diff --git a/config/block.block.dcb2017_account_menu.yml b/config/block.block.dcb2017_account_menu.yml
index e5e57605b..54a74ee3e 100644
--- a/config/block.block.dcb2017_account_menu.yml
+++ b/config/block.block.dcb2017_account_menu.yml
@@ -12,7 +12,7 @@ _core:
   default_config_hash: DweBpscQZdG0-fHkSpUzdYucrNH45G_KF7Z82V-oyQM
 id: dcb2017_account_menu
 theme: dcb2017
-region: '-1'
+region: header
 weight: -1
 provider: null
 plugin: 'system_menu_block:account'
diff --git a/config/block.block.dcb2017_breadcrumbs.yml b/config/block.block.dcb2017_breadcrumbs.yml
index d9f5c53b2..e3bbe11e2 100644
--- a/config/block.block.dcb2017_breadcrumbs.yml
+++ b/config/block.block.dcb2017_breadcrumbs.yml
@@ -10,7 +10,7 @@ _core:
   default_config_hash: oXUb3JZR2WW5VOdw4HrhRicCsq51mCgLfRyvheG68ck
 id: dcb2017_breadcrumbs
 theme: dcb2017
-region: '-1'
+region: header
 weight: -6
 provider: null
 plugin: system_breadcrumb_block
diff --git a/config/block.block.dcb2017_help.yml b/config/block.block.dcb2017_help.yml
index b24bccf73..73678d1a8 100644
--- a/config/block.block.dcb2017_help.yml
+++ b/config/block.block.dcb2017_help.yml
@@ -10,7 +10,7 @@ _core:
   default_config_hash: 8I8iACSa0sKO3k3jlvUG1ge52rfcKX7USJAQYnzuBgg
 id: dcb2017_help
 theme: dcb2017
-region: '-1'
+region: header
 weight: -5
 provider: null
 plugin: help_block
diff --git a/config/block.block.dcb2017_local_actions.yml b/config/block.block.dcb2017_local_actions.yml
index 74f70fb0d..fac09a3c0 100644
--- a/config/block.block.dcb2017_local_actions.yml
+++ b/config/block.block.dcb2017_local_actions.yml
@@ -8,7 +8,7 @@ _core:
   default_config_hash: 13GQpeITIJsp1kyPniXtWZfyFH87vb1xxJCHifL4UeE
 id: dcb2017_local_actions
 theme: dcb2017
-region: '-1'
+region: header
 weight: -4
 provider: null
 plugin: local_actions_block
diff --git a/config/block.block.dcb2017_powered.yml b/config/block.block.dcb2017_powered.yml
index 5857a3431..faab89f53 100644
--- a/config/block.block.dcb2017_powered.yml
+++ b/config/block.block.dcb2017_powered.yml
@@ -10,7 +10,7 @@ _core:
   default_config_hash: jQQUUWN2Uxr5qZtc9zcJKBCxpKY8orN1u2HPqYYRQDI
 id: dcb2017_powered
 theme: dcb2017
-region: '-1'
+region: header
 weight: -7
 provider: null
 plugin: system_powered_by_block
diff --git a/config/block.block.dcb2017_search.yml b/config/block.block.dcb2017_search.yml
index e4127adff..24467f42a 100644
--- a/config/block.block.dcb2017_search.yml
+++ b/config/block.block.dcb2017_search.yml
@@ -10,7 +10,7 @@ _core:
   default_config_hash: za-39d5WDUg6XvbyqSnuVYEeq6QM4qKJxW8MnoAha5A
 id: dcb2017_search
 theme: dcb2017
-region: '-1'
+region: header
 weight: -3
 provider: null
 plugin: search_form_block
diff --git a/config/block.block.dcb2017_tools.yml b/config/block.block.dcb2017_tools.yml
index 03ce478ed..de115feb1 100644
--- a/config/block.block.dcb2017_tools.yml
+++ b/config/block.block.dcb2017_tools.yml
@@ -12,7 +12,7 @@ _core:
   default_config_hash: NeHSoqm4XFqA7_0bDmR429ZZQt3LRbZMNRJTMsFyOfI
 id: dcb2017_tools
 theme: dcb2017
-region: '-1'
+region: header
 weight: -2
 provider: null
 plugin: 'system_menu_block:tools'
diff --git a/config/core.entity_form_display.block_content.basic.default.yml b/config/core.entity_form_display.block_content.basic.default.yml
index 237fb09d6..badceabdc 100644
--- a/config/core.entity_form_display.block_content.basic.default.yml
+++ b/config/core.entity_form_display.block_content.basic.default.yml
@@ -22,6 +22,7 @@ content:
       summary_rows: 3
       placeholder: ''
     third_party_settings: {  }
+    region: content
   info:
     type: string_textfield
     weight: -5
@@ -29,4 +30,5 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+    region: content
 hidden: {  }
diff --git a/config/core.entity_form_display.comment.comment.default.yml b/config/core.entity_form_display.comment.comment.default.yml
index 2013a9703..4b2f5df4a 100644
--- a/config/core.entity_form_display.comment.comment.default.yml
+++ b/config/core.entity_form_display.comment.comment.default.yml
@@ -16,6 +16,7 @@ mode: default
 content:
   author:
     weight: -2
+    region: content
   comment_body:
     type: text_textarea
     weight: 11
@@ -23,6 +24,7 @@ content:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
+    region: content
   subject:
     type: string_textfield
     weight: 10
@@ -30,4 +32,5 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+    region: content
 hidden: {  }
diff --git a/config/core.entity_form_display.node.article.default.yml b/config/core.entity_form_display.node.article.default.yml
index e18d0d1c2..186ea1276 100644
--- a/config/core.entity_form_display.node.article.default.yml
+++ b/config/core.entity_form_display.node.article.default.yml
@@ -29,16 +29,19 @@ content:
       summary_rows: 3
       placeholder: ''
     third_party_settings: {  }
+    region: content
   comment:
     type: comment_default
     weight: 20
     settings: {  }
     third_party_settings: {  }
+    region: content
   created:
     type: datetime_timestamp
     weight: 10
     settings: {  }
     third_party_settings: {  }
+    region: content
   field_image:
     type: image_image
     weight: 4
@@ -46,28 +49,33 @@ content:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
+    region: content
   field_tags:
     type: entity_reference_autocomplete_tags
     weight: 3
     settings: {  }
     third_party_settings: {  }
+    region: content
   path:
     type: path
     weight: 30
     settings: {  }
     third_party_settings: {  }
+    region: content
   promote:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 15
     third_party_settings: {  }
+    region: content
   sticky:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 16
     third_party_settings: {  }
+    region: content
   title:
     type: string_textfield
     weight: 0
@@ -75,6 +83,7 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+    region: content
   uid:
     type: entity_reference_autocomplete
     weight: 5
@@ -83,4 +92,5 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+    region: content
 hidden: {  }
diff --git a/config/core.entity_form_display.node.page.default.yml b/config/core.entity_form_display.node.page.default.yml
index 2a3b3106c..20415d605 100644
--- a/config/core.entity_form_display.node.page.default.yml
+++ b/config/core.entity_form_display.node.page.default.yml
@@ -25,34 +25,40 @@ content:
       summary_rows: 3
       placeholder: ''
     third_party_settings: {  }
+    region: content
   created:
     type: datetime_timestamp
     weight: 10
     settings: {  }
     third_party_settings: {  }
+    region: content
   field_file:
     weight: 32
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
     type: file_generic
+    region: content
   path:
     type: path
     weight: 30
     settings: {  }
     third_party_settings: {  }
+    region: content
   promote:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 15
     third_party_settings: {  }
+    region: content
   sticky:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 16
     third_party_settings: {  }
+    region: content
   title:
     type: string_textfield
     weight: -5
@@ -60,6 +66,7 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+    region: content
   uid:
     type: entity_reference_autocomplete
     weight: 5
@@ -68,4 +75,5 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+    region: content
 hidden: {  }
diff --git a/config/core.entity_form_display.node.sponsor.default.yml b/config/core.entity_form_display.node.sponsor.default.yml
index 590a83a0a..982a4c1db 100644
--- a/config/core.entity_form_display.node.sponsor.default.yml
+++ b/config/core.entity_form_display.node.sponsor.default.yml
@@ -25,11 +25,13 @@ content:
       summary_rows: 3
       placeholder: ''
     third_party_settings: {  }
+    region: content
   created:
     type: datetime_timestamp
     weight: 10
     settings: {  }
     third_party_settings: {  }
+    region: content
   field_logo:
     weight: 32
     settings:
@@ -37,28 +39,33 @@ content:
       preview_image_style: thumbnail
     third_party_settings: {  }
     type: image_image
+    region: content
   field_sponsor_level:
     weight: 33
     settings: {  }
     third_party_settings: {  }
     type: options_select
+    region: content
   path:
     type: path
     weight: 30
     settings: {  }
     third_party_settings: {  }
+    region: content
   promote:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 15
     third_party_settings: {  }
+    region: content
   sticky:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 16
     third_party_settings: {  }
+    region: content
   title:
     type: string_textfield
     weight: -5
@@ -66,6 +73,7 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+    region: content
   uid:
     type: entity_reference_autocomplete
     weight: 5
@@ -74,4 +82,5 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+    region: content
 hidden: {  }
diff --git a/config/core.entity_form_display.user.user.default.yml b/config/core.entity_form_display.user.user.default.yml
index e5fe601b3..369b8a4ee 100644
--- a/config/core.entity_form_display.user.user.default.yml
+++ b/config/core.entity_form_display.user.user.default.yml
@@ -17,12 +17,16 @@ mode: default
 content:
   account:
     weight: -10
+    region: content
   contact:
     weight: 5
+    region: content
   language:
     weight: 0
+    region: content
   timezone:
     weight: 6
+    region: content
   user_picture:
     type: image_image
     settings:
@@ -30,4 +34,5 @@ content:
       preview_image_style: thumbnail
     third_party_settings: {  }
     weight: -1
+    region: content
 hidden: {  }
diff --git a/config/core.entity_view_display.block_content.basic.default.yml b/config/core.entity_view_display.block_content.basic.default.yml
index 9895f399b..7ad2fff5c 100644
--- a/config/core.entity_view_display.block_content.basic.default.yml
+++ b/config/core.entity_view_display.block_content.basic.default.yml
@@ -20,4 +20,5 @@ content:
     weight: 0
     settings: {  }
     third_party_settings: {  }
+    region: content
 hidden: {  }
diff --git a/config/core.entity_view_display.comment.comment.default.yml b/config/core.entity_view_display.comment.comment.default.yml
index 0f1c06808..0dbd3d198 100644
--- a/config/core.entity_view_display.comment.comment.default.yml
+++ b/config/core.entity_view_display.comment.comment.default.yml
@@ -20,6 +20,8 @@ content:
     weight: 0
     settings: {  }
     third_party_settings: {  }
+    region: content
   links:
     weight: 100
+    region: content
 hidden: {  }
diff --git a/config/core.entity_view_display.node.article.default.yml b/config/core.entity_view_display.node.article.default.yml
index c8c8d4d25..9e2574b23 100644
--- a/config/core.entity_view_display.node.article.default.yml
+++ b/config/core.entity_view_display.node.article.default.yml
@@ -28,6 +28,7 @@ content:
     settings: {  }
     third_party_settings: {  }
     label: hidden
+    region: content
   comment:
     type: comment_default
     weight: 110
@@ -36,6 +37,7 @@ content:
       view_mode: default
       pager_id: 0
     third_party_settings: {  }
+    region: content
   field_image:
     type: image
     weight: -1
@@ -44,6 +46,7 @@ content:
       image_link: ''
     third_party_settings: {  }
     label: hidden
+    region: content
   field_tags:
     type: entity_reference_label
     weight: 10
@@ -51,8 +54,10 @@ content:
     settings:
       link: true
     third_party_settings: {  }
+    region: content
   links:
     weight: 100
+    region: content
 hidden:
   field_image: true
   field_tags: true
diff --git a/config/core.entity_view_display.node.article.rss.yml b/config/core.entity_view_display.node.article.rss.yml
index f6d165215..b264f4aaf 100644
--- a/config/core.entity_view_display.node.article.rss.yml
+++ b/config/core.entity_view_display.node.article.rss.yml
@@ -20,6 +20,7 @@ mode: rss
 content:
   links:
     weight: 100
+    region: content
 hidden:
   body: true
   comment: true
diff --git a/config/core.entity_view_display.node.article.teaser.yml b/config/core.entity_view_display.node.article.teaser.yml
index e156e3acd..833d26e63 100644
--- a/config/core.entity_view_display.node.article.teaser.yml
+++ b/config/core.entity_view_display.node.article.teaser.yml
@@ -28,6 +28,7 @@ content:
       trim_length: 600
     third_party_settings: {  }
     label: hidden
+    region: content
   field_image:
     type: image
     weight: -1
@@ -36,6 +37,7 @@ content:
       image_link: content
     third_party_settings: {  }
     label: hidden
+    region: content
   field_tags:
     type: entity_reference_label
     weight: 10
@@ -43,8 +45,10 @@ content:
       link: true
     third_party_settings: {  }
     label: above
+    region: content
   links:
     weight: 100
+    region: content
 hidden:
   comment: true
   field_image: true
diff --git a/config/core.entity_view_display.node.page.default.yml b/config/core.entity_view_display.node.page.default.yml
index 6ed900c9b..894c74117 100644
--- a/config/core.entity_view_display.node.page.default.yml
+++ b/config/core.entity_view_display.node.page.default.yml
@@ -23,14 +23,17 @@ content:
     weight: 100
     settings: {  }
     third_party_settings: {  }
+    region: content
   field_file:
     weight: 102
     label: inline
     settings: {  }
     third_party_settings: {  }
     type: file_default
+    region: content
   links:
     weight: 101
     settings: {  }
     third_party_settings: {  }
+    region: content
 hidden: {  }
diff --git a/config/core.entity_view_display.node.page.teaser.yml b/config/core.entity_view_display.node.page.teaser.yml
index 712014dd7..ecd0a7ec1 100644
--- a/config/core.entity_view_display.node.page.teaser.yml
+++ b/config/core.entity_view_display.node.page.teaser.yml
@@ -5,6 +5,7 @@ dependencies:
   config:
     - core.entity_view_mode.node.teaser
     - field.field.node.page.body
+    - field.field.node.page.field_file
     - node.type.page
   module:
     - text
@@ -23,6 +24,9 @@ content:
     settings:
       trim_length: 600
     third_party_settings: {  }
+    region: content
   links:
     weight: 101
-hidden: {  }
+    region: content
+hidden:
+  field_file: true
diff --git a/config/core.entity_view_display.node.sponsor.default.yml b/config/core.entity_view_display.node.sponsor.default.yml
index 8fdadfd85..ce90a5ac7 100644
--- a/config/core.entity_view_display.node.sponsor.default.yml
+++ b/config/core.entity_view_display.node.sponsor.default.yml
@@ -23,6 +23,7 @@ content:
     weight: 101
     settings: {  }
     third_party_settings: {  }
+    region: content
   field_logo:
     weight: 102
     label: above
@@ -31,12 +32,15 @@ content:
       image_link: ''
     third_party_settings: {  }
     type: image
+    region: content
   field_sponsor_level:
     weight: 103
     label: above
     settings: {  }
     third_party_settings: {  }
     type: list_default
+    region: content
   links:
     weight: 100
+    region: content
 hidden: {  }
diff --git a/config/core.entity_view_display.node.sponsor.teaser.yml b/config/core.entity_view_display.node.sponsor.teaser.yml
index 63635c718..8ce083571 100644
--- a/config/core.entity_view_display.node.sponsor.teaser.yml
+++ b/config/core.entity_view_display.node.sponsor.teaser.yml
@@ -5,6 +5,8 @@ dependencies:
   config:
     - core.entity_view_mode.node.teaser
     - field.field.node.sponsor.body
+    - field.field.node.sponsor.field_logo
+    - field.field.node.sponsor.field_sponsor_level
     - node.type.sponsor
   module:
     - text
@@ -21,6 +23,10 @@ content:
     settings:
       trim_length: 600
     third_party_settings: {  }
+    region: content
   links:
     weight: 100
-hidden: {  }
+    region: content
+hidden:
+  field_logo: true
+  field_sponsor_level: true
diff --git a/config/core.entity_view_display.user.user.compact.yml b/config/core.entity_view_display.user.user.compact.yml
index e17a67138..90746890c 100644
--- a/config/core.entity_view_display.user.user.compact.yml
+++ b/config/core.entity_view_display.user.user.compact.yml
@@ -24,5 +24,6 @@ content:
       image_link: content
     third_party_settings: {  }
     label: hidden
+    region: content
 hidden:
   member_for: true
diff --git a/config/core.entity_view_display.user.user.default.yml b/config/core.entity_view_display.user.user.default.yml
index 2d56f7a8f..91493d57c 100644
--- a/config/core.entity_view_display.user.user.default.yml
+++ b/config/core.entity_view_display.user.user.default.yml
@@ -17,6 +17,7 @@ mode: default
 content:
   member_for:
     weight: 5
+    region: content
   user_picture:
     type: image
     weight: 0
@@ -25,4 +26,5 @@ content:
       image_link: content
     third_party_settings: {  }
     label: hidden
+    region: content
 hidden: {  }
diff --git a/config/core.extension.yml b/config/core.extension.yml
index 2426f0e38..6dd4d4ee8 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -52,3 +52,4 @@ theme:
   dcb2017: 0
 _core:
   default_config_hash: m2GVq11UAOVuNgj8x0t5fMOPujpvQQ_zxLoaly1BMEU
+profile: standard
diff --git a/config/system.cron.yml b/config/system.cron.yml
index a44f232fa..904a96fb6 100644
--- a/config/system.cron.yml
+++ b/config/system.cron.yml
@@ -3,3 +3,4 @@ threshold:
   requirements_error: 1209600
 _core:
   default_config_hash: 05U0n1_8zHYzxEFSWjyHCWuJyhdez2a6Z_aTIXin04E
+logging: 1
diff --git a/config/user.role.anonymous.yml b/config/user.role.anonymous.yml
index 7c9c5cc86..13a491ca5 100644
--- a/config/user.role.anonymous.yml
+++ b/config/user.role.anonymous.yml
@@ -9,8 +9,8 @@ label: 'Anonymous user'
 weight: 0
 is_admin: false
 permissions:
-  - 'access content'
-  - 'use text format restricted_html'
   - 'access comments'
+  - 'access content'
   - 'access site-wide contact form'
   - 'search content'
+  - 'use text format restricted_html'
diff --git a/config/user.role.authenticated.yml b/config/user.role.authenticated.yml
index 70aec3b70..23cd8fcf0 100644
--- a/config/user.role.authenticated.yml
+++ b/config/user.role.authenticated.yml
@@ -9,11 +9,11 @@ label: 'Authenticated user'
 weight: 1
 is_admin: false
 permissions:
-  - 'access content'
-  - 'use text format basic_html'
   - 'access comments'
-  - 'post comments'
-  - 'skip comment approval'
-  - 'access site-wide contact form'
+  - 'access content'
   - 'access shortcuts'
+  - 'access site-wide contact form'
+  - 'post comments'
   - 'search content'
+  - 'skip comment approval'
+  - 'use text format basic_html'
diff --git a/web/.csslintrc b/web/.csslintrc
index 1133ef2a9..177e4fcc7 100644
--- a/web/.csslintrc
+++ b/web/.csslintrc
@@ -1,37 +1,40 @@
-{
-  "important": true,
-  "adjoining-classes": false,
-  "known-properties": true,
-  "box-sizing": false,
-  "box-model": true,
-  "overqualified-elements": true,
-  "display-property-grouping": true,
-  "bulletproof-font-face": false,
-  "compatible-vendor-prefixes": false,
-  "regex-selectors": false,
-  "errors": false,
-  "duplicate-background-images": true,
-  "duplicate-properties": true,
-  "empty-rules": true,
-  "selector-max-approaching": false,
-  "gradients": false,
-  "fallback-colors": false,
-  "font-sizes": false,
-  "font-faces": false,
-  "floats": false,
-  "star-property-hack": true,
-  "outline-none": true,
-  "import": true,
-  "ids": true,
-  "underscore-property-hack": true,
-  "rules-count": false,
-  "qualified-headings": true,
-  "selector-max": false,
-  "shorthand": true,
-  "text-indent": true,
-  "unique-headings": true,
-  "universal-selector": false,
-  "unqualified-attributes": true,
-  "vendor-prefix": true,
-  "zero-units": true
-}
+--errors=box-model,
+         display-property-grouping,
+         duplicate-background-images,
+         duplicate-properties,
+         empty-rules,
+         ids,
+         import,
+         important,
+         known-properties,
+         outline-none,
+         overqualified-elements,
+         qualified-headings,
+         shorthand,
+         star-property-hack,
+         text-indent,
+         underscore-property-hack,
+         unique-headings,
+         unqualified-attributes,
+         vendor-prefix,
+         zero-units
+--ignore=adjoining-classes,
+         box-sizing,
+         bulletproof-font-face,
+         compatible-vendor-prefixes,
+         errors,
+         fallback-colors,
+         floats,
+         font-faces,
+         font-sizes,
+         gradients,
+         import-ie-limit,
+         order-alphabetical,
+         regex-selectors,
+         rules-count,
+         selector-max,
+         selector-max-approaching,
+         selector-newline,
+         universal-selector
+--exclude-list=core/assets,
+               vendor
diff --git a/web/.eslintignore b/web/.eslintignore
index 961edb753..de133ba44 100644
--- a/web/.eslintignore
+++ b/web/.eslintignore
@@ -6,3 +6,4 @@ libraries/**/*
 sites/**/libraries/**/*
 profiles/**/libraries/**/*
 **/js_test_files/**/*
+**/node_modules/**/*
diff --git a/web/.eslintrc.json b/web/.eslintrc.json
new file mode 100644
index 000000000..d4bbc9205
--- /dev/null
+++ b/web/.eslintrc.json
@@ -0,0 +1,3 @@
+{
+  "extends": "./core/.eslintrc.json"
+}
diff --git a/web/autoload.php b/web/autoload.php
index 1e5ad34e3..85dc818a3 100644
--- a/web/autoload.php
+++ b/web/autoload.php
@@ -4,6 +4,9 @@
  * @file
  * Includes the autoloader created by Composer.
  *
+ * This file was generated by drupal-composer/drupal-scaffold.
+ * https://github.com/drupal-composer/drupal-scaffold
+ *
  * @see composer.json
  * @see index.php
  * @see core/install.php
diff --git a/web/composer.json b/web/composer.json
index e2b64e415..9e17bfc38 100644
--- a/web/composer.json
+++ b/web/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "composer/installers": "^1.0.21",
         "wikimedia/composer-merge-plugin": "~1.3",
-        "drupal/core": "~8.2",
+        "drupal/core": "~8.3",
         "drupal-composer/drupal-scaffold": "dev-master"
     },
     "replace": {
@@ -22,14 +22,6 @@
             "By default Drupal loads the autoloader from ./vendor/autoload.php.",
             "To change the autoloader you can edit ./autoload.php."
         ],
-        "merge-plugin": {
-            "include": [
-                "core/composer.json"
-            ],
-            "recurse": false,
-            "replace": false,
-            "merge-extra": false
-        },
         "drupal-scaffold": {
             "source": "http://cgit.drupalcode.org/drupal/plain/{path}?h={version}",
             "excludes": [
@@ -44,7 +36,6 @@
         }
     },
     "scripts": {
-        "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
         "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess",
         "post-package-install": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup",
         "post-package-update": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup"
diff --git a/web/composer.lock b/web/composer.lock
index feadcf901..91d15090b 100644
--- a/web/composer.lock
+++ b/web/composer.lock
@@ -4,31 +4,40 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "b1bad605e3192b62c91672262c3b543b",
+    "content-hash": "963d2c28d95078f45f3a151d07962ac0",
     "packages": [
         {
             "name": "asm89/stack-cors",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/asm89/stack-cors.git",
-                "reference": "3ae8ef219bb4c9a6caf857421719aa07fa7776cc"
+                "reference": "65ccbd455370f043c2e3b93482a3813603d68731"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/asm89/stack-cors/zipball/3ae8ef219bb4c9a6caf857421719aa07fa7776cc",
-                "reference": "3ae8ef219bb4c9a6caf857421719aa07fa7776cc",
+                "url": "https://api.github.com/repos/asm89/stack-cors/zipball/65ccbd455370f043c2e3b93482a3813603d68731",
+                "reference": "65ccbd455370f043c2e3b93482a3813603d68731",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2",
-                "symfony/http-foundation": "~2.1|~3.0",
-                "symfony/http-kernel": "~2.1|~3.0"
+                "php": ">=5.5.9",
+                "symfony/http-foundation": "~2.7|~3.0",
+                "symfony/http-kernel": "~2.7|~3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.0 || ^4.8.10",
+                "squizlabs/php_codesniffer": "^2.3"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
             "autoload": {
-                "psr-0": {
-                    "Asm89\\Stack": "src/"
+                "psr-4": {
+                    "Asm89\\Stack\\": "src/Asm89/Stack/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -47,2939 +56,8 @@
                 "cors",
                 "stack"
             ],
-            "time": "2016-08-01T12:05:04+00:00"
+            "time": "2017-04-11T20:03:41+00:00"
         },
-        {
-            "name": "composer/installers",
-            "version": "v1.0.21",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/installers.git",
-                "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
-                "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
-                "shasum": ""
-            },
-            "replace": {
-                "roundcube/plugin-installer": "*",
-                "shama/baton": "*"
-            },
-            "require-dev": {
-                "composer/composer": "1.0.*@dev",
-                "phpunit/phpunit": "4.1.*"
-            },
-            "type": "composer-installer",
-            "extra": {
-                "class": "Composer\\Installers\\Installer",
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Composer\\Installers\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kyle Robinson Young",
-                    "email": "kyle@dontkry.com",
-                    "homepage": "https://github.com/shama"
-                }
-            ],
-            "description": "A multi-framework Composer library installer",
-            "homepage": "http://composer.github.com/installers/",
-            "keywords": [
-                "Craft",
-                "Dolibarr",
-                "Hurad",
-                "MODX Evo",
-                "OXID",
-                "SMF",
-                "Thelia",
-                "WolfCMS",
-                "agl",
-                "aimeos",
-                "annotatecms",
-                "bitrix",
-                "cakephp",
-                "chef",
-                "codeigniter",
-                "concrete5",
-                "croogo",
-                "dokuwiki",
-                "drupal",
-                "elgg",
-                "fuelphp",
-                "grav",
-                "installer",
-                "joomla",
-                "kohana",
-                "laravel",
-                "lithium",
-                "magento",
-                "mako",
-                "mediawiki",
-                "modulework",
-                "moodle",
-                "phpbb",
-                "piwik",
-                "ppi",
-                "puppet",
-                "roundcube",
-                "shopware",
-                "silverstripe",
-                "symfony",
-                "typo3",
-                "wordpress",
-                "zend",
-                "zikula"
-            ],
-            "time": "2015-02-18T17:17:01+00:00"
-        },
-        {
-            "name": "composer/semver",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/semver.git",
-                "reference": "d0e1ccc6d44ab318b758d709e19176037da6b1ba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/d0e1ccc6d44ab318b758d709e19176037da6b1ba",
-                "reference": "d0e1ccc6d44ab318b758d709e19176037da6b1ba",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.5",
-                "phpunit/phpunit-mock-objects": "~2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Semver\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Rob Bast",
-                    "email": "rob.bast@gmail.com"
-                },
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "Semver library that offers utilities, version constraint parsing and validation.",
-            "keywords": [
-                "semantic",
-                "semver",
-                "validation",
-                "versioning"
-            ],
-            "time": "2015-09-21T09:42:36+00:00"
-        },
-        {
-            "name": "doctrine/annotations",
-            "version": "v1.2.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
-                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/lexer": "1.*",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "doctrine/cache": "1.*",
-                "phpunit/phpunit": "4.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Annotations\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
-            ],
-            "time": "2015-08-31T12:32:49+00:00"
-        },
-        {
-            "name": "doctrine/cache",
-            "version": "v1.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/cache.git",
-                "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca",
-                "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "conflict": {
-                "doctrine/common": ">2.2,<2.4"
-            },
-            "require-dev": {
-                "phpunit/phpunit": ">=3.7",
-                "predis/predis": "~1.0",
-                "satooshi/php-coveralls": "~0.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Cache\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Caching library offering an object-oriented API for many cache backends",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "cache",
-                "caching"
-            ],
-            "time": "2015-08-31T12:36:41+00:00"
-        },
-        {
-            "name": "doctrine/collections",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/collections.git",
-                "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
-                "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Collections\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Collections Abstraction library",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "array",
-                "collections",
-                "iterator"
-            ],
-            "time": "2015-04-14T22:21:58+00:00"
-        },
-        {
-            "name": "doctrine/common",
-            "version": "v2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/common.git",
-                "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9",
-                "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/annotations": "1.*",
-                "doctrine/cache": "1.*",
-                "doctrine/collections": "1.*",
-                "doctrine/inflector": "1.*",
-                "doctrine/lexer": "1.*",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~3.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Common Library for Doctrine projects",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "annotations",
-                "collections",
-                "eventmanager",
-                "persistence",
-                "spl"
-            ],
-            "time": "2015-08-31T13:00:22+00:00"
-        },
-        {
-            "name": "doctrine/inflector",
-            "version": "v1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/inflector.git",
-                "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/0bcb2e79d8571787f18b7eb036ed3d004908e604",
-                "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Inflector\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Common String Manipulations with regard to casing and singular/plural rules.",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "inflection",
-                "pluralize",
-                "singularize",
-                "string"
-            ],
-            "time": "2014-12-20T21:24:13+00:00"
-        },
-        {
-            "name": "doctrine/lexer",
-            "version": "v1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Lexer\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "lexer",
-                "parser"
-            ],
-            "time": "2014-09-09T13:34:57+00:00"
-        },
-        {
-            "name": "drupal-composer/drupal-scaffold",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/drupal-composer/drupal-scaffold.git",
-                "reference": "3ad465ac853c2e52e6a808f5529859917662c256"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/drupal-composer/drupal-scaffold/zipball/3ad465ac853c2e52e6a808f5529859917662c256",
-                "reference": "3ad465ac853c2e52e6a808f5529859917662c256",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0.0",
-                "php": ">=5.4.5"
-            },
-            "require-dev": {
-                "composer/composer": "dev-master",
-                "phpunit/phpunit": "^4.4.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "DrupalComposer\\DrupalScaffold\\Plugin",
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "DrupalComposer\\DrupalScaffold\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0+"
-            ],
-            "description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core",
-            "time": "2016-11-05 10:46:44"
-        },
-        {
-            "name": "drupal/core",
-            "version": "8.2.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/drupal-composer/drupal-core.git",
-                "reference": "5d3fb8a93514f23198ac6848b2679ef1026d2326"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/drupal-composer/drupal-core/zipball/5d3fb8a93514f23198ac6848b2679ef1026d2326",
-                "reference": "5d3fb8a93514f23198ac6848b2679ef1026d2326",
-                "shasum": ""
-            },
-            "require": {
-                "asm89/stack-cors": "~1.0",
-                "composer/semver": "~1.0",
-                "doctrine/annotations": "1.2.*",
-                "doctrine/common": "2.5.*",
-                "easyrdf/easyrdf": "0.9.*",
-                "egulias/email-validator": "1.2.*",
-                "guzzlehttp/guzzle": "^6.2.1",
-                "masterminds/html5": "~2.1",
-                "paragonie/random_compat": "^1|^2",
-                "php": ">=5.5.9",
-                "stack/builder": "1.0.*",
-                "symfony-cmf/routing": "~1.4",
-                "symfony/class-loader": "~2.8",
-                "symfony/console": "~2.8",
-                "symfony/dependency-injection": "~2.8",
-                "symfony/event-dispatcher": "~2.8",
-                "symfony/http-foundation": "~2.8",
-                "symfony/http-kernel": "~2.8",
-                "symfony/polyfill-iconv": "~1.0",
-                "symfony/process": "~2.8",
-                "symfony/psr-http-message-bridge": "v0.2",
-                "symfony/routing": "~2.8",
-                "symfony/serializer": "~2.8",
-                "symfony/translation": "~2.8",
-                "symfony/validator": "~2.8",
-                "symfony/yaml": "~2.8",
-                "twig/twig": "^1.23.1",
-                "zendframework/zend-diactoros": "~1.1",
-                "zendframework/zend-feed": "~2.4"
-            },
-            "replace": {
-                "drupal/action": "self.version",
-                "drupal/aggregator": "self.version",
-                "drupal/automated_cron": "self.version",
-                "drupal/ban": "self.version",
-                "drupal/bartik": "self.version",
-                "drupal/basic_auth": "self.version",
-                "drupal/big_pipe": "self.version",
-                "drupal/block": "self.version",
-                "drupal/block_content": "self.version",
-                "drupal/block_place": "self.version",
-                "drupal/book": "self.version",
-                "drupal/breakpoint": "self.version",
-                "drupal/ckeditor": "self.version",
-                "drupal/classy": "self.version",
-                "drupal/color": "self.version",
-                "drupal/comment": "self.version",
-                "drupal/config": "self.version",
-                "drupal/config_translation": "self.version",
-                "drupal/contact": "self.version",
-                "drupal/content_moderation": "self.version",
-                "drupal/content_translation": "self.version",
-                "drupal/contextual": "self.version",
-                "drupal/core-annotation": "self.version",
-                "drupal/core-assertion": "self.version",
-                "drupal/core-bridge": "self.version",
-                "drupal/core-datetime": "self.version",
-                "drupal/core-dependency-injection": "self.version",
-                "drupal/core-diff": "self.version",
-                "drupal/core-discovery": "self.version",
-                "drupal/core-event-dispatcher": "self.version",
-                "drupal/core-file-cache": "self.version",
-                "drupal/core-filesystem": "self.version",
-                "drupal/core-gettext": "self.version",
-                "drupal/core-graph": "self.version",
-                "drupal/core-http-foundation": "self.version",
-                "drupal/core-php-storage": "self.version",
-                "drupal/core-plugin": "self.version",
-                "drupal/core-proxy-builder": "self.version",
-                "drupal/core-render": "self.version",
-                "drupal/core-serialization": "self.version",
-                "drupal/core-transliteration": "self.version",
-                "drupal/core-utility": "self.version",
-                "drupal/core-uuid": "self.version",
-                "drupal/datetime": "self.version",
-                "drupal/datetime_range": "self.version",
-                "drupal/dblog": "self.version",
-                "drupal/dynamic_page_cache": "self.version",
-                "drupal/editor": "self.version",
-                "drupal/entity_reference": "self.version",
-                "drupal/field": "self.version",
-                "drupal/field_ui": "self.version",
-                "drupal/file": "self.version",
-                "drupal/filter": "self.version",
-                "drupal/forum": "self.version",
-                "drupal/hal": "self.version",
-                "drupal/help": "self.version",
-                "drupal/history": "self.version",
-                "drupal/image": "self.version",
-                "drupal/inline_form_errors": "self.version",
-                "drupal/language": "self.version",
-                "drupal/link": "self.version",
-                "drupal/locale": "self.version",
-                "drupal/menu_link_content": "self.version",
-                "drupal/menu_ui": "self.version",
-                "drupal/migrate": "self.version",
-                "drupal/migrate_drupal": "self.version",
-                "drupal/migrate_drupal_ui": "self.version",
-                "drupal/minimal": "self.version",
-                "drupal/node": "self.version",
-                "drupal/options": "self.version",
-                "drupal/outside_in": "self.version",
-                "drupal/page_cache": "self.version",
-                "drupal/path": "self.version",
-                "drupal/quickedit": "self.version",
-                "drupal/rdf": "self.version",
-                "drupal/responsive_image": "self.version",
-                "drupal/rest": "self.version",
-                "drupal/search": "self.version",
-                "drupal/serialization": "self.version",
-                "drupal/seven": "self.version",
-                "drupal/shortcut": "self.version",
-                "drupal/simpletest": "self.version",
-                "drupal/standard": "self.version",
-                "drupal/stark": "self.version",
-                "drupal/statistics": "self.version",
-                "drupal/syslog": "self.version",
-                "drupal/system": "self.version",
-                "drupal/taxonomy": "self.version",
-                "drupal/telephone": "self.version",
-                "drupal/text": "self.version",
-                "drupal/toolbar": "self.version",
-                "drupal/tour": "self.version",
-                "drupal/tracker": "self.version",
-                "drupal/update": "self.version",
-                "drupal/user": "self.version",
-                "drupal/views": "self.version",
-                "drupal/views_ui": "self.version"
-            },
-            "require-dev": {
-                "behat/mink": "~1.7",
-                "behat/mink-goutte-driver": "~1.2",
-                "jcalderonzumba/gastonjs": "~1.0.2",
-                "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
-                "mikey179/vfsstream": "~1.2",
-                "phpunit/phpunit": ">=4.8.28 <5",
-                "symfony/css-selector": "~2.8"
-            },
-            "type": "drupal-core",
-            "autoload": {
-                "psr-4": {
-                    "Drupal\\Core\\": "lib/Drupal/Core",
-                    "Drupal\\Component\\": "lib/Drupal/Component",
-                    "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
-                },
-                "classmap": [
-                    "lib/Drupal.php",
-                    "lib/Drupal/Component/Utility/Timer.php",
-                    "lib/Drupal/Component/Utility/Unicode.php",
-                    "lib/Drupal/Core/Database/Database.php",
-                    "lib/Drupal/Core/DrupalKernel.php",
-                    "lib/Drupal/Core/DrupalKernelInterface.php",
-                    "lib/Drupal/Core/Site/Settings.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0+"
-            ],
-            "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-            "time": "2017-03-15T20:19:51+00:00"
-        },
-        {
-            "name": "easyrdf/easyrdf",
-            "version": "0.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/njh/easyrdf.git",
-                "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/njh/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566",
-                "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "ext-pcre": "*",
-                "php": ">=5.2.8"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~3.5",
-                "sami/sami": "~1.4",
-                "squizlabs/php_codesniffer": "~1.4.3"
-            },
-            "suggest": {
-                "ml/json-ld": "~1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "EasyRdf_": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Nicholas Humfrey",
-                    "email": "njh@aelius.com",
-                    "homepage": "http://www.aelius.com/njh/",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Alexey Zakhlestin",
-                    "email": "indeyets@gmail.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.",
-            "homepage": "http://www.easyrdf.org/",
-            "keywords": [
-                "Linked Data",
-                "RDF",
-                "Semantic Web",
-                "Turtle",
-                "rdfa",
-                "sparql"
-            ],
-            "time": "2015-02-27T09:45:49+00:00"
-        },
-        {
-            "name": "egulias/email-validator",
-            "version": "1.2.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/af864423f50ea59f96c87bb1eae147a70bcf67a1",
-                "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/lexer": "~1.0,>=1.0.1",
-                "php": ">= 5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4",
-                "satooshi/php-coveralls": "dev-master"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Egulias\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Eduardo Gulias Davis"
-                }
-            ],
-            "description": "A library for validating emails",
-            "homepage": "https://github.com/egulias/EmailValidator",
-            "keywords": [
-                "email",
-                "emailvalidation",
-                "emailvalidator",
-                "validation",
-                "validator"
-            ],
-            "time": "2015-06-22T21:07:51+00:00"
-        },
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "6.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "3f808fba627f2c5b69e2501217bf31af349c1427"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/3f808fba627f2c5b69e2501217bf31af349c1427",
-                "reference": "3f808fba627f2c5b69e2501217bf31af349c1427",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.3.1",
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "^4.0",
-                "psr/log": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.2-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2016-07-15T17:22:37+00:00"
-        },
-        {
-            "name": "guzzlehttp/promises",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/promises.git",
-                "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579",
-                "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle promises library",
-            "keywords": [
-                "promise"
-            ],
-            "time": "2016-05-18T16:56:05+00:00"
-        },
-        {
-            "name": "guzzlehttp/psr7",
-            "version": "1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
-                "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "PSR-7 message implementation",
-            "keywords": [
-                "http",
-                "message",
-                "stream",
-                "uri"
-            ],
-            "time": "2016-06-24T23:00:38+00:00"
-        },
-        {
-            "name": "ircmaxell/password-compat",
-            "version": "v1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ircmaxell/password_compat.git",
-                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
-                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
-                "shasum": ""
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/password.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Anthony Ferrara",
-                    "email": "ircmaxell@php.net",
-                    "homepage": "http://blog.ircmaxell.com"
-                }
-            ],
-            "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
-            "homepage": "https://github.com/ircmaxell/password_compat",
-            "keywords": [
-                "hashing",
-                "password"
-            ],
-            "time": "2014-11-20T16:49:30+00:00"
-        },
-        {
-            "name": "masterminds/html5",
-            "version": "2.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "170aa5cb35b29fccafbf5ea63487c013f396fdc9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/170aa5cb35b29fccafbf5ea63487c013f396fdc9",
-                "reference": "170aa5cb35b29fccafbf5ea63487c013f396fdc9",
-                "shasum": ""
-            },
-            "require": {
-                "ext-libxml": "*",
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*",
-                "sami/sami": "~2.0",
-                "satooshi/php-coveralls": "1.0.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Masterminds\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matt Butcher",
-                    "email": "technosophos@gmail.com"
-                },
-                {
-                    "name": "Asmir Mustafic",
-                    "email": "goetas@gmail.com"
-                },
-                {
-                    "name": "Matt Farina",
-                    "email": "matt@mattfarina.com"
-                }
-            ],
-            "description": "An HTML5 parser and serializer.",
-            "homepage": "http://masterminds.github.io/html5-php",
-            "keywords": [
-                "HTML5",
-                "dom",
-                "html",
-                "parser",
-                "querypath",
-                "serializer",
-                "xml"
-            ],
-            "time": "2016-05-10T14:11:45+00:00"
-        },
-        {
-            "name": "paragonie/random_compat",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a208865a5aeffc2dbbef2a5b3409887272d93f32",
-                "reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*|5.*"
-            },
-            "suggest": {
-                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/random.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com"
-                }
-            ],
-            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-            "keywords": [
-                "csprng",
-                "pseudorandom",
-                "random"
-            ],
-            "time": "2015-12-01T02:52:15+00:00"
-        },
-        {
-            "name": "psr/http-message",
-            "version": "1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
-                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2015-05-04T20:22:00+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "1.0.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/1.0.0",
-                "reference": "1.0.0",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Psr\\Log\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2012-12-21T11:40:51+00:00"
-        },
-        {
-            "name": "stack/builder",
-            "version": "v1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/stackphp/builder.git",
-                "reference": "59fcc9b448a8ce5e338a04c4e2e4aca893e83425"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/stackphp/builder/zipball/59fcc9b448a8ce5e338a04c4e2e4aca893e83425",
-                "reference": "59fcc9b448a8ce5e338a04c4e2e4aca893e83425",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "symfony/http-foundation": "~2.1|~3.0",
-                "symfony/http-kernel": "~2.1|~3.0"
-            },
-            "require-dev": {
-                "silex/silex": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Stack": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch"
-                }
-            ],
-            "description": "Builder for stack middlewares based on HttpKernelInterface.",
-            "keywords": [
-                "stack"
-            ],
-            "time": "2016-06-02T06:58:42+00:00"
-        },
-        {
-            "name": "symfony-cmf/routing",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony-cmf/Routing.git",
-                "reference": "b93704ca098334f56e9b317932f21a4362e620db"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/b93704ca098334f56e9b317932f21a4362e620db",
-                "reference": "b93704ca098334f56e9b317932f21a4362e620db",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.9|^7.0",
-                "psr/log": "1.*",
-                "symfony/http-kernel": "^2.2|3.*",
-                "symfony/routing": "^2.2|3.*"
-            },
-            "require-dev": {
-                "friendsofsymfony/jsrouting-bundle": "^1.1",
-                "symfony-cmf/testing": "^1.3",
-                "symfony/config": "^2.2|3.*",
-                "symfony/dependency-injection": "^2.0.5|3.*",
-                "symfony/event-dispatcher": "^2.1|3.*"
-            },
-            "suggest": {
-                "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version (~2.1)"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Cmf\\Component\\Routing\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony CMF Community",
-                    "homepage": "https://github.com/symfony-cmf/Routing/contributors"
-                }
-            ],
-            "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
-            "homepage": "http://cmf.symfony.com",
-            "keywords": [
-                "database",
-                "routing"
-            ],
-            "time": "2016-03-31T09:11:39+00:00"
-        },
-        {
-            "name": "symfony/class-loader",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/class-loader.git",
-                "reference": "7c46951128f7169cbece2c303fba4a9eb35cbe68"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/7c46951128f7169cbece2c303fba4a9eb35cbe68",
-                "reference": "7c46951128f7169cbece2c303fba4a9eb35cbe68",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-apcu": "~1.1"
-            },
-            "require-dev": {
-                "symfony/finder": "~2.0,>=2.0.5|~3.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\ClassLoader\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony ClassLoader Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-10T14:03:07+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "2e18b8903d9c498ba02e1dfa73f64d4894bb6912"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2e18b8903d9c498ba02e1dfa73f64d4894bb6912",
-                "reference": "2e18b8903d9c498ba02e1dfa73f64d4894bb6912",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/debug": "~2.7,>=2.7.2|~3.0.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1|~3.0.0",
-                "symfony/process": "~2.1|~3.0.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-08T20:43:03+00:00"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "567681e2c4e5431704e884e4be25a95fd900770f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/567681e2c4e5431704e884e4be25a95fd900770f",
-                "reference": "567681e2c4e5431704e884e4be25a95fd900770f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-            },
-            "require-dev": {
-                "symfony/class-loader": "~2.2|~3.0.0",
-                "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Debug Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
-        },
-        {
-            "name": "symfony/dependency-injection",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "b75356611675364607d697f314850d9d870a84aa"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b75356611675364607d697f314850d9d870a84aa",
-                "reference": "b75356611675364607d697f314850d9d870a84aa",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "conflict": {
-                "symfony/expression-language": "<2.6"
-            },
-            "require-dev": {
-                "symfony/config": "~2.2|~3.0.0",
-                "symfony/expression-language": "~2.6|~3.0.0",
-                "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.7"
-            },
-            "suggest": {
-                "symfony/config": "",
-                "symfony/expression-language": "For using expressions in service container configuration",
-                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-                "symfony/yaml": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\DependencyInjection\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony DependencyInjection Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-10T14:27:01+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "74877977f90fb9c3e46378d5764217c55f32df34"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/74877977f90fb9c3e46378d5764217c55f32df34",
-                "reference": "74877977f90fb9c3e46378d5764217c55f32df34",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.0,>=2.0.5|~3.0.0",
-                "symfony/dependency-injection": "~2.6|~3.0.0",
-                "symfony/expression-language": "~2.6|~3.0.0",
-                "symfony/stopwatch": "~2.3|~3.0.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
-        },
-        {
-            "name": "symfony/http-foundation",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "464cdde6757a40701d758112cc7ff2c6adf6e82f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/464cdde6757a40701d758112cc7ff2c6adf6e82f",
-                "reference": "464cdde6757a40701d758112cc7ff2c6adf6e82f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-mbstring": "~1.1",
-                "symfony/polyfill-php54": "~1.0",
-                "symfony/polyfill-php55": "~1.0"
-            },
-            "require-dev": {
-                "symfony/expression-language": "~2.4|~3.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\HttpFoundation\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony HttpFoundation Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-08T20:43:03+00:00"
-        },
-        {
-            "name": "symfony/http-kernel",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "1097eb4ce0a7bdcd030f110c123682fed89a137c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1097eb4ce0a7bdcd030f110c123682fed89a137c",
-                "reference": "1097eb4ce0a7bdcd030f110c123682fed89a137c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "psr/log": "~1.0",
-                "symfony/debug": "~2.6,>=2.6.2",
-                "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0",
-                "symfony/http-foundation": "~2.7.20|~2.8.13|~3.1.6"
-            },
-            "conflict": {
-                "symfony/config": "<2.7"
-            },
-            "require-dev": {
-                "symfony/browser-kit": "~2.3|~3.0.0",
-                "symfony/class-loader": "~2.1|~3.0.0",
-                "symfony/config": "~2.8",
-                "symfony/console": "~2.3|~3.0.0",
-                "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
-                "symfony/dependency-injection": "~2.8|~3.0.0",
-                "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
-                "symfony/expression-language": "~2.4|~3.0.0",
-                "symfony/finder": "~2.0,>=2.0.5|~3.0.0",
-                "symfony/process": "~2.0,>=2.0.5|~3.0.0",
-                "symfony/routing": "~2.8|~3.0.0",
-                "symfony/stopwatch": "~2.3|~3.0.0",
-                "symfony/templating": "~2.2|~3.0.0",
-                "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
-                "symfony/var-dumper": "~2.6|~3.0.0"
-            },
-            "suggest": {
-                "symfony/browser-kit": "",
-                "symfony/class-loader": "",
-                "symfony/config": "",
-                "symfony/console": "",
-                "symfony/dependency-injection": "",
-                "symfony/finder": "",
-                "symfony/var-dumper": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\HttpKernel\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony HttpKernel Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-12T20:27:24+00:00"
-        },
-        {
-            "name": "symfony/polyfill-apcu",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "5d4474f447403c3348e37b70acc2b95475b7befa"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/5d4474f447403c3348e37b70acc2b95475b7befa",
-                "reference": "5d4474f447403c3348e37b70acc2b95475b7befa",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "apcu",
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-11-14T01:06:16+00:00"
-        },
-        {
-            "name": "symfony/polyfill-iconv",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "cba36f3616d9866b3e52662e88da5c090fac1e97"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/cba36f3616d9866b3e52662e88da5c090fac1e97",
-                "reference": "cba36f3616d9866b3e52662e88da5c090fac1e97",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-iconv": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Iconv\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Iconv extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "iconv",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-11-14T01:06:16+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-11-14T01:06:16+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php54",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php54.git",
-                "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/90e085822963fdcc9d1c5b73deb3d2e5783b16a0",
-                "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php54\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-11-14T01:06:16+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php55",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php55.git",
-                "reference": "03e3f0350bca2220e3623a0e340eef194405fc67"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/03e3f0350bca2220e3623a0e340eef194405fc67",
-                "reference": "03e3f0350bca2220e3623a0e340eef194405fc67",
-                "shasum": ""
-            },
-            "require": {
-                "ircmaxell/password-compat": "~1.0",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php55\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-11-14T01:06:16+00:00"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "ebb3c2abe0940a703f08e0cbe373f62d97d40231"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/ebb3c2abe0940a703f08e0cbe373f62d97d40231",
-                "reference": "ebb3c2abe0940a703f08e0cbe373f62d97d40231",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Process Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
-        },
-        {
-            "name": "symfony/psr-http-message-bridge",
-            "version": "v0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/psr-http-message-bridge.git",
-                "reference": "dc7e308e1dc2898a46776e2221a643cb08315453"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/dc7e308e1dc2898a46776e2221a643cb08315453",
-                "reference": "dc7e308e1dc2898a46776e2221a643cb08315453",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "psr/http-message": "~1.0",
-                "symfony/http-foundation": "~2.3|~3.0"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7|~3.0"
-            },
-            "suggest": {
-                "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
-            },
-            "type": "symfony-bridge",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Bridge\\PsrHttpMessage\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "PSR HTTP message bridge",
-            "homepage": "http://symfony.com",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr-7"
-            ],
-            "time": "2015-05-29T17:57:12+00:00"
-        },
-        {
-            "name": "symfony/routing",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/routing.git",
-                "reference": "2a7e3e02bbfb0a4f722e6a3154489e4ac8b3a97f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/2a7e3e02bbfb0a4f722e6a3154489e4ac8b3a97f",
-                "reference": "2a7e3e02bbfb0a4f722e6a3154489e4ac8b3a97f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "conflict": {
-                "symfony/config": "<2.7"
-            },
-            "require-dev": {
-                "doctrine/annotations": "~1.0",
-                "doctrine/common": "~2.2",
-                "psr/log": "~1.0",
-                "symfony/config": "~2.7|~3.0.0",
-                "symfony/expression-language": "~2.4|~3.0.0",
-                "symfony/http-foundation": "~2.3|~3.0.0",
-                "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
-            },
-            "suggest": {
-                "doctrine/annotations": "For using the annotation loader",
-                "symfony/config": "For using the all-in-one router or any loader",
-                "symfony/dependency-injection": "For loading routes from a service",
-                "symfony/expression-language": "For using expression matching",
-                "symfony/http-foundation": "For using a Symfony Request object",
-                "symfony/yaml": "For using the YAML loader"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Routing\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Routing Component",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "router",
-                "routing",
-                "uri",
-                "url"
-            ],
-            "time": "2017-01-02T20:30:24+00:00"
-        },
-        {
-            "name": "symfony/serializer",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/serializer.git",
-                "reference": "3a5337e3daaabb9ada73d60f3271adb6bfa56a1a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/3a5337e3daaabb9ada73d60f3271adb6bfa56a1a",
-                "reference": "3a5337e3daaabb9ada73d60f3271adb6bfa56a1a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-php55": "~1.0"
-            },
-            "require-dev": {
-                "doctrine/annotations": "~1.0",
-                "doctrine/cache": "~1.0",
-                "symfony/config": "~2.2|~3.0.0",
-                "symfony/property-access": "~2.3|~3.0.0",
-                "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
-            },
-            "suggest": {
-                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-                "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
-                "symfony/config": "For using the XML mapping loader.",
-                "symfony/property-access": "For using the ObjectNormalizer.",
-                "symfony/yaml": "For using the default YAML mapping loader."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Serializer\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Serializer Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
-        },
-        {
-            "name": "symfony/translation",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/translation.git",
-                "reference": "b4ac4a393f6970cc157fba17be537380de396a86"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/b4ac4a393f6970cc157fba17be537380de396a86",
-                "reference": "b4ac4a393f6970cc157fba17be537380de396a86",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/config": "<2.7"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.8",
-                "symfony/intl": "~2.4|~3.0.0",
-                "symfony/yaml": "~2.2|~3.0.0"
-            },
-            "suggest": {
-                "psr/log": "To use logging capability in translator",
-                "symfony/config": "",
-                "symfony/yaml": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Translation\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Translation Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
-        },
-        {
-            "name": "symfony/validator",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/validator.git",
-                "reference": "3b1a3188efea75ec7c0419a2568b6e5f82031811"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/3b1a3188efea75ec7c0419a2568b6e5f82031811",
-                "reference": "3b1a3188efea75ec7c0419a2568b6e5f82031811",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/translation": "~2.4|~3.0.0"
-            },
-            "require-dev": {
-                "doctrine/annotations": "~1.0",
-                "doctrine/cache": "~1.0",
-                "egulias/email-validator": "~1.2,>=1.2.1",
-                "symfony/config": "~2.2|~3.0.0",
-                "symfony/expression-language": "~2.4|~3.0.0",
-                "symfony/http-foundation": "~2.3|~3.0.0",
-                "symfony/intl": "~2.7.4|~2.8|~3.0.0",
-                "symfony/property-access": "~2.3|~3.0.0",
-                "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
-            },
-            "suggest": {
-                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-                "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
-                "egulias/email-validator": "Strict (RFC compliant) email validation",
-                "symfony/config": "",
-                "symfony/expression-language": "For using the 2.4 Expression validator",
-                "symfony/http-foundation": "",
-                "symfony/intl": "",
-                "symfony/property-access": "For using the 2.4 Validator API",
-                "symfony/yaml": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Validator\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Validator Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-12T19:24:25+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.8.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2",
-                "reference": "dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-03T13:49:52+00:00"
-        },
-        {
-            "name": "twig/twig",
-            "version": "v1.24.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
-                "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.7"
-            },
-            "require-dev": {
-                "symfony/debug": "~2.7",
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.24-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Twig_": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Armin Ronacher",
-                    "email": "armin.ronacher@active-4.com",
-                    "role": "Project Founder"
-                },
-                {
-                    "name": "Twig Team",
-                    "homepage": "http://twig.sensiolabs.org/contributors",
-                    "role": "Contributors"
-                }
-            ],
-            "description": "Twig, the flexible, fast, and secure template language for PHP",
-            "homepage": "http://twig.sensiolabs.org",
-            "keywords": [
-                "templating"
-            ],
-            "time": "2016-01-25T21:22:18+00:00"
-        },
-        {
-            "name": "wikimedia/composer-merge-plugin",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/wikimedia/composer-merge-plugin.git",
-                "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
-                "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "composer/composer": "1.0.*@dev",
-                "jakub-onderka/php-parallel-lint": "~0.8",
-                "phpunit/phpunit": "~4.8|~5.0",
-                "squizlabs/php_codesniffer": "~2.1.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                },
-                "class": "Wikimedia\\Composer\\MergePlugin"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Wikimedia\\Composer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bryan Davis",
-                    "email": "bd808@wikimedia.org"
-                }
-            ],
-            "description": "Composer plugin to merge multiple composer.json files",
-            "time": "2016-03-08T17:11:37+00:00"
-        },
-        {
-            "name": "zendframework/zend-diactoros",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-diactoros.git",
-                "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/e2f5c12916c74da384058d0dfbc7fbc0b03d1181",
-                "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4",
-                "psr/http-message": "~1.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "~1.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.6",
-                "squizlabs/php_codesniffer": "^2.3.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev",
-                    "dev-develop": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Diactoros\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "description": "PSR HTTP Message implementations",
-            "homepage": "https://github.com/zendframework/zend-diactoros",
-            "keywords": [
-                "http",
-                "psr",
-                "psr-7"
-            ],
-            "time": "2015-08-10T20:04:20+00:00"
-        },
-        {
-            "name": "zendframework/zend-escaper",
-            "version": "2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-escaper.git",
-                "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73",
-                "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Escaper\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://github.com/zendframework/zend-escaper",
-            "keywords": [
-                "escaper",
-                "zf2"
-            ],
-            "time": "2015-06-03T14:05:37+00:00"
-        },
-        {
-            "name": "zendframework/zend-feed",
-            "version": "2.5.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-feed.git",
-                "reference": "0661345b82b51428619e05d3aadd3de65b57fa54"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0661345b82b51428619e05d3aadd3de65b57fa54",
-                "reference": "0661345b82b51428619e05d3aadd3de65b57fa54",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "zendframework/zend-escaper": "~2.5",
-                "zendframework/zend-stdlib": "~2.5"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-cache": "~2.5",
-                "zendframework/zend-db": "~2.5",
-                "zendframework/zend-http": "~2.5",
-                "zendframework/zend-servicemanager": "~2.5",
-                "zendframework/zend-validator": "~2.5"
-            },
-            "suggest": {
-                "zendframework/zend-cache": "Zend\\Cache component",
-                "zendframework/zend-db": "Zend\\Db component",
-                "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
-                "zendframework/zend-validator": "Zend\\Validator component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Feed\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides functionality for consuming RSS and Atom feeds",
-            "homepage": "https://github.com/zendframework/zend-feed",
-            "keywords": [
-                "feed",
-                "zf2"
-            ],
-            "time": "2015-08-04T21:39:18+00:00"
-        },
-        {
-            "name": "zendframework/zend-hydrator",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-hydrator.git",
-                "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/f3ed8b833355140350bbed98d8a7b8b66875903f",
-                "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "zendframework/zend-stdlib": "^2.5.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "^2.0@dev",
-                "zendframework/zend-eventmanager": "^2.5.1",
-                "zendframework/zend-filter": "^2.5.1",
-                "zendframework/zend-inputfilter": "^2.5.1",
-                "zendframework/zend-serializer": "^2.5.1",
-                "zendframework/zend-servicemanager": "^2.5.1"
-            },
-            "suggest": {
-                "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage",
-                "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage",
-                "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy",
-                "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev",
-                    "dev-develop": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Hydrator\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://github.com/zendframework/zend-hydrator",
-            "keywords": [
-                "hydrator",
-                "zf2"
-            ],
-            "time": "2015-09-17T14:06:43+00:00"
-        },
-        {
-            "name": "zendframework/zend-stdlib",
-            "version": "2.7.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-stdlib.git",
-                "reference": "8ac0c77ff567fcf49b58689ee3bfa7595be102bc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8ac0c77ff567fcf49b58689ee3bfa7595be102bc",
-                "reference": "8ac0c77ff567fcf49b58689ee3bfa7595be102bc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "zendframework/zend-hydrator": "~1.0"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1",
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
-                "zendframework/zend-config": "~2.5",
-                "zendframework/zend-eventmanager": "~2.5",
-                "zendframework/zend-filter": "~2.5",
-                "zendframework/zend-inputfilter": "~2.5",
-                "zendframework/zend-serializer": "~2.5",
-                "zendframework/zend-servicemanager": "~2.5"
-            },
-            "suggest": {
-                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-                "zendframework/zend-filter": "To support naming strategy hydrator usage",
-                "zendframework/zend-serializer": "Zend\\Serializer component",
-                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Stdlib\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://github.com/zendframework/zend-stdlib",
-            "keywords": [
-                "stdlib",
-                "zf2"
-            ],
-            "time": "2015-09-25T04:06:33+00:00"
-        }
-    ],
-    "packages-dev": [
         {
             "name": "behat/mink",
             "version": "v1.7.1",
@@ -3149,6 +227,508 @@
             ],
             "time": "2016-03-05T09:04:22+00:00"
         },
+        {
+            "name": "composer/installers",
+            "version": "v1.0.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/installers.git",
+                "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
+                "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
+                "shasum": ""
+            },
+            "replace": {
+                "roundcube/plugin-installer": "*",
+                "shama/baton": "*"
+            },
+            "require-dev": {
+                "composer/composer": "1.0.*@dev",
+                "phpunit/phpunit": "4.1.*"
+            },
+            "type": "composer-installer",
+            "extra": {
+                "class": "Composer\\Installers\\Installer",
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Composer\\Installers\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kyle Robinson Young",
+                    "email": "kyle@dontkry.com",
+                    "homepage": "https://github.com/shama"
+                }
+            ],
+            "description": "A multi-framework Composer library installer",
+            "homepage": "http://composer.github.com/installers/",
+            "keywords": [
+                "Craft",
+                "Dolibarr",
+                "Hurad",
+                "MODX Evo",
+                "OXID",
+                "SMF",
+                "Thelia",
+                "WolfCMS",
+                "agl",
+                "aimeos",
+                "annotatecms",
+                "bitrix",
+                "cakephp",
+                "chef",
+                "codeigniter",
+                "concrete5",
+                "croogo",
+                "dokuwiki",
+                "drupal",
+                "elgg",
+                "fuelphp",
+                "grav",
+                "installer",
+                "joomla",
+                "kohana",
+                "laravel",
+                "lithium",
+                "magento",
+                "mako",
+                "mediawiki",
+                "modulework",
+                "moodle",
+                "phpbb",
+                "piwik",
+                "ppi",
+                "puppet",
+                "roundcube",
+                "shopware",
+                "silverstripe",
+                "symfony",
+                "typo3",
+                "wordpress",
+                "zend",
+                "zikula"
+            ],
+            "time": "2015-02-18T17:17:01+00:00"
+        },
+        {
+            "name": "composer/semver",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/semver.git",
+                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5 || ^5.0.5",
+                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Semver\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
+            "keywords": [
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
+            ],
+            "time": "2016-08-30T16:08:34+00:00"
+        },
+        {
+            "name": "doctrine/annotations",
+            "version": "v1.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/annotations.git",
+                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
+                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "1.*",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "doctrine/cache": "1.*",
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Annotations\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Docblock Annotations Parser",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "parser"
+            ],
+            "time": "2015-08-31T12:32:49+00:00"
+        },
+        {
+            "name": "doctrine/cache",
+            "version": "v1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/cache.git",
+                "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/b6f544a20f4807e81f7044d31e679ccbb1866dc3",
+                "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~5.5|~7.0"
+            },
+            "conflict": {
+                "doctrine/common": ">2.2,<2.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8|~5.0",
+                "predis/predis": "~1.0",
+                "satooshi/php-coveralls": "~0.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Caching library offering an object-oriented API for many cache backends",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "cache",
+                "caching"
+            ],
+            "time": "2016-10-29T11:16:17+00:00"
+        },
+        {
+            "name": "doctrine/collections",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/collections.git",
+                "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
+                "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "~0.1@dev",
+                "phpunit/phpunit": "^5.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Collections\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Collections Abstraction library",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "array",
+                "collections",
+                "iterator"
+            ],
+            "time": "2017-01-03T10:49:41+00:00"
+        },
+        {
+            "name": "doctrine/common",
+            "version": "v2.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/common.git",
+                "reference": "930297026c8009a567ac051fd545bf6124150347"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/930297026c8009a567ac051fd545bf6124150347",
+                "reference": "930297026c8009a567ac051fd545bf6124150347",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "1.*",
+                "doctrine/cache": "1.*",
+                "doctrine/collections": "1.*",
+                "doctrine/inflector": "1.*",
+                "doctrine/lexer": "1.*",
+                "php": "~5.6|~7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\": "lib/Doctrine/Common"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Common Library for Doctrine projects",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "annotations",
+                "collections",
+                "eventmanager",
+                "persistence",
+                "spl"
+            ],
+            "time": "2017-01-13T14:02:13+00:00"
+        },
+        {
+            "name": "doctrine/inflector",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/inflector.git",
+                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
+                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Inflector\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Common String Manipulations with regard to casing and singular/plural rules.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "inflection",
+                "pluralize",
+                "singularize",
+                "string"
+            ],
+            "time": "2015-11-06T14:35:42+00:00"
+        },
         {
             "name": "doctrine/instantiator",
             "version": "1.0.5",
@@ -3203,6 +783,397 @@
             ],
             "time": "2015-06-14T21:17:01+00:00"
         },
+        {
+            "name": "doctrine/lexer",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Lexer\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "lexer",
+                "parser"
+            ],
+            "time": "2014-09-09T13:34:57+00:00"
+        },
+        {
+            "name": "drupal-composer/drupal-scaffold",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/drupal-composer/drupal-scaffold.git",
+                "reference": "3ad465ac853c2e52e6a808f5529859917662c256"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/drupal-composer/drupal-scaffold/zipball/3ad465ac853c2e52e6a808f5529859917662c256",
+                "reference": "3ad465ac853c2e52e6a808f5529859917662c256",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0.0",
+                "php": ">=5.4.5"
+            },
+            "require-dev": {
+                "composer/composer": "dev-master",
+                "phpunit/phpunit": "^4.4.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "DrupalComposer\\DrupalScaffold\\Plugin",
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "DrupalComposer\\DrupalScaffold\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core",
+            "time": "2016-11-05T10:46:44+00:00"
+        },
+        {
+            "name": "drupal/core",
+            "version": "8.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/drupal-composer/drupal-core.git",
+                "reference": "e503a252ec5c2811abed6af0c7b70afda8e93a3f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/drupal-composer/drupal-core/zipball/e503a252ec5c2811abed6af0c7b70afda8e93a3f",
+                "reference": "e503a252ec5c2811abed6af0c7b70afda8e93a3f",
+                "shasum": ""
+            },
+            "require": {
+                "asm89/stack-cors": "~1.0",
+                "composer/semver": "~1.0",
+                "doctrine/annotations": "1.2.*",
+                "doctrine/common": "^2.5",
+                "easyrdf/easyrdf": "0.9.*",
+                "egulias/email-validator": "1.2.*",
+                "guzzlehttp/guzzle": "^6.2.1",
+                "masterminds/html5": "~2.1",
+                "paragonie/random_compat": "^1.0|^2.0",
+                "php": ">=5.5.9",
+                "stack/builder": "1.0.*",
+                "symfony-cmf/routing": "~1.4",
+                "symfony/class-loader": "~2.8",
+                "symfony/console": "~2.8",
+                "symfony/dependency-injection": "~2.8",
+                "symfony/event-dispatcher": "~2.8",
+                "symfony/http-foundation": "~2.8",
+                "symfony/http-kernel": "~2.8",
+                "symfony/polyfill-iconv": "~1.0",
+                "symfony/process": "~2.8",
+                "symfony/psr-http-message-bridge": "^1.0",
+                "symfony/routing": "~2.8",
+                "symfony/serializer": "~2.8",
+                "symfony/translation": "~2.8",
+                "symfony/validator": "~2.8",
+                "symfony/yaml": "~2.8",
+                "twig/twig": "^1.23.1",
+                "zendframework/zend-diactoros": "~1.1",
+                "zendframework/zend-feed": "~2.4"
+            },
+            "replace": {
+                "drupal/action": "self.version",
+                "drupal/aggregator": "self.version",
+                "drupal/automated_cron": "self.version",
+                "drupal/ban": "self.version",
+                "drupal/bartik": "self.version",
+                "drupal/basic_auth": "self.version",
+                "drupal/big_pipe": "self.version",
+                "drupal/block": "self.version",
+                "drupal/block_content": "self.version",
+                "drupal/block_place": "self.version",
+                "drupal/book": "self.version",
+                "drupal/breakpoint": "self.version",
+                "drupal/ckeditor": "self.version",
+                "drupal/classy": "self.version",
+                "drupal/color": "self.version",
+                "drupal/comment": "self.version",
+                "drupal/config": "self.version",
+                "drupal/config_translation": "self.version",
+                "drupal/contact": "self.version",
+                "drupal/content_moderation": "self.version",
+                "drupal/content_translation": "self.version",
+                "drupal/contextual": "self.version",
+                "drupal/core-annotation": "self.version",
+                "drupal/core-assertion": "self.version",
+                "drupal/core-bridge": "self.version",
+                "drupal/core-datetime": "self.version",
+                "drupal/core-dependency-injection": "self.version",
+                "drupal/core-diff": "self.version",
+                "drupal/core-discovery": "self.version",
+                "drupal/core-event-dispatcher": "self.version",
+                "drupal/core-file-cache": "self.version",
+                "drupal/core-filesystem": "self.version",
+                "drupal/core-gettext": "self.version",
+                "drupal/core-graph": "self.version",
+                "drupal/core-http-foundation": "self.version",
+                "drupal/core-php-storage": "self.version",
+                "drupal/core-plugin": "self.version",
+                "drupal/core-proxy-builder": "self.version",
+                "drupal/core-render": "self.version",
+                "drupal/core-serialization": "self.version",
+                "drupal/core-transliteration": "self.version",
+                "drupal/core-utility": "self.version",
+                "drupal/core-uuid": "self.version",
+                "drupal/datetime": "self.version",
+                "drupal/datetime_range": "self.version",
+                "drupal/dblog": "self.version",
+                "drupal/dynamic_page_cache": "self.version",
+                "drupal/editor": "self.version",
+                "drupal/entity_reference": "self.version",
+                "drupal/field": "self.version",
+                "drupal/field_layout": "self.version",
+                "drupal/field_ui": "self.version",
+                "drupal/file": "self.version",
+                "drupal/filter": "self.version",
+                "drupal/forum": "self.version",
+                "drupal/hal": "self.version",
+                "drupal/help": "self.version",
+                "drupal/history": "self.version",
+                "drupal/image": "self.version",
+                "drupal/inline_form_errors": "self.version",
+                "drupal/language": "self.version",
+                "drupal/layout_discovery": "self.version",
+                "drupal/link": "self.version",
+                "drupal/locale": "self.version",
+                "drupal/menu_link_content": "self.version",
+                "drupal/menu_ui": "self.version",
+                "drupal/migrate": "self.version",
+                "drupal/migrate_drupal": "self.version",
+                "drupal/migrate_drupal_ui": "self.version",
+                "drupal/minimal": "self.version",
+                "drupal/node": "self.version",
+                "drupal/options": "self.version",
+                "drupal/outside_in": "self.version",
+                "drupal/page_cache": "self.version",
+                "drupal/path": "self.version",
+                "drupal/quickedit": "self.version",
+                "drupal/rdf": "self.version",
+                "drupal/responsive_image": "self.version",
+                "drupal/rest": "self.version",
+                "drupal/search": "self.version",
+                "drupal/serialization": "self.version",
+                "drupal/seven": "self.version",
+                "drupal/shortcut": "self.version",
+                "drupal/simpletest": "self.version",
+                "drupal/standard": "self.version",
+                "drupal/stark": "self.version",
+                "drupal/statistics": "self.version",
+                "drupal/syslog": "self.version",
+                "drupal/system": "self.version",
+                "drupal/taxonomy": "self.version",
+                "drupal/telephone": "self.version",
+                "drupal/text": "self.version",
+                "drupal/toolbar": "self.version",
+                "drupal/tour": "self.version",
+                "drupal/tracker": "self.version",
+                "drupal/update": "self.version",
+                "drupal/user": "self.version",
+                "drupal/views": "self.version",
+                "drupal/views_ui": "self.version",
+                "drupal/workflows": "self.version"
+            },
+            "require-dev": {
+                "behat/mink": "1.7.x-dev",
+                "behat/mink-goutte-driver": "~1.2",
+                "drupal/coder": "8.2.12",
+                "jcalderonzumba/gastonjs": "~1.0.2",
+                "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
+                "mikey179/vfsstream": "~1.2",
+                "phpunit/phpunit": ">=4.8.28 <5",
+                "symfony/browser-kit": ">=2.8.13 <3.0",
+                "symfony/css-selector": "~2.8"
+            },
+            "type": "drupal-core",
+            "autoload": {
+                "psr-4": {
+                    "Drupal\\Core\\": "lib/Drupal/Core",
+                    "Drupal\\Component\\": "lib/Drupal/Component",
+                    "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
+                },
+                "classmap": [
+                    "lib/Drupal.php",
+                    "lib/Drupal/Component/Utility/Timer.php",
+                    "lib/Drupal/Component/Utility/Unicode.php",
+                    "lib/Drupal/Core/Database/Database.php",
+                    "lib/Drupal/Core/DrupalKernel.php",
+                    "lib/Drupal/Core/DrupalKernelInterface.php",
+                    "lib/Drupal/Core/Site/Settings.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "description": "Drupal is an open source content management platform powering millions of websites and applications.",
+            "time": "2017-04-06T00:12:44+00:00"
+        },
+        {
+            "name": "easyrdf/easyrdf",
+            "version": "0.9.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/njh/easyrdf.git",
+                "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/njh/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566",
+                "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-pcre": "*",
+                "php": ">=5.2.8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.5",
+                "sami/sami": "~1.4",
+                "squizlabs/php_codesniffer": "~1.4.3"
+            },
+            "suggest": {
+                "ml/json-ld": "~1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "EasyRdf_": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nicholas Humfrey",
+                    "email": "njh@aelius.com",
+                    "homepage": "http://www.aelius.com/njh/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Alexey Zakhlestin",
+                    "email": "indeyets@gmail.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.",
+            "homepage": "http://www.easyrdf.org/",
+            "keywords": [
+                "Linked Data",
+                "RDF",
+                "Semantic Web",
+                "Turtle",
+                "rdfa",
+                "sparql"
+            ],
+            "time": "2015-02-27T09:45:49+00:00"
+        },
+        {
+            "name": "egulias/email-validator",
+            "version": "1.2.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/egulias/EmailValidator.git",
+                "reference": "5642614492f0ca2064c01d60cc33284cc2f731a9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/5642614492f0ca2064c01d60cc33284cc2f731a9",
+                "reference": "5642614492f0ca2064c01d60cc33284cc2f731a9",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "^1.0.1",
+                "php": ">= 5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Egulias\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eduardo Gulias Davis"
+                }
+            ],
+            "description": "A library for validating emails",
+            "homepage": "https://github.com/egulias/EmailValidator",
+            "keywords": [
+                "email",
+                "emailvalidation",
+                "emailvalidator",
+                "validation",
+                "validator"
+            ],
+            "time": "2017-02-03T22:48:59+00:00"
+        },
         {
             "name": "fabpot/goutte",
             "version": "v3.1.2",
@@ -3252,6 +1223,226 @@
             ],
             "time": "2015-11-05T12:58:44+00:00"
         },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006",
+                "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.4",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.0",
+                "psr/log": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.2-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2017-02-28T22:50:30+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-12-20T10:07:11+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "time": "2017-03-20T17:10:46+00:00"
+        },
+        {
+            "name": "ircmaxell/password-compat",
+            "version": "v1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ircmaxell/password_compat.git",
+                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
+                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/password.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anthony Ferrara",
+                    "email": "ircmaxell@php.net",
+                    "homepage": "http://blog.ircmaxell.com"
+                }
+            ],
+            "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
+            "homepage": "https://github.com/ircmaxell/password_compat",
+            "keywords": [
+                "hashing",
+                "password"
+            ],
+            "time": "2014-11-20T16:49:30+00:00"
+        },
         {
             "name": "jcalderonzumba/gastonjs",
             "version": "v1.0.2",
@@ -3370,6 +1561,71 @@
             ],
             "time": "2015-12-04T13:55:02+00:00"
         },
+        {
+            "name": "masterminds/html5",
+            "version": "2.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Masterminds/html5-php.git",
+                "reference": "7866e93dcf0245de22378414e0c2c7350abc45af"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/7866e93dcf0245de22378414e0c2c7350abc45af",
+                "reference": "7866e93dcf0245de22378414e0c2c7350abc45af",
+                "shasum": ""
+            },
+            "require": {
+                "ext-libxml": "*",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*",
+                "sami/sami": "~2.0",
+                "satooshi/php-coveralls": "1.0.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Masterminds\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Matt Butcher",
+                    "email": "technosophos@gmail.com"
+                },
+                {
+                    "name": "Asmir Mustafic",
+                    "email": "goetas@gmail.com"
+                },
+                {
+                    "name": "Matt Farina",
+                    "email": "matt@mattfarina.com"
+                }
+            ],
+            "description": "An HTML5 parser and serializer.",
+            "homepage": "http://masterminds.github.io/html5-php",
+            "keywords": [
+                "HTML5",
+                "dom",
+                "html",
+                "parser",
+                "querypath",
+                "serializer",
+                "xml"
+            ],
+            "time": "2016-09-22T11:01:11+00:00"
+        },
         {
             "name": "mikey179/vfsStream",
             "version": "v1.6.0",
@@ -3416,6 +1672,54 @@
             "homepage": "http://vfs.bovigo.org/",
             "time": "2015-10-06T16:59:57+00:00"
         },
+        {
+            "name": "paragonie/random_compat",
+            "version": "v2.0.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+                "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/random.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "pseudorandom",
+                "random"
+            ],
+            "time": "2017-03-13T16:27:32+00:00"
+        },
         {
             "name": "phpdocumentor/reflection-docblock",
             "version": "2.0.4",
@@ -3893,6 +2197,103 @@
             ],
             "time": "2015-10-02T06:51:40+00:00"
         },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06T14:39:51+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2016-10-10T12:19:37+00:00"
+        },
         {
             "name": "sebastian/comparator",
             "version": "1.2.0",
@@ -4264,6 +2665,114 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "time": "2015-06-21T13:59:46+00:00"
         },
+        {
+            "name": "stack/builder",
+            "version": "v1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/stackphp/builder.git",
+                "reference": "59fcc9b448a8ce5e338a04c4e2e4aca893e83425"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/stackphp/builder/zipball/59fcc9b448a8ce5e338a04c4e2e4aca893e83425",
+                "reference": "59fcc9b448a8ce5e338a04c4e2e4aca893e83425",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "symfony/http-foundation": "~2.1|~3.0",
+                "symfony/http-kernel": "~2.1|~3.0"
+            },
+            "require-dev": {
+                "silex/silex": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Stack": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                }
+            ],
+            "description": "Builder for stack middlewares based on HttpKernelInterface.",
+            "keywords": [
+                "stack"
+            ],
+            "time": "2016-06-02T06:58:42+00:00"
+        },
+        {
+            "name": "symfony-cmf/routing",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony-cmf/Routing.git",
+                "reference": "b93704ca098334f56e9b317932f21a4362e620db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/b93704ca098334f56e9b317932f21a4362e620db",
+                "reference": "b93704ca098334f56e9b317932f21a4362e620db",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.9|^7.0",
+                "psr/log": "1.*",
+                "symfony/http-kernel": "^2.2|3.*",
+                "symfony/routing": "^2.2|3.*"
+            },
+            "require-dev": {
+                "friendsofsymfony/jsrouting-bundle": "^1.1",
+                "symfony-cmf/testing": "^1.3",
+                "symfony/config": "^2.2|3.*",
+                "symfony/dependency-injection": "^2.0.5|3.*",
+                "symfony/event-dispatcher": "^2.1|3.*"
+            },
+            "suggest": {
+                "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version (~2.1)"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Cmf\\Component\\Routing\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony CMF Community",
+                    "homepage": "https://github.com/symfony-cmf/Routing/contributors"
+                }
+            ],
+            "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
+            "homepage": "http://cmf.symfony.com",
+            "keywords": [
+                "database",
+                "routing"
+            ],
+            "time": "2016-03-31T09:11:39+00:00"
+        },
         {
             "name": "symfony/browser-kit",
             "version": "v2.8.16",
@@ -4321,6 +2830,120 @@
             "homepage": "https://symfony.com",
             "time": "2017-01-02T20:30:24+00:00"
         },
+        {
+            "name": "symfony/class-loader",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/class-loader.git",
+                "reference": "2c8de07a8a4cc4da9c018ab7a81888b80e762f93"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/2c8de07a8a4cc4da9c018ab7a81888b80e762f93",
+                "reference": "2c8de07a8a4cc4da9c018ab7a81888b80e762f93",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-apcu": "~1.1"
+            },
+            "require-dev": {
+                "symfony/finder": "^2.0.5|~3.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\ClassLoader\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony ClassLoader Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-18T19:13:35+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "86407ff20855a5eaa2a7219bd815e9c40a88633e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/86407ff20855a5eaa2a7219bd815e9c40a88633e",
+                "reference": "86407ff20855a5eaa2a7219bd815e9c40a88633e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/debug": "^2.7.2|~3.0.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1|~3.0.0",
+                "symfony/process": "~2.1|~3.0.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-04-03T20:37:06+00:00"
+        },
         {
             "name": "symfony/css-selector",
             "version": "v2.8.16",
@@ -4375,25 +2998,145 @@
             "time": "2017-01-02T20:30:24+00:00"
         },
         {
-            "name": "symfony/dom-crawler",
-            "version": "v2.8.16",
+            "name": "symfony/debug",
+            "version": "v2.8.19",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "52cc211afa9458c0a54c478010a55f44892c1c02"
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "e90099a2958d4833a02d05b504cc06e1c234abcc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/52cc211afa9458c0a54c478010a55f44892c1c02",
-                "reference": "52cc211afa9458c0a54c478010a55f44892c1c02",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/e90099a2958d4833a02d05b504cc06e1c234abcc",
+                "reference": "e90099a2958d4833a02d05b504cc06e1c234abcc",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.9",
+                "psr/log": "~1.0"
+            },
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+            },
+            "require-dev": {
+                "symfony/class-loader": "~2.2|~3.0.0",
+                "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Debug\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Debug Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-18T19:13:35+00:00"
+        },
+        {
+            "name": "symfony/dependency-injection",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dependency-injection.git",
+                "reference": "14b9d8ae69ac4c74e8f05fee7e0a57039b99c81e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/14b9d8ae69ac4c74e8f05fee7e0a57039b99c81e",
+                "reference": "14b9d8ae69ac4c74e8f05fee7e0a57039b99c81e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "conflict": {
+                "symfony/expression-language": "<2.6"
+            },
+            "require-dev": {
+                "symfony/config": "~2.2|~3.0.0",
+                "symfony/expression-language": "~2.6|~3.0.0",
+                "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.7"
+            },
+            "suggest": {
+                "symfony/config": "",
+                "symfony/expression-language": "For using expressions in service container configuration",
+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\DependencyInjection\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony DependencyInjection Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-04-03T22:14:48+00:00"
+        },
+        {
+            "name": "symfony/dom-crawler",
+            "version": "v3.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dom-crawler.git",
+                "reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/dff8fecf1f56990d88058e3a1885c2a5f1b8e970",
+                "reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0.0"
+                "symfony/css-selector": "~2.8|~3.0"
             },
             "suggest": {
                 "symfony/css-selector": ""
@@ -4401,7 +3144,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -4428,9 +3171,1239 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:30:24+00:00"
+            "time": "2016-07-30T07:22:48+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "88b65f0ac25355090e524aba4ceb066025df8bd2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/88b65f0ac25355090e524aba4ceb066025df8bd2",
+                "reference": "88b65f0ac25355090e524aba4ceb066025df8bd2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "^2.0.5|~3.0.0",
+                "symfony/dependency-injection": "~2.6|~3.0.0",
+                "symfony/expression-language": "~2.6|~3.0.0",
+                "symfony/stopwatch": "~2.3|~3.0.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-04-03T20:37:06+00:00"
+        },
+        {
+            "name": "symfony/http-foundation",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-foundation.git",
+                "reference": "0717efd2f2264dbd3d8e1bc69a0418c2fd6295d2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0717efd2f2264dbd3d8e1bc69a0418c2fd6295d2",
+                "reference": "0717efd2f2264dbd3d8e1bc69a0418c2fd6295d2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php54": "~1.0",
+                "symfony/polyfill-php55": "~1.0"
+            },
+            "require-dev": {
+                "symfony/expression-language": "~2.4|~3.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\HttpFoundation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony HttpFoundation Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-04-04T15:24:26+00:00"
+        },
+        {
+            "name": "symfony/http-kernel",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-kernel.git",
+                "reference": "3256e9e554f02ba2dd49cff253f15df69c36cf40"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3256e9e554f02ba2dd49cff253f15df69c36cf40",
+                "reference": "3256e9e554f02ba2dd49cff253f15df69c36cf40",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "psr/log": "~1.0",
+                "symfony/debug": "^2.6.2",
+                "symfony/event-dispatcher": "^2.6.7|~3.0.0",
+                "symfony/http-foundation": "~2.7.20|~2.8.13|~3.1.6"
+            },
+            "conflict": {
+                "symfony/config": "<2.7"
+            },
+            "require-dev": {
+                "symfony/browser-kit": "~2.3|~3.0.0",
+                "symfony/class-loader": "~2.1|~3.0.0",
+                "symfony/config": "~2.8",
+                "symfony/console": "~2.3|~3.0.0",
+                "symfony/css-selector": "^2.0.5|~3.0.0",
+                "symfony/dependency-injection": "~2.8|~3.0.0",
+                "symfony/dom-crawler": "^2.0.5|~3.0.0",
+                "symfony/expression-language": "~2.4|~3.0.0",
+                "symfony/finder": "^2.0.5|~3.0.0",
+                "symfony/process": "^2.0.5|~3.0.0",
+                "symfony/routing": "~2.8|~3.0.0",
+                "symfony/stopwatch": "~2.3|~3.0.0",
+                "symfony/templating": "~2.2|~3.0.0",
+                "symfony/translation": "^2.0.5|~3.0.0",
+                "symfony/var-dumper": "~2.6|~3.0.0"
+            },
+            "suggest": {
+                "symfony/browser-kit": "",
+                "symfony/class-loader": "",
+                "symfony/config": "",
+                "symfony/console": "",
+                "symfony/dependency-injection": "",
+                "symfony/finder": "",
+                "symfony/var-dumper": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\HttpKernel\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony HttpKernel Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-04-05T04:04:34+00:00"
+        },
+        {
+            "name": "symfony/polyfill-apcu",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-apcu.git",
+                "reference": "5d4474f447403c3348e37b70acc2b95475b7befa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/5d4474f447403c3348e37b70acc2b95475b7befa",
+                "reference": "5d4474f447403c3348e37b70acc2b95475b7befa",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "apcu",
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-11-14T01:06:16+00:00"
+        },
+        {
+            "name": "symfony/polyfill-iconv",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-iconv.git",
+                "reference": "cba36f3616d9866b3e52662e88da5c090fac1e97"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/cba36f3616d9866b3e52662e88da5c090fac1e97",
+                "reference": "cba36f3616d9866b3e52662e88da5c090fac1e97",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-iconv": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Iconv\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Iconv extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "iconv",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-11-14T01:06:16+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-11-14T01:06:16+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php54",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php54.git",
+                "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/90e085822963fdcc9d1c5b73deb3d2e5783b16a0",
+                "reference": "90e085822963fdcc9d1c5b73deb3d2e5783b16a0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php54\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-11-14T01:06:16+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php55",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php55.git",
+                "reference": "03e3f0350bca2220e3623a0e340eef194405fc67"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/03e3f0350bca2220e3623a0e340eef194405fc67",
+                "reference": "03e3f0350bca2220e3623a0e340eef194405fc67",
+                "shasum": ""
+            },
+            "require": {
+                "ircmaxell/password-compat": "~1.0",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php55\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-11-14T01:06:16+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "41336b20b52f5fd5b42a227e394e673c8071118f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/41336b20b52f5fd5b42a227e394e673c8071118f",
+                "reference": "41336b20b52f5fd5b42a227e394e673c8071118f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-04T12:20:59+00:00"
+        },
+        {
+            "name": "symfony/psr-http-message-bridge",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/psr-http-message-bridge.git",
+                "reference": "66085f246d3893cbdbcec5f5ad15ac60546cf0de"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/66085f246d3893cbdbcec5f5ad15ac60546cf0de",
+                "reference": "66085f246d3893cbdbcec5f5ad15ac60546cf0de",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "psr/http-message": "~1.0",
+                "symfony/http-foundation": "~2.3|~3.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7|~3.0"
+            },
+            "suggest": {
+                "psr/http-message-implementation": "To use the HttpFoundation factory",
+                "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
+            },
+            "type": "symfony-bridge",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Bridge\\PsrHttpMessage\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "PSR HTTP message bridge",
+            "homepage": "http://symfony.com",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr-7"
+            ],
+            "time": "2016-09-14T18:37:20+00:00"
+        },
+        {
+            "name": "symfony/routing",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/routing.git",
+                "reference": "d145cd396f702c497cb24b21785ddac90a23fe71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/d145cd396f702c497cb24b21785ddac90a23fe71",
+                "reference": "d145cd396f702c497cb24b21785ddac90a23fe71",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "conflict": {
+                "symfony/config": "<2.7"
+            },
+            "require-dev": {
+                "doctrine/annotations": "~1.0",
+                "doctrine/common": "~2.2",
+                "psr/log": "~1.0",
+                "symfony/config": "~2.7|~3.0.0",
+                "symfony/expression-language": "~2.4|~3.0.0",
+                "symfony/http-foundation": "~2.3|~3.0.0",
+                "symfony/yaml": "^2.0.5|~3.0.0"
+            },
+            "suggest": {
+                "doctrine/annotations": "For using the annotation loader",
+                "symfony/config": "For using the all-in-one router or any loader",
+                "symfony/dependency-injection": "For loading routes from a service",
+                "symfony/expression-language": "For using expression matching",
+                "symfony/http-foundation": "For using a Symfony Request object",
+                "symfony/yaml": "For using the YAML loader"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Routing\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Routing Component",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "router",
+                "routing",
+                "uri",
+                "url"
+            ],
+            "time": "2017-03-02T15:56:34+00:00"
+        },
+        {
+            "name": "symfony/serializer",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/serializer.git",
+                "reference": "d1c3d68daee29bbf0b4600745899a7000c215642"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/d1c3d68daee29bbf0b4600745899a7000c215642",
+                "reference": "d1c3d68daee29bbf0b4600745899a7000c215642",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-php55": "~1.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "~1.0",
+                "doctrine/cache": "~1.0",
+                "symfony/config": "~2.2|~3.0.0",
+                "symfony/property-access": "~2.3|~3.0.0",
+                "symfony/yaml": "^2.0.5|~3.0.0"
+            },
+            "suggest": {
+                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+                "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+                "symfony/config": "For using the XML mapping loader.",
+                "symfony/property-access": "For using the ObjectNormalizer.",
+                "symfony/yaml": "For using the default YAML mapping loader."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Serializer\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Serializer Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-21T22:47:17+00:00"
+        },
+        {
+            "name": "symfony/translation",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/translation.git",
+                "reference": "047e97a64d609778cadfc76e3a09793696bb19f1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/047e97a64d609778cadfc76e3a09793696bb19f1",
+                "reference": "047e97a64d609778cadfc76e3a09793696bb19f1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/config": "<2.7"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.8",
+                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
+                "symfony/yaml": "~2.2|~3.0.0"
+            },
+            "suggest": {
+                "psr/log": "To use logging capability in translator",
+                "symfony/config": "",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Translation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Translation Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-21T21:39:01+00:00"
+        },
+        {
+            "name": "symfony/validator",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/validator.git",
+                "reference": "43f617ee200af4f4dedbb0782c6c689e06994286"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/43f617ee200af4f4dedbb0782c6c689e06994286",
+                "reference": "43f617ee200af4f4dedbb0782c6c689e06994286",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/translation": "~2.4|~3.0.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "~1.0",
+                "doctrine/cache": "~1.0",
+                "egulias/email-validator": "^1.2.1",
+                "symfony/config": "~2.2|~3.0.0",
+                "symfony/expression-language": "~2.4|~3.0.0",
+                "symfony/http-foundation": "~2.3|~3.0.0",
+                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
+                "symfony/property-access": "~2.3|~3.0.0",
+                "symfony/yaml": "^2.0.5|~3.0.0"
+            },
+            "suggest": {
+                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+                "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+                "egulias/email-validator": "Strict (RFC compliant) email validation",
+                "symfony/config": "",
+                "symfony/expression-language": "For using the 2.4 Expression validator",
+                "symfony/http-foundation": "",
+                "symfony/intl": "",
+                "symfony/property-access": "For using the 2.4 Validator API",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Validator\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Validator Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-23T16:08:03+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.8.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "286d84891690b0e2515874717e49360d1c98a703"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/286d84891690b0e2515874717e49360d1c98a703",
+                "reference": "286d84891690b0e2515874717e49360d1c98a703",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-20T09:41:44+00:00"
+        },
+        {
+            "name": "twig/twig",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a",
+                "reference": "05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.7"
+            },
+            "require-dev": {
+                "psr/container": "^1.0",
+                "symfony/debug": "~2.7",
+                "symfony/phpunit-bridge": "~3.3@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.33-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Twig_": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Twig Team",
+                    "homepage": "http://twig.sensiolabs.org/contributors",
+                    "role": "Contributors"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "http://twig.sensiolabs.org",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2017-03-22T15:40:09+00:00"
+        },
+        {
+            "name": "wikimedia/composer-merge-plugin",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/wikimedia/composer-merge-plugin.git",
+                "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
+                "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "composer/composer": "1.0.*@dev",
+                "jakub-onderka/php-parallel-lint": "~0.8",
+                "phpunit/phpunit": "~4.8|~5.0",
+                "squizlabs/php_codesniffer": "~2.1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                },
+                "class": "Wikimedia\\Composer\\MergePlugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Wikimedia\\Composer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bryan Davis",
+                    "email": "bd808@wikimedia.org"
+                }
+            ],
+            "description": "Composer plugin to merge multiple composer.json files",
+            "time": "2016-03-08T17:11:37+00:00"
+        },
+        {
+            "name": "zendframework/zend-diactoros",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-diactoros.git",
+                "reference": "b03f285a333f51e58c95cce54109a4a9ed691436"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/b03f285a333f51e58c95cce54109a4a9ed691436",
+                "reference": "b03f285a333f51e58c95cce54109a4a9ed691436",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.4 || ^7.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "phpunit/phpunit": "^4.6 || ^5.5",
+                "zendframework/zend-coding-standard": "~1.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev",
+                    "dev-develop": "1.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Diactoros\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "description": "PSR HTTP Message implementations",
+            "homepage": "https://github.com/zendframework/zend-diactoros",
+            "keywords": [
+                "http",
+                "psr",
+                "psr-7"
+            ],
+            "time": "2017-04-06T16:18:34+00:00"
+        },
+        {
+            "name": "zendframework/zend-escaper",
+            "version": "2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-escaper.git",
+                "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+                "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Escaper\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-escaper",
+            "keywords": [
+                "escaper",
+                "zf2"
+            ],
+            "time": "2016-06-30T19:48:38+00:00"
+        },
+        {
+            "name": "zendframework/zend-feed",
+            "version": "2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-feed.git",
+                "reference": "94579e805dd108683209fe14b3b5d4276de3de6e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/94579e805dd108683209fe14b3b5d4276de3de6e",
+                "reference": "94579e805dd108683209fe14b3b5d4276de3de6e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "zendframework/zend-escaper": "^2.5",
+                "zendframework/zend-stdlib": "^2.7 || ^3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+                "psr/http-message": "^1.0",
+                "zendframework/zend-cache": "^2.6",
+                "zendframework/zend-coding-standard": "~1.0.0",
+                "zendframework/zend-db": "^2.7",
+                "zendframework/zend-http": "^2.5.4",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-validator": "^2.6"
+            },
+            "suggest": {
+                "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
+                "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
+                "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
+                "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
+                "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries ehen using the Writer subcomponent"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev",
+                    "dev-develop": "2.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Feed\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides functionality for consuming RSS and Atom feeds",
+            "homepage": "https://github.com/zendframework/zend-feed",
+            "keywords": [
+                "feed",
+                "zf2"
+            ],
+            "time": "2017-04-01T15:03:14+00:00"
+        },
+        {
+            "name": "zendframework/zend-stdlib",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-stdlib.git",
+                "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78",
+                "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "^2.6.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev",
+                    "dev-develop": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Stdlib\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-stdlib",
+            "keywords": [
+                "stdlib",
+                "zf2"
+            ],
+            "time": "2016-09-13T14:38:50+00:00"
         }
     ],
+    "packages-dev": [],
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
@@ -4438,8 +4411,6 @@
     },
     "prefer-stable": true,
     "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.5.9"
-    },
+    "platform": [],
     "platform-dev": []
 }
diff --git a/web/core/.eslintignore b/web/core/.eslintignore
new file mode 100644
index 000000000..a15282a9a
--- /dev/null
+++ b/web/core/.eslintignore
@@ -0,0 +1,4 @@
+assets/vendor/**/*
+modules/locale/tests/locale_test.js
+node_modules/**/*
+**/js_test_files/**/*
diff --git a/web/core/.eslintrc b/web/core/.eslintrc.json
similarity index 98%
rename from web/core/.eslintrc
rename to web/core/.eslintrc.json
index 9b34952fd..218d84f93 100644
--- a/web/core/.eslintrc
+++ b/web/core/.eslintrc.json
@@ -1,7 +1,9 @@
 {
   "extends": "eslint:recommended",
   "env": {
-    "browser": true
+    "browser": true,
+    "es6": true,
+    "node": true
   },
   "globals": {
     "Drupal": true,
diff --git a/web/core/CHANGELOG.txt b/web/core/CHANGELOG.txt
index 853260ae9..10e824f9e 100644
--- a/web/core/CHANGELOG.txt
+++ b/web/core/CHANGELOG.txt
@@ -1,10 +1,113 @@
-Drupal 8.2.7, 2017-03-15
+Drupal 8.3.0, 2017-04-05
 ------------------------
-- Fixed security issues. See SA-CORE-2017-001.
-
-Drupal 8.2.3, 2016-11-16
-------------------------
-- Fixed security issues. See SA-CORE-2016-005.
+- Added modules:
+    * Added the Workflows module (experimental) which abstracts transitions and
+      states from Content Moderation into a separate component for reuse by
+      other modules implementing non-publishing workflows.
+    * Added the Layout Discovery module (experimental) which provides an API for
+      modules or themes to register layouts.
+    * Added the Field Layout module (experimental) which provides the ability
+      for site builders to rearrange fields on content types, block types, etc.
+      into new regions, for both the form and display, on the same forms
+      provided by the normal field user interface.
+- Updated vendor libraries:
+    * Updated to Twig 1.25.
+    * Updated to jQuery 2.2.4.
+    * Updated to CKEditor 4.6.2 (with new Moono-Lisa skin).
+    * Updated Symfony components to 2.8.18.
+    * Updated PHPUnit to 4.8.35.
+    * Applied patch-level updates to the latest versions for all dependencies
+      wherever possible. Minor updates applied for Symfony PSR-7 Bridge and
+      Zend Stdlib, which Drupal does not depend on directly.
+- Browser support:
+    * Advance notice: Internet Explore 9 and 10 will no longer supported from
+      8.4.x, scheduled for October 2017. Microsoft has now ended support for
+      these browsers. Drupal will still support Internet Explorer 11 and its
+      replacement, Edge.
+- Raised stability levels of experimental modules:
+    * Updated the BigPipe module from beta to stable.
+    * Updated the Migrate module from alpha to beta.
+    * See https://www.drupal.org/core/experimental#versions for more
+      information about the stability levels of experimental modules.
+- Improved authoring features:
+    * Can now drag and drop images into image fields in Quick Edit mode.
+    * Image fields are now limited to only accepting images, so that users on
+      mobile clients are not offered a confusing and non-functional video
+      upload option.
+    * CKEditor now utilizes the AutoGrow plugin to better take advantage of
+      larger screen sizes.
+- Improved site building and administration:
+    * Redesigned status report.
+    * Standardized display of Views overview page to more closely match that of
+      other administrative overview pages.
+    * Views filter order now matches the table column order below in Content
+      and People overview pages.
+    * The "Allowed HTML tags" input has been converted to a textarea, which
+      significantly improves the usability of HTML filter configuration.
+    * Removed the 'disabled' region from block administration.
+    * Incoming paths are again case-insensitive for routing, similar to earlier
+      major Drupal versions.
+- Content Moderation improvements (experimental):
+    * Refactored to use new experimental Workflows module.
+    * Now supports moderation of non-translatable entity types.
+    * When reverting a moderated revision, the moderation state is now
+      reverted too.
+    * Added an API to create and enforce default workflow states and
+      transitions.
+    * Allow moderation of entity types without bundles, as long as they have
+      revisions.
+    * Publishes any entity type that implements EntityPublishedInterface, not
+      just Nodes.
+- Migration improvements (experimental):
+    * Drupal 7 core node translations are now migrated to Drupal 8.
+    * Configuration translation support is added to migrations in general and
+      implemented for Drupal 6 user profile fields.
+- Improved REST API and decoupled site features:
+    * REST API now supports the registering of users.
+    * Anonymous REST API performance increased by 60% by utilizing the internal
+      page cache.
+    * Improved the response bodies and status codes for requests with incorrect
+      request headers or request bodies, in dozens of situations.
+    * Massive overhaul of the test coverage.
+    * 403 responses now return reason why access was denied.
+    * Serialized values for Booleans and integers are now returned as the
+      correct data type, rather than incorrectly typed as strings.
+- Improved performance/scalability:
+    * Optimized class loader detection made more generic to support class
+      loaders other than ApcClassLoader.
+    * ViewsData and Token info cache now use the default cache bin to prevent
+      APCu memory from being filled too quickly.
+    * Improve statistics performance by adding a swappable backend.
+- Improved developer APIs:
+    * Deprecated several routing services in favor of two more unified services.
+    * Replaced the deprecated Symfony ExecutionContextInterface by subclassing
+      from ConstraintValidator to prepare for an update to Symfony 3.
+    * EntityPublishedInterface and EntityPublishedTrait have been added to give
+      a generic publishing API, and are being used by Node and Comment entity
+      types.
+    * Added a collection label to EntityType. This is a plural uppercase label
+      for a collection of entities - e.g. "Workflows".
+- Changed coding standards:
+    * Officially adopted short array syntax and updated all of core accordingly.
+    * PHP CodeSniffer and Drupal Coder have been added as composer dev
+      requirements, so they can be installed automatically with
+      `composer install --dev` rather than requiring separate installation. (Do
+      not use `composer install --dev` for production sites.)
+    * Most global constants in Drupal 8 have been deprecated in favor of class
+      constants. As a best practice, use appropriate class constants rather than
+      global constants.
+- Testing improvements:
+    * Integrated PHPUnit verbose output in SimpleTest UI.
+    * Improved backward compatibility with WebTestBase.
+    * Improved backward compatibility between BrowserTestBase and WebTestBase.
+    * Many old WebTestBase tests have been moved to BrowserTestBase.
+    * Expanded automated test coverage for JavaScript.
+- Package management:
+    * composer.json now uses the new official endpoint for modules and themes,
+      packages.drupal.org.
+    * Custom modules and themes can now be installed to correct locations using
+      composer.
+    * Added Package.json enabling new JavaScript language features.
 
 Drupal 8.2.0, 2016-10-05
 ------------------------
diff --git a/web/core/INSTALL.txt b/web/core/INSTALL.txt
index c83976126..74ceed95d 100644
--- a/web/core/INSTALL.txt
+++ b/web/core/INSTALL.txt
@@ -353,7 +353,7 @@ Never edit Drupal's core modules and themes; instead, use the hooks available in
 the Drupal API. To modify the behavior of Drupal, develop a module as described
 at https://www.drupal.org/developing/modules. To modify the look of Drupal,
 create a subtheme as described at https://www.drupal.org/node/2165673, or a
-completely new theme as described at https://www.drupal.org/documentation/theme
+completely new theme as described at https://www.drupal.org/docs/8/theming
 
 MULTISITE CONFIGURATION
 -----------------------
diff --git a/web/core/MAINTAINERS.txt b/web/core/MAINTAINERS.txt
index 0739fb092..6b9e83365 100644
--- a/web/core/MAINTAINERS.txt
+++ b/web/core/MAINTAINERS.txt
@@ -30,8 +30,14 @@ Drupal 8
   (Framework Manager - Frontend)
 
 Provisional membership:
+- Lauri Eskola 'lauriii' https://www.drupal.org/u/lauriii
+  (Framework Manager - Frontend)
+- Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy
+  (Product Manager)
 - Chris McCafferty 'cilefen' https://www.drupal.org/u/cilefen
   (Release Manager)
+- Roy Scholten 'yoroy' https://www.drupal.org/u/yoroy
+  (Product Manager)
 
 Drupal 7
 - Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
@@ -176,7 +182,7 @@ Database API
   - ?
 
 Database Logging
-- ?
+- Mariano D'Agostino 'dagmar' https://www.drupal.org/u/dagmar
 
 Database Update API
 - ?
@@ -237,6 +243,9 @@ Help
 Image
 - Claudiu Cristea 'claudiu.cristea' https://www.drupal.org/u/claudiu.cristea
 
+Inline Form Errors
+- Daniël Smidt 'dmsmidt' https://www.drupal.org/u/dmsmidt
+
 Installer
 - ?
 
@@ -267,14 +276,12 @@ Migrate
 - Adam Globus-Hoenich 'phenaproxima' https://www.drupal.org/u/phenaproxima
 - Ben Dougherty 'benjy' https://www.drupal.org/u/benjy
 - Lucas Hedding 'heddn' https://www.drupal.org/u/heddn
-- Michael Anello 'ultimike' https://www.drupal.org/u/ultimike
 - Mike Ryan 'mikeryan' https://www.drupal.org/u/mikeryan
 - Vicki Spagnolo 'quietone' https://www.drupal.org/u/quietone
 
 Migrate (Drupal)
 - Ben Dougherty 'benjy' https://www.drupal.org/u/benjy
 - Lucas Hedding 'heddn' https://www.drupal.org/u/heddn
-- Michael Anello 'ultimike' https://www.drupal.org/u/ultimike
 - Mike Ryan 'mikeryan' https://www.drupal.org/u/mikeryan
 - Vicki Spagnolo 'quietone' https://www.drupal.org/u/quietone
 
@@ -369,7 +376,7 @@ Statistics
 - Tim Millwood 'timmillwood' https://www.drupal.org/u/timmillwood
 
 Syslog
-- Khalid Baheyeldin 'kbahey' https://www.drupal.org/u/kbahey
+- ?
 
 System (module)
 - ?
@@ -470,9 +477,6 @@ re-architect or otherwise improve large areas of Drupal core. See
 https://www.drupal.org/community-initiatives/drupal-core for more information on
 their responsibilities. The initiative coordinators for Drupal 8 are:
 
-Multi-lingual
-- Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy
-
 Workflow Initiative
 - Dick Olsson 'dixon_' https://www.drupal.org/u/dixon_
 
@@ -480,6 +484,12 @@ PHPUnit Initiative
 - Klaus Purer 'klausi' https://www.drupal.org/u/klausi
 - Daniel Wehner 'dawehner' https://www.drupal.org/u/dawehner
 
+Layout Initiative
+- Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
+
+Media Initiative
+- Janez Urevc 'slashrsm' https://www.drupal.org/u/slashrsm
+
 Provisional membership: None at this time.
 
 
diff --git a/web/core/assets/vendor/ckeditor/CHANGES.md b/web/core/assets/vendor/ckeditor/CHANGES.md
index d291c8d58..72c579805 100644
--- a/web/core/assets/vendor/ckeditor/CHANGES.md
+++ b/web/core/assets/vendor/ckeditor/CHANGES.md
@@ -1,11 +1,113 @@
 CKEditor 4 Changelog
 ====================
 
+## CKEditor 4.6.2
+
+New Features:
+
+* [#16733](http://dev.ckeditor.com/ticket/16733): Added a new pastel color palette for the [Color Button](http://ckeditor.com/addon/colorbutton) plugin and a new [`config.colorButton_colorsPerRow`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_colorsPerRow) configuration option for setting the number of rows in the color selector.
+* [#16752](http://dev.ckeditor.com/ticket/16752): Added a new Azerbaijani localization. Thanks to the [Azerbaijani language team](https://www.transifex.com/ckeditor/teams/11143/az/)!
+* [#13818](http://dev.ckeditor.com/ticket/13818): It is now possible to group [Widget](http://ckeditor.com/addon/widget) [style definitions](http://docs.ckeditor.com/#!/guide/dev_styles-section-widget-styles), so applying one style disables the other.
+
+Fixed Issues:
+
+* [#13446](http://dev.ckeditor.com/ticket/13446): [Chrome] Fixed: It is possible to type in an unfocused inline editor.
+* [#14856](http://dev.ckeditor.com/ticket/14856): Fixed: [Font size and font family](http://ckeditor.com/addon/font) reset each other when modified at certain positions.
+* [#16745](http://dev.ckeditor.com/ticket/16745): [Edge] Fixed: List items are lost when [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#16682](http://dev.ckeditor.com/ticket/16682): [Edge] Fixed: A list gets [pasted from Word](http://ckeditor.com/addon/pastefromword) as a set of paragraphs. Added the [`config.pasteFromWord_heuristicsEdgeList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWord_heuristicsEdgeList) configuration option.
+* [#10373](http://dev.ckeditor.com/ticket/10373): Fixed: Context menu items can be dragged into the editor.
+* [#16728](http://dev.ckeditor.com/ticket/16728): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Quirks Mode.
+* [#16795](http://dev.ckeditor.com/ticket/16795): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Compatibility Mode.
+* [#16675](http://dev.ckeditor.com/ticket/16675): Fixed: Styles applied with [Copy Formatting](http://ckeditor.com/addon/copyformatting) to a single table cell are applied to the whole table.
+* [#16753](http://dev.ckeditor.com/ticket/16753): Fixed: [`element.setSize`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setSize) sets incorrect editor dimensions if the border width is represented as a fraction of pixels.
+* [#16705](http://dev.ckeditor.com/ticket/16705): [Firefox] Fixed: Unable to paste images as Base64 strings when using [Clipboard](http://ckeditor.com/addon/clipboard).
+* [#14869](http://dev.ckeditor.com/ticket/14869): Fixed: JavaScript error is thrown when trying to use [Find](http://ckeditor.com/addon/find) in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
+
+## CKEditor 4.6.1
+
+New Features:
+
+* [#16639](http://dev.ckeditor.com/ticket/16639): The `callback` parameter in the [CKEDITOR.ajax.post](http://docs.ckeditor.com/#!/api/CKEDITOR.ajax-method-post) method became optional.
+
+Fixed Issues:
+
+* [#11064](http://dev.ckeditor.com/ticket/11064): [Blink, WebKit] Fixed: Cannot select all editor content when a widget or a non-editable element is the first or last element of the content. Also fixes this issue in the [Select All](http://ckeditor.com/addon/selectall) plugin.
+* [#14755](http://dev.ckeditor.com/ticket/14755): [Blink, WebKit, IE8] Fixed: Browser hangs when a table is inserted in the place of a selected list with an empty last item.
+* [#16624](http://dev.ckeditor.com/ticket/16624): Fixed: Improved the [Color Button](http://ckeditor.com/addon/colorbutton) plugin which will now normalize the CSS `background` property if it only contains a color value. This fixes missing background colors when using [Paste from Word](http://ckeditor.com/addon/pastefromword).
+* [#16600](http://dev.ckeditor.com/ticket/16600): [Blink, WebKit] Fixed: Error thrown occasionally by an uninitialized editable for multiple CKEditor instances on the same page.
+
+## CKEditor 4.6
+
+New Features:
+
+* [#14569](http://dev.ckeditor.com/ticket/14569): Added a new, flat, default CKEditor skin called [Moono-Lisa](http://ckeditor.com/addon/moono-lisa). Refreshed default colors available in the [Color Button](http://ckeditor.com/addon/colorbutton) plugin ([Text Color and Background Color](http://docs.ckeditor.com/#!/guide/dev_colorbutton) feature).
+* [#14707](http://dev.ckeditor.com/ticket/14707): Added a new [Copy Formatting](http://ckeditor.com/addon/copyformatting) feature to enable easy copying of styles between your document parts.
+* Introduced the completely rewritten [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin:
+	* Backward incompatibility: The [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) option now defaults to `false`. This option will be deprecated in the future. Use [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf) to replicate the effect of setting it to `true`.
+	* Backward incompatibility: The [`config.pasteFromWordNumberedHeadingToList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordNumberedHeadingToList) and [`config.pasteFromWordRemoveStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveStyles) options were dropped and no longer have any effect on pasted content.
+	* Major improvements in preservation of list numbering, styling and indentation (nested lists with multiple levels).
+	* Major improvements in document structure parsing that fix plenty of issues with distorted or missing content after paste.
+* Added new translation: Occitan. Thanks to [Cédric Valmary](https://totenoc.eu/)!
+* [#10015](http://dev.ckeditor.com/ticket/10015): Keyboard shortcuts (relevant to the operating system in use) will now be displayed in tooltips and context menus.
+* [#13794](http://dev.ckeditor.com/ticket/13794): The [Upload Image](http://ckeditor.com/addon/uploadimage) feature now uses `uploaded.width/height` if set.
+* [#12541](http://dev.ckeditor.com/ticket/12541): Added the [Upload File](http://ckeditor.com/addon/uploadfile) plugin that lets you upload a file by drag&amp;dropping it into the editor content.
+* [#14449](http://dev.ckeditor.com/ticket/14449): Introduced the [Balloon Panel](http://ckeditor.com/addon/balloonpanel) plugin that lets you create stylish floating UI elements for the editor.
+* [#12077](https://dev.ckeditor.com/ticket/12077): Added support for the HTML5 `download` attribute in link (`<a>`) elements. Selecting the "Force Download" checkbox in the [Link](http://ckeditor.com/addon/link) dialog will cause the linked file to be downloaded automatically. Thanks to [sbusse](https://github.com/sbusse)!
+* [#13518](http://dev.ckeditor.com/ticket/13518): Introduced the [`additionalRequestParameters`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadWidgetDefinition-property-additionalRequestParameters) property for file uploads to make it possible to send additional information about the uploaded file to the server.
+* [#14889](http://dev.ckeditor.com/ticket/14889): Added the [`config.image2_altRequired`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_altRequired) option for the [Enhanced Image](http://ckeditor.com/addon/image2) plugin to allow making alternative text a mandatory field. Thanks to [Andrey Fedoseev](https://github.com/andreyfedoseev)!
+
+Fixed Issues:
+
+* [#9991](http://dev.ckeditor.com/ticket/9991): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) should only normalize input data.
+* [#7209](http://dev.ckeditor.com/ticket/7209): Fixed: Lists with 3 levels not [pasted from Word](http://ckeditor.com/addon/pastefromword) correctly.
+* [#14335](http://dev.ckeditor.com/ticket/14335): Fixed: Pasting a numbered list starting with a value different from "1" from Microsoft Word does not work correctly.
+* [#14542](http://dev.ckeditor.com/ticket/14542): Fixed: Copying a numbered list from Microsoft Word does not preserve list formatting.
+* [#14544](http://dev.ckeditor.com/ticket/14544): Fixed: Copying a nested list from Microsoft Word results in an empty list.
+* [#14660](http://dev.ckeditor.com/ticket/14660): Fixed: [Pasting text from  Word](http://ckeditor.com/addon/pastefromword) breaks the styling in some cases.
+* [#14867](http://dev.ckeditor.com/ticket/14867): [Firefox] Fixed: Text gets stripped when [pasting content from Word](http://ckeditor.com/addon/pastefromword).
+* [#2507](http://dev.ckeditor.com/ticket/2507): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) does not detect pasting a part of a paragraph.
+* [#3336](http://dev.ckeditor.com/ticket/3336): Fixed: Extra blank row added on top of the content [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#6115](http://dev.ckeditor.com/ticket/6115): Fixed: When Right-to-Left text direction is applied to a table [pasted from Word](http://ckeditor.com/addon/pastefromword), borders are missing on one side.
+* [#6342](http://dev.ckeditor.com/ticket/6342): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filters out a basic text style when it is [configured to use attributes](http://docs.ckeditor.com/#!/guide/dev_basicstyles-section-custom-basic-text-style-definition).
+* [#6457](http://dev.ckeditor.com/ticket/6457): [IE] Fixed: [Pasting from Word](http://ckeditor.com/addon/pastefromword) is extremely slow.
+* [#6789](http://dev.ckeditor.com/ticket/6789): Fixed: The `mso-list: ignore` style is not handled properly when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#7262](http://dev.ckeditor.com/ticket/7262): Fixed: Lists in preformatted body disappear when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#7662](http://dev.ckeditor.com/ticket/7662): [Opera] Fixed: Extra empty number/bullet shown in the editor body when editing a multi-level list [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#7807](http://dev.ckeditor.com/ticket/7807): Fixed: Last item in a list not converted to a `<li>` element after [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#7950](http://dev.ckeditor.com/ticket/7950): [IE] Fixed: Content [from Word pasted](http://ckeditor.com/addon/pastefromword) differently than in other browsers.
+* [#7982](http://dev.ckeditor.com/ticket/7982): Fixed: Multi-level lists get split into smaller ones when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#8231](http://dev.ckeditor.com/ticket/8231): [WebKit, Opera] Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts empty paragraphs.
+* [#8266](http://dev.ckeditor.com/ticket/8266): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts a blank line at the top.
+* [#8341](http://dev.ckeditor.com/ticket/8341), [#7646](http://dev.ckeditor.com/ticket/7646): Fixed: Faulty removal of empty `<span>` elements in [Paste from Word](http://ckeditor.com/addon/pastefromword) content cleanup breaking content formatting.
+* [#8754](http://dev.ckeditor.com/ticket/8754): [Firefox] Fixed: Incorrect pasting of multiple nested lists in [Paste from Word](http://ckeditor.com/addon/pastefromword).
+* [#8983](http://dev.ckeditor.com/ticket/8983): Fixed: Alignment lost when [pasting from Word](http://ckeditor.com/addon/pastefromword) with [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) set to [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
+* [#9331](http://dev.ckeditor.com/ticket/9331): [IE] Fixed: [Pasting text from Word](http://ckeditor.com/addon/pastefromword) creates a simple Caesar cipher.
+* [#9422](http://dev.ckeditor.com/ticket/9422): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) leaves an unwanted `color:windowtext` style.
+* [#10011](http://dev.ckeditor.com/ticket/10011): [IE9-10] Fixed: [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) is ignored under certain conditions.
+* [#10643](http://dev.ckeditor.com/ticket/10643): Fixed: Differences between using <kbd>Ctrl+V</kbd> and pasting from the [Paste from Word](http://ckeditor.com/addon/pastefromword) dialog.
+* [#10784](http://dev.ckeditor.com/ticket/10784): Fixed: Lines missing when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#11294](http://dev.ckeditor.com/ticket/11294): [IE10] Fixed: Font size is not preserved when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#11627](http://dev.ckeditor.com/ticket/11627): Fixed: Missing words when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#12784](http://dev.ckeditor.com/ticket/12784): Fixed: Bulleted list with custom bullets gets changed to a numbered list when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#13174](http://dev.ckeditor.com/ticket/13174): Fixed: Data loss after [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#13828](http://dev.ckeditor.com/ticket/13828): Fixed: Widget classes should be added to the wrapper rather than the widget element.
+* [#13829](http://dev.ckeditor.com/ticket/13829): Fixed: No class in [Widget](http://ckeditor.com/addon/widget) wrapper to identify the widget type.
+* [#13519](http://dev.ckeditor.com/ticket/13519): Server response received when uploading files should be more flexible.
+
+Other Changes:
+
+* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type) and [WebSpellChecker](http://ckeditor.com/addon/wsc) plugins:
+ 	* Support for the new default Moono-Lisa skin.
+ 	* [#121](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/121): Fixed: [Basic Styles](http://ckeditor.com/addon/basicstyles) do not work when SCAYT is enabled.
+ 	* [#125](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/125): Fixed: Inline styles are not continued when writing multiple lines of styled text with SCAYT enabled.
+ 	* [#127](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/127): Fixed: Uncaught TypeError after enabling SCAYT in the CKEditor `<div>` element.
+ 	* [#128](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/128): Fixed: Error thrown after enabling SCAYT caused by conflicts with RequireJS.
+
 ## CKEditor 4.5.11
 
 **Security Updates:**
 
-* [Severity: minor] Fixed the target="_blank" vulnerability reported by James Gaskell.
+* [Severity: minor] Fixed the `target="_blank"` vulnerability reported by James Gaskell.
 
 	Issue summary: If a victim had access to a spoofed version of ckeditor.com via HTTP (e.g. due to DNS spoofing, using a hacked public network or mailicious hotspot), then when using a link to the ckeditor.com website it was possible for the attacker to change the current URL of the opening page, even if the opening page was protected with SSL.
 
@@ -52,7 +154,6 @@ Fixed Issues:
 * [#11697](http://dev.ckeditor.com/ticket/11697): Fixed: Content is replaced ignoring the letter case setting in the [Find and Replace](http://ckeditor.com/addon/find) dialog window.
 * [#13886](http://dev.ckeditor.com/ticket/13886): Fixed: Invalid handling of the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) instance with the `styles` property by [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
 * [#14535](http://dev.ckeditor.com/ticket/14535): Fixed: CSS syntax corrections. Thanks to [mdjdenormandie](https://github.com/mdjdenormandie)!
-* [#14312](http://dev.ckeditor.com/ticket/14312): [IE] Fixed: Artifact is visible after pasting any text.
 
 ## CKEditor 4.5.8
 
diff --git a/web/core/assets/vendor/ckeditor/LICENSE.md b/web/core/assets/vendor/ckeditor/LICENSE.md
index 55be53afa..d6f58ca44 100644
--- a/web/core/assets/vendor/ckeditor/LICENSE.md
+++ b/web/core/assets/vendor/ckeditor/LICENSE.md
@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:
@@ -37,7 +37,7 @@ done by developers outside of CKSource with their express permission.
 
 The following libraries are included in CKEditor under the MIT license (see Appendix D):
 
-* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2016, CKSource - Frederico Knabben.
+* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2017, CKSource - Frederico Knabben.
 * PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
 * CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
 
diff --git a/web/core/assets/vendor/ckeditor/build-config.js b/web/core/assets/vendor/ckeditor/build-config.js
index c4eda91da..4a3398147 100644
--- a/web/core/assets/vendor/ckeditor/build-config.js
+++ b/web/core/assets/vendor/ckeditor/build-config.js
@@ -22,76 +22,79 @@
 /* exported CKBUILDER_CONFIG */
 
 var CKBUILDER_CONFIG = {
-	skin: 'moono',
+	skin: 'moono-lisa',
 	ignore: [
 		// CKEditor repository structure: unrelated to the usage of CKEditor itself.
-		'dev',
-		'README.md',
-		'.editorconfig',
-		'.gitignore',
-		'.gitattributes',
-		'.idea',
-		'.mailmap',
-		'.DS_Store',
-		'tests',
-		'package.json',
 		'bender.js',
 		'.bender',
 		'bender-err.log',
 		'bender-out.log',
-		'node_modules',
+		'dev',
+		'docs',
+		'.DS_Store',
+		'.editorconfig',
+		'.gitignore',
+		'.gitattributes',
+		'gruntfile.js',
+		'.idea',
 		'.jscsrc',
+		'.jshintignore',
 		'.jshintrc',
+		'less',
+		'.mailmap',
+		'node_modules',
+		'package.json',
+		'README.md',
+		'tests',
 		// Parts of CKEditor that we consciously don't ship with Drupal.
 		'adapters',
 		'config.js',
 		'contents.css',
-		'gruntfile.js',
 		'styles.js',
 		'samples',
-		'skins/moono/readme.md'
+		'skins/moono-lisa/readme.md'
 	],
-	plugins : {
-		'about' : 1,
-		'a11yhelp' : 1,
-		'basicstyles' : 1,
-		'blockquote' : 1,
-		'clipboard' : 1,
-		'contextmenu' : 1,
-		'resize' : 1,
-		'toolbar' : 1,
-		'elementspath' : 1,
-		'enterkey' : 1,
-		'entities' : 1,
-		'filebrowser' : 1,
-		'floatingspace' : 1,
-		'format' : 1,
-		'htmlwriter' : 1,
-		'horizontalrule' : 1,
-		'wysiwygarea' : 1,
-		'indent' : 1,
-		'indentlist' : 1,
-		'language' : 1,
-		'list' : 1,
-		'magicline' : 1,
-		'maximize' : 1,
-		'pastetext' : 1,
-		'pastefromword' : 1,
-		'removeformat' : 1,
-		'sourcearea' : 1,
-		'specialchar' : 1,
-		'stylescombo' : 1,
-		'tab' : 1,
-		'table' : 1,
-		'tabletools' : 1,
-		'undo' : 1,
-		'justify' : 1,
-		'showblocks' : 1,
-		'showborders' : 1,
-		'tableresize' : 1,
-		'sharedspace' : 1,
-		'sourcedialog' : 1,
-		'widget' : 1,
-		'image2' : 1
+	plugins: {
+		a11yhelp: 1,
+		about: 1,
+		autogrow: 1,
+		basicstyles: 1,
+		blockquote: 1,
+		clipboard: 1,
+		contextmenu: 1,
+		elementspath: 1,
+		enterkey: 1,
+		entities: 1,
+		filebrowser: 1,
+		floatingspace: 1,
+		format: 1,
+		horizontalrule: 1,
+		htmlwriter: 1,
+		image2: 1,
+		indent: 1,
+		indentlist: 1,
+		justify: 1,
+		language: 1,
+		list: 1,
+		magicline: 1,
+		maximize: 1,
+		pastefromword: 1,
+		pastetext: 1,
+		removeformat: 1,
+		sharedspace: 1,
+		showblocks: 1,
+		showborders: 1,
+		sourcearea: 1,
+		sourcedialog: 1,
+		specialchar: 1,
+		stylescombo: 1,
+		tab: 1,
+		table: 1,
+		tableresize: 1,
+		tabletools: 1,
+		toolbar: 1,
+		undo: 1,
+		widget: 1,
+		wysiwygarea: 1
 	}
 };
diff --git a/web/core/assets/vendor/ckeditor/ckeditor.js b/web/core/assets/vendor/ckeditor/ckeditor.js
index 2c8c7b5ce..7de640e87 100644
--- a/web/core/assets/vendor/ckeditor/ckeditor.js
+++ b/web/core/assets/vendor/ckeditor/ckeditor.js
@@ -1,549 +1,563 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-(function(){window.CKEDITOR&&window.CKEDITOR.dom||(window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,f={timestamp:"G88J",version:"4.5.11",revision:"3876e73",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var e=window.CKEDITOR_BASEPATH||"";if(!e)for(var c=document.getElementsByTagName("script"),f=0;f<c.length;f++){var k=c[f].src.match(a);if(k){e=k[1];break}}-1==e.indexOf(":/")&&"//"!=e.slice(0,
-2)&&(e=0===e.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+e:location.href.match(/^[^\?]*\/(?:)/)[0]+e);if(!e)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return e}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"\x26":"?")+"t\x3d"+this.timestamp);return a},
-domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",a,!1),e()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),e())}catch(k){}}function e(){for(var a;a=c.shift();)a()}var c=[];return function(k){function b(){try{document.documentElement.doScroll("left")}catch(g){setTimeout(b,1);return}a()}c.push(k);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",
-a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);k=!1;try{k=!window.frameElement}catch(d){}document.documentElement.doScroll&&k&&b()}}}()},c=window.CKEDITOR_GETURL;if(c){var e=f.getUrl;f.getUrl=function(a){return c.call(f,a)||e.call(f,a)}}return f}()),CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(a){var f=CKEDITOR.event.prototype,c;for(c in f)null==a[c]&&(a[c]=f[c])},
-CKEDITOR.event.prototype=function(){function a(a){var h=f(this);return h[a]||(h[a]=new c(a))}var f=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},c=function(a){this.name=a;this.listeners=[]};c.prototype={getListenerIndex:function(a){for(var c=0,f=this.listeners;c<f.length;c++)if(f[c].fn==a)return c;return-1}};return{define:function(e,c){var f=a.call(this,e);CKEDITOR.tools.extend(f,c,!0)},on:function(c,h,f,l,k){function b(g,b,a,p){g={name:c,sender:this,editor:g,
-data:b,listenerData:l,stop:a,cancel:p,removeListener:d};return!1===h.call(f,g)?!1:g.data}function d(){p.removeListener(c,h)}var g=a.call(this,c);if(0>g.getListenerIndex(h)){g=g.listeners;f||(f=this);isNaN(k)&&(k=10);var p=this;b.fn=h;b.priority=k;for(var v=g.length-1;0<=v;v--)if(g[v].priority<=k)return g.splice(v+1,0,b),{removeListener:d};g.unshift(b)}return{removeListener:d}},once:function(){var a=Array.prototype.slice.call(arguments),c=a[1];a[1]=function(a){a.removeListener();return c.apply(this,
-arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,c=function(){a=1},m=0,l=function(){m=1};return function(k,b,d){var g=f(this)[k];k=a;var p=m;a=m=0;if(g){var v=g.listeners;if(v.length)for(var v=v.slice(0),u,t=0;t<v.length;t++){if(g.errorProof)try{u=v[t].call(this,d,b,c,l)}catch(n){}else u=v[t].call(this,d,b,c,l);!1===u?m=1:"undefined"!=typeof u&&(b=u);if(a||m)break}}b=
-m?!1:"undefined"==typeof b?!0:b;a=k;m=p;return b}}(),fireOnce:function(a,c,m){c=this.fire(a,c,m);delete f(this)[a];return c},removeListener:function(a,c){var m=f(this)[a];if(m){var l=m.getListenerIndex(c);0<=l&&m.listeners.splice(l,1)}},removeAllListeners:function(){var a=f(this),c;for(c in a)delete a[c]},hasListeners:function(a){return(a=f(this)[a])&&0<a.listeners.length}}}()),CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=
-function(a,f){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fire.call(this,a,f,this)},CKEDITOR.editor.prototype.fireOnce=function(a,f){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fireOnce.call(this,a,f,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype)),CKEDITOR.env||(CKEDITOR.env=function(){var a=navigator.userAgent.toLowerCase(),f=a.match(/edge[ \/](\d+.?\d*)/),c=-1<a.indexOf("trident/"),c=!(!f&&!c),c={ie:c,edge:!!f,webkit:!c&&
+(function(){window.CKEDITOR&&window.CKEDITOR.dom||(window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,e={timestamp:"H1AG",version:"4.6.2",revision:"20af917",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var c=window.CKEDITOR_BASEPATH||"";if(!c)for(var f=document.getElementsByTagName("script"),e=0;e<f.length;e++){var k=f[e].src.match(a);if(k){c=k[1];break}}-1==c.indexOf(":/")&&"//"!=c.slice(0,
+2)&&(c=0===c.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+c:location.href.match(/^[^\?]*\/(?:)/)[0]+c);if(!c)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return c}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"\x26":"?")+"t\x3d"+this.timestamp);return a},
+domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",a,!1),c()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),c())}catch(k){}}function c(){for(var k;k=f.shift();)k()}var f=[];return function(k){function d(){try{document.documentElement.doScroll("left")}catch(g){setTimeout(d,1);return}a()}f.push(k);"complete"===document.readyState&&setTimeout(a,1);if(1==f.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",
+a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);k=!1;try{k=!window.frameElement}catch(b){}document.documentElement.doScroll&&k&&d()}}}()},c=window.CKEDITOR_GETURL;if(c){var f=e.getUrl;e.getUrl=function(a){return c.call(e,a)||f.call(e,a)}}return e}()),CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(a){var e=CKEDITOR.event.prototype,c;for(c in e)null==a[c]&&(a[c]=e[c])},
+CKEDITOR.event.prototype=function(){function a(a){var h=e(this);return h[a]||(h[a]=new c(a))}var e=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},c=function(a){this.name=a;this.listeners=[]};c.prototype={getListenerIndex:function(a){for(var c=0,e=this.listeners;c<e.length;c++)if(e[c].fn==a)return c;return-1}};return{define:function(c,h){var e=a.call(this,c);CKEDITOR.tools.extend(e,h,!0)},on:function(c,h,e,l,k){function d(g,d,k,p){g={name:c,sender:this,editor:g,
+data:d,listenerData:l,stop:k,cancel:p,removeListener:b};return!1===h.call(e,g)?!1:g.data}function b(){p.removeListener(c,h)}var g=a.call(this,c);if(0>g.getListenerIndex(h)){g=g.listeners;e||(e=this);isNaN(k)&&(k=10);var p=this;d.fn=h;d.priority=k;for(var v=g.length-1;0<=v;v--)if(g[v].priority<=k)return g.splice(v+1,0,d),{removeListener:b};g.unshift(d)}return{removeListener:b}},once:function(){var a=Array.prototype.slice.call(arguments),c=a[1];a[1]=function(a){a.removeListener();return c.apply(this,
+arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,c=function(){a=1},m=0,l=function(){m=1};return function(k,d,b){var g=e(this)[k];k=a;var p=m;a=m=0;if(g){var v=g.listeners;if(v.length)for(var v=v.slice(0),r,w=0;w<v.length;w++){if(g.errorProof)try{r=v[w].call(this,b,d,c,l)}catch(n){}else r=v[w].call(this,b,d,c,l);!1===r?m=1:"undefined"!=typeof r&&(d=r);if(a||m)break}}d=
+m?!1:"undefined"==typeof d?!0:d;a=k;m=p;return d}}(),fireOnce:function(a,c,m){c=this.fire(a,c,m);delete e(this)[a];return c},removeListener:function(a,c){var m=e(this)[a];if(m){var l=m.getListenerIndex(c);0<=l&&m.listeners.splice(l,1)}},removeAllListeners:function(){var a=e(this),c;for(c in a)delete a[c]},hasListeners:function(a){return(a=e(this)[a])&&0<a.listeners.length}}}()),CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=
+function(a,e){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fire.call(this,a,e,this)},CKEDITOR.editor.prototype.fireOnce=function(a,e){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fireOnce.call(this,a,e,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype)),CKEDITOR.env||(CKEDITOR.env=function(){var a=navigator.userAgent.toLowerCase(),e=a.match(/edge[ \/](\d+.?\d*)/),c=-1<a.indexOf("trident/"),c=!(!e&&!c),c={ie:c,edge:!!e,webkit:!c&&
 -1<a.indexOf(" applewebkit/"),air:-1<a.indexOf(" adobeair/"),mac:-1<a.indexOf("macintosh"),quirks:"BackCompat"==document.compatMode&&(!document.documentMode||10>document.documentMode),mobile:-1<a.indexOf("mobile"),iOS:/(ipad|iphone|ipod)/.test(a),isCustomDomain:function(){if(!this.ie)return!1;var a=document.domain,c=window.location.hostname;return a!=c&&a!="["+c+"]"},secure:"https:"==location.protocol};c.gecko="Gecko"==navigator.product&&!c.webkit&&!c.ie;c.webkit&&(-1<a.indexOf("chrome")?c.chrome=
-!0:c.safari=!0);var e=0;c.ie&&(e=f?parseFloat(f[1]):c.quirks||!document.documentMode?parseFloat(a.match(/msie (\d+)/)[1]):document.documentMode,c.ie9Compat=9==e,c.ie8Compat=8==e,c.ie7Compat=7==e,c.ie6Compat=7>e||c.quirks);c.gecko&&(f=a.match(/rv:([\d\.]+)/))&&(f=f[1].split("."),e=1E4*f[0]+100*(f[1]||0)+1*(f[2]||0));c.air&&(e=parseFloat(a.match(/ adobeair\/(\d+)/)[1]));c.webkit&&(e=parseFloat(a.match(/ applewebkit\/(\d+)/)[1]));c.version=e;c.isCompatible=!(c.ie&&7>e)&&!(c.gecko&&4E4>e)&&!(c.webkit&&
-534>e);c.hidpi=2<=window.devicePixelRatio;c.needsBrFiller=c.gecko||c.webkit||c.ie&&10<e;c.needsNbspFiller=c.ie&&11>e;c.cssClass="cke_browser_"+(c.ie?"ie":c.gecko?"gecko":c.webkit?"webkit":"unknown");c.quirks&&(c.cssClass+=" cke_browser_quirks");c.ie&&(c.cssClass+=" cke_browser_ie"+(c.quirks?"6 cke_browser_iequirks":c.version));c.air&&(c.cssClass+=" cke_browser_air");c.iOS&&(c.cssClass+=" cke_browser_ios");c.hidpi&&(c.cssClass+=" cke_hidpi");return c}()),"unloaded"==CKEDITOR.status&&function(){CKEDITOR.event.implementOn(CKEDITOR);
-CKEDITOR.loadFullCore=function(){if("basic_ready"!=CKEDITOR.status)CKEDITOR.loadFullCore._load=1;else{delete CKEDITOR.loadFullCore;var a=document.createElement("script");a.type="text/javascript";a.src=CKEDITOR.basePath+"ckeditor.js";document.getElementsByTagName("head")[0].appendChild(a)}};CKEDITOR.loadFullCoreTimeout=0;CKEDITOR.add=function(a){(this._.pending||(this._.pending=[])).push(a)};(function(){CKEDITOR.domReady(function(){var a=CKEDITOR.loadFullCore,f=CKEDITOR.loadFullCoreTimeout;a&&(CKEDITOR.status=
-"basic_ready",a&&a._load?a():f&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},1E3*f))})})();CKEDITOR.status="basic_loaded"}(),"use strict",CKEDITOR.VERBOSITY_WARN=1,CKEDITOR.VERBOSITY_ERROR=2,CKEDITOR.verbosity=CKEDITOR.VERBOSITY_WARN|CKEDITOR.VERBOSITY_ERROR,CKEDITOR.warn=function(a,f){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_WARN&&CKEDITOR.fire("log",{type:"warn",errorCode:a,additionalData:f})},CKEDITOR.error=function(a,f){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_ERROR&&CKEDITOR.fire("log",
-{type:"error",errorCode:a,additionalData:f})},CKEDITOR.on("log",function(a){if(window.console&&window.console.log){var f=console[a.data.type]?a.data.type:"log",c=a.data.errorCode;if(a=a.data.additionalData)console[f]("[CKEDITOR] Error code: "+c+".",a);else console[f]("[CKEDITOR] Error code: "+c+".");console[f]("[CKEDITOR] For more information about this error go to http://docs.ckeditor.com/#!/guide/dev_errors-section-"+c)}},null,null,999),CKEDITOR.dom={},function(){var a=[],f=CKEDITOR.env.gecko?"-moz-":
-CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",c=/&/g,e=/>/g,h=/</g,m=/"/g,l=/&(lt|gt|amp|quot|nbsp|shy|#\d{1,5});/g,k={lt:"\x3c",gt:"\x3e",amp:"\x26",quot:'"',nbsp:" ",shy:"­"},b=function(d,g){return"#"==g[0]?String.fromCharCode(parseInt(g.slice(1),10)):k[g]};CKEDITOR.on("reset",function(){a=[]});CKEDITOR.tools={arrayCompare:function(d,g){if(!d&&!g)return!0;if(!d||!g||d.length!=g.length)return!1;for(var b=0;b<d.length;b++)if(d[b]!=g[b])return!1;return!0},getIndex:function(d,g){for(var b=
-0;b<d.length;++b)if(g(d[b]))return b;return-1},clone:function(d){var g;if(d&&d instanceof Array){g=[];for(var b=0;b<d.length;b++)g[b]=CKEDITOR.tools.clone(d[b]);return g}if(null===d||"object"!=typeof d||d instanceof String||d instanceof Number||d instanceof Boolean||d instanceof Date||d instanceof RegExp||d.nodeType||d.window===d)return d;g=new d.constructor;for(b in d)g[b]=CKEDITOR.tools.clone(d[b]);return g},capitalize:function(d,g){return d.charAt(0).toUpperCase()+(g?d.slice(1):d.slice(1).toLowerCase())},
-extend:function(d){var g=arguments.length,b,a;"boolean"==typeof(b=arguments[g-1])?g--:"boolean"==typeof(b=arguments[g-2])&&(a=arguments[g-1],g-=2);for(var k=1;k<g;k++){var c=arguments[k],n;for(n in c)if(!0===b||null==d[n])if(!a||n in a)d[n]=c[n]}return d},prototypedCopy:function(d){var g=function(){};g.prototype=d;return new g},copy:function(d){var g={},b;for(b in d)g[b]=d[b];return g},isArray:function(d){return"[object Array]"==Object.prototype.toString.call(d)},isEmpty:function(d){for(var g in d)if(d.hasOwnProperty(g))return!1;
-return!0},cssVendorPrefix:function(d,g,b){if(b)return f+d+":"+g+";"+d+":"+g;b={};b[d]=g;b[f+d]=g;return b},cssStyleToDomStyle:function(){var d=document.createElement("div").style,g="undefined"!=typeof d.cssFloat?"cssFloat":"undefined"!=typeof d.styleFloat?"styleFloat":"float";return function(d){return"float"==d?g:d.replace(/-./g,function(g){return g.substr(1).toUpperCase()})}}(),buildStyleHtml:function(d){d=[].concat(d);for(var g,b=[],a=0;a<d.length;a++)if(g=d[a])/@import|[{}]/.test(g)?b.push("\x3cstyle\x3e"+
-g+"\x3c/style\x3e"):b.push('\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+g+'"\x3e');return b.join("")},htmlEncode:function(d){return void 0===d||null===d?"":String(d).replace(c,"\x26amp;").replace(e,"\x26gt;").replace(h,"\x26lt;")},htmlDecode:function(d){return d.replace(l,b)},htmlEncodeAttr:function(d){return CKEDITOR.tools.htmlEncode(d).replace(m,"\x26quot;")},htmlDecodeAttr:function(d){return CKEDITOR.tools.htmlDecode(d)},transformPlainTextToHtml:function(d,g){var b=g==CKEDITOR.ENTER_BR,
-a=this.htmlEncode(d.replace(/\r\n/g,"\n")),a=a.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;"),k=g==CKEDITOR.ENTER_P?"p":"div";if(!b){var c=/\n{2}/g;if(c.test(a))var n="\x3c"+k+"\x3e",e="\x3c/"+k+"\x3e",a=n+a.replace(c,function(){return e+n})+e}a=a.replace(/\n/g,"\x3cbr\x3e");b||(a=a.replace(new RegExp("\x3cbr\x3e(?\x3d\x3c/"+k+"\x3e)"),function(g){return CKEDITOR.tools.repeat(g,2)}));a=a.replace(/^ | $/g,"\x26nbsp;");return a=a.replace(/(>|\s) /g,function(g,d){return d+"\x26nbsp;"}).replace(/ (?=<)/g,
-"\x26nbsp;")},getNextNumber:function(){var d=0;return function(){return++d}}(),getNextId:function(){return"cke_"+this.getNextNumber()},getUniqueId:function(){for(var d="e",g=0;8>g;g++)d+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return d},override:function(d,g){var b=g(d);b.prototype=d.prototype;return b},setTimeout:function(d,g,b,a,k){k||(k=window);b||(b=k);return k.setTimeout(function(){a?d.apply(b,[].concat(a)):d.apply(b)},g||0)},trim:function(){var d=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;
-return function(g){return g.replace(d,"")}}(),ltrim:function(){var d=/^[ \t\n\r]+/g;return function(g){return g.replace(d,"")}}(),rtrim:function(){var d=/[ \t\n\r]+$/g;return function(g){return g.replace(d,"")}}(),indexOf:function(d,g){if("function"==typeof g)for(var b=0,a=d.length;b<a;b++){if(g(d[b]))return b}else{if(d.indexOf)return d.indexOf(g);b=0;for(a=d.length;b<a;b++)if(d[b]===g)return b}return-1},search:function(d,g){var b=CKEDITOR.tools.indexOf(d,g);return 0<=b?d[b]:null},bind:function(d,
-g){return function(){return d.apply(g,arguments)}},createClass:function(d){var g=d.$,b=d.base,a=d.privates||d._,k=d.proto;d=d.statics;!g&&(g=function(){b&&this.base.apply(this,arguments)});if(a)var c=g,g=function(){var g=this._||(this._={}),d;for(d in a){var b=a[d];g[d]="function"==typeof b?CKEDITOR.tools.bind(b,this):b}c.apply(this,arguments)};b&&(g.prototype=this.prototypedCopy(b.prototype),g.prototype.constructor=g,g.base=b,g.baseProto=b.prototype,g.prototype.base=function(){this.base=b.prototype.base;
-b.apply(this,arguments);this.base=arguments.callee});k&&this.extend(g.prototype,k,!0);d&&this.extend(g,d,!0);return g},addFunction:function(d,g){return a.push(function(){return d.apply(g||this,arguments)})-1},removeFunction:function(d){a[d]=null},callFunction:function(d){var g=a[d];return g&&g.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var d=/^-?\d+\.?\d*px$/,g;return function(b){g=CKEDITOR.tools.trim(b+"")+"px";return d.test(g)?g:b||""}}(),convertToPx:function(){var d;
-return function(g){d||(d=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"\x3e\x3c/div\x3e',CKEDITOR.document),CKEDITOR.document.getBody().append(d));return/%$/.test(g)?g:(d.setStyle("width",g),d.$.clientWidth)}}(),repeat:function(d,g){return Array(g+1).join(d)},tryThese:function(){for(var d,g=0,b=arguments.length;g<b;g++){var a=arguments[g];try{d=a();break}catch(k){}}return d},genKey:function(){return Array.prototype.slice.call(arguments).join("-")},
-defer:function(d){return function(){var g=arguments,b=this;window.setTimeout(function(){d.apply(b,g)},0)}},normalizeCssText:function(d,g){var b=[],a,k=CKEDITOR.tools.parseCssText(d,!0,g);for(a in k)b.push(a+":"+k[a]);b.sort();return b.length?b.join(";")+";":""},convertRgbToHex:function(d){return d.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(g,d,b,a){g=[d,b,a];for(d=0;3>d;d++)g[d]=("0"+parseInt(g[d],10).toString(16)).slice(-2);return"#"+g.join("")})},normalizeHex:function(d){return d.replace(/#(([0-9a-f]{3}){1,2})($|;|\s+)/gi,
-function(g,d,b,a){g=d.toLowerCase();3==g.length&&(g=g.split(""),g=[g[0],g[0],g[1],g[1],g[2],g[2]].join(""));return"#"+g+a})},parseCssText:function(d,g,b){var a={};b&&(d=(new CKEDITOR.dom.element("span")).setAttribute("style",d).getAttribute("style")||"");d&&(d=CKEDITOR.tools.normalizeHex(CKEDITOR.tools.convertRgbToHex(d)));if(!d||";"==d)return a;d.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(d,b,k){g&&(b=b.toLowerCase(),"font-family"==b&&(k=k.replace(/\s*,\s*/g,
-",")),k=CKEDITOR.tools.trim(k));a[b]=k});return a},writeCssText:function(d,g){var b,a=[];for(b in d)a.push(b+":"+d[b]);g&&a.sort();return a.join("; ")},objectCompare:function(d,g,b){var a;if(!d&&!g)return!0;if(!d||!g)return!1;for(a in d)if(d[a]!=g[a])return!1;if(!b)for(a in g)if(d[a]!=g[a])return!1;return!0},objectKeys:function(d){var g=[],b;for(b in d)g.push(b);return g},convertArrayToObject:function(d,g){var b={};1==arguments.length&&(g=!0);for(var a=0,k=d.length;a<k;++a)b[d[a]]=g;return b},fixDomain:function(){for(var d;;)try{d=
-window.parent.document.domain;break}catch(g){d=d?d.replace(/.+?(?:\.|$)/,""):document.domain;if(!d)break;document.domain=d}return!!d},eventsBuffer:function(d,g,b){function a(){c=(new Date).getTime();k=!1;b?g.call(b):g()}var k,c=0;return{input:function(){if(!k){var g=(new Date).getTime()-c;g<d?k=setTimeout(a,d-g):a()}},reset:function(){k&&clearTimeout(k);k=c=0}}},enableHtml5Elements:function(d,g){for(var b="abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video".split(" "),
-a=b.length,k;a--;)k=d.createElement(b[a]),g&&d.appendChild(k)},checkIfAnyArrayItemMatches:function(d,g){for(var b=0,a=d.length;b<a;++b)if(d[b].match(g))return!0;return!1},checkIfAnyObjectPropertyMatches:function(d,g){for(var b in d)if(b.match(g))return!0;return!1},transparentImageData:"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw\x3d\x3d",getCookie:function(d){d=d.toLowerCase();for(var g=document.cookie.split(";"),b,a,k=0;k<g.length;k++)if(b=g[k].split("\x3d"),
-a=decodeURIComponent(CKEDITOR.tools.trim(b[0]).toLowerCase()),a===d)return decodeURIComponent(1<b.length?b[1]:"");return null},setCookie:function(d,g){document.cookie=encodeURIComponent(d)+"\x3d"+encodeURIComponent(g)+";path\x3d/"},getCsrfToken:function(){var d=CKEDITOR.tools.getCookie("ckCsrfToken");if(!d||40!=d.length){var d=[],g="";if(window.crypto&&window.crypto.getRandomValues)d=new Uint8Array(40),window.crypto.getRandomValues(d);else for(var b=0;40>b;b++)d.push(Math.floor(256*Math.random()));
-for(b=0;b<d.length;b++)var a="abcdefghijklmnopqrstuvwxyz0123456789".charAt(d[b]%36),g=g+(.5<Math.random()?a.toUpperCase():a);d=g;CKEDITOR.tools.setCookie("ckCsrfToken",d)}return d},escapeCss:function(d){return d?window.CSS&&CSS.escape?CSS.escape(d):isNaN(parseInt(d.charAt(0),10))?d:"\\3"+d.charAt(0)+" "+d.substring(1,d.length):""}}}(),CKEDITOR.dtd=function(){var a=CKEDITOR.tools.extend,f=function(d,g){for(var b=CKEDITOR.tools.clone(d),a=1;a<arguments.length;a++){g=arguments[a];for(var k in g)delete b[k]}return b},
-c={},e={},h={address:1,article:1,aside:1,blockquote:1,details:1,div:1,dl:1,fieldset:1,figure:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,hr:1,main:1,menu:1,nav:1,ol:1,p:1,pre:1,section:1,table:1,ul:1},m={command:1,link:1,meta:1,noscript:1,script:1,style:1},l={},k={"#":1},b={center:1,dir:1,noframes:1};a(c,{a:1,abbr:1,area:1,audio:1,b:1,bdi:1,bdo:1,br:1,button:1,canvas:1,cite:1,code:1,command:1,datalist:1,del:1,dfn:1,em:1,embed:1,i:1,iframe:1,img:1,input:1,ins:1,kbd:1,keygen:1,
-label:1,map:1,mark:1,meter:1,noscript:1,object:1,output:1,progress:1,q:1,ruby:1,s:1,samp:1,script:1,select:1,small:1,span:1,strong:1,sub:1,sup:1,textarea:1,time:1,u:1,"var":1,video:1,wbr:1},k,{acronym:1,applet:1,basefont:1,big:1,font:1,isindex:1,strike:1,style:1,tt:1});a(e,h,c,b);f={a:f(c,{a:1,button:1}),abbr:c,address:e,area:l,article:e,aside:e,audio:a({source:1,track:1},e),b:c,base:l,bdi:c,bdo:c,blockquote:e,body:e,br:l,button:f(c,{a:1,button:1}),canvas:c,caption:e,cite:c,code:c,col:l,colgroup:{col:1},
-command:l,datalist:a({option:1},c),dd:e,del:c,details:a({summary:1},e),dfn:c,div:e,dl:{dt:1,dd:1},dt:e,em:c,embed:l,fieldset:a({legend:1},e),figcaption:e,figure:a({figcaption:1},e),footer:e,form:e,h1:c,h2:c,h3:c,h4:c,h5:c,h6:c,head:a({title:1,base:1},m),header:e,hgroup:{h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},hr:l,html:a({head:1,body:1},e,m),i:c,iframe:k,img:l,input:l,ins:c,kbd:c,keygen:l,label:c,legend:c,li:e,link:l,main:e,map:e,mark:c,menu:a({li:1},e),meta:l,meter:f(c,{meter:1}),nav:e,noscript:a({link:1,
-meta:1,style:1},c),object:a({param:1},c),ol:{li:1},optgroup:{option:1},option:k,output:c,p:c,param:l,pre:c,progress:f(c,{progress:1}),q:c,rp:c,rt:c,ruby:a({rp:1,rt:1},c),s:c,samp:c,script:k,section:e,select:{optgroup:1,option:1},small:c,source:l,span:c,strong:c,style:k,sub:c,summary:a({h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},c),sup:c,table:{caption:1,colgroup:1,thead:1,tfoot:1,tbody:1,tr:1},tbody:{tr:1},td:e,textarea:k,tfoot:{tr:1},th:e,thead:{tr:1},time:f(c,{time:1}),title:k,tr:{th:1,td:1},track:l,u:c,ul:{li:1},
-"var":c,video:a({source:1,track:1},e),wbr:l,acronym:c,applet:a({param:1},e),basefont:l,big:c,center:e,dialog:l,dir:{li:1},font:c,isindex:l,noframes:e,strike:c,tt:c};a(f,{$block:a({audio:1,dd:1,dt:1,figcaption:1,li:1,video:1},h,b),$blockLimit:{article:1,aside:1,audio:1,body:1,caption:1,details:1,dir:1,div:1,dl:1,fieldset:1,figcaption:1,figure:1,footer:1,form:1,header:1,hgroup:1,main:1,menu:1,nav:1,ol:1,section:1,table:1,td:1,th:1,tr:1,ul:1,video:1},$cdata:{script:1,style:1},$editable:{address:1,article:1,
-aside:1,blockquote:1,body:1,details:1,div:1,fieldset:1,figcaption:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,main:1,nav:1,p:1,pre:1,section:1},$empty:{area:1,base:1,basefont:1,br:1,col:1,command:1,dialog:1,embed:1,hr:1,img:1,input:1,isindex:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1},$inline:c,$list:{dl:1,ol:1,ul:1},$listItem:{dd:1,dt:1,li:1},$nonBodyContent:a({body:1,head:1,html:1},f.head),$nonEditable:{applet:1,audio:1,button:1,embed:1,iframe:1,map:1,object:1,
-option:1,param:1,script:1,textarea:1,video:1},$object:{applet:1,audio:1,button:1,hr:1,iframe:1,img:1,input:1,object:1,select:1,table:1,textarea:1,video:1},$removeEmpty:{abbr:1,acronym:1,b:1,bdi:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,mark:1,meter:1,output:1,q:1,ruby:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,time:1,tt:1,u:1,"var":1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,
-td:1,tfoot:1,th:1,thead:1,tr:1},$transparent:{a:1,audio:1,canvas:1,del:1,ins:1,map:1,noscript:1,object:1,video:1},$intermediate:{caption:1,colgroup:1,dd:1,dt:1,figcaption:1,legend:1,li:1,optgroup:1,option:1,rp:1,rt:1,summary:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1}});return f}(),CKEDITOR.dom.event=function(a){this.$=a},CKEDITOR.dom.event.prototype={getKey:function(){return this.$.keyCode||this.$.which},getKeystroke:function(){var a=this.getKey();if(this.$.ctrlKey||this.$.metaKey)a+=CKEDITOR.CTRL;
-this.$.shiftKey&&(a+=CKEDITOR.SHIFT);this.$.altKey&&(a+=CKEDITOR.ALT);return a},preventDefault:function(a){var f=this.$;f.preventDefault?f.preventDefault():f.returnValue=!1;a&&this.stopPropagation()},stopPropagation:function(){var a=this.$;a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},getTarget:function(){var a=this.$.target||this.$.srcElement;return a?new CKEDITOR.dom.node(a):null},getPhase:function(){return this.$.eventPhase||2},getPageOffset:function(){var a=this.getTarget().getDocument().$;
-return{x:this.$.pageX||this.$.clientX+(a.documentElement.scrollLeft||a.body.scrollLeft),y:this.$.pageY||this.$.clientY+(a.documentElement.scrollTop||a.body.scrollTop)}}},CKEDITOR.CTRL=1114112,CKEDITOR.SHIFT=2228224,CKEDITOR.ALT=4456448,CKEDITOR.EVENT_PHASE_CAPTURING=1,CKEDITOR.EVENT_PHASE_AT_TARGET=2,CKEDITOR.EVENT_PHASE_BUBBLING=3,CKEDITOR.dom.domObject=function(a){a&&(this.$=a)},CKEDITOR.dom.domObject.prototype=function(){var a=function(a,c){return function(e){"undefined"!=typeof CKEDITOR&&a.fire(c,
-new CKEDITOR.dom.event(e))}};return{getPrivate:function(){var a;(a=this.getCustomData("_"))||this.setCustomData("_",a={});return a},on:function(f){var c=this.getCustomData("_cke_nativeListeners");c||(c={},this.setCustomData("_cke_nativeListeners",c));c[f]||(c=c[f]=a(this,f),this.$.addEventListener?this.$.addEventListener(f,c,!!CKEDITOR.event.useCapture):this.$.attachEvent&&this.$.attachEvent("on"+f,c));return CKEDITOR.event.prototype.on.apply(this,arguments)},removeListener:function(a){CKEDITOR.event.prototype.removeListener.apply(this,
-arguments);if(!this.hasListeners(a)){var c=this.getCustomData("_cke_nativeListeners"),e=c&&c[a];e&&(this.$.removeEventListener?this.$.removeEventListener(a,e,!1):this.$.detachEvent&&this.$.detachEvent("on"+a,e),delete c[a])}},removeAllListeners:function(){var a=this.getCustomData("_cke_nativeListeners"),c;for(c in a){var e=a[c];this.$.detachEvent?this.$.detachEvent("on"+c,e):this.$.removeEventListener&&this.$.removeEventListener(c,e,!1);delete a[c]}CKEDITOR.event.prototype.removeAllListeners.call(this)}}}(),
-function(a){var f={};CKEDITOR.on("reset",function(){f={}});a.equals=function(a){try{return a&&a.$===this.$}catch(e){return!1}};a.setCustomData=function(a,e){var h=this.getUniqueId();(f[h]||(f[h]={}))[a]=e;return this};a.getCustomData=function(a){var e=this.$["data-cke-expando"];return(e=e&&f[e])&&a in e?e[a]:null};a.removeCustomData=function(a){var e=this.$["data-cke-expando"],e=e&&f[e],h,m;e&&(h=e[a],m=a in e,delete e[a]);return m?h:null};a.clearCustomData=function(){this.removeAllListeners();var a=
-this.$["data-cke-expando"];a&&delete f[a]};a.getUniqueId=function(){return this.$["data-cke-expando"]||(this.$["data-cke-expando"]=CKEDITOR.tools.getNextNumber())};CKEDITOR.event.implementOn(a)}(CKEDITOR.dom.domObject.prototype),CKEDITOR.dom.node=function(a){return a?new CKEDITOR.dom[a.nodeType==CKEDITOR.NODE_DOCUMENT?"document":a.nodeType==CKEDITOR.NODE_ELEMENT?"element":a.nodeType==CKEDITOR.NODE_TEXT?"text":a.nodeType==CKEDITOR.NODE_COMMENT?"comment":a.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT?
-"documentFragment":"domObject"](a):this},CKEDITOR.dom.node.prototype=new CKEDITOR.dom.domObject,CKEDITOR.NODE_ELEMENT=1,CKEDITOR.NODE_DOCUMENT=9,CKEDITOR.NODE_TEXT=3,CKEDITOR.NODE_COMMENT=8,CKEDITOR.NODE_DOCUMENT_FRAGMENT=11,CKEDITOR.POSITION_IDENTICAL=0,CKEDITOR.POSITION_DISCONNECTED=1,CKEDITOR.POSITION_FOLLOWING=2,CKEDITOR.POSITION_PRECEDING=4,CKEDITOR.POSITION_IS_CONTAINED=8,CKEDITOR.POSITION_CONTAINS=16,CKEDITOR.tools.extend(CKEDITOR.dom.node.prototype,{appendTo:function(a,f){a.append(this,f);
-return a},clone:function(a,f){function c(e){e["data-cke-expando"]&&(e["data-cke-expando"]=!1);if(e.nodeType==CKEDITOR.NODE_ELEMENT||e.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)if(f||e.nodeType!=CKEDITOR.NODE_ELEMENT||e.removeAttribute("id",!1),a){e=e.childNodes;for(var h=0;h<e.length;h++)c(e[h])}}function e(c){if(c.type==CKEDITOR.NODE_ELEMENT||c.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT){if(c.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var h=c.getName();":"==h[0]&&c.renameNode(h.substring(1))}if(a)for(h=0;h<
-c.getChildCount();h++)e(c.getChild(h))}}var h=this.$.cloneNode(a);c(h);h=new CKEDITOR.dom.node(h);CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(this.type==CKEDITOR.NODE_ELEMENT||this.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)&&e(h);return h},hasPrevious:function(){return!!this.$.previousSibling},hasNext:function(){return!!this.$.nextSibling},insertAfter:function(a){a.$.parentNode.insertBefore(this.$,a.$.nextSibling);return a},insertBefore:function(a){a.$.parentNode.insertBefore(this.$,a.$);return a},insertBeforeMe:function(a){this.$.parentNode.insertBefore(a.$,
-this.$);return a},getAddress:function(a){for(var f=[],c=this.getDocument().$.documentElement,e=this.$;e&&e!=c;){var h=e.parentNode;h&&f.unshift(this.getIndex.call({$:e},a));e=h}return f},getDocument:function(){return new CKEDITOR.dom.document(this.$.ownerDocument||this.$.parentNode.ownerDocument)},getIndex:function(a){function f(a,k){var b=k?a.nextSibling:a.previousSibling;return b&&b.nodeType==CKEDITOR.NODE_TEXT?c(b)?f(b,k):b:null}function c(a){return!a.nodeValue||a.nodeValue==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE}
-var e=this.$,h=-1,m;if(!this.$.parentNode||a&&e.nodeType==CKEDITOR.NODE_TEXT&&c(e)&&!f(e)&&!f(e,!0))return-1;do a&&e!=this.$&&e.nodeType==CKEDITOR.NODE_TEXT&&(m||c(e))||(h++,m=e.nodeType==CKEDITOR.NODE_TEXT);while(e=e.previousSibling);return h},getNextSourceNode:function(a,f,c){if(c&&!c.call){var e=c;c=function(a){return!a.equals(e)}}a=!a&&this.getFirst&&this.getFirst();var h;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&c&&!1===c(this,!0))return null;a=this.getNext()}for(;!a&&(h=(h||this).getParent());){if(c&&
-!1===c(h,!0))return null;a=h.getNext()}return!a||c&&!1===c(a)?null:f&&f!=a.type?a.getNextSourceNode(!1,f,c):a},getPreviousSourceNode:function(a,f,c){if(c&&!c.call){var e=c;c=function(a){return!a.equals(e)}}a=!a&&this.getLast&&this.getLast();var h;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&c&&!1===c(this,!0))return null;a=this.getPrevious()}for(;!a&&(h=(h||this).getParent());){if(c&&!1===c(h,!0))return null;a=h.getPrevious()}return!a||c&&!1===c(a)?null:f&&a.type!=f?a.getPreviousSourceNode(!1,f,c):
-a},getPrevious:function(a){var f=this.$,c;do c=(f=f.previousSibling)&&10!=f.nodeType&&new CKEDITOR.dom.node(f);while(c&&a&&!a(c));return c},getNext:function(a){var f=this.$,c;do c=(f=f.nextSibling)&&new CKEDITOR.dom.node(f);while(c&&a&&!a(c));return c},getParent:function(a){var f=this.$.parentNode;return f&&(f.nodeType==CKEDITOR.NODE_ELEMENT||a&&f.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)?new CKEDITOR.dom.node(f):null},getParents:function(a){var f=this,c=[];do c[a?"push":"unshift"](f);while(f=f.getParent());
-return c},getCommonAncestor:function(a){if(a.equals(this))return this;if(a.contains&&a.contains(this))return a;var f=this.contains?this:this.getParent();do if(f.contains(a))return f;while(f=f.getParent());return null},getPosition:function(a){var f=this.$,c=a.$;if(f.compareDocumentPosition)return f.compareDocumentPosition(c);if(f==c)return CKEDITOR.POSITION_IDENTICAL;if(this.type==CKEDITOR.NODE_ELEMENT&&a.type==CKEDITOR.NODE_ELEMENT){if(f.contains){if(f.contains(c))return CKEDITOR.POSITION_CONTAINS+
-CKEDITOR.POSITION_PRECEDING;if(c.contains(f))return CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING}if("sourceIndex"in f)return 0>f.sourceIndex||0>c.sourceIndex?CKEDITOR.POSITION_DISCONNECTED:f.sourceIndex<c.sourceIndex?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING}f=this.getAddress();a=a.getAddress();for(var c=Math.min(f.length,a.length),e=0;e<c;e++)if(f[e]!=a[e])return f[e]<a[e]?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING;return f.length<a.length?CKEDITOR.POSITION_CONTAINS+
-CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING},getAscendant:function(a,f){var c=this.$,e,h;f||(c=c.parentNode);"function"==typeof a?(h=!0,e=a):(h=!1,e=function(c){c="string"==typeof c.nodeName?c.nodeName.toLowerCase():"";return"string"==typeof a?c==a:c in a});for(;c;){if(e(h?new CKEDITOR.dom.node(c):c))return new CKEDITOR.dom.node(c);try{c=c.parentNode}catch(m){c=null}}return null},hasAscendant:function(a,f){var c=this.$;f||(c=c.parentNode);for(;c;){if(c.nodeName&&
-c.nodeName.toLowerCase()==a)return!0;c=c.parentNode}return!1},move:function(a,f){a.append(this.remove(),f)},remove:function(a){var f=this.$,c=f.parentNode;if(c){if(a)for(;a=f.firstChild;)c.insertBefore(f.removeChild(a),f);c.removeChild(f)}return this},replace:function(a){this.insertBefore(a);a.remove()},trim:function(){this.ltrim();this.rtrim()},ltrim:function(){for(var a;this.getFirst&&(a=this.getFirst());){if(a.type==CKEDITOR.NODE_TEXT){var f=CKEDITOR.tools.ltrim(a.getText()),c=a.getLength();if(f)f.length<
-c&&(a.split(c-f.length),this.$.removeChild(this.$.firstChild));else{a.remove();continue}}break}},rtrim:function(){for(var a;this.getLast&&(a=this.getLast());){if(a.type==CKEDITOR.NODE_TEXT){var f=CKEDITOR.tools.rtrim(a.getText()),c=a.getLength();if(f)f.length<c&&(a.split(f.length),this.$.lastChild.parentNode.removeChild(this.$.lastChild));else{a.remove();continue}}break}CKEDITOR.env.needsBrFiller&&(a=this.$.lastChild)&&1==a.type&&"br"==a.nodeName.toLowerCase()&&a.parentNode.removeChild(a)},isReadOnly:function(a){var f=
-this;this.type!=CKEDITOR.NODE_ELEMENT&&(f=this.getParent());CKEDITOR.env.edge&&f&&f.is("textarea","input")&&(a=!0);if(!a&&f&&"undefined"!=typeof f.$.isContentEditable)return!(f.$.isContentEditable||f.data("cke-editable"));for(;f;){if(f.data("cke-editable"))return!1;if(f.hasAttribute("contenteditable"))return"false"==f.getAttribute("contenteditable");f=f.getParent()}return!0}}),CKEDITOR.dom.window=function(a){CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.window.prototype=new CKEDITOR.dom.domObject,
-CKEDITOR.tools.extend(CKEDITOR.dom.window.prototype,{focus:function(){this.$.focus()},getViewPaneSize:function(){var a=this.$.document,f="CSS1Compat"==a.compatMode;return{width:(f?a.documentElement.clientWidth:a.body.clientWidth)||0,height:(f?a.documentElement.clientHeight:a.body.clientHeight)||0}},getScrollPosition:function(){var a=this.$;if("pageXOffset"in a)return{x:a.pageXOffset||0,y:a.pageYOffset||0};a=a.document;return{x:a.documentElement.scrollLeft||a.body.scrollLeft||0,y:a.documentElement.scrollTop||
-a.body.scrollTop||0}},getFrame:function(){var a=this.$.frameElement;return a?new CKEDITOR.dom.element.get(a):null}}),CKEDITOR.dom.document=function(a){CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.document.prototype=new CKEDITOR.dom.domObject,CKEDITOR.tools.extend(CKEDITOR.dom.document.prototype,{type:CKEDITOR.NODE_DOCUMENT,appendStyleSheet:function(a){if(this.$.createStyleSheet)this.$.createStyleSheet(a);else{var f=new CKEDITOR.dom.element("link");f.setAttributes({rel:"stylesheet",type:"text/css",
-href:a});this.getHead().append(f)}},appendStyleText:function(a){if(this.$.createStyleSheet){var f=this.$.createStyleSheet("");f.cssText=a}else{var c=new CKEDITOR.dom.element("style",this);c.append(new CKEDITOR.dom.text(a,this));this.getHead().append(c)}return f||c.$.sheet},createElement:function(a,f){var c=new CKEDITOR.dom.element(a,this);f&&(f.attributes&&c.setAttributes(f.attributes),f.styles&&c.setStyles(f.styles));return c},createText:function(a){return new CKEDITOR.dom.text(a,this)},focus:function(){this.getWindow().focus()},
-getActive:function(){var a;try{a=this.$.activeElement}catch(f){return null}return new CKEDITOR.dom.element(a)},getById:function(a){return(a=this.$.getElementById(a))?new CKEDITOR.dom.element(a):null},getByAddress:function(a,f){for(var c=this.$.documentElement,e=0;c&&e<a.length;e++){var h=a[e];if(f)for(var m=-1,l=0;l<c.childNodes.length;l++){var k=c.childNodes[l];if(!0!==f||3!=k.nodeType||!k.previousSibling||3!=k.previousSibling.nodeType)if(m++,m==h){c=k;break}}else c=c.childNodes[h]}return c?new CKEDITOR.dom.node(c):
-null},getElementsByTag:function(a,f){CKEDITOR.env.ie&&8>=document.documentMode||!f||(a=f+":"+a);return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(a))},getHead:function(){var a=this.$.getElementsByTagName("head")[0];return a=a?new CKEDITOR.dom.element(a):this.getDocumentElement().append(new CKEDITOR.dom.element("head"),!0)},getBody:function(){return new CKEDITOR.dom.element(this.$.body)},getDocumentElement:function(){return new CKEDITOR.dom.element(this.$.documentElement)},getWindow:function(){return new CKEDITOR.dom.window(this.$.parentWindow||
-this.$.defaultView)},write:function(a){this.$.open("text/html","replace");CKEDITOR.env.ie&&(a=a.replace(/(?:^\s*<!DOCTYPE[^>]*?>)|^/i,'$\x26\n\x3cscript data-cke-temp\x3d"1"\x3e('+CKEDITOR.tools.fixDomain+")();\x3c/script\x3e"));this.$.write(a);this.$.close()},find:function(a){return new CKEDITOR.dom.nodeList(this.$.querySelectorAll(a))},findOne:function(a){return(a=this.$.querySelector(a))?new CKEDITOR.dom.element(a):null},_getHtml5ShivFrag:function(){var a=this.getCustomData("html5ShivFrag");a||
-(a=this.$.createDocumentFragment(),CKEDITOR.tools.enableHtml5Elements(a,!0),this.setCustomData("html5ShivFrag",a));return a}}),CKEDITOR.dom.nodeList=function(a){this.$=a},CKEDITOR.dom.nodeList.prototype={count:function(){return this.$.length},getItem:function(a){return 0>a||a>=this.$.length?null:(a=this.$[a])?new CKEDITOR.dom.node(a):null}},CKEDITOR.dom.element=function(a,f){"string"==typeof a&&(a=(f?f.$:document).createElement(a));CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.element.get=function(a){return(a=
-"string"==typeof a?document.getElementById(a)||document.getElementsByName(a)[0]:a)&&(a.$?a:new CKEDITOR.dom.element(a))},CKEDITOR.dom.element.prototype=new CKEDITOR.dom.node,CKEDITOR.dom.element.createFromHtml=function(a,f){var c=new CKEDITOR.dom.element("div",f);c.setHtml(a);return c.getFirst().remove()},CKEDITOR.dom.element.setMarker=function(a,f,c,e){var h=f.getCustomData("list_marker_id")||f.setCustomData("list_marker_id",CKEDITOR.tools.getNextNumber()).getCustomData("list_marker_id"),m=f.getCustomData("list_marker_names")||
-f.setCustomData("list_marker_names",{}).getCustomData("list_marker_names");a[h]=f;m[c]=1;return f.setCustomData(c,e)},CKEDITOR.dom.element.clearAllMarkers=function(a){for(var f in a)CKEDITOR.dom.element.clearMarkers(a,a[f],1)},CKEDITOR.dom.element.clearMarkers=function(a,f,c){var e=f.getCustomData("list_marker_names"),h=f.getCustomData("list_marker_id"),m;for(m in e)f.removeCustomData(m);f.removeCustomData("list_marker_names");c&&(f.removeCustomData("list_marker_id"),delete a[h])},function(){function a(a,
-b){return-1<(" "+a+" ").replace(m," ").indexOf(" "+b+" ")}function f(a){var b=!0;a.$.id||(a.$.id="cke_tmp_"+CKEDITOR.tools.getNextNumber(),b=!1);return function(){b||a.removeAttribute("id")}}function c(a,b){var d=CKEDITOR.tools.escapeCss(a.$.id);return"#"+d+" "+b.split(/,\s*/).join(", #"+d+" ")}function e(a){for(var b=0,d=0,g=l[a].length;d<g;d++)b+=parseInt(this.getComputedStyle(l[a][d])||0,10)||0;return b}var h=document.createElement("_").classList,h="undefined"!==typeof h&&null!==String(h.add).match(/\[Native code\]/gi),
-m=/[\n\t\r]/g;CKEDITOR.tools.extend(CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_ELEMENT,addClass:h?function(a){this.$.classList.add(a);return this}:function(k){var b=this.$.className;b&&(a(b,k)||(b+=" "+k));this.$.className=b||k;return this},removeClass:h?function(a){var b=this.$;b.classList.remove(a);b.className||b.removeAttribute("class");return this}:function(k){var b=this.getAttribute("class");b&&a(b,k)&&((b=b.replace(new RegExp("(?:^|\\s+)"+k+"(?\x3d\\s|$)"),"").replace(/^\s+/,""))?this.setAttribute("class",
-b):this.removeAttribute("class"));return this},hasClass:function(k){return a(this.$.className,k)},append:function(a,b){"string"==typeof a&&(a=this.getDocument().createElement(a));b?this.$.insertBefore(a.$,this.$.firstChild):this.$.appendChild(a.$);return a},appendHtml:function(a){if(this.$.childNodes.length){var b=new CKEDITOR.dom.element("div",this.getDocument());b.setHtml(a);b.moveChildren(this)}else this.setHtml(a)},appendText:function(a){null!=this.$.text&&CKEDITOR.env.ie&&9>CKEDITOR.env.version?
-this.$.text+=a:this.append(new CKEDITOR.dom.text(a))},appendBogus:function(a){if(a||CKEDITOR.env.needsBrFiller){for(a=this.getLast();a&&a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.rtrim(a.getText());)a=a.getPrevious();a&&a.is&&a.is("br")||(a=this.getDocument().createElement("br"),CKEDITOR.env.gecko&&a.setAttribute("type","_moz"),this.append(a))}},breakParent:function(a,b){var d=new CKEDITOR.dom.range(this.getDocument());d.setStartAfter(this);d.setEndAfter(a);var g=d.extractContents(!1,b||!1),c;d.insertNode(this.remove());
-if(CKEDITOR.env.ie&&!CKEDITOR.env.edge){for(d=new CKEDITOR.dom.element("div");c=g.getFirst();)c.$.style.backgroundColor&&(c.$.style.backgroundColor=c.$.style.backgroundColor),d.append(c);d.insertAfter(this);d.remove(!0)}else g.insertAfterNode(this)},contains:document.compareDocumentPosition?function(a){return!!(this.$.compareDocumentPosition(a.$)&16)}:function(a){var b=this.$;return a.type!=CKEDITOR.NODE_ELEMENT?b.contains(a.getParent().$):b!=a.$&&b.contains(a.$)},focus:function(){function a(){try{this.$.focus()}catch(b){}}
-return function(b){b?CKEDITOR.tools.setTimeout(a,100,this):a.call(this)}}(),getHtml:function(){var a=this.$.innerHTML;return CKEDITOR.env.ie?a.replace(/<\?[^>]*>/g,""):a},getOuterHtml:function(){if(this.$.outerHTML)return this.$.outerHTML.replace(/<\?[^>]*>/,"");var a=this.$.ownerDocument.createElement("div");a.appendChild(this.$.cloneNode(!0));return a.innerHTML},getClientRect:function(){var a=CKEDITOR.tools.extend({},this.$.getBoundingClientRect());!a.width&&(a.width=a.right-a.left);!a.height&&
-(a.height=a.bottom-a.top);return a},setHtml:CKEDITOR.env.ie&&9>CKEDITOR.env.version?function(a){try{var b=this.$;if(this.getParent())return b.innerHTML=a;var d=this.getDocument()._getHtml5ShivFrag();d.appendChild(b);b.innerHTML=a;d.removeChild(b);return a}catch(g){this.$.innerHTML="";b=new CKEDITOR.dom.element("body",this.getDocument());b.$.innerHTML=a;for(b=b.getChildren();b.count();)this.append(b.getItem(0));return a}}:function(a){return this.$.innerHTML=a},setText:function(){var a=document.createElement("p");
-a.innerHTML="x";a=a.textContent;return function(b){this.$[a?"textContent":"innerText"]=b}}(),getAttribute:function(){var a=function(a){return this.$.getAttribute(a,2)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){switch(a){case "class":a="className";break;case "http-equiv":a="httpEquiv";break;case "name":return this.$.name;case "tabindex":return a=this.$.getAttribute(a,2),0!==a&&0===this.$.tabIndex&&(a=null),a;case "checked":return a=this.$.attributes.getNamedItem(a),
-(a.specified?a.nodeValue:this.$.checked)?"checked":null;case "hspace":case "value":return this.$[a];case "style":return this.$.style.cssText;case "contenteditable":case "contentEditable":return this.$.attributes.getNamedItem("contentEditable").specified?this.$.getAttribute("contentEditable"):null}return this.$.getAttribute(a,2)}:a}(),getAttributes:function(a){var b={},d=this.$.attributes,g;a=CKEDITOR.tools.isArray(a)?a:[];for(g=0;g<d.length;g++)-1===CKEDITOR.tools.indexOf(a,d[g].name)&&(b[d[g].name]=
-d[g].value);return b},getChildren:function(){return new CKEDITOR.dom.nodeList(this.$.childNodes)},getComputedStyle:document.defaultView&&document.defaultView.getComputedStyle?function(a){var b=this.getWindow().$.getComputedStyle(this.$,null);return b?b.getPropertyValue(a):""}:function(a){return this.$.currentStyle[CKEDITOR.tools.cssStyleToDomStyle(a)]},getDtd:function(){var a=CKEDITOR.dtd[this.getName()];this.getDtd=function(){return a};return a},getElementsByTag:CKEDITOR.dom.document.prototype.getElementsByTag,
-getTabIndex:function(){var a=this.$.tabIndex;return 0!==a||CKEDITOR.dtd.$tabIndex[this.getName()]||0===parseInt(this.getAttribute("tabindex"),10)?a:-1},getText:function(){return this.$.textContent||this.$.innerText||""},getWindow:function(){return this.getDocument().getWindow()},getId:function(){return this.$.id||null},getNameAtt:function(){return this.$.name||null},getName:function(){var a=this.$.nodeName.toLowerCase();if(CKEDITOR.env.ie&&8>=document.documentMode){var b=this.$.scopeName;"HTML"!=
-b&&(a=b.toLowerCase()+":"+a)}this.getName=function(){return a};return this.getName()},getValue:function(){return this.$.value},getFirst:function(a){var b=this.$.firstChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getNext(a));return b},getLast:function(a){var b=this.$.lastChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getPrevious(a));return b},getStyle:function(a){return this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]},is:function(){var a=this.getName();if("object"==typeof arguments[0])return!!arguments[0][a];
-for(var b=0;b<arguments.length;b++)if(arguments[b]==a)return!0;return!1},isEditable:function(a){var b=this.getName();return this.isReadOnly()||"none"==this.getComputedStyle("display")||"hidden"==this.getComputedStyle("visibility")||CKEDITOR.dtd.$nonEditable[b]||CKEDITOR.dtd.$empty[b]||this.is("a")&&(this.data("cke-saved-name")||this.hasAttribute("name"))&&!this.getChildCount()?!1:!1!==a?(a=CKEDITOR.dtd[b]||CKEDITOR.dtd.span,!(!a||!a["#"])):!0},isIdentical:function(a){var b=this.clone(0,1);a=a.clone(0,
-1);b.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);a.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);if(b.$.isEqualNode)return b.$.style.cssText=CKEDITOR.tools.normalizeCssText(b.$.style.cssText),a.$.style.cssText=CKEDITOR.tools.normalizeCssText(a.$.style.cssText),b.$.isEqualNode(a.$);b=b.getOuterHtml();a=a.getOuterHtml();if(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&this.is("a")){var d=this.getParent();
-d.type==CKEDITOR.NODE_ELEMENT&&(d=d.clone(),d.setHtml(b),b=d.getHtml(),d.setHtml(a),a=d.getHtml())}return b==a},isVisible:function(){var a=(this.$.offsetHeight||this.$.offsetWidth)&&"hidden"!=this.getComputedStyle("visibility"),b,d;a&&CKEDITOR.env.webkit&&(b=this.getWindow(),!b.equals(CKEDITOR.document.getWindow())&&(d=b.$.frameElement)&&(a=(new CKEDITOR.dom.element(d)).isVisible()));return!!a},isEmptyInlineRemoveable:function(){if(!CKEDITOR.dtd.$removeEmpty[this.getName()])return!1;for(var a=this.getChildren(),
-b=0,d=a.count();b<d;b++){var g=a.getItem(b);if(g.type!=CKEDITOR.NODE_ELEMENT||!g.data("cke-bookmark"))if(g.type==CKEDITOR.NODE_ELEMENT&&!g.isEmptyInlineRemoveable()||g.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(g.getText()))return!1}return!0},hasAttributes:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(){for(var a=this.$.attributes,b=0;b<a.length;b++){var d=a[b];switch(d.nodeName){case "class":if(this.getAttribute("class"))return!0;case "data-cke-expando":continue;default:if(d.specified)return!0}}return!1}:
-function(){var a=this.$.attributes,b=a.length,d={"data-cke-expando":1,_moz_dirty:1};return 0<b&&(2<b||!d[a[0].nodeName]||2==b&&!d[a[1].nodeName])},hasAttribute:function(){function a(b){var d=this.$.attributes.getNamedItem(b);if("input"==this.getName())switch(b){case "class":return 0<this.$.className.length;case "checked":return!!this.$.checked;case "value":return b=this.getAttribute("type"),"checkbox"==b||"radio"==b?"on"!=this.$.value:!!this.$.value}return d?d.specified:!1}return CKEDITOR.env.ie?
-8>CKEDITOR.env.version?function(b){return"name"==b?!!this.$.name:a.call(this,b)}:a:function(a){return!!this.$.attributes.getNamedItem(a)}}(),hide:function(){this.setStyle("display","none")},moveChildren:function(a,b){var d=this.$;a=a.$;if(d!=a){var g;if(b)for(;g=d.lastChild;)a.insertBefore(d.removeChild(g),a.firstChild);else for(;g=d.firstChild;)a.appendChild(d.removeChild(g))}},mergeSiblings:function(){function a(b,d,g){if(d&&d.type==CKEDITOR.NODE_ELEMENT){for(var c=[];d.data("cke-bookmark")||d.isEmptyInlineRemoveable();)if(c.push(d),
-d=g?d.getNext():d.getPrevious(),!d||d.type!=CKEDITOR.NODE_ELEMENT)return;if(b.isIdentical(d)){for(var e=g?b.getLast():b.getFirst();c.length;)c.shift().move(b,!g);d.moveChildren(b,!g);d.remove();e&&e.type==CKEDITOR.NODE_ELEMENT&&e.mergeSiblings()}}}return function(b){if(!1===b||CKEDITOR.dtd.$removeEmpty[this.getName()]||this.is("a"))a(this,this.getNext(),!0),a(this,this.getPrevious())}}(),show:function(){this.setStyles({display:"",visibility:""})},setAttribute:function(){var a=function(a,d){this.$.setAttribute(a,
-d);return this};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(b,d){"class"==b?this.$.className=d:"style"==b?this.$.style.cssText=d:"tabindex"==b?this.$.tabIndex=d:"checked"==b?this.$.checked=d:"contenteditable"==b?a.call(this,"contentEditable",d):a.apply(this,arguments);return this}:CKEDITOR.env.ie8Compat&&CKEDITOR.env.secure?function(b,d){if("src"==b&&d.match(/^http:\/\//))try{a.apply(this,arguments)}catch(g){}else a.apply(this,arguments);return this}:a}(),setAttributes:function(a){for(var b in a)this.setAttribute(b,
-a[b]);return this},setValue:function(a){this.$.value=a;return this},removeAttribute:function(){var a=function(a){this.$.removeAttribute(a)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){"class"==a?a="className":"tabindex"==a?a="tabIndex":"contenteditable"==a&&(a="contentEditable");this.$.removeAttribute(a)}:a}(),removeAttributes:function(a){if(CKEDITOR.tools.isArray(a))for(var b=0;b<a.length;b++)this.removeAttribute(a[b]);else for(b in a=a||this.getAttributes(),
-a)a.hasOwnProperty(b)&&this.removeAttribute(b)},removeStyle:function(a){var b=this.$.style;if(b.removeProperty||"border"!=a&&"margin"!=a&&"padding"!=a)b.removeProperty?b.removeProperty(a):b.removeAttribute(CKEDITOR.tools.cssStyleToDomStyle(a)),this.$.style.cssText||this.removeAttribute("style");else{var d=["top","left","right","bottom"],g;"border"==a&&(g=["color","style","width"]);for(var b=[],c=0;c<d.length;c++)if(g)for(var e=0;e<g.length;e++)b.push([a,d[c],g[e]].join("-"));else b.push([a,d[c]].join("-"));
-for(a=0;a<b.length;a++)this.removeStyle(b[a])}},setStyle:function(a,b){this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]=b;return this},setStyles:function(a){for(var b in a)this.setStyle(b,a[b]);return this},setOpacity:function(a){CKEDITOR.env.ie&&9>CKEDITOR.env.version?(a=Math.round(100*a),this.setStyle("filter",100<=a?"":"progid:DXImageTransform.Microsoft.Alpha(opacity\x3d"+a+")")):this.setStyle("opacity",a)},unselectable:function(){this.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","none"));
-if(CKEDITOR.env.ie){this.setAttribute("unselectable","on");for(var a,b=this.getElementsByTag("*"),d=0,g=b.count();d<g;d++)a=b.getItem(d),a.setAttribute("unselectable","on")}},getPositionedAncestor:function(){for(var a=this;"html"!=a.getName();){if("static"!=a.getComputedStyle("position"))return a;a=a.getParent()}return null},getDocumentPosition:function(a){var b=0,d=0,g=this.getDocument(),c=g.getBody(),e="BackCompat"==g.$.compatMode;if(document.documentElement.getBoundingClientRect&&(CKEDITOR.env.ie?
-8!==CKEDITOR.env.version:1)){var h=this.$.getBoundingClientRect(),f=g.$.documentElement,n=f.clientTop||c.$.clientTop||0,q=f.clientLeft||c.$.clientLeft||0,m=!0;CKEDITOR.env.ie&&(m=g.getDocumentElement().contains(this),g=g.getBody().contains(this),m=e&&g||!e&&m);m&&(CKEDITOR.env.webkit||CKEDITOR.env.ie&&12<=CKEDITOR.env.version?(b=c.$.scrollLeft||f.scrollLeft,d=c.$.scrollTop||f.scrollTop):(d=e?c.$:f,b=d.scrollLeft,d=d.scrollTop),b=h.left+b-q,d=h.top+d-n)}else for(n=this,q=null;n&&"body"!=n.getName()&&
-"html"!=n.getName();){b+=n.$.offsetLeft-n.$.scrollLeft;d+=n.$.offsetTop-n.$.scrollTop;n.equals(this)||(b+=n.$.clientLeft||0,d+=n.$.clientTop||0);for(;q&&!q.equals(n);)b-=q.$.scrollLeft,d-=q.$.scrollTop,q=q.getParent();q=n;n=(h=n.$.offsetParent)?new CKEDITOR.dom.element(h):null}a&&(h=this.getWindow(),n=a.getWindow(),!h.equals(n)&&h.$.frameElement&&(a=(new CKEDITOR.dom.element(h.$.frameElement)).getDocumentPosition(a),b+=a.x,d+=a.y));document.documentElement.getBoundingClientRect||!CKEDITOR.env.gecko||
-e||(b+=this.$.clientLeft?1:0,d+=this.$.clientTop?1:0);return{x:b,y:d}},scrollIntoView:function(a){var b=this.getParent();if(b){do if((b.$.clientWidth&&b.$.clientWidth<b.$.scrollWidth||b.$.clientHeight&&b.$.clientHeight<b.$.scrollHeight)&&!b.is("body")&&this.scrollIntoParent(b,a,1),b.is("html")){var d=b.getWindow();try{var g=d.$.frameElement;g&&(b=new CKEDITOR.dom.element(g))}catch(c){}}while(b=b.getParent())}},scrollIntoParent:function(a,b,d){var g,c,e,h;function f(g,d){/body|html/.test(a.getName())?
-a.getWindow().$.scrollBy(g,d):(a.$.scrollLeft+=g,a.$.scrollTop+=d)}function n(a,g){var d={x:0,y:0};if(!a.is(m?"body":"html")){var b=a.$.getBoundingClientRect();d.x=b.left;d.y=b.top}b=a.getWindow();b.equals(g)||(b=n(CKEDITOR.dom.element.get(b.$.frameElement),g),d.x+=b.x,d.y+=b.y);return d}function q(a,g){return parseInt(a.getComputedStyle("margin-"+g)||0,10)||0}!a&&(a=this.getWindow());e=a.getDocument();var m="BackCompat"==e.$.compatMode;a instanceof CKEDITOR.dom.window&&(a=m?e.getBody():e.getDocumentElement());
-CKEDITOR.env.webkit&&(e=this.getEditor(!1))&&(e._.previousScrollTop=null);e=a.getWindow();c=n(this,e);var l=n(a,e),C=this.$.offsetHeight;g=this.$.offsetWidth;var r=a.$.clientHeight,w=a.$.clientWidth;e=c.x-q(this,"left")-l.x||0;h=c.y-q(this,"top")-l.y||0;g=c.x+g+q(this,"right")-(l.x+w)||0;c=c.y+C+q(this,"bottom")-(l.y+r)||0;(0>h||0<c)&&f(0,!0===b?h:!1===b?c:0>h?h:c);d&&(0>e||0<g)&&f(0>e?e:g,0)},setState:function(a,b,d){b=b||"cke";switch(a){case CKEDITOR.TRISTATE_ON:this.addClass(b+"_on");this.removeClass(b+
-"_off");this.removeClass(b+"_disabled");d&&this.setAttribute("aria-pressed",!0);d&&this.removeAttribute("aria-disabled");break;case CKEDITOR.TRISTATE_DISABLED:this.addClass(b+"_disabled");this.removeClass(b+"_off");this.removeClass(b+"_on");d&&this.setAttribute("aria-disabled",!0);d&&this.removeAttribute("aria-pressed");break;default:this.addClass(b+"_off"),this.removeClass(b+"_on"),this.removeClass(b+"_disabled"),d&&this.removeAttribute("aria-pressed"),d&&this.removeAttribute("aria-disabled")}},
-getFrameDocument:function(){var a=this.$;try{a.contentWindow.document}catch(b){a.src=a.src}return a&&new CKEDITOR.dom.document(a.contentWindow.document)},copyAttributes:function(a,b){var d=this.$.attributes;b=b||{};for(var g=0;g<d.length;g++){var c=d[g],e=c.nodeName.toLowerCase(),h;if(!(e in b))if("checked"==e&&(h=this.getAttribute(e)))a.setAttribute(e,h);else if(!CKEDITOR.env.ie||this.hasAttribute(e))h=this.getAttribute(e),null===h&&(h=c.nodeValue),a.setAttribute(e,h)}""!==this.$.style.cssText&&
-(a.$.style.cssText=this.$.style.cssText)},renameNode:function(a){if(this.getName()!=a){var b=this.getDocument();a=new CKEDITOR.dom.element(a,b);this.copyAttributes(a);this.moveChildren(a);this.getParent(!0)&&this.$.parentNode.replaceChild(a.$,this.$);a.$["data-cke-expando"]=this.$["data-cke-expando"];this.$=a.$;delete this.getName}},getChild:function(){function a(b,d){var g=b.childNodes;if(0<=d&&d<g.length)return g[d]}return function(b){var d=this.$;if(b.slice)for(b=b.slice();0<b.length&&d;)d=a(d,
-b.shift());else d=a(d,b);return d?new CKEDITOR.dom.node(d):null}}(),getChildCount:function(){return this.$.childNodes.length},disableContextMenu:function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT&&b.hasClass("cke_enable_context_menu")}this.on("contextmenu",function(b){b.data.getTarget().getAscendant(a,!0)||b.data.preventDefault()})},getDirection:function(a){return a?this.getComputedStyle("direction")||this.getDirection()||this.getParent()&&this.getParent().getDirection(1)||this.getDocument().$.dir||
-"ltr":this.getStyle("direction")||this.getAttribute("dir")},data:function(a,b){a="data-"+a;if(void 0===b)return this.getAttribute(a);!1===b?this.removeAttribute(a):this.setAttribute(a,b);return null},getEditor:function(a){var b=CKEDITOR.instances,d,g,c;a=a||void 0===a;for(d in b)if(g=b[d],g.element.equals(this)&&g.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||!a&&(c=g.editable(),c.equals(this)||c.contains(this)))return g;return null},find:function(a){var b=f(this);a=new CKEDITOR.dom.nodeList(this.$.querySelectorAll(c(this,
-a)));b();return a},findOne:function(a){var b=f(this);a=this.$.querySelector(c(this,a));b();return a?new CKEDITOR.dom.element(a):null},forEach:function(a,b,d){if(!(d||b&&this.type!=b))var g=a(this);if(!1!==g){d=this.getChildren();for(var c=0;c<d.count();c++)g=d.getItem(c),g.type==CKEDITOR.NODE_ELEMENT?g.forEach(a,b):b&&g.type!=b||a(g)}}});var l={width:["border-left-width","border-right-width","padding-left","padding-right"],height:["border-top-width","border-bottom-width","padding-top","padding-bottom"]};
-CKEDITOR.dom.element.prototype.setSize=function(a,b,d){"number"==typeof b&&(!d||CKEDITOR.env.ie&&CKEDITOR.env.quirks||(b-=e.call(this,a)),this.setStyle(a,b+"px"))};CKEDITOR.dom.element.prototype.getSize=function(a,b){var d=Math.max(this.$["offset"+CKEDITOR.tools.capitalize(a)],this.$["client"+CKEDITOR.tools.capitalize(a)])||0;b&&(d-=e.call(this,a));return d}}(),CKEDITOR.dom.documentFragment=function(a){a=a||CKEDITOR.document;this.$=a.type==CKEDITOR.NODE_DOCUMENT?a.$.createDocumentFragment():a},CKEDITOR.tools.extend(CKEDITOR.dom.documentFragment.prototype,
+!0:c.safari=!0);var f=0;c.ie&&(f=e?parseFloat(e[1]):c.quirks||!document.documentMode?parseFloat(a.match(/msie (\d+)/)[1]):document.documentMode,c.ie9Compat=9==f,c.ie8Compat=8==f,c.ie7Compat=7==f,c.ie6Compat=7>f||c.quirks);c.gecko&&(e=a.match(/rv:([\d\.]+)/))&&(e=e[1].split("."),f=1E4*e[0]+100*(e[1]||0)+1*(e[2]||0));c.air&&(f=parseFloat(a.match(/ adobeair\/(\d+)/)[1]));c.webkit&&(f=parseFloat(a.match(/ applewebkit\/(\d+)/)[1]));c.version=f;c.isCompatible=!(c.ie&&7>f)&&!(c.gecko&&4E4>f)&&!(c.webkit&&
+534>f);c.hidpi=2<=window.devicePixelRatio;c.needsBrFiller=c.gecko||c.webkit||c.ie&&10<f;c.needsNbspFiller=c.ie&&11>f;c.cssClass="cke_browser_"+(c.ie?"ie":c.gecko?"gecko":c.webkit?"webkit":"unknown");c.quirks&&(c.cssClass+=" cke_browser_quirks");c.ie&&(c.cssClass+=" cke_browser_ie"+(c.quirks?"6 cke_browser_iequirks":c.version));c.air&&(c.cssClass+=" cke_browser_air");c.iOS&&(c.cssClass+=" cke_browser_ios");c.hidpi&&(c.cssClass+=" cke_hidpi");return c}()),"unloaded"==CKEDITOR.status&&function(){CKEDITOR.event.implementOn(CKEDITOR);
+CKEDITOR.loadFullCore=function(){if("basic_ready"!=CKEDITOR.status)CKEDITOR.loadFullCore._load=1;else{delete CKEDITOR.loadFullCore;var a=document.createElement("script");a.type="text/javascript";a.src=CKEDITOR.basePath+"ckeditor.js";document.getElementsByTagName("head")[0].appendChild(a)}};CKEDITOR.loadFullCoreTimeout=0;CKEDITOR.add=function(a){(this._.pending||(this._.pending=[])).push(a)};(function(){CKEDITOR.domReady(function(){var a=CKEDITOR.loadFullCore,e=CKEDITOR.loadFullCoreTimeout;a&&(CKEDITOR.status=
+"basic_ready",a&&a._load?a():e&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},1E3*e))})})();CKEDITOR.status="basic_loaded"}(),"use strict",CKEDITOR.VERBOSITY_WARN=1,CKEDITOR.VERBOSITY_ERROR=2,CKEDITOR.verbosity=CKEDITOR.VERBOSITY_WARN|CKEDITOR.VERBOSITY_ERROR,CKEDITOR.warn=function(a,e){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_WARN&&CKEDITOR.fire("log",{type:"warn",errorCode:a,additionalData:e})},CKEDITOR.error=function(a,e){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_ERROR&&CKEDITOR.fire("log",
+{type:"error",errorCode:a,additionalData:e})},CKEDITOR.on("log",function(a){if(window.console&&window.console.log){var e=console[a.data.type]?a.data.type:"log",c=a.data.errorCode;if(a=a.data.additionalData)console[e]("[CKEDITOR] Error code: "+c+".",a);else console[e]("[CKEDITOR] Error code: "+c+".");console[e]("[CKEDITOR] For more information about this error go to http://docs.ckeditor.com/#!/guide/dev_errors-section-"+c)}},null,null,999),CKEDITOR.dom={},function(){var a=[],e=CKEDITOR.env.gecko?"-moz-":
+CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",c=/&/g,f=/>/g,h=/</g,m=/"/g,l=/&(lt|gt|amp|quot|nbsp|shy|#\d{1,5});/g,k={lt:"\x3c",gt:"\x3e",amp:"\x26",quot:'"',nbsp:" ",shy:"­"},d=function(b,g){return"#"==g[0]?String.fromCharCode(parseInt(g.slice(1),10)):k[g]};CKEDITOR.on("reset",function(){a=[]});CKEDITOR.tools={arrayCompare:function(b,g){if(!b&&!g)return!0;if(!b||!g||b.length!=g.length)return!1;for(var d=0;d<b.length;d++)if(b[d]!=g[d])return!1;return!0},getIndex:function(b,g){for(var d=
+0;d<b.length;++d)if(g(b[d]))return d;return-1},clone:function(b){var g;if(b&&b instanceof Array){g=[];for(var d=0;d<b.length;d++)g[d]=CKEDITOR.tools.clone(b[d]);return g}if(null===b||"object"!=typeof b||b instanceof String||b instanceof Number||b instanceof Boolean||b instanceof Date||b instanceof RegExp||b.nodeType||b.window===b)return b;g=new b.constructor;for(d in b)g[d]=CKEDITOR.tools.clone(b[d]);return g},capitalize:function(b,g){return b.charAt(0).toUpperCase()+(g?b.slice(1):b.slice(1).toLowerCase())},
+extend:function(b){var g=arguments.length,d,a;"boolean"==typeof(d=arguments[g-1])?g--:"boolean"==typeof(d=arguments[g-2])&&(a=arguments[g-1],g-=2);for(var k=1;k<g;k++){var c=arguments[k],n;for(n in c)if(!0===d||null==b[n])if(!a||n in a)b[n]=c[n]}return b},prototypedCopy:function(b){var g=function(){};g.prototype=b;return new g},copy:function(b){var g={},d;for(d in b)g[d]=b[d];return g},isArray:function(b){return"[object Array]"==Object.prototype.toString.call(b)},isEmpty:function(b){for(var g in b)if(b.hasOwnProperty(g))return!1;
+return!0},cssVendorPrefix:function(b,g,d){if(d)return e+b+":"+g+";"+b+":"+g;d={};d[b]=g;d[e+b]=g;return d},cssStyleToDomStyle:function(){var b=document.createElement("div").style,g="undefined"!=typeof b.cssFloat?"cssFloat":"undefined"!=typeof b.styleFloat?"styleFloat":"float";return function(b){return"float"==b?g:b.replace(/-./g,function(g){return g.substr(1).toUpperCase()})}}(),buildStyleHtml:function(b){b=[].concat(b);for(var g,d=[],a=0;a<b.length;a++)if(g=b[a])/@import|[{}]/.test(g)?d.push("\x3cstyle\x3e"+
+g+"\x3c/style\x3e"):d.push('\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+g+'"\x3e');return d.join("")},htmlEncode:function(b){return void 0===b||null===b?"":String(b).replace(c,"\x26amp;").replace(f,"\x26gt;").replace(h,"\x26lt;")},htmlDecode:function(b){return b.replace(l,d)},htmlEncodeAttr:function(b){return CKEDITOR.tools.htmlEncode(b).replace(m,"\x26quot;")},htmlDecodeAttr:function(b){return CKEDITOR.tools.htmlDecode(b)},transformPlainTextToHtml:function(b,g){var d=g==CKEDITOR.ENTER_BR,
+a=this.htmlEncode(b.replace(/\r\n/g,"\n")),a=a.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;"),k=g==CKEDITOR.ENTER_P?"p":"div";if(!d){var c=/\n{2}/g;if(c.test(a))var n="\x3c"+k+"\x3e",f="\x3c/"+k+"\x3e",a=n+a.replace(c,function(){return f+n})+f}a=a.replace(/\n/g,"\x3cbr\x3e");d||(a=a.replace(new RegExp("\x3cbr\x3e(?\x3d\x3c/"+k+"\x3e)"),function(g){return CKEDITOR.tools.repeat(g,2)}));a=a.replace(/^ | $/g,"\x26nbsp;");return a=a.replace(/(>|\s) /g,function(g,b){return b+"\x26nbsp;"}).replace(/ (?=<)/g,
+"\x26nbsp;")},getNextNumber:function(){var b=0;return function(){return++b}}(),getNextId:function(){return"cke_"+this.getNextNumber()},getUniqueId:function(){for(var b="e",g=0;8>g;g++)b+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return b},override:function(b,g){var d=g(b);d.prototype=b.prototype;return d},setTimeout:function(b,g,d,a,k){k||(k=window);d||(d=k);return k.setTimeout(function(){a?b.apply(d,[].concat(a)):b.apply(d)},g||0)},trim:function(){var b=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;
+return function(g){return g.replace(b,"")}}(),ltrim:function(){var b=/^[ \t\n\r]+/g;return function(g){return g.replace(b,"")}}(),rtrim:function(){var b=/[ \t\n\r]+$/g;return function(g){return g.replace(b,"")}}(),indexOf:function(b,g){if("function"==typeof g)for(var d=0,a=b.length;d<a;d++){if(g(b[d]))return d}else{if(b.indexOf)return b.indexOf(g);d=0;for(a=b.length;d<a;d++)if(b[d]===g)return d}return-1},search:function(b,g){var d=CKEDITOR.tools.indexOf(b,g);return 0<=d?b[d]:null},bind:function(b,
+g){return function(){return b.apply(g,arguments)}},createClass:function(b){var g=b.$,d=b.base,a=b.privates||b._,k=b.proto;b=b.statics;!g&&(g=function(){d&&this.base.apply(this,arguments)});if(a)var c=g,g=function(){var g=this._||(this._={}),b;for(b in a){var d=a[b];g[b]="function"==typeof d?CKEDITOR.tools.bind(d,this):d}c.apply(this,arguments)};d&&(g.prototype=this.prototypedCopy(d.prototype),g.prototype.constructor=g,g.base=d,g.baseProto=d.prototype,g.prototype.base=function(){this.base=d.prototype.base;
+d.apply(this,arguments);this.base=arguments.callee});k&&this.extend(g.prototype,k,!0);b&&this.extend(g,b,!0);return g},addFunction:function(b,g){return a.push(function(){return b.apply(g||this,arguments)})-1},removeFunction:function(b){a[b]=null},callFunction:function(b){var g=a[b];return g&&g.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var b=/^-?\d+\.?\d*px$/,g;return function(d){g=CKEDITOR.tools.trim(d+"")+"px";return b.test(g)?g:d||""}}(),convertToPx:function(){var b;
+return function(g){b||(b=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"\x3e\x3c/div\x3e',CKEDITOR.document),CKEDITOR.document.getBody().append(b));return/%$/.test(g)?g:(b.setStyle("width",g),b.$.clientWidth)}}(),repeat:function(b,g){return Array(g+1).join(b)},tryThese:function(){for(var b,g=0,d=arguments.length;g<d;g++){var a=arguments[g];try{b=a();break}catch(k){}}return b},genKey:function(){return Array.prototype.slice.call(arguments).join("-")},
+defer:function(b){return function(){var g=arguments,d=this;window.setTimeout(function(){b.apply(d,g)},0)}},normalizeCssText:function(b,g){var d=[],a,k=CKEDITOR.tools.parseCssText(b,!0,g);for(a in k)d.push(a+":"+k[a]);d.sort();return d.length?d.join(";")+";":""},convertRgbToHex:function(b){return b.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(g,b,d,a){g=[b,d,a];for(b=0;3>b;b++)g[b]=("0"+parseInt(g[b],10).toString(16)).slice(-2);return"#"+g.join("")})},normalizeHex:function(b){return b.replace(/#(([0-9a-f]{3}){1,2})($|;|\s+)/gi,
+function(g,b,d,a){g=b.toLowerCase();3==g.length&&(g=g.split(""),g=[g[0],g[0],g[1],g[1],g[2],g[2]].join(""));return"#"+g+a})},parseCssText:function(b,g,d){var a={};d&&(b=(new CKEDITOR.dom.element("span")).setAttribute("style",b).getAttribute("style")||"");b&&(b=CKEDITOR.tools.normalizeHex(CKEDITOR.tools.convertRgbToHex(b)));if(!b||";"==b)return a;b.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(b,d,k){g&&(d=d.toLowerCase(),"font-family"==d&&(k=k.replace(/\s*,\s*/g,
+",")),k=CKEDITOR.tools.trim(k));a[d]=k});return a},writeCssText:function(b,g){var d,a=[];for(d in b)a.push(d+":"+b[d]);g&&a.sort();return a.join("; ")},objectCompare:function(b,g,d){var a;if(!b&&!g)return!0;if(!b||!g)return!1;for(a in b)if(b[a]!=g[a])return!1;if(!d)for(a in g)if(b[a]!=g[a])return!1;return!0},objectKeys:function(b){var g=[],d;for(d in b)g.push(d);return g},convertArrayToObject:function(b,g){var d={};1==arguments.length&&(g=!0);for(var a=0,k=b.length;a<k;++a)d[b[a]]=g;return d},fixDomain:function(){for(var b;;)try{b=
+window.parent.document.domain;break}catch(g){b=b?b.replace(/.+?(?:\.|$)/,""):document.domain;if(!b)break;document.domain=b}return!!b},eventsBuffer:function(b,g,d){function a(){c=(new Date).getTime();k=!1;d?g.call(d):g()}var k,c=0;return{input:function(){if(!k){var g=(new Date).getTime()-c;g<b?k=setTimeout(a,b-g):a()}},reset:function(){k&&clearTimeout(k);k=c=0}}},enableHtml5Elements:function(b,g){for(var d="abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video".split(" "),
+a=d.length,k;a--;)k=b.createElement(d[a]),g&&b.appendChild(k)},checkIfAnyArrayItemMatches:function(b,g){for(var d=0,a=b.length;d<a;++d)if(b[d].match(g))return!0;return!1},checkIfAnyObjectPropertyMatches:function(b,g){for(var d in b)if(d.match(g))return!0;return!1},keystrokeToString:function(b,g){var d=g&16711680,a=g&65535,k=CKEDITOR.env.mac,c=[],n=[];d&CKEDITOR.CTRL&&(c.push(k?"⌘":b[17]),n.push(k?b[224]:b[17]));d&CKEDITOR.ALT&&(c.push(k?"⌥":b[18]),n.push(b[18]));d&CKEDITOR.SHIFT&&(c.push(k?"⇧":b[16]),
+n.push(b[16]));a&&(b[a]?(c.push(b[a]),n.push(b[a])):(c.push(String.fromCharCode(a)),n.push(String.fromCharCode(a))));return{display:c.join("+"),aria:n.join("+")}},transparentImageData:"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw\x3d\x3d",getCookie:function(b){b=b.toLowerCase();for(var g=document.cookie.split(";"),d,a,k=0;k<g.length;k++)if(d=g[k].split("\x3d"),a=decodeURIComponent(CKEDITOR.tools.trim(d[0]).toLowerCase()),a===b)return decodeURIComponent(1<d.length?
+d[1]:"");return null},setCookie:function(b,g){document.cookie=encodeURIComponent(b)+"\x3d"+encodeURIComponent(g)+";path\x3d/"},getCsrfToken:function(){var b=CKEDITOR.tools.getCookie("ckCsrfToken");if(!b||40!=b.length){var b=[],g="";if(window.crypto&&window.crypto.getRandomValues)b=new Uint8Array(40),window.crypto.getRandomValues(b);else for(var d=0;40>d;d++)b.push(Math.floor(256*Math.random()));for(d=0;d<b.length;d++)var a="abcdefghijklmnopqrstuvwxyz0123456789".charAt(b[d]%36),g=g+(.5<Math.random()?
+a.toUpperCase():a);b=g;CKEDITOR.tools.setCookie("ckCsrfToken",b)}return b},escapeCss:function(b){return b?window.CSS&&CSS.escape?CSS.escape(b):isNaN(parseInt(b.charAt(0),10))?b:"\\3"+b.charAt(0)+" "+b.substring(1,b.length):""},style:{parse:{_colors:{aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aqua:"#00FFFF",aquamarine:"#7FFFD4",azure:"#F0FFFF",beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blue:"#0000FF",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",
+chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",
+darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",fuchsia:"#FF00FF",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",gray:"#808080",green:"#008000",greenyellow:"#ADFF2F",grey:"#808080",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",
+lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgray:"#D3D3D3",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",lightyellow:"#FFFFE0",lime:"#00FF00",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",maroon:"#800000",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",
+mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",navy:"#000080",oldlace:"#FDF5E6",olive:"#808000",olivedrab:"#6B8E23",orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",
+peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",purple:"#800080",rebeccapurple:"#663399",red:"#FF0000",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",silver:"#C0C0C0",skyblue:"#87CEEB",slateblue:"#6A5ACD",slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",teal:"#008080",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",
+violet:"#EE82EE",wheat:"#F5DEB3",white:"#FFFFFF",whitesmoke:"#F5F5F5",yellow:"#FFFF00",yellowgreen:"#9ACD32"},_rgbaRegExp:/rgba?\(\s*\d+%?\s*,\s*\d+%?\s*,\s*\d+%?\s*(?:,\s*[0-9.]+\s*)?\)/gi,_hslaRegExp:/hsla?\(\s*[0-9.]+\s*,\s*\d+%\s*,\s*\d+%\s*(?:,\s*[0-9.]+\s*)?\)/gi,background:function(b){var g=[],d=[],d=this._findColor(b);d.length&&(g.color=d[0],CKEDITOR.tools.array.forEach(d,function(g){b=b.replace(g,"")}));if(b=CKEDITOR.tools.trim(b))g.unprocessed=b;return g},margin:function(b){function g(g){d.top=
+a[g[0]];d.right=a[g[1]];d.bottom=a[g[2]];d.left=a[g[3]]}var d={},a=b.match(/(?:\-?[\.\d]+(?:%|\w*)|auto|inherit|initial|unset)/g)||["0px"];switch(a.length){case 1:g([0,0,0,0]);break;case 2:g([0,1,0,1]);break;case 3:g([0,1,2,1]);break;case 4:g([0,1,2,3])}return d},_findColor:function(b){var g=[],d=CKEDITOR.tools.array,g=g.concat(b.match(this._rgbaRegExp)||[]),g=g.concat(b.match(this._hslaRegExp)||[]);return g=g.concat(d.filter(b.split(/\s+/),function(g){return g.match(/^\#[a-f0-9]{3}(?:[a-f0-9]{3})?$/gi)?
+!0:g.toLowerCase()in CKEDITOR.tools.style.parse._colors}))}}},array:{filter:function(b,g,d){var a=[];this.forEach(b,function(k,c){g.call(d,k,c,b)&&a.push(k)});return a},forEach:function(b,g,d){var a=b.length,k;for(k=0;k<a;k++)g.call(d,b[k],k,b)},map:function(b,g,d){for(var a=[],k=0;k<b.length;k++)a.push(g.call(d,b[k],k,b));return a},reduce:function(b,g,d,a){for(var k=0;k<b.length;k++)d=g.call(a,d,b[k],k,b);return d}}};CKEDITOR.tools.array.indexOf=CKEDITOR.tools.indexOf;CKEDITOR.tools.array.isArray=
+CKEDITOR.tools.isArray}(),CKEDITOR.dtd=function(){var a=CKEDITOR.tools.extend,e=function(b,g){for(var d=CKEDITOR.tools.clone(b),a=1;a<arguments.length;a++){g=arguments[a];for(var k in g)delete d[k]}return d},c={},f={},h={address:1,article:1,aside:1,blockquote:1,details:1,div:1,dl:1,fieldset:1,figure:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,hr:1,main:1,menu:1,nav:1,ol:1,p:1,pre:1,section:1,table:1,ul:1},m={command:1,link:1,meta:1,noscript:1,script:1,style:1},l={},k={"#":1},
+d={center:1,dir:1,noframes:1};a(c,{a:1,abbr:1,area:1,audio:1,b:1,bdi:1,bdo:1,br:1,button:1,canvas:1,cite:1,code:1,command:1,datalist:1,del:1,dfn:1,em:1,embed:1,i:1,iframe:1,img:1,input:1,ins:1,kbd:1,keygen:1,label:1,map:1,mark:1,meter:1,noscript:1,object:1,output:1,progress:1,q:1,ruby:1,s:1,samp:1,script:1,select:1,small:1,span:1,strong:1,sub:1,sup:1,textarea:1,time:1,u:1,"var":1,video:1,wbr:1},k,{acronym:1,applet:1,basefont:1,big:1,font:1,isindex:1,strike:1,style:1,tt:1});a(f,h,c,d);e={a:e(c,{a:1,
+button:1}),abbr:c,address:f,area:l,article:f,aside:f,audio:a({source:1,track:1},f),b:c,base:l,bdi:c,bdo:c,blockquote:f,body:f,br:l,button:e(c,{a:1,button:1}),canvas:c,caption:f,cite:c,code:c,col:l,colgroup:{col:1},command:l,datalist:a({option:1},c),dd:f,del:c,details:a({summary:1},f),dfn:c,div:f,dl:{dt:1,dd:1},dt:f,em:c,embed:l,fieldset:a({legend:1},f),figcaption:f,figure:a({figcaption:1},f),footer:f,form:f,h1:c,h2:c,h3:c,h4:c,h5:c,h6:c,head:a({title:1,base:1},m),header:f,hgroup:{h1:1,h2:1,h3:1,h4:1,
+h5:1,h6:1},hr:l,html:a({head:1,body:1},f,m),i:c,iframe:k,img:l,input:l,ins:c,kbd:c,keygen:l,label:c,legend:c,li:f,link:l,main:f,map:f,mark:c,menu:a({li:1},f),meta:l,meter:e(c,{meter:1}),nav:f,noscript:a({link:1,meta:1,style:1},c),object:a({param:1},c),ol:{li:1},optgroup:{option:1},option:k,output:c,p:c,param:l,pre:c,progress:e(c,{progress:1}),q:c,rp:c,rt:c,ruby:a({rp:1,rt:1},c),s:c,samp:c,script:k,section:f,select:{optgroup:1,option:1},small:c,source:l,span:c,strong:c,style:k,sub:c,summary:a({h1:1,
+h2:1,h3:1,h4:1,h5:1,h6:1},c),sup:c,table:{caption:1,colgroup:1,thead:1,tfoot:1,tbody:1,tr:1},tbody:{tr:1},td:f,textarea:k,tfoot:{tr:1},th:f,thead:{tr:1},time:e(c,{time:1}),title:k,tr:{th:1,td:1},track:l,u:c,ul:{li:1},"var":c,video:a({source:1,track:1},f),wbr:l,acronym:c,applet:a({param:1},f),basefont:l,big:c,center:f,dialog:l,dir:{li:1},font:c,isindex:l,noframes:f,strike:c,tt:c};a(e,{$block:a({audio:1,dd:1,dt:1,figcaption:1,li:1,video:1},h,d),$blockLimit:{article:1,aside:1,audio:1,body:1,caption:1,
+details:1,dir:1,div:1,dl:1,fieldset:1,figcaption:1,figure:1,footer:1,form:1,header:1,hgroup:1,main:1,menu:1,nav:1,ol:1,section:1,table:1,td:1,th:1,tr:1,ul:1,video:1},$cdata:{script:1,style:1},$editable:{address:1,article:1,aside:1,blockquote:1,body:1,details:1,div:1,fieldset:1,figcaption:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,main:1,nav:1,p:1,pre:1,section:1},$empty:{area:1,base:1,basefont:1,br:1,col:1,command:1,dialog:1,embed:1,hr:1,img:1,input:1,isindex:1,keygen:1,link:1,
+meta:1,param:1,source:1,track:1,wbr:1},$inline:c,$list:{dl:1,ol:1,ul:1},$listItem:{dd:1,dt:1,li:1},$nonBodyContent:a({body:1,head:1,html:1},e.head),$nonEditable:{applet:1,audio:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,param:1,script:1,textarea:1,video:1},$object:{applet:1,audio:1,button:1,hr:1,iframe:1,img:1,input:1,object:1,select:1,table:1,textarea:1,video:1},$removeEmpty:{abbr:1,acronym:1,b:1,bdi:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,mark:1,meter:1,
+output:1,q:1,ruby:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,time:1,tt:1,u:1,"var":1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},$transparent:{a:1,audio:1,canvas:1,del:1,ins:1,map:1,noscript:1,object:1,video:1},$intermediate:{caption:1,colgroup:1,dd:1,dt:1,figcaption:1,legend:1,li:1,optgroup:1,option:1,rp:1,rt:1,summary:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1}});return e}(),
+CKEDITOR.dom.event=function(a){this.$=a},CKEDITOR.dom.event.prototype={getKey:function(){return this.$.keyCode||this.$.which},getKeystroke:function(){var a=this.getKey();if(this.$.ctrlKey||this.$.metaKey)a+=CKEDITOR.CTRL;this.$.shiftKey&&(a+=CKEDITOR.SHIFT);this.$.altKey&&(a+=CKEDITOR.ALT);return a},preventDefault:function(a){var e=this.$;e.preventDefault?e.preventDefault():e.returnValue=!1;a&&this.stopPropagation()},stopPropagation:function(){var a=this.$;a.stopPropagation?a.stopPropagation():a.cancelBubble=
+!0},getTarget:function(){var a=this.$.target||this.$.srcElement;return a?new CKEDITOR.dom.node(a):null},getPhase:function(){return this.$.eventPhase||2},getPageOffset:function(){var a=this.getTarget().getDocument().$;return{x:this.$.pageX||this.$.clientX+(a.documentElement.scrollLeft||a.body.scrollLeft),y:this.$.pageY||this.$.clientY+(a.documentElement.scrollTop||a.body.scrollTop)}}},CKEDITOR.CTRL=1114112,CKEDITOR.SHIFT=2228224,CKEDITOR.ALT=4456448,CKEDITOR.EVENT_PHASE_CAPTURING=1,CKEDITOR.EVENT_PHASE_AT_TARGET=
+2,CKEDITOR.EVENT_PHASE_BUBBLING=3,CKEDITOR.dom.domObject=function(a){a&&(this.$=a)},CKEDITOR.dom.domObject.prototype=function(){var a=function(a,c){return function(f){"undefined"!=typeof CKEDITOR&&a.fire(c,new CKEDITOR.dom.event(f))}};return{getPrivate:function(){var a;(a=this.getCustomData("_"))||this.setCustomData("_",a={});return a},on:function(e){var c=this.getCustomData("_cke_nativeListeners");c||(c={},this.setCustomData("_cke_nativeListeners",c));c[e]||(c=c[e]=a(this,e),this.$.addEventListener?
+this.$.addEventListener(e,c,!!CKEDITOR.event.useCapture):this.$.attachEvent&&this.$.attachEvent("on"+e,c));return CKEDITOR.event.prototype.on.apply(this,arguments)},removeListener:function(a){CKEDITOR.event.prototype.removeListener.apply(this,arguments);if(!this.hasListeners(a)){var c=this.getCustomData("_cke_nativeListeners"),f=c&&c[a];f&&(this.$.removeEventListener?this.$.removeEventListener(a,f,!1):this.$.detachEvent&&this.$.detachEvent("on"+a,f),delete c[a])}},removeAllListeners:function(){var a=
+this.getCustomData("_cke_nativeListeners"),c;for(c in a){var f=a[c];this.$.detachEvent?this.$.detachEvent("on"+c,f):this.$.removeEventListener&&this.$.removeEventListener(c,f,!1);delete a[c]}CKEDITOR.event.prototype.removeAllListeners.call(this)}}}(),function(a){var e={};CKEDITOR.on("reset",function(){e={}});a.equals=function(a){try{return a&&a.$===this.$}catch(f){return!1}};a.setCustomData=function(a,f){var h=this.getUniqueId();(e[h]||(e[h]={}))[a]=f;return this};a.getCustomData=function(a){var f=
+this.$["data-cke-expando"];return(f=f&&e[f])&&a in f?f[a]:null};a.removeCustomData=function(a){var f=this.$["data-cke-expando"],f=f&&e[f],h,m;f&&(h=f[a],m=a in f,delete f[a]);return m?h:null};a.clearCustomData=function(){this.removeAllListeners();var a=this.$["data-cke-expando"];a&&delete e[a]};a.getUniqueId=function(){return this.$["data-cke-expando"]||(this.$["data-cke-expando"]=CKEDITOR.tools.getNextNumber())};CKEDITOR.event.implementOn(a)}(CKEDITOR.dom.domObject.prototype),CKEDITOR.dom.node=function(a){return a?
+new CKEDITOR.dom[a.nodeType==CKEDITOR.NODE_DOCUMENT?"document":a.nodeType==CKEDITOR.NODE_ELEMENT?"element":a.nodeType==CKEDITOR.NODE_TEXT?"text":a.nodeType==CKEDITOR.NODE_COMMENT?"comment":a.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT?"documentFragment":"domObject"](a):this},CKEDITOR.dom.node.prototype=new CKEDITOR.dom.domObject,CKEDITOR.NODE_ELEMENT=1,CKEDITOR.NODE_DOCUMENT=9,CKEDITOR.NODE_TEXT=3,CKEDITOR.NODE_COMMENT=8,CKEDITOR.NODE_DOCUMENT_FRAGMENT=11,CKEDITOR.POSITION_IDENTICAL=0,CKEDITOR.POSITION_DISCONNECTED=
+1,CKEDITOR.POSITION_FOLLOWING=2,CKEDITOR.POSITION_PRECEDING=4,CKEDITOR.POSITION_IS_CONTAINED=8,CKEDITOR.POSITION_CONTAINS=16,CKEDITOR.tools.extend(CKEDITOR.dom.node.prototype,{appendTo:function(a,e){a.append(this,e);return a},clone:function(a,e){function c(f){f["data-cke-expando"]&&(f["data-cke-expando"]=!1);if(f.nodeType==CKEDITOR.NODE_ELEMENT||f.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)if(e||f.nodeType!=CKEDITOR.NODE_ELEMENT||f.removeAttribute("id",!1),a){f=f.childNodes;for(var h=0;h<f.length;h++)c(f[h])}}
+function f(c){if(c.type==CKEDITOR.NODE_ELEMENT||c.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT){if(c.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var h=c.getName();":"==h[0]&&c.renameNode(h.substring(1))}if(a)for(h=0;h<c.getChildCount();h++)f(c.getChild(h))}}var h=this.$.cloneNode(a);c(h);h=new CKEDITOR.dom.node(h);CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(this.type==CKEDITOR.NODE_ELEMENT||this.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)&&f(h);return h},hasPrevious:function(){return!!this.$.previousSibling},hasNext:function(){return!!this.$.nextSibling},
+insertAfter:function(a){a.$.parentNode.insertBefore(this.$,a.$.nextSibling);return a},insertBefore:function(a){a.$.parentNode.insertBefore(this.$,a.$);return a},insertBeforeMe:function(a){this.$.parentNode.insertBefore(a.$,this.$);return a},getAddress:function(a){for(var e=[],c=this.getDocument().$.documentElement,f=this.$;f&&f!=c;){var h=f.parentNode;h&&e.unshift(this.getIndex.call({$:f},a));f=h}return e},getDocument:function(){return new CKEDITOR.dom.document(this.$.ownerDocument||this.$.parentNode.ownerDocument)},
+getIndex:function(a){function e(a,k){var d=k?a.nextSibling:a.previousSibling;return d&&d.nodeType==CKEDITOR.NODE_TEXT?c(d)?e(d,k):d:null}function c(a){return!a.nodeValue||a.nodeValue==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE}var f=this.$,h=-1,m;if(!this.$.parentNode||a&&f.nodeType==CKEDITOR.NODE_TEXT&&c(f)&&!e(f)&&!e(f,!0))return-1;do a&&f!=this.$&&f.nodeType==CKEDITOR.NODE_TEXT&&(m||c(f))||(h++,m=f.nodeType==CKEDITOR.NODE_TEXT);while(f=f.previousSibling);return h},getNextSourceNode:function(a,
+e,c){if(c&&!c.call){var f=c;c=function(a){return!a.equals(f)}}a=!a&&this.getFirst&&this.getFirst();var h;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&c&&!1===c(this,!0))return null;a=this.getNext()}for(;!a&&(h=(h||this).getParent());){if(c&&!1===c(h,!0))return null;a=h.getNext()}return!a||c&&!1===c(a)?null:e&&e!=a.type?a.getNextSourceNode(!1,e,c):a},getPreviousSourceNode:function(a,e,c){if(c&&!c.call){var f=c;c=function(a){return!a.equals(f)}}a=!a&&this.getLast&&this.getLast();var h;if(!a){if(this.type==
+CKEDITOR.NODE_ELEMENT&&c&&!1===c(this,!0))return null;a=this.getPrevious()}for(;!a&&(h=(h||this).getParent());){if(c&&!1===c(h,!0))return null;a=h.getPrevious()}return!a||c&&!1===c(a)?null:e&&a.type!=e?a.getPreviousSourceNode(!1,e,c):a},getPrevious:function(a){var e=this.$,c;do c=(e=e.previousSibling)&&10!=e.nodeType&&new CKEDITOR.dom.node(e);while(c&&a&&!a(c));return c},getNext:function(a){var e=this.$,c;do c=(e=e.nextSibling)&&new CKEDITOR.dom.node(e);while(c&&a&&!a(c));return c},getParent:function(a){var e=
+this.$.parentNode;return e&&(e.nodeType==CKEDITOR.NODE_ELEMENT||a&&e.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)?new CKEDITOR.dom.node(e):null},getParents:function(a){var e=this,c=[];do c[a?"push":"unshift"](e);while(e=e.getParent());return c},getCommonAncestor:function(a){if(a.equals(this))return this;if(a.contains&&a.contains(this))return a;var e=this.contains?this:this.getParent();do if(e.contains(a))return e;while(e=e.getParent());return null},getPosition:function(a){var e=this.$,c=a.$;if(e.compareDocumentPosition)return e.compareDocumentPosition(c);
+if(e==c)return CKEDITOR.POSITION_IDENTICAL;if(this.type==CKEDITOR.NODE_ELEMENT&&a.type==CKEDITOR.NODE_ELEMENT){if(e.contains){if(e.contains(c))return CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING;if(c.contains(e))return CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING}if("sourceIndex"in e)return 0>e.sourceIndex||0>c.sourceIndex?CKEDITOR.POSITION_DISCONNECTED:e.sourceIndex<c.sourceIndex?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING}e=this.getAddress();a=a.getAddress();
+for(var c=Math.min(e.length,a.length),f=0;f<c;f++)if(e[f]!=a[f])return e[f]<a[f]?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING;return e.length<a.length?CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING},getAscendant:function(a,e){var c=this.$,f,h;e||(c=c.parentNode);"function"==typeof a?(h=!0,f=a):(h=!1,f=function(c){c="string"==typeof c.nodeName?c.nodeName.toLowerCase():"";return"string"==typeof a?c==a:c in a});for(;c;){if(f(h?
+new CKEDITOR.dom.node(c):c))return new CKEDITOR.dom.node(c);try{c=c.parentNode}catch(m){c=null}}return null},hasAscendant:function(a,e){var c=this.$;e||(c=c.parentNode);for(;c;){if(c.nodeName&&c.nodeName.toLowerCase()==a)return!0;c=c.parentNode}return!1},move:function(a,e){a.append(this.remove(),e)},remove:function(a){var e=this.$,c=e.parentNode;if(c){if(a)for(;a=e.firstChild;)c.insertBefore(e.removeChild(a),e);c.removeChild(e)}return this},replace:function(a){this.insertBefore(a);a.remove()},trim:function(){this.ltrim();
+this.rtrim()},ltrim:function(){for(var a;this.getFirst&&(a=this.getFirst());){if(a.type==CKEDITOR.NODE_TEXT){var e=CKEDITOR.tools.ltrim(a.getText()),c=a.getLength();if(e)e.length<c&&(a.split(c-e.length),this.$.removeChild(this.$.firstChild));else{a.remove();continue}}break}},rtrim:function(){for(var a;this.getLast&&(a=this.getLast());){if(a.type==CKEDITOR.NODE_TEXT){var e=CKEDITOR.tools.rtrim(a.getText()),c=a.getLength();if(e)e.length<c&&(a.split(e.length),this.$.lastChild.parentNode.removeChild(this.$.lastChild));
+else{a.remove();continue}}break}CKEDITOR.env.needsBrFiller&&(a=this.$.lastChild)&&1==a.type&&"br"==a.nodeName.toLowerCase()&&a.parentNode.removeChild(a)},isReadOnly:function(a){var e=this;this.type!=CKEDITOR.NODE_ELEMENT&&(e=this.getParent());CKEDITOR.env.edge&&e&&e.is("textarea","input")&&(a=!0);if(!a&&e&&"undefined"!=typeof e.$.isContentEditable)return!(e.$.isContentEditable||e.data("cke-editable"));for(;e;){if(e.data("cke-editable"))return!1;if(e.hasAttribute("contenteditable"))return"false"==
+e.getAttribute("contenteditable");e=e.getParent()}return!0}}),CKEDITOR.dom.window=function(a){CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.window.prototype=new CKEDITOR.dom.domObject,CKEDITOR.tools.extend(CKEDITOR.dom.window.prototype,{focus:function(){this.$.focus()},getViewPaneSize:function(){var a=this.$.document,e="CSS1Compat"==a.compatMode;return{width:(e?a.documentElement.clientWidth:a.body.clientWidth)||0,height:(e?a.documentElement.clientHeight:a.body.clientHeight)||0}},getScrollPosition:function(){var a=
+this.$;if("pageXOffset"in a)return{x:a.pageXOffset||0,y:a.pageYOffset||0};a=a.document;return{x:a.documentElement.scrollLeft||a.body.scrollLeft||0,y:a.documentElement.scrollTop||a.body.scrollTop||0}},getFrame:function(){var a=this.$.frameElement;return a?new CKEDITOR.dom.element.get(a):null}}),CKEDITOR.dom.document=function(a){CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.document.prototype=new CKEDITOR.dom.domObject,CKEDITOR.tools.extend(CKEDITOR.dom.document.prototype,{type:CKEDITOR.NODE_DOCUMENT,
+appendStyleSheet:function(a){if(this.$.createStyleSheet)this.$.createStyleSheet(a);else{var e=new CKEDITOR.dom.element("link");e.setAttributes({rel:"stylesheet",type:"text/css",href:a});this.getHead().append(e)}},appendStyleText:function(a){if(this.$.createStyleSheet){var e=this.$.createStyleSheet("");e.cssText=a}else{var c=new CKEDITOR.dom.element("style",this);c.append(new CKEDITOR.dom.text(a,this));this.getHead().append(c)}return e||c.$.sheet},createElement:function(a,e){var c=new CKEDITOR.dom.element(a,
+this);e&&(e.attributes&&c.setAttributes(e.attributes),e.styles&&c.setStyles(e.styles));return c},createText:function(a){return new CKEDITOR.dom.text(a,this)},focus:function(){this.getWindow().focus()},getActive:function(){var a;try{a=this.$.activeElement}catch(e){return null}return new CKEDITOR.dom.element(a)},getById:function(a){return(a=this.$.getElementById(a))?new CKEDITOR.dom.element(a):null},getByAddress:function(a,e){for(var c=this.$.documentElement,f=0;c&&f<a.length;f++){var h=a[f];if(e)for(var m=
+-1,l=0;l<c.childNodes.length;l++){var k=c.childNodes[l];if(!0!==e||3!=k.nodeType||!k.previousSibling||3!=k.previousSibling.nodeType)if(m++,m==h){c=k;break}}else c=c.childNodes[h]}return c?new CKEDITOR.dom.node(c):null},getElementsByTag:function(a,e){CKEDITOR.env.ie&&8>=document.documentMode||!e||(a=e+":"+a);return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(a))},getHead:function(){var a=this.$.getElementsByTagName("head")[0];return a=a?new CKEDITOR.dom.element(a):this.getDocumentElement().append(new CKEDITOR.dom.element("head"),
+!0)},getBody:function(){return new CKEDITOR.dom.element(this.$.body)},getDocumentElement:function(){return new CKEDITOR.dom.element(this.$.documentElement)},getWindow:function(){return new CKEDITOR.dom.window(this.$.parentWindow||this.$.defaultView)},write:function(a){this.$.open("text/html","replace");CKEDITOR.env.ie&&(a=a.replace(/(?:^\s*<!DOCTYPE[^>]*?>)|^/i,'$\x26\n\x3cscript data-cke-temp\x3d"1"\x3e('+CKEDITOR.tools.fixDomain+")();\x3c/script\x3e"));this.$.write(a);this.$.close()},find:function(a){return new CKEDITOR.dom.nodeList(this.$.querySelectorAll(a))},
+findOne:function(a){return(a=this.$.querySelector(a))?new CKEDITOR.dom.element(a):null},_getHtml5ShivFrag:function(){var a=this.getCustomData("html5ShivFrag");a||(a=this.$.createDocumentFragment(),CKEDITOR.tools.enableHtml5Elements(a,!0),this.setCustomData("html5ShivFrag",a));return a}}),CKEDITOR.dom.nodeList=function(a){this.$=a},CKEDITOR.dom.nodeList.prototype={count:function(){return this.$.length},getItem:function(a){return 0>a||a>=this.$.length?null:(a=this.$[a])?new CKEDITOR.dom.node(a):null}},
+CKEDITOR.dom.element=function(a,e){"string"==typeof a&&(a=(e?e.$:document).createElement(a));CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.element.get=function(a){return(a="string"==typeof a?document.getElementById(a)||document.getElementsByName(a)[0]:a)&&(a.$?a:new CKEDITOR.dom.element(a))},CKEDITOR.dom.element.prototype=new CKEDITOR.dom.node,CKEDITOR.dom.element.createFromHtml=function(a,e){var c=new CKEDITOR.dom.element("div",e);c.setHtml(a);return c.getFirst().remove()},CKEDITOR.dom.element.setMarker=
+function(a,e,c,f){var h=e.getCustomData("list_marker_id")||e.setCustomData("list_marker_id",CKEDITOR.tools.getNextNumber()).getCustomData("list_marker_id"),m=e.getCustomData("list_marker_names")||e.setCustomData("list_marker_names",{}).getCustomData("list_marker_names");a[h]=e;m[c]=1;return e.setCustomData(c,f)},CKEDITOR.dom.element.clearAllMarkers=function(a){for(var e in a)CKEDITOR.dom.element.clearMarkers(a,a[e],1)},CKEDITOR.dom.element.clearMarkers=function(a,e,c){var f=e.getCustomData("list_marker_names"),
+h=e.getCustomData("list_marker_id"),m;for(m in f)e.removeCustomData(m);e.removeCustomData("list_marker_names");c&&(e.removeCustomData("list_marker_id"),delete a[h])},function(){function a(a,d){return-1<(" "+a+" ").replace(m," ").indexOf(" "+d+" ")}function e(a){var d=!0;a.$.id||(a.$.id="cke_tmp_"+CKEDITOR.tools.getNextNumber(),d=!1);return function(){d||a.removeAttribute("id")}}function c(a,d){var b=CKEDITOR.tools.escapeCss(a.$.id);return"#"+b+" "+d.split(/,\s*/).join(", #"+b+" ")}function f(a){for(var d=
+0,b=0,g=l[a].length;b<g;b++)d+=parseFloat(this.getComputedStyle(l[a][b])||0,10)||0;return d}var h=document.createElement("_").classList,h="undefined"!==typeof h&&null!==String(h.add).match(/\[Native code\]/gi),m=/[\n\t\r]/g;CKEDITOR.tools.extend(CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_ELEMENT,addClass:h?function(a){this.$.classList.add(a);return this}:function(k){var d=this.$.className;d&&(a(d,k)||(d+=" "+k));this.$.className=d||k;return this},removeClass:h?function(a){var d=this.$;d.classList.remove(a);
+d.className||d.removeAttribute("class");return this}:function(k){var d=this.getAttribute("class");d&&a(d,k)&&((d=d.replace(new RegExp("(?:^|\\s+)"+k+"(?\x3d\\s|$)"),"").replace(/^\s+/,""))?this.setAttribute("class",d):this.removeAttribute("class"));return this},hasClass:function(k){return a(this.$.className,k)},append:function(a,d){"string"==typeof a&&(a=this.getDocument().createElement(a));d?this.$.insertBefore(a.$,this.$.firstChild):this.$.appendChild(a.$);return a},appendHtml:function(a){if(this.$.childNodes.length){var d=
+new CKEDITOR.dom.element("div",this.getDocument());d.setHtml(a);d.moveChildren(this)}else this.setHtml(a)},appendText:function(a){null!=this.$.text&&CKEDITOR.env.ie&&9>CKEDITOR.env.version?this.$.text+=a:this.append(new CKEDITOR.dom.text(a))},appendBogus:function(a){if(a||CKEDITOR.env.needsBrFiller){for(a=this.getLast();a&&a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.rtrim(a.getText());)a=a.getPrevious();a&&a.is&&a.is("br")||(a=this.getDocument().createElement("br"),CKEDITOR.env.gecko&&a.setAttribute("type",
+"_moz"),this.append(a))}},breakParent:function(a,d){var b=new CKEDITOR.dom.range(this.getDocument());b.setStartAfter(this);b.setEndAfter(a);var g=b.extractContents(!1,d||!1),c;b.insertNode(this.remove());if(CKEDITOR.env.ie&&!CKEDITOR.env.edge){for(b=new CKEDITOR.dom.element("div");c=g.getFirst();)c.$.style.backgroundColor&&(c.$.style.backgroundColor=c.$.style.backgroundColor),b.append(c);b.insertAfter(this);b.remove(!0)}else g.insertAfterNode(this)},contains:document.compareDocumentPosition?function(a){return!!(this.$.compareDocumentPosition(a.$)&
+16)}:function(a){var d=this.$;return a.type!=CKEDITOR.NODE_ELEMENT?d.contains(a.getParent().$):d!=a.$&&d.contains(a.$)},focus:function(){function a(){try{this.$.focus()}catch(d){}}return function(d){d?CKEDITOR.tools.setTimeout(a,100,this):a.call(this)}}(),getHtml:function(){var a=this.$.innerHTML;return CKEDITOR.env.ie?a.replace(/<\?[^>]*>/g,""):a},getOuterHtml:function(){if(this.$.outerHTML)return this.$.outerHTML.replace(/<\?[^>]*>/,"");var a=this.$.ownerDocument.createElement("div");a.appendChild(this.$.cloneNode(!0));
+return a.innerHTML},getClientRect:function(){var a=CKEDITOR.tools.extend({},this.$.getBoundingClientRect());!a.width&&(a.width=a.right-a.left);!a.height&&(a.height=a.bottom-a.top);return a},setHtml:CKEDITOR.env.ie&&9>CKEDITOR.env.version?function(a){try{var d=this.$;if(this.getParent())return d.innerHTML=a;var b=this.getDocument()._getHtml5ShivFrag();b.appendChild(d);d.innerHTML=a;b.removeChild(d);return a}catch(g){this.$.innerHTML="";d=new CKEDITOR.dom.element("body",this.getDocument());d.$.innerHTML=
+a;for(d=d.getChildren();d.count();)this.append(d.getItem(0));return a}}:function(a){return this.$.innerHTML=a},setText:function(){var a=document.createElement("p");a.innerHTML="x";a=a.textContent;return function(d){this.$[a?"textContent":"innerText"]=d}}(),getAttribute:function(){var a=function(a){return this.$.getAttribute(a,2)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){switch(a){case "class":a="className";break;case "http-equiv":a="httpEquiv";break;case "name":return this.$.name;
+case "tabindex":return a=this.$.getAttribute(a,2),0!==a&&0===this.$.tabIndex&&(a=null),a;case "checked":return a=this.$.attributes.getNamedItem(a),(a.specified?a.nodeValue:this.$.checked)?"checked":null;case "hspace":case "value":return this.$[a];case "style":return this.$.style.cssText;case "contenteditable":case "contentEditable":return this.$.attributes.getNamedItem("contentEditable").specified?this.$.getAttribute("contentEditable"):null}return this.$.getAttribute(a,2)}:a}(),getAttributes:function(a){var d=
+{},b=this.$.attributes,g;a=CKEDITOR.tools.isArray(a)?a:[];for(g=0;g<b.length;g++)-1===CKEDITOR.tools.indexOf(a,b[g].name)&&(d[b[g].name]=b[g].value);return d},getChildren:function(){return new CKEDITOR.dom.nodeList(this.$.childNodes)},getComputedStyle:document.defaultView&&document.defaultView.getComputedStyle?function(a){var d=this.getWindow().$.getComputedStyle(this.$,null);return d?d.getPropertyValue(a):""}:function(a){return this.$.currentStyle[CKEDITOR.tools.cssStyleToDomStyle(a)]},getDtd:function(){var a=
+CKEDITOR.dtd[this.getName()];this.getDtd=function(){return a};return a},getElementsByTag:CKEDITOR.dom.document.prototype.getElementsByTag,getTabIndex:function(){var a=this.$.tabIndex;return 0!==a||CKEDITOR.dtd.$tabIndex[this.getName()]||0===parseInt(this.getAttribute("tabindex"),10)?a:-1},getText:function(){return this.$.textContent||this.$.innerText||""},getWindow:function(){return this.getDocument().getWindow()},getId:function(){return this.$.id||null},getNameAtt:function(){return this.$.name||
+null},getName:function(){var a=this.$.nodeName.toLowerCase();if(CKEDITOR.env.ie&&8>=document.documentMode){var d=this.$.scopeName;"HTML"!=d&&(a=d.toLowerCase()+":"+a)}this.getName=function(){return a};return this.getName()},getValue:function(){return this.$.value},getFirst:function(a){var d=this.$.firstChild;(d=d&&new CKEDITOR.dom.node(d))&&a&&!a(d)&&(d=d.getNext(a));return d},getLast:function(a){var d=this.$.lastChild;(d=d&&new CKEDITOR.dom.node(d))&&a&&!a(d)&&(d=d.getPrevious(a));return d},getStyle:function(a){return this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]},
+is:function(){var a=this.getName();if("object"==typeof arguments[0])return!!arguments[0][a];for(var d=0;d<arguments.length;d++)if(arguments[d]==a)return!0;return!1},isEditable:function(a){var d=this.getName();return this.isReadOnly()||"none"==this.getComputedStyle("display")||"hidden"==this.getComputedStyle("visibility")||CKEDITOR.dtd.$nonEditable[d]||CKEDITOR.dtd.$empty[d]||this.is("a")&&(this.data("cke-saved-name")||this.hasAttribute("name"))&&!this.getChildCount()?!1:!1!==a?(a=CKEDITOR.dtd[d]||
+CKEDITOR.dtd.span,!(!a||!a["#"])):!0},isIdentical:function(a){var d=this.clone(0,1);a=a.clone(0,1);d.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);a.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);if(d.$.isEqualNode)return d.$.style.cssText=CKEDITOR.tools.normalizeCssText(d.$.style.cssText),a.$.style.cssText=CKEDITOR.tools.normalizeCssText(a.$.style.cssText),d.$.isEqualNode(a.$);d=d.getOuterHtml();a=
+a.getOuterHtml();if(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&this.is("a")){var b=this.getParent();b.type==CKEDITOR.NODE_ELEMENT&&(b=b.clone(),b.setHtml(d),d=b.getHtml(),b.setHtml(a),a=b.getHtml())}return d==a},isVisible:function(){var a=(this.$.offsetHeight||this.$.offsetWidth)&&"hidden"!=this.getComputedStyle("visibility"),d,b;a&&CKEDITOR.env.webkit&&(d=this.getWindow(),!d.equals(CKEDITOR.document.getWindow())&&(b=d.$.frameElement)&&(a=(new CKEDITOR.dom.element(b)).isVisible()));return!!a},isEmptyInlineRemoveable:function(){if(!CKEDITOR.dtd.$removeEmpty[this.getName()])return!1;
+for(var a=this.getChildren(),d=0,b=a.count();d<b;d++){var g=a.getItem(d);if(g.type!=CKEDITOR.NODE_ELEMENT||!g.data("cke-bookmark"))if(g.type==CKEDITOR.NODE_ELEMENT&&!g.isEmptyInlineRemoveable()||g.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(g.getText()))return!1}return!0},hasAttributes:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(){for(var a=this.$.attributes,d=0;d<a.length;d++){var b=a[d];switch(b.nodeName){case "class":if(this.getAttribute("class"))return!0;case "data-cke-expando":continue;
+default:if(b.specified)return!0}}return!1}:function(){var a=this.$.attributes,d=a.length,b={"data-cke-expando":1,_moz_dirty:1};return 0<d&&(2<d||!b[a[0].nodeName]||2==d&&!b[a[1].nodeName])},hasAttribute:function(){function a(d){var b=this.$.attributes.getNamedItem(d);if("input"==this.getName())switch(d){case "class":return 0<this.$.className.length;case "checked":return!!this.$.checked;case "value":return d=this.getAttribute("type"),"checkbox"==d||"radio"==d?"on"!=this.$.value:!!this.$.value}return b?
+b.specified:!1}return CKEDITOR.env.ie?8>CKEDITOR.env.version?function(d){return"name"==d?!!this.$.name:a.call(this,d)}:a:function(a){return!!this.$.attributes.getNamedItem(a)}}(),hide:function(){this.setStyle("display","none")},moveChildren:function(a,d){var b=this.$;a=a.$;if(b!=a){var g;if(d)for(;g=b.lastChild;)a.insertBefore(b.removeChild(g),a.firstChild);else for(;g=b.firstChild;)a.appendChild(b.removeChild(g))}},mergeSiblings:function(){function a(d,b,g){if(b&&b.type==CKEDITOR.NODE_ELEMENT){for(var c=
+[];b.data("cke-bookmark")||b.isEmptyInlineRemoveable();)if(c.push(b),b=g?b.getNext():b.getPrevious(),!b||b.type!=CKEDITOR.NODE_ELEMENT)return;if(d.isIdentical(b)){for(var k=g?d.getLast():d.getFirst();c.length;)c.shift().move(d,!g);b.moveChildren(d,!g);b.remove();k&&k.type==CKEDITOR.NODE_ELEMENT&&k.mergeSiblings()}}}return function(d){if(!1===d||CKEDITOR.dtd.$removeEmpty[this.getName()]||this.is("a"))a(this,this.getNext(),!0),a(this,this.getPrevious())}}(),show:function(){this.setStyles({display:"",
+visibility:""})},setAttribute:function(){var a=function(a,b){this.$.setAttribute(a,b);return this};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(d,b){"class"==d?this.$.className=b:"style"==d?this.$.style.cssText=b:"tabindex"==d?this.$.tabIndex=b:"checked"==d?this.$.checked=b:"contenteditable"==d?a.call(this,"contentEditable",b):a.apply(this,arguments);return this}:CKEDITOR.env.ie8Compat&&CKEDITOR.env.secure?function(d,b){if("src"==d&&b.match(/^http:\/\//))try{a.apply(this,
+arguments)}catch(g){}else a.apply(this,arguments);return this}:a}(),setAttributes:function(a){for(var d in a)this.setAttribute(d,a[d]);return this},setValue:function(a){this.$.value=a;return this},removeAttribute:function(){var a=function(a){this.$.removeAttribute(a)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){"class"==a?a="className":"tabindex"==a?a="tabIndex":"contenteditable"==a&&(a="contentEditable");this.$.removeAttribute(a)}:a}(),removeAttributes:function(a){if(CKEDITOR.tools.isArray(a))for(var d=
+0;d<a.length;d++)this.removeAttribute(a[d]);else for(d in a=a||this.getAttributes(),a)a.hasOwnProperty(d)&&this.removeAttribute(d)},removeStyle:function(a){var d=this.$.style;if(d.removeProperty||"border"!=a&&"margin"!=a&&"padding"!=a)d.removeProperty?d.removeProperty(a):d.removeAttribute(CKEDITOR.tools.cssStyleToDomStyle(a)),this.$.style.cssText||this.removeAttribute("style");else{var b=["top","left","right","bottom"],g;"border"==a&&(g=["color","style","width"]);for(var d=[],c=0;c<b.length;c++)if(g)for(var f=
+0;f<g.length;f++)d.push([a,b[c],g[f]].join("-"));else d.push([a,b[c]].join("-"));for(a=0;a<d.length;a++)this.removeStyle(d[a])}},setStyle:function(a,d){this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]=d;return this},setStyles:function(a){for(var d in a)this.setStyle(d,a[d]);return this},setOpacity:function(a){CKEDITOR.env.ie&&9>CKEDITOR.env.version?(a=Math.round(100*a),this.setStyle("filter",100<=a?"":"progid:DXImageTransform.Microsoft.Alpha(opacity\x3d"+a+")")):this.setStyle("opacity",a)},unselectable:function(){this.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select",
+"none"));if(CKEDITOR.env.ie){this.setAttribute("unselectable","on");for(var a,d=this.getElementsByTag("*"),b=0,g=d.count();b<g;b++)a=d.getItem(b),a.setAttribute("unselectable","on")}},getPositionedAncestor:function(){for(var a=this;"html"!=a.getName();){if("static"!=a.getComputedStyle("position"))return a;a=a.getParent()}return null},getDocumentPosition:function(a){var d=0,b=0,g=this.getDocument(),c=g.getBody(),f="BackCompat"==g.$.compatMode;if(document.documentElement.getBoundingClientRect&&(CKEDITOR.env.ie?
+8!==CKEDITOR.env.version:1)){var h=this.$.getBoundingClientRect(),e=g.$.documentElement,n=e.clientTop||c.$.clientTop||0,q=e.clientLeft||c.$.clientLeft||0,m=!0;CKEDITOR.env.ie&&(m=g.getDocumentElement().contains(this),g=g.getBody().contains(this),m=f&&g||!f&&m);m&&(CKEDITOR.env.webkit||CKEDITOR.env.ie&&12<=CKEDITOR.env.version?(d=c.$.scrollLeft||e.scrollLeft,b=c.$.scrollTop||e.scrollTop):(b=f?c.$:e,d=b.scrollLeft,b=b.scrollTop),d=h.left+d-q,b=h.top+b-n)}else for(n=this,q=null;n&&"body"!=n.getName()&&
+"html"!=n.getName();){d+=n.$.offsetLeft-n.$.scrollLeft;b+=n.$.offsetTop-n.$.scrollTop;n.equals(this)||(d+=n.$.clientLeft||0,b+=n.$.clientTop||0);for(;q&&!q.equals(n);)d-=q.$.scrollLeft,b-=q.$.scrollTop,q=q.getParent();q=n;n=(h=n.$.offsetParent)?new CKEDITOR.dom.element(h):null}a&&(h=this.getWindow(),n=a.getWindow(),!h.equals(n)&&h.$.frameElement&&(a=(new CKEDITOR.dom.element(h.$.frameElement)).getDocumentPosition(a),d+=a.x,b+=a.y));document.documentElement.getBoundingClientRect||!CKEDITOR.env.gecko||
+f||(d+=this.$.clientLeft?1:0,b+=this.$.clientTop?1:0);return{x:d,y:b}},scrollIntoView:function(a){var d=this.getParent();if(d){do if((d.$.clientWidth&&d.$.clientWidth<d.$.scrollWidth||d.$.clientHeight&&d.$.clientHeight<d.$.scrollHeight)&&!d.is("body")&&this.scrollIntoParent(d,a,1),d.is("html")){var b=d.getWindow();try{var g=b.$.frameElement;g&&(d=new CKEDITOR.dom.element(g))}catch(c){}}while(d=d.getParent())}},scrollIntoParent:function(a,d,b){var g,c,f,h;function e(g,b){/body|html/.test(a.getName())?
+a.getWindow().$.scrollBy(g,b):(a.$.scrollLeft+=g,a.$.scrollTop+=b)}function n(a,g){var b={x:0,y:0};if(!a.is(m?"body":"html")){var d=a.$.getBoundingClientRect();b.x=d.left;b.y=d.top}d=a.getWindow();d.equals(g)||(d=n(CKEDITOR.dom.element.get(d.$.frameElement),g),b.x+=d.x,b.y+=d.y);return b}function q(a,g){return parseInt(a.getComputedStyle("margin-"+g)||0,10)||0}!a&&(a=this.getWindow());f=a.getDocument();var m="BackCompat"==f.$.compatMode;a instanceof CKEDITOR.dom.window&&(a=m?f.getBody():f.getDocumentElement());
+CKEDITOR.env.webkit&&(f=this.getEditor(!1))&&(f._.previousScrollTop=null);f=a.getWindow();c=n(this,f);var l=n(a,f),y=this.$.offsetHeight;g=this.$.offsetWidth;var t=a.$.clientHeight,x=a.$.clientWidth;f=c.x-q(this,"left")-l.x||0;h=c.y-q(this,"top")-l.y||0;g=c.x+g+q(this,"right")-(l.x+x)||0;c=c.y+y+q(this,"bottom")-(l.y+t)||0;(0>h||0<c)&&e(0,!0===d?h:!1===d?c:0>h?h:c);b&&(0>f||0<g)&&e(0>f?f:g,0)},setState:function(a,d,b){d=d||"cke";switch(a){case CKEDITOR.TRISTATE_ON:this.addClass(d+"_on");this.removeClass(d+
+"_off");this.removeClass(d+"_disabled");b&&this.setAttribute("aria-pressed",!0);b&&this.removeAttribute("aria-disabled");break;case CKEDITOR.TRISTATE_DISABLED:this.addClass(d+"_disabled");this.removeClass(d+"_off");this.removeClass(d+"_on");b&&this.setAttribute("aria-disabled",!0);b&&this.removeAttribute("aria-pressed");break;default:this.addClass(d+"_off"),this.removeClass(d+"_on"),this.removeClass(d+"_disabled"),b&&this.removeAttribute("aria-pressed"),b&&this.removeAttribute("aria-disabled")}},
+getFrameDocument:function(){var a=this.$;try{a.contentWindow.document}catch(d){a.src=a.src}return a&&new CKEDITOR.dom.document(a.contentWindow.document)},copyAttributes:function(a,d){var b=this.$.attributes;d=d||{};for(var g=0;g<b.length;g++){var c=b[g],f=c.nodeName.toLowerCase(),h;if(!(f in d))if("checked"==f&&(h=this.getAttribute(f)))a.setAttribute(f,h);else if(!CKEDITOR.env.ie||this.hasAttribute(f))h=this.getAttribute(f),null===h&&(h=c.nodeValue),a.setAttribute(f,h)}""!==this.$.style.cssText&&
+(a.$.style.cssText=this.$.style.cssText)},renameNode:function(a){if(this.getName()!=a){var d=this.getDocument();a=new CKEDITOR.dom.element(a,d);this.copyAttributes(a);this.moveChildren(a);this.getParent(!0)&&this.$.parentNode.replaceChild(a.$,this.$);a.$["data-cke-expando"]=this.$["data-cke-expando"];this.$=a.$;delete this.getName}},getChild:function(){function a(d,b){var g=d.childNodes;if(0<=b&&b<g.length)return g[b]}return function(d){var b=this.$;if(d.slice)for(d=d.slice();0<d.length&&b;)b=a(b,
+d.shift());else b=a(b,d);return b?new CKEDITOR.dom.node(b):null}}(),getChildCount:function(){return this.$.childNodes.length},disableContextMenu:function(){function a(d){return d.type==CKEDITOR.NODE_ELEMENT&&d.hasClass("cke_enable_context_menu")}this.on("contextmenu",function(d){d.data.getTarget().getAscendant(a,!0)||d.data.preventDefault()})},getDirection:function(a){return a?this.getComputedStyle("direction")||this.getDirection()||this.getParent()&&this.getParent().getDirection(1)||this.getDocument().$.dir||
+"ltr":this.getStyle("direction")||this.getAttribute("dir")},data:function(a,d){a="data-"+a;if(void 0===d)return this.getAttribute(a);!1===d?this.removeAttribute(a):this.setAttribute(a,d);return null},getEditor:function(a){var d=CKEDITOR.instances,b,g,c;a=a||void 0===a;for(b in d)if(g=d[b],g.element.equals(this)&&g.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||!a&&(c=g.editable())&&(c.equals(this)||c.contains(this)))return g;return null},find:function(a){var d=e(this);a=new CKEDITOR.dom.nodeList(this.$.querySelectorAll(c(this,
+a)));d();return a},findOne:function(a){var d=e(this);a=this.$.querySelector(c(this,a));d();return a?new CKEDITOR.dom.element(a):null},forEach:function(a,d,b){if(!(b||d&&this.type!=d))var g=a(this);if(!1!==g){b=this.getChildren();for(var c=0;c<b.count();c++)g=b.getItem(c),g.type==CKEDITOR.NODE_ELEMENT?g.forEach(a,d):d&&g.type!=d||a(g)}}});var l={width:["border-left-width","border-right-width","padding-left","padding-right"],height:["border-top-width","border-bottom-width","padding-top","padding-bottom"]};
+CKEDITOR.dom.element.prototype.setSize=function(a,d,b){"number"==typeof d&&(!b||CKEDITOR.env.ie&&CKEDITOR.env.quirks||(d-=f.call(this,a)),this.setStyle(a,d+"px"))};CKEDITOR.dom.element.prototype.getSize=function(a,d){var b=Math.max(this.$["offset"+CKEDITOR.tools.capitalize(a)],this.$["client"+CKEDITOR.tools.capitalize(a)])||0;d&&(b-=f.call(this,a));return b}}(),CKEDITOR.dom.documentFragment=function(a){a=a||CKEDITOR.document;this.$=a.type==CKEDITOR.NODE_DOCUMENT?a.$.createDocumentFragment():a},CKEDITOR.tools.extend(CKEDITOR.dom.documentFragment.prototype,
 CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,insertAfterNode:function(a){a=a.$;a.parentNode.insertBefore(this.$,a.nextSibling)},getHtml:function(){var a=new CKEDITOR.dom.element("div");this.clone(1,1).appendTo(a);return a.getHtml().replace(/\s*data-cke-expando=".*?"/g,"")}},!0,{append:1,appendBogus:1,clone:1,getFirst:1,getHtml:1,getLast:1,getParent:1,getNext:1,getPrevious:1,appendTo:1,moveChildren:1,insertBefore:1,insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,
-getChildCount:1,getChild:1,getChildren:1}),function(){function a(a,g){var d=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(d.collapsed)return this.end(),null;d.optimize()}var b,c=d.startContainer;b=d.endContainer;var e=d.startOffset,h=d.endOffset,p,f=this.guard,k=this.type,m=a?"getPreviousSourceNode":"getNextSourceNode";if(!a&&!this._.guardLTR){var l=b.type==CKEDITOR.NODE_ELEMENT?b:b.getParent(),y=b.type==CKEDITOR.NODE_ELEMENT?b.getChild(h):b.getNext();this._.guardLTR=function(a,
-g){return(!g||!l.equals(a))&&(!y||!a.equals(y))&&(a.type!=CKEDITOR.NODE_ELEMENT||!g||!a.equals(d.root))}}if(a&&!this._.guardRTL){var D=c.type==CKEDITOR.NODE_ELEMENT?c:c.getParent(),F=c.type==CKEDITOR.NODE_ELEMENT?e?c.getChild(e-1):null:c.getPrevious();this._.guardRTL=function(a,g){return(!g||!D.equals(a))&&(!F||!a.equals(F))&&(a.type!=CKEDITOR.NODE_ELEMENT||!g||!a.equals(d.root))}}var E=a?this._.guardRTL:this._.guardLTR;p=f?function(a,g){return!1===E(a,g)?!1:f(a,g)}:E;this.current?b=this.current[m](!1,
-k,p):(a?b.type==CKEDITOR.NODE_ELEMENT&&(b=0<h?b.getChild(h-1):!1===p(b,!0)?null:b.getPreviousSourceNode(!0,k,p)):(b=c,b.type==CKEDITOR.NODE_ELEMENT&&((b=b.getChild(e))||(b=!1===p(c,!0)?null:c.getNextSourceNode(!0,k,p)))),b&&!1===p(b)&&(b=null));for(;b&&!this._.end;){this.current=b;if(!this.evaluator||!1!==this.evaluator(b)){if(!g)return b}else if(g&&this.evaluator)return!1;b=b[m](!1,k,p)}this.end();return this.current=null}function f(g){for(var d,b=null;d=a.call(this,g);)b=d;return b}CKEDITOR.dom.walker=
-CKEDITOR.tools.createClass({$:function(a){this.range=a;this._={}},proto:{end:function(){this._.end=1},next:function(){return a.call(this)},previous:function(){return a.call(this,1)},checkForward:function(){return!1!==a.call(this,0,1)},checkBackward:function(){return!1!==a.call(this,1,1)},lastForward:function(){return f.call(this)},lastBackward:function(){return f.call(this,1)},reset:function(){delete this.current;this._={}}}});var c={block:1,"list-item":1,table:1,"table-row-group":1,"table-header-group":1,
-"table-footer-group":1,"table-row":1,"table-column-group":1,"table-column":1,"table-cell":1,"table-caption":1},e={absolute:1,fixed:1};CKEDITOR.dom.element.prototype.isBlockBoundary=function(a){return"none"!=this.getComputedStyle("float")||this.getComputedStyle("position")in e||!c[this.getComputedStyle("display")]?!!(this.is(CKEDITOR.dtd.$block)||a&&this.is(a)):!0};CKEDITOR.dom.walker.blockBoundary=function(a){return function(g){return!(g.type==CKEDITOR.NODE_ELEMENT&&g.isBlockBoundary(a))}};CKEDITOR.dom.walker.listItemBoundary=
-function(){return this.blockBoundary({br:1})};CKEDITOR.dom.walker.bookmark=function(a,g){function d(a){return a&&a.getName&&"span"==a.getName()&&a.data("cke-bookmark")}return function(b){var c,e;c=b&&b.type!=CKEDITOR.NODE_ELEMENT&&(e=b.getParent())&&d(e);c=a?c:c||d(b);return!!(g^c)}};CKEDITOR.dom.walker.whitespaces=function(a){return function(g){var d;g&&g.type==CKEDITOR.NODE_TEXT&&(d=!CKEDITOR.tools.trim(g.getText())||CKEDITOR.env.webkit&&g.getText()==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE);
-return!!(a^d)}};CKEDITOR.dom.walker.invisible=function(a){var g=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.env.webkit?1:0;return function(b){g(b)?b=1:(b.type==CKEDITOR.NODE_TEXT&&(b=b.getParent()),b=b.$.offsetWidth<=d);return!!(a^b)}};CKEDITOR.dom.walker.nodeType=function(a,g){return function(d){return!!(g^d.type==a)}};CKEDITOR.dom.walker.bogus=function(a){function g(a){return!m(a)&&!l(a)}return function(d){var b=CKEDITOR.env.needsBrFiller?d.is&&d.is("br"):d.getText&&h.test(d.getText());b&&(b=d.getParent(),
-d=d.getNext(g),b=b.isBlockBoundary()&&(!d||d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()));return!!(a^b)}};CKEDITOR.dom.walker.temp=function(a){return function(g){g.type!=CKEDITOR.NODE_ELEMENT&&(g=g.getParent());g=g&&g.hasAttribute("data-cke-temp");return!!(a^g)}};var h=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,m=CKEDITOR.dom.walker.whitespaces(),l=CKEDITOR.dom.walker.bookmark(),k=CKEDITOR.dom.walker.temp(),b=function(a){return l(a)||m(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$inline)&&!a.is(CKEDITOR.dtd.$empty)};
-CKEDITOR.dom.walker.ignored=function(a){return function(g){g=m(g)||l(g)||k(g);return!!(a^g)}};var d=CKEDITOR.dom.walker.ignored();CKEDITOR.dom.walker.empty=function(a){return function(g){for(var b=0,c=g.getChildCount();b<c;++b)if(!d(g.getChild(b)))return!!a;return!a}};var g=CKEDITOR.dom.walker.empty(),p=CKEDITOR.dom.walker.validEmptyBlockContainers=CKEDITOR.tools.extend(function(a){var g={},d;for(d in a)CKEDITOR.dtd[d]["#"]&&(g[d]=1);return g}(CKEDITOR.dtd.$block),{caption:1,td:1,th:1});CKEDITOR.dom.walker.editable=
-function(a){return function(b){b=d(b)?!1:b.type==CKEDITOR.NODE_TEXT||b.type==CKEDITOR.NODE_ELEMENT&&(b.is(CKEDITOR.dtd.$inline)||b.is("hr")||"false"==b.getAttribute("contenteditable")||!CKEDITOR.env.needsBrFiller&&b.is(p)&&g(b))?!0:!1;return!!(a^b)}};CKEDITOR.dom.element.prototype.getBogus=function(){var a=this;do a=a.getPreviousSourceNode();while(b(a));return a&&(CKEDITOR.env.needsBrFiller?a.is&&a.is("br"):a.getText&&h.test(a.getText()))?a:!1}}(),CKEDITOR.dom.range=function(a){this.endOffset=this.endContainer=
-this.startOffset=this.startContainer=null;this.collapsed=!0;var f=a instanceof CKEDITOR.dom.document;this.document=f?a:a.getDocument();this.root=f?a.getBody():a},function(){function a(a){a.collapsed=a.startContainer&&a.endContainer&&a.startContainer.equals(a.endContainer)&&a.startOffset==a.endOffset}function f(a,d,b,c,e){function h(a,g,b,d){var c=b?a.getPrevious():a.getNext();if(d&&m)return c;r||d?g.append(a.clone(!0,e),b):(a.remove(),l&&g.append(a));return c}function f(){var a,g,b,d=Math.min(O.length,
-I.length);for(a=0;a<d;a++)if(g=O[a],b=I[a],!g.equals(b))return a;return a-1}function k(){var b=R-1,d=E&&L&&!w.equals(B);b<M-1||b<Q-1||d?(d?a.moveToPosition(B,CKEDITOR.POSITION_BEFORE_START):Q==b+1&&F?a.moveToPosition(I[b],CKEDITOR.POSITION_BEFORE_END):a.moveToPosition(I[b+1],CKEDITOR.POSITION_BEFORE_START),c&&(b=O[b+1])&&b.type==CKEDITOR.NODE_ELEMENT&&(d=CKEDITOR.dom.element.createFromHtml('\x3cspan data-cke-bookmark\x3d"1" style\x3d"display:none"\x3e\x26nbsp;\x3c/span\x3e',a.document),d.insertAfter(b),
-b.mergeSiblings(!1),a.moveToBookmark({startNode:d}))):a.collapse(!0)}a.optimizeBookmark();var m=0===d,l=1==d,r=2==d;d=r||l;var w=a.startContainer,B=a.endContainer,z=a.startOffset,y=a.endOffset,D,F,E,L,G,N;if(r&&B.type==CKEDITOR.NODE_TEXT&&w.equals(B))w=a.document.createText(w.substring(z,y)),b.append(w);else{B.type==CKEDITOR.NODE_TEXT?r?N=!0:B=B.split(y):0<B.getChildCount()?y>=B.getChildCount()?(B=B.getChild(y-1),F=!0):B=B.getChild(y):L=F=!0;w.type==CKEDITOR.NODE_TEXT?r?G=!0:w.split(z):0<w.getChildCount()?
-0===z?(w=w.getChild(z),D=!0):w=w.getChild(z-1):E=D=!0;for(var O=w.getParents(),I=B.getParents(),R=f(),M=O.length-1,Q=I.length-1,P=b,K,W,U,S=-1,J=R;J<=M;J++){W=O[J];U=W.getNext();for(J!=M||W.equals(I[J])&&M<Q?d&&(K=P.append(W.clone(0,e))):D?h(W,P,!1,E):G&&P.append(a.document.createText(W.substring(z)));U;){if(U.equals(I[J])){S=J;break}U=h(U,P)}P=K}P=b;for(J=R;J<=Q;J++)if(b=I[J],U=b.getPrevious(),b.equals(O[J]))d&&(P=P.getChild(0));else{J!=Q||b.equals(O[J])&&Q<M?d&&(K=P.append(b.clone(0,e))):F?h(b,
-P,!1,L):N&&P.append(a.document.createText(b.substring(0,y)));if(J>S)for(;U;)U=h(U,P,!0);P=K}r||k()}}function c(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(!0),c=CKEDITOR.dom.walker.bogus();return function(e){return d(e)||b(e)?!0:c(e)&&!a?a=!0:e.type==CKEDITOR.NODE_TEXT&&(e.hasAscendant("pre")||CKEDITOR.tools.trim(e.getText()).length)||e.type==CKEDITOR.NODE_ELEMENT&&!e.is(m)?!1:!0}}function e(a){var b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(1);
-return function(c){return d(c)||b(c)?!0:!a&&l(c)||c.type==CKEDITOR.NODE_ELEMENT&&c.is(CKEDITOR.dtd.$removeEmpty)}}function h(a){return function(){var c;return this[a?"getPreviousNode":"getNextNode"](function(a){!c&&d(a)&&(c=a);return b(a)&&!(l(a)&&a.equals(c))})}}var m={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1},l=CKEDITOR.dom.walker.bogus(),k=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,
-b=CKEDITOR.dom.walker.editable(),d=CKEDITOR.dom.walker.ignored(!0);CKEDITOR.dom.range.prototype={clone:function(){var a=new CKEDITOR.dom.range(this.root);a._setStartContainer(this.startContainer);a.startOffset=this.startOffset;a._setEndContainer(this.endContainer);a.endOffset=this.endOffset;a.collapsed=this.collapsed;return a},collapse:function(a){a?(this._setEndContainer(this.startContainer),this.endOffset=this.startOffset):(this._setStartContainer(this.endContainer),this.startOffset=this.endOffset);
-this.collapsed=!0},cloneContents:function(a){var b=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||f(this,2,b,!1,"undefined"==typeof a?!0:a);return b},deleteContents:function(a){this.collapsed||f(this,0,null,a)},extractContents:function(a,b){var d=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||f(this,1,d,a,"undefined"==typeof b?!0:b);return d},createBookmark:function(a){var b,d,c,e,h=this.collapsed;b=this.document.createElement("span");b.data("cke-bookmark",1);b.setStyle("display",
-"none");b.setHtml("\x26nbsp;");a&&(c="cke_bm_"+CKEDITOR.tools.getNextNumber(),b.setAttribute("id",c+(h?"C":"S")));h||(d=b.clone(),d.setHtml("\x26nbsp;"),a&&d.setAttribute("id",c+"E"),e=this.clone(),e.collapse(),e.insertNode(d));e=this.clone();e.collapse(!0);e.insertNode(b);d?(this.setStartAfter(b),this.setEndBefore(d)):this.moveToPosition(b,CKEDITOR.POSITION_AFTER_END);return{startNode:a?c+(h?"C":"S"):b,endNode:a?c+"E":d,serializable:a,collapsed:h}},createBookmark2:function(){function a(g){var b=
-g.container,c=g.offset,e;e=b;var h=c;e=e.type!=CKEDITOR.NODE_ELEMENT||0===h||h==e.getChildCount()?0:e.getChild(h-1).type==CKEDITOR.NODE_TEXT&&e.getChild(h).type==CKEDITOR.NODE_TEXT;e&&(b=b.getChild(c-1),c=b.getLength());if(b.type==CKEDITOR.NODE_ELEMENT&&0<c){a:{for(e=b;c--;)if(h=e.getChild(c).getIndex(!0),0<=h){c=h;break a}c=-1}c+=1}if(b.type==CKEDITOR.NODE_TEXT){e=b;for(h=0;(e=e.getPrevious())&&e.type==CKEDITOR.NODE_TEXT;)h+=e.getText().replace(CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE,"").length;
-e=h;b.getText()?c+=e:(h=b.getPrevious(d),e?(c=e,b=h?h.getNext():b.getParent().getFirst()):(b=b.getParent(),c=h?h.getIndex(!0)+1:0))}g.container=b;g.offset=c}function b(a,g){var d=g.getCustomData("cke-fillingChar");if(d){var c=a.container;d.equals(c)&&(a.offset-=CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE.length,0>=a.offset&&(a.offset=c.getIndex(),a.container=c.getParent()))}}var d=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_TEXT,!0);return function(d){var c=this.collapsed,e={container:this.startContainer,
-offset:this.startOffset},h={container:this.endContainer,offset:this.endOffset};d&&(a(e),b(e,this.root),c||(a(h),b(h,this.root)));return{start:e.container.getAddress(d),end:c?null:h.container.getAddress(d),startOffset:e.offset,endOffset:h.offset,normalized:d,collapsed:c,is2:!0}}}(),moveToBookmark:function(a){if(a.is2){var b=this.document.getByAddress(a.start,a.normalized),d=a.startOffset,c=a.end&&this.document.getByAddress(a.end,a.normalized);a=a.endOffset;this.setStart(b,d);c?this.setEnd(c,a):this.collapse(!0)}else b=
-(d=a.serializable)?this.document.getById(a.startNode):a.startNode,a=d?this.document.getById(a.endNode):a.endNode,this.setStartBefore(b),b.remove(),a?(this.setEndBefore(a),a.remove()):this.collapse(!0)},getBoundaryNodes:function(){var a=this.startContainer,b=this.endContainer,d=this.startOffset,c=this.endOffset,e;if(a.type==CKEDITOR.NODE_ELEMENT)if(e=a.getChildCount(),e>d)a=a.getChild(d);else if(1>e)a=a.getPreviousSourceNode();else{for(a=a.$;a.lastChild;)a=a.lastChild;a=new CKEDITOR.dom.node(a);a=
-a.getNextSourceNode()||a}if(b.type==CKEDITOR.NODE_ELEMENT)if(e=b.getChildCount(),e>c)b=b.getChild(c).getPreviousSourceNode(!0);else if(1>e)b=b.getPreviousSourceNode();else{for(b=b.$;b.lastChild;)b=b.lastChild;b=new CKEDITOR.dom.node(b)}a.getPosition(b)&CKEDITOR.POSITION_FOLLOWING&&(a=b);return{startNode:a,endNode:b}},getCommonAncestor:function(a,b){var d=this.startContainer,c=this.endContainer,d=d.equals(c)?a&&d.type==CKEDITOR.NODE_ELEMENT&&this.startOffset==this.endOffset-1?d.getChild(this.startOffset):
+getChildCount:1,getChild:1,getChildren:1}),function(){function a(a,g){var b=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(b.collapsed)return this.end(),null;b.optimize()}var d,c=b.startContainer;d=b.endContainer;var f=b.startOffset,h=b.endOffset,p,e=this.guard,k=this.type,m=a?"getPreviousSourceNode":"getNextSourceNode";if(!a&&!this._.guardLTR){var l=d.type==CKEDITOR.NODE_ELEMENT?d:d.getParent(),A=d.type==CKEDITOR.NODE_ELEMENT?d.getChild(h):d.getNext();this._.guardLTR=function(a,
+g){return(!g||!l.equals(a))&&(!A||!a.equals(A))&&(a.type!=CKEDITOR.NODE_ELEMENT||!g||!a.equals(b.root))}}if(a&&!this._.guardRTL){var C=c.type==CKEDITOR.NODE_ELEMENT?c:c.getParent(),E=c.type==CKEDITOR.NODE_ELEMENT?f?c.getChild(f-1):null:c.getPrevious();this._.guardRTL=function(a,g){return(!g||!C.equals(a))&&(!E||!a.equals(E))&&(a.type!=CKEDITOR.NODE_ELEMENT||!g||!a.equals(b.root))}}var D=a?this._.guardRTL:this._.guardLTR;p=e?function(a,g){return!1===D(a,g)?!1:e(a,g)}:D;this.current?d=this.current[m](!1,
+k,p):(a?d.type==CKEDITOR.NODE_ELEMENT&&(d=0<h?d.getChild(h-1):!1===p(d,!0)?null:d.getPreviousSourceNode(!0,k,p)):(d=c,d.type==CKEDITOR.NODE_ELEMENT&&((d=d.getChild(f))||(d=!1===p(c,!0)?null:c.getNextSourceNode(!0,k,p)))),d&&!1===p(d)&&(d=null));for(;d&&!this._.end;){this.current=d;if(!this.evaluator||!1!==this.evaluator(d)){if(!g)return d}else if(g&&this.evaluator)return!1;d=d[m](!1,k,p)}this.end();return this.current=null}function e(g){for(var b,d=null;b=a.call(this,g);)d=b;return d}CKEDITOR.dom.walker=
+CKEDITOR.tools.createClass({$:function(a){this.range=a;this._={}},proto:{end:function(){this._.end=1},next:function(){return a.call(this)},previous:function(){return a.call(this,1)},checkForward:function(){return!1!==a.call(this,0,1)},checkBackward:function(){return!1!==a.call(this,1,1)},lastForward:function(){return e.call(this)},lastBackward:function(){return e.call(this,1)},reset:function(){delete this.current;this._={}}}});var c={block:1,"list-item":1,table:1,"table-row-group":1,"table-header-group":1,
+"table-footer-group":1,"table-row":1,"table-column-group":1,"table-column":1,"table-cell":1,"table-caption":1},f={absolute:1,fixed:1};CKEDITOR.dom.element.prototype.isBlockBoundary=function(a){return"none"!=this.getComputedStyle("float")||this.getComputedStyle("position")in f||!c[this.getComputedStyle("display")]?!!(this.is(CKEDITOR.dtd.$block)||a&&this.is(a)):!0};CKEDITOR.dom.walker.blockBoundary=function(a){return function(g){return!(g.type==CKEDITOR.NODE_ELEMENT&&g.isBlockBoundary(a))}};CKEDITOR.dom.walker.listItemBoundary=
+function(){return this.blockBoundary({br:1})};CKEDITOR.dom.walker.bookmark=function(a,g){function b(a){return a&&a.getName&&"span"==a.getName()&&a.data("cke-bookmark")}return function(d){var c,f;c=d&&d.type!=CKEDITOR.NODE_ELEMENT&&(f=d.getParent())&&b(f);c=a?c:c||b(d);return!!(g^c)}};CKEDITOR.dom.walker.whitespaces=function(a){return function(g){var b;g&&g.type==CKEDITOR.NODE_TEXT&&(b=!CKEDITOR.tools.trim(g.getText())||CKEDITOR.env.webkit&&g.getText()==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE);
+return!!(a^b)}};CKEDITOR.dom.walker.invisible=function(a){var g=CKEDITOR.dom.walker.whitespaces(),b=CKEDITOR.env.webkit?1:0;return function(d){g(d)?d=1:(d.type==CKEDITOR.NODE_TEXT&&(d=d.getParent()),d=d.$.offsetWidth<=b);return!!(a^d)}};CKEDITOR.dom.walker.nodeType=function(a,g){return function(b){return!!(g^b.type==a)}};CKEDITOR.dom.walker.bogus=function(a){function g(a){return!m(a)&&!l(a)}return function(b){var d=CKEDITOR.env.needsBrFiller?b.is&&b.is("br"):b.getText&&h.test(b.getText());d&&(d=b.getParent(),
+b=b.getNext(g),d=d.isBlockBoundary()&&(!b||b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()));return!!(a^d)}};CKEDITOR.dom.walker.temp=function(a){return function(g){g.type!=CKEDITOR.NODE_ELEMENT&&(g=g.getParent());g=g&&g.hasAttribute("data-cke-temp");return!!(a^g)}};var h=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,m=CKEDITOR.dom.walker.whitespaces(),l=CKEDITOR.dom.walker.bookmark(),k=CKEDITOR.dom.walker.temp(),d=function(a){return l(a)||m(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$inline)&&!a.is(CKEDITOR.dtd.$empty)};
+CKEDITOR.dom.walker.ignored=function(a){return function(g){g=m(g)||l(g)||k(g);return!!(a^g)}};var b=CKEDITOR.dom.walker.ignored();CKEDITOR.dom.walker.empty=function(a){return function(g){for(var d=0,c=g.getChildCount();d<c;++d)if(!b(g.getChild(d)))return!!a;return!a}};var g=CKEDITOR.dom.walker.empty(),p=CKEDITOR.dom.walker.validEmptyBlockContainers=CKEDITOR.tools.extend(function(a){var g={},b;for(b in a)CKEDITOR.dtd[b]["#"]&&(g[b]=1);return g}(CKEDITOR.dtd.$block),{caption:1,td:1,th:1});CKEDITOR.dom.walker.editable=
+function(a){return function(d){d=b(d)?!1:d.type==CKEDITOR.NODE_TEXT||d.type==CKEDITOR.NODE_ELEMENT&&(d.is(CKEDITOR.dtd.$inline)||d.is("hr")||"false"==d.getAttribute("contenteditable")||!CKEDITOR.env.needsBrFiller&&d.is(p)&&g(d))?!0:!1;return!!(a^d)}};CKEDITOR.dom.element.prototype.getBogus=function(){var a=this;do a=a.getPreviousSourceNode();while(d(a));return a&&(CKEDITOR.env.needsBrFiller?a.is&&a.is("br"):a.getText&&h.test(a.getText()))?a:!1}}(),CKEDITOR.dom.range=function(a){this.endOffset=this.endContainer=
+this.startOffset=this.startContainer=null;this.collapsed=!0;var e=a instanceof CKEDITOR.dom.document;this.document=e?a:a.getDocument();this.root=e?a.getBody():a},function(){function a(a){a.collapsed=a.startContainer&&a.endContainer&&a.startContainer.equals(a.endContainer)&&a.startOffset==a.endOffset}function e(a,b,d,c,f){function n(a,g,b,d){var c=b?a.getPrevious():a.getNext();if(d&&k)return c;t||d?g.append(a.clone(!0,f),b):(a.remove(),m&&g.append(a));return c}function h(){var a,g,b,d=Math.min(P.length,
+G.length);for(a=0;a<d;a++)if(g=P[a],b=G[a],!g.equals(b))return a;return a-1}function e(){var b=S-1,d=D&&I&&!x.equals(l);b<L-1||b<R-1||d?(d?a.moveToPosition(l,CKEDITOR.POSITION_BEFORE_START):R==b+1&&E?a.moveToPosition(G[b],CKEDITOR.POSITION_BEFORE_END):a.moveToPosition(G[b+1],CKEDITOR.POSITION_BEFORE_START),c&&(b=P[b+1])&&b.type==CKEDITOR.NODE_ELEMENT&&(d=CKEDITOR.dom.element.createFromHtml('\x3cspan data-cke-bookmark\x3d"1" style\x3d"display:none"\x3e\x26nbsp;\x3c/span\x3e',a.document),d.insertAfter(b),
+b.mergeSiblings(!1),a.moveToBookmark({startNode:d}))):a.collapse(!0)}a.optimizeBookmark();var k=0===b,m=1==b,t=2==b;b=t||m;var x=a.startContainer,l=a.endContainer,z=a.startOffset,A=a.endOffset,C,E,D,I,H,M;if(t&&l.type==CKEDITOR.NODE_TEXT&&x.equals(l))x=a.document.createText(x.substring(z,A)),d.append(x);else{l.type==CKEDITOR.NODE_TEXT?t?M=!0:l=l.split(A):0<l.getChildCount()?A>=l.getChildCount()?(l=l.getChild(A-1),E=!0):l=l.getChild(A):I=E=!0;x.type==CKEDITOR.NODE_TEXT?t?H=!0:x.split(z):0<x.getChildCount()?
+0===z?(x=x.getChild(z),C=!0):x=x.getChild(z-1):D=C=!0;for(var P=x.getParents(),G=l.getParents(),S=h(),L=P.length-1,R=G.length-1,O=d,T,V,W,X=-1,N=S;N<=L;N++){V=P[N];W=V.getNext();for(N!=L||V.equals(G[N])&&L<R?b&&(T=O.append(V.clone(0,f))):C?n(V,O,!1,D):H&&O.append(a.document.createText(V.substring(z)));W;){if(W.equals(G[N])){X=N;break}W=n(W,O)}O=T}O=d;for(N=S;N<=R;N++)if(d=G[N],W=d.getPrevious(),d.equals(P[N]))b&&(O=O.getChild(0));else{N!=R||d.equals(P[N])&&R<L?b&&(T=O.append(d.clone(0,f))):E?n(d,
+O,!1,I):M&&O.append(a.document.createText(d.substring(0,A)));if(N>X)for(;W;)W=n(W,O,!0);O=T}t||e()}}function c(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(!0),c=CKEDITOR.dom.walker.bogus();return function(f){return d(f)||b(f)?!0:c(f)&&!a?a=!0:f.type==CKEDITOR.NODE_TEXT&&(f.hasAscendant("pre")||CKEDITOR.tools.trim(f.getText()).length)||f.type==CKEDITOR.NODE_ELEMENT&&!f.is(m)?!1:!0}}function f(a){var b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(1);
+return function(c){return d(c)||b(c)?!0:!a&&l(c)||c.type==CKEDITOR.NODE_ELEMENT&&c.is(CKEDITOR.dtd.$removeEmpty)}}function h(a){return function(){var c;return this[a?"getPreviousNode":"getNextNode"](function(a){!c&&b(a)&&(c=a);return d(a)&&!(l(a)&&a.equals(c))})}}var m={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1},l=CKEDITOR.dom.walker.bogus(),k=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,
+d=CKEDITOR.dom.walker.editable(),b=CKEDITOR.dom.walker.ignored(!0);CKEDITOR.dom.range.prototype={clone:function(){var a=new CKEDITOR.dom.range(this.root);a._setStartContainer(this.startContainer);a.startOffset=this.startOffset;a._setEndContainer(this.endContainer);a.endOffset=this.endOffset;a.collapsed=this.collapsed;return a},collapse:function(a){a?(this._setEndContainer(this.startContainer),this.endOffset=this.startOffset):(this._setStartContainer(this.endContainer),this.startOffset=this.endOffset);
+this.collapsed=!0},cloneContents:function(a){var b=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||e(this,2,b,!1,"undefined"==typeof a?!0:a);return b},deleteContents:function(a){this.collapsed||e(this,0,null,a)},extractContents:function(a,b){var d=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||e(this,1,d,a,"undefined"==typeof b?!0:b);return d},createBookmark:function(a){var b,d,c,f,n=this.collapsed;b=this.document.createElement("span");b.data("cke-bookmark",1);b.setStyle("display",
+"none");b.setHtml("\x26nbsp;");a&&(c="cke_bm_"+CKEDITOR.tools.getNextNumber(),b.setAttribute("id",c+(n?"C":"S")));n||(d=b.clone(),d.setHtml("\x26nbsp;"),a&&d.setAttribute("id",c+"E"),f=this.clone(),f.collapse(),f.insertNode(d));f=this.clone();f.collapse(!0);f.insertNode(b);d?(this.setStartAfter(b),this.setEndBefore(d)):this.moveToPosition(b,CKEDITOR.POSITION_AFTER_END);return{startNode:a?c+(n?"C":"S"):b,endNode:a?c+"E":d,serializable:a,collapsed:n}},createBookmark2:function(){function a(g){var b=
+g.container,c=g.offset,f;f=b;var h=c;f=f.type!=CKEDITOR.NODE_ELEMENT||0===h||h==f.getChildCount()?0:f.getChild(h-1).type==CKEDITOR.NODE_TEXT&&f.getChild(h).type==CKEDITOR.NODE_TEXT;f&&(b=b.getChild(c-1),c=b.getLength());if(b.type==CKEDITOR.NODE_ELEMENT&&0<c){a:{for(f=b;c--;)if(h=f.getChild(c).getIndex(!0),0<=h){c=h;break a}c=-1}c+=1}if(b.type==CKEDITOR.NODE_TEXT){f=b;for(h=0;(f=f.getPrevious())&&f.type==CKEDITOR.NODE_TEXT;)h+=f.getText().replace(CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE,"").length;
+f=h;b.getText()?c+=f:(h=b.getPrevious(d),f?(c=f,b=h?h.getNext():b.getParent().getFirst()):(b=b.getParent(),c=h?h.getIndex(!0)+1:0))}g.container=b;g.offset=c}function b(a,g){var d=g.getCustomData("cke-fillingChar");if(d){var c=a.container;d.equals(c)&&(a.offset-=CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE.length,0>=a.offset&&(a.offset=c.getIndex(),a.container=c.getParent()))}}var d=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_TEXT,!0);return function(d){var c=this.collapsed,f={container:this.startContainer,
+offset:this.startOffset},h={container:this.endContainer,offset:this.endOffset};d&&(a(f),b(f,this.root),c||(a(h),b(h,this.root)));return{start:f.container.getAddress(d),end:c?null:h.container.getAddress(d),startOffset:f.offset,endOffset:h.offset,normalized:d,collapsed:c,is2:!0}}}(),moveToBookmark:function(a){if(a.is2){var b=this.document.getByAddress(a.start,a.normalized),d=a.startOffset,c=a.end&&this.document.getByAddress(a.end,a.normalized);a=a.endOffset;this.setStart(b,d);c?this.setEnd(c,a):this.collapse(!0)}else b=
+(d=a.serializable)?this.document.getById(a.startNode):a.startNode,a=d?this.document.getById(a.endNode):a.endNode,this.setStartBefore(b),b.remove(),a?(this.setEndBefore(a),a.remove()):this.collapse(!0)},getBoundaryNodes:function(){var a=this.startContainer,b=this.endContainer,d=this.startOffset,c=this.endOffset,f;if(a.type==CKEDITOR.NODE_ELEMENT)if(f=a.getChildCount(),f>d)a=a.getChild(d);else if(1>f)a=a.getPreviousSourceNode();else{for(a=a.$;a.lastChild;)a=a.lastChild;a=new CKEDITOR.dom.node(a);a=
+a.getNextSourceNode()||a}if(b.type==CKEDITOR.NODE_ELEMENT)if(f=b.getChildCount(),f>c)b=b.getChild(c).getPreviousSourceNode(!0);else if(1>f)b=b.getPreviousSourceNode();else{for(b=b.$;b.lastChild;)b=b.lastChild;b=new CKEDITOR.dom.node(b)}a.getPosition(b)&CKEDITOR.POSITION_FOLLOWING&&(a=b);return{startNode:a,endNode:b}},getCommonAncestor:function(a,b){var d=this.startContainer,c=this.endContainer,d=d.equals(c)?a&&d.type==CKEDITOR.NODE_ELEMENT&&this.startOffset==this.endOffset-1?d.getChild(this.startOffset):
 d:d.getCommonAncestor(c);return b&&!d.is?d.getParent():d},optimize:function(){var a=this.startContainer,b=this.startOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setStartAfter(a):this.setStartBefore(a));a=this.endContainer;b=this.endOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setEndAfter(a):this.setEndBefore(a))},optimizeBookmark:function(){var a=this.startContainer,b=this.endContainer;a.is&&a.is("span")&&a.data("cke-bookmark")&&this.setStartAt(a,CKEDITOR.POSITION_BEFORE_START);
-b&&b.is&&b.is("span")&&b.data("cke-bookmark")&&this.setEndAt(b,CKEDITOR.POSITION_AFTER_END)},trim:function(a,b){var d=this.startContainer,c=this.startOffset,e=this.collapsed;if((!a||e)&&d&&d.type==CKEDITOR.NODE_TEXT){if(c)if(c>=d.getLength())c=d.getIndex()+1,d=d.getParent();else{var h=d.split(c),c=d.getIndex()+1,d=d.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(h,this.endOffset-this.startOffset):d.equals(this.endContainer)&&(this.endOffset+=1)}else c=d.getIndex(),d=d.getParent();
-this.setStart(d,c);if(e){this.collapse(!0);return}}d=this.endContainer;c=this.endOffset;b||e||!d||d.type!=CKEDITOR.NODE_TEXT||(c?(c>=d.getLength()||d.split(c),c=d.getIndex()+1):c=d.getIndex(),d=d.getParent(),this.setEnd(d,c))},enlarge:function(a,b){function d(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var c=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var e=1;case CKEDITOR.ENLARGE_ELEMENT:var h=function(a,b){var d=new CKEDITOR.dom.range(k);
-d.setStart(a,b);d.setEndAt(k,CKEDITOR.POSITION_BEFORE_END);var d=new CKEDITOR.dom.walker(d),g;for(d.guard=function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};g=d.next();){if(g.type!=CKEDITOR.NODE_TEXT)return!1;D=g!=a?g.getText():g.substring(b);if(c.test(D))return!1}return!0};if(this.collapsed)break;var f=this.getCommonAncestor(),k=this.root,m,l,r,w,B,z=!1,y,D;y=this.startContainer;var F=this.startOffset;y.type==CKEDITOR.NODE_TEXT?(F&&(y=!CKEDITOR.tools.trim(y.substring(0,F)).length&&
-y,z=!!y),y&&((w=y.getPrevious())||(r=y.getParent()))):(F&&(w=y.getChild(F-1)||y.getLast()),w||(r=y));for(r=d(r);r||w;){if(r&&!w){!B&&r.equals(f)&&(B=!0);if(e?r.isBlockBoundary():!k.contains(r))break;z&&"inline"==r.getComputedStyle("display")||(z=!1,B?m=r:this.setStartBefore(r));w=r.getPrevious()}for(;w;)if(y=!1,w.type==CKEDITOR.NODE_COMMENT)w=w.getPrevious();else{if(w.type==CKEDITOR.NODE_TEXT)D=w.getText(),c.test(D)&&(w=null),y=/[\s\ufeff]$/.test(D);else if((w.$.offsetWidth>(CKEDITOR.env.webkit?1:
-0)||b&&w.is("br"))&&!w.data("cke-bookmark"))if(z&&CKEDITOR.dtd.$removeEmpty[w.getName()]){D=w.getText();if(c.test(D))w=null;else for(var F=w.$.getElementsByTagName("*"),E=0,L;L=F[E++];)if(!CKEDITOR.dtd.$removeEmpty[L.nodeName.toLowerCase()]){w=null;break}w&&(y=!!D.length)}else w=null;y&&(z?B?m=r:r&&this.setStartBefore(r):z=!0);if(w){y=w.getPrevious();if(!r&&!y){r=w;w=null;break}w=y}else r=null}r&&(r=d(r.getParent()))}y=this.endContainer;F=this.endOffset;r=w=null;B=z=!1;y.type==CKEDITOR.NODE_TEXT?
-CKEDITOR.tools.trim(y.substring(F)).length?z=!0:(z=!y.getLength(),F==y.getLength()?(w=y.getNext())||(r=y.getParent()):h(y,F)&&(r=y.getParent())):(w=y.getChild(F))||(r=y);for(;r||w;){if(r&&!w){!B&&r.equals(f)&&(B=!0);if(e?r.isBlockBoundary():!k.contains(r))break;z&&"inline"==r.getComputedStyle("display")||(z=!1,B?l=r:r&&this.setEndAfter(r));w=r.getNext()}for(;w;){y=!1;if(w.type==CKEDITOR.NODE_TEXT)D=w.getText(),h(w,0)||(w=null),y=/^[\s\ufeff]/.test(D);else if(w.type==CKEDITOR.NODE_ELEMENT){if((0<w.$.offsetWidth||
-b&&w.is("br"))&&!w.data("cke-bookmark"))if(z&&CKEDITOR.dtd.$removeEmpty[w.getName()]){D=w.getText();if(c.test(D))w=null;else for(F=w.$.getElementsByTagName("*"),E=0;L=F[E++];)if(!CKEDITOR.dtd.$removeEmpty[L.nodeName.toLowerCase()]){w=null;break}w&&(y=!!D.length)}else w=null}else y=1;y&&z&&(B?l=r:this.setEndAfter(r));if(w){y=w.getNext();if(!r&&!y){r=w;w=null;break}w=y}else r=null}r&&(r=d(r.getParent()))}m&&l&&(f=m.contains(l)?l:m,this.setStartBefore(f),this.setEndAfter(f));break;case CKEDITOR.ENLARGE_BLOCK_CONTENTS:case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:r=
-new CKEDITOR.dom.range(this.root);k=this.root;r.setStartAt(k,CKEDITOR.POSITION_AFTER_START);r.setEnd(this.startContainer,this.startOffset);r=new CKEDITOR.dom.walker(r);var G,N,O=CKEDITOR.dom.walker.blockBoundary(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?{br:1}:null),I=null,R=function(a){if(a.type==CKEDITOR.NODE_ELEMENT&&"false"==a.getAttribute("contenteditable"))if(I){if(I.equals(a)){I=null;return}}else I=a;else if(I)return;var b=O(a);b||(G=a);return b},e=function(a){var b=R(a);!b&&a.is&&a.is("br")&&
-(N=a);return b};r.guard=R;r=r.lastBackward();G=G||k;this.setStartAt(G,!G.is("br")&&(!r&&this.checkStartOfBlock()||r&&G.contains(r))?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_AFTER_END);if(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS){r=this.clone();r=new CKEDITOR.dom.walker(r);var M=CKEDITOR.dom.walker.whitespaces(),Q=CKEDITOR.dom.walker.bookmark();r.evaluator=function(a){return!M(a)&&!Q(a)};if((r=r.previous())&&r.type==CKEDITOR.NODE_ELEMENT&&r.is("br"))break}r=this.clone();r.collapse();r.setEndAt(k,
-CKEDITOR.POSITION_BEFORE_END);r=new CKEDITOR.dom.walker(r);r.guard=a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?e:R;G=I=N=null;r=r.lastForward();G=G||k;this.setEndAt(G,!r&&this.checkEndOfBlock()||r&&G.contains(r)?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_BEFORE_START);N&&this.setEndAfter(N)}},shrink:function(a,b,d){if(!this.collapsed){a=a||CKEDITOR.SHRINK_TEXT;var c=this.clone(),e=this.startContainer,h=this.endContainer,k=this.startOffset,f=this.endOffset,m=1,l=1;e&&e.type==CKEDITOR.NODE_TEXT&&(k?
-k>=e.getLength()?c.setStartAfter(e):(c.setStartBefore(e),m=0):c.setStartBefore(e));h&&h.type==CKEDITOR.NODE_TEXT&&(f?f>=h.getLength()?c.setEndAfter(h):(c.setEndAfter(h),l=0):c.setEndBefore(h));var c=new CKEDITOR.dom.walker(c),r=CKEDITOR.dom.walker.bookmark();c.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};var w;c.guard=function(b,c){if(r(b))return!0;if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||c&&b.equals(w)||!1===d&&b.type==
-CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;c||b.type!=CKEDITOR.NODE_ELEMENT||(w=b);return!0};m&&(e=c[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(e,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);l&&(c.reset(),(c=c[a==CKEDITOR.SHRINK_ELEMENT?"lastBackward":"previous"]())&&this.setEndAt(c,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_END));return!(!m&&!l)}},insertNode:function(a){this.optimizeBookmark();
+b&&b.is&&b.is("span")&&b.data("cke-bookmark")&&this.setEndAt(b,CKEDITOR.POSITION_AFTER_END)},trim:function(a,b){var d=this.startContainer,c=this.startOffset,f=this.collapsed;if((!a||f)&&d&&d.type==CKEDITOR.NODE_TEXT){if(c)if(c>=d.getLength())c=d.getIndex()+1,d=d.getParent();else{var h=d.split(c),c=d.getIndex()+1,d=d.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(h,this.endOffset-this.startOffset):d.equals(this.endContainer)&&(this.endOffset+=1)}else c=d.getIndex(),d=d.getParent();
+this.setStart(d,c);if(f){this.collapse(!0);return}}d=this.endContainer;c=this.endOffset;b||f||!d||d.type!=CKEDITOR.NODE_TEXT||(c?(c>=d.getLength()||d.split(c),c=d.getIndex()+1):c=d.getIndex(),d=d.getParent(),this.setEnd(d,c))},enlarge:function(a,b){function d(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var c=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var f=1;case CKEDITOR.ENLARGE_ELEMENT:var h=function(a,b){var d=new CKEDITOR.dom.range(k);
+d.setStart(a,b);d.setEndAt(k,CKEDITOR.POSITION_BEFORE_END);var d=new CKEDITOR.dom.walker(d),g;for(d.guard=function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};g=d.next();){if(g.type!=CKEDITOR.NODE_TEXT)return!1;C=g!=a?g.getText():g.substring(b);if(c.test(C))return!1}return!0};if(this.collapsed)break;var e=this.getCommonAncestor(),k=this.root,l,m,t,x,F,z=!1,A,C;A=this.startContainer;var E=this.startOffset;A.type==CKEDITOR.NODE_TEXT?(E&&(A=!CKEDITOR.tools.trim(A.substring(0,E)).length&&
+A,z=!!A),A&&((x=A.getPrevious())||(t=A.getParent()))):(E&&(x=A.getChild(E-1)||A.getLast()),x||(t=A));for(t=d(t);t||x;){if(t&&!x){!F&&t.equals(e)&&(F=!0);if(f?t.isBlockBoundary():!k.contains(t))break;z&&"inline"==t.getComputedStyle("display")||(z=!1,F?l=t:this.setStartBefore(t));x=t.getPrevious()}for(;x;)if(A=!1,x.type==CKEDITOR.NODE_COMMENT)x=x.getPrevious();else{if(x.type==CKEDITOR.NODE_TEXT)C=x.getText(),c.test(C)&&(x=null),A=/[\s\ufeff]$/.test(C);else if((x.$.offsetWidth>(CKEDITOR.env.webkit?1:
+0)||b&&x.is("br"))&&!x.data("cke-bookmark"))if(z&&CKEDITOR.dtd.$removeEmpty[x.getName()]){C=x.getText();if(c.test(C))x=null;else for(var E=x.$.getElementsByTagName("*"),D=0,I;I=E[D++];)if(!CKEDITOR.dtd.$removeEmpty[I.nodeName.toLowerCase()]){x=null;break}x&&(A=!!C.length)}else x=null;A&&(z?F?l=t:t&&this.setStartBefore(t):z=!0);if(x){A=x.getPrevious();if(!t&&!A){t=x;x=null;break}x=A}else t=null}t&&(t=d(t.getParent()))}A=this.endContainer;E=this.endOffset;t=x=null;F=z=!1;A.type==CKEDITOR.NODE_TEXT?
+CKEDITOR.tools.trim(A.substring(E)).length?z=!0:(z=!A.getLength(),E==A.getLength()?(x=A.getNext())||(t=A.getParent()):h(A,E)&&(t=A.getParent())):(x=A.getChild(E))||(t=A);for(;t||x;){if(t&&!x){!F&&t.equals(e)&&(F=!0);if(f?t.isBlockBoundary():!k.contains(t))break;z&&"inline"==t.getComputedStyle("display")||(z=!1,F?m=t:t&&this.setEndAfter(t));x=t.getNext()}for(;x;){A=!1;if(x.type==CKEDITOR.NODE_TEXT)C=x.getText(),h(x,0)||(x=null),A=/^[\s\ufeff]/.test(C);else if(x.type==CKEDITOR.NODE_ELEMENT){if((0<x.$.offsetWidth||
+b&&x.is("br"))&&!x.data("cke-bookmark"))if(z&&CKEDITOR.dtd.$removeEmpty[x.getName()]){C=x.getText();if(c.test(C))x=null;else for(E=x.$.getElementsByTagName("*"),D=0;I=E[D++];)if(!CKEDITOR.dtd.$removeEmpty[I.nodeName.toLowerCase()]){x=null;break}x&&(A=!!C.length)}else x=null}else A=1;A&&z&&(F?m=t:this.setEndAfter(t));if(x){A=x.getNext();if(!t&&!A){t=x;x=null;break}x=A}else t=null}t&&(t=d(t.getParent()))}l&&m&&(e=l.contains(m)?m:l,this.setStartBefore(e),this.setEndAfter(e));break;case CKEDITOR.ENLARGE_BLOCK_CONTENTS:case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:t=
+new CKEDITOR.dom.range(this.root);k=this.root;t.setStartAt(k,CKEDITOR.POSITION_AFTER_START);t.setEnd(this.startContainer,this.startOffset);t=new CKEDITOR.dom.walker(t);var H,M,P=CKEDITOR.dom.walker.blockBoundary(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?{br:1}:null),G=null,S=function(a){if(a.type==CKEDITOR.NODE_ELEMENT&&"false"==a.getAttribute("contenteditable"))if(G){if(G.equals(a)){G=null;return}}else G=a;else if(G)return;var b=P(a);b||(H=a);return b},f=function(a){var b=S(a);!b&&a.is&&a.is("br")&&
+(M=a);return b};t.guard=S;t=t.lastBackward();H=H||k;this.setStartAt(H,!H.is("br")&&(!t&&this.checkStartOfBlock()||t&&H.contains(t))?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_AFTER_END);if(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS){t=this.clone();t=new CKEDITOR.dom.walker(t);var L=CKEDITOR.dom.walker.whitespaces(),R=CKEDITOR.dom.walker.bookmark();t.evaluator=function(a){return!L(a)&&!R(a)};if((t=t.previous())&&t.type==CKEDITOR.NODE_ELEMENT&&t.is("br"))break}t=this.clone();t.collapse();t.setEndAt(k,
+CKEDITOR.POSITION_BEFORE_END);t=new CKEDITOR.dom.walker(t);t.guard=a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?f:S;H=G=M=null;t=t.lastForward();H=H||k;this.setEndAt(H,!t&&this.checkEndOfBlock()||t&&H.contains(t)?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_BEFORE_START);M&&this.setEndAfter(M)}},shrink:function(a,b,d){if(!this.collapsed){a=a||CKEDITOR.SHRINK_TEXT;var c=this.clone(),f=this.startContainer,h=this.endContainer,e=this.startOffset,k=this.endOffset,l=1,m=1;f&&f.type==CKEDITOR.NODE_TEXT&&(e?
+e>=f.getLength()?c.setStartAfter(f):(c.setStartBefore(f),l=0):c.setStartBefore(f));h&&h.type==CKEDITOR.NODE_TEXT&&(k?k>=h.getLength()?c.setEndAfter(h):(c.setEndAfter(h),m=0):c.setEndBefore(h));var c=new CKEDITOR.dom.walker(c),t=CKEDITOR.dom.walker.bookmark();c.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};var x;c.guard=function(b,c){if(t(b))return!0;if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||c&&b.equals(x)||!1===d&&b.type==
+CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;c||b.type!=CKEDITOR.NODE_ELEMENT||(x=b);return!0};l&&(f=c[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(f,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);m&&(c.reset(),(c=c[a==CKEDITOR.SHRINK_ELEMENT?"lastBackward":"previous"]())&&this.setEndAt(c,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_END));return!(!l&&!m)}},insertNode:function(a){this.optimizeBookmark();
 this.trim(!1,!0);var b=this.startContainer,d=b.getChild(this.startOffset);d?a.insertBefore(d):b.append(a);a.getParent()&&a.getParent().equals(this.endContainer)&&this.endOffset++;this.setStartBefore(a)},moveToPosition:function(a,b){this.setStartAt(a,b);this.collapse(!0)},moveToRange:function(a){this.setStart(a.startContainer,a.startOffset);this.setEnd(a.endContainer,a.endOffset)},selectNodeContents:function(a){this.setStart(a,0);this.setEnd(a,a.type==CKEDITOR.NODE_TEXT?a.getLength():a.getChildCount())},
 setStart:function(b,d){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(d=b.getIndex(),b=b.getParent());this._setStartContainer(b);this.startOffset=d;this.endContainer||(this._setEndContainer(b),this.endOffset=d);a(this)},setEnd:function(b,d){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(d=b.getIndex()+1,b=b.getParent());this._setEndContainer(b);this.endOffset=d;this.startContainer||(this._setStartContainer(b),this.startOffset=d);a(this)},setStartAfter:function(a){this.setStart(a.getParent(),
 a.getIndex()+1)},setStartBefore:function(a){this.setStart(a.getParent(),a.getIndex())},setEndAfter:function(a){this.setEnd(a.getParent(),a.getIndex()+1)},setEndBefore:function(a){this.setEnd(a.getParent(),a.getIndex())},setStartAt:function(b,d){switch(d){case CKEDITOR.POSITION_AFTER_START:this.setStart(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setStart(b,b.getLength()):this.setStart(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setStartBefore(b);
 break;case CKEDITOR.POSITION_AFTER_END:this.setStartAfter(b)}a(this)},setEndAt:function(b,d){switch(d){case CKEDITOR.POSITION_AFTER_START:this.setEnd(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setEnd(b,b.getLength()):this.setEnd(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setEndBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setEndAfter(b)}a(this)},fixBlock:function(a,b){var d=this.createBookmark(),c=this.document.createElement(b);this.collapse(a);
-this.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS);this.extractContents().appendTo(c);c.trim();this.insertNode(c);var e=c.getBogus();e&&e.remove();c.appendBogus();this.moveToBookmark(d);return c},splitBlock:function(a,b){var d=new CKEDITOR.dom.elementPath(this.startContainer,this.root),c=new CKEDITOR.dom.elementPath(this.endContainer,this.root),e=d.block,h=c.block,k=null;if(!d.blockLimit.equals(c.blockLimit))return null;"br"!=a&&(e||(e=this.fixBlock(!0,a),h=(new CKEDITOR.dom.elementPath(this.endContainer,
-this.root)).block),h||(h=this.fixBlock(!1,a)));d=e&&this.checkStartOfBlock();c=h&&this.checkEndOfBlock();this.deleteContents();e&&e.equals(h)&&(c?(k=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(h,CKEDITOR.POSITION_AFTER_END),h=null):d?(k=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e=null):(h=this.splitElement(e,b||!1),e.is("ul","ol")||e.appendBogus()));return{previousBlock:e,nextBlock:h,wasStartOfBlock:d,
-wasEndOfBlock:c,elementPath:k}},splitElement:function(a,b){if(!this.collapsed)return null;this.setEndAt(a,CKEDITOR.POSITION_BEFORE_END);var d=this.extractContents(!1,b||!1),c=a.clone(!1,b||!1);d.appendTo(c);c.insertAfter(a);this.moveToPosition(a,CKEDITOR.POSITION_AFTER_END);return c},removeEmptyBlocksAtEnd:function(){function a(g){return function(a){return b(a)||d(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.isEmptyInlineRemoveable()||g.is("table")&&a.is("caption")?!1:!0}}var b=CKEDITOR.dom.walker.whitespaces(),
-d=CKEDITOR.dom.walker.bookmark(!1);return function(b){for(var d=this.createBookmark(),c=this[b?"endPath":"startPath"](),e=c.block||c.blockLimit,h;e&&!e.equals(c.root)&&!e.getFirst(a(e));)h=e.getParent(),this[b?"setEndAt":"setStartAt"](e,CKEDITOR.POSITION_AFTER_END),e.remove(1),e=h;this.moveToBookmark(d)}}(),startPath:function(){return new CKEDITOR.dom.elementPath(this.startContainer,this.root)},endPath:function(){return new CKEDITOR.dom.elementPath(this.endContainer,this.root)},checkBoundaryOfElement:function(a,
-b){var d=b==CKEDITOR.START,c=this.clone();c.collapse(d);c[d?"setStartAt":"setEndAt"](a,d?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END);c=new CKEDITOR.dom.walker(c);c.evaluator=e(d);return c[d?"checkBackward":"checkForward"]()},checkStartOfBlock:function(){var a=this.startContainer,b=this.startOffset;CKEDITOR.env.ie&&b&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.ltrim(a.substring(0,b)),k.test(a)&&this.trim(0,1));this.trim();a=new CKEDITOR.dom.elementPath(this.startContainer,this.root);
+this.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS);this.extractContents().appendTo(c);c.trim();this.insertNode(c);var f=c.getBogus();f&&f.remove();c.appendBogus();this.moveToBookmark(d);return c},splitBlock:function(a,b){var d=new CKEDITOR.dom.elementPath(this.startContainer,this.root),c=new CKEDITOR.dom.elementPath(this.endContainer,this.root),f=d.block,h=c.block,e=null;if(!d.blockLimit.equals(c.blockLimit))return null;"br"!=a&&(f||(f=this.fixBlock(!0,a),h=(new CKEDITOR.dom.elementPath(this.endContainer,
+this.root)).block),h||(h=this.fixBlock(!1,a)));d=f&&this.checkStartOfBlock();c=h&&this.checkEndOfBlock();this.deleteContents();f&&f.equals(h)&&(c?(e=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(h,CKEDITOR.POSITION_AFTER_END),h=null):d?(e=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(f,CKEDITOR.POSITION_BEFORE_START),f=null):(h=this.splitElement(f,b||!1),f.is("ul","ol")||f.appendBogus()));return{previousBlock:f,nextBlock:h,wasStartOfBlock:d,
+wasEndOfBlock:c,elementPath:e}},splitElement:function(a,b){if(!this.collapsed)return null;this.setEndAt(a,CKEDITOR.POSITION_BEFORE_END);var d=this.extractContents(!1,b||!1),c=a.clone(!1,b||!1);d.appendTo(c);c.insertAfter(a);this.moveToPosition(a,CKEDITOR.POSITION_AFTER_END);return c},removeEmptyBlocksAtEnd:function(){function a(g){return function(a){return b(a)||d(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.isEmptyInlineRemoveable()||g.is("table")&&a.is("caption")?!1:!0}}var b=CKEDITOR.dom.walker.whitespaces(),
+d=CKEDITOR.dom.walker.bookmark(!1);return function(b){for(var d=this.createBookmark(),c=this[b?"endPath":"startPath"](),f=c.block||c.blockLimit,h;f&&!f.equals(c.root)&&!f.getFirst(a(f));)h=f.getParent(),this[b?"setEndAt":"setStartAt"](f,CKEDITOR.POSITION_AFTER_END),f.remove(1),f=h;this.moveToBookmark(d)}}(),startPath:function(){return new CKEDITOR.dom.elementPath(this.startContainer,this.root)},endPath:function(){return new CKEDITOR.dom.elementPath(this.endContainer,this.root)},checkBoundaryOfElement:function(a,
+b){var d=b==CKEDITOR.START,c=this.clone();c.collapse(d);c[d?"setStartAt":"setEndAt"](a,d?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END);c=new CKEDITOR.dom.walker(c);c.evaluator=f(d);return c[d?"checkBackward":"checkForward"]()},checkStartOfBlock:function(){var a=this.startContainer,b=this.startOffset;CKEDITOR.env.ie&&b&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.ltrim(a.substring(0,b)),k.test(a)&&this.trim(0,1));this.trim();a=new CKEDITOR.dom.elementPath(this.startContainer,this.root);
 b=this.clone();b.collapse(!0);b.setStartAt(a.block||a.blockLimit,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(b);a.evaluator=c();return a.checkBackward()},checkEndOfBlock:function(){var a=this.endContainer,b=this.endOffset;CKEDITOR.env.ie&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.rtrim(a.substring(b)),k.test(a)&&this.trim(1,0));this.trim();a=new CKEDITOR.dom.elementPath(this.endContainer,this.root);b=this.clone();b.collapse(!1);b.setEndAt(a.block||a.blockLimit,CKEDITOR.POSITION_BEFORE_END);
 a=new CKEDITOR.dom.walker(b);a.evaluator=c();return a.checkForward()},getPreviousNode:function(a,b,d){var c=this.clone();c.collapse(1);c.setStartAt(d||this.root,CKEDITOR.POSITION_AFTER_START);d=new CKEDITOR.dom.walker(c);d.evaluator=a;d.guard=b;return d.previous()},getNextNode:function(a,b,d){var c=this.clone();c.collapse();c.setEndAt(d||this.root,CKEDITOR.POSITION_BEFORE_END);d=new CKEDITOR.dom.walker(c);d.evaluator=a;d.guard=b;return d.next()},checkReadOnly:function(){function a(b,d){for(;b;){if(b.type==
-CKEDITOR.NODE_ELEMENT){if("false"==b.getAttribute("contentEditable")&&!b.data("cke-editable"))return 0;if(b.is("html")||"true"==b.getAttribute("contentEditable")&&(b.contains(d)||b.equals(d)))break}b=b.getParent()}return 1}return function(){var b=this.startContainer,d=this.endContainer;return!(a(b,d)&&a(d,b))}}(),moveToElementEditablePosition:function(a,b){if(a.type==CKEDITOR.NODE_ELEMENT&&!a.isEditable(!1))return this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START),
-!0;for(var c=0;a;){if(a.type==CKEDITOR.NODE_TEXT){b&&this.endContainer&&this.checkEndOfBlock()&&k.test(a.getText())?this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START):this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START);c=1;break}if(a.type==CKEDITOR.NODE_ELEMENT)if(a.isEditable())this.moveToPosition(a,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_START),c=1;else if(b&&a.is("br")&&this.endContainer&&this.checkEndOfBlock())this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);
-else if("false"==a.getAttribute("contenteditable")&&a.is(CKEDITOR.dtd.$block))return this.setStartBefore(a),this.setEndAfter(a),!0;var e=a,h=c,n=void 0;e.type==CKEDITOR.NODE_ELEMENT&&e.isEditable(!1)&&(n=e[b?"getLast":"getFirst"](d));h||n||(n=e[b?"getPrevious":"getNext"](d));a=n}return!!c},moveToClosestEditablePosition:function(a,b){var d,c=0,e,h,k=[CKEDITOR.POSITION_AFTER_END,CKEDITOR.POSITION_BEFORE_START];a?(d=new CKEDITOR.dom.range(this.root),d.moveToPosition(a,k[b?0:1])):d=this.clone();if(a&&
-!a.is(CKEDITOR.dtd.$block))c=1;else if(e=d[b?"getNextEditableNode":"getPreviousEditableNode"]())c=1,(h=e.type==CKEDITOR.NODE_ELEMENT)&&e.is(CKEDITOR.dtd.$block)&&"false"==e.getAttribute("contenteditable")?(d.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),d.setEndAt(e,CKEDITOR.POSITION_AFTER_END)):!CKEDITOR.env.needsBrFiller&&h&&e.is(CKEDITOR.dom.walker.validEmptyBlockContainers)?(d.setEnd(e,0),d.collapse()):d.moveToPosition(e,k[b?1:0]);c&&this.moveToRange(d);return!!c},moveToElementEditStart:function(a){return this.moveToElementEditablePosition(a)},
+CKEDITOR.NODE_ELEMENT){if("false"==b.getAttribute("contentEditable")&&!b.data("cke-editable"))return 0;if(b.is("html")||"true"==b.getAttribute("contentEditable")&&(b.contains(d)||b.equals(d)))break}b=b.getParent()}return 1}return function(){var b=this.startContainer,d=this.endContainer;return!(a(b,d)&&a(d,b))}}(),moveToElementEditablePosition:function(a,d){if(a.type==CKEDITOR.NODE_ELEMENT&&!a.isEditable(!1))return this.moveToPosition(a,d?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START),
+!0;for(var c=0;a;){if(a.type==CKEDITOR.NODE_TEXT){d&&this.endContainer&&this.checkEndOfBlock()&&k.test(a.getText())?this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START):this.moveToPosition(a,d?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START);c=1;break}if(a.type==CKEDITOR.NODE_ELEMENT)if(a.isEditable())this.moveToPosition(a,d?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_START),c=1;else if(d&&a.is("br")&&this.endContainer&&this.checkEndOfBlock())this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);
+else if("false"==a.getAttribute("contenteditable")&&a.is(CKEDITOR.dtd.$block))return this.setStartBefore(a),this.setEndAfter(a),!0;var f=a,h=c,n=void 0;f.type==CKEDITOR.NODE_ELEMENT&&f.isEditable(!1)&&(n=f[d?"getLast":"getFirst"](b));h||n||(n=f[d?"getPrevious":"getNext"](b));a=n}return!!c},moveToClosestEditablePosition:function(a,b){var d,c=0,f,h,e=[CKEDITOR.POSITION_AFTER_END,CKEDITOR.POSITION_BEFORE_START];a?(d=new CKEDITOR.dom.range(this.root),d.moveToPosition(a,e[b?0:1])):d=this.clone();if(a&&
+!a.is(CKEDITOR.dtd.$block))c=1;else if(f=d[b?"getNextEditableNode":"getPreviousEditableNode"]())c=1,(h=f.type==CKEDITOR.NODE_ELEMENT)&&f.is(CKEDITOR.dtd.$block)&&"false"==f.getAttribute("contenteditable")?(d.setStartAt(f,CKEDITOR.POSITION_BEFORE_START),d.setEndAt(f,CKEDITOR.POSITION_AFTER_END)):!CKEDITOR.env.needsBrFiller&&h&&f.is(CKEDITOR.dom.walker.validEmptyBlockContainers)?(d.setEnd(f,0),d.collapse()):d.moveToPosition(f,e[b?1:0]);c&&this.moveToRange(d);return!!c},moveToElementEditStart:function(a){return this.moveToElementEditablePosition(a)},
 moveToElementEditEnd:function(a){return this.moveToElementEditablePosition(a,!0)},getEnclosedNode:function(){var a=this.clone();a.optimize();if(a.startContainer.type!=CKEDITOR.NODE_ELEMENT||a.endContainer.type!=CKEDITOR.NODE_ELEMENT)return null;var a=new CKEDITOR.dom.walker(a),b=CKEDITOR.dom.walker.bookmark(!1,!0),d=CKEDITOR.dom.walker.whitespaces(!0);a.evaluator=function(a){return d(a)&&b(a)};var c=a.next();a.reset();return c&&c.equals(a.previous())?c:null},getTouchedStartNode:function(){var a=this.startContainer;
-return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.startOffset)||a},getTouchedEndNode:function(){var a=this.endContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.endOffset-1)||a},getNextEditableNode:h(),getPreviousEditableNode:h(1),scrollIntoView:function(){var a=new CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",this.document),b,d,c,e=this.clone();e.optimize();(c=e.startContainer.type==CKEDITOR.NODE_TEXT)?(d=e.startContainer.getText(),
-b=e.startContainer.split(e.startOffset),a.insertAfter(e.startContainer)):e.insertNode(a);a.scrollIntoView();c&&(e.startContainer.setText(d),b.remove());a.remove()},_setStartContainer:function(a){this.startContainer=a},_setEndContainer:function(a){this.endContainer=a},_find:function(a,b){var d=this.getCommonAncestor(),c=this.getBoundaryNodes(),e=[],h,k,f,m;if(d&&d.find)for(k=d.find(a),h=0;h<k.count();h++)if(d=k.getItem(h),b||!d.isReadOnly())f=d.getPosition(c.startNode)&CKEDITOR.POSITION_FOLLOWING||
-c.startNode.equals(d),m=d.getPosition(c.endNode)&CKEDITOR.POSITION_PRECEDING+CKEDITOR.POSITION_IS_CONTAINED,f&&m&&e.push(d);return e}}}(),CKEDITOR.POSITION_AFTER_START=1,CKEDITOR.POSITION_BEFORE_END=2,CKEDITOR.POSITION_BEFORE_START=3,CKEDITOR.POSITION_AFTER_END=4,CKEDITOR.ENLARGE_ELEMENT=1,CKEDITOR.ENLARGE_BLOCK_CONTENTS=2,CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3,CKEDITOR.ENLARGE_INLINE=4,CKEDITOR.START=1,CKEDITOR.END=2,CKEDITOR.SHRINK_ELEMENT=1,CKEDITOR.SHRINK_TEXT=2,"use strict",function(){function a(a){1>
-arguments.length||(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function f(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function c(a,b,e,h){a:{null==h&&(h=f(e));for(var k;k=h.shift();)if(k.getDtd().p){h={element:k,remaining:h};break a}h=null}if(!h)return 0;if((k=CKEDITOR.filter.instances[h.element.data("cke-filter")])&&!k.check(b))return c(a,b,e,h.remaining);
-b=new CKEDITOR.dom.range(h.element);b.selectNodeContents(h.element);b=b.createIterator();b.enlargeBr=a.enlargeBr;b.enforceRealBlocks=a.enforceRealBlocks;b.activeFilter=b.filter=k;a._.nestedEditable={element:h.element,container:e,remaining:h.remaining,iterator:b};return 1}function e(a,b,c){if(!b)return!1;a=a.clone();a.collapse(!c);return a.checkBoundaryOfElement(b,c?CKEDITOR.START:CKEDITOR.END)}var h=/^[\r\n\t ]+$/,m=CKEDITOR.dom.walker.bookmark(!1,!0),l=CKEDITOR.dom.walker.whitespaces(!0),k=function(a){return m(a)&&
-l(a)},b={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var g,f,l,u,t;a=a||"p";if(this._.nestedEditable){if(g=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,g;this.activeFilter=this.filter;if(c(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=null}if(!this.range.root.getDtd()[a])return null;
-if(!this._.started){var n=this.range.clone();f=n.startPath();var q=n.endPath(),x=!n.collapsed&&e(n,f.block),A=!n.collapsed&&e(n,q.block,1);n.shrink(CKEDITOR.SHRINK_ELEMENT,!0);x&&n.setStartAt(f.block,CKEDITOR.POSITION_BEFORE_END);A&&n.setEndAt(q.block,CKEDITOR.POSITION_AFTER_START);f=n.endContainer.hasAscendant("pre",!0)||n.startContainer.hasAscendant("pre",!0);n.enlarge(this.forceBrBreak&&!f||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);n.collapsed||(f=new CKEDITOR.dom.walker(n.clone()),
-q=CKEDITOR.dom.walker.bookmark(!0,!0),f.evaluator=q,this._.nextNode=f.next(),f=new CKEDITOR.dom.walker(n.clone()),f.evaluator=q,f=f.previous(),this._.lastNode=f.getNextSourceNode(!0,null,n.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(q=this.range.clone(),q.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),q.checkEndOfBlock()&&(q=new CKEDITOR.dom.elementPath(q.endContainer,
-q.root),this._.lastNode=(q.block||q.blockLimit).getNextSourceNode(!0))),this._.lastNode&&n.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=n.document.createText(""),this._.lastNode.insertAfter(f)),n=null);this._.started=1;f=n}q=this._.nextNode;n=this._.lastNode;for(this._.nextNode=null;q;){var x=0,A=q.hasAscendant("pre"),C=q.type!=CKEDITOR.NODE_ELEMENT,r=0;if(C)q.type==CKEDITOR.NODE_TEXT&&h.test(q.getText())&&(C=0);else{var w=q.getName();if(CKEDITOR.dtd.$block[w]&&"false"==q.getAttribute("contenteditable")){g=
-q;c(this,a,g);break}else if(q.isBlockBoundary(this.forceBrBreak&&!A&&{br:1})){if("br"==w)C=1;else if(!f&&!q.getChildCount()&&"hr"!=w){g=q;l=q.equals(n);break}f&&(f.setEndAt(q,CKEDITOR.POSITION_BEFORE_START),"br"!=w&&(this._.nextNode=q));x=1}else{if(q.getFirst()){f||(f=this.range.clone(),f.setStartAt(q,CKEDITOR.POSITION_BEFORE_START));q=q.getFirst();continue}C=1}}C&&!f&&(f=this.range.clone(),f.setStartAt(q,CKEDITOR.POSITION_BEFORE_START));l=(!x||C)&&q.equals(n);if(f&&!x)for(;!q.getNext(k)&&!l;){w=
-q.getParent();if(w.isBlockBoundary(this.forceBrBreak&&!A&&{br:1})){x=1;C=0;l||w.equals(n);f.setEndAt(w,CKEDITOR.POSITION_BEFORE_END);break}q=w;C=1;l=q.equals(n);r=1}C&&f.setEndAt(q,CKEDITOR.POSITION_AFTER_END);q=this._getNextSourceNode(q,r,n);if((l=!q)||x&&f)break}if(!g){if(!f)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;g=new CKEDITOR.dom.elementPath(f.startContainer,f.root);q=g.blockLimit;x={div:1,th:1,td:1};g=g.block;!g&&q&&!this.enforceRealBlocks&&x[q.getName()]&&
-f.checkStartOfBlock()&&f.checkEndOfBlock()&&!q.equals(f.root)?g=q:!g||this.enforceRealBlocks&&g.is(b)?(g=this.range.document.createElement(a),f.extractContents().appendTo(g),g.trim(),f.insertNode(g),u=t=!0):"li"!=g.getName()?f.checkStartOfBlock()&&f.checkEndOfBlock()||(g=g.clone(!1),f.extractContents().appendTo(g),g.trim(),t=f.splitBlock(),u=!t.wasStartOfBlock,t=!t.wasEndOfBlock,f.insertNode(g)):l||(this._.nextNode=g.equals(n)?null:this._getNextSourceNode(f.getBoundaryNodes().endNode,1,n))}u&&(u=
-g.getPrevious())&&u.type==CKEDITOR.NODE_ELEMENT&&("br"==u.getName()?u.remove():u.getLast()&&"br"==u.getLast().$.nodeName.toLowerCase()&&u.getLast().remove());t&&(u=g.getLast())&&u.type==CKEDITOR.NODE_ELEMENT&&"br"==u.getName()&&(!CKEDITOR.env.needsBrFiller||u.getPrevious(m)||u.getNext(m))&&u.remove();this._.nextNode||(this._.nextNode=l||g.equals(n)||!n?null:this._getNextSourceNode(g,1,n));return g},_getNextSourceNode:function(a,b,c){function e(a){return!(a.equals(c)||a.equals(h))}var h=this.range.root;
-for(a=a.getNextSourceNode(b,null,e);!m(a);)a=a.getNextSourceNode(b,null,e);return a}};CKEDITOR.dom.range.prototype.createIterator=function(){return new a(this)}}(),CKEDITOR.command=function(a,f){this.uiItems=[];this.exec=function(c){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&a.focus();return!1===this.fire("exec")?!0:!1!==f.exec.call(this,a,c)};this.refresh=function(a,c){if(!this.readOnly&&a.readOnly)return!0;if(this.context&&!c.isContextFor(this.context)||
-!this.checkAllowed(!0))return this.disable(),!0;this.startDisabled||this.enable();this.modes&&!this.modes[a.mode]&&this.disable();return!1===this.fire("refresh",{editor:a,path:c})?!0:f.refresh&&!1!==f.refresh.apply(this,arguments)};var c;this.checkAllowed=function(e){return e||"boolean"!=typeof c?c=a.activeFilter.checkFeature(this):c};CKEDITOR.tools.extend(this,f,{modes:{wysiwyg:1},editorFocus:1,contextSensitive:!!f.context,state:CKEDITOR.TRISTATE_DISABLED});CKEDITOR.event.call(this)},CKEDITOR.command.prototype=
+return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.startOffset)||a},getTouchedEndNode:function(){var a=this.endContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.endOffset-1)||a},getNextEditableNode:h(),getPreviousEditableNode:h(1),scrollIntoView:function(){var a=new CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",this.document),b,d,c,f=this.clone();f.optimize();(c=f.startContainer.type==CKEDITOR.NODE_TEXT)?(d=f.startContainer.getText(),
+b=f.startContainer.split(f.startOffset),a.insertAfter(f.startContainer)):f.insertNode(a);a.scrollIntoView();c&&(f.startContainer.setText(d),b.remove());a.remove()},_setStartContainer:function(a){this.startContainer=a},_setEndContainer:function(a){this.endContainer=a},_find:function(a,b){var d=this.getCommonAncestor(),c=this.getBoundaryNodes(),f=[],h,e,k,l;if(d&&d.find)for(e=d.find(a),h=0;h<e.count();h++)if(d=e.getItem(h),b||!d.isReadOnly())k=d.getPosition(c.startNode)&CKEDITOR.POSITION_FOLLOWING||
+c.startNode.equals(d),l=d.getPosition(c.endNode)&CKEDITOR.POSITION_PRECEDING+CKEDITOR.POSITION_IS_CONTAINED,k&&l&&f.push(d);return f}}}(),CKEDITOR.POSITION_AFTER_START=1,CKEDITOR.POSITION_BEFORE_END=2,CKEDITOR.POSITION_BEFORE_START=3,CKEDITOR.POSITION_AFTER_END=4,CKEDITOR.ENLARGE_ELEMENT=1,CKEDITOR.ENLARGE_BLOCK_CONTENTS=2,CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3,CKEDITOR.ENLARGE_INLINE=4,CKEDITOR.START=1,CKEDITOR.END=2,CKEDITOR.SHRINK_ELEMENT=1,CKEDITOR.SHRINK_TEXT=2,"use strict",function(){function a(a){1>
+arguments.length||(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function e(a){var d=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return d.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return d}function c(a,d,f,h){a:{null==h&&(h=e(f));for(var k;k=h.shift();)if(k.getDtd().p){h={element:k,remaining:h};break a}h=null}if(!h)return 0;if((k=CKEDITOR.filter.instances[h.element.data("cke-filter")])&&!k.check(d))return c(a,d,f,h.remaining);
+d=new CKEDITOR.dom.range(h.element);d.selectNodeContents(h.element);d=d.createIterator();d.enlargeBr=a.enlargeBr;d.enforceRealBlocks=a.enforceRealBlocks;d.activeFilter=d.filter=k;a._.nestedEditable={element:h.element,container:f,remaining:h.remaining,iterator:d};return 1}function f(a,d,c){if(!d)return!1;a=a.clone();a.collapse(!c);return a.checkBoundaryOfElement(d,c?CKEDITOR.START:CKEDITOR.END)}var h=/^[\r\n\t ]+$/,m=CKEDITOR.dom.walker.bookmark(!1,!0),l=CKEDITOR.dom.walker.whitespaces(!0),k=function(a){return m(a)&&
+l(a)},d={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var g,e,l,r,w;a=a||"p";if(this._.nestedEditable){if(g=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,g;this.activeFilter=this.filter;if(c(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=null}if(!this.range.root.getDtd()[a])return null;
+if(!this._.started){var n=this.range.clone();e=n.startPath();var q=n.endPath(),u=!n.collapsed&&f(n,e.block),B=!n.collapsed&&f(n,q.block,1);n.shrink(CKEDITOR.SHRINK_ELEMENT,!0);u&&n.setStartAt(e.block,CKEDITOR.POSITION_BEFORE_END);B&&n.setEndAt(q.block,CKEDITOR.POSITION_AFTER_START);e=n.endContainer.hasAscendant("pre",!0)||n.startContainer.hasAscendant("pre",!0);n.enlarge(this.forceBrBreak&&!e||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);n.collapsed||(e=new CKEDITOR.dom.walker(n.clone()),
+q=CKEDITOR.dom.walker.bookmark(!0,!0),e.evaluator=q,this._.nextNode=e.next(),e=new CKEDITOR.dom.walker(n.clone()),e.evaluator=q,e=e.previous(),this._.lastNode=e.getNextSourceNode(!0,null,n.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(q=this.range.clone(),q.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),q.checkEndOfBlock()&&(q=new CKEDITOR.dom.elementPath(q.endContainer,
+q.root),this._.lastNode=(q.block||q.blockLimit).getNextSourceNode(!0))),this._.lastNode&&n.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=n.document.createText(""),this._.lastNode.insertAfter(e)),n=null);this._.started=1;e=n}q=this._.nextNode;n=this._.lastNode;for(this._.nextNode=null;q;){var u=0,B=q.hasAscendant("pre"),y=q.type!=CKEDITOR.NODE_ELEMENT,t=0;if(y)q.type==CKEDITOR.NODE_TEXT&&h.test(q.getText())&&(y=0);else{var x=q.getName();if(CKEDITOR.dtd.$block[x]&&"false"==q.getAttribute("contenteditable")){g=
+q;c(this,a,g);break}else if(q.isBlockBoundary(this.forceBrBreak&&!B&&{br:1})){if("br"==x)y=1;else if(!e&&!q.getChildCount()&&"hr"!=x){g=q;l=q.equals(n);break}e&&(e.setEndAt(q,CKEDITOR.POSITION_BEFORE_START),"br"!=x&&(this._.nextNode=q));u=1}else{if(q.getFirst()){e||(e=this.range.clone(),e.setStartAt(q,CKEDITOR.POSITION_BEFORE_START));q=q.getFirst();continue}y=1}}y&&!e&&(e=this.range.clone(),e.setStartAt(q,CKEDITOR.POSITION_BEFORE_START));l=(!u||y)&&q.equals(n);if(e&&!u)for(;!q.getNext(k)&&!l;){x=
+q.getParent();if(x.isBlockBoundary(this.forceBrBreak&&!B&&{br:1})){u=1;y=0;l||x.equals(n);e.setEndAt(x,CKEDITOR.POSITION_BEFORE_END);break}q=x;y=1;l=q.equals(n);t=1}y&&e.setEndAt(q,CKEDITOR.POSITION_AFTER_END);q=this._getNextSourceNode(q,t,n);if((l=!q)||u&&e)break}if(!g){if(!e)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;g=new CKEDITOR.dom.elementPath(e.startContainer,e.root);q=g.blockLimit;u={div:1,th:1,td:1};g=g.block;!g&&q&&!this.enforceRealBlocks&&u[q.getName()]&&
+e.checkStartOfBlock()&&e.checkEndOfBlock()&&!q.equals(e.root)?g=q:!g||this.enforceRealBlocks&&g.is(d)?(g=this.range.document.createElement(a),e.extractContents().appendTo(g),g.trim(),e.insertNode(g),r=w=!0):"li"!=g.getName()?e.checkStartOfBlock()&&e.checkEndOfBlock()||(g=g.clone(!1),e.extractContents().appendTo(g),g.trim(),w=e.splitBlock(),r=!w.wasStartOfBlock,w=!w.wasEndOfBlock,e.insertNode(g)):l||(this._.nextNode=g.equals(n)?null:this._getNextSourceNode(e.getBoundaryNodes().endNode,1,n))}r&&(r=
+g.getPrevious())&&r.type==CKEDITOR.NODE_ELEMENT&&("br"==r.getName()?r.remove():r.getLast()&&"br"==r.getLast().$.nodeName.toLowerCase()&&r.getLast().remove());w&&(r=g.getLast())&&r.type==CKEDITOR.NODE_ELEMENT&&"br"==r.getName()&&(!CKEDITOR.env.needsBrFiller||r.getPrevious(m)||r.getNext(m))&&r.remove();this._.nextNode||(this._.nextNode=l||g.equals(n)||!n?null:this._getNextSourceNode(g,1,n));return g},_getNextSourceNode:function(a,d,c){function f(a){return!(a.equals(c)||a.equals(h))}var h=this.range.root;
+for(a=a.getNextSourceNode(d,null,f);!m(a);)a=a.getNextSourceNode(d,null,f);return a}};CKEDITOR.dom.range.prototype.createIterator=function(){return new a(this)}}(),CKEDITOR.command=function(a,e){this.uiItems=[];this.exec=function(c){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&a.focus();return!1===this.fire("exec")?!0:!1!==e.exec.call(this,a,c)};this.refresh=function(a,c){if(!this.readOnly&&a.readOnly)return!0;if(this.context&&!c.isContextFor(this.context)||
+!this.checkAllowed(!0))return this.disable(),!0;this.startDisabled||this.enable();this.modes&&!this.modes[a.mode]&&this.disable();return!1===this.fire("refresh",{editor:a,path:c})?!0:e.refresh&&!1!==e.refresh.apply(this,arguments)};var c;this.checkAllowed=function(f){return f||"boolean"!=typeof c?c=a.activeFilter.checkFeature(this):c};CKEDITOR.tools.extend(this,e,{modes:{wysiwyg:1},editorFocus:1,contextSensitive:!!e.context,state:CKEDITOR.TRISTATE_DISABLED});CKEDITOR.event.call(this)},CKEDITOR.command.prototype=
 {enable:function(){this.state==CKEDITOR.TRISTATE_DISABLED&&this.checkAllowed()&&this.setState(this.preserveState&&"undefined"!=typeof this.previousState?this.previousState:CKEDITOR.TRISTATE_OFF)},disable:function(){this.setState(CKEDITOR.TRISTATE_DISABLED)},setState:function(a){if(this.state==a||a!=CKEDITOR.TRISTATE_DISABLED&&!this.checkAllowed())return!1;this.previousState=this.state;this.state=a;this.fire("state");return!0},toggleState:function(){this.state==CKEDITOR.TRISTATE_OFF?this.setState(CKEDITOR.TRISTATE_ON):
 this.state==CKEDITOR.TRISTATE_ON&&this.setState(CKEDITOR.TRISTATE_OFF)}},CKEDITOR.event.implementOn(CKEDITOR.command.prototype),CKEDITOR.ENTER_P=1,CKEDITOR.ENTER_BR=2,CKEDITOR.ENTER_DIV=3,CKEDITOR.config={customConfig:"config.js",autoUpdateElement:!0,language:"",defaultLanguage:"en",contentsLangDirection:"",enterMode:CKEDITOR.ENTER_P,forceEnterMode:!1,shiftEnterMode:CKEDITOR.ENTER_BR,docType:"\x3c!DOCTYPE html\x3e",bodyId:"",bodyClass:"",fullPage:!1,height:200,contentsCss:CKEDITOR.getUrl("contents.css"),
-extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]},function(){function a(a,b,d,c,g){var e,h;a=[];for(e in b){h=b[e];h="boolean"==typeof h?{}:"function"==typeof h?{match:h}:E(h);"$"!=e.charAt(0)&&(h.elements=e);d&&(h.featureName=d.toLowerCase());var f=h;f.elements=l(f.elements,/\s+/)||null;f.propertiesOnly=f.propertiesOnly||!0===f.elements;var n=/\s*,\s*/,k=void 0;for(k in N){f[k]=l(f[k],
-n)||null;var r=f,m=O[k],p=l(f[O[k]],n),w=f[k],q=[],C=!0,B=void 0;p?C=!1:p={};for(B in w)"!"==B.charAt(0)&&(B=B.slice(1),q.push(B),p[B]=!0,C=!1);for(;B=q.pop();)w[B]=w["!"+B],delete w["!"+B];r[m]=(C?!1:p)||null}f.match=f.match||null;c.push(h);a.push(h)}b=g.elements;g=g.generic;var t;d=0;for(c=a.length;d<c;++d){e=E(a[d]);h=!0===e.classes||!0===e.styles||!0===e.attributes;f=e;k=m=n=void 0;for(n in N)f[n]=x(f[n]);r=!0;for(k in O){n=O[k];m=f[n];p=[];w=void 0;for(w in m)-1<w.indexOf("*")?p.push(new RegExp("^"+
-w.replace(/\*/g,".*")+"$")):p.push(w);m=p;m.length&&(f[n]=m,r=!1)}f.nothingRequired=r;f.noProperties=!(f.attributes||f.classes||f.styles);if(!0===e.elements||null===e.elements)g[h?"unshift":"push"](e);else for(t in f=e.elements,delete e.elements,f)if(b[t])b[t][h?"unshift":"push"](e);else b[t]=[e]}}function f(a,b,d,g){if(!a.match||a.match(b))if(g||k(a,b))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=c(a.attributes,b.attributes,d.validAttributes)),d.allStyles||(d.allStyles=c(a.styles,
-b.styles,d.validStyles)),!d.allClasses){a=a.classes;b=b.classes;g=d.validClasses;if(a)if(!0===a)a=!0;else{for(var e=0,h=b.length,f;e<h;++e)f=b[e],g[f]||(g[f]=a(f));a=!1}else a=!1;d.allClasses=a}}function c(a,b,d){if(!a)return!1;if(!0===a)return!0;for(var c in b)d[c]||(d[c]=a(c));return!1}function e(a,b,d){if(!a.match||a.match(b)){if(a.noProperties)return!1;d.hadInvalidAttribute=h(a.attributes,b.attributes)||d.hadInvalidAttribute;d.hadInvalidStyle=h(a.styles,b.styles)||d.hadInvalidStyle;a=a.classes;
-b=b.classes;if(a){for(var c=!1,g=!0===a,e=b.length;e--;)if(g||a(b[e]))b.splice(e,1),c=!0;a=c}else a=!1;d.hadInvalidClass=a||d.hadInvalidClass}}function h(a,b){if(!a)return!1;var d=!1,c=!0===a,g;for(g in b)if(c||a(g))delete b[g],d=!0;return d}function m(a,b,d){if(a.disabled||a.customConfig&&!d||!b)return!1;a._.cachedChecks={};return!0}function l(a,b){if(!a)return!1;if(!0===a)return a;if("string"==typeof a)return a=L(a),"*"==a?!0:CKEDITOR.tools.convertArrayToObject(a.split(b));if(CKEDITOR.tools.isArray(a))return a.length?
-CKEDITOR.tools.convertArrayToObject(a):!1;var d={},c=0,g;for(g in a)d[g]=a[g],c++;return c?d:!1}function k(a,d){if(a.nothingRequired)return!0;var c,g,e,h;if(e=a.requiredClasses)for(h=d.classes,c=0;c<e.length;++c)if(g=e[c],"string"==typeof g){if(-1==CKEDITOR.tools.indexOf(h,g))return!1}else if(!CKEDITOR.tools.checkIfAnyArrayItemMatches(h,g))return!1;return b(d.styles,a.requiredStyles)&&b(d.attributes,a.requiredAttributes)}function b(a,b){if(!b)return!0;for(var d=0,c;d<b.length;++d)if(c=b[d],"string"==
-typeof c){if(!(c in a))return!1}else if(!CKEDITOR.tools.checkIfAnyObjectPropertyMatches(a,c))return!1;return!0}function d(a){if(!a)return{};a=a.split(/\s*,\s*/).sort();for(var b={};a.length;)b[a.shift()]="cke-test";return b}function g(a){var b,d,c,g,e={},h=1;for(a=L(a);b=a.match(I);)(d=b[2])?(c=p(d,"styles"),g=p(d,"attrs"),d=p(d,"classes")):c=g=d=null,e["$"+h++]={elements:b[1],classes:d,styles:c,attributes:g},a=a.slice(b[0].length);return e}function p(a,b){var d=a.match(R[b]);return d?L(d[1]):null}
-function v(a){var b=a.styleBackup=a.attributes.style,d=a.classBackup=a.attributes["class"];a.styles||(a.styles=CKEDITOR.tools.parseCssText(b||"",1));a.classes||(a.classes=d?d.split(/\s+/):[])}function u(a,b,d,c){var g=0,h;c.toHtml&&(b.name=b.name.replace(M,"$1"));if(c.doCallbacks&&a.elementCallbacks){a:{h=a.elementCallbacks;for(var k=0,r=h.length,m;k<r;++k)if(m=h[k](b)){h=m;break a}h=void 0}if(h)return h}if(c.doTransform&&(h=a._.transformations[b.name])){v(b);for(k=0;k<h.length;++k)w(a,b,h[k]);n(b)}if(c.doFilter){a:{k=
-b.name;r=a._;a=r.allowedRules.elements[k];h=r.allowedRules.generic;k=r.disallowedRules.elements[k];r=r.disallowedRules.generic;m=c.skipRequired;var p={valid:!1,validAttributes:{},validClasses:{},validStyles:{},allAttributes:!1,allClasses:!1,allStyles:!1,hadInvalidAttribute:!1,hadInvalidClass:!1,hadInvalidStyle:!1},l,B;if(a||h){v(b);if(k)for(l=0,B=k.length;l<B;++l)if(!1===e(k[l],b,p)){a=null;break a}if(r)for(l=0,B=r.length;l<B;++l)e(r[l],b,p);if(a)for(l=0,B=a.length;l<B;++l)f(a[l],b,p,m);if(h)for(l=
-0,B=h.length;l<B;++l)f(h[l],b,p,m);a=p}else a=null}if(!a||!a.valid)return d.push(b),1;B=a.validAttributes;var C=a.validStyles;h=a.validClasses;var k=b.attributes,x=b.styles,r=b.classes;m=b.classBackup;var t=b.styleBackup,I,z,O=[],p=[],u=/^data-cke-/;l=!1;delete k.style;delete k["class"];delete b.classBackup;delete b.styleBackup;if(!a.allAttributes)for(I in k)B[I]||(u.test(I)?I==(z=I.replace(/^data-cke-saved-/,""))||B[z]||(delete k[I],l=!0):(delete k[I],l=!0));if(!a.allStyles||a.hadInvalidStyle){for(I in x)a.allStyles||
-C[I]?O.push(I+":"+x[I]):l=!0;O.length&&(k.style=O.sort().join("; "))}else t&&(k.style=t);if(!a.allClasses||a.hadInvalidClass){for(I=0;I<r.length;++I)(a.allClasses||h[r[I]])&&p.push(r[I]);p.length&&(k["class"]=p.sort().join(" "));m&&p.length<m.split(/\s+/).length&&(l=!0)}else m&&(k["class"]=m);l&&(g=1);if(!c.skipFinalValidation&&!q(b))return d.push(b),1}c.toHtml&&(b.name=b.name.replace(Q,"cke:$1"));return g}function t(a){var b=[],d;for(d in a)-1<d.indexOf("*")&&b.push(d.replace(/\*/g,".*"));return b.length?
-new RegExp("^(?:"+b.join("|")+")$"):null}function n(a){var b=a.attributes,d;delete b.style;delete b["class"];if(d=CKEDITOR.tools.writeCssText(a.styles,!0))b.style=d;a.classes.length&&(b["class"]=a.classes.sort().join(" "))}function q(a){switch(a.name){case "a":if(!(a.children.length||a.attributes.name||a.attributes.id))return!1;break;case "img":if(!a.attributes.src)return!1}return!0}function x(a){if(!a)return!1;if(!0===a)return!0;var b=t(a);return function(d){return d in a||b&&d.match(b)}}function A(){return new CKEDITOR.htmlParser.element("br")}
-function C(a){return a.type==CKEDITOR.NODE_ELEMENT&&("br"==a.name||F.$block[a.name])}function r(a,b,d){var c=a.name;if(F.$empty[c]||!a.children.length)"hr"==c&&"br"==b?a.replaceWith(A()):(a.parent&&d.push({check:"it",el:a.parent}),a.remove());else if(F.$block[c]||"tr"==c)if("br"==b)a.previous&&!C(a.previous)&&(b=A(),b.insertBefore(a)),a.next&&!C(a.next)&&(b=A(),b.insertAfter(a)),a.replaceWithChildren();else{var c=a.children,g;b:{g=F[b];for(var e=0,h=c.length,f;e<h;++e)if(f=c[e],f.type==CKEDITOR.NODE_ELEMENT&&
-!g[f.name]){g=!1;break b}g=!0}if(g)a.name=b,a.attributes={},d.push({check:"parent-down",el:a});else{g=a.parent;for(var e=g.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||"body"==g.name,k,n,h=c.length;0<h;)f=c[--h],e&&(f.type==CKEDITOR.NODE_TEXT||f.type==CKEDITOR.NODE_ELEMENT&&F.$inline[f.name])?(k||(k=new CKEDITOR.htmlParser.element(b),k.insertAfter(a),d.push({check:"parent-down",el:k})),k.add(f,0)):(k=null,n=F[g.name]||F.span,f.insertAfter(a),g.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||f.type!=CKEDITOR.NODE_ELEMENT||
-n[f.name]||d.push({check:"el-up",el:f}));a.remove()}}else c in{style:1,script:1}?a.remove():(a.parent&&d.push({check:"it",el:a.parent}),a.replaceWithChildren())}function w(a,b,d){var c,g;for(c=0;c<d.length;++c)if(g=d[c],!(g.check&&!a.check(g.check,!1)||g.left&&!g.left(b))){g.right(b,P);break}}function B(a,b){var d=b.getDefinition(),c=d.attributes,g=d.styles,e,h,f,k;if(a.name!=d.element)return!1;for(e in c)if("class"==e)for(d=c[e].split(/\s+/),f=a.classes.join("|");k=d.pop();){if(-1==f.indexOf(k))return!1}else if(a.attributes[e]!=
-c[e])return!1;for(h in g)if(a.styles[h]!=g[h])return!1;return!0}function z(a,b){var d,c;"string"==typeof a?d=a:a instanceof CKEDITOR.style?c=a:(d=a[0],c=a[1]);return[{element:d,left:c,right:function(a,d){d.transform(a,b)}}]}function y(a){return function(b){return B(b,a)}}function D(a){return function(b,d){d[a](b)}}var F=CKEDITOR.dtd,E=CKEDITOR.tools.copy,L=CKEDITOR.tools.trim,G=["","p","br","div"];CKEDITOR.FILTER_SKIP_TREE=2;CKEDITOR.filter=function(a){this.allowedContent=[];this.disallowedContent=
-[];this.elementCallbacks=null;this.disabled=!1;this.editor=null;this.id=CKEDITOR.tools.getNextNumber();this._={allowedRules:{elements:{},generic:[]},disallowedRules:{elements:{},generic:[]},transformations:{},cachedTests:{}};CKEDITOR.filter.instances[this.id]=this;if(a instanceof CKEDITOR.editor){a=this.editor=a;this.customConfig=!0;var b=a.config.allowedContent;!0===b?this.disabled=!0:(b||(this.customConfig=!1),this.allow(b,"config",1),this.allow(a.config.extraAllowedContent,"extra",1),this.allow(G[a.enterMode]+
-" "+G[a.shiftEnterMode],"default",1),this.disallow(a.config.disallowedContent))}else this.customConfig=!1,this.allow(a,"default",1)};CKEDITOR.filter.instances={};CKEDITOR.filter.prototype={allow:function(b,d,c){if(!m(this,b,c))return!1;var e,h;if("string"==typeof b)b=g(b);else if(b instanceof CKEDITOR.style){if(b.toAllowedContentRules)return this.allow(b.toAllowedContentRules(this.editor),d,c);e=b.getDefinition();b={};c=e.attributes;b[e.element]=e={styles:e.styles,requiredStyles:e.styles&&CKEDITOR.tools.objectKeys(e.styles)};
-c&&(c=E(c),e.classes=c["class"]?c["class"].split(/\s+/):null,e.requiredClasses=e.classes,delete c["class"],e.attributes=c,e.requiredAttributes=c&&CKEDITOR.tools.objectKeys(c))}else if(CKEDITOR.tools.isArray(b)){for(e=0;e<b.length;++e)h=this.allow(b[e],d,c);return h}a(this,b,d,this.allowedContent,this._.allowedRules);return!0},applyTo:function(a,b,d,c){if(this.disabled)return!1;var g=this,e=[],h=this.editor&&this.editor.config.protectedSource,f,k=!1,n={doFilter:!d,doTransform:!0,doCallbacks:!0,toHtml:b};
-a.forEach(function(a){if(a.type==CKEDITOR.NODE_ELEMENT){if("off"==a.attributes["data-cke-filter"])return!1;if(!b||"span"!=a.name||!~CKEDITOR.tools.objectKeys(a.attributes).join("|").indexOf("data-cke-"))if(f=u(g,a,e,n),f&1)k=!0;else if(f&2)return!1}else if(a.type==CKEDITOR.NODE_COMMENT&&a.value.match(/^\{cke_protected\}(?!\{C\})/)){var d;a:{var c=decodeURIComponent(a.value.replace(/^\{cke_protected\}/,""));d=[];var r,m,p;if(h)for(m=0;m<h.length;++m)if((p=c.match(h[m]))&&p[0].length==c.length){d=!0;
-break a}c=CKEDITOR.htmlParser.fragment.fromHtml(c);1==c.children.length&&(r=c.children[0]).type==CKEDITOR.NODE_ELEMENT&&u(g,r,d,n);d=!d.length}d||e.push(a)}},null,!0);e.length&&(k=!0);var m;a=[];c=G[c||(this.editor?this.editor.enterMode:CKEDITOR.ENTER_P)];for(var p;d=e.pop();)d.type==CKEDITOR.NODE_ELEMENT?r(d,c,a):d.remove();for(;m=a.pop();)if(d=m.el,d.parent)switch(p=F[d.parent.name]||F.span,m.check){case "it":F.$removeEmpty[d.name]&&!d.children.length?r(d,c,a):q(d)||r(d,c,a);break;case "el-up":d.parent.type==
-CKEDITOR.NODE_DOCUMENT_FRAGMENT||p[d.name]||r(d,c,a);break;case "parent-down":d.parent.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||p[d.name]||r(d.parent,c,a)}return k},checkFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));return!a.requiredContent||this.check(a.requiredContent)},disable:function(){this.disabled=!0},disallow:function(b){if(!m(this,b,!0))return!1;"string"==typeof b&&(b=g(b));a(this,b,null,this.disallowedContent,this._.disallowedRules);return!0},
+extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]},function(){function a(a,b,d,c,g){var f,h;a=[];for(f in b){h=b[f];h="boolean"==typeof h?{}:"function"==typeof h?{match:h}:D(h);"$"!=f.charAt(0)&&(h.elements=f);d&&(h.featureName=d.toLowerCase());var e=h;e.elements=l(e.elements,/\s+/)||null;e.propertiesOnly=e.propertiesOnly||!0===e.elements;var k=/\s*,\s*/,n=void 0;for(n in M){e[n]=l(e[n],
+k)||null;var t=e,x=P[n],m=l(e[P[n]],k),p=e[n],q=[],F=!0,G=void 0;m?F=!1:m={};for(G in p)"!"==G.charAt(0)&&(G=G.slice(1),q.push(G),m[G]=!0,F=!1);for(;G=q.pop();)p[G]=p["!"+G],delete p["!"+G];t[x]=(F?!1:m)||null}e.match=e.match||null;c.push(h);a.push(h)}b=g.elements;g=g.generic;var z;d=0;for(c=a.length;d<c;++d){f=D(a[d]);h=!0===f.classes||!0===f.styles||!0===f.attributes;e=f;n=x=k=void 0;for(k in M)e[k]=u(e[k]);t=!0;for(n in P){k=P[n];x=e[k];m=[];p=void 0;for(p in x)-1<p.indexOf("*")?m.push(new RegExp("^"+
+p.replace(/\*/g,".*")+"$")):m.push(p);x=m;x.length&&(e[k]=x,t=!1)}e.nothingRequired=t;e.noProperties=!(e.attributes||e.classes||e.styles);if(!0===f.elements||null===f.elements)g[h?"unshift":"push"](f);else for(z in e=f.elements,delete f.elements,e)if(b[z])b[z][h?"unshift":"push"](f);else b[z]=[f]}}function e(a,b,d,g){if(!a.match||a.match(b))if(g||k(a,b))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=c(a.attributes,b.attributes,d.validAttributes)),d.allStyles||(d.allStyles=c(a.styles,
+b.styles,d.validStyles)),!d.allClasses){a=a.classes;b=b.classes;g=d.validClasses;if(a)if(!0===a)a=!0;else{for(var f=0,h=b.length,e;f<h;++f)e=b[f],g[e]||(g[e]=a(e));a=!1}else a=!1;d.allClasses=a}}function c(a,b,d){if(!a)return!1;if(!0===a)return!0;for(var c in b)d[c]||(d[c]=a(c));return!1}function f(a,b,d){if(!a.match||a.match(b)){if(a.noProperties)return!1;d.hadInvalidAttribute=h(a.attributes,b.attributes)||d.hadInvalidAttribute;d.hadInvalidStyle=h(a.styles,b.styles)||d.hadInvalidStyle;a=a.classes;
+b=b.classes;if(a){for(var c=!1,g=!0===a,f=b.length;f--;)if(g||a(b[f]))b.splice(f,1),c=!0;a=c}else a=!1;d.hadInvalidClass=a||d.hadInvalidClass}}function h(a,b){if(!a)return!1;var d=!1,c=!0===a,g;for(g in b)if(c||a(g))delete b[g],d=!0;return d}function m(a,b,d){if(a.disabled||a.customConfig&&!d||!b)return!1;a._.cachedChecks={};return!0}function l(a,b){if(!a)return!1;if(!0===a)return a;if("string"==typeof a)return a=I(a),"*"==a?!0:CKEDITOR.tools.convertArrayToObject(a.split(b));if(CKEDITOR.tools.isArray(a))return a.length?
+CKEDITOR.tools.convertArrayToObject(a):!1;var d={},c=0,g;for(g in a)d[g]=a[g],c++;return c?d:!1}function k(a,b){if(a.nothingRequired)return!0;var c,g,f,h;if(f=a.requiredClasses)for(h=b.classes,c=0;c<f.length;++c)if(g=f[c],"string"==typeof g){if(-1==CKEDITOR.tools.indexOf(h,g))return!1}else if(!CKEDITOR.tools.checkIfAnyArrayItemMatches(h,g))return!1;return d(b.styles,a.requiredStyles)&&d(b.attributes,a.requiredAttributes)}function d(a,b){if(!b)return!0;for(var d=0,c;d<b.length;++d)if(c=b[d],"string"==
+typeof c){if(!(c in a))return!1}else if(!CKEDITOR.tools.checkIfAnyObjectPropertyMatches(a,c))return!1;return!0}function b(a){if(!a)return{};a=a.split(/\s*,\s*/).sort();for(var b={};a.length;)b[a.shift()]="cke-test";return b}function g(a){var b,d,c,g,f={},h=1;for(a=I(a);b=a.match(G);)(d=b[2])?(c=p(d,"styles"),g=p(d,"attrs"),d=p(d,"classes")):c=g=d=null,f["$"+h++]={elements:b[1],classes:d,styles:c,attributes:g},a=a.slice(b[0].length);return f}function p(a,b){var d=a.match(S[b]);return d?I(d[1]):null}
+function v(a){var b=a.styleBackup=a.attributes.style,d=a.classBackup=a.attributes["class"];a.styles||(a.styles=CKEDITOR.tools.parseCssText(b||"",1));a.classes||(a.classes=d?d.split(/\s+/):[])}function r(a,b,d,c){var g=0,h;c.toHtml&&(b.name=b.name.replace(L,"$1"));if(c.doCallbacks&&a.elementCallbacks){a:{h=a.elementCallbacks;for(var k=0,t=h.length,l;k<t;++k)if(l=h[k](b)){h=l;break a}h=void 0}if(h)return h}if(c.doTransform&&(h=a._.transformations[b.name])){v(b);for(k=0;k<h.length;++k)x(a,b,h[k]);n(b)}if(c.doFilter){a:{k=
+b.name;t=a._;a=t.allowedRules.elements[k];h=t.allowedRules.generic;k=t.disallowedRules.elements[k];t=t.disallowedRules.generic;l=c.skipRequired;var m={valid:!1,validAttributes:{},validClasses:{},validStyles:{},allAttributes:!1,allClasses:!1,allStyles:!1,hadInvalidAttribute:!1,hadInvalidClass:!1,hadInvalidStyle:!1},p,F;if(a||h){v(b);if(k)for(p=0,F=k.length;p<F;++p)if(!1===f(k[p],b,m)){a=null;break a}if(t)for(p=0,F=t.length;p<F;++p)f(t[p],b,m);if(a)for(p=0,F=a.length;p<F;++p)e(a[p],b,m,l);if(h)for(p=
+0,F=h.length;p<F;++p)e(h[p],b,m,l);a=m}else a=null}if(!a||!a.valid)return d.push(b),1;F=a.validAttributes;var u=a.validStyles;h=a.validClasses;var k=b.attributes,G=b.styles,t=b.classes;l=b.classBackup;var z=b.styleBackup,w,P,A=[],m=[],r=/^data-cke-/;p=!1;delete k.style;delete k["class"];delete b.classBackup;delete b.styleBackup;if(!a.allAttributes)for(w in k)F[w]||(r.test(w)?w==(P=w.replace(/^data-cke-saved-/,""))||F[P]||(delete k[w],p=!0):(delete k[w],p=!0));if(!a.allStyles||a.hadInvalidStyle){for(w in G)a.allStyles||
+u[w]?A.push(w+":"+G[w]):p=!0;A.length&&(k.style=A.sort().join("; "))}else z&&(k.style=z);if(!a.allClasses||a.hadInvalidClass){for(w=0;w<t.length;++w)(a.allClasses||h[t[w]])&&m.push(t[w]);m.length&&(k["class"]=m.sort().join(" "));l&&m.length<l.split(/\s+/).length&&(p=!0)}else l&&(k["class"]=l);p&&(g=1);if(!c.skipFinalValidation&&!q(b))return d.push(b),1}c.toHtml&&(b.name=b.name.replace(R,"cke:$1"));return g}function w(a){var b=[],d;for(d in a)-1<d.indexOf("*")&&b.push(d.replace(/\*/g,".*"));return b.length?
+new RegExp("^(?:"+b.join("|")+")$"):null}function n(a){var b=a.attributes,d;delete b.style;delete b["class"];if(d=CKEDITOR.tools.writeCssText(a.styles,!0))b.style=d;a.classes.length&&(b["class"]=a.classes.sort().join(" "))}function q(a){switch(a.name){case "a":if(!(a.children.length||a.attributes.name||a.attributes.id))return!1;break;case "img":if(!a.attributes.src)return!1}return!0}function u(a){if(!a)return!1;if(!0===a)return!0;var b=w(a);return function(d){return d in a||b&&d.match(b)}}function B(){return new CKEDITOR.htmlParser.element("br")}
+function y(a){return a.type==CKEDITOR.NODE_ELEMENT&&("br"==a.name||E.$block[a.name])}function t(a,b,d){var c=a.name;if(E.$empty[c]||!a.children.length)"hr"==c&&"br"==b?a.replaceWith(B()):(a.parent&&d.push({check:"it",el:a.parent}),a.remove());else if(E.$block[c]||"tr"==c)if("br"==b)a.previous&&!y(a.previous)&&(b=B(),b.insertBefore(a)),a.next&&!y(a.next)&&(b=B(),b.insertAfter(a)),a.replaceWithChildren();else{var c=a.children,g;b:{g=E[b];for(var f=0,h=c.length,e;f<h;++f)if(e=c[f],e.type==CKEDITOR.NODE_ELEMENT&&
+!g[e.name]){g=!1;break b}g=!0}if(g)a.name=b,a.attributes={},d.push({check:"parent-down",el:a});else{g=a.parent;for(var f=g.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||"body"==g.name,k,n,h=c.length;0<h;)e=c[--h],f&&(e.type==CKEDITOR.NODE_TEXT||e.type==CKEDITOR.NODE_ELEMENT&&E.$inline[e.name])?(k||(k=new CKEDITOR.htmlParser.element(b),k.insertAfter(a),d.push({check:"parent-down",el:k})),k.add(e,0)):(k=null,n=E[g.name]||E.span,e.insertAfter(a),g.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||e.type!=CKEDITOR.NODE_ELEMENT||
+n[e.name]||d.push({check:"el-up",el:e}));a.remove()}}else c in{style:1,script:1}?a.remove():(a.parent&&d.push({check:"it",el:a.parent}),a.replaceWithChildren())}function x(a,b,d){var c,g;for(c=0;c<d.length;++c)if(g=d[c],!(g.check&&!a.check(g.check,!1)||g.left&&!g.left(b))){g.right(b,O);break}}function F(a,b){var d=b.getDefinition(),c=d.attributes,g=d.styles,f,h,e,k;if(a.name!=d.element)return!1;for(f in c)if("class"==f)for(d=c[f].split(/\s+/),e=a.classes.join("|");k=d.pop();){if(-1==e.indexOf(k))return!1}else if(a.attributes[f]!=
+c[f])return!1;for(h in g)if(a.styles[h]!=g[h])return!1;return!0}function z(a,b){var d,c;"string"==typeof a?d=a:a instanceof CKEDITOR.style?c=a:(d=a[0],c=a[1]);return[{element:d,left:c,right:function(a,d){d.transform(a,b)}}]}function A(a){return function(b){return F(b,a)}}function C(a){return function(b,d){d[a](b)}}var E=CKEDITOR.dtd,D=CKEDITOR.tools.copy,I=CKEDITOR.tools.trim,H=["","p","br","div"];CKEDITOR.FILTER_SKIP_TREE=2;CKEDITOR.filter=function(a){this.allowedContent=[];this.disallowedContent=
+[];this.elementCallbacks=null;this.disabled=!1;this.editor=null;this.id=CKEDITOR.tools.getNextNumber();this._={allowedRules:{elements:{},generic:[]},disallowedRules:{elements:{},generic:[]},transformations:{},cachedTests:{}};CKEDITOR.filter.instances[this.id]=this;if(a instanceof CKEDITOR.editor){a=this.editor=a;this.customConfig=!0;var b=a.config.allowedContent;!0===b?this.disabled=!0:(b||(this.customConfig=!1),this.allow(b,"config",1),this.allow(a.config.extraAllowedContent,"extra",1),this.allow(H[a.enterMode]+
+" "+H[a.shiftEnterMode],"default",1),this.disallow(a.config.disallowedContent))}else this.customConfig=!1,this.allow(a,"default",1)};CKEDITOR.filter.instances={};CKEDITOR.filter.prototype={allow:function(b,d,c){if(!m(this,b,c))return!1;var f,h;if("string"==typeof b)b=g(b);else if(b instanceof CKEDITOR.style){if(b.toAllowedContentRules)return this.allow(b.toAllowedContentRules(this.editor),d,c);f=b.getDefinition();b={};c=f.attributes;b[f.element]=f={styles:f.styles,requiredStyles:f.styles&&CKEDITOR.tools.objectKeys(f.styles)};
+c&&(c=D(c),f.classes=c["class"]?c["class"].split(/\s+/):null,f.requiredClasses=f.classes,delete c["class"],f.attributes=c,f.requiredAttributes=c&&CKEDITOR.tools.objectKeys(c))}else if(CKEDITOR.tools.isArray(b)){for(f=0;f<b.length;++f)h=this.allow(b[f],d,c);return h}a(this,b,d,this.allowedContent,this._.allowedRules);return!0},applyTo:function(a,b,d,c){if(this.disabled)return!1;var g=this,f=[],h=this.editor&&this.editor.config.protectedSource,e,k=!1,n={doFilter:!d,doTransform:!0,doCallbacks:!0,toHtml:b};
+a.forEach(function(a){if(a.type==CKEDITOR.NODE_ELEMENT){if("off"==a.attributes["data-cke-filter"])return!1;if(!b||"span"!=a.name||!~CKEDITOR.tools.objectKeys(a.attributes).join("|").indexOf("data-cke-"))if(e=r(g,a,f,n),e&1)k=!0;else if(e&2)return!1}else if(a.type==CKEDITOR.NODE_COMMENT&&a.value.match(/^\{cke_protected\}(?!\{C\})/)){var d;a:{var c=decodeURIComponent(a.value.replace(/^\{cke_protected\}/,""));d=[];var t,l,p;if(h)for(l=0;l<h.length;++l)if((p=c.match(h[l]))&&p[0].length==c.length){d=!0;
+break a}c=CKEDITOR.htmlParser.fragment.fromHtml(c);1==c.children.length&&(t=c.children[0]).type==CKEDITOR.NODE_ELEMENT&&r(g,t,d,n);d=!d.length}d||f.push(a)}},null,!0);f.length&&(k=!0);var l;a=[];c=H[c||(this.editor?this.editor.enterMode:CKEDITOR.ENTER_P)];for(var p;d=f.pop();)d.type==CKEDITOR.NODE_ELEMENT?t(d,c,a):d.remove();for(;l=a.pop();)if(d=l.el,d.parent)switch(p=E[d.parent.name]||E.span,l.check){case "it":E.$removeEmpty[d.name]&&!d.children.length?t(d,c,a):q(d)||t(d,c,a);break;case "el-up":d.parent.type==
+CKEDITOR.NODE_DOCUMENT_FRAGMENT||p[d.name]||t(d,c,a);break;case "parent-down":d.parent.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||p[d.name]||t(d.parent,c,a)}return k},checkFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));return!a.requiredContent||this.check(a.requiredContent)},disable:function(){this.disabled=!0},disallow:function(b){if(!m(this,b,!0))return!1;"string"==typeof b&&(b=g(b));a(this,b,null,this.disallowedContent,this._.disallowedRules);return!0},
 addContentForms:function(a){if(!this.disabled&&a){var b,d,c=[],g;for(b=0;b<a.length&&!g;++b)d=a[b],("string"==typeof d||d instanceof CKEDITOR.style)&&this.check(d)&&(g=d);if(g){for(b=0;b<a.length;++b)c.push(z(a[b],g));this.addTransformations(c)}}},addElementCallback:function(a){this.elementCallbacks||(this.elementCallbacks=[]);this.elementCallbacks.push(a)},addFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));this.allow(a.allowedContent,a.name);this.addTransformations(a.contentTransformations);
-this.addContentForms(a.contentForms);return a.requiredContent&&(this.customConfig||this.disallowedContent.length)?this.check(a.requiredContent):!0},addTransformations:function(a){var b,d;if(!this.disabled&&a){var c=this._.transformations,g;for(g=0;g<a.length;++g){b=a[g];var e=void 0,h=void 0,f=void 0,k=void 0,n=void 0,r=void 0;d=[];for(h=0;h<b.length;++h)f=b[h],"string"==typeof f?(f=f.split(/\s*:\s*/),k=f[0],n=null,r=f[1]):(k=f.check,n=f.left,r=f.right),e||(e=f,e=e.element?e.element:k?k.match(/^([a-z0-9]+)/i)[0]:
-e.left.getDefinition().element),n instanceof CKEDITOR.style&&(n=y(n)),d.push({check:k==e?null:k,left:n,right:"string"==typeof r?D(r):r});b=e;c[b]||(c[b]=[]);c[b].push(d)}}},check:function(a,b,c){if(this.disabled)return!0;if(CKEDITOR.tools.isArray(a)){for(var e=a.length;e--;)if(this.check(a[e],b,c))return!0;return!1}var h,f;if("string"==typeof a){f=a+"\x3c"+(!1===b?"0":"1")+(c?"1":"0")+"\x3e";if(f in this._.cachedChecks)return this._.cachedChecks[f];e=g(a).$1;h=e.styles;var k=e.classes;e.name=e.elements;
-e.classes=k=k?k.split(/\s*,\s*/):[];e.styles=d(h);e.attributes=d(e.attributes);e.children=[];k.length&&(e.attributes["class"]=k.join(" "));h&&(e.attributes.style=CKEDITOR.tools.writeCssText(e.styles));h=e}else e=a.getDefinition(),h=e.styles,k=e.attributes||{},h&&!CKEDITOR.tools.isEmpty(h)?(h=E(h),k.style=CKEDITOR.tools.writeCssText(h,!0)):h={},h={name:e.element,attributes:k,classes:k["class"]?k["class"].split(/\s+/):[],styles:h,children:[]};var k=CKEDITOR.tools.clone(h),r=[],m;if(!1!==b&&(m=this._.transformations[h.name])){for(e=
-0;e<m.length;++e)w(this,h,m[e]);n(h)}u(this,k,r,{doFilter:!0,doTransform:!1!==b,skipRequired:!c,skipFinalValidation:!c});b=0<r.length?!1:CKEDITOR.tools.objectCompare(h.attributes,k.attributes,!0)?!0:!1;"string"==typeof a&&(this._.cachedChecks[f]=b);return b},getAllowedEnterMode:function(){var a=["p","div","br"],b={p:CKEDITOR.ENTER_P,div:CKEDITOR.ENTER_DIV,br:CKEDITOR.ENTER_BR};return function(d,c){var g=a.slice(),e;if(this.check(G[d]))return d;for(c||(g=g.reverse());e=g.pop();)if(this.check(e))return b[e];
-return CKEDITOR.ENTER_BR}}(),destroy:function(){delete CKEDITOR.filter.instances[this.id];delete this._;delete this.allowedContent;delete this.disallowedContent}};var N={styles:1,attributes:1,classes:1},O={styles:"requiredStyles",attributes:"requiredAttributes",classes:"requiredClasses"},I=/^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,R={styles:/{([^}]+)}/,attrs:/\[([^\]]+)\]/,classes:/\(([^\)]+)\)/},M=/^cke:(object|embed|param)$/,
-Q=/^(object|embed|param)$/,P;P=CKEDITOR.filter.transformationsTools={sizeToStyle:function(a){this.lengthToStyle(a,"width");this.lengthToStyle(a,"height")},sizeToAttribute:function(a){this.lengthToAttribute(a,"width");this.lengthToAttribute(a,"height")},lengthToStyle:function(a,b,d){d=d||b;if(!(d in a.styles)){var c=a.attributes[b];c&&(/^\d+$/.test(c)&&(c+="px"),a.styles[d]=c)}delete a.attributes[b]},lengthToAttribute:function(a,b,d){d=d||b;if(!(d in a.attributes)){var c=a.styles[b],g=c&&c.match(/^(\d+)(?:\.\d*)?px$/);
-g?a.attributes[d]=g[1]:"cke-test"==c&&(a.attributes[d]="cke-test")}delete a.styles[b]},alignmentToStyle:function(a){if(!("float"in a.styles)){var b=a.attributes.align;if("left"==b||"right"==b)a.styles["float"]=b}delete a.attributes.align},alignmentToAttribute:function(a){if(!("align"in a.attributes)){var b=a.styles["float"];if("left"==b||"right"==b)a.attributes.align=b}delete a.styles["float"]},matchesStyle:B,transform:function(a,b){if("string"==typeof b)a.name=b;else{var d=b.getDefinition(),c=d.styles,
-g=d.attributes,e,h,f,k;a.name=d.element;for(e in g)if("class"==e)for(d=a.classes.join("|"),f=g[e].split(/\s+/);k=f.pop();)-1==d.indexOf(k)&&a.classes.push(k);else a.attributes[e]=g[e];for(h in c)a.styles[h]=c[h]}}}}(),function(){CKEDITOR.focusManager=function(a){if(a.focusManager)return a.focusManager;this.hasFocus=!1;this.currentActive=null;this._={editor:a};return this};CKEDITOR.focusManager._={blurDelay:200};CKEDITOR.focusManager.prototype={focus:function(a){this._.timer&&clearTimeout(this._.timer);
-a&&(this.currentActive=a);this.hasFocus||this._.locked||((a=CKEDITOR.currentInstance)&&a.focusManager.blur(1),this.hasFocus=!0,(a=this._.editor.container)&&a.addClass("cke_focus"),this._.editor.fire("focus"))},lock:function(){this._.locked=1},unlock:function(){delete this._.locked},blur:function(a){function f(){if(this.hasFocus){this.hasFocus=!1;var a=this._.editor.container;a&&a.removeClass("cke_focus");this._.editor.fire("blur")}}if(!this._.locked){this._.timer&&clearTimeout(this._.timer);var c=
-CKEDITOR.focusManager._.blurDelay;a||!c?f.call(this):this._.timer=CKEDITOR.tools.setTimeout(function(){delete this._.timer;f.call(this)},c,this)}},add:function(a,f){var c=a.getCustomData("focusmanager");if(!c||c!=this){c&&c.remove(a);var c="focus",e="blur";f&&(CKEDITOR.env.ie?(c="focusin",e="focusout"):CKEDITOR.event.useCapture=1);var h={blur:function(){a.equals(this.currentActive)&&this.blur()},focus:function(){this.focus(a)}};a.on(c,h.focus,this);a.on(e,h.blur,this);f&&(CKEDITOR.event.useCapture=
-0);a.setCustomData("focusmanager",this);a.setCustomData("focusmanager_handlers",h)}},remove:function(a){a.removeCustomData("focusmanager");var f=a.removeCustomData("focusmanager_handlers");a.removeListener("blur",f.blur);a.removeListener("focus",f.focus)}}}(),CKEDITOR.keystrokeHandler=function(a){if(a.keystrokeHandler)return a.keystrokeHandler;this.keystrokes={};this.blockedKeystrokes={};this._={editor:a};return this},function(){var a,f=function(c){c=c.data;var h=c.getKeystroke(),f=this.keystrokes[h],
-l=this._.editor;a=!1===l.fire("key",{keyCode:h,domEvent:c});a||(f&&(a=!1!==l.execCommand(f,{from:"keystrokeHandler"})),a||(a=!!this.blockedKeystrokes[h]));a&&c.preventDefault(!0);return!a},c=function(c){a&&(a=!1,c.data.preventDefault(!0))};CKEDITOR.keystrokeHandler.prototype={attach:function(a){a.on("keydown",f,this);if(CKEDITOR.env.gecko&&CKEDITOR.env.mac)a.on("keypress",c,this)}}}(),function(){CKEDITOR.lang={languages:{af:1,ar:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,"en-au":1,"en-ca":1,
-"en-gb":1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,"fr-ca":1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,ms:1,nb:1,nl:1,no:1,pl:1,"pt-br":1,pt:1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,"sr-latn":1,sr:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,"zh-cn":1,zh:1},rtl:{ar:1,fa:1,he:1,ku:1,ug:1},load:function(a,f,c){a&&CKEDITOR.lang.languages[a]||(a=this.detect(f,a));var e=this;f=function(){e[a].dir=e.rtl[a]?"rtl":"ltr";c(a,e[a])};this[a]?f():CKEDITOR.scriptLoader.load(CKEDITOR.getUrl("lang/"+
-a+".js"),f,this)},detect:function(a,f){var c=this.languages;f=f||navigator.userLanguage||navigator.language||a;var e=f.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),h=e[1],e=e[2];c[h+"-"+e]?h=h+"-"+e:c[h]||(h=null);CKEDITOR.lang.detect=h?function(){return h}:function(a){return a};return h||a}}}(),CKEDITOR.scriptLoader=function(){var a={},f={};return{load:function(c,e,h,m){var l="string"==typeof c;l&&(c=[c]);h||(h=CKEDITOR);var k=c.length,b=[],d=[],g=function(a){e&&(l?e.call(h,a):e.call(h,b,d))};if(0===
-k)g(!0);else{var p=function(a,c){(c?b:d).push(a);0>=--k&&(m&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),g(c))},v=function(b,d){a[b]=1;var c=f[b];delete f[b];for(var g=0;g<c.length;g++)c[g](b,d)},u=function(b){if(a[b])p(b,!0);else{var d=f[b]||(f[b]=[]);d.push(p);if(!(1<d.length)){var c=new CKEDITOR.dom.element("script");c.setAttributes({type:"text/javascript",src:b});e&&(CKEDITOR.env.ie&&(8>=CKEDITOR.env.version||CKEDITOR.env.ie9Compat)?c.$.onreadystatechange=function(){if("loaded"==
-c.$.readyState||"complete"==c.$.readyState)c.$.onreadystatechange=null,v(b,!0)}:(c.$.onload=function(){setTimeout(function(){v(b,!0)},0)},c.$.onerror=function(){v(b,!1)}));c.appendTo(CKEDITOR.document.getHead())}}};m&&CKEDITOR.document.getDocumentElement().setStyle("cursor","wait");for(var t=0;t<k;t++)u(c[t])}},queue:function(){function a(){var c;(c=e[0])&&this.load(c.scriptUrl,c.callback,CKEDITOR,0)}var e=[];return function(h,f){var l=this;e.push({scriptUrl:h,callback:function(){f&&f.apply(this,
-arguments);e.shift();a.call(l)}});1==e.length&&a.call(this)}}()}}(),CKEDITOR.resourceManager=function(a,f){this.basePath=a;this.fileName=f;this.registered={};this.loaded={};this.externals={};this._={waitingList:{}}},CKEDITOR.resourceManager.prototype={add:function(a,f){if(this.registered[a])throw Error('[CKEDITOR.resourceManager.add] The resource name "'+a+'" is already registered.');var c=this.registered[a]=f||{};c.name=a;c.path=this.getPath(a);CKEDITOR.fire(a+CKEDITOR.tools.capitalize(this.fileName)+
-"Ready",c);return this.get(a)},get:function(a){return this.registered[a]||null},getPath:function(a){var f=this.externals[a];return CKEDITOR.getUrl(f&&f.dir||this.basePath+a+"/")},getFilePath:function(a){var f=this.externals[a];return CKEDITOR.getUrl(this.getPath(a)+(f?f.file:this.fileName+".js"))},addExternal:function(a,f,c){a=a.split(",");for(var e=0;e<a.length;e++){var h=a[e];c||(f=f.replace(/[^\/]+$/,function(a){c=a;return""}));this.externals[h]={dir:f,file:c||this.fileName+".js"}}},load:function(a,
-f,c){CKEDITOR.tools.isArray(a)||(a=a?[a]:[]);for(var e=this.loaded,h=this.registered,m=[],l={},k={},b=0;b<a.length;b++){var d=a[b];if(d)if(e[d]||h[d])k[d]=this.get(d);else{var g=this.getFilePath(d);m.push(g);g in l||(l[g]=[]);l[g].push(d)}}CKEDITOR.scriptLoader.load(m,function(a,b){if(b.length)throw Error('[CKEDITOR.resourceManager.load] Resource name "'+l[b[0]].join(",")+'" was not found at "'+b[0]+'".');for(var d=0;d<a.length;d++)for(var g=l[a[d]],h=0;h<g.length;h++){var m=g[h];k[m]=this.get(m);
-e[m]=1}f.call(c,k)},this)}},CKEDITOR.plugins=new CKEDITOR.resourceManager("plugins/","plugin"),CKEDITOR.plugins.load=CKEDITOR.tools.override(CKEDITOR.plugins.load,function(a){var f={};return function(c,e,h){var m={},l=function(c){a.call(this,c,function(a){CKEDITOR.tools.extend(m,a);var d=[],c;for(c in a){var k=a[c],v=k&&k.requires;if(!f[c]){if(k.icons)for(var u=k.icons.split(","),t=u.length;t--;)CKEDITOR.skin.addIcon(u[t],k.path+"icons/"+(CKEDITOR.env.hidpi&&k.hidpi?"hidpi/":"")+u[t]+".png");f[c]=
-1}if(v)for(v.split&&(v=v.split(",")),k=0;k<v.length;k++)m[v[k]]||d.push(v[k])}if(d.length)l.call(this,d);else{for(c in m)k=m[c],k.onLoad&&!k.onLoad._called&&(!1===k.onLoad()&&delete m[c],k.onLoad._called=1);e&&e.call(h||window,m)}},this)};l.call(this,c)}}),CKEDITOR.plugins.setLang=function(a,f,c){var e=this.get(a);a=e.langEntries||(e.langEntries={});e=e.lang||(e.lang=[]);e.split&&(e=e.split(","));-1==CKEDITOR.tools.indexOf(e,f)&&e.push(f);a[f]=c},CKEDITOR.ui=function(a){if(a.ui)return a.ui;this.items=
-{};this.instances={};this.editor=a;this._={handlers:{}};return this},CKEDITOR.ui.prototype={add:function(a,f,c){c.name=a.toLowerCase();var e=this.items[a]={type:f,command:c.command||null,args:Array.prototype.slice.call(arguments,2)};CKEDITOR.tools.extend(e,c)},get:function(a){return this.instances[a]},create:function(a){var f=this.items[a],c=f&&this._.handlers[f.type],e=f&&f.command&&this.editor.getCommand(f.command),c=c&&c.create.apply(this,f.args);this.instances[a]=c;e&&e.uiItems.push(c);c&&!c.type&&
-(c.type=f.type);return c},addHandler:function(a,f){this._.handlers[a]=f},space:function(a){return CKEDITOR.document.getById(this.spaceId(a))},spaceId:function(a){return this.editor.id+"_"+a}},CKEDITOR.event.implementOn(CKEDITOR.ui),function(){function a(a,b,d){CKEDITOR.event.call(this);a=a&&CKEDITOR.tools.clone(a);if(void 0!==b){if(!(b instanceof CKEDITOR.dom.element))throw Error("Expect element of type CKEDITOR.dom.element.");if(!d)throw Error("One of the element modes must be specified.");if(CKEDITOR.env.ie&&
-CKEDITOR.env.quirks&&d==CKEDITOR.ELEMENT_MODE_INLINE)throw Error("Inline element mode is not supported on IE quirks.");if(!c(b,d))throw Error('The specified element mode is not supported on element: "'+b.getName()+'".');this.element=b;this.elementMode=d;this.name=this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO&&(b.getId()||b.getNameAtt())}else this.elementMode=CKEDITOR.ELEMENT_MODE_NONE;this._={};this.commands={};this.templates={};this.name=this.name||f();this.id=CKEDITOR.tools.getNextId();this.status=
-"unloaded";this.config=CKEDITOR.tools.prototypedCopy(CKEDITOR.config);this.ui=new CKEDITOR.ui(this);this.focusManager=new CKEDITOR.focusManager(this);this.keystrokeHandler=new CKEDITOR.keystrokeHandler(this);this.on("readOnly",e);this.on("selectionChange",function(a){m(this,a.data.path)});this.on("activeFilterChange",function(){m(this,this.elementPath(),!0)});this.on("mode",e);this.on("instanceReady",function(){this.config.startupFocus&&this.focus()});CKEDITOR.fire("instanceCreated",null,this);CKEDITOR.add(this);
-CKEDITOR.tools.setTimeout(function(){"destroyed"!==this.status?k(this,a):CKEDITOR.warn("editor-incorrect-destroy")},0,this)}function f(){do var a="editor"+ ++u;while(CKEDITOR.instances[a]);return a}function c(a,b){return b==CKEDITOR.ELEMENT_MODE_INLINE?a.is(CKEDITOR.dtd.$editable)||a.is("textarea"):b==CKEDITOR.ELEMENT_MODE_REPLACE?!a.is(CKEDITOR.dtd.$nonBodyContent):1}function e(){var a=this.commands,b;for(b in a)h(this,a[b])}function h(a,b){b[b.startDisabled?"disable":a.readOnly&&!b.readOnly?"disable":
-b.modes[a.mode]?"enable":"disable"]()}function m(a,b,d){if(b){var c,g,e=a.commands;for(g in e)c=e[g],(d||c.contextSensitive)&&c.refresh(a,b)}}function l(a){var b=a.config.customConfig;if(!b)return!1;var b=CKEDITOR.getUrl(b),d=t[b]||(t[b]={});d.fn?(d.fn.call(a,a.config),CKEDITOR.getUrl(a.config.customConfig)!=b&&l(a)||a.fireOnce("customConfigLoaded")):CKEDITOR.scriptLoader.queue(b,function(){d.fn=CKEDITOR.editorConfig?CKEDITOR.editorConfig:function(){};l(a)});return!0}function k(a,d){a.on("customConfigLoaded",
-function(){if(d){if(d.on)for(var c in d.on)a.on(c,d.on[c]);CKEDITOR.tools.extend(a.config,d,!0);delete a.config.on}c=a.config;a.readOnly=c.readOnly?!0:a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.is("textarea")?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):a.element.isReadOnly():a.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):!1;a.blockless=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?!(a.element.is("textarea")||
-CKEDITOR.dtd[a.element.getName()].p):!1;a.tabIndex=c.tabIndex||a.element&&a.element.getAttribute("tabindex")||0;a.activeEnterMode=a.enterMode=a.blockless?CKEDITOR.ENTER_BR:c.enterMode;a.activeShiftEnterMode=a.shiftEnterMode=a.blockless?CKEDITOR.ENTER_BR:c.shiftEnterMode;c.skin&&(CKEDITOR.skinName=c.skin);a.fireOnce("configLoaded");a.dataProcessor=new CKEDITOR.htmlDataProcessor(a);a.filter=a.activeFilter=new CKEDITOR.filter(a);b(a)});d&&null!=d.customConfig&&(a.config.customConfig=d.customConfig);
-l(a)||a.fireOnce("customConfigLoaded")}function b(a){CKEDITOR.skin.loadPart("editor",function(){d(a)})}function d(a){CKEDITOR.lang.load(a.config.language,a.config.defaultLanguage,function(b,d){var c=a.config.title;a.langCode=b;a.lang=CKEDITOR.tools.prototypedCopy(d);a.title="string"==typeof c||!1===c?c:[a.lang.editor,a.name].join(", ");a.config.contentsLangDirection||(a.config.contentsLangDirection=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.getDirection(1):a.lang.dir);a.fire("langLoaded");
-g(a)})}function g(a){a.getStylesSet(function(b){a.once("loaded",function(){a.fire("stylesSet",{styles:b})},null,null,1);p(a)})}function p(a){var b=a.config,d=b.plugins,c=b.extraPlugins,g=b.removePlugins;if(c)var e=new RegExp("(?:^|,)(?:"+c.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),d=d.replace(e,""),d=d+(","+c);if(g)var h=new RegExp("(?:^|,)(?:"+g.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),d=d.replace(h,"");CKEDITOR.env.air&&(d+=",adobeair");CKEDITOR.plugins.load(d.split(","),function(d){var c=[],
-g=[],e=[];a.plugins=d;for(var f in d){var k=d[f],r=k.lang,m=null,p=k.requires,l;CKEDITOR.tools.isArray(p)&&(p=p.join(","));if(p&&(l=p.match(h)))for(;p=l.pop();)CKEDITOR.error("editor-plugin-required",{plugin:p.replace(",",""),requiredBy:f});r&&!a.lang[f]&&(r.split&&(r=r.split(",")),0<=CKEDITOR.tools.indexOf(r,a.langCode)?m=a.langCode:(m=a.langCode.replace(/-.*/,""),m=m!=a.langCode&&0<=CKEDITOR.tools.indexOf(r,m)?m:0<=CKEDITOR.tools.indexOf(r,"en")?"en":r[0]),k.langEntries&&k.langEntries[m]?(a.lang[f]=
-k.langEntries[m],m=null):e.push(CKEDITOR.getUrl(k.path+"lang/"+m+".js")));g.push(m);c.push(k)}CKEDITOR.scriptLoader.load(e,function(){for(var d=["beforeInit","init","afterInit"],e=0;e<d.length;e++)for(var h=0;h<c.length;h++){var f=c[h];0===e&&g[h]&&f.lang&&f.langEntries&&(a.lang[f.name]=f.langEntries[g[h]]);if(f[d[e]])f[d[e]](a)}a.fireOnce("pluginsLoaded");b.keystrokes&&a.setKeystroke(a.config.keystrokes);for(h=0;h<a.config.blockedKeystrokes.length;h++)a.keystrokeHandler.blockedKeystrokes[a.config.blockedKeystrokes[h]]=
-1;a.status="loaded";a.fireOnce("loaded");CKEDITOR.fire("instanceLoaded",null,a)})})}function v(){var a=this.element;if(a&&this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO){var b=this.getData();this.config.htmlEncodeOutput&&(b=CKEDITOR.tools.htmlEncode(b));a.is("textarea")?a.setValue(b):a.setHtml(b);return!0}return!1}a.prototype=CKEDITOR.editor.prototype;CKEDITOR.editor=a;var u=0,t={};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{addCommand:function(a,b){b.name=a.toLowerCase();var d=new CKEDITOR.command(this,
+this.addContentForms(a.contentForms);return a.requiredContent&&(this.customConfig||this.disallowedContent.length)?this.check(a.requiredContent):!0},addTransformations:function(a){var b,d;if(!this.disabled&&a){var c=this._.transformations,g;for(g=0;g<a.length;++g){b=a[g];var f=void 0,h=void 0,e=void 0,k=void 0,n=void 0,t=void 0;d=[];for(h=0;h<b.length;++h)e=b[h],"string"==typeof e?(e=e.split(/\s*:\s*/),k=e[0],n=null,t=e[1]):(k=e.check,n=e.left,t=e.right),f||(f=e,f=f.element?f.element:k?k.match(/^([a-z0-9]+)/i)[0]:
+f.left.getDefinition().element),n instanceof CKEDITOR.style&&(n=A(n)),d.push({check:k==f?null:k,left:n,right:"string"==typeof t?C(t):t});b=f;c[b]||(c[b]=[]);c[b].push(d)}}},check:function(a,d,c){if(this.disabled)return!0;if(CKEDITOR.tools.isArray(a)){for(var f=a.length;f--;)if(this.check(a[f],d,c))return!0;return!1}var h,e;if("string"==typeof a){e=a+"\x3c"+(!1===d?"0":"1")+(c?"1":"0")+"\x3e";if(e in this._.cachedChecks)return this._.cachedChecks[e];f=g(a).$1;h=f.styles;var k=f.classes;f.name=f.elements;
+f.classes=k=k?k.split(/\s*,\s*/):[];f.styles=b(h);f.attributes=b(f.attributes);f.children=[];k.length&&(f.attributes["class"]=k.join(" "));h&&(f.attributes.style=CKEDITOR.tools.writeCssText(f.styles));h=f}else f=a.getDefinition(),h=f.styles,k=f.attributes||{},h&&!CKEDITOR.tools.isEmpty(h)?(h=D(h),k.style=CKEDITOR.tools.writeCssText(h,!0)):h={},h={name:f.element,attributes:k,classes:k["class"]?k["class"].split(/\s+/):[],styles:h,children:[]};var k=CKEDITOR.tools.clone(h),t=[],l;if(!1!==d&&(l=this._.transformations[h.name])){for(f=
+0;f<l.length;++f)x(this,h,l[f]);n(h)}r(this,k,t,{doFilter:!0,doTransform:!1!==d,skipRequired:!c,skipFinalValidation:!c});d=0<t.length?!1:CKEDITOR.tools.objectCompare(h.attributes,k.attributes,!0)?!0:!1;"string"==typeof a&&(this._.cachedChecks[e]=d);return d},getAllowedEnterMode:function(){var a=["p","div","br"],b={p:CKEDITOR.ENTER_P,div:CKEDITOR.ENTER_DIV,br:CKEDITOR.ENTER_BR};return function(d,c){var g=a.slice(),f;if(this.check(H[d]))return d;for(c||(g=g.reverse());f=g.pop();)if(this.check(f))return b[f];
+return CKEDITOR.ENTER_BR}}(),destroy:function(){delete CKEDITOR.filter.instances[this.id];delete this._;delete this.allowedContent;delete this.disallowedContent}};var M={styles:1,attributes:1,classes:1},P={styles:"requiredStyles",attributes:"requiredAttributes",classes:"requiredClasses"},G=/^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,S={styles:/{([^}]+)}/,attrs:/\[([^\]]+)\]/,classes:/\(([^\)]+)\)/},L=/^cke:(object|embed|param)$/,
+R=/^(object|embed|param)$/,O;O=CKEDITOR.filter.transformationsTools={sizeToStyle:function(a){this.lengthToStyle(a,"width");this.lengthToStyle(a,"height")},sizeToAttribute:function(a){this.lengthToAttribute(a,"width");this.lengthToAttribute(a,"height")},lengthToStyle:function(a,b,d){d=d||b;if(!(d in a.styles)){var c=a.attributes[b];c&&(/^\d+$/.test(c)&&(c+="px"),a.styles[d]=c)}delete a.attributes[b]},lengthToAttribute:function(a,b,d){d=d||b;if(!(d in a.attributes)){var c=a.styles[b],g=c&&c.match(/^(\d+)(?:\.\d*)?px$/);
+g?a.attributes[d]=g[1]:"cke-test"==c&&(a.attributes[d]="cke-test")}delete a.styles[b]},alignmentToStyle:function(a){if(!("float"in a.styles)){var b=a.attributes.align;if("left"==b||"right"==b)a.styles["float"]=b}delete a.attributes.align},alignmentToAttribute:function(a){if(!("align"in a.attributes)){var b=a.styles["float"];if("left"==b||"right"==b)a.attributes.align=b}delete a.styles["float"]},splitBorderShorthand:function(a){function b(c){a.styles["border-top-width"]=d[c[0]];a.styles["border-right-width"]=
+d[c[1]];a.styles["border-bottom-width"]=d[c[2]];a.styles["border-left-width"]=d[c[3]]}if(a.styles.border){var d=a.styles.border.match(/([\.\d]+\w+)/g)||["0px"];switch(d.length){case 1:a.styles["border-width"]=d[0];break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}a.styles["border-style"]=a.styles["border-style"]||(a.styles.border.match(/(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset|initial|inherit)/)||[])[0];a.styles["border-style"]||delete a.styles["border-style"];
+delete a.styles.border}},listTypeToStyle:function(a){if(a.attributes.type)switch(a.attributes.type){case "a":a.styles["list-style-type"]="lower-alpha";break;case "A":a.styles["list-style-type"]="upper-alpha";break;case "i":a.styles["list-style-type"]="lower-roman";break;case "I":a.styles["list-style-type"]="upper-roman";break;case "1":a.styles["list-style-type"]="decimal";break;default:a.styles["list-style-type"]=a.attributes.type}},splitMarginShorthand:function(a){function b(c){a.styles["margin-top"]=
+d[c[0]];a.styles["margin-right"]=d[c[1]];a.styles["margin-bottom"]=d[c[2]];a.styles["margin-left"]=d[c[3]]}if(a.styles.margin){var d=a.styles.margin.match(/(\-?[\.\d]+\w+)/g)||["0px"];switch(d.length){case 1:a.styles.margin=d[0];break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}delete a.styles.margin}},matchesStyle:F,transform:function(a,b){if("string"==typeof b)a.name=b;else{var d=b.getDefinition(),c=d.styles,g=d.attributes,f,h,e,k;a.name=d.element;for(f in g)if("class"==
+f)for(d=a.classes.join("|"),e=g[f].split(/\s+/);k=e.pop();)-1==d.indexOf(k)&&a.classes.push(k);else a.attributes[f]=g[f];for(h in c)a.styles[h]=c[h]}}}}(),function(){CKEDITOR.focusManager=function(a){if(a.focusManager)return a.focusManager;this.hasFocus=!1;this.currentActive=null;this._={editor:a};return this};CKEDITOR.focusManager._={blurDelay:200};CKEDITOR.focusManager.prototype={focus:function(a){this._.timer&&clearTimeout(this._.timer);a&&(this.currentActive=a);this.hasFocus||this._.locked||((a=
+CKEDITOR.currentInstance)&&a.focusManager.blur(1),this.hasFocus=!0,(a=this._.editor.container)&&a.addClass("cke_focus"),this._.editor.fire("focus"))},lock:function(){this._.locked=1},unlock:function(){delete this._.locked},blur:function(a){function e(){var a=this._.editor;this.hasFocus&&(this.hasFocus=!1,CKEDITOR.env.chrome&&a.editable().isInline()&&a.window.$.getSelection().removeAllRanges(),(a=this._.editor.container)&&a.removeClass("cke_focus"),this._.editor.fire("blur"))}if(!this._.locked){this._.timer&&
+clearTimeout(this._.timer);var c=CKEDITOR.focusManager._.blurDelay;a||!c?e.call(this):this._.timer=CKEDITOR.tools.setTimeout(function(){delete this._.timer;e.call(this)},c,this)}},add:function(a,e){var c=a.getCustomData("focusmanager");if(!c||c!=this){c&&c.remove(a);var c="focus",f="blur";e&&(CKEDITOR.env.ie?(c="focusin",f="focusout"):CKEDITOR.event.useCapture=1);var h={blur:function(){a.equals(this.currentActive)&&this.blur()},focus:function(){this.focus(a)}};a.on(c,h.focus,this);a.on(f,h.blur,this);
+e&&(CKEDITOR.event.useCapture=0);a.setCustomData("focusmanager",this);a.setCustomData("focusmanager_handlers",h)}},remove:function(a){a.removeCustomData("focusmanager");var e=a.removeCustomData("focusmanager_handlers");a.removeListener("blur",e.blur);a.removeListener("focus",e.focus)}}}(),CKEDITOR.keystrokeHandler=function(a){if(a.keystrokeHandler)return a.keystrokeHandler;this.keystrokes={};this.blockedKeystrokes={};this._={editor:a};return this},function(){var a,e=function(c){c=c.data;var h=c.getKeystroke(),
+e=this.keystrokes[h],l=this._.editor;a=!1===l.fire("key",{keyCode:h,domEvent:c});a||(e&&(a=!1!==l.execCommand(e,{from:"keystrokeHandler"})),a||(a=!!this.blockedKeystrokes[h]));a&&c.preventDefault(!0);return!a},c=function(c){a&&(a=!1,c.data.preventDefault(!0))};CKEDITOR.keystrokeHandler.prototype={attach:function(a){a.on("keydown",e,this);if(CKEDITOR.env.gecko&&CKEDITOR.env.mac)a.on("keypress",c,this)}}}(),function(){CKEDITOR.lang={languages:{af:1,ar:1,az:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,
+"de-ch":1,el:1,"en-au":1,"en-ca":1,"en-gb":1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,"fr-ca":1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,ms:1,nb:1,nl:1,no:1,oc:1,pl:1,"pt-br":1,pt:1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,"sr-latn":1,sr:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,"zh-cn":1,zh:1},rtl:{ar:1,fa:1,he:1,ku:1,ug:1},load:function(a,e,c){a&&CKEDITOR.lang.languages[a]||(a=this.detect(e,a));var f=this;e=function(){f[a].dir=f.rtl[a]?"rtl":"ltr";c(a,f[a])};
+this[a]?e():CKEDITOR.scriptLoader.load(CKEDITOR.getUrl("lang/"+a+".js"),e,this)},detect:function(a,e){var c=this.languages;e=e||navigator.userLanguage||navigator.language||a;var f=e.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),h=f[1],f=f[2];c[h+"-"+f]?h=h+"-"+f:c[h]||(h=null);CKEDITOR.lang.detect=h?function(){return h}:function(a){return a};return h||a}}}(),CKEDITOR.scriptLoader=function(){var a={},e={};return{load:function(c,f,h,m){var l="string"==typeof c;l&&(c=[c]);h||(h=CKEDITOR);var k=c.length,
+d=[],b=[],g=function(a){f&&(l?f.call(h,a):f.call(h,d,b))};if(0===k)g(!0);else{var p=function(a,c){(c?d:b).push(a);0>=--k&&(m&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),g(c))},v=function(b,d){a[b]=1;var c=e[b];delete e[b];for(var g=0;g<c.length;g++)c[g](b,d)},r=function(b){if(a[b])p(b,!0);else{var d=e[b]||(e[b]=[]);d.push(p);if(!(1<d.length)){var c=new CKEDITOR.dom.element("script");c.setAttributes({type:"text/javascript",src:b});f&&(CKEDITOR.env.ie&&(8>=CKEDITOR.env.version||CKEDITOR.env.ie9Compat)?
+c.$.onreadystatechange=function(){if("loaded"==c.$.readyState||"complete"==c.$.readyState)c.$.onreadystatechange=null,v(b,!0)}:(c.$.onload=function(){setTimeout(function(){v(b,!0)},0)},c.$.onerror=function(){v(b,!1)}));c.appendTo(CKEDITOR.document.getHead())}}};m&&CKEDITOR.document.getDocumentElement().setStyle("cursor","wait");for(var w=0;w<k;w++)r(c[w])}},queue:function(){function a(){var c;(c=f[0])&&this.load(c.scriptUrl,c.callback,CKEDITOR,0)}var f=[];return function(h,e){var l=this;f.push({scriptUrl:h,
+callback:function(){e&&e.apply(this,arguments);f.shift();a.call(l)}});1==f.length&&a.call(this)}}()}}(),CKEDITOR.resourceManager=function(a,e){this.basePath=a;this.fileName=e;this.registered={};this.loaded={};this.externals={};this._={waitingList:{}}},CKEDITOR.resourceManager.prototype={add:function(a,e){if(this.registered[a])throw Error('[CKEDITOR.resourceManager.add] The resource name "'+a+'" is already registered.');var c=this.registered[a]=e||{};c.name=a;c.path=this.getPath(a);CKEDITOR.fire(a+
+CKEDITOR.tools.capitalize(this.fileName)+"Ready",c);return this.get(a)},get:function(a){return this.registered[a]||null},getPath:function(a){var e=this.externals[a];return CKEDITOR.getUrl(e&&e.dir||this.basePath+a+"/")},getFilePath:function(a){var e=this.externals[a];return CKEDITOR.getUrl(this.getPath(a)+(e?e.file:this.fileName+".js"))},addExternal:function(a,e,c){a=a.split(",");for(var f=0;f<a.length;f++){var h=a[f];c||(e=e.replace(/[^\/]+$/,function(a){c=a;return""}));this.externals[h]={dir:e,
+file:c||this.fileName+".js"}}},load:function(a,e,c){CKEDITOR.tools.isArray(a)||(a=a?[a]:[]);for(var f=this.loaded,h=this.registered,m=[],l={},k={},d=0;d<a.length;d++){var b=a[d];if(b)if(f[b]||h[b])k[b]=this.get(b);else{var g=this.getFilePath(b);m.push(g);g in l||(l[g]=[]);l[g].push(b)}}CKEDITOR.scriptLoader.load(m,function(a,b){if(b.length)throw Error('[CKEDITOR.resourceManager.load] Resource name "'+l[b[0]].join(",")+'" was not found at "'+b[0]+'".');for(var d=0;d<a.length;d++)for(var g=l[a[d]],
+h=0;h<g.length;h++){var m=g[h];k[m]=this.get(m);f[m]=1}e.call(c,k)},this)}},CKEDITOR.plugins=new CKEDITOR.resourceManager("plugins/","plugin"),CKEDITOR.plugins.load=CKEDITOR.tools.override(CKEDITOR.plugins.load,function(a){var e={};return function(c,f,h){var m={},l=function(c){a.call(this,c,function(a){CKEDITOR.tools.extend(m,a);var b=[],c;for(c in a){var k=a[c],v=k&&k.requires;if(!e[c]){if(k.icons)for(var r=k.icons.split(","),w=r.length;w--;)CKEDITOR.skin.addIcon(r[w],k.path+"icons/"+(CKEDITOR.env.hidpi&&
+k.hidpi?"hidpi/":"")+r[w]+".png");e[c]=1}if(v)for(v.split&&(v=v.split(",")),k=0;k<v.length;k++)m[v[k]]||b.push(v[k])}if(b.length)l.call(this,b);else{for(c in m)k=m[c],k.onLoad&&!k.onLoad._called&&(!1===k.onLoad()&&delete m[c],k.onLoad._called=1);f&&f.call(h||window,m)}},this)};l.call(this,c)}}),CKEDITOR.plugins.setLang=function(a,e,c){var f=this.get(a);a=f.langEntries||(f.langEntries={});f=f.lang||(f.lang=[]);f.split&&(f=f.split(","));-1==CKEDITOR.tools.indexOf(f,e)&&f.push(e);a[e]=c},CKEDITOR.ui=
+function(a){if(a.ui)return a.ui;this.items={};this.instances={};this.editor=a;this._={handlers:{}};return this},CKEDITOR.ui.prototype={add:function(a,e,c){c.name=a.toLowerCase();var f=this.items[a]={type:e,command:c.command||null,args:Array.prototype.slice.call(arguments,2)};CKEDITOR.tools.extend(f,c)},get:function(a){return this.instances[a]},create:function(a){var e=this.items[a],c=e&&this._.handlers[e.type],f=e&&e.command&&this.editor.getCommand(e.command),c=c&&c.create.apply(this,e.args);this.instances[a]=
+c;f&&f.uiItems.push(c);c&&!c.type&&(c.type=e.type);return c},addHandler:function(a,e){this._.handlers[a]=e},space:function(a){return CKEDITOR.document.getById(this.spaceId(a))},spaceId:function(a){return this.editor.id+"_"+a}},CKEDITOR.event.implementOn(CKEDITOR.ui),function(){function a(a,b,d){CKEDITOR.event.call(this);a=a&&CKEDITOR.tools.clone(a);if(void 0!==b){if(!(b instanceof CKEDITOR.dom.element))throw Error("Expect element of type CKEDITOR.dom.element.");if(!d)throw Error("One of the element modes must be specified.");
+if(CKEDITOR.env.ie&&CKEDITOR.env.quirks&&d==CKEDITOR.ELEMENT_MODE_INLINE)throw Error("Inline element mode is not supported on IE quirks.");if(!c(b,d))throw Error('The specified element mode is not supported on element: "'+b.getName()+'".');this.element=b;this.elementMode=d;this.name=this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO&&(b.getId()||b.getNameAtt())}else this.elementMode=CKEDITOR.ELEMENT_MODE_NONE;this._={};this.commands={};this.templates={};this.name=this.name||e();this.id=CKEDITOR.tools.getNextId();
+this.status="unloaded";this.config=CKEDITOR.tools.prototypedCopy(CKEDITOR.config);this.ui=new CKEDITOR.ui(this);this.focusManager=new CKEDITOR.focusManager(this);this.keystrokeHandler=new CKEDITOR.keystrokeHandler(this);this.on("readOnly",f);this.on("selectionChange",function(a){m(this,a.data.path)});this.on("activeFilterChange",function(){m(this,this.elementPath(),!0)});this.on("mode",f);this.on("instanceReady",function(){this.config.startupFocus&&this.focus()});CKEDITOR.fire("instanceCreated",null,
+this);CKEDITOR.add(this);CKEDITOR.tools.setTimeout(function(){"destroyed"!==this.status?k(this,a):CKEDITOR.warn("editor-incorrect-destroy")},0,this)}function e(){do var a="editor"+ ++r;while(CKEDITOR.instances[a]);return a}function c(a,b){return b==CKEDITOR.ELEMENT_MODE_INLINE?a.is(CKEDITOR.dtd.$editable)||a.is("textarea"):b==CKEDITOR.ELEMENT_MODE_REPLACE?!a.is(CKEDITOR.dtd.$nonBodyContent):1}function f(){var a=this.commands,b;for(b in a)h(this,a[b])}function h(a,b){b[b.startDisabled?"disable":a.readOnly&&
+!b.readOnly?"disable":b.modes[a.mode]?"enable":"disable"]()}function m(a,b,d){if(b){var c,g,f=a.commands;for(g in f)c=f[g],(d||c.contextSensitive)&&c.refresh(a,b)}}function l(a){var b=a.config.customConfig;if(!b)return!1;var b=CKEDITOR.getUrl(b),d=w[b]||(w[b]={});d.fn?(d.fn.call(a,a.config),CKEDITOR.getUrl(a.config.customConfig)!=b&&l(a)||a.fireOnce("customConfigLoaded")):CKEDITOR.scriptLoader.queue(b,function(){d.fn=CKEDITOR.editorConfig?CKEDITOR.editorConfig:function(){};l(a)});return!0}function k(a,
+b){a.on("customConfigLoaded",function(){if(b){if(b.on)for(var c in b.on)a.on(c,b.on[c]);CKEDITOR.tools.extend(a.config,b,!0);delete a.config.on}c=a.config;a.readOnly=c.readOnly?!0:a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.is("textarea")?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):a.element.isReadOnly():a.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):!1;a.blockless=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?
+!(a.element.is("textarea")||CKEDITOR.dtd[a.element.getName()].p):!1;a.tabIndex=c.tabIndex||a.element&&a.element.getAttribute("tabindex")||0;a.activeEnterMode=a.enterMode=a.blockless?CKEDITOR.ENTER_BR:c.enterMode;a.activeShiftEnterMode=a.shiftEnterMode=a.blockless?CKEDITOR.ENTER_BR:c.shiftEnterMode;c.skin&&(CKEDITOR.skinName=c.skin);a.fireOnce("configLoaded");a.dataProcessor=new CKEDITOR.htmlDataProcessor(a);a.filter=a.activeFilter=new CKEDITOR.filter(a);d(a)});b&&null!=b.customConfig&&(a.config.customConfig=
+b.customConfig);l(a)||a.fireOnce("customConfigLoaded")}function d(a){CKEDITOR.skin.loadPart("editor",function(){b(a)})}function b(a){CKEDITOR.lang.load(a.config.language,a.config.defaultLanguage,function(b,d){var c=a.config.title;a.langCode=b;a.lang=CKEDITOR.tools.prototypedCopy(d);a.title="string"==typeof c||!1===c?c:[a.lang.editor,a.name].join(", ");a.config.contentsLangDirection||(a.config.contentsLangDirection=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.getDirection(1):a.lang.dir);a.fire("langLoaded");
+g(a)})}function g(a){a.getStylesSet(function(b){a.once("loaded",function(){a.fire("stylesSet",{styles:b})},null,null,1);p(a)})}function p(a){var b=a.config,d=b.plugins,c=b.extraPlugins,g=b.removePlugins;if(c)var f=new RegExp("(?:^|,)(?:"+c.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),d=d.replace(f,""),d=d+(","+c);if(g)var h=new RegExp("(?:^|,)(?:"+g.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),d=d.replace(h,"");CKEDITOR.env.air&&(d+=",adobeair");CKEDITOR.plugins.load(d.split(","),function(d){var c=[],
+g=[],f=[];a.plugins=d;for(var e in d){var k=d[e],t=k.lang,l=null,m=k.requires,p;CKEDITOR.tools.isArray(m)&&(m=m.join(","));if(m&&(p=m.match(h)))for(;m=p.pop();)CKEDITOR.error("editor-plugin-required",{plugin:m.replace(",",""),requiredBy:e});t&&!a.lang[e]&&(t.split&&(t=t.split(",")),0<=CKEDITOR.tools.indexOf(t,a.langCode)?l=a.langCode:(l=a.langCode.replace(/-.*/,""),l=l!=a.langCode&&0<=CKEDITOR.tools.indexOf(t,l)?l:0<=CKEDITOR.tools.indexOf(t,"en")?"en":t[0]),k.langEntries&&k.langEntries[l]?(a.lang[e]=
+k.langEntries[l],l=null):f.push(CKEDITOR.getUrl(k.path+"lang/"+l+".js")));g.push(l);c.push(k)}CKEDITOR.scriptLoader.load(f,function(){for(var d=["beforeInit","init","afterInit"],f=0;f<d.length;f++)for(var h=0;h<c.length;h++){var e=c[h];0===f&&g[h]&&e.lang&&e.langEntries&&(a.lang[e.name]=e.langEntries[g[h]]);if(e[d[f]])e[d[f]](a)}a.fireOnce("pluginsLoaded");b.keystrokes&&a.setKeystroke(a.config.keystrokes);for(h=0;h<a.config.blockedKeystrokes.length;h++)a.keystrokeHandler.blockedKeystrokes[a.config.blockedKeystrokes[h]]=
+1;a.status="loaded";a.fireOnce("loaded");CKEDITOR.fire("instanceLoaded",null,a)})})}function v(){var a=this.element;if(a&&this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO){var b=this.getData();this.config.htmlEncodeOutput&&(b=CKEDITOR.tools.htmlEncode(b));a.is("textarea")?a.setValue(b):a.setHtml(b);return!0}return!1}a.prototype=CKEDITOR.editor.prototype;CKEDITOR.editor=a;var r=0,w={};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{addCommand:function(a,b){b.name=a.toLowerCase();var d=new CKEDITOR.command(this,
 b);this.mode&&h(this,d);return this.commands[a]=d},_attachToForm:function(){function a(b){d.updateElement();d._.required&&!c.getValue()&&!1===d.fire("required")&&b.data.preventDefault()}function b(a){return!!(a&&a.call&&a.apply)}var d=this,c=d.element,g=new CKEDITOR.dom.element(c.$.form);c.is("textarea")&&g&&(g.on("submit",a),b(g.$.submit)&&(g.$.submit=CKEDITOR.tools.override(g.$.submit,function(b){return function(){a();b.apply?b.apply(this):b()}})),d.on("destroy",function(){g.removeListener("submit",
 a)}))},destroy:function(a){this.fire("beforeDestroy");!a&&v.call(this);this.editable(null);this.filter&&(this.filter.destroy(),delete this.filter);delete this.activeFilter;this.status="destroyed";this.fire("destroy");this.removeAllListeners();CKEDITOR.remove(this);CKEDITOR.fire("instanceDestroyed",null,this)},elementPath:function(a){if(!a){a=this.getSelection();if(!a)return null;a=a.getStartElement()}return a?new CKEDITOR.dom.elementPath(a,this.editable()):null},createRange:function(){var a=this.editable();
 return a?new CKEDITOR.dom.range(a):null},execCommand:function(a,b){var d=this.getCommand(a),c={name:a,commandData:b,command:d};return d&&d.state!=CKEDITOR.TRISTATE_DISABLED&&!1!==this.fire("beforeCommandExec",c)&&(c.returnValue=d.exec(c.commandData),!d.async&&!1!==this.fire("afterCommandExec",c))?c.returnValue:!1},getCommand:function(a){return this.commands[a]},getData:function(a){!a&&this.fire("beforeGetData");var b=this._.data;"string"!=typeof b&&(b=(b=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?
 b.is("textarea")?b.getValue():b.getHtml():"");b={dataValue:b};!a&&this.fire("getData",b);return b.dataValue},getSnapshot:function(){var a=this.fire("getSnapshot");"string"!=typeof a&&(a=(a=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.is("textarea")?a.getValue():a.getHtml():"");return a},loadSnapshot:function(a){this.fire("loadSnapshot",a)},setData:function(a,b,d){var c=!0,g=b;b&&"object"==typeof b&&(d=b.internal,g=b.callback,c=!b.noSnapshot);!d&&c&&this.fire("saveSnapshot");if(g||
 !d)this.once("dataReady",function(a){!d&&c&&this.fire("saveSnapshot");g&&g.call(a.editor)});a={dataValue:a};!d&&this.fire("setData",a);this._.data=a.dataValue;!d&&this.fire("afterSetData",a)},setReadOnly:function(a){a=null==a||a;this.readOnly!=a&&(this.readOnly=a,this.keystrokeHandler.blockedKeystrokes[8]=+a,this.editable().setReadOnly(a),this.fire("readOnly"))},insertHtml:function(a,b,d){this.fire("insertHtml",{dataValue:a,mode:b,range:d})},insertText:function(a){this.fire("insertText",a)},insertElement:function(a){this.fire("insertElement",
-a)},getSelectedHtml:function(a){var b=this.editable(),d=this.getSelection(),d=d&&d.getRanges();if(!b||!d||0===d.length)return null;for(var c=new CKEDITOR.dom.documentFragment,g,e,h,f=0;f<d.length;f++){var k=d[f],m=k.startContainer;m.getName&&"tr"==m.getName()?(g||(g=m.getAscendant("table").clone(),g.append(m.getAscendant("tbody").clone()),c.append(g),g=g.findOne("tbody")),e&&e.equals(m)||(e=m,h=m.clone(),g.append(h)),h.append(k.cloneContents())):c.append(k.cloneContents())}b=g?c:b.getHtmlFromRange(d[0]);
+a)},getSelectedHtml:function(a){var b=this.editable(),d=this.getSelection(),d=d&&d.getRanges();if(!b||!d||0===d.length)return null;for(var c=new CKEDITOR.dom.documentFragment,g,f,h,e=0;e<d.length;e++){var k=d[e],l=k.startContainer;l.getName&&"tr"==l.getName()?(g||(g=l.getAscendant("table").clone(),g.append(l.getAscendant("tbody").clone()),c.append(g),g=g.findOne("tbody")),f&&f.equals(l)||(f=l,h=l.clone(),g.append(h)),h.append(k.cloneContents())):c.append(k.cloneContents())}b=g?c:b.getHtmlFromRange(d[0]);
 return a?b.getHtml():b},extractSelectedHtml:function(a,b){var d=this.editable(),c=this.getSelection().getRanges();if(!d||0===c.length)return null;c=c[0];d=d.extractHtmlFromRange(c,b);b||this.getSelection().selectRanges([c]);return a?d.getHtml():d},focus:function(){this.fire("beforeFocus")},checkDirty:function(){return"ready"==this.status&&this._.previousValue!==this.getSnapshot()},resetDirty:function(){this._.previousValue=this.getSnapshot()},updateElement:function(){return v.call(this)},setKeystroke:function(){for(var a=
-this.keystrokeHandler.keystrokes,b=CKEDITOR.tools.isArray(arguments[0])?arguments[0]:[[].slice.call(arguments,0)],d,c,g=b.length;g--;)d=b[g],c=0,CKEDITOR.tools.isArray(d)&&(c=d[1],d=d[0]),c?a[d]=c:delete a[d]},addFeature:function(a){return this.filter.addFeature(a)},setActiveFilter:function(a){a||(a=this.filter);this.activeFilter!==a&&(this.activeFilter=a,this.fire("activeFilterChange"),a===this.filter?this.setActiveEnterMode(null,null):this.setActiveEnterMode(a.getAllowedEnterMode(this.enterMode),
-a.getAllowedEnterMode(this.shiftEnterMode,!0)))},setActiveEnterMode:function(a,b){a=a?this.blockless?CKEDITOR.ENTER_BR:a:this.enterMode;b=b?this.blockless?CKEDITOR.ENTER_BR:b:this.shiftEnterMode;if(this.activeEnterMode!=a||this.activeShiftEnterMode!=b)this.activeEnterMode=a,this.activeShiftEnterMode=b,this.fire("activeEnterModeChange")},showNotification:function(a){alert(a)}})}(),CKEDITOR.ELEMENT_MODE_NONE=0,CKEDITOR.ELEMENT_MODE_REPLACE=1,CKEDITOR.ELEMENT_MODE_APPENDTO=2,CKEDITOR.ELEMENT_MODE_INLINE=
-3,CKEDITOR.htmlParser=function(){this._={htmlPartsRegex:/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--\x3e)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/g}},function(){var a=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,f={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};CKEDITOR.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},
-onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(c){for(var e,h,m=0,l;e=this._.htmlPartsRegex.exec(c);){h=e.index;if(h>m)if(m=c.substring(m,h),l)l.push(m);else this.onText(m);m=this._.htmlPartsRegex.lastIndex;if(h=e[1])if(h=h.toLowerCase(),l&&CKEDITOR.dtd.$cdata[h]&&(this.onCDATA(l.join("")),l=null),!l){this.onTagClose(h);continue}if(l)l.push(e[0]);else if(h=e[3]){if(h=h.toLowerCase(),!/="/.test(h)){var k={},b,d=e[4];e=!!e[5];if(d)for(;b=a.exec(d);){var g=b[1].toLowerCase();
-b=b[2]||b[3]||b[4]||"";k[g]=!b&&f[g]?g:CKEDITOR.tools.htmlDecodeAttr(b)}this.onTagOpen(h,k,e);!l&&CKEDITOR.dtd.$cdata[h]&&(l=[])}}else if(h=e[2])this.onComment(h)}if(c.length>m)this.onText(c.substring(m,c.length))}}}(),CKEDITOR.htmlParser.basicWriter=CKEDITOR.tools.createClass({$:function(){this._={output:[]}},proto:{openTag:function(a){this._.output.push("\x3c",a)},openTagClose:function(a,f){f?this._.output.push(" /\x3e"):this._.output.push("\x3e")},attribute:function(a,f){"string"==typeof f&&(f=
-CKEDITOR.tools.htmlEncodeAttr(f));this._.output.push(" ",a,'\x3d"',f,'"')},closeTag:function(a){this._.output.push("\x3c/",a,"\x3e")},text:function(a){this._.output.push(a)},comment:function(a){this._.output.push("\x3c!--",a,"--\x3e")},write:function(a){this._.output.push(a)},reset:function(){this._.output=[];this._.indent=!1},getHtml:function(a){var f=this._.output.join("");a&&this.reset();return f}}}),"use strict",function(){CKEDITOR.htmlParser.node=function(){};CKEDITOR.htmlParser.node.prototype=
-{remove:function(){var a=this.parent.children,f=CKEDITOR.tools.indexOf(a,this),c=this.previous,e=this.next;c&&(c.next=e);e&&(e.previous=c);a.splice(f,1);this.parent=null},replaceWith:function(a){var f=this.parent.children,c=CKEDITOR.tools.indexOf(f,this),e=a.previous=this.previous,h=a.next=this.next;e&&(e.next=a);h&&(h.previous=a);f[c]=a;a.parent=this.parent;this.parent=null},insertAfter:function(a){var f=a.parent.children,c=CKEDITOR.tools.indexOf(f,a),e=a.next;f.splice(c+1,0,this);this.next=a.next;
-this.previous=a;a.next=this;e&&(e.previous=this);this.parent=a.parent},insertBefore:function(a){var f=a.parent.children,c=CKEDITOR.tools.indexOf(f,a);f.splice(c,0,this);this.next=a;(this.previous=a.previous)&&(a.previous.next=this);a.previous=this;this.parent=a.parent},getAscendant:function(a){var f="function"==typeof a?a:"string"==typeof a?function(c){return c.name==a}:function(c){return c.name in a},c=this.parent;for(;c&&c.type==CKEDITOR.NODE_ELEMENT;){if(f(c))return c;c=c.parent}return null},wrapWith:function(a){this.replaceWith(a);
-a.add(this);return a},getIndex:function(){return CKEDITOR.tools.indexOf(this.parent.children,this)},getFilterContext:function(a){return a||{}}}}(),"use strict",CKEDITOR.htmlParser.comment=function(a){this.value=a;this._={isBlockLike:!1}},CKEDITOR.htmlParser.comment.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_COMMENT,filter:function(a,f){var c=this.value;if(!(c=a.onComment(f,c,this)))return this.remove(),!1;if("string"!=typeof c)return this.replaceWith(c),!1;this.value=
-c;return!0},writeHtml:function(a,f){f&&this.filter(f);a.comment(this.value)}}),"use strict",function(){CKEDITOR.htmlParser.text=function(a){this.value=a;this._={isBlockLike:!1}};CKEDITOR.htmlParser.text.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(a,f){if(!(this.value=a.onText(f,this.value,this)))return this.remove(),!1},writeHtml:function(a,f){f&&this.filter(f);a.text(this.value)}})}(),"use strict",function(){CKEDITOR.htmlParser.cdata=function(a){this.value=
-a};CKEDITOR.htmlParser.cdata.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(){},writeHtml:function(a){a.write(this.value)}})}(),"use strict",CKEDITOR.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:!0,hasInlineStarted:!1}},function(){function a(a){return a.attributes["data-cke-survive"]?!1:"a"==a.name&&a.attributes.href||CKEDITOR.dtd.$removeEmpty[a.name]}var f=CKEDITOR.tools.extend({table:1,ul:1,ol:1,dl:1},
-CKEDITOR.dtd.table,CKEDITOR.dtd.ul,CKEDITOR.dtd.ol,CKEDITOR.dtd.dl),c={ol:1,ul:1},e=CKEDITOR.tools.extend({},{html:1},CKEDITOR.dtd.html,CKEDITOR.dtd.body,CKEDITOR.dtd.head,{style:1,script:1}),h={ul:"li",ol:"li",dl:"dd",table:"tbody",tbody:"tr",thead:"tr",tfoot:"tr",tr:"td"};CKEDITOR.htmlParser.fragment.fromHtml=function(m,l,k){function b(a){var b;if(0<q.length)for(var c=0;c<q.length;c++){var g=q[c],e=g.name,h=CKEDITOR.dtd[e],f=A.name&&CKEDITOR.dtd[A.name];f&&!f[e]||a&&h&&!h[a]&&CKEDITOR.dtd[a]?e==
-A.name&&(p(A,A.parent,1),c--):(b||(d(),b=1),g=g.clone(),g.parent=A,A=g,q.splice(c,1),c--)}}function d(){for(;x.length;)p(x.shift(),A)}function g(a){if(a._.isBlockLike&&"pre"!=a.name&&"textarea"!=a.name){var b=a.children.length,d=a.children[b-1],c;d&&d.type==CKEDITOR.NODE_TEXT&&((c=CKEDITOR.tools.rtrim(d.value))?d.value=c:a.children.length=b-1)}}function p(b,d,c){d=d||A||n;var e=A;void 0===b.previous&&(v(d,b)&&(A=d,t.onTagOpen(k,{}),b.returnPoint=d=A),g(b),a(b)&&!b.children.length||d.add(b),"pre"==
-b.name&&(r=!1),"textarea"==b.name&&(C=!1));b.returnPoint?(A=b.returnPoint,delete b.returnPoint):A=c?d:e}function v(a,b){if((a==n||"body"==a.name)&&k&&(!a.name||CKEDITOR.dtd[a.name][k])){var d,c;return(d=b.attributes&&(c=b.attributes["data-cke-real-element-type"])?c:b.name)&&d in CKEDITOR.dtd.$inline&&!(d in CKEDITOR.dtd.head)&&!b.isOrphan||b.type==CKEDITOR.NODE_TEXT}}function u(a,b){return a in CKEDITOR.dtd.$listItem||a in CKEDITOR.dtd.$tableContent?a==b||"dt"==a&&"dd"==b||"dd"==a&&"dt"==b:!1}var t=
-new CKEDITOR.htmlParser,n=l instanceof CKEDITOR.htmlParser.element?l:"string"==typeof l?new CKEDITOR.htmlParser.element(l):new CKEDITOR.htmlParser.fragment,q=[],x=[],A=n,C="textarea"==n.name,r="pre"==n.name;t.onTagOpen=function(g,h,k,m){h=new CKEDITOR.htmlParser.element(g,h);h.isUnknown&&k&&(h.isEmpty=!0);h.isOptionalClose=m;if(a(h))q.push(h);else{if("pre"==g)r=!0;else{if("br"==g&&r){A.add(new CKEDITOR.htmlParser.text("\n"));return}"textarea"==g&&(C=!0)}if("br"==g)x.push(h);else{for(;!(m=(k=A.name)?
-CKEDITOR.dtd[k]||(A._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):e,h.isUnknown||A.isUnknown||m[g]);)if(A.isOptionalClose)t.onTagClose(k);else if(g in c&&k in c)k=A.children,(k=k[k.length-1])&&"li"==k.name||p(k=new CKEDITOR.htmlParser.element("li"),A),!h.returnPoint&&(h.returnPoint=A),A=k;else if(g in CKEDITOR.dtd.$listItem&&!u(g,k))t.onTagOpen("li"==g?"ul":"dl",{},0,1);else if(k in f&&!u(g,k))!h.returnPoint&&(h.returnPoint=A),A=A.parent;else if(k in CKEDITOR.dtd.$inline&&q.unshift(A),A.parent)p(A,
-A.parent,1);else{h.isOrphan=1;break}b(g);d();h.parent=A;h.isEmpty?p(h):A=h}}};t.onTagClose=function(a){for(var b=q.length-1;0<=b;b--)if(a==q[b].name){q.splice(b,1);return}for(var c=[],g=[],e=A;e!=n&&e.name!=a;)e._.isBlockLike||g.unshift(e),c.push(e),e=e.returnPoint||e.parent;if(e!=n){for(b=0;b<c.length;b++){var h=c[b];p(h,h.parent)}A=e;e._.isBlockLike&&d();p(e,e.parent);e==A&&(A=A.parent);q=q.concat(g)}"body"==a&&(k=!1)};t.onText=function(a){if(!(A._.hasInlineStarted&&!x.length||r||C)&&(a=CKEDITOR.tools.ltrim(a),
-0===a.length))return;var c=A.name,g=c?CKEDITOR.dtd[c]||(A._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):e;if(!C&&!g["#"]&&c in f)t.onTagOpen(h[c]||""),t.onText(a);else{d();b();r||C||(a=a.replace(/[\t\r\n ]{2,}|[\t\r\n]/g," "));a=new CKEDITOR.htmlParser.text(a);if(v(A,a))this.onTagOpen(k,{},0,1);A.add(a)}};t.onCDATA=function(a){A.add(new CKEDITOR.htmlParser.cdata(a))};t.onComment=function(a){d();b();A.add(new CKEDITOR.htmlParser.comment(a))};t.parse(m);for(d();A!=n;)p(A,A.parent,1);g(n);return n};
-CKEDITOR.htmlParser.fragment.prototype={type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,add:function(a,c){isNaN(c)&&(c=this.children.length);var e=0<c?this.children[c-1]:null;if(e){if(a._.isBlockLike&&e.type==CKEDITOR.NODE_TEXT&&(e.value=CKEDITOR.tools.rtrim(e.value),0===e.value.length)){this.children.pop();this.add(a);return}e.next=a}a.previous=e;a.parent=this;this.children.splice(c,0,a);this._.hasInlineStarted||(this._.hasInlineStarted=a.type==CKEDITOR.NODE_TEXT||a.type==CKEDITOR.NODE_ELEMENT&&!a._.isBlockLike)},
-filter:function(a,c){c=this.getFilterContext(c);a.onRoot(c,this);this.filterChildren(a,!1,c)},filterChildren:function(a,c,e){if(this.childrenFilteredBy!=a.id){e=this.getFilterContext(e);if(c&&!this.parent)a.onRoot(e,this);this.childrenFilteredBy=a.id;for(c=0;c<this.children.length;c++)!1===this.children[c].filter(a,e)&&c--}},writeHtml:function(a,c){c&&this.filter(c);this.writeChildrenHtml(a)},writeChildrenHtml:function(a,c,e){var b=this.getFilterContext();if(e&&!this.parent&&c)c.onRoot(b,this);c&&
-this.filterChildren(c,!1,b);c=0;e=this.children;for(b=e.length;c<b;c++)e[c].writeHtml(a)},forEach:function(a,c,e){if(!(e||c&&this.type!=c))var b=a(this);if(!1!==b){e=this.children;for(var d=0;d<e.length;d++)b=e[d],b.type==CKEDITOR.NODE_ELEMENT?b.forEach(a,c):c&&b.type!=c||a(b)}},getFilterContext:function(a){return a||{}}}}(),"use strict",function(){function a(){this.rules=[]}function f(c,e,h,f){var l,k;for(l in e)(k=c[l])||(k=c[l]=new a),k.add(e[l],h,f)}CKEDITOR.htmlParser.filter=CKEDITOR.tools.createClass({$:function(c){this.id=
-CKEDITOR.tools.getNextNumber();this.elementNameRules=new a;this.attributeNameRules=new a;this.elementsRules={};this.attributesRules={};this.textRules=new a;this.commentRules=new a;this.rootRules=new a;c&&this.addRules(c,10)},proto:{addRules:function(a,e){var h;"number"==typeof e?h=e:e&&"priority"in e&&(h=e.priority);"number"!=typeof h&&(h=10);"object"!=typeof e&&(e={});a.elementNames&&this.elementNameRules.addMany(a.elementNames,h,e);a.attributeNames&&this.attributeNameRules.addMany(a.attributeNames,
-h,e);a.elements&&f(this.elementsRules,a.elements,h,e);a.attributes&&f(this.attributesRules,a.attributes,h,e);a.text&&this.textRules.add(a.text,h,e);a.comment&&this.commentRules.add(a.comment,h,e);a.root&&this.rootRules.add(a.root,h,e)},applyTo:function(a){a.filter(this)},onElementName:function(a,e){return this.elementNameRules.execOnName(a,e)},onAttributeName:function(a,e){return this.attributeNameRules.execOnName(a,e)},onText:function(a,e,h){return this.textRules.exec(a,e,h)},onComment:function(a,
-e,h){return this.commentRules.exec(a,e,h)},onRoot:function(a,e){return this.rootRules.exec(a,e)},onElement:function(a,e){for(var h=[this.elementsRules["^"],this.elementsRules[e.name],this.elementsRules.$],f,l=0;3>l;l++)if(f=h[l]){f=f.exec(a,e,this);if(!1===f)return null;if(f&&f!=e)return this.onNode(a,f);if(e.parent&&!e.name)break}return e},onNode:function(a,e){var h=e.type;return h==CKEDITOR.NODE_ELEMENT?this.onElement(a,e):h==CKEDITOR.NODE_TEXT?new CKEDITOR.htmlParser.text(this.onText(a,e.value)):
-h==CKEDITOR.NODE_COMMENT?new CKEDITOR.htmlParser.comment(this.onComment(a,e.value)):null},onAttribute:function(a,e,h,f){return(h=this.attributesRules[h])?h.exec(a,f,e,this):f}}});CKEDITOR.htmlParser.filterRulesGroup=a;a.prototype={add:function(a,e,h){this.rules.splice(this.findIndex(e),0,{value:a,priority:e,options:h})},addMany:function(a,e,h){for(var f=[this.findIndex(e),0],l=0,k=a.length;l<k;l++)f.push({value:a[l],priority:e,options:h});this.rules.splice.apply(this.rules,f)},findIndex:function(a){for(var e=
-this.rules,h=e.length-1;0<=h&&a<e[h].priority;)h--;return h+1},exec:function(a,e){var h=e instanceof CKEDITOR.htmlParser.node||e instanceof CKEDITOR.htmlParser.fragment,f=Array.prototype.slice.call(arguments,1),l=this.rules,k=l.length,b,d,g,p;for(p=0;p<k;p++)if(h&&(b=e.type,d=e.name),g=l[p],!(a.nonEditable&&!g.options.applyToAll||a.nestedEditable&&g.options.excludeNestedEditable)){g=g.value.apply(null,f);if(!1===g||h&&g&&(g.name!=d||g.type!=b))return g;null!=g&&(f[0]=e=g)}return e},execOnName:function(a,
-e){for(var h=0,f=this.rules,l=f.length,k;e&&h<l;h++)k=f[h],a.nonEditable&&!k.options.applyToAll||a.nestedEditable&&k.options.excludeNestedEditable||(e=e.replace(k.value[0],k.value[1]));return e}}}(),function(){function a(a,b){function d(a){return a||CKEDITOR.env.needsNbspFiller?new CKEDITOR.htmlParser.text(" "):new CKEDITOR.htmlParser.element("br",{"data-cke-bogus":1})}function g(a,b){return function(g){if(g.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var h=[],k=c(g),r,l;if(k)for(f(k,1)&&h.push(k);k;)m(k)&&
-(r=e(k))&&f(r)&&((l=e(r))&&!m(l)?h.push(r):(d(p).insertAfter(r),r.remove())),k=k.previous;for(k=0;k<h.length;k++)h[k].remove();if(h=!a||!1!==("function"==typeof b?b(g):b))p||CKEDITOR.env.needsBrFiller||g.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT?p||CKEDITOR.env.needsBrFiller||!(7<document.documentMode||g.name in CKEDITOR.dtd.tr||g.name in CKEDITOR.dtd.$listItem)?(h=c(g),h=!h||"form"==g.name&&"input"==h.name):h=!1:h=!1;h&&g.add(d(a))}}}function f(a,b){if((!p||CKEDITOR.env.needsBrFiller)&&a.type==CKEDITOR.NODE_ELEMENT&&
-"br"==a.name&&!a.attributes["data-cke-eol"])return!0;var d;return a.type==CKEDITOR.NODE_TEXT&&(d=a.value.match(q))&&(d.index&&((new CKEDITOR.htmlParser.text(a.value.substring(0,d.index))).insertBefore(a),a.value=d[0]),!CKEDITOR.env.needsBrFiller&&p&&(!b||a.parent.name in n)||!p&&((d=a.previous)&&"br"==d.name||!d||m(d)))?!0:!1}var k={elements:{}},p="html"==b,n=CKEDITOR.tools.extend({},r),w;for(w in n)"#"in A[w]||delete n[w];for(w in n)k.elements[w]=g(p,a.config.fillEmptyBlocks);k.root=g(p,!1);k.elements.br=
-function(a){return function(b){if(b.parent.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var c=b.attributes;if("data-cke-bogus"in c||"data-cke-eol"in c)delete c["data-cke-bogus"];else{for(c=b.next;c&&h(c);)c=c.next;var g=e(b);!c&&m(b.parent)?l(b.parent,d(a)):m(c)&&g&&!m(g)&&d(a).insertBefore(c)}}}}(p);return k}function f(a,b){return a!=CKEDITOR.ENTER_BR&&!1!==b?a==CKEDITOR.ENTER_DIV?"div":"p":!1}function c(a){for(a=a.children[a.children.length-1];a&&h(a);)a=a.previous;return a}function e(a){for(a=a.previous;a&&
-h(a);)a=a.previous;return a}function h(a){return a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(a.value)||a.type==CKEDITOR.NODE_ELEMENT&&a.attributes["data-cke-bookmark"]}function m(a){return a&&(a.type==CKEDITOR.NODE_ELEMENT&&a.name in r||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function l(a,b){var d=a.children[a.children.length-1];a.children.push(b);b.parent=a;d&&(d.next=b,b.previous=d)}function k(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);
-a.contenteditable="false"}function b(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function d(a){return a.replace(D,function(a,b,d){return"\x3c"+b+d.replace(F,function(a,b){return E.test(b)&&-1==d.indexOf("data-cke-saved-"+b)?" data-cke-saved-"+a+" data-cke-"+CKEDITOR.rnd+"-"+a:a})+"\x3e"})}function g(a,b){return a.replace(b,function(a,b,d){0===a.indexOf("\x3ctextarea")&&(a=b+u(d).replace(/</g,"\x26lt;").replace(/>/g,
-"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function p(a){return a.replace(N,function(a,b){return decodeURIComponent(b)})}function v(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,function(a){return"\x3c!--"+x+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function u(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function t(a,b){var d=b._.dataStore;
-return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return d&&d[b]||""})}function n(a,b){var d=[],c=b.config.protectedSource,g=b._.dataStore||(b._.dataStore={id:1}),e=/<\!--\{cke_temp(comment)?\}(\d*?)--\x3e/g,c=[/<script[\s\S]*?(<\/script>|$)/gi,/<noscript[\s\S]*?<\/noscript>/gi,/<meta[\s\S]*?\/?>/gi].concat(c);a=a.replace(/\x3c!--[\s\S]*?--\x3e/g,function(a){return"\x3c!--{cke_tempcomment}"+(d.push(a)-
-1)+"--\x3e"});for(var h=0;h<c.length;h++)a=a.replace(c[h],function(a){a=a.replace(e,function(a,b,c){return d[c]});return/cke_temp(comment)?/.test(a)?a:"\x3c!--{cke_temp}"+(d.push(a)-1)+"--\x3e"});a=a.replace(e,function(a,b,c){return"\x3c!--"+x+(b?"{C}":"")+encodeURIComponent(d[c]).replace(/--/g,"%2D%2D")+"--\x3e"});a=a.replace(/<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g,function(a){return a.replace(/\x3c!--\{cke_protected\}([^>]*)--\x3e/g,function(a,b){g[g.id]=
-decodeURIComponent(b);return"{cke_protected_"+g.id++ +"}"})});return a=a.replace(/<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g,function(a,d,c,g){return"\x3c"+d+c+"\x3e"+t(u(g),b)+"\x3c/"+d+"\x3e"})}CKEDITOR.htmlDataProcessor=function(b){var c,e,h=this;this.editor=b;this.dataFilter=c=new CKEDITOR.htmlParser.filter;this.htmlFilter=e=new CKEDITOR.htmlParser.filter;this.writer=new CKEDITOR.htmlParser.basicWriter;c.addRules(w);c.addRules(B,{applyToAll:!0});c.addRules(a(b,"data"),{applyToAll:!0});
-e.addRules(z);e.addRules(y,{applyToAll:!0});e.addRules(a(b,"html"),{applyToAll:!0});b.on("toHtml",function(a){a=a.data;var c=a.dataValue,e,c=n(c,b),c=g(c,G),c=d(c),c=g(c,L),c=c.replace(O,"$1cke:$2"),c=c.replace(R,"\x3ccke:$1$2\x3e\x3c/cke:$1\x3e"),c=c.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,"$1$2$2"),c=c.replace(/([^a-z0-9<\-])(on\w{3,})(?!>)/gi,"$1data-cke-"+CKEDITOR.rnd+"-$2");e=a.context||b.editable().getName();var h;CKEDITOR.env.ie&&9>CKEDITOR.env.version&&"pre"==e&&(e="div",c="\x3cpre\x3e"+c+"\x3c/pre\x3e",
-h=1);e=b.document.createElement(e);e.setHtml("a"+c);c=e.getHtml().substr(1);c=c.replace(new RegExp("data-cke-"+CKEDITOR.rnd+"-","ig"),"");h&&(c=c.replace(/^<pre>|<\/pre>$/gi,""));c=c.replace(I,"$1$2");c=p(c);c=u(c);e=!1===a.fixForBody?!1:f(a.enterMode,b.config.autoParagraph);c=CKEDITOR.htmlParser.fragment.fromHtml(c,a.context,e);e&&(h=c,!h.children.length&&CKEDITOR.dtd[h.name][e]&&(e=new CKEDITOR.htmlParser.element(e),h.add(e)));a.dataValue=c},null,null,5);b.on("toHtml",function(a){a.data.filter.applyTo(a.data.dataValue,
-!0,a.data.dontFilter,a.data.enterMode)&&b.fire("dataFiltered")},null,null,6);b.on("toHtml",function(a){a.data.dataValue.filterChildren(h.dataFilter,!0)},null,null,10);b.on("toHtml",function(a){a=a.data;var b=a.dataValue,d=new CKEDITOR.htmlParser.basicWriter;b.writeChildrenHtml(d);b=d.getHtml(!0);a.dataValue=v(b)},null,null,15);b.on("toDataFormat",function(a){var d=a.data.dataValue;a.data.enterMode!=CKEDITOR.ENTER_BR&&(d=d.replace(/^<br *\/?>/i,""));a.data.dataValue=CKEDITOR.htmlParser.fragment.fromHtml(d,
-a.data.context,f(a.data.enterMode,b.config.autoParagraph))},null,null,5);b.on("toDataFormat",function(a){a.data.dataValue.filterChildren(h.htmlFilter,!0)},null,null,10);b.on("toDataFormat",function(a){a.data.filter.applyTo(a.data.dataValue,!1,!0)},null,null,11);b.on("toDataFormat",function(a){var d=a.data.dataValue,c=h.writer;c.reset();d.writeChildrenHtml(c);d=c.getHtml(!0);d=u(d);d=t(d,b);a.data.dataValue=d},null,null,15)};CKEDITOR.htmlDataProcessor.prototype={toHtml:function(a,b,d,c){var g=this.editor,
-e,h,f,k;b&&"object"==typeof b?(e=b.context,d=b.fixForBody,c=b.dontFilter,h=b.filter,f=b.enterMode,k=b.protectedWhitespaces):e=b;e||null===e||(e=g.editable().getName());return g.fire("toHtml",{dataValue:a,context:e,fixForBody:d,dontFilter:c,filter:h||g.filter,enterMode:f||g.enterMode,protectedWhitespaces:k}).dataValue},toDataFormat:function(a,b){var d,c,g;b&&(d=b.context,c=b.filter,g=b.enterMode);d||null===d||(d=this.editor.editable().getName());return this.editor.fire("toDataFormat",{dataValue:a,
-filter:c||this.editor.filter,context:d,enterMode:g||this.editor.enterMode}).dataValue}};var q=/(?:&nbsp;|\xa0)$/,x="{cke_protected}",A=CKEDITOR.dtd,C="caption colgroup col thead tfoot tbody".split(" "),r=CKEDITOR.tools.extend({},A.$blockLimit,A.$block),w={elements:{input:k,textarea:k}},B={attributeNames:[[/^on/,"data-cke-pa-on"],[/^data-cke-expando$/,""]]},z={elements:{embed:function(a){var b=a.parent;if(b&&"object"==b.name){var d=b.attributes.width,b=b.attributes.height;d&&(a.attributes.width=d);
-b&&(a.attributes.height=b)}},a:function(a){var b=a.attributes;if(!(a.children.length||b.name||b.id||a.attributes["data-cke-saved-name"]))return!1}}},y={elementNames:[[/^cke:/,""],[/^\?xml:namespace$/,""]],attributeNames:[[/^data-cke-(saved|pa)-/,""],[/^data-cke-.*/,""],["hidefocus",""]],elements:{$:function(a){var b=a.attributes;if(b){if(b["data-cke-temp"])return!1;for(var d=["name","href","src"],c,g=0;g<d.length;g++)c="data-cke-saved-"+d[g],c in b&&delete b[d[g]]}return a},table:function(a){a.children.slice(0).sort(function(a,
-b){var d,c;a.type==CKEDITOR.NODE_ELEMENT&&b.type==a.type&&(d=CKEDITOR.tools.indexOf(C,a.name),c=CKEDITOR.tools.indexOf(C,b.name));-1<d&&-1<c&&d!=c||(d=a.parent?a.getIndex():-1,c=b.parent?b.getIndex():-1);return d>c?1:-1})},param:function(a){a.children=[];a.isEmpty=!0;return a},span:function(a){"Apple-style-span"==a.attributes["class"]&&delete a.name},html:function(a){delete a.attributes.contenteditable;delete a.attributes["class"]},body:function(a){delete a.attributes.spellcheck;delete a.attributes.contenteditable},
-style:function(a){var b=a.children[0];b&&b.value&&(b.value=CKEDITOR.tools.trim(b.value));a.attributes.type||(a.attributes.type="text/css")},title:function(a){var b=a.children[0];!b&&l(a,b=new CKEDITOR.htmlParser.text);b.value=a.attributes["data-cke-title"]||""},input:b,textarea:b},attributes:{"class":function(a){return CKEDITOR.tools.ltrim(a.replace(/(?:^|\s+)cke_[^\s]*/g,""))||!1}}};CKEDITOR.env.ie&&(y.attributes.style=function(a){return a.replace(/(^|;)([^\:]+)/g,function(a){return a.toLowerCase()})});
-var D=/<(a|area|img|input|source)\b([^>]*)>/gi,F=/([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,E=/^(href|src|name)$/i,L=/(?:<style(?=[ >])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,G=/(<textarea(?=[ >])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,N=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,O=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,I=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,R=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi}(),"use strict",CKEDITOR.htmlParser.element=
-function(a,f){this.name=a;this.attributes=f||{};this.children=[];var c=a||"",e=c.match(/^cke:(.*)/);e&&(c=e[1]);c=!!(CKEDITOR.dtd.$nonBodyContent[c]||CKEDITOR.dtd.$block[c]||CKEDITOR.dtd.$listItem[c]||CKEDITOR.dtd.$tableContent[c]||CKEDITOR.dtd.$nonEditable[c]||"br"==c);this.isEmpty=!!CKEDITOR.dtd.$empty[a];this.isUnknown=!CKEDITOR.dtd[a];this._={isBlockLike:c,hasInlineStarted:this.isEmpty||!c}},CKEDITOR.htmlParser.cssStyle=function(a){var f={};((a instanceof CKEDITOR.htmlParser.element?a.attributes.style:
-a)||"").replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(a,e,h){"font-family"==e&&(h=h.replace(/["']/g,""));f[e.toLowerCase()]=h});return{rules:f,populate:function(a){var e=this.toString();e&&(a instanceof CKEDITOR.dom.element?a.setAttribute("style",e):a instanceof CKEDITOR.htmlParser.element?a.attributes.style=e:a.style=e)},toString:function(){var a=[],e;for(e in f)f[e]&&a.push(e,":",f[e],";");return a.join("")}}},function(){function a(a){return function(c){return c.type==
-CKEDITOR.NODE_ELEMENT&&("string"==typeof a?c.name==a:c.name in a)}}var f=function(a,c){a=a[0];c=c[0];return a<c?-1:a>c?1:0},c=CKEDITOR.htmlParser.fragment.prototype;CKEDITOR.htmlParser.element.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_ELEMENT,add:c.add,clone:function(){return new CKEDITOR.htmlParser.element(this.name,this.attributes)},filter:function(a,c){var f=this,l,k;c=f.getFilterContext(c);if(c.off)return!0;if(!f.parent)a.onRoot(c,f);for(;;){l=f.name;if(!(k=
-a.onElementName(c,l)))return this.remove(),!1;f.name=k;if(!(f=a.onElement(c,f)))return this.remove(),!1;if(f!==this)return this.replaceWith(f),!1;if(f.name==l)break;if(f.type!=CKEDITOR.NODE_ELEMENT)return this.replaceWith(f),!1;if(!f.name)return this.replaceWithChildren(),!1}l=f.attributes;var b,d;for(b in l){for(k=l[b];;)if(d=a.onAttributeName(c,b))if(d!=b)delete l[b],b=d;else break;else{delete l[b];break}d&&(!1===(k=a.onAttribute(c,f,d,k))?delete l[d]:l[d]=k)}f.isEmpty||this.filterChildren(a,!1,
-c);return!0},filterChildren:c.filterChildren,writeHtml:function(a,c){c&&this.filter(c);var m=this.name,l=[],k=this.attributes,b,d;a.openTag(m,k);for(b in k)l.push([b,k[b]]);a.sortAttributes&&l.sort(f);b=0;for(d=l.length;b<d;b++)k=l[b],a.attribute(k[0],k[1]);a.openTagClose(m,this.isEmpty);this.writeChildrenHtml(a);this.isEmpty||a.closeTag(m)},writeChildrenHtml:c.writeChildrenHtml,replaceWithChildren:function(){for(var a=this.children,c=a.length;c;)a[--c].insertAfter(this);this.remove()},forEach:c.forEach,
-getFirst:function(c){if(!c)return this.children.length?this.children[0]:null;"function"!=typeof c&&(c=a(c));for(var h=0,f=this.children.length;h<f;++h)if(c(this.children[h]))return this.children[h];return null},getHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;this.writeChildrenHtml(a);return a.getHtml()},setHtml:function(a){a=this.children=CKEDITOR.htmlParser.fragment.fromHtml(a).children;for(var c=0,f=a.length;c<f;++c)a[c].parent=this},getOuterHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;
-this.writeHtml(a);return a.getHtml()},split:function(a){for(var c=this.children.splice(a,this.children.length-a),f=this.clone(),l=0;l<c.length;++l)c[l].parent=f;f.children=c;c[0]&&(c[0].previous=null);0<a&&(this.children[a-1].next=null);this.parent.add(f,this.getIndex()+1);return f},addClass:function(a){if(!this.hasClass(a)){var c=this.attributes["class"]||"";this.attributes["class"]=c+(c?" ":"")+a}},removeClass:function(a){var c=this.attributes["class"];c&&((c=CKEDITOR.tools.trim(c.replace(new RegExp("(?:\\s+|^)"+
-a+"(?:\\s+|$)")," ")))?this.attributes["class"]=c:delete this.attributes["class"])},hasClass:function(a){var c=this.attributes["class"];return c?(new RegExp("(?:^|\\s)"+a+"(?\x3d\\s|$)")).test(c):!1},getFilterContext:function(a){var c=[];a||(a={off:!1,nonEditable:!1,nestedEditable:!1});a.off||"off"!=this.attributes["data-cke-processor"]||c.push("off",!0);a.nonEditable||"false"!=this.attributes.contenteditable?a.nonEditable&&!a.nestedEditable&&"true"==this.attributes.contenteditable&&c.push("nestedEditable",
-!0):c.push("nonEditable",!0);if(c.length){a=CKEDITOR.tools.copy(a);for(var f=0;f<c.length;f+=2)a[c[f]]=c[f+1]}return a}},!0)}(),function(){var a={},f=/{([^}]+)}/g,c=/([\\'])/g,e=/\n/g,h=/\r/g;CKEDITOR.template=function(m){if(a[m])this.output=a[m];else{var l=m.replace(c,"\\$1").replace(e,"\\n").replace(h,"\\r").replace(f,function(a,b){return"',data['"+b+"']\x3d\x3dundefined?'{"+b+"}':data['"+b+"'],'"});this.output=a[m]=Function("data","buffer","return buffer?buffer.push('"+l+"'):['"+l+"'].join('');")}}}(),
-delete CKEDITOR.loadFullCore,CKEDITOR.instances={},CKEDITOR.document=new CKEDITOR.dom.document(document),CKEDITOR.add=function(a){CKEDITOR.instances[a.name]=a;a.on("focus",function(){CKEDITOR.currentInstance!=a&&(CKEDITOR.currentInstance=a,CKEDITOR.fire("currentInstance"))});a.on("blur",function(){CKEDITOR.currentInstance==a&&(CKEDITOR.currentInstance=null,CKEDITOR.fire("currentInstance"))});CKEDITOR.fire("instance",null,a)},CKEDITOR.remove=function(a){delete CKEDITOR.instances[a.name]},function(){var a=
-{};CKEDITOR.addTemplate=function(f,c){var e=a[f];if(e)return e;e={name:f,source:c};CKEDITOR.fire("template",e);return a[f]=new CKEDITOR.template(e.source)};CKEDITOR.getTemplate=function(f){return a[f]}}(),function(){var a=[];CKEDITOR.addCss=function(f){a.push(f)};CKEDITOR.getCss=function(){return a.join("\n")}}(),CKEDITOR.on("instanceDestroyed",function(){CKEDITOR.tools.isEmpty(this.instances)&&CKEDITOR.fire("reset")}),CKEDITOR.TRISTATE_ON=1,CKEDITOR.TRISTATE_OFF=2,CKEDITOR.TRISTATE_DISABLED=0,function(){CKEDITOR.inline=
-function(a,f){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var c=new CKEDITOR.editor(f,a,CKEDITOR.ELEMENT_MODE_INLINE),e=a.is("textarea")?a:null;e?(c.setData(e.getValue(),null,!0),a=CKEDITOR.dom.element.createFromHtml('\x3cdiv contenteditable\x3d"'+!!c.readOnly+'" class\x3d"cke_textarea_inline"\x3e'+e.getValue()+"\x3c/div\x3e",CKEDITOR.document),a.insertAfter(e),
-e.hide(),e.$.form&&c._attachToForm()):c.setData(a.getHtml(),null,!0);c.on("loaded",function(){c.fire("uiReady");c.editable(a);c.container=a;c.ui.contentsElement=a;c.setData(c.getData(1));c.resetDirty();c.fire("contentDom");c.mode="wysiwyg";c.fire("mode");c.status="ready";c.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,c)},null,null,1E4);c.on("destroy",function(){e&&(c.container.clearCustomData(),c.container.remove(),e.show());c.element.clearCustomData();delete c.element});return c};
-CKEDITOR.inlineAll=function(){var a,f,c;for(c in CKEDITOR.dtd.$editable)for(var e=CKEDITOR.document.getElementsByTag(c),h=0,m=e.count();h<m;h++)a=e.getItem(h),"true"==a.getAttribute("contenteditable")&&(f={element:a,config:{}},!1!==CKEDITOR.fire("inline",f)&&CKEDITOR.inline(a,f.config))};CKEDITOR.domReady(function(){!CKEDITOR.disableAutoInline&&CKEDITOR.inlineAll()})}(),CKEDITOR.replaceClass="ckeditor",function(){function a(a,h,m,l){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);
-if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var k=new CKEDITOR.editor(h,a,l);l==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.setStyle("visibility","hidden"),k._.required=a.hasAttribute("required"),a.removeAttribute("required"));m&&k.setData(m,null,!0);k.on("loaded",function(){c(k);l==CKEDITOR.ELEMENT_MODE_REPLACE&&k.config.autoUpdateElement&&a.$.form&&k._attachToForm();k.setMode(k.config.startupMode,function(){k.resetDirty();k.status="ready";
-k.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,k)})});k.on("destroy",f);return k}function f(){var a=this.container,c=this.element;a&&(a.clearCustomData(),a.remove());c&&(c.clearCustomData(),this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&(c.show(),this._.required&&c.setAttribute("required","required")),delete this.element)}function c(a){var c=a.name,f=a.element,l=a.elementMode,k=a.fire("uiSpace",{space:"top",html:""}).html,b=a.fire("uiSpace",{space:"bottom",html:""}).html,d=new CKEDITOR.template('\x3c{outerEl} id\x3d"cke_{name}" class\x3d"{id} cke cke_reset cke_chrome cke_editor_{name} cke_{langDir} '+
-CKEDITOR.env.cssClass+'"  dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"application"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':"")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':"")+'\x3c{outerEl} class\x3d"cke_inner cke_reset" role\x3d"presentation"\x3e{topHtml}\x3c{outerEl} id\x3d"{contentId}" class\x3d"cke_contents cke_reset" role\x3d"presentation"\x3e\x3c/{outerEl}\x3e{bottomHtml}\x3c/{outerEl}\x3e\x3c/{outerEl}\x3e'),
-c=CKEDITOR.dom.element.createFromHtml(d.output({id:a.id,name:c,langDir:a.lang.dir,langCode:a.langCode,voiceLabel:a.title,topHtml:k?'\x3cspan id\x3d"'+a.ui.spaceId("top")+'" class\x3d"cke_top cke_reset_all" role\x3d"presentation" style\x3d"height:auto"\x3e'+k+"\x3c/span\x3e":"",contentId:a.ui.spaceId("contents"),bottomHtml:b?'\x3cspan id\x3d"'+a.ui.spaceId("bottom")+'" class\x3d"cke_bottom cke_reset_all" role\x3d"presentation"\x3e'+b+"\x3c/span\x3e":"",outerEl:CKEDITOR.env.ie?"span":"div"}));l==CKEDITOR.ELEMENT_MODE_REPLACE?
-(f.hide(),c.insertAfter(f)):f.append(c);a.container=c;a.ui.contentsElement=a.ui.space("contents");k&&a.ui.space("top").unselectable();b&&a.ui.space("bottom").unselectable();f=a.config.width;l=a.config.height;f&&c.setStyle("width",CKEDITOR.tools.cssLength(f));l&&a.ui.space("contents").setStyle("height",CKEDITOR.tools.cssLength(l));c.disableContextMenu();CKEDITOR.env.webkit&&c.on("focus",function(){a.focus()});a.fireOnce("uiReady")}CKEDITOR.replace=function(c,h){return a(c,h,null,CKEDITOR.ELEMENT_MODE_REPLACE)};
-CKEDITOR.appendTo=function(c,h,f){return a(c,h,f,CKEDITOR.ELEMENT_MODE_APPENDTO)};CKEDITOR.replaceAll=function(){for(var a=document.getElementsByTagName("textarea"),c=0;c<a.length;c++){var f=null,l=a[c];if(l.name||l.id){if("string"==typeof arguments[0]){if(!(new RegExp("(?:^|\\s)"+arguments[0]+"(?:$|\\s)")).test(l.className))continue}else if("function"==typeof arguments[0]&&(f={},!1===arguments[0](l,f)))continue;this.replace(l,f)}}};CKEDITOR.editor.prototype.addMode=function(a,c){(this._.modes||(this._.modes=
-{}))[a]=c};CKEDITOR.editor.prototype.setMode=function(a,c){var f=this,l=this._.modes;if(a!=f.mode&&l&&l[a]){f.fire("beforeSetMode",a);if(f.mode){var k=f.checkDirty(),l=f._.previousModeData,b,d=0;f.fire("beforeModeUnload");f.editable(0);f._.previousMode=f.mode;f._.previousModeData=b=f.getData(1);"source"==f.mode&&l==b&&(f.fire("lockSnapshot",{forceUpdate:!0}),d=1);f.ui.space("contents").setHtml("");f.mode=""}else f._.previousModeData=f.getData(1);this._.modes[a](function(){f.mode=a;void 0!==k&&!k&&
-f.resetDirty();d?f.fire("unlockSnapshot"):"wysiwyg"==a&&f.fire("saveSnapshot");setTimeout(function(){f.fire("mode");c&&c.call(f)},0)})}};CKEDITOR.editor.prototype.resize=function(a,c,f,l){var k=this.container,b=this.ui.space("contents"),d=CKEDITOR.env.webkit&&this.document&&this.document.getWindow().$.frameElement;l=l?this.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}):k;l.setSize("width",a,!0);d&&(d.style.width="1%");var g=(l.$.offsetHeight||0)-(b.$.clientHeight||
-0),k=Math.max(c-(f?0:g),0);c=f?c+g:c;b.setStyle("height",k+"px");d&&(d.style.width="100%");this.fire("resize",{outerHeight:c,contentsHeight:k,outerWidth:a||l.getSize("width")})};CKEDITOR.editor.prototype.getResizable=function(a){return a?this.ui.space("contents"):this.container};CKEDITOR.domReady(function(){CKEDITOR.replaceClass&&CKEDITOR.replaceAll(CKEDITOR.replaceClass)})}(),CKEDITOR.config.startupMode="wysiwyg",function(){function a(a){var b=a.editor,d=a.data.path,c=d.blockLimit,g=a.data.selection,
-h=g.getRanges()[0],k;if(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller)if(g=f(g,d))g.appendBogus(),k=CKEDITOR.env.ie;l(b,d.block,c)&&h.collapsed&&!h.getCommonAncestor().isReadOnly()&&(d=h.clone(),d.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS),c=new CKEDITOR.dom.walker(d),c.guard=function(a){return!e(a)||a.type==CKEDITOR.NODE_COMMENT||a.isReadOnly()},!c.checkForward()||d.checkStartOfBlock()&&d.checkEndOfBlock())&&(b=h.fixBlock(!0,b.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p"),CKEDITOR.env.needsBrFiller||
-(b=b.getFirst(e))&&b.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(b.getText()).match(/^(?:&nbsp;|\xa0)$/)&&b.remove(),k=1,a.cancel());k&&h.select()}function f(a,b){if(a.isFake)return 0;var d=b.block||b.blockLimit,c=d&&d.getLast(e);if(!(!d||!d.isBlockBoundary()||c&&c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()||d.is("pre")||d.getBogus()))return d}function c(a){var b=a.data.getTarget();b.is("input")&&(b=b.getAttribute("type"),"submit"!=b&&"reset"!=b||a.data.preventDefault())}function e(a){return g(a)&&
-p(a)}function h(a,b){return function(d){var c=d.data.$.toElement||d.data.$.fromElement||d.data.$.relatedTarget;(c=c&&c.nodeType==CKEDITOR.NODE_ELEMENT?new CKEDITOR.dom.element(c):null)&&(b.equals(c)||b.contains(c))||a.call(this,d)}}function m(a){function b(a){return function(b,c){c&&b.type==CKEDITOR.NODE_ELEMENT&&b.is(g)&&(d=b);if(!(c||!e(b)||a&&u(b)))return!1}}var d,c=a.getRanges()[0];a=a.root;var g={table:1,ul:1,ol:1,dl:1};if(c.startPath().contains(g)){var h=c.clone();h.collapse(1);h.setStartAt(a,
-CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(h);a.guard=b();a.checkBackward();if(d)return h=c.clone(),h.collapse(),h.setEndAt(d,CKEDITOR.POSITION_AFTER_END),a=new CKEDITOR.dom.walker(h),a.guard=b(!0),d=!1,a.checkForward(),d}return null}function l(a,b,d){return!1!==a.config.autoParagraph&&a.activeEnterMode!=CKEDITOR.ENTER_BR&&(a.editable().equals(d)&&!b||b&&"true"==b.getAttribute("contenteditable"))}function k(a){return a.activeEnterMode!=CKEDITOR.ENTER_BR&&!1!==a.config.autoParagraph?
-a.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p":!1}function b(a){var b=a.editor;b.getSelection().scrollIntoView();setTimeout(function(){b.fire("saveSnapshot")},0)}function d(a,b,d){var c=a.getCommonAncestor(b);for(b=a=d?b:a;(a=a.getParent())&&!c.equals(a)&&1==a.getChildCount();)b=a;b.remove()}var g,p,v,u,t,n,q,x,A;CKEDITOR.editable=CKEDITOR.tools.createClass({base:CKEDITOR.dom.element,$:function(a,b){this.base(b.$||b);this.editor=a;this.status="unloaded";this.hasFocus=!1;this.setup()},proto:{focus:function(){var a;
-if(CKEDITOR.env.webkit&&!this.hasFocus&&(a=this.editor._.previousActive||this.getDocument().getActive(),this.contains(a))){a.focus();return}CKEDITOR.env.edge&&14<CKEDITOR.env.version&&!this.hasFocus&&this.getDocument().equals(CKEDITOR.document)&&(this.editor._.previousScrollTop=this.$.scrollTop);try{!CKEDITOR.env.ie||CKEDITOR.env.edge&&14<CKEDITOR.env.version||!this.getDocument().equals(CKEDITOR.document)?this.$.focus():this.$.setActive()}catch(b){if(!CKEDITOR.env.ie)throw b;}CKEDITOR.env.safari&&
-!this.isInline()&&(a=CKEDITOR.document.getActive(),a.equals(this.getWindow().getFrame())||this.getWindow().focus())},on:function(a,b){var d=Array.prototype.slice.call(arguments,0);CKEDITOR.env.ie&&/^focus|blur$/.exec(a)&&(a="focus"==a?"focusin":"focusout",b=h(b,this),d[0]=a,d[1]=b);return CKEDITOR.dom.element.prototype.on.apply(this,d)},attachListener:function(a){!this._.listeners&&(this._.listeners=[]);var b=Array.prototype.slice.call(arguments,1),b=a.on.apply(a,b);this._.listeners.push(b);return b},
-clearListeners:function(){var a=this._.listeners;try{for(;a.length;)a.pop().removeListener()}catch(b){}},restoreAttrs:function(){var a=this._.attrChanges,b,d;for(d in a)a.hasOwnProperty(d)&&(b=a[d],null!==b?this.setAttribute(d,b):this.removeAttribute(d))},attachClass:function(a){var b=this.getCustomData("classes");this.hasClass(a)||(!b&&(b=[]),b.push(a),this.setCustomData("classes",b),this.addClass(a))},changeAttr:function(a,b){var d=this.getAttribute(a);b!==d&&(!this._.attrChanges&&(this._.attrChanges=
-{}),a in this._.attrChanges||(this._.attrChanges[a]=d),this.setAttribute(a,b))},insertText:function(a){this.editor.focus();this.insertHtml(this.transformPlainTextToHtml(a),"text")},transformPlainTextToHtml:function(a){var b=this.editor.getSelection().getStartElement().hasAscendant("pre",!0)?CKEDITOR.ENTER_BR:this.editor.activeEnterMode;return CKEDITOR.tools.transformPlainTextToHtml(a,b)},insertHtml:function(a,d,c){var g=this.editor;g.focus();g.fire("saveSnapshot");c||(c=g.getSelection().getRanges()[0]);
-n(this,d||"html",a,c);c.select();b(this);this.editor.fire("afterInsertHtml",{})},insertHtmlIntoRange:function(a,b,d){n(this,d||"html",a,b);this.editor.fire("afterInsertHtml",{intoRange:b})},insertElement:function(a,d){var c=this.editor;c.focus();c.fire("saveSnapshot");var g=c.activeEnterMode,c=c.getSelection(),h=a.getName(),h=CKEDITOR.dtd.$block[h];d||(d=c.getRanges()[0]);this.insertElementIntoRange(a,d)&&(d.moveToPosition(a,CKEDITOR.POSITION_AFTER_END),h&&((h=a.getNext(function(a){return e(a)&&!u(a)}))&&
-h.type==CKEDITOR.NODE_ELEMENT&&h.is(CKEDITOR.dtd.$block)?h.getDtd()["#"]?d.moveToElementEditStart(h):d.moveToElementEditEnd(a):h||g==CKEDITOR.ENTER_BR||(h=d.fixBlock(!0,g==CKEDITOR.ENTER_DIV?"div":"p"),d.moveToElementEditStart(h))));c.selectRanges([d]);b(this)},insertElementIntoSelection:function(a){this.insertElement(a)},insertElementIntoRange:function(a,b){var d=this.editor,c=d.config.enterMode,g=a.getName(),e=CKEDITOR.dtd.$block[g];if(b.checkReadOnly())return!1;b.deleteContents(1);b.startContainer.type==
-CKEDITOR.NODE_ELEMENT&&b.startContainer.is({tr:1,table:1,tbody:1,thead:1,tfoot:1})&&q(b);var h,f;if(e)for(;(h=b.getCommonAncestor(0,1))&&(f=CKEDITOR.dtd[h.getName()])&&(!f||!f[g]);)h.getName()in CKEDITOR.dtd.span?b.splitElement(h):b.checkStartOfBlock()&&b.checkEndOfBlock()?(b.setStartBefore(h),b.collapse(!0),h.remove()):b.splitBlock(c==CKEDITOR.ENTER_DIV?"div":"p",d.editable());b.insertNode(a);return!0},setData:function(a,b){b||(a=this.editor.dataProcessor.toHtml(a));this.setHtml(a);this.fixInitialSelection();
-"unloaded"==this.status&&(this.status="ready");this.editor.fire("dataReady")},getData:function(a){var b=this.getHtml();a||(b=this.editor.dataProcessor.toDataFormat(b));return b},setReadOnly:function(a){this.setAttribute("contenteditable",!a)},detach:function(){this.removeClass("cke_editable");this.status="detached";var a=this.editor;this._.detach();delete a.document;delete a.window},isInline:function(){return this.getDocument().equals(CKEDITOR.document)},fixInitialSelection:function(){function a(){var b=
-d.getDocument().$,c=b.getSelection(),g;a:if(c.anchorNode&&c.anchorNode==d.$)g=!0;else{if(CKEDITOR.env.webkit&&(g=d.getDocument().getActive())&&g.equals(d)&&!c.anchorNode){g=!0;break a}g=void 0}g&&(g=new CKEDITOR.dom.range(d),g.moveToElementEditStart(d),b=b.createRange(),b.setStart(g.startContainer.$,g.startOffset),b.collapse(!0),c.removeAllRanges(),c.addRange(b))}function b(){var a=d.getDocument().$,c=a.selection,g=d.getDocument().getActive();"None"==c.type&&g.equals(d)&&(c=new CKEDITOR.dom.range(d),
-a=a.body.createTextRange(),c.moveToElementEditStart(d),c=c.startContainer,c.type!=CKEDITOR.NODE_ELEMENT&&(c=c.getParent()),a.moveToElementText(c.$),a.collapse(!0),a.select())}var d=this;if(CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.quirks))this.hasFocus&&(this.focus(),b());else if(this.hasFocus)this.focus(),a();else this.once("focus",function(){a()},null,null,-999)},getHtmlFromRange:function(a){if(a.collapsed)return new CKEDITOR.dom.documentFragment(a.document);a={doc:this.getDocument(),
-range:a.clone()};x.eol.detect(a,this);x.bogus.exclude(a);x.cell.shrink(a);a.fragment=a.range.cloneContents();x.tree.rebuild(a,this);x.eol.fix(a,this);return new CKEDITOR.dom.documentFragment(a.fragment.$)},extractHtmlFromRange:function(a,b){var d=A,c={range:a,doc:a.document},g=this.getHtmlFromRange(a);if(a.collapsed)return a.optimize(),g;a.enlarge(CKEDITOR.ENLARGE_INLINE,1);d.table.detectPurge(c);c.bookmark=a.createBookmark();delete c.range;var e=this.editor.createRange();e.moveToPosition(c.bookmark.startNode,
-CKEDITOR.POSITION_BEFORE_START);c.targetBookmark=e.createBookmark();d.list.detectMerge(c,this);d.table.detectRanges(c,this);d.block.detectMerge(c,this);c.tableContentsRanges?(d.table.deleteRanges(c),a.moveToBookmark(c.bookmark),c.range=a):(a.moveToBookmark(c.bookmark),c.range=a,a.extractContents(d.detectExtractMerge(c)));a.moveToBookmark(c.targetBookmark);a.optimize();d.fixUneditableRangePosition(a);d.list.merge(c,this);d.table.purge(c,this);d.block.merge(c,this);if(b){d=a.startPath();if(c=a.checkStartOfBlock()&&
-a.checkEndOfBlock()&&d.block&&!a.root.equals(d.block)){a:{var c=d.block.getElementsByTag("span"),e=0,h;if(c)for(;h=c.getItem(e++);)if(!p(h)){c=!0;break a}c=!1}c=!c}c&&(a.moveToPosition(d.block,CKEDITOR.POSITION_BEFORE_START),d.block.remove())}else d.autoParagraph(this.editor,a),v(a.startContainer)&&a.startContainer.appendBogus();a.startContainer.mergeSiblings();return g},setup:function(){var a=this.editor;this.attachListener(a,"beforeGetData",function(){var b=this.getData();this.is("textarea")||!1!==
-a.config.ignoreEmptyParagraph&&(b=b.replace(t,function(a,b){return b}));a.setData(b,null,1)},this);this.attachListener(a,"getSnapshot",function(a){a.data=this.getData(1)},this);this.attachListener(a,"afterSetData",function(){this.setData(a.getData(1))},this);this.attachListener(a,"loadSnapshot",function(a){this.setData(a.data,1)},this);this.attachListener(a,"beforeFocus",function(){var b=a.getSelection();(b=b&&b.getNative())&&"Control"==b.type||this.focus()},this);this.attachListener(a,"insertHtml",
-function(a){this.insertHtml(a.data.dataValue,a.data.mode,a.data.range)},this);this.attachListener(a,"insertElement",function(a){this.insertElement(a.data)},this);this.attachListener(a,"insertText",function(a){this.insertText(a.data)},this);this.setReadOnly(a.readOnly);this.attachClass("cke_editable");a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?this.attachClass("cke_editable_inline"):a.elementMode!=CKEDITOR.ELEMENT_MODE_REPLACE&&a.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||this.attachClass("cke_editable_themed");
-this.attachClass("cke_contents_"+a.config.contentsLangDirection);a.keystrokeHandler.blockedKeystrokes[8]=+a.readOnly;a.keystrokeHandler.attach(this);this.on("blur",function(){this.hasFocus=!1},null,null,-1);this.on("focus",function(){this.hasFocus=!0},null,null,-1);if(CKEDITOR.env.webkit)this.on("scroll",function(){a._.previousScrollTop=a.editable().$.scrollTop},null,null,-1);if(CKEDITOR.env.edge&&14<CKEDITOR.env.version){var b=function(){var d=a.editable();null!=a._.previousScrollTop&&d.getDocument().equals(CKEDITOR.document)&&
-(d.$.scrollTop=a._.previousScrollTop,a._.previousScrollTop=null,this.removeListener("scroll",b))};this.on("scroll",b)}a.focusManager.add(this);this.equals(CKEDITOR.document.getActive())&&(this.hasFocus=!0,a.once("contentDom",function(){a.focusManager.focus(this)},this));this.isInline()&&this.changeAttr("tabindex",a.tabIndex);if(!this.is("textarea")){a.document=this.getDocument();a.window=this.getWindow();var h=a.document;this.changeAttr("spellcheck",!a.config.disableNativeSpellChecker);var f=a.config.contentsLangDirection;
-this.getDirection(1)!=f&&this.changeAttr("dir",f);var k=CKEDITOR.getCss();if(k){var f=h.getHead(),p=f.getCustomData("stylesheet");p?k!=p.getText()&&(CKEDITOR.env.ie&&9>CKEDITOR.env.version?p.$.styleSheet.cssText=k:p.setText(k)):(k=h.appendStyleText(k),k=new CKEDITOR.dom.element(k.ownerNode||k.owningElement),f.setCustomData("stylesheet",k),k.data("cke-temp",1))}f=h.getCustomData("stylesheet_ref")||0;h.setCustomData("stylesheet_ref",f+1);this.setCustomData("cke_includeReadonly",!a.config.disableReadonlyStyling);
-this.attachListener(this,"click",function(a){a=a.data;var b=(new CKEDITOR.dom.elementPath(a.getTarget(),this)).contains("a");b&&2!=a.$.button&&b.isReadOnly()&&a.preventDefault()});var l={8:1,46:1};this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var d=b.data.domEvent.getKey(),c;if(d in l){b=a.getSelection();var e,h=b.getRanges()[0],f=h.startPath(),k,p,r,d=8==d;CKEDITOR.env.ie&&11>CKEDITOR.env.version&&(e=b.getSelectedElement())||(e=m(b))?(a.fire("saveSnapshot"),h.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),
-e.remove(),h.select(),a.fire("saveSnapshot"),c=1):h.collapsed&&((k=f.block)&&(r=k[d?"getPrevious":"getNext"](g))&&r.type==CKEDITOR.NODE_ELEMENT&&r.is("table")&&h[d?"checkStartOfBlock":"checkEndOfBlock"]()?(a.fire("saveSnapshot"),h[d?"checkEndOfBlock":"checkStartOfBlock"]()&&k.remove(),h["moveToElementEdit"+(d?"End":"Start")](r),h.select(),a.fire("saveSnapshot"),c=1):f.blockLimit&&f.blockLimit.is("td")&&(p=f.blockLimit.getAscendant("table"))&&h.checkBoundaryOfElement(p,d?CKEDITOR.START:CKEDITOR.END)&&
-(r=p[d?"getPrevious":"getNext"](g))?(a.fire("saveSnapshot"),h["moveToElementEdit"+(d?"End":"Start")](r),h.checkStartOfBlock()&&h.checkEndOfBlock()?r.remove():h.select(),a.fire("saveSnapshot"),c=1):(p=f.contains(["td","th","caption"]))&&h.checkBoundaryOfElement(p,d?CKEDITOR.START:CKEDITOR.END)&&(c=1))}return!c});a.blockless&&CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller&&this.attachListener(this,"keyup",function(b){b.data.getKeystroke()in l&&!this.getFirst(e)&&(this.appendBogus(),b=a.createRange(),b.moveToPosition(this,
-CKEDITOR.POSITION_AFTER_START),b.select())});this.attachListener(this,"dblclick",function(b){if(a.readOnly)return!1;b={element:b.data.getTarget()};a.fire("doubleclick",b)});CKEDITOR.env.ie&&this.attachListener(this,"click",c);CKEDITOR.env.ie&&!CKEDITOR.env.edge||this.attachListener(this,"mousedown",function(b){var d=b.data.getTarget();d.is("img","hr","input","textarea","select")&&!d.isReadOnly()&&(a.getSelection().selectElement(d),d.is("input","textarea","select")&&b.data.preventDefault())});CKEDITOR.env.edge&&
-this.attachListener(this,"mouseup",function(b){(b=b.data.getTarget())&&b.is("img")&&a.getSelection().selectElement(b)});CKEDITOR.env.gecko&&this.attachListener(this,"mouseup",function(b){if(2==b.data.$.button&&(b=b.data.getTarget(),!b.getOuterHtml().replace(t,""))){var d=a.createRange();d.moveToElementEditStart(b);d.select(!0)}});CKEDITOR.env.webkit&&(this.attachListener(this,"click",function(a){a.data.getTarget().is("input","select")&&a.data.preventDefault()}),this.attachListener(this,"mouseup",
-function(a){a.data.getTarget().is("input","textarea")&&a.data.preventDefault()}));CKEDITOR.env.webkit&&this.attachListener(a,"key",function(b){if(a.readOnly)return!0;b=b.data.domEvent.getKey();if(b in l){var c=8==b,g=a.getSelection().getRanges()[0];b=g.startPath();if(g.collapsed)a:{var e=b.block;if(e&&g[c?"checkStartOfBlock":"checkEndOfBlock"]()&&g.moveToClosestEditablePosition(e,!c)&&g.collapsed){if(g.startContainer.type==CKEDITOR.NODE_ELEMENT){var h=g.startContainer.getChild(g.startOffset-(c?1:
-0));if(h&&h.type==CKEDITOR.NODE_ELEMENT&&h.is("hr")){a.fire("saveSnapshot");h.remove();b=!0;break a}}g=g.startPath().block;if(!g||g&&g.contains(e))b=void 0;else{a.fire("saveSnapshot");var f;(f=(c?g:e).getBogus())&&f.remove();f=a.getSelection();h=f.createBookmarks();(c?e:g).moveChildren(c?g:e,!1);b.lastElement.mergeSiblings();d(e,g,!c);f.selectBookmarks(h);b=!0}}else b=!1}else c=g,f=b.block,g=c.endPath().block,f&&g&&!f.equals(g)?(a.fire("saveSnapshot"),(e=f.getBogus())&&e.remove(),c.enlarge(CKEDITOR.ENLARGE_INLINE),
-c.deleteContents(),g.getParent()&&(g.moveChildren(f,!1),b.lastElement.mergeSiblings(),d(f,g,!0)),c=a.getSelection().getRanges()[0],c.collapse(1),c.optimize(),""===c.startContainer.getHtml()&&c.startContainer.appendBogus(),c.select(),b=!0):b=!1;if(!b)return;a.getSelection().scrollIntoView();a.fire("saveSnapshot");return!1}},this,null,100)}}},_:{detach:function(){this.editor.setData(this.editor.getData(),0,1);this.clearListeners();this.restoreAttrs();var a;if(a=this.removeCustomData("classes"))for(;a.length;)this.removeClass(a.pop());
-if(!this.is("textarea")){a=this.getDocument();var b=a.getHead();if(b.getCustomData("stylesheet")){var d=a.getCustomData("stylesheet_ref");--d?a.setCustomData("stylesheet_ref",d):(a.removeCustomData("stylesheet_ref"),b.removeCustomData("stylesheet").remove())}}this.editor.fire("contentDomUnload");delete this.editor}}});CKEDITOR.editor.prototype.editable=function(a){var b=this._.editable;if(b&&a)return 0;arguments.length&&(b=this._.editable=a?a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,
-a):(b&&b.detach(),null));return b};CKEDITOR.on("instanceLoaded",function(b){var d=b.editor;d.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&a.data("cke-editable",a.hasAttribute("contenteditable")?"true":"1"),a.setAttribute("contentEditable",!1))});d.on("selectionChange",function(b){if(!d.readOnly){var c=d.getSelection();c&&!c.isLocked&&(c=d.checkDirty(),d.fire("lockSnapshot"),a(b),d.fire("unlockSnapshot"),
-!c&&d.resetDirty())}})});CKEDITOR.on("instanceCreated",function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var d=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-label",d);d&&a.changeAttr("title",d);var c=b.fire("ariaEditorHelpLabel",{}).label;if(c&&(d=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":"contents"))){var g=CKEDITOR.tools.getNextId(),c=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+g+'" class\x3d"cke_voice_label"\x3e'+
-c+"\x3c/span\x3e");d.append(c);a.changeAttr("aria-describedby",g)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");g=CKEDITOR.dom.walker.whitespaces(!0);p=CKEDITOR.dom.walker.bookmark(!1,!0);v=CKEDITOR.dom.walker.empty();u=CKEDITOR.dom.walker.bogus();t=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;n=function(){function a(b){return b.type==
-CKEDITOR.NODE_ELEMENT}function b(d,c){var g,e,h,f,k=[],l=c.range.startContainer;g=c.range.startPath();for(var l=p[l.getName()],n=0,m=d.getChildren(),t=m.count(),q=-1,w=-1,B=0,x=g.contains(p.$list);n<t;++n)g=m.getItem(n),a(g)?(h=g.getName(),x&&h in CKEDITOR.dtd.$list?k=k.concat(b(g,c)):(f=!!l[h],"br"!=h||!g.data("cke-eol")||n&&n!=t-1||(B=(e=n?k[n-1].node:m.getItem(n+1))&&(!a(e)||!e.is("br")),e=e&&a(e)&&p.$block[e.getName()]),-1!=q||f||(q=n),f||(w=n),k.push({isElement:1,isLineBreak:B,isBlock:g.isBlockBoundary(),
-hasBlockSibling:e,node:g,name:h,allowed:f}),e=B=0)):k.push({isElement:0,node:g,allowed:1});-1<q&&(k[q].firstNotAllowed=1);-1<w&&(k[w].lastNotAllowed=1);return k}function d(b,c){var g=[],e=b.getChildren(),h=e.count(),f,k=0,l=p[c],n=!b.is(p.$inline)||b.is("br");for(n&&g.push(" ");k<h;k++)f=e.getItem(k),a(f)&&!f.is(l)?g=g.concat(d(f,c)):g.push(f);n&&g.push(" ");return g}function c(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function g(b){return b&&a(b)&&(b.is(p.$removeEmpty)||
-b.is("a")&&!b.isBlockBoundary())}function h(b,d,c,g){var e=b.clone(),f,k;e.setEndAt(d,CKEDITOR.POSITION_BEFORE_END);(f=(new CKEDITOR.dom.walker(e)).next())&&a(f)&&n[f.getName()]&&(k=f.getPrevious())&&a(k)&&!k.getParent().equals(b.startContainer)&&c.contains(k)&&g.contains(f)&&f.isIdentical(k)&&(f.moveChildren(k),f.remove(),h(b,d,c,g))}function f(b,d){function c(b,d){if(d.isBlock&&d.isElement&&!d.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var g=d.endContainer.getChild(d.endOffset),e=d.endContainer.getChild(d.endOffset-
-1);g&&c(g,b[b.length-1]);e&&c(e,b[0])&&(d.setEnd(d.endContainer,d.endOffset-1),d.collapse())}var p=CKEDITOR.dtd,n={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},m={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},t=CKEDITOR.tools.extend({},p.$inline);delete t.br;return function(n,q,I,x){var u=n.editor,v=!1;"unfiltered_html"==q&&(q="html",v=!0);if(!x.checkReadOnly()){var A=(new CKEDITOR.dom.elementPath(x.startContainer,x.root)).blockLimit||x.root;n={type:q,dontFilter:v,editable:n,
-editor:u,range:x,blockLimit:A,mergeCandidates:[],zombies:[]};q=n.range;x=n.mergeCandidates;var K,E;"text"==n.type&&q.shrink(CKEDITOR.SHRINK_ELEMENT,!0,!1)&&(K=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",q.document),q.insertNode(K),q.setStartAfter(K));v=new CKEDITOR.dom.elementPath(q.startContainer);n.endPath=A=new CKEDITOR.dom.elementPath(q.endContainer);if(!q.collapsed){var u=A.block||A.blockLimit,U=q.getCommonAncestor();u&&!u.equals(U)&&!u.contains(U)&&q.checkEndOfBlock()&&
-n.zombies.push(u);q.deleteContents()}for(;(E=c(q))&&a(E)&&E.isBlockBoundary()&&v.contains(E);)q.moveToPosition(E,CKEDITOR.POSITION_BEFORE_END);h(q,n.blockLimit,v,A);K&&(q.setEndBefore(K),q.collapse(),K.remove());K=q.startPath();if(u=K.contains(g,!1,1))q.splitElement(u),n.inlineStylesRoot=u,n.inlineStylesPeak=K.lastElement;K=q.createBookmark();(u=K.startNode.getPrevious(e))&&a(u)&&g(u)&&x.push(u);(u=K.startNode.getNext(e))&&a(u)&&g(u)&&x.push(u);for(u=K.startNode;(u=u.getParent())&&g(u);)x.push(u);
-q.moveToBookmark(K);if(K=I){K=n.range;if("text"==n.type&&n.inlineStylesRoot){E=n.inlineStylesPeak;q=E.getDocument().createText("{cke-peak}");for(x=n.inlineStylesRoot.getParent();!E.equals(x);)q=q.appendTo(E.clone()),E=E.getParent();I=q.getOuterHtml().split("{cke-peak}").join(I)}E=n.blockLimit.getName();if(/^\s+|\s+$/.test(I)&&"span"in CKEDITOR.dtd[E]){var S='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';I=S+I+S}I=n.editor.dataProcessor.toHtml(I,{context:null,fixForBody:!1,protectedWhitespaces:!!S,
-dontFilter:n.dontFilter,filter:n.editor.activeFilter,enterMode:n.editor.activeEnterMode});E=K.document.createElement("body");E.setHtml(I);S&&(E.getFirst().remove(),E.getLast().remove());if((S=K.startPath().block)&&(1!=S.getChildCount()||!S.getBogus()))a:{var J;if(1==E.getChildCount()&&a(J=E.getFirst())&&J.is(m)&&!J.hasAttribute("contenteditable")){S=J.getElementsByTag("*");K=0;for(x=S.count();K<x;K++)if(q=S.getItem(K),!q.is(t))break a;J.moveChildren(J.getParent(1));J.remove()}}n.dataWrapper=E;K=I}if(K){J=
-n.range;K=J.document;var H;E=n.blockLimit;x=0;var V,S=[],T,Z;I=u=0;var X,da;q=J.startContainer;var v=n.endPath.elements[0],aa,A=v.getPosition(q),U=!!v.getCommonAncestor(q)&&A!=CKEDITOR.POSITION_IDENTICAL&&!(A&CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED);q=b(n.dataWrapper,n);for(f(q,J);x<q.length;x++){A=q[x];if(H=A.isLineBreak){H=J;X=E;var Y=void 0,fa=void 0;A.hasBlockSibling?H=1:(Y=H.startContainer.getAscendant(p.$block,1))&&Y.is({div:1,p:1})?(fa=Y.getPosition(X),fa==CKEDITOR.POSITION_IDENTICAL||
-fa==CKEDITOR.POSITION_CONTAINS?H=0:(X=H.splitElement(Y),H.moveToPosition(X,CKEDITOR.POSITION_AFTER_START),H=1)):H=0}if(H)I=0<x;else{H=J.startPath();!A.isBlock&&l(n.editor,H.block,H.blockLimit)&&(Z=k(n.editor))&&(Z=K.createElement(Z),Z.appendBogus(),J.insertNode(Z),CKEDITOR.env.needsBrFiller&&(V=Z.getBogus())&&V.remove(),J.moveToPosition(Z,CKEDITOR.POSITION_BEFORE_END));if((H=J.startPath().block)&&!H.equals(T)){if(V=H.getBogus())V.remove(),S.push(H);T=H}A.firstNotAllowed&&(u=1);if(u&&A.isElement){H=
-J.startContainer;for(X=null;H&&!p[H.getName()][A.name];){if(H.equals(E)){H=null;break}X=H;H=H.getParent()}if(H)X&&(da=J.splitElement(X),n.zombies.push(da),n.zombies.push(X));else{X=E.getName();aa=!x;H=x==q.length-1;X=d(A.node,X);for(var Y=[],fa=X.length,ca=0,ea=void 0,ha=0,ia=-1;ca<fa;ca++)ea=X[ca]," "==ea?(ha||aa&&!ca||(Y.push(new CKEDITOR.dom.text(" ")),ia=Y.length),ha=1):(Y.push(ea),ha=0);H&&ia==Y.length&&Y.pop();aa=Y}}if(aa){for(;H=aa.pop();)J.insertNode(H);aa=0}else J.insertNode(A.node);A.lastNotAllowed&&
-x<q.length-1&&((da=U?v:da)&&J.setEndAt(da,CKEDITOR.POSITION_AFTER_START),u=0);J.collapse()}}1!=q.length?V=!1:(V=q[0],V=V.isElement&&"false"==V.node.getAttribute("contenteditable"));V&&(I=!0,H=q[0].node,J.setStartAt(H,CKEDITOR.POSITION_BEFORE_START),J.setEndAt(H,CKEDITOR.POSITION_AFTER_END));n.dontMoveCaret=I;n.bogusNeededBlocks=S}V=n.range;var ba;da=n.bogusNeededBlocks;for(aa=V.createBookmark();T=n.zombies.pop();)T.getParent()&&(Z=V.clone(),Z.moveToElementEditStart(T),Z.removeEmptyBlocksAtEnd());
-if(da)for(;T=da.pop();)CKEDITOR.env.needsBrFiller?T.appendBogus():T.append(V.document.createText(" "));for(;T=n.mergeCandidates.pop();)T.mergeSiblings();V.moveToBookmark(aa);if(!n.dontMoveCaret){for(T=c(V);T&&a(T)&&!T.is(p.$empty);){if(T.isBlockBoundary())V.moveToPosition(T,CKEDITOR.POSITION_BEFORE_END);else{if(g(T)&&T.getHtml().match(/(\s|&nbsp;)$/g)){ba=null;break}ba=V.clone();ba.moveToPosition(T,CKEDITOR.POSITION_BEFORE_END)}T=T.getLast(e)}ba&&V.moveToRange(ba)}}}}();q=function(){function a(b){b=
-new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT};return b}function b(a,d,c){d=a.getDocument().createElement(d);a.append(d,c);return d}function d(a){var b=a.count(),c;for(b;0<b--;)c=a.getItem(b),CKEDITOR.tools.trim(c.getHtml())||(c.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&c.getChildCount()&&c.getFirst().remove())}return function(c){var g=
-c.startContainer,e=g.getAscendant("table",1),h=!1;d(e.getElementsByTag("td"));d(e.getElementsByTag("th"));e=c.clone();e.setStart(g,0);e=a(e).lastBackward();e||(e=c.clone(),e.setEndAt(g,CKEDITOR.POSITION_BEFORE_END),e=a(e).lastForward(),h=!0);e||(e=g);e.is("table")?(c.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),c.collapse(!0),e.remove()):(e.is({tbody:1,thead:1,tfoot:1})&&(e=b(e,"tr",h)),e.is("tr")&&(e=b(e,e.getParent().is("thead")?"th":"td",h)),(g=e.getBogus())&&g.remove(),c.moveToPosition(e,h?CKEDITOR.POSITION_AFTER_START:
-CKEDITOR.POSITION_BEFORE_END))}}();x={eol:{detect:function(a,b){var d=a.range,c=d.clone(),g=d.clone(),e=new CKEDITOR.dom.elementPath(d.startContainer,b),h=new CKEDITOR.dom.elementPath(d.endContainer,b);c.collapse(1);g.collapse();e.block&&c.checkBoundaryOfElement(e.block,CKEDITOR.END)&&(d.setStartAfter(e.block),a.prependEolBr=1);h.block&&g.checkBoundaryOfElement(h.block,CKEDITOR.START)&&(d.setEndBefore(h.block),a.appendEolBr=1)},fix:function(a,b){var d=b.getDocument(),c;a.appendEolBr&&(c=this.createEolBr(d),
-a.fragment.append(c));!a.prependEolBr||c&&!c.getPrevious()||a.fragment.append(this.createEolBr(d),1)},createEolBr:function(a){return a.createElement("br",{attributes:{"data-cke-eol":1}})}},bogus:{exclude:function(a){var b=a.range.getBoundaryNodes(),d=b.startNode,b=b.endNode;!b||!u(b)||d&&d.equals(b)||a.range.setEndBefore(b)}},tree:{rebuild:function(a,b){var d=a.range,c=d.getCommonAncestor(),g=new CKEDITOR.dom.elementPath(c,b),e=new CKEDITOR.dom.elementPath(d.startContainer,b),d=new CKEDITOR.dom.elementPath(d.endContainer,
-b),h;c.type==CKEDITOR.NODE_TEXT&&(c=c.getParent());if(g.blockLimit.is({tr:1,table:1})){var f=g.contains("table").getParent();h=function(a){return!a.equals(f)}}else if(g.block&&g.block.is(CKEDITOR.dtd.$listItem)&&(e=e.contains(CKEDITOR.dtd.$list),d=d.contains(CKEDITOR.dtd.$list),!e.equals(d))){var k=g.contains(CKEDITOR.dtd.$list).getParent();h=function(a){return!a.equals(k)}}h||(h=function(a){return!a.equals(g.block)&&!a.equals(g.blockLimit)});this.rebuildFragment(a,b,c,h)},rebuildFragment:function(a,
-b,d,c){for(var g;d&&!d.equals(b)&&c(d);)g=d.clone(0,1),a.fragment.appendTo(g),a.fragment=g,d=d.getParent()}},cell:{shrink:function(a){a=a.range;var b=a.startContainer,d=a.endContainer,c=a.startOffset,g=a.endOffset;b.type==CKEDITOR.NODE_ELEMENT&&b.equals(d)&&b.is("tr")&&++c==g&&a.shrink(CKEDITOR.SHRINK_TEXT)}}};A=function(){function a(b,d){var c=b.getParent();if(c.is(CKEDITOR.dtd.$inline))b[d?"insertBefore":"insertAfter"](c)}function b(d,c,g){a(c);a(g,1);for(var e;e=g.getNext();)e.insertAfter(c),c=
-e;v(d)&&d.remove()}function d(a,b){var c=new CKEDITOR.dom.range(a);c.setStartAfter(b.startNode);c.setEndBefore(b.endNode);return c}return{list:{detectMerge:function(a,b){var c=d(b,a.bookmark),g=c.startPath(),e=c.endPath(),h=g.contains(CKEDITOR.dtd.$list),f=e.contains(CKEDITOR.dtd.$list);a.mergeList=h&&f&&h.getParent().equals(f.getParent())&&!h.equals(f);a.mergeListItems=g.block&&e.block&&g.block.is(CKEDITOR.dtd.$listItem)&&e.block.is(CKEDITOR.dtd.$listItem);if(a.mergeList||a.mergeListItems)c=c.clone(),
-c.setStartBefore(a.bookmark.startNode),c.setEndAfter(a.bookmark.endNode),a.mergeListBookmark=c.createBookmark()},merge:function(a,d){if(a.mergeListBookmark){var c=a.mergeListBookmark.startNode,g=a.mergeListBookmark.endNode,e=new CKEDITOR.dom.elementPath(c,d),h=new CKEDITOR.dom.elementPath(g,d);if(a.mergeList){var f=e.contains(CKEDITOR.dtd.$list),k=h.contains(CKEDITOR.dtd.$list);f.equals(k)||(k.moveChildren(f),k.remove())}a.mergeListItems&&(e=e.contains(CKEDITOR.dtd.$listItem),h=h.contains(CKEDITOR.dtd.$listItem),
-e.equals(h)||b(h,c,g));c.remove();g.remove()}}},block:{detectMerge:function(a,b){if(!a.tableContentsRanges&&!a.mergeListBookmark){var d=new CKEDITOR.dom.range(b);d.setStartBefore(a.bookmark.startNode);d.setEndAfter(a.bookmark.endNode);a.mergeBlockBookmark=d.createBookmark()}},merge:function(a,d){if(a.mergeBlockBookmark&&!a.purgeTableBookmark){var c=a.mergeBlockBookmark.startNode,g=a.mergeBlockBookmark.endNode,e=new CKEDITOR.dom.elementPath(c,d),h=new CKEDITOR.dom.elementPath(g,d),e=e.block,h=h.block;
-e&&h&&!e.equals(h)&&b(h,c,g);c.remove();g.remove()}}},table:function(){function a(d){var g=[],e,h=new CKEDITOR.dom.walker(d),f=d.startPath().contains(c),k=d.endPath().contains(c),p={};h.guard=function(a,h){if(a.type==CKEDITOR.NODE_ELEMENT){var n="visited_"+(h?"out":"in");if(a.getCustomData(n))return;CKEDITOR.dom.element.setMarker(p,a,n,1)}if(h&&f&&a.equals(f))e=d.clone(),e.setEndAt(f,CKEDITOR.POSITION_BEFORE_END),g.push(e);else if(!h&&k&&a.equals(k))e=d.clone(),e.setStartAt(k,CKEDITOR.POSITION_AFTER_START),
-g.push(e);else{if(n=!h)n=a.type==CKEDITOR.NODE_ELEMENT&&a.is(c)&&(!f||b(a,f))&&(!k||b(a,k));n&&(e=d.clone(),e.selectNodeContents(a),g.push(e))}};h.lastForward();CKEDITOR.dom.element.clearAllMarkers(p);return g}function b(a,d){var c=CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED,g=a.getPosition(d);return g===CKEDITOR.POSITION_IDENTICAL?!1:0===(g&c)}var c={td:1,th:1,caption:1};return{detectPurge:function(a){var b=a.range,d=b.clone();d.enlarge(CKEDITOR.ENLARGE_ELEMENT);var d=new CKEDITOR.dom.walker(d),
-g=0;d.evaluator=function(a){a.type==CKEDITOR.NODE_ELEMENT&&a.is(c)&&++g};d.checkForward();if(1<g){var d=b.startPath().contains("table"),e=b.endPath().contains("table");d&&e&&b.checkBoundaryOfElement(d,CKEDITOR.START)&&b.checkBoundaryOfElement(e,CKEDITOR.END)&&(b=a.range.clone(),b.setStartBefore(d),b.setEndAfter(e),a.purgeTableBookmark=b.createBookmark())}},detectRanges:function(g,e){var h=d(e,g.bookmark),f=h.clone(),k,p,n=h.getCommonAncestor();n.is(CKEDITOR.dtd.$tableContent)&&!n.is(c)&&(n=n.getAscendant("table",
-!0));p=n;n=new CKEDITOR.dom.elementPath(h.startContainer,p);p=new CKEDITOR.dom.elementPath(h.endContainer,p);n=n.contains("table");p=p.contains("table");if(n||p)n&&p&&b(n,p)?(g.tableSurroundingRange=f,f.setStartAt(n,CKEDITOR.POSITION_AFTER_END),f.setEndAt(p,CKEDITOR.POSITION_BEFORE_START),f=h.clone(),f.setEndAt(n,CKEDITOR.POSITION_AFTER_END),k=h.clone(),k.setStartAt(p,CKEDITOR.POSITION_BEFORE_START),k=a(f).concat(a(k))):n?p||(g.tableSurroundingRange=f,f.setStartAt(n,CKEDITOR.POSITION_AFTER_END),h.setEndAt(n,
-CKEDITOR.POSITION_AFTER_END)):(g.tableSurroundingRange=f,f.setEndAt(p,CKEDITOR.POSITION_BEFORE_START),h.setStartAt(p,CKEDITOR.POSITION_AFTER_START)),g.tableContentsRanges=k?k:a(h)},deleteRanges:function(a){for(var b;b=a.tableContentsRanges.pop();)b.extractContents(),v(b.startContainer)&&b.startContainer.appendBogus();a.tableSurroundingRange&&a.tableSurroundingRange.extractContents()},purge:function(a){if(a.purgeTableBookmark){var b=a.doc,d=a.range.clone(),b=b.createElement("p");b.insertBefore(a.purgeTableBookmark.startNode);
-d.moveToBookmark(a.purgeTableBookmark);d.deleteContents();a.range.moveToPosition(b,CKEDITOR.POSITION_AFTER_START)}}}}(),detectExtractMerge:function(a){return!(a.range.startPath().contains(CKEDITOR.dtd.$listItem)&&a.range.endPath().contains(CKEDITOR.dtd.$listItem))},fixUneditableRangePosition:function(a){a.startContainer.getDtd()["#"]||a.moveToClosestEditablePosition(null,!0)},autoParagraph:function(a,b){var d=b.startPath(),c;l(a,d.block,d.blockLimit)&&(c=k(a))&&(c=b.document.createElement(c),c.appendBogus(),
-b.insertNode(c),b.moveToPosition(c,CKEDITOR.POSITION_AFTER_START))}}}()}(),function(){function a(){var a=this._.fakeSelection,b;a&&(b=this.getSelection(1),b&&b.isHidden()||(a.reset(),a=0));if(!a&&(a=b||this.getSelection(1),!a||a.getType()==CKEDITOR.SELECTION_NONE))return;this.fire("selectionCheck",a);b=this.elementPath();if(!b.compare(this._.selectionPreviousPath)){var d=this._.selectionPreviousPath&&this._.selectionPreviousPath.blockLimit.equals(b.blockLimit);CKEDITOR.env.webkit&&!d&&(this._.previousActive=
-this.document.getActive());this._.selectionPreviousPath=b;this.fire("selectionChange",{selection:a,path:b})}}function f(){q=!0;n||(c.call(this),n=CKEDITOR.tools.setTimeout(c,200,this))}function c(){n=null;q&&(CKEDITOR.tools.setTimeout(a,0,this),q=!1)}function e(a){return x(a)||a.type==CKEDITOR.NODE_ELEMENT&&!a.is(CKEDITOR.dtd.$empty)?!0:!1}function h(a){function b(d,c){return d&&d.type!=CKEDITOR.NODE_TEXT?a.clone()["moveToElementEdit"+(c?"End":"Start")](d):!1}if(!(a.root instanceof CKEDITOR.editable))return!1;
-var d=a.startContainer,c=a.getPreviousNode(e,null,d),g=a.getNextNode(e,null,d);return b(c)||b(g,1)||!(c||g||d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()&&d.getBogus())?!0:!1}function m(a){l(a,!1);var b=a.getDocument().createText(u);a.setCustomData("cke-fillingChar",b);return b}function l(a,b){var d=a&&a.removeCustomData("cke-fillingChar");if(d){if(!1!==b){var c=a.getDocument().getSelection().getNative(),g=c&&"None"!=c.type&&c.getRangeAt(0),e=u.length;if(d.getLength()>e&&g&&g.intersectsNode(d.$)){var h=
-[{node:c.anchorNode,offset:c.anchorOffset},{node:c.focusNode,offset:c.focusOffset}];c.anchorNode==d.$&&c.anchorOffset>e&&(h[0].offset-=e);c.focusNode==d.$&&c.focusOffset>e&&(h[1].offset-=e)}}d.setText(k(d.getText(),1));h&&(d=a.getDocument().$,c=d.getSelection(),d=d.createRange(),d.setStart(h[0].node,h[0].offset),d.collapse(!0),c.removeAllRanges(),c.addRange(d),c.extend(h[1].node,h[1].offset))}}function k(a,b){return b?a.replace(t,function(a,b){return b?" ":""}):a.replace(u,"")}function b(a,b){var d=
-CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-hidden-sel\x3d"1" data-cke-temp\x3d"1" style\x3d"'+(CKEDITOR.env.ie&&14>CKEDITOR.env.version?"display:none":"position:fixed;top:0;left:-1000px")+'"\x3e'+(b||"\x26nbsp;")+"\x3c/div\x3e",a.document);a.fire("lockSnapshot");a.editable().append(d);var c=a.getSelection(1),g=a.createRange(),e=c.root.on("selectionchange",function(a){a.cancel()},null,null,0);g.setStartAt(d,CKEDITOR.POSITION_AFTER_START);g.setEndAt(d,CKEDITOR.POSITION_BEFORE_END);c.selectRanges([g]);
-e.removeListener();a.fire("unlockSnapshot");a._.hiddenSelectionContainer=d}function d(a){var b={37:1,39:1,8:1,46:1};return function(d){var c=d.data.getKeystroke();if(b[c]){var g=a.getSelection().getRanges(),e=g[0];1==g.length&&e.collapsed&&(c=e[38>c?"getPreviousEditableNode":"getNextEditableNode"]())&&c.type==CKEDITOR.NODE_ELEMENT&&"false"==c.getAttribute("contenteditable")&&(a.getSelection().fake(c),d.data.preventDefault(),d.cancel())}}}function g(a){for(var b=0;b<a.length;b++){var d=a[b];d.getCommonAncestor().isReadOnly()&&
-a.splice(b,1);if(!d.collapsed){if(d.startContainer.isReadOnly())for(var c=d.startContainer,g;c&&!((g=c.type==CKEDITOR.NODE_ELEMENT)&&c.is("body")||!c.isReadOnly());)g&&"false"==c.getAttribute("contentEditable")&&d.setStartAfter(c),c=c.getParent();c=d.startContainer;g=d.endContainer;var e=d.startOffset,h=d.endOffset,f=d.clone();c&&c.type==CKEDITOR.NODE_TEXT&&(e>=c.getLength()?f.setStartAfter(c):f.setStartBefore(c));g&&g.type==CKEDITOR.NODE_TEXT&&(h?f.setEndAfter(g):f.setEndBefore(g));c=new CKEDITOR.dom.walker(f);
-c.evaluator=function(c){if(c.type==CKEDITOR.NODE_ELEMENT&&c.isReadOnly()){var g=d.clone();d.setEndBefore(c);d.collapsed&&a.splice(b--,1);c.getPosition(f.endContainer)&CKEDITOR.POSITION_CONTAINS||(g.setStartAfter(c),g.collapsed||a.splice(b+1,0,g));return!0}return!1};c.next()}}return a}var p="function"!=typeof window.getSelection,v=1,u=CKEDITOR.tools.repeat("​",7),t=new RegExp(u+"( )?","g"),n,q,x=CKEDITOR.dom.walker.invisible(1),A=function(){function a(b){return function(a){var d=a.editor.createRange();
-d.moveToClosestEditablePosition(a.selected,b)&&a.editor.getSelection().selectRanges([d]);return!1}}function b(a){return function(b){var d=b.editor,c=d.createRange(),g;(g=c.moveToClosestEditablePosition(b.selected,a))||(g=c.moveToClosestEditablePosition(b.selected,!a));g&&d.getSelection().selectRanges([c]);d.fire("saveSnapshot");b.selected.remove();g||(c.moveToElementEditablePosition(d.editable()),d.getSelection().selectRanges([c]));d.fire("saveSnapshot");return!1}}var d=a(),c=a(1);return{37:d,38:d,
-39:c,40:c,8:b(),46:b(1)}}();CKEDITOR.on("instanceCreated",function(b){function c(){var a=g.getSelection();a&&a.removeAllRanges()}var g=b.editor;g.on("contentDom",function(){function b(){t=new CKEDITOR.dom.selection(g.getSelection());t.lock()}function c(){h.removeListener("mouseup",c);m.removeListener("mouseup",c);var a=CKEDITOR.document.$.selection,b=a.createRange();"None"!=a.type&&b.parentElement().ownerDocument==e.$&&b.select()}var e=g.document,h=CKEDITOR.document,k=g.editable(),n=e.getBody(),m=
-e.getDocumentElement(),r=k.isInline(),q,t;CKEDITOR.env.gecko&&k.attachListener(k,"focus",function(a){a.removeListener();0!==q&&(a=g.getSelection().getNative())&&a.isCollapsed&&a.anchorNode==k.$&&(a=g.createRange(),a.moveToElementEditStart(k),a.select())},null,null,-2);k.attachListener(k,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){q&&CKEDITOR.env.webkit&&(q=g._.previousActive&&g._.previousActive.equals(e.getActive()))&&null!=g._.previousScrollTop&&g._.previousScrollTop!=k.$.scrollTop&&(k.$.scrollTop=
-g._.previousScrollTop);g.unlockSelection(q);q=0},null,null,-1);k.attachListener(k,"mousedown",function(){q=0});if(CKEDITOR.env.ie||r)p?k.attachListener(k,"beforedeactivate",b,null,null,-1):k.attachListener(g,"selectionCheck",b,null,null,-1),k.attachListener(k,CKEDITOR.env.webkit?"DOMFocusOut":"blur",function(){g.lockSelection(t);q=1},null,null,-1),k.attachListener(k,"mousedown",function(){q=0});if(CKEDITOR.env.ie&&!r){var x;k.attachListener(k,"mousedown",function(a){2==a.data.$.button&&((a=g.document.getSelection())&&
-a.getType()!=CKEDITOR.SELECTION_NONE||(x=g.window.getScrollPosition()))});k.attachListener(k,"mouseup",function(a){2==a.data.$.button&&x&&(g.document.$.documentElement.scrollLeft=x.x,g.document.$.documentElement.scrollTop=x.y);x=null});if("BackCompat"!=e.$.compatMode){if(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat){var u,v;m.on("mousedown",function(a){function b(a){a=a.data.$;if(u){var d=n.$.createTextRange();try{d.moveToPoint(a.clientX,a.clientY)}catch(c){}u.setEndPoint(0>v.compareEndPoints("StartToStart",
-d)?"EndToEnd":"StartToStart",d);u.select()}}function d(){m.removeListener("mousemove",b);h.removeListener("mouseup",d);m.removeListener("mouseup",d);u.select()}a=a.data;if(a.getTarget().is("html")&&a.$.y<m.$.clientHeight&&a.$.x<m.$.clientWidth){u=n.$.createTextRange();try{u.moveToPoint(a.$.clientX,a.$.clientY)}catch(c){}v=u.duplicate();m.on("mousemove",b);h.on("mouseup",d);m.on("mouseup",d)}})}if(7<CKEDITOR.env.version&&11>CKEDITOR.env.version)m.on("mousedown",function(a){a.data.getTarget().is("html")&&
-(h.on("mouseup",c),m.on("mouseup",c))})}}k.attachListener(k,"selectionchange",a,g);k.attachListener(k,"keyup",f,g);k.attachListener(k,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){g.forceNextSelectionCheck();g.selectionChange(1)});if(r&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){var w;k.attachListener(k,"mousedown",function(){w=1});k.attachListener(e.getDocumentElement(),"mouseup",function(){w&&f.call(g);w=0})}else k.attachListener(CKEDITOR.env.ie?k:e.getDocumentElement(),"mouseup",f,g);CKEDITOR.env.webkit&&
-k.attachListener(e,"keydown",function(a){switch(a.data.getKey()){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:l(k)}},null,null,-1);k.attachListener(k,"keydown",d(g),null,null,-1)});g.on("setData",function(){g.unlockSelection();CKEDITOR.env.webkit&&c()});g.on("contentDomUnload",function(){g.unlockSelection()});if(CKEDITOR.env.ie9Compat)g.on("beforeDestroy",c,null,null,9);g.on("dataReady",function(){delete g._.fakeSelection;delete g._.hiddenSelectionContainer;g.selectionChange(1)});
-g.on("loadSnapshot",function(){var a=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT),b=g.editable().getLast(a);b&&b.hasAttribute("data-cke-hidden-sel")&&(b.remove(),CKEDITOR.env.gecko&&(a=g.editable().getFirst(a))&&a.is("br")&&a.getAttribute("_moz_editor_bogus_node")&&a.remove())},null,null,100);g.on("key",function(a){if("wysiwyg"==g.mode){var b=g.getSelection();if(b.isFake){var d=A[a.data.keyCode];if(d)return d({editor:g,selected:b.getSelectedElement(),selection:b,keyEvent:a})}}})});if(CKEDITOR.env.webkit)CKEDITOR.on("instanceReady",
-function(a){var b=a.editor;b.on("selectionChange",function(){var a=b.editable(),d=a.getCustomData("cke-fillingChar");d&&(d.getCustomData("ready")?l(a):d.setCustomData("ready",1))},null,null,-1);b.on("beforeSetMode",function(){l(b.editable())},null,null,-1);b.on("getSnapshot",function(a){a.data&&(a.data=k(a.data))},b,null,20);b.on("toDataFormat",function(a){a.data.dataValue=k(a.data.dataValue)},null,null,0)});CKEDITOR.editor.prototype.selectionChange=function(b){(b?a:f).call(this)};CKEDITOR.editor.prototype.getSelection=
-function(a){return!this._.savedSelection&&!this._.fakeSelection||a?(a=this.editable())&&"wysiwyg"==this.mode?new CKEDITOR.dom.selection(a):null:this._.savedSelection||this._.fakeSelection};CKEDITOR.editor.prototype.lockSelection=function(a){a=a||this.getSelection(1);return a.getType()!=CKEDITOR.SELECTION_NONE?(!a.isLocked&&a.lock(),this._.savedSelection=a,!0):!1};CKEDITOR.editor.prototype.unlockSelection=function(a){var b=this._.savedSelection;return b?(b.unlock(a),delete this._.savedSelection,!0):
-!1};CKEDITOR.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath};CKEDITOR.dom.document.prototype.getSelection=function(){return new CKEDITOR.dom.selection(this)};CKEDITOR.dom.range.prototype.select=function(){var a=this.root instanceof CKEDITOR.editable?this.root.editor.getSelection():new CKEDITOR.dom.selection(this.root);a.selectRanges([this]);return a};CKEDITOR.SELECTION_NONE=1;CKEDITOR.SELECTION_TEXT=2;CKEDITOR.SELECTION_ELEMENT=3;CKEDITOR.dom.selection=function(a){if(a instanceof
-CKEDITOR.dom.selection){var b=a;a=a.root}var d=a instanceof CKEDITOR.dom.element;this.rev=b?b.rev:v++;this.document=a instanceof CKEDITOR.dom.document?a:a.getDocument();this.root=d?a:this.document.getBody();this.isLocked=0;this._={cache:{}};if(b)return CKEDITOR.tools.extend(this._.cache,b._.cache),this.isFake=b.isFake,this.isLocked=b.isLocked,this;a=this.getNative();var c,g;if(a)if(a.getRangeAt)c=(g=a.rangeCount&&a.getRangeAt(0))&&new CKEDITOR.dom.node(g.commonAncestorContainer);else{try{g=a.createRange()}catch(e){}c=
-g&&CKEDITOR.dom.element.get(g.item&&g.item(0)||g.parentElement())}if(!c||c.type!=CKEDITOR.NODE_ELEMENT&&c.type!=CKEDITOR.NODE_TEXT||!this.root.equals(c)&&!this.root.contains(c))this._.cache.type=CKEDITOR.SELECTION_NONE,this._.cache.startElement=null,this._.cache.selectedElement=null,this._.cache.selectedText="",this._.cache.ranges=new CKEDITOR.dom.rangeList;return this};var C={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,
-thead:1,tfoot:1};CKEDITOR.tools.extend(CKEDITOR.dom.selection,{_removeFillingCharSequenceString:k,_createFillingCharSequenceNode:m,FILLING_CHAR_SEQUENCE:u});CKEDITOR.dom.selection.prototype={getNative:function(){return void 0!==this._.cache.nativeSel?this._.cache.nativeSel:this._.cache.nativeSel=p?this.document.$.selection:this.document.getWindow().$.getSelection()},getType:p?function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_NONE;try{var d=this.getNative(),c=d.type;"Text"==
-c&&(b=CKEDITOR.SELECTION_TEXT);"Control"==c&&(b=CKEDITOR.SELECTION_ELEMENT);d.createRange().parentElement()&&(b=CKEDITOR.SELECTION_TEXT)}catch(g){}return a.type=b}:function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_TEXT,d=this.getNative();if(!d||!d.rangeCount)b=CKEDITOR.SELECTION_NONE;else if(1==d.rangeCount){var d=d.getRangeAt(0),c=d.startContainer;c==d.endContainer&&1==c.nodeType&&1==d.endOffset-d.startOffset&&C[c.childNodes[d.startOffset].nodeName.toLowerCase()]&&(b=
-CKEDITOR.SELECTION_ELEMENT)}return a.type=b},getRanges:function(){var a=p?function(){function a(b){return(new CKEDITOR.dom.node(b)).getIndex()}var b=function(b,d){b=b.duplicate();b.collapse(d);var c=b.parentElement();if(!c.hasChildNodes())return{container:c,offset:0};for(var g=c.children,e,h,f=b.duplicate(),k=0,p=g.length-1,n=-1,l,m;k<=p;)if(n=Math.floor((k+p)/2),e=g[n],f.moveToElementText(e),l=f.compareEndPoints("StartToStart",b),0<l)p=n-1;else if(0>l)k=n+1;else return{container:c,offset:a(e)};if(-1==
-n||n==g.length-1&&0>l){f.moveToElementText(c);f.setEndPoint("StartToStart",b);f=f.text.replace(/(\r\n|\r)/g,"\n").length;g=c.childNodes;if(!f)return e=g[g.length-1],e.nodeType!=CKEDITOR.NODE_TEXT?{container:c,offset:g.length}:{container:e,offset:e.nodeValue.length};for(c=g.length;0<f&&0<c;)h=g[--c],h.nodeType==CKEDITOR.NODE_TEXT&&(m=h,f-=h.nodeValue.length);return{container:m,offset:-f}}f.collapse(0<l?!0:!1);f.setEndPoint(0<l?"StartToStart":"EndToStart",b);f=f.text.replace(/(\r\n|\r)/g,"\n").length;
-if(!f)return{container:c,offset:a(e)+(0<l?0:1)};for(;0<f;)try{h=e[0<l?"previousSibling":"nextSibling"],h.nodeType==CKEDITOR.NODE_TEXT&&(f-=h.nodeValue.length,m=h),e=h}catch(q){return{container:c,offset:a(e)}}return{container:m,offset:0<l?-f:m.nodeValue.length+f}};return function(){var a=this.getNative(),d=a&&a.createRange(),c=this.getType();if(!a)return[];if(c==CKEDITOR.SELECTION_TEXT)return a=new CKEDITOR.dom.range(this.root),c=b(d,!0),a.setStart(new CKEDITOR.dom.node(c.container),c.offset),c=b(d),
-a.setEnd(new CKEDITOR.dom.node(c.container),c.offset),a.endContainer.getPosition(a.startContainer)&CKEDITOR.POSITION_PRECEDING&&a.endOffset<=a.startContainer.getIndex()&&a.collapse(),[a];if(c==CKEDITOR.SELECTION_ELEMENT){for(var c=[],g=0;g<d.length;g++){for(var e=d.item(g),h=e.parentNode,f=0,a=new CKEDITOR.dom.range(this.root);f<h.childNodes.length&&h.childNodes[f]!=e;f++);a.setStart(new CKEDITOR.dom.node(h),f);a.setEnd(new CKEDITOR.dom.node(h),f+1);c.push(a)}return c}return[]}}():function(){var a=
-[],b,d=this.getNative();if(!d)return a;for(var c=0;c<d.rangeCount;c++){var g=d.getRangeAt(c);b=new CKEDITOR.dom.range(this.root);b.setStart(new CKEDITOR.dom.node(g.startContainer),g.startOffset);b.setEnd(new CKEDITOR.dom.node(g.endContainer),g.endOffset);a.push(b)}return a};return function(b){var d=this._.cache,c=d.ranges;c||(d.ranges=c=new CKEDITOR.dom.rangeList(a.call(this)));return b?g(new CKEDITOR.dom.rangeList(c.slice())):c}}(),getStartElement:function(){var a=this._.cache;if(void 0!==a.startElement)return a.startElement;
-var b;switch(this.getType()){case CKEDITOR.SELECTION_ELEMENT:return this.getSelectedElement();case CKEDITOR.SELECTION_TEXT:var d=this.getRanges()[0];if(d){if(d.collapsed)b=d.startContainer,b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());else{for(d.optimize();b=d.startContainer,d.startOffset==(b.getChildCount?b.getChildCount():b.getLength())&&!b.isBlockBoundary();)d.setStartAfter(b);b=d.startContainer;if(b.type!=CKEDITOR.NODE_ELEMENT)return b.getParent();if((b=b.getChild(d.startOffset))&&b.type==
-CKEDITOR.NODE_ELEMENT)for(d=b.getFirst();d&&d.type==CKEDITOR.NODE_ELEMENT;)b=d,d=d.getFirst();else b=d.startContainer}b=b.$}}return a.startElement=b?new CKEDITOR.dom.element(b):null},getSelectedElement:function(){var a=this._.cache;if(void 0!==a.selectedElement)return a.selectedElement;var b=this,d=CKEDITOR.tools.tryThese(function(){return b.getNative().createRange().item(0)},function(){for(var a=b.getRanges()[0].clone(),d,c,g=2;g&&!((d=a.getEnclosedNode())&&d.type==CKEDITOR.NODE_ELEMENT&&C[d.getName()]&&
-(c=d));g--)a.shrink(CKEDITOR.SHRINK_ELEMENT);return c&&c.$});return a.selectedElement=d?new CKEDITOR.dom.element(d):null},getSelectedText:function(){var a=this._.cache;if(void 0!==a.selectedText)return a.selectedText;var b=this.getNative(),b=p?"Control"==b.type?"":b.createRange().text:b.toString();return a.selectedText=b},lock:function(){this.getRanges();this.getStartElement();this.getSelectedElement();this.getSelectedText();this._.cache.nativeSel=null;this.isLocked=1},unlock:function(a){if(this.isLocked){if(a)var b=
-this.getSelectedElement(),d=!b&&this.getRanges(),c=this.isFake;this.isLocked=0;this.reset();a&&(a=b||d[0]&&d[0].getCommonAncestor())&&a.getAscendant("body",1)&&(c?this.fake(b):b?this.selectElement(b):this.selectRanges(d))}},reset:function(){this._.cache={};this.isFake=0;var a=this.root.editor;if(a&&a._.fakeSelection)if(this.rev==a._.fakeSelection.rev){delete a._.fakeSelection;var b=a._.hiddenSelectionContainer;if(b){var d=a.checkDirty();a.fire("lockSnapshot");b.remove();a.fire("unlockSnapshot");!d&&
-a.resetDirty()}delete a._.hiddenSelectionContainer}else CKEDITOR.warn("selection-fake-reset");this.rev=v++},selectElement:function(a){var b=new CKEDITOR.dom.range(this.root);b.setStartBefore(a);b.setEndAfter(a);this.selectRanges([b])},selectRanges:function(a){var b=this.root.editor,b=b&&b._.hiddenSelectionContainer;this.reset();if(b)for(var b=this.root,d,c=0;c<a.length;++c)d=a[c],d.endContainer.equals(b)&&(d.endOffset=Math.min(d.endOffset,b.getChildCount()));if(a.length)if(this.isLocked){var g=CKEDITOR.document.getActive();
-this.unlock();this.selectRanges(a);this.lock();g&&!g.equals(this.root)&&g.focus()}else{var e;a:{var f,k;if(1==a.length&&!(k=a[0]).collapsed&&(e=k.getEnclosedNode())&&e.type==CKEDITOR.NODE_ELEMENT&&(k=k.clone(),k.shrink(CKEDITOR.SHRINK_ELEMENT,!0),(f=k.getEnclosedNode())&&f.type==CKEDITOR.NODE_ELEMENT&&(e=f),"false"==e.getAttribute("contenteditable")))break a;e=void 0}if(e)this.fake(e);else{if(p){k=CKEDITOR.dom.walker.whitespaces(!0);f=/\ufeff|\u00a0/;b={table:1,tbody:1,tr:1};1<a.length&&(e=a[a.length-
-1],a[0].setEnd(e.endContainer,e.endOffset));e=a[0];a=e.collapsed;var n,q,t;if((d=e.getEnclosedNode())&&d.type==CKEDITOR.NODE_ELEMENT&&d.getName()in C&&(!d.is("a")||!d.getText()))try{t=d.$.createControlRange();t.addElement(d.$);t.select();return}catch(x){}if(e.startContainer.type==CKEDITOR.NODE_ELEMENT&&e.startContainer.getName()in b||e.endContainer.type==CKEDITOR.NODE_ELEMENT&&e.endContainer.getName()in b)e.shrink(CKEDITOR.NODE_ELEMENT,!0),a=e.collapsed;t=e.createBookmark();b=t.startNode;a||(g=t.endNode);
-t=e.document.$.body.createTextRange();t.moveToElementText(b.$);t.moveStart("character",1);g?(f=e.document.$.body.createTextRange(),f.moveToElementText(g.$),t.setEndPoint("EndToEnd",f),t.moveEnd("character",-1)):(n=b.getNext(k),q=b.hasAscendant("pre"),n=!(n&&n.getText&&n.getText().match(f))&&(q||!b.hasPrevious()||b.getPrevious().is&&b.getPrevious().is("br")),q=e.document.createElement("span"),q.setHtml("\x26#65279;"),q.insertBefore(b),n&&e.document.createText("").insertBefore(b));e.setStartBefore(b);
-b.remove();a?(n?(t.moveStart("character",-1),t.select(),e.document.$.selection.clear()):t.select(),e.moveToPosition(q,CKEDITOR.POSITION_BEFORE_START),q.remove()):(e.setEndBefore(g),g.remove(),t.select())}else{g=this.getNative();if(!g)return;this.removeAllRanges();for(t=0;t<a.length;t++){if(t<a.length-1&&(n=a[t],q=a[t+1],f=n.clone(),f.setStart(n.endContainer,n.endOffset),f.setEnd(q.startContainer,q.startOffset),!f.collapsed&&(f.shrink(CKEDITOR.NODE_ELEMENT,!0),e=f.getCommonAncestor(),f=f.getEnclosedNode(),
-e.isReadOnly()||f&&f.isReadOnly()))){q.setStart(n.startContainer,n.startOffset);a.splice(t--,1);continue}e=a[t];q=this.document.$.createRange();e.collapsed&&CKEDITOR.env.webkit&&h(e)&&(f=m(this.root),e.insertNode(f),(n=f.getNext())&&!f.getPrevious()&&n.type==CKEDITOR.NODE_ELEMENT&&"br"==n.getName()?(l(this.root),e.moveToPosition(n,CKEDITOR.POSITION_BEFORE_START)):e.moveToPosition(f,CKEDITOR.POSITION_AFTER_END));q.setStart(e.startContainer.$,e.startOffset);try{q.setEnd(e.endContainer.$,e.endOffset)}catch(u){if(0<=
-u.toString().indexOf("NS_ERROR_ILLEGAL_VALUE"))e.collapse(1),q.setEnd(e.endContainer.$,e.endOffset);else throw u;}g.addRange(q)}}this.reset();this.root.fire("selectionchange")}}},fake:function(a,d){var c=this.root.editor;void 0===d&&a.hasAttribute("aria-label")&&(d=a.getAttribute("aria-label"));this.reset();b(c,d);var g=this._.cache,e=new CKEDITOR.dom.range(this.root);e.setStartBefore(a);e.setEndAfter(a);g.ranges=new CKEDITOR.dom.rangeList(e);g.selectedElement=g.startElement=a;g.type=CKEDITOR.SELECTION_ELEMENT;
-g.selectedText=g.nativeSel=null;this.isFake=1;this.rev=v++;c._.fakeSelection=this;this.root.fire("selectionchange")},isHidden:function(){var a=this.getCommonAncestor();a&&a.type==CKEDITOR.NODE_TEXT&&(a=a.getParent());return!(!a||!a.data("cke-hidden-sel"))},createBookmarks:function(a){a=this.getRanges().createBookmarks(a);this.isFake&&(a.isFake=1);return a},createBookmarks2:function(a){a=this.getRanges().createBookmarks2(a);this.isFake&&(a.isFake=1);return a},selectBookmarks:function(a){for(var b=
-[],d,c=0;c<a.length;c++){var g=new CKEDITOR.dom.range(this.root);g.moveToBookmark(a[c]);b.push(g)}a.isFake&&(d=b[0].getEnclosedNode(),d&&d.type==CKEDITOR.NODE_ELEMENT||(CKEDITOR.warn("selection-not-fake"),a.isFake=0));a.isFake?this.fake(d):this.selectRanges(b);return this},getCommonAncestor:function(){var a=this.getRanges();return a.length?a[0].startContainer.getCommonAncestor(a[a.length-1].endContainer):null},scrollIntoView:function(){this.type!=CKEDITOR.SELECTION_NONE&&this.getRanges()[0].scrollIntoView()},
-removeAllRanges:function(){if(this.getType()!=CKEDITOR.SELECTION_NONE){var a=this.getNative();try{a&&a[p?"empty":"removeAllRanges"]()}catch(b){}this.reset()}}}}(),"use strict",CKEDITOR.STYLE_BLOCK=1,CKEDITOR.STYLE_INLINE=2,CKEDITOR.STYLE_OBJECT=3,function(){function a(a,b){for(var d,c;(a=a.getParent())&&!a.equals(b);)if(a.getAttribute("data-nostyle"))d=a;else if(!c){var g=a.getAttribute("contentEditable");"false"==g?d=a:"true"==g&&(c=1)}return d}function f(a,b,d,c){return(a.getPosition(b)|c)==c&&
-(!d.childRule||d.childRule(a))}function c(b){var d=b.document;if(b.collapsed)d=x(this,d),b.insertNode(d),b.moveToPosition(d,CKEDITOR.POSITION_BEFORE_END);else{var g=this.element,e=this._.definition,k,n=e.ignoreReadonly,p=n||e.includeReadonly;null==p&&(p=b.root.getCustomData("cke_includeReadonly"));var l=CKEDITOR.dtd[g];l||(k=!0,l=CKEDITOR.dtd.span);b.enlarge(CKEDITOR.ENLARGE_INLINE,1);b.trim();var m=b.createBookmark(),q=m.startNode,u=m.endNode,v=q,r;if(!n){var A=b.getCommonAncestor(),n=a(q,A),A=a(u,
-A);n&&(v=n.getNextSourceNode(!0));A&&(u=A)}for(v.getPosition(u)==CKEDITOR.POSITION_FOLLOWING&&(v=0);v;){n=!1;if(v.equals(u))v=null,n=!0;else{var w=v.type==CKEDITOR.NODE_ELEMENT?v.getName():null,A=w&&"false"==v.getAttribute("contentEditable"),C=w&&v.getAttribute("data-nostyle");if(w&&v.data("cke-bookmark")){v=v.getNextSourceNode(!0);continue}if(A&&p&&CKEDITOR.dtd.$block[w])for(var B=v,y=h(B),z=void 0,D=y.length,ea=0,B=D&&new CKEDITOR.dom.range(B.getDocument());ea<D;++ea){var z=y[ea],F=CKEDITOR.filter.instances[z.data("cke-filter")];
-if(F?F.check(this):1)B.selectNodeContents(z),c.call(this,B)}y=w?!l[w]||C?0:A&&!p?0:f(v,u,e,N):1;if(y)if(z=v.getParent(),y=e,D=g,ea=k,!z||!(z.getDtd()||CKEDITOR.dtd.span)[D]&&!ea||y.parentRule&&!y.parentRule(z))n=!0;else{if(r||w&&CKEDITOR.dtd.$removeEmpty[w]&&(v.getPosition(u)|N)!=N||(r=b.clone(),r.setStartBefore(v)),w=v.type,w==CKEDITOR.NODE_TEXT||A||w==CKEDITOR.NODE_ELEMENT&&!v.getChildCount()){for(var w=v,E;(n=!w.getNext(L))&&(E=w.getParent(),l[E.getName()])&&f(E,q,e,O);)w=E;r.setEndAfter(w)}}else n=
-!0;v=v.getNextSourceNode(C||A)}if(n&&r&&!r.collapsed){for(var n=x(this,d),A=n.hasAttributes(),C=r.getCommonAncestor(),w={},y={},z={},D={},ba,G,ga;n&&C;){if(C.getName()==g){for(ba in e.attributes)!D[ba]&&(ga=C.getAttribute(G))&&(n.getAttribute(ba)==ga?y[ba]=1:D[ba]=1);for(G in e.styles)!z[G]&&(ga=C.getStyle(G))&&(n.getStyle(G)==ga?w[G]=1:z[G]=1)}C=C.getParent()}for(ba in y)n.removeAttribute(ba);for(G in w)n.removeStyle(G);A&&!n.hasAttributes()&&(n=null);n?(r.extractContents().appendTo(n),r.insertNode(n),
-t.call(this,n),n.mergeSiblings(),CKEDITOR.env.ie||n.$.normalize()):(n=new CKEDITOR.dom.element("span"),r.extractContents().appendTo(n),r.insertNode(n),t.call(this,n),n.remove(!0));r=null}}b.moveToBookmark(m);b.shrink(CKEDITOR.SHRINK_TEXT);b.shrink(CKEDITOR.NODE_ELEMENT,!0)}}function e(a){function b(){for(var a=new CKEDITOR.dom.elementPath(c.getParent()),d=new CKEDITOR.dom.elementPath(p.getParent()),g=null,e=null,h=0;h<a.elements.length;h++){var f=a.elements[h];if(f==a.block||f==a.blockLimit)break;
-l.checkElementRemovable(f,!0)&&(g=f)}for(h=0;h<d.elements.length;h++){f=d.elements[h];if(f==d.block||f==d.blockLimit)break;l.checkElementRemovable(f,!0)&&(e=f)}e&&p.breakParent(e);g&&c.breakParent(g)}a.enlarge(CKEDITOR.ENLARGE_INLINE,1);var d=a.createBookmark(),c=d.startNode;if(a.collapsed){for(var g=new CKEDITOR.dom.elementPath(c.getParent(),a.root),e,h=0,f;h<g.elements.length&&(f=g.elements[h])&&f!=g.block&&f!=g.blockLimit;h++)if(this.checkElementRemovable(f)){var k;a.collapsed&&(a.checkBoundaryOfElement(f,
-CKEDITOR.END)||(k=a.checkBoundaryOfElement(f,CKEDITOR.START)))?(e=f,e.match=k?"start":"end"):(f.mergeSiblings(),f.is(this.element)?u.call(this,f):n(f,r(this)[f.getName()]))}if(e){f=c;for(h=0;;h++){k=g.elements[h];if(k.equals(e))break;else if(k.match)continue;else k=k.clone();k.append(f);f=k}f["start"==e.match?"insertBefore":"insertAfter"](e)}}else{var p=d.endNode,l=this;b();for(g=c;!g.equals(p);)e=g.getNextSourceNode(),g.type==CKEDITOR.NODE_ELEMENT&&this.checkElementRemovable(g)&&(g.getName()==this.element?
-u.call(this,g):n(g,r(this)[g.getName()]),e.type==CKEDITOR.NODE_ELEMENT&&e.contains(c)&&(b(),e=c.getNext())),g=e}a.moveToBookmark(d);a.shrink(CKEDITOR.NODE_ELEMENT,!0)}function h(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function m(a){var b=a.getEnclosedNode()||a.getCommonAncestor(!1,!0);(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1))&&!a.isReadOnly()&&A(a,this)}function l(a){var b=a.getCommonAncestor(!0,
-!0);if(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1)){var b=this._.definition,d=b.attributes;if(d)for(var c in d)a.removeAttribute(c,d[c]);if(b.styles)for(var g in b.styles)b.styles.hasOwnProperty(g)&&a.removeStyle(g)}}function k(a){var b=a.createBookmark(!0),c=a.createIterator();c.enforceRealBlocks=!0;this._.enterMode&&(c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR);for(var g,e=a.document,h;g=c.getNextParagraph();)!g.isReadOnly()&&(c.activeFilter?c.activeFilter.check(this):
-1)&&(h=x(this,e,g),d(g,h));a.moveToBookmark(b)}function b(a){var b=a.createBookmark(1),c=a.createIterator();c.enforceRealBlocks=!0;c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR;for(var g,e;g=c.getNextParagraph();)this.checkElementRemovable(g)&&(g.is("pre")?((e=this._.enterMode==CKEDITOR.ENTER_BR?null:a.document.createElement(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))&&g.copyAttributes(e),d(g,e)):u.call(this,g));a.moveToBookmark(b)}function d(a,b){var d=!b;d&&(b=a.getDocument().createElement("div"),
-a.copyAttributes(b));var c=b&&b.is("pre"),e=a.is("pre"),h=!c&&e;if(c&&!e){e=b;(h=a.getBogus())&&h.remove();h=a.getHtml();h=p(h,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"");h=h.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,"$1");h=h.replace(/([ \t\n\r]+|&nbsp;)/g," ");h=h.replace(/<br\b[^>]*>/gi,"\n");if(CKEDITOR.env.ie){var f=a.getDocument().createElement("div");f.append(e);e.$.outerHTML="\x3cpre\x3e"+h+"\x3c/pre\x3e";e.copyAttributes(f.getFirst());e=f.getFirst().remove()}else e.setHtml(h);b=e}else h?b=v(d?
-[a.getHtml()]:g(a),b):a.moveChildren(b);b.replace(a);if(c){var d=b,k;(k=d.getPrevious(G))&&k.type==CKEDITOR.NODE_ELEMENT&&k.is("pre")&&(c=p(k.getHtml(),/\n$/,"")+"\n\n"+p(d.getHtml(),/^\n/,""),CKEDITOR.env.ie?d.$.outerHTML="\x3cpre\x3e"+c+"\x3c/pre\x3e":d.setHtml(c),k.remove())}else d&&q(b)}function g(a){var b=[];p(a.getOuterHtml(),/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,function(a,b,d){return b+"\x3c/pre\x3e"+d+"\x3cpre\x3e"}).replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(a,
-d){b.push(d)});return b}function p(a,b,d){var c="",g="";a=a.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(a,b,d){b&&(c=b);d&&(g=d);return""});return c+a.replace(b,d)+g}function v(a,b){var d;1<a.length&&(d=new CKEDITOR.dom.documentFragment(b.getDocument()));for(var c=0;c<a.length;c++){var g=a[c],g=g.replace(/(\r\n|\r)/g,"\n"),g=p(g,/^[ \t]*\n/,""),g=p(g,/\n$/,""),g=p(g,/^[ \t]+|[ \t]+$/g,function(a,b){return 1==a.length?"\x26nbsp;":b?" "+CKEDITOR.tools.repeat("\x26nbsp;",
-a.length-1):CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "}),g=g.replace(/\n/g,"\x3cbr\x3e"),g=g.replace(/[ \t]{2,}/g,function(a){return CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "});if(d){var e=b.clone();e.setHtml(g);d.append(e)}else b.setHtml(g)}return d||b}function u(a,b){var d=this._.definition,c=d.attributes,d=d.styles,g=r(this)[a.getName()],e=CKEDITOR.tools.isEmpty(c)&&CKEDITOR.tools.isEmpty(d),h;for(h in c)if("class"!=h&&!this._.definition.fullMatch||a.getAttribute(h)==w(h,c[h]))b&&
-"data-"==h.slice(0,5)||(e=a.hasAttribute(h),a.removeAttribute(h));for(var f in d)this._.definition.fullMatch&&a.getStyle(f)!=w(f,d[f],!0)||(e=e||!!a.getStyle(f),a.removeStyle(f));n(a,g,y[a.getName()]);e&&(this._.definition.alwaysRemoveElement?q(a,1):!CKEDITOR.dtd.$block[a.getName()]||this._.enterMode==CKEDITOR.ENTER_BR&&!a.hasAttributes()?q(a):a.renameNode(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))}function t(a){for(var b=r(this),d=a.getElementsByTag(this.element),c,g=d.count();0<=--g;)c=d.getItem(g),
-c.isReadOnly()||u.call(this,c,!0);for(var e in b)if(e!=this.element)for(d=a.getElementsByTag(e),g=d.count()-1;0<=g;g--)c=d.getItem(g),c.isReadOnly()||n(c,b[e])}function n(a,b,d){if(b=b&&b.attributes)for(var c=0;c<b.length;c++){var g=b[c][0],e;if(e=a.getAttribute(g)){var h=b[c][1];(null===h||h.test&&h.test(e)||"string"==typeof h&&e==h)&&a.removeAttribute(g)}}d||q(a)}function q(a,b){if(!a.hasAttributes()||b)if(CKEDITOR.dtd.$block[a.getName()]){var d=a.getPrevious(G),c=a.getNext(G);!d||d.type!=CKEDITOR.NODE_TEXT&&
-d.isBlockBoundary({br:1})||a.append("br",1);!c||c.type!=CKEDITOR.NODE_TEXT&&c.isBlockBoundary({br:1})||a.append("br");a.remove(!0)}else d=a.getFirst(),c=a.getLast(),a.remove(!0),d&&(d.type==CKEDITOR.NODE_ELEMENT&&d.mergeSiblings(),c&&!d.equals(c)&&c.type==CKEDITOR.NODE_ELEMENT&&c.mergeSiblings())}function x(a,b,d){var c;c=a.element;"*"==c&&(c="span");c=new CKEDITOR.dom.element(c,b);d&&d.copyAttributes(c);c=A(c,a);b.getCustomData("doc_processing_style")&&c.hasAttribute("id")?c.removeAttribute("id"):
-b.setCustomData("doc_processing_style",1);return c}function A(a,b){var d=b._.definition,c=d.attributes,d=CKEDITOR.style.getStyleText(d);if(c)for(var g in c)a.setAttribute(g,c[g]);d&&a.setAttribute("style",d);return a}function C(a,b){for(var d in a)a[d]=a[d].replace(E,function(a,d){return b[d]})}function r(a){if(a._.overrides)return a._.overrides;var b=a._.overrides={},d=a._.definition.overrides;if(d){CKEDITOR.tools.isArray(d)||(d=[d]);for(var c=0;c<d.length;c++){var g=d[c],e,h;"string"==typeof g?
-e=g.toLowerCase():(e=g.element?g.element.toLowerCase():a.element,h=g.attributes);g=b[e]||(b[e]={});if(h){var g=g.attributes=g.attributes||[],f;for(f in h)g.push([f.toLowerCase(),h[f]])}}}return b}function w(a,b,d){var c=new CKEDITOR.dom.element("span");c[d?"setStyle":"setAttribute"](a,b);return c[d?"getStyle":"getAttribute"](a)}function B(a,b){function d(a,b){return"font-family"==b.toLowerCase()?a.replace(/["']/g,""):a}"string"==typeof a&&(a=CKEDITOR.tools.parseCssText(a));"string"==typeof b&&(b=
-CKEDITOR.tools.parseCssText(b,!0));for(var c in a)if(!(c in b)||d(b[c],c)!=d(a[c],c)&&"inherit"!=a[c]&&"inherit"!=b[c])return!1;return!0}function z(a,b,d){var c=a.document,g=a.getRanges();b=b?this.removeFromRange:this.applyToRange;for(var e,h=g.createIterator();e=h.getNextRange();)b.call(this,e,d);a.selectRanges(g);c.removeCustomData("doc_processing_style")}var y={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,
-time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},D={a:1,blockquote:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},F=/\s*(?:;\s*|$)/,E=/#\((.+?)\)/g,L=CKEDITOR.dom.walker.bookmark(0,1),G=CKEDITOR.dom.walker.whitespaces(1);CKEDITOR.style=function(a,b){if("string"==typeof a.type)return new CKEDITOR.style.customHandlers[a.type](a);var d=a.attributes;d&&d.style&&(a.styles=CKEDITOR.tools.extend({},a.styles,
-CKEDITOR.tools.parseCssText(d.style)),delete d.style);b&&(a=CKEDITOR.tools.clone(a),C(a.attributes,b),C(a.styles,b));d=this.element=a.element?"string"==typeof a.element?a.element.toLowerCase():a.element:"*";this.type=a.type||(y[d]?CKEDITOR.STYLE_BLOCK:D[d]?CKEDITOR.STYLE_OBJECT:CKEDITOR.STYLE_INLINE);"object"==typeof this.element&&(this.type=CKEDITOR.STYLE_OBJECT);this._={definition:a}};CKEDITOR.style.prototype={apply:function(a){if(a instanceof CKEDITOR.dom.document)return z.call(this,a.getSelection());
+this.keystrokeHandler.keystrokes,b=CKEDITOR.tools.isArray(arguments[0])?arguments[0]:[[].slice.call(arguments,0)],d,c,g=b.length;g--;)d=b[g],c=0,CKEDITOR.tools.isArray(d)&&(c=d[1],d=d[0]),c?a[d]=c:delete a[d]},getCommandKeystroke:function(a){var b=a.name,d=this.keystrokeHandler.keystrokes,c;if(a.fakeKeystroke)return a.fakeKeystroke;for(c in d)if(d.hasOwnProperty(c)&&d[c]==b)return c;return null},addFeature:function(a){return this.filter.addFeature(a)},setActiveFilter:function(a){a||(a=this.filter);
+this.activeFilter!==a&&(this.activeFilter=a,this.fire("activeFilterChange"),a===this.filter?this.setActiveEnterMode(null,null):this.setActiveEnterMode(a.getAllowedEnterMode(this.enterMode),a.getAllowedEnterMode(this.shiftEnterMode,!0)))},setActiveEnterMode:function(a,b){a=a?this.blockless?CKEDITOR.ENTER_BR:a:this.enterMode;b=b?this.blockless?CKEDITOR.ENTER_BR:b:this.shiftEnterMode;if(this.activeEnterMode!=a||this.activeShiftEnterMode!=b)this.activeEnterMode=a,this.activeShiftEnterMode=b,this.fire("activeEnterModeChange")},
+showNotification:function(a){alert(a)}})}(),CKEDITOR.ELEMENT_MODE_NONE=0,CKEDITOR.ELEMENT_MODE_REPLACE=1,CKEDITOR.ELEMENT_MODE_APPENDTO=2,CKEDITOR.ELEMENT_MODE_INLINE=3,CKEDITOR.htmlParser=function(){this._={htmlPartsRegex:/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--\x3e)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/g}},function(){var a=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,e={checked:1,compact:1,declare:1,
+defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};CKEDITOR.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(c){for(var f,h,m=0,l;f=this._.htmlPartsRegex.exec(c);){h=f.index;if(h>m)if(m=c.substring(m,h),l)l.push(m);else this.onText(m);m=this._.htmlPartsRegex.lastIndex;if(h=f[1])if(h=h.toLowerCase(),l&&CKEDITOR.dtd.$cdata[h]&&(this.onCDATA(l.join("")),
+l=null),!l){this.onTagClose(h);continue}if(l)l.push(f[0]);else if(h=f[3]){if(h=h.toLowerCase(),!/="/.test(h)){var k={},d,b=f[4];f=!!f[5];if(b)for(;d=a.exec(b);){var g=d[1].toLowerCase();d=d[2]||d[3]||d[4]||"";k[g]=!d&&e[g]?g:CKEDITOR.tools.htmlDecodeAttr(d)}this.onTagOpen(h,k,f);!l&&CKEDITOR.dtd.$cdata[h]&&(l=[])}}else if(h=f[2])this.onComment(h)}if(c.length>m)this.onText(c.substring(m,c.length))}}}(),CKEDITOR.htmlParser.basicWriter=CKEDITOR.tools.createClass({$:function(){this._={output:[]}},proto:{openTag:function(a){this._.output.push("\x3c",
+a)},openTagClose:function(a,e){e?this._.output.push(" /\x3e"):this._.output.push("\x3e")},attribute:function(a,e){"string"==typeof e&&(e=CKEDITOR.tools.htmlEncodeAttr(e));this._.output.push(" ",a,'\x3d"',e,'"')},closeTag:function(a){this._.output.push("\x3c/",a,"\x3e")},text:function(a){this._.output.push(a)},comment:function(a){this._.output.push("\x3c!--",a,"--\x3e")},write:function(a){this._.output.push(a)},reset:function(){this._.output=[];this._.indent=!1},getHtml:function(a){var e=this._.output.join("");
+a&&this.reset();return e}}}),"use strict",function(){CKEDITOR.htmlParser.node=function(){};CKEDITOR.htmlParser.node.prototype={remove:function(){var a=this.parent.children,e=CKEDITOR.tools.indexOf(a,this),c=this.previous,f=this.next;c&&(c.next=f);f&&(f.previous=c);a.splice(e,1);this.parent=null},replaceWith:function(a){var e=this.parent.children,c=CKEDITOR.tools.indexOf(e,this),f=a.previous=this.previous,h=a.next=this.next;f&&(f.next=a);h&&(h.previous=a);e[c]=a;a.parent=this.parent;this.parent=null},
+insertAfter:function(a){var e=a.parent.children,c=CKEDITOR.tools.indexOf(e,a),f=a.next;e.splice(c+1,0,this);this.next=a.next;this.previous=a;a.next=this;f&&(f.previous=this);this.parent=a.parent},insertBefore:function(a){var e=a.parent.children,c=CKEDITOR.tools.indexOf(e,a);e.splice(c,0,this);this.next=a;(this.previous=a.previous)&&(a.previous.next=this);a.previous=this;this.parent=a.parent},getAscendant:function(a){var e="function"==typeof a?a:"string"==typeof a?function(c){return c.name==a}:function(c){return c.name in
+a},c=this.parent;for(;c&&c.type==CKEDITOR.NODE_ELEMENT;){if(e(c))return c;c=c.parent}return null},wrapWith:function(a){this.replaceWith(a);a.add(this);return a},getIndex:function(){return CKEDITOR.tools.indexOf(this.parent.children,this)},getFilterContext:function(a){return a||{}}}}(),"use strict",CKEDITOR.htmlParser.comment=function(a){this.value=a;this._={isBlockLike:!1}},CKEDITOR.htmlParser.comment.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_COMMENT,filter:function(a,
+e){var c=this.value;if(!(c=a.onComment(e,c,this)))return this.remove(),!1;if("string"!=typeof c)return this.replaceWith(c),!1;this.value=c;return!0},writeHtml:function(a,e){e&&this.filter(e);a.comment(this.value)}}),"use strict",function(){CKEDITOR.htmlParser.text=function(a){this.value=a;this._={isBlockLike:!1}};CKEDITOR.htmlParser.text.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(a,e){if(!(this.value=a.onText(e,this.value,this)))return this.remove(),
+!1},writeHtml:function(a,e){e&&this.filter(e);a.text(this.value)}})}(),"use strict",function(){CKEDITOR.htmlParser.cdata=function(a){this.value=a};CKEDITOR.htmlParser.cdata.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(){},writeHtml:function(a){a.write(this.value)}})}(),"use strict",CKEDITOR.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:!0,hasInlineStarted:!1}},function(){function a(a){return a.attributes["data-cke-survive"]?
+!1:"a"==a.name&&a.attributes.href||CKEDITOR.dtd.$removeEmpty[a.name]}var e=CKEDITOR.tools.extend({table:1,ul:1,ol:1,dl:1},CKEDITOR.dtd.table,CKEDITOR.dtd.ul,CKEDITOR.dtd.ol,CKEDITOR.dtd.dl),c={ol:1,ul:1},f=CKEDITOR.tools.extend({},{html:1},CKEDITOR.dtd.html,CKEDITOR.dtd.body,CKEDITOR.dtd.head,{style:1,script:1}),h={ul:"li",ol:"li",dl:"dd",table:"tbody",tbody:"tr",thead:"tr",tfoot:"tr",tr:"td"};CKEDITOR.htmlParser.fragment.fromHtml=function(m,l,k){function d(a){var d;if(0<q.length)for(var c=0;c<q.length;c++){var g=
+q[c],f=g.name,h=CKEDITOR.dtd[f],e=B.name&&CKEDITOR.dtd[B.name];e&&!e[f]||a&&h&&!h[a]&&CKEDITOR.dtd[a]?f==B.name&&(p(B,B.parent,1),c--):(d||(b(),d=1),g=g.clone(),g.parent=B,B=g,q.splice(c,1),c--)}}function b(){for(;u.length;)p(u.shift(),B)}function g(a){if(a._.isBlockLike&&"pre"!=a.name&&"textarea"!=a.name){var b=a.children.length,d=a.children[b-1],c;d&&d.type==CKEDITOR.NODE_TEXT&&((c=CKEDITOR.tools.rtrim(d.value))?d.value=c:a.children.length=b-1)}}function p(b,d,c){d=d||B||n;var f=B;void 0===b.previous&&
+(v(d,b)&&(B=d,w.onTagOpen(k,{}),b.returnPoint=d=B),g(b),a(b)&&!b.children.length||d.add(b),"pre"==b.name&&(t=!1),"textarea"==b.name&&(y=!1));b.returnPoint?(B=b.returnPoint,delete b.returnPoint):B=c?d:f}function v(a,b){if((a==n||"body"==a.name)&&k&&(!a.name||CKEDITOR.dtd[a.name][k])){var d,c;return(d=b.attributes&&(c=b.attributes["data-cke-real-element-type"])?c:b.name)&&d in CKEDITOR.dtd.$inline&&!(d in CKEDITOR.dtd.head)&&!b.isOrphan||b.type==CKEDITOR.NODE_TEXT}}function r(a,b){return a in CKEDITOR.dtd.$listItem||
+a in CKEDITOR.dtd.$tableContent?a==b||"dt"==a&&"dd"==b||"dd"==a&&"dt"==b:!1}var w=new CKEDITOR.htmlParser,n=l instanceof CKEDITOR.htmlParser.element?l:"string"==typeof l?new CKEDITOR.htmlParser.element(l):new CKEDITOR.htmlParser.fragment,q=[],u=[],B=n,y="textarea"==n.name,t="pre"==n.name;w.onTagOpen=function(g,h,k,l){h=new CKEDITOR.htmlParser.element(g,h);h.isUnknown&&k&&(h.isEmpty=!0);h.isOptionalClose=l;if(a(h))q.push(h);else{if("pre"==g)t=!0;else{if("br"==g&&t){B.add(new CKEDITOR.htmlParser.text("\n"));
+return}"textarea"==g&&(y=!0)}if("br"==g)u.push(h);else{for(;!(l=(k=B.name)?CKEDITOR.dtd[k]||(B._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):f,h.isUnknown||B.isUnknown||l[g]);)if(B.isOptionalClose)w.onTagClose(k);else if(g in c&&k in c)k=B.children,(k=k[k.length-1])&&"li"==k.name||p(k=new CKEDITOR.htmlParser.element("li"),B),!h.returnPoint&&(h.returnPoint=B),B=k;else if(g in CKEDITOR.dtd.$listItem&&!r(g,k))w.onTagOpen("li"==g?"ul":"dl",{},0,1);else if(k in e&&!r(g,k))!h.returnPoint&&(h.returnPoint=
+B),B=B.parent;else if(k in CKEDITOR.dtd.$inline&&q.unshift(B),B.parent)p(B,B.parent,1);else{h.isOrphan=1;break}d(g);b();h.parent=B;h.isEmpty?p(h):B=h}}};w.onTagClose=function(a){for(var d=q.length-1;0<=d;d--)if(a==q[d].name){q.splice(d,1);return}for(var c=[],g=[],f=B;f!=n&&f.name!=a;)f._.isBlockLike||g.unshift(f),c.push(f),f=f.returnPoint||f.parent;if(f!=n){for(d=0;d<c.length;d++){var h=c[d];p(h,h.parent)}B=f;f._.isBlockLike&&b();p(f,f.parent);f==B&&(B=B.parent);q=q.concat(g)}"body"==a&&(k=!1)};w.onText=
+function(a){if(!(B._.hasInlineStarted&&!u.length||t||y)&&(a=CKEDITOR.tools.ltrim(a),0===a.length))return;var c=B.name,g=c?CKEDITOR.dtd[c]||(B._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):f;if(!y&&!g["#"]&&c in e)w.onTagOpen(h[c]||""),w.onText(a);else{b();d();t||y||(a=a.replace(/[\t\r\n ]{2,}|[\t\r\n]/g," "));a=new CKEDITOR.htmlParser.text(a);if(v(B,a))this.onTagOpen(k,{},0,1);B.add(a)}};w.onCDATA=function(a){B.add(new CKEDITOR.htmlParser.cdata(a))};w.onComment=function(a){b();d();B.add(new CKEDITOR.htmlParser.comment(a))};
+w.parse(m);for(b();B!=n;)p(B,B.parent,1);g(n);return n};CKEDITOR.htmlParser.fragment.prototype={type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,add:function(a,c){isNaN(c)&&(c=this.children.length);var f=0<c?this.children[c-1]:null;if(f){if(a._.isBlockLike&&f.type==CKEDITOR.NODE_TEXT&&(f.value=CKEDITOR.tools.rtrim(f.value),0===f.value.length)){this.children.pop();this.add(a);return}f.next=a}a.previous=f;a.parent=this;this.children.splice(c,0,a);this._.hasInlineStarted||(this._.hasInlineStarted=a.type==CKEDITOR.NODE_TEXT||
+a.type==CKEDITOR.NODE_ELEMENT&&!a._.isBlockLike)},filter:function(a,c){c=this.getFilterContext(c);a.onRoot(c,this);this.filterChildren(a,!1,c)},filterChildren:function(a,c,f){if(this.childrenFilteredBy!=a.id){f=this.getFilterContext(f);if(c&&!this.parent)a.onRoot(f,this);this.childrenFilteredBy=a.id;for(c=0;c<this.children.length;c++)!1===this.children[c].filter(a,f)&&c--}},writeHtml:function(a,c){c&&this.filter(c);this.writeChildrenHtml(a)},writeChildrenHtml:function(a,c,f){var d=this.getFilterContext();
+if(f&&!this.parent&&c)c.onRoot(d,this);c&&this.filterChildren(c,!1,d);c=0;f=this.children;for(d=f.length;c<d;c++)f[c].writeHtml(a)},forEach:function(a,c,f){if(!(f||c&&this.type!=c))var d=a(this);if(!1!==d){f=this.children;for(var b=0;b<f.length;b++)d=f[b],d.type==CKEDITOR.NODE_ELEMENT?d.forEach(a,c):c&&d.type!=c||a(d)}},getFilterContext:function(a){return a||{}}}}(),"use strict",function(){function a(){this.rules=[]}function e(c,f,h,e){var l,k;for(l in f)(k=c[l])||(k=c[l]=new a),k.add(f[l],h,e)}CKEDITOR.htmlParser.filter=
+CKEDITOR.tools.createClass({$:function(c){this.id=CKEDITOR.tools.getNextNumber();this.elementNameRules=new a;this.attributeNameRules=new a;this.elementsRules={};this.attributesRules={};this.textRules=new a;this.commentRules=new a;this.rootRules=new a;c&&this.addRules(c,10)},proto:{addRules:function(a,f){var h;"number"==typeof f?h=f:f&&"priority"in f&&(h=f.priority);"number"!=typeof h&&(h=10);"object"!=typeof f&&(f={});a.elementNames&&this.elementNameRules.addMany(a.elementNames,h,f);a.attributeNames&&
+this.attributeNameRules.addMany(a.attributeNames,h,f);a.elements&&e(this.elementsRules,a.elements,h,f);a.attributes&&e(this.attributesRules,a.attributes,h,f);a.text&&this.textRules.add(a.text,h,f);a.comment&&this.commentRules.add(a.comment,h,f);a.root&&this.rootRules.add(a.root,h,f)},applyTo:function(a){a.filter(this)},onElementName:function(a,f){return this.elementNameRules.execOnName(a,f)},onAttributeName:function(a,f){return this.attributeNameRules.execOnName(a,f)},onText:function(a,f,h){return this.textRules.exec(a,
+f,h)},onComment:function(a,f,h){return this.commentRules.exec(a,f,h)},onRoot:function(a,f){return this.rootRules.exec(a,f)},onElement:function(a,f){for(var h=[this.elementsRules["^"],this.elementsRules[f.name],this.elementsRules.$],e,l=0;3>l;l++)if(e=h[l]){e=e.exec(a,f,this);if(!1===e)return null;if(e&&e!=f)return this.onNode(a,e);if(f.parent&&!f.name)break}return f},onNode:function(a,f){var h=f.type;return h==CKEDITOR.NODE_ELEMENT?this.onElement(a,f):h==CKEDITOR.NODE_TEXT?new CKEDITOR.htmlParser.text(this.onText(a,
+f.value)):h==CKEDITOR.NODE_COMMENT?new CKEDITOR.htmlParser.comment(this.onComment(a,f.value)):null},onAttribute:function(a,f,h,e){return(h=this.attributesRules[h])?h.exec(a,e,f,this):e}}});CKEDITOR.htmlParser.filterRulesGroup=a;a.prototype={add:function(a,f,h){this.rules.splice(this.findIndex(f),0,{value:a,priority:f,options:h})},addMany:function(a,f,h){for(var e=[this.findIndex(f),0],l=0,k=a.length;l<k;l++)e.push({value:a[l],priority:f,options:h});this.rules.splice.apply(this.rules,e)},findIndex:function(a){for(var f=
+this.rules,h=f.length-1;0<=h&&a<f[h].priority;)h--;return h+1},exec:function(a,f){var h=f instanceof CKEDITOR.htmlParser.node||f instanceof CKEDITOR.htmlParser.fragment,e=Array.prototype.slice.call(arguments,1),l=this.rules,k=l.length,d,b,g,p;for(p=0;p<k;p++)if(h&&(d=f.type,b=f.name),g=l[p],!(a.nonEditable&&!g.options.applyToAll||a.nestedEditable&&g.options.excludeNestedEditable)){g=g.value.apply(null,e);if(!1===g||h&&g&&(g.name!=b||g.type!=d))return g;null!=g&&(e[0]=f=g)}return f},execOnName:function(a,
+f){for(var h=0,e=this.rules,l=e.length,k;f&&h<l;h++)k=e[h],a.nonEditable&&!k.options.applyToAll||a.nestedEditable&&k.options.excludeNestedEditable||(f=f.replace(k.value[0],k.value[1]));return f}}}(),function(){function a(a,b){function d(a){return a||CKEDITOR.env.needsNbspFiller?new CKEDITOR.htmlParser.text(" "):new CKEDITOR.htmlParser.element("br",{"data-cke-bogus":1})}function g(a,b){return function(g){if(g.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var h=[],k=c(g),t,l;if(k)for(e(k,1)&&h.push(k);k;)m(k)&&
+(t=f(k))&&e(t)&&((l=f(t))&&!m(l)?h.push(t):(d(p).insertAfter(t),t.remove())),k=k.previous;for(k=0;k<h.length;k++)h[k].remove();if(h=!a||!1!==("function"==typeof b?b(g):b))p||CKEDITOR.env.needsBrFiller||g.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT?p||CKEDITOR.env.needsBrFiller||!(7<document.documentMode||g.name in CKEDITOR.dtd.tr||g.name in CKEDITOR.dtd.$listItem)?(h=c(g),h=!h||"form"==g.name&&"input"==h.name):h=!1:h=!1;h&&g.add(d(a))}}}function e(a,b){if((!p||CKEDITOR.env.needsBrFiller)&&a.type==CKEDITOR.NODE_ELEMENT&&
+"br"==a.name&&!a.attributes["data-cke-eol"])return!0;var d;return a.type==CKEDITOR.NODE_TEXT&&(d=a.value.match(q))&&(d.index&&((new CKEDITOR.htmlParser.text(a.value.substring(0,d.index))).insertBefore(a),a.value=d[0]),!CKEDITOR.env.needsBrFiller&&p&&(!b||a.parent.name in n)||!p&&((d=a.previous)&&"br"==d.name||!d||m(d)))?!0:!1}var k={elements:{}},p="html"==b,n=CKEDITOR.tools.extend({},t),x;for(x in n)"#"in B[x]||delete n[x];for(x in n)k.elements[x]=g(p,a.config.fillEmptyBlocks);k.root=g(p,!1);k.elements.br=
+function(a){return function(b){if(b.parent.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var c=b.attributes;if("data-cke-bogus"in c||"data-cke-eol"in c)delete c["data-cke-bogus"];else{for(c=b.next;c&&h(c);)c=c.next;var g=f(b);!c&&m(b.parent)?l(b.parent,d(a)):m(c)&&g&&!m(g)&&d(a).insertBefore(c)}}}}(p);return k}function e(a,b){return a!=CKEDITOR.ENTER_BR&&!1!==b?a==CKEDITOR.ENTER_DIV?"div":"p":!1}function c(a){for(a=a.children[a.children.length-1];a&&h(a);)a=a.previous;return a}function f(a){for(a=a.previous;a&&
+h(a);)a=a.previous;return a}function h(a){return a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(a.value)||a.type==CKEDITOR.NODE_ELEMENT&&a.attributes["data-cke-bookmark"]}function m(a){return a&&(a.type==CKEDITOR.NODE_ELEMENT&&a.name in t||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function l(a,b){var d=a.children[a.children.length-1];a.children.push(b);b.parent=a;d&&(d.next=b,b.previous=d)}function k(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);
+a.contenteditable="false"}function d(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function b(a){return a.replace(C,function(a,b,d){return"\x3c"+b+d.replace(E,function(a,b){return D.test(b)&&-1==d.indexOf("data-cke-saved-"+b)?" data-cke-saved-"+a+" data-cke-"+CKEDITOR.rnd+"-"+a:a})+"\x3e"})}function g(a,b){return a.replace(b,function(a,b,d){0===a.indexOf("\x3ctextarea")&&(a=b+r(d).replace(/</g,"\x26lt;").replace(/>/g,
+"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function p(a){return a.replace(M,function(a,b){return decodeURIComponent(b)})}function v(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,function(a){return"\x3c!--"+u+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function r(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function w(a,b){var d=b._.dataStore;
+return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return d&&d[b]||""})}function n(a,b){var d=[],c=b.config.protectedSource,g=b._.dataStore||(b._.dataStore={id:1}),f=/<\!--\{cke_temp(comment)?\}(\d*?)--\x3e/g,c=[/<script[\s\S]*?(<\/script>|$)/gi,/<noscript[\s\S]*?<\/noscript>/gi,/<meta[\s\S]*?\/?>/gi].concat(c);a=a.replace(/\x3c!--[\s\S]*?--\x3e/g,function(a){return"\x3c!--{cke_tempcomment}"+(d.push(a)-
+1)+"--\x3e"});for(var h=0;h<c.length;h++)a=a.replace(c[h],function(a){a=a.replace(f,function(a,b,c){return d[c]});return/cke_temp(comment)?/.test(a)?a:"\x3c!--{cke_temp}"+(d.push(a)-1)+"--\x3e"});a=a.replace(f,function(a,b,c){return"\x3c!--"+u+(b?"{C}":"")+encodeURIComponent(d[c]).replace(/--/g,"%2D%2D")+"--\x3e"});a=a.replace(/<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g,function(a){return a.replace(/\x3c!--\{cke_protected\}([^>]*)--\x3e/g,function(a,b){g[g.id]=
+decodeURIComponent(b);return"{cke_protected_"+g.id++ +"}"})});return a=a.replace(/<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g,function(a,d,c,g){return"\x3c"+d+c+"\x3e"+w(r(g),b)+"\x3c/"+d+"\x3e"})}CKEDITOR.htmlDataProcessor=function(d){var c,f,h=this;this.editor=d;this.dataFilter=c=new CKEDITOR.htmlParser.filter;this.htmlFilter=f=new CKEDITOR.htmlParser.filter;this.writer=new CKEDITOR.htmlParser.basicWriter;c.addRules(x);c.addRules(F,{applyToAll:!0});c.addRules(a(d,"data"),{applyToAll:!0});
+f.addRules(z);f.addRules(A,{applyToAll:!0});f.addRules(a(d,"html"),{applyToAll:!0});d.on("toHtml",function(a){a=a.data;var c=a.dataValue,f,c=n(c,d),c=g(c,H),c=b(c),c=g(c,I),c=c.replace(P,"$1cke:$2"),c=c.replace(S,"\x3ccke:$1$2\x3e\x3c/cke:$1\x3e"),c=c.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,"$1$2$2"),c=c.replace(/([^a-z0-9<\-])(on\w{3,})(?!>)/gi,"$1data-cke-"+CKEDITOR.rnd+"-$2");f=a.context||d.editable().getName();var h;CKEDITOR.env.ie&&9>CKEDITOR.env.version&&"pre"==f&&(f="div",c="\x3cpre\x3e"+c+"\x3c/pre\x3e",
+h=1);f=d.document.createElement(f);f.setHtml("a"+c);c=f.getHtml().substr(1);c=c.replace(new RegExp("data-cke-"+CKEDITOR.rnd+"-","ig"),"");h&&(c=c.replace(/^<pre>|<\/pre>$/gi,""));c=c.replace(G,"$1$2");c=p(c);c=r(c);f=!1===a.fixForBody?!1:e(a.enterMode,d.config.autoParagraph);c=CKEDITOR.htmlParser.fragment.fromHtml(c,a.context,f);f&&(h=c,!h.children.length&&CKEDITOR.dtd[h.name][f]&&(f=new CKEDITOR.htmlParser.element(f),h.add(f)));a.dataValue=c},null,null,5);d.on("toHtml",function(a){a.data.filter.applyTo(a.data.dataValue,
+!0,a.data.dontFilter,a.data.enterMode)&&d.fire("dataFiltered")},null,null,6);d.on("toHtml",function(a){a.data.dataValue.filterChildren(h.dataFilter,!0)},null,null,10);d.on("toHtml",function(a){a=a.data;var b=a.dataValue,d=new CKEDITOR.htmlParser.basicWriter;b.writeChildrenHtml(d);b=d.getHtml(!0);a.dataValue=v(b)},null,null,15);d.on("toDataFormat",function(a){var b=a.data.dataValue;a.data.enterMode!=CKEDITOR.ENTER_BR&&(b=b.replace(/^<br *\/?>/i,""));a.data.dataValue=CKEDITOR.htmlParser.fragment.fromHtml(b,
+a.data.context,e(a.data.enterMode,d.config.autoParagraph))},null,null,5);d.on("toDataFormat",function(a){a.data.dataValue.filterChildren(h.htmlFilter,!0)},null,null,10);d.on("toDataFormat",function(a){a.data.filter.applyTo(a.data.dataValue,!1,!0)},null,null,11);d.on("toDataFormat",function(a){var b=a.data.dataValue,c=h.writer;c.reset();b.writeChildrenHtml(c);b=c.getHtml(!0);b=r(b);b=w(b,d);a.data.dataValue=b},null,null,15)};CKEDITOR.htmlDataProcessor.prototype={toHtml:function(a,b,d,c){var g=this.editor,
+f,h,e,k;b&&"object"==typeof b?(f=b.context,d=b.fixForBody,c=b.dontFilter,h=b.filter,e=b.enterMode,k=b.protectedWhitespaces):f=b;f||null===f||(f=g.editable().getName());return g.fire("toHtml",{dataValue:a,context:f,fixForBody:d,dontFilter:c,filter:h||g.filter,enterMode:e||g.enterMode,protectedWhitespaces:k}).dataValue},toDataFormat:function(a,b){var d,c,g;b&&(d=b.context,c=b.filter,g=b.enterMode);d||null===d||(d=this.editor.editable().getName());return this.editor.fire("toDataFormat",{dataValue:a,
+filter:c||this.editor.filter,context:d,enterMode:g||this.editor.enterMode}).dataValue}};var q=/(?:&nbsp;|\xa0)$/,u="{cke_protected}",B=CKEDITOR.dtd,y="caption colgroup col thead tfoot tbody".split(" "),t=CKEDITOR.tools.extend({},B.$blockLimit,B.$block),x={elements:{input:k,textarea:k}},F={attributeNames:[[/^on/,"data-cke-pa-on"],[/^data-cke-expando$/,""]]},z={elements:{embed:function(a){var b=a.parent;if(b&&"object"==b.name){var d=b.attributes.width,b=b.attributes.height;d&&(a.attributes.width=d);
+b&&(a.attributes.height=b)}},a:function(a){var b=a.attributes;if(!(a.children.length||b.name||b.id||a.attributes["data-cke-saved-name"]))return!1}}},A={elementNames:[[/^cke:/,""],[/^\?xml:namespace$/,""]],attributeNames:[[/^data-cke-(saved|pa)-/,""],[/^data-cke-.*/,""],["hidefocus",""]],elements:{$:function(a){var b=a.attributes;if(b){if(b["data-cke-temp"])return!1;for(var d=["name","href","src"],c,g=0;g<d.length;g++)c="data-cke-saved-"+d[g],c in b&&delete b[d[g]]}return a},table:function(a){a.children.slice(0).sort(function(a,
+b){var d,c;a.type==CKEDITOR.NODE_ELEMENT&&b.type==a.type&&(d=CKEDITOR.tools.indexOf(y,a.name),c=CKEDITOR.tools.indexOf(y,b.name));-1<d&&-1<c&&d!=c||(d=a.parent?a.getIndex():-1,c=b.parent?b.getIndex():-1);return d>c?1:-1})},param:function(a){a.children=[];a.isEmpty=!0;return a},span:function(a){"Apple-style-span"==a.attributes["class"]&&delete a.name},html:function(a){delete a.attributes.contenteditable;delete a.attributes["class"]},body:function(a){delete a.attributes.spellcheck;delete a.attributes.contenteditable},
+style:function(a){var b=a.children[0];b&&b.value&&(b.value=CKEDITOR.tools.trim(b.value));a.attributes.type||(a.attributes.type="text/css")},title:function(a){var b=a.children[0];!b&&l(a,b=new CKEDITOR.htmlParser.text);b.value=a.attributes["data-cke-title"]||""},input:d,textarea:d},attributes:{"class":function(a){return CKEDITOR.tools.ltrim(a.replace(/(?:^|\s+)cke_[^\s]*/g,""))||!1}}};CKEDITOR.env.ie&&(A.attributes.style=function(a){return a.replace(/(^|;)([^\:]+)/g,function(a){return a.toLowerCase()})});
+var C=/<(a|area|img|input|source)\b([^>]*)>/gi,E=/([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,D=/^(href|src|name)$/i,I=/(?:<style(?=[ >])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,H=/(<textarea(?=[ >])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,M=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,P=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,G=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,S=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi}(),"use strict",CKEDITOR.htmlParser.element=
+function(a,e){this.name=a;this.attributes=e||{};this.children=[];var c=a||"",f=c.match(/^cke:(.*)/);f&&(c=f[1]);c=!!(CKEDITOR.dtd.$nonBodyContent[c]||CKEDITOR.dtd.$block[c]||CKEDITOR.dtd.$listItem[c]||CKEDITOR.dtd.$tableContent[c]||CKEDITOR.dtd.$nonEditable[c]||"br"==c);this.isEmpty=!!CKEDITOR.dtd.$empty[a];this.isUnknown=!CKEDITOR.dtd[a];this._={isBlockLike:c,hasInlineStarted:this.isEmpty||!c}},CKEDITOR.htmlParser.cssStyle=function(a){var e={};((a instanceof CKEDITOR.htmlParser.element?a.attributes.style:
+a)||"").replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(a,f,h){"font-family"==f&&(h=h.replace(/["']/g,""));e[f.toLowerCase()]=h});return{rules:e,populate:function(a){var f=this.toString();f&&(a instanceof CKEDITOR.dom.element?a.setAttribute("style",f):a instanceof CKEDITOR.htmlParser.element?a.attributes.style=f:a.style=f)},toString:function(){var a=[],f;for(f in e)e[f]&&a.push(f,":",e[f],";");return a.join("")}}},function(){function a(a){return function(c){return c.type==
+CKEDITOR.NODE_ELEMENT&&("string"==typeof a?c.name==a:c.name in a)}}var e=function(a,c){a=a[0];c=c[0];return a<c?-1:a>c?1:0},c=CKEDITOR.htmlParser.fragment.prototype;CKEDITOR.htmlParser.element.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_ELEMENT,add:c.add,clone:function(){return new CKEDITOR.htmlParser.element(this.name,this.attributes)},filter:function(a,c){var e=this,l,k;c=e.getFilterContext(c);if(c.off)return!0;if(!e.parent)a.onRoot(c,e);for(;;){l=e.name;if(!(k=
+a.onElementName(c,l)))return this.remove(),!1;e.name=k;if(!(e=a.onElement(c,e)))return this.remove(),!1;if(e!==this)return this.replaceWith(e),!1;if(e.name==l)break;if(e.type!=CKEDITOR.NODE_ELEMENT)return this.replaceWith(e),!1;if(!e.name)return this.replaceWithChildren(),!1}l=e.attributes;var d,b;for(d in l){for(k=l[d];;)if(b=a.onAttributeName(c,d))if(b!=d)delete l[d],d=b;else break;else{delete l[d];break}b&&(!1===(k=a.onAttribute(c,e,b,k))?delete l[b]:l[b]=k)}e.isEmpty||this.filterChildren(a,!1,
+c);return!0},filterChildren:c.filterChildren,writeHtml:function(a,c){c&&this.filter(c);var m=this.name,l=[],k=this.attributes,d,b;a.openTag(m,k);for(d in k)l.push([d,k[d]]);a.sortAttributes&&l.sort(e);d=0;for(b=l.length;d<b;d++)k=l[d],a.attribute(k[0],k[1]);a.openTagClose(m,this.isEmpty);this.writeChildrenHtml(a);this.isEmpty||a.closeTag(m)},writeChildrenHtml:c.writeChildrenHtml,replaceWithChildren:function(){for(var a=this.children,c=a.length;c;)a[--c].insertAfter(this);this.remove()},forEach:c.forEach,
+getFirst:function(c){if(!c)return this.children.length?this.children[0]:null;"function"!=typeof c&&(c=a(c));for(var h=0,e=this.children.length;h<e;++h)if(c(this.children[h]))return this.children[h];return null},getHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;this.writeChildrenHtml(a);return a.getHtml()},setHtml:function(a){a=this.children=CKEDITOR.htmlParser.fragment.fromHtml(a).children;for(var c=0,e=a.length;c<e;++c)a[c].parent=this},getOuterHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;
+this.writeHtml(a);return a.getHtml()},split:function(a){for(var c=this.children.splice(a,this.children.length-a),e=this.clone(),l=0;l<c.length;++l)c[l].parent=e;e.children=c;c[0]&&(c[0].previous=null);0<a&&(this.children[a-1].next=null);this.parent.add(e,this.getIndex()+1);return e},find:function(a,c){void 0===c&&(c=!1);var e=[],l;for(l=0;l<this.children.length;l++){var k=this.children[l];"function"==typeof a&&a(k)?e.push(k):"string"==typeof a&&k.name===a&&e.push(k);c&&k.find&&(e=e.concat(k.find(a,
+c)))}return e},addClass:function(a){if(!this.hasClass(a)){var c=this.attributes["class"]||"";this.attributes["class"]=c+(c?" ":"")+a}},removeClass:function(a){var c=this.attributes["class"];c&&((c=CKEDITOR.tools.trim(c.replace(new RegExp("(?:\\s+|^)"+a+"(?:\\s+|$)")," ")))?this.attributes["class"]=c:delete this.attributes["class"])},hasClass:function(a){var c=this.attributes["class"];return c?(new RegExp("(?:^|\\s)"+a+"(?\x3d\\s|$)")).test(c):!1},getFilterContext:function(a){var c=[];a||(a={off:!1,
+nonEditable:!1,nestedEditable:!1});a.off||"off"!=this.attributes["data-cke-processor"]||c.push("off",!0);a.nonEditable||"false"!=this.attributes.contenteditable?a.nonEditable&&!a.nestedEditable&&"true"==this.attributes.contenteditable&&c.push("nestedEditable",!0):c.push("nonEditable",!0);if(c.length){a=CKEDITOR.tools.copy(a);for(var e=0;e<c.length;e+=2)a[c[e]]=c[e+1]}return a}},!0)}(),function(){var a={},e=/{([^}]+)}/g,c=/([\\'])/g,f=/\n/g,h=/\r/g;CKEDITOR.template=function(m){if(a[m])this.output=
+a[m];else{var l=m.replace(c,"\\$1").replace(f,"\\n").replace(h,"\\r").replace(e,function(a,d){return"',data['"+d+"']\x3d\x3dundefined?'{"+d+"}':data['"+d+"'],'"});this.output=a[m]=Function("data","buffer","return buffer?buffer.push('"+l+"'):['"+l+"'].join('');")}}}(),delete CKEDITOR.loadFullCore,CKEDITOR.instances={},CKEDITOR.document=new CKEDITOR.dom.document(document),CKEDITOR.add=function(a){CKEDITOR.instances[a.name]=a;a.on("focus",function(){CKEDITOR.currentInstance!=a&&(CKEDITOR.currentInstance=
+a,CKEDITOR.fire("currentInstance"))});a.on("blur",function(){CKEDITOR.currentInstance==a&&(CKEDITOR.currentInstance=null,CKEDITOR.fire("currentInstance"))});CKEDITOR.fire("instance",null,a)},CKEDITOR.remove=function(a){delete CKEDITOR.instances[a.name]},function(){var a={};CKEDITOR.addTemplate=function(e,c){var f=a[e];if(f)return f;f={name:e,source:c};CKEDITOR.fire("template",f);return a[e]=new CKEDITOR.template(f.source)};CKEDITOR.getTemplate=function(e){return a[e]}}(),function(){var a=[];CKEDITOR.addCss=
+function(e){a.push(e)};CKEDITOR.getCss=function(){return a.join("\n")}}(),CKEDITOR.on("instanceDestroyed",function(){CKEDITOR.tools.isEmpty(this.instances)&&CKEDITOR.fire("reset")}),CKEDITOR.TRISTATE_ON=1,CKEDITOR.TRISTATE_OFF=2,CKEDITOR.TRISTATE_DISABLED=0,function(){CKEDITOR.inline=function(a,e){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var c=new CKEDITOR.editor(e,
+a,CKEDITOR.ELEMENT_MODE_INLINE),f=a.is("textarea")?a:null;f?(c.setData(f.getValue(),null,!0),a=CKEDITOR.dom.element.createFromHtml('\x3cdiv contenteditable\x3d"'+!!c.readOnly+'" class\x3d"cke_textarea_inline"\x3e'+f.getValue()+"\x3c/div\x3e",CKEDITOR.document),a.insertAfter(f),f.hide(),f.$.form&&c._attachToForm()):c.setData(a.getHtml(),null,!0);c.on("loaded",function(){c.fire("uiReady");c.editable(a);c.container=a;c.ui.contentsElement=a;c.setData(c.getData(1));c.resetDirty();c.fire("contentDom");
+c.mode="wysiwyg";c.fire("mode");c.status="ready";c.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,c)},null,null,1E4);c.on("destroy",function(){f&&(c.container.clearCustomData(),c.container.remove(),f.show());c.element.clearCustomData();delete c.element});return c};CKEDITOR.inlineAll=function(){var a,e,c;for(c in CKEDITOR.dtd.$editable)for(var f=CKEDITOR.document.getElementsByTag(c),h=0,m=f.count();h<m;h++)a=f.getItem(h),"true"==a.getAttribute("contenteditable")&&(e={element:a,config:{}},
+!1!==CKEDITOR.fire("inline",e)&&CKEDITOR.inline(a,e.config))};CKEDITOR.domReady(function(){!CKEDITOR.disableAutoInline&&CKEDITOR.inlineAll()})}(),CKEDITOR.replaceClass="ckeditor",function(){function a(a,h,m,l){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var k=new CKEDITOR.editor(h,a,l);l==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.setStyle("visibility","hidden"),k._.required=
+a.hasAttribute("required"),a.removeAttribute("required"));m&&k.setData(m,null,!0);k.on("loaded",function(){c(k);l==CKEDITOR.ELEMENT_MODE_REPLACE&&k.config.autoUpdateElement&&a.$.form&&k._attachToForm();k.setMode(k.config.startupMode,function(){k.resetDirty();k.status="ready";k.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,k)})});k.on("destroy",e);return k}function e(){var a=this.container,c=this.element;a&&(a.clearCustomData(),a.remove());c&&(c.clearCustomData(),this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&
+(c.show(),this._.required&&c.setAttribute("required","required")),delete this.element)}function c(a){var c=a.name,e=a.element,l=a.elementMode,k=a.fire("uiSpace",{space:"top",html:""}).html,d=a.fire("uiSpace",{space:"bottom",html:""}).html,b=new CKEDITOR.template('\x3c{outerEl} id\x3d"cke_{name}" class\x3d"{id} cke cke_reset cke_chrome cke_editor_{name} cke_{langDir} '+CKEDITOR.env.cssClass+'"  dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"application"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':
+"")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':"")+'\x3c{outerEl} class\x3d"cke_inner cke_reset" role\x3d"presentation"\x3e{topHtml}\x3c{outerEl} id\x3d"{contentId}" class\x3d"cke_contents cke_reset" role\x3d"presentation"\x3e\x3c/{outerEl}\x3e{bottomHtml}\x3c/{outerEl}\x3e\x3c/{outerEl}\x3e'),c=CKEDITOR.dom.element.createFromHtml(b.output({id:a.id,name:c,langDir:a.lang.dir,langCode:a.langCode,voiceLabel:a.title,topHtml:k?'\x3cspan id\x3d"'+
+a.ui.spaceId("top")+'" class\x3d"cke_top cke_reset_all" role\x3d"presentation" style\x3d"height:auto"\x3e'+k+"\x3c/span\x3e":"",contentId:a.ui.spaceId("contents"),bottomHtml:d?'\x3cspan id\x3d"'+a.ui.spaceId("bottom")+'" class\x3d"cke_bottom cke_reset_all" role\x3d"presentation"\x3e'+d+"\x3c/span\x3e":"",outerEl:CKEDITOR.env.ie?"span":"div"}));l==CKEDITOR.ELEMENT_MODE_REPLACE?(e.hide(),c.insertAfter(e)):e.append(c);a.container=c;a.ui.contentsElement=a.ui.space("contents");k&&a.ui.space("top").unselectable();
+d&&a.ui.space("bottom").unselectable();e=a.config.width;l=a.config.height;e&&c.setStyle("width",CKEDITOR.tools.cssLength(e));l&&a.ui.space("contents").setStyle("height",CKEDITOR.tools.cssLength(l));c.disableContextMenu();CKEDITOR.env.webkit&&c.on("focus",function(){a.focus()});a.fireOnce("uiReady")}CKEDITOR.replace=function(c,e){return a(c,e,null,CKEDITOR.ELEMENT_MODE_REPLACE)};CKEDITOR.appendTo=function(c,e,m){return a(c,e,m,CKEDITOR.ELEMENT_MODE_APPENDTO)};CKEDITOR.replaceAll=function(){for(var a=
+document.getElementsByTagName("textarea"),c=0;c<a.length;c++){var e=null,l=a[c];if(l.name||l.id){if("string"==typeof arguments[0]){if(!(new RegExp("(?:^|\\s)"+arguments[0]+"(?:$|\\s)")).test(l.className))continue}else if("function"==typeof arguments[0]&&(e={},!1===arguments[0](l,e)))continue;this.replace(l,e)}}};CKEDITOR.editor.prototype.addMode=function(a,c){(this._.modes||(this._.modes={}))[a]=c};CKEDITOR.editor.prototype.setMode=function(a,c){var e=this,l=this._.modes;if(a!=e.mode&&l&&l[a]){e.fire("beforeSetMode",
+a);if(e.mode){var k=e.checkDirty(),l=e._.previousModeData,d,b=0;e.fire("beforeModeUnload");e.editable(0);e._.previousMode=e.mode;e._.previousModeData=d=e.getData(1);"source"==e.mode&&l==d&&(e.fire("lockSnapshot",{forceUpdate:!0}),b=1);e.ui.space("contents").setHtml("");e.mode=""}else e._.previousModeData=e.getData(1);this._.modes[a](function(){e.mode=a;void 0!==k&&!k&&e.resetDirty();b?e.fire("unlockSnapshot"):"wysiwyg"==a&&e.fire("saveSnapshot");setTimeout(function(){e.fire("mode");c&&c.call(e)},
+0)})}};CKEDITOR.editor.prototype.resize=function(a,c,e,l){var k=this.container,d=this.ui.space("contents"),b=CKEDITOR.env.webkit&&this.document&&this.document.getWindow().$.frameElement;l=l?this.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}):k;l.setSize("width",a,!0);b&&(b.style.width="1%");var g=(l.$.offsetHeight||0)-(d.$.clientHeight||0),k=Math.max(c-(e?0:g),0);c=e?c+g:c;d.setStyle("height",k+"px");b&&(b.style.width="100%");this.fire("resize",{outerHeight:c,
+contentsHeight:k,outerWidth:a||l.getSize("width")})};CKEDITOR.editor.prototype.getResizable=function(a){return a?this.ui.space("contents"):this.container};CKEDITOR.domReady(function(){CKEDITOR.replaceClass&&CKEDITOR.replaceAll(CKEDITOR.replaceClass)})}(),CKEDITOR.config.startupMode="wysiwyg",function(){function a(a){var b=a.editor,d=a.data.path,c=d.blockLimit,g=a.data.selection,h=g.getRanges()[0],k;if(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller)if(g=e(g,d))g.appendBogus(),k=CKEDITOR.env.ie;
+l(b,d.block,c)&&h.collapsed&&!h.getCommonAncestor().isReadOnly()&&(d=h.clone(),d.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS),c=new CKEDITOR.dom.walker(d),c.guard=function(a){return!f(a)||a.type==CKEDITOR.NODE_COMMENT||a.isReadOnly()},!c.checkForward()||d.checkStartOfBlock()&&d.checkEndOfBlock())&&(b=h.fixBlock(!0,b.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p"),CKEDITOR.env.needsBrFiller||(b=b.getFirst(f))&&b.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(b.getText()).match(/^(?:&nbsp;|\xa0)$/)&&b.remove(),
+k=1,a.cancel());k&&h.select()}function e(a,b){if(a.isFake)return 0;var d=b.block||b.blockLimit,c=d&&d.getLast(f);if(!(!d||!d.isBlockBoundary()||c&&c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()||d.is("pre")||d.getBogus()))return d}function c(a){var b=a.data.getTarget();b.is("input")&&(b=b.getAttribute("type"),"submit"!=b&&"reset"!=b||a.data.preventDefault())}function f(a){return g(a)&&p(a)}function h(a,b){return function(d){var c=d.data.$.toElement||d.data.$.fromElement||d.data.$.relatedTarget;
+(c=c&&c.nodeType==CKEDITOR.NODE_ELEMENT?new CKEDITOR.dom.element(c):null)&&(b.equals(c)||b.contains(c))||a.call(this,d)}}function m(a){function b(a){return function(b,c){c&&b.type==CKEDITOR.NODE_ELEMENT&&b.is(g)&&(d=b);if(!(c||!f(b)||a&&r(b)))return!1}}var d,c=a.getRanges()[0];a=a.root;var g={table:1,ul:1,ol:1,dl:1};if(c.startPath().contains(g)){var e=c.clone();e.collapse(1);e.setStartAt(a,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(e);a.guard=b();a.checkBackward();if(d)return e=c.clone(),
+e.collapse(),e.setEndAt(d,CKEDITOR.POSITION_AFTER_END),a=new CKEDITOR.dom.walker(e),a.guard=b(!0),d=!1,a.checkForward(),d}return null}function l(a,b,d){return!1!==a.config.autoParagraph&&a.activeEnterMode!=CKEDITOR.ENTER_BR&&(a.editable().equals(d)&&!b||b&&"true"==b.getAttribute("contenteditable"))}function k(a){return a.activeEnterMode!=CKEDITOR.ENTER_BR&&!1!==a.config.autoParagraph?a.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p":!1}function d(a){var b=a.editor;b.getSelection().scrollIntoView();
+setTimeout(function(){b.fire("saveSnapshot")},0)}function b(a,b,d){var c=a.getCommonAncestor(b);for(b=a=d?b:a;(a=a.getParent())&&!c.equals(a)&&1==a.getChildCount();)b=a;b.remove()}var g,p,v,r,w,n,q,u,B,y;CKEDITOR.editable=CKEDITOR.tools.createClass({base:CKEDITOR.dom.element,$:function(a,b){this.base(b.$||b);this.editor=a;this.status="unloaded";this.hasFocus=!1;this.setup()},proto:{focus:function(){var a;if(CKEDITOR.env.webkit&&!this.hasFocus&&(a=this.editor._.previousActive||this.getDocument().getActive(),
+this.contains(a))){a.focus();return}CKEDITOR.env.edge&&14<CKEDITOR.env.version&&!this.hasFocus&&this.getDocument().equals(CKEDITOR.document)&&(this.editor._.previousScrollTop=this.$.scrollTop);try{!CKEDITOR.env.ie||CKEDITOR.env.edge&&14<CKEDITOR.env.version||!this.getDocument().equals(CKEDITOR.document)?this.$.focus():this.$.setActive()}catch(b){if(!CKEDITOR.env.ie)throw b;}CKEDITOR.env.safari&&!this.isInline()&&(a=CKEDITOR.document.getActive(),a.equals(this.getWindow().getFrame())||this.getWindow().focus())},
+on:function(a,b){var d=Array.prototype.slice.call(arguments,0);CKEDITOR.env.ie&&/^focus|blur$/.exec(a)&&(a="focus"==a?"focusin":"focusout",b=h(b,this),d[0]=a,d[1]=b);return CKEDITOR.dom.element.prototype.on.apply(this,d)},attachListener:function(a){!this._.listeners&&(this._.listeners=[]);var b=Array.prototype.slice.call(arguments,1),b=a.on.apply(a,b);this._.listeners.push(b);return b},clearListeners:function(){var a=this._.listeners;try{for(;a.length;)a.pop().removeListener()}catch(b){}},restoreAttrs:function(){var a=
+this._.attrChanges,b,d;for(d in a)a.hasOwnProperty(d)&&(b=a[d],null!==b?this.setAttribute(d,b):this.removeAttribute(d))},attachClass:function(a){var b=this.getCustomData("classes");this.hasClass(a)||(!b&&(b=[]),b.push(a),this.setCustomData("classes",b),this.addClass(a))},changeAttr:function(a,b){var d=this.getAttribute(a);b!==d&&(!this._.attrChanges&&(this._.attrChanges={}),a in this._.attrChanges||(this._.attrChanges[a]=d),this.setAttribute(a,b))},insertText:function(a){this.editor.focus();this.insertHtml(this.transformPlainTextToHtml(a),
+"text")},transformPlainTextToHtml:function(a){var b=this.editor.getSelection().getStartElement().hasAscendant("pre",!0)?CKEDITOR.ENTER_BR:this.editor.activeEnterMode;return CKEDITOR.tools.transformPlainTextToHtml(a,b)},insertHtml:function(a,b,c){var g=this.editor;g.focus();g.fire("saveSnapshot");c||(c=g.getSelection().getRanges()[0]);n(this,b||"html",a,c);c.select();d(this);this.editor.fire("afterInsertHtml",{})},insertHtmlIntoRange:function(a,b,d){n(this,d||"html",a,b);this.editor.fire("afterInsertHtml",
+{intoRange:b})},insertElement:function(a,b){var c=this.editor;c.focus();c.fire("saveSnapshot");var g=c.activeEnterMode,c=c.getSelection(),e=a.getName(),e=CKEDITOR.dtd.$block[e];b||(b=c.getRanges()[0]);this.insertElementIntoRange(a,b)&&(b.moveToPosition(a,CKEDITOR.POSITION_AFTER_END),e&&((e=a.getNext(function(a){return f(a)&&!r(a)}))&&e.type==CKEDITOR.NODE_ELEMENT&&e.is(CKEDITOR.dtd.$block)?e.getDtd()["#"]?b.moveToElementEditStart(e):b.moveToElementEditEnd(a):e||g==CKEDITOR.ENTER_BR||(e=b.fixBlock(!0,
+g==CKEDITOR.ENTER_DIV?"div":"p"),b.moveToElementEditStart(e))));c.selectRanges([b]);d(this)},insertElementIntoSelection:function(a){this.insertElement(a)},insertElementIntoRange:function(a,b){var d=this.editor,c=d.config.enterMode,g=a.getName(),f=CKEDITOR.dtd.$block[g];if(b.checkReadOnly())return!1;b.deleteContents(1);b.startContainer.type==CKEDITOR.NODE_ELEMENT&&(b.startContainer.is({tr:1,table:1,tbody:1,thead:1,tfoot:1})?q(b):b.startContainer.is(CKEDITOR.dtd.$list)&&u(b));var e,h;if(f)for(;(e=b.getCommonAncestor(0,
+1))&&(h=CKEDITOR.dtd[e.getName()])&&(!h||!h[g]);)e.getName()in CKEDITOR.dtd.span?b.splitElement(e):b.checkStartOfBlock()&&b.checkEndOfBlock()?(b.setStartBefore(e),b.collapse(!0),e.remove()):b.splitBlock(c==CKEDITOR.ENTER_DIV?"div":"p",d.editable());b.insertNode(a);return!0},setData:function(a,b){b||(a=this.editor.dataProcessor.toHtml(a));this.setHtml(a);this.fixInitialSelection();"unloaded"==this.status&&(this.status="ready");this.editor.fire("dataReady")},getData:function(a){var b=this.getHtml();
+a||(b=this.editor.dataProcessor.toDataFormat(b));return b},setReadOnly:function(a){this.setAttribute("contenteditable",!a)},detach:function(){this.removeClass("cke_editable");this.status="detached";var a=this.editor;this._.detach();delete a.document;delete a.window},isInline:function(){return this.getDocument().equals(CKEDITOR.document)},fixInitialSelection:function(){function a(){var b=d.getDocument().$,c=b.getSelection(),g;a:if(c.anchorNode&&c.anchorNode==d.$)g=!0;else{if(CKEDITOR.env.webkit&&(g=
+d.getDocument().getActive())&&g.equals(d)&&!c.anchorNode){g=!0;break a}g=void 0}g&&(g=new CKEDITOR.dom.range(d),g.moveToElementEditStart(d),b=b.createRange(),b.setStart(g.startContainer.$,g.startOffset),b.collapse(!0),c.removeAllRanges(),c.addRange(b))}function b(){var a=d.getDocument().$,c=a.selection,g=d.getDocument().getActive();"None"==c.type&&g.equals(d)&&(c=new CKEDITOR.dom.range(d),a=a.body.createTextRange(),c.moveToElementEditStart(d),c=c.startContainer,c.type!=CKEDITOR.NODE_ELEMENT&&(c=c.getParent()),
+a.moveToElementText(c.$),a.collapse(!0),a.select())}var d=this;if(CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.quirks))this.hasFocus&&(this.focus(),b());else if(this.hasFocus)this.focus(),a();else this.once("focus",function(){a()},null,null,-999)},getHtmlFromRange:function(a){if(a.collapsed)return new CKEDITOR.dom.documentFragment(a.document);a={doc:this.getDocument(),range:a.clone()};B.eol.detect(a,this);B.bogus.exclude(a);B.cell.shrink(a);a.fragment=a.range.cloneContents();B.tree.rebuild(a,
+this);B.eol.fix(a,this);return new CKEDITOR.dom.documentFragment(a.fragment.$)},extractHtmlFromRange:function(a,b){var d=y,c={range:a,doc:a.document},g=this.getHtmlFromRange(a);if(a.collapsed)return a.optimize(),g;a.enlarge(CKEDITOR.ENLARGE_INLINE,1);d.table.detectPurge(c);c.bookmark=a.createBookmark();delete c.range;var f=this.editor.createRange();f.moveToPosition(c.bookmark.startNode,CKEDITOR.POSITION_BEFORE_START);c.targetBookmark=f.createBookmark();d.list.detectMerge(c,this);d.table.detectRanges(c,
+this);d.block.detectMerge(c,this);c.tableContentsRanges?(d.table.deleteRanges(c),a.moveToBookmark(c.bookmark),c.range=a):(a.moveToBookmark(c.bookmark),c.range=a,a.extractContents(d.detectExtractMerge(c)));a.moveToBookmark(c.targetBookmark);a.optimize();d.fixUneditableRangePosition(a);d.list.merge(c,this);d.table.purge(c,this);d.block.merge(c,this);if(b){d=a.startPath();if(c=a.checkStartOfBlock()&&a.checkEndOfBlock()&&d.block&&!a.root.equals(d.block)){a:{var c=d.block.getElementsByTag("span"),f=0,
+e;if(c)for(;e=c.getItem(f++);)if(!p(e)){c=!0;break a}c=!1}c=!c}c&&(a.moveToPosition(d.block,CKEDITOR.POSITION_BEFORE_START),d.block.remove())}else d.autoParagraph(this.editor,a),v(a.startContainer)&&a.startContainer.appendBogus();a.startContainer.mergeSiblings();return g},setup:function(){var a=this.editor;this.attachListener(a,"beforeGetData",function(){var b=this.getData();this.is("textarea")||!1!==a.config.ignoreEmptyParagraph&&(b=b.replace(w,function(a,b){return b}));a.setData(b,null,1)},this);
+this.attachListener(a,"getSnapshot",function(a){a.data=this.getData(1)},this);this.attachListener(a,"afterSetData",function(){this.setData(a.getData(1))},this);this.attachListener(a,"loadSnapshot",function(a){this.setData(a.data,1)},this);this.attachListener(a,"beforeFocus",function(){var b=a.getSelection();(b=b&&b.getNative())&&"Control"==b.type||this.focus()},this);this.attachListener(a,"insertHtml",function(a){this.insertHtml(a.data.dataValue,a.data.mode,a.data.range)},this);this.attachListener(a,
+"insertElement",function(a){this.insertElement(a.data)},this);this.attachListener(a,"insertText",function(a){this.insertText(a.data)},this);this.setReadOnly(a.readOnly);this.attachClass("cke_editable");a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?this.attachClass("cke_editable_inline"):a.elementMode!=CKEDITOR.ELEMENT_MODE_REPLACE&&a.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||this.attachClass("cke_editable_themed");this.attachClass("cke_contents_"+a.config.contentsLangDirection);a.keystrokeHandler.blockedKeystrokes[8]=
++a.readOnly;a.keystrokeHandler.attach(this);this.on("blur",function(){this.hasFocus=!1},null,null,-1);this.on("focus",function(){this.hasFocus=!0},null,null,-1);if(CKEDITOR.env.webkit)this.on("scroll",function(){a._.previousScrollTop=a.editable().$.scrollTop},null,null,-1);if(CKEDITOR.env.edge&&14<CKEDITOR.env.version){var d=function(){var b=a.editable();null!=a._.previousScrollTop&&b.getDocument().equals(CKEDITOR.document)&&(b.$.scrollTop=a._.previousScrollTop,a._.previousScrollTop=null,this.removeListener("scroll",
+d))};this.on("scroll",d)}a.focusManager.add(this);this.equals(CKEDITOR.document.getActive())&&(this.hasFocus=!0,a.once("contentDom",function(){a.focusManager.focus(this)},this));this.isInline()&&this.changeAttr("tabindex",a.tabIndex);if(!this.is("textarea")){a.document=this.getDocument();a.window=this.getWindow();var e=a.document;this.changeAttr("spellcheck",!a.config.disableNativeSpellChecker);var h=a.config.contentsLangDirection;this.getDirection(1)!=h&&this.changeAttr("dir",h);var k=CKEDITOR.getCss();
+if(k){var h=e.getHead(),l=h.getCustomData("stylesheet");l?k!=l.getText()&&(CKEDITOR.env.ie&&9>CKEDITOR.env.version?l.$.styleSheet.cssText=k:l.setText(k)):(k=e.appendStyleText(k),k=new CKEDITOR.dom.element(k.ownerNode||k.owningElement),h.setCustomData("stylesheet",k),k.data("cke-temp",1))}h=e.getCustomData("stylesheet_ref")||0;e.setCustomData("stylesheet_ref",h+1);this.setCustomData("cke_includeReadonly",!a.config.disableReadonlyStyling);this.attachListener(this,"click",function(a){a=a.data;var b=
+(new CKEDITOR.dom.elementPath(a.getTarget(),this)).contains("a");b&&2!=a.$.button&&b.isReadOnly()&&a.preventDefault()});var p={8:1,46:1};this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var d=b.data.domEvent.getKey(),c;if(d in p){b=a.getSelection();var f,e=b.getRanges()[0],h=e.startPath(),k,l,n,d=8==d;CKEDITOR.env.ie&&11>CKEDITOR.env.version&&(f=b.getSelectedElement())||(f=m(b))?(a.fire("saveSnapshot"),e.moveToPosition(f,CKEDITOR.POSITION_BEFORE_START),f.remove(),e.select(),a.fire("saveSnapshot"),
+c=1):e.collapsed&&((k=h.block)&&(n=k[d?"getPrevious":"getNext"](g))&&n.type==CKEDITOR.NODE_ELEMENT&&n.is("table")&&e[d?"checkStartOfBlock":"checkEndOfBlock"]()?(a.fire("saveSnapshot"),e[d?"checkEndOfBlock":"checkStartOfBlock"]()&&k.remove(),e["moveToElementEdit"+(d?"End":"Start")](n),e.select(),a.fire("saveSnapshot"),c=1):h.blockLimit&&h.blockLimit.is("td")&&(l=h.blockLimit.getAscendant("table"))&&e.checkBoundaryOfElement(l,d?CKEDITOR.START:CKEDITOR.END)&&(n=l[d?"getPrevious":"getNext"](g))?(a.fire("saveSnapshot"),
+e["moveToElementEdit"+(d?"End":"Start")](n),e.checkStartOfBlock()&&e.checkEndOfBlock()?n.remove():e.select(),a.fire("saveSnapshot"),c=1):(l=h.contains(["td","th","caption"]))&&e.checkBoundaryOfElement(l,d?CKEDITOR.START:CKEDITOR.END)&&(c=1))}return!c});a.blockless&&CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller&&this.attachListener(this,"keyup",function(b){b.data.getKeystroke()in p&&!this.getFirst(f)&&(this.appendBogus(),b=a.createRange(),b.moveToPosition(this,CKEDITOR.POSITION_AFTER_START),b.select())});
+this.attachListener(this,"dblclick",function(b){if(a.readOnly)return!1;b={element:b.data.getTarget()};a.fire("doubleclick",b)});CKEDITOR.env.ie&&this.attachListener(this,"click",c);CKEDITOR.env.ie&&!CKEDITOR.env.edge||this.attachListener(this,"mousedown",function(b){var d=b.data.getTarget();d.is("img","hr","input","textarea","select")&&!d.isReadOnly()&&(a.getSelection().selectElement(d),d.is("input","textarea","select")&&b.data.preventDefault())});CKEDITOR.env.edge&&this.attachListener(this,"mouseup",
+function(b){(b=b.data.getTarget())&&b.is("img")&&a.getSelection().selectElement(b)});CKEDITOR.env.gecko&&this.attachListener(this,"mouseup",function(b){if(2==b.data.$.button&&(b=b.data.getTarget(),!b.getOuterHtml().replace(w,""))){var d=a.createRange();d.moveToElementEditStart(b);d.select(!0)}});CKEDITOR.env.webkit&&(this.attachListener(this,"click",function(a){a.data.getTarget().is("input","select")&&a.data.preventDefault()}),this.attachListener(this,"mouseup",function(a){a.data.getTarget().is("input",
+"textarea")&&a.data.preventDefault()}));CKEDITOR.env.webkit&&this.attachListener(a,"key",function(d){if(a.readOnly)return!0;d=d.data.domEvent.getKey();if(d in p){var c=8==d,g=a.getSelection().getRanges()[0];d=g.startPath();if(g.collapsed)a:{var e=d.block;if(e&&g[c?"checkStartOfBlock":"checkEndOfBlock"]()&&g.moveToClosestEditablePosition(e,!c)&&g.collapsed){if(g.startContainer.type==CKEDITOR.NODE_ELEMENT){var f=g.startContainer.getChild(g.startOffset-(c?1:0));if(f&&f.type==CKEDITOR.NODE_ELEMENT&&f.is("hr")){a.fire("saveSnapshot");
+f.remove();d=!0;break a}}g=g.startPath().block;if(!g||g&&g.contains(e))d=void 0;else{a.fire("saveSnapshot");var h;(h=(c?g:e).getBogus())&&h.remove();h=a.getSelection();f=h.createBookmarks();(c?e:g).moveChildren(c?g:e,!1);d.lastElement.mergeSiblings();b(e,g,!c);h.selectBookmarks(f);d=!0}}else d=!1}else c=g,h=d.block,g=c.endPath().block,h&&g&&!h.equals(g)?(a.fire("saveSnapshot"),(e=h.getBogus())&&e.remove(),c.enlarge(CKEDITOR.ENLARGE_INLINE),c.deleteContents(),g.getParent()&&(g.moveChildren(h,!1),d.lastElement.mergeSiblings(),
+b(h,g,!0)),c=a.getSelection().getRanges()[0],c.collapse(1),c.optimize(),""===c.startContainer.getHtml()&&c.startContainer.appendBogus(),c.select(),d=!0):d=!1;if(!d)return;a.getSelection().scrollIntoView();a.fire("saveSnapshot");return!1}},this,null,100)}}},_:{detach:function(){this.editor.setData(this.editor.getData(),0,1);this.clearListeners();this.restoreAttrs();var a;if(a=this.removeCustomData("classes"))for(;a.length;)this.removeClass(a.pop());if(!this.is("textarea")){a=this.getDocument();var b=
+a.getHead();if(b.getCustomData("stylesheet")){var d=a.getCustomData("stylesheet_ref");--d?a.setCustomData("stylesheet_ref",d):(a.removeCustomData("stylesheet_ref"),b.removeCustomData("stylesheet").remove())}}this.editor.fire("contentDomUnload");delete this.editor}}});CKEDITOR.editor.prototype.editable=function(a){var b=this._.editable;if(b&&a)return 0;arguments.length&&(b=this._.editable=a?a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,a):(b&&b.detach(),null));return b};CKEDITOR.on("instanceLoaded",
+function(b){var d=b.editor;d.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&a.data("cke-editable",a.hasAttribute("contenteditable")?"true":"1"),a.setAttribute("contentEditable",!1))});d.on("selectionChange",function(b){if(!d.readOnly){var c=d.getSelection();c&&!c.isLocked&&(c=d.checkDirty(),d.fire("lockSnapshot"),a(b),d.fire("unlockSnapshot"),!c&&d.resetDirty())}})});CKEDITOR.on("instanceCreated",
+function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var d=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-label",d);d&&a.changeAttr("title",d);var c=b.fire("ariaEditorHelpLabel",{}).label;if(c&&(d=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":"contents"))){var g=CKEDITOR.tools.getNextId(),c=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+g+'" class\x3d"cke_voice_label"\x3e'+c+"\x3c/span\x3e");d.append(c);a.changeAttr("aria-describedby",
+g)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");g=CKEDITOR.dom.walker.whitespaces(!0);p=CKEDITOR.dom.walker.bookmark(!1,!0);v=CKEDITOR.dom.walker.empty();r=CKEDITOR.dom.walker.bogus();w=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;n=function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT}function b(d,c){var g,e,f,h,k=[],l=c.range.startContainer;
+g=c.range.startPath();for(var l=p[l.getName()],n=0,m=d.getChildren(),q=m.count(),w=-1,u=-1,v=0,r=g.contains(p.$list);n<q;++n)g=m.getItem(n),a(g)?(f=g.getName(),r&&f in CKEDITOR.dtd.$list?k=k.concat(b(g,c)):(h=!!l[f],"br"!=f||!g.data("cke-eol")||n&&n!=q-1||(v=(e=n?k[n-1].node:m.getItem(n+1))&&(!a(e)||!e.is("br")),e=e&&a(e)&&p.$block[e.getName()]),-1!=w||h||(w=n),h||(u=n),k.push({isElement:1,isLineBreak:v,isBlock:g.isBlockBoundary(),hasBlockSibling:e,node:g,name:f,allowed:h}),e=v=0)):k.push({isElement:0,
+node:g,allowed:1});-1<w&&(k[w].firstNotAllowed=1);-1<u&&(k[u].lastNotAllowed=1);return k}function d(b,c){var g=[],e=b.getChildren(),f=e.count(),h,k=0,l=p[c],n=!b.is(p.$inline)||b.is("br");for(n&&g.push(" ");k<f;k++)h=e.getItem(k),a(h)&&!h.is(l)?g=g.concat(d(h,c)):g.push(h);n&&g.push(" ");return g}function c(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function g(b){return b&&a(b)&&(b.is(p.$removeEmpty)||b.is("a")&&!b.isBlockBoundary())}function e(b,d,c,g){var f=b.clone(),
+h,k;f.setEndAt(d,CKEDITOR.POSITION_BEFORE_END);(h=(new CKEDITOR.dom.walker(f)).next())&&a(h)&&n[h.getName()]&&(k=h.getPrevious())&&a(k)&&!k.getParent().equals(b.startContainer)&&c.contains(k)&&g.contains(h)&&h.isIdentical(k)&&(h.moveChildren(k),h.remove(),e(b,d,c,g))}function h(b,d){function c(b,d){if(d.isBlock&&d.isElement&&!d.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var g=d.endContainer.getChild(d.endOffset),e=d.endContainer.getChild(d.endOffset-1);g&&c(g,b[b.length-1]);e&&c(e,b[0])&&
+(d.setEnd(d.endContainer,d.endOffset-1),d.collapse())}var p=CKEDITOR.dtd,n={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},m={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},q=CKEDITOR.tools.extend({},p.$inline);delete q.br;return function(n,G,w,u){var v=n.editor,r=!1;"unfiltered_html"==G&&(G="html",r=!0);if(!u.checkReadOnly()){var B=(new CKEDITOR.dom.elementPath(u.startContainer,u.root)).blockLimit||u.root;n={type:G,dontFilter:r,editable:n,editor:v,range:u,blockLimit:B,
+mergeCandidates:[],zombies:[]};G=n.range;u=n.mergeCandidates;var y,I;"text"==n.type&&G.shrink(CKEDITOR.SHRINK_ELEMENT,!0,!1)&&(y=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",G.document),G.insertNode(y),G.setStartAfter(y));r=new CKEDITOR.dom.elementPath(G.startContainer);n.endPath=B=new CKEDITOR.dom.elementPath(G.endContainer);if(!G.collapsed){var v=B.block||B.blockLimit,X=G.getCommonAncestor();v&&!v.equals(X)&&!v.contains(X)&&G.checkEndOfBlock()&&n.zombies.push(v);G.deleteContents()}for(;(I=
+c(G))&&a(I)&&I.isBlockBoundary()&&r.contains(I);)G.moveToPosition(I,CKEDITOR.POSITION_BEFORE_END);e(G,n.blockLimit,r,B);y&&(G.setEndBefore(y),G.collapse(),y.remove());y=G.startPath();if(v=y.contains(g,!1,1))G.splitElement(v),n.inlineStylesRoot=v,n.inlineStylesPeak=y.lastElement;y=G.createBookmark();(v=y.startNode.getPrevious(f))&&a(v)&&g(v)&&u.push(v);(v=y.startNode.getNext(f))&&a(v)&&g(v)&&u.push(v);for(v=y.startNode;(v=v.getParent())&&g(v);)u.push(v);G.moveToBookmark(y);if(y=w){y=n.range;if("text"==
+n.type&&n.inlineStylesRoot){I=n.inlineStylesPeak;G=I.getDocument().createText("{cke-peak}");for(u=n.inlineStylesRoot.getParent();!I.equals(u);)G=G.appendTo(I.clone()),I=I.getParent();w=G.getOuterHtml().split("{cke-peak}").join(w)}I=n.blockLimit.getName();if(/^\s+|\s+$/.test(w)&&"span"in CKEDITOR.dtd[I]){var N='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';w=N+w+N}w=n.editor.dataProcessor.toHtml(w,{context:null,fixForBody:!1,protectedWhitespaces:!!N,dontFilter:n.dontFilter,filter:n.editor.activeFilter,
+enterMode:n.editor.activeEnterMode});I=y.document.createElement("body");I.setHtml(w);N&&(I.getFirst().remove(),I.getLast().remove());if((N=y.startPath().block)&&(1!=N.getChildCount()||!N.getBogus()))a:{var J;if(1==I.getChildCount()&&a(J=I.getFirst())&&J.is(m)&&!J.hasAttribute("contenteditable")){N=J.getElementsByTag("*");y=0;for(u=N.count();y<u;y++)if(G=N.getItem(y),!G.is(q))break a;J.moveChildren(J.getParent(1));J.remove()}}n.dataWrapper=I;y=w}if(y){J=n.range;y=J.document;var Q;I=n.blockLimit;u=
+0;var U,N=[],K,ba;w=v=0;var Y,ca;G=J.startContainer;var r=n.endPath.elements[0],da,B=r.getPosition(G),X=!!r.getCommonAncestor(G)&&B!=CKEDITOR.POSITION_IDENTICAL&&!(B&CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED);G=b(n.dataWrapper,n);for(h(G,J);u<G.length;u++){B=G[u];if(Q=B.isLineBreak){Q=J;Y=I;var aa=void 0,ea=void 0;B.hasBlockSibling?Q=1:(aa=Q.startContainer.getAscendant(p.$block,1))&&aa.is({div:1,p:1})?(ea=aa.getPosition(Y),ea==CKEDITOR.POSITION_IDENTICAL||ea==CKEDITOR.POSITION_CONTAINS?
+Q=0:(Y=Q.splitElement(aa),Q.moveToPosition(Y,CKEDITOR.POSITION_AFTER_START),Q=1)):Q=0}if(Q)w=0<u;else{Q=J.startPath();!B.isBlock&&l(n.editor,Q.block,Q.blockLimit)&&(ba=k(n.editor))&&(ba=y.createElement(ba),ba.appendBogus(),J.insertNode(ba),CKEDITOR.env.needsBrFiller&&(U=ba.getBogus())&&U.remove(),J.moveToPosition(ba,CKEDITOR.POSITION_BEFORE_END));if((Q=J.startPath().block)&&!Q.equals(K)){if(U=Q.getBogus())U.remove(),N.push(Q);K=Q}B.firstNotAllowed&&(v=1);if(v&&B.isElement){Q=J.startContainer;for(Y=
+null;Q&&!p[Q.getName()][B.name];){if(Q.equals(I)){Q=null;break}Y=Q;Q=Q.getParent()}if(Q)Y&&(ca=J.splitElement(Y),n.zombies.push(ca),n.zombies.push(Y));else{Y=I.getName();da=!u;Q=u==G.length-1;Y=d(B.node,Y);for(var aa=[],ea=Y.length,fa=0,ha=void 0,ia=0,ga=-1;fa<ea;fa++)ha=Y[fa]," "==ha?(ia||da&&!fa||(aa.push(new CKEDITOR.dom.text(" ")),ga=aa.length),ia=1):(aa.push(ha),ia=0);Q&&ga==aa.length&&aa.pop();da=aa}}if(da){for(;Q=da.pop();)J.insertNode(Q);da=0}else J.insertNode(B.node);B.lastNotAllowed&&u<
+G.length-1&&((ca=X?r:ca)&&J.setEndAt(ca,CKEDITOR.POSITION_AFTER_START),v=0);J.collapse()}}1!=G.length?U=!1:(U=G[0],U=U.isElement&&"false"==U.node.getAttribute("contenteditable"));U&&(w=!0,Q=G[0].node,J.setStartAt(Q,CKEDITOR.POSITION_BEFORE_START),J.setEndAt(Q,CKEDITOR.POSITION_AFTER_END));n.dontMoveCaret=w;n.bogusNeededBlocks=N}U=n.range;var Z;ca=n.bogusNeededBlocks;for(da=U.createBookmark();K=n.zombies.pop();)K.getParent()&&(ba=U.clone(),ba.moveToElementEditStart(K),ba.removeEmptyBlocksAtEnd());
+if(ca)for(;K=ca.pop();)CKEDITOR.env.needsBrFiller?K.appendBogus():K.append(U.document.createText(" "));for(;K=n.mergeCandidates.pop();)K.mergeSiblings();U.moveToBookmark(da);if(!n.dontMoveCaret){for(K=c(U);K&&a(K)&&!K.is(p.$empty);){if(K.isBlockBoundary())U.moveToPosition(K,CKEDITOR.POSITION_BEFORE_END);else{if(g(K)&&K.getHtml().match(/(\s|&nbsp;)$/g)){Z=null;break}Z=U.clone();Z.moveToPosition(K,CKEDITOR.POSITION_BEFORE_END)}K=K.getLast(f)}Z&&U.moveToRange(Z)}}}}();q=function(){function a(b){b=new CKEDITOR.dom.walker(b);
+b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT};return b}function b(a,d,c){d=a.getDocument().createElement(d);a.append(d,c);return d}function d(a){var b=a.count(),c;for(b;0<b--;)c=a.getItem(b),CKEDITOR.tools.trim(c.getHtml())||(c.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&c.getChildCount()&&c.getFirst().remove())}return function(c){var g=c.startContainer,e=g.getAscendant("table",
+1),f=!1;d(e.getElementsByTag("td"));d(e.getElementsByTag("th"));e=c.clone();e.setStart(g,0);e=a(e).lastBackward();e||(e=c.clone(),e.setEndAt(g,CKEDITOR.POSITION_BEFORE_END),e=a(e).lastForward(),f=!0);e||(e=g);e.is("table")?(c.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),c.collapse(!0),e.remove()):(e.is({tbody:1,thead:1,tfoot:1})&&(e=b(e,"tr",f)),e.is("tr")&&(e=b(e,e.getParent().is("thead")?"th":"td",f)),(g=e.getBogus())&&g.remove(),c.moveToPosition(e,f?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END))}}();
+u=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$list)||a.is(CKEDITOR.dtd.$listItem)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$listItem)};return b}return function(b){var d=b.startContainer,c=!1,g;g=b.clone();g.setStart(d,0);g=a(g).lastBackward();g||(g=b.clone(),g.setEndAt(d,CKEDITOR.POSITION_BEFORE_END),g=a(g).lastForward(),c=!0);g||(g=d);g.is(CKEDITOR.dtd.$list)?
+(b.setStartAt(g,CKEDITOR.POSITION_BEFORE_START),b.collapse(!0),g.remove()):((d=g.getBogus())&&d.remove(),b.moveToPosition(g,c?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END),b.select())}}();B={eol:{detect:function(a,b){var d=a.range,c=d.clone(),g=d.clone(),e=new CKEDITOR.dom.elementPath(d.startContainer,b),f=new CKEDITOR.dom.elementPath(d.endContainer,b);c.collapse(1);g.collapse();e.block&&c.checkBoundaryOfElement(e.block,CKEDITOR.END)&&(d.setStartAfter(e.block),a.prependEolBr=1);f.block&&
+g.checkBoundaryOfElement(f.block,CKEDITOR.START)&&(d.setEndBefore(f.block),a.appendEolBr=1)},fix:function(a,b){var d=b.getDocument(),c;a.appendEolBr&&(c=this.createEolBr(d),a.fragment.append(c));!a.prependEolBr||c&&!c.getPrevious()||a.fragment.append(this.createEolBr(d),1)},createEolBr:function(a){return a.createElement("br",{attributes:{"data-cke-eol":1}})}},bogus:{exclude:function(a){var b=a.range.getBoundaryNodes(),d=b.startNode,b=b.endNode;!b||!r(b)||d&&d.equals(b)||a.range.setEndBefore(b)}},
+tree:{rebuild:function(a,b){var d=a.range,c=d.getCommonAncestor(),g=new CKEDITOR.dom.elementPath(c,b),e=new CKEDITOR.dom.elementPath(d.startContainer,b),d=new CKEDITOR.dom.elementPath(d.endContainer,b),f;c.type==CKEDITOR.NODE_TEXT&&(c=c.getParent());if(g.blockLimit.is({tr:1,table:1})){var h=g.contains("table").getParent();f=function(a){return!a.equals(h)}}else if(g.block&&g.block.is(CKEDITOR.dtd.$listItem)&&(e=e.contains(CKEDITOR.dtd.$list),d=d.contains(CKEDITOR.dtd.$list),!e.equals(d))){var k=g.contains(CKEDITOR.dtd.$list).getParent();
+f=function(a){return!a.equals(k)}}f||(f=function(a){return!a.equals(g.block)&&!a.equals(g.blockLimit)});this.rebuildFragment(a,b,c,f)},rebuildFragment:function(a,b,d,c){for(var g;d&&!d.equals(b)&&c(d);)g=d.clone(0,1),a.fragment.appendTo(g),a.fragment=g,d=d.getParent()}},cell:{shrink:function(a){a=a.range;var b=a.startContainer,d=a.endContainer,c=a.startOffset,g=a.endOffset;b.type==CKEDITOR.NODE_ELEMENT&&b.equals(d)&&b.is("tr")&&++c==g&&a.shrink(CKEDITOR.SHRINK_TEXT)}}};y=function(){function a(b,d){var c=
+b.getParent();if(c.is(CKEDITOR.dtd.$inline))b[d?"insertBefore":"insertAfter"](c)}function b(d,c,g){a(c);a(g,1);for(var e;e=g.getNext();)e.insertAfter(c),c=e;v(d)&&d.remove()}function d(a,b){var c=new CKEDITOR.dom.range(a);c.setStartAfter(b.startNode);c.setEndBefore(b.endNode);return c}return{list:{detectMerge:function(a,b){var c=d(b,a.bookmark),g=c.startPath(),e=c.endPath(),f=g.contains(CKEDITOR.dtd.$list),h=e.contains(CKEDITOR.dtd.$list);a.mergeList=f&&h&&f.getParent().equals(h.getParent())&&!f.equals(h);
+a.mergeListItems=g.block&&e.block&&g.block.is(CKEDITOR.dtd.$listItem)&&e.block.is(CKEDITOR.dtd.$listItem);if(a.mergeList||a.mergeListItems)c=c.clone(),c.setStartBefore(a.bookmark.startNode),c.setEndAfter(a.bookmark.endNode),a.mergeListBookmark=c.createBookmark()},merge:function(a,d){if(a.mergeListBookmark){var c=a.mergeListBookmark.startNode,g=a.mergeListBookmark.endNode,e=new CKEDITOR.dom.elementPath(c,d),f=new CKEDITOR.dom.elementPath(g,d);if(a.mergeList){var h=e.contains(CKEDITOR.dtd.$list),k=
+f.contains(CKEDITOR.dtd.$list);h.equals(k)||(k.moveChildren(h),k.remove())}a.mergeListItems&&(e=e.contains(CKEDITOR.dtd.$listItem),f=f.contains(CKEDITOR.dtd.$listItem),e.equals(f)||b(f,c,g));c.remove();g.remove()}}},block:{detectMerge:function(a,b){if(!a.tableContentsRanges&&!a.mergeListBookmark){var d=new CKEDITOR.dom.range(b);d.setStartBefore(a.bookmark.startNode);d.setEndAfter(a.bookmark.endNode);a.mergeBlockBookmark=d.createBookmark()}},merge:function(a,d){if(a.mergeBlockBookmark&&!a.purgeTableBookmark){var c=
+a.mergeBlockBookmark.startNode,g=a.mergeBlockBookmark.endNode,e=new CKEDITOR.dom.elementPath(c,d),f=new CKEDITOR.dom.elementPath(g,d),e=e.block,f=f.block;e&&f&&!e.equals(f)&&b(f,c,g);c.remove();g.remove()}}},table:function(){function a(d){var g=[],e,f=new CKEDITOR.dom.walker(d),h=d.startPath().contains(c),k=d.endPath().contains(c),n={};f.guard=function(a,f){if(a.type==CKEDITOR.NODE_ELEMENT){var l="visited_"+(f?"out":"in");if(a.getCustomData(l))return;CKEDITOR.dom.element.setMarker(n,a,l,1)}if(f&&
+h&&a.equals(h))e=d.clone(),e.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),g.push(e);else if(!f&&k&&a.equals(k))e=d.clone(),e.setStartAt(k,CKEDITOR.POSITION_AFTER_START),g.push(e);else{if(l=!f)l=a.type==CKEDITOR.NODE_ELEMENT&&a.is(c)&&(!h||b(a,h))&&(!k||b(a,k));l&&(e=d.clone(),e.selectNodeContents(a),g.push(e))}};f.lastForward();CKEDITOR.dom.element.clearAllMarkers(n);return g}function b(a,d){var c=CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED,g=a.getPosition(d);return g===CKEDITOR.POSITION_IDENTICAL?
+!1:0===(g&c)}var c={td:1,th:1,caption:1};return{detectPurge:function(a){var b=a.range,d=b.clone();d.enlarge(CKEDITOR.ENLARGE_ELEMENT);var d=new CKEDITOR.dom.walker(d),g=0;d.evaluator=function(a){a.type==CKEDITOR.NODE_ELEMENT&&a.is(c)&&++g};d.checkForward();if(1<g){var d=b.startPath().contains("table"),e=b.endPath().contains("table");d&&e&&b.checkBoundaryOfElement(d,CKEDITOR.START)&&b.checkBoundaryOfElement(e,CKEDITOR.END)&&(b=a.range.clone(),b.setStartBefore(d),b.setEndAfter(e),a.purgeTableBookmark=
+b.createBookmark())}},detectRanges:function(g,e){var f=d(e,g.bookmark),h=f.clone(),k,n,l=f.getCommonAncestor();l.is(CKEDITOR.dtd.$tableContent)&&!l.is(c)&&(l=l.getAscendant("table",!0));n=l;l=new CKEDITOR.dom.elementPath(f.startContainer,n);n=new CKEDITOR.dom.elementPath(f.endContainer,n);l=l.contains("table");n=n.contains("table");if(l||n)l&&n&&b(l,n)?(g.tableSurroundingRange=h,h.setStartAt(l,CKEDITOR.POSITION_AFTER_END),h.setEndAt(n,CKEDITOR.POSITION_BEFORE_START),h=f.clone(),h.setEndAt(l,CKEDITOR.POSITION_AFTER_END),
+k=f.clone(),k.setStartAt(n,CKEDITOR.POSITION_BEFORE_START),k=a(h).concat(a(k))):l?n||(g.tableSurroundingRange=h,h.setStartAt(l,CKEDITOR.POSITION_AFTER_END),f.setEndAt(l,CKEDITOR.POSITION_AFTER_END)):(g.tableSurroundingRange=h,h.setEndAt(n,CKEDITOR.POSITION_BEFORE_START),f.setStartAt(n,CKEDITOR.POSITION_AFTER_START)),g.tableContentsRanges=k?k:a(f)},deleteRanges:function(a){for(var b;b=a.tableContentsRanges.pop();)b.extractContents(),v(b.startContainer)&&b.startContainer.appendBogus();a.tableSurroundingRange&&
+a.tableSurroundingRange.extractContents()},purge:function(a){if(a.purgeTableBookmark){var b=a.doc,d=a.range.clone(),b=b.createElement("p");b.insertBefore(a.purgeTableBookmark.startNode);d.moveToBookmark(a.purgeTableBookmark);d.deleteContents();a.range.moveToPosition(b,CKEDITOR.POSITION_AFTER_START)}}}}(),detectExtractMerge:function(a){return!(a.range.startPath().contains(CKEDITOR.dtd.$listItem)&&a.range.endPath().contains(CKEDITOR.dtd.$listItem))},fixUneditableRangePosition:function(a){a.startContainer.getDtd()["#"]||
+a.moveToClosestEditablePosition(null,!0)},autoParagraph:function(a,b){var d=b.startPath(),c;l(a,d.block,d.blockLimit)&&(c=k(a))&&(c=b.document.createElement(c),c.appendBogus(),b.insertNode(c),b.moveToPosition(c,CKEDITOR.POSITION_AFTER_START))}}}()}(),function(){function a(){var a=this._.fakeSelection,b;a&&(b=this.getSelection(1),b&&b.isHidden()||(a.reset(),a=0));if(!a&&(a=b||this.getSelection(1),!a||a.getType()==CKEDITOR.SELECTION_NONE))return;this.fire("selectionCheck",a);b=this.elementPath();if(!b.compare(this._.selectionPreviousPath)){var d=
+this._.selectionPreviousPath&&this._.selectionPreviousPath.blockLimit.equals(b.blockLimit);CKEDITOR.env.webkit&&!d&&(this._.previousActive=this.document.getActive());this._.selectionPreviousPath=b;this.fire("selectionChange",{selection:a,path:b})}}function e(){q=!0;n||(c.call(this),n=CKEDITOR.tools.setTimeout(c,200,this))}function c(){n=null;q&&(CKEDITOR.tools.setTimeout(a,0,this),q=!1)}function f(a){return u(a)||a.type==CKEDITOR.NODE_ELEMENT&&!a.is(CKEDITOR.dtd.$empty)?!0:!1}function h(a){function b(d,
+c){return d&&d.type!=CKEDITOR.NODE_TEXT?a.clone()["moveToElementEdit"+(c?"End":"Start")](d):!1}if(!(a.root instanceof CKEDITOR.editable))return!1;var d=a.startContainer,c=a.getPreviousNode(f,null,d),g=a.getNextNode(f,null,d);return b(c)||b(g,1)||!(c||g||d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()&&d.getBogus())?!0:!1}function m(a){l(a,!1);var b=a.getDocument().createText(r);a.setCustomData("cke-fillingChar",b);return b}function l(a,b){var d=a&&a.removeCustomData("cke-fillingChar");if(d){if(!1!==
+b){var c=a.getDocument().getSelection().getNative(),g=c&&"None"!=c.type&&c.getRangeAt(0),e=r.length;if(d.getLength()>e&&g&&g.intersectsNode(d.$)){var f=[{node:c.anchorNode,offset:c.anchorOffset},{node:c.focusNode,offset:c.focusOffset}];c.anchorNode==d.$&&c.anchorOffset>e&&(f[0].offset-=e);c.focusNode==d.$&&c.focusOffset>e&&(f[1].offset-=e)}}d.setText(k(d.getText(),1));f&&(d=a.getDocument().$,c=d.getSelection(),d=d.createRange(),d.setStart(f[0].node,f[0].offset),d.collapse(!0),c.removeAllRanges(),
+c.addRange(d),c.extend(f[1].node,f[1].offset))}}function k(a,b){return b?a.replace(w,function(a,b){return b?" ":""}):a.replace(r,"")}function d(a,b){var d=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-hidden-sel\x3d"1" data-cke-temp\x3d"1" style\x3d"'+(CKEDITOR.env.ie&&14>CKEDITOR.env.version?"display:none":"position:fixed;top:0;left:-1000px")+'"\x3e'+(b||"\x26nbsp;")+"\x3c/div\x3e",a.document);a.fire("lockSnapshot");a.editable().append(d);var c=a.getSelection(1),g=a.createRange(),e=c.root.on("selectionchange",
+function(a){a.cancel()},null,null,0);g.setStartAt(d,CKEDITOR.POSITION_AFTER_START);g.setEndAt(d,CKEDITOR.POSITION_BEFORE_END);c.selectRanges([g]);e.removeListener();a.fire("unlockSnapshot");a._.hiddenSelectionContainer=d}function b(a){var b={37:1,39:1,8:1,46:1};return function(d){var c=d.data.getKeystroke();if(b[c]){var g=a.getSelection().getRanges(),e=g[0];1==g.length&&e.collapsed&&(c=e[38>c?"getPreviousEditableNode":"getNextEditableNode"]())&&c.type==CKEDITOR.NODE_ELEMENT&&"false"==c.getAttribute("contenteditable")&&
+(a.getSelection().fake(c),d.data.preventDefault(),d.cancel())}}}function g(a){for(var b=0;b<a.length;b++){var d=a[b];d.getCommonAncestor().isReadOnly()&&a.splice(b,1);if(!d.collapsed){if(d.startContainer.isReadOnly())for(var c=d.startContainer,g;c&&!((g=c.type==CKEDITOR.NODE_ELEMENT)&&c.is("body")||!c.isReadOnly());)g&&"false"==c.getAttribute("contentEditable")&&d.setStartAfter(c),c=c.getParent();c=d.startContainer;g=d.endContainer;var e=d.startOffset,f=d.endOffset,h=d.clone();c&&c.type==CKEDITOR.NODE_TEXT&&
+(e>=c.getLength()?h.setStartAfter(c):h.setStartBefore(c));g&&g.type==CKEDITOR.NODE_TEXT&&(f?h.setEndAfter(g):h.setEndBefore(g));c=new CKEDITOR.dom.walker(h);c.evaluator=function(c){if(c.type==CKEDITOR.NODE_ELEMENT&&c.isReadOnly()){var g=d.clone();d.setEndBefore(c);d.collapsed&&a.splice(b--,1);c.getPosition(h.endContainer)&CKEDITOR.POSITION_CONTAINS||(g.setStartAfter(c),g.collapsed||a.splice(b+1,0,g));return!0}return!1};c.next()}}return a}var p="function"!=typeof window.getSelection,v=1,r=CKEDITOR.tools.repeat("​",
+7),w=new RegExp(r+"( )?","g"),n,q,u=CKEDITOR.dom.walker.invisible(1),B=function(){function a(b){return function(a){var d=a.editor.createRange();d.moveToClosestEditablePosition(a.selected,b)&&a.editor.getSelection().selectRanges([d]);return!1}}function b(a){return function(b){var d=b.editor,c=d.createRange(),g;(g=c.moveToClosestEditablePosition(b.selected,a))||(g=c.moveToClosestEditablePosition(b.selected,!a));g&&d.getSelection().selectRanges([c]);d.fire("saveSnapshot");b.selected.remove();g||(c.moveToElementEditablePosition(d.editable()),
+d.getSelection().selectRanges([c]));d.fire("saveSnapshot");return!1}}var d=a(),c=a(1);return{37:d,38:d,39:c,40:c,8:b(),46:b(1)}}();CKEDITOR.on("instanceCreated",function(d){function c(){var a=g.getSelection();a&&a.removeAllRanges()}var g=d.editor;g.on("contentDom",function(){function d(){w=new CKEDITOR.dom.selection(g.getSelection());w.lock()}function c(){h.removeListener("mouseup",c);m.removeListener("mouseup",c);var a=CKEDITOR.document.$.selection,b=a.createRange();"None"!=a.type&&b.parentElement().ownerDocument==
+f.$&&b.select()}var f=g.document,h=CKEDITOR.document,k=g.editable(),n=f.getBody(),m=f.getDocumentElement(),t=k.isInline(),q,w;CKEDITOR.env.gecko&&k.attachListener(k,"focus",function(a){a.removeListener();0!==q&&(a=g.getSelection().getNative())&&a.isCollapsed&&a.anchorNode==k.$&&(a=g.createRange(),a.moveToElementEditStart(k),a.select())},null,null,-2);k.attachListener(k,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){q&&CKEDITOR.env.webkit&&(q=g._.previousActive&&g._.previousActive.equals(f.getActive()))&&
+null!=g._.previousScrollTop&&g._.previousScrollTop!=k.$.scrollTop&&(k.$.scrollTop=g._.previousScrollTop);g.unlockSelection(q);q=0},null,null,-1);k.attachListener(k,"mousedown",function(){q=0});if(CKEDITOR.env.ie||t)p?k.attachListener(k,"beforedeactivate",d,null,null,-1):k.attachListener(g,"selectionCheck",d,null,null,-1),k.attachListener(k,CKEDITOR.env.webkit?"DOMFocusOut":"blur",function(){g.lockSelection(w);q=1},null,null,-1),k.attachListener(k,"mousedown",function(){q=0});if(CKEDITOR.env.ie&&!t){var u;
+k.attachListener(k,"mousedown",function(a){2==a.data.$.button&&((a=g.document.getSelection())&&a.getType()!=CKEDITOR.SELECTION_NONE||(u=g.window.getScrollPosition()))});k.attachListener(k,"mouseup",function(a){2==a.data.$.button&&u&&(g.document.$.documentElement.scrollLeft=u.x,g.document.$.documentElement.scrollTop=u.y);u=null});if("BackCompat"!=f.$.compatMode){if(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat){var v,r;m.on("mousedown",function(a){function b(a){a=a.data.$;if(v){var d=n.$.createTextRange();
+try{d.moveToPoint(a.clientX,a.clientY)}catch(c){}v.setEndPoint(0>r.compareEndPoints("StartToStart",d)?"EndToEnd":"StartToStart",d);v.select()}}function d(){m.removeListener("mousemove",b);h.removeListener("mouseup",d);m.removeListener("mouseup",d);v.select()}a=a.data;if(a.getTarget().is("html")&&a.$.y<m.$.clientHeight&&a.$.x<m.$.clientWidth){v=n.$.createTextRange();try{v.moveToPoint(a.$.clientX,a.$.clientY)}catch(c){}r=v.duplicate();m.on("mousemove",b);h.on("mouseup",d);m.on("mouseup",d)}})}if(7<
+CKEDITOR.env.version&&11>CKEDITOR.env.version)m.on("mousedown",function(a){a.data.getTarget().is("html")&&(h.on("mouseup",c),m.on("mouseup",c))})}}k.attachListener(k,"selectionchange",a,g);k.attachListener(k,"keyup",e,g);k.attachListener(k,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){g.forceNextSelectionCheck();g.selectionChange(1)});if(t&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){var x;k.attachListener(k,"mousedown",function(){x=1});k.attachListener(f.getDocumentElement(),"mouseup",function(){x&&
+e.call(g);x=0})}else k.attachListener(CKEDITOR.env.ie?k:f.getDocumentElement(),"mouseup",e,g);CKEDITOR.env.webkit&&k.attachListener(f,"keydown",function(a){switch(a.data.getKey()){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:l(k)}},null,null,-1);k.attachListener(k,"keydown",b(g),null,null,-1)});g.on("setData",function(){g.unlockSelection();CKEDITOR.env.webkit&&c()});g.on("contentDomUnload",function(){g.unlockSelection()});if(CKEDITOR.env.ie9Compat)g.on("beforeDestroy",
+c,null,null,9);g.on("dataReady",function(){delete g._.fakeSelection;delete g._.hiddenSelectionContainer;g.selectionChange(1)});g.on("loadSnapshot",function(){var a=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT),b=g.editable().getLast(a);b&&b.hasAttribute("data-cke-hidden-sel")&&(b.remove(),CKEDITOR.env.gecko&&(a=g.editable().getFirst(a))&&a.is("br")&&a.getAttribute("_moz_editor_bogus_node")&&a.remove())},null,null,100);g.on("key",function(a){if("wysiwyg"==g.mode){var b=g.getSelection();if(b.isFake){var d=
+B[a.data.keyCode];if(d)return d({editor:g,selected:b.getSelectedElement(),selection:b,keyEvent:a})}}})});if(CKEDITOR.env.webkit)CKEDITOR.on("instanceReady",function(a){var b=a.editor;b.on("selectionChange",function(){var a=b.editable(),d=a.getCustomData("cke-fillingChar");d&&(d.getCustomData("ready")?l(a):d.setCustomData("ready",1))},null,null,-1);b.on("beforeSetMode",function(){l(b.editable())},null,null,-1);b.on("getSnapshot",function(a){a.data&&(a.data=k(a.data))},b,null,20);b.on("toDataFormat",
+function(a){a.data.dataValue=k(a.data.dataValue)},null,null,0)});CKEDITOR.editor.prototype.selectionChange=function(b){(b?a:e).call(this)};CKEDITOR.editor.prototype.getSelection=function(a){return!this._.savedSelection&&!this._.fakeSelection||a?(a=this.editable())&&"wysiwyg"==this.mode?new CKEDITOR.dom.selection(a):null:this._.savedSelection||this._.fakeSelection};CKEDITOR.editor.prototype.lockSelection=function(a){a=a||this.getSelection(1);return a.getType()!=CKEDITOR.SELECTION_NONE?(!a.isLocked&&
+a.lock(),this._.savedSelection=a,!0):!1};CKEDITOR.editor.prototype.unlockSelection=function(a){var b=this._.savedSelection;return b?(b.unlock(a),delete this._.savedSelection,!0):!1};CKEDITOR.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath};CKEDITOR.dom.document.prototype.getSelection=function(){return new CKEDITOR.dom.selection(this)};CKEDITOR.dom.range.prototype.select=function(){var a=this.root instanceof CKEDITOR.editable?this.root.editor.getSelection():
+new CKEDITOR.dom.selection(this.root);a.selectRanges([this]);return a};CKEDITOR.SELECTION_NONE=1;CKEDITOR.SELECTION_TEXT=2;CKEDITOR.SELECTION_ELEMENT=3;CKEDITOR.dom.selection=function(a){if(a instanceof CKEDITOR.dom.selection){var b=a;a=a.root}var d=a instanceof CKEDITOR.dom.element;this.rev=b?b.rev:v++;this.document=a instanceof CKEDITOR.dom.document?a:a.getDocument();this.root=d?a:this.document.getBody();this.isLocked=0;this._={cache:{}};if(b)return CKEDITOR.tools.extend(this._.cache,b._.cache),
+this.isFake=b.isFake,this.isLocked=b.isLocked,this;a=this.getNative();var c,g;if(a)if(a.getRangeAt)c=(g=a.rangeCount&&a.getRangeAt(0))&&new CKEDITOR.dom.node(g.commonAncestorContainer);else{try{g=a.createRange()}catch(e){}c=g&&CKEDITOR.dom.element.get(g.item&&g.item(0)||g.parentElement())}if(!c||c.type!=CKEDITOR.NODE_ELEMENT&&c.type!=CKEDITOR.NODE_TEXT||!this.root.equals(c)&&!this.root.contains(c))this._.cache.type=CKEDITOR.SELECTION_NONE,this._.cache.startElement=null,this._.cache.selectedElement=
+null,this._.cache.selectedText="",this._.cache.ranges=new CKEDITOR.dom.rangeList;return this};var y={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};CKEDITOR.tools.extend(CKEDITOR.dom.selection,{_removeFillingCharSequenceString:k,_createFillingCharSequenceNode:m,FILLING_CHAR_SEQUENCE:r});CKEDITOR.dom.selection.prototype={getNative:function(){return void 0!==this._.cache.nativeSel?this._.cache.nativeSel:this._.cache.nativeSel=
+p?this.document.$.selection:this.document.getWindow().$.getSelection()},getType:p?function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_NONE;try{var d=this.getNative(),c=d.type;"Text"==c&&(b=CKEDITOR.SELECTION_TEXT);"Control"==c&&(b=CKEDITOR.SELECTION_ELEMENT);d.createRange().parentElement()&&(b=CKEDITOR.SELECTION_TEXT)}catch(g){}return a.type=b}:function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_TEXT,d=this.getNative();if(!d||!d.rangeCount)b=CKEDITOR.SELECTION_NONE;
+else if(1==d.rangeCount){var d=d.getRangeAt(0),c=d.startContainer;c==d.endContainer&&1==c.nodeType&&1==d.endOffset-d.startOffset&&y[c.childNodes[d.startOffset].nodeName.toLowerCase()]&&(b=CKEDITOR.SELECTION_ELEMENT)}return a.type=b},getRanges:function(){var a=p?function(){function a(b){return(new CKEDITOR.dom.node(b)).getIndex()}var b=function(b,d){b=b.duplicate();b.collapse(d);var c=b.parentElement();if(!c.hasChildNodes())return{container:c,offset:0};for(var g=c.children,e,f,h=b.duplicate(),k=0,
+n=g.length-1,l=-1,p,m;k<=n;)if(l=Math.floor((k+n)/2),e=g[l],h.moveToElementText(e),p=h.compareEndPoints("StartToStart",b),0<p)n=l-1;else if(0>p)k=l+1;else return{container:c,offset:a(e)};if(-1==l||l==g.length-1&&0>p){h.moveToElementText(c);h.setEndPoint("StartToStart",b);h=h.text.replace(/(\r\n|\r)/g,"\n").length;g=c.childNodes;if(!h)return e=g[g.length-1],e.nodeType!=CKEDITOR.NODE_TEXT?{container:c,offset:g.length}:{container:e,offset:e.nodeValue.length};for(c=g.length;0<h&&0<c;)f=g[--c],f.nodeType==
+CKEDITOR.NODE_TEXT&&(m=f,h-=f.nodeValue.length);return{container:m,offset:-h}}h.collapse(0<p?!0:!1);h.setEndPoint(0<p?"StartToStart":"EndToStart",b);h=h.text.replace(/(\r\n|\r)/g,"\n").length;if(!h)return{container:c,offset:a(e)+(0<p?0:1)};for(;0<h;)try{f=e[0<p?"previousSibling":"nextSibling"],f.nodeType==CKEDITOR.NODE_TEXT&&(h-=f.nodeValue.length,m=f),e=f}catch(q){return{container:c,offset:a(e)}}return{container:m,offset:0<p?-h:m.nodeValue.length+h}};return function(){var a=this.getNative(),d=a&&
+a.createRange(),c=this.getType();if(!a)return[];if(c==CKEDITOR.SELECTION_TEXT)return a=new CKEDITOR.dom.range(this.root),c=b(d,!0),a.setStart(new CKEDITOR.dom.node(c.container),c.offset),c=b(d),a.setEnd(new CKEDITOR.dom.node(c.container),c.offset),a.endContainer.getPosition(a.startContainer)&CKEDITOR.POSITION_PRECEDING&&a.endOffset<=a.startContainer.getIndex()&&a.collapse(),[a];if(c==CKEDITOR.SELECTION_ELEMENT){for(var c=[],g=0;g<d.length;g++){for(var e=d.item(g),f=e.parentNode,h=0,a=new CKEDITOR.dom.range(this.root);h<
+f.childNodes.length&&f.childNodes[h]!=e;h++);a.setStart(new CKEDITOR.dom.node(f),h);a.setEnd(new CKEDITOR.dom.node(f),h+1);c.push(a)}return c}return[]}}():function(){var a=[],b,d=this.getNative();if(!d)return a;for(var c=0;c<d.rangeCount;c++){var g=d.getRangeAt(c);b=new CKEDITOR.dom.range(this.root);b.setStart(new CKEDITOR.dom.node(g.startContainer),g.startOffset);b.setEnd(new CKEDITOR.dom.node(g.endContainer),g.endOffset);a.push(b)}return a};return function(b){var d=this._.cache,c=d.ranges;c||(d.ranges=
+c=new CKEDITOR.dom.rangeList(a.call(this)));return b?g(new CKEDITOR.dom.rangeList(c.slice())):c}}(),getStartElement:function(){var a=this._.cache;if(void 0!==a.startElement)return a.startElement;var b;switch(this.getType()){case CKEDITOR.SELECTION_ELEMENT:return this.getSelectedElement();case CKEDITOR.SELECTION_TEXT:var d=this.getRanges()[0];if(d){if(d.collapsed)b=d.startContainer,b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());else{for(d.optimize();b=d.startContainer,d.startOffset==(b.getChildCount?
+b.getChildCount():b.getLength())&&!b.isBlockBoundary();)d.setStartAfter(b);b=d.startContainer;if(b.type!=CKEDITOR.NODE_ELEMENT)return b.getParent();if((b=b.getChild(d.startOffset))&&b.type==CKEDITOR.NODE_ELEMENT)for(d=b.getFirst();d&&d.type==CKEDITOR.NODE_ELEMENT;)b=d,d=d.getFirst();else b=d.startContainer}b=b.$}}return a.startElement=b?new CKEDITOR.dom.element(b):null},getSelectedElement:function(){var a=this._.cache;if(void 0!==a.selectedElement)return a.selectedElement;var b=this,d=CKEDITOR.tools.tryThese(function(){return b.getNative().createRange().item(0)},
+function(){for(var a=b.getRanges()[0].clone(),d,c,g=2;g&&!((d=a.getEnclosedNode())&&d.type==CKEDITOR.NODE_ELEMENT&&y[d.getName()]&&(c=d));g--)a.shrink(CKEDITOR.SHRINK_ELEMENT);return c&&c.$});return a.selectedElement=d?new CKEDITOR.dom.element(d):null},getSelectedText:function(){var a=this._.cache;if(void 0!==a.selectedText)return a.selectedText;var b=this.getNative(),b=p?"Control"==b.type?"":b.createRange().text:b.toString();return a.selectedText=b},lock:function(){this.getRanges();this.getStartElement();
+this.getSelectedElement();this.getSelectedText();this._.cache.nativeSel=null;this.isLocked=1},unlock:function(a){if(this.isLocked){if(a)var b=this.getSelectedElement(),d=!b&&this.getRanges(),c=this.isFake;this.isLocked=0;this.reset();a&&(a=b||d[0]&&d[0].getCommonAncestor())&&a.getAscendant("body",1)&&(c?this.fake(b):b?this.selectElement(b):this.selectRanges(d))}},reset:function(){this._.cache={};this.isFake=0;var a=this.root.editor;if(a&&a._.fakeSelection)if(this.rev==a._.fakeSelection.rev){delete a._.fakeSelection;
+var b=a._.hiddenSelectionContainer;if(b){var d=a.checkDirty();a.fire("lockSnapshot");b.remove();a.fire("unlockSnapshot");!d&&a.resetDirty()}delete a._.hiddenSelectionContainer}else CKEDITOR.warn("selection-fake-reset");this.rev=v++},selectElement:function(a){var b=new CKEDITOR.dom.range(this.root);b.setStartBefore(a);b.setEndAfter(a);this.selectRanges([b])},selectRanges:function(a){var b=this.root.editor,b=b&&b._.hiddenSelectionContainer;this.reset();if(b)for(var b=this.root,d,c=0;c<a.length;++c)d=
+a[c],d.endContainer.equals(b)&&(d.endOffset=Math.min(d.endOffset,b.getChildCount()));if(a.length)if(this.isLocked){var g=CKEDITOR.document.getActive();this.unlock();this.selectRanges(a);this.lock();g&&!g.equals(this.root)&&g.focus()}else{var e;a:{var f,k;if(1==a.length&&!(k=a[0]).collapsed&&(e=k.getEnclosedNode())&&e.type==CKEDITOR.NODE_ELEMENT&&(k=k.clone(),k.shrink(CKEDITOR.SHRINK_ELEMENT,!0),(f=k.getEnclosedNode())&&f.type==CKEDITOR.NODE_ELEMENT&&(e=f),"false"==e.getAttribute("contenteditable")))break a;
+e=void 0}if(e)this.fake(e);else{if(p){k=CKEDITOR.dom.walker.whitespaces(!0);f=/\ufeff|\u00a0/;b={table:1,tbody:1,tr:1};1<a.length&&(e=a[a.length-1],a[0].setEnd(e.endContainer,e.endOffset));e=a[0];a=e.collapsed;var n,q,w;if((d=e.getEnclosedNode())&&d.type==CKEDITOR.NODE_ELEMENT&&d.getName()in y&&(!d.is("a")||!d.getText()))try{w=d.$.createControlRange();w.addElement(d.$);w.select();return}catch(u){}if(e.startContainer.type==CKEDITOR.NODE_ELEMENT&&e.startContainer.getName()in b||e.endContainer.type==
+CKEDITOR.NODE_ELEMENT&&e.endContainer.getName()in b)e.shrink(CKEDITOR.NODE_ELEMENT,!0),a=e.collapsed;w=e.createBookmark();b=w.startNode;a||(g=w.endNode);w=e.document.$.body.createTextRange();w.moveToElementText(b.$);w.moveStart("character",1);g?(f=e.document.$.body.createTextRange(),f.moveToElementText(g.$),w.setEndPoint("EndToEnd",f),w.moveEnd("character",-1)):(n=b.getNext(k),q=b.hasAscendant("pre"),n=!(n&&n.getText&&n.getText().match(f))&&(q||!b.hasPrevious()||b.getPrevious().is&&b.getPrevious().is("br")),
+q=e.document.createElement("span"),q.setHtml("\x26#65279;"),q.insertBefore(b),n&&e.document.createText("").insertBefore(b));e.setStartBefore(b);b.remove();a?(n?(w.moveStart("character",-1),w.select(),e.document.$.selection.clear()):w.select(),e.moveToPosition(q,CKEDITOR.POSITION_BEFORE_START),q.remove()):(e.setEndBefore(g),g.remove(),w.select())}else{g=this.getNative();if(!g)return;this.removeAllRanges();for(w=0;w<a.length;w++){if(w<a.length-1&&(n=a[w],q=a[w+1],f=n.clone(),f.setStart(n.endContainer,
+n.endOffset),f.setEnd(q.startContainer,q.startOffset),!f.collapsed&&(f.shrink(CKEDITOR.NODE_ELEMENT,!0),e=f.getCommonAncestor(),f=f.getEnclosedNode(),e.isReadOnly()||f&&f.isReadOnly()))){q.setStart(n.startContainer,n.startOffset);a.splice(w--,1);continue}e=a[w];q=this.document.$.createRange();e.collapsed&&CKEDITOR.env.webkit&&h(e)&&(f=m(this.root),e.insertNode(f),(n=f.getNext())&&!f.getPrevious()&&n.type==CKEDITOR.NODE_ELEMENT&&"br"==n.getName()?(l(this.root),e.moveToPosition(n,CKEDITOR.POSITION_BEFORE_START)):
+e.moveToPosition(f,CKEDITOR.POSITION_AFTER_END));q.setStart(e.startContainer.$,e.startOffset);try{q.setEnd(e.endContainer.$,e.endOffset)}catch(G){if(0<=G.toString().indexOf("NS_ERROR_ILLEGAL_VALUE"))e.collapse(1),q.setEnd(e.endContainer.$,e.endOffset);else throw G;}g.addRange(q)}}this.reset();this.root.fire("selectionchange")}}},fake:function(a,b){var c=this.root.editor;void 0===b&&a.hasAttribute("aria-label")&&(b=a.getAttribute("aria-label"));this.reset();d(c,b);var g=this._.cache,e=new CKEDITOR.dom.range(this.root);
+e.setStartBefore(a);e.setEndAfter(a);g.ranges=new CKEDITOR.dom.rangeList(e);g.selectedElement=g.startElement=a;g.type=CKEDITOR.SELECTION_ELEMENT;g.selectedText=g.nativeSel=null;this.isFake=1;this.rev=v++;c._.fakeSelection=this;this.root.fire("selectionchange")},isHidden:function(){var a=this.getCommonAncestor();a&&a.type==CKEDITOR.NODE_TEXT&&(a=a.getParent());return!(!a||!a.data("cke-hidden-sel"))},createBookmarks:function(a){a=this.getRanges().createBookmarks(a);this.isFake&&(a.isFake=1);return a},
+createBookmarks2:function(a){a=this.getRanges().createBookmarks2(a);this.isFake&&(a.isFake=1);return a},selectBookmarks:function(a){for(var b=[],d,c=0;c<a.length;c++){var g=new CKEDITOR.dom.range(this.root);g.moveToBookmark(a[c]);b.push(g)}a.isFake&&(d=b[0].getEnclosedNode(),d&&d.type==CKEDITOR.NODE_ELEMENT||(CKEDITOR.warn("selection-not-fake"),a.isFake=0));a.isFake?this.fake(d):this.selectRanges(b);return this},getCommonAncestor:function(){var a=this.getRanges();return a.length?a[0].startContainer.getCommonAncestor(a[a.length-
+1].endContainer):null},scrollIntoView:function(){this.type!=CKEDITOR.SELECTION_NONE&&this.getRanges()[0].scrollIntoView()},removeAllRanges:function(){if(this.getType()!=CKEDITOR.SELECTION_NONE){var a=this.getNative();try{a&&a[p?"empty":"removeAllRanges"]()}catch(b){}this.reset()}}}}(),"use strict",CKEDITOR.STYLE_BLOCK=1,CKEDITOR.STYLE_INLINE=2,CKEDITOR.STYLE_OBJECT=3,function(){function a(a,b){for(var d,c;(a=a.getParent())&&!a.equals(b);)if(a.getAttribute("data-nostyle"))d=a;else if(!c){var g=a.getAttribute("contentEditable");
+"false"==g?d=a:"true"==g&&(c=1)}return d}function e(a,b,d,c){return(a.getPosition(b)|c)==c&&(!d.childRule||d.childRule(a))}function c(b){var d=b.document;if(b.collapsed)d=u(this,d),b.insertNode(d),b.moveToPosition(d,CKEDITOR.POSITION_BEFORE_END);else{var g=this.element,f=this._.definition,k,n=f.ignoreReadonly,l=n||f.includeReadonly;null==l&&(l=b.root.getCustomData("cke_includeReadonly"));var p=CKEDITOR.dtd[g];p||(k=!0,p=CKEDITOR.dtd.span);b.enlarge(CKEDITOR.ENLARGE_INLINE,1);b.trim();var m=b.createBookmark(),
+q=m.startNode,v=m.endNode,r=q,t;if(!n){var B=b.getCommonAncestor(),n=a(q,B),B=a(v,B);n&&(r=n.getNextSourceNode(!0));B&&(v=B)}for(r.getPosition(v)==CKEDITOR.POSITION_FOLLOWING&&(r=0);r;){n=!1;if(r.equals(v))r=null,n=!0;else{var y=r.type==CKEDITOR.NODE_ELEMENT?r.getName():null,B=y&&"false"==r.getAttribute("contentEditable"),x=y&&r.getAttribute("data-nostyle");if(y&&r.data("cke-bookmark")){r=r.getNextSourceNode(!0);continue}if(B&&l&&CKEDITOR.dtd.$block[y])for(var F=r,A=h(F),z=void 0,C=A.length,fa=0,
+F=C&&new CKEDITOR.dom.range(F.getDocument());fa<C;++fa){var z=A[fa],E=CKEDITOR.filter.instances[z.data("cke-filter")];if(E?E.check(this):1)F.selectNodeContents(z),c.call(this,F)}A=y?!p[y]||x?0:B&&!l?0:e(r,v,f,M):1;if(A)if(z=r.getParent(),A=f,C=g,fa=k,!z||!(z.getDtd()||CKEDITOR.dtd.span)[C]&&!fa||A.parentRule&&!A.parentRule(z))n=!0;else{if(t||y&&CKEDITOR.dtd.$removeEmpty[y]&&(r.getPosition(v)|M)!=M||(t=b.clone(),t.setStartBefore(r)),y=r.type,y==CKEDITOR.NODE_TEXT||B||y==CKEDITOR.NODE_ELEMENT&&!r.getChildCount()){for(var y=
+r,H;(n=!y.getNext(I))&&(H=y.getParent(),p[H.getName()])&&e(H,q,f,P);)y=H;t.setEndAfter(y)}}else n=!0;r=r.getNextSourceNode(x||B)}if(n&&t&&!t.collapsed){for(var n=u(this,d),B=n.hasAttributes(),x=t.getCommonAncestor(),y={},A={},z={},C={},ga,Z,D;n&&x;){if(x.getName()==g){for(ga in f.attributes)!C[ga]&&(D=x.getAttribute(Z))&&(n.getAttribute(ga)==D?A[ga]=1:C[ga]=1);for(Z in f.styles)!z[Z]&&(D=x.getStyle(Z))&&(n.getStyle(Z)==D?y[Z]=1:z[Z]=1)}x=x.getParent()}for(ga in A)n.removeAttribute(ga);for(Z in y)n.removeStyle(Z);
+B&&!n.hasAttributes()&&(n=null);n?(t.extractContents().appendTo(n),t.insertNode(n),w.call(this,n),n.mergeSiblings(),CKEDITOR.env.ie||n.$.normalize()):(n=new CKEDITOR.dom.element("span"),t.extractContents().appendTo(n),t.insertNode(n),w.call(this,n),n.remove(!0));t=null}}b.moveToBookmark(m);b.shrink(CKEDITOR.SHRINK_TEXT);b.shrink(CKEDITOR.NODE_ELEMENT,!0)}}function f(a){function b(){for(var a=new CKEDITOR.dom.elementPath(c.getParent()),d=new CKEDITOR.dom.elementPath(l.getParent()),g=null,e=null,f=
+0;f<a.elements.length;f++){var h=a.elements[f];if(h==a.block||h==a.blockLimit)break;p.checkElementRemovable(h,!0)&&(g=h)}for(f=0;f<d.elements.length;f++){h=d.elements[f];if(h==d.block||h==d.blockLimit)break;p.checkElementRemovable(h,!0)&&(e=h)}e&&l.breakParent(e);g&&c.breakParent(g)}a.enlarge(CKEDITOR.ENLARGE_INLINE,1);var d=a.createBookmark(),c=d.startNode;if(a.collapsed){for(var g=new CKEDITOR.dom.elementPath(c.getParent(),a.root),e,f=0,h;f<g.elements.length&&(h=g.elements[f])&&h!=g.block&&h!=g.blockLimit;f++)if(this.checkElementRemovable(h)){var k;
+a.collapsed&&(a.checkBoundaryOfElement(h,CKEDITOR.END)||(k=a.checkBoundaryOfElement(h,CKEDITOR.START)))?(e=h,e.match=k?"start":"end"):(h.mergeSiblings(),h.is(this.element)?r.call(this,h):n(h,t(this)[h.getName()]))}if(e){h=c;for(f=0;;f++){k=g.elements[f];if(k.equals(e))break;else if(k.match)continue;else k=k.clone();k.append(h);h=k}h["start"==e.match?"insertBefore":"insertAfter"](e)}}else{var l=d.endNode,p=this;b();for(g=c;!g.equals(l);)e=g.getNextSourceNode(),g.type==CKEDITOR.NODE_ELEMENT&&this.checkElementRemovable(g)&&
+(g.getName()==this.element?r.call(this,g):n(g,t(this)[g.getName()]),e.type==CKEDITOR.NODE_ELEMENT&&e.contains(c)&&(b(),e=c.getNext())),g=e}a.moveToBookmark(d);a.shrink(CKEDITOR.NODE_ELEMENT,!0)}function h(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function m(a){var b=a.getEnclosedNode()||a.getCommonAncestor(!1,!0);(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1))&&!a.isReadOnly()&&B(a,this)}
+function l(a){var b=a.getCommonAncestor(!0,!0);if(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1)){var b=this._.definition,d=b.attributes;if(d)for(var c in d)a.removeAttribute(c,d[c]);if(b.styles)for(var g in b.styles)b.styles.hasOwnProperty(g)&&a.removeStyle(g)}}function k(a){var d=a.createBookmark(!0),c=a.createIterator();c.enforceRealBlocks=!0;this._.enterMode&&(c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR);for(var g,e=a.document,f;g=c.getNextParagraph();)!g.isReadOnly()&&
+(c.activeFilter?c.activeFilter.check(this):1)&&(f=u(this,e,g),b(g,f));a.moveToBookmark(d)}function d(a){var d=a.createBookmark(1),c=a.createIterator();c.enforceRealBlocks=!0;c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR;for(var g,e;g=c.getNextParagraph();)this.checkElementRemovable(g)&&(g.is("pre")?((e=this._.enterMode==CKEDITOR.ENTER_BR?null:a.document.createElement(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))&&g.copyAttributes(e),b(g,e)):r.call(this,g));a.moveToBookmark(d)}function b(a,b){var d=
+!b;d&&(b=a.getDocument().createElement("div"),a.copyAttributes(b));var c=b&&b.is("pre"),e=a.is("pre"),f=!c&&e;if(c&&!e){e=b;(f=a.getBogus())&&f.remove();f=a.getHtml();f=p(f,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"");f=f.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,"$1");f=f.replace(/([ \t\n\r]+|&nbsp;)/g," ");f=f.replace(/<br\b[^>]*>/gi,"\n");if(CKEDITOR.env.ie){var h=a.getDocument().createElement("div");h.append(e);e.$.outerHTML="\x3cpre\x3e"+f+"\x3c/pre\x3e";e.copyAttributes(h.getFirst());e=h.getFirst().remove()}else e.setHtml(f);
+b=e}else f?b=v(d?[a.getHtml()]:g(a),b):a.moveChildren(b);b.replace(a);if(c){var d=b,k;(k=d.getPrevious(H))&&k.type==CKEDITOR.NODE_ELEMENT&&k.is("pre")&&(c=p(k.getHtml(),/\n$/,"")+"\n\n"+p(d.getHtml(),/^\n/,""),CKEDITOR.env.ie?d.$.outerHTML="\x3cpre\x3e"+c+"\x3c/pre\x3e":d.setHtml(c),k.remove())}else d&&q(b)}function g(a){var b=[];p(a.getOuterHtml(),/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,function(a,b,d){return b+"\x3c/pre\x3e"+d+"\x3cpre\x3e"}).replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,
+function(a,d){b.push(d)});return b}function p(a,b,d){var c="",g="";a=a.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(a,b,d){b&&(c=b);d&&(g=d);return""});return c+a.replace(b,d)+g}function v(a,b){var d;1<a.length&&(d=new CKEDITOR.dom.documentFragment(b.getDocument()));for(var c=0;c<a.length;c++){var g=a[c],g=g.replace(/(\r\n|\r)/g,"\n"),g=p(g,/^[ \t]*\n/,""),g=p(g,/\n$/,""),g=p(g,/^[ \t]+|[ \t]+$/g,function(a,b){return 1==a.length?"\x26nbsp;":
+b?" "+CKEDITOR.tools.repeat("\x26nbsp;",a.length-1):CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "}),g=g.replace(/\n/g,"\x3cbr\x3e"),g=g.replace(/[ \t]{2,}/g,function(a){return CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "});if(d){var e=b.clone();e.setHtml(g);d.append(e)}else b.setHtml(g)}return d||b}function r(a,b){var d=this._.definition,c=d.attributes,d=d.styles,g=t(this)[a.getName()],e=CKEDITOR.tools.isEmpty(c)&&CKEDITOR.tools.isEmpty(d),f;for(f in c)if("class"!=f&&!this._.definition.fullMatch||
+a.getAttribute(f)==x(f,c[f]))b&&"data-"==f.slice(0,5)||(e=a.hasAttribute(f),a.removeAttribute(f));for(var h in d)this._.definition.fullMatch&&a.getStyle(h)!=x(h,d[h],!0)||(e=e||!!a.getStyle(h),a.removeStyle(h));n(a,g,A[a.getName()]);e&&(this._.definition.alwaysRemoveElement?q(a,1):!CKEDITOR.dtd.$block[a.getName()]||this._.enterMode==CKEDITOR.ENTER_BR&&!a.hasAttributes()?q(a):a.renameNode(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))}function w(a){for(var b=t(this),d=a.getElementsByTag(this.element),
+c,g=d.count();0<=--g;)c=d.getItem(g),c.isReadOnly()||r.call(this,c,!0);for(var e in b)if(e!=this.element)for(d=a.getElementsByTag(e),g=d.count()-1;0<=g;g--)c=d.getItem(g),c.isReadOnly()||n(c,b[e])}function n(a,b,d){if(b=b&&b.attributes)for(var c=0;c<b.length;c++){var g=b[c][0],e;if(e=a.getAttribute(g)){var f=b[c][1];(null===f||f.test&&f.test(e)||"string"==typeof f&&e==f)&&a.removeAttribute(g)}}d||q(a)}function q(a,b){if(!a.hasAttributes()||b)if(CKEDITOR.dtd.$block[a.getName()]){var d=a.getPrevious(H),
+c=a.getNext(H);!d||d.type!=CKEDITOR.NODE_TEXT&&d.isBlockBoundary({br:1})||a.append("br",1);!c||c.type!=CKEDITOR.NODE_TEXT&&c.isBlockBoundary({br:1})||a.append("br");a.remove(!0)}else d=a.getFirst(),c=a.getLast(),a.remove(!0),d&&(d.type==CKEDITOR.NODE_ELEMENT&&d.mergeSiblings(),c&&!d.equals(c)&&c.type==CKEDITOR.NODE_ELEMENT&&c.mergeSiblings())}function u(a,b,d){var c;c=a.element;"*"==c&&(c="span");c=new CKEDITOR.dom.element(c,b);d&&d.copyAttributes(c);c=B(c,a);b.getCustomData("doc_processing_style")&&
+c.hasAttribute("id")?c.removeAttribute("id"):b.setCustomData("doc_processing_style",1);return c}function B(a,b){var d=b._.definition,c=d.attributes,d=CKEDITOR.style.getStyleText(d);if(c)for(var g in c)a.setAttribute(g,c[g]);d&&a.setAttribute("style",d);return a}function y(a,b){for(var d in a)a[d]=a[d].replace(D,function(a,d){return b[d]})}function t(a){if(a._.overrides)return a._.overrides;var b=a._.overrides={},d=a._.definition.overrides;if(d){CKEDITOR.tools.isArray(d)||(d=[d]);for(var c=0;c<d.length;c++){var g=
+d[c],e,f;"string"==typeof g?e=g.toLowerCase():(e=g.element?g.element.toLowerCase():a.element,f=g.attributes);g=b[e]||(b[e]={});if(f){var g=g.attributes=g.attributes||[],h;for(h in f)g.push([h.toLowerCase(),f[h]])}}}return b}function x(a,b,d){var c=new CKEDITOR.dom.element("span");c[d?"setStyle":"setAttribute"](a,b);return c[d?"getStyle":"getAttribute"](a)}function F(a,b){function d(a,b){return"font-family"==b.toLowerCase()?a.replace(/["']/g,""):a}"string"==typeof a&&(a=CKEDITOR.tools.parseCssText(a));
+"string"==typeof b&&(b=CKEDITOR.tools.parseCssText(b,!0));for(var c in a)if(!(c in b)||d(b[c],c)!=d(a[c],c)&&"inherit"!=a[c]&&"inherit"!=b[c])return!1;return!0}function z(a,b,d){var c=a.document,g=a.getRanges();b=b?this.removeFromRange:this.applyToRange;for(var e,f=g.createIterator();e=f.getNextRange();)b.call(this,e,d);a.selectRanges(g);c.removeCustomData("doc_processing_style")}var A={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,
+dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},C={a:1,blockquote:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},E=/\s*(?:;\s*|$)/,D=/#\((.+?)\)/g,I=CKEDITOR.dom.walker.bookmark(0,1),H=CKEDITOR.dom.walker.whitespaces(1);CKEDITOR.style=function(a,b){if("string"==typeof a.type)return new CKEDITOR.style.customHandlers[a.type](a);var d=a.attributes;d&&d.style&&(a.styles=CKEDITOR.tools.extend({},
+a.styles,CKEDITOR.tools.parseCssText(d.style)),delete d.style);b&&(a=CKEDITOR.tools.clone(a),y(a.attributes,b),y(a.styles,b));d=this.element=a.element?"string"==typeof a.element?a.element.toLowerCase():a.element:"*";this.type=a.type||(A[d]?CKEDITOR.STYLE_BLOCK:C[d]?CKEDITOR.STYLE_OBJECT:CKEDITOR.STYLE_INLINE);"object"==typeof this.element&&(this.type=CKEDITOR.STYLE_OBJECT);this._={definition:a}};CKEDITOR.style.prototype={apply:function(a){if(a instanceof CKEDITOR.dom.document)return z.call(this,a.getSelection());
 if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);z.call(this,a.getSelection(),0,a);this._.enterMode=b}},remove:function(a){if(a instanceof CKEDITOR.dom.document)return z.call(this,a.getSelection(),1);if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);z.call(this,a.getSelection(),1,a);this._.enterMode=b}},applyToRange:function(a){this.applyToRange=this.type==CKEDITOR.STYLE_INLINE?c:this.type==
-CKEDITOR.STYLE_BLOCK?k:this.type==CKEDITOR.STYLE_OBJECT?m:null;return this.applyToRange(a)},removeFromRange:function(a){this.removeFromRange=this.type==CKEDITOR.STYLE_INLINE?e:this.type==CKEDITOR.STYLE_BLOCK?b:this.type==CKEDITOR.STYLE_OBJECT?l:null;return this.removeFromRange(a)},applyToObject:function(a){A(a,this)},checkActive:function(a,b){switch(this.type){case CKEDITOR.STYLE_BLOCK:return this.checkElementRemovable(a.block||a.blockLimit,!0,b);case CKEDITOR.STYLE_OBJECT:case CKEDITOR.STYLE_INLINE:for(var d=
+CKEDITOR.STYLE_BLOCK?k:this.type==CKEDITOR.STYLE_OBJECT?m:null;return this.applyToRange(a)},removeFromRange:function(a){this.removeFromRange=this.type==CKEDITOR.STYLE_INLINE?f:this.type==CKEDITOR.STYLE_BLOCK?d:this.type==CKEDITOR.STYLE_OBJECT?l:null;return this.removeFromRange(a)},applyToObject:function(a){B(a,this)},checkActive:function(a,b){switch(this.type){case CKEDITOR.STYLE_BLOCK:return this.checkElementRemovable(a.block||a.blockLimit,!0,b);case CKEDITOR.STYLE_OBJECT:case CKEDITOR.STYLE_INLINE:for(var d=
 a.elements,c=0,g;c<d.length;c++)if(g=d[c],this.type!=CKEDITOR.STYLE_INLINE||g!=a.block&&g!=a.blockLimit){if(this.type==CKEDITOR.STYLE_OBJECT){var e=g.getName();if(!("string"==typeof this.element?e==this.element:e in this.element))continue}if(this.checkElementRemovable(g,!0,b))return!0}}return!1},checkApplicable:function(a,b,d){b&&b instanceof CKEDITOR.filter&&(d=b);if(d&&!d.check(this))return!1;switch(this.type){case CKEDITOR.STYLE_OBJECT:return!!a.contains(this.element);case CKEDITOR.STYLE_BLOCK:return!!a.blockLimit.getDtd()[this.element]}return!0},
-checkElementMatch:function(a,b){var d=this._.definition;if(!a||!d.ignoreReadonly&&a.isReadOnly())return!1;var c=a.getName();if("string"==typeof this.element?c==this.element:c in this.element){if(!b&&!a.hasAttributes())return!0;if(c=d._AC)d=c;else{var c={},g=0,e=d.attributes;if(e)for(var h in e)g++,c[h]=e[h];if(h=CKEDITOR.style.getStyleText(d))c.style||g++,c.style=h;c._length=g;d=d._AC=c}if(d._length){for(var f in d)if("_length"!=f)if(c=a.getAttribute(f)||"","style"==f?B(d[f],c):d[f]==c){if(!b)return!0}else if(b)return!1;
-if(b)return!0}else return!0}return!1},checkElementRemovable:function(a,b,d){if(this.checkElementMatch(a,b,d))return!0;if(b=r(this)[a.getName()]){var c;if(!(b=b.attributes))return!0;for(d=0;d<b.length;d++)if(c=b[d][0],c=a.getAttribute(c)){var g=b[d][1];if(null===g)return!0;if("string"==typeof g){if(c==g)return!0}else if(g.test(c))return!0}}return!1},buildPreview:function(a){var b=this._.definition,d=[],c=b.element;"bdo"==c&&(c="span");var d=["\x3c",c],g=b.attributes;if(g)for(var e in g)d.push(" ",
-e,'\x3d"',g[e],'"');(g=CKEDITOR.style.getStyleText(b))&&d.push(' style\x3d"',g,'"');d.push("\x3e",a||b.name,"\x3c/",c,"\x3e");return d.join("")},getDefinition:function(){return this._.definition}};CKEDITOR.style.getStyleText=function(a){var b=a._ST;if(b)return b;var b=a.styles,d=a.attributes&&a.attributes.style||"",c="";d.length&&(d=d.replace(F,";"));for(var g in b){var e=b[g],h=(g+":"+e).replace(F,";");"inherit"==e?c+=h:d+=h}d.length&&(d=CKEDITOR.tools.normalizeCssText(d,!0));return a._ST=d+c};CKEDITOR.style.customHandlers=
-{};CKEDITOR.style.addCustomHandler=function(a){var b=function(a){this._={definition:a};this.setup&&this.setup(a)};b.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.style.prototype),{assignedTo:CKEDITOR.STYLE_OBJECT},a,!0);return this.customHandlers[a.type]=b};var N=CKEDITOR.POSITION_PRECEDING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED,O=CKEDITOR.POSITION_FOLLOWING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED}(),CKEDITOR.styleCommand=function(a,
-f){this.requiredContent=this.allowedContent=this.style=a;CKEDITOR.tools.extend(this,f,!0)},CKEDITOR.styleCommand.prototype.exec=function(a){a.focus();this.state==CKEDITOR.TRISTATE_OFF?a.applyStyle(this.style):this.state==CKEDITOR.TRISTATE_ON&&a.removeStyle(this.style)},CKEDITOR.stylesSet=new CKEDITOR.resourceManager("","stylesSet"),CKEDITOR.addStylesSet=CKEDITOR.tools.bind(CKEDITOR.stylesSet.add,CKEDITOR.stylesSet),CKEDITOR.loadStylesSet=function(a,f,c){CKEDITOR.stylesSet.addExternal(a,f,"");CKEDITOR.stylesSet.load(a,
-c)},CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{attachStyleStateChange:function(a,f){var c=this._.styleStateChangeCallbacks;c||(c=this._.styleStateChangeCallbacks=[],this.on("selectionChange",function(a){for(var h=0;h<c.length;h++){var f=c[h],l=f.style.checkActive(a.data.path,this)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF;f.fn.call(this,l)}}));c.push({style:a,fn:f})},applyStyle:function(a){a.apply(this)},removeStyle:function(a){a.remove(this)},getStylesSet:function(a){if(this._.stylesDefinitions)a(this._.stylesDefinitions);
-else{var f=this,c=f.config.stylesCombo_stylesSet||f.config.stylesSet;if(!1===c)a(null);else if(c instanceof Array)f._.stylesDefinitions=c,a(c);else{c||(c="default");var c=c.split(":"),e=c[0];CKEDITOR.stylesSet.addExternal(e,c[1]?c.slice(1).join(":"):CKEDITOR.getUrl("styles.js"),"");CKEDITOR.stylesSet.load(e,function(c){f._.stylesDefinitions=c[e];a(f._.stylesDefinitions)})}}}}),CKEDITOR.dom.comment=function(a,f){"string"==typeof a&&(a=(f?f.$:document).createComment(a));CKEDITOR.dom.domObject.call(this,
-a)},CKEDITOR.dom.comment.prototype=new CKEDITOR.dom.node,CKEDITOR.tools.extend(CKEDITOR.dom.comment.prototype,{type:CKEDITOR.NODE_COMMENT,getOuterHtml:function(){return"\x3c!--"+this.$.nodeValue+"--\x3e"}}),"use strict",function(){var a={},f={},c;for(c in CKEDITOR.dtd.$blockLimit)c in CKEDITOR.dtd.$list||(a[c]=1);for(c in CKEDITOR.dtd.$block)c in CKEDITOR.dtd.$blockLimit||c in CKEDITOR.dtd.$empty||(f[c]=1);CKEDITOR.dom.elementPath=function(c,h){var m=null,l=null,k=[],b=c,d;h=h||c.getDocument().getBody();
-do if(b.type==CKEDITOR.NODE_ELEMENT){k.push(b);if(!this.lastElement&&(this.lastElement=b,b.is(CKEDITOR.dtd.$object)||"false"==b.getAttribute("contenteditable")))continue;if(b.equals(h))break;if(!l&&(d=b.getName(),"true"==b.getAttribute("contenteditable")?l=b:!m&&f[d]&&(m=b),a[d])){if(d=!m&&"div"==d){a:{d=b.getChildren();for(var g=0,p=d.count();g<p;g++){var v=d.getItem(g);if(v.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$block[v.getName()]){d=!0;break a}}d=!1}d=!d}d?m=b:l=b}}while(b=b.getParent());l||
-(l=h);this.block=m;this.blockLimit=l;this.root=h;this.elements=k}}(),CKEDITOR.dom.elementPath.prototype={compare:function(a){var f=this.elements;a=a&&a.elements;if(!a||f.length!=a.length)return!1;for(var c=0;c<f.length;c++)if(!f[c].equals(a[c]))return!1;return!0},contains:function(a,f,c){var e;"string"==typeof a&&(e=function(c){return c.getName()==a});a instanceof CKEDITOR.dom.element?e=function(c){return c.equals(a)}:CKEDITOR.tools.isArray(a)?e=function(c){return-1<CKEDITOR.tools.indexOf(a,c.getName())}:
-"function"==typeof a?e=a:"object"==typeof a&&(e=function(c){return c.getName()in a});var h=this.elements,m=h.length;f&&m--;c&&(h=Array.prototype.slice.call(h,0),h.reverse());for(f=0;f<m;f++)if(e(h[f]))return h[f];return null},isContextFor:function(a){var f;return a in CKEDITOR.dtd.$block?(f=this.contains(CKEDITOR.dtd.$intermediate)||this.root.equals(this.block)&&this.block||this.blockLimit,!!f.getDtd()[a]):!0},direction:function(){return(this.block||this.blockLimit||this.root).getDirection(1)}},CKEDITOR.dom.text=
-function(a,f){"string"==typeof a&&(a=(f?f.$:document).createTextNode(a));this.$=a},CKEDITOR.dom.text.prototype=new CKEDITOR.dom.node,CKEDITOR.tools.extend(CKEDITOR.dom.text.prototype,{type:CKEDITOR.NODE_TEXT,getLength:function(){return this.$.nodeValue.length},getText:function(){return this.$.nodeValue},setText:function(a){this.$.nodeValue=a},split:function(a){var f=this.$.parentNode,c=f.childNodes.length,e=this.getLength(),h=this.getDocument(),m=new CKEDITOR.dom.text(this.$.splitText(a),h);f.childNodes.length==
-c&&(a>=e?(m=h.createText(""),m.insertAfter(this)):(a=h.createText(""),a.insertAfter(m),a.remove()));return m},substring:function(a,f){return"number"!=typeof f?this.$.nodeValue.substr(a):this.$.nodeValue.substring(a,f)}}),function(){function a(a,e,h){var f=a.serializable,l=e[h?"endContainer":"startContainer"],k=h?"endOffset":"startOffset",b=f?e.document.getById(a.startNode):a.startNode;a=f?e.document.getById(a.endNode):a.endNode;l.equals(b.getPrevious())?(e.startOffset=e.startOffset-l.getLength()-
-a.getPrevious().getLength(),l=a.getNext()):l.equals(a.getPrevious())&&(e.startOffset-=l.getLength(),l=a.getNext());l.equals(b.getParent())&&e[k]++;l.equals(a.getParent())&&e[k]++;e[h?"endContainer":"startContainer"]=l;return e}CKEDITOR.dom.rangeList=function(a){if(a instanceof CKEDITOR.dom.rangeList)return a;a?a instanceof CKEDITOR.dom.range&&(a=[a]):a=[];return CKEDITOR.tools.extend(a,f)};var f={createIterator:function(){var a=this,e=CKEDITOR.dom.walker.bookmark(),h=[],f;return{getNextRange:function(l){f=
-void 0===f?0:f+1;var k=a[f];if(k&&1<a.length){if(!f)for(var b=a.length-1;0<=b;b--)h.unshift(a[b].createBookmark(!0));if(l)for(var d=0;a[f+d+1];){var g=k.document;l=0;b=g.getById(h[d].endNode);for(g=g.getById(h[d+1].startNode);;){b=b.getNextSourceNode(!1);if(g.equals(b))l=1;else if(e(b)||b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary())continue;break}if(!l)break;d++}for(k.moveToBookmark(h.shift());d--;)b=a[++f],b.moveToBookmark(h.shift()),k.setEnd(b.endContainer,b.endOffset)}return k}}},createBookmarks:function(c){for(var e=
-[],h,f=0;f<this.length;f++){e.push(h=this[f].createBookmark(c,!0));for(var l=f+1;l<this.length;l++)this[l]=a(h,this[l]),this[l]=a(h,this[l],!0)}return e},createBookmarks2:function(a){for(var e=[],h=0;h<this.length;h++)e.push(this[h].createBookmark2(a));return e},moveToBookmarks:function(a){for(var e=0;e<this.length;e++)this[e].moveToBookmark(a[e])}}}(),function(){function a(){return CKEDITOR.getUrl(CKEDITOR.skinName.split(",")[1]||"skins/"+CKEDITOR.skinName.split(",")[0]+"/")}function f(b){var c=
-CKEDITOR.skin["ua_"+b],e=CKEDITOR.env;if(c)for(var c=c.split(",").sort(function(a,b){return a>b?-1:1}),h=0,f;h<c.length;h++)if(f=c[h],e.ie&&(f.replace(/^ie/,"")==e.version||e.quirks&&"iequirks"==f)&&(f="ie"),e[f]){b+="_"+c[h];break}return CKEDITOR.getUrl(a()+b+".css")}function c(a,b){m[a]||(CKEDITOR.document.appendStyleSheet(f(a)),m[a]=1);b&&b()}function e(a){var b=a.getById(l);b||(b=a.getHead().append("style"),b.setAttribute("id",l),b.setAttribute("type","text/css"));return b}function h(a,b,c){var e,
-h,f;if(CKEDITOR.env.webkit)for(b=b.split("}").slice(0,-1),h=0;h<b.length;h++)b[h]=b[h].split("{");for(var k=0;k<a.length;k++)if(CKEDITOR.env.webkit)for(h=0;h<b.length;h++){f=b[h][1];for(e=0;e<c.length;e++)f=f.replace(c[e][0],c[e][1]);a[k].$.sheet.addRule(b[h][0],f)}else{f=b;for(e=0;e<c.length;e++)f=f.replace(c[e][0],c[e][1]);CKEDITOR.env.ie&&11>CKEDITOR.env.version?a[k].$.styleSheet.cssText+=f:a[k].$.innerHTML+=f}}var m={};CKEDITOR.skin={path:a,loadPart:function(b,g){CKEDITOR.skin.name!=CKEDITOR.skinName.split(",")[0]?
-CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(a()+"skin.js"),function(){c(b,g)}):c(b,g)},getPath:function(a){return CKEDITOR.getUrl(f(a))},icons:{},addIcon:function(a,b,c,e){a=a.toLowerCase();this.icons[a]||(this.icons[a]={path:b,offset:c||0,bgsize:e||"16px"})},getIconStyle:function(a,b,c,e,h){var f;a&&(a=a.toLowerCase(),b&&(f=this.icons[a+"-rtl"]),f||(f=this.icons[a]));a=c||f&&f.path||"";e=e||f&&f.offset;h=h||f&&f.bgsize||"16px";a&&(a=a.replace(/'/g,"\\'"));return a&&"background-image:url('"+CKEDITOR.getUrl(a)+
-"');background-position:0 "+e+"px;background-size:"+h+";"}};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{getUiColor:function(){return this.uiColor},setUiColor:function(a){var c=e(CKEDITOR.document);return(this.setUiColor=function(a){this.uiColor=a;var d=CKEDITOR.skin.chameleon,e="",f="";"function"==typeof d&&(e=d(this,"editor"),f=d(this,"panel"));a=[[b,a]];h([c],e,a);h(k,f,a)}).call(this,a)}});var l="cke_ui_color",k=[],b=/\$color/g;CKEDITOR.on("instanceLoaded",function(a){if(!CKEDITOR.env.ie||
-!CKEDITOR.env.quirks){var c=a.editor;a=function(a){a=(a.data[0]||a.data).element.getElementsByTag("iframe").getItem(0).getFrameDocument();if(!a.getById("cke_ui_color")){a=e(a);k.push(a);var d=c.getUiColor();d&&h([a],CKEDITOR.skin.chameleon(c,"panel"),[[b,d]])}};c.on("panelShow",a);c.on("menuShow",a);c.config.uiColor&&c.setUiColor(c.config.uiColor)}})}(),function(){if(CKEDITOR.env.webkit)CKEDITOR.env.hc=!1;else{var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"width:0;height:0;position:absolute;left:-10000px;border:1px solid;border-color:red blue"\x3e\x3c/div\x3e',
-CKEDITOR.document);a.appendTo(CKEDITOR.document.getHead());try{var f=a.getComputedStyle("border-top-color"),c=a.getComputedStyle("border-right-color");CKEDITOR.env.hc=!(!f||f!=c)}catch(e){CKEDITOR.env.hc=!1}a.remove()}CKEDITOR.env.hc&&(CKEDITOR.env.cssClass+=" cke_hc");CKEDITOR.document.appendStyleText(".cke{visibility:hidden;}");CKEDITOR.status="loaded";CKEDITOR.fireOnce("loaded");if(a=CKEDITOR._.pending)for(delete CKEDITOR._.pending,f=0;f<a.length;f++)CKEDITOR.editor.prototype.constructor.apply(a[f][0],
-a[f][1]),CKEDITOR.add(a[f][0])}(),CKEDITOR.skin.name="moono",CKEDITOR.skin.ua_editor="ie,iequirks,ie7,ie8,gecko",CKEDITOR.skin.ua_dialog="ie,iequirks,ie7,ie8",CKEDITOR.skin.chameleon=function(){var a=function(){return function(a,c){for(var f=a.match(/[^#]./g),l=0;3>l;l++){var k=l,b;b=parseInt(f[l],16);b=("0"+(0>c?0|b*(1+c):0|b+(255-b)*c).toString(16)).slice(-2);f[k]=b}return"#"+f.join("")}}(),f=function(){var a=new CKEDITOR.template("background:#{to};background-image:linear-gradient(to bottom,{from},{to});filter:progid:DXImageTransform.Microsoft.gradient(gradientType\x3d0,startColorstr\x3d'{from}',endColorstr\x3d'{to}');");
-return function(c,f){return a.output({from:c,to:f})}}(),c={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ {defaultGradient}border-bottom-color:{defaultBorder};] {id} .cke_bottom [{defaultGradient}border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [{defaultGradient}border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [{defaultGradient}outline-color:{defaultBorder};border-top-color:{defaultBorder};] {id} .cke_dialog_tab [{lightGradient}border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [{mediumGradient}] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} .cke_toolgroup [{lightGradient}border-color:{defaultBorder};] {id} a.cke_button_off:hover, {id} a.cke_button_off:focus, {id} a.cke_button_off:active [{mediumGradient}] {id} .cke_button_on [{ckeButtonOn}] {id} .cke_toolbar_separator [background-color: {ckeToolbarSeparator};] {id} .cke_combo_button [border-color:{defaultBorder};{lightGradient}] {id} a.cke_combo_button:hover, {id} a.cke_combo_button:focus, {id} .cke_combo_on a.cke_combo_button [border-color:{defaultBorder};{mediumGradient}] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover, {id} a.cke_path_item:focus, {id} a.cke_path_item:active [background-color:{elementsPathBg};] {id}.cke_panel [border-color:{defaultBorder};] "),
-panel:new CKEDITOR.template(".cke_panel_grouptitle [{lightGradient}border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:focus.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:focus.cke_colorauto, a:focus.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
-return function(e,h){var m=e.uiColor,m={id:"."+e.id,defaultBorder:a(m,-.1),defaultGradient:f(a(m,.9),m),lightGradient:f(a(m,1),a(m,.7)),mediumGradient:f(a(m,.8),a(m,.5)),ckeButtonOn:f(a(m,.6),a(m,.7)),ckeResizer:a(m,-.4),ckeToolbarSeparator:a(m,.5),ckeColorauto:a(m,.8),dialogBody:a(m,.7),dialogTabSelected:f("#FFFFFF","#FFFFFF"),dialogTabSelectedBorder:"#FFF",elementsPathColor:a(m,-.6),elementsPathBg:m,menubuttonIcon:a(m,.5),menubuttonIconHover:a(m,.3)};return c[h].output(m).replace(/\[/g,"{").replace(/\]/g,
-"}")}}(),CKEDITOR.plugins.add("dialogui",{onLoad:function(){var a=function(a){this._||(this._={});this._["default"]=this._.initValue=a["default"]||"";this._.required=a.required||!1;for(var d=[this._],c=1;c<arguments.length;c++)d.push(arguments[c]);d.push(!0);CKEDITOR.tools.extend.apply(CKEDITOR.tools,d);return this._},f={build:function(a,d,c){return new CKEDITOR.ui.dialog.textInput(a,d,c)}},c={build:function(a,d,c){return new CKEDITOR.ui.dialog[d.type](a,d,c)}},e={isChanged:function(){return this.getValue()!=
-this.getInitValue()},reset:function(a){this.setValue(this.getInitValue(),a)},setInitValue:function(){this._.initValue=this.getValue()},resetInitValue:function(){this._.initValue=this._["default"]},getInitValue:function(){return this._.initValue}},h=CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onChange:function(a,d){this._.domOnChangeRegistered||(a.on("load",function(){this.getInputElement().on("change",function(){a.parts.dialog.isVisible()&&this.fire("change",{value:this.getValue()})},
-this)},this),this._.domOnChangeRegistered=!0);this.on("change",d)}},!0),m=/^on([A-Z]\w+)/,l=function(a){for(var d in a)(m.test(d)||"title"==d||"type"==d)&&delete a[d];return a},k=function(a){a=a.data.getKeystroke();a==CKEDITOR.SHIFT+CKEDITOR.ALT+36?this.setDirectionMarker("ltr"):a==CKEDITOR.SHIFT+CKEDITOR.ALT+35&&this.setDirectionMarker("rtl")};CKEDITOR.tools.extend(CKEDITOR.ui.dialog,{labeledElement:function(b,d,c,e){if(!(4>arguments.length)){var h=a.call(this,d);h.labelId=CKEDITOR.tools.getNextId()+
-"_label";this._.children=[];var f={role:d.role||"presentation"};d.includeLabel&&(f["aria-labelledby"]=h.labelId);CKEDITOR.ui.dialog.uiElement.call(this,b,d,c,"div",null,f,function(){var a=[],c=d.required?" cke_required":"";"horizontal"!=d.labelLayout?a.push('\x3clabel class\x3d"cke_dialog_ui_labeled_label'+c+'" ',' id\x3d"'+h.labelId+'"',h.inputId?' for\x3d"'+h.inputId+'"':"",(d.labelStyle?' style\x3d"'+d.labelStyle+'"':"")+"\x3e",d.label,"\x3c/label\x3e",'\x3cdiv class\x3d"cke_dialog_ui_labeled_content"',
-d.controlStyle?' style\x3d"'+d.controlStyle+'"':"",' role\x3d"presentation"\x3e',e.call(this,b,d),"\x3c/div\x3e"):(c={type:"hbox",widths:d.widths,padding:0,children:[{type:"html",html:'\x3clabel class\x3d"cke_dialog_ui_labeled_label'+c+'" id\x3d"'+h.labelId+'" for\x3d"'+h.inputId+'"'+(d.labelStyle?' style\x3d"'+d.labelStyle+'"':"")+"\x3e"+CKEDITOR.tools.htmlEncode(d.label)+"\x3c/label\x3e"},{type:"html",html:'\x3cspan class\x3d"cke_dialog_ui_labeled_content"'+(d.controlStyle?' style\x3d"'+d.controlStyle+
-'"':"")+"\x3e"+e.call(this,b,d)+"\x3c/span\x3e"}]},CKEDITOR.dialog._.uiElementBuilders.hbox.build(b,c,a));return a.join("")})}},textInput:function(b,d,c){if(!(3>arguments.length)){a.call(this,d);var e=this._.inputId=CKEDITOR.tools.getNextId()+"_textInput",h={"class":"cke_dialog_ui_input_"+d.type,id:e,type:d.type};d.validate&&(this.validate=d.validate);d.maxLength&&(h.maxlength=d.maxLength);d.size&&(h.size=d.size);d.inputStyle&&(h.style=d.inputStyle);var f=this,l=!1;b.on("load",function(){f.getInputElement().on("keydown",
-function(a){13==a.data.getKeystroke()&&(l=!0)});f.getInputElement().on("keyup",function(a){13==a.data.getKeystroke()&&l&&(b.getButton("ok")&&setTimeout(function(){b.getButton("ok").click()},0),l=!1);f.bidi&&k.call(f,a)},null,null,1E3)});CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){var a=['\x3cdiv class\x3d"cke_dialog_ui_input_',d.type,'" role\x3d"presentation"'];d.width&&a.push('style\x3d"width:'+d.width+'" ');a.push("\x3e\x3cinput ");h["aria-labelledby"]=this._.labelId;this._.required&&
-(h["aria-required"]=this._.required);for(var b in h)a.push(b+'\x3d"'+h[b]+'" ');a.push(" /\x3e\x3c/div\x3e");return a.join("")})}},textarea:function(b,d,c){if(!(3>arguments.length)){a.call(this,d);var e=this,h=this._.inputId=CKEDITOR.tools.getNextId()+"_textarea",f={};d.validate&&(this.validate=d.validate);f.rows=d.rows||5;f.cols=d.cols||20;f["class"]="cke_dialog_ui_input_textarea "+(d["class"]||"");"undefined"!=typeof d.inputStyle&&(f.style=d.inputStyle);d.dir&&(f.dir=d.dir);if(e.bidi)b.on("load",
-function(){e.getInputElement().on("keyup",k)},e);CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){f["aria-labelledby"]=this._.labelId;this._.required&&(f["aria-required"]=this._.required);var a=['\x3cdiv class\x3d"cke_dialog_ui_input_textarea" role\x3d"presentation"\x3e\x3ctextarea id\x3d"',h,'" '],b;for(b in f)a.push(b+'\x3d"'+CKEDITOR.tools.htmlEncode(f[b])+'" ');a.push("\x3e",CKEDITOR.tools.htmlEncode(e._["default"]),"\x3c/textarea\x3e\x3c/div\x3e");return a.join("")})}},checkbox:function(b,
-d,c){if(!(3>arguments.length)){var e=a.call(this,d,{"default":!!d["default"]});d.validate&&(this.validate=d.validate);CKEDITOR.ui.dialog.uiElement.call(this,b,d,c,"span",null,null,function(){var a=CKEDITOR.tools.extend({},d,{id:d.id?d.id+"_checkbox":CKEDITOR.tools.getNextId()+"_checkbox"},!0),c=[],g=CKEDITOR.tools.getNextId()+"_label",h={"class":"cke_dialog_ui_checkbox_input",type:"checkbox","aria-labelledby":g};l(a);d["default"]&&(h.checked="checked");"undefined"!=typeof a.inputStyle&&(a.style=a.inputStyle);
-e.checkbox=new CKEDITOR.ui.dialog.uiElement(b,a,c,"input",null,h);c.push(' \x3clabel id\x3d"',g,'" for\x3d"',h.id,'"'+(d.labelStyle?' style\x3d"'+d.labelStyle+'"':"")+"\x3e",CKEDITOR.tools.htmlEncode(d.label),"\x3c/label\x3e");return c.join("")})}},radio:function(b,d,c){if(!(3>arguments.length)){a.call(this,d);this._["default"]||(this._["default"]=this._.initValue=d.items[0][1]);d.validate&&(this.validate=d.validate);var e=[],h=this;d.role="radiogroup";d.includeLabel=!0;CKEDITOR.ui.dialog.labeledElement.call(this,
-b,d,c,function(){for(var a=[],c=[],g=(d.id?d.id:CKEDITOR.tools.getNextId())+"_radio",f=0;f<d.items.length;f++){var k=d.items[f],m=void 0!==k[2]?k[2]:k[0],C=void 0!==k[1]?k[1]:k[0],r=CKEDITOR.tools.getNextId()+"_radio_input",w=r+"_label",r=CKEDITOR.tools.extend({},d,{id:r,title:null,type:null},!0),m=CKEDITOR.tools.extend({},r,{title:m},!0),B={type:"radio","class":"cke_dialog_ui_radio_input",name:g,value:C,"aria-labelledby":w},z=[];h._["default"]==C&&(B.checked="checked");l(r);l(m);"undefined"!=typeof r.inputStyle&&
-(r.style=r.inputStyle);r.keyboardFocusable=!0;e.push(new CKEDITOR.ui.dialog.uiElement(b,r,z,"input",null,B));z.push(" ");new CKEDITOR.ui.dialog.uiElement(b,m,z,"label",null,{id:w,"for":B.id},k[0]);a.push(z.join(""))}new CKEDITOR.ui.dialog.hbox(b,e,a,c);return c.join("")});this._.children=e}},button:function(b,d,c){if(arguments.length){"function"==typeof d&&(d=d(b.getParentEditor()));a.call(this,d,{disabled:d.disabled||!1});CKEDITOR.event.implementOn(this);var e=this;b.on("load",function(){var a=this.getElement();
-(function(){a.on("click",function(a){e.click();a.data.preventDefault()});a.on("keydown",function(a){a.data.getKeystroke()in{32:1}&&(e.click(),a.data.preventDefault())})})();a.unselectable()},this);var h=CKEDITOR.tools.extend({},d);delete h.style;var f=CKEDITOR.tools.getNextId()+"_label";CKEDITOR.ui.dialog.uiElement.call(this,b,h,c,"a",null,{style:d.style,href:"javascript:void(0)",title:d.label,hidefocus:"true","class":d["class"],role:"button","aria-labelledby":f},'\x3cspan id\x3d"'+f+'" class\x3d"cke_dialog_ui_button"\x3e'+
-CKEDITOR.tools.htmlEncode(d.label)+"\x3c/span\x3e")}},select:function(b,d,c){if(!(3>arguments.length)){var e=a.call(this,d);d.validate&&(this.validate=d.validate);e.inputId=CKEDITOR.tools.getNextId()+"_select";CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){var a=CKEDITOR.tools.extend({},d,{id:d.id?d.id+"_select":CKEDITOR.tools.getNextId()+"_select"},!0),c=[],g=[],h={id:e.inputId,"class":"cke_dialog_ui_input_select","aria-labelledby":this._.labelId};c.push('\x3cdiv class\x3d"cke_dialog_ui_input_',
-d.type,'" role\x3d"presentation"');d.width&&c.push('style\x3d"width:'+d.width+'" ');c.push("\x3e");void 0!==d.size&&(h.size=d.size);void 0!==d.multiple&&(h.multiple=d.multiple);l(a);for(var f=0,k;f<d.items.length&&(k=d.items[f]);f++)g.push('\x3coption value\x3d"',CKEDITOR.tools.htmlEncode(void 0!==k[1]?k[1]:k[0]).replace(/"/g,"\x26quot;"),'" /\x3e ',CKEDITOR.tools.htmlEncode(k[0]));"undefined"!=typeof a.inputStyle&&(a.style=a.inputStyle);e.select=new CKEDITOR.ui.dialog.uiElement(b,a,c,"select",null,
-h,g.join(""));c.push("\x3c/div\x3e");return c.join("")})}},file:function(b,d,c){if(!(3>arguments.length)){void 0===d["default"]&&(d["default"]="");var e=CKEDITOR.tools.extend(a.call(this,d),{definition:d,buttons:[]});d.validate&&(this.validate=d.validate);b.on("load",function(){CKEDITOR.document.getById(e.frameId).getParent().addClass("cke_dialog_ui_input_file")});CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){e.frameId=CKEDITOR.tools.getNextId()+"_fileInput";var a=['\x3ciframe frameborder\x3d"0" allowtransparency\x3d"0" class\x3d"cke_dialog_ui_input_file" role\x3d"presentation" id\x3d"',
-e.frameId,'" title\x3d"',d.label,'" src\x3d"javascript:void('];a.push(CKEDITOR.env.ie?"(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"})()":"0");a.push(')"\x3e\x3c/iframe\x3e');return a.join("")})}},fileButton:function(b,d,c){var e=this;if(!(3>arguments.length)){a.call(this,d);d.validate&&(this.validate=d.validate);var h=CKEDITOR.tools.extend({},d),f=h.onClick;h.className=(h.className?h.className+" ":"")+"cke_dialog_ui_button";h.onClick=function(a){var c=
-d["for"];f&&!1===f.call(this,a)||(b.getContentElement(c[0],c[1]).submit(),this.disable())};b.on("load",function(){b.getContentElement(d["for"][0],d["for"][1])._.buttons.push(e)});CKEDITOR.ui.dialog.button.call(this,b,h,c)}},html:function(){var a=/^\s*<[\w:]+\s+([^>]*)?>/,d=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,c=/\/$/;return function(e,h,f){if(!(3>arguments.length)){var k=[],n=h.html;"\x3c"!=n.charAt(0)&&(n="\x3cspan\x3e"+n+"\x3c/span\x3e");var l=h.focus;if(l){var m=this.focus;this.focus=function(){("function"==
-typeof l?l:m).call(this);this.fire("focus")};h.isFocusable&&(this.isFocusable=this.isFocusable);this.keyboardFocusable=!0}CKEDITOR.ui.dialog.uiElement.call(this,e,h,k,"span",null,null,"");k=k.join("").match(a);n=n.match(d)||["","",""];c.test(n[1])&&(n[1]=n[1].slice(0,-1),n[2]="/"+n[2]);f.push([n[1]," ",k[1]||"",n[2]].join(""))}}}(),fieldset:function(a,d,c,e,h){var f=h.label;this._={children:d};CKEDITOR.ui.dialog.uiElement.call(this,a,h,e,"fieldset",null,null,function(){var a=[];f&&a.push("\x3clegend"+
-(h.labelStyle?' style\x3d"'+h.labelStyle+'"':"")+"\x3e"+f+"\x3c/legend\x3e");for(var b=0;b<c.length;b++)a.push(c[b]);return a.join("")})}},!0);CKEDITOR.ui.dialog.html.prototype=new CKEDITOR.ui.dialog.uiElement;CKEDITOR.ui.dialog.labeledElement.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setLabel:function(a){var d=CKEDITOR.document.getById(this._.labelId);1>d.getChildCount()?(new CKEDITOR.dom.text(a,CKEDITOR.document)).appendTo(d):d.getChild(0).$.nodeValue=a;return this},getLabel:function(){var a=
+checkElementMatch:function(a,b){var d=this._.definition;if(!a||!d.ignoreReadonly&&a.isReadOnly())return!1;var c=a.getName();if("string"==typeof this.element?c==this.element:c in this.element){if(!b&&!a.hasAttributes())return!0;if(c=d._AC)d=c;else{var c={},g=0,e=d.attributes;if(e)for(var f in e)g++,c[f]=e[f];if(f=CKEDITOR.style.getStyleText(d))c.style||g++,c.style=f;c._length=g;d=d._AC=c}if(d._length){for(var h in d)if("_length"!=h)if(c=a.getAttribute(h)||"","style"==h?F(d[h],c):d[h]==c){if(!b)return!0}else if(b)return!1;
+if(b)return!0}else return!0}return!1},checkElementRemovable:function(a,b,d){if(this.checkElementMatch(a,b,d))return!0;if(b=t(this)[a.getName()]){var c;if(!(b=b.attributes))return!0;for(d=0;d<b.length;d++)if(c=b[d][0],c=a.getAttribute(c)){var g=b[d][1];if(null===g)return!0;if("string"==typeof g){if(c==g)return!0}else if(g.test(c))return!0}}return!1},buildPreview:function(a){var b=this._.definition,d=[],c=b.element;"bdo"==c&&(c="span");var d=["\x3c",c],g=b.attributes;if(g)for(var e in g)d.push(" ",
+e,'\x3d"',g[e],'"');(g=CKEDITOR.style.getStyleText(b))&&d.push(' style\x3d"',g,'"');d.push("\x3e",a||b.name,"\x3c/",c,"\x3e");return d.join("")},getDefinition:function(){return this._.definition}};CKEDITOR.style.getStyleText=function(a){var b=a._ST;if(b)return b;var b=a.styles,d=a.attributes&&a.attributes.style||"",c="";d.length&&(d=d.replace(E,";"));for(var g in b){var e=b[g],f=(g+":"+e).replace(E,";");"inherit"==e?c+=f:d+=f}d.length&&(d=CKEDITOR.tools.normalizeCssText(d,!0));return a._ST=d+c};CKEDITOR.style.customHandlers=
+{};CKEDITOR.style.addCustomHandler=function(a){var b=function(a){this._={definition:a};this.setup&&this.setup(a)};b.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.style.prototype),{assignedTo:CKEDITOR.STYLE_OBJECT},a,!0);return this.customHandlers[a.type]=b};var M=CKEDITOR.POSITION_PRECEDING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED,P=CKEDITOR.POSITION_FOLLOWING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED}(),CKEDITOR.styleCommand=function(a,
+e){this.requiredContent=this.allowedContent=this.style=a;CKEDITOR.tools.extend(this,e,!0)},CKEDITOR.styleCommand.prototype.exec=function(a){a.focus();this.state==CKEDITOR.TRISTATE_OFF?a.applyStyle(this.style):this.state==CKEDITOR.TRISTATE_ON&&a.removeStyle(this.style)},CKEDITOR.stylesSet=new CKEDITOR.resourceManager("","stylesSet"),CKEDITOR.addStylesSet=CKEDITOR.tools.bind(CKEDITOR.stylesSet.add,CKEDITOR.stylesSet),CKEDITOR.loadStylesSet=function(a,e,c){CKEDITOR.stylesSet.addExternal(a,e,"");CKEDITOR.stylesSet.load(a,
+c)},CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{attachStyleStateChange:function(a,e){var c=this._.styleStateChangeCallbacks;c||(c=this._.styleStateChangeCallbacks=[],this.on("selectionChange",function(a){for(var e=0;e<c.length;e++){var m=c[e],l=m.style.checkActive(a.data.path,this)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF;m.fn.call(this,l)}}));c.push({style:a,fn:e})},applyStyle:function(a){a.apply(this)},removeStyle:function(a){a.remove(this)},getStylesSet:function(a){if(this._.stylesDefinitions)a(this._.stylesDefinitions);
+else{var e=this,c=e.config.stylesCombo_stylesSet||e.config.stylesSet;if(!1===c)a(null);else if(c instanceof Array)e._.stylesDefinitions=c,a(c);else{c||(c="default");var c=c.split(":"),f=c[0];CKEDITOR.stylesSet.addExternal(f,c[1]?c.slice(1).join(":"):CKEDITOR.getUrl("styles.js"),"");CKEDITOR.stylesSet.load(f,function(c){e._.stylesDefinitions=c[f];a(e._.stylesDefinitions)})}}}}),CKEDITOR.dom.comment=function(a,e){"string"==typeof a&&(a=(e?e.$:document).createComment(a));CKEDITOR.dom.domObject.call(this,
+a)},CKEDITOR.dom.comment.prototype=new CKEDITOR.dom.node,CKEDITOR.tools.extend(CKEDITOR.dom.comment.prototype,{type:CKEDITOR.NODE_COMMENT,getOuterHtml:function(){return"\x3c!--"+this.$.nodeValue+"--\x3e"}}),"use strict",function(){var a={},e={},c;for(c in CKEDITOR.dtd.$blockLimit)c in CKEDITOR.dtd.$list||(a[c]=1);for(c in CKEDITOR.dtd.$block)c in CKEDITOR.dtd.$blockLimit||c in CKEDITOR.dtd.$empty||(e[c]=1);CKEDITOR.dom.elementPath=function(c,h){var m=null,l=null,k=[],d=c,b;h=h||c.getDocument().getBody();
+do if(d.type==CKEDITOR.NODE_ELEMENT){k.push(d);if(!this.lastElement&&(this.lastElement=d,d.is(CKEDITOR.dtd.$object)||"false"==d.getAttribute("contenteditable")))continue;if(d.equals(h))break;if(!l&&(b=d.getName(),"true"==d.getAttribute("contenteditable")?l=d:!m&&e[b]&&(m=d),a[b])){if(b=!m&&"div"==b){a:{b=d.getChildren();for(var g=0,p=b.count();g<p;g++){var v=b.getItem(g);if(v.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$block[v.getName()]){b=!0;break a}}b=!1}b=!b}b?m=d:l=d}}while(d=d.getParent());l||
+(l=h);this.block=m;this.blockLimit=l;this.root=h;this.elements=k}}(),CKEDITOR.dom.elementPath.prototype={compare:function(a){var e=this.elements;a=a&&a.elements;if(!a||e.length!=a.length)return!1;for(var c=0;c<e.length;c++)if(!e[c].equals(a[c]))return!1;return!0},contains:function(a,e,c){var f;"string"==typeof a&&(f=function(c){return c.getName()==a});a instanceof CKEDITOR.dom.element?f=function(c){return c.equals(a)}:CKEDITOR.tools.isArray(a)?f=function(c){return-1<CKEDITOR.tools.indexOf(a,c.getName())}:
+"function"==typeof a?f=a:"object"==typeof a&&(f=function(c){return c.getName()in a});var h=this.elements,m=h.length;e&&m--;c&&(h=Array.prototype.slice.call(h,0),h.reverse());for(e=0;e<m;e++)if(f(h[e]))return h[e];return null},isContextFor:function(a){var e;return a in CKEDITOR.dtd.$block?(e=this.contains(CKEDITOR.dtd.$intermediate)||this.root.equals(this.block)&&this.block||this.blockLimit,!!e.getDtd()[a]):!0},direction:function(){return(this.block||this.blockLimit||this.root).getDirection(1)}},CKEDITOR.dom.text=
+function(a,e){"string"==typeof a&&(a=(e?e.$:document).createTextNode(a));this.$=a},CKEDITOR.dom.text.prototype=new CKEDITOR.dom.node,CKEDITOR.tools.extend(CKEDITOR.dom.text.prototype,{type:CKEDITOR.NODE_TEXT,getLength:function(){return this.$.nodeValue.length},getText:function(){return this.$.nodeValue},setText:function(a){this.$.nodeValue=a},split:function(a){var e=this.$.parentNode,c=e.childNodes.length,f=this.getLength(),h=this.getDocument(),m=new CKEDITOR.dom.text(this.$.splitText(a),h);e.childNodes.length==
+c&&(a>=f?(m=h.createText(""),m.insertAfter(this)):(a=h.createText(""),a.insertAfter(m),a.remove()));return m},substring:function(a,e){return"number"!=typeof e?this.$.nodeValue.substr(a):this.$.nodeValue.substring(a,e)}}),function(){function a(a,e,h){var m=a.serializable,l=e[h?"endContainer":"startContainer"],k=h?"endOffset":"startOffset",d=m?e.document.getById(a.startNode):a.startNode;a=m?e.document.getById(a.endNode):a.endNode;l.equals(d.getPrevious())?(e.startOffset=e.startOffset-l.getLength()-
+a.getPrevious().getLength(),l=a.getNext()):l.equals(a.getPrevious())&&(e.startOffset-=l.getLength(),l=a.getNext());l.equals(d.getParent())&&e[k]++;l.equals(a.getParent())&&e[k]++;e[h?"endContainer":"startContainer"]=l;return e}CKEDITOR.dom.rangeList=function(a){if(a instanceof CKEDITOR.dom.rangeList)return a;a?a instanceof CKEDITOR.dom.range&&(a=[a]):a=[];return CKEDITOR.tools.extend(a,e)};var e={createIterator:function(){var a=this,e=CKEDITOR.dom.walker.bookmark(),h=[],m;return{getNextRange:function(l){m=
+void 0===m?0:m+1;var k=a[m];if(k&&1<a.length){if(!m)for(var d=a.length-1;0<=d;d--)h.unshift(a[d].createBookmark(!0));if(l)for(var b=0;a[m+b+1];){var g=k.document;l=0;d=g.getById(h[b].endNode);for(g=g.getById(h[b+1].startNode);;){d=d.getNextSourceNode(!1);if(g.equals(d))l=1;else if(e(d)||d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary())continue;break}if(!l)break;b++}for(k.moveToBookmark(h.shift());b--;)d=a[++m],d.moveToBookmark(h.shift()),k.setEnd(d.endContainer,d.endOffset)}return k}}},createBookmarks:function(c){for(var e=
+[],h,m=0;m<this.length;m++){e.push(h=this[m].createBookmark(c,!0));for(var l=m+1;l<this.length;l++)this[l]=a(h,this[l]),this[l]=a(h,this[l],!0)}return e},createBookmarks2:function(a){for(var e=[],h=0;h<this.length;h++)e.push(this[h].createBookmark2(a));return e},moveToBookmarks:function(a){for(var e=0;e<this.length;e++)this[e].moveToBookmark(a[e])}}}(),function(){function a(){return CKEDITOR.getUrl(CKEDITOR.skinName.split(",")[1]||"skins/"+CKEDITOR.skinName.split(",")[0]+"/")}function e(b){var d=
+CKEDITOR.skin["ua_"+b],c=CKEDITOR.env;if(d)for(var d=d.split(",").sort(function(a,b){return a>b?-1:1}),e=0,f;e<d.length;e++)if(f=d[e],c.ie&&(f.replace(/^ie/,"")==c.version||c.quirks&&"iequirks"==f)&&(f="ie"),c[f]){b+="_"+d[e];break}return CKEDITOR.getUrl(a()+b+".css")}function c(a,d){m[a]||(CKEDITOR.document.appendStyleSheet(e(a)),m[a]=1);d&&d()}function f(a){var d=a.getById(l);d||(d=a.getHead().append("style"),d.setAttribute("id",l),d.setAttribute("type","text/css"));return d}function h(a,d,c){var e,
+f,h;if(CKEDITOR.env.webkit)for(d=d.split("}").slice(0,-1),f=0;f<d.length;f++)d[f]=d[f].split("{");for(var k=0;k<a.length;k++)if(CKEDITOR.env.webkit)for(f=0;f<d.length;f++){h=d[f][1];for(e=0;e<c.length;e++)h=h.replace(c[e][0],c[e][1]);a[k].$.sheet.addRule(d[f][0],h)}else{h=d;for(e=0;e<c.length;e++)h=h.replace(c[e][0],c[e][1]);CKEDITOR.env.ie&&11>CKEDITOR.env.version?a[k].$.styleSheet.cssText+=h:a[k].$.innerHTML+=h}}var m={};CKEDITOR.skin={path:a,loadPart:function(b,d){CKEDITOR.skin.name!=CKEDITOR.skinName.split(",")[0]?
+CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(a()+"skin.js"),function(){c(b,d)}):c(b,d)},getPath:function(a){return CKEDITOR.getUrl(e(a))},icons:{},addIcon:function(a,d,c,e){a=a.toLowerCase();this.icons[a]||(this.icons[a]={path:d,offset:c||0,bgsize:e||"16px"})},getIconStyle:function(a,d,c,e,f){var h;a&&(a=a.toLowerCase(),d&&(h=this.icons[a+"-rtl"]),h||(h=this.icons[a]));a=c||h&&h.path||"";e=e||h&&h.offset;f=f||h&&h.bgsize||"16px";a&&(a=a.replace(/'/g,"\\'"));return a&&"background-image:url('"+CKEDITOR.getUrl(a)+
+"');background-position:0 "+e+"px;background-size:"+f+";"}};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{getUiColor:function(){return this.uiColor},setUiColor:function(a){var c=f(CKEDITOR.document);return(this.setUiColor=function(a){this.uiColor=a;var b=CKEDITOR.skin.chameleon,e="",f="";"function"==typeof b&&(e=b(this,"editor"),f=b(this,"panel"));a=[[d,a]];h([c],e,a);h(k,f,a)}).call(this,a)}});var l="cke_ui_color",k=[],d=/\$color/g;CKEDITOR.on("instanceLoaded",function(a){if(!CKEDITOR.env.ie||
+!CKEDITOR.env.quirks){var c=a.editor;a=function(a){a=(a.data[0]||a.data).element.getElementsByTag("iframe").getItem(0).getFrameDocument();if(!a.getById("cke_ui_color")){a=f(a);k.push(a);var b=c.getUiColor();b&&h([a],CKEDITOR.skin.chameleon(c,"panel"),[[d,b]])}};c.on("panelShow",a);c.on("menuShow",a);c.config.uiColor&&c.setUiColor(c.config.uiColor)}})}(),function(){if(CKEDITOR.env.webkit)CKEDITOR.env.hc=!1;else{var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"width:0;height:0;position:absolute;left:-10000px;border:1px solid;border-color:red blue"\x3e\x3c/div\x3e',
+CKEDITOR.document);a.appendTo(CKEDITOR.document.getHead());try{var e=a.getComputedStyle("border-top-color"),c=a.getComputedStyle("border-right-color");CKEDITOR.env.hc=!(!e||e!=c)}catch(f){CKEDITOR.env.hc=!1}a.remove()}CKEDITOR.env.hc&&(CKEDITOR.env.cssClass+=" cke_hc");CKEDITOR.document.appendStyleText(".cke{visibility:hidden;}");CKEDITOR.status="loaded";CKEDITOR.fireOnce("loaded");if(a=CKEDITOR._.pending)for(delete CKEDITOR._.pending,e=0;e<a.length;e++)CKEDITOR.editor.prototype.constructor.apply(a[e][0],
+a[e][1]),CKEDITOR.add(a[e][0])}(),CKEDITOR.skin.name="moono-lisa",CKEDITOR.skin.ua_editor="ie,iequirks,ie8,gecko",CKEDITOR.skin.ua_dialog="ie,iequirks,ie8",CKEDITOR.skin.chameleon=function(){var a=function(){return function(a,e){for(var h=a.match(/[^#]./g),m=0;3>m;m++){var l=m,k;k=parseInt(h[m],16);k=("0"+(0>e?0|k*(1+e):0|k+(255-k)*e).toString(16)).slice(-2);h[l]=k}return"#"+h.join("")}}(),e={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_bottom [background-color:{defaultBackground};border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [background-color:{defaultBackground};outline-color:{defaultBorder};] {id} .cke_dialog_tab [background-color:{dialogTab};border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [background-color:{lightBackground};] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} a.cke_button_off:hover,{id} a.cke_button_off:focus,{id} a.cke_button_off:active [background-color:{darkBackground};border-color:{toolbarElementsBorder};] {id} .cke_button_on [background-color:{ckeButtonOn};border-color:{toolbarElementsBorder};] {id} .cke_toolbar_separator,{id} .cke_toolgroup a.cke_button:last-child:after,{id} .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after [background-color: {toolbarElementsBorder};border-color: {toolbarElementsBorder};] {id} a.cke_combo_button:hover,{id} a.cke_combo_button:focus,{id} .cke_combo_on a.cke_combo_button [border-color:{toolbarElementsBorder};background-color:{darkBackground};] {id} .cke_combo:after [border-color:{toolbarElementsBorder};] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover,{id} a.cke_path_item:focus,{id} a.cke_path_item:active [background-color:{darkBackground};] {id}.cke_panel [border-color:{defaultBorder};] "),
+panel:new CKEDITOR.template(".cke_panel_grouptitle [background-color:{lightBackground};border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active [background-color:{menubuttonHover};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
+return function(c,f){var h=a(c.uiColor,.4),h={id:"."+c.id,defaultBorder:a(h,-.2),toolbarElementsBorder:a(h,-.25),defaultBackground:h,lightBackground:a(h,.8),darkBackground:a(h,-.15),ckeButtonOn:a(h,.4),ckeResizer:a(h,-.4),ckeColorauto:a(h,.8),dialogBody:a(h,.7),dialogTab:a(h,.65),dialogTabSelected:"#FFF",dialogTabSelectedBorder:"#FFF",elementsPathColor:a(h,-.6),menubuttonHover:a(h,.1),menubuttonIcon:a(h,.5),menubuttonIconHover:a(h,.3)};return e[f].output(h).replace(/\[/g,"{").replace(/\]/g,"}")}}(),
+CKEDITOR.plugins.add("dialogui",{onLoad:function(){var a=function(a){this._||(this._={});this._["default"]=this._.initValue=a["default"]||"";this._.required=a.required||!1;for(var b=[this._],c=1;c<arguments.length;c++)b.push(arguments[c]);b.push(!0);CKEDITOR.tools.extend.apply(CKEDITOR.tools,b);return this._},e={build:function(a,b,c){return new CKEDITOR.ui.dialog.textInput(a,b,c)}},c={build:function(a,b,c){return new CKEDITOR.ui.dialog[b.type](a,b,c)}},f={isChanged:function(){return this.getValue()!=
+this.getInitValue()},reset:function(a){this.setValue(this.getInitValue(),a)},setInitValue:function(){this._.initValue=this.getValue()},resetInitValue:function(){this._.initValue=this._["default"]},getInitValue:function(){return this._.initValue}},h=CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onChange:function(a,b){this._.domOnChangeRegistered||(a.on("load",function(){this.getInputElement().on("change",function(){a.parts.dialog.isVisible()&&this.fire("change",{value:this.getValue()})},
+this)},this),this._.domOnChangeRegistered=!0);this.on("change",b)}},!0),m=/^on([A-Z]\w+)/,l=function(a){for(var b in a)(m.test(b)||"title"==b||"type"==b)&&delete a[b];return a},k=function(a){a=a.data.getKeystroke();a==CKEDITOR.SHIFT+CKEDITOR.ALT+36?this.setDirectionMarker("ltr"):a==CKEDITOR.SHIFT+CKEDITOR.ALT+35&&this.setDirectionMarker("rtl")};CKEDITOR.tools.extend(CKEDITOR.ui.dialog,{labeledElement:function(d,b,c,e){if(!(4>arguments.length)){var f=a.call(this,b);f.labelId=CKEDITOR.tools.getNextId()+
+"_label";this._.children=[];var h={role:b.role||"presentation"};b.includeLabel&&(h["aria-labelledby"]=f.labelId);CKEDITOR.ui.dialog.uiElement.call(this,d,b,c,"div",null,h,function(){var a=[],c=b.required?" cke_required":"";"horizontal"!=b.labelLayout?a.push('\x3clabel class\x3d"cke_dialog_ui_labeled_label'+c+'" ',' id\x3d"'+f.labelId+'"',f.inputId?' for\x3d"'+f.inputId+'"':"",(b.labelStyle?' style\x3d"'+b.labelStyle+'"':"")+"\x3e",b.label,"\x3c/label\x3e",'\x3cdiv class\x3d"cke_dialog_ui_labeled_content"',
+b.controlStyle?' style\x3d"'+b.controlStyle+'"':"",' role\x3d"presentation"\x3e',e.call(this,d,b),"\x3c/div\x3e"):(c={type:"hbox",widths:b.widths,padding:0,children:[{type:"html",html:'\x3clabel class\x3d"cke_dialog_ui_labeled_label'+c+'" id\x3d"'+f.labelId+'" for\x3d"'+f.inputId+'"'+(b.labelStyle?' style\x3d"'+b.labelStyle+'"':"")+"\x3e"+CKEDITOR.tools.htmlEncode(b.label)+"\x3c/label\x3e"},{type:"html",html:'\x3cspan class\x3d"cke_dialog_ui_labeled_content"'+(b.controlStyle?' style\x3d"'+b.controlStyle+
+'"':"")+"\x3e"+e.call(this,d,b)+"\x3c/span\x3e"}]},CKEDITOR.dialog._.uiElementBuilders.hbox.build(d,c,a));return a.join("")})}},textInput:function(d,b,c){if(!(3>arguments.length)){a.call(this,b);var e=this._.inputId=CKEDITOR.tools.getNextId()+"_textInput",f={"class":"cke_dialog_ui_input_"+b.type,id:e,type:b.type};b.validate&&(this.validate=b.validate);b.maxLength&&(f.maxlength=b.maxLength);b.size&&(f.size=b.size);b.inputStyle&&(f.style=b.inputStyle);var h=this,l=!1;d.on("load",function(){h.getInputElement().on("keydown",
+function(a){13==a.data.getKeystroke()&&(l=!0)});h.getInputElement().on("keyup",function(a){13==a.data.getKeystroke()&&l&&(d.getButton("ok")&&setTimeout(function(){d.getButton("ok").click()},0),l=!1);h.bidi&&k.call(h,a)},null,null,1E3)});CKEDITOR.ui.dialog.labeledElement.call(this,d,b,c,function(){var a=['\x3cdiv class\x3d"cke_dialog_ui_input_',b.type,'" role\x3d"presentation"'];b.width&&a.push('style\x3d"width:'+b.width+'" ');a.push("\x3e\x3cinput ");f["aria-labelledby"]=this._.labelId;this._.required&&
+(f["aria-required"]=this._.required);for(var d in f)a.push(d+'\x3d"'+f[d]+'" ');a.push(" /\x3e\x3c/div\x3e");return a.join("")})}},textarea:function(d,b,c){if(!(3>arguments.length)){a.call(this,b);var e=this,f=this._.inputId=CKEDITOR.tools.getNextId()+"_textarea",h={};b.validate&&(this.validate=b.validate);h.rows=b.rows||5;h.cols=b.cols||20;h["class"]="cke_dialog_ui_input_textarea "+(b["class"]||"");"undefined"!=typeof b.inputStyle&&(h.style=b.inputStyle);b.dir&&(h.dir=b.dir);if(e.bidi)d.on("load",
+function(){e.getInputElement().on("keyup",k)},e);CKEDITOR.ui.dialog.labeledElement.call(this,d,b,c,function(){h["aria-labelledby"]=this._.labelId;this._.required&&(h["aria-required"]=this._.required);var a=['\x3cdiv class\x3d"cke_dialog_ui_input_textarea" role\x3d"presentation"\x3e\x3ctextarea id\x3d"',f,'" '],b;for(b in h)a.push(b+'\x3d"'+CKEDITOR.tools.htmlEncode(h[b])+'" ');a.push("\x3e",CKEDITOR.tools.htmlEncode(e._["default"]),"\x3c/textarea\x3e\x3c/div\x3e");return a.join("")})}},checkbox:function(d,
+b,c){if(!(3>arguments.length)){var e=a.call(this,b,{"default":!!b["default"]});b.validate&&(this.validate=b.validate);CKEDITOR.ui.dialog.uiElement.call(this,d,b,c,"span",null,null,function(){var a=CKEDITOR.tools.extend({},b,{id:b.id?b.id+"_checkbox":CKEDITOR.tools.getNextId()+"_checkbox"},!0),c=[],g=CKEDITOR.tools.getNextId()+"_label",f={"class":"cke_dialog_ui_checkbox_input",type:"checkbox","aria-labelledby":g};l(a);b["default"]&&(f.checked="checked");"undefined"!=typeof a.inputStyle&&(a.style=a.inputStyle);
+e.checkbox=new CKEDITOR.ui.dialog.uiElement(d,a,c,"input",null,f);c.push(' \x3clabel id\x3d"',g,'" for\x3d"',f.id,'"'+(b.labelStyle?' style\x3d"'+b.labelStyle+'"':"")+"\x3e",CKEDITOR.tools.htmlEncode(b.label),"\x3c/label\x3e");return c.join("")})}},radio:function(d,b,c){if(!(3>arguments.length)){a.call(this,b);this._["default"]||(this._["default"]=this._.initValue=b.items[0][1]);b.validate&&(this.validate=b.validate);var e=[],f=this;b.role="radiogroup";b.includeLabel=!0;CKEDITOR.ui.dialog.labeledElement.call(this,
+d,b,c,function(){for(var a=[],c=[],g=(b.id?b.id:CKEDITOR.tools.getNextId())+"_radio",h=0;h<b.items.length;h++){var k=b.items[h],m=void 0!==k[2]?k[2]:k[0],y=void 0!==k[1]?k[1]:k[0],t=CKEDITOR.tools.getNextId()+"_radio_input",x=t+"_label",t=CKEDITOR.tools.extend({},b,{id:t,title:null,type:null},!0),m=CKEDITOR.tools.extend({},t,{title:m},!0),F={type:"radio","class":"cke_dialog_ui_radio_input",name:g,value:y,"aria-labelledby":x},z=[];f._["default"]==y&&(F.checked="checked");l(t);l(m);"undefined"!=typeof t.inputStyle&&
+(t.style=t.inputStyle);t.keyboardFocusable=!0;e.push(new CKEDITOR.ui.dialog.uiElement(d,t,z,"input",null,F));z.push(" ");new CKEDITOR.ui.dialog.uiElement(d,m,z,"label",null,{id:x,"for":F.id},k[0]);a.push(z.join(""))}new CKEDITOR.ui.dialog.hbox(d,e,a,c);return c.join("")});this._.children=e}},button:function(d,b,c){if(arguments.length){"function"==typeof b&&(b=b(d.getParentEditor()));a.call(this,b,{disabled:b.disabled||!1});CKEDITOR.event.implementOn(this);var e=this;d.on("load",function(){var a=this.getElement();
+(function(){a.on("click",function(a){e.click();a.data.preventDefault()});a.on("keydown",function(a){a.data.getKeystroke()in{32:1}&&(e.click(),a.data.preventDefault())})})();a.unselectable()},this);var f=CKEDITOR.tools.extend({},b);delete f.style;var h=CKEDITOR.tools.getNextId()+"_label";CKEDITOR.ui.dialog.uiElement.call(this,d,f,c,"a",null,{style:b.style,href:"javascript:void(0)",title:b.label,hidefocus:"true","class":b["class"],role:"button","aria-labelledby":h},'\x3cspan id\x3d"'+h+'" class\x3d"cke_dialog_ui_button"\x3e'+
+CKEDITOR.tools.htmlEncode(b.label)+"\x3c/span\x3e")}},select:function(d,b,c){if(!(3>arguments.length)){var e=a.call(this,b);b.validate&&(this.validate=b.validate);e.inputId=CKEDITOR.tools.getNextId()+"_select";CKEDITOR.ui.dialog.labeledElement.call(this,d,b,c,function(){var a=CKEDITOR.tools.extend({},b,{id:b.id?b.id+"_select":CKEDITOR.tools.getNextId()+"_select"},!0),c=[],g=[],f={id:e.inputId,"class":"cke_dialog_ui_input_select","aria-labelledby":this._.labelId};c.push('\x3cdiv class\x3d"cke_dialog_ui_input_',
+b.type,'" role\x3d"presentation"');b.width&&c.push('style\x3d"width:'+b.width+'" ');c.push("\x3e");void 0!==b.size&&(f.size=b.size);void 0!==b.multiple&&(f.multiple=b.multiple);l(a);for(var h=0,k;h<b.items.length&&(k=b.items[h]);h++)g.push('\x3coption value\x3d"',CKEDITOR.tools.htmlEncode(void 0!==k[1]?k[1]:k[0]).replace(/"/g,"\x26quot;"),'" /\x3e ',CKEDITOR.tools.htmlEncode(k[0]));"undefined"!=typeof a.inputStyle&&(a.style=a.inputStyle);e.select=new CKEDITOR.ui.dialog.uiElement(d,a,c,"select",null,
+f,g.join(""));c.push("\x3c/div\x3e");return c.join("")})}},file:function(d,b,c){if(!(3>arguments.length)){void 0===b["default"]&&(b["default"]="");var e=CKEDITOR.tools.extend(a.call(this,b),{definition:b,buttons:[]});b.validate&&(this.validate=b.validate);d.on("load",function(){CKEDITOR.document.getById(e.frameId).getParent().addClass("cke_dialog_ui_input_file")});CKEDITOR.ui.dialog.labeledElement.call(this,d,b,c,function(){e.frameId=CKEDITOR.tools.getNextId()+"_fileInput";var a=['\x3ciframe frameborder\x3d"0" allowtransparency\x3d"0" class\x3d"cke_dialog_ui_input_file" role\x3d"presentation" id\x3d"',
+e.frameId,'" title\x3d"',b.label,'" src\x3d"javascript:void('];a.push(CKEDITOR.env.ie?"(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"})()":"0");a.push(')"\x3e\x3c/iframe\x3e');return a.join("")})}},fileButton:function(d,b,c){var e=this;if(!(3>arguments.length)){a.call(this,b);b.validate&&(this.validate=b.validate);var f=CKEDITOR.tools.extend({},b),h=f.onClick;f.className=(f.className?f.className+" ":"")+"cke_dialog_ui_button";f.onClick=function(a){var c=
+b["for"];h&&!1===h.call(this,a)||(d.getContentElement(c[0],c[1]).submit(),this.disable())};d.on("load",function(){d.getContentElement(b["for"][0],b["for"][1])._.buttons.push(e)});CKEDITOR.ui.dialog.button.call(this,d,f,c)}},html:function(){var a=/^\s*<[\w:]+\s+([^>]*)?>/,b=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,c=/\/$/;return function(e,f,h){if(!(3>arguments.length)){var k=[],n=f.html;"\x3c"!=n.charAt(0)&&(n="\x3cspan\x3e"+n+"\x3c/span\x3e");var l=f.focus;if(l){var m=this.focus;this.focus=function(){("function"==
+typeof l?l:m).call(this);this.fire("focus")};f.isFocusable&&(this.isFocusable=this.isFocusable);this.keyboardFocusable=!0}CKEDITOR.ui.dialog.uiElement.call(this,e,f,k,"span",null,null,"");k=k.join("").match(a);n=n.match(b)||["","",""];c.test(n[1])&&(n[1]=n[1].slice(0,-1),n[2]="/"+n[2]);h.push([n[1]," ",k[1]||"",n[2]].join(""))}}}(),fieldset:function(a,b,c,e,f){var h=f.label;this._={children:b};CKEDITOR.ui.dialog.uiElement.call(this,a,f,e,"fieldset",null,null,function(){var a=[];h&&a.push("\x3clegend"+
+(f.labelStyle?' style\x3d"'+f.labelStyle+'"':"")+"\x3e"+h+"\x3c/legend\x3e");for(var b=0;b<c.length;b++)a.push(c[b]);return a.join("")})}},!0);CKEDITOR.ui.dialog.html.prototype=new CKEDITOR.ui.dialog.uiElement;CKEDITOR.ui.dialog.labeledElement.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setLabel:function(a){var b=CKEDITOR.document.getById(this._.labelId);1>b.getChildCount()?(new CKEDITOR.dom.text(a,CKEDITOR.document)).appendTo(b):b.getChild(0).$.nodeValue=a;return this},getLabel:function(){var a=
 CKEDITOR.document.getById(this._.labelId);return!a||1>a.getChildCount()?"":a.getChild(0).getText()},eventProcessors:h},!0);CKEDITOR.ui.dialog.button.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{click:function(){return this._.disabled?!1:this.fire("click",{dialog:this._.dialog})},enable:function(){this._.disabled=!1;var a=this.getElement();a&&a.removeClass("cke_disabled")},disable:function(){this._.disabled=!0;this.getElement().addClass("cke_disabled")},isVisible:function(){return this.getElement().getFirst().isVisible()},
-isEnabled:function(){return!this._.disabled},eventProcessors:CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onClick:function(a,d){this.on("click",function(){d.apply(this,arguments)})}},!0),accessKeyUp:function(){this.click()},accessKeyDown:function(){this.focus()},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.textInput.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return CKEDITOR.document.getById(this._.inputId)},
-focus:function(){var a=this.selectParentTab();setTimeout(function(){var d=a.getInputElement();d&&d.$.focus()},0)},select:function(){var a=this.selectParentTab();setTimeout(function(){var d=a.getInputElement();d&&(d.$.focus(),d.$.select())},0)},accessKeyUp:function(){this.select()},setValue:function(a){if(this.bidi){var d=a&&a.charAt(0);(d="‪"==d?"ltr":"‫"==d?"rtl":null)&&(a=a.slice(1));this.setDirectionMarker(d)}a||(a="");return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply(this,arguments)},
-getValue:function(){var a=CKEDITOR.ui.dialog.uiElement.prototype.getValue.call(this);if(this.bidi&&a){var d=this.getDirectionMarker();d&&(a=("ltr"==d?"‪":"‫")+a)}return a},setDirectionMarker:function(a){var d=this.getInputElement();a?d.setAttributes({dir:a,"data-cke-dir-marker":a}):this.getDirectionMarker()&&d.removeAttributes(["dir","data-cke-dir-marker"])},getDirectionMarker:function(){return this.getInputElement().data("cke-dir-marker")},keyboardFocusable:!0},e,!0);CKEDITOR.ui.dialog.textarea.prototype=
-new CKEDITOR.ui.dialog.textInput;CKEDITOR.ui.dialog.select.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return this._.select.getElement()},add:function(a,d,c){var e=new CKEDITOR.dom.element("option",this.getDialog().getParentEditor().document),h=this.getInputElement().$;e.$.text=a;e.$.value=void 0===d||null===d?a:d;void 0===c||null===c?CKEDITOR.env.ie?h.add(e.$):h.add(e.$,null):h.add(e.$,c);return this},remove:function(a){this.getInputElement().$.remove(a);
-return this},clear:function(){for(var a=this.getInputElement().$;0<a.length;)a.remove(0);return this},keyboardFocusable:!0},e,!0);CKEDITOR.ui.dialog.checkbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getInputElement:function(){return this._.checkbox.getElement()},setValue:function(a,d){this.getInputElement().$.checked=a;!d&&this.fire("change",{value:a})},getValue:function(){return this.getInputElement().$.checked},accessKeyUp:function(){this.setValue(!this.getValue())},eventProcessors:{onChange:function(a,
-d){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return h.onChange.apply(this,arguments);a.on("load",function(){var a=this._.checkbox.getElement();a.on("propertychange",function(b){b=b.data.$;"checked"==b.propertyName&&this.fire("change",{value:a.$.checked})},this)},this);this.on("change",d);return null}},keyboardFocusable:!0},e,!0);CKEDITOR.ui.dialog.radio.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setValue:function(a,d){for(var c=this._.children,e,h=0;h<c.length&&(e=c[h]);h++)e.getElement().$.checked=
-e.getValue()==a;!d&&this.fire("change",{value:a})},getValue:function(){for(var a=this._.children,d=0;d<a.length;d++)if(a[d].getElement().$.checked)return a[d].getValue();return null},accessKeyUp:function(){var a=this._.children,d;for(d=0;d<a.length;d++)if(a[d].getElement().$.checked){a[d].getElement().focus();return}a[0].getElement().focus()},eventProcessors:{onChange:function(a,d){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return h.onChange.apply(this,arguments);a.on("load",function(){for(var a=
-this._.children,b=this,d=0;d<a.length;d++)a[d].getElement().on("propertychange",function(a){a=a.data.$;"checked"==a.propertyName&&this.$.checked&&b.fire("change",{value:this.getAttribute("value")})})},this);this.on("change",d);return null}}},e,!0);CKEDITOR.ui.dialog.file.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,e,{getInputElement:function(){var a=CKEDITOR.document.getById(this._.frameId).getFrameDocument();return 0<a.$.forms.length?new CKEDITOR.dom.element(a.$.forms[0].elements[0]):
-this.getElement()},submit:function(){this.getInputElement().getParent().$.submit();return this},getAction:function(){return this.getInputElement().getParent().$.action},registerEvents:function(a){var d=/^on([A-Z]\w+)/,c,e=function(a,b,d,c){a.on("formLoaded",function(){a.getInputElement().on(d,c,a)})},h;for(h in a)if(c=h.match(d))this.eventProcessors[h]?this.eventProcessors[h].call(this,this._.dialog,a[h]):e(this,this._.dialog,c[1].toLowerCase(),a[h]);return this},reset:function(){function a(){c.$.open();
-var b="";e.size&&(b=e.size-(CKEDITOR.env.ie?7:0));var m=d.frameId+"_input";c.$.write(['\x3chtml dir\x3d"'+n+'" lang\x3d"'+l+'"\x3e\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e\x3cbody style\x3d"margin: 0; overflow: hidden; background: transparent;"\x3e','\x3cform enctype\x3d"multipart/form-data" method\x3d"POST" dir\x3d"'+n+'" lang\x3d"'+l+'" action\x3d"',CKEDITOR.tools.htmlEncode(e.action),'"\x3e\x3clabel id\x3d"',d.labelId,'" for\x3d"',m,'" style\x3d"display:none"\x3e',CKEDITOR.tools.htmlEncode(e.label),
-'\x3c/label\x3e\x3cinput style\x3d"width:100%" id\x3d"',m,'" aria-labelledby\x3d"',d.labelId,'" type\x3d"file" name\x3d"',CKEDITOR.tools.htmlEncode(e.id||"cke_upload"),'" size\x3d"',CKEDITOR.tools.htmlEncode(0<b?b:""),'" /\x3e\x3c/form\x3e\x3c/body\x3e\x3c/html\x3e\x3cscript\x3e',CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"","window.parent.CKEDITOR.tools.callFunction("+f+");","window.onbeforeunload \x3d function() {window.parent.CKEDITOR.tools.callFunction("+k+")}","\x3c/script\x3e"].join(""));
-c.$.close();for(b=0;b<h.length;b++)h[b].enable()}var d=this._,c=CKEDITOR.document.getById(d.frameId).getFrameDocument(),e=d.definition,h=d.buttons,f=this.formLoadedNumber,k=this.formUnloadNumber,n=d.dialog._.editor.lang.dir,l=d.dialog._.editor.langCode;f||(f=this.formLoadedNumber=CKEDITOR.tools.addFunction(function(){this.fire("formLoaded")},this),k=this.formUnloadNumber=CKEDITOR.tools.addFunction(function(){this.getInputElement().clearCustomData()},this),this.getDialog()._.editor.on("destroy",function(){CKEDITOR.tools.removeFunction(f);
-CKEDITOR.tools.removeFunction(k)}));CKEDITOR.env.gecko?setTimeout(a,500):a()},getValue:function(){return this.getInputElement().$.value||""},setInitValue:function(){this._.initValue=""},eventProcessors:{onChange:function(a,d){this._.domOnChangeRegistered||(this.on("formLoaded",function(){this.getInputElement().on("change",function(){this.fire("change",{value:this.getValue()})},this)},this),this._.domOnChangeRegistered=!0);this.on("change",d)}},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.fileButton.prototype=
-new CKEDITOR.ui.dialog.button;CKEDITOR.ui.dialog.fieldset.prototype=CKEDITOR.tools.clone(CKEDITOR.ui.dialog.hbox.prototype);CKEDITOR.dialog.addUIElement("text",f);CKEDITOR.dialog.addUIElement("password",f);CKEDITOR.dialog.addUIElement("textarea",c);CKEDITOR.dialog.addUIElement("checkbox",c);CKEDITOR.dialog.addUIElement("radio",c);CKEDITOR.dialog.addUIElement("button",c);CKEDITOR.dialog.addUIElement("select",c);CKEDITOR.dialog.addUIElement("file",c);CKEDITOR.dialog.addUIElement("fileButton",c);CKEDITOR.dialog.addUIElement("html",
-c);CKEDITOR.dialog.addUIElement("fieldset",{build:function(a,d,c){for(var e=d.children,h,f=[],k=[],n=0;n<e.length&&(h=e[n]);n++){var l=[];f.push(l);k.push(CKEDITOR.dialog._.uiElementBuilders[h.type].build(a,h,l))}return new CKEDITOR.ui.dialog[d.type](a,k,f,c,d)}})}}),CKEDITOR.DIALOG_RESIZE_NONE=0,CKEDITOR.DIALOG_RESIZE_WIDTH=1,CKEDITOR.DIALOG_RESIZE_HEIGHT=2,CKEDITOR.DIALOG_RESIZE_BOTH=3,CKEDITOR.DIALOG_STATE_IDLE=1,CKEDITOR.DIALOG_STATE_BUSY=2,function(){function a(){for(var a=this._.tabIdList.length,
-b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId)+a,d=b-1;d>b-a;d--)if(this._.tabs[this._.tabIdList[d%a]][0].$.offsetHeight)return this._.tabIdList[d%a];return null}function f(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId),d=b+1;d<b+a;d++)if(this._.tabs[this._.tabIdList[d%a]][0].$.offsetHeight)return this._.tabIdList[d%a];return null}function c(a,b){for(var d=a.$.getElementsByTagName("input"),c=0,g=d.length;c<g;c++){var e=new CKEDITOR.dom.element(d[c]);
-"text"==e.getAttribute("type").toLowerCase()&&(b?(e.setAttribute("value",e.getCustomData("fake_value")||""),e.removeCustomData("fake_value")):(e.setCustomData("fake_value",e.getAttribute("value")),e.setAttribute("value","")))}}function e(a,b){var d=this.getInputElement();d&&(a?d.removeAttribute("aria-invalid"):d.setAttribute("aria-invalid",!0));a||(this.select?this.select():this.focus());b&&alert(b);this.fire("validated",{valid:a,msg:b})}function h(){var a=this.getInputElement();a&&a.removeAttribute("aria-invalid")}
+isEnabled:function(){return!this._.disabled},eventProcessors:CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onClick:function(a,b){this.on("click",function(){b.apply(this,arguments)})}},!0),accessKeyUp:function(){this.click()},accessKeyDown:function(){this.focus()},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.textInput.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return CKEDITOR.document.getById(this._.inputId)},
+focus:function(){var a=this.selectParentTab();setTimeout(function(){var b=a.getInputElement();b&&b.$.focus()},0)},select:function(){var a=this.selectParentTab();setTimeout(function(){var b=a.getInputElement();b&&(b.$.focus(),b.$.select())},0)},accessKeyUp:function(){this.select()},setValue:function(a){if(this.bidi){var b=a&&a.charAt(0);(b="‪"==b?"ltr":"‫"==b?"rtl":null)&&(a=a.slice(1));this.setDirectionMarker(b)}a||(a="");return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply(this,arguments)},
+getValue:function(){var a=CKEDITOR.ui.dialog.uiElement.prototype.getValue.call(this);if(this.bidi&&a){var b=this.getDirectionMarker();b&&(a=("ltr"==b?"‪":"‫")+a)}return a},setDirectionMarker:function(a){var b=this.getInputElement();a?b.setAttributes({dir:a,"data-cke-dir-marker":a}):this.getDirectionMarker()&&b.removeAttributes(["dir","data-cke-dir-marker"])},getDirectionMarker:function(){return this.getInputElement().data("cke-dir-marker")},keyboardFocusable:!0},f,!0);CKEDITOR.ui.dialog.textarea.prototype=
+new CKEDITOR.ui.dialog.textInput;CKEDITOR.ui.dialog.select.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return this._.select.getElement()},add:function(a,b,c){var e=new CKEDITOR.dom.element("option",this.getDialog().getParentEditor().document),f=this.getInputElement().$;e.$.text=a;e.$.value=void 0===b||null===b?a:b;void 0===c||null===c?CKEDITOR.env.ie?f.add(e.$):f.add(e.$,null):f.add(e.$,c);return this},remove:function(a){this.getInputElement().$.remove(a);
+return this},clear:function(){for(var a=this.getInputElement().$;0<a.length;)a.remove(0);return this},keyboardFocusable:!0},f,!0);CKEDITOR.ui.dialog.checkbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getInputElement:function(){return this._.checkbox.getElement()},setValue:function(a,b){this.getInputElement().$.checked=a;!b&&this.fire("change",{value:a})},getValue:function(){return this.getInputElement().$.checked},accessKeyUp:function(){this.setValue(!this.getValue())},eventProcessors:{onChange:function(a,
+b){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return h.onChange.apply(this,arguments);a.on("load",function(){var a=this._.checkbox.getElement();a.on("propertychange",function(b){b=b.data.$;"checked"==b.propertyName&&this.fire("change",{value:a.$.checked})},this)},this);this.on("change",b);return null}},keyboardFocusable:!0},f,!0);CKEDITOR.ui.dialog.radio.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setValue:function(a,b){for(var c=this._.children,e,f=0;f<c.length&&(e=c[f]);f++)e.getElement().$.checked=
+e.getValue()==a;!b&&this.fire("change",{value:a})},getValue:function(){for(var a=this._.children,b=0;b<a.length;b++)if(a[b].getElement().$.checked)return a[b].getValue();return null},accessKeyUp:function(){var a=this._.children,b;for(b=0;b<a.length;b++)if(a[b].getElement().$.checked){a[b].getElement().focus();return}a[0].getElement().focus()},eventProcessors:{onChange:function(a,b){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return h.onChange.apply(this,arguments);a.on("load",function(){for(var a=
+this._.children,b=this,d=0;d<a.length;d++)a[d].getElement().on("propertychange",function(a){a=a.data.$;"checked"==a.propertyName&&this.$.checked&&b.fire("change",{value:this.getAttribute("value")})})},this);this.on("change",b);return null}}},f,!0);CKEDITOR.ui.dialog.file.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,f,{getInputElement:function(){var a=CKEDITOR.document.getById(this._.frameId).getFrameDocument();return 0<a.$.forms.length?new CKEDITOR.dom.element(a.$.forms[0].elements[0]):
+this.getElement()},submit:function(){this.getInputElement().getParent().$.submit();return this},getAction:function(){return this.getInputElement().getParent().$.action},registerEvents:function(a){var b=/^on([A-Z]\w+)/,c,e=function(a,b,d,c){a.on("formLoaded",function(){a.getInputElement().on(d,c,a)})},f;for(f in a)if(c=f.match(b))this.eventProcessors[f]?this.eventProcessors[f].call(this,this._.dialog,a[f]):e(this,this._.dialog,c[1].toLowerCase(),a[f]);return this},reset:function(){function a(){c.$.open();
+var d="";e.size&&(d=e.size-(CKEDITOR.env.ie?7:0));var m=b.frameId+"_input";c.$.write(['\x3chtml dir\x3d"'+n+'" lang\x3d"'+l+'"\x3e\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e\x3cbody style\x3d"margin: 0; overflow: hidden; background: transparent;"\x3e','\x3cform enctype\x3d"multipart/form-data" method\x3d"POST" dir\x3d"'+n+'" lang\x3d"'+l+'" action\x3d"',CKEDITOR.tools.htmlEncode(e.action),'"\x3e\x3clabel id\x3d"',b.labelId,'" for\x3d"',m,'" style\x3d"display:none"\x3e',CKEDITOR.tools.htmlEncode(e.label),
+'\x3c/label\x3e\x3cinput style\x3d"width:100%" id\x3d"',m,'" aria-labelledby\x3d"',b.labelId,'" type\x3d"file" name\x3d"',CKEDITOR.tools.htmlEncode(e.id||"cke_upload"),'" size\x3d"',CKEDITOR.tools.htmlEncode(0<d?d:""),'" /\x3e\x3c/form\x3e\x3c/body\x3e\x3c/html\x3e\x3cscript\x3e',CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"","window.parent.CKEDITOR.tools.callFunction("+h+");","window.onbeforeunload \x3d function() {window.parent.CKEDITOR.tools.callFunction("+k+")}","\x3c/script\x3e"].join(""));
+c.$.close();for(d=0;d<f.length;d++)f[d].enable()}var b=this._,c=CKEDITOR.document.getById(b.frameId).getFrameDocument(),e=b.definition,f=b.buttons,h=this.formLoadedNumber,k=this.formUnloadNumber,n=b.dialog._.editor.lang.dir,l=b.dialog._.editor.langCode;h||(h=this.formLoadedNumber=CKEDITOR.tools.addFunction(function(){this.fire("formLoaded")},this),k=this.formUnloadNumber=CKEDITOR.tools.addFunction(function(){this.getInputElement().clearCustomData()},this),this.getDialog()._.editor.on("destroy",function(){CKEDITOR.tools.removeFunction(h);
+CKEDITOR.tools.removeFunction(k)}));CKEDITOR.env.gecko?setTimeout(a,500):a()},getValue:function(){return this.getInputElement().$.value||""},setInitValue:function(){this._.initValue=""},eventProcessors:{onChange:function(a,b){this._.domOnChangeRegistered||(this.on("formLoaded",function(){this.getInputElement().on("change",function(){this.fire("change",{value:this.getValue()})},this)},this),this._.domOnChangeRegistered=!0);this.on("change",b)}},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.fileButton.prototype=
+new CKEDITOR.ui.dialog.button;CKEDITOR.ui.dialog.fieldset.prototype=CKEDITOR.tools.clone(CKEDITOR.ui.dialog.hbox.prototype);CKEDITOR.dialog.addUIElement("text",e);CKEDITOR.dialog.addUIElement("password",e);CKEDITOR.dialog.addUIElement("textarea",c);CKEDITOR.dialog.addUIElement("checkbox",c);CKEDITOR.dialog.addUIElement("radio",c);CKEDITOR.dialog.addUIElement("button",c);CKEDITOR.dialog.addUIElement("select",c);CKEDITOR.dialog.addUIElement("file",c);CKEDITOR.dialog.addUIElement("fileButton",c);CKEDITOR.dialog.addUIElement("html",
+c);CKEDITOR.dialog.addUIElement("fieldset",{build:function(a,b,c){for(var e=b.children,f,h=[],k=[],n=0;n<e.length&&(f=e[n]);n++){var l=[];h.push(l);k.push(CKEDITOR.dialog._.uiElementBuilders[f.type].build(a,f,l))}return new CKEDITOR.ui.dialog[b.type](a,k,h,c,b)}})}}),CKEDITOR.DIALOG_RESIZE_NONE=0,CKEDITOR.DIALOG_RESIZE_WIDTH=1,CKEDITOR.DIALOG_RESIZE_HEIGHT=2,CKEDITOR.DIALOG_RESIZE_BOTH=3,CKEDITOR.DIALOG_STATE_IDLE=1,CKEDITOR.DIALOG_STATE_BUSY=2,function(){function a(){for(var a=this._.tabIdList.length,
+b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId)+a,d=b-1;d>b-a;d--)if(this._.tabs[this._.tabIdList[d%a]][0].$.offsetHeight)return this._.tabIdList[d%a];return null}function e(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId),d=b+1;d<b+a;d++)if(this._.tabs[this._.tabIdList[d%a]][0].$.offsetHeight)return this._.tabIdList[d%a];return null}function c(a,b){for(var d=a.$.getElementsByTagName("input"),c=0,g=d.length;c<g;c++){var e=new CKEDITOR.dom.element(d[c]);
+"text"==e.getAttribute("type").toLowerCase()&&(b?(e.setAttribute("value",e.getCustomData("fake_value")||""),e.removeCustomData("fake_value")):(e.setCustomData("fake_value",e.getAttribute("value")),e.setAttribute("value","")))}}function f(a,b){var d=this.getInputElement();d&&(a?d.removeAttribute("aria-invalid"):d.setAttribute("aria-invalid",!0));a||(this.select?this.select():this.focus());b&&alert(b);this.fire("validated",{valid:a,msg:b})}function h(){var a=this.getInputElement();a&&a.removeAttribute("aria-invalid")}
 function m(a){var b=CKEDITOR.dom.element.createFromHtml(CKEDITOR.addTemplate("dialog",n).output({id:CKEDITOR.tools.getNextNumber(),editorId:a.id,langDir:a.lang.dir,langCode:a.langCode,editorDialogClass:"cke_editor_"+a.name.replace(/\./g,"\\.")+"_dialog",closeTitle:a.lang.common.close,hidpi:CKEDITOR.env.hidpi?"cke_hidpi":""})),d=b.getChild([0,0,0,0,0]),c=d.getChild(0),g=d.getChild(1);a.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(d);!CKEDITOR.env.ie||CKEDITOR.env.quirks||
 CKEDITOR.env.edge||(a="javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())",CKEDITOR.dom.element.createFromHtml('\x3ciframe frameBorder\x3d"0" class\x3d"cke_iframe_shim" src\x3d"'+a+'" tabIndex\x3d"-1"\x3e\x3c/iframe\x3e').appendTo(d.getParent()));c.unselectable();g.unselectable();return{element:b,parts:{dialog:b.getChild(0),title:c,close:g,tabs:d.getChild(2),contents:d.getChild([3,0,0,0]),footer:d.getChild([3,0,1,0])}}}function l(a,
 b,d){this.element=b;this.focusIndex=d;this.tabIndex=0;this.isFocusable=function(){return!b.getAttribute("disabled")&&b.isVisible()};this.focus=function(){a._.currentFocusIndex=this.focusIndex;this.element.focus()};b.on("keydown",function(a){a.data.getKeystroke()in{32:1,13:1}&&this.fire("click")});b.on("focus",function(){this.fire("mouseover")});b.on("blur",function(){this.fire("mouseout")})}function k(a){function b(){a.layout()}var d=CKEDITOR.document.getWindow();d.on("resize",b);a.on("hide",function(){d.removeListener("resize",
-b)})}function b(a,b){this._={dialog:a};CKEDITOR.tools.extend(this,b)}function d(a){function b(d){var k=a.getSize(),n=CKEDITOR.document.getWindow().getViewPaneSize(),l=d.data.$.screenX,p=d.data.$.screenY,m=l-c.x,q=p-c.y;c={x:l,y:p};g.x+=m;g.y+=q;a.move(g.x+f[3]<h?-f[3]:g.x-f[1]>n.width-k.width-h?n.width-k.width+("rtl"==e.lang.dir?0:f[1]):g.x,g.y+f[0]<h?-f[0]:g.y-f[2]>n.height-k.height-h?n.height-k.height+f[2]:g.y,1);d.data.preventDefault()}function d(){CKEDITOR.document.removeListener("mousemove",
-b);CKEDITOR.document.removeListener("mouseup",d);if(CKEDITOR.env.ie6Compat){var a=z.getChild(0).getFrameDocument();a.removeListener("mousemove",b);a.removeListener("mouseup",d)}}var c=null,g=null,e=a.getParentEditor(),h=e.config.dialog_magnetDistance,f=CKEDITOR.skin.margins||[0,0,0,0];"undefined"==typeof h&&(h=20);a.parts.title.on("mousedown",function(e){c={x:e.data.$.screenX,y:e.data.$.screenY};CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",d);g=a.getPosition();if(CKEDITOR.env.ie6Compat){var h=
-z.getChild(0).getFrameDocument();h.on("mousemove",b);h.on("mouseup",d)}e.data.preventDefault()},a)}function g(a){function b(d){var p="rtl"==e.lang.dir,m=l.width,q=l.height,t=m+(d.data.$.screenX-n.x)*(p?-1:1)*(a._.moved?1:2),x=q+(d.data.$.screenY-n.y)*(a._.moved?1:2),r=a._.element.getFirst(),r=p&&r.getComputedStyle("right"),u=a.getPosition();u.y+x>k.height&&(x=k.height-u.y);(p?r:u.x)+t>k.width&&(t=k.width-(p?r:u.x));if(g==CKEDITOR.DIALOG_RESIZE_WIDTH||g==CKEDITOR.DIALOG_RESIZE_BOTH)m=Math.max(c.minWidth||
-0,t-h);if(g==CKEDITOR.DIALOG_RESIZE_HEIGHT||g==CKEDITOR.DIALOG_RESIZE_BOTH)q=Math.max(c.minHeight||0,x-f);a.resize(m,q);a._.moved||a.layout();d.data.preventDefault()}function d(){CKEDITOR.document.removeListener("mouseup",d);CKEDITOR.document.removeListener("mousemove",b);p&&(p.remove(),p=null);if(CKEDITOR.env.ie6Compat){var a=z.getChild(0).getFrameDocument();a.removeListener("mouseup",d);a.removeListener("mousemove",b)}}var c=a.definition,g=c.resizable;if(g!=CKEDITOR.DIALOG_RESIZE_NONE){var e=a.getParentEditor(),
-h,f,k,n,l,p,m=CKEDITOR.tools.addFunction(function(c){l=a.getSize();var g=a.parts.contents;g.$.getElementsByTagName("iframe").length&&(p=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_dialog_resize_cover" style\x3d"height: 100%; position: absolute; width: 100%;"\x3e\x3c/div\x3e'),g.append(p));f=l.height-a.parts.contents.getSize("height",!(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.quirks));h=l.width-a.parts.contents.getSize("width",1);n={x:c.screenX,y:c.screenY};k=CKEDITOR.document.getWindow().getViewPaneSize();
+b)})}function d(a,b){this._={dialog:a};CKEDITOR.tools.extend(this,b)}function b(a){function b(d){var k=a.getSize(),n=CKEDITOR.document.getWindow().getViewPaneSize(),l=d.data.$.screenX,p=d.data.$.screenY,m=l-c.x,q=p-c.y;c={x:l,y:p};g.x+=m;g.y+=q;a.move(g.x+h[3]<f?-h[3]:g.x-h[1]>n.width-k.width-f?n.width-k.width+("rtl"==e.lang.dir?0:h[1]):g.x,g.y+h[0]<f?-h[0]:g.y-h[2]>n.height-k.height-f?n.height-k.height+h[2]:g.y,1);d.data.preventDefault()}function d(){CKEDITOR.document.removeListener("mousemove",
+b);CKEDITOR.document.removeListener("mouseup",d);if(CKEDITOR.env.ie6Compat){var a=z.getChild(0).getFrameDocument();a.removeListener("mousemove",b);a.removeListener("mouseup",d)}}var c=null,g=null,e=a.getParentEditor(),f=e.config.dialog_magnetDistance,h=CKEDITOR.skin.margins||[0,0,0,0];"undefined"==typeof f&&(f=20);a.parts.title.on("mousedown",function(e){c={x:e.data.$.screenX,y:e.data.$.screenY};CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",d);g=a.getPosition();if(CKEDITOR.env.ie6Compat){var f=
+z.getChild(0).getFrameDocument();f.on("mousemove",b);f.on("mouseup",d)}e.data.preventDefault()},a)}function g(a){function b(d){var p="rtl"==e.lang.dir,m=l.width,q=l.height,u=m+(d.data.$.screenX-n.x)*(p?-1:1)*(a._.moved?1:2),w=q+(d.data.$.screenY-n.y)*(a._.moved?1:2),t=a._.element.getFirst(),t=p&&t.getComputedStyle("right"),r=a.getPosition();r.y+w>k.height&&(w=k.height-r.y);(p?t:r.x)+u>k.width&&(u=k.width-(p?t:r.x));if(g==CKEDITOR.DIALOG_RESIZE_WIDTH||g==CKEDITOR.DIALOG_RESIZE_BOTH)m=Math.max(c.minWidth||
+0,u-f);if(g==CKEDITOR.DIALOG_RESIZE_HEIGHT||g==CKEDITOR.DIALOG_RESIZE_BOTH)q=Math.max(c.minHeight||0,w-h);a.resize(m,q);a._.moved||a.layout();d.data.preventDefault()}function d(){CKEDITOR.document.removeListener("mouseup",d);CKEDITOR.document.removeListener("mousemove",b);p&&(p.remove(),p=null);if(CKEDITOR.env.ie6Compat){var a=z.getChild(0).getFrameDocument();a.removeListener("mouseup",d);a.removeListener("mousemove",b)}}var c=a.definition,g=c.resizable;if(g!=CKEDITOR.DIALOG_RESIZE_NONE){var e=a.getParentEditor(),
+f,h,k,n,l,p,m=CKEDITOR.tools.addFunction(function(c){l=a.getSize();var g=a.parts.contents;g.$.getElementsByTagName("iframe").length&&(p=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_dialog_resize_cover" style\x3d"height: 100%; position: absolute; width: 100%;"\x3e\x3c/div\x3e'),g.append(p));h=l.height-a.parts.contents.getSize("height",!(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.quirks));f=l.width-a.parts.contents.getSize("width",1);n={x:c.screenX,y:c.screenY};k=CKEDITOR.document.getWindow().getViewPaneSize();
 CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",d);CKEDITOR.env.ie6Compat&&(g=z.getChild(0).getFrameDocument(),g.on("mousemove",b),g.on("mouseup",d));c.preventDefault&&c.preventDefault()});a.on("load",function(){var b="";g==CKEDITOR.DIALOG_RESIZE_WIDTH?b=" cke_resizer_horizontal":g==CKEDITOR.DIALOG_RESIZE_HEIGHT&&(b=" cke_resizer_vertical");b=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_resizer'+b+" cke_resizer_"+e.lang.dir+'" title\x3d"'+CKEDITOR.tools.htmlEncode(e.lang.common.resize)+
-'" onmousedown\x3d"CKEDITOR.tools.callFunction('+m+', event )"\x3e'+("ltr"==e.lang.dir?"◢":"◣")+"\x3c/div\x3e");a.parts.footer.append(b,1)});e.on("destroy",function(){CKEDITOR.tools.removeFunction(m)})}}function p(a){a.data.preventDefault(1)}function v(a){var b=CKEDITOR.document.getWindow(),d=a.config,c=d.dialog_backgroundCoverColor||"white",g=d.dialog_backgroundCoverOpacity,e=d.baseFloatZIndex,d=CKEDITOR.tools.genKey(c,g,e),h=B[d];h?h.show():(e=['\x3cdiv tabIndex\x3d"-1" style\x3d"position: ',CKEDITOR.env.ie6Compat?
-"absolute":"fixed","; z-index: ",e,"; top: 0px; left: 0px; ",CKEDITOR.env.ie6Compat?"":"background-color: "+c,'" class\x3d"cke_dialog_background_cover"\x3e'],CKEDITOR.env.ie6Compat&&(c="\x3chtml\x3e\x3cbody style\x3d\\'background-color:"+c+";\\'\x3e\x3c/body\x3e\x3c/html\x3e",e.push('\x3ciframe hidefocus\x3d"true" frameborder\x3d"0" id\x3d"cke_dialog_background_iframe" src\x3d"javascript:'),e.push("void((function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.write( '"+
-c+"' );document.close();")+"})())"),e.push('" style\x3d"position:absolute;left:0;top:0;width:100%;height: 100%;filter: progid:DXImageTransform.Microsoft.Alpha(opacity\x3d0)"\x3e\x3c/iframe\x3e')),e.push("\x3c/div\x3e"),h=CKEDITOR.dom.element.createFromHtml(e.join("")),h.setOpacity(void 0!==g?g:.5),h.on("keydown",p),h.on("keypress",p),h.on("keyup",p),h.appendTo(CKEDITOR.document.getBody()),B[d]=h);a.focusManager.add(h);z=h;a=function(){var a=b.getViewPaneSize();h.setStyles({width:a.width+"px",height:a.height+
-"px"})};var f=function(){var a=b.getScrollPosition(),d=CKEDITOR.dialog._.currentTop;h.setStyles({left:a.x+"px",top:a.y+"px"});if(d){do a=d.getPosition(),d.move(a.x,a.y);while(d=d._.parentDialog)}};w=a;b.on("resize",a);a();CKEDITOR.env.mac&&CKEDITOR.env.webkit||h.focus();if(CKEDITOR.env.ie6Compat){var k=function(){f();arguments.callee.prevScrollHandler.apply(this,arguments)};b.$.setTimeout(function(){k.prevScrollHandler=window.onscroll||function(){};window.onscroll=k},0);f()}}function u(a){z&&(a.focusManager.remove(z),
-a=CKEDITOR.document.getWindow(),z.hide(),a.removeListener("resize",w),CKEDITOR.env.ie6Compat&&a.$.setTimeout(function(){window.onscroll=window.onscroll&&window.onscroll.prevScrollHandler||null},0),w=null)}var t=CKEDITOR.tools.cssLength,n='\x3cdiv class\x3d"cke_reset_all {editorId} {editorDialogClass} {hidpi}" dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"dialog" aria-labelledby\x3d"cke_dialog_title_{id}"\x3e\x3ctable class\x3d"cke_dialog '+CKEDITOR.env.cssClass+' cke_{langDir}" style\x3d"position:absolute" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_dialog_body" role\x3d"presentation"\x3e\x3cdiv id\x3d"cke_dialog_title_{id}" class\x3d"cke_dialog_title" role\x3d"presentation"\x3e\x3c/div\x3e\x3ca id\x3d"cke_dialog_close_button_{id}" class\x3d"cke_dialog_close_button" href\x3d"javascript:void(0)" title\x3d"{closeTitle}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3eX\x3c/span\x3e\x3c/a\x3e\x3cdiv id\x3d"cke_dialog_tabs_{id}" class\x3d"cke_dialog_tabs" role\x3d"tablist"\x3e\x3c/div\x3e\x3ctable class\x3d"cke_dialog_contents" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_contents_{id}" class\x3d"cke_dialog_contents_body" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_footer_{id}" class\x3d"cke_dialog_footer" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e';
-CKEDITOR.dialog=function(b,c){function k(){var a=B._.focusList;a.sort(function(a,b){return a.tabIndex!=b.tabIndex?b.tabIndex-a.tabIndex:a.focusIndex-b.focusIndex});for(var b=a.length,d=0;d<b;d++)a[d].focusIndex=d}function n(a){var b=B._.focusList;a=a||0;if(!(1>b.length)){var d=B._.currentFocusIndex;B._.tabBarMode&&0>a&&(d=0);try{b[d].getInputElement().$.blur()}catch(c){}var g=d,e=1<B._.pageCount;do{g+=a;if(e&&!B._.tabBarMode&&(g==b.length||-1==g)){B._.tabBarMode=!0;B._.tabs[B._.currentTabId][0].focus();
-B._.currentFocusIndex=-1;return}g=(g+b.length)%b.length;if(g==d)break}while(a&&!b[g].isFocusable());b[g].focus();"text"==b[g].type&&b[g].select()}}function l(d){if(B==CKEDITOR.dialog._.currentTop){var c=d.data.getKeystroke(),g="rtl"==b.lang.dir,e=[37,38,39,40];H=w=0;if(9==c||c==CKEDITOR.SHIFT+9)n(c==CKEDITOR.SHIFT+9?-1:1),H=1;else if(c==CKEDITOR.ALT+121&&!B._.tabBarMode&&1<B.getPageCount())B._.tabBarMode=!0,B._.tabs[B._.currentTabId][0].focus(),B._.currentFocusIndex=-1,H=1;else if(-1!=CKEDITOR.tools.indexOf(e,
-c)&&B._.tabBarMode)c=-1!=CKEDITOR.tools.indexOf([g?39:37,38],c)?a.call(B):f.call(B),B.selectPage(c),B._.tabs[c][0].focus(),H=1;else if(13!=c&&32!=c||!B._.tabBarMode)if(13==c)c=d.data.getTarget(),c.is("a","button","select","textarea")||c.is("input")&&"button"==c.$.type||((c=this.getButton("ok"))&&CKEDITOR.tools.setTimeout(c.click,0,c),H=1),w=1;else if(27==c)(c=this.getButton("cancel"))?CKEDITOR.tools.setTimeout(c.click,0,c):!1!==this.fire("cancel",{hide:!0}).hide&&this.hide(),w=1;else return;else this.selectPage(this._.currentTabId),
-this._.tabBarMode=!1,this._.currentFocusIndex=-1,n(1),H=1;p(d)}}function p(a){H?a.data.preventDefault(1):w&&a.data.stopPropagation()}var t=CKEDITOR.dialog._.dialogDefinitions[c],x=CKEDITOR.tools.clone(q),u=b.config.dialog_buttonsOrder||"OS",v=b.lang.dir,A={},H,w;("OS"==u&&CKEDITOR.env.mac||"rtl"==u&&"ltr"==v||"ltr"==u&&"rtl"==v)&&x.buttons.reverse();t=CKEDITOR.tools.extend(t(b),x);t=CKEDITOR.tools.clone(t);t=new r(this,t);x=m(b);this._={editor:b,element:x.element,name:c,contentSize:{width:0,height:0},
-size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:!1,focusList:[],currentFocusIndex:0,hasFocus:!1};this.parts=x.parts;CKEDITOR.tools.setTimeout(function(){b.fire("ariaWidget",this.parts.contents)},0,this);x={position:CKEDITOR.env.ie6Compat?"absolute":"fixed",top:0,visibility:"hidden"};x["rtl"==v?"right":"left"]=0;this.parts.dialog.setStyles(x);CKEDITOR.event.call(this);this.definition=t=CKEDITOR.fire("dialogDefinition",
-{name:c,definition:t},b).definition;if(!("removeDialogTabs"in b._)&&b.config.removeDialogTabs){x=b.config.removeDialogTabs.split(";");for(v=0;v<x.length;v++)if(u=x[v].split(":"),2==u.length){var C=u[0];A[C]||(A[C]=[]);A[C].push(u[1])}b._.removeDialogTabs=A}if(b._.removeDialogTabs&&(A=b._.removeDialogTabs[c]))for(v=0;v<A.length;v++)t.removeContents(A[v]);if(t.onLoad)this.on("load",t.onLoad);if(t.onShow)this.on("show",t.onShow);if(t.onHide)this.on("hide",t.onHide);if(t.onOk)this.on("ok",function(a){b.fire("saveSnapshot");
-setTimeout(function(){b.fire("saveSnapshot")},0);!1===t.onOk.call(this,a)&&(a.data.hide=!1)});this.state=CKEDITOR.DIALOG_STATE_IDLE;if(t.onCancel)this.on("cancel",function(a){!1===t.onCancel.call(this,a)&&(a.data.hide=!1)});var B=this,y=function(a){var b=B._.contents,d=!1,c;for(c in b)for(var g in b[c])if(d=a.call(this,b[c][g]))return};this.on("ok",function(a){y(function(b){if(b.validate){var d=b.validate(this),c="string"==typeof d||!1===d;c&&(a.data.hide=!1,a.stop());e.call(b,!c,"string"==typeof d?
-d:void 0);return c}})},this,null,0);this.on("cancel",function(a){y(function(d){if(d.isChanged())return b.config.dialog_noConfirmCancel||confirm(b.lang.common.confirmCancel)||(a.data.hide=!1),!0})},this,null,0);this.parts.close.on("click",function(a){!1!==this.fire("cancel",{hide:!0}).hide&&this.hide();a.data.preventDefault()},this);this.changeFocus=n;var z=this._.element;b.focusManager.add(z,1);this.on("show",function(){z.on("keydown",l,this);if(CKEDITOR.env.gecko)z.on("keypress",p,this)});this.on("hide",
-function(){z.removeListener("keydown",l);CKEDITOR.env.gecko&&z.removeListener("keypress",p);y(function(a){h.apply(a)})});this.on("iframeAdded",function(a){(new CKEDITOR.dom.document(a.data.iframe.$.contentWindow.document)).on("keydown",l,this,null,0)});this.on("show",function(){k();var a=1<B._.pageCount;b.config.dialog_startupFocusTab&&a?(B._.tabBarMode=!0,B._.tabs[B._.currentTabId][0].focus(),B._.currentFocusIndex=-1):this._.hasFocus||(this._.currentFocusIndex=a?-1:this._.focusList.length-1,t.onFocus?
-(a=t.onFocus.call(this))&&a.focus():n(1))},this,null,4294967295);if(CKEDITOR.env.ie6Compat)this.on("load",function(){var a=this.getElement(),b=a.getFirst();b.remove();b.appendTo(a)},this);d(this);g(this);(new CKEDITOR.dom.text(t.title,CKEDITOR.document)).appendTo(this.parts.title);for(v=0;v<t.contents.length;v++)(A=t.contents[v])&&this.addPage(A);this.parts.tabs.on("click",function(a){var b=a.data.getTarget();b.hasClass("cke_dialog_tab")&&(b=b.$.id,this.selectPage(b.substring(4,b.lastIndexOf("_"))),
-this._.tabBarMode&&(this._.tabBarMode=!1,this._.currentFocusIndex=-1,n(1)),a.data.preventDefault())},this);v=[];A=CKEDITOR.dialog._.uiElementBuilders.hbox.build(this,{type:"hbox",className:"cke_dialog_footer_buttons",widths:[],children:t.buttons},v).getChild();this.parts.footer.setHtml(v.join(""));for(v=0;v<A.length;v++)this._.buttons[A[v].id]=A[v]};CKEDITOR.dialog.prototype={destroy:function(){this.hide();this._.element.remove()},resize:function(){return function(a,b){this._.contentSize&&this._.contentSize.width==
+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+m+', event )"\x3e'+("ltr"==e.lang.dir?"◢":"◣")+"\x3c/div\x3e");a.parts.footer.append(b,1)});e.on("destroy",function(){CKEDITOR.tools.removeFunction(m)})}}function p(a){a.data.preventDefault(1)}function v(a){var b=CKEDITOR.document.getWindow(),d=a.config,c=CKEDITOR.skinName||a.config.skin,g=d.dialog_backgroundCoverColor||("moono-lisa"==c?"black":"white"),c=d.dialog_backgroundCoverOpacity,e=d.baseFloatZIndex,d=CKEDITOR.tools.genKey(g,c,e),f=F[d];f?f.show():
+(e=['\x3cdiv tabIndex\x3d"-1" style\x3d"position: ',CKEDITOR.env.ie6Compat?"absolute":"fixed","; z-index: ",e,"; top: 0px; left: 0px; ",CKEDITOR.env.ie6Compat?"":"background-color: "+g,'" class\x3d"cke_dialog_background_cover"\x3e'],CKEDITOR.env.ie6Compat&&(g="\x3chtml\x3e\x3cbody style\x3d\\'background-color:"+g+";\\'\x3e\x3c/body\x3e\x3c/html\x3e",e.push('\x3ciframe hidefocus\x3d"true" frameborder\x3d"0" id\x3d"cke_dialog_background_iframe" src\x3d"javascript:'),e.push("void((function(){"+encodeURIComponent("document.open();("+
+CKEDITOR.tools.fixDomain+")();document.write( '"+g+"' );document.close();")+"})())"),e.push('" style\x3d"position:absolute;left:0;top:0;width:100%;height: 100%;filter: progid:DXImageTransform.Microsoft.Alpha(opacity\x3d0)"\x3e\x3c/iframe\x3e')),e.push("\x3c/div\x3e"),f=CKEDITOR.dom.element.createFromHtml(e.join("")),f.setOpacity(void 0!==c?c:.5),f.on("keydown",p),f.on("keypress",p),f.on("keyup",p),f.appendTo(CKEDITOR.document.getBody()),F[d]=f);a.focusManager.add(f);z=f;a=function(){var a=b.getViewPaneSize();
+f.setStyles({width:a.width+"px",height:a.height+"px"})};var h=function(){var a=b.getScrollPosition(),d=CKEDITOR.dialog._.currentTop;f.setStyles({left:a.x+"px",top:a.y+"px"});if(d){do a=d.getPosition(),d.move(a.x,a.y);while(d=d._.parentDialog)}};x=a;b.on("resize",a);a();CKEDITOR.env.mac&&CKEDITOR.env.webkit||f.focus();if(CKEDITOR.env.ie6Compat){var k=function(){h();arguments.callee.prevScrollHandler.apply(this,arguments)};b.$.setTimeout(function(){k.prevScrollHandler=window.onscroll||function(){};
+window.onscroll=k},0);h()}}function r(a){z&&(a.focusManager.remove(z),a=CKEDITOR.document.getWindow(),z.hide(),a.removeListener("resize",x),CKEDITOR.env.ie6Compat&&a.$.setTimeout(function(){window.onscroll=window.onscroll&&window.onscroll.prevScrollHandler||null},0),x=null)}var w=CKEDITOR.tools.cssLength,n='\x3cdiv class\x3d"cke_reset_all {editorId} {editorDialogClass} {hidpi}" dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"dialog" aria-labelledby\x3d"cke_dialog_title_{id}"\x3e\x3ctable class\x3d"cke_dialog '+
+CKEDITOR.env.cssClass+' cke_{langDir}" style\x3d"position:absolute" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_dialog_body" role\x3d"presentation"\x3e\x3cdiv id\x3d"cke_dialog_title_{id}" class\x3d"cke_dialog_title" role\x3d"presentation"\x3e\x3c/div\x3e\x3ca id\x3d"cke_dialog_close_button_{id}" class\x3d"cke_dialog_close_button" href\x3d"javascript:void(0)" title\x3d"{closeTitle}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3eX\x3c/span\x3e\x3c/a\x3e\x3cdiv id\x3d"cke_dialog_tabs_{id}" class\x3d"cke_dialog_tabs" role\x3d"tablist"\x3e\x3c/div\x3e\x3ctable class\x3d"cke_dialog_contents" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_contents_{id}" class\x3d"cke_dialog_contents_body" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_footer_{id}" class\x3d"cke_dialog_footer" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e';
+CKEDITOR.dialog=function(d,c){function k(){var a=K._.focusList;a.sort(function(a,b){return a.tabIndex!=b.tabIndex?b.tabIndex-a.tabIndex:a.focusIndex-b.focusIndex});for(var b=a.length,d=0;d<b;d++)a[d].focusIndex=d}function n(a){var b=K._.focusList;a=a||0;if(!(1>b.length)){var d=K._.currentFocusIndex;K._.tabBarMode&&0>a&&(d=0);try{b[d].getInputElement().$.blur()}catch(c){}var g=d,e=1<K._.pageCount;do{g+=a;if(e&&!K._.tabBarMode&&(g==b.length||-1==g)){K._.tabBarMode=!0;K._.tabs[K._.currentTabId][0].focus();
+K._.currentFocusIndex=-1;return}g=(g+b.length)%b.length;if(g==d)break}while(a&&!b[g].isFocusable());b[g].focus();"text"==b[g].type&&b[g].select()}}function l(b){if(K==CKEDITOR.dialog._.currentTop){var c=b.data.getKeystroke(),g="rtl"==d.lang.dir,f=[37,38,39,40];J=B=0;if(9==c||c==CKEDITOR.SHIFT+9)n(c==CKEDITOR.SHIFT+9?-1:1),J=1;else if(c==CKEDITOR.ALT+121&&!K._.tabBarMode&&1<K.getPageCount())K._.tabBarMode=!0,K._.tabs[K._.currentTabId][0].focus(),K._.currentFocusIndex=-1,J=1;else if(-1!=CKEDITOR.tools.indexOf(f,
+c)&&K._.tabBarMode)c=-1!=CKEDITOR.tools.indexOf([g?39:37,38],c)?a.call(K):e.call(K),K.selectPage(c),K._.tabs[c][0].focus(),J=1;else if(13!=c&&32!=c||!K._.tabBarMode)if(13==c)c=b.data.getTarget(),c.is("a","button","select","textarea")||c.is("input")&&"button"==c.$.type||((c=this.getButton("ok"))&&CKEDITOR.tools.setTimeout(c.click,0,c),J=1),B=1;else if(27==c)(c=this.getButton("cancel"))?CKEDITOR.tools.setTimeout(c.click,0,c):!1!==this.fire("cancel",{hide:!0}).hide&&this.hide(),B=1;else return;else this.selectPage(this._.currentTabId),
+this._.tabBarMode=!1,this._.currentFocusIndex=-1,n(1),J=1;p(b)}}function p(a){J?a.data.preventDefault(1):B&&a.data.stopPropagation()}var u=CKEDITOR.dialog._.dialogDefinitions[c],w=CKEDITOR.tools.clone(q),r=d.config.dialog_buttonsOrder||"OS",y=d.lang.dir,v={},J,B;("OS"==r&&CKEDITOR.env.mac||"rtl"==r&&"ltr"==y||"ltr"==r&&"rtl"==y)&&w.buttons.reverse();u=CKEDITOR.tools.extend(u(d),w);u=CKEDITOR.tools.clone(u);u=new t(this,u);w=m(d);this._={editor:d,element:w.element,name:c,contentSize:{width:0,height:0},
+size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:!1,focusList:[],currentFocusIndex:0,hasFocus:!1};this.parts=w.parts;CKEDITOR.tools.setTimeout(function(){d.fire("ariaWidget",this.parts.contents)},0,this);w={position:CKEDITOR.env.ie6Compat?"absolute":"fixed",top:0,visibility:"hidden"};w["rtl"==y?"right":"left"]=0;this.parts.dialog.setStyles(w);CKEDITOR.event.call(this);this.definition=u=CKEDITOR.fire("dialogDefinition",
+{name:c,definition:u},d).definition;if(!("removeDialogTabs"in d._)&&d.config.removeDialogTabs){w=d.config.removeDialogTabs.split(";");for(y=0;y<w.length;y++)if(r=w[y].split(":"),2==r.length){var x=r[0];v[x]||(v[x]=[]);v[x].push(r[1])}d._.removeDialogTabs=v}if(d._.removeDialogTabs&&(v=d._.removeDialogTabs[c]))for(y=0;y<v.length;y++)u.removeContents(v[y]);if(u.onLoad)this.on("load",u.onLoad);if(u.onShow)this.on("show",u.onShow);if(u.onHide)this.on("hide",u.onHide);if(u.onOk)this.on("ok",function(a){d.fire("saveSnapshot");
+setTimeout(function(){d.fire("saveSnapshot")},0);!1===u.onOk.call(this,a)&&(a.data.hide=!1)});this.state=CKEDITOR.DIALOG_STATE_IDLE;if(u.onCancel)this.on("cancel",function(a){!1===u.onCancel.call(this,a)&&(a.data.hide=!1)});var K=this,F=function(a){var b=K._.contents,d=!1,c;for(c in b)for(var g in b[c])if(d=a.call(this,b[c][g]))return};this.on("ok",function(a){F(function(b){if(b.validate){var d=b.validate(this),c="string"==typeof d||!1===d;c&&(a.data.hide=!1,a.stop());f.call(b,!c,"string"==typeof d?
+d:void 0);return c}})},this,null,0);this.on("cancel",function(a){F(function(b){if(b.isChanged())return d.config.dialog_noConfirmCancel||confirm(d.lang.common.confirmCancel)||(a.data.hide=!1),!0})},this,null,0);this.parts.close.on("click",function(a){!1!==this.fire("cancel",{hide:!0}).hide&&this.hide();a.data.preventDefault()},this);this.changeFocus=n;var A=this._.element;d.focusManager.add(A,1);this.on("show",function(){A.on("keydown",l,this);if(CKEDITOR.env.gecko)A.on("keypress",p,this)});this.on("hide",
+function(){A.removeListener("keydown",l);CKEDITOR.env.gecko&&A.removeListener("keypress",p);F(function(a){h.apply(a)})});this.on("iframeAdded",function(a){(new CKEDITOR.dom.document(a.data.iframe.$.contentWindow.document)).on("keydown",l,this,null,0)});this.on("show",function(){k();var a=1<K._.pageCount;d.config.dialog_startupFocusTab&&a?(K._.tabBarMode=!0,K._.tabs[K._.currentTabId][0].focus(),K._.currentFocusIndex=-1):this._.hasFocus||(this._.currentFocusIndex=a?-1:this._.focusList.length-1,u.onFocus?
+(a=u.onFocus.call(this))&&a.focus():n(1))},this,null,4294967295);if(CKEDITOR.env.ie6Compat)this.on("load",function(){var a=this.getElement(),b=a.getFirst();b.remove();b.appendTo(a)},this);b(this);g(this);(new CKEDITOR.dom.text(u.title,CKEDITOR.document)).appendTo(this.parts.title);for(y=0;y<u.contents.length;y++)(v=u.contents[y])&&this.addPage(v);this.parts.tabs.on("click",function(a){var b=a.data.getTarget();b.hasClass("cke_dialog_tab")&&(b=b.$.id,this.selectPage(b.substring(4,b.lastIndexOf("_"))),
+this._.tabBarMode&&(this._.tabBarMode=!1,this._.currentFocusIndex=-1,n(1)),a.data.preventDefault())},this);y=[];v=CKEDITOR.dialog._.uiElementBuilders.hbox.build(this,{type:"hbox",className:"cke_dialog_footer_buttons",widths:[],children:u.buttons},y).getChild();this.parts.footer.setHtml(y.join(""));for(y=0;y<v.length;y++)this._.buttons[v[y].id]=v[y]};CKEDITOR.dialog.prototype={destroy:function(){this.hide();this._.element.remove()},resize:function(){return function(a,b){this._.contentSize&&this._.contentSize.width==
 a&&this._.contentSize.height==b||(CKEDITOR.dialog.fire("resize",{dialog:this,width:a,height:b},this._.editor),this.fire("resize",{width:a,height:b},this._.editor),this.parts.contents.setStyles({width:a+"px",height:b+"px"}),"rtl"==this._.editor.lang.dir&&this._.position&&(this._.position.x=CKEDITOR.document.getWindow().getViewPaneSize().width-this._.contentSize.width-parseInt(this._.element.getFirst().getStyle("right"),10)),this._.contentSize={width:a,height:b})}}(),getSize:function(){var a=this._.element.getFirst();
 return{width:a.$.offsetWidth||0,height:a.$.offsetHeight||0}},move:function(a,b,d){var c=this._.element.getFirst(),g="rtl"==this._.editor.lang.dir,e="fixed"==c.getComputedStyle("position");CKEDITOR.env.ie&&c.setStyle("zoom","100%");e&&this._.position&&this._.position.x==a&&this._.position.y==b||(this._.position={x:a,y:b},e||(e=CKEDITOR.document.getWindow().getScrollPosition(),a+=e.x,b+=e.y),g&&(e=this.getSize(),a=CKEDITOR.document.getWindow().getViewPaneSize().width-e.width-a),b={top:(0<b?b:0)+"px"},
 b[g?"right":"left"]=(0<a?a:0)+"px",c.setStyles(b),d&&(this._.moved=1))},getPosition:function(){return CKEDITOR.tools.extend({},this._.position)},show:function(){var a=this._.element,b=this.definition;a.getParent()&&a.getParent().equals(CKEDITOR.document.getBody())?a.setStyle("display","block"):a.appendTo(CKEDITOR.document.getBody());this.resize(this._.contentSize&&this._.contentSize.width||b.width||b.minWidth,this._.contentSize&&this._.contentSize.height||b.height||b.minHeight);this.reset();this.selectPage(this.definition.contents[0].id);
 null===CKEDITOR.dialog._.currentZIndex&&(CKEDITOR.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex);this._.element.getFirst().setStyle("z-index",CKEDITOR.dialog._.currentZIndex+=10);null===CKEDITOR.dialog._.currentTop?(CKEDITOR.dialog._.currentTop=this,this._.parentDialog=null,v(this._.editor)):(this._.parentDialog=CKEDITOR.dialog._.currentTop,this._.parentDialog.getElement().getFirst().$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/2),CKEDITOR.dialog._.currentTop=this);
-a.on("keydown",D);a.on("keyup",F);this._.hasFocus=!1;for(var d in b.contents)if(b.contents[d]){var a=b.contents[d],c=this._.tabs[a.id],g=a.requiredContent,e=0;if(c){for(var h in this._.contents[a.id]){var f=this._.contents[a.id][h];"hbox"!=f.type&&"vbox"!=f.type&&f.getInputElement()&&(f.requiredContent&&!this._.editor.activeFilter.check(f.requiredContent)?f.disable():(f.enable(),e++))}!e||g&&!this._.editor.activeFilter.check(g)?c[0].addClass("cke_dialog_tab_disabled"):c[0].removeClass("cke_dialog_tab_disabled")}}CKEDITOR.tools.setTimeout(function(){this.layout();
+a.on("keydown",C);a.on("keyup",E);this._.hasFocus=!1;for(var d in b.contents)if(b.contents[d]){var a=b.contents[d],c=this._.tabs[a.id],g=a.requiredContent,e=0;if(c){for(var f in this._.contents[a.id]){var h=this._.contents[a.id][f];"hbox"!=h.type&&"vbox"!=h.type&&h.getInputElement()&&(h.requiredContent&&!this._.editor.activeFilter.check(h.requiredContent)?h.disable():(h.enable(),e++))}!e||g&&!this._.editor.activeFilter.check(g)?c[0].addClass("cke_dialog_tab_disabled"):c[0].removeClass("cke_dialog_tab_disabled")}}CKEDITOR.tools.setTimeout(function(){this.layout();
 k(this);this.parts.dialog.setStyle("visibility","");this.fireOnce("load",{});CKEDITOR.ui.fire("ready",this);this.fire("show",{});this._.editor.fire("dialogShow",this);this._.parentDialog||this._.editor.focusManager.lock();this.foreach(function(a){a.setInitValue&&a.setInitValue()})},100,this)},layout:function(){var a=this.parts.dialog,b=this.getSize(),d=CKEDITOR.document.getWindow().getViewPaneSize(),c=(d.width-b.width)/2,g=(d.height-b.height)/2;CKEDITOR.env.ie6Compat||(b.height+(0<g?g:0)>d.height||
 b.width+(0<c?c:0)>d.width?a.setStyle("position","absolute"):a.setStyle("position","fixed"));this.move(this._.moved?this._.position.x:c,this._.moved?this._.position.y:g)},foreach:function(a){for(var b in this._.contents)for(var d in this._.contents[b])a.call(this,this._.contents[b][d]);return this},reset:function(){var a=function(a){a.reset&&a.reset(1)};return function(){this.foreach(a);return this}}(),setupContent:function(){var a=arguments;this.foreach(function(b){b.setup&&b.setup.apply(b,a)})},
-commitContent:function(){var a=arguments;this.foreach(function(b){CKEDITOR.env.ie&&this._.currentFocusIndex==b.focusIndex&&b.getInputElement().$.blur();b.commit&&b.commit.apply(b,a)})},hide:function(){if(this.parts.dialog.isVisible()){this.fire("hide",{});this._.editor.fire("dialogHide",this);this.selectPage(this._.tabIdList[0]);var a=this._.element;a.setStyle("display","none");this.parts.dialog.setStyle("visibility","hidden");for(L(this);CKEDITOR.dialog._.currentTop!=this;)CKEDITOR.dialog._.currentTop.hide();
-if(this._.parentDialog){var b=this._.parentDialog.getElement().getFirst();b.setStyle("z-index",parseInt(b.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2))}else u(this._.editor);if(CKEDITOR.dialog._.currentTop=this._.parentDialog)CKEDITOR.dialog._.currentZIndex-=10;else{CKEDITOR.dialog._.currentZIndex=null;a.removeListener("keydown",D);a.removeListener("keyup",F);var d=this._.editor;d.focus();setTimeout(function(){d.focusManager.unlock();CKEDITOR.env.iOS&&d.window.focus()},0)}delete this._.parentDialog;
+commitContent:function(){var a=arguments;this.foreach(function(b){CKEDITOR.env.ie&&this._.currentFocusIndex==b.focusIndex&&b.getInputElement().$.blur();b.commit&&b.commit.apply(b,a)})},hide:function(){if(this.parts.dialog.isVisible()){this.fire("hide",{});this._.editor.fire("dialogHide",this);this.selectPage(this._.tabIdList[0]);var a=this._.element;a.setStyle("display","none");this.parts.dialog.setStyle("visibility","hidden");for(I(this);CKEDITOR.dialog._.currentTop!=this;)CKEDITOR.dialog._.currentTop.hide();
+if(this._.parentDialog){var b=this._.parentDialog.getElement().getFirst();b.setStyle("z-index",parseInt(b.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2))}else r(this._.editor);if(CKEDITOR.dialog._.currentTop=this._.parentDialog)CKEDITOR.dialog._.currentZIndex-=10;else{CKEDITOR.dialog._.currentZIndex=null;a.removeListener("keydown",C);a.removeListener("keyup",E);var d=this._.editor;d.focus();setTimeout(function(){d.focusManager.unlock();CKEDITOR.env.iOS&&d.window.focus()},0)}delete this._.parentDialog;
 this.foreach(function(a){a.resetInitValue&&a.resetInitValue()});this.setState(CKEDITOR.DIALOG_STATE_IDLE)}},addPage:function(a){if(!a.requiredContent||this._.editor.filter.check(a.requiredContent)){for(var b=[],d=a.label?' title\x3d"'+CKEDITOR.tools.htmlEncode(a.label)+'"':"",c=CKEDITOR.dialog._.uiElementBuilders.vbox.build(this,{type:"vbox",className:"cke_dialog_page_contents",children:a.elements,expand:!!a.expand,padding:a.padding,style:a.style||"width: 100%;"},b),g=this._.contents[a.id]={},e=c.getChild(),
-h=0;c=e.shift();)c.notAllowed||"hbox"==c.type||"vbox"==c.type||h++,g[c.id]=c,"function"==typeof c.getChild&&e.push.apply(e,c.getChild());h||(a.hidden=!0);b=CKEDITOR.dom.element.createFromHtml(b.join(""));b.setAttribute("role","tabpanel");c=CKEDITOR.env;g="cke_"+a.id+"_"+CKEDITOR.tools.getNextNumber();d=CKEDITOR.dom.element.createFromHtml(['\x3ca class\x3d"cke_dialog_tab"',0<this._.pageCount?" cke_last":"cke_first",d,a.hidden?' style\x3d"display:none"':"",' id\x3d"',g,'"',c.gecko&&!c.hc?"":' href\x3d"javascript:void(0)"',
-' tabIndex\x3d"-1" hidefocus\x3d"true" role\x3d"tab"\x3e',a.label,"\x3c/a\x3e"].join(""));b.setAttribute("aria-labelledby",g);this._.tabs[a.id]=[d,b];this._.tabIdList.push(a.id);!a.hidden&&this._.pageCount++;this._.lastTab=d;this.updateStyle();b.setAttribute("name",a.id);b.appendTo(this.parts.contents);d.unselectable();this.parts.tabs.append(d);a.accessKey&&(E(this,this,"CTRL+"+a.accessKey,N,G),this._.accessKeyMap["CTRL+"+a.accessKey]=a.id)}},selectPage:function(a){if(this._.currentTabId!=a&&!this._.tabs[a][0].hasClass("cke_dialog_tab_disabled")&&
+f=0;c=e.shift();)c.notAllowed||"hbox"==c.type||"vbox"==c.type||f++,g[c.id]=c,"function"==typeof c.getChild&&e.push.apply(e,c.getChild());f||(a.hidden=!0);b=CKEDITOR.dom.element.createFromHtml(b.join(""));b.setAttribute("role","tabpanel");c=CKEDITOR.env;g="cke_"+a.id+"_"+CKEDITOR.tools.getNextNumber();d=CKEDITOR.dom.element.createFromHtml(['\x3ca class\x3d"cke_dialog_tab"',0<this._.pageCount?" cke_last":"cke_first",d,a.hidden?' style\x3d"display:none"':"",' id\x3d"',g,'"',c.gecko&&!c.hc?"":' href\x3d"javascript:void(0)"',
+' tabIndex\x3d"-1" hidefocus\x3d"true" role\x3d"tab"\x3e',a.label,"\x3c/a\x3e"].join(""));b.setAttribute("aria-labelledby",g);this._.tabs[a.id]=[d,b];this._.tabIdList.push(a.id);!a.hidden&&this._.pageCount++;this._.lastTab=d;this.updateStyle();b.setAttribute("name",a.id);b.appendTo(this.parts.contents);d.unselectable();this.parts.tabs.append(d);a.accessKey&&(D(this,this,"CTRL+"+a.accessKey,M,H),this._.accessKeyMap["CTRL+"+a.accessKey]=a.id)}},selectPage:function(a){if(this._.currentTabId!=a&&!this._.tabs[a][0].hasClass("cke_dialog_tab_disabled")&&
 !1!==this.fire("selectPage",{page:a,currentPage:this._.currentTabId})){for(var b in this._.tabs){var d=this._.tabs[b][0],g=this._.tabs[b][1];b!=a&&(d.removeClass("cke_dialog_tab_selected"),g.hide());g.setAttribute("aria-hidden",b!=a)}var e=this._.tabs[a];e[0].addClass("cke_dialog_tab_selected");CKEDITOR.env.ie6Compat||CKEDITOR.env.ie7Compat?(c(e[1]),e[1].show(),setTimeout(function(){c(e[1],1)},0)):e[1].show();this._.currentTabId=a;this._.currentTabIndex=CKEDITOR.tools.indexOf(this._.tabIdList,a)}},
 updateStyle:function(){this.parts.dialog[(1===this._.pageCount?"add":"remove")+"Class"]("cke_single_page")},hidePage:function(b){var d=this._.tabs[b]&&this._.tabs[b][0];d&&1!=this._.pageCount&&d.isVisible()&&(b==this._.currentTabId&&this.selectPage(a.call(this)),d.hide(),this._.pageCount--,this.updateStyle())},showPage:function(a){if(a=this._.tabs[a]&&this._.tabs[a][0])a.show(),this._.pageCount++,this.updateStyle()},getElement:function(){return this._.element},getName:function(){return this._.name},
 getContentElement:function(a,b){var d=this._.contents[a];return d&&d[b]},getValueOf:function(a,b){return this.getContentElement(a,b).getValue()},setValueOf:function(a,b,d){return this.getContentElement(a,b).setValue(d)},getButton:function(a){return this._.buttons[a]},click:function(a){return this._.buttons[a].click()},disableButton:function(a){return this._.buttons[a].disable()},enableButton:function(a){return this._.buttons[a].enable()},getPageCount:function(){return this._.pageCount},getParentEditor:function(){return this._.editor},
@@ -551,503 +565,517 @@ getSelectedElement:function(){return this.getParentEditor().getSelection().getSe
 styles:{"float":"rtl"==b?"right":"left"}};d.styles["margin-"+("rtl"==b?"left":"right")]="8px";this.parts.spinner=CKEDITOR.document.createElement("div",d);this.parts.spinner.setHtml("\x26#8987;");this.parts.spinner.appendTo(this.parts.title,1)}this.parts.spinner.show();this.getButton("ok").disable()}else a==CKEDITOR.DIALOG_STATE_IDLE&&(this.parts.spinner&&this.parts.spinner.hide(),this.getButton("ok").enable());this.fire("state",a)}}};CKEDITOR.tools.extend(CKEDITOR.dialog,{add:function(a,b){this._.dialogDefinitions[a]&&
 "function"!=typeof b||(this._.dialogDefinitions[a]=b)},exists:function(a){return!!this._.dialogDefinitions[a]},getCurrent:function(){return CKEDITOR.dialog._.currentTop},isTabEnabled:function(a,b,d){a=a.config.removeDialogTabs;return!(a&&a.match(new RegExp("(?:^|;)"+b+":"+d+"(?:$|;)","i")))},okButton:function(){var a=function(a,b){b=b||{};return CKEDITOR.tools.extend({id:"ok",type:"button",label:a.lang.common.ok,"class":"cke_dialog_ui_button_ok",onClick:function(a){a=a.data.dialog;!1!==a.fire("ok",
 {hide:!0}).hide&&a.hide()}},b,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(d){return a(d,b)},{type:"button"},!0)};return a}(),cancelButton:function(){var a=function(a,b){b=b||{};return CKEDITOR.tools.extend({id:"cancel",type:"button",label:a.lang.common.cancel,"class":"cke_dialog_ui_button_cancel",onClick:function(a){a=a.data.dialog;!1!==a.fire("cancel",{hide:!0}).hide&&a.hide()}},b,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(d){return a(d,
-b)},{type:"button"},!0)};return a}(),addUIElement:function(a,b){this._.uiElementBuilders[a]=b}});CKEDITOR.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};CKEDITOR.event.implementOn(CKEDITOR.dialog);CKEDITOR.event.implementOn(CKEDITOR.dialog.prototype);var q={resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:600,minHeight:400,buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton]},x=function(a,b,d){for(var c=0,g;g=a[c];c++)if(g.id==b||d&&g[d]&&(g=x(g[d],
-b,d)))return g;return null},A=function(a,b,d,c,g){if(d){for(var e=0,h;h=a[e];e++){if(h.id==d)return a.splice(e,0,b),b;if(c&&h[c]&&(h=A(h[c],b,d,c,!0)))return h}if(g)return null}a.push(b);return b},C=function(a,b,d){for(var c=0,g;g=a[c];c++){if(g.id==b)return a.splice(c,1);if(d&&g[d]&&(g=C(g[d],b,d)))return g}return null},r=function(a,d){this.dialog=a;for(var c=d.contents,g=0,e;e=c[g];g++)c[g]=e&&new b(a,e);CKEDITOR.tools.extend(this,d)};r.prototype={getContents:function(a){return x(this.contents,
-a)},getButton:function(a){return x(this.buttons,a)},addContents:function(a,b){return A(this.contents,a,b)},addButton:function(a,b){return A(this.buttons,a,b)},removeContents:function(a){C(this.contents,a)},removeButton:function(a){C(this.buttons,a)}};b.prototype={get:function(a){return x(this.elements,a,"children")},add:function(a,b){return A(this.elements,a,b,"children")},remove:function(a){C(this.elements,a,"children")}};var w,B={},z,y={},D=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,d=
-a.data.$.altKey,c=a.data.$.shiftKey,g=String.fromCharCode(a.data.$.keyCode);(b=y[(b?"CTRL+":"")+(d?"ALT+":"")+(c?"SHIFT+":"")+g])&&b.length&&(b=b[b.length-1],b.keydown&&b.keydown.call(b.uiElement,b.dialog,b.key),a.data.preventDefault())},F=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,d=a.data.$.altKey,c=a.data.$.shiftKey,g=String.fromCharCode(a.data.$.keyCode);(b=y[(b?"CTRL+":"")+(d?"ALT+":"")+(c?"SHIFT+":"")+g])&&b.length&&(b=b[b.length-1],b.keyup&&(b.keyup.call(b.uiElement,b.dialog,b.key),
-a.data.preventDefault()))},E=function(a,b,d,c,g){(y[d]||(y[d]=[])).push({uiElement:a,dialog:b,key:d,keyup:g||a.accessKeyUp,keydown:c||a.accessKeyDown})},L=function(a){for(var b in y){for(var d=y[b],c=d.length-1;0<=c;c--)d[c].dialog!=a&&d[c].uiElement!=a||d.splice(c,1);0===d.length&&delete y[b]}},G=function(a,b){a._.accessKeyMap[b]&&a.selectPage(a._.accessKeyMap[b])},N=function(){};(function(){CKEDITOR.ui.dialog={uiElement:function(a,b,d,c,g,e,h){if(!(4>arguments.length)){var f=(c.call?c(b):c)||"div",
-k=["\x3c",f," "],n=(g&&g.call?g(b):g)||{},l=(e&&e.call?e(b):e)||{},p=(h&&h.call?h.call(this,a,b):h)||"",m=this.domId=l.id||CKEDITOR.tools.getNextId()+"_uiElement";b.requiredContent&&!a.getParentEditor().filter.check(b.requiredContent)&&(n.display="none",this.notAllowed=!0);l.id=m;var q={};b.type&&(q["cke_dialog_ui_"+b.type]=1);b.className&&(q[b.className]=1);b.disabled&&(q.cke_disabled=1);for(var t=l["class"]&&l["class"].split?l["class"].split(" "):[],m=0;m<t.length;m++)t[m]&&(q[t[m]]=1);t=[];for(m in q)t.push(m);
-l["class"]=t.join(" ");b.title&&(l.title=b.title);q=(b.style||"").split(";");b.align&&(t=b.align,n["margin-left"]="left"==t?0:"auto",n["margin-right"]="right"==t?0:"auto");for(m in n)q.push(m+":"+n[m]);b.hidden&&q.push("display:none");for(m=q.length-1;0<=m;m--)""===q[m]&&q.splice(m,1);0<q.length&&(l.style=(l.style?l.style+"; ":"")+q.join("; "));for(m in l)k.push(m+'\x3d"'+CKEDITOR.tools.htmlEncode(l[m])+'" ');k.push("\x3e",p,"\x3c/",f,"\x3e");d.push(k.join(""));(this._||(this._={})).dialog=a;"boolean"==
+b)},{type:"button"},!0)};return a}(),addUIElement:function(a,b){this._.uiElementBuilders[a]=b}});CKEDITOR.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};CKEDITOR.event.implementOn(CKEDITOR.dialog);CKEDITOR.event.implementOn(CKEDITOR.dialog.prototype);var q={resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:600,minHeight:400,buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton]},u=function(a,b,d){for(var c=0,g;g=a[c];c++)if(g.id==b||d&&g[d]&&(g=u(g[d],
+b,d)))return g;return null},B=function(a,b,d,c,g){if(d){for(var e=0,f;f=a[e];e++){if(f.id==d)return a.splice(e,0,b),b;if(c&&f[c]&&(f=B(f[c],b,d,c,!0)))return f}if(g)return null}a.push(b);return b},y=function(a,b,d){for(var c=0,g;g=a[c];c++){if(g.id==b)return a.splice(c,1);if(d&&g[d]&&(g=y(g[d],b,d)))return g}return null},t=function(a,b){this.dialog=a;for(var c=b.contents,g=0,e;e=c[g];g++)c[g]=e&&new d(a,e);CKEDITOR.tools.extend(this,b)};t.prototype={getContents:function(a){return u(this.contents,
+a)},getButton:function(a){return u(this.buttons,a)},addContents:function(a,b){return B(this.contents,a,b)},addButton:function(a,b){return B(this.buttons,a,b)},removeContents:function(a){y(this.contents,a)},removeButton:function(a){y(this.buttons,a)}};d.prototype={get:function(a){return u(this.elements,a,"children")},add:function(a,b){return B(this.elements,a,b,"children")},remove:function(a){y(this.elements,a,"children")}};var x,F={},z,A={},C=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,d=
+a.data.$.altKey,c=a.data.$.shiftKey,g=String.fromCharCode(a.data.$.keyCode);(b=A[(b?"CTRL+":"")+(d?"ALT+":"")+(c?"SHIFT+":"")+g])&&b.length&&(b=b[b.length-1],b.keydown&&b.keydown.call(b.uiElement,b.dialog,b.key),a.data.preventDefault())},E=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,d=a.data.$.altKey,c=a.data.$.shiftKey,g=String.fromCharCode(a.data.$.keyCode);(b=A[(b?"CTRL+":"")+(d?"ALT+":"")+(c?"SHIFT+":"")+g])&&b.length&&(b=b[b.length-1],b.keyup&&(b.keyup.call(b.uiElement,b.dialog,b.key),
+a.data.preventDefault()))},D=function(a,b,d,c,g){(A[d]||(A[d]=[])).push({uiElement:a,dialog:b,key:d,keyup:g||a.accessKeyUp,keydown:c||a.accessKeyDown})},I=function(a){for(var b in A){for(var d=A[b],c=d.length-1;0<=c;c--)d[c].dialog!=a&&d[c].uiElement!=a||d.splice(c,1);0===d.length&&delete A[b]}},H=function(a,b){a._.accessKeyMap[b]&&a.selectPage(a._.accessKeyMap[b])},M=function(){};(function(){CKEDITOR.ui.dialog={uiElement:function(a,b,d,c,g,e,f){if(!(4>arguments.length)){var h=(c.call?c(b):c)||"div",
+k=["\x3c",h," "],n=(g&&g.call?g(b):g)||{},l=(e&&e.call?e(b):e)||{},p=(f&&f.call?f.call(this,a,b):f)||"",m=this.domId=l.id||CKEDITOR.tools.getNextId()+"_uiElement";b.requiredContent&&!a.getParentEditor().filter.check(b.requiredContent)&&(n.display="none",this.notAllowed=!0);l.id=m;var q={};b.type&&(q["cke_dialog_ui_"+b.type]=1);b.className&&(q[b.className]=1);b.disabled&&(q.cke_disabled=1);for(var u=l["class"]&&l["class"].split?l["class"].split(" "):[],m=0;m<u.length;m++)u[m]&&(q[u[m]]=1);u=[];for(m in q)u.push(m);
+l["class"]=u.join(" ");b.title&&(l.title=b.title);q=(b.style||"").split(";");b.align&&(u=b.align,n["margin-left"]="left"==u?0:"auto",n["margin-right"]="right"==u?0:"auto");for(m in n)q.push(m+":"+n[m]);b.hidden&&q.push("display:none");for(m=q.length-1;0<=m;m--)""===q[m]&&q.splice(m,1);0<q.length&&(l.style=(l.style?l.style+"; ":"")+q.join("; "));for(m in l)k.push(m+'\x3d"'+CKEDITOR.tools.htmlEncode(l[m])+'" ');k.push("\x3e",p,"\x3c/",h,"\x3e");d.push(k.join(""));(this._||(this._={})).dialog=a;"boolean"==
 typeof b.isChanged&&(this.isChanged=function(){return b.isChanged});"function"==typeof b.isChanged&&(this.isChanged=b.isChanged);"function"==typeof b.setValue&&(this.setValue=CKEDITOR.tools.override(this.setValue,function(a){return function(d){a.call(this,b.setValue.call(this,d))}}));"function"==typeof b.getValue&&(this.getValue=CKEDITOR.tools.override(this.getValue,function(a){return function(){return b.getValue.call(this,a.call(this))}}));CKEDITOR.event.implementOn(this);this.registerEvents(b);
-this.accessKeyUp&&this.accessKeyDown&&b.accessKey&&E(this,a,"CTRL+"+b.accessKey);var x=this;a.on("load",function(){var b=x.getInputElement();if(b){var d=x.type in{checkbox:1,ratio:1}&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?"cke_dialog_ui_focused":"";b.on("focus",function(){a._.tabBarMode=!1;a._.hasFocus=!0;x.fire("focus");d&&this.addClass(d)});b.on("blur",function(){x.fire("blur");d&&this.removeClass(d)})}});CKEDITOR.tools.extend(this,b);this.keyboardFocusable&&(this.tabIndex=b.tabIndex||0,this.focusIndex=
-a._.focusList.push(this)-1,this.on("focus",function(){a._.currentFocusIndex=x.focusIndex}))}},hbox:function(a,b,d,c,g){if(!(4>arguments.length)){this._||(this._={});var e=this._.children=b,h=g&&g.widths||null,f=g&&g.height||null,k,n={role:"presentation"};g&&g.align&&(n.align=g.align);CKEDITOR.ui.dialog.uiElement.call(this,a,g||{type:"hbox"},c,"table",{},n,function(){var a=['\x3ctbody\x3e\x3ctr class\x3d"cke_dialog_ui_hbox"\x3e'];for(k=0;k<d.length;k++){var b="cke_dialog_ui_hbox_child",c=[];0===k&&
-(b="cke_dialog_ui_hbox_first");k==d.length-1&&(b="cke_dialog_ui_hbox_last");a.push('\x3ctd class\x3d"',b,'" role\x3d"presentation" ');h?h[k]&&c.push("width:"+t(h[k])):c.push("width:"+Math.floor(100/d.length)+"%");f&&c.push("height:"+t(f));g&&void 0!==g.padding&&c.push("padding:"+t(g.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&e[k].align&&c.push("text-align:"+e[k].align);0<c.length&&a.push('style\x3d"'+c.join("; ")+'" ');a.push("\x3e",d[k],"\x3c/td\x3e")}a.push("\x3c/tr\x3e\x3c/tbody\x3e");return a.join("")})}},
-vbox:function(a,b,d,c,g){if(!(3>arguments.length)){this._||(this._={});var e=this._.children=b,h=g&&g.width||null,f=g&&g.heights||null;CKEDITOR.ui.dialog.uiElement.call(this,a,g||{type:"vbox"},c,"div",null,{role:"presentation"},function(){var b=['\x3ctable role\x3d"presentation" cellspacing\x3d"0" border\x3d"0" '];b.push('style\x3d"');g&&g.expand&&b.push("height:100%;");b.push("width:"+t(h||"100%"),";");CKEDITOR.env.webkit&&b.push("float:none;");b.push('"');b.push('align\x3d"',CKEDITOR.tools.htmlEncode(g&&
-g.align||("ltr"==a.getParentEditor().lang.dir?"left":"right")),'" ');b.push("\x3e\x3ctbody\x3e");for(var c=0;c<d.length;c++){var k=[];b.push('\x3ctr\x3e\x3ctd role\x3d"presentation" ');h&&k.push("width:"+t(h||"100%"));f?k.push("height:"+t(f[c])):g&&g.expand&&k.push("height:"+Math.floor(100/d.length)+"%");g&&void 0!==g.padding&&k.push("padding:"+t(g.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&e[c].align&&k.push("text-align:"+e[c].align);0<k.length&&b.push('style\x3d"',k.join("; "),'" ');b.push(' class\x3d"cke_dialog_ui_vbox_child"\x3e',
+this.accessKeyUp&&this.accessKeyDown&&b.accessKey&&D(this,a,"CTRL+"+b.accessKey);var w=this;a.on("load",function(){var b=w.getInputElement();if(b){var d=w.type in{checkbox:1,ratio:1}&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?"cke_dialog_ui_focused":"";b.on("focus",function(){a._.tabBarMode=!1;a._.hasFocus=!0;w.fire("focus");d&&this.addClass(d)});b.on("blur",function(){w.fire("blur");d&&this.removeClass(d)})}});CKEDITOR.tools.extend(this,b);this.keyboardFocusable&&(this.tabIndex=b.tabIndex||0,this.focusIndex=
+a._.focusList.push(this)-1,this.on("focus",function(){a._.currentFocusIndex=w.focusIndex}))}},hbox:function(a,b,d,c,g){if(!(4>arguments.length)){this._||(this._={});var e=this._.children=b,f=g&&g.widths||null,h=g&&g.height||null,k,l={role:"presentation"};g&&g.align&&(l.align=g.align);CKEDITOR.ui.dialog.uiElement.call(this,a,g||{type:"hbox"},c,"table",{},l,function(){var a=['\x3ctbody\x3e\x3ctr class\x3d"cke_dialog_ui_hbox"\x3e'];for(k=0;k<d.length;k++){var b="cke_dialog_ui_hbox_child",c=[];0===k&&
+(b="cke_dialog_ui_hbox_first");k==d.length-1&&(b="cke_dialog_ui_hbox_last");a.push('\x3ctd class\x3d"',b,'" role\x3d"presentation" ');f?f[k]&&c.push("width:"+w(f[k])):c.push("width:"+Math.floor(100/d.length)+"%");h&&c.push("height:"+w(h));g&&void 0!==g.padding&&c.push("padding:"+w(g.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&e[k].align&&c.push("text-align:"+e[k].align);0<c.length&&a.push('style\x3d"'+c.join("; ")+'" ');a.push("\x3e",d[k],"\x3c/td\x3e")}a.push("\x3c/tr\x3e\x3c/tbody\x3e");return a.join("")})}},
+vbox:function(a,b,d,c,g){if(!(3>arguments.length)){this._||(this._={});var e=this._.children=b,f=g&&g.width||null,h=g&&g.heights||null;CKEDITOR.ui.dialog.uiElement.call(this,a,g||{type:"vbox"},c,"div",null,{role:"presentation"},function(){var b=['\x3ctable role\x3d"presentation" cellspacing\x3d"0" border\x3d"0" '];b.push('style\x3d"');g&&g.expand&&b.push("height:100%;");b.push("width:"+w(f||"100%"),";");CKEDITOR.env.webkit&&b.push("float:none;");b.push('"');b.push('align\x3d"',CKEDITOR.tools.htmlEncode(g&&
+g.align||("ltr"==a.getParentEditor().lang.dir?"left":"right")),'" ');b.push("\x3e\x3ctbody\x3e");for(var c=0;c<d.length;c++){var k=[];b.push('\x3ctr\x3e\x3ctd role\x3d"presentation" ');f&&k.push("width:"+w(f||"100%"));h?k.push("height:"+w(h[c])):g&&g.expand&&k.push("height:"+Math.floor(100/d.length)+"%");g&&void 0!==g.padding&&k.push("padding:"+w(g.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&e[c].align&&k.push("text-align:"+e[c].align);0<k.length&&b.push('style\x3d"',k.join("; "),'" ');b.push(' class\x3d"cke_dialog_ui_vbox_child"\x3e',
 d[c],"\x3c/td\x3e\x3c/tr\x3e")}b.push("\x3c/tbody\x3e\x3c/table\x3e");return b.join("")})}}}})();CKEDITOR.ui.dialog.uiElement.prototype={getElement:function(){return CKEDITOR.document.getById(this.domId)},getInputElement:function(){return this.getElement()},getDialog:function(){return this._.dialog},setValue:function(a,b){this.getInputElement().setValue(a);!b&&this.fire("change",{value:a});return this},getValue:function(){return this.getInputElement().getValue()},isChanged:function(){return!1},selectParentTab:function(){for(var a=
 this.getInputElement();(a=a.getParent())&&-1==a.$.className.search("cke_dialog_page_contents"););if(!a)return this;a=a.getAttribute("name");this._.dialog._.currentTabId!=a&&this._.dialog.selectPage(a);return this},focus:function(){this.selectParentTab().getInputElement().focus();return this},registerEvents:function(a){var b=/^on([A-Z]\w+)/,d,c=function(a,b,d,c){b.on("load",function(){a.getInputElement().on(d,c,a)})},g;for(g in a)if(d=g.match(b))this.eventProcessors[g]?this.eventProcessors[g].call(this,
 this._.dialog,a[g]):c(this,this._.dialog,d[1].toLowerCase(),a[g]);return this},eventProcessors:{onLoad:function(a,b){a.on("load",b,this)},onShow:function(a,b){a.on("show",b,this)},onHide:function(a,b){a.on("hide",b,this)}},accessKeyDown:function(){this.focus()},accessKeyUp:function(){},disable:function(){var a=this.getElement();this.getInputElement().setAttribute("disabled","true");a.addClass("cke_disabled")},enable:function(){var a=this.getElement();this.getInputElement().removeAttribute("disabled");
 a.removeClass("cke_disabled")},isEnabled:function(){return!this.getElement().hasClass("cke_disabled")},isVisible:function(){return this.getInputElement().isVisible()},isFocusable:function(){return this.isEnabled()&&this.isVisible()?!0:!1}};CKEDITOR.ui.dialog.hbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getChild:function(a){if(1>arguments.length)return this._.children.concat();a.splice||(a=[a]);return 2>a.length?this._.children[a[0]]:this._.children[a[0]]&&this._.children[a[0]].getChild?
-this._.children[a[0]].getChild(a.slice(1,a.length)):null}},!0);CKEDITOR.ui.dialog.vbox.prototype=new CKEDITOR.ui.dialog.hbox;(function(){var a={build:function(a,b,d){for(var c=b.children,g,e=[],h=[],f=0;f<c.length&&(g=c[f]);f++){var k=[];e.push(k);h.push(CKEDITOR.dialog._.uiElementBuilders[g.type].build(a,g,k))}return new CKEDITOR.ui.dialog[b.type](a,h,e,d,b)}};CKEDITOR.dialog.addUIElement("hbox",a);CKEDITOR.dialog.addUIElement("vbox",a)})();CKEDITOR.dialogCommand=function(a,b){this.dialogName=a;
+this._.children[a[0]].getChild(a.slice(1,a.length)):null}},!0);CKEDITOR.ui.dialog.vbox.prototype=new CKEDITOR.ui.dialog.hbox;(function(){var a={build:function(a,b,d){for(var c=b.children,g,e=[],f=[],h=0;h<c.length&&(g=c[h]);h++){var k=[];e.push(k);f.push(CKEDITOR.dialog._.uiElementBuilders[g.type].build(a,g,k))}return new CKEDITOR.ui.dialog[b.type](a,f,e,d,b)}};CKEDITOR.dialog.addUIElement("hbox",a);CKEDITOR.dialog.addUIElement("vbox",a)})();CKEDITOR.dialogCommand=function(a,b){this.dialogName=a;
 CKEDITOR.tools.extend(this,b,!0)};CKEDITOR.dialogCommand.prototype={exec:function(a){a.openDialog(this.dialogName)},canUndo:!1,editorFocus:1};(function(){var a=/^([a]|[^a])+$/,b=/^\d*$/,d=/^\d*(?:\.\d+)?$/,c=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,g=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,e=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;CKEDITOR.VALIDATE_OR=1;CKEDITOR.VALIDATE_AND=2;CKEDITOR.dialog.validate={functions:function(){var a=arguments;return function(){var b=this&&this.getValue?this.getValue():
-a[0],d,c=CKEDITOR.VALIDATE_AND,g=[],e;for(e=0;e<a.length;e++)if("function"==typeof a[e])g.push(a[e]);else break;e<a.length&&"string"==typeof a[e]&&(d=a[e],e++);e<a.length&&"number"==typeof a[e]&&(c=a[e]);var h=c==CKEDITOR.VALIDATE_AND?!0:!1;for(e=0;e<g.length;e++)h=c==CKEDITOR.VALIDATE_AND?h&&g[e](b):h||g[e](b);return h?!0:d}},regex:function(a,b){return function(d){d=this&&this.getValue?this.getValue():d;return a.test(d)?!0:b}},notEmpty:function(b){return this.regex(a,b)},integer:function(a){return this.regex(b,
+a[0],d,c=CKEDITOR.VALIDATE_AND,g=[],e;for(e=0;e<a.length;e++)if("function"==typeof a[e])g.push(a[e]);else break;e<a.length&&"string"==typeof a[e]&&(d=a[e],e++);e<a.length&&"number"==typeof a[e]&&(c=a[e]);var f=c==CKEDITOR.VALIDATE_AND?!0:!1;for(e=0;e<g.length;e++)f=c==CKEDITOR.VALIDATE_AND?f&&g[e](b):f||g[e](b);return f?!0:d}},regex:function(a,b){return function(d){d=this&&this.getValue?this.getValue():d;return a.test(d)?!0:b}},notEmpty:function(b){return this.regex(a,b)},integer:function(a){return this.regex(b,
 a)},number:function(a){return this.regex(d,a)},cssLength:function(a){return this.functions(function(a){return g.test(CKEDITOR.tools.trim(a))},a)},htmlLength:function(a){return this.functions(function(a){return c.test(CKEDITOR.tools.trim(a))},a)},inlineStyle:function(a){return this.functions(function(a){return e.test(CKEDITOR.tools.trim(a))},a)},equals:function(a,b){return this.functions(function(b){return b==a},b)},notEqual:function(a,b){return this.functions(function(b){return b!=a},b)}};CKEDITOR.on("instanceDestroyed",
-function(a){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var b;b=CKEDITOR.dialog._.currentTop;)b.hide();for(var d in B)B[d].remove();B={}}a=a.editor._.storedDialogs;for(var c in a)a[c].destroy()})})();CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{openDialog:function(a,b){var d=null,c=CKEDITOR.dialog._.dialogDefinitions[a];null===CKEDITOR.dialog._.currentTop&&v(this);if("function"==typeof c)d=this._.storedDialogs||(this._.storedDialogs={}),d=d[a]||(d[a]=new CKEDITOR.dialog(this,a)),b&&b.call(d,
-d),d.show();else{if("failed"==c)throw u(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+a+'" failed when loading definition.');"string"==typeof c&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(c),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[a]&&(CKEDITOR.dialog._.dialogDefinitions[a]="failed");this.openDialog(a,b)},this,0,1)}CKEDITOR.skin.loadPart("dialog");return d}})}(),CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(a){a.on("doubleclick",function(f){f.data.dialog&&
-a.openDialog(f.data.dialog)},null,null,999)}}),CKEDITOR.plugins.add("about",{requires:"dialog",init:function(a){var f=a.addCommand("about",new CKEDITOR.dialogCommand("about"));f.modes={wysiwyg:1,source:1};f.canUndo=!1;f.readOnly=1;a.ui.addButton&&a.ui.addButton("About",{label:a.lang.about.title,command:"about",toolbar:"about"});CKEDITOR.dialog.add("about",this.path+"dialogs/about.js")}}),function(){CKEDITOR.plugins.add("a11yhelp",{requires:"dialog",availableLangs:{af:1,ar:1,bg:1,ca:1,cs:1,cy:1,da:1,
-de:1,"de-ch":1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,fr:1,"fr-ca":1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,nb:1,nl:1,no:1,pl:1,pt:1,"pt-br":1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,sr:1,"sr-latn":1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},init:function(a){var f=this;a.addCommand("a11yHelp",{exec:function(){var c=a.langCode,c=f.availableLangs[c]?c:f.availableLangs[c.replace(/-.*/,"")]?c.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(f.path+
-"dialogs/lang/"+c+".js"),function(){a.lang.a11yhelp=f.langEntries[c];a.openDialog("a11yHelp")})},modes:{wysiwyg:1,source:1},readOnly:1,canUndo:!1});a.setKeystroke(CKEDITOR.ALT+48,"a11yHelp");CKEDITOR.dialog.add("a11yHelp",this.path+"dialogs/a11yhelp.js");a.on("ariaEditorHelpLabel",function(c){c.data.label=a.lang.common.editorHelp})}})}(),CKEDITOR.plugins.add("basicstyles",{init:function(a){var f=0,c=function(c,h,b,d){if(d){d=new CKEDITOR.style(d);var g=e[b];g.unshift(d);a.attachStyleStateChange(d,
-function(d){!a.readOnly&&a.getCommand(b).setState(d)});a.addCommand(b,new CKEDITOR.styleCommand(d,{contentForms:g}));a.ui.addButton&&a.ui.addButton(c,{label:h,command:b,toolbar:"basicstyles,"+(f+=10)})}},e={bold:["strong","b",["span",function(a){a=a.styles["font-weight"];return"bold"==a||700<=+a}]],italic:["em","i",["span",function(a){return"italic"==a.styles["font-style"]}]],underline:["u",["span",function(a){return"underline"==a.styles["text-decoration"]}]],strike:["s","strike",["span",function(a){return"line-through"==
+function(a){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var b;b=CKEDITOR.dialog._.currentTop;)b.hide();for(var d in F)F[d].remove();F={}}a=a.editor._.storedDialogs;for(var c in a)a[c].destroy()})})();CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{openDialog:function(a,b){var d=null,c=CKEDITOR.dialog._.dialogDefinitions[a];null===CKEDITOR.dialog._.currentTop&&v(this);if("function"==typeof c)d=this._.storedDialogs||(this._.storedDialogs={}),d=d[a]||(d[a]=new CKEDITOR.dialog(this,a)),b&&b.call(d,
+d),d.show();else{if("failed"==c)throw r(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+a+'" failed when loading definition.');"string"==typeof c&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(c),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[a]&&(CKEDITOR.dialog._.dialogDefinitions[a]="failed");this.openDialog(a,b)},this,0,1)}CKEDITOR.skin.loadPart("dialog");return d}})}(),CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(a){a.on("doubleclick",function(e){e.data.dialog&&
+a.openDialog(e.data.dialog)},null,null,999)}}),CKEDITOR.plugins.add("about",{requires:"dialog",init:function(a){var e=a.addCommand("about",new CKEDITOR.dialogCommand("about"));e.modes={wysiwyg:1,source:1};e.canUndo=!1;e.readOnly=1;a.ui.addButton&&a.ui.addButton("About",{label:a.lang.about.title,command:"about",toolbar:"about"});CKEDITOR.dialog.add("about",this.path+"dialogs/about.js")}}),function(){CKEDITOR.plugins.add("a11yhelp",{requires:"dialog",availableLangs:{af:1,ar:1,az:1,bg:1,ca:1,cs:1,cy:1,
+da:1,de:1,"de-ch":1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,fr:1,"fr-ca":1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,nb:1,nl:1,no:1,oc:1,pl:1,pt:1,"pt-br":1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,sr:1,"sr-latn":1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},init:function(a){var e=this;a.addCommand("a11yHelp",{exec:function(){var c=a.langCode,c=e.availableLangs[c]?c:e.availableLangs[c.replace(/-.*/,"")]?c.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(e.path+
+"dialogs/lang/"+c+".js"),function(){a.lang.a11yhelp=e.langEntries[c];a.openDialog("a11yHelp")})},modes:{wysiwyg:1,source:1},readOnly:1,canUndo:!1});a.setKeystroke(CKEDITOR.ALT+48,"a11yHelp");CKEDITOR.dialog.add("a11yHelp",this.path+"dialogs/a11yhelp.js");a.on("ariaEditorHelpLabel",function(c){c.data.label=a.lang.common.editorHelp})}})}(),CKEDITOR.plugins.add("basicstyles",{init:function(a){var e=0,c=function(c,h,d,b){if(b){b=new CKEDITOR.style(b);var g=f[d];g.unshift(b);a.attachStyleStateChange(b,
+function(b){!a.readOnly&&a.getCommand(d).setState(b)});a.addCommand(d,new CKEDITOR.styleCommand(b,{contentForms:g}));a.ui.addButton&&a.ui.addButton(c,{label:h,command:d,toolbar:"basicstyles,"+(e+=10)})}},f={bold:["strong","b",["span",function(a){a=a.styles["font-weight"];return"bold"==a||700<=+a}]],italic:["em","i",["span",function(a){return"italic"==a.styles["font-style"]}]],underline:["u",["span",function(a){return"underline"==a.styles["text-decoration"]}]],strike:["s","strike",["span",function(a){return"line-through"==
 a.styles["text-decoration"]}]],subscript:["sub"],superscript:["sup"]},h=a.config,m=a.lang.basicstyles;c("Bold",m.bold,"bold",h.coreStyles_bold);c("Italic",m.italic,"italic",h.coreStyles_italic);c("Underline",m.underline,"underline",h.coreStyles_underline);c("Strike",m.strike,"strike",h.coreStyles_strike);c("Subscript",m.subscript,"subscript",h.coreStyles_subscript);c("Superscript",m.superscript,"superscript",h.coreStyles_superscript);a.setKeystroke([[CKEDITOR.CTRL+66,"bold"],[CKEDITOR.CTRL+73,"italic"],
-[CKEDITOR.CTRL+85,"underline"]])}}),CKEDITOR.config.coreStyles_bold={element:"strong",overrides:"b"},CKEDITOR.config.coreStyles_italic={element:"em",overrides:"i"},CKEDITOR.config.coreStyles_underline={element:"u"},CKEDITOR.config.coreStyles_strike={element:"s",overrides:"strike"},CKEDITOR.config.coreStyles_subscript={element:"sub"},CKEDITOR.config.coreStyles_superscript={element:"sup"},function(){var a={exec:function(a){var c=a.getCommand("blockquote").state,e=a.getSelection(),h=e&&e.getRanges()[0];
-if(h){var m=e.createBookmarks();if(CKEDITOR.env.ie){var l=m[0].startNode,k=m[0].endNode,b;if(l&&"blockquote"==l.getParent().getName())for(b=l;b=b.getNext();)if(b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()){l.move(b,!0);break}if(k&&"blockquote"==k.getParent().getName())for(b=k;b=b.getPrevious();)if(b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()){k.move(b);break}}var d=h.createIterator();d.enlargeBr=a.config.enterMode!=CKEDITOR.ENTER_BR;if(c==CKEDITOR.TRISTATE_OFF){for(l=[];c=d.getNextParagraph();)l.push(c);
-1>l.length&&(c=a.document.createElement(a.config.enterMode==CKEDITOR.ENTER_P?"p":"div"),k=m.shift(),h.insertNode(c),c.append(new CKEDITOR.dom.text("",a.document)),h.moveToBookmark(k),h.selectNodeContents(c),h.collapse(!0),k=h.createBookmark(),l.push(c),m.unshift(k));b=l[0].getParent();h=[];for(k=0;k<l.length;k++)c=l[k],b=b.getCommonAncestor(c.getParent());for(c={table:1,tbody:1,tr:1,ol:1,ul:1};c[b.getName()];)b=b.getParent();for(k=null;0<l.length;){for(c=l.shift();!c.getParent().equals(b);)c=c.getParent();
-c.equals(k)||h.push(c);k=c}for(;0<h.length;)if(c=h.shift(),"blockquote"==c.getName()){for(k=new CKEDITOR.dom.documentFragment(a.document);c.getFirst();)k.append(c.getFirst().remove()),l.push(k.getLast());k.replace(c)}else l.push(c);h=a.document.createElement("blockquote");for(h.insertBefore(l[0]);0<l.length;)c=l.shift(),h.append(c)}else if(c==CKEDITOR.TRISTATE_ON){k=[];for(b={};c=d.getNextParagraph();){for(l=h=null;c.getParent();){if("blockquote"==c.getParent().getName()){h=c.getParent();l=c;break}c=
-c.getParent()}h&&l&&!l.getCustomData("blockquote_moveout")&&(k.push(l),CKEDITOR.dom.element.setMarker(b,l,"blockquote_moveout",!0))}CKEDITOR.dom.element.clearAllMarkers(b);c=[];l=[];for(b={};0<k.length;)d=k.shift(),h=d.getParent(),d.getPrevious()?d.getNext()?(d.breakParent(d.getParent()),l.push(d.getNext())):d.remove().insertAfter(h):d.remove().insertBefore(h),h.getCustomData("blockquote_processed")||(l.push(h),CKEDITOR.dom.element.setMarker(b,h,"blockquote_processed",!0)),c.push(d);CKEDITOR.dom.element.clearAllMarkers(b);
-for(k=l.length-1;0<=k;k--){h=l[k];a:{b=h;for(var d=0,g=b.getChildCount(),p=void 0;d<g&&(p=b.getChild(d));d++)if(p.type==CKEDITOR.NODE_ELEMENT&&p.isBlockBoundary()){b=!1;break a}b=!0}b&&h.remove()}if(a.config.enterMode==CKEDITOR.ENTER_BR)for(h=!0;c.length;)if(d=c.shift(),"div"==d.getName()){k=new CKEDITOR.dom.documentFragment(a.document);!h||!d.getPrevious()||d.getPrevious().type==CKEDITOR.NODE_ELEMENT&&d.getPrevious().isBlockBoundary()||k.append(a.document.createElement("br"));for(h=d.getNext()&&
-!(d.getNext().type==CKEDITOR.NODE_ELEMENT&&d.getNext().isBlockBoundary());d.getFirst();)d.getFirst().remove().appendTo(k);h&&k.append(a.document.createElement("br"));k.replace(d);h=!1}}e.selectBookmarks(m);a.focus()}},refresh:function(a,c){this.setState(a.elementPath(c.block||c.blockLimit).contains("blockquote",1)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)},context:"blockquote",allowedContent:"blockquote",requiredContent:"blockquote"};CKEDITOR.plugins.add("blockquote",{init:function(f){f.blockless||
-(f.addCommand("blockquote",a),f.ui.addButton&&f.ui.addButton("Blockquote",{label:f.lang.blockquote.toolbar,command:"blockquote",toolbar:"blocks,10"}))}})}(),"use strict",function(){function a(a,b,d){b.type||(b.type="auto");if(d&&!1===a.fire("beforePaste",b)||!b.dataValue&&b.dataTransfer.isEmpty())return!1;b.dataValue||(b.dataValue="");if(CKEDITOR.env.gecko&&"drop"==b.method&&a.toolbox)a.once("afterPaste",function(){a.toolbox.focus()});return a.fire("paste",b)}function f(b){function d(){var a=b.editable();
-if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var c=function(a){b.readOnly&&"cut"==a.name||y.initPasteDataTransfer(a,b);a.data.preventDefault()};a.on("copy",c);a.on("cut",c);a.on("cut",function(){b.readOnly||b.extractSelectedHtml()},null,null,999)}a.on(y.mainPasteEvent,function(a){"beforepaste"==y.mainPasteEvent&&D||w(a)});"beforepaste"==y.mainPasteEvent&&(a.on("paste",function(a){F||(h(),a.data.preventDefault(),w(a),k("paste")||b.openDialog("paste"))}),a.on("contextmenu",f,null,null,0),
-a.on("beforepaste",function(a){!a.data||a.data.$.ctrlKey||a.data.$.shiftKey||f()},null,null,0));a.on("beforecut",function(){!D&&l(b)});var e;a.attachListener(CKEDITOR.env.ie?a:b.document.getDocumentElement(),"mouseup",function(){e=setTimeout(function(){B()},0)});b.on("destroy",function(){clearTimeout(e)});a.on("keyup",B)}function c(a){return{type:a,canUndo:"cut"==a,startDisabled:!0,exec:function(){"cut"==this.type&&l();var a;var d=this.type;if(CKEDITOR.env.ie)a=k(d);else try{a=b.document.$.execCommand(d,
-!1,null)}catch(c){a=!1}a||b.showNotification(b.lang.clipboard[this.type+"Error"]);return a}}}function e(){return{canUndo:!1,async:!0,exec:function(b,d){var c=this,g=function(d,g){d&&a(b,d,!!g);b.fire("afterCommandExec",{name:"paste",command:c,returnValue:!!d})};"string"==typeof d?g({dataValue:d,method:"paste",dataTransfer:y.initPasteDataTransfer()},1):b.getClipboardData(g)}}}function h(){F=1;setTimeout(function(){F=0},100)}function f(){D=1;setTimeout(function(){D=0},10)}function k(a){var d=b.document,
-c=d.getBody(),e=!1,h=function(){e=!0};c.on(a,h);7<CKEDITOR.env.version?d.$.execCommand(a):d.$.selection.createRange().execCommand(a);c.removeListener(a,h);return e}function l(){if(CKEDITOR.env.ie&&!CKEDITOR.env.quirks){var a=b.getSelection(),d,c,e;a.getType()==CKEDITOR.SELECTION_ELEMENT&&(d=a.getSelectedElement())&&(c=a.getRanges()[0],e=b.document.createText(""),e.insertBefore(d),c.setStartBefore(e),c.setEndAfter(d),a.selectRanges([c]),setTimeout(function(){d.getParent()&&(e.remove(),a.selectElement(d))},
-0))}}function m(a,d){var c=b.document,e=b.editable(),h=function(a){a.cancel()},f;if(!c.getById("cke_pastebin")){var k=b.getSelection(),n=k.createBookmarks();CKEDITOR.env.ie&&k.root.fire("selectionchange");var l=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!e.is("body")||CKEDITOR.env.ie?"div":"body",c);l.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var p=0,c=c.getWindow();CKEDITOR.env.webkit?(e.append(l),l.addClass("cke_editable"),e.is("body")||(p="static"!=e.getComputedStyle("position")?
-e:CKEDITOR.dom.element.get(e.$.offsetParent),p=p.getDocumentPosition().y)):e.getAscendant(CKEDITOR.env.ie?"body":"html",1).append(l);l.setStyles({position:"absolute",top:c.getScrollPosition().y-p+10+"px",width:"1px",height:Math.max(1,c.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0});CKEDITOR.env.safari&&l.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text"));(p=l.getParent().isReadOnly())?(l.setOpacity(0),l.setAttribute("contenteditable",!0)):l.setStyle("ltr"==b.config.contentsLangDirection?
-"left":"right","-10000px");b.on("selectionChange",h,null,null,0);if(CKEDITOR.env.webkit||CKEDITOR.env.gecko)f=e.once("blur",h,null,null,-100);p&&l.focus();p=new CKEDITOR.dom.range(l);p.selectNodeContents(l);var q=p.select();CKEDITOR.env.ie&&(f=e.once("blur",function(){b.lockSelection(q)}));var t=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=t);f&&f.removeListener();CKEDITOR.env.ie&&e.focus();k.selectBookmarks(n);
-l.remove();var a;CKEDITOR.env.webkit&&(a=l.getFirst())&&a.is&&a.hasClass("Apple-style-span")&&(l=a);b.removeListener("selectionChange",h);d(l.getHtml())},0)}}function C(){if("paste"==y.mainPasteEvent)return b.fire("beforePaste",{type:"auto",method:"paste"}),!1;b.focus();h();var a=b.focusManager;a.lock();if(b.editable().fire(y.mainPasteEvent)&&!k("paste"))return a.unlock(),!1;a.unlock();return!0}function r(a){if("wysiwyg"==b.mode)switch(a.data.keyCode){case CKEDITOR.CTRL+86:case CKEDITOR.SHIFT+45:a=
-b.editable();h();"paste"==y.mainPasteEvent&&a.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+46:b.fire("saveSnapshot"),setTimeout(function(){b.fire("saveSnapshot")},50)}}function w(d){var c={type:"auto",method:"paste",dataTransfer:y.initPasteDataTransfer(d)};c.dataTransfer.cacheData();var e=!1!==b.fire("beforePaste",c);e&&y.canClipboardApiBeTrusted(c.dataTransfer,b)?(d.data.preventDefault(),setTimeout(function(){a(b,c)},0)):m(d,function(d){c.dataValue=d.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,
-"");e&&a(b,c)})}function B(){if("wysiwyg"==b.mode){var a=z("paste");b.getCommand("cut").setState(z("cut"));b.getCommand("copy").setState(z("copy"));b.getCommand("paste").setState(a);b.fire("pasteState",a)}}function z(a){if(E&&a in{paste:1,cut:1})return CKEDITOR.TRISTATE_DISABLED;if("paste"==a)return CKEDITOR.TRISTATE_OFF;a=b.getSelection();var d=a.getRanges();return a.getType()==CKEDITOR.SELECTION_NONE||1==d.length&&d[0].collapsed?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_OFF}var y=CKEDITOR.plugins.clipboard,
-D=0,F=0,E=0;(function(){b.on("key",r);b.on("contentDom",d);b.on("selectionChange",function(a){E=a.data.selection.getRanges()[0].checkReadOnly();B()});b.contextMenu&&b.contextMenu.addListener(function(a,b){E=b.getRanges()[0].checkReadOnly();return{cut:z("cut"),copy:z("copy"),paste:z("paste")}})})();(function(){function a(d,c,e,h,f){var k=b.lang.clipboard[c];b.addCommand(c,e);b.ui.addButton&&b.ui.addButton(d,{label:k,command:c,toolbar:"clipboard,"+h});b.addMenuItems&&b.addMenuItem(c,{label:k,command:c,
-group:"clipboard",order:f})}a("Cut","cut",c("cut"),10,1);a("Copy","copy",c("copy"),20,4);a("Paste","paste",e(),30,8)})();b.getClipboardData=function(a,d){function c(a){a.removeListener();a.cancel();d(a.data)}function e(a){a.removeListener();a.cancel();n=!0;d({type:k,dataValue:a.data.dataValue,dataTransfer:a.data.dataTransfer,method:"paste"})}function h(){this.customTitle=a&&a.title}var f=!1,k="auto",n=!1;d||(d=a,a=null);b.on("paste",c,null,null,0);b.on("beforePaste",function(a){a.removeListener();
-f=!0;k=a.data.type},null,null,1E3);!1===C()&&(b.removeListener("paste",c),f&&b.fire("pasteDialog",h)?(b.on("pasteDialogCommit",e),b.on("dialogHide",function(a){a.removeListener();a.data.removeListener("pasteDialogCommit",e);setTimeout(function(){n||d(null)},10)})):d(null))}}function c(a){if(CKEDITOR.env.webkit){if(!a.match(/^[^<]*$/g)&&!a.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi)&&!a.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else if(CKEDITOR.env.gecko){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}else return"html";
-return"htmlifiedtext"}function e(a,b){function d(a){return CKEDITOR.tools.repeat("\x3c/p\x3e\x3cp\x3e",~~(a/2))+(1==a%2?"\x3cbr\x3e":"")}b=b.replace(/\s+/g," ").replace(/> +</g,"\x3e\x3c").replace(/<br ?\/>/gi,"\x3cbr\x3e");b=b.replace(/<\/?[A-Z]+>/g,function(a){return a.toLowerCase()});if(b.match(/^[^<]$/))return b;CKEDITOR.env.webkit&&-1<b.indexOf("\x3cdiv\x3e")&&(b=b.replace(/^(<div>(<br>|)<\/div>)(?!$|(<div>(<br>|)<\/div>))/g,"\x3cbr\x3e").replace(/^(<div>(<br>|)<\/div>){2}(?!$)/g,"\x3cdiv\x3e\x3c/div\x3e"),
-b.match(/<div>(<br>|)<\/div>/)&&(b="\x3cp\x3e"+b.replace(/(<div>(<br>|)<\/div>)+/g,function(a){return d(a.split("\x3c/div\x3e\x3cdiv\x3e").length+1)})+"\x3c/p\x3e"),b=b.replace(/<\/div><div>/g,"\x3cbr\x3e"),b=b.replace(/<\/?div>/g,""));CKEDITOR.env.gecko&&a.enterMode!=CKEDITOR.ENTER_BR&&(CKEDITOR.env.gecko&&(b=b.replace(/^<br><br>$/,"\x3cbr\x3e")),-1<b.indexOf("\x3cbr\x3e\x3cbr\x3e")&&(b="\x3cp\x3e"+b.replace(/(<br>){2,}/g,function(a){return d(a.length/4)})+"\x3c/p\x3e"));return l(a,b)}function h(){function a(){var b=
-{},d;for(d in CKEDITOR.dtd)"$"!=d.charAt(0)&&"div"!=d&&"span"!=d&&(b[d]=1);return b}var b={};return{get:function(d){return"plain-text"==d?b.plainText||(b.plainText=new CKEDITOR.filter("br")):"semantic-content"==d?((d=b.semanticContent)||(d=new CKEDITOR.filter,d.allow({$1:{elements:a(),attributes:!0,styles:!1,classes:!1}}),d=b.semanticContent=d),d):d?new CKEDITOR.filter(d):null}}}function m(a,b,d){b=CKEDITOR.htmlParser.fragment.fromHtml(b);var c=new CKEDITOR.htmlParser.basicWriter;d.applyTo(b,!0,!1,
-a.activeEnterMode);b.writeHtml(c);return c.getHtml()}function l(a,b){a.enterMode==CKEDITOR.ENTER_BR?b=b.replace(/(<\/p><p>)+/g,function(a){return CKEDITOR.tools.repeat("\x3cbr\x3e",a.length/7*2)}).replace(/<\/?p>/g,""):a.enterMode==CKEDITOR.ENTER_DIV&&(b=b.replace(/<(\/)?p>/g,"\x3c$1div\x3e"));return b}function k(a){a.data.preventDefault();a.data.$.dataTransfer.dropEffect="none"}function b(b){var d=CKEDITOR.plugins.clipboard;b.on("contentDom",function(){function c(d,e,h){e.select();a(b,{dataTransfer:h,
-method:"drop"},1);h.sourceEditor.fire("saveSnapshot");h.sourceEditor.editable().extractHtmlFromRange(d);h.sourceEditor.getSelection().selectRanges([d]);h.sourceEditor.fire("saveSnapshot")}function e(c,h){c.select();a(b,{dataTransfer:h,method:"drop"},1);d.resetDragDataTransfer()}function h(a,d,c){var e={$:a.data.$,target:a.data.getTarget()};d&&(e.dragRange=d);c&&(e.dropRange=c);!1===b.fire(a.name,e)&&a.data.preventDefault()}function f(a){a.type!=CKEDITOR.NODE_ELEMENT&&(a=a.getParent());return a.getChildCount()}
-var k=b.editable(),l=CKEDITOR.plugins.clipboard.getDropTarget(b),m=b.ui.space("top"),C=b.ui.space("bottom");d.preventDefaultDropOnElement(m);d.preventDefaultDropOnElement(C);k.attachListener(l,"dragstart",h);k.attachListener(b,"dragstart",d.resetDragDataTransfer,d,null,1);k.attachListener(b,"dragstart",function(a){d.initDragDataTransfer(a,b)},null,null,2);k.attachListener(b,"dragstart",function(){var a=d.dragRange=b.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(d.dragStartContainerChildCount=
-a?f(a.startContainer):null,d.dragEndContainerChildCount=a?f(a.endContainer):null)},null,null,100);k.attachListener(l,"dragend",h);k.attachListener(b,"dragend",d.initDragDataTransfer,d,null,1);k.attachListener(b,"dragend",d.resetDragDataTransfer,d,null,100);k.attachListener(l,"dragover",function(a){var b=a.data.getTarget();b&&b.is&&b.is("html")?a.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&a.data.$.dataTransfer.types.contains("Files")&&a.data.preventDefault()});
-k.attachListener(l,"drop",function(a){if(!a.data.$.defaultPrevented){a.data.preventDefault();var c=a.data.getTarget();if(!c.isReadOnly()||c.type==CKEDITOR.NODE_ELEMENT&&c.is("html")){var c=d.getRangeAtDropPosition(a,b),e=d.dragRange;c&&h(a,e,c)}}},null,null,9999);k.attachListener(b,"drop",d.initDragDataTransfer,d,null,1);k.attachListener(b,"drop",function(a){if(a=a.data){var h=a.dropRange,f=a.dragRange,k=a.dataTransfer;k.getTransferType(b)==CKEDITOR.DATA_TRANSFER_INTERNAL?setTimeout(function(){d.internalDrop(f,
-h,k,b)},0):k.getTransferType(b)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c(f,h,k):e(h,k)}},null,null,9999)})}CKEDITOR.plugins.add("clipboard",{requires:"dialog",init:function(a){var d,k=h();a.config.forcePasteAsPlainText?d="plain-text":a.config.pasteFilter?d=a.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in a.config||(d="semantic-content");a.pasteFilter=k.get(d);f(a);b(a);CKEDITOR.dialog.add("paste",CKEDITOR.getUrl(this.path+"dialogs/paste.js"));a.on("paste",function(b){b.data.dataTransfer||
-(b.data.dataTransfer=new CKEDITOR.plugins.clipboard.dataTransfer);if(!b.data.dataValue){var d=b.data.dataTransfer,c=d.getData("text/html");if(c)b.data.dataValue=c,b.data.type="html";else if(c=d.getData("text/plain"))b.data.dataValue=a.editable().transformPlainTextToHtml(c),b.data.type="text"}},null,null,1);a.on("paste",function(a){var b=a.data.dataValue,d=CKEDITOR.dtd.$block;-1<b.indexOf("Apple-")&&(b=b.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi," "),"html"!=a.data.type&&(b=b.replace(/<span class="Apple-tab-span"[^>]*>([^<]*)<\/span>/gi,
-function(a,b){return b.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;")})),-1<b.indexOf('\x3cbr class\x3d"Apple-interchange-newline"\x3e')&&(a.data.startsWithEOL=1,a.data.preSniffing="html",b=b.replace(/<br class="Apple-interchange-newline">/,"")),b=b.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1"));if(b.match(/^<[^<]+cke_(editable|contents)/i)){var c,g,e=new CKEDITOR.dom.element("div");for(e.setHtml(b);1==e.getChildCount()&&(c=e.getFirst())&&c.type==CKEDITOR.NODE_ELEMENT&&(c.hasClass("cke_editable")||
-c.hasClass("cke_contents"));)e=g=c;g&&(b=g.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?b=b.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(b,c){return c.toLowerCase()in d?(a.data.preSniffing="html","\x3c"+c):b}):CKEDITOR.env.webkit?b=b.replace(/<\/(\w+)><div><br><\/div>$/,function(b,c){return c in d?(a.data.endsWithEOL=1,"\x3c/"+c+"\x3e"):b}):CKEDITOR.env.gecko&&(b=b.replace(/(\s)<br>$/,"$1"));a.data.dataValue=b},null,null,3);a.on("paste",function(b){b=b.data;var d=b.type,h=b.dataValue,f,l=a.config.clipboard_defaultContentType||
-"html",p=b.dataTransfer.getTransferType(a);f="html"==d||"html"==b.preSniffing?"html":c(h);"htmlifiedtext"==f&&(h=e(a.config,h));"text"==d&&"html"==f?h=m(a,h,k.get("plain-text")):p==CKEDITOR.DATA_TRANSFER_EXTERNAL&&a.pasteFilter&&!b.dontFilter&&(h=m(a,h,a.pasteFilter));b.startsWithEOL&&(h='\x3cbr data-cke-eol\x3d"1"\x3e'+h);b.endsWithEOL&&(h+='\x3cbr data-cke-eol\x3d"1"\x3e');"auto"==d&&(d="html"==f||"html"==l?"html":"text");b.type=d;b.dataValue=h;delete b.preSniffing;delete b.startsWithEOL;delete b.endsWithEOL},
-null,null,6);a.on("paste",function(b){b=b.data;b.dataValue&&(a.insertHtml(b.dataValue,b.type,b.range),setTimeout(function(){a.fire("afterPaste")},0))},null,null,1E3);a.on("pasteDialog",function(b){setTimeout(function(){a.openDialog("paste",b.data)},0)})}});CKEDITOR.plugins.clipboard={isCustomCopyCutSupported:!CKEDITOR.env.ie&&!CKEDITOR.env.iOS,isCustomDataTypesSupported:!CKEDITOR.env.ie,isFileApiSupported:!CKEDITOR.env.ie||9<CKEDITOR.env.version,mainPasteEvent:CKEDITOR.env.ie&&!CKEDITOR.env.edge?
-"beforepaste":"paste",canClipboardApiBeTrusted:function(a,b){return a.getTransferType(b)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||CKEDITOR.env.chrome&&!a.isEmpty()||CKEDITOR.env.gecko&&(a.getData("text/html")||a.getFilesCount())?!0:!1},getDropTarget:function(a){var b=a.editable();return CKEDITOR.env.ie&&9>CKEDITOR.env.version||b.isInline()?b:a.document},fixSplitNodesAfterDrop:function(a,b,d,c){function e(a,d,c){var g=a;g.type==CKEDITOR.NODE_TEXT&&(g=a.getParent());if(g.equals(d)&&c!=d.getChildCount())return a=
-b.startContainer.getChild(b.startOffset-1),d=b.startContainer.getChild(b.startOffset),a&&a.type==CKEDITOR.NODE_TEXT&&d&&d.type==CKEDITOR.NODE_TEXT&&(c=a.getLength(),a.setText(a.getText()+d.getText()),d.remove(),b.setStart(a,c),b.collapse(!0)),!0}var h=b.startContainer;"number"==typeof c&&"number"==typeof d&&h.type==CKEDITOR.NODE_ELEMENT&&(e(a.startContainer,h,d)||e(a.endContainer,h,c))},isDropRangeAffectedByDragRange:function(a,b){var d=b.startContainer,c=b.endOffset;return a.endContainer.equals(d)&&
-a.endOffset<=c||a.startContainer.getParent().equals(d)&&a.startContainer.getIndex()<c||a.endContainer.getParent().equals(d)&&a.endContainer.getIndex()<c?!0:!1},internalDrop:function(b,d,c,e){var h=CKEDITOR.plugins.clipboard,f=e.editable(),k,l;e.fire("saveSnapshot");e.fire("lockSnapshot",{dontUpdate:1});CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(b,d,h.dragStartContainerChildCount,h.dragEndContainerChildCount);(l=this.isDropRangeAffectedByDragRange(b,d))||(k=b.createBookmark(!1));
-h=d.clone().createBookmark(!1);l&&(k=b.createBookmark(!1));b=k.startNode;d=k.endNode;l=h.startNode;d&&b.getPosition(l)&CKEDITOR.POSITION_PRECEDING&&d.getPosition(l)&CKEDITOR.POSITION_FOLLOWING&&l.insertBefore(b);b=e.createRange();b.moveToBookmark(k);f.extractHtmlFromRange(b,1);d=e.createRange();d.moveToBookmark(h);a(e,{dataTransfer:c,method:"drop",range:d},1);e.fire("unlockSnapshot")},getRangeAtDropPosition:function(a,b){var d=a.data.$,c=d.clientX,e=d.clientY,h=b.getSelection(!0).getRanges()[0],f=
-b.createRange();if(a.data.testRange)return a.data.testRange;if(document.caretRangeFromPoint)d=b.document.$.caretRangeFromPoint(c,e),f.setStart(CKEDITOR.dom.node(d.startContainer),d.startOffset),f.collapse(!0);else if(d.rangeParent)f.setStart(CKEDITOR.dom.node(d.rangeParent),d.rangeOffset),f.collapse(!0);else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&h&&b.editable().hasFocus)return h;if(document.body.createTextRange){b.focus();d=b.document.getBody().$.createTextRange();try{for(var k=!1,l=0;20>l&&
-!k;l++){if(!k)try{d.moveToPoint(c,e-l),k=!0}catch(m){}if(!k)try{d.moveToPoint(c,e+l),k=!0}catch(r){}}if(k){var w="cke-temp-"+(new Date).getTime();d.pasteHTML('\x3cspan id\x3d"'+w+'"\x3e​\x3c/span\x3e');var B=b.document.getById(w);f.moveToPosition(B,CKEDITOR.POSITION_BEFORE_START);B.remove()}else{var z=b.document.$.elementFromPoint(c,e),y=new CKEDITOR.dom.element(z),D;if(y.equals(b.editable())||"html"==y.getName())return h&&h.startContainer&&!h.startContainer.equals(b.editable())?h:null;D=y.getClientRect();
-c<D.left?f.setStartAt(y,CKEDITOR.POSITION_AFTER_START):f.setStartAt(y,CKEDITOR.POSITION_BEFORE_END);f.collapse(!0)}}catch(F){return null}}else return null}return f},initDragDataTransfer:function(a,b){var d=a.data.$?a.data.$.dataTransfer:null,c=new this.dataTransfer(d,b);d?this.dragData&&c.id==this.dragData.id?c=this.dragData:this.dragData=c:this.dragData?c=this.dragData:this.dragData=c;a.data.dataTransfer=c},resetDragDataTransfer:function(){this.dragData=null},initPasteDataTransfer:function(a,b){if(this.isCustomCopyCutSupported){if(a&&
-a.data&&a.data.$){var d=new this.dataTransfer(a.data.$.clipboardData,b);this.copyCutData&&d.id==this.copyCutData.id?(d=this.copyCutData,d.$=a.data.$.clipboardData):this.copyCutData=d;return d}return new this.dataTransfer(null,b)}return new this.dataTransfer(CKEDITOR.env.edge&&a&&a.data.$&&a.data.$.clipboardData||null,b)},preventDefaultDropOnElement:function(a){a&&a.on("dragover",k)}};var d=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?"cke/id":"Text";CKEDITOR.plugins.clipboard.dataTransfer=
-function(a,b){a&&(this.$=a);this._={metaRegExp:/^<meta.*?>/i,bodyRegExp:/<body(?:[\s\S]*?)>([\s\S]*)<\/body>/i,fragmentRegExp:/\x3c!--(?:Start|End)Fragment--\x3e/g,data:{},files:[],normalizeType:function(a){a=a.toLowerCase();return"text"==a||"text/plain"==a?"Text":"url"==a?"URL":a}};this.id=this.getData(d);this.id||(this.id="Text"==d?"":"cke-"+CKEDITOR.tools.getUniqueId());if("Text"!=d)try{this.$.setData(d,this.id)}catch(c){}b&&(this.sourceEditor=b,this.setData("text/html",b.getSelectedHtml(1)),"Text"==
-d||this.getData("text/plain")||this.setData("text/plain",b.getSelection().getSelectedText()))};CKEDITOR.DATA_TRANSFER_INTERNAL=1;CKEDITOR.DATA_TRANSFER_CROSS_EDITORS=2;CKEDITOR.DATA_TRANSFER_EXTERNAL=3;CKEDITOR.plugins.clipboard.dataTransfer.prototype={getData:function(a){a=this._.normalizeType(a);var b=this._.data[a];if(void 0===b||null===b||""===b)try{b=this.$.getData(a)}catch(d){}if(void 0===b||null===b||""===b)b="";"text/html"==a?(b=b.replace(this._.metaRegExp,""),(a=this._.bodyRegExp.exec(b))&&
-a.length&&(b=a[1],b=b.replace(this._.fragmentRegExp,""))):"Text"==a&&CKEDITOR.env.gecko&&this.getFilesCount()&&"file://"==b.substring(0,7)&&(b="");return b},setData:function(a,b){a=this._.normalizeType(a);this._.data[a]=b;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||"URL"==a||"Text"==a){"Text"==d&&"Text"==a&&(this.id=b);try{this.$.setData(a,b)}catch(c){}}},getTransferType:function(a){return this.sourceEditor?this.sourceEditor==a?CKEDITOR.DATA_TRANSFER_INTERNAL:CKEDITOR.DATA_TRANSFER_CROSS_EDITORS:
-CKEDITOR.DATA_TRANSFER_EXTERNAL},cacheData:function(){function a(d){d=b._.normalizeType(d);var c=b.getData(d);c&&(b._.data[d]=c)}if(this.$){var b=this,d,c;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(d=0;d<this.$.types.length;d++)a(this.$.types[d])}else a("Text"),a("URL");c=this._getImageFromClipboard();if(this.$&&this.$.files||c){this._.files=[];if(this.$.files&&this.$.files.length)for(d=0;d<this.$.files.length;d++)this._.files.push(this.$.files[d]);0===this._.files.length&&
-c&&this._.files.push(c)}}},getFilesCount:function(){return this._.files.length?this._.files.length:this.$&&this.$.files&&this.$.files.length?this.$.files.length:this._getImageFromClipboard()?1:0},getFile:function(a){return this._.files.length?this._.files[a]:this.$&&this.$.files&&this.$.files.length?this.$.files[a]:0===a?this._getImageFromClipboard():void 0},isEmpty:function(){var a={},b;if(this.getFilesCount())return!1;for(b in this._.data)a[b]=1;if(this.$)if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(var c=
-0;c<this.$.types.length;c++)a[this.$.types[c]]=1}else a.Text=1,a.URL=1;"Text"!=d&&(a[d]=0);for(b in a)if(a[b]&&""!==this.getData(b))return!1;return!0},_getImageFromClipboard:function(){var a;if(this.$&&this.$.items&&this.$.items[0])try{if((a=this.$.items[0].getAsFile())&&a.type)return a}catch(b){}}}}(),function(){CKEDITOR.plugins.add("panel",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_PANEL,CKEDITOR.ui.panel.handler)}});CKEDITOR.UI_PANEL="panel";CKEDITOR.ui.panel=function(a,c){c&&CKEDITOR.tools.extend(this,
-c);CKEDITOR.tools.extend(this,{className:"",css:[]});this.id=CKEDITOR.tools.getNextId();this.document=a;this.isFramed=this.forceIFrame||this.css.length;this._={blocks:{}}};CKEDITOR.ui.panel.handler={create:function(a){return new CKEDITOR.ui.panel(a)}};var a=CKEDITOR.addTemplate("panel",'\x3cdiv lang\x3d"{langCode}" id\x3d"{id}" dir\x3d{dir} class\x3d"cke cke_reset_all {editorId} cke_panel cke_panel {cls} cke_{dir}" style\x3d"z-index:{z-index}" role\x3d"presentation"\x3e{frame}\x3c/div\x3e'),f=CKEDITOR.addTemplate("panel-frame",
-'\x3ciframe id\x3d"{id}" class\x3d"cke_panel_frame" role\x3d"presentation" frameborder\x3d"0" src\x3d"{src}"\x3e\x3c/iframe\x3e'),c=CKEDITOR.addTemplate("panel-frame-inner",'\x3c!DOCTYPE html\x3e\x3chtml class\x3d"cke_panel_container {env}" dir\x3d"{dir}" lang\x3d"{langCode}"\x3e\x3chead\x3e{css}\x3c/head\x3e\x3cbody class\x3d"cke_{dir}" style\x3d"margin:0;padding:0" onload\x3d"{onload}"\x3e\x3c/body\x3e\x3c/html\x3e');CKEDITOR.ui.panel.prototype={render:function(e,h){this.getHolderElement=function(){var a=
-this._.holder;if(!a){if(this.isFramed){var a=this.document.getById(this.id+"_frame"),b=a.getParent(),a=a.getFrameDocument();CKEDITOR.env.iOS&&b.setStyles({overflow:"scroll","-webkit-overflow-scrolling":"touch"});b=CKEDITOR.tools.addFunction(CKEDITOR.tools.bind(function(){this.isLoaded=!0;if(this.onLoad)this.onLoad()},this));a.write(c.output(CKEDITOR.tools.extend({css:CKEDITOR.tools.buildStyleHtml(this.css),onload:"window.parent.CKEDITOR.tools.callFunction("+b+");"},m)));a.getWindow().$.CKEDITOR=CKEDITOR;
-a.on("keydown",function(a){var b=a.data.getKeystroke(),c=this.document.getById(this.id).getAttribute("dir");this._.onKeyDown&&!1===this._.onKeyDown(b)?a.data.preventDefault():(27==b||b==("rtl"==c?39:37))&&this.onEscape&&!1===this.onEscape(b)&&a.data.preventDefault()},this);a=a.getBody();a.unselectable();CKEDITOR.env.air&&CKEDITOR.tools.callFunction(b)}else a=this.document.getById(this.id);this._.holder=a}return a};var m={editorId:e.id,id:this.id,langCode:e.langCode,dir:e.lang.dir,cls:this.className,
-frame:"",env:CKEDITOR.env.cssClass,"z-index":e.config.baseFloatZIndex+1};if(this.isFramed){var l=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie?"javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())":"";m.frame=f.output({id:this.id+"_frame",src:l})}l=a.output(m);h&&h.push(l);return l},addBlock:function(a,c){c=this._.blocks[a]=c instanceof CKEDITOR.ui.panel.block?c:new CKEDITOR.ui.panel.block(this.getHolderElement(),c);this._.currentBlock||
-this.showBlock(a);return c},getBlock:function(a){return this._.blocks[a]},showBlock:function(a){a=this._.blocks[a];var c=this._.currentBlock,f=!this.forceIFrame||CKEDITOR.env.ie?this._.holder:this.document.getById(this.id+"_frame");c&&c.hide();this._.currentBlock=a;CKEDITOR.fire("ariaWidget",f);a._.focusIndex=-1;this._.onKeyDown=a.onKeyDown&&CKEDITOR.tools.bind(a.onKeyDown,a);a.show();return a},destroy:function(){this.element&&this.element.remove()}};CKEDITOR.ui.panel.block=CKEDITOR.tools.createClass({$:function(a,
-c){this.element=a.append(a.getDocument().createElement("div",{attributes:{tabindex:-1,"class":"cke_panel_block"},styles:{display:"none"}}));c&&CKEDITOR.tools.extend(this,c);this.element.setAttributes({role:this.attributes.role||"presentation","aria-label":this.attributes["aria-label"],title:this.attributes.title||this.attributes["aria-label"]});this.keys={};this._.focusIndex=-1;this.element.disableContextMenu()},_:{markItem:function(a){-1!=a&&(a=this.element.getElementsByTag("a").getItem(this._.focusIndex=
-a),CKEDITOR.env.webkit&&a.getDocument().getWindow().focus(),a.focus(),this.onMark&&this.onMark(a))}},proto:{show:function(){this.element.setStyle("display","")},hide:function(){this.onHide&&!0===this.onHide.call(this)||this.element.setStyle("display","none")},onKeyDown:function(a,c){var f=this.keys[a];switch(f){case "next":for(var l=this._.focusIndex,f=this.element.getElementsByTag("a"),k;k=f.getItem(++l);)if(k.getAttribute("_cke_focus")&&k.$.offsetWidth){this._.focusIndex=l;k.focus();break}return k||
-c?!1:(this._.focusIndex=-1,this.onKeyDown(a,1));case "prev":l=this._.focusIndex;for(f=this.element.getElementsByTag("a");0<l&&(k=f.getItem(--l));){if(k.getAttribute("_cke_focus")&&k.$.offsetWidth){this._.focusIndex=l;k.focus();break}k=null}return k||c?!1:(this._.focusIndex=f.count(),this.onKeyDown(a,1));case "click":case "mouseup":return l=this._.focusIndex,(k=0<=l&&this.element.getElementsByTag("a").getItem(l))&&(k.$[f]?k.$[f]():k.$["on"+f]()),!1}return!0}}})}(),CKEDITOR.plugins.add("floatpanel",
-{requires:"panel"}),function(){function a(a,e,h,m,l){l=CKEDITOR.tools.genKey(e.getUniqueId(),h.getUniqueId(),a.lang.dir,a.uiColor||"",m.css||"",l||"");var k=f[l];k||(k=f[l]=new CKEDITOR.ui.panel(e,m),k.element=h.append(CKEDITOR.dom.element.createFromHtml(k.render(a),e)),k.element.setStyles({display:"none",position:"absolute"}));return k}var f={};CKEDITOR.ui.floatPanel=CKEDITOR.tools.createClass({$:function(c,e,h,f){function l(){g.hide()}h.forceIFrame=1;h.toolbarRelated&&c.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&
-(e=CKEDITOR.document.getById("cke_"+c.name));var k=e.getDocument();f=a(c,k,e,h,f||0);var b=f.element,d=b.getFirst(),g=this;b.disableContextMenu();this.element=b;this._={editor:c,panel:f,parentElement:e,definition:h,document:k,iframe:d,children:[],dir:c.lang.dir,showBlockParams:null};c.on("mode",l);c.on("resize",l);k.getWindow().on("resize",function(){this.reposition()},this)},proto:{addBlock:function(a,e){return this._.panel.addBlock(a,e)},addListBlock:function(a,e){return this._.panel.addListBlock(a,
-e)},getBlock:function(a){return this._.panel.getBlock(a)},showBlock:function(a,e,h,f,l,k){var b=this._.panel,d=b.showBlock(a);this._.showBlockParams=[].slice.call(arguments);this.allowBlur(!1);var g=this._.editor.editable();this._.returnFocus=g.hasFocus?g:new CKEDITOR.dom.element(CKEDITOR.document.$.activeElement);this._.hideTimeout=0;var p=this.element,g=this._.iframe,g=CKEDITOR.env.ie&&!CKEDITOR.env.edge?g:new CKEDITOR.dom.window(g.$.contentWindow),v=p.getDocument(),u=this._.parentElement.getPositionedAncestor(),
-t=e.getDocumentPosition(v),v=u?u.getDocumentPosition(v):{x:0,y:0},n="rtl"==this._.dir,q=t.x+(f||0)-v.x,x=t.y+(l||0)-v.y;!n||1!=h&&4!=h?n||2!=h&&3!=h||(q+=e.$.offsetWidth-1):q+=e.$.offsetWidth;if(3==h||4==h)x+=e.$.offsetHeight-1;this._.panel._.offsetParentId=e.getId();p.setStyles({top:x+"px",left:0,display:""});p.setOpacity(0);p.getFirst().removeStyle("width");this._.editor.focusManager.add(g);this._.blurSet||(CKEDITOR.event.useCapture=!0,g.on("blur",function(a){function b(){delete this._.returnFocus;
-this.hide()}this.allowBlur()&&a.data.getPhase()==CKEDITOR.EVENT_PHASE_AT_TARGET&&this.visible&&!this._.activeChild&&(CKEDITOR.env.iOS?this._.hideTimeout||(this._.hideTimeout=CKEDITOR.tools.setTimeout(b,0,this)):b.call(this))},this),g.on("focus",function(){this._.focused=!0;this.hideChild();this.allowBlur(!0)},this),CKEDITOR.env.iOS&&(g.on("touchstart",function(){clearTimeout(this._.hideTimeout)},this),g.on("touchend",function(){this._.hideTimeout=0;this.focus()},this)),CKEDITOR.event.useCapture=!1,
-this._.blurSet=1);b.onEscape=CKEDITOR.tools.bind(function(a){if(this.onEscape&&!1===this.onEscape(a))return!1},this);CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.tools.bind(function(){var a=p;a.removeStyle("width");if(d.autoSize){var c=d.element.getDocument(),c=(CKEDITOR.env.webkit||CKEDITOR.env.edge?d.element:c.getBody()).$.scrollWidth;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<c&&(c+=(a.$.offsetWidth||0)-(a.$.clientWidth||0)+3);a.setStyle("width",c+10+"px");c=d.element.$.scrollHeight;CKEDITOR.env.ie&&
-CKEDITOR.env.quirks&&0<c&&(c+=(a.$.offsetHeight||0)-(a.$.clientHeight||0)+3);a.setStyle("height",c+"px");b._.currentBlock.element.setStyle("display","none").removeStyle("display")}else a.removeStyle("height");n&&(q-=p.$.offsetWidth);p.setStyle("left",q+"px");var c=b.element.getWindow(),a=p.$.getBoundingClientRect(),c=c.getViewPaneSize(),e=a.width||a.right-a.left,g=a.height||a.bottom-a.top,h=n?a.right:c.width-a.left,f=n?c.width-a.right:a.left;n?h<e&&(q=f>e?q+e:c.width>e?q-a.left:q-a.right+c.width):
-h<e&&(q=f>e?q-e:c.width>e?q-a.right+c.width:q-a.left);e=a.top;c.height-a.top<g&&(x=e>g?x-g:c.height>g?x-a.bottom+c.height:x-a.top);CKEDITOR.env.ie&&(c=a=new CKEDITOR.dom.element(p.$.offsetParent),"html"==c.getName()&&(c=c.getDocument().getBody()),"rtl"==c.getComputedStyle("direction")&&(q=CKEDITOR.env.ie8Compat?q-2*p.getDocument().getDocumentElement().$.scrollLeft:q-(a.$.scrollWidth-a.$.clientWidth)));var a=p.getFirst(),l;(l=a.getCustomData("activePanel"))&&l.onHide&&l.onHide.call(this,1);a.setCustomData("activePanel",
-this);p.setStyles({top:x+"px",left:q+"px"});p.setOpacity(1);k&&k()},this);b.isLoaded?a():b.onLoad=a;CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.env.webkit&&CKEDITOR.document.getWindow().getScrollPosition().y;this.focus();d.element.focus();CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=a);this.allowBlur(!0);this._.editor.fire("panelShow",this)},0,this)},CKEDITOR.env.air?200:0,this);this.visible=1;this.onShow&&this.onShow.call(this)},reposition:function(){var a=this._.showBlockParams;
-this.visible&&this._.showBlockParams&&(this.hide(),this.showBlock.apply(this,a))},focus:function(){if(CKEDITOR.env.webkit){var a=CKEDITOR.document.getActive();a&&!a.equals(this._.iframe)&&a.$.blur()}(this._.lastFocused||this._.iframe.getFrameDocument().getWindow()).focus()},blur:function(){var a=this._.iframe.getFrameDocument().getActive();a&&a.is("a")&&(this._.lastFocused=a)},hide:function(a){if(this.visible&&(!this.onHide||!0!==this.onHide.call(this))){this.hideChild();CKEDITOR.env.gecko&&this._.iframe.getFrameDocument().$.activeElement.blur();
-this.element.setStyle("display","none");this.visible=0;this.element.getFirst().removeCustomData("activePanel");if(a=a&&this._.returnFocus)CKEDITOR.env.webkit&&a.type&&a.getWindow().$.focus(),a.focus();delete this._.lastFocused;this._.showBlockParams=null;this._.editor.fire("panelHide",this)}},allowBlur:function(a){var e=this._.panel;void 0!==a&&(e.allowBlur=a);return e.allowBlur},showAsChild:function(a,e,h,f,l,k){if(this._.activeChild!=a||a._.panel._.offsetParentId!=h.getId())this.hideChild(),a.onHide=
-CKEDITOR.tools.bind(function(){CKEDITOR.tools.setTimeout(function(){this._.focused||this.hide()},0,this)},this),this._.activeChild=a,this._.focused=!1,a.showBlock(e,h,f,l,k),this.blur(),(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&setTimeout(function(){a.element.getChild(0).$.style.cssText+=""},100)},hideChild:function(a){var e=this._.activeChild;e&&(delete e.onHide,delete this._.activeChild,e.hide(),a&&this.focus())}}});CKEDITOR.on("instanceDestroyed",function(){var a=CKEDITOR.tools.isEmpty(CKEDITOR.instances),
-e;for(e in f){var h=f[e];a?h.destroy():h.element.hide()}a&&(f={})})}(),CKEDITOR.plugins.add("menu",{requires:"floatpanel",beforeInit:function(a){for(var f=a.config.menu_groups.split(","),c=a._.menuGroups={},e=a._.menuItems={},h=0;h<f.length;h++)c[f[h]]=h+1;a.addMenuGroup=function(a,e){c[a]=e||100};a.addMenuItem=function(a,h){c[h.group]&&(e[a]=new CKEDITOR.menuItem(this,a,h))};a.addMenuItems=function(a){for(var c in a)this.addMenuItem(c,a[c])};a.getMenuItem=function(a){return e[a]};a.removeMenuItem=
-function(a){delete e[a]}}}),function(){function a(a){a.sort(function(a,c){return a.group<c.group?-1:a.group>c.group?1:a.order<c.order?-1:a.order>c.order?1:0})}var f='\x3cspan class\x3d"cke_menuitem"\x3e\x3ca id\x3d"{id}" class\x3d"cke_menubutton cke_menubutton__{name} cke_menubutton_{state} {cls}" href\x3d"{href}" title\x3d"{title}" tabindex\x3d"-1"_cke_focus\x3d1 hidefocus\x3d"true" role\x3d"{role}" aria-haspopup\x3d"{hasPopup}" aria-disabled\x3d"{disabled}" {ariaChecked}';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&
-(f+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(f+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var f=f+(' onmouseover\x3d"CKEDITOR.tools.callFunction({hoverFn},{index});" onmouseout\x3d"CKEDITOR.tools.callFunction({moveOutFn},{index});" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;"\x3e'),c=CKEDITOR.addTemplate("menuItem",f+'\x3cspan class\x3d"cke_menubutton_inner"\x3e\x3cspan class\x3d"cke_menubutton_icon"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{iconStyle}"\x3e\x3c/span\x3e\x3c/span\x3e\x3cspan class\x3d"cke_menubutton_label"\x3e{label}\x3c/span\x3e{arrowHtml}\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e'),
-e=CKEDITOR.addTemplate("menuArrow",'\x3cspan class\x3d"cke_menuarrow"\x3e\x3cspan\x3e{label}\x3c/span\x3e\x3c/span\x3e');CKEDITOR.menu=CKEDITOR.tools.createClass({$:function(a,c){c=this._.definition=c||{};this.id=CKEDITOR.tools.getNextId();this.editor=a;this.items=[];this._.listeners=[];this._.level=c.level||1;var e=CKEDITOR.tools.extend({},c.panel,{css:[CKEDITOR.skin.getPath("editor")],level:this._.level-1,block:{}}),f=e.block.attributes=e.attributes||{};!f.role&&(f.role="menu");this._.panelDefinition=
-e},_:{onShow:function(){var a=this.editor.getSelection(),c=a&&a.getStartElement(),e=this.editor.elementPath(),f=this._.listeners;this.removeAll();for(var b=0;b<f.length;b++){var d=f[b](c,a,e);if(d)for(var g in d){var p=this.editor.getMenuItem(g);!p||p.command&&!this.editor.getCommand(p.command).state||(p.state=d[g],this.add(p))}}},onClick:function(a){this.hide();if(a.onClick)a.onClick();else a.command&&this.editor.execCommand(a.command)},onEscape:function(a){var c=this.parent;c?c._.panel.hideChild(1):
-27==a&&this.hide(1);return!1},onHide:function(){this.onHide&&this.onHide()},showSubMenu:function(a){var c=this._.subMenu,e=this.items[a];if(e=e.getItems&&e.getItems()){c?c.removeAll():(c=this._.subMenu=new CKEDITOR.menu(this.editor,CKEDITOR.tools.extend({},this._.definition,{level:this._.level+1},!0)),c.parent=this,c._.onClick=CKEDITOR.tools.bind(this._.onClick,this));for(var f in e){var b=this.editor.getMenuItem(f);b&&(b.state=e[f],c.add(b))}var d=this._.panel.getBlock(this.id).element.getDocument().getById(this.id+
-String(a));setTimeout(function(){c.show(d,2)},0)}else this._.panel.hideChild(1)}},proto:{add:function(a){a.order||(a.order=this.items.length);this.items.push(a)},removeAll:function(){this.items=[]},show:function(c,e,f,k){if(!this.parent&&(this._.onShow(),!this.items.length))return;e=e||("rtl"==this.editor.lang.dir?2:1);var b=this.items,d=this.editor,g=this._.panel,p=this._.element;if(!g){g=this._.panel=new CKEDITOR.ui.floatPanel(this.editor,CKEDITOR.document.getBody(),this._.panelDefinition,this._.level);
-g.onEscape=CKEDITOR.tools.bind(function(a){if(!1===this._.onEscape(a))return!1},this);g.onShow=function(){g._.panel.getHolderElement().getParent().addClass("cke").addClass("cke_reset_all")};g.onHide=CKEDITOR.tools.bind(function(){this._.onHide&&this._.onHide()},this);p=g.addBlock(this.id,this._.panelDefinition.block);p.autoSize=!0;var v=p.keys;v[40]="next";v[9]="next";v[38]="prev";v[CKEDITOR.SHIFT+9]="prev";v["rtl"==d.lang.dir?37:39]=CKEDITOR.env.ie?"mouseup":"click";v[32]=CKEDITOR.env.ie?"mouseup":
-"click";CKEDITOR.env.ie&&(v[13]="mouseup");p=this._.element=p.element;v=p.getDocument();v.getBody().setStyle("overflow","hidden");v.getElementsByTag("html").getItem(0).setStyle("overflow","hidden");this._.itemOverFn=CKEDITOR.tools.addFunction(function(a){clearTimeout(this._.showSubTimeout);this._.showSubTimeout=CKEDITOR.tools.setTimeout(this._.showSubMenu,d.config.menu_subMenuDelay||400,this,[a])},this);this._.itemOutFn=CKEDITOR.tools.addFunction(function(){clearTimeout(this._.showSubTimeout)},this);
-this._.itemClickFn=CKEDITOR.tools.addFunction(function(a){var b=this.items[a];if(b.state==CKEDITOR.TRISTATE_DISABLED)this.hide(1);else if(b.getItems)this._.showSubMenu(a);else this._.onClick(b)},this)}a(b);for(var v=d.elementPath(),v=['\x3cdiv class\x3d"cke_menu'+(v&&v.direction()!=d.lang.dir?" cke_mixed_dir_content":"")+'" role\x3d"presentation"\x3e'],u=b.length,t=u&&b[0].group,n=0;n<u;n++){var q=b[n];t!=q.group&&(v.push('\x3cdiv class\x3d"cke_menuseparator" role\x3d"separator"\x3e\x3c/div\x3e'),
-t=q.group);q.render(this,n,v)}v.push("\x3c/div\x3e");p.setHtml(v.join(""));CKEDITOR.ui.fire("ready",this);this.parent?this.parent._.panel.showAsChild(g,this.id,c,e,f,k):g.showBlock(this.id,c,e,f,k);d.fire("menuShow",[g])},addListener:function(a){this._.listeners.push(a)},hide:function(a){this._.onHide&&this._.onHide();this._.panel&&this._.panel.hide(a)}}});CKEDITOR.menuItem=CKEDITOR.tools.createClass({$:function(a,c,e){CKEDITOR.tools.extend(this,e,{order:0,className:"cke_menubutton__"+c});this.group=
-a._.menuGroups[this.group];this.editor=a;this.name=c},proto:{render:function(a,f,l){var k=a.id+String(f),b="undefined"==typeof this.state?CKEDITOR.TRISTATE_OFF:this.state,d="",g=b==CKEDITOR.TRISTATE_ON?"on":b==CKEDITOR.TRISTATE_DISABLED?"disabled":"off";this.role in{menuitemcheckbox:1,menuitemradio:1}&&(d=' aria-checked\x3d"'+(b==CKEDITOR.TRISTATE_ON?"true":"false")+'"');var p=this.getItems,v="\x26#"+("rtl"==this.editor.lang.dir?"9668":"9658")+";",u=this.name;this.icon&&!/\./.test(this.icon)&&(u=
-this.icon);a={id:k,name:this.name,iconName:u,label:this.label,cls:this.className||"",state:g,hasPopup:p?"true":"false",disabled:b==CKEDITOR.TRISTATE_DISABLED,title:this.label,href:"javascript:void('"+(this.label||"").replace("'")+"')",hoverFn:a._.itemOverFn,moveOutFn:a._.itemOutFn,clickFn:a._.itemClickFn,index:f,iconStyle:CKEDITOR.skin.getIconStyle(u,"rtl"==this.editor.lang.dir,u==this.icon?null:this.icon,this.iconOffset),arrowHtml:p?e.output({label:v}):"",role:this.role?this.role:"menuitem",ariaChecked:d};
-c.output(a,l)}}})}(),CKEDITOR.config.menu_groups="clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div",CKEDITOR.plugins.add("contextmenu",{requires:"menu",onLoad:function(){CKEDITOR.plugins.contextMenu=CKEDITOR.tools.createClass({base:CKEDITOR.menu,$:function(a){this.base.call(this,a,{panel:{className:"cke_menu_panel",attributes:{"aria-label":a.lang.contextmenu.options}}})},proto:{addTarget:function(a,
-f){a.on("contextmenu",function(a){a=a.data;var e=CKEDITOR.env.webkit?c:CKEDITOR.env.mac?a.$.metaKey:a.$.ctrlKey;if(!f||!e){a.preventDefault();if(CKEDITOR.env.mac&&CKEDITOR.env.webkit){var e=this.editor,l=(new CKEDITOR.dom.elementPath(a.getTarget(),e.editable())).contains(function(a){return a.hasAttribute("contenteditable")},!0);l&&"false"==l.getAttribute("contenteditable")&&e.getSelection().fake(l)}var l=a.getTarget().getDocument(),k=a.getTarget().getDocument().getDocumentElement(),e=!l.equals(CKEDITOR.document),
-l=l.getWindow().getScrollPosition(),b=e?a.$.clientX:a.$.pageX||l.x+a.$.clientX,d=e?a.$.clientY:a.$.pageY||l.y+a.$.clientY;CKEDITOR.tools.setTimeout(function(){this.open(k,null,b,d)},CKEDITOR.env.ie?200:0,this)}},this);if(CKEDITOR.env.webkit){var c,e=function(){c=0};a.on("keydown",function(a){c=CKEDITOR.env.mac?a.data.$.metaKey:a.data.$.ctrlKey});a.on("keyup",e);a.on("contextmenu",e)}},open:function(a,f,c,e){this.editor.focus();a=a||CKEDITOR.document.getDocumentElement();this.editor.selectionChange(1);
-this.show(a,f,c,e)}}})},beforeInit:function(a){var f=a.contextMenu=new CKEDITOR.plugins.contextMenu(a);a.on("contentDom",function(){f.addTarget(a.editable(),!1!==a.config.browserContextMenuOnCtrl)});a.addCommand("contextMenu",{exec:function(){a.contextMenu.open(a.document.getBody())}});a.setKeystroke(CKEDITOR.SHIFT+121,"contextMenu");a.setKeystroke(CKEDITOR.CTRL+CKEDITOR.SHIFT+121,"contextMenu")}}),CKEDITOR.plugins.add("resize",{init:function(a){function f(c){var h=b.width,f=b.height,l=h+(c.data.$.screenX-
-k.x)*("rtl"==m?-1:1);c=f+(c.data.$.screenY-k.y);d&&(h=Math.max(e.resize_minWidth,Math.min(l,e.resize_maxWidth)));g&&(f=Math.max(e.resize_minHeight,Math.min(c,e.resize_maxHeight)));a.resize(d?h:null,f)}function c(){CKEDITOR.document.removeListener("mousemove",f);CKEDITOR.document.removeListener("mouseup",c);a.document&&(a.document.removeListener("mousemove",f),a.document.removeListener("mouseup",c))}var e=a.config,h=a.ui.spaceId("resizer"),m=a.element?a.element.getDirection(1):"ltr";!e.resize_dir&&
-(e.resize_dir="vertical");void 0===e.resize_maxWidth&&(e.resize_maxWidth=3E3);void 0===e.resize_maxHeight&&(e.resize_maxHeight=3E3);void 0===e.resize_minWidth&&(e.resize_minWidth=750);void 0===e.resize_minHeight&&(e.resize_minHeight=250);if(!1!==e.resize_enabled){var l=null,k,b,d=("both"==e.resize_dir||"horizontal"==e.resize_dir)&&e.resize_minWidth!=e.resize_maxWidth,g=("both"==e.resize_dir||"vertical"==e.resize_dir)&&e.resize_minHeight!=e.resize_maxHeight,p=CKEDITOR.tools.addFunction(function(d){l||
-(l=a.getResizable());b={width:l.$.offsetWidth||0,height:l.$.offsetHeight||0};k={x:d.screenX,y:d.screenY};e.resize_minWidth>b.width&&(e.resize_minWidth=b.width);e.resize_minHeight>b.height&&(e.resize_minHeight=b.height);CKEDITOR.document.on("mousemove",f);CKEDITOR.document.on("mouseup",c);a.document&&(a.document.on("mousemove",f),a.document.on("mouseup",c));d.preventDefault&&d.preventDefault()});a.on("destroy",function(){CKEDITOR.tools.removeFunction(p)});a.on("uiSpace",function(b){if("bottom"==b.data.space){var c=
-"";d&&!g&&(c=" cke_resizer_horizontal");!d&&g&&(c=" cke_resizer_vertical");var e='\x3cspan id\x3d"'+h+'" class\x3d"cke_resizer'+c+" cke_resizer_"+m+'" title\x3d"'+CKEDITOR.tools.htmlEncode(a.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+p+', event)"\x3e'+("ltr"==m?"◢":"◣")+"\x3c/span\x3e";"ltr"==m&&"ltr"==c?b.data.html+=e:b.data.html=e+b.data.html}},a,null,100);a.on("maximize",function(b){a.ui.space("resizer")[b.data==CKEDITOR.TRISTATE_ON?"hide":"show"]()})}}}),function(){var a=
-'\x3ca id\x3d"{id}" class\x3d"cke_button cke_button__{name} cke_button_{state} {cls}"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' title\x3d"{title}" tabindex\x3d"-1" hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-haspopup\x3d"{hasArrow}" aria-disabled\x3d"{ariaDisabled}"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(a+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(a+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');
-var a=a+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{style}"'),a=a+'\x3e\x26nbsp;\x3c/span\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_button_label cke_button__{name}_label" aria-hidden\x3d"false"\x3e{label}\x3c/span\x3e{arrowHtml}\x3c/a\x3e',
-f=CKEDITOR.addTemplate("buttonArrow",'\x3cspan class\x3d"cke_button_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":"")+"\x3c/span\x3e"),c=CKEDITOR.addTemplate("button",a);CKEDITOR.plugins.add("button",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_BUTTON,CKEDITOR.ui.button.handler)}});CKEDITOR.UI_BUTTON="button";CKEDITOR.ui.button=function(a){CKEDITOR.tools.extend(this,a,{title:a.label,click:a.click||function(c){c.execCommand(a.command)}});this._={}};CKEDITOR.ui.button.handler={create:function(a){return new CKEDITOR.ui.button(a)}};
-CKEDITOR.ui.button.prototype={render:function(a,h){function m(){var b=a.mode;b&&(b=this.modes[b]?void 0!==n[b]?n[b]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,b=a.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:b,this.setState(b),this.refresh&&this.refresh())}var l=CKEDITOR.env,k=this._.id=CKEDITOR.tools.getNextId(),b="",d=this.command,g;this._.editor=a;var p={id:k,button:this,editor:a,focus:function(){CKEDITOR.document.getById(k).focus()},execute:function(){this.button.click(a)},attach:function(a){this.button.attach(a)}},
-v=CKEDITOR.tools.addFunction(function(a){if(p.onkey)return a=new CKEDITOR.dom.event(a),!1!==p.onkey(p,a.getKeystroke())}),u=CKEDITOR.tools.addFunction(function(a){var b;p.onfocus&&(b=!1!==p.onfocus(p,new CKEDITOR.dom.event(a)));return b}),t=0;p.clickFn=g=CKEDITOR.tools.addFunction(function(){t&&(a.unlockSelection(1),t=0);p.execute();l.iOS&&a.focus()});if(this.modes){var n={};a.on("beforeModeUnload",function(){a.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(n[a.mode]=this._.state)},this);a.on("activeFilterChange",
-m,this);a.on("mode",m,this);!this.readOnly&&a.on("readOnly",m,this)}else d&&(d=a.getCommand(d))&&(d.on("state",function(){this.setState(d.state)},this),b+=d.state==CKEDITOR.TRISTATE_ON?"on":d.state==CKEDITOR.TRISTATE_DISABLED?"disabled":"off");if(this.directional)a.on("contentDirChanged",function(b){var d=CKEDITOR.document.getById(this._.id),c=d.getFirst();b=b.data;b!=a.lang.dir?d.addClass("cke_"+b):d.removeClass("cke_ltr").removeClass("cke_rtl");c.setAttribute("style",CKEDITOR.skin.getIconStyle(x,
-"rtl"==b,this.icon,this.iconOffset))},this);d||(b+="off");var q=this.name||this.command,x=q;this.icon&&!/\./.test(this.icon)&&(x=this.icon,this.icon=null);b={id:k,name:q,iconName:x,label:this.label,cls:this.className||"",state:b,ariaDisabled:"disabled"==b?"true":"false",title:this.title,titleJs:l.gecko&&!l.hc?"":(this.title||"").replace("'",""),hasArrow:this.hasArrow?"true":"false",keydownFn:v,focusFn:u,clickFn:g,style:CKEDITOR.skin.getIconStyle(x,"rtl"==a.lang.dir,this.icon,this.iconOffset),arrowHtml:this.hasArrow?
-f.output():""};c.output(b,h);if(this.onRender)this.onRender();return p},setState:function(a){if(this._.state==a)return!1;this._.state=a;var c=CKEDITOR.document.getById(this._.id);return c?(c.setState(a,"cke_button"),a==CKEDITOR.TRISTATE_DISABLED?c.setAttribute("aria-disabled",!0):c.removeAttribute("aria-disabled"),this.hasArrow?(a=a==CKEDITOR.TRISTATE_ON?this._.editor.lang.button.selectedLabel.replace(/%1/g,this.label):this.label,CKEDITOR.document.getById(this._.id+"_label").setText(a)):a==CKEDITOR.TRISTATE_ON?
-c.setAttribute("aria-pressed",!0):c.removeAttribute("aria-pressed"),!0):!1},getState:function(){return this._.state},toFeature:function(a){if(this._.feature)return this._.feature;var c=this;this.allowedContent||this.requiredContent||!this.command||(c=a.getCommand(this.command)||c);return this._.feature=c}};CKEDITOR.ui.prototype.addButton=function(a,c){this.add(a,CKEDITOR.UI_BUTTON,c)}}(),function(){function a(a){function c(){for(var b=e(),d=CKEDITOR.tools.clone(a.config.toolbarGroups)||f(a),g=0;g<
-d.length;g++){var m=d[g];if("/"!=m){"string"==typeof m&&(m=d[g]={name:m});var n,q=m.groups;if(q)for(var x=0;x<q.length;x++)n=q[x],(n=b[n])&&k(m,n);(n=b[m.name])&&k(m,n)}}return d}function e(){var b={},d,c,g;for(d in a.ui.items)c=a.ui.items[d],g=c.toolbar||"others",g=g.split(","),c=g[0],g=parseInt(g[1]||-1,10),b[c]||(b[c]=[]),b[c].push({name:d,order:g});for(c in b)b[c]=b[c].sort(function(a,b){return a.order==b.order?0:0>b.order?-1:0>a.order?1:a.order<b.order?-1:1});return b}function k(b,c){if(c.length){b.items?
-b.items.push(a.ui.create("-")):b.items=[];for(var e;e=c.shift();)e="string"==typeof e?e:e.name,d&&-1!=CKEDITOR.tools.indexOf(d,e)||(e=a.ui.create(e))&&a.addFeature(e)&&b.items.push(e)}}function b(a){var b=[],d,c,e;for(d=0;d<a.length;++d)c=a[d],e={},"/"==c?b.push(c):CKEDITOR.tools.isArray(c)?(k(e,CKEDITOR.tools.clone(c)),b.push(e)):c.items&&(k(e,CKEDITOR.tools.clone(c.items)),e.name=c.name,b.push(e));return b}var d=a.config.removeButtons,d=d&&d.split(","),g=a.config.toolbar;"string"==typeof g&&(g=
-a.config["toolbar_"+g]);return a.toolbar=g?b(g):c()}function f(a){return a._.toolbarGroups||(a._.toolbarGroups=[{name:"document",groups:["mode","document","doctools"]},{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"forms"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},{name:"links"},{name:"insert"},"/",{name:"styles"},{name:"colors"},{name:"tools"},{name:"others"},
-{name:"about"}])}var c=function(){this.toolbars=[];this.focusCommandExecuted=!1};c.prototype.focus=function(){for(var a=0,c;c=this.toolbars[a++];)for(var e=0,f;f=c.items[e++];)if(f.focus){f.focus();return}};var e={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(a){a.toolbox&&(a.toolbox.focusCommandExecuted=!0,CKEDITOR.env.ie||CKEDITOR.env.air?setTimeout(function(){a.toolbox.focus()},100):a.toolbox.focus())}};CKEDITOR.plugins.add("toolbar",{requires:"button",init:function(f){var m,l=function(a,
-b){var d,c="rtl"==f.lang.dir,e=f.config.toolbarGroupCycling,v=c?37:39,c=c?39:37,e=void 0===e||e;switch(b){case 9:case CKEDITOR.SHIFT+9:for(;!d||!d.items.length;)if(d=9==b?(d?d.next:a.toolbar.next)||f.toolbox.toolbars[0]:(d?d.previous:a.toolbar.previous)||f.toolbox.toolbars[f.toolbox.toolbars.length-1],d.items.length)for(a=d.items[m?d.items.length-1:0];a&&!a.focus;)(a=m?a.previous:a.next)||(d=0);a&&a.focus();return!1;case v:d=a;do d=d.next,!d&&e&&(d=a.toolbar.items[0]);while(d&&!d.focus);d?d.focus():
-l(a,9);return!1;case 40:return a.button&&a.button.hasArrow?(f.once("panelShow",function(a){a.data._.panel._.currentBlock.onKeyDown(40)}),a.execute()):l(a,40==b?v:c),!1;case c:case 38:d=a;do d=d.previous,!d&&e&&(d=a.toolbar.items[a.toolbar.items.length-1]);while(d&&!d.focus);d?d.focus():(m=1,l(a,CKEDITOR.SHIFT+9),m=0);return!1;case 27:return f.focus(),!1;case 13:case 32:return a.execute(),!1}return!0};f.on("uiSpace",function(e){if(e.data.space==f.config.toolbarLocation){e.removeListener();f.toolbox=
-new c;var b=CKEDITOR.tools.getNextId(),d=['\x3cspan id\x3d"',b,'" class\x3d"cke_voice_label"\x3e',f.lang.toolbar.toolbars,"\x3c/span\x3e",'\x3cspan id\x3d"'+f.ui.spaceId("toolbox")+'" class\x3d"cke_toolbox" role\x3d"group" aria-labelledby\x3d"',b,'" onmousedown\x3d"return false;"\x3e'],b=!1!==f.config.toolbarStartupExpanded,g,m;f.config.toolbarCanCollapse&&f.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&d.push('\x3cspan class\x3d"cke_toolbox_main"'+(b?"\x3e":' style\x3d"display:none"\x3e'));for(var v=
-f.toolbox.toolbars,u=a(f),t=0;t<u.length;t++){var n,q=0,x,A=u[t],C;if(A)if(g&&(d.push("\x3c/span\x3e"),m=g=0),"/"===A)d.push('\x3cspan class\x3d"cke_toolbar_break"\x3e\x3c/span\x3e');else{C=A.items||A;for(var r=0;r<C.length;r++){var w=C[r],B;if(w){var z=function(a){a=a.render(f,d);y=q.items.push(a)-1;0<y&&(a.previous=q.items[y-1],a.previous.next=a);a.toolbar=q;a.onkey=l;a.onfocus=function(){f.toolbox.focusCommandExecuted||f.focus()}};if(w.type==CKEDITOR.UI_SEPARATOR)m=g&&w;else{B=!1!==w.canGroup;
-if(!q){n=CKEDITOR.tools.getNextId();q={id:n,items:[]};x=A.name&&(f.lang.toolbar.toolbarGroups[A.name]||A.name);d.push('\x3cspan id\x3d"',n,'" class\x3d"cke_toolbar"',x?' aria-labelledby\x3d"'+n+'_label"':"",' role\x3d"toolbar"\x3e');x&&d.push('\x3cspan id\x3d"',n,'_label" class\x3d"cke_voice_label"\x3e',x,"\x3c/span\x3e");d.push('\x3cspan class\x3d"cke_toolbar_start"\x3e\x3c/span\x3e');var y=v.push(q)-1;0<y&&(q.previous=v[y-1],q.previous.next=q)}B?g||(d.push('\x3cspan class\x3d"cke_toolgroup" role\x3d"presentation"\x3e'),
-g=1):g&&(d.push("\x3c/span\x3e"),g=0);m&&(z(m),m=0);z(w)}}}g&&(d.push("\x3c/span\x3e"),m=g=0);q&&d.push('\x3cspan class\x3d"cke_toolbar_end"\x3e\x3c/span\x3e\x3c/span\x3e')}}f.config.toolbarCanCollapse&&d.push("\x3c/span\x3e");if(f.config.toolbarCanCollapse&&f.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var D=CKEDITOR.tools.addFunction(function(){f.execCommand("toolbarCollapse")});f.on("destroy",function(){CKEDITOR.tools.removeFunction(D)});f.addCommand("toolbarCollapse",{readOnly:1,exec:function(a){var b=
-a.ui.space("toolbar_collapser"),d=b.getPrevious(),c=a.ui.space("contents"),e=d.getParent(),g=parseInt(c.$.style.height,10),f=e.$.offsetHeight,h=b.hasClass("cke_toolbox_collapser_min");h?(d.show(),b.removeClass("cke_toolbox_collapser_min"),b.setAttribute("title",a.lang.toolbar.toolbarCollapse)):(d.hide(),b.addClass("cke_toolbox_collapser_min"),b.setAttribute("title",a.lang.toolbar.toolbarExpand));b.getFirst().setText(h?"▲":"◀");c.setStyle("height",g-(e.$.offsetHeight-f)+"px");a.fire("resize",{outerHeight:a.container.$.offsetHeight,
-contentsHeight:c.$.offsetHeight,outerWidth:a.container.$.offsetWidth})},modes:{wysiwyg:1,source:1}});f.setKeystroke(CKEDITOR.ALT+(CKEDITOR.env.ie||CKEDITOR.env.webkit?189:109),"toolbarCollapse");d.push('\x3ca title\x3d"'+(b?f.lang.toolbar.toolbarCollapse:f.lang.toolbar.toolbarExpand)+'" id\x3d"'+f.ui.spaceId("toolbar_collapser")+'" tabIndex\x3d"-1" class\x3d"cke_toolbox_collapser');b||d.push(" cke_toolbox_collapser_min");d.push('" onclick\x3d"CKEDITOR.tools.callFunction('+D+')"\x3e','\x3cspan class\x3d"cke_arrow"\x3e\x26#9650;\x3c/span\x3e',
-"\x3c/a\x3e")}d.push("\x3c/span\x3e");e.data.html+=d.join("")}});f.on("destroy",function(){if(this.toolbox){var a,b=0,d,c,e;for(a=this.toolbox.toolbars;b<a.length;b++)for(c=a[b].items,d=0;d<c.length;d++)e=c[d],e.clickFn&&CKEDITOR.tools.removeFunction(e.clickFn),e.keyDownFn&&CKEDITOR.tools.removeFunction(e.keyDownFn)}});f.on("uiReady",function(){var a=f.ui.space("toolbox");a&&f.focusManager.add(a,1)});f.addCommand("toolbarFocus",e);f.setKeystroke(CKEDITOR.ALT+121,"toolbarFocus");f.ui.add("-",CKEDITOR.UI_SEPARATOR,
-{});f.ui.addHandler(CKEDITOR.UI_SEPARATOR,{create:function(){return{render:function(a,b){b.push('\x3cspan class\x3d"cke_toolbar_separator" role\x3d"separator"\x3e\x3c/span\x3e');return{}}}}})}});CKEDITOR.ui.prototype.addToolbarGroup=function(a,c,e){var k=f(this.editor),b=0===c,d={name:a};if(e){if(e=CKEDITOR.tools.search(k,function(a){return a.name==e})){!e.groups&&(e.groups=[]);if(c&&(c=CKEDITOR.tools.indexOf(e.groups,c),0<=c)){e.groups.splice(c+1,0,a);return}b?e.groups.splice(0,0,a):e.groups.push(a);
-return}c=null}c&&(c=CKEDITOR.tools.indexOf(k,function(a){return a.name==c}));b?k.splice(0,0,a):"number"==typeof c?k.splice(c+1,0,d):k.push(a)}}(),CKEDITOR.UI_SEPARATOR="separator",CKEDITOR.config.toolbarLocation="top",function(){function a(a,c){function l(b){b=g.list[b];var d;b.equals(a.editable())||"true"==b.getAttribute("contenteditable")?(d=a.createRange(),d.selectNodeContents(b),d=d.select()):(d=a.getSelection(),d.selectElement(b));CKEDITOR.env.ie&&a.fire("selectionChange",{selection:d,path:new CKEDITOR.dom.elementPath(b)});
-a.focus()}function k(){d&&d.setHtml('\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');delete g.list}var b=a.ui.spaceId("path"),d,g=a._.elementsPath,p=g.idBase;c.html+='\x3cspan id\x3d"'+b+'_label" class\x3d"cke_voice_label"\x3e'+a.lang.elementspath.eleLabel+'\x3c/span\x3e\x3cspan id\x3d"'+b+'" class\x3d"cke_path" role\x3d"group" aria-labelledby\x3d"'+b+'_label"\x3e\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e\x3c/span\x3e';a.on("uiReady",function(){var b=a.ui.space("path");
-b&&a.focusManager.add(b,1)});g.onClick=l;var v=CKEDITOR.tools.addFunction(l),u=CKEDITOR.tools.addFunction(function(b,d){var c=g.idBase,e;d=new CKEDITOR.dom.event(d);e="rtl"==a.lang.dir;switch(d.getKeystroke()){case e?39:37:case 9:return(e=CKEDITOR.document.getById(c+(b+1)))||(e=CKEDITOR.document.getById(c+"0")),e.focus(),!1;case e?37:39:case CKEDITOR.SHIFT+9:return(e=CKEDITOR.document.getById(c+(b-1)))||(e=CKEDITOR.document.getById(c+(g.list.length-1))),e.focus(),!1;case 27:return a.focus(),!1;case 13:case 32:return l(b),
-!1}return!0});a.on("selectionChange",function(){for(var c=[],f=g.list=[],k=[],l=g.filters,m=!0,C=a.elementPath().elements,r,w=C.length;w--;){var B=C[w],z=0;r=B.data("cke-display-name")?B.data("cke-display-name"):B.data("cke-real-element-type")?B.data("cke-real-element-type"):B.getName();(m=B.hasAttribute("contenteditable")?"true"==B.getAttribute("contenteditable"):m)||B.hasAttribute("contenteditable")||(z=1);for(var y=0;y<l.length;y++){var D=l[y](B,r);if(!1===D){z=1;break}r=D||r}z||(f.unshift(B),
-k.unshift(r))}f=f.length;for(l=0;l<f;l++)r=k[l],m=a.lang.elementspath.eleTitle.replace(/%1/,r),r=e.output({id:p+l,label:m,text:r,jsTitle:"javascript:void('"+r+"')",index:l,keyDownFn:u,clickFn:v}),c.unshift(r);d||(d=CKEDITOR.document.getById(b));k=d;k.setHtml(c.join("")+'\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');a.fire("elementsPathUpdate",{space:k})});a.on("readOnly",k);a.on("contentDomUnload",k);a.addCommand("elementsPathFocus",f.toolbarFocus);a.setKeystroke(CKEDITOR.ALT+122,
-"elementsPathFocus")}var f={toolbarFocus:{editorFocus:!1,readOnly:1,exec:function(a){(a=CKEDITOR.document.getById(a._.elementsPath.idBase+"0"))&&a.focus(CKEDITOR.env.ie||CKEDITOR.env.air)}}},c="";CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(c+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var e=CKEDITOR.addTemplate("pathItem",'\x3ca id\x3d"{id}" href\x3d"{jsTitle}" tabindex\x3d"-1" class\x3d"cke_path_item" title\x3d"{label}"'+c+' hidefocus\x3d"true"  onkeydown\x3d"return CKEDITOR.tools.callFunction({keyDownFn},{index}, event );" onclick\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;" role\x3d"button" aria-label\x3d"{label}"\x3e{text}\x3c/a\x3e');
-CKEDITOR.plugins.add("elementspath",{init:function(c){c._.elementsPath={idBase:"cke_elementspath_"+CKEDITOR.tools.getNextNumber()+"_",filters:[]};c.on("uiSpace",function(e){"bottom"==e.data.space&&a(c,e.data)})}})}(),function(){function a(a,b,c){c=a.config.forceEnterMode||c;"wysiwyg"==a.mode&&(b||(b=a.activeEnterMode),a.elementPath().isContextFor("p")||(b=CKEDITOR.ENTER_BR,c=1),a.fire("saveSnapshot"),b==CKEDITOR.ENTER_BR?l(a,b,null,c):k(a,b,null,c),a.fire("saveSnapshot"))}function f(a){a=a.getSelection().getRanges(!0);
-for(var b=a.length-1;0<b;b--)a[b].deleteContents();return a[0]}function c(a){var b=a.startContainer.getAscendant(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&"true"==a.getAttribute("contenteditable")},!0);if(a.root.equals(b))return a;b=new CKEDITOR.dom.range(b);b.moveToRange(a);return b}CKEDITOR.plugins.add("enterkey",{init:function(b){b.addCommand("enter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){a(b)}});b.addCommand("shiftEnter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){a(b,
-b.activeShiftEnterMode,1)}});b.setKeystroke([[13,"enter"],[CKEDITOR.SHIFT+13,"shiftEnter"]])}});var e=CKEDITOR.dom.walker.whitespaces(),h=CKEDITOR.dom.walker.bookmark();CKEDITOR.plugins.enterkey={enterBlock:function(a,g,k,m){if(k=k||f(a)){k=c(k);var u=k.document,t=k.checkStartOfBlock(),n=k.checkEndOfBlock(),q=a.elementPath(k.startContainer),x=q.block,A=g==CKEDITOR.ENTER_DIV?"div":"p",C;if(t&&n){if(x&&(x.is("li")||x.getParent().is("li"))){x.is("li")||(x=x.getParent());k=x.getParent();C=k.getParent();
-m=!x.hasPrevious();var r=!x.hasNext(),A=a.getSelection(),w=A.createBookmarks(),t=x.getDirection(1),n=x.getAttribute("class"),B=x.getAttribute("style"),z=C.getDirection(1)!=t;a=a.enterMode!=CKEDITOR.ENTER_BR||z||B||n;if(C.is("li"))m||r?(m&&r&&k.remove(),x[r?"insertAfter":"insertBefore"](C)):x.breakParent(C);else{if(a)if(q.block.is("li")?(C=u.createElement(g==CKEDITOR.ENTER_P?"p":"div"),z&&C.setAttribute("dir",t),B&&C.setAttribute("style",B),n&&C.setAttribute("class",n),x.moveChildren(C)):C=q.block,
-m||r)C[m?"insertBefore":"insertAfter"](k);else x.breakParent(k),C.insertAfter(k);else if(x.appendBogus(!0),m||r)for(;u=x[m?"getFirst":"getLast"]();)u[m?"insertBefore":"insertAfter"](k);else for(x.breakParent(k);u=x.getLast();)u.insertAfter(k);x.remove()}A.selectBookmarks(w);return}if(x&&x.getParent().is("blockquote")){x.breakParent(x.getParent());x.getPrevious().getFirst(CKEDITOR.dom.walker.invisible(1))||x.getPrevious().remove();x.getNext().getFirst(CKEDITOR.dom.walker.invisible(1))||x.getNext().remove();
-k.moveToElementEditStart(x);k.select();return}}else if(x&&x.is("pre")&&!n){l(a,g,k,m);return}if(t=k.splitBlock(A)){g=t.previousBlock;x=t.nextBlock;q=t.wasStartOfBlock;a=t.wasEndOfBlock;x?(w=x.getParent(),w.is("li")&&(x.breakParent(w),x.move(x.getNext(),1))):g&&(w=g.getParent())&&w.is("li")&&(g.breakParent(w),w=g.getNext(),k.moveToElementEditStart(w),g.move(g.getPrevious()));if(q||a){if(g){if(g.is("li")||!b.test(g.getName())&&!g.is("pre"))C=g.clone()}else x&&(C=x.clone());C?m&&!C.is("li")&&C.renameNode(A):
-w&&w.is("li")?C=w:(C=u.createElement(A),g&&(r=g.getDirection())&&C.setAttribute("dir",r));if(u=t.elementPath)for(m=0,A=u.elements.length;m<A;m++){w=u.elements[m];if(w.equals(u.block)||w.equals(u.blockLimit))break;CKEDITOR.dtd.$removeEmpty[w.getName()]&&(w=w.clone(),C.moveChildren(w),C.append(w))}C.appendBogus();C.getParent()||k.insertNode(C);C.is("li")&&C.removeAttribute("value");!CKEDITOR.env.ie||!q||a&&g.getChildCount()||(k.moveToElementEditStart(a?g:C),k.select());k.moveToElementEditStart(q&&!a?
-x:C)}else x.is("li")&&(C=k.clone(),C.selectNodeContents(x),C=new CKEDITOR.dom.walker(C),C.evaluator=function(a){return!(h(a)||e(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in CKEDITOR.dtd.$inline&&!(a.getName()in CKEDITOR.dtd.$empty))},(w=C.next())&&w.type==CKEDITOR.NODE_ELEMENT&&w.is("ul","ol")&&(CKEDITOR.env.needsBrFiller?u.createElement("br"):u.createText(" ")).insertBefore(w)),x&&k.moveToElementEditStart(x);k.select();k.scrollIntoView()}}},enterBr:function(a,c,e,h){if(e=e||f(a)){var l=e.document,
-m=e.checkEndOfBlock(),n=new CKEDITOR.dom.elementPath(a.getSelection().getStartElement()),q=n.block,x=q&&n.block.getName();h||"li"!=x?(!h&&m&&b.test(x)?(m=q.getDirection())?(l=l.createElement("div"),l.setAttribute("dir",m),l.insertAfter(q),e.setStart(l,0)):(l.createElement("br").insertAfter(q),CKEDITOR.env.gecko&&l.createText("").insertAfter(q),e.setStartAt(q.getNext(),CKEDITOR.env.ie?CKEDITOR.POSITION_BEFORE_START:CKEDITOR.POSITION_AFTER_START)):(a="pre"==x&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?
-l.createText("\r"):l.createElement("br"),e.deleteContents(),e.insertNode(a),CKEDITOR.env.needsBrFiller?(l.createText("").insertAfter(a),m&&(q||n.blockLimit).appendBogus(),a.getNext().$.nodeValue="",e.setStartAt(a.getNext(),CKEDITOR.POSITION_AFTER_START)):e.setStartAt(a,CKEDITOR.POSITION_AFTER_END)),e.collapse(!0),e.select(),e.scrollIntoView()):k(a,c,e,h)}}};var m=CKEDITOR.plugins.enterkey,l=m.enterBr,k=m.enterBlock,b=/^h[1-6]$/}(),function(){function a(a,c){var e={},h=[],m={nbsp:" ",shy:"­",gt:"\x3e",
-lt:"\x3c",amp:"\x26",apos:"'",quot:'"'};a=a.replace(/\b(nbsp|shy|gt|lt|amp|apos|quot)(?:,|$)/g,function(a,b){var f=c?"\x26"+b+";":m[b];e[f]=c?m[b]:"\x26"+b+";";h.push(f);return""});if(!c&&a){a=a.split(",");var l=document.createElement("div"),k;l.innerHTML="\x26"+a.join(";\x26")+";";k=l.innerHTML;l=null;for(l=0;l<k.length;l++){var b=k.charAt(l);e[b]="\x26"+a[l]+";";h.push(b)}}e.regex=h.join(c?"|":"");return e}CKEDITOR.plugins.add("entities",{afterInit:function(f){function c(a){return b[a]}function e(a){return"force"!=
-h.entities_processNumerical&&l[a]?l[a]:"\x26#"+a.charCodeAt(0)+";"}var h=f.config;if(f=(f=f.dataProcessor)&&f.htmlFilter){var m=[];!1!==h.basicEntities&&m.push("nbsp,gt,lt,amp");h.entities&&(m.length&&m.push("quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro"),
+[CKEDITOR.CTRL+85,"underline"]])}}),CKEDITOR.config.coreStyles_bold={element:"strong",overrides:"b"},CKEDITOR.config.coreStyles_italic={element:"em",overrides:"i"},CKEDITOR.config.coreStyles_underline={element:"u"},CKEDITOR.config.coreStyles_strike={element:"s",overrides:"strike"},CKEDITOR.config.coreStyles_subscript={element:"sub"},CKEDITOR.config.coreStyles_superscript={element:"sup"},function(){var a={exec:function(a){var c=a.getCommand("blockquote").state,f=a.getSelection(),h=f&&f.getRanges()[0];
+if(h){var m=f.createBookmarks();if(CKEDITOR.env.ie){var l=m[0].startNode,k=m[0].endNode,d;if(l&&"blockquote"==l.getParent().getName())for(d=l;d=d.getNext();)if(d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()){l.move(d,!0);break}if(k&&"blockquote"==k.getParent().getName())for(d=k;d=d.getPrevious();)if(d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()){k.move(d);break}}var b=h.createIterator();b.enlargeBr=a.config.enterMode!=CKEDITOR.ENTER_BR;if(c==CKEDITOR.TRISTATE_OFF){for(l=[];c=b.getNextParagraph();)l.push(c);
+1>l.length&&(c=a.document.createElement(a.config.enterMode==CKEDITOR.ENTER_P?"p":"div"),k=m.shift(),h.insertNode(c),c.append(new CKEDITOR.dom.text("",a.document)),h.moveToBookmark(k),h.selectNodeContents(c),h.collapse(!0),k=h.createBookmark(),l.push(c),m.unshift(k));d=l[0].getParent();h=[];for(k=0;k<l.length;k++)c=l[k],d=d.getCommonAncestor(c.getParent());for(c={table:1,tbody:1,tr:1,ol:1,ul:1};c[d.getName()];)d=d.getParent();for(k=null;0<l.length;){for(c=l.shift();!c.getParent().equals(d);)c=c.getParent();
+c.equals(k)||h.push(c);k=c}for(;0<h.length;)if(c=h.shift(),"blockquote"==c.getName()){for(k=new CKEDITOR.dom.documentFragment(a.document);c.getFirst();)k.append(c.getFirst().remove()),l.push(k.getLast());k.replace(c)}else l.push(c);h=a.document.createElement("blockquote");for(h.insertBefore(l[0]);0<l.length;)c=l.shift(),h.append(c)}else if(c==CKEDITOR.TRISTATE_ON){k=[];for(d={};c=b.getNextParagraph();){for(l=h=null;c.getParent();){if("blockquote"==c.getParent().getName()){h=c.getParent();l=c;break}c=
+c.getParent()}h&&l&&!l.getCustomData("blockquote_moveout")&&(k.push(l),CKEDITOR.dom.element.setMarker(d,l,"blockquote_moveout",!0))}CKEDITOR.dom.element.clearAllMarkers(d);c=[];l=[];for(d={};0<k.length;)b=k.shift(),h=b.getParent(),b.getPrevious()?b.getNext()?(b.breakParent(b.getParent()),l.push(b.getNext())):b.remove().insertAfter(h):b.remove().insertBefore(h),h.getCustomData("blockquote_processed")||(l.push(h),CKEDITOR.dom.element.setMarker(d,h,"blockquote_processed",!0)),c.push(b);CKEDITOR.dom.element.clearAllMarkers(d);
+for(k=l.length-1;0<=k;k--){h=l[k];a:{d=h;for(var b=0,g=d.getChildCount(),p=void 0;b<g&&(p=d.getChild(b));b++)if(p.type==CKEDITOR.NODE_ELEMENT&&p.isBlockBoundary()){d=!1;break a}d=!0}d&&h.remove()}if(a.config.enterMode==CKEDITOR.ENTER_BR)for(h=!0;c.length;)if(b=c.shift(),"div"==b.getName()){k=new CKEDITOR.dom.documentFragment(a.document);!h||!b.getPrevious()||b.getPrevious().type==CKEDITOR.NODE_ELEMENT&&b.getPrevious().isBlockBoundary()||k.append(a.document.createElement("br"));for(h=b.getNext()&&
+!(b.getNext().type==CKEDITOR.NODE_ELEMENT&&b.getNext().isBlockBoundary());b.getFirst();)b.getFirst().remove().appendTo(k);h&&k.append(a.document.createElement("br"));k.replace(b);h=!1}}f.selectBookmarks(m);a.focus()}},refresh:function(a,c){this.setState(a.elementPath(c.block||c.blockLimit).contains("blockquote",1)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)},context:"blockquote",allowedContent:"blockquote",requiredContent:"blockquote"};CKEDITOR.plugins.add("blockquote",{init:function(e){e.blockless||
+(e.addCommand("blockquote",a),e.ui.addButton&&e.ui.addButton("Blockquote",{label:e.lang.blockquote.toolbar,command:"blockquote",toolbar:"blocks,10"}))}})}(),"use strict",function(){function a(a,b,d){b.type||(b.type="auto");if(d&&!1===a.fire("beforePaste",b)||!b.dataValue&&b.dataTransfer.isEmpty())return!1;b.dataValue||(b.dataValue="");if(CKEDITOR.env.gecko&&"drop"==b.method&&a.toolbox)a.once("afterPaste",function(){a.toolbox.focus()});return a.fire("paste",b)}function e(b){function d(){var a=b.editable();
+if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var c=function(a){b.readOnly&&"cut"==a.name||A.initPasteDataTransfer(a,b);a.data.preventDefault()};a.on("copy",c);a.on("cut",c);a.on("cut",function(){b.readOnly||b.extractSelectedHtml()},null,null,999)}a.on(A.mainPasteEvent,function(a){"beforepaste"==A.mainPasteEvent&&C||x(a)});"beforepaste"==A.mainPasteEvent&&(a.on("paste",function(a){E||(f(),a.data.preventDefault(),x(a),k("paste")||b.openDialog("paste"))}),a.on("contextmenu",h,null,null,0),
+a.on("beforepaste",function(a){!a.data||a.data.$.ctrlKey||a.data.$.shiftKey||h()},null,null,0));a.on("beforecut",function(){!C&&l(b)});var e;a.attachListener(CKEDITOR.env.ie?a:b.document.getDocumentElement(),"mouseup",function(){e=setTimeout(function(){F()},0)});b.on("destroy",function(){clearTimeout(e)});a.on("keyup",F)}function c(a){return{type:a,canUndo:"cut"==a,startDisabled:!0,fakeKeystroke:"cut"==a?CKEDITOR.CTRL+88:CKEDITOR.CTRL+67,exec:function(){"cut"==this.type&&l();var a;var d=this.type;
+if(CKEDITOR.env.ie)a=k(d);else try{a=b.document.$.execCommand(d,!1,null)}catch(c){a=!1}a||b.showNotification(b.lang.clipboard[this.type+"Error"]);return a}}}function e(){return{canUndo:!1,async:!0,fakeKeystroke:CKEDITOR.CTRL+86,exec:function(b,d){var c=this,g=function(d,g){d&&a(b,d,!!g);b.fire("afterCommandExec",{name:"paste",command:c,returnValue:!!d})};"string"==typeof d?g({dataValue:d,method:"paste",dataTransfer:A.initPasteDataTransfer()},1):b.getClipboardData(g)}}}function f(){E=1;setTimeout(function(){E=
+0},100)}function h(){C=1;setTimeout(function(){C=0},10)}function k(a){var d=b.document,c=d.getBody(),e=!1,f=function(){e=!0};c.on(a,f);7<CKEDITOR.env.version?d.$.execCommand(a):d.$.selection.createRange().execCommand(a);c.removeListener(a,f);return e}function l(){if(CKEDITOR.env.ie&&!CKEDITOR.env.quirks){var a=b.getSelection(),d,c,e;a.getType()==CKEDITOR.SELECTION_ELEMENT&&(d=a.getSelectedElement())&&(c=a.getRanges()[0],e=b.document.createText(""),e.insertBefore(d),c.setStartBefore(e),c.setEndAfter(d),
+a.selectRanges([c]),setTimeout(function(){d.getParent()&&(e.remove(),a.selectElement(d))},0))}}function m(a,d){var c=b.document,e=b.editable(),f=function(a){a.cancel()},h;if(!c.getById("cke_pastebin")){var k=b.getSelection(),n=k.createBookmarks();CKEDITOR.env.ie&&k.root.fire("selectionchange");var l=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!e.is("body")||CKEDITOR.env.ie?"div":"body",c);l.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var p=0,c=c.getWindow();CKEDITOR.env.webkit?(e.append(l),
+l.addClass("cke_editable"),e.is("body")||(p="static"!=e.getComputedStyle("position")?e:CKEDITOR.dom.element.get(e.$.offsetParent),p=p.getDocumentPosition().y)):e.getAscendant(CKEDITOR.env.ie?"body":"html",1).append(l);l.setStyles({position:"absolute",top:c.getScrollPosition().y-p+10+"px",width:"1px",height:Math.max(1,c.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0});CKEDITOR.env.safari&&l.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text"));(p=l.getParent().isReadOnly())?
+(l.setOpacity(0),l.setAttribute("contenteditable",!0)):l.setStyle("ltr"==b.config.contentsLangDirection?"left":"right","-10000px");b.on("selectionChange",f,null,null,0);if(CKEDITOR.env.webkit||CKEDITOR.env.gecko)h=e.once("blur",f,null,null,-100);p&&l.focus();p=new CKEDITOR.dom.range(l);p.selectNodeContents(l);var q=p.select();CKEDITOR.env.ie&&(h=e.once("blur",function(){b.lockSelection(q)}));var u=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=
+u);h&&h.removeListener();CKEDITOR.env.ie&&e.focus();k.selectBookmarks(n);l.remove();var a;CKEDITOR.env.webkit&&(a=l.getFirst())&&a.is&&a.hasClass("Apple-style-span")&&(l=a);b.removeListener("selectionChange",f);d(l.getHtml())},0)}}function y(){if("paste"==A.mainPasteEvent)return b.fire("beforePaste",{type:"auto",method:"paste"}),!1;b.focus();f();var a=b.focusManager;a.lock();if(b.editable().fire(A.mainPasteEvent)&&!k("paste"))return a.unlock(),!1;a.unlock();return!0}function t(a){if("wysiwyg"==b.mode)switch(a.data.keyCode){case CKEDITOR.CTRL+
+86:case CKEDITOR.SHIFT+45:a=b.editable();f();"paste"==A.mainPasteEvent&&a.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+46:b.fire("saveSnapshot"),setTimeout(function(){b.fire("saveSnapshot")},50)}}function x(d){var c={type:"auto",method:"paste",dataTransfer:A.initPasteDataTransfer(d)};c.dataTransfer.cacheData();var e=!1!==b.fire("beforePaste",c);e&&A.canClipboardApiBeTrusted(c.dataTransfer,b)?(d.data.preventDefault(),setTimeout(function(){a(b,c)},0)):m(d,function(d){c.dataValue=
+d.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,"");e&&a(b,c)})}function F(){if("wysiwyg"==b.mode){var a=z("paste");b.getCommand("cut").setState(z("cut"));b.getCommand("copy").setState(z("copy"));b.getCommand("paste").setState(a);b.fire("pasteState",a)}}function z(a){if(D&&a in{paste:1,cut:1})return CKEDITOR.TRISTATE_DISABLED;if("paste"==a)return CKEDITOR.TRISTATE_OFF;a=b.getSelection();var d=a.getRanges();return a.getType()==CKEDITOR.SELECTION_NONE||1==d.length&&d[0].collapsed?CKEDITOR.TRISTATE_DISABLED:
+CKEDITOR.TRISTATE_OFF}var A=CKEDITOR.plugins.clipboard,C=0,E=0,D=0;(function(){b.on("key",t);b.on("contentDom",d);b.on("selectionChange",function(a){D=a.data.selection.getRanges()[0].checkReadOnly();F()});b.contextMenu&&b.contextMenu.addListener(function(a,b){D=b.getRanges()[0].checkReadOnly();return{cut:z("cut"),copy:z("copy"),paste:z("paste")}})})();(function(){function a(d,c,e,f,h){var k=b.lang.clipboard[c];b.addCommand(c,e);b.ui.addButton&&b.ui.addButton(d,{label:k,command:c,toolbar:"clipboard,"+
+f});b.addMenuItems&&b.addMenuItem(c,{label:k,command:c,group:"clipboard",order:h})}a("Cut","cut",c("cut"),10,1);a("Copy","copy",c("copy"),20,4);a("Paste","paste",e(),30,8)})();b.getClipboardData=function(a,d){function c(a){a.removeListener();a.cancel();d(a.data)}function e(a){a.removeListener();a.cancel();l=!0;d({type:k,dataValue:a.data.dataValue,dataTransfer:a.data.dataTransfer,method:"paste"})}function f(){this.customTitle=a&&a.title}var h=!1,k="auto",l=!1;d||(d=a,a=null);b.on("paste",c,null,null,
+0);b.on("beforePaste",function(a){a.removeListener();h=!0;k=a.data.type},null,null,1E3);!1===y()&&(b.removeListener("paste",c),h&&b.fire("pasteDialog",f)?(b.on("pasteDialogCommit",e),b.on("dialogHide",function(a){a.removeListener();a.data.removeListener("pasteDialogCommit",e);setTimeout(function(){l||d(null)},10)})):d(null))}}function c(a){if(CKEDITOR.env.webkit){if(!a.match(/^[^<]*$/g)&&!a.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi)&&
+!a.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else if(CKEDITOR.env.gecko){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}else return"html";return"htmlifiedtext"}function f(a,b){function d(a){return CKEDITOR.tools.repeat("\x3c/p\x3e\x3cp\x3e",~~(a/2))+(1==a%2?"\x3cbr\x3e":"")}b=b.replace(/\s+/g," ").replace(/> +</g,"\x3e\x3c").replace(/<br ?\/>/gi,"\x3cbr\x3e");b=b.replace(/<\/?[A-Z]+>/g,function(a){return a.toLowerCase()});if(b.match(/^[^<]$/))return b;CKEDITOR.env.webkit&&
+-1<b.indexOf("\x3cdiv\x3e")&&(b=b.replace(/^(<div>(<br>|)<\/div>)(?!$|(<div>(<br>|)<\/div>))/g,"\x3cbr\x3e").replace(/^(<div>(<br>|)<\/div>){2}(?!$)/g,"\x3cdiv\x3e\x3c/div\x3e"),b.match(/<div>(<br>|)<\/div>/)&&(b="\x3cp\x3e"+b.replace(/(<div>(<br>|)<\/div>)+/g,function(a){return d(a.split("\x3c/div\x3e\x3cdiv\x3e").length+1)})+"\x3c/p\x3e"),b=b.replace(/<\/div><div>/g,"\x3cbr\x3e"),b=b.replace(/<\/?div>/g,""));CKEDITOR.env.gecko&&a.enterMode!=CKEDITOR.ENTER_BR&&(CKEDITOR.env.gecko&&(b=b.replace(/^<br><br>$/,
+"\x3cbr\x3e")),-1<b.indexOf("\x3cbr\x3e\x3cbr\x3e")&&(b="\x3cp\x3e"+b.replace(/(<br>){2,}/g,function(a){return d(a.length/4)})+"\x3c/p\x3e"));return l(a,b)}function h(){function a(){var b={},d;for(d in CKEDITOR.dtd)"$"!=d.charAt(0)&&"div"!=d&&"span"!=d&&(b[d]=1);return b}var b={};return{get:function(d){return"plain-text"==d?b.plainText||(b.plainText=new CKEDITOR.filter("br")):"semantic-content"==d?((d=b.semanticContent)||(d=new CKEDITOR.filter,d.allow({$1:{elements:a(),attributes:!0,styles:!1,classes:!1}}),
+d=b.semanticContent=d),d):d?new CKEDITOR.filter(d):null}}}function m(a,b,d){b=CKEDITOR.htmlParser.fragment.fromHtml(b);var c=new CKEDITOR.htmlParser.basicWriter;d.applyTo(b,!0,!1,a.activeEnterMode);b.writeHtml(c);return c.getHtml()}function l(a,b){a.enterMode==CKEDITOR.ENTER_BR?b=b.replace(/(<\/p><p>)+/g,function(a){return CKEDITOR.tools.repeat("\x3cbr\x3e",a.length/7*2)}).replace(/<\/?p>/g,""):a.enterMode==CKEDITOR.ENTER_DIV&&(b=b.replace(/<(\/)?p>/g,"\x3c$1div\x3e"));return b}function k(a){a.data.preventDefault();
+a.data.$.dataTransfer.dropEffect="none"}function d(b){var d=CKEDITOR.plugins.clipboard;b.on("contentDom",function(){function c(d,e,f){e.select();a(b,{dataTransfer:f,method:"drop"},1);f.sourceEditor.fire("saveSnapshot");f.sourceEditor.editable().extractHtmlFromRange(d);f.sourceEditor.getSelection().selectRanges([d]);f.sourceEditor.fire("saveSnapshot")}function e(c,f){c.select();a(b,{dataTransfer:f,method:"drop"},1);d.resetDragDataTransfer()}function f(a,d,c){var e={$:a.data.$,target:a.data.getTarget()};
+d&&(e.dragRange=d);c&&(e.dropRange=c);!1===b.fire(a.name,e)&&a.data.preventDefault()}function h(a){a.type!=CKEDITOR.NODE_ELEMENT&&(a=a.getParent());return a.getChildCount()}var k=b.editable(),l=CKEDITOR.plugins.clipboard.getDropTarget(b),m=b.ui.space("top"),y=b.ui.space("bottom");d.preventDefaultDropOnElement(m);d.preventDefaultDropOnElement(y);k.attachListener(l,"dragstart",f);k.attachListener(b,"dragstart",d.resetDragDataTransfer,d,null,1);k.attachListener(b,"dragstart",function(a){d.initDragDataTransfer(a,
+b)},null,null,2);k.attachListener(b,"dragstart",function(){var a=d.dragRange=b.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(d.dragStartContainerChildCount=a?h(a.startContainer):null,d.dragEndContainerChildCount=a?h(a.endContainer):null)},null,null,100);k.attachListener(l,"dragend",f);k.attachListener(b,"dragend",d.initDragDataTransfer,d,null,1);k.attachListener(b,"dragend",d.resetDragDataTransfer,d,null,100);k.attachListener(l,"dragover",function(a){var b=a.data.getTarget();
+b&&b.is&&b.is("html")?a.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&a.data.$.dataTransfer.types.contains("Files")&&a.data.preventDefault()});k.attachListener(l,"drop",function(a){if(!a.data.$.defaultPrevented){a.data.preventDefault();var c=a.data.getTarget();if(!c.isReadOnly()||c.type==CKEDITOR.NODE_ELEMENT&&c.is("html")){var c=d.getRangeAtDropPosition(a,b),e=d.dragRange;c&&f(a,e,c)}}},null,null,9999);k.attachListener(b,"drop",d.initDragDataTransfer,d,null,
+1);k.attachListener(b,"drop",function(a){if(a=a.data){var f=a.dropRange,h=a.dragRange,k=a.dataTransfer;k.getTransferType(b)==CKEDITOR.DATA_TRANSFER_INTERNAL?setTimeout(function(){d.internalDrop(h,f,k,b)},0):k.getTransferType(b)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c(h,f,k):e(f,k)}},null,null,9999)})}CKEDITOR.plugins.add("clipboard",{requires:"dialog",init:function(a){var b,k=h();a.config.forcePasteAsPlainText?b="plain-text":a.config.pasteFilter?b=a.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in
+a.config||(b="semantic-content");a.pasteFilter=k.get(b);e(a);d(a);CKEDITOR.dialog.add("paste",CKEDITOR.getUrl(this.path+"dialogs/paste.js"));if(CKEDITOR.env.gecko){var l=["image/png","image/jpeg","image/gif"],w;a.on("paste",function(b){var d=b.data,c=d.dataTransfer;if(!d.dataValue&&"paste"==d.method&&c&&1==c.getFilesCount()&&w!=c.id&&(c=c.getFile(0),-1!=CKEDITOR.tools.indexOf(l,c.type))){var e=new FileReader;e.addEventListener("load",function(){b.data.dataValue='\x3cimg src\x3d"'+e.result+'" /\x3e';
+a.fire("paste",b.data)},!1);e.addEventListener("abort",function(){a.fire("paste",b.data)},!1);e.addEventListener("error",function(){a.fire("paste",b.data)},!1);e.readAsDataURL(c);w=d.dataTransfer.id;b.stop()}},null,null,1)}a.on("paste",function(b){b.data.dataTransfer||(b.data.dataTransfer=new CKEDITOR.plugins.clipboard.dataTransfer);if(!b.data.dataValue){var d=b.data.dataTransfer,c=d.getData("text/html");if(c)b.data.dataValue=c,b.data.type="html";else if(c=d.getData("text/plain"))b.data.dataValue=
+a.editable().transformPlainTextToHtml(c),b.data.type="text"}},null,null,1);a.on("paste",function(a){var b=a.data.dataValue,d=CKEDITOR.dtd.$block;-1<b.indexOf("Apple-")&&(b=b.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi," "),"html"!=a.data.type&&(b=b.replace(/<span class="Apple-tab-span"[^>]*>([^<]*)<\/span>/gi,function(a,b){return b.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;")})),-1<b.indexOf('\x3cbr class\x3d"Apple-interchange-newline"\x3e')&&(a.data.startsWithEOL=1,a.data.preSniffing=
+"html",b=b.replace(/<br class="Apple-interchange-newline">/,"")),b=b.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1"));if(b.match(/^<[^<]+cke_(editable|contents)/i)){var c,g,e=new CKEDITOR.dom.element("div");for(e.setHtml(b);1==e.getChildCount()&&(c=e.getFirst())&&c.type==CKEDITOR.NODE_ELEMENT&&(c.hasClass("cke_editable")||c.hasClass("cke_contents"));)e=g=c;g&&(b=g.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?b=b.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(b,c){return c.toLowerCase()in d?(a.data.preSniffing=
+"html","\x3c"+c):b}):CKEDITOR.env.webkit?b=b.replace(/<\/(\w+)><div><br><\/div>$/,function(b,c){return c in d?(a.data.endsWithEOL=1,"\x3c/"+c+"\x3e"):b}):CKEDITOR.env.gecko&&(b=b.replace(/(\s)<br>$/,"$1"));a.data.dataValue=b},null,null,3);a.on("paste",function(b){b=b.data;var d=b.type,e=b.dataValue,h,l=a.config.clipboard_defaultContentType||"html",p=b.dataTransfer.getTransferType(a);h="html"==d||"html"==b.preSniffing?"html":c(e);"htmlifiedtext"==h&&(e=f(a.config,e));"text"==d&&"html"==h?e=m(a,e,k.get("plain-text")):
+p==CKEDITOR.DATA_TRANSFER_EXTERNAL&&a.pasteFilter&&!b.dontFilter&&(e=m(a,e,a.pasteFilter));b.startsWithEOL&&(e='\x3cbr data-cke-eol\x3d"1"\x3e'+e);b.endsWithEOL&&(e+='\x3cbr data-cke-eol\x3d"1"\x3e');"auto"==d&&(d="html"==h||"html"==l?"html":"text");b.type=d;b.dataValue=e;delete b.preSniffing;delete b.startsWithEOL;delete b.endsWithEOL},null,null,6);a.on("paste",function(b){b=b.data;b.dataValue&&(a.insertHtml(b.dataValue,b.type,b.range),setTimeout(function(){a.fire("afterPaste")},0))},null,null,1E3);
+a.on("pasteDialog",function(b){setTimeout(function(){a.openDialog("paste",b.data)},0)})}});CKEDITOR.plugins.clipboard={isCustomCopyCutSupported:!CKEDITOR.env.ie&&!CKEDITOR.env.iOS,isCustomDataTypesSupported:!CKEDITOR.env.ie,isFileApiSupported:!CKEDITOR.env.ie||9<CKEDITOR.env.version,mainPasteEvent:CKEDITOR.env.ie&&!CKEDITOR.env.edge?"beforepaste":"paste",canClipboardApiBeTrusted:function(a,b){return a.getTransferType(b)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||CKEDITOR.env.chrome&&!a.isEmpty()||CKEDITOR.env.gecko&&
+(a.getData("text/html")||a.getFilesCount())?!0:!1},getDropTarget:function(a){var b=a.editable();return CKEDITOR.env.ie&&9>CKEDITOR.env.version||b.isInline()?b:a.document},fixSplitNodesAfterDrop:function(a,b,d,c){function e(a,d,c){var g=a;g.type==CKEDITOR.NODE_TEXT&&(g=a.getParent());if(g.equals(d)&&c!=d.getChildCount())return a=b.startContainer.getChild(b.startOffset-1),d=b.startContainer.getChild(b.startOffset),a&&a.type==CKEDITOR.NODE_TEXT&&d&&d.type==CKEDITOR.NODE_TEXT&&(c=a.getLength(),a.setText(a.getText()+
+d.getText()),d.remove(),b.setStart(a,c),b.collapse(!0)),!0}var f=b.startContainer;"number"==typeof c&&"number"==typeof d&&f.type==CKEDITOR.NODE_ELEMENT&&(e(a.startContainer,f,d)||e(a.endContainer,f,c))},isDropRangeAffectedByDragRange:function(a,b){var d=b.startContainer,c=b.endOffset;return a.endContainer.equals(d)&&a.endOffset<=c||a.startContainer.getParent().equals(d)&&a.startContainer.getIndex()<c||a.endContainer.getParent().equals(d)&&a.endContainer.getIndex()<c?!0:!1},internalDrop:function(b,
+d,c,e){var f=CKEDITOR.plugins.clipboard,h=e.editable(),k,l;e.fire("saveSnapshot");e.fire("lockSnapshot",{dontUpdate:1});CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(b,d,f.dragStartContainerChildCount,f.dragEndContainerChildCount);(l=this.isDropRangeAffectedByDragRange(b,d))||(k=b.createBookmark(!1));f=d.clone().createBookmark(!1);l&&(k=b.createBookmark(!1));b=k.startNode;d=k.endNode;l=f.startNode;d&&b.getPosition(l)&CKEDITOR.POSITION_PRECEDING&&d.getPosition(l)&CKEDITOR.POSITION_FOLLOWING&&
+l.insertBefore(b);b=e.createRange();b.moveToBookmark(k);h.extractHtmlFromRange(b,1);d=e.createRange();d.moveToBookmark(f);a(e,{dataTransfer:c,method:"drop",range:d},1);e.fire("unlockSnapshot")},getRangeAtDropPosition:function(a,b){var d=a.data.$,c=d.clientX,e=d.clientY,f=b.getSelection(!0).getRanges()[0],h=b.createRange();if(a.data.testRange)return a.data.testRange;if(document.caretRangeFromPoint)d=b.document.$.caretRangeFromPoint(c,e),h.setStart(CKEDITOR.dom.node(d.startContainer),d.startOffset),
+h.collapse(!0);else if(d.rangeParent)h.setStart(CKEDITOR.dom.node(d.rangeParent),d.rangeOffset),h.collapse(!0);else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&f&&b.editable().hasFocus)return f;if(document.body.createTextRange){b.focus();d=b.document.getBody().$.createTextRange();try{for(var k=!1,l=0;20>l&&!k;l++){if(!k)try{d.moveToPoint(c,e-l),k=!0}catch(m){}if(!k)try{d.moveToPoint(c,e+l),k=!0}catch(t){}}if(k){var x="cke-temp-"+(new Date).getTime();d.pasteHTML('\x3cspan id\x3d"'+x+'"\x3e​\x3c/span\x3e');
+var F=b.document.getById(x);h.moveToPosition(F,CKEDITOR.POSITION_BEFORE_START);F.remove()}else{var z=b.document.$.elementFromPoint(c,e),A=new CKEDITOR.dom.element(z),C;if(A.equals(b.editable())||"html"==A.getName())return f&&f.startContainer&&!f.startContainer.equals(b.editable())?f:null;C=A.getClientRect();c<C.left?h.setStartAt(A,CKEDITOR.POSITION_AFTER_START):h.setStartAt(A,CKEDITOR.POSITION_BEFORE_END);h.collapse(!0)}}catch(E){return null}}else return null}return h},initDragDataTransfer:function(a,
+b){var d=a.data.$?a.data.$.dataTransfer:null,c=new this.dataTransfer(d,b);d?this.dragData&&c.id==this.dragData.id?c=this.dragData:this.dragData=c:this.dragData?c=this.dragData:this.dragData=c;a.data.dataTransfer=c},resetDragDataTransfer:function(){this.dragData=null},initPasteDataTransfer:function(a,b){if(this.isCustomCopyCutSupported){if(a&&a.data&&a.data.$){var d=new this.dataTransfer(a.data.$.clipboardData,b);this.copyCutData&&d.id==this.copyCutData.id?(d=this.copyCutData,d.$=a.data.$.clipboardData):
+this.copyCutData=d;return d}return new this.dataTransfer(null,b)}return new this.dataTransfer(CKEDITOR.env.edge&&a&&a.data.$&&a.data.$.clipboardData||null,b)},preventDefaultDropOnElement:function(a){a&&a.on("dragover",k)}};var b=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?"cke/id":"Text";CKEDITOR.plugins.clipboard.dataTransfer=function(a,d){a&&(this.$=a);this._={metaRegExp:/^<meta.*?>/i,bodyRegExp:/<body(?:[\s\S]*?)>([\s\S]*)<\/body>/i,fragmentRegExp:/\x3c!--(?:Start|End)Fragment--\x3e/g,
+data:{},files:[],normalizeType:function(a){a=a.toLowerCase();return"text"==a||"text/plain"==a?"Text":"url"==a?"URL":a}};this.id=this.getData(b);this.id||(this.id="Text"==b?"":"cke-"+CKEDITOR.tools.getUniqueId());if("Text"!=b)try{this.$.setData(b,this.id)}catch(c){}d&&(this.sourceEditor=d,this.setData("text/html",d.getSelectedHtml(1)),"Text"==b||this.getData("text/plain")||this.setData("text/plain",d.getSelection().getSelectedText()))};CKEDITOR.DATA_TRANSFER_INTERNAL=1;CKEDITOR.DATA_TRANSFER_CROSS_EDITORS=
+2;CKEDITOR.DATA_TRANSFER_EXTERNAL=3;CKEDITOR.plugins.clipboard.dataTransfer.prototype={getData:function(a){a=this._.normalizeType(a);var b=this._.data[a];if(void 0===b||null===b||""===b)try{b=this.$.getData(a)}catch(d){}if(void 0===b||null===b||""===b)b="";"text/html"==a?(b=b.replace(this._.metaRegExp,""),(a=this._.bodyRegExp.exec(b))&&a.length&&(b=a[1],b=b.replace(this._.fragmentRegExp,""))):"Text"==a&&CKEDITOR.env.gecko&&this.getFilesCount()&&"file://"==b.substring(0,7)&&(b="");return b},setData:function(a,
+d){a=this._.normalizeType(a);this._.data[a]=d;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||"URL"==a||"Text"==a){"Text"==b&&"Text"==a&&(this.id=d);try{this.$.setData(a,d)}catch(c){}}},getTransferType:function(a){return this.sourceEditor?this.sourceEditor==a?CKEDITOR.DATA_TRANSFER_INTERNAL:CKEDITOR.DATA_TRANSFER_CROSS_EDITORS:CKEDITOR.DATA_TRANSFER_EXTERNAL},cacheData:function(){function a(d){d=b._.normalizeType(d);var c=b.getData(d);c&&(b._.data[d]=c)}if(this.$){var b=this,d,c;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(d=
+0;d<this.$.types.length;d++)a(this.$.types[d])}else a("Text"),a("URL");c=this._getImageFromClipboard();if(this.$&&this.$.files||c){this._.files=[];if(this.$.files&&this.$.files.length)for(d=0;d<this.$.files.length;d++)this._.files.push(this.$.files[d]);0===this._.files.length&&c&&this._.files.push(c)}}},getFilesCount:function(){return this._.files.length?this._.files.length:this.$&&this.$.files&&this.$.files.length?this.$.files.length:this._getImageFromClipboard()?1:0},getFile:function(a){return this._.files.length?
+this._.files[a]:this.$&&this.$.files&&this.$.files.length?this.$.files[a]:0===a?this._getImageFromClipboard():void 0},isEmpty:function(){var a={},d;if(this.getFilesCount())return!1;for(d in this._.data)a[d]=1;if(this.$)if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(var c=0;c<this.$.types.length;c++)a[this.$.types[c]]=1}else a.Text=1,a.URL=1;"Text"!=b&&(a[b]=0);for(d in a)if(a[d]&&""!==this.getData(d))return!1;return!0},_getImageFromClipboard:function(){var a;if(this.$&&
+this.$.items&&this.$.items[0])try{if((a=this.$.items[0].getAsFile())&&a.type)return a}catch(b){}}}}(),function(){CKEDITOR.plugins.add("panel",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_PANEL,CKEDITOR.ui.panel.handler)}});CKEDITOR.UI_PANEL="panel";CKEDITOR.ui.panel=function(a,c){c&&CKEDITOR.tools.extend(this,c);CKEDITOR.tools.extend(this,{className:"",css:[]});this.id=CKEDITOR.tools.getNextId();this.document=a;this.isFramed=this.forceIFrame||this.css.length;this._={blocks:{}}};CKEDITOR.ui.panel.handler=
+{create:function(a){return new CKEDITOR.ui.panel(a)}};var a=CKEDITOR.addTemplate("panel",'\x3cdiv lang\x3d"{langCode}" id\x3d"{id}" dir\x3d{dir} class\x3d"cke cke_reset_all {editorId} cke_panel cke_panel {cls} cke_{dir}" style\x3d"z-index:{z-index}" role\x3d"presentation"\x3e{frame}\x3c/div\x3e'),e=CKEDITOR.addTemplate("panel-frame",'\x3ciframe id\x3d"{id}" class\x3d"cke_panel_frame" role\x3d"presentation" frameborder\x3d"0" src\x3d"{src}"\x3e\x3c/iframe\x3e'),c=CKEDITOR.addTemplate("panel-frame-inner",
+'\x3c!DOCTYPE html\x3e\x3chtml class\x3d"cke_panel_container {env}" dir\x3d"{dir}" lang\x3d"{langCode}"\x3e\x3chead\x3e{css}\x3c/head\x3e\x3cbody class\x3d"cke_{dir}" style\x3d"margin:0;padding:0" onload\x3d"{onload}"\x3e\x3c/body\x3e\x3c/html\x3e');CKEDITOR.ui.panel.prototype={render:function(f,h){this.getHolderElement=function(){var a=this._.holder;if(!a){if(this.isFramed){var a=this.document.getById(this.id+"_frame"),d=a.getParent(),a=a.getFrameDocument();CKEDITOR.env.iOS&&d.setStyles({overflow:"scroll",
+"-webkit-overflow-scrolling":"touch"});d=CKEDITOR.tools.addFunction(CKEDITOR.tools.bind(function(){this.isLoaded=!0;if(this.onLoad)this.onLoad()},this));a.write(c.output(CKEDITOR.tools.extend({css:CKEDITOR.tools.buildStyleHtml(this.css),onload:"window.parent.CKEDITOR.tools.callFunction("+d+");"},m)));a.getWindow().$.CKEDITOR=CKEDITOR;a.on("keydown",function(a){var d=a.data.getKeystroke(),c=this.document.getById(this.id).getAttribute("dir");this._.onKeyDown&&!1===this._.onKeyDown(d)?a.data.preventDefault():
+(27==d||d==("rtl"==c?39:37))&&this.onEscape&&!1===this.onEscape(d)&&a.data.preventDefault()},this);a=a.getBody();a.unselectable();CKEDITOR.env.air&&CKEDITOR.tools.callFunction(d)}else a=this.document.getById(this.id);this._.holder=a}return a};var m={editorId:f.id,id:this.id,langCode:f.langCode,dir:f.lang.dir,cls:this.className,frame:"",env:CKEDITOR.env.cssClass,"z-index":f.config.baseFloatZIndex+1};if(this.isFramed){var l=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie?"javascript:void(function(){"+
+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())":"";m.frame=e.output({id:this.id+"_frame",src:l})}l=a.output(m);h&&h.push(l);return l},addBlock:function(a,c){c=this._.blocks[a]=c instanceof CKEDITOR.ui.panel.block?c:new CKEDITOR.ui.panel.block(this.getHolderElement(),c);this._.currentBlock||this.showBlock(a);return c},getBlock:function(a){return this._.blocks[a]},showBlock:function(a){a=this._.blocks[a];var c=this._.currentBlock,e=!this.forceIFrame||
+CKEDITOR.env.ie?this._.holder:this.document.getById(this.id+"_frame");c&&c.hide();this._.currentBlock=a;CKEDITOR.fire("ariaWidget",e);a._.focusIndex=-1;this._.onKeyDown=a.onKeyDown&&CKEDITOR.tools.bind(a.onKeyDown,a);a.show();return a},destroy:function(){this.element&&this.element.remove()}};CKEDITOR.ui.panel.block=CKEDITOR.tools.createClass({$:function(a,c){this.element=a.append(a.getDocument().createElement("div",{attributes:{tabindex:-1,"class":"cke_panel_block"},styles:{display:"none"}}));c&&
+CKEDITOR.tools.extend(this,c);this.element.setAttributes({role:this.attributes.role||"presentation","aria-label":this.attributes["aria-label"],title:this.attributes.title||this.attributes["aria-label"]});this.keys={};this._.focusIndex=-1;this.element.disableContextMenu()},_:{markItem:function(a){-1!=a&&(a=this.element.getElementsByTag("a").getItem(this._.focusIndex=a),CKEDITOR.env.webkit&&a.getDocument().getWindow().focus(),a.focus(),this.onMark&&this.onMark(a))}},proto:{show:function(){this.element.setStyle("display",
+"")},hide:function(){this.onHide&&!0===this.onHide.call(this)||this.element.setStyle("display","none")},onKeyDown:function(a,c){var e=this.keys[a];switch(e){case "next":for(var l=this._.focusIndex,e=this.element.getElementsByTag("a"),k;k=e.getItem(++l);)if(k.getAttribute("_cke_focus")&&k.$.offsetWidth){this._.focusIndex=l;k.focus();break}return k||c?!1:(this._.focusIndex=-1,this.onKeyDown(a,1));case "prev":l=this._.focusIndex;for(e=this.element.getElementsByTag("a");0<l&&(k=e.getItem(--l));){if(k.getAttribute("_cke_focus")&&
+k.$.offsetWidth){this._.focusIndex=l;k.focus();break}k=null}return k||c?!1:(this._.focusIndex=e.count(),this.onKeyDown(a,1));case "click":case "mouseup":return l=this._.focusIndex,(k=0<=l&&this.element.getElementsByTag("a").getItem(l))&&(k.$[e]?k.$[e]():k.$["on"+e]()),!1}return!0}}})}(),CKEDITOR.plugins.add("floatpanel",{requires:"panel"}),function(){function a(a,f,h,m,l){l=CKEDITOR.tools.genKey(f.getUniqueId(),h.getUniqueId(),a.lang.dir,a.uiColor||"",m.css||"",l||"");var k=e[l];k||(k=e[l]=new CKEDITOR.ui.panel(f,
+m),k.element=h.append(CKEDITOR.dom.element.createFromHtml(k.render(a),f)),k.element.setStyles({display:"none",position:"absolute"}));return k}var e={};CKEDITOR.ui.floatPanel=CKEDITOR.tools.createClass({$:function(c,e,h,m){function l(){g.hide()}h.forceIFrame=1;h.toolbarRelated&&c.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&(e=CKEDITOR.document.getById("cke_"+c.name));var k=e.getDocument();m=a(c,k,e,h,m||0);var d=m.element,b=d.getFirst(),g=this;d.disableContextMenu();this.element=d;this._={editor:c,
+panel:m,parentElement:e,definition:h,document:k,iframe:b,children:[],dir:c.lang.dir,showBlockParams:null};c.on("mode",l);c.on("resize",l);k.getWindow().on("resize",function(){this.reposition()},this)},proto:{addBlock:function(a,e){return this._.panel.addBlock(a,e)},addListBlock:function(a,e){return this._.panel.addListBlock(a,e)},getBlock:function(a){return this._.panel.getBlock(a)},showBlock:function(a,e,h,m,l,k){var d=this._.panel,b=d.showBlock(a);this._.showBlockParams=[].slice.call(arguments);
+this.allowBlur(!1);var g=this._.editor.editable();this._.returnFocus=g.hasFocus?g:new CKEDITOR.dom.element(CKEDITOR.document.$.activeElement);this._.hideTimeout=0;var p=this.element,g=this._.iframe,g=CKEDITOR.env.ie&&!CKEDITOR.env.edge?g:new CKEDITOR.dom.window(g.$.contentWindow),v=p.getDocument(),r=this._.parentElement.getPositionedAncestor(),w=e.getDocumentPosition(v),v=r?r.getDocumentPosition(v):{x:0,y:0},n="rtl"==this._.dir,q=w.x+(m||0)-v.x,u=w.y+(l||0)-v.y;!n||1!=h&&4!=h?n||2!=h&&3!=h||(q+=e.$.offsetWidth-
+1):q+=e.$.offsetWidth;if(3==h||4==h)u+=e.$.offsetHeight-1;this._.panel._.offsetParentId=e.getId();p.setStyles({top:u+"px",left:0,display:""});p.setOpacity(0);p.getFirst().removeStyle("width");this._.editor.focusManager.add(g);this._.blurSet||(CKEDITOR.event.useCapture=!0,g.on("blur",function(a){function b(){delete this._.returnFocus;this.hide()}this.allowBlur()&&a.data.getPhase()==CKEDITOR.EVENT_PHASE_AT_TARGET&&this.visible&&!this._.activeChild&&(CKEDITOR.env.iOS?this._.hideTimeout||(this._.hideTimeout=
+CKEDITOR.tools.setTimeout(b,0,this)):b.call(this))},this),g.on("focus",function(){this._.focused=!0;this.hideChild();this.allowBlur(!0)},this),CKEDITOR.env.iOS&&(g.on("touchstart",function(){clearTimeout(this._.hideTimeout)},this),g.on("touchend",function(){this._.hideTimeout=0;this.focus()},this)),CKEDITOR.event.useCapture=!1,this._.blurSet=1);d.onEscape=CKEDITOR.tools.bind(function(a){if(this.onEscape&&!1===this.onEscape(a))return!1},this);CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.tools.bind(function(){var a=
+p;a.removeStyle("width");if(b.autoSize){var c=b.element.getDocument(),c=(CKEDITOR.env.webkit||CKEDITOR.env.edge?b.element:c.getBody()).$.scrollWidth;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<c&&(c+=(a.$.offsetWidth||0)-(a.$.clientWidth||0)+3);a.setStyle("width",c+10+"px");c=b.element.$.scrollHeight;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<c&&(c+=(a.$.offsetHeight||0)-(a.$.clientHeight||0)+3);a.setStyle("height",c+"px");d._.currentBlock.element.setStyle("display","none").removeStyle("display")}else a.removeStyle("height");
+n&&(q-=p.$.offsetWidth);p.setStyle("left",q+"px");var c=d.element.getWindow(),a=p.$.getBoundingClientRect(),c=c.getViewPaneSize(),e=a.width||a.right-a.left,g=a.height||a.bottom-a.top,f=n?a.right:c.width-a.left,h=n?c.width-a.right:a.left;n?f<e&&(q=h>e?q+e:c.width>e?q-a.left:q-a.right+c.width):f<e&&(q=h>e?q-e:c.width>e?q-a.right+c.width:q-a.left);e=a.top;c.height-a.top<g&&(u=e>g?u-g:c.height>g?u-a.bottom+c.height:u-a.top);CKEDITOR.env.ie&&(c=a=new CKEDITOR.dom.element(p.$.offsetParent),"html"==c.getName()&&
+(c=c.getDocument().getBody()),"rtl"==c.getComputedStyle("direction")&&(q=CKEDITOR.env.ie8Compat?q-2*p.getDocument().getDocumentElement().$.scrollLeft:q-(a.$.scrollWidth-a.$.clientWidth)));var a=p.getFirst(),l;(l=a.getCustomData("activePanel"))&&l.onHide&&l.onHide.call(this,1);a.setCustomData("activePanel",this);p.setStyles({top:u+"px",left:q+"px"});p.setOpacity(1);k&&k()},this);d.isLoaded?a():d.onLoad=a;CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.env.webkit&&CKEDITOR.document.getWindow().getScrollPosition().y;
+this.focus();b.element.focus();CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=a);this.allowBlur(!0);this._.editor.fire("panelShow",this)},0,this)},CKEDITOR.env.air?200:0,this);this.visible=1;this.onShow&&this.onShow.call(this)},reposition:function(){var a=this._.showBlockParams;this.visible&&this._.showBlockParams&&(this.hide(),this.showBlock.apply(this,a))},focus:function(){if(CKEDITOR.env.webkit){var a=CKEDITOR.document.getActive();a&&!a.equals(this._.iframe)&&a.$.blur()}(this._.lastFocused||
+this._.iframe.getFrameDocument().getWindow()).focus()},blur:function(){var a=this._.iframe.getFrameDocument().getActive();a&&a.is("a")&&(this._.lastFocused=a)},hide:function(a){if(this.visible&&(!this.onHide||!0!==this.onHide.call(this))){this.hideChild();CKEDITOR.env.gecko&&this._.iframe.getFrameDocument().$.activeElement.blur();this.element.setStyle("display","none");this.visible=0;this.element.getFirst().removeCustomData("activePanel");if(a=a&&this._.returnFocus)CKEDITOR.env.webkit&&a.type&&a.getWindow().$.focus(),
+a.focus();delete this._.lastFocused;this._.showBlockParams=null;this._.editor.fire("panelHide",this)}},allowBlur:function(a){var e=this._.panel;void 0!==a&&(e.allowBlur=a);return e.allowBlur},showAsChild:function(a,e,h,m,l,k){if(this._.activeChild!=a||a._.panel._.offsetParentId!=h.getId())this.hideChild(),a.onHide=CKEDITOR.tools.bind(function(){CKEDITOR.tools.setTimeout(function(){this._.focused||this.hide()},0,this)},this),this._.activeChild=a,this._.focused=!1,a.showBlock(e,h,m,l,k),this.blur(),
+(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&setTimeout(function(){a.element.getChild(0).$.style.cssText+=""},100)},hideChild:function(a){var e=this._.activeChild;e&&(delete e.onHide,delete this._.activeChild,e.hide(),a&&this.focus())}}});CKEDITOR.on("instanceDestroyed",function(){var a=CKEDITOR.tools.isEmpty(CKEDITOR.instances),f;for(f in e){var h=e[f];a?h.destroy():h.element.hide()}a&&(e={})})}(),CKEDITOR.plugins.add("menu",{requires:"floatpanel",beforeInit:function(a){for(var e=a.config.menu_groups.split(","),
+c=a._.menuGroups={},f=a._.menuItems={},h=0;h<e.length;h++)c[e[h]]=h+1;a.addMenuGroup=function(a,e){c[a]=e||100};a.addMenuItem=function(a,e){c[e.group]&&(f[a]=new CKEDITOR.menuItem(this,a,e))};a.addMenuItems=function(a){for(var c in a)this.addMenuItem(c,a[c])};a.getMenuItem=function(a){return f[a]};a.removeMenuItem=function(a){delete f[a]}}}),function(){function a(a){a.sort(function(a,c){return a.group<c.group?-1:a.group>c.group?1:a.order<c.order?-1:a.order>c.order?1:0})}var e='\x3cspan class\x3d"cke_menuitem"\x3e\x3ca id\x3d"{id}" class\x3d"cke_menubutton cke_menubutton__{name} cke_menubutton_{state} {cls}" href\x3d"{href}" title\x3d"{title}" tabindex\x3d"-1" _cke_focus\x3d1 hidefocus\x3d"true" role\x3d"{role}" aria-label\x3d"{label}" aria-describedby\x3d"{id}_description" aria-haspopup\x3d"{hasPopup}" aria-disabled\x3d"{disabled}" {ariaChecked} draggable\x3d"false"';
+CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(e+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(e+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;" ondragstart\x3d"return false;"');var e=e+(' onmouseover\x3d"CKEDITOR.tools.callFunction({hoverFn},{index});" onmouseout\x3d"CKEDITOR.tools.callFunction({moveOutFn},{index});" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;"\x3e'),c=CKEDITOR.addTemplate("menuItem",
+e+'\x3cspan class\x3d"cke_menubutton_inner"\x3e\x3cspan class\x3d"cke_menubutton_icon"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{iconStyle}"\x3e\x3c/span\x3e\x3c/span\x3e\x3cspan class\x3d"cke_menubutton_label"\x3e{label}\x3c/span\x3e{shortcutHtml}{arrowHtml}\x3c/span\x3e\x3c/a\x3e\x3cspan id\x3d"{id}_description" class\x3d"cke_voice_label" aria-hidden\x3d"false"\x3e{ariaShortcut}\x3c/span\x3e\x3c/span\x3e'),f=CKEDITOR.addTemplate("menuArrow",'\x3cspan class\x3d"cke_menuarrow"\x3e\x3cspan\x3e{label}\x3c/span\x3e\x3c/span\x3e'),
+h=CKEDITOR.addTemplate("menuShortcut",'\x3cspan class\x3d"cke_menubutton_label cke_menubutton_shortcut"\x3e{shortcut}\x3c/span\x3e');CKEDITOR.menu=CKEDITOR.tools.createClass({$:function(a,c){c=this._.definition=c||{};this.id=CKEDITOR.tools.getNextId();this.editor=a;this.items=[];this._.listeners=[];this._.level=c.level||1;var e=CKEDITOR.tools.extend({},c.panel,{css:[CKEDITOR.skin.getPath("editor")],level:this._.level-1,block:{}}),d=e.block.attributes=e.attributes||{};!d.role&&(d.role="menu");this._.panelDefinition=
+e},_:{onShow:function(){var a=this.editor.getSelection(),c=a&&a.getStartElement(),e=this.editor.elementPath(),d=this._.listeners;this.removeAll();for(var b=0;b<d.length;b++){var g=d[b](c,a,e);if(g)for(var f in g){var h=this.editor.getMenuItem(f);!h||h.command&&!this.editor.getCommand(h.command).state||(h.state=g[f],this.add(h))}}},onClick:function(a){this.hide();if(a.onClick)a.onClick();else a.command&&this.editor.execCommand(a.command)},onEscape:function(a){var c=this.parent;c?c._.panel.hideChild(1):
+27==a&&this.hide(1);return!1},onHide:function(){this.onHide&&this.onHide()},showSubMenu:function(a){var c=this._.subMenu,e=this.items[a];if(e=e.getItems&&e.getItems()){c?c.removeAll():(c=this._.subMenu=new CKEDITOR.menu(this.editor,CKEDITOR.tools.extend({},this._.definition,{level:this._.level+1},!0)),c.parent=this,c._.onClick=CKEDITOR.tools.bind(this._.onClick,this));for(var d in e){var b=this.editor.getMenuItem(d);b&&(b.state=e[d],c.add(b))}var g=this._.panel.getBlock(this.id).element.getDocument().getById(this.id+
+String(a));setTimeout(function(){c.show(g,2)},0)}else this._.panel.hideChild(1)}},proto:{add:function(a){a.order||(a.order=this.items.length);this.items.push(a)},removeAll:function(){this.items=[]},show:function(c,e,f,d){if(!this.parent&&(this._.onShow(),!this.items.length))return;e=e||("rtl"==this.editor.lang.dir?2:1);var b=this.items,g=this.editor,h=this._.panel,v=this._.element;if(!h){h=this._.panel=new CKEDITOR.ui.floatPanel(this.editor,CKEDITOR.document.getBody(),this._.panelDefinition,this._.level);
+h.onEscape=CKEDITOR.tools.bind(function(a){if(!1===this._.onEscape(a))return!1},this);h.onShow=function(){h._.panel.getHolderElement().getParent().addClass("cke").addClass("cke_reset_all")};h.onHide=CKEDITOR.tools.bind(function(){this._.onHide&&this._.onHide()},this);v=h.addBlock(this.id,this._.panelDefinition.block);v.autoSize=!0;var r=v.keys;r[40]="next";r[9]="next";r[38]="prev";r[CKEDITOR.SHIFT+9]="prev";r["rtl"==g.lang.dir?37:39]=CKEDITOR.env.ie?"mouseup":"click";r[32]=CKEDITOR.env.ie?"mouseup":
+"click";CKEDITOR.env.ie&&(r[13]="mouseup");v=this._.element=v.element;r=v.getDocument();r.getBody().setStyle("overflow","hidden");r.getElementsByTag("html").getItem(0).setStyle("overflow","hidden");this._.itemOverFn=CKEDITOR.tools.addFunction(function(a){clearTimeout(this._.showSubTimeout);this._.showSubTimeout=CKEDITOR.tools.setTimeout(this._.showSubMenu,g.config.menu_subMenuDelay||400,this,[a])},this);this._.itemOutFn=CKEDITOR.tools.addFunction(function(){clearTimeout(this._.showSubTimeout)},this);
+this._.itemClickFn=CKEDITOR.tools.addFunction(function(a){var b=this.items[a];if(b.state==CKEDITOR.TRISTATE_DISABLED)this.hide(1);else if(b.getItems)this._.showSubMenu(a);else this._.onClick(b)},this)}a(b);for(var r=g.elementPath(),r=['\x3cdiv class\x3d"cke_menu'+(r&&r.direction()!=g.lang.dir?" cke_mixed_dir_content":"")+'" role\x3d"presentation"\x3e'],w=b.length,n=w&&b[0].group,q=0;q<w;q++){var u=b[q];n!=u.group&&(r.push('\x3cdiv class\x3d"cke_menuseparator" role\x3d"separator"\x3e\x3c/div\x3e'),
+n=u.group);u.render(this,q,r)}r.push("\x3c/div\x3e");v.setHtml(r.join(""));CKEDITOR.ui.fire("ready",this);this.parent?this.parent._.panel.showAsChild(h,this.id,c,e,f,d):h.showBlock(this.id,c,e,f,d);g.fire("menuShow",[h])},addListener:function(a){this._.listeners.push(a)},hide:function(a){this._.onHide&&this._.onHide();this._.panel&&this._.panel.hide(a)}}});CKEDITOR.menuItem=CKEDITOR.tools.createClass({$:function(a,c,e){CKEDITOR.tools.extend(this,e,{order:0,className:"cke_menubutton__"+c});this.group=
+a._.menuGroups[this.group];this.editor=a;this.name=c},proto:{render:function(a,e,k){var d=a.id+String(e),b="undefined"==typeof this.state?CKEDITOR.TRISTATE_OFF:this.state,g="",p=this.editor,v,r,w=b==CKEDITOR.TRISTATE_ON?"on":b==CKEDITOR.TRISTATE_DISABLED?"disabled":"off";this.role in{menuitemcheckbox:1,menuitemradio:1}&&(g=' aria-checked\x3d"'+(b==CKEDITOR.TRISTATE_ON?"true":"false")+'"');var n=this.getItems,q="\x26#"+("rtl"==this.editor.lang.dir?"9668":"9658")+";",u=this.name;this.icon&&!/\./.test(this.icon)&&
+(u=this.icon);this.command&&(v=p.getCommand(this.command),(v=p.getCommandKeystroke(v))&&(r=CKEDITOR.tools.keystrokeToString(p.lang.common.keyboard,v)));a={id:d,name:this.name,iconName:u,label:this.label,cls:this.className||"",state:w,hasPopup:n?"true":"false",disabled:b==CKEDITOR.TRISTATE_DISABLED,title:this.label+(r?" ("+r.display+")":""),ariaShortcut:r?p.lang.common.keyboardShortcut+" "+r.aria:"",href:"javascript:void('"+(this.label||"").replace("'")+"')",hoverFn:a._.itemOverFn,moveOutFn:a._.itemOutFn,
+clickFn:a._.itemClickFn,index:e,iconStyle:CKEDITOR.skin.getIconStyle(u,"rtl"==this.editor.lang.dir,u==this.icon?null:this.icon,this.iconOffset),shortcutHtml:r?h.output({shortcut:r.display}):"",arrowHtml:n?f.output({label:q}):"",role:this.role?this.role:"menuitem",ariaChecked:g};c.output(a,k)}}})}(),CKEDITOR.config.menu_groups="clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div",
+CKEDITOR.plugins.add("contextmenu",{requires:"menu",onLoad:function(){CKEDITOR.plugins.contextMenu=CKEDITOR.tools.createClass({base:CKEDITOR.menu,$:function(a){this.base.call(this,a,{panel:{className:"cke_menu_panel",attributes:{"aria-label":a.lang.contextmenu.options}}})},proto:{addTarget:function(a,e){a.on("contextmenu",function(a){a=a.data;var f=CKEDITOR.env.webkit?c:CKEDITOR.env.mac?a.$.metaKey:a.$.ctrlKey;if(!e||!f){a.preventDefault();if(CKEDITOR.env.mac&&CKEDITOR.env.webkit){var f=this.editor,
+l=(new CKEDITOR.dom.elementPath(a.getTarget(),f.editable())).contains(function(a){return a.hasAttribute("contenteditable")},!0);l&&"false"==l.getAttribute("contenteditable")&&f.getSelection().fake(l)}var l=a.getTarget().getDocument(),k=a.getTarget().getDocument().getDocumentElement(),f=!l.equals(CKEDITOR.document),l=l.getWindow().getScrollPosition(),d=f?a.$.clientX:a.$.pageX||l.x+a.$.clientX,b=f?a.$.clientY:a.$.pageY||l.y+a.$.clientY;CKEDITOR.tools.setTimeout(function(){this.open(k,null,d,b)},CKEDITOR.env.ie?
+200:0,this)}},this);if(CKEDITOR.env.webkit){var c,f=function(){c=0};a.on("keydown",function(a){c=CKEDITOR.env.mac?a.data.$.metaKey:a.data.$.ctrlKey});a.on("keyup",f);a.on("contextmenu",f)}},open:function(a,e,c,f){this.editor.focus();a=a||CKEDITOR.document.getDocumentElement();this.editor.selectionChange(1);this.show(a,e,c,f)}}})},beforeInit:function(a){var e=a.contextMenu=new CKEDITOR.plugins.contextMenu(a);a.on("contentDom",function(){e.addTarget(a.editable(),!1!==a.config.browserContextMenuOnCtrl)});
+a.addCommand("contextMenu",{exec:function(){a.contextMenu.open(a.document.getBody())}});a.setKeystroke(CKEDITOR.SHIFT+121,"contextMenu");a.setKeystroke(CKEDITOR.CTRL+CKEDITOR.SHIFT+121,"contextMenu")}}),function(){var a='\x3ca id\x3d"{id}" class\x3d"cke_button cke_button__{name} cke_button_{state} {cls}"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' title\x3d"{title}" tabindex\x3d"-1" hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-describedby\x3d"{id}_description" aria-haspopup\x3d"{hasArrow}" aria-disabled\x3d"{ariaDisabled}"';
+CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(a+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(a+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var a=a+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{style}"'),
+a=a+'\x3e\x26nbsp;\x3c/span\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_button_label cke_button__{name}_label" aria-hidden\x3d"false"\x3e{label}\x3c/span\x3e\x3cspan id\x3d"{id}_description" class\x3d"cke_button_label" aria-hidden\x3d"false"\x3e{ariaShortcut}\x3c/span\x3e{arrowHtml}\x3c/a\x3e',e=CKEDITOR.addTemplate("buttonArrow",'\x3cspan class\x3d"cke_button_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":"")+"\x3c/span\x3e"),c=CKEDITOR.addTemplate("button",a);CKEDITOR.plugins.add("button",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_BUTTON,
+CKEDITOR.ui.button.handler)}});CKEDITOR.UI_BUTTON="button";CKEDITOR.ui.button=function(a){CKEDITOR.tools.extend(this,a,{title:a.label,click:a.click||function(c){c.execCommand(a.command)}});this._={}};CKEDITOR.ui.button.handler={create:function(a){return new CKEDITOR.ui.button(a)}};CKEDITOR.ui.button.prototype={render:function(a,h){function m(){var b=a.mode;b&&(b=this.modes[b]?void 0!==u[b]?u[b]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,b=a.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:
+b,this.setState(b),this.refresh&&this.refresh())}var l=CKEDITOR.env,k=this._.id=CKEDITOR.tools.getNextId(),d="",b=this.command,g,p,v;this._.editor=a;var r={id:k,button:this,editor:a,focus:function(){CKEDITOR.document.getById(k).focus()},execute:function(){this.button.click(a)},attach:function(a){this.button.attach(a)}},w=CKEDITOR.tools.addFunction(function(a){if(r.onkey)return a=new CKEDITOR.dom.event(a),!1!==r.onkey(r,a.getKeystroke())}),n=CKEDITOR.tools.addFunction(function(a){var b;r.onfocus&&
+(b=!1!==r.onfocus(r,new CKEDITOR.dom.event(a)));return b}),q=0;r.clickFn=g=CKEDITOR.tools.addFunction(function(){q&&(a.unlockSelection(1),q=0);r.execute();l.iOS&&a.focus()});if(this.modes){var u={};a.on("beforeModeUnload",function(){a.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(u[a.mode]=this._.state)},this);a.on("activeFilterChange",m,this);a.on("mode",m,this);!this.readOnly&&a.on("readOnly",m,this)}else b&&(b=a.getCommand(b))&&(b.on("state",function(){this.setState(b.state)},this),d+=b.state==
+CKEDITOR.TRISTATE_ON?"on":b.state==CKEDITOR.TRISTATE_DISABLED?"disabled":"off");if(this.directional)a.on("contentDirChanged",function(b){var d=CKEDITOR.document.getById(this._.id),c=d.getFirst();b=b.data;b!=a.lang.dir?d.addClass("cke_"+b):d.removeClass("cke_ltr").removeClass("cke_rtl");c.setAttribute("style",CKEDITOR.skin.getIconStyle(B,"rtl"==b,this.icon,this.iconOffset))},this);b?(p=a.getCommandKeystroke(b))&&(v=CKEDITOR.tools.keystrokeToString(a.lang.common.keyboard,p)):d+="off";var B=p=this.name||
+this.command;this.icon&&!/\./.test(this.icon)&&(B=this.icon,this.icon=null);d={id:k,name:p,iconName:B,label:this.label,cls:this.className||"",state:d,ariaDisabled:"disabled"==d?"true":"false",title:this.title+(v?" ("+v.display+")":""),ariaShortcut:v?a.lang.common.keyboardShortcut+" "+v.aria:"",titleJs:l.gecko&&!l.hc?"":(this.title||"").replace("'",""),hasArrow:this.hasArrow?"true":"false",keydownFn:w,focusFn:n,clickFn:g,style:CKEDITOR.skin.getIconStyle(B,"rtl"==a.lang.dir,this.icon,this.iconOffset),
+arrowHtml:this.hasArrow?e.output():""};c.output(d,h);if(this.onRender)this.onRender();return r},setState:function(a){if(this._.state==a)return!1;this._.state=a;var c=CKEDITOR.document.getById(this._.id);return c?(c.setState(a,"cke_button"),a==CKEDITOR.TRISTATE_DISABLED?c.setAttribute("aria-disabled",!0):c.removeAttribute("aria-disabled"),this.hasArrow?(a=a==CKEDITOR.TRISTATE_ON?this._.editor.lang.button.selectedLabel.replace(/%1/g,this.label):this.label,CKEDITOR.document.getById(this._.id+"_label").setText(a)):
+a==CKEDITOR.TRISTATE_ON?c.setAttribute("aria-pressed",!0):c.removeAttribute("aria-pressed"),!0):!1},getState:function(){return this._.state},toFeature:function(a){if(this._.feature)return this._.feature;var c=this;this.allowedContent||this.requiredContent||!this.command||(c=a.getCommand(this.command)||c);return this._.feature=c}};CKEDITOR.ui.prototype.addButton=function(a,c){this.add(a,CKEDITOR.UI_BUTTON,c)}}(),function(){function a(a){function c(){for(var b=f(),d=CKEDITOR.tools.clone(a.config.toolbarGroups)||
+e(a),g=0;g<d.length;g++){var m=d[g];if("/"!=m){"string"==typeof m&&(m=d[g]={name:m});var n,q=m.groups;if(q)for(var u=0;u<q.length;u++)n=q[u],(n=b[n])&&k(m,n);(n=b[m.name])&&k(m,n)}}return d}function f(){var b={},d,c,e;for(d in a.ui.items)c=a.ui.items[d],e=c.toolbar||"others",e=e.split(","),c=e[0],e=parseInt(e[1]||-1,10),b[c]||(b[c]=[]),b[c].push({name:d,order:e});for(c in b)b[c]=b[c].sort(function(a,b){return a.order==b.order?0:0>b.order?-1:0>a.order?1:a.order<b.order?-1:1});return b}function k(d,
+c){if(c.length){d.items?d.items.push(a.ui.create("-")):d.items=[];for(var e;e=c.shift();)e="string"==typeof e?e:e.name,b&&-1!=CKEDITOR.tools.indexOf(b,e)||(e=a.ui.create(e))&&a.addFeature(e)&&d.items.push(e)}}function d(a){var b=[],d,c,e;for(d=0;d<a.length;++d)c=a[d],e={},"/"==c?b.push(c):CKEDITOR.tools.isArray(c)?(k(e,CKEDITOR.tools.clone(c)),b.push(e)):c.items&&(k(e,CKEDITOR.tools.clone(c.items)),e.name=c.name,b.push(e));return b}var b=a.config.removeButtons,b=b&&b.split(","),g=a.config.toolbar;
+"string"==typeof g&&(g=a.config["toolbar_"+g]);return a.toolbar=g?d(g):c()}function e(a){return a._.toolbarGroups||(a._.toolbarGroups=[{name:"document",groups:["mode","document","doctools"]},{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"forms"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},{name:"links"},{name:"insert"},"/",{name:"styles"},{name:"colors"},
+{name:"tools"},{name:"others"},{name:"about"}])}var c=function(){this.toolbars=[];this.focusCommandExecuted=!1};c.prototype.focus=function(){for(var a=0,c;c=this.toolbars[a++];)for(var e=0,f;f=c.items[e++];)if(f.focus){f.focus();return}};var f={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(a){a.toolbox&&(a.toolbox.focusCommandExecuted=!0,CKEDITOR.env.ie||CKEDITOR.env.air?setTimeout(function(){a.toolbox.focus()},100):a.toolbox.focus())}};CKEDITOR.plugins.add("toolbar",{requires:"button",init:function(e){var m,
+l=function(a,d){var b,c="rtl"==e.lang.dir,f=e.config.toolbarGroupCycling,v=c?37:39,c=c?39:37,f=void 0===f||f;switch(d){case 9:case CKEDITOR.SHIFT+9:for(;!b||!b.items.length;)if(b=9==d?(b?b.next:a.toolbar.next)||e.toolbox.toolbars[0]:(b?b.previous:a.toolbar.previous)||e.toolbox.toolbars[e.toolbox.toolbars.length-1],b.items.length)for(a=b.items[m?b.items.length-1:0];a&&!a.focus;)(a=m?a.previous:a.next)||(b=0);a&&a.focus();return!1;case v:b=a;do b=b.next,!b&&f&&(b=a.toolbar.items[0]);while(b&&!b.focus);
+b?b.focus():l(a,9);return!1;case 40:return a.button&&a.button.hasArrow?(e.once("panelShow",function(a){a.data._.panel._.currentBlock.onKeyDown(40)}),a.execute()):l(a,40==d?v:c),!1;case c:case 38:b=a;do b=b.previous,!b&&f&&(b=a.toolbar.items[a.toolbar.items.length-1]);while(b&&!b.focus);b?b.focus():(m=1,l(a,CKEDITOR.SHIFT+9),m=0);return!1;case 27:return e.focus(),!1;case 13:case 32:return a.execute(),!1}return!0};e.on("uiSpace",function(f){if(f.data.space==e.config.toolbarLocation){f.removeListener();
+e.toolbox=new c;var d=CKEDITOR.tools.getNextId(),b=['\x3cspan id\x3d"',d,'" class\x3d"cke_voice_label"\x3e',e.lang.toolbar.toolbars,"\x3c/span\x3e",'\x3cspan id\x3d"'+e.ui.spaceId("toolbox")+'" class\x3d"cke_toolbox" role\x3d"group" aria-labelledby\x3d"',d,'" onmousedown\x3d"return false;"\x3e'],d=!1!==e.config.toolbarStartupExpanded,g,m;e.config.toolbarCanCollapse&&e.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&b.push('\x3cspan class\x3d"cke_toolbox_main"'+(d?"\x3e":' style\x3d"display:none"\x3e'));
+for(var v=e.toolbox.toolbars,r=a(e),w=r.length,n=0;n<w;n++){var q,u=0,B,y=r[n],t="/"!==y&&("/"===r[n+1]||n==w-1),x;if(y)if(g&&(b.push("\x3c/span\x3e"),m=g=0),"/"===y)b.push('\x3cspan class\x3d"cke_toolbar_break"\x3e\x3c/span\x3e');else{x=y.items||y;for(var F=0;F<x.length;F++){var z=x[F],A;if(z){var C=function(a){a=a.render(e,b);E=u.items.push(a)-1;0<E&&(a.previous=u.items[E-1],a.previous.next=a);a.toolbar=u;a.onkey=l;a.onfocus=function(){e.toolbox.focusCommandExecuted||e.focus()}};if(z.type==CKEDITOR.UI_SEPARATOR)m=
+g&&z;else{A=!1!==z.canGroup;if(!u){q=CKEDITOR.tools.getNextId();u={id:q,items:[]};B=y.name&&(e.lang.toolbar.toolbarGroups[y.name]||y.name);b.push('\x3cspan id\x3d"',q,'" class\x3d"cke_toolbar'+(t?' cke_toolbar_last"':'"'),B?' aria-labelledby\x3d"'+q+'_label"':"",' role\x3d"toolbar"\x3e');B&&b.push('\x3cspan id\x3d"',q,'_label" class\x3d"cke_voice_label"\x3e',B,"\x3c/span\x3e");b.push('\x3cspan class\x3d"cke_toolbar_start"\x3e\x3c/span\x3e');var E=v.push(u)-1;0<E&&(u.previous=v[E-1],u.previous.next=
+u)}A?g||(b.push('\x3cspan class\x3d"cke_toolgroup" role\x3d"presentation"\x3e'),g=1):g&&(b.push("\x3c/span\x3e"),g=0);m&&(C(m),m=0);C(z)}}}g&&(b.push("\x3c/span\x3e"),m=g=0);u&&b.push('\x3cspan class\x3d"cke_toolbar_end"\x3e\x3c/span\x3e\x3c/span\x3e')}}e.config.toolbarCanCollapse&&b.push("\x3c/span\x3e");if(e.config.toolbarCanCollapse&&e.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var D=CKEDITOR.tools.addFunction(function(){e.execCommand("toolbarCollapse")});e.on("destroy",function(){CKEDITOR.tools.removeFunction(D)});
+e.addCommand("toolbarCollapse",{readOnly:1,exec:function(a){var b=a.ui.space("toolbar_collapser"),d=b.getPrevious(),c=a.ui.space("contents"),e=d.getParent(),g=parseInt(c.$.style.height,10),f=e.$.offsetHeight,h=b.hasClass("cke_toolbox_collapser_min");h?(d.show(),b.removeClass("cke_toolbox_collapser_min"),b.setAttribute("title",a.lang.toolbar.toolbarCollapse)):(d.hide(),b.addClass("cke_toolbox_collapser_min"),b.setAttribute("title",a.lang.toolbar.toolbarExpand));b.getFirst().setText(h?"▲":"◀");c.setStyle("height",
+g-(e.$.offsetHeight-f)+"px");a.fire("resize",{outerHeight:a.container.$.offsetHeight,contentsHeight:c.$.offsetHeight,outerWidth:a.container.$.offsetWidth})},modes:{wysiwyg:1,source:1}});e.setKeystroke(CKEDITOR.ALT+(CKEDITOR.env.ie||CKEDITOR.env.webkit?189:109),"toolbarCollapse");b.push('\x3ca title\x3d"'+(d?e.lang.toolbar.toolbarCollapse:e.lang.toolbar.toolbarExpand)+'" id\x3d"'+e.ui.spaceId("toolbar_collapser")+'" tabIndex\x3d"-1" class\x3d"cke_toolbox_collapser');d||b.push(" cke_toolbox_collapser_min");
+b.push('" onclick\x3d"CKEDITOR.tools.callFunction('+D+')"\x3e','\x3cspan class\x3d"cke_arrow"\x3e\x26#9650;\x3c/span\x3e',"\x3c/a\x3e")}b.push("\x3c/span\x3e");f.data.html+=b.join("")}});e.on("destroy",function(){if(this.toolbox){var a,d=0,b,c,e;for(a=this.toolbox.toolbars;d<a.length;d++)for(c=a[d].items,b=0;b<c.length;b++)e=c[b],e.clickFn&&CKEDITOR.tools.removeFunction(e.clickFn),e.keyDownFn&&CKEDITOR.tools.removeFunction(e.keyDownFn)}});e.on("uiReady",function(){var a=e.ui.space("toolbox");a&&e.focusManager.add(a,
+1)});e.addCommand("toolbarFocus",f);e.setKeystroke(CKEDITOR.ALT+121,"toolbarFocus");e.ui.add("-",CKEDITOR.UI_SEPARATOR,{});e.ui.addHandler(CKEDITOR.UI_SEPARATOR,{create:function(){return{render:function(a,d){d.push('\x3cspan class\x3d"cke_toolbar_separator" role\x3d"separator"\x3e\x3c/span\x3e');return{}}}}})}});CKEDITOR.ui.prototype.addToolbarGroup=function(a,c,f){var k=e(this.editor),d=0===c,b={name:a};if(f){if(f=CKEDITOR.tools.search(k,function(a){return a.name==f})){!f.groups&&(f.groups=[]);if(c&&
+(c=CKEDITOR.tools.indexOf(f.groups,c),0<=c)){f.groups.splice(c+1,0,a);return}d?f.groups.splice(0,0,a):f.groups.push(a);return}c=null}c&&(c=CKEDITOR.tools.indexOf(k,function(a){return a.name==c}));d?k.splice(0,0,a):"number"==typeof c?k.splice(c+1,0,b):k.push(a)}}(),CKEDITOR.UI_SEPARATOR="separator",CKEDITOR.config.toolbarLocation="top",function(){function a(a,c){function l(b){b=g.list[b];var d;b.equals(a.editable())||"true"==b.getAttribute("contenteditable")?(d=a.createRange(),d.selectNodeContents(b),
+d=d.select()):(d=a.getSelection(),d.selectElement(b));CKEDITOR.env.ie&&a.fire("selectionChange",{selection:d,path:new CKEDITOR.dom.elementPath(b)});a.focus()}function k(){b&&b.setHtml('\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');delete g.list}var d=a.ui.spaceId("path"),b,g=a._.elementsPath,p=g.idBase;c.html+='\x3cspan id\x3d"'+d+'_label" class\x3d"cke_voice_label"\x3e'+a.lang.elementspath.eleLabel+'\x3c/span\x3e\x3cspan id\x3d"'+d+'" class\x3d"cke_path" role\x3d"group" aria-labelledby\x3d"'+
+d+'_label"\x3e\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e\x3c/span\x3e';a.on("uiReady",function(){var b=a.ui.space("path");b&&a.focusManager.add(b,1)});g.onClick=l;var v=CKEDITOR.tools.addFunction(l),r=CKEDITOR.tools.addFunction(function(b,d){var c=g.idBase,e;d=new CKEDITOR.dom.event(d);e="rtl"==a.lang.dir;switch(d.getKeystroke()){case e?39:37:case 9:return(e=CKEDITOR.document.getById(c+(b+1)))||(e=CKEDITOR.document.getById(c+"0")),e.focus(),!1;case e?37:39:case CKEDITOR.SHIFT+9:return(e=
+CKEDITOR.document.getById(c+(b-1)))||(e=CKEDITOR.document.getById(c+(g.list.length-1))),e.focus(),!1;case 27:return a.focus(),!1;case 13:case 32:return l(b),!1}return!0});a.on("selectionChange",function(){for(var c=[],e=g.list=[],k=[],l=g.filters,m=!0,y=a.elementPath().elements,t,x=y.length;x--;){var F=y[x],z=0;t=F.data("cke-display-name")?F.data("cke-display-name"):F.data("cke-real-element-type")?F.data("cke-real-element-type"):F.getName();(m=F.hasAttribute("contenteditable")?"true"==F.getAttribute("contenteditable"):
+m)||F.hasAttribute("contenteditable")||(z=1);for(var A=0;A<l.length;A++){var C=l[A](F,t);if(!1===C){z=1;break}t=C||t}z||(e.unshift(F),k.unshift(t))}e=e.length;for(l=0;l<e;l++)t=k[l],m=a.lang.elementspath.eleTitle.replace(/%1/,t),t=f.output({id:p+l,label:m,text:t,jsTitle:"javascript:void('"+t+"')",index:l,keyDownFn:r,clickFn:v}),c.unshift(t);b||(b=CKEDITOR.document.getById(d));k=b;k.setHtml(c.join("")+'\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');a.fire("elementsPathUpdate",{space:k})});
+a.on("readOnly",k);a.on("contentDomUnload",k);a.addCommand("elementsPathFocus",e.toolbarFocus);a.setKeystroke(CKEDITOR.ALT+122,"elementsPathFocus")}var e={toolbarFocus:{editorFocus:!1,readOnly:1,exec:function(a){(a=CKEDITOR.document.getById(a._.elementsPath.idBase+"0"))&&a.focus(CKEDITOR.env.ie||CKEDITOR.env.air)}}},c="";CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(c+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var f=CKEDITOR.addTemplate("pathItem",
+'\x3ca id\x3d"{id}" href\x3d"{jsTitle}" tabindex\x3d"-1" class\x3d"cke_path_item" title\x3d"{label}"'+c+' hidefocus\x3d"true"  onkeydown\x3d"return CKEDITOR.tools.callFunction({keyDownFn},{index}, event );" onclick\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;" role\x3d"button" aria-label\x3d"{label}"\x3e{text}\x3c/a\x3e');CKEDITOR.plugins.add("elementspath",{init:function(c){c._.elementsPath={idBase:"cke_elementspath_"+CKEDITOR.tools.getNextNumber()+"_",filters:[]};c.on("uiSpace",
+function(e){"bottom"==e.data.space&&a(c,e.data)})}})}(),function(){function a(a,d,c){c=a.config.forceEnterMode||c;"wysiwyg"==a.mode&&(d||(d=a.activeEnterMode),a.elementPath().isContextFor("p")||(d=CKEDITOR.ENTER_BR,c=1),a.fire("saveSnapshot"),d==CKEDITOR.ENTER_BR?l(a,d,null,c):k(a,d,null,c),a.fire("saveSnapshot"))}function e(a){a=a.getSelection().getRanges(!0);for(var d=a.length-1;0<d;d--)a[d].deleteContents();return a[0]}function c(a){var d=a.startContainer.getAscendant(function(a){return a.type==
+CKEDITOR.NODE_ELEMENT&&"true"==a.getAttribute("contenteditable")},!0);if(a.root.equals(d))return a;d=new CKEDITOR.dom.range(d);d.moveToRange(a);return d}CKEDITOR.plugins.add("enterkey",{init:function(b){b.addCommand("enter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){a(b)}});b.addCommand("shiftEnter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){a(b,b.activeShiftEnterMode,1)}});b.setKeystroke([[13,"enter"],[CKEDITOR.SHIFT+13,"shiftEnter"]])}});var f=CKEDITOR.dom.walker.whitespaces(),h=
+CKEDITOR.dom.walker.bookmark();CKEDITOR.plugins.enterkey={enterBlock:function(a,g,k,m){if(k=k||e(a)){k=c(k);var r=k.document,w=k.checkStartOfBlock(),n=k.checkEndOfBlock(),q=a.elementPath(k.startContainer),u=q.block,B=g==CKEDITOR.ENTER_DIV?"div":"p",y;if(w&&n){if(u&&(u.is("li")||u.getParent().is("li"))){u.is("li")||(u=u.getParent());k=u.getParent();y=k.getParent();m=!u.hasPrevious();var t=!u.hasNext(),B=a.getSelection(),x=B.createBookmarks(),w=u.getDirection(1),n=u.getAttribute("class"),F=u.getAttribute("style"),
+z=y.getDirection(1)!=w;a=a.enterMode!=CKEDITOR.ENTER_BR||z||F||n;if(y.is("li"))m||t?(m&&t&&k.remove(),u[t?"insertAfter":"insertBefore"](y)):u.breakParent(y);else{if(a)if(q.block.is("li")?(y=r.createElement(g==CKEDITOR.ENTER_P?"p":"div"),z&&y.setAttribute("dir",w),F&&y.setAttribute("style",F),n&&y.setAttribute("class",n),u.moveChildren(y)):y=q.block,m||t)y[m?"insertBefore":"insertAfter"](k);else u.breakParent(k),y.insertAfter(k);else if(u.appendBogus(!0),m||t)for(;r=u[m?"getFirst":"getLast"]();)r[m?
+"insertBefore":"insertAfter"](k);else for(u.breakParent(k);r=u.getLast();)r.insertAfter(k);u.remove()}B.selectBookmarks(x);return}if(u&&u.getParent().is("blockquote")){u.breakParent(u.getParent());u.getPrevious().getFirst(CKEDITOR.dom.walker.invisible(1))||u.getPrevious().remove();u.getNext().getFirst(CKEDITOR.dom.walker.invisible(1))||u.getNext().remove();k.moveToElementEditStart(u);k.select();return}}else if(u&&u.is("pre")&&!n){l(a,g,k,m);return}if(w=k.splitBlock(B)){g=w.previousBlock;u=w.nextBlock;
+q=w.wasStartOfBlock;a=w.wasEndOfBlock;u?(x=u.getParent(),x.is("li")&&(u.breakParent(x),u.move(u.getNext(),1))):g&&(x=g.getParent())&&x.is("li")&&(g.breakParent(x),x=g.getNext(),k.moveToElementEditStart(x),g.move(g.getPrevious()));if(q||a){if(g){if(g.is("li")||!d.test(g.getName())&&!g.is("pre"))y=g.clone()}else u&&(y=u.clone());y?m&&!y.is("li")&&y.renameNode(B):x&&x.is("li")?y=x:(y=r.createElement(B),g&&(t=g.getDirection())&&y.setAttribute("dir",t));if(r=w.elementPath)for(m=0,B=r.elements.length;m<
+B;m++){x=r.elements[m];if(x.equals(r.block)||x.equals(r.blockLimit))break;CKEDITOR.dtd.$removeEmpty[x.getName()]&&(x=x.clone(),y.moveChildren(x),y.append(x))}y.appendBogus();y.getParent()||k.insertNode(y);y.is("li")&&y.removeAttribute("value");!CKEDITOR.env.ie||!q||a&&g.getChildCount()||(k.moveToElementEditStart(a?g:y),k.select());k.moveToElementEditStart(q&&!a?u:y)}else u.is("li")&&(y=k.clone(),y.selectNodeContents(u),y=new CKEDITOR.dom.walker(y),y.evaluator=function(a){return!(h(a)||f(a)||a.type==
+CKEDITOR.NODE_ELEMENT&&a.getName()in CKEDITOR.dtd.$inline&&!(a.getName()in CKEDITOR.dtd.$empty))},(x=y.next())&&x.type==CKEDITOR.NODE_ELEMENT&&x.is("ul","ol")&&(CKEDITOR.env.needsBrFiller?r.createElement("br"):r.createText(" ")).insertBefore(x)),u&&k.moveToElementEditStart(u);k.select();k.scrollIntoView()}}},enterBr:function(a,c,f,h){if(f=f||e(a)){var l=f.document,m=f.checkEndOfBlock(),n=new CKEDITOR.dom.elementPath(a.getSelection().getStartElement()),q=n.block,u=q&&n.block.getName();h||"li"!=u?(!h&&
+m&&d.test(u)?(m=q.getDirection())?(l=l.createElement("div"),l.setAttribute("dir",m),l.insertAfter(q),f.setStart(l,0)):(l.createElement("br").insertAfter(q),CKEDITOR.env.gecko&&l.createText("").insertAfter(q),f.setStartAt(q.getNext(),CKEDITOR.env.ie?CKEDITOR.POSITION_BEFORE_START:CKEDITOR.POSITION_AFTER_START)):(a="pre"==u&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?l.createText("\r"):l.createElement("br"),f.deleteContents(),f.insertNode(a),CKEDITOR.env.needsBrFiller?(l.createText("").insertAfter(a),
+m&&(q||n.blockLimit).appendBogus(),a.getNext().$.nodeValue="",f.setStartAt(a.getNext(),CKEDITOR.POSITION_AFTER_START)):f.setStartAt(a,CKEDITOR.POSITION_AFTER_END)),f.collapse(!0),f.select(),f.scrollIntoView()):k(a,c,f,h)}}};var m=CKEDITOR.plugins.enterkey,l=m.enterBr,k=m.enterBlock,d=/^h[1-6]$/}(),function(){function a(a,c){var f={},h=[],m={nbsp:" ",shy:"­",gt:"\x3e",lt:"\x3c",amp:"\x26",apos:"'",quot:'"'};a=a.replace(/\b(nbsp|shy|gt|lt|amp|apos|quot)(?:,|$)/g,function(a,d){var e=c?"\x26"+d+";":m[d];
+f[e]=c?m[d]:"\x26"+d+";";h.push(e);return""});if(!c&&a){a=a.split(",");var l=document.createElement("div"),k;l.innerHTML="\x26"+a.join(";\x26")+";";k=l.innerHTML;l=null;for(l=0;l<k.length;l++){var d=k.charAt(l);f[d]="\x26"+a[l]+";";h.push(d)}}f.regex=h.join(c?"|":"");return f}CKEDITOR.plugins.add("entities",{afterInit:function(e){function c(a){return d[a]}function f(a){return"force"!=h.entities_processNumerical&&l[a]?l[a]:"\x26#"+a.charCodeAt(0)+";"}var h=e.config;if(e=(e=e.dataProcessor)&&e.htmlFilter){var m=
+[];!1!==h.basicEntities&&m.push("nbsp,gt,lt,amp");h.entities&&(m.length&&m.push("quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro"),
 h.entities_latin&&m.push("Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml"),h.entities_greek&&m.push("Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv"),
-h.entities_additional&&m.push(h.entities_additional));var l=a(m.join(",")),k=l.regex?"["+l.regex+"]":"a^";delete l.regex;h.entities&&h.entities_processNumerical&&(k="[^ -~]|"+k);var k=new RegExp(k,"g"),b=a("nbsp,gt,lt,amp,shy",!0),d=new RegExp(b.regex,"g");f.addRules({text:function(a){return a.replace(d,c).replace(k,e)}},{applyToAll:!0,excludeNestedEditable:!0})}}})}(),CKEDITOR.config.basicEntities=!0,CKEDITOR.config.entities=!0,CKEDITOR.config.entities_latin=!0,CKEDITOR.config.entities_greek=!0,
-CKEDITOR.config.entities_additional="#39",CKEDITOR.plugins.add("popup"),CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{popup:function(a,f,c,e){f=f||"80%";c=c||"70%";"string"==typeof f&&1<f.length&&"%"==f.substr(f.length-1,1)&&(f=parseInt(window.screen.width*parseInt(f,10)/100,10));"string"==typeof c&&1<c.length&&"%"==c.substr(c.length-1,1)&&(c=parseInt(window.screen.height*parseInt(c,10)/100,10));640>f&&(f=640);420>c&&(c=420);var h=parseInt((window.screen.height-c)/2,10),m=parseInt((window.screen.width-
-f)/2,10);e=(e||"location\x3dno,menubar\x3dno,toolbar\x3dno,dependent\x3dyes,minimizable\x3dno,modal\x3dyes,alwaysRaised\x3dyes,resizable\x3dyes,scrollbars\x3dyes")+",width\x3d"+f+",height\x3d"+c+",top\x3d"+h+",left\x3d"+m;var l=window.open("",null,e,!0);if(!l)return!1;try{-1==navigator.userAgent.toLowerCase().indexOf(" chrome/")&&(l.moveTo(m,h),l.resizeTo(f,c)),l.focus(),l.location.href=a}catch(k){window.open(a,null,e,!0)}return!0}}),function(){function a(a,d){var c=[];if(d)for(var e in d)c.push(e+
-"\x3d"+encodeURIComponent(d[e]));else return a;return a+(-1!=a.indexOf("?")?"\x26":"?")+c.join("\x26")}function f(a){a+="";return a.charAt(0).toUpperCase()+a.substr(1)}function c(){var b=this.getDialog(),d=b.getParentEditor();d._.filebrowserSe=this;var c=d.config["filebrowser"+f(b.getName())+"WindowWidth"]||d.config.filebrowserWindowWidth||"80%",b=d.config["filebrowser"+f(b.getName())+"WindowHeight"]||d.config.filebrowserWindowHeight||"70%",e=this.filebrowser.params||{};e.CKEditor=d.name;e.CKEditorFuncNum=
-d._.filebrowserFn;e.langCode||(e.langCode=d.langCode);e=a(this.filebrowser.url,e);d.popup(e,c,b,d.config.filebrowserWindowFeatures||d.config.fileBrowserWindowFeatures)}function e(){var a=this.getDialog();a.getParentEditor()._.filebrowserSe=this;return a.getContentElement(this["for"][0],this["for"][1]).getInputElement().$.value&&a.getContentElement(this["for"][0],this["for"][1]).getAction()?!0:!1}function h(b,d,c){var e=c.params||{};e.CKEditor=b.name;e.CKEditorFuncNum=b._.filebrowserFn;e.langCode||
-(e.langCode=b.langCode);d.action=a(c.url,e);d.filebrowser=c}function m(a,d,g,k){if(k&&k.length)for(var l,u=k.length;u--;)if(l=k[u],"hbox"!=l.type&&"vbox"!=l.type&&"fieldset"!=l.type||m(a,d,g,l.children),l.filebrowser)if("string"==typeof l.filebrowser&&(l.filebrowser={action:"fileButton"==l.type?"QuickUpload":"Browse",target:l.filebrowser}),"Browse"==l.filebrowser.action){var t=l.filebrowser.url;void 0===t&&(t=a.config["filebrowser"+f(d)+"BrowseUrl"],void 0===t&&(t=a.config.filebrowserBrowseUrl));
-t&&(l.onClick=c,l.filebrowser.url=t,l.hidden=!1)}else if("QuickUpload"==l.filebrowser.action&&l["for"]&&(t=l.filebrowser.url,void 0===t&&(t=a.config["filebrowser"+f(d)+"UploadUrl"],void 0===t&&(t=a.config.filebrowserUploadUrl)),t)){var n=l.onClick;l.onClick=function(a){var b=a.sender;if(n&&!1===n.call(b,a))return!1;if(e.call(b,a)){a=b.getDialog().getContentElement(this["for"][0],this["for"][1]).getInputElement();if(b=new CKEDITOR.dom.element(a.$.form))(a=b.$.elements.ckCsrfToken)?a=new CKEDITOR.dom.element(a):
-(a=new CKEDITOR.dom.element("input"),a.setAttributes({name:"ckCsrfToken",type:"hidden"}),b.append(a)),a.setAttribute("value",CKEDITOR.tools.getCsrfToken());return!0}return!1};l.filebrowser.url=t;l.hidden=!1;h(a,g.getContents(l["for"][0]).get(l["for"][1]),l.filebrowser)}}function l(a,d,c){if(-1!==c.indexOf(";")){c=c.split(";");for(var e=0;e<c.length;e++)if(l(a,d,c[e]))return!0;return!1}return(a=a.getContents(d).get(c).filebrowser)&&a.url}function k(a,d){var c=this._.filebrowserSe.getDialog(),e=this._.filebrowserSe["for"],
-f=this._.filebrowserSe.filebrowser.onSelect;e&&c.getContentElement(e[0],e[1]).reset();if("function"!=typeof d||!1!==d.call(this._.filebrowserSe))if(!f||!1!==f.call(this._.filebrowserSe,a,d))if("string"==typeof d&&d&&alert(d),a&&(e=this._.filebrowserSe,c=e.getDialog(),e=e.filebrowser.target||null))if(e=e.split(":"),f=c.getContentElement(e[0],e[1]))f.setValue(a),c.selectPage(e[0])}CKEDITOR.plugins.add("filebrowser",{requires:"popup",init:function(a){a._.filebrowserFn=CKEDITOR.tools.addFunction(k,a);
-a.on("destroy",function(){CKEDITOR.tools.removeFunction(this._.filebrowserFn)})}});CKEDITOR.on("dialogDefinition",function(a){if(a.editor.plugins.filebrowser)for(var d=a.data.definition,c,e=0;e<d.contents.length;++e)if(c=d.contents[e])m(a.editor,a.data.name,d,c.elements),c.hidden&&c.filebrowser&&(c.hidden=!l(d,c.id,c.filebrowser))})}(),function(){function a(a){var h=a.config,m=a.fire("uiSpace",{space:"top",html:""}).html,l=function(){function d(a,e,g){b.setStyle(e,c(g));b.setStyle("position",a)}function g(a){var b=
-m.getDocumentPosition();switch(a){case "top":d("absolute","top",b.y-A-w);break;case "pin":d("fixed","top",z);break;case "bottom":d("absolute","top",b.y+(q.height||q.bottom-q.top)+w)}k=a}var k,m,n,q,x,A,C,r=h.floatSpaceDockedOffsetX||0,w=h.floatSpaceDockedOffsetY||0,B=h.floatSpacePinnedOffsetX||0,z=h.floatSpacePinnedOffsetY||0;return function(d){if(m=a.editable()){var p=d&&"focus"==d.name;p&&b.show();a.fire("floatingSpaceLayout",{show:p});b.removeStyle("left");b.removeStyle("right");n=b.getClientRect();
-q=m.getClientRect();x=f.getViewPaneSize();A=n.height;C="pageXOffset"in f.$?f.$.pageXOffset:CKEDITOR.document.$.documentElement.scrollLeft;k?(A+w<=q.top?g("top"):A+w>x.height-q.bottom?g("pin"):g("bottom"),d=x.width/2,d=h.floatSpacePreferRight?"right":0<q.left&&q.right<x.width&&q.width>n.width?"rtl"==h.contentsLangDirection?"right":"left":d-q.left>q.right-d?"left":"right",n.width>x.width?(d="left",p=0):(p="left"==d?0<q.left?q.left:0:q.right<x.width?x.width-q.right:0,p+n.width>x.width&&(d="left"==d?
-"right":"left",p=0)),b.setStyle(d,c(("pin"==k?B:r)+p+("pin"==k?0:"left"==d?C:-C)))):(k="pin",g("pin"),l(d))}}}();if(m){var k=new CKEDITOR.template('\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_float cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?" ":"")+'" lang\x3d"{langCode}" role\x3d"application" style\x3d"{style}"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':" ")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':
-" ")+'\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{topId}" class\x3d"cke_top" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e'),b=CKEDITOR.document.getBody().append(CKEDITOR.dom.element.createFromHtml(k.output({content:m,id:a.id,langDir:a.lang.dir,langCode:a.langCode,name:a.name,style:"display:none;z-index:"+(h.baseFloatZIndex-1),topId:a.ui.spaceId("top"),voiceLabel:a.title}))),d=CKEDITOR.tools.eventsBuffer(500,l),g=CKEDITOR.tools.eventsBuffer(100,l);b.unselectable();b.on("mousedown",
-function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()});a.on("focus",function(b){l(b);a.on("change",d.input);f.on("scroll",g.input);f.on("resize",g.input)});a.on("blur",function(){b.hide();a.removeListener("change",d.input);f.removeListener("scroll",g.input);f.removeListener("resize",g.input)});a.on("destroy",function(){f.removeListener("scroll",g.input);f.removeListener("resize",g.input);b.clearCustomData();b.remove()});a.focusManager.hasFocus&&b.show();a.focusManager.add(b,
-1)}}var f=CKEDITOR.document.getWindow(),c=CKEDITOR.tools.cssLength;CKEDITOR.plugins.add("floatingspace",{init:function(c){c.on("loaded",function(){a(this)},null,null,20)}})}(),CKEDITOR.plugins.add("listblock",{requires:"panel",onLoad:function(){var a=CKEDITOR.addTemplate("panel-list",'\x3cul role\x3d"presentation" class\x3d"cke_panel_list"\x3e{items}\x3c/ul\x3e'),f=CKEDITOR.addTemplate("panel-list-item",'\x3cli id\x3d"{id}" class\x3d"cke_panel_listItem" role\x3dpresentation\x3e\x3ca id\x3d"{id}_option" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"{title}" href\x3d"javascript:void(\'{val}\')"  {onclick}\x3d"CKEDITOR.tools.callFunction({clickFn},\'{val}\'); return false;" role\x3d"option"\x3e{text}\x3c/a\x3e\x3c/li\x3e'),
-c=CKEDITOR.addTemplate("panel-list-group",'\x3ch1 id\x3d"{id}" class\x3d"cke_panel_grouptitle" role\x3d"presentation" \x3e{label}\x3c/h1\x3e'),e=/\'/g;CKEDITOR.ui.panel.prototype.addListBlock=function(a,c){return this.addBlock(a,new CKEDITOR.ui.listBlock(this.getHolderElement(),c))};CKEDITOR.ui.listBlock=CKEDITOR.tools.createClass({base:CKEDITOR.ui.panel.block,$:function(a,c){c=c||{};var e=c.attributes||(c.attributes={});(this.multiSelect=!!c.multiSelect)&&(e["aria-multiselectable"]=!0);!e.role&&
+h.entities_additional&&m.push(h.entities_additional));var l=a(m.join(",")),k=l.regex?"["+l.regex+"]":"a^";delete l.regex;h.entities&&h.entities_processNumerical&&(k="[^ -~]|"+k);var k=new RegExp(k,"g"),d=a("nbsp,gt,lt,amp,shy",!0),b=new RegExp(d.regex,"g");e.addRules({text:function(a){return a.replace(b,c).replace(k,f)}},{applyToAll:!0,excludeNestedEditable:!0})}}})}(),CKEDITOR.config.basicEntities=!0,CKEDITOR.config.entities=!0,CKEDITOR.config.entities_latin=!0,CKEDITOR.config.entities_greek=!0,
+CKEDITOR.config.entities_additional="#39",CKEDITOR.plugins.add("popup"),CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{popup:function(a,e,c,f){e=e||"80%";c=c||"70%";"string"==typeof e&&1<e.length&&"%"==e.substr(e.length-1,1)&&(e=parseInt(window.screen.width*parseInt(e,10)/100,10));"string"==typeof c&&1<c.length&&"%"==c.substr(c.length-1,1)&&(c=parseInt(window.screen.height*parseInt(c,10)/100,10));640>e&&(e=640);420>c&&(c=420);var h=parseInt((window.screen.height-c)/2,10),m=parseInt((window.screen.width-
+e)/2,10);f=(f||"location\x3dno,menubar\x3dno,toolbar\x3dno,dependent\x3dyes,minimizable\x3dno,modal\x3dyes,alwaysRaised\x3dyes,resizable\x3dyes,scrollbars\x3dyes")+",width\x3d"+e+",height\x3d"+c+",top\x3d"+h+",left\x3d"+m;var l=window.open("",null,f,!0);if(!l)return!1;try{-1==navigator.userAgent.toLowerCase().indexOf(" chrome/")&&(l.moveTo(m,h),l.resizeTo(e,c)),l.focus(),l.location.href=a}catch(k){window.open(a,null,f,!0)}return!0}}),function(){function a(a,b){var c=[];if(b)for(var e in b)c.push(e+
+"\x3d"+encodeURIComponent(b[e]));else return a;return a+(-1!=a.indexOf("?")?"\x26":"?")+c.join("\x26")}function e(a){a+="";return a.charAt(0).toUpperCase()+a.substr(1)}function c(){var d=this.getDialog(),b=d.getParentEditor();b._.filebrowserSe=this;var c=b.config["filebrowser"+e(d.getName())+"WindowWidth"]||b.config.filebrowserWindowWidth||"80%",d=b.config["filebrowser"+e(d.getName())+"WindowHeight"]||b.config.filebrowserWindowHeight||"70%",f=this.filebrowser.params||{};f.CKEditor=b.name;f.CKEditorFuncNum=
+b._.filebrowserFn;f.langCode||(f.langCode=b.langCode);f=a(this.filebrowser.url,f);b.popup(f,c,d,b.config.filebrowserWindowFeatures||b.config.fileBrowserWindowFeatures)}function f(){var a=this.getDialog();a.getParentEditor()._.filebrowserSe=this;return a.getContentElement(this["for"][0],this["for"][1]).getInputElement().$.value&&a.getContentElement(this["for"][0],this["for"][1]).getAction()?!0:!1}function h(d,b,c){var e=c.params||{};e.CKEditor=d.name;e.CKEditorFuncNum=d._.filebrowserFn;e.langCode||
+(e.langCode=d.langCode);b.action=a(c.url,e);b.filebrowser=c}function m(a,b,g,k){if(k&&k.length)for(var l,r=k.length;r--;)if(l=k[r],"hbox"!=l.type&&"vbox"!=l.type&&"fieldset"!=l.type||m(a,b,g,l.children),l.filebrowser)if("string"==typeof l.filebrowser&&(l.filebrowser={action:"fileButton"==l.type?"QuickUpload":"Browse",target:l.filebrowser}),"Browse"==l.filebrowser.action){var w=l.filebrowser.url;void 0===w&&(w=a.config["filebrowser"+e(b)+"BrowseUrl"],void 0===w&&(w=a.config.filebrowserBrowseUrl));
+w&&(l.onClick=c,l.filebrowser.url=w,l.hidden=!1)}else if("QuickUpload"==l.filebrowser.action&&l["for"]&&(w=l.filebrowser.url,void 0===w&&(w=a.config["filebrowser"+e(b)+"UploadUrl"],void 0===w&&(w=a.config.filebrowserUploadUrl)),w)){var n=l.onClick;l.onClick=function(a){var b=a.sender;if(n&&!1===n.call(b,a))return!1;if(f.call(b,a)){a=b.getDialog().getContentElement(this["for"][0],this["for"][1]).getInputElement();if(b=new CKEDITOR.dom.element(a.$.form))(a=b.$.elements.ckCsrfToken)?a=new CKEDITOR.dom.element(a):
+(a=new CKEDITOR.dom.element("input"),a.setAttributes({name:"ckCsrfToken",type:"hidden"}),b.append(a)),a.setAttribute("value",CKEDITOR.tools.getCsrfToken());return!0}return!1};l.filebrowser.url=w;l.hidden=!1;h(a,g.getContents(l["for"][0]).get(l["for"][1]),l.filebrowser)}}function l(a,b,c){if(-1!==c.indexOf(";")){c=c.split(";");for(var e=0;e<c.length;e++)if(l(a,b,c[e]))return!0;return!1}return(a=a.getContents(b).get(c).filebrowser)&&a.url}function k(a,b){var c=this._.filebrowserSe.getDialog(),e=this._.filebrowserSe["for"],
+f=this._.filebrowserSe.filebrowser.onSelect;e&&c.getContentElement(e[0],e[1]).reset();if("function"!=typeof b||!1!==b.call(this._.filebrowserSe))if(!f||!1!==f.call(this._.filebrowserSe,a,b))if("string"==typeof b&&b&&alert(b),a&&(e=this._.filebrowserSe,c=e.getDialog(),e=e.filebrowser.target||null))if(e=e.split(":"),f=c.getContentElement(e[0],e[1]))f.setValue(a),c.selectPage(e[0])}CKEDITOR.plugins.add("filebrowser",{requires:"popup",init:function(a){a._.filebrowserFn=CKEDITOR.tools.addFunction(k,a);
+a.on("destroy",function(){CKEDITOR.tools.removeFunction(this._.filebrowserFn)})}});CKEDITOR.on("dialogDefinition",function(a){if(a.editor.plugins.filebrowser)for(var b=a.data.definition,c,e=0;e<b.contents.length;++e)if(c=b.contents[e])m(a.editor,a.data.name,b,c.elements),c.hidden&&c.filebrowser&&(c.hidden=!l(b,c.id,c.filebrowser))})}(),function(){function a(a){var h=a.config,m=a.fire("uiSpace",{space:"top",html:""}).html,l=function(){function b(a,e,g){d.setStyle(e,c(g));d.setStyle("position",a)}function g(a){var d=
+m.getDocumentPosition();switch(a){case "top":b("absolute","top",d.y-B-x);break;case "pin":b("fixed","top",z);break;case "bottom":b("absolute","top",d.y+(q.height||q.bottom-q.top)+x)}k=a}var k,m,n,q,u,B,y,t=h.floatSpaceDockedOffsetX||0,x=h.floatSpaceDockedOffsetY||0,F=h.floatSpacePinnedOffsetX||0,z=h.floatSpacePinnedOffsetY||0;return function(b){if(m=a.editable()){var p=b&&"focus"==b.name;p&&d.show();a.fire("floatingSpaceLayout",{show:p});d.removeStyle("left");d.removeStyle("right");n=d.getClientRect();
+q=m.getClientRect();u=e.getViewPaneSize();B=n.height;y="pageXOffset"in e.$?e.$.pageXOffset:CKEDITOR.document.$.documentElement.scrollLeft;k?(B+x<=q.top?g("top"):B+x>u.height-q.bottom?g("pin"):g("bottom"),b=u.width/2,b=h.floatSpacePreferRight?"right":0<q.left&&q.right<u.width&&q.width>n.width?"rtl"==h.contentsLangDirection?"right":"left":b-q.left>q.right-b?"left":"right",n.width>u.width?(b="left",p=0):(p="left"==b?0<q.left?q.left:0:q.right<u.width?u.width-q.right:0,p+n.width>u.width&&(b="left"==b?
+"right":"left",p=0)),d.setStyle(b,c(("pin"==k?F:t)+p+("pin"==k?0:"left"==b?y:-y)))):(k="pin",g("pin"),l(b))}}}();if(m){var k=new CKEDITOR.template('\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_float cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?" ":"")+'" lang\x3d"{langCode}" role\x3d"application" style\x3d"{style}"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':" ")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':
+" ")+'\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{topId}" class\x3d"cke_top" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e'),d=CKEDITOR.document.getBody().append(CKEDITOR.dom.element.createFromHtml(k.output({content:m,id:a.id,langDir:a.lang.dir,langCode:a.langCode,name:a.name,style:"display:none;z-index:"+(h.baseFloatZIndex-1),topId:a.ui.spaceId("top"),voiceLabel:a.title}))),b=CKEDITOR.tools.eventsBuffer(500,l),g=CKEDITOR.tools.eventsBuffer(100,l);d.unselectable();d.on("mousedown",
+function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()});a.on("focus",function(d){l(d);a.on("change",b.input);e.on("scroll",g.input);e.on("resize",g.input)});a.on("blur",function(){d.hide();a.removeListener("change",b.input);e.removeListener("scroll",g.input);e.removeListener("resize",g.input)});a.on("destroy",function(){e.removeListener("scroll",g.input);e.removeListener("resize",g.input);d.clearCustomData();d.remove()});a.focusManager.hasFocus&&d.show();a.focusManager.add(d,
+1)}}var e=CKEDITOR.document.getWindow(),c=CKEDITOR.tools.cssLength;CKEDITOR.plugins.add("floatingspace",{init:function(c){c.on("loaded",function(){a(this)},null,null,20)}})}(),CKEDITOR.plugins.add("listblock",{requires:"panel",onLoad:function(){var a=CKEDITOR.addTemplate("panel-list",'\x3cul role\x3d"presentation" class\x3d"cke_panel_list"\x3e{items}\x3c/ul\x3e'),e=CKEDITOR.addTemplate("panel-list-item",'\x3cli id\x3d"{id}" class\x3d"cke_panel_listItem" role\x3dpresentation\x3e\x3ca id\x3d"{id}_option" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"{title}" href\x3d"javascript:void(\'{val}\')"  {onclick}\x3d"CKEDITOR.tools.callFunction({clickFn},\'{val}\'); return false;" role\x3d"option"\x3e{text}\x3c/a\x3e\x3c/li\x3e'),
+c=CKEDITOR.addTemplate("panel-list-group",'\x3ch1 id\x3d"{id}" class\x3d"cke_panel_grouptitle" role\x3d"presentation" \x3e{label}\x3c/h1\x3e'),f=/\'/g;CKEDITOR.ui.panel.prototype.addListBlock=function(a,c){return this.addBlock(a,new CKEDITOR.ui.listBlock(this.getHolderElement(),c))};CKEDITOR.ui.listBlock=CKEDITOR.tools.createClass({base:CKEDITOR.ui.panel.block,$:function(a,c){c=c||{};var e=c.attributes||(c.attributes={});(this.multiSelect=!!c.multiSelect)&&(e["aria-multiselectable"]=!0);!e.role&&
 (e.role="listbox");this.base.apply(this,arguments);this.element.setAttribute("role",e.role);e=this.keys;e[40]="next";e[9]="next";e[38]="prev";e[CKEDITOR.SHIFT+9]="prev";e[32]=CKEDITOR.env.ie?"mouseup":"click";CKEDITOR.env.ie&&(e[13]="mouseup");this._.pendingHtml=[];this._.pendingList=[];this._.items={};this._.groups={}},_:{close:function(){if(this._.started){var c=a.output({items:this._.pendingList.join("")});this._.pendingList=[];this._.pendingHtml.push(c);delete this._.started}},getClick:function(){this._.click||
-(this._.click=CKEDITOR.tools.addFunction(function(a){var c=this.toggle(a);if(this.onClick)this.onClick(a,c)},this));return this._.click}},proto:{add:function(a,c,l){var k=CKEDITOR.tools.getNextId();this._.started||(this._.started=1,this._.size=this._.size||0);this._.items[a]=k;var b;b=CKEDITOR.tools.htmlEncodeAttr(a).replace(e,"\\'");a={id:k,val:b,onclick:CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick",clickFn:this._.getClick(),title:CKEDITOR.tools.htmlEncodeAttr(l||a),text:c||a};
-this._.pendingList.push(f.output(a))},startGroup:function(a){this._.close();var e=CKEDITOR.tools.getNextId();this._.groups[a]=e;this._.pendingHtml.push(c.output({id:e,label:a}))},commit:function(){this._.close();this.element.appendHtml(this._.pendingHtml.join(""));delete this._.size;this._.pendingHtml=[]},toggle:function(a){var c=this.isMarked(a);c?this.unmark(a):this.mark(a);return!c},hideGroup:function(a){var c=(a=this.element.getDocument().getById(this._.groups[a]))&&a.getNext();a&&(a.setStyle("display",
-"none"),c&&"ul"==c.getName()&&c.setStyle("display","none"))},hideItem:function(a){this.element.getDocument().getById(this._.items[a]).setStyle("display","none")},showAll:function(){var a=this._.items,c=this._.groups,e=this.element.getDocument(),f;for(f in a)e.getById(a[f]).setStyle("display","");for(var b in c)a=e.getById(c[b]),f=a.getNext(),a.setStyle("display",""),f&&"ul"==f.getName()&&f.setStyle("display","")},mark:function(a){this.multiSelect||this.unmarkAll();a=this._.items[a];var c=this.element.getDocument().getById(a);
+(this._.click=CKEDITOR.tools.addFunction(function(a){var c=this.toggle(a);if(this.onClick)this.onClick(a,c)},this));return this._.click}},proto:{add:function(a,c,l){var k=CKEDITOR.tools.getNextId();this._.started||(this._.started=1,this._.size=this._.size||0);this._.items[a]=k;var d;d=CKEDITOR.tools.htmlEncodeAttr(a).replace(f,"\\'");a={id:k,val:d,onclick:CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick",clickFn:this._.getClick(),title:CKEDITOR.tools.htmlEncodeAttr(l||a),text:c||a};
+this._.pendingList.push(e.output(a))},startGroup:function(a){this._.close();var e=CKEDITOR.tools.getNextId();this._.groups[a]=e;this._.pendingHtml.push(c.output({id:e,label:a}))},commit:function(){this._.close();this.element.appendHtml(this._.pendingHtml.join(""));delete this._.size;this._.pendingHtml=[]},toggle:function(a){var c=this.isMarked(a);c?this.unmark(a):this.mark(a);return!c},hideGroup:function(a){var c=(a=this.element.getDocument().getById(this._.groups[a]))&&a.getNext();a&&(a.setStyle("display",
+"none"),c&&"ul"==c.getName()&&c.setStyle("display","none"))},hideItem:function(a){this.element.getDocument().getById(this._.items[a]).setStyle("display","none")},showAll:function(){var a=this._.items,c=this._.groups,e=this.element.getDocument(),f;for(f in a)e.getById(a[f]).setStyle("display","");for(var d in c)a=e.getById(c[d]),f=a.getNext(),a.setStyle("display",""),f&&"ul"==f.getName()&&f.setStyle("display","")},mark:function(a){this.multiSelect||this.unmarkAll();a=this._.items[a];var c=this.element.getDocument().getById(a);
 c.addClass("cke_selected");this.element.getDocument().getById(a+"_option").setAttribute("aria-selected",!0);this.onMark&&this.onMark(c)},unmark:function(a){var c=this.element.getDocument();a=this._.items[a];var e=c.getById(a);e.removeClass("cke_selected");c.getById(a+"_option").removeAttribute("aria-selected");this.onUnmark&&this.onUnmark(e)},unmarkAll:function(){var a=this._.items,c=this.element.getDocument(),e;for(e in a){var f=a[e];c.getById(f).removeClass("cke_selected");c.getById(f+"_option").removeAttribute("aria-selected")}this.onUnmark&&
 this.onUnmark()},isMarked:function(a){return this.element.getDocument().getById(this._.items[a]).hasClass("cke_selected")},focus:function(a){this._.focusIndex=-1;var c=this.element.getElementsByTag("a"),e,f=-1;if(a)for(e=this.element.getDocument().getById(this._.items[a]).getFirst();a=c.getItem(++f);){if(a.equals(e)){this._.focusIndex=f;break}}else this.element.focus();e&&setTimeout(function(){e.focus()},0)}}})}}),CKEDITOR.plugins.add("richcombo",{requires:"floatpanel,listblock,button",beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_RICHCOMBO,
 CKEDITOR.ui.richCombo.handler)}}),function(){var a='\x3cspan id\x3d"{id}" class\x3d"cke_combo cke_combo__{name} {cls}" role\x3d"presentation"\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_combo_label"\x3e{label}\x3c/span\x3e\x3ca class\x3d"cke_combo_button" title\x3d"{title}" tabindex\x3d"-1"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-haspopup\x3d"true"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&
 (a+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(a+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var a=a+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event,this);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan id\x3d"{id}_text" class\x3d"cke_combo_text cke_combo_inlinelabel"\x3e{label}\x3c/span\x3e\x3cspan class\x3d"cke_combo_open"\x3e\x3cspan class\x3d"cke_combo_arrow"\x3e'+
-(CKEDITOR.env.hc?"\x26#9660;":CKEDITOR.env.air?"\x26nbsp;":"")+"\x3c/span\x3e\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e"),f=CKEDITOR.addTemplate("combo",a);CKEDITOR.UI_RICHCOMBO="richcombo";CKEDITOR.ui.richCombo=CKEDITOR.tools.createClass({$:function(a){CKEDITOR.tools.extend(this,a,{canGroup:!1,title:a.label,modes:{wysiwyg:1},editorFocus:1});a=this.panel||{};delete this.panel;this.id=CKEDITOR.tools.getNextNumber();this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.className="cke_combopanel";
-a.block={multiSelect:a.multiSelect,attributes:a.attributes};a.toolbarRelated=!0;this._={panelDefinition:a,items:{}}},proto:{renderHtml:function(a){var e=[];this.render(a,e);return e.join("")},render:function(a,e){function h(){if(this.getState()!=CKEDITOR.TRISTATE_ON){var b=this.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;a.readOnly&&!this.readOnly&&(b=CKEDITOR.TRISTATE_DISABLED);this.setState(b);this.setValue("");b!=CKEDITOR.TRISTATE_DISABLED&&this.refresh&&this.refresh()}}var m=
-CKEDITOR.env,l="cke_"+this.id,k=CKEDITOR.tools.addFunction(function(b){v&&(a.unlockSelection(1),v=0);d.execute(b)},this),b=this,d={id:l,combo:this,focus:function(){CKEDITOR.document.getById(l).getChild(1).focus()},execute:function(d){var e=b._;if(e.state!=CKEDITOR.TRISTATE_DISABLED)if(b.createPanel(a),e.on)e.panel.hide();else{b.commit();var g=b.getValue();g?e.list.mark(g):e.list.unmarkAll();e.panel.showBlock(b.id,new CKEDITOR.dom.element(d),4)}},clickFn:k};a.on("activeFilterChange",h,this);a.on("mode",
-h,this);a.on("selectionChange",h,this);!this.readOnly&&a.on("readOnly",h,this);var g=CKEDITOR.tools.addFunction(function(b,e){b=new CKEDITOR.dom.event(b);var g=b.getKeystroke();if(40==g)a.once("panelShow",function(a){a.data._.panel._.currentBlock.onKeyDown(40)});switch(g){case 13:case 32:case 40:CKEDITOR.tools.callFunction(k,e);break;default:d.onkey(d,g)}b.preventDefault()}),p=CKEDITOR.tools.addFunction(function(){d.onfocus&&d.onfocus()}),v=0;d.keyDownFn=g;m={id:l,name:this.name||this.command,label:this.label,
-title:this.title,cls:this.className||"",titleJs:m.gecko&&!m.hc?"":(this.title||"").replace("'",""),keydownFn:g,focusFn:p,clickFn:k};f.output(m,e);if(this.onRender)this.onRender();return d},createPanel:function(a){if(!this._.panel){var e=this._.panelDefinition,f=this._.panelDefinition.block,m=e.parent||CKEDITOR.document.getBody(),l="cke_combopanel__"+this.name,k=new CKEDITOR.ui.floatPanel(a,m,e),b=k.addListBlock(this.id,f),d=this;k.onShow=function(){this.element.addClass(l);d.setState(CKEDITOR.TRISTATE_ON);
-d._.on=1;d.editorFocus&&!a.focusManager.hasFocus&&a.focus();if(d.onOpen)d.onOpen();a.once("panelShow",function(){b.focus(!b.multiSelect&&d.getValue())})};k.onHide=function(b){this.element.removeClass(l);d.setState(d.modes&&d.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);d._.on=0;if(!b&&d.onClose)d.onClose()};k.onEscape=function(){k.hide(1)};b.onClick=function(a,b){d.onClick&&d.onClick.call(d,a,b);k.hide()};this._.panel=k;this._.list=b;k.getBlock(this.id).onHide=function(){d._.on=
-0;d.setState(CKEDITOR.TRISTATE_OFF)};this.init&&this.init()}},setValue:function(a,e){this._.value=a;var f=this.document.getById("cke_"+this.id+"_text");f&&(a||e?f.removeClass("cke_combo_inlinelabel"):(e=this.label,f.addClass("cke_combo_inlinelabel")),f.setText("undefined"!=typeof e?e:a))},getValue:function(){return this._.value||""},unmarkAll:function(){this._.list.unmarkAll()},mark:function(a){this._.list.mark(a)},hideItem:function(a){this._.list.hideItem(a)},hideGroup:function(a){this._.list.hideGroup(a)},
-showAll:function(){this._.list.showAll()},add:function(a,e,f){this._.items[a]=f||a;this._.list.add(a,e,f)},startGroup:function(a){this._.list.startGroup(a)},commit:function(){this._.committed||(this._.list.commit(),this._.committed=1,CKEDITOR.ui.fire("ready",this));this._.committed=1},setState:function(a){if(this._.state!=a){var e=this.document.getById("cke_"+this.id);e.setState(a,"cke_combo");a==CKEDITOR.TRISTATE_DISABLED?e.setAttribute("aria-disabled",!0):e.removeAttribute("aria-disabled");this._.state=
-a}},getState:function(){return this._.state},enable:function(){this._.state==CKEDITOR.TRISTATE_DISABLED&&this.setState(this._.lastState)},disable:function(){this._.state!=CKEDITOR.TRISTATE_DISABLED&&(this._.lastState=this._.state,this.setState(CKEDITOR.TRISTATE_DISABLED))}},statics:{handler:{create:function(a){return new CKEDITOR.ui.richCombo(a)}}}});CKEDITOR.ui.prototype.addRichCombo=function(a,e){this.add(a,CKEDITOR.UI_RICHCOMBO,e)}}(),CKEDITOR.plugins.add("format",{requires:"richcombo",init:function(a){if(!a.blockless){for(var f=
-a.config,c=a.lang.format,e=f.format_tags.split(";"),h={},m=0,l=[],k=0;k<e.length;k++){var b=e[k],d=new CKEDITOR.style(f["format_"+b]);if(!a.filter.customConfig||a.filter.check(d))m++,h[b]=d,h[b]._.enterMode=a.config.enterMode,l.push(d)}0!==m&&a.ui.addRichCombo("Format",{label:c.label,title:c.panelTitle,toolbar:"styles,20",allowedContent:l,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(f.contentsCss),multiSelect:!1,attributes:{"aria-label":c.panelTitle}},init:function(){this.startGroup(c.panelTitle);
+(CKEDITOR.env.hc?"\x26#9660;":CKEDITOR.env.air?"\x26nbsp;":"")+"\x3c/span\x3e\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e"),e=CKEDITOR.addTemplate("combo",a);CKEDITOR.UI_RICHCOMBO="richcombo";CKEDITOR.ui.richCombo=CKEDITOR.tools.createClass({$:function(a){CKEDITOR.tools.extend(this,a,{canGroup:!1,title:a.label,modes:{wysiwyg:1},editorFocus:1});a=this.panel||{};delete this.panel;this.id=CKEDITOR.tools.getNextNumber();this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.className="cke_combopanel";
+a.block={multiSelect:a.multiSelect,attributes:a.attributes};a.toolbarRelated=!0;this._={panelDefinition:a,items:{}}},proto:{renderHtml:function(a){var e=[];this.render(a,e);return e.join("")},render:function(a,f){function h(){if(this.getState()!=CKEDITOR.TRISTATE_ON){var b=this.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;a.readOnly&&!this.readOnly&&(b=CKEDITOR.TRISTATE_DISABLED);this.setState(b);this.setValue("");b!=CKEDITOR.TRISTATE_DISABLED&&this.refresh&&this.refresh()}}var m=
+CKEDITOR.env,l="cke_"+this.id,k=CKEDITOR.tools.addFunction(function(d){v&&(a.unlockSelection(1),v=0);b.execute(d)},this),d=this,b={id:l,combo:this,focus:function(){CKEDITOR.document.getById(l).getChild(1).focus()},execute:function(b){var e=d._;if(e.state!=CKEDITOR.TRISTATE_DISABLED)if(d.createPanel(a),e.on)e.panel.hide();else{d.commit();var g=d.getValue();g?e.list.mark(g):e.list.unmarkAll();e.panel.showBlock(d.id,new CKEDITOR.dom.element(b),4)}},clickFn:k};a.on("activeFilterChange",h,this);a.on("mode",
+h,this);a.on("selectionChange",h,this);!this.readOnly&&a.on("readOnly",h,this);var g=CKEDITOR.tools.addFunction(function(d,e){d=new CKEDITOR.dom.event(d);var g=d.getKeystroke();if(40==g)a.once("panelShow",function(a){a.data._.panel._.currentBlock.onKeyDown(40)});switch(g){case 13:case 32:case 40:CKEDITOR.tools.callFunction(k,e);break;default:b.onkey(b,g)}d.preventDefault()}),p=CKEDITOR.tools.addFunction(function(){b.onfocus&&b.onfocus()}),v=0;b.keyDownFn=g;m={id:l,name:this.name||this.command,label:this.label,
+title:this.title,cls:this.className||"",titleJs:m.gecko&&!m.hc?"":(this.title||"").replace("'",""),keydownFn:g,focusFn:p,clickFn:k};e.output(m,f);if(this.onRender)this.onRender();return b},createPanel:function(a){if(!this._.panel){var e=this._.panelDefinition,h=this._.panelDefinition.block,m=e.parent||CKEDITOR.document.getBody(),l="cke_combopanel__"+this.name,k=new CKEDITOR.ui.floatPanel(a,m,e),d=k.addListBlock(this.id,h),b=this;k.onShow=function(){this.element.addClass(l);b.setState(CKEDITOR.TRISTATE_ON);
+b._.on=1;b.editorFocus&&!a.focusManager.hasFocus&&a.focus();if(b.onOpen)b.onOpen();a.once("panelShow",function(){d.focus(!d.multiSelect&&b.getValue())})};k.onHide=function(d){this.element.removeClass(l);b.setState(b.modes&&b.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);b._.on=0;if(!d&&b.onClose)b.onClose()};k.onEscape=function(){k.hide(1)};d.onClick=function(a,d){b.onClick&&b.onClick.call(b,a,d);k.hide()};this._.panel=k;this._.list=d;k.getBlock(this.id).onHide=function(){b._.on=
+0;b.setState(CKEDITOR.TRISTATE_OFF)};this.init&&this.init()}},setValue:function(a,e){this._.value=a;var h=this.document.getById("cke_"+this.id+"_text");h&&(a||e?h.removeClass("cke_combo_inlinelabel"):(e=this.label,h.addClass("cke_combo_inlinelabel")),h.setText("undefined"!=typeof e?e:a))},getValue:function(){return this._.value||""},unmarkAll:function(){this._.list.unmarkAll()},mark:function(a){this._.list.mark(a)},hideItem:function(a){this._.list.hideItem(a)},hideGroup:function(a){this._.list.hideGroup(a)},
+showAll:function(){this._.list.showAll()},add:function(a,e,h){this._.items[a]=h||a;this._.list.add(a,e,h)},startGroup:function(a){this._.list.startGroup(a)},commit:function(){this._.committed||(this._.list.commit(),this._.committed=1,CKEDITOR.ui.fire("ready",this));this._.committed=1},setState:function(a){if(this._.state!=a){var e=this.document.getById("cke_"+this.id);e.setState(a,"cke_combo");a==CKEDITOR.TRISTATE_DISABLED?e.setAttribute("aria-disabled",!0):e.removeAttribute("aria-disabled");this._.state=
+a}},getState:function(){return this._.state},enable:function(){this._.state==CKEDITOR.TRISTATE_DISABLED&&this.setState(this._.lastState)},disable:function(){this._.state!=CKEDITOR.TRISTATE_DISABLED&&(this._.lastState=this._.state,this.setState(CKEDITOR.TRISTATE_DISABLED))}},statics:{handler:{create:function(a){return new CKEDITOR.ui.richCombo(a)}}}});CKEDITOR.ui.prototype.addRichCombo=function(a,e){this.add(a,CKEDITOR.UI_RICHCOMBO,e)}}(),CKEDITOR.plugins.add("format",{requires:"richcombo",init:function(a){if(!a.blockless){for(var e=
+a.config,c=a.lang.format,f=e.format_tags.split(";"),h={},m=0,l=[],k=0;k<f.length;k++){var d=f[k],b=new CKEDITOR.style(e["format_"+d]);if(!a.filter.customConfig||a.filter.check(b))m++,h[d]=b,h[d]._.enterMode=a.config.enterMode,l.push(b)}0!==m&&a.ui.addRichCombo("Format",{label:c.label,title:c.panelTitle,toolbar:"styles,20",allowedContent:l,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(e.contentsCss),multiSelect:!1,attributes:{"aria-label":c.panelTitle}},init:function(){this.startGroup(c.panelTitle);
 for(var a in h){var b=c["tag_"+a];this.add(a,h[a].buildPreview(b),b)}},onClick:function(b){a.focus();a.fire("saveSnapshot");b=h[b];var d=a.elementPath();a[b.checkActive(d,a)?"removeStyle":"applyStyle"](b);setTimeout(function(){a.fire("saveSnapshot")},0)},onRender:function(){a.on("selectionChange",function(b){var d=this.getValue();b=b.data.path;this.refresh();for(var c in h)if(h[c].checkActive(b,a)){c!=d&&this.setValue(c,a.lang.format["tag_"+c]);return}this.setValue("")},this)},onOpen:function(){this.showAll();
 for(var b in h)a.activeFilter.check(h[b])||this.hideItem(b)},refresh:function(){var b=a.elementPath();if(b){if(b.isContextFor("p"))for(var d in h)if(a.activeFilter.check(h[d]))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}}})}}}),CKEDITOR.config.format_tags="p;h1;h2;h3;h4;h5;h6;pre;address;div",CKEDITOR.config.format_p={element:"p"},CKEDITOR.config.format_div={element:"div"},CKEDITOR.config.format_pre={element:"pre"},CKEDITOR.config.format_address={element:"address"},CKEDITOR.config.format_h1=
-{element:"h1"},CKEDITOR.config.format_h2={element:"h2"},CKEDITOR.config.format_h3={element:"h3"},CKEDITOR.config.format_h4={element:"h4"},CKEDITOR.config.format_h5={element:"h5"},CKEDITOR.config.format_h6={element:"h6"},CKEDITOR.plugins.add("htmlwriter",{init:function(a){var f=new CKEDITOR.htmlWriter;f.forceSimpleAmpersand=a.config.forceSimpleAmpersand;f.indentationChars=a.config.dataIndentationChars||"\t";a.dataProcessor.writer=f}}),CKEDITOR.htmlWriter=CKEDITOR.tools.createClass({base:CKEDITOR.htmlParser.basicWriter,
-$:function(){this.base();this.indentationChars="\t";this.selfClosingEnd=" /\x3e";this.lineBreakChars="\n";this.sortAttributes=1;this._.indent=0;this._.indentation="";this._.inPre=0;this._.rules={};var a=CKEDITOR.dtd,f;for(f in CKEDITOR.tools.extend({},a.$nonBodyContent,a.$block,a.$listItem,a.$tableContent))this.setRules(f,{indent:!a[f]["#"],breakBeforeOpen:1,breakBeforeClose:!a[f]["#"],breakAfterClose:1,needsSpace:f in a.$block&&!(f in{li:1,dt:1,dd:1})});this.setRules("br",{breakAfterOpen:1});this.setRules("title",
-{indent:0,breakAfterOpen:0});this.setRules("style",{indent:0,breakBeforeClose:1});this.setRules("pre",{breakAfterOpen:1,indent:0})},proto:{openTag:function(a){var f=this._.rules[a];this._.afterCloser&&f&&f.needsSpace&&this._.needsSpace&&this._.output.push("\n");this._.indent?this.indentation():f&&f.breakBeforeOpen&&(this.lineBreak(),this.indentation());this._.output.push("\x3c",a);this._.afterCloser=0},openTagClose:function(a,f){var c=this._.rules[a];f?(this._.output.push(this.selfClosingEnd),c&&
-c.breakAfterClose&&(this._.needsSpace=c.needsSpace)):(this._.output.push("\x3e"),c&&c.indent&&(this._.indentation+=this.indentationChars));c&&c.breakAfterOpen&&this.lineBreak();"pre"==a&&(this._.inPre=1)},attribute:function(a,f){"string"==typeof f&&(this.forceSimpleAmpersand&&(f=f.replace(/&amp;/g,"\x26")),f=CKEDITOR.tools.htmlEncodeAttr(f));this._.output.push(" ",a,'\x3d"',f,'"')},closeTag:function(a){var f=this._.rules[a];f&&f.indent&&(this._.indentation=this._.indentation.substr(this.indentationChars.length));
-this._.indent?this.indentation():f&&f.breakBeforeClose&&(this.lineBreak(),this.indentation());this._.output.push("\x3c/",a,"\x3e");"pre"==a&&(this._.inPre=0);f&&f.breakAfterClose&&(this.lineBreak(),this._.needsSpace=f.needsSpace);this._.afterCloser=1},text:function(a){this._.indent&&(this.indentation(),!this._.inPre&&(a=CKEDITOR.tools.ltrim(a)));this._.output.push(a)},comment:function(a){this._.indent&&this.indentation();this._.output.push("\x3c!--",a,"--\x3e")},lineBreak:function(){!this._.inPre&&
-0<this._.output.length&&this._.output.push(this.lineBreakChars);this._.indent=1},indentation:function(){!this._.inPre&&this._.indentation&&this._.output.push(this._.indentation);this._.indent=0},reset:function(){this._.output=[];this._.indent=0;this._.indentation="";this._.afterCloser=0;this._.inPre=0;this._.needsSpace=0},setRules:function(a,f){var c=this._.rules[a];c?CKEDITOR.tools.extend(c,f,!0):this._.rules[a]=f}}}),function(){var a={canUndo:!1,exec:function(a){var c=a.document.createElement("hr");
-a.insertElement(c)},allowedContent:"hr",requiredContent:"hr"};CKEDITOR.plugins.add("horizontalrule",{init:function(f){f.blockless||(f.addCommand("horizontalrule",a),f.ui.addButton&&f.ui.addButton("HorizontalRule",{label:f.lang.horizontalrule.toolbar,command:"horizontalrule",toolbar:"insert,40"}))}})}(),function(){function a(a){function c(a){var b=!1;g.attachListener(g,"keydown",function(){var d=k.getBody().getElementsByTag(a);if(!b){for(var c=0;c<d.count();c++)d.getItem(c).setCustomData("retain",
-!0);b=!0}},null,null,1);g.attachListener(g,"keyup",function(){var d=k.getElementsByTag(a);b&&(1!=d.count()||d.getItem(0).getCustomData("retain")||d.getItem(0).hasAttribute("data-cke-temp")||d.getItem(0).remove(1),b=!1)})}var e=this.editor,k=a.document,b=k.body,d=k.getElementById("cke_actscrpt");d&&d.parentNode.removeChild(d);(d=k.getElementById("cke_shimscrpt"))&&d.parentNode.removeChild(d);(d=k.getElementById("cke_basetagscrpt"))&&d.parentNode.removeChild(d);b.contentEditable=!0;CKEDITOR.env.ie&&
-(b.hideFocus=!0,b.disabled=!0,b.removeAttribute("disabled"));delete this._.isLoadingData;this.$=b;k=new CKEDITOR.dom.document(k);this.setup();this.fixInitialSelection();var g=this;CKEDITOR.env.ie&&!CKEDITOR.env.edge&&k.getDocumentElement().addClass(k.$.compatMode);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&e.enterMode!=CKEDITOR.ENTER_P?c("p"):CKEDITOR.env.edge&&e.enterMode!=CKEDITOR.ENTER_DIV&&c("div");if(CKEDITOR.env.webkit||CKEDITOR.env.ie&&10<CKEDITOR.env.version)k.getDocumentElement().on("mousedown",
-function(a){a.data.getTarget().is("html")&&setTimeout(function(){e.editable().focus()})});f(e);try{e.document.$.execCommand("2D-position",!1,!0)}catch(p){}(CKEDITOR.env.gecko||CKEDITOR.env.ie&&"CSS1Compat"==e.document.$.compatMode)&&this.attachListener(this,"keydown",function(a){var b=a.data.getKeystroke();if(33==b||34==b)if(CKEDITOR.env.ie)setTimeout(function(){e.getSelection().scrollIntoView()},0);else if(e.window.$.innerHeight>this.$.offsetHeight){var d=e.createRange();d[33==b?"moveToElementEditStart":
-"moveToElementEditEnd"](this);d.select();a.data.preventDefault()}});CKEDITOR.env.ie&&this.attachListener(k,"blur",function(){try{k.$.selection.empty()}catch(a){}});CKEDITOR.env.iOS&&this.attachListener(k,"touchend",function(){a.focus()});b=e.document.getElementsByTag("title").getItem(0);b.data("cke-title",b.getText());CKEDITOR.env.ie&&(e.document.$.title=this._.docTitle);CKEDITOR.tools.setTimeout(function(){"unloaded"==this.status&&(this.status="ready");e.fire("contentDom");this._.isPendingFocus&&
-(e.focus(),this._.isPendingFocus=!1);setTimeout(function(){e.fire("dataReady")},0)},0,this)}function f(a){function c(){var b;a.editable().attachListener(a,"selectionChange",function(){var c=a.getSelection().getSelectedElement();c&&(b&&(b.detachEvent("onresizestart",e),b=null),c.$.attachEvent("onresizestart",e),b=c.$)})}function e(a){a.returnValue=!1}if(CKEDITOR.env.gecko)try{var f=a.document.$;f.execCommand("enableObjectResizing",!1,!a.config.disableObjectResizing);f.execCommand("enableInlineTableEditing",
-!1,!a.config.disableNativeTableHandles)}catch(b){}else CKEDITOR.env.ie&&11>CKEDITOR.env.version&&a.config.disableObjectResizing&&c(a)}function c(){var a=[];if(8<=CKEDITOR.document.$.documentMode){a.push("html.CSS1Compat [contenteditable\x3dfalse]{min-height:0 !important}");var c=[],e;for(e in CKEDITOR.dtd.$removeEmpty)c.push("html.CSS1Compat "+e+"[contenteditable\x3dfalse]");a.push(c.join(",")+"{display:inline-block}")}else CKEDITOR.env.gecko&&(a.push("html{height:100% !important}"),a.push("img:-moz-broken{-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"));
-a.push("html{cursor:text;*cursor:auto}");a.push("img,input,textarea{cursor:default}");return a.join("\n")}var e;CKEDITOR.plugins.add("wysiwygarea",{init:function(a){a.config.fullPage&&a.addFeature({allowedContent:"html head title; style [media,type]; body (*)[id]; meta link [*]",requiredContent:"body"});a.addMode("wysiwyg",function(c){function f(d){d&&d.removeListener();a.editable(new e(a,b.$.contentWindow.document.body));a.setData(a.getData(1),c)}var k="document.open();"+(CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+
-")();":"")+"document.close();",k=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie&&!CKEDITOR.env.edge?"javascript:void(function(){"+encodeURIComponent(k)+"}())":"",b=CKEDITOR.dom.element.createFromHtml('\x3ciframe src\x3d"'+k+'" frameBorder\x3d"0"\x3e\x3c/iframe\x3e');b.setStyles({width:"100%",height:"100%"});b.addClass("cke_wysiwyg_frame").addClass("cke_reset");k=a.ui.space("contents");k.append(b);var d=CKEDITOR.env.ie&&!CKEDITOR.env.edge||CKEDITOR.env.gecko;if(d)b.on("load",f);var g=a.title,
-p=a.fire("ariaEditorHelpLabel",{}).label;g&&(CKEDITOR.env.ie&&p&&(g+=", "+p),b.setAttribute("title",g));if(p){var g=CKEDITOR.tools.getNextId(),v=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+g+'" class\x3d"cke_voice_label"\x3e'+p+"\x3c/span\x3e");k.append(v,1);b.setAttribute("aria-describedby",g)}a.on("beforeModeUnload",function(a){a.removeListener();v&&v.remove()});b.setAttributes({tabIndex:a.tabIndex,allowTransparency:"true"});!d&&f();a.fire("ariaWidget",b)})}});CKEDITOR.editor.prototype.addContentsCss=
-function(a){var c=this.config,e=c.contentsCss;CKEDITOR.tools.isArray(e)||(c.contentsCss=e?[e]:[]);c.contentsCss.push(a)};e=CKEDITOR.tools.createClass({$:function(){this.base.apply(this,arguments);this._.frameLoadedHandler=CKEDITOR.tools.addFunction(function(c){CKEDITOR.tools.setTimeout(a,0,this,c)},this);this._.docTitle=this.getWindow().getFrame().getAttribute("title")},base:CKEDITOR.editable,proto:{setData:function(a,e){var f=this.editor;if(e)this.setHtml(a),this.fixInitialSelection(),f.fire("dataReady");
-else{this._.isLoadingData=!0;f._.dataStore={id:1};var k=f.config,b=k.fullPage,d=k.docType,g=CKEDITOR.tools.buildStyleHtml(c()).replace(/<style>/,'\x3cstyle data-cke-temp\x3d"1"\x3e');b||(g+=CKEDITOR.tools.buildStyleHtml(f.config.contentsCss));var p=k.baseHref?'\x3cbase href\x3d"'+k.baseHref+'" data-cke-temp\x3d"1" /\x3e':"";b&&(a=a.replace(/<!DOCTYPE[^>]*>/i,function(a){f.docType=d=a;return""}).replace(/<\?xml\s[^\?]*\?>/i,function(a){f.xmlDeclaration=a;return""}));a=f.dataProcessor.toHtml(a);b?(/<body[\s|>]/.test(a)||
-(a="\x3cbody\x3e"+a),/<html[\s|>]/.test(a)||(a="\x3chtml\x3e"+a+"\x3c/html\x3e"),/<head[\s|>]/.test(a)?/<title[\s|>]/.test(a)||(a=a.replace(/<head[^>]*>/,"$\x26\x3ctitle\x3e\x3c/title\x3e")):a=a.replace(/<html[^>]*>/,"$\x26\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e"),p&&(a=a.replace(/<head[^>]*?>/,"$\x26"+p)),a=a.replace(/<\/head\s*>/,g+"$\x26"),a=d+a):a=k.docType+'\x3chtml dir\x3d"'+k.contentsLangDirection+'" lang\x3d"'+(k.contentsLanguage||f.langCode)+'"\x3e\x3chead\x3e\x3ctitle\x3e'+
+{element:"h1"},CKEDITOR.config.format_h2={element:"h2"},CKEDITOR.config.format_h3={element:"h3"},CKEDITOR.config.format_h4={element:"h4"},CKEDITOR.config.format_h5={element:"h5"},CKEDITOR.config.format_h6={element:"h6"},CKEDITOR.plugins.add("htmlwriter",{init:function(a){var e=new CKEDITOR.htmlWriter;e.forceSimpleAmpersand=a.config.forceSimpleAmpersand;e.indentationChars=a.config.dataIndentationChars||"\t";a.dataProcessor.writer=e}}),CKEDITOR.htmlWriter=CKEDITOR.tools.createClass({base:CKEDITOR.htmlParser.basicWriter,
+$:function(){this.base();this.indentationChars="\t";this.selfClosingEnd=" /\x3e";this.lineBreakChars="\n";this.sortAttributes=1;this._.indent=0;this._.indentation="";this._.inPre=0;this._.rules={};var a=CKEDITOR.dtd,e;for(e in CKEDITOR.tools.extend({},a.$nonBodyContent,a.$block,a.$listItem,a.$tableContent))this.setRules(e,{indent:!a[e]["#"],breakBeforeOpen:1,breakBeforeClose:!a[e]["#"],breakAfterClose:1,needsSpace:e in a.$block&&!(e in{li:1,dt:1,dd:1})});this.setRules("br",{breakAfterOpen:1});this.setRules("title",
+{indent:0,breakAfterOpen:0});this.setRules("style",{indent:0,breakBeforeClose:1});this.setRules("pre",{breakAfterOpen:1,indent:0})},proto:{openTag:function(a){var e=this._.rules[a];this._.afterCloser&&e&&e.needsSpace&&this._.needsSpace&&this._.output.push("\n");this._.indent?this.indentation():e&&e.breakBeforeOpen&&(this.lineBreak(),this.indentation());this._.output.push("\x3c",a);this._.afterCloser=0},openTagClose:function(a,e){var c=this._.rules[a];e?(this._.output.push(this.selfClosingEnd),c&&
+c.breakAfterClose&&(this._.needsSpace=c.needsSpace)):(this._.output.push("\x3e"),c&&c.indent&&(this._.indentation+=this.indentationChars));c&&c.breakAfterOpen&&this.lineBreak();"pre"==a&&(this._.inPre=1)},attribute:function(a,e){"string"==typeof e&&(this.forceSimpleAmpersand&&(e=e.replace(/&amp;/g,"\x26")),e=CKEDITOR.tools.htmlEncodeAttr(e));this._.output.push(" ",a,'\x3d"',e,'"')},closeTag:function(a){var e=this._.rules[a];e&&e.indent&&(this._.indentation=this._.indentation.substr(this.indentationChars.length));
+this._.indent?this.indentation():e&&e.breakBeforeClose&&(this.lineBreak(),this.indentation());this._.output.push("\x3c/",a,"\x3e");"pre"==a&&(this._.inPre=0);e&&e.breakAfterClose&&(this.lineBreak(),this._.needsSpace=e.needsSpace);this._.afterCloser=1},text:function(a){this._.indent&&(this.indentation(),!this._.inPre&&(a=CKEDITOR.tools.ltrim(a)));this._.output.push(a)},comment:function(a){this._.indent&&this.indentation();this._.output.push("\x3c!--",a,"--\x3e")},lineBreak:function(){!this._.inPre&&
+0<this._.output.length&&this._.output.push(this.lineBreakChars);this._.indent=1},indentation:function(){!this._.inPre&&this._.indentation&&this._.output.push(this._.indentation);this._.indent=0},reset:function(){this._.output=[];this._.indent=0;this._.indentation="";this._.afterCloser=0;this._.inPre=0;this._.needsSpace=0},setRules:function(a,e){var c=this._.rules[a];c?CKEDITOR.tools.extend(c,e,!0):this._.rules[a]=e}}}),function(){var a={canUndo:!1,exec:function(a){var c=a.document.createElement("hr");
+a.insertElement(c)},allowedContent:"hr",requiredContent:"hr"};CKEDITOR.plugins.add("horizontalrule",{init:function(e){e.blockless||(e.addCommand("horizontalrule",a),e.ui.addButton&&e.ui.addButton("HorizontalRule",{label:e.lang.horizontalrule.toolbar,command:"horizontalrule",toolbar:"insert,40"}))}})}(),function(){function a(a){function c(a){var b=!1;g.attachListener(g,"keydown",function(){var d=k.getBody().getElementsByTag(a);if(!b){for(var c=0;c<d.count();c++)d.getItem(c).setCustomData("retain",
+!0);b=!0}},null,null,1);g.attachListener(g,"keyup",function(){var d=k.getElementsByTag(a);b&&(1!=d.count()||d.getItem(0).getCustomData("retain")||d.getItem(0).hasAttribute("data-cke-temp")||d.getItem(0).remove(1),b=!1)})}var f=this.editor,k=a.document,d=k.body,b=k.getElementById("cke_actscrpt");b&&b.parentNode.removeChild(b);(b=k.getElementById("cke_shimscrpt"))&&b.parentNode.removeChild(b);(b=k.getElementById("cke_basetagscrpt"))&&b.parentNode.removeChild(b);d.contentEditable=!0;CKEDITOR.env.ie&&
+(d.hideFocus=!0,d.disabled=!0,d.removeAttribute("disabled"));delete this._.isLoadingData;this.$=d;k=new CKEDITOR.dom.document(k);this.setup();this.fixInitialSelection();var g=this;CKEDITOR.env.ie&&!CKEDITOR.env.edge&&k.getDocumentElement().addClass(k.$.compatMode);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&f.enterMode!=CKEDITOR.ENTER_P?c("p"):CKEDITOR.env.edge&&f.enterMode!=CKEDITOR.ENTER_DIV&&c("div");if(CKEDITOR.env.webkit||CKEDITOR.env.ie&&10<CKEDITOR.env.version)k.getDocumentElement().on("mousedown",
+function(a){a.data.getTarget().is("html")&&setTimeout(function(){f.editable().focus()})});e(f);try{f.document.$.execCommand("2D-position",!1,!0)}catch(p){}(CKEDITOR.env.gecko||CKEDITOR.env.ie&&"CSS1Compat"==f.document.$.compatMode)&&this.attachListener(this,"keydown",function(a){var b=a.data.getKeystroke();if(33==b||34==b)if(CKEDITOR.env.ie)setTimeout(function(){f.getSelection().scrollIntoView()},0);else if(f.window.$.innerHeight>this.$.offsetHeight){var d=f.createRange();d[33==b?"moveToElementEditStart":
+"moveToElementEditEnd"](this);d.select();a.data.preventDefault()}});CKEDITOR.env.ie&&this.attachListener(k,"blur",function(){try{k.$.selection.empty()}catch(a){}});CKEDITOR.env.iOS&&this.attachListener(k,"touchend",function(){a.focus()});d=f.document.getElementsByTag("title").getItem(0);d.data("cke-title",d.getText());CKEDITOR.env.ie&&(f.document.$.title=this._.docTitle);CKEDITOR.tools.setTimeout(function(){"unloaded"==this.status&&(this.status="ready");f.fire("contentDom");this._.isPendingFocus&&
+(f.focus(),this._.isPendingFocus=!1);setTimeout(function(){f.fire("dataReady")},0)},0,this)}function e(a){function c(){var b;a.editable().attachListener(a,"selectionChange",function(){var d=a.getSelection().getSelectedElement();d&&(b&&(b.detachEvent("onresizestart",e),b=null),d.$.attachEvent("onresizestart",e),b=d.$)})}function e(a){a.returnValue=!1}if(CKEDITOR.env.gecko)try{var f=a.document.$;f.execCommand("enableObjectResizing",!1,!a.config.disableObjectResizing);f.execCommand("enableInlineTableEditing",
+!1,!a.config.disableNativeTableHandles)}catch(d){}else CKEDITOR.env.ie&&11>CKEDITOR.env.version&&a.config.disableObjectResizing&&c(a)}function c(){var a=[];if(8<=CKEDITOR.document.$.documentMode){a.push("html.CSS1Compat [contenteditable\x3dfalse]{min-height:0 !important}");var c=[],e;for(e in CKEDITOR.dtd.$removeEmpty)c.push("html.CSS1Compat "+e+"[contenteditable\x3dfalse]");a.push(c.join(",")+"{display:inline-block}")}else CKEDITOR.env.gecko&&(a.push("html{height:100% !important}"),a.push("img:-moz-broken{-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"));
+a.push("html{cursor:text;*cursor:auto}");a.push("img,input,textarea{cursor:default}");return a.join("\n")}var f;CKEDITOR.plugins.add("wysiwygarea",{init:function(a){a.config.fullPage&&a.addFeature({allowedContent:"html head title; style [media,type]; body (*)[id]; meta link [*]",requiredContent:"body"});a.addMode("wysiwyg",function(c){function e(b){b&&b.removeListener();a.editable(new f(a,d.$.contentWindow.document.body));a.setData(a.getData(1),c)}var k="document.open();"+(CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+
+")();":"")+"document.close();",k=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie&&!CKEDITOR.env.edge?"javascript:void(function(){"+encodeURIComponent(k)+"}())":"",d=CKEDITOR.dom.element.createFromHtml('\x3ciframe src\x3d"'+k+'" frameBorder\x3d"0"\x3e\x3c/iframe\x3e');d.setStyles({width:"100%",height:"100%"});d.addClass("cke_wysiwyg_frame").addClass("cke_reset");k=a.ui.space("contents");k.append(d);var b=CKEDITOR.env.ie&&!CKEDITOR.env.edge||CKEDITOR.env.gecko;if(b)d.on("load",e);var g=a.title,
+p=a.fire("ariaEditorHelpLabel",{}).label;g&&(CKEDITOR.env.ie&&p&&(g+=", "+p),d.setAttribute("title",g));if(p){var g=CKEDITOR.tools.getNextId(),v=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+g+'" class\x3d"cke_voice_label"\x3e'+p+"\x3c/span\x3e");k.append(v,1);d.setAttribute("aria-describedby",g)}a.on("beforeModeUnload",function(a){a.removeListener();v&&v.remove()});d.setAttributes({tabIndex:a.tabIndex,allowTransparency:"true"});!b&&e();a.fire("ariaWidget",d)})}});CKEDITOR.editor.prototype.addContentsCss=
+function(a){var c=this.config,e=c.contentsCss;CKEDITOR.tools.isArray(e)||(c.contentsCss=e?[e]:[]);c.contentsCss.push(a)};f=CKEDITOR.tools.createClass({$:function(){this.base.apply(this,arguments);this._.frameLoadedHandler=CKEDITOR.tools.addFunction(function(c){CKEDITOR.tools.setTimeout(a,0,this,c)},this);this._.docTitle=this.getWindow().getFrame().getAttribute("title")},base:CKEDITOR.editable,proto:{setData:function(a,e){var f=this.editor;if(e)this.setHtml(a),this.fixInitialSelection(),f.fire("dataReady");
+else{this._.isLoadingData=!0;f._.dataStore={id:1};var k=f.config,d=k.fullPage,b=k.docType,g=CKEDITOR.tools.buildStyleHtml(c()).replace(/<style>/,'\x3cstyle data-cke-temp\x3d"1"\x3e');d||(g+=CKEDITOR.tools.buildStyleHtml(f.config.contentsCss));var p=k.baseHref?'\x3cbase href\x3d"'+k.baseHref+'" data-cke-temp\x3d"1" /\x3e':"";d&&(a=a.replace(/<!DOCTYPE[^>]*>/i,function(a){f.docType=b=a;return""}).replace(/<\?xml\s[^\?]*\?>/i,function(a){f.xmlDeclaration=a;return""}));a=f.dataProcessor.toHtml(a);d?(/<body[\s|>]/.test(a)||
+(a="\x3cbody\x3e"+a),/<html[\s|>]/.test(a)||(a="\x3chtml\x3e"+a+"\x3c/html\x3e"),/<head[\s|>]/.test(a)?/<title[\s|>]/.test(a)||(a=a.replace(/<head[^>]*>/,"$\x26\x3ctitle\x3e\x3c/title\x3e")):a=a.replace(/<html[^>]*>/,"$\x26\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e"),p&&(a=a.replace(/<head[^>]*?>/,"$\x26"+p)),a=a.replace(/<\/head\s*>/,g+"$\x26"),a=b+a):a=k.docType+'\x3chtml dir\x3d"'+k.contentsLangDirection+'" lang\x3d"'+(k.contentsLanguage||f.langCode)+'"\x3e\x3chead\x3e\x3ctitle\x3e'+
 this._.docTitle+"\x3c/title\x3e"+p+g+"\x3c/head\x3e\x3cbody"+(k.bodyId?' id\x3d"'+k.bodyId+'"':"")+(k.bodyClass?' class\x3d"'+k.bodyClass+'"':"")+"\x3e"+a+"\x3c/body\x3e\x3c/html\x3e";CKEDITOR.env.gecko&&(a=a.replace(/<body/,'\x3cbody contenteditable\x3d"true" '),2E4>CKEDITOR.env.version&&(a=a.replace(/<body[^>]*>/,"$\x26\x3c!-- cke-content-start --\x3e")));k='\x3cscript id\x3d"cke_actscrpt" type\x3d"text/javascript"'+(CKEDITOR.env.ie?' defer\x3d"defer" ':"")+"\x3evar wasLoaded\x3d0;function onload(){if(!wasLoaded)window.parent.CKEDITOR.tools.callFunction("+
 this._.frameLoadedHandler+",window);wasLoaded\x3d1;}"+(CKEDITOR.env.ie?"onload();":'document.addEventListener("DOMContentLoaded", onload, false );')+"\x3c/script\x3e";CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(k+='\x3cscript id\x3d"cke_shimscrpt"\x3ewindow.parent.CKEDITOR.tools.enableHtml5Elements(document)\x3c/script\x3e');p&&CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(k+='\x3cscript id\x3d"cke_basetagscrpt"\x3evar baseTag \x3d document.querySelector( "base" );baseTag.href \x3d baseTag.href;\x3c/script\x3e');
-a=a.replace(/(?=\s*<\/(:?head)>)/,k);this.clearCustomData();this.clearListeners();f.fire("contentDomUnload");var v=this.getDocument();try{v.write(a)}catch(u){setTimeout(function(){v.write(a)},0)}}},getData:function(a){if(a)return this.getHtml();a=this.editor;var c=a.config,e=c.fullPage,f=e&&a.docType,b=e&&a.xmlDeclaration,d=this.getDocument(),e=e?d.getDocumentElement().getOuterHtml():d.getBody().getHtml();CKEDITOR.env.gecko&&c.enterMode!=CKEDITOR.ENTER_BR&&(e=e.replace(/<br>(?=\s*(:?$|<\/body>))/,
-""));e=a.dataProcessor.toDataFormat(e);b&&(e=b+"\n"+e);f&&(e=f+"\n"+e);return e},focus:function(){this._.isLoadingData?this._.isPendingFocus=!0:e.baseProto.focus.call(this)},detach:function(){var a=this.editor,c=a.document,f;try{f=a.window.getFrame()}catch(k){}e.baseProto.detach.call(this);this.clearCustomData();c.getDocumentElement().clearCustomData();CKEDITOR.tools.removeFunction(this._.frameLoadedHandler);f&&f.getParent()?(f.clearCustomData(),(a=f.removeCustomData("onResize"))&&a.removeListener(),
-f.remove()):CKEDITOR.warn("editor-destroy-iframe")}}})}(),CKEDITOR.config.disableObjectResizing=!1,CKEDITOR.config.disableNativeTableHandles=!0,CKEDITOR.config.disableNativeSpellChecker=!0,function(){function a(a,h){var m,l;h.on("refresh",function(a){var b=[f],d;for(d in a.data.states)b.push(a.data.states[d]);this.setState(CKEDITOR.tools.search(b,c)?c:f)},h,null,100);h.on("exec",function(c){m=a.getSelection();l=m.createBookmarks(1);c.data||(c.data={});c.data.done=!1},h,null,0);h.on("exec",function(){a.forceNextSelectionCheck();
-m.selectBookmarks(l)},h,null,100)}var f=CKEDITOR.TRISTATE_DISABLED,c=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indent",{init:function(c){var f=CKEDITOR.plugins.indent.genericDefinition;a(c,c.addCommand("indent",new f(!0)));a(c,c.addCommand("outdent",new f));c.ui.addButton&&(c.ui.addButton("Indent",{label:c.lang.indent.indent,command:"indent",directional:!0,toolbar:"indent,20"}),c.ui.addButton("Outdent",{label:c.lang.indent.outdent,command:"outdent",directional:!0,toolbar:"indent,10"}));c.on("dirChanged",
-function(a){var f=c.createRange(),h=a.data.node;f.setStartBefore(h);f.setEndAfter(h);for(var b=new CKEDITOR.dom.walker(f),d;d=b.next();)if(d.type==CKEDITOR.NODE_ELEMENT)if(!d.equals(h)&&d.getDirection())f.setStartAfter(d),b=new CKEDITOR.dom.walker(f);else{var g=c.config.indentClasses;if(g)for(var p="ltr"==a.data.dir?["_rtl",""]:["","_rtl"],v=0;v<g.length;v++)d.hasClass(g[v]+p[0])&&(d.removeClass(g[v]+p[0]),d.addClass(g[v]+p[1]));g=d.getStyle("margin-right");p=d.getStyle("margin-left");g?d.setStyle("margin-left",
-g):d.removeStyle("margin-left");p?d.setStyle("margin-right",p):d.removeStyle("margin-right")}})}});CKEDITOR.plugins.indent={genericDefinition:function(a){this.isIndent=!!a;this.startDisabled=!this.isIndent},specificDefinition:function(a,c,f){this.name=c;this.editor=a;this.jobs={};this.enterBr=a.config.enterMode==CKEDITOR.ENTER_BR;this.isIndent=!!f;this.relatedGlobal=f?"indent":"outdent";this.indentKey=f?9:CKEDITOR.SHIFT+9;this.database={}},registerCommands:function(a,c){a.on("pluginsLoaded",function(){for(var a in c)(function(a,
-c){var b=a.getCommand(c.relatedGlobal),d;for(d in c.jobs)b.on("exec",function(b){b.data.done||(a.fire("lockSnapshot"),c.execJob(a,d)&&(b.data.done=!0),a.fire("unlockSnapshot"),CKEDITOR.dom.element.clearAllMarkers(c.database))},this,null,d),b.on("refresh",function(b){b.data.states||(b.data.states={});b.data.states[c.name+"@"+d]=c.refreshJob(a,d,b.data.path)},this,null,d);a.addFeature(c)})(this,c[a])})}};CKEDITOR.plugins.indent.genericDefinition.prototype={context:"p",exec:function(){}};CKEDITOR.plugins.indent.specificDefinition.prototype=
-{execJob:function(a,c){var m=this.jobs[c];if(m.state!=f)return m.exec.call(this,a)},refreshJob:function(a,c,m){c=this.jobs[c];a.activeFilter.checkFeature(this)?c.state=c.refresh.call(this,a,m):c.state=f;return c.state},getContext:function(a){return a.contains(this.context)}}}(),function(){function a(a){function b(b){for(var f=m.startContainer,n=m.endContainer;f&&!f.getParent().equals(b);)f=f.getParent();for(;n&&!n.getParent().equals(b);)n=n.getParent();if(!f||!n)return!1;for(var l=f,f=[],t=!1;!t;)l.equals(n)&&
-(t=!0),f.push(l),l=l.getNext();if(1>f.length)return!1;l=b.getParents(!0);for(n=0;n<l.length;n++)if(l[n].getName&&h[l[n].getName()]){b=l[n];break}for(var l=d.isIndent?1:-1,n=f[0],f=f[f.length-1],t=CKEDITOR.plugins.list.listToArray(b,e),w=t[f.getCustomData("listarray_index")].indent,n=n.getCustomData("listarray_index");n<=f.getCustomData("listarray_index");n++)if(t[n].indent+=l,0<l){var B=t[n].parent;t[n].parent=new CKEDITOR.dom.element(B.getName(),B.getDocument())}for(n=f.getCustomData("listarray_index")+
-1;n<t.length&&t[n].indent>w;n++)t[n].indent+=l;f=CKEDITOR.plugins.list.arrayToList(t,e,null,a.config.enterMode,b.getDirection());if(!d.isIndent){var v;if((v=b.getParent())&&v.is("li"))for(var l=f.listNode.getChildren(),y=[],D,n=l.count()-1;0<=n;n--)(D=l.getItem(n))&&D.is&&D.is("li")&&y.push(D)}f&&f.listNode.replace(b);if(y&&y.length)for(n=0;n<y.length;n++){for(D=b=y[n];(D=D.getNext())&&D.is&&D.getName()in h;)CKEDITOR.env.needsNbspFiller&&!b.getFirst(c)&&b.append(m.document.createText(" ")),b.append(D);
-b.insertAfter(v)}f&&a.fire("contentDomInvalidated");return!0}for(var d=this,e=this.database,h=this.context,l=a.getSelection(),l=(l&&l.getRanges()).createIterator(),m;m=l.getNextRange();){for(var t=m.getCommonAncestor();t&&(t.type!=CKEDITOR.NODE_ELEMENT||!h[t.getName()]);){if(a.editable().equals(t)){t=!1;break}t=t.getParent()}t||(t=m.startPath().contains(h))&&m.setEndAt(t,CKEDITOR.POSITION_BEFORE_END);if(!t){var n=m.getEnclosedNode();n&&n.type==CKEDITOR.NODE_ELEMENT&&n.getName()in h&&(m.setStartAt(n,
-CKEDITOR.POSITION_AFTER_START),m.setEndAt(n,CKEDITOR.POSITION_BEFORE_END),t=n)}t&&m.startContainer.type==CKEDITOR.NODE_ELEMENT&&m.startContainer.getName()in h&&(n=new CKEDITOR.dom.walker(m),n.evaluator=f,m.startContainer=n.next());t&&m.endContainer.type==CKEDITOR.NODE_ELEMENT&&m.endContainer.getName()in h&&(n=new CKEDITOR.dom.walker(m),n.evaluator=f,m.endContainer=n.previous());if(t)return b(t)}return 0}function f(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.is("li")}function c(a){return e(a)&&h(a)}
-var e=CKEDITOR.dom.walker.whitespaces(!0),h=CKEDITOR.dom.walker.bookmark(!1,!0),m=CKEDITOR.TRISTATE_DISABLED,l=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indentlist",{requires:"indent",init:function(c){function b(b){d.specificDefinition.apply(this,arguments);this.requiredContent=["ul","ol"];b.on("key",function(a){if("wysiwyg"==b.mode&&a.data.keyCode==this.indentKey){var d=this.getContext(b.elementPath());!d||this.isIndent&&CKEDITOR.plugins.indentList.firstItemInPath(this.context,b.elementPath(),
-d)||(b.execCommand(this.relatedGlobal),a.cancel())}},this);this.jobs[this.isIndent?10:30]={refresh:this.isIndent?function(a,b){var d=this.getContext(b),c=CKEDITOR.plugins.indentList.firstItemInPath(this.context,b,d);return d&&this.isIndent&&!c?l:m}:function(a,b){return!this.getContext(b)||this.isIndent?m:l},exec:CKEDITOR.tools.bind(a,this)}}var d=CKEDITOR.plugins.indent;d.registerCommands(c,{indentlist:new b(c,"indentlist",!0),outdentlist:new b(c,"outdentlist")});CKEDITOR.tools.extend(b.prototype,
-d.specificDefinition.prototype,{context:{ol:1,ul:1}})}});CKEDITOR.plugins.indentList={};CKEDITOR.plugins.indentList.firstItemInPath=function(a,b,d){var c=b.contains(f);d||(d=b.contains(a));return d&&c&&c.equals(d.getFirst(f))}}(),CKEDITOR.plugins.add("menubutton",{requires:"button,menu",onLoad:function(){var a=function(a){var c=this._,e=c.menu;c.state!==CKEDITOR.TRISTATE_DISABLED&&(c.on&&e?e.hide():(c.previousState=c.state,e||(e=c.menu=new CKEDITOR.menu(a,{panel:{className:"cke_menu_panel",attributes:{"aria-label":a.lang.common.options}}}),
-e.onHide=CKEDITOR.tools.bind(function(){var e=this.command?a.getCommand(this.command).modes:this.modes;this.setState(!e||e[a.mode]?c.previousState:CKEDITOR.TRISTATE_DISABLED);c.on=0},this),this.onMenu&&e.addListener(this.onMenu)),this.setState(CKEDITOR.TRISTATE_ON),c.on=1,setTimeout(function(){e.show(CKEDITOR.document.getById(c.id),4)},0)))};CKEDITOR.ui.menuButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(f){delete f.panel;this.base(f);this.hasArrow=!0;this.click=a},statics:{handler:{create:function(a){return new CKEDITOR.ui.menuButton(a)}}}})},
-beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_MENUBUTTON,CKEDITOR.ui.menuButton.handler)}}),CKEDITOR.UI_MENUBUTTON="menubutton","use strict",function(){CKEDITOR.plugins.add("language",{requires:"menubutton",init:function(a){var f=a.config.language_list||["ar:Arabic:rtl","fr:French","es:Spanish"],c=this,e=a.lang.language,h={},m,l,k,b;a.addCommand("language",{allowedContent:"span[!lang,!dir]",requiredContent:"span[lang,dir]",contextSensitive:!0,exec:function(a,b){var c=h["language_"+b];if(c)a[c.style.checkActive(a.elementPath(),
-a)?"removeStyle":"applyStyle"](c.style)},refresh:function(a){this.setState(c.getCurrentLangElement(a)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)}});for(b=0;b<f.length;b++)m=f[b].split(":"),l=m[0],k="language_"+l,h[k]={label:m[1],langId:l,group:"language",order:b,ltr:"rtl"!=(""+m[2]).toLowerCase(),onClick:function(){a.execCommand("language",this.langId)},role:"menuitemcheckbox"},h[k].style=new CKEDITOR.style({element:"span",attributes:{lang:l,dir:h[k].ltr?"ltr":"rtl"}});h.language_remove={label:e.remove,
-group:"language_remove",state:CKEDITOR.TRISTATE_DISABLED,order:h.length,onClick:function(){var b=c.getCurrentLangElement(a);b&&a.execCommand("language",b.getAttribute("lang"))}};a.addMenuGroup("language",1);a.addMenuGroup("language_remove");a.addMenuItems(h);a.ui.add("Language",CKEDITOR.UI_MENUBUTTON,{label:e.button,allowedContent:"span[!lang,!dir]",requiredContent:"span[lang,dir]",toolbar:"bidi,30",command:"language",onMenu:function(){var b={},e=c.getCurrentLangElement(a),f;for(f in h)b[f]=CKEDITOR.TRISTATE_OFF;
-b.language_remove=e?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;e&&(b["language_"+e.getAttribute("lang")]=CKEDITOR.TRISTATE_ON);return b}})},getCurrentLangElement:function(a){var f=a.elementPath();a=f&&f.elements;var c;if(f)for(var e=0;e<a.length;e++)f=a[e],!c&&"span"==f.getName()&&f.hasAttribute("dir")&&f.hasAttribute("lang")&&(c=f);return c}})}(),function(){function a(a,b,d){function c(d){if(!(!(l=k[d?"getFirst":"getLast"]())||l.is&&l.isBlockBoundary()||!(m=b.root[d?"getPrevious":"getNext"](CKEDITOR.dom.walker.invisible(!0)))||
-m.is&&m.isBlockBoundary({br:1})))a.document.createElement("br")[d?"insertBefore":"insertAfter"](l)}for(var e=CKEDITOR.plugins.list.listToArray(b.root,d),f=[],g=0;g<b.contents.length;g++){var h=b.contents[g];(h=h.getAscendant("li",!0))&&!h.getCustomData("list_item_processed")&&(f.push(h),CKEDITOR.dom.element.setMarker(d,h,"list_item_processed",!0))}h=null;for(g=0;g<f.length;g++)h=f[g].getCustomData("listarray_index"),e[h].indent=-1;for(g=h+1;g<e.length;g++)if(e[g].indent>e[g-1].indent+1){f=e[g-1].indent+
-1-e[g].indent;for(h=e[g].indent;e[g]&&e[g].indent>=h;)e[g].indent+=f,g++;g--}var k=CKEDITOR.plugins.list.arrayToList(e,d,null,a.config.enterMode,b.root.getAttribute("dir")).listNode,l,m;c(!0);c();k.replace(b.root);a.fire("contentDomInvalidated")}function f(a,b){this.name=a;this.context=this.type=b;this.allowedContent=b+" li";this.requiredContent=b}function c(a,b,d,c){for(var e,f;e=a[c?"getLast":"getFirst"](u);)(f=e.getDirection(1))!==b.getDirection(1)&&e.setAttribute("dir",f),e.remove(),d?e[c?"insertBefore":
-"insertAfter"](d):b.append(e,c)}function e(a){function b(d){var e=a[d?"getPrevious":"getNext"](g);e&&e.type==CKEDITOR.NODE_ELEMENT&&e.is(a.getName())&&(c(a,e,null,!d),a.remove(),a=e)}b();b(1)}function h(a){return a.type==CKEDITOR.NODE_ELEMENT&&(a.getName()in CKEDITOR.dtd.$block||a.getName()in CKEDITOR.dtd.$listItem)&&CKEDITOR.dtd[a.getName()]["#"]}function m(a,b,d){a.fire("saveSnapshot");d.enlarge(CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS);var f=d.extractContents();b.trim(!1,!0);var h=b.createBookmark(),
-k=new CKEDITOR.dom.elementPath(b.startContainer),m=k.block,k=k.lastElement.getAscendant("li",1)||m,w=new CKEDITOR.dom.elementPath(d.startContainer),B=w.contains(CKEDITOR.dtd.$listItem),w=w.contains(CKEDITOR.dtd.$list);m?(m=m.getBogus())&&m.remove():w&&(m=w.getPrevious(g))&&p(m)&&m.remove();(m=f.getLast())&&m.type==CKEDITOR.NODE_ELEMENT&&m.is("br")&&m.remove();(m=b.startContainer.getChild(b.startOffset))?f.insertBefore(m):b.startContainer.append(f);B&&(f=l(B))&&(k.contains(B)?(c(f,B.getParent(),B),
-f.remove()):k.append(f));for(;d.checkStartOfBlock()&&d.checkEndOfBlock();){w=d.startPath();f=w.block;if(!f)break;f.is("li")&&(k=f.getParent(),f.equals(k.getLast(g))&&f.equals(k.getFirst(g))&&(f=k));d.moveToPosition(f,CKEDITOR.POSITION_BEFORE_START);f.remove()}d=d.clone();f=a.editable();d.setEndAt(f,CKEDITOR.POSITION_BEFORE_END);d=new CKEDITOR.dom.walker(d);d.evaluator=function(a){return g(a)&&!p(a)};(d=d.next())&&d.type==CKEDITOR.NODE_ELEMENT&&d.getName()in CKEDITOR.dtd.$list&&e(d);b.moveToBookmark(h);
-b.select();a.fire("saveSnapshot")}function l(a){return(a=a.getLast(g))&&a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in k?a:null}var k={ol:1,ul:1},b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(),g=function(a){return!(b(a)||d(a))},p=CKEDITOR.dom.walker.bogus();CKEDITOR.plugins.list={listToArray:function(a,b,d,c,e){if(!k[a.getName()])return[];c||(c=0);d||(d=[]);for(var f=0,g=a.getChildCount();f<g;f++){var h=a.getChild(f);h.type==CKEDITOR.NODE_ELEMENT&&h.getName()in CKEDITOR.dtd.$list&&
-CKEDITOR.plugins.list.listToArray(h,b,d,c+1);if("li"==h.$.nodeName.toLowerCase()){var l={parent:a,indent:c,element:h,contents:[]};e?l.grandparent=e:(l.grandparent=a.getParent(),l.grandparent&&"li"==l.grandparent.$.nodeName.toLowerCase()&&(l.grandparent=l.grandparent.getParent()));b&&CKEDITOR.dom.element.setMarker(b,h,"listarray_index",d.length);d.push(l);for(var m=0,p=h.getChildCount(),u;m<p;m++)u=h.getChild(m),u.type==CKEDITOR.NODE_ELEMENT&&k[u.getName()]?CKEDITOR.plugins.list.listToArray(u,b,d,
-c+1,l.grandparent):l.contents.push(u)}}return d},arrayToList:function(a,b,c,e,f){c||(c=0);if(!a||a.length<c+1)return null;for(var h,l=a[c].parent.getDocument(),m=new CKEDITOR.dom.documentFragment(l),p=null,u=c,v=Math.max(a[c].indent,0),D=null,F,E,L=e==CKEDITOR.ENTER_P?"p":"div";;){var G=a[u];h=G.grandparent;F=G.element.getDirection(1);if(G.indent==v){p&&a[u].parent.getName()==p.getName()||(p=a[u].parent.clone(!1,1),f&&p.setAttribute("dir",f),m.append(p));D=p.append(G.element.clone(0,1));F!=p.getDirection(1)&&
-D.setAttribute("dir",F);for(h=0;h<G.contents.length;h++)D.append(G.contents[h].clone(1,1));u++}else if(G.indent==Math.max(v,0)+1)G=a[u-1].element.getDirection(1),u=CKEDITOR.plugins.list.arrayToList(a,null,u,e,G!=F?F:null),!D.getChildCount()&&CKEDITOR.env.needsNbspFiller&&7>=l.$.documentMode&&D.append(l.createText(" ")),D.append(u.listNode),u=u.nextIndex;else if(-1==G.indent&&!c&&h){k[h.getName()]?(D=G.element.clone(!1,!0),F!=h.getDirection(1)&&D.setAttribute("dir",F)):D=new CKEDITOR.dom.documentFragment(l);
-var p=h.getDirection(1)!=F,N=G.element,O=N.getAttribute("class"),I=N.getAttribute("style"),R=D.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&(e!=CKEDITOR.ENTER_BR||p||I||O),M,Q=G.contents.length,P;for(h=0;h<Q;h++)if(M=G.contents[h],d(M)&&1<Q)R?P=M.clone(1,1):D.append(M.clone(1,1));else if(M.type==CKEDITOR.NODE_ELEMENT&&M.isBlockBoundary()){p&&!M.getDirection()&&M.setAttribute("dir",F);E=M;var K=N.getAttribute("style");K&&E.setAttribute("style",K.replace(/([^;])$/,"$1;")+(E.getAttribute("style")||""));O&&
-M.addClass(O);E=null;P&&(D.append(P),P=null);D.append(M.clone(1,1))}else R?(E||(E=l.createElement(L),D.append(E),p&&E.setAttribute("dir",F)),I&&E.setAttribute("style",I),O&&E.setAttribute("class",O),P&&(E.append(P),P=null),E.append(M.clone(1,1))):D.append(M.clone(1,1));P&&((E||D).append(P),P=null);D.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&u!=a.length-1&&(CKEDITOR.env.needsBrFiller&&(F=D.getLast())&&F.type==CKEDITOR.NODE_ELEMENT&&F.is("br")&&F.remove(),(F=D.getLast(g))&&F.type==CKEDITOR.NODE_ELEMENT&&
-F.is(CKEDITOR.dtd.$block)||D.append(l.createElement("br")));F=D.$.nodeName.toLowerCase();"div"!=F&&"p"!=F||D.appendBogus();m.append(D);p=null;u++}else return null;E=null;if(a.length<=u||Math.max(a[u].indent,0)<v)break}if(b)for(a=m.getFirst();a;){if(a.type==CKEDITOR.NODE_ELEMENT&&(CKEDITOR.dom.element.clearMarkers(b,a),a.getName()in CKEDITOR.dtd.$listItem&&(c=a,l=f=e=void 0,e=c.getDirection()))){for(f=c.getParent();f&&!(l=f.getDirection());)f=f.getParent();e==l&&c.removeAttribute("dir")}a=a.getNextSourceNode()}return{listNode:m,
-nextIndex:u}}};var v=/^h[1-6]$/,u=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT);f.prototype={exec:function(b){this.refresh(b,b.elementPath());var d=b.config,c=b.getSelection(),f=c&&c.getRanges();if(this.state==CKEDITOR.TRISTATE_OFF){var h=b.editable();if(h.getFirst(g)){var l=1==f.length&&f[0];(d=l&&l.getEnclosedNode())&&d.is&&this.type==d.getName()&&this.setState(CKEDITOR.TRISTATE_ON)}else d.enterMode==CKEDITOR.ENTER_BR?h.appendBogus():f[0].fixBlock(1,d.enterMode==CKEDITOR.ENTER_P?"p":"div"),
-c.selectRanges(f)}for(var d=c.createBookmarks(!0),h=[],m={},f=f.createIterator(),p=0;(l=f.getNextRange())&&++p;){var u=l.getBoundaryNodes(),z=u.startNode,y=u.endNode;z.type==CKEDITOR.NODE_ELEMENT&&"td"==z.getName()&&l.setStartAt(u.startNode,CKEDITOR.POSITION_AFTER_START);y.type==CKEDITOR.NODE_ELEMENT&&"td"==y.getName()&&l.setEndAt(u.endNode,CKEDITOR.POSITION_BEFORE_END);l=l.createIterator();for(l.forceBrBreak=this.state==CKEDITOR.TRISTATE_OFF;u=l.getNextParagraph();)if(!u.getCustomData("list_block")){CKEDITOR.dom.element.setMarker(m,
-u,"list_block",1);for(var D=b.elementPath(u),z=D.elements,y=0,D=D.blockLimit,F,E=z.length-1;0<=E&&(F=z[E]);E--)if(k[F.getName()]&&D.contains(F)){D.removeCustomData("list_group_object_"+p);(z=F.getCustomData("list_group_object"))?z.contents.push(u):(z={root:F,contents:[u]},h.push(z),CKEDITOR.dom.element.setMarker(m,F,"list_group_object",z));y=1;break}y||(y=D,y.getCustomData("list_group_object_"+p)?y.getCustomData("list_group_object_"+p).contents.push(u):(z={root:y,contents:[u]},CKEDITOR.dom.element.setMarker(m,
-y,"list_group_object_"+p,z),h.push(z)))}}for(F=[];0<h.length;)if(z=h.shift(),this.state==CKEDITOR.TRISTATE_OFF)if(k[z.root.getName()]){f=b;p=z;z=m;l=F;y=CKEDITOR.plugins.list.listToArray(p.root,z);D=[];for(u=0;u<p.contents.length;u++)E=p.contents[u],(E=E.getAscendant("li",!0))&&!E.getCustomData("list_item_processed")&&(D.push(E),CKEDITOR.dom.element.setMarker(z,E,"list_item_processed",!0));for(var E=p.root.getDocument(),L=void 0,G=void 0,u=0;u<D.length;u++){var N=D[u].getCustomData("listarray_index"),
-L=y[N].parent;L.is(this.type)||(G=E.createElement(this.type),L.copyAttributes(G,{start:1,type:1}),G.removeStyle("list-style-type"),y[N].parent=G)}z=CKEDITOR.plugins.list.arrayToList(y,z,null,f.config.enterMode);y=void 0;D=z.listNode.getChildCount();for(u=0;u<D&&(y=z.listNode.getChild(u));u++)y.getName()==this.type&&l.push(y);z.listNode.replace(p.root);f.fire("contentDomInvalidated")}else{y=b;l=z;u=F;D=l.contents;f=l.root.getDocument();p=[];1==D.length&&D[0].equals(l.root)&&(z=f.createElement("div"),
-D[0].moveChildren&&D[0].moveChildren(z),D[0].append(z),D[0]=z);l=l.contents[0].getParent();for(E=0;E<D.length;E++)l=l.getCommonAncestor(D[E].getParent());L=y.config.useComputedState;y=z=void 0;L=void 0===L||L;for(E=0;E<D.length;E++)for(G=D[E];N=G.getParent();){if(N.equals(l)){p.push(G);!y&&G.getDirection()&&(y=1);G=G.getDirection(L);null!==z&&(z=z&&z!=G?null:G);break}G=N}if(!(1>p.length)){D=p[p.length-1].getNext();E=f.createElement(this.type);u.push(E);for(L=u=void 0;p.length;)u=p.shift(),L=f.createElement("li"),
-G=u,G.is("pre")||v.test(G.getName())||"false"==G.getAttribute("contenteditable")?u.appendTo(L):(u.copyAttributes(L),z&&u.getDirection()&&(L.removeStyle("direction"),L.removeAttribute("dir")),u.moveChildren(L),u.remove()),L.appendTo(E);z&&y&&E.setAttribute("dir",z);D?E.insertBefore(D):E.appendTo(l)}}else this.state==CKEDITOR.TRISTATE_ON&&k[z.root.getName()]&&a.call(this,b,z,m);for(E=0;E<F.length;E++)e(F[E]);CKEDITOR.dom.element.clearAllMarkers(m);c.selectBookmarks(d);b.focus()},refresh:function(a,
-b){var d=b.contains(k,1),c=b.blockLimit||b.root;d&&c.contains(d)?this.setState(d.is(this.type)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.plugins.add("list",{requires:"indentlist",init:function(a){a.blockless||(a.addCommand("numberedlist",new f("numberedlist","ol")),a.addCommand("bulletedlist",new f("bulletedlist","ul")),a.ui.addButton&&(a.ui.addButton("NumberedList",{label:a.lang.list.numberedlist,command:"numberedlist",directional:!0,toolbar:"list,10"}),
-a.ui.addButton("BulletedList",{label:a.lang.list.bulletedlist,command:"bulletedlist",directional:!0,toolbar:"list,20"})),a.on("key",function(b){var d=b.data.domEvent.getKey(),c;if("wysiwyg"==a.mode&&d in{8:1,46:1}){var e=a.getSelection().getRanges()[0],f=e&&e.startPath();if(e&&e.collapsed){var r=8==d,u=a.editable(),v=new CKEDITOR.dom.walker(e.clone());v.evaluator=function(a){return g(a)&&!p(a)};v.guard=function(a,b){return!(b&&a.type==CKEDITOR.NODE_ELEMENT&&a.is("table"))};d=e.clone();if(r){var z;
-(z=f.contains(k))&&e.checkBoundaryOfElement(z,CKEDITOR.START)&&(z=z.getParent())&&z.is("li")&&(z=l(z))?(c=z,z=z.getPrevious(g),d.moveToPosition(z&&p(z)?z:c,CKEDITOR.POSITION_BEFORE_START)):(v.range.setStartAt(u,CKEDITOR.POSITION_AFTER_START),v.range.setEnd(e.startContainer,e.startOffset),(z=v.previous())&&z.type==CKEDITOR.NODE_ELEMENT&&(z.getName()in k||z.is("li"))&&(z.is("li")||(v.range.selectNodeContents(z),v.reset(),v.evaluator=h,z=v.previous()),c=z,d.moveToElementEditEnd(c),d.moveToPosition(d.endPath().block,
-CKEDITOR.POSITION_BEFORE_END)));if(c)m(a,d,e),b.cancel();else{var y=f.contains(k);y&&e.checkBoundaryOfElement(y,CKEDITOR.START)&&(c=y.getFirst(g),e.checkBoundaryOfElement(c,CKEDITOR.START)&&(z=y.getPrevious(g),l(c)?z&&(e.moveToElementEditEnd(z),e.select()):a.execCommand("outdent"),b.cancel()))}}else if(c=f.contains("li")){if(v.range.setEndAt(u,CKEDITOR.POSITION_BEFORE_END),r=(u=c.getLast(g))&&h(u)?u:c,f=0,(z=v.next())&&z.type==CKEDITOR.NODE_ELEMENT&&z.getName()in k&&z.equals(u)?(f=1,z=v.next()):e.checkBoundaryOfElement(r,
-CKEDITOR.END)&&(f=2),f&&z){e=e.clone();e.moveToElementEditStart(z);if(1==f&&(d.optimize(),!d.startContainer.equals(c))){for(c=d.startContainer;c.is(CKEDITOR.dtd.$inline);)y=c,c=c.getParent();y&&d.moveToPosition(y,CKEDITOR.POSITION_AFTER_END)}2==f&&(d.moveToPosition(d.endPath().block,CKEDITOR.POSITION_BEFORE_END),e.endPath().block&&e.moveToPosition(e.endPath().block,CKEDITOR.POSITION_AFTER_START));m(a,d,e);b.cancel()}}else v.range.setEndAt(u,CKEDITOR.POSITION_BEFORE_END),(z=v.next())&&z.type==CKEDITOR.NODE_ELEMENT&&
-z.is(k)&&(z=z.getFirst(g),f.block&&e.checkStartOfBlock()&&e.checkEndOfBlock()?(f.block.remove(),e.moveToElementEditStart(z),e.select()):l(z)?(e.moveToElementEditStart(z),e.select()):(e=e.clone(),e.moveToElementEditStart(z),m(a,d,e)),b.cancel());setTimeout(function(){a.selectionChange(1)})}}}))}})}(),"use strict",function(){function a(a,b,d){return p(b)&&p(d)&&d.equals(b.getNext(function(a){return!(aa(a)||Y(a)||v(a))}))}function f(a){this.upper=a[0];this.lower=a[1];this.set.apply(this,a.slice(2))}
-function c(a){var b=a.element;if(b&&p(b)&&(b=b.getAscendant(a.triggers,!0))&&a.editable.contains(b)){var d=l(b);if("true"==d.getAttribute("contenteditable"))return b;if(d.is(a.triggers))return d}return null}function e(a,b,d){r(a,b);r(a,d);a=b.size.bottom;d=d.size.top;return a&&d?0|(a+d)/2:a||d}function h(a,b,d){return b=b[d?"getPrevious":"getNext"](function(b){return b&&b.type==CKEDITOR.NODE_TEXT&&!aa(b)||p(b)&&!v(b)&&!g(a,b)})}function m(a,b,d){return a>b&&a<d}function l(a,b){if(a.data("cke-editable"))return null;
-for(b||(a=a.getParent());a&&!a.data("cke-editable");){if(a.hasAttribute("contenteditable"))return a;a=a.getParent()}return null}function k(a){var d=a.doc,c=F('\x3cspan contenteditable\x3d"false" style\x3d"'+T+"position:absolute;border-top:1px dashed "+a.boxColor+'"\x3e\x3c/span\x3e',d),e=CKEDITOR.getUrl(this.path+"images/"+(E.hidpi?"hidpi/":"")+"icon"+(a.rtl?"-rtl":"")+".png");y(c,{attach:function(){this.wrap.getParent()||this.wrap.appendTo(a.editable,!0);return this},lineChildren:[y(F('\x3cspan title\x3d"'+
-a.editor.lang.magicline.title+'" contenteditable\x3d"false"\x3e\x26#8629;\x3c/span\x3e',d),{base:T+"height:17px;width:17px;"+(a.rtl?"left":"right")+":17px;background:url("+e+") center no-repeat "+a.boxColor+";cursor:pointer;"+(E.hc?"font-size: 15px;line-height:14px;border:1px solid #fff;text-align:center;":"")+(E.hidpi?"background-size: 9px 10px;":""),looks:["top:-8px; border-radius: 2px;","top:-17px; border-radius: 2px 2px 0px 0px;","top:-1px; border-radius: 0px 0px 2px 2px;"]}),y(F(X,d),{base:Z+
-"left:0px;border-left-color:"+a.boxColor+";",looks:["border-width:8px 0 8px 8px;top:-8px","border-width:8px 0 0 8px;top:-8px","border-width:0 0 8px 8px;top:0px"]}),y(F(X,d),{base:Z+"right:0px;border-right-color:"+a.boxColor+";",looks:["border-width:8px 8px 8px 0;top:-8px","border-width:8px 8px 0 0;top:-8px","border-width:0 8px 8px 0;top:0px"]})],detach:function(){this.wrap.getParent()&&this.wrap.remove();return this},mouseNear:function(){r(a,this);var b=a.holdDistance,d=this.size;return d&&m(a.mouse.y,
-d.top-b,d.bottom+b)&&m(a.mouse.x,d.left-b,d.right+b)?!0:!1},place:function(){var b=a.view,d=a.editable,c=a.trigger,e=c.upper,f=c.lower,g=e||f,h=g.getParent(),k={};this.trigger=c;e&&r(a,e,!0);f&&r(a,f,!0);r(a,h,!0);a.inInlineMode&&w(a,!0);h.equals(d)?(k.left=b.scroll.x,k.right=-b.scroll.x,k.width=""):(k.left=g.size.left-g.size.margin.left+b.scroll.x-(a.inInlineMode?b.editable.left+b.editable.border.left:0),k.width=g.size.outerWidth+g.size.margin.left+g.size.margin.right+b.scroll.x,k.right="");e&&f?
-k.top=e.size.margin.bottom===f.size.margin.top?0|e.size.bottom+e.size.margin.bottom/2:e.size.margin.bottom<f.size.margin.top?e.size.bottom+e.size.margin.bottom:e.size.bottom+e.size.margin.bottom-f.size.margin.top:e?f||(k.top=e.size.bottom+e.size.margin.bottom):k.top=f.size.top-f.size.margin.top;c.is(Q)||m(k.top,b.scroll.y-15,b.scroll.y+5)?(k.top=a.inInlineMode?0:b.scroll.y,this.look(Q)):c.is(P)||m(k.top,b.pane.bottom-5,b.pane.bottom+15)?(k.top=a.inInlineMode?b.editable.height+b.editable.padding.top+
-b.editable.padding.bottom:b.pane.bottom-1,this.look(P)):(a.inInlineMode&&(k.top-=b.editable.top+b.editable.border.top),this.look(K));a.inInlineMode&&(k.top--,k.top+=b.editable.scroll.top,k.left+=b.editable.scroll.left);for(var l in k)k[l]=CKEDITOR.tools.cssLength(k[l]);this.setStyles(k)},look:function(a){if(this.oldLook!=a){for(var b=this.lineChildren.length,d;b--;)(d=this.lineChildren[b]).setAttribute("style",d.base+d.looks[0|a/2]);this.oldLook=a}},wrap:new D("span",a.doc)});for(d=c.lineChildren.length;d--;)c.lineChildren[d].appendTo(c);
-c.look(K);c.appendTo(c.wrap);c.unselectable();c.lineChildren[0].on("mouseup",function(d){c.detach();b(a,function(b){var d=a.line.trigger;b[d.is(O)?"insertBefore":"insertAfter"](d.is(O)?d.lower:d.upper)},!0);a.editor.focus();E.ie||a.enterMode==CKEDITOR.ENTER_BR||a.hotNode.scrollIntoView();d.data.preventDefault(!0)});c.on("mousedown",function(a){a.data.preventDefault(!0)});a.line=c}function b(a,b,d){var c=new CKEDITOR.dom.range(a.doc),e=a.editor,f;E.ie&&a.enterMode==CKEDITOR.ENTER_BR?f=a.doc.createText(W):
-(f=(f=l(a.element,!0))&&f.data("cke-enter-mode")||a.enterMode,f=new D(N[f],a.doc),f.is("br")||a.doc.createText(W).appendTo(f));d&&e.fire("saveSnapshot");b(f);c.moveToPosition(f,CKEDITOR.POSITION_AFTER_START);e.getSelection().selectRanges([c]);a.hotNode=f;d&&e.fire("saveSnapshot")}function d(a,d){return{canUndo:!0,modes:{wysiwyg:1},exec:function(){function e(c){var f=E.ie&&9>E.version?" ":W,g=a.hotNode&&a.hotNode.getText()==f&&a.element.equals(a.hotNode)&&a.lastCmdDirection===!!d;b(a,function(b){g&&
-a.hotNode&&a.hotNode.remove();b[d?"insertAfter":"insertBefore"](c);b.setAttributes({"data-cke-magicline-hot":1,"data-cke-magicline-dir":!!d});a.lastCmdDirection=!!d});E.ie||a.enterMode==CKEDITOR.ENTER_BR||a.hotNode.scrollIntoView();a.line.detach()}return function(b){b=b.getSelection().getStartElement();var f;b=b.getAscendant(H,1);if(!n(a,b)&&b&&!b.equals(a.editable)&&!b.contains(a.editable)){(f=l(b))&&"false"==f.getAttribute("contenteditable")&&(b=f);a.element=b;f=h(a,b,!d);var g;p(f)&&f.is(a.triggers)&&
-f.is(J)&&(!h(a,f,!d)||(g=h(a,f,!d))&&p(g)&&g.is(a.triggers))?e(f):(g=c(a,b),p(g)&&(h(a,g,!d)?(b=h(a,g,!d))&&p(b)&&b.is(a.triggers)&&e(g):e(g)))}}}()}}function g(a,b){if(!b||b.type!=CKEDITOR.NODE_ELEMENT||!b.$)return!1;var d=a.line;return d.wrap.equals(b)||d.wrap.contains(b)}function p(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.$}function v(a){if(!p(a))return!1;var b;(b=u(a))||(p(a)?(b={left:1,right:1,center:1},b=!(!b[a.getComputedStyle("float")]&&!b[a.getAttribute("align")])):b=!1);return b}function u(a){return!!{absolute:1,
-fixed:1}[a.getComputedStyle("position")]}function t(a,b){return p(b)?b.is(a.triggers):null}function n(a,b){if(!b)return!1;for(var d=b.getParents(1),c=d.length;c--;)for(var e=a.tabuList.length;e--;)if(d[c].hasAttribute(a.tabuList[e]))return!0;return!1}function q(a,b,d){b=b[d?"getLast":"getFirst"](function(b){return a.isRelevant(b)&&!b.is(S)});if(!b)return!1;r(a,b);return d?b.size.top>a.mouse.y:b.size.bottom<a.mouse.y}function x(a){var b=a.editable,d=a.mouse,c=a.view,e=a.triggerOffset;w(a);var h=d.y>
-(a.inInlineMode?c.editable.top+c.editable.height/2:Math.min(c.editable.height,c.pane.height)/2),b=b[h?"getLast":"getFirst"](function(a){return!(aa(a)||Y(a))});if(!b)return null;g(a,b)&&(b=a.line.wrap[h?"getPrevious":"getNext"](function(a){return!(aa(a)||Y(a))}));if(!p(b)||v(b)||!t(a,b))return null;r(a,b);return!h&&0<=b.size.top&&m(d.y,0,b.size.top+e)?(a=a.inInlineMode||0===c.scroll.y?Q:K,new f([null,b,O,M,a])):h&&b.size.bottom<=c.pane.height&&m(d.y,b.size.bottom-e,c.pane.height)?(a=a.inInlineMode||
-m(b.size.bottom,c.pane.height-e,c.pane.height)?P:K,new f([b,null,I,M,a])):null}function A(a){var b=a.mouse,d=a.view,e=a.triggerOffset,g=c(a);if(!g)return null;r(a,g);var e=Math.min(e,0|g.size.outerHeight/2),k=[],l,n;if(m(b.y,g.size.top-1,g.size.top+e))n=!1;else if(m(b.y,g.size.bottom-e,g.size.bottom+1))n=!0;else return null;if(v(g)||q(a,g,n)||g.getParent().is(U))return null;var H=h(a,g,!n);if(H){if(H&&H.type==CKEDITOR.NODE_TEXT)return null;if(p(H)){if(v(H)||!t(a,H)||H.getParent().is(U))return null;
-k=[H,g][n?"reverse":"concat"]().concat([R,M])}}else g.equals(a.editable[n?"getLast":"getFirst"](a.isRelevant))?(w(a),n&&m(b.y,g.size.bottom-e,d.pane.height)&&m(g.size.bottom,d.pane.height-e,d.pane.height)?l=P:m(b.y,0,g.size.top+e)&&(l=Q)):l=K,k=[null,g][n?"reverse":"concat"]().concat([n?I:O,M,l,g.equals(a.editable[n?"getLast":"getFirst"](a.isRelevant))?n?P:Q:K]);return 0 in k?new f(k):null}function C(a,b,d,c){for(var e=b.getDocumentPosition(),f={},g={},h={},k={},l=ca.length;l--;)f[ca[l]]=parseInt(b.getComputedStyle.call(b,
-"border-"+ca[l]+"-width"),10)||0,h[ca[l]]=parseInt(b.getComputedStyle.call(b,"padding-"+ca[l]),10)||0,g[ca[l]]=parseInt(b.getComputedStyle.call(b,"margin-"+ca[l]),10)||0;d&&!c||B(a,c);k.top=e.y-(d?0:a.view.scroll.y);k.left=e.x-(d?0:a.view.scroll.x);k.outerWidth=b.$.offsetWidth;k.outerHeight=b.$.offsetHeight;k.height=k.outerHeight-(h.top+h.bottom+f.top+f.bottom);k.width=k.outerWidth-(h.left+h.right+f.left+f.right);k.bottom=k.top+k.outerHeight;k.right=k.left+k.outerWidth;a.inInlineMode&&(k.scroll={top:b.$.scrollTop,
-left:b.$.scrollLeft});return y({border:f,padding:h,margin:g,ignoreScroll:d},k,!0)}function r(a,b,d){if(!p(b))return b.size=null;if(!b.size)b.size={};else if(b.size.ignoreScroll==d&&b.size.date>new Date-V)return null;return y(b.size,C(a,b,d),{date:+new Date},!0)}function w(a,b){a.view.editable=C(a,a.editable,b,!0)}function B(a,b){a.view||(a.view={});var d=a.view;if(!(!b&&d&&d.date>new Date-V)){var c=a.win,d=c.getScrollPosition(),c=c.getViewPaneSize();y(a.view,{scroll:{x:d.x,y:d.y,width:a.doc.$.documentElement.scrollWidth-
-c.width,height:a.doc.$.documentElement.scrollHeight-c.height},pane:{width:c.width,height:c.height,bottom:c.height+d.y},date:+new Date},!0)}}function z(a,b,d,c){for(var e=c,g=c,h=0,k=!1,l=!1,n=a.view.pane.height,m=a.mouse;m.y+h<n&&0<m.y-h;){k||(k=b(e,c));l||(l=b(g,c));!k&&0<m.y-h&&(e=d(a,{x:m.x,y:m.y-h}));!l&&m.y+h<n&&(g=d(a,{x:m.x,y:m.y+h}));if(k&&l)break;h+=2}return new f([e,g,null,null])}CKEDITOR.plugins.add("magicline",{init:function(a){var e=a.config,l=e.magicline_triggerOffset||30,m={editor:a,
-enterMode:e.enterMode,triggerOffset:l,holdDistance:0|l*(e.magicline_holdDistance||.5),boxColor:e.magicline_color||"#ff0000",rtl:"rtl"==e.contentsLangDirection,tabuList:["data-cke-hidden-sel"].concat(e.magicline_tabuList||[]),triggers:e.magicline_everywhere?H:{table:1,hr:1,div:1,ul:1,ol:1,dl:1,form:1,blockquote:1}},q,t,r;m.isRelevant=function(a){return p(a)&&!g(m,a)&&!v(a)};a.on("contentDom",function(){var l=a.editable(),p=a.document,H=a.window;y(m,{editable:l,inInlineMode:l.isInline(),doc:p,win:H,
-hotNode:null},!0);m.boundary=m.inInlineMode?m.editable:m.doc.getDocumentElement();l.is(G.$inline)||(m.inInlineMode&&!u(l)&&l.setStyles({position:"relative",top:null,left:null}),k.call(this,m),B(m),l.attachListener(a,"beforeUndoImage",function(){m.line.detach()}),l.attachListener(a,"beforeGetData",function(){m.line.wrap.getParent()&&(m.line.detach(),a.once("getData",function(){m.line.attach()},null,null,1E3))},null,null,0),l.attachListener(m.inInlineMode?p:p.getWindow().getFrame(),"mouseout",function(b){if("wysiwyg"==
-a.mode)if(m.inInlineMode){var d=b.data.$.clientX;b=b.data.$.clientY;B(m);w(m,!0);var c=m.view.editable,e=m.view.scroll;d>c.left-e.x&&d<c.right-e.x&&b>c.top-e.y&&b<c.bottom-e.y||(clearTimeout(r),r=null,m.line.detach())}else clearTimeout(r),r=null,m.line.detach()}),l.attachListener(l,"keyup",function(){m.hiddenMode=0}),l.attachListener(l,"keydown",function(b){if("wysiwyg"==a.mode)switch(b.data.getKeystroke()){case 2228240:case 16:m.hiddenMode=1,m.line.detach()}}),l.attachListener(m.inInlineMode?l:p,
-"mousemove",function(b){t=!0;if("wysiwyg"==a.mode&&!a.readOnly&&!r){var d={x:b.data.$.clientX,y:b.data.$.clientY};r=setTimeout(function(){m.mouse=d;r=m.trigger=null;B(m);t&&!m.hiddenMode&&a.focusManager.hasFocus&&!m.line.mouseNear()&&(m.element=da(m,!0))&&((m.trigger=x(m)||A(m)||fa(m))&&!n(m,m.trigger.upper||m.trigger.lower)?m.line.attach().place():(m.trigger=null,m.line.detach()),t=!1)},30)}}),l.attachListener(H,"scroll",function(){"wysiwyg"==a.mode&&(m.line.detach(),E.webkit&&(m.hiddenMode=1,clearTimeout(q),
-q=setTimeout(function(){m.mouseDown||(m.hiddenMode=0)},50)))}),l.attachListener(L?p:H,"mousedown",function(){"wysiwyg"==a.mode&&(m.line.detach(),m.hiddenMode=1,m.mouseDown=1)}),l.attachListener(L?p:H,"mouseup",function(){m.hiddenMode=0;m.mouseDown=0}),a.addCommand("accessPreviousSpace",d(m)),a.addCommand("accessNextSpace",d(m,!0)),a.setKeystroke([[e.magicline_keystrokePrevious,"accessPreviousSpace"],[e.magicline_keystrokeNext,"accessNextSpace"]]),a.on("loadSnapshot",function(){var b,d,c,e;for(e in{p:1,
-br:1,div:1})for(b=a.document.getElementsByTag(e),c=b.count();c--;)if((d=b.getItem(c)).data("cke-magicline-hot")){m.hotNode=d;m.lastCmdDirection="true"===d.data("cke-magicline-dir")?!0:!1;return}}),this.backdoor={accessFocusSpace:b,boxTrigger:f,isLine:g,getAscendantTrigger:c,getNonEmptyNeighbour:h,getSize:C,that:m,triggerEdge:A,triggerEditable:x,triggerExpand:fa})},this)}});var y=CKEDITOR.tools.extend,D=CKEDITOR.dom.element,F=D.createFromHtml,E=CKEDITOR.env,L=CKEDITOR.env.ie&&9>CKEDITOR.env.version,
-G=CKEDITOR.dtd,N={},O=128,I=64,R=32,M=16,Q=4,P=2,K=1,W=" ",U=G.$listItem,S=G.$tableContent,J=y({},G.$nonEditable,G.$empty),H=G.$block,V=100,T="width:0px;height:0px;padding:0px;margin:0px;display:block;z-index:9999;color:#fff;position:absolute;font-size: 0px;line-height:0px;",Z=T+"border-color:transparent;display:block;border-style:solid;",X="\x3cspan\x3e"+W+"\x3c/span\x3e";N[CKEDITOR.ENTER_BR]="br";N[CKEDITOR.ENTER_P]="p";N[CKEDITOR.ENTER_DIV]="div";f.prototype={set:function(a,b,d){this.properties=
-a+b+(d||K);return this},is:function(a){return(this.properties&a)==a}};var da=function(){function a(b,d){var c=b.$.elementFromPoint(d.x,d.y);return c&&c.nodeType?new CKEDITOR.dom.element(c):null}return function(b,d,c){if(!b.mouse)return null;var e=b.doc,f=b.line.wrap;c=c||b.mouse;var h=a(e,c);d&&g(b,h)&&(f.hide(),h=a(e,c),f.show());return!h||h.type!=CKEDITOR.NODE_ELEMENT||!h.$||E.ie&&9>E.version&&!b.boundary.equals(h)&&!b.boundary.contains(h)?null:h}}(),aa=CKEDITOR.dom.walker.whitespaces(),Y=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_COMMENT),
-fa=function(){function b(c){var f=c.element,g,h,k;if(!p(f)||f.contains(c.editable)||f.isReadOnly())return null;k=z(c,function(a,b){return!b.equals(a)},function(a,b){return da(a,!0,b)},f);g=k.upper;h=k.lower;if(a(c,g,h))return k.set(R,8);if(g&&f.contains(g))for(;!g.getParent().equals(f);)g=g.getParent();else g=f.getFirst(function(a){return d(c,a)});if(h&&f.contains(h))for(;!h.getParent().equals(f);)h=h.getParent();else h=f.getLast(function(a){return d(c,a)});if(!g||!h)return null;r(c,g);r(c,h);if(!m(c.mouse.y,
-g.size.top,h.size.bottom))return null;for(var f=Number.MAX_VALUE,l,n,q,H;h&&!h.equals(g)&&(n=g.getNext(c.isRelevant));)l=Math.abs(e(c,g,n)-c.mouse.y),l<f&&(f=l,q=g,H=n),g=n,r(c,g);if(!q||!H||!m(c.mouse.y,q.size.top,H.size.bottom))return null;k.upper=q;k.lower=H;return k.set(R,8)}function d(a,b){return!(b&&b.type==CKEDITOR.NODE_TEXT||Y(b)||v(b)||g(a,b)||b.type==CKEDITOR.NODE_ELEMENT&&b.$&&b.is("br"))}return function(d){var c=b(d),e;if(e=c){e=c.upper;var f=c.lower;e=!e||!f||v(f)||v(e)||f.equals(e)||
-e.equals(f)||f.contains(e)||e.contains(f)?!1:t(d,e)&&t(d,f)&&a(d,e,f)?!0:!1}return e?c:null}}(),ca=["top","left","right","bottom"]}(),CKEDITOR.config.magicline_keystrokePrevious=CKEDITOR.CTRL+CKEDITOR.SHIFT+51,CKEDITOR.config.magicline_keystrokeNext=CKEDITOR.CTRL+CKEDITOR.SHIFT+52,function(){function a(a){if(!a||a.type!=CKEDITOR.NODE_ELEMENT||"form"!=a.getName())return[];for(var c=[],e=["style","className"],b=0;b<e.length;b++){var d=a.$.elements.namedItem(e[b]);d&&(d=new CKEDITOR.dom.element(d),c.push([d,
-d.nextSibling]),d.remove())}return c}function f(a,c){if(a&&a.type==CKEDITOR.NODE_ELEMENT&&"form"==a.getName()&&0<c.length)for(var e=c.length-1;0<=e;e--){var b=c[e][0],d=c[e][1];d?b.insertBefore(d):b.appendTo(a)}}function c(c,e){var h=a(c),b={},d=c.$;e||(b["class"]=d.className||"",d.className="");b.inline=d.style.cssText||"";e||(d.style.cssText="position: static; overflow: visible");f(h);return b}function e(c,e){var h=a(c),b=c.$;"class"in e&&(b.className=e["class"]);"inline"in e&&(b.style.cssText=
-e.inline);f(h)}function h(a){if(!a.editable().isInline()){var c=CKEDITOR.instances,e;for(e in c){var b=c[e];"wysiwyg"!=b.mode||b.readOnly||(b=b.document.getBody(),b.setAttribute("contentEditable",!1),b.setAttribute("contentEditable",!0))}a.editable().hasFocus&&(a.toolbox.focus(),a.focus())}}CKEDITOR.plugins.add("maximize",{init:function(a){function f(){var b=d.getViewPaneSize();a.resize(b.width,b.height,null,!0)}if(a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var k=a.lang,b=CKEDITOR.document,d=b.getWindow(),
-g,p,v,u=CKEDITOR.TRISTATE_OFF;a.addCommand("maximize",{modes:{wysiwyg:!CKEDITOR.env.iOS,source:!CKEDITOR.env.iOS},readOnly:1,editorFocus:!1,exec:function(){var t=a.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}),n=a.ui.space("contents");if("wysiwyg"==a.mode){var q=a.getSelection();g=q&&q.getRanges();p=d.getScrollPosition()}else{var x=a.editable().$;g=!CKEDITOR.env.ie&&[x.selectionStart,x.selectionEnd];p=[x.scrollLeft,x.scrollTop]}if(this.state==CKEDITOR.TRISTATE_OFF){d.on("resize",
-f);v=d.getScrollPosition();for(q=a.container;q=q.getParent();)q.setCustomData("maximize_saved_styles",c(q)),q.setStyle("z-index",a.config.baseFloatZIndex-5);n.setCustomData("maximize_saved_styles",c(n,!0));t.setCustomData("maximize_saved_styles",c(t,!0));n={overflow:CKEDITOR.env.webkit?"":"hidden",width:0,height:0};b.getDocumentElement().setStyles(n);!CKEDITOR.env.gecko&&b.getDocumentElement().setStyle("position","fixed");CKEDITOR.env.gecko&&CKEDITOR.env.quirks||b.getBody().setStyles(n);CKEDITOR.env.ie?
-setTimeout(function(){d.$.scrollTo(0,0)},0):d.$.scrollTo(0,0);t.setStyle("position",CKEDITOR.env.gecko&&CKEDITOR.env.quirks?"fixed":"absolute");t.$.offsetLeft;t.setStyles({"z-index":a.config.baseFloatZIndex-5,left:"0px",top:"0px"});t.addClass("cke_maximized");f();n=t.getDocumentPosition();t.setStyles({left:-1*n.x+"px",top:-1*n.y+"px"});CKEDITOR.env.gecko&&h(a)}else if(this.state==CKEDITOR.TRISTATE_ON){d.removeListener("resize",f);for(var q=[n,t],A=0;A<q.length;A++)e(q[A],q[A].getCustomData("maximize_saved_styles")),
-q[A].removeCustomData("maximize_saved_styles");for(q=a.container;q=q.getParent();)e(q,q.getCustomData("maximize_saved_styles")),q.removeCustomData("maximize_saved_styles");CKEDITOR.env.ie?setTimeout(function(){d.$.scrollTo(v.x,v.y)},0):d.$.scrollTo(v.x,v.y);t.removeClass("cke_maximized");CKEDITOR.env.webkit&&(t.setStyle("display","inline"),setTimeout(function(){t.setStyle("display","block")},0));a.fire("resize",{outerHeight:a.container.$.offsetHeight,contentsHeight:n.$.offsetHeight,outerWidth:a.container.$.offsetWidth})}this.toggleState();
-if(q=this.uiItems[0])n=this.state==CKEDITOR.TRISTATE_OFF?k.maximize.maximize:k.maximize.minimize,q=CKEDITOR.document.getById(q._.id),q.getChild(1).setHtml(n),q.setAttribute("title",n),q.setAttribute("href",'javascript:void("'+n+'");');"wysiwyg"==a.mode?g?(CKEDITOR.env.gecko&&h(a),a.getSelection().selectRanges(g),(x=a.getSelection().getStartElement())&&x.scrollIntoView(!0)):d.$.scrollTo(p.x,p.y):(g&&(x.selectionStart=g[0],x.selectionEnd=g[1]),x.scrollLeft=p[0],x.scrollTop=p[1]);g=p=null;u=this.state;
-a.fire("maximize",this.state)},canUndo:!1});a.ui.addButton&&a.ui.addButton("Maximize",{label:k.maximize.maximize,command:"maximize",toolbar:"tools,10"});a.on("mode",function(){var b=a.getCommand("maximize");b.setState(b.state==CKEDITOR.TRISTATE_DISABLED?CKEDITOR.TRISTATE_DISABLED:u)},null,null,100)}}})}(),function(){var a={canUndo:!1,async:!0,exec:function(f){f.getClipboardData({title:f.lang.pastetext.title},function(c){c&&f.fire("paste",{type:"text",dataValue:c.dataValue,method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});
-f.fire("afterCommandExec",{name:"pastetext",command:a,returnValue:!!c})})}};CKEDITOR.plugins.add("pastetext",{requires:"clipboard",init:function(f){f.addCommand("pastetext",a);f.ui.addButton&&f.ui.addButton("PasteText",{label:f.lang.pastetext.button,command:"pastetext",toolbar:"clipboard,40"});if(f.config.forcePasteAsPlainText)f.on("beforePaste",function(a){"html"!=a.data.type&&(a.data.type="text")});f.on("pasteState",function(a){f.getCommand("pastetext").setState(a.data)})}})}(),function(){function a(a,
-e,f){var m=CKEDITOR.cleanWord;m?f():(a=CKEDITOR.getUrl(a.config.pasteFromWordCleanupFile||e+"filter/default.js"),CKEDITOR.scriptLoader.load(a,f,null,!0));return!m}function f(a){a.data.type="html"}CKEDITOR.plugins.add("pastefromword",{requires:"clipboard",init:function(c){var e=0,h=this.path;c.addCommand("pastefromword",{canUndo:!1,async:!0,exec:function(a){var c=this;e=1;a.once("beforePaste",f);a.getClipboardData({title:a.lang.pastefromword.title},function(e){e&&a.fire("paste",{type:"html",dataValue:e.dataValue,
-method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});a.fire("afterCommandExec",{name:"pastefromword",command:c,returnValue:!!e})})}});c.ui.addButton&&c.ui.addButton("PasteFromWord",{label:c.lang.pastefromword.toolbar,command:"pastefromword",toolbar:"clipboard,50"});c.on("pasteState",function(a){c.getCommand("pastefromword").setState(a.data)});c.on("paste",function(f){var l=f.data,k=l.dataValue;if(k&&(e||/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(k))){l.dontFilter=
-!0;var b=a(c,h,function(){if(b)c.fire("paste",l);else if(!c.config.pasteFromWordPromptCleanup||e||confirm(c.lang.pastefromword.confirmCleanup))l.dataValue=CKEDITOR.cleanWord(k,c);e=0});b&&f.cancel()}},null,null,3)}})}(),CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}}),CKEDITOR.plugins.removeformat=
-{commands:{removeformat:{exec:function(a){for(var f=a._.removeFormatRegex||(a._.removeFormatRegex=new RegExp("^(?:"+a.config.removeFormatTags.replace(/,/g,"|")+")$","i")),c=a._.removeAttributes||(a._.removeAttributes=a.config.removeFormatAttributes.split(",")),e=CKEDITOR.plugins.removeformat.filter,h=a.getSelection().getRanges(),m=h.createIterator(),l=function(a){return a.type==CKEDITOR.NODE_ELEMENT},k;k=m.getNextRange();){k.collapsed||k.enlarge(CKEDITOR.ENLARGE_ELEMENT);var b=k.createBookmark(),
-d=b.startNode,g=b.endNode,p=function(b){for(var d=a.elementPath(b),c=d.elements,g=1,h;(h=c[g])&&!h.equals(d.block)&&!h.equals(d.blockLimit);g++)f.test(h.getName())&&e(a,h)&&b.breakParent(h)};p(d);if(g)for(p(g),d=d.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT);d&&!d.equals(g);)if(d.isReadOnly()){if(d.getPosition(g)&CKEDITOR.POSITION_CONTAINS)break;d=d.getNext(l)}else p=d.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT),"img"==d.getName()&&d.data("cke-realelement")||!e(a,d)||(f.test(d.getName())?d.remove(1):
-(d.removeAttributes(c),a.fire("removeFormatCleanup",d))),d=p;k.moveToBookmark(b)}a.forceNextSelectionCheck();a.getSelection().selectRanges(h)}}},filter:function(a,f){for(var c=a._.removeFormatFilters||[],e=0;e<c.length;e++)if(!1===c[e](f))return!1;return!0}},CKEDITOR.editor.prototype.addRemoveFormatFilter=function(a){this._.removeFormatFilters||(this._.removeFormatFilters=[]);this._.removeFormatFilters.push(a)},CKEDITOR.config.removeFormatTags="b,big,cite,code,del,dfn,em,font,i,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var",
-CKEDITOR.config.removeFormatAttributes="class,style,lang,width,height,align,hspace,valign",function(){CKEDITOR.plugins.add("sourcearea",{init:function(f){function c(){var a=h&&this.equals(CKEDITOR.document.getActive());this.hide();this.setStyle("height",this.getParent().$.clientHeight+"px");this.setStyle("width",this.getParent().$.clientWidth+"px");this.show();a&&this.focus()}if(f.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var e=CKEDITOR.plugins.sourcearea;f.addMode("source",function(e){var h=f.ui.space("contents").getDocument().createElement("textarea");
-h.setStyles(CKEDITOR.tools.extend({width:CKEDITOR.env.ie7Compat?"99%":"100%",height:"100%",resize:"none",outline:"none","text-align":"left"},CKEDITOR.tools.cssVendorPrefix("tab-size",f.config.sourceAreaTabSize||4)));h.setAttribute("dir","ltr");h.addClass("cke_source").addClass("cke_reset").addClass("cke_enable_context_menu");f.ui.space("contents").append(h);h=f.editable(new a(f,h));h.setData(f.getData(1));CKEDITOR.env.ie&&(h.attachListener(f,"resize",c,h),h.attachListener(CKEDITOR.document.getWindow(),
-"resize",c,h),CKEDITOR.tools.setTimeout(c,0,h));f.fire("ariaWidget",this);e()});f.addCommand("source",e.commands.source);f.ui.addButton&&f.ui.addButton("Source",{label:f.lang.sourcearea.toolbar,command:"source",toolbar:"mode,10"});f.on("mode",function(){f.getCommand("source").setState("source"==f.mode?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)});var h=CKEDITOR.env.ie&&9==CKEDITOR.env.version}}});var a=CKEDITOR.tools.createClass({base:CKEDITOR.editable,proto:{setData:function(a){this.setValue(a);
-this.status="ready";this.editor.fire("dataReady")},getData:function(){return this.getValue()},insertHtml:function(){},insertElement:function(){},insertText:function(){},setReadOnly:function(a){this[(a?"set":"remove")+"Attribute"]("readOnly","readonly")},detach:function(){a.baseProto.detach.call(this);this.clearCustomData();this.remove()}}})}(),CKEDITOR.plugins.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:!1,readOnly:1,exec:function(a){"wysiwyg"==a.mode&&a.fire("saveSnapshot");
-a.getCommand("source").setState(CKEDITOR.TRISTATE_DISABLED);a.setMode("source"==a.mode?"wysiwyg":"source")},canUndo:!1}}},CKEDITOR.plugins.add("specialchar",{availableLangs:{af:1,ar:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fr:1,"fr-ca":1,gl:1,he:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,nb:1,nl:1,no:1,pl:1,pt:1,"pt-br":1,ru:1,si:1,sk:1,sl:1,sq:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},requires:"dialog",init:function(a){var f=
-this;CKEDITOR.dialog.add("specialchar",this.path+"dialogs/specialchar.js");a.addCommand("specialchar",{exec:function(){var c=a.langCode,c=f.availableLangs[c]?c:f.availableLangs[c.replace(/-.*/,"")]?c.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(f.path+"dialogs/lang/"+c+".js"),function(){CKEDITOR.tools.extend(a.lang.specialchar,f.langEntries[c]);a.openDialog("specialchar")})},modes:{wysiwyg:1},canUndo:!1});a.ui.addButton&&a.ui.addButton("SpecialChar",{label:a.lang.specialchar.toolbar,
-command:"specialchar",toolbar:"insert,50"})}}),CKEDITOR.config.specialChars="! \x26quot; # $ % \x26amp; ' ( ) * + - . / 0 1 2 3 4 5 6 7 8 9 : ; \x26lt; \x3d \x26gt; ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ \x26euro; \x26lsquo; \x26rsquo; \x26ldquo; \x26rdquo; \x26ndash; \x26mdash; \x26iexcl; \x26cent; \x26pound; \x26curren; \x26yen; \x26brvbar; \x26sect; \x26uml; \x26copy; \x26ordf; \x26laquo; \x26not; \x26reg; \x26macr; \x26deg; \x26sup2; \x26sup3; \x26acute; \x26micro; \x26para; \x26middot; \x26cedil; \x26sup1; \x26ordm; \x26raquo; \x26frac14; \x26frac12; \x26frac34; \x26iquest; \x26Agrave; \x26Aacute; \x26Acirc; \x26Atilde; \x26Auml; \x26Aring; \x26AElig; \x26Ccedil; \x26Egrave; \x26Eacute; \x26Ecirc; \x26Euml; \x26Igrave; \x26Iacute; \x26Icirc; \x26Iuml; \x26ETH; \x26Ntilde; \x26Ograve; \x26Oacute; \x26Ocirc; \x26Otilde; \x26Ouml; \x26times; \x26Oslash; \x26Ugrave; \x26Uacute; \x26Ucirc; \x26Uuml; \x26Yacute; \x26THORN; \x26szlig; \x26agrave; \x26aacute; \x26acirc; \x26atilde; \x26auml; \x26aring; \x26aelig; \x26ccedil; \x26egrave; \x26eacute; \x26ecirc; \x26euml; \x26igrave; \x26iacute; \x26icirc; \x26iuml; \x26eth; \x26ntilde; \x26ograve; \x26oacute; \x26ocirc; \x26otilde; \x26ouml; \x26divide; \x26oslash; \x26ugrave; \x26uacute; \x26ucirc; \x26uuml; \x26yacute; \x26thorn; \x26yuml; \x26OElig; \x26oelig; \x26#372; \x26#374 \x26#373 \x26#375; \x26sbquo; \x26#8219; \x26bdquo; \x26hellip; \x26trade; \x26#9658; \x26bull; \x26rarr; \x26rArr; \x26hArr; \x26diams; \x26asymp;".split(" "),
-function(){CKEDITOR.plugins.add("stylescombo",{requires:"richcombo",init:function(a){var f=a.config,c=a.lang.stylescombo,e={},h=[],m=[];a.on("stylesSet",function(c){if(c=c.data.styles){for(var k,b,d,g=0,p=c.length;g<p;g++)(k=c[g],a.blockless&&k.element in CKEDITOR.dtd.$block||(b=k.name,k=new CKEDITOR.style(k),a.filter.customConfig&&!a.filter.check(k)))||(k._name=b,k._.enterMode=f.enterMode,k._.type=d=k.assignedTo||k.type,k._.weight=g+1E3*(d==CKEDITOR.STYLE_OBJECT?1:d==CKEDITOR.STYLE_BLOCK?2:3),e[b]=
-k,h.push(k),m.push(k));h.sort(function(a,b){return a._.weight-b._.weight})}});a.ui.addRichCombo("Styles",{label:c.label,title:c.panelTitle,toolbar:"styles,10",allowedContent:m,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(f.contentsCss),multiSelect:!0,attributes:{"aria-label":c.panelTitle}},init:function(){var a,e,b,d,f,m;f=0;for(m=h.length;f<m;f++)a=h[f],e=a._name,d=a._.type,d!=b&&(this.startGroup(c["panelTitle"+String(d)]),b=d),this.add(e,a.type==CKEDITOR.STYLE_OBJECT?e:a.buildPreview(),e);
-this.commit()},onClick:function(c){a.focus();a.fire("saveSnapshot");c=e[c];var f=a.elementPath();a[c.checkActive(f,a)?"removeStyle":"applyStyle"](c);a.fire("saveSnapshot")},onRender:function(){a.on("selectionChange",function(c){var f=this.getValue();c=c.data.path.elements;for(var b=0,d=c.length,g;b<d;b++){g=c[b];for(var h in e)if(e[h].checkElementRemovable(g,!0,a)){h!=f&&this.setValue(h);return}}this.setValue("")},this)},onOpen:function(){var f=a.getSelection().getSelectedElement(),f=a.elementPath(f),
-h=[0,0,0,0];this.showAll();this.unmarkAll();for(var b in e){var d=e[b],g=d._.type;d.checkApplicable(f,a,a.activeFilter)?h[g]++:this.hideItem(b);d.checkActive(f,a)&&this.mark(b)}h[CKEDITOR.STYLE_BLOCK]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_BLOCK)]);h[CKEDITOR.STYLE_INLINE]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_INLINE)]);h[CKEDITOR.STYLE_OBJECT]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_OBJECT)])},refresh:function(){var c=a.elementPath();if(c){for(var f in e)if(e[f].checkApplicable(c,
-a,a.activeFilter))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}},reset:function(){e={};h=[]}})}})}(),function(){function a(a){return{editorFocus:!1,canUndo:!1,modes:{wysiwyg:1},exec:function(c){if(c.editable().hasFocus){var e=c.getSelection(),f;if(f=(new CKEDITOR.dom.elementPath(e.getCommonAncestor(),e.root)).contains({td:1,th:1},1)){var e=c.createRange(),b=CKEDITOR.tools.tryThese(function(){var b=f.getParent().$.cells[f.$.cellIndex+(a?-1:1)];b.parentNode.parentNode;return b},function(){var b=
-f.getParent(),b=b.getAscendant("table").$.rows[b.$.rowIndex+(a?-1:1)];return b.cells[a?b.cells.length-1:0]});if(b||a)if(b)b=new CKEDITOR.dom.element(b),e.moveToElementEditStart(b),e.checkStartOfBlock()&&e.checkEndOfBlock()||e.selectNodeContents(b);else return!0;else{for(var d=f.getAscendant("table").$,b=f.getParent().$.cells,d=new CKEDITOR.dom.element(d.insertRow(-1),c.document),g=0,p=b.length;g<p;g++)d.append((new CKEDITOR.dom.element(b[g],c.document)).clone(!1,!1)).appendBogus();e.moveToElementEditStart(d)}e.select(!0);
-return!0}}return!1}}}var f={editorFocus:!1,modes:{wysiwyg:1,source:1}},c={exec:function(a){a.container.focusNext(!0,a.tabIndex)}},e={exec:function(a){a.container.focusPrevious(!0,a.tabIndex)}};CKEDITOR.plugins.add("tab",{init:function(h){for(var m=!1!==h.config.enableTabKeyTools,l=h.config.tabSpaces||0,k="";l--;)k+=" ";if(k)h.on("key",function(a){9==a.data.keyCode&&(h.insertText(k),a.cancel())});if(m)h.on("key",function(a){(9==a.data.keyCode&&h.execCommand("selectNextCell")||a.data.keyCode==CKEDITOR.SHIFT+
-9&&h.execCommand("selectPreviousCell"))&&a.cancel()});h.addCommand("blur",CKEDITOR.tools.extend(c,f));h.addCommand("blurBack",CKEDITOR.tools.extend(e,f));h.addCommand("selectNextCell",a());h.addCommand("selectPreviousCell",a(!0))}})}(),CKEDITOR.dom.element.prototype.focusNext=function(a,f){var c=void 0===f?this.getTabIndex():f,e,h,m,l,k,b;if(0>=c)for(k=this.getNextSourceNode(a,CKEDITOR.NODE_ELEMENT);k;){if(k.isVisible()&&0===k.getTabIndex()){m=k;break}k=k.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT)}else for(k=
-this.getDocument().getBody().getFirst();k=k.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!e)if(!h&&k.equals(this)){if(h=!0,a){if(!(k=k.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;e=1}}else h&&!this.contains(k)&&(e=1);if(k.isVisible()&&!(0>(b=k.getTabIndex()))){if(e&&b==c){m=k;break}b>c&&(!m||!l||b<l)?(m=k,l=b):m||0!==b||(m=k,l=b)}}m&&m.focus()},CKEDITOR.dom.element.prototype.focusPrevious=function(a,f){for(var c=void 0===f?this.getTabIndex():f,e,h,m,l=0,k,b=this.getDocument().getBody().getLast();b=
-b.getPreviousSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!e)if(!h&&b.equals(this)){if(h=!0,a){if(!(b=b.getPreviousSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;e=1}}else h&&!this.contains(b)&&(e=1);if(b.isVisible()&&!(0>(k=b.getTabIndex())))if(0>=c){if(e&&0===k){m=b;break}k>l&&(m=b,l=k)}else{if(e&&k==c){m=b;break}k<c&&(!m||k>l)&&(m=b,l=k)}}m&&m.focus()},CKEDITOR.plugins.add("table",{requires:"dialog",init:function(a){function f(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,
-c){this.setState(c.contains("table",1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}if(!a.blockless){var c=a.lang.table;a.addCommand("table",new CKEDITOR.dialogCommand("table",{context:"table",allowedContent:"table{width,height}[align,border,cellpadding,cellspacing,summary];caption tbody thead tfoot;th td tr[scope];"+(a.plugins.dialogadvtab?"table"+a.plugins.dialogadvtab.allowedContent():""),requiredContent:"table",contentTransformations:[["table{width}: sizeToStyle","table[width]: sizeToAttribute"]]}));
-a.addCommand("tableProperties",new CKEDITOR.dialogCommand("tableProperties",f()));a.addCommand("tableDelete",f({exec:function(a){var c=a.elementPath().contains("table",1);if(c){var f=c.getParent(),l=a.editable();1!=f.getChildCount()||f.is("td","th")||f.equals(l)||(c=f);a=a.createRange();a.moveToPosition(c,CKEDITOR.POSITION_BEFORE_START);c.remove();a.select()}}}));a.ui.addButton&&a.ui.addButton("Table",{label:c.toolbar,command:"table",toolbar:"insert,30"});CKEDITOR.dialog.add("table",this.path+"dialogs/table.js");
-CKEDITOR.dialog.add("tableProperties",this.path+"dialogs/table.js");a.addMenuItems&&a.addMenuItems({table:{label:c.menu,command:"tableProperties",group:"table",order:5},tabledelete:{label:c.deleteTable,command:"tableDelete",group:"table",order:1}});a.on("doubleclick",function(a){a.data.element.is("table")&&(a.data.dialog="tableProperties")});a.contextMenu&&a.contextMenu.addListener(function(){return{tabledelete:CKEDITOR.TRISTATE_OFF,table:CKEDITOR.TRISTATE_OFF}})}}}),function(){function a(a){function b(a){0<
-d.length||a.type!=CKEDITOR.NODE_ELEMENT||!v.test(a.getName())||a.getCustomData("selected_cell")||(CKEDITOR.dom.element.setMarker(c,a,"selected_cell",!0),d.push(a))}a=a.getRanges();for(var d=[],c={},e=0;e<a.length;e++){var f=a[e];if(f.collapsed)f=f.getCommonAncestor(),(f=f.getAscendant("td",!0)||f.getAscendant("th",!0))&&d.push(f);else{var f=new CKEDITOR.dom.walker(f),g;for(f.guard=b;g=f.next();)g.type==CKEDITOR.NODE_ELEMENT&&g.is(CKEDITOR.dtd.table)||(g=g.getAscendant("td",!0)||g.getAscendant("th",
-!0))&&!g.getCustomData("selected_cell")&&(CKEDITOR.dom.element.setMarker(c,g,"selected_cell",!0),d.push(g))}}CKEDITOR.dom.element.clearAllMarkers(c);return d}function f(b,d){for(var c=a(b),e=c[0],f=e.getAscendant("table"),e=e.getDocument(),g=c[0].getParent(),h=g.$.rowIndex,c=c[c.length-1],k=c.getParent().$.rowIndex+c.$.rowSpan-1,c=new CKEDITOR.dom.element(f.$.rows[k]),h=d?h:k,g=d?g:c,c=CKEDITOR.tools.buildTableMap(f),f=c[h],h=d?c[h-1]:c[h+1],c=c[0].length,e=e.createElement("tr"),k=0;f[k]&&k<c;k++){var l;
-1<f[k].rowSpan&&h&&f[k]==h[k]?(l=f[k],l.rowSpan+=1):(l=(new CKEDITOR.dom.element(f[k])).clone(),l.removeAttribute("rowSpan"),l.appendBogus(),e.append(l),l=l.$);k+=l.colSpan-1}d?e.insertBefore(g):e.insertAfter(g)}function c(b){if(b instanceof CKEDITOR.dom.selection){var d=a(b),e=d[0].getAscendant("table"),f=CKEDITOR.tools.buildTableMap(e);b=d[0].getParent().$.rowIndex;for(var d=d[d.length-1],g=d.getParent().$.rowIndex+d.$.rowSpan-1,d=[],h=b;h<=g;h++){for(var k=f[h],l=new CKEDITOR.dom.element(e.$.rows[h]),
-m=0;m<k.length;m++){var p=new CKEDITOR.dom.element(k[m]),v=p.getParent().$.rowIndex;1==p.$.rowSpan?p.remove():(--p.$.rowSpan,v==h&&(v=f[h+1],v[m-1]?p.insertAfter(new CKEDITOR.dom.element(v[m-1])):(new CKEDITOR.dom.element(e.$.rows[h+1])).append(p,1)));m+=p.$.colSpan-1}d.push(l)}f=e.$.rows;e=new CKEDITOR.dom.element(f[g+1]||(0<b?f[b-1]:null)||e.$.parentNode);for(h=d.length;0<=h;h--)c(d[h]);return e}b instanceof CKEDITOR.dom.element&&(e=b.getAscendant("table"),1==e.$.rows.length?e.remove():b.remove());
-return null}function e(a,b){for(var d=b?Infinity:0,c=0;c<a.length;c++){var e;e=a[c];for(var f=b,g=e.getParent().$.cells,h=0,k=0;k<g.length;k++){var l=g[k],h=h+(f?1:l.colSpan);if(l==e.$)break}e=h-1;if(b?e<d:e>d)d=e}return d}function h(b,d){for(var c=a(b),f=c[0].getAscendant("table"),g=e(c,1),c=e(c),g=d?g:c,h=CKEDITOR.tools.buildTableMap(f),f=[],c=[],k=h.length,l=0;l<k;l++)f.push(h[l][g]),c.push(d?h[l][g-1]:h[l][g+1]);for(l=0;l<k;l++)f[l]&&(1<f[l].colSpan&&c[l]==f[l]?(g=f[l],g.colSpan+=1):(g=(new CKEDITOR.dom.element(f[l])).clone(),
-g.removeAttribute("colSpan"),g.appendBogus(),g[d?"insertBefore":"insertAfter"].call(g,new CKEDITOR.dom.element(f[l])),g=g.$),l+=g.rowSpan-1)}function m(a,b){var d=a.getStartElement();if(d=d.getAscendant("td",1)||d.getAscendant("th",1)){var c=d.clone();c.appendBogus();b?c.insertBefore(d):c.insertAfter(d)}}function l(b){if(b instanceof CKEDITOR.dom.selection){b=a(b);var d=b[0]&&b[0].getAscendant("table"),c;a:{var e=0;c=b.length-1;for(var f={},g,h;g=b[e++];)CKEDITOR.dom.element.setMarker(f,g,"delete_cell",
-!0);for(e=0;g=b[e++];)if((h=g.getPrevious())&&!h.getCustomData("delete_cell")||(h=g.getNext())&&!h.getCustomData("delete_cell")){CKEDITOR.dom.element.clearAllMarkers(f);c=h;break a}CKEDITOR.dom.element.clearAllMarkers(f);h=b[0].getParent();(h=h.getPrevious())?c=h.getLast():(h=b[c].getParent(),c=(h=h.getNext())?h.getChild(0):null)}for(h=b.length-1;0<=h;h--)l(b[h]);c?k(c,!0):d&&d.remove()}else b instanceof CKEDITOR.dom.element&&(d=b.getParent(),1==d.getChildCount()?d.remove():b.remove())}function k(a,
-b){var d=a.getDocument(),c=CKEDITOR.document;CKEDITOR.env.ie&&10==CKEDITOR.env.version&&(c.focus(),d.focus());d=new CKEDITOR.dom.range(d);d["moveToElementEdit"+(b?"End":"Start")](a)||(d.selectNodeContents(a),d.collapse(b?!1:!0));d.select(!0)}function b(a,b,d){a=a[b];if("undefined"==typeof d)return a;for(b=0;a&&b<a.length;b++){if(d.is&&a[b]==d.$)return b;if(b==d)return new CKEDITOR.dom.element(a[b])}return d.is?-1:null}function d(d,c,e){var f=a(d),g;if((c?1!=f.length:2>f.length)||(g=d.getCommonAncestor())&&
-g.type==CKEDITOR.NODE_ELEMENT&&g.is("table"))return!1;var h;d=f[0];g=d.getAscendant("table");var k=CKEDITOR.tools.buildTableMap(g),l=k.length,m=k[0].length,p=d.getParent().$.rowIndex,v=b(k,p,d);if(c){var y;try{var D=parseInt(d.getAttribute("rowspan"),10)||1;h=parseInt(d.getAttribute("colspan"),10)||1;y=k["up"==c?p-D:"down"==c?p+D:p]["left"==c?v-h:"right"==c?v+h:v]}catch(F){return!1}if(!y||d.$==y)return!1;f["up"==c||"left"==c?"unshift":"push"](new CKEDITOR.dom.element(y))}c=d.getDocument();var E=p,
-D=y=0,L=!e&&new CKEDITOR.dom.documentFragment(c),G=0;for(c=0;c<f.length;c++){h=f[c];var N=h.getParent(),O=h.getFirst(),I=h.$.colSpan,R=h.$.rowSpan,N=N.$.rowIndex,M=b(k,N,h),G=G+I*R,D=Math.max(D,M-v+I);y=Math.max(y,N-p+R);e||(I=h,(R=I.getBogus())&&R.remove(),I.trim(),h.getChildren().count()&&(N==E||!O||O.isBlockBoundary&&O.isBlockBoundary({br:1})||(E=L.getLast(CKEDITOR.dom.walker.whitespaces(!0)),!E||E.is&&E.is("br")||L.append("br")),h.moveChildren(L)),c?h.remove():h.setHtml(""));E=N}if(e)return y*
-D==G;L.moveChildren(d);d.appendBogus();D>=m?d.removeAttribute("rowSpan"):d.$.rowSpan=y;y>=l?d.removeAttribute("colSpan"):d.$.colSpan=D;e=new CKEDITOR.dom.nodeList(g.$.rows);f=e.count();for(c=f-1;0<=c;c--)g=e.getItem(c),g.$.cells.length||(g.remove(),f++);return d}function g(d,c){var e=a(d);if(1<e.length)return!1;if(c)return!0;var e=e[0],f=e.getParent(),g=f.getAscendant("table"),h=CKEDITOR.tools.buildTableMap(g),k=f.$.rowIndex,l=b(h,k,e),m=e.$.rowSpan,p;if(1<m){p=Math.ceil(m/2);for(var m=Math.floor(m/
-2),f=k+p,g=new CKEDITOR.dom.element(g.$.rows[f]),h=b(h,f),v,f=e.clone(),k=0;k<h.length;k++)if(v=h[k],v.parentNode==g.$&&k>l){f.insertBefore(new CKEDITOR.dom.element(v));break}else v=null;v||g.append(f)}else for(m=p=1,g=f.clone(),g.insertAfter(f),g.append(f=e.clone()),v=b(h,k),l=0;l<v.length;l++)v[l].rowSpan++;f.appendBogus();e.$.rowSpan=p;f.$.rowSpan=m;1==p&&e.removeAttribute("rowSpan");1==m&&f.removeAttribute("rowSpan");return f}function p(d,c){var e=a(d);if(1<e.length)return!1;if(c)return!0;var e=
-e[0],f=e.getParent(),g=f.getAscendant("table"),g=CKEDITOR.tools.buildTableMap(g),h=b(g,f.$.rowIndex,e),k=e.$.colSpan;if(1<k)f=Math.ceil(k/2),k=Math.floor(k/2);else{for(var k=f=1,l=[],m=0;m<g.length;m++){var p=g[m];l.push(p[h]);1<p[h].rowSpan&&(m+=p[h].rowSpan-1)}for(g=0;g<l.length;g++)l[g].colSpan++}g=e.clone();g.insertAfter(e);g.appendBogus();e.$.colSpan=f;g.$.colSpan=k;1==f&&e.removeAttribute("colSpan");1==k&&g.removeAttribute("colSpan");return g}var v=/^(?:td|th)$/;CKEDITOR.plugins.tabletools=
-{requires:"table,dialog,contextmenu",init:function(b){function e(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,b){this.setState(b.contains({td:1,th:1},1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}function n(a,d){var c=b.addCommand(a,d);b.addFeature(c)}var q=b.lang.table;n("cellProperties",new CKEDITOR.dialogCommand("cellProperties",e({allowedContent:"td th{width,height,border-color,background-color,white-space,vertical-align,text-align}[colspan,rowspan]",
-requiredContent:"table"})));CKEDITOR.dialog.add("cellProperties",this.path+"dialogs/tableCell.js");n("rowDelete",e({requiredContent:"table",exec:function(a){a=a.getSelection();k(c(a))}}));n("rowInsertBefore",e({requiredContent:"table",exec:function(a){a=a.getSelection();f(a,!0)}}));n("rowInsertAfter",e({requiredContent:"table",exec:function(a){a=a.getSelection();f(a)}}));n("columnDelete",e({requiredContent:"table",exec:function(b){b=b.getSelection();b=a(b);var d=b[0],c=b[b.length-1];b=d.getAscendant("table");
-for(var e=CKEDITOR.tools.buildTableMap(b),f,g,h=[],l=0,m=e.length;l<m;l++)for(var n=0,p=e[l].length;n<p;n++)e[l][n]==d.$&&(f=n),e[l][n]==c.$&&(g=n);for(l=f;l<=g;l++)for(n=0;n<e.length;n++)c=e[n],d=new CKEDITOR.dom.element(b.$.rows[n]),c=new CKEDITOR.dom.element(c[l]),c.$&&(1==c.$.colSpan?c.remove():--c.$.colSpan,n+=c.$.rowSpan-1,d.$.cells.length||h.push(d));g=b.$.rows[0]&&b.$.rows[0].cells;f=new CKEDITOR.dom.element(g[f]||(f?g[f-1]:b.$.parentNode));h.length==m&&b.remove();f&&k(f,!0)}}));n("columnInsertBefore",
-e({requiredContent:"table",exec:function(a){a=a.getSelection();h(a,!0)}}));n("columnInsertAfter",e({requiredContent:"table",exec:function(a){a=a.getSelection();h(a)}}));n("cellDelete",e({requiredContent:"table",exec:function(a){a=a.getSelection();l(a)}}));n("cellMerge",e({allowedContent:"td[colspan,rowspan]",requiredContent:"td[colspan,rowspan]",exec:function(a){k(d(a.getSelection()),!0)}}));n("cellMergeRight",e({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){k(d(a.getSelection(),
-"right"),!0)}}));n("cellMergeDown",e({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){k(d(a.getSelection(),"down"),!0)}}));n("cellVerticalSplit",e({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){k(p(a.getSelection()))}}));n("cellHorizontalSplit",e({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){k(g(a.getSelection()))}}));n("cellInsertBefore",e({requiredContent:"table",exec:function(a){a=a.getSelection();m(a,!0)}}));
-n("cellInsertAfter",e({requiredContent:"table",exec:function(a){a=a.getSelection();m(a)}}));b.addMenuItems&&b.addMenuItems({tablecell:{label:q.cell.menu,group:"tablecell",order:1,getItems:function(){var c=b.getSelection(),e=a(c);return{tablecell_insertBefore:CKEDITOR.TRISTATE_OFF,tablecell_insertAfter:CKEDITOR.TRISTATE_OFF,tablecell_delete:CKEDITOR.TRISTATE_OFF,tablecell_merge:d(c,null,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_merge_right:d(c,"right",!0)?CKEDITOR.TRISTATE_OFF:
-CKEDITOR.TRISTATE_DISABLED,tablecell_merge_down:d(c,"down",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_vertical:p(c,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_horizontal:g(c,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_properties:0<e.length?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED}}},tablecell_insertBefore:{label:q.cell.insertBefore,group:"tablecell",command:"cellInsertBefore",order:5},tablecell_insertAfter:{label:q.cell.insertAfter,
+a=a.replace(/(?=\s*<\/(:?head)>)/,k);this.clearCustomData();this.clearListeners();f.fire("contentDomUnload");var v=this.getDocument();try{v.write(a)}catch(r){setTimeout(function(){v.write(a)},0)}}},getData:function(a){if(a)return this.getHtml();a=this.editor;var c=a.config,e=c.fullPage,f=e&&a.docType,d=e&&a.xmlDeclaration,b=this.getDocument(),e=e?b.getDocumentElement().getOuterHtml():b.getBody().getHtml();CKEDITOR.env.gecko&&c.enterMode!=CKEDITOR.ENTER_BR&&(e=e.replace(/<br>(?=\s*(:?$|<\/body>))/,
+""));e=a.dataProcessor.toDataFormat(e);d&&(e=d+"\n"+e);f&&(e=f+"\n"+e);return e},focus:function(){this._.isLoadingData?this._.isPendingFocus=!0:f.baseProto.focus.call(this)},detach:function(){var a=this.editor,c=a.document,e;try{e=a.window.getFrame()}catch(k){}f.baseProto.detach.call(this);this.clearCustomData();c.getDocumentElement().clearCustomData();CKEDITOR.tools.removeFunction(this._.frameLoadedHandler);e&&e.getParent()?(e.clearCustomData(),(a=e.removeCustomData("onResize"))&&a.removeListener(),
+e.remove()):CKEDITOR.warn("editor-destroy-iframe")}}})}(),CKEDITOR.config.disableObjectResizing=!1,CKEDITOR.config.disableNativeTableHandles=!0,CKEDITOR.config.disableNativeSpellChecker=!0,function(){function a(a,h){var m,l;h.on("refresh",function(a){var d=[e],b;for(b in a.data.states)d.push(a.data.states[b]);this.setState(CKEDITOR.tools.search(d,c)?c:e)},h,null,100);h.on("exec",function(c){m=a.getSelection();l=m.createBookmarks(1);c.data||(c.data={});c.data.done=!1},h,null,0);h.on("exec",function(){a.forceNextSelectionCheck();
+m.selectBookmarks(l)},h,null,100)}var e=CKEDITOR.TRISTATE_DISABLED,c=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indent",{init:function(c){var e=CKEDITOR.plugins.indent.genericDefinition;a(c,c.addCommand("indent",new e(!0)));a(c,c.addCommand("outdent",new e));c.ui.addButton&&(c.ui.addButton("Indent",{label:c.lang.indent.indent,command:"indent",directional:!0,toolbar:"indent,20"}),c.ui.addButton("Outdent",{label:c.lang.indent.outdent,command:"outdent",directional:!0,toolbar:"indent,10"}));c.on("dirChanged",
+function(a){var e=c.createRange(),k=a.data.node;e.setStartBefore(k);e.setEndAfter(k);for(var d=new CKEDITOR.dom.walker(e),b;b=d.next();)if(b.type==CKEDITOR.NODE_ELEMENT)if(!b.equals(k)&&b.getDirection())e.setStartAfter(b),d=new CKEDITOR.dom.walker(e);else{var g=c.config.indentClasses;if(g)for(var h="ltr"==a.data.dir?["_rtl",""]:["","_rtl"],v=0;v<g.length;v++)b.hasClass(g[v]+h[0])&&(b.removeClass(g[v]+h[0]),b.addClass(g[v]+h[1]));g=b.getStyle("margin-right");h=b.getStyle("margin-left");g?b.setStyle("margin-left",
+g):b.removeStyle("margin-left");h?b.setStyle("margin-right",h):b.removeStyle("margin-right")}})}});CKEDITOR.plugins.indent={genericDefinition:function(a){this.isIndent=!!a;this.startDisabled=!this.isIndent},specificDefinition:function(a,c,e){this.name=c;this.editor=a;this.jobs={};this.enterBr=a.config.enterMode==CKEDITOR.ENTER_BR;this.isIndent=!!e;this.relatedGlobal=e?"indent":"outdent";this.indentKey=e?9:CKEDITOR.SHIFT+9;this.database={}},registerCommands:function(a,c){a.on("pluginsLoaded",function(){for(var a in c)(function(a,
+c){var d=a.getCommand(c.relatedGlobal),b;for(b in c.jobs)d.on("exec",function(d){d.data.done||(a.fire("lockSnapshot"),c.execJob(a,b)&&(d.data.done=!0),a.fire("unlockSnapshot"),CKEDITOR.dom.element.clearAllMarkers(c.database))},this,null,b),d.on("refresh",function(d){d.data.states||(d.data.states={});d.data.states[c.name+"@"+b]=c.refreshJob(a,b,d.data.path)},this,null,b);a.addFeature(c)})(this,c[a])})}};CKEDITOR.plugins.indent.genericDefinition.prototype={context:"p",exec:function(){}};CKEDITOR.plugins.indent.specificDefinition.prototype=
+{execJob:function(a,c){var m=this.jobs[c];if(m.state!=e)return m.exec.call(this,a)},refreshJob:function(a,c,m){c=this.jobs[c];a.activeFilter.checkFeature(this)?c.state=c.refresh.call(this,a,m):c.state=e;return c.state},getContext:function(a){return a.contains(this.context)}}}(),function(){function a(a){function d(d){for(var e=l.startContainer,h=l.endContainer;e&&!e.getParent().equals(d);)e=e.getParent();for(;h&&!h.getParent().equals(d);)h=h.getParent();if(!e||!h)return!1;for(var n=e,e=[],m=!1;!m;)n.equals(h)&&
+(m=!0),e.push(n),n=n.getNext();if(1>e.length)return!1;n=d.getParents(!0);for(h=0;h<n.length;h++)if(n[h].getName&&f[n[h].getName()]){d=n[h];break}for(var n=b.isIndent?1:-1,h=e[0],e=e[e.length-1],m=CKEDITOR.plugins.list.listToArray(d,g),w=m[e.getCustomData("listarray_index")].indent,h=h.getCustomData("listarray_index");h<=e.getCustomData("listarray_index");h++)if(m[h].indent+=n,0<n){var v=m[h].parent;m[h].parent=new CKEDITOR.dom.element(v.getName(),v.getDocument())}for(h=e.getCustomData("listarray_index")+
+1;h<m.length&&m[h].indent>w;h++)m[h].indent+=n;e=CKEDITOR.plugins.list.arrayToList(m,g,null,a.config.enterMode,d.getDirection());if(!b.isIndent){var z;if((z=d.getParent())&&z.is("li"))for(var n=e.listNode.getChildren(),A=[],C,h=n.count()-1;0<=h;h--)(C=n.getItem(h))&&C.is&&C.is("li")&&A.push(C)}e&&e.listNode.replace(d);if(A&&A.length)for(h=0;h<A.length;h++){for(C=d=A[h];(C=C.getNext())&&C.is&&C.getName()in f;)CKEDITOR.env.needsNbspFiller&&!d.getFirst(c)&&d.append(l.document.createText(" ")),d.append(C);
+d.insertAfter(z)}e&&a.fire("contentDomInvalidated");return!0}for(var b=this,g=this.database,f=this.context,h=a.getSelection(),h=(h&&h.getRanges()).createIterator(),l;l=h.getNextRange();){for(var m=l.getCommonAncestor();m&&(m.type!=CKEDITOR.NODE_ELEMENT||!f[m.getName()]);){if(a.editable().equals(m)){m=!1;break}m=m.getParent()}m||(m=l.startPath().contains(f))&&l.setEndAt(m,CKEDITOR.POSITION_BEFORE_END);if(!m){var n=l.getEnclosedNode();n&&n.type==CKEDITOR.NODE_ELEMENT&&n.getName()in f&&(l.setStartAt(n,
+CKEDITOR.POSITION_AFTER_START),l.setEndAt(n,CKEDITOR.POSITION_BEFORE_END),m=n)}m&&l.startContainer.type==CKEDITOR.NODE_ELEMENT&&l.startContainer.getName()in f&&(n=new CKEDITOR.dom.walker(l),n.evaluator=e,l.startContainer=n.next());m&&l.endContainer.type==CKEDITOR.NODE_ELEMENT&&l.endContainer.getName()in f&&(n=new CKEDITOR.dom.walker(l),n.evaluator=e,l.endContainer=n.previous());if(m)return d(m)}return 0}function e(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.is("li")}function c(a){return f(a)&&h(a)}
+var f=CKEDITOR.dom.walker.whitespaces(!0),h=CKEDITOR.dom.walker.bookmark(!1,!0),m=CKEDITOR.TRISTATE_DISABLED,l=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indentlist",{requires:"indent",init:function(c){function d(d){b.specificDefinition.apply(this,arguments);this.requiredContent=["ul","ol"];d.on("key",function(a){if("wysiwyg"==d.mode&&a.data.keyCode==this.indentKey){var b=this.getContext(d.elementPath());!b||this.isIndent&&CKEDITOR.plugins.indentList.firstItemInPath(this.context,d.elementPath(),
+b)||(d.execCommand(this.relatedGlobal),a.cancel())}},this);this.jobs[this.isIndent?10:30]={refresh:this.isIndent?function(a,b){var d=this.getContext(b),c=CKEDITOR.plugins.indentList.firstItemInPath(this.context,b,d);return d&&this.isIndent&&!c?l:m}:function(a,b){return!this.getContext(b)||this.isIndent?m:l},exec:CKEDITOR.tools.bind(a,this)}}var b=CKEDITOR.plugins.indent;b.registerCommands(c,{indentlist:new d(c,"indentlist",!0),outdentlist:new d(c,"outdentlist")});CKEDITOR.tools.extend(d.prototype,
+b.specificDefinition.prototype,{context:{ol:1,ul:1}})}});CKEDITOR.plugins.indentList={};CKEDITOR.plugins.indentList.firstItemInPath=function(a,d,b){var c=d.contains(e);b||(b=d.contains(a));return b&&c&&c.equals(b.getFirst(e))}}(),CKEDITOR.plugins.add("menubutton",{requires:"button,menu",onLoad:function(){var a=function(a){var c=this._,f=c.menu;c.state!==CKEDITOR.TRISTATE_DISABLED&&(c.on&&f?f.hide():(c.previousState=c.state,f||(f=c.menu=new CKEDITOR.menu(a,{panel:{className:"cke_menu_panel",attributes:{"aria-label":a.lang.common.options}}}),
+f.onHide=CKEDITOR.tools.bind(function(){var f=this.command?a.getCommand(this.command).modes:this.modes;this.setState(!f||f[a.mode]?c.previousState:CKEDITOR.TRISTATE_DISABLED);c.on=0},this),this.onMenu&&f.addListener(this.onMenu)),this.setState(CKEDITOR.TRISTATE_ON),c.on=1,setTimeout(function(){f.show(CKEDITOR.document.getById(c.id),4)},0)))};CKEDITOR.ui.menuButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(e){delete e.panel;this.base(e);this.hasArrow=!0;this.click=a},statics:{handler:{create:function(a){return new CKEDITOR.ui.menuButton(a)}}}})},
+beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_MENUBUTTON,CKEDITOR.ui.menuButton.handler)}}),CKEDITOR.UI_MENUBUTTON="menubutton","use strict",function(){CKEDITOR.plugins.add("language",{requires:"menubutton",init:function(a){var e=a.config.language_list||["ar:Arabic:rtl","fr:French","es:Spanish"],c=this,f=a.lang.language,h={},m,l,k,d;a.addCommand("language",{allowedContent:"span[!lang,!dir]",requiredContent:"span[lang,dir]",contextSensitive:!0,exec:function(a,d){var c=h["language_"+d];if(c)a[c.style.checkActive(a.elementPath(),
+a)?"removeStyle":"applyStyle"](c.style)},refresh:function(a){this.setState(c.getCurrentLangElement(a)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)}});for(d=0;d<e.length;d++)m=e[d].split(":"),l=m[0],k="language_"+l,h[k]={label:m[1],langId:l,group:"language",order:d,ltr:"rtl"!=(""+m[2]).toLowerCase(),onClick:function(){a.execCommand("language",this.langId)},role:"menuitemcheckbox"},h[k].style=new CKEDITOR.style({element:"span",attributes:{lang:l,dir:h[k].ltr?"ltr":"rtl"}});h.language_remove={label:f.remove,
+group:"language_remove",state:CKEDITOR.TRISTATE_DISABLED,order:h.length,onClick:function(){var b=c.getCurrentLangElement(a);b&&a.execCommand("language",b.getAttribute("lang"))}};a.addMenuGroup("language",1);a.addMenuGroup("language_remove");a.addMenuItems(h);a.ui.add("Language",CKEDITOR.UI_MENUBUTTON,{label:f.button,allowedContent:"span[!lang,!dir]",requiredContent:"span[lang,dir]",toolbar:"bidi,30",command:"language",onMenu:function(){var b={},d=c.getCurrentLangElement(a),e;for(e in h)b[e]=CKEDITOR.TRISTATE_OFF;
+b.language_remove=d?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;d&&(b["language_"+d.getAttribute("lang")]=CKEDITOR.TRISTATE_ON);return b}})},getCurrentLangElement:function(a){var e=a.elementPath();a=e&&e.elements;var c;if(e)for(var f=0;f<a.length;f++)e=a[f],!c&&"span"==e.getName()&&e.hasAttribute("dir")&&e.hasAttribute("lang")&&(c=e);return c}})}(),function(){function a(a,b,d){function c(d){if(!(!(l=h[d?"getFirst":"getLast"]())||l.is&&l.isBlockBoundary()||!(m=b.root[d?"getPrevious":"getNext"](CKEDITOR.dom.walker.invisible(!0)))||
+m.is&&m.isBlockBoundary({br:1})))a.document.createElement("br")[d?"insertBefore":"insertAfter"](l)}for(var e=CKEDITOR.plugins.list.listToArray(b.root,d),g=[],f=0;f<b.contents.length;f++){var k=b.contents[f];(k=k.getAscendant("li",!0))&&!k.getCustomData("list_item_processed")&&(g.push(k),CKEDITOR.dom.element.setMarker(d,k,"list_item_processed",!0))}k=null;for(f=0;f<g.length;f++)k=g[f].getCustomData("listarray_index"),e[k].indent=-1;for(f=k+1;f<e.length;f++)if(e[f].indent>e[f-1].indent+1){g=e[f-1].indent+
+1-e[f].indent;for(k=e[f].indent;e[f]&&e[f].indent>=k;)e[f].indent+=g,f++;f--}var h=CKEDITOR.plugins.list.arrayToList(e,d,null,a.config.enterMode,b.root.getAttribute("dir")).listNode,l,m;c(!0);c();h.replace(b.root);a.fire("contentDomInvalidated")}function e(a,b){this.name=a;this.context=this.type=b;this.allowedContent=b+" li";this.requiredContent=b}function c(a,b,d,c){for(var e,g;e=a[c?"getLast":"getFirst"](r);)(g=e.getDirection(1))!==b.getDirection(1)&&e.setAttribute("dir",g),e.remove(),d?e[c?"insertBefore":
+"insertAfter"](d):b.append(e,c)}function f(a){function b(d){var e=a[d?"getPrevious":"getNext"](g);e&&e.type==CKEDITOR.NODE_ELEMENT&&e.is(a.getName())&&(c(a,e,null,!d),a.remove(),a=e)}b();b(1)}function h(a){return a.type==CKEDITOR.NODE_ELEMENT&&(a.getName()in CKEDITOR.dtd.$block||a.getName()in CKEDITOR.dtd.$listItem)&&CKEDITOR.dtd[a.getName()]["#"]}function m(a,b,d){a.fire("saveSnapshot");d.enlarge(CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS);var e=d.extractContents();b.trim(!1,!0);var k=b.createBookmark(),
+h=new CKEDITOR.dom.elementPath(b.startContainer),m=h.block,h=h.lastElement.getAscendant("li",1)||m,x=new CKEDITOR.dom.elementPath(d.startContainer),r=x.contains(CKEDITOR.dtd.$listItem),x=x.contains(CKEDITOR.dtd.$list);m?(m=m.getBogus())&&m.remove():x&&(m=x.getPrevious(g))&&p(m)&&m.remove();(m=e.getLast())&&m.type==CKEDITOR.NODE_ELEMENT&&m.is("br")&&m.remove();(m=b.startContainer.getChild(b.startOffset))?e.insertBefore(m):b.startContainer.append(e);r&&(e=l(r))&&(h.contains(r)?(c(e,r.getParent(),r),
+e.remove()):h.append(e));for(;d.checkStartOfBlock()&&d.checkEndOfBlock();){x=d.startPath();e=x.block;if(!e)break;e.is("li")&&(h=e.getParent(),e.equals(h.getLast(g))&&e.equals(h.getFirst(g))&&(e=h));d.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START);e.remove()}d=d.clone();e=a.editable();d.setEndAt(e,CKEDITOR.POSITION_BEFORE_END);d=new CKEDITOR.dom.walker(d);d.evaluator=function(a){return g(a)&&!p(a)};(d=d.next())&&d.type==CKEDITOR.NODE_ELEMENT&&d.getName()in CKEDITOR.dtd.$list&&f(d);b.moveToBookmark(k);
+b.select();a.fire("saveSnapshot")}function l(a){return(a=a.getLast(g))&&a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in k?a:null}var k={ol:1,ul:1},d=CKEDITOR.dom.walker.whitespaces(),b=CKEDITOR.dom.walker.bookmark(),g=function(a){return!(d(a)||b(a))},p=CKEDITOR.dom.walker.bogus();CKEDITOR.plugins.list={listToArray:function(a,b,d,c,e){if(!k[a.getName()])return[];c||(c=0);d||(d=[]);for(var g=0,f=a.getChildCount();g<f;g++){var h=a.getChild(g);h.type==CKEDITOR.NODE_ELEMENT&&h.getName()in CKEDITOR.dtd.$list&&
+CKEDITOR.plugins.list.listToArray(h,b,d,c+1);if("li"==h.$.nodeName.toLowerCase()){var l={parent:a,indent:c,element:h,contents:[]};e?l.grandparent=e:(l.grandparent=a.getParent(),l.grandparent&&"li"==l.grandparent.$.nodeName.toLowerCase()&&(l.grandparent=l.grandparent.getParent()));b&&CKEDITOR.dom.element.setMarker(b,h,"listarray_index",d.length);d.push(l);for(var m=0,p=h.getChildCount(),r;m<p;m++)r=h.getChild(m),r.type==CKEDITOR.NODE_ELEMENT&&k[r.getName()]?CKEDITOR.plugins.list.listToArray(r,b,d,
+c+1,l.grandparent):l.contents.push(r)}}return d},arrayToList:function(a,d,c,e,f){c||(c=0);if(!a||a.length<c+1)return null;for(var h,l=a[c].parent.getDocument(),m=new CKEDITOR.dom.documentFragment(l),p=null,r=c,v=Math.max(a[c].indent,0),C=null,E,D,I=e==CKEDITOR.ENTER_P?"p":"div";;){var H=a[r];h=H.grandparent;E=H.element.getDirection(1);if(H.indent==v){p&&a[r].parent.getName()==p.getName()||(p=a[r].parent.clone(!1,1),f&&p.setAttribute("dir",f),m.append(p));C=p.append(H.element.clone(0,1));E!=p.getDirection(1)&&
+C.setAttribute("dir",E);for(h=0;h<H.contents.length;h++)C.append(H.contents[h].clone(1,1));r++}else if(H.indent==Math.max(v,0)+1)H=a[r-1].element.getDirection(1),r=CKEDITOR.plugins.list.arrayToList(a,null,r,e,H!=E?E:null),!C.getChildCount()&&CKEDITOR.env.needsNbspFiller&&7>=l.$.documentMode&&C.append(l.createText(" ")),C.append(r.listNode),r=r.nextIndex;else if(-1==H.indent&&!c&&h){k[h.getName()]?(C=H.element.clone(!1,!0),E!=h.getDirection(1)&&C.setAttribute("dir",E)):C=new CKEDITOR.dom.documentFragment(l);
+var p=h.getDirection(1)!=E,M=H.element,P=M.getAttribute("class"),G=M.getAttribute("style"),S=C.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&(e!=CKEDITOR.ENTER_BR||p||G||P),L,R=H.contents.length,O;for(h=0;h<R;h++)if(L=H.contents[h],b(L)&&1<R)S?O=L.clone(1,1):C.append(L.clone(1,1));else if(L.type==CKEDITOR.NODE_ELEMENT&&L.isBlockBoundary()){p&&!L.getDirection()&&L.setAttribute("dir",E);D=L;var T=M.getAttribute("style");T&&D.setAttribute("style",T.replace(/([^;])$/,"$1;")+(D.getAttribute("style")||""));P&&
+L.addClass(P);D=null;O&&(C.append(O),O=null);C.append(L.clone(1,1))}else S?(D||(D=l.createElement(I),C.append(D),p&&D.setAttribute("dir",E)),G&&D.setAttribute("style",G),P&&D.setAttribute("class",P),O&&(D.append(O),O=null),D.append(L.clone(1,1))):C.append(L.clone(1,1));O&&((D||C).append(O),O=null);C.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&r!=a.length-1&&(CKEDITOR.env.needsBrFiller&&(E=C.getLast())&&E.type==CKEDITOR.NODE_ELEMENT&&E.is("br")&&E.remove(),(E=C.getLast(g))&&E.type==CKEDITOR.NODE_ELEMENT&&
+E.is(CKEDITOR.dtd.$block)||C.append(l.createElement("br")));E=C.$.nodeName.toLowerCase();"div"!=E&&"p"!=E||C.appendBogus();m.append(C);p=null;r++}else return null;D=null;if(a.length<=r||Math.max(a[r].indent,0)<v)break}if(d)for(a=m.getFirst();a;){if(a.type==CKEDITOR.NODE_ELEMENT&&(CKEDITOR.dom.element.clearMarkers(d,a),a.getName()in CKEDITOR.dtd.$listItem&&(c=a,l=f=e=void 0,e=c.getDirection()))){for(f=c.getParent();f&&!(l=f.getDirection());)f=f.getParent();e==l&&c.removeAttribute("dir")}a=a.getNextSourceNode()}return{listNode:m,
+nextIndex:r}}};var v=/^h[1-6]$/,r=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT);e.prototype={exec:function(b){this.refresh(b,b.elementPath());var d=b.config,c=b.getSelection(),e=c&&c.getRanges();if(this.state==CKEDITOR.TRISTATE_OFF){var h=b.editable();if(h.getFirst(g)){var l=1==e.length&&e[0];(d=l&&l.getEnclosedNode())&&d.is&&this.type==d.getName()&&this.setState(CKEDITOR.TRISTATE_ON)}else d.enterMode==CKEDITOR.ENTER_BR?h.appendBogus():e[0].fixBlock(1,d.enterMode==CKEDITOR.ENTER_P?"p":"div"),
+c.selectRanges(e)}for(var d=c.createBookmarks(!0),h=[],m={},e=e.createIterator(),p=0;(l=e.getNextRange())&&++p;){var r=l.getBoundaryNodes(),z=r.startNode,A=r.endNode;z.type==CKEDITOR.NODE_ELEMENT&&"td"==z.getName()&&l.setStartAt(r.startNode,CKEDITOR.POSITION_AFTER_START);A.type==CKEDITOR.NODE_ELEMENT&&"td"==A.getName()&&l.setEndAt(r.endNode,CKEDITOR.POSITION_BEFORE_END);l=l.createIterator();for(l.forceBrBreak=this.state==CKEDITOR.TRISTATE_OFF;r=l.getNextParagraph();)if(!r.getCustomData("list_block")){CKEDITOR.dom.element.setMarker(m,
+r,"list_block",1);for(var C=b.elementPath(r),z=C.elements,A=0,C=C.blockLimit,E,D=z.length-1;0<=D&&(E=z[D]);D--)if(k[E.getName()]&&C.contains(E)){C.removeCustomData("list_group_object_"+p);(z=E.getCustomData("list_group_object"))?z.contents.push(r):(z={root:E,contents:[r]},h.push(z),CKEDITOR.dom.element.setMarker(m,E,"list_group_object",z));A=1;break}A||(A=C,A.getCustomData("list_group_object_"+p)?A.getCustomData("list_group_object_"+p).contents.push(r):(z={root:A,contents:[r]},CKEDITOR.dom.element.setMarker(m,
+A,"list_group_object_"+p,z),h.push(z)))}}for(E=[];0<h.length;)if(z=h.shift(),this.state==CKEDITOR.TRISTATE_OFF)if(k[z.root.getName()]){e=b;p=z;z=m;l=E;A=CKEDITOR.plugins.list.listToArray(p.root,z);C=[];for(r=0;r<p.contents.length;r++)D=p.contents[r],(D=D.getAscendant("li",!0))&&!D.getCustomData("list_item_processed")&&(C.push(D),CKEDITOR.dom.element.setMarker(z,D,"list_item_processed",!0));for(var D=p.root.getDocument(),I=void 0,H=void 0,r=0;r<C.length;r++){var M=C[r].getCustomData("listarray_index"),
+I=A[M].parent;I.is(this.type)||(H=D.createElement(this.type),I.copyAttributes(H,{start:1,type:1}),H.removeStyle("list-style-type"),A[M].parent=H)}z=CKEDITOR.plugins.list.arrayToList(A,z,null,e.config.enterMode);A=void 0;C=z.listNode.getChildCount();for(r=0;r<C&&(A=z.listNode.getChild(r));r++)A.getName()==this.type&&l.push(A);z.listNode.replace(p.root);e.fire("contentDomInvalidated")}else{A=b;l=z;r=E;C=l.contents;e=l.root.getDocument();p=[];1==C.length&&C[0].equals(l.root)&&(z=e.createElement("div"),
+C[0].moveChildren&&C[0].moveChildren(z),C[0].append(z),C[0]=z);l=l.contents[0].getParent();for(D=0;D<C.length;D++)l=l.getCommonAncestor(C[D].getParent());I=A.config.useComputedState;A=z=void 0;I=void 0===I||I;for(D=0;D<C.length;D++)for(H=C[D];M=H.getParent();){if(M.equals(l)){p.push(H);!A&&H.getDirection()&&(A=1);H=H.getDirection(I);null!==z&&(z=z&&z!=H?null:H);break}H=M}if(!(1>p.length)){C=p[p.length-1].getNext();D=e.createElement(this.type);r.push(D);for(I=r=void 0;p.length;)r=p.shift(),I=e.createElement("li"),
+H=r,H.is("pre")||v.test(H.getName())||"false"==H.getAttribute("contenteditable")?r.appendTo(I):(r.copyAttributes(I),z&&r.getDirection()&&(I.removeStyle("direction"),I.removeAttribute("dir")),r.moveChildren(I),r.remove()),I.appendTo(D);z&&A&&D.setAttribute("dir",z);C?D.insertBefore(C):D.appendTo(l)}}else this.state==CKEDITOR.TRISTATE_ON&&k[z.root.getName()]&&a.call(this,b,z,m);for(D=0;D<E.length;D++)f(E[D]);CKEDITOR.dom.element.clearAllMarkers(m);c.selectBookmarks(d);b.focus()},refresh:function(a,
+b){var d=b.contains(k,1),c=b.blockLimit||b.root;d&&c.contains(d)?this.setState(d.is(this.type)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.plugins.add("list",{requires:"indentlist",init:function(a){a.blockless||(a.addCommand("numberedlist",new e("numberedlist","ol")),a.addCommand("bulletedlist",new e("bulletedlist","ul")),a.ui.addButton&&(a.ui.addButton("NumberedList",{label:a.lang.list.numberedlist,command:"numberedlist",directional:!0,toolbar:"list,10"}),
+a.ui.addButton("BulletedList",{label:a.lang.list.bulletedlist,command:"bulletedlist",directional:!0,toolbar:"list,20"})),a.on("key",function(b){var d=b.data.domEvent.getKey(),c;if("wysiwyg"==a.mode&&d in{8:1,46:1}){var e=a.getSelection().getRanges()[0],f=e&&e.startPath();if(e&&e.collapsed){var r=8==d,x=a.editable(),v=new CKEDITOR.dom.walker(e.clone());v.evaluator=function(a){return g(a)&&!p(a)};v.guard=function(a,b){return!(b&&a.type==CKEDITOR.NODE_ELEMENT&&a.is("table"))};d=e.clone();if(r){var z;
+(z=f.contains(k))&&e.checkBoundaryOfElement(z,CKEDITOR.START)&&(z=z.getParent())&&z.is("li")&&(z=l(z))?(c=z,z=z.getPrevious(g),d.moveToPosition(z&&p(z)?z:c,CKEDITOR.POSITION_BEFORE_START)):(v.range.setStartAt(x,CKEDITOR.POSITION_AFTER_START),v.range.setEnd(e.startContainer,e.startOffset),(z=v.previous())&&z.type==CKEDITOR.NODE_ELEMENT&&(z.getName()in k||z.is("li"))&&(z.is("li")||(v.range.selectNodeContents(z),v.reset(),v.evaluator=h,z=v.previous()),c=z,d.moveToElementEditEnd(c),d.moveToPosition(d.endPath().block,
+CKEDITOR.POSITION_BEFORE_END)));if(c)m(a,d,e),b.cancel();else{var A=f.contains(k);A&&e.checkBoundaryOfElement(A,CKEDITOR.START)&&(c=A.getFirst(g),e.checkBoundaryOfElement(c,CKEDITOR.START)&&(z=A.getPrevious(g),l(c)?z&&(e.moveToElementEditEnd(z),e.select()):a.execCommand("outdent"),b.cancel()))}}else if(c=f.contains("li")){if(v.range.setEndAt(x,CKEDITOR.POSITION_BEFORE_END),r=(x=c.getLast(g))&&h(x)?x:c,f=0,(z=v.next())&&z.type==CKEDITOR.NODE_ELEMENT&&z.getName()in k&&z.equals(x)?(f=1,z=v.next()):e.checkBoundaryOfElement(r,
+CKEDITOR.END)&&(f=2),f&&z){e=e.clone();e.moveToElementEditStart(z);if(1==f&&(d.optimize(),!d.startContainer.equals(c))){for(c=d.startContainer;c.is(CKEDITOR.dtd.$inline);)A=c,c=c.getParent();A&&d.moveToPosition(A,CKEDITOR.POSITION_AFTER_END)}2==f&&(d.moveToPosition(d.endPath().block,CKEDITOR.POSITION_BEFORE_END),e.endPath().block&&e.moveToPosition(e.endPath().block,CKEDITOR.POSITION_AFTER_START));m(a,d,e);b.cancel()}}else v.range.setEndAt(x,CKEDITOR.POSITION_BEFORE_END),(z=v.next())&&z.type==CKEDITOR.NODE_ELEMENT&&
+z.is(k)&&(z=z.getFirst(g),f.block&&e.checkStartOfBlock()&&e.checkEndOfBlock()?(f.block.remove(),e.moveToElementEditStart(z),e.select()):l(z)?(e.moveToElementEditStart(z),e.select()):(e=e.clone(),e.moveToElementEditStart(z),m(a,d,e)),b.cancel());setTimeout(function(){a.selectionChange(1)})}}}))}})}(),"use strict",function(){function a(a,b,d){return p(b)&&p(d)&&d.equals(b.getNext(function(a){return!(ca(a)||da(a)||v(a))}))}function e(a){this.upper=a[0];this.lower=a[1];this.set.apply(this,a.slice(2))}
+function c(a){var b=a.element;if(b&&p(b)&&(b=b.getAscendant(a.triggers,!0))&&a.editable.contains(b)){var d=l(b);if("true"==d.getAttribute("contenteditable"))return b;if(d.is(a.triggers))return d}return null}function f(a,b,d){t(a,b);t(a,d);a=b.size.bottom;d=d.size.top;return a&&d?0|(a+d)/2:a||d}function h(a,b,d){return b=b[d?"getPrevious":"getNext"](function(b){return b&&b.type==CKEDITOR.NODE_TEXT&&!ca(b)||p(b)&&!v(b)&&!g(a,b)})}function m(a,b,d){return a>b&&a<d}function l(a,b){if(a.data("cke-editable"))return null;
+for(b||(a=a.getParent());a&&!a.data("cke-editable");){if(a.hasAttribute("contenteditable"))return a;a=a.getParent()}return null}function k(a){var b=a.doc,c=E('\x3cspan contenteditable\x3d"false" style\x3d"'+U+"position:absolute;border-top:1px dashed "+a.boxColor+'"\x3e\x3c/span\x3e',b),e=CKEDITOR.getUrl(this.path+"images/"+(D.hidpi?"hidpi/":"")+"icon"+(a.rtl?"-rtl":"")+".png");A(c,{attach:function(){this.wrap.getParent()||this.wrap.appendTo(a.editable,!0);return this},lineChildren:[A(E('\x3cspan title\x3d"'+
+a.editor.lang.magicline.title+'" contenteditable\x3d"false"\x3e\x26#8629;\x3c/span\x3e',b),{base:U+"height:17px;width:17px;"+(a.rtl?"left":"right")+":17px;background:url("+e+") center no-repeat "+a.boxColor+";cursor:pointer;"+(D.hc?"font-size: 15px;line-height:14px;border:1px solid #fff;text-align:center;":"")+(D.hidpi?"background-size: 9px 10px;":""),looks:["top:-8px; border-radius: 2px;","top:-17px; border-radius: 2px 2px 0px 0px;","top:-1px; border-radius: 0px 0px 2px 2px;"]}),A(E(ba,b),{base:K+
+"left:0px;border-left-color:"+a.boxColor+";",looks:["border-width:8px 0 8px 8px;top:-8px","border-width:8px 0 0 8px;top:-8px","border-width:0 0 8px 8px;top:0px"]}),A(E(ba,b),{base:K+"right:0px;border-right-color:"+a.boxColor+";",looks:["border-width:8px 8px 8px 0;top:-8px","border-width:8px 8px 0 0;top:-8px","border-width:0 8px 8px 0;top:0px"]})],detach:function(){this.wrap.getParent()&&this.wrap.remove();return this},mouseNear:function(){t(a,this);var b=a.holdDistance,d=this.size;return d&&m(a.mouse.y,
+d.top-b,d.bottom+b)&&m(a.mouse.x,d.left-b,d.right+b)?!0:!1},place:function(){var b=a.view,d=a.editable,c=a.trigger,e=c.upper,g=c.lower,f=e||g,h=f.getParent(),k={};this.trigger=c;e&&t(a,e,!0);g&&t(a,g,!0);t(a,h,!0);a.inInlineMode&&x(a,!0);h.equals(d)?(k.left=b.scroll.x,k.right=-b.scroll.x,k.width=""):(k.left=f.size.left-f.size.margin.left+b.scroll.x-(a.inInlineMode?b.editable.left+b.editable.border.left:0),k.width=f.size.outerWidth+f.size.margin.left+f.size.margin.right+b.scroll.x,k.right="");e&&g?
+k.top=e.size.margin.bottom===g.size.margin.top?0|e.size.bottom+e.size.margin.bottom/2:e.size.margin.bottom<g.size.margin.top?e.size.bottom+e.size.margin.bottom:e.size.bottom+e.size.margin.bottom-g.size.margin.top:e?g||(k.top=e.size.bottom+e.size.margin.bottom):k.top=g.size.top-g.size.margin.top;c.is(R)||m(k.top,b.scroll.y-15,b.scroll.y+5)?(k.top=a.inInlineMode?0:b.scroll.y,this.look(R)):c.is(O)||m(k.top,b.pane.bottom-5,b.pane.bottom+15)?(k.top=a.inInlineMode?b.editable.height+b.editable.padding.top+
+b.editable.padding.bottom:b.pane.bottom-1,this.look(O)):(a.inInlineMode&&(k.top-=b.editable.top+b.editable.border.top),this.look(T));a.inInlineMode&&(k.top--,k.top+=b.editable.scroll.top,k.left+=b.editable.scroll.left);for(var l in k)k[l]=CKEDITOR.tools.cssLength(k[l]);this.setStyles(k)},look:function(a){if(this.oldLook!=a){for(var b=this.lineChildren.length,d;b--;)(d=this.lineChildren[b]).setAttribute("style",d.base+d.looks[0|a/2]);this.oldLook=a}},wrap:new C("span",a.doc)});for(b=c.lineChildren.length;b--;)c.lineChildren[b].appendTo(c);
+c.look(T);c.appendTo(c.wrap);c.unselectable();c.lineChildren[0].on("mouseup",function(b){c.detach();d(a,function(b){var d=a.line.trigger;b[d.is(P)?"insertBefore":"insertAfter"](d.is(P)?d.lower:d.upper)},!0);a.editor.focus();D.ie||a.enterMode==CKEDITOR.ENTER_BR||a.hotNode.scrollIntoView();b.data.preventDefault(!0)});c.on("mousedown",function(a){a.data.preventDefault(!0)});a.line=c}function d(a,b,d){var c=new CKEDITOR.dom.range(a.doc),e=a.editor,g;D.ie&&a.enterMode==CKEDITOR.ENTER_BR?g=a.doc.createText(V):
+(g=(g=l(a.element,!0))&&g.data("cke-enter-mode")||a.enterMode,g=new C(M[g],a.doc),g.is("br")||a.doc.createText(V).appendTo(g));d&&e.fire("saveSnapshot");b(g);c.moveToPosition(g,CKEDITOR.POSITION_AFTER_START);e.getSelection().selectRanges([c]);a.hotNode=g;d&&e.fire("saveSnapshot")}function b(a,b){return{canUndo:!0,modes:{wysiwyg:1},exec:function(){function e(c){var g=D.ie&&9>D.version?" ":V,f=a.hotNode&&a.hotNode.getText()==g&&a.element.equals(a.hotNode)&&a.lastCmdDirection===!!b;d(a,function(d){f&&
+a.hotNode&&a.hotNode.remove();d[b?"insertAfter":"insertBefore"](c);d.setAttributes({"data-cke-magicline-hot":1,"data-cke-magicline-dir":!!b});a.lastCmdDirection=!!b});D.ie||a.enterMode==CKEDITOR.ENTER_BR||a.hotNode.scrollIntoView();a.line.detach()}return function(d){d=d.getSelection().getStartElement();var g;d=d.getAscendant(J,1);if(!n(a,d)&&d&&!d.equals(a.editable)&&!d.contains(a.editable)){(g=l(d))&&"false"==g.getAttribute("contenteditable")&&(d=g);a.element=d;g=h(a,d,!b);var f;p(g)&&g.is(a.triggers)&&
+g.is(N)&&(!h(a,g,!b)||(f=h(a,g,!b))&&p(f)&&f.is(a.triggers))?e(g):(f=c(a,d),p(f)&&(h(a,f,!b)?(d=h(a,f,!b))&&p(d)&&d.is(a.triggers)&&e(f):e(f)))}}}()}}function g(a,b){if(!b||b.type!=CKEDITOR.NODE_ELEMENT||!b.$)return!1;var d=a.line;return d.wrap.equals(b)||d.wrap.contains(b)}function p(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.$}function v(a){if(!p(a))return!1;var b;(b=r(a))||(p(a)?(b={left:1,right:1,center:1},b=!(!b[a.getComputedStyle("float")]&&!b[a.getAttribute("align")])):b=!1);return b}function r(a){return!!{absolute:1,
+fixed:1}[a.getComputedStyle("position")]}function w(a,b){return p(b)?b.is(a.triggers):null}function n(a,b){if(!b)return!1;for(var d=b.getParents(1),c=d.length;c--;)for(var e=a.tabuList.length;e--;)if(d[c].hasAttribute(a.tabuList[e]))return!0;return!1}function q(a,b,d){b=b[d?"getLast":"getFirst"](function(b){return a.isRelevant(b)&&!b.is(X)});if(!b)return!1;t(a,b);return d?b.size.top>a.mouse.y:b.size.bottom<a.mouse.y}function u(a){var b=a.editable,d=a.mouse,c=a.view,f=a.triggerOffset;x(a);var k=d.y>
+(a.inInlineMode?c.editable.top+c.editable.height/2:Math.min(c.editable.height,c.pane.height)/2),b=b[k?"getLast":"getFirst"](function(a){return!(ca(a)||da(a))});if(!b)return null;g(a,b)&&(b=a.line.wrap[k?"getPrevious":"getNext"](function(a){return!(ca(a)||da(a))}));if(!p(b)||v(b)||!w(a,b))return null;t(a,b);return!k&&0<=b.size.top&&m(d.y,0,b.size.top+f)?(a=a.inInlineMode||0===c.scroll.y?R:T,new e([null,b,P,L,a])):k&&b.size.bottom<=c.pane.height&&m(d.y,b.size.bottom-f,c.pane.height)?(a=a.inInlineMode||
+m(b.size.bottom,c.pane.height-f,c.pane.height)?O:T,new e([b,null,G,L,a])):null}function B(a){var b=a.mouse,d=a.view,g=a.triggerOffset,f=c(a);if(!f)return null;t(a,f);var g=Math.min(g,0|f.size.outerHeight/2),k=[],l,n;if(m(b.y,f.size.top-1,f.size.top+g))n=!1;else if(m(b.y,f.size.bottom-g,f.size.bottom+1))n=!0;else return null;if(v(f)||q(a,f,n)||f.getParent().is(W))return null;var J=h(a,f,!n);if(J){if(J&&J.type==CKEDITOR.NODE_TEXT)return null;if(p(J)){if(v(J)||!w(a,J)||J.getParent().is(W))return null;
+k=[J,f][n?"reverse":"concat"]().concat([S,L])}}else f.equals(a.editable[n?"getLast":"getFirst"](a.isRelevant))?(x(a),n&&m(b.y,f.size.bottom-g,d.pane.height)&&m(f.size.bottom,d.pane.height-g,d.pane.height)?l=O:m(b.y,0,f.size.top+g)&&(l=R)):l=T,k=[null,f][n?"reverse":"concat"]().concat([n?G:P,L,l,f.equals(a.editable[n?"getLast":"getFirst"](a.isRelevant))?n?O:R:T]);return 0 in k?new e(k):null}function y(a,b,d,c){for(var e=b.getDocumentPosition(),g={},f={},k={},h={},l=ea.length;l--;)g[ea[l]]=parseInt(b.getComputedStyle.call(b,
+"border-"+ea[l]+"-width"),10)||0,k[ea[l]]=parseInt(b.getComputedStyle.call(b,"padding-"+ea[l]),10)||0,f[ea[l]]=parseInt(b.getComputedStyle.call(b,"margin-"+ea[l]),10)||0;d&&!c||F(a,c);h.top=e.y-(d?0:a.view.scroll.y);h.left=e.x-(d?0:a.view.scroll.x);h.outerWidth=b.$.offsetWidth;h.outerHeight=b.$.offsetHeight;h.height=h.outerHeight-(k.top+k.bottom+g.top+g.bottom);h.width=h.outerWidth-(k.left+k.right+g.left+g.right);h.bottom=h.top+h.outerHeight;h.right=h.left+h.outerWidth;a.inInlineMode&&(h.scroll={top:b.$.scrollTop,
+left:b.$.scrollLeft});return A({border:g,padding:k,margin:f,ignoreScroll:d},h,!0)}function t(a,b,d){if(!p(b))return b.size=null;if(!b.size)b.size={};else if(b.size.ignoreScroll==d&&b.size.date>new Date-Q)return null;return A(b.size,y(a,b,d),{date:+new Date},!0)}function x(a,b){a.view.editable=y(a,a.editable,b,!0)}function F(a,b){a.view||(a.view={});var d=a.view;if(!(!b&&d&&d.date>new Date-Q)){var c=a.win,d=c.getScrollPosition(),c=c.getViewPaneSize();A(a.view,{scroll:{x:d.x,y:d.y,width:a.doc.$.documentElement.scrollWidth-
+c.width,height:a.doc.$.documentElement.scrollHeight-c.height},pane:{width:c.width,height:c.height,bottom:c.height+d.y},date:+new Date},!0)}}function z(a,b,d,c){for(var g=c,f=c,k=0,h=!1,l=!1,n=a.view.pane.height,m=a.mouse;m.y+k<n&&0<m.y-k;){h||(h=b(g,c));l||(l=b(f,c));!h&&0<m.y-k&&(g=d(a,{x:m.x,y:m.y-k}));!l&&m.y+k<n&&(f=d(a,{x:m.x,y:m.y+k}));if(h&&l)break;k+=2}return new e([g,f,null,null])}CKEDITOR.plugins.add("magicline",{init:function(a){var f=a.config,l=f.magicline_triggerOffset||30,m={editor:a,
+enterMode:f.enterMode,triggerOffset:l,holdDistance:0|l*(f.magicline_holdDistance||.5),boxColor:f.magicline_color||"#ff0000",rtl:"rtl"==f.contentsLangDirection,tabuList:["data-cke-hidden-sel"].concat(f.magicline_tabuList||[]),triggers:f.magicline_everywhere?J:{table:1,hr:1,div:1,ul:1,ol:1,dl:1,form:1,blockquote:1}},q,w,t;m.isRelevant=function(a){return p(a)&&!g(m,a)&&!v(a)};a.on("contentDom",function(){var l=a.editable(),J=a.document,p=a.window;A(m,{editable:l,inInlineMode:l.isInline(),doc:J,win:p,
+hotNode:null},!0);m.boundary=m.inInlineMode?m.editable:m.doc.getDocumentElement();l.is(H.$inline)||(m.inInlineMode&&!r(l)&&l.setStyles({position:"relative",top:null,left:null}),k.call(this,m),F(m),l.attachListener(a,"beforeUndoImage",function(){m.line.detach()}),l.attachListener(a,"beforeGetData",function(){m.line.wrap.getParent()&&(m.line.detach(),a.once("getData",function(){m.line.attach()},null,null,1E3))},null,null,0),l.attachListener(m.inInlineMode?J:J.getWindow().getFrame(),"mouseout",function(b){if("wysiwyg"==
+a.mode)if(m.inInlineMode){var d=b.data.$.clientX;b=b.data.$.clientY;F(m);x(m,!0);var c=m.view.editable,e=m.view.scroll;d>c.left-e.x&&d<c.right-e.x&&b>c.top-e.y&&b<c.bottom-e.y||(clearTimeout(t),t=null,m.line.detach())}else clearTimeout(t),t=null,m.line.detach()}),l.attachListener(l,"keyup",function(){m.hiddenMode=0}),l.attachListener(l,"keydown",function(b){if("wysiwyg"==a.mode)switch(b.data.getKeystroke()){case 2228240:case 16:m.hiddenMode=1,m.line.detach()}}),l.attachListener(m.inInlineMode?l:J,
+"mousemove",function(b){w=!0;if("wysiwyg"==a.mode&&!a.readOnly&&!t){var d={x:b.data.$.clientX,y:b.data.$.clientY};t=setTimeout(function(){m.mouse=d;t=m.trigger=null;F(m);w&&!m.hiddenMode&&a.focusManager.hasFocus&&!m.line.mouseNear()&&(m.element=Y(m,!0))&&((m.trigger=u(m)||B(m)||aa(m))&&!n(m,m.trigger.upper||m.trigger.lower)?m.line.attach().place():(m.trigger=null,m.line.detach()),w=!1)},30)}}),l.attachListener(p,"scroll",function(){"wysiwyg"==a.mode&&(m.line.detach(),D.webkit&&(m.hiddenMode=1,clearTimeout(q),
+q=setTimeout(function(){m.mouseDown||(m.hiddenMode=0)},50)))}),l.attachListener(I?J:p,"mousedown",function(){"wysiwyg"==a.mode&&(m.line.detach(),m.hiddenMode=1,m.mouseDown=1)}),l.attachListener(I?J:p,"mouseup",function(){m.hiddenMode=0;m.mouseDown=0}),a.addCommand("accessPreviousSpace",b(m)),a.addCommand("accessNextSpace",b(m,!0)),a.setKeystroke([[f.magicline_keystrokePrevious,"accessPreviousSpace"],[f.magicline_keystrokeNext,"accessNextSpace"]]),a.on("loadSnapshot",function(){var b,d,c,e;for(e in{p:1,
+br:1,div:1})for(b=a.document.getElementsByTag(e),c=b.count();c--;)if((d=b.getItem(c)).data("cke-magicline-hot")){m.hotNode=d;m.lastCmdDirection="true"===d.data("cke-magicline-dir")?!0:!1;return}}),this.backdoor={accessFocusSpace:d,boxTrigger:e,isLine:g,getAscendantTrigger:c,getNonEmptyNeighbour:h,getSize:y,that:m,triggerEdge:B,triggerEditable:u,triggerExpand:aa})},this)}});var A=CKEDITOR.tools.extend,C=CKEDITOR.dom.element,E=C.createFromHtml,D=CKEDITOR.env,I=CKEDITOR.env.ie&&9>CKEDITOR.env.version,
+H=CKEDITOR.dtd,M={},P=128,G=64,S=32,L=16,R=4,O=2,T=1,V=" ",W=H.$listItem,X=H.$tableContent,N=A({},H.$nonEditable,H.$empty),J=H.$block,Q=100,U="width:0px;height:0px;padding:0px;margin:0px;display:block;z-index:9999;color:#fff;position:absolute;font-size: 0px;line-height:0px;",K=U+"border-color:transparent;display:block;border-style:solid;",ba="\x3cspan\x3e"+V+"\x3c/span\x3e";M[CKEDITOR.ENTER_BR]="br";M[CKEDITOR.ENTER_P]="p";M[CKEDITOR.ENTER_DIV]="div";e.prototype={set:function(a,b,d){this.properties=
+a+b+(d||T);return this},is:function(a){return(this.properties&a)==a}};var Y=function(){function a(b,d){var c=b.$.elementFromPoint(d.x,d.y);return c&&c.nodeType?new CKEDITOR.dom.element(c):null}return function(b,d,c){if(!b.mouse)return null;var e=b.doc,f=b.line.wrap;c=c||b.mouse;var k=a(e,c);d&&g(b,k)&&(f.hide(),k=a(e,c),f.show());return!k||k.type!=CKEDITOR.NODE_ELEMENT||!k.$||D.ie&&9>D.version&&!b.boundary.equals(k)&&!b.boundary.contains(k)?null:k}}(),ca=CKEDITOR.dom.walker.whitespaces(),da=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_COMMENT),
+aa=function(){function b(c){var e=c.element,g,k,h;if(!p(e)||e.contains(c.editable)||e.isReadOnly())return null;h=z(c,function(a,b){return!b.equals(a)},function(a,b){return Y(a,!0,b)},e);g=h.upper;k=h.lower;if(a(c,g,k))return h.set(S,8);if(g&&e.contains(g))for(;!g.getParent().equals(e);)g=g.getParent();else g=e.getFirst(function(a){return d(c,a)});if(k&&e.contains(k))for(;!k.getParent().equals(e);)k=k.getParent();else k=e.getLast(function(a){return d(c,a)});if(!g||!k)return null;t(c,g);t(c,k);if(!m(c.mouse.y,
+g.size.top,k.size.bottom))return null;for(var e=Number.MAX_VALUE,l,n,q,J;k&&!k.equals(g)&&(n=g.getNext(c.isRelevant));)l=Math.abs(f(c,g,n)-c.mouse.y),l<e&&(e=l,q=g,J=n),g=n,t(c,g);if(!q||!J||!m(c.mouse.y,q.size.top,J.size.bottom))return null;h.upper=q;h.lower=J;return h.set(S,8)}function d(a,b){return!(b&&b.type==CKEDITOR.NODE_TEXT||da(b)||v(b)||g(a,b)||b.type==CKEDITOR.NODE_ELEMENT&&b.$&&b.is("br"))}return function(d){var c=b(d),e;if(e=c){e=c.upper;var g=c.lower;e=!e||!g||v(g)||v(e)||g.equals(e)||
+e.equals(g)||g.contains(e)||e.contains(g)?!1:w(d,e)&&w(d,g)&&a(d,e,g)?!0:!1}return e?c:null}}(),ea=["top","left","right","bottom"]}(),CKEDITOR.config.magicline_keystrokePrevious=CKEDITOR.CTRL+CKEDITOR.SHIFT+51,CKEDITOR.config.magicline_keystrokeNext=CKEDITOR.CTRL+CKEDITOR.SHIFT+52,function(){function a(a){if(!a||a.type!=CKEDITOR.NODE_ELEMENT||"form"!=a.getName())return[];for(var c=[],e=["style","className"],d=0;d<e.length;d++){var b=a.$.elements.namedItem(e[d]);b&&(b=new CKEDITOR.dom.element(b),c.push([b,
+b.nextSibling]),b.remove())}return c}function e(a,c){if(a&&a.type==CKEDITOR.NODE_ELEMENT&&"form"==a.getName()&&0<c.length)for(var e=c.length-1;0<=e;e--){var d=c[e][0],b=c[e][1];b?d.insertBefore(b):d.appendTo(a)}}function c(c,f){var k=a(c),d={},b=c.$;f||(d["class"]=b.className||"",b.className="");d.inline=b.style.cssText||"";f||(b.style.cssText="position: static; overflow: visible");e(k);return d}function f(c,f){var k=a(c),d=c.$;"class"in f&&(d.className=f["class"]);"inline"in f&&(d.style.cssText=
+f.inline);e(k)}function h(a){if(!a.editable().isInline()){var c=CKEDITOR.instances,e;for(e in c){var d=c[e];"wysiwyg"!=d.mode||d.readOnly||(d=d.document.getBody(),d.setAttribute("contentEditable",!1),d.setAttribute("contentEditable",!0))}a.editable().hasFocus&&(a.toolbox.focus(),a.focus())}}CKEDITOR.plugins.add("maximize",{init:function(a){function e(){var d=b.getViewPaneSize();a.resize(d.width,d.height,null,!0)}if(a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var k=a.lang,d=CKEDITOR.document,b=d.getWindow(),
+g,p,v,r=CKEDITOR.TRISTATE_OFF;a.addCommand("maximize",{modes:{wysiwyg:!CKEDITOR.env.iOS,source:!CKEDITOR.env.iOS},readOnly:1,editorFocus:!1,exec:function(){var w=a.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}),n=a.ui.space("contents");if("wysiwyg"==a.mode){var q=a.getSelection();g=q&&q.getRanges();p=b.getScrollPosition()}else{var u=a.editable().$;g=!CKEDITOR.env.ie&&[u.selectionStart,u.selectionEnd];p=[u.scrollLeft,u.scrollTop]}if(this.state==CKEDITOR.TRISTATE_OFF){b.on("resize",
+e);v=b.getScrollPosition();for(q=a.container;q=q.getParent();)q.setCustomData("maximize_saved_styles",c(q)),q.setStyle("z-index",a.config.baseFloatZIndex-5);n.setCustomData("maximize_saved_styles",c(n,!0));w.setCustomData("maximize_saved_styles",c(w,!0));n={overflow:CKEDITOR.env.webkit?"":"hidden",width:0,height:0};d.getDocumentElement().setStyles(n);!CKEDITOR.env.gecko&&d.getDocumentElement().setStyle("position","fixed");CKEDITOR.env.gecko&&CKEDITOR.env.quirks||d.getBody().setStyles(n);CKEDITOR.env.ie?
+setTimeout(function(){b.$.scrollTo(0,0)},0):b.$.scrollTo(0,0);w.setStyle("position",CKEDITOR.env.gecko&&CKEDITOR.env.quirks?"fixed":"absolute");w.$.offsetLeft;w.setStyles({"z-index":a.config.baseFloatZIndex-5,left:"0px",top:"0px"});w.addClass("cke_maximized");e();n=w.getDocumentPosition();w.setStyles({left:-1*n.x+"px",top:-1*n.y+"px"});CKEDITOR.env.gecko&&h(a)}else if(this.state==CKEDITOR.TRISTATE_ON){b.removeListener("resize",e);for(var q=[n,w],B=0;B<q.length;B++)f(q[B],q[B].getCustomData("maximize_saved_styles")),
+q[B].removeCustomData("maximize_saved_styles");for(q=a.container;q=q.getParent();)f(q,q.getCustomData("maximize_saved_styles")),q.removeCustomData("maximize_saved_styles");CKEDITOR.env.ie?setTimeout(function(){b.$.scrollTo(v.x,v.y)},0):b.$.scrollTo(v.x,v.y);w.removeClass("cke_maximized");CKEDITOR.env.webkit&&(w.setStyle("display","inline"),setTimeout(function(){w.setStyle("display","block")},0));a.fire("resize",{outerHeight:a.container.$.offsetHeight,contentsHeight:n.$.offsetHeight,outerWidth:a.container.$.offsetWidth})}this.toggleState();
+if(q=this.uiItems[0])n=this.state==CKEDITOR.TRISTATE_OFF?k.maximize.maximize:k.maximize.minimize,q=CKEDITOR.document.getById(q._.id),q.getChild(1).setHtml(n),q.setAttribute("title",n),q.setAttribute("href",'javascript:void("'+n+'");');"wysiwyg"==a.mode?g?(CKEDITOR.env.gecko&&h(a),a.getSelection().selectRanges(g),(u=a.getSelection().getStartElement())&&u.scrollIntoView(!0)):b.$.scrollTo(p.x,p.y):(g&&(u.selectionStart=g[0],u.selectionEnd=g[1]),u.scrollLeft=p[0],u.scrollTop=p[1]);g=p=null;r=this.state;
+a.fire("maximize",this.state)},canUndo:!1});a.ui.addButton&&a.ui.addButton("Maximize",{label:k.maximize.maximize,command:"maximize",toolbar:"tools,10"});a.on("mode",function(){var b=a.getCommand("maximize");b.setState(b.state==CKEDITOR.TRISTATE_DISABLED?CKEDITOR.TRISTATE_DISABLED:r)},null,null,100)}}})}(),function(){var a={canUndo:!1,async:!0,exec:function(e){e.getClipboardData({title:e.lang.pastetext.title},function(c){c&&e.fire("paste",{type:"text",dataValue:c.dataValue,method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});
+e.fire("afterCommandExec",{name:"pastetext",command:a,returnValue:!!c})})}};CKEDITOR.plugins.add("pastetext",{requires:"clipboard",init:function(e){e.addCommand("pastetext",a);e.ui.addButton&&e.ui.addButton("PasteText",{label:e.lang.pastetext.button,command:"pastetext",toolbar:"clipboard,40"});if(e.config.forcePasteAsPlainText)e.on("beforePaste",function(a){"html"!=a.data.type&&(a.data.type="text")});e.on("pasteState",function(a){e.getCommand("pastetext").setState(a.data)})}})}(),function(){function a(a,
+e,h){var m=CKEDITOR.cleanWord;m?h():(a=CKEDITOR.getUrl(a.config.pasteFromWordCleanupFile||e+"filter/default.js"),CKEDITOR.scriptLoader.load(a,h,null,!0));return!m}function e(a){a.data.type="html"}CKEDITOR.plugins.add("pastefromword",{requires:"clipboard",init:function(c){var f=0,h=this.path;c.addCommand("pastefromword",{canUndo:!1,async:!0,exec:function(a){var c=this;f=1;a.once("beforePaste",e);a.getClipboardData({title:a.lang.pastefromword.title},function(e){e&&a.fire("paste",{type:"html",dataValue:e.dataValue,
+method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});a.fire("afterCommandExec",{name:"pastefromword",command:c,returnValue:!!e})})}});c.ui.addButton&&c.ui.addButton("PasteFromWord",{label:c.lang.pastefromword.toolbar,command:"pastefromword",toolbar:"clipboard,50"});c.on("pasteState",function(a){c.getCommand("pastefromword").setState(a.data)});c.on("paste",function(e){var l=e.data,k=l.dataValue,d=/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument|<o:\w+>|<\/font>)/,b={dataValue:k};
+if(k&&(f||d.test(k))&&(!1!==c.fire("pasteFromWord",b)||f)){l.dontFilter=!0;var g=a(c,h,function(){if(g)c.fire("paste",l);else if(!c.config.pasteFromWordPromptCleanup||f||confirm(c.lang.pastefromword.confirmCleanup))b.dataValue=CKEDITOR.cleanWord(b.dataValue,c),c.fire("afterPasteFromWord",b),l.dataValue=b.dataValue;f=0});g&&e.cancel()}},null,null,3)}})}(),CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&
+a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}}),CKEDITOR.plugins.removeformat={commands:{removeformat:{exec:function(a){for(var e=a._.removeFormatRegex||(a._.removeFormatRegex=new RegExp("^(?:"+a.config.removeFormatTags.replace(/,/g,"|")+")$","i")),c=a._.removeAttributes||(a._.removeAttributes=a.config.removeFormatAttributes.split(",")),f=CKEDITOR.plugins.removeformat.filter,h=a.getSelection().getRanges(),m=h.createIterator(),l=function(a){return a.type==
+CKEDITOR.NODE_ELEMENT},k;k=m.getNextRange();){k.collapsed||k.enlarge(CKEDITOR.ENLARGE_ELEMENT);var d=k.createBookmark(),b=d.startNode,g=d.endNode,p=function(b){for(var d=a.elementPath(b),c=d.elements,g=1,k;(k=c[g])&&!k.equals(d.block)&&!k.equals(d.blockLimit);g++)e.test(k.getName())&&f(a,k)&&b.breakParent(k)};p(b);if(g)for(p(g),b=b.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT);b&&!b.equals(g);)if(b.isReadOnly()){if(b.getPosition(g)&CKEDITOR.POSITION_CONTAINS)break;b=b.getNext(l)}else p=b.getNextSourceNode(!1,
+CKEDITOR.NODE_ELEMENT),"img"==b.getName()&&b.data("cke-realelement")||!f(a,b)||(e.test(b.getName())?b.remove(1):(b.removeAttributes(c),a.fire("removeFormatCleanup",b))),b=p;k.moveToBookmark(d)}a.forceNextSelectionCheck();a.getSelection().selectRanges(h)}}},filter:function(a,e){for(var c=a._.removeFormatFilters||[],f=0;f<c.length;f++)if(!1===c[f](e))return!1;return!0}},CKEDITOR.editor.prototype.addRemoveFormatFilter=function(a){this._.removeFormatFilters||(this._.removeFormatFilters=[]);this._.removeFormatFilters.push(a)},
+CKEDITOR.config.removeFormatTags="b,big,cite,code,del,dfn,em,font,i,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var",CKEDITOR.config.removeFormatAttributes="class,style,lang,width,height,align,hspace,valign",function(){CKEDITOR.plugins.add("sourcearea",{init:function(e){function c(){var a=h&&this.equals(CKEDITOR.document.getActive());this.hide();this.setStyle("height",this.getParent().$.clientHeight+"px");this.setStyle("width",this.getParent().$.clientWidth+"px");this.show();a&&this.focus()}
+if(e.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var f=CKEDITOR.plugins.sourcearea;e.addMode("source",function(f){var h=e.ui.space("contents").getDocument().createElement("textarea");h.setStyles(CKEDITOR.tools.extend({width:CKEDITOR.env.ie7Compat?"99%":"100%",height:"100%",resize:"none",outline:"none","text-align":"left"},CKEDITOR.tools.cssVendorPrefix("tab-size",e.config.sourceAreaTabSize||4)));h.setAttribute("dir","ltr");h.addClass("cke_source").addClass("cke_reset").addClass("cke_enable_context_menu");
+e.ui.space("contents").append(h);h=e.editable(new a(e,h));h.setData(e.getData(1));CKEDITOR.env.ie&&(h.attachListener(e,"resize",c,h),h.attachListener(CKEDITOR.document.getWindow(),"resize",c,h),CKEDITOR.tools.setTimeout(c,0,h));e.fire("ariaWidget",this);f()});e.addCommand("source",f.commands.source);e.ui.addButton&&e.ui.addButton("Source",{label:e.lang.sourcearea.toolbar,command:"source",toolbar:"mode,10"});e.on("mode",function(){e.getCommand("source").setState("source"==e.mode?CKEDITOR.TRISTATE_ON:
+CKEDITOR.TRISTATE_OFF)});var h=CKEDITOR.env.ie&&9==CKEDITOR.env.version}}});var a=CKEDITOR.tools.createClass({base:CKEDITOR.editable,proto:{setData:function(a){this.setValue(a);this.status="ready";this.editor.fire("dataReady")},getData:function(){return this.getValue()},insertHtml:function(){},insertElement:function(){},insertText:function(){},setReadOnly:function(a){this[(a?"set":"remove")+"Attribute"]("readOnly","readonly")},detach:function(){a.baseProto.detach.call(this);this.clearCustomData();
+this.remove()}}})}(),CKEDITOR.plugins.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:!1,readOnly:1,exec:function(a){"wysiwyg"==a.mode&&a.fire("saveSnapshot");a.getCommand("source").setState(CKEDITOR.TRISTATE_DISABLED);a.setMode("source"==a.mode?"wysiwyg":"source")},canUndo:!1}}},CKEDITOR.plugins.add("specialchar",{availableLangs:{af:1,ar:1,az:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fr:1,"fr-ca":1,gl:1,he:1,hr:1,hu:1,id:1,it:1,
+ja:1,km:1,ko:1,ku:1,lt:1,lv:1,nb:1,nl:1,no:1,oc:1,pl:1,pt:1,"pt-br":1,ru:1,si:1,sk:1,sl:1,sq:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},requires:"dialog",init:function(a){var e=this;CKEDITOR.dialog.add("specialchar",this.path+"dialogs/specialchar.js");a.addCommand("specialchar",{exec:function(){var c=a.langCode,c=e.availableLangs[c]?c:e.availableLangs[c.replace(/-.*/,"")]?c.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(e.path+"dialogs/lang/"+c+".js"),function(){CKEDITOR.tools.extend(a.lang.specialchar,
+e.langEntries[c]);a.openDialog("specialchar")})},modes:{wysiwyg:1},canUndo:!1});a.ui.addButton&&a.ui.addButton("SpecialChar",{label:a.lang.specialchar.toolbar,command:"specialchar",toolbar:"insert,50"})}}),CKEDITOR.config.specialChars="! \x26quot; # $ % \x26amp; ' ( ) * + - . / 0 1 2 3 4 5 6 7 8 9 : ; \x26lt; \x3d \x26gt; ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ \x26euro; \x26lsquo; \x26rsquo; \x26ldquo; \x26rdquo; \x26ndash; \x26mdash; \x26iexcl; \x26cent; \x26pound; \x26curren; \x26yen; \x26brvbar; \x26sect; \x26uml; \x26copy; \x26ordf; \x26laquo; \x26not; \x26reg; \x26macr; \x26deg; \x26sup2; \x26sup3; \x26acute; \x26micro; \x26para; \x26middot; \x26cedil; \x26sup1; \x26ordm; \x26raquo; \x26frac14; \x26frac12; \x26frac34; \x26iquest; \x26Agrave; \x26Aacute; \x26Acirc; \x26Atilde; \x26Auml; \x26Aring; \x26AElig; \x26Ccedil; \x26Egrave; \x26Eacute; \x26Ecirc; \x26Euml; \x26Igrave; \x26Iacute; \x26Icirc; \x26Iuml; \x26ETH; \x26Ntilde; \x26Ograve; \x26Oacute; \x26Ocirc; \x26Otilde; \x26Ouml; \x26times; \x26Oslash; \x26Ugrave; \x26Uacute; \x26Ucirc; \x26Uuml; \x26Yacute; \x26THORN; \x26szlig; \x26agrave; \x26aacute; \x26acirc; \x26atilde; \x26auml; \x26aring; \x26aelig; \x26ccedil; \x26egrave; \x26eacute; \x26ecirc; \x26euml; \x26igrave; \x26iacute; \x26icirc; \x26iuml; \x26eth; \x26ntilde; \x26ograve; \x26oacute; \x26ocirc; \x26otilde; \x26ouml; \x26divide; \x26oslash; \x26ugrave; \x26uacute; \x26ucirc; \x26uuml; \x26yacute; \x26thorn; \x26yuml; \x26OElig; \x26oelig; \x26#372; \x26#374 \x26#373 \x26#375; \x26sbquo; \x26#8219; \x26bdquo; \x26hellip; \x26trade; \x26#9658; \x26bull; \x26rarr; \x26rArr; \x26hArr; \x26diams; \x26asymp;".split(" "),
+function(){CKEDITOR.plugins.add("stylescombo",{requires:"richcombo",init:function(a){var e=a.config,c=a.lang.stylescombo,f={},h=[],m=[];a.on("stylesSet",function(c){if(c=c.data.styles){for(var k,d,b,g=0,p=c.length;g<p;g++)(k=c[g],a.blockless&&k.element in CKEDITOR.dtd.$block||"string"==typeof k.type&&!CKEDITOR.style.customHandlers[k.type]||(d=k.name,k=new CKEDITOR.style(k),a.filter.customConfig&&!a.filter.check(k)))||(k._name=d,k._.enterMode=e.enterMode,k._.type=b=k.assignedTo||k.type,k._.weight=
+g+1E3*(b==CKEDITOR.STYLE_OBJECT?1:b==CKEDITOR.STYLE_BLOCK?2:3),f[d]=k,h.push(k),m.push(k));h.sort(function(a,b){return a._.weight-b._.weight})}});a.ui.addRichCombo("Styles",{label:c.label,title:c.panelTitle,toolbar:"styles,10",allowedContent:m,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(e.contentsCss),multiSelect:!0,attributes:{"aria-label":c.panelTitle}},init:function(){var a,e,d,b,g,f;g=0;for(f=h.length;g<f;g++)a=h[g],e=a._name,b=a._.type,b!=d&&(this.startGroup(c["panelTitle"+String(b)]),
+d=b),this.add(e,a.type==CKEDITOR.STYLE_OBJECT?e:a.buildPreview(),e);this.commit()},onClick:function(c){a.focus();a.fire("saveSnapshot");c=f[c];var e=a.elementPath();if(c.group&&c.removeStylesFromSameGroup(a))a.applyStyle(c);else a[c.checkActive(e,a)?"removeStyle":"applyStyle"](c);a.fire("saveSnapshot")},onRender:function(){a.on("selectionChange",function(c){var e=this.getValue();c=c.data.path.elements;for(var d=0,b=c.length,g;d<b;d++){g=c[d];for(var h in f)if(f[h].checkElementRemovable(g,!0,a)){h!=
+e&&this.setValue(h);return}}this.setValue("")},this)},onOpen:function(){var e=a.getSelection().getSelectedElement(),e=a.elementPath(e),k=[0,0,0,0];this.showAll();this.unmarkAll();for(var d in f){var b=f[d],g=b._.type;b.checkApplicable(e,a,a.activeFilter)?k[g]++:this.hideItem(d);b.checkActive(e,a)&&this.mark(d)}k[CKEDITOR.STYLE_BLOCK]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_BLOCK)]);k[CKEDITOR.STYLE_INLINE]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_INLINE)]);k[CKEDITOR.STYLE_OBJECT]||
+this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_OBJECT)])},refresh:function(){var c=a.elementPath();if(c){for(var e in f)if(f[e].checkApplicable(c,a,a.activeFilter))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}},reset:function(){f={};h=[]}})}})}(),function(){function a(a){return{editorFocus:!1,canUndo:!1,modes:{wysiwyg:1},exec:function(c){if(c.editable().hasFocus){var e=c.getSelection(),f;if(f=(new CKEDITOR.dom.elementPath(e.getCommonAncestor(),e.root)).contains({td:1,th:1},1)){var e=c.createRange(),
+d=CKEDITOR.tools.tryThese(function(){var b=f.getParent().$.cells[f.$.cellIndex+(a?-1:1)];b.parentNode.parentNode;return b},function(){var b=f.getParent(),b=b.getAscendant("table").$.rows[b.$.rowIndex+(a?-1:1)];return b.cells[a?b.cells.length-1:0]});if(d||a)if(d)d=new CKEDITOR.dom.element(d),e.moveToElementEditStart(d),e.checkStartOfBlock()&&e.checkEndOfBlock()||e.selectNodeContents(d);else return!0;else{for(var b=f.getAscendant("table").$,d=f.getParent().$.cells,b=new CKEDITOR.dom.element(b.insertRow(-1),
+c.document),g=0,p=d.length;g<p;g++)b.append((new CKEDITOR.dom.element(d[g],c.document)).clone(!1,!1)).appendBogus();e.moveToElementEditStart(b)}e.select(!0);return!0}}return!1}}}var e={editorFocus:!1,modes:{wysiwyg:1,source:1}},c={exec:function(a){a.container.focusNext(!0,a.tabIndex)}},f={exec:function(a){a.container.focusPrevious(!0,a.tabIndex)}};CKEDITOR.plugins.add("tab",{init:function(h){for(var m=!1!==h.config.enableTabKeyTools,l=h.config.tabSpaces||0,k="";l--;)k+=" ";if(k)h.on("key",function(a){9==
+a.data.keyCode&&(h.insertText(k),a.cancel())});if(m)h.on("key",function(a){(9==a.data.keyCode&&h.execCommand("selectNextCell")||a.data.keyCode==CKEDITOR.SHIFT+9&&h.execCommand("selectPreviousCell"))&&a.cancel()});h.addCommand("blur",CKEDITOR.tools.extend(c,e));h.addCommand("blurBack",CKEDITOR.tools.extend(f,e));h.addCommand("selectNextCell",a());h.addCommand("selectPreviousCell",a(!0))}})}(),CKEDITOR.dom.element.prototype.focusNext=function(a,e){var c=void 0===e?this.getTabIndex():e,f,h,m,l,k,d;if(0>=
+c)for(k=this.getNextSourceNode(a,CKEDITOR.NODE_ELEMENT);k;){if(k.isVisible()&&0===k.getTabIndex()){m=k;break}k=k.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT)}else for(k=this.getDocument().getBody().getFirst();k=k.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!f)if(!h&&k.equals(this)){if(h=!0,a){if(!(k=k.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;f=1}}else h&&!this.contains(k)&&(f=1);if(k.isVisible()&&!(0>(d=k.getTabIndex()))){if(f&&d==c){m=k;break}d>c&&(!m||!l||d<l)?(m=k,l=d):m||0!==d||
+(m=k,l=d)}}m&&m.focus()},CKEDITOR.dom.element.prototype.focusPrevious=function(a,e){for(var c=void 0===e?this.getTabIndex():e,f,h,m,l=0,k,d=this.getDocument().getBody().getLast();d=d.getPreviousSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!f)if(!h&&d.equals(this)){if(h=!0,a){if(!(d=d.getPreviousSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;f=1}}else h&&!this.contains(d)&&(f=1);if(d.isVisible()&&!(0>(k=d.getTabIndex())))if(0>=c){if(f&&0===k){m=d;break}k>l&&(m=d,l=k)}else{if(f&&k==c){m=d;break}k<c&&(!m||
+k>l)&&(m=d,l=k)}}m&&m.focus()},CKEDITOR.plugins.add("table",{requires:"dialog",init:function(a){function e(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,c){this.setState(c.contains("table",1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}if(!a.blockless){var c=a.lang.table;a.addCommand("table",new CKEDITOR.dialogCommand("table",{context:"table",allowedContent:"table{width,height}[align,border,cellpadding,cellspacing,summary];caption tbody thead tfoot;th td tr[scope];"+
+(a.plugins.dialogadvtab?"table"+a.plugins.dialogadvtab.allowedContent():""),requiredContent:"table",contentTransformations:[["table{width}: sizeToStyle","table[width]: sizeToAttribute"],["td: splitBorderShorthand"],[{element:"table",right:function(a){a.styles&&(a.styles.border&&a.styles.border.match(/solid/)&&(a.attributes.border=1),"collapse"==a.styles["border-collapse"]&&(a.attributes.cellspacing=0))}}]]}));a.addCommand("tableProperties",new CKEDITOR.dialogCommand("tableProperties",e()));a.addCommand("tableDelete",
+e({exec:function(a){var c=a.elementPath().contains("table",1);if(c){var e=c.getParent(),l=a.editable();1!=e.getChildCount()||e.is("td","th")||e.equals(l)||(c=e);a=a.createRange();a.moveToPosition(c,CKEDITOR.POSITION_BEFORE_START);c.remove();a.select()}}}));a.ui.addButton&&a.ui.addButton("Table",{label:c.toolbar,command:"table",toolbar:"insert,30"});CKEDITOR.dialog.add("table",this.path+"dialogs/table.js");CKEDITOR.dialog.add("tableProperties",this.path+"dialogs/table.js");a.addMenuItems&&a.addMenuItems({table:{label:c.menu,
+command:"tableProperties",group:"table",order:5},tabledelete:{label:c.deleteTable,command:"tableDelete",group:"table",order:1}});a.on("doubleclick",function(a){a.data.element.is("table")&&(a.data.dialog="tableProperties")});a.contextMenu&&a.contextMenu.addListener(function(){return{tabledelete:CKEDITOR.TRISTATE_OFF,table:CKEDITOR.TRISTATE_OFF}})}}}),function(){function a(a){function b(a){0<d.length||a.type!=CKEDITOR.NODE_ELEMENT||!v.test(a.getName())||a.getCustomData("selected_cell")||(CKEDITOR.dom.element.setMarker(c,
+a,"selected_cell",!0),d.push(a))}a=a.getRanges();for(var d=[],c={},e=0;e<a.length;e++){var g=a[e];if(g.collapsed)g=g.getCommonAncestor(),(g=g.getAscendant("td",!0)||g.getAscendant("th",!0))&&d.push(g);else{var g=new CKEDITOR.dom.walker(g),f;for(g.guard=b;f=g.next();)f.type==CKEDITOR.NODE_ELEMENT&&f.is(CKEDITOR.dtd.table)||(f=f.getAscendant("td",!0)||f.getAscendant("th",!0))&&!f.getCustomData("selected_cell")&&(CKEDITOR.dom.element.setMarker(c,f,"selected_cell",!0),d.push(f))}}CKEDITOR.dom.element.clearAllMarkers(c);
+return d}function e(b,d){for(var c=a(b),e=c[0],g=e.getAscendant("table"),e=e.getDocument(),f=c[0].getParent(),k=f.$.rowIndex,c=c[c.length-1],h=c.getParent().$.rowIndex+c.$.rowSpan-1,c=new CKEDITOR.dom.element(g.$.rows[h]),k=d?k:h,f=d?f:c,c=CKEDITOR.tools.buildTableMap(g),g=c[k],k=d?c[k-1]:c[k+1],c=c[0].length,e=e.createElement("tr"),h=0;g[h]&&h<c;h++){var l;1<g[h].rowSpan&&k&&g[h]==k[h]?(l=g[h],l.rowSpan+=1):(l=(new CKEDITOR.dom.element(g[h])).clone(),l.removeAttribute("rowSpan"),l.appendBogus(),
+e.append(l),l=l.$);h+=l.colSpan-1}d?e.insertBefore(f):e.insertAfter(f)}function c(b){if(b instanceof CKEDITOR.dom.selection){var d=a(b),e=d[0].getAscendant("table"),g=CKEDITOR.tools.buildTableMap(e);b=d[0].getParent().$.rowIndex;for(var d=d[d.length-1],f=d.getParent().$.rowIndex+d.$.rowSpan-1,d=[],k=b;k<=f;k++){for(var h=g[k],l=new CKEDITOR.dom.element(e.$.rows[k]),m=0;m<h.length;m++){var p=new CKEDITOR.dom.element(h[m]),v=p.getParent().$.rowIndex;1==p.$.rowSpan?p.remove():(--p.$.rowSpan,v==k&&(v=
+g[k+1],v[m-1]?p.insertAfter(new CKEDITOR.dom.element(v[m-1])):(new CKEDITOR.dom.element(e.$.rows[k+1])).append(p,1)));m+=p.$.colSpan-1}d.push(l)}g=e.$.rows;e=new CKEDITOR.dom.element(g[f+1]||(0<b?g[b-1]:null)||e.$.parentNode);for(k=d.length;0<=k;k--)c(d[k]);return e}b instanceof CKEDITOR.dom.element&&(e=b.getAscendant("table"),1==e.$.rows.length?e.remove():b.remove());return null}function f(a,b){for(var d=b?Infinity:0,c=0;c<a.length;c++){var e;e=a[c];for(var g=b,f=e.getParent().$.cells,k=0,h=0;h<
+f.length;h++){var l=f[h],k=k+(g?1:l.colSpan);if(l==e.$)break}e=k-1;if(b?e<d:e>d)d=e}return d}function h(b,d){for(var c=a(b),e=c[0].getAscendant("table"),g=f(c,1),c=f(c),g=d?g:c,k=CKEDITOR.tools.buildTableMap(e),e=[],c=[],h=k.length,l=0;l<h;l++)e.push(k[l][g]),c.push(d?k[l][g-1]:k[l][g+1]);for(l=0;l<h;l++)e[l]&&(1<e[l].colSpan&&c[l]==e[l]?(g=e[l],g.colSpan+=1):(g=(new CKEDITOR.dom.element(e[l])).clone(),g.removeAttribute("colSpan"),g.appendBogus(),g[d?"insertBefore":"insertAfter"].call(g,new CKEDITOR.dom.element(e[l])),
+g=g.$),l+=g.rowSpan-1)}function m(a,b){var d=a.getStartElement();if(d=d.getAscendant("td",1)||d.getAscendant("th",1)){var c=d.clone();c.appendBogus();b?c.insertBefore(d):c.insertAfter(d)}}function l(b){if(b instanceof CKEDITOR.dom.selection){b=a(b);var d=b[0]&&b[0].getAscendant("table"),c;a:{var e=0;c=b.length-1;for(var g={},f,h;f=b[e++];)CKEDITOR.dom.element.setMarker(g,f,"delete_cell",!0);for(e=0;f=b[e++];)if((h=f.getPrevious())&&!h.getCustomData("delete_cell")||(h=f.getNext())&&!h.getCustomData("delete_cell")){CKEDITOR.dom.element.clearAllMarkers(g);
+c=h;break a}CKEDITOR.dom.element.clearAllMarkers(g);h=b[0].getParent();(h=h.getPrevious())?c=h.getLast():(h=b[c].getParent(),c=(h=h.getNext())?h.getChild(0):null)}for(h=b.length-1;0<=h;h--)l(b[h]);c?k(c,!0):d&&d.remove()}else b instanceof CKEDITOR.dom.element&&(d=b.getParent(),1==d.getChildCount()?d.remove():b.remove())}function k(a,b){var d=a.getDocument(),c=CKEDITOR.document;CKEDITOR.env.ie&&10==CKEDITOR.env.version&&(c.focus(),d.focus());d=new CKEDITOR.dom.range(d);d["moveToElementEdit"+(b?"End":
+"Start")](a)||(d.selectNodeContents(a),d.collapse(b?!1:!0));d.select(!0)}function d(a,b,d){a=a[b];if("undefined"==typeof d)return a;for(b=0;a&&b<a.length;b++){if(d.is&&a[b]==d.$)return b;if(b==d)return new CKEDITOR.dom.element(a[b])}return d.is?-1:null}function b(b,c,e){var g=a(b),f;if((c?1!=g.length:2>g.length)||(f=b.getCommonAncestor())&&f.type==CKEDITOR.NODE_ELEMENT&&f.is("table"))return!1;var k;b=g[0];f=b.getAscendant("table");var h=CKEDITOR.tools.buildTableMap(f),l=h.length,m=h[0].length,p=b.getParent().$.rowIndex,
+v=d(h,p,b);if(c){var A;try{var C=parseInt(b.getAttribute("rowspan"),10)||1;k=parseInt(b.getAttribute("colspan"),10)||1;A=h["up"==c?p-C:"down"==c?p+C:p]["left"==c?v-k:"right"==c?v+k:v]}catch(E){return!1}if(!A||b.$==A)return!1;g["up"==c||"left"==c?"unshift":"push"](new CKEDITOR.dom.element(A))}c=b.getDocument();var D=p,C=A=0,I=!e&&new CKEDITOR.dom.documentFragment(c),H=0;for(c=0;c<g.length;c++){k=g[c];var M=k.getParent(),P=k.getFirst(),G=k.$.colSpan,S=k.$.rowSpan,M=M.$.rowIndex,L=d(h,M,k),H=H+G*S,C=
+Math.max(C,L-v+G);A=Math.max(A,M-p+S);e||(G=k,(S=G.getBogus())&&S.remove(),G.trim(),k.getChildren().count()&&(M==D||!P||P.isBlockBoundary&&P.isBlockBoundary({br:1})||(D=I.getLast(CKEDITOR.dom.walker.whitespaces(!0)),!D||D.is&&D.is("br")||I.append("br")),k.moveChildren(I)),c?k.remove():k.setHtml(""));D=M}if(e)return A*C==H;I.moveChildren(b);b.appendBogus();C>=m?b.removeAttribute("rowSpan"):b.$.rowSpan=A;A>=l?b.removeAttribute("colSpan"):b.$.colSpan=C;e=new CKEDITOR.dom.nodeList(f.$.rows);g=e.count();
+for(c=g-1;0<=c;c--)f=e.getItem(c),f.$.cells.length||(f.remove(),g++);return b}function g(b,c){var e=a(b);if(1<e.length)return!1;if(c)return!0;var e=e[0],g=e.getParent(),f=g.getAscendant("table"),k=CKEDITOR.tools.buildTableMap(f),h=g.$.rowIndex,l=d(k,h,e),m=e.$.rowSpan,p;if(1<m){p=Math.ceil(m/2);for(var m=Math.floor(m/2),g=h+p,f=new CKEDITOR.dom.element(f.$.rows[g]),k=d(k,g),v,g=e.clone(),h=0;h<k.length;h++)if(v=k[h],v.parentNode==f.$&&h>l){g.insertBefore(new CKEDITOR.dom.element(v));break}else v=
+null;v||f.append(g)}else for(m=p=1,f=g.clone(),f.insertAfter(g),f.append(g=e.clone()),v=d(k,h),l=0;l<v.length;l++)v[l].rowSpan++;g.appendBogus();e.$.rowSpan=p;g.$.rowSpan=m;1==p&&e.removeAttribute("rowSpan");1==m&&g.removeAttribute("rowSpan");return g}function p(b,c){var e=a(b);if(1<e.length)return!1;if(c)return!0;var e=e[0],g=e.getParent(),f=g.getAscendant("table"),f=CKEDITOR.tools.buildTableMap(f),k=d(f,g.$.rowIndex,e),h=e.$.colSpan;if(1<h)g=Math.ceil(h/2),h=Math.floor(h/2);else{for(var h=g=1,l=
+[],m=0;m<f.length;m++){var p=f[m];l.push(p[k]);1<p[k].rowSpan&&(m+=p[k].rowSpan-1)}for(f=0;f<l.length;f++)l[f].colSpan++}f=e.clone();f.insertAfter(e);f.appendBogus();e.$.colSpan=g;f.$.colSpan=h;1==g&&e.removeAttribute("colSpan");1==h&&f.removeAttribute("colSpan");return f}var v=/^(?:td|th)$/;CKEDITOR.plugins.tabletools={requires:"table,dialog,contextmenu",init:function(d){function f(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,b){this.setState(b.contains({td:1,th:1},
+1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}function n(a,b){var c=d.addCommand(a,b);d.addFeature(c)}var q=d.lang.table;n("cellProperties",new CKEDITOR.dialogCommand("cellProperties",f({allowedContent:"td th{width,height,border-color,background-color,white-space,vertical-align,text-align}[colspan,rowspan]",requiredContent:"table",contentTransformations:[[{element:"td",left:function(a){return a.styles.background&&a.styles.background.match(/^(#[a-fA-F0-9]{3,6}|rgb\([\d, ]+\)|\w+)$/)},right:function(a){a.styles["background-color"]=
+a.styles.background}}]]})));CKEDITOR.dialog.add("cellProperties",this.path+"dialogs/tableCell.js");n("rowDelete",f({requiredContent:"table",exec:function(a){a=a.getSelection();k(c(a))}}));n("rowInsertBefore",f({requiredContent:"table",exec:function(a){a=a.getSelection();e(a,!0)}}));n("rowInsertAfter",f({requiredContent:"table",exec:function(a){a=a.getSelection();e(a)}}));n("columnDelete",f({requiredContent:"table",exec:function(b){b=b.getSelection();b=a(b);var d=b[0],c=b[b.length-1];b=d.getAscendant("table");
+for(var e=CKEDITOR.tools.buildTableMap(b),g,f,h=[],l=0,m=e.length;l<m;l++)for(var n=0,p=e[l].length;n<p;n++)e[l][n]==d.$&&(g=n),e[l][n]==c.$&&(f=n);for(l=g;l<=f;l++)for(n=0;n<e.length;n++)c=e[n],d=new CKEDITOR.dom.element(b.$.rows[n]),c=new CKEDITOR.dom.element(c[l]),c.$&&(1==c.$.colSpan?c.remove():--c.$.colSpan,n+=c.$.rowSpan-1,d.$.cells.length||h.push(d));f=b.$.rows[0]&&b.$.rows[0].cells;g=new CKEDITOR.dom.element(f[g]||(g?f[g-1]:b.$.parentNode));h.length==m&&b.remove();g&&k(g,!0)}}));n("columnInsertBefore",
+f({requiredContent:"table",exec:function(a){a=a.getSelection();h(a,!0)}}));n("columnInsertAfter",f({requiredContent:"table",exec:function(a){a=a.getSelection();h(a)}}));n("cellDelete",f({requiredContent:"table",exec:function(a){a=a.getSelection();l(a)}}));n("cellMerge",f({allowedContent:"td[colspan,rowspan]",requiredContent:"td[colspan,rowspan]",exec:function(a){k(b(a.getSelection()),!0)}}));n("cellMergeRight",f({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){k(b(a.getSelection(),
+"right"),!0)}}));n("cellMergeDown",f({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){k(b(a.getSelection(),"down"),!0)}}));n("cellVerticalSplit",f({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){k(p(a.getSelection()))}}));n("cellHorizontalSplit",f({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){k(g(a.getSelection()))}}));n("cellInsertBefore",f({requiredContent:"table",exec:function(a){a=a.getSelection();m(a,!0)}}));
+n("cellInsertAfter",f({requiredContent:"table",exec:function(a){a=a.getSelection();m(a)}}));d.addMenuItems&&d.addMenuItems({tablecell:{label:q.cell.menu,group:"tablecell",order:1,getItems:function(){var c=d.getSelection(),e=a(c);return{tablecell_insertBefore:CKEDITOR.TRISTATE_OFF,tablecell_insertAfter:CKEDITOR.TRISTATE_OFF,tablecell_delete:CKEDITOR.TRISTATE_OFF,tablecell_merge:b(c,null,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_merge_right:b(c,"right",!0)?CKEDITOR.TRISTATE_OFF:
+CKEDITOR.TRISTATE_DISABLED,tablecell_merge_down:b(c,"down",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_vertical:p(c,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_horizontal:g(c,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_properties:0<e.length?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED}}},tablecell_insertBefore:{label:q.cell.insertBefore,group:"tablecell",command:"cellInsertBefore",order:5},tablecell_insertAfter:{label:q.cell.insertAfter,
 group:"tablecell",command:"cellInsertAfter",order:10},tablecell_delete:{label:q.cell.deleteCell,group:"tablecell",command:"cellDelete",order:15},tablecell_merge:{label:q.cell.merge,group:"tablecell",command:"cellMerge",order:16},tablecell_merge_right:{label:q.cell.mergeRight,group:"tablecell",command:"cellMergeRight",order:17},tablecell_merge_down:{label:q.cell.mergeDown,group:"tablecell",command:"cellMergeDown",order:18},tablecell_split_horizontal:{label:q.cell.splitHorizontal,group:"tablecell",
 command:"cellHorizontalSplit",order:19},tablecell_split_vertical:{label:q.cell.splitVertical,group:"tablecell",command:"cellVerticalSplit",order:20},tablecell_properties:{label:q.cell.title,group:"tablecellproperties",command:"cellProperties",order:21},tablerow:{label:q.row.menu,group:"tablerow",order:1,getItems:function(){return{tablerow_insertBefore:CKEDITOR.TRISTATE_OFF,tablerow_insertAfter:CKEDITOR.TRISTATE_OFF,tablerow_delete:CKEDITOR.TRISTATE_OFF}}},tablerow_insertBefore:{label:q.row.insertBefore,
 group:"tablerow",command:"rowInsertBefore",order:5},tablerow_insertAfter:{label:q.row.insertAfter,group:"tablerow",command:"rowInsertAfter",order:10},tablerow_delete:{label:q.row.deleteRow,group:"tablerow",command:"rowDelete",order:15},tablecolumn:{label:q.column.menu,group:"tablecolumn",order:1,getItems:function(){return{tablecolumn_insertBefore:CKEDITOR.TRISTATE_OFF,tablecolumn_insertAfter:CKEDITOR.TRISTATE_OFF,tablecolumn_delete:CKEDITOR.TRISTATE_OFF}}},tablecolumn_insertBefore:{label:q.column.insertBefore,
-group:"tablecolumn",command:"columnInsertBefore",order:5},tablecolumn_insertAfter:{label:q.column.insertAfter,group:"tablecolumn",command:"columnInsertAfter",order:10},tablecolumn_delete:{label:q.column.deleteColumn,group:"tablecolumn",command:"columnDelete",order:15}});b.contextMenu&&b.contextMenu.addListener(function(a,b,d){return(a=d.contains({td:1,th:1},1))&&!a.isReadOnly()?{tablecell:CKEDITOR.TRISTATE_OFF,tablerow:CKEDITOR.TRISTATE_OFF,tablecolumn:CKEDITOR.TRISTATE_OFF}:null})},getSelectedCells:a};
-CKEDITOR.plugins.add("tabletools",CKEDITOR.plugins.tabletools)}(),CKEDITOR.tools.buildTableMap=function(a){a=a.$.rows;for(var f=-1,c=[],e=0;e<a.length;e++){f++;!c[f]&&(c[f]=[]);for(var h=-1,m=0;m<a[e].cells.length;m++){var l=a[e].cells[m];for(h++;c[f][h];)h++;for(var k=isNaN(l.colSpan)?1:l.colSpan,l=isNaN(l.rowSpan)?1:l.rowSpan,b=0;b<l;b++){c[f+b]||(c[f+b]=[]);for(var d=0;d<k;d++)c[f+b][h+d]=a[e].cells[m]}h+=k-1}}return c},"use strict",function(){var a=[CKEDITOR.CTRL+90,CKEDITOR.CTRL+89,CKEDITOR.CTRL+
-CKEDITOR.SHIFT+90],f={8:1,46:1};CKEDITOR.plugins.add("undo",{init:function(e){function b(a){f.enabled&&!1!==a.data.command.canUndo&&f.save()}function d(){f.enabled=e.readOnly?!1:"wysiwyg"==e.mode;f.onChange()}var f=e.undoManager=new c(e),h=f.editingHandler=new m(f),l=e.addCommand("undo",{exec:function(){f.undo()&&(e.selectionChange(),this.fire("afterUndo"))},startDisabled:!0,canUndo:!1}),u=e.addCommand("redo",{exec:function(){f.redo()&&(e.selectionChange(),this.fire("afterRedo"))},startDisabled:!0,
-canUndo:!1});e.setKeystroke([[a[0],"undo"],[a[1],"redo"],[a[2],"redo"]]);f.onChange=function(){l.setState(f.undoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);u.setState(f.redoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)};e.on("beforeCommandExec",b);e.on("afterCommandExec",b);e.on("saveSnapshot",function(a){f.save(a.data&&a.data.contentOnly)});e.on("contentDom",h.attachListeners,h);e.on("instanceReady",function(){e.fire("saveSnapshot")});e.on("beforeModeUnload",function(){"wysiwyg"==
-e.mode&&f.save(!0)});e.on("mode",d);e.on("readOnly",d);e.ui.addButton&&(e.ui.addButton("Undo",{label:e.lang.undo.undo,command:"undo",toolbar:"undo,10"}),e.ui.addButton("Redo",{label:e.lang.undo.redo,command:"redo",toolbar:"undo,20"}));e.resetUndo=function(){f.reset();e.fire("saveSnapshot")};e.on("updateSnapshot",function(){f.currentImage&&f.update()});e.on("lockSnapshot",function(a){a=a.data;f.lock(a&&a.dontUpdate,a&&a.forceUpdate)});e.on("unlockSnapshot",f.unlock,f)}});CKEDITOR.plugins.undo={};var c=
-CKEDITOR.plugins.undo.UndoManager=function(a){this.strokesRecorded=[0,0];this.locked=null;this.previousKeyGroup=-1;this.limit=a.config.undoStackSize||20;this.strokesLimit=25;this.editor=a;this.reset()};c.prototype={type:function(a,b){var d=c.getKeyGroup(a),e=this.strokesRecorded[d]+1;b=b||e>=this.strokesLimit;this.typing||(this.hasUndo=this.typing=!0,this.hasRedo=!1,this.onChange());b?(e=0,this.editor.fire("saveSnapshot")):this.editor.fire("change");this.strokesRecorded[d]=e;this.previousKeyGroup=
-d},keyGroupChanged:function(a){return c.getKeyGroup(a)!=this.previousKeyGroup},reset:function(){this.snapshots=[];this.index=-1;this.currentImage=null;this.hasRedo=this.hasUndo=!1;this.locked=null;this.resetType()},resetType:function(){this.strokesRecorded=[0,0];this.typing=!1;this.previousKeyGroup=-1},refreshState:function(){this.hasUndo=!!this.getNextImage(!0);this.hasRedo=!!this.getNextImage(!1);this.resetType();this.onChange()},save:function(a,b,d){var c=this.editor;if(this.locked||"ready"!=c.status||
-"wysiwyg"!=c.mode)return!1;var f=c.editable();if(!f||"ready"!=f.status)return!1;f=this.snapshots;b||(b=new e(c));if(!1===b.contents)return!1;if(this.currentImage)if(b.equalsContent(this.currentImage)){if(a||b.equalsSelection(this.currentImage))return!1}else!1!==d&&c.fire("change");f.splice(this.index+1,f.length-this.index-1);f.length==this.limit&&f.shift();this.index=f.push(b)-1;this.currentImage=b;!1!==d&&this.refreshState();return!0},restoreImage:function(a){var b=this.editor,d;a.bookmarks&&(b.focus(),
-d=b.getSelection());this.locked={level:999};this.editor.loadSnapshot(a.contents);a.bookmarks?d.selectBookmarks(a.bookmarks):CKEDITOR.env.ie&&(d=this.editor.document.getBody().$.createTextRange(),d.collapse(!0),d.select());this.locked=null;this.index=a.index;this.currentImage=this.snapshots[this.index];this.update();this.refreshState();b.fire("change")},getNextImage:function(a){var b=this.snapshots,d=this.currentImage,c;if(d)if(a)for(c=this.index-1;0<=c;c--){if(a=b[c],!d.equalsContent(a))return a.index=
-c,a}else for(c=this.index+1;c<b.length;c++)if(a=b[c],!d.equalsContent(a))return a.index=c,a;return null},redoable:function(){return this.enabled&&this.hasRedo},undoable:function(){return this.enabled&&this.hasUndo},undo:function(){if(this.undoable()){this.save(!0);var a=this.getNextImage(!0);if(a)return this.restoreImage(a),!0}return!1},redo:function(){if(this.redoable()&&(this.save(!0),this.redoable())){var a=this.getNextImage(!1);if(a)return this.restoreImage(a),!0}return!1},update:function(a){if(!this.locked){a||
-(a=new e(this.editor));for(var b=this.index,d=this.snapshots;0<b&&this.currentImage.equalsContent(d[b-1]);)--b;d.splice(b,this.index-b+1,a);this.index=b;this.currentImage=a}},updateSelection:function(a){if(!this.snapshots.length)return!1;var b=this.snapshots,d=b[b.length-1];return d.equalsContent(a)&&!d.equalsSelection(a)?(this.currentImage=b[b.length-1]=a,!0):!1},lock:function(a,b){if(this.locked)this.locked.level++;else if(a)this.locked={level:1};else{var d=null;if(b)d=!0;else{var c=new e(this.editor,
-!0);this.currentImage&&this.currentImage.equalsContent(c)&&(d=c)}this.locked={update:d,level:1}}},unlock:function(){if(this.locked&&!--this.locked.level){var a=this.locked.update;this.locked=null;if(!0===a)this.update();else if(a){var b=new e(this.editor,!0);a.equalsContent(b)||this.update()}}}};c.navigationKeyCodes={37:1,38:1,39:1,40:1,36:1,35:1,33:1,34:1};c.keyGroups={PRINTABLE:0,FUNCTIONAL:1};c.isNavigationKey=function(a){return!!c.navigationKeyCodes[a]};c.getKeyGroup=function(a){var b=c.keyGroups;
-return f[a]?b.FUNCTIONAL:b.PRINTABLE};c.getOppositeKeyGroup=function(a){var b=c.keyGroups;return a==b.FUNCTIONAL?b.PRINTABLE:b.FUNCTIONAL};c.ieFunctionalKeysBug=function(a){return CKEDITOR.env.ie&&c.getKeyGroup(a)==c.keyGroups.FUNCTIONAL};var e=CKEDITOR.plugins.undo.Image=function(a,b){this.editor=a;a.fire("beforeUndoImage");var d=a.getSnapshot();CKEDITOR.env.ie&&d&&(d=d.replace(/\s+data-cke-expando=".*?"/g,""));this.contents=d;b||(this.bookmarks=(d=d&&a.getSelection())&&d.createBookmarks2(!0));a.fire("afterUndoImage")},
-h=/\b(?:href|src|name)="[^"]*?"/gi;e.prototype={equalsContent:function(a){var b=this.contents;a=a.contents;CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)&&(b=b.replace(h,""),a=a.replace(h,""));return b!=a?!1:!0},equalsSelection:function(a){var b=this.bookmarks;a=a.bookmarks;if(b||a){if(!b||!a||b.length!=a.length)return!1;for(var d=0;d<b.length;d++){var c=b[d],e=a[d];if(c.startOffset!=e.startOffset||c.endOffset!=e.endOffset||!CKEDITOR.tools.arrayCompare(c.start,e.start)||!CKEDITOR.tools.arrayCompare(c.end,
-e.end))return!1}}return!0}};var m=CKEDITOR.plugins.undo.NativeEditingHandler=function(a){this.undoManager=a;this.ignoreInputEvent=!1;this.keyEventsStack=new l;this.lastKeydownImage=null};m.prototype={onKeydown:function(f){var b=f.data.getKey();if(229!==b)if(-1<CKEDITOR.tools.indexOf(a,f.data.getKeystroke()))f.data.preventDefault();else if(this.keyEventsStack.cleanUp(f),f=this.undoManager,this.keyEventsStack.getLast(b)||this.keyEventsStack.push(b),this.lastKeydownImage=new e(f.editor),c.isNavigationKey(b)||
-this.undoManager.keyGroupChanged(b))if(f.strokesRecorded[0]||f.strokesRecorded[1])f.save(!1,this.lastKeydownImage,!1),f.resetType()},onInput:function(){if(this.ignoreInputEvent)this.ignoreInputEvent=!1;else{var a=this.keyEventsStack.getLast();a||(a=this.keyEventsStack.push(0));this.keyEventsStack.increment(a.keyCode);this.keyEventsStack.getTotalInputs()>=this.undoManager.strokesLimit&&(this.undoManager.type(a.keyCode,!0),this.keyEventsStack.resetInputs())}},onKeyup:function(a){var b=this.undoManager;
-a=a.data.getKey();var d=this.keyEventsStack.getTotalInputs();this.keyEventsStack.remove(a);if(!(c.ieFunctionalKeysBug(a)&&this.lastKeydownImage&&this.lastKeydownImage.equalsContent(new e(b.editor,!0))))if(0<d)b.type(a);else if(c.isNavigationKey(a))this.onNavigationKey(!0)},onNavigationKey:function(a){var b=this.undoManager;!a&&b.save(!0,null,!1)||b.updateSelection(new e(b.editor));b.resetType()},ignoreInputEventListener:function(){this.ignoreInputEvent=!0},attachListeners:function(){var a=this.undoManager.editor,
-b=a.editable(),d=this;b.attachListener(b,"keydown",function(a){d.onKeydown(a);if(c.ieFunctionalKeysBug(a.data.getKey()))d.onInput()},null,null,999);b.attachListener(b,CKEDITOR.env.ie?"keypress":"input",d.onInput,d,null,999);b.attachListener(b,"keyup",d.onKeyup,d,null,999);b.attachListener(b,"paste",d.ignoreInputEventListener,d,null,999);b.attachListener(b,"drop",d.ignoreInputEventListener,d,null,999);b.attachListener(b.isInline()?b:a.document.getDocumentElement(),"click",function(){d.onNavigationKey()},
-null,null,999);b.attachListener(this.undoManager.editor,"blur",function(){d.keyEventsStack.remove(9)},null,null,999)}};var l=CKEDITOR.plugins.undo.KeyEventsStack=function(){this.stack=[]};l.prototype={push:function(a){a=this.stack.push({keyCode:a,inputs:0});return this.stack[a-1]},getLastIndex:function(a){if("number"!=typeof a)return this.stack.length-1;for(var b=this.stack.length;b--;)if(this.stack[b].keyCode==a)return b;return-1},getLast:function(a){a=this.getLastIndex(a);return-1!=a?this.stack[a]:
-null},increment:function(a){this.getLast(a).inputs++},remove:function(a){a=this.getLastIndex(a);-1!=a&&this.stack.splice(a,1)},resetInputs:function(a){if("number"==typeof a)this.getLast(a).inputs=0;else for(a=this.stack.length;a--;)this.stack[a].inputs=0},getTotalInputs:function(){for(var a=this.stack.length,b=0;a--;)b+=this.stack[a].inputs;return b},cleanUp:function(a){a=a.data.$;a.ctrlKey||a.metaKey||this.remove(17);a.shiftKey||this.remove(16);a.altKey||this.remove(18)}}}(),function(){function a(a,
-c){c=void 0===c||c;var f;if(c)f=a.getComputedStyle("text-align");else{for(;!a.hasAttribute||!a.hasAttribute("align")&&!a.getStyle("text-align");){f=a.getParent();if(!f)break;a=f}f=a.getStyle("text-align")||a.getAttribute("align")||""}f&&(f=f.replace(/(?:-(?:moz|webkit)-)?(?:start|auto)/i,""));!f&&c&&(f="rtl"==a.getComputedStyle("direction")?"right":"left");return f}function f(a,c,f){this.editor=a;this.name=c;this.value=f;this.context="p";c=a.config.justifyClasses;var l=a.config.enterMode==CKEDITOR.ENTER_P?
-"p":"div";if(c){switch(f){case "left":this.cssClassName=c[0];break;case "center":this.cssClassName=c[1];break;case "right":this.cssClassName=c[2];break;case "justify":this.cssClassName=c[3]}this.cssClassRegex=new RegExp("(?:^|\\s+)(?:"+c.join("|")+")(?\x3d$|\\s)");this.requiredContent=l+"("+this.cssClassName+")"}else this.requiredContent=l+"{text-align}";this.allowedContent={"caption div h1 h2 h3 h4 h5 h6 p pre td th li":{propertiesOnly:!0,styles:this.cssClassName?null:"text-align",classes:this.cssClassName||
-null}};a.config.enterMode==CKEDITOR.ENTER_BR&&(this.allowedContent.div=!0)}function c(a){var c=a.editor,f=c.createRange();f.setStartBefore(a.data.node);f.setEndAfter(a.data.node);for(var l=new CKEDITOR.dom.walker(f),k;k=l.next();)if(k.type==CKEDITOR.NODE_ELEMENT)if(!k.equals(a.data.node)&&k.getDirection())f.setStartAfter(k),l=new CKEDITOR.dom.walker(f);else{var b=c.config.justifyClasses;b&&(k.hasClass(b[0])?(k.removeClass(b[0]),k.addClass(b[2])):k.hasClass(b[2])&&(k.removeClass(b[2]),k.addClass(b[0])));
-b=k.getStyle("text-align");"left"==b?k.setStyle("text-align","right"):"right"==b&&k.setStyle("text-align","left")}}f.prototype={exec:function(c){var f=c.getSelection(),m=c.config.enterMode;if(f){for(var l=f.createBookmarks(),k=f.getRanges(),b=this.cssClassName,d,g,p=c.config.useComputedState,p=void 0===p||p,v=k.length-1;0<=v;v--)for(d=k[v].createIterator(),d.enlargeBr=m!=CKEDITOR.ENTER_BR;g=d.getNextParagraph(m==CKEDITOR.ENTER_P?"p":"div");)if(!g.isReadOnly()){g.removeAttribute("align");g.removeStyle("text-align");
-var u=b&&(g.$.className=CKEDITOR.tools.ltrim(g.$.className.replace(this.cssClassRegex,""))),t=this.state==CKEDITOR.TRISTATE_OFF&&(!p||a(g,!0)!=this.value);b?t?g.addClass(b):u||g.removeAttribute("class"):t&&g.setStyle("text-align",this.value)}c.focus();c.forceNextSelectionCheck();f.selectBookmarks(l)}},refresh:function(c,f){var m=f.block||f.blockLimit;this.setState("body"!=m.getName()&&a(m,this.editor.config.useComputedState)==this.value?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)}};CKEDITOR.plugins.add("justify",
-{init:function(a){if(!a.blockless){var h=new f(a,"justifyleft","left"),m=new f(a,"justifycenter","center"),l=new f(a,"justifyright","right"),k=new f(a,"justifyblock","justify");a.addCommand("justifyleft",h);a.addCommand("justifycenter",m);a.addCommand("justifyright",l);a.addCommand("justifyblock",k);a.ui.addButton&&(a.ui.addButton("JustifyLeft",{label:a.lang.justify.left,command:"justifyleft",toolbar:"align,10"}),a.ui.addButton("JustifyCenter",{label:a.lang.justify.center,command:"justifycenter",
+group:"tablecolumn",command:"columnInsertBefore",order:5},tablecolumn_insertAfter:{label:q.column.insertAfter,group:"tablecolumn",command:"columnInsertAfter",order:10},tablecolumn_delete:{label:q.column.deleteColumn,group:"tablecolumn",command:"columnDelete",order:15}});d.contextMenu&&d.contextMenu.addListener(function(a,b,d){return(a=d.contains({td:1,th:1},1))&&!a.isReadOnly()?{tablecell:CKEDITOR.TRISTATE_OFF,tablerow:CKEDITOR.TRISTATE_OFF,tablecolumn:CKEDITOR.TRISTATE_OFF}:null})},getSelectedCells:a};
+CKEDITOR.plugins.add("tabletools",CKEDITOR.plugins.tabletools)}(),CKEDITOR.tools.buildTableMap=function(a){a=a.$.rows;for(var e=-1,c=[],f=0;f<a.length;f++){e++;!c[e]&&(c[e]=[]);for(var h=-1,m=0;m<a[f].cells.length;m++){var l=a[f].cells[m];for(h++;c[e][h];)h++;for(var k=isNaN(l.colSpan)?1:l.colSpan,l=isNaN(l.rowSpan)?1:l.rowSpan,d=0;d<l;d++){c[e+d]||(c[e+d]=[]);for(var b=0;b<k;b++)c[e+d][h+b]=a[f].cells[m]}h+=k-1}}return c},"use strict",function(){var a=[CKEDITOR.CTRL+90,CKEDITOR.CTRL+89,CKEDITOR.CTRL+
+CKEDITOR.SHIFT+90],e={8:1,46:1};CKEDITOR.plugins.add("undo",{init:function(e){function d(a){g.enabled&&!1!==a.data.command.canUndo&&g.save()}function b(){g.enabled=e.readOnly?!1:"wysiwyg"==e.mode;g.onChange()}var g=e.undoManager=new c(e),f=g.editingHandler=new m(g),h=e.addCommand("undo",{exec:function(){g.undo()&&(e.selectionChange(),this.fire("afterUndo"))},startDisabled:!0,canUndo:!1}),l=e.addCommand("redo",{exec:function(){g.redo()&&(e.selectionChange(),this.fire("afterRedo"))},startDisabled:!0,
+canUndo:!1});e.setKeystroke([[a[0],"undo"],[a[1],"redo"],[a[2],"redo"]]);g.onChange=function(){h.setState(g.undoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);l.setState(g.redoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)};e.on("beforeCommandExec",d);e.on("afterCommandExec",d);e.on("saveSnapshot",function(a){g.save(a.data&&a.data.contentOnly)});e.on("contentDom",f.attachListeners,f);e.on("instanceReady",function(){e.fire("saveSnapshot")});e.on("beforeModeUnload",function(){"wysiwyg"==
+e.mode&&g.save(!0)});e.on("mode",b);e.on("readOnly",b);e.ui.addButton&&(e.ui.addButton("Undo",{label:e.lang.undo.undo,command:"undo",toolbar:"undo,10"}),e.ui.addButton("Redo",{label:e.lang.undo.redo,command:"redo",toolbar:"undo,20"}));e.resetUndo=function(){g.reset();e.fire("saveSnapshot")};e.on("updateSnapshot",function(){g.currentImage&&g.update()});e.on("lockSnapshot",function(a){a=a.data;g.lock(a&&a.dontUpdate,a&&a.forceUpdate)});e.on("unlockSnapshot",g.unlock,g)}});CKEDITOR.plugins.undo={};var c=
+CKEDITOR.plugins.undo.UndoManager=function(a){this.strokesRecorded=[0,0];this.locked=null;this.previousKeyGroup=-1;this.limit=a.config.undoStackSize||20;this.strokesLimit=25;this.editor=a;this.reset()};c.prototype={type:function(a,d){var b=c.getKeyGroup(a),e=this.strokesRecorded[b]+1;d=d||e>=this.strokesLimit;this.typing||(this.hasUndo=this.typing=!0,this.hasRedo=!1,this.onChange());d?(e=0,this.editor.fire("saveSnapshot")):this.editor.fire("change");this.strokesRecorded[b]=e;this.previousKeyGroup=
+b},keyGroupChanged:function(a){return c.getKeyGroup(a)!=this.previousKeyGroup},reset:function(){this.snapshots=[];this.index=-1;this.currentImage=null;this.hasRedo=this.hasUndo=!1;this.locked=null;this.resetType()},resetType:function(){this.strokesRecorded=[0,0];this.typing=!1;this.previousKeyGroup=-1},refreshState:function(){this.hasUndo=!!this.getNextImage(!0);this.hasRedo=!!this.getNextImage(!1);this.resetType();this.onChange()},save:function(a,d,b){var c=this.editor;if(this.locked||"ready"!=c.status||
+"wysiwyg"!=c.mode)return!1;var e=c.editable();if(!e||"ready"!=e.status)return!1;e=this.snapshots;d||(d=new f(c));if(!1===d.contents)return!1;if(this.currentImage)if(d.equalsContent(this.currentImage)){if(a||d.equalsSelection(this.currentImage))return!1}else!1!==b&&c.fire("change");e.splice(this.index+1,e.length-this.index-1);e.length==this.limit&&e.shift();this.index=e.push(d)-1;this.currentImage=d;!1!==b&&this.refreshState();return!0},restoreImage:function(a){var d=this.editor,b;a.bookmarks&&(d.focus(),
+b=d.getSelection());this.locked={level:999};this.editor.loadSnapshot(a.contents);a.bookmarks?b.selectBookmarks(a.bookmarks):CKEDITOR.env.ie&&(b=this.editor.document.getBody().$.createTextRange(),b.collapse(!0),b.select());this.locked=null;this.index=a.index;this.currentImage=this.snapshots[this.index];this.update();this.refreshState();d.fire("change")},getNextImage:function(a){var d=this.snapshots,b=this.currentImage,c;if(b)if(a)for(c=this.index-1;0<=c;c--){if(a=d[c],!b.equalsContent(a))return a.index=
+c,a}else for(c=this.index+1;c<d.length;c++)if(a=d[c],!b.equalsContent(a))return a.index=c,a;return null},redoable:function(){return this.enabled&&this.hasRedo},undoable:function(){return this.enabled&&this.hasUndo},undo:function(){if(this.undoable()){this.save(!0);var a=this.getNextImage(!0);if(a)return this.restoreImage(a),!0}return!1},redo:function(){if(this.redoable()&&(this.save(!0),this.redoable())){var a=this.getNextImage(!1);if(a)return this.restoreImage(a),!0}return!1},update:function(a){if(!this.locked){a||
+(a=new f(this.editor));for(var d=this.index,b=this.snapshots;0<d&&this.currentImage.equalsContent(b[d-1]);)--d;b.splice(d,this.index-d+1,a);this.index=d;this.currentImage=a}},updateSelection:function(a){if(!this.snapshots.length)return!1;var d=this.snapshots,b=d[d.length-1];return b.equalsContent(a)&&!b.equalsSelection(a)?(this.currentImage=d[d.length-1]=a,!0):!1},lock:function(a,d){if(this.locked)this.locked.level++;else if(a)this.locked={level:1};else{var b=null;if(d)b=!0;else{var c=new f(this.editor,
+!0);this.currentImage&&this.currentImage.equalsContent(c)&&(b=c)}this.locked={update:b,level:1}}},unlock:function(){if(this.locked&&!--this.locked.level){var a=this.locked.update;this.locked=null;if(!0===a)this.update();else if(a){var d=new f(this.editor,!0);a.equalsContent(d)||this.update()}}}};c.navigationKeyCodes={37:1,38:1,39:1,40:1,36:1,35:1,33:1,34:1};c.keyGroups={PRINTABLE:0,FUNCTIONAL:1};c.isNavigationKey=function(a){return!!c.navigationKeyCodes[a]};c.getKeyGroup=function(a){var d=c.keyGroups;
+return e[a]?d.FUNCTIONAL:d.PRINTABLE};c.getOppositeKeyGroup=function(a){var d=c.keyGroups;return a==d.FUNCTIONAL?d.PRINTABLE:d.FUNCTIONAL};c.ieFunctionalKeysBug=function(a){return CKEDITOR.env.ie&&c.getKeyGroup(a)==c.keyGroups.FUNCTIONAL};var f=CKEDITOR.plugins.undo.Image=function(a,d){this.editor=a;a.fire("beforeUndoImage");var b=a.getSnapshot();CKEDITOR.env.ie&&b&&(b=b.replace(/\s+data-cke-expando=".*?"/g,""));this.contents=b;d||(this.bookmarks=(b=b&&a.getSelection())&&b.createBookmarks2(!0));a.fire("afterUndoImage")},
+h=/\b(?:href|src|name)="[^"]*?"/gi;f.prototype={equalsContent:function(a){var d=this.contents;a=a.contents;CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)&&(d=d.replace(h,""),a=a.replace(h,""));return d!=a?!1:!0},equalsSelection:function(a){var d=this.bookmarks;a=a.bookmarks;if(d||a){if(!d||!a||d.length!=a.length)return!1;for(var b=0;b<d.length;b++){var c=d[b],e=a[b];if(c.startOffset!=e.startOffset||c.endOffset!=e.endOffset||!CKEDITOR.tools.arrayCompare(c.start,e.start)||!CKEDITOR.tools.arrayCompare(c.end,
+e.end))return!1}}return!0}};var m=CKEDITOR.plugins.undo.NativeEditingHandler=function(a){this.undoManager=a;this.ignoreInputEvent=!1;this.keyEventsStack=new l;this.lastKeydownImage=null};m.prototype={onKeydown:function(e){var d=e.data.getKey();if(229!==d)if(-1<CKEDITOR.tools.indexOf(a,e.data.getKeystroke()))e.data.preventDefault();else if(this.keyEventsStack.cleanUp(e),e=this.undoManager,this.keyEventsStack.getLast(d)||this.keyEventsStack.push(d),this.lastKeydownImage=new f(e.editor),c.isNavigationKey(d)||
+this.undoManager.keyGroupChanged(d))if(e.strokesRecorded[0]||e.strokesRecorded[1])e.save(!1,this.lastKeydownImage,!1),e.resetType()},onInput:function(){if(this.ignoreInputEvent)this.ignoreInputEvent=!1;else{var a=this.keyEventsStack.getLast();a||(a=this.keyEventsStack.push(0));this.keyEventsStack.increment(a.keyCode);this.keyEventsStack.getTotalInputs()>=this.undoManager.strokesLimit&&(this.undoManager.type(a.keyCode,!0),this.keyEventsStack.resetInputs())}},onKeyup:function(a){var d=this.undoManager;
+a=a.data.getKey();var b=this.keyEventsStack.getTotalInputs();this.keyEventsStack.remove(a);if(!(c.ieFunctionalKeysBug(a)&&this.lastKeydownImage&&this.lastKeydownImage.equalsContent(new f(d.editor,!0))))if(0<b)d.type(a);else if(c.isNavigationKey(a))this.onNavigationKey(!0)},onNavigationKey:function(a){var d=this.undoManager;!a&&d.save(!0,null,!1)||d.updateSelection(new f(d.editor));d.resetType()},ignoreInputEventListener:function(){this.ignoreInputEvent=!0},attachListeners:function(){var a=this.undoManager.editor,
+d=a.editable(),b=this;d.attachListener(d,"keydown",function(a){b.onKeydown(a);if(c.ieFunctionalKeysBug(a.data.getKey()))b.onInput()},null,null,999);d.attachListener(d,CKEDITOR.env.ie?"keypress":"input",b.onInput,b,null,999);d.attachListener(d,"keyup",b.onKeyup,b,null,999);d.attachListener(d,"paste",b.ignoreInputEventListener,b,null,999);d.attachListener(d,"drop",b.ignoreInputEventListener,b,null,999);d.attachListener(d.isInline()?d:a.document.getDocumentElement(),"click",function(){b.onNavigationKey()},
+null,null,999);d.attachListener(this.undoManager.editor,"blur",function(){b.keyEventsStack.remove(9)},null,null,999)}};var l=CKEDITOR.plugins.undo.KeyEventsStack=function(){this.stack=[]};l.prototype={push:function(a){a=this.stack.push({keyCode:a,inputs:0});return this.stack[a-1]},getLastIndex:function(a){if("number"!=typeof a)return this.stack.length-1;for(var d=this.stack.length;d--;)if(this.stack[d].keyCode==a)return d;return-1},getLast:function(a){a=this.getLastIndex(a);return-1!=a?this.stack[a]:
+null},increment:function(a){this.getLast(a).inputs++},remove:function(a){a=this.getLastIndex(a);-1!=a&&this.stack.splice(a,1)},resetInputs:function(a){if("number"==typeof a)this.getLast(a).inputs=0;else for(a=this.stack.length;a--;)this.stack[a].inputs=0},getTotalInputs:function(){for(var a=this.stack.length,d=0;a--;)d+=this.stack[a].inputs;return d},cleanUp:function(a){a=a.data.$;a.ctrlKey||a.metaKey||this.remove(17);a.shiftKey||this.remove(16);a.altKey||this.remove(18)}}}(),function(){function a(a,
+c){c=void 0===c||c;var e;if(c)e=a.getComputedStyle("text-align");else{for(;!a.hasAttribute||!a.hasAttribute("align")&&!a.getStyle("text-align");){e=a.getParent();if(!e)break;a=e}e=a.getStyle("text-align")||a.getAttribute("align")||""}e&&(e=e.replace(/(?:-(?:moz|webkit)-)?(?:start|auto)/i,""));!e&&c&&(e="rtl"==a.getComputedStyle("direction")?"right":"left");return e}function e(a,c,e){this.editor=a;this.name=c;this.value=e;this.context="p";c=a.config.justifyClasses;var l=a.config.enterMode==CKEDITOR.ENTER_P?
+"p":"div";if(c){switch(e){case "left":this.cssClassName=c[0];break;case "center":this.cssClassName=c[1];break;case "right":this.cssClassName=c[2];break;case "justify":this.cssClassName=c[3]}this.cssClassRegex=new RegExp("(?:^|\\s+)(?:"+c.join("|")+")(?\x3d$|\\s)");this.requiredContent=l+"("+this.cssClassName+")"}else this.requiredContent=l+"{text-align}";this.allowedContent={"caption div h1 h2 h3 h4 h5 h6 p pre td th li":{propertiesOnly:!0,styles:this.cssClassName?null:"text-align",classes:this.cssClassName||
+null}};a.config.enterMode==CKEDITOR.ENTER_BR&&(this.allowedContent.div=!0)}function c(a){var c=a.editor,e=c.createRange();e.setStartBefore(a.data.node);e.setEndAfter(a.data.node);for(var l=new CKEDITOR.dom.walker(e),k;k=l.next();)if(k.type==CKEDITOR.NODE_ELEMENT)if(!k.equals(a.data.node)&&k.getDirection())e.setStartAfter(k),l=new CKEDITOR.dom.walker(e);else{var d=c.config.justifyClasses;d&&(k.hasClass(d[0])?(k.removeClass(d[0]),k.addClass(d[2])):k.hasClass(d[2])&&(k.removeClass(d[2]),k.addClass(d[0])));
+d=k.getStyle("text-align");"left"==d?k.setStyle("text-align","right"):"right"==d&&k.setStyle("text-align","left")}}e.prototype={exec:function(c){var e=c.getSelection(),m=c.config.enterMode;if(e){for(var l=e.createBookmarks(),k=e.getRanges(),d=this.cssClassName,b,g,p=c.config.useComputedState,p=void 0===p||p,v=k.length-1;0<=v;v--)for(b=k[v].createIterator(),b.enlargeBr=m!=CKEDITOR.ENTER_BR;g=b.getNextParagraph(m==CKEDITOR.ENTER_P?"p":"div");)if(!g.isReadOnly()){g.removeAttribute("align");g.removeStyle("text-align");
+var r=d&&(g.$.className=CKEDITOR.tools.ltrim(g.$.className.replace(this.cssClassRegex,""))),w=this.state==CKEDITOR.TRISTATE_OFF&&(!p||a(g,!0)!=this.value);d?w?g.addClass(d):r||g.removeAttribute("class"):w&&g.setStyle("text-align",this.value)}c.focus();c.forceNextSelectionCheck();e.selectBookmarks(l)}},refresh:function(c,e){var m=e.block||e.blockLimit;this.setState("body"!=m.getName()&&a(m,this.editor.config.useComputedState)==this.value?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)}};CKEDITOR.plugins.add("justify",
+{init:function(a){if(!a.blockless){var h=new e(a,"justifyleft","left"),m=new e(a,"justifycenter","center"),l=new e(a,"justifyright","right"),k=new e(a,"justifyblock","justify");a.addCommand("justifyleft",h);a.addCommand("justifycenter",m);a.addCommand("justifyright",l);a.addCommand("justifyblock",k);a.ui.addButton&&(a.ui.addButton("JustifyLeft",{label:a.lang.justify.left,command:"justifyleft",toolbar:"align,10"}),a.ui.addButton("JustifyCenter",{label:a.lang.justify.center,command:"justifycenter",
 toolbar:"align,20"}),a.ui.addButton("JustifyRight",{label:a.lang.justify.right,command:"justifyright",toolbar:"align,30"}),a.ui.addButton("JustifyBlock",{label:a.lang.justify.block,command:"justifyblock",toolbar:"align,40"}));a.on("dirChanged",c)}}})}(),function(){var a={readOnly:1,preserveState:!0,editorFocus:!1,exec:function(a){this.toggleState();this.refresh(a)},refresh:function(a){if(a.document){var c=this.state!=CKEDITOR.TRISTATE_ON||a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&!a.focusManager.hasFocus?
-"removeClass":"attachClass";a.editable()[c]("cke_show_blocks")}}};CKEDITOR.plugins.add("showblocks",{onLoad:function(){var a="p div pre address blockquote h1 h2 h3 h4 h5 h6".split(" "),c,e,h,m,l=CKEDITOR.getUrl(this.path),k=!(CKEDITOR.env.ie&&9>CKEDITOR.env.version),b=k?":not([contenteditable\x3dfalse]):not(.cke_show_blocks_off)":"",d,g;for(c=e=h=m="";d=a.pop();)g=a.length?",":"",c+=".cke_show_blocks "+d+b+g,h+=".cke_show_blocks.cke_contents_ltr "+d+b+g,m+=".cke_show_blocks.cke_contents_rtl "+d+b+
-g,e+=".cke_show_blocks "+d+b+"{background-image:url("+CKEDITOR.getUrl(l+"images/block_"+d+".png")+")}";CKEDITOR.addCss((c+"{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px}").concat(e,h+"{background-position:top left;padding-left:8px}",m+"{background-position:top right;padding-right:8px}"));k||CKEDITOR.addCss(".cke_show_blocks [contenteditable\x3dfalse],.cke_show_blocks .cke_show_blocks_off{border:none;padding-top:0;background-image:none}.cke_show_blocks.cke_contents_rtl [contenteditable\x3dfalse],.cke_show_blocks.cke_contents_rtl .cke_show_blocks_off{padding-right:0}.cke_show_blocks.cke_contents_ltr [contenteditable\x3dfalse],.cke_show_blocks.cke_contents_ltr .cke_show_blocks_off{padding-left:0}")},
-init:function(f){function c(){e.refresh(f)}if(!f.blockless){var e=f.addCommand("showblocks",a);e.canUndo=!1;f.config.startupOutlineBlocks&&e.setState(CKEDITOR.TRISTATE_ON);f.ui.addButton&&f.ui.addButton("ShowBlocks",{label:f.lang.showblocks.toolbar,command:"showblocks",toolbar:"tools,20"});f.on("mode",function(){e.state!=CKEDITOR.TRISTATE_DISABLED&&e.refresh(f)});f.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&(f.on("focus",c),f.on("blur",c));f.on("contentDom",function(){e.state!=CKEDITOR.TRISTATE_DISABLED&&
-e.refresh(f)})}}})}(),function(){var a={preserveState:!0,editorFocus:!1,readOnly:1,exec:function(a){this.toggleState();this.refresh(a)},refresh:function(a){if(a.document){var c=this.state==CKEDITOR.TRISTATE_ON?"attachClass":"removeClass";a.editable()[c]("cke_show_borders")}}};CKEDITOR.plugins.add("showborders",{modes:{wysiwyg:1},onLoad:function(){var a;a=(CKEDITOR.env.ie6Compat?[".%1 table.%2,",".%1 table.%2 td, .%1 table.%2 th","{","border : #d3d3d3 1px dotted","}"]:".%1 table.%2,;.%1 table.%2 \x3e tr \x3e td, .%1 table.%2 \x3e tr \x3e th,;.%1 table.%2 \x3e tbody \x3e tr \x3e td, .%1 table.%2 \x3e tbody \x3e tr \x3e th,;.%1 table.%2 \x3e thead \x3e tr \x3e td, .%1 table.%2 \x3e thead \x3e tr \x3e th,;.%1 table.%2 \x3e tfoot \x3e tr \x3e td, .%1 table.%2 \x3e tfoot \x3e tr \x3e th;{;border : #d3d3d3 1px dotted;}".split(";")).join("").replace(/%2/g,
-"cke_show_border").replace(/%1/g,"cke_show_borders ");CKEDITOR.addCss(a)},init:function(f){var c=f.addCommand("showborders",a);c.canUndo=!1;!1!==f.config.startupShowBorders&&c.setState(CKEDITOR.TRISTATE_ON);f.on("mode",function(){c.state!=CKEDITOR.TRISTATE_DISABLED&&c.refresh(f)},null,null,100);f.on("contentDom",function(){c.state!=CKEDITOR.TRISTATE_DISABLED&&c.refresh(f)});f.on("removeFormatCleanup",function(a){a=a.data;f.getCommand("showborders").state==CKEDITOR.TRISTATE_ON&&a.is("table")&&(!a.hasAttribute("border")||
-0>=parseInt(a.getAttribute("border"),10))&&a.addClass("cke_show_border")})},afterInit:function(a){var c=a.dataProcessor;a=c&&c.dataFilter;c=c&&c.htmlFilter;a&&a.addRules({elements:{table:function(a){a=a.attributes;var c=a["class"],f=parseInt(a.border,10);f&&!(0>=f)||c&&-1!=c.indexOf("cke_show_border")||(a["class"]=(c||"")+" cke_show_border")}}});c&&c.addRules({elements:{table:function(a){a=a.attributes;var c=a["class"];c&&(a["class"]=c.replace("cke_show_border","").replace(/\s{2}/," ").replace(/^\s+|\s+$/,
-""))}}})}});CKEDITOR.on("dialogDefinition",function(a){var c=a.data.name;if("table"==c||"tableProperties"==c)if(a=a.data.definition,c=a.getContents("info").get("txtBorder"),c.commit=CKEDITOR.tools.override(c.commit,function(a){return function(c,f){a.apply(this,arguments);var l=parseInt(this.getValue(),10);f[!l||0>=l?"addClass":"removeClass"]("cke_show_border")}}),a=(a=a.getContents("advanced"))&&a.get("advCSSClasses"))a.setup=CKEDITOR.tools.override(a.setup,function(a){return function(){a.apply(this,
-arguments);this.setValue(this.getValue().replace(/cke_show_border/,""))}}),a.commit=CKEDITOR.tools.override(a.commit,function(a){return function(c,f){a.apply(this,arguments);parseInt(f.getAttribute("border"),10)||f.addClass("cke_show_border")}})})}(),function(){function a(a){return CKEDITOR.env.ie?a.$.clientWidth:parseInt(a.getComputedStyle("width"),10)}function f(a,c){var e=a.getComputedStyle("border-"+c+"-width"),f={thin:"0px",medium:"1px",thick:"2px"};0>e.indexOf("px")&&(e=e in f&&"none"!=a.getComputedStyle("border-style")?
-f[e]:0);return parseInt(e,10)}function c(a){var c=[],e=-1,h="rtl"==a.getComputedStyle("direction"),k;k=a.$.rows;for(var l=0,m,n,q,x=0,A=k.length;x<A;x++)q=k[x],m=q.cells.length,m>l&&(l=m,n=q);k=n;l=new CKEDITOR.dom.element(a.$.tBodies[0]);m=l.getDocumentPosition();n=0;for(q=k.cells.length;n<q;n++){var x=new CKEDITOR.dom.element(k.cells[n]),A=k.cells[n+1]&&new CKEDITOR.dom.element(k.cells[n+1]),e=e+(x.$.colSpan||1),C,r,w=x.getDocumentPosition().x;h?r=w+f(x,"left"):C=w+x.$.offsetWidth-f(x,"right");
-A?(w=A.getDocumentPosition().x,h?C=w+A.$.offsetWidth-f(A,"right"):r=w+f(A,"left")):(w=a.getDocumentPosition().x,h?C=w:r=w+a.$.offsetWidth);x=Math.max(r-C,3);c.push({table:a,index:e,x:C,y:m.y,width:x,height:l.$.offsetHeight,rtl:h})}return c}function e(a){(a.data||a).preventDefault()}function h(b){function c(){x=0;q.setOpacity(0);C&&g();var a=t.table;setTimeout(function(){a.removeCustomData("_cke_table_pillars")},0);n.removeListener("dragstart",e)}function g(){for(var c=t.rtl,d=c?w.length:r.length,
-e=0,g=0;g<d;g++){var h=r[g],k=w[g],m=t.table;CKEDITOR.tools.setTimeout(function(a,f,g,h,k,n){a&&a.setStyle("width",l(Math.max(f+n,1)));g&&g.setStyle("width",l(Math.max(h-n,1)));k&&m.setStyle("width",l(k+n*(c?-1:1)));++e==d&&b.fire("saveSnapshot")},0,this,[h,h&&a(h),k,k&&a(k),(!h||!k)&&a(m)+f(m,"left")+f(m,"right"),C])}}function h(c){e(c);b.fire("saveSnapshot");c=t.index;for(var d=CKEDITOR.tools.buildTableMap(t.table),f=[],g=[],k=Number.MAX_VALUE,l=k,p=t.rtl,y=0,R=d.length;y<R;y++){var M=d[y],Q=M[c+
-(p?1:0)],M=M[c+(p?0:1)],Q=Q&&new CKEDITOR.dom.element(Q),M=M&&new CKEDITOR.dom.element(M);Q&&M&&Q.equals(M)||(Q&&(k=Math.min(k,a(Q))),M&&(l=Math.min(l,a(M))),f.push(Q),g.push(M))}r=f;w=g;B=t.x-k;z=t.x+l;q.setOpacity(.5);A=parseInt(q.getStyle("left"),10);C=0;x=1;q.on("mousemove",u);n.on("dragstart",e);n.on("mouseup",m,this)}function m(a){a.removeListener();c()}function u(a){y(a.data.getPageOffset().x)}var t,n,q,x,A,C,r,w,B,z;n=b.document;q=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-temp\x3d1 contenteditable\x3dfalse unselectable\x3don style\x3d"position:absolute;cursor:col-resize;filter:alpha(opacity\x3d0);opacity:0;padding:0;background-color:#004;background-image:none;border:0px none;z-index:10"\x3e\x3c/div\x3e',
-n);b.on("destroy",function(){q.remove()});k||n.getDocumentElement().append(q);this.attachTo=function(a){x||(k&&(n.getBody().append(q),C=0),t=a,q.setStyles({width:l(a.width),height:l(a.height),left:l(a.x),top:l(a.y)}),k&&q.setOpacity(.25),q.on("mousedown",h,this),n.getBody().setStyle("cursor","col-resize"),q.show())};var y=this.move=function(a){if(!t)return 0;if(!x&&(a<t.x||a>t.x+t.width))return t=null,x=C=0,n.removeListener("mouseup",m),q.removeListener("mousedown",h),q.removeListener("mousemove",
-u),n.getBody().setStyle("cursor","auto"),k?q.remove():q.hide(),0;a-=Math.round(q.$.offsetWidth/2);if(x){if(a==B||a==z)return 1;a=Math.max(a,B);a=Math.min(a,z);C=a-A}q.setStyle("left",l(a));return 1}}function m(a){var c=a.data.getTarget();if("mouseout"==a.name){if(!c.is("table"))return;for(var e=new CKEDITOR.dom.element(a.data.$.relatedTarget||a.data.$.toElement);e&&e.$&&!e.equals(c)&&!e.is("body");)e=e.getParent();if(!e||e.equals(c))return}c.getAscendant("table",1).removeCustomData("_cke_table_pillars");
-a.removeListener()}var l=CKEDITOR.tools.cssLength,k=CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks);CKEDITOR.plugins.add("tableresize",{requires:"tabletools",init:function(a){a.on("contentDom",function(){var d,f=a.editable();f.attachListener(f.isInline()?f:a.document,"mousemove",function(f){f=f.data;var g=f.getTarget();if(g.type==CKEDITOR.NODE_ELEMENT){var k=f.getPageOffset().x;if(d&&d.move(k))e(f);else if(g.is("table")||g.getAscendant("tbody",1))if(g=g.getAscendant("table",1),a.editable().contains(g)){(f=
-g.getCustomData("_cke_table_pillars"))||(g.setCustomData("_cke_table_pillars",f=c(g)),g.on("mouseout",m),g.on("mousedown",m));a:{for(var g=0,l=f.length;g<l;g++){var n=f[g];if(k>=n.x&&k<=n.x+n.width){k=n;break a}}k=null}k&&(!d&&(d=new h(a)),d.attachTo(k))}}})})}})}(),function(){function a(a,e,h){var m,l;if(h="string"==typeof h?CKEDITOR.document.getById(h):new CKEDITOR.dom.element(h))if(m=a.fire("uiSpace",{space:e,html:""}).html)a.on("uiSpace",function(a){a.data.space==e&&a.cancel()},null,null,1),l=
-h.append(CKEDITOR.dom.element.createFromHtml(f.output({id:a.id,name:a.name,langDir:a.lang.dir,langCode:a.langCode,space:e,spaceId:a.ui.spaceId(e),content:m}))),h.getCustomData("cke_hasshared")?l.hide():h.setCustomData("cke_hasshared",1),l.unselectable(),l.on("mousedown",function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()}),a.focusManager.add(l,1),a.on("focus",function(){for(var a=0,b,c=h.getChildren();b=c.getItem(a);a++)b.type==CKEDITOR.NODE_ELEMENT&&!b.equals(l)&&b.hasClass("cke_shared")&&
-b.hide();l.show()}),a.on("destroy",function(){l.remove()})}var f=CKEDITOR.addTemplate("sharedcontainer",'\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_shared cke_detached cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?" ":"")+'" lang\x3d"{langCode}" role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{spaceId}" class\x3d"cke_{space}" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e');
-CKEDITOR.plugins.add("sharedspace",{init:function(c){c.on("loaded",function(){var e=c.config.sharedSpaces;if(e)for(var f in e)a(c,f,e[f])},null,null,9)}})}(),CKEDITOR.plugins.add("sourcedialog",{init:function(a){a.addCommand("sourcedialog",new CKEDITOR.dialogCommand("sourcedialog"));CKEDITOR.dialog.add("sourcedialog",this.path+"dialogs/sourcedialog.js");a.ui.addButton&&a.ui.addButton("Sourcedialog",{label:a.lang.sourcedialog.toolbar,command:"sourcedialog",toolbar:"mode,10"})}}),"use strict",function(){function a(a,
-c){CKEDITOR.tools.extend(this,{editor:a,editable:a.editable(),doc:a.document,win:a.window},c,!0);this.inline=this.editable.isInline();this.inline||(this.frame=this.win.getFrame());this.target=this[this.inline?"editable":"doc"]}function f(a,c){CKEDITOR.tools.extend(this,c,{editor:a},!0)}function c(a,c){var e=a.editable();CKEDITOR.tools.extend(this,{editor:a,editable:e,inline:e.isInline(),doc:a.document,win:a.window,container:CKEDITOR.document.getBody(),winTop:CKEDITOR.document.getWindow()},c,!0);this.hidden=
-{};this.visible={};this.inline||(this.frame=this.win.getFrame());this.queryViewport();var f=CKEDITOR.tools.bind(this.queryViewport,this),k=CKEDITOR.tools.bind(this.hideVisible,this),l=CKEDITOR.tools.bind(this.removeAll,this);e.attachListener(this.winTop,"resize",f);e.attachListener(this.winTop,"scroll",f);e.attachListener(this.winTop,"resize",k);e.attachListener(this.win,"scroll",k);e.attachListener(this.inline?e:this.frame,"mouseout",function(a){var b=a.data.$.clientX;a=a.data.$.clientY;this.queryViewport();
-(b<=this.rect.left||b>=this.rect.right||a<=this.rect.top||a>=this.rect.bottom)&&this.hideVisible();(0>=b||b>=this.winTopPane.width||0>=a||a>=this.winTopPane.height)&&this.hideVisible()},this);e.attachListener(a,"resize",f);e.attachListener(a,"mode",l);a.on("destroy",l);this.lineTpl=(new CKEDITOR.template('\x3cdiv data-cke-lineutils-line\x3d"1" class\x3d"cke_reset_all" style\x3d"{lineStyle}"\x3e\x3cspan style\x3d"{tipLeftStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3cspan style\x3d"{tipRightStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3c/div\x3e')).output({lineStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},
-m,this.lineStyle,!0)),tipLeftStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},h,{left:"0px","border-left-color":"red","border-width":"6px 0 6px 6px"},this.tipCss,this.tipLeftStyle,!0)),tipRightStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},h,{right:"0px","border-right-color":"red","border-width":"6px 6px 6px 0"},this.tipCss,this.tipRightStyle,!0))})}function e(a){var c;if(c=a&&a.type==CKEDITOR.NODE_ELEMENT)c=!(l[a.getComputedStyle("float")]||l[a.getAttribute("align")]);return c&&
-!k[a.getComputedStyle("position")]}CKEDITOR.plugins.add("lineutils");CKEDITOR.LINEUTILS_BEFORE=1;CKEDITOR.LINEUTILS_AFTER=2;CKEDITOR.LINEUTILS_INSIDE=4;a.prototype={start:function(a){var c=this,e=this.editor,f=this.doc,h,k,l,m,q=CKEDITOR.tools.eventsBuffer(50,function(){e.readOnly||"wysiwyg"!=e.mode||(c.relations={},(k=f.$.elementFromPoint(l,m))&&k.nodeType&&(h=new CKEDITOR.dom.element(k),c.traverseSearch(h),isNaN(l+m)||c.pixelSearch(h,l,m),a&&a(c.relations,l,m)))});this.listener=this.editable.attachListener(this.target,
-"mousemove",function(a){l=a.data.$.clientX;m=a.data.$.clientY;q.input()});this.editable.attachListener(this.inline?this.editable:this.frame,"mouseout",function(){q.reset()})},stop:function(){this.listener&&this.listener.removeListener()},getRange:function(){var a={};a[CKEDITOR.LINEUTILS_BEFORE]=CKEDITOR.POSITION_BEFORE_START;a[CKEDITOR.LINEUTILS_AFTER]=CKEDITOR.POSITION_AFTER_END;a[CKEDITOR.LINEUTILS_INSIDE]=CKEDITOR.POSITION_AFTER_START;return function(c){var e=this.editor.createRange();e.moveToPosition(this.relations[c.uid].element,
-a[c.type]);return e}}(),store:function(){function a(b,c,e){var f=b.getUniqueId();f in e?e[f].type|=c:e[f]={element:b,type:c}}return function(c,f){var h;f&CKEDITOR.LINEUTILS_AFTER&&e(h=c.getNext())&&h.isVisible()&&(a(h,CKEDITOR.LINEUTILS_BEFORE,this.relations),f^=CKEDITOR.LINEUTILS_AFTER);f&CKEDITOR.LINEUTILS_INSIDE&&e(h=c.getFirst())&&h.isVisible()&&(a(h,CKEDITOR.LINEUTILS_BEFORE,this.relations),f^=CKEDITOR.LINEUTILS_INSIDE);a(c,f,this.relations)}}(),traverseSearch:function(a){var c,f,h;do if(h=a.$["data-cke-expando"],
-!(h&&h in this.relations)){if(a.equals(this.editable))break;if(e(a))for(c in this.lookups)(f=this.lookups[c](a))&&this.store(a,f)}while((!a||a.type!=CKEDITOR.NODE_ELEMENT||"true"!=a.getAttribute("contenteditable"))&&(a=a.getParent()))},pixelSearch:function(){function a(b,f,h,k,l){for(var m=0,q;l(h);){h+=k;if(25==++m)break;if(q=this.doc.$.elementFromPoint(f,h))if(q==b)m=0;else if(c(b,q)&&(m=0,e(q=new CKEDITOR.dom.element(q))))return q}}var c=CKEDITOR.env.ie||CKEDITOR.env.webkit?function(a,b){return a.contains(b)}:
-function(a,b){return!!(a.compareDocumentPosition(b)&16)};return function(c,d,f){var h=this.win.getViewPaneSize().height,k=a.call(this,c.$,d,f,-1,function(a){return 0<a});d=a.call(this,c.$,d,f,1,function(a){return a<h});if(k)for(this.traverseSearch(k);!k.getParent().equals(c);)k=k.getParent();if(d)for(this.traverseSearch(d);!d.getParent().equals(c);)d=d.getParent();for(;k||d;){k&&(k=k.getNext(e));if(!k||k.equals(d))break;this.traverseSearch(k);d&&(d=d.getPrevious(e));if(!d||d.equals(k))break;this.traverseSearch(d)}}}(),
-greedySearch:function(){this.relations={};for(var a=this.editable.getElementsByTag("*"),c=0,f,h,k;f=a.getItem(c++);)if(!f.equals(this.editable)&&f.type==CKEDITOR.NODE_ELEMENT&&(f.hasAttribute("contenteditable")||!f.isReadOnly())&&e(f)&&f.isVisible())for(k in this.lookups)(h=this.lookups[k](f))&&this.store(f,h);return this.relations}};f.prototype={locate:function(){function a(b,c){var f=b.element[c===CKEDITOR.LINEUTILS_BEFORE?"getPrevious":"getNext"]();return f&&e(f)?(b.siblingRect=f.getClientRect(),
-c==CKEDITOR.LINEUTILS_BEFORE?(b.siblingRect.bottom+b.elementRect.top)/2:(b.elementRect.bottom+b.siblingRect.top)/2):c==CKEDITOR.LINEUTILS_BEFORE?b.elementRect.top:b.elementRect.bottom}return function(c){var e;this.locations={};for(var f in c)e=c[f],e.elementRect=e.element.getClientRect(),e.type&CKEDITOR.LINEUTILS_BEFORE&&this.store(f,CKEDITOR.LINEUTILS_BEFORE,a(e,CKEDITOR.LINEUTILS_BEFORE)),e.type&CKEDITOR.LINEUTILS_AFTER&&this.store(f,CKEDITOR.LINEUTILS_AFTER,a(e,CKEDITOR.LINEUTILS_AFTER)),e.type&
-CKEDITOR.LINEUTILS_INSIDE&&this.store(f,CKEDITOR.LINEUTILS_INSIDE,(e.elementRect.top+e.elementRect.bottom)/2);return this.locations}}(),sort:function(){var a,c,e,f;return function(h,k){a=this.locations;c=[];for(var l in a)for(var m in a[l])if(e=Math.abs(h-a[l][m]),c.length){for(f=0;f<c.length;f++)if(e<c[f].dist){c.splice(f,0,{uid:+l,type:m,dist:e});break}f==c.length&&c.push({uid:+l,type:m,dist:e})}else c.push({uid:+l,type:m,dist:e});return"undefined"!=typeof k?c.slice(0,k):c}}(),store:function(a,
-c,e){this.locations[a]||(this.locations[a]={});this.locations[a][c]=e}};var h={display:"block",width:"0px",height:"0px","border-color":"transparent","border-style":"solid",position:"absolute",top:"-6px"},m={height:"0px","border-top":"1px dashed red",position:"absolute","z-index":9999};c.prototype={removeAll:function(){for(var a in this.hidden)this.hidden[a].remove(),delete this.hidden[a];for(a in this.visible)this.visible[a].remove(),delete this.visible[a]},hideLine:function(a){var c=a.getUniqueId();
-a.hide();this.hidden[c]=a;delete this.visible[c]},showLine:function(a){var c=a.getUniqueId();a.show();this.visible[c]=a;delete this.hidden[c]},hideVisible:function(){for(var a in this.visible)this.hideLine(this.visible[a])},placeLine:function(a,c){var e,f,h;if(e=this.getStyle(a.uid,a.type)){for(h in this.visible)if(this.visible[h].getCustomData("hash")!==this.hash){f=this.visible[h];break}if(!f)for(h in this.hidden)if(this.hidden[h].getCustomData("hash")!==this.hash){this.showLine(f=this.hidden[h]);
-break}f||this.showLine(f=this.addLine());f.setCustomData("hash",this.hash);this.visible[f.getUniqueId()]=f;f.setStyles(e);c&&c(f)}},getStyle:function(a,c){var e=this.relations[a],f=this.locations[a][c],h={};h.width=e.siblingRect?Math.max(e.siblingRect.width,e.elementRect.width):e.elementRect.width;h.top=this.inline?f+this.winTopScroll.y-this.rect.relativeY:this.rect.top+this.winTopScroll.y+f;if(h.top-this.winTopScroll.y<this.rect.top||h.top-this.winTopScroll.y>this.rect.bottom)return!1;this.inline?
-h.left=e.elementRect.left-this.rect.relativeX:(0<e.elementRect.left?h.left=this.rect.left+e.elementRect.left:(h.width+=e.elementRect.left,h.left=this.rect.left),0<(e=h.left+h.width-(this.rect.left+this.winPane.width))&&(h.width-=e));h.left+=this.winTopScroll.x;for(var k in h)h[k]=CKEDITOR.tools.cssLength(h[k]);return h},addLine:function(){var a=CKEDITOR.dom.element.createFromHtml(this.lineTpl);a.appendTo(this.container);return a},prepare:function(a,c){this.relations=a;this.locations=c;this.hash=Math.random()},
-cleanup:function(){var a,c;for(c in this.visible)a=this.visible[c],a.getCustomData("hash")!==this.hash&&this.hideLine(a)},queryViewport:function(){this.winPane=this.win.getViewPaneSize();this.winTopScroll=this.winTop.getScrollPosition();this.winTopPane=this.winTop.getViewPaneSize();this.rect=this.getClientRect(this.inline?this.editable:this.frame)},getClientRect:function(a){a=a.getClientRect();var c=this.container.getDocumentPosition(),e=this.container.getComputedStyle("position");a.relativeX=a.relativeY=
-0;"static"!=e&&(a.relativeY=c.y,a.relativeX=c.x,a.top-=a.relativeY,a.bottom-=a.relativeY,a.left-=a.relativeX,a.right-=a.relativeX);return a}};var l={left:1,right:1,center:1},k={absolute:1,fixed:1};CKEDITOR.plugins.lineutils={finder:a,locator:f,liner:c}}(),"use strict",function(){function a(a){this.editor=a;this.registered={};this.instances={};this.selected=[];this.widgetHoldingFocusedEditable=this.focused=null;this._={nextId:0,upcasts:[],upcastCallbacks:[],filters:{}};B(this);w(this);this.on("checkWidgets",
-l);this.editor.on("contentDomInvalidated",this.checkWidgets,this);r(this);x(this);A(this);q(this);C(this)}function f(a,b,c,d,e){var g=a.editor;CKEDITOR.tools.extend(this,d,{editor:g,id:b,inline:"span"==c.getParent().getName(),element:c,data:CKEDITOR.tools.extend({},"function"==typeof d.defaults?d.defaults():d.defaults),dataReady:!1,inited:!1,ready:!1,edit:f.prototype.edit,focusedEditable:null,definition:d,repository:a,draggable:!1!==d.draggable,_:{downcastFn:d.downcast&&"string"==typeof d.downcast?
-d.downcasts[d.downcast]:d.downcast}},!0);a.fire("instanceCreated",this);K(this,d);this.init&&this.init();this.inited=!0;(a=this.element.data("cke-widget-data"))&&this.setData(JSON.parse(decodeURIComponent(a)));e&&this.setData(e);this.data.classes||this.setData("classes",this.getClasses());this.dataReady=!0;U(this);this.fire("data",this.data);this.isInited()&&g.editable().contains(this.wrapper)&&(this.ready=!0,this.fire("ready"))}function c(a,b,c){CKEDITOR.dom.element.call(this,b.$);this.editor=a;
-this._={};b=this.filter=c.filter;CKEDITOR.dtd[this.getName()].p?(this.enterMode=b?b.getAllowedEnterMode(a.enterMode):a.enterMode,this.shiftEnterMode=b?b.getAllowedEnterMode(a.shiftEnterMode,!0):a.shiftEnterMode):this.enterMode=this.shiftEnterMode=CKEDITOR.ENTER_BR}function e(a,b){a.addCommand(b.name,{exec:function(a,c){function d(){a.widgets.finalizeCreation(h)}var e=a.widgets.focused;if(e&&e.name==b.name)e.edit();else if(b.insert)b.insert();else if(b.template){var e="function"==typeof b.defaults?
-b.defaults():b.defaults,e=CKEDITOR.dom.element.createFromHtml(b.template.output(e)),f,g=a.widgets.wrapElement(e,b.name),h=new CKEDITOR.dom.documentFragment(g.getDocument());h.append(g);(f=a.widgets.initOn(e,b,c&&c.startupData))?(e=f.once("edit",function(b){if(b.data.dialog)f.once("dialog",function(b){b=b.data;var c,e;c=b.once("ok",d,null,null,20);e=b.once("cancel",function(b){b.data&&!1===b.data.hide||a.widgets.destroy(f,!0)});b.once("hide",function(){c.removeListener();e.removeListener()})});else d()},
-null,null,999),f.edit(),e.removeListener()):d()}},allowedContent:b.allowedContent,requiredContent:b.requiredContent,contentForms:b.contentForms,contentTransformations:b.contentTransformations})}function h(a,b){function c(b,d,e){var f=CKEDITOR.tools.getIndex(a._.upcasts,function(a){return a[2]>e});0>f&&(f=a._.upcasts.length);a._.upcasts.splice(f,0,[b,d,e])}var d=b.upcast,e=b.upcastPriority||10;if(d)if("string"==typeof d)for(d=d.split(",");d.length;)c(b.upcasts[d.pop()],b.name,e);else c(d,b.name,e)}
-function m(a,b){a.focused=null;if(b.isInited()){var c=b.editor.checkDirty();a.fire("widgetBlurred",{widget:b});b.setFocused(!1);!c&&b.editor.resetDirty()}}function l(a){a=a.data;if("wysiwyg"==this.editor.mode){var b=this.editor.editable(),c=this.instances,d,e,g,h;if(b){for(d in c)c[d].isReady()&&!b.contains(c[d].wrapper)&&this.destroy(c[d],!0);if(a&&a.initOnlyNew)c=this.initOnAll();else{var k=b.find(".cke_widget_wrapper"),c=[];d=0;for(e=k.count();d<e;d++){g=k.getItem(d);if(h=!this.getByElement(g,
-!0)){a:{h=v;for(var l=g;l=l.getParent();)if(h(l)){h=!0;break a}h=!1}h=!h}h&&b.contains(g)&&(g.addClass("cke_widget_new"),c.push(this.initOn(g.getFirst(f.isDomWidgetElement))))}}a&&a.focusInited&&1==c.length&&c[0].focus()}}}function k(a,b,c){if(!c.allowedContent)return null;var d=this._.filters[a];d||(this._.filters[a]=d={});(a=d[b])||(d[b]=a=new CKEDITOR.filter(c.allowedContent));return a}function b(a){var b=[],c=a._.upcasts,d=a._.upcastCallbacks;return{toBeWrapped:b,iterator:function(a){var e,g,
-h,k,l;if("data-cke-widget-wrapper"in a.attributes)return(a=a.getFirst(f.isParserWidgetElement))&&b.push([a]),!1;if("data-widget"in a.attributes)return b.push([a]),!1;if(l=c.length){if(a.attributes["data-cke-widget-upcasted"])return!1;k=0;for(e=d.length;k<e;++k)if(!1===d[k](a))return;for(k=0;k<l;++k)if(e=c[k],h={},g=e[0](a,h))return g instanceof CKEDITOR.htmlParser.element&&(a=g),a.attributes["data-cke-widget-data"]=encodeURIComponent(JSON.stringify(h)),a.attributes["data-cke-widget-upcasted"]=1,b.push([a,
-e[1]]),!1}}}}function d(a){return{tabindex:-1,contenteditable:"false","data-cke-widget-wrapper":1,"data-cke-filter":"off","class":"cke_widget_wrapper cke_widget_new cke_widget_"+(a?"inline":"block")}}function g(a,b,c){if(a.type==CKEDITOR.NODE_ELEMENT){var d=CKEDITOR.dtd[a.name];if(d&&!d[c.name]){var d=a.split(b),e=a.parent;b=d.getIndex();a.children.length||(--b,a.remove());d.children.length||d.remove();return g(e,b,c)}}a.add(c,b)}function p(a,b){return"boolean"==typeof a.inline?a.inline:!!CKEDITOR.dtd.$inline[b]}
-function v(a){return a.hasAttribute("data-cke-temp")}function u(a,b,c,d){var e=a.editor;e.fire("lockSnapshot");c?(d=c.data("cke-widget-editable"),d=b.editables[d],a.widgetHoldingFocusedEditable=b,b.focusedEditable=d,c.addClass("cke_widget_editable_focused"),d.filter&&e.setActiveFilter(d.filter),e.setActiveEnterMode(d.enterMode,d.shiftEnterMode)):(d||b.focusedEditable.removeClass("cke_widget_editable_focused"),b.focusedEditable=null,a.widgetHoldingFocusedEditable=null,e.setActiveFilter(null),e.setActiveEnterMode(null,
-null));e.fire("unlockSnapshot")}function t(a){a.contextMenu&&a.contextMenu.addListener(function(b){if(b=a.widgets.getByElement(b,!0))return b.fire("contextMenu",{})})}function n(a,b){return CKEDITOR.tools.trim(b)}function q(a){var b=a.editor,c=CKEDITOR.plugins.lineutils;b.on("dragstart",function(c){var d=c.data.target;f.isDomDragHandler(d)&&(d=a.getByElement(d),c.data.dataTransfer.setData("cke/widget-id",d.id),b.focus(),d.focus())});b.on("drop",function(c){var d=c.data.dataTransfer,e=d.getData("cke/widget-id"),
-f=d.getTransferType(b),d=b.createRange();""!==e&&f===CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c.cancel():""!==e&&f==CKEDITOR.DATA_TRANSFER_INTERNAL&&(e=a.instances[e])&&(d.setStartBefore(e.wrapper),d.setEndAfter(e.wrapper),c.data.dragRange=d,delete CKEDITOR.plugins.clipboard.dragStartContainerChildCount,delete CKEDITOR.plugins.clipboard.dragEndContainerChildCount,c.data.dataTransfer.setData("text/html",b.editable().getHtmlFromRange(d).getHtml()),b.widgets.destroy(e,!0))});b.on("contentDom",function(){var d=
-b.editable();CKEDITOR.tools.extend(a,{finder:new c.finder(b,{lookups:{"default":function(b){if(!b.is(CKEDITOR.dtd.$listItem)&&b.is(CKEDITOR.dtd.$block)&&!f.isDomNestedEditable(b)&&!a._.draggedWidget.wrapper.contains(b)){var c=f.getNestedEditable(d,b);if(c){b=a._.draggedWidget;if(a.getByElement(c)==b)return;c=CKEDITOR.filter.instances[c.data("cke-filter")];b=b.requiredContent;if(c&&b&&!c.check(b))return}return CKEDITOR.LINEUTILS_BEFORE|CKEDITOR.LINEUTILS_AFTER}}}}),locator:new c.locator(b),liner:new c.liner(b,
-{lineStyle:{cursor:"move !important","border-top-color":"#666"},tipLeftStyle:{"border-left-color":"#666"},tipRightStyle:{"border-right-color":"#666"}})},!0)})}function x(a){var b=a.editor;b.on("contentDom",function(){var c=b.editable(),d=c.isInline()?c:b.document,e,g;c.attachListener(d,"mousedown",function(c){var d=c.data.getTarget();if(!d.type)return!1;e=a.getByElement(d);g=0;e&&(e.inline&&d.type==CKEDITOR.NODE_ELEMENT&&d.hasAttribute("data-cke-widget-drag-handler")?(g=1,a.focused!=e&&b.getSelection().removeAllRanges()):
-f.getNestedEditable(e.wrapper,d)?e=null:(c.data.preventDefault(),CKEDITOR.env.ie||e.focus()))});c.attachListener(d,"mouseup",function(){g&&e&&e.wrapper&&(g=0,e.focus())});CKEDITOR.env.ie&&c.attachListener(d,"mouseup",function(){setTimeout(function(){e&&e.wrapper&&c.contains(e.wrapper)&&(e.focus(),e=null)})})});b.on("doubleclick",function(b){var c=a.getByElement(b.data.element);if(c&&!f.getNestedEditable(c.wrapper,b.data.element))return c.fire("doubleclick",{element:b.data.element})},null,null,1)}
-function A(a){a.editor.on("key",function(b){var c=a.focused,d=a.widgetHoldingFocusedEditable,e;c?e=c.fire("key",{keyCode:b.data.keyCode}):d&&(c=b.data.keyCode,b=d.focusedEditable,c==CKEDITOR.CTRL+65?(c=b.getBogus(),d=d.editor.createRange(),d.selectNodeContents(b),c&&d.setEndAt(c,CKEDITOR.POSITION_BEFORE_START),d.select(),e=!1):8==c||46==c?(e=d.editor.getSelection().getRanges(),d=e[0],e=!(1==e.length&&d.collapsed&&d.checkBoundaryOfElement(b,CKEDITOR[8==c?"START":"END"]))):e=void 0);return e},null,
-null,1)}function C(a){function b(c){a.focused&&F(a.focused,"cut"==c.name)}var c=a.editor;c.on("contentDom",function(){var a=c.editable();a.attachListener(a,"copy",b);a.attachListener(a,"cut",b)})}function r(a){var b=a.editor;b.on("selectionCheck",function(){a.fire("checkSelection")});a.on("checkSelection",a.checkSelection,a);b.on("selectionChange",function(c){var d=(c=f.getNestedEditable(b.editable(),c.data.selection.getStartElement()))&&a.getByElement(c),e=a.widgetHoldingFocusedEditable;e?e===d&&
-e.focusedEditable.equals(c)||(u(a,e,null),d&&c&&u(a,d,c)):d&&c&&u(a,d,c)});b.on("dataReady",function(){z(a).commit()});b.on("blur",function(){var b;(b=a.focused)&&m(a,b);(b=a.widgetHoldingFocusedEditable)&&u(a,b,null)})}function w(a){var b=a.editor,c={};b.on("toDataFormat",function(b){var d=CKEDITOR.tools.getNextNumber(),e=[];b.data.downcastingSessionId=d;c[d]=e;b.data.dataValue.forEach(function(b){var c=b.attributes,d;if("data-cke-widget-id"in c){if(c=a.instances[c["data-cke-widget-id"]])d=b.getFirst(f.isParserWidgetElement),
-e.push({wrapper:b,element:d,widget:c,editables:{}}),"1"!=d.attributes["data-cke-widget-keep-attr"]&&delete d.attributes["data-widget"]}else if("data-cke-widget-editable"in c)return e[e.length-1].editables[c["data-cke-widget-editable"]]=b,!1},CKEDITOR.NODE_ELEMENT,!0)},null,null,8);b.on("toDataFormat",function(a){if(a.data.downcastingSessionId){a=c[a.data.downcastingSessionId];for(var b,d,e,f,g,h;b=a.shift();){d=b.widget;e=b.element;f=d._.downcastFn&&d._.downcastFn.call(d,e);for(h in b.editables)g=
-b.editables[h],delete g.attributes.contenteditable,g.setHtml(d.editables[h].getData());f||(f=e);b.wrapper.replaceWith(f)}}},null,null,13);b.on("contentDomUnload",function(){a.destroyAll(!0)})}function B(a){var c=a.editor,d,e;c.on("toHtml",function(c){var e=b(a),g;for(c.data.dataValue.forEach(e.iterator,CKEDITOR.NODE_ELEMENT,!0);g=e.toBeWrapped.pop();){var h=g[0],k=h.parent;k.type==CKEDITOR.NODE_ELEMENT&&k.attributes["data-cke-widget-wrapper"]&&k.replaceWith(h);a.wrapElement(g[0],g[1])}d=c.data.protectedWhitespaces?
-3==c.data.dataValue.children.length&&f.isParserWidgetWrapper(c.data.dataValue.children[1]):1==c.data.dataValue.children.length&&f.isParserWidgetWrapper(c.data.dataValue.children[0])},null,null,8);c.on("dataReady",function(){if(e)for(var b=c.editable().find(".cke_widget_wrapper"),d,g,h=0,k=b.count();h<k;++h)d=b.getItem(h),g=d.getFirst(f.isDomWidgetElement),g.type==CKEDITOR.NODE_ELEMENT&&g.data("widget")?(g.replace(d),a.wrapElement(g)):d.remove();e=0;a.destroyAll(!0);a.initOnAll()});c.on("loadSnapshot",
-function(b){/data-cke-widget/.test(b.data)&&(e=1);a.destroyAll(!0)},null,null,9);c.on("paste",function(a){a=a.data;a.dataValue=a.dataValue.replace(S,n);a.range&&(a=f.getNestedEditable(c.editable(),a.range.startContainer))&&(a=CKEDITOR.filter.instances[a.data("cke-filter")])&&c.setActiveFilter(a)});c.on("afterInsertHtml",function(b){b.data.intoRange?a.checkWidgets({initOnlyNew:!0}):(c.fire("lockSnapshot"),a.checkWidgets({initOnlyNew:!0,focusInited:d}),c.fire("unlockSnapshot"))})}function z(a){var b=
-a.selected,c=[],d=b.slice(0),e=null;return{select:function(a){0>CKEDITOR.tools.indexOf(b,a)&&c.push(a);a=CKEDITOR.tools.indexOf(d,a);0<=a&&d.splice(a,1);return this},focus:function(a){e=a;return this},commit:function(){var f=a.focused!==e,g,h;a.editor.fire("lockSnapshot");for(f&&(g=a.focused)&&m(a,g);g=d.pop();)b.splice(CKEDITOR.tools.indexOf(b,g),1),g.isInited()&&(h=g.editor.checkDirty(),g.setSelected(!1),!h&&g.editor.resetDirty());f&&e&&(h=a.editor.checkDirty(),a.focused=e,a.fire("widgetFocused",
-{widget:e}),e.setFocused(!0),!h&&a.editor.resetDirty());for(;g=c.pop();)b.push(g),g.setSelected(!0);a.editor.fire("unlockSnapshot")}}}function y(a,b,c){var d=0;b=E(b);var e=a.data.classes||{},f;if(b){for(e=CKEDITOR.tools.clone(e);f=b.pop();)c?e[f]||(d=e[f]=1):e[f]&&(delete e[f],d=1);d&&a.setData("classes",e)}}function D(a){a.cancel()}function F(a,b){var c=a.editor,d=c.document;if(!d.getById("cke_copybin")){var e=c.blockless||CKEDITOR.env.ie?"span":"div",f=d.createElement(e),g=d.createElement(e),e=
+"removeClass":"attachClass";a.editable()[c]("cke_show_blocks")}}};CKEDITOR.plugins.add("showblocks",{onLoad:function(){var a="p div pre address blockquote h1 h2 h3 h4 h5 h6".split(" "),c,f,h,m,l=CKEDITOR.getUrl(this.path),k=!(CKEDITOR.env.ie&&9>CKEDITOR.env.version),d=k?":not([contenteditable\x3dfalse]):not(.cke_show_blocks_off)":"",b,g;for(c=f=h=m="";b=a.pop();)g=a.length?",":"",c+=".cke_show_blocks "+b+d+g,h+=".cke_show_blocks.cke_contents_ltr "+b+d+g,m+=".cke_show_blocks.cke_contents_rtl "+b+d+
+g,f+=".cke_show_blocks "+b+d+"{background-image:url("+CKEDITOR.getUrl(l+"images/block_"+b+".png")+")}";CKEDITOR.addCss((c+"{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px}").concat(f,h+"{background-position:top left;padding-left:8px}",m+"{background-position:top right;padding-right:8px}"));k||CKEDITOR.addCss(".cke_show_blocks [contenteditable\x3dfalse],.cke_show_blocks .cke_show_blocks_off{border:none;padding-top:0;background-image:none}.cke_show_blocks.cke_contents_rtl [contenteditable\x3dfalse],.cke_show_blocks.cke_contents_rtl .cke_show_blocks_off{padding-right:0}.cke_show_blocks.cke_contents_ltr [contenteditable\x3dfalse],.cke_show_blocks.cke_contents_ltr .cke_show_blocks_off{padding-left:0}")},
+init:function(e){function c(){f.refresh(e)}if(!e.blockless){var f=e.addCommand("showblocks",a);f.canUndo=!1;e.config.startupOutlineBlocks&&f.setState(CKEDITOR.TRISTATE_ON);e.ui.addButton&&e.ui.addButton("ShowBlocks",{label:e.lang.showblocks.toolbar,command:"showblocks",toolbar:"tools,20"});e.on("mode",function(){f.state!=CKEDITOR.TRISTATE_DISABLED&&f.refresh(e)});e.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&(e.on("focus",c),e.on("blur",c));e.on("contentDom",function(){f.state!=CKEDITOR.TRISTATE_DISABLED&&
+f.refresh(e)})}}})}(),function(){var a={preserveState:!0,editorFocus:!1,readOnly:1,exec:function(a){this.toggleState();this.refresh(a)},refresh:function(a){if(a.document){var c=this.state==CKEDITOR.TRISTATE_ON?"attachClass":"removeClass";a.editable()[c]("cke_show_borders")}}};CKEDITOR.plugins.add("showborders",{modes:{wysiwyg:1},onLoad:function(){var a;a=(CKEDITOR.env.ie6Compat?[".%1 table.%2,",".%1 table.%2 td, .%1 table.%2 th","{","border : #d3d3d3 1px dotted","}"]:".%1 table.%2,;.%1 table.%2 \x3e tr \x3e td, .%1 table.%2 \x3e tr \x3e th,;.%1 table.%2 \x3e tbody \x3e tr \x3e td, .%1 table.%2 \x3e tbody \x3e tr \x3e th,;.%1 table.%2 \x3e thead \x3e tr \x3e td, .%1 table.%2 \x3e thead \x3e tr \x3e th,;.%1 table.%2 \x3e tfoot \x3e tr \x3e td, .%1 table.%2 \x3e tfoot \x3e tr \x3e th;{;border : #d3d3d3 1px dotted;}".split(";")).join("").replace(/%2/g,
+"cke_show_border").replace(/%1/g,"cke_show_borders ");CKEDITOR.addCss(a)},init:function(e){var c=e.addCommand("showborders",a);c.canUndo=!1;!1!==e.config.startupShowBorders&&c.setState(CKEDITOR.TRISTATE_ON);e.on("mode",function(){c.state!=CKEDITOR.TRISTATE_DISABLED&&c.refresh(e)},null,null,100);e.on("contentDom",function(){c.state!=CKEDITOR.TRISTATE_DISABLED&&c.refresh(e)});e.on("removeFormatCleanup",function(a){a=a.data;e.getCommand("showborders").state==CKEDITOR.TRISTATE_ON&&a.is("table")&&(!a.hasAttribute("border")||
+0>=parseInt(a.getAttribute("border"),10))&&a.addClass("cke_show_border")})},afterInit:function(a){var c=a.dataProcessor;a=c&&c.dataFilter;c=c&&c.htmlFilter;a&&a.addRules({elements:{table:function(a){a=a.attributes;var c=a["class"],e=parseInt(a.border,10);e&&!(0>=e)||c&&-1!=c.indexOf("cke_show_border")||(a["class"]=(c||"")+" cke_show_border")}}});c&&c.addRules({elements:{table:function(a){a=a.attributes;var c=a["class"];c&&(a["class"]=c.replace("cke_show_border","").replace(/\s{2}/," ").replace(/^\s+|\s+$/,
+""))}}})}});CKEDITOR.on("dialogDefinition",function(a){var c=a.data.name;if("table"==c||"tableProperties"==c)if(a=a.data.definition,c=a.getContents("info").get("txtBorder"),c.commit=CKEDITOR.tools.override(c.commit,function(a){return function(c,e){a.apply(this,arguments);var l=parseInt(this.getValue(),10);e[!l||0>=l?"addClass":"removeClass"]("cke_show_border")}}),a=(a=a.getContents("advanced"))&&a.get("advCSSClasses"))a.setup=CKEDITOR.tools.override(a.setup,function(a){return function(){a.apply(this,
+arguments);this.setValue(this.getValue().replace(/cke_show_border/,""))}}),a.commit=CKEDITOR.tools.override(a.commit,function(a){return function(c,e){a.apply(this,arguments);parseInt(e.getAttribute("border"),10)||e.addClass("cke_show_border")}})})}(),function(){function a(a){return CKEDITOR.env.ie?a.$.clientWidth:parseInt(a.getComputedStyle("width"),10)}function e(a,b){var c=a.getComputedStyle("border-"+b+"-width"),e={thin:"0px",medium:"1px",thick:"2px"};0>c.indexOf("px")&&(c=c in e&&"none"!=a.getComputedStyle("border-style")?
+e[c]:0);return parseInt(c,10)}function c(a){var b=[],c=-1,f="rtl"==a.getComputedStyle("direction"),h;h=a.$.rows;for(var k=0,l,m,q,u=0,B=h.length;u<B;u++)q=h[u],l=q.cells.length,l>k&&(k=l,m=q);h=m;k=new CKEDITOR.dom.element(a.$.tBodies[0]);l=k.getDocumentPosition();m=0;for(q=h.cells.length;m<q;m++){var u=new CKEDITOR.dom.element(h.cells[m]),B=h.cells[m+1]&&new CKEDITOR.dom.element(h.cells[m+1]),c=c+(u.$.colSpan||1),y,t,x=u.getDocumentPosition().x;f?t=x+e(u,"left"):y=x+u.$.offsetWidth-e(u,"right");
+B?(x=B.getDocumentPosition().x,f?y=x+B.$.offsetWidth-e(B,"right"):t=x+e(B,"left")):(x=a.getDocumentPosition().x,f?y=x:t=x+a.$.offsetWidth);u=Math.max(t-y,3);b.push({table:a,index:c,x:y,y:l.y,width:u,height:k.$.offsetHeight,rtl:f})}return b}function f(a){(a.data||a).preventDefault()}function h(d){function b(){u=0;q.setOpacity(0);y&&c();var a=w.table;setTimeout(function(){a.removeCustomData("_cke_table_pillars")},0);n.removeListener("dragstart",f)}function c(){for(var b=w.rtl,g=b?x.length:t.length,
+f=0,h=0;h<g;h++){var k=t[h],m=x[h],n=w.table;CKEDITOR.tools.setTimeout(function(a,c,e,h,k,m){a&&a.setStyle("width",l(Math.max(c+m,1)));e&&e.setStyle("width",l(Math.max(h-m,1)));k&&n.setStyle("width",l(k+m*(b?-1:1)));++f==g&&d.fire("saveSnapshot")},0,this,[k,k&&a(k),m,m&&a(m),(!k||!m)&&a(n)+e(n,"left")+e(n,"right"),y])}}function h(b){f(b);d.fire("saveSnapshot");b=w.index;for(var c=CKEDITOR.tools.buildTableMap(w.table),e=[],g=[],k=Number.MAX_VALUE,l=k,p=w.rtl,A=0,S=c.length;A<S;A++){var L=c[A],R=L[b+
+(p?1:0)],L=L[b+(p?0:1)],R=R&&new CKEDITOR.dom.element(R),L=L&&new CKEDITOR.dom.element(L);R&&L&&R.equals(L)||(R&&(k=Math.min(k,a(R))),L&&(l=Math.min(l,a(L))),e.push(R),g.push(L))}t=e;x=g;F=w.x-k;z=w.x+l;q.setOpacity(.5);B=parseInt(q.getStyle("left"),10);y=0;u=1;q.on("mousemove",r);n.on("dragstart",f);n.on("mouseup",m,this)}function m(a){a.removeListener();b()}function r(a){A(a.data.getPageOffset().x)}var w,n,q,u,B,y,t,x,F,z;n=d.document;q=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-temp\x3d1 contenteditable\x3dfalse unselectable\x3don style\x3d"position:absolute;cursor:col-resize;filter:alpha(opacity\x3d0);opacity:0;padding:0;background-color:#004;background-image:none;border:0px none;z-index:10"\x3e\x3c/div\x3e',
+n);d.on("destroy",function(){q.remove()});k||n.getDocumentElement().append(q);this.attachTo=function(a){u||(k&&(n.getBody().append(q),y=0),w=a,q.setStyles({width:l(a.width),height:l(a.height),left:l(a.x),top:l(a.y)}),k&&q.setOpacity(.25),q.on("mousedown",h,this),n.getBody().setStyle("cursor","col-resize"),q.show())};var A=this.move=function(a){if(!w)return 0;if(!u&&(a<w.x||a>w.x+w.width))return w=null,u=y=0,n.removeListener("mouseup",m),q.removeListener("mousedown",h),q.removeListener("mousemove",
+r),n.getBody().setStyle("cursor","auto"),k?q.remove():q.hide(),0;a-=Math.round(q.$.offsetWidth/2);if(u){if(a==F||a==z)return 1;a=Math.max(a,F);a=Math.min(a,z);y=a-B}q.setStyle("left",l(a));return 1}}function m(a){var b=a.data.getTarget();if("mouseout"==a.name){if(!b.is("table"))return;for(var c=new CKEDITOR.dom.element(a.data.$.relatedTarget||a.data.$.toElement);c&&c.$&&!c.equals(b)&&!c.is("body");)c=c.getParent();if(!c||c.equals(b))return}b.getAscendant("table",1).removeCustomData("_cke_table_pillars");
+a.removeListener()}var l=CKEDITOR.tools.cssLength,k=CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks);CKEDITOR.plugins.add("tableresize",{requires:"tabletools",init:function(a){a.on("contentDom",function(){var b,e=a.editable();e.attachListener(e.isInline()?e:a.document,"mousemove",function(e){e=e.data;var g=e.getTarget();if(g.type==CKEDITOR.NODE_ELEMENT){var k=e.getPageOffset().x;if(b&&b.move(k))f(e);else if(g.is("table")||g.getAscendant("tbody",1))if(g=g.getAscendant("table",1),a.editable().contains(g)){(e=
+g.getCustomData("_cke_table_pillars"))||(g.setCustomData("_cke_table_pillars",e=c(g)),g.on("mouseout",m),g.on("mousedown",m));a:{for(var g=0,l=e.length;g<l;g++){var n=e[g];if(k>=n.x&&k<=n.x+n.width){k=n;break a}}k=null}k&&(!b&&(b=new h(a)),b.attachTo(k))}}})})}})}(),function(){function a(a,f,h){var m,l;if(h="string"==typeof h?CKEDITOR.document.getById(h):new CKEDITOR.dom.element(h))if(m=a.fire("uiSpace",{space:f,html:""}).html)a.on("uiSpace",function(a){a.data.space==f&&a.cancel()},null,null,1),l=
+h.append(CKEDITOR.dom.element.createFromHtml(e.output({id:a.id,name:a.name,langDir:a.lang.dir,langCode:a.langCode,space:f,spaceId:a.ui.spaceId(f),content:m}))),h.getCustomData("cke_hasshared")?l.hide():h.setCustomData("cke_hasshared",1),l.unselectable(),l.on("mousedown",function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()}),a.focusManager.add(l,1),a.on("focus",function(){for(var a=0,d,b=h.getChildren();d=b.getItem(a);a++)d.type==CKEDITOR.NODE_ELEMENT&&!d.equals(l)&&d.hasClass("cke_shared")&&
+d.hide();l.show()}),a.on("destroy",function(){l.remove()})}var e=CKEDITOR.addTemplate("sharedcontainer",'\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_shared cke_detached cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?" ":"")+'" lang\x3d"{langCode}" role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{spaceId}" class\x3d"cke_{space}" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e');
+CKEDITOR.plugins.add("sharedspace",{init:function(c){c.on("loaded",function(){var e=c.config.sharedSpaces;if(e)for(var h in e)a(c,h,e[h])},null,null,9)}})}(),CKEDITOR.plugins.add("sourcedialog",{init:function(a){a.addCommand("sourcedialog",new CKEDITOR.dialogCommand("sourcedialog"));CKEDITOR.dialog.add("sourcedialog",this.path+"dialogs/sourcedialog.js");a.ui.addButton&&a.ui.addButton("Sourcedialog",{label:a.lang.sourcedialog.toolbar,command:"sourcedialog",toolbar:"mode,10"})}}),"use strict",function(){function a(a,
+b){CKEDITOR.tools.extend(this,{editor:a,editable:a.editable(),doc:a.document,win:a.window},b,!0);this.inline=this.editable.isInline();this.inline||(this.frame=this.win.getFrame());this.target=this[this.inline?"editable":"doc"]}function e(a,b){CKEDITOR.tools.extend(this,b,{editor:a},!0)}function c(a,b){var c=a.editable();CKEDITOR.tools.extend(this,{editor:a,editable:c,inline:c.isInline(),doc:a.document,win:a.window,container:CKEDITOR.document.getBody(),winTop:CKEDITOR.document.getWindow()},b,!0);this.hidden=
+{};this.visible={};this.inline||(this.frame=this.win.getFrame());this.queryViewport();var e=CKEDITOR.tools.bind(this.queryViewport,this),f=CKEDITOR.tools.bind(this.hideVisible,this),k=CKEDITOR.tools.bind(this.removeAll,this);c.attachListener(this.winTop,"resize",e);c.attachListener(this.winTop,"scroll",e);c.attachListener(this.winTop,"resize",f);c.attachListener(this.win,"scroll",f);c.attachListener(this.inline?c:this.frame,"mouseout",function(a){var b=a.data.$.clientX;a=a.data.$.clientY;this.queryViewport();
+(b<=this.rect.left||b>=this.rect.right||a<=this.rect.top||a>=this.rect.bottom)&&this.hideVisible();(0>=b||b>=this.winTopPane.width||0>=a||a>=this.winTopPane.height)&&this.hideVisible()},this);c.attachListener(a,"resize",e);c.attachListener(a,"mode",k);a.on("destroy",k);this.lineTpl=(new CKEDITOR.template('\x3cdiv data-cke-lineutils-line\x3d"1" class\x3d"cke_reset_all" style\x3d"{lineStyle}"\x3e\x3cspan style\x3d"{tipLeftStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3cspan style\x3d"{tipRightStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3c/div\x3e')).output({lineStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},
+m,this.lineStyle,!0)),tipLeftStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},h,{left:"0px","border-left-color":"red","border-width":"6px 0 6px 6px"},this.tipCss,this.tipLeftStyle,!0)),tipRightStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},h,{right:"0px","border-right-color":"red","border-width":"6px 6px 6px 0"},this.tipCss,this.tipRightStyle,!0))})}function f(a){var b;if(b=a&&a.type==CKEDITOR.NODE_ELEMENT)b=!(l[a.getComputedStyle("float")]||l[a.getAttribute("align")]);return b&&
+!k[a.getComputedStyle("position")]}CKEDITOR.plugins.add("lineutils");CKEDITOR.LINEUTILS_BEFORE=1;CKEDITOR.LINEUTILS_AFTER=2;CKEDITOR.LINEUTILS_INSIDE=4;a.prototype={start:function(a){var b=this,c=this.editor,e=this.doc,f,h,k,l,m=CKEDITOR.tools.eventsBuffer(50,function(){c.readOnly||"wysiwyg"!=c.mode||(b.relations={},(h=e.$.elementFromPoint(k,l))&&h.nodeType&&(f=new CKEDITOR.dom.element(h),b.traverseSearch(f),isNaN(k+l)||b.pixelSearch(f,k,l),a&&a(b.relations,k,l)))});this.listener=this.editable.attachListener(this.target,
+"mousemove",function(a){k=a.data.$.clientX;l=a.data.$.clientY;m.input()});this.editable.attachListener(this.inline?this.editable:this.frame,"mouseout",function(){m.reset()})},stop:function(){this.listener&&this.listener.removeListener()},getRange:function(){var a={};a[CKEDITOR.LINEUTILS_BEFORE]=CKEDITOR.POSITION_BEFORE_START;a[CKEDITOR.LINEUTILS_AFTER]=CKEDITOR.POSITION_AFTER_END;a[CKEDITOR.LINEUTILS_INSIDE]=CKEDITOR.POSITION_AFTER_START;return function(b){var c=this.editor.createRange();c.moveToPosition(this.relations[b.uid].element,
+a[b.type]);return c}}(),store:function(){function a(b,d,c){var e=b.getUniqueId();e in c?c[e].type|=d:c[e]={element:b,type:d}}return function(b,c){var e;c&CKEDITOR.LINEUTILS_AFTER&&f(e=b.getNext())&&e.isVisible()&&(a(e,CKEDITOR.LINEUTILS_BEFORE,this.relations),c^=CKEDITOR.LINEUTILS_AFTER);c&CKEDITOR.LINEUTILS_INSIDE&&f(e=b.getFirst())&&e.isVisible()&&(a(e,CKEDITOR.LINEUTILS_BEFORE,this.relations),c^=CKEDITOR.LINEUTILS_INSIDE);a(b,c,this.relations)}}(),traverseSearch:function(a){var b,c,e;do if(e=a.$["data-cke-expando"],
+!(e&&e in this.relations)){if(a.equals(this.editable))break;if(f(a))for(b in this.lookups)(c=this.lookups[b](a))&&this.store(a,c)}while((!a||a.type!=CKEDITOR.NODE_ELEMENT||"true"!=a.getAttribute("contenteditable"))&&(a=a.getParent()))},pixelSearch:function(){function a(c,d,e,h,k){for(var l=0,m;k(e);){e+=h;if(25==++l)break;if(m=this.doc.$.elementFromPoint(d,e))if(m==c)l=0;else if(b(c,m)&&(l=0,f(m=new CKEDITOR.dom.element(m))))return m}}var b=CKEDITOR.env.ie||CKEDITOR.env.webkit?function(a,b){return a.contains(b)}:
+function(a,b){return!!(a.compareDocumentPosition(b)&16)};return function(b,c,e){var h=this.win.getViewPaneSize().height,k=a.call(this,b.$,c,e,-1,function(a){return 0<a});c=a.call(this,b.$,c,e,1,function(a){return a<h});if(k)for(this.traverseSearch(k);!k.getParent().equals(b);)k=k.getParent();if(c)for(this.traverseSearch(c);!c.getParent().equals(b);)c=c.getParent();for(;k||c;){k&&(k=k.getNext(f));if(!k||k.equals(c))break;this.traverseSearch(k);c&&(c=c.getPrevious(f));if(!c||c.equals(k))break;this.traverseSearch(c)}}}(),
+greedySearch:function(){this.relations={};for(var a=this.editable.getElementsByTag("*"),b=0,c,e,h;c=a.getItem(b++);)if(!c.equals(this.editable)&&c.type==CKEDITOR.NODE_ELEMENT&&(c.hasAttribute("contenteditable")||!c.isReadOnly())&&f(c)&&c.isVisible())for(h in this.lookups)(e=this.lookups[h](c))&&this.store(c,e);return this.relations}};e.prototype={locate:function(){function a(b,c){var d=b.element[c===CKEDITOR.LINEUTILS_BEFORE?"getPrevious":"getNext"]();return d&&f(d)?(b.siblingRect=d.getClientRect(),
+c==CKEDITOR.LINEUTILS_BEFORE?(b.siblingRect.bottom+b.elementRect.top)/2:(b.elementRect.bottom+b.siblingRect.top)/2):c==CKEDITOR.LINEUTILS_BEFORE?b.elementRect.top:b.elementRect.bottom}return function(b){var c;this.locations={};for(var e in b)c=b[e],c.elementRect=c.element.getClientRect(),c.type&CKEDITOR.LINEUTILS_BEFORE&&this.store(e,CKEDITOR.LINEUTILS_BEFORE,a(c,CKEDITOR.LINEUTILS_BEFORE)),c.type&CKEDITOR.LINEUTILS_AFTER&&this.store(e,CKEDITOR.LINEUTILS_AFTER,a(c,CKEDITOR.LINEUTILS_AFTER)),c.type&
+CKEDITOR.LINEUTILS_INSIDE&&this.store(e,CKEDITOR.LINEUTILS_INSIDE,(c.elementRect.top+c.elementRect.bottom)/2);return this.locations}}(),sort:function(){var a,b,c,e;return function(f,h){a=this.locations;b=[];for(var k in a)for(var l in a[k])if(c=Math.abs(f-a[k][l]),b.length){for(e=0;e<b.length;e++)if(c<b[e].dist){b.splice(e,0,{uid:+k,type:l,dist:c});break}e==b.length&&b.push({uid:+k,type:l,dist:c})}else b.push({uid:+k,type:l,dist:c});return"undefined"!=typeof h?b.slice(0,h):b}}(),store:function(a,
+b,c){this.locations[a]||(this.locations[a]={});this.locations[a][b]=c}};var h={display:"block",width:"0px",height:"0px","border-color":"transparent","border-style":"solid",position:"absolute",top:"-6px"},m={height:"0px","border-top":"1px dashed red",position:"absolute","z-index":9999};c.prototype={removeAll:function(){for(var a in this.hidden)this.hidden[a].remove(),delete this.hidden[a];for(a in this.visible)this.visible[a].remove(),delete this.visible[a]},hideLine:function(a){var b=a.getUniqueId();
+a.hide();this.hidden[b]=a;delete this.visible[b]},showLine:function(a){var b=a.getUniqueId();a.show();this.visible[b]=a;delete this.hidden[b]},hideVisible:function(){for(var a in this.visible)this.hideLine(this.visible[a])},placeLine:function(a,b){var c,e,f;if(c=this.getStyle(a.uid,a.type)){for(f in this.visible)if(this.visible[f].getCustomData("hash")!==this.hash){e=this.visible[f];break}if(!e)for(f in this.hidden)if(this.hidden[f].getCustomData("hash")!==this.hash){this.showLine(e=this.hidden[f]);
+break}e||this.showLine(e=this.addLine());e.setCustomData("hash",this.hash);this.visible[e.getUniqueId()]=e;e.setStyles(c);b&&b(e)}},getStyle:function(a,b){var c=this.relations[a],e=this.locations[a][b],f={};f.width=c.siblingRect?Math.max(c.siblingRect.width,c.elementRect.width):c.elementRect.width;f.top=this.inline?e+this.winTopScroll.y-this.rect.relativeY:this.rect.top+this.winTopScroll.y+e;if(f.top-this.winTopScroll.y<this.rect.top||f.top-this.winTopScroll.y>this.rect.bottom)return!1;this.inline?
+f.left=c.elementRect.left-this.rect.relativeX:(0<c.elementRect.left?f.left=this.rect.left+c.elementRect.left:(f.width+=c.elementRect.left,f.left=this.rect.left),0<(c=f.left+f.width-(this.rect.left+this.winPane.width))&&(f.width-=c));f.left+=this.winTopScroll.x;for(var h in f)f[h]=CKEDITOR.tools.cssLength(f[h]);return f},addLine:function(){var a=CKEDITOR.dom.element.createFromHtml(this.lineTpl);a.appendTo(this.container);return a},prepare:function(a,b){this.relations=a;this.locations=b;this.hash=Math.random()},
+cleanup:function(){var a,b;for(b in this.visible)a=this.visible[b],a.getCustomData("hash")!==this.hash&&this.hideLine(a)},queryViewport:function(){this.winPane=this.win.getViewPaneSize();this.winTopScroll=this.winTop.getScrollPosition();this.winTopPane=this.winTop.getViewPaneSize();this.rect=this.getClientRect(this.inline?this.editable:this.frame)},getClientRect:function(a){a=a.getClientRect();var b=this.container.getDocumentPosition(),c=this.container.getComputedStyle("position");a.relativeX=a.relativeY=
+0;"static"!=c&&(a.relativeY=b.y,a.relativeX=b.x,a.top-=a.relativeY,a.bottom-=a.relativeY,a.left-=a.relativeX,a.right-=a.relativeX);return a}};var l={left:1,right:1,center:1},k={absolute:1,fixed:1};CKEDITOR.plugins.lineutils={finder:a,locator:e,liner:c}}(),function(){function a(a){return a.getName&&!a.hasAttribute("data-cke-temp")}CKEDITOR.plugins.add("widgetselection",{init:function(a){if(CKEDITOR.env.webkit){var c=CKEDITOR.plugins.widgetselection;a.on("contentDom",function(a){a=a.editor;var e=a.document,
+m=a.editable();m.attachListener(e,"keydown",function(a){var e=a.data.$;65==a.data.getKey()&&(CKEDITOR.env.mac&&e.metaKey||!CKEDITOR.env.mac&&e.ctrlKey)&&CKEDITOR.tools.setTimeout(function(){c.addFillers(m)||c.removeFillers(m)},0)},null,null,-1);a.on("selectionCheck",function(a){c.removeFillers(a.editor.editable())});a.on("paste",function(a){a.data.dataValue=c.cleanPasteData(a.data.dataValue)});"selectall"in a.plugins&&c.addSelectAllIntegration(a)})}}});CKEDITOR.plugins.widgetselection={startFiller:null,
+endFiller:null,fillerAttribute:"data-cke-filler-webkit",fillerContent:"\x26nbsp;",fillerTagName:"div",addFillers:function(e){var c=e.editor;if(!this.isWholeContentSelected(e)&&0<e.getChildCount()){var f=e.getFirst(a),h=e.getLast(a);f&&f.type==CKEDITOR.NODE_ELEMENT&&!f.isEditable()&&(this.startFiller=this.createFiller(),e.append(this.startFiller,1));h&&h.type==CKEDITOR.NODE_ELEMENT&&!h.isEditable()&&(this.endFiller=this.createFiller(!0),e.append(this.endFiller,0));if(this.hasFiller(e))return c=c.createRange(),
+c.selectNodeContents(e),c.select(),!0}return!1},removeFillers:function(a){if(this.hasFiller(a)&&!this.isWholeContentSelected(a)){var c=a.findOne(this.fillerTagName+"["+this.fillerAttribute+"\x3dstart]"),f=a.findOne(this.fillerTagName+"["+this.fillerAttribute+"\x3dend]");this.startFiller&&c&&this.startFiller.equals(c)?this.removeFiller(this.startFiller,a):this.startFiller=c;this.endFiller&&f&&this.endFiller.equals(f)?this.removeFiller(this.endFiller,a):this.endFiller=f}},cleanPasteData:function(a){a&&
+a.length&&(a=a.replace(this.createFillerRegex(),"").replace(this.createFillerRegex(!0),""));return a},isWholeContentSelected:function(a){var c=a.editor.getSelection().getRanges()[0];return!c||c&&c.collapsed?!1:(c=c.clone(),c.enlarge(CKEDITOR.ENLARGE_ELEMENT),!!(c&&a&&c.startContainer&&c.endContainer&&0===c.startOffset&&c.endOffset===a.getChildCount()&&c.startContainer.equals(a)&&c.endContainer.equals(a)))},hasFiller:function(a){return 0<a.find(this.fillerTagName+"["+this.fillerAttribute+"]").count()},
+createFiller:function(a){var c=new CKEDITOR.dom.element(this.fillerTagName);c.setHtml(this.fillerContent);c.setAttribute(this.fillerAttribute,a?"end":"start");c.setAttribute("data-cke-temp",1);c.setStyles({display:"block",width:0,height:0,padding:0,border:0,margin:0,position:"absolute",top:0,left:"-9999px",opacity:0,overflow:"hidden"});return c},removeFiller:function(a,c){if(a){var f=c.editor,h=c.editor.getSelection().getRanges()[0].startPath(),m=f.createRange(),l,k;h.contains(a)&&(l=a.getHtml(),
+k=!0);h="start"==a.getAttribute(this.fillerAttribute);a.remove();l&&0<l.length&&l!=this.fillerContent?(c.insertHtmlIntoRange(l,f.getSelection().getRanges()[0]),m.setStartAt(c.getChild(c.getChildCount()-1),CKEDITOR.POSITION_BEFORE_END),f.getSelection().selectRanges([m])):k&&(h?m.setStartAt(c.getFirst().getNext(),CKEDITOR.POSITION_AFTER_START):m.setEndAt(c.getLast().getPrevious(),CKEDITOR.POSITION_BEFORE_END),c.editor.getSelection().selectRanges([m]))}},createFillerRegex:function(a){var c=this.createFiller(a).getOuterHtml().replace(/style="[^"]*"/gi,
+'style\x3d"[^"]*"').replace(/>[^<]*</gi,"\x3e[^\x3c]*\x3c");return new RegExp((a?"":"^")+c+(a?"$":""))},addSelectAllIntegration:function(a){var c=this;a.editable().attachListener(a,"beforeCommandExec",function(f){var h=a.editable();"selectAll"==f.data.name&&h&&c.addFillers(h)},null,null,9999)}}}(),"use strict",function(){function a(a){this.editor=a;this.registered={};this.instances={};this.selected=[];this.widgetHoldingFocusedEditable=this.focused=null;this._={nextId:0,upcasts:[],upcastCallbacks:[],
+filters:{}};F(this);x(this);this.on("checkWidgets",l);this.editor.on("contentDomInvalidated",this.checkWidgets,this);t(this);u(this);B(this);q(this);y(this)}function e(a,b,c,d,f){var g=a.editor;CKEDITOR.tools.extend(this,d,{editor:g,id:b,inline:"span"==c.getParent().getName(),element:c,data:CKEDITOR.tools.extend({},"function"==typeof d.defaults?d.defaults():d.defaults),dataReady:!1,inited:!1,ready:!1,edit:e.prototype.edit,focusedEditable:null,definition:d,repository:a,draggable:!1!==d.draggable,_:{downcastFn:d.downcast&&
+"string"==typeof d.downcast?d.downcasts[d.downcast]:d.downcast}},!0);a.fire("instanceCreated",this);T(this,d);this.init&&this.init();this.inited=!0;(a=this.element.data("cke-widget-data"))&&this.setData(JSON.parse(decodeURIComponent(a)));f&&this.setData(f);this.data.classes||this.setData("classes",this.getClasses());this.dataReady=!0;W(this);this.fire("data",this.data);this.isInited()&&g.editable().contains(this.wrapper)&&(this.ready=!0,this.fire("ready"))}function c(a,b,c){CKEDITOR.dom.element.call(this,
+b.$);this.editor=a;this._={};b=this.filter=c.filter;CKEDITOR.dtd[this.getName()].p?(this.enterMode=b?b.getAllowedEnterMode(a.enterMode):a.enterMode,this.shiftEnterMode=b?b.getAllowedEnterMode(a.shiftEnterMode,!0):a.shiftEnterMode):this.enterMode=this.shiftEnterMode=CKEDITOR.ENTER_BR}function f(a,b){a.addCommand(b.name,{exec:function(a,c){function d(){a.widgets.finalizeCreation(h)}var e=a.widgets.focused;if(e&&e.name==b.name)e.edit();else if(b.insert)b.insert();else if(b.template){var e="function"==
+typeof b.defaults?b.defaults():b.defaults,e=CKEDITOR.dom.element.createFromHtml(b.template.output(e)),f,g=a.widgets.wrapElement(e,b.name),h=new CKEDITOR.dom.documentFragment(g.getDocument());h.append(g);(f=a.widgets.initOn(e,b,c&&c.startupData))?(e=f.once("edit",function(b){if(b.data.dialog)f.once("dialog",function(b){b=b.data;var c,e;c=b.once("ok",d,null,null,20);e=b.once("cancel",function(b){b.data&&!1===b.data.hide||a.widgets.destroy(f,!0)});b.once("hide",function(){c.removeListener();e.removeListener()})});
+else d()},null,null,999),f.edit(),e.removeListener()):d()}},allowedContent:b.allowedContent,requiredContent:b.requiredContent,contentForms:b.contentForms,contentTransformations:b.contentTransformations})}function h(a,b){function c(b,d,e){var f=CKEDITOR.tools.getIndex(a._.upcasts,function(a){return a[2]>e});0>f&&(f=a._.upcasts.length);a._.upcasts.splice(f,0,[b,d,e])}var d=b.upcast,e=b.upcastPriority||10;if(d)if("string"==typeof d)for(d=d.split(",");d.length;)c(b.upcasts[d.pop()],b.name,e);else c(d,
+b.name,e)}function m(a,b){a.focused=null;if(b.isInited()){var c=b.editor.checkDirty();a.fire("widgetBlurred",{widget:b});b.setFocused(!1);!c&&b.editor.resetDirty()}}function l(a){a=a.data;if("wysiwyg"==this.editor.mode){var b=this.editor.editable(),c=this.instances,d,f,g,h;if(b){for(d in c)c[d].isReady()&&!b.contains(c[d].wrapper)&&this.destroy(c[d],!0);if(a&&a.initOnlyNew)c=this.initOnAll();else{var k=b.find(".cke_widget_wrapper"),c=[];d=0;for(f=k.count();d<f;d++){g=k.getItem(d);if(h=!this.getByElement(g,
+!0)){a:{h=v;for(var l=g;l=l.getParent();)if(h(l)){h=!0;break a}h=!1}h=!h}h&&b.contains(g)&&(g.addClass("cke_widget_new"),c.push(this.initOn(g.getFirst(e.isDomWidgetElement))))}}a&&a.focusInited&&1==c.length&&c[0].focus()}}}function k(a,b,c){if(!c.allowedContent)return null;var d=this._.filters[a];d||(this._.filters[a]=d={});(a=d[b])||(d[b]=a=new CKEDITOR.filter(c.allowedContent));return a}function d(a){var b=[],c=a._.upcasts,d=a._.upcastCallbacks;return{toBeWrapped:b,iterator:function(a){var f,g,
+h,k,l;if("data-cke-widget-wrapper"in a.attributes)return(a=a.getFirst(e.isParserWidgetElement))&&b.push([a]),!1;if("data-widget"in a.attributes)return b.push([a]),!1;if(l=c.length){if(a.attributes["data-cke-widget-upcasted"])return!1;k=0;for(f=d.length;k<f;++k)if(!1===d[k](a))return;for(k=0;k<l;++k)if(f=c[k],h={},g=f[0](a,h))return g instanceof CKEDITOR.htmlParser.element&&(a=g),a.attributes["data-cke-widget-data"]=encodeURIComponent(JSON.stringify(h)),a.attributes["data-cke-widget-upcasted"]=1,b.push([a,
+f[1]]),!1}}}}function b(a,b){return{tabindex:-1,contenteditable:"false","data-cke-widget-wrapper":1,"data-cke-filter":"off","class":"cke_widget_wrapper cke_widget_new cke_widget_"+(a?"inline":"block")+(b?" cke_widget_"+b:"")}}function g(a,b,c){if(a.type==CKEDITOR.NODE_ELEMENT){var d=CKEDITOR.dtd[a.name];if(d&&!d[c.name]){var d=a.split(b),e=a.parent;b=d.getIndex();a.children.length||(--b,a.remove());d.children.length||d.remove();return g(e,b,c)}}a.add(c,b)}function p(a,b){return"boolean"==typeof a.inline?
+a.inline:!!CKEDITOR.dtd.$inline[b]}function v(a){return a.hasAttribute("data-cke-temp")}function r(a,b,c,d){var e=a.editor;e.fire("lockSnapshot");c?(d=c.data("cke-widget-editable"),d=b.editables[d],a.widgetHoldingFocusedEditable=b,b.focusedEditable=d,c.addClass("cke_widget_editable_focused"),d.filter&&e.setActiveFilter(d.filter),e.setActiveEnterMode(d.enterMode,d.shiftEnterMode)):(d||b.focusedEditable.removeClass("cke_widget_editable_focused"),b.focusedEditable=null,a.widgetHoldingFocusedEditable=
+null,e.setActiveFilter(null),e.setActiveEnterMode(null,null));e.fire("unlockSnapshot")}function w(a){a.contextMenu&&a.contextMenu.addListener(function(b){if(b=a.widgets.getByElement(b,!0))return b.fire("contextMenu",{})})}function n(a,b){return CKEDITOR.tools.trim(b)}function q(a){var b=a.editor,c=CKEDITOR.plugins.lineutils;b.on("dragstart",function(c){var d=c.data.target;e.isDomDragHandler(d)&&(d=a.getByElement(d),c.data.dataTransfer.setData("cke/widget-id",d.id),b.focus(),d.focus())});b.on("drop",
+function(c){var d=c.data.dataTransfer,e=d.getData("cke/widget-id"),f=d.getTransferType(b),d=b.createRange();""!==e&&f===CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c.cancel():""!==e&&f==CKEDITOR.DATA_TRANSFER_INTERNAL&&(e=a.instances[e])&&(d.setStartBefore(e.wrapper),d.setEndAfter(e.wrapper),c.data.dragRange=d,delete CKEDITOR.plugins.clipboard.dragStartContainerChildCount,delete CKEDITOR.plugins.clipboard.dragEndContainerChildCount,c.data.dataTransfer.setData("text/html",b.editable().getHtmlFromRange(d).getHtml()),
+b.widgets.destroy(e,!0))});b.on("contentDom",function(){var d=b.editable();CKEDITOR.tools.extend(a,{finder:new c.finder(b,{lookups:{"default":function(b){if(!b.is(CKEDITOR.dtd.$listItem)&&b.is(CKEDITOR.dtd.$block)&&!e.isDomNestedEditable(b)&&!a._.draggedWidget.wrapper.contains(b)){var c=e.getNestedEditable(d,b);if(c){b=a._.draggedWidget;if(a.getByElement(c)==b)return;c=CKEDITOR.filter.instances[c.data("cke-filter")];b=b.requiredContent;if(c&&b&&!c.check(b))return}return CKEDITOR.LINEUTILS_BEFORE|
+CKEDITOR.LINEUTILS_AFTER}}}}),locator:new c.locator(b),liner:new c.liner(b,{lineStyle:{cursor:"move !important","border-top-color":"#666"},tipLeftStyle:{"border-left-color":"#666"},tipRightStyle:{"border-right-color":"#666"}})},!0)})}function u(a){var b=a.editor;b.on("contentDom",function(){var c=b.editable(),d=c.isInline()?c:b.document,f,g;c.attachListener(d,"mousedown",function(c){var d=c.data.getTarget();if(!d.type)return!1;f=a.getByElement(d);g=0;f&&(f.inline&&d.type==CKEDITOR.NODE_ELEMENT&&d.hasAttribute("data-cke-widget-drag-handler")?
+(g=1,a.focused!=f&&b.getSelection().removeAllRanges()):e.getNestedEditable(f.wrapper,d)?f=null:(c.data.preventDefault(),CKEDITOR.env.ie||f.focus()))});c.attachListener(d,"mouseup",function(){g&&f&&f.wrapper&&(g=0,f.focus())});CKEDITOR.env.ie&&c.attachListener(d,"mouseup",function(){setTimeout(function(){f&&f.wrapper&&c.contains(f.wrapper)&&(f.focus(),f=null)})})});b.on("doubleclick",function(b){var c=a.getByElement(b.data.element);if(c&&!e.getNestedEditable(c.wrapper,b.data.element))return c.fire("doubleclick",
+{element:b.data.element})},null,null,1)}function B(a){a.editor.on("key",function(b){var c=a.focused,d=a.widgetHoldingFocusedEditable,e;c?e=c.fire("key",{keyCode:b.data.keyCode}):d&&(c=b.data.keyCode,b=d.focusedEditable,c==CKEDITOR.CTRL+65?(c=b.getBogus(),d=d.editor.createRange(),d.selectNodeContents(b),c&&d.setEndAt(c,CKEDITOR.POSITION_BEFORE_START),d.select(),e=!1):8==c||46==c?(e=d.editor.getSelection().getRanges(),d=e[0],e=!(1==e.length&&d.collapsed&&d.checkBoundaryOfElement(b,CKEDITOR[8==c?"START":
+"END"]))):e=void 0);return e},null,null,1)}function y(a){function b(c){a.focused&&E(a.focused,"cut"==c.name)}var c=a.editor;c.on("contentDom",function(){var a=c.editable();a.attachListener(a,"copy",b);a.attachListener(a,"cut",b)})}function t(a){var b=a.editor;b.on("selectionCheck",function(){a.fire("checkSelection")});a.on("checkSelection",a.checkSelection,a);b.on("selectionChange",function(c){var d=(c=e.getNestedEditable(b.editable(),c.data.selection.getStartElement()))&&a.getByElement(c),f=a.widgetHoldingFocusedEditable;
+f?f===d&&f.focusedEditable.equals(c)||(r(a,f,null),d&&c&&r(a,d,c)):d&&c&&r(a,d,c)});b.on("dataReady",function(){z(a).commit()});b.on("blur",function(){var b;(b=a.focused)&&m(a,b);(b=a.widgetHoldingFocusedEditable)&&r(a,b,null)})}function x(a){var b=a.editor,c={};b.on("toDataFormat",function(b){var d=CKEDITOR.tools.getNextNumber(),f=[];b.data.downcastingSessionId=d;c[d]=f;b.data.dataValue.forEach(function(b){var c=b.attributes,d;if("data-cke-widget-id"in c){if(c=a.instances[c["data-cke-widget-id"]])d=
+b.getFirst(e.isParserWidgetElement),f.push({wrapper:b,element:d,widget:c,editables:{}}),"1"!=d.attributes["data-cke-widget-keep-attr"]&&delete d.attributes["data-widget"]}else if("data-cke-widget-editable"in c)return f[f.length-1].editables[c["data-cke-widget-editable"]]=b,!1},CKEDITOR.NODE_ELEMENT,!0)},null,null,8);b.on("toDataFormat",function(a){if(a.data.downcastingSessionId){a=c[a.data.downcastingSessionId];for(var b,d,e,f,g,h;b=a.shift();){d=b.widget;e=b.element;f=d._.downcastFn&&d._.downcastFn.call(d,
+e);for(h in b.editables)g=b.editables[h],delete g.attributes.contenteditable,g.setHtml(d.editables[h].getData());f||(f=e);b.wrapper.replaceWith(f)}}},null,null,13);b.on("contentDomUnload",function(){a.destroyAll(!0)})}function F(a){var b=a.editor,c,f;b.on("toHtml",function(b){var f=d(a),g;for(b.data.dataValue.forEach(f.iterator,CKEDITOR.NODE_ELEMENT,!0);g=f.toBeWrapped.pop();){var h=g[0],k=h.parent;k.type==CKEDITOR.NODE_ELEMENT&&k.attributes["data-cke-widget-wrapper"]&&k.replaceWith(h);a.wrapElement(g[0],
+g[1])}c=b.data.protectedWhitespaces?3==b.data.dataValue.children.length&&e.isParserWidgetWrapper(b.data.dataValue.children[1]):1==b.data.dataValue.children.length&&e.isParserWidgetWrapper(b.data.dataValue.children[0])},null,null,8);b.on("dataReady",function(){if(f)for(var c=b.editable().find(".cke_widget_wrapper"),d,g,h=0,k=c.count();h<k;++h)d=c.getItem(h),g=d.getFirst(e.isDomWidgetElement),g.type==CKEDITOR.NODE_ELEMENT&&g.data("widget")?(g.replace(d),a.wrapElement(g)):d.remove();f=0;a.destroyAll(!0);
+a.initOnAll()});b.on("loadSnapshot",function(b){/data-cke-widget/.test(b.data)&&(f=1);a.destroyAll(!0)},null,null,9);b.on("paste",function(a){a=a.data;a.dataValue=a.dataValue.replace(X,n);a.range&&(a=e.getNestedEditable(b.editable(),a.range.startContainer))&&(a=CKEDITOR.filter.instances[a.data("cke-filter")])&&b.setActiveFilter(a)});b.on("afterInsertHtml",function(d){d.data.intoRange?a.checkWidgets({initOnlyNew:!0}):(b.fire("lockSnapshot"),a.checkWidgets({initOnlyNew:!0,focusInited:c}),b.fire("unlockSnapshot"))})}
+function z(a){var b=a.selected,c=[],d=b.slice(0),e=null;return{select:function(a){0>CKEDITOR.tools.indexOf(b,a)&&c.push(a);a=CKEDITOR.tools.indexOf(d,a);0<=a&&d.splice(a,1);return this},focus:function(a){e=a;return this},commit:function(){var f=a.focused!==e,g,h;a.editor.fire("lockSnapshot");for(f&&(g=a.focused)&&m(a,g);g=d.pop();)b.splice(CKEDITOR.tools.indexOf(b,g),1),g.isInited()&&(h=g.editor.checkDirty(),g.setSelected(!1),!h&&g.editor.resetDirty());f&&e&&(h=a.editor.checkDirty(),a.focused=e,a.fire("widgetFocused",
+{widget:e}),e.setFocused(!0),!h&&a.editor.resetDirty());for(;g=c.pop();)b.push(g),g.setSelected(!0);a.editor.fire("unlockSnapshot")}}}function A(a,b,c){var d=0;b=D(b);var e=a.data.classes||{},f;if(b){for(e=CKEDITOR.tools.clone(e);f=b.pop();)c?e[f]||(d=e[f]=1):e[f]&&(delete e[f],d=1);d&&a.setData("classes",e)}}function C(a){a.cancel()}function E(a,b){var c=a.editor,d=c.document;if(!d.getById("cke_copybin")){var e=c.blockless||CKEDITOR.env.ie?"span":"div",f=d.createElement(e),g=d.createElement(e),e=
 CKEDITOR.env.ie&&9>CKEDITOR.env.version;g.setAttributes({id:"cke_copybin","data-cke-temp":"1"});f.setStyles({position:"absolute",width:"1px",height:"1px",overflow:"hidden"});f.setStyle("ltr"==c.config.contentsLangDirection?"left":"right","-5000px");var h=c.createRange();h.setStartBefore(a.wrapper);h.setEndAfter(a.wrapper);f.setHtml('\x3cspan data-cke-copybin-start\x3d"1"\x3e​\x3c/span\x3e'+c.editable().getHtmlFromRange(h).getHtml()+'\x3cspan data-cke-copybin-end\x3d"1"\x3e​\x3c/span\x3e');c.fire("saveSnapshot");
-c.fire("lockSnapshot");g.append(f);c.editable().append(g);var k=c.on("selectionChange",D,null,null,0),l=a.repository.on("checkSelection",D,null,null,0);if(e)var m=d.getDocumentElement().$,n=m.scrollTop;h=c.createRange();h.selectNodeContents(f);h.select();e&&(m.scrollTop=n);setTimeout(function(){b||a.focus();g.remove();k.removeListener();l.removeListener();c.fire("unlockSnapshot");b&&(a.repository.del(a),c.fire("saveSnapshot"))},100)}}function E(a){return(a=(a=a.getDefinition().attributes)&&a["class"])?
-a.split(/\s+/):null}function L(){var a=CKEDITOR.document.getActive(),b=this.editor,c=b.editable();(c.isInline()?c:b.document.getWindow().getFrame()).equals(a)&&b.focusManager.focus(c)}function G(){CKEDITOR.env.gecko&&this.editor.unlockSelection();CKEDITOR.env.webkit||(this.editor.forceNextSelectionCheck(),this.editor.selectionChange(1))}function N(a){var b=null;a.on("data",function(){var a=this.data.classes,c;if(b!=a){for(c in b)a&&a[c]||this.removeClass(c);for(c in a)this.addClass(c);b=a}})}function O(a){a.on("data",
-function(){if(a.wrapper){var b=this.getLabel?this.getLabel():this.editor.lang.widget.label.replace(/%1/,this.pathName||this.element.getName());a.wrapper.setAttribute("role","region");a.wrapper.setAttribute("aria-label",b)}},null,null,9999)}function I(a){if(a.draggable){var b=a.editor,c=a.wrapper.getLast(f.isDomDragHandlerContainer),d;c?d=c.findOne("img"):(c=new CKEDITOR.dom.element("span",b.document),c.setAttributes({"class":"cke_reset cke_widget_drag_handler_container",style:"background:rgba(220,220,220,0.5);background-image:url("+
+c.fire("lockSnapshot");g.append(f);c.editable().append(g);var k=c.on("selectionChange",C,null,null,0),l=a.repository.on("checkSelection",C,null,null,0);if(e)var m=d.getDocumentElement().$,n=m.scrollTop;h=c.createRange();h.selectNodeContents(f);h.select();e&&(m.scrollTop=n);setTimeout(function(){b||a.focus();g.remove();k.removeListener();l.removeListener();c.fire("unlockSnapshot");b&&(a.repository.del(a),c.fire("saveSnapshot"))},100)}}function D(a){return(a=(a=a.getDefinition().attributes)&&a["class"])?
+a.split(/\s+/):null}function I(){var a=CKEDITOR.document.getActive(),b=this.editor,c=b.editable();(c.isInline()?c:b.document.getWindow().getFrame()).equals(a)&&b.focusManager.focus(c)}function H(){CKEDITOR.env.gecko&&this.editor.unlockSelection();CKEDITOR.env.webkit||(this.editor.forceNextSelectionCheck(),this.editor.selectionChange(1))}function M(a){var b=null;a.on("data",function(){var a=this.data.classes,c;if(b!=a){for(c in b)a&&a[c]||this.removeClass(c);for(c in a)this.addClass(c);b=a}})}function P(a){a.on("data",
+function(){if(a.wrapper){var b=this.getLabel?this.getLabel():this.editor.lang.widget.label.replace(/%1/,this.pathName||this.element.getName());a.wrapper.setAttribute("role","region");a.wrapper.setAttribute("aria-label",b)}},null,null,9999)}function G(a){if(a.draggable){var b=a.editor,c=a.wrapper.getLast(e.isDomDragHandlerContainer),d;c?d=c.findOne("img"):(c=new CKEDITOR.dom.element("span",b.document),c.setAttributes({"class":"cke_reset cke_widget_drag_handler_container",style:"background:rgba(220,220,220,0.5);background-image:url("+
 b.plugins.widget.path+"images/handle.png)"}),d=new CKEDITOR.dom.element("img",b.document),d.setAttributes({"class":"cke_reset cke_widget_drag_handler","data-cke-widget-drag-handler":"1",src:CKEDITOR.tools.transparentImageData,width:15,title:b.lang.widget.move,height:15,role:"presentation"}),a.inline&&d.setAttribute("draggable","true"),c.append(d),a.wrapper.append(c));a.wrapper.on("dragover",function(a){a.data.preventDefault()});a.wrapper.on("mouseenter",a.updateDragHandlerPosition,a);setTimeout(function(){a.on("data",
-a.updateDragHandlerPosition,a)},50);if(!a.inline&&(d.on("mousedown",R,a),CKEDITOR.env.ie&&9>CKEDITOR.env.version))d.on("dragstart",function(a){a.data.preventDefault(!0)});a.dragHandlerContainer=c}}function R(a){function b(){var c;for(q.reset();c=h.pop();)c.removeListener();var d=k;c=a.sender;var e=this.repository.finder,f=this.repository.liner,g=this.editor,l=this.editor.editable();CKEDITOR.tools.isEmpty(f.visible)||(d=e.getRange(d[0]),this.focus(),g.fire("drop",{dropRange:d,target:d.startContainer}));
+a.updateDragHandlerPosition,a)},50);if(!a.inline&&(d.on("mousedown",S,a),CKEDITOR.env.ie&&9>CKEDITOR.env.version))d.on("dragstart",function(a){a.data.preventDefault(!0)});a.dragHandlerContainer=c}}function S(a){function b(){var c;for(q.reset();c=h.pop();)c.removeListener();var d=k;c=a.sender;var e=this.repository.finder,f=this.repository.liner,g=this.editor,l=this.editor.editable();CKEDITOR.tools.isEmpty(f.visible)||(d=e.getRange(d[0]),this.focus(),g.fire("drop",{dropRange:d,target:d.startContainer}));
 l.removeClass("cke_widget_dragging");f.hideVisible();g.fire("dragend",{target:c})}var c=this.repository.finder,d=this.repository.locator,e=this.repository.liner,f=this.editor,g=f.editable(),h=[],k=[],l,m;this.repository._.draggedWidget=this;var n=c.greedySearch(),q=CKEDITOR.tools.eventsBuffer(50,function(){l=d.locate(n);k=d.sort(m,1);k.length&&(e.prepare(n,l),e.placeLine(k[0]),e.cleanup())});g.addClass("cke_widget_dragging");h.push(g.on("mousemove",function(a){m=a.data.$.clientY;q.input()}));f.fire("dragstart",
-{target:a.sender});h.push(f.document.once("mouseup",b,this));g.isInline()||h.push(CKEDITOR.document.once("mouseup",b,this))}function M(a){var b,c,d=a.editables;a.editables={};if(a.editables)for(b in d)c=d[b],a.initEditable(b,"string"==typeof c?{selector:c}:c)}function Q(a){if(a.mask){var b=a.wrapper.findOne(".cke_widget_mask");b||(b=new CKEDITOR.dom.element("img",a.editor.document),b.setAttributes({src:CKEDITOR.tools.transparentImageData,"class":"cke_reset cke_widget_mask"}),a.wrapper.append(b));
-a.mask=b}}function P(a){if(a.parts){var b={},c,d;for(d in a.parts)c=a.wrapper.findOne(a.parts[d]),b[d]=c;a.parts=b}}function K(a,b){W(a);P(a);M(a);Q(a);I(a);N(a);O(a);if(CKEDITOR.env.ie&&9>CKEDITOR.env.version)a.wrapper.on("dragstart",function(b){var c=b.data.getTarget();f.getNestedEditable(a,c)||a.inline&&f.isDomDragHandler(c)||b.data.preventDefault()});a.wrapper.removeClass("cke_widget_new");a.element.addClass("cke_widget_element");a.on("key",function(b){b=b.data.keyCode;if(13==b)a.edit();else{if(b==
-CKEDITOR.CTRL+67||b==CKEDITOR.CTRL+88){F(a,b==CKEDITOR.CTRL+88);return}if(b in J||CKEDITOR.CTRL&b||CKEDITOR.ALT&b)return}return!1},null,null,999);a.on("doubleclick",function(b){a.edit()&&b.cancel()});if(b.data)a.on("data",b.data);if(b.edit)a.on("edit",b.edit)}function W(a){(a.wrapper=a.element.getParent()).setAttribute("data-cke-widget-id",a.id)}function U(a){a.element.data("cke-widget-data",encodeURIComponent(JSON.stringify(a.data)))}CKEDITOR.plugins.add("widget",{requires:"lineutils,clipboard",
+{target:a.sender});h.push(f.document.once("mouseup",b,this));g.isInline()||h.push(CKEDITOR.document.once("mouseup",b,this))}function L(a){var b,c,d=a.editables;a.editables={};if(a.editables)for(b in d)c=d[b],a.initEditable(b,"string"==typeof c?{selector:c}:c)}function R(a){if(a.mask){var b=a.wrapper.findOne(".cke_widget_mask");b||(b=new CKEDITOR.dom.element("img",a.editor.document),b.setAttributes({src:CKEDITOR.tools.transparentImageData,"class":"cke_reset cke_widget_mask"}),a.wrapper.append(b));
+a.mask=b}}function O(a){if(a.parts){var b={},c,d;for(d in a.parts)c=a.wrapper.findOne(a.parts[d]),b[d]=c;a.parts=b}}function T(a,b){V(a);O(a);L(a);R(a);G(a);M(a);P(a);if(CKEDITOR.env.ie&&9>CKEDITOR.env.version)a.wrapper.on("dragstart",function(b){var c=b.data.getTarget();e.getNestedEditable(a,c)||a.inline&&e.isDomDragHandler(c)||b.data.preventDefault()});a.wrapper.removeClass("cke_widget_new");a.element.addClass("cke_widget_element");a.on("key",function(b){b=b.data.keyCode;if(13==b)a.edit();else{if(b==
+CKEDITOR.CTRL+67||b==CKEDITOR.CTRL+88){E(a,b==CKEDITOR.CTRL+88);return}if(b in N||CKEDITOR.CTRL&b||CKEDITOR.ALT&b)return}return!1},null,null,999);a.on("doubleclick",function(b){a.edit()&&b.cancel()});if(b.data)a.on("data",b.data);if(b.edit)a.on("edit",b.edit)}function V(a){(a.wrapper=a.element.getParent()).setAttribute("data-cke-widget-id",a.id)}function W(a){a.element.data("cke-widget-data",encodeURIComponent(JSON.stringify(a.data)))}CKEDITOR.plugins.add("widget",{requires:"lineutils,clipboard,widgetselection",
 onLoad:function(){CKEDITOR.addCss(".cke_widget_wrapper{position:relative;outline:none}.cke_widget_inline{display:inline-block}.cke_widget_wrapper:hover\x3e.cke_widget_element{outline:2px solid yellow;cursor:default}.cke_widget_wrapper:hover .cke_widget_editable{outline:2px solid yellow}.cke_widget_wrapper.cke_widget_focused\x3e.cke_widget_element,.cke_widget_wrapper .cke_widget_editable.cke_widget_editable_focused{outline:2px solid #ace}.cke_widget_editable{cursor:text}.cke_widget_drag_handler_container{position:absolute;width:15px;height:0;display:none;opacity:0.75;transition:height 0s 0.2s;line-height:0}.cke_widget_wrapper:hover\x3e.cke_widget_drag_handler_container{height:15px;transition:none}.cke_widget_drag_handler_container:hover{opacity:1}img.cke_widget_drag_handler{cursor:move;width:15px;height:15px;display:inline-block}.cke_widget_mask{position:absolute;top:0;left:0;width:100%;height:100%;display:block}.cke_editable.cke_widget_dragging, .cke_editable.cke_widget_dragging *{cursor:move !important}")},
-beforeInit:function(b){b.widgets=new a(b)},afterInit:function(a){var b=a.widgets.registered,c,d,e;for(d in b)c=b[d],(e=c.button)&&a.ui.addButton&&a.ui.addButton(CKEDITOR.tools.capitalize(c.name,!0),{label:e,command:c.name,toolbar:"insert,10"});t(a)}});a.prototype={MIN_SELECTION_CHECK_INTERVAL:500,add:function(a,b){b=CKEDITOR.tools.prototypedCopy(b);b.name=a;b._=b._||{};this.editor.fire("widgetDefinition",b);b.template&&(b.template=new CKEDITOR.template(b.template));e(this.editor,b);h(this,b);return this.registered[a]=
-b},addUpcastCallback:function(a){this._.upcastCallbacks.push(a)},checkSelection:function(){var a=this.editor.getSelection(),b=a.getSelectedElement(),c=z(this),d;if(b&&(d=this.getByElement(b,!0)))return c.focus(d).select(d).commit();a=a.getRanges()[0];if(!a||a.collapsed)return c.commit();a=new CKEDITOR.dom.walker(a);for(a.evaluator=f.isDomWidgetWrapper;b=a.next();)c.select(this.getByElement(b));c.commit()},checkWidgets:function(a){this.fire("checkWidgets",CKEDITOR.tools.copy(a||{}))},del:function(a){if(this.focused===
-a){var b=a.editor,c=b.createRange(),d;(d=c.moveToClosestEditablePosition(a.wrapper,!0))||(d=c.moveToClosestEditablePosition(a.wrapper,!1));d&&b.getSelection().selectRanges([c])}a.wrapper.remove();this.destroy(a,!0)},destroy:function(a,b){this.widgetHoldingFocusedEditable===a&&u(this,a,null,b);a.destroy(b);delete this.instances[a.id];this.fire("instanceDestroyed",a)},destroyAll:function(a,b){var c,d,e=this.instances;if(b&&!a){d=b.find(".cke_widget_wrapper");for(var e=d.count(),f=0;f<e;++f)(c=this.getByElement(d.getItem(f),
-!0))&&this.destroy(c)}else for(d in e)c=e[d],this.destroy(c,a)},finalizeCreation:function(a){(a=a.getFirst())&&f.isDomWidgetWrapper(a)&&(this.editor.insertElement(a),a=this.getByElement(a),a.ready=!0,a.fire("ready"),a.focus())},getByElement:function(){function a(c){return c.is(b)&&c.data("cke-widget-id")}var b={div:1,span:1};return function(b,c){if(!b)return null;var d=a(b);if(!c&&!d){var e=this.editor.editable();do b=b.getParent();while(b&&!b.equals(e)&&!(d=a(b)))}return this.instances[d]||null}}(),
-initOn:function(a,b,c){b?"string"==typeof b&&(b=this.registered[b]):b=this.registered[a.data("widget")];if(!b)return null;var d=this.wrapElement(a,b.name);return d?d.hasClass("cke_widget_new")?(a=new f(this,this._.nextId++,a,b,c),a.isInited()?this.instances[a.id]=a:null):this.getByElement(a):null},initOnAll:function(a){a=(a||this.editor.editable()).find(".cke_widget_new");for(var b=[],c,d=a.count();d--;)(c=this.initOn(a.getItem(d).getFirst(f.isDomWidgetElement)))&&b.push(c);return b},onWidget:function(a){var b=
-Array.prototype.slice.call(arguments);b.shift();for(var c in this.instances){var d=this.instances[c];d.name==a&&d.on.apply(d,b)}this.on("instanceCreated",function(c){c=c.data;c.name==a&&c.on.apply(c,b)})},parseElementClasses:function(a){if(!a)return null;a=CKEDITOR.tools.trim(a).split(/\s+/);for(var b,c={},d=0;b=a.pop();)-1==b.indexOf("cke_")&&(c[b]=d=1);return d?c:null},wrapElement:function(a,b){var c=null,e,f;if(a instanceof CKEDITOR.dom.element){e=this.registered[b||a.data("widget")];if(!e)return null;
-if((c=a.getParent())&&c.type==CKEDITOR.NODE_ELEMENT&&c.data("cke-widget-wrapper"))return c;a.hasAttribute("data-cke-widget-keep-attr")||a.data("cke-widget-keep-attr",a.data("widget")?1:0);b&&a.data("widget",b);f=p(e,a.getName());c=new CKEDITOR.dom.element(f?"span":"div");c.setAttributes(d(f));c.data("cke-display-name",e.pathName?e.pathName:a.getName());a.getParent(!0)&&c.replace(a);a.appendTo(c)}else if(a instanceof CKEDITOR.htmlParser.element){e=this.registered[b||a.attributes["data-widget"]];if(!e)return null;
-if((c=a.parent)&&c.type==CKEDITOR.NODE_ELEMENT&&c.attributes["data-cke-widget-wrapper"])return c;"data-cke-widget-keep-attr"in a.attributes||(a.attributes["data-cke-widget-keep-attr"]=a.attributes["data-widget"]?1:0);b&&(a.attributes["data-widget"]=b);f=p(e,a.name);c=new CKEDITOR.htmlParser.element(f?"span":"div",d(f));c.attributes["data-cke-display-name"]=e.pathName?e.pathName:a.name;e=a.parent;var h;e&&(h=a.getIndex(),a.remove());c.add(a);e&&g(e,h,c)}return c},_tests_createEditableFilter:k};CKEDITOR.event.implementOn(a.prototype);
-f.prototype={addClass:function(a){this.element.addClass(a)},applyStyle:function(a){y(this,a,1)},checkStyleActive:function(a){a=E(a);var b;if(!a)return!1;for(;b=a.pop();)if(!this.hasClass(b))return!1;return!0},destroy:function(a){this.fire("destroy");if(this.editables)for(var b in this.editables)this.destroyEditable(b,a);a||("0"==this.element.data("cke-widget-keep-attr")&&this.element.removeAttribute("data-widget"),this.element.removeAttributes(["data-cke-widget-data","data-cke-widget-keep-attr"]),
-this.element.removeClass("cke_widget_element"),this.element.replace(this.wrapper));this.wrapper=null},destroyEditable:function(a,b){var c=this.editables[a];c.removeListener("focus",G);c.removeListener("blur",L);this.editor.focusManager.remove(c);b||(this.repository.destroyAll(!1,c),c.removeClass("cke_widget_editable"),c.removeClass("cke_widget_editable_focused"),c.removeAttributes(["contenteditable","data-cke-widget-editable","data-cke-enter-mode"]));delete this.editables[a]},edit:function(){var a=
-{dialog:this.dialog},b=this;if(!1===this.fire("edit",a)||!a.dialog)return!1;this.editor.openDialog(a.dialog,function(a){var c,d;!1!==b.fire("dialog",a)&&(c=a.on("show",function(){a.setupContent(b)}),d=a.on("ok",function(){var c,d=b.on("data",function(a){c=1;a.cancel()},null,null,0);b.editor.fire("saveSnapshot");a.commitContent(b);d.removeListener();c&&(b.fire("data",b.data),b.editor.fire("saveSnapshot"))}),a.once("hide",function(){c.removeListener();d.removeListener()}))});return!0},getClasses:function(){return this.repository.parseElementClasses(this.element.getAttribute("class"))},
-hasClass:function(a){return this.element.hasClass(a)},initEditable:function(a,b){var d=this._findOneNotNested(b.selector);return d&&d.is(CKEDITOR.dtd.$editable)?(d=new c(this.editor,d,{filter:k.call(this.repository,this.name,a,b)}),this.editables[a]=d,d.setAttributes({contenteditable:"true","data-cke-widget-editable":a,"data-cke-enter-mode":d.enterMode}),d.filter&&d.data("cke-filter",d.filter.id),d.addClass("cke_widget_editable"),d.removeClass("cke_widget_editable_focused"),b.pathName&&d.data("cke-display-name",
-b.pathName),this.editor.focusManager.add(d),d.on("focus",G,this),CKEDITOR.env.ie&&d.on("blur",L,this),d._.initialSetData=!0,d.setData(d.getHtml()),!0):!1},_findOneNotNested:function(a){a=this.wrapper.find(a);for(var b,c,d=0;d<a.count();d++)if(b=a.getItem(d),c=b.getAscendant(f.isDomWidgetWrapper),this.wrapper.equals(c))return b;return null},isInited:function(){return!(!this.wrapper||!this.inited)},isReady:function(){return this.isInited()&&this.ready},focus:function(){var a=this.editor.getSelection();
-if(a){var b=this.editor.checkDirty();a.fake(this.wrapper);!b&&this.editor.resetDirty()}this.editor.focus()},removeClass:function(a){this.element.removeClass(a)},removeStyle:function(a){y(this,a,0)},setData:function(a,b){var c=this.data,d=0;if("string"==typeof a)c[a]!==b&&(c[a]=b,d=1);else{var e=a;for(a in e)c[a]!==e[a]&&(d=1,c[a]=e[a])}d&&this.dataReady&&(U(this),this.fire("data",c));return this},setFocused:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_focused");this.fire(a?"focus":
-"blur");return this},setSelected:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_selected");this.fire(a?"select":"deselect");return this},updateDragHandlerPosition:function(){var a=this.editor,b=this.element.$,c=this._.dragHandlerOffset,b={x:b.offsetLeft,y:b.offsetTop-15};c&&b.x==c.x&&b.y==c.y||(c=a.checkDirty(),a.fire("lockSnapshot"),this.dragHandlerContainer.setStyles({top:b.y+"px",left:b.x+"px",display:"block"}),a.fire("unlockSnapshot"),!c&&a.resetDirty(),this._.dragHandlerOffset=
-b)}};CKEDITOR.event.implementOn(f.prototype);f.getNestedEditable=function(a,b){return!b||b.equals(a)?null:f.isDomNestedEditable(b)?b:f.getNestedEditable(a,b.getParent())};f.isDomDragHandler=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-drag-handler")};f.isDomDragHandlerContainer=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_widget_drag_handler_container")};f.isDomNestedEditable=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-editable")};
-f.isDomWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-widget")};f.isDomWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-wrapper")};f.isParserWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-widget"]};f.isParserWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-cke-widget-wrapper"]};c.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.dom.element.prototype),
-{setData:function(a){this._.initialSetData||this.editor.widgets.destroyAll(!1,this);this._.initialSetData=!1;a=this.editor.dataProcessor.toHtml(a,{context:this.getName(),filter:this.filter,enterMode:this.enterMode});this.setHtml(a);this.editor.widgets.initOnAll(this)},getData:function(){return this.editor.dataProcessor.toDataFormat(this.getHtml(),{context:this.getName(),filter:this.filter,enterMode:this.enterMode})}});var S=/^(?:<(?:div|span)(?: data-cke-temp="1")?(?: id="cke_copybin")?(?: data-cke-temp="1")?>)?(?:<(?:div|span)(?: style="[^"]+")?>)?<span [^>]*data-cke-copybin-start="1"[^>]*>.?<\/span>([\s\S]+)<span [^>]*data-cke-copybin-end="1"[^>]*>.?<\/span>(?:<\/(?:div|span)>)?(?:<\/(?:div|span)>)?$/i,
-J={37:1,38:1,39:1,40:1,8:1,46:1};(function(){function a(){}function b(a,c,d){return d&&this.checkElement(a)?(a=d.widgets.getByElement(a,!0))&&a.checkStyleActive(this):!1}CKEDITOR.style.addCustomHandler({type:"widget",setup:function(a){this.widget=a.widget},apply:function(a){a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&a.widgets.focused.applyStyle(this)},remove:function(a){a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&a.widgets.focused.removeStyle(this)},
-checkActive:function(a,b){return this.checkElementMatch(a.lastElement,0,b)},checkApplicable:function(a,b){return b instanceof CKEDITOR.editor?this.checkElement(a.lastElement):!1},checkElementMatch:b,checkElementRemovable:b,checkElement:function(a){return f.isDomWidgetWrapper(a)?(a=a.getFirst(f.isDomWidgetElement))&&a.data("widget")==this.widget:!1},buildPreview:function(a){return a||this._.definition.name},toAllowedContentRules:function(a){if(!a)return null;a=a.widgets.registered[this.widget];var b,
-c={};if(!a)return null;if(a.styleableElements){b=this.getClassesArray();if(!b)return null;c[a.styleableElements]={classes:b,propertiesOnly:!0};return c}return a.styleToAllowedContentRules?a.styleToAllowedContentRules(this):null},getClassesArray:function(){var a=this._.definition.attributes&&this._.definition.attributes["class"];return a?CKEDITOR.tools.trim(a).split(/\s+/):null},applyToRange:a,removeFromRange:a,applyToObject:a})})();CKEDITOR.plugins.widget=f;f.repository=a;f.nestedEditable=c}(),"use strict",
-function(){function a(a){function b(){this.deflated||(a.widgets.focused==this.widget&&(this.focused=!0),a.widgets.destroy(this.widget),this.deflated=!0)}function e(){var b=a.editable(),c=a.document;if(this.deflated)this.widget=a.widgets.initOn(this.element,"image",this.widget.data),this.widget.inline&&!(new CKEDITOR.dom.elementPath(this.widget.wrapper,b)).block&&(b=c.createElement(a.activeEnterMode==CKEDITOR.ENTER_P?"p":"div"),b.replace(this.widget.wrapper),this.widget.wrapper.move(b)),this.focused&&
-(this.widget.focus(),delete this.focused),delete this.deflated;else{var d=this.widget,b=h,c=d.wrapper,f=d.data.align,d=d.data.hasCaption;if(b){for(var g=3;g--;)c.removeClass(b[g]);"center"==f?d&&c.addClass(b[1]):"none"!=f&&c.addClass(b[u[f]])}else"center"==f?(d?c.setStyle("text-align","center"):c.removeStyle("text-align"),c.removeStyle("float")):("none"==f?c.removeStyle("float"):c.setStyle("float",f),c.removeStyle("text-align"))}}var h=a.config.image2_alignClasses,k=a.config.image2_captionedClass;
-return{allowedContent:d(a),requiredContent:"img[src,alt]",features:g(a),styleableElements:"img figure",contentTransformations:[["img[width]: sizeToAttribute"]],editables:{caption:{selector:"figcaption",allowedContent:"br em strong sub sup u s; a[!href,target]"}},parts:{image:"img",caption:"figcaption"},dialog:"image2",template:'\x3cimg alt\x3d"" src\x3d"" /\x3e',data:function(){var c=this.features;this.data.hasCaption&&!a.filter.checkFeature(c.caption)&&(this.data.hasCaption=!1);"none"==this.data.align||
-a.filter.checkFeature(c.align)||(this.data.align="none");this.shiftState({widget:this,element:this.element,oldData:this.oldData,newData:this.data,deflate:b,inflate:e});this.data.link?this.parts.link||(this.parts.link=this.parts.image.getParent()):this.parts.link&&delete this.parts.link;this.parts.image.setAttributes({src:this.data.src,"data-cke-saved-src":this.data.src,alt:this.data.alt});if(this.oldData&&!this.oldData.hasCaption&&this.data.hasCaption)for(var d in this.data.classes)this.parts.image.removeClass(d);
-if(a.filter.checkFeature(c.dimension)){c=this.data;c={width:c.width,height:c.height};d=this.parts.image;for(var f in c)c[f]?d.setAttribute(f,c[f]):d.removeAttribute(f)}this.oldData=CKEDITOR.tools.extend({},this.data)},init:function(){var b=CKEDITOR.plugins.image2,c=this.parts.image,d={hasCaption:!!this.parts.caption,src:c.getAttribute("src"),alt:c.getAttribute("alt")||"",width:c.getAttribute("width")||"",height:c.getAttribute("height")||"",lock:this.ready?b.checkHasNaturalRatio(c):!0},e=c.getAscendant("a");
-e&&this.wrapper.contains(e)&&(this.parts.link=e);d.align||(c=d.hasCaption?this.element:c,h?(c.hasClass(h[0])?d.align="left":c.hasClass(h[2])&&(d.align="right"),d.align?c.removeClass(h[u[d.align]]):d.align="none"):(d.align=c.getStyle("float")||"none",c.removeStyle("float")));a.plugins.link&&this.parts.link&&(d.link=b.getLinkAttributesParser()(a,this.parts.link),(c=d.link.advanced)&&c.advCSSClasses&&(c.advCSSClasses=CKEDITOR.tools.trim(c.advCSSClasses.replace(/cke_\S+/,""))));this.wrapper[(d.hasCaption?
+beforeInit:function(b){b.widgets=new a(b)},afterInit:function(a){var b=a.widgets.registered,c,d,e;for(d in b)c=b[d],(e=c.button)&&a.ui.addButton&&a.ui.addButton(CKEDITOR.tools.capitalize(c.name,!0),{label:e,command:c.name,toolbar:"insert,10"});w(a)}});a.prototype={MIN_SELECTION_CHECK_INTERVAL:500,add:function(a,b){b=CKEDITOR.tools.prototypedCopy(b);b.name=a;b._=b._||{};this.editor.fire("widgetDefinition",b);b.template&&(b.template=new CKEDITOR.template(b.template));f(this.editor,b);h(this,b);return this.registered[a]=
+b},addUpcastCallback:function(a){this._.upcastCallbacks.push(a)},checkSelection:function(){var a=this.editor.getSelection(),b=a.getSelectedElement(),c=z(this),d;if(b&&(d=this.getByElement(b,!0)))return c.focus(d).select(d).commit();a=a.getRanges()[0];if(!a||a.collapsed)return c.commit();a=new CKEDITOR.dom.walker(a);for(a.evaluator=e.isDomWidgetWrapper;b=a.next();)c.select(this.getByElement(b));c.commit()},checkWidgets:function(a){this.fire("checkWidgets",CKEDITOR.tools.copy(a||{}))},del:function(a){if(this.focused===
+a){var b=a.editor,c=b.createRange(),d;(d=c.moveToClosestEditablePosition(a.wrapper,!0))||(d=c.moveToClosestEditablePosition(a.wrapper,!1));d&&b.getSelection().selectRanges([c])}a.wrapper.remove();this.destroy(a,!0)},destroy:function(a,b){this.widgetHoldingFocusedEditable===a&&r(this,a,null,b);a.destroy(b);delete this.instances[a.id];this.fire("instanceDestroyed",a)},destroyAll:function(a,b){var c,d,e=this.instances;if(b&&!a){d=b.find(".cke_widget_wrapper");for(var e=d.count(),f=0;f<e;++f)(c=this.getByElement(d.getItem(f),
+!0))&&this.destroy(c)}else for(d in e)c=e[d],this.destroy(c,a)},finalizeCreation:function(a){(a=a.getFirst())&&e.isDomWidgetWrapper(a)&&(this.editor.insertElement(a),a=this.getByElement(a),a.ready=!0,a.fire("ready"),a.focus())},getByElement:function(){function a(c){return c.is(b)&&c.data("cke-widget-id")}var b={div:1,span:1};return function(b,c){if(!b)return null;var d=a(b);if(!c&&!d){var e=this.editor.editable();do b=b.getParent();while(b&&!b.equals(e)&&!(d=a(b)))}return this.instances[d]||null}}(),
+initOn:function(a,b,c){b?"string"==typeof b&&(b=this.registered[b]):b=this.registered[a.data("widget")];if(!b)return null;var d=this.wrapElement(a,b.name);return d?d.hasClass("cke_widget_new")?(a=new e(this,this._.nextId++,a,b,c),a.isInited()?this.instances[a.id]=a:null):this.getByElement(a):null},initOnAll:function(a){a=(a||this.editor.editable()).find(".cke_widget_new");for(var b=[],c,d=a.count();d--;)(c=this.initOn(a.getItem(d).getFirst(e.isDomWidgetElement)))&&b.push(c);return b},onWidget:function(a){var b=
+Array.prototype.slice.call(arguments);b.shift();for(var c in this.instances){var d=this.instances[c];d.name==a&&d.on.apply(d,b)}this.on("instanceCreated",function(c){c=c.data;c.name==a&&c.on.apply(c,b)})},parseElementClasses:function(a){if(!a)return null;a=CKEDITOR.tools.trim(a).split(/\s+/);for(var b,c={},d=0;b=a.pop();)-1==b.indexOf("cke_")&&(c[b]=d=1);return d?c:null},wrapElement:function(a,c){var d=null,e,f;if(a instanceof CKEDITOR.dom.element){c=c||a.data("widget");e=this.registered[c];if(!e)return null;
+if((d=a.getParent())&&d.type==CKEDITOR.NODE_ELEMENT&&d.data("cke-widget-wrapper"))return d;a.hasAttribute("data-cke-widget-keep-attr")||a.data("cke-widget-keep-attr",a.data("widget")?1:0);a.data("widget",c);f=p(e,a.getName());d=new CKEDITOR.dom.element(f?"span":"div");d.setAttributes(b(f,c));d.data("cke-display-name",e.pathName?e.pathName:a.getName());a.getParent(!0)&&d.replace(a);a.appendTo(d)}else if(a instanceof CKEDITOR.htmlParser.element){c=c||a.attributes["data-widget"];e=this.registered[c];
+if(!e)return null;if((d=a.parent)&&d.type==CKEDITOR.NODE_ELEMENT&&d.attributes["data-cke-widget-wrapper"])return d;"data-cke-widget-keep-attr"in a.attributes||(a.attributes["data-cke-widget-keep-attr"]=a.attributes["data-widget"]?1:0);c&&(a.attributes["data-widget"]=c);f=p(e,a.name);d=new CKEDITOR.htmlParser.element(f?"span":"div",b(f,c));d.attributes["data-cke-display-name"]=e.pathName?e.pathName:a.name;e=a.parent;var h;e&&(h=a.getIndex(),a.remove());d.add(a);e&&g(e,h,d)}return d},_tests_createEditableFilter:k};
+CKEDITOR.event.implementOn(a.prototype);e.prototype={addClass:function(a){this.element.addClass(a);this.wrapper.addClass(e.WRAPPER_CLASS_PREFIX+a)},applyStyle:function(a){A(this,a,1)},checkStyleActive:function(a){a=D(a);var b;if(!a)return!1;for(;b=a.pop();)if(!this.hasClass(b))return!1;return!0},destroy:function(a){this.fire("destroy");if(this.editables)for(var b in this.editables)this.destroyEditable(b,a);a||("0"==this.element.data("cke-widget-keep-attr")&&this.element.removeAttribute("data-widget"),
+this.element.removeAttributes(["data-cke-widget-data","data-cke-widget-keep-attr"]),this.element.removeClass("cke_widget_element"),this.element.replace(this.wrapper));this.wrapper=null},destroyEditable:function(a,b){var c=this.editables[a];c.removeListener("focus",H);c.removeListener("blur",I);this.editor.focusManager.remove(c);b||(this.repository.destroyAll(!1,c),c.removeClass("cke_widget_editable"),c.removeClass("cke_widget_editable_focused"),c.removeAttributes(["contenteditable","data-cke-widget-editable",
+"data-cke-enter-mode"]));delete this.editables[a]},edit:function(){var a={dialog:this.dialog},b=this;if(!1===this.fire("edit",a)||!a.dialog)return!1;this.editor.openDialog(a.dialog,function(a){var c,d;!1!==b.fire("dialog",a)&&(c=a.on("show",function(){a.setupContent(b)}),d=a.on("ok",function(){var c,d=b.on("data",function(a){c=1;a.cancel()},null,null,0);b.editor.fire("saveSnapshot");a.commitContent(b);d.removeListener();c&&(b.fire("data",b.data),b.editor.fire("saveSnapshot"))}),a.once("hide",function(){c.removeListener();
+d.removeListener()}))});return!0},getClasses:function(){return this.repository.parseElementClasses(this.element.getAttribute("class"))},hasClass:function(a){return this.element.hasClass(a)},initEditable:function(a,b){var d=this._findOneNotNested(b.selector);return d&&d.is(CKEDITOR.dtd.$editable)?(d=new c(this.editor,d,{filter:k.call(this.repository,this.name,a,b)}),this.editables[a]=d,d.setAttributes({contenteditable:"true","data-cke-widget-editable":a,"data-cke-enter-mode":d.enterMode}),d.filter&&
+d.data("cke-filter",d.filter.id),d.addClass("cke_widget_editable"),d.removeClass("cke_widget_editable_focused"),b.pathName&&d.data("cke-display-name",b.pathName),this.editor.focusManager.add(d),d.on("focus",H,this),CKEDITOR.env.ie&&d.on("blur",I,this),d._.initialSetData=!0,d.setData(d.getHtml()),!0):!1},_findOneNotNested:function(a){a=this.wrapper.find(a);for(var b,c,d=0;d<a.count();d++)if(b=a.getItem(d),c=b.getAscendant(e.isDomWidgetWrapper),this.wrapper.equals(c))return b;return null},isInited:function(){return!(!this.wrapper||
+!this.inited)},isReady:function(){return this.isInited()&&this.ready},focus:function(){var a=this.editor.getSelection();if(a){var b=this.editor.checkDirty();a.fake(this.wrapper);!b&&this.editor.resetDirty()}this.editor.focus()},removeClass:function(a){this.element.removeClass(a);this.wrapper.removeClass(e.WRAPPER_CLASS_PREFIX+a)},removeStyle:function(a){A(this,a,0)},setData:function(a,b){var c=this.data,d=0;if("string"==typeof a)c[a]!==b&&(c[a]=b,d=1);else{var e=a;for(a in e)c[a]!==e[a]&&(d=1,c[a]=
+e[a])}d&&this.dataReady&&(W(this),this.fire("data",c));return this},setFocused:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_focused");this.fire(a?"focus":"blur");return this},setSelected:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_selected");this.fire(a?"select":"deselect");return this},updateDragHandlerPosition:function(){var a=this.editor,b=this.element.$,c=this._.dragHandlerOffset,b={x:b.offsetLeft,y:b.offsetTop-15};c&&b.x==c.x&&b.y==c.y||(c=a.checkDirty(),
+a.fire("lockSnapshot"),this.dragHandlerContainer.setStyles({top:b.y+"px",left:b.x+"px",display:"block"}),a.fire("unlockSnapshot"),!c&&a.resetDirty(),this._.dragHandlerOffset=b)}};CKEDITOR.event.implementOn(e.prototype);e.getNestedEditable=function(a,b){return!b||b.equals(a)?null:e.isDomNestedEditable(b)?b:e.getNestedEditable(a,b.getParent())};e.isDomDragHandler=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-drag-handler")};e.isDomDragHandlerContainer=function(a){return a.type==
+CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_widget_drag_handler_container")};e.isDomNestedEditable=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-editable")};e.isDomWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-widget")};e.isDomWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-wrapper")};e.isParserWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-widget"]};
+e.isParserWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-cke-widget-wrapper"]};e.WRAPPER_CLASS_PREFIX="cke_widget_wrapper_";c.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.dom.element.prototype),{setData:function(a){this._.initialSetData||this.editor.widgets.destroyAll(!1,this);this._.initialSetData=!1;a=this.editor.dataProcessor.toHtml(a,{context:this.getName(),filter:this.filter,enterMode:this.enterMode});this.setHtml(a);this.editor.widgets.initOnAll(this)},
+getData:function(){return this.editor.dataProcessor.toDataFormat(this.getHtml(),{context:this.getName(),filter:this.filter,enterMode:this.enterMode})}});var X=/^(?:<(?:div|span)(?: data-cke-temp="1")?(?: id="cke_copybin")?(?: data-cke-temp="1")?>)?(?:<(?:div|span)(?: style="[^"]+")?>)?<span [^>]*data-cke-copybin-start="1"[^>]*>.?<\/span>([\s\S]+)<span [^>]*data-cke-copybin-end="1"[^>]*>.?<\/span>(?:<\/(?:div|span)>)?(?:<\/(?:div|span)>)?$/i,N={37:1,38:1,39:1,40:1,8:1,46:1};(function(){function a(){}
+function b(a,c,d){return d&&this.checkElement(a)?(a=d.widgets.getByElement(a,!0))&&a.checkStyleActive(this):!1}var c={};CKEDITOR.style.addCustomHandler({type:"widget",setup:function(a){this.widget=a.widget;if(this.group="string"==typeof a.group?[a.group]:a.group){a=this.widget;var b;c[a]||(c[a]={});for(var d=0,e=this.group.length;d<e;d++)b=this.group[d],c[a][b]||(c[a][b]=[]),c[a][b].push(this)}},apply:function(a){var b;a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&(b=a.widgets.focused,
+this.group&&this.removeStylesFromSameGroup(a),b.applyStyle(this))},remove:function(a){a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&a.widgets.focused.removeStyle(this)},removeStylesFromSameGroup:function(a){var b,d,e=!1;if(!(a instanceof CKEDITOR.editor))return!1;d=a.elementPath();if(this.checkApplicable(d,a))for(var f=0,g=this.group.length;f<g;f++){b=c[this.widget][this.group[f]];for(var h=0;h<b.length;h++)b[h]!==this&&b[h].checkActive(d,a)&&(a.widgets.focused.removeStyle(b[h]),
+e=!0)}return e},checkActive:function(a,b){return this.checkElementMatch(a.lastElement,0,b)},checkApplicable:function(a,b){return b instanceof CKEDITOR.editor?this.checkElement(a.lastElement):!1},checkElementMatch:b,checkElementRemovable:b,checkElement:function(a){return e.isDomWidgetWrapper(a)?(a=a.getFirst(e.isDomWidgetElement))&&a.data("widget")==this.widget:!1},buildPreview:function(a){return a||this._.definition.name},toAllowedContentRules:function(a){if(!a)return null;a=a.widgets.registered[this.widget];
+var b,c={};if(!a)return null;if(a.styleableElements){b=this.getClassesArray();if(!b)return null;c[a.styleableElements]={classes:b,propertiesOnly:!0};return c}return a.styleToAllowedContentRules?a.styleToAllowedContentRules(this):null},getClassesArray:function(){var a=this._.definition.attributes&&this._.definition.attributes["class"];return a?CKEDITOR.tools.trim(a).split(/\s+/):null},applyToRange:a,removeFromRange:a,applyToObject:a})})();CKEDITOR.plugins.widget=e;e.repository=a;e.nestedEditable=c}(),
+"use strict",function(){function a(a){function d(){this.deflated||(a.widgets.focused==this.widget&&(this.focused=!0),a.widgets.destroy(this.widget),this.deflated=!0)}function f(){var b=a.editable(),c=a.document;if(this.deflated)this.widget=a.widgets.initOn(this.element,"image",this.widget.data),this.widget.inline&&!(new CKEDITOR.dom.elementPath(this.widget.wrapper,b)).block&&(b=c.createElement(a.activeEnterMode==CKEDITOR.ENTER_P?"p":"div"),b.replace(this.widget.wrapper),this.widget.wrapper.move(b)),
+this.focused&&(this.widget.focus(),delete this.focused),delete this.deflated;else{var d=this.widget,b=h,c=d.wrapper,e=d.data.align,d=d.data.hasCaption;if(b){for(var g=3;g--;)c.removeClass(b[g]);"center"==e?d&&c.addClass(b[1]):"none"!=e&&c.addClass(b[r[e]])}else"center"==e?(d?c.setStyle("text-align","center"):c.removeStyle("text-align"),c.removeStyle("float")):("none"==e?c.removeStyle("float"):c.setStyle("float",e),c.removeStyle("text-align"))}}var h=a.config.image2_alignClasses,k=a.config.image2_captionedClass;
+return{allowedContent:b(a),requiredContent:"img[src,alt]",features:g(a),styleableElements:"img figure",contentTransformations:[["img[width]: sizeToAttribute"]],editables:{caption:{selector:"figcaption",allowedContent:"br em strong sub sup u s; a[!href,target]"}},parts:{image:"img",caption:"figcaption"},dialog:"image2",template:'\x3cimg alt\x3d"" src\x3d"" /\x3e',data:function(){var b=this.features;this.data.hasCaption&&!a.filter.checkFeature(b.caption)&&(this.data.hasCaption=!1);"none"==this.data.align||
+a.filter.checkFeature(b.align)||(this.data.align="none");this.shiftState({widget:this,element:this.element,oldData:this.oldData,newData:this.data,deflate:d,inflate:f});this.data.link?this.parts.link||(this.parts.link=this.parts.image.getParent()):this.parts.link&&delete this.parts.link;this.parts.image.setAttributes({src:this.data.src,"data-cke-saved-src":this.data.src,alt:this.data.alt});if(this.oldData&&!this.oldData.hasCaption&&this.data.hasCaption)for(var c in this.data.classes)this.parts.image.removeClass(c);
+if(a.filter.checkFeature(b.dimension)){b=this.data;b={width:b.width,height:b.height};c=this.parts.image;for(var e in b)b[e]?c.setAttribute(e,b[e]):c.removeAttribute(e)}this.oldData=CKEDITOR.tools.extend({},this.data)},init:function(){var b=CKEDITOR.plugins.image2,c=this.parts.image,d={hasCaption:!!this.parts.caption,src:c.getAttribute("src"),alt:c.getAttribute("alt")||"",width:c.getAttribute("width")||"",height:c.getAttribute("height")||"",lock:this.ready?b.checkHasNaturalRatio(c):!0},e=c.getAscendant("a");
+e&&this.wrapper.contains(e)&&(this.parts.link=e);d.align||(c=d.hasCaption?this.element:c,h?(c.hasClass(h[0])?d.align="left":c.hasClass(h[2])&&(d.align="right"),d.align?c.removeClass(h[r[d.align]]):d.align="none"):(d.align=c.getStyle("float")||"none",c.removeStyle("float")));a.plugins.link&&this.parts.link&&(d.link=b.getLinkAttributesParser()(a,this.parts.link),(c=d.link.advanced)&&c.advCSSClasses&&(c.advCSSClasses=CKEDITOR.tools.trim(c.advCSSClasses.replace(/cke_\S+/,""))));this.wrapper[(d.hasCaption?
 "remove":"add")+"Class"]("cke_image_nocaption");this.setData(d);a.filter.checkFeature(this.features.dimension)&&!0!==a.config.image2_disableResizer&&m(this);this.shiftState=b.stateShifter(this.editor);this.on("contextMenu",function(a){a.data.image=CKEDITOR.TRISTATE_OFF;if(this.parts.link||this.wrapper.getAscendant("a"))a.data.link=a.data.unlink=CKEDITOR.TRISTATE_OFF});this.on("dialog",function(a){a.data.widget=this},this)},addClass:function(a){p(this).addClass(a)},hasClass:function(a){return p(this).hasClass(a)},
-removeClass:function(a){p(this).removeClass(a)},getClasses:function(){var a=new RegExp("^("+[].concat(k,h).join("|")+")$");return function(){var b=this.repository.parseElementClasses(p(this).getAttribute("class")),c;for(c in b)a.test(c)&&delete b[c];return b}}(),upcast:f(a),downcast:c(a),getLabel:function(){return this.editor.lang.widget.label.replace(/%1/,(this.data.alt||"")+" "+this.pathName)}}}function f(a){var b=e(a),c=a.config.image2_captionedClass;return function(a,d){var e={width:1,height:1},
-f=a.name,g;if(!a.attributes["data-cke-realelement"]&&(b(a)?("div"==f&&(g=a.getFirst("figure"))&&(a.replaceWith(g),a=g),d.align="center",g=a.getFirst("img")||a.getFirst("a").getFirst("img")):"figure"==f&&a.hasClass(c)?g=a.getFirst("img")||a.getFirst("a").getFirst("img"):h(a)&&(g="a"==a.name?a.children[0]:a),g)){for(var k in e)(e=g.attributes[k])&&e.match(t)&&delete g.attributes[k];return a}}}function c(a){var b=a.config.image2_alignClasses;return function(a){var c="a"==a.name?a.getFirst():a,d=c.attributes,
-e=this.data.align;if(!this.inline){var f=a.getFirst("span");f&&f.replaceWith(f.getFirst({img:1,a:1}))}e&&"none"!=e&&(f=CKEDITOR.tools.parseCssText(d.style||""),"center"==e&&"figure"==a.name?a=a.wrapWith(new CKEDITOR.htmlParser.element("div",b?{"class":b[1]}:{style:"text-align:center"})):e in{left:1,right:1}&&(b?c.addClass(b[u[e]]):f["float"]=e),b||CKEDITOR.tools.isEmpty(f)||(d.style=CKEDITOR.tools.writeCssText(f)));return a}}function e(a){var b=a.config.image2_captionedClass,c=a.config.image2_alignClasses,
+removeClass:function(a){p(this).removeClass(a)},getClasses:function(){var a=new RegExp("^("+[].concat(k,h).join("|")+")$");return function(){var b=this.repository.parseElementClasses(p(this).getAttribute("class")),c;for(c in b)a.test(c)&&delete b[c];return b}}(),upcast:e(a),downcast:c(a),getLabel:function(){return this.editor.lang.widget.label.replace(/%1/,(this.data.alt||"")+" "+this.pathName)}}}function e(a){var b=f(a),c=a.config.image2_captionedClass;return function(a,d){var e={width:1,height:1},
+f=a.name,g;if(!a.attributes["data-cke-realelement"]&&(b(a)?("div"==f&&(g=a.getFirst("figure"))&&(a.replaceWith(g),a=g),d.align="center",g=a.getFirst("img")||a.getFirst("a").getFirst("img")):"figure"==f&&a.hasClass(c)?g=a.getFirst("img")||a.getFirst("a").getFirst("img"):h(a)&&(g="a"==a.name?a.children[0]:a),g)){for(var k in e)(e=g.attributes[k])&&e.match(w)&&delete g.attributes[k];return a}}}function c(a){var b=a.config.image2_alignClasses;return function(a){var c="a"==a.name?a.getFirst():a,d=c.attributes,
+e=this.data.align;if(!this.inline){var f=a.getFirst("span");f&&f.replaceWith(f.getFirst({img:1,a:1}))}e&&"none"!=e&&(f=CKEDITOR.tools.parseCssText(d.style||""),"center"==e&&"figure"==a.name?a=a.wrapWith(new CKEDITOR.htmlParser.element("div",b?{"class":b[1]}:{style:"text-align:center"})):e in{left:1,right:1}&&(b?c.addClass(b[r[e]]):f["float"]=e),b||CKEDITOR.tools.isEmpty(f)||(d.style=CKEDITOR.tools.writeCssText(f)));return a}}function f(a){var b=a.config.image2_captionedClass,c=a.config.image2_alignClasses,
 d={figure:1,a:1,img:1};return function(e){if(!(e.name in{div:1,p:1}))return!1;var f=e.children;if(1!==f.length)return!1;f=f[0];if(!(f.name in d))return!1;if("p"==e.name){if(!h(f))return!1}else if("figure"==f.name){if(!f.hasClass(b))return!1}else if(a.enterMode==CKEDITOR.ENTER_P||!h(f))return!1;return(c?e.hasClass(c[1]):"center"==CKEDITOR.tools.parseCssText(e.attributes.style||"",!0)["text-align"])?!0:!1}}function h(a){return"img"==a.name?!0:"a"==a.name?1==a.children.length&&a.getFirst("img"):!1}function m(a){var b=
 a.editor,c=b.editable(),d=b.document,e=a.resizer=d.createElement("span");e.addClass("cke_image_resizer");e.setAttribute("title",b.lang.image2.resizer);e.append(new CKEDITOR.dom.text("​",d));if(a.inline)a.wrapper.append(e);else{var f=a.parts.link||a.parts.image,g=f.getParent(),h=d.createElement("span");h.addClass("cke_image_resizer_wrapper");h.append(f);h.append(e);a.element.append(h,!0);g.is("span")&&g.remove()}e.on("mousedown",function(f){function g(a,b,c){var e=CKEDITOR.document,f=[];d.equals(e)||
-f.push(e.on(a,b));f.push(d.on(a,b));if(c)for(a=f.length;a--;)c.push(f.pop())}function h(){K=t+m*S;W=Math.round(K/v)}function k(){W=u-J;K=Math.round(W*v)}var l=a.parts.image,m="right"==a.data.align?-1:1,p=f.data.$.screenX,r=f.data.$.screenY,t=l.$.clientWidth,u=l.$.clientHeight,v=t/u,w=[],B="cke_image_s"+(~m?"e":"w"),P,K,W,U,S,J,H;b.fire("saveSnapshot");g("mousemove",function(a){P=a.data.$;S=P.screenX-p;J=r-P.screenY;H=Math.abs(S/J);1==m?0>=S?0>=J?h():H>=v?h():k():0>=J?H>=v?k():h():k():0>=S?0>=J?H>=
-v?k():h():k():0>=J?h():H>=v?h():k();15<=K&&15<=W?(l.setAttributes({width:K,height:W}),U=!0):U=!1},w);g("mouseup",function(){for(var d;d=w.pop();)d.removeListener();c.removeClass(B);e.removeClass("cke_image_resizing");U&&(a.setData({width:K,height:W}),b.fire("saveSnapshot"));U=!1},w);c.addClass(B);e.addClass("cke_image_resizing")});a.on("data",function(){e["right"==a.data.align?"addClass":"removeClass"]("cke_image_resizer_left")})}function l(a){var c=[],d;return function(e){var f=a.getCommand("justify"+
-e);if(f){c.push(function(){f.refresh(a,a.elementPath())});if(e in{right:1,left:1,center:1})f.on("exec",function(d){var f=b(a);if(f){f.setData("align",e);for(f=c.length;f--;)c[f]();d.cancel()}});f.on("refresh",function(c){var f=b(a),g={right:1,left:1,center:1};f&&(void 0===d&&(d=a.filter.checkFeature(a.widgets.registered.image.features.align)),d?this.setState(f.data.align==e?CKEDITOR.TRISTATE_ON:e in g?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED):this.setState(CKEDITOR.TRISTATE_DISABLED),c.cancel())})}}}
-function k(a){a.plugins.link&&(CKEDITOR.on("dialogDefinition",function(c){c=c.data;if("link"==c.name){c=c.definition;var d=c.onShow,e=c.onOk;c.onShow=function(){var c=b(a),e=this.getContentElement("info","linkDisplayText").getElement().getParent().getParent();c&&(c.inline?!c.wrapper.getAscendant("a"):1)?(this.setupContent(c.data.link||{}),e.hide()):(e.show(),d.apply(this,arguments))};c.onOk=function(){var c=b(a);if(c&&(c.inline?!c.wrapper.getAscendant("a"):1)){var d={};this.commitContent(d);c.setData("link",
-d)}else e.apply(this,arguments)}}}),a.getCommand("unlink").on("exec",function(c){var d=b(a);d&&d.parts.link&&(d.setData("link",null),this.refresh(a,a.elementPath()),c.cancel())}),a.getCommand("unlink").on("refresh",function(c){var d=b(a);d&&(this.setState(d.data.link||d.wrapper.getAscendant("a")?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED),c.cancel())}))}function b(a){return(a=a.widgets.focused)&&"image"==a.name?a:null}function d(a){var b=a.config.image2_alignClasses;a={div:{match:e(a)},p:{match:e(a)},
+f.push(e.on(a,b));f.push(d.on(a,b));if(c)for(a=f.length;a--;)c.push(f.pop())}function h(){T=t+m*X;V=Math.round(T/v)}function k(){V=w-N;T=Math.round(V*v)}var l=a.parts.image,m="right"==a.data.align?-1:1,p=f.data.$.screenX,r=f.data.$.screenY,t=l.$.clientWidth,w=l.$.clientHeight,v=t/w,x=[],F="cke_image_s"+(~m?"e":"w"),O,T,V,W,X,N,J;b.fire("saveSnapshot");g("mousemove",function(a){O=a.data.$;X=O.screenX-p;N=r-O.screenY;J=Math.abs(X/N);1==m?0>=X?0>=N?h():J>=v?h():k():0>=N?J>=v?k():h():k():0>=X?0>=N?J>=
+v?k():h():k():0>=N?h():J>=v?h():k();15<=T&&15<=V?(l.setAttributes({width:T,height:V}),W=!0):W=!1},x);g("mouseup",function(){for(var d;d=x.pop();)d.removeListener();c.removeClass(F);e.removeClass("cke_image_resizing");W&&(a.setData({width:T,height:V}),b.fire("saveSnapshot"));W=!1},x);c.addClass(F);e.addClass("cke_image_resizing")});a.on("data",function(){e["right"==a.data.align?"addClass":"removeClass"]("cke_image_resizer_left")})}function l(a){var b=[],c;return function(e){var f=a.getCommand("justify"+
+e);if(f){b.push(function(){f.refresh(a,a.elementPath())});if(e in{right:1,left:1,center:1})f.on("exec",function(c){var f=d(a);if(f){f.setData("align",e);for(f=b.length;f--;)b[f]();c.cancel()}});f.on("refresh",function(b){var f=d(a),g={right:1,left:1,center:1};f&&(void 0===c&&(c=a.filter.checkFeature(a.widgets.registered.image.features.align)),c?this.setState(f.data.align==e?CKEDITOR.TRISTATE_ON:e in g?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED):this.setState(CKEDITOR.TRISTATE_DISABLED),b.cancel())})}}}
+function k(a){a.plugins.link&&(CKEDITOR.on("dialogDefinition",function(b){b=b.data;if("link"==b.name){b=b.definition;var c=b.onShow,e=b.onOk;b.onShow=function(){var b=d(a),e=this.getContentElement("info","linkDisplayText").getElement().getParent().getParent();b&&(b.inline?!b.wrapper.getAscendant("a"):1)?(this.setupContent(b.data.link||{}),e.hide()):(e.show(),c.apply(this,arguments))};b.onOk=function(){var b=d(a);if(b&&(b.inline?!b.wrapper.getAscendant("a"):1)){var c={};this.commitContent(c);b.setData("link",
+c)}else e.apply(this,arguments)}}}),a.getCommand("unlink").on("exec",function(b){var c=d(a);c&&c.parts.link&&(c.setData("link",null),this.refresh(a,a.elementPath()),b.cancel())}),a.getCommand("unlink").on("refresh",function(b){var c=d(a);c&&(this.setState(c.data.link||c.wrapper.getAscendant("a")?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED),b.cancel())}))}function d(a){return(a=a.widgets.focused)&&"image"==a.name?a:null}function b(a){var b=a.config.image2_alignClasses;a={div:{match:f(a)},p:{match:f(a)},
 img:{attributes:"!src,alt,width,height"},figure:{classes:"!"+a.config.image2_captionedClass},figcaption:!0};b?(a.div.classes=b[1],a.p.classes=a.div.classes,a.img.classes=b[0]+","+b[2],a.figure.classes+=","+a.img.classes):(a.div.styles="text-align",a.p.styles="text-align",a.img.styles="float",a.figure.styles="float,display");return a}function g(a){a=a.config.image2_alignClasses;return{dimension:{requiredContent:"img[width,height]"},align:{requiredContent:"img"+(a?"("+a[0]+")":"{float}")},caption:{requiredContent:"figcaption"}}}
-function p(a){return a.data.hasCaption?a.element:a.parts.image}var v=new CKEDITOR.template('\x3cfigure class\x3d"{captionedClass}"\x3e\x3cimg alt\x3d"" src\x3d"" /\x3e\x3cfigcaption\x3e{captionPlaceholder}\x3c/figcaption\x3e\x3c/figure\x3e'),u={left:0,center:1,right:2},t=/^\s*(\d+\%)\s*$/i;CKEDITOR.plugins.add("image2",{requires:"widget,dialog",icons:"image",hidpi:!0,onLoad:function(){CKEDITOR.addCss(".cke_image_nocaption{line-height:0}.cke_editable.cke_image_sw, .cke_editable.cke_image_sw *{cursor:sw-resize !important}.cke_editable.cke_image_se, .cke_editable.cke_image_se *{cursor:se-resize !important}.cke_image_resizer{display:none;position:absolute;width:10px;height:10px;bottom:-5px;right:-5px;background:#000;outline:1px solid #fff;line-height:0;cursor:se-resize;}.cke_image_resizer_wrapper{position:relative;display:inline-block;line-height:0;}.cke_image_resizer.cke_image_resizer_left{right:auto;left:-5px;cursor:sw-resize;}.cke_widget_wrapper:hover .cke_image_resizer,.cke_image_resizer.cke_image_resizing{display:block}.cke_widget_wrapper\x3ea{display:inline-block}")},
+function p(a){return a.data.hasCaption?a.element:a.parts.image}var v=new CKEDITOR.template('\x3cfigure class\x3d"{captionedClass}"\x3e\x3cimg alt\x3d"" src\x3d"" /\x3e\x3cfigcaption\x3e{captionPlaceholder}\x3c/figcaption\x3e\x3c/figure\x3e'),r={left:0,center:1,right:2},w=/^\s*(\d+\%)\s*$/i;CKEDITOR.plugins.add("image2",{requires:"widget,dialog",icons:"image",hidpi:!0,onLoad:function(){CKEDITOR.addCss(".cke_image_nocaption{line-height:0}.cke_editable.cke_image_sw, .cke_editable.cke_image_sw *{cursor:sw-resize !important}.cke_editable.cke_image_se, .cke_editable.cke_image_se *{cursor:se-resize !important}.cke_image_resizer{display:none;position:absolute;width:10px;height:10px;bottom:-5px;right:-5px;background:#000;outline:1px solid #fff;line-height:0;cursor:se-resize;}.cke_image_resizer_wrapper{position:relative;display:inline-block;line-height:0;}.cke_image_resizer.cke_image_resizer_left{right:auto;left:-5px;cursor:sw-resize;}.cke_widget_wrapper:hover .cke_image_resizer,.cke_image_resizer.cke_image_resizing{display:block}.cke_widget_wrapper\x3ea{display:inline-block}")},
 init:function(b){var c=b.config,d=b.lang.image2,e=a(b);c.filebrowserImage2BrowseUrl=c.filebrowserImageBrowseUrl;c.filebrowserImage2UploadUrl=c.filebrowserImageUploadUrl;e.pathName=d.pathName;e.editables.caption.pathName=d.pathNameCaption;b.widgets.add("image",e);b.ui.addButton&&b.ui.addButton("Image",{label:b.lang.common.image,command:"image",toolbar:"insert,10"});b.contextMenu&&(b.addMenuGroup("image",10),b.addMenuItem("image",{label:d.menu,command:"image",group:"image"}));CKEDITOR.dialog.add("image2",
 this.path+"dialogs/image2.js")},afterInit:function(a){var b={left:1,right:1,center:1,block:1},c=l(a),d;for(d in b)c(d);k(a)}});CKEDITOR.plugins.image2={stateShifter:function(a){function b(a,f){var g={};e?g.attributes={"class":e[1]}:g.styles={"text-align":"center"};g=d.createElement(a.activeEnterMode==CKEDITOR.ENTER_P?"p":"div",g);c(g,f);f.move(g);return g}function c(b,d){if(d.getParent()){var e=a.createRange();e.moveToPosition(d,CKEDITOR.POSITION_BEFORE_START);d.remove();g.insertElementIntoRange(b,
 e)}else b.replace(d)}var d=a.document,e=a.config.image2_alignClasses,f=a.config.image2_captionedClass,g=a.editable(),h=["hasCaption","align","link"],k={align:function(c,d,f){var g=c.element;c.changed.align?c.newData.hasCaption||("center"==f&&(c.deflate(),c.element=b(a,g)),c.changed.hasCaption||"center"!=d||"center"==f||(c.deflate(),d=g.findOne("a,img"),d.replace(g),c.element=d)):"center"==f&&c.changed.hasCaption&&!c.newData.hasCaption&&(c.deflate(),c.element=b(a,g));!e&&g.is("figure")&&("center"==
 f?g.setStyle("display","inline-block"):g.removeStyle("display"))},hasCaption:function(b,e,g){b.changed.hasCaption&&(e=b.element.is({img:1,a:1})?b.element:b.element.findOne("a,img"),b.deflate(),g?(g=CKEDITOR.dom.element.createFromHtml(v.output({captionedClass:f,captionPlaceholder:a.lang.image2.captionPlaceholder}),d),c(g,b.element),e.replace(g.findOne("img")),b.element=g):(e.replace(b.element),b.element=e))},link:function(b,c,e){if(b.changed.link){var f=b.element.is("img")?b.element:b.element.findOne("img"),
 g=b.element.is("a")?b.element:b.element.findOne("a"),h=b.element.is("a")&&!e||b.element.is("img")&&e,k;h&&b.deflate();e?(c||(k=d.createElement("a",{attributes:{href:b.newData.link.url}}),k.replace(f),f.move(k)),e=CKEDITOR.plugins.image2.getLinkAttributesGetter()(a,e),CKEDITOR.tools.isEmpty(e.set)||(k||g).setAttributes(e.set),e.removed.length&&(k||g).removeAttributes(e.removed)):(e=g.findOne("img"),e.replace(g),k=e);h&&(b.element=k)}}};return function(a){var b,c;a.changed={};for(c=0;c<h.length;c++)b=
 h[c],a.changed[b]=a.oldData?a.oldData[b]!==a.newData[b]:!1;for(c=0;c<h.length;c++)b=h[c],k[b](a,a.oldData?a.oldData[b]:null,a.newData[b]);a.inflate()}},checkHasNaturalRatio:function(a){var b=a.$;a=this.getNatural(a);return Math.round(b.clientWidth/a.width*a.height)==b.clientHeight||Math.round(b.clientHeight/a.height*a.width)==b.clientWidth},getNatural:function(a){if(a.$.naturalWidth)a={width:a.$.naturalWidth,height:a.$.naturalHeight};else{var b=new Image;b.src=a.getAttribute("src");a={width:b.width,
-height:b.height}}return a},getLinkAttributesGetter:function(){return CKEDITOR.plugins.link.getLinkAttributes},getLinkAttributesParser:function(){return CKEDITOR.plugins.link.parseLinkAttributes}}}(),CKEDITOR.config.image2_captionedClass="image",CKEDITOR.config.plugins="dialogui,dialog,about,a11yhelp,basicstyles,blockquote,clipboard,panel,floatpanel,menu,contextmenu,resize,button,toolbar,elementspath,enterkey,entities,popup,filebrowser,floatingspace,listblock,richcombo,format,htmlwriter,horizontalrule,wysiwygarea,indent,indentlist,menubutton,language,list,magicline,maximize,pastetext,pastefromword,removeformat,sourcearea,specialchar,stylescombo,tab,table,tabletools,undo,justify,showblocks,showborders,tableresize,sharedspace,sourcedialog,lineutils,widget,image2",
-CKEDITOR.config.skin="moono",function(){var a=function(a,c){var e=CKEDITOR.getUrl("plugins/"+c);a=a.split(",");for(var h=0;h<a.length;h++)CKEDITOR.skin.icons[a[h]]={path:e,offset:-a[++h],bgsize:a[++h]}};CKEDITOR.env.hidpi?a("about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,blockquote,168,,copy-rtl,192,,copy,216,,cut-rtl,240,,cut,264,,paste-rtl,288,,paste,312,,horizontalrule,336,,image,360,,indent-rtl,384,,indent,408,,outdent-rtl,432,,outdent,456,,justifyblock,480,,justifycenter,504,,justifyleft,528,,justifyright,552,,language,576,,bulletedlist-rtl,600,,bulletedlist,624,,numberedlist-rtl,648,,numberedlist,672,,maximize,696,,pastefromword-rtl,720,,pastefromword,744,,pastetext-rtl,768,,pastetext,792,,removeformat,816,,showblocks-rtl,840,,showblocks,864,,source-rtl,888,,source,912,,sourcedialog-rtl,936,,sourcedialog,960,,specialchar,984,,table,1008,,redo-rtl,1032,,redo,1056,,undo-rtl,1080,,undo,1104,,simplebox,2256,auto",
+height:b.height}}return a},getLinkAttributesGetter:function(){return CKEDITOR.plugins.link.getLinkAttributes},getLinkAttributesParser:function(){return CKEDITOR.plugins.link.parseLinkAttributes}}}(),CKEDITOR.config.image2_captionedClass="image","use strict",function(){function a(a){function c(){m=a.document;l=m[CKEDITOR.env.ie?"getBody":"getDocumentElement"]();k=CKEDITOR.env.quirks?m.getBody():m.getDocumentElement();var b=CKEDITOR.env.quirks?k:k.findOne("body");b&&(b.setStyle("height","auto"),b.setStyle("min-height",
+CKEDITOR.env.safari?"0%":"auto"));d=CKEDITOR.dom.element.createFromHtml('\x3cspan style\x3d"margin:0;padding:0;border:0;clear:both;width:1px;height:1px;display:block;"\x3e'+(CKEDITOR.env.webkit?"\x26nbsp;":"")+"\x3c/span\x3e",m)}function f(){v&&k.setStyle("overflow-y","hidden");var c=a.window.getViewPaneSize().height,f;l.append(d);f=d.getDocumentPosition(m).y+d.$.offsetHeight;d.remove();f+=b;f=Math.max(f,g);f=Math.min(f,p);f!=c&&h!=f&&(f=a.fire("autoGrow",{currentHeight:c,newHeight:f}).newHeight,
+a.resize(a.container.getStyle("width"),f,!0),h=f);v||(f<p&&k.$.scrollHeight>k.$.clientHeight?k.setStyle("overflow-y","hidden"):k.removeStyle("overflow-y"))}var h,m,l,k,d,b=a.config.autoGrow_bottomSpace||0,g=void 0!==a.config.autoGrow_minHeight?a.config.autoGrow_minHeight:200,p=a.config.autoGrow_maxHeight||Infinity,v=!a.config.autoGrow_maxHeight;a.addCommand("autogrow",{exec:f,modes:{wysiwyg:1},readOnly:1,canUndo:!1,editorFocus:!1});var r={contentDom:1,key:1,selectionChange:1,insertElement:1,mode:1},
+w;for(w in r)a.on(w,function(b){"wysiwyg"==b.editor.mode&&setTimeout(function(){var b=a.getCommand("maximize");!a.window||b&&b.state==CKEDITOR.TRISTATE_ON?h=null:(f(),v||f())},100)});a.on("afterCommandExec",function(a){"maximize"==a.data.name&&"wysiwyg"==a.editor.mode&&(a.data.command.state==CKEDITOR.TRISTATE_ON?k.removeStyle("overflow-y"):f())});a.on("contentDom",c);c();a.config.autoGrow_onStartup&&a.editable().isVisible()&&a.execCommand("autogrow")}CKEDITOR.plugins.add("autogrow",{init:function(e){if(e.elementMode!=
+CKEDITOR.ELEMENT_MODE_INLINE)e.on("instanceReady",function(){e.editable().isInline()?e.ui.space("contents").setStyle("height","auto"):a(e)})}})}(),CKEDITOR.config.plugins="dialogui,dialog,about,a11yhelp,basicstyles,blockquote,clipboard,panel,floatpanel,menu,contextmenu,button,toolbar,elementspath,enterkey,entities,popup,filebrowser,floatingspace,listblock,richcombo,format,htmlwriter,horizontalrule,wysiwygarea,indent,indentlist,menubutton,language,list,magicline,maximize,pastetext,pastefromword,removeformat,sourcearea,specialchar,stylescombo,tab,table,tabletools,undo,justify,showblocks,showborders,tableresize,sharedspace,sourcedialog,lineutils,widgetselection,widget,image2,autogrow",
+CKEDITOR.config.skin="moono-lisa",function(){var a=function(a,c){var f=CKEDITOR.getUrl("plugins/"+c);a=a.split(",");for(var h=0;h<a.length;h++)CKEDITOR.skin.icons[a[h]]={path:f,offset:-a[++h],bgsize:a[++h]}};CKEDITOR.env.hidpi?a("about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,blockquote,168,,copy-rtl,192,,copy,216,,cut-rtl,240,,cut,264,,paste-rtl,288,,paste,312,,horizontalrule,336,,image,360,,indent-rtl,384,,indent,408,,outdent-rtl,432,,outdent,456,,justifyblock,480,,justifycenter,504,,justifyleft,528,,justifyright,552,,language,576,,bulletedlist-rtl,600,,bulletedlist,624,,numberedlist-rtl,648,,numberedlist,672,,maximize,696,,pastefromword-rtl,720,,pastefromword,744,,pastetext-rtl,768,,pastetext,792,,removeformat,816,,showblocks-rtl,840,,showblocks,864,,source-rtl,888,,source,912,,sourcedialog-rtl,936,,sourcedialog,960,,specialchar,984,,table,1008,,redo-rtl,1032,,redo,1056,,undo-rtl,1080,,undo,1104,,simplebox,2256,auto",
 "icons_hidpi.png"):a("about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,blockquote,168,auto,copy-rtl,192,auto,copy,216,auto,cut-rtl,240,auto,cut,264,auto,paste-rtl,288,auto,paste,312,auto,horizontalrule,336,auto,image,360,auto,indent-rtl,384,auto,indent,408,auto,outdent-rtl,432,auto,outdent,456,auto,justifyblock,480,auto,justifycenter,504,auto,justifyleft,528,auto,justifyright,552,auto,language,576,auto,bulletedlist-rtl,600,auto,bulletedlist,624,auto,numberedlist-rtl,648,auto,numberedlist,672,auto,maximize,696,auto,pastefromword-rtl,720,auto,pastefromword,744,auto,pastetext-rtl,768,auto,pastetext,792,auto,removeformat,816,auto,showblocks-rtl,840,auto,showblocks,864,auto,source-rtl,888,auto,source,912,auto,sourcedialog-rtl,936,auto,sourcedialog,960,auto,specialchar,984,auto,table,1008,auto,redo-rtl,1032,auto,redo,1056,auto,undo-rtl,1080,auto,undo,1104,auto,simplebox,1128,auto",
 "icons.png")}())})();
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/_translationstatus.txt b/web/core/assets/vendor/ckeditor/lang/_translationstatus.txt
index 5573f8040..233ed53b3 100644
--- a/web/core/assets/vendor/ckeditor/lang/_translationstatus.txt
+++ b/web/core/assets/vendor/ckeditor/lang/_translationstatus.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 
 af.js      Found: 62 Missing: 4
diff --git a/web/core/assets/vendor/ckeditor/lang/af.js b/web/core/assets/vendor/ckeditor/lang/af.js
index 70754a450..756fe0de1 100644
--- a/web/core/assets/vendor/ckeditor/lang/af.js
+++ b/web/core/assets/vendor/ckeditor/lang/af.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['af']={"widget":{"move":"Klik en trek on te beweeg","label":"%1 widget"},"undo":{"redo":"Oordoen","undo":"Ontdoen"},"toolbar":{"toolbarCollapse":"Verklein werkbalk","toolbarExpand":"Vergroot werkbalk","toolbarGroups":{"document":"Dokument","clipboard":"Knipbord/Undo","editing":"Verander","forms":"Vorms","basicstyles":"Eenvoudige Styl","paragraph":"Paragraaf","links":"Skakels","insert":"Toevoeg","styles":"Style","colors":"Kleure","tools":"Gereedskap"},"toolbars":"Werkbalke"},"table":{"border":"Randbreedte","caption":"Naam","cell":{"menu":"Sel","insertBefore":"Voeg sel in voor","insertAfter":"Voeg sel in na","deleteCell":"Verwyder sel","merge":"Voeg selle saam","mergeRight":"Voeg saam na regs","mergeDown":"Voeg saam ondertoe","splitHorizontal":"Splits sel horisontaal","splitVertical":"Splits sel vertikaal","title":"Sel eienskappe","cellType":"Sel tipe","rowSpan":"Omspan rye","colSpan":"Omspan kolomme","wordWrap":"Woord terugloop","hAlign":"Horisontale oplyning","vAlign":"Vertikale oplyning","alignBaseline":"Basislyn","bgColor":"Agtergrondkleur","borderColor":"Randkleur","data":"Inhoud","header":"Opskrif","yes":"Ja","no":"Nee","invalidWidth":"Selbreedte moet 'n getal wees.","invalidHeight":"Selhoogte moet 'n getal wees.","invalidRowSpan":"Omspan rye moet 'n heelgetal wees.","invalidColSpan":"Omspan kolomme moet 'n heelgetal wees.","chooseColor":"Kies"},"cellPad":"Sel-spasie","cellSpace":"Sel-afstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Verwyder kolom"},"columns":"Kolomme","deleteTable":"Verwyder tabel","headers":"Opskrifte","headersBoth":"Beide    ","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste ry","invalidBorder":"Randbreedte moet 'n getal wees.","invalidCellPadding":"Sel-spasie moet 'n getal wees.","invalidCellSpacing":"Sel-afstand moet 'n getal wees.","invalidCols":"Aantal kolomme moet 'n getal groter as 0 wees.","invalidHeight":"Tabelhoogte moet 'n getal wees.","invalidRows":"Aantal rye moet 'n getal groter as 0 wees.","invalidWidth":"Tabelbreedte moet 'n getal wees.","menu":"Tabel eienskappe","row":{"menu":"Ry","insertBefore":"Voeg ry in voor","insertAfter":"Voeg ry in na","deleteRow":"Verwyder ry"},"rows":"Rye","summary":"Opsomming","title":"Tabel eienskappe","toolbar":"Tabel","widthPc":"persent","widthPx":"piksels","widthUnit":"breedte-eenheid"},"stylescombo":{"label":"Styl","panelTitle":"Vormaat style","panelTitle1":"Blok style","panelTitle2":"Inlyn style","panelTitle3":"Objek style"},"specialchar":{"options":"Spesiale karakter-opsies","title":"Kies spesiale karakter","toolbar":"Voeg spesiaale karakter in"},"sourcedialog":{"toolbar":"Bron","title":"Bron"},"sourcearea":{"toolbar":"Bron"},"showblocks":{"toolbar":"Toon blokke"},"removeformat":{"toolbar":"Verwyder opmaak"},"pastetext":{"button":"Plak as eenvoudige teks","title":"Plak as eenvoudige teks"},"pastefromword":{"confirmCleanup":"Die teks wat u wil plak lyk asof dit uit Word gekopiëer is. Wil u dit eers skoonmaak voordat dit geplak word?","error":"Die geplakte teks kon nie skoongemaak word nie, weens 'n interne fout","title":"Plak vanuit Word","toolbar":"Plak vanuit Word"},"maximize":{"maximize":"Maksimaliseer","minimize":"Minimaliseer"},"magicline":{"title":"Voeg paragraaf hier in"},"list":{"bulletedlist":"Ongenommerde lys","numberedlist":"Genommerde lys"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Uitvul","center":"Sentreer","left":"Links oplyn","right":"Regs oplyn"},"indent":{"indent":"Vergroot inspring","outdent":"Verklein inspring"},"image2":{"alt":"Alternatiewe teks","btnUpload":"Stuur na bediener","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Afbeelding informasie","lockRatio":"Vaste proporsie","menu":"Afbeelding eienskappe","pathName":"image","pathNameCaption":"caption","resetSize":"Herstel grootte","resizer":"Click and drag to resize","title":"Afbeelding eienskappe","uploadTab":"Oplaai","urlMissing":"Die URL na die afbeelding ontbreek."},"horizontalrule":{"toolbar":"Horisontale lyn invoeg"},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Opskrif 1","tag_h2":"Opskrif 2","tag_h3":"Opskrif 3","tag_h4":"Opskrif 4","tag_h5":"Opskrif 5","tag_h6":"Opskrif 6","tag_p":"Normaal","tag_pre":"Opgemaak"},"elementspath":{"eleLabel":"Elemente-pad","eleTitle":"%1 element"},"contextmenu":{"options":"Konteks Spyskaart-opsies"},"clipboard":{"copy":"Kopiëer","copyError":"U blaaier se sekuriteitsinstelling belet die kopiëringsaksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+C).","cut":"Knip","cutError":"U blaaier se sekuriteitsinstelling belet die outomatiese knip-aksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+X).","paste":"Plak","pasteArea":"Plak-area","pasteMsg":"Plak die teks in die volgende teks-area met die sleutelbordkombinasie (<STRONG>Ctrl/Cmd+V</STRONG>) en druk <STRONG>OK</STRONG>.","securityMsg":"Weens u blaaier se sekuriteitsinstelling is data op die knipbord nie toeganklik nie. U kan dit eers weer in hierdie venster plak.","title":"Byvoeg"},"button":{"selectedLabel":"%1 uitgekies"},"blockquote":{"toolbar":"Sitaatblok"},"basicstyles":{"bold":"Vet","italic":"Skuins","strike":"Deurgestreep","subscript":"Onderskrif","superscript":"Bo-skrif","underline":"Onderstreep"},"about":{"copy":"Kopiereg &copy; $1. Alle regte voorbehou.","dlgTitle":"Meer oor CKEditor","help":"Slaan $1 na vir hulp.","moreInfo":"Vir lisensie-informasie, besoek asb. ons webwerf:","title":"Meer oor CKEditor","userGuide":"CKEditor Gebruikers gits"},"editor":"Woordverwerker","editorPanel":"Woordverwerkerpaneel","common":{"editorHelp":"Druk op ALT 0 vir hulp","browseServer":"Blaai op bediener","url":"URL","protocol":"Protokol","upload":"Oplaai","uploadSubmit":"Stuur aan die bediener","image":"Beeld","flash":"Flash","form":"Vorm","checkbox":"Merkhokkie","radio":"Radioknoppie","textField":"Teksveld","textarea":"Teksarea","hiddenField":"Versteekteveld","button":"Knop","select":"Keuseveld","imageButton":"Beeldknop","notSet":"<geen instelling>","id":"Id","name":"Naam","langDir":"Skryfrigting","langDirLtr":"Links na regs (LTR)","langDirRtl":"Regs na links (RTL)","langCode":"Taalkode","longDescr":"Lang beskrywing URL","cssClass":"CSS klasse","advisoryTitle":"Aanbevole titel","cssStyle":"Styl","ok":"OK","cancel":"Kanselleer","close":"Sluit","preview":"Voorbeeld","resize":"Skalierung","generalTab":"Algemeen","advancedTab":"Gevorderd","validateNumberFailed":"Hierdie waarde is nie 'n nommer nie.","confirmNewPage":"Alle wysiginge sal verlore gaan. Is jy seker dat jy 'n nuwe bladsy wil laai?","confirmCancel":"Sommige opsies is gewysig. Is jy seker dat jy hierdie dialoogvenster wil sluit?","options":"Opsies","target":"Teiken","targetNew":"Nuwe venster (_blank)","targetTop":"Boonste venster (_top)","targetSelf":"Selfde venster (_self)","targetParent":"Oorspronklike venster (_parent)","langDirLTR":"Links na Regs (LTR)","langDirRTL":"Regs na Links (RTL)","styles":"Styl","cssClasses":"CSS klasse","width":"Breedte","height":"Hoogte","align":"Orienteerung","alignLeft":"Links","alignRight":"Regs","alignCenter":"Middel","alignJustify":"Eweredig","alignTop":"Bo","alignMiddle":"Middel","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde","invalidHeight":"Hoogte moet 'n getal wees","invalidWidth":"Breedte moet 'n getal wees.","invalidCssLength":"Die waarde vir die \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","invalidHtmlLength":"Die waarde vir die  \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige HTML eenheid (px of %).","invalidInlineStyle":"Ongeldige CSS. Formaat is een of meer sleutel-wert paare, \"naam : wert\" met kommapunte gesky.","cssLengthTooltip":"Voeg 'n getal wert in pixel in, of 'n waarde met geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, nie beskikbaar nie</span>"}};
\ No newline at end of file
+CKEDITOR.lang['af']={"widget":{"move":"Klik en trek on te beweeg","label":"%1 widget"},"undo":{"redo":"Oordoen","undo":"Ontdoen"},"toolbar":{"toolbarCollapse":"Verklein werkbalk","toolbarExpand":"Vergroot werkbalk","toolbarGroups":{"document":"Dokument","clipboard":"Knipbord/Undo","editing":"Verander","forms":"Vorms","basicstyles":"Eenvoudige Styl","paragraph":"Paragraaf","links":"Skakels","insert":"Toevoeg","styles":"Style","colors":"Kleure","tools":"Gereedskap"},"toolbars":"Werkbalke"},"table":{"border":"Randbreedte","caption":"Naam","cell":{"menu":"Sel","insertBefore":"Voeg sel in voor","insertAfter":"Voeg sel in na","deleteCell":"Verwyder sel","merge":"Voeg selle saam","mergeRight":"Voeg saam na regs","mergeDown":"Voeg saam ondertoe","splitHorizontal":"Splits sel horisontaal","splitVertical":"Splits sel vertikaal","title":"Sel eienskappe","cellType":"Sel tipe","rowSpan":"Omspan rye","colSpan":"Omspan kolomme","wordWrap":"Woord terugloop","hAlign":"Horisontale oplyning","vAlign":"Vertikale oplyning","alignBaseline":"Basislyn","bgColor":"Agtergrondkleur","borderColor":"Randkleur","data":"Inhoud","header":"Opskrif","yes":"Ja","no":"Nee","invalidWidth":"Selbreedte moet 'n getal wees.","invalidHeight":"Selhoogte moet 'n getal wees.","invalidRowSpan":"Omspan rye moet 'n heelgetal wees.","invalidColSpan":"Omspan kolomme moet 'n heelgetal wees.","chooseColor":"Kies"},"cellPad":"Sel-spasie","cellSpace":"Sel-afstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Verwyder kolom"},"columns":"Kolomme","deleteTable":"Verwyder tabel","headers":"Opskrifte","headersBoth":"Beide    ","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste ry","invalidBorder":"Randbreedte moet 'n getal wees.","invalidCellPadding":"Sel-spasie moet 'n getal wees.","invalidCellSpacing":"Sel-afstand moet 'n getal wees.","invalidCols":"Aantal kolomme moet 'n getal groter as 0 wees.","invalidHeight":"Tabelhoogte moet 'n getal wees.","invalidRows":"Aantal rye moet 'n getal groter as 0 wees.","invalidWidth":"Tabelbreedte moet 'n getal wees.","menu":"Tabel eienskappe","row":{"menu":"Ry","insertBefore":"Voeg ry in voor","insertAfter":"Voeg ry in na","deleteRow":"Verwyder ry"},"rows":"Rye","summary":"Opsomming","title":"Tabel eienskappe","toolbar":"Tabel","widthPc":"persent","widthPx":"piksels","widthUnit":"breedte-eenheid"},"stylescombo":{"label":"Styl","panelTitle":"Vormaat style","panelTitle1":"Blok style","panelTitle2":"Inlyn style","panelTitle3":"Objek style"},"specialchar":{"options":"Spesiale karakter-opsies","title":"Kies spesiale karakter","toolbar":"Voeg spesiaale karakter in"},"sourcedialog":{"toolbar":"Bron","title":"Bron"},"sourcearea":{"toolbar":"Bron"},"showblocks":{"toolbar":"Toon blokke"},"removeformat":{"toolbar":"Verwyder opmaak"},"pastetext":{"button":"Plak as eenvoudige teks","title":"Plak as eenvoudige teks"},"pastefromword":{"confirmCleanup":"Die teks wat u wil plak lyk asof dit uit Word gekopiëer is. Wil u dit eers skoonmaak voordat dit geplak word?","error":"Die geplakte teks kon nie skoongemaak word nie, weens 'n interne fout","title":"Plak vanuit Word","toolbar":"Plak vanuit Word"},"maximize":{"maximize":"Maksimaliseer","minimize":"Minimaliseer"},"magicline":{"title":"Voeg paragraaf hier in"},"list":{"bulletedlist":"Ongenommerde lys","numberedlist":"Genommerde lys"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Uitvul","center":"Sentreer","left":"Links oplyn","right":"Regs oplyn"},"indent":{"indent":"Vergroot inspring","outdent":"Verklein inspring"},"image2":{"alt":"Alternatiewe teks","btnUpload":"Stuur na bediener","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Afbeelding informasie","lockRatio":"Vaste proporsie","menu":"Afbeelding eienskappe","pathName":"image","pathNameCaption":"caption","resetSize":"Herstel grootte","resizer":"Click and drag to resize","title":"Afbeelding eienskappe","uploadTab":"Oplaai","urlMissing":"Die URL na die afbeelding ontbreek.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Horisontale lyn invoeg"},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Opskrif 1","tag_h2":"Opskrif 2","tag_h3":"Opskrif 3","tag_h4":"Opskrif 4","tag_h5":"Opskrif 5","tag_h6":"Opskrif 6","tag_p":"Normaal","tag_pre":"Opgemaak"},"elementspath":{"eleLabel":"Elemente-pad","eleTitle":"%1 element"},"contextmenu":{"options":"Konteks Spyskaart-opsies"},"clipboard":{"copy":"Kopiëer","copyError":"U blaaier se sekuriteitsinstelling belet die kopiëringsaksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+C).","cut":"Knip","cutError":"U blaaier se sekuriteitsinstelling belet die outomatiese knip-aksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+X).","paste":"Plak","pasteArea":"Plak-area","pasteMsg":"Plak die teks in die volgende teks-area met die sleutelbordkombinasie (<STRONG>Ctrl/Cmd+V</STRONG>) en druk <STRONG>OK</STRONG>.","securityMsg":"Weens u blaaier se sekuriteitsinstelling is data op die knipbord nie toeganklik nie. U kan dit eers weer in hierdie venster plak.","title":"Byvoeg"},"button":{"selectedLabel":"%1 uitgekies"},"blockquote":{"toolbar":"Sitaatblok"},"basicstyles":{"bold":"Vet","italic":"Skuins","strike":"Deurgestreep","subscript":"Onderskrif","superscript":"Bo-skrif","underline":"Onderstreep"},"about":{"copy":"Kopiereg &copy; $1. Alle regte voorbehou.","dlgTitle":"Meer oor CKEditor","help":"Slaan $1 na vir hulp.","moreInfo":"Vir lisensie-informasie, besoek asb. ons webwerf:","title":"Meer oor CKEditor","userGuide":"CKEditor Gebruikers gits"},"editor":"Woordverwerker","editorPanel":"Woordverwerkerpaneel","common":{"editorHelp":"Druk op ALT 0 vir hulp","browseServer":"Blaai op bediener","url":"URL","protocol":"Protokol","upload":"Oplaai","uploadSubmit":"Stuur aan die bediener","image":"Beeld","flash":"Flash","form":"Vorm","checkbox":"Merkhokkie","radio":"Radioknoppie","textField":"Teksveld","textarea":"Teksarea","hiddenField":"Versteekteveld","button":"Knop","select":"Keuseveld","imageButton":"Beeldknop","notSet":"<geen instelling>","id":"Id","name":"Naam","langDir":"Skryfrigting","langDirLtr":"Links na regs (LTR)","langDirRtl":"Regs na links (RTL)","langCode":"Taalkode","longDescr":"Lang beskrywing URL","cssClass":"CSS klasse","advisoryTitle":"Aanbevole titel","cssStyle":"Styl","ok":"OK","cancel":"Kanselleer","close":"Sluit","preview":"Voorbeeld","resize":"Skalierung","generalTab":"Algemeen","advancedTab":"Gevorderd","validateNumberFailed":"Hierdie waarde is nie 'n nommer nie.","confirmNewPage":"Alle wysiginge sal verlore gaan. Is jy seker dat jy 'n nuwe bladsy wil laai?","confirmCancel":"Sommige opsies is gewysig. Is jy seker dat jy hierdie dialoogvenster wil sluit?","options":"Opsies","target":"Teiken","targetNew":"Nuwe venster (_blank)","targetTop":"Boonste venster (_top)","targetSelf":"Selfde venster (_self)","targetParent":"Oorspronklike venster (_parent)","langDirLTR":"Links na Regs (LTR)","langDirRTL":"Regs na Links (RTL)","styles":"Styl","cssClasses":"CSS klasse","width":"Breedte","height":"Hoogte","align":"Orienteerung","alignLeft":"Links","alignRight":"Regs","alignCenter":"Middel","alignJustify":"Eweredig","alignTop":"Bo","alignMiddle":"Middel","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde","invalidHeight":"Hoogte moet 'n getal wees","invalidWidth":"Breedte moet 'n getal wees.","invalidCssLength":"Die waarde vir die \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","invalidHtmlLength":"Die waarde vir die  \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige HTML eenheid (px of %).","invalidInlineStyle":"Ongeldige CSS. Formaat is een of meer sleutel-wert paare, \"naam : wert\" met kommapunte gesky.","cssLengthTooltip":"Voeg 'n getal wert in pixel in, of 'n waarde met geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, nie beskikbaar nie</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"Einde","36":"Tuis","46":"Verwyder","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/ar.js b/web/core/assets/vendor/ckeditor/lang/ar.js
index 0c224e410..1b54497d8 100644
--- a/web/core/assets/vendor/ckeditor/lang/ar.js
+++ b/web/core/assets/vendor/ckeditor/lang/ar.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ar']={"widget":{"move":"إضغط و إسحب للتحريك","label":"%1 widget"},"undo":{"redo":"إعادة","undo":"تراجع"},"toolbar":{"toolbarCollapse":"تقليص شريط الأدوت","toolbarExpand":"تمديد شريط الأدوات","toolbarGroups":{"document":"مستند","clipboard":"الحافظة/الرجوع","editing":"تحرير","forms":"نماذج","basicstyles":"نمط بسيط","paragraph":"فقرة","links":"روابط","insert":"إدراج","styles":"أنماط","colors":"ألوان","tools":"أدوات"},"toolbars":"أشرطة أدوات المحرر"},"table":{"border":"الحدود","caption":"الوصف","cell":{"menu":"خلية","insertBefore":"إدراج خلية قبل","insertAfter":"إدراج خلية بعد","deleteCell":"حذف خلية","merge":"دمج خلايا","mergeRight":"دمج لليمين","mergeDown":"دمج للأسفل","splitHorizontal":"تقسيم الخلية أفقياً","splitVertical":"تقسيم الخلية عمودياً","title":"خصائص الخلية","cellType":"نوع الخلية","rowSpan":"امتداد الصفوف","colSpan":"امتداد الأعمدة","wordWrap":"التفاف النص","hAlign":"محاذاة أفقية","vAlign":"محاذاة رأسية","alignBaseline":"خط القاعدة","bgColor":"لون الخلفية","borderColor":"لون الحدود","data":"بيانات","header":"عنوان","yes":"نعم","no":"لا","invalidWidth":"عرض الخلية يجب أن يكون عدداً.","invalidHeight":"ارتفاع الخلية يجب أن يكون عدداً.","invalidRowSpan":"امتداد الصفوف يجب أن يكون عدداً صحيحاً.","invalidColSpan":"امتداد الأعمدة يجب أن يكون عدداً صحيحاً.","chooseColor":"اختر"},"cellPad":"المسافة البادئة","cellSpace":"تباعد الخلايا","column":{"menu":"عمود","insertBefore":"إدراج عمود قبل","insertAfter":"إدراج عمود بعد","deleteColumn":"حذف أعمدة"},"columns":"أعمدة","deleteTable":"حذف الجدول","headers":"العناوين","headersBoth":"كلاهما","headersColumn":"العمود الأول","headersNone":"بدون","headersRow":"الصف الأول","invalidBorder":"حجم الحد يجب أن يكون عدداً.","invalidCellPadding":"المسافة البادئة يجب أن تكون عدداً","invalidCellSpacing":"المسافة بين الخلايا يجب أن تكون عدداً.","invalidCols":"عدد الأعمدة يجب أن يكون عدداً أكبر من صفر.","invalidHeight":"ارتفاع الجدول يجب أن يكون عدداً.","invalidRows":"عدد الصفوف يجب أن يكون عدداً أكبر من صفر.","invalidWidth":"عرض الجدول يجب أن يكون عدداً.","menu":"خصائص الجدول","row":{"menu":"صف","insertBefore":"إدراج صف قبل","insertAfter":"إدراج صف بعد","deleteRow":"حذف صفوف"},"rows":"صفوف","summary":"الخلاصة","title":"خصائص الجدول","toolbar":"جدول","widthPc":"بالمئة","widthPx":"بكسل","widthUnit":"وحدة العرض"},"stylescombo":{"label":"أنماط","panelTitle":"أنماط التنسيق","panelTitle1":"أنماط الفقرة","panelTitle2":"أنماط مضمنة","panelTitle3":"أنماط الكائن"},"specialchar":{"options":"خيارات الأحرف الخاصة","title":"اختر حرف خاص","toolbar":"إدراج  حرف خاص"},"sourcedialog":{"toolbar":"المصدر","title":"المصدر"},"sourcearea":{"toolbar":"المصدر"},"showblocks":{"toolbar":"مخطط تفصيلي"},"removeformat":{"toolbar":"إزالة التنسيقات"},"pastetext":{"button":"لصق كنص بسيط","title":"لصق كنص بسيط"},"pastefromword":{"confirmCleanup":"يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظيفه قبل الشروع في عملية اللصق؟","error":"لم يتم مسح المعلومات الملصقة لخلل داخلي","title":"لصق من وورد","toolbar":"لصق من وورد"},"maximize":{"maximize":"تكبير","minimize":"تصغير"},"magicline":{"title":"إدراج فقرة هنا"},"list":{"bulletedlist":"ادخال/حذف تعداد نقطي","numberedlist":"ادخال/حذف تعداد رقمي"},"language":{"button":"حدد اللغة","remove":"حذف اللغة"},"justify":{"block":"ضبط","center":"توسيط","left":"محاذاة إلى اليسار","right":"محاذاة إلى اليمين"},"indent":{"indent":"زيادة المسافة البادئة","outdent":"إنقاص المسافة البادئة"},"image2":{"alt":"عنوان الصورة","btnUpload":"أرسلها للخادم","captioned":"صورة ذات اسم","captionPlaceholder":"تسمية","infoTab":"معلومات الصورة","lockRatio":"تناسق الحجم","menu":"خصائص الصورة","pathName":"صورة","pathNameCaption":"تسمية","resetSize":"إستعادة الحجم الأصلي","resizer":"انقر ثم اسحب للتحجيم","title":"خصائص الصورة","uploadTab":"رفع","urlMissing":"عنوان مصدر الصورة مفقود"},"horizontalrule":{"toolbar":"خط فاصل"},"format":{"label":"تنسيق","panelTitle":"تنسيق الفقرة","tag_address":"عنوان","tag_div":"عادي (DIV)","tag_h1":"العنوان 1","tag_h2":"العنوان  2","tag_h3":"العنوان  3","tag_h4":"العنوان  4","tag_h5":"العنوان  5","tag_h6":"العنوان  6","tag_p":"عادي","tag_pre":"منسّق"},"elementspath":{"eleLabel":"مسار العنصر","eleTitle":"عنصر 1%"},"contextmenu":{"options":"خصائص قائمة السياق"},"clipboard":{"copy":"نسخ","copyError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع عمليات النسخ التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+C).","cut":"قص","cutError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع القص التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+X).","paste":"لصق","pasteArea":"منطقة اللصق","pasteMsg":"الصق داخل الصندوق بإستخدام زرائر (<STRONG>Ctrl/Cmd+V</STRONG>) في لوحة المفاتيح، ثم اضغط زر  <STRONG>موافق</STRONG>.","securityMsg":"نظراً لإعدادات الأمان الخاصة بمتصفحك، لن يتمكن هذا المحرر من الوصول لمحتوى حافظتك، لذلك يجب عليك لصق المحتوى مرة أخرى في هذه النافذة.","title":"لصق"},"button":{"selectedLabel":"%1 (محدد)"},"blockquote":{"toolbar":"اقتباس"},"basicstyles":{"bold":"عريض","italic":"مائل","strike":"يتوسطه خط","subscript":"منخفض","superscript":"مرتفع","underline":"تسطير"},"about":{"copy":"حقوق النشر &copy; $1. جميع الحقوق محفوظة.","dlgTitle":"عن CKEditor","help":"راجع $1 من أجل المساعدة","moreInfo":"للحصول على معلومات الترخيص ، يرجى زيارة موقعنا:","title":"عن CKEditor","userGuide":"دليل مستخدم CKEditor."},"editor":"محرر النص الغني","editorPanel":"لائحة محرر النص المنسق","common":{"editorHelp":"إضغط على ALT + 0 للحصول على المساعدة.","browseServer":"تصفح","url":"الرابط","protocol":"البروتوكول","upload":"رفع","uploadSubmit":"أرسل","image":"صورة","flash":"فلاش","form":"نموذج","checkbox":"خانة إختيار","radio":"زر اختيار","textField":"مربع نص","textarea":"مساحة نصية","hiddenField":"إدراج حقل خفي","button":"زر ضغط","select":"اختار","imageButton":"زر صورة","notSet":"<بدون تحديد>","id":"الرقم","name":"إسم","langDir":"إتجاه النص","langDirLtr":"اليسار لليمين (LTR)","langDirRtl":"اليمين لليسار (RTL)","langCode":"رمز اللغة","longDescr":"الوصف التفصيلى","cssClass":"فئات التنسيق","advisoryTitle":"عنوان التقرير","cssStyle":"نمط","ok":"موافق","cancel":"إلغاء الأمر","close":"أغلق","preview":"استعراض","resize":"تغيير الحجم","generalTab":"عام","advancedTab":"متقدم","validateNumberFailed":"لايوجد نتيجة","confirmNewPage":"ستفقد أي متغييرات اذا لم تقم بحفظها اولا. هل أنت متأكد أنك تريد صفحة جديدة؟","confirmCancel":"بعض الخيارات قد تغيرت. هل أنت متأكد من إغلاق مربع النص؟","options":"خيارات","target":"هدف الرابط","targetNew":"نافذة جديدة","targetTop":"النافذة الأعلى","targetSelf":"داخل النافذة","targetParent":"النافذة الأم","langDirLTR":"اليسار لليمين (LTR)","langDirRTL":"اليمين لليسار (RTL)","styles":"نمط","cssClasses":"فئات التنسيق","width":"العرض","height":"الإرتفاع","align":"محاذاة","alignLeft":"يسار","alignRight":"يمين","alignCenter":"وسط","alignJustify":"ضبط","alignTop":"أعلى","alignMiddle":"وسط","alignBottom":"أسفل","alignNone":"None","invalidValue":"قيمة غير مفبولة.","invalidHeight":"الارتفاع يجب أن يكون عدداً.","invalidWidth":"العرض يجب أن يكون عدداً.","invalidCssLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة CSS قياس مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة HTML قياس مقبولة (px or %).","invalidInlineStyle":"قيمة الخانة المخصصة لـ  Inline Style يجب أن تختوي على مجموع واحد أو أكثر بالشكل التالي: \"name : value\", مفصولة بفاصلة منقزطة.","cssLengthTooltip":"أدخل رقما للقيمة بالبكسل أو رقما بوحدة CSS مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, غير متاح</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ar']={"widget":{"move":"إضغط و إسحب للتحريك","label":"%1 widget"},"undo":{"redo":"إعادة","undo":"تراجع"},"toolbar":{"toolbarCollapse":"تقليص شريط الأدوت","toolbarExpand":"تمديد شريط الأدوات","toolbarGroups":{"document":"مستند","clipboard":"الحافظة/الرجوع","editing":"تحرير","forms":"نماذج","basicstyles":"نمط بسيط","paragraph":"فقرة","links":"روابط","insert":"إدراج","styles":"أنماط","colors":"ألوان","tools":"أدوات"},"toolbars":"أشرطة أدوات المحرر"},"table":{"border":"الحدود","caption":"الوصف","cell":{"menu":"خلية","insertBefore":"إدراج خلية قبل","insertAfter":"إدراج خلية بعد","deleteCell":"حذف خلية","merge":"دمج خلايا","mergeRight":"دمج لليمين","mergeDown":"دمج للأسفل","splitHorizontal":"تقسيم الخلية أفقياً","splitVertical":"تقسيم الخلية عمودياً","title":"خصائص الخلية","cellType":"نوع الخلية","rowSpan":"امتداد الصفوف","colSpan":"امتداد الأعمدة","wordWrap":"التفاف النص","hAlign":"محاذاة أفقية","vAlign":"محاذاة رأسية","alignBaseline":"خط القاعدة","bgColor":"لون الخلفية","borderColor":"لون الحدود","data":"بيانات","header":"عنوان","yes":"نعم","no":"لا","invalidWidth":"عرض الخلية يجب أن يكون عدداً.","invalidHeight":"ارتفاع الخلية يجب أن يكون عدداً.","invalidRowSpan":"امتداد الصفوف يجب أن يكون عدداً صحيحاً.","invalidColSpan":"امتداد الأعمدة يجب أن يكون عدداً صحيحاً.","chooseColor":"اختر"},"cellPad":"المسافة البادئة","cellSpace":"تباعد الخلايا","column":{"menu":"عمود","insertBefore":"إدراج عمود قبل","insertAfter":"إدراج عمود بعد","deleteColumn":"حذف أعمدة"},"columns":"أعمدة","deleteTable":"حذف الجدول","headers":"العناوين","headersBoth":"كلاهما","headersColumn":"العمود الأول","headersNone":"بدون","headersRow":"الصف الأول","invalidBorder":"حجم الحد يجب أن يكون عدداً.","invalidCellPadding":"المسافة البادئة يجب أن تكون عدداً","invalidCellSpacing":"المسافة بين الخلايا يجب أن تكون عدداً.","invalidCols":"عدد الأعمدة يجب أن يكون عدداً أكبر من صفر.","invalidHeight":"ارتفاع الجدول يجب أن يكون عدداً.","invalidRows":"عدد الصفوف يجب أن يكون عدداً أكبر من صفر.","invalidWidth":"عرض الجدول يجب أن يكون عدداً.","menu":"خصائص الجدول","row":{"menu":"صف","insertBefore":"إدراج صف قبل","insertAfter":"إدراج صف بعد","deleteRow":"حذف صفوف"},"rows":"صفوف","summary":"الخلاصة","title":"خصائص الجدول","toolbar":"جدول","widthPc":"بالمئة","widthPx":"بكسل","widthUnit":"وحدة العرض"},"stylescombo":{"label":"أنماط","panelTitle":"أنماط التنسيق","panelTitle1":"أنماط الفقرة","panelTitle2":"أنماط مضمنة","panelTitle3":"أنماط الكائن"},"specialchar":{"options":"خيارات الأحرف الخاصة","title":"اختر حرف خاص","toolbar":"إدراج  حرف خاص"},"sourcedialog":{"toolbar":"المصدر","title":"المصدر"},"sourcearea":{"toolbar":"المصدر"},"showblocks":{"toolbar":"مخطط تفصيلي"},"removeformat":{"toolbar":"إزالة التنسيقات"},"pastetext":{"button":"لصق كنص بسيط","title":"لصق كنص بسيط"},"pastefromword":{"confirmCleanup":"يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظيفه قبل الشروع في عملية اللصق؟","error":"لم يتم مسح المعلومات الملصقة لخلل داخلي","title":"لصق من وورد","toolbar":"لصق من وورد"},"maximize":{"maximize":"تكبير","minimize":"تصغير"},"magicline":{"title":"إدراج فقرة هنا"},"list":{"bulletedlist":"ادخال/حذف تعداد نقطي","numberedlist":"ادخال/حذف تعداد رقمي"},"language":{"button":"حدد اللغة","remove":"حذف اللغة"},"justify":{"block":"ضبط","center":"توسيط","left":"محاذاة إلى اليسار","right":"محاذاة إلى اليمين"},"indent":{"indent":"زيادة المسافة البادئة","outdent":"إنقاص المسافة البادئة"},"image2":{"alt":"عنوان الصورة","btnUpload":"أرسلها للخادم","captioned":"صورة ذات اسم","captionPlaceholder":"تسمية","infoTab":"معلومات الصورة","lockRatio":"تناسق الحجم","menu":"خصائص الصورة","pathName":"صورة","pathNameCaption":"تسمية","resetSize":"إستعادة الحجم الأصلي","resizer":"انقر ثم اسحب للتحجيم","title":"خصائص الصورة","uploadTab":"رفع","urlMissing":"عنوان مصدر الصورة مفقود","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"خط فاصل"},"format":{"label":"تنسيق","panelTitle":"تنسيق الفقرة","tag_address":"عنوان","tag_div":"عادي (DIV)","tag_h1":"العنوان 1","tag_h2":"العنوان  2","tag_h3":"العنوان  3","tag_h4":"العنوان  4","tag_h5":"العنوان  5","tag_h6":"العنوان  6","tag_p":"عادي","tag_pre":"منسّق"},"elementspath":{"eleLabel":"مسار العنصر","eleTitle":"عنصر 1%"},"contextmenu":{"options":"خصائص قائمة السياق"},"clipboard":{"copy":"نسخ","copyError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع عمليات النسخ التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+C).","cut":"قص","cutError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع القص التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+X).","paste":"لصق","pasteArea":"منطقة اللصق","pasteMsg":"الصق داخل الصندوق بإستخدام زرائر (<STRONG>Ctrl/Cmd+V</STRONG>) في لوحة المفاتيح، ثم اضغط زر  <STRONG>موافق</STRONG>.","securityMsg":"نظراً لإعدادات الأمان الخاصة بمتصفحك، لن يتمكن هذا المحرر من الوصول لمحتوى حافظتك، لذلك يجب عليك لصق المحتوى مرة أخرى في هذه النافذة.","title":"لصق"},"button":{"selectedLabel":"%1 (محدد)"},"blockquote":{"toolbar":"اقتباس"},"basicstyles":{"bold":"عريض","italic":"مائل","strike":"يتوسطه خط","subscript":"منخفض","superscript":"مرتفع","underline":"تسطير"},"about":{"copy":"حقوق النشر &copy; $1. جميع الحقوق محفوظة.","dlgTitle":"عن CKEditor","help":"راجع $1 من أجل المساعدة","moreInfo":"للحصول على معلومات الترخيص ، يرجى زيارة موقعنا:","title":"عن CKEditor","userGuide":"دليل مستخدم CKEditor."},"editor":"محرر النص الغني","editorPanel":"لائحة محرر النص المنسق","common":{"editorHelp":"إضغط على ALT + 0 للحصول على المساعدة.","browseServer":"تصفح","url":"الرابط","protocol":"البروتوكول","upload":"رفع","uploadSubmit":"أرسل","image":"صورة","flash":"فلاش","form":"نموذج","checkbox":"خانة إختيار","radio":"زر اختيار","textField":"مربع نص","textarea":"مساحة نصية","hiddenField":"إدراج حقل خفي","button":"زر ضغط","select":"اختار","imageButton":"زر صورة","notSet":"<بدون تحديد>","id":"الرقم","name":"إسم","langDir":"إتجاه النص","langDirLtr":"اليسار لليمين (LTR)","langDirRtl":"اليمين لليسار (RTL)","langCode":"رمز اللغة","longDescr":"الوصف التفصيلى","cssClass":"فئات التنسيق","advisoryTitle":"عنوان التقرير","cssStyle":"نمط","ok":"موافق","cancel":"إلغاء الأمر","close":"أغلق","preview":"استعراض","resize":"تغيير الحجم","generalTab":"عام","advancedTab":"متقدم","validateNumberFailed":"لايوجد نتيجة","confirmNewPage":"ستفقد أي متغييرات اذا لم تقم بحفظها اولا. هل أنت متأكد أنك تريد صفحة جديدة؟","confirmCancel":"بعض الخيارات قد تغيرت. هل أنت متأكد من إغلاق مربع النص؟","options":"خيارات","target":"هدف الرابط","targetNew":"نافذة جديدة","targetTop":"النافذة الأعلى","targetSelf":"داخل النافذة","targetParent":"النافذة الأم","langDirLTR":"اليسار لليمين (LTR)","langDirRTL":"اليمين لليسار (RTL)","styles":"نمط","cssClasses":"فئات التنسيق","width":"العرض","height":"الإرتفاع","align":"محاذاة","alignLeft":"يسار","alignRight":"يمين","alignCenter":"وسط","alignJustify":"ضبط","alignTop":"أعلى","alignMiddle":"وسط","alignBottom":"أسفل","alignNone":"None","invalidValue":"قيمة غير مفبولة.","invalidHeight":"الارتفاع يجب أن يكون عدداً.","invalidWidth":"العرض يجب أن يكون عدداً.","invalidCssLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة CSS قياس مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة HTML قياس مقبولة (px or %).","invalidInlineStyle":"قيمة الخانة المخصصة لـ  Inline Style يجب أن تختوي على مجموع واحد أو أكثر بالشكل التالي: \"name : value\", مفصولة بفاصلة منقزطة.","cssLengthTooltip":"أدخل رقما للقيمة بالبكسل أو رقما بوحدة CSS مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, غير متاح</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/bg.js b/web/core/assets/vendor/ckeditor/lang/bg.js
index f958c6ebf..4e4b48e76 100644
--- a/web/core/assets/vendor/ckeditor/lang/bg.js
+++ b/web/core/assets/vendor/ckeditor/lang/bg.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['bg']={"widget":{"move":"Кликни и влачи, за да преместиш","label":"%1 widget"},"undo":{"redo":"Връщане на предишен статус","undo":"Възтанови"},"toolbar":{"toolbarCollapse":"Свиване на лентата с инструменти","toolbarExpand":"Разширяване на лентата с инструменти","toolbarGroups":{"document":"Документ","clipboard":"Клипборд/Отмяна","editing":"Промяна","forms":"Форми","basicstyles":"Базови стилове","paragraph":"Параграф","links":"Връзки","insert":"Вмъкване","styles":"Стилове","colors":"Цветове","tools":"Инструменти"},"toolbars":"Ленти с инструменти"},"table":{"border":"Размер на рамката","caption":"Заглавие","cell":{"menu":"Клетка","insertBefore":"Вмъкване на клетка преди","insertAfter":"Вмъкване на клетка след","deleteCell":"Изтриване на клетки","merge":"Сливане на клетки","mergeRight":"Сливане в дясно","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Настройки на клетката","cellType":"Тип на клетката","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Авто. пренос","hAlign":"Хоризонтално подравняване","vAlign":"Вертикално подравняване","alignBaseline":"Базова линия","bgColor":"Фон","borderColor":"Цвят на рамката","data":"Данни","header":"Хедър","yes":"Да","no":"Не","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Изберете"},"cellPad":"Отделяне на клетките","cellSpace":"Разтояние между клетките","column":{"menu":"Колона","insertBefore":"Вмъкване на колона преди","insertAfter":"Вмъкване на колона след","deleteColumn":"Изтриване на колони"},"columns":"Колони","deleteTable":"Изтриване на таблица","headers":"Хедъри","headersBoth":"Заедно","headersColumn":"Първа колона","headersNone":"Няма","headersRow":"Първи ред","invalidBorder":"Размерът на рамката трябва да е число.","invalidCellPadding":"Отстоянието на клетките трябва да е позитивно число.","invalidCellSpacing":"Интервала в клетките трябва да е позитивно число.","invalidCols":"Броят колони трябва да е по-голям от 0.","invalidHeight":"Височината на таблицата трябва да е число.","invalidRows":"Броят редове трябва да е по-голям от 0.","invalidWidth":"Ширината на таблицата трябва да е число.","menu":"Настройки на таблицата","row":{"menu":"Ред","insertBefore":"Вмъкване на ред преди","insertAfter":"Вмъкване на ред след","deleteRow":"Изтриване на редове"},"rows":"Редове","summary":"Обща информация","title":"Настройки на таблицата","toolbar":"Таблица","widthPc":"процент","widthPx":"пиксела","widthUnit":"единица за ширина"},"stylescombo":{"label":"Стилове","panelTitle":"Стилове за форматиране","panelTitle1":"Блокови стилове","panelTitle2":"Вътрешни стилове","panelTitle3":"Обектни стилове"},"specialchar":{"options":"Опции за специален знак","title":"Избор на специален знак","toolbar":"Вмъкване на специален знак"},"sourcedialog":{"toolbar":"Източник","title":"Източник"},"sourcearea":{"toolbar":"Изходен код"},"showblocks":{"toolbar":"Показва блокове"},"removeformat":{"toolbar":"Премахване на форматирането"},"pastetext":{"button":"Вмъкни като чист текст","title":"Вмъкни като чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Вмъкни от MS Word","toolbar":"Вмъкни от MS Word"},"maximize":{"maximize":"Максимизиране","minimize":"Минимизиране"},"magicline":{"title":"Вмъкнете параграф тук"},"list":{"bulletedlist":"Вмъкване/Премахване на точков списък","numberedlist":"Вмъкване/Премахване на номериран списък"},"language":{"button":"Задай език","remove":"Премахни език"},"justify":{"block":"Двустранно подравняване","center":"Център","left":"Подравни в ляво","right":"Подравни в дясно"},"indent":{"indent":"Увеличаване на отстъпа","outdent":"Намаляване на отстъпа"},"image2":{"alt":"Алтернативен текст","btnUpload":"Изпрати я на сървъра","captioned":"Надписано изображение","captionPlaceholder":"Надпис","infoTab":"Детайли за изображението","lockRatio":"Заключване на съотношението","menu":"Настройки на изображението","pathName":"изображение","pathNameCaption":"надпис","resetSize":"Нулиране на размер","resizer":"Кликни и влачи, за да преоразмериш","title":"Настройки на изображението","uploadTab":"Качване","urlMissing":"URL адреса на изображението липсва."},"horizontalrule":{"toolbar":"Вмъкване на хоризонтална линия"},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Адрес","tag_div":"Параграф (DIV)","tag_h1":"Заглавие 1","tag_h2":"Заглавие 2","tag_h3":"Заглавие 3","tag_h4":"Заглавие 4","tag_h5":"Заглавие 5","tag_h6":"Заглавие 6","tag_p":"Нормален","tag_pre":"Форматиран"},"elementspath":{"eleLabel":"Път за елементите","eleTitle":"%1 елемент"},"contextmenu":{"options":"Опции на контекстното меню"},"clipboard":{"copy":"Копирай","copyError":"Настройките за сигурност на вашия бразуър не разрешават на редактора да изпълни запаметяването. За целта използвайте клавиатурата (Ctrl/Cmd+C).","cut":"Отрежи","cutError":"Настройките за сигурност на Вашия браузър не позволяват на редактора автоматично да изъплни действията за отрязване. Моля ползвайте клавиатурните команди за целта (ctrl+x).","paste":"Вмъкни","pasteArea":"Зона за вмъкване","pasteMsg":"Вмъкнете тук съдъжанието с клавиатуарата (<STRONG>Ctrl/Cmd+V</STRONG>) и натиснете <STRONG>OK</STRONG>.","securityMsg":"Заради настройките за сигурност на Вашия браузър, редакторът не може да прочете данните от клипборда коректно.","title":"Вмъкни"},"button":{"selectedLabel":"%1 (Избрано)"},"blockquote":{"toolbar":"Блок за цитат"},"basicstyles":{"bold":"Удебелен","italic":"Наклонен","strike":"Зачертан текст","subscript":"Индексиран текст","superscript":"Суперскрипт","underline":"Подчертан"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Относно CKEditor","help":"Проверете $1 за помощ.","moreInfo":"За лицензионна информация моля посетете сайта ни:","title":"Относно CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Текстов редактор за форматиран текст","editorPanel":"Панел на текстовия редактор","common":{"editorHelp":"натиснете ALT 0 за помощ","browseServer":"Избор от сървъра","url":"URL","protocol":"Протокол","upload":"Качване","uploadSubmit":"Изпращане към сървъра","image":"Снимка","flash":"Флаш","form":"Форма","checkbox":"Поле за избор","radio":"Радио бутон","textField":"Текстово поле","textarea":"Текстова зона","hiddenField":"Скрито поле","button":"Бутон","select":"Поле за избор","imageButton":"Бутон за снимка","notSet":"<не е избрано>","id":"ID","name":"Име","langDir":"Посока на езика","langDirLtr":"Ляво на дясно (ЛнД)","langDirRtl":"Дясно на ляво (ДнЛ)","langCode":"Код на езика","longDescr":"Уеб адрес за дълго описание","cssClass":"Класове за CSS","advisoryTitle":"Препоръчително заглавие","cssStyle":"Стил","ok":"ОК","cancel":"Отказ","close":"Затвори","preview":"Преглед","resize":"Влачете за да оразмерите","generalTab":"Общи","advancedTab":"Разширено","validateNumberFailed":"Тази стойност не е число","confirmNewPage":"Всички незапазени промени ще бъдат изгубени. Сигурни ли сте, че желаете да заредите нова страница?","confirmCancel":"Някои от опциите са променени. Сигурни ли сте, че желаете да затворите прозореца?","options":"Опции","target":"Цел","targetNew":"Нов прозорец (_blank)","targetTop":"Горна позиция (_top)","targetSelf":"Текущия прозорец (_self)","targetParent":"Основен прозорец (_parent)","langDirLTR":"Ляво на дясно (ЛнД)","langDirRTL":"Дясно на ляво (ДнЛ)","styles":"Стил","cssClasses":"Класове за CSS","width":"Ширина","height":"Височина","align":"Подравняване","alignLeft":"Ляво","alignRight":"Дясно","alignCenter":"Център","alignJustify":"Двустранно подравняване","alignTop":"Горе","alignMiddle":"По средата","alignBottom":"Долу","alignNone":"Без подравняване","invalidValue":"Невалидна стойност.","invalidHeight":"Височината трябва да е число.","invalidWidth":"Ширина требе да е число.","invalidCssLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна CSS измервателна единица (px, %, in, cm, mm, em, ex, pt, или pc).","invalidHtmlLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна HTML измервателна единица (px или %).","invalidInlineStyle":"Стойността на стилa трябва да съдържат една или повече двойки във формат \"name : value\", разделени с двоеточие.","cssLengthTooltip":"Въведете числена стойност в пиксели или друга валидна CSS единица (px, %, in, cm, mm, em, ex, pt, или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недостъпно</span>"}};
\ No newline at end of file
+CKEDITOR.lang['bg']={"widget":{"move":"Кликни и влачи, за да преместиш","label":"%1 widget"},"undo":{"redo":"Връщане на предишен статус","undo":"Възтанови"},"toolbar":{"toolbarCollapse":"Свиване на лентата с инструменти","toolbarExpand":"Разширяване на лентата с инструменти","toolbarGroups":{"document":"Документ","clipboard":"Клипборд/Отмяна","editing":"Промяна","forms":"Форми","basicstyles":"Базови стилове","paragraph":"Параграф","links":"Връзки","insert":"Вмъкване","styles":"Стилове","colors":"Цветове","tools":"Инструменти"},"toolbars":"Ленти с инструменти"},"table":{"border":"Размер на рамката","caption":"Заглавие","cell":{"menu":"Клетка","insertBefore":"Вмъкване на клетка преди","insertAfter":"Вмъкване на клетка след","deleteCell":"Изтриване на клетки","merge":"Сливане на клетки","mergeRight":"Сливане в дясно","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Настройки на клетката","cellType":"Тип на клетката","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Авто. пренос","hAlign":"Хоризонтално подравняване","vAlign":"Вертикално подравняване","alignBaseline":"Базова линия","bgColor":"Фон","borderColor":"Цвят на рамката","data":"Данни","header":"Хедър","yes":"Да","no":"Не","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Изберете"},"cellPad":"Отделяне на клетките","cellSpace":"Разтояние между клетките","column":{"menu":"Колона","insertBefore":"Вмъкване на колона преди","insertAfter":"Вмъкване на колона след","deleteColumn":"Изтриване на колони"},"columns":"Колони","deleteTable":"Изтриване на таблица","headers":"Хедъри","headersBoth":"Заедно","headersColumn":"Първа колона","headersNone":"Няма","headersRow":"Първи ред","invalidBorder":"Размерът на рамката трябва да е число.","invalidCellPadding":"Отстоянието на клетките трябва да е позитивно число.","invalidCellSpacing":"Интервала в клетките трябва да е позитивно число.","invalidCols":"Броят колони трябва да е по-голям от 0.","invalidHeight":"Височината на таблицата трябва да е число.","invalidRows":"Броят редове трябва да е по-голям от 0.","invalidWidth":"Ширината на таблицата трябва да е число.","menu":"Настройки на таблицата","row":{"menu":"Ред","insertBefore":"Вмъкване на ред преди","insertAfter":"Вмъкване на ред след","deleteRow":"Изтриване на редове"},"rows":"Редове","summary":"Обща информация","title":"Настройки на таблицата","toolbar":"Таблица","widthPc":"процент","widthPx":"пиксела","widthUnit":"единица за ширина"},"stylescombo":{"label":"Стилове","panelTitle":"Стилове за форматиране","panelTitle1":"Блокови стилове","panelTitle2":"Вътрешни стилове","panelTitle3":"Обектни стилове"},"specialchar":{"options":"Опции за специален знак","title":"Избор на специален знак","toolbar":"Вмъкване на специален знак"},"sourcedialog":{"toolbar":"Източник","title":"Източник"},"sourcearea":{"toolbar":"Изходен код"},"showblocks":{"toolbar":"Показва блокове"},"removeformat":{"toolbar":"Премахване на форматирането"},"pastetext":{"button":"Вмъкни като чист текст","title":"Вмъкни като чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Вмъкни от MS Word","toolbar":"Вмъкни от MS Word"},"maximize":{"maximize":"Максимизиране","minimize":"Минимизиране"},"magicline":{"title":"Вмъкнете параграф тук"},"list":{"bulletedlist":"Вмъкване/Премахване на точков списък","numberedlist":"Вмъкване/Премахване на номериран списък"},"language":{"button":"Задай език","remove":"Премахни език"},"justify":{"block":"Двустранно подравняване","center":"Център","left":"Подравни в ляво","right":"Подравни в дясно"},"indent":{"indent":"Увеличаване на отстъпа","outdent":"Намаляване на отстъпа"},"image2":{"alt":"Алтернативен текст","btnUpload":"Изпрати я на сървъра","captioned":"Надписано изображение","captionPlaceholder":"Надпис","infoTab":"Детайли за изображението","lockRatio":"Заключване на съотношението","menu":"Настройки на изображението","pathName":"изображение","pathNameCaption":"надпис","resetSize":"Нулиране на размер","resizer":"Кликни и влачи, за да преоразмериш","title":"Настройки на изображението","uploadTab":"Качване","urlMissing":"URL адреса на изображението липсва.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Вмъкване на хоризонтална линия"},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Адрес","tag_div":"Параграф (DIV)","tag_h1":"Заглавие 1","tag_h2":"Заглавие 2","tag_h3":"Заглавие 3","tag_h4":"Заглавие 4","tag_h5":"Заглавие 5","tag_h6":"Заглавие 6","tag_p":"Нормален","tag_pre":"Форматиран"},"elementspath":{"eleLabel":"Път за елементите","eleTitle":"%1 елемент"},"contextmenu":{"options":"Опции на контекстното меню"},"clipboard":{"copy":"Копирай","copyError":"Настройките за сигурност на вашия бразуър не разрешават на редактора да изпълни запаметяването. За целта използвайте клавиатурата (Ctrl/Cmd+C).","cut":"Отрежи","cutError":"Настройките за сигурност на Вашия браузър не позволяват на редактора автоматично да изъплни действията за отрязване. Моля ползвайте клавиатурните команди за целта (ctrl+x).","paste":"Вмъкни","pasteArea":"Зона за вмъкване","pasteMsg":"Вмъкнете тук съдъжанието с клавиатуарата (<STRONG>Ctrl/Cmd+V</STRONG>) и натиснете <STRONG>OK</STRONG>.","securityMsg":"Заради настройките за сигурност на Вашия браузър, редакторът не може да прочете данните от клипборда коректно.","title":"Вмъкни"},"button":{"selectedLabel":"%1 (Избрано)"},"blockquote":{"toolbar":"Блок за цитат"},"basicstyles":{"bold":"Удебелен","italic":"Наклонен","strike":"Зачертан текст","subscript":"Индексиран текст","superscript":"Суперскрипт","underline":"Подчертан"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Относно CKEditor","help":"Проверете $1 за помощ.","moreInfo":"За лицензионна информация моля посетете сайта ни:","title":"Относно CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Текстов редактор за форматиран текст","editorPanel":"Панел на текстовия редактор","common":{"editorHelp":"натиснете ALT 0 за помощ","browseServer":"Избор от сървъра","url":"URL","protocol":"Протокол","upload":"Качване","uploadSubmit":"Изпращане към сървъра","image":"Снимка","flash":"Флаш","form":"Форма","checkbox":"Поле за избор","radio":"Радио бутон","textField":"Текстово поле","textarea":"Текстова зона","hiddenField":"Скрито поле","button":"Бутон","select":"Поле за избор","imageButton":"Бутон за снимка","notSet":"<не е избрано>","id":"ID","name":"Име","langDir":"Посока на езика","langDirLtr":"Ляво на дясно (ЛнД)","langDirRtl":"Дясно на ляво (ДнЛ)","langCode":"Код на езика","longDescr":"Уеб адрес за дълго описание","cssClass":"Класове за CSS","advisoryTitle":"Препоръчително заглавие","cssStyle":"Стил","ok":"ОК","cancel":"Отказ","close":"Затвори","preview":"Преглед","resize":"Влачете за да оразмерите","generalTab":"Общи","advancedTab":"Разширено","validateNumberFailed":"Тази стойност не е число","confirmNewPage":"Всички незапазени промени ще бъдат изгубени. Сигурни ли сте, че желаете да заредите нова страница?","confirmCancel":"Някои от опциите са променени. Сигурни ли сте, че желаете да затворите прозореца?","options":"Опции","target":"Цел","targetNew":"Нов прозорец (_blank)","targetTop":"Горна позиция (_top)","targetSelf":"Текущия прозорец (_self)","targetParent":"Основен прозорец (_parent)","langDirLTR":"Ляво на дясно (ЛнД)","langDirRTL":"Дясно на ляво (ДнЛ)","styles":"Стил","cssClasses":"Класове за CSS","width":"Ширина","height":"Височина","align":"Подравняване","alignLeft":"Ляво","alignRight":"Дясно","alignCenter":"Център","alignJustify":"Двустранно подравняване","alignTop":"Горе","alignMiddle":"По средата","alignBottom":"Долу","alignNone":"Без подравняване","invalidValue":"Невалидна стойност.","invalidHeight":"Височината трябва да е число.","invalidWidth":"Ширина требе да е число.","invalidCssLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна CSS измервателна единица (px, %, in, cm, mm, em, ex, pt, или pc).","invalidHtmlLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна HTML измервателна единица (px или %).","invalidInlineStyle":"Стойността на стилa трябва да съдържат една или повече двойки във формат \"name : value\", разделени с двоеточие.","cssLengthTooltip":"Въведете числена стойност в пиксели или друга валидна CSS единица (px, %, in, cm, mm, em, ex, pt, или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недостъпно</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/bn.js b/web/core/assets/vendor/ckeditor/lang/bn.js
index 7b3632041..1d6d790f7 100644
--- a/web/core/assets/vendor/ckeditor/lang/bn.js
+++ b/web/core/assets/vendor/ckeditor/lang/bn.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['bn']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"পুনরায়  করি","undo":"আনডু"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"বর্ডারের সাইজ","caption":"শীর্ষক","cell":{"menu":"সেল","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"সেল মুছে দাও","merge":"সেল জোড়া দাও","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"পৃষ্ঠতলের রং","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"সেল প্যাডিং","cellSpace":"সেল স্পেস","column":{"menu":"কলাম","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"কলাম মুছে দাও"},"columns":"কলাম","deleteTable":"টেবিল ডিলীট কর","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"টেবিল প্রোপার্টি","row":{"menu":"রো","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"রো মুছে দাও"},"rows":"রো","summary":"সারাংশ","title":"টেবিল প্রোপার্টি","toolbar":"টেবিলের লেবেল যুক্ত কর","widthPc":"শতকরা","widthPx":"পিক্সেল","widthUnit":"width unit"},"stylescombo":{"label":"ধরন","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"বিশেষ ক্যারেক্টার বাছাই কর","toolbar":"বিশেষ অক্ষর যুক্ত কর"},"sourcedialog":{"toolbar":"উৎস","title":"সোর্স"},"sourcearea":{"toolbar":"উৎস"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"ধরন-প্রকৃতি অপসারণ করি"},"pastetext":{"button":"সাধারণ টেক্সট হিসেবে পেইস্ট করি","title":"সাদা টেক্সট হিসেবে পেস্ট কর"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"পেস্ট (শব্দ)","toolbar":"পেস্ট (শব্দ)"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"বুলেটেড তালিকা প্রবেশ/অপসারন করি","numberedlist":"সাংখ্যিক লিস্টের লেবেল"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"যাচাই করি","center":"মাঝ বরাবর ঘেষা","left":"বা দিকে ঘেঁষা","right":"ডান দিকে ঘেঁষা"},"indent":{"indent":"ইনডেন্ট বাড়াই","outdent":"ইনডেন্ট কমাও"},"image2":{"alt":"বিকল্প টেক্সট","btnUpload":"ইহাকে সার্ভারে প্রেরন কর","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ছবির তথ্য","lockRatio":"অনুপাত লক কর","menu":"ছবির প্রোপার্টি","pathName":"image","pathNameCaption":"caption","resetSize":"সাইজ পূর্বাবস্থায় ফিরিয়ে দাও","resizer":"Click and drag to resize","title":"ছবির প্রোপার্টি","uploadTab":"আপলোড","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"অনুভূমিক লাইন যোগ করি"},"format":{"label":"ধরন-প্রকৃতি","panelTitle":"ফন্ট ফরমেট","tag_address":"ঠিকানা","tag_div":"শীর্ষক (DIV)","tag_h1":"শীর্ষক ১","tag_h2":"শীর্ষক ২","tag_h3":"শীর্ষক ৩","tag_h4":"শীর্ষক ৪","tag_h5":"শীর্ষক ৫","tag_h6":"শীর্ষক ৬","tag_p":"সাধারণ","tag_pre":"ফর্মেটেড"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"কপি","copyError":"আপনার ব্রাউজারের নিরাপত্তা সেটিংসমূহ এডিটরকে স্বয়ংক্রিয়ভাবে কপি করার প্রক্রিয়া চালনা করার অনুমতি দেয় না। অনুগ্রহপূর্বক এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+C)।","cut":"কাট","cutError":"আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কাট করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+X)।","paste":"পেস্ট","pasteArea":"Paste Area","pasteMsg":"অনুগ্রহ করে নীচের বাক্সে কিবোর্ড ব্যবহার করে (<STRONG>Ctrl/Cmd+V</STRONG>) পেস্ট করুন এবং <STRONG>OK</STRONG> চাপ দিন","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"পেস্ট"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"বোল্ড","italic":"বাঁকা","strike":"স্ট্রাইক থ্রু","subscript":"অধোলেখ","superscript":"অভিলেখ","underline":"আন্ডারলাইন"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"ব্রাউজ সার্ভার","url":"URL","protocol":"প্রোটোকল","upload":"আপলোড","uploadSubmit":"ইহাকে সার্ভারে প্রেরন কর","image":"ছবির লেবেল যুক্ত কর","flash":"ফ্লাশ লেবেল যুক্ত কর","form":"ফর্ম","checkbox":"চেক বাক্স","radio":"রেডিও বাটন","textField":"টেক্সট ফীল্ড","textarea":"টেক্সট এরিয়া","hiddenField":"গুপ্ত ফীল্ড","button":"বাটন","select":"বাছাই ফীল্ড","imageButton":"ছবির বাটন","notSet":"<সেট নেই>","id":"আইডি","name":"নাম","langDir":"ভাষা লেখার দিক","langDirLtr":"বাম থেকে ডান (LTR)","langDirRtl":"ডান থেকে বাম (RTL)","langCode":"ভাষা কোড","longDescr":"URL এর লম্বা বর্ণনা","cssClass":"স্টাইল-শীট ক্লাস","advisoryTitle":"পরামর্শ শীর্ষক","cssStyle":"স্টাইল","ok":"ওকে","cancel":"বাতিল","close":"Close","preview":"প্রিভিউ","resize":"Resize","generalTab":"General","advancedTab":"এডভান্সড","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"টার্গেট","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","styles":"স্টাইল","cssClasses":"স্টাইল-শীট ক্লাস","width":"প্রস্থ","height":"দৈর্ঘ্য","align":"এলাইন","alignLeft":"বামে","alignRight":"ডানে","alignCenter":"মাঝখানে","alignJustify":"ব্লক জাস্টিফাই","alignTop":"উপর","alignMiddle":"মধ্য","alignBottom":"নীচে","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['bn']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"পুনরায়  করি","undo":"আনডু"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"বর্ডারের সাইজ","caption":"শীর্ষক","cell":{"menu":"সেল","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"সেল মুছে দাও","merge":"সেল জোড়া দাও","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"পৃষ্ঠতলের রং","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"সেল প্যাডিং","cellSpace":"সেল স্পেস","column":{"menu":"কলাম","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"কলাম মুছে দাও"},"columns":"কলাম","deleteTable":"টেবিল ডিলীট কর","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"টেবিল প্রোপার্টি","row":{"menu":"রো","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"রো মুছে দাও"},"rows":"রো","summary":"সারাংশ","title":"টেবিল প্রোপার্টি","toolbar":"টেবিলের লেবেল যুক্ত কর","widthPc":"শতকরা","widthPx":"পিক্সেল","widthUnit":"width unit"},"stylescombo":{"label":"ধরন","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"বিশেষ ক্যারেক্টার বাছাই কর","toolbar":"বিশেষ অক্ষর যুক্ত কর"},"sourcedialog":{"toolbar":"উৎস","title":"সোর্স"},"sourcearea":{"toolbar":"উৎস"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"ধরন-প্রকৃতি অপসারণ করি"},"pastetext":{"button":"সাধারণ টেক্সট হিসেবে পেইস্ট করি","title":"সাদা টেক্সট হিসেবে পেস্ট কর"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"পেস্ট (শব্দ)","toolbar":"পেস্ট (শব্দ)"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"বুলেটেড তালিকা প্রবেশ/অপসারন করি","numberedlist":"সাংখ্যিক লিস্টের লেবেল"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"যাচাই করি","center":"মাঝ বরাবর ঘেষা","left":"বা দিকে ঘেঁষা","right":"ডান দিকে ঘেঁষা"},"indent":{"indent":"ইনডেন্ট বাড়াই","outdent":"ইনডেন্ট কমাও"},"image2":{"alt":"বিকল্প টেক্সট","btnUpload":"ইহাকে সার্ভারে প্রেরন কর","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ছবির তথ্য","lockRatio":"অনুপাত লক কর","menu":"ছবির প্রোপার্টি","pathName":"image","pathNameCaption":"caption","resetSize":"সাইজ পূর্বাবস্থায় ফিরিয়ে দাও","resizer":"Click and drag to resize","title":"ছবির প্রোপার্টি","uploadTab":"আপলোড","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"অনুভূমিক লাইন যোগ করি"},"format":{"label":"ধরন-প্রকৃতি","panelTitle":"ফন্ট ফরমেট","tag_address":"ঠিকানা","tag_div":"শীর্ষক (DIV)","tag_h1":"শীর্ষক ১","tag_h2":"শীর্ষক ২","tag_h3":"শীর্ষক ৩","tag_h4":"শীর্ষক ৪","tag_h5":"শীর্ষক ৫","tag_h6":"শীর্ষক ৬","tag_p":"সাধারণ","tag_pre":"ফর্মেটেড"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"কপি","copyError":"আপনার ব্রাউজারের নিরাপত্তা সেটিংসমূহ এডিটরকে স্বয়ংক্রিয়ভাবে কপি করার প্রক্রিয়া চালনা করার অনুমতি দেয় না। অনুগ্রহপূর্বক এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+C)।","cut":"কাট","cutError":"আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কাট করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+X)।","paste":"পেস্ট","pasteArea":"Paste Area","pasteMsg":"অনুগ্রহ করে নীচের বাক্সে কিবোর্ড ব্যবহার করে (<STRONG>Ctrl/Cmd+V</STRONG>) পেস্ট করুন এবং <STRONG>OK</STRONG> চাপ দিন","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"পেস্ট"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"বোল্ড","italic":"বাঁকা","strike":"স্ট্রাইক থ্রু","subscript":"অধোলেখ","superscript":"অভিলেখ","underline":"আন্ডারলাইন"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"ব্রাউজ সার্ভার","url":"URL","protocol":"প্রোটোকল","upload":"আপলোড","uploadSubmit":"ইহাকে সার্ভারে প্রেরন কর","image":"ছবির লেবেল যুক্ত কর","flash":"ফ্লাশ লেবেল যুক্ত কর","form":"ফর্ম","checkbox":"চেক বাক্স","radio":"রেডিও বাটন","textField":"টেক্সট ফীল্ড","textarea":"টেক্সট এরিয়া","hiddenField":"গুপ্ত ফীল্ড","button":"বাটন","select":"বাছাই ফীল্ড","imageButton":"ছবির বাটন","notSet":"<সেট নেই>","id":"আইডি","name":"নাম","langDir":"ভাষা লেখার দিক","langDirLtr":"বাম থেকে ডান (LTR)","langDirRtl":"ডান থেকে বাম (RTL)","langCode":"ভাষা কোড","longDescr":"URL এর লম্বা বর্ণনা","cssClass":"স্টাইল-শীট ক্লাস","advisoryTitle":"পরামর্শ শীর্ষক","cssStyle":"স্টাইল","ok":"ওকে","cancel":"বাতিল","close":"Close","preview":"প্রিভিউ","resize":"Resize","generalTab":"General","advancedTab":"এডভান্সড","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"টার্গেট","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","styles":"স্টাইল","cssClasses":"স্টাইল-শীট ক্লাস","width":"প্রস্থ","height":"দৈর্ঘ্য","align":"এলাইন","alignLeft":"বামে","alignRight":"ডানে","alignCenter":"মাঝখানে","alignJustify":"ব্লক জাস্টিফাই","alignTop":"উপর","alignMiddle":"মধ্য","alignBottom":"নীচে","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/bs.js b/web/core/assets/vendor/ckeditor/lang/bs.js
index da6c6aa2b..256ebcd0b 100644
--- a/web/core/assets/vendor/ckeditor/lang/bs.js
+++ b/web/core/assets/vendor/ckeditor/lang/bs.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['bs']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Ponovi","undo":"Vrati"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Okvir","caption":"Naslov","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Briši æelije","merge":"Spoji æelije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Uvod æelija","cellSpace":"Razmak æelija","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Briši kolone"},"columns":"Kolona","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Svojstva tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Briši redove"},"rows":"Redova","summary":"Summary","title":"Svojstva tabele","toolbar":"Tabela","widthPc":"posto","widthPx":"piksela","widthUnit":"width unit"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Izaberi specijalni karakter","toolbar":"Ubaci specijalni karater"},"sourcedialog":{"toolbar":"HTML kôd","title":"HTML kôd"},"sourcearea":{"toolbar":"HTML kôd"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Poništi format"},"pastetext":{"button":"Zalijepi kao obièan tekst","title":"Zalijepi kao obièan tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalijepi iz Word-a","toolbar":"Zalijepi iz Word-a"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Lista","numberedlist":"Numerisana lista"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Puno poravnanje","center":"Centralno poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"indent":{"indent":"Poveæaj uvod","outdent":"Smanji uvod"},"image2":{"alt":"Tekst na slici","btnUpload":"Šalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zakljuèaj odnos","menu":"Svojstva slike","pathName":"image","pathNameCaption":"caption","resetSize":"Resetuj dimenzije","resizer":"Click and drag to resize","title":"Svojstva slike","uploadTab":"Šalji","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Ubaci horizontalnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Boldiraj","italic":"Ukosi","strike":"Precrtaj","subscript":"Subscript","superscript":"Superscript","underline":"Podvuci"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Šalji","uploadSubmit":"Šalji na server","image":"Slika","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije podešeno>","id":"Id","name":"Naziv","langDir":"Smjer pisanja","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Jezièni kôd","longDescr":"Dugaèki opis URL-a","cssClass":"Klase CSS stilova","advisoryTitle":"Advisory title","cssStyle":"Stil","ok":"OK","cancel":"Odustani","close":"Close","preview":"Prikaži","resize":"Resize","generalTab":"General","advancedTab":"Naprednije","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Prozor","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase CSS stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Centar","alignJustify":"Puno poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dno","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['bs']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Ponovi","undo":"Vrati"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Okvir","caption":"Naslov","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Briši æelije","merge":"Spoji æelije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Uvod æelija","cellSpace":"Razmak æelija","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Briši kolone"},"columns":"Kolona","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Svojstva tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Briši redove"},"rows":"Redova","summary":"Summary","title":"Svojstva tabele","toolbar":"Tabela","widthPc":"posto","widthPx":"piksela","widthUnit":"width unit"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Izaberi specijalni karakter","toolbar":"Ubaci specijalni karater"},"sourcedialog":{"toolbar":"HTML kôd","title":"HTML kôd"},"sourcearea":{"toolbar":"HTML kôd"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Poništi format"},"pastetext":{"button":"Zalijepi kao obièan tekst","title":"Zalijepi kao obièan tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalijepi iz Word-a","toolbar":"Zalijepi iz Word-a"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Lista","numberedlist":"Numerisana lista"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Puno poravnanje","center":"Centralno poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"indent":{"indent":"Poveæaj uvod","outdent":"Smanji uvod"},"image2":{"alt":"Tekst na slici","btnUpload":"Šalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zakljuèaj odnos","menu":"Svojstva slike","pathName":"image","pathNameCaption":"caption","resetSize":"Resetuj dimenzije","resizer":"Click and drag to resize","title":"Svojstva slike","uploadTab":"Šalji","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Ubaci horizontalnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Boldiraj","italic":"Ukosi","strike":"Precrtaj","subscript":"Subscript","superscript":"Superscript","underline":"Podvuci"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Šalji","uploadSubmit":"Šalji na server","image":"Slika","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije podešeno>","id":"Id","name":"Naziv","langDir":"Smjer pisanja","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Jezièni kôd","longDescr":"Dugaèki opis URL-a","cssClass":"Klase CSS stilova","advisoryTitle":"Advisory title","cssStyle":"Stil","ok":"OK","cancel":"Odustani","close":"Close","preview":"Prikaži","resize":"Resize","generalTab":"General","advancedTab":"Naprednije","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Prozor","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase CSS stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Centar","alignJustify":"Puno poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dno","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/ca.js b/web/core/assets/vendor/ckeditor/lang/ca.js
index f41211e03..86d9fc8e4 100644
--- a/web/core/assets/vendor/ckeditor/lang/ca.js
+++ b/web/core/assets/vendor/ckeditor/lang/ca.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ca']={"widget":{"move":"Clicar i arrossegar per moure","label":"%1 widget"},"undo":{"redo":"Refés","undo":"Desfés"},"toolbar":{"toolbarCollapse":"Redueix la barra d'eines","toolbarExpand":"Amplia la barra d'eines","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor de barra d'eines"},"table":{"border":"Mida vora","caption":"Títol","cell":{"menu":"Cel·la","insertBefore":"Insereix abans","insertAfter":"Insereix després","deleteCell":"Suprimeix","merge":"Fusiona","mergeRight":"Fusiona a la dreta","mergeDown":"Fusiona avall","splitHorizontal":"Divideix horitzontalment","splitVertical":"Divideix verticalment","title":"Propietats de la cel·la","cellType":"Tipus de cel·la","rowSpan":"Expansió de files","colSpan":"Expansió de columnes","wordWrap":"Ajustar al contingut","hAlign":"Alineació Horizontal","vAlign":"Alineació Vertical","alignBaseline":"A la línia base","bgColor":"Color de fons","borderColor":"Color de la vora","data":"Dades","header":"Capçalera","yes":"Sí","no":"No","invalidWidth":"L'amplada de cel·la ha de ser un nombre.","invalidHeight":"L'alçada de cel·la ha de ser un nombre.","invalidRowSpan":"L'expansió de files ha de ser un nombre enter.","invalidColSpan":"L'expansió de columnes ha de ser un nombre enter.","chooseColor":"Trieu"},"cellPad":"Encoixinament de cel·les","cellSpace":"Espaiat de cel·les","column":{"menu":"Columna","insertBefore":"Insereix columna abans de","insertAfter":"Insereix columna darrera","deleteColumn":"Suprimeix una columna"},"columns":"Columnes","deleteTable":"Suprimeix la taula","headers":"Capçaleres","headersBoth":"Ambdues","headersColumn":"Primera columna","headersNone":"Cap","headersRow":"Primera fila","invalidBorder":"El gruix de la vora ha de ser un nombre.","invalidCellPadding":"L'encoixinament de cel·la  ha de ser un nombre.","invalidCellSpacing":"L'espaiat de cel·la  ha de ser un nombre.","invalidCols":"El nombre de columnes ha de ser un nombre major que 0.","invalidHeight":"L'alçada de la taula  ha de ser un nombre.","invalidRows":"El nombre de files ha de ser un nombre major que 0.","invalidWidth":"L'amplada de la taula  ha de ser un nombre.","menu":"Propietats de la taula","row":{"menu":"Fila","insertBefore":"Insereix fila abans de","insertAfter":"Insereix fila darrera","deleteRow":"Suprimeix una fila"},"rows":"Files","summary":"Resum","title":"Propietats de la taula","toolbar":"Taula","widthPc":"percentatge","widthPx":"píxels","widthUnit":"unitat d'amplada"},"stylescombo":{"label":"Estil","panelTitle":"Estils de format","panelTitle1":"Estils de bloc","panelTitle2":"Estils incrustats","panelTitle3":"Estils d'objecte"},"specialchar":{"options":"Opcions de caràcters especials","title":"Selecciona el caràcter especial","toolbar":"Insereix caràcter especial"},"sourcedialog":{"toolbar":"Codi font","title":"Codi font"},"sourcearea":{"toolbar":"Codi font"},"showblocks":{"toolbar":"Mostra els blocs"},"removeformat":{"toolbar":"Elimina Format"},"pastetext":{"button":"Enganxa com a text no formatat","title":"Enganxa com a text no formatat"},"pastefromword":{"confirmCleanup":"El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?","error":"No ha estat possible netejar les dades enganxades degut a un error intern","title":"Enganxa des del Word","toolbar":"Enganxa des del Word"},"maximize":{"maximize":"Maximitza","minimize":"Minimitza"},"magicline":{"title":"Insereix el paràgraf aquí"},"list":{"bulletedlist":"Llista de pics","numberedlist":"Llista numerada"},"language":{"button":"Definir l'idioma","remove":"Eliminar idioma"},"justify":{"block":"Justificat","center":"Centrat","left":"Alinea a l'esquerra","right":"Alinea a la dreta"},"indent":{"indent":"Augmenta el sagnat","outdent":"Redueix el sagnat"},"image2":{"alt":"Text alternatiu","btnUpload":"Envia-la al servidor","captioned":"Imatge amb subtítol","captionPlaceholder":"Títol","infoTab":"Informació de la imatge","lockRatio":"Bloqueja les proporcions","menu":"Propietats de la imatge","pathName":"imatge","pathNameCaption":"subtítol","resetSize":"Restaura la mida","resizer":"Clicar i arrossegar per redimensionar","title":"Propietats de la imatge","uploadTab":"Puja","urlMissing":"Falta la URL de la imatge."},"horizontalrule":{"toolbar":"Insereix línia horitzontal"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adreça","tag_div":"Normal (DIV)","tag_h1":"Encapçalament 1","tag_h2":"Encapçalament 2","tag_h3":"Encapçalament 3","tag_h4":"Encapçalament 4","tag_h5":"Encapçalament 5","tag_h6":"Encapçalament 6","tag_p":"Normal","tag_pre":"Formatejat"},"elementspath":{"eleLabel":"Ruta dels elements","eleTitle":"%1 element"},"contextmenu":{"options":"Opcions del menú contextual"},"clipboard":{"copy":"Copiar","copyError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+C).","cut":"Retallar","cutError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+X).","paste":"Enganxar","pasteArea":"Àrea d'enganxat","pasteMsg":"Si us plau, enganxi dins del següent camp utilitzant el teclat (<strong>Ctrl/Cmd+V</strong>) i premi OK.","securityMsg":"A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir a les dades del porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.","title":"Enganxar"},"button":{"selectedLabel":"%1 (Seleccionat)"},"blockquote":{"toolbar":"Bloc de cita"},"basicstyles":{"bold":"Negreta","italic":"Cursiva","strike":"Ratllat","subscript":"Subíndex","superscript":"Superíndex","underline":"Subratllat"},"about":{"copy":"Copyright &copy; $1. Tots els drets reservats.","dlgTitle":"Quant al CKEditor","help":"Premi $1 per obtenir ajuda.","moreInfo":"Per informació sobre llicències visiteu el nostre lloc web:","title":"Quant al CKEditor","userGuide":"Manual d'usuari de CKEditor"},"editor":"Editor de text enriquit","editorPanel":"Panell de l'editor de text enriquit","common":{"editorHelp":"Premeu ALT 0 per ajuda","browseServer":"Veure servidor","url":"URL","protocol":"Protocol","upload":"Puja","uploadSubmit":"Envia-la al servidor","image":"Imatge","flash":"Flash","form":"Formulari","checkbox":"Casella de verificació","radio":"Botó d'opció","textField":"Camp de text","textarea":"Àrea de text","hiddenField":"Camp ocult","button":"Botó","select":"Camp de selecció","imageButton":"Botó d'imatge","notSet":"<no definit>","id":"Id","name":"Nom","langDir":"Direcció de l'idioma","langDirLtr":"D'esquerra a dreta (LTR)","langDirRtl":"De dreta a esquerra (RTL)","langCode":"Codi d'idioma","longDescr":"Descripció llarga de la URL","cssClass":"Classes del full d'estil","advisoryTitle":"Títol consultiu","cssStyle":"Estil","ok":"D'acord","cancel":"Cancel·la","close":"Tanca","preview":"Previsualitza","resize":"Arrossegueu per redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquest valor no és un número.","confirmNewPage":"Els canvis en aquest contingut que no es desin es perdran. Esteu segur que voleu carregar una pàgina nova?","confirmCancel":"Algunes opcions s'han canviat. Esteu segur que voleu tancar el quadre de diàleg?","options":"Opcions","target":"Destí","targetNew":"Nova finestra (_blank)","targetTop":"Finestra superior (_top)","targetSelf":"Mateixa finestra (_self)","targetParent":"Finestra pare (_parent)","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","styles":"Estil","cssClasses":"Classes del full d'estil","width":"Amplada","height":"Alçada","align":"Alineació","alignLeft":"Ajusta a l'esquerra","alignRight":"Ajusta a la dreta","alignCenter":"Centre","alignJustify":"Justificat","alignTop":"Superior","alignMiddle":"Centre","alignBottom":"Inferior","alignNone":"None","invalidValue":"Valor no vàlid.","invalidHeight":"L'alçada ha de ser un número.","invalidWidth":"L'amplada ha de ser un número.","invalidCssLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","invalidHtmlLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida d'HTML (px o %).","invalidInlineStyle":"El valor especificat per l'estil en línia ha de constar d'una o més tuples amb el format \"name: value\", separats per punt i coma.","cssLengthTooltip":"Introduïu un número per un valor en píxels o un número amb una unitat vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ca']={"widget":{"move":"Clicar i arrossegar per moure","label":"%1 widget"},"undo":{"redo":"Refés","undo":"Desfés"},"toolbar":{"toolbarCollapse":"Redueix la barra d'eines","toolbarExpand":"Amplia la barra d'eines","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor de barra d'eines"},"table":{"border":"Mida vora","caption":"Títol","cell":{"menu":"Cel·la","insertBefore":"Insereix abans","insertAfter":"Insereix després","deleteCell":"Suprimeix","merge":"Fusiona","mergeRight":"Fusiona a la dreta","mergeDown":"Fusiona avall","splitHorizontal":"Divideix horitzontalment","splitVertical":"Divideix verticalment","title":"Propietats de la cel·la","cellType":"Tipus de cel·la","rowSpan":"Expansió de files","colSpan":"Expansió de columnes","wordWrap":"Ajustar al contingut","hAlign":"Alineació Horizontal","vAlign":"Alineació Vertical","alignBaseline":"A la línia base","bgColor":"Color de fons","borderColor":"Color de la vora","data":"Dades","header":"Capçalera","yes":"Sí","no":"No","invalidWidth":"L'amplada de cel·la ha de ser un nombre.","invalidHeight":"L'alçada de cel·la ha de ser un nombre.","invalidRowSpan":"L'expansió de files ha de ser un nombre enter.","invalidColSpan":"L'expansió de columnes ha de ser un nombre enter.","chooseColor":"Trieu"},"cellPad":"Encoixinament de cel·les","cellSpace":"Espaiat de cel·les","column":{"menu":"Columna","insertBefore":"Insereix columna abans de","insertAfter":"Insereix columna darrera","deleteColumn":"Suprimeix una columna"},"columns":"Columnes","deleteTable":"Suprimeix la taula","headers":"Capçaleres","headersBoth":"Ambdues","headersColumn":"Primera columna","headersNone":"Cap","headersRow":"Primera fila","invalidBorder":"El gruix de la vora ha de ser un nombre.","invalidCellPadding":"L'encoixinament de cel·la  ha de ser un nombre.","invalidCellSpacing":"L'espaiat de cel·la  ha de ser un nombre.","invalidCols":"El nombre de columnes ha de ser un nombre major que 0.","invalidHeight":"L'alçada de la taula  ha de ser un nombre.","invalidRows":"El nombre de files ha de ser un nombre major que 0.","invalidWidth":"L'amplada de la taula  ha de ser un nombre.","menu":"Propietats de la taula","row":{"menu":"Fila","insertBefore":"Insereix fila abans de","insertAfter":"Insereix fila darrera","deleteRow":"Suprimeix una fila"},"rows":"Files","summary":"Resum","title":"Propietats de la taula","toolbar":"Taula","widthPc":"percentatge","widthPx":"píxels","widthUnit":"unitat d'amplada"},"stylescombo":{"label":"Estil","panelTitle":"Estils de format","panelTitle1":"Estils de bloc","panelTitle2":"Estils incrustats","panelTitle3":"Estils d'objecte"},"specialchar":{"options":"Opcions de caràcters especials","title":"Selecciona el caràcter especial","toolbar":"Insereix caràcter especial"},"sourcedialog":{"toolbar":"Codi font","title":"Codi font"},"sourcearea":{"toolbar":"Codi font"},"showblocks":{"toolbar":"Mostra els blocs"},"removeformat":{"toolbar":"Elimina Format"},"pastetext":{"button":"Enganxa com a text no formatat","title":"Enganxa com a text no formatat"},"pastefromword":{"confirmCleanup":"El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?","error":"No ha estat possible netejar les dades enganxades degut a un error intern","title":"Enganxa des del Word","toolbar":"Enganxa des del Word"},"maximize":{"maximize":"Maximitza","minimize":"Minimitza"},"magicline":{"title":"Insereix el paràgraf aquí"},"list":{"bulletedlist":"Llista de pics","numberedlist":"Llista numerada"},"language":{"button":"Definir l'idioma","remove":"Eliminar idioma"},"justify":{"block":"Justificat","center":"Centrat","left":"Alinea a l'esquerra","right":"Alinea a la dreta"},"indent":{"indent":"Augmenta el sagnat","outdent":"Redueix el sagnat"},"image2":{"alt":"Text alternatiu","btnUpload":"Envia-la al servidor","captioned":"Imatge amb subtítol","captionPlaceholder":"Títol","infoTab":"Informació de la imatge","lockRatio":"Bloqueja les proporcions","menu":"Propietats de la imatge","pathName":"imatge","pathNameCaption":"subtítol","resetSize":"Restaura la mida","resizer":"Clicar i arrossegar per redimensionar","title":"Propietats de la imatge","uploadTab":"Puja","urlMissing":"Falta la URL de la imatge.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Insereix línia horitzontal"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adreça","tag_div":"Normal (DIV)","tag_h1":"Encapçalament 1","tag_h2":"Encapçalament 2","tag_h3":"Encapçalament 3","tag_h4":"Encapçalament 4","tag_h5":"Encapçalament 5","tag_h6":"Encapçalament 6","tag_p":"Normal","tag_pre":"Formatejat"},"elementspath":{"eleLabel":"Ruta dels elements","eleTitle":"%1 element"},"contextmenu":{"options":"Opcions del menú contextual"},"clipboard":{"copy":"Copiar","copyError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+C).","cut":"Retallar","cutError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+X).","paste":"Enganxar","pasteArea":"Àrea d'enganxat","pasteMsg":"Si us plau, enganxi dins del següent camp utilitzant el teclat (<strong>Ctrl/Cmd+V</strong>) i premi OK.","securityMsg":"A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir a les dades del porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.","title":"Enganxar"},"button":{"selectedLabel":"%1 (Seleccionat)"},"blockquote":{"toolbar":"Bloc de cita"},"basicstyles":{"bold":"Negreta","italic":"Cursiva","strike":"Ratllat","subscript":"Subíndex","superscript":"Superíndex","underline":"Subratllat"},"about":{"copy":"Copyright &copy; $1. Tots els drets reservats.","dlgTitle":"Quant al CKEditor","help":"Premi $1 per obtenir ajuda.","moreInfo":"Per informació sobre llicències visiteu el nostre lloc web:","title":"Quant al CKEditor","userGuide":"Manual d'usuari de CKEditor"},"editor":"Editor de text enriquit","editorPanel":"Panell de l'editor de text enriquit","common":{"editorHelp":"Premeu ALT 0 per ajuda","browseServer":"Veure servidor","url":"URL","protocol":"Protocol","upload":"Puja","uploadSubmit":"Envia-la al servidor","image":"Imatge","flash":"Flash","form":"Formulari","checkbox":"Casella de verificació","radio":"Botó d'opció","textField":"Camp de text","textarea":"Àrea de text","hiddenField":"Camp ocult","button":"Botó","select":"Camp de selecció","imageButton":"Botó d'imatge","notSet":"<no definit>","id":"Id","name":"Nom","langDir":"Direcció de l'idioma","langDirLtr":"D'esquerra a dreta (LTR)","langDirRtl":"De dreta a esquerra (RTL)","langCode":"Codi d'idioma","longDescr":"Descripció llarga de la URL","cssClass":"Classes del full d'estil","advisoryTitle":"Títol consultiu","cssStyle":"Estil","ok":"D'acord","cancel":"Cancel·la","close":"Tanca","preview":"Previsualitza","resize":"Arrossegueu per redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquest valor no és un número.","confirmNewPage":"Els canvis en aquest contingut que no es desin es perdran. Esteu segur que voleu carregar una pàgina nova?","confirmCancel":"Algunes opcions s'han canviat. Esteu segur que voleu tancar el quadre de diàleg?","options":"Opcions","target":"Destí","targetNew":"Nova finestra (_blank)","targetTop":"Finestra superior (_top)","targetSelf":"Mateixa finestra (_self)","targetParent":"Finestra pare (_parent)","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","styles":"Estil","cssClasses":"Classes del full d'estil","width":"Amplada","height":"Alçada","align":"Alineació","alignLeft":"Ajusta a l'esquerra","alignRight":"Ajusta a la dreta","alignCenter":"Centre","alignJustify":"Justificat","alignTop":"Superior","alignMiddle":"Centre","alignBottom":"Inferior","alignNone":"Cap","invalidValue":"Valor no vàlid.","invalidHeight":"L'alçada ha de ser un número.","invalidWidth":"L'amplada ha de ser un número.","invalidCssLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","invalidHtmlLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida d'HTML (px o %).","invalidInlineStyle":"El valor especificat per l'estil en línia ha de constar d'una o més tuples amb el format \"name: value\", separats per punt i coma.","cssLengthTooltip":"Introduïu un número per un valor en píxels o un número amb una unitat vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retrocés","13":"Intro","16":"Majúscules","17":"Ctrl","18":"Alt","32":"Space","35":"Fi","36":"Inici","46":"Eliminar","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/cs.js b/web/core/assets/vendor/ckeditor/lang/cs.js
index 2745d97e9..71cf14d6b 100644
--- a/web/core/assets/vendor/ckeditor/lang/cs.js
+++ b/web/core/assets/vendor/ckeditor/lang/cs.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['cs']={"widget":{"move":"Klepněte a táhněte pro přesunutí","label":"Ovládací prvek %1"},"undo":{"redo":"Znovu","undo":"Zpět"},"toolbar":{"toolbarCollapse":"Skrýt panel nástrojů","toolbarExpand":"Zobrazit panel nástrojů","toolbarGroups":{"document":"Dokument","clipboard":"Schránka/Zpět","editing":"Úpravy","forms":"Formuláře","basicstyles":"Základní styly","paragraph":"Odstavec","links":"Odkazy","insert":"Vložit","styles":"Styly","colors":"Barvy","tools":"Nástroje"},"toolbars":"Panely nástrojů editoru"},"table":{"border":"Ohraničení","caption":"Popis","cell":{"menu":"Buňka","insertBefore":"Vložit buňku před","insertAfter":"Vložit buňku za","deleteCell":"Smazat buňky","merge":"Sloučit buňky","mergeRight":"Sloučit doprava","mergeDown":"Sloučit dolů","splitHorizontal":"Rozdělit buňky vodorovně","splitVertical":"Rozdělit buňky svisle","title":"Vlastnosti buňky","cellType":"Typ buňky","rowSpan":"Spojit řádky","colSpan":"Spojit sloupce","wordWrap":"Zalamování","hAlign":"Vodorovné zarovnání","vAlign":"Svislé zarovnání","alignBaseline":"Na účaří","bgColor":"Barva pozadí","borderColor":"Barva okraje","data":"Data","header":"Hlavička","yes":"Ano","no":"Ne","invalidWidth":"Šířka buňky musí být číslo.","invalidHeight":"Zadaná výška buňky musí být číslená.","invalidRowSpan":"Zadaný počet sloučených řádků musí být celé číslo.","invalidColSpan":"Zadaný počet sloučených sloupců musí být celé číslo.","chooseColor":"Výběr"},"cellPad":"Odsazení obsahu v buňce","cellSpace":"Vzdálenost buněk","column":{"menu":"Sloupec","insertBefore":"Vložit sloupec před","insertAfter":"Vložit sloupec za","deleteColumn":"Smazat sloupec"},"columns":"Sloupce","deleteTable":"Smazat tabulku","headers":"Záhlaví","headersBoth":"Obojí","headersColumn":"První sloupec","headersNone":"Žádné","headersRow":"První řádek","invalidBorder":"Zdaná velikost okraje musí být číselná.","invalidCellPadding":"Zadané odsazení obsahu v buňce musí být číselné.","invalidCellSpacing":"Zadaná vzdálenost buněk musí být číselná.","invalidCols":"Počet sloupců musí být číslo větší než 0.","invalidHeight":"Zadaná výška tabulky musí být číselná.","invalidRows":"Počet řádků musí být číslo větší než 0.","invalidWidth":"Šířka tabulky musí být číslo.","menu":"Vlastnosti tabulky","row":{"menu":"Řádek","insertBefore":"Vložit řádek před","insertAfter":"Vložit řádek za","deleteRow":"Smazat řádky"},"rows":"Řádky","summary":"Souhrn","title":"Vlastnosti tabulky","toolbar":"Tabulka","widthPc":"procent","widthPx":"bodů","widthUnit":"jednotka šířky"},"stylescombo":{"label":"Styl","panelTitle":"Formátovací styly","panelTitle1":"Blokové styly","panelTitle2":"Řádkové styly","panelTitle3":"Objektové styly"},"specialchar":{"options":"Nastavení speciálních znaků","title":"Výběr speciálního znaku","toolbar":"Vložit speciální znaky"},"sourcedialog":{"toolbar":"Zdroj","title":"Zdroj"},"sourcearea":{"toolbar":"Zdroj"},"showblocks":{"toolbar":"Ukázat bloky"},"removeformat":{"toolbar":"Odstranit formátování"},"pastetext":{"button":"Vložit jako čistý text","title":"Vložit jako čistý text"},"pastefromword":{"confirmCleanup":"Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vyčistit?","error":"Z důvodu vnitřní chyby nebylo možné provést vyčištění vkládaného textu.","title":"Vložit z Wordu","toolbar":"Vložit z Wordu"},"maximize":{"maximize":"Maximalizovat","minimize":"Minimalizovat"},"magicline":{"title":"zde vložit odstavec"},"list":{"bulletedlist":"Odrážky","numberedlist":"Číslování"},"language":{"button":"Nastavit jazyk","remove":"Odstranit jazyk"},"justify":{"block":"Zarovnat do bloku","center":"Zarovnat na střed","left":"Zarovnat vlevo","right":"Zarovnat vpravo"},"indent":{"indent":"Zvětšit odsazení","outdent":"Zmenšit odsazení"},"image2":{"alt":"Alternativní text","btnUpload":"Odeslat na server","captioned":"Obrázek s popisem","captionPlaceholder":"Popis","infoTab":"Informace o obrázku","lockRatio":"Zámek","menu":"Vlastnosti obrázku","pathName":"Obrázek","pathNameCaption":"Popis","resetSize":"Původní velikost","resizer":"Klepněte a táhněte pro změnu velikosti","title":"Vlastnosti obrázku","uploadTab":"Odeslat","urlMissing":"Zadané URL zdroje obrázku nebylo nalezeno."},"horizontalrule":{"toolbar":"Vložit vodorovnou linku"},"format":{"label":"Formát","panelTitle":"Formát","tag_address":"Adresa","tag_div":"Normální (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normální","tag_pre":"Naformátováno"},"elementspath":{"eleLabel":"Cesta objektu","eleTitle":"%1 objekt"},"contextmenu":{"options":"Nastavení kontextové nabídky"},"clipboard":{"copy":"Kopírovat","copyError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+C).","cut":"Vyjmout","cutError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+X).","paste":"Vložit","pasteArea":"Oblast vkládání","pasteMsg":"Do následujícího pole vložte požadovaný obsah pomocí klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stiskněte <STRONG>OK</STRONG>.","securityMsg":"Z důvodů nastavení bezpečnosti vašeho prohlížeče nemůže editor přistupovat přímo do schránky. Obsah schránky prosím vložte znovu do tohoto okna.","title":"Vložit"},"button":{"selectedLabel":"%1 (Vybráno)"},"blockquote":{"toolbar":"Citace"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Přeškrtnuté","subscript":"Dolní index","superscript":"Horní index","underline":"Podtržené"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O aplikaci CKEditor","help":"Prohlédněte si $1 pro nápovědu.","moreInfo":"Pro informace o lincenci navštivte naši webovou stránku:","title":"O aplikaci CKEditor","userGuide":"Uživatelská příručka CKEditor"},"editor":"Textový editor","editorPanel":"Panel textového editoru","common":{"editorHelp":"Stiskněte ALT 0 pro nápovědu","browseServer":"Vybrat na serveru","url":"URL","protocol":"Protokol","upload":"Odeslat","uploadSubmit":"Odeslat na server","image":"Obrázek","flash":"Flash","form":"Formulář","checkbox":"Zaškrtávací políčko","radio":"Přepínač","textField":"Textové pole","textarea":"Textová oblast","hiddenField":"Skryté pole","button":"Tlačítko","select":"Seznam","imageButton":"Obrázkové tlačítko","notSet":"<nenastaveno>","id":"Id","name":"Jméno","langDir":"Směr jazyka","langDirLtr":"Zleva doprava (LTR)","langDirRtl":"Zprava doleva (RTL)","langCode":"Kód jazyka","longDescr":"Dlouhý popis URL","cssClass":"Třída stylu","advisoryTitle":"Pomocný titulek","cssStyle":"Styl","ok":"OK","cancel":"Zrušit","close":"Zavřít","preview":"Náhled","resize":"Uchopit pro změnu velikosti","generalTab":"Obecné","advancedTab":"Rozšířené","validateNumberFailed":"Zadaná hodnota není číselná.","confirmNewPage":"Jakékoliv neuložené změny obsahu budou ztraceny. Skutečně chcete otevřít novou stránku?","confirmCancel":"Některá z nastavení byla změněna. Skutečně chcete zavřít dialogové okno?","options":"Nastavení","target":"Cíl","targetNew":"Nové okno (_blank)","targetTop":"Okno nejvyšší úrovně (_top)","targetSelf":"Stejné okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","styles":"Styly","cssClasses":"Třídy stylů","width":"Šířka","height":"Výška","align":"Zarovnání","alignLeft":"Vlevo","alignRight":"Vpravo","alignCenter":"Na střed","alignJustify":"Zarovnat do bloku","alignTop":"Nahoru","alignMiddle":"Na střed","alignBottom":"Dolů","alignNone":"Žádné","invalidValue":"Neplatná hodnota.","invalidHeight":"Zadaná výška musí být číslo.","invalidWidth":"Šířka musí být číslo.","invalidCssLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry CSS (px, %, in, cm, mm, em, ex, pt, nebo pc).","invalidHtmlLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry HTML (px nebo %).","invalidInlineStyle":"Hodnota určená pro řádkový styl se musí skládat z jedné nebo více n-tic ve formátu \"název : hodnota\", oddělené středníky","cssLengthTooltip":"Zadejte číslo jako hodnotu v pixelech nebo číslo s platnou jednotkou CSS (px, %, v cm, mm, em, ex, pt, nebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupné</span>"}};
\ No newline at end of file
+CKEDITOR.lang['cs']={"widget":{"move":"Klepněte a táhněte pro přesunutí","label":"Ovládací prvek %1"},"undo":{"redo":"Znovu","undo":"Zpět"},"toolbar":{"toolbarCollapse":"Skrýt panel nástrojů","toolbarExpand":"Zobrazit panel nástrojů","toolbarGroups":{"document":"Dokument","clipboard":"Schránka/Zpět","editing":"Úpravy","forms":"Formuláře","basicstyles":"Základní styly","paragraph":"Odstavec","links":"Odkazy","insert":"Vložit","styles":"Styly","colors":"Barvy","tools":"Nástroje"},"toolbars":"Panely nástrojů editoru"},"table":{"border":"Ohraničení","caption":"Popis","cell":{"menu":"Buňka","insertBefore":"Vložit buňku před","insertAfter":"Vložit buňku za","deleteCell":"Smazat buňky","merge":"Sloučit buňky","mergeRight":"Sloučit doprava","mergeDown":"Sloučit dolů","splitHorizontal":"Rozdělit buňky vodorovně","splitVertical":"Rozdělit buňky svisle","title":"Vlastnosti buňky","cellType":"Typ buňky","rowSpan":"Spojit řádky","colSpan":"Spojit sloupce","wordWrap":"Zalamování","hAlign":"Vodorovné zarovnání","vAlign":"Svislé zarovnání","alignBaseline":"Na účaří","bgColor":"Barva pozadí","borderColor":"Barva okraje","data":"Data","header":"Hlavička","yes":"Ano","no":"Ne","invalidWidth":"Šířka buňky musí být číslo.","invalidHeight":"Zadaná výška buňky musí být číslená.","invalidRowSpan":"Zadaný počet sloučených řádků musí být celé číslo.","invalidColSpan":"Zadaný počet sloučených sloupců musí být celé číslo.","chooseColor":"Výběr"},"cellPad":"Odsazení obsahu v buňce","cellSpace":"Vzdálenost buněk","column":{"menu":"Sloupec","insertBefore":"Vložit sloupec před","insertAfter":"Vložit sloupec za","deleteColumn":"Smazat sloupec"},"columns":"Sloupce","deleteTable":"Smazat tabulku","headers":"Záhlaví","headersBoth":"Obojí","headersColumn":"První sloupec","headersNone":"Žádné","headersRow":"První řádek","invalidBorder":"Zdaná velikost okraje musí být číselná.","invalidCellPadding":"Zadané odsazení obsahu v buňce musí být číselné.","invalidCellSpacing":"Zadaná vzdálenost buněk musí být číselná.","invalidCols":"Počet sloupců musí být číslo větší než 0.","invalidHeight":"Zadaná výška tabulky musí být číselná.","invalidRows":"Počet řádků musí být číslo větší než 0.","invalidWidth":"Šířka tabulky musí být číslo.","menu":"Vlastnosti tabulky","row":{"menu":"Řádek","insertBefore":"Vložit řádek před","insertAfter":"Vložit řádek za","deleteRow":"Smazat řádky"},"rows":"Řádky","summary":"Souhrn","title":"Vlastnosti tabulky","toolbar":"Tabulka","widthPc":"procent","widthPx":"bodů","widthUnit":"jednotka šířky"},"stylescombo":{"label":"Styl","panelTitle":"Formátovací styly","panelTitle1":"Blokové styly","panelTitle2":"Řádkové styly","panelTitle3":"Objektové styly"},"specialchar":{"options":"Nastavení speciálních znaků","title":"Výběr speciálního znaku","toolbar":"Vložit speciální znaky"},"sourcedialog":{"toolbar":"Zdroj","title":"Zdroj"},"sourcearea":{"toolbar":"Zdroj"},"showblocks":{"toolbar":"Ukázat bloky"},"removeformat":{"toolbar":"Odstranit formátování"},"pastetext":{"button":"Vložit jako čistý text","title":"Vložit jako čistý text"},"pastefromword":{"confirmCleanup":"Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vyčistit?","error":"Z důvodu vnitřní chyby nebylo možné provést vyčištění vkládaného textu.","title":"Vložit z Wordu","toolbar":"Vložit z Wordu"},"maximize":{"maximize":"Maximalizovat","minimize":"Minimalizovat"},"magicline":{"title":"zde vložit odstavec"},"list":{"bulletedlist":"Odrážky","numberedlist":"Číslování"},"language":{"button":"Nastavit jazyk","remove":"Odstranit jazyk"},"justify":{"block":"Zarovnat do bloku","center":"Zarovnat na střed","left":"Zarovnat vlevo","right":"Zarovnat vpravo"},"indent":{"indent":"Zvětšit odsazení","outdent":"Zmenšit odsazení"},"image2":{"alt":"Alternativní text","btnUpload":"Odeslat na server","captioned":"Obrázek s popisem","captionPlaceholder":"Popis","infoTab":"Informace o obrázku","lockRatio":"Zámek","menu":"Vlastnosti obrázku","pathName":"Obrázek","pathNameCaption":"Popis","resetSize":"Původní velikost","resizer":"Klepněte a táhněte pro změnu velikosti","title":"Vlastnosti obrázku","uploadTab":"Odeslat","urlMissing":"Zadané URL zdroje obrázku nebylo nalezeno.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Vložit vodorovnou linku"},"format":{"label":"Formát","panelTitle":"Formát","tag_address":"Adresa","tag_div":"Normální (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normální","tag_pre":"Naformátováno"},"elementspath":{"eleLabel":"Cesta objektu","eleTitle":"%1 objekt"},"contextmenu":{"options":"Nastavení kontextové nabídky"},"clipboard":{"copy":"Kopírovat","copyError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+C).","cut":"Vyjmout","cutError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+X).","paste":"Vložit","pasteArea":"Oblast vkládání","pasteMsg":"Do následujícího pole vložte požadovaný obsah pomocí klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stiskněte <STRONG>OK</STRONG>.","securityMsg":"Z důvodů nastavení bezpečnosti vašeho prohlížeče nemůže editor přistupovat přímo do schránky. Obsah schránky prosím vložte znovu do tohoto okna.","title":"Vložit"},"button":{"selectedLabel":"%1 (Vybráno)"},"blockquote":{"toolbar":"Citace"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Přeškrtnuté","subscript":"Dolní index","superscript":"Horní index","underline":"Podtržené"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O aplikaci CKEditor","help":"Prohlédněte si $1 pro nápovědu.","moreInfo":"Pro informace o lincenci navštivte naši webovou stránku:","title":"O aplikaci CKEditor","userGuide":"Uživatelská příručka CKEditor"},"editor":"Textový editor","editorPanel":"Panel textového editoru","common":{"editorHelp":"Stiskněte ALT 0 pro nápovědu","browseServer":"Vybrat na serveru","url":"URL","protocol":"Protokol","upload":"Odeslat","uploadSubmit":"Odeslat na server","image":"Obrázek","flash":"Flash","form":"Formulář","checkbox":"Zaškrtávací políčko","radio":"Přepínač","textField":"Textové pole","textarea":"Textová oblast","hiddenField":"Skryté pole","button":"Tlačítko","select":"Seznam","imageButton":"Obrázkové tlačítko","notSet":"<nenastaveno>","id":"Id","name":"Jméno","langDir":"Směr jazyka","langDirLtr":"Zleva doprava (LTR)","langDirRtl":"Zprava doleva (RTL)","langCode":"Kód jazyka","longDescr":"Dlouhý popis URL","cssClass":"Třída stylu","advisoryTitle":"Pomocný titulek","cssStyle":"Styl","ok":"OK","cancel":"Zrušit","close":"Zavřít","preview":"Náhled","resize":"Uchopit pro změnu velikosti","generalTab":"Obecné","advancedTab":"Rozšířené","validateNumberFailed":"Zadaná hodnota není číselná.","confirmNewPage":"Jakékoliv neuložené změny obsahu budou ztraceny. Skutečně chcete otevřít novou stránku?","confirmCancel":"Některá z nastavení byla změněna. Skutečně chcete zavřít dialogové okno?","options":"Nastavení","target":"Cíl","targetNew":"Nové okno (_blank)","targetTop":"Okno nejvyšší úrovně (_top)","targetSelf":"Stejné okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","styles":"Styly","cssClasses":"Třídy stylů","width":"Šířka","height":"Výška","align":"Zarovnání","alignLeft":"Vlevo","alignRight":"Vpravo","alignCenter":"Na střed","alignJustify":"Zarovnat do bloku","alignTop":"Nahoru","alignMiddle":"Na střed","alignBottom":"Dolů","alignNone":"Žádné","invalidValue":"Neplatná hodnota.","invalidHeight":"Zadaná výška musí být číslo.","invalidWidth":"Šířka musí být číslo.","invalidCssLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry CSS (px, %, in, cm, mm, em, ex, pt, nebo pc).","invalidHtmlLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry HTML (px nebo %).","invalidInlineStyle":"Hodnota určená pro řádkový styl se musí skládat z jedné nebo více n-tic ve formátu \"název : hodnota\", oddělené středníky","cssLengthTooltip":"Zadejte číslo jako hodnotu v pixelech nebo číslo s platnou jednotkou CSS (px, %, v cm, mm, em, ex, pt, nebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupné</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"Konec","36":"Domů","46":"Smazat","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/cy.js b/web/core/assets/vendor/ckeditor/lang/cy.js
index 487e3bfb1..dfd9b83de 100644
--- a/web/core/assets/vendor/ckeditor/lang/cy.js
+++ b/web/core/assets/vendor/ckeditor/lang/cy.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['cy']={"widget":{"move":"Clcio a llusgo i symud","label":"%1 widget"},"undo":{"redo":"Ailwneud","undo":"Dadwneud"},"toolbar":{"toolbarCollapse":"Cyfangu'r Bar Offer","toolbarExpand":"Ehangu'r Bar Offer","toolbarGroups":{"document":"Dogfen","clipboard":"Clipfwrdd/Dadwneud","editing":"Golygu","forms":"Ffurflenni","basicstyles":"Arddulliau Sylfaenol","paragraph":"Paragraff","links":"Dolenni","insert":"Mewnosod","styles":"Arddulliau","colors":"Lliwiau","tools":"Offer"},"toolbars":"Bariau offer y golygydd"},"table":{"border":"Maint yr Ymyl","caption":"Pennawd","cell":{"menu":"Cell","insertBefore":"Mewnosod Cell Cyn","insertAfter":"Mewnosod Cell Ar Ôl","deleteCell":"Dileu Celloedd","merge":"Cyfuno Celloedd","mergeRight":"Cyfuno i'r Dde","mergeDown":"Cyfuno i Lawr","splitHorizontal":"Hollti'r Gell yn Lorweddol","splitVertical":"Hollti'r Gell yn Fertigol","title":"Priodweddau'r Gell","cellType":"Math y Gell","rowSpan":"Rhychwant Rhesi","colSpan":"Rhychwant Colofnau","wordWrap":"Lapio Geiriau","hAlign":"Aliniad Llorweddol","vAlign":"Aliniad Fertigol","alignBaseline":"Baslinell","bgColor":"Lliw Cefndir","borderColor":"Lliw Ymyl","data":"Data","header":"Pennyn","yes":"Ie","no":"Na","invalidWidth":"Mae'n rhaid i led y gell fod yn rhif.","invalidHeight":"Mae'n rhaid i uchder y gell fod yn rhif.","invalidRowSpan":"Mae'n rhaid i rychwant y rhesi fod yn gyfanrif.","invalidColSpan":"Mae'n rhaid i rychwant y colofnau fod yn gyfanrif.","chooseColor":"Dewis"},"cellPad":"Padio'r gell","cellSpace":"Bylchiad y gell","column":{"menu":"Colofn","insertBefore":"Mewnosod Colofn Cyn","insertAfter":"Mewnosod Colofn Ar Ôl","deleteColumn":"Dileu Colofnau"},"columns":"Colofnau","deleteTable":"Dileu Tabl","headers":"Penynnau","headersBoth":"Y Ddau","headersColumn":"Colofn gyntaf","headersNone":"Dim","headersRow":"Rhes gyntaf","invalidBorder":"Mae'n rhaid i faint yr ymyl fod yn rhif.","invalidCellPadding":"Mae'n rhaid i badiad y gell fod yn rhif positif.","invalidCellSpacing":"Mae'n rhaid i fylchiad y gell fod yn rhif positif.","invalidCols":"Mae'n rhaid cael o leiaf un golofn.","invalidHeight":"Mae'n rhaid i uchder y tabl fod yn rhif.","invalidRows":"Mae'n rhaid cael o leiaf un rhes.","invalidWidth":"Mae'n rhaid i led y tabl fod yn rhif.","menu":"Priodweddau'r Tabl","row":{"menu":"Rhes","insertBefore":"Mewnosod Rhes Cyn","insertAfter":"Mewnosod Rhes Ar Ôl","deleteRow":"Dileu Rhesi"},"rows":"Rhesi","summary":"Crynodeb","title":"Priodweddau'r Tabl","toolbar":"Tabl","widthPc":"y cant","widthPx":"picsel","widthUnit":"uned lled"},"stylescombo":{"label":"Arddulliau","panelTitle":"Arddulliau Fformatio","panelTitle1":"Arddulliau Bloc","panelTitle2":"Arddulliau Mewnol","panelTitle3":"Arddulliau Gwrthrych"},"specialchar":{"options":"Opsiynau Nodau Arbennig","title":"Dewis Nod Arbennig","toolbar":"Mewnosod Nod Arbennig"},"sourcedialog":{"toolbar":"HTML","title":"HTML"},"sourcearea":{"toolbar":"HTML"},"showblocks":{"toolbar":"Dangos Blociau"},"removeformat":{"toolbar":"Tynnu Fformat"},"pastetext":{"button":"Gludo fel testun plaen","title":"Gludo fel Testun Plaen"},"pastefromword":{"confirmCleanup":"Mae'r testun rydych chi am ludo wedi'i gopïo o Word. Ydych chi am ei lanhau cyn ei ludo?","error":"Doedd dim modd glanhau y data a ludwyd oherwydd gwall mewnol","title":"Gludo o Word","toolbar":"Gludo o Word"},"maximize":{"maximize":"Mwyhau","minimize":"Lleihau"},"magicline":{"title":"Mewnosod paragraff yma"},"list":{"bulletedlist":"Mewnosod/Tynnu Rhestr Bwled","numberedlist":"Mewnosod/Tynnu Rhestr Rhifol"},"language":{"button":"Gosod iaith","remove":"Tynnu iaith"},"justify":{"block":"Unioni","center":"Alinio i'r Canol","left":"Alinio i'r Chwith","right":"Alinio i'r Dde"},"indent":{"indent":"Cynyddu'r Mewnoliad","outdent":"Lleihau'r Mewnoliad"},"image2":{"alt":"Testun Amgen","btnUpload":"Anfon i'r Gweinydd","captioned":"Delwedd â phennawd","captionPlaceholder":"Caption","infoTab":"Gwyb Delwedd","lockRatio":"Cloi Cymhareb","menu":"Priodweddau Delwedd","pathName":"delwedd","pathNameCaption":"pennawd","resetSize":"Ailosod Maint","resizer":"Clicio a llusgo i ail-meintio","title":"Priodweddau Delwedd","uploadTab":"Lanlwytho","urlMissing":"URL gwreiddiol y ddelwedd ar goll."},"horizontalrule":{"toolbar":"Mewnosod Llinell Lorweddol"},"format":{"label":"Fformat","panelTitle":"Fformat Paragraff","tag_address":"Cyfeiriad","tag_div":"Normal (DIV)","tag_h1":"Pennawd 1","tag_h2":"Pennawd 2","tag_h3":"Pennawd 3","tag_h4":"Pennawd 4","tag_h5":"Pennawd 5","tag_h6":"Pennawd 6","tag_p":"Normal","tag_pre":"Wedi'i Fformatio"},"elementspath":{"eleLabel":"Llwybr elfennau","eleTitle":"Elfen %1"},"contextmenu":{"options":"Opsiynau Dewislen Cyd-destun"},"clipboard":{"copy":"Copïo","copyError":"'Dyw gosodiadau diogelwch eich porwr ddim yn caniatàu'r golygydd i gynnal 'gweithredoedd copïo' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+C).","cut":"Torri","cutError":"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd torri' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+X).","paste":"Gludo","pasteArea":"Ardal Gludo","pasteMsg":"Gludwch i mewn i'r blwch canlynol gan ddefnyddio'r bysellfwrdd (<strong>Ctrl/Cmd+V</strong>) a phwyso <strong>Iawn</strong>.","securityMsg":"Oherwydd gosodiadau diogelwch eich porwr, 'dyw'r porwr ddim yn gallu ennill mynediad i'r data ar y clipfwrdd yn uniongyrchol. Mae angen i chi ei ludo eto i'r ffenestr hon.","title":"Gludo"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Dyfyniad bloc"},"basicstyles":{"bold":"Bras","italic":"Italig","strike":"Llinell Trwyddo","subscript":"Is-sgript","superscript":"Uwchsgript","underline":"Tanlinellu"},"about":{"copy":"Hawlfraint &copy; $1. Cedwir pob hawl.","dlgTitle":"Ynghylch CKEditor","help":"Gwirio $1 am gymorth.","moreInfo":"Am wybodaeth ynghylch trwyddedau, ewch i'n gwefan:","title":"Ynghylch CKEditor","userGuide":"Canllawiau Defnyddiwr CKEditor"},"editor":"Golygydd Testun Cyfoethog","editorPanel":"Panel Golygydd Testun Cyfoethog","common":{"editorHelp":"Gwasgwch ALT 0 am gymorth","browseServer":"Pori'r Gweinydd","url":"URL","protocol":"Protocol","upload":"Lanlwytho","uploadSubmit":"Anfon i'r Gweinydd","image":"Delwedd","flash":"Flash","form":"Ffurflen","checkbox":"Blwch ticio","radio":"Botwm Radio","textField":"Maes Testun","textarea":"Ardal Testun","hiddenField":"Maes Cudd","button":"Botwm","select":"Maes Dewis","imageButton":"Botwm Delwedd","notSet":"<heb osod>","id":"Id","name":"Name","langDir":"Cyfeiriad Iaith","langDirLtr":"Chwith i'r Dde (LTR)","langDirRtl":"Dde i'r Chwith (RTL)","langCode":"Cod Iaith","longDescr":"URL Disgrifiad Hir","cssClass":"Dosbarthiadau Dalen Arddull","advisoryTitle":"Teitl Cynghorol","cssStyle":"Arddull","ok":"Iawn","cancel":"Diddymu","close":"Cau","preview":"Rhagolwg","resize":"Ailfeintio","generalTab":"Cyffredinol","advancedTab":"Uwch","validateNumberFailed":"'Dyw'r gwerth hwn ddim yn rhif.","confirmNewPage":"Byddwch chi'n colli unrhyw newidiadau i'r cynnwys sydd heb eu cadw. Ydych am barhau i lwytho tudalen newydd?","confirmCancel":"Cafodd rhai o'r opsiynau eu newid. Ydych chi wir am gau'r deialog?","options":"Opsiynau","target":"Targed","targetNew":"Ffenest Newydd (_blank)","targetTop":"Ffenest ar y Brig (_top)","targetSelf":"Yr un Ffenest (_self)","targetParent":"Ffenest y Rhiant (_parent)","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","styles":"Arddull","cssClasses":"Dosbarthiadau Dalen Arddull","width":"Lled","height":"Uchder","align":"Alinio","alignLeft":"Chwith","alignRight":"Dde","alignCenter":"Canol","alignJustify":"Unioni","alignTop":"Brig","alignMiddle":"Canol","alignBottom":"Gwaelod","alignNone":"None","invalidValue":"Gwerth annilys.","invalidHeight":"Mae'n rhaid i'r uchder fod yn rhif.","invalidWidth":"Mae'n rhaid i'r lled fod yn rhif.","invalidCssLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad CSS dilys (px, %, in, cm, mm, em, ex, pt, neu pc).","invalidHtmlLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad HTML dilys (px neu %).","invalidInlineStyle":"Mae'n rhaid i'r gwerth ar gyfer arddull mewn-llinell gynnwys un set neu fwy ar y fformat \"enw : gwerth\", wedi'u gwahanu gyda hanner colon.","cssLengthTooltip":"Rhowch rif am werth mewn picsel neu rhif gydag uned CSS dilys (px, %, in, cm, mm, em, pt neu pc).","unavailable":"%1<span class=\"cke_accessibility\">, ddim ar gael</span>"}};
\ No newline at end of file
+CKEDITOR.lang['cy']={"widget":{"move":"Clcio a llusgo i symud","label":"%1 widget"},"undo":{"redo":"Ailwneud","undo":"Dadwneud"},"toolbar":{"toolbarCollapse":"Cyfangu'r Bar Offer","toolbarExpand":"Ehangu'r Bar Offer","toolbarGroups":{"document":"Dogfen","clipboard":"Clipfwrdd/Dadwneud","editing":"Golygu","forms":"Ffurflenni","basicstyles":"Arddulliau Sylfaenol","paragraph":"Paragraff","links":"Dolenni","insert":"Mewnosod","styles":"Arddulliau","colors":"Lliwiau","tools":"Offer"},"toolbars":"Bariau offer y golygydd"},"table":{"border":"Maint yr Ymyl","caption":"Pennawd","cell":{"menu":"Cell","insertBefore":"Mewnosod Cell Cyn","insertAfter":"Mewnosod Cell Ar Ôl","deleteCell":"Dileu Celloedd","merge":"Cyfuno Celloedd","mergeRight":"Cyfuno i'r Dde","mergeDown":"Cyfuno i Lawr","splitHorizontal":"Hollti'r Gell yn Lorweddol","splitVertical":"Hollti'r Gell yn Fertigol","title":"Priodweddau'r Gell","cellType":"Math y Gell","rowSpan":"Rhychwant Rhesi","colSpan":"Rhychwant Colofnau","wordWrap":"Lapio Geiriau","hAlign":"Aliniad Llorweddol","vAlign":"Aliniad Fertigol","alignBaseline":"Baslinell","bgColor":"Lliw Cefndir","borderColor":"Lliw Ymyl","data":"Data","header":"Pennyn","yes":"Ie","no":"Na","invalidWidth":"Mae'n rhaid i led y gell fod yn rhif.","invalidHeight":"Mae'n rhaid i uchder y gell fod yn rhif.","invalidRowSpan":"Mae'n rhaid i rychwant y rhesi fod yn gyfanrif.","invalidColSpan":"Mae'n rhaid i rychwant y colofnau fod yn gyfanrif.","chooseColor":"Dewis"},"cellPad":"Padio'r gell","cellSpace":"Bylchiad y gell","column":{"menu":"Colofn","insertBefore":"Mewnosod Colofn Cyn","insertAfter":"Mewnosod Colofn Ar Ôl","deleteColumn":"Dileu Colofnau"},"columns":"Colofnau","deleteTable":"Dileu Tabl","headers":"Penynnau","headersBoth":"Y Ddau","headersColumn":"Colofn gyntaf","headersNone":"Dim","headersRow":"Rhes gyntaf","invalidBorder":"Mae'n rhaid i faint yr ymyl fod yn rhif.","invalidCellPadding":"Mae'n rhaid i badiad y gell fod yn rhif positif.","invalidCellSpacing":"Mae'n rhaid i fylchiad y gell fod yn rhif positif.","invalidCols":"Mae'n rhaid cael o leiaf un golofn.","invalidHeight":"Mae'n rhaid i uchder y tabl fod yn rhif.","invalidRows":"Mae'n rhaid cael o leiaf un rhes.","invalidWidth":"Mae'n rhaid i led y tabl fod yn rhif.","menu":"Priodweddau'r Tabl","row":{"menu":"Rhes","insertBefore":"Mewnosod Rhes Cyn","insertAfter":"Mewnosod Rhes Ar Ôl","deleteRow":"Dileu Rhesi"},"rows":"Rhesi","summary":"Crynodeb","title":"Priodweddau'r Tabl","toolbar":"Tabl","widthPc":"y cant","widthPx":"picsel","widthUnit":"uned lled"},"stylescombo":{"label":"Arddulliau","panelTitle":"Arddulliau Fformatio","panelTitle1":"Arddulliau Bloc","panelTitle2":"Arddulliau Mewnol","panelTitle3":"Arddulliau Gwrthrych"},"specialchar":{"options":"Opsiynau Nodau Arbennig","title":"Dewis Nod Arbennig","toolbar":"Mewnosod Nod Arbennig"},"sourcedialog":{"toolbar":"HTML","title":"HTML"},"sourcearea":{"toolbar":"HTML"},"showblocks":{"toolbar":"Dangos Blociau"},"removeformat":{"toolbar":"Tynnu Fformat"},"pastetext":{"button":"Gludo fel testun plaen","title":"Gludo fel Testun Plaen"},"pastefromword":{"confirmCleanup":"Mae'r testun rydych chi am ludo wedi'i gopïo o Word. Ydych chi am ei lanhau cyn ei ludo?","error":"Doedd dim modd glanhau y data a ludwyd oherwydd gwall mewnol","title":"Gludo o Word","toolbar":"Gludo o Word"},"maximize":{"maximize":"Mwyhau","minimize":"Lleihau"},"magicline":{"title":"Mewnosod paragraff yma"},"list":{"bulletedlist":"Mewnosod/Tynnu Rhestr Bwled","numberedlist":"Mewnosod/Tynnu Rhestr Rhifol"},"language":{"button":"Gosod iaith","remove":"Tynnu iaith"},"justify":{"block":"Unioni","center":"Alinio i'r Canol","left":"Alinio i'r Chwith","right":"Alinio i'r Dde"},"indent":{"indent":"Cynyddu'r Mewnoliad","outdent":"Lleihau'r Mewnoliad"},"image2":{"alt":"Testun Amgen","btnUpload":"Anfon i'r Gweinydd","captioned":"Delwedd â phennawd","captionPlaceholder":"Caption","infoTab":"Gwyb Delwedd","lockRatio":"Cloi Cymhareb","menu":"Priodweddau Delwedd","pathName":"delwedd","pathNameCaption":"pennawd","resetSize":"Ailosod Maint","resizer":"Clicio a llusgo i ail-meintio","title":"Priodweddau Delwedd","uploadTab":"Lanlwytho","urlMissing":"URL gwreiddiol y ddelwedd ar goll.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Mewnosod Llinell Lorweddol"},"format":{"label":"Fformat","panelTitle":"Fformat Paragraff","tag_address":"Cyfeiriad","tag_div":"Normal (DIV)","tag_h1":"Pennawd 1","tag_h2":"Pennawd 2","tag_h3":"Pennawd 3","tag_h4":"Pennawd 4","tag_h5":"Pennawd 5","tag_h6":"Pennawd 6","tag_p":"Normal","tag_pre":"Wedi'i Fformatio"},"elementspath":{"eleLabel":"Llwybr elfennau","eleTitle":"Elfen %1"},"contextmenu":{"options":"Opsiynau Dewislen Cyd-destun"},"clipboard":{"copy":"Copïo","copyError":"'Dyw gosodiadau diogelwch eich porwr ddim yn caniatàu'r golygydd i gynnal 'gweithredoedd copïo' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+C).","cut":"Torri","cutError":"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd torri' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+X).","paste":"Gludo","pasteArea":"Ardal Gludo","pasteMsg":"Gludwch i mewn i'r blwch canlynol gan ddefnyddio'r bysellfwrdd (<strong>Ctrl/Cmd+V</strong>) a phwyso <strong>Iawn</strong>.","securityMsg":"Oherwydd gosodiadau diogelwch eich porwr, 'dyw'r porwr ddim yn gallu ennill mynediad i'r data ar y clipfwrdd yn uniongyrchol. Mae angen i chi ei ludo eto i'r ffenestr hon.","title":"Gludo"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Dyfyniad bloc"},"basicstyles":{"bold":"Bras","italic":"Italig","strike":"Llinell Trwyddo","subscript":"Is-sgript","superscript":"Uwchsgript","underline":"Tanlinellu"},"about":{"copy":"Hawlfraint &copy; $1. Cedwir pob hawl.","dlgTitle":"Ynghylch CKEditor","help":"Gwirio $1 am gymorth.","moreInfo":"Am wybodaeth ynghylch trwyddedau, ewch i'n gwefan:","title":"Ynghylch CKEditor","userGuide":"Canllawiau Defnyddiwr CKEditor"},"editor":"Golygydd Testun Cyfoethog","editorPanel":"Panel Golygydd Testun Cyfoethog","common":{"editorHelp":"Gwasgwch ALT 0 am gymorth","browseServer":"Pori'r Gweinydd","url":"URL","protocol":"Protocol","upload":"Lanlwytho","uploadSubmit":"Anfon i'r Gweinydd","image":"Delwedd","flash":"Flash","form":"Ffurflen","checkbox":"Blwch ticio","radio":"Botwm Radio","textField":"Maes Testun","textarea":"Ardal Testun","hiddenField":"Maes Cudd","button":"Botwm","select":"Maes Dewis","imageButton":"Botwm Delwedd","notSet":"<heb osod>","id":"Id","name":"Name","langDir":"Cyfeiriad Iaith","langDirLtr":"Chwith i'r Dde (LTR)","langDirRtl":"Dde i'r Chwith (RTL)","langCode":"Cod Iaith","longDescr":"URL Disgrifiad Hir","cssClass":"Dosbarthiadau Dalen Arddull","advisoryTitle":"Teitl Cynghorol","cssStyle":"Arddull","ok":"Iawn","cancel":"Diddymu","close":"Cau","preview":"Rhagolwg","resize":"Ailfeintio","generalTab":"Cyffredinol","advancedTab":"Uwch","validateNumberFailed":"'Dyw'r gwerth hwn ddim yn rhif.","confirmNewPage":"Byddwch chi'n colli unrhyw newidiadau i'r cynnwys sydd heb eu cadw. Ydych am barhau i lwytho tudalen newydd?","confirmCancel":"Cafodd rhai o'r opsiynau eu newid. Ydych chi wir am gau'r deialog?","options":"Opsiynau","target":"Targed","targetNew":"Ffenest Newydd (_blank)","targetTop":"Ffenest ar y Brig (_top)","targetSelf":"Yr un Ffenest (_self)","targetParent":"Ffenest y Rhiant (_parent)","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","styles":"Arddull","cssClasses":"Dosbarthiadau Dalen Arddull","width":"Lled","height":"Uchder","align":"Alinio","alignLeft":"Chwith","alignRight":"Dde","alignCenter":"Canol","alignJustify":"Unioni","alignTop":"Brig","alignMiddle":"Canol","alignBottom":"Gwaelod","alignNone":"None","invalidValue":"Gwerth annilys.","invalidHeight":"Mae'n rhaid i'r uchder fod yn rhif.","invalidWidth":"Mae'n rhaid i'r lled fod yn rhif.","invalidCssLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad CSS dilys (px, %, in, cm, mm, em, ex, pt, neu pc).","invalidHtmlLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad HTML dilys (px neu %).","invalidInlineStyle":"Mae'n rhaid i'r gwerth ar gyfer arddull mewn-llinell gynnwys un set neu fwy ar y fformat \"enw : gwerth\", wedi'u gwahanu gyda hanner colon.","cssLengthTooltip":"Rhowch rif am werth mewn picsel neu rhif gydag uned CSS dilys (px, %, in, cm, mm, em, pt neu pc).","unavailable":"%1<span class=\"cke_accessibility\">, ddim ar gael</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/da.js b/web/core/assets/vendor/ckeditor/lang/da.js
index c6434e711..8645a2027 100644
--- a/web/core/assets/vendor/ckeditor/lang/da.js
+++ b/web/core/assets/vendor/ckeditor/lang/da.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['da']={"widget":{"move":"Klik og træk for at flytte","label":"%1 widget"},"undo":{"redo":"Annullér fortryd","undo":"Fortryd"},"toolbar":{"toolbarCollapse":"Sammenklap værktøjslinje","toolbarExpand":"Udvid værktøjslinje","toolbarGroups":{"document":"Dokument","clipboard":"Udklipsholder/Fortryd","editing":"Redigering","forms":"Formularer","basicstyles":"Basis styles","paragraph":"Paragraf","links":"Links","insert":"Indsæt","styles":"Typografier","colors":"Farver","tools":"Værktøjer"},"toolbars":"Editors værktøjslinjer"},"table":{"border":"Rammebredde","caption":"Titel","cell":{"menu":"Celle","insertBefore":"Indsæt celle før","insertAfter":"Indsæt celle efter","deleteCell":"Slet celle","merge":"Flet celler","mergeRight":"Flet til højre","mergeDown":"Flet nedad","splitHorizontal":"Del celle vandret","splitVertical":"Del celle lodret","title":"Celleegenskaber","cellType":"Celletype","rowSpan":"Række span (rows span)","colSpan":"Kolonne span (columns span)","wordWrap":"Tekstombrydning","hAlign":"Vandret justering","vAlign":"Lodret justering","alignBaseline":"Grundlinje","bgColor":"Baggrundsfarve","borderColor":"Rammefarve","data":"Data","header":"Hoved","yes":"Ja","no":"Nej","invalidWidth":"Cellebredde skal være et tal.","invalidHeight":"Cellehøjde skal være et tal.","invalidRowSpan":"Række span skal være et heltal.","invalidColSpan":"Kolonne span skal være et heltal.","chooseColor":"Vælg"},"cellPad":"Cellemargen","cellSpace":"Celleafstand","column":{"menu":"Kolonne","insertBefore":"Indsæt kolonne før","insertAfter":"Indsæt kolonne efter","deleteColumn":"Slet kolonne"},"columns":"Kolonner","deleteTable":"Slet tabel","headers":"Hoved","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første række","invalidBorder":"Rammetykkelse skal være et tal.","invalidCellPadding":"Cellemargen skal være et tal.","invalidCellSpacing":"Celleafstand skal være et tal.","invalidCols":"Antallet af kolonner skal være større end 0.","invalidHeight":"Tabelhøjde skal være et tal.","invalidRows":"Antallet af rækker skal være større end 0.","invalidWidth":"Tabelbredde skal være et tal.","menu":"Egenskaber for tabel","row":{"menu":"Række","insertBefore":"Indsæt række før","insertAfter":"Indsæt række efter","deleteRow":"Slet række"},"rows":"Rækker","summary":"Resumé","title":"Egenskaber for tabel","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"Bredde på enhed"},"stylescombo":{"label":"Typografi","panelTitle":"Formattering på stylesheet","panelTitle1":"Block typografi","panelTitle2":"Inline typografi","panelTitle3":"Object typografi"},"specialchar":{"options":"Muligheder for specialkarakterer","title":"Vælg symbol","toolbar":"Indsæt symbol"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis afsnitsmærker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Indsæt som ikke-formateret tekst","title":"Indsæt som ikke-formateret tekst"},"pastefromword":{"confirmCleanup":"Den tekst du forsøger at indsætte ser ud til at komme fra Word. Vil du rense teksten før den indsættes?","error":"Det var ikke muligt at fjerne formatteringen på den indsatte tekst grundet en intern fejl","title":"Indsæt fra Word","toolbar":"Indsæt fra Word"},"maximize":{"maximize":"Maksimér","minimize":"Minimér"},"magicline":{"title":"Indsæt afsnit"},"list":{"bulletedlist":"Punktopstilling","numberedlist":"Talopstilling"},"language":{"button":"Vælg sprog","remove":"Fjern sprog"},"justify":{"block":"Lige margener","center":"Centreret","left":"Venstrestillet","right":"Højrestillet"},"indent":{"indent":"Forøg indrykning","outdent":"Formindsk indrykning"},"image2":{"alt":"Alternativ tekst","btnUpload":"Upload fil til serveren","captioned":"Tekstet billede","captionPlaceholder":"Tekst","infoTab":"Generelt","lockRatio":"Lås størrelsesforhold","menu":"Egenskaber for billede","pathName":"billede","pathNameCaption":"tekst","resetSize":"Nulstil størrelse","resizer":"Klik og træk for at ændre størrelsen","title":"Egenskaber for billede","uploadTab":"Upload","urlMissing":"Kilde på billed-URL mangler"},"horizontalrule":{"toolbar":"Indsæt vandret streg"},"format":{"label":"Formatering","panelTitle":"Formatering","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formateret"},"elementspath":{"eleLabel":"Sti på element","eleTitle":"%1 element"},"contextmenu":{"options":"Muligheder for hjælpemenu"},"clipboard":{"copy":"Kopiér","copyError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at kopiere teksten (Ctrl/Cmd+C).","cut":"Klip","cutError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at klippe teksten (Ctrl/Cmd+X).","paste":"Indsæt","pasteArea":"Indsæt område","pasteMsg":"Indsæt i feltet herunder (<STRONG>Ctrl/Cmd+V</STRONG>) og klik på <STRONG>OK</STRONG>.","securityMsg":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Du skal indsætte udklipsholderens indhold i dette vindue igen.","title":"Indsæt"},"button":{"selectedLabel":"%1 (Valgt)"},"blockquote":{"toolbar":"Blokcitat"},"basicstyles":{"bold":"Fed","italic":"Kursiv","strike":"Gennemstreget","subscript":"Sænket skrift","superscript":"Hævet skrift","underline":"Understreget"},"about":{"copy":"Copyright &copy; $1. Alle rettigheder forbeholdes.","dlgTitle":"Om CKEditor","help":"Se $1 for at få hjælp.","moreInfo":"For informationer omkring licens, se venligst vores hjemmeside (på engelsk):","title":"Om CKEditor","userGuide":"CKEditor-brugermanual"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryk ALT 0 for hjælp","browseServer":"Gennemse...","url":"URL","protocol":"Protokol","upload":"Upload","uploadSubmit":"Upload","image":"Indsæt billede","flash":"Indsæt Flash","form":"Indsæt formular","checkbox":"Indsæt afkrydsningsfelt","radio":"Indsæt alternativknap","textField":"Indsæt tekstfelt","textarea":"Indsæt tekstboks","hiddenField":"Indsæt skjult felt","button":"Indsæt knap","select":"Indsæt liste","imageButton":"Indsæt billedknap","notSet":"<intet valgt>","id":"Id","name":"Navn","langDir":"Tekstretning","langDirLtr":"Fra venstre mod højre (LTR)","langDirRtl":"Fra højre mod venstre (RTL)","langCode":"Sprogkode","longDescr":"Udvidet beskrivelse","cssClass":"Typografiark (CSS)","advisoryTitle":"Titel","cssStyle":"Typografi (CSS)","ok":"OK","cancel":"Annullér","close":"Luk","preview":"Forhåndsvisning","resize":"Træk for at skalere","generalTab":"Generelt","advancedTab":"Avanceret","validateNumberFailed":"Værdien er ikke et tal.","confirmNewPage":"Alt indhold, der ikke er blevet gemt, vil gå tabt. Er du sikker på, at du vil indlæse en ny side?","confirmCancel":"Nogle af indstillingerne er blevet ændret. Er du sikker på, at du vil lukke vinduet?","options":"Vis muligheder","target":"Mål","targetNew":"Nyt vindue (_blank)","targetTop":"Øverste vindue (_top)","targetSelf":"Samme vindue (_self)","targetParent":"Samme vindue (_parent)","langDirLTR":"Venstre til højre (LTR)","langDirRTL":"Højre til venstre (RTL)","styles":"Style","cssClasses":"Stylesheetklasser","width":"Bredde","height":"Højde","align":"Justering","alignLeft":"Venstre","alignRight":"Højre","alignCenter":"Centreret","alignJustify":"Lige margener","alignTop":"Øverst","alignMiddle":"Centreret","alignBottom":"Nederst","alignNone":"Ingen","invalidValue":"Ugyldig værdi.","invalidHeight":"Højde skal være et tal.","invalidWidth":"Bredde skal være et tal.","invalidCssLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px eller %).","invalidInlineStyle":"Værdien specificeret for inline style skal indeholde en eller flere elementer med et format som \"name:value\", separeret af semikoloner","cssLengthTooltip":"Indsæt en numerisk værdi i pixel eller nummer med en gyldig CSS værdi (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikke tilgængelig</span>"}};
\ No newline at end of file
+CKEDITOR.lang['da']={"widget":{"move":"Klik og træk for at flytte","label":"%1 widget"},"undo":{"redo":"Annullér fortryd","undo":"Fortryd"},"toolbar":{"toolbarCollapse":"Sammenklap værktøjslinje","toolbarExpand":"Udvid værktøjslinje","toolbarGroups":{"document":"Dokument","clipboard":"Udklipsholder/Fortryd","editing":"Redigering","forms":"Formularer","basicstyles":"Basis styles","paragraph":"Paragraf","links":"Links","insert":"Indsæt","styles":"Typografier","colors":"Farver","tools":"Værktøjer"},"toolbars":"Editors værktøjslinjer"},"table":{"border":"Rammebredde","caption":"Titel","cell":{"menu":"Celle","insertBefore":"Indsæt celle før","insertAfter":"Indsæt celle efter","deleteCell":"Slet celle","merge":"Flet celler","mergeRight":"Flet til højre","mergeDown":"Flet nedad","splitHorizontal":"Del celle vandret","splitVertical":"Del celle lodret","title":"Celleegenskaber","cellType":"Celletype","rowSpan":"Række span (rows span)","colSpan":"Kolonne span (columns span)","wordWrap":"Tekstombrydning","hAlign":"Vandret justering","vAlign":"Lodret justering","alignBaseline":"Grundlinje","bgColor":"Baggrundsfarve","borderColor":"Rammefarve","data":"Data","header":"Hoved","yes":"Ja","no":"Nej","invalidWidth":"Cellebredde skal være et tal.","invalidHeight":"Cellehøjde skal være et tal.","invalidRowSpan":"Række span skal være et heltal.","invalidColSpan":"Kolonne span skal være et heltal.","chooseColor":"Vælg"},"cellPad":"Cellemargen","cellSpace":"Celleafstand","column":{"menu":"Kolonne","insertBefore":"Indsæt kolonne før","insertAfter":"Indsæt kolonne efter","deleteColumn":"Slet kolonne"},"columns":"Kolonner","deleteTable":"Slet tabel","headers":"Hoved","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første række","invalidBorder":"Rammetykkelse skal være et tal.","invalidCellPadding":"Cellemargen skal være et tal.","invalidCellSpacing":"Celleafstand skal være et tal.","invalidCols":"Antallet af kolonner skal være større end 0.","invalidHeight":"Tabelhøjde skal være et tal.","invalidRows":"Antallet af rækker skal være større end 0.","invalidWidth":"Tabelbredde skal være et tal.","menu":"Egenskaber for tabel","row":{"menu":"Række","insertBefore":"Indsæt række før","insertAfter":"Indsæt række efter","deleteRow":"Slet række"},"rows":"Rækker","summary":"Resumé","title":"Egenskaber for tabel","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"Bredde på enhed"},"stylescombo":{"label":"Typografi","panelTitle":"Formattering på stylesheet","panelTitle1":"Block typografi","panelTitle2":"Inline typografi","panelTitle3":"Object typografi"},"specialchar":{"options":"Muligheder for specialkarakterer","title":"Vælg symbol","toolbar":"Indsæt symbol"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis afsnitsmærker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Indsæt som ikke-formateret tekst","title":"Indsæt som ikke-formateret tekst"},"pastefromword":{"confirmCleanup":"Den tekst du forsøger at indsætte ser ud til at komme fra Word. Vil du rense teksten før den indsættes?","error":"Det var ikke muligt at fjerne formatteringen på den indsatte tekst grundet en intern fejl","title":"Indsæt fra Word","toolbar":"Indsæt fra Word"},"maximize":{"maximize":"Maksimér","minimize":"Minimér"},"magicline":{"title":"Indsæt afsnit"},"list":{"bulletedlist":"Punktopstilling","numberedlist":"Talopstilling"},"language":{"button":"Vælg sprog","remove":"Fjern sprog"},"justify":{"block":"Lige margener","center":"Centreret","left":"Venstrestillet","right":"Højrestillet"},"indent":{"indent":"Forøg indrykning","outdent":"Formindsk indrykning"},"image2":{"alt":"Alternativ tekst","btnUpload":"Upload fil til serveren","captioned":"Tekstet billede","captionPlaceholder":"Tekst","infoTab":"Generelt","lockRatio":"Lås størrelsesforhold","menu":"Egenskaber for billede","pathName":"billede","pathNameCaption":"tekst","resetSize":"Nulstil størrelse","resizer":"Klik og træk for at ændre størrelsen","title":"Egenskaber for billede","uploadTab":"Upload","urlMissing":"Kilde på billed-URL mangler","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Indsæt vandret streg"},"format":{"label":"Formatering","panelTitle":"Formatering","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formateret"},"elementspath":{"eleLabel":"Sti på element","eleTitle":"%1 element"},"contextmenu":{"options":"Muligheder for hjælpemenu"},"clipboard":{"copy":"Kopiér","copyError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at kopiere teksten (Ctrl/Cmd+C).","cut":"Klip","cutError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at klippe teksten (Ctrl/Cmd+X).","paste":"Indsæt","pasteArea":"Indsæt område","pasteMsg":"Indsæt i feltet herunder (<STRONG>Ctrl/Cmd+V</STRONG>) og klik på <STRONG>OK</STRONG>.","securityMsg":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Du skal indsætte udklipsholderens indhold i dette vindue igen.","title":"Indsæt"},"button":{"selectedLabel":"%1 (Valgt)"},"blockquote":{"toolbar":"Blokcitat"},"basicstyles":{"bold":"Fed","italic":"Kursiv","strike":"Gennemstreget","subscript":"Sænket skrift","superscript":"Hævet skrift","underline":"Understreget"},"about":{"copy":"Copyright &copy; $1. Alle rettigheder forbeholdes.","dlgTitle":"Om CKEditor","help":"Se $1 for at få hjælp.","moreInfo":"For informationer omkring licens, se venligst vores hjemmeside (på engelsk):","title":"Om CKEditor","userGuide":"CKEditor-brugermanual"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryk ALT 0 for hjælp","browseServer":"Gennemse...","url":"URL","protocol":"Protokol","upload":"Upload","uploadSubmit":"Upload","image":"Indsæt billede","flash":"Indsæt Flash","form":"Indsæt formular","checkbox":"Indsæt afkrydsningsfelt","radio":"Indsæt alternativknap","textField":"Indsæt tekstfelt","textarea":"Indsæt tekstboks","hiddenField":"Indsæt skjult felt","button":"Indsæt knap","select":"Indsæt liste","imageButton":"Indsæt billedknap","notSet":"<intet valgt>","id":"Id","name":"Navn","langDir":"Tekstretning","langDirLtr":"Fra venstre mod højre (LTR)","langDirRtl":"Fra højre mod venstre (RTL)","langCode":"Sprogkode","longDescr":"Udvidet beskrivelse","cssClass":"Typografiark (CSS)","advisoryTitle":"Titel","cssStyle":"Typografi (CSS)","ok":"OK","cancel":"Annullér","close":"Luk","preview":"Forhåndsvisning","resize":"Træk for at skalere","generalTab":"Generelt","advancedTab":"Avanceret","validateNumberFailed":"Værdien er ikke et tal.","confirmNewPage":"Alt indhold, der ikke er blevet gemt, vil gå tabt. Er du sikker på, at du vil indlæse en ny side?","confirmCancel":"Nogle af indstillingerne er blevet ændret. Er du sikker på, at du vil lukke vinduet?","options":"Vis muligheder","target":"Mål","targetNew":"Nyt vindue (_blank)","targetTop":"Øverste vindue (_top)","targetSelf":"Samme vindue (_self)","targetParent":"Samme vindue (_parent)","langDirLTR":"Venstre til højre (LTR)","langDirRTL":"Højre til venstre (RTL)","styles":"Style","cssClasses":"Stylesheetklasser","width":"Bredde","height":"Højde","align":"Justering","alignLeft":"Venstre","alignRight":"Højre","alignCenter":"Centreret","alignJustify":"Lige margener","alignTop":"Øverst","alignMiddle":"Centreret","alignBottom":"Nederst","alignNone":"Ingen","invalidValue":"Ugyldig værdi.","invalidHeight":"Højde skal være et tal.","invalidWidth":"Bredde skal være et tal.","invalidCssLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px eller %).","invalidInlineStyle":"Værdien specificeret for inline style skal indeholde en eller flere elementer med et format som \"name:value\", separeret af semikoloner","cssLengthTooltip":"Indsæt en numerisk værdi i pixel eller nummer med en gyldig CSS værdi (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikke tilgængelig</span>","keyboard":{"8":"Backspace","13":"Retur","16":"Shift","17":"Ctrl","18":"Alt","32":"Mellemrum","35":"End","36":"Home","46":"Slet","224":"Command"},"keyboardShortcut":"Tastatur genvej"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/de-ch.js b/web/core/assets/vendor/ckeditor/lang/de-ch.js
index bf60eaa2f..1c0f8df62 100644
--- a/web/core/assets/vendor/ckeditor/lang/de-ch.js
+++ b/web/core/assets/vendor/ckeditor/lang/de-ch.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['de-ch']={"widget":{"move":"Zum Verschieben anwählen und ziehen","label":"%1 widget"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"table":{"border":"Rahmengrösse","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand aussen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muss eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muss eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand aussen muss eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß grösser als 0 sein..","invalidHeight":"Die Tabellenbreite muss eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß grösser als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"sourcedialog":{"toolbar":"Quellcode","title":"Quellcode"},"sourcearea":{"toolbar":"Quellcode"},"showblocks":{"toolbar":"Blöcke anzeigen"},"removeformat":{"toolbar":"Formatierung entfernen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"magicline":{"title":"Absatz hier einfügen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"image2":{"alt":"Alternativer Text","btnUpload":"Zum Server senden","captioned":"Bild mit Überschrift","captionPlaceholder":"Überschrift","infoTab":"Bildinfo","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","pathName":"Bild","pathNameCaption":"Überschrift","resetSize":"Grösse zurücksetzen","resizer":"Zum Vergrössern auswählen und ziehen","title":"Bild-Eigenschaften","uploadTab":"Hochladen","urlMissing":"Bildquellen-URL fehlt."},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"contextmenu":{"options":"Kontextmenüoptionen"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"blockquote":{"toolbar":"Zitatblock"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schliessen","preview":"Vorschau","resize":"Grösse ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schliessen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>"}};
\ No newline at end of file
+CKEDITOR.lang['de-ch']={"widget":{"move":"Zum Verschieben anwählen und ziehen","label":"%1 widget"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"table":{"border":"Rahmengrösse","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand aussen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muss eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muss eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand aussen muss eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß grösser als 0 sein..","invalidHeight":"Die Tabellenbreite muss eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß grösser als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"sourcedialog":{"toolbar":"Quellcode","title":"Quellcode"},"sourcearea":{"toolbar":"Quellcode"},"showblocks":{"toolbar":"Blöcke anzeigen"},"removeformat":{"toolbar":"Formatierung entfernen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"magicline":{"title":"Absatz hier einfügen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"image2":{"alt":"Alternativer Text","btnUpload":"Zum Server senden","captioned":"Bild mit Überschrift","captionPlaceholder":"Überschrift","infoTab":"Bildinfo","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","pathName":"Bild","pathNameCaption":"Überschrift","resetSize":"Grösse zurücksetzen","resizer":"Zum Vergrössern auswählen und ziehen","title":"Bild-Eigenschaften","uploadTab":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"contextmenu":{"options":"Kontextmenüoptionen"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"blockquote":{"toolbar":"Zitatblock"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schliessen","preview":"Vorschau","resize":"Grösse ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schliessen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>","keyboard":{"8":"Rücktaste","13":"Eingabe","16":"Umschalt","17":"Strg","18":"Alt","32":"Space","35":"Ende","36":"Pos1","46":"Entfernen","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/de.js b/web/core/assets/vendor/ckeditor/lang/de.js
index b88cf7c8d..91c4f5e03 100644
--- a/web/core/assets/vendor/ckeditor/lang/de.js
+++ b/web/core/assets/vendor/ckeditor/lang/de.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['de']={"widget":{"move":"Zum Verschieben anwählen und ziehen","label":"%1 widget"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"table":{"border":"Rahmengröße","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand außen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muß eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muß eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand außen muß eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß größer als 0 sein..","invalidHeight":"Die Tabellenbreite muß eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß größer als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"sourcedialog":{"toolbar":"Quellcode","title":"Quellcode"},"sourcearea":{"toolbar":"Quellcode"},"showblocks":{"toolbar":"Blöcke anzeigen"},"removeformat":{"toolbar":"Formatierung entfernen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"magicline":{"title":"Absatz hier einfügen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"image2":{"alt":"Alternativer Text","btnUpload":"Zum Server senden","captioned":"Bild mit Überschrift","captionPlaceholder":"Überschrift","infoTab":"Bildinfo","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","pathName":"Bild","pathNameCaption":"Überschrift","resetSize":"Größe zurücksetzen","resizer":"Zum Vergrößern auswählen und ziehen","title":"Bild-Eigenschaften","uploadTab":"Hochladen","urlMissing":"Bildquellen-URL fehlt."},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"contextmenu":{"options":"Kontextmenüoptionen"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"blockquote":{"toolbar":"Zitatblock"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schließen","preview":"Vorschau","resize":"Größe ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>"}};
\ No newline at end of file
+CKEDITOR.lang['de']={"widget":{"move":"Zum Verschieben anwählen und ziehen","label":"%1 Steuerelement"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"table":{"border":"Rahmengröße","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand außen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muß eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muß eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand außen muß eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß größer als 0 sein..","invalidHeight":"Die Tabellenbreite muß eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß größer als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"sourcedialog":{"toolbar":"Quellcode","title":"Quellcode"},"sourcearea":{"toolbar":"Quellcode"},"showblocks":{"toolbar":"Blöcke anzeigen"},"removeformat":{"toolbar":"Formatierung entfernen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"magicline":{"title":"Absatz hier einfügen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"image2":{"alt":"Alternativer Text","btnUpload":"Zum Server senden","captioned":"Bild mit Überschrift","captionPlaceholder":"Überschrift","infoTab":"Bildinfo","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","pathName":"Bild","pathNameCaption":"Überschrift","resetSize":"Größe zurücksetzen","resizer":"Zum Vergrößern auswählen und ziehen","title":"Bild-Eigenschaften","uploadTab":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","altMissing":"Alternativer Text fehlt."},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"contextmenu":{"options":"Kontextmenüoptionen"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"blockquote":{"toolbar":"Zitatblock"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schließen","preview":"Vorschau","resize":"Größe ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>","keyboard":{"8":"Rücktaste","13":"Eingabe","16":"Umschalt","17":"Strg","18":"Alt","32":"Leer","35":"Ende","36":"Pos1","46":"Entfernen","224":"Befehl"},"keyboardShortcut":"Tastaturkürzel"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/el.js b/web/core/assets/vendor/ckeditor/lang/el.js
index f0b8a1e19..a5f6f0842 100644
--- a/web/core/assets/vendor/ckeditor/lang/el.js
+++ b/web/core/assets/vendor/ckeditor/lang/el.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['el']={"widget":{"move":"Κάνετε κλικ και σύρετε το ποντίκι για να μετακινήστε","label":"%1 widget"},"undo":{"redo":"Επανάληψη","undo":"Αναίρεση"},"toolbar":{"toolbarCollapse":"Σύμπτυξη Εργαλειοθήκης","toolbarExpand":"Ανάπτυξη Εργαλειοθήκης","toolbarGroups":{"document":"Έγγραφο","clipboard":"Πρόχειρο/Αναίρεση","editing":"Επεξεργασία","forms":"Φόρμες","basicstyles":"Βασικά Στυλ","paragraph":"Παράγραφος","links":"Σύνδεσμοι","insert":"Εισαγωγή","styles":"Στυλ","colors":"Χρώματα","tools":"Εργαλεία"},"toolbars":"Εργαλειοθήκες επεξεργαστή"},"table":{"border":"Πάχος Περιγράμματος","caption":"Λεζάντα","cell":{"menu":"Κελί","insertBefore":"Εισαγωγή Κελιού Πριν","insertAfter":"Εισαγωγή Κελιού Μετά","deleteCell":"Διαγραφή Κελιών","merge":"Ενοποίηση Κελιών","mergeRight":"Συγχώνευση Με Δεξιά","mergeDown":"Συγχώνευση Με Κάτω","splitHorizontal":"Οριζόντια Διαίρεση Κελιού","splitVertical":"Κατακόρυφη Διαίρεση Κελιού","title":"Ιδιότητες Κελιού","cellType":"Τύπος Κελιού","rowSpan":"Εύρος Γραμμών","colSpan":"Εύρος Στηλών","wordWrap":"Αναδίπλωση Λέξεων","hAlign":"Οριζόντια Στοίχιση","vAlign":"Κάθετη Στοίχιση","alignBaseline":"Γραμμή Βάσης","bgColor":"Χρώμα Φόντου","borderColor":"Χρώμα Περιγράμματος","data":"Δεδομένα","header":"Κεφαλίδα","yes":"Ναι","no":"Όχι","invalidWidth":"Το πλάτος του κελιού πρέπει να είναι αριθμός.","invalidHeight":"Το ύψος του κελιού πρέπει να είναι αριθμός.","invalidRowSpan":"Το εύρος των γραμμών πρέπει να είναι ακέραιος αριθμός.","invalidColSpan":"Το εύρος των στηλών πρέπει να είναι ακέραιος αριθμός.","chooseColor":"Επιλέξτε"},"cellPad":"Αναπλήρωση κελιών","cellSpace":"Απόσταση κελιών","column":{"menu":"Στήλη","insertBefore":"Εισαγωγή Στήλης Πριν","insertAfter":"Εισαγωγή Στήλης Μετά","deleteColumn":"Διαγραφή Στηλών"},"columns":"Στήλες","deleteTable":"Διαγραφή Πίνακα","headers":"Κεφαλίδες","headersBoth":"Και τα δύο","headersColumn":"Πρώτη στήλη","headersNone":"Κανένα","headersRow":"Πρώτη Γραμμή","invalidBorder":"Το πάχος του περιγράμματος πρέπει να είναι ένας αριθμός.","invalidCellPadding":"Η αναπλήρωση των κελιών πρέπει να είναι θετικός αριθμός.","invalidCellSpacing":"Η απόσταση μεταξύ των κελιών πρέπει να είναι ένας θετικός αριθμός.","invalidCols":"Ο αριθμός των στηλών πρέπει να είναι μεγαλύτερος από 0.","invalidHeight":"Το ύψος του πίνακα πρέπει να είναι αριθμός.","invalidRows":"Ο αριθμός των σειρών πρέπει να είναι μεγαλύτερος από 0.","invalidWidth":"Το πλάτος του πίνακα πρέπει να είναι ένας αριθμός.","menu":"Ιδιότητες Πίνακα","row":{"menu":"Γραμμή","insertBefore":"Εισαγωγή Γραμμής Πριν","insertAfter":"Εισαγωγή Γραμμής Μετά","deleteRow":"Διαγραφή Γραμμών"},"rows":"Γραμμές","summary":"Περίληψη","title":"Ιδιότητες Πίνακα","toolbar":"Πίνακας","widthPc":"τοις εκατό","widthPx":"pixel","widthUnit":"μονάδα πλάτους"},"stylescombo":{"label":"Μορφές","panelTitle":"Στυλ Μορφοποίησης","panelTitle1":"Στυλ Τμημάτων","panelTitle2":"Στυλ Εν Σειρά","panelTitle3":"Στυλ Αντικειμένων"},"specialchar":{"options":"Επιλογές Ειδικών Χαρακτήρων","title":"Επιλέξτε Έναν Ειδικό Χαρακτήρα","toolbar":"Εισαγωγή Ειδικού Χαρακτήρα"},"sourcedialog":{"toolbar":"Κώδικας","title":"Κώδικας"},"sourcearea":{"toolbar":"Κώδικας"},"showblocks":{"toolbar":"Προβολή Τμημάτων"},"removeformat":{"toolbar":"Εκκαθάριση Μορφοποίησης"},"pastetext":{"button":"Επικόλληση ως απλό κείμενο","title":"Επικόλληση ως απλό κείμενο"},"pastefromword":{"confirmCleanup":"Το κείμενο που επικολλάται φαίνεται να είναι αντιγραμμένο από το Word. Μήπως θα θέλατε να καθαριστεί προτού επικολληθεί;","error":"Δεν ήταν δυνατό να καθαριστούν τα δεδομένα λόγω ενός εσωτερικού σφάλματος","title":"Επικόλληση από το Word","toolbar":"Επικόλληση από το Word"},"maximize":{"maximize":"Μεγιστοποίηση","minimize":"Ελαχιστοποίηση"},"magicline":{"title":"Εισάγετε παράγραφο εδώ"},"list":{"bulletedlist":"Εισαγωγή/Απομάκρυνση Λίστας Κουκκίδων","numberedlist":"Εισαγωγή/Απομάκρυνση Αριθμημένης Λίστας"},"language":{"button":"Θέση γλώσσας","remove":"Αφαίρεση γλώσσας"},"justify":{"block":"Πλήρης Στοίχιση","center":"Στο Κέντρο","left":"Στοίχιση Αριστερά","right":"Στοίχιση Δεξιά"},"indent":{"indent":"Αύξηση Εσοχής","outdent":"Μείωση Εσοχής"},"image2":{"alt":"Εναλλακτικό Κείμενο","btnUpload":"Αποστολή στον Διακομιστή","captioned":"Εικόνα με λεζάντα","captionPlaceholder":"Λεζάντα","infoTab":"Πληροφορίες Εικόνας","lockRatio":"Κλείδωμα Αναλογίας","menu":"Ιδιότητες Εικόνας","pathName":"εικόνα","pathNameCaption":"λεζάντα","resetSize":"Επαναφορά Αρχικού Μεγέθους","resizer":"Κάνετε κλικ και σύρετε το ποντίκι για να αλλάξετε το μέγεθος","title":"Ιδιότητες Εικόνας","uploadTab":"Αποστολή","urlMissing":"Λείπει το πηγαίο URL της εικόνας."},"horizontalrule":{"toolbar":"Εισαγωγή Οριζόντιας Γραμμής"},"format":{"label":"Μορφοποίηση","panelTitle":"Μορφοποίηση Παραγράφου","tag_address":"Διεύθυνση","tag_div":"Κανονική (DIV)","tag_h1":"Κεφαλίδα 1","tag_h2":"Κεφαλίδα 2","tag_h3":"Κεφαλίδα 3","tag_h4":"Κεφαλίδα 4","tag_h5":"Κεφαλίδα 5","tag_h6":"Κεφαλίδα 6","tag_p":"Κανονική","tag_pre":"Προ-μορφοποιημένη"},"elementspath":{"eleLabel":"Διαδρομή Στοιχείων","eleTitle":"Στοιχείο %1"},"contextmenu":{"options":"Επιλογές Αναδυόμενου Μενού"},"clipboard":{"copy":"Αντιγραφή","copyError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αντιγραφής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+C).","cut":"Αποκοπή","cutError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αποκοπής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+X).","paste":"Επικόλληση","pasteArea":"Περιοχή Επικόλλησης","pasteMsg":"Παρακαλώ επικολλήστε στο ακόλουθο κουτί χρησιμοποιώντας το πληκτρολόγιο (<strong>Ctrl/Cmd+V</strong>) και πατήστε OK.","securityMsg":"Λόγων των ρυθμίσεων ασφάλειας του περιηγητή σας, ο επεξεργαστής δεν μπορεί να έχει πρόσβαση στην μνήμη επικόλλησης. Χρειάζεται να επικολλήσετε ξανά σε αυτό το παράθυρο.","title":"Επικόλληση"},"button":{"selectedLabel":"%1 (Επιλεγμένο)"},"blockquote":{"toolbar":"Περιοχή Παράθεσης"},"basicstyles":{"bold":"Έντονη","italic":"Πλάγια","strike":"Διακριτή Διαγραφή","subscript":"Δείκτης","superscript":"Εκθέτης","underline":"Υπογράμμιση"},"about":{"copy":"Πνευματικά δικαιώματα &copy; $1 Με επιφύλαξη παντός δικαιώματος.","dlgTitle":"Περί του CKEditor","help":"Ελέγξτε τις $1 για βοήθεια.","moreInfo":"Για πληροφορίες σχετικές με την άδεια χρήσης, παρακαλούμε επισκεφθείτε την ιστοσελίδα μας:","title":"Περί του CKEditor","userGuide":"Οδηγίες Χρήστη CKEditor"},"editor":"Επεξεργαστής Πλούσιου Κειμένου","editorPanel":"Πίνακας Επεξεργαστή Πλούσιου Κειμένου","common":{"editorHelp":"Πατήστε το ALT 0 για βοήθεια","browseServer":"Εξερεύνηση Διακομιστή","url":"URL","protocol":"Πρωτόκολλο","upload":"Αποστολή","uploadSubmit":"Αποστολή στον Διακομιστή","image":"Εικόνα","flash":"Flash","form":"Φόρμα","checkbox":"Κουτί Επιλογής","radio":"Κουμπί Επιλογής","textField":"Πεδίο Κειμένου","textarea":"Περιοχή Κειμένου","hiddenField":"Κρυφό Πεδίο","button":"Κουμπί","select":"Πεδίο Επιλογής","imageButton":"Κουμπί Εικόνας","notSet":"<δεν έχει ρυθμιστεί>","id":"Id","name":"Όνομα","langDir":"Κατεύθυνση Κειμένου","langDirLtr":"Αριστερά προς Δεξιά (LTR)","langDirRtl":"Δεξιά προς Αριστερά (RTL)","langCode":"Κωδικός Γλώσσας","longDescr":"Αναλυτική Περιγραφή URL","cssClass":"Κλάσεις Φύλλων Στυλ","advisoryTitle":"Ενδεικτικός Τίτλος","cssStyle":"Μορφή Κειμένου","ok":"OK","cancel":"Ακύρωση","close":"Κλείσιμο","preview":"Προεπισκόπηση","resize":"Αλλαγή Μεγέθους","generalTab":"Γενικά","advancedTab":"Για Προχωρημένους","validateNumberFailed":"Αυτή η τιμή δεν είναι αριθμός.","confirmNewPage":"Οι όποιες αλλαγές στο περιεχόμενο θα χαθούν. Είσαστε σίγουροι ότι θέλετε να φορτώσετε μια νέα σελίδα;","confirmCancel":"Μερικές επιλογές έχουν αλλάξει. Είσαστε σίγουροι ότι θέλετε να κλείσετε το παράθυρο διαλόγου;","options":"Επιλογές","target":"Προορισμός","targetNew":"Νέο Παράθυρο (_blank)","targetTop":"Αρχική Περιοχή (_top)","targetSelf":"Ίδιο Παράθυρο (_self)","targetParent":"Γονεϊκό Παράθυρο (_parent)","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","styles":"Μορφή","cssClasses":"Κλάσεις Φύλλων Στυλ","width":"Πλάτος","height":"Ύψος","align":"Στοίχιση","alignLeft":"Αριστερά","alignRight":"Δεξιά","alignCenter":"Κέντρο","alignJustify":"Πλήρης Στοίχιση","alignTop":"Πάνω","alignMiddle":"Μέση","alignBottom":"Κάτω","alignNone":"Χωρίς","invalidValue":"Μη έγκυρη τιμή.","invalidHeight":"Το ύψος πρέπει να είναι ένας αριθμός.","invalidWidth":"Το πλάτος πρέπει να είναι ένας αριθμός.","invalidCssLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","invalidHtmlLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης HTML (px ή %).","invalidInlineStyle":"Η τιμή για το εν σειρά στυλ πρέπει να περιέχει ένα ή περισσότερα ζεύγη με την μορφή \"όνομα: τιμή\" διαχωρισμένα με Ελληνικό ερωτηματικό.","cssLengthTooltip":"Εισάγεται μια τιμή σε pixel ή έναν αριθμό μαζί με μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","unavailable":"%1<span class=\"cke_accessibility\">, δεν είναι διαθέσιμο</span>"}};
\ No newline at end of file
+CKEDITOR.lang['el']={"widget":{"move":"Κάνετε κλικ και σύρετε το ποντίκι για να μετακινήστε","label":"%1 widget"},"undo":{"redo":"Επανάληψη","undo":"Αναίρεση"},"toolbar":{"toolbarCollapse":"Σύμπτυξη Εργαλειοθήκης","toolbarExpand":"Ανάπτυξη Εργαλειοθήκης","toolbarGroups":{"document":"Έγγραφο","clipboard":"Πρόχειρο/Αναίρεση","editing":"Επεξεργασία","forms":"Φόρμες","basicstyles":"Βασικά Στυλ","paragraph":"Παράγραφος","links":"Σύνδεσμοι","insert":"Εισαγωγή","styles":"Στυλ","colors":"Χρώματα","tools":"Εργαλεία"},"toolbars":"Εργαλειοθήκες επεξεργαστή"},"table":{"border":"Πάχος Περιγράμματος","caption":"Λεζάντα","cell":{"menu":"Κελί","insertBefore":"Εισαγωγή Κελιού Πριν","insertAfter":"Εισαγωγή Κελιού Μετά","deleteCell":"Διαγραφή Κελιών","merge":"Ενοποίηση Κελιών","mergeRight":"Συγχώνευση Με Δεξιά","mergeDown":"Συγχώνευση Με Κάτω","splitHorizontal":"Οριζόντια Διαίρεση Κελιού","splitVertical":"Κατακόρυφη Διαίρεση Κελιού","title":"Ιδιότητες Κελιού","cellType":"Τύπος Κελιού","rowSpan":"Εύρος Γραμμών","colSpan":"Εύρος Στηλών","wordWrap":"Αναδίπλωση Λέξεων","hAlign":"Οριζόντια Στοίχιση","vAlign":"Κάθετη Στοίχιση","alignBaseline":"Γραμμή Βάσης","bgColor":"Χρώμα Φόντου","borderColor":"Χρώμα Περιγράμματος","data":"Δεδομένα","header":"Κεφαλίδα","yes":"Ναι","no":"Όχι","invalidWidth":"Το πλάτος του κελιού πρέπει να είναι αριθμός.","invalidHeight":"Το ύψος του κελιού πρέπει να είναι αριθμός.","invalidRowSpan":"Το εύρος των γραμμών πρέπει να είναι ακέραιος αριθμός.","invalidColSpan":"Το εύρος των στηλών πρέπει να είναι ακέραιος αριθμός.","chooseColor":"Επιλέξτε"},"cellPad":"Αναπλήρωση κελιών","cellSpace":"Απόσταση κελιών","column":{"menu":"Στήλη","insertBefore":"Εισαγωγή Στήλης Πριν","insertAfter":"Εισαγωγή Στήλης Μετά","deleteColumn":"Διαγραφή Στηλών"},"columns":"Στήλες","deleteTable":"Διαγραφή Πίνακα","headers":"Κεφαλίδες","headersBoth":"Και τα δύο","headersColumn":"Πρώτη στήλη","headersNone":"Κανένα","headersRow":"Πρώτη Γραμμή","invalidBorder":"Το πάχος του περιγράμματος πρέπει να είναι ένας αριθμός.","invalidCellPadding":"Η αναπλήρωση των κελιών πρέπει να είναι θετικός αριθμός.","invalidCellSpacing":"Η απόσταση μεταξύ των κελιών πρέπει να είναι ένας θετικός αριθμός.","invalidCols":"Ο αριθμός των στηλών πρέπει να είναι μεγαλύτερος από 0.","invalidHeight":"Το ύψος του πίνακα πρέπει να είναι αριθμός.","invalidRows":"Ο αριθμός των σειρών πρέπει να είναι μεγαλύτερος από 0.","invalidWidth":"Το πλάτος του πίνακα πρέπει να είναι ένας αριθμός.","menu":"Ιδιότητες Πίνακα","row":{"menu":"Γραμμή","insertBefore":"Εισαγωγή Γραμμής Πριν","insertAfter":"Εισαγωγή Γραμμής Μετά","deleteRow":"Διαγραφή Γραμμών"},"rows":"Γραμμές","summary":"Περίληψη","title":"Ιδιότητες Πίνακα","toolbar":"Πίνακας","widthPc":"τοις εκατό","widthPx":"pixel","widthUnit":"μονάδα πλάτους"},"stylescombo":{"label":"Μορφές","panelTitle":"Στυλ Μορφοποίησης","panelTitle1":"Στυλ Τμημάτων","panelTitle2":"Στυλ Εν Σειρά","panelTitle3":"Στυλ Αντικειμένων"},"specialchar":{"options":"Επιλογές Ειδικών Χαρακτήρων","title":"Επιλέξτε Έναν Ειδικό Χαρακτήρα","toolbar":"Εισαγωγή Ειδικού Χαρακτήρα"},"sourcedialog":{"toolbar":"Κώδικας","title":"Κώδικας"},"sourcearea":{"toolbar":"Κώδικας"},"showblocks":{"toolbar":"Προβολή Τμημάτων"},"removeformat":{"toolbar":"Εκκαθάριση Μορφοποίησης"},"pastetext":{"button":"Επικόλληση ως απλό κείμενο","title":"Επικόλληση ως απλό κείμενο"},"pastefromword":{"confirmCleanup":"Το κείμενο που επικολλάται φαίνεται να είναι αντιγραμμένο από το Word. Μήπως θα θέλατε να καθαριστεί προτού επικολληθεί;","error":"Δεν ήταν δυνατό να καθαριστούν τα δεδομένα λόγω ενός εσωτερικού σφάλματος","title":"Επικόλληση από το Word","toolbar":"Επικόλληση από το Word"},"maximize":{"maximize":"Μεγιστοποίηση","minimize":"Ελαχιστοποίηση"},"magicline":{"title":"Εισάγετε παράγραφο εδώ"},"list":{"bulletedlist":"Εισαγωγή/Απομάκρυνση Λίστας Κουκκίδων","numberedlist":"Εισαγωγή/Απομάκρυνση Αριθμημένης Λίστας"},"language":{"button":"Θέση γλώσσας","remove":"Αφαίρεση γλώσσας"},"justify":{"block":"Πλήρης Στοίχιση","center":"Στο Κέντρο","left":"Στοίχιση Αριστερά","right":"Στοίχιση Δεξιά"},"indent":{"indent":"Αύξηση Εσοχής","outdent":"Μείωση Εσοχής"},"image2":{"alt":"Εναλλακτικό Κείμενο","btnUpload":"Αποστολή στον Διακομιστή","captioned":"Εικόνα με λεζάντα","captionPlaceholder":"Λεζάντα","infoTab":"Πληροφορίες Εικόνας","lockRatio":"Κλείδωμα Αναλογίας","menu":"Ιδιότητες Εικόνας","pathName":"εικόνα","pathNameCaption":"λεζάντα","resetSize":"Επαναφορά Αρχικού Μεγέθους","resizer":"Κάνετε κλικ και σύρετε το ποντίκι για να αλλάξετε το μέγεθος","title":"Ιδιότητες Εικόνας","uploadTab":"Αποστολή","urlMissing":"Λείπει το πηγαίο URL της εικόνας.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Εισαγωγή Οριζόντιας Γραμμής"},"format":{"label":"Μορφοποίηση","panelTitle":"Μορφοποίηση Παραγράφου","tag_address":"Διεύθυνση","tag_div":"Κανονική (DIV)","tag_h1":"Κεφαλίδα 1","tag_h2":"Κεφαλίδα 2","tag_h3":"Κεφαλίδα 3","tag_h4":"Κεφαλίδα 4","tag_h5":"Κεφαλίδα 5","tag_h6":"Κεφαλίδα 6","tag_p":"Κανονική","tag_pre":"Προ-μορφοποιημένη"},"elementspath":{"eleLabel":"Διαδρομή Στοιχείων","eleTitle":"Στοιχείο %1"},"contextmenu":{"options":"Επιλογές Αναδυόμενου Μενού"},"clipboard":{"copy":"Αντιγραφή","copyError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αντιγραφής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+C).","cut":"Αποκοπή","cutError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αποκοπής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+X).","paste":"Επικόλληση","pasteArea":"Περιοχή Επικόλλησης","pasteMsg":"Παρακαλώ επικολλήστε στο ακόλουθο κουτί χρησιμοποιώντας το πληκτρολόγιο (<strong>Ctrl/Cmd+V</strong>) και πατήστε OK.","securityMsg":"Λόγων των ρυθμίσεων ασφάλειας του περιηγητή σας, ο επεξεργαστής δεν μπορεί να έχει πρόσβαση στην μνήμη επικόλλησης. Χρειάζεται να επικολλήσετε ξανά σε αυτό το παράθυρο.","title":"Επικόλληση"},"button":{"selectedLabel":"%1 (Επιλεγμένο)"},"blockquote":{"toolbar":"Περιοχή Παράθεσης"},"basicstyles":{"bold":"Έντονη","italic":"Πλάγια","strike":"Διακριτή Διαγραφή","subscript":"Δείκτης","superscript":"Εκθέτης","underline":"Υπογράμμιση"},"about":{"copy":"Πνευματικά δικαιώματα &copy; $1 Με επιφύλαξη παντός δικαιώματος.","dlgTitle":"Περί του CKEditor","help":"Ελέγξτε τις $1 για βοήθεια.","moreInfo":"Για πληροφορίες σχετικές με την άδεια χρήσης, παρακαλούμε επισκεφθείτε την ιστοσελίδα μας:","title":"Περί του CKEditor","userGuide":"Οδηγίες Χρήστη CKEditor"},"editor":"Επεξεργαστής Πλούσιου Κειμένου","editorPanel":"Πίνακας Επεξεργαστή Πλούσιου Κειμένου","common":{"editorHelp":"Πατήστε το ALT 0 για βοήθεια","browseServer":"Εξερεύνηση Διακομιστή","url":"URL","protocol":"Πρωτόκολλο","upload":"Αποστολή","uploadSubmit":"Αποστολή στον Διακομιστή","image":"Εικόνα","flash":"Flash","form":"Φόρμα","checkbox":"Κουτί Επιλογής","radio":"Κουμπί Επιλογής","textField":"Πεδίο Κειμένου","textarea":"Περιοχή Κειμένου","hiddenField":"Κρυφό Πεδίο","button":"Κουμπί","select":"Πεδίο Επιλογής","imageButton":"Κουμπί Εικόνας","notSet":"<δεν έχει ρυθμιστεί>","id":"Id","name":"Όνομα","langDir":"Κατεύθυνση Κειμένου","langDirLtr":"Αριστερά προς Δεξιά (LTR)","langDirRtl":"Δεξιά προς Αριστερά (RTL)","langCode":"Κωδικός Γλώσσας","longDescr":"Αναλυτική Περιγραφή URL","cssClass":"Κλάσεις Φύλλων Στυλ","advisoryTitle":"Ενδεικτικός Τίτλος","cssStyle":"Μορφή Κειμένου","ok":"OK","cancel":"Ακύρωση","close":"Κλείσιμο","preview":"Προεπισκόπηση","resize":"Αλλαγή Μεγέθους","generalTab":"Γενικά","advancedTab":"Για Προχωρημένους","validateNumberFailed":"Αυτή η τιμή δεν είναι αριθμός.","confirmNewPage":"Οι όποιες αλλαγές στο περιεχόμενο θα χαθούν. Είσαστε σίγουροι ότι θέλετε να φορτώσετε μια νέα σελίδα;","confirmCancel":"Μερικές επιλογές έχουν αλλάξει. Είσαστε σίγουροι ότι θέλετε να κλείσετε το παράθυρο διαλόγου;","options":"Επιλογές","target":"Προορισμός","targetNew":"Νέο Παράθυρο (_blank)","targetTop":"Αρχική Περιοχή (_top)","targetSelf":"Ίδιο Παράθυρο (_self)","targetParent":"Γονεϊκό Παράθυρο (_parent)","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","styles":"Μορφή","cssClasses":"Κλάσεις Φύλλων Στυλ","width":"Πλάτος","height":"Ύψος","align":"Στοίχιση","alignLeft":"Αριστερά","alignRight":"Δεξιά","alignCenter":"Κέντρο","alignJustify":"Πλήρης Στοίχιση","alignTop":"Πάνω","alignMiddle":"Μέση","alignBottom":"Κάτω","alignNone":"Χωρίς","invalidValue":"Μη έγκυρη τιμή.","invalidHeight":"Το ύψος πρέπει να είναι ένας αριθμός.","invalidWidth":"Το πλάτος πρέπει να είναι ένας αριθμός.","invalidCssLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","invalidHtmlLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης HTML (px ή %).","invalidInlineStyle":"Η τιμή για το εν σειρά στυλ πρέπει να περιέχει ένα ή περισσότερα ζεύγη με την μορφή \"όνομα: τιμή\" διαχωρισμένα με Ελληνικό ερωτηματικό.","cssLengthTooltip":"Εισάγεται μια τιμή σε pixel ή έναν αριθμό μαζί με μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","unavailable":"%1<span class=\"cke_accessibility\">, δεν είναι διαθέσιμο</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/en-au.js b/web/core/assets/vendor/ckeditor/lang/en-au.js
index 7fc42457c..18f8335d1 100644
--- a/web/core/assets/vendor/ckeditor/lang/en-au.js
+++ b/web/core/assets/vendor/ckeditor/lang/en-au.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en-au']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['en-au']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/en-ca.js b/web/core/assets/vendor/ckeditor/lang/en-ca.js
index 64ee502fe..84c196ad3 100644
--- a/web/core/assets/vendor/ckeditor/lang/en-ca.js
+++ b/web/core/assets/vendor/ckeditor/lang/en-ca.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en-ca']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['en-ca']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/en-gb.js b/web/core/assets/vendor/ckeditor/lang/en-gb.js
index 5bb5fb31b..7b358c9e1 100644
--- a/web/core/assets/vendor/ckeditor/lang/en-gb.js
+++ b/web/core/assets/vendor/ckeditor/lang/en-gb.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en-gb']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximise","minimize":"Minimise"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Drag to resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialogue window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['en-gb']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximise","minimize":"Minimise"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Drag to resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialogue window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/en.js b/web/core/assets/vendor/ckeditor/lang/en.js
index 6282b4bb0..40c544da5 100644
--- a/web/core/assets/vendor/ckeditor/lang/en.js
+++ b/web/core/assets/vendor/ckeditor/lang/en.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Center","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","alignLeft":"Left","alignRight":"Right","alignCenter":"Center","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['en']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Center","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","alignLeft":"Left","alignRight":"Right","alignCenter":"Center","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/eo.js b/web/core/assets/vendor/ckeditor/lang/eo.js
index 67e00d071..e5caeeb99 100644
--- a/web/core/assets/vendor/ckeditor/lang/eo.js
+++ b/web/core/assets/vendor/ckeditor/lang/eo.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['eo']={"widget":{"move":"klaki kaj treni por movi","label":"%1 widget"},"undo":{"redo":"Refari","undo":"Malfari"},"toolbar":{"toolbarCollapse":"Faldi la ilbreton","toolbarExpand":"Malfaldi la ilbreton","toolbarGroups":{"document":"Dokumento","clipboard":"Poŝo/Malfari","editing":"Redaktado","forms":"Formularoj","basicstyles":"Bazaj stiloj","paragraph":"Paragrafo","links":"Ligiloj","insert":"Enmeti","styles":"Stiloj","colors":"Koloroj","tools":"Iloj"},"toolbars":"Ilobretoj de la redaktilo"},"table":{"border":"Bordero","caption":"Tabeltitolo","cell":{"menu":"Ĉelo","insertBefore":"Enmeti Ĉelon Antaŭ","insertAfter":"Enmeti Ĉelon Post","deleteCell":"Forigi la Ĉelojn","merge":"Kunfandi la Ĉelojn","mergeRight":"Kunfandi dekstren","mergeDown":"Kunfandi malsupren ","splitHorizontal":"Horizontale dividi","splitVertical":"Vertikale dividi","title":"Ĉelatributoj","cellType":"Ĉeltipo","rowSpan":"Kunfando de linioj","colSpan":"Kunfando de kolumnoj","wordWrap":"Cezuro","hAlign":"Horizontala ĝisrandigo","vAlign":"Vertikala ĝisrandigo","alignBaseline":"Malsupro de la teksto","bgColor":"Fonkoloro","borderColor":"Borderkoloro","data":"Datenoj","header":"Supra paĝotitolo","yes":"Jes","no":"No","invalidWidth":"Ĉellarĝo devas esti nombro.","invalidHeight":"Ĉelalto devas esti nombro.","invalidRowSpan":"Kunfando de linioj devas esti entjera nombro.","invalidColSpan":"Kunfando de kolumnoj devas esti entjera nombro.","chooseColor":"Elektu"},"cellPad":"Interna Marĝeno de la ĉeloj","cellSpace":"Spaco inter la Ĉeloj","column":{"menu":"Kolumno","insertBefore":"Enmeti kolumnon antaŭ","insertAfter":"Enmeti kolumnon post","deleteColumn":"Forigi Kolumnojn"},"columns":"Kolumnoj","deleteTable":"Forigi Tabelon","headers":"Supraj Paĝotitoloj","headersBoth":"Ambaŭ","headersColumn":"Unua kolumno","headersNone":"Neniu","headersRow":"Unua linio","invalidBorder":"La bordergrando devas esti nombro.","invalidCellPadding":"La interna marĝeno en la ĉeloj devas esti pozitiva nombro.","invalidCellSpacing":"La spaco inter la ĉeloj devas esti pozitiva nombro.","invalidCols":"La nombro de la kolumnoj devas superi 0.","invalidHeight":"La tabelalto devas esti nombro.","invalidRows":"La nombro de la linioj devas superi 0.","invalidWidth":"La tabellarĝo devas esti nombro.","menu":"Atributoj de Tabelo","row":{"menu":"Linio","insertBefore":"Enmeti linion antaŭ","insertAfter":"Enmeti linion post","deleteRow":"Forigi Liniojn"},"rows":"Linioj","summary":"Resumo","title":"Atributoj de Tabelo","toolbar":"Tabelo","widthPc":"elcentoj","widthPx":"Rastrumeroj","widthUnit":"unuo de larĝo"},"stylescombo":{"label":"Stiloj","panelTitle":"Stiloj pri enpaĝigo","panelTitle1":"Stiloj de blokoj","panelTitle2":"Enliniaj Stiloj","panelTitle3":"Stiloj de objektoj"},"specialchar":{"options":"Opcioj pri Specialaj Signoj","title":"Selekti Specialan Signon","toolbar":"Enmeti Specialan Signon"},"sourcedialog":{"toolbar":"Fonto","title":"Fonto"},"sourcearea":{"toolbar":"Fonto"},"showblocks":{"toolbar":"Montri la blokojn"},"removeformat":{"toolbar":"Forigi Formaton"},"pastetext":{"button":"Interglui kiel platan tekston","title":"Interglui kiel platan tekston"},"pastefromword":{"confirmCleanup":"La teksto, kiun vi volas interglui, ŝajnas esti kopiita el Word. Ĉu vi deziras purigi ĝin antaŭ intergluo?","error":"Ne eblis purigi la intergluitajn datenojn pro interna eraro","title":"Interglui el Word","toolbar":"Interglui el Word"},"maximize":{"maximize":"Pligrandigi","minimize":"Malgrandigi"},"magicline":{"title":"Enmeti paragrafon ĉi-tien"},"list":{"bulletedlist":"Bula Listo","numberedlist":"Numera Listo"},"language":{"button":"Instali lingvon","remove":"Forigi lingvon"},"justify":{"block":"Ĝisrandigi Ambaŭflanke","center":"Centrigi","left":"Ĝisrandigi maldekstren","right":"Ĝisrandigi dekstren"},"indent":{"indent":"Pligrandigi Krommarĝenon","outdent":"Malpligrandigi Krommarĝenon"},"image2":{"alt":"Anstataŭiga Teksto","btnUpload":"Sendu al Servilo","captioned":"Bildo kun apudskribo","captionPlaceholder":"Apudskribo","infoTab":"Informoj pri Bildo","lockRatio":"Konservi Proporcion","menu":"Atributoj de Bildo","pathName":"bildo","pathNameCaption":"apudskribo","resetSize":"Origina Grando","resizer":"Kliki kaj treni por ŝanĝi la grandon","title":"Atributoj de Bildo","uploadTab":"Alŝuti","urlMissing":"La fontretadreso de la bildo mankas."},"horizontalrule":{"toolbar":"Enmeti Horizontalan Linion"},"format":{"label":"Formato","panelTitle":"ParagrafFormato","tag_address":"Adreso","tag_div":"Normala (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normala","tag_pre":"Formatita"},"elementspath":{"eleLabel":"Vojo al Elementoj","eleTitle":"%1 elementoj"},"contextmenu":{"options":"Opcioj de Kunteksta Menuo"},"clipboard":{"copy":"Kopii","copyError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-C).","cut":"Eltondi","cutError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-X).","paste":"Interglui","pasteArea":"Intergluoareo","pasteMsg":"Bonvolu glui la tekston en la jenan areon per uzado de la klavaro (<strong>Ctrl/Cmd+V</strong>) kaj premu OK","securityMsg":"Pro la sekurecagordo de via TTT-legilo, la redaktilo ne povas rekte atingi viajn datenojn en la poŝo. Bonvolu denove interglui la datenojn en tiun fenestron.","title":"Interglui"},"button":{"selectedLabel":"%1 (Selektita)"},"blockquote":{"toolbar":"Citaĵo"},"basicstyles":{"bold":"Grasa","italic":"Kursiva","strike":"Trastreko","subscript":"Suba indico","superscript":"Supra indico","underline":"Substreko"},"about":{"copy":"Copyright &copy; $1. Ĉiuj rajtoj rezervitaj.","dlgTitle":"Pri CKEditor","help":"Kontroli $1 por helpo.","moreInfo":"Por informoj pri licenco, bonvolu viziti nian retpaĝaron:","title":"Pri CKEditor","userGuide":"CKEditor Uzindikoj"},"editor":"RiĉTeksta Redaktilo","editorPanel":"Panelo de la RiĉTeksta Redaktilo","common":{"editorHelp":"Premu ALT 0 por helpilo","browseServer":"Foliumi en la Servilo","url":"URL","protocol":"Protokolo","upload":"Alŝuti","uploadSubmit":"Sendu al Servilo","image":"Bildo","flash":"Flaŝo","form":"Formularo","checkbox":"Markobutono","radio":"Radiobutono","textField":"Teksta kampo","textarea":"Teksta Areo","hiddenField":"Kaŝita Kampo","button":"Butono","select":"Elekta Kampo","imageButton":"Bildbutono","notSet":"<Defaŭlta>","id":"Id","name":"Nomo","langDir":"Skribdirekto","langDirLtr":"De maldekstro dekstren (LTR)","langDirRtl":"De dekstro maldekstren (RTL)","langCode":"Lingva Kodo","longDescr":"URL de Longa Priskribo","cssClass":"Klasoj de Stilfolioj","advisoryTitle":"Priskriba Titolo","cssStyle":"Stilo","ok":"Akcepti","cancel":"Rezigni","close":"Fermi","preview":"Vidigi Aspekton","resize":"Movigi por ŝanĝi la grandon","generalTab":"Ĝenerala","advancedTab":"Speciala","validateNumberFailed":"Tiu valoro ne estas nombro.","confirmNewPage":"La neregistritaj ŝanĝoj estas perdotaj. Ĉu vi certas, ke vi volas ŝargi novan paĝon?","confirmCancel":"Iuj opcioj esta ŝanĝitaj. Ĉu vi certas, ke vi volas fermi la dialogon?","options":"Opcioj","target":"Celo","targetNew":"Nova Fenestro (_blank)","targetTop":"Supra Fenestro (_top)","targetSelf":"Sama Fenestro (_self)","targetParent":"Patra Fenestro (_parent)","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","styles":"Stilo","cssClasses":"Stilfoliaj Klasoj","width":"Larĝo","height":"Alto","align":"Ĝisrandigo","alignLeft":"Maldekstre","alignRight":"Dekstre","alignCenter":"Centre","alignJustify":"Ĝisrandigi Ambaŭflanke","alignTop":"Supre","alignMiddle":"Centre","alignBottom":"Malsupre","alignNone":"Neniu","invalidValue":"Nevalida Valoro","invalidHeight":"Alto devas esti nombro.","invalidWidth":"Larĝo devas esti nombro.","invalidCssLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida CSSmezurunuo (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida HTMLmezurunuo (px or %).","invalidInlineStyle":"La valoro indikita por la enlinia stilo devas konsisti el unu aŭ pluraj elementoj kun la formato de \"nomo : valoro\", apartigitaj per punktokomoj.","cssLengthTooltip":"Entajpu nombron por rastrumera valoro aŭ nombron kun valida CSSunuo (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, nehavebla</span>"}};
\ No newline at end of file
+CKEDITOR.lang['eo']={"widget":{"move":"klaki kaj treni por movi","label":"%1 widget"},"undo":{"redo":"Refari","undo":"Malfari"},"toolbar":{"toolbarCollapse":"Faldi la ilbreton","toolbarExpand":"Malfaldi la ilbreton","toolbarGroups":{"document":"Dokumento","clipboard":"Poŝo/Malfari","editing":"Redaktado","forms":"Formularoj","basicstyles":"Bazaj stiloj","paragraph":"Paragrafo","links":"Ligiloj","insert":"Enmeti","styles":"Stiloj","colors":"Koloroj","tools":"Iloj"},"toolbars":"Ilobretoj de la redaktilo"},"table":{"border":"Bordero","caption":"Tabeltitolo","cell":{"menu":"Ĉelo","insertBefore":"Enmeti Ĉelon Antaŭ","insertAfter":"Enmeti Ĉelon Post","deleteCell":"Forigi la Ĉelojn","merge":"Kunfandi la Ĉelojn","mergeRight":"Kunfandi dekstren","mergeDown":"Kunfandi malsupren ","splitHorizontal":"Horizontale dividi","splitVertical":"Vertikale dividi","title":"Ĉelatributoj","cellType":"Ĉeltipo","rowSpan":"Kunfando de linioj","colSpan":"Kunfando de kolumnoj","wordWrap":"Cezuro","hAlign":"Horizontala ĝisrandigo","vAlign":"Vertikala ĝisrandigo","alignBaseline":"Malsupro de la teksto","bgColor":"Fonkoloro","borderColor":"Borderkoloro","data":"Datenoj","header":"Supra paĝotitolo","yes":"Jes","no":"No","invalidWidth":"Ĉellarĝo devas esti nombro.","invalidHeight":"Ĉelalto devas esti nombro.","invalidRowSpan":"Kunfando de linioj devas esti entjera nombro.","invalidColSpan":"Kunfando de kolumnoj devas esti entjera nombro.","chooseColor":"Elektu"},"cellPad":"Interna Marĝeno de la ĉeloj","cellSpace":"Spaco inter la Ĉeloj","column":{"menu":"Kolumno","insertBefore":"Enmeti kolumnon antaŭ","insertAfter":"Enmeti kolumnon post","deleteColumn":"Forigi Kolumnojn"},"columns":"Kolumnoj","deleteTable":"Forigi Tabelon","headers":"Supraj Paĝotitoloj","headersBoth":"Ambaŭ","headersColumn":"Unua kolumno","headersNone":"Neniu","headersRow":"Unua linio","invalidBorder":"La bordergrando devas esti nombro.","invalidCellPadding":"La interna marĝeno en la ĉeloj devas esti pozitiva nombro.","invalidCellSpacing":"La spaco inter la ĉeloj devas esti pozitiva nombro.","invalidCols":"La nombro de la kolumnoj devas superi 0.","invalidHeight":"La tabelalto devas esti nombro.","invalidRows":"La nombro de la linioj devas superi 0.","invalidWidth":"La tabellarĝo devas esti nombro.","menu":"Atributoj de Tabelo","row":{"menu":"Linio","insertBefore":"Enmeti linion antaŭ","insertAfter":"Enmeti linion post","deleteRow":"Forigi Liniojn"},"rows":"Linioj","summary":"Resumo","title":"Atributoj de Tabelo","toolbar":"Tabelo","widthPc":"elcentoj","widthPx":"Rastrumeroj","widthUnit":"unuo de larĝo"},"stylescombo":{"label":"Stiloj","panelTitle":"Stiloj pri enpaĝigo","panelTitle1":"Stiloj de blokoj","panelTitle2":"Enliniaj Stiloj","panelTitle3":"Stiloj de objektoj"},"specialchar":{"options":"Opcioj pri Specialaj Signoj","title":"Selekti Specialan Signon","toolbar":"Enmeti Specialan Signon"},"sourcedialog":{"toolbar":"Fonto","title":"Fonto"},"sourcearea":{"toolbar":"Fonto"},"showblocks":{"toolbar":"Montri la blokojn"},"removeformat":{"toolbar":"Forigi Formaton"},"pastetext":{"button":"Interglui kiel platan tekston","title":"Interglui kiel platan tekston"},"pastefromword":{"confirmCleanup":"La teksto, kiun vi volas interglui, ŝajnas esti kopiita el Word. Ĉu vi deziras purigi ĝin antaŭ intergluo?","error":"Ne eblis purigi la intergluitajn datenojn pro interna eraro","title":"Interglui el Word","toolbar":"Interglui el Word"},"maximize":{"maximize":"Pligrandigi","minimize":"Malgrandigi"},"magicline":{"title":"Enmeti paragrafon ĉi-tien"},"list":{"bulletedlist":"Bula Listo","numberedlist":"Numera Listo"},"language":{"button":"Instali lingvon","remove":"Forigi lingvon"},"justify":{"block":"Ĝisrandigi Ambaŭflanke","center":"Centrigi","left":"Ĝisrandigi maldekstren","right":"Ĝisrandigi dekstren"},"indent":{"indent":"Pligrandigi Krommarĝenon","outdent":"Malpligrandigi Krommarĝenon"},"image2":{"alt":"Anstataŭiga Teksto","btnUpload":"Sendu al Servilo","captioned":"Bildo kun apudskribo","captionPlaceholder":"Apudskribo","infoTab":"Informoj pri Bildo","lockRatio":"Konservi Proporcion","menu":"Atributoj de Bildo","pathName":"bildo","pathNameCaption":"apudskribo","resetSize":"Origina Grando","resizer":"Kliki kaj treni por ŝanĝi la grandon","title":"Atributoj de Bildo","uploadTab":"Alŝuti","urlMissing":"La fontretadreso de la bildo mankas.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Enmeti Horizontalan Linion"},"format":{"label":"Formato","panelTitle":"ParagrafFormato","tag_address":"Adreso","tag_div":"Normala (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normala","tag_pre":"Formatita"},"elementspath":{"eleLabel":"Vojo al Elementoj","eleTitle":"%1 elementoj"},"contextmenu":{"options":"Opcioj de Kunteksta Menuo"},"clipboard":{"copy":"Kopii","copyError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-C).","cut":"Eltondi","cutError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-X).","paste":"Interglui","pasteArea":"Intergluoareo","pasteMsg":"Bonvolu glui la tekston en la jenan areon per uzado de la klavaro (<strong>Ctrl/Cmd+V</strong>) kaj premu OK","securityMsg":"Pro la sekurecagordo de via TTT-legilo, la redaktilo ne povas rekte atingi viajn datenojn en la poŝo. Bonvolu denove interglui la datenojn en tiun fenestron.","title":"Interglui"},"button":{"selectedLabel":"%1 (Selektita)"},"blockquote":{"toolbar":"Citaĵo"},"basicstyles":{"bold":"Grasa","italic":"Kursiva","strike":"Trastreko","subscript":"Suba indico","superscript":"Supra indico","underline":"Substreko"},"about":{"copy":"Copyright &copy; $1. Ĉiuj rajtoj rezervitaj.","dlgTitle":"Pri CKEditor","help":"Kontroli $1 por helpo.","moreInfo":"Por informoj pri licenco, bonvolu viziti nian retpaĝaron:","title":"Pri CKEditor","userGuide":"CKEditor Uzindikoj"},"editor":"RiĉTeksta Redaktilo","editorPanel":"Panelo de la RiĉTeksta Redaktilo","common":{"editorHelp":"Premu ALT 0 por helpilo","browseServer":"Foliumi en la Servilo","url":"URL","protocol":"Protokolo","upload":"Alŝuti","uploadSubmit":"Sendu al Servilo","image":"Bildo","flash":"Flaŝo","form":"Formularo","checkbox":"Markobutono","radio":"Radiobutono","textField":"Teksta kampo","textarea":"Teksta Areo","hiddenField":"Kaŝita Kampo","button":"Butono","select":"Elekta Kampo","imageButton":"Bildbutono","notSet":"<Defaŭlta>","id":"Id","name":"Nomo","langDir":"Skribdirekto","langDirLtr":"De maldekstro dekstren (LTR)","langDirRtl":"De dekstro maldekstren (RTL)","langCode":"Lingva Kodo","longDescr":"URL de Longa Priskribo","cssClass":"Klasoj de Stilfolioj","advisoryTitle":"Priskriba Titolo","cssStyle":"Stilo","ok":"Akcepti","cancel":"Rezigni","close":"Fermi","preview":"Vidigi Aspekton","resize":"Movigi por ŝanĝi la grandon","generalTab":"Ĝenerala","advancedTab":"Speciala","validateNumberFailed":"Tiu valoro ne estas nombro.","confirmNewPage":"La neregistritaj ŝanĝoj estas perdotaj. Ĉu vi certas, ke vi volas ŝargi novan paĝon?","confirmCancel":"Iuj opcioj esta ŝanĝitaj. Ĉu vi certas, ke vi volas fermi la dialogon?","options":"Opcioj","target":"Celo","targetNew":"Nova Fenestro (_blank)","targetTop":"Supra Fenestro (_top)","targetSelf":"Sama Fenestro (_self)","targetParent":"Patra Fenestro (_parent)","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","styles":"Stilo","cssClasses":"Stilfoliaj Klasoj","width":"Larĝo","height":"Alto","align":"Ĝisrandigo","alignLeft":"Maldekstre","alignRight":"Dekstre","alignCenter":"Centre","alignJustify":"Ĝisrandigi Ambaŭflanke","alignTop":"Supre","alignMiddle":"Centre","alignBottom":"Malsupre","alignNone":"Neniu","invalidValue":"Nevalida Valoro","invalidHeight":"Alto devas esti nombro.","invalidWidth":"Larĝo devas esti nombro.","invalidCssLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida CSSmezurunuo (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida HTMLmezurunuo (px or %).","invalidInlineStyle":"La valoro indikita por la enlinia stilo devas konsisti el unu aŭ pluraj elementoj kun la formato de \"nomo : valoro\", apartigitaj per punktokomoj.","cssLengthTooltip":"Entajpu nombron por rastrumera valoro aŭ nombron kun valida CSSunuo (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, nehavebla</span>","keyboard":{"8":"Retropaŝo","13":"Enigi","16":"Registrumo","17":"Stirklavo","18":"Alt-klavo","32":"Space","35":"Fino","36":"Hejmo","46":"Forigi","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/es.js b/web/core/assets/vendor/ckeditor/lang/es.js
index fb93ca267..be66432d7 100644
--- a/web/core/assets/vendor/ckeditor/lang/es.js
+++ b/web/core/assets/vendor/ckeditor/lang/es.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['es']={"widget":{"move":"Dar clic y arrastrar para mover","label":"reproductor %1"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"toolbar":{"toolbarCollapse":"Contraer barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/Deshacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Barras de herramientas del editor"},"table":{"border":"Tamaño de Borde","caption":"Título","cell":{"menu":"Celda","insertBefore":"Insertar celda a la izquierda","insertAfter":"Insertar celda a la derecha","deleteCell":"Eliminar Celdas","merge":"Combinar Celdas","mergeRight":"Combinar a la derecha","mergeDown":"Combinar hacia abajo","splitHorizontal":"Dividir la celda horizontalmente","splitVertical":"Dividir la celda verticalmente","title":"Propiedades de celda","cellType":"Tipo de Celda","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Ajustar al contenido","hAlign":"Alineación Horizontal","vAlign":"Alineación Vertical","alignBaseline":"Linea de base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Sí","no":"No","invalidWidth":"La anchura de celda debe ser un número.","invalidHeight":"La altura de celda debe ser un número.","invalidRowSpan":"La expansión de filas debe ser un número entero.","invalidColSpan":"La expansión de columnas debe ser un número entero.","chooseColor":"Elegir"},"cellPad":"Esp. interior","cellSpace":"Esp. e/celdas","column":{"menu":"Columna","insertBefore":"Insertar columna a la izquierda","insertAfter":"Insertar columna a la derecha","deleteColumn":"Eliminar Columnas"},"columns":"Columnas","deleteTable":"Eliminar Tabla","headers":"Encabezados","headersBoth":"Ambas","headersColumn":"Primera columna","headersNone":"Ninguno","headersRow":"Primera fila","invalidBorder":"El tamaño del borde debe ser un número.","invalidCellPadding":"El espaciado interior debe ser un número.","invalidCellSpacing":"El espaciado entre celdas debe ser un número.","invalidCols":"El número de columnas debe ser un número mayor que 0.","invalidHeight":"La altura de tabla debe ser un número.","invalidRows":"El número de filas debe ser un número mayor que 0.","invalidWidth":"La anchura de tabla debe ser un número.","menu":"Propiedades de Tabla","row":{"menu":"Fila","insertBefore":"Insertar fila en la parte superior","insertAfter":"Insertar fila en la parte inferior","deleteRow":"Eliminar Filas"},"rows":"Filas","summary":"Síntesis","title":"Propiedades de Tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"unidad de la anchura"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos para formatear","panelTitle1":"Estilos de párrafo","panelTitle2":"Estilos de carácter","panelTitle3":"Estilos de objeto"},"specialchar":{"options":"Opciones de caracteres especiales","title":"Seleccione un caracter especial","toolbar":"Insertar Caracter Especial"},"sourcedialog":{"toolbar":"Fuente HTML","title":"Fuente HTML"},"sourcearea":{"toolbar":"Fuente HTML"},"showblocks":{"toolbar":"Mostrar bloques"},"removeformat":{"toolbar":"Eliminar Formato"},"pastetext":{"button":"Pegar como Texto Plano","title":"Pegar como Texto Plano"},"pastefromword":{"confirmCleanup":"El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?","error":"No ha sido posible limpiar los datos debido a un error interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Insertar párrafo aquí"},"list":{"bulletedlist":"Viñetas","numberedlist":"Numeración"},"language":{"button":"Fijar lenguaje","remove":"Quitar lenguaje"},"justify":{"block":"Justificado","center":"Centrar","left":"Alinear a Izquierda","right":"Alinear a Derecha"},"indent":{"indent":"Aumentar Sangría","outdent":"Disminuir Sangría"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar al Servidor","captioned":"Imagen subtitulada","captionPlaceholder":"Leyenda","infoTab":"Información de Imagen","lockRatio":"Proporcional","menu":"Propiedades de Imagen","pathName":"image","pathNameCaption":"subtítulo","resetSize":"Tamaño Original","resizer":"Dar clic y arrastrar para cambiar tamaño","title":"Propiedades de Imagen","uploadTab":"Cargar","urlMissing":"Debe indicar la URL de la imagen."},"horizontalrule":{"toolbar":"Insertar Línea Horizontal"},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Dirección","tag_div":"Normal (DIV)","tag_h1":"Encabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Con formato"},"elementspath":{"eleLabel":"Ruta de los elementos","eleTitle":"%1 elemento"},"contextmenu":{"options":"Opciones del menú contextual"},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl/Cmd+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.","securityMsg":"Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles.\r\nEs necesario que lo pegue de nuevo en esta ventana.","title":"Pegar"},"button":{"selectedLabel":"%1 (Seleccionado)"},"blockquote":{"toolbar":"Cita"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subrayado"},"about":{"copy":"Copyright &copy; $1. Todos los derechos reservados.","dlgTitle":"Acerca de CKEditor","help":"Lea la  $1 para resolver sus dudas.","moreInfo":"Para información de licencia, por favor visite nuestro sitio web:","title":"Acerca de CKEditor","userGuide":"Guía de usuario de CKEditor"},"editor":"Editor de texto enriquecido","editorPanel":"Panel del Editor de Texto Enriquecido","common":{"editorHelp":"Pulse ALT 0 para ayuda","browseServer":"Ver Servidor","url":"URL","protocol":"Protocolo","upload":"Cargar","uploadSubmit":"Enviar al Servidor","image":"Imagen","flash":"Flash","form":"Formulario","checkbox":"Casilla de Verificación","radio":"Botones de Radio","textField":"Campo de Texto","textarea":"Area de Texto","hiddenField":"Campo Oculto","button":"Botón","select":"Campo de Selección","imageButton":"Botón Imagen","notSet":"<No definido>","id":"Id","name":"Nombre","langDir":"Orientación","langDirLtr":"Izquierda a Derecha (LTR)","langDirRtl":"Derecha a Izquierda (RTL)","langCode":"Cód. de idioma","longDescr":"Descripción larga URL","cssClass":"Clases de hojas de estilo","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Cerrar","preview":"Previsualización","resize":"Arrastre para redimensionar","generalTab":"General","advancedTab":"Avanzado","validateNumberFailed":"El valor no es un número.","confirmNewPage":"Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?","confirmCancel":"Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?","options":"Opciones","target":"Destino","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana principal (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana padre (_parent)","langDirLTR":"Izquierda a derecha (LTR)","langDirRTL":"Derecha a izquierda (RTL)","styles":"Estilos","cssClasses":"Clase de la hoja de estilos","width":"Anchura","height":"Altura","align":"Alineación","alignLeft":"Izquierda","alignRight":"Derecha","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Tope","alignMiddle":"Centro","alignBottom":"Pie","alignNone":"Ninguno","invalidValue":"Valor no válido","invalidHeight":"Altura debe ser un número.","invalidWidth":"Anchura debe ser un número.","invalidCssLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).","invalidInlineStyle":"El valor especificado para el estilo debe consistir en uno o más pares con el formato \"nombre: valor\", separados por punto y coma.","cssLengthTooltip":"Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>"}};
\ No newline at end of file
+CKEDITOR.lang['es']={"widget":{"move":"Dar clic y arrastrar para mover","label":"reproductor %1"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"toolbar":{"toolbarCollapse":"Contraer barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/Deshacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Barras de herramientas del editor"},"table":{"border":"Tamaño de Borde","caption":"Título","cell":{"menu":"Celda","insertBefore":"Insertar celda a la izquierda","insertAfter":"Insertar celda a la derecha","deleteCell":"Eliminar Celdas","merge":"Combinar Celdas","mergeRight":"Combinar a la derecha","mergeDown":"Combinar hacia abajo","splitHorizontal":"Dividir la celda horizontalmente","splitVertical":"Dividir la celda verticalmente","title":"Propiedades de celda","cellType":"Tipo de Celda","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Ajustar al contenido","hAlign":"Alineación Horizontal","vAlign":"Alineación Vertical","alignBaseline":"Linea de base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Sí","no":"No","invalidWidth":"La anchura de celda debe ser un número.","invalidHeight":"La altura de celda debe ser un número.","invalidRowSpan":"La expansión de filas debe ser un número entero.","invalidColSpan":"La expansión de columnas debe ser un número entero.","chooseColor":"Elegir"},"cellPad":"Esp. interior","cellSpace":"Esp. e/celdas","column":{"menu":"Columna","insertBefore":"Insertar columna a la izquierda","insertAfter":"Insertar columna a la derecha","deleteColumn":"Eliminar Columnas"},"columns":"Columnas","deleteTable":"Eliminar Tabla","headers":"Encabezados","headersBoth":"Ambas","headersColumn":"Primera columna","headersNone":"Ninguno","headersRow":"Primera fila","invalidBorder":"El tamaño del borde debe ser un número.","invalidCellPadding":"El espaciado interior debe ser un número.","invalidCellSpacing":"El espaciado entre celdas debe ser un número.","invalidCols":"El número de columnas debe ser un número mayor que 0.","invalidHeight":"La altura de tabla debe ser un número.","invalidRows":"El número de filas debe ser un número mayor que 0.","invalidWidth":"La anchura de tabla debe ser un número.","menu":"Propiedades de Tabla","row":{"menu":"Fila","insertBefore":"Insertar fila en la parte superior","insertAfter":"Insertar fila en la parte inferior","deleteRow":"Eliminar Filas"},"rows":"Filas","summary":"Síntesis","title":"Propiedades de Tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"unidad de la anchura"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos para formatear","panelTitle1":"Estilos de párrafo","panelTitle2":"Estilos de carácter","panelTitle3":"Estilos de objeto"},"specialchar":{"options":"Opciones de caracteres especiales","title":"Seleccione un caracter especial","toolbar":"Insertar Caracter Especial"},"sourcedialog":{"toolbar":"Fuente HTML","title":"Fuente HTML"},"sourcearea":{"toolbar":"Fuente HTML"},"showblocks":{"toolbar":"Mostrar bloques"},"removeformat":{"toolbar":"Eliminar Formato"},"pastetext":{"button":"Pegar como Texto Plano","title":"Pegar como Texto Plano"},"pastefromword":{"confirmCleanup":"El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?","error":"No ha sido posible limpiar los datos debido a un error interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Insertar párrafo aquí"},"list":{"bulletedlist":"Viñetas","numberedlist":"Numeración"},"language":{"button":"Fijar lenguaje","remove":"Quitar lenguaje"},"justify":{"block":"Justificado","center":"Centrar","left":"Alinear a Izquierda","right":"Alinear a Derecha"},"indent":{"indent":"Aumentar Sangría","outdent":"Disminuir Sangría"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar al Servidor","captioned":"Imagen subtitulada","captionPlaceholder":"Leyenda","infoTab":"Información de Imagen","lockRatio":"Proporcional","menu":"Propiedades de Imagen","pathName":"image","pathNameCaption":"subtítulo","resetSize":"Tamaño Original","resizer":"Dar clic y arrastrar para cambiar tamaño","title":"Propiedades de Imagen","uploadTab":"Cargar","urlMissing":"Debe indicar la URL de la imagen.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Insertar Línea Horizontal"},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Dirección","tag_div":"Normal (DIV)","tag_h1":"Encabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Con formato"},"elementspath":{"eleLabel":"Ruta de los elementos","eleTitle":"%1 elemento"},"contextmenu":{"options":"Opciones del menú contextual"},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl/Cmd+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.","securityMsg":"Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles.\r\nEs necesario que lo pegue de nuevo en esta ventana.","title":"Pegar"},"button":{"selectedLabel":"%1 (Seleccionado)"},"blockquote":{"toolbar":"Cita"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subrayado"},"about":{"copy":"Copyright &copy; $1. Todos los derechos reservados.","dlgTitle":"Acerca de CKEditor","help":"Lea la  $1 para resolver sus dudas.","moreInfo":"Para información de licencia, por favor visite nuestro sitio web:","title":"Acerca de CKEditor","userGuide":"Guía de usuario de CKEditor"},"editor":"Editor de texto enriquecido","editorPanel":"Panel del Editor de Texto Enriquecido","common":{"editorHelp":"Pulse ALT 0 para ayuda","browseServer":"Ver Servidor","url":"URL","protocol":"Protocolo","upload":"Cargar","uploadSubmit":"Enviar al Servidor","image":"Imagen","flash":"Flash","form":"Formulario","checkbox":"Casilla de Verificación","radio":"Botones de Radio","textField":"Campo de Texto","textarea":"Area de Texto","hiddenField":"Campo Oculto","button":"Botón","select":"Campo de Selección","imageButton":"Botón Imagen","notSet":"<No definido>","id":"Id","name":"Nombre","langDir":"Orientación","langDirLtr":"Izquierda a Derecha (LTR)","langDirRtl":"Derecha a Izquierda (RTL)","langCode":"Cód. de idioma","longDescr":"Descripción larga URL","cssClass":"Clases de hojas de estilo","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Cerrar","preview":"Previsualización","resize":"Arrastre para redimensionar","generalTab":"General","advancedTab":"Avanzado","validateNumberFailed":"El valor no es un número.","confirmNewPage":"Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?","confirmCancel":"Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?","options":"Opciones","target":"Destino","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana principal (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana padre (_parent)","langDirLTR":"Izquierda a derecha (LTR)","langDirRTL":"Derecha a izquierda (RTL)","styles":"Estilos","cssClasses":"Clase de la hoja de estilos","width":"Anchura","height":"Altura","align":"Alineación","alignLeft":"Izquierda","alignRight":"Derecha","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Tope","alignMiddle":"Centro","alignBottom":"Pie","alignNone":"Ninguno","invalidValue":"Valor no válido","invalidHeight":"Altura debe ser un número.","invalidWidth":"Anchura debe ser un número.","invalidCssLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).","invalidInlineStyle":"El valor especificado para el estilo debe consistir en uno o más pares con el formato \"nombre: valor\", separados por punto y coma.","cssLengthTooltip":"Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retroceso","13":"Ingresar","16":"Mayús.","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Inicio","46":"Suprimir","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/et.js b/web/core/assets/vendor/ckeditor/lang/et.js
index bb697a6c8..0fa5727aa 100644
--- a/web/core/assets/vendor/ckeditor/lang/et.js
+++ b/web/core/assets/vendor/ckeditor/lang/et.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['et']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Toimingu kordamine","undo":"Tagasivõtmine"},"toolbar":{"toolbarCollapse":"Tööriistariba peitmine","toolbarExpand":"Tööriistariba näitamine","toolbarGroups":{"document":"Dokument","clipboard":"Lõikelaud/tagasivõtmine","editing":"Muutmine","forms":"Vormid","basicstyles":"Põhistiilid","paragraph":"Lõik","links":"Lingid","insert":"Sisesta","styles":"Stiilid","colors":"Värvid","tools":"Tööriistad"},"toolbars":"Redaktori tööriistaribad"},"table":{"border":"Joone suurus","caption":"Tabeli tiitel","cell":{"menu":"Lahter","insertBefore":"Sisesta lahter enne","insertAfter":"Sisesta lahter peale","deleteCell":"Eemalda lahtrid","merge":"Ühenda lahtrid","mergeRight":"Ühenda paremale","mergeDown":"Ühenda alla","splitHorizontal":"Poolita lahter horisontaalselt","splitVertical":"Poolita lahter vertikaalselt","title":"Lahtri omadused","cellType":"Lahtri liik","rowSpan":"Ridade vahe","colSpan":"Tulpade vahe","wordWrap":"Sõnade murdmine","hAlign":"Horisontaalne joondus","vAlign":"Vertikaalne joondus","alignBaseline":"Baasjoon","bgColor":"Tausta värv","borderColor":"Äärise värv","data":"Andmed","header":"Päis","yes":"Jah","no":"Ei","invalidWidth":"Lahtri laius peab olema number.","invalidHeight":"Lahtri kõrgus peab olema number.","invalidRowSpan":"Ridade vahe peab olema täisarv.","invalidColSpan":"Tulpade vahe peab olema täisarv.","chooseColor":"Vali"},"cellPad":"Lahtri täidis","cellSpace":"Lahtri vahe","column":{"menu":"Veerg","insertBefore":"Sisesta veerg enne","insertAfter":"Sisesta veerg peale","deleteColumn":"Eemalda veerud"},"columns":"Veerud","deleteTable":"Kustuta tabel","headers":"Päised","headersBoth":"Mõlemad","headersColumn":"Esimene tulp","headersNone":"Puudub","headersRow":"Esimene rida","invalidBorder":"Äärise suurus peab olema number.","invalidCellPadding":"Lahtrite polsterdus (padding) peab olema positiivne arv.","invalidCellSpacing":"Lahtrite vahe peab olema positiivne arv.","invalidCols":"Tulpade arv peab olema nullist suurem.","invalidHeight":"Tabeli kõrgus peab olema number.","invalidRows":"Ridade arv peab olema nullist suurem.","invalidWidth":"Tabeli laius peab olema number.","menu":"Tabeli omadused","row":{"menu":"Rida","insertBefore":"Sisesta rida enne","insertAfter":"Sisesta rida peale","deleteRow":"Eemalda read"},"rows":"Read","summary":"Kokkuvõte","title":"Tabeli omadused","toolbar":"Tabel","widthPc":"protsenti","widthPx":"pikslit","widthUnit":"laiuse ühik"},"stylescombo":{"label":"Stiil","panelTitle":"Vormindusstiilid","panelTitle1":"Blokkstiilid","panelTitle2":"Reasisesed stiilid","panelTitle3":"Objektistiilid"},"specialchar":{"options":"Erimärkide valikud","title":"Erimärgi valimine","toolbar":"Erimärgi sisestamine"},"sourcedialog":{"toolbar":"Lähtekood","title":"Lähtekood"},"sourcearea":{"toolbar":"Lähtekood"},"showblocks":{"toolbar":"Blokkide näitamine"},"removeformat":{"toolbar":"Vormingu eemaldamine"},"pastetext":{"button":"Asetamine tavalise tekstina","title":"Asetamine tavalise tekstina"},"pastefromword":{"confirmCleanup":"Tekst, mida tahad asetada näib pärinevat Wordist. Kas tahad selle enne asetamist puhastada?","error":"Asetatud andmete puhastamine ei olnud sisemise vea tõttu võimalik","title":"Asetamine Wordist","toolbar":"Asetamine Wordist"},"maximize":{"maximize":"Maksimeerimine","minimize":"Minimeerimine"},"magicline":{"title":"Sisesta siia lõigu tekst"},"list":{"bulletedlist":"Punktloend","numberedlist":"Numberloend"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Rööpjoondus","center":"Keskjoondus","left":"Vasakjoondus","right":"Paremjoondus"},"indent":{"indent":"Taande suurendamine","outdent":"Taande vähendamine"},"image2":{"alt":"Alternatiivne tekst","btnUpload":"Saada serverisse","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Pildi info","lockRatio":"Lukusta kuvasuhe","menu":"Pildi omadused","pathName":"image","pathNameCaption":"caption","resetSize":"Lähtesta suurus","resizer":"Click and drag to resize","title":"Pildi omadused","uploadTab":"Lae üles","urlMissing":"Pildi lähte-URL on puudu."},"horizontalrule":{"toolbar":"Horisontaaljoone sisestamine"},"format":{"label":"Vorming","panelTitle":"Vorming","tag_address":"Aadress","tag_div":"Tavaline (DIV)","tag_h1":"Pealkiri 1","tag_h2":"Pealkiri 2","tag_h3":"Pealkiri 3","tag_h4":"Pealkiri 4","tag_h5":"Pealkiri 5","tag_h6":"Pealkiri 6","tag_p":"Tavaline","tag_pre":"Vormindatud"},"elementspath":{"eleLabel":"Elementide asukoht","eleTitle":"%1 element"},"contextmenu":{"options":"Kontekstimenüü valikud"},"clipboard":{"copy":"Kopeeri","copyError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+C).","cut":"Lõika","cutError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+X).","paste":"Aseta","pasteArea":"Asetamise ala","pasteMsg":"Palun aseta tekst järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl/Cmd+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.","securityMsg":"Sinu veebisirvija turvaseadete tõttu ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead asetama need uuesti siia aknasse.","title":"Asetamine"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blokktsitaat"},"basicstyles":{"bold":"Paks","italic":"Kursiiv","strike":"Läbijoonitud","subscript":"Allindeks","superscript":"Ülaindeks","underline":"Allajoonitud"},"about":{"copy":"Copyright &copy; $1. Kõik õigused kaitstud.","dlgTitle":"CKEditorist","help":"Abi jaoks vaata $1.","moreInfo":"Litsentsi andmed leiab meie veebilehelt:","title":"CKEditorist","userGuide":"CKEditori kasutusjuhendit"},"editor":"Rikkalik tekstiredaktor","editorPanel":"Rikkaliku tekstiredaktori paneel","common":{"editorHelp":"Abi saamiseks vajuta ALT 0","browseServer":"Serveri sirvimine","url":"URL","protocol":"Protokoll","upload":"Laadi üles","uploadSubmit":"Saada serverisse","image":"Pilt","flash":"Flash","form":"Vorm","checkbox":"Märkeruut","radio":"Raadionupp","textField":"Tekstilahter","textarea":"Tekstiala","hiddenField":"Varjatud lahter","button":"Nupp","select":"Valiklahter","imageButton":"Piltnupp","notSet":"<määramata>","id":"ID","name":"Nimi","langDir":"Keele suund","langDirLtr":"Vasakult paremale (LTR)","langDirRtl":"Paremalt vasakule (RTL)","langCode":"Keele kood","longDescr":"Pikk kirjeldus URL","cssClass":"Stiilistiku klassid","advisoryTitle":"Soovituslik pealkiri","cssStyle":"Laad","ok":"Olgu","cancel":"Loobu","close":"Sulge","preview":"Eelvaade","resize":"Suuruse muutmiseks lohista","generalTab":"Üldine","advancedTab":"Täpsemalt","validateNumberFailed":"See väärtus pole number.","confirmNewPage":"Kõik salvestamata muudatused lähevad kaotsi. Kas oled kindel, et tahad laadida uue lehe?","confirmCancel":"Mõned valikud on muudetud. Kas oled kindel, et tahad dialoogi sulgeda?","options":"Valikud","target":"Sihtkoht","targetNew":"Uus aken (_blank)","targetTop":"Kõige ülemine aken (_top)","targetSelf":"Sama aken (_self)","targetParent":"Vanemaken (_parent)","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","styles":"Stiili","cssClasses":"Stiililehe klassid","width":"Laius","height":"Kõrgus","align":"Joondus","alignLeft":"Vasak","alignRight":"Paremale","alignCenter":"Kesk","alignJustify":"Rööpjoondus","alignTop":"Üles","alignMiddle":"Keskele","alignBottom":"Alla","alignNone":"None","invalidValue":"Vigane väärtus.","invalidHeight":"Kõrgus peab olema number.","invalidWidth":"Laius peab olema number.","invalidCssLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv CSS ühikuga (px, %, in, cm, mm, em, ex, pt või pc) või ilma.","invalidHtmlLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv HTML ühikuga (px või %) või ilma.","invalidInlineStyle":"Reasisese stiili määrangud peavad koosnema paarisväärtustest (tuples), mis on semikoolonitega eraldatult järgnevas vormingus: \"nimi : väärtus\".","cssLengthTooltip":"Sisesta väärtus pikslites või number koos sobiva CSS-i ühikuga (px, %, in, cm, mm, em, ex, pt või pc).","unavailable":"%1<span class=\"cke_accessibility\">, pole saadaval</span>"}};
\ No newline at end of file
+CKEDITOR.lang['et']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Toimingu kordamine","undo":"Tagasivõtmine"},"toolbar":{"toolbarCollapse":"Tööriistariba peitmine","toolbarExpand":"Tööriistariba näitamine","toolbarGroups":{"document":"Dokument","clipboard":"Lõikelaud/tagasivõtmine","editing":"Muutmine","forms":"Vormid","basicstyles":"Põhistiilid","paragraph":"Lõik","links":"Lingid","insert":"Sisesta","styles":"Stiilid","colors":"Värvid","tools":"Tööriistad"},"toolbars":"Redaktori tööriistaribad"},"table":{"border":"Joone suurus","caption":"Tabeli tiitel","cell":{"menu":"Lahter","insertBefore":"Sisesta lahter enne","insertAfter":"Sisesta lahter peale","deleteCell":"Eemalda lahtrid","merge":"Ühenda lahtrid","mergeRight":"Ühenda paremale","mergeDown":"Ühenda alla","splitHorizontal":"Poolita lahter horisontaalselt","splitVertical":"Poolita lahter vertikaalselt","title":"Lahtri omadused","cellType":"Lahtri liik","rowSpan":"Ridade vahe","colSpan":"Tulpade vahe","wordWrap":"Sõnade murdmine","hAlign":"Horisontaalne joondus","vAlign":"Vertikaalne joondus","alignBaseline":"Baasjoon","bgColor":"Tausta värv","borderColor":"Äärise värv","data":"Andmed","header":"Päis","yes":"Jah","no":"Ei","invalidWidth":"Lahtri laius peab olema number.","invalidHeight":"Lahtri kõrgus peab olema number.","invalidRowSpan":"Ridade vahe peab olema täisarv.","invalidColSpan":"Tulpade vahe peab olema täisarv.","chooseColor":"Vali"},"cellPad":"Lahtri täidis","cellSpace":"Lahtri vahe","column":{"menu":"Veerg","insertBefore":"Sisesta veerg enne","insertAfter":"Sisesta veerg peale","deleteColumn":"Eemalda veerud"},"columns":"Veerud","deleteTable":"Kustuta tabel","headers":"Päised","headersBoth":"Mõlemad","headersColumn":"Esimene tulp","headersNone":"Puudub","headersRow":"Esimene rida","invalidBorder":"Äärise suurus peab olema number.","invalidCellPadding":"Lahtrite polsterdus (padding) peab olema positiivne arv.","invalidCellSpacing":"Lahtrite vahe peab olema positiivne arv.","invalidCols":"Tulpade arv peab olema nullist suurem.","invalidHeight":"Tabeli kõrgus peab olema number.","invalidRows":"Ridade arv peab olema nullist suurem.","invalidWidth":"Tabeli laius peab olema number.","menu":"Tabeli omadused","row":{"menu":"Rida","insertBefore":"Sisesta rida enne","insertAfter":"Sisesta rida peale","deleteRow":"Eemalda read"},"rows":"Read","summary":"Kokkuvõte","title":"Tabeli omadused","toolbar":"Tabel","widthPc":"protsenti","widthPx":"pikslit","widthUnit":"laiuse ühik"},"stylescombo":{"label":"Stiil","panelTitle":"Vormindusstiilid","panelTitle1":"Blokkstiilid","panelTitle2":"Reasisesed stiilid","panelTitle3":"Objektistiilid"},"specialchar":{"options":"Erimärkide valikud","title":"Erimärgi valimine","toolbar":"Erimärgi sisestamine"},"sourcedialog":{"toolbar":"Lähtekood","title":"Lähtekood"},"sourcearea":{"toolbar":"Lähtekood"},"showblocks":{"toolbar":"Blokkide näitamine"},"removeformat":{"toolbar":"Vormingu eemaldamine"},"pastetext":{"button":"Asetamine tavalise tekstina","title":"Asetamine tavalise tekstina"},"pastefromword":{"confirmCleanup":"Tekst, mida tahad asetada näib pärinevat Wordist. Kas tahad selle enne asetamist puhastada?","error":"Asetatud andmete puhastamine ei olnud sisemise vea tõttu võimalik","title":"Asetamine Wordist","toolbar":"Asetamine Wordist"},"maximize":{"maximize":"Maksimeerimine","minimize":"Minimeerimine"},"magicline":{"title":"Sisesta siia lõigu tekst"},"list":{"bulletedlist":"Punktloend","numberedlist":"Numberloend"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Rööpjoondus","center":"Keskjoondus","left":"Vasakjoondus","right":"Paremjoondus"},"indent":{"indent":"Taande suurendamine","outdent":"Taande vähendamine"},"image2":{"alt":"Alternatiivne tekst","btnUpload":"Saada serverisse","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Pildi info","lockRatio":"Lukusta kuvasuhe","menu":"Pildi omadused","pathName":"image","pathNameCaption":"caption","resetSize":"Lähtesta suurus","resizer":"Click and drag to resize","title":"Pildi omadused","uploadTab":"Lae üles","urlMissing":"Pildi lähte-URL on puudu.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Horisontaaljoone sisestamine"},"format":{"label":"Vorming","panelTitle":"Vorming","tag_address":"Aadress","tag_div":"Tavaline (DIV)","tag_h1":"Pealkiri 1","tag_h2":"Pealkiri 2","tag_h3":"Pealkiri 3","tag_h4":"Pealkiri 4","tag_h5":"Pealkiri 5","tag_h6":"Pealkiri 6","tag_p":"Tavaline","tag_pre":"Vormindatud"},"elementspath":{"eleLabel":"Elementide asukoht","eleTitle":"%1 element"},"contextmenu":{"options":"Kontekstimenüü valikud"},"clipboard":{"copy":"Kopeeri","copyError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+C).","cut":"Lõika","cutError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+X).","paste":"Aseta","pasteArea":"Asetamise ala","pasteMsg":"Palun aseta tekst järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl/Cmd+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.","securityMsg":"Sinu veebisirvija turvaseadete tõttu ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead asetama need uuesti siia aknasse.","title":"Asetamine"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blokktsitaat"},"basicstyles":{"bold":"Paks","italic":"Kursiiv","strike":"Läbijoonitud","subscript":"Allindeks","superscript":"Ülaindeks","underline":"Allajoonitud"},"about":{"copy":"Copyright &copy; $1. Kõik õigused kaitstud.","dlgTitle":"CKEditorist","help":"Abi jaoks vaata $1.","moreInfo":"Litsentsi andmed leiab meie veebilehelt:","title":"CKEditorist","userGuide":"CKEditori kasutusjuhendit"},"editor":"Rikkalik tekstiredaktor","editorPanel":"Rikkaliku tekstiredaktori paneel","common":{"editorHelp":"Abi saamiseks vajuta ALT 0","browseServer":"Serveri sirvimine","url":"URL","protocol":"Protokoll","upload":"Laadi üles","uploadSubmit":"Saada serverisse","image":"Pilt","flash":"Flash","form":"Vorm","checkbox":"Märkeruut","radio":"Raadionupp","textField":"Tekstilahter","textarea":"Tekstiala","hiddenField":"Varjatud lahter","button":"Nupp","select":"Valiklahter","imageButton":"Piltnupp","notSet":"<määramata>","id":"ID","name":"Nimi","langDir":"Keele suund","langDirLtr":"Vasakult paremale (LTR)","langDirRtl":"Paremalt vasakule (RTL)","langCode":"Keele kood","longDescr":"Pikk kirjeldus URL","cssClass":"Stiilistiku klassid","advisoryTitle":"Soovituslik pealkiri","cssStyle":"Laad","ok":"Olgu","cancel":"Loobu","close":"Sulge","preview":"Eelvaade","resize":"Suuruse muutmiseks lohista","generalTab":"Üldine","advancedTab":"Täpsemalt","validateNumberFailed":"See väärtus pole number.","confirmNewPage":"Kõik salvestamata muudatused lähevad kaotsi. Kas oled kindel, et tahad laadida uue lehe?","confirmCancel":"Mõned valikud on muudetud. Kas oled kindel, et tahad dialoogi sulgeda?","options":"Valikud","target":"Sihtkoht","targetNew":"Uus aken (_blank)","targetTop":"Kõige ülemine aken (_top)","targetSelf":"Sama aken (_self)","targetParent":"Vanemaken (_parent)","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","styles":"Stiili","cssClasses":"Stiililehe klassid","width":"Laius","height":"Kõrgus","align":"Joondus","alignLeft":"Vasak","alignRight":"Paremale","alignCenter":"Kesk","alignJustify":"Rööpjoondus","alignTop":"Üles","alignMiddle":"Keskele","alignBottom":"Alla","alignNone":"None","invalidValue":"Vigane väärtus.","invalidHeight":"Kõrgus peab olema number.","invalidWidth":"Laius peab olema number.","invalidCssLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv CSS ühikuga (px, %, in, cm, mm, em, ex, pt või pc) või ilma.","invalidHtmlLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv HTML ühikuga (px või %) või ilma.","invalidInlineStyle":"Reasisese stiili määrangud peavad koosnema paarisväärtustest (tuples), mis on semikoolonitega eraldatult järgnevas vormingus: \"nimi : väärtus\".","cssLengthTooltip":"Sisesta väärtus pikslites või number koos sobiva CSS-i ühikuga (px, %, in, cm, mm, em, ex, pt või pc).","unavailable":"%1<span class=\"cke_accessibility\">, pole saadaval</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/eu.js b/web/core/assets/vendor/ckeditor/lang/eu.js
index 904defb4a..d6d4d1682 100644
--- a/web/core/assets/vendor/ckeditor/lang/eu.js
+++ b/web/core/assets/vendor/ckeditor/lang/eu.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['eu']={"widget":{"move":"Klikatu eta arrastatu lekuz aldatzeko","label":"%1 widget"},"undo":{"redo":"Berregin","undo":"Desegin"},"toolbar":{"toolbarCollapse":"Tolestu tresna-barra","toolbarExpand":"Zabaldu tresna-barra","toolbarGroups":{"document":"Dokumentua","clipboard":"Arbela/Desegin","editing":"Editatu","forms":"Formularioak","basicstyles":"Oinarrizko estiloak","paragraph":"Paragrafoa","links":"Estekak","insert":"Txertatu","styles":"Estiloak","colors":"Koloreak","tools":"Tresnak"},"toolbars":"Editorearen tresna-barrak"},"table":{"border":"Ertzaren zabalera","caption":"Epigrafea","cell":{"menu":"Gelaxka","insertBefore":"Txertatu gelaxka aurretik","insertAfter":"Txertatu gelaxka ondoren","deleteCell":"Ezabatu gelaxkak","merge":"Batu gelaxkak","mergeRight":"Batu eskuinetara","mergeDown":"Batu behera","splitHorizontal":"Banatu gelaxka horizontalki","splitVertical":"Banatu gelaxka bertikalki","title":"Gelaxkaren propietateak","cellType":"Gelaxka-mota","rowSpan":"Errenkaden hedadura","colSpan":"Zutabeen hedadura","wordWrap":"Itzulbira","hAlign":"Lerrokatze horizontala","vAlign":"Lerrokatze bertikala","alignBaseline":"Oinarri-lerroan","bgColor":"Atzeko planoaren kolorea","borderColor":"Ertzaren kolorea","data":"Data","header":"Goiburua","yes":"Bai","no":"Ez","invalidWidth":"Gelaxkaren zabalera zenbaki bat izan behar da.","invalidHeight":"Gelaxkaren altuera zenbaki bat izan behar da.","invalidRowSpan":"Errenkaden hedadura zenbaki osoa izan behar da.","invalidColSpan":"Zutabeen hedadura zenbaki osoa izan behar da.","chooseColor":"Aukeratu"},"cellPad":"Gelaxken betegarria","cellSpace":"Gelaxka arteko tartea","column":{"menu":"Zutabea","insertBefore":"Txertatu zutabea aurretik","insertAfter":"Txertatu zutabea ondoren","deleteColumn":"Ezabatu zutabeak"},"columns":"Zutabeak","deleteTable":"Ezabatu taula","headers":"Goiburuak","headersBoth":"Biak","headersColumn":"Lehen zutabea","headersNone":"Bat ere ez","headersRow":"Lehen errenkada","invalidBorder":"Ertzaren tamaina zenbaki bat izan behar da.","invalidCellPadding":"Gelaxken betegarria zenbaki bat izan behar da.","invalidCellSpacing":"Gelaxka arteko tartea zenbaki bat izan behar da.","invalidCols":"Zutabe kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidHeight":"Taularen altuera zenbaki bat izan behar da.","invalidRows":"Errenkada kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidWidth":"Taularen zabalera zenbaki bat izan behar da.","menu":"Taularen propietateak","row":{"menu":"Errenkada","insertBefore":"Txertatu errenkada aurretik","insertAfter":"Txertatu errenkada ondoren","deleteRow":"Ezabatu errenkadak"},"rows":"Errenkadak","summary":"Laburpena","title":"Taularen propietateak","toolbar":"Taula","widthPc":"ehuneko","widthPx":"pixel","widthUnit":"zabalera unitatea"},"stylescombo":{"label":"Estiloak","panelTitle":"Formatu estiloak","panelTitle1":"Bloke estiloak","panelTitle2":"Lineako estiloak","panelTitle3":"Objektu estiloak"},"specialchar":{"options":"Karaktere berezien aukerak","title":"Hautatu karaktere berezia","toolbar":"Txertatu karaktere berezia"},"sourcedialog":{"toolbar":"Iturburua","title":"Iturburua"},"sourcearea":{"toolbar":"Iturburua"},"showblocks":{"toolbar":"Erakutsi blokeak"},"removeformat":{"toolbar":"Kendu formatua"},"pastetext":{"button":"Itsatsi testu arrunta bezala","title":"Itsatsi testu arrunta bezala"},"pastefromword":{"confirmCleanup":"Itsatsi nahi duzun testua Word-etik kopiatua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?","error":"Barne-errore bat dela eta ezin izan da itsatsitako testua garbitu","title":"Itsatsi Word-etik","toolbar":"Itsatsi Word-etik"},"maximize":{"maximize":"Maximizatu","minimize":"Minimizatu"},"magicline":{"title":"Txertatu paragrafoa hemen"},"list":{"bulletedlist":"Buletdun Zerrenda","numberedlist":"Zenbakidun Zerrenda"},"language":{"button":"Ezarri hizkuntza","remove":"Kendu hizkuntza"},"justify":{"block":"Justifikatu","center":"Erdian","left":"Lerrokatu ezkerrean","right":"Lerrokatu eskuinean"},"indent":{"indent":"Handitu koska","outdent":"Txikitu koska"},"image2":{"alt":"Ordezko testua","btnUpload":"Bidali zerbitzarira","captioned":"Argazki oina","captionPlaceholder":"Argazki oina","infoTab":"Irudiaren informazioa","lockRatio":"Blokeatu erlazioa","menu":"Irudiaren propietateak","pathName":"Irudia","pathNameCaption":"Argazki oina","resetSize":"Berrezarri tamaina","resizer":"Klikatu eta arrastatu tamainaz aldatzeko","title":"Irudiaren propietateak","uploadTab":"Kargatu","urlMissing":"Irudiaren iturburuaren URLa falta da."},"horizontalrule":{"toolbar":"Txertatu marra horizontala"},"format":{"label":"Formatua","panelTitle":"Paragrafoaren formatua","tag_address":"Helbidea","tag_div":"Normala (DIV)","tag_h1":"Izenburua 1","tag_h2":"Izenburua 2","tag_h3":"Izenburua 3","tag_h4":"Izenburua 4","tag_h5":"Izenburua 5","tag_h6":"Izenburua 6","tag_p":"Normala","tag_pre":"Formatuduna"},"elementspath":{"eleLabel":"Elementuen bidea","eleTitle":"%1 elementua"},"contextmenu":{"options":"Testuinguru-menuaren aukerak"},"clipboard":{"copy":"Kopiatu","copyError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki kopiatzea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+C).","cut":"Ebaki","cutError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki moztea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+X).","paste":"Itsatsi","pasteArea":"Itsasteko area","pasteMsg":"Mesedez teklatua erabiliz (<strong>Ctrl/Cmd+V</strong>) ondorengo eremuan testua itsatsi eta sakatu <strong>Ados</strong>.","securityMsg":"Nabigatzailearen segurtasun ezarpenak direla eta, editoreak ezin du arbela zuzenean erabili. Leiho honetan berriro itsatsi behar duzu.","title":"Itsatsi"},"button":{"selectedLabel":"%1 (hautatuta)"},"blockquote":{"toolbar":"Aipamen blokea"},"basicstyles":{"bold":"Lodia","italic":"Etzana","strike":"Marratua","subscript":"Azpi-indizea","superscript":"Goi-indizea","underline":"Azpimarratu"},"about":{"copy":"Copyright &copy; $1. Eskubide guztiak erreserbaturik.","dlgTitle":"CKEditor-i buruz","help":"Begiratu $1 laguntzarako.","moreInfo":"Lizentziari buruzko informazioa gure webgunean:","title":"CKEditor-i buruz","userGuide":"CKEditor-en erabiltzaile-gida"},"editor":"Testu aberastuaren editorea","editorPanel":"Testu aberastuaren editorearen panela","common":{"editorHelp":"Sakatu ALT 0 laguntza jasotzeko","browseServer":"Arakatu zerbitzaria","url":"URLa","protocol":"Protokoloa","upload":"Kargatu","uploadSubmit":"Bidali zerbitzarira","image":"Irudia","flash":"Flash","form":"Formularioa","checkbox":"Kontrol-laukia","radio":"Aukera-botoia","textField":"Testu-eremua","textarea":"Testu-area","hiddenField":"Ezkutuko eremua","button":"Botoia","select":"Hautespen-eremua","imageButton":"Irudi-botoia","notSet":"<ezarri gabe>","id":"Id","name":"Izena","langDir":"Hizkuntzaren norabidea","langDirLtr":"Ezkerretik eskuinera (LTR)","langDirRtl":"Eskuinetik ezkerrera (RTL)","langCode":"Hizkuntzaren kodea","longDescr":"URLaren deskribapen luzea","cssClass":"Estilo-orriko klaseak","advisoryTitle":"Aholkatutako izenburua","cssStyle":"Estiloa","ok":"Ados","cancel":"Utzi","close":"Itxi","preview":"Aurrebista","resize":"Aldatu tamainaz","generalTab":"Orokorra","advancedTab":"Aurreratua","validateNumberFailed":"Balio hau ez da zenbaki bat.","confirmNewPage":"Eduki honetan gorde gabe dauden aldaketak galduko dira. Ziur zaude orri berri bat kargatu nahi duzula?","confirmCancel":"Aukera batzuk aldatu dituzu. Ziur zaude elkarrizketa-koadroa itxi nahi duzula?","options":"Aukerak","target":"Helburua","targetNew":"Leiho berria (_blank)","targetTop":"Goieneko leihoan (_top)","targetSelf":"Leiho berean (_self)","targetParent":"Leiho gurasoan (_parent)","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","styles":"Estiloa","cssClasses":"Estilo-orriko klaseak","width":"Zabalera","height":"Altuera","align":"Lerrokatzea","alignLeft":"Ezkerrean","alignRight":"Eskuinean","alignCenter":"Erdian","alignJustify":"Justifikatu","alignTop":"Goian","alignMiddle":"Erdian","alignBottom":"Behean","alignNone":"Bat ere ez","invalidValue":"Balio desegokia.","invalidHeight":"Altuera zenbaki bat izan behar da.","invalidWidth":"Zabalera zenbaki bat izan behar da.","invalidCssLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, CSS neurri unitate batekin edo gabe (px, %, in, cm, mm, em, ex, pt edo pc).","invalidHtmlLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, HTML neurri unitate batekin edo gabe (px edo %).","invalidInlineStyle":"Lineako estiloan zehaztutako balioak \"izen : balio\" formatuko tupla bat edo gehiago izan behar dira, komaz bereiztuak.","cssLengthTooltip":"Sartu zenbaki bat edo zenbaki bat baliozko CSS unitate batekin (px, %, in, cm, mm, em, ex, pt, edo pc).","unavailable":"%1<span class=\"cke_accessibility\">, erabilezina</span>"}};
\ No newline at end of file
+CKEDITOR.lang['eu']={"widget":{"move":"Klikatu eta arrastatu lekuz aldatzeko","label":"%1 widget"},"undo":{"redo":"Berregin","undo":"Desegin"},"toolbar":{"toolbarCollapse":"Tolestu tresna-barra","toolbarExpand":"Zabaldu tresna-barra","toolbarGroups":{"document":"Dokumentua","clipboard":"Arbela/Desegin","editing":"Editatu","forms":"Formularioak","basicstyles":"Oinarrizko estiloak","paragraph":"Paragrafoa","links":"Estekak","insert":"Txertatu","styles":"Estiloak","colors":"Koloreak","tools":"Tresnak"},"toolbars":"Editorearen tresna-barrak"},"table":{"border":"Ertzaren zabalera","caption":"Epigrafea","cell":{"menu":"Gelaxka","insertBefore":"Txertatu gelaxka aurretik","insertAfter":"Txertatu gelaxka ondoren","deleteCell":"Ezabatu gelaxkak","merge":"Batu gelaxkak","mergeRight":"Batu eskuinetara","mergeDown":"Batu behera","splitHorizontal":"Banatu gelaxka horizontalki","splitVertical":"Banatu gelaxka bertikalki","title":"Gelaxkaren propietateak","cellType":"Gelaxka-mota","rowSpan":"Errenkaden hedadura","colSpan":"Zutabeen hedadura","wordWrap":"Itzulbira","hAlign":"Lerrokatze horizontala","vAlign":"Lerrokatze bertikala","alignBaseline":"Oinarri-lerroan","bgColor":"Atzeko planoaren kolorea","borderColor":"Ertzaren kolorea","data":"Data","header":"Goiburua","yes":"Bai","no":"Ez","invalidWidth":"Gelaxkaren zabalera zenbaki bat izan behar da.","invalidHeight":"Gelaxkaren altuera zenbaki bat izan behar da.","invalidRowSpan":"Errenkaden hedadura zenbaki osoa izan behar da.","invalidColSpan":"Zutabeen hedadura zenbaki osoa izan behar da.","chooseColor":"Aukeratu"},"cellPad":"Gelaxken betegarria","cellSpace":"Gelaxka arteko tartea","column":{"menu":"Zutabea","insertBefore":"Txertatu zutabea aurretik","insertAfter":"Txertatu zutabea ondoren","deleteColumn":"Ezabatu zutabeak"},"columns":"Zutabeak","deleteTable":"Ezabatu taula","headers":"Goiburuak","headersBoth":"Biak","headersColumn":"Lehen zutabea","headersNone":"Bat ere ez","headersRow":"Lehen errenkada","invalidBorder":"Ertzaren tamaina zenbaki bat izan behar da.","invalidCellPadding":"Gelaxken betegarria zenbaki bat izan behar da.","invalidCellSpacing":"Gelaxka arteko tartea zenbaki bat izan behar da.","invalidCols":"Zutabe kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidHeight":"Taularen altuera zenbaki bat izan behar da.","invalidRows":"Errenkada kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidWidth":"Taularen zabalera zenbaki bat izan behar da.","menu":"Taularen propietateak","row":{"menu":"Errenkada","insertBefore":"Txertatu errenkada aurretik","insertAfter":"Txertatu errenkada ondoren","deleteRow":"Ezabatu errenkadak"},"rows":"Errenkadak","summary":"Laburpena","title":"Taularen propietateak","toolbar":"Taula","widthPc":"ehuneko","widthPx":"pixel","widthUnit":"zabalera unitatea"},"stylescombo":{"label":"Estiloak","panelTitle":"Formatu estiloak","panelTitle1":"Bloke estiloak","panelTitle2":"Lineako estiloak","panelTitle3":"Objektu estiloak"},"specialchar":{"options":"Karaktere berezien aukerak","title":"Hautatu karaktere berezia","toolbar":"Txertatu karaktere berezia"},"sourcedialog":{"toolbar":"Iturburua","title":"Iturburua"},"sourcearea":{"toolbar":"Iturburua"},"showblocks":{"toolbar":"Erakutsi blokeak"},"removeformat":{"toolbar":"Kendu formatua"},"pastetext":{"button":"Itsatsi testu arrunta bezala","title":"Itsatsi testu arrunta bezala"},"pastefromword":{"confirmCleanup":"Itsatsi nahi duzun testua Word-etik kopiatua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?","error":"Barne-errore bat dela eta ezin izan da itsatsitako testua garbitu","title":"Itsatsi Word-etik","toolbar":"Itsatsi Word-etik"},"maximize":{"maximize":"Maximizatu","minimize":"Minimizatu"},"magicline":{"title":"Txertatu paragrafoa hemen"},"list":{"bulletedlist":"Buletdun Zerrenda","numberedlist":"Zenbakidun Zerrenda"},"language":{"button":"Ezarri hizkuntza","remove":"Kendu hizkuntza"},"justify":{"block":"Justifikatu","center":"Erdian","left":"Lerrokatu ezkerrean","right":"Lerrokatu eskuinean"},"indent":{"indent":"Handitu koska","outdent":"Txikitu koska"},"image2":{"alt":"Ordezko testua","btnUpload":"Bidali zerbitzarira","captioned":"Argazki oina","captionPlaceholder":"Argazki oina","infoTab":"Irudiaren informazioa","lockRatio":"Blokeatu erlazioa","menu":"Irudiaren propietateak","pathName":"Irudia","pathNameCaption":"Argazki oina","resetSize":"Berrezarri tamaina","resizer":"Klikatu eta arrastatu tamainaz aldatzeko","title":"Irudiaren propietateak","uploadTab":"Kargatu","urlMissing":"Irudiaren iturburuaren URLa falta da.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Txertatu marra horizontala"},"format":{"label":"Formatua","panelTitle":"Paragrafoaren formatua","tag_address":"Helbidea","tag_div":"Normala (DIV)","tag_h1":"Izenburua 1","tag_h2":"Izenburua 2","tag_h3":"Izenburua 3","tag_h4":"Izenburua 4","tag_h5":"Izenburua 5","tag_h6":"Izenburua 6","tag_p":"Normala","tag_pre":"Formatuduna"},"elementspath":{"eleLabel":"Elementuen bidea","eleTitle":"%1 elementua"},"contextmenu":{"options":"Testuinguru-menuaren aukerak"},"clipboard":{"copy":"Kopiatu","copyError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki kopiatzea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+C).","cut":"Ebaki","cutError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki moztea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+X).","paste":"Itsatsi","pasteArea":"Itsasteko area","pasteMsg":"Mesedez teklatua erabiliz (<strong>Ctrl/Cmd+V</strong>) ondorengo eremuan testua itsatsi eta sakatu <strong>Ados</strong>.","securityMsg":"Nabigatzailearen segurtasun ezarpenak direla eta, editoreak ezin du arbela zuzenean erabili. Leiho honetan berriro itsatsi behar duzu.","title":"Itsatsi"},"button":{"selectedLabel":"%1 (hautatuta)"},"blockquote":{"toolbar":"Aipamen blokea"},"basicstyles":{"bold":"Lodia","italic":"Etzana","strike":"Marratua","subscript":"Azpi-indizea","superscript":"Goi-indizea","underline":"Azpimarratu"},"about":{"copy":"Copyright &copy; $1. Eskubide guztiak erreserbaturik.","dlgTitle":"CKEditor-i buruz","help":"Begiratu $1 laguntzarako.","moreInfo":"Lizentziari buruzko informazioa gure webgunean:","title":"CKEditor-i buruz","userGuide":"CKEditor-en erabiltzaile-gida"},"editor":"Testu aberastuaren editorea","editorPanel":"Testu aberastuaren editorearen panela","common":{"editorHelp":"Sakatu ALT 0 laguntza jasotzeko","browseServer":"Arakatu zerbitzaria","url":"URLa","protocol":"Protokoloa","upload":"Kargatu","uploadSubmit":"Bidali zerbitzarira","image":"Irudia","flash":"Flash","form":"Formularioa","checkbox":"Kontrol-laukia","radio":"Aukera-botoia","textField":"Testu-eremua","textarea":"Testu-area","hiddenField":"Ezkutuko eremua","button":"Botoia","select":"Hautespen-eremua","imageButton":"Irudi-botoia","notSet":"<ezarri gabe>","id":"Id","name":"Izena","langDir":"Hizkuntzaren norabidea","langDirLtr":"Ezkerretik eskuinera (LTR)","langDirRtl":"Eskuinetik ezkerrera (RTL)","langCode":"Hizkuntzaren kodea","longDescr":"URLaren deskribapen luzea","cssClass":"Estilo-orriko klaseak","advisoryTitle":"Aholkatutako izenburua","cssStyle":"Estiloa","ok":"Ados","cancel":"Utzi","close":"Itxi","preview":"Aurrebista","resize":"Aldatu tamainaz","generalTab":"Orokorra","advancedTab":"Aurreratua","validateNumberFailed":"Balio hau ez da zenbaki bat.","confirmNewPage":"Eduki honetan gorde gabe dauden aldaketak galduko dira. Ziur zaude orri berri bat kargatu nahi duzula?","confirmCancel":"Aukera batzuk aldatu dituzu. Ziur zaude elkarrizketa-koadroa itxi nahi duzula?","options":"Aukerak","target":"Helburua","targetNew":"Leiho berria (_blank)","targetTop":"Goieneko leihoan (_top)","targetSelf":"Leiho berean (_self)","targetParent":"Leiho gurasoan (_parent)","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","styles":"Estiloa","cssClasses":"Estilo-orriko klaseak","width":"Zabalera","height":"Altuera","align":"Lerrokatzea","alignLeft":"Ezkerrean","alignRight":"Eskuinean","alignCenter":"Erdian","alignJustify":"Justifikatu","alignTop":"Goian","alignMiddle":"Erdian","alignBottom":"Behean","alignNone":"Bat ere ez","invalidValue":"Balio desegokia.","invalidHeight":"Altuera zenbaki bat izan behar da.","invalidWidth":"Zabalera zenbaki bat izan behar da.","invalidCssLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, CSS neurri unitate batekin edo gabe (px, %, in, cm, mm, em, ex, pt edo pc).","invalidHtmlLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, HTML neurri unitate batekin edo gabe (px edo %).","invalidInlineStyle":"Lineako estiloan zehaztutako balioak \"izen : balio\" formatuko tupla bat edo gehiago izan behar dira, komaz bereiztuak.","cssLengthTooltip":"Sartu zenbaki bat edo zenbaki bat baliozko CSS unitate batekin (px, %, in, cm, mm, em, ex, pt, edo pc).","unavailable":"%1<span class=\"cke_accessibility\">, erabilezina</span>","keyboard":{"8":"Backspace","13":"Sartu","16":"Maius","17":"Ktrl","18":"Alt","32":"Space","35":"Buka","36":"Etxea","46":"Ezabatu","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/fa.js b/web/core/assets/vendor/ckeditor/lang/fa.js
index c667482ba..bf19e6710 100644
--- a/web/core/assets/vendor/ckeditor/lang/fa.js
+++ b/web/core/assets/vendor/ckeditor/lang/fa.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fa']={"widget":{"move":"کلیک و کشیدن برای جابجایی","label":"%1 widget"},"undo":{"redo":"بازچیدن","undo":"واچیدن"},"toolbar":{"toolbarCollapse":"بستن نوار ابزار","toolbarExpand":"بازکردن نوار ابزار","toolbarGroups":{"document":"سند","clipboard":"حافظه موقت/برگشت","editing":"در حال ویرایش","forms":"فرم​ها","basicstyles":"سبک‌های پایه","paragraph":"بند","links":"پیوندها","insert":"ورود","styles":"سبک‌ها","colors":"رنگ​ها","tools":"ابزارها"},"toolbars":"نوار ابزارهای ویرایش‌گر"},"table":{"border":"اندازهٴ لبه","caption":"عنوان","cell":{"menu":"سلول","insertBefore":"افزودن سلول قبل از","insertAfter":"افزودن سلول بعد از","deleteCell":"حذف سلولها","merge":"ادغام سلولها","mergeRight":"ادغام به راست","mergeDown":"ادغام به پایین","splitHorizontal":"جدا کردن افقی سلول","splitVertical":"جدا کردن عمودی سلول","title":"ویژگیهای سلول","cellType":"نوع سلول","rowSpan":"محدوده ردیفها","colSpan":"محدوده ستونها","wordWrap":"شکستن کلمه","hAlign":"چینش افقی","vAlign":"چینش عمودی","alignBaseline":"خط مبنا","bgColor":"رنگ زمینه","borderColor":"رنگ خطوط","data":"اطلاعات","header":"سرنویس","yes":"بله","no":"خیر","invalidWidth":"عرض سلول باید یک عدد باشد.","invalidHeight":"ارتفاع سلول باید عدد باشد.","invalidRowSpan":"مقدار محدوده ردیفها باید یک عدد باشد.","invalidColSpan":"مقدار محدوده ستونها باید یک عدد باشد.","chooseColor":"انتخاب"},"cellPad":"فاصلهٴ پرشده در سلول","cellSpace":"فاصلهٴ میان سلولها","column":{"menu":"ستون","insertBefore":"افزودن ستون قبل از","insertAfter":"افزودن ستون بعد از","deleteColumn":"حذف ستونها"},"columns":"ستونها","deleteTable":"پاک کردن جدول","headers":"سرنویسها","headersBoth":"هردو","headersColumn":"اولین ستون","headersNone":"هیچ","headersRow":"اولین ردیف","invalidBorder":"مقدار اندازه خطوط باید یک عدد باشد.","invalidCellPadding":"بالشتک سلول باید یک عدد باشد.","invalidCellSpacing":"مقدار فاصلهگذاری سلول باید یک عدد باشد.","invalidCols":"تعداد ستونها باید یک عدد بزرگتر از 0 باشد.","invalidHeight":"مقدار ارتفاع  جدول باید یک عدد باشد.","invalidRows":"تعداد ردیفها باید یک عدد بزرگتر از 0 باشد.","invalidWidth":"مقدار پهنای جدول باید یک عدد باشد.","menu":"ویژگیهای جدول","row":{"menu":"سطر","insertBefore":"افزودن سطر قبل از","insertAfter":"افزودن سطر بعد از","deleteRow":"حذف سطرها"},"rows":"سطرها","summary":"خلاصه","title":"ویژگیهای جدول","toolbar":"جدول","widthPc":"درصد","widthPx":"پیکسل","widthUnit":"واحد پهنا"},"stylescombo":{"label":"سبک","panelTitle":"سبکهای قالببندی","panelTitle1":"سبکهای بلوک","panelTitle2":"سبکهای درونخطی","panelTitle3":"سبکهای شیء"},"specialchar":{"options":"گزینه‌های نویسه‌های ویژه","title":"گزینش نویسه‌ی ویژه","toolbar":"گنجاندن نویسه‌ی ویژه"},"sourcedialog":{"toolbar":"منبع","title":"منبع"},"sourcearea":{"toolbar":"منبع"},"showblocks":{"toolbar":"نمایش بلوک‌ها"},"removeformat":{"toolbar":"برداشتن فرمت"},"pastetext":{"button":"چسباندن به عنوان متن ساده","title":"چسباندن به عنوان متن ساده"},"pastefromword":{"confirmCleanup":"متنی که میخواهید بچسبانید به نظر میرسد که از Word کپی شده است. آیا میخواهید قبل از چسباندن آن را پاکسازی کنید؟","error":"به دلیل بروز خطای داخلی امکان پاکسازی اطلاعات بازنشانی شده وجود ندارد.","title":"چسباندن از Word","toolbar":"چسباندن از Word"},"maximize":{"maximize":"بیشنه کردن","minimize":"کمینه کردن"},"magicline":{"title":"قرار دادن بند در اینجا"},"list":{"bulletedlist":"فهرست نقطه​ای","numberedlist":"فهرست شماره​دار"},"language":{"button":"تعیین زبان","remove":"حذف زبان"},"justify":{"block":"بلوک چین","center":"میان چین","left":"چپ چین","right":"راست چین"},"indent":{"indent":"افزایش تورفتگی","outdent":"کاهش تورفتگی"},"image2":{"alt":"متن جایگزین","btnUpload":"به سرور بفرست","captioned":"تصویر زیرنویس شده","captionPlaceholder":"عنوان","infoTab":"اطلاعات تصویر","lockRatio":"قفل کردن نسبت","menu":"ویژگی​های تصویر","pathName":"تصویر","pathNameCaption":"عنوان","resetSize":"بازنشانی اندازه","resizer":"کلیک و کشیدن برای تغییر اندازه","title":"ویژگی​های تصویر","uploadTab":"بالاگذاری","urlMissing":"آدرس URL اصلی تصویر یافت نشد."},"horizontalrule":{"toolbar":"گنجاندن خط افقی"},"format":{"label":"قالب","panelTitle":"قالب بند","tag_address":"نشانی","tag_div":"بند","tag_h1":"سرنویس ۱","tag_h2":"سرنویس ۲","tag_h3":"سرنویس ۳","tag_h4":"سرنویس ۴","tag_h5":"سرنویس ۵","tag_h6":"سرنویس ۶","tag_p":"معمولی","tag_pre":"قالب‌دار"},"elementspath":{"eleLabel":"مسیر عناصر","eleTitle":"%1 عنصر"},"contextmenu":{"options":"گزینه​های منوی زمینه"},"clipboard":{"copy":"رونوشت","copyError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای کپی کردن را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+C).","cut":"برش","cutError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای برش را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+X).","paste":"چسباندن","pasteArea":"محل چسباندن","pasteMsg":"لطفا متن را با کلیدهای (<STRONG>Ctrl/Cmd+V</STRONG>) در این جعبهٴ متنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.","securityMsg":"به خاطر تنظیمات امنیتی مرورگر شما، ویرایشگر نمیتواند دسترسی مستقیم به دادههای clipboard داشته باشد. شما باید دوباره آنرا در این پنجره بچسبانید.","title":"چسباندن"},"button":{"selectedLabel":"%1 (انتخاب شده)"},"blockquote":{"toolbar":"بلوک نقل قول"},"basicstyles":{"bold":"درشت","italic":"خمیده","strike":"خط‌خورده","subscript":"زیرنویس","superscript":"بالانویس","underline":"زیرخط‌دار"},"about":{"copy":"حق نشر &copy; $1. کلیه حقوق محفوظ است.","dlgTitle":"درباره CKEditor","help":" برای راهنمایی $1 را ملاحظه کنید.","moreInfo":"برای کسب اطلاعات مجوز لطفا به وب سایت ما مراجعه کنید:","title":"درباره CKEditor","userGuide":"راهنمای کاربران CKEditor"},"editor":"ویرایش‌گر متن غنی","editorPanel":"پنل ویرایشگر متن غنی","common":{"editorHelp":"کلید Alt+0 را برای راهنمایی بفشارید","browseServer":"فهرست​نمایی سرور","url":"URL","protocol":"قرارداد","upload":"بالاگذاری","uploadSubmit":"به سرور بفرست","image":"تصویر","flash":"فلش","form":"فرم","checkbox":"چک‌باکس","radio":"دکمه‌ی رادیویی","textField":"فیلد متنی","textarea":"ناحیهٴ متنی","hiddenField":"فیلد پنهان","button":"دکمه","select":"فیلد انتخاب چند گزینه​ای","imageButton":"دکمه‌ی تصویری","notSet":"<تعیین‌نشده>","id":"شناسه","name":"نام","langDir":"جهت زبان","langDirLtr":"چپ به راست","langDirRtl":"راست به چپ","langCode":"کد زبان","longDescr":"URL توصیف طولانی","cssClass":"کلاس​های شیوه​نامه (Stylesheet)","advisoryTitle":"عنوان کمکی","cssStyle":"سبک","ok":"پذیرش","cancel":"انصراف","close":"بستن","preview":"پیش‌نمایش","resize":"تغییر اندازه","generalTab":"عمومی","advancedTab":"پیش‌رفته","validateNumberFailed":"این مقدار یک عدد نیست.","confirmNewPage":"هر تغییر ایجاد شده​ی ذخیره نشده از بین خواهد رفت. آیا اطمینان دارید که قصد بارگیری صفحه جدیدی را دارید؟","confirmCancel":"برخی از گزینه‌ها تغییر کرده‌اند. آیا واقعا قصد بستن این پنجره را دارید؟","options":"گزینه​ها","target":"مقصد","targetNew":"پنجره جدید","targetTop":"بالاترین پنجره","targetSelf":"همان پنجره","targetParent":"پنجره والد","langDirLTR":"چپ به راست","langDirRTL":"راست به چپ","styles":"سبک","cssClasses":"کلاس‌های سبک‌نامه","width":"عرض","height":"طول","align":"چینش","alignLeft":"چپ","alignRight":"راست","alignCenter":"وسط","alignJustify":"بلوک چین","alignTop":"بالا","alignMiddle":"میانه","alignBottom":"پائین","alignNone":"هیچ","invalidValue":"مقدار نامعتبر.","invalidHeight":"ارتفاع باید یک عدد باشد.","invalidWidth":"عرض باید یک عدد باشد.","invalidCssLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری CSS معتبر باشد (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری HTML معتبر باشد (px or %).","invalidInlineStyle":"عدد تعیین شده برای سبک درون​خطی -Inline Style- باید دارای یک یا چند چندتایی با شکلی شبیه \"name : value\" که باید با یک \";\" از هم جدا شوند.","cssLengthTooltip":"یک عدد برای یک مقدار بر حسب پیکسل و یا یک عدد با یک واحد CSS معتبر وارد کنید (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">، غیر قابل دسترس</span>"}};
\ No newline at end of file
+CKEDITOR.lang['fa']={"widget":{"move":"کلیک و کشیدن برای جابجایی","label":"%1 widget"},"undo":{"redo":"بازچیدن","undo":"واچیدن"},"toolbar":{"toolbarCollapse":"بستن نوار ابزار","toolbarExpand":"بازکردن نوار ابزار","toolbarGroups":{"document":"سند","clipboard":"حافظه موقت/برگشت","editing":"در حال ویرایش","forms":"فرم​ها","basicstyles":"سبک‌های پایه","paragraph":"بند","links":"پیوندها","insert":"ورود","styles":"سبک‌ها","colors":"رنگ​ها","tools":"ابزارها"},"toolbars":"نوار ابزارهای ویرایش‌گر"},"table":{"border":"اندازهٴ لبه","caption":"عنوان","cell":{"menu":"سلول","insertBefore":"افزودن سلول قبل از","insertAfter":"افزودن سلول بعد از","deleteCell":"حذف سلولها","merge":"ادغام سلولها","mergeRight":"ادغام به راست","mergeDown":"ادغام به پایین","splitHorizontal":"جدا کردن افقی سلول","splitVertical":"جدا کردن عمودی سلول","title":"ویژگیهای سلول","cellType":"نوع سلول","rowSpan":"محدوده ردیفها","colSpan":"محدوده ستونها","wordWrap":"شکستن کلمه","hAlign":"چینش افقی","vAlign":"چینش عمودی","alignBaseline":"خط مبنا","bgColor":"رنگ زمینه","borderColor":"رنگ خطوط","data":"اطلاعات","header":"سرنویس","yes":"بله","no":"خیر","invalidWidth":"عرض سلول باید یک عدد باشد.","invalidHeight":"ارتفاع سلول باید عدد باشد.","invalidRowSpan":"مقدار محدوده ردیفها باید یک عدد باشد.","invalidColSpan":"مقدار محدوده ستونها باید یک عدد باشد.","chooseColor":"انتخاب"},"cellPad":"فاصلهٴ پرشده در سلول","cellSpace":"فاصلهٴ میان سلولها","column":{"menu":"ستون","insertBefore":"افزودن ستون قبل از","insertAfter":"افزودن ستون بعد از","deleteColumn":"حذف ستونها"},"columns":"ستونها","deleteTable":"پاک کردن جدول","headers":"سرنویسها","headersBoth":"هردو","headersColumn":"اولین ستون","headersNone":"هیچ","headersRow":"اولین ردیف","invalidBorder":"مقدار اندازه خطوط باید یک عدد باشد.","invalidCellPadding":"بالشتک سلول باید یک عدد باشد.","invalidCellSpacing":"مقدار فاصلهگذاری سلول باید یک عدد باشد.","invalidCols":"تعداد ستونها باید یک عدد بزرگتر از 0 باشد.","invalidHeight":"مقدار ارتفاع  جدول باید یک عدد باشد.","invalidRows":"تعداد ردیفها باید یک عدد بزرگتر از 0 باشد.","invalidWidth":"مقدار پهنای جدول باید یک عدد باشد.","menu":"ویژگیهای جدول","row":{"menu":"سطر","insertBefore":"افزودن سطر قبل از","insertAfter":"افزودن سطر بعد از","deleteRow":"حذف سطرها"},"rows":"سطرها","summary":"خلاصه","title":"ویژگیهای جدول","toolbar":"جدول","widthPc":"درصد","widthPx":"پیکسل","widthUnit":"واحد پهنا"},"stylescombo":{"label":"سبک","panelTitle":"سبکهای قالببندی","panelTitle1":"سبکهای بلوک","panelTitle2":"سبکهای درونخطی","panelTitle3":"سبکهای شیء"},"specialchar":{"options":"گزینه‌های نویسه‌های ویژه","title":"گزینش نویسه‌ی ویژه","toolbar":"گنجاندن نویسه‌ی ویژه"},"sourcedialog":{"toolbar":"منبع","title":"منبع"},"sourcearea":{"toolbar":"منبع"},"showblocks":{"toolbar":"نمایش بلوک‌ها"},"removeformat":{"toolbar":"برداشتن فرمت"},"pastetext":{"button":"چسباندن به عنوان متن ساده","title":"چسباندن به عنوان متن ساده"},"pastefromword":{"confirmCleanup":"متنی که میخواهید بچسبانید به نظر میرسد که از Word کپی شده است. آیا میخواهید قبل از چسباندن آن را پاکسازی کنید؟","error":"به دلیل بروز خطای داخلی امکان پاکسازی اطلاعات بازنشانی شده وجود ندارد.","title":"چسباندن از Word","toolbar":"چسباندن از Word"},"maximize":{"maximize":"بیشنه کردن","minimize":"کمینه کردن"},"magicline":{"title":"قرار دادن بند در اینجا"},"list":{"bulletedlist":"فهرست نقطه​ای","numberedlist":"فهرست شماره​دار"},"language":{"button":"تعیین زبان","remove":"حذف زبان"},"justify":{"block":"بلوک چین","center":"میان چین","left":"چپ چین","right":"راست چین"},"indent":{"indent":"افزایش تورفتگی","outdent":"کاهش تورفتگی"},"image2":{"alt":"متن جایگزین","btnUpload":"به سرور بفرست","captioned":"تصویر زیرنویس شده","captionPlaceholder":"عنوان","infoTab":"اطلاعات تصویر","lockRatio":"قفل کردن نسبت","menu":"ویژگی​های تصویر","pathName":"تصویر","pathNameCaption":"عنوان","resetSize":"بازنشانی اندازه","resizer":"کلیک و کشیدن برای تغییر اندازه","title":"ویژگی​های تصویر","uploadTab":"بالاگذاری","urlMissing":"آدرس URL اصلی تصویر یافت نشد.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"گنجاندن خط افقی"},"format":{"label":"قالب","panelTitle":"قالب بند","tag_address":"نشانی","tag_div":"بند","tag_h1":"سرنویس ۱","tag_h2":"سرنویس ۲","tag_h3":"سرنویس ۳","tag_h4":"سرنویس ۴","tag_h5":"سرنویس ۵","tag_h6":"سرنویس ۶","tag_p":"معمولی","tag_pre":"قالب‌دار"},"elementspath":{"eleLabel":"مسیر عناصر","eleTitle":"%1 عنصر"},"contextmenu":{"options":"گزینه​های منوی زمینه"},"clipboard":{"copy":"رونوشت","copyError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای کپی کردن را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+C).","cut":"برش","cutError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای برش را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+X).","paste":"چسباندن","pasteArea":"محل چسباندن","pasteMsg":"لطفا متن را با کلیدهای (<STRONG>Ctrl/Cmd+V</STRONG>) در این جعبهٴ متنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.","securityMsg":"به خاطر تنظیمات امنیتی مرورگر شما، ویرایشگر نمیتواند دسترسی مستقیم به دادههای clipboard داشته باشد. شما باید دوباره آنرا در این پنجره بچسبانید.","title":"چسباندن"},"button":{"selectedLabel":"%1 (انتخاب شده)"},"blockquote":{"toolbar":"بلوک نقل قول"},"basicstyles":{"bold":"درشت","italic":"خمیده","strike":"خط‌خورده","subscript":"زیرنویس","superscript":"بالانویس","underline":"زیرخط‌دار"},"about":{"copy":"حق نشر &copy; $1. کلیه حقوق محفوظ است.","dlgTitle":"درباره CKEditor","help":" برای راهنمایی $1 را ملاحظه کنید.","moreInfo":"برای کسب اطلاعات مجوز لطفا به وب سایت ما مراجعه کنید:","title":"درباره CKEditor","userGuide":"راهنمای کاربران CKEditor"},"editor":"ویرایش‌گر متن غنی","editorPanel":"پنل ویرایشگر متن غنی","common":{"editorHelp":"کلید Alt+0 را برای راهنمایی بفشارید","browseServer":"فهرست​نمایی سرور","url":"URL","protocol":"قرارداد","upload":"بالاگذاری","uploadSubmit":"به سرور بفرست","image":"تصویر","flash":"فلش","form":"فرم","checkbox":"چک‌باکس","radio":"دکمه‌ی رادیویی","textField":"فیلد متنی","textarea":"ناحیهٴ متنی","hiddenField":"فیلد پنهان","button":"دکمه","select":"فیلد انتخاب چند گزینه​ای","imageButton":"دکمه‌ی تصویری","notSet":"<تعیین‌نشده>","id":"شناسه","name":"نام","langDir":"جهت زبان","langDirLtr":"چپ به راست","langDirRtl":"راست به چپ","langCode":"کد زبان","longDescr":"URL توصیف طولانی","cssClass":"کلاس​های شیوه​نامه (Stylesheet)","advisoryTitle":"عنوان کمکی","cssStyle":"سبک","ok":"پذیرش","cancel":"انصراف","close":"بستن","preview":"پیش‌نمایش","resize":"تغییر اندازه","generalTab":"عمومی","advancedTab":"پیش‌رفته","validateNumberFailed":"این مقدار یک عدد نیست.","confirmNewPage":"هر تغییر ایجاد شده​ی ذخیره نشده از بین خواهد رفت. آیا اطمینان دارید که قصد بارگیری صفحه جدیدی را دارید؟","confirmCancel":"برخی از گزینه‌ها تغییر کرده‌اند. آیا واقعا قصد بستن این پنجره را دارید؟","options":"گزینه​ها","target":"مقصد","targetNew":"پنجره جدید","targetTop":"بالاترین پنجره","targetSelf":"همان پنجره","targetParent":"پنجره والد","langDirLTR":"چپ به راست","langDirRTL":"راست به چپ","styles":"سبک","cssClasses":"کلاس‌های سبک‌نامه","width":"عرض","height":"طول","align":"چینش","alignLeft":"چپ","alignRight":"راست","alignCenter":"وسط","alignJustify":"بلوک چین","alignTop":"بالا","alignMiddle":"میانه","alignBottom":"پائین","alignNone":"هیچ","invalidValue":"مقدار نامعتبر.","invalidHeight":"ارتفاع باید یک عدد باشد.","invalidWidth":"عرض باید یک عدد باشد.","invalidCssLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری CSS معتبر باشد (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری HTML معتبر باشد (px or %).","invalidInlineStyle":"عدد تعیین شده برای سبک درون​خطی -Inline Style- باید دارای یک یا چند چندتایی با شکلی شبیه \"name : value\" که باید با یک \";\" از هم جدا شوند.","cssLengthTooltip":"یک عدد برای یک مقدار بر حسب پیکسل و یا یک عدد با یک واحد CSS معتبر وارد کنید (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">، غیر قابل دسترس</span>","keyboard":{"8":"عقبگرد","13":"ورود","16":"تعویض","17":"کنترل","18":"دگرساز","32":"Space","35":"پایان","36":"خانه","46":"حذف","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/fi.js b/web/core/assets/vendor/ckeditor/lang/fi.js
index b9d94e60a..0d4396d26 100644
--- a/web/core/assets/vendor/ckeditor/lang/fi.js
+++ b/web/core/assets/vendor/ckeditor/lang/fi.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fi']={"widget":{"move":"Siirrä klikkaamalla ja raahaamalla","label":"%1 widget"},"undo":{"redo":"Toista","undo":"Kumoa"},"toolbar":{"toolbarCollapse":"Kutista työkalupalkki","toolbarExpand":"Laajenna työkalupalkki","toolbarGroups":{"document":"Dokumentti","clipboard":"Leikepöytä/Kumoa","editing":"Muokkaus","forms":"Lomakkeet","basicstyles":"Perustyylit","paragraph":"Kappale","links":"Linkit","insert":"Lisää","styles":"Tyylit","colors":"Värit","tools":"Työkalut"},"toolbars":"Editorin työkalupalkit"},"table":{"border":"Rajan paksuus","caption":"Otsikko","cell":{"menu":"Solu","insertBefore":"Lisää solu eteen","insertAfter":"Lisää solu perään","deleteCell":"Poista solut","merge":"Yhdistä solut","mergeRight":"Yhdistä oikealla olevan kanssa","mergeDown":"Yhdistä alla olevan kanssa","splitHorizontal":"Jaa solu vaakasuunnassa","splitVertical":"Jaa solu pystysuunnassa","title":"Solun ominaisuudet","cellType":"Solun tyyppi","rowSpan":"Rivin jatkuvuus","colSpan":"Solun jatkuvuus","wordWrap":"Rivitys","hAlign":"Horisontaali kohdistus","vAlign":"Vertikaali kohdistus","alignBaseline":"Alas (teksti)","bgColor":"Taustan väri","borderColor":"Reunan väri","data":"Data","header":"Ylätunniste","yes":"Kyllä","no":"Ei","invalidWidth":"Solun leveyden täytyy olla numero.","invalidHeight":"Solun korkeuden täytyy olla numero.","invalidRowSpan":"Rivin jatkuvuuden täytyy olla kokonaisluku.","invalidColSpan":"Solun jatkuvuuden täytyy olla kokonaisluku.","chooseColor":"Valitse"},"cellPad":"Solujen sisennys","cellSpace":"Solujen väli","column":{"menu":"Sarake","insertBefore":"Lisää sarake vasemmalle","insertAfter":"Lisää sarake oikealle","deleteColumn":"Poista sarakkeet"},"columns":"Sarakkeet","deleteTable":"Poista taulu","headers":"Ylätunnisteet","headersBoth":"Molemmat","headersColumn":"Ensimmäinen sarake","headersNone":"Ei","headersRow":"Ensimmäinen rivi","invalidBorder":"Reunan koon täytyy olla numero.","invalidCellPadding":"Solujen sisennyksen täytyy olla numero.","invalidCellSpacing":"Solujen välin täytyy olla numero.","invalidCols":"Sarakkeiden määrän täytyy olla suurempi kuin 0.","invalidHeight":"Taulun korkeuden täytyy olla numero.","invalidRows":"Rivien määrän täytyy olla suurempi kuin 0.","invalidWidth":"Taulun leveyden täytyy olla numero.","menu":"Taulun ominaisuudet","row":{"menu":"Rivi","insertBefore":"Lisää rivi yläpuolelle","insertAfter":"Lisää rivi alapuolelle","deleteRow":"Poista rivit"},"rows":"Rivit","summary":"Yhteenveto","title":"Taulun ominaisuudet","toolbar":"Taulu","widthPc":"prosenttia","widthPx":"pikseliä","widthUnit":"leveysyksikkö"},"stylescombo":{"label":"Tyyli","panelTitle":"Muotoilujen tyylit","panelTitle1":"Lohkojen tyylit","panelTitle2":"Rivinsisäiset tyylit","panelTitle3":"Objektien tyylit"},"specialchar":{"options":"Erikoismerkin ominaisuudet","title":"Valitse erikoismerkki","toolbar":"Lisää erikoismerkki"},"sourcedialog":{"toolbar":"Koodi","title":"Koodi"},"sourcearea":{"toolbar":"Koodi"},"showblocks":{"toolbar":"Näytä elementit"},"removeformat":{"toolbar":"Poista muotoilu"},"pastetext":{"button":"Liitä tekstinä","title":"Liitä tekstinä"},"pastefromword":{"confirmCleanup":"Liittämäsi teksti näyttäisi olevan Word-dokumentista. Haluatko siivota sen ennen liittämistä? (Suositus: Kyllä)","error":"Liitetyn tiedon siivoaminen ei onnistunut sisäisen virheen takia","title":"Liitä Word-dokumentista","toolbar":"Liitä Word-dokumentista"},"maximize":{"maximize":"Suurenna","minimize":"Pienennä"},"magicline":{"title":"Lisää kappale tähän."},"list":{"bulletedlist":"Luettelomerkit","numberedlist":"Numerointi"},"language":{"button":"Aseta kieli","remove":"Poista kieli"},"justify":{"block":"Tasaa molemmat reunat","center":"Keskitä","left":"Tasaa vasemmat reunat","right":"Tasaa oikeat reunat"},"indent":{"indent":"Suurenna sisennystä","outdent":"Pienennä sisennystä"},"image2":{"alt":"Vaihtoehtoinen teksti","btnUpload":"Lähetä palvelimelle","captioned":"Kuva kuvatekstillä","captionPlaceholder":"Kuvateksti","infoTab":"Kuvan tiedot","lockRatio":"Lukitse suhteet","menu":"Kuvan ominaisuudet","pathName":"kuva","pathNameCaption":"kuvateksti","resetSize":"Alkuperäinen koko","resizer":"Klikkaa ja raahaa muuttaaksesi kokoa","title":"Kuvan ominaisuudet","uploadTab":"Lisää tiedosto","urlMissing":"Kuvan lähdeosoite puuttuu."},"horizontalrule":{"toolbar":"Lisää murtoviiva"},"format":{"label":"Muotoilu","panelTitle":"Muotoilu","tag_address":"Osoite","tag_div":"Normaali (DIV)","tag_h1":"Otsikko 1","tag_h2":"Otsikko 2","tag_h3":"Otsikko 3","tag_h4":"Otsikko 4","tag_h5":"Otsikko 5","tag_h6":"Otsikko 6","tag_p":"Normaali","tag_pre":"Muotoiltu"},"elementspath":{"eleLabel":"Elementin polku","eleTitle":"%1 elementti"},"contextmenu":{"options":"Pikavalikon ominaisuudet"},"clipboard":{"copy":"Kopioi","copyError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).","cut":"Leikkaa","cutError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).","paste":"Liitä","pasteArea":"Leikealue","pasteMsg":"Liitä painamalla (<STRONG>Ctrl+V</STRONG>) ja painamalla <STRONG>OK</STRONG>.","securityMsg":"Selaimesi turva-asetukset eivät salli editorin käyttää leikepöytää suoraan. Sinun pitää suorittaa liittäminen tässä ikkunassa.","title":"Liitä"},"button":{"selectedLabel":"%1 (Valittu)"},"blockquote":{"toolbar":"Lainaus"},"basicstyles":{"bold":"Lihavoitu","italic":"Kursivoitu","strike":"Yliviivattu","subscript":"Alaindeksi","superscript":"Yläindeksi","underline":"Alleviivattu"},"about":{"copy":"Copyright &copy; $1. Kaikki oikeuden pidätetään.","dlgTitle":"Tietoa CKEditorista","help":"Katso ohjeet: $1.","moreInfo":"Lisenssitiedot löytyvät kotisivuiltamme:","title":"Tietoa CKEditorista","userGuide":"CKEditorin käyttäjäopas"},"editor":"Rikastekstieditori","editorPanel":"Rikastekstieditoripaneeli","common":{"editorHelp":"Paina ALT 0 nähdäksesi ohjeen","browseServer":"Selaa palvelinta","url":"Osoite","protocol":"Protokolla","upload":"Lisää tiedosto","uploadSubmit":"Lähetä palvelimelle","image":"Kuva","flash":"Flash-animaatio","form":"Lomake","checkbox":"Valintaruutu","radio":"Radiopainike","textField":"Tekstikenttä","textarea":"Tekstilaatikko","hiddenField":"Piilokenttä","button":"Painike","select":"Valintakenttä","imageButton":"Kuvapainike","notSet":"<ei asetettu>","id":"Tunniste","name":"Nimi","langDir":"Kielen suunta","langDirLtr":"Vasemmalta oikealle (LTR)","langDirRtl":"Oikealta vasemmalle (RTL)","langCode":"Kielikoodi","longDescr":"Pitkän kuvauksen URL","cssClass":"Tyyliluokat","advisoryTitle":"Avustava otsikko","cssStyle":"Tyyli","ok":"OK","cancel":"Peruuta","close":"Sulje","preview":"Esikatselu","resize":"Raahaa muuttaaksesi kokoa","generalTab":"Yleinen","advancedTab":"Lisäominaisuudet","validateNumberFailed":"Arvon pitää olla numero.","confirmNewPage":"Kaikki tallentamattomat muutokset tähän sisältöön menetetään. Oletko varma, että haluat ladata uuden sivun?","confirmCancel":"Jotkut asetuksista on muuttuneet. Oletko varma, että haluat sulkea valintaikkunan?","options":"Asetukset","target":"Kohde","targetNew":"Uusi ikkuna (_blank)","targetTop":"Päällimmäinen ikkuna (_top)","targetSelf":"Sama ikkuna (_self)","targetParent":"Ylemmän tason ikkuna (_parent)","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","styles":"Tyyli","cssClasses":"Tyylitiedoston luokat","width":"Leveys","height":"Korkeus","align":"Kohdistus","alignLeft":"Vasemmalle","alignRight":"Oikealle","alignCenter":"Keskelle","alignJustify":"Tasaa molemmat reunat","alignTop":"Ylös","alignMiddle":"Keskelle","alignBottom":"Alas","alignNone":"Ei asetettu","invalidValue":"Virheellinen arvo.","invalidHeight":"Korkeuden täytyy olla numero.","invalidWidth":"Leveyden täytyy olla numero.","invalidCssLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku CSS mittayksikön (px, %, in, cm, mm, em, ex, pt tai pc) kanssa tai ilman.","invalidHtmlLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku HTML mittayksikön (px tai %) kanssa tai ilman.","invalidInlineStyle":"Tyylille annetun arvon täytyy koostua yhdestä tai useammasta \"nimi : arvo\" parista, jotka ovat eroteltuna toisistaan puolipisteillä.","cssLengthTooltip":"Anna numeroarvo pikseleinä tai numeroarvo CSS mittayksikön kanssa (px, %, in, cm, mm, em, ex, pt, tai pc).","unavailable":"%1<span class=\"cke_accessibility\">, ei saatavissa</span>"}};
\ No newline at end of file
+CKEDITOR.lang['fi']={"widget":{"move":"Siirrä klikkaamalla ja raahaamalla","label":"%1 widget"},"undo":{"redo":"Toista","undo":"Kumoa"},"toolbar":{"toolbarCollapse":"Kutista työkalupalkki","toolbarExpand":"Laajenna työkalupalkki","toolbarGroups":{"document":"Dokumentti","clipboard":"Leikepöytä/Kumoa","editing":"Muokkaus","forms":"Lomakkeet","basicstyles":"Perustyylit","paragraph":"Kappale","links":"Linkit","insert":"Lisää","styles":"Tyylit","colors":"Värit","tools":"Työkalut"},"toolbars":"Editorin työkalupalkit"},"table":{"border":"Rajan paksuus","caption":"Otsikko","cell":{"menu":"Solu","insertBefore":"Lisää solu eteen","insertAfter":"Lisää solu perään","deleteCell":"Poista solut","merge":"Yhdistä solut","mergeRight":"Yhdistä oikealla olevan kanssa","mergeDown":"Yhdistä alla olevan kanssa","splitHorizontal":"Jaa solu vaakasuunnassa","splitVertical":"Jaa solu pystysuunnassa","title":"Solun ominaisuudet","cellType":"Solun tyyppi","rowSpan":"Rivin jatkuvuus","colSpan":"Solun jatkuvuus","wordWrap":"Rivitys","hAlign":"Horisontaali kohdistus","vAlign":"Vertikaali kohdistus","alignBaseline":"Alas (teksti)","bgColor":"Taustan väri","borderColor":"Reunan väri","data":"Data","header":"Ylätunniste","yes":"Kyllä","no":"Ei","invalidWidth":"Solun leveyden täytyy olla numero.","invalidHeight":"Solun korkeuden täytyy olla numero.","invalidRowSpan":"Rivin jatkuvuuden täytyy olla kokonaisluku.","invalidColSpan":"Solun jatkuvuuden täytyy olla kokonaisluku.","chooseColor":"Valitse"},"cellPad":"Solujen sisennys","cellSpace":"Solujen väli","column":{"menu":"Sarake","insertBefore":"Lisää sarake vasemmalle","insertAfter":"Lisää sarake oikealle","deleteColumn":"Poista sarakkeet"},"columns":"Sarakkeet","deleteTable":"Poista taulu","headers":"Ylätunnisteet","headersBoth":"Molemmat","headersColumn":"Ensimmäinen sarake","headersNone":"Ei","headersRow":"Ensimmäinen rivi","invalidBorder":"Reunan koon täytyy olla numero.","invalidCellPadding":"Solujen sisennyksen täytyy olla numero.","invalidCellSpacing":"Solujen välin täytyy olla numero.","invalidCols":"Sarakkeiden määrän täytyy olla suurempi kuin 0.","invalidHeight":"Taulun korkeuden täytyy olla numero.","invalidRows":"Rivien määrän täytyy olla suurempi kuin 0.","invalidWidth":"Taulun leveyden täytyy olla numero.","menu":"Taulun ominaisuudet","row":{"menu":"Rivi","insertBefore":"Lisää rivi yläpuolelle","insertAfter":"Lisää rivi alapuolelle","deleteRow":"Poista rivit"},"rows":"Rivit","summary":"Yhteenveto","title":"Taulun ominaisuudet","toolbar":"Taulu","widthPc":"prosenttia","widthPx":"pikseliä","widthUnit":"leveysyksikkö"},"stylescombo":{"label":"Tyyli","panelTitle":"Muotoilujen tyylit","panelTitle1":"Lohkojen tyylit","panelTitle2":"Rivinsisäiset tyylit","panelTitle3":"Objektien tyylit"},"specialchar":{"options":"Erikoismerkin ominaisuudet","title":"Valitse erikoismerkki","toolbar":"Lisää erikoismerkki"},"sourcedialog":{"toolbar":"Koodi","title":"Koodi"},"sourcearea":{"toolbar":"Koodi"},"showblocks":{"toolbar":"Näytä elementit"},"removeformat":{"toolbar":"Poista muotoilu"},"pastetext":{"button":"Liitä tekstinä","title":"Liitä tekstinä"},"pastefromword":{"confirmCleanup":"Liittämäsi teksti näyttäisi olevan Word-dokumentista. Haluatko siivota sen ennen liittämistä? (Suositus: Kyllä)","error":"Liitetyn tiedon siivoaminen ei onnistunut sisäisen virheen takia","title":"Liitä Word-dokumentista","toolbar":"Liitä Word-dokumentista"},"maximize":{"maximize":"Suurenna","minimize":"Pienennä"},"magicline":{"title":"Lisää kappale tähän."},"list":{"bulletedlist":"Luettelomerkit","numberedlist":"Numerointi"},"language":{"button":"Aseta kieli","remove":"Poista kieli"},"justify":{"block":"Tasaa molemmat reunat","center":"Keskitä","left":"Tasaa vasemmat reunat","right":"Tasaa oikeat reunat"},"indent":{"indent":"Suurenna sisennystä","outdent":"Pienennä sisennystä"},"image2":{"alt":"Vaihtoehtoinen teksti","btnUpload":"Lähetä palvelimelle","captioned":"Kuva kuvatekstillä","captionPlaceholder":"Kuvateksti","infoTab":"Kuvan tiedot","lockRatio":"Lukitse suhteet","menu":"Kuvan ominaisuudet","pathName":"kuva","pathNameCaption":"kuvateksti","resetSize":"Alkuperäinen koko","resizer":"Klikkaa ja raahaa muuttaaksesi kokoa","title":"Kuvan ominaisuudet","uploadTab":"Lisää tiedosto","urlMissing":"Kuvan lähdeosoite puuttuu.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Lisää murtoviiva"},"format":{"label":"Muotoilu","panelTitle":"Muotoilu","tag_address":"Osoite","tag_div":"Normaali (DIV)","tag_h1":"Otsikko 1","tag_h2":"Otsikko 2","tag_h3":"Otsikko 3","tag_h4":"Otsikko 4","tag_h5":"Otsikko 5","tag_h6":"Otsikko 6","tag_p":"Normaali","tag_pre":"Muotoiltu"},"elementspath":{"eleLabel":"Elementin polku","eleTitle":"%1 elementti"},"contextmenu":{"options":"Pikavalikon ominaisuudet"},"clipboard":{"copy":"Kopioi","copyError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).","cut":"Leikkaa","cutError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).","paste":"Liitä","pasteArea":"Leikealue","pasteMsg":"Liitä painamalla (<STRONG>Ctrl+V</STRONG>) ja painamalla <STRONG>OK</STRONG>.","securityMsg":"Selaimesi turva-asetukset eivät salli editorin käyttää leikepöytää suoraan. Sinun pitää suorittaa liittäminen tässä ikkunassa.","title":"Liitä"},"button":{"selectedLabel":"%1 (Valittu)"},"blockquote":{"toolbar":"Lainaus"},"basicstyles":{"bold":"Lihavoitu","italic":"Kursivoitu","strike":"Yliviivattu","subscript":"Alaindeksi","superscript":"Yläindeksi","underline":"Alleviivattu"},"about":{"copy":"Copyright &copy; $1. Kaikki oikeuden pidätetään.","dlgTitle":"Tietoa CKEditorista","help":"Katso ohjeet: $1.","moreInfo":"Lisenssitiedot löytyvät kotisivuiltamme:","title":"Tietoa CKEditorista","userGuide":"CKEditorin käyttäjäopas"},"editor":"Rikastekstieditori","editorPanel":"Rikastekstieditoripaneeli","common":{"editorHelp":"Paina ALT 0 nähdäksesi ohjeen","browseServer":"Selaa palvelinta","url":"Osoite","protocol":"Protokolla","upload":"Lisää tiedosto","uploadSubmit":"Lähetä palvelimelle","image":"Kuva","flash":"Flash-animaatio","form":"Lomake","checkbox":"Valintaruutu","radio":"Radiopainike","textField":"Tekstikenttä","textarea":"Tekstilaatikko","hiddenField":"Piilokenttä","button":"Painike","select":"Valintakenttä","imageButton":"Kuvapainike","notSet":"<ei asetettu>","id":"Tunniste","name":"Nimi","langDir":"Kielen suunta","langDirLtr":"Vasemmalta oikealle (LTR)","langDirRtl":"Oikealta vasemmalle (RTL)","langCode":"Kielikoodi","longDescr":"Pitkän kuvauksen URL","cssClass":"Tyyliluokat","advisoryTitle":"Avustava otsikko","cssStyle":"Tyyli","ok":"OK","cancel":"Peruuta","close":"Sulje","preview":"Esikatselu","resize":"Raahaa muuttaaksesi kokoa","generalTab":"Yleinen","advancedTab":"Lisäominaisuudet","validateNumberFailed":"Arvon pitää olla numero.","confirmNewPage":"Kaikki tallentamattomat muutokset tähän sisältöön menetetään. Oletko varma, että haluat ladata uuden sivun?","confirmCancel":"Jotkut asetuksista on muuttuneet. Oletko varma, että haluat sulkea valintaikkunan?","options":"Asetukset","target":"Kohde","targetNew":"Uusi ikkuna (_blank)","targetTop":"Päällimmäinen ikkuna (_top)","targetSelf":"Sama ikkuna (_self)","targetParent":"Ylemmän tason ikkuna (_parent)","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","styles":"Tyyli","cssClasses":"Tyylitiedoston luokat","width":"Leveys","height":"Korkeus","align":"Kohdistus","alignLeft":"Vasemmalle","alignRight":"Oikealle","alignCenter":"Keskelle","alignJustify":"Tasaa molemmat reunat","alignTop":"Ylös","alignMiddle":"Keskelle","alignBottom":"Alas","alignNone":"Ei asetettu","invalidValue":"Virheellinen arvo.","invalidHeight":"Korkeuden täytyy olla numero.","invalidWidth":"Leveyden täytyy olla numero.","invalidCssLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku CSS mittayksikön (px, %, in, cm, mm, em, ex, pt tai pc) kanssa tai ilman.","invalidHtmlLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku HTML mittayksikön (px tai %) kanssa tai ilman.","invalidInlineStyle":"Tyylille annetun arvon täytyy koostua yhdestä tai useammasta \"nimi : arvo\" parista, jotka ovat eroteltuna toisistaan puolipisteillä.","cssLengthTooltip":"Anna numeroarvo pikseleinä tai numeroarvo CSS mittayksikön kanssa (px, %, in, cm, mm, em, ex, pt, tai pc).","unavailable":"%1<span class=\"cke_accessibility\">, ei saatavissa</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/fo.js b/web/core/assets/vendor/ckeditor/lang/fo.js
index 4cf626862..6a2f3058d 100644
--- a/web/core/assets/vendor/ckeditor/lang/fo.js
+++ b/web/core/assets/vendor/ckeditor/lang/fo.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fo']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Vend aftur","undo":"Angra"},"toolbar":{"toolbarCollapse":"Lat Toolbar aftur","toolbarExpand":"Vís Toolbar","toolbarGroups":{"document":"Dokument","clipboard":"Clipboard/Undo","editing":"Editering","forms":"Formar","basicstyles":"Grundleggjandi Styles","paragraph":"Reglubrot","links":"Leinkjur","insert":"Set inn","styles":"Styles","colors":"Litir","tools":"Tól"},"toolbars":"Editor toolbars"},"table":{"border":"Bordabreidd","caption":"Tabellfrágreiðing","cell":{"menu":"Meski","insertBefore":"Set meska inn áðrenn","insertAfter":"Set meska inn aftaná","deleteCell":"Strika meskar","merge":"Flætta meskar","mergeRight":"Flætta meskar til høgru","mergeDown":"Flætta saman","splitHorizontal":"Kloyv meska vatnrætt","splitVertical":"Kloyv meska loddrætt","title":"Mesku eginleikar","cellType":"Mesku slag","rowSpan":"Ræð spenni","colSpan":"Kolonnu spenni","wordWrap":"Orðkloyving","hAlign":"Horisontal plasering","vAlign":"Loddrøtt plasering","alignBaseline":"Basislinja","bgColor":"Bakgrundslitur","borderColor":"Bordalitur","data":"Data","header":"Header","yes":"Ja","no":"Nei","invalidWidth":"Meskubreidd má vera eitt tal.","invalidHeight":"Meskuhædd má vera eitt tal.","invalidRowSpan":"Raðspennið má vera eitt heiltal.","invalidColSpan":"Kolonnuspennið má vera eitt heiltal.","chooseColor":"Vel"},"cellPad":"Meskubreddi","cellSpace":"Fjarstøða millum meskar","column":{"menu":"Kolonna","insertBefore":"Set kolonnu inn áðrenn","insertAfter":"Set kolonnu inn aftaná","deleteColumn":"Strika kolonnur"},"columns":"Kolonnur","deleteTable":"Strika tabell","headers":"Yvirskriftir","headersBoth":"Báðir","headersColumn":"Fyrsta kolonna","headersNone":"Eingin","headersRow":"Fyrsta rað","invalidBorder":"Borda-stødd má vera eitt tal.","invalidCellPadding":"Cell padding má vera eitt tal.","invalidCellSpacing":"Cell spacing má vera eitt tal.","invalidCols":"Talið av kolonnum má vera eitt tal størri enn 0.","invalidHeight":"Tabell-hædd má vera eitt tal.","invalidRows":"Talið av røðum má vera eitt tal størri enn 0.","invalidWidth":"Tabell-breidd má vera eitt tal.","menu":"Eginleikar fyri tabell","row":{"menu":"Rað","insertBefore":"Set rað inn áðrenn","insertAfter":"Set rað inn aftaná","deleteRow":"Strika røðir"},"rows":"Røðir","summary":"Samandráttur","title":"Eginleikar fyri tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"pixels","widthUnit":"breiddar unit"},"stylescombo":{"label":"Typografi","panelTitle":"Formatterings stílir","panelTitle1":"Blokk stílir","panelTitle2":"Inline stílir","panelTitle3":"Object stílir"},"specialchar":{"options":"Møguleikar við serteknum","title":"Vel sertekn","toolbar":"Set inn sertekn"},"sourcedialog":{"toolbar":"Kelda","title":"Kelda"},"sourcearea":{"toolbar":"Kelda"},"showblocks":{"toolbar":"Vís blokkar"},"removeformat":{"toolbar":"Strika sniðgeving"},"pastetext":{"button":"Innrita som reinan tekst","title":"Innrita som reinan tekst"},"pastefromword":{"confirmCleanup":"Teksturin, tú roynir at seta inn, sýnist at stava frá Word. Skal teksturin reinsast fyrst?","error":"Tað eydnaðist ikki at reinsa tekstin vegna ein internan feil","title":"Innrita frá Word","toolbar":"Innrita frá Word"},"maximize":{"maximize":"Maksimera","minimize":"Minimera"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Punktmerktur listi","numberedlist":"Talmerktur listi"},"language":{"button":"Velja tungumál","remove":"Remove language"},"justify":{"block":"Javnir tekstkantar","center":"Miðsett","left":"Vinstrasett","right":"Høgrasett"},"indent":{"indent":"Økja reglubrotarinntriv","outdent":"Minka reglubrotarinntriv"},"image2":{"alt":"Alternativur tekstur","btnUpload":"Send til ambætaran","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Myndaupplýsingar","lockRatio":"Læs lutfallið","menu":"Myndaeginleikar","pathName":"image","pathNameCaption":"caption","resetSize":"Upprunastødd","resizer":"Click and drag to resize","title":"Myndaeginleikar","uploadTab":"Send til ambætaran","urlMissing":"URL til mynd manglar."},"horizontalrule":{"toolbar":"Ger vatnrætta linju"},"format":{"label":"Skriftsnið","panelTitle":"Skriftsnið","tag_address":"Adressa","tag_div":"Vanligt (DIV)","tag_h1":"Yvirskrift 1","tag_h2":"Yvirskrift 2","tag_h3":"Yvirskrift 3","tag_h4":"Yvirskrift 4","tag_h5":"Yvirskrift 5","tag_h6":"Yvirskrift 6","tag_p":"Vanligt","tag_pre":"Sniðgivið"},"elementspath":{"eleLabel":"Slóð til elementir","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Avrita","copyError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (Ctrl/Cmd+C).","cut":"Kvett","cutError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (Ctrl/Cmd+X).","paste":"Innrita","pasteArea":"Avritingarumráði","pasteMsg":"Vinarliga koyr tekstin í hendan rútin við knappaborðinum (<strong>Ctrl/Cmd+V</strong>) og klikk á <strong>Góðtak</strong>.","securityMsg":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í beinleiðis atgongd til avritingarminnið. Tygum mugu royna aftur í hesum rútinum.","title":"Innrita"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blockquote"},"basicstyles":{"bold":"Feit skrift","italic":"Skráskrift","strike":"Yvirstrikað","subscript":"Lækkað skrift","superscript":"Hækkað skrift","underline":"Undirstrikað"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Um CKEditor","help":"Kekka $1 fyri hjálp.","moreInfo":"Licens upplýsingar finnast á heimasíðu okkara:","title":"Um CKEditor","userGuide":"CKEditor Brúkaravegleiðing"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Trýst ALT og 0 fyri vegleiðing","browseServer":"Ambætarakagi","url":"URL","protocol":"Protokoll","upload":"Send til ambætaran","uploadSubmit":"Send til ambætaran","image":"Myndir","flash":"Flash","form":"Formur","checkbox":"Flugubein","radio":"Radioknøttur","textField":"Tekstteigur","textarea":"Tekstumráði","hiddenField":"Fjaldur teigur","button":"Knøttur","select":"Valskrá","imageButton":"Myndaknøttur","notSet":"<ikki sett>","id":"Id","name":"Navn","langDir":"Tekstkós","langDirLtr":"Frá vinstru til høgru (LTR)","langDirRtl":"Frá høgru til vinstru (RTL)","langCode":"Málkoda","longDescr":"Víðkað URL frágreiðing","cssClass":"Typografi klassar","advisoryTitle":"Vegleiðandi heiti","cssStyle":"Typografi","ok":"Góðkent","cancel":"Avlýs","close":"Lat aftur","preview":"Frumsýn","resize":"Drag fyri at broyta stødd","generalTab":"Generelt","advancedTab":"Fjølbroytt","validateNumberFailed":"Hetta er ikki eitt tal.","confirmNewPage":"Allar ikki goymdar broytingar í hesum innihaldið hvørva. Skal nýggj síða lesast kortini?","confirmCancel":"Nakrir valmøguleikar eru broyttir. Ert tú vísur í, at dialogurin skal latast aftur?","options":"Options","target":"Target","targetNew":"Nýtt vindeyga (_blank)","targetTop":"Vindeyga ovast (_top)","targetSelf":"Sama vindeyga (_self)","targetParent":"Upphavligt vindeyga (_parent)","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Breidd","height":"Hædd","align":"Justering","alignLeft":"Vinstra","alignRight":"Høgra","alignCenter":"Miðsett","alignJustify":"Javnir tekstkantar","alignTop":"Ovast","alignMiddle":"Miðja","alignBottom":"Botnur","alignNone":"Eingin","invalidValue":"Invalid value.","invalidHeight":"Hædd má vera eitt tal.","invalidWidth":"Breidd má vera eitt tal.","invalidCssLength":"Virðið sett í \"%1\" feltið má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px, %, in, cm, mm, em, ex, pt, ella pc).","invalidHtmlLength":"Virðið sett í \"%1\" feltiðield má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px ella %).","invalidInlineStyle":"Virði specifiserað fyri inline style má hava eitt ella fleiri pør (tuples) skrivað sum \"name : value\", hvørt parið sundurskilt við semi-colon.","cssLengthTooltip":"Skriva eitt tal fyri eitt virði í pixels ella eitt tal við gyldigum CSS eind (px, %, in, cm, mm, em, ex, pt, ella pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikki tøkt</span>"}};
\ No newline at end of file
+CKEDITOR.lang['fo']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Vend aftur","undo":"Angra"},"toolbar":{"toolbarCollapse":"Lat Toolbar aftur","toolbarExpand":"Vís Toolbar","toolbarGroups":{"document":"Dokument","clipboard":"Clipboard/Undo","editing":"Editering","forms":"Formar","basicstyles":"Grundleggjandi Styles","paragraph":"Reglubrot","links":"Leinkjur","insert":"Set inn","styles":"Styles","colors":"Litir","tools":"Tól"},"toolbars":"Editor toolbars"},"table":{"border":"Bordabreidd","caption":"Tabellfrágreiðing","cell":{"menu":"Meski","insertBefore":"Set meska inn áðrenn","insertAfter":"Set meska inn aftaná","deleteCell":"Strika meskar","merge":"Flætta meskar","mergeRight":"Flætta meskar til høgru","mergeDown":"Flætta saman","splitHorizontal":"Kloyv meska vatnrætt","splitVertical":"Kloyv meska loddrætt","title":"Mesku eginleikar","cellType":"Mesku slag","rowSpan":"Ræð spenni","colSpan":"Kolonnu spenni","wordWrap":"Orðkloyving","hAlign":"Horisontal plasering","vAlign":"Loddrøtt plasering","alignBaseline":"Basislinja","bgColor":"Bakgrundslitur","borderColor":"Bordalitur","data":"Data","header":"Header","yes":"Ja","no":"Nei","invalidWidth":"Meskubreidd má vera eitt tal.","invalidHeight":"Meskuhædd má vera eitt tal.","invalidRowSpan":"Raðspennið má vera eitt heiltal.","invalidColSpan":"Kolonnuspennið má vera eitt heiltal.","chooseColor":"Vel"},"cellPad":"Meskubreddi","cellSpace":"Fjarstøða millum meskar","column":{"menu":"Kolonna","insertBefore":"Set kolonnu inn áðrenn","insertAfter":"Set kolonnu inn aftaná","deleteColumn":"Strika kolonnur"},"columns":"Kolonnur","deleteTable":"Strika tabell","headers":"Yvirskriftir","headersBoth":"Báðir","headersColumn":"Fyrsta kolonna","headersNone":"Eingin","headersRow":"Fyrsta rað","invalidBorder":"Borda-stødd má vera eitt tal.","invalidCellPadding":"Cell padding má vera eitt tal.","invalidCellSpacing":"Cell spacing má vera eitt tal.","invalidCols":"Talið av kolonnum má vera eitt tal størri enn 0.","invalidHeight":"Tabell-hædd má vera eitt tal.","invalidRows":"Talið av røðum má vera eitt tal størri enn 0.","invalidWidth":"Tabell-breidd má vera eitt tal.","menu":"Eginleikar fyri tabell","row":{"menu":"Rað","insertBefore":"Set rað inn áðrenn","insertAfter":"Set rað inn aftaná","deleteRow":"Strika røðir"},"rows":"Røðir","summary":"Samandráttur","title":"Eginleikar fyri tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"pixels","widthUnit":"breiddar unit"},"stylescombo":{"label":"Typografi","panelTitle":"Formatterings stílir","panelTitle1":"Blokk stílir","panelTitle2":"Inline stílir","panelTitle3":"Object stílir"},"specialchar":{"options":"Møguleikar við serteknum","title":"Vel sertekn","toolbar":"Set inn sertekn"},"sourcedialog":{"toolbar":"Kelda","title":"Kelda"},"sourcearea":{"toolbar":"Kelda"},"showblocks":{"toolbar":"Vís blokkar"},"removeformat":{"toolbar":"Strika sniðgeving"},"pastetext":{"button":"Innrita som reinan tekst","title":"Innrita som reinan tekst"},"pastefromword":{"confirmCleanup":"Teksturin, tú roynir at seta inn, sýnist at stava frá Word. Skal teksturin reinsast fyrst?","error":"Tað eydnaðist ikki at reinsa tekstin vegna ein internan feil","title":"Innrita frá Word","toolbar":"Innrita frá Word"},"maximize":{"maximize":"Maksimera","minimize":"Minimera"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Punktmerktur listi","numberedlist":"Talmerktur listi"},"language":{"button":"Velja tungumál","remove":"Remove language"},"justify":{"block":"Javnir tekstkantar","center":"Miðsett","left":"Vinstrasett","right":"Høgrasett"},"indent":{"indent":"Økja reglubrotarinntriv","outdent":"Minka reglubrotarinntriv"},"image2":{"alt":"Alternativur tekstur","btnUpload":"Send til ambætaran","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Myndaupplýsingar","lockRatio":"Læs lutfallið","menu":"Myndaeginleikar","pathName":"image","pathNameCaption":"caption","resetSize":"Upprunastødd","resizer":"Click and drag to resize","title":"Myndaeginleikar","uploadTab":"Send til ambætaran","urlMissing":"URL til mynd manglar.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Ger vatnrætta linju"},"format":{"label":"Skriftsnið","panelTitle":"Skriftsnið","tag_address":"Adressa","tag_div":"Vanligt (DIV)","tag_h1":"Yvirskrift 1","tag_h2":"Yvirskrift 2","tag_h3":"Yvirskrift 3","tag_h4":"Yvirskrift 4","tag_h5":"Yvirskrift 5","tag_h6":"Yvirskrift 6","tag_p":"Vanligt","tag_pre":"Sniðgivið"},"elementspath":{"eleLabel":"Slóð til elementir","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Avrita","copyError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (Ctrl/Cmd+C).","cut":"Kvett","cutError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (Ctrl/Cmd+X).","paste":"Innrita","pasteArea":"Avritingarumráði","pasteMsg":"Vinarliga koyr tekstin í hendan rútin við knappaborðinum (<strong>Ctrl/Cmd+V</strong>) og klikk á <strong>Góðtak</strong>.","securityMsg":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í beinleiðis atgongd til avritingarminnið. Tygum mugu royna aftur í hesum rútinum.","title":"Innrita"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blockquote"},"basicstyles":{"bold":"Feit skrift","italic":"Skráskrift","strike":"Yvirstrikað","subscript":"Lækkað skrift","superscript":"Hækkað skrift","underline":"Undirstrikað"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Um CKEditor","help":"Kekka $1 fyri hjálp.","moreInfo":"Licens upplýsingar finnast á heimasíðu okkara:","title":"Um CKEditor","userGuide":"CKEditor Brúkaravegleiðing"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Trýst ALT og 0 fyri vegleiðing","browseServer":"Ambætarakagi","url":"URL","protocol":"Protokoll","upload":"Send til ambætaran","uploadSubmit":"Send til ambætaran","image":"Myndir","flash":"Flash","form":"Formur","checkbox":"Flugubein","radio":"Radioknøttur","textField":"Tekstteigur","textarea":"Tekstumráði","hiddenField":"Fjaldur teigur","button":"Knøttur","select":"Valskrá","imageButton":"Myndaknøttur","notSet":"<ikki sett>","id":"Id","name":"Navn","langDir":"Tekstkós","langDirLtr":"Frá vinstru til høgru (LTR)","langDirRtl":"Frá høgru til vinstru (RTL)","langCode":"Málkoda","longDescr":"Víðkað URL frágreiðing","cssClass":"Typografi klassar","advisoryTitle":"Vegleiðandi heiti","cssStyle":"Typografi","ok":"Góðkent","cancel":"Avlýs","close":"Lat aftur","preview":"Frumsýn","resize":"Drag fyri at broyta stødd","generalTab":"Generelt","advancedTab":"Fjølbroytt","validateNumberFailed":"Hetta er ikki eitt tal.","confirmNewPage":"Allar ikki goymdar broytingar í hesum innihaldið hvørva. Skal nýggj síða lesast kortini?","confirmCancel":"Nakrir valmøguleikar eru broyttir. Ert tú vísur í, at dialogurin skal latast aftur?","options":"Options","target":"Target","targetNew":"Nýtt vindeyga (_blank)","targetTop":"Vindeyga ovast (_top)","targetSelf":"Sama vindeyga (_self)","targetParent":"Upphavligt vindeyga (_parent)","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Breidd","height":"Hædd","align":"Justering","alignLeft":"Vinstra","alignRight":"Høgra","alignCenter":"Miðsett","alignJustify":"Javnir tekstkantar","alignTop":"Ovast","alignMiddle":"Miðja","alignBottom":"Botnur","alignNone":"Eingin","invalidValue":"Invalid value.","invalidHeight":"Hædd má vera eitt tal.","invalidWidth":"Breidd má vera eitt tal.","invalidCssLength":"Virðið sett í \"%1\" feltið má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px, %, in, cm, mm, em, ex, pt, ella pc).","invalidHtmlLength":"Virðið sett í \"%1\" feltiðield má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px ella %).","invalidInlineStyle":"Virði specifiserað fyri inline style má hava eitt ella fleiri pør (tuples) skrivað sum \"name : value\", hvørt parið sundurskilt við semi-colon.","cssLengthTooltip":"Skriva eitt tal fyri eitt virði í pixels ella eitt tal við gyldigum CSS eind (px, %, in, cm, mm, em, ex, pt, ella pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikki tøkt</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/fr-ca.js b/web/core/assets/vendor/ckeditor/lang/fr-ca.js
index 58a8f30f6..3c61bf844 100644
--- a/web/core/assets/vendor/ckeditor/lang/fr-ca.js
+++ b/web/core/assets/vendor/ckeditor/lang/fr-ca.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fr-ca']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Refaire","undo":"Annuler"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse papier/Annuler","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"table":{"border":"Taille de la bordure","caption":"Titre","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer des cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Retour à la ligne","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de cellule doit être un nombre.","invalidHeight":"La hauteur de cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Sélectionner"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer des colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux.","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer des lignes"},"rows":"Lignes","summary":"Résumé","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pourcentage","widthPx":"pixels","widthUnit":"unité de largeur"},"stylescombo":{"label":"Styles","panelTitle":"Styles de formattage","panelTitle1":"Styles de block","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"specialchar":{"options":"Option des caractères spéciaux","title":"Sélectionner un caractère spécial","toolbar":"Insérer un caractère spécial"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Afficher les blocs"},"removeformat":{"toolbar":"Supprimer le formatage"},"pastetext":{"button":"Coller comme texte","title":"Coller comme texte"},"pastefromword":{"confirmCleanup":"Le texte que vous tentez de coller semble provenir de Word.  Désirez vous le nettoyer avant de coller?","error":"Il n'a pas été possible de nettoyer les données collées du à une erreur interne","title":"Coller de Word","toolbar":"Coller de Word"},"maximize":{"maximize":"Maximizer","minimize":"Minimizer"},"magicline":{"title":"Insérer le paragraphe ici"},"list":{"bulletedlist":"Liste à puces","numberedlist":"Liste numérotée"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justifié","center":"Centré","left":"Aligner à gauche","right":"Aligner à Droite"},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"image2":{"alt":"Texte alternatif","btnUpload":"Envoyer sur le serveur","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informations sur l'image2","lockRatio":"Verrouiller les proportions","menu":"Propriétés de l'image2","pathName":"image","pathNameCaption":"caption","resetSize":"Taille originale","resizer":"Click and drag to resize","title":"Propriétés de l'image2","uploadTab":"Téléverser","urlMissing":"L'URL de la source de l'image est manquant."},"horizontalrule":{"toolbar":"Insérer un séparateur horizontale"},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"En-tête 1","tag_h2":"En-tête 2","tag_h3":"En-tête 3","tag_h4":"En-tête 4","tag_h5":"En-tête 5","tag_h6":"En-tête 6","tag_p":"Normal","tag_pre":"Formaté"},"elementspath":{"eleLabel":"Chemin d'éléments","eleTitle":"element %1"},"contextmenu":{"options":"Options du menu contextuel"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl/Cmd+V</STRONG>) et appuyer sur <STRONG>OK</STRONG>.","securityMsg":"A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Citation"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour l'aide.","moreInfo":"Pour les informations de licence, consulter notre site internet:","title":"À propos de CKEditor","userGuide":"Guide utilisateur de CKEditor"},"editor":"Éditeur de texte enrichi","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Appuyez sur 0 pour de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Envoyer","uploadSubmit":"Envoyer au serveur","image":"Image","flash":"Animation Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<Par défaut>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"De gauche à droite (LTR)","langDirRtl":"De droite à gauche (RTL)","langCode":"Code langue","longDescr":"URL de description longue","cssClass":"Classes CSS","advisoryTitle":"Titre","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous certain de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées.  Êtes-vous certain de vouloir fermer?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieur (_top)","targetSelf":"Cette fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","styles":"Style","cssClasses":"Classe CSS","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centré","alignJustify":"Justifié","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"None","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style intégré doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour la valeur en pixel ou un nombre avec une unité CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>"}};
\ No newline at end of file
+CKEDITOR.lang['fr-ca']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Refaire","undo":"Annuler"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse papier/Annuler","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"table":{"border":"Taille de la bordure","caption":"Titre","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer des cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Retour à la ligne","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de cellule doit être un nombre.","invalidHeight":"La hauteur de cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Sélectionner"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer des colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux.","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer des lignes"},"rows":"Lignes","summary":"Résumé","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pourcentage","widthPx":"pixels","widthUnit":"unité de largeur"},"stylescombo":{"label":"Styles","panelTitle":"Styles de formattage","panelTitle1":"Styles de block","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"specialchar":{"options":"Option des caractères spéciaux","title":"Sélectionner un caractère spécial","toolbar":"Insérer un caractère spécial"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Afficher les blocs"},"removeformat":{"toolbar":"Supprimer le formatage"},"pastetext":{"button":"Coller comme texte","title":"Coller comme texte"},"pastefromword":{"confirmCleanup":"Le texte que vous tentez de coller semble provenir de Word.  Désirez vous le nettoyer avant de coller?","error":"Il n'a pas été possible de nettoyer les données collées du à une erreur interne","title":"Coller de Word","toolbar":"Coller de Word"},"maximize":{"maximize":"Maximizer","minimize":"Minimizer"},"magicline":{"title":"Insérer le paragraphe ici"},"list":{"bulletedlist":"Liste à puces","numberedlist":"Liste numérotée"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justifié","center":"Centré","left":"Aligner à gauche","right":"Aligner à Droite"},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"image2":{"alt":"Texte alternatif","btnUpload":"Envoyer sur le serveur","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informations sur l'image2","lockRatio":"Verrouiller les proportions","menu":"Propriétés de l'image2","pathName":"image","pathNameCaption":"caption","resetSize":"Taille originale","resizer":"Click and drag to resize","title":"Propriétés de l'image2","uploadTab":"Téléverser","urlMissing":"L'URL de la source de l'image est manquant.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Insérer un séparateur horizontale"},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"En-tête 1","tag_h2":"En-tête 2","tag_h3":"En-tête 3","tag_h4":"En-tête 4","tag_h5":"En-tête 5","tag_h6":"En-tête 6","tag_p":"Normal","tag_pre":"Formaté"},"elementspath":{"eleLabel":"Chemin d'éléments","eleTitle":"element %1"},"contextmenu":{"options":"Options du menu contextuel"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl/Cmd+V</STRONG>) et appuyer sur <STRONG>OK</STRONG>.","securityMsg":"A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Citation"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour l'aide.","moreInfo":"Pour les informations de licence, consulter notre site internet:","title":"À propos de CKEditor","userGuide":"Guide utilisateur de CKEditor"},"editor":"Éditeur de texte enrichi","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Appuyez sur 0 pour de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Envoyer","uploadSubmit":"Envoyer au serveur","image":"Image","flash":"Animation Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<Par défaut>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"De gauche à droite (LTR)","langDirRtl":"De droite à gauche (RTL)","langCode":"Code langue","longDescr":"URL de description longue","cssClass":"Classes CSS","advisoryTitle":"Titre","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous certain de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées.  Êtes-vous certain de vouloir fermer?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieur (_top)","targetSelf":"Cette fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","styles":"Style","cssClasses":"Classe CSS","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centré","alignJustify":"Justifié","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"None","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style intégré doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour la valeur en pixel ou un nombre avec une unité CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/fr.js b/web/core/assets/vendor/ckeditor/lang/fr.js
index de39bea10..996cf5f82 100644
--- a/web/core/assets/vendor/ckeditor/lang/fr.js
+++ b/web/core/assets/vendor/ckeditor/lang/fr.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fr']={"widget":{"move":"Cliquer et glisser pour déplacer","label":"Élément %1"},"undo":{"redo":"Rétablir","undo":"Annuler"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse-papier/Défaire","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barres d'outils de l'éditeur"},"table":{"border":"Taille de la bordure","caption":"Titre du tableau","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer les cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner vers la droite","mergeDown":"Fusionner vers le bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Lignes occupées","colSpan":"Colonnes occupées","wordWrap":"Césure","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Ligne de base","bgColor":"Couleur d'arrière-plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de la cellule doit être un nombre.","invalidHeight":"La hauteur de la cellule doit être un nombre.","invalidRowSpan":"Le nombre de colonnes occupées doit être un nombre entier.","invalidColSpan":"Le nombre de colonnes occupées doit être un nombre entier.","chooseColor":"Choisir"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement entre les cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer les colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de la bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement entre les cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer les lignes"},"rows":"Lignes","summary":"Résumé (description)","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pour cent","widthPx":"pixels","widthUnit":"unité de largeur"},"stylescombo":{"label":"Styles","panelTitle":"Styles de mise en forme","panelTitle1":"Styles de bloc","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"specialchar":{"options":"Options des caractères spéciaux","title":"Sélectionner un caractère","toolbar":"Insérer un caractère spécial"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Afficher les blocs"},"removeformat":{"toolbar":"Supprimer la mise en forme"},"pastetext":{"button":"Coller comme texte brut","title":"Coller comme texte brut"},"pastefromword":{"confirmCleanup":"Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller ?","error":"Les données collées n'ont pas pu être nettoyées à cause d'une erreur interne","title":"Coller depuis Word","toolbar":"Coller depuis Word"},"maximize":{"maximize":"Agrandir","minimize":"Réduire"},"magicline":{"title":"Insérer un paragraphe ici"},"list":{"bulletedlist":"Insérer/Supprimer une liste à puces","numberedlist":"Insérer/Supprimer une liste numérotée"},"language":{"button":"Définir la langue","remove":"Supprimer la langue"},"justify":{"block":"Justifier","center":"Centrer","left":"Aligner à gauche","right":"Aligner à droite"},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"image2":{"alt":"Texte alternatif","btnUpload":"Envoyer sur le serveur","captioned":"Image légendée","captionPlaceholder":"Légende","infoTab":"Informations sur l'image","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image","pathName":"image","pathNameCaption":"légende","resetSize":"Réinitialiser la taille","resizer":"Cliquer et glisser pour redimensionner","title":"Propriétés de l'image","uploadTab":"Téléverser","urlMissing":"L'URL source de l'image est manquante."},"horizontalrule":{"toolbar":"Ligne horizontale"},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Division","tag_h1":"Titre 1","tag_h2":"Titre 2","tag_h3":"Titre 3","tag_h4":"Titre 4","tag_h5":"Titre 5","tag_h6":"Titre 6","tag_p":"Normal","tag_pre":"Préformaté"},"elementspath":{"eleLabel":"Chemin des éléments","eleTitle":"Élément %1"},"contextmenu":{"options":"Options du menu contextuel"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Copier ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Couper ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller le texte dans la zone suivante en utilisant le raccourci clavier (<strong>Ctrl/Cmd+V</strong>) et cliquez sur OK.","securityMsg":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur d'accéder directement aux données du presse-papier. Vous devez les coller à nouveau dans cette fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Sélectionné)"},"blockquote":{"toolbar":"Citation"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour obtenir de l'aide.","moreInfo":"Pour les informations de licence, veuillez visiter notre site web :","title":"À propos de CKEditor","userGuide":"Guide de l'utilisateur CKEditor (en anglais)"},"editor":"Éditeur de texte enrichi","editorPanel":"Tableau de bord de l'éditeur de texte enrichi","common":{"editorHelp":"Utilisez le raccourci Alt-0 pour obtenir de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Téléverser","uploadSubmit":"Envoyer sur le serveur","image":"Image","flash":"Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ invisible","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton avec image","notSet":"<indéfini>","id":"ID","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"Gauche à droite (LTR)","langDirRtl":"Droite à gauche (RTL)","langCode":"Code de langue","longDescr":"URL de description longue","cssClass":"Classes de style","advisoryTitle":"Infobulle","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page ?","confirmCancel":"Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer ?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieure (_top)","targetSelf":"Même fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"Gauche à droite (LTR)","langDirRTL":"Droite à gauche (RTL)","styles":"Style","cssClasses":"Classes de style","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centrer","alignJustify":"Justifier","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"Aucun","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style en ligne doit être composée d'un ou plusieurs couples au format « nom : valeur », séparés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>"}};
\ No newline at end of file
+CKEDITOR.lang['fr']={"widget":{"move":"Cliquer et glisser pour déplacer","label":"Élément %1"},"undo":{"redo":"Rétablir","undo":"Annuler"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse-papier/Défaire","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barres d'outils de l'éditeur"},"table":{"border":"Taille de la bordure","caption":"Titre du tableau","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer les cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner vers la droite","mergeDown":"Fusionner vers le bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Lignes occupées","colSpan":"Colonnes occupées","wordWrap":"Césure","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Ligne de base","bgColor":"Couleur d'arrière-plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de la cellule doit être un nombre.","invalidHeight":"La hauteur de la cellule doit être un nombre.","invalidRowSpan":"Le nombre de colonnes occupées doit être un nombre entier.","invalidColSpan":"Le nombre de colonnes occupées doit être un nombre entier.","chooseColor":"Choisir"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement entre les cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer les colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de la bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement entre les cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer les lignes"},"rows":"Lignes","summary":"Résumé (description)","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pour cent","widthPx":"pixels","widthUnit":"unité de largeur"},"stylescombo":{"label":"Styles","panelTitle":"Styles de mise en forme","panelTitle1":"Styles de bloc","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"specialchar":{"options":"Options des caractères spéciaux","title":"Sélectionner un caractère","toolbar":"Insérer un caractère spécial"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Afficher les blocs"},"removeformat":{"toolbar":"Supprimer la mise en forme"},"pastetext":{"button":"Coller comme texte brut","title":"Coller comme texte brut"},"pastefromword":{"confirmCleanup":"Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller ?","error":"Les données collées n'ont pas pu être nettoyées à cause d'une erreur interne","title":"Coller depuis Word","toolbar":"Coller depuis Word"},"maximize":{"maximize":"Agrandir","minimize":"Réduire"},"magicline":{"title":"Insérer un paragraphe ici"},"list":{"bulletedlist":"Insérer/Supprimer une liste à puces","numberedlist":"Insérer/Supprimer une liste numérotée"},"language":{"button":"Définir la langue","remove":"Supprimer la langue"},"justify":{"block":"Justifier","center":"Centrer","left":"Aligner à gauche","right":"Aligner à droite"},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"image2":{"alt":"Texte alternatif","btnUpload":"Envoyer sur le serveur","captioned":"Image légendée","captionPlaceholder":"Légende","infoTab":"Informations sur l'image","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image","pathName":"image","pathNameCaption":"légende","resetSize":"Réinitialiser la taille","resizer":"Cliquer et glisser pour redimensionner","title":"Propriétés de l'image","uploadTab":"Téléverser","urlMissing":"L'URL source de l'image est manquante.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Ligne horizontale"},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Division","tag_h1":"Titre 1","tag_h2":"Titre 2","tag_h3":"Titre 3","tag_h4":"Titre 4","tag_h5":"Titre 5","tag_h6":"Titre 6","tag_p":"Normal","tag_pre":"Préformaté"},"elementspath":{"eleLabel":"Chemin des éléments","eleTitle":"Élément %1"},"contextmenu":{"options":"Options du menu contextuel"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Copier ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Couper ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller le texte dans la zone suivante en utilisant le raccourci clavier (<strong>Ctrl/Cmd+V</strong>) et cliquez sur OK.","securityMsg":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur d'accéder directement aux données du presse-papier. Vous devez les coller à nouveau dans cette fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Sélectionné)"},"blockquote":{"toolbar":"Citation"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour obtenir de l'aide.","moreInfo":"Pour les informations de licence, veuillez visiter notre site web :","title":"À propos de CKEditor","userGuide":"Guide de l'utilisateur CKEditor (en anglais)"},"editor":"Éditeur de texte enrichi","editorPanel":"Tableau de bord de l'éditeur de texte enrichi","common":{"editorHelp":"Utilisez le raccourci Alt-0 pour obtenir de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Téléverser","uploadSubmit":"Envoyer sur le serveur","image":"Image","flash":"Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ invisible","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton avec image","notSet":"<indéfini>","id":"ID","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"Gauche à droite (LTR)","langDirRtl":"Droite à gauche (RTL)","langCode":"Code de langue","longDescr":"URL de description longue","cssClass":"Classes de style","advisoryTitle":"Infobulle","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page ?","confirmCancel":"Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer ?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieure (_top)","targetSelf":"Même fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"Gauche à droite (LTR)","langDirRTL":"Droite à gauche (RTL)","styles":"Style","cssClasses":"Classes de style","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centrer","alignJustify":"Justifier","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"Aucun","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style en ligne doit être composée d'un ou plusieurs couples au format « nom : valeur », séparés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Backspace","13":"Entrée","16":"Majuscule","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Origine","46":"Supprimer","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/gl.js b/web/core/assets/vendor/ckeditor/lang/gl.js
index c3766579d..6809d4631 100644
--- a/web/core/assets/vendor/ckeditor/lang/gl.js
+++ b/web/core/assets/vendor/ckeditor/lang/gl.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['gl']={"widget":{"move":"Prema e arrastre para mover","label":"%1 widget"},"undo":{"redo":"Refacer","undo":"Desfacer"},"toolbar":{"toolbarCollapse":"Contraer a barra de ferramentas","toolbarExpand":"Expandir a barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeis/desfacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Paragrafo","links":"Ligazóns","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barras de ferramentas do editor"},"table":{"border":"Tamaño do bordo","caption":"Título","cell":{"menu":"Cela","insertBefore":"Inserir a cela á esquerda","insertAfter":"Inserir a cela á dereita","deleteCell":"Eliminar celas","merge":"Combinar celas","mergeRight":"Combinar á dereita","mergeDown":"Combinar cara abaixo","splitHorizontal":"Dividir a cela en horizontal","splitVertical":"Dividir a cela en vertical","title":"Propiedades da cela","cellType":"Tipo de cela","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Axustar ao contido","hAlign":"Aliñación horizontal","vAlign":"Aliñación vertical","alignBaseline":"Liña de base","bgColor":"Cor do fondo","borderColor":"Cor do bordo","data":"Datos","header":"Cabeceira","yes":"Si","no":"Non","invalidWidth":"O largo da cela debe ser un número.","invalidHeight":"O alto da cela debe ser un número.","invalidRowSpan":"A expansión de filas debe ser un número enteiro.","invalidColSpan":"A expansión de columnas debe ser un número enteiro.","chooseColor":"Escoller"},"cellPad":"Marxe interior da cela","cellSpace":"Marxe entre celas","column":{"menu":"Columna","insertBefore":"Inserir a columna á esquerda","insertAfter":"Inserir a columna á dereita","deleteColumn":"Borrar Columnas"},"columns":"Columnas","deleteTable":"Borrar Táboa","headers":"Cabeceiras","headersBoth":"Ambas","headersColumn":"Primeira columna","headersNone":"Ningún","headersRow":"Primeira fila","invalidBorder":"O tamaño do bordo debe ser un número.","invalidCellPadding":"A marxe interior debe ser un número positivo.","invalidCellSpacing":"A marxe entre celas debe ser un número positivo.","invalidCols":"O número de columnas debe ser un número maior que 0.","invalidHeight":"O alto da táboa debe ser un número.","invalidRows":"O número de filas debe ser un número maior que 0","invalidWidth":"O largo da táboa debe ser un número.","menu":"Propiedades da táboa","row":{"menu":"Fila","insertBefore":"Inserir a fila por riba","insertAfter":"Inserir a fila por baixo","deleteRow":"Eliminar filas"},"rows":"Filas","summary":"Resumo","title":"Propiedades da táboa","toolbar":"Taboa","widthPc":"porcentaxe","widthPx":"píxeles","widthUnit":"unidade do largo"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de formatando","panelTitle1":"Estilos de bloque","panelTitle2":"Estilos de liña","panelTitle3":"Estilos de obxecto"},"specialchar":{"options":"Opcións de caracteres especiais","title":"Seleccione un carácter especial","toolbar":"Inserir un carácter especial"},"sourcedialog":{"toolbar":"Orixe","title":"Orixe"},"sourcearea":{"toolbar":"Orixe"},"showblocks":{"toolbar":"Amosar os bloques"},"removeformat":{"toolbar":"Retirar o formato"},"pastetext":{"button":"Pegar como texto simple","title":"Pegar como texto simple"},"pastefromword":{"confirmCleanup":"O texto que quere pegar semella ser copiado desde o Word. Quere depuralo antes de pegalo?","error":"Non foi posíbel depurar os datos pegados por mor dun erro interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Inserir aquí o parágrafo"},"list":{"bulletedlist":"Inserir/retirar lista viñeteada","numberedlist":"Inserir/retirar lista numerada"},"language":{"button":"Estabelezer o idioma","remove":"Retirar o idioma"},"justify":{"block":"Xustificado","center":"Centrado","left":"Aliñar á esquerda","right":"Aliñar á dereita"},"indent":{"indent":"Aumentar a sangría","outdent":"Reducir a sangría"},"image2":{"alt":"Texto alternativo","btnUpload":"Enviar ao servidor","captioned":"Imaxe con lenda","captionPlaceholder":"Lenda","infoTab":"Información da imaxe","lockRatio":"Proporcional","menu":"Propiedades da imaxe","pathName":"Imaxe","pathNameCaption":"lenda","resetSize":"Tamaño orixinal","resizer":"Prema e arrastre para axustar o tamaño","title":"Propiedades da imaxe","uploadTab":"Cargar","urlMissing":"Non se atopa o URL da imaxe."},"horizontalrule":{"toolbar":"Inserir unha liña horizontal"},"format":{"label":"Formato","panelTitle":"Formato do parágrafo","tag_address":"Enderezo","tag_div":"Normal  (DIV)","tag_h1":"Enacabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Ruta dos elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Opcións do menú contextual"},"clipboard":{"copy":"Copiar","copyError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de copia. Use o teclado para iso (Ctrl/Cmd+C).","cut":"Cortar","cutError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de corte. Use o teclado para iso (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Pegue dentro do seguinte cadro usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prema en Aceptar","securityMsg":"Por mor da configuración de seguranza do seu navegador, o editor non ten acceso ao portapapeis. É necesario pegalo novamente nesta xanela.","title":"Pegar"},"button":{"selectedLabel":"%1 (seleccionado)"},"blockquote":{"toolbar":"Cita"},"basicstyles":{"bold":"Negra","italic":"Cursiva","strike":"Riscado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subliñado"},"about":{"copy":"Copyright &copy; $1. Todos os dereitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Consulte $1 para obter axuda.","moreInfo":"Para obter  información sobre a licenza, visite o noso sitio web:","title":"Sobre o CKEditor","userGuide":"Guía do usuario do CKEditor"},"editor":"Editor de texto mellorado","editorPanel":"Panel do editor de texto mellorado","common":{"editorHelp":"Prema ALT 0 para obter axuda","browseServer":"Examinar o servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar ao servidor","image":"Imaxe","flash":"Flash","form":"Formulario","checkbox":"Caixa de selección","radio":"Botón de opción","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo agochado","button":"Botón","select":"Campo de selección","imageButton":"Botón de imaxe","notSet":"<sen estabelecer>","id":"ID","name":"Nome","langDir":"Dirección de escritura do idioma","langDirLtr":"Esquerda a dereita (LTR)","langDirRtl":"Dereita a esquerda (RTL)","langCode":"Código do idioma","longDescr":"Descrición completa do URL","cssClass":"Clases da folla de estilos","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Pechar","preview":"Vista previa","resize":"Redimensionar","generalTab":"Xeral","advancedTab":"Avanzado","validateNumberFailed":"Este valor non é un número.","confirmNewPage":"Calquera cambio que non gardara neste contido perderase.\r\nConfirma que quere cargar unha páxina nova?","confirmCancel":"Algunhas das opcións foron cambiadas.\r\nConfirma que quere pechar o diálogo?","options":"Opcións","target":"Destino","targetNew":"Nova xanela (_blank)","targetTop":"Xanela principal (_top)","targetSelf":"Mesma xanela (_self)","targetParent":"Xanela superior (_parent)","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","styles":"Estilo","cssClasses":"Clases da folla de estilos","width":"Largo","height":"Alto","align":"Aliñamento","alignLeft":"Esquerda","alignRight":"Dereita","alignCenter":"Centro","alignJustify":"Xustificado","alignTop":"Arriba","alignMiddle":"Centro","alignBottom":"Abaixo","alignNone":"Ningún","invalidValue":"Valor incorrecto.","invalidHeight":"O alto debe ser un número.","invalidWidth":"O largo debe ser un número.","invalidCssLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida HTML correcta (px ou %).","invalidInlineStyle":"O valor especificado no estilo en liña debe consistir nunha ou máis tuplas co formato «nome : valor», separadas por punto e coma.","cssLengthTooltip":"Escriba un número para o valor en píxeles ou un número cunha unidade CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, non dispoñíbel</span>"}};
\ No newline at end of file
+CKEDITOR.lang['gl']={"widget":{"move":"Prema e arrastre para mover","label":"%1 widget"},"undo":{"redo":"Refacer","undo":"Desfacer"},"toolbar":{"toolbarCollapse":"Contraer a barra de ferramentas","toolbarExpand":"Expandir a barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeis/desfacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Paragrafo","links":"Ligazóns","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barras de ferramentas do editor"},"table":{"border":"Tamaño do bordo","caption":"Título","cell":{"menu":"Cela","insertBefore":"Inserir a cela á esquerda","insertAfter":"Inserir a cela á dereita","deleteCell":"Eliminar celas","merge":"Combinar celas","mergeRight":"Combinar á dereita","mergeDown":"Combinar cara abaixo","splitHorizontal":"Dividir a cela en horizontal","splitVertical":"Dividir a cela en vertical","title":"Propiedades da cela","cellType":"Tipo de cela","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Axustar ao contido","hAlign":"Aliñación horizontal","vAlign":"Aliñación vertical","alignBaseline":"Liña de base","bgColor":"Cor do fondo","borderColor":"Cor do bordo","data":"Datos","header":"Cabeceira","yes":"Si","no":"Non","invalidWidth":"O largo da cela debe ser un número.","invalidHeight":"O alto da cela debe ser un número.","invalidRowSpan":"A expansión de filas debe ser un número enteiro.","invalidColSpan":"A expansión de columnas debe ser un número enteiro.","chooseColor":"Escoller"},"cellPad":"Marxe interior da cela","cellSpace":"Marxe entre celas","column":{"menu":"Columna","insertBefore":"Inserir a columna á esquerda","insertAfter":"Inserir a columna á dereita","deleteColumn":"Borrar Columnas"},"columns":"Columnas","deleteTable":"Borrar Táboa","headers":"Cabeceiras","headersBoth":"Ambas","headersColumn":"Primeira columna","headersNone":"Ningún","headersRow":"Primeira fila","invalidBorder":"O tamaño do bordo debe ser un número.","invalidCellPadding":"A marxe interior debe ser un número positivo.","invalidCellSpacing":"A marxe entre celas debe ser un número positivo.","invalidCols":"O número de columnas debe ser un número maior que 0.","invalidHeight":"O alto da táboa debe ser un número.","invalidRows":"O número de filas debe ser un número maior que 0","invalidWidth":"O largo da táboa debe ser un número.","menu":"Propiedades da táboa","row":{"menu":"Fila","insertBefore":"Inserir a fila por riba","insertAfter":"Inserir a fila por baixo","deleteRow":"Eliminar filas"},"rows":"Filas","summary":"Resumo","title":"Propiedades da táboa","toolbar":"Taboa","widthPc":"porcentaxe","widthPx":"píxeles","widthUnit":"unidade do largo"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de formatando","panelTitle1":"Estilos de bloque","panelTitle2":"Estilos de liña","panelTitle3":"Estilos de obxecto"},"specialchar":{"options":"Opcións de caracteres especiais","title":"Seleccione un carácter especial","toolbar":"Inserir un carácter especial"},"sourcedialog":{"toolbar":"Orixe","title":"Orixe"},"sourcearea":{"toolbar":"Orixe"},"showblocks":{"toolbar":"Amosar os bloques"},"removeformat":{"toolbar":"Retirar o formato"},"pastetext":{"button":"Pegar como texto simple","title":"Pegar como texto simple"},"pastefromword":{"confirmCleanup":"O texto que quere pegar semella ser copiado desde o Word. Quere depuralo antes de pegalo?","error":"Non foi posíbel depurar os datos pegados por mor dun erro interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Inserir aquí o parágrafo"},"list":{"bulletedlist":"Inserir/retirar lista viñeteada","numberedlist":"Inserir/retirar lista numerada"},"language":{"button":"Estabelezer o idioma","remove":"Retirar o idioma"},"justify":{"block":"Xustificado","center":"Centrado","left":"Aliñar á esquerda","right":"Aliñar á dereita"},"indent":{"indent":"Aumentar a sangría","outdent":"Reducir a sangría"},"image2":{"alt":"Texto alternativo","btnUpload":"Enviar ao servidor","captioned":"Imaxe con lenda","captionPlaceholder":"Lenda","infoTab":"Información da imaxe","lockRatio":"Proporcional","menu":"Propiedades da imaxe","pathName":"Imaxe","pathNameCaption":"lenda","resetSize":"Tamaño orixinal","resizer":"Prema e arrastre para axustar o tamaño","title":"Propiedades da imaxe","uploadTab":"Cargar","urlMissing":"Non se atopa o URL da imaxe.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Inserir unha liña horizontal"},"format":{"label":"Formato","panelTitle":"Formato do parágrafo","tag_address":"Enderezo","tag_div":"Normal  (DIV)","tag_h1":"Enacabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Ruta dos elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Opcións do menú contextual"},"clipboard":{"copy":"Copiar","copyError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de copia. Use o teclado para iso (Ctrl/Cmd+C).","cut":"Cortar","cutError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de corte. Use o teclado para iso (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Pegue dentro do seguinte cadro usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prema en Aceptar","securityMsg":"Por mor da configuración de seguranza do seu navegador, o editor non ten acceso ao portapapeis. É necesario pegalo novamente nesta xanela.","title":"Pegar"},"button":{"selectedLabel":"%1 (seleccionado)"},"blockquote":{"toolbar":"Cita"},"basicstyles":{"bold":"Negra","italic":"Cursiva","strike":"Riscado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subliñado"},"about":{"copy":"Copyright &copy; $1. Todos os dereitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Consulte $1 para obter axuda.","moreInfo":"Para obter  información sobre a licenza, visite o noso sitio web:","title":"Sobre o CKEditor","userGuide":"Guía do usuario do CKEditor"},"editor":"Editor de texto mellorado","editorPanel":"Panel do editor de texto mellorado","common":{"editorHelp":"Prema ALT 0 para obter axuda","browseServer":"Examinar o servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar ao servidor","image":"Imaxe","flash":"Flash","form":"Formulario","checkbox":"Caixa de selección","radio":"Botón de opción","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo agochado","button":"Botón","select":"Campo de selección","imageButton":"Botón de imaxe","notSet":"<sen estabelecer>","id":"ID","name":"Nome","langDir":"Dirección de escritura do idioma","langDirLtr":"Esquerda a dereita (LTR)","langDirRtl":"Dereita a esquerda (RTL)","langCode":"Código do idioma","longDescr":"Descrición completa do URL","cssClass":"Clases da folla de estilos","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Pechar","preview":"Vista previa","resize":"Redimensionar","generalTab":"Xeral","advancedTab":"Avanzado","validateNumberFailed":"Este valor non é un número.","confirmNewPage":"Calquera cambio que non gardara neste contido perderase.\r\nConfirma que quere cargar unha páxina nova?","confirmCancel":"Algunhas das opcións foron cambiadas.\r\nConfirma que quere pechar o diálogo?","options":"Opcións","target":"Destino","targetNew":"Nova xanela (_blank)","targetTop":"Xanela principal (_top)","targetSelf":"Mesma xanela (_self)","targetParent":"Xanela superior (_parent)","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","styles":"Estilo","cssClasses":"Clases da folla de estilos","width":"Largo","height":"Alto","align":"Aliñamento","alignLeft":"Esquerda","alignRight":"Dereita","alignCenter":"Centro","alignJustify":"Xustificado","alignTop":"Arriba","alignMiddle":"Centro","alignBottom":"Abaixo","alignNone":"Ningún","invalidValue":"Valor incorrecto.","invalidHeight":"O alto debe ser un número.","invalidWidth":"O largo debe ser un número.","invalidCssLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida HTML correcta (px ou %).","invalidInlineStyle":"O valor especificado no estilo en liña debe consistir nunha ou máis tuplas co formato «nome : valor», separadas por punto e coma.","cssLengthTooltip":"Escriba un número para o valor en píxeles ou un número cunha unidade CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, non dispoñíbel</span>","keyboard":{"8":"Backspace","13":"Intro","16":"Maiús","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Inicio","46":"Supr","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/gu.js b/web/core/assets/vendor/ckeditor/lang/gu.js
index 213ec1c93..51faa35e9 100644
--- a/web/core/assets/vendor/ckeditor/lang/gu.js
+++ b/web/core/assets/vendor/ckeditor/lang/gu.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['gu']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"રિડૂ; પછી હતી એવી સ્થિતિ પાછી લાવવી","undo":"રદ કરવું; પહેલાં હતી એવી સ્થિતિ પાછી લાવવી"},"toolbar":{"toolbarCollapse":"ટૂલબાર નાનું કરવું","toolbarExpand":"ટૂલબાર મોટું કરવું","toolbarGroups":{"document":"દસ્તાવેજ","clipboard":"ક્લિપબોર્ડ/અન","editing":"એડીટ કરવું","forms":"ફોર્મ","basicstyles":"બેસિક્ સ્ટાઇલ","paragraph":"ફકરો","links":"લીંક","insert":"ઉમેરવું","styles":"સ્ટાઇલ","colors":"રંગ","tools":"ટૂલ્સ"},"toolbars":"એડીટર ટૂલ બાર"},"table":{"border":"કોઠાની બાજુ(બોર્ડર) સાઇઝ","caption":"મથાળું/કૅપ્શન ","cell":{"menu":"કોષના ખાના","insertBefore":"પહેલાં કોષ ઉમેરવો","insertAfter":"પછી કોષ ઉમેરવો","deleteCell":"કોષ ડિલીટ/કાઢી નાખવો","merge":"કોષ ભેગા કરવા","mergeRight":"જમણી બાજુ ભેગા કરવા","mergeDown":"નીચે ભેગા કરવા","splitHorizontal":"કોષને સમસ્તરીય વિભાજન કરવું","splitVertical":"કોષને સીધું ને ઊભું વિભાજન કરવું","title":"સેલના ગુણ","cellType":"સેલનો પ્રકાર","rowSpan":"આડી કટારની જગ્યા","colSpan":"ઊભી કતારની જગ્યા","wordWrap":"વર્ડ રેપ","hAlign":"સપાટ લાઈનદોરી","vAlign":"ઊભી લાઈનદોરી","alignBaseline":"બસે લાઈન","bgColor":"પાછાળનો રંગ","borderColor":"બોર્ડેર રંગ","data":"સ્વીકૃત માહિતી","header":"મથાળું","yes":"હા","no":"ના","invalidWidth":"સેલની પોહલાઈ આંકડો હોવો જોઈએ.","invalidHeight":"સેલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRowSpan":"રો સ્પાન આંકડો હોવો જોઈએ.","invalidColSpan":"કોલમ સ્પાન આંકડો હોવો જોઈએ.","chooseColor":"પસંદ કરવું"},"cellPad":"સેલ પૅડિંગ","cellSpace":"સેલ અંતર","column":{"menu":"કૉલમ/ઊભી કટાર","insertBefore":"પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી","insertAfter":"પછી કૉલમ/ઊભી કટાર ઉમેરવી","deleteColumn":"કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી"},"columns":"કૉલમ/ઊભી કટાર","deleteTable":"કોઠો ડિલીટ/કાઢી નાખવું","headers":"મથાળા","headersBoth":"બેવું","headersColumn":"પહેલી ઊભી કટાર","headersNone":"નથી ","headersRow":"પહેલી  કટાર","invalidBorder":"બોર્ડર એક આંકડો હોવો જોઈએ","invalidCellPadding":"સેલની અંદરની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCellSpacing":"સેલ વચ્ચેની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCols":"ઉભી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidHeight":"ટેબલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRows":"આડી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidWidth":"ટેબલની પોહલાઈ આંકડો હોવો જોઈએ.","menu":"ટેબલ, કોઠાનું મથાળું","row":{"menu":"પંક્તિના ખાના","insertBefore":"પહેલાં પંક્તિ ઉમેરવી","insertAfter":"પછી પંક્તિ ઉમેરવી","deleteRow":"પંક્તિઓ ડિલીટ/કાઢી નાખવી"},"rows":"પંક્તિના ખાના","summary":"ટૂંકો એહેવાલ","title":"ટેબલ, કોઠાનું મથાળું","toolbar":"ટેબલ, કોઠો","widthPc":"પ્રતિશત","widthPx":"પિકસલ","widthUnit":"પોહાલાઈ એકમ"},"stylescombo":{"label":"શૈલી/રીત","panelTitle":"ફોર્મેટ ","panelTitle1":"બ્લોક ","panelTitle2":"ઈનલાઈન ","panelTitle3":"ઓબ્જેક્ટ પદ્ધતિ"},"specialchar":{"options":"સ્પેશિઅલ કરેક્ટરના વિકલ્પો","title":"સ્પેશિઅલ વિશિષ્ટ અક્ષર પસંદ કરો","toolbar":"વિશિષ્ટ અક્ષર ઇન્સર્ટ/દાખલ કરવું"},"sourcedialog":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ","title":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"sourcearea":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"showblocks":{"toolbar":"બ્લૉક બતાવવું"},"removeformat":{"toolbar":"ફૉર્મટ કાઢવું"},"pastetext":{"button":"પેસ્ટ (ટેક્સ્ટ)","title":"પેસ્ટ (ટેક્સ્ટ)"},"pastefromword":{"confirmCleanup":"તમે જે ટેક્ષ્ત્ કોપી કરી રહ્યા છો ટે વર્ડ ની છે. કોપી કરતા પેહલા સાફ કરવી છે?","error":"પેસ્ટ કરેલો ડેટા ઇન્ટરનલ એરર ના લીથે સાફ કરી શકાયો નથી.","title":"પેસ્ટ (વડૅ ટેક્સ્ટ)","toolbar":"પેસ્ટ (વડૅ ટેક્સ્ટ)"},"maximize":{"maximize":"મોટું કરવું","minimize":"નાનું કરવું"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"બુલેટ સૂચિ","numberedlist":"સંખ્યાંકન સૂચિ"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"બ્લૉક, અંતરાય જસ્ટિફાઇ","center":"સંકેંદ્રણ/સેંટરિંગ","left":"ડાબી બાજુએ/બાજુ તરફ","right":"જમણી બાજુએ/બાજુ તરફ"},"indent":{"indent":"ઇન્ડેન્ટ, લીટીના આરંભમાં જગ્યા વધારવી","outdent":"ઇન્ડેન્ટ લીટીના આરંભમાં જગ્યા ઘટાડવી"},"image2":{"alt":"ઑલ્ટર્નટ ટેક્સ્ટ","btnUpload":"આ સર્વરને મોકલવું","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ચિત્ર ની જાણકારી","lockRatio":"લૉક ગુણોત્તર","menu":"ચિત્રના ગુણ","pathName":"image","pathNameCaption":"caption","resetSize":"રીસેટ સાઇઝ","resizer":"Click and drag to resize","title":"ચિત્રના ગુણ","uploadTab":"અપલોડ","urlMissing":"ઈમેજની મૂળ URL છે નહી."},"horizontalrule":{"toolbar":"સમસ્તરીય રેખા ઇન્સર્ટ/દાખલ કરવી"},"format":{"label":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","panelTitle":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","tag_address":"સરનામું","tag_div":"શીર્ષક (DIV)","tag_h1":"શીર્ષક 1","tag_h2":"શીર્ષક 2","tag_h3":"શીર્ષક 3","tag_h4":"શીર્ષક 4","tag_h5":"શીર્ષક 5","tag_h6":"શીર્ષક 6","tag_p":"સામાન્ય","tag_pre":"ફૉર્મટેડ"},"elementspath":{"eleLabel":"એલીમેન્ટ્સ નો ","eleTitle":"એલીમેન્ટ %1"},"contextmenu":{"options":"કોન્તેક્ષ્ત્ મેનુના વિકલ્પો"},"clipboard":{"copy":"નકલ","copyError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl/Cmd+C) का प्रयोग करें।","cut":"કાપવું","cutError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl/Cmd+X) નો ઉપયોગ કરો.","paste":"પેસ્ટ","pasteArea":"પેસ્ટ કરવાની જગ્યા","pasteMsg":"Ctrl/Cmd+V નો પ્રયોગ કરી પેસ્ટ કરો","securityMsg":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસના કારણે,એડિટર તમારા કિલ્પબોર્ડ ડેટા ને કોપી નથી કરી શકતો. તમારે આ વિન્ડોમાં ફરીથી પેસ્ટ કરવું પડશે.","title":"પેસ્ટ"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"બ્લૉક-કોટ, અવતરણચિહ્નો"},"basicstyles":{"bold":"બોલ્ડ/સ્પષ્ટ","italic":"ઇટેલિક, ત્રાંસા","strike":"છેકી નાખવું","subscript":"એક ચિહ્નની નીચે કરેલું બીજું ચિહ્ન","superscript":"એક ચિહ્ન ઉપર કરેલું બીજું ચિહ્ન.","underline":"અન્ડર્લાઇન, નીચે લીટી"},"about":{"copy":"કોપીરાઈટ &copy; $1. ઓલ રાઈટ્સ ","dlgTitle":"CKEditor વિષે","help":"મદદ માટે $1 તપાસો","moreInfo":"લાયસનસની માહિતી માટે અમારી વેબ સાઈટ","title":"CKEditor વિષે","userGuide":"CKEditor યુઝર્સ ગાઈડ"},"editor":"રીચ ટેક્ષ્ત્ એડીટર","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"પ્રેસ ALT 0 મદદ માટ","browseServer":"સર્વર બ્રાઉઝ કરો","url":"URL","protocol":"પ્રોટોકૉલ","upload":"અપલોડ","uploadSubmit":"આ સર્વરને મોકલવું","image":"ચિત્ર","flash":"ફ્લૅશ","form":"ફૉર્મ/પત્રક","checkbox":"ચેક બોક્સ","radio":"રેડિઓ બટન","textField":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્ર","textarea":"ટેક્સ્ટ એરિઆ, શબ્દ વિસ્તાર","hiddenField":"ગુપ્ત ક્ષેત્ર","button":"બટન","select":"પસંદગી ક્ષેત્ર","imageButton":"ચિત્ર બટન","notSet":"<સેટ નથી>","id":"Id","name":"નામ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLtr":"ડાબે થી જમણે (LTR)","langDirRtl":"જમણે થી ડાબે (RTL)","langCode":"ભાષા કોડ","longDescr":"વધારે માહિતી માટે URL","cssClass":"સ્ટાઇલ-શીટ ક્લાસ","advisoryTitle":"મુખ્ય મથાળું","cssStyle":"સ્ટાઇલ","ok":"ઠીક છે","cancel":"રદ કરવું","close":"બંધ કરવું","preview":"જોવું","resize":"ખેંચી ને યોગ્ય કરવું","generalTab":"જનરલ","advancedTab":"અડ્વાન્સડ","validateNumberFailed":"આ રકમ આકડો નથી.","confirmNewPage":"સવે કાર્ય વગરનું ફકરો ખોવાઈ જશે. તમને ખાતરી છે કે તમને નવું પાનું ખોલવું છે?","confirmCancel":"ઘણા વિકલ્પો બદલાયા છે. તમારે આ બોક્ષ્ બંધ કરવું છે?","options":"વિકલ્પો","target":"લક્ષ્ય","targetNew":"નવી વિન્ડો (_blank)","targetTop":"ઉપરની વિન્ડો (_top)","targetSelf":"એજ વિન્ડો (_self)","targetParent":"પેરનટ વિન્ડો (_parent)","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","styles":"શૈલી","cssClasses":"શૈલી કલાસીસ","width":"પહોળાઈ","height":"ઊંચાઈ","align":"લાઇનદોરીમાં ગોઠવવું","alignLeft":"ડાબી બાજુ ગોઠવવું","alignRight":"જમણી","alignCenter":"મધ્ય સેન્ટર","alignJustify":"બ્લૉક, અંતરાય જસ્ટિફાઇ","alignTop":"ઉપર","alignMiddle":"વચ્ચે","alignBottom":"નીચે","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"ઉંચાઈ એક આંકડો હોવો જોઈએ.","invalidWidth":"પોહળ ઈ એક આંકડો હોવો જોઈએ.","invalidCssLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc) વગર.","invalidHtmlLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા HTML measurement unit (px or %) વગર.","invalidInlineStyle":"ઈનલાઈન  સ્ટાઈલ ની વેલ્યુ  \"name : value\" ના ફોર્મેટ માં હોવી જોઈએ, વચ્ચે સેમી-કોલોન જોઈએ.","cssLengthTooltip":"પિક્ષ્લ્ નો આંકડો CSS unit (px, %, in, cm, mm, em, ex, pt, or pc) માં નાખો.","unavailable":"%1<span class=\"cke_accessibility\">, નથી મળતું</span>"}};
\ No newline at end of file
+CKEDITOR.lang['gu']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"રિડૂ; પછી હતી એવી સ્થિતિ પાછી લાવવી","undo":"રદ કરવું; પહેલાં હતી એવી સ્થિતિ પાછી લાવવી"},"toolbar":{"toolbarCollapse":"ટૂલબાર નાનું કરવું","toolbarExpand":"ટૂલબાર મોટું કરવું","toolbarGroups":{"document":"દસ્તાવેજ","clipboard":"ક્લિપબોર્ડ/અન","editing":"એડીટ કરવું","forms":"ફોર્મ","basicstyles":"બેસિક્ સ્ટાઇલ","paragraph":"ફકરો","links":"લીંક","insert":"ઉમેરવું","styles":"સ્ટાઇલ","colors":"રંગ","tools":"ટૂલ્સ"},"toolbars":"એડીટર ટૂલ બાર"},"table":{"border":"કોઠાની બાજુ(બોર્ડર) સાઇઝ","caption":"મથાળું/કૅપ્શન ","cell":{"menu":"કોષના ખાના","insertBefore":"પહેલાં કોષ ઉમેરવો","insertAfter":"પછી કોષ ઉમેરવો","deleteCell":"કોષ ડિલીટ/કાઢી નાખવો","merge":"કોષ ભેગા કરવા","mergeRight":"જમણી બાજુ ભેગા કરવા","mergeDown":"નીચે ભેગા કરવા","splitHorizontal":"કોષને સમસ્તરીય વિભાજન કરવું","splitVertical":"કોષને સીધું ને ઊભું વિભાજન કરવું","title":"સેલના ગુણ","cellType":"સેલનો પ્રકાર","rowSpan":"આડી કટારની જગ્યા","colSpan":"ઊભી કતારની જગ્યા","wordWrap":"વર્ડ રેપ","hAlign":"સપાટ લાઈનદોરી","vAlign":"ઊભી લાઈનદોરી","alignBaseline":"બસે લાઈન","bgColor":"પાછાળનો રંગ","borderColor":"બોર્ડેર રંગ","data":"સ્વીકૃત માહિતી","header":"મથાળું","yes":"હા","no":"ના","invalidWidth":"સેલની પોહલાઈ આંકડો હોવો જોઈએ.","invalidHeight":"સેલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRowSpan":"રો સ્પાન આંકડો હોવો જોઈએ.","invalidColSpan":"કોલમ સ્પાન આંકડો હોવો જોઈએ.","chooseColor":"પસંદ કરવું"},"cellPad":"સેલ પૅડિંગ","cellSpace":"સેલ અંતર","column":{"menu":"કૉલમ/ઊભી કટાર","insertBefore":"પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી","insertAfter":"પછી કૉલમ/ઊભી કટાર ઉમેરવી","deleteColumn":"કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી"},"columns":"કૉલમ/ઊભી કટાર","deleteTable":"કોઠો ડિલીટ/કાઢી નાખવું","headers":"મથાળા","headersBoth":"બેવું","headersColumn":"પહેલી ઊભી કટાર","headersNone":"નથી ","headersRow":"પહેલી  કટાર","invalidBorder":"બોર્ડર એક આંકડો હોવો જોઈએ","invalidCellPadding":"સેલની અંદરની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCellSpacing":"સેલ વચ્ચેની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCols":"ઉભી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidHeight":"ટેબલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRows":"આડી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidWidth":"ટેબલની પોહલાઈ આંકડો હોવો જોઈએ.","menu":"ટેબલ, કોઠાનું મથાળું","row":{"menu":"પંક્તિના ખાના","insertBefore":"પહેલાં પંક્તિ ઉમેરવી","insertAfter":"પછી પંક્તિ ઉમેરવી","deleteRow":"પંક્તિઓ ડિલીટ/કાઢી નાખવી"},"rows":"પંક્તિના ખાના","summary":"ટૂંકો એહેવાલ","title":"ટેબલ, કોઠાનું મથાળું","toolbar":"ટેબલ, કોઠો","widthPc":"પ્રતિશત","widthPx":"પિકસલ","widthUnit":"પોહાલાઈ એકમ"},"stylescombo":{"label":"શૈલી/રીત","panelTitle":"ફોર્મેટ ","panelTitle1":"બ્લોક ","panelTitle2":"ઈનલાઈન ","panelTitle3":"ઓબ્જેક્ટ પદ્ધતિ"},"specialchar":{"options":"સ્પેશિઅલ કરેક્ટરના વિકલ્પો","title":"સ્પેશિઅલ વિશિષ્ટ અક્ષર પસંદ કરો","toolbar":"વિશિષ્ટ અક્ષર ઇન્સર્ટ/દાખલ કરવું"},"sourcedialog":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ","title":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"sourcearea":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"showblocks":{"toolbar":"બ્લૉક બતાવવું"},"removeformat":{"toolbar":"ફૉર્મટ કાઢવું"},"pastetext":{"button":"પેસ્ટ (ટેક્સ્ટ)","title":"પેસ્ટ (ટેક્સ્ટ)"},"pastefromword":{"confirmCleanup":"તમે જે ટેક્ષ્ત્ કોપી કરી રહ્યા છો ટે વર્ડ ની છે. કોપી કરતા પેહલા સાફ કરવી છે?","error":"પેસ્ટ કરેલો ડેટા ઇન્ટરનલ એરર ના લીથે સાફ કરી શકાયો નથી.","title":"પેસ્ટ (વડૅ ટેક્સ્ટ)","toolbar":"પેસ્ટ (વડૅ ટેક્સ્ટ)"},"maximize":{"maximize":"મોટું કરવું","minimize":"નાનું કરવું"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"બુલેટ સૂચિ","numberedlist":"સંખ્યાંકન સૂચિ"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"બ્લૉક, અંતરાય જસ્ટિફાઇ","center":"સંકેંદ્રણ/સેંટરિંગ","left":"ડાબી બાજુએ/બાજુ તરફ","right":"જમણી બાજુએ/બાજુ તરફ"},"indent":{"indent":"ઇન્ડેન્ટ, લીટીના આરંભમાં જગ્યા વધારવી","outdent":"ઇન્ડેન્ટ લીટીના આરંભમાં જગ્યા ઘટાડવી"},"image2":{"alt":"ઑલ્ટર્નટ ટેક્સ્ટ","btnUpload":"આ સર્વરને મોકલવું","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ચિત્ર ની જાણકારી","lockRatio":"લૉક ગુણોત્તર","menu":"ચિત્રના ગુણ","pathName":"image","pathNameCaption":"caption","resetSize":"રીસેટ સાઇઝ","resizer":"Click and drag to resize","title":"ચિત્રના ગુણ","uploadTab":"અપલોડ","urlMissing":"ઈમેજની મૂળ URL છે નહી.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"સમસ્તરીય રેખા ઇન્સર્ટ/દાખલ કરવી"},"format":{"label":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","panelTitle":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","tag_address":"સરનામું","tag_div":"શીર્ષક (DIV)","tag_h1":"શીર્ષક 1","tag_h2":"શીર્ષક 2","tag_h3":"શીર્ષક 3","tag_h4":"શીર્ષક 4","tag_h5":"શીર્ષક 5","tag_h6":"શીર્ષક 6","tag_p":"સામાન્ય","tag_pre":"ફૉર્મટેડ"},"elementspath":{"eleLabel":"એલીમેન્ટ્સ નો ","eleTitle":"એલીમેન્ટ %1"},"contextmenu":{"options":"કોન્તેક્ષ્ત્ મેનુના વિકલ્પો"},"clipboard":{"copy":"નકલ","copyError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl/Cmd+C) का प्रयोग करें।","cut":"કાપવું","cutError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl/Cmd+X) નો ઉપયોગ કરો.","paste":"પેસ્ટ","pasteArea":"પેસ્ટ કરવાની જગ્યા","pasteMsg":"Ctrl/Cmd+V નો પ્રયોગ કરી પેસ્ટ કરો","securityMsg":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસના કારણે,એડિટર તમારા કિલ્પબોર્ડ ડેટા ને કોપી નથી કરી શકતો. તમારે આ વિન્ડોમાં ફરીથી પેસ્ટ કરવું પડશે.","title":"પેસ્ટ"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"બ્લૉક-કોટ, અવતરણચિહ્નો"},"basicstyles":{"bold":"બોલ્ડ/સ્પષ્ટ","italic":"ઇટેલિક, ત્રાંસા","strike":"છેકી નાખવું","subscript":"એક ચિહ્નની નીચે કરેલું બીજું ચિહ્ન","superscript":"એક ચિહ્ન ઉપર કરેલું બીજું ચિહ્ન.","underline":"અન્ડર્લાઇન, નીચે લીટી"},"about":{"copy":"કોપીરાઈટ &copy; $1. ઓલ રાઈટ્સ ","dlgTitle":"CKEditor વિષે","help":"મદદ માટે $1 તપાસો","moreInfo":"લાયસનસની માહિતી માટે અમારી વેબ સાઈટ","title":"CKEditor વિષે","userGuide":"CKEditor યુઝર્સ ગાઈડ"},"editor":"રીચ ટેક્ષ્ત્ એડીટર","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"પ્રેસ ALT 0 મદદ માટ","browseServer":"સર્વર બ્રાઉઝ કરો","url":"URL","protocol":"પ્રોટોકૉલ","upload":"અપલોડ","uploadSubmit":"આ સર્વરને મોકલવું","image":"ચિત્ર","flash":"ફ્લૅશ","form":"ફૉર્મ/પત્રક","checkbox":"ચેક બોક્સ","radio":"રેડિઓ બટન","textField":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્ર","textarea":"ટેક્સ્ટ એરિઆ, શબ્દ વિસ્તાર","hiddenField":"ગુપ્ત ક્ષેત્ર","button":"બટન","select":"પસંદગી ક્ષેત્ર","imageButton":"ચિત્ર બટન","notSet":"<સેટ નથી>","id":"Id","name":"નામ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLtr":"ડાબે થી જમણે (LTR)","langDirRtl":"જમણે થી ડાબે (RTL)","langCode":"ભાષા કોડ","longDescr":"વધારે માહિતી માટે URL","cssClass":"સ્ટાઇલ-શીટ ક્લાસ","advisoryTitle":"મુખ્ય મથાળું","cssStyle":"સ્ટાઇલ","ok":"ઠીક છે","cancel":"રદ કરવું","close":"બંધ કરવું","preview":"જોવું","resize":"ખેંચી ને યોગ્ય કરવું","generalTab":"જનરલ","advancedTab":"અડ્વાન્સડ","validateNumberFailed":"આ રકમ આકડો નથી.","confirmNewPage":"સવે કાર્ય વગરનું ફકરો ખોવાઈ જશે. તમને ખાતરી છે કે તમને નવું પાનું ખોલવું છે?","confirmCancel":"ઘણા વિકલ્પો બદલાયા છે. તમારે આ બોક્ષ્ બંધ કરવું છે?","options":"વિકલ્પો","target":"લક્ષ્ય","targetNew":"નવી વિન્ડો (_blank)","targetTop":"ઉપરની વિન્ડો (_top)","targetSelf":"એજ વિન્ડો (_self)","targetParent":"પેરનટ વિન્ડો (_parent)","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","styles":"શૈલી","cssClasses":"શૈલી કલાસીસ","width":"પહોળાઈ","height":"ઊંચાઈ","align":"લાઇનદોરીમાં ગોઠવવું","alignLeft":"ડાબી બાજુ ગોઠવવું","alignRight":"જમણી","alignCenter":"મધ્ય સેન્ટર","alignJustify":"બ્લૉક, અંતરાય જસ્ટિફાઇ","alignTop":"ઉપર","alignMiddle":"વચ્ચે","alignBottom":"નીચે","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"ઉંચાઈ એક આંકડો હોવો જોઈએ.","invalidWidth":"પોહળ ઈ એક આંકડો હોવો જોઈએ.","invalidCssLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc) વગર.","invalidHtmlLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા HTML measurement unit (px or %) વગર.","invalidInlineStyle":"ઈનલાઈન  સ્ટાઈલ ની વેલ્યુ  \"name : value\" ના ફોર્મેટ માં હોવી જોઈએ, વચ્ચે સેમી-કોલોન જોઈએ.","cssLengthTooltip":"પિક્ષ્લ્ નો આંકડો CSS unit (px, %, in, cm, mm, em, ex, pt, or pc) માં નાખો.","unavailable":"%1<span class=\"cke_accessibility\">, નથી મળતું</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/he.js b/web/core/assets/vendor/ckeditor/lang/he.js
index 18f4e9efb..dfd0a0c1f 100644
--- a/web/core/assets/vendor/ckeditor/lang/he.js
+++ b/web/core/assets/vendor/ckeditor/lang/he.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['he']={"widget":{"move":"לחץ וגרור להזזה","label":"%1 widget"},"undo":{"redo":"חזרה על צעד אחרון","undo":"ביטול צעד אחרון"},"toolbar":{"toolbarCollapse":"מזעור סרגל כלים","toolbarExpand":"הרחבת סרגל כלים","toolbarGroups":{"document":"מסמך","clipboard":"לוח הגזירים (Clipboard)/צעד אחרון","editing":"עריכה","forms":"טפסים","basicstyles":"עיצוב בסיסי","paragraph":"פסקה","links":"קישורים","insert":"הכנסה","styles":"עיצוב","colors":"צבעים","tools":"כלים"},"toolbars":"סרגלי כלים של העורך"},"table":{"border":"גודל מסגרת","caption":"כיתוב","cell":{"menu":"מאפייני תא","insertBefore":"הוספת תא לפני","insertAfter":"הוספת תא אחרי","deleteCell":"מחיקת תאים","merge":"מיזוג תאים","mergeRight":"מזג ימינה","mergeDown":"מזג למטה","splitHorizontal":"פיצול תא אופקית","splitVertical":"פיצול תא אנכית","title":"תכונות התא","cellType":"סוג התא","rowSpan":"מתיחת השורות","colSpan":"מתיחת התאים","wordWrap":"מניעת גלישת שורות","hAlign":"יישור אופקי","vAlign":"יישור אנכי","alignBaseline":"שורת בסיס","bgColor":"צבע רקע","borderColor":"צבע מסגרת","data":"מידע","header":"כותרת","yes":"כן","no":"לא","invalidWidth":"שדה רוחב התא חייב להיות מספר.","invalidHeight":"שדה גובה התא חייב להיות מספר.","invalidRowSpan":"שדה מתיחת השורות חייב להיות מספר שלם.","invalidColSpan":"שדה מתיחת העמודות חייב להיות מספר שלם.","chooseColor":"בחר"},"cellPad":"ריפוד תא","cellSpace":"מרווח תא","column":{"menu":"עמודה","insertBefore":"הוספת עמודה לפני","insertAfter":"הוספת עמודה אחרי","deleteColumn":"מחיקת עמודות"},"columns":"עמודות","deleteTable":"מחק טבלה","headers":"כותרות","headersBoth":"שניהם","headersColumn":"עמודה ראשונה","headersNone":"אין","headersRow":"שורה ראשונה","invalidBorder":"שדה גודל המסגרת חייב להיות מספר.","invalidCellPadding":"שדה ריפוד התאים חייב להיות מספר חיובי.","invalidCellSpacing":"שדה ריווח התאים חייב להיות מספר חיובי.","invalidCols":"שדה מספר העמודות חייב להיות מספר גדול מ 0.","invalidHeight":"שדה גובה הטבלה חייב להיות מספר.","invalidRows":"שדה מספר השורות חייב להיות מספר גדול מ 0.","invalidWidth":"שדה רוחב הטבלה חייב להיות מספר.","menu":"מאפייני טבלה","row":{"menu":"שורה","insertBefore":"הוספת שורה לפני","insertAfter":"הוספת שורה אחרי","deleteRow":"מחיקת שורות"},"rows":"שורות","summary":"תקציר","title":"מאפייני טבלה","toolbar":"טבלה","widthPc":"אחוז","widthPx":"פיקסלים","widthUnit":"יחידת רוחב"},"stylescombo":{"label":"סגנון","panelTitle":"סגנונות פורמט","panelTitle1":"סגנונות בלוק","panelTitle2":"סגנונות רצף","panelTitle3":"סגנונות אובייקט"},"specialchar":{"options":"אפשרויות תווים מיוחדים","title":"בחירת תו מיוחד","toolbar":"הוספת תו מיוחד"},"sourcedialog":{"toolbar":"מקור","title":"מקור"},"sourcearea":{"toolbar":"מקור"},"showblocks":{"toolbar":"הצגת בלוקים"},"removeformat":{"toolbar":"הסרת העיצוב"},"pastetext":{"button":"הדבקה כטקסט פשוט","title":"הדבקה כטקסט פשוט"},"pastefromword":{"confirmCleanup":"נראה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. האם ברצונך לנקות אותו טרם ההדבקה?","error":"לא ניתן היה לנקות את המידע בשל תקלה פנימית.","title":"הדבקה מ-Word","toolbar":"הדבקה מ-Word"},"maximize":{"maximize":"הגדלה למקסימום","minimize":"הקטנה למינימום"},"magicline":{"title":"הכנס פסקה כאן"},"list":{"bulletedlist":"רשימת נקודות","numberedlist":"רשימה ממוספרת"},"language":{"button":"צור שפה","remove":"הסר שפה"},"justify":{"block":"יישור לשוליים","center":"מרכוז","left":"יישור לשמאל","right":"יישור לימין"},"indent":{"indent":"הגדלת הזחה","outdent":"הקטנת הזחה"},"image2":{"alt":"טקסט חלופי","btnUpload":"שליחה לשרת","captioned":"כותרת תמונה","captionPlaceholder":"כותרת","infoTab":"מידע על התמונה","lockRatio":"נעילת היחס","menu":"תכונות התמונה","pathName":"תמונה","pathNameCaption":"כותרת","resetSize":"איפוס הגודל","resizer":"לחץ וגרור לשינוי הגודל","title":"מאפייני התמונה","uploadTab":"העלאה","urlMissing":"כתובת התמונה חסרה."},"horizontalrule":{"toolbar":"הוספת קו אופקי"},"format":{"label":"עיצוב","panelTitle":"עיצוב","tag_address":"כתובת","tag_div":"נורמלי (DIV)","tag_h1":"כותרת","tag_h2":"כותרת 2","tag_h3":"כותרת 3","tag_h4":"כותרת 4","tag_h5":"כותרת 5","tag_h6":"כותרת 6","tag_p":"נורמלי","tag_pre":"קוד"},"elementspath":{"eleLabel":"עץ האלמנטים","eleTitle":"%1 אלמנט"},"contextmenu":{"options":"אפשרויות תפריט ההקשר"},"clipboard":{"copy":"העתקה","copyError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות העתקה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+C).","cut":"גזירה","cutError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות גזירה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+X).","paste":"הדבקה","pasteArea":"איזור הדבקה","pasteMsg":"נא להדביק בתוך הקופסה באמצעות (<b>Ctrl/Cmd+V</b>) וללחוץ על <b>אישור</b>.","securityMsg":"עקב הגדרות אבטחה בדפדפן, לא ניתן לגשת אל לוח הגזירים (Clipboard) בצורה ישירה. נא להדביק שוב בחלון זה.","title":"הדבקה"},"button":{"selectedLabel":"1% (סומן)"},"blockquote":{"toolbar":"בלוק ציטוט"},"basicstyles":{"bold":"מודגש","italic":"נטוי","strike":"כתיב מחוק","subscript":"כתיב תחתון","superscript":"כתיב עליון","underline":"קו תחתון"},"about":{"copy":"Copyright &copy; $1. כל הזכויות שמורות.","dlgTitle":"אודות CKEditor","help":"היכנסו ל$1 לעזרה.","moreInfo":"למידע נוסף בקרו באתרנו:","title":"אודות CKEditor","userGuide":"מדריך המשתמש של CKEditor"},"editor":"עורך טקסט עשיר","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"לחץ אלט ALT + 0 לעזרה","browseServer":"סייר השרת","url":"כתובת (URL)","protocol":"פרוטוקול","upload":"העלאה","uploadSubmit":"שליחה לשרת","image":"תמונה","flash":"פלאש","form":"טופס","checkbox":"תיבת סימון","radio":"לחצן אפשרויות","textField":"שדה טקסט","textarea":"איזור טקסט","hiddenField":"שדה חבוי","button":"כפתור","select":"שדה בחירה","imageButton":"כפתור תמונה","notSet":"<לא נקבע>","id":"זיהוי (ID)","name":"שם","langDir":"כיוון שפה","langDirLtr":"שמאל לימין (LTR)","langDirRtl":"ימין לשמאל (RTL)","langCode":"קוד שפה","longDescr":"קישור לתיאור מפורט","cssClass":"מחלקת עיצוב (CSS Class)","advisoryTitle":"כותרת מוצעת","cssStyle":"סגנון","ok":"אישור","cancel":"ביטול","close":"סגירה","preview":"תצוגה מקדימה","resize":"יש לגרור בכדי לשנות את הגודל","generalTab":"כללי","advancedTab":"אפשרויות מתקדמות","validateNumberFailed":"הערך חייב להיות מספרי.","confirmNewPage":"כל השינויים שלא נשמרו יאבדו. האם להעלות דף חדש?","confirmCancel":"חלק מהאפשרויות שונו, האם לסגור את הדיאלוג?","options":"אפשרויות","target":"מטרה","targetNew":"חלון חדש (_blank)","targetTop":"החלון העליון ביותר (_top)","targetSelf":"אותו חלון (_self)","targetParent":"חלון האב (_parent)","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","styles":"סגנון","cssClasses":"מחלקות גליונות סגנון","width":"רוחב","height":"גובה","align":"יישור","alignLeft":"לשמאל","alignRight":"לימין","alignCenter":"מרכז","alignJustify":"יישור לשוליים","alignTop":"למעלה","alignMiddle":"לאמצע","alignBottom":"לתחתית","alignNone":"None","invalidValue":"ערך לא חוקי.","invalidHeight":"הגובה חייב להיות מספר.","invalidWidth":"הרוחב חייב להיות מספר.","invalidCssLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של CSS (px, %, in, cm, mm, em, ex, pt, או pc).","invalidHtmlLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של HTML (px או %).","invalidInlineStyle":"הערך שצויין לשדה הסגנון חייב להכיל זוג ערכים אחד או יותר בפורמט \"שם : ערך\", מופרדים על ידי נקודה-פסיק.","cssLengthTooltip":"יש להכניס מספר המייצג פיקסלים או מספר עם יחידת גליונות סגנון תקינה (px, %, in, cm, mm, em, ex, pt, או pc).","unavailable":"%1<span class=\"cke_accessibility\">, לא זמין</span>"}};
\ No newline at end of file
+CKEDITOR.lang['he']={"widget":{"move":"לחץ וגרור להזזה","label":"%1 widget"},"undo":{"redo":"חזרה על צעד אחרון","undo":"ביטול צעד אחרון"},"toolbar":{"toolbarCollapse":"מזעור סרגל כלים","toolbarExpand":"הרחבת סרגל כלים","toolbarGroups":{"document":"מסמך","clipboard":"לוח הגזירים (Clipboard)/צעד אחרון","editing":"עריכה","forms":"טפסים","basicstyles":"עיצוב בסיסי","paragraph":"פסקה","links":"קישורים","insert":"הכנסה","styles":"עיצוב","colors":"צבעים","tools":"כלים"},"toolbars":"סרגלי כלים של העורך"},"table":{"border":"גודל מסגרת","caption":"כיתוב","cell":{"menu":"מאפייני תא","insertBefore":"הוספת תא לפני","insertAfter":"הוספת תא אחרי","deleteCell":"מחיקת תאים","merge":"מיזוג תאים","mergeRight":"מזג ימינה","mergeDown":"מזג למטה","splitHorizontal":"פיצול תא אופקית","splitVertical":"פיצול תא אנכית","title":"תכונות התא","cellType":"סוג התא","rowSpan":"מתיחת השורות","colSpan":"מתיחת התאים","wordWrap":"מניעת גלישת שורות","hAlign":"יישור אופקי","vAlign":"יישור אנכי","alignBaseline":"שורת בסיס","bgColor":"צבע רקע","borderColor":"צבע מסגרת","data":"מידע","header":"כותרת","yes":"כן","no":"לא","invalidWidth":"שדה רוחב התא חייב להיות מספר.","invalidHeight":"שדה גובה התא חייב להיות מספר.","invalidRowSpan":"שדה מתיחת השורות חייב להיות מספר שלם.","invalidColSpan":"שדה מתיחת העמודות חייב להיות מספר שלם.","chooseColor":"בחר"},"cellPad":"ריפוד תא","cellSpace":"מרווח תא","column":{"menu":"עמודה","insertBefore":"הוספת עמודה לפני","insertAfter":"הוספת עמודה אחרי","deleteColumn":"מחיקת עמודות"},"columns":"עמודות","deleteTable":"מחק טבלה","headers":"כותרות","headersBoth":"שניהם","headersColumn":"עמודה ראשונה","headersNone":"אין","headersRow":"שורה ראשונה","invalidBorder":"שדה גודל המסגרת חייב להיות מספר.","invalidCellPadding":"שדה ריפוד התאים חייב להיות מספר חיובי.","invalidCellSpacing":"שדה ריווח התאים חייב להיות מספר חיובי.","invalidCols":"שדה מספר העמודות חייב להיות מספר גדול מ 0.","invalidHeight":"שדה גובה הטבלה חייב להיות מספר.","invalidRows":"שדה מספר השורות חייב להיות מספר גדול מ 0.","invalidWidth":"שדה רוחב הטבלה חייב להיות מספר.","menu":"מאפייני טבלה","row":{"menu":"שורה","insertBefore":"הוספת שורה לפני","insertAfter":"הוספת שורה אחרי","deleteRow":"מחיקת שורות"},"rows":"שורות","summary":"תקציר","title":"מאפייני טבלה","toolbar":"טבלה","widthPc":"אחוז","widthPx":"פיקסלים","widthUnit":"יחידת רוחב"},"stylescombo":{"label":"סגנון","panelTitle":"סגנונות פורמט","panelTitle1":"סגנונות בלוק","panelTitle2":"סגנונות רצף","panelTitle3":"סגנונות אובייקט"},"specialchar":{"options":"אפשרויות תווים מיוחדים","title":"בחירת תו מיוחד","toolbar":"הוספת תו מיוחד"},"sourcedialog":{"toolbar":"מקור","title":"מקור"},"sourcearea":{"toolbar":"מקור"},"showblocks":{"toolbar":"הצגת בלוקים"},"removeformat":{"toolbar":"הסרת העיצוב"},"pastetext":{"button":"הדבקה כטקסט פשוט","title":"הדבקה כטקסט פשוט"},"pastefromword":{"confirmCleanup":"נראה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. האם ברצונך לנקות אותו טרם ההדבקה?","error":"לא ניתן היה לנקות את המידע בשל תקלה פנימית.","title":"הדבקה מ-Word","toolbar":"הדבקה מ-Word"},"maximize":{"maximize":"הגדלה למקסימום","minimize":"הקטנה למינימום"},"magicline":{"title":"הכנס פסקה כאן"},"list":{"bulletedlist":"רשימת נקודות","numberedlist":"רשימה ממוספרת"},"language":{"button":"צור שפה","remove":"הסר שפה"},"justify":{"block":"יישור לשוליים","center":"מרכוז","left":"יישור לשמאל","right":"יישור לימין"},"indent":{"indent":"הגדלת הזחה","outdent":"הקטנת הזחה"},"image2":{"alt":"טקסט חלופי","btnUpload":"שליחה לשרת","captioned":"כותרת תמונה","captionPlaceholder":"כותרת","infoTab":"מידע על התמונה","lockRatio":"נעילת היחס","menu":"תכונות התמונה","pathName":"תמונה","pathNameCaption":"כותרת","resetSize":"איפוס הגודל","resizer":"לחץ וגרור לשינוי הגודל","title":"מאפייני התמונה","uploadTab":"העלאה","urlMissing":"כתובת התמונה חסרה.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"הוספת קו אופקי"},"format":{"label":"עיצוב","panelTitle":"עיצוב","tag_address":"כתובת","tag_div":"נורמלי (DIV)","tag_h1":"כותרת","tag_h2":"כותרת 2","tag_h3":"כותרת 3","tag_h4":"כותרת 4","tag_h5":"כותרת 5","tag_h6":"כותרת 6","tag_p":"נורמלי","tag_pre":"קוד"},"elementspath":{"eleLabel":"עץ האלמנטים","eleTitle":"%1 אלמנט"},"contextmenu":{"options":"אפשרויות תפריט ההקשר"},"clipboard":{"copy":"העתקה","copyError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות העתקה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+C).","cut":"גזירה","cutError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות גזירה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+X).","paste":"הדבקה","pasteArea":"איזור הדבקה","pasteMsg":"נא להדביק בתוך הקופסה באמצעות (<b>Ctrl/Cmd+V</b>) וללחוץ על <b>אישור</b>.","securityMsg":"עקב הגדרות אבטחה בדפדפן, לא ניתן לגשת אל לוח הגזירים (Clipboard) בצורה ישירה. נא להדביק שוב בחלון זה.","title":"הדבקה"},"button":{"selectedLabel":"1% (סומן)"},"blockquote":{"toolbar":"בלוק ציטוט"},"basicstyles":{"bold":"מודגש","italic":"נטוי","strike":"כתיב מחוק","subscript":"כתיב תחתון","superscript":"כתיב עליון","underline":"קו תחתון"},"about":{"copy":"Copyright &copy; $1. כל הזכויות שמורות.","dlgTitle":"אודות CKEditor","help":"היכנסו ל$1 לעזרה.","moreInfo":"למידע נוסף בקרו באתרנו:","title":"אודות CKEditor","userGuide":"מדריך המשתמש של CKEditor"},"editor":"עורך טקסט עשיר","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"לחץ אלט ALT + 0 לעזרה","browseServer":"סייר השרת","url":"כתובת (URL)","protocol":"פרוטוקול","upload":"העלאה","uploadSubmit":"שליחה לשרת","image":"תמונה","flash":"פלאש","form":"טופס","checkbox":"תיבת סימון","radio":"לחצן אפשרויות","textField":"שדה טקסט","textarea":"איזור טקסט","hiddenField":"שדה חבוי","button":"כפתור","select":"שדה בחירה","imageButton":"כפתור תמונה","notSet":"<לא נקבע>","id":"זיהוי (ID)","name":"שם","langDir":"כיוון שפה","langDirLtr":"שמאל לימין (LTR)","langDirRtl":"ימין לשמאל (RTL)","langCode":"קוד שפה","longDescr":"קישור לתיאור מפורט","cssClass":"מחלקת עיצוב (CSS Class)","advisoryTitle":"כותרת מוצעת","cssStyle":"סגנון","ok":"אישור","cancel":"ביטול","close":"סגירה","preview":"תצוגה מקדימה","resize":"יש לגרור בכדי לשנות את הגודל","generalTab":"כללי","advancedTab":"אפשרויות מתקדמות","validateNumberFailed":"הערך חייב להיות מספרי.","confirmNewPage":"כל השינויים שלא נשמרו יאבדו. האם להעלות דף חדש?","confirmCancel":"חלק מהאפשרויות שונו, האם לסגור את הדיאלוג?","options":"אפשרויות","target":"מטרה","targetNew":"חלון חדש (_blank)","targetTop":"החלון העליון ביותר (_top)","targetSelf":"אותו חלון (_self)","targetParent":"חלון האב (_parent)","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","styles":"סגנון","cssClasses":"מחלקות גליונות סגנון","width":"רוחב","height":"גובה","align":"יישור","alignLeft":"לשמאל","alignRight":"לימין","alignCenter":"מרכז","alignJustify":"יישור לשוליים","alignTop":"למעלה","alignMiddle":"לאמצע","alignBottom":"לתחתית","alignNone":"None","invalidValue":"ערך לא חוקי.","invalidHeight":"הגובה חייב להיות מספר.","invalidWidth":"הרוחב חייב להיות מספר.","invalidCssLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של CSS (px, %, in, cm, mm, em, ex, pt, או pc).","invalidHtmlLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של HTML (px או %).","invalidInlineStyle":"הערך שצויין לשדה הסגנון חייב להכיל זוג ערכים אחד או יותר בפורמט \"שם : ערך\", מופרדים על ידי נקודה-פסיק.","cssLengthTooltip":"יש להכניס מספר המייצג פיקסלים או מספר עם יחידת גליונות סגנון תקינה (px, %, in, cm, mm, em, ex, pt, או pc).","unavailable":"%1<span class=\"cke_accessibility\">, לא זמין</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"מחק","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/hi.js b/web/core/assets/vendor/ckeditor/lang/hi.js
index 6b747b05a..a7b83d74f 100644
--- a/web/core/assets/vendor/ckeditor/lang/hi.js
+++ b/web/core/assets/vendor/ckeditor/lang/hi.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['hi']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"रीडू","undo":"अन्डू"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"एडिटर टूलबार"},"table":{"border":"बॉर्डर साइज़","caption":"शीर्षक","cell":{"menu":"खाना","insertBefore":"पहले सैल डालें","insertAfter":"बाद में सैल डालें","deleteCell":"सैल डिलीट करें","merge":"सैल मिलायें","mergeRight":"बाँया विलय","mergeDown":"नीचे विलय करें","splitHorizontal":"सैल को क्षैतिज स्थिति में विभाजित करें","splitVertical":"सैल को लम्बाकार में विभाजित करें","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"सैल पैडिंग","cellSpace":"सैल अंतर","column":{"menu":"कालम","insertBefore":"पहले कालम डालें","insertAfter":"बाद में कालम डालें","deleteColumn":"कालम डिलीट करें"},"columns":"कालम","deleteTable":"टेबल डिलीट करें","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"टेबल प्रॉपर्टीज़","row":{"menu":"पंक्ति","insertBefore":"पहले पंक्ति डालें","insertAfter":"बाद में पंक्ति डालें","deleteRow":"पंक्तियाँ डिलीट करें"},"rows":"पंक्तियाँ","summary":"सारांश","title":"टेबल प्रॉपर्टीज़","toolbar":"टेबल","widthPc":"प्रतिशत","widthPx":"पिक्सैल","widthUnit":"width unit"},"stylescombo":{"label":"स्टाइल","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"विशेष चरित्र विकल्प","title":"विशेष करॅक्टर चुनें","toolbar":"विशेष करॅक्टर इन्सर्ट करें"},"sourcedialog":{"toolbar":"सोर्स","title":"सोर्स"},"sourcearea":{"toolbar":"सोर्स"},"showblocks":{"toolbar":"ब्लॉक दिखायें"},"removeformat":{"toolbar":"फ़ॉर्मैट हटायें"},"pastetext":{"button":"पेस्ट (सादा टॅक्स्ट)","title":"पेस्ट (सादा टॅक्स्ट)"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"पेस्ट (वर्ड से)","toolbar":"पेस्ट (वर्ड से)"},"maximize":{"maximize":"मेक्सिमाईज़","minimize":"मिनिमाईज़"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"बुलॅट सूची","numberedlist":"अंकीय सूची"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"ब्लॉक जस्टीफ़ाई","center":"बीच में","left":"बायीं तरफ","right":"दायीं तरफ"},"indent":{"indent":"इन्डॅन्ट बढ़ायें","outdent":"इन्डॅन्ट कम करें"},"image2":{"alt":"वैकल्पिक टेक्स्ट","btnUpload":"इसे सर्वर को भेजें","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"तस्वीर की जानकारी","lockRatio":"लॉक अनुपात","menu":"तस्वीर प्रॉपर्टीज़","pathName":"image","pathNameCaption":"caption","resetSize":"रीसॅट साइज़","resizer":"Click and drag to resize","title":"तस्वीर प्रॉपर्टीज़","uploadTab":"अपलोड","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"हॉरिज़ॉन्टल रेखा इन्सर्ट करें"},"format":{"label":"फ़ॉर्मैट","panelTitle":"फ़ॉर्मैट","tag_address":"पता","tag_div":"शीर्षक (DIV)","tag_h1":"शीर्षक 1","tag_h2":"शीर्षक 2","tag_h3":"शीर्षक 3","tag_h4":"शीर्षक 4","tag_h5":"शीर्षक 5","tag_h6":"शीर्षक 6","tag_p":"साधारण","tag_pre":"फ़ॉर्मैटॅड"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"कॉपी","copyError":"आपके ब्राआउज़र की सुरक्षा सॅटिन्ग्स ने कॉपी करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+C) का प्रयोग करें।","cut":"कट","cutError":"आपके ब्राउज़र की सुरक्षा सॅटिन्ग्स ने कट करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+X) का प्रयोग करें।","paste":"पेस्ट","pasteArea":"Paste Area","pasteMsg":"Ctrl/Cmd+V का प्रयोग करके पेस्ट करें और ठीक है करें.","securityMsg":"आपके ब्राउज़र की सुरक्षा आपके ब्राउज़र की सुरKश सैटिंग के कारण, एडिटर आपके क्लिपबोर्ड डेटा को नहीं पा सकता है. आपको उसे इस विन्डो में दोबारा पेस्ट करना होगा.","title":"पेस्ट"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"ब्लॉक-कोट"},"basicstyles":{"bold":"बोल्ड","italic":"इटैलिक","strike":"स्ट्राइक थ्रू","subscript":"अधोलेख","superscript":"अभिलेख","underline":"रेखांकण"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"रिच टेक्स्ट एडिटर","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"मदद के लिये ALT 0 दबाए","browseServer":"सर्वर ब्राउज़ करें","url":"URL","protocol":"प्रोटोकॉल","upload":"अपलोड","uploadSubmit":"इसे सर्वर को भेजें","image":"तस्वीर","flash":"फ़्लैश","form":"फ़ॉर्म","checkbox":"चॅक बॉक्स","radio":"रेडिओ बटन","textField":"टेक्स्ट फ़ील्ड","textarea":"टेक्स्ट एरिया","hiddenField":"गुप्त फ़ील्ड","button":"बटन","select":"चुनाव फ़ील्ड","imageButton":"तस्वीर बटन","notSet":"<सॅट नहीं>","id":"Id","name":"नाम","langDir":"भाषा लिखने की दिशा","langDirLtr":"बायें से दायें (LTR)","langDirRtl":"दायें से बायें (RTL)","langCode":"भाषा कोड","longDescr":"अधिक विवरण के लिए URL","cssClass":"स्टाइल-शीट क्लास","advisoryTitle":"परामर्श शीर्शक","cssStyle":"स्टाइल","ok":"ठीक है","cancel":"रद्द करें","close":"Close","preview":"प्रीव्यू","resize":"Resize","generalTab":"सामान्य","advancedTab":"ऍड्वान्स्ड","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"टार्गेट","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","styles":"स्टाइल","cssClasses":"स्टाइल-शीट क्लास","width":"चौड़ाई","height":"ऊँचाई","align":"ऍलाइन","alignLeft":"दायें","alignRight":"दायें","alignCenter":"बीच में","alignJustify":"ब्लॉक जस्टीफ़ाई","alignTop":"ऊपर","alignMiddle":"मध्य","alignBottom":"नीचे","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['hi']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"रीडू","undo":"अन्डू"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"एडिटर टूलबार"},"table":{"border":"बॉर्डर साइज़","caption":"शीर्षक","cell":{"menu":"खाना","insertBefore":"पहले सैल डालें","insertAfter":"बाद में सैल डालें","deleteCell":"सैल डिलीट करें","merge":"सैल मिलायें","mergeRight":"बाँया विलय","mergeDown":"नीचे विलय करें","splitHorizontal":"सैल को क्षैतिज स्थिति में विभाजित करें","splitVertical":"सैल को लम्बाकार में विभाजित करें","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"सैल पैडिंग","cellSpace":"सैल अंतर","column":{"menu":"कालम","insertBefore":"पहले कालम डालें","insertAfter":"बाद में कालम डालें","deleteColumn":"कालम डिलीट करें"},"columns":"कालम","deleteTable":"टेबल डिलीट करें","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"टेबल प्रॉपर्टीज़","row":{"menu":"पंक्ति","insertBefore":"पहले पंक्ति डालें","insertAfter":"बाद में पंक्ति डालें","deleteRow":"पंक्तियाँ डिलीट करें"},"rows":"पंक्तियाँ","summary":"सारांश","title":"टेबल प्रॉपर्टीज़","toolbar":"टेबल","widthPc":"प्रतिशत","widthPx":"पिक्सैल","widthUnit":"width unit"},"stylescombo":{"label":"स्टाइल","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"विशेष चरित्र विकल्प","title":"विशेष करॅक्टर चुनें","toolbar":"विशेष करॅक्टर इन्सर्ट करें"},"sourcedialog":{"toolbar":"सोर्स","title":"सोर्स"},"sourcearea":{"toolbar":"सोर्स"},"showblocks":{"toolbar":"ब्लॉक दिखायें"},"removeformat":{"toolbar":"फ़ॉर्मैट हटायें"},"pastetext":{"button":"पेस्ट (सादा टॅक्स्ट)","title":"पेस्ट (सादा टॅक्स्ट)"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"पेस्ट (वर्ड से)","toolbar":"पेस्ट (वर्ड से)"},"maximize":{"maximize":"मेक्सिमाईज़","minimize":"मिनिमाईज़"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"बुलॅट सूची","numberedlist":"अंकीय सूची"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"ब्लॉक जस्टीफ़ाई","center":"बीच में","left":"बायीं तरफ","right":"दायीं तरफ"},"indent":{"indent":"इन्डॅन्ट बढ़ायें","outdent":"इन्डॅन्ट कम करें"},"image2":{"alt":"वैकल्पिक टेक्स्ट","btnUpload":"इसे सर्वर को भेजें","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"तस्वीर की जानकारी","lockRatio":"लॉक अनुपात","menu":"तस्वीर प्रॉपर्टीज़","pathName":"image","pathNameCaption":"caption","resetSize":"रीसॅट साइज़","resizer":"Click and drag to resize","title":"तस्वीर प्रॉपर्टीज़","uploadTab":"अपलोड","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"हॉरिज़ॉन्टल रेखा इन्सर्ट करें"},"format":{"label":"फ़ॉर्मैट","panelTitle":"फ़ॉर्मैट","tag_address":"पता","tag_div":"शीर्षक (DIV)","tag_h1":"शीर्षक 1","tag_h2":"शीर्षक 2","tag_h3":"शीर्षक 3","tag_h4":"शीर्षक 4","tag_h5":"शीर्षक 5","tag_h6":"शीर्षक 6","tag_p":"साधारण","tag_pre":"फ़ॉर्मैटॅड"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"कॉपी","copyError":"आपके ब्राआउज़र की सुरक्षा सॅटिन्ग्स ने कॉपी करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+C) का प्रयोग करें।","cut":"कट","cutError":"आपके ब्राउज़र की सुरक्षा सॅटिन्ग्स ने कट करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+X) का प्रयोग करें।","paste":"पेस्ट","pasteArea":"Paste Area","pasteMsg":"Ctrl/Cmd+V का प्रयोग करके पेस्ट करें और ठीक है करें.","securityMsg":"आपके ब्राउज़र की सुरक्षा आपके ब्राउज़र की सुरKश सैटिंग के कारण, एडिटर आपके क्लिपबोर्ड डेटा को नहीं पा सकता है. आपको उसे इस विन्डो में दोबारा पेस्ट करना होगा.","title":"पेस्ट"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"ब्लॉक-कोट"},"basicstyles":{"bold":"बोल्ड","italic":"इटैलिक","strike":"स्ट्राइक थ्रू","subscript":"अधोलेख","superscript":"अभिलेख","underline":"रेखांकण"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"रिच टेक्स्ट एडिटर","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"मदद के लिये ALT 0 दबाए","browseServer":"सर्वर ब्राउज़ करें","url":"URL","protocol":"प्रोटोकॉल","upload":"अपलोड","uploadSubmit":"इसे सर्वर को भेजें","image":"तस्वीर","flash":"फ़्लैश","form":"फ़ॉर्म","checkbox":"चॅक बॉक्स","radio":"रेडिओ बटन","textField":"टेक्स्ट फ़ील्ड","textarea":"टेक्स्ट एरिया","hiddenField":"गुप्त फ़ील्ड","button":"बटन","select":"चुनाव फ़ील्ड","imageButton":"तस्वीर बटन","notSet":"<सॅट नहीं>","id":"Id","name":"नाम","langDir":"भाषा लिखने की दिशा","langDirLtr":"बायें से दायें (LTR)","langDirRtl":"दायें से बायें (RTL)","langCode":"भाषा कोड","longDescr":"अधिक विवरण के लिए URL","cssClass":"स्टाइल-शीट क्लास","advisoryTitle":"परामर्श शीर्शक","cssStyle":"स्टाइल","ok":"ठीक है","cancel":"रद्द करें","close":"Close","preview":"प्रीव्यू","resize":"Resize","generalTab":"सामान्य","advancedTab":"ऍड्वान्स्ड","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"टार्गेट","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","styles":"स्टाइल","cssClasses":"स्टाइल-शीट क्लास","width":"चौड़ाई","height":"ऊँचाई","align":"ऍलाइन","alignLeft":"दायें","alignRight":"दायें","alignCenter":"बीच में","alignJustify":"ब्लॉक जस्टीफ़ाई","alignTop":"ऊपर","alignMiddle":"मध्य","alignBottom":"नीचे","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/hr.js b/web/core/assets/vendor/ckeditor/lang/hr.js
index 6de665128..6bd519974 100644
--- a/web/core/assets/vendor/ckeditor/lang/hr.js
+++ b/web/core/assets/vendor/ckeditor/lang/hr.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['hr']={"widget":{"move":"Klikni i povuci da pomakneš","label":"%1 widget"},"undo":{"redo":"Ponovi","undo":"Poništi"},"toolbar":{"toolbarCollapse":"Smanji alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Dokument","clipboard":"Međuspremnik/Poništi","editing":"Uređivanje","forms":"Forme","basicstyles":"Osnovni stilovi","paragraph":"Paragraf","links":"Veze","insert":"Umetni","styles":"Stilovi","colors":"Boje","tools":"Alatke"},"toolbars":"Alatne trake uređivača teksta"},"table":{"border":"Veličina okvira","caption":"Naslov","cell":{"menu":"Ćelija","insertBefore":"Ubaci ćeliju prije","insertAfter":"Ubaci ćeliju poslije","deleteCell":"Izbriši ćelije","merge":"Spoji ćelije","mergeRight":"Spoji desno","mergeDown":"Spoji dolje","splitHorizontal":"Podijeli ćeliju vodoravno","splitVertical":"Podijeli ćeliju okomito","title":"Svojstva ćelije","cellType":"Vrsta ćelije","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Prelazak u novi red","hAlign":"Vodoravno poravnanje","vAlign":"Okomito poravnanje","alignBaseline":"Osnovna linija","bgColor":"Boja pozadine","borderColor":"Boja ruba","data":"Podatak","header":"Zaglavlje","yes":"Da","no":"ne","invalidWidth":"Širina ćelije mora biti broj.","invalidHeight":"Visina ćelije mora biti broj.","invalidRowSpan":"Rows span mora biti cijeli broj.","invalidColSpan":"Columns span mora biti cijeli broj.","chooseColor":"Odaberi"},"cellPad":"Razmak ćelija","cellSpace":"Prostornost ćelija","column":{"menu":"Kolona","insertBefore":"Ubaci kolonu prije","insertAfter":"Ubaci kolonu poslije","deleteColumn":"Izbriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tablicu","headers":"Zaglavlje","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"Ništa","headersRow":"Prvi red","invalidBorder":"Debljina ruba mora biti broj.","invalidCellPadding":"Razmak ćelija mora biti broj.","invalidCellSpacing":"Prostornost ćelija mora biti broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tablice mora biti broj.","invalidRows":"Broj redova mora biti broj veći od 0.","invalidWidth":"Širina tablice mora biti broj.","menu":"Svojstva tablice","row":{"menu":"Red","insertBefore":"Ubaci red prije","insertAfter":"Ubaci red poslije","deleteRow":"Izbriši redove"},"rows":"Redova","summary":"Sažetak","title":"Svojstva tablice","toolbar":"Tablica","widthPc":"postotaka","widthPx":"piksela","widthUnit":"jedinica širine"},"stylescombo":{"label":"Stil","panelTitle":"Stilovi formatiranja","panelTitle1":"Block stilovi","panelTitle2":"Inline stilovi","panelTitle3":"Object stilovi"},"specialchar":{"options":"Opcije specijalnih znakova","title":"Odaberite posebni karakter","toolbar":"Ubaci posebne znakove"},"sourcedialog":{"toolbar":"Kôd","title":"Kôd"},"sourcearea":{"toolbar":"Kôd"},"showblocks":{"toolbar":"Prikaži blokove"},"removeformat":{"toolbar":"Ukloni formatiranje"},"pastetext":{"button":"Zalijepi kao čisti tekst","title":"Zalijepi kao čisti tekst"},"pastefromword":{"confirmCleanup":"Tekst koji želite zalijepiti čini se da je kopiran iz Worda. Želite li prije očistiti tekst?","error":"Nije moguće očistiti podatke za ljepljenje zbog interne greške","title":"Zalijepi iz Worda","toolbar":"Zalijepi iz Worda"},"maximize":{"maximize":"Povećaj","minimize":"Smanji"},"magicline":{"title":"Ubaci paragraf ovdje"},"list":{"bulletedlist":"Obična lista","numberedlist":"Brojčana lista"},"language":{"button":"Namjesti jezik","remove":"Makni jezik"},"justify":{"block":"Blok poravnanje","center":"Središnje poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"indent":{"indent":"Pomakni udesno","outdent":"Pomakni ulijevo"},"image2":{"alt":"Alternativni tekst","btnUpload":"Pošalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zaključaj odnos","menu":"Svojstva slika","pathName":"image","pathNameCaption":"caption","resetSize":"Obriši veličinu","resizer":"Click and drag to resize","title":"Svojstva slika","uploadTab":"Pošalji","urlMissing":"Nedostaje URL slike."},"horizontalrule":{"toolbar":"Ubaci vodoravnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Putanja elemenata","eleTitle":"%1 element"},"contextmenu":{"options":"Opcije izbornika"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Prostor za ljepljenje","pasteMsg":"Molimo zaljepite unutar doljnjeg okvira koristeći tipkovnicu (<STRONG>Ctrl/Cmd+V</STRONG>) i kliknite <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki Vašeg pretraživača, editor nema direktan pristup Vašem međuspremniku. Potrebno je ponovno zalijepiti tekst u ovaj prozor.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blockquote"},"basicstyles":{"bold":"Podebljaj","italic":"Ukosi","strike":"Precrtano","subscript":"Subscript","superscript":"Superscript","underline":"Potcrtano"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O CKEditoru","help":"Provjeri $1 za pomoć.","moreInfo":"Za informacije o licencama posjetite našu web stranicu:","title":"O CKEditoru","userGuide":"Vodič za CKEditor korisnike"},"editor":"Bogati uređivač teksta, %1","editorPanel":"Ploča Bogatog Uređivača Teksta","common":{"editorHelp":"Pritisni ALT 0 za pomoć","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Flash","form":"Forma","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smjer jezika","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Kôd jezika","longDescr":"Dugački opis URL","cssClass":"Klase stilova","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Poništi","close":"Zatvori","preview":"Pregledaj","resize":"Povuci za promjenu veličine","generalTab":"Općenito","advancedTab":"Napredno","validateNumberFailed":"Ova vrijednost nije broj.","confirmNewPage":"Sve napravljene promjene će biti izgubljene ukoliko ih niste snimili. Sigurno želite učitati novu stranicu?","confirmCancel":"Neke od opcija su promjenjene. Sigurno želite zatvoriti ovaj prozor?","options":"Opcije","target":"Odredište","targetNew":"Novi prozor (_blank)","targetTop":"Vršni prozor (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Roditeljski prozor (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Središnje","alignJustify":"Blok poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dolje","alignNone":"None","invalidValue":"Neispravna vrijednost.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih CSS mjernih jedinica (px, %, in, cm, mm, em, ex, pt ili pc).","invalidHtmlLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih HTML mjernih jedinica (px ili %).","invalidInlineStyle":"Vrijednost za linijski stil mora sadržavati jednu ili više definicija s formatom \"naziv:vrijednost\", odvojenih točka-zarezom.","cssLengthTooltip":"Unesite broj za vrijednost u pikselima ili broj s važećim CSS mjernim jedinicama (px, %, in, cm, mm, em, ex, pt ili pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupno</span>"}};
\ No newline at end of file
+CKEDITOR.lang['hr']={"widget":{"move":"Klikni i povuci da pomakneš","label":"%1 widget"},"undo":{"redo":"Ponovi","undo":"Poništi"},"toolbar":{"toolbarCollapse":"Smanji alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Dokument","clipboard":"Međuspremnik/Poništi","editing":"Uređivanje","forms":"Forme","basicstyles":"Osnovni stilovi","paragraph":"Paragraf","links":"Veze","insert":"Umetni","styles":"Stilovi","colors":"Boje","tools":"Alatke"},"toolbars":"Alatne trake uređivača teksta"},"table":{"border":"Veličina okvira","caption":"Naslov","cell":{"menu":"Ćelija","insertBefore":"Ubaci ćeliju prije","insertAfter":"Ubaci ćeliju poslije","deleteCell":"Izbriši ćelije","merge":"Spoji ćelije","mergeRight":"Spoji desno","mergeDown":"Spoji dolje","splitHorizontal":"Podijeli ćeliju vodoravno","splitVertical":"Podijeli ćeliju okomito","title":"Svojstva ćelije","cellType":"Vrsta ćelije","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Prelazak u novi red","hAlign":"Vodoravno poravnanje","vAlign":"Okomito poravnanje","alignBaseline":"Osnovna linija","bgColor":"Boja pozadine","borderColor":"Boja ruba","data":"Podatak","header":"Zaglavlje","yes":"Da","no":"ne","invalidWidth":"Širina ćelije mora biti broj.","invalidHeight":"Visina ćelije mora biti broj.","invalidRowSpan":"Rows span mora biti cijeli broj.","invalidColSpan":"Columns span mora biti cijeli broj.","chooseColor":"Odaberi"},"cellPad":"Razmak ćelija","cellSpace":"Prostornost ćelija","column":{"menu":"Kolona","insertBefore":"Ubaci kolonu prije","insertAfter":"Ubaci kolonu poslije","deleteColumn":"Izbriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tablicu","headers":"Zaglavlje","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"Ništa","headersRow":"Prvi red","invalidBorder":"Debljina ruba mora biti broj.","invalidCellPadding":"Razmak ćelija mora biti broj.","invalidCellSpacing":"Prostornost ćelija mora biti broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tablice mora biti broj.","invalidRows":"Broj redova mora biti broj veći od 0.","invalidWidth":"Širina tablice mora biti broj.","menu":"Svojstva tablice","row":{"menu":"Red","insertBefore":"Ubaci red prije","insertAfter":"Ubaci red poslije","deleteRow":"Izbriši redove"},"rows":"Redova","summary":"Sažetak","title":"Svojstva tablice","toolbar":"Tablica","widthPc":"postotaka","widthPx":"piksela","widthUnit":"jedinica širine"},"stylescombo":{"label":"Stil","panelTitle":"Stilovi formatiranja","panelTitle1":"Block stilovi","panelTitle2":"Inline stilovi","panelTitle3":"Object stilovi"},"specialchar":{"options":"Opcije specijalnih znakova","title":"Odaberite posebni karakter","toolbar":"Ubaci posebne znakove"},"sourcedialog":{"toolbar":"Kôd","title":"Kôd"},"sourcearea":{"toolbar":"Kôd"},"showblocks":{"toolbar":"Prikaži blokove"},"removeformat":{"toolbar":"Ukloni formatiranje"},"pastetext":{"button":"Zalijepi kao čisti tekst","title":"Zalijepi kao čisti tekst"},"pastefromword":{"confirmCleanup":"Tekst koji želite zalijepiti čini se da je kopiran iz Worda. Želite li prije očistiti tekst?","error":"Nije moguće očistiti podatke za ljepljenje zbog interne greške","title":"Zalijepi iz Worda","toolbar":"Zalijepi iz Worda"},"maximize":{"maximize":"Povećaj","minimize":"Smanji"},"magicline":{"title":"Ubaci paragraf ovdje"},"list":{"bulletedlist":"Obična lista","numberedlist":"Brojčana lista"},"language":{"button":"Namjesti jezik","remove":"Makni jezik"},"justify":{"block":"Blok poravnanje","center":"Središnje poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"indent":{"indent":"Pomakni udesno","outdent":"Pomakni ulijevo"},"image2":{"alt":"Alternativni tekst","btnUpload":"Pošalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zaključaj odnos","menu":"Svojstva slika","pathName":"image","pathNameCaption":"caption","resetSize":"Obriši veličinu","resizer":"Click and drag to resize","title":"Svojstva slika","uploadTab":"Pošalji","urlMissing":"Nedostaje URL slike.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Ubaci vodoravnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Putanja elemenata","eleTitle":"%1 element"},"contextmenu":{"options":"Opcije izbornika"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Prostor za ljepljenje","pasteMsg":"Molimo zaljepite unutar doljnjeg okvira koristeći tipkovnicu (<STRONG>Ctrl/Cmd+V</STRONG>) i kliknite <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki Vašeg pretraživača, editor nema direktan pristup Vašem međuspremniku. Potrebno je ponovno zalijepiti tekst u ovaj prozor.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blockquote"},"basicstyles":{"bold":"Podebljaj","italic":"Ukosi","strike":"Precrtano","subscript":"Subscript","superscript":"Superscript","underline":"Potcrtano"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O CKEditoru","help":"Provjeri $1 za pomoć.","moreInfo":"Za informacije o licencama posjetite našu web stranicu:","title":"O CKEditoru","userGuide":"Vodič za CKEditor korisnike"},"editor":"Bogati uređivač teksta, %1","editorPanel":"Ploča Bogatog Uređivača Teksta","common":{"editorHelp":"Pritisni ALT 0 za pomoć","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Flash","form":"Forma","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smjer jezika","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Kôd jezika","longDescr":"Dugački opis URL","cssClass":"Klase stilova","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Poništi","close":"Zatvori","preview":"Pregledaj","resize":"Povuci za promjenu veličine","generalTab":"Općenito","advancedTab":"Napredno","validateNumberFailed":"Ova vrijednost nije broj.","confirmNewPage":"Sve napravljene promjene će biti izgubljene ukoliko ih niste snimili. Sigurno želite učitati novu stranicu?","confirmCancel":"Neke od opcija su promjenjene. Sigurno želite zatvoriti ovaj prozor?","options":"Opcije","target":"Odredište","targetNew":"Novi prozor (_blank)","targetTop":"Vršni prozor (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Roditeljski prozor (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Središnje","alignJustify":"Blok poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dolje","alignNone":"None","invalidValue":"Neispravna vrijednost.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih CSS mjernih jedinica (px, %, in, cm, mm, em, ex, pt ili pc).","invalidHtmlLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih HTML mjernih jedinica (px ili %).","invalidInlineStyle":"Vrijednost za linijski stil mora sadržavati jednu ili više definicija s formatom \"naziv:vrijednost\", odvojenih točka-zarezom.","cssLengthTooltip":"Unesite broj za vrijednost u pikselima ili broj s važećim CSS mjernim jedinicama (px, %, in, cm, mm, em, ex, pt ili pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupno</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/hu.js b/web/core/assets/vendor/ckeditor/lang/hu.js
index 16114dc17..5de3d0572 100644
--- a/web/core/assets/vendor/ckeditor/lang/hu.js
+++ b/web/core/assets/vendor/ckeditor/lang/hu.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['hu']={"widget":{"move":"Kattints és húzd a mozgatáshoz","label":"%1 widget"},"undo":{"redo":"Ismétlés","undo":"Visszavonás"},"toolbar":{"toolbarCollapse":"Eszköztár összecsukása","toolbarExpand":"Eszköztár szétnyitása","toolbarGroups":{"document":"Dokumentum","clipboard":"Vágólap/Visszavonás","editing":"Szerkesztés","forms":"Űrlapok","basicstyles":"Alapstílusok","paragraph":"Bekezdés","links":"Hivatkozások","insert":"Beszúrás","styles":"Stílusok","colors":"Színek","tools":"Eszközök"},"toolbars":"Szerkesztő Eszköztár"},"table":{"border":"Szegélyméret","caption":"Felirat","cell":{"menu":"Cella","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteCell":"Cellák törlése","merge":"Cellák egyesítése","mergeRight":"Cellák egyesítése jobbra","mergeDown":"Cellák egyesítése lefelé","splitHorizontal":"Cellák szétválasztása vízszintesen","splitVertical":"Cellák szétválasztása függőlegesen","title":"Cella tulajdonságai","cellType":"Cella típusa","rowSpan":"Függőleges egyesítés","colSpan":"Vízszintes egyesítés","wordWrap":"Hosszú sorok törése","hAlign":"Vízszintes igazítás","vAlign":"Függőleges igazítás","alignBaseline":"Alapvonalra","bgColor":"Háttér színe","borderColor":"Keret színe","data":"Adat","header":"Fejléc","yes":"Igen","no":"Nem","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRowSpan":"A függőleges egyesítés mezőbe csak számokat írhat.","invalidColSpan":"A vízszintes egyesítés mezőbe csak számokat írhat.","chooseColor":"Válasszon"},"cellPad":"Cella belső margó","cellSpace":"Cella térköz","column":{"menu":"Oszlop","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteColumn":"Oszlopok törlése"},"columns":"Oszlopok","deleteTable":"Táblázat törlése","headers":"Fejlécek","headersBoth":"Mindkettő","headersColumn":"Első oszlop","headersNone":"Nincsenek","headersRow":"Első sor","invalidBorder":"A szegélyméret mezőbe csak számokat írhat.","invalidCellPadding":"A cella belső margó mezőbe csak számokat írhat.","invalidCellSpacing":"A cella térköz mezőbe csak számokat írhat.","invalidCols":"Az oszlopok számának nagyobbnak kell lenni mint 0.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRows":"A sorok számának nagyobbnak kell lenni mint 0.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","menu":"Táblázat tulajdonságai","row":{"menu":"Sor","insertBefore":"Beszúrás fölé","insertAfter":"Beszúrás alá","deleteRow":"Sorok törlése"},"rows":"Sorok","summary":"Leírás","title":"Táblázat tulajdonságai","toolbar":"Táblázat","widthPc":"százalék","widthPx":"képpont","widthUnit":"Szélesség egység"},"stylescombo":{"label":"Stílus","panelTitle":"Formázási stílusok","panelTitle1":"Blokk stílusok","panelTitle2":"Inline stílusok","panelTitle3":"Objektum stílusok"},"specialchar":{"options":"Speciális karakter opciók","title":"Speciális karakter választása","toolbar":"Speciális karakter beillesztése"},"sourcedialog":{"toolbar":"Forráskód","title":"Forráskód"},"sourcearea":{"toolbar":"Forráskód"},"showblocks":{"toolbar":"Blokkok megjelenítése"},"removeformat":{"toolbar":"Formázás eltávolítása"},"pastetext":{"button":"Beillesztés formázatlan szövegként","title":"Beillesztés formázatlan szövegként"},"pastefromword":{"confirmCleanup":"Úgy tűnik a beillesztett szöveget Word-ből másolt át. Meg szeretné tisztítani a szöveget? (ajánlott)","error":"Egy belső hiba miatt nem sikerült megtisztítani a szöveget","title":"Beillesztés Word-ből","toolbar":"Beillesztés Word-ből"},"maximize":{"maximize":"Teljes méret","minimize":"Kis méret"},"magicline":{"title":"Szúrja be a bekezdést ide"},"list":{"bulletedlist":"Felsorolás","numberedlist":"Számozás"},"language":{"button":"Nyelv beállítása","remove":"Nyelv eltávolítása"},"justify":{"block":"Sorkizárt","center":"Középre","left":"Balra","right":"Jobbra"},"indent":{"indent":"Behúzás növelése","outdent":"Behúzás csökkentése"},"image2":{"alt":"Buborék szöveg","btnUpload":"Küldés a szerverre","captioned":"Feliratozott kép","captionPlaceholder":"Képfelirat","infoTab":"Alaptulajdonságok","lockRatio":"Arány megtartása","menu":"Kép tulajdonságai","pathName":"kép","pathNameCaption":"felirat","resetSize":"Eredeti méret","resizer":"Kattints és húzz az átméretezéshez","title":"Kép tulajdonságai","uploadTab":"Feltöltés","urlMissing":"Hiányzik a kép URL-je"},"horizontalrule":{"toolbar":"Elválasztóvonal beillesztése"},"format":{"label":"Formátum","panelTitle":"Formátum","tag_address":"Címsor","tag_div":"Bekezdés (DIV)","tag_h1":"Fejléc 1","tag_h2":"Fejléc 2","tag_h3":"Fejléc 3","tag_h4":"Fejléc 4","tag_h5":"Fejléc 5","tag_h6":"Fejléc 6","tag_p":"Normál","tag_pre":"Formázott"},"elementspath":{"eleLabel":"Elem utak","eleTitle":"%1 elem"},"contextmenu":{"options":"Helyi menü opciók"},"clipboard":{"copy":"Másolás","copyError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","cut":"Kivágás","cutError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","paste":"Beillesztés","pasteArea":"Beszúrás mező","pasteMsg":"Másolja be az alábbi mezőbe a <STRONG>Ctrl/Cmd+V</STRONG> billentyűk lenyomásával, majd nyomjon <STRONG>Rendben</STRONG>-t.","securityMsg":"A böngésző biztonsági beállításai miatt a szerkesztő nem képes hozzáférni a vágólap adataihoz. Illeszd be újra ebben az ablakban.","title":"Beillesztés"},"button":{"selectedLabel":"%1 (Kiválasztva)"},"blockquote":{"toolbar":"Idézet blokk"},"basicstyles":{"bold":"Félkövér","italic":"Dőlt","strike":"Áthúzott","subscript":"Alsó index","superscript":"Felső index","underline":"Aláhúzott"},"about":{"copy":"Copyright &copy; $1. Minden jog fenntartva.","dlgTitle":"CKEditor névjegy","help":"Itt találsz segítséget: $1","moreInfo":"Licenszelési információkért kérjük látogassa meg weboldalunkat:","title":"CKEditor névjegy","userGuide":"CKEditor Felhasználói útmutató"},"editor":"HTML szerkesztő","editorPanel":"Rich Text szerkesztő panel","common":{"editorHelp":"Segítségért nyomjon ALT 0","browseServer":"Böngészés a szerveren","url":"Hivatkozás","protocol":"Protokoll","upload":"Feltöltés","uploadSubmit":"Küldés a szerverre","image":"Kép","flash":"Flash","form":"Űrlap","checkbox":"Jelölőnégyzet","radio":"Választógomb","textField":"Szövegmező","textarea":"Szövegterület","hiddenField":"Rejtettmező","button":"Gomb","select":"Legördülő lista","imageButton":"Képgomb","notSet":"<nincs beállítva>","id":"Azonosító","name":"Név","langDir":"Írás iránya","langDirLtr":"Balról jobbra","langDirRtl":"Jobbról balra","langCode":"Nyelv kódja","longDescr":"Részletes leírás webcíme","cssClass":"Stíluskészlet","advisoryTitle":"Súgócimke","cssStyle":"Stílus","ok":"Rendben","cancel":"Mégsem","close":"Bezárás","preview":"Előnézet","resize":"Húzza az átméretezéshez","generalTab":"Általános","advancedTab":"További opciók","validateNumberFailed":"A mezőbe csak számokat írhat.","confirmNewPage":"Minden nem mentett változás el fog veszni! Biztosan be szeretné tölteni az oldalt?","confirmCancel":"Az űrlap tartalma megváltozott, ám a változásokat nem rögzítette. Biztosan be szeretné zárni az űrlapot?","options":"Beállítások","target":"Cél","targetNew":"Új ablak (_blank)","targetTop":"Legfelső ablak (_top)","targetSelf":"Aktuális ablakban (_self)","targetParent":"Szülő ablak (_parent)","langDirLTR":"Balról jobbra (LTR)","langDirRTL":"Jobbról balra (RTL)","styles":"Stílus","cssClasses":"Stíluslap osztály","width":"Szélesség","height":"Magasság","align":"Igazítás","alignLeft":"Bal","alignRight":"Jobbra","alignCenter":"Középre","alignJustify":"Sorkizárt","alignTop":"Tetejére","alignMiddle":"Középre","alignBottom":"Aljára","alignNone":"None","invalidValue":"Érvénytelen érték.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidCssLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes CSS egységgel megjelölve(px, %, in, cm, mm, em, ex, pt vagy pc).","invalidHtmlLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes HTML egységgel megjelölve(px vagy %).","invalidInlineStyle":"Az inline stílusnak megadott értéknek tartalmaznia kell egy vagy több rekordot a \"name : value\" formátumban, pontosvesszővel elválasztva.","cssLengthTooltip":"Adjon meg egy számot értéknek pixelekben vagy egy számot érvényes CSS mértékegységben (px, %, in, cm, mm, em, ex, pt, vagy pc).","unavailable":"%1<span class=\"cke_accessibility\">, nem elérhető</span>"}};
\ No newline at end of file
+CKEDITOR.lang['hu']={"widget":{"move":"Kattints és húzd a mozgatáshoz","label":"%1 widget"},"undo":{"redo":"Ismétlés","undo":"Visszavonás"},"toolbar":{"toolbarCollapse":"Eszköztár összecsukása","toolbarExpand":"Eszköztár szétnyitása","toolbarGroups":{"document":"Dokumentum","clipboard":"Vágólap/Visszavonás","editing":"Szerkesztés","forms":"Űrlapok","basicstyles":"Alapstílusok","paragraph":"Bekezdés","links":"Hivatkozások","insert":"Beszúrás","styles":"Stílusok","colors":"Színek","tools":"Eszközök"},"toolbars":"Szerkesztő Eszköztár"},"table":{"border":"Szegélyméret","caption":"Felirat","cell":{"menu":"Cella","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteCell":"Cellák törlése","merge":"Cellák egyesítése","mergeRight":"Cellák egyesítése jobbra","mergeDown":"Cellák egyesítése lefelé","splitHorizontal":"Cellák szétválasztása vízszintesen","splitVertical":"Cellák szétválasztása függőlegesen","title":"Cella tulajdonságai","cellType":"Cella típusa","rowSpan":"Függőleges egyesítés","colSpan":"Vízszintes egyesítés","wordWrap":"Hosszú sorok törése","hAlign":"Vízszintes igazítás","vAlign":"Függőleges igazítás","alignBaseline":"Alapvonalra","bgColor":"Háttér színe","borderColor":"Keret színe","data":"Adat","header":"Fejléc","yes":"Igen","no":"Nem","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRowSpan":"A függőleges egyesítés mezőbe csak számokat írhat.","invalidColSpan":"A vízszintes egyesítés mezőbe csak számokat írhat.","chooseColor":"Válasszon"},"cellPad":"Cella belső margó","cellSpace":"Cella térköz","column":{"menu":"Oszlop","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteColumn":"Oszlopok törlése"},"columns":"Oszlopok","deleteTable":"Táblázat törlése","headers":"Fejlécek","headersBoth":"Mindkettő","headersColumn":"Első oszlop","headersNone":"Nincsenek","headersRow":"Első sor","invalidBorder":"A szegélyméret mezőbe csak számokat írhat.","invalidCellPadding":"A cella belső margó mezőbe csak számokat írhat.","invalidCellSpacing":"A cella térköz mezőbe csak számokat írhat.","invalidCols":"Az oszlopok számának nagyobbnak kell lenni mint 0.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRows":"A sorok számának nagyobbnak kell lenni mint 0.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","menu":"Táblázat tulajdonságai","row":{"menu":"Sor","insertBefore":"Beszúrás fölé","insertAfter":"Beszúrás alá","deleteRow":"Sorok törlése"},"rows":"Sorok","summary":"Leírás","title":"Táblázat tulajdonságai","toolbar":"Táblázat","widthPc":"százalék","widthPx":"képpont","widthUnit":"Szélesség egység"},"stylescombo":{"label":"Stílus","panelTitle":"Formázási stílusok","panelTitle1":"Blokk stílusok","panelTitle2":"Inline stílusok","panelTitle3":"Objektum stílusok"},"specialchar":{"options":"Speciális karakter opciók","title":"Speciális karakter választása","toolbar":"Speciális karakter beillesztése"},"sourcedialog":{"toolbar":"Forráskód","title":"Forráskód"},"sourcearea":{"toolbar":"Forráskód"},"showblocks":{"toolbar":"Blokkok megjelenítése"},"removeformat":{"toolbar":"Formázás eltávolítása"},"pastetext":{"button":"Beillesztés formázatlan szövegként","title":"Beillesztés formázatlan szövegként"},"pastefromword":{"confirmCleanup":"Úgy tűnik a beillesztett szöveget Word-ből másolt át. Meg szeretné tisztítani a szöveget? (ajánlott)","error":"Egy belső hiba miatt nem sikerült megtisztítani a szöveget","title":"Beillesztés Word-ből","toolbar":"Beillesztés Word-ből"},"maximize":{"maximize":"Teljes méret","minimize":"Kis méret"},"magicline":{"title":"Szúrja be a bekezdést ide"},"list":{"bulletedlist":"Felsorolás","numberedlist":"Számozás"},"language":{"button":"Nyelv beállítása","remove":"Nyelv eltávolítása"},"justify":{"block":"Sorkizárt","center":"Középre","left":"Balra","right":"Jobbra"},"indent":{"indent":"Behúzás növelése","outdent":"Behúzás csökkentése"},"image2":{"alt":"Buborék szöveg","btnUpload":"Küldés a szerverre","captioned":"Feliratozott kép","captionPlaceholder":"Képfelirat","infoTab":"Alaptulajdonságok","lockRatio":"Arány megtartása","menu":"Kép tulajdonságai","pathName":"kép","pathNameCaption":"felirat","resetSize":"Eredeti méret","resizer":"Kattints és húzz az átméretezéshez","title":"Kép tulajdonságai","uploadTab":"Feltöltés","urlMissing":"Hiányzik a kép URL-je","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Elválasztóvonal beillesztése"},"format":{"label":"Formátum","panelTitle":"Formátum","tag_address":"Címsor","tag_div":"Bekezdés (DIV)","tag_h1":"Fejléc 1","tag_h2":"Fejléc 2","tag_h3":"Fejléc 3","tag_h4":"Fejléc 4","tag_h5":"Fejléc 5","tag_h6":"Fejléc 6","tag_p":"Normál","tag_pre":"Formázott"},"elementspath":{"eleLabel":"Elem utak","eleTitle":"%1 elem"},"contextmenu":{"options":"Helyi menü opciók"},"clipboard":{"copy":"Másolás","copyError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","cut":"Kivágás","cutError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","paste":"Beillesztés","pasteArea":"Beszúrás mező","pasteMsg":"Másolja be az alábbi mezőbe a <STRONG>Ctrl/Cmd+V</STRONG> billentyűk lenyomásával, majd nyomjon <STRONG>Rendben</STRONG>-t.","securityMsg":"A böngésző biztonsági beállításai miatt a szerkesztő nem képes hozzáférni a vágólap adataihoz. Illeszd be újra ebben az ablakban.","title":"Beillesztés"},"button":{"selectedLabel":"%1 (Kiválasztva)"},"blockquote":{"toolbar":"Idézet blokk"},"basicstyles":{"bold":"Félkövér","italic":"Dőlt","strike":"Áthúzott","subscript":"Alsó index","superscript":"Felső index","underline":"Aláhúzott"},"about":{"copy":"Copyright &copy; $1. Minden jog fenntartva.","dlgTitle":"CKEditor névjegy","help":"Itt találsz segítséget: $1","moreInfo":"Licenszelési információkért kérjük látogassa meg weboldalunkat:","title":"CKEditor névjegy","userGuide":"CKEditor Felhasználói útmutató"},"editor":"HTML szerkesztő","editorPanel":"Rich Text szerkesztő panel","common":{"editorHelp":"Segítségért nyomjon ALT 0","browseServer":"Böngészés a szerveren","url":"Hivatkozás","protocol":"Protokoll","upload":"Feltöltés","uploadSubmit":"Küldés a szerverre","image":"Kép","flash":"Flash","form":"Űrlap","checkbox":"Jelölőnégyzet","radio":"Választógomb","textField":"Szövegmező","textarea":"Szövegterület","hiddenField":"Rejtettmező","button":"Gomb","select":"Legördülő lista","imageButton":"Képgomb","notSet":"<nincs beállítva>","id":"Azonosító","name":"Név","langDir":"Írás iránya","langDirLtr":"Balról jobbra","langDirRtl":"Jobbról balra","langCode":"Nyelv kódja","longDescr":"Részletes leírás webcíme","cssClass":"Stíluskészlet","advisoryTitle":"Súgócimke","cssStyle":"Stílus","ok":"Rendben","cancel":"Mégsem","close":"Bezárás","preview":"Előnézet","resize":"Húzza az átméretezéshez","generalTab":"Általános","advancedTab":"További opciók","validateNumberFailed":"A mezőbe csak számokat írhat.","confirmNewPage":"Minden nem mentett változás el fog veszni! Biztosan be szeretné tölteni az oldalt?","confirmCancel":"Az űrlap tartalma megváltozott, ám a változásokat nem rögzítette. Biztosan be szeretné zárni az űrlapot?","options":"Beállítások","target":"Cél","targetNew":"Új ablak (_blank)","targetTop":"Legfelső ablak (_top)","targetSelf":"Aktuális ablakban (_self)","targetParent":"Szülő ablak (_parent)","langDirLTR":"Balról jobbra (LTR)","langDirRTL":"Jobbról balra (RTL)","styles":"Stílus","cssClasses":"Stíluslap osztály","width":"Szélesség","height":"Magasság","align":"Igazítás","alignLeft":"Bal","alignRight":"Jobbra","alignCenter":"Középre","alignJustify":"Sorkizárt","alignTop":"Tetejére","alignMiddle":"Középre","alignBottom":"Aljára","alignNone":"None","invalidValue":"Érvénytelen érték.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidCssLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes CSS egységgel megjelölve(px, %, in, cm, mm, em, ex, pt vagy pc).","invalidHtmlLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes HTML egységgel megjelölve(px vagy %).","invalidInlineStyle":"Az inline stílusnak megadott értéknek tartalmaznia kell egy vagy több rekordot a \"name : value\" formátumban, pontosvesszővel elválasztva.","cssLengthTooltip":"Adjon meg egy számot értéknek pixelekben vagy egy számot érvényes CSS mértékegységben (px, %, in, cm, mm, em, ex, pt, vagy pc).","unavailable":"%1<span class=\"cke_accessibility\">, nem elérhető</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/id.js b/web/core/assets/vendor/ckeditor/lang/id.js
index b2fa2ee6b..0db534128 100644
--- a/web/core/assets/vendor/ckeditor/lang/id.js
+++ b/web/core/assets/vendor/ckeditor/lang/id.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['id']={"widget":{"move":"Tekan dan geser untuk memindahkan","label":"%1 widget"},"undo":{"redo":"Kembali lakukan","undo":"Batalkan perlakuan"},"toolbar":{"toolbarCollapse":"Ciutkan Toolbar","toolbarExpand":"Bentangkan Toolbar","toolbarGroups":{"document":"Dokumen","clipboard":"Papan klip / Kembalikan perlakuan","editing":"Sunting","forms":"Formulir","basicstyles":"Gaya Dasar","paragraph":"Paragraf","links":"Tautan","insert":"Sisip","styles":"Gaya","colors":"Warna","tools":"Alat"},"toolbars":"Toolbar Penyunting"},"table":{"border":"Ukuran batas","caption":"Judul halaman","cell":{"menu":"Sel","insertBefore":"Sisip Sel Sebelum","insertAfter":"Sisip Sel Setelah","deleteCell":"Hapus Sel","merge":"Gabungkan Sel","mergeRight":"Gabungkan ke Kanan","mergeDown":"Gabungkan ke Bawah","splitHorizontal":"Pisahkan Sel Secara Horisontal","splitVertical":"Pisahkan Sel Secara Vertikal","title":"Properti Sel","cellType":"Tipe Sel","rowSpan":"Rentang antar baris","colSpan":"Rentang antar kolom","wordWrap":"Word Wrap","hAlign":"Jajaran Horisontal","vAlign":"Jajaran Vertikal","alignBaseline":"Dasar","bgColor":"Warna Latar Belakang","borderColor":"Warna Batasan","data":"Data","header":"Header","yes":"Ya","no":"Tidak","invalidWidth":"Lebar sel harus sebuah angka.","invalidHeight":"Tinggi sel harus sebuah angka","invalidRowSpan":"Rentang antar baris harus angka seluruhnya.","invalidColSpan":"Rentang antar kolom harus angka seluruhnya","chooseColor":"Pilih"},"cellPad":"Sel spasi dalam","cellSpace":"Spasi antar sel","column":{"menu":"Kolom","insertBefore":"Sisip Kolom Sebelum","insertAfter":"Sisip Kolom Sesudah","deleteColumn":"Hapus Kolom"},"columns":"Kolom","deleteTable":"Hapus Tabel","headers":"Headers","headersBoth":"Keduanya","headersColumn":"Kolom pertama","headersNone":"Tidak ada","headersRow":"Baris Pertama","invalidBorder":"Ukuran batasan harus sebuah angka","invalidCellPadding":"'Spasi dalam' sel harus angka positif.","invalidCellSpacing":"Spasi antar sel harus angka positif.","invalidCols":"Jumlah kolom harus sebuah angka lebih besar dari 0","invalidHeight":"Tinggi tabel harus sebuah angka.","invalidRows":"Jumlah barus harus sebuah angka dan lebih besar dari 0.","invalidWidth":"Lebar tabel harus sebuah angka.","menu":"Properti Tabel","row":{"menu":"Baris","insertBefore":"Sisip Baris Sebelum","insertAfter":"Sisip Baris Sesudah","deleteRow":"Hapus Baris"},"rows":"Baris","summary":"Intisari","title":"Properti Tabel","toolbar":"Tabe","widthPc":"persen","widthPx":"piksel","widthUnit":"lebar satuan"},"stylescombo":{"label":"Gaya","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Opsi spesial karakter","title":"Pilih spesial karakter","toolbar":"Sisipkan spesial karakter"},"sourcedialog":{"toolbar":"Sumber","title":"Sumber"},"sourcearea":{"toolbar":"Sumber"},"showblocks":{"toolbar":"Perlihatkan Blok"},"removeformat":{"toolbar":"Hapus Format"},"pastetext":{"button":"Tempel sebagai teks polos","title":"Tempel sebagai Teks Polos"},"pastefromword":{"confirmCleanup":"Teks yang ingin anda tempel sepertinya di salin dari Word. Apakah anda mau membersihkannya sebelum menempel?","error":"Tidak mungkin membersihkan data yang ditempel dikerenakan kesalahan internal","title":"Tempel dari Word","toolbar":"Tempel dari Word"},"maximize":{"maximize":"Memperbesar","minimize":"Memperkecil"},"magicline":{"title":"Masukkan paragraf disini"},"list":{"bulletedlist":"Sisip/Hapus Daftar Bullet","numberedlist":"Sisip/Hapus Daftar Bernomor"},"language":{"button":"Atur Bahasa","remove":"Hapus Bahasa"},"justify":{"block":"Rata kiri-kanan","center":"Pusat","left":"Align Left","right":"Align Right"},"indent":{"indent":"Tingkatkan Lekuk","outdent":"Kurangi Lekuk"},"image2":{"alt":"Teks alternatif","btnUpload":"Kirim ke Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info Gambar","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Atur Ulang Ukuran","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Unggah","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Sisip Garis Horisontal"},"format":{"label":"Bentuk","panelTitle":"Bentuk Paragraf","tag_address":"Alamat","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Membentuk"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Opsi Konteks Pilihan"},"clipboard":{"copy":"Salin","copyError":"Pengaturan keamanan peramban anda tidak mengizinkan editor untuk mengeksekusi operasi menyalin secara otomatis. Mohon gunakan papan tuts (Ctrl/Cmd+C)","cut":"Potong","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Tempel","pasteArea":"Area Tempel","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Karena pengaturan keamanan peramban anda, editor tida dapat mengakses data clipboard anda secara langsung. Anda harus mem-paste kembali pada halaman ini","title":"Tempel"},"button":{"selectedLabel":"%1(Dipilih)"},"blockquote":{"toolbar":"Kutipan Blok"},"basicstyles":{"bold":"Huruf Tebal","italic":"Huruf Miring","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Garis Bawah"},"about":{"copy":"Hak cipta &copy; $1. All rights reserved.","dlgTitle":"Tentang CKEditor","help":"Cel $1 untuk bantuan.","moreInfo":"Untuk informasi lisensi silahkan kunjungi web site kami:","title":"Tentang CKEditor","userGuide":"Petunjuk Pengguna CKEditor"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tekan ALT 0 untuk bantuan.","browseServer":"Jelajah Server","url":"URL","protocol":"Protokol","upload":"Unggah","uploadSubmit":"Kirim ke Server","image":"Gambar","flash":"Flash","form":"Formulir","checkbox":"Kotak Cek","radio":"Tombol Radio","textField":"Kolom Teks","textarea":"Area Teks","hiddenField":"Kolom Tersembunyi","button":"Tombol","select":"Kolom Seleksi","imageButton":"Tombol Gambar","notSet":"<tidak diatur>","id":"Id","name":"Nama","langDir":"Arah Bahasa","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri","langCode":"Kode Bahasa","longDescr":"Deskripsi URL Panjang","cssClass":"Kelas Stylesheet","advisoryTitle":"Penasehat Judul","cssStyle":"Gaya","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Pratinjau","resize":"Ubah ukuran","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"Nilai ini tidak sebuah angka","confirmNewPage":"Semua perubahan yang tidak disimpan di konten ini akan hilang. Apakah anda yakin ingin memuat halaman baru?","confirmCancel":"Beberapa opsi telah berubah. Apakah anda yakin ingin menutup dialog?","options":"Opsi","target":"Sasaran","targetNew":"Jendela Baru (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Jendela yang Sama (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Gaya","cssClasses":"Kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Penjajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Rata kiri-kanan","alignTop":"Atas","alignMiddle":"Tengah","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Tinggi harus sebuah angka.","invalidWidth":"Lebar harus sebuah angka.","invalidCssLength":"Nilai untuk \"%1\" harus sebuah angkat positif dengan atau tanpa pengukuran unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Nilai yang dispesifikasian untuk kolom \"%1\" harus sebuah angka positif dengan atau tanpa sebuah unit pengukuran HTML (px atau %) yang valid.","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Masukkan sebuah angka untuk sebuah nilai dalam pixel atau sebuah angka dengan unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, tidak tersedia</span>"}};
\ No newline at end of file
+CKEDITOR.lang['id']={"widget":{"move":"Tekan dan geser untuk memindahkan","label":"%1 widget"},"undo":{"redo":"Kembali lakukan","undo":"Batalkan perlakuan"},"toolbar":{"toolbarCollapse":"Ciutkan Toolbar","toolbarExpand":"Bentangkan Toolbar","toolbarGroups":{"document":"Dokumen","clipboard":"Papan klip / Kembalikan perlakuan","editing":"Sunting","forms":"Formulir","basicstyles":"Gaya Dasar","paragraph":"Paragraf","links":"Tautan","insert":"Sisip","styles":"Gaya","colors":"Warna","tools":"Alat"},"toolbars":"Toolbar Penyunting"},"table":{"border":"Ukuran batas","caption":"Judul halaman","cell":{"menu":"Sel","insertBefore":"Sisip Sel Sebelum","insertAfter":"Sisip Sel Setelah","deleteCell":"Hapus Sel","merge":"Gabungkan Sel","mergeRight":"Gabungkan ke Kanan","mergeDown":"Gabungkan ke Bawah","splitHorizontal":"Pisahkan Sel Secara Horisontal","splitVertical":"Pisahkan Sel Secara Vertikal","title":"Properti Sel","cellType":"Tipe Sel","rowSpan":"Rentang antar baris","colSpan":"Rentang antar kolom","wordWrap":"Word Wrap","hAlign":"Jajaran Horisontal","vAlign":"Jajaran Vertikal","alignBaseline":"Dasar","bgColor":"Warna Latar Belakang","borderColor":"Warna Batasan","data":"Data","header":"Header","yes":"Ya","no":"Tidak","invalidWidth":"Lebar sel harus sebuah angka.","invalidHeight":"Tinggi sel harus sebuah angka","invalidRowSpan":"Rentang antar baris harus angka seluruhnya.","invalidColSpan":"Rentang antar kolom harus angka seluruhnya","chooseColor":"Pilih"},"cellPad":"Sel spasi dalam","cellSpace":"Spasi antar sel","column":{"menu":"Kolom","insertBefore":"Sisip Kolom Sebelum","insertAfter":"Sisip Kolom Sesudah","deleteColumn":"Hapus Kolom"},"columns":"Kolom","deleteTable":"Hapus Tabel","headers":"Headers","headersBoth":"Keduanya","headersColumn":"Kolom pertama","headersNone":"Tidak ada","headersRow":"Baris Pertama","invalidBorder":"Ukuran batasan harus sebuah angka","invalidCellPadding":"'Spasi dalam' sel harus angka positif.","invalidCellSpacing":"Spasi antar sel harus angka positif.","invalidCols":"Jumlah kolom harus sebuah angka lebih besar dari 0","invalidHeight":"Tinggi tabel harus sebuah angka.","invalidRows":"Jumlah barus harus sebuah angka dan lebih besar dari 0.","invalidWidth":"Lebar tabel harus sebuah angka.","menu":"Properti Tabel","row":{"menu":"Baris","insertBefore":"Sisip Baris Sebelum","insertAfter":"Sisip Baris Sesudah","deleteRow":"Hapus Baris"},"rows":"Baris","summary":"Intisari","title":"Properti Tabel","toolbar":"Tabe","widthPc":"persen","widthPx":"piksel","widthUnit":"lebar satuan"},"stylescombo":{"label":"Gaya","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Opsi spesial karakter","title":"Pilih spesial karakter","toolbar":"Sisipkan spesial karakter"},"sourcedialog":{"toolbar":"Sumber","title":"Sumber"},"sourcearea":{"toolbar":"Sumber"},"showblocks":{"toolbar":"Perlihatkan Blok"},"removeformat":{"toolbar":"Hapus Format"},"pastetext":{"button":"Tempel sebagai teks polos","title":"Tempel sebagai Teks Polos"},"pastefromword":{"confirmCleanup":"Teks yang ingin anda tempel sepertinya di salin dari Word. Apakah anda mau membersihkannya sebelum menempel?","error":"Tidak mungkin membersihkan data yang ditempel dikerenakan kesalahan internal","title":"Tempel dari Word","toolbar":"Tempel dari Word"},"maximize":{"maximize":"Memperbesar","minimize":"Memperkecil"},"magicline":{"title":"Masukkan paragraf disini"},"list":{"bulletedlist":"Sisip/Hapus Daftar Bullet","numberedlist":"Sisip/Hapus Daftar Bernomor"},"language":{"button":"Atur Bahasa","remove":"Hapus Bahasa"},"justify":{"block":"Rata kiri-kanan","center":"Pusat","left":"Align Left","right":"Align Right"},"indent":{"indent":"Tingkatkan Lekuk","outdent":"Kurangi Lekuk"},"image2":{"alt":"Teks alternatif","btnUpload":"Kirim ke Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info Gambar","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Atur Ulang Ukuran","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Unggah","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Sisip Garis Horisontal"},"format":{"label":"Bentuk","panelTitle":"Bentuk Paragraf","tag_address":"Alamat","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Membentuk"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Opsi Konteks Pilihan"},"clipboard":{"copy":"Salin","copyError":"Pengaturan keamanan peramban anda tidak mengizinkan editor untuk mengeksekusi operasi menyalin secara otomatis. Mohon gunakan papan tuts (Ctrl/Cmd+C)","cut":"Potong","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Tempel","pasteArea":"Area Tempel","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Karena pengaturan keamanan peramban anda, editor tida dapat mengakses data clipboard anda secara langsung. Anda harus mem-paste kembali pada halaman ini","title":"Tempel"},"button":{"selectedLabel":"%1(Dipilih)"},"blockquote":{"toolbar":"Kutipan Blok"},"basicstyles":{"bold":"Huruf Tebal","italic":"Huruf Miring","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Garis Bawah"},"about":{"copy":"Hak cipta &copy; $1. All rights reserved.","dlgTitle":"Tentang CKEditor","help":"Cel $1 untuk bantuan.","moreInfo":"Untuk informasi lisensi silahkan kunjungi web site kami:","title":"Tentang CKEditor","userGuide":"Petunjuk Pengguna CKEditor"},"editor":"Rich Text Editor","editorPanel":"Panel Rich Text Editor","common":{"editorHelp":"Tekan ALT 0 untuk bantuan.","browseServer":"Jelajah Server","url":"URL","protocol":"Protokol","upload":"Unggah","uploadSubmit":"Kirim ke Server","image":"Gambar","flash":"Flash","form":"Formulir","checkbox":"Kotak Cek","radio":"Tombol Radio","textField":"Kolom Teks","textarea":"Area Teks","hiddenField":"Kolom Tersembunyi","button":"Tombol","select":"Kolom Seleksi","imageButton":"Tombol Gambar","notSet":"<tidak diatur>","id":"Id","name":"Nama","langDir":"Arah Bahasa","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri","langCode":"Kode Bahasa","longDescr":"Deskripsi URL Panjang","cssClass":"Kelas Stylesheet","advisoryTitle":"Penasehat Judul","cssStyle":"Gaya","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Pratinjau","resize":"Ubah ukuran","generalTab":"Umum","advancedTab":"Lebih Lanjut","validateNumberFailed":"Nilai ini tidak sebuah angka","confirmNewPage":"Semua perubahan yang tidak disimpan di konten ini akan hilang. Apakah anda yakin ingin memuat halaman baru?","confirmCancel":"Beberapa opsi telah berubah. Apakah anda yakin ingin menutup dialog?","options":"Opsi","target":"Sasaran","targetNew":"Jendela Baru (_blank)","targetTop":"Laman Atas (_top)","targetSelf":"Jendela yang Sama (_self)","targetParent":"Jendela Induk (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Gaya","cssClasses":"Kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Penjajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Rata kiri-kanan","alignTop":"Atas","alignMiddle":"Tengah","alignBottom":"Bawah","alignNone":"Tidak ada","invalidValue":"Nilai tidak sah.","invalidHeight":"Tinggi harus sebuah angka.","invalidWidth":"Lebar harus sebuah angka.","invalidCssLength":"Nilai untuk \"%1\" harus sebuah angkat positif dengan atau tanpa pengukuran unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Nilai yang dispesifikasian untuk kolom \"%1\" harus sebuah angka positif dengan atau tanpa sebuah unit pengukuran HTML (px atau %) yang valid.","invalidInlineStyle":"Nilai pada inline style merupakan pasangan nama dan nilai dengan format \"nama : nilai\", yang dipisahkan dengan titik dua.","cssLengthTooltip":"Masukkan sebuah angka untuk sebuah nilai dalam pixel atau sebuah angka dengan unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, tidak tersedia</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Spasi","35":"End","36":"Home","46":"Hapus","224":"Command"},"keyboardShortcut":"Pintasan Keyboard"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/is.js b/web/core/assets/vendor/ckeditor/lang/is.js
index a47d04383..cb0dfeb00 100644
--- a/web/core/assets/vendor/ckeditor/lang/is.js
+++ b/web/core/assets/vendor/ckeditor/lang/is.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['is']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Hætta við afturköllun","undo":"Afturkalla"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Breidd ramma","caption":"Titill","cell":{"menu":"Reitur","insertBefore":"Skjóta inn reiti fyrir aftan","insertAfter":"Skjóta inn reiti fyrir framan","deleteCell":"Fella reit","merge":"Sameina reiti","mergeRight":"Sameina til hægri","mergeDown":"Sameina niður á við","splitHorizontal":"Kljúfa reit lárétt","splitVertical":"Kljúfa reit lóðrétt","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Reitaspássía","cellSpace":"Bil milli reita","column":{"menu":"Dálkur","insertBefore":"Skjóta inn dálki vinstra megin","insertAfter":"Skjóta inn dálki hægra megin","deleteColumn":"Fella dálk"},"columns":"Dálkar","deleteTable":"Fella töflu","headers":"Fyrirsagnir","headersBoth":"Hvort tveggja","headersColumn":"Fyrsti dálkur","headersNone":"Engar","headersRow":"Fyrsta röð","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Eigindi töflu","row":{"menu":"Röð","insertBefore":"Skjóta inn röð fyrir ofan","insertAfter":"Skjóta inn röð fyrir neðan","deleteRow":"Eyða röð"},"rows":"Raðir","summary":"Áfram","title":"Eigindi töflu","toolbar":"Tafla","widthPc":"prósent","widthPx":"myndeindir","widthUnit":"width unit"},"stylescombo":{"label":"Stílflokkur","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Velja tákn","toolbar":"Setja inn merki"},"sourcedialog":{"toolbar":"Kóði","title":"Kóði"},"sourcearea":{"toolbar":"Kóði"},"showblocks":{"toolbar":"Sýna blokkir"},"removeformat":{"toolbar":"Fjarlægja snið"},"pastetext":{"button":"Líma sem ósniðinn texta","title":"Líma sem ósniðinn texta"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Líma úr Word","toolbar":"Líma úr Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Punktalisti","numberedlist":"Númeraður listi"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Jafna báðum megin","center":"Miðja texta","left":"Vinstrijöfnun","right":"Hægrijöfnun"},"indent":{"indent":"Minnka inndrátt","outdent":"Auka inndrátt"},"image2":{"alt":"Baklægur texti","btnUpload":"Hlaða upp","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Almennt","lockRatio":"Festa stærðarhlutfall","menu":"Eigindi myndar","pathName":"image","pathNameCaption":"caption","resetSize":"Reikna stærð","resizer":"Click and drag to resize","title":"Eigindi myndar","uploadTab":"Senda upp","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Lóðrétt lína"},"format":{"label":"Stílsnið","panelTitle":"Stílsnið","tag_address":"Vistfang","tag_div":"Venjulegt (DIV)","tag_h1":"Fyrirsögn 1","tag_h2":"Fyrirsögn 2","tag_h3":"Fyrirsögn 3","tag_h4":"Fyrirsögn 4","tag_h5":"Fyrirsögn 5","tag_h6":"Fyrirsögn 6","tag_p":"Venjulegt letur","tag_pre":"Forsniðið"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Afrita","copyError":"Öryggisstillingar vafrans þíns leyfa ekki afritun texta með músaraðgerð. Notaðu lyklaborðið í afrita (Ctrl/Cmd+C).","cut":"Klippa","cutError":"Öryggisstillingar vafrans þíns leyfa ekki klippingu texta með músaraðgerð. Notaðu lyklaborðið í klippa (Ctrl/Cmd+X).","paste":"Líma","pasteArea":"Paste Area","pasteMsg":"Límdu í svæðið hér að neðan og (<STRONG>Ctrl/Cmd+V</STRONG>) og smelltu á <STRONG>OK</STRONG>.","securityMsg":"Vegna öryggisstillinga í vafranum þínum fær ritillinn ekki beinan aðgang að klippuborðinu. Þú verður að líma innihaldið aftur inn í þennan glugga.","title":"Líma"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Inndráttur"},"basicstyles":{"bold":"Feitletrað","italic":"Skáletrað","strike":"Yfirstrikað","subscript":"Niðurskrifað","superscript":"Uppskrifað","underline":"Undirstrikað"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Fletta í skjalasafni","url":"Vefslóð","protocol":"Samskiptastaðall","upload":"Senda upp","uploadSubmit":"Hlaða upp","image":"Setja inn mynd","flash":"Flash","form":"Setja inn innsláttarform","checkbox":"Setja inn hökunarreit","radio":"Setja inn valhnapp","textField":"Setja inn textareit","textarea":"Setja inn textasvæði","hiddenField":"Setja inn falið svæði","button":"Setja inn hnapp","select":"Setja inn lista","imageButton":"Setja inn myndahnapp","notSet":"<ekkert valið>","id":"Auðkenni","name":"Nafn","langDir":"Lesstefna","langDirLtr":"Frá vinstri til hægri (LTR)","langDirRtl":"Frá hægri til vinstri (RTL)","langCode":"Tungumálakóði","longDescr":"Nánari lýsing","cssClass":"Stílsniðsflokkur","advisoryTitle":"Titill","cssStyle":"Stíll","ok":"Í lagi","cancel":"Hætta við","close":"Close","preview":"Forskoða","resize":"Resize","generalTab":"Almennt","advancedTab":"Tæknilegt","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Mark","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","styles":"Stíll","cssClasses":"Stílsniðsflokkur","width":"Breidd","height":"Hæð","align":"Jöfnun","alignLeft":"Vinstri","alignRight":"Hægri","alignCenter":"Miðjað","alignJustify":"Jafna báðum megin","alignTop":"Efst","alignMiddle":"Miðjuð","alignBottom":"Neðst","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['is']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Hætta við afturköllun","undo":"Afturkalla"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Breidd ramma","caption":"Titill","cell":{"menu":"Reitur","insertBefore":"Skjóta inn reiti fyrir aftan","insertAfter":"Skjóta inn reiti fyrir framan","deleteCell":"Fella reit","merge":"Sameina reiti","mergeRight":"Sameina til hægri","mergeDown":"Sameina niður á við","splitHorizontal":"Kljúfa reit lárétt","splitVertical":"Kljúfa reit lóðrétt","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Reitaspássía","cellSpace":"Bil milli reita","column":{"menu":"Dálkur","insertBefore":"Skjóta inn dálki vinstra megin","insertAfter":"Skjóta inn dálki hægra megin","deleteColumn":"Fella dálk"},"columns":"Dálkar","deleteTable":"Fella töflu","headers":"Fyrirsagnir","headersBoth":"Hvort tveggja","headersColumn":"Fyrsti dálkur","headersNone":"Engar","headersRow":"Fyrsta röð","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Eigindi töflu","row":{"menu":"Röð","insertBefore":"Skjóta inn röð fyrir ofan","insertAfter":"Skjóta inn röð fyrir neðan","deleteRow":"Eyða röð"},"rows":"Raðir","summary":"Áfram","title":"Eigindi töflu","toolbar":"Tafla","widthPc":"prósent","widthPx":"myndeindir","widthUnit":"width unit"},"stylescombo":{"label":"Stílflokkur","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Velja tákn","toolbar":"Setja inn merki"},"sourcedialog":{"toolbar":"Kóði","title":"Kóði"},"sourcearea":{"toolbar":"Kóði"},"showblocks":{"toolbar":"Sýna blokkir"},"removeformat":{"toolbar":"Fjarlægja snið"},"pastetext":{"button":"Líma sem ósniðinn texta","title":"Líma sem ósniðinn texta"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Líma úr Word","toolbar":"Líma úr Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Punktalisti","numberedlist":"Númeraður listi"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Jafna báðum megin","center":"Miðja texta","left":"Vinstrijöfnun","right":"Hægrijöfnun"},"indent":{"indent":"Minnka inndrátt","outdent":"Auka inndrátt"},"image2":{"alt":"Baklægur texti","btnUpload":"Hlaða upp","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Almennt","lockRatio":"Festa stærðarhlutfall","menu":"Eigindi myndar","pathName":"image","pathNameCaption":"caption","resetSize":"Reikna stærð","resizer":"Click and drag to resize","title":"Eigindi myndar","uploadTab":"Senda upp","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Lóðrétt lína"},"format":{"label":"Stílsnið","panelTitle":"Stílsnið","tag_address":"Vistfang","tag_div":"Venjulegt (DIV)","tag_h1":"Fyrirsögn 1","tag_h2":"Fyrirsögn 2","tag_h3":"Fyrirsögn 3","tag_h4":"Fyrirsögn 4","tag_h5":"Fyrirsögn 5","tag_h6":"Fyrirsögn 6","tag_p":"Venjulegt letur","tag_pre":"Forsniðið"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Afrita","copyError":"Öryggisstillingar vafrans þíns leyfa ekki afritun texta með músaraðgerð. Notaðu lyklaborðið í afrita (Ctrl/Cmd+C).","cut":"Klippa","cutError":"Öryggisstillingar vafrans þíns leyfa ekki klippingu texta með músaraðgerð. Notaðu lyklaborðið í klippa (Ctrl/Cmd+X).","paste":"Líma","pasteArea":"Paste Area","pasteMsg":"Límdu í svæðið hér að neðan og (<STRONG>Ctrl/Cmd+V</STRONG>) og smelltu á <STRONG>OK</STRONG>.","securityMsg":"Vegna öryggisstillinga í vafranum þínum fær ritillinn ekki beinan aðgang að klippuborðinu. Þú verður að líma innihaldið aftur inn í þennan glugga.","title":"Líma"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Inndráttur"},"basicstyles":{"bold":"Feitletrað","italic":"Skáletrað","strike":"Yfirstrikað","subscript":"Niðurskrifað","superscript":"Uppskrifað","underline":"Undirstrikað"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Fletta í skjalasafni","url":"Vefslóð","protocol":"Samskiptastaðall","upload":"Senda upp","uploadSubmit":"Hlaða upp","image":"Setja inn mynd","flash":"Flash","form":"Setja inn innsláttarform","checkbox":"Setja inn hökunarreit","radio":"Setja inn valhnapp","textField":"Setja inn textareit","textarea":"Setja inn textasvæði","hiddenField":"Setja inn falið svæði","button":"Setja inn hnapp","select":"Setja inn lista","imageButton":"Setja inn myndahnapp","notSet":"<ekkert valið>","id":"Auðkenni","name":"Nafn","langDir":"Lesstefna","langDirLtr":"Frá vinstri til hægri (LTR)","langDirRtl":"Frá hægri til vinstri (RTL)","langCode":"Tungumálakóði","longDescr":"Nánari lýsing","cssClass":"Stílsniðsflokkur","advisoryTitle":"Titill","cssStyle":"Stíll","ok":"Í lagi","cancel":"Hætta við","close":"Close","preview":"Forskoða","resize":"Resize","generalTab":"Almennt","advancedTab":"Tæknilegt","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Mark","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","styles":"Stíll","cssClasses":"Stílsniðsflokkur","width":"Breidd","height":"Hæð","align":"Jöfnun","alignLeft":"Vinstri","alignRight":"Hægri","alignCenter":"Miðjað","alignJustify":"Jafna báðum megin","alignTop":"Efst","alignMiddle":"Miðjuð","alignBottom":"Neðst","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/it.js b/web/core/assets/vendor/ckeditor/lang/it.js
index 84ea99944..a9c6ec93a 100644
--- a/web/core/assets/vendor/ckeditor/lang/it.js
+++ b/web/core/assets/vendor/ckeditor/lang/it.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['it']={"widget":{"move":"Fare clic e trascinare per spostare","label":"Widget %1"},"undo":{"redo":"Ripristina","undo":"Annulla"},"toolbar":{"toolbarCollapse":"Minimizza Toolbar","toolbarExpand":"Espandi Toolbar","toolbarGroups":{"document":"Documento","clipboard":"Copia negli appunti/Annulla","editing":"Modifica","forms":"Form","basicstyles":"Stili di base","paragraph":"Paragrafo","links":"Link","insert":"Inserisci","styles":"Stili","colors":"Colori","tools":"Strumenti"},"toolbars":"Editor toolbar"},"table":{"border":"Dimensione bordo","caption":"Intestazione","cell":{"menu":"Cella","insertBefore":"Inserisci Cella Prima","insertAfter":"Inserisci Cella Dopo","deleteCell":"Elimina celle","merge":"Unisce celle","mergeRight":"Unisci a Destra","mergeDown":"Unisci in Basso","splitHorizontal":"Dividi Cella Orizzontalmente","splitVertical":"Dividi Cella Verticalmente","title":"Proprietà della cella","cellType":"Tipo di cella","rowSpan":"Su più righe","colSpan":"Su più colonne","wordWrap":"Ritorno a capo","hAlign":"Allineamento orizzontale","vAlign":"Allineamento verticale","alignBaseline":"Linea Base","bgColor":"Colore di Sfondo","borderColor":"Colore del Bordo","data":"Dati","header":"Intestazione","yes":"Si","no":"No","invalidWidth":"La larghezza della cella dev'essere un numero.","invalidHeight":"L'altezza della cella dev'essere un numero.","invalidRowSpan":"Il numero di righe dev'essere un numero intero.","invalidColSpan":"Il numero di colonne dev'essere un numero intero.","chooseColor":"Scegli"},"cellPad":"Padding celle","cellSpace":"Spaziatura celle","column":{"menu":"Colonna","insertBefore":"Inserisci Colonna Prima","insertAfter":"Inserisci Colonna Dopo","deleteColumn":"Elimina colonne"},"columns":"Colonne","deleteTable":"Cancella Tabella","headers":"Intestazione","headersBoth":"Entrambe","headersColumn":"Prima Colonna","headersNone":"Nessuna","headersRow":"Prima Riga","invalidBorder":"La dimensione del bordo dev'essere un numero.","invalidCellPadding":"Il paging delle celle dev'essere un numero","invalidCellSpacing":"La spaziatura tra le celle dev'essere un numero.","invalidCols":"Il numero di colonne dev'essere un numero maggiore di 0.","invalidHeight":"L'altezza della tabella dev'essere un numero.","invalidRows":"Il numero di righe dev'essere un numero maggiore di 0.","invalidWidth":"La larghezza della tabella dev'essere un numero.","menu":"Proprietà tabella","row":{"menu":"Riga","insertBefore":"Inserisci Riga Prima","insertAfter":"Inserisci Riga Dopo","deleteRow":"Elimina righe"},"rows":"Righe","summary":"Indice","title":"Proprietà tabella","toolbar":"Tabella","widthPc":"percento","widthPx":"pixel","widthUnit":"unità larghezza"},"stylescombo":{"label":"Stili","panelTitle":"Stili di formattazione","panelTitle1":"Stili per blocchi","panelTitle2":"Stili in linea","panelTitle3":"Stili per oggetti"},"specialchar":{"options":"Opzioni carattere speciale","title":"Seleziona carattere speciale","toolbar":"Inserisci carattere speciale"},"sourcedialog":{"toolbar":"Sorgente","title":"Sorgente"},"sourcearea":{"toolbar":"Sorgente"},"showblocks":{"toolbar":"Visualizza Blocchi"},"removeformat":{"toolbar":"Elimina formattazione"},"pastetext":{"button":"Incolla come testo semplice","title":"Incolla come testo semplice"},"pastefromword":{"confirmCleanup":"Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?","error":"Non è stato possibile eliminare il testo incollato a causa di un errore interno.","title":"Incolla da Word","toolbar":"Incolla da Word"},"maximize":{"maximize":"Massimizza","minimize":"Minimizza"},"magicline":{"title":"Inserisci paragrafo qui"},"list":{"bulletedlist":"Inserisci/Rimuovi Elenco Puntato","numberedlist":"Inserisci/Rimuovi Elenco Numerato"},"language":{"button":"Imposta lingua","remove":"Rimuovi lingua"},"justify":{"block":"Giustifica","center":"Centra","left":"Allinea a sinistra","right":"Allinea a destra"},"indent":{"indent":"Aumenta rientro","outdent":"Riduci rientro"},"image2":{"alt":"Testo alternativo","btnUpload":"Invia al server","captioned":"Immagine con didascalia","captionPlaceholder":"Didascalia","infoTab":"Informazioni immagine","lockRatio":"Blocca rapporto","menu":"Proprietà immagine","pathName":"immagine","pathNameCaption":"didascalia","resetSize":"Reimposta dimensione","resizer":"Fare clic e trascinare per ridimensionare","title":"Proprietà immagine","uploadTab":"Carica","urlMissing":"Manca l'URL dell'immagine."},"horizontalrule":{"toolbar":"Inserisci riga orizzontale"},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Indirizzo","tag_div":"Paragrafo (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normale","tag_pre":"Formattato"},"elementspath":{"eleLabel":"Percorso degli elementi","eleTitle":"%1 elemento"},"contextmenu":{"options":"Opzioni del menù contestuale"},"clipboard":{"copy":"Copia","copyError":"Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).","cut":"Taglia","cutError":"Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).","paste":"Incolla","pasteArea":"Incolla","pasteMsg":"Incolla il testo all'interno dell'area sottostante usando la scorciatoia di tastiere (<STRONG>Ctrl/Cmd+V</STRONG>) e premi <STRONG>OK</STRONG>.","securityMsg":"A causa delle impostazioni di sicurezza del browser,l'editor non è in grado di accedere direttamente agli appunti. E' pertanto necessario incollarli di nuovo in questa finestra.","title":"Incolla"},"button":{"selectedLabel":"%1 (selezionato)"},"blockquote":{"toolbar":"Citazione"},"basicstyles":{"bold":"Grassetto","italic":"Corsivo","strike":"Barrato","subscript":"Pedice","superscript":"Apice","underline":"Sottolineato"},"about":{"copy":"Copyright &copy; $1. Tutti i diritti riservati.","dlgTitle":"Riguardo CKEditor","help":"Vedi $1 per l'aiuto.","moreInfo":"Per le informazioni sulla licenza si prega di visitare il nostro sito:","title":"Riguardo CKEditor","userGuide":"Guida Utente CKEditor"},"editor":"Rich Text Editor","editorPanel":"Pannello Rich Text Editor","common":{"editorHelp":"Premi ALT 0 per aiuto","browseServer":"Cerca sul server","url":"URL","protocol":"Protocollo","upload":"Carica","uploadSubmit":"Invia al server","image":"Immagine","flash":"Oggetto Flash","form":"Modulo","checkbox":"Checkbox","radio":"Radio Button","textField":"Campo di testo","textarea":"Area di testo","hiddenField":"Campo nascosto","button":"Bottone","select":"Menu di selezione","imageButton":"Bottone immagine","notSet":"<non impostato>","id":"Id","name":"Nome","langDir":"Direzione scrittura","langDirLtr":"Da Sinistra a Destra (LTR)","langDirRtl":"Da Destra a Sinistra (RTL)","langCode":"Codice Lingua","longDescr":"URL descrizione estesa","cssClass":"Nome classe CSS","advisoryTitle":"Titolo","cssStyle":"Stile","ok":"OK","cancel":"Annulla","close":"Chiudi","preview":"Anteprima","resize":"Trascina per ridimensionare","generalTab":"Generale","advancedTab":"Avanzate","validateNumberFailed":"Il valore inserito non è un numero.","confirmNewPage":"Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?","confirmCancel":"Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?","options":"Opzioni","target":"Destinazione","targetNew":"Nuova finestra (_blank)","targetTop":"Finestra in primo piano (_top)","targetSelf":"Stessa finestra (_self)","targetParent":"Finestra Padre (_parent)","langDirLTR":"Da sinistra a destra (LTR)","langDirRTL":"Da destra a sinistra (RTL)","styles":"Stile","cssClasses":"Classi di stile","width":"Larghezza","height":"Altezza","align":"Allineamento","alignLeft":"Sinistra","alignRight":"Destra","alignCenter":"Centrato","alignJustify":"Giustifica","alignTop":"In Alto","alignMiddle":"Centrato","alignBottom":"In Basso","alignNone":"Nessuno","invalidValue":"Valore non valido.","invalidHeight":"L'altezza dev'essere un numero","invalidWidth":"La Larghezza dev'essere un numero","invalidCssLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).","invalidInlineStyle":"Il valore specificato per lo stile inline deve consistere in una o più tuple con il formato di \"name : value\", separati da semicolonne.","cssLengthTooltip":"Inserisci un numero per il valore in pixel oppure un numero con una valida unità CSS (px, %, in, cm, mm, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, non disponibile</span>"}};
\ No newline at end of file
+CKEDITOR.lang['it']={"widget":{"move":"Fare clic e trascinare per spostare","label":"Widget %1"},"undo":{"redo":"Ripristina","undo":"Annulla"},"toolbar":{"toolbarCollapse":"Minimizza Toolbar","toolbarExpand":"Espandi Toolbar","toolbarGroups":{"document":"Documento","clipboard":"Copia negli appunti/Annulla","editing":"Modifica","forms":"Form","basicstyles":"Stili di base","paragraph":"Paragrafo","links":"Link","insert":"Inserisci","styles":"Stili","colors":"Colori","tools":"Strumenti"},"toolbars":"Editor toolbar"},"table":{"border":"Dimensione bordo","caption":"Intestazione","cell":{"menu":"Cella","insertBefore":"Inserisci Cella Prima","insertAfter":"Inserisci Cella Dopo","deleteCell":"Elimina celle","merge":"Unisce celle","mergeRight":"Unisci a Destra","mergeDown":"Unisci in Basso","splitHorizontal":"Dividi Cella Orizzontalmente","splitVertical":"Dividi Cella Verticalmente","title":"Proprietà della cella","cellType":"Tipo di cella","rowSpan":"Su più righe","colSpan":"Su più colonne","wordWrap":"Ritorno a capo","hAlign":"Allineamento orizzontale","vAlign":"Allineamento verticale","alignBaseline":"Linea Base","bgColor":"Colore di Sfondo","borderColor":"Colore del Bordo","data":"Dati","header":"Intestazione","yes":"Si","no":"No","invalidWidth":"La larghezza della cella dev'essere un numero.","invalidHeight":"L'altezza della cella dev'essere un numero.","invalidRowSpan":"Il numero di righe dev'essere un numero intero.","invalidColSpan":"Il numero di colonne dev'essere un numero intero.","chooseColor":"Scegli"},"cellPad":"Padding celle","cellSpace":"Spaziatura celle","column":{"menu":"Colonna","insertBefore":"Inserisci Colonna Prima","insertAfter":"Inserisci Colonna Dopo","deleteColumn":"Elimina colonne"},"columns":"Colonne","deleteTable":"Cancella Tabella","headers":"Intestazione","headersBoth":"Entrambe","headersColumn":"Prima Colonna","headersNone":"Nessuna","headersRow":"Prima Riga","invalidBorder":"La dimensione del bordo dev'essere un numero.","invalidCellPadding":"Il paging delle celle dev'essere un numero","invalidCellSpacing":"La spaziatura tra le celle dev'essere un numero.","invalidCols":"Il numero di colonne dev'essere un numero maggiore di 0.","invalidHeight":"L'altezza della tabella dev'essere un numero.","invalidRows":"Il numero di righe dev'essere un numero maggiore di 0.","invalidWidth":"La larghezza della tabella dev'essere un numero.","menu":"Proprietà tabella","row":{"menu":"Riga","insertBefore":"Inserisci Riga Prima","insertAfter":"Inserisci Riga Dopo","deleteRow":"Elimina righe"},"rows":"Righe","summary":"Indice","title":"Proprietà tabella","toolbar":"Tabella","widthPc":"percento","widthPx":"pixel","widthUnit":"unità larghezza"},"stylescombo":{"label":"Stili","panelTitle":"Stili di formattazione","panelTitle1":"Stili per blocchi","panelTitle2":"Stili in linea","panelTitle3":"Stili per oggetti"},"specialchar":{"options":"Opzioni carattere speciale","title":"Seleziona carattere speciale","toolbar":"Inserisci carattere speciale"},"sourcedialog":{"toolbar":"Sorgente","title":"Sorgente"},"sourcearea":{"toolbar":"Sorgente"},"showblocks":{"toolbar":"Visualizza Blocchi"},"removeformat":{"toolbar":"Elimina formattazione"},"pastetext":{"button":"Incolla come testo semplice","title":"Incolla come testo semplice"},"pastefromword":{"confirmCleanup":"Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?","error":"Non è stato possibile eliminare il testo incollato a causa di un errore interno.","title":"Incolla da Word","toolbar":"Incolla da Word"},"maximize":{"maximize":"Massimizza","minimize":"Minimizza"},"magicline":{"title":"Inserisci paragrafo qui"},"list":{"bulletedlist":"Inserisci/Rimuovi Elenco Puntato","numberedlist":"Inserisci/Rimuovi Elenco Numerato"},"language":{"button":"Imposta lingua","remove":"Rimuovi lingua"},"justify":{"block":"Giustifica","center":"Centra","left":"Allinea a sinistra","right":"Allinea a destra"},"indent":{"indent":"Aumenta rientro","outdent":"Riduci rientro"},"image2":{"alt":"Testo alternativo","btnUpload":"Invia al server","captioned":"Immagine con didascalia","captionPlaceholder":"Didascalia","infoTab":"Informazioni immagine","lockRatio":"Blocca rapporto","menu":"Proprietà immagine","pathName":"immagine","pathNameCaption":"didascalia","resetSize":"Reimposta dimensione","resizer":"Fare clic e trascinare per ridimensionare","title":"Proprietà immagine","uploadTab":"Carica","urlMissing":"Manca l'URL dell'immagine.","altMissing":"Testo alternativo mancante."},"horizontalrule":{"toolbar":"Inserisci riga orizzontale"},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Indirizzo","tag_div":"Paragrafo (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normale","tag_pre":"Formattato"},"elementspath":{"eleLabel":"Percorso degli elementi","eleTitle":"%1 elemento"},"contextmenu":{"options":"Opzioni del menù contestuale"},"clipboard":{"copy":"Copia","copyError":"Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).","cut":"Taglia","cutError":"Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).","paste":"Incolla","pasteArea":"Incolla","pasteMsg":"Incolla il testo all'interno dell'area sottostante usando la scorciatoia di tastiere (<STRONG>Ctrl/Cmd+V</STRONG>) e premi <STRONG>OK</STRONG>.","securityMsg":"A causa delle impostazioni di sicurezza del browser,l'editor non è in grado di accedere direttamente agli appunti. E' pertanto necessario incollarli di nuovo in questa finestra.","title":"Incolla"},"button":{"selectedLabel":"%1 (selezionato)"},"blockquote":{"toolbar":"Citazione"},"basicstyles":{"bold":"Grassetto","italic":"Corsivo","strike":"Barrato","subscript":"Pedice","superscript":"Apice","underline":"Sottolineato"},"about":{"copy":"Copyright &copy; $1. Tutti i diritti riservati.","dlgTitle":"Riguardo CKEditor","help":"Vedi $1 per l'aiuto.","moreInfo":"Per le informazioni sulla licenza si prega di visitare il nostro sito:","title":"Riguardo CKEditor","userGuide":"Guida Utente CKEditor"},"editor":"Rich Text Editor","editorPanel":"Pannello Rich Text Editor","common":{"editorHelp":"Premi ALT 0 per aiuto","browseServer":"Cerca sul server","url":"URL","protocol":"Protocollo","upload":"Carica","uploadSubmit":"Invia al server","image":"Immagine","flash":"Oggetto Flash","form":"Modulo","checkbox":"Checkbox","radio":"Radio Button","textField":"Campo di testo","textarea":"Area di testo","hiddenField":"Campo nascosto","button":"Bottone","select":"Menu di selezione","imageButton":"Bottone immagine","notSet":"<non impostato>","id":"Id","name":"Nome","langDir":"Direzione scrittura","langDirLtr":"Da Sinistra a Destra (LTR)","langDirRtl":"Da Destra a Sinistra (RTL)","langCode":"Codice Lingua","longDescr":"URL descrizione estesa","cssClass":"Nome classe CSS","advisoryTitle":"Titolo","cssStyle":"Stile","ok":"OK","cancel":"Annulla","close":"Chiudi","preview":"Anteprima","resize":"Trascina per ridimensionare","generalTab":"Generale","advancedTab":"Avanzate","validateNumberFailed":"Il valore inserito non è un numero.","confirmNewPage":"Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?","confirmCancel":"Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?","options":"Opzioni","target":"Destinazione","targetNew":"Nuova finestra (_blank)","targetTop":"Finestra in primo piano (_top)","targetSelf":"Stessa finestra (_self)","targetParent":"Finestra Padre (_parent)","langDirLTR":"Da sinistra a destra (LTR)","langDirRTL":"Da destra a sinistra (RTL)","styles":"Stile","cssClasses":"Classi di stile","width":"Larghezza","height":"Altezza","align":"Allineamento","alignLeft":"Sinistra","alignRight":"Destra","alignCenter":"Centrato","alignJustify":"Giustifica","alignTop":"In Alto","alignMiddle":"Centrato","alignBottom":"In Basso","alignNone":"Nessuno","invalidValue":"Valore non valido.","invalidHeight":"L'altezza dev'essere un numero","invalidWidth":"La Larghezza dev'essere un numero","invalidCssLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).","invalidInlineStyle":"Il valore specificato per lo stile inline deve consistere in una o più tuple con il formato di \"name : value\", separati da semicolonne.","cssLengthTooltip":"Inserisci un numero per il valore in pixel oppure un numero con una valida unità CSS (px, %, in, cm, mm, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, non disponibile</span>","keyboard":{"8":"Backspace","13":"Invio","16":"Maiusc","17":"Ctrl","18":"Alt","32":"Spazio","35":"Fine","36":"Inizio","46":"Canc","224":"Comando"},"keyboardShortcut":"Scorciatoia da tastiera"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/ja.js b/web/core/assets/vendor/ckeditor/lang/ja.js
index 77875c67a..9e40ba6d7 100644
--- a/web/core/assets/vendor/ckeditor/lang/ja.js
+++ b/web/core/assets/vendor/ckeditor/lang/ja.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ja']={"widget":{"move":"ドラッグして移動","label":"%1 widget"},"undo":{"redo":"やり直す","undo":"元に戻す"},"toolbar":{"toolbarCollapse":"ツールバーを閉じる","toolbarExpand":"ツールバーを開く","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"編集ツールバー"},"table":{"border":"枠線の幅","caption":"キャプション","cell":{"menu":"セル","insertBefore":"セルを前に挿入","insertAfter":"セルを後に挿入","deleteCell":"セルを削除","merge":"セルを結合","mergeRight":"右に結合","mergeDown":"下に結合","splitHorizontal":"セルを水平方向に分割","splitVertical":"セルを垂直方向に分割","title":"セルのプロパティ","cellType":"セルの種類","rowSpan":"行の結合数","colSpan":"列の結合数","wordWrap":"単語の折り返し","hAlign":"水平方向の配置","vAlign":"垂直方向の配置","alignBaseline":"ベースライン","bgColor":"背景色","borderColor":"ボーダーカラー","data":"テーブルデータ (td)","header":"ヘッダ","yes":"はい","no":"いいえ","invalidWidth":"セル幅は数値で入力してください。","invalidHeight":"セル高さは数値で入力してください。","invalidRowSpan":"縦幅(行数)は数値で入力してください。","invalidColSpan":"横幅(列数)は数値で入力してください。","chooseColor":"色の選択"},"cellPad":"セル内間隔","cellSpace":"セル内余白","column":{"menu":"列","insertBefore":"列を左に挿入","insertAfter":"列を右に挿入","deleteColumn":"列を削除"},"columns":"列数","deleteTable":"表を削除","headers":"ヘッダ (th)","headersBoth":"両方","headersColumn":"最初の列のみ","headersNone":"なし","headersRow":"最初の行のみ","invalidBorder":"枠線の幅は数値で入力してください。","invalidCellPadding":"セル内余白は数値で入力してください。","invalidCellSpacing":"セル間余白は数値で入力してください。","invalidCols":"列数は0より大きな数値を入力してください。","invalidHeight":"高さは数値で入力してください。","invalidRows":"行数は0より大きな数値を入力してください。","invalidWidth":"幅は数値で入力してください。","menu":"表のプロパティ","row":{"menu":"行","insertBefore":"行を上に挿入","insertAfter":"行を下に挿入","deleteRow":"行を削除"},"rows":"行数","summary":"表の概要","title":"表のプロパティ","toolbar":"表","widthPc":"パーセント","widthPx":"ピクセル","widthUnit":"幅の単位"},"stylescombo":{"label":"スタイル","panelTitle":"スタイル","panelTitle1":"ブロックスタイル","panelTitle2":"インラインスタイル","panelTitle3":"オブジェクトスタイル"},"specialchar":{"options":"特殊文字オプション","title":"特殊文字の選択","toolbar":"特殊文字を挿入"},"sourcedialog":{"toolbar":"ソース","title":"ソース"},"sourcearea":{"toolbar":"ソース"},"showblocks":{"toolbar":"ブロック表示"},"removeformat":{"toolbar":"書式を解除"},"pastetext":{"button":"プレーンテキストとして貼り付け","title":"プレーンテキストとして貼り付け"},"pastefromword":{"confirmCleanup":"貼り付けを行うテキストはワード文章からコピーされようとしています。貼り付ける前にクリーニングを行いますか？","error":"内部エラーにより貼り付けたデータをクリアできませんでした","title":"ワード文章から貼り付け","toolbar":"ワード文章から貼り付け"},"maximize":{"maximize":"最大化","minimize":"最小化"},"magicline":{"title":"ここに段落を挿入"},"list":{"bulletedlist":"番号無しリスト","numberedlist":"番号付きリスト"},"language":{"button":"言語を設定","remove":"言語を削除"},"justify":{"block":"両端揃え","center":"中央揃え","left":"左揃え","right":"右揃え"},"indent":{"indent":"インデント","outdent":"インデント解除"},"image2":{"alt":"代替テキスト","btnUpload":"サーバーに送信","captioned":"キャプションを付ける","captionPlaceholder":"キャプション","infoTab":"画像情報","lockRatio":"比率を固定","menu":"画像のプロパティ","pathName":"image","pathNameCaption":"caption","resetSize":"サイズをリセット","resizer":"ドラッグしてリサイズ","title":"画像のプロパティ","uploadTab":"アップロード","urlMissing":"画像のURLを入力してください。"},"horizontalrule":{"toolbar":"水平線"},"format":{"label":"書式","panelTitle":"段落の書式","tag_address":"アドレス","tag_div":"標準 (DIV)","tag_h1":"見出し 1","tag_h2":"見出し 2","tag_h3":"見出し 3","tag_h4":"見出し 4","tag_h5":"見出し 5","tag_h6":"見出し 6","tag_p":"標準","tag_pre":"書式付き"},"elementspath":{"eleLabel":"要素パス","eleTitle":"%1 要素"},"contextmenu":{"options":"コンテキストメニューオプション"},"clipboard":{"copy":"コピー","copyError":"ブラウザーのセキュリティ設定によりエディタのコピー操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+C)を使用してください。","cut":"切り取り","cutError":"ブラウザーのセキュリティ設定によりエディタの切り取り操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+X)を使用してください。","paste":"貼り付け","pasteArea":"貼り付け場所","pasteMsg":"キーボード(<STRONG>Ctrl/Cmd+V</STRONG>)を使用して、次の入力エリア内で貼り付けて、<STRONG>OK</STRONG>を押してください。","securityMsg":"ブラウザのセキュリティ設定により、エディタはクリップボードデータに直接アクセスすることができません。このウィンドウは貼り付け操作を行う度に表示されます。","title":"貼り付け"},"button":{"selectedLabel":"%1 (選択中)"},"blockquote":{"toolbar":"ブロック引用文"},"basicstyles":{"bold":"太字","italic":"斜体","strike":"打ち消し線","subscript":"下付き","superscript":"上付き","underline":"下線"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"CKEditorについて","help":"$1 のヘルプを見てください。","moreInfo":"ライセンス情報の詳細はウェブサイトにて確認してください:","title":"CKEditorについて","userGuide":"CKEditor User's Guide"},"editor":"リッチテキストエディタ","editorPanel":"リッチテキストエディタパネル","common":{"editorHelp":"ヘルプは ALT 0 を押してください","browseServer":"サーバブラウザ","url":"URL","protocol":"プロトコル","upload":"アップロード","uploadSubmit":"サーバーに送信","image":"イメージ","flash":"Flash","form":"フォーム","checkbox":"チェックボックス","radio":"ラジオボタン","textField":"１行テキスト","textarea":"テキストエリア","hiddenField":"不可視フィールド","button":"ボタン","select":"選択フィールド","imageButton":"画像ボタン","notSet":"<なし>","id":"Id","name":"Name属性","langDir":"文字表記の方向","langDirLtr":"左から右 (LTR)","langDirRtl":"右から左 (RTL)","langCode":"言語コード","longDescr":"longdesc属性(長文説明)","cssClass":"スタイルシートクラス","advisoryTitle":"Title属性","cssStyle":"スタイルシート","ok":"OK","cancel":"キャンセル","close":"閉じる","preview":"プレビュー","resize":"ドラッグしてリサイズ","generalTab":"全般","advancedTab":"高度な設定","validateNumberFailed":"値が数ではありません","confirmNewPage":"変更内容を保存せず、 新しいページを開いてもよろしいでしょうか？","confirmCancel":"オプション設定を変更しました。ダイアログを閉じてもよろしいでしょうか？","options":"オプション","target":"ターゲット","targetNew":"新しいウインドウ (_blank)","targetTop":"最上部ウィンドウ (_top)","targetSelf":"同じウィンドウ (_self)","targetParent":"親ウィンドウ (_parent)","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","styles":"スタイル","cssClasses":"スタイルシートクラス","width":"幅","height":"高さ","align":"行揃え","alignLeft":"左","alignRight":"右","alignCenter":"中央","alignJustify":"両端揃え","alignTop":"上","alignMiddle":"中央","alignBottom":"下","alignNone":"なし","invalidValue":"不正な値です。","invalidHeight":"高さは数値で入力してください。","invalidWidth":"幅は数値で入力してください。","invalidCssLength":"入力された \"%1\" 項目の値は、CSSの大きさ(px, %, in, cm, mm, em, ex, pt, または pc)が正しいものである/ないに関わらず、正の値である必要があります。","invalidHtmlLength":"入力された \"%1\" 項目の値は、HTMLの大きさ(px または %)が正しいものである/ないに関わらず、正の値である必要があります。","invalidInlineStyle":"入力されたインラインスタイルの値は、\"名前 : 値\" のフォーマットのセットで、複数の場合はセミコロンで区切られている形式である必要があります。","cssLengthTooltip":"ピクセル数もしくはCSSにセットできる数値を入力してください。(px,%,in,cm,mm,em,ex,pt,or pc)","unavailable":"%1<span class=\"cke_accessibility\">, 利用不可能</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ja']={"widget":{"move":"ドラッグして移動","label":"%1 ウィジェット"},"undo":{"redo":"やり直す","undo":"元に戻す"},"toolbar":{"toolbarCollapse":"ツールバーを閉じる","toolbarExpand":"ツールバーを開く","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"編集ツールバー"},"table":{"border":"枠線の幅","caption":"キャプション","cell":{"menu":"セル","insertBefore":"セルを前に挿入","insertAfter":"セルを後に挿入","deleteCell":"セルを削除","merge":"セルを結合","mergeRight":"右に結合","mergeDown":"下に結合","splitHorizontal":"セルを水平方向に分割","splitVertical":"セルを垂直方向に分割","title":"セルのプロパティ","cellType":"セルの種類","rowSpan":"行の結合数","colSpan":"列の結合数","wordWrap":"単語の折り返し","hAlign":"水平方向の配置","vAlign":"垂直方向の配置","alignBaseline":"ベースライン","bgColor":"背景色","borderColor":"ボーダーカラー","data":"テーブルデータ (td)","header":"ヘッダ","yes":"はい","no":"いいえ","invalidWidth":"セル幅は数値で入力してください。","invalidHeight":"セル高さは数値で入力してください。","invalidRowSpan":"縦幅(行数)は数値で入力してください。","invalidColSpan":"横幅(列数)は数値で入力してください。","chooseColor":"色の選択"},"cellPad":"セル内間隔","cellSpace":"セル内余白","column":{"menu":"列","insertBefore":"列を左に挿入","insertAfter":"列を右に挿入","deleteColumn":"列を削除"},"columns":"列数","deleteTable":"表を削除","headers":"ヘッダ (th)","headersBoth":"両方","headersColumn":"最初の列のみ","headersNone":"なし","headersRow":"最初の行のみ","invalidBorder":"枠線の幅は数値で入力してください。","invalidCellPadding":"セル内余白は数値で入力してください。","invalidCellSpacing":"セル間余白は数値で入力してください。","invalidCols":"列数は0より大きな数値を入力してください。","invalidHeight":"高さは数値で入力してください。","invalidRows":"行数は0より大きな数値を入力してください。","invalidWidth":"幅は数値で入力してください。","menu":"表のプロパティ","row":{"menu":"行","insertBefore":"行を上に挿入","insertAfter":"行を下に挿入","deleteRow":"行を削除"},"rows":"行数","summary":"表の概要","title":"表のプロパティ","toolbar":"表","widthPc":"パーセント","widthPx":"ピクセル","widthUnit":"幅の単位"},"stylescombo":{"label":"スタイル","panelTitle":"スタイル","panelTitle1":"ブロックスタイル","panelTitle2":"インラインスタイル","panelTitle3":"オブジェクトスタイル"},"specialchar":{"options":"特殊文字オプション","title":"特殊文字の選択","toolbar":"特殊文字を挿入"},"sourcedialog":{"toolbar":"ソース","title":"ソース"},"sourcearea":{"toolbar":"ソース"},"showblocks":{"toolbar":"ブロック表示"},"removeformat":{"toolbar":"書式を解除"},"pastetext":{"button":"プレーンテキストとして貼り付け","title":"プレーンテキストとして貼り付け"},"pastefromword":{"confirmCleanup":"貼り付けを行うテキストはワード文章からコピーされようとしています。貼り付ける前にクリーニングを行いますか？","error":"内部エラーにより貼り付けたデータをクリアできませんでした","title":"ワード文章から貼り付け","toolbar":"ワード文章から貼り付け"},"maximize":{"maximize":"最大化","minimize":"最小化"},"magicline":{"title":"ここに段落を挿入"},"list":{"bulletedlist":"番号無しリスト","numberedlist":"番号付きリスト"},"language":{"button":"言語を設定","remove":"言語を削除"},"justify":{"block":"両端揃え","center":"中央揃え","left":"左揃え","right":"右揃え"},"indent":{"indent":"インデント","outdent":"インデント解除"},"image2":{"alt":"代替テキスト","btnUpload":"サーバーに送信","captioned":"キャプションを付ける","captionPlaceholder":"キャプション","infoTab":"画像情報","lockRatio":"比率を固定","menu":"画像のプロパティ","pathName":"image","pathNameCaption":"caption","resetSize":"サイズをリセット","resizer":"ドラッグしてリサイズ","title":"画像のプロパティ","uploadTab":"アップロード","urlMissing":"画像のURLを入力してください。","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"水平線"},"format":{"label":"書式","panelTitle":"段落の書式","tag_address":"アドレス","tag_div":"標準 (DIV)","tag_h1":"見出し 1","tag_h2":"見出し 2","tag_h3":"見出し 3","tag_h4":"見出し 4","tag_h5":"見出し 5","tag_h6":"見出し 6","tag_p":"標準","tag_pre":"書式付き"},"elementspath":{"eleLabel":"要素パス","eleTitle":"%1 要素"},"contextmenu":{"options":"コンテキストメニューオプション"},"clipboard":{"copy":"コピー","copyError":"ブラウザーのセキュリティ設定によりエディタのコピー操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+C)を使用してください。","cut":"切り取り","cutError":"ブラウザーのセキュリティ設定によりエディタの切り取り操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+X)を使用してください。","paste":"貼り付け","pasteArea":"貼り付け場所","pasteMsg":"キーボード(<STRONG>Ctrl/Cmd+V</STRONG>)を使用して、次の入力エリア内で貼り付けて、<STRONG>OK</STRONG>を押してください。","securityMsg":"ブラウザのセキュリティ設定により、エディタはクリップボードデータに直接アクセスすることができません。このウィンドウは貼り付け操作を行う度に表示されます。","title":"貼り付け"},"button":{"selectedLabel":"%1 (選択中)"},"blockquote":{"toolbar":"ブロック引用文"},"basicstyles":{"bold":"太字","italic":"斜体","strike":"打ち消し線","subscript":"下付き","superscript":"上付き","underline":"下線"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"CKEditorについて","help":"$1 のヘルプを見てください。","moreInfo":"ライセンス情報の詳細はウェブサイトにて確認してください:","title":"CKEditorについて","userGuide":"CKEditor User's Guide"},"editor":"リッチテキストエディタ","editorPanel":"リッチテキストエディタパネル","common":{"editorHelp":"ヘルプは ALT 0 を押してください","browseServer":"サーバブラウザ","url":"URL","protocol":"プロトコル","upload":"アップロード","uploadSubmit":"サーバーに送信","image":"イメージ","flash":"Flash","form":"フォーム","checkbox":"チェックボックス","radio":"ラジオボタン","textField":"１行テキスト","textarea":"テキストエリア","hiddenField":"不可視フィールド","button":"ボタン","select":"選択フィールド","imageButton":"画像ボタン","notSet":"<なし>","id":"Id","name":"Name属性","langDir":"文字表記の方向","langDirLtr":"左から右 (LTR)","langDirRtl":"右から左 (RTL)","langCode":"言語コード","longDescr":"longdesc属性(長文説明)","cssClass":"スタイルシートクラス","advisoryTitle":"Title属性","cssStyle":"スタイルシート","ok":"OK","cancel":"キャンセル","close":"閉じる","preview":"プレビュー","resize":"ドラッグしてリサイズ","generalTab":"全般","advancedTab":"高度な設定","validateNumberFailed":"値が数ではありません","confirmNewPage":"変更内容を保存せず、 新しいページを開いてもよろしいでしょうか？","confirmCancel":"オプション設定を変更しました。ダイアログを閉じてもよろしいでしょうか？","options":"オプション","target":"ターゲット","targetNew":"新しいウインドウ (_blank)","targetTop":"最上部ウィンドウ (_top)","targetSelf":"同じウィンドウ (_self)","targetParent":"親ウィンドウ (_parent)","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","styles":"スタイル","cssClasses":"スタイルシートクラス","width":"幅","height":"高さ","align":"行揃え","alignLeft":"左","alignRight":"右","alignCenter":"中央","alignJustify":"両端揃え","alignTop":"上","alignMiddle":"中央","alignBottom":"下","alignNone":"なし","invalidValue":"不正な値です。","invalidHeight":"高さは数値で入力してください。","invalidWidth":"幅は数値で入力してください。","invalidCssLength":"入力された \"%1\" 項目の値は、CSSの大きさ(px, %, in, cm, mm, em, ex, pt, または pc)が正しいものである/ないに関わらず、正の値である必要があります。","invalidHtmlLength":"入力された \"%1\" 項目の値は、HTMLの大きさ(px または %)が正しいものである/ないに関わらず、正の値である必要があります。","invalidInlineStyle":"入力されたインラインスタイルの値は、\"名前 : 値\" のフォーマットのセットで、複数の場合はセミコロンで区切られている形式である必要があります。","cssLengthTooltip":"ピクセル数もしくはCSSにセットできる数値を入力してください。(px,%,in,cm,mm,em,ex,pt,or pc)","unavailable":"%1<span class=\"cke_accessibility\">, 利用不可能</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"キーボードショートカット"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/ka.js b/web/core/assets/vendor/ckeditor/lang/ka.js
index e7f44f287..ce3ae03d2 100644
--- a/web/core/assets/vendor/ckeditor/lang/ka.js
+++ b/web/core/assets/vendor/ckeditor/lang/ka.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ka']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"გამეორება","undo":"გაუქმება"},"toolbar":{"toolbarCollapse":"ხელსაწყოთა ზოლის შეწევა","toolbarExpand":"ხელსაწყოთა ზოლის გამოწევა","toolbarGroups":{"document":"დოკუმენტი","clipboard":"Clipboard/გაუქმება","editing":"რედაქტირება","forms":"ფორმები","basicstyles":"ძირითადი სტილები","paragraph":"აბზაცი","links":"ბმულები","insert":"ჩასმა","styles":"სტილები","colors":"ფერები","tools":"ხელსაწყოები"},"toolbars":"Editor toolbars"},"table":{"border":"ჩარჩოს ზომა","caption":"სათაური","cell":{"menu":"უჯრა","insertBefore":"უჯრის ჩასმა მანამდე","insertAfter":"უჯრის ჩასმა მერე","deleteCell":"უჯრების წაშლა","merge":"უჯრების შეერთება","mergeRight":"შეერთება მარჯვენასთან","mergeDown":"შეერთება ქვემოთასთან","splitHorizontal":"გაყოფა ჰორიზონტალურად","splitVertical":"გაყოფა ვერტიკალურად","title":"უჯრის პარამეტრები","cellType":"უჯრის ტიპი","rowSpan":"სტრიქონების ოდენობა","colSpan":"სვეტების ოდენობა","wordWrap":"სტრიქონის გადატანა (Word Wrap)","hAlign":"ჰორიზონტალური სწორება","vAlign":"ვერტიკალური სწორება","alignBaseline":"ძირითადი ხაზის გასწვრივ","bgColor":"ფონის ფერი","borderColor":"ჩარჩოს ფერი","data":"მონაცემები","header":"სათაური","yes":"დიახ","no":"არა","invalidWidth":"უჯრის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidHeight":"უჯრის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRowSpan":"სტრიქონების რაოდენობა მთელი რიცხვი უნდა იყოს.","invalidColSpan":"სვეტების რაოდენობა მთელი რიცხვი უნდა იყოს.","chooseColor":"არჩევა"},"cellPad":"უჯრის კიდე (padding)","cellSpace":"უჯრის სივრცე (spacing)","column":{"menu":"სვეტი","insertBefore":"სვეტის ჩამატება წინ","insertAfter":"სვეტის ჩამატება მერე","deleteColumn":"სვეტების წაშლა"},"columns":"სვეტი","deleteTable":"ცხრილის წაშლა","headers":"სათაურები","headersBoth":"ორივე","headersColumn":"პირველი სვეტი","headersNone":"არაფერი","headersRow":"პირველი სტრიქონი","invalidBorder":"ჩარჩოს ზომა რიცხვით უდნა იყოს წარმოდგენილი.","invalidCellPadding":"უჯრის კიდე (padding) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCellSpacing":"უჯრის სივრცე (spacing) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCols":"სვეტების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidHeight":"ცხრილის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRows":"სტრიქონების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidWidth":"ცხრილის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","menu":"ცხრილის პარამეტრები","row":{"menu":"სტრიქონი","insertBefore":"სტრიქონის ჩამატება წინ","insertAfter":"სტრიქონის ჩამატება მერე","deleteRow":"სტრიქონების წაშლა"},"rows":"სტრიქონი","summary":"შეჯამება","title":"ცხრილის პარამეტრები","toolbar":"ცხრილი","widthPc":"პროცენტი","widthPx":"წერტილი","widthUnit":"საზომი ერთეული"},"stylescombo":{"label":"სტილები","panelTitle":"ფორმატირების სტილები","panelTitle1":"არის სტილები","panelTitle2":"თანდართული სტილები","panelTitle3":"ობიექტის სტილები"},"specialchar":{"options":"სპეციალური სიმბოლოს პარამეტრები","title":"სპეციალური სიმბოლოს არჩევა","toolbar":"სპეციალური სიმბოლოს ჩასმა"},"sourcedialog":{"toolbar":"კოდები","title":"კოდები"},"sourcearea":{"toolbar":"კოდები"},"showblocks":{"toolbar":"არეების ჩვენება"},"removeformat":{"toolbar":"ფორმატირების მოხსნა"},"pastetext":{"button":"მხოლოდ ტექსტის ჩასმა","title":"მხოლოდ ტექსტის ჩასმა"},"pastefromword":{"confirmCleanup":"ჩასასმელი ტექსტი ვორდიდან გადმოტანილს გავს - გინდათ მისი წინასწარ გაწმენდა?","error":"შიდა შეცდომის გამო ვერ მოხერხდა ტექსტის გაწმენდა","title":"ვორდიდან ჩასმა","toolbar":"ვორდიდან ჩასმა"},"maximize":{"maximize":"გადიდება","minimize":"დაპატარავება"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"ღილიანი სია","numberedlist":"გადანომრილი სია"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"გადასწორება","center":"შუაში სწორება","left":"მარცხნივ სწორება","right":"მარჯვნივ სწორება"},"indent":{"indent":"მეტად შეწევა","outdent":"ნაკლებად შეწევა"},"image2":{"alt":"სანაცვლო ტექსტი","btnUpload":"სერვერისთვის გაგზავნა","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"სურათის ინფორმცია","lockRatio":"პროპორციის შენარჩუნება","menu":"სურათის პარამეტრები","pathName":"image","pathNameCaption":"caption","resetSize":"ზომის დაბრუნება","resizer":"Click and drag to resize","title":"სურათის პარამეტრები","uploadTab":"აქაჩვა","urlMissing":"სურათის URL არაა შევსებული."},"horizontalrule":{"toolbar":"ჰორიზონტალური ხაზის ჩასმა"},"format":{"label":"ფიორმატირება","panelTitle":"ფორმატირება","tag_address":"მისამართი","tag_div":"ჩვეულებრივი (DIV)","tag_h1":"სათაური 1","tag_h2":"სათაური 2","tag_h3":"სათაური 3","tag_h4":"სათაური 4","tag_h5":"სათაური 5","tag_h6":"სათაური 6","tag_p":"ჩვეულებრივი","tag_pre":"ფორმატირებული"},"elementspath":{"eleLabel":"ელემეტის გზა","eleTitle":"%1 ელემენტი"},"contextmenu":{"options":"კონტექსტური მენიუს პარამეტრები"},"clipboard":{"copy":"ასლი","copyError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ასლის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+C).","cut":"ამოჭრა","cutError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ამოჭრის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+X).","paste":"ჩასმა","pasteArea":"ჩასმის არე","pasteMsg":"ჩასვით ამ არის შიგნით კლავიატურის გამოყენებით (<strong>Ctrl/Cmd+V</strong>) და დააჭირეთ OK-ს","securityMsg":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა clipboard-ის მონაცემების წვდომის უფლებას. კიდევ უნდა ჩასვათ ტექსტი ამ ფანჯარაში.","title":"ჩასმა"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"ციტატა"},"basicstyles":{"bold":"მსხვილი","italic":"დახრილი","strike":"გადახაზული","subscript":"ინდექსი","superscript":"ხარისხი","underline":"გახაზული"},"about":{"copy":"Copyright &copy; $1. ყველა უფლება დაცულია.","dlgTitle":"CKEditor-ის შესახებ","help":"დახმარებისთვის იხილეთ $1.","moreInfo":"ლიცენზიის ინფორმაციისთვის ეწვიეთ ჩვენს საიტს:","title":"CKEditor-ის შესახებ","userGuide":"CKEditor-ის მომხმარებლის სახელმძღვანელო"},"editor":"ტექსტის რედაქტორი","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"დააჭირეთ ALT 0-ს დახმარების მისაღებად","browseServer":"სერვერზე დათვალიერება","url":"URL","protocol":"პროტოკოლი","upload":"ატვირთვა","uploadSubmit":"სერვერზე გაგზავნა","image":"სურათი","flash":"Flash","form":"ფორმა","checkbox":"მონიშვნის ღილაკი","radio":"ამორჩევის ღილაკი","textField":"ტექსტური ველი","textarea":"ტექსტური არე","hiddenField":"მალული ველი","button":"ღილაკი","select":"არჩევის ველი","imageButton":"სურათიანი ღილაკი","notSet":"<არაფერი>","id":"Id","name":"სახელი","langDir":"ენის მიმართულება","langDirLtr":"მარცხნიდან მარჯვნივ (LTR)","langDirRtl":"მარჯვნიდან მარცხნივ (RTL)","langCode":"ენის კოდი","longDescr":"დიდი აღწერის URL","cssClass":"CSS კლასი","advisoryTitle":"სათაური","cssStyle":"CSS სტილი","ok":"დიახ","cancel":"გაუქმება","close":"დახურვა","preview":"გადახედვა","resize":"გაწიე ზომის შესაცვლელად","generalTab":"ინფორმაცია","advancedTab":"გაფართოებული","validateNumberFailed":"ეს მნიშვნელობა არაა რიცხვი.","confirmNewPage":"ამ დოკუმენტში ყველა ჩაუწერელი ცვლილება დაიკარგება. დარწმუნებული ხართ რომ ახალი გვერდის ჩატვირთვა გინდათ?","confirmCancel":"ზოგიერთი პარამეტრი შეცვლილია, დარწმუნებულილ ხართ რომ ფანჯრის დახურვა გსურთ?","options":"პარამეტრები","target":"გახსნის ადგილი","targetNew":"ახალი ფანჯარა (_blank)","targetTop":"ზედა ფანჯარა (_top)","targetSelf":"იგივე ფანჯარა (_self)","targetParent":"მშობელი ფანჯარა (_parent)","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","styles":"სტილი","cssClasses":"CSS კლასი","width":"სიგანე","height":"სიმაღლე","align":"სწორება","alignLeft":"მარცხენა","alignRight":"მარჯვენა","alignCenter":"შუა","alignJustify":"両端揃え","alignTop":"ზემოთა","alignMiddle":"შუა","alignBottom":"ქვემოთა","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidWidth":"სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, მიუწვდომელია</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ka']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"გამეორება","undo":"გაუქმება"},"toolbar":{"toolbarCollapse":"ხელსაწყოთა ზოლის შეწევა","toolbarExpand":"ხელსაწყოთა ზოლის გამოწევა","toolbarGroups":{"document":"დოკუმენტი","clipboard":"Clipboard/გაუქმება","editing":"რედაქტირება","forms":"ფორმები","basicstyles":"ძირითადი სტილები","paragraph":"აბზაცი","links":"ბმულები","insert":"ჩასმა","styles":"სტილები","colors":"ფერები","tools":"ხელსაწყოები"},"toolbars":"Editor toolbars"},"table":{"border":"ჩარჩოს ზომა","caption":"სათაური","cell":{"menu":"უჯრა","insertBefore":"უჯრის ჩასმა მანამდე","insertAfter":"უჯრის ჩასმა მერე","deleteCell":"უჯრების წაშლა","merge":"უჯრების შეერთება","mergeRight":"შეერთება მარჯვენასთან","mergeDown":"შეერთება ქვემოთასთან","splitHorizontal":"გაყოფა ჰორიზონტალურად","splitVertical":"გაყოფა ვერტიკალურად","title":"უჯრის პარამეტრები","cellType":"უჯრის ტიპი","rowSpan":"სტრიქონების ოდენობა","colSpan":"სვეტების ოდენობა","wordWrap":"სტრიქონის გადატანა (Word Wrap)","hAlign":"ჰორიზონტალური სწორება","vAlign":"ვერტიკალური სწორება","alignBaseline":"ძირითადი ხაზის გასწვრივ","bgColor":"ფონის ფერი","borderColor":"ჩარჩოს ფერი","data":"მონაცემები","header":"სათაური","yes":"დიახ","no":"არა","invalidWidth":"უჯრის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidHeight":"უჯრის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRowSpan":"სტრიქონების რაოდენობა მთელი რიცხვი უნდა იყოს.","invalidColSpan":"სვეტების რაოდენობა მთელი რიცხვი უნდა იყოს.","chooseColor":"არჩევა"},"cellPad":"უჯრის კიდე (padding)","cellSpace":"უჯრის სივრცე (spacing)","column":{"menu":"სვეტი","insertBefore":"სვეტის ჩამატება წინ","insertAfter":"სვეტის ჩამატება მერე","deleteColumn":"სვეტების წაშლა"},"columns":"სვეტი","deleteTable":"ცხრილის წაშლა","headers":"სათაურები","headersBoth":"ორივე","headersColumn":"პირველი სვეტი","headersNone":"არაფერი","headersRow":"პირველი სტრიქონი","invalidBorder":"ჩარჩოს ზომა რიცხვით უდნა იყოს წარმოდგენილი.","invalidCellPadding":"უჯრის კიდე (padding) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCellSpacing":"უჯრის სივრცე (spacing) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCols":"სვეტების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidHeight":"ცხრილის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRows":"სტრიქონების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidWidth":"ცხრილის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","menu":"ცხრილის პარამეტრები","row":{"menu":"სტრიქონი","insertBefore":"სტრიქონის ჩამატება წინ","insertAfter":"სტრიქონის ჩამატება მერე","deleteRow":"სტრიქონების წაშლა"},"rows":"სტრიქონი","summary":"შეჯამება","title":"ცხრილის პარამეტრები","toolbar":"ცხრილი","widthPc":"პროცენტი","widthPx":"წერტილი","widthUnit":"საზომი ერთეული"},"stylescombo":{"label":"სტილები","panelTitle":"ფორმატირების სტილები","panelTitle1":"არის სტილები","panelTitle2":"თანდართული სტილები","panelTitle3":"ობიექტის სტილები"},"specialchar":{"options":"სპეციალური სიმბოლოს პარამეტრები","title":"სპეციალური სიმბოლოს არჩევა","toolbar":"სპეციალური სიმბოლოს ჩასმა"},"sourcedialog":{"toolbar":"კოდები","title":"კოდები"},"sourcearea":{"toolbar":"კოდები"},"showblocks":{"toolbar":"არეების ჩვენება"},"removeformat":{"toolbar":"ფორმატირების მოხსნა"},"pastetext":{"button":"მხოლოდ ტექსტის ჩასმა","title":"მხოლოდ ტექსტის ჩასმა"},"pastefromword":{"confirmCleanup":"ჩასასმელი ტექსტი ვორდიდან გადმოტანილს გავს - გინდათ მისი წინასწარ გაწმენდა?","error":"შიდა შეცდომის გამო ვერ მოხერხდა ტექსტის გაწმენდა","title":"ვორდიდან ჩასმა","toolbar":"ვორდიდან ჩასმა"},"maximize":{"maximize":"გადიდება","minimize":"დაპატარავება"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"ღილიანი სია","numberedlist":"გადანომრილი სია"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"გადასწორება","center":"შუაში სწორება","left":"მარცხნივ სწორება","right":"მარჯვნივ სწორება"},"indent":{"indent":"მეტად შეწევა","outdent":"ნაკლებად შეწევა"},"image2":{"alt":"სანაცვლო ტექსტი","btnUpload":"სერვერისთვის გაგზავნა","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"სურათის ინფორმცია","lockRatio":"პროპორციის შენარჩუნება","menu":"სურათის პარამეტრები","pathName":"image","pathNameCaption":"caption","resetSize":"ზომის დაბრუნება","resizer":"Click and drag to resize","title":"სურათის პარამეტრები","uploadTab":"აქაჩვა","urlMissing":"სურათის URL არაა შევსებული.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"ჰორიზონტალური ხაზის ჩასმა"},"format":{"label":"ფიორმატირება","panelTitle":"ფორმატირება","tag_address":"მისამართი","tag_div":"ჩვეულებრივი (DIV)","tag_h1":"სათაური 1","tag_h2":"სათაური 2","tag_h3":"სათაური 3","tag_h4":"სათაური 4","tag_h5":"სათაური 5","tag_h6":"სათაური 6","tag_p":"ჩვეულებრივი","tag_pre":"ფორმატირებული"},"elementspath":{"eleLabel":"ელემეტის გზა","eleTitle":"%1 ელემენტი"},"contextmenu":{"options":"კონტექსტური მენიუს პარამეტრები"},"clipboard":{"copy":"ასლი","copyError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ასლის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+C).","cut":"ამოჭრა","cutError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ამოჭრის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+X).","paste":"ჩასმა","pasteArea":"ჩასმის არე","pasteMsg":"ჩასვით ამ არის შიგნით კლავიატურის გამოყენებით (<strong>Ctrl/Cmd+V</strong>) და დააჭირეთ OK-ს","securityMsg":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა clipboard-ის მონაცემების წვდომის უფლებას. კიდევ უნდა ჩასვათ ტექსტი ამ ფანჯარაში.","title":"ჩასმა"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"ციტატა"},"basicstyles":{"bold":"მსხვილი","italic":"დახრილი","strike":"გადახაზული","subscript":"ინდექსი","superscript":"ხარისხი","underline":"გახაზული"},"about":{"copy":"Copyright &copy; $1. ყველა უფლება დაცულია.","dlgTitle":"CKEditor-ის შესახებ","help":"დახმარებისთვის იხილეთ $1.","moreInfo":"ლიცენზიის ინფორმაციისთვის ეწვიეთ ჩვენს საიტს:","title":"CKEditor-ის შესახებ","userGuide":"CKEditor-ის მომხმარებლის სახელმძღვანელო"},"editor":"ტექსტის რედაქტორი","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"დააჭირეთ ALT 0-ს დახმარების მისაღებად","browseServer":"სერვერზე დათვალიერება","url":"URL","protocol":"პროტოკოლი","upload":"ატვირთვა","uploadSubmit":"სერვერზე გაგზავნა","image":"სურათი","flash":"Flash","form":"ფორმა","checkbox":"მონიშვნის ღილაკი","radio":"ამორჩევის ღილაკი","textField":"ტექსტური ველი","textarea":"ტექსტური არე","hiddenField":"მალული ველი","button":"ღილაკი","select":"არჩევის ველი","imageButton":"სურათიანი ღილაკი","notSet":"<არაფერი>","id":"Id","name":"სახელი","langDir":"ენის მიმართულება","langDirLtr":"მარცხნიდან მარჯვნივ (LTR)","langDirRtl":"მარჯვნიდან მარცხნივ (RTL)","langCode":"ენის კოდი","longDescr":"დიდი აღწერის URL","cssClass":"CSS კლასი","advisoryTitle":"სათაური","cssStyle":"CSS სტილი","ok":"დიახ","cancel":"გაუქმება","close":"დახურვა","preview":"გადახედვა","resize":"გაწიე ზომის შესაცვლელად","generalTab":"ინფორმაცია","advancedTab":"გაფართოებული","validateNumberFailed":"ეს მნიშვნელობა არაა რიცხვი.","confirmNewPage":"ამ დოკუმენტში ყველა ჩაუწერელი ცვლილება დაიკარგება. დარწმუნებული ხართ რომ ახალი გვერდის ჩატვირთვა გინდათ?","confirmCancel":"ზოგიერთი პარამეტრი შეცვლილია, დარწმუნებულილ ხართ რომ ფანჯრის დახურვა გსურთ?","options":"პარამეტრები","target":"გახსნის ადგილი","targetNew":"ახალი ფანჯარა (_blank)","targetTop":"ზედა ფანჯარა (_top)","targetSelf":"იგივე ფანჯარა (_self)","targetParent":"მშობელი ფანჯარა (_parent)","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","styles":"სტილი","cssClasses":"CSS კლასი","width":"სიგანე","height":"სიმაღლე","align":"სწორება","alignLeft":"მარცხენა","alignRight":"მარჯვენა","alignCenter":"შუა","alignJustify":"両端揃え","alignTop":"ზემოთა","alignMiddle":"შუა","alignBottom":"ქვემოთა","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidWidth":"სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, მიუწვდომელია</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/km.js b/web/core/assets/vendor/ckeditor/lang/km.js
index e67922f04..d37cf98c5 100644
--- a/web/core/assets/vendor/ckeditor/lang/km.js
+++ b/web/core/assets/vendor/ckeditor/lang/km.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['km']={"widget":{"move":"ចុច​ហើយ​ទាញ​ដើម្បី​ផ្លាស់​ទី","label":"%1 widget"},"undo":{"redo":"ធ្វើ​ឡើង​វិញ","undo":"មិន​ធ្វើ​វិញ"},"toolbar":{"toolbarCollapse":"បង្រួម​របារ​ឧបករណ៍","toolbarExpand":"ពង្រីក​របារ​ឧបករណ៍","toolbarGroups":{"document":"ឯកសារ","clipboard":"Clipboard/មិន​ធ្វើ​វិញ","editing":"ការ​កែ​សម្រួល","forms":"បែបបទ","basicstyles":"រចនាបថ​មូលដ្ឋាន","paragraph":"កថាខណ្ឌ","links":"តំណ","insert":"បញ្ចូល","styles":"រចនាបថ","colors":"ពណ៌","tools":"ឧបករណ៍"},"toolbars":"របារ​ឧបករណ៍​កែ​សម្រួល"},"table":{"border":"ទំហំ​បន្ទាត់​ស៊ុម","caption":"ចំណងជើង","cell":{"menu":"ក្រឡា","insertBefore":"បញ្ចូល​ក្រឡា​ពីមុខ","insertAfter":"បញ្ចូល​ក្រឡា​ពី​ក្រោយ","deleteCell":"លុប​ក្រឡា","merge":"បញ្ចូល​ក្រឡា​ចូល​គ្នា","mergeRight":"បញ្ចូល​គ្នា​ខាង​ស្ដាំ","mergeDown":"បញ្ចូល​គ្នា​ចុះ​ក្រោម","splitHorizontal":"ពុះ​ក្រឡា​ផ្ដេក","splitVertical":"ពុះ​ក្រឡា​បញ្ឈរ","title":"លក្ខណៈ​ក្រឡា","cellType":"ប្រភេទ​ក្រឡា","rowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា","colSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា","wordWrap":"រុំ​ពាក្យ","hAlign":"ការ​តម្រឹម​ផ្ដេក","vAlign":"ការ​តម្រឹម​បញ្ឈរ","alignBaseline":"ខ្សែ​បន្ទាត់​គោល","bgColor":"ពណ៌​ផ្ទៃ​ក្រោយ","borderColor":"ពណ៌​បន្ទាត់​ស៊ុម","data":"ទិន្នន័យ","header":"ក្បាល","yes":"ព្រម","no":"ទេ","invalidWidth":"ទទឹង​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidHeight":"កម្ពស់​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidRowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","invalidColSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","chooseColor":"រើស"},"cellPad":"ចន្លោះ​ក្រឡា","cellSpace":"គម្លាត​ក្រឡា","column":{"menu":"ជួរ​ឈរ","insertBefore":"បញ្ចូល​ជួរ​ឈរ​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ឈរ​ពី​ក្រោយ","deleteColumn":"លុប​ជួរ​ឈរ"},"columns":"ជួរឈរ","deleteTable":"លុប​តារាង","headers":"ក្បាល","headersBoth":"ទាំង​ពីរ","headersColumn":"ជួរ​ឈរ​ដំបូង","headersNone":"មិន​មាន","headersRow":"ជួរ​ដេក​ដំបូង","invalidBorder":"ទំហំ​បន្ទាត់​ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","invalidCellPadding":"ចន្លោះ​ក្រឡា​ត្រូវ​តែជា​លេខ​វិជ្ជមាន។","invalidCellSpacing":"គម្លាត​ក្រឡា​ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន។","invalidCols":"ចំនួន​ជួរ​ឈរ​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidHeight":"កម្ពស់​តារាង​ត្រូវ​តែ​ជា​លេខ","invalidRows":"ចំនួន​ជួរ​ដេក​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidWidth":"ទទឹង​តារាង​ត្រូវ​តែ​ជា​លេខ។","menu":"លក្ខណៈ​តារាង","row":{"menu":"ជួរ​ដេក","insertBefore":"បញ្ចូល​ជួរ​ដេក​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ដេក​ពី​ក្រោយ","deleteRow":"លុប​ជួរ​ដេក"},"rows":"ជួរ​ដេក","summary":"សេចក្តី​សង្ខេប","title":"លក្ខណៈ​តារាង","toolbar":"តារាង","widthPc":"ភាគរយ","widthPx":"ភីកសែល","widthUnit":"ឯកតា​ទទឹង"},"stylescombo":{"label":"រចនាបថ","panelTitle":"ទ្រង់ទ្រាយ​រចនាបថ","panelTitle1":"រចនាបថ​ប្លក់","panelTitle2":"រចនាបថ​ក្នុង​ជួរ","panelTitle3":"រចនាបថ​វត្ថុ"},"specialchar":{"options":"ជម្រើស​តួ​អក្សរ​ពិសេស","title":"រើស​តួអក្សរ​ពិសេស","toolbar":"បន្ថែមអក្សរពិសេស"},"sourcedialog":{"toolbar":"អក្សរ​កូដ","title":"អក្សរ​កូដ"},"sourcearea":{"toolbar":"អក្សរ​កូដ"},"showblocks":{"toolbar":"បង្ហាញ​ប្លក់"},"removeformat":{"toolbar":"ជម្រះ​ទ្រង់​ទ្រាយ"},"pastetext":{"button":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា","title":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា"},"pastefromword":{"confirmCleanup":"អត្ថបទ​ដែល​អ្នក​ចង់​បិទ​ភ្ជាប់​នេះ ទំនង​ដូច​ជា​ចម្លង​មក​ពី Word។ តើ​អ្នក​ចង់​សម្អាត​វា​មុន​បិទ​ភ្ជាប់​ទេ?","error":"ដោយ​សារ​មាន​បញ្ហា​ផ្នែក​ក្នុង​ធ្វើ​ឲ្យ​មិន​អាច​សម្អាត​ទិន្នន័យ​ដែល​បាន​បិទ​ភ្ជាប់","title":"បិទ​ភ្ជាប់​ពី Word","toolbar":"បិទ​ភ្ជាប់​ពី Word"},"maximize":{"maximize":"ពង្រីក​អតិបរមា","minimize":"បង្រួម​អប្បបរមា"},"magicline":{"title":"បញ្ចូល​កថាខណ្ឌ​នៅ​ទីនេះ"},"list":{"bulletedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​ចំណុច​មូល","numberedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​លេខ"},"language":{"button":"កំណត់​ភាសា","remove":"លុប​ភាសា"},"justify":{"block":"តម្រឹម​ពេញ","center":"កណ្ដាល","left":"តម្រឹម​ឆ្វេង","right":"តម្រឹម​ស្ដាំ"},"indent":{"indent":"បន្ថែមការចូលបន្ទាត់","outdent":"បន្ថយការចូលបន្ទាត់"},"image2":{"alt":"អត្ថបទជំនួស","btnUpload":"បញ្ជូនទៅកាន់ម៉ាស៊ីនផ្តល់សេវា","captioned":"រូប​ដែល​មាន​ចំណង​ជើង","captionPlaceholder":"Caption","infoTab":"ពត៌មានអំពីរូបភាព","lockRatio":"ចាក់​សោ​ផល​ធៀប","menu":"លក្ខណៈ​សម្បត្តិ​រូប​ភាព","pathName":"រូបភាព","pathNameCaption":"ចំណងជើង","resetSize":"កំណត់ទំហំឡើងវិញ","resizer":"ចុច​ហើយ​ទាញ​ដើម្បី​ប្ដូរ​ទំហំ","title":"លក្ខណៈ​សម្បត្តិ​រូប​ភាប","uploadTab":"ផ្ទុក​ឡើង","urlMissing":"ខ្វះ URL ប្រភព​រូប​ភាព។"},"horizontalrule":{"toolbar":"បន្ថែមបន្ទាត់ផ្តេក"},"format":{"label":"ទម្រង់","panelTitle":"ទម្រង់​កថាខណ្ឌ","tag_address":"អាសយដ្ឋាន","tag_div":"ធម្មតា (DIV)","tag_h1":"ចំណង​ជើង 1","tag_h2":"ចំណង​ជើង 2","tag_h3":"ចំណង​ជើង 3","tag_h4":"ចំណង​ជើង 4","tag_h5":"ចំណង​ជើង 5","tag_h6":"ចំណង​ជើង 6","tag_p":"ធម្មតា","tag_pre":"Formatted"},"elementspath":{"eleLabel":"ទីតាំង​ធាតុ","eleTitle":"ធាតុ %1"},"contextmenu":{"options":"ជម្រើស​ម៉ឺនុយ​បរិបទ"},"clipboard":{"copy":"ចម្លង","copyError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ ចំលងអត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ (Ctrl/Cmd+C)។","cut":"កាត់យក","cutError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ កាត់អត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ  (Ctrl/Cmd+X) ។","paste":"បិទ​ភ្ជាប់","pasteArea":"តំបន់​បិទ​ភ្ជាប់","pasteMsg":"សូមចំលងអត្ថបទទៅដាក់ក្នុងប្រអប់ដូចខាងក្រោមដោយប្រើប្រាស់ ឃី ​(<STRONG>Ctrl/Cmd+V</STRONG>) ហើយចុច <STRONG>OK</STRONG> ។","securityMsg":"ព្រោះតែ​ការកំណត់​សុវត្ថិភាព ប្រអប់សរសេរ​មិន​អាចចាប់​យកទិន្នន័យពីក្តារតម្បៀតខ្ទាស់​អ្នក​​ដោយផ្ទាល់​បានទេ។ អ្នក​ត្រូវចំលង​ដាក់វាម្តង​ទៀត ក្នុងផ្ទាំងនេះ។","title":"បិទ​ភ្ជាប់"},"button":{"selectedLabel":"%1 (បាន​ជ្រើស​រើស)"},"blockquote":{"toolbar":"ប្លក់​ពាក្យ​សម្រង់"},"basicstyles":{"bold":"ដិត","italic":"ទ្រេត","strike":"គូស​បន្ទាត់​ចំ​កណ្ដាល","subscript":"អក្សរតូចក្រោម","superscript":"អក្សរតូចលើ","underline":"គូស​បន្ទាត់​ក្រោម"},"about":{"copy":"រក្សាសិទ្ធិ &copy; $1។ រក្សា​សិទ្ធិ​គ្រប់​បែប​យ៉ាង។","dlgTitle":"អំពី CKEditor","help":"ពិនិត្យ $1 សម្រាប់​ជំនួយ។","moreInfo":"សម្រាប់​ព័ត៌មាន​អំពី​អាជ្ញាបណញណ សូម​មើល​ក្នុង​គេហទំព័រ​របស់​យើង៖","title":"អំពី CKEditor","userGuide":"វិធី​ប្រើ​ប្រាស់ CKEditor"},"editor":"ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","editorPanel":"ផ្ទាំង​ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","common":{"editorHelp":"ចុច ALT 0 សម្រាប់​ជំនួយ","browseServer":"រក​មើល​ក្នុង​ម៉ាស៊ីន​បម្រើ","url":"URL","protocol":"ពិធីការ","upload":"ផ្ទុក​ឡើង","uploadSubmit":"បញ្ជូនទៅកាន់ម៉ាស៊ីន​បម្រើ","image":"រូបភាព","flash":"Flash","form":"បែបបទ","checkbox":"ប្រអប់​ធីក","radio":"ប៊ូតុង​មូល","textField":"វាល​អត្ថបទ","textarea":"Textarea","hiddenField":"វាល​កំបាំង","button":"ប៊ូតុង","select":"វាល​ជម្រើស","imageButton":"ប៊ូតុង​រូបភាព","notSet":"<មិនកំណត់>","id":"Id","name":"ឈ្មោះ","langDir":"ទិសដៅភាសា","langDirLtr":"ពីឆ្វេងទៅស្តាំ (LTR)","langDirRtl":"ពីស្តាំទៅឆ្វេង (RTL)","langCode":"លេខ​កូដ​ភាសា","longDescr":"URL អធិប្បាយ​វែង","cssClass":"Stylesheet Classes","advisoryTitle":"ចំណង​ជើង​ណែនាំ","cssStyle":"រចនាបថ","ok":"ព្រម","cancel":"បោះបង់","close":"បិទ","preview":"មើល​ជា​មុន","resize":"ប្ដូរ​ទំហំ","generalTab":"ទូទៅ","advancedTab":"កម្រិត​ខ្ពស់","validateNumberFailed":"តម្លៃ​នេះ​ពុំ​មែន​ជា​លេខ​ទេ។","confirmNewPage":"រាល់​បន្លាស់​ប្ដូរ​នានា​ដែល​មិន​ទាន់​រក្សា​ទុក​ក្នុង​មាតិកា​នេះ នឹង​ត្រូវ​បាត់​បង់។ តើ​អ្នក​ពិត​ជា​ចង់​ផ្ទុក​ទំព័រ​ថ្មី​មែនទេ?","confirmCancel":"ការ​កំណត់​មួយ​ចំនួន​ត្រូ​វ​បាន​ផ្លាស់​ប្ដូរ។ តើ​អ្នក​ពិត​ជា​ចង់​បិទ​ប្រអប់​នេះ​មែនទេ?","options":"ការ​កំណត់","target":"គោលដៅ","targetNew":"វីនដូ​ថ្មី (_blank)","targetTop":"វីនដូ​លើ​គេ (_top)","targetSelf":"វីនដូ​ដូច​គ្នា (_self)","targetParent":"វីនដូ​មេ (_parent)","langDirLTR":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirRTL":"ពីស្តាំទៅឆ្វេង(RTL)","styles":"រចនាបថ","cssClasses":"Stylesheet Classes","width":"ទទឹង","height":"កំពស់","align":"កំណត់​ទីតាំង","alignLeft":"ខាងឆ្វង","alignRight":"ខាងស្តាំ","alignCenter":"កណ្តាល","alignJustify":"តំរឹមសងខាង","alignTop":"ខាងលើ","alignMiddle":"កណ្តាល","alignBottom":"ខាងក្រោម","alignNone":"គ្មាន","invalidValue":"តម្លៃ​មិន​ត្រឹម​ត្រូវ។","invalidHeight":"តម្លៃ​កំពស់​ត្រូវ​តែ​ជា​លេខ។","invalidWidth":"តម្លៃ​ទទឹង​ត្រូវ​តែ​ជា​លេខ។","invalidCssLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន​ ដោយ​ភ្ជាប់ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","invalidHtmlLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន ដោយ​ភ្ជាប់​ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ HTML (px ឬ %) ។","invalidInlineStyle":"តម្លៃ​កំណត់​សម្រាប់​រចនាបថ​ក្នុង​តួ ត្រូវ​តែ​មាន​មួយ​ឬ​ធាតុ​ច្រើន​ដោយ​មាន​ទ្រង់ទ្រាយ​ជា \"ឈ្មោះ : តម្លៃ\" ហើយ​ញែក​ចេញ​ពី​គ្នា​ដោយ​ចុច​ក្បៀស។","cssLengthTooltip":"បញ្ចូល​លេខ​សម្រាប់​តម្លៃ​ជា​ភិចសែល ឬ​លេខ​ដែល​មាន​ឯកតា​ត្រឹមត្រូវ​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","unavailable":"%1<span class=\"cke_accessibility\">, មិន​មាន</span>"}};
\ No newline at end of file
+CKEDITOR.lang['km']={"widget":{"move":"ចុច​ហើយ​ទាញ​ដើម្បី​ផ្លាស់​ទី","label":"%1 widget"},"undo":{"redo":"ធ្វើ​ឡើង​វិញ","undo":"មិន​ធ្វើ​វិញ"},"toolbar":{"toolbarCollapse":"បង្រួម​របារ​ឧបករណ៍","toolbarExpand":"ពង្រីក​របារ​ឧបករណ៍","toolbarGroups":{"document":"ឯកសារ","clipboard":"Clipboard/មិន​ធ្វើ​វិញ","editing":"ការ​កែ​សម្រួល","forms":"បែបបទ","basicstyles":"រចនាបថ​មូលដ្ឋាន","paragraph":"កថាខណ្ឌ","links":"តំណ","insert":"បញ្ចូល","styles":"រចនាបថ","colors":"ពណ៌","tools":"ឧបករណ៍"},"toolbars":"របារ​ឧបករណ៍​កែ​សម្រួល"},"table":{"border":"ទំហំ​បន្ទាត់​ស៊ុម","caption":"ចំណងជើង","cell":{"menu":"ក្រឡា","insertBefore":"បញ្ចូល​ក្រឡា​ពីមុខ","insertAfter":"បញ្ចូល​ក្រឡា​ពី​ក្រោយ","deleteCell":"លុប​ក្រឡា","merge":"បញ្ចូល​ក្រឡា​ចូល​គ្នា","mergeRight":"បញ្ចូល​គ្នា​ខាង​ស្ដាំ","mergeDown":"បញ្ចូល​គ្នា​ចុះ​ក្រោម","splitHorizontal":"ពុះ​ក្រឡា​ផ្ដេក","splitVertical":"ពុះ​ក្រឡា​បញ្ឈរ","title":"លក្ខណៈ​ក្រឡា","cellType":"ប្រភេទ​ក្រឡា","rowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា","colSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា","wordWrap":"រុំ​ពាក្យ","hAlign":"ការ​តម្រឹម​ផ្ដេក","vAlign":"ការ​តម្រឹម​បញ្ឈរ","alignBaseline":"ខ្សែ​បន្ទាត់​គោល","bgColor":"ពណ៌​ផ្ទៃ​ក្រោយ","borderColor":"ពណ៌​បន្ទាត់​ស៊ុម","data":"ទិន្នន័យ","header":"ក្បាល","yes":"ព្រម","no":"ទេ","invalidWidth":"ទទឹង​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidHeight":"កម្ពស់​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidRowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","invalidColSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","chooseColor":"រើស"},"cellPad":"ចន្លោះ​ក្រឡា","cellSpace":"គម្លាត​ក្រឡា","column":{"menu":"ជួរ​ឈរ","insertBefore":"បញ្ចូល​ជួរ​ឈរ​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ឈរ​ពី​ក្រោយ","deleteColumn":"លុប​ជួរ​ឈរ"},"columns":"ជួរឈរ","deleteTable":"លុប​តារាង","headers":"ក្បាល","headersBoth":"ទាំង​ពីរ","headersColumn":"ជួរ​ឈរ​ដំបូង","headersNone":"មិន​មាន","headersRow":"ជួរ​ដេក​ដំបូង","invalidBorder":"ទំហំ​បន្ទាត់​ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","invalidCellPadding":"ចន្លោះ​ក្រឡា​ត្រូវ​តែជា​លេខ​វិជ្ជមាន។","invalidCellSpacing":"គម្លាត​ក្រឡា​ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន។","invalidCols":"ចំនួន​ជួរ​ឈរ​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidHeight":"កម្ពស់​តារាង​ត្រូវ​តែ​ជា​លេខ","invalidRows":"ចំនួន​ជួរ​ដេក​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidWidth":"ទទឹង​តារាង​ត្រូវ​តែ​ជា​លេខ។","menu":"លក្ខណៈ​តារាង","row":{"menu":"ជួរ​ដេក","insertBefore":"បញ្ចូល​ជួរ​ដេក​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ដេក​ពី​ក្រោយ","deleteRow":"លុប​ជួរ​ដេក"},"rows":"ជួរ​ដេក","summary":"សេចក្តី​សង្ខេប","title":"លក្ខណៈ​តារាង","toolbar":"តារាង","widthPc":"ភាគរយ","widthPx":"ភីកសែល","widthUnit":"ឯកតា​ទទឹង"},"stylescombo":{"label":"រចនាបថ","panelTitle":"ទ្រង់ទ្រាយ​រចនាបថ","panelTitle1":"រចនាបថ​ប្លក់","panelTitle2":"រចនាបថ​ក្នុង​ជួរ","panelTitle3":"រចនាបថ​វត្ថុ"},"specialchar":{"options":"ជម្រើស​តួ​អក្សរ​ពិសេស","title":"រើស​តួអក្សរ​ពិសេស","toolbar":"បន្ថែមអក្សរពិសេស"},"sourcedialog":{"toolbar":"អក្សរ​កូដ","title":"អក្សរ​កូដ"},"sourcearea":{"toolbar":"អក្សរ​កូដ"},"showblocks":{"toolbar":"បង្ហាញ​ប្លក់"},"removeformat":{"toolbar":"ជម្រះ​ទ្រង់​ទ្រាយ"},"pastetext":{"button":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា","title":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា"},"pastefromword":{"confirmCleanup":"អត្ថបទ​ដែល​អ្នក​ចង់​បិទ​ភ្ជាប់​នេះ ទំនង​ដូច​ជា​ចម្លង​មក​ពី Word។ តើ​អ្នក​ចង់​សម្អាត​វា​មុន​បិទ​ភ្ជាប់​ទេ?","error":"ដោយ​សារ​មាន​បញ្ហា​ផ្នែក​ក្នុង​ធ្វើ​ឲ្យ​មិន​អាច​សម្អាត​ទិន្នន័យ​ដែល​បាន​បិទ​ភ្ជាប់","title":"បិទ​ភ្ជាប់​ពី Word","toolbar":"បិទ​ភ្ជាប់​ពី Word"},"maximize":{"maximize":"ពង្រីក​អតិបរមា","minimize":"បង្រួម​អប្បបរមា"},"magicline":{"title":"បញ្ចូល​កថាខណ្ឌ​នៅ​ទីនេះ"},"list":{"bulletedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​ចំណុច​មូល","numberedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​លេខ"},"language":{"button":"កំណត់​ភាសា","remove":"លុប​ភាសា"},"justify":{"block":"តម្រឹម​ពេញ","center":"កណ្ដាល","left":"តម្រឹម​ឆ្វេង","right":"តម្រឹម​ស្ដាំ"},"indent":{"indent":"បន្ថែមការចូលបន្ទាត់","outdent":"បន្ថយការចូលបន្ទាត់"},"image2":{"alt":"អត្ថបទជំនួស","btnUpload":"បញ្ជូនទៅកាន់ម៉ាស៊ីនផ្តល់សេវា","captioned":"រូប​ដែល​មាន​ចំណង​ជើង","captionPlaceholder":"Caption","infoTab":"ពត៌មានអំពីរូបភាព","lockRatio":"ចាក់​សោ​ផល​ធៀប","menu":"លក្ខណៈ​សម្បត្តិ​រូប​ភាព","pathName":"រូបភាព","pathNameCaption":"ចំណងជើង","resetSize":"កំណត់ទំហំឡើងវិញ","resizer":"ចុច​ហើយ​ទាញ​ដើម្បី​ប្ដូរ​ទំហំ","title":"លក្ខណៈ​សម្បត្តិ​រូប​ភាប","uploadTab":"ផ្ទុក​ឡើង","urlMissing":"ខ្វះ URL ប្រភព​រូប​ភាព។","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"បន្ថែមបន្ទាត់ផ្តេក"},"format":{"label":"ទម្រង់","panelTitle":"ទម្រង់​កថាខណ្ឌ","tag_address":"អាសយដ្ឋាន","tag_div":"ធម្មតា (DIV)","tag_h1":"ចំណង​ជើង 1","tag_h2":"ចំណង​ជើង 2","tag_h3":"ចំណង​ជើង 3","tag_h4":"ចំណង​ជើង 4","tag_h5":"ចំណង​ជើង 5","tag_h6":"ចំណង​ជើង 6","tag_p":"ធម្មតា","tag_pre":"Formatted"},"elementspath":{"eleLabel":"ទីតាំង​ធាតុ","eleTitle":"ធាតុ %1"},"contextmenu":{"options":"ជម្រើស​ម៉ឺនុយ​បរិបទ"},"clipboard":{"copy":"ចម្លង","copyError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ ចំលងអត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ (Ctrl/Cmd+C)។","cut":"កាត់យក","cutError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ កាត់អត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ  (Ctrl/Cmd+X) ។","paste":"បិទ​ភ្ជាប់","pasteArea":"តំបន់​បិទ​ភ្ជាប់","pasteMsg":"សូមចំលងអត្ថបទទៅដាក់ក្នុងប្រអប់ដូចខាងក្រោមដោយប្រើប្រាស់ ឃី ​(<STRONG>Ctrl/Cmd+V</STRONG>) ហើយចុច <STRONG>OK</STRONG> ។","securityMsg":"ព្រោះតែ​ការកំណត់​សុវត្ថិភាព ប្រអប់សរសេរ​មិន​អាចចាប់​យកទិន្នន័យពីក្តារតម្បៀតខ្ទាស់​អ្នក​​ដោយផ្ទាល់​បានទេ។ អ្នក​ត្រូវចំលង​ដាក់វាម្តង​ទៀត ក្នុងផ្ទាំងនេះ។","title":"បិទ​ភ្ជាប់"},"button":{"selectedLabel":"%1 (បាន​ជ្រើស​រើស)"},"blockquote":{"toolbar":"ប្លក់​ពាក្យ​សម្រង់"},"basicstyles":{"bold":"ដិត","italic":"ទ្រេត","strike":"គូស​បន្ទាត់​ចំ​កណ្ដាល","subscript":"អក្សរតូចក្រោម","superscript":"អក្សរតូចលើ","underline":"គូស​បន្ទាត់​ក្រោម"},"about":{"copy":"រក្សាសិទ្ធិ &copy; $1។ រក្សា​សិទ្ធិ​គ្រប់​បែប​យ៉ាង។","dlgTitle":"អំពី CKEditor","help":"ពិនិត្យ $1 សម្រាប់​ជំនួយ។","moreInfo":"សម្រាប់​ព័ត៌មាន​អំពី​អាជ្ញាបណញណ សូម​មើល​ក្នុង​គេហទំព័រ​របស់​យើង៖","title":"អំពី CKEditor","userGuide":"វិធី​ប្រើ​ប្រាស់ CKEditor"},"editor":"ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","editorPanel":"ផ្ទាំង​ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","common":{"editorHelp":"ចុច ALT 0 សម្រាប់​ជំនួយ","browseServer":"រក​មើល​ក្នុង​ម៉ាស៊ីន​បម្រើ","url":"URL","protocol":"ពិធីការ","upload":"ផ្ទុក​ឡើង","uploadSubmit":"បញ្ជូនទៅកាន់ម៉ាស៊ីន​បម្រើ","image":"រូបភាព","flash":"Flash","form":"បែបបទ","checkbox":"ប្រអប់​ធីក","radio":"ប៊ូតុង​មូល","textField":"វាល​អត្ថបទ","textarea":"Textarea","hiddenField":"វាល​កំបាំង","button":"ប៊ូតុង","select":"វាល​ជម្រើស","imageButton":"ប៊ូតុង​រូបភាព","notSet":"<មិនកំណត់>","id":"Id","name":"ឈ្មោះ","langDir":"ទិសដៅភាសា","langDirLtr":"ពីឆ្វេងទៅស្តាំ (LTR)","langDirRtl":"ពីស្តាំទៅឆ្វេង (RTL)","langCode":"លេខ​កូដ​ភាសា","longDescr":"URL អធិប្បាយ​វែង","cssClass":"Stylesheet Classes","advisoryTitle":"ចំណង​ជើង​ណែនាំ","cssStyle":"រចនាបថ","ok":"ព្រម","cancel":"បោះបង់","close":"បិទ","preview":"មើល​ជា​មុន","resize":"ប្ដូរ​ទំហំ","generalTab":"ទូទៅ","advancedTab":"កម្រិត​ខ្ពស់","validateNumberFailed":"តម្លៃ​នេះ​ពុំ​មែន​ជា​លេខ​ទេ។","confirmNewPage":"រាល់​បន្លាស់​ប្ដូរ​នានា​ដែល​មិន​ទាន់​រក្សា​ទុក​ក្នុង​មាតិកា​នេះ នឹង​ត្រូវ​បាត់​បង់។ តើ​អ្នក​ពិត​ជា​ចង់​ផ្ទុក​ទំព័រ​ថ្មី​មែនទេ?","confirmCancel":"ការ​កំណត់​មួយ​ចំនួន​ត្រូ​វ​បាន​ផ្លាស់​ប្ដូរ។ តើ​អ្នក​ពិត​ជា​ចង់​បិទ​ប្រអប់​នេះ​មែនទេ?","options":"ការ​កំណត់","target":"គោលដៅ","targetNew":"វីនដូ​ថ្មី (_blank)","targetTop":"វីនដូ​លើ​គេ (_top)","targetSelf":"វីនដូ​ដូច​គ្នា (_self)","targetParent":"វីនដូ​មេ (_parent)","langDirLTR":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirRTL":"ពីស្តាំទៅឆ្វេង(RTL)","styles":"រចនាបថ","cssClasses":"Stylesheet Classes","width":"ទទឹង","height":"កំពស់","align":"កំណត់​ទីតាំង","alignLeft":"ខាងឆ្វង","alignRight":"ខាងស្តាំ","alignCenter":"កណ្តាល","alignJustify":"តំរឹមសងខាង","alignTop":"ខាងលើ","alignMiddle":"កណ្តាល","alignBottom":"ខាងក្រោម","alignNone":"គ្មាន","invalidValue":"តម្លៃ​មិន​ត្រឹម​ត្រូវ។","invalidHeight":"តម្លៃ​កំពស់​ត្រូវ​តែ​ជា​លេខ។","invalidWidth":"តម្លៃ​ទទឹង​ត្រូវ​តែ​ជា​លេខ។","invalidCssLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន​ ដោយ​ភ្ជាប់ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","invalidHtmlLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន ដោយ​ភ្ជាប់​ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ HTML (px ឬ %) ។","invalidInlineStyle":"តម្លៃ​កំណត់​សម្រាប់​រចនាបថ​ក្នុង​តួ ត្រូវ​តែ​មាន​មួយ​ឬ​ធាតុ​ច្រើន​ដោយ​មាន​ទ្រង់ទ្រាយ​ជា \"ឈ្មោះ : តម្លៃ\" ហើយ​ញែក​ចេញ​ពី​គ្នា​ដោយ​ចុច​ក្បៀស។","cssLengthTooltip":"បញ្ចូល​លេខ​សម្រាប់​តម្លៃ​ជា​ភិចសែល ឬ​លេខ​ដែល​មាន​ឯកតា​ត្រឹមត្រូវ​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","unavailable":"%1<span class=\"cke_accessibility\">, មិន​មាន</span>","keyboard":{"8":"លុបថយក្រោយ","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"ចុង","36":"ផ្ទះ","46":"លុប","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/ko.js b/web/core/assets/vendor/ckeditor/lang/ko.js
index 177692196..490facfa0 100644
--- a/web/core/assets/vendor/ckeditor/lang/ko.js
+++ b/web/core/assets/vendor/ckeditor/lang/ko.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ko']={"widget":{"move":"움직이려면 클릭 후 드래그 하세요","label":"%1 widget"},"undo":{"redo":"다시 실행","undo":"실행 취소"},"toolbar":{"toolbarCollapse":"툴바 줄이기","toolbarExpand":"툴바 확장","toolbarGroups":{"document":"문서","clipboard":"클립보드/실행 취소","editing":"편집","forms":"폼","basicstyles":"기본 스타일","paragraph":"단락","links":"링크","insert":"삽입","styles":"스타일","colors":"색상","tools":"도구"},"toolbars":"에디터 툴바"},"table":{"border":"테두리 두께","caption":"주석","cell":{"menu":"셀","insertBefore":"앞에 셀 삽입","insertAfter":"뒤에 셀 삽입","deleteCell":"셀 삭제","merge":"셀 합치기","mergeRight":"오른쪽 합치기","mergeDown":"왼쪽 합치기","splitHorizontal":"수평 나누기","splitVertical":"수직 나누기","title":"셀 속성","cellType":"셀 종류","rowSpan":"행 간격","colSpan":"열 간격","wordWrap":"줄 끝 단어 줄 바꿈","hAlign":"가로 정렬","vAlign":"세로 정렬","alignBaseline":"영문 글꼴 기준선","bgColor":"배경색","borderColor":"테두리 색","data":"자료","header":"머릿칸","yes":"예","no":"아니오","invalidWidth":"셀 너비는 숫자여야 합니다.","invalidHeight":"셀 높이는 숫자여야 합니다.","invalidRowSpan":"행 간격은 정수여야 합니다.","invalidColSpan":"열 간격은 정수여야 합니다.","chooseColor":"선택"},"cellPad":"셀 여백","cellSpace":"셀 간격","column":{"menu":"열","insertBefore":"왼쪽에 열 삽입","insertAfter":"오른쪽에 열 삽입","deleteColumn":"열 삭제"},"columns":"열","deleteTable":"표 삭제","headers":"머릿칸","headersBoth":"모두","headersColumn":"첫 열","headersNone":"없음","headersRow":"첫 행","invalidBorder":"테두리 두께는 숫자여야 합니다.","invalidCellPadding":"셀 여백은 0 이상이어야 합니다.","invalidCellSpacing":"셀 간격은 0 이상이어야 합니다.","invalidCols":"열 번호는 0보다 커야 합니다.","invalidHeight":"표 높이는 숫자여야 합니다.","invalidRows":"행 번호는 0보다 커야 합니다.","invalidWidth":"표의 너비는 숫자여야 합니다.","menu":"표 속성","row":{"menu":"행","insertBefore":"위에 행 삽입","insertAfter":"아래에 행 삽입","deleteRow":"행 삭제"},"rows":"행","summary":"요약","title":"표 속성","toolbar":"표","widthPc":"백분율","widthPx":"픽셀","widthUnit":"너비 단위"},"stylescombo":{"label":"스타일","panelTitle":"전체 구성 스타일","panelTitle1":"블록 스타일","panelTitle2":"인라인 스타일","panelTitle3":"객체 스타일"},"specialchar":{"options":"특수문자 옵션","title":"특수문자 선택","toolbar":"특수문자 삽입"},"sourcedialog":{"toolbar":"소스","title":"소스"},"sourcearea":{"toolbar":"소스"},"showblocks":{"toolbar":"블록 보기"},"removeformat":{"toolbar":"형식 지우기"},"pastetext":{"button":"텍스트로 붙여넣기","title":"텍스트로 붙여넣기"},"pastefromword":{"confirmCleanup":"붙여 넣을 내용은 MS Word에서 복사 한 것입니다. 붙여 넣기 전에 정리 하시겠습니까?","error":"내부 오류로 붙여 넣은 데이터를 정리 할 수 없습니다.","title":"MS Word 에서 붙여넣기","toolbar":"MS Word 에서 붙여넣기"},"maximize":{"maximize":"최대화","minimize":"최소화"},"magicline":{"title":"여기에 단락 삽입"},"list":{"bulletedlist":"순서 없는 목록","numberedlist":"순서 있는 목록"},"language":{"button":"언어 설정","remove":"언어 설정 지우기"},"justify":{"block":"양쪽 맞춤","center":"가운데 정렬","left":"왼쪽 정렬","right":"오른쪽 정렬"},"indent":{"indent":"들여쓰기","outdent":"내어쓰기"},"image2":{"alt":"대체 문자열","btnUpload":"서버로 전송","captioned":"이미지 설명 넣기","captionPlaceholder":"설명","infoTab":"이미지 정보","lockRatio":"비율 유지","menu":"이미지 속성","pathName":"이미지","pathNameCaption":"설명","resetSize":"원래 크기로","resizer":"크기를 조절하려면 클릭 후 드래그 하세요","title":"이미지 속성","uploadTab":"업로드","urlMissing":"이미지 원본 주소(URL)가 없습니다."},"horizontalrule":{"toolbar":"가로 줄 삽입"},"format":{"label":"문단","panelTitle":"문단 형식","tag_address":"글쓴이","tag_div":"기본 (DIV)","tag_h1":"제목 1","tag_h2":"제목 2","tag_h3":"제목 3","tag_h4":"제목 4","tag_h5":"제목 5","tag_h6":"제목 6","tag_p":"본문","tag_pre":"정형 문단"},"elementspath":{"eleLabel":"요소 경로","eleTitle":"%1 요소"},"contextmenu":{"options":"컨텍스트 메뉴 옵션"},"clipboard":{"copy":"복사","copyError":"브라우저의 보안설정 때문에 복사할 수 없습니다. 키보드(Ctrl/Cmd+C)를 이용해서 복사하십시오.","cut":"잘라내기","cutError":"브라우저의 보안설정 때문에 잘라내기 기능을 실행할 수 없습니다. 키보드(Ctrl/Cmd+X)를 이용해서 잘라내기 하십시오","paste":"붙여넣기","pasteArea":"붙여넣기 범위","pasteMsg":"키보드(<strong>Ctrl/Cmd+V</strong>)를 이용해서 상자안에 붙여넣고 <strong>확인</strong> 를 누르세요.","securityMsg":"브라우저 보안 설정으로 인해, 클립보드에 직접 접근할 수 없습니다. 이 창에 다시 붙여넣기 하십시오.","title":"붙여넣기"},"button":{"selectedLabel":"%1 (선택됨)"},"blockquote":{"toolbar":"인용 단락"},"basicstyles":{"bold":"굵게","italic":"기울임꼴","strike":"취소선","subscript":"아래 첨자","superscript":"위 첨자","underline":"밑줄"},"about":{"copy":"저작권 &copy; $1 . 판권 소유.","dlgTitle":"CKEditor 에 대하여","help":"도움이 필요하시면 $1 를 확인하세요.","moreInfo":"라이선스에 대한 정보는 저희 웹 사이트를 참고하세요:","title":"CKEditor에 대하여","userGuide":"CKEditor 사용설명서"},"editor":"리치 텍스트 편집기","editorPanel":"리치 텍스트 편집기 패널","common":{"editorHelp":"도움이 필요하면 ALT 0 을 누르세요","browseServer":"서버 보기","url":"URL","protocol":"프로토콜","upload":"업로드","uploadSubmit":"서버로 전송","image":"이미지","flash":"플래시","form":"폼","checkbox":"체크 박스","radio":"라디오 버튼","textField":"한 줄 입력 칸","textarea":"여러 줄 입력 칸","hiddenField":"숨은 입력 칸","button":"버튼","select":"선택 목록","imageButton":"이미지 버튼","notSet":"<설정 안 됨>","id":"ID","name":"이름","langDir":"언어 방향","langDirLtr":"왼쪽에서 오른쪽 (LTR)","langDirRtl":"오른쪽에서 왼쪽 (RTL)","langCode":"언어 코드","longDescr":"웹 주소 설명","cssClass":"스타일 시트 클래스","advisoryTitle":"보조 제목","cssStyle":"스타일","ok":"확인","cancel":"취소","close":"닫기","preview":"미리보기","resize":"크기 조절","generalTab":"일반","advancedTab":"자세히","validateNumberFailed":"이 값은 숫자가 아닙니다.","confirmNewPage":"저장하지 않은 모든 변경사항은 유실됩니다. 정말로 새로운 페이지를 부르겠습니까?","confirmCancel":"일부 옵션이 변경 되었습니다. 정말로 창을 닫겠습니까?","options":"옵션","target":"타겟","targetNew":"새 창 (_blank)","targetTop":"최상위 창 (_top)","targetSelf":"같은 창 (_self)","targetParent":"부모 창 (_parent)","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","styles":"스타일","cssClasses":"스타일 시트 클래스","width":"너비","height":"높이","align":"정렬","alignLeft":"왼쪽","alignRight":"오른쪽","alignCenter":"가운데","alignJustify":"양쪽 맞춤","alignTop":"위","alignMiddle":"중간","alignBottom":"아래","alignNone":"기본","invalidValue":"잘못된 값.","invalidHeight":"높이는 숫자여야 합니다.","invalidWidth":"넓이는 숫자여야 합니다.","invalidCssLength":"\"%1\" 값은 유효한 CSS 측정 단위(px, %, in, cm, mm, em, ex, pt, or pc)를 포함하거나 포함하지 않은 양수 여야 합니다.","invalidHtmlLength":"\"%1\" 값은 유효한 HTML 측정 단위(px or %)를 포함하거나 포함하지 않은 양수여야 합니다.","invalidInlineStyle":"인라인 스타일에 설정된 값은 \"name : value\" 형식을 가진 하나 이상의 투플(tuples)이 세미콜론(;)으로 구분되어 구성되어야 합니다.","cssLengthTooltip":"픽셀 단위의 숫자만 입력하시거나 유효한 CSS 단위(px, %, in, cm, mm, em, ex, pt, or pc)와 함께 숫자를 입력해주세요.","unavailable":"%1<span class=\"cke_accessibility\">, 사용불가</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ko']={"widget":{"move":"움직이려면 클릭 후 드래그 하세요","label":"%1 widget"},"undo":{"redo":"다시 실행","undo":"실행 취소"},"toolbar":{"toolbarCollapse":"툴바 줄이기","toolbarExpand":"툴바 확장","toolbarGroups":{"document":"문서","clipboard":"클립보드/실행 취소","editing":"편집","forms":"폼","basicstyles":"기본 스타일","paragraph":"단락","links":"링크","insert":"삽입","styles":"스타일","colors":"색상","tools":"도구"},"toolbars":"에디터 툴바"},"table":{"border":"테두리 두께","caption":"주석","cell":{"menu":"셀","insertBefore":"앞에 셀 삽입","insertAfter":"뒤에 셀 삽입","deleteCell":"셀 삭제","merge":"셀 합치기","mergeRight":"오른쪽 합치기","mergeDown":"왼쪽 합치기","splitHorizontal":"수평 나누기","splitVertical":"수직 나누기","title":"셀 속성","cellType":"셀 종류","rowSpan":"행 간격","colSpan":"열 간격","wordWrap":"줄 끝 단어 줄 바꿈","hAlign":"가로 정렬","vAlign":"세로 정렬","alignBaseline":"영문 글꼴 기준선","bgColor":"배경색","borderColor":"테두리 색","data":"자료","header":"머릿칸","yes":"예","no":"아니오","invalidWidth":"셀 너비는 숫자여야 합니다.","invalidHeight":"셀 높이는 숫자여야 합니다.","invalidRowSpan":"행 간격은 정수여야 합니다.","invalidColSpan":"열 간격은 정수여야 합니다.","chooseColor":"선택"},"cellPad":"셀 여백","cellSpace":"셀 간격","column":{"menu":"열","insertBefore":"왼쪽에 열 삽입","insertAfter":"오른쪽에 열 삽입","deleteColumn":"열 삭제"},"columns":"열","deleteTable":"표 삭제","headers":"머릿칸","headersBoth":"모두","headersColumn":"첫 열","headersNone":"없음","headersRow":"첫 행","invalidBorder":"테두리 두께는 숫자여야 합니다.","invalidCellPadding":"셀 여백은 0 이상이어야 합니다.","invalidCellSpacing":"셀 간격은 0 이상이어야 합니다.","invalidCols":"열 번호는 0보다 커야 합니다.","invalidHeight":"표 높이는 숫자여야 합니다.","invalidRows":"행 번호는 0보다 커야 합니다.","invalidWidth":"표의 너비는 숫자여야 합니다.","menu":"표 속성","row":{"menu":"행","insertBefore":"위에 행 삽입","insertAfter":"아래에 행 삽입","deleteRow":"행 삭제"},"rows":"행","summary":"요약","title":"표 속성","toolbar":"표","widthPc":"백분율","widthPx":"픽셀","widthUnit":"너비 단위"},"stylescombo":{"label":"스타일","panelTitle":"전체 구성 스타일","panelTitle1":"블록 스타일","panelTitle2":"인라인 스타일","panelTitle3":"객체 스타일"},"specialchar":{"options":"특수문자 옵션","title":"특수문자 선택","toolbar":"특수문자 삽입"},"sourcedialog":{"toolbar":"소스","title":"소스"},"sourcearea":{"toolbar":"소스"},"showblocks":{"toolbar":"블록 보기"},"removeformat":{"toolbar":"형식 지우기"},"pastetext":{"button":"텍스트로 붙여넣기","title":"텍스트로 붙여넣기"},"pastefromword":{"confirmCleanup":"붙여 넣을 내용은 MS Word에서 복사 한 것입니다. 붙여 넣기 전에 정리 하시겠습니까?","error":"내부 오류로 붙여 넣은 데이터를 정리 할 수 없습니다.","title":"MS Word 에서 붙여넣기","toolbar":"MS Word 에서 붙여넣기"},"maximize":{"maximize":"최대화","minimize":"최소화"},"magicline":{"title":"여기에 단락 삽입"},"list":{"bulletedlist":"순서 없는 목록","numberedlist":"순서 있는 목록"},"language":{"button":"언어 설정","remove":"언어 설정 지우기"},"justify":{"block":"양쪽 맞춤","center":"가운데 정렬","left":"왼쪽 정렬","right":"오른쪽 정렬"},"indent":{"indent":"들여쓰기","outdent":"내어쓰기"},"image2":{"alt":"대체 문자열","btnUpload":"서버로 전송","captioned":"이미지 설명 넣기","captionPlaceholder":"설명","infoTab":"이미지 정보","lockRatio":"비율 유지","menu":"이미지 속성","pathName":"이미지","pathNameCaption":"설명","resetSize":"원래 크기로","resizer":"크기를 조절하려면 클릭 후 드래그 하세요","title":"이미지 속성","uploadTab":"업로드","urlMissing":"이미지 원본 주소(URL)가 없습니다.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"가로 줄 삽입"},"format":{"label":"문단","panelTitle":"문단 형식","tag_address":"글쓴이","tag_div":"기본 (DIV)","tag_h1":"제목 1","tag_h2":"제목 2","tag_h3":"제목 3","tag_h4":"제목 4","tag_h5":"제목 5","tag_h6":"제목 6","tag_p":"본문","tag_pre":"정형 문단"},"elementspath":{"eleLabel":"요소 경로","eleTitle":"%1 요소"},"contextmenu":{"options":"컨텍스트 메뉴 옵션"},"clipboard":{"copy":"복사","copyError":"브라우저의 보안설정 때문에 복사할 수 없습니다. 키보드(Ctrl/Cmd+C)를 이용해서 복사하십시오.","cut":"잘라내기","cutError":"브라우저의 보안설정 때문에 잘라내기 기능을 실행할 수 없습니다. 키보드(Ctrl/Cmd+X)를 이용해서 잘라내기 하십시오","paste":"붙여넣기","pasteArea":"붙여넣기 범위","pasteMsg":"키보드(<strong>Ctrl/Cmd+V</strong>)를 이용해서 상자안에 붙여넣고 <strong>확인</strong> 를 누르세요.","securityMsg":"브라우저 보안 설정으로 인해, 클립보드에 직접 접근할 수 없습니다. 이 창에 다시 붙여넣기 하십시오.","title":"붙여넣기"},"button":{"selectedLabel":"%1 (선택됨)"},"blockquote":{"toolbar":"인용 단락"},"basicstyles":{"bold":"굵게","italic":"기울임꼴","strike":"취소선","subscript":"아래 첨자","superscript":"위 첨자","underline":"밑줄"},"about":{"copy":"저작권 &copy; $1 . 판권 소유.","dlgTitle":"CKEditor 에 대하여","help":"도움이 필요하시면 $1 를 확인하세요.","moreInfo":"라이선스에 대한 정보는 저희 웹 사이트를 참고하세요:","title":"CKEditor에 대하여","userGuide":"CKEditor 사용설명서"},"editor":"리치 텍스트 편집기","editorPanel":"리치 텍스트 편집기 패널","common":{"editorHelp":"도움이 필요하면 ALT 0 을 누르세요","browseServer":"서버 보기","url":"URL","protocol":"프로토콜","upload":"업로드","uploadSubmit":"서버로 전송","image":"이미지","flash":"플래시","form":"폼","checkbox":"체크 박스","radio":"라디오 버튼","textField":"한 줄 입력 칸","textarea":"여러 줄 입력 칸","hiddenField":"숨은 입력 칸","button":"버튼","select":"선택 목록","imageButton":"이미지 버튼","notSet":"<설정 안 됨>","id":"ID","name":"이름","langDir":"언어 방향","langDirLtr":"왼쪽에서 오른쪽 (LTR)","langDirRtl":"오른쪽에서 왼쪽 (RTL)","langCode":"언어 코드","longDescr":"웹 주소 설명","cssClass":"스타일 시트 클래스","advisoryTitle":"보조 제목","cssStyle":"스타일","ok":"확인","cancel":"취소","close":"닫기","preview":"미리보기","resize":"크기 조절","generalTab":"일반","advancedTab":"자세히","validateNumberFailed":"이 값은 숫자가 아닙니다.","confirmNewPage":"저장하지 않은 모든 변경사항은 유실됩니다. 정말로 새로운 페이지를 부르겠습니까?","confirmCancel":"일부 옵션이 변경 되었습니다. 정말로 창을 닫겠습니까?","options":"옵션","target":"타겟","targetNew":"새 창 (_blank)","targetTop":"최상위 창 (_top)","targetSelf":"같은 창 (_self)","targetParent":"부모 창 (_parent)","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","styles":"스타일","cssClasses":"스타일 시트 클래스","width":"너비","height":"높이","align":"정렬","alignLeft":"왼쪽","alignRight":"오른쪽","alignCenter":"가운데","alignJustify":"양쪽 맞춤","alignTop":"위","alignMiddle":"중간","alignBottom":"아래","alignNone":"기본","invalidValue":"잘못된 값.","invalidHeight":"높이는 숫자여야 합니다.","invalidWidth":"넓이는 숫자여야 합니다.","invalidCssLength":"\"%1\" 값은 유효한 CSS 측정 단위(px, %, in, cm, mm, em, ex, pt, or pc)를 포함하거나 포함하지 않은 양수 여야 합니다.","invalidHtmlLength":"\"%1\" 값은 유효한 HTML 측정 단위(px or %)를 포함하거나 포함하지 않은 양수여야 합니다.","invalidInlineStyle":"인라인 스타일에 설정된 값은 \"name : value\" 형식을 가진 하나 이상의 투플(tuples)이 세미콜론(;)으로 구분되어 구성되어야 합니다.","cssLengthTooltip":"픽셀 단위의 숫자만 입력하시거나 유효한 CSS 단위(px, %, in, cm, mm, em, ex, pt, or pc)와 함께 숫자를 입력해주세요.","unavailable":"%1<span class=\"cke_accessibility\">, 사용불가</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/ku.js b/web/core/assets/vendor/ckeditor/lang/ku.js
index 63c3e44ec..8759e6fdb 100644
--- a/web/core/assets/vendor/ckeditor/lang/ku.js
+++ b/web/core/assets/vendor/ckeditor/lang/ku.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ku']={"widget":{"move":"کرتەبکە و ڕایبکێشە بۆ جوڵاندن","label":"%1 ویجێت"},"undo":{"redo":"هەڵگەڕاندنەوە","undo":"پووچکردنەوە"},"toolbar":{"toolbarCollapse":"شاردنەوی هێڵی تووڵامراز","toolbarExpand":"نیشاندانی هێڵی تووڵامراز","toolbarGroups":{"document":"پەڕه","clipboard":"بڕین/پووچکردنەوە","editing":"چاکسازی","forms":"داڕشتە","basicstyles":"شێوازی بنچینەیی","paragraph":"بڕگە","links":"بەستەر","insert":"خستنە ناو","styles":"شێواز","colors":"ڕەنگەکان","tools":"ئامرازەکان"},"toolbars":"تووڵامرازی دەسکاریکەر"},"table":{"border":"گەورەیی پەراوێز","caption":"سەردێڕ","cell":{"menu":"خانه","insertBefore":"دانانی خانه لەپێش","insertAfter":"دانانی خانه لەپاش","deleteCell":"سڕینەوەی خانه","merge":"تێکەڵکردنی خانە","mergeRight":"تێکەڵکردنی لەگەڵ ڕاست","mergeDown":"تێکەڵکردنی لەگەڵ خوارەوە","splitHorizontal":"دابەشکردنی خانەی ئاسۆیی","splitVertical":"دابەشکردنی خانەی ئەستونی","title":"خاسیەتی خانه","cellType":"جۆری خانه","rowSpan":"ماوەی نێوان ڕیز","colSpan":"بستی ئەستونی","wordWrap":"پێچانەوەی وشە","hAlign":"ڕیزکردنی ئاسۆیی","vAlign":"ڕیزکردنی ئەستونی","alignBaseline":"هێڵەبنەڕەت","bgColor":"ڕەنگی پاشبنەما","borderColor":"ڕەنگی پەراوێز","data":"داتا","header":"سەرپەڕه","yes":"بەڵێ","no":"نەخێر","invalidWidth":"پانی خانه دەبێت بەتەواوی ژماره بێت.","invalidHeight":"درێژی خانه بەتەواوی دەبێت ژمارە بێت.","invalidRowSpan":"ماوەی نێوان ڕیز بەتەواوی دەبێت ژمارە بێت.","invalidColSpan":"ماوەی نێوان ئەستونی بەتەواوی دەبێت ژمارە بێت.","chooseColor":"هەڵبژێرە"},"cellPad":"بۆشایی ناوپۆش","cellSpace":"بۆشایی خانه","column":{"menu":"ئەستون","insertBefore":"دانانی ئەستون لەپێش","insertAfter":"دانانی ئەستوون لەپاش","deleteColumn":"سڕینەوەی ئەستوون"},"columns":"ستوونەکان","deleteTable":"سڕینەوەی خشتە","headers":"سەرپەڕه","headersBoth":"هەردووك","headersColumn":"یەکەم ئەستوون","headersNone":"هیچ","headersRow":"یەکەم ڕیز","invalidBorder":"ژمارەی پەراوێز دەبێت تەنها ژماره بێت.","invalidCellPadding":"ناوپۆشی خانه دەبێت ژمارەکی درووست بێت.","invalidCellSpacing":"بۆشایی خانه دەبێت ژمارەکی درووست بێت.","invalidCols":"ژمارەی ئەستوونی دەبێت گەورەتر بێت لەژمارەی 0.","invalidHeight":"درێژی خشته دهبێت تهنها ژماره بێت.","invalidRows":"ژمارەی ڕیز دەبێت گەورەتر بێت لەژمارەی 0.","invalidWidth":"پانی خشته دەبێت تەنها ژماره بێت.","menu":"خاسیەتی خشتە","row":{"menu":"ڕیز","insertBefore":"دانانی ڕیز لەپێش","insertAfter":"دانانی ڕیز لەپاش","deleteRow":"سڕینەوەی ڕیز"},"rows":"ڕیز","summary":"کورتە","title":"خاسیەتی خشتە","toolbar":"خشتە","widthPc":"لەسەدا","widthPx":"وێنەخاڵ - پیکسل","widthUnit":"پانی یەکە"},"stylescombo":{"label":"شێواز","panelTitle":"شێوازی ڕازاندنەوە","panelTitle1":"شێوازی خشت","panelTitle2":"شێوازی ناوهێڵ","panelTitle3":"شێوازی بەرکار"},"specialchar":{"options":"هەڵبژاردەی نووسەی تایبەتی","title":"هەڵبژاردنی نووسەی تایبەتی","toolbar":"دانانی نووسەی تایبەتی"},"sourcedialog":{"toolbar":"سەرچاوە","title":"سەرچاوە"},"sourcearea":{"toolbar":"سەرچاوە"},"showblocks":{"toolbar":"نیشاندانی بەربەستەکان"},"removeformat":{"toolbar":"لابردنی داڕشتەکە"},"pastetext":{"button":"لکاندنی وەك دەقی ڕوون","title":"لکاندنی وەك دەقی ڕوون"},"pastefromword":{"confirmCleanup":"ئەم دەقەی بەتەمای بیلکێنی پێدەچێت له word هێنرابێت. دەتەوێت پاکی بکەیوه پێش ئەوەی بیلکێنی؟","error":"هیچ ڕێگەیەك نەبوو لەلکاندنی دەقەکه بەهۆی هەڵەیەکی ناوەخۆیی","title":"لکاندنی لەلایەن Word","toolbar":"لکاندنی لەڕێی Word"},"maximize":{"maximize":"ئەوپەڕی گەورەیی","minimize":"ئەوپەڕی بچووکی"},"magicline":{"title":"بڕگە لێرە دابنێ"},"list":{"bulletedlist":"دانان/لابردنی خاڵی لیست","numberedlist":"دانان/لابردنی ژمارەی لیست"},"language":{"button":"جێگیرکردنی زمان","remove":"لابردنی زمان"},"justify":{"block":"هاوستوونی","center":"ناوەڕاست","left":"بەهێڵ کردنی چەپ","right":"بەهێڵ کردنی ڕاست"},"indent":{"indent":"زیادکردنی بۆشایی","outdent":"کەمکردنەوەی بۆشایی"},"image2":{"alt":"جێگرەوەی دەق","btnUpload":"ناردنی بۆ ڕاژه","captioned":"وێنەی بەسەردێر","captionPlaceholder":"سەردێر","infoTab":"زانیاری وێنه","lockRatio":"داخستنی ڕێژه","menu":"خاسیەتی وێنه","pathName":"وێنە","pathNameCaption":"سەردێر","resetSize":"ڕێکخستنەوەی قەباره","resizer":"کرتەبکە و ڕایبکێشە بۆ قەبارە گۆڕین","title":"خاسیەتی وێنه","uploadTab":"بارکردن","urlMissing":"سەرچاوەی بەستەری وێنه بزره"},"horizontalrule":{"toolbar":"دانانی هێلی ئاسۆیی"},"format":{"label":"ڕازاندنەوە","panelTitle":"بەشی ڕازاندنەوه","tag_address":"ناونیشان","tag_div":"(DIV)-ی ئاسایی","tag_h1":"سەرنووسەی ١","tag_h2":"سەرنووسەی ٢","tag_h3":"سەرنووسەی ٣","tag_h4":"سەرنووسەی ٤","tag_h5":"سەرنووسەی ٥","tag_h6":"سەرنووسەی ٦","tag_p":"ئاسایی","tag_pre":"شێوازکراو"},"elementspath":{"eleLabel":"ڕێڕەوی توخمەکان","eleTitle":"%1 توخم"},"contextmenu":{"options":"هەڵبژاردەی لیستەی کلیکی دەستی ڕاست"},"clipboard":{"copy":"لەبەرگرتنەوە","copyError":"پارێزی وێبگەڕەکەت ڕێگەنادات بەسەرنووسەکە لە لکاندنی دەقی خۆکارارنە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+C).","cut":"بڕین","cutError":"پارێزی وێبگەڕەکەت ڕێگەنادات بە سەرنووسەکە لەبڕینی خۆکارانە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+X).","paste":"لکاندن","pasteArea":"ناوچەی لکاندن","pasteMsg":"تکایە بیلکێنە لەناوەوەی ئەم سنوقە لەڕێی تەختەکلیلەکەت بە بەکارهێنانی کلیلی (<STRONG>Ctrl/Cmd+V</STRONG>) دووای کلیکی باشە بکە.","securityMsg":"بەهۆی شێوەپێدانی پارێزی وێبگەڕەکەت، سەرنووسەکه ناتوانێت دەستبگەیەنێت بەهەڵگیراوەکە ڕاستەوخۆ. بۆیه پێویسته دووباره بیلکێنیت لەم پەنجەرەیه.","title":"لکاندن"},"button":{"selectedLabel":"%1 (هەڵبژێردراو)"},"blockquote":{"toolbar":"بەربەستکردنی ووتەی وەرگیراو"},"basicstyles":{"bold":"قەڵەو","italic":"لار","strike":"لێدان","subscript":"ژێرنووس","superscript":"سەرنووس","underline":"ژێرهێڵ"},"about":{"copy":"مافی لەبەرگەرتنەوەی &copy; $1. گشتی پارێزراوه. ورگێڕانی بۆ کوردی لەلایەن هۆژە کۆیی.","dlgTitle":"دەربارەی CKEditor","help":"سەیری $1 بکه بۆ یارمەتی.","moreInfo":"بۆ زانیاری زیاتر دەربارەی مۆڵەتی بەکارهێنان، تکایه سەردانی ماڵپەڕەکەمان بکه:","title":"دەربارەی CKEditor","userGuide":"ڕێپیشاندەری CKEditors"},"editor":"سەرنووسەی دەقی تەواو","editorPanel":"بڕگەی سەرنووسەی دەقی تەواو","common":{"editorHelp":"کلیکی ALT لەگەڵ 0 بکه‌ بۆ یارمەتی","browseServer":"هێنانی ڕاژە","url":"ناونیشانی بەستەر","protocol":"پڕۆتۆکۆڵ","upload":"بارکردن","uploadSubmit":"ناردنی بۆ ڕاژە","image":"وێنە","flash":"فلاش","form":"داڕشتە","checkbox":"خانەی نیشانکردن","radio":"جێگرەوەی دوگمە","textField":"خانەی دەق","textarea":"ڕووبەری دەق","hiddenField":"شاردنەوی خانە","button":"دوگمە","select":"هەڵبژاردەی خانە","imageButton":"دوگمەی وێنە","notSet":"<هیچ دانەدراوە>","id":"ناسنامە","name":"ناو","langDir":"ئاراستەی زمان","langDirLtr":"چەپ بۆ ڕاست (LTR)","langDirRtl":"ڕاست بۆ چەپ (RTL)","langCode":"هێمای زمان","longDescr":"پێناسەی درێژی بەستەر","cssClass":"شێوازی چینی په‌ڕە","advisoryTitle":"ڕاوێژکاری سەردێڕ","cssStyle":"شێواز","ok":"باشە","cancel":"پاشگەزبوونەوە","close":"داخستن","preview":"پێشبینین","resize":"گۆڕینی ئەندازە","generalTab":"گشتی","advancedTab":"پەرەسەندوو","validateNumberFailed":"ئەم نرخە ژمارە نیە، تکایە نرخێکی ژمارە بنووسە.","confirmNewPage":"سەرجەم گۆڕانکاریەکان و پێکهاتەکانی ناووەوە لەدەست دەدەی گەر بێتوو پاشکەوتی نەکەی یەکەم جار، تۆ هەر دڵنیایی لەکردنەوەی پەنجەرەکی نوێ؟","confirmCancel":"هەندێك هەڵبژاردە گۆڕدراوە. تۆ دڵنیایی لە داخستنی ئەم دیالۆگە؟","options":"هەڵبژاردەکان","target":"ئامانج","targetNew":"پەنجەرەیەکی نوێ (_blank)","targetTop":"لووتکەی پەنجەرە (_top)","targetSelf":"لەهەمان پەنجەرە (_self)","targetParent":"پەنجەرەی باوان (_parent)","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","styles":"شێواز","cssClasses":"شێوازی چینی پەڕە","width":"پانی","height":"درێژی","align":"ڕێککەرەوە","alignLeft":"چەپ","alignRight":"ڕاست","alignCenter":"ناوەڕاست","alignJustify":"هاوستوونی","alignTop":"سەرەوە","alignMiddle":"ناوەند","alignBottom":"ژێرەوە","alignNone":"هیچ","invalidValue":"نرخێکی نادرووست.","invalidHeight":"درێژی دەبێت ژمارە بێت.","invalidWidth":"پانی دەبێت ژمارە بێت.","invalidCssLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی (px, %, in, cm, mm, em, ex, pt, یان pc).","invalidHtmlLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی HTML (px یان %).","invalidInlineStyle":"دانەی نرخی شێوازی ناوهێڵ دەبێت پێکهاتبێت لەیەك یان زیاتری داڕشتە \"ناو : نرخ\", جیاکردنەوەی بە فاریزە و خاڵ","cssLengthTooltip":"ژمارەیەك بنووسه‌ بۆ نرخی piksel یان ئامرازێکی درووستی CSS (px, %, in, cm, mm, em, ex, pt, یان pc).","unavailable":"%1<span class=\"cke_accessibility\">, ئامادە نیە</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ku']={"widget":{"move":"کرتەبکە و ڕایبکێشە بۆ جوڵاندن","label":"%1 ویجێت"},"undo":{"redo":"هەڵگەڕاندنەوە","undo":"پووچکردنەوە"},"toolbar":{"toolbarCollapse":"شاردنەوی هێڵی تووڵامراز","toolbarExpand":"نیشاندانی هێڵی تووڵامراز","toolbarGroups":{"document":"پەڕه","clipboard":"بڕین/پووچکردنەوە","editing":"چاکسازی","forms":"داڕشتە","basicstyles":"شێوازی بنچینەیی","paragraph":"بڕگە","links":"بەستەر","insert":"خستنە ناو","styles":"شێواز","colors":"ڕەنگەکان","tools":"ئامرازەکان"},"toolbars":"تووڵامرازی دەسکاریکەر"},"table":{"border":"گەورەیی پەراوێز","caption":"سەردێڕ","cell":{"menu":"خانه","insertBefore":"دانانی خانه لەپێش","insertAfter":"دانانی خانه لەپاش","deleteCell":"سڕینەوەی خانه","merge":"تێکەڵکردنی خانە","mergeRight":"تێکەڵکردنی لەگەڵ ڕاست","mergeDown":"تێکەڵکردنی لەگەڵ خوارەوە","splitHorizontal":"دابەشکردنی خانەی ئاسۆیی","splitVertical":"دابەشکردنی خانەی ئەستونی","title":"خاسیەتی خانه","cellType":"جۆری خانه","rowSpan":"ماوەی نێوان ڕیز","colSpan":"بستی ئەستونی","wordWrap":"پێچانەوەی وشە","hAlign":"ڕیزکردنی ئاسۆیی","vAlign":"ڕیزکردنی ئەستونی","alignBaseline":"هێڵەبنەڕەت","bgColor":"ڕەنگی پاشبنەما","borderColor":"ڕەنگی پەراوێز","data":"داتا","header":"سەرپەڕه","yes":"بەڵێ","no":"نەخێر","invalidWidth":"پانی خانه دەبێت بەتەواوی ژماره بێت.","invalidHeight":"درێژی خانه بەتەواوی دەبێت ژمارە بێت.","invalidRowSpan":"ماوەی نێوان ڕیز بەتەواوی دەبێت ژمارە بێت.","invalidColSpan":"ماوەی نێوان ئەستونی بەتەواوی دەبێت ژمارە بێت.","chooseColor":"هەڵبژێرە"},"cellPad":"بۆشایی ناوپۆش","cellSpace":"بۆشایی خانه","column":{"menu":"ئەستون","insertBefore":"دانانی ئەستون لەپێش","insertAfter":"دانانی ئەستوون لەپاش","deleteColumn":"سڕینەوەی ئەستوون"},"columns":"ستوونەکان","deleteTable":"سڕینەوەی خشتە","headers":"سەرپەڕه","headersBoth":"هەردووك","headersColumn":"یەکەم ئەستوون","headersNone":"هیچ","headersRow":"یەکەم ڕیز","invalidBorder":"ژمارەی پەراوێز دەبێت تەنها ژماره بێت.","invalidCellPadding":"ناوپۆشی خانه دەبێت ژمارەکی درووست بێت.","invalidCellSpacing":"بۆشایی خانه دەبێت ژمارەکی درووست بێت.","invalidCols":"ژمارەی ئەستوونی دەبێت گەورەتر بێت لەژمارەی 0.","invalidHeight":"درێژی خشته دهبێت تهنها ژماره بێت.","invalidRows":"ژمارەی ڕیز دەبێت گەورەتر بێت لەژمارەی 0.","invalidWidth":"پانی خشته دەبێت تەنها ژماره بێت.","menu":"خاسیەتی خشتە","row":{"menu":"ڕیز","insertBefore":"دانانی ڕیز لەپێش","insertAfter":"دانانی ڕیز لەپاش","deleteRow":"سڕینەوەی ڕیز"},"rows":"ڕیز","summary":"کورتە","title":"خاسیەتی خشتە","toolbar":"خشتە","widthPc":"لەسەدا","widthPx":"وێنەخاڵ - پیکسل","widthUnit":"پانی یەکە"},"stylescombo":{"label":"شێواز","panelTitle":"شێوازی ڕازاندنەوە","panelTitle1":"شێوازی خشت","panelTitle2":"شێوازی ناوهێڵ","panelTitle3":"شێوازی بەرکار"},"specialchar":{"options":"هەڵبژاردەی نووسەی تایبەتی","title":"هەڵبژاردنی نووسەی تایبەتی","toolbar":"دانانی نووسەی تایبەتی"},"sourcedialog":{"toolbar":"سەرچاوە","title":"سەرچاوە"},"sourcearea":{"toolbar":"سەرچاوە"},"showblocks":{"toolbar":"نیشاندانی بەربەستەکان"},"removeformat":{"toolbar":"لابردنی داڕشتەکە"},"pastetext":{"button":"لکاندنی وەك دەقی ڕوون","title":"لکاندنی وەك دەقی ڕوون"},"pastefromword":{"confirmCleanup":"ئەم دەقەی بەتەمای بیلکێنی پێدەچێت له word هێنرابێت. دەتەوێت پاکی بکەیوه پێش ئەوەی بیلکێنی؟","error":"هیچ ڕێگەیەك نەبوو لەلکاندنی دەقەکه بەهۆی هەڵەیەکی ناوەخۆیی","title":"لکاندنی لەلایەن Word","toolbar":"لکاندنی لەڕێی Word"},"maximize":{"maximize":"ئەوپەڕی گەورەیی","minimize":"ئەوپەڕی بچووکی"},"magicline":{"title":"بڕگە لێرە دابنێ"},"list":{"bulletedlist":"دانان/لابردنی خاڵی لیست","numberedlist":"دانان/لابردنی ژمارەی لیست"},"language":{"button":"جێگیرکردنی زمان","remove":"لابردنی زمان"},"justify":{"block":"هاوستوونی","center":"ناوەڕاست","left":"بەهێڵ کردنی چەپ","right":"بەهێڵ کردنی ڕاست"},"indent":{"indent":"زیادکردنی بۆشایی","outdent":"کەمکردنەوەی بۆشایی"},"image2":{"alt":"جێگرەوەی دەق","btnUpload":"ناردنی بۆ ڕاژه","captioned":"وێنەی بەسەردێر","captionPlaceholder":"سەردێر","infoTab":"زانیاری وێنه","lockRatio":"داخستنی ڕێژه","menu":"خاسیەتی وێنه","pathName":"وێنە","pathNameCaption":"سەردێر","resetSize":"ڕێکخستنەوەی قەباره","resizer":"کرتەبکە و ڕایبکێشە بۆ قەبارە گۆڕین","title":"خاسیەتی وێنه","uploadTab":"بارکردن","urlMissing":"سەرچاوەی بەستەری وێنه بزره","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"دانانی هێلی ئاسۆیی"},"format":{"label":"ڕازاندنەوە","panelTitle":"بەشی ڕازاندنەوه","tag_address":"ناونیشان","tag_div":"(DIV)-ی ئاسایی","tag_h1":"سەرنووسەی ١","tag_h2":"سەرنووسەی ٢","tag_h3":"سەرنووسەی ٣","tag_h4":"سەرنووسەی ٤","tag_h5":"سەرنووسەی ٥","tag_h6":"سەرنووسەی ٦","tag_p":"ئاسایی","tag_pre":"شێوازکراو"},"elementspath":{"eleLabel":"ڕێڕەوی توخمەکان","eleTitle":"%1 توخم"},"contextmenu":{"options":"هەڵبژاردەی لیستەی کلیکی دەستی ڕاست"},"clipboard":{"copy":"لەبەرگرتنەوە","copyError":"پارێزی وێبگەڕەکەت ڕێگەنادات بەسەرنووسەکە لە لکاندنی دەقی خۆکارارنە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+C).","cut":"بڕین","cutError":"پارێزی وێبگەڕەکەت ڕێگەنادات بە سەرنووسەکە لەبڕینی خۆکارانە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+X).","paste":"لکاندن","pasteArea":"ناوچەی لکاندن","pasteMsg":"تکایە بیلکێنە لەناوەوەی ئەم سنوقە لەڕێی تەختەکلیلەکەت بە بەکارهێنانی کلیلی (<STRONG>Ctrl/Cmd+V</STRONG>) دووای کلیکی باشە بکە.","securityMsg":"بەهۆی شێوەپێدانی پارێزی وێبگەڕەکەت، سەرنووسەکه ناتوانێت دەستبگەیەنێت بەهەڵگیراوەکە ڕاستەوخۆ. بۆیه پێویسته دووباره بیلکێنیت لەم پەنجەرەیه.","title":"لکاندن"},"button":{"selectedLabel":"%1 (هەڵبژێردراو)"},"blockquote":{"toolbar":"بەربەستکردنی ووتەی وەرگیراو"},"basicstyles":{"bold":"قەڵەو","italic":"لار","strike":"لێدان","subscript":"ژێرنووس","superscript":"سەرنووس","underline":"ژێرهێڵ"},"about":{"copy":"مافی لەبەرگەرتنەوەی &copy; $1. گشتی پارێزراوه. ورگێڕانی بۆ کوردی لەلایەن هۆژە کۆیی.","dlgTitle":"دەربارەی CKEditor","help":"سەیری $1 بکه بۆ یارمەتی.","moreInfo":"بۆ زانیاری زیاتر دەربارەی مۆڵەتی بەکارهێنان، تکایه سەردانی ماڵپەڕەکەمان بکه:","title":"دەربارەی CKEditor","userGuide":"ڕێپیشاندەری CKEditors"},"editor":"سەرنووسەی دەقی تەواو","editorPanel":"بڕگەی سەرنووسەی دەقی تەواو","common":{"editorHelp":"کلیکی ALT لەگەڵ 0 بکه‌ بۆ یارمەتی","browseServer":"هێنانی ڕاژە","url":"ناونیشانی بەستەر","protocol":"پڕۆتۆکۆڵ","upload":"بارکردن","uploadSubmit":"ناردنی بۆ ڕاژە","image":"وێنە","flash":"فلاش","form":"داڕشتە","checkbox":"خانەی نیشانکردن","radio":"جێگرەوەی دوگمە","textField":"خانەی دەق","textarea":"ڕووبەری دەق","hiddenField":"شاردنەوی خانە","button":"دوگمە","select":"هەڵبژاردەی خانە","imageButton":"دوگمەی وێنە","notSet":"<هیچ دانەدراوە>","id":"ناسنامە","name":"ناو","langDir":"ئاراستەی زمان","langDirLtr":"چەپ بۆ ڕاست (LTR)","langDirRtl":"ڕاست بۆ چەپ (RTL)","langCode":"هێمای زمان","longDescr":"پێناسەی درێژی بەستەر","cssClass":"شێوازی چینی په‌ڕە","advisoryTitle":"ڕاوێژکاری سەردێڕ","cssStyle":"شێواز","ok":"باشە","cancel":"پاشگەزبوونەوە","close":"داخستن","preview":"پێشبینین","resize":"گۆڕینی ئەندازە","generalTab":"گشتی","advancedTab":"پەرەسەندوو","validateNumberFailed":"ئەم نرخە ژمارە نیە، تکایە نرخێکی ژمارە بنووسە.","confirmNewPage":"سەرجەم گۆڕانکاریەکان و پێکهاتەکانی ناووەوە لەدەست دەدەی گەر بێتوو پاشکەوتی نەکەی یەکەم جار، تۆ هەر دڵنیایی لەکردنەوەی پەنجەرەکی نوێ؟","confirmCancel":"هەندێك هەڵبژاردە گۆڕدراوە. تۆ دڵنیایی لە داخستنی ئەم دیالۆگە؟","options":"هەڵبژاردەکان","target":"ئامانج","targetNew":"پەنجەرەیەکی نوێ (_blank)","targetTop":"لووتکەی پەنجەرە (_top)","targetSelf":"لەهەمان پەنجەرە (_self)","targetParent":"پەنجەرەی باوان (_parent)","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","styles":"شێواز","cssClasses":"شێوازی چینی پەڕە","width":"پانی","height":"درێژی","align":"ڕێککەرەوە","alignLeft":"چەپ","alignRight":"ڕاست","alignCenter":"ناوەڕاست","alignJustify":"هاوستوونی","alignTop":"سەرەوە","alignMiddle":"ناوەند","alignBottom":"ژێرەوە","alignNone":"هیچ","invalidValue":"نرخێکی نادرووست.","invalidHeight":"درێژی دەبێت ژمارە بێت.","invalidWidth":"پانی دەبێت ژمارە بێت.","invalidCssLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی (px, %, in, cm, mm, em, ex, pt, یان pc).","invalidHtmlLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی HTML (px یان %).","invalidInlineStyle":"دانەی نرخی شێوازی ناوهێڵ دەبێت پێکهاتبێت لەیەك یان زیاتری داڕشتە \"ناو : نرخ\", جیاکردنەوەی بە فاریزە و خاڵ","cssLengthTooltip":"ژمارەیەك بنووسه‌ بۆ نرخی piksel یان ئامرازێکی درووستی CSS (px, %, in, cm, mm, em, ex, pt, یان pc).","unavailable":"%1<span class=\"cke_accessibility\">, ئامادە نیە</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/lt.js b/web/core/assets/vendor/ckeditor/lang/lt.js
index 529d54883..a0ae25950 100644
--- a/web/core/assets/vendor/ckeditor/lang/lt.js
+++ b/web/core/assets/vendor/ckeditor/lang/lt.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['lt']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Atstatyti","undo":"Atšaukti"},"toolbar":{"toolbarCollapse":"Apjungti įrankių juostą","toolbarExpand":"Išplėsti įrankių juostą","toolbarGroups":{"document":"Dokumentas","clipboard":"Atmintinė/Atgal","editing":"Redagavimas","forms":"Formos","basicstyles":"Pagrindiniai stiliai","paragraph":"Paragrafas","links":"Nuorodos","insert":"Įterpti","styles":"Stiliai","colors":"Spalvos","tools":"Įrankiai"},"toolbars":"Redaktoriaus įrankiai"},"table":{"border":"Rėmelio dydis","caption":"Antraštė","cell":{"menu":"Langelis","insertBefore":"Įterpti langelį prieš","insertAfter":"Įterpti langelį po","deleteCell":"Šalinti langelius","merge":"Sujungti langelius","mergeRight":"Sujungti su dešine","mergeDown":"Sujungti su apačia","splitHorizontal":"Skaidyti langelį horizontaliai","splitVertical":"Skaidyti langelį vertikaliai","title":"Cell nustatymai","cellType":"Cell rūšis","rowSpan":"Eilučių Span","colSpan":"Stulpelių Span","wordWrap":"Sutraukti raides","hAlign":"Horizontalus lygiavimas","vAlign":"Vertikalus lygiavimas","alignBaseline":"Apatinė linija","bgColor":"Fono spalva","borderColor":"Rėmelio spalva","data":"Data","header":"Antraštė","yes":"Taip","no":"Ne","invalidWidth":"Reikšmė turi būti skaičius.","invalidHeight":"Reikšmė turi būti skaičius.","invalidRowSpan":"Reikšmė turi būti skaičius.","invalidColSpan":"Reikšmė turi būti skaičius.","chooseColor":"Pasirinkite"},"cellPad":"Tarpas nuo langelio rėmo iki teksto","cellSpace":"Tarpas tarp langelių","column":{"menu":"Stulpelis","insertBefore":"Įterpti stulpelį prieš","insertAfter":"Įterpti stulpelį po","deleteColumn":"Šalinti stulpelius"},"columns":"Stulpeliai","deleteTable":"Šalinti lentelę","headers":"Antraštės","headersBoth":"Abu","headersColumn":"Pirmas stulpelis","headersNone":"Nėra","headersRow":"Pirma eilutė","invalidBorder":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellPadding":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellSpacing":"Reikšmė turi būti nurodyta skaičiumi.","invalidCols":"Skaičius turi būti didesnis nei 0.","invalidHeight":"Reikšmė turi būti nurodyta skaičiumi.","invalidRows":"Skaičius turi būti didesnis nei 0.","invalidWidth":"Reikšmė turi būti nurodyta skaičiumi.","menu":"Lentelės savybės","row":{"menu":"Eilutė","insertBefore":"Įterpti eilutę prieš","insertAfter":"Įterpti eilutę po","deleteRow":"Šalinti eilutes"},"rows":"Eilutės","summary":"Santrauka","title":"Lentelės savybės","toolbar":"Lentelė","widthPc":"procentais","widthPx":"taškais","widthUnit":"pločio vienetas"},"stylescombo":{"label":"Stilius","panelTitle":"Stilių formatavimas","panelTitle1":"Blokų stiliai","panelTitle2":"Vidiniai stiliai","panelTitle3":"Objektų stiliai"},"specialchar":{"options":"Specialaus simbolio nustatymai","title":"Pasirinkite specialų simbolį","toolbar":"Įterpti specialų simbolį"},"sourcedialog":{"toolbar":"Šaltinis","title":"Šaltinis"},"sourcearea":{"toolbar":"Šaltinis"},"showblocks":{"toolbar":"Rodyti blokus"},"removeformat":{"toolbar":"Panaikinti formatą"},"pastetext":{"button":"Įdėti kaip gryną tekstą","title":"Įdėti kaip gryną tekstą"},"pastefromword":{"confirmCleanup":"Tekstas, kurį įkeliate yra kopijuojamas iš Word. Ar norite jį išvalyti prieš įkeliant?","error":"Dėl vidinių sutrikimų, nepavyko išvalyti įkeliamo teksto","title":"Įdėti iš Word","toolbar":"Įdėti iš Word"},"maximize":{"maximize":"Išdidinti","minimize":"Sumažinti"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Suženklintas sąrašas","numberedlist":"Numeruotas sąrašas"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Lygiuoti abi puses","center":"Centruoti","left":"Lygiuoti kairę","right":"Lygiuoti dešinę"},"indent":{"indent":"Padidinti įtrauką","outdent":"Sumažinti įtrauką"},"image2":{"alt":"Alternatyvus Tekstas","btnUpload":"Siųsti į serverį","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Vaizdo informacija","lockRatio":"Išlaikyti proporciją","menu":"Vaizdo savybės","pathName":"image","pathNameCaption":"caption","resetSize":"Atstatyti dydį","resizer":"Click and drag to resize","title":"Vaizdo savybės","uploadTab":"Siųsti","urlMissing":"Paveiksliuko nuorodos nėra."},"horizontalrule":{"toolbar":"Įterpti horizontalią liniją"},"format":{"label":"Šrifto formatas","panelTitle":"Šrifto formatas","tag_address":"Kreipinio","tag_div":"Normalus (DIV)","tag_h1":"Antraštinis 1","tag_h2":"Antraštinis 2","tag_h3":"Antraštinis 3","tag_h4":"Antraštinis 4","tag_h5":"Antraštinis 5","tag_h6":"Antraštinis 6","tag_p":"Normalus","tag_pre":"Formuotas"},"elementspath":{"eleLabel":"Elemento kelias","eleTitle":"%1 elementas"},"contextmenu":{"options":"Kontekstinio meniu parametrai"},"clipboard":{"copy":"Kopijuoti","copyError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+C).","cut":"Iškirpti","cutError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+X).","paste":"Įdėti","pasteArea":"Įkelti dalį","pasteMsg":"Žemiau esančiame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (<STRONG>Ctrl/Cmd+V</STRONG>) ir paspauskite mygtuką <STRONG>OK</STRONG>.","securityMsg":"Dėl jūsų naršyklės saugumo nustatymų, redaktorius negali tiesiogiai pasiekti laikinosios atminties. Jums reikia nukopijuoti dar kartą į šį langą.","title":"Įdėti"},"button":{"selectedLabel":"%1 (Pasirinkta)"},"blockquote":{"toolbar":"Citata"},"basicstyles":{"bold":"Pusjuodis","italic":"Kursyvas","strike":"Perbrauktas","subscript":"Apatinis indeksas","superscript":"Viršutinis indeksas","underline":"Pabrauktas"},"about":{"copy":"Copyright &copy; $1. Visos teiss saugomos.","dlgTitle":"Apie CKEditor","help":"Patikrinkite $1 dėl pagalbos.","moreInfo":"Dėl licencijavimo apsilankykite mūsų svetainėje:","title":"Apie CKEditor","userGuide":"CKEditor Vartotojo Gidas"},"editor":"Pilnas redaktorius","editorPanel":"Pilno redagtoriaus skydelis","common":{"editorHelp":"Spauskite ALT 0 dėl pagalbos","browseServer":"Naršyti po serverį","url":"URL","protocol":"Protokolas","upload":"Siųsti","uploadSubmit":"Siųsti į serverį","image":"Vaizdas","flash":"Flash","form":"Forma","checkbox":"Žymimasis langelis","radio":"Žymimoji akutė","textField":"Teksto laukas","textarea":"Teksto sritis","hiddenField":"Nerodomas laukas","button":"Mygtukas","select":"Atrankos laukas","imageButton":"Vaizdinis mygtukas","notSet":"<nėra nustatyta>","id":"Id","name":"Vardas","langDir":"Teksto kryptis","langDirLtr":"Iš kairės į dešinę (LTR)","langDirRtl":"Iš dešinės į kairę (RTL)","langCode":"Kalbos kodas","longDescr":"Ilgas aprašymas URL","cssClass":"Stilių lentelės klasės","advisoryTitle":"Konsultacinė antraštė","cssStyle":"Stilius","ok":"OK","cancel":"Nutraukti","close":"Uždaryti","preview":"Peržiūrėti","resize":"Pavilkite, kad pakeistumėte dydį","generalTab":"Bendros savybės","advancedTab":"Papildomas","validateNumberFailed":"Ši reikšmė nėra skaičius.","confirmNewPage":"Visas neišsaugotas turinys bus prarastas. Ar tikrai norite įkrauti naują puslapį?","confirmCancel":"Kai kurie parametrai pasikeitė. Ar tikrai norite užverti langą?","options":"Parametrai","target":"Tikslinė nuoroda","targetNew":"Naujas langas (_blank)","targetTop":"Viršutinis langas (_top)","targetSelf":"Esamas langas (_self)","targetParent":"Paskutinis langas (_parent)","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","styles":"Stilius","cssClasses":"Stilių klasės","width":"Plotis","height":"Aukštis","align":"Lygiuoti","alignLeft":"Kairę","alignRight":"Dešinę","alignCenter":"Centrą","alignJustify":"Lygiuoti abi puses","alignTop":"Viršūnę","alignMiddle":"Vidurį","alignBottom":"Apačią","alignNone":"Niekas","invalidValue":"Neteisinga reikšmė.","invalidHeight":"Aukštis turi būti nurodytas skaičiais.","invalidWidth":"Plotis turi būti nurodytas skaičiais.","invalidCssLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo CSS matavimo vieneto (px, %, in, cm, mm, em, ex, pt arba pc).","invalidHtmlLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo HTML matavimo vieneto (px arba %).","invalidInlineStyle":"Reikšmė nurodyta vidiniame stiliuje turi būti sudaryta iš vieno šių reikšmių \"vardas : reikšmė\", atskirta kabliataškiais.","cssLengthTooltip":"Įveskite reikšmę pikseliais arba skaičiais su tinkamu CSS vienetu (px, %, in, cm, mm, em, ex, pt arba pc).","unavailable":"%1<span class=\"cke_accessibility\">, netinkamas</span>"}};
\ No newline at end of file
+CKEDITOR.lang['lt']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Atstatyti","undo":"Atšaukti"},"toolbar":{"toolbarCollapse":"Apjungti įrankių juostą","toolbarExpand":"Išplėsti įrankių juostą","toolbarGroups":{"document":"Dokumentas","clipboard":"Atmintinė/Atgal","editing":"Redagavimas","forms":"Formos","basicstyles":"Pagrindiniai stiliai","paragraph":"Paragrafas","links":"Nuorodos","insert":"Įterpti","styles":"Stiliai","colors":"Spalvos","tools":"Įrankiai"},"toolbars":"Redaktoriaus įrankiai"},"table":{"border":"Rėmelio dydis","caption":"Antraštė","cell":{"menu":"Langelis","insertBefore":"Įterpti langelį prieš","insertAfter":"Įterpti langelį po","deleteCell":"Šalinti langelius","merge":"Sujungti langelius","mergeRight":"Sujungti su dešine","mergeDown":"Sujungti su apačia","splitHorizontal":"Skaidyti langelį horizontaliai","splitVertical":"Skaidyti langelį vertikaliai","title":"Cell nustatymai","cellType":"Cell rūšis","rowSpan":"Eilučių Span","colSpan":"Stulpelių Span","wordWrap":"Sutraukti raides","hAlign":"Horizontalus lygiavimas","vAlign":"Vertikalus lygiavimas","alignBaseline":"Apatinė linija","bgColor":"Fono spalva","borderColor":"Rėmelio spalva","data":"Data","header":"Antraštė","yes":"Taip","no":"Ne","invalidWidth":"Reikšmė turi būti skaičius.","invalidHeight":"Reikšmė turi būti skaičius.","invalidRowSpan":"Reikšmė turi būti skaičius.","invalidColSpan":"Reikšmė turi būti skaičius.","chooseColor":"Pasirinkite"},"cellPad":"Tarpas nuo langelio rėmo iki teksto","cellSpace":"Tarpas tarp langelių","column":{"menu":"Stulpelis","insertBefore":"Įterpti stulpelį prieš","insertAfter":"Įterpti stulpelį po","deleteColumn":"Šalinti stulpelius"},"columns":"Stulpeliai","deleteTable":"Šalinti lentelę","headers":"Antraštės","headersBoth":"Abu","headersColumn":"Pirmas stulpelis","headersNone":"Nėra","headersRow":"Pirma eilutė","invalidBorder":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellPadding":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellSpacing":"Reikšmė turi būti nurodyta skaičiumi.","invalidCols":"Skaičius turi būti didesnis nei 0.","invalidHeight":"Reikšmė turi būti nurodyta skaičiumi.","invalidRows":"Skaičius turi būti didesnis nei 0.","invalidWidth":"Reikšmė turi būti nurodyta skaičiumi.","menu":"Lentelės savybės","row":{"menu":"Eilutė","insertBefore":"Įterpti eilutę prieš","insertAfter":"Įterpti eilutę po","deleteRow":"Šalinti eilutes"},"rows":"Eilutės","summary":"Santrauka","title":"Lentelės savybės","toolbar":"Lentelė","widthPc":"procentais","widthPx":"taškais","widthUnit":"pločio vienetas"},"stylescombo":{"label":"Stilius","panelTitle":"Stilių formatavimas","panelTitle1":"Blokų stiliai","panelTitle2":"Vidiniai stiliai","panelTitle3":"Objektų stiliai"},"specialchar":{"options":"Specialaus simbolio nustatymai","title":"Pasirinkite specialų simbolį","toolbar":"Įterpti specialų simbolį"},"sourcedialog":{"toolbar":"Šaltinis","title":"Šaltinis"},"sourcearea":{"toolbar":"Šaltinis"},"showblocks":{"toolbar":"Rodyti blokus"},"removeformat":{"toolbar":"Panaikinti formatą"},"pastetext":{"button":"Įdėti kaip gryną tekstą","title":"Įdėti kaip gryną tekstą"},"pastefromword":{"confirmCleanup":"Tekstas, kurį įkeliate yra kopijuojamas iš Word. Ar norite jį išvalyti prieš įkeliant?","error":"Dėl vidinių sutrikimų, nepavyko išvalyti įkeliamo teksto","title":"Įdėti iš Word","toolbar":"Įdėti iš Word"},"maximize":{"maximize":"Išdidinti","minimize":"Sumažinti"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Suženklintas sąrašas","numberedlist":"Numeruotas sąrašas"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Lygiuoti abi puses","center":"Centruoti","left":"Lygiuoti kairę","right":"Lygiuoti dešinę"},"indent":{"indent":"Padidinti įtrauką","outdent":"Sumažinti įtrauką"},"image2":{"alt":"Alternatyvus Tekstas","btnUpload":"Siųsti į serverį","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Vaizdo informacija","lockRatio":"Išlaikyti proporciją","menu":"Vaizdo savybės","pathName":"image","pathNameCaption":"caption","resetSize":"Atstatyti dydį","resizer":"Click and drag to resize","title":"Vaizdo savybės","uploadTab":"Siųsti","urlMissing":"Paveiksliuko nuorodos nėra.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Įterpti horizontalią liniją"},"format":{"label":"Šrifto formatas","panelTitle":"Šrifto formatas","tag_address":"Kreipinio","tag_div":"Normalus (DIV)","tag_h1":"Antraštinis 1","tag_h2":"Antraštinis 2","tag_h3":"Antraštinis 3","tag_h4":"Antraštinis 4","tag_h5":"Antraštinis 5","tag_h6":"Antraštinis 6","tag_p":"Normalus","tag_pre":"Formuotas"},"elementspath":{"eleLabel":"Elemento kelias","eleTitle":"%1 elementas"},"contextmenu":{"options":"Kontekstinio meniu parametrai"},"clipboard":{"copy":"Kopijuoti","copyError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+C).","cut":"Iškirpti","cutError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+X).","paste":"Įdėti","pasteArea":"Įkelti dalį","pasteMsg":"Žemiau esančiame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (<STRONG>Ctrl/Cmd+V</STRONG>) ir paspauskite mygtuką <STRONG>OK</STRONG>.","securityMsg":"Dėl jūsų naršyklės saugumo nustatymų, redaktorius negali tiesiogiai pasiekti laikinosios atminties. Jums reikia nukopijuoti dar kartą į šį langą.","title":"Įdėti"},"button":{"selectedLabel":"%1 (Pasirinkta)"},"blockquote":{"toolbar":"Citata"},"basicstyles":{"bold":"Pusjuodis","italic":"Kursyvas","strike":"Perbrauktas","subscript":"Apatinis indeksas","superscript":"Viršutinis indeksas","underline":"Pabrauktas"},"about":{"copy":"Copyright &copy; $1. Visos teiss saugomos.","dlgTitle":"Apie CKEditor","help":"Patikrinkite $1 dėl pagalbos.","moreInfo":"Dėl licencijavimo apsilankykite mūsų svetainėje:","title":"Apie CKEditor","userGuide":"CKEditor Vartotojo Gidas"},"editor":"Pilnas redaktorius","editorPanel":"Pilno redagtoriaus skydelis","common":{"editorHelp":"Spauskite ALT 0 dėl pagalbos","browseServer":"Naršyti po serverį","url":"URL","protocol":"Protokolas","upload":"Siųsti","uploadSubmit":"Siųsti į serverį","image":"Vaizdas","flash":"Flash","form":"Forma","checkbox":"Žymimasis langelis","radio":"Žymimoji akutė","textField":"Teksto laukas","textarea":"Teksto sritis","hiddenField":"Nerodomas laukas","button":"Mygtukas","select":"Atrankos laukas","imageButton":"Vaizdinis mygtukas","notSet":"<nėra nustatyta>","id":"Id","name":"Vardas","langDir":"Teksto kryptis","langDirLtr":"Iš kairės į dešinę (LTR)","langDirRtl":"Iš dešinės į kairę (RTL)","langCode":"Kalbos kodas","longDescr":"Ilgas aprašymas URL","cssClass":"Stilių lentelės klasės","advisoryTitle":"Konsultacinė antraštė","cssStyle":"Stilius","ok":"OK","cancel":"Nutraukti","close":"Uždaryti","preview":"Peržiūrėti","resize":"Pavilkite, kad pakeistumėte dydį","generalTab":"Bendros savybės","advancedTab":"Papildomas","validateNumberFailed":"Ši reikšmė nėra skaičius.","confirmNewPage":"Visas neišsaugotas turinys bus prarastas. Ar tikrai norite įkrauti naują puslapį?","confirmCancel":"Kai kurie parametrai pasikeitė. Ar tikrai norite užverti langą?","options":"Parametrai","target":"Tikslinė nuoroda","targetNew":"Naujas langas (_blank)","targetTop":"Viršutinis langas (_top)","targetSelf":"Esamas langas (_self)","targetParent":"Paskutinis langas (_parent)","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","styles":"Stilius","cssClasses":"Stilių klasės","width":"Plotis","height":"Aukštis","align":"Lygiuoti","alignLeft":"Kairę","alignRight":"Dešinę","alignCenter":"Centrą","alignJustify":"Lygiuoti abi puses","alignTop":"Viršūnę","alignMiddle":"Vidurį","alignBottom":"Apačią","alignNone":"Niekas","invalidValue":"Neteisinga reikšmė.","invalidHeight":"Aukštis turi būti nurodytas skaičiais.","invalidWidth":"Plotis turi būti nurodytas skaičiais.","invalidCssLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo CSS matavimo vieneto (px, %, in, cm, mm, em, ex, pt arba pc).","invalidHtmlLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo HTML matavimo vieneto (px arba %).","invalidInlineStyle":"Reikšmė nurodyta vidiniame stiliuje turi būti sudaryta iš vieno šių reikšmių \"vardas : reikšmė\", atskirta kabliataškiais.","cssLengthTooltip":"Įveskite reikšmę pikseliais arba skaičiais su tinkamu CSS vienetu (px, %, in, cm, mm, em, ex, pt arba pc).","unavailable":"%1<span class=\"cke_accessibility\">, netinkamas</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/lv.js b/web/core/assets/vendor/ckeditor/lang/lv.js
index 090f71dc1..d763b07cb 100644
--- a/web/core/assets/vendor/ckeditor/lang/lv.js
+++ b/web/core/assets/vendor/ckeditor/lang/lv.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['lv']={"widget":{"move":"Klikšķina un velc, lai pārvietotu","label":"%1 widget"},"undo":{"redo":"Atkārtot","undo":"Atcelt"},"toolbar":{"toolbarCollapse":"Aizvērt rīkjoslu","toolbarExpand":"Atvērt rīkjoslu","toolbarGroups":{"document":"Dokuments","clipboard":"Starpliktuve/Atcelt","editing":"Labošana","forms":"Formas","basicstyles":"Pamata stili","paragraph":"Paragrāfs","links":"Saites","insert":"Ievietot","styles":"Stili","colors":"Krāsas","tools":"Rīki"},"toolbars":"Redaktora rīkjoslas"},"table":{"border":"Rāmja izmērs","caption":"Leģenda","cell":{"menu":"Šūna","insertBefore":"Pievienot šūnu pirms","insertAfter":"Pievienot šūnu pēc","deleteCell":"Dzēst rūtiņas","merge":"Apvienot rūtiņas","mergeRight":"Apvieno pa labi","mergeDown":"Apvienot uz leju","splitHorizontal":"Sadalīt šūnu horizontāli","splitVertical":"Sadalīt šūnu vertikāli","title":"Šūnas uzstādījumi","cellType":"Šūnas tips","rowSpan":"Apvienotas rindas","colSpan":"Apvienotas kolonas","wordWrap":"Vārdu pārnese","hAlign":"Horizontālais novietojums","vAlign":"Vertikālais novietojums","alignBaseline":"Pamatrinda","bgColor":"Fona krāsa","borderColor":"Rāmja krāsa","data":"Dati","header":"Virsraksts","yes":"Jā","no":"Nē","invalidWidth":"Šūnas platumam jābūt skaitlim","invalidHeight":"Šūnas augstumam jābūt skaitlim","invalidRowSpan":"Apvienojamo rindu skaitam jābūt veselam skaitlim","invalidColSpan":"Apvienojamo kolonu skaitam jābūt veselam skaitlim","chooseColor":"Izvēlēties"},"cellPad":"Rūtiņu nobīde","cellSpace":"Rūtiņu atstatums","column":{"menu":"Kolonna","insertBefore":"Ievietot kolonu pirms","insertAfter":"Ievieto kolonu pēc","deleteColumn":"Dzēst kolonnas"},"columns":"Kolonnas","deleteTable":"Dzēst tabulu","headers":"Virsraksti","headersBoth":"Abi","headersColumn":"Pirmā kolona","headersNone":"Nekas","headersRow":"Pirmā rinda","invalidBorder":"Rāmju izmēram jābūt skaitlim","invalidCellPadding":"Šūnu atkāpēm jābūt pozitīvam skaitlim","invalidCellSpacing":"Šūnu atstarpēm jābūt pozitīvam skaitlim","invalidCols":"Kolonu skaitam jābūt lielākam par 0","invalidHeight":"Tabulas augstumam jābūt skaitlim","invalidRows":"Rindu skaitam jābūt lielākam par 0","invalidWidth":"Tabulas platumam jābūt skaitlim","menu":"Tabulas īpašības","row":{"menu":"Rinda","insertBefore":"Ievietot rindu pirms","insertAfter":"Ievietot rindu pēc","deleteRow":"Dzēst rindas"},"rows":"Rindas","summary":"Anotācija","title":"Tabulas īpašības","toolbar":"Tabula","widthPc":"procentuāli","widthPx":"pikseļos","widthUnit":"platuma mērvienība"},"stylescombo":{"label":"Stils","panelTitle":"Formatēšanas stili","panelTitle1":"Bloka stili","panelTitle2":"iekļautie stili","panelTitle3":"Objekta stili"},"specialchar":{"options":"Speciālo simbolu uzstādījumi","title":"Ievietot īpašu simbolu","toolbar":"Ievietot speciālo simbolu"},"sourcedialog":{"toolbar":"HTML kods","title":"HTML kods"},"sourcearea":{"toolbar":"HTML kods"},"showblocks":{"toolbar":"Parādīt blokus"},"removeformat":{"toolbar":"Noņemt stilus"},"pastetext":{"button":"Ievietot kā vienkāršu tekstu","title":"Ievietot kā vienkāršu tekstu"},"pastefromword":{"confirmCleanup":"Teksts, kuru vēlaties ielīmēt, izskatās ir nokopēts no Word. Vai vēlaties to iztīrīt pirms ielīmēšanas?","error":"Iekšējas kļūdas dēļ, neizdevās iztīrīt ielīmētos datus.","title":"Ievietot no Worda","toolbar":"Ievietot no Worda"},"maximize":{"maximize":"Maksimizēt","minimize":"Minimizēt"},"magicline":{"title":"Ievietot šeit rindkopu"},"list":{"bulletedlist":"Pievienot/Noņemt vienkāršu sarakstu","numberedlist":"Numurēts saraksts"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Izlīdzināt malas","center":"Izlīdzināt pret centru","left":"Izlīdzināt pa kreisi","right":"Izlīdzināt pa labi"},"indent":{"indent":"Palielināt atkāpi","outdent":"Samazināt atkāpi"},"image2":{"alt":"Alternatīvais teksts","btnUpload":"Nosūtīt serverim","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informācija par attēlu","lockRatio":"Nemainīga Augstuma/Platuma attiecība","menu":"Attēla īpašības","pathName":"image","pathNameCaption":"caption","resetSize":"Atjaunot sākotnējo izmēru","resizer":"Click and drag to resize","title":"Attēla īpašības","uploadTab":"Augšupielādēt","urlMissing":"Trūkst attēla atrašanās adrese."},"horizontalrule":{"toolbar":"Ievietot horizontālu Atdalītājsvītru"},"format":{"label":"Formāts","panelTitle":"Formāts","tag_address":"Adrese","tag_div":"Rindkopa (DIV)","tag_h1":"Virsraksts 1","tag_h2":"Virsraksts 2","tag_h3":"Virsraksts 3","tag_h4":"Virsraksts 4","tag_h5":"Virsraksts 5","tag_h6":"Virsraksts 6","tag_p":"Normāls teksts","tag_pre":"Formatēts teksts"},"elementspath":{"eleLabel":"Elementa ceļš","eleTitle":"%1 elements"},"contextmenu":{"options":"Uznirstošās izvēlnes uzstādījumi"},"clipboard":{"copy":"Kopēt","copyError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+C), lai veiktu šo darbību.","cut":"Izgriezt","cutError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt izgriezšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+X), lai veiktu šo darbību.","paste":"Ielīmēt","pasteArea":"Ielīmēšanas zona","pasteMsg":"Lūdzu, ievietojiet tekstu šajā laukumā, izmantojot klaviatūru (<STRONG>Ctrl/Cmd+V</STRONG>) un apstipriniet ar <STRONG>Darīts!</STRONG>.","securityMsg":"Jūsu pārlūka drošības uzstādījumu dēļ, nav iespējams tieši piekļūt jūsu starpliktuvei. Jums jāielīmē atkārtoti šajā logā.","title":"Ievietot"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Bloka citāts"},"basicstyles":{"bold":"Treknināts","italic":"Kursīvs","strike":"Pārsvītrots","subscript":"Apakšrakstā","superscript":"Augšrakstā","underline":"Pasvītrots"},"about":{"copy":"Kopēšanas tiesības &copy; $1. Visas tiesības rezervētas.","dlgTitle":"Par CKEditor","help":"Pārbaudiet $1 palīdzībai.","moreInfo":"Informācijai par licenzēšanu apmeklējiet mūsu mājas lapu:","title":"Par CKEditor","userGuide":"CKEditor Lietotāja pamācība"},"editor":"Bagātinātā teksta redaktors","editorPanel":"Bagātinātā teksta redaktora panelis","common":{"editorHelp":"Palīdzībai, nospiediet ALT 0 ","browseServer":"Skatīt servera saturu","url":"URL","protocol":"Protokols","upload":"Augšupielādēt","uploadSubmit":"Nosūtīt serverim","image":"Attēls","flash":"Flash","form":"Forma","checkbox":"Atzīmēšanas kastīte","radio":"Izvēles poga","textField":"Teksta rinda","textarea":"Teksta laukums","hiddenField":"Paslēpta teksta rinda","button":"Poga","select":"Iezīmēšanas lauks","imageButton":"Attēlpoga","notSet":"<nav iestatīts>","id":"Id","name":"Nosaukums","langDir":"Valodas lasīšanas virziens","langDirLtr":"No kreisās uz labo (LTR)","langDirRtl":"No labās uz kreiso (RTL)","langCode":"Valodas kods","longDescr":"Gara apraksta Hipersaite","cssClass":"Stilu saraksta klases","advisoryTitle":"Konsultatīvs virsraksts","cssStyle":"Stils","ok":"Darīts!","cancel":"Atcelt","close":"Aizvērt","preview":"Priekšskatījums","resize":"Mērogot","generalTab":"Vispārīgi","advancedTab":"Izvērstais","validateNumberFailed":"Šī vērtība nav skaitlis","confirmNewPage":"Jebkuras nesaglabātās izmaiņas tiks zaudētas. Vai tiešām vēlaties atvērt jaunu lapu?","confirmCancel":"Daži no uzstādījumiem ir mainīti. Vai tiešām vēlaties aizvērt šo dialogu?","options":"Uzstādījumi","target":"Mērķis","targetNew":"Jauns logs (_blank)","targetTop":"Virsējais logs (_top)","targetSelf":"Tas pats logs (_self)","targetParent":"Avota logs (_parent)","langDirLTR":"Kreisais uz Labo (LTR)","langDirRTL":"Labais uz Kreiso (RTL)","styles":"Stils","cssClasses":"Stilu klases","width":"Platums","height":"Augstums","align":"Nolīdzināt","alignLeft":"Pa kreisi","alignRight":"Pa labi","alignCenter":"Centrēti","alignJustify":"Izlīdzināt malas","alignTop":"Augšā","alignMiddle":"Vertikāli centrēts","alignBottom":"Apakšā","alignNone":"Nekas","invalidValue":"Nekorekta vērtība","invalidHeight":"Augstumam jābūt skaitlim.","invalidWidth":"Platumam jābūt skaitlim","invalidCssLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām CSS mērvienībām (px, %, in, cm, mm, em, ex, pt, vai pc).","invalidHtmlLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām HTML mērvienībām (px vai %).","invalidInlineStyle":"Iekļautajā stilā norādītajai vērtībai jāsastāv no viena vai vairākiem pāriem pēc forma'ta \"nosaukums: vērtība\", atdalītiem ar semikolu.","cssLengthTooltip":"Ievadiet vērtību pikseļos vai skaitli ar derīgu CSS mērvienību (px, %, in, cm, mm, em, ex, pt, vai pc).","unavailable":"%1<span class=\"cke_accessibility\">, nav pieejams</span>"}};
\ No newline at end of file
+CKEDITOR.lang['lv']={"widget":{"move":"Klikšķina un velc, lai pārvietotu","label":"%1 widget"},"undo":{"redo":"Atkārtot","undo":"Atcelt"},"toolbar":{"toolbarCollapse":"Aizvērt rīkjoslu","toolbarExpand":"Atvērt rīkjoslu","toolbarGroups":{"document":"Dokuments","clipboard":"Starpliktuve/Atcelt","editing":"Labošana","forms":"Formas","basicstyles":"Pamata stili","paragraph":"Paragrāfs","links":"Saites","insert":"Ievietot","styles":"Stili","colors":"Krāsas","tools":"Rīki"},"toolbars":"Redaktora rīkjoslas"},"table":{"border":"Rāmja izmērs","caption":"Leģenda","cell":{"menu":"Šūna","insertBefore":"Pievienot šūnu pirms","insertAfter":"Pievienot šūnu pēc","deleteCell":"Dzēst rūtiņas","merge":"Apvienot rūtiņas","mergeRight":"Apvieno pa labi","mergeDown":"Apvienot uz leju","splitHorizontal":"Sadalīt šūnu horizontāli","splitVertical":"Sadalīt šūnu vertikāli","title":"Šūnas uzstādījumi","cellType":"Šūnas tips","rowSpan":"Apvienotas rindas","colSpan":"Apvienotas kolonas","wordWrap":"Vārdu pārnese","hAlign":"Horizontālais novietojums","vAlign":"Vertikālais novietojums","alignBaseline":"Pamatrinda","bgColor":"Fona krāsa","borderColor":"Rāmja krāsa","data":"Dati","header":"Virsraksts","yes":"Jā","no":"Nē","invalidWidth":"Šūnas platumam jābūt skaitlim","invalidHeight":"Šūnas augstumam jābūt skaitlim","invalidRowSpan":"Apvienojamo rindu skaitam jābūt veselam skaitlim","invalidColSpan":"Apvienojamo kolonu skaitam jābūt veselam skaitlim","chooseColor":"Izvēlēties"},"cellPad":"Rūtiņu nobīde","cellSpace":"Rūtiņu atstatums","column":{"menu":"Kolonna","insertBefore":"Ievietot kolonu pirms","insertAfter":"Ievieto kolonu pēc","deleteColumn":"Dzēst kolonnas"},"columns":"Kolonnas","deleteTable":"Dzēst tabulu","headers":"Virsraksti","headersBoth":"Abi","headersColumn":"Pirmā kolona","headersNone":"Nekas","headersRow":"Pirmā rinda","invalidBorder":"Rāmju izmēram jābūt skaitlim","invalidCellPadding":"Šūnu atkāpēm jābūt pozitīvam skaitlim","invalidCellSpacing":"Šūnu atstarpēm jābūt pozitīvam skaitlim","invalidCols":"Kolonu skaitam jābūt lielākam par 0","invalidHeight":"Tabulas augstumam jābūt skaitlim","invalidRows":"Rindu skaitam jābūt lielākam par 0","invalidWidth":"Tabulas platumam jābūt skaitlim","menu":"Tabulas īpašības","row":{"menu":"Rinda","insertBefore":"Ievietot rindu pirms","insertAfter":"Ievietot rindu pēc","deleteRow":"Dzēst rindas"},"rows":"Rindas","summary":"Anotācija","title":"Tabulas īpašības","toolbar":"Tabula","widthPc":"procentuāli","widthPx":"pikseļos","widthUnit":"platuma mērvienība"},"stylescombo":{"label":"Stils","panelTitle":"Formatēšanas stili","panelTitle1":"Bloka stili","panelTitle2":"iekļautie stili","panelTitle3":"Objekta stili"},"specialchar":{"options":"Speciālo simbolu uzstādījumi","title":"Ievietot īpašu simbolu","toolbar":"Ievietot speciālo simbolu"},"sourcedialog":{"toolbar":"HTML kods","title":"HTML kods"},"sourcearea":{"toolbar":"HTML kods"},"showblocks":{"toolbar":"Parādīt blokus"},"removeformat":{"toolbar":"Noņemt stilus"},"pastetext":{"button":"Ievietot kā vienkāršu tekstu","title":"Ievietot kā vienkāršu tekstu"},"pastefromword":{"confirmCleanup":"Teksts, kuru vēlaties ielīmēt, izskatās ir nokopēts no Word. Vai vēlaties to iztīrīt pirms ielīmēšanas?","error":"Iekšējas kļūdas dēļ, neizdevās iztīrīt ielīmētos datus.","title":"Ievietot no Worda","toolbar":"Ievietot no Worda"},"maximize":{"maximize":"Maksimizēt","minimize":"Minimizēt"},"magicline":{"title":"Ievietot šeit rindkopu"},"list":{"bulletedlist":"Pievienot/Noņemt vienkāršu sarakstu","numberedlist":"Numurēts saraksts"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Izlīdzināt malas","center":"Izlīdzināt pret centru","left":"Izlīdzināt pa kreisi","right":"Izlīdzināt pa labi"},"indent":{"indent":"Palielināt atkāpi","outdent":"Samazināt atkāpi"},"image2":{"alt":"Alternatīvais teksts","btnUpload":"Nosūtīt serverim","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informācija par attēlu","lockRatio":"Nemainīga Augstuma/Platuma attiecība","menu":"Attēla īpašības","pathName":"image","pathNameCaption":"caption","resetSize":"Atjaunot sākotnējo izmēru","resizer":"Click and drag to resize","title":"Attēla īpašības","uploadTab":"Augšupielādēt","urlMissing":"Trūkst attēla atrašanās adrese.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Ievietot horizontālu Atdalītājsvītru"},"format":{"label":"Formāts","panelTitle":"Formāts","tag_address":"Adrese","tag_div":"Rindkopa (DIV)","tag_h1":"Virsraksts 1","tag_h2":"Virsraksts 2","tag_h3":"Virsraksts 3","tag_h4":"Virsraksts 4","tag_h5":"Virsraksts 5","tag_h6":"Virsraksts 6","tag_p":"Normāls teksts","tag_pre":"Formatēts teksts"},"elementspath":{"eleLabel":"Elementa ceļš","eleTitle":"%1 elements"},"contextmenu":{"options":"Uznirstošās izvēlnes uzstādījumi"},"clipboard":{"copy":"Kopēt","copyError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+C), lai veiktu šo darbību.","cut":"Izgriezt","cutError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt izgriezšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+X), lai veiktu šo darbību.","paste":"Ielīmēt","pasteArea":"Ielīmēšanas zona","pasteMsg":"Lūdzu, ievietojiet tekstu šajā laukumā, izmantojot klaviatūru (<STRONG>Ctrl/Cmd+V</STRONG>) un apstipriniet ar <STRONG>Darīts!</STRONG>.","securityMsg":"Jūsu pārlūka drošības uzstādījumu dēļ, nav iespējams tieši piekļūt jūsu starpliktuvei. Jums jāielīmē atkārtoti šajā logā.","title":"Ievietot"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Bloka citāts"},"basicstyles":{"bold":"Treknināts","italic":"Kursīvs","strike":"Pārsvītrots","subscript":"Apakšrakstā","superscript":"Augšrakstā","underline":"Pasvītrots"},"about":{"copy":"Kopēšanas tiesības &copy; $1. Visas tiesības rezervētas.","dlgTitle":"Par CKEditor","help":"Pārbaudiet $1 palīdzībai.","moreInfo":"Informācijai par licenzēšanu apmeklējiet mūsu mājas lapu:","title":"Par CKEditor","userGuide":"CKEditor Lietotāja pamācība"},"editor":"Bagātinātā teksta redaktors","editorPanel":"Bagātinātā teksta redaktora panelis","common":{"editorHelp":"Palīdzībai, nospiediet ALT 0 ","browseServer":"Skatīt servera saturu","url":"URL","protocol":"Protokols","upload":"Augšupielādēt","uploadSubmit":"Nosūtīt serverim","image":"Attēls","flash":"Flash","form":"Forma","checkbox":"Atzīmēšanas kastīte","radio":"Izvēles poga","textField":"Teksta rinda","textarea":"Teksta laukums","hiddenField":"Paslēpta teksta rinda","button":"Poga","select":"Iezīmēšanas lauks","imageButton":"Attēlpoga","notSet":"<nav iestatīts>","id":"Id","name":"Nosaukums","langDir":"Valodas lasīšanas virziens","langDirLtr":"No kreisās uz labo (LTR)","langDirRtl":"No labās uz kreiso (RTL)","langCode":"Valodas kods","longDescr":"Gara apraksta Hipersaite","cssClass":"Stilu saraksta klases","advisoryTitle":"Konsultatīvs virsraksts","cssStyle":"Stils","ok":"Darīts!","cancel":"Atcelt","close":"Aizvērt","preview":"Priekšskatījums","resize":"Mērogot","generalTab":"Vispārīgi","advancedTab":"Izvērstais","validateNumberFailed":"Šī vērtība nav skaitlis","confirmNewPage":"Jebkuras nesaglabātās izmaiņas tiks zaudētas. Vai tiešām vēlaties atvērt jaunu lapu?","confirmCancel":"Daži no uzstādījumiem ir mainīti. Vai tiešām vēlaties aizvērt šo dialogu?","options":"Uzstādījumi","target":"Mērķis","targetNew":"Jauns logs (_blank)","targetTop":"Virsējais logs (_top)","targetSelf":"Tas pats logs (_self)","targetParent":"Avota logs (_parent)","langDirLTR":"Kreisais uz Labo (LTR)","langDirRTL":"Labais uz Kreiso (RTL)","styles":"Stils","cssClasses":"Stilu klases","width":"Platums","height":"Augstums","align":"Nolīdzināt","alignLeft":"Pa kreisi","alignRight":"Pa labi","alignCenter":"Centrēti","alignJustify":"Izlīdzināt malas","alignTop":"Augšā","alignMiddle":"Vertikāli centrēts","alignBottom":"Apakšā","alignNone":"Nekas","invalidValue":"Nekorekta vērtība","invalidHeight":"Augstumam jābūt skaitlim.","invalidWidth":"Platumam jābūt skaitlim","invalidCssLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām CSS mērvienībām (px, %, in, cm, mm, em, ex, pt, vai pc).","invalidHtmlLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām HTML mērvienībām (px vai %).","invalidInlineStyle":"Iekļautajā stilā norādītajai vērtībai jāsastāv no viena vai vairākiem pāriem pēc forma'ta \"nosaukums: vērtība\", atdalītiem ar semikolu.","cssLengthTooltip":"Ievadiet vērtību pikseļos vai skaitli ar derīgu CSS mērvienību (px, %, in, cm, mm, em, ex, pt, vai pc).","unavailable":"%1<span class=\"cke_accessibility\">, nav pieejams</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/mk.js b/web/core/assets/vendor/ckeditor/lang/mk.js
index 68e1148d7..dc5adbf9e 100644
--- a/web/core/assets/vendor/ckeditor/lang/mk.js
+++ b/web/core/assets/vendor/ckeditor/lang/mk.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['mk']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Во средина","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Алтернативен текст","btnUpload":"Прикачи на сервер","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Информации за сликата","lockRatio":"Зачувај пропорција","menu":"Својства на сликата","pathName":"image","pathNameCaption":"caption","resetSize":"Ресетирај големина","resizer":"Click and drag to resize","title":"Својства на сликата","uploadTab":"Прикачи","urlMissing":"Недостасува URL-то на сликата."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Контекст-мени опции"},"clipboard":{"copy":"Копирај (Copy)","copyError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши копирање. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","cut":"Исечи (Cut)","cutError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши сечење. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","paste":"Залепи (Paste)","pasteArea":"Простор за залепување","pasteMsg":"Ве молиме да залепите во следниот квадрат користејќи ја тастатурата (<string>Ctrl/Cmd+V</string>) и да притиснете OK","securityMsg":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот директно да пристапи до копираните податоци. Потребно е повторно да се обидете во овој прозорец.","title":"Залепи (Paste)"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Одвоен цитат"},"basicstyles":{"bold":"Здебелено","italic":"Накривено","strike":"Прецртано","subscript":"Долен индекс","superscript":"Горен индекс","underline":"Подвлечено"},"about":{"copy":"Авторски права &copy; $1. Сите права се задржани.","dlgTitle":"За CKEditor","help":"Отворете $1 за помош.","moreInfo":"За информации околу лиценцата, ве молиме посетете го нашиот веб-сајт: ","title":"За CKEditor","userGuide":"CKEditor упатство за корисници"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Притисни ALT 0 за помош","browseServer":"Пребарај низ серверот","url":"URL","protocol":"Протокол","upload":"Прикачи","uploadSubmit":"Прикачи на сервер","image":"Слика","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Поле за текст","textarea":"Големо поле за текст","hiddenField":"Скриено поле","button":"Button","select":"Selection Field","imageButton":"Копче-слика","notSet":"<not set>","id":"Id","name":"Name","langDir":"Насока на јазик","langDirLtr":"Лево кон десно","langDirRtl":"Десно кон лево","langCode":"Код на јазик","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Стил","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"Општо","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опции","target":"Target","targetNew":"Нов прозорец (_blank)","targetTop":"Најгорниот прозорец (_top)","targetSelf":"Истиот прозорец (_self)","targetParent":"Прозорец-родител (_parent)","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","styles":"Стил","cssClasses":"Stylesheet Classes","width":"Широчина","height":"Височина","align":"Alignment","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Во средина","alignJustify":"Justify","alignTop":"Горе","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"Никое","invalidValue":"Невалидна вредност","invalidHeight":"Височината мора да биде број.","invalidWidth":"Широчината мора да биде број.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['mk']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Во средина","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Алтернативен текст","btnUpload":"Прикачи на сервер","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Информации за сликата","lockRatio":"Зачувај пропорција","menu":"Својства на сликата","pathName":"image","pathNameCaption":"caption","resetSize":"Ресетирај големина","resizer":"Click and drag to resize","title":"Својства на сликата","uploadTab":"Прикачи","urlMissing":"Недостасува URL-то на сликата.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Контекст-мени опции"},"clipboard":{"copy":"Копирај (Copy)","copyError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши копирање. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","cut":"Исечи (Cut)","cutError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши сечење. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","paste":"Залепи (Paste)","pasteArea":"Простор за залепување","pasteMsg":"Ве молиме да залепите во следниот квадрат користејќи ја тастатурата (<string>Ctrl/Cmd+V</string>) и да притиснете OK","securityMsg":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот директно да пристапи до копираните податоци. Потребно е повторно да се обидете во овој прозорец.","title":"Залепи (Paste)"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Одвоен цитат"},"basicstyles":{"bold":"Здебелено","italic":"Накривено","strike":"Прецртано","subscript":"Долен индекс","superscript":"Горен индекс","underline":"Подвлечено"},"about":{"copy":"Авторски права &copy; $1. Сите права се задржани.","dlgTitle":"За CKEditor","help":"Отворете $1 за помош.","moreInfo":"За информации околу лиценцата, ве молиме посетете го нашиот веб-сајт: ","title":"За CKEditor","userGuide":"CKEditor упатство за корисници"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Притисни ALT 0 за помош","browseServer":"Пребарај низ серверот","url":"URL","protocol":"Протокол","upload":"Прикачи","uploadSubmit":"Прикачи на сервер","image":"Слика","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Поле за текст","textarea":"Големо поле за текст","hiddenField":"Скриено поле","button":"Button","select":"Selection Field","imageButton":"Копче-слика","notSet":"<not set>","id":"Id","name":"Name","langDir":"Насока на јазик","langDirLtr":"Лево кон десно","langDirRtl":"Десно кон лево","langCode":"Код на јазик","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Стил","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"Општо","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опции","target":"Target","targetNew":"Нов прозорец (_blank)","targetTop":"Најгорниот прозорец (_top)","targetSelf":"Истиот прозорец (_self)","targetParent":"Прозорец-родител (_parent)","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","styles":"Стил","cssClasses":"Stylesheet Classes","width":"Широчина","height":"Височина","align":"Alignment","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Во средина","alignJustify":"Justify","alignTop":"Горе","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"Никое","invalidValue":"Невалидна вредност","invalidHeight":"Височината мора да биде број.","invalidWidth":"Широчината мора да биде број.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/mn.js b/web/core/assets/vendor/ckeditor/lang/mn.js
index 38835df1c..bafe4aabc 100644
--- a/web/core/assets/vendor/ckeditor/lang/mn.js
+++ b/web/core/assets/vendor/ckeditor/lang/mn.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['mn']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Өмнөх үйлдлээ сэргээх","undo":"Хүчингүй болгох"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Холбоосууд","insert":"Оруулах","styles":"Загварууд","colors":"Онгөнүүд","tools":"Хэрэгслүүд"},"toolbars":"Болосруулагчийн хэрэгслийн самбар"},"table":{"border":"Хүрээний хэмжээ","caption":"Тайлбар","cell":{"menu":"Нүх/зай","insertBefore":"Нүх/зай өмнө нь оруулах","insertAfter":"Нүх/зай дараа нь оруулах","deleteCell":"Нүх устгах","merge":"Нүх нэгтэх","mergeRight":"Баруун тийш нэгтгэх","mergeDown":"Доош нэгтгэх","splitHorizontal":"Нүх/зайг босоогоор нь тусгаарлах","splitVertical":"Нүх/зайг хөндлөнгөөр нь тусгаарлах","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Хэвтээд тэгшлэх арга","vAlign":"Босоод тэгшлэх арга","alignBaseline":"Baseline","bgColor":"Дэвсгэр өнгө","borderColor":"Хүрээний өнгө","data":"Data","header":"Header","yes":"Тийм","no":"Үгүй","invalidWidth":"Нүдний өргөн нь тоо байх ёстой.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сонгох"},"cellPad":"Нүх доторлох(padding)","cellSpace":"Нүх хоорондын зай (spacing)","column":{"menu":"Багана","insertBefore":"Багана өмнө нь оруулах","insertAfter":"Багана дараа нь оруулах","deleteColumn":"Багана устгах"},"columns":"Багана","deleteTable":"Хүснэгт устгах","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Хүснэгтийн өргөн нь тоо байх ёстой.","menu":"Хүснэгт","row":{"menu":"Мөр","insertBefore":"Мөр өмнө нь оруулах","insertAfter":"Мөр дараа нь оруулах","deleteRow":"Мөр устгах"},"rows":"Мөр","summary":"Тайлбар","title":"Хүснэгт","toolbar":"Хүснэгт","widthPc":"хувь","widthPx":"цэг","widthUnit":"өргөний нэгж"},"stylescombo":{"label":"Загвар","panelTitle":"Загвар хэлбэржүүлэх","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Онцгой тэмдэгт сонгох","toolbar":"Онцгой тэмдэгт оруулах"},"sourcedialog":{"toolbar":"Код","title":"Код"},"sourcearea":{"toolbar":"Код"},"showblocks":{"toolbar":"Хавтангуудыг харуулах"},"removeformat":{"toolbar":"Параргафын загварыг авч хаях"},"pastetext":{"button":"Энгийн бичвэрээр буулгах","title":"Энгийн бичвэрээр буулгах"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word-оос буулгах","toolbar":"Word-оос буулгах"},"maximize":{"maximize":"Дэлгэц дүүргэх","minimize":"Цонхыг багсгаж харуулах"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Цэгтэй жагсаалт","numberedlist":"Дугаарлагдсан жагсаалт"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Тэгшлэх","center":"Голлуулах","left":"Зүүн талд тулгах","right":"Баруун талд тулгах"},"indent":{"indent":"Догол мөр хасах","outdent":"Догол мөр нэмэх"},"image2":{"alt":"Зургийг орлох бичвэр","btnUpload":"Үүнийг сервэррүү илгээ","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Зурагны мэдээлэл","lockRatio":"Радио түгжих","menu":"Зураг","pathName":"image","pathNameCaption":"caption","resetSize":"хэмжээ дахин оноох","resizer":"Click and drag to resize","title":"Зураг","uploadTab":"Илгээж ачаалах","urlMissing":"Зургийн эх сурвалжийн хаяг (URL) байхгүй байна."},"horizontalrule":{"toolbar":"Хөндлөн зураас оруулах"},"format":{"label":"Параргафын загвар","panelTitle":"Параргафын загвар","tag_address":"Хаяг","tag_div":"Paragraph (DIV)","tag_h1":"Гарчиг 1","tag_h2":"Гарчиг 2","tag_h3":"Гарчиг 3","tag_h4":"Гарчиг 4","tag_h5":"Гарчиг 5","tag_h6":"Гарчиг 6","tag_p":"Хэвийн","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Хуулах","copyError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хуулах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+C) товчны хослолыг ашиглана уу.","cut":"Хайчлах","cutError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хайчлах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+X) товчны хослолыг ашиглана уу.","paste":"Буулгах","pasteArea":"Paste Area","pasteMsg":"(<strong>Ctrl/Cmd+V</strong>) товчийг ашиглан paste хийнэ үү. Мөн <strong>OK</strong> дар.","securityMsg":"Таны үзүүлэгч/browser/-н хамгаалалтын тохиргооноос болоод editor clipboard өгөгдөлрүү шууд хандах боломжгүй. Энэ цонход дахин paste хийхийг оролд.","title":"Буулгах"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Ишлэл хэсэг"},"basicstyles":{"bold":"Тод бүдүүн","italic":"Налуу","strike":"Дундуур нь зураастай болгох","subscript":"Суурь болгох","superscript":"Зэрэг болгох","underline":"Доогуур нь зураастай болгох"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Хэлбэрт бичвэр боловсруулагч","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Үйлчлэгч тооцоолуур (сервэр)-ийг үзэх","url":"цахим хуудасны хаяг (URL)","protocol":"Протокол","upload":"Илгээж ачаалах","uploadSubmit":"Үүнийг үйлчлэгч тооцоолуур (сервер) лүү илгээх","image":"Зураг","flash":"Флаш хөдөлгөөнтэй зураг","form":"Маягт","checkbox":"Тэмдэглээний нүд","radio":"Радио товчлуур","textField":"Бичвэрийн талбар","textarea":"Бичвэрийн зай","hiddenField":"Далд талбар","button":"Товчлуур","select":"Сонголтын талбар","imageButton":"Зургий товчуур","notSet":"<тохируулаагүй>","id":"Id (техникийн нэр)","name":"Нэр","langDir":"Хэлний чиглэл","langDirLtr":"Зүүнээс баруун (LTR)","langDirRtl":"Баруунаас зүүн (RTL)","langCode":"Хэлний код","longDescr":"Урт тайлбарын вэб хаяг","cssClass":"Хэлбэрийн хуудасны ангиуд","advisoryTitle":"Зөвлөх гарчиг","cssStyle":"Загвар","ok":"За","cancel":"Болих","close":"Хаах","preview":"Урьдчилан харах","resize":"Resize","generalTab":"Ерөнхий","advancedTab":"Гүнзгий","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Сонголт","target":"Бай","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Зүүн талаас баруун тийшээ (LTR)","langDirRTL":"Баруун талаас зүүн тийшээ (RTL)","styles":"Загвар","cssClasses":"Хэлбэрийн хуудасны ангиуд","width":"Өргөн","height":"Өндөр","align":"Эгнээ","alignLeft":"Зүүн","alignRight":"Баруун","alignCenter":"Төвд","alignJustify":"Тэгшлэх","alignTop":"Дээд талд","alignMiddle":"Дунд","alignBottom":"Доод талд","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Өндөр нь тоо байх ёстой.","invalidWidth":"Өргөн нь тоо байх ёстой.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['mn']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Өмнөх үйлдлээ сэргээх","undo":"Хүчингүй болгох"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Холбоосууд","insert":"Оруулах","styles":"Загварууд","colors":"Онгөнүүд","tools":"Хэрэгслүүд"},"toolbars":"Болосруулагчийн хэрэгслийн самбар"},"table":{"border":"Хүрээний хэмжээ","caption":"Тайлбар","cell":{"menu":"Нүх/зай","insertBefore":"Нүх/зай өмнө нь оруулах","insertAfter":"Нүх/зай дараа нь оруулах","deleteCell":"Нүх устгах","merge":"Нүх нэгтэх","mergeRight":"Баруун тийш нэгтгэх","mergeDown":"Доош нэгтгэх","splitHorizontal":"Нүх/зайг босоогоор нь тусгаарлах","splitVertical":"Нүх/зайг хөндлөнгөөр нь тусгаарлах","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Хэвтээд тэгшлэх арга","vAlign":"Босоод тэгшлэх арга","alignBaseline":"Baseline","bgColor":"Дэвсгэр өнгө","borderColor":"Хүрээний өнгө","data":"Data","header":"Header","yes":"Тийм","no":"Үгүй","invalidWidth":"Нүдний өргөн нь тоо байх ёстой.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сонгох"},"cellPad":"Нүх доторлох(padding)","cellSpace":"Нүх хоорондын зай (spacing)","column":{"menu":"Багана","insertBefore":"Багана өмнө нь оруулах","insertAfter":"Багана дараа нь оруулах","deleteColumn":"Багана устгах"},"columns":"Багана","deleteTable":"Хүснэгт устгах","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Хүснэгтийн өргөн нь тоо байх ёстой.","menu":"Хүснэгт","row":{"menu":"Мөр","insertBefore":"Мөр өмнө нь оруулах","insertAfter":"Мөр дараа нь оруулах","deleteRow":"Мөр устгах"},"rows":"Мөр","summary":"Тайлбар","title":"Хүснэгт","toolbar":"Хүснэгт","widthPc":"хувь","widthPx":"цэг","widthUnit":"өргөний нэгж"},"stylescombo":{"label":"Загвар","panelTitle":"Загвар хэлбэржүүлэх","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Онцгой тэмдэгт сонгох","toolbar":"Онцгой тэмдэгт оруулах"},"sourcedialog":{"toolbar":"Код","title":"Код"},"sourcearea":{"toolbar":"Код"},"showblocks":{"toolbar":"Хавтангуудыг харуулах"},"removeformat":{"toolbar":"Параргафын загварыг авч хаях"},"pastetext":{"button":"Энгийн бичвэрээр буулгах","title":"Энгийн бичвэрээр буулгах"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word-оос буулгах","toolbar":"Word-оос буулгах"},"maximize":{"maximize":"Дэлгэц дүүргэх","minimize":"Цонхыг багсгаж харуулах"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Цэгтэй жагсаалт","numberedlist":"Дугаарлагдсан жагсаалт"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Тэгшлэх","center":"Голлуулах","left":"Зүүн талд тулгах","right":"Баруун талд тулгах"},"indent":{"indent":"Догол мөр хасах","outdent":"Догол мөр нэмэх"},"image2":{"alt":"Зургийг орлох бичвэр","btnUpload":"Үүнийг сервэррүү илгээ","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Зурагны мэдээлэл","lockRatio":"Радио түгжих","menu":"Зураг","pathName":"image","pathNameCaption":"caption","resetSize":"хэмжээ дахин оноох","resizer":"Click and drag to resize","title":"Зураг","uploadTab":"Илгээж ачаалах","urlMissing":"Зургийн эх сурвалжийн хаяг (URL) байхгүй байна.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Хөндлөн зураас оруулах"},"format":{"label":"Параргафын загвар","panelTitle":"Параргафын загвар","tag_address":"Хаяг","tag_div":"Paragraph (DIV)","tag_h1":"Гарчиг 1","tag_h2":"Гарчиг 2","tag_h3":"Гарчиг 3","tag_h4":"Гарчиг 4","tag_h5":"Гарчиг 5","tag_h6":"Гарчиг 6","tag_p":"Хэвийн","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Хуулах","copyError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хуулах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+C) товчны хослолыг ашиглана уу.","cut":"Хайчлах","cutError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хайчлах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+X) товчны хослолыг ашиглана уу.","paste":"Буулгах","pasteArea":"Paste Area","pasteMsg":"(<strong>Ctrl/Cmd+V</strong>) товчийг ашиглан paste хийнэ үү. Мөн <strong>OK</strong> дар.","securityMsg":"Таны үзүүлэгч/browser/-н хамгаалалтын тохиргооноос болоод editor clipboard өгөгдөлрүү шууд хандах боломжгүй. Энэ цонход дахин paste хийхийг оролд.","title":"Буулгах"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Ишлэл хэсэг"},"basicstyles":{"bold":"Тод бүдүүн","italic":"Налуу","strike":"Дундуур нь зураастай болгох","subscript":"Суурь болгох","superscript":"Зэрэг болгох","underline":"Доогуур нь зураастай болгох"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Хэлбэрт бичвэр боловсруулагч","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Үйлчлэгч тооцоолуур (сервэр)-ийг үзэх","url":"цахим хуудасны хаяг (URL)","protocol":"Протокол","upload":"Илгээж ачаалах","uploadSubmit":"Үүнийг үйлчлэгч тооцоолуур (сервер) лүү илгээх","image":"Зураг","flash":"Флаш хөдөлгөөнтэй зураг","form":"Маягт","checkbox":"Тэмдэглээний нүд","radio":"Радио товчлуур","textField":"Бичвэрийн талбар","textarea":"Бичвэрийн зай","hiddenField":"Далд талбар","button":"Товчлуур","select":"Сонголтын талбар","imageButton":"Зургий товчуур","notSet":"<тохируулаагүй>","id":"Id (техникийн нэр)","name":"Нэр","langDir":"Хэлний чиглэл","langDirLtr":"Зүүнээс баруун (LTR)","langDirRtl":"Баруунаас зүүн (RTL)","langCode":"Хэлний код","longDescr":"Урт тайлбарын вэб хаяг","cssClass":"Хэлбэрийн хуудасны ангиуд","advisoryTitle":"Зөвлөх гарчиг","cssStyle":"Загвар","ok":"За","cancel":"Болих","close":"Хаах","preview":"Урьдчилан харах","resize":"Resize","generalTab":"Ерөнхий","advancedTab":"Гүнзгий","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Сонголт","target":"Бай","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Зүүн талаас баруун тийшээ (LTR)","langDirRTL":"Баруун талаас зүүн тийшээ (RTL)","styles":"Загвар","cssClasses":"Хэлбэрийн хуудасны ангиуд","width":"Өргөн","height":"Өндөр","align":"Эгнээ","alignLeft":"Зүүн","alignRight":"Баруун","alignCenter":"Төвд","alignJustify":"Тэгшлэх","alignTop":"Дээд талд","alignMiddle":"Дунд","alignBottom":"Доод талд","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Өндөр нь тоо байх ёстой.","invalidWidth":"Өргөн нь тоо байх ёстой.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/ms.js b/web/core/assets/vendor/ckeditor/lang/ms.js
index 866b79a20..06b983fdd 100644
--- a/web/core/assets/vendor/ckeditor/lang/ms.js
+++ b/web/core/assets/vendor/ckeditor/lang/ms.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ms']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Ulangkan","undo":"Batalkan"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Saiz Border","caption":"Keterangan","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Buangkan Sel-sel","merge":"Cantumkan Sel-sel","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Tambahan Ruang Sel","cellSpace":"Ruangan Antara Sel","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Buangkan Lajur"},"columns":"Jaluran","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Ciri-ciri Jadual","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Buangkan Baris"},"rows":"Barisan","summary":"Summary","title":"Ciri-ciri Jadual","toolbar":"Jadual","widthPc":"peratus","widthPx":"piksel-piksel","widthUnit":"width unit"},"stylescombo":{"label":"Stail","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Sila pilih huruf istimewa","toolbar":"Masukkan Huruf Istimewa"},"sourcedialog":{"toolbar":"Sumber","title":"Sumber"},"sourcearea":{"toolbar":"Sumber"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Buang Format"},"pastetext":{"button":"Tampal sebagai text biasa","title":"Tampal sebagai text biasa"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Tampal dari Word","toolbar":"Tampal dari Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Senarai tidak bernombor","numberedlist":"Senarai bernombor"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Jajaran Blok","center":"Jajaran Tengah","left":"Jajaran Kiri","right":"Jajaran Kanan"},"indent":{"indent":"Tambahkan Inden","outdent":"Kurangkan Inden"},"image2":{"alt":"Text Alternatif","btnUpload":"Hantar ke Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info Imej","lockRatio":"Tetapkan Nisbah","menu":"Ciri-ciri Imej","pathName":"image","pathNameCaption":"caption","resetSize":"Saiz Set Semula","resizer":"Click and drag to resize","title":"Ciri-ciri Imej","uploadTab":"Muat Naik","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Masukkan Garisan Membujur"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Alamat","tag_div":"Perenggan (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Telah Diformat"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Salin","copyError":"Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+C).","cut":"Potong","cutError":"Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+X).","paste":"Tampal","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Tampal"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Muat Naik","uploadSubmit":"Hantar ke Server","image":"Gambar","flash":"Flash","form":"Borang","checkbox":"Checkbox","radio":"Butang Radio","textField":"Text Field","textarea":"Textarea","hiddenField":"Field Tersembunyi","button":"Butang","select":"Field Pilihan","imageButton":"Butang Bergambar","notSet":"<tidak di set>","id":"Id","name":"Nama","langDir":"Arah Tulisan","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri (RTL)","langCode":"Kod Bahasa","longDescr":"Butiran Panjang URL","cssClass":"Kelas-kelas Stylesheet","advisoryTitle":"Tajuk Makluman","cssStyle":"Stail","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Prebiu","resize":"Resize","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Sasaran","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Stail","cssClasses":"Kelas-kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Jajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Jajaran Blok","alignTop":"Atas","alignMiddle":"Pertengahan","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ms']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Ulangkan","undo":"Batalkan"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Saiz Border","caption":"Keterangan","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Buangkan Sel-sel","merge":"Cantumkan Sel-sel","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Tambahan Ruang Sel","cellSpace":"Ruangan Antara Sel","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Buangkan Lajur"},"columns":"Jaluran","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Ciri-ciri Jadual","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Buangkan Baris"},"rows":"Barisan","summary":"Summary","title":"Ciri-ciri Jadual","toolbar":"Jadual","widthPc":"peratus","widthPx":"piksel-piksel","widthUnit":"width unit"},"stylescombo":{"label":"Stail","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Sila pilih huruf istimewa","toolbar":"Masukkan Huruf Istimewa"},"sourcedialog":{"toolbar":"Sumber","title":"Sumber"},"sourcearea":{"toolbar":"Sumber"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Buang Format"},"pastetext":{"button":"Tampal sebagai text biasa","title":"Tampal sebagai text biasa"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Tampal dari Word","toolbar":"Tampal dari Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Senarai tidak bernombor","numberedlist":"Senarai bernombor"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Jajaran Blok","center":"Jajaran Tengah","left":"Jajaran Kiri","right":"Jajaran Kanan"},"indent":{"indent":"Tambahkan Inden","outdent":"Kurangkan Inden"},"image2":{"alt":"Text Alternatif","btnUpload":"Hantar ke Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info Imej","lockRatio":"Tetapkan Nisbah","menu":"Ciri-ciri Imej","pathName":"image","pathNameCaption":"caption","resetSize":"Saiz Set Semula","resizer":"Click and drag to resize","title":"Ciri-ciri Imej","uploadTab":"Muat Naik","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Masukkan Garisan Membujur"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Alamat","tag_div":"Perenggan (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Telah Diformat"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Salin","copyError":"Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+C).","cut":"Potong","cutError":"Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+X).","paste":"Tampal","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Tampal"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Muat Naik","uploadSubmit":"Hantar ke Server","image":"Gambar","flash":"Flash","form":"Borang","checkbox":"Checkbox","radio":"Butang Radio","textField":"Text Field","textarea":"Textarea","hiddenField":"Field Tersembunyi","button":"Butang","select":"Field Pilihan","imageButton":"Butang Bergambar","notSet":"<tidak di set>","id":"Id","name":"Nama","langDir":"Arah Tulisan","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri (RTL)","langCode":"Kod Bahasa","longDescr":"Butiran Panjang URL","cssClass":"Kelas-kelas Stylesheet","advisoryTitle":"Tajuk Makluman","cssStyle":"Stail","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Prebiu","resize":"Resize","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Sasaran","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Stail","cssClasses":"Kelas-kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Jajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Jajaran Blok","alignTop":"Atas","alignMiddle":"Pertengahan","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/nb.js b/web/core/assets/vendor/ckeditor/lang/nb.js
index 0ec3741b2..98293b8bd 100644
--- a/web/core/assets/vendor/ckeditor/lang/nb.js
+++ b/web/core/assets/vendor/ckeditor/lang/nb.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['nb']={"widget":{"move":"Klikk og dra for å flytte","label":"%1 widget"},"undo":{"redo":"Gjør om","undo":"Angre"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis blokker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"magicline":{"title":"Sett inn nytt avsnitt her"},"list":{"bulletedlist":"Legg til / fjern punktmerket liste","numberedlist":"Legg til / fjern nummerert liste"},"language":{"button":"Sett språk","remove":"Fjern språk"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"image2":{"alt":"Alternativ tekst","btnUpload":"Send det til serveren","captioned":"Bilde med bildetekst","captionPlaceholder":"Bildetekst","infoTab":"Bildeinformasjon","lockRatio":"Lås forhold","menu":"Bildeegenskaper","pathName":"bilde","pathNameCaption":"bildetekst","resetSize":"Tilbakestill størrelse","resizer":"Klikk og dra for å endre størrelse","title":"Bildeegenskaper","uploadTab":"Last opp","urlMissing":"Bildets adresse mangler."},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<strong>Ctrl/Cmd+V</strong>) og trykk <strong>OK</strong>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Valgt)"},"blockquote":{"toolbar":"Blokksitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla gjennom tjener","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil gå tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Du har endret noen alternativer. Er du sikker på at du vil lukke dialogvinduet?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>"}};
\ No newline at end of file
+CKEDITOR.lang['nb']={"widget":{"move":"Klikk og dra for å flytte","label":"Widget %1"},"undo":{"redo":"Gjør om","undo":"Angre"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis blokker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"magicline":{"title":"Sett inn nytt avsnitt her"},"list":{"bulletedlist":"Legg til / fjern punktliste","numberedlist":"Legg til / fjern nummerert liste"},"language":{"button":"Sett språk","remove":"Fjern språk"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"image2":{"alt":"Alternativ tekst","btnUpload":"Send det til serveren","captioned":"Bilde med bildetekst","captionPlaceholder":"Bildetekst","infoTab":"Bildeinformasjon","lockRatio":"Lås forhold","menu":"Bildeegenskaper","pathName":"bilde","pathNameCaption":"bildetekst","resetSize":"Tilbakestill størrelse","resizer":"Klikk og dra for å endre størrelse","title":"Bildeegenskaper","uploadTab":"Last opp","urlMissing":"Bildets adresse mangler.","altMissing":"Alternativ tekst mangler."},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<strong>Ctrl/Cmd+V</strong>) og trykk <strong>OK</strong>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Valgt)"},"blockquote":{"toolbar":"Blokksitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla gjennom tjener","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (LTR)","langDirRtl":"Høyre til venstre (RTL)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil gå tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Du har endret noen alternativer. Er du sikker på at du vil lukke dialogvinduet?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vinduet (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Mellomrom","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Tastatursnarvei"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/nl.js b/web/core/assets/vendor/ckeditor/lang/nl.js
index f6c6358b9..ca77a96fd 100644
--- a/web/core/assets/vendor/ckeditor/lang/nl.js
+++ b/web/core/assets/vendor/ckeditor/lang/nl.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['nl']={"widget":{"move":"Klik en sleep om te verplaatsen","label":"%1 widget"},"undo":{"redo":"Opnieuw uitvoeren","undo":"Ongedaan maken"},"toolbar":{"toolbarCollapse":"Werkbalk inklappen","toolbarExpand":"Werkbalk uitklappen","toolbarGroups":{"document":"Document","clipboard":"Klembord/Ongedaan maken","editing":"Bewerken","forms":"Formulieren","basicstyles":"Basisstijlen","paragraph":"Paragraaf","links":"Links","insert":"Invoegen","styles":"Stijlen","colors":"Kleuren","tools":"Toepassingen"},"toolbars":"Werkbalken"},"table":{"border":"Randdikte","caption":"Titel","cell":{"menu":"Cel","insertBefore":"Voeg cel in voor","insertAfter":"Voeg cel in na","deleteCell":"Cellen verwijderen","merge":"Cellen samenvoegen","mergeRight":"Voeg samen naar rechts","mergeDown":"Voeg samen naar beneden","splitHorizontal":"Splits cel horizontaal","splitVertical":"Splits cel vertikaal","title":"Celeigenschappen","cellType":"Celtype","rowSpan":"Rijen samenvoegen","colSpan":"Kolommen samenvoegen","wordWrap":"Automatische terugloop","hAlign":"Horizontale uitlijning","vAlign":"Verticale uitlijning","alignBaseline":"Tekstregel","bgColor":"Achtergrondkleur","borderColor":"Randkleur","data":"Gegevens","header":"Kop","yes":"Ja","no":"Nee","invalidWidth":"De celbreedte moet een getal zijn.","invalidHeight":"De celhoogte moet een getal zijn.","invalidRowSpan":"Rijen samenvoegen moet een heel getal zijn.","invalidColSpan":"Kolommen samenvoegen moet een heel getal zijn.","chooseColor":"Kies"},"cellPad":"Celopvulling","cellSpace":"Celafstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Kolommen verwijderen"},"columns":"Kolommen","deleteTable":"Tabel verwijderen","headers":"Koppen","headersBoth":"Beide","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste rij","invalidBorder":"De randdikte moet een getal zijn.","invalidCellPadding":"Celopvulling moet een getal zijn.","invalidCellSpacing":"Celafstand moet een getal zijn.","invalidCols":"Het aantal kolommen moet een getal zijn groter dan 0.","invalidHeight":"De tabelhoogte moet een getal zijn.","invalidRows":"Het aantal rijen moet een getal zijn groter dan 0.","invalidWidth":"De tabelbreedte moet een getal zijn.","menu":"Tabeleigenschappen","row":{"menu":"Rij","insertBefore":"Voeg rij in voor","insertAfter":"Voeg rij in na","deleteRow":"Rijen verwijderen"},"rows":"Rijen","summary":"Samenvatting","title":"Tabeleigenschappen","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"eenheid breedte"},"stylescombo":{"label":"Stijl","panelTitle":"Opmaakstijlen","panelTitle1":"Blok stijlen","panelTitle2":"Inline stijlen","panelTitle3":"Object stijlen"},"specialchar":{"options":"Speciale tekens opties","title":"Selecteer speciaal teken","toolbar":"Speciaal teken invoegen"},"sourcedialog":{"toolbar":"Broncode","title":"Broncode"},"sourcearea":{"toolbar":"Broncode"},"showblocks":{"toolbar":"Toon blokken"},"removeformat":{"toolbar":"Opmaak verwijderen"},"pastetext":{"button":"Plakken als platte tekst","title":"Plakken als platte tekst"},"pastefromword":{"confirmCleanup":"De tekst die u wilt plakken lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?","error":"Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout","title":"Plakken vanuit Word","toolbar":"Plakken vanuit Word"},"maximize":{"maximize":"Maximaliseren","minimize":"Minimaliseren"},"magicline":{"title":"Hier paragraaf invoeren"},"list":{"bulletedlist":"Opsomming invoegen","numberedlist":"Genummerde lijst invoegen"},"language":{"button":"Taal instellen","remove":"Taal verwijderen"},"justify":{"block":"Uitvullen","center":"Centreren","left":"Links uitlijnen","right":"Rechts uitlijnen"},"indent":{"indent":"Inspringing vergroten","outdent":"Inspringing verkleinen"},"image2":{"alt":"Alternatieve tekst","btnUpload":"Naar server verzenden","captioned":"Afbeelding met onderschrift","captionPlaceholder":"Onderschrift","infoTab":"Afbeeldingsinformatie","lockRatio":"Verhouding vergrendelen","menu":"Eigenschappen afbeelding","pathName":"afbeelding","pathNameCaption":"onderschrift","resetSize":"Afmetingen herstellen","resizer":"Klik en sleep om te herschalen","title":"Afbeeldingseigenschappen","uploadTab":"Uploaden","urlMissing":"De URL naar de afbeelding ontbreekt."},"horizontalrule":{"toolbar":"Horizontale lijn invoegen"},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Kop 1","tag_h2":"Kop 2","tag_h3":"Kop 3","tag_h4":"Kop 4","tag_h5":"Kop 5","tag_h6":"Kop 6","tag_p":"Normaal","tag_pre":"Met opmaak"},"elementspath":{"eleLabel":"Elementenpad","eleTitle":"%1 element"},"contextmenu":{"options":"Contextmenu opties"},"clipboard":{"copy":"Kopiëren","copyError":"De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.","cut":"Knippen","cutError":"De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.","paste":"Plakken","pasteArea":"Plakgebied","pasteMsg":"Plak de tekst in het volgende vak gebruikmakend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op OK.","securityMsg":"Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.","title":"Plakken"},"button":{"selectedLabel":"%1 (Geselecteerd)"},"blockquote":{"toolbar":"Citaatblok"},"basicstyles":{"bold":"Vet","italic":"Cursief","strike":"Doorhalen","subscript":"Subscript","superscript":"Superscript","underline":"Onderstrepen"},"about":{"copy":"Copyright &copy; $1. Alle rechten voorbehouden.","dlgTitle":"Over CKEditor","help":"Bekijk de $1 voor hulp.","moreInfo":"Bezoek onze website voor licentieinformatie:","title":"Over CKEditor","userGuide":"CKEditor gebruiksaanwijzing"},"editor":"Tekstverwerker","editorPanel":"Tekstverwerker beheerpaneel","common":{"editorHelp":"Druk ALT 0 voor hulp","browseServer":"Bladeren op server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Naar server verzenden","image":"Afbeelding","flash":"Flash","form":"Formulier","checkbox":"Selectievinkje","radio":"Keuzerondje","textField":"Tekstveld","textarea":"Tekstvak","hiddenField":"Verborgen veld","button":"Knop","select":"Selectieveld","imageButton":"Afbeeldingsknop","notSet":"<niet ingevuld>","id":"Id","name":"Naam","langDir":"Schrijfrichting","langDirLtr":"Links naar rechts (LTR)","langDirRtl":"Rechts naar links (RTL)","langCode":"Taalcode","longDescr":"Lange URL-omschrijving","cssClass":"Stylesheet-klassen","advisoryTitle":"Adviserende titel","cssStyle":"Stijl","ok":"OK","cancel":"Annuleren","close":"Sluiten","preview":"Voorbeeld","resize":"Sleep om te herschalen","generalTab":"Algemeen","advancedTab":"Geavanceerd","validateNumberFailed":"Deze waarde is geen geldig getal.","confirmNewPage":"Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?","confirmCancel":"Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?","options":"Opties","target":"Doelvenster","targetNew":"Nieuw venster (_blank)","targetTop":"Hele venster (_top)","targetSelf":"Zelfde venster (_self)","targetParent":"Origineel venster (_parent)","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","styles":"Stijl","cssClasses":"Stylesheet-klassen","width":"Breedte","height":"Hoogte","align":"Uitlijning","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Centreren","alignJustify":"Uitvullen","alignTop":"Boven","alignMiddle":"Midden","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde.","invalidHeight":"De hoogte moet een getal zijn.","invalidWidth":"De breedte moet een getal zijn.","invalidCssLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).","invalidHtmlLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).","invalidInlineStyle":"Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat \"naam : waarde\", gescheiden door puntkomma's.","cssLengthTooltip":"Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, niet beschikbaar</span>"}};
\ No newline at end of file
+CKEDITOR.lang['nl']={"widget":{"move":"Klik en sleep om te verplaatsen","label":"%1 widget"},"undo":{"redo":"Opnieuw uitvoeren","undo":"Ongedaan maken"},"toolbar":{"toolbarCollapse":"Werkbalk inklappen","toolbarExpand":"Werkbalk uitklappen","toolbarGroups":{"document":"Document","clipboard":"Klembord/Ongedaan maken","editing":"Bewerken","forms":"Formulieren","basicstyles":"Basisstijlen","paragraph":"Paragraaf","links":"Links","insert":"Invoegen","styles":"Stijlen","colors":"Kleuren","tools":"Toepassingen"},"toolbars":"Werkbalken"},"table":{"border":"Randdikte","caption":"Titel","cell":{"menu":"Cel","insertBefore":"Voeg cel in voor","insertAfter":"Voeg cel in na","deleteCell":"Cellen verwijderen","merge":"Cellen samenvoegen","mergeRight":"Voeg samen naar rechts","mergeDown":"Voeg samen naar beneden","splitHorizontal":"Splits cel horizontaal","splitVertical":"Splits cel vertikaal","title":"Celeigenschappen","cellType":"Celtype","rowSpan":"Rijen samenvoegen","colSpan":"Kolommen samenvoegen","wordWrap":"Automatische terugloop","hAlign":"Horizontale uitlijning","vAlign":"Verticale uitlijning","alignBaseline":"Tekstregel","bgColor":"Achtergrondkleur","borderColor":"Randkleur","data":"Gegevens","header":"Kop","yes":"Ja","no":"Nee","invalidWidth":"De celbreedte moet een getal zijn.","invalidHeight":"De celhoogte moet een getal zijn.","invalidRowSpan":"Rijen samenvoegen moet een heel getal zijn.","invalidColSpan":"Kolommen samenvoegen moet een heel getal zijn.","chooseColor":"Kies"},"cellPad":"Celopvulling","cellSpace":"Celafstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Kolommen verwijderen"},"columns":"Kolommen","deleteTable":"Tabel verwijderen","headers":"Koppen","headersBoth":"Beide","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste rij","invalidBorder":"De randdikte moet een getal zijn.","invalidCellPadding":"Celopvulling moet een getal zijn.","invalidCellSpacing":"Celafstand moet een getal zijn.","invalidCols":"Het aantal kolommen moet een getal zijn groter dan 0.","invalidHeight":"De tabelhoogte moet een getal zijn.","invalidRows":"Het aantal rijen moet een getal zijn groter dan 0.","invalidWidth":"De tabelbreedte moet een getal zijn.","menu":"Tabeleigenschappen","row":{"menu":"Rij","insertBefore":"Voeg rij in voor","insertAfter":"Voeg rij in na","deleteRow":"Rijen verwijderen"},"rows":"Rijen","summary":"Samenvatting","title":"Tabeleigenschappen","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"eenheid breedte"},"stylescombo":{"label":"Stijl","panelTitle":"Opmaakstijlen","panelTitle1":"Blok stijlen","panelTitle2":"Inline stijlen","panelTitle3":"Object stijlen"},"specialchar":{"options":"Speciale tekens opties","title":"Selecteer speciaal teken","toolbar":"Speciaal teken invoegen"},"sourcedialog":{"toolbar":"Broncode","title":"Broncode"},"sourcearea":{"toolbar":"Broncode"},"showblocks":{"toolbar":"Toon blokken"},"removeformat":{"toolbar":"Opmaak verwijderen"},"pastetext":{"button":"Plakken als platte tekst","title":"Plakken als platte tekst"},"pastefromword":{"confirmCleanup":"De tekst die u wilt plakken lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?","error":"Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout","title":"Plakken vanuit Word","toolbar":"Plakken vanuit Word"},"maximize":{"maximize":"Maximaliseren","minimize":"Minimaliseren"},"magicline":{"title":"Hier paragraaf invoeren"},"list":{"bulletedlist":"Opsomming invoegen","numberedlist":"Genummerde lijst invoegen"},"language":{"button":"Taal instellen","remove":"Taal verwijderen"},"justify":{"block":"Uitvullen","center":"Centreren","left":"Links uitlijnen","right":"Rechts uitlijnen"},"indent":{"indent":"Inspringing vergroten","outdent":"Inspringing verkleinen"},"image2":{"alt":"Alternatieve tekst","btnUpload":"Naar server verzenden","captioned":"Afbeelding met onderschrift","captionPlaceholder":"Onderschrift","infoTab":"Afbeeldingsinformatie","lockRatio":"Verhouding vergrendelen","menu":"Eigenschappen afbeelding","pathName":"afbeelding","pathNameCaption":"onderschrift","resetSize":"Afmetingen herstellen","resizer":"Klik en sleep om te herschalen","title":"Afbeeldingseigenschappen","uploadTab":"Uploaden","urlMissing":"De URL naar de afbeelding ontbreekt.","altMissing":"Alternatieve tekst ontbreekt."},"horizontalrule":{"toolbar":"Horizontale lijn invoegen"},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Kop 1","tag_h2":"Kop 2","tag_h3":"Kop 3","tag_h4":"Kop 4","tag_h5":"Kop 5","tag_h6":"Kop 6","tag_p":"Normaal","tag_pre":"Met opmaak"},"elementspath":{"eleLabel":"Elementenpad","eleTitle":"%1 element"},"contextmenu":{"options":"Contextmenu opties"},"clipboard":{"copy":"Kopiëren","copyError":"De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.","cut":"Knippen","cutError":"De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.","paste":"Plakken","pasteArea":"Plakgebied","pasteMsg":"Plak de tekst in het volgende vak gebruikmakend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op OK.","securityMsg":"Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.","title":"Plakken"},"button":{"selectedLabel":"%1 (Geselecteerd)"},"blockquote":{"toolbar":"Citaatblok"},"basicstyles":{"bold":"Vet","italic":"Cursief","strike":"Doorhalen","subscript":"Subscript","superscript":"Superscript","underline":"Onderstrepen"},"about":{"copy":"Copyright &copy; $1. Alle rechten voorbehouden.","dlgTitle":"Over CKEditor","help":"Bekijk de $1 voor hulp.","moreInfo":"Bezoek onze website voor licentieinformatie:","title":"Over CKEditor","userGuide":"CKEditor gebruiksaanwijzing"},"editor":"Tekstverwerker","editorPanel":"Tekstverwerker beheerpaneel","common":{"editorHelp":"Druk ALT 0 voor hulp","browseServer":"Bladeren op server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Naar server verzenden","image":"Afbeelding","flash":"Flash","form":"Formulier","checkbox":"Selectievinkje","radio":"Keuzerondje","textField":"Tekstveld","textarea":"Tekstvak","hiddenField":"Verborgen veld","button":"Knop","select":"Selectieveld","imageButton":"Afbeeldingsknop","notSet":"<niet ingevuld>","id":"Id","name":"Naam","langDir":"Schrijfrichting","langDirLtr":"Links naar rechts (LTR)","langDirRtl":"Rechts naar links (RTL)","langCode":"Taalcode","longDescr":"Lange URL-omschrijving","cssClass":"Stylesheet-klassen","advisoryTitle":"Adviserende titel","cssStyle":"Stijl","ok":"OK","cancel":"Annuleren","close":"Sluiten","preview":"Voorbeeld","resize":"Sleep om te herschalen","generalTab":"Algemeen","advancedTab":"Geavanceerd","validateNumberFailed":"Deze waarde is geen geldig getal.","confirmNewPage":"Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?","confirmCancel":"Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?","options":"Opties","target":"Doelvenster","targetNew":"Nieuw venster (_blank)","targetTop":"Hele venster (_top)","targetSelf":"Zelfde venster (_self)","targetParent":"Origineel venster (_parent)","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","styles":"Stijl","cssClasses":"Stylesheet-klassen","width":"Breedte","height":"Hoogte","align":"Uitlijning","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Centreren","alignJustify":"Uitvullen","alignTop":"Boven","alignMiddle":"Midden","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde.","invalidHeight":"De hoogte moet een getal zijn.","invalidWidth":"De breedte moet een getal zijn.","invalidCssLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).","invalidHtmlLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).","invalidInlineStyle":"Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat \"naam : waarde\", gescheiden door puntkomma's.","cssLengthTooltip":"Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, niet beschikbaar</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Spatie","35":"End","36":"Home","46":"Verwijderen","224":"Command"},"keyboardShortcut":"Sneltoets"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/no.js b/web/core/assets/vendor/ckeditor/lang/no.js
index f835ab158..a701505ae 100644
--- a/web/core/assets/vendor/ckeditor/lang/no.js
+++ b/web/core/assets/vendor/ckeditor/lang/no.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['no']={"widget":{"move":"Klikk og dra for å flytte","label":"%1 widget"},"undo":{"redo":"Gjør om","undo":"Angre"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis blokker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"magicline":{"title":"Sett inn nytt avsnitt her"},"list":{"bulletedlist":"Legg til/Fjern punktmerket liste","numberedlist":"Legg til/Fjern nummerert liste"},"language":{"button":"Sett språk","remove":"Fjern språk"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"image2":{"alt":"Alternativ tekst","btnUpload":"Send det til serveren","captioned":"Bilde med bildetekst","captionPlaceholder":"Caption","infoTab":"Bildeinformasjon","lockRatio":"Lås forhold","menu":"Bildeegenskaper","pathName":"bilde","pathNameCaption":"bildetekst","resetSize":"Tilbakestill størrelse","resizer":"Klikk og dra for å endre størrelse","title":"Bildeegenskaper","uploadTab":"Last opp","urlMissing":"Bildets adresse mangler."},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk snarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blokksitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla igjennom server","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>"}};
\ No newline at end of file
+CKEDITOR.lang['no']={"widget":{"move":"Klikk og dra for å flytte","label":"Widget %1"},"undo":{"redo":"Gjør om","undo":"Angre"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis blokker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"magicline":{"title":"Sett inn nytt avsnitt her"},"list":{"bulletedlist":"Legg til/Fjern punktmerket liste","numberedlist":"Legg til/Fjern nummerert liste"},"language":{"button":"Sett språk","remove":"Fjern språk"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"image2":{"alt":"Alternativ tekst","btnUpload":"Send det til serveren","captioned":"Bilde med bildetekst","captionPlaceholder":"Caption","infoTab":"Bildeinformasjon","lockRatio":"Lås forhold","menu":"Bildeegenskaper","pathName":"bilde","pathNameCaption":"bildetekst","resetSize":"Tilbakestill størrelse","resizer":"Klikk og dra for å endre størrelse","title":"Bildeegenskaper","uploadTab":"Last opp","urlMissing":"Bildets adresse mangler.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk snarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Valgt)"},"blockquote":{"toolbar":"Blokksitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla igjennom server","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/oc.js b/web/core/assets/vendor/ckeditor/lang/oc.js
new file mode 100644
index 000000000..182f8bb1f
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/lang/oc.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.lang['oc']={"widget":{"move":"Clicar e lisar per desplaçar","label":"Element %1"},"undo":{"redo":"Refar","undo":"Restablir"},"toolbar":{"toolbarCollapse":"Enrotlar la barra d'aisinas","toolbarExpand":"Desenrotlar la barra d'aisinas","toolbarGroups":{"document":"Document","clipboard":"Quichapapièr/Desfar","editing":"Edicion","forms":"Formularis","basicstyles":"Estils de basa","paragraph":"Paragraf","links":"Ligams","insert":"Inserir","styles":"Estils","colors":"Colors","tools":"Aisinas"},"toolbars":"Barras d'aisinas de l'editor"},"table":{"border":"Talha de la bordadura","caption":"Títol del tablèu","cell":{"menu":"Cellula","insertBefore":"Inserir una cellula abans","insertAfter":"Inserir una cellula aprèp","deleteCell":"Suprimir las cellulas","merge":"Fusionar las cellulas","mergeRight":"Fusionar cap a dreita","mergeDown":"Fusionar cap aval","splitHorizontal":"Separar la cellula orizontalament","splitVertical":"Separar la cellula verticalament","title":"Proprietats de la cellula","cellType":"Tipe de cellula","rowSpan":"Linhas ocupadas","colSpan":"Colomnas ocupadas","wordWrap":"Cesura","hAlign":"Alinhament orizontal","vAlign":"Alinhament vertical","alignBaseline":"Linha de basa","bgColor":"Color de rèireplan","borderColor":"Color de bordadura","data":"Donadas","header":"Entèsta","yes":"Òc","no":"Non","invalidWidth":"La largor de la cellula deu èsser un nombre.","invalidHeight":"La nautor de la cellula deu èsser un nombre.","invalidRowSpan":"Lo nombre de linhas ocupadas deu èsser un nombre entièr.","invalidColSpan":"Lo nombre de colomnas ocupadas deu èsser un nombre entièr.","chooseColor":"Causir"},"cellPad":"Marge intèrne de las cellulas","cellSpace":"Espaçament entre las cellulas","column":{"menu":"Colomna","insertBefore":"Inserir una colomna abans","insertAfter":"Inserir una colomna aprèp","deleteColumn":"Suprimir las colomnas"},"columns":"Colomnas","deleteTable":"Suprimir lo tablèu","headers":"Entèstas","headersBoth":"Los dos","headersColumn":"Primièra colomna","headersNone":"Pas cap","headersRow":"Primièra linha","invalidBorder":"La talha de la bordadura deu èsser un nombre.","invalidCellPadding":"Lo marge intèrne de las cellulas deu èsser un nombre positiu.","invalidCellSpacing":"L'espaçament entre las cellulas deu èsser un nombre positiu.","invalidCols":"Lo nombre de colomnas deu èsser superior a 0.","invalidHeight":"La nautor del tablèu deu èsser un nombre.","invalidRows":"Lo nombre de linhas deu èsser superior a 0.","invalidWidth":"La largor del tablèu deu èsser un nombre.","menu":"Proprietats del tablèu","row":{"menu":"Linha","insertBefore":"Inserir una linha abans","insertAfter":"Inserir una linha aprèp","deleteRow":"Suprimir las linhas"},"rows":"Linhas","summary":"Resumit (descripcion)","title":"Proprietats del tablèu","toolbar":"Tablèu","widthPc":"per cent","widthPx":"pixèls","widthUnit":"unitat de largor"},"stylescombo":{"label":"Estils","panelTitle":"Estils de mesa en pagina","panelTitle1":"Estils de blòt","panelTitle2":"Estils en linha","panelTitle3":"Estils d'objècte"},"specialchar":{"options":"Opcions dels caractèrs especials","title":"Seleccionar un caractèr","toolbar":"Inserir un caractèr especial"},"sourcedialog":{"toolbar":"Font","title":"Font"},"sourcearea":{"toolbar":"Font"},"showblocks":{"toolbar":"Afichar los blòts"},"removeformat":{"toolbar":"Suprimir la mesa en forma"},"pastetext":{"button":"Pegar coma tèxte brut","title":"Pegar coma tèxte brut"},"pastefromword":{"confirmCleanup":"Sembla que lo tèxte de pegar proven de Word. Lo volètz netejar abans de lo pegar ?","error":"Las donadas pegadas an pas pogut èsser netejadas a causa d'una error intèrna","title":"Pegar dempuèi Word","toolbar":"Pegar dempuèi Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Inserir un paragraf aicí"},"list":{"bulletedlist":"Inserir/Suprimir una lista amb de piuses","numberedlist":"Inserir/Suprimir una lista numerotada"},"language":{"button":"Definir la lenga","remove":"Suprimir la lenga"},"justify":{"block":"Justificar","center":"Centrar","left":"Alinhar a esquèrra","right":"Alinhar a dreita"},"indent":{"indent":"Aumentar l'alinèa","outdent":"Dmesir l'alinèa"},"image2":{"alt":"Tèxte alternatiu","btnUpload":"Mandar sul servidor","captioned":"Imatge amb legenda","captionPlaceholder":"Legenda","infoTab":"Informacions sus l'imatge","lockRatio":"Conservar las proporcions","menu":"Proprietats de l'imatge","pathName":"imatge","pathNameCaption":"legenda","resetSize":"Reïnicializar la talha","resizer":"Clicar e lisar per redimensionar","title":"Proprietats de l'imatge","uploadTab":"Mandar","urlMissing":"L'URL font de l'imatge es mancanta.","altMissing":"Lo tèxte alternatiu es mancant."},"horizontalrule":{"toolbar":"Inserir una linha orizontala"},"format":{"label":"Format","panelTitle":"Format de paragraf","tag_address":"Adreça","tag_div":"Division (DIV)","tag_h1":"Títol 1","tag_h2":"Títol 2","tag_h3":"Títol 3","tag_h4":"Títol 4","tag_h5":"Títol 5","tag_h6":"Títol 6","tag_p":"Normal","tag_pre":"Preformatat"},"elementspath":{"eleLabel":"Camin dels elements","eleTitle":"Element %1"},"contextmenu":{"options":"Opcions del menú contextual"},"clipboard":{"copy":"Copiar","copyError":"Los paramètres de seguretat de vòstre navigador autorizan pas l'editor a executar automaticament l'operacion « Copiar ». Utilizatz l'acorchi de clavièr a aqueste efièit (Ctrl/Cmd+C).","cut":"Talhar","cutError":"Los paramètres de seguretat de vòstre navigador autorizan pas l'editor a executar automaticament l'operacion « Talhar ». Utilizatz l'acorchi de clavièr a aqueste efièit (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Pegar la zòna","pasteMsg":"Pegatz lo tèxte dins la zòna seguenta en utilizant l'acorchi de clavièr (<strong>Ctrl/Cmd+V</strong>) e clicatz sus D'acòrdi.","securityMsg":"Los paramètres de seguretat de vòstre navigador empach l'editor d'accedir dirèctament a las donadas del quichapapièr. Las vos cal pegar tornamai dins aquesta fenèstra.","title":"Pegar"},"button":{"selectedLabel":"%1 (Seleccionat)"},"blockquote":{"toolbar":"Citacion"},"basicstyles":{"bold":"Gras","italic":"Italica","strike":"Raiat","subscript":"Indici","superscript":"Exponent","underline":"Solinhat"},"about":{"copy":"Copyright &copy; $1. Totes los dreits reservats.","dlgTitle":"A prepaus de CKEditor","help":"Consultar $1 per obténer d'ajuda.","moreInfo":"Per las informacions de licéncia, visitatz nòstre site web :","title":"A prepaus de CKEditor","userGuide":"Guida de l'utilizaire CKEditor (en anglés)"},"editor":"Editor de tèxte enriquit","editorPanel":"Tablèu de bòrd de l'editor de tèxte enriquit","common":{"editorHelp":"Utilisatz l'acorchi Alt-0 per obténer d'ajuda","browseServer":"Percórrer lo servidor","url":"URL","protocol":"Protocòl","upload":"Mandar","uploadSubmit":"Mandar sul servidor","image":"Imatge","flash":"Flash","form":"Formulari","checkbox":"Casa de marcar","radio":"Boton ràdio","textField":"Camp  tèxte","textarea":"Zòna de tèxte","hiddenField":"Camp invisible","button":"Boton","select":"Lista desenrotlanta","imageButton":"Boton amb imatge","notSet":"<indefinit>","id":"Id","name":"Nom","langDir":"Sens d'escritura","langDirLtr":"Esquèrra a dreita (LTR)","langDirRtl":"Dreita a esquèrra (RTL)","langCode":"Còdi de lenga","longDescr":"URL de descripcion longa","cssClass":"Classas d'estil","advisoryTitle":"Infobulla","cssStyle":"Estil","ok":"D'acòrdi","cancel":"Anullar","close":"Tampar","preview":"Previsualizar","resize":"Redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquesta valor es pas un nombre.","confirmNewPage":"Los cambiaments pas salvats seràn perduts. Sètz segur que volètz cargar una novèla pagina ?","confirmCancel":"Certanas opcions son estadas modificadas. Sètz segur que volètz tampar ?","options":"Opcions","target":"Cibla","targetNew":"Novèla fenèstra (_blank)","targetTop":"Fenèstra superiora (_top)","targetSelf":"Meteissa fenèstra (_self)","targetParent":"Fenèstra parent (_parent)","langDirLTR":"Esquèrra a dreita (LTR)","langDirRTL":"Dreita a esquèrra (RTL)","styles":"Estil","cssClasses":"Classas d'estil","width":"Largor","height":"Nautor","align":"Alinhament","alignLeft":"Esquèrra","alignRight":"Dreita","alignCenter":"Centrar","alignJustify":"Justificar","alignTop":"Naut","alignMiddle":"Mitan","alignBottom":"Bas","alignNone":"Pas cap","invalidValue":"Valor invalida.","invalidHeight":"La nautor deu èsser un nombre.","invalidWidth":"La largor deu èsser un nombre.","invalidCssLength":"La valor especificada pel camp « %1 » deu èsser un nombre positiu amb o sens unitat de mesura CSS valid (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"La valor especificada pel camp « %1 » deu èsser un nombre positiu amb o sens unitat de mesura HTML valid (px o %).","invalidInlineStyle":"La valor especificada per l'estil en linha deu èsser compausada d'un o mantun parelh al format « nom : valor », separats per de punts-virgulas.","cssLengthTooltip":"Entrar un nombre per una valor en pixèls o un nombre amb una unitat de mesura CSS valida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Retorn","13":"Entrada","16":"Majuscula","17":"Ctrl","18":"Alt","32":"Espaci","35":"Fin","36":"Origina","46":"Suprimir","224":"Comanda"},"keyboardShortcut":"Acorchi de clavièr"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/pl.js b/web/core/assets/vendor/ckeditor/lang/pl.js
index 7ceef342b..65d176a75 100644
--- a/web/core/assets/vendor/ckeditor/lang/pl.js
+++ b/web/core/assets/vendor/ckeditor/lang/pl.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['pl']={"widget":{"move":"Kliknij i przeciągnij, by przenieść.","label":"Widget %1"},"undo":{"redo":"Ponów","undo":"Cofnij"},"toolbar":{"toolbarCollapse":"Zwiń pasek narzędzi","toolbarExpand":"Rozwiń pasek narzędzi","toolbarGroups":{"document":"Dokument","clipboard":"Schowek/Wstecz","editing":"Edycja","forms":"Formularze","basicstyles":"Style podstawowe","paragraph":"Akapit","links":"Hiperłącza","insert":"Wstawianie","styles":"Style","colors":"Kolory","tools":"Narzędzia"},"toolbars":"Paski narzędzi edytora"},"table":{"border":"Grubość obramowania","caption":"Tytuł","cell":{"menu":"Komórka","insertBefore":"Wstaw komórkę z lewej","insertAfter":"Wstaw komórkę z prawej","deleteCell":"Usuń komórki","merge":"Połącz komórki","mergeRight":"Połącz z komórką z prawej","mergeDown":"Połącz z komórką poniżej","splitHorizontal":"Podziel komórkę poziomo","splitVertical":"Podziel komórkę pionowo","title":"Właściwości komórki","cellType":"Typ komórki","rowSpan":"Scalenie wierszy","colSpan":"Scalenie komórek","wordWrap":"Zawijanie słów","hAlign":"Wyrównanie poziome","vAlign":"Wyrównanie pionowe","alignBaseline":"Linia bazowa","bgColor":"Kolor tła","borderColor":"Kolor obramowania","data":"Dane","header":"Nagłówek","yes":"Tak","no":"Nie","invalidWidth":"Szerokość komórki musi być liczbą.","invalidHeight":"Wysokość komórki musi być liczbą.","invalidRowSpan":"Scalenie wierszy musi być liczbą całkowitą.","invalidColSpan":"Scalenie komórek musi być liczbą całkowitą.","chooseColor":"Wybierz"},"cellPad":"Dopełnienie komórek","cellSpace":"Odstęp pomiędzy komórkami","column":{"menu":"Kolumna","insertBefore":"Wstaw kolumnę z lewej","insertAfter":"Wstaw kolumnę z prawej","deleteColumn":"Usuń kolumny"},"columns":"Liczba kolumn","deleteTable":"Usuń tabelę","headers":"Nagłówki","headersBoth":"Oba","headersColumn":"Pierwsza kolumna","headersNone":"Brak","headersRow":"Pierwszy wiersz","invalidBorder":"Wartość obramowania musi być liczbą.","invalidCellPadding":"Dopełnienie komórek musi być liczbą dodatnią.","invalidCellSpacing":"Odstęp pomiędzy komórkami musi być liczbą dodatnią.","invalidCols":"Liczba kolumn musi być większa niż 0.","invalidHeight":"Wysokość tabeli musi być liczbą.","invalidRows":"Liczba wierszy musi być większa niż 0.","invalidWidth":"Szerokość tabeli musi być liczbą.","menu":"Właściwości tabeli","row":{"menu":"Wiersz","insertBefore":"Wstaw wiersz powyżej","insertAfter":"Wstaw wiersz poniżej","deleteRow":"Usuń wiersze"},"rows":"Liczba wierszy","summary":"Podsumowanie","title":"Właściwości tabeli","toolbar":"Tabela","widthPc":"%","widthPx":"piksele","widthUnit":"jednostka szerokości"},"stylescombo":{"label":"Styl","panelTitle":"Style formatujące","panelTitle1":"Style blokowe","panelTitle2":"Style liniowe","panelTitle3":"Style obiektowe"},"specialchar":{"options":"Opcje znaków specjalnych","title":"Wybierz znak specjalny","toolbar":"Wstaw znak specjalny"},"sourcedialog":{"toolbar":"Źródło dokumentu","title":"Źródło dokumentu"},"sourcearea":{"toolbar":"Źródło dokumentu"},"showblocks":{"toolbar":"Pokaż bloki"},"removeformat":{"toolbar":"Usuń formatowanie"},"pastetext":{"button":"Wklej jako czysty tekst","title":"Wklej jako czysty tekst"},"pastefromword":{"confirmCleanup":"Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Microsoft Word. Czy chcesz go wyczyścić przed wklejeniem?","error":"Wyczyszczenie wklejonych danych nie było możliwe z powodu wystąpienia błędu.","title":"Wklej z programu MS Word","toolbar":"Wklej z programu MS Word"},"maximize":{"maximize":"Maksymalizuj","minimize":"Minimalizuj"},"magicline":{"title":"Wstaw nowy akapit"},"list":{"bulletedlist":"Lista wypunktowana","numberedlist":"Lista numerowana"},"language":{"button":"Ustaw język","remove":"Usuń język"},"justify":{"block":"Wyjustuj","center":"Wyśrodkuj","left":"Wyrównaj do lewej","right":"Wyrównaj do prawej"},"indent":{"indent":"Zwiększ wcięcie","outdent":"Zmniejsz wcięcie"},"image2":{"alt":"Tekst zastępczy","btnUpload":"Wyślij","captioned":"Obrazek z podpisem","captionPlaceholder":"Podpis","infoTab":"Informacje o obrazku","lockRatio":"Zablokuj proporcje","menu":"Właściwości obrazka","pathName":"obrazek","pathNameCaption":"podpis","resetSize":"Przywróć rozmiar","resizer":"Kliknij i przeciągnij, by zmienić rozmiar.","title":"Właściwości obrazka","uploadTab":"Wyślij","urlMissing":"Podaj adres URL obrazka."},"horizontalrule":{"toolbar":"Wstaw poziomą linię"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adres","tag_div":"Normalny (DIV)","tag_h1":"Nagłówek 1","tag_h2":"Nagłówek 2","tag_h3":"Nagłówek 3","tag_h4":"Nagłówek 4","tag_h5":"Nagłówek 5","tag_h6":"Nagłówek 6","tag_p":"Normalny","tag_pre":"Tekst sformatowany"},"elementspath":{"eleLabel":"Ścieżka elementów","eleTitle":"element %1"},"contextmenu":{"options":"Opcje menu kontekstowego"},"clipboard":{"copy":"Kopiuj","copyError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+C.","cut":"Wytnij","cutError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+X.","paste":"Wklej","pasteArea":"Obszar wklejania","pasteMsg":"Wklej tekst w poniższym polu, używając skrótu klawiaturowego (<STRONG>Ctrl/Cmd+V</STRONG>), i kliknij <STRONG>OK</STRONG>.","securityMsg":"Zabezpieczenia przeglądarki uniemożliwiają wklejenie danych bezpośrednio do edytora. Proszę ponownie wkleić dane w tym oknie.","title":"Wklej"},"button":{"selectedLabel":"%1 (Wybrany)"},"blockquote":{"toolbar":"Cytat"},"basicstyles":{"bold":"Pogrubienie","italic":"Kursywa","strike":"Przekreślenie","subscript":"Indeks dolny","superscript":"Indeks górny","underline":"Podkreślenie"},"about":{"copy":"Copyright &copy; $1. Wszelkie prawa zastrzeżone.","dlgTitle":"Informacje o programie CKEditor","help":"Pomoc znajdziesz w $1.","moreInfo":"Informacje na temat licencji można znaleźć na naszej stronie:","title":"Informacje o programie CKEditor","userGuide":"podręczniku użytkownika programu CKEditor"},"editor":"Edytor tekstu sformatowanego","editorPanel":"Panel edytora tekstu sformatowanego","common":{"editorHelp":"W celu uzyskania pomocy naciśnij ALT 0","browseServer":"Przeglądaj","url":"Adres URL","protocol":"Protokół","upload":"Wyślij","uploadSubmit":"Wyślij","image":"Obrazek","flash":"Flash","form":"Formularz","checkbox":"Pole wyboru (checkbox)","radio":"Przycisk opcji (radio)","textField":"Pole tekstowe","textarea":"Obszar tekstowy","hiddenField":"Pole ukryte","button":"Przycisk","select":"Lista wyboru","imageButton":"Przycisk graficzny","notSet":"<nie ustawiono>","id":"Id","name":"Nazwa","langDir":"Kierunek tekstu","langDirLtr":"Od lewej do prawej (LTR)","langDirRtl":"Od prawej do lewej (RTL)","langCode":"Kod języka","longDescr":"Adres URL długiego opisu","cssClass":"Nazwa klasy CSS","advisoryTitle":"Opis obiektu docelowego","cssStyle":"Styl","ok":"OK","cancel":"Anuluj","close":"Zamknij","preview":"Podgląd","resize":"Przeciągnij, aby zmienić rozmiar","generalTab":"Ogólne","advancedTab":"Zaawansowane","validateNumberFailed":"Ta wartość nie jest liczbą.","confirmNewPage":"Wszystkie niezapisane zmiany zostaną utracone. Czy na pewno wczytać nową stronę?","confirmCancel":"Pewne opcje zostały zmienione. Czy na pewno zamknąć okno dialogowe?","options":"Opcje","target":"Obiekt docelowy","targetNew":"Nowe okno (_blank)","targetTop":"Okno najwyżej w hierarchii (_top)","targetSelf":"To samo okno (_self)","targetParent":"Okno nadrzędne (_parent)","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","styles":"Style","cssClasses":"Klasy arkusza stylów","width":"Szerokość","height":"Wysokość","align":"Wyrównaj","alignLeft":"Do lewej","alignRight":"Do prawej","alignCenter":"Do środka","alignJustify":"Wyjustuj","alignTop":"Do góry","alignMiddle":"Do środka","alignBottom":"Do dołu","alignNone":"Brak","invalidValue":"Nieprawidłowa wartość.","invalidHeight":"Wysokość musi być liczbą.","invalidWidth":"Szerokość musi być liczbą.","invalidCssLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","invalidHtmlLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z HTML (px lub %).","invalidInlineStyle":"Wartość podana dla stylu musi składać się z jednej lub większej liczby krotek w formacie \"nazwa : wartość\", rozdzielonych średnikami.","cssLengthTooltip":"Wpisz liczbę dla wartości w pikselach lub liczbę wraz z jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","unavailable":"%1<span class=\"cke_accessibility\">, niedostępne</span>"}};
\ No newline at end of file
+CKEDITOR.lang['pl']={"widget":{"move":"Kliknij i przeciągnij, by przenieść.","label":"Widget %1"},"undo":{"redo":"Ponów","undo":"Cofnij"},"toolbar":{"toolbarCollapse":"Zwiń pasek narzędzi","toolbarExpand":"Rozwiń pasek narzędzi","toolbarGroups":{"document":"Dokument","clipboard":"Schowek/Wstecz","editing":"Edycja","forms":"Formularze","basicstyles":"Style podstawowe","paragraph":"Akapit","links":"Hiperłącza","insert":"Wstawianie","styles":"Style","colors":"Kolory","tools":"Narzędzia"},"toolbars":"Paski narzędzi edytora"},"table":{"border":"Grubość obramowania","caption":"Tytuł","cell":{"menu":"Komórka","insertBefore":"Wstaw komórkę z lewej","insertAfter":"Wstaw komórkę z prawej","deleteCell":"Usuń komórki","merge":"Połącz komórki","mergeRight":"Połącz z komórką z prawej","mergeDown":"Połącz z komórką poniżej","splitHorizontal":"Podziel komórkę poziomo","splitVertical":"Podziel komórkę pionowo","title":"Właściwości komórki","cellType":"Typ komórki","rowSpan":"Scalenie wierszy","colSpan":"Scalenie komórek","wordWrap":"Zawijanie słów","hAlign":"Wyrównanie poziome","vAlign":"Wyrównanie pionowe","alignBaseline":"Linia bazowa","bgColor":"Kolor tła","borderColor":"Kolor obramowania","data":"Dane","header":"Nagłówek","yes":"Tak","no":"Nie","invalidWidth":"Szerokość komórki musi być liczbą.","invalidHeight":"Wysokość komórki musi być liczbą.","invalidRowSpan":"Scalenie wierszy musi być liczbą całkowitą.","invalidColSpan":"Scalenie komórek musi być liczbą całkowitą.","chooseColor":"Wybierz"},"cellPad":"Dopełnienie komórek","cellSpace":"Odstęp pomiędzy komórkami","column":{"menu":"Kolumna","insertBefore":"Wstaw kolumnę z lewej","insertAfter":"Wstaw kolumnę z prawej","deleteColumn":"Usuń kolumny"},"columns":"Liczba kolumn","deleteTable":"Usuń tabelę","headers":"Nagłówki","headersBoth":"Oba","headersColumn":"Pierwsza kolumna","headersNone":"Brak","headersRow":"Pierwszy wiersz","invalidBorder":"Wartość obramowania musi być liczbą.","invalidCellPadding":"Dopełnienie komórek musi być liczbą dodatnią.","invalidCellSpacing":"Odstęp pomiędzy komórkami musi być liczbą dodatnią.","invalidCols":"Liczba kolumn musi być większa niż 0.","invalidHeight":"Wysokość tabeli musi być liczbą.","invalidRows":"Liczba wierszy musi być większa niż 0.","invalidWidth":"Szerokość tabeli musi być liczbą.","menu":"Właściwości tabeli","row":{"menu":"Wiersz","insertBefore":"Wstaw wiersz powyżej","insertAfter":"Wstaw wiersz poniżej","deleteRow":"Usuń wiersze"},"rows":"Liczba wierszy","summary":"Podsumowanie","title":"Właściwości tabeli","toolbar":"Tabela","widthPc":"%","widthPx":"piksele","widthUnit":"jednostka szerokości"},"stylescombo":{"label":"Styl","panelTitle":"Style formatujące","panelTitle1":"Style blokowe","panelTitle2":"Style liniowe","panelTitle3":"Style obiektowe"},"specialchar":{"options":"Opcje znaków specjalnych","title":"Wybierz znak specjalny","toolbar":"Wstaw znak specjalny"},"sourcedialog":{"toolbar":"Źródło dokumentu","title":"Źródło dokumentu"},"sourcearea":{"toolbar":"Źródło dokumentu"},"showblocks":{"toolbar":"Pokaż bloki"},"removeformat":{"toolbar":"Usuń formatowanie"},"pastetext":{"button":"Wklej jako czysty tekst","title":"Wklej jako czysty tekst"},"pastefromword":{"confirmCleanup":"Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Microsoft Word. Czy chcesz go wyczyścić przed wklejeniem?","error":"Wyczyszczenie wklejonych danych nie było możliwe z powodu wystąpienia błędu.","title":"Wklej z programu MS Word","toolbar":"Wklej z programu MS Word"},"maximize":{"maximize":"Maksymalizuj","minimize":"Minimalizuj"},"magicline":{"title":"Wstaw nowy akapit"},"list":{"bulletedlist":"Lista wypunktowana","numberedlist":"Lista numerowana"},"language":{"button":"Ustaw język","remove":"Usuń język"},"justify":{"block":"Wyjustuj","center":"Wyśrodkuj","left":"Wyrównaj do lewej","right":"Wyrównaj do prawej"},"indent":{"indent":"Zwiększ wcięcie","outdent":"Zmniejsz wcięcie"},"image2":{"alt":"Tekst zastępczy","btnUpload":"Wyślij","captioned":"Obrazek z podpisem","captionPlaceholder":"Podpis","infoTab":"Informacje o obrazku","lockRatio":"Zablokuj proporcje","menu":"Właściwości obrazka","pathName":"obrazek","pathNameCaption":"podpis","resetSize":"Przywróć rozmiar","resizer":"Kliknij i przeciągnij, by zmienić rozmiar.","title":"Właściwości obrazka","uploadTab":"Wyślij","urlMissing":"Podaj adres URL obrazka.","altMissing":"Podaj tekst zastępczy obrazka."},"horizontalrule":{"toolbar":"Wstaw poziomą linię"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adres","tag_div":"Normalny (DIV)","tag_h1":"Nagłówek 1","tag_h2":"Nagłówek 2","tag_h3":"Nagłówek 3","tag_h4":"Nagłówek 4","tag_h5":"Nagłówek 5","tag_h6":"Nagłówek 6","tag_p":"Normalny","tag_pre":"Tekst sformatowany"},"elementspath":{"eleLabel":"Ścieżka elementów","eleTitle":"element %1"},"contextmenu":{"options":"Opcje menu kontekstowego"},"clipboard":{"copy":"Kopiuj","copyError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+C.","cut":"Wytnij","cutError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+X.","paste":"Wklej","pasteArea":"Obszar wklejania","pasteMsg":"Wklej tekst w poniższym polu, używając skrótu klawiaturowego (<STRONG>Ctrl/Cmd+V</STRONG>), i kliknij <STRONG>OK</STRONG>.","securityMsg":"Zabezpieczenia przeglądarki uniemożliwiają wklejenie danych bezpośrednio do edytora. Proszę ponownie wkleić dane w tym oknie.","title":"Wklej"},"button":{"selectedLabel":"%1 (Wybrany)"},"blockquote":{"toolbar":"Cytat"},"basicstyles":{"bold":"Pogrubienie","italic":"Kursywa","strike":"Przekreślenie","subscript":"Indeks dolny","superscript":"Indeks górny","underline":"Podkreślenie"},"about":{"copy":"Copyright &copy; $1. Wszelkie prawa zastrzeżone.","dlgTitle":"Informacje o programie CKEditor","help":"Pomoc znajdziesz w $1.","moreInfo":"Informacje na temat licencji można znaleźć na naszej stronie:","title":"Informacje o programie CKEditor","userGuide":"podręczniku użytkownika programu CKEditor"},"editor":"Edytor tekstu sformatowanego","editorPanel":"Panel edytora tekstu sformatowanego","common":{"editorHelp":"W celu uzyskania pomocy naciśnij ALT 0","browseServer":"Przeglądaj","url":"Adres URL","protocol":"Protokół","upload":"Wyślij","uploadSubmit":"Wyślij","image":"Obrazek","flash":"Flash","form":"Formularz","checkbox":"Pole wyboru (checkbox)","radio":"Przycisk opcji (radio)","textField":"Pole tekstowe","textarea":"Obszar tekstowy","hiddenField":"Pole ukryte","button":"Przycisk","select":"Lista wyboru","imageButton":"Przycisk graficzny","notSet":"<nie ustawiono>","id":"Id","name":"Nazwa","langDir":"Kierunek tekstu","langDirLtr":"Od lewej do prawej (LTR)","langDirRtl":"Od prawej do lewej (RTL)","langCode":"Kod języka","longDescr":"Adres URL długiego opisu","cssClass":"Nazwa klasy CSS","advisoryTitle":"Opis obiektu docelowego","cssStyle":"Styl","ok":"OK","cancel":"Anuluj","close":"Zamknij","preview":"Podgląd","resize":"Przeciągnij, aby zmienić rozmiar","generalTab":"Ogólne","advancedTab":"Zaawansowane","validateNumberFailed":"Ta wartość nie jest liczbą.","confirmNewPage":"Wszystkie niezapisane zmiany zostaną utracone. Czy na pewno wczytać nową stronę?","confirmCancel":"Pewne opcje zostały zmienione. Czy na pewno zamknąć okno dialogowe?","options":"Opcje","target":"Obiekt docelowy","targetNew":"Nowe okno (_blank)","targetTop":"Okno najwyżej w hierarchii (_top)","targetSelf":"To samo okno (_self)","targetParent":"Okno nadrzędne (_parent)","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","styles":"Style","cssClasses":"Klasy arkusza stylów","width":"Szerokość","height":"Wysokość","align":"Wyrównaj","alignLeft":"Do lewej","alignRight":"Do prawej","alignCenter":"Do środka","alignJustify":"Wyjustuj","alignTop":"Do góry","alignMiddle":"Do środka","alignBottom":"Do dołu","alignNone":"Brak","invalidValue":"Nieprawidłowa wartość.","invalidHeight":"Wysokość musi być liczbą.","invalidWidth":"Szerokość musi być liczbą.","invalidCssLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","invalidHtmlLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z HTML (px lub %).","invalidInlineStyle":"Wartość podana dla stylu musi składać się z jednej lub większej liczby krotek w formacie \"nazwa : wartość\", rozdzielonych średnikami.","cssLengthTooltip":"Wpisz liczbę dla wartości w pikselach lub liczbę wraz z jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","unavailable":"%1<span class=\"cke_accessibility\">, niedostępne</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"spacja","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Skrót klawiszowy"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/pt-br.js b/web/core/assets/vendor/ckeditor/lang/pt-br.js
index ceb38ac62..a24f570ee 100644
--- a/web/core/assets/vendor/ckeditor/lang/pt-br.js
+++ b/web/core/assets/vendor/ckeditor/lang/pt-br.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['pt-br']={"widget":{"move":"Click e arraste para mover","label":"%1 widget"},"undo":{"redo":"Refazer","undo":"Desfazer"},"toolbar":{"toolbarCollapse":"Diminuir Barra de Ferramentas","toolbarExpand":"Aumentar Barra de Ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Clipboard/Desfazer","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Paragrafo","links":"Links","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barra de Ferramentas do Editor"},"table":{"border":"Borda","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula a esquerda","insertAfter":"Inserir célula a direita","deleteCell":"Remover Células","merge":"Mesclar Células","mergeRight":"Mesclar com célula a direita","mergeDown":"Mesclar com célula abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas cobertas","colSpan":"Colunas cobertas","wordWrap":"Quebra de palavra","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Patamar de alinhamento","bgColor":"Cor de fundo","borderColor":"Cor das bordas","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula tem que ser um número.","invalidHeight":"A altura da célula tem que ser um número.","invalidRowSpan":"Linhas cobertas tem que ser um número inteiro.","invalidColSpan":"Colunas cobertas tem que ser um número inteiro.","chooseColor":"Escolher"},"cellPad":"Margem interna","cellSpace":"Espaçamento","column":{"menu":"Coluna","insertBefore":"Inserir coluna a esquerda","insertAfter":"Inserir coluna a direita","deleteColumn":"Remover Colunas"},"columns":"Colunas","deleteTable":"Apagar Tabela","headers":"Cabeçalho","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da borda tem que ser um número.","invalidCellPadding":"A margem interna das células tem que ser um número.","invalidCellSpacing":"O espaçamento das células tem que ser um número.","invalidCols":"O número de colunas tem que ser um número maior que 0.","invalidHeight":"A altura da tabela tem que ser um número.","invalidRows":"O número de linhas tem que ser um número maior que 0.","invalidWidth":"A largura da tabela tem que ser um número.","menu":"Formatar Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha acima","insertAfter":"Inserir linha abaixo","deleteRow":"Remover Linhas"},"rows":"Linhas","summary":"Resumo","title":"Formatar Tabela","toolbar":"Tabela","widthPc":"%","widthPx":"pixels","widthUnit":"unidade largura"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de texto corrido","panelTitle3":"Estilos de objeto"},"specialchar":{"options":"Opções de Caractere Especial","title":"Selecione um Caractere Especial","toolbar":"Inserir Caractere Especial"},"sourcedialog":{"toolbar":"Código-Fonte","title":"Código-Fonte"},"sourcearea":{"toolbar":"Código-Fonte"},"showblocks":{"toolbar":"Mostrar blocos de código"},"removeformat":{"toolbar":"Remover Formatação"},"pastetext":{"button":"Colar como Texto sem Formatação","title":"Colar como Texto sem Formatação"},"pastefromword":{"confirmCleanup":"O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?","error":"Não foi possível limpar os dados colados devido a um erro interno","title":"Colar do Word","toolbar":"Colar do Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimize"},"magicline":{"title":"Insera um parágrafo aqui"},"list":{"bulletedlist":"Lista sem números","numberedlist":"Lista numerada"},"language":{"button":"Configure o Idioma","remove":"Remover Idioma"},"justify":{"block":"Justificado","center":"Centralizar","left":"Alinhar Esquerda","right":"Alinhar Direita"},"indent":{"indent":"Aumentar Recuo","outdent":"Diminuir Recuo"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar para o Servidor","captioned":"Legenda da Imagem","captionPlaceholder":"Legenda","infoTab":"Informações da Imagem","lockRatio":"Travar Proporções","menu":"Formatar Imagem","pathName":"Imagem","pathNameCaption":"Legenda","resetSize":"Redefinir para o Tamanho Original","resizer":"Click e arraste para redimensionar","title":"Formatar Imagem","uploadTab":"Enviar ao Servidor","urlMissing":"URL da imagem está faltando."},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"format":{"label":"Formatação","panelTitle":"Formatação","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Caminho dos Elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Opções Menu de Contexto"},"clipboard":{"copy":"Copiar","copyError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).","cut":"Recortar","cutError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Área para Colar","pasteMsg":"Transfira o link usado na caixa usando o teclado com (<STRONG>Ctrl/Cmd+V</STRONG>) e <STRONG>OK</STRONG>.","securityMsg":"As configurações de segurança do seu navegador não permitem que o editor acesse os dados da área de transferência diretamente. Por favor cole o conteúdo manualmente nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"blockquote":{"toolbar":"Citação"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Tachado","subscript":"Subscrito","superscript":"Sobrescrito","underline":"Sublinhado"},"about":{"copy":"Copyright &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Verifique o $1 para obter ajuda.","moreInfo":"Para informações sobre a licença por favor visite o nosso site:","title":"Sobre o CKEditor","userGuide":"Guia do Usuário do CKEditor"},"editor":"Editor de Rich Text","editorPanel":"Painel do editor de Rich Text","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Localizar no Servidor","url":"URL","protocol":"Protocolo","upload":"Enviar ao Servidor","uploadSubmit":"Enviar para o Servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão de Opção","textField":"Caixa de Texto","textarea":"Área de Texto","hiddenField":"Campo Oculto","button":"Botão","select":"Caixa de Listagem","imageButton":"Botão de Imagem","notSet":"<não ajustado>","id":"Id","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para Direita (LTR)","langDirRtl":"Direita para Esquerda (RTL)","langCode":"Idioma","longDescr":"Descrição da URL","cssClass":"Classe de CSS","advisoryTitle":"Título","cssStyle":"Estilos","ok":"OK","cancel":"Cancelar","close":"Fechar","preview":"Visualizar","resize":"Arraste para redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um número.","confirmNewPage":"Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?","confirmCancel":"Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela de Cima (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Pai (_parent)","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","styles":"Estilo","cssClasses":"Classes","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centralizado","alignJustify":"Justificar","alignTop":"Superior","alignMiddle":"Centralizado","alignBottom":"Inferior","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura tem que ser um número","invalidWidth":"A largura tem que ser um número.","invalidCssLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","invalidHtmlLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px ou %).","invalidInlineStyle":"O valor válido para estilo deve conter uma ou mais tuplas no formato \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>"}};
\ No newline at end of file
+CKEDITOR.lang['pt-br']={"widget":{"move":"Click e arraste para mover","label":"%1 widget"},"undo":{"redo":"Refazer","undo":"Desfazer"},"toolbar":{"toolbarCollapse":"Diminuir Barra de Ferramentas","toolbarExpand":"Aumentar Barra de Ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Clipboard/Desfazer","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Paragrafo","links":"Links","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barra de Ferramentas do Editor"},"table":{"border":"Borda","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula a esquerda","insertAfter":"Inserir célula a direita","deleteCell":"Remover Células","merge":"Mesclar Células","mergeRight":"Mesclar com célula a direita","mergeDown":"Mesclar com célula abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas cobertas","colSpan":"Colunas cobertas","wordWrap":"Quebra de palavra","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Patamar de alinhamento","bgColor":"Cor de fundo","borderColor":"Cor das bordas","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula tem que ser um número.","invalidHeight":"A altura da célula tem que ser um número.","invalidRowSpan":"Linhas cobertas tem que ser um número inteiro.","invalidColSpan":"Colunas cobertas tem que ser um número inteiro.","chooseColor":"Escolher"},"cellPad":"Margem interna","cellSpace":"Espaçamento","column":{"menu":"Coluna","insertBefore":"Inserir coluna a esquerda","insertAfter":"Inserir coluna a direita","deleteColumn":"Remover Colunas"},"columns":"Colunas","deleteTable":"Apagar Tabela","headers":"Cabeçalho","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da borda tem que ser um número.","invalidCellPadding":"A margem interna das células tem que ser um número.","invalidCellSpacing":"O espaçamento das células tem que ser um número.","invalidCols":"O número de colunas tem que ser um número maior que 0.","invalidHeight":"A altura da tabela tem que ser um número.","invalidRows":"O número de linhas tem que ser um número maior que 0.","invalidWidth":"A largura da tabela tem que ser um número.","menu":"Formatar Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha acima","insertAfter":"Inserir linha abaixo","deleteRow":"Remover Linhas"},"rows":"Linhas","summary":"Resumo","title":"Formatar Tabela","toolbar":"Tabela","widthPc":"%","widthPx":"pixels","widthUnit":"unidade largura"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de texto corrido","panelTitle3":"Estilos de objeto"},"specialchar":{"options":"Opções de Caractere Especial","title":"Selecione um Caractere Especial","toolbar":"Inserir Caractere Especial"},"sourcedialog":{"toolbar":"Código-Fonte","title":"Código-Fonte"},"sourcearea":{"toolbar":"Código-Fonte"},"showblocks":{"toolbar":"Mostrar blocos de código"},"removeformat":{"toolbar":"Remover Formatação"},"pastetext":{"button":"Colar como Texto sem Formatação","title":"Colar como Texto sem Formatação"},"pastefromword":{"confirmCleanup":"O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?","error":"Não foi possível limpar os dados colados devido a um erro interno","title":"Colar do Word","toolbar":"Colar do Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimize"},"magicline":{"title":"Insera um parágrafo aqui"},"list":{"bulletedlist":"Lista sem números","numberedlist":"Lista numerada"},"language":{"button":"Configure o Idioma","remove":"Remover Idioma"},"justify":{"block":"Justificado","center":"Centralizar","left":"Alinhar Esquerda","right":"Alinhar Direita"},"indent":{"indent":"Aumentar Recuo","outdent":"Diminuir Recuo"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar para o Servidor","captioned":"Legenda da Imagem","captionPlaceholder":"Legenda","infoTab":"Informações da Imagem","lockRatio":"Travar Proporções","menu":"Formatar Imagem","pathName":"Imagem","pathNameCaption":"Legenda","resetSize":"Redefinir para o Tamanho Original","resizer":"Click e arraste para redimensionar","title":"Formatar Imagem","uploadTab":"Enviar ao Servidor","urlMissing":"URL da imagem está faltando.","altMissing":"Texto alternativo não informado."},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"format":{"label":"Formatação","panelTitle":"Formatação","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Caminho dos Elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Opções Menu de Contexto"},"clipboard":{"copy":"Copiar","copyError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).","cut":"Recortar","cutError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Área para Colar","pasteMsg":"Transfira o link usado na caixa usando o teclado com (<STRONG>Ctrl/Cmd+V</STRONG>) e <STRONG>OK</STRONG>.","securityMsg":"As configurações de segurança do seu navegador não permitem que o editor acesse os dados da área de transferência diretamente. Por favor cole o conteúdo manualmente nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"blockquote":{"toolbar":"Citação"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Tachado","subscript":"Subscrito","superscript":"Sobrescrito","underline":"Sublinhado"},"about":{"copy":"Copyright &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Verifique o $1 para obter ajuda.","moreInfo":"Para informações sobre a licença por favor visite o nosso site:","title":"Sobre o CKEditor","userGuide":"Guia do Usuário do CKEditor"},"editor":"Editor de Rich Text","editorPanel":"Painel do editor de Rich Text","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Localizar no Servidor","url":"URL","protocol":"Protocolo","upload":"Enviar ao Servidor","uploadSubmit":"Enviar para o Servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão de Opção","textField":"Caixa de Texto","textarea":"Área de Texto","hiddenField":"Campo Oculto","button":"Botão","select":"Caixa de Listagem","imageButton":"Botão de Imagem","notSet":"<não ajustado>","id":"Id","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para Direita (LTR)","langDirRtl":"Direita para Esquerda (RTL)","langCode":"Idioma","longDescr":"Descrição da URL","cssClass":"Classe de CSS","advisoryTitle":"Título","cssStyle":"Estilos","ok":"OK","cancel":"Cancelar","close":"Fechar","preview":"Visualizar","resize":"Arraste para redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um número.","confirmNewPage":"Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?","confirmCancel":"Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela de Cima (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Pai (_parent)","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","styles":"Estilo","cssClasses":"Classes","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centralizado","alignJustify":"Justificar","alignTop":"Superior","alignMiddle":"Centralizado","alignBottom":"Inferior","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura tem que ser um número","invalidWidth":"A largura tem que ser um número.","invalidCssLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","invalidHtmlLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px ou %).","invalidInlineStyle":"O valor válido para estilo deve conter uma ou mais tuplas no formato \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>","keyboard":{"8":"Tecla Retroceder","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Tecla Espaço","35":"End","36":"Home","46":"Delete","224":"Comando"},"keyboardShortcut":"Atalho do teclado"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/pt.js b/web/core/assets/vendor/ckeditor/lang/pt.js
index a79711238..b4642f70f 100644
--- a/web/core/assets/vendor/ckeditor/lang/pt.js
+++ b/web/core/assets/vendor/ckeditor/lang/pt.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['pt']={"widget":{"move":"Clique e arraste para mover","label":"%1 widget"},"undo":{"redo":"Refazer","undo":"Anular"},"toolbar":{"toolbarCollapse":"Ocultar barra de ferramentas","toolbarExpand":"Expandir barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Área de transferência/Anular","editing":"Edição","forms":"Formulários","basicstyles":"Estilos básicos","paragraph":"Parágrafo","links":"Hiperligações","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Editor de barras de ferramentas"},"table":{"border":"Tamanho do contorno","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula antes","insertAfter":"Inserir célula depois","deleteCell":"Apagar células","merge":"Unir células","mergeRight":"Unir à direita","mergeDown":"Fundir abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas na célula","colSpan":"Colunas na célula","wordWrap":"Moldar texto","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Base","bgColor":"Cor de fundo","borderColor":"Cor da margem","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula deve ser um número.","invalidHeight":"A altura da célula deve ser um número.","invalidRowSpan":"As filas da célula deve ter um número inteiro.","invalidColSpan":"As colunas da célula devem ter um número inteiro.","chooseColor":"Escolher"},"cellPad":"Espaço interior","cellSpace":"Espaçamento de célula","column":{"menu":"Coluna","insertBefore":"Inserir coluna antes","insertAfter":"Inserir coluna depois","deleteColumn":"Apagar colunas"},"columns":"Colunas","deleteTable":"Apagar tabela","headers":"Cabeçalhos","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da margem tem de ser um número.","invalidCellPadding":"A criação do espaço na célula deve ser um número positivo.","invalidCellSpacing":"O espaçamento da célula deve ser um número positivo.","invalidCols":"O número de colunas tem de ser um número maior que 0.","invalidHeight":"A altura da tabela tem de ser um número.","invalidRows":"O número de linhas tem de ser maior que 0.","invalidWidth":"A largura da tabela tem de ser um número.","menu":"Propriedades da tabela","row":{"menu":"Linha","insertBefore":"Inserir linha antes","insertAfter":"Inserir linha depois","deleteRow":"Apagar linhas"},"rows":"Linhas","summary":"Resumo","title":"Propriedades da tabela","toolbar":"Tabela","widthPc":"percentagem","widthPx":"pixéis","widthUnit":"unidade da largura"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de Linha","panelTitle3":"Estilos de Objeto"},"specialchar":{"options":"Opções de caracteres especiais","title":"Selecione um caracter especial","toolbar":"Inserir carácter especial"},"sourcedialog":{"toolbar":"Fonte","title":"Fonte"},"sourcearea":{"toolbar":"Fonte"},"showblocks":{"toolbar":"Exibir blocos"},"removeformat":{"toolbar":"Limpar formatação"},"pastetext":{"button":"Colar como texto simples","title":"Colar como texto simples"},"pastefromword":{"confirmCleanup":"O texto que pretende colar parece ter sido copiado do Word. Deseja limpá-lo antes de colar?","error":"Não foi possivel limpar a informação colada decido a um erro interno.","title":"Colar do Word","toolbar":"Colar do Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Insira aqui o parágrafo"},"list":{"bulletedlist":"Marcas","numberedlist":"Numeração"},"language":{"button":"Definir Idioma","remove":"Remover idioma"},"justify":{"block":"Justificado","center":"Alinhar ao centro","left":"Alinhar à esquerda","right":"Alinhar à direita"},"indent":{"indent":"Aumentar avanço","outdent":"Diminuir avanço"},"image2":{"alt":"Texto alternativo","btnUpload":"Enviar para o servidor","captioned":"Imagem legendada","captionPlaceholder":"Legenda","infoTab":"Informação da imagem","lockRatio":"Proporcional","menu":"Propriedades da imagem","pathName":"imagem","pathNameCaption":"legenda","resetSize":"Tamanho original","resizer":"Clique e arraste para redimensionar","title":"Propriedades da imagem","uploadTab":"Carregar","urlMissing":"O URL da fonte da imagem está em falta."},"horizontalrule":{"toolbar":"Inserir linha horizontal"},"format":{"label":"Formatar","panelTitle":"Formatar Parágrafo","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Caminho dos elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Menu de opções de contexto"},"clipboard":{"copy":"Copiar","copyError":"A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Colar área","pasteMsg":"Por favor, cole dentro da seguinte caixa usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e carregue em <STRONG>OK</STRONG>.","securityMsg":"Devido ás definições de segurança do teu browser, o editor não pode aceder ao clipboard diretamente. É necessário que voltes a colar as informações nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"blockquote":{"toolbar":"Bloco de citação"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Rasurado","subscript":"Superior à linha","superscript":"Superior à linha","underline":"Sublinhado"},"about":{"copy":"Direitos de Autor &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Doar $1 para ajudar.","moreInfo":"Para informação sobre licenciamento visite o nosso sítio web:","title":"Sobre o CKEditor","userGuide":"CKEditor - Guia do utilizador"},"editor":"Editor de texto enriquecido","editorPanel":"Painel do editor de texto enriquecido","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Navegar no servidor","url":"URL","protocol":"Protocolo","upload":"Carregar","uploadSubmit":"Enviar para o servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de verificação","radio":"Botão","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo oculto","button":"Botão","select":"Campo de seleção","imageButton":"Botão da imagem","notSet":"<Não definido>","id":"ID","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para a Direita (EPD)","langDirRtl":"Direita para a Esquerda (DPE)","langCode":"Código do idioma","longDescr":"Descrição completa do URL","cssClass":"Classes de estilo das folhas","advisoryTitle":"Título consultivo","cssStyle":"Estilo","ok":"CONFIRMAR","cancel":"Cancelar","close":"Fechar","preview":"Pré-visualização","resize":"Redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um numero.","confirmNewPage":"Irão ser perdidas quaisquer alterações não guardadas. Tem a certeza que deseja carregar a nova página?","confirmCancel":"Foram alteradas algumas das opções. Tem a certeza que deseja fechar a janela?","options":"Opções","target":"Destino","targetNew":"Nova janela (_blank)","targetTop":"Janela superior (_top)","targetSelf":"Mesma janela (_self)","targetParent":"Janela dependente (_parent)","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","styles":"Estilo","cssClasses":"Classes de folhas de estilo","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Topo","alignMiddle":"Centro","alignBottom":"Base","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura deve ser um número.","invalidWidth":"A largura deve ser um número. ","invalidCssLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida HTML válida (px ou %).","invalidInlineStyle":"O valor especificado para o estilo em linha deve constituir um ou mais conjuntos de valores com o formato de \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para um valor em pontos ou um número com uma unidade CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>"}};
\ No newline at end of file
+CKEDITOR.lang['pt']={"widget":{"move":"Clique e arraste para mover","label":"%1 widget"},"undo":{"redo":"Refazer","undo":"Anular"},"toolbar":{"toolbarCollapse":"Ocultar barra de ferramentas","toolbarExpand":"Expandir barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Área de transferência/Anular","editing":"Edição","forms":"Formulários","basicstyles":"Estilos básicos","paragraph":"Parágrafo","links":"Hiperligações","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Editor de barras de ferramentas"},"table":{"border":"Tamanho do contorno","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula antes","insertAfter":"Inserir célula depois","deleteCell":"Apagar células","merge":"Unir células","mergeRight":"Unir à direita","mergeDown":"Fundir abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas na célula","colSpan":"Colunas na célula","wordWrap":"Moldar texto","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Base","bgColor":"Cor de fundo","borderColor":"Cor da margem","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula deve ser um número.","invalidHeight":"A altura da célula deve ser um número.","invalidRowSpan":"As filas da célula deve ter um número inteiro.","invalidColSpan":"As colunas da célula devem ter um número inteiro.","chooseColor":"Escolher"},"cellPad":"Espaço interior","cellSpace":"Espaçamento de célula","column":{"menu":"Coluna","insertBefore":"Inserir coluna antes","insertAfter":"Inserir coluna depois","deleteColumn":"Apagar colunas"},"columns":"Colunas","deleteTable":"Apagar tabela","headers":"Cabeçalhos","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da margem tem de ser um número.","invalidCellPadding":"A criação do espaço na célula deve ser um número positivo.","invalidCellSpacing":"O espaçamento da célula deve ser um número positivo.","invalidCols":"O número de colunas tem de ser um número maior que 0.","invalidHeight":"A altura da tabela tem de ser um número.","invalidRows":"O número de linhas tem de ser maior que 0.","invalidWidth":"A largura da tabela tem de ser um número.","menu":"Propriedades da tabela","row":{"menu":"Linha","insertBefore":"Inserir linha antes","insertAfter":"Inserir linha depois","deleteRow":"Apagar linhas"},"rows":"Linhas","summary":"Resumo","title":"Propriedades da tabela","toolbar":"Tabela","widthPc":"percentagem","widthPx":"pixéis","widthUnit":"unidade da largura"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de Linha","panelTitle3":"Estilos de Objeto"},"specialchar":{"options":"Opções de caracteres especiais","title":"Selecione um caracter especial","toolbar":"Inserir carácter especial"},"sourcedialog":{"toolbar":"Fonte","title":"Fonte"},"sourcearea":{"toolbar":"Fonte"},"showblocks":{"toolbar":"Exibir blocos"},"removeformat":{"toolbar":"Limpar formatação"},"pastetext":{"button":"Colar como texto simples","title":"Colar como texto simples"},"pastefromword":{"confirmCleanup":"O texto que pretende colar parece ter sido copiado do Word. Deseja limpá-lo antes de colar?","error":"Não foi possivel limpar a informação colada decido a um erro interno.","title":"Colar do Word","toolbar":"Colar do Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Insira aqui o parágrafo"},"list":{"bulletedlist":"Marcas","numberedlist":"Numeração"},"language":{"button":"Definir Idioma","remove":"Remover idioma"},"justify":{"block":"Justificado","center":"Alinhar ao centro","left":"Alinhar à esquerda","right":"Alinhar à direita"},"indent":{"indent":"Aumentar avanço","outdent":"Diminuir avanço"},"image2":{"alt":"Texto alternativo","btnUpload":"Enviar para o servidor","captioned":"Imagem legendada","captionPlaceholder":"Legenda","infoTab":"Informação da imagem","lockRatio":"Proporcional","menu":"Propriedades da imagem","pathName":"imagem","pathNameCaption":"legenda","resetSize":"Tamanho original","resizer":"Clique e arraste para redimensionar","title":"Propriedades da imagem","uploadTab":"Carregar","urlMissing":"O URL da fonte da imagem está em falta.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Inserir linha horizontal"},"format":{"label":"Formatar","panelTitle":"Formatar Parágrafo","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Caminho dos elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Menu de opções de contexto"},"clipboard":{"copy":"Copiar","copyError":"A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Colar área","pasteMsg":"Por favor, cole dentro da seguinte caixa usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e carregue em <STRONG>OK</STRONG>.","securityMsg":"Devido ás definições de segurança do teu browser, o editor não pode aceder ao clipboard diretamente. É necessário que voltes a colar as informações nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"blockquote":{"toolbar":"Bloco de citação"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Rasurado","subscript":"Superior à linha","superscript":"Superior à linha","underline":"Sublinhado"},"about":{"copy":"Direitos de Autor &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Doar $1 para ajudar.","moreInfo":"Para informação sobre licenciamento visite o nosso sítio web:","title":"Sobre o CKEditor","userGuide":"CKEditor - Guia do utilizador"},"editor":"Editor de texto enriquecido","editorPanel":"Painel do editor de texto enriquecido","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Navegar no servidor","url":"URL","protocol":"Protocolo","upload":"Carregar","uploadSubmit":"Enviar para o servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de verificação","radio":"Botão","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo oculto","button":"Botão","select":"Campo de seleção","imageButton":"Botão da imagem","notSet":"<Não definido>","id":"ID","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para a Direita (EPD)","langDirRtl":"Direita para a Esquerda (DPE)","langCode":"Código do idioma","longDescr":"Descrição completa do URL","cssClass":"Classes de estilo das folhas","advisoryTitle":"Título consultivo","cssStyle":"Estilo","ok":"CONFIRMAR","cancel":"Cancelar","close":"Fechar","preview":"Pré-visualização","resize":"Redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um numero.","confirmNewPage":"Irão ser perdidas quaisquer alterações não guardadas. Tem a certeza que deseja carregar a nova página?","confirmCancel":"Foram alteradas algumas das opções. Tem a certeza que deseja fechar a janela?","options":"Opções","target":"Destino","targetNew":"Nova janela (_blank)","targetTop":"Janela superior (_top)","targetSelf":"Mesma janela (_self)","targetParent":"Janela dependente (_parent)","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","styles":"Estilo","cssClasses":"Classes de folhas de estilo","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Topo","alignMiddle":"Centro","alignBottom":"Base","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura deve ser um número.","invalidWidth":"A largura deve ser um número. ","invalidCssLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida HTML válida (px ou %).","invalidInlineStyle":"O valor especificado para o estilo em linha deve constituir um ou mais conjuntos de valores com o formato de \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para um valor em pontos ou um número com uma unidade CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"Fim","36":"Entrada","46":"Eliminar","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/ro.js b/web/core/assets/vendor/ckeditor/lang/ro.js
index 65f06ae49..fdd2036f1 100644
--- a/web/core/assets/vendor/ckeditor/lang/ro.js
+++ b/web/core/assets/vendor/ckeditor/lang/ro.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ro']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Starea ulterioară (redo)","undo":"Starea anterioară (undo)"},"toolbar":{"toolbarCollapse":"Micșorează Bara","toolbarExpand":"Mărește Bara","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editează bara de unelte"},"table":{"border":"Mărimea marginii","caption":"Titlu (Caption)","cell":{"menu":"Celulă","insertBefore":"Inserează celulă înainte","insertAfter":"Inserează celulă după","deleteCell":"Şterge celule","merge":"Uneşte celule","mergeRight":"Uneşte la dreapta","mergeDown":"Uneşte jos","splitHorizontal":"Împarte celula pe orizontală","splitVertical":"Împarte celula pe verticală","title":"Proprietăți celulă","cellType":"Tipul celulei","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Aliniament orizontal","vAlign":"Aliniament vertical","alignBaseline":"Baseline","bgColor":"Culoare fundal","borderColor":"Culoare bordură","data":"Data","header":"Antet","yes":"Da","no":"Nu","invalidWidth":"Lățimea celulei trebuie să fie un număr.","invalidHeight":"Înălțimea celulei trebuie să fie un număr.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Alege"},"cellPad":"Spaţiu în cadrul celulei","cellSpace":"Spaţiu între celule","column":{"menu":"Coloană","insertBefore":"Inserează coloană înainte","insertAfter":"Inserează coloană după","deleteColumn":"Şterge celule"},"columns":"Coloane","deleteTable":"Şterge tabel","headers":"Antente","headersBoth":"Ambele","headersColumn":"Prima coloană","headersNone":"Nimic","headersRow":"Primul rând","invalidBorder":"Dimensiunea bordurii trebuie să aibe un număr.","invalidCellPadding":"Spațierea celulei trebuie sa fie un număr pozitiv","invalidCellSpacing":"Spațierea celului trebuie să fie un număr pozitiv.","invalidCols":"Numărul coloanelor trebuie să fie mai mare decât 0.","invalidHeight":"Inaltimea celulei trebuie sa fie un numar.","invalidRows":"Numărul rândurilor trebuie să fie mai mare decât 0.","invalidWidth":"Lățimea tabelului trebuie să fie un număr.","menu":"Proprietăţile tabelului","row":{"menu":"Rând","insertBefore":"Inserează rând înainte","insertAfter":"Inserează rând după","deleteRow":"Şterge rânduri"},"rows":"Rânduri","summary":"Rezumat","title":"Proprietăţile tabelului","toolbar":"Tabel","widthPc":"procente","widthPx":"pixeli","widthUnit":"unitate lățime"},"stylescombo":{"label":"Stil","panelTitle":"Formatarea stilurilor","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Opțiuni caractere speciale","title":"Selectează caracter special","toolbar":"Inserează caracter special"},"sourcedialog":{"toolbar":"Sursa","title":"Sursa"},"sourcearea":{"toolbar":"Sursa"},"showblocks":{"toolbar":"Arată blocurile"},"removeformat":{"toolbar":"Înlătură formatarea"},"pastetext":{"button":"Adaugă ca text simplu (Plain Text)","title":"Adaugă ca text simplu (Plain Text)"},"pastefromword":{"confirmCleanup":"Textul pe care doriți să-l lipiți este din Word. Doriți curățarea textului înante de a-l adăuga?","error":"Nu a fost posibilă curățarea datelor adăugate datorită unei erori interne","title":"Adaugă din Word","toolbar":"Adaugă din Word"},"maximize":{"maximize":"Mărește","minimize":"Micșorează"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Inserează / Elimină Listă cu puncte","numberedlist":"Inserează / Elimină Listă numerotată"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Aliniere în bloc (Block Justify)","center":"Aliniere centrală","left":"Aliniere la stânga","right":"Aliniere la dreapta"},"indent":{"indent":"Creşte indentarea","outdent":"Scade indentarea"},"image2":{"alt":"Text alternativ","btnUpload":"Trimite la server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informaţii despre imagine","lockRatio":"Păstrează proporţiile","menu":"Proprietăţile imaginii","pathName":"image","pathNameCaption":"caption","resetSize":"Resetează mărimea","resizer":"Click and drag to resize","title":"Proprietăţile imaginii","uploadTab":"Încarcă","urlMissing":"Sursa URL a imaginii lipsește."},"horizontalrule":{"toolbar":"Inserează linie orizontală"},"format":{"label":"Formatare","panelTitle":"Formatare","tag_address":"Adresă","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatat"},"elementspath":{"eleLabel":"Calea elementelor","eleTitle":"%1 element"},"contextmenu":{"options":"Opțiuni Meniu Contextual"},"clipboard":{"copy":"Copiază","copyError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+C).","cut":"Taie","cutError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+X).","paste":"Adaugă","pasteArea":"Suprafața de adăugare","pasteMsg":"Vă rugăm adăugaţi în căsuţa următoare folosind tastatura (<strong>Ctrl/Cmd+V</strong>) şi apăsaţi OK","securityMsg":"Din cauza setărilor de securitate ale programului dvs. cu care navigaţi pe internet (browser), editorul nu poate accesa direct datele din clipboard. Va trebui să adăugaţi din nou datele în această fereastră.","title":"Adaugă"},"button":{"selectedLabel":"%1 (Selectat)"},"blockquote":{"toolbar":"Citat"},"basicstyles":{"bold":"Îngroşat (bold)","italic":"Înclinat (italic)","strike":"Tăiat (strike through)","subscript":"Indice (subscript)","superscript":"Putere (superscript)","underline":"Subliniat (underline)"},"about":{"copy":"Copyright &copy; $1. Toate drepturile rezervate.","dlgTitle":"Despre CKEeditor","help":"Citește  $1 pentru ajutor.","moreInfo":"Pentru informații despre licență, vă rugăm vizitați web site-ul nostru:","title":"Despre CKEditor","userGuide":"CKEditor Ghid Utilizator"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Apasă ALT 0 pentru ajutor","browseServer":"Răsfoieşte server","url":"URL","protocol":"Protocol","upload":"Încarcă","uploadSubmit":"Trimite la server","image":"Imagine","flash":"Flash","form":"Formular (Form)","checkbox":"Bifă (Checkbox)","radio":"Buton radio (RadioButton)","textField":"Câmp text (TextField)","textarea":"Suprafaţă text (Textarea)","hiddenField":"Câmp ascuns (HiddenField)","button":"Buton","select":"Câmp selecţie (SelectionField)","imageButton":"Buton imagine (ImageButton)","notSet":"<nesetat>","id":"Id","name":"Nume","langDir":"Direcţia cuvintelor","langDirLtr":"stânga-dreapta (LTR)","langDirRtl":"dreapta-stânga (RTL)","langCode":"Codul limbii","longDescr":"Descrierea lungă URL","cssClass":"Clasele cu stilul paginii (CSS)","advisoryTitle":"Titlul consultativ","cssStyle":"Stil","ok":"OK","cancel":"Anulare","close":"Închide","preview":"Previzualizare","resize":"Trage pentru a redimensiona","generalTab":"General","advancedTab":"Avansat","validateNumberFailed":"Această valoare nu este un număr.","confirmNewPage":"Orice modificări nesalvate ale acestui conținut, vor fi pierdute. Sigur doriți încărcarea unei noi pagini?","confirmCancel":"Câteva opțiuni au fost schimbate. Sigur doriți să închideți dialogul?","options":"Opțiuni","target":"Țintă","targetNew":"Fereastră nouă (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"În aceeași fereastră (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Stânga spre Dreapta (LTR)","langDirRTL":"Dreapta spre Stânga (RTL)","styles":"Stil","cssClasses":"Stylesheet Classes","width":"Lăţime","height":"Înălţime","align":"Aliniere","alignLeft":"Mărește Bara","alignRight":"Dreapta","alignCenter":"Centru","alignJustify":"Aliniere în bloc (Block Justify)","alignTop":"Sus","alignMiddle":"Mijloc","alignBottom":"Jos","alignNone":"None","invalidValue":"Valoare invalidă","invalidHeight":"Înălțimea trebuie să fie un număr.","invalidWidth":"Lățimea trebuie să fie un număr.","invalidCssLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","invalidHtmlLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură HTML (px sau %).","invalidInlineStyle":"Valoarea specificată pentru stil trebuie să conțină una sau mai multe construcții de tipul \"name : value\", separate prin punct și virgulă.","cssLengthTooltip":"Introduceți un număr în pixeli sau un număr cu o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","unavailable":"%1<span class=\"cke_accessibility\">, nu este disponibil</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ro']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Starea ulterioară (redo)","undo":"Starea anterioară (undo)"},"toolbar":{"toolbarCollapse":"Micșorează Bara","toolbarExpand":"Mărește Bara","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editează bara de unelte"},"table":{"border":"Mărimea marginii","caption":"Titlu (Caption)","cell":{"menu":"Celulă","insertBefore":"Inserează celulă înainte","insertAfter":"Inserează celulă după","deleteCell":"Şterge celule","merge":"Uneşte celule","mergeRight":"Uneşte la dreapta","mergeDown":"Uneşte jos","splitHorizontal":"Împarte celula pe orizontală","splitVertical":"Împarte celula pe verticală","title":"Proprietăți celulă","cellType":"Tipul celulei","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Aliniament orizontal","vAlign":"Aliniament vertical","alignBaseline":"Baseline","bgColor":"Culoare fundal","borderColor":"Culoare bordură","data":"Data","header":"Antet","yes":"Da","no":"Nu","invalidWidth":"Lățimea celulei trebuie să fie un număr.","invalidHeight":"Înălțimea celulei trebuie să fie un număr.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Alege"},"cellPad":"Spaţiu în cadrul celulei","cellSpace":"Spaţiu între celule","column":{"menu":"Coloană","insertBefore":"Inserează coloană înainte","insertAfter":"Inserează coloană după","deleteColumn":"Şterge celule"},"columns":"Coloane","deleteTable":"Şterge tabel","headers":"Antente","headersBoth":"Ambele","headersColumn":"Prima coloană","headersNone":"Nimic","headersRow":"Primul rând","invalidBorder":"Dimensiunea bordurii trebuie să aibe un număr.","invalidCellPadding":"Spațierea celulei trebuie sa fie un număr pozitiv","invalidCellSpacing":"Spațierea celului trebuie să fie un număr pozitiv.","invalidCols":"Numărul coloanelor trebuie să fie mai mare decât 0.","invalidHeight":"Inaltimea celulei trebuie sa fie un numar.","invalidRows":"Numărul rândurilor trebuie să fie mai mare decât 0.","invalidWidth":"Lățimea tabelului trebuie să fie un număr.","menu":"Proprietăţile tabelului","row":{"menu":"Rând","insertBefore":"Inserează rând înainte","insertAfter":"Inserează rând după","deleteRow":"Şterge rânduri"},"rows":"Rânduri","summary":"Rezumat","title":"Proprietăţile tabelului","toolbar":"Tabel","widthPc":"procente","widthPx":"pixeli","widthUnit":"unitate lățime"},"stylescombo":{"label":"Stil","panelTitle":"Formatarea stilurilor","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Opțiuni caractere speciale","title":"Selectează caracter special","toolbar":"Inserează caracter special"},"sourcedialog":{"toolbar":"Sursa","title":"Sursa"},"sourcearea":{"toolbar":"Sursa"},"showblocks":{"toolbar":"Arată blocurile"},"removeformat":{"toolbar":"Înlătură formatarea"},"pastetext":{"button":"Adaugă ca text simplu (Plain Text)","title":"Adaugă ca text simplu (Plain Text)"},"pastefromword":{"confirmCleanup":"Textul pe care doriți să-l lipiți este din Word. Doriți curățarea textului înante de a-l adăuga?","error":"Nu a fost posibilă curățarea datelor adăugate datorită unei erori interne","title":"Adaugă din Word","toolbar":"Adaugă din Word"},"maximize":{"maximize":"Mărește","minimize":"Micșorează"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Inserează / Elimină Listă cu puncte","numberedlist":"Inserează / Elimină Listă numerotată"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Aliniere în bloc (Block Justify)","center":"Aliniere centrală","left":"Aliniere la stânga","right":"Aliniere la dreapta"},"indent":{"indent":"Creşte indentarea","outdent":"Scade indentarea"},"image2":{"alt":"Text alternativ","btnUpload":"Trimite la server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informaţii despre imagine","lockRatio":"Păstrează proporţiile","menu":"Proprietăţile imaginii","pathName":"image","pathNameCaption":"caption","resetSize":"Resetează mărimea","resizer":"Click and drag to resize","title":"Proprietăţile imaginii","uploadTab":"Încarcă","urlMissing":"Sursa URL a imaginii lipsește.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Inserează linie orizontală"},"format":{"label":"Formatare","panelTitle":"Formatare","tag_address":"Adresă","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatat"},"elementspath":{"eleLabel":"Calea elementelor","eleTitle":"%1 element"},"contextmenu":{"options":"Opțiuni Meniu Contextual"},"clipboard":{"copy":"Copiază","copyError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+C).","cut":"Taie","cutError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+X).","paste":"Adaugă","pasteArea":"Suprafața de adăugare","pasteMsg":"Vă rugăm adăugaţi în căsuţa următoare folosind tastatura (<strong>Ctrl/Cmd+V</strong>) şi apăsaţi OK","securityMsg":"Din cauza setărilor de securitate ale programului dvs. cu care navigaţi pe internet (browser), editorul nu poate accesa direct datele din clipboard. Va trebui să adăugaţi din nou datele în această fereastră.","title":"Adaugă"},"button":{"selectedLabel":"%1 (Selectat)"},"blockquote":{"toolbar":"Citat"},"basicstyles":{"bold":"Îngroşat (bold)","italic":"Înclinat (italic)","strike":"Tăiat (strike through)","subscript":"Indice (subscript)","superscript":"Putere (superscript)","underline":"Subliniat (underline)"},"about":{"copy":"Copyright &copy; $1. Toate drepturile rezervate.","dlgTitle":"Despre CKEeditor","help":"Citește  $1 pentru ajutor.","moreInfo":"Pentru informații despre licență, vă rugăm vizitați web site-ul nostru:","title":"Despre CKEditor","userGuide":"CKEditor Ghid Utilizator"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Apasă ALT 0 pentru ajutor","browseServer":"Răsfoieşte server","url":"URL","protocol":"Protocol","upload":"Încarcă","uploadSubmit":"Trimite la server","image":"Imagine","flash":"Flash","form":"Formular (Form)","checkbox":"Bifă (Checkbox)","radio":"Buton radio (RadioButton)","textField":"Câmp text (TextField)","textarea":"Suprafaţă text (Textarea)","hiddenField":"Câmp ascuns (HiddenField)","button":"Buton","select":"Câmp selecţie (SelectionField)","imageButton":"Buton imagine (ImageButton)","notSet":"<nesetat>","id":"Id","name":"Nume","langDir":"Direcţia cuvintelor","langDirLtr":"stânga-dreapta (LTR)","langDirRtl":"dreapta-stânga (RTL)","langCode":"Codul limbii","longDescr":"Descrierea lungă URL","cssClass":"Clasele cu stilul paginii (CSS)","advisoryTitle":"Titlul consultativ","cssStyle":"Stil","ok":"OK","cancel":"Anulare","close":"Închide","preview":"Previzualizare","resize":"Trage pentru a redimensiona","generalTab":"General","advancedTab":"Avansat","validateNumberFailed":"Această valoare nu este un număr.","confirmNewPage":"Orice modificări nesalvate ale acestui conținut, vor fi pierdute. Sigur doriți încărcarea unei noi pagini?","confirmCancel":"Câteva opțiuni au fost schimbate. Sigur doriți să închideți dialogul?","options":"Opțiuni","target":"Țintă","targetNew":"Fereastră nouă (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"În aceeași fereastră (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Stânga spre Dreapta (LTR)","langDirRTL":"Dreapta spre Stânga (RTL)","styles":"Stil","cssClasses":"Stylesheet Classes","width":"Lăţime","height":"Înălţime","align":"Aliniere","alignLeft":"Mărește Bara","alignRight":"Dreapta","alignCenter":"Centru","alignJustify":"Aliniere în bloc (Block Justify)","alignTop":"Sus","alignMiddle":"Mijloc","alignBottom":"Jos","alignNone":"None","invalidValue":"Valoare invalidă","invalidHeight":"Înălțimea trebuie să fie un număr.","invalidWidth":"Lățimea trebuie să fie un număr.","invalidCssLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","invalidHtmlLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură HTML (px sau %).","invalidInlineStyle":"Valoarea specificată pentru stil trebuie să conțină una sau mai multe construcții de tipul \"name : value\", separate prin punct și virgulă.","cssLengthTooltip":"Introduceți un număr în pixeli sau un număr cu o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","unavailable":"%1<span class=\"cke_accessibility\">, nu este disponibil</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/ru.js b/web/core/assets/vendor/ckeditor/lang/ru.js
index 343da5c84..306b1ddc0 100644
--- a/web/core/assets/vendor/ckeditor/lang/ru.js
+++ b/web/core/assets/vendor/ckeditor/lang/ru.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ru']={"widget":{"move":"Нажмите и перетащите","label":"%1 widget"},"undo":{"redo":"Повторить","undo":"Отменить"},"toolbar":{"toolbarCollapse":"Свернуть панель инструментов","toolbarExpand":"Развернуть панель инструментов","toolbarGroups":{"document":"Документ","clipboard":"Буфер обмена / Отмена действий","editing":"Корректировка","forms":"Формы","basicstyles":"Простые стили","paragraph":"Абзац","links":"Ссылки","insert":"Вставка","styles":"Стили","colors":"Цвета","tools":"Инструменты"},"toolbars":"Панели инструментов редактора"},"table":{"border":"Размер границ","caption":"Заголовок","cell":{"menu":"Ячейка","insertBefore":"Вставить ячейку слева","insertAfter":"Вставить ячейку справа","deleteCell":"Удалить ячейки","merge":"Объединить ячейки","mergeRight":"Объединить с правой","mergeDown":"Объединить с нижней","splitHorizontal":"Разделить ячейку по вертикали","splitVertical":"Разделить ячейку по горизонтали","title":"Свойства ячейки","cellType":"Тип ячейки","rowSpan":"Объединяет строк","colSpan":"Объединяет колонок","wordWrap":"Перенос по словам","hAlign":"Горизонтальное выравнивание","vAlign":"Вертикальное выравнивание","alignBaseline":"По базовой линии","bgColor":"Цвет фона","borderColor":"Цвет границ","data":"Данные","header":"Заголовок","yes":"Да","no":"Нет","invalidWidth":"Ширина ячейки должна быть числом.","invalidHeight":"Высота ячейки должна быть числом.","invalidRowSpan":"Количество объединяемых строк должно быть задано числом.","invalidColSpan":"Количество объединяемых колонок должно быть задано числом.","chooseColor":"Выберите"},"cellPad":"Внутренний отступ ячеек","cellSpace":"Внешний отступ ячеек","column":{"menu":"Колонка","insertBefore":"Вставить колонку слева","insertAfter":"Вставить колонку справа","deleteColumn":"Удалить колонки"},"columns":"Колонки","deleteTable":"Удалить таблицу","headers":"Заголовки","headersBoth":"Сверху и слева","headersColumn":"Левая колонка","headersNone":"Без заголовков","headersRow":"Верхняя строка","invalidBorder":"Размер границ должен быть числом.","invalidCellPadding":"Внутренний отступ ячеек (cellpadding) должен быть числом.","invalidCellSpacing":"Внешний отступ ячеек (cellspacing) должен быть числом.","invalidCols":"Количество столбцов должно быть больше 0.","invalidHeight":"Высота таблицы должна быть числом.","invalidRows":"Количество строк должно быть больше 0.","invalidWidth":"Ширина таблицы должна быть числом.","menu":"Свойства таблицы","row":{"menu":"Строка","insertBefore":"Вставить строку сверху","insertAfter":"Вставить строку снизу","deleteRow":"Удалить строки"},"rows":"Строки","summary":"Итоги","title":"Свойства таблицы","toolbar":"Таблица","widthPc":"процентов","widthPx":"пикселей","widthUnit":"единица измерения"},"stylescombo":{"label":"Стили","panelTitle":"Стили форматирования","panelTitle1":"Стили блока","panelTitle2":"Стили элемента","panelTitle3":"Стили объекта"},"specialchar":{"options":"Выбор специального символа","title":"Выберите специальный символ","toolbar":"Вставить специальный символ"},"sourcedialog":{"toolbar":"Исходник","title":"Источник"},"sourcearea":{"toolbar":"Источник"},"showblocks":{"toolbar":"Отображать блоки"},"removeformat":{"toolbar":"Убрать форматирование"},"pastetext":{"button":"Вставить только текст","title":"Вставить только текст"},"pastefromword":{"confirmCleanup":"Текст, который вы желаете вставить, по всей видимости, был скопирован из Word. Следует ли очистить его перед вставкой?","error":"Невозможно очистить вставленные данные из-за внутренней ошибки","title":"Вставить из Word","toolbar":"Вставить из Word"},"maximize":{"maximize":"Развернуть","minimize":"Свернуть"},"magicline":{"title":"Вставить здесь параграф"},"list":{"bulletedlist":"Вставить / удалить маркированный список","numberedlist":"Вставить / удалить нумерованный список"},"language":{"button":"Установка языка","remove":"Удалить язык"},"justify":{"block":"По ширине","center":"По центру","left":"По левому краю","right":"По правому краю"},"indent":{"indent":"Увеличить отступ","outdent":"Уменьшить отступ"},"image2":{"alt":"Альтернативный текст","btnUpload":"Загрузить на сервер","captioned":"Отображать название","captionPlaceholder":"Название","infoTab":"Данные об изображении","lockRatio":"Сохранять пропорции","menu":"Свойства изображения","pathName":"изображение","pathNameCaption":"название","resetSize":"Вернуть обычные размеры","resizer":"Нажмите и растяните","title":"Свойства изображения","uploadTab":"Загрузка файла","urlMissing":"Не указана ссылка на изображение."},"horizontalrule":{"toolbar":"Вставить горизонтальную линию"},"format":{"label":"Форматирование","panelTitle":"Форматирование","tag_address":"Адрес","tag_div":"Обычное (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Обычное","tag_pre":"Моноширинное"},"elementspath":{"eleLabel":"Путь элементов","eleTitle":"Элемент %1"},"contextmenu":{"options":"Параметры контекстного меню"},"clipboard":{"copy":"Копировать","copyError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по копированию текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+C).","cut":"Вырезать","cutError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по вырезке текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+X).","paste":"Вставить","pasteArea":"Зона для вставки","pasteMsg":"Пожалуйста, вставьте текст в зону ниже, используя клавиатуру (<strong>Ctrl/Cmd+V</strong>) и нажмите кнопку \"OK\".","securityMsg":"Настройки безопасности вашего браузера не разрешают редактору напрямую обращаться к буферу обмена. Вы должны вставить текст снова в это окно.","title":"Вставить"},"button":{"selectedLabel":"%1 (Выбрано)"},"blockquote":{"toolbar":"Цитата"},"basicstyles":{"bold":"Полужирный","italic":"Курсив","strike":"Зачеркнутый","subscript":"Подстрочный индекс","superscript":"Надстрочный индекс","underline":"Подчеркнутый"},"about":{"copy":"Copyright &copy; $1. Все права защищены.","dlgTitle":"О CKEditor","help":"$1 содержит подробную справку по использованию.","moreInfo":"Для получения информации о лицензии, пожалуйста, перейдите на наш сайт:","title":"О CKEditor","userGuide":"Руководство пользователя CKEditor"},"editor":"Визуальный текстовый редактор","editorPanel":"Визуальный редактор текста","common":{"editorHelp":"Нажмите ALT-0 для открытия справки","browseServer":"Выбор на сервере","url":"Ссылка","protocol":"Протокол","upload":"Загрузка файла","uploadSubmit":"Загрузить на сервер","image":"Изображение","flash":"Flash","form":"Форма","checkbox":"Чекбокс","radio":"Радиокнопка","textField":"Текстовое поле","textarea":"Многострочное текстовое поле","hiddenField":"Скрытое поле","button":"Кнопка","select":"Выпадающий список","imageButton":"Кнопка-изображение","notSet":"<не указано>","id":"Идентификатор","name":"Имя","langDir":"Направление текста","langDirLtr":"Слева направо (LTR)","langDirRtl":"Справа налево (RTL)","langCode":"Код языка","longDescr":"Длинное описание ссылки","cssClass":"Класс CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль","ok":"ОК","cancel":"Отмена","close":"Закрыть","preview":"Предпросмотр","resize":"Перетащите для изменения размера","generalTab":"Основное","advancedTab":"Дополнительно","validateNumberFailed":"Это значение не является числом.","confirmNewPage":"Несохранённые изменения будут потеряны! Вы действительно желаете перейти на другую страницу?","confirmCancel":"Некоторые параметры были изменены. Вы уверены, что желаете закрыть без сохранения?","options":"Параметры","target":"Цель","targetNew":"Новое окно (_blank)","targetTop":"Главное окно (_top)","targetSelf":"Текущее окно (_self)","targetParent":"Родительское окно (_parent)","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","styles":"Стиль","cssClasses":"CSS классы","width":"Ширина","height":"Высота","align":"Выравнивание","alignLeft":"По левому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширине","alignTop":"Поверху","alignMiddle":"Посередине","alignBottom":"Понизу","alignNone":"Нет","invalidValue":"Недопустимое значение.","invalidHeight":"Высота задается числом.","invalidWidth":"Ширина задается числом.","invalidCssLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","invalidHtmlLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры HTML (px или %).","invalidInlineStyle":"Значение, указанное для стиля элемента, должно состоять из одной или нескольких пар данных в формате \"параметр : значение\", разделённых точкой с запятой.","cssLengthTooltip":"Введите значение в пикселях, либо число с корректной единицей меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недоступно</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ru']={"widget":{"move":"Нажмите и перетащите, чтобы переместить","label":"%1 виджет"},"undo":{"redo":"Повторить","undo":"Отменить"},"toolbar":{"toolbarCollapse":"Свернуть панель инструментов","toolbarExpand":"Развернуть панель инструментов","toolbarGroups":{"document":"Документ","clipboard":"Буфер обмена / Отмена действий","editing":"Корректировка","forms":"Формы","basicstyles":"Простые стили","paragraph":"Абзац","links":"Ссылки","insert":"Вставка","styles":"Стили","colors":"Цвета","tools":"Инструменты"},"toolbars":"Панели инструментов редактора"},"table":{"border":"Размер границ","caption":"Заголовок","cell":{"menu":"Ячейка","insertBefore":"Вставить ячейку слева","insertAfter":"Вставить ячейку справа","deleteCell":"Удалить ячейки","merge":"Объединить ячейки","mergeRight":"Объединить с правой","mergeDown":"Объединить с нижней","splitHorizontal":"Разделить ячейку по вертикали","splitVertical":"Разделить ячейку по горизонтали","title":"Свойства ячейки","cellType":"Тип ячейки","rowSpan":"Объединяет строк","colSpan":"Объединяет колонок","wordWrap":"Перенос по словам","hAlign":"Горизонтальное выравнивание","vAlign":"Вертикальное выравнивание","alignBaseline":"По базовой линии","bgColor":"Цвет фона","borderColor":"Цвет границ","data":"Данные","header":"Заголовок","yes":"Да","no":"Нет","invalidWidth":"Ширина ячейки должна быть числом.","invalidHeight":"Высота ячейки должна быть числом.","invalidRowSpan":"Количество объединяемых строк должно быть задано числом.","invalidColSpan":"Количество объединяемых колонок должно быть задано числом.","chooseColor":"Выберите"},"cellPad":"Внутренний отступ ячеек","cellSpace":"Внешний отступ ячеек","column":{"menu":"Колонка","insertBefore":"Вставить колонку слева","insertAfter":"Вставить колонку справа","deleteColumn":"Удалить колонки"},"columns":"Колонки","deleteTable":"Удалить таблицу","headers":"Заголовки","headersBoth":"Сверху и слева","headersColumn":"Левая колонка","headersNone":"Без заголовков","headersRow":"Верхняя строка","invalidBorder":"Размер границ должен быть числом.","invalidCellPadding":"Внутренний отступ ячеек (cellpadding) должен быть числом.","invalidCellSpacing":"Внешний отступ ячеек (cellspacing) должен быть числом.","invalidCols":"Количество столбцов должно быть больше 0.","invalidHeight":"Высота таблицы должна быть числом.","invalidRows":"Количество строк должно быть больше 0.","invalidWidth":"Ширина таблицы должна быть числом.","menu":"Свойства таблицы","row":{"menu":"Строка","insertBefore":"Вставить строку сверху","insertAfter":"Вставить строку снизу","deleteRow":"Удалить строки"},"rows":"Строки","summary":"Итоги","title":"Свойства таблицы","toolbar":"Таблица","widthPc":"процентов","widthPx":"пикселей","widthUnit":"единица измерения"},"stylescombo":{"label":"Стили","panelTitle":"Стили форматирования","panelTitle1":"Стили блока","panelTitle2":"Стили элемента","panelTitle3":"Стили объекта"},"specialchar":{"options":"Выбор специального символа","title":"Выберите специальный символ","toolbar":"Вставить специальный символ"},"sourcedialog":{"toolbar":"Исходник","title":"Источник"},"sourcearea":{"toolbar":"Источник"},"showblocks":{"toolbar":"Отображать блоки"},"removeformat":{"toolbar":"Убрать форматирование"},"pastetext":{"button":"Вставить только текст","title":"Вставить только текст"},"pastefromword":{"confirmCleanup":"Текст, который вы желаете вставить, по всей видимости, был скопирован из Word. Следует ли очистить его перед вставкой?","error":"Невозможно очистить вставленные данные из-за внутренней ошибки","title":"Вставить из Word","toolbar":"Вставить из Word"},"maximize":{"maximize":"Развернуть","minimize":"Свернуть"},"magicline":{"title":"Вставить здесь параграф"},"list":{"bulletedlist":"Вставить / удалить маркированный список","numberedlist":"Вставить / удалить нумерованный список"},"language":{"button":"Установка языка","remove":"Удалить язык"},"justify":{"block":"По ширине","center":"По центру","left":"По левому краю","right":"По правому краю"},"indent":{"indent":"Увеличить отступ","outdent":"Уменьшить отступ"},"image2":{"alt":"Альтернативный текст","btnUpload":"Загрузить на сервер","captioned":"Отображать название","captionPlaceholder":"Название","infoTab":"Данные об изображении","lockRatio":"Сохранять пропорции","menu":"Свойства изображения","pathName":"изображение","pathNameCaption":"название","resetSize":"Вернуть обычные размеры","resizer":"Нажмите и растяните","title":"Свойства изображения","uploadTab":"Загрузка файла","urlMissing":"Не указана ссылка на изображение.","altMissing":"Не задан альтернативный текст"},"horizontalrule":{"toolbar":"Вставить горизонтальную линию"},"format":{"label":"Форматирование","panelTitle":"Форматирование","tag_address":"Адрес","tag_div":"Обычное (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Обычное","tag_pre":"Моноширинное"},"elementspath":{"eleLabel":"Путь элементов","eleTitle":"Элемент %1"},"contextmenu":{"options":"Параметры контекстного меню"},"clipboard":{"copy":"Копировать","copyError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по копированию текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+C).","cut":"Вырезать","cutError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по вырезке текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+X).","paste":"Вставить","pasteArea":"Зона для вставки","pasteMsg":"Пожалуйста, вставьте текст в зону ниже, используя клавиатуру (<strong>Ctrl/Cmd+V</strong>) и нажмите кнопку \"OK\".","securityMsg":"Настройки безопасности вашего браузера не разрешают редактору напрямую обращаться к буферу обмена. Вы должны вставить текст снова в это окно.","title":"Вставить"},"button":{"selectedLabel":"%1 (Выбрано)"},"blockquote":{"toolbar":"Цитата"},"basicstyles":{"bold":"Полужирный","italic":"Курсив","strike":"Зачеркнутый","subscript":"Подстрочный индекс","superscript":"Надстрочный индекс","underline":"Подчеркнутый"},"about":{"copy":"Copyright &copy; $1. Все права защищены.","dlgTitle":"О CKEditor","help":"$1 содержит подробную справку по использованию.","moreInfo":"Для получения информации о лицензии, пожалуйста, перейдите на наш сайт:","title":"О CKEditor","userGuide":"Руководство пользователя CKEditor"},"editor":"Визуальный текстовый редактор","editorPanel":"Визуальный редактор текста","common":{"editorHelp":"Нажмите ALT-0 для открытия справки","browseServer":"Выбор на сервере","url":"Ссылка","protocol":"Протокол","upload":"Загрузка файла","uploadSubmit":"Загрузить на сервер","image":"Изображение","flash":"Flash","form":"Форма","checkbox":"Чекбокс","radio":"Радиокнопка","textField":"Текстовое поле","textarea":"Многострочное текстовое поле","hiddenField":"Скрытое поле","button":"Кнопка","select":"Выпадающий список","imageButton":"Кнопка-изображение","notSet":"<не указано>","id":"Идентификатор","name":"Имя","langDir":"Направление текста","langDirLtr":"Слева направо (LTR)","langDirRtl":"Справа налево (RTL)","langCode":"Код языка","longDescr":"Длинное описание ссылки","cssClass":"Класс CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль","ok":"ОК","cancel":"Отмена","close":"Закрыть","preview":"Предпросмотр","resize":"Перетащите для изменения размера","generalTab":"Основное","advancedTab":"Дополнительно","validateNumberFailed":"Это значение не является числом.","confirmNewPage":"Несохранённые изменения будут потеряны! Вы действительно желаете перейти на другую страницу?","confirmCancel":"Некоторые параметры были изменены. Вы уверены, что желаете закрыть без сохранения?","options":"Параметры","target":"Цель","targetNew":"Новое окно (_blank)","targetTop":"Главное окно (_top)","targetSelf":"Текущее окно (_self)","targetParent":"Родительское окно (_parent)","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","styles":"Стиль","cssClasses":"CSS классы","width":"Ширина","height":"Высота","align":"Выравнивание","alignLeft":"По левому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширине","alignTop":"Поверху","alignMiddle":"Посередине","alignBottom":"Понизу","alignNone":"Нет","invalidValue":"Недопустимое значение.","invalidHeight":"Высота задается числом.","invalidWidth":"Ширина задается числом.","invalidCssLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","invalidHtmlLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры HTML (px или %).","invalidInlineStyle":"Значение, указанное для стиля элемента, должно состоять из одной или нескольких пар данных в формате \"параметр : значение\", разделённых точкой с запятой.","cssLengthTooltip":"Введите значение в пикселях, либо число с корректной единицей меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недоступно</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Пробел","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Комбинация клавиш"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/si.js b/web/core/assets/vendor/ckeditor/lang/si.js
index b9e3569a3..db446cb6e 100644
--- a/web/core/assets/vendor/ckeditor/lang/si.js
+++ b/web/core/assets/vendor/ckeditor/lang/si.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['si']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"නැවත කිරීම","undo":"වෙනස් කිරීම"},"toolbar":{"toolbarCollapse":"මෙවලම් තීරුව හැකුලුම.","toolbarExpand":"මෙවලම් තීරුව දීගහැරුම","toolbarGroups":{"document":"ලිපිය","clipboard":"ඇමිණුම වෙනස් කිරීම","editing":"සංස්කරණය","forms":"පෝරමය","basicstyles":"මුලික විලාසය","paragraph":"චේදය","links":"සබැඳිය","insert":"ඇතුලත් කිරීම","styles":"විලාසය","colors":"වර්ණය","tools":"මෙවලම්"},"toolbars":"සංස්කරණ මෙවලම් තීරුව"},"table":{"border":"සීමාවවල විශාලත්වය","caption":"Caption","cell":{"menu":"කොටුව","insertBefore":"පෙර කොටුවක් ඇතුල්කිරිම","insertAfter":"පසුව කොටුවක් ඇතුලත් ","deleteCell":"කොටුව මැකීම","merge":"කොටු එකට යාකිරිම","mergeRight":"දකුණට ","mergeDown":"පහලට ","splitHorizontal":"තිරස්ව කොටු පැතිරීම","splitVertical":"සිරස්ව කොටු පැතිරීම","title":"කොටු ","cellType":"කොටු වර්ගය","rowSpan":"පේළි පළල","colSpan":"සිරස් පළල","wordWrap":"වචන ගැලපුම","hAlign":"තිරස්ව ","vAlign":"සිරස්ව ","alignBaseline":"පාද රේඛාව","bgColor":"පසුබිම් වර්ණය","borderColor":"මායිම් ","data":"Data","header":"ශීර්ෂක","yes":"ඔව්","no":"නැත","invalidWidth":"කොටු පළල සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidHeight":"කොටු උස සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"තෝරන්න"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"සිරස් ","deleteTable":"වගුව මකන්න","headers":"ශීර්ෂක","headersBoth":"දෙකම","headersColumn":"පළමූ සිරස් තීරුව","headersNone":"කිසිවක්ම නොවේ","headersRow":"පළමූ පේළිය","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"විලාසය","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"විශේෂ  ගුණාංග වීකල්ප","title":"විශේෂ  ගුණාංග ","toolbar":"විශේෂ ගුණාංග ඇතුලත් "},"sourcedialog":{"toolbar":"මුලාශ්‍රය","title":"මුලාශ්‍රය"},"sourcearea":{"toolbar":"මුලාශ්‍රය"},"showblocks":{"toolbar":"කොටස පෙන්නන්න"},"removeformat":{"toolbar":"සැකසීම වෙනස් කරන්න"},"pastetext":{"button":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න","title":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"වචන වලින් අලවන්න","toolbar":"වචන වලින් අලවන්න"},"maximize":{"maximize":"විශාල කිරීම","minimize":"කුඩා කිරීම"},"magicline":{"title":"චේදය ඇතුලත් කරන්න"},"list":{"bulletedlist":"ඇතුලත් / ඉවත් කිරීම ලඉස්තුව","numberedlist":"ඇතුලත් / ඉවත් කිරීම අන්න්කිත ලඉස්තුව"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"මධ්‍ය","left":"Align Left","right":"Align Right"},"indent":{"indent":"අතර පරතරය වැඩිකරන්න","outdent":"අතර පරතරය අඩුකරන්න"},"image2":{"alt":"විකල්ප ","btnUpload":"සේවාදායකය වෙත යොමුකිරිම","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"රුපයේ තොරතුරු","lockRatio":"නවතන අනුපාතය ","menu":"රුපයේ ගුණ","pathName":"image","pathNameCaption":"caption","resetSize":"නැවතත් විශාලත්වය වෙනස් කිරීම","resizer":"Click and drag to resize","title":"රුපයේ ","uploadTab":"උඩුගතකිරීම","urlMissing":"රුප මුලාශ්‍ර URL නැත."},"horizontalrule":{"toolbar":"තිරස් රේඛාවක් ඇතුලත් කරන්න"},"format":{"label":"ආකෘතිය","panelTitle":"චේදයේ ","tag_address":"ලිපිනය","tag_div":"සාමාන්‍ය(DIV)","tag_h1":"ශීර්ෂය 1","tag_h2":"ශීර්ෂය 2","tag_h3":"ශීර්ෂය 3","tag_h4":"ශීර්ෂය 4","tag_h5":"ශීර්ෂය 5","tag_h6":"ශීර්ෂය 6","tag_p":"සාමාන්‍ය","tag_pre":"ආකෘතියන්"},"elementspath":{"eleLabel":"මුලද්‍රව්‍ය මාර්ගය","eleTitle":"%1 මුල"},"contextmenu":{"options":"අනතර්ග ලේඛණ  විකල්ප"},"clipboard":{"copy":"පිටපත් කරන්න","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"කපාගන්න","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"අලවන්න","pasteArea":"අලවන ප්‍රදේශ","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"අලවන්න"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"උද්ධෘත කොටස"},"basicstyles":{"bold":"තද අකුරින් ලියනලද","italic":"බැධීඅකුරින් ලියන ලද","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"යටින් ඉරි අදින ලද"},"about":{"copy":"පිටපත් අයිතිය සහ පිටපත් කිරීම;$1 .සියලුම හිමිකම් ඇවිරිණි.","dlgTitle":"CKEditor ගැන විස්තර","help":"උදව් සඳහා $1 ","moreInfo":"බලපත්‍ර තොරතුරු සදහා කරුණාකර අපගේ විද්‍යුත් ලිපිනයට පිවිසෙන්න:","title":"CKEditor ගැන විස්තර","userGuide":"CKEditor භාවිතා කිරීම පිළිබඳ "},"editor":"පොහොසත් වචන සංස්කරණ","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"උදව් ලබා ගැනීමට  ALT බොත්තම ඔබන්න","browseServer":"සෙවුම් සේවාදායකය","url":"URL","protocol":"මුලාපත්‍රය","upload":"උඩුගතකිරීම","uploadSubmit":"සේවාදායකය වෙත යොමුකිරිම","image":"රුපය","flash":"දීප්තිය","form":"පෝරමය","checkbox":"ලකුණුකිරීමේ කොටුව","radio":"තේරීම් ","textField":"ලියන ප්‍රදේශය","textarea":"අකුරු ","hiddenField":"සැඟවුණු ප්‍රදේශය","button":"බොත්තම","select":"තෝරන්න ","imageButton":"රුප ","notSet":"<යොදා >","id":"අංකය","name":"නම","langDir":"භාෂා දිශාව","langDirLtr":"වමේසිට දකුණුට","langDirRtl":"දකුණේ සිට වමට","langCode":"භාෂා කේතය","longDescr":"සම්පුර්න පැහැදිලි කිරීම","cssClass":"විලාශ පත්‍ර පන්තිය","advisoryTitle":"උපදෙස් ","cssStyle":"විලාසය","ok":"නිරදි","cancel":"අවලංගු කිරීම","close":"වැසීම","preview":"නැවත ","resize":"විශාලත්වය නැවත වෙනස් කිරීම","generalTab":"පොදු කරුණු.","advancedTab":"දීය","validateNumberFailed":"මෙම වටිනාකම අංකයක් නොවේ","confirmNewPage":"ආරක්ෂා නොකළ සියලුම දත්තයන් මැකියනුලැබේ. ඔබට නව පිටුවක් ලබා ගැනීමට අවශ්‍යද?","confirmCancel":"ඇතම් විකල්පයන් වෙනස් කර ඇත. ඔබට මින් නික්මීමට අවශ්‍යද?","options":" විකල්ප","target":"අරමුණ","targetNew":"නව කව්ළුව","targetTop":"වැදගත් කව්ළුව","targetSelf":"එම කව්ළුව(_තම\\\\)","targetParent":"මව් කව්ළුව(_)","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","styles":"විලාසය","cssClasses":"විලාසපත්‍ර පන්තිය","width":"පළල","height":"උස","align":"ගැලපුම","alignLeft":"වම","alignRight":"දකුණ","alignCenter":"මධ්‍ය","alignJustify":"Justify","alignTop":"ඉ","alignMiddle":"මැද","alignBottom":"පහල","alignNone":"None","invalidValue":"වැරදී වටිනාකමකි","invalidHeight":"උස අංකයක් විය යුතුය","invalidWidth":"පළල අංකයක් විය යුතුය","invalidCssLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  CSS මිනුම් එකක(px, %, in, cm, mm, em, ex, pt, pc)","invalidHtmlLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  HTML මිනුම් එකක (px හෝ %).","invalidInlineStyle":"වටිනාකමක් නිරූපණය කිරීම  පේළි විලාසයයට ආකෘතිය  අනතර්ග විය යුතය  \"නම : වටිනාකම\", තිත් කොමාවකින් වෙන් වෙන ලද.","cssLengthTooltip":"සංක්‍යා ඇතුලත් කිරීමේදී වටිනාකම තිත් ප්‍රමාණය නිවරදි CSS  ඒකක(තිත්, %, අඟල්,සෙමි, mm, em, ex, pt, pc)","unavailable":"%1<span පන්තිය=\"ළඟා වියහැකි ද බලන්න\">, නොමැතිනම්</span>"}};
\ No newline at end of file
+CKEDITOR.lang['si']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"නැවත කිරීම","undo":"වෙනස් කිරීම"},"toolbar":{"toolbarCollapse":"මෙවලම් තීරුව හැකුලුම.","toolbarExpand":"මෙවලම් තීරුව දීගහැරුම","toolbarGroups":{"document":"ලිපිය","clipboard":"ඇමිණුම වෙනස් කිරීම","editing":"සංස්කරණය","forms":"පෝරමය","basicstyles":"මුලික විලාසය","paragraph":"චේදය","links":"සබැඳිය","insert":"ඇතුලත් කිරීම","styles":"විලාසය","colors":"වර්ණය","tools":"මෙවලම්"},"toolbars":"සංස්කරණ මෙවලම් තීරුව"},"table":{"border":"සීමාවවල විශාලත්වය","caption":"Caption","cell":{"menu":"කොටුව","insertBefore":"පෙර කොටුවක් ඇතුල්කිරිම","insertAfter":"පසුව කොටුවක් ඇතුලත් ","deleteCell":"කොටුව මැකීම","merge":"කොටු එකට යාකිරිම","mergeRight":"දකුණට ","mergeDown":"පහලට ","splitHorizontal":"තිරස්ව කොටු පැතිරීම","splitVertical":"සිරස්ව කොටු පැතිරීම","title":"කොටු ","cellType":"කොටු වර්ගය","rowSpan":"පේළි පළල","colSpan":"සිරස් පළල","wordWrap":"වචන ගැලපුම","hAlign":"තිරස්ව ","vAlign":"සිරස්ව ","alignBaseline":"පාද රේඛාව","bgColor":"පසුබිම් වර්ණය","borderColor":"මායිම් ","data":"Data","header":"ශීර්ෂක","yes":"ඔව්","no":"නැත","invalidWidth":"කොටු පළල සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidHeight":"කොටු උස සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"තෝරන්න"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"සිරස් ","deleteTable":"වගුව මකන්න","headers":"ශීර්ෂක","headersBoth":"දෙකම","headersColumn":"පළමූ සිරස් තීරුව","headersNone":"කිසිවක්ම නොවේ","headersRow":"පළමූ පේළිය","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"විලාසය","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"විශේෂ  ගුණාංග වීකල්ප","title":"විශේෂ  ගුණාංග ","toolbar":"විශේෂ ගුණාංග ඇතුලත් "},"sourcedialog":{"toolbar":"මුලාශ්‍රය","title":"මුලාශ්‍රය"},"sourcearea":{"toolbar":"මුලාශ්‍රය"},"showblocks":{"toolbar":"කොටස පෙන්නන්න"},"removeformat":{"toolbar":"සැකසීම වෙනස් කරන්න"},"pastetext":{"button":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න","title":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"වචන වලින් අලවන්න","toolbar":"වචන වලින් අලවන්න"},"maximize":{"maximize":"විශාල කිරීම","minimize":"කුඩා කිරීම"},"magicline":{"title":"චේදය ඇතුලත් කරන්න"},"list":{"bulletedlist":"ඇතුලත් / ඉවත් කිරීම ලඉස්තුව","numberedlist":"ඇතුලත් / ඉවත් කිරීම අන්න්කිත ලඉස්තුව"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"මධ්‍ය","left":"Align Left","right":"Align Right"},"indent":{"indent":"අතර පරතරය වැඩිකරන්න","outdent":"අතර පරතරය අඩුකරන්න"},"image2":{"alt":"විකල්ප ","btnUpload":"සේවාදායකය වෙත යොමුකිරිම","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"රුපයේ තොරතුරු","lockRatio":"නවතන අනුපාතය ","menu":"රුපයේ ගුණ","pathName":"image","pathNameCaption":"caption","resetSize":"නැවතත් විශාලත්වය වෙනස් කිරීම","resizer":"Click and drag to resize","title":"රුපයේ ","uploadTab":"උඩුගතකිරීම","urlMissing":"රුප මුලාශ්‍ර URL නැත.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"තිරස් රේඛාවක් ඇතුලත් කරන්න"},"format":{"label":"ආකෘතිය","panelTitle":"චේදයේ ","tag_address":"ලිපිනය","tag_div":"සාමාන්‍ය(DIV)","tag_h1":"ශීර්ෂය 1","tag_h2":"ශීර්ෂය 2","tag_h3":"ශීර්ෂය 3","tag_h4":"ශීර්ෂය 4","tag_h5":"ශීර්ෂය 5","tag_h6":"ශීර්ෂය 6","tag_p":"සාමාන්‍ය","tag_pre":"ආකෘතියන්"},"elementspath":{"eleLabel":"මුලද්‍රව්‍ය මාර්ගය","eleTitle":"%1 මුල"},"contextmenu":{"options":"අනතර්ග ලේඛණ  විකල්ප"},"clipboard":{"copy":"පිටපත් කරන්න","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"කපාගන්න","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"අලවන්න","pasteArea":"අලවන ප්‍රදේශ","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"අලවන්න"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"උද්ධෘත කොටස"},"basicstyles":{"bold":"තද අකුරින් ලියනලද","italic":"බැධීඅකුරින් ලියන ලද","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"යටින් ඉරි අදින ලද"},"about":{"copy":"පිටපත් අයිතිය සහ පිටපත් කිරීම;$1 .සියලුම හිමිකම් ඇවිරිණි.","dlgTitle":"CKEditor ගැන විස්තර","help":"උදව් සඳහා $1 ","moreInfo":"බලපත්‍ර තොරතුරු සදහා කරුණාකර අපගේ විද්‍යුත් ලිපිනයට පිවිසෙන්න:","title":"CKEditor ගැන විස්තර","userGuide":"CKEditor භාවිතා කිරීම පිළිබඳ "},"editor":"පොහොසත් වචන සංස්කරණ","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"උදව් ලබා ගැනීමට  ALT බොත්තම ඔබන්න","browseServer":"සෙවුම් සේවාදායකය","url":"URL","protocol":"මුලාපත්‍රය","upload":"උඩුගතකිරීම","uploadSubmit":"සේවාදායකය වෙත යොමුකිරිම","image":"රුපය","flash":"දීප්තිය","form":"පෝරමය","checkbox":"ලකුණුකිරීමේ කොටුව","radio":"තේරීම් ","textField":"ලියන ප්‍රදේශය","textarea":"අකුරු ","hiddenField":"සැඟවුණු ප්‍රදේශය","button":"බොත්තම","select":"තෝරන්න ","imageButton":"රුප ","notSet":"<යොදා >","id":"අංකය","name":"නම","langDir":"භාෂා දිශාව","langDirLtr":"වමේසිට දකුණුට","langDirRtl":"දකුණේ සිට වමට","langCode":"භාෂා කේතය","longDescr":"සම්පුර්න පැහැදිලි කිරීම","cssClass":"විලාශ පත්‍ර පන්තිය","advisoryTitle":"උපදෙස් ","cssStyle":"විලාසය","ok":"නිරදි","cancel":"අවලංගු කිරීම","close":"වැසීම","preview":"නැවත ","resize":"විශාලත්වය නැවත වෙනස් කිරීම","generalTab":"පොදු කරුණු.","advancedTab":"දීය","validateNumberFailed":"මෙම වටිනාකම අංකයක් නොවේ","confirmNewPage":"ආරක්ෂා නොකළ සියලුම දත්තයන් මැකියනුලැබේ. ඔබට නව පිටුවක් ලබා ගැනීමට අවශ්‍යද?","confirmCancel":"ඇතම් විකල්පයන් වෙනස් කර ඇත. ඔබට මින් නික්මීමට අවශ්‍යද?","options":" විකල්ප","target":"අරමුණ","targetNew":"නව කව්ළුව","targetTop":"වැදගත් කව්ළුව","targetSelf":"එම කව්ළුව(_තම\\\\)","targetParent":"මව් කව්ළුව(_)","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","styles":"විලාසය","cssClasses":"විලාසපත්‍ර පන්තිය","width":"පළල","height":"උස","align":"ගැලපුම","alignLeft":"වම","alignRight":"දකුණ","alignCenter":"මධ්‍ය","alignJustify":"Justify","alignTop":"ඉ","alignMiddle":"මැද","alignBottom":"පහල","alignNone":"None","invalidValue":"වැරදී වටිනාකමකි","invalidHeight":"උස අංකයක් විය යුතුය","invalidWidth":"පළල අංකයක් විය යුතුය","invalidCssLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  CSS මිනුම් එකක(px, %, in, cm, mm, em, ex, pt, pc)","invalidHtmlLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  HTML මිනුම් එකක (px හෝ %).","invalidInlineStyle":"වටිනාකමක් නිරූපණය කිරීම  පේළි විලාසයයට ආකෘතිය  අනතර්ග විය යුතය  \"නම : වටිනාකම\", තිත් කොමාවකින් වෙන් වෙන ලද.","cssLengthTooltip":"සංක්‍යා ඇතුලත් කිරීමේදී වටිනාකම තිත් ප්‍රමාණය නිවරදි CSS  ඒකක(තිත්, %, අඟල්,සෙමි, mm, em, ex, pt, pc)","unavailable":"%1<span පන්තිය=\"ළඟා වියහැකි ද බලන්න\">, නොමැතිනම්</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/sk.js b/web/core/assets/vendor/ckeditor/lang/sk.js
index 60be627d3..a8be3d4dc 100644
--- a/web/core/assets/vendor/ckeditor/lang/sk.js
+++ b/web/core/assets/vendor/ckeditor/lang/sk.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sk']={"widget":{"move":"Kliknite a potiahnite pre presunutie","label":"%1 widget"},"undo":{"redo":"Znovu","undo":"Späť"},"toolbar":{"toolbarCollapse":"Zbaliť lištu nástrojov","toolbarExpand":"Rozbaliť lištu nástrojov","toolbarGroups":{"document":"Dokument","clipboard":"Schránka pre kopírovanie/Späť","editing":"Upravovanie","forms":"Formuláre","basicstyles":"Základné štýly","paragraph":"Odsek","links":"Odkazy","insert":"Vložiť","styles":"Štýly","colors":"Farby","tools":"Nástroje"},"toolbars":"Lišty nástrojov editora"},"table":{"border":"Šírka orámovania","caption":"Popis","cell":{"menu":"Bunka","insertBefore":"Vložiť bunku pred","insertAfter":"Vložiť bunku za","deleteCell":"Vymazať bunky","merge":"Zlúčiť bunky","mergeRight":"Zlúčiť doprava","mergeDown":"Zlúčiť dole","splitHorizontal":"Rozdeliť bunky horizontálne","splitVertical":"Rozdeliť bunky vertikálne","title":"Vlastnosti bunky","cellType":"Typ bunky","rowSpan":"Rozsah riadkov","colSpan":"Rozsah stĺpcov","wordWrap":"Zalamovanie riadkov","hAlign":"Horizontálne zarovnanie","vAlign":"Vertikálne zarovnanie","alignBaseline":"Základná čiara (baseline)","bgColor":"Farba pozadia","borderColor":"Farba orámovania","data":"Dáta","header":"Hlavička","yes":"Áno","no":"Nie","invalidWidth":"Šírka bunky musí byť číslo.","invalidHeight":"Výška bunky musí byť číslo.","invalidRowSpan":"Rozsah riadkov musí byť celé číslo.","invalidColSpan":"Rozsah stĺpcov musí byť celé číslo.","chooseColor":"Vybrať"},"cellPad":"Odsadenie obsahu (cell padding)","cellSpace":"Vzdialenosť buniek (cell spacing)","column":{"menu":"Stĺpec","insertBefore":"Vložiť stĺpec pred","insertAfter":"Vložiť stĺpec po","deleteColumn":"Zmazať stĺpce"},"columns":"Stĺpce","deleteTable":"Vymazať tabuľku","headers":"Hlavička","headersBoth":"Obe","headersColumn":"Prvý stĺpec","headersNone":"Žiadne","headersRow":"Prvý riadok","invalidBorder":"Šírka orámovania musí byť číslo.","invalidCellPadding":"Odsadenie v bunkách (cell padding) musí byť kladné číslo.","invalidCellSpacing":"Medzera mädzi bunkami (cell spacing) musí byť kladné číslo.","invalidCols":"Počet stĺpcov musí byť číslo väčšie ako 0.","invalidHeight":"Výška tabuľky musí byť číslo.","invalidRows":"Počet riadkov musí byť číslo väčšie ako 0.","invalidWidth":"Širka tabuľky musí byť číslo.","menu":"Vlastnosti tabuľky","row":{"menu":"Riadok","insertBefore":"Vložiť riadok pred","insertAfter":"Vložiť riadok po","deleteRow":"Vymazať riadky"},"rows":"Riadky","summary":"Prehľad","title":"Vlastnosti tabuľky","toolbar":"Tabuľka","widthPc":"percent","widthPx":"pixelov","widthUnit":"jednotka šírky"},"stylescombo":{"label":"Štýly","panelTitle":"Formátovanie štýlov","panelTitle1":"Štýly bloku","panelTitle2":"Vnútroriadkové (inline) štýly","panelTitle3":"Štýly objeku"},"specialchar":{"options":"Možnosti špeciálneho znaku","title":"Výber špeciálneho znaku","toolbar":"Vložiť špeciálny znak"},"sourcedialog":{"toolbar":"Zdroj","title":"Zdroj"},"sourcearea":{"toolbar":"Zdroj"},"showblocks":{"toolbar":"Ukázať bloky"},"removeformat":{"toolbar":"Odstrániť formátovanie"},"pastetext":{"button":"Vložiť ako čistý text","title":"Vložiť ako čistý text"},"pastefromword":{"confirmCleanup":"Zdá sa, že vkladaný text pochádza z programu MS Word. Chcete ho pred vkladaním automaticky vyčistiť?","error":"Kvôli internej chybe nebolo možné vložené dáta vyčistiť","title":"Vložiť z Wordu","toolbar":"Vložiť z Wordu"},"maximize":{"maximize":"Maximalizovať","minimize":"Minimalizovať"},"magicline":{"title":"Odsek vložiť sem"},"list":{"bulletedlist":"Vložiť/odstrániť zoznam s odrážkami","numberedlist":"Vložiť/odstrániť číslovaný zoznam"},"language":{"button":"Nastaviť jazyk","remove":"Odstrániť jazyk"},"justify":{"block":"Zarovnať do bloku","center":"Zarovnať na stred","left":"Zarovnať vľavo","right":"Zarovnať vpravo"},"indent":{"indent":"Zväčšiť odsadenie","outdent":"Zmenšiť odsadenie"},"image2":{"alt":"Alternatívny text","btnUpload":"Odoslať to na server","captioned":"Opísaný obrázok","captionPlaceholder":"Popis","infoTab":"Informácie o obrázku","lockRatio":"Pomer zámky","menu":"Vlastnosti obrázka","pathName":"obrázok","pathNameCaption":"popis","resetSize":"Pôvodná veľkosť","resizer":"Kliknite a potiahnite pre zmenu veľkosti","title":"Vlastnosti obrázka","uploadTab":"Nahrať","urlMissing":"Chýba URL zdroja obrázka."},"horizontalrule":{"toolbar":"Vložiť vodorovnú čiaru"},"format":{"label":"Formát","panelTitle":"Odsek","tag_address":"Adresa","tag_div":"Normálny (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normálny","tag_pre":"Formátovaný"},"elementspath":{"eleLabel":"Cesta prvkov","eleTitle":"%1 prvok"},"contextmenu":{"options":"Možnosti kontextového menu"},"clipboard":{"copy":"Kopírovať","copyError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu kopírovania. Použite na to klávesnicu (Ctrl/Cmd+C).","cut":"Vystrihnúť","cutError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu vystrihnutia. Použite na to klávesnicu (Ctrl/Cmd+X).","paste":"Vložiť","pasteArea":"Miesto na vloženie","pasteMsg":"Použitím klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) vložte text do rámčeka a stlačte OK.","securityMsg":"Kvôli bezpečnostným nastaveniam vášho prehliadača editor nemôže pristupovať k schránke na kopírovanie priamo. Vložte to preto do tohto okna.","title":"Vložiť"},"button":{"selectedLabel":"%1 (Vybrané)"},"blockquote":{"toolbar":"Citácia"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Prečiarknuté","subscript":"Dolný index","superscript":"Horný index","underline":"Podčiarknuté"},"about":{"copy":"Copyright &copy; $1. Všetky práva vyhradené.","dlgTitle":"O CKEditor-e","help":"Zaškrtnite $1 pre pomoc.","moreInfo":"Pre informácie o licenciách, prosíme, navštívte našu web stránku:","title":"O CKEditor-e","userGuide":"Používateľská príručka KCEditor-a"},"editor":"Editor formátovaného textu","editorPanel":"Panel editora formátovaného textu","common":{"editorHelp":"Stlačením ALT 0 spustiť pomocníka","browseServer":"Prehliadať server","url":"URL","protocol":"Protokol","upload":"Odoslať","uploadSubmit":"Odoslať na server","image":"Obrázok","flash":"Flash","form":"Formulár","checkbox":"Zaškrtávacie pole","radio":"Prepínač","textField":"Textové pole","textarea":"Textová oblasť","hiddenField":"Skryté pole","button":"Tlačidlo","select":"Rozbaľovací zoznam","imageButton":"Obrázkové tlačidlo","notSet":"<nenastavené>","id":"Id","name":"Meno","langDir":"Orientácia jazyka","langDirLtr":"Zľava doprava (LTR)","langDirRtl":"Sprava doľava (RTL)","langCode":"Kód jazyka","longDescr":"Dlhý popis URL","cssClass":"Trieda štýlu","advisoryTitle":"Pomocný titulok","cssStyle":"Štýl","ok":"OK","cancel":"Zrušiť","close":"Zatvorit","preview":"Náhľad","resize":"Zmeniť veľkosť","generalTab":"Hlavné","advancedTab":"Rozšírené","validateNumberFailed":"Hodnota nie je číslo.","confirmNewPage":"Prajete si načítat novú stránku? Všetky neuložené zmeny budú stratené. ","confirmCancel":"Niektore možnosti boli zmenené. Naozaj chcete zavrieť okno?","options":"Možnosti","target":"Cieľ","targetNew":"Nové okno (_blank)","targetTop":"Najvrchnejšie okno (_top)","targetSelf":"To isté okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","styles":"Štýl","cssClasses":"Triedy štýlu","width":"Šírka","height":"Výška","align":"Zarovnanie","alignLeft":"Vľavo","alignRight":"Vpravo","alignCenter":"Na stred","alignJustify":"Zarovnať do bloku","alignTop":"Nahor","alignMiddle":"Na stred","alignBottom":"Dole","alignNone":"Žiadne","invalidValue":"Neplatná hodnota.","invalidHeight":"Výška musí byť číslo.","invalidWidth":"Šírka musí byť číslo.","invalidCssLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej CSS mernej jednotky (px, %, in, cm, mm, em, ex, pt alebo pc).","invalidHtmlLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej HTML mernej jednotky (px alebo %).","invalidInlineStyle":"Zadaná hodnota pre inline štýl musí pozostávať s jedného, alebo viac dvojíc formátu \"názov: hodnota\", oddelených bodkočiarkou.","cssLengthTooltip":"Vložte číslo pre hodnotu v pixeloch alebo číslo so správnou CSS jednotou (px, %, in, cm, mm, em, ex, pt alebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupný</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sk']={"widget":{"move":"Kliknite a potiahnite pre presunutie","label":"%1 widget"},"undo":{"redo":"Znovu","undo":"Späť"},"toolbar":{"toolbarCollapse":"Zbaliť lištu nástrojov","toolbarExpand":"Rozbaliť lištu nástrojov","toolbarGroups":{"document":"Dokument","clipboard":"Schránka pre kopírovanie/Späť","editing":"Upravovanie","forms":"Formuláre","basicstyles":"Základné štýly","paragraph":"Odsek","links":"Odkazy","insert":"Vložiť","styles":"Štýly","colors":"Farby","tools":"Nástroje"},"toolbars":"Lišty nástrojov editora"},"table":{"border":"Šírka orámovania","caption":"Popis","cell":{"menu":"Bunka","insertBefore":"Vložiť bunku pred","insertAfter":"Vložiť bunku za","deleteCell":"Vymazať bunky","merge":"Zlúčiť bunky","mergeRight":"Zlúčiť doprava","mergeDown":"Zlúčiť dole","splitHorizontal":"Rozdeliť bunky horizontálne","splitVertical":"Rozdeliť bunky vertikálne","title":"Vlastnosti bunky","cellType":"Typ bunky","rowSpan":"Rozsah riadkov","colSpan":"Rozsah stĺpcov","wordWrap":"Zalamovanie riadkov","hAlign":"Horizontálne zarovnanie","vAlign":"Vertikálne zarovnanie","alignBaseline":"Základná čiara (baseline)","bgColor":"Farba pozadia","borderColor":"Farba orámovania","data":"Dáta","header":"Hlavička","yes":"Áno","no":"Nie","invalidWidth":"Šírka bunky musí byť číslo.","invalidHeight":"Výška bunky musí byť číslo.","invalidRowSpan":"Rozsah riadkov musí byť celé číslo.","invalidColSpan":"Rozsah stĺpcov musí byť celé číslo.","chooseColor":"Vybrať"},"cellPad":"Odsadenie obsahu (cell padding)","cellSpace":"Vzdialenosť buniek (cell spacing)","column":{"menu":"Stĺpec","insertBefore":"Vložiť stĺpec pred","insertAfter":"Vložiť stĺpec po","deleteColumn":"Zmazať stĺpce"},"columns":"Stĺpce","deleteTable":"Vymazať tabuľku","headers":"Hlavička","headersBoth":"Obe","headersColumn":"Prvý stĺpec","headersNone":"Žiadne","headersRow":"Prvý riadok","invalidBorder":"Šírka orámovania musí byť číslo.","invalidCellPadding":"Odsadenie v bunkách (cell padding) musí byť kladné číslo.","invalidCellSpacing":"Medzera mädzi bunkami (cell spacing) musí byť kladné číslo.","invalidCols":"Počet stĺpcov musí byť číslo väčšie ako 0.","invalidHeight":"Výška tabuľky musí byť číslo.","invalidRows":"Počet riadkov musí byť číslo väčšie ako 0.","invalidWidth":"Širka tabuľky musí byť číslo.","menu":"Vlastnosti tabuľky","row":{"menu":"Riadok","insertBefore":"Vložiť riadok pred","insertAfter":"Vložiť riadok po","deleteRow":"Vymazať riadky"},"rows":"Riadky","summary":"Prehľad","title":"Vlastnosti tabuľky","toolbar":"Tabuľka","widthPc":"percent","widthPx":"pixelov","widthUnit":"jednotka šírky"},"stylescombo":{"label":"Štýly","panelTitle":"Formátovanie štýlov","panelTitle1":"Štýly bloku","panelTitle2":"Vnútroriadkové (inline) štýly","panelTitle3":"Štýly objeku"},"specialchar":{"options":"Možnosti špeciálneho znaku","title":"Výber špeciálneho znaku","toolbar":"Vložiť špeciálny znak"},"sourcedialog":{"toolbar":"Zdroj","title":"Zdroj"},"sourcearea":{"toolbar":"Zdroj"},"showblocks":{"toolbar":"Ukázať bloky"},"removeformat":{"toolbar":"Odstrániť formátovanie"},"pastetext":{"button":"Vložiť ako čistý text","title":"Vložiť ako čistý text"},"pastefromword":{"confirmCleanup":"Zdá sa, že vkladaný text pochádza z programu MS Word. Chcete ho pred vkladaním automaticky vyčistiť?","error":"Kvôli internej chybe nebolo možné vložené dáta vyčistiť","title":"Vložiť z Wordu","toolbar":"Vložiť z Wordu"},"maximize":{"maximize":"Maximalizovať","minimize":"Minimalizovať"},"magicline":{"title":"Odsek vložiť sem"},"list":{"bulletedlist":"Vložiť/odstrániť zoznam s odrážkami","numberedlist":"Vložiť/odstrániť číslovaný zoznam"},"language":{"button":"Nastaviť jazyk","remove":"Odstrániť jazyk"},"justify":{"block":"Zarovnať do bloku","center":"Zarovnať na stred","left":"Zarovnať vľavo","right":"Zarovnať vpravo"},"indent":{"indent":"Zväčšiť odsadenie","outdent":"Zmenšiť odsadenie"},"image2":{"alt":"Alternatívny text","btnUpload":"Odoslať to na server","captioned":"Opísaný obrázok","captionPlaceholder":"Popis","infoTab":"Informácie o obrázku","lockRatio":"Pomer zámky","menu":"Vlastnosti obrázka","pathName":"obrázok","pathNameCaption":"popis","resetSize":"Pôvodná veľkosť","resizer":"Kliknite a potiahnite pre zmenu veľkosti","title":"Vlastnosti obrázka","uploadTab":"Nahrať","urlMissing":"Chýba URL zdroja obrázka.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Vložiť vodorovnú čiaru"},"format":{"label":"Formát","panelTitle":"Odsek","tag_address":"Adresa","tag_div":"Normálny (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normálny","tag_pre":"Formátovaný"},"elementspath":{"eleLabel":"Cesta prvkov","eleTitle":"%1 prvok"},"contextmenu":{"options":"Možnosti kontextového menu"},"clipboard":{"copy":"Kopírovať","copyError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu kopírovania. Použite na to klávesnicu (Ctrl/Cmd+C).","cut":"Vystrihnúť","cutError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu vystrihnutia. Použite na to klávesnicu (Ctrl/Cmd+X).","paste":"Vložiť","pasteArea":"Miesto na vloženie","pasteMsg":"Použitím klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) vložte text do rámčeka a stlačte OK.","securityMsg":"Kvôli bezpečnostným nastaveniam vášho prehliadača editor nemôže pristupovať k schránke na kopírovanie priamo. Vložte to preto do tohto okna.","title":"Vložiť"},"button":{"selectedLabel":"%1 (Vybrané)"},"blockquote":{"toolbar":"Citácia"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Prečiarknuté","subscript":"Dolný index","superscript":"Horný index","underline":"Podčiarknuté"},"about":{"copy":"Copyright &copy; $1. Všetky práva vyhradené.","dlgTitle":"O CKEditor-e","help":"Zaškrtnite $1 pre pomoc.","moreInfo":"Pre informácie o licenciách, prosíme, navštívte našu web stránku:","title":"O CKEditor-e","userGuide":"Používateľská príručka KCEditor-a"},"editor":"Editor formátovaného textu","editorPanel":"Panel editora formátovaného textu","common":{"editorHelp":"Stlačením ALT 0 spustiť pomocníka","browseServer":"Prehliadať server","url":"URL","protocol":"Protokol","upload":"Odoslať","uploadSubmit":"Odoslať na server","image":"Obrázok","flash":"Flash","form":"Formulár","checkbox":"Zaškrtávacie pole","radio":"Prepínač","textField":"Textové pole","textarea":"Textová oblasť","hiddenField":"Skryté pole","button":"Tlačidlo","select":"Rozbaľovací zoznam","imageButton":"Obrázkové tlačidlo","notSet":"<nenastavené>","id":"Id","name":"Meno","langDir":"Orientácia jazyka","langDirLtr":"Zľava doprava (LTR)","langDirRtl":"Sprava doľava (RTL)","langCode":"Kód jazyka","longDescr":"Dlhý popis URL","cssClass":"Trieda štýlu","advisoryTitle":"Pomocný titulok","cssStyle":"Štýl","ok":"OK","cancel":"Zrušiť","close":"Zatvorit","preview":"Náhľad","resize":"Zmeniť veľkosť","generalTab":"Hlavné","advancedTab":"Rozšírené","validateNumberFailed":"Hodnota nie je číslo.","confirmNewPage":"Prajete si načítat novú stránku? Všetky neuložené zmeny budú stratené. ","confirmCancel":"Niektore možnosti boli zmenené. Naozaj chcete zavrieť okno?","options":"Možnosti","target":"Cieľ","targetNew":"Nové okno (_blank)","targetTop":"Najvrchnejšie okno (_top)","targetSelf":"To isté okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","styles":"Štýl","cssClasses":"Triedy štýlu","width":"Šírka","height":"Výška","align":"Zarovnanie","alignLeft":"Vľavo","alignRight":"Vpravo","alignCenter":"Na stred","alignJustify":"Zarovnať do bloku","alignTop":"Nahor","alignMiddle":"Na stred","alignBottom":"Dole","alignNone":"Žiadne","invalidValue":"Neplatná hodnota.","invalidHeight":"Výška musí byť číslo.","invalidWidth":"Šírka musí byť číslo.","invalidCssLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej CSS mernej jednotky (px, %, in, cm, mm, em, ex, pt alebo pc).","invalidHtmlLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej HTML mernej jednotky (px alebo %).","invalidInlineStyle":"Zadaná hodnota pre inline štýl musí pozostávať s jedného, alebo viac dvojíc formátu \"názov: hodnota\", oddelených bodkočiarkou.","cssLengthTooltip":"Vložte číslo pre hodnotu v pixeloch alebo číslo so správnou CSS jednotou (px, %, in, cm, mm, em, ex, pt alebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupný</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Medzerník","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Klávesová skratka"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/sl.js b/web/core/assets/vendor/ckeditor/lang/sl.js
index d40695a14..a6a9d4e99 100644
--- a/web/core/assets/vendor/ckeditor/lang/sl.js
+++ b/web/core/assets/vendor/ckeditor/lang/sl.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sl']={"widget":{"move":"Kliknite in povlecite, da premaknete","label":"%1 widget"},"undo":{"redo":"Uveljavi","undo":"Razveljavi"},"toolbar":{"toolbarCollapse":"Skrči orodno vrstico","toolbarExpand":"Razširi orodno vrstico","toolbarGroups":{"document":"Dokument","clipboard":"Odložišče/Razveljavi","editing":"Urejanje","forms":"Obrazci","basicstyles":"Osnovni slogi","paragraph":"Odstavek","links":"Povezave","insert":"Vstavi","styles":"Slogi","colors":"Barve","tools":"Orodja"},"toolbars":"Orodne vrstice urejevalnika"},"table":{"border":"Velikost obrobe","caption":"Napis","cell":{"menu":"Celica","insertBefore":"Vstavi celico pred","insertAfter":"Vstavi celico za","deleteCell":"Izbriši celice","merge":"Združi celice","mergeRight":"Združi desno","mergeDown":"Združi navzdol","splitHorizontal":"Razdeli celico vodoravno","splitVertical":"Razdeli celico navpično","title":"Lastnosti celice","cellType":"Vrsta celice","rowSpan":"Razpon vrstic","colSpan":"Razpon stolpcev","wordWrap":"Prelom besedila","hAlign":"Vodoravna poravnava","vAlign":"Navpična poravnava","alignBaseline":"Osnovnica","bgColor":"Barva ozadja","borderColor":"Barva obrobe","data":"Podatki","header":"Glava","yes":"Da","no":"Ne","invalidWidth":"Širina celice mora biti število.","invalidHeight":"Višina celice mora biti število.","invalidRowSpan":"Razpon vrstic mora biti celo število.","invalidColSpan":"Razpon stolpcev mora biti celo število.","chooseColor":"Izberi"},"cellPad":"Odmik znotraj celic","cellSpace":"Razmik med celicami","column":{"menu":"Stolpec","insertBefore":"Vstavi stolpec pred","insertAfter":"Vstavi stolpec za","deleteColumn":"Izbriši stolpce"},"columns":"Stolpci","deleteTable":"Izbriši tabelo","headers":"Glave","headersBoth":"Oboje","headersColumn":"Prvi stolpec","headersNone":"Brez","headersRow":"Prva vrstica","invalidBorder":"Širina obrobe mora biti število.","invalidCellPadding":"Odmik znotraj celic mora biti pozitivno število.","invalidCellSpacing":"Razmik med celicami mora biti pozitivno število.","invalidCols":"Število stolpcev mora biti večje od 0.","invalidHeight":"Višina tabele mora biti število.","invalidRows":"Število vrstic mora biti večje od 0.","invalidWidth":"Širina tabele mora biti število.","menu":"Lastnosti tabele","row":{"menu":"Vrstica","insertBefore":"Vstavi vrstico pred","insertAfter":"Vstavi vrstico za","deleteRow":"Izbriši vrstice"},"rows":"Vrstice","summary":"Povzetek","title":"Lastnosti tabele","toolbar":"Tabela","widthPc":"odstotkov","widthPx":"pik","widthUnit":"enota širine"},"stylescombo":{"label":"Slog","panelTitle":"Oblikovalni Stili","panelTitle1":"Slogi odstavkov","panelTitle2":"Slogi besedila","panelTitle3":"Slogi objektov"},"specialchar":{"options":"Možnosti posebnih znakov","title":"Izberi posebni znak","toolbar":"Vstavi posebni znak"},"sourcedialog":{"toolbar":"Izvorna koda","title":"Izvorna koda"},"sourcearea":{"toolbar":"Izvorna koda"},"showblocks":{"toolbar":"Prikaži ograde"},"removeformat":{"toolbar":"Odstrani oblikovanje"},"pastetext":{"button":"Prilepi kot golo besedilo","title":"Prilepi kot golo besedilo"},"pastefromword":{"confirmCleanup":"Besedilo, ki ga želite prilepiti, je kopirano iz Worda. Ali ga želite očistiti, preden ga prilepite?","error":"Ni bilo mogoče očistiti prilepljenih podatkov zaradi notranje napake","title":"Prilepi iz Worda","toolbar":"Prilepi iz Worda"},"maximize":{"maximize":"Maksimiraj","minimize":"Minimiraj"},"magicline":{"title":"Vstavite odstavek tukaj"},"list":{"bulletedlist":"Vstavi/odstrani neoštevilčen seznam","numberedlist":"Vstavi/odstrani oštevilčen seznam"},"language":{"button":"Nastavi jezik","remove":"Odstrani jezik"},"justify":{"block":"Obojestranska poravnava","center":"Sredinska poravnava","left":"Leva poravnava","right":"Desna poravnava"},"indent":{"indent":"Povečaj zamik","outdent":"Zmanjšaj zamik"},"image2":{"alt":"Nadomestno besedilo","btnUpload":"Pošlji na strežnik","captioned":"Slika z napisom","captionPlaceholder":"Napis","infoTab":"Podatki o sliki","lockRatio":"Zakleni razmerje","menu":"Lastnosti slike","pathName":"slika","pathNameCaption":"napis","resetSize":"Ponastavi velikost","resizer":"Kliknite in povlecite, da spremenite velikost","title":"Lastnosti slike","uploadTab":"Naloži","urlMissing":"Manjka vir (URL) slike."},"horizontalrule":{"toolbar":"Vstavi vodoravno črto"},"format":{"label":"Oblika","panelTitle":"Oblika odstavka","tag_address":"Napis","tag_div":"Navaden (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Navaden","tag_pre":"Oblikovan"},"elementspath":{"eleLabel":"Pot elementov","eleTitle":"Element %1"},"contextmenu":{"options":"Možnosti kontekstnega menija"},"clipboard":{"copy":"Kopiraj","copyError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+X).","paste":"Prilepi","pasteArea":"Prilepi območje","pasteMsg":"Prosimo, prilepite v sleči okvir s pomočjo tipkovnice (<strong>Ctrl/Cmd+V</strong>) in pritisnite V redu.","securityMsg":"Zaradi varnostnih nastavitev vašega brskalnika urejevalnik ne more neposredno dostopati do odložišča. Vsebino odložišča ponovno prilepite v to okno.","title":"Prilepi"},"button":{"selectedLabel":"%1 (Izbrano)"},"blockquote":{"toolbar":"Citat"},"basicstyles":{"bold":"Krepko","italic":"Ležeče","strike":"Prečrtano","subscript":"Podpisano","superscript":"Nadpisano","underline":"Podčrtano"},"about":{"copy":"Copyright &copy; $1. Vse pravice pridržane.","dlgTitle":"O programu CKEditor","help":"Oglejte si $1 za pomoč.","moreInfo":"Za informacije o licenciranju prosimo obiščite našo spletno stran:","title":"O programu CKEditor","userGuide":"Uporabniški vodnik CKEditor"},"editor":"Urejevalnik obogatenega besedila","editorPanel":"Plošča urejevalnika obogatenega besedila","common":{"editorHelp":"Pritisnite ALT 0 za pomoč","browseServer":"Prebrskaj na strežniku","url":"URL","protocol":"Protokol","upload":"Naloži","uploadSubmit":"Pošlji na strežnik","image":"Slika","flash":"Flash","form":"Obrazec","checkbox":"Potrditveno polje","radio":"Izbirno polje","textField":"Besedilno polje","textarea":"Besedilno območje","hiddenField":"Skrito polje","button":"Gumb","select":"Spustno polje","imageButton":"Slikovni gumb","notSet":"<ni določen>","id":"Id","name":"Ime","langDir":"Smer jezika","langDirLtr":"Od leve proti desni (LTR)","langDirRtl":"Od desne proti levi (RTL)","langCode":"Koda jezika","longDescr":"Dolg opis URL-ja","cssClass":"Razredi slogovne predloge","advisoryTitle":"Predlagani naslov","cssStyle":"Slog","ok":"V redu","cancel":"Prekliči","close":"Zapri","preview":"Predogled","resize":"Potegni za spremembo velikosti","generalTab":"Splošno","advancedTab":"Napredno","validateNumberFailed":"Vrednost ni število.","confirmNewPage":"Vse neshranjene spremembe vsebine bodo izgubljene. Ali res želite naložiti novo stran?","confirmCancel":"Spremenili ste nekaj možnosti. Ali res želite zapreti okno?","options":"Možnosti","target":"Cilj","targetNew":"Novo okno (_blank)","targetTop":"Vrhovno okno (_top)","targetSelf":"Isto okno (_self)","targetParent":"Starševsko okno (_parent)","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","styles":"Slog","cssClasses":"Razredi slogovne predloge","width":"Širina","height":"Višina","align":"Poravnava","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredinsko","alignJustify":"Obojestranska poravnava","alignTop":"Na vrh","alignMiddle":"V sredino","alignBottom":"Na dno","alignNone":"Brez poravnave","invalidValue":"Neveljavna vrednost.","invalidHeight":"Višina mora biti število.","invalidWidth":"Širina mora biti število.","invalidCssLength":"Vrednost, določena za polje »%1«, mora biti pozitivno število z ali brez veljavne CSS-enote za merjenje (px, %, in, cm, mm, em, ex, pt ali pc).","invalidHtmlLength":"Vrednost, določena za polje »%1«, mora biti pozitivno število z ali brez veljavne HTML-enote za merjenje (px ali %).","invalidInlineStyle":"Vrednost, določena za slog v vrstici, mora biti sestavljena iz ene ali več dvojic oblike »ime : vrednost«, ločenih s podpičji.","cssLengthTooltip":"Vnesite število za vrednost v slikovnih pikah ali število z veljavno CSS-enoto (px, %, in, cm, mm, em, ex, pt ali pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedosegljiv</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sl']={"widget":{"move":"Kliknite in povlecite, da premaknete","label":"%1 widget"},"undo":{"redo":"Uveljavi","undo":"Razveljavi"},"toolbar":{"toolbarCollapse":"Skrči orodno vrstico","toolbarExpand":"Razširi orodno vrstico","toolbarGroups":{"document":"Dokument","clipboard":"Odložišče/Razveljavi","editing":"Urejanje","forms":"Obrazci","basicstyles":"Osnovni slogi","paragraph":"Odstavek","links":"Povezave","insert":"Vstavi","styles":"Slogi","colors":"Barve","tools":"Orodja"},"toolbars":"Orodne vrstice urejevalnika"},"table":{"border":"Velikost obrobe","caption":"Napis","cell":{"menu":"Celica","insertBefore":"Vstavi celico pred","insertAfter":"Vstavi celico za","deleteCell":"Izbriši celice","merge":"Združi celice","mergeRight":"Združi desno","mergeDown":"Združi navzdol","splitHorizontal":"Razdeli celico vodoravno","splitVertical":"Razdeli celico navpično","title":"Lastnosti celice","cellType":"Vrsta celice","rowSpan":"Razpon vrstic","colSpan":"Razpon stolpcev","wordWrap":"Prelom besedila","hAlign":"Vodoravna poravnava","vAlign":"Navpična poravnava","alignBaseline":"Osnovnica","bgColor":"Barva ozadja","borderColor":"Barva obrobe","data":"Podatki","header":"Glava","yes":"Da","no":"Ne","invalidWidth":"Širina celice mora biti število.","invalidHeight":"Višina celice mora biti število.","invalidRowSpan":"Razpon vrstic mora biti celo število.","invalidColSpan":"Razpon stolpcev mora biti celo število.","chooseColor":"Izberi"},"cellPad":"Odmik znotraj celic","cellSpace":"Razmik med celicami","column":{"menu":"Stolpec","insertBefore":"Vstavi stolpec pred","insertAfter":"Vstavi stolpec za","deleteColumn":"Izbriši stolpce"},"columns":"Stolpci","deleteTable":"Izbriši tabelo","headers":"Glave","headersBoth":"Oboje","headersColumn":"Prvi stolpec","headersNone":"Brez","headersRow":"Prva vrstica","invalidBorder":"Širina obrobe mora biti število.","invalidCellPadding":"Odmik znotraj celic mora biti pozitivno število.","invalidCellSpacing":"Razmik med celicami mora biti pozitivno število.","invalidCols":"Število stolpcev mora biti večje od 0.","invalidHeight":"Višina tabele mora biti število.","invalidRows":"Število vrstic mora biti večje od 0.","invalidWidth":"Širina tabele mora biti število.","menu":"Lastnosti tabele","row":{"menu":"Vrstica","insertBefore":"Vstavi vrstico pred","insertAfter":"Vstavi vrstico za","deleteRow":"Izbriši vrstice"},"rows":"Vrstice","summary":"Povzetek","title":"Lastnosti tabele","toolbar":"Tabela","widthPc":"odstotkov","widthPx":"pik","widthUnit":"enota širine"},"stylescombo":{"label":"Slog","panelTitle":"Oblikovalni Stili","panelTitle1":"Slogi odstavkov","panelTitle2":"Slogi besedila","panelTitle3":"Slogi objektov"},"specialchar":{"options":"Možnosti posebnih znakov","title":"Izberi posebni znak","toolbar":"Vstavi posebni znak"},"sourcedialog":{"toolbar":"Izvorna koda","title":"Izvorna koda"},"sourcearea":{"toolbar":"Izvorna koda"},"showblocks":{"toolbar":"Prikaži ograde"},"removeformat":{"toolbar":"Odstrani oblikovanje"},"pastetext":{"button":"Prilepi kot golo besedilo","title":"Prilepi kot golo besedilo"},"pastefromword":{"confirmCleanup":"Besedilo, ki ga želite prilepiti, je kopirano iz Worda. Ali ga želite očistiti, preden ga prilepite?","error":"Ni bilo mogoče očistiti prilepljenih podatkov zaradi notranje napake","title":"Prilepi iz Worda","toolbar":"Prilepi iz Worda"},"maximize":{"maximize":"Maksimiraj","minimize":"Minimiraj"},"magicline":{"title":"Vstavite odstavek tukaj"},"list":{"bulletedlist":"Vstavi/odstrani neoštevilčen seznam","numberedlist":"Vstavi/odstrani oštevilčen seznam"},"language":{"button":"Nastavi jezik","remove":"Odstrani jezik"},"justify":{"block":"Obojestranska poravnava","center":"Sredinska poravnava","left":"Leva poravnava","right":"Desna poravnava"},"indent":{"indent":"Povečaj zamik","outdent":"Zmanjšaj zamik"},"image2":{"alt":"Nadomestno besedilo","btnUpload":"Pošlji na strežnik","captioned":"Slika z napisom","captionPlaceholder":"Napis","infoTab":"Podatki o sliki","lockRatio":"Zakleni razmerje","menu":"Lastnosti slike","pathName":"slika","pathNameCaption":"napis","resetSize":"Ponastavi velikost","resizer":"Kliknite in povlecite, da spremenite velikost","title":"Lastnosti slike","uploadTab":"Naloži","urlMissing":"Manjka vir (URL) slike.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Vstavi vodoravno črto"},"format":{"label":"Oblika","panelTitle":"Oblika odstavka","tag_address":"Napis","tag_div":"Navaden (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Navaden","tag_pre":"Oblikovan"},"elementspath":{"eleLabel":"Pot elementov","eleTitle":"Element %1"},"contextmenu":{"options":"Možnosti kontekstnega menija"},"clipboard":{"copy":"Kopiraj","copyError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+X).","paste":"Prilepi","pasteArea":"Prilepi območje","pasteMsg":"Prosimo, prilepite v sleči okvir s pomočjo tipkovnice (<strong>Ctrl/Cmd+V</strong>) in pritisnite V redu.","securityMsg":"Zaradi varnostnih nastavitev vašega brskalnika urejevalnik ne more neposredno dostopati do odložišča. Vsebino odložišča ponovno prilepite v to okno.","title":"Prilepi"},"button":{"selectedLabel":"%1 (Izbrano)"},"blockquote":{"toolbar":"Citat"},"basicstyles":{"bold":"Krepko","italic":"Ležeče","strike":"Prečrtano","subscript":"Podpisano","superscript":"Nadpisano","underline":"Podčrtano"},"about":{"copy":"Copyright &copy; $1. Vse pravice pridržane.","dlgTitle":"O programu CKEditor","help":"Oglejte si $1 za pomoč.","moreInfo":"Za informacije o licenciranju prosimo obiščite našo spletno stran:","title":"O programu CKEditor","userGuide":"Uporabniški vodnik CKEditor"},"editor":"Urejevalnik obogatenega besedila","editorPanel":"Plošča urejevalnika obogatenega besedila","common":{"editorHelp":"Pritisnite ALT 0 za pomoč","browseServer":"Prebrskaj na strežniku","url":"URL","protocol":"Protokol","upload":"Naloži","uploadSubmit":"Pošlji na strežnik","image":"Slika","flash":"Flash","form":"Obrazec","checkbox":"Potrditveno polje","radio":"Izbirno polje","textField":"Besedilno polje","textarea":"Besedilno območje","hiddenField":"Skrito polje","button":"Gumb","select":"Spustno polje","imageButton":"Slikovni gumb","notSet":"<ni določen>","id":"Id","name":"Ime","langDir":"Smer jezika","langDirLtr":"Od leve proti desni (LTR)","langDirRtl":"Od desne proti levi (RTL)","langCode":"Koda jezika","longDescr":"Dolg opis URL-ja","cssClass":"Razredi slogovne predloge","advisoryTitle":"Predlagani naslov","cssStyle":"Slog","ok":"V redu","cancel":"Prekliči","close":"Zapri","preview":"Predogled","resize":"Potegni za spremembo velikosti","generalTab":"Splošno","advancedTab":"Napredno","validateNumberFailed":"Vrednost ni število.","confirmNewPage":"Vse neshranjene spremembe vsebine bodo izgubljene. Ali res želite naložiti novo stran?","confirmCancel":"Spremenili ste nekaj možnosti. Ali res želite zapreti okno?","options":"Možnosti","target":"Cilj","targetNew":"Novo okno (_blank)","targetTop":"Vrhovno okno (_top)","targetSelf":"Isto okno (_self)","targetParent":"Starševsko okno (_parent)","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","styles":"Slog","cssClasses":"Razredi slogovne predloge","width":"Širina","height":"Višina","align":"Poravnava","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredinsko","alignJustify":"Obojestranska poravnava","alignTop":"Na vrh","alignMiddle":"V sredino","alignBottom":"Na dno","alignNone":"Brez poravnave","invalidValue":"Neveljavna vrednost.","invalidHeight":"Višina mora biti število.","invalidWidth":"Širina mora biti število.","invalidCssLength":"Vrednost, določena za polje »%1«, mora biti pozitivno število z ali brez veljavne CSS-enote za merjenje (px, %, in, cm, mm, em, ex, pt ali pc).","invalidHtmlLength":"Vrednost, določena za polje »%1«, mora biti pozitivno število z ali brez veljavne HTML-enote za merjenje (px ali %).","invalidInlineStyle":"Vrednost, določena za slog v vrstici, mora biti sestavljena iz ene ali več dvojic oblike »ime : vrednost«, ločenih s podpičji.","cssLengthTooltip":"Vnesite število za vrednost v slikovnih pikah ali število z veljavno CSS-enoto (px, %, in, cm, mm, em, ex, pt ali pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedosegljiv</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/sq.js b/web/core/assets/vendor/ckeditor/lang/sq.js
index 19d82a4e7..0a93dcec0 100644
--- a/web/core/assets/vendor/ckeditor/lang/sq.js
+++ b/web/core/assets/vendor/ckeditor/lang/sq.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sq']={"widget":{"move":"Kliko dhe tërhiqe për ta lëvizur","label":"%1 widget"},"undo":{"redo":"Ribëje","undo":"Rizhbëje"},"toolbar":{"toolbarCollapse":"Zvogëlo Shiritin","toolbarExpand":"Zgjero Shiritin","toolbarGroups":{"document":"Dokument","clipboard":"Tabela Punës/Ribëje","editing":"Duke Redaktuar","forms":"Formular","basicstyles":"Stili Bazë","paragraph":"Paragraf","links":"Nyjet","insert":"Shto","styles":"Stil","colors":"Ngjyrat","tools":"Mjetet"},"toolbars":"Shiritet e Redaktuesit"},"table":{"border":"Madhësia e kornizave","caption":"Titull","cell":{"menu":"Qeli","insertBefore":"Shto Qeli Para","insertAfter":"Shto Qeli Prapa","deleteCell":"Gris Qelitë","merge":"Bashko Qelitë","mergeRight":"Bashko Djathtas","mergeDown":"Bashko Poshtë","splitHorizontal":"Ndaj Qelinë Horizontalisht","splitVertical":"Ndaj Qelinë Vertikalisht","title":"Rekuizitat e Qelisë","cellType":"Lloji i Qelisë","rowSpan":"Bashko Rreshtat","colSpan":"Bashko Kolonat","wordWrap":"Fund i Fjalës","hAlign":"Bashkimi Horizontal","vAlign":"Bashkimi Vertikal","alignBaseline":"Baza","bgColor":"Ngjyra e Prapavijës","borderColor":"Ngjyra e Kornizave","data":"Të dhënat","header":"Koka","yes":"Po","no":"Jo","invalidWidth":"Gjerësia e qelisë duhet të jetë numër.","invalidHeight":"Lartësia e qelisë duhet të jetë numër.","invalidRowSpan":"Hapësira e rreshtave duhet të jetë numër i plotë.","invalidColSpan":"Hapësira e kolonave duhet të jetë numër i plotë.","chooseColor":"Përzgjidh"},"cellPad":"Mbushja e qelisë","cellSpace":"Hapësira e qelisë","column":{"menu":"Kolona","insertBefore":"Vendos Kolonë Para","insertAfter":"Vendos Kolonë Pas","deleteColumn":"Gris Kolonat"},"columns":"Kolonat","deleteTable":"Gris Tabelën","headers":"Kokat","headersBoth":"Së bashku","headersColumn":"Kolona e parë","headersNone":"Asnjë","headersRow":"Rreshti i Parë","invalidBorder":"Madhësia e kufinjve duhet të jetë numër.","invalidCellPadding":"Mbushja e qelisë duhet të jetë numër pozitiv.","invalidCellSpacing":"Hapësira e qelisë duhet të jetë numër pozitiv.","invalidCols":"Numri i kolonave duhet të jetë numër më i madh se 0.","invalidHeight":"Lartësia e tabelës duhet të jetë numër.","invalidRows":"Numri i rreshtave duhet të jetë numër më i madh se 0.","invalidWidth":"Gjerësia e tabelës duhet të jetë numër.","menu":"Karakteristikat e Tabelës","row":{"menu":"Rreshti","insertBefore":"Shto Rresht Para","insertAfter":"Shto Rresht Prapa","deleteRow":"Gris Rreshtat"},"rows":"Rreshtat","summary":"Përmbledhje","title":"Karakteristikat e Tabelës","toolbar":"Tabela","widthPc":"përqind","widthPx":"piksell","widthUnit":"njësia e gjerësisë"},"stylescombo":{"label":"Stil","panelTitle":"Stilet e Formatimit","panelTitle1":"Stilet e Bllokut","panelTitle2":"Stili i Brendshëm","panelTitle3":"Stilet e Objektit"},"specialchar":{"options":"Mundësitë për Karaktere Speciale","title":"Përzgjidh Karakter Special","toolbar":"Vendos Karakter Special"},"sourcedialog":{"toolbar":"Burimi","title":"Burimi"},"sourcearea":{"toolbar":"Burimi"},"showblocks":{"toolbar":"Shfaq Blloqet"},"removeformat":{"toolbar":"Largo Formatin"},"pastetext":{"button":"Hidhe si tekst të thjeshtë","title":"Hidhe si Tekst të Thjeshtë"},"pastefromword":{"confirmCleanup":"Teksti që dëshironi të e hidhni siç duket është kopjuar nga Word-i. Dëshironi të e pastroni para se të e hidhni?","error":"Nuk ishte e mundur të fshiheshin të dhënat e hedhura për shkak të një gabimi të brendshëm","title":"Hidhe nga Word-i","toolbar":"Hidhe nga Word-i"},"maximize":{"maximize":"Zmadho","minimize":"Zvogëlo"},"magicline":{"title":"Vendos paragraf këtu"},"list":{"bulletedlist":"Vendos/Largo Listën me Pika","numberedlist":"Vendos/Largo Listën me Numra"},"language":{"button":"Përzgjidhni gjuhën","remove":"Largoni gjuhën"},"justify":{"block":"Zgjero","center":"Qendër","left":"Rreshto majtas","right":"Rreshto Djathtas"},"indent":{"indent":"Rrite Identin","outdent":"Zvogëlo Identin"},"image2":{"alt":"Tekst Alternativ","btnUpload":"Dërgo në server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informacione mbi Fotografinë","lockRatio":"Mbyll Racionin","menu":"Karakteristikat e Fotografisë","pathName":"foto","pathNameCaption":"caption","resetSize":"Rikthe Madhësinë","resizer":"Click and drag to resize","title":"Karakteristikat e Fotografisë","uploadTab":"Ngarko","urlMissing":"Mungon URL e burimit të fotografisë."},"horizontalrule":{"toolbar":"Vendos Vijë Horizontale"},"format":{"label":"Formati","panelTitle":"Formati i Paragrafit","tag_address":"Adresa","tag_div":"Normal (DIV)","tag_h1":"Titulli 1","tag_h2":"Titulli 2","tag_h3":"Titulli 3","tag_h4":"Titulli 4","tag_h5":"Titulli 5","tag_h6":"Titulli 6","tag_p":"Normal","tag_pre":"Formatuar"},"elementspath":{"eleLabel":"Rruga e elementeve","eleTitle":"%1 element"},"contextmenu":{"options":"Mundësitë e Menysë së Kontekstit"},"clipboard":{"copy":"Kopjo","copyError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e kopjimit. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+C).","cut":"Preje","cutError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e prerjes. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+X).","paste":"Hidhe","pasteArea":"Hapësira Hedhëse","pasteMsg":"Ju lutemi hidhni brenda kutizës në vijim duke shfrytëzuar tastierën (<strong>Ctrl/Cmd+V</strong>) dhe shtypni Mirë.","securityMsg":"Për shkak të dhënave të sigurisë së shfletuesit tuaj, redaktuesi nuk është në gjendje të i qaset drejtpërdrejtë të dhanve të tabelës suaj të punës. Ju duhet të hidhni atë përsëri në këtë dritare.","title":"Hidhe"},"button":{"selectedLabel":"%1 (Përzgjedhur)"},"blockquote":{"toolbar":"Citatet"},"basicstyles":{"bold":"Trash","italic":"Pjerrët","strike":"Nëpërmes","subscript":"Nën-skriptë","superscript":"Super-skriptë","underline":"Nënvijëzuar"},"about":{"copy":"Të drejtat  e kopjimit &copy; $1. Të gjitha të drejtat e rezervuara.","dlgTitle":"Rreth CKEditor","help":"Kontrollo $1 për ndihmë.","moreInfo":"Për informacione rreth licencave shih faqen tonë:","title":"Rreth CKEditor","userGuide":"Udhëzuesi i Shfrytëzuesit të CKEditor"},"editor":"Redaktues i Pasur Teksti","editorPanel":"Paneli i redaktuesit të tekstit të plotë","common":{"editorHelp":"Shtyp ALT 0 për ndihmë","browseServer":"Shfleto në Server","url":"URL","protocol":"Protokolli","upload":"Ngarko","uploadSubmit":"Dërgo në server","image":"Imazh","flash":"Objekt flash","form":"Formular","checkbox":"Checkbox","radio":"Buton radio","textField":"Fushë tekst","textarea":"Hapësirë tekst","hiddenField":"Fushë e fshehur","button":"Buton","select":"Menu zgjedhjeje","imageButton":"Buton imazhi","notSet":"<e pazgjedhur>","id":"Id","name":"Emër","langDir":"Kod gjuhe","langDirLtr":"Nga e majta në të djathtë (LTR)","langDirRtl":"Nga e djathta në të majtë (RTL)","langCode":"Kod gjuhe","longDescr":"Përshkrim i hollësishëm","cssClass":"Klasa stili CSS","advisoryTitle":"Titull","cssStyle":"Stil","ok":"OK","cancel":"Anulo","close":"Mbyll","preview":"Parashiko","resize":"Ripërmaso","generalTab":"Të përgjithshme","advancedTab":"Të përparuara","validateNumberFailed":"Vlera e futur nuk është një numër","confirmNewPage":"Çdo ndryshim që nuk është ruajtur do humbasë. Je i sigurtë që dëshiron të krijosh një faqe të re?","confirmCancel":"Disa opsione kanë ndryshuar. Je i sigurtë që dëshiron ta mbyllësh dritaren?","options":"Opsione","target":"Objektivi","targetNew":"Dritare e re (_blank)","targetTop":"Dritare në plan të parë (_top)","targetSelf":"E njëjta dritare (_self)","targetParent":"Dritarja prind (_parent)","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","styles":"Stil","cssClasses":"Klasa Stili CSS","width":"Gjerësi","height":"Lartësi","align":"Rreshtim","alignLeft":"Majtas","alignRight":"Djathtas","alignCenter":"Qendër","alignJustify":"Zgjero","alignTop":"Lart","alignMiddle":"Në mes","alignBottom":"Poshtë","alignNone":"Asnjë","invalidValue":"Vlerë e pavlefshme","invalidHeight":"Lartësia duhet të jetë një numër","invalidWidth":"Gjerësia duhet të jetë një numër","invalidCssLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme CSS (px, %, in, cm, mm, em, ex, pt ose pc).","invalidHtmlLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme HTML (px ose %)","invalidInlineStyle":"Stili inline duhet të jetë një apo disa vlera të formatit \"emër: vlerë\", ndarë nga pikëpresje.","cssLengthTooltip":"Fut një numër për vlerën në pixel apo një numër me një njësi të vlefshme CSS (px, %, in, cm, mm, ex, pt, ose pc).","unavailable":"%1<span class=\"cke_accessibility\">, i padisponueshëm</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sq']={"widget":{"move":"Kliko dhe tërhiqe për ta lëvizur","label":"%1 widget"},"undo":{"redo":"Ribëje","undo":"Rizhbëje"},"toolbar":{"toolbarCollapse":"Zvogëlo Shiritin","toolbarExpand":"Zgjero Shiritin","toolbarGroups":{"document":"Dokument","clipboard":"Tabela Punës/Ribëje","editing":"Duke Redaktuar","forms":"Formular","basicstyles":"Stili Bazë","paragraph":"Paragraf","links":"Nyjet","insert":"Shto","styles":"Stil","colors":"Ngjyrat","tools":"Mjetet"},"toolbars":"Shiritet e Redaktuesit"},"table":{"border":"Madhësia e kornizave","caption":"Titull","cell":{"menu":"Qeli","insertBefore":"Shto Qeli Para","insertAfter":"Shto Qeli Prapa","deleteCell":"Gris Qelitë","merge":"Bashko Qelitë","mergeRight":"Bashko Djathtas","mergeDown":"Bashko Poshtë","splitHorizontal":"Ndaj Qelinë Horizontalisht","splitVertical":"Ndaj Qelinë Vertikalisht","title":"Rekuizitat e Qelisë","cellType":"Lloji i Qelisë","rowSpan":"Bashko Rreshtat","colSpan":"Bashko Kolonat","wordWrap":"Fund i Fjalës","hAlign":"Bashkimi Horizontal","vAlign":"Bashkimi Vertikal","alignBaseline":"Baza","bgColor":"Ngjyra e Prapavijës","borderColor":"Ngjyra e Kornizave","data":"Të dhënat","header":"Koka","yes":"Po","no":"Jo","invalidWidth":"Gjerësia e qelisë duhet të jetë numër.","invalidHeight":"Lartësia e qelisë duhet të jetë numër.","invalidRowSpan":"Hapësira e rreshtave duhet të jetë numër i plotë.","invalidColSpan":"Hapësira e kolonave duhet të jetë numër i plotë.","chooseColor":"Përzgjidh"},"cellPad":"Mbushja e qelisë","cellSpace":"Hapësira e qelisë","column":{"menu":"Kolona","insertBefore":"Vendos Kolonë Para","insertAfter":"Vendos Kolonë Pas","deleteColumn":"Gris Kolonat"},"columns":"Kolonat","deleteTable":"Gris Tabelën","headers":"Kokat","headersBoth":"Së bashku","headersColumn":"Kolona e parë","headersNone":"Asnjë","headersRow":"Rreshti i Parë","invalidBorder":"Madhësia e kufinjve duhet të jetë numër.","invalidCellPadding":"Mbushja e qelisë duhet të jetë numër pozitiv.","invalidCellSpacing":"Hapësira e qelisë duhet të jetë numër pozitiv.","invalidCols":"Numri i kolonave duhet të jetë numër më i madh se 0.","invalidHeight":"Lartësia e tabelës duhet të jetë numër.","invalidRows":"Numri i rreshtave duhet të jetë numër më i madh se 0.","invalidWidth":"Gjerësia e tabelës duhet të jetë numër.","menu":"Karakteristikat e Tabelës","row":{"menu":"Rreshti","insertBefore":"Shto Rresht Para","insertAfter":"Shto Rresht Prapa","deleteRow":"Gris Rreshtat"},"rows":"Rreshtat","summary":"Përmbledhje","title":"Karakteristikat e Tabelës","toolbar":"Tabela","widthPc":"përqind","widthPx":"piksell","widthUnit":"njësia e gjerësisë"},"stylescombo":{"label":"Stil","panelTitle":"Stilet e Formatimit","panelTitle1":"Stilet e Bllokut","panelTitle2":"Stili i Brendshëm","panelTitle3":"Stilet e Objektit"},"specialchar":{"options":"Mundësitë për Karaktere Speciale","title":"Përzgjidh Karakter Special","toolbar":"Vendos Karakter Special"},"sourcedialog":{"toolbar":"Burimi","title":"Burimi"},"sourcearea":{"toolbar":"Burimi"},"showblocks":{"toolbar":"Shfaq Blloqet"},"removeformat":{"toolbar":"Largo Formatin"},"pastetext":{"button":"Hidhe si tekst të thjeshtë","title":"Hidhe si Tekst të Thjeshtë"},"pastefromword":{"confirmCleanup":"Teksti që dëshironi të e hidhni siç duket është kopjuar nga Word-i. Dëshironi të e pastroni para se të e hidhni?","error":"Nuk ishte e mundur të fshiheshin të dhënat e hedhura për shkak të një gabimi të brendshëm","title":"Hidhe nga Word-i","toolbar":"Hidhe nga Word-i"},"maximize":{"maximize":"Zmadho","minimize":"Zvogëlo"},"magicline":{"title":"Vendos paragraf këtu"},"list":{"bulletedlist":"Vendos/Largo Listën me Pika","numberedlist":"Vendos/Largo Listën me Numra"},"language":{"button":"Përzgjidhni gjuhën","remove":"Largoni gjuhën"},"justify":{"block":"Zgjero","center":"Qendër","left":"Rreshto majtas","right":"Rreshto Djathtas"},"indent":{"indent":"Rrite Identin","outdent":"Zvogëlo Identin"},"image2":{"alt":"Tekst Alternativ","btnUpload":"Dërgo në server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informacione mbi Fotografinë","lockRatio":"Mbyll Racionin","menu":"Karakteristikat e Fotografisë","pathName":"foto","pathNameCaption":"caption","resetSize":"Rikthe Madhësinë","resizer":"Click and drag to resize","title":"Karakteristikat e Fotografisë","uploadTab":"Ngarko","urlMissing":"Mungon URL e burimit të fotografisë.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Vendos Vijë Horizontale"},"format":{"label":"Formati","panelTitle":"Formati i Paragrafit","tag_address":"Adresa","tag_div":"Normal (DIV)","tag_h1":"Titulli 1","tag_h2":"Titulli 2","tag_h3":"Titulli 3","tag_h4":"Titulli 4","tag_h5":"Titulli 5","tag_h6":"Titulli 6","tag_p":"Normal","tag_pre":"Formatuar"},"elementspath":{"eleLabel":"Rruga e elementeve","eleTitle":"%1 element"},"contextmenu":{"options":"Mundësitë e Menysë së Kontekstit"},"clipboard":{"copy":"Kopjo","copyError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e kopjimit. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+C).","cut":"Preje","cutError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e prerjes. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+X).","paste":"Hidhe","pasteArea":"Hapësira Hedhëse","pasteMsg":"Ju lutemi hidhni brenda kutizës në vijim duke shfrytëzuar tastierën (<strong>Ctrl/Cmd+V</strong>) dhe shtypni Mirë.","securityMsg":"Për shkak të dhënave të sigurisë së shfletuesit tuaj, redaktuesi nuk është në gjendje të i qaset drejtpërdrejtë të dhanve të tabelës suaj të punës. Ju duhet të hidhni atë përsëri në këtë dritare.","title":"Hidhe"},"button":{"selectedLabel":"%1 (Përzgjedhur)"},"blockquote":{"toolbar":"Citatet"},"basicstyles":{"bold":"Trash","italic":"Pjerrët","strike":"Nëpërmes","subscript":"Nën-skriptë","superscript":"Super-skriptë","underline":"Nënvijëzuar"},"about":{"copy":"Të drejtat  e kopjimit &copy; $1. Të gjitha të drejtat e rezervuara.","dlgTitle":"Rreth CKEditor","help":"Kontrollo $1 për ndihmë.","moreInfo":"Për informacione rreth licencave shih faqen tonë:","title":"Rreth CKEditor","userGuide":"Udhëzuesi i Shfrytëzuesit të CKEditor"},"editor":"Redaktues i Pasur Teksti","editorPanel":"Paneli i redaktuesit të tekstit të plotë","common":{"editorHelp":"Shtyp ALT 0 për ndihmë","browseServer":"Shfleto në Server","url":"URL","protocol":"Protokolli","upload":"Ngarko","uploadSubmit":"Dërgo në server","image":"Imazh","flash":"Objekt flash","form":"Formular","checkbox":"Checkbox","radio":"Buton radio","textField":"Fushë tekst","textarea":"Hapësirë tekst","hiddenField":"Fushë e fshehur","button":"Buton","select":"Menu zgjedhjeje","imageButton":"Buton imazhi","notSet":"<e pazgjedhur>","id":"Id","name":"Emër","langDir":"Kod gjuhe","langDirLtr":"Nga e majta në të djathtë (LTR)","langDirRtl":"Nga e djathta në të majtë (RTL)","langCode":"Kod gjuhe","longDescr":"Përshkrim i hollësishëm","cssClass":"Klasa stili CSS","advisoryTitle":"Titull","cssStyle":"Stil","ok":"OK","cancel":"Anulo","close":"Mbyll","preview":"Parashiko","resize":"Ripërmaso","generalTab":"Të përgjithshme","advancedTab":"Të përparuara","validateNumberFailed":"Vlera e futur nuk është një numër","confirmNewPage":"Çdo ndryshim që nuk është ruajtur do humbasë. Je i sigurtë që dëshiron të krijosh një faqe të re?","confirmCancel":"Disa opsione kanë ndryshuar. Je i sigurtë që dëshiron ta mbyllësh dritaren?","options":"Opsione","target":"Objektivi","targetNew":"Dritare e re (_blank)","targetTop":"Dritare në plan të parë (_top)","targetSelf":"E njëjta dritare (_self)","targetParent":"Dritarja prind (_parent)","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","styles":"Stil","cssClasses":"Klasa Stili CSS","width":"Gjerësi","height":"Lartësi","align":"Rreshtim","alignLeft":"Majtas","alignRight":"Djathtas","alignCenter":"Qendër","alignJustify":"Zgjero","alignTop":"Lart","alignMiddle":"Në mes","alignBottom":"Poshtë","alignNone":"Asnjë","invalidValue":"Vlerë e pavlefshme","invalidHeight":"Lartësia duhet të jetë një numër","invalidWidth":"Gjerësia duhet të jetë një numër","invalidCssLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme CSS (px, %, in, cm, mm, em, ex, pt ose pc).","invalidHtmlLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme HTML (px ose %)","invalidInlineStyle":"Stili inline duhet të jetë një apo disa vlera të formatit \"emër: vlerë\", ndarë nga pikëpresje.","cssLengthTooltip":"Fut një numër për vlerën në pixel apo një numër me një njësi të vlefshme CSS (px, %, in, cm, mm, ex, pt, ose pc).","unavailable":"%1<span class=\"cke_accessibility\">, i padisponueshëm</span>","keyboard":{"8":"Prapa","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Grise","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/sr-latn.js b/web/core/assets/vendor/ckeditor/lang/sr-latn.js
index 38771f033..c56f78168 100644
--- a/web/core/assets/vendor/ckeditor/lang/sr-latn.js
+++ b/web/core/assets/vendor/ckeditor/lang/sr-latn.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sr-latn']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Ponovi akciju","undo":"Poni�ti akciju"},"toolbar":{"toolbarCollapse":"Suzi alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Alatne trake"},"table":{"border":"Veličina okvira","caption":"Naslov tabele","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Obriši ćelije","merge":"Spoj celije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Razmak ćelija","cellSpace":"Ćelijski prostor","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Obriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tabelu","headers":"Zaglavlja","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"None","headersRow":"Prvi red","invalidBorder":"Veličina okvira mora biti broj.","invalidCellPadding":"Padding polja mora biti pozitivan broj.","invalidCellSpacing":"Razmak između ćelija mora biti pozitivan broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tabele mora biti broj.","invalidRows":"Broj redova mora biti veći od 0.","invalidWidth":"Širina tabele mora biti broj.","menu":"Osobine tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Obriši redove"},"rows":"Redova","summary":"Sažetak","title":"Osobine tabele","toolbar":"Tabela","widthPc":"procenata","widthPx":"piksela","widthUnit":"jedinica za širinu"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Odaberite specijalni karakter","toolbar":"Unesi specijalni karakter"},"sourcedialog":{"toolbar":"Kôd","title":"Kôd"},"sourcearea":{"toolbar":"Kôd"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Ukloni formatiranje"},"pastetext":{"button":"Zalepi kao čist tekst","title":"Zalepi kao čist tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalepi iz Worda","toolbar":"Zalepi iz Worda"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Nenabrojiva lista","numberedlist":"Nabrojiva lista"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Obostrano ravnanje","center":"Centriran tekst","left":"Levo ravnanje","right":"Desno ravnanje"},"indent":{"indent":"Uvećaj levu marginu","outdent":"Smanji levu marginu"},"image2":{"alt":"Alternativni tekst","btnUpload":"Pošalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zaključaj odnos","menu":"Osobine slika","pathName":"image","pathNameCaption":"caption","resetSize":"Resetuj veličinu","resizer":"Click and drag to resize","title":"Osobine slika","uploadTab":"Pošalji","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Unesi horizontalnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adresa","tag_div":"Normalno (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+C).","cut":"Iseci","cutError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+X).","paste":"Zalepi","pasteArea":"Prostor za lepljenje","pasteMsg":"Molimo Vas da zalepite unutar donje povrine koristeći tastaturnu prečicu (<STRONG>Ctrl/Cmd+V</STRONG>) i da pritisnete <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki vašeg pregledača, editor nije u mogućnosti da direktno pristupi podacima u klipbordu. Potrebno je da zalepite još jednom u ovom prozoru.","title":"Zalepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Podebljano","italic":"Kurziv","strike":"Precrtano","subscript":"Indeks","superscript":"Stepen","underline":"Podvučeno"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Bogati uređivač teksta","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Fleš","form":"Forma","checkbox":"Polje za potvrdu","radio":"Radio-dugme","textField":"Tekstualno polje","textarea":"Zona teksta","hiddenField":"Skriveno polje","button":"Dugme","select":"Izborno polje","imageButton":"Dugme sa slikom","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smer jezika","langDirLtr":"S leva na desno (LTR)","langDirRtl":"S desna na levo (RTL)","langCode":"Kôd jezika","longDescr":"Pun opis URL","cssClass":"Stylesheet klase","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Otkaži","close":"Zatvori","preview":"Izgled stranice","resize":"Resize","generalTab":"Opšte","advancedTab":"Napredni tagovi","validateNumberFailed":"Ova vrednost nije broj.","confirmNewPage":"Nesačuvane promene ovog sadržaja će biti izgubljene. Jeste li sigurni da želita da učitate novu stranu?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Opcije","target":"Meta","targetNew":"Novi prozor (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","styles":"Stil","cssClasses":"Stylesheet klase","width":"Širina","height":"Visina","align":"Ravnanje","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredina","alignJustify":"Obostrano ravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dole","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sr-latn']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Ponovi akciju","undo":"Poni�ti akciju"},"toolbar":{"toolbarCollapse":"Suzi alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Alatne trake"},"table":{"border":"Veličina okvira","caption":"Naslov tabele","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Obriši ćelije","merge":"Spoj celije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Razmak ćelija","cellSpace":"Ćelijski prostor","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Obriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tabelu","headers":"Zaglavlja","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"None","headersRow":"Prvi red","invalidBorder":"Veličina okvira mora biti broj.","invalidCellPadding":"Padding polja mora biti pozitivan broj.","invalidCellSpacing":"Razmak između ćelija mora biti pozitivan broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tabele mora biti broj.","invalidRows":"Broj redova mora biti veći od 0.","invalidWidth":"Širina tabele mora biti broj.","menu":"Osobine tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Obriši redove"},"rows":"Redova","summary":"Sažetak","title":"Osobine tabele","toolbar":"Tabela","widthPc":"procenata","widthPx":"piksela","widthUnit":"jedinica za širinu"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Odaberite specijalni karakter","toolbar":"Unesi specijalni karakter"},"sourcedialog":{"toolbar":"Kôd","title":"Kôd"},"sourcearea":{"toolbar":"Kôd"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Ukloni formatiranje"},"pastetext":{"button":"Zalepi kao čist tekst","title":"Zalepi kao čist tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalepi iz Worda","toolbar":"Zalepi iz Worda"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Nenabrojiva lista","numberedlist":"Nabrojiva lista"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Obostrano ravnanje","center":"Centriran tekst","left":"Levo ravnanje","right":"Desno ravnanje"},"indent":{"indent":"Uvećaj levu marginu","outdent":"Smanji levu marginu"},"image2":{"alt":"Alternativni tekst","btnUpload":"Pošalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zaključaj odnos","menu":"Osobine slika","pathName":"image","pathNameCaption":"caption","resetSize":"Resetuj veličinu","resizer":"Click and drag to resize","title":"Osobine slika","uploadTab":"Pošalji","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Unesi horizontalnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adresa","tag_div":"Normalno (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+C).","cut":"Iseci","cutError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+X).","paste":"Zalepi","pasteArea":"Prostor za lepljenje","pasteMsg":"Molimo Vas da zalepite unutar donje povrine koristeći tastaturnu prečicu (<STRONG>Ctrl/Cmd+V</STRONG>) i da pritisnete <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki vašeg pregledača, editor nije u mogućnosti da direktno pristupi podacima u klipbordu. Potrebno je da zalepite još jednom u ovom prozoru.","title":"Zalepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Podebljano","italic":"Kurziv","strike":"Precrtano","subscript":"Indeks","superscript":"Stepen","underline":"Podvučeno"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Bogati uređivač teksta","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Fleš","form":"Forma","checkbox":"Polje za potvrdu","radio":"Radio-dugme","textField":"Tekstualno polje","textarea":"Zona teksta","hiddenField":"Skriveno polje","button":"Dugme","select":"Izborno polje","imageButton":"Dugme sa slikom","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smer jezika","langDirLtr":"S leva na desno (LTR)","langDirRtl":"S desna na levo (RTL)","langCode":"Kôd jezika","longDescr":"Pun opis URL","cssClass":"Stylesheet klase","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Otkaži","close":"Zatvori","preview":"Izgled stranice","resize":"Resize","generalTab":"Opšte","advancedTab":"Napredni tagovi","validateNumberFailed":"Ova vrednost nije broj.","confirmNewPage":"Nesačuvane promene ovog sadržaja će biti izgubljene. Jeste li sigurni da želita da učitate novu stranu?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Opcije","target":"Meta","targetNew":"Novi prozor (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","styles":"Stil","cssClasses":"Stylesheet klase","width":"Širina","height":"Visina","align":"Ravnanje","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredina","alignJustify":"Obostrano ravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dole","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/sr.js b/web/core/assets/vendor/ckeditor/lang/sr.js
index d01c2aa1a..483e113a2 100644
--- a/web/core/assets/vendor/ckeditor/lang/sr.js
+++ b/web/core/assets/vendor/ckeditor/lang/sr.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sr']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Понови акцију","undo":"Поништи акцију"},"toolbar":{"toolbarCollapse":"Склопи алатну траку","toolbarExpand":"Прошири алатну траку","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Едитор алатне траке"},"table":{"border":"Величина оквира","caption":"Наслов табеле","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Обриши ћелије","merge":"Спој ћелије","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Размак ћелија","cellSpace":"Ћелијски простор","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Обриши колоне"},"columns":"Kолона","deleteTable":"Обриши таблу","headers":"Поглавља","headersBoth":"Оба","headersColumn":"Прва колона","headersNone":"None","headersRow":"Први ред","invalidBorder":"Величина ивице треба да буде цифра.","invalidCellPadding":"Пуњење ћелије треба да буде позитивна цифра.","invalidCellSpacing":"Размак ћелије треба да буде позитивна цифра.","invalidCols":"Број колона треба да буде цифра већа од 0.","invalidHeight":"Висина табеле треба да буде цифра.","invalidRows":"Број реда треба да буде цифра већа од 0.","invalidWidth":"Ширина табеле треба да буде цифра.","menu":"Особине табеле","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Обриши редове"},"rows":"Редова","summary":"Резиме","title":"Особине табеле","toolbar":"Табела","widthPc":"процената","widthPx":"пиксела","widthUnit":"јединица ширине"},"stylescombo":{"label":"Стил","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Опције специјалног карактера","title":"Одаберите специјални карактер","toolbar":"Унеси специјални карактер"},"sourcedialog":{"toolbar":"Kôд","title":"Kôд"},"sourcearea":{"toolbar":"Kôд"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Уклони форматирање"},"pastetext":{"button":"Залепи као чист текст","title":"Залепи као чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Залепи из Worda","toolbar":"Залепи из Worda"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Ненабројива листа","numberedlist":"Набројиву листу"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Обострано равнање","center":"Центриран текст","left":"Лево равнање","right":"Десно равнање"},"indent":{"indent":"Увећај леву маргину","outdent":"Смањи леву маргину"},"image2":{"alt":"Алтернативни текст","btnUpload":"Пошаљи на сервер","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Инфо слике","lockRatio":"Закључај однос","menu":"Особине слика","pathName":"image","pathNameCaption":"caption","resetSize":"Ресетуј величину","resizer":"Click and drag to resize","title":"Особине слика","uploadTab":"Пошаљи","urlMissing":"Недостаје УРЛ слике."},"horizontalrule":{"toolbar":"Унеси хоризонталну линију"},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Adresa","tag_div":"Нормално (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Копирај","copyError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског копирања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+C).","cut":"Исеци","cutError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског исецања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+X).","paste":"Залепи","pasteArea":"Залепи зону","pasteMsg":"Молимо Вас да залепите унутар доње површине користећи тастатурну пречицу (<STRONG>Ctrl/Cmd+V</STRONG>) и да притиснете <STRONG>OK</STRONG>.","securityMsg":"Због сигурносних подешавања претраживача, едитор не може да приступи оставу. Требате да га поново залепите у овом прозору.","title":"Залепи"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Подебљано","italic":"Курзив","strike":"Прецртано","subscript":"Индекс","superscript":"Степен","underline":"Подвучено"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Претражи сервер","url":"УРЛ","protocol":"Протокол","upload":"Пошаљи","uploadSubmit":"Пошаљи на сервер","image":"Слика","flash":"Флеш елемент","form":"Форма","checkbox":"Поље за потврду","radio":"Радио-дугме","textField":"Текстуално поље","textarea":"Зона текста","hiddenField":"Скривено поље","button":"Дугме","select":"Изборно поље","imageButton":"Дугме са сликом","notSet":"<није постављено>","id":"Ид","name":"Назив","langDir":"Смер језика","langDirLtr":"С лева на десно (LTR)","langDirRtl":"С десна на лево (RTL)","langCode":"Kôд језика","longDescr":"Пун опис УРЛ","cssClass":"Stylesheet класе","advisoryTitle":"Advisory наслов","cssStyle":"Стил","ok":"OK","cancel":"Oткажи","close":"Затвори","preview":"Изглед странице","resize":"Resize","generalTab":"Опште","advancedTab":"Напредни тагови","validateNumberFailed":"Ова вредност није цигра.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опције","target":"Meтa","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","styles":"Стил","cssClasses":"Stylesheet класе","width":"Ширина","height":"Висина","align":"Равнање","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Средина","alignJustify":"Обострано равнање","alignTop":"Врх","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sr']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"Понови акцију","undo":"Поништи акцију"},"toolbar":{"toolbarCollapse":"Склопи алатну траку","toolbarExpand":"Прошири алатну траку","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Едитор алатне траке"},"table":{"border":"Величина оквира","caption":"Наслов табеле","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Обриши ћелије","merge":"Спој ћелије","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Размак ћелија","cellSpace":"Ћелијски простор","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Обриши колоне"},"columns":"Kолона","deleteTable":"Обриши таблу","headers":"Поглавља","headersBoth":"Оба","headersColumn":"Прва колона","headersNone":"None","headersRow":"Први ред","invalidBorder":"Величина ивице треба да буде цифра.","invalidCellPadding":"Пуњење ћелије треба да буде позитивна цифра.","invalidCellSpacing":"Размак ћелије треба да буде позитивна цифра.","invalidCols":"Број колона треба да буде цифра већа од 0.","invalidHeight":"Висина табеле треба да буде цифра.","invalidRows":"Број реда треба да буде цифра већа од 0.","invalidWidth":"Ширина табеле треба да буде цифра.","menu":"Особине табеле","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Обриши редове"},"rows":"Редова","summary":"Резиме","title":"Особине табеле","toolbar":"Табела","widthPc":"процената","widthPx":"пиксела","widthUnit":"јединица ширине"},"stylescombo":{"label":"Стил","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Опције специјалног карактера","title":"Одаберите специјални карактер","toolbar":"Унеси специјални карактер"},"sourcedialog":{"toolbar":"Kôд","title":"Kôд"},"sourcearea":{"toolbar":"Kôд"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Уклони форматирање"},"pastetext":{"button":"Залепи као чист текст","title":"Залепи као чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Залепи из Worda","toolbar":"Залепи из Worda"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Ненабројива листа","numberedlist":"Набројиву листу"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Обострано равнање","center":"Центриран текст","left":"Лево равнање","right":"Десно равнање"},"indent":{"indent":"Увећај леву маргину","outdent":"Смањи леву маргину"},"image2":{"alt":"Алтернативни текст","btnUpload":"Пошаљи на сервер","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Инфо слике","lockRatio":"Закључај однос","menu":"Особине слика","pathName":"image","pathNameCaption":"caption","resetSize":"Ресетуј величину","resizer":"Click and drag to resize","title":"Особине слика","uploadTab":"Пошаљи","urlMissing":"Недостаје УРЛ слике.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Унеси хоризонталну линију"},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Adresa","tag_div":"Нормално (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Копирај","copyError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског копирања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+C).","cut":"Исеци","cutError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског исецања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+X).","paste":"Залепи","pasteArea":"Залепи зону","pasteMsg":"Молимо Вас да залепите унутар доње површине користећи тастатурну пречицу (<STRONG>Ctrl/Cmd+V</STRONG>) и да притиснете <STRONG>OK</STRONG>.","securityMsg":"Због сигурносних подешавања претраживача, едитор не може да приступи оставу. Требате да га поново залепите у овом прозору.","title":"Залепи"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Подебљано","italic":"Курзив","strike":"Прецртано","subscript":"Индекс","superscript":"Степен","underline":"Подвучено"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Претражи сервер","url":"УРЛ","protocol":"Протокол","upload":"Пошаљи","uploadSubmit":"Пошаљи на сервер","image":"Слика","flash":"Флеш елемент","form":"Форма","checkbox":"Поље за потврду","radio":"Радио-дугме","textField":"Текстуално поље","textarea":"Зона текста","hiddenField":"Скривено поље","button":"Дугме","select":"Изборно поље","imageButton":"Дугме са сликом","notSet":"<није постављено>","id":"Ид","name":"Назив","langDir":"Смер језика","langDirLtr":"С лева на десно (LTR)","langDirRtl":"С десна на лево (RTL)","langCode":"Kôд језика","longDescr":"Пун опис УРЛ","cssClass":"Stylesheet класе","advisoryTitle":"Advisory наслов","cssStyle":"Стил","ok":"OK","cancel":"Oткажи","close":"Затвори","preview":"Изглед странице","resize":"Resize","generalTab":"Опште","advancedTab":"Напредни тагови","validateNumberFailed":"Ова вредност није цигра.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опције","target":"Meтa","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","styles":"Стил","cssClasses":"Stylesheet класе","width":"Ширина","height":"Висина","align":"Равнање","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Средина","alignJustify":"Обострано равнање","alignTop":"Врх","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/sv.js b/web/core/assets/vendor/ckeditor/lang/sv.js
index cfc109680..c71db112f 100644
--- a/web/core/assets/vendor/ckeditor/lang/sv.js
+++ b/web/core/assets/vendor/ckeditor/lang/sv.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sv']={"widget":{"move":"Klicka och drag för att flytta","label":"%1 widget"},"undo":{"redo":"Gör om","undo":"Ångra"},"toolbar":{"toolbarCollapse":"Dölj verktygsfält","toolbarExpand":"Visa verktygsfält","toolbarGroups":{"document":"Dokument","clipboard":"Urklipp/ångra","editing":"Redigering","forms":"Formulär","basicstyles":"Basstilar","paragraph":"Paragraf","links":"Länkar","insert":"Infoga","styles":"Stilar","colors":"Färger","tools":"Verktyg"},"toolbars":"Redigera verktygsfält"},"table":{"border":"Kantstorlek","caption":"Rubrik","cell":{"menu":"Cell","insertBefore":"Lägg till cell före","insertAfter":"Lägg till cell efter","deleteCell":"Radera celler","merge":"Sammanfoga celler","mergeRight":"Sammanfoga höger","mergeDown":"Sammanfoga ner","splitHorizontal":"Dela cell horisontellt","splitVertical":"Dela cell vertikalt","title":"Egenskaper för cell","cellType":"Celltyp","rowSpan":"Rad spann","colSpan":"Kolumnen spann","wordWrap":"Radbrytning","hAlign":"Horisontell justering","vAlign":"Vertikal justering","alignBaseline":"Baslinje","bgColor":"Bakgrundsfärg","borderColor":"Ramfärg","data":"Data","header":"Rubrik","yes":"Ja","no":"Nej","invalidWidth":"Cellens bredd måste vara ett nummer.","invalidHeight":"Cellens höjd måste vara ett nummer.","invalidRowSpan":"Radutvidgning måste vara ett heltal.","invalidColSpan":"Kolumn måste vara ett heltal.","chooseColor":"Välj"},"cellPad":"Cellutfyllnad","cellSpace":"Cellavstånd","column":{"menu":"Kolumn","insertBefore":"Lägg till kolumn före","insertAfter":"Lägg till kolumn efter","deleteColumn":"Radera kolumn"},"columns":"Kolumner","deleteTable":"Radera tabell","headers":"Rubriker","headersBoth":"Båda","headersColumn":"Första kolumnen","headersNone":"Ingen","headersRow":"Första raden","invalidBorder":"Ram måste vara ett nummer.","invalidCellPadding":"Luft i cell måste vara ett nummer.","invalidCellSpacing":"Luft i cell måste vara ett nummer.","invalidCols":"Antal kolumner måste vara ett nummer större än 0.","invalidHeight":"Tabellens höjd måste vara ett nummer.","invalidRows":"Antal rader måste vara större än 0.","invalidWidth":"Tabell måste vara ett nummer.","menu":"Tabellegenskaper","row":{"menu":"Rad","insertBefore":"Lägg till rad före","insertAfter":"Lägg till rad efter","deleteRow":"Radera rad"},"rows":"Rader","summary":"Sammanfattning","title":"Tabellegenskaper","toolbar":"Tabell","widthPc":"procent","widthPx":"pixlar","widthUnit":"enhet bredd"},"stylescombo":{"label":"Anpassad stil","panelTitle":"Formatmallar","panelTitle1":"Blockstil","panelTitle2":"Inbäddad stil","panelTitle3":"Objektets stil"},"specialchar":{"options":"Alternativ för utökade tecken","title":"Välj utökat tecken","toolbar":"Klistra in utökat tecken"},"sourcedialog":{"toolbar":"Källa","title":"Källa"},"sourcearea":{"toolbar":"Källa"},"showblocks":{"toolbar":"Visa block"},"removeformat":{"toolbar":"Radera formatering"},"pastetext":{"button":"Klistra in som vanlig text","title":"Klistra in som vanlig text"},"pastefromword":{"confirmCleanup":"Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa den innan du klistrar in den?","error":"Det var inte möjligt att städa upp den inklistrade data på grund av ett internt fel","title":"Klistra in från Word","toolbar":"Klistra in från Word"},"maximize":{"maximize":"Maximera","minimize":"Minimera"},"magicline":{"title":"Infoga paragraf här"},"list":{"bulletedlist":"Infoga/ta bort punktlista","numberedlist":"Infoga/ta bort numrerad lista"},"language":{"button":"Sätt språk","remove":"Ta bort språk"},"justify":{"block":"Justera till marginaler","center":"Centrera","left":"Vänsterjustera","right":"Högerjustera"},"indent":{"indent":"Öka indrag","outdent":"Minska indrag"},"image2":{"alt":"Alternativ text","btnUpload":"Skicka till server","captioned":"Rubricerad bild","captionPlaceholder":"Bildtext","infoTab":"Bildinformation","lockRatio":"Lås höjd/bredd förhållanden","menu":"Bildegenskaper","pathName":"bild","pathNameCaption":"rubrik","resetSize":"Återställ storlek","resizer":"Klicka och drag för att ändra storlek","title":"Bildegenskaper","uploadTab":"Ladda upp","urlMissing":"Bildkällans URL saknas."},"horizontalrule":{"toolbar":"Infoga horisontal linje"},"format":{"label":"Teckenformat","panelTitle":"Teckenformat","tag_address":"Adress","tag_div":"Normal (DIV)","tag_h1":"Rubrik 1","tag_h2":"Rubrik 2","tag_h3":"Rubrik 3","tag_h4":"Rubrik 4","tag_h5":"Rubrik 5","tag_h6":"Rubrik 6","tag_p":"Normal","tag_pre":"Formaterad"},"elementspath":{"eleLabel":"Elementets sökväg","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiera","copyError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden kopiera. Använd (Ctrl/Cmd+C) istället.","cut":"Klipp ut","cutError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden klipp ut. Använd (Ctrl/Cmd+X) istället.","paste":"Klistra in","pasteArea":"Paste Area","pasteMsg":"Var god och klistra in Er text i rutan nedan genom att använda (<strong>Ctrl/Cmd+V</strong>) klicka sen på OK.","securityMsg":"På grund av din webbläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.","title":"Klistra in"},"button":{"selectedLabel":"%1 (Vald)"},"blockquote":{"toolbar":"Blockcitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Genomstruken","subscript":"Nedsänkta tecken","superscript":"Upphöjda tecken","underline":"Understruken"},"about":{"copy":"Copyright &copy; $1. Alla rättigheter reserverade.","dlgTitle":"Om CKEditor","help":"Se $1 för hjälp.","moreInfo":"För information av licensiering besök vår hemsida:","title":"Om CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryck ALT 0 för hjälp","browseServer":"Bläddra på server","url":"URL","protocol":"Protokoll","upload":"Ladda upp","uploadSubmit":"Skicka till server","image":"Bild","flash":"Flash","form":"Formulär","checkbox":"Kryssruta","radio":"Alternativknapp","textField":"Textfält","textarea":"Textruta","hiddenField":"Dolt fält","button":"Knapp","select":"Flervalslista","imageButton":"Bildknapp","notSet":"<ej angivet>","id":"Id","name":"Namn","langDir":"Språkriktning","langDirLtr":"Vänster till Höger (VTH)","langDirRtl":"Höger till Vänster (HTV)","langCode":"Språkkod","longDescr":"URL-beskrivning","cssClass":"Stilmall","advisoryTitle":"Titel","cssStyle":"Stilmall","ok":"OK","cancel":"Avbryt","close":"Stäng","preview":"Förhandsgranska","resize":"Dra för att ändra storlek","generalTab":"Allmänt","advancedTab":"Avancerad","validateNumberFailed":"Värdet är inte ett nummer.","confirmNewPage":"Alla ändringar i innehållet kommer att förloras. Är du säker på att du vill ladda en ny sida?","confirmCancel":"Några av alternativen har ändrats. Är du säker på att du vill stänga dialogrutan?","options":"Alternativ","target":"Mål","targetNew":"Nytt fönster (_blank)","targetTop":"Översta fönstret (_top)","targetSelf":"Samma fönster (_self)","targetParent":"Föregående fönster (_parent)","langDirLTR":"Vänster till höger (LTR)","langDirRTL":"Höger till vänster (RTL)","styles":"Stil","cssClasses":"Stilmallar","width":"Bredd","height":"Höjd","align":"Justering","alignLeft":"Vänster","alignRight":"Höger","alignCenter":"Centrerad","alignJustify":"Justera till marginaler","alignTop":"Överkant","alignMiddle":"Mitten","alignBottom":"Nederkant","alignNone":"Ingen","invalidValue":"Felaktigt värde.","invalidHeight":"Höjd måste vara ett nummer.","invalidWidth":"Bredd måste vara ett nummer.","invalidCssLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan CSS-mätenheter (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan godkända HTML-mätenheter (px eller %).","invalidInlineStyle":"Det angivna värdet för style måste innehålla en eller flera tupler separerade med semikolon i följande format: \"name : value\"","cssLengthTooltip":"Ange ett nummer i pixlar eller ett nummer men godkänd CSS-mätenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, Ej tillgänglig</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sv']={"widget":{"move":"Klicka och drag för att flytta","label":"%1-widget"},"undo":{"redo":"Gör om","undo":"Ångra"},"toolbar":{"toolbarCollapse":"Dölj verktygsfält","toolbarExpand":"Visa verktygsfält","toolbarGroups":{"document":"Dokument","clipboard":"Urklipp/ångra","editing":"Redigering","forms":"Formulär","basicstyles":"Basstilar","paragraph":"Paragraf","links":"Länkar","insert":"Infoga","styles":"Stilar","colors":"Färger","tools":"Verktyg"},"toolbars":"Editorns verktygsfält"},"table":{"border":"Kantstorlek","caption":"Rubrik","cell":{"menu":"Cell","insertBefore":"Lägg till cell före","insertAfter":"Lägg till cell efter","deleteCell":"Radera celler","merge":"Sammanfoga celler","mergeRight":"Sammanfoga höger","mergeDown":"Sammanfoga ner","splitHorizontal":"Dela cell horisontellt","splitVertical":"Dela cell vertikalt","title":"Egenskaper för cell","cellType":"Celltyp","rowSpan":"Rad spann","colSpan":"Kolumnen spann","wordWrap":"Radbrytning","hAlign":"Horisontell justering","vAlign":"Vertikal justering","alignBaseline":"Baslinje","bgColor":"Bakgrundsfärg","borderColor":"Ramfärg","data":"Data","header":"Rubrik","yes":"Ja","no":"Nej","invalidWidth":"Cellens bredd måste vara ett nummer.","invalidHeight":"Cellens höjd måste vara ett nummer.","invalidRowSpan":"Radutvidgning måste vara ett heltal.","invalidColSpan":"Kolumn måste vara ett heltal.","chooseColor":"Välj"},"cellPad":"Cellutfyllnad","cellSpace":"Cellavstånd","column":{"menu":"Kolumn","insertBefore":"Lägg till kolumn före","insertAfter":"Lägg till kolumn efter","deleteColumn":"Radera kolumn"},"columns":"Kolumner","deleteTable":"Radera tabell","headers":"Rubriker","headersBoth":"Båda","headersColumn":"Första kolumnen","headersNone":"Ingen","headersRow":"Första raden","invalidBorder":"Ram måste vara ett nummer.","invalidCellPadding":"Luft i cell måste vara ett nummer.","invalidCellSpacing":"Luft i cell måste vara ett nummer.","invalidCols":"Antal kolumner måste vara ett nummer större än 0.","invalidHeight":"Tabellens höjd måste vara ett nummer.","invalidRows":"Antal rader måste vara större än 0.","invalidWidth":"Tabell måste vara ett nummer.","menu":"Tabellegenskaper","row":{"menu":"Rad","insertBefore":"Lägg till rad före","insertAfter":"Lägg till rad efter","deleteRow":"Radera rad"},"rows":"Rader","summary":"Sammanfattning","title":"Tabellegenskaper","toolbar":"Tabell","widthPc":"procent","widthPx":"pixlar","widthUnit":"enhet bredd"},"stylescombo":{"label":"Stilar","panelTitle":"Formateringsstilar","panelTitle1":"Blockstilar","panelTitle2":"Inbäddade stilar","panelTitle3":"Objektstilar"},"specialchar":{"options":"Alternativ för utökade tecken","title":"Välj utökat tecken","toolbar":"Klistra in utökat tecken"},"sourcedialog":{"toolbar":"Källa","title":"Källa"},"sourcearea":{"toolbar":"Källa"},"showblocks":{"toolbar":"Visa block"},"removeformat":{"toolbar":"Radera formatering"},"pastetext":{"button":"Klistra in som vanlig text","title":"Klistra in som vanlig text"},"pastefromword":{"confirmCleanup":"Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa den innan du klistrar in den?","error":"Det var inte möjligt att städa upp den inklistrade data på grund av ett internt fel","title":"Klistra in från Word","toolbar":"Klistra in från Word"},"maximize":{"maximize":"Maximera","minimize":"Minimera"},"magicline":{"title":"Infoga paragraf här"},"list":{"bulletedlist":"Infoga/ta bort punktlista","numberedlist":"Infoga/ta bort numrerad lista"},"language":{"button":"Sätt språk","remove":"Ta bort språk"},"justify":{"block":"Justera till marginaler","center":"Centrera","left":"Vänsterjustera","right":"Högerjustera"},"indent":{"indent":"Öka indrag","outdent":"Minska indrag"},"image2":{"alt":"Alternativ text","btnUpload":"Skicka till server","captioned":"Rubricerad bild","captionPlaceholder":"Bildtext","infoTab":"Bildinformation","lockRatio":"Lås höjd/bredd förhållanden","menu":"Bildegenskaper","pathName":"bild","pathNameCaption":"rubrik","resetSize":"Återställ storlek","resizer":"Klicka och drag för att ändra storlek","title":"Bildegenskaper","uploadTab":"Ladda upp","urlMissing":"Bildkällans URL saknas.","altMissing":"Alternativ text saknas"},"horizontalrule":{"toolbar":"Infoga horisontal linje"},"format":{"label":"Teckenformat","panelTitle":"Teckenformat","tag_address":"Adress","tag_div":"Normal (DIV)","tag_h1":"Rubrik 1","tag_h2":"Rubrik 2","tag_h3":"Rubrik 3","tag_h4":"Rubrik 4","tag_h5":"Rubrik 5","tag_h6":"Rubrik 6","tag_p":"Normal","tag_pre":"Formaterad"},"elementspath":{"eleLabel":"Elementets sökväg","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiera","copyError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden kopiera. Använd (Ctrl/Cmd+C) istället.","cut":"Klipp ut","cutError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden klipp ut. Använd (Ctrl/Cmd+X) istället.","paste":"Klistra in","pasteArea":"Paste Area","pasteMsg":"Var god och klistra in Er text i rutan nedan genom att använda (<strong>Ctrl/Cmd+V</strong>) klicka sen på OK.","securityMsg":"På grund av din webbläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.","title":"Klistra in"},"button":{"selectedLabel":"%1 (Vald)"},"blockquote":{"toolbar":"Blockcitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Genomstruken","subscript":"Nedsänkta tecken","superscript":"Upphöjda tecken","underline":"Understruken"},"about":{"copy":"Copyright &copy; $1. Alla rättigheter reserverade.","dlgTitle":"Om CKEditor","help":"Se $1 för hjälp.","moreInfo":"För information om licensiering besök vår hemsida:","title":"Om CKEditor","userGuide":"CKEditor användarmanual"},"editor":"Rich Text-editor","editorPanel":"Panel till Rich Text-editor","common":{"editorHelp":"Tryck ALT 0 för hjälp","browseServer":"Bläddra på server","url":"URL","protocol":"Protokoll","upload":"Ladda upp","uploadSubmit":"Skicka till server","image":"Bild","flash":"Flash","form":"Formulär","checkbox":"Kryssruta","radio":"Alternativknapp","textField":"Textfält","textarea":"Textruta","hiddenField":"Dolt fält","button":"Knapp","select":"Flervalslista","imageButton":"Bildknapp","notSet":"<ej angivet>","id":"Id","name":"Namn","langDir":"Språkriktning","langDirLtr":"Vänster till Höger (VTH)","langDirRtl":"Höger till Vänster (HTV)","langCode":"Språkkod","longDescr":"URL-beskrivning","cssClass":"Stilmall","advisoryTitle":"Titel","cssStyle":"Stilmall","ok":"OK","cancel":"Avbryt","close":"Stäng","preview":"Förhandsgranska","resize":"Dra för att ändra storlek","generalTab":"Allmänt","advancedTab":"Avancerad","validateNumberFailed":"Värdet är inte ett nummer.","confirmNewPage":"Alla ändringar i innehållet kommer att förloras. Är du säker på att du vill ladda en ny sida?","confirmCancel":"Några av alternativen har ändrats. Är du säker på att du vill stänga dialogrutan?","options":"Alternativ","target":"Mål","targetNew":"Nytt fönster (_blank)","targetTop":"Översta fönstret (_top)","targetSelf":"Samma fönster (_self)","targetParent":"Föregående fönster (_parent)","langDirLTR":"Vänster till höger (LTR)","langDirRTL":"Höger till vänster (RTL)","styles":"Stil","cssClasses":"Stilmallar","width":"Bredd","height":"Höjd","align":"Justering","alignLeft":"Vänster","alignRight":"Höger","alignCenter":"Centrerad","alignJustify":"Justera till marginaler","alignTop":"Överkant","alignMiddle":"Mitten","alignBottom":"Nederkant","alignNone":"Ingen","invalidValue":"Felaktigt värde.","invalidHeight":"Höjd måste vara ett nummer.","invalidWidth":"Bredd måste vara ett nummer.","invalidCssLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan CSS-mätenheter (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan godkända HTML-mätenheter (px eller %).","invalidInlineStyle":"Det angivna värdet för style måste innehålla en eller flera tupler separerade med semikolon i följande format: \"name : value\"","cssLengthTooltip":"Ange ett nummer i pixlar eller ett nummer men godkänd CSS-mätenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, Ej tillgänglig</span>","keyboard":{"8":"Backsteg","13":"Retur","16":"Skift","17":"Ctrl","18":"Alt","32":"Mellanslag","35":"Slut","36":"Hem","46":"Radera","224":"Kommando"},"keyboardShortcut":"Kortkommando"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/th.js b/web/core/assets/vendor/ckeditor/lang/th.js
index 120b0ff43..03599928b 100644
--- a/web/core/assets/vendor/ckeditor/lang/th.js
+++ b/web/core/assets/vendor/ckeditor/lang/th.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['th']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"ทำซ้ำคำสั่ง","undo":"ยกเลิกคำสั่ง"},"toolbar":{"toolbarCollapse":"ซ่อนแถบเครื่องมือ","toolbarExpand":"เปิดแถบเครื่องมือ","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"แถบเครื่องมือช่วยพิมพ์ข้อความ"},"table":{"border":"ขนาดเส้นขอบ","caption":"หัวเรื่องของตาราง","cell":{"menu":"ช่องตาราง","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"ลบช่อง","merge":"ผสานช่อง","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"ระยะแนวตั้ง","cellSpace":"ระยะแนวนอนน","column":{"menu":"คอลัมน์","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"ลบสดมน์"},"columns":"สดมน์","deleteTable":"ลบตาราง","headers":"ส่วนหัว","headersBoth":"ทั้งสองอย่าง","headersColumn":"คอลัมน์แรก","headersNone":"None","headersRow":"แถวแรก","invalidBorder":"ขนาดเส้นกรอบต้องเป็นจำนวนตัวเลข","invalidCellPadding":"ช่องว่างภายในเซลล์ต้องเลขจำนวนบวก","invalidCellSpacing":"ช่องว่างภายในเซลล์ต้องเป็นเลขจำนวนบวก","invalidCols":"จำนวนคอลัมน์ต้องเป็นจำนวนมากกว่า 0","invalidHeight":"ส่วนสูงของตารางต้องเป็นตัวเลข","invalidRows":"จำนวนของแถวต้องเป็นจำนวนมากกว่า 0","invalidWidth":"ความกว้างตารางต้องเป็นตัวเลข","menu":"คุณสมบัติของ ตาราง","row":{"menu":"แถว","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"ลบแถว"},"rows":"แถว","summary":"สรุปความ","title":"คุณสมบัติของ ตาราง","toolbar":"ตาราง","widthPc":"เปอร์เซ็น","widthPx":"จุดสี","widthUnit":"หน่วยความกว้าง"},"stylescombo":{"label":"ลักษณะ","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"แทรกตัวอักษรพิเศษ","toolbar":"แทรกตัวอักษรพิเศษ"},"sourcedialog":{"toolbar":"ดูรหัส HTML","title":"ดูรหัส HTML"},"sourcearea":{"toolbar":"ดูรหัส HTML"},"showblocks":{"toolbar":"แสดงบล็อคข้อมูล"},"removeformat":{"toolbar":"ล้างรูปแบบ"},"pastetext":{"button":"วางแบบตัวอักษรธรรมดา","title":"วางแบบตัวอักษรธรรมดา"},"pastefromword":{"confirmCleanup":"ข้อความที่คุณต้องการวางลงไปเป็นข้อความที่คัดลอกมาจากโปรแกรมไมโครซอฟท์เวิร์ด คุณต้องการล้างค่าข้อความดังกล่าวก่อนวางลงไปหรือไม่?","error":"ไม่สามารถล้างข้อมูลที่ต้องการวางได้เนื่องจากเกิดข้อผิดพลาดภายในระบบ","title":"วางสำเนาจากตัวอักษรเวิร์ด","toolbar":"วางสำเนาจากตัวอักษรเวิร์ด"},"maximize":{"maximize":"ขยายใหญ่","minimize":"ย่อขนาด"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"ลำดับรายการแบบสัญลักษณ์","numberedlist":"ลำดับรายการแบบตัวเลข"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"จัดพอดีหน้ากระดาษ","center":"จัดกึ่งกลาง","left":"จัดชิดซ้าย","right":"จัดชิดขวา"},"indent":{"indent":"เพิ่มระยะย่อหน้า","outdent":"ลดระยะย่อหน้า"},"image2":{"alt":"คำประกอบรูปภาพ","btnUpload":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ข้อมูลของรูปภาพ","lockRatio":"กำหนดอัตราส่วน กว้าง-สูง แบบคงที่","menu":"คุณสมบัติของ รูปภาพ","pathName":"image","pathNameCaption":"caption","resetSize":"กำหนดรูปเท่าขนาดจริง","resizer":"Click and drag to resize","title":"คุณสมบัติของ รูปภาพ","uploadTab":"อัพโหลดไฟล์","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"แทรกเส้นคั่นบรรทัด"},"format":{"label":"รูปแบบ","panelTitle":"รูปแบบ","tag_address":"Address","tag_div":"Paragraph (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"สำเนา","copyError":"ไม่สามารถสำเนาข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว C พร้อมกัน).","cut":"ตัด","cutError":"ไม่สามารถตัดข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว X พร้อมกัน).","paste":"วาง","pasteArea":"Paste Area","pasteMsg":"กรุณาใช้คีย์บอร์ดเท่านั้น โดยกดปุ๋ม (<strong>Ctrl/Cmd และ V</strong>)พร้อมๆกัน และกด <strong>OK</strong>.","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"วาง"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"ตัวหนา","italic":"ตัวเอียง","strike":"ตัวขีดเส้นทับ","subscript":"ตัวห้อย","superscript":"ตัวยก","underline":"ตัวขีดเส้นใต้"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"กด ALT 0 หากต้องการความช่วยเหลือ","browseServer":"เปิดหน้าต่างจัดการไฟล์อัพโหลด","url":"ที่อยู่อ้างอิง URL","protocol":"โปรโตคอล","upload":"อัพโหลดไฟล์","uploadSubmit":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","image":"รูปภาพ","flash":"ไฟล์ Flash","form":"แบบฟอร์ม","checkbox":"เช็คบ๊อก","radio":"เรดิโอบัตตอน","textField":"เท็กซ์ฟิลด์","textarea":"เท็กซ์แอเรีย","hiddenField":"ฮิดเดนฟิลด์","button":"ปุ่ม","select":"แถบตัวเลือก","imageButton":"ปุ่มแบบรูปภาพ","notSet":"<ไม่ระบุ>","id":"ไอดี","name":"ชื่อ","langDir":"การเขียน-อ่านภาษา","langDirLtr":"จากซ้ายไปขวา (LTR)","langDirRtl":"จากขวามาซ้าย (RTL)","langCode":"รหัสภาษา","longDescr":"คำอธิบายประกอบ URL","cssClass":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","advisoryTitle":"คำเกริ่นนำ","cssStyle":"ลักษณะการแสดงผล","ok":"ตกลง","cancel":"ยกเลิก","close":"ปิด","preview":"ดูหน้าเอกสารตัวอย่าง","resize":"ปรับขนาด","generalTab":"ทั่วไป","advancedTab":"ขั้นสูง","validateNumberFailed":"ค่านี้ไม่ใช่ตัวเลข","confirmNewPage":"การเปลี่ยนแปลงใดๆ ในเนื้อหานี้ ที่ไม่ได้ถูกบันทึกไว้ จะสูญหายทั้งหมด คุณแน่ใจว่าจะเรียกหน้าใหม่?","confirmCancel":"ตัวเลือกบางตัวมีการเปลี่ยนแปลง คุณแน่ใจว่าจะปิดกล่องโต้ตอบนี้?","options":"ตัวเลือก","target":"การเปิดหน้าลิงค์","targetNew":"หน้าต่างใหม่ (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"หน้าต่างเดียวกัน (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","styles":"ลักษณะการแสดงผล","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","width":"ความกว้าง","height":"ความสูง","align":"การจัดวาง","alignLeft":"ชิดซ้าย","alignRight":"ชิดขวา","alignCenter":"กึ่งกลาง","alignJustify":"நியாயப்படுத்தவும்","alignTop":"บนสุด","alignMiddle":"กึ่งกลางแนวตั้ง","alignBottom":"ชิดด้านล่าง","alignNone":"None","invalidValue":"ค่าไม่ถูกต้อง","invalidHeight":"ความสูงต้องเป็นตัวเลข","invalidWidth":"ความกว้างต้องเป็นตัวเลข","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['th']={"widget":{"move":"Click and drag to move","label":"%1 widget"},"undo":{"redo":"ทำซ้ำคำสั่ง","undo":"ยกเลิกคำสั่ง"},"toolbar":{"toolbarCollapse":"ซ่อนแถบเครื่องมือ","toolbarExpand":"เปิดแถบเครื่องมือ","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"แถบเครื่องมือช่วยพิมพ์ข้อความ"},"table":{"border":"ขนาดเส้นขอบ","caption":"หัวเรื่องของตาราง","cell":{"menu":"ช่องตาราง","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"ลบช่อง","merge":"ผสานช่อง","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"ระยะแนวตั้ง","cellSpace":"ระยะแนวนอนน","column":{"menu":"คอลัมน์","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"ลบสดมน์"},"columns":"สดมน์","deleteTable":"ลบตาราง","headers":"ส่วนหัว","headersBoth":"ทั้งสองอย่าง","headersColumn":"คอลัมน์แรก","headersNone":"None","headersRow":"แถวแรก","invalidBorder":"ขนาดเส้นกรอบต้องเป็นจำนวนตัวเลข","invalidCellPadding":"ช่องว่างภายในเซลล์ต้องเลขจำนวนบวก","invalidCellSpacing":"ช่องว่างภายในเซลล์ต้องเป็นเลขจำนวนบวก","invalidCols":"จำนวนคอลัมน์ต้องเป็นจำนวนมากกว่า 0","invalidHeight":"ส่วนสูงของตารางต้องเป็นตัวเลข","invalidRows":"จำนวนของแถวต้องเป็นจำนวนมากกว่า 0","invalidWidth":"ความกว้างตารางต้องเป็นตัวเลข","menu":"คุณสมบัติของ ตาราง","row":{"menu":"แถว","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"ลบแถว"},"rows":"แถว","summary":"สรุปความ","title":"คุณสมบัติของ ตาราง","toolbar":"ตาราง","widthPc":"เปอร์เซ็น","widthPx":"จุดสี","widthUnit":"หน่วยความกว้าง"},"stylescombo":{"label":"ลักษณะ","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"แทรกตัวอักษรพิเศษ","toolbar":"แทรกตัวอักษรพิเศษ"},"sourcedialog":{"toolbar":"ดูรหัส HTML","title":"ดูรหัส HTML"},"sourcearea":{"toolbar":"ดูรหัส HTML"},"showblocks":{"toolbar":"แสดงบล็อคข้อมูล"},"removeformat":{"toolbar":"ล้างรูปแบบ"},"pastetext":{"button":"วางแบบตัวอักษรธรรมดา","title":"วางแบบตัวอักษรธรรมดา"},"pastefromword":{"confirmCleanup":"ข้อความที่คุณต้องการวางลงไปเป็นข้อความที่คัดลอกมาจากโปรแกรมไมโครซอฟท์เวิร์ด คุณต้องการล้างค่าข้อความดังกล่าวก่อนวางลงไปหรือไม่?","error":"ไม่สามารถล้างข้อมูลที่ต้องการวางได้เนื่องจากเกิดข้อผิดพลาดภายในระบบ","title":"วางสำเนาจากตัวอักษรเวิร์ด","toolbar":"วางสำเนาจากตัวอักษรเวิร์ด"},"maximize":{"maximize":"ขยายใหญ่","minimize":"ย่อขนาด"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"ลำดับรายการแบบสัญลักษณ์","numberedlist":"ลำดับรายการแบบตัวเลข"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"จัดพอดีหน้ากระดาษ","center":"จัดกึ่งกลาง","left":"จัดชิดซ้าย","right":"จัดชิดขวา"},"indent":{"indent":"เพิ่มระยะย่อหน้า","outdent":"ลดระยะย่อหน้า"},"image2":{"alt":"คำประกอบรูปภาพ","btnUpload":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ข้อมูลของรูปภาพ","lockRatio":"กำหนดอัตราส่วน กว้าง-สูง แบบคงที่","menu":"คุณสมบัติของ รูปภาพ","pathName":"image","pathNameCaption":"caption","resetSize":"กำหนดรูปเท่าขนาดจริง","resizer":"Click and drag to resize","title":"คุณสมบัติของ รูปภาพ","uploadTab":"อัพโหลดไฟล์","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"แทรกเส้นคั่นบรรทัด"},"format":{"label":"รูปแบบ","panelTitle":"รูปแบบ","tag_address":"Address","tag_div":"Paragraph (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"สำเนา","copyError":"ไม่สามารถสำเนาข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว C พร้อมกัน).","cut":"ตัด","cutError":"ไม่สามารถตัดข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว X พร้อมกัน).","paste":"วาง","pasteArea":"Paste Area","pasteMsg":"กรุณาใช้คีย์บอร์ดเท่านั้น โดยกดปุ๋ม (<strong>Ctrl/Cmd และ V</strong>)พร้อมๆกัน และกด <strong>OK</strong>.","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"วาง"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"ตัวหนา","italic":"ตัวเอียง","strike":"ตัวขีดเส้นทับ","subscript":"ตัวห้อย","superscript":"ตัวยก","underline":"ตัวขีดเส้นใต้"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"กด ALT 0 หากต้องการความช่วยเหลือ","browseServer":"เปิดหน้าต่างจัดการไฟล์อัพโหลด","url":"ที่อยู่อ้างอิง URL","protocol":"โปรโตคอล","upload":"อัพโหลดไฟล์","uploadSubmit":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","image":"รูปภาพ","flash":"ไฟล์ Flash","form":"แบบฟอร์ม","checkbox":"เช็คบ๊อก","radio":"เรดิโอบัตตอน","textField":"เท็กซ์ฟิลด์","textarea":"เท็กซ์แอเรีย","hiddenField":"ฮิดเดนฟิลด์","button":"ปุ่ม","select":"แถบตัวเลือก","imageButton":"ปุ่มแบบรูปภาพ","notSet":"<ไม่ระบุ>","id":"ไอดี","name":"ชื่อ","langDir":"การเขียน-อ่านภาษา","langDirLtr":"จากซ้ายไปขวา (LTR)","langDirRtl":"จากขวามาซ้าย (RTL)","langCode":"รหัสภาษา","longDescr":"คำอธิบายประกอบ URL","cssClass":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","advisoryTitle":"คำเกริ่นนำ","cssStyle":"ลักษณะการแสดงผล","ok":"ตกลง","cancel":"ยกเลิก","close":"ปิด","preview":"ดูหน้าเอกสารตัวอย่าง","resize":"ปรับขนาด","generalTab":"ทั่วไป","advancedTab":"ขั้นสูง","validateNumberFailed":"ค่านี้ไม่ใช่ตัวเลข","confirmNewPage":"การเปลี่ยนแปลงใดๆ ในเนื้อหานี้ ที่ไม่ได้ถูกบันทึกไว้ จะสูญหายทั้งหมด คุณแน่ใจว่าจะเรียกหน้าใหม่?","confirmCancel":"ตัวเลือกบางตัวมีการเปลี่ยนแปลง คุณแน่ใจว่าจะปิดกล่องโต้ตอบนี้?","options":"ตัวเลือก","target":"การเปิดหน้าลิงค์","targetNew":"หน้าต่างใหม่ (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"หน้าต่างเดียวกัน (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","styles":"ลักษณะการแสดงผล","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","width":"ความกว้าง","height":"ความสูง","align":"การจัดวาง","alignLeft":"ชิดซ้าย","alignRight":"ชิดขวา","alignCenter":"กึ่งกลาง","alignJustify":"நியாயப்படுத்தவும்","alignTop":"บนสุด","alignMiddle":"กึ่งกลางแนวตั้ง","alignBottom":"ชิดด้านล่าง","alignNone":"None","invalidValue":"ค่าไม่ถูกต้อง","invalidHeight":"ความสูงต้องเป็นตัวเลข","invalidWidth":"ความกว้างต้องเป็นตัวเลข","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/tr.js b/web/core/assets/vendor/ckeditor/lang/tr.js
index cc5d708b9..a18d1e16c 100644
--- a/web/core/assets/vendor/ckeditor/lang/tr.js
+++ b/web/core/assets/vendor/ckeditor/lang/tr.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['tr']={"widget":{"move":"Taşımak için, tıklayın ve sürükleyin","label":"%1 widget"},"undo":{"redo":"Tekrarla","undo":"Geri Al"},"toolbar":{"toolbarCollapse":"Araç çubuklarını topla","toolbarExpand":"Araç çubuklarını aç","toolbarGroups":{"document":"Belge","clipboard":"Pano/Geri al","editing":"Düzenleme","forms":"Formlar","basicstyles":"Temel Stiller","paragraph":"Paragraf","links":"Bağlantılar","insert":"Ekle","styles":"Stiller","colors":"Renkler","tools":"Araçlar"},"toolbars":"Araç çubukları Editörü"},"table":{"border":"Kenar Kalınlığı","caption":"Başlık","cell":{"menu":"Hücre","insertBefore":"Hücre Ekle - Önce","insertAfter":"Hücre Ekle - Sonra","deleteCell":"Hücre Sil","merge":"Hücreleri Birleştir","mergeRight":"Birleştir - Sağdaki İle ","mergeDown":"Birleştir - Aşağıdaki İle ","splitHorizontal":"Hücreyi Yatay Böl","splitVertical":"Hücreyi Dikey Böl","title":"Hücre Özellikleri","cellType":"Hücre Tipi","rowSpan":"Satırlar Mesafesi (Span)","colSpan":"Sütünlar Mesafesi (Span)","wordWrap":"Kelime Kaydırma","hAlign":"Düşey Hizalama","vAlign":"Yataş Hizalama","alignBaseline":"Tabana","bgColor":"Arkaplan Rengi","borderColor":"Çerçeve Rengi","data":"Veri","header":"Başlık","yes":"Evet","no":"Hayır","invalidWidth":"Hücre genişliği sayı olmalıdır.","invalidHeight":"Hücre yüksekliği sayı olmalıdır.","invalidRowSpan":"Satırların mesafesi tam sayı olmalıdır.","invalidColSpan":"Sütünların mesafesi tam sayı olmalıdır.","chooseColor":"Seçiniz"},"cellPad":"Izgara yazı arası","cellSpace":"Izgara kalınlığı","column":{"menu":"Sütun","insertBefore":"Kolon Ekle - Önce","insertAfter":"Kolon Ekle - Sonra","deleteColumn":"Sütun Sil"},"columns":"Sütunlar","deleteTable":"Tabloyu Sil","headers":"Başlıklar","headersBoth":"Her İkisi","headersColumn":"İlk Sütun","headersNone":"Yok","headersRow":"İlk Satır","invalidBorder":"Çerceve büyüklüklüğü sayı olmalıdır.","invalidCellPadding":"Hücre aralığı (padding) sayı olmalıdır.","invalidCellSpacing":"Hücre boşluğu (spacing) sayı olmalıdır.","invalidCols":"Sütün sayısı 0 sayısından büyük olmalıdır.","invalidHeight":"Tablo yüksekliği sayı olmalıdır.","invalidRows":"Satır sayısı 0 sayısından büyük olmalıdır.","invalidWidth":"Tablo genişliği sayı olmalıdır.","menu":"Tablo Özellikleri","row":{"menu":"Satır","insertBefore":"Satır Ekle - Önce","insertAfter":"Satır Ekle - Sonra","deleteRow":"Satır Sil"},"rows":"Satırlar","summary":"Özet","title":"Tablo Özellikleri","toolbar":"Tablo","widthPc":"yüzde","widthPx":"piksel","widthUnit":"genişlik birimi"},"stylescombo":{"label":"Biçem","panelTitle":"Stilleri Düzenliyor","panelTitle1":"Blok Stilleri","panelTitle2":"Inline Stilleri","panelTitle3":"Nesne Stilleri"},"specialchar":{"options":"Özel Karakter Seçenekleri","title":"Özel Karakter Seç","toolbar":"Özel Karakter Ekle"},"sourcedialog":{"toolbar":"Kaynak","title":"Kaynak"},"sourcearea":{"toolbar":"Kaynak"},"showblocks":{"toolbar":"Blokları Göster"},"removeformat":{"toolbar":"Biçimi Kaldır"},"pastetext":{"button":"Düz Metin Olarak Yapıştır","title":"Düz Metin Olarak Yapıştır"},"pastefromword":{"confirmCleanup":"Yapıştırmaya çalıştığınız metin Word'den kopyalanmıştır. Yapıştırmadan önce silmek istermisiniz?","error":"Yapıştırmadaki veri bilgisi hata düzelene kadar silinmeyecektir","title":"Word'den Yapıştır","toolbar":"Word'den Yapıştır"},"maximize":{"maximize":"Büyült","minimize":"Küçült"},"magicline":{"title":"Parağrafı buraya ekle"},"list":{"bulletedlist":"Simgeli Liste","numberedlist":"Numaralı Liste"},"language":{"button":"Dili seç","remove":"Dili kaldır"},"justify":{"block":"İki Kenara Yaslanmış","center":"Ortalanmış","left":"Sola Dayalı","right":"Sağa Dayalı"},"indent":{"indent":"Sekme Arttır","outdent":"Sekme Azalt"},"image2":{"alt":"Alternatif Yazı","btnUpload":"Sunucuya Yolla","captioned":"Başlıklı resim","captionPlaceholder":"Başlık","infoTab":"Resim Bilgisi","lockRatio":"Oranı Kilitle","menu":"Resim Özellikleri","pathName":"Resim","pathNameCaption":"başlık","resetSize":"Boyutu Başa Döndür","resizer":"Boyutlandırmak için, tıklayın ve sürükleyin","title":"Resim Özellikleri","uploadTab":"Karşıya Yükle","urlMissing":"Resmin URL kaynağı bulunamadı."},"horizontalrule":{"toolbar":"Yatay Satır Ekle"},"format":{"label":"Biçim","panelTitle":"Biçim","tag_address":"Adres","tag_div":"Paragraf (DIV)","tag_h1":"Başlık 1","tag_h2":"Başlık 2","tag_h3":"Başlık 3","tag_h4":"Başlık 4","tag_h5":"Başlık 5","tag_h6":"Başlık 6","tag_p":"Normal","tag_pre":"Biçimli"},"elementspath":{"eleLabel":"Elementlerin yolu","eleTitle":"%1 elementi"},"contextmenu":{"options":"İçerik Menüsü Seçenekleri"},"clipboard":{"copy":"Kopyala","copyError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl/Cmd+C) tuşlarını kullanın.","cut":"Kes","cutError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl/Cmd+X) tuşlarını kullanın.","paste":"Yapıştır","pasteArea":"Yapıştırma Alanı","pasteMsg":"Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl/Cmd+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.","securityMsg":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin direkt olarak panoya erişimine izin vermiyor. Bu pencere içine tekrar yapıştırmalısınız..","title":"Yapıştır"},"button":{"selectedLabel":"%1 (Seçilmiş)"},"blockquote":{"toolbar":"Blok Oluştur"},"basicstyles":{"bold":"Kalın","italic":"İtalik","strike":"Üstü Çizgili","subscript":"Alt Simge","superscript":"Üst Simge","underline":"Altı Çizgili"},"about":{"copy":"Copyright &copy; $1. Tüm hakları saklıdır.","dlgTitle":"CKEditor Hakkında","help":"Yardım için $1 kontrol edin.","moreInfo":"Lisanslama hakkında daha fazla bilgi almak için lütfen sitemizi ziyaret edin:","title":"CKEditor Hakkında","userGuide":"CKEditor Kullanıcı Kılavuzu"},"editor":"Zengin Metin Editörü","editorPanel":"Zengin Metin Editör Paneli","common":{"editorHelp":"Yardım için ALT 0 tuşlarına basın","browseServer":"Sunucuya Gözat","url":"URL","protocol":"Protokol","upload":"Karşıya Yükle","uploadSubmit":"Sunucuya Gönder","image":"Resim","flash":"Flash","form":"Form","checkbox":"Onay Kutusu","radio":"Seçenek Düğmesi","textField":"Metin Kutusu","textarea":"Metin Alanı","hiddenField":"Gizli Alan","button":"Düğme","select":"Seçme Alanı","imageButton":"Resim Düğmesi","notSet":"<tanımlanmamış>","id":"Kimlik","name":"İsim","langDir":"Dil Yönü","langDirLtr":"Soldan Sağa (LTR)","langDirRtl":"Sağdan Sola (RTL)","langCode":"Dil Kodlaması","longDescr":"Uzun Tanımlı URL","cssClass":"Biçem Sayfası Sınıfları","advisoryTitle":"Öneri Başlığı","cssStyle":"Biçem","ok":"Tamam","cancel":"İptal","close":"Kapat","preview":"Önizleme","resize":"Yeniden Boyutlandır","generalTab":"Genel","advancedTab":"Gelişmiş","validateNumberFailed":"Bu değer bir sayı değildir.","confirmNewPage":"Bu içerikle ilgili kaydedilmemiş tüm bilgiler kaybolacaktır. Yeni bir sayfa yüklemek istediğinizden emin misiniz?","confirmCancel":"Bazı seçenekleri değiştirdiniz. İletişim penceresini kapatmak istediğinizden emin misiniz?","options":"Seçenekler","target":"Hedef","targetNew":"Yeni Pencere (_blank)","targetTop":"En Üstteki Pencere (_top)","targetSelf":"Aynı Pencere (_self)","targetParent":"Üst Pencere (_parent)","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","styles":"Biçem","cssClasses":"Biçem Sayfası Sınıfları","width":"Genişlik","height":"Yükseklik","align":"Hizalama","alignLeft":"Sol","alignRight":"Sağ","alignCenter":"Ortala","alignJustify":"İki Kenara Yaslanmış","alignTop":"Üst","alignMiddle":"Orta","alignBottom":"Alt","alignNone":"Hiçbiri","invalidValue":"Geçersiz değer.","invalidHeight":"Yükseklik değeri bir sayı olmalıdır.","invalidWidth":"Genişlik değeri bir sayı olmalıdır.","invalidCssLength":"\"%1\" alanı için verilen değer, geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt, veya pc) içeren veya içermeyen pozitif bir sayı olmalıdır.","invalidHtmlLength":"Belirttiğiniz sayı \"%1\" alanı için pozitif bir sayı HTML birim değeri olmalıdır (px veya %).","invalidInlineStyle":"Satıriçi biçem için verilen değer, \"isim : değer\" biçiminde birbirinden noktalı virgüllerle ayrılan bir veya daha fazla değişkenler grubundan oluşmalıdır.","cssLengthTooltip":"Piksel türünde bir sayı veya geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt veya pc) içeren bir sayı girin.","unavailable":"%1<span class=\"cke_accessibility\">, kullanılamaz</span>"}};
\ No newline at end of file
+CKEDITOR.lang['tr']={"widget":{"move":"Taşımak için, tıklayın ve sürükleyin","label":"%1 Grafik Beleşeni"},"undo":{"redo":"Tekrarla","undo":"Geri Al"},"toolbar":{"toolbarCollapse":"Araç çubuklarını topla","toolbarExpand":"Araç çubuklarını aç","toolbarGroups":{"document":"Belge","clipboard":"Pano/Geri al","editing":"Düzenleme","forms":"Formlar","basicstyles":"Temel Stiller","paragraph":"Paragraf","links":"Bağlantılar","insert":"Ekle","styles":"Stiller","colors":"Renkler","tools":"Araçlar"},"toolbars":"Araç çubukları Editörü"},"table":{"border":"Kenar Kalınlığı","caption":"Başlık","cell":{"menu":"Hücre","insertBefore":"Hücre Ekle - Önce","insertAfter":"Hücre Ekle - Sonra","deleteCell":"Hücre Sil","merge":"Hücreleri Birleştir","mergeRight":"Birleştir - Sağdaki İle ","mergeDown":"Birleştir - Aşağıdaki İle ","splitHorizontal":"Hücreyi Yatay Böl","splitVertical":"Hücreyi Dikey Böl","title":"Hücre Özellikleri","cellType":"Hücre Tipi","rowSpan":"Satırlar Mesafesi (Span)","colSpan":"Sütünlar Mesafesi (Span)","wordWrap":"Kelime Kaydırma","hAlign":"Düşey Hizalama","vAlign":"Yataş Hizalama","alignBaseline":"Tabana","bgColor":"Arkaplan Rengi","borderColor":"Çerçeve Rengi","data":"Veri","header":"Başlık","yes":"Evet","no":"Hayır","invalidWidth":"Hücre genişliği sayı olmalıdır.","invalidHeight":"Hücre yüksekliği sayı olmalıdır.","invalidRowSpan":"Satırların mesafesi tam sayı olmalıdır.","invalidColSpan":"Sütünların mesafesi tam sayı olmalıdır.","chooseColor":"Seçiniz"},"cellPad":"Izgara yazı arası","cellSpace":"Izgara kalınlığı","column":{"menu":"Sütun","insertBefore":"Kolon Ekle - Önce","insertAfter":"Kolon Ekle - Sonra","deleteColumn":"Sütun Sil"},"columns":"Sütunlar","deleteTable":"Tabloyu Sil","headers":"Başlıklar","headersBoth":"Her İkisi","headersColumn":"İlk Sütun","headersNone":"Yok","headersRow":"İlk Satır","invalidBorder":"Çerceve büyüklüklüğü sayı olmalıdır.","invalidCellPadding":"Hücre aralığı (padding) sayı olmalıdır.","invalidCellSpacing":"Hücre boşluğu (spacing) sayı olmalıdır.","invalidCols":"Sütün sayısı 0 sayısından büyük olmalıdır.","invalidHeight":"Tablo yüksekliği sayı olmalıdır.","invalidRows":"Satır sayısı 0 sayısından büyük olmalıdır.","invalidWidth":"Tablo genişliği sayı olmalıdır.","menu":"Tablo Özellikleri","row":{"menu":"Satır","insertBefore":"Satır Ekle - Önce","insertAfter":"Satır Ekle - Sonra","deleteRow":"Satır Sil"},"rows":"Satırlar","summary":"Özet","title":"Tablo Özellikleri","toolbar":"Tablo","widthPc":"yüzde","widthPx":"piksel","widthUnit":"genişlik birimi"},"stylescombo":{"label":"Biçem","panelTitle":"Stilleri Düzenliyor","panelTitle1":"Blok Stilleri","panelTitle2":"Inline Stilleri","panelTitle3":"Nesne Stilleri"},"specialchar":{"options":"Özel Karakter Seçenekleri","title":"Özel Karakter Seç","toolbar":"Özel Karakter Ekle"},"sourcedialog":{"toolbar":"Kaynak","title":"Kaynak"},"sourcearea":{"toolbar":"Kaynak"},"showblocks":{"toolbar":"Blokları Göster"},"removeformat":{"toolbar":"Biçimi Kaldır"},"pastetext":{"button":"Düz Metin Olarak Yapıştır","title":"Düz Metin Olarak Yapıştır"},"pastefromword":{"confirmCleanup":"Yapıştırmaya çalıştığınız metin Word'den kopyalanmıştır. Yapıştırmadan önce silmek istermisiniz?","error":"Yapıştırmadaki veri bilgisi hata düzelene kadar silinmeyecektir","title":"Word'den Yapıştır","toolbar":"Word'den Yapıştır"},"maximize":{"maximize":"Büyült","minimize":"Küçült"},"magicline":{"title":"Parağrafı buraya ekle"},"list":{"bulletedlist":"Simgeli Liste","numberedlist":"Numaralı Liste"},"language":{"button":"Dili seç","remove":"Dili kaldır"},"justify":{"block":"İki Kenara Yaslanmış","center":"Ortalanmış","left":"Sola Dayalı","right":"Sağa Dayalı"},"indent":{"indent":"Sekme Arttır","outdent":"Sekme Azalt"},"image2":{"alt":"Alternatif Yazı","btnUpload":"Sunucuya Yolla","captioned":"Başlıklı resim","captionPlaceholder":"Başlık","infoTab":"Resim Bilgisi","lockRatio":"Oranı Kilitle","menu":"Resim Özellikleri","pathName":"Resim","pathNameCaption":"başlık","resetSize":"Boyutu Başa Döndür","resizer":"Boyutlandırmak için, tıklayın ve sürükleyin","title":"Resim Özellikleri","uploadTab":"Karşıya Yükle","urlMissing":"Resmin URL kaynağı bulunamadı.","altMissing":"Alternatif yazı eksik."},"horizontalrule":{"toolbar":"Yatay Satır Ekle"},"format":{"label":"Biçim","panelTitle":"Biçim","tag_address":"Adres","tag_div":"Paragraf (DIV)","tag_h1":"Başlık 1","tag_h2":"Başlık 2","tag_h3":"Başlık 3","tag_h4":"Başlık 4","tag_h5":"Başlık 5","tag_h6":"Başlık 6","tag_p":"Normal","tag_pre":"Biçimli"},"elementspath":{"eleLabel":"Elementlerin yolu","eleTitle":"%1 elementi"},"contextmenu":{"options":"İçerik Menüsü Seçenekleri"},"clipboard":{"copy":"Kopyala","copyError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl/Cmd+C) tuşlarını kullanın.","cut":"Kes","cutError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl/Cmd+X) tuşlarını kullanın.","paste":"Yapıştır","pasteArea":"Yapıştırma Alanı","pasteMsg":"Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl/Cmd+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.","securityMsg":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin direkt olarak panoya erişimine izin vermiyor. Bu pencere içine tekrar yapıştırmalısınız..","title":"Yapıştır"},"button":{"selectedLabel":"%1 (Seçilmiş)"},"blockquote":{"toolbar":"Blok Oluştur"},"basicstyles":{"bold":"Kalın","italic":"İtalik","strike":"Üstü Çizgili","subscript":"Alt Simge","superscript":"Üst Simge","underline":"Altı Çizgili"},"about":{"copy":"Copyright &copy; $1. Tüm hakları saklıdır.","dlgTitle":"CKEditor Hakkında","help":"Yardım için $1 kontrol edin.","moreInfo":"Lisanslama hakkında daha fazla bilgi almak için lütfen sitemizi ziyaret edin:","title":"CKEditor Hakkında","userGuide":"CKEditor Kullanıcı Kılavuzu"},"editor":"Zengin Metin Editörü","editorPanel":"Zengin Metin Editör Paneli","common":{"editorHelp":"Yardım için ALT 0 tuşlarına basın","browseServer":"Sunucuya Gözat","url":"URL","protocol":"Protokol","upload":"Karşıya Yükle","uploadSubmit":"Sunucuya Gönder","image":"Resim","flash":"Flash","form":"Form","checkbox":"Onay Kutusu","radio":"Seçenek Düğmesi","textField":"Metin Kutusu","textarea":"Metin Alanı","hiddenField":"Gizli Alan","button":"Düğme","select":"Seçme Alanı","imageButton":"Resim Düğmesi","notSet":"<tanımlanmamış>","id":"Kimlik","name":"İsim","langDir":"Dil Yönü","langDirLtr":"Soldan Sağa (LTR)","langDirRtl":"Sağdan Sola (RTL)","langCode":"Dil Kodlaması","longDescr":"Uzun Tanımlı URL","cssClass":"Biçem Sayfası Sınıfları","advisoryTitle":"Öneri Başlığı","cssStyle":"Biçem","ok":"Tamam","cancel":"İptal","close":"Kapat","preview":"Önizleme","resize":"Yeniden Boyutlandır","generalTab":"Genel","advancedTab":"Gelişmiş","validateNumberFailed":"Bu değer bir sayı değildir.","confirmNewPage":"Bu içerikle ilgili kaydedilmemiş tüm bilgiler kaybolacaktır. Yeni bir sayfa yüklemek istediğinizden emin misiniz?","confirmCancel":"Bazı seçenekleri değiştirdiniz. İletişim penceresini kapatmak istediğinizden emin misiniz?","options":"Seçenekler","target":"Hedef","targetNew":"Yeni Pencere (_blank)","targetTop":"En Üstteki Pencere (_top)","targetSelf":"Aynı Pencere (_self)","targetParent":"Üst Pencere (_parent)","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","styles":"Biçem","cssClasses":"Biçem Sayfası Sınıfları","width":"Genişlik","height":"Yükseklik","align":"Hizalama","alignLeft":"Sol","alignRight":"Sağ","alignCenter":"Ortala","alignJustify":"İki Kenara Yaslanmış","alignTop":"Üst","alignMiddle":"Orta","alignBottom":"Alt","alignNone":"Hiçbiri","invalidValue":"Geçersiz değer.","invalidHeight":"Yükseklik değeri bir sayı olmalıdır.","invalidWidth":"Genişlik değeri bir sayı olmalıdır.","invalidCssLength":"\"%1\" alanı için verilen değer, geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt, veya pc) içeren veya içermeyen pozitif bir sayı olmalıdır.","invalidHtmlLength":"Belirttiğiniz sayı \"%1\" alanı için pozitif bir sayı HTML birim değeri olmalıdır (px veya %).","invalidInlineStyle":"Satıriçi biçem için verilen değer, \"isim : değer\" biçiminde birbirinden noktalı virgüllerle ayrılan bir veya daha fazla değişkenler grubundan oluşmalıdır.","cssLengthTooltip":"Piksel türünde bir sayı veya geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt veya pc) içeren bir sayı girin.","unavailable":"%1<span class=\"cke_accessibility\">, kullanılamaz</span>","keyboard":{"8":"Silme Tuşu","13":"Giriş Tuşu","16":"Üst Karater Tuşu","17":"Kontrol Tuşu","18":"Alt Tuşu","32":"Boşluk Tuşu","35":"En Sona Tuşu","36":"En Başa Tuşu","46":"Silme Tuşu","224":"Komut Tuşu"},"keyboardShortcut":"Klavye Kısayolu"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/tt.js b/web/core/assets/vendor/ckeditor/lang/tt.js
index 311b069af..b92003ce4 100644
--- a/web/core/assets/vendor/ckeditor/lang/tt.js
+++ b/web/core/assets/vendor/ckeditor/lang/tt.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['tt']={"widget":{"move":"Күчереп куер өчен басып шудырыгыз","label":"%1 widget"},"undo":{"redo":"Кабатлау","undo":"Кайтару"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Документ","clipboard":"Алмашу буферы/Кайтару","editing":"Төзәтү","forms":"Формалар","basicstyles":"Төп стильләр","paragraph":"Параграф","links":"Сылталамалар","insert":"Өстәү","styles":"Стильләр","colors":"Төсләр","tools":"Кораллар"},"toolbars":"Editor toolbars"},"table":{"border":"Чик калынлыгы","caption":"Исем","cell":{"menu":"Күзәнәк","insertBefore":"Алдына күзәнәк өстәү","insertAfter":"Артына күзәнәк өстәү","deleteCell":"Күзәнәкләрне бетерү","merge":"Күзәнәкләрне берләштерү","mergeRight":"Уң яктагы белән берләштерү","mergeDown":"Астагы белән берләштерү","splitHorizontal":"Күзәнәкне юлларга бүлү","splitVertical":"Күзәнәкне баганаларга бүлү","title":"Күзәнәк үзлекләре","cellType":"Күзәнәк төре","rowSpan":"Юлларны берләштерү","colSpan":"Баганаларны берләштерү","wordWrap":"Текстны күчерү","hAlign":"Ятма тигезләү","vAlign":"Асма тигезләү","alignBaseline":"Таяныч сызыгы","bgColor":"Фон төсе","borderColor":"Чик төсе","data":"Мәгълүмат","header":"Башлык","yes":"Әйе","no":"Юк","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сайлау"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Багана","insertBefore":"Сулдан баганалар өстәү","insertAfter":"Уңнан баганалар өстәү","deleteColumn":"Баганаларны бетерү"},"columns":"Баганалар","deleteTable":"Таблицаны бетерү","headers":"Башлыклар","headersBoth":"Икесе дә","headersColumn":"Беренче багана","headersNone":"Һичбер","headersRow":"Беренче юл","invalidBorder":"Чик киңлеге сан булырга тиеш.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Күзәнәкләр аралары уңай сан булырга тиеш.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Таблица биеклеге сан булырга тиеш.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Таблица киңлеге сан булырга тиеш","menu":"Таблица үзлекләре","row":{"menu":"Юл","insertBefore":"Өстән юллар өстәү","insertAfter":"Астан юллар өстәү","deleteRow":"Юлларны бетерү"},"rows":"Юллар","summary":"Йомгаклау","title":"Таблица үзлекләре","toolbar":"Таблица","widthPc":"процент","widthPx":"Нокталар","widthUnit":"киңлек берәмлеге"},"stylescombo":{"label":"Стильләр","panelTitle":"Форматлау стильләре","panelTitle1":"Блоклар стильләре","panelTitle2":"Эчке стильләр","panelTitle3":"Объектлар стильләре"},"specialchar":{"options":"Махсус символ үзлекләре","title":"Махсус символ сайлау","toolbar":"Махсус символ өстәү"},"sourcedialog":{"toolbar":"Чыганак","title":"Чыганак"},"sourcearea":{"toolbar":"Чыганак"},"showblocks":{"toolbar":"Блокларны күрсәтү"},"removeformat":{"toolbar":"Форматлауны бетерү"},"pastetext":{"button":"Форматлаусыз текст өстәү","title":"Форматлаусыз текст өстәү"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word'тан өстәү","toolbar":"Word'тан өстәү"},"maximize":{"maximize":"Зурайту","minimize":"Кечерәйтү"},"magicline":{"title":"Бирегә параграф өстәү"},"list":{"bulletedlist":"Маркерлы тезмә өстәү/бетерү","numberedlist":" Номерланган тезмә өстәү/бетерү"},"language":{"button":"Тел сайлау","remove":"Телне бетерү"},"justify":{"block":"Киңлеккә карап тигезләү","center":"Үзәккә тигезләү","left":"Сул як кырыйдан тигезләү","right":"Уң як кырыйдан тигезләү"},"indent":{"indent":"Отступны арттыру","outdent":"Отступны кечерәйтү"},"image2":{"alt":"Альтернатив текст","btnUpload":"Серверга җибәрү","captioned":"Исеме куелган рәсем","captionPlaceholder":"Исем","infoTab":"Рәсем тасвирламасы","lockRatio":"Lock Ratio","menu":"Рәсем үзлекләре","pathName":"рәсем","pathNameCaption":"исем","resetSize":"Баштагы зурлык","resizer":"Күчереп куер өчен басып шудырыгыз","title":"Рәсем үзлекләре","uploadTab":"Йөкләү","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Ятма сызык өстәү"},"format":{"label":"Форматлау","panelTitle":"Параграф форматлавы","tag_address":"Адрес","tag_div":"Гади (DIV)","tag_h1":"Башлам 1","tag_h2":"Башлам 2","tag_h3":"Башлам 3","tag_h4":"Башлам 4","tag_h5":"Башлам 5","tag_h6":"Башлам 6","tag_p":"Гади","tag_pre":"Форматлаулы"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 элемент"},"contextmenu":{"options":"Контекст меню үзлекләре"},"clipboard":{"copy":"Күчермәләү","copyError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","cut":"Кисеп алу","cutError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","paste":"Өстәү","pasteArea":"Өстәү мәйданы","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Өстәү"},"button":{"selectedLabel":"%1 (Сайланган)"},"blockquote":{"toolbar":"Өземтә блогы"},"basicstyles":{"bold":"Калын","italic":"Курсив","strike":"Сызылган","subscript":"Аскы индекс","superscript":"Өске индекс","underline":"Астына сызылган"},"about":{"copy":"Copyright &copy; $1. Бар хокуклар сакланган","dlgTitle":"CKEditor турында","help":"Ярдәм өчен $1 тикшереп карагыз.","moreInfo":"For licensing information please visit our web site:","title":"CKEditor турында","userGuide":"CKEditor кулланмасы"},"editor":"Форматлаулы текст өлкәсе","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Ярдәм өчен ALT 0 басыгыз","browseServer":"Сервер карап чыгу","url":"Сылталама","protocol":"Протокол","upload":"Йөкләү","uploadSubmit":"Серверга җибәрү","image":"Рәсем","flash":"Флеш","form":"Форма","checkbox":"Чекбокс","radio":"Радио төймә","textField":"Текст кыры","textarea":"Текст мәйданы","hiddenField":"Яшерен кыр","button":"Төймə","select":"Сайлау кыры","imageButton":"Рәсемле төймə","notSet":"<билгеләнмәгән>","id":"Id","name":"Исем","langDir":"Язылыш юнəлеше","langDirLtr":"Сулдан уңга язылыш (LTR)","langDirRtl":"Уңнан сулга язылыш (RTL)","langCode":"Тел коды","longDescr":"Җентекле тасвирламага сылталама","cssClass":"Стильләр класслары","advisoryTitle":"Киңәш исем","cssStyle":"Стиль","ok":"Тәмам","cancel":"Баш тарту","close":"Чыгу","preview":"Карап алу","resize":"Зурлыкны үзгәртү","generalTab":"Төп","advancedTab":"Киңәйтелгән көйләүләр","validateNumberFailed":"Әлеге кыйммәт сан түгел.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Үзлекләр","target":"Максат","targetNew":"Яңа тәрәзә (_blank)","targetTop":"Өске тәрәзә (_top)","targetSelf":"Шул үк тәрәзә (_self)","targetParent":"Ана тәрәзә (_parent)","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","styles":"Стиль","cssClasses":"Стильләр класслары","width":"Киңлек","height":"Биеклек","align":"Тигезләү","alignLeft":"Сул якка","alignRight":"Уң якка","alignCenter":"Үзәккә","alignJustify":"Киңлеккә карап тигезләү","alignTop":"Өскә","alignMiddle":"Уртага","alignBottom":"Аска","alignNone":"Һичбер","invalidValue":"Дөрес булмаган кыйммәт.","invalidHeight":"Биеклек сан булырга тиеш.","invalidWidth":"Киңлек сан булырга тиеш.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['tt']={"widget":{"move":"Күчереп куер өчен басып шудырыгыз","label":"%1 widget"},"undo":{"redo":"Кабатлау","undo":"Кайтару"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Документ","clipboard":"Алмашу буферы/Кайтару","editing":"Төзәтү","forms":"Формалар","basicstyles":"Төп стильләр","paragraph":"Параграф","links":"Сылталамалар","insert":"Өстәү","styles":"Стильләр","colors":"Төсләр","tools":"Кораллар"},"toolbars":"Editor toolbars"},"table":{"border":"Чик калынлыгы","caption":"Исем","cell":{"menu":"Күзәнәк","insertBefore":"Алдына күзәнәк өстәү","insertAfter":"Артына күзәнәк өстәү","deleteCell":"Күзәнәкләрне бетерү","merge":"Күзәнәкләрне берләштерү","mergeRight":"Уң яктагы белән берләштерү","mergeDown":"Астагы белән берләштерү","splitHorizontal":"Күзәнәкне юлларга бүлү","splitVertical":"Күзәнәкне баганаларга бүлү","title":"Күзәнәк үзлекләре","cellType":"Күзәнәк төре","rowSpan":"Юлларны берләштерү","colSpan":"Баганаларны берләштерү","wordWrap":"Текстны күчерү","hAlign":"Ятма тигезләү","vAlign":"Асма тигезләү","alignBaseline":"Таяныч сызыгы","bgColor":"Фон төсе","borderColor":"Чик төсе","data":"Мәгълүмат","header":"Башлык","yes":"Әйе","no":"Юк","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сайлау"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Багана","insertBefore":"Сулдан баганалар өстәү","insertAfter":"Уңнан баганалар өстәү","deleteColumn":"Баганаларны бетерү"},"columns":"Баганалар","deleteTable":"Таблицаны бетерү","headers":"Башлыклар","headersBoth":"Икесе дә","headersColumn":"Беренче багана","headersNone":"Һичбер","headersRow":"Беренче юл","invalidBorder":"Чик киңлеге сан булырга тиеш.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Күзәнәкләр аралары уңай сан булырга тиеш.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Таблица биеклеге сан булырга тиеш.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Таблица киңлеге сан булырга тиеш","menu":"Таблица үзлекләре","row":{"menu":"Юл","insertBefore":"Өстән юллар өстәү","insertAfter":"Астан юллар өстәү","deleteRow":"Юлларны бетерү"},"rows":"Юллар","summary":"Йомгаклау","title":"Таблица үзлекләре","toolbar":"Таблица","widthPc":"процент","widthPx":"Нокталар","widthUnit":"киңлек берәмлеге"},"stylescombo":{"label":"Стильләр","panelTitle":"Форматлау стильләре","panelTitle1":"Блоклар стильләре","panelTitle2":"Эчке стильләр","panelTitle3":"Объектлар стильләре"},"specialchar":{"options":"Махсус символ үзлекләре","title":"Махсус символ сайлау","toolbar":"Махсус символ өстәү"},"sourcedialog":{"toolbar":"Чыганак","title":"Чыганак"},"sourcearea":{"toolbar":"Чыганак"},"showblocks":{"toolbar":"Блокларны күрсәтү"},"removeformat":{"toolbar":"Форматлауны бетерү"},"pastetext":{"button":"Форматлаусыз текст өстәү","title":"Форматлаусыз текст өстәү"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word'тан өстәү","toolbar":"Word'тан өстәү"},"maximize":{"maximize":"Зурайту","minimize":"Кечерәйтү"},"magicline":{"title":"Бирегә параграф өстәү"},"list":{"bulletedlist":"Маркерлы тезмә өстәү/бетерү","numberedlist":" Номерланган тезмә өстәү/бетерү"},"language":{"button":"Тел сайлау","remove":"Телне бетерү"},"justify":{"block":"Киңлеккә карап тигезләү","center":"Үзәккә тигезләү","left":"Сул як кырыйдан тигезләү","right":"Уң як кырыйдан тигезләү"},"indent":{"indent":"Отступны арттыру","outdent":"Отступны кечерәйтү"},"image2":{"alt":"Альтернатив текст","btnUpload":"Серверга җибәрү","captioned":"Исеме куелган рәсем","captionPlaceholder":"Исем","infoTab":"Рәсем тасвирламасы","lockRatio":"Lock Ratio","menu":"Рәсем үзлекләре","pathName":"рәсем","pathNameCaption":"исем","resetSize":"Баштагы зурлык","resizer":"Күчереп куер өчен басып шудырыгыз","title":"Рәсем үзлекләре","uploadTab":"Йөкләү","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Ятма сызык өстәү"},"format":{"label":"Форматлау","panelTitle":"Параграф форматлавы","tag_address":"Адрес","tag_div":"Гади (DIV)","tag_h1":"Башлам 1","tag_h2":"Башлам 2","tag_h3":"Башлам 3","tag_h4":"Башлам 4","tag_h5":"Башлам 5","tag_h6":"Башлам 6","tag_p":"Гади","tag_pre":"Форматлаулы"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 элемент"},"contextmenu":{"options":"Контекст меню үзлекләре"},"clipboard":{"copy":"Күчермәләү","copyError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","cut":"Кисеп алу","cutError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","paste":"Өстәү","pasteArea":"Өстәү мәйданы","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Өстәү"},"button":{"selectedLabel":"%1 (Сайланган)"},"blockquote":{"toolbar":"Өземтә блогы"},"basicstyles":{"bold":"Калын","italic":"Курсив","strike":"Сызылган","subscript":"Аскы индекс","superscript":"Өске индекс","underline":"Астына сызылган"},"about":{"copy":"Copyright &copy; $1. Бар хокуклар сакланган","dlgTitle":"CKEditor турында","help":"Ярдәм өчен $1 тикшереп карагыз.","moreInfo":"For licensing information please visit our web site:","title":"CKEditor турында","userGuide":"CKEditor кулланмасы"},"editor":"Форматлаулы текст өлкәсе","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Ярдәм өчен ALT 0 басыгыз","browseServer":"Сервер карап чыгу","url":"Сылталама","protocol":"Протокол","upload":"Йөкләү","uploadSubmit":"Серверга җибәрү","image":"Рәсем","flash":"Флеш","form":"Форма","checkbox":"Чекбокс","radio":"Радио төймә","textField":"Текст кыры","textarea":"Текст мәйданы","hiddenField":"Яшерен кыр","button":"Төймə","select":"Сайлау кыры","imageButton":"Рәсемле төймə","notSet":"<билгеләнмәгән>","id":"Id","name":"Исем","langDir":"Язылыш юнəлеше","langDirLtr":"Сулдан уңга язылыш (LTR)","langDirRtl":"Уңнан сулга язылыш (RTL)","langCode":"Тел коды","longDescr":"Җентекле тасвирламага сылталама","cssClass":"Стильләр класслары","advisoryTitle":"Киңәш исем","cssStyle":"Стиль","ok":"Тәмам","cancel":"Баш тарту","close":"Чыгу","preview":"Карап алу","resize":"Зурлыкны үзгәртү","generalTab":"Төп","advancedTab":"Киңәйтелгән көйләүләр","validateNumberFailed":"Әлеге кыйммәт сан түгел.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Үзлекләр","target":"Максат","targetNew":"Яңа тәрәзә (_blank)","targetTop":"Өске тәрәзә (_top)","targetSelf":"Шул үк тәрәзә (_self)","targetParent":"Ана тәрәзә (_parent)","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","styles":"Стиль","cssClasses":"Стильләр класслары","width":"Киңлек","height":"Биеклек","align":"Тигезләү","alignLeft":"Сул якка","alignRight":"Уң якка","alignCenter":"Үзәккә","alignJustify":"Киңлеккә карап тигезләү","alignTop":"Өскә","alignMiddle":"Уртага","alignBottom":"Аска","alignNone":"Һичбер","invalidValue":"Дөрес булмаган кыйммәт.","invalidHeight":"Биеклек сан булырга тиеш.","invalidWidth":"Киңлек сан булырга тиеш.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Кайтару","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Бетерү","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/ug.js b/web/core/assets/vendor/ckeditor/lang/ug.js
index 83d35de97..590074562 100644
--- a/web/core/assets/vendor/ckeditor/lang/ug.js
+++ b/web/core/assets/vendor/ckeditor/lang/ug.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ug']={"widget":{"move":"يۆتكەشتە چېكىپ سۆرەڭ","label":"%1 widget"},"undo":{"redo":"قايتىلا ","undo":"يېنىۋال"},"toolbar":{"toolbarCollapse":"قورال بالداقنى قاتلا","toolbarExpand":"قورال بالداقنى ياي","toolbarGroups":{"document":"پۈتۈك","clipboard":"چاپلاش تاختىسى/يېنىۋال","editing":"تەھرىر","forms":"جەدۋەل","basicstyles":"ئاساسىي ئۇسلۇب","paragraph":"ئابزاس","links":"ئۇلانما","insert":"قىستۇر","styles":"ئۇسلۇب","colors":"رەڭ","tools":"قورال"},"toolbars":"قورال بالداق"},"table":{"border":"گىرۋەك","caption":"ماۋزۇ","cell":{"menu":"كاتەكچە","insertBefore":"سولغا كاتەكچە قىستۇر","insertAfter":"ئوڭغا كاتەكچە قىستۇر","deleteCell":"كەتەكچە ئۆچۈر","merge":"كاتەكچە بىرلەشتۈر","mergeRight":"كاتەكچىنى ئوڭغا بىرلەشتۈر","mergeDown":"كاتەكچىنى ئاستىغا بىرلەشتۈر","splitHorizontal":"كاتەكچىنى توغرىسىغا بىرلەشتۈر","splitVertical":"كاتەكچىنى بويىغا بىرلەشتۈر","title":"كاتەكچە خاسلىقى","cellType":"كاتەكچە تىپى","rowSpan":"بويىغا چات ئارىسى قۇر سانى","colSpan":"توغرىسىغا چات ئارىسى ئىستون سانى","wordWrap":"ئۆزلۈكىدىن قۇر قاتلا","hAlign":"توغرىسىغا توغرىلا","vAlign":"بويىغا توغرىلا","alignBaseline":"ئاساسىي سىزىق","bgColor":"تەگلىك رەڭگى","borderColor":"گىرۋەك رەڭگى","data":"سانلىق مەلۇمات","header":"جەدۋەل باشى","yes":"ھەئە","no":"ياق","invalidWidth":"كاتەكچە كەڭلىكى چوقۇم سان بولىدۇ","invalidHeight":"كاتەكچە ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRowSpan":"قۇر چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ ","invalidColSpan":"ئىستون چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ","chooseColor":"تاللاڭ"},"cellPad":"يان ئارىلىق","cellSpace":"ئارىلىق","column":{"menu":"ئىستون","insertBefore":"سولغا ئىستون قىستۇر","insertAfter":"ئوڭغا ئىستون قىستۇر","deleteColumn":"ئىستون ئۆچۈر"},"columns":"ئىستون سانى","deleteTable":"جەدۋەل ئۆچۈر","headers":"ماۋزۇ كاتەكچە","headersBoth":"بىرىنچى ئىستون ۋە بىرىنچى قۇر","headersColumn":"بىرىنچى ئىستون","headersNone":"يوق","headersRow":"بىرىنچى قۇر","invalidBorder":"گىرۋەك توملۇقى چوقۇم سان بولىدۇ","invalidCellPadding":"كاتەكچىگە چوقۇم سان تولدۇرۇلىدۇ","invalidCellSpacing":"كاتەكچە ئارىلىقى چوقۇم سان بولىدۇ","invalidCols":"بەلگىلەنگەن قۇر سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidHeight":"جەدۋەل ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRows":"بەلگىلەنگەن ئىستون سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidWidth":"جەدۋەل كەڭلىكى چوقۇم سان بولىدۇ","menu":"جەدۋەل خاسلىقى","row":{"menu":"قۇر","insertBefore":"ئۈستىگە قۇر قىستۇر","insertAfter":"ئاستىغا قۇر قىستۇر","deleteRow":"قۇر ئۆچۈر"},"rows":"قۇر سانى","summary":"ئۈزۈندە","title":"جەدۋەل خاسلىقى","toolbar":"جەدۋەل","widthPc":"پىرسەنت","widthPx":"پىكسېل","widthUnit":"كەڭلىك بىرلىكى"},"stylescombo":{"label":"ئۇسلۇب","panelTitle":"ئۇسلۇب","panelTitle1":"بۆلەك دەرىجىسىدىكى ئېلېمېنت ئۇسلۇبى","panelTitle2":"ئىچكى باغلانما ئېلېمېنت ئۇسلۇبى","panelTitle3":"نەڭ (Object) ئېلېمېنت ئۇسلۇبى"},"specialchar":{"options":"ئالاھىدە ھەرپ تاللانمىسى","title":"ئالاھىدە ھەرپ تاللاڭ","toolbar":"ئالاھىدە ھەرپ قىستۇر"},"sourcedialog":{"toolbar":"مەنبە","title":"مەنبە"},"sourcearea":{"toolbar":"مەنبە"},"showblocks":{"toolbar":"بۆلەكنى كۆرسەت"},"removeformat":{"toolbar":"پىچىمنى چىقىرىۋەت"},"pastetext":{"button":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا","title":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا"},"pastefromword":{"confirmCleanup":"سىز چاپلىماقچى بولغان مەزمۇن MS Word تىن كەلگەندەك قىلىدۇ، MS Word پىچىمىنى تازىلىۋەتكەندىن كېيىن ئاندىن چاپلامدۇ؟","error":"ئىچكى خاتالىق سەۋەبىدىن چاپلايدىغان سانلىق مەلۇماتنى تازىلىيالمايدۇ","title":"MS Word تىن چاپلا","toolbar":"MS Word تىن چاپلا"},"maximize":{"maximize":"چوڭايت","minimize":"كىچىكلەت"},"magicline":{"title":"بۇ جايغا ئابزاس قىستۇر"},"list":{"bulletedlist":"تۈر بەلگە تىزىمى","numberedlist":"تەرتىپ نومۇر تىزىمى"},"language":{"button":"تىل تەڭشەك","remove":"تىلنى چىقىرىۋەت"},"justify":{"block":"ئىككى تەرەپتىن توغرىلا","center":"ئوتتۇرىغا توغرىلا","left":"سولغا توغرىلا","right":"ئوڭغا توغرىلا"},"indent":{"indent":"تارايت","outdent":"كەڭەيت"},"image2":{"alt":"تېكىست ئالماشتۇر","btnUpload":"مۇلازىمېتىرغا يۈكلە","captioned":"ماۋزۇلۇق سۈرەت","captionPlaceholder":"Caption","infoTab":"سۈرەت","lockRatio":"نىسبەتنى قۇلۇپلا","menu":"سۈرەت خاسلىقى","pathName":"image","pathNameCaption":"caption","resetSize":"ئەسلى چوڭلۇق","resizer":"Click and drag to resize","title":"سۈرەت خاسلىقى","uploadTab":"يۈكلە","urlMissing":"سۈرەتنىڭ ئەسلى ھۆججەت ئادرېسى كەم"},"horizontalrule":{"toolbar":"توغرا سىزىق قىستۇر"},"format":{"label":"پىچىم","panelTitle":"پىچىم","tag_address":"ئادرېس","tag_div":"ئابزاس (DIV)","tag_h1":"ماۋزۇ 1","tag_h2":"ماۋزۇ 2","tag_h3":"ماۋزۇ 3","tag_h4":"ماۋزۇ 4","tag_h5":"ماۋزۇ 5","tag_h6":"ماۋزۇ 6","tag_p":"ئادەتتىكى","tag_pre":"تىزىلغان پىچىم"},"elementspath":{"eleLabel":"ئېلېمېنت يولى","eleTitle":"%1 ئېلېمېنت"},"contextmenu":{"options":"قىسقا يول تىزىملىك تاللانمىسى"},"clipboard":{"copy":"كۆچۈر","copyError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كۆچۈر مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+C) ئارقىلىق تاماملاڭ","cut":"كەس","cutError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كەس مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+X) ئارقىلىق تاماملاڭ","paste":"چاپلا","pasteArea":"چاپلاش دائىرىسى","pasteMsg":"ھەرپتاختا تېز كۇنۇپكا (<STRONG>Ctrl/Cmd+V</STRONG>) نى ئىشلىتىپ مەزمۇننى تۆۋەندىكى رامكىغا كۆچۈرۈڭ، ئاندىن <STRONG>جەزملە</STRONG>نى بېسىڭ","securityMsg":"توركۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى سەۋەبىدىن بۇ تەھرىرلىگۈچ چاپلاش تاختىسىدىكى مەزمۇننى بىۋاستە زىيارەت قىلالمايدۇ، بۇ كۆزنەكتە قايتا بىر قېتىم چاپلىشىڭىز كېرەك.","title":"چاپلا"},"button":{"selectedLabel":"%1 (تاللاندى)"},"blockquote":{"toolbar":"بۆلەك نەقىل"},"basicstyles":{"bold":"توم","italic":"يانتۇ","strike":"ئۆچۈرۈش سىزىقى","subscript":"تۆۋەن ئىندېكس","superscript":"يۇقىرى ئىندېكس","underline":"ئاستى سىزىق"},"about":{"copy":"Copyright &copy; $1. نەشر ھوقۇقىغا ئىگە","dlgTitle":"CKEditor ھەققىدە","help":"$1 نى زىيارەت قىلىپ ياردەمگە ئېرىشىڭ","moreInfo":"تور تۇرايىمىزنى زىيارەت قىلىپ كېلىشىمگە ئائىت تېخىمۇ كۆپ ئۇچۇرغا ئېرىشىڭ","title":"CKEditor ھەققىدە","userGuide":"CKEditor ئىشلەتكۈچى قوللانمىسى"},"editor":"تەھرىرلىگۈچ","editorPanel":"مول تېكست تەھرىرلىگۈچ تاختىسى","common":{"editorHelp":"ALT+0 نى بېسىپ ياردەمنى كۆرۈڭ","browseServer":"كۆرسىتىش مۇلازىمېتىر","url":"ئەسلى ھۆججەت","protocol":"كېلىشىم","upload":"يۈكلە","uploadSubmit":"مۇلازىمېتىرغا يۈكلە","image":"سۈرەت","flash":"Flash","form":"جەدۋەل","checkbox":"كۆپ تاللاش رامكىسى","radio":"يەككە تاللاش توپچىسى","textField":"يەككە قۇر تېكىست","textarea":"كۆپ قۇر تېكىست","hiddenField":"يوشۇرۇن دائىرە","button":"توپچا","select":"تىزىم/تىزىملىك","imageButton":"سۈرەت دائىرە","notSet":"‹تەڭشەلمىگەن›","id":"ID","name":"ئات","langDir":"تىل يۆنىلىشى","langDirLtr":"سولدىن ئوڭغا (LTR)","langDirRtl":"ئوڭدىن سولغا (RTL)","langCode":"تىل كودى","longDescr":"تەپسىلىي چۈشەندۈرۈش ئادرېسى","cssClass":"ئۇسلۇب خىلىنىڭ ئاتى","advisoryTitle":"ماۋزۇ","cssStyle":"قۇر ئىچىدىكى ئۇسلۇبى","ok":"جەزملە","cancel":"ۋاز كەچ","close":"تاقا","preview":"ئالدىن كۆزەت","resize":"چوڭلۇقىنى ئۆزگەرت","generalTab":"ئادەتتىكى","advancedTab":"ئالىي","validateNumberFailed":"سان پىچىمىدا كىرگۈزۈش زۆرۈر","confirmNewPage":"نۆۋەتتىكى پۈتۈك مەزمۇنى ساقلانمىدى، يېڭى پۈتۈك قۇرامسىز؟","confirmCancel":"قىسمەن ئۆزگەرتىش ساقلانمىدى، بۇ سۆزلەشكۈنى تاقامسىز؟","options":"تاللانما","target":"نىشان كۆزنەك","targetNew":"يېڭى كۆزنەك (_blank)","targetTop":"پۈتۈن بەت (_top)","targetSelf":"مەزكۇر كۆزنەك (_self)","targetParent":"ئاتا كۆزنەك (_parent)","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","styles":"ئۇسلۇبلار","cssClasses":"ئۇسلۇب خىللىرى","width":"كەڭلىك","height":"ئېگىزلىك","align":"توغرىلىنىشى","alignLeft":"سول","alignRight":"ئوڭ","alignCenter":"ئوتتۇرا","alignJustify":"ئىككى تەرەپتىن توغرىلا","alignTop":"ئۈستى","alignMiddle":"ئوتتۇرا","alignBottom":"ئاستى","alignNone":"يوق","invalidValue":"ئىناۋەتسىز قىممەت.","invalidHeight":"ئېگىزلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidWidth":"كەڭلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidCssLength":"بۇ سۆز بۆلىكى چوقۇم مۇۋاپىق بولغان CSS ئۇزۇنلۇق قىممىتى بولۇشى زۆرۈر، بىرلىكى (px, %, in, cm, mm, em, ex, pt ياكى pc)","invalidHtmlLength":"بۇ سۆز بۆلىكى چوقۇم بىرىكمە HTML ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px ياكى %)","invalidInlineStyle":"ئىچكى باغلانما ئۇسلۇبى چوقۇم چېكىتلىك پەش بىلەن ئايرىلغان بىر ياكى كۆپ «خاسلىق ئاتى:خاسلىق قىممىتى» پىچىمىدا بولۇشى لازىم","cssLengthTooltip":"بۇ سۆز بۆلىكى بىرىكمە CSS ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px, %, in, cm, mm, em, ex, pt ياكى pc)","unavailable":"%1<span class=\\\\\"cke_accessibility\\\\\">، ئىشلەتكىلى بولمايدۇ</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ug']={"widget":{"move":"يۆتكەشتە چېكىپ سۆرەڭ","label":"%1 widget"},"undo":{"redo":"قايتىلا ","undo":"يېنىۋال"},"toolbar":{"toolbarCollapse":"قورال بالداقنى قاتلا","toolbarExpand":"قورال بالداقنى ياي","toolbarGroups":{"document":"پۈتۈك","clipboard":"چاپلاش تاختىسى/يېنىۋال","editing":"تەھرىر","forms":"جەدۋەل","basicstyles":"ئاساسىي ئۇسلۇب","paragraph":"ئابزاس","links":"ئۇلانما","insert":"قىستۇر","styles":"ئۇسلۇب","colors":"رەڭ","tools":"قورال"},"toolbars":"قورال بالداق"},"table":{"border":"گىرۋەك","caption":"ماۋزۇ","cell":{"menu":"كاتەكچە","insertBefore":"سولغا كاتەكچە قىستۇر","insertAfter":"ئوڭغا كاتەكچە قىستۇر","deleteCell":"كەتەكچە ئۆچۈر","merge":"كاتەكچە بىرلەشتۈر","mergeRight":"كاتەكچىنى ئوڭغا بىرلەشتۈر","mergeDown":"كاتەكچىنى ئاستىغا بىرلەشتۈر","splitHorizontal":"كاتەكچىنى توغرىسىغا بىرلەشتۈر","splitVertical":"كاتەكچىنى بويىغا بىرلەشتۈر","title":"كاتەكچە خاسلىقى","cellType":"كاتەكچە تىپى","rowSpan":"بويىغا چات ئارىسى قۇر سانى","colSpan":"توغرىسىغا چات ئارىسى ئىستون سانى","wordWrap":"ئۆزلۈكىدىن قۇر قاتلا","hAlign":"توغرىسىغا توغرىلا","vAlign":"بويىغا توغرىلا","alignBaseline":"ئاساسىي سىزىق","bgColor":"تەگلىك رەڭگى","borderColor":"گىرۋەك رەڭگى","data":"سانلىق مەلۇمات","header":"جەدۋەل باشى","yes":"ھەئە","no":"ياق","invalidWidth":"كاتەكچە كەڭلىكى چوقۇم سان بولىدۇ","invalidHeight":"كاتەكچە ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRowSpan":"قۇر چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ ","invalidColSpan":"ئىستون چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ","chooseColor":"تاللاڭ"},"cellPad":"يان ئارىلىق","cellSpace":"ئارىلىق","column":{"menu":"ئىستون","insertBefore":"سولغا ئىستون قىستۇر","insertAfter":"ئوڭغا ئىستون قىستۇر","deleteColumn":"ئىستون ئۆچۈر"},"columns":"ئىستون سانى","deleteTable":"جەدۋەل ئۆچۈر","headers":"ماۋزۇ كاتەكچە","headersBoth":"بىرىنچى ئىستون ۋە بىرىنچى قۇر","headersColumn":"بىرىنچى ئىستون","headersNone":"يوق","headersRow":"بىرىنچى قۇر","invalidBorder":"گىرۋەك توملۇقى چوقۇم سان بولىدۇ","invalidCellPadding":"كاتەكچىگە چوقۇم سان تولدۇرۇلىدۇ","invalidCellSpacing":"كاتەكچە ئارىلىقى چوقۇم سان بولىدۇ","invalidCols":"بەلگىلەنگەن قۇر سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidHeight":"جەدۋەل ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRows":"بەلگىلەنگەن ئىستون سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidWidth":"جەدۋەل كەڭلىكى چوقۇم سان بولىدۇ","menu":"جەدۋەل خاسلىقى","row":{"menu":"قۇر","insertBefore":"ئۈستىگە قۇر قىستۇر","insertAfter":"ئاستىغا قۇر قىستۇر","deleteRow":"قۇر ئۆچۈر"},"rows":"قۇر سانى","summary":"ئۈزۈندە","title":"جەدۋەل خاسلىقى","toolbar":"جەدۋەل","widthPc":"پىرسەنت","widthPx":"پىكسېل","widthUnit":"كەڭلىك بىرلىكى"},"stylescombo":{"label":"ئۇسلۇب","panelTitle":"ئۇسلۇب","panelTitle1":"بۆلەك دەرىجىسىدىكى ئېلېمېنت ئۇسلۇبى","panelTitle2":"ئىچكى باغلانما ئېلېمېنت ئۇسلۇبى","panelTitle3":"نەڭ (Object) ئېلېمېنت ئۇسلۇبى"},"specialchar":{"options":"ئالاھىدە ھەرپ تاللانمىسى","title":"ئالاھىدە ھەرپ تاللاڭ","toolbar":"ئالاھىدە ھەرپ قىستۇر"},"sourcedialog":{"toolbar":"مەنبە","title":"مەنبە"},"sourcearea":{"toolbar":"مەنبە"},"showblocks":{"toolbar":"بۆلەكنى كۆرسەت"},"removeformat":{"toolbar":"پىچىمنى چىقىرىۋەت"},"pastetext":{"button":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا","title":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا"},"pastefromword":{"confirmCleanup":"سىز چاپلىماقچى بولغان مەزمۇن MS Word تىن كەلگەندەك قىلىدۇ، MS Word پىچىمىنى تازىلىۋەتكەندىن كېيىن ئاندىن چاپلامدۇ؟","error":"ئىچكى خاتالىق سەۋەبىدىن چاپلايدىغان سانلىق مەلۇماتنى تازىلىيالمايدۇ","title":"MS Word تىن چاپلا","toolbar":"MS Word تىن چاپلا"},"maximize":{"maximize":"چوڭايت","minimize":"كىچىكلەت"},"magicline":{"title":"بۇ جايغا ئابزاس قىستۇر"},"list":{"bulletedlist":"تۈر بەلگە تىزىمى","numberedlist":"تەرتىپ نومۇر تىزىمى"},"language":{"button":"تىل تەڭشەك","remove":"تىلنى چىقىرىۋەت"},"justify":{"block":"ئىككى تەرەپتىن توغرىلا","center":"ئوتتۇرىغا توغرىلا","left":"سولغا توغرىلا","right":"ئوڭغا توغرىلا"},"indent":{"indent":"تارايت","outdent":"كەڭەيت"},"image2":{"alt":"تېكىست ئالماشتۇر","btnUpload":"مۇلازىمېتىرغا يۈكلە","captioned":"ماۋزۇلۇق سۈرەت","captionPlaceholder":"Caption","infoTab":"سۈرەت","lockRatio":"نىسبەتنى قۇلۇپلا","menu":"سۈرەت خاسلىقى","pathName":"image","pathNameCaption":"caption","resetSize":"ئەسلى چوڭلۇق","resizer":"Click and drag to resize","title":"سۈرەت خاسلىقى","uploadTab":"يۈكلە","urlMissing":"سۈرەتنىڭ ئەسلى ھۆججەت ئادرېسى كەم","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"توغرا سىزىق قىستۇر"},"format":{"label":"پىچىم","panelTitle":"پىچىم","tag_address":"ئادرېس","tag_div":"ئابزاس (DIV)","tag_h1":"ماۋزۇ 1","tag_h2":"ماۋزۇ 2","tag_h3":"ماۋزۇ 3","tag_h4":"ماۋزۇ 4","tag_h5":"ماۋزۇ 5","tag_h6":"ماۋزۇ 6","tag_p":"ئادەتتىكى","tag_pre":"تىزىلغان پىچىم"},"elementspath":{"eleLabel":"ئېلېمېنت يولى","eleTitle":"%1 ئېلېمېنت"},"contextmenu":{"options":"قىسقا يول تىزىملىك تاللانمىسى"},"clipboard":{"copy":"كۆچۈر","copyError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كۆچۈر مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+C) ئارقىلىق تاماملاڭ","cut":"كەس","cutError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كەس مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+X) ئارقىلىق تاماملاڭ","paste":"چاپلا","pasteArea":"چاپلاش دائىرىسى","pasteMsg":"ھەرپتاختا تېز كۇنۇپكا (<STRONG>Ctrl/Cmd+V</STRONG>) نى ئىشلىتىپ مەزمۇننى تۆۋەندىكى رامكىغا كۆچۈرۈڭ، ئاندىن <STRONG>جەزملە</STRONG>نى بېسىڭ","securityMsg":"توركۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى سەۋەبىدىن بۇ تەھرىرلىگۈچ چاپلاش تاختىسىدىكى مەزمۇننى بىۋاستە زىيارەت قىلالمايدۇ، بۇ كۆزنەكتە قايتا بىر قېتىم چاپلىشىڭىز كېرەك.","title":"چاپلا"},"button":{"selectedLabel":"%1 (تاللاندى)"},"blockquote":{"toolbar":"بۆلەك نەقىل"},"basicstyles":{"bold":"توم","italic":"يانتۇ","strike":"ئۆچۈرۈش سىزىقى","subscript":"تۆۋەن ئىندېكس","superscript":"يۇقىرى ئىندېكس","underline":"ئاستى سىزىق"},"about":{"copy":"Copyright &copy; $1. نەشر ھوقۇقىغا ئىگە","dlgTitle":"CKEditor ھەققىدە","help":"$1 نى زىيارەت قىلىپ ياردەمگە ئېرىشىڭ","moreInfo":"تور تۇرايىمىزنى زىيارەت قىلىپ كېلىشىمگە ئائىت تېخىمۇ كۆپ ئۇچۇرغا ئېرىشىڭ","title":"CKEditor ھەققىدە","userGuide":"CKEditor ئىشلەتكۈچى قوللانمىسى"},"editor":"تەھرىرلىگۈچ","editorPanel":"مول تېكست تەھرىرلىگۈچ تاختىسى","common":{"editorHelp":"ALT+0 نى بېسىپ ياردەمنى كۆرۈڭ","browseServer":"كۆرسىتىش مۇلازىمېتىر","url":"ئەسلى ھۆججەت","protocol":"كېلىشىم","upload":"يۈكلە","uploadSubmit":"مۇلازىمېتىرغا يۈكلە","image":"سۈرەت","flash":"Flash","form":"جەدۋەل","checkbox":"كۆپ تاللاش رامكىسى","radio":"يەككە تاللاش توپچىسى","textField":"يەككە قۇر تېكىست","textarea":"كۆپ قۇر تېكىست","hiddenField":"يوشۇرۇن دائىرە","button":"توپچا","select":"تىزىم/تىزىملىك","imageButton":"سۈرەت دائىرە","notSet":"‹تەڭشەلمىگەن›","id":"ID","name":"ئات","langDir":"تىل يۆنىلىشى","langDirLtr":"سولدىن ئوڭغا (LTR)","langDirRtl":"ئوڭدىن سولغا (RTL)","langCode":"تىل كودى","longDescr":"تەپسىلىي چۈشەندۈرۈش ئادرېسى","cssClass":"ئۇسلۇب خىلىنىڭ ئاتى","advisoryTitle":"ماۋزۇ","cssStyle":"قۇر ئىچىدىكى ئۇسلۇبى","ok":"جەزملە","cancel":"ۋاز كەچ","close":"تاقا","preview":"ئالدىن كۆزەت","resize":"چوڭلۇقىنى ئۆزگەرت","generalTab":"ئادەتتىكى","advancedTab":"ئالىي","validateNumberFailed":"سان پىچىمىدا كىرگۈزۈش زۆرۈر","confirmNewPage":"نۆۋەتتىكى پۈتۈك مەزمۇنى ساقلانمىدى، يېڭى پۈتۈك قۇرامسىز؟","confirmCancel":"قىسمەن ئۆزگەرتىش ساقلانمىدى، بۇ سۆزلەشكۈنى تاقامسىز؟","options":"تاللانما","target":"نىشان كۆزنەك","targetNew":"يېڭى كۆزنەك (_blank)","targetTop":"پۈتۈن بەت (_top)","targetSelf":"مەزكۇر كۆزنەك (_self)","targetParent":"ئاتا كۆزنەك (_parent)","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","styles":"ئۇسلۇبلار","cssClasses":"ئۇسلۇب خىللىرى","width":"كەڭلىك","height":"ئېگىزلىك","align":"توغرىلىنىشى","alignLeft":"سول","alignRight":"ئوڭ","alignCenter":"ئوتتۇرا","alignJustify":"ئىككى تەرەپتىن توغرىلا","alignTop":"ئۈستى","alignMiddle":"ئوتتۇرا","alignBottom":"ئاستى","alignNone":"يوق","invalidValue":"ئىناۋەتسىز قىممەت.","invalidHeight":"ئېگىزلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidWidth":"كەڭلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidCssLength":"بۇ سۆز بۆلىكى چوقۇم مۇۋاپىق بولغان CSS ئۇزۇنلۇق قىممىتى بولۇشى زۆرۈر، بىرلىكى (px, %, in, cm, mm, em, ex, pt ياكى pc)","invalidHtmlLength":"بۇ سۆز بۆلىكى چوقۇم بىرىكمە HTML ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px ياكى %)","invalidInlineStyle":"ئىچكى باغلانما ئۇسلۇبى چوقۇم چېكىتلىك پەش بىلەن ئايرىلغان بىر ياكى كۆپ «خاسلىق ئاتى:خاسلىق قىممىتى» پىچىمىدا بولۇشى لازىم","cssLengthTooltip":"بۇ سۆز بۆلىكى بىرىكمە CSS ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px, %, in, cm, mm, em, ex, pt ياكى pc)","unavailable":"%1<span class=\\\\\"cke_accessibility\\\\\">، ئىشلەتكىلى بولمايدۇ</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"ئۆچۈر","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/uk.js b/web/core/assets/vendor/ckeditor/lang/uk.js
index b3d1187f6..f028500f5 100644
--- a/web/core/assets/vendor/ckeditor/lang/uk.js
+++ b/web/core/assets/vendor/ckeditor/lang/uk.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['uk']={"widget":{"move":"Клікніть і потягніть для переміщення","label":"%1 віджет"},"undo":{"redo":"Повторити","undo":"Повернути"},"toolbar":{"toolbarCollapse":"Згорнути панель інструментів","toolbarExpand":"Розгорнути панель інструментів","toolbarGroups":{"document":"Документ","clipboard":"Буфер обміну / Скасувати","editing":"Редагування","forms":"Форми","basicstyles":"Основний Стиль","paragraph":"Параграф","links":"Посилання","insert":"Вставити","styles":"Стилі","colors":"Кольори","tools":"Інструменти"},"toolbars":"Панель інструментів редактора"},"table":{"border":"Розмір рамки","caption":"Заголовок таблиці","cell":{"menu":"Комірки","insertBefore":"Вставити комірку перед","insertAfter":"Вставити комірку після","deleteCell":"Видалити комірки","merge":"Об'єднати комірки","mergeRight":"Об'єднати справа","mergeDown":"Об'єднати донизу","splitHorizontal":"Розділити комірку по горизонталі","splitVertical":"Розділити комірку по вертикалі","title":"Властивості комірки","cellType":"Тип комірки","rowSpan":"Об'єднання рядків","colSpan":"Об'єднання стовпців","wordWrap":"Автоперенесення тексту","hAlign":"Гориз. вирівнювання","vAlign":"Верт. вирівнювання","alignBaseline":"По базовій лінії","bgColor":"Колір фону","borderColor":"Колір рамки","data":"Дані","header":"Заголовок","yes":"Так","no":"Ні","invalidWidth":"Ширина комірки повинна бути цілим числом.","invalidHeight":"Висота комірки повинна бути цілим числом.","invalidRowSpan":"Кількість об'єднуваних рядків повинна бути цілим числом.","invalidColSpan":"Кількість об'єднуваних стовбців повинна бути цілим числом.","chooseColor":"Обрати"},"cellPad":"Внутр. відступ","cellSpace":"Проміжок","column":{"menu":"Стовбці","insertBefore":"Вставити стовбець перед","insertAfter":"Вставити стовбець після","deleteColumn":"Видалити стовбці"},"columns":"Стовбці","deleteTable":"Видалити таблицю","headers":"Заголовки стовбців/рядків","headersBoth":"Стовбці і рядки","headersColumn":"Стовбці","headersNone":"Без заголовків","headersRow":"Рядки","invalidBorder":"Розмір рамки повинен бути цілим числом.","invalidCellPadding":"Внутр. відступ комірки повинен бути цілим числом.","invalidCellSpacing":"Проміжок між комірками повинен бути цілим числом.","invalidCols":"Кількість стовбців повинна бути більшою 0.","invalidHeight":"Висота таблиці повинна бути цілим числом.","invalidRows":"Кількість рядків повинна бути більшою 0.","invalidWidth":"Ширина таблиці повинна бути цілим числом.","menu":"Властивості таблиці","row":{"menu":"Рядки","insertBefore":"Вставити рядок перед","insertAfter":"Вставити рядок після","deleteRow":"Видалити рядки"},"rows":"Рядки","summary":"Детальний опис заголовку таблиці","title":"Властивості таблиці","toolbar":"Таблиця","widthPc":"відсотків","widthPx":"пікселів","widthUnit":"Одиниці вимір."},"stylescombo":{"label":"Стиль","panelTitle":"Стилі форматування","panelTitle1":"Блочні стилі","panelTitle2":"Рядкові стилі","panelTitle3":"Об'єктні стилі"},"specialchar":{"options":"Опції","title":"Оберіть спеціальний символ","toolbar":"Спеціальний символ"},"sourcedialog":{"toolbar":"Джерело","title":"Джерело"},"sourcearea":{"toolbar":"Джерело"},"showblocks":{"toolbar":"Показувати блоки"},"removeformat":{"toolbar":"Видалити форматування"},"pastetext":{"button":"Вставити тільки текст","title":"Вставити тільки текст"},"pastefromword":{"confirmCleanup":"Текст, що Ви намагаєтесь вставити, схожий на скопійований з Word. Бажаєте очистити його форматування перед вставлянням?","error":"Неможливо очистити форматування через внутрішню помилку.","title":"Вставити з Word","toolbar":"Вставити з Word"},"maximize":{"maximize":"Максимізувати","minimize":"Мінімізувати"},"magicline":{"title":"Вставити абзац"},"list":{"bulletedlist":"Маркірований список","numberedlist":"Нумерований список"},"language":{"button":"Установити мову","remove":"Вилучити мову"},"justify":{"block":"По ширині","center":"По центру","left":"По лівому краю","right":"По правому краю"},"indent":{"indent":"Збільшити відступ","outdent":"Зменшити відступ"},"image2":{"alt":"Альтернативний текст","btnUpload":"Надіслати на сервер","captioned":"Підписане зображення","captionPlaceholder":"Заголовок","infoTab":"Інформація про зображення","lockRatio":"Зберегти пропорції","menu":"Властивості зображення","pathName":"Зображення","pathNameCaption":"заголовок","resetSize":"Очистити поля розмірів","resizer":"Клікніть та потягніть для зміни розмірів","title":"Властивості зображення","uploadTab":"Надіслати","urlMissing":"Вкажіть URL зображення."},"horizontalrule":{"toolbar":"Горизонтальна лінія"},"format":{"label":"Форматування","panelTitle":"Форматування параграфа","tag_address":"Адреса","tag_div":"Нормальний (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Нормальний","tag_pre":"Форматований"},"elementspath":{"eleLabel":"Шлях","eleTitle":"%1 елемент"},"contextmenu":{"options":"Опції контекстного меню"},"clipboard":{"copy":"Копіювати","copyError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції копіювання. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+C).","cut":"Вирізати","cutError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції вирізування. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+X)","paste":"Вставити","pasteArea":"Область вставки","pasteMsg":"Будь ласка, вставте інформацію з буфера обміну в цю область, користуючись комбінацією клавіш (<STRONG>Ctrl/Cmd+V</STRONG>), та натисніть <STRONG>OK</STRONG>.","securityMsg":"Редактор не може отримати прямий доступ до буферу обміну у зв'язку з налаштуваннями Вашого браузера. Вам потрібно вставити інформацію в це вікно.","title":"Вставити"},"button":{"selectedLabel":"%1 (Вибрано)"},"blockquote":{"toolbar":"Цитата"},"basicstyles":{"bold":"Жирний","italic":"Курсив","strike":"Закреслений","subscript":"Нижній індекс","superscript":"Верхній індекс","underline":"Підкреслений"},"about":{"copy":"Copyright &copy; $1. Всі права застережено.","dlgTitle":"Про CKEditor","help":"Перевірте $1 для допомоги.","moreInfo":"Щодо інформації з ліцензування завітайте на наш сайт:","title":"Про CKEditor","userGuide":"Інструкція Користувача для CKEditor"},"editor":"Текстовий редактор","editorPanel":"Панель текстового редактора","common":{"editorHelp":"натисніть ALT 0 для довідки","browseServer":"Огляд Сервера","url":"URL","protocol":"Протокол","upload":"Надіслати","uploadSubmit":"Надіслати на сервер","image":"Зображення","flash":"Flash","form":"Форма","checkbox":"Галочка","radio":"Кнопка вибору","textField":"Текстове поле","textarea":"Текстова область","hiddenField":"Приховане поле","button":"Кнопка","select":"Список","imageButton":"Кнопка із зображенням","notSet":"<не визначено>","id":"Ідентифікатор","name":"Ім'я","langDir":"Напрямок мови","langDirLtr":"Зліва направо (LTR)","langDirRtl":"Справа наліво (RTL)","langCode":"Код мови","longDescr":"Довгий опис URL","cssClass":"Клас CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль CSS","ok":"ОК","cancel":"Скасувати","close":"Закрити","preview":"Попередній перегляд","resize":"Потягніть для зміни розмірів","generalTab":"Основне","advancedTab":"Додаткове","validateNumberFailed":"Значення не є цілим числом.","confirmNewPage":"Всі незбережені зміни будуть втрачені. Ви впевнені, що хочете завантажити нову сторінку?","confirmCancel":"Деякі опції змінено. Закрити вікно без збереження змін?","options":"Опції","target":"Ціль","targetNew":"Нове вікно (_blank)","targetTop":"Поточне вікно (_top)","targetSelf":"Поточний фрейм/вікно (_self)","targetParent":"Батьківський фрейм/вікно (_parent)","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","styles":"Стиль CSS","cssClasses":"Клас CSS","width":"Ширина","height":"Висота","align":"Вирівнювання","alignLeft":"По лівому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширині","alignTop":"По верхньому краю","alignMiddle":"По середині","alignBottom":"По нижньому краю","alignNone":"Нема","invalidValue":"Невірне значення.","invalidHeight":"Висота повинна бути цілим числом.","invalidWidth":"Ширина повинна бути цілим числом.","invalidCssLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру CSS блоку (px, %, in, cm, mm, em, ex, pt або pc).","invalidHtmlLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру HTML блоку (px або %).","invalidInlineStyle":"Значення, вказане для вбудованого стилю повинне складатися з одного чи кількох кортежів у форматі \"ім'я : значення\", розділених крапкою з комою.","cssLengthTooltip":"Введіть номер значення в пікселях або число з дійсною одиниці CSS (px, %, in, cm, mm, em, ex, pt або pc).","unavailable":"%1<span class=\"cke_accessibility\">, не доступне</span>"}};
\ No newline at end of file
+CKEDITOR.lang['uk']={"widget":{"move":"Клікніть і потягніть для переміщення","label":"%1 віджет"},"undo":{"redo":"Повторити","undo":"Повернути"},"toolbar":{"toolbarCollapse":"Згорнути панель інструментів","toolbarExpand":"Розгорнути панель інструментів","toolbarGroups":{"document":"Документ","clipboard":"Буфер обміну / Скасувати","editing":"Редагування","forms":"Форми","basicstyles":"Основний Стиль","paragraph":"Параграф","links":"Посилання","insert":"Вставити","styles":"Стилі","colors":"Кольори","tools":"Інструменти"},"toolbars":"Панель інструментів редактора"},"table":{"border":"Розмір рамки","caption":"Заголовок таблиці","cell":{"menu":"Комірки","insertBefore":"Вставити комірку перед","insertAfter":"Вставити комірку після","deleteCell":"Видалити комірки","merge":"Об'єднати комірки","mergeRight":"Об'єднати справа","mergeDown":"Об'єднати донизу","splitHorizontal":"Розділити комірку по горизонталі","splitVertical":"Розділити комірку по вертикалі","title":"Властивості комірки","cellType":"Тип комірки","rowSpan":"Об'єднання рядків","colSpan":"Об'єднання стовпців","wordWrap":"Автоперенесення тексту","hAlign":"Гориз. вирівнювання","vAlign":"Верт. вирівнювання","alignBaseline":"По базовій лінії","bgColor":"Колір фону","borderColor":"Колір рамки","data":"Дані","header":"Заголовок","yes":"Так","no":"Ні","invalidWidth":"Ширина комірки повинна бути цілим числом.","invalidHeight":"Висота комірки повинна бути цілим числом.","invalidRowSpan":"Кількість об'єднуваних рядків повинна бути цілим числом.","invalidColSpan":"Кількість об'єднуваних стовбців повинна бути цілим числом.","chooseColor":"Обрати"},"cellPad":"Внутр. відступ","cellSpace":"Проміжок","column":{"menu":"Стовбці","insertBefore":"Вставити стовбець перед","insertAfter":"Вставити стовбець після","deleteColumn":"Видалити стовбці"},"columns":"Стовбці","deleteTable":"Видалити таблицю","headers":"Заголовки стовбців/рядків","headersBoth":"Стовбці і рядки","headersColumn":"Стовбці","headersNone":"Без заголовків","headersRow":"Рядки","invalidBorder":"Розмір рамки повинен бути цілим числом.","invalidCellPadding":"Внутр. відступ комірки повинен бути цілим числом.","invalidCellSpacing":"Проміжок між комірками повинен бути цілим числом.","invalidCols":"Кількість стовбців повинна бути більшою 0.","invalidHeight":"Висота таблиці повинна бути цілим числом.","invalidRows":"Кількість рядків повинна бути більшою 0.","invalidWidth":"Ширина таблиці повинна бути цілим числом.","menu":"Властивості таблиці","row":{"menu":"Рядки","insertBefore":"Вставити рядок перед","insertAfter":"Вставити рядок після","deleteRow":"Видалити рядки"},"rows":"Рядки","summary":"Детальний опис заголовку таблиці","title":"Властивості таблиці","toolbar":"Таблиця","widthPc":"відсотків","widthPx":"пікселів","widthUnit":"Одиниці вимір."},"stylescombo":{"label":"Стиль","panelTitle":"Стилі форматування","panelTitle1":"Блочні стилі","panelTitle2":"Рядкові стилі","panelTitle3":"Об'єктні стилі"},"specialchar":{"options":"Опції","title":"Оберіть спеціальний символ","toolbar":"Спеціальний символ"},"sourcedialog":{"toolbar":"Джерело","title":"Джерело"},"sourcearea":{"toolbar":"Джерело"},"showblocks":{"toolbar":"Показувати блоки"},"removeformat":{"toolbar":"Видалити форматування"},"pastetext":{"button":"Вставити тільки текст","title":"Вставити тільки текст"},"pastefromword":{"confirmCleanup":"Текст, що Ви намагаєтесь вставити, схожий на скопійований з Word. Бажаєте очистити його форматування перед вставлянням?","error":"Неможливо очистити форматування через внутрішню помилку.","title":"Вставити з Word","toolbar":"Вставити з Word"},"maximize":{"maximize":"Максимізувати","minimize":"Мінімізувати"},"magicline":{"title":"Вставити абзац"},"list":{"bulletedlist":"Маркірований список","numberedlist":"Нумерований список"},"language":{"button":"Установити мову","remove":"Вилучити мову"},"justify":{"block":"По ширині","center":"По центру","left":"По лівому краю","right":"По правому краю"},"indent":{"indent":"Збільшити відступ","outdent":"Зменшити відступ"},"image2":{"alt":"Альтернативний текст","btnUpload":"Надіслати на сервер","captioned":"Підписане зображення","captionPlaceholder":"Заголовок","infoTab":"Інформація про зображення","lockRatio":"Зберегти пропорції","menu":"Властивості зображення","pathName":"Зображення","pathNameCaption":"заголовок","resetSize":"Очистити поля розмірів","resizer":"Клікніть та потягніть для зміни розмірів","title":"Властивості зображення","uploadTab":"Надіслати","urlMissing":"Вкажіть URL зображення.","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Горизонтальна лінія"},"format":{"label":"Форматування","panelTitle":"Форматування параграфа","tag_address":"Адреса","tag_div":"Нормальний (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Нормальний","tag_pre":"Форматований"},"elementspath":{"eleLabel":"Шлях","eleTitle":"%1 елемент"},"contextmenu":{"options":"Опції контекстного меню"},"clipboard":{"copy":"Копіювати","copyError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції копіювання. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+C).","cut":"Вирізати","cutError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції вирізування. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+X)","paste":"Вставити","pasteArea":"Область вставки","pasteMsg":"Будь ласка, вставте інформацію з буфера обміну в цю область, користуючись комбінацією клавіш (<STRONG>Ctrl/Cmd+V</STRONG>), та натисніть <STRONG>OK</STRONG>.","securityMsg":"Редактор не може отримати прямий доступ до буферу обміну у зв'язку з налаштуваннями Вашого браузера. Вам потрібно вставити інформацію в це вікно.","title":"Вставити"},"button":{"selectedLabel":"%1 (Вибрано)"},"blockquote":{"toolbar":"Цитата"},"basicstyles":{"bold":"Жирний","italic":"Курсив","strike":"Закреслений","subscript":"Нижній індекс","superscript":"Верхній індекс","underline":"Підкреслений"},"about":{"copy":"Copyright &copy; $1. Всі права застережено.","dlgTitle":"Про CKEditor","help":"Перевірте $1 для допомоги.","moreInfo":"Щодо інформації з ліцензування завітайте на наш сайт:","title":"Про CKEditor","userGuide":"Інструкція Користувача для CKEditor"},"editor":"Текстовий редактор","editorPanel":"Панель текстового редактора","common":{"editorHelp":"натисніть ALT 0 для довідки","browseServer":"Огляд Сервера","url":"URL","protocol":"Протокол","upload":"Надіслати","uploadSubmit":"Надіслати на сервер","image":"Зображення","flash":"Flash","form":"Форма","checkbox":"Галочка","radio":"Кнопка вибору","textField":"Текстове поле","textarea":"Текстова область","hiddenField":"Приховане поле","button":"Кнопка","select":"Список","imageButton":"Кнопка із зображенням","notSet":"<не визначено>","id":"Ідентифікатор","name":"Ім'я","langDir":"Напрямок мови","langDirLtr":"Зліва направо (LTR)","langDirRtl":"Справа наліво (RTL)","langCode":"Код мови","longDescr":"Довгий опис URL","cssClass":"Клас CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль CSS","ok":"ОК","cancel":"Скасувати","close":"Закрити","preview":"Попередній перегляд","resize":"Потягніть для зміни розмірів","generalTab":"Основне","advancedTab":"Додаткове","validateNumberFailed":"Значення не є цілим числом.","confirmNewPage":"Всі незбережені зміни будуть втрачені. Ви впевнені, що хочете завантажити нову сторінку?","confirmCancel":"Деякі опції змінено. Закрити вікно без збереження змін?","options":"Опції","target":"Ціль","targetNew":"Нове вікно (_blank)","targetTop":"Поточне вікно (_top)","targetSelf":"Поточний фрейм/вікно (_self)","targetParent":"Батьківський фрейм/вікно (_parent)","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","styles":"Стиль CSS","cssClasses":"Клас CSS","width":"Ширина","height":"Висота","align":"Вирівнювання","alignLeft":"По лівому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширині","alignTop":"По верхньому краю","alignMiddle":"По середині","alignBottom":"По нижньому краю","alignNone":"Нема","invalidValue":"Невірне значення.","invalidHeight":"Висота повинна бути цілим числом.","invalidWidth":"Ширина повинна бути цілим числом.","invalidCssLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру CSS блоку (px, %, in, cm, mm, em, ex, pt або pc).","invalidHtmlLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру HTML блоку (px або %).","invalidInlineStyle":"Значення, вказане для вбудованого стилю повинне складатися з одного чи кількох кортежів у форматі \"ім'я : значення\", розділених крапкою з комою.","cssLengthTooltip":"Введіть номер значення в пікселях або число з дійсною одиниці CSS (px, %, in, cm, mm, em, ex, pt або pc).","unavailable":"%1<span class=\"cke_accessibility\">, не доступне</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Видалити","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/vi.js b/web/core/assets/vendor/ckeditor/lang/vi.js
index 44fcdab3f..ef0ead839 100644
--- a/web/core/assets/vendor/ckeditor/lang/vi.js
+++ b/web/core/assets/vendor/ckeditor/lang/vi.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['vi']={"widget":{"move":"Nhấp chuột và kéo để di chuyển","label":"%1 widget"},"undo":{"redo":"Làm lại thao tác","undo":"Khôi phục thao tác"},"toolbar":{"toolbarCollapse":"Thu gọn thanh công cụ","toolbarExpand":"Mở rộng thnah công cụ","toolbarGroups":{"document":"Tài liệu","clipboard":"Clipboard/Undo","editing":"Chỉnh sửa","forms":"Bảng biểu","basicstyles":"Kiểu cơ bản","paragraph":"Đoạn","links":"Liên kết","insert":"Chèn","styles":"Kiểu","colors":"Màu sắc","tools":"Công cụ"},"toolbars":"Thanh công cụ"},"table":{"border":"Kích thước đường viền","caption":"Đầu đề","cell":{"menu":"Ô","insertBefore":"Chèn ô Phía trước","insertAfter":"Chèn ô Phía sau","deleteCell":"Xoá ô","merge":"Kết hợp ô","mergeRight":"Kết hợp sang phải","mergeDown":"Kết hợp xuống dưới","splitHorizontal":"Phân tách ô theo chiều ngang","splitVertical":"Phân tách ô theo chiều dọc","title":"Thuộc tính của ô","cellType":"Kiểu của ô","rowSpan":"Kết hợp hàng","colSpan":"Kết hợp cột","wordWrap":"Chữ liền hàng","hAlign":"Canh lề ngang","vAlign":"Canh lề dọc","alignBaseline":"Đường cơ sở","bgColor":"Màu nền","borderColor":"Màu viền","data":"Dữ liệu","header":"Đầu đề","yes":"Có","no":"Không","invalidWidth":"Chiều rộng của ô phải là một số nguyên.","invalidHeight":"Chiều cao của ô phải là một số nguyên.","invalidRowSpan":"Số hàng kết hợp phải là một số nguyên.","invalidColSpan":"Số cột kết hợp phải là một số nguyên.","chooseColor":"Chọn màu"},"cellPad":"Khoảng đệm giữ ô và nội dung","cellSpace":"Khoảng cách giữa các ô","column":{"menu":"Cột","insertBefore":"Chèn cột phía trước","insertAfter":"Chèn cột phía sau","deleteColumn":"Xoá cột"},"columns":"Số cột","deleteTable":"Xóa bảng","headers":"Đầu đề","headersBoth":"Cả hai","headersColumn":"Cột đầu tiên","headersNone":"Không có","headersRow":"Hàng đầu tiên","invalidBorder":"Kích cỡ của đường biên phải là một số nguyên.","invalidCellPadding":"Khoảng đệm giữa ô và nội dung phải là một số nguyên.","invalidCellSpacing":"Khoảng cách giữa các ô phải là một số nguyên.","invalidCols":"Số lượng cột phải là một số lớn hơn 0.","invalidHeight":"Chiều cao của bảng phải là một số nguyên.","invalidRows":"Số lượng hàng phải là một số lớn hơn 0.","invalidWidth":"Chiều rộng của bảng phải là một số nguyên.","menu":"Thuộc tính bảng","row":{"menu":"Hàng","insertBefore":"Chèn hàng phía trước","insertAfter":"Chèn hàng phía sau","deleteRow":"Xoá hàng"},"rows":"Số hàng","summary":"Tóm lược","title":"Thuộc tính bảng","toolbar":"Bảng","widthPc":"Phần trăm (%)","widthPx":"Điểm ảnh (px)","widthUnit":"Đơn vị"},"stylescombo":{"label":"Kiểu","panelTitle":"Phong cách định dạng","panelTitle1":"Kiểu khối","panelTitle2":"Kiểu trực tiếp","panelTitle3":"Kiểu đối tượng"},"specialchar":{"options":"Tùy chọn các ký tự đặc biệt","title":"Hãy chọn ký tự đặc biệt","toolbar":"Chèn ký tự đặc biệt"},"sourcedialog":{"toolbar":"Mã HTML","title":"Mã HTML"},"sourcearea":{"toolbar":"Mã HTML"},"showblocks":{"toolbar":"Hiển thị các khối"},"removeformat":{"toolbar":"Xoá định dạng"},"pastetext":{"button":"Dán theo định dạng văn bản thuần","title":"Dán theo định dạng văn bản thuần"},"pastefromword":{"confirmCleanup":"Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại bỏ định dạng Word trước khi dán?","error":"Không thể để làm sạch các dữ liệu dán do một lỗi nội bộ","title":"Dán với định dạng Word","toolbar":"Dán với định dạng Word"},"maximize":{"maximize":"Phóng to tối đa","minimize":"Thu nhỏ"},"magicline":{"title":"Chèn đoạn vào đây"},"list":{"bulletedlist":"Chèn/Xoá Danh sách không thứ tự","numberedlist":"Chèn/Xoá Danh sách có thứ tự"},"language":{"button":"Thiết lập ngôn ngữ","remove":"Loại bỏ ngôn ngữ"},"justify":{"block":"Canh đều","center":"Canh giữa","left":"Canh trái","right":"Canh phải"},"indent":{"indent":"Dịch vào trong","outdent":"Dịch ra ngoài"},"image2":{"alt":"Chú thích ảnh","btnUpload":"Tải lên máy chủ","captioned":"Ảnh có chú thích","captionPlaceholder":"Nhãn","infoTab":"Thông tin của ảnh","lockRatio":"Giữ nguyên tỷ lệ","menu":"Thuộc tính của ảnh","pathName":"ảnh","pathNameCaption":"chú thích","resetSize":"Kích thước gốc","resizer":"Kéo rê để thay đổi kích cỡ","title":"Thuộc tính của ảnh","uploadTab":"Tải lên","urlMissing":"Thiếu đường dẫn hình ảnh"},"horizontalrule":{"toolbar":"Chèn đường phân cách ngang"},"format":{"label":"Định dạng","panelTitle":"Định dạng","tag_address":"Address","tag_div":"Bình thường (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Bình thường (P)","tag_pre":"Đã thiết lập"},"elementspath":{"eleLabel":"Nhãn thành phần","eleTitle":"%1 thành phần"},"contextmenu":{"options":"Tùy chọn menu bổ xung"},"clipboard":{"copy":"Sao chép","copyError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+C).","cut":"Cắt","cutError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+X).","paste":"Dán","pasteArea":"Khu vực dán","pasteMsg":"Hãy dán nội dung vào trong khung bên dưới, sử dụng tổ hợp phím (<STRONG>Ctrl/Cmd+V</STRONG>) và nhấn vào nút <STRONG>Đồng ý</STRONG>.","securityMsg":"Do thiết lập bảo mật của trình duyệt nên trình biên tập không thể truy cập trực tiếp vào nội dung đã sao chép. Bạn cần phải dán lại nội dung vào cửa sổ này.","title":"Dán"},"button":{"selectedLabel":"%1 (Đã chọn)"},"blockquote":{"toolbar":"Khối trích dẫn"},"basicstyles":{"bold":"Đậm","italic":"Nghiêng","strike":"Gạch xuyên ngang","subscript":"Chỉ số dưới","superscript":"Chỉ số trên","underline":"Gạch chân"},"about":{"copy":"Bản quyền &copy; $1. Giữ toàn quyền.","dlgTitle":"Thông tin về CKEditor","help":"Kiểm tra $1 để được giúp đỡ.","moreInfo":"Vui lòng ghé thăm trang web của chúng tôi để có thông tin về giấy phép:","title":"Thông tin về CKEditor","userGuide":"Hướng dẫn sử dụng CKEditor"},"editor":"Bộ soạn thảo văn bản có định dạng","editorPanel":"Bảng điều khiển Rich Text Editor","common":{"editorHelp":"Nhấn ALT + 0 để được giúp đỡ","browseServer":"Duyệt máy chủ","url":"URL","protocol":"Giao thức","upload":"Tải lên","uploadSubmit":"Tải lên máy chủ","image":"Hình ảnh","flash":"Flash","form":"Biểu mẫu","checkbox":"Nút kiểm","radio":"Nút chọn","textField":"Trường văn bản","textarea":"Vùng văn bản","hiddenField":"Trường ẩn","button":"Nút","select":"Ô chọn","imageButton":"Nút hình ảnh","notSet":"<không thiết lập>","id":"Định danh","name":"Tên","langDir":"Hướng ngôn ngữ","langDirLtr":"Trái sang phải (LTR)","langDirRtl":"Phải sang trái (RTL)","langCode":"Mã ngôn ngữ","longDescr":"Mô tả URL","cssClass":"Lớp Stylesheet","advisoryTitle":"Nhan đề hướng dẫn","cssStyle":"Kiểu ","ok":"Đồng ý","cancel":"Bỏ qua","close":"Đóng","preview":"Xem trước","resize":"Kéo rê để thay đổi kích cỡ","generalTab":"Tab chung","advancedTab":"Tab mở rộng","validateNumberFailed":"Giá trị này không phải là số.","confirmNewPage":"Mọi thay đổi không được lưu lại, nội dung này sẽ bị mất. Bạn có chắc chắn muốn tải một trang mới?","confirmCancel":"Một vài tùy chọn đã bị thay đổi. Bạn có chắc chắn muốn đóng hộp thoại?","options":"Tùy chọn","target":"Đích đến","targetNew":"Cửa sổ mới (_blank)","targetTop":"Cửa sổ trên cùng (_top)","targetSelf":"Tại trang (_self)","targetParent":"Cửa sổ cha (_parent)","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","styles":"Kiểu","cssClasses":"Lớp CSS","width":"Chiều rộng","height":"Chiều cao","align":"Vị trí","alignLeft":"Trái","alignRight":"Phải","alignCenter":"Giữa","alignJustify":"Sắp chữ","alignTop":"Trên","alignMiddle":"Giữa","alignBottom":"Dưới","alignNone":"Không","invalidValue":"Giá trị không hợp lệ.","invalidHeight":"Chiều cao phải là số nguyên.","invalidWidth":"Chiều rộng phải là số nguyên.","invalidCssLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","invalidHtmlLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo HTML hợp lệ (px hoặc %).","invalidInlineStyle":"Giá trị quy định cho kiểu nội tuyến phải bao gồm một hoặc nhiều dữ liệu với định dạng \"tên:giá trị\", cách nhau bằng dấu chấm phẩy.","cssLengthTooltip":"Nhập một giá trị theo pixel hoặc một số với một đơn vị CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","unavailable":"%1<span class=\"cke_accessibility\">, không có</span>"}};
\ No newline at end of file
+CKEDITOR.lang['vi']={"widget":{"move":"Nhấp chuột và kéo để di chuyển","label":"%1 widget"},"undo":{"redo":"Làm lại thao tác","undo":"Khôi phục thao tác"},"toolbar":{"toolbarCollapse":"Thu gọn thanh công cụ","toolbarExpand":"Mở rộng thnah công cụ","toolbarGroups":{"document":"Tài liệu","clipboard":"Clipboard/Undo","editing":"Chỉnh sửa","forms":"Bảng biểu","basicstyles":"Kiểu cơ bản","paragraph":"Đoạn","links":"Liên kết","insert":"Chèn","styles":"Kiểu","colors":"Màu sắc","tools":"Công cụ"},"toolbars":"Thanh công cụ"},"table":{"border":"Kích thước đường viền","caption":"Đầu đề","cell":{"menu":"Ô","insertBefore":"Chèn ô Phía trước","insertAfter":"Chèn ô Phía sau","deleteCell":"Xoá ô","merge":"Kết hợp ô","mergeRight":"Kết hợp sang phải","mergeDown":"Kết hợp xuống dưới","splitHorizontal":"Phân tách ô theo chiều ngang","splitVertical":"Phân tách ô theo chiều dọc","title":"Thuộc tính của ô","cellType":"Kiểu của ô","rowSpan":"Kết hợp hàng","colSpan":"Kết hợp cột","wordWrap":"Chữ liền hàng","hAlign":"Canh lề ngang","vAlign":"Canh lề dọc","alignBaseline":"Đường cơ sở","bgColor":"Màu nền","borderColor":"Màu viền","data":"Dữ liệu","header":"Đầu đề","yes":"Có","no":"Không","invalidWidth":"Chiều rộng của ô phải là một số nguyên.","invalidHeight":"Chiều cao của ô phải là một số nguyên.","invalidRowSpan":"Số hàng kết hợp phải là một số nguyên.","invalidColSpan":"Số cột kết hợp phải là một số nguyên.","chooseColor":"Chọn màu"},"cellPad":"Khoảng đệm giữ ô và nội dung","cellSpace":"Khoảng cách giữa các ô","column":{"menu":"Cột","insertBefore":"Chèn cột phía trước","insertAfter":"Chèn cột phía sau","deleteColumn":"Xoá cột"},"columns":"Số cột","deleteTable":"Xóa bảng","headers":"Đầu đề","headersBoth":"Cả hai","headersColumn":"Cột đầu tiên","headersNone":"Không có","headersRow":"Hàng đầu tiên","invalidBorder":"Kích cỡ của đường biên phải là một số nguyên.","invalidCellPadding":"Khoảng đệm giữa ô và nội dung phải là một số nguyên.","invalidCellSpacing":"Khoảng cách giữa các ô phải là một số nguyên.","invalidCols":"Số lượng cột phải là một số lớn hơn 0.","invalidHeight":"Chiều cao của bảng phải là một số nguyên.","invalidRows":"Số lượng hàng phải là một số lớn hơn 0.","invalidWidth":"Chiều rộng của bảng phải là một số nguyên.","menu":"Thuộc tính bảng","row":{"menu":"Hàng","insertBefore":"Chèn hàng phía trước","insertAfter":"Chèn hàng phía sau","deleteRow":"Xoá hàng"},"rows":"Số hàng","summary":"Tóm lược","title":"Thuộc tính bảng","toolbar":"Bảng","widthPc":"Phần trăm (%)","widthPx":"Điểm ảnh (px)","widthUnit":"Đơn vị"},"stylescombo":{"label":"Kiểu","panelTitle":"Phong cách định dạng","panelTitle1":"Kiểu khối","panelTitle2":"Kiểu trực tiếp","panelTitle3":"Kiểu đối tượng"},"specialchar":{"options":"Tùy chọn các ký tự đặc biệt","title":"Hãy chọn ký tự đặc biệt","toolbar":"Chèn ký tự đặc biệt"},"sourcedialog":{"toolbar":"Mã HTML","title":"Mã HTML"},"sourcearea":{"toolbar":"Mã HTML"},"showblocks":{"toolbar":"Hiển thị các khối"},"removeformat":{"toolbar":"Xoá định dạng"},"pastetext":{"button":"Dán theo định dạng văn bản thuần","title":"Dán theo định dạng văn bản thuần"},"pastefromword":{"confirmCleanup":"Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại bỏ định dạng Word trước khi dán?","error":"Không thể để làm sạch các dữ liệu dán do một lỗi nội bộ","title":"Dán với định dạng Word","toolbar":"Dán với định dạng Word"},"maximize":{"maximize":"Phóng to tối đa","minimize":"Thu nhỏ"},"magicline":{"title":"Chèn đoạn vào đây"},"list":{"bulletedlist":"Chèn/Xoá Danh sách không thứ tự","numberedlist":"Chèn/Xoá Danh sách có thứ tự"},"language":{"button":"Thiết lập ngôn ngữ","remove":"Loại bỏ ngôn ngữ"},"justify":{"block":"Canh đều","center":"Canh giữa","left":"Canh trái","right":"Canh phải"},"indent":{"indent":"Dịch vào trong","outdent":"Dịch ra ngoài"},"image2":{"alt":"Chú thích ảnh","btnUpload":"Tải lên máy chủ","captioned":"Ảnh có chú thích","captionPlaceholder":"Nhãn","infoTab":"Thông tin của ảnh","lockRatio":"Giữ nguyên tỷ lệ","menu":"Thuộc tính của ảnh","pathName":"ảnh","pathNameCaption":"chú thích","resetSize":"Kích thước gốc","resizer":"Kéo rê để thay đổi kích cỡ","title":"Thuộc tính của ảnh","uploadTab":"Tải lên","urlMissing":"Thiếu đường dẫn hình ảnh","altMissing":"Alternative text is missing."},"horizontalrule":{"toolbar":"Chèn đường phân cách ngang"},"format":{"label":"Định dạng","panelTitle":"Định dạng","tag_address":"Address","tag_div":"Bình thường (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Bình thường (P)","tag_pre":"Đã thiết lập"},"elementspath":{"eleLabel":"Nhãn thành phần","eleTitle":"%1 thành phần"},"contextmenu":{"options":"Tùy chọn menu bổ xung"},"clipboard":{"copy":"Sao chép","copyError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+C).","cut":"Cắt","cutError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+X).","paste":"Dán","pasteArea":"Khu vực dán","pasteMsg":"Hãy dán nội dung vào trong khung bên dưới, sử dụng tổ hợp phím (<STRONG>Ctrl/Cmd+V</STRONG>) và nhấn vào nút <STRONG>Đồng ý</STRONG>.","securityMsg":"Do thiết lập bảo mật của trình duyệt nên trình biên tập không thể truy cập trực tiếp vào nội dung đã sao chép. Bạn cần phải dán lại nội dung vào cửa sổ này.","title":"Dán"},"button":{"selectedLabel":"%1 (Đã chọn)"},"blockquote":{"toolbar":"Khối trích dẫn"},"basicstyles":{"bold":"Đậm","italic":"Nghiêng","strike":"Gạch xuyên ngang","subscript":"Chỉ số dưới","superscript":"Chỉ số trên","underline":"Gạch chân"},"about":{"copy":"Bản quyền &copy; $1. Giữ toàn quyền.","dlgTitle":"Thông tin về CKEditor","help":"Kiểm tra $1 để được giúp đỡ.","moreInfo":"Vui lòng ghé thăm trang web của chúng tôi để có thông tin về giấy phép:","title":"Thông tin về CKEditor","userGuide":"Hướng dẫn sử dụng CKEditor"},"editor":"Bộ soạn thảo văn bản có định dạng","editorPanel":"Bảng điều khiển Rich Text Editor","common":{"editorHelp":"Nhấn ALT + 0 để được giúp đỡ","browseServer":"Duyệt máy chủ","url":"URL","protocol":"Giao thức","upload":"Tải lên","uploadSubmit":"Tải lên máy chủ","image":"Hình ảnh","flash":"Flash","form":"Biểu mẫu","checkbox":"Nút kiểm","radio":"Nút chọn","textField":"Trường văn bản","textarea":"Vùng văn bản","hiddenField":"Trường ẩn","button":"Nút","select":"Ô chọn","imageButton":"Nút hình ảnh","notSet":"<không thiết lập>","id":"Định danh","name":"Tên","langDir":"Hướng ngôn ngữ","langDirLtr":"Trái sang phải (LTR)","langDirRtl":"Phải sang trái (RTL)","langCode":"Mã ngôn ngữ","longDescr":"Mô tả URL","cssClass":"Lớp Stylesheet","advisoryTitle":"Nhan đề hướng dẫn","cssStyle":"Kiểu ","ok":"Đồng ý","cancel":"Bỏ qua","close":"Đóng","preview":"Xem trước","resize":"Kéo rê để thay đổi kích cỡ","generalTab":"Tab chung","advancedTab":"Tab mở rộng","validateNumberFailed":"Giá trị này không phải là số.","confirmNewPage":"Mọi thay đổi không được lưu lại, nội dung này sẽ bị mất. Bạn có chắc chắn muốn tải một trang mới?","confirmCancel":"Một vài tùy chọn đã bị thay đổi. Bạn có chắc chắn muốn đóng hộp thoại?","options":"Tùy chọn","target":"Đích đến","targetNew":"Cửa sổ mới (_blank)","targetTop":"Cửa sổ trên cùng (_top)","targetSelf":"Tại trang (_self)","targetParent":"Cửa sổ cha (_parent)","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","styles":"Kiểu","cssClasses":"Lớp CSS","width":"Chiều rộng","height":"Chiều cao","align":"Vị trí","alignLeft":"Trái","alignRight":"Phải","alignCenter":"Giữa","alignJustify":"Sắp chữ","alignTop":"Trên","alignMiddle":"Giữa","alignBottom":"Dưới","alignNone":"Không","invalidValue":"Giá trị không hợp lệ.","invalidHeight":"Chiều cao phải là số nguyên.","invalidWidth":"Chiều rộng phải là số nguyên.","invalidCssLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","invalidHtmlLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo HTML hợp lệ (px hoặc %).","invalidInlineStyle":"Giá trị quy định cho kiểu nội tuyến phải bao gồm một hoặc nhiều dữ liệu với định dạng \"tên:giá trị\", cách nhau bằng dấu chấm phẩy.","cssLengthTooltip":"Nhập một giá trị theo pixel hoặc một số với một đơn vị CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","unavailable":"%1<span class=\"cke_accessibility\">, không có</span>","keyboard":{"8":"Phím Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Xóa","224":"Command"},"keyboardShortcut":"Keyboard shortcut"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/zh-cn.js b/web/core/assets/vendor/ckeditor/lang/zh-cn.js
index cc75fb5e2..7ed8fdb62 100644
--- a/web/core/assets/vendor/ckeditor/lang/zh-cn.js
+++ b/web/core/assets/vendor/ckeditor/lang/zh-cn.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['zh-cn']={"widget":{"move":"点击并拖拽以移动","label":"%1 widget"},"undo":{"redo":"重做","undo":"撤消"},"toolbar":{"toolbarCollapse":"折叠工具栏","toolbarExpand":"展开工具栏","toolbarGroups":{"document":"文档","clipboard":"剪贴板/撤销","editing":"编辑","forms":"表单","basicstyles":"基本格式","paragraph":"段落","links":"链接","insert":"插入","styles":"样式","colors":"颜色","tools":"工具"},"toolbars":"工具栏"},"table":{"border":"边框","caption":"标题","cell":{"menu":"单元格","insertBefore":"在左侧插入单元格","insertAfter":"在右侧插入单元格","deleteCell":"删除单元格","merge":"合并单元格","mergeRight":"向右合并单元格","mergeDown":"向下合并单元格","splitHorizontal":"水平拆分单元格","splitVertical":"垂直拆分单元格","title":"单元格属性","cellType":"单元格类型","rowSpan":"纵跨行数","colSpan":"横跨列数","wordWrap":"自动换行","hAlign":"水平对齐","vAlign":"垂直对齐","alignBaseline":"基线","bgColor":"背景颜色","borderColor":"边框颜色","data":"数据","header":"表头","yes":"是","no":"否","invalidWidth":"单元格宽度必须为数字格式","invalidHeight":"单元格高度必须为数字格式","invalidRowSpan":"行跨度必须为整数格式","invalidColSpan":"列跨度必须为整数格式","chooseColor":"选择"},"cellPad":"边距","cellSpace":"间距","column":{"menu":"列","insertBefore":"在左侧插入列","insertAfter":"在右侧插入列","deleteColumn":"删除列"},"columns":"列数","deleteTable":"删除表格","headers":"标题单元格","headersBoth":"第一列和第一行","headersColumn":"第一列","headersNone":"无","headersRow":"第一行","invalidBorder":"边框粗细必须为数字格式","invalidCellPadding":"单元格填充必须为数字格式","invalidCellSpacing":"单元格间距必须为数字格式","invalidCols":"指定的行数必须大于零","invalidHeight":"表格高度必须为数字格式","invalidRows":"指定的列数必须大于零","invalidWidth":"表格宽度必须为数字格式","menu":"表格属性","row":{"menu":"行","insertBefore":"在上方插入行","insertAfter":"在下方插入行","deleteRow":"删除行"},"rows":"行数","summary":"摘要","title":"表格属性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"宽度单位"},"stylescombo":{"label":"样式","panelTitle":"样式","panelTitle1":"块级元素样式","panelTitle2":"内联元素样式","panelTitle3":"对象元素样式"},"specialchar":{"options":"特殊符号选项","title":"选择特殊符号","toolbar":"插入特殊符号"},"sourcedialog":{"toolbar":"源码","title":"源码"},"sourcearea":{"toolbar":"源码"},"showblocks":{"toolbar":"显示区块"},"removeformat":{"toolbar":"清除格式"},"pastetext":{"button":"粘贴为无格式文本","title":"粘贴为无格式文本"},"pastefromword":{"confirmCleanup":"您要粘贴的内容好像是来自 MS Word，是否要清除 MS Word 格式后再粘贴？","error":"由于内部错误无法清理要粘贴的数据","title":"从 MS Word 粘贴","toolbar":"从 MS Word 粘贴"},"maximize":{"maximize":"全屏","minimize":"最小化"},"magicline":{"title":"在这插入段落"},"list":{"bulletedlist":"项目列表","numberedlist":"编号列表"},"language":{"button":"设置语言","remove":"移除语言"},"justify":{"block":"两端对齐","center":"居中","left":"左对齐","right":"右对齐"},"indent":{"indent":"增加缩进量","outdent":"减少缩进量"},"image2":{"alt":"替换文本","btnUpload":"上传到服务器","captioned":"带标题图像","captionPlaceholder":"标题","infoTab":"图像信息","lockRatio":"锁定比例","menu":"图像属性","pathName":"图像","pathNameCaption":"标题","resetSize":"原始尺寸","resizer":"点击并拖拽以改变尺寸","title":"图像属性","uploadTab":"上传","urlMissing":"缺少图像源文件地址"},"horizontalrule":{"toolbar":"插入水平线"},"format":{"label":"格式","panelTitle":"格式","tag_address":"地址","tag_div":"段落(DIV)","tag_h1":"标题 1","tag_h2":"标题 2","tag_h3":"标题 3","tag_h4":"标题 4","tag_h5":"标题 5","tag_h6":"标题 6","tag_p":"普通","tag_pre":"已编排格式"},"elementspath":{"eleLabel":"元素路径","eleTitle":"%1 元素"},"contextmenu":{"options":"快捷菜单选项"},"clipboard":{"copy":"复制","copyError":"您的浏览器安全设置不允许编辑器自动执行复制操作，请使用键盘快捷键(Ctrl/Cmd+C)来完成。","cut":"剪切","cutError":"您的浏览器安全设置不允许编辑器自动执行剪切操作，请使用键盘快捷键(Ctrl/Cmd+X)来完成。","paste":"粘贴","pasteArea":"粘贴区域","pasteMsg":"请使用键盘快捷键(<STRONG>Ctrl/Cmd+V</STRONG>)把内容粘贴到下面的方框里，再按 <STRONG>确定</STRONG>","securityMsg":"因为您的浏览器的安全设置原因，本编辑器不能直接访问您的剪贴板内容，你需要在本窗口重新粘贴一次。","title":"粘贴"},"button":{"selectedLabel":"已选中 %1 项"},"blockquote":{"toolbar":"块引用"},"basicstyles":{"bold":"加粗","italic":"倾斜","strike":"删除线","subscript":"下标","superscript":"上标","underline":"下划线"},"about":{"copy":"版权所有 &copy; $1。<br />保留所有权利。","dlgTitle":"关于 CKEditor","help":"访问 $1 以获取帮助。","moreInfo":"相关授权许可信息请访问我们的网站：","title":"关于 CKEditor","userGuide":"CKEditor 用户向导"},"editor":"所见即所得编辑器","editorPanel":"所见即所得编辑器面板","common":{"editorHelp":"按 ALT+0 获得帮助","browseServer":"浏览服务器","url":"URL","protocol":"协议","upload":"上传","uploadSubmit":"上传到服务器","image":"图像","flash":"Flash","form":"表单","checkbox":"复选框","radio":"单选按钮","textField":"单行文本","textarea":"多行文本","hiddenField":"隐藏域","button":"按钮","select":"列表/菜单","imageButton":"图像按钮","notSet":"<没有设置>","id":"ID","name":"名称","langDir":"语言方向","langDirLtr":"从左到右 (LTR)","langDirRtl":"从右到左 (RTL)","langCode":"语言代码","longDescr":"详细说明 URL","cssClass":"样式类名称","advisoryTitle":"标题","cssStyle":"行内样式","ok":"确定","cancel":"取消","close":"关闭","preview":"预览","resize":"拖拽以改变大小","generalTab":"常规","advancedTab":"高级","validateNumberFailed":"需要输入数字格式","confirmNewPage":"当前文档内容未保存，是否确认新建文档？","confirmCancel":"部分修改尚未保存，是否确认关闭对话框？","options":"选项","target":"目标窗口","targetNew":"新窗口 (_blank)","targetTop":"整页 (_top)","targetSelf":"本窗口 (_self)","targetParent":"父窗口 (_parent)","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","styles":"样式","cssClasses":"样式类","width":"宽度","height":"高度","align":"对齐方式","alignLeft":"左对齐","alignRight":"右对齐","alignCenter":"居中","alignJustify":"两端对齐","alignTop":"顶端","alignMiddle":"居中","alignBottom":"底部","alignNone":"无","invalidValue":"无效的值。","invalidHeight":"高度必须为数字格式","invalidWidth":"宽度必须为数字格式","invalidCssLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)","invalidHtmlLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 HTML 长度单位(px 或 %)","invalidInlineStyle":"内联样式必须为格式是以分号分隔的一个或多个“属性名 : 属性值”。","cssLengthTooltip":"输入一个表示像素值的数字，或加上一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，不可用</span>"}};
\ No newline at end of file
+CKEDITOR.lang['zh-cn']={"widget":{"move":"点击并拖拽以移动","label":"%1 小部件"},"undo":{"redo":"重做","undo":"撤消"},"toolbar":{"toolbarCollapse":"折叠工具栏","toolbarExpand":"展开工具栏","toolbarGroups":{"document":"文档","clipboard":"剪贴板/撤销","editing":"编辑","forms":"表单","basicstyles":"基本格式","paragraph":"段落","links":"链接","insert":"插入","styles":"样式","colors":"颜色","tools":"工具"},"toolbars":"工具栏"},"table":{"border":"边框","caption":"标题","cell":{"menu":"单元格","insertBefore":"在左侧插入单元格","insertAfter":"在右侧插入单元格","deleteCell":"删除单元格","merge":"合并单元格","mergeRight":"向右合并单元格","mergeDown":"向下合并单元格","splitHorizontal":"水平拆分单元格","splitVertical":"垂直拆分单元格","title":"单元格属性","cellType":"单元格类型","rowSpan":"纵跨行数","colSpan":"横跨列数","wordWrap":"自动换行","hAlign":"水平对齐","vAlign":"垂直对齐","alignBaseline":"基线","bgColor":"背景颜色","borderColor":"边框颜色","data":"数据","header":"表头","yes":"是","no":"否","invalidWidth":"单元格宽度必须为数字格式","invalidHeight":"单元格高度必须为数字格式","invalidRowSpan":"行跨度必须为整数格式","invalidColSpan":"列跨度必须为整数格式","chooseColor":"选择"},"cellPad":"边距","cellSpace":"间距","column":{"menu":"列","insertBefore":"在左侧插入列","insertAfter":"在右侧插入列","deleteColumn":"删除列"},"columns":"列数","deleteTable":"删除表格","headers":"标题单元格","headersBoth":"第一列和第一行","headersColumn":"第一列","headersNone":"无","headersRow":"第一行","invalidBorder":"边框粗细必须为数字格式","invalidCellPadding":"单元格填充必须为数字格式","invalidCellSpacing":"单元格间距必须为数字格式","invalidCols":"指定的行数必须大于零","invalidHeight":"表格高度必须为数字格式","invalidRows":"指定的列数必须大于零","invalidWidth":"表格宽度必须为数字格式","menu":"表格属性","row":{"menu":"行","insertBefore":"在上方插入行","insertAfter":"在下方插入行","deleteRow":"删除行"},"rows":"行数","summary":"摘要","title":"表格属性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"宽度单位"},"stylescombo":{"label":"样式","panelTitle":"样式","panelTitle1":"块级元素样式","panelTitle2":"内联元素样式","panelTitle3":"对象元素样式"},"specialchar":{"options":"特殊符号选项","title":"选择特殊符号","toolbar":"插入特殊符号"},"sourcedialog":{"toolbar":"源码","title":"源码"},"sourcearea":{"toolbar":"源码"},"showblocks":{"toolbar":"显示区块"},"removeformat":{"toolbar":"清除格式"},"pastetext":{"button":"粘贴为无格式文本","title":"粘贴为无格式文本"},"pastefromword":{"confirmCleanup":"您要粘贴的内容好像是来自 MS Word，是否要清除 MS Word 格式后再粘贴？","error":"由于内部错误无法清理要粘贴的数据","title":"从 MS Word 粘贴","toolbar":"从 MS Word 粘贴"},"maximize":{"maximize":"全屏","minimize":"最小化"},"magicline":{"title":"在这插入段落"},"list":{"bulletedlist":"项目列表","numberedlist":"编号列表"},"language":{"button":"设置语言","remove":"移除语言"},"justify":{"block":"两端对齐","center":"居中","left":"左对齐","right":"右对齐"},"indent":{"indent":"增加缩进量","outdent":"减少缩进量"},"image2":{"alt":"替换文本","btnUpload":"上传到服务器","captioned":"带标题图像","captionPlaceholder":"标题","infoTab":"图像信息","lockRatio":"锁定比例","menu":"图像属性","pathName":"图像","pathNameCaption":"标题","resetSize":"原始尺寸","resizer":"点击并拖拽以改变尺寸","title":"图像属性","uploadTab":"上传","urlMissing":"缺少图像源文件地址","altMissing":"缺少替换文本"},"horizontalrule":{"toolbar":"插入水平线"},"format":{"label":"格式","panelTitle":"格式","tag_address":"地址","tag_div":"段落(DIV)","tag_h1":"标题 1","tag_h2":"标题 2","tag_h3":"标题 3","tag_h4":"标题 4","tag_h5":"标题 5","tag_h6":"标题 6","tag_p":"普通","tag_pre":"已编排格式"},"elementspath":{"eleLabel":"元素路径","eleTitle":"%1 元素"},"contextmenu":{"options":"快捷菜单选项"},"clipboard":{"copy":"复制","copyError":"您的浏览器安全设置不允许编辑器自动执行复制操作，请使用键盘快捷键(Ctrl/Cmd+C)来完成。","cut":"剪切","cutError":"您的浏览器安全设置不允许编辑器自动执行剪切操作，请使用键盘快捷键(Ctrl/Cmd+X)来完成。","paste":"粘贴","pasteArea":"粘贴区域","pasteMsg":"请使用键盘快捷键(<STRONG>Ctrl/Cmd+V</STRONG>)把内容粘贴到下面的方框里，再按 <STRONG>确定</STRONG>","securityMsg":"因为您的浏览器的安全设置原因，本编辑器不能直接访问您的剪贴板内容，你需要在本窗口重新粘贴一次。","title":"粘贴"},"button":{"selectedLabel":"已选中 %1 项"},"blockquote":{"toolbar":"块引用"},"basicstyles":{"bold":"加粗","italic":"倾斜","strike":"删除线","subscript":"下标","superscript":"上标","underline":"下划线"},"about":{"copy":"版权所有 &copy; $1。<br />保留所有权利。","dlgTitle":"关于 CKEditor","help":"访问 $1 以获取帮助。","moreInfo":"相关授权许可信息请访问我们的网站：","title":"关于 CKEditor","userGuide":"CKEditor 用户向导"},"editor":"所见即所得编辑器","editorPanel":"所见即所得编辑器面板","common":{"editorHelp":"按 ALT+0 获得帮助","browseServer":"浏览服务器","url":"URL","protocol":"协议","upload":"上传","uploadSubmit":"上传到服务器","image":"图像","flash":"Flash","form":"表单","checkbox":"复选框","radio":"单选按钮","textField":"单行文本","textarea":"多行文本","hiddenField":"隐藏域","button":"按钮","select":"列表/菜单","imageButton":"图像按钮","notSet":"<没有设置>","id":"ID","name":"名称","langDir":"语言方向","langDirLtr":"从左到右 (LTR)","langDirRtl":"从右到左 (RTL)","langCode":"语言代码","longDescr":"详细说明 URL","cssClass":"样式类名称","advisoryTitle":"标题","cssStyle":"行内样式","ok":"确定","cancel":"取消","close":"关闭","preview":"预览","resize":"拖拽以改变大小","generalTab":"常规","advancedTab":"高级","validateNumberFailed":"需要输入数字格式","confirmNewPage":"当前文档内容未保存，是否确认新建文档？","confirmCancel":"部分修改尚未保存，是否确认关闭对话框？","options":"选项","target":"目标窗口","targetNew":"新窗口 (_blank)","targetTop":"整页 (_top)","targetSelf":"本窗口 (_self)","targetParent":"父窗口 (_parent)","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","styles":"样式","cssClasses":"样式类","width":"宽度","height":"高度","align":"对齐方式","alignLeft":"左对齐","alignRight":"右对齐","alignCenter":"居中","alignJustify":"两端对齐","alignTop":"顶端","alignMiddle":"居中","alignBottom":"底部","alignNone":"无","invalidValue":"无效的值。","invalidHeight":"高度必须为数字格式","invalidWidth":"宽度必须为数字格式","invalidCssLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)","invalidHtmlLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 HTML 长度单位(px 或 %)","invalidInlineStyle":"内联样式必须为格式是以分号分隔的一个或多个“属性名 : 属性值”。","cssLengthTooltip":"输入一个表示像素值的数字，或加上一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，不可用</span>","keyboard":{"8":"退格键","13":"回车键","16":"Shift","17":"Ctrl","18":"Alt","32":"空格键","35":"行尾键","36":"行首键","46":"删除键","224":"Command"},"keyboardShortcut":"快捷键"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/lang/zh.js b/web/core/assets/vendor/ckeditor/lang/zh.js
index 14506cdc7..99224231a 100644
--- a/web/core/assets/vendor/ckeditor/lang/zh.js
+++ b/web/core/assets/vendor/ckeditor/lang/zh.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['zh']={"widget":{"move":"拖曳以移動","label":"%1 小工具"},"undo":{"redo":"取消復原","undo":"復原"},"toolbar":{"toolbarCollapse":"摺疊工具列","toolbarExpand":"展開工具列","toolbarGroups":{"document":"文件","clipboard":"剪貼簿/復原","editing":"編輯選項","forms":"格式","basicstyles":"基本樣式","paragraph":"段落","links":"連結","insert":"插入","styles":"樣式","colors":"顏色","tools":"工具"},"toolbars":"編輯器工具列"},"table":{"border":"框線大小","caption":"標題","cell":{"menu":"儲存格","insertBefore":"前方插入儲存格","insertAfter":"後方插入儲存格","deleteCell":"刪除儲存格","merge":"合併儲存格","mergeRight":"向右合併","mergeDown":"向下合併","splitHorizontal":"水平分割儲存格","splitVertical":"垂直分割儲存格","title":"儲存格屬性","cellType":"儲存格類型","rowSpan":"列全長","colSpan":"行全長","wordWrap":"自動斷行","hAlign":"水平對齊","vAlign":"垂直對齊","alignBaseline":"基準線","bgColor":"背景顏色","borderColor":"框線顏色","data":"資料","header":"頁首","yes":"是","no":"否","invalidWidth":"儲存格寬度必須為數字。","invalidHeight":"儲存格高度必須為數字。","invalidRowSpan":"列全長必須是整數。","invalidColSpan":"行全長必須是整數。","chooseColor":"選擇"},"cellPad":"儲存格邊距","cellSpace":"儲存格間距","column":{"menu":"行","insertBefore":"左方插入行","insertAfter":"右方插入行","deleteColumn":"刪除行"},"columns":"行","deleteTable":"刪除表格","headers":"頁首","headersBoth":"同時","headersColumn":"第一行","headersNone":"無","headersRow":"第一列","invalidBorder":"框線大小必須是整數。","invalidCellPadding":"儲存格邊距必須為正數。","invalidCellSpacing":"儲存格間距必須為正數。","invalidCols":"行數須為大於 0 的正整數。","invalidHeight":"表格高度必須為數字。","invalidRows":"列數須為大於 0 的正整數。","invalidWidth":"表格寬度必須為數字。","menu":"表格屬性","row":{"menu":"列","insertBefore":"上方插入列","insertAfter":"下方插入列","deleteRow":"刪除列"},"rows":"列","summary":"總結","title":"表格屬性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"寬度單位"},"stylescombo":{"label":"樣式","panelTitle":"格式化樣式","panelTitle1":"區塊樣式","panelTitle2":"內嵌樣式","panelTitle3":"物件樣式"},"specialchar":{"options":"特殊字元選項","title":"選取特殊字元","toolbar":"插入特殊字元"},"sourcedialog":{"toolbar":"原始碼","title":"原始碼"},"sourcearea":{"toolbar":"原始碼"},"showblocks":{"toolbar":"顯示區塊"},"removeformat":{"toolbar":"移除格式"},"pastetext":{"button":"貼成純文字","title":"貼成純文字"},"pastefromword":{"confirmCleanup":"您想貼上的文字似乎是自 Word 複製而來，請問您是否要先清除 Word 的格式後再行貼上？","error":"由於發生內部錯誤，無法清除清除 Word 的格式。","title":"自 Word 貼上","toolbar":"自 Word 貼上"},"maximize":{"maximize":"最大化","minimize":"最小化"},"magicline":{"title":"在此插入段落"},"list":{"bulletedlist":"插入/移除項目符號清單","numberedlist":"插入/移除編號清單清單"},"language":{"button":"設定語言","remove":"移除語言"},"justify":{"block":"左右對齊","center":"置中","left":"靠左對齊","right":"靠右對齊"},"indent":{"indent":"增加縮排","outdent":"減少縮排"},"image2":{"alt":"替代文字","btnUpload":"傳送至伺服器","captioned":"已加標題之圖片","captionPlaceholder":"標題","infoTab":"影像資訊","lockRatio":"固定比例","menu":"影像屬性","pathName":"圖片","pathNameCaption":"標題","resetSize":"重設大小","resizer":"拖曳以改變大小","title":"影像屬性","uploadTab":"上傳","urlMissing":"遺失圖片來源之 URL "},"horizontalrule":{"toolbar":"插入水平線"},"format":{"label":"格式","panelTitle":"段落格式","tag_address":"地址","tag_div":"標準 (DIV)","tag_h1":"標題 1","tag_h2":"標題 2","tag_h3":"標題 3","tag_h4":"標題 4","tag_h5":"標題 5","tag_h6":"標題 6","tag_p":"標準","tag_pre":"格式設定"},"elementspath":{"eleLabel":"元件路徑","eleTitle":"%1 個元件"},"contextmenu":{"options":"內容功能表選項"},"clipboard":{"copy":"複製","copyError":"瀏覽器的安全性設定不允許編輯器自動執行複製動作。請使用鍵盤快捷鍵 (Ctrl/Cmd+C) 複製。","cut":"剪下","cutError":"瀏覽器的安全性設定不允許編輯器自動執行剪下動作。請使用鏐盤快捷鍵 (Ctrl/Cmd+X) 剪下。","paste":"貼上","pasteArea":"貼上區","pasteMsg":"請使用鍵盤快捷鍵 (<strong>Ctrl/Cmd+V</strong>) 貼到下方區域中並按下「確定」。","securityMsg":"因為瀏覽器的安全性設定，本編輯器無法直接存取您的剪貼簿資料，請您自行在本視窗進行貼上動作。","title":"貼上"},"button":{"selectedLabel":"%1 (已選取)"},"blockquote":{"toolbar":"引用段落"},"basicstyles":{"bold":"粗體","italic":"斜體","strike":"刪除線","subscript":"下標","superscript":"上標","underline":"底線"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"關於 CKEditor","help":"檢閱 $1 尋求幫助。","moreInfo":"關於授權資訊，請參閱我們的網站：","title":"關於 CKEditor","userGuide":"CKEditor 使用者手冊"},"editor":"RTF 編輯器","editorPanel":"RTF 編輯器面板","common":{"editorHelp":"按下 ALT 0 取得說明。","browseServer":"瀏覽伺服器","url":"URL","protocol":"通訊協定","upload":"上傳","uploadSubmit":"傳送至伺服器","image":"圖像","flash":"Flash","form":"表格","checkbox":"核取方塊","radio":"選項按鈕","textField":"文字欄位","textarea":"文字區域","hiddenField":"隱藏欄位","button":"按鈕","select":"選取欄位","imageButton":"影像按鈕","notSet":"<未設定>","id":"ID","name":"名稱","langDir":"語言方向","langDirLtr":"由左至右 (LTR)","langDirRtl":"由右至左 (RTL)","langCode":"語言代碼","longDescr":"完整描述 URL","cssClass":"樣式表類別","advisoryTitle":"標題","cssStyle":"樣式","ok":"確定","cancel":"取消","close":"關閉","preview":"預覽","resize":"調整大小","generalTab":"一般","advancedTab":"進階","validateNumberFailed":"此值不是數值。","confirmNewPage":"現存的修改尚未儲存，要開新檔案？","confirmCancel":"部份選項尚未儲存，要關閉對話框？","options":"選項","target":"目標","targetNew":"開新視窗 (_blank)","targetTop":"最上層視窗 (_top)","targetSelf":"相同視窗 (_self)","targetParent":"父視窗 (_parent)","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","styles":"樣式","cssClasses":"樣式表類別","width":"寬度","height":"高度","align":"對齊方式","alignLeft":"靠左對齊","alignRight":"靠右對齊","alignCenter":"置中對齊","alignJustify":"左右對齊","alignTop":"頂端","alignMiddle":"中間對齊","alignBottom":"底端","alignNone":"無","invalidValue":"無效值。","invalidHeight":"高度必須為數字。","invalidWidth":"寬度必須為數字。","invalidCssLength":"「%1」的值應為正數，並可包含有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","invalidHtmlLength":"「%1」的值應為正數，並可包含有效的 HTML 單位 (px 或 %)。","invalidInlineStyle":"行內樣式的值應包含一個以上的變數值組，其格式如「名稱:值」，並以分號區隔之。","cssLengthTooltip":"請輸入數值，單位是像素或有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，無法使用</span>"}};
\ No newline at end of file
+CKEDITOR.lang['zh']={"widget":{"move":"拖曳以移動","label":"%1 小工具"},"undo":{"redo":"取消復原","undo":"復原"},"toolbar":{"toolbarCollapse":"摺疊工具列","toolbarExpand":"展開工具列","toolbarGroups":{"document":"文件","clipboard":"剪貼簿/復原","editing":"編輯選項","forms":"格式","basicstyles":"基本樣式","paragraph":"段落","links":"連結","insert":"插入","styles":"樣式","colors":"顏色","tools":"工具"},"toolbars":"編輯器工具列"},"table":{"border":"框線大小","caption":"標題","cell":{"menu":"儲存格","insertBefore":"前方插入儲存格","insertAfter":"後方插入儲存格","deleteCell":"刪除儲存格","merge":"合併儲存格","mergeRight":"向右合併","mergeDown":"向下合併","splitHorizontal":"水平分割儲存格","splitVertical":"垂直分割儲存格","title":"儲存格屬性","cellType":"儲存格類型","rowSpan":"列全長","colSpan":"行全長","wordWrap":"自動斷行","hAlign":"水平對齊","vAlign":"垂直對齊","alignBaseline":"基準線","bgColor":"背景顏色","borderColor":"框線顏色","data":"資料","header":"頁首","yes":"是","no":"否","invalidWidth":"儲存格寬度必須為數字。","invalidHeight":"儲存格高度必須為數字。","invalidRowSpan":"列全長必須是整數。","invalidColSpan":"行全長必須是整數。","chooseColor":"選擇"},"cellPad":"儲存格邊距","cellSpace":"儲存格間距","column":{"menu":"行","insertBefore":"左方插入行","insertAfter":"右方插入行","deleteColumn":"刪除行"},"columns":"行","deleteTable":"刪除表格","headers":"頁首","headersBoth":"同時","headersColumn":"第一行","headersNone":"無","headersRow":"第一列","invalidBorder":"框線大小必須是整數。","invalidCellPadding":"儲存格邊距必須為正數。","invalidCellSpacing":"儲存格間距必須為正數。","invalidCols":"行數須為大於 0 的正整數。","invalidHeight":"表格高度必須為數字。","invalidRows":"列數須為大於 0 的正整數。","invalidWidth":"表格寬度必須為數字。","menu":"表格屬性","row":{"menu":"列","insertBefore":"上方插入列","insertAfter":"下方插入列","deleteRow":"刪除列"},"rows":"列","summary":"總結","title":"表格屬性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"寬度單位"},"stylescombo":{"label":"樣式","panelTitle":"格式化樣式","panelTitle1":"區塊樣式","panelTitle2":"內嵌樣式","panelTitle3":"物件樣式"},"specialchar":{"options":"特殊字元選項","title":"選取特殊字元","toolbar":"插入特殊字元"},"sourcedialog":{"toolbar":"原始碼","title":"原始碼"},"sourcearea":{"toolbar":"原始碼"},"showblocks":{"toolbar":"顯示區塊"},"removeformat":{"toolbar":"移除格式"},"pastetext":{"button":"貼成純文字","title":"貼成純文字"},"pastefromword":{"confirmCleanup":"您想貼上的文字似乎是自 Word 複製而來，請問您是否要先清除 Word 的格式後再行貼上？","error":"由於發生內部錯誤，無法清除清除 Word 的格式。","title":"自 Word 貼上","toolbar":"自 Word 貼上"},"maximize":{"maximize":"最大化","minimize":"最小化"},"magicline":{"title":"在此插入段落"},"list":{"bulletedlist":"插入/移除項目符號清單","numberedlist":"插入/移除編號清單清單"},"language":{"button":"設定語言","remove":"移除語言"},"justify":{"block":"左右對齊","center":"置中","left":"靠左對齊","right":"靠右對齊"},"indent":{"indent":"增加縮排","outdent":"減少縮排"},"image2":{"alt":"替代文字","btnUpload":"傳送至伺服器","captioned":"已加標題之圖片","captionPlaceholder":"標題","infoTab":"影像資訊","lockRatio":"固定比例","menu":"影像屬性","pathName":"圖片","pathNameCaption":"標題","resetSize":"重設大小","resizer":"拖曳以改變大小","title":"影像屬性","uploadTab":"上傳","urlMissing":"遺失圖片來源之 URL ","altMissing":"替代文字遺失。"},"horizontalrule":{"toolbar":"插入水平線"},"format":{"label":"格式","panelTitle":"段落格式","tag_address":"地址","tag_div":"標準 (DIV)","tag_h1":"標題 1","tag_h2":"標題 2","tag_h3":"標題 3","tag_h4":"標題 4","tag_h5":"標題 5","tag_h6":"標題 6","tag_p":"標準","tag_pre":"格式設定"},"elementspath":{"eleLabel":"元件路徑","eleTitle":"%1 個元件"},"contextmenu":{"options":"內容功能表選項"},"clipboard":{"copy":"複製","copyError":"瀏覽器的安全性設定不允許編輯器自動執行複製動作。請使用鍵盤快捷鍵 (Ctrl/Cmd+C) 複製。","cut":"剪下","cutError":"瀏覽器的安全性設定不允許編輯器自動執行剪下動作。請使用鏐盤快捷鍵 (Ctrl/Cmd+X) 剪下。","paste":"貼上","pasteArea":"貼上區","pasteMsg":"請使用鍵盤快捷鍵 (<strong>Ctrl/Cmd+V</strong>) 貼到下方區域中並按下「確定」。","securityMsg":"因為瀏覽器的安全性設定，本編輯器無法直接存取您的剪貼簿資料，請您自行在本視窗進行貼上動作。","title":"貼上"},"button":{"selectedLabel":"%1 (已選取)"},"blockquote":{"toolbar":"引用段落"},"basicstyles":{"bold":"粗體","italic":"斜體","strike":"刪除線","subscript":"下標","superscript":"上標","underline":"底線"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"關於 CKEditor","help":"檢閱 $1 尋求幫助。","moreInfo":"關於授權資訊，請參閱我們的網站：","title":"關於 CKEditor","userGuide":"CKEditor 使用者手冊"},"editor":"RTF 編輯器","editorPanel":"RTF 編輯器面板","common":{"editorHelp":"按下 ALT 0 取得說明。","browseServer":"瀏覽伺服器","url":"URL","protocol":"通訊協定","upload":"上傳","uploadSubmit":"傳送至伺服器","image":"圖像","flash":"Flash","form":"表格","checkbox":"核取方塊","radio":"選項按鈕","textField":"文字欄位","textarea":"文字區域","hiddenField":"隱藏欄位","button":"按鈕","select":"選取欄位","imageButton":"影像按鈕","notSet":"<未設定>","id":"ID","name":"名稱","langDir":"語言方向","langDirLtr":"由左至右 (LTR)","langDirRtl":"由右至左 (RTL)","langCode":"語言代碼","longDescr":"完整描述 URL","cssClass":"樣式表類別","advisoryTitle":"標題","cssStyle":"樣式","ok":"確定","cancel":"取消","close":"關閉","preview":"預覽","resize":"調整大小","generalTab":"一般","advancedTab":"進階","validateNumberFailed":"此值不是數值。","confirmNewPage":"現存的修改尚未儲存，要開新檔案？","confirmCancel":"部份選項尚未儲存，要關閉對話框？","options":"選項","target":"目標","targetNew":"開新視窗 (_blank)","targetTop":"最上層視窗 (_top)","targetSelf":"相同視窗 (_self)","targetParent":"父視窗 (_parent)","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","styles":"樣式","cssClasses":"樣式表類別","width":"寬度","height":"高度","align":"對齊方式","alignLeft":"靠左對齊","alignRight":"靠右對齊","alignCenter":"置中對齊","alignJustify":"左右對齊","alignTop":"頂端","alignMiddle":"中間對齊","alignBottom":"底端","alignNone":"無","invalidValue":"無效值。","invalidHeight":"高度必須為數字。","invalidWidth":"寬度必須為數字。","invalidCssLength":"「%1」的值應為正數，並可包含有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","invalidHtmlLength":"「%1」的值應為正數，並可包含有效的 HTML 單位 (px 或 %)。","invalidInlineStyle":"行內樣式的值應包含一個以上的變數值組，其格式如「名稱:值」，並以分號區隔之。","cssLengthTooltip":"請輸入數值，單位是像素或有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，無法使用</span>","keyboard":{"8":"退格鍵","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"空白鍵","35":"End","36":"Home","46":"刪除","224":"Command 鍵"},"keyboardShortcut":"鍵盤快捷鍵"}};
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
index 4585951e0..6c268cab3 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.dialog.add("a11yHelp",function(l){var a=l.lang.a11yhelp,n=CKEDITOR.tools.getNextId(),e={8:a.backspace,9:a.tab,13:a.enter,16:a.shift,17:a.ctrl,18:a.alt,19:a.pause,20:a.capslock,27:a.escape,33:a.pageUp,34:a.pageDown,35:a.end,36:a.home,37:a.leftArrow,38:a.upArrow,39:a.rightArrow,40:a.downArrow,45:a.insert,46:a["delete"],91:a.leftWindowKey,92:a.rightWindowKey,93:a.selectKey,96:a.numpad0,97:a.numpad1,98:a.numpad2,99:a.numpad3,100:a.numpad4,101:a.numpad5,102:a.numpad6,103:a.numpad7,104:a.numpad8,
-105:a.numpad9,106:a.multiply,107:a.add,109:a.subtract,110:a.decimalPoint,111:a.divide,112:a.f1,113:a.f2,114:a.f3,115:a.f4,116:a.f5,117:a.f6,118:a.f7,119:a.f8,120:a.f9,121:a.f10,122:a.f11,123:a.f12,144:a.numLock,145:a.scrollLock,186:a.semiColon,187:a.equalSign,188:a.comma,189:a.dash,190:a.period,191:a.forwardSlash,192:a.graveAccent,219:a.openBracket,220:a.backSlash,221:a.closeBracket,222:a.singleQuote};e[CKEDITOR.ALT]=a.alt;e[CKEDITOR.SHIFT]=a.shift;e[CKEDITOR.CTRL]=a.ctrl;var f=[CKEDITOR.ALT,CKEDITOR.SHIFT,
-CKEDITOR.CTRL],p=/\$\{(.*?)\}/g,t=function(){var a=l.keystrokeHandler.keystrokes,g={},c;for(c in a)g[a[c]]=c;return function(a,c){var b;if(g[c]){b=g[c];for(var h,k,m=[],d=0;d<f.length;d++)k=f[d],h=b/f[d],1<h&&2>=h&&(b-=k,m.push(e[k]));m.push(e[b]||String.fromCharCode(b));b=m.join("+")}else b=a;return b}}();return{title:a.title,minWidth:600,minHeight:400,contents:[{id:"info",label:l.lang.common.generalTab,expand:!0,elements:[{type:"html",id:"legends",style:"white-space:normal;",focus:function(){this.getElement().focus()},
-html:function(){for(var e='\x3cdiv class\x3d"cke_accessibility_legend" role\x3d"document" aria-labelledby\x3d"'+n+'_arialbl" tabIndex\x3d"-1"\x3e%1\x3c/div\x3e\x3cspan id\x3d"'+n+'_arialbl" class\x3d"cke_voice_label"\x3e'+a.contents+" \x3c/span\x3e",g=[],c=a.legend,l=c.length,f=0;f<l;f++){for(var b=c[f],h=[],k=b.items,m=k.length,d=0;d<m;d++){var q=k[d],r=q.legend.replace(p,t);r.match(p)||h.push("\x3cdt\x3e%1\x3c/dt\x3e\x3cdd\x3e%2\x3c/dd\x3e".replace("%1",q.name).replace("%2",r))}g.push("\x3ch1\x3e%1\x3c/h1\x3e\x3cdl\x3e%2\x3c/dl\x3e".replace("%1",
-b.name).replace("%2",h.join("")))}return e.replace("%1",g.join(""))}()+'\x3cstyle type\x3d"text/css"\x3e.cke_accessibility_legend{width:600px;height:400px;padding-right:5px;overflow-y:auto;overflow-x:hidden;}.cke_browser_quirks .cke_accessibility_legend,{height:390px}.cke_accessibility_legend *{white-space:normal;}.cke_accessibility_legend h1{font-size: 20px;border-bottom: 1px solid #AAA;margin: 5px 0px 15px;}.cke_accessibility_legend dl{margin-left: 5px;}.cke_accessibility_legend dt{font-size: 13px;font-weight: bold;}.cke_accessibility_legend dd{margin:10px}\x3c/style\x3e'}]}],
+CKEDITOR.dialog.add("a11yHelp",function(h){var a=h.lang.a11yhelp,b=h.lang.common.keyboard,n=CKEDITOR.tools.getNextId(),e={8:b[8],9:a.tab,13:b[13],16:b[16],17:b[17],18:b[18],19:a.pause,20:a.capslock,27:a.escape,33:a.pageUp,34:a.pageDown,35:b[35],36:b[36],37:a.leftArrow,38:a.upArrow,39:a.rightArrow,40:a.downArrow,45:a.insert,46:b[46],91:a.leftWindowKey,92:a.rightWindowKey,93:a.selectKey,96:a.numpad0,97:a.numpad1,98:a.numpad2,99:a.numpad3,100:a.numpad4,101:a.numpad5,102:a.numpad6,103:a.numpad7,104:a.numpad8,
+105:a.numpad9,106:a.multiply,107:a.add,109:a.subtract,110:a.decimalPoint,111:a.divide,112:a.f1,113:a.f2,114:a.f3,115:a.f4,116:a.f5,117:a.f6,118:a.f7,119:a.f8,120:a.f9,121:a.f10,122:a.f11,123:a.f12,144:a.numLock,145:a.scrollLock,186:a.semiColon,187:a.equalSign,188:a.comma,189:a.dash,190:a.period,191:a.forwardSlash,192:a.graveAccent,219:a.openBracket,220:a.backSlash,221:a.closeBracket,222:a.singleQuote};e[CKEDITOR.ALT]=b[18];e[CKEDITOR.SHIFT]=b[16];e[CKEDITOR.CTRL]=b[17];var g=[CKEDITOR.ALT,CKEDITOR.SHIFT,
+CKEDITOR.CTRL],p=/\$\{(.*?)\}/g,t=function(){var a=h.keystrokeHandler.keystrokes,b={},d;for(d in a)b[a[d]]=d;return function(a,d){var c;if(b[d]){c=b[d];for(var k,l,m=[],f=0;f<g.length;f++)l=g[f],k=c/g[f],1<k&&2>=k&&(c-=l,m.push(e[l]));m.push(e[c]||String.fromCharCode(c));c=m.join("+")}else c=a;return c}}();return{title:a.title,minWidth:600,minHeight:400,contents:[{id:"info",label:h.lang.common.generalTab,expand:!0,elements:[{type:"html",id:"legends",style:"white-space:normal;",focus:function(){this.getElement().focus()},
+html:function(){for(var b='\x3cdiv class\x3d"cke_accessibility_legend" role\x3d"document" aria-labelledby\x3d"'+n+'_arialbl" tabIndex\x3d"-1"\x3e%1\x3c/div\x3e\x3cspan id\x3d"'+n+'_arialbl" class\x3d"cke_voice_label"\x3e'+a.contents+" \x3c/span\x3e",e=[],d=a.legend,h=d.length,g=0;g<h;g++){for(var c=d[g],k=[],l=c.items,m=l.length,f=0;f<m;f++){var q=l[f],r=q.legend.replace(p,t);r.match(p)||k.push("\x3cdt\x3e%1\x3c/dt\x3e\x3cdd\x3e%2\x3c/dd\x3e".replace("%1",q.name).replace("%2",r))}e.push("\x3ch1\x3e%1\x3c/h1\x3e\x3cdl\x3e%2\x3c/dl\x3e".replace("%1",
+c.name).replace("%2",k.join("")))}return b.replace("%1",e.join(""))}()+'\x3cstyle type\x3d"text/css"\x3e.cke_accessibility_legend{width:600px;height:400px;padding-right:5px;overflow-y:auto;overflow-x:hidden;}.cke_browser_quirks .cke_accessibility_legend,{height:390px}.cke_accessibility_legend *{white-space:normal;}.cke_accessibility_legend h1{font-size: 20px;border-bottom: 1px solid #AAA;margin: 5px 0px 15px;}.cke_accessibility_legend dl{margin-left: 5px;}.cke_accessibility_legend dt{font-size: 13px;font-weight: bold;}.cke_accessibility_legend dd{margin:10px}\x3c/style\x3e'}]}],
 buttons:[CKEDITOR.dialog.cancelButton]}});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
index a60eb8bbf..58f07c35c 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 
 cs.js      Found: 30 Missing: 0
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
index f33c0bbee..293a69d9e 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","af",{title:"Toeganglikheid instruksies",contents:"Hulp inhoud. Druk ESC om toe te maak.",legend:[{name:"Algemeen",items:[{name:"Bewerker balk",legend:"Druk ${toolbarFocus} om op die werkbalk te land. Beweeg na die volgende en voorige wekrbalkgroep met TAB and SHIFT+TAB. Beweeg na die volgende en voorige werkbalkknop met die regter of linker pyl. Druk SPASIE of ENTER om die knop te bevestig."},{name:"Bewerker dialoog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Bewerkerinhoudmenu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pouse",capslock:"Hoofletterslot",escape:"Ontsnap",pageUp:"Blaaiop",pageDown:"Blaaiaf",end:"Einde",home:"Tuis",leftArrow:"Linkspyl",upArrow:"Oppyl",rightArrow:"Regterpyl",downArrow:"Afpyl",insert:"Toevoeg","delete":"Verwyder",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Nommerblok 0",numpad1:"Nommerblok 1",
-numpad2:"Nommerblok 2",numpad3:"Nommerblok 3",numpad4:"Nommerblok 4",numpad5:"Nommerblok 5",numpad6:"Nommerblok 6",numpad7:"Nommerblok 7",numpad8:"Nommerblok 8",numpad9:"Nommerblok 9",multiply:"Maal",add:"Plus",subtract:"Minus",decimalPoint:"Desimaalepunt",divide:"Gedeeldeur",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Nommervergrendel",scrollLock:"Rolvergrendel",semiColon:"Kommapunt",equalSign:"Isgelykaan",comma:"Komma",dash:"Koppelteken",
-period:"Punt",forwardSlash:"Skuinsstreep",graveAccent:"Aksentteken",openBracket:"Oopblokhakkie",backSlash:"Trustreep",closeBracket:"Toeblokhakkie",singleQuote:"Enkelaanhaalingsteken"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pouse",capslock:"Hoofletterslot",escape:"Ontsnap",pageUp:"Blaaiop",pageDown:"Blaaiaf",leftArrow:"Linkspyl",upArrow:"Oppyl",rightArrow:"Regterpyl",downArrow:"Afpyl",insert:"Toevoeg",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Nommerblok 0",numpad1:"Nommerblok 1",numpad2:"Nommerblok 2",numpad3:"Nommerblok 3",numpad4:"Nommerblok 4",numpad5:"Nommerblok 5",numpad6:"Nommerblok 6",
+numpad7:"Nommerblok 7",numpad8:"Nommerblok 8",numpad9:"Nommerblok 9",multiply:"Maal",add:"Plus",subtract:"Minus",decimalPoint:"Desimaalepunt",divide:"Gedeeldeur",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Nommervergrendel",scrollLock:"Rolvergrendel",semiColon:"Kommapunt",equalSign:"Isgelykaan",comma:"Komma",dash:"Koppelteken",period:"Punt",forwardSlash:"Skuinsstreep",graveAccent:"Aksentteken",openBracket:"Oopblokhakkie",backSlash:"Trustreep",
+closeBracket:"Toeblokhakkie",singleQuote:"Enkelaanhaalingsteken"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
index 724decb56..a18ea8a2e 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ar",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"عام",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"إضافة",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"تقسيم",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"فاصلة",dash:"Dash",period:"نقطة",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"إضافة",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"تقسيم",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"فاصلة",dash:"Dash",period:"نقطة",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
index d4a9f93ca..d6db25afc 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","bg",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Общо",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
index 11f77ba93..fc562822f 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
@@ -1,12 +1,12 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ca",{title:"Instruccions d'Accessibilitat",contents:"Continguts de l'Ajuda. Per tancar aquest quadre de diàleg premi ESC.",legend:[{name:"General",items:[{name:"Editor de barra d'eines",legend:"Premi ${toolbarFocus} per desplaçar-se per la barra d'eines. Vagi en el següent i anterior grup de barra d'eines amb TAB i SHIFT+TAB. Vagi en el següent i anterior botó de la barra d'eines amb RIGHT ARROW i LEFT ARROW. Premi SPACE o ENTER per activar el botó de la barra d'eines."},
-{name:"Editor de quadre de diàleg",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor de menú contextual",legend:"Premi ${contextMenu} o APPLICATION KEY per obrir el menú contextual. Després desplacis a la següent opció del menú amb TAB o DOWN ARROW. Desplacis a l'anterior opció amb SHIFT+TAB o UP ARROW. Premi SPACE o ENTER per seleccionar l'opció del menú. Obri el submenú de l'actual opció utilitzant SPACE o ENTER o RIGHT ARROW. Pot tornar a l'opció del menú pare amb ESC o LEFT ARROW. Tanqui el menú contextual amb ESC."},
-{name:"Editor de caixa de llista",legend:"Dins d'un quadre de llista, desplacis al següent element de la llista amb TAB o DOWN ARROW. Desplacis a l'anterior element de la llista amb SHIFT+TAB o UP ARROW. Premi SPACE o ENTER per seleccionar l'opció de la llista. Premi ESC per tancar el quadre de llista."},{name:"Editor de barra de ruta de l'element",legend:"Premi ${elementsPathFocus} per anar als elements de la barra de ruta. Desplacis al botó de l'element següent amb TAB o RIGHT ARROW. Desplacis a l'anterior botó amb SHIFT+TAB o LEFT ARROW. Premi SPACE o ENTER per seleccionar l'element a l'editor."}]},
-{name:"Ordres",items:[{name:"Desfer ordre",legend:"Premi ${undo}"},{name:"Refer ordre",legend:"Premi ${redo}"},{name:"Ordre negreta",legend:"Premi ${bold}"},{name:"Ordre cursiva",legend:"Premi ${italic}"},{name:"Ordre subratllat",legend:"Premi ${underline}"},{name:"Ordre enllaç",legend:"Premi ${link}"},{name:"Ordre amagar barra d'eines",legend:"Premi ${toolbarCollapse}"},{name:"Ordre per accedir a l'anterior espai enfocat",legend:"Premi ${accessPreviousSpace} per accedir a l'enfocament d'espai més proper inabastable abans del símbol d'intercalació, per exemple: dos elements HR adjacents. Repetiu la combinació de tecles per arribar a enfocaments d'espais distants."},
-{name:"Ordre per accedir al següent espai enfocat",legend:"Premi ${accessNextSpace} per accedir a l'enfocament d'espai més proper inabastable després del símbol d'intercalació, per exemple: dos elements HR adjacents. Repetiu la combinació de tecles per arribar a enfocaments d'espais distants."},{name:"Ajuda d'accessibilitat",legend:"Premi ${a11yHelp}"}]}],backspace:"Retrocés",tab:"Tabulació",enter:"Intro",shift:"Majúscules",ctrl:"Ctrl",alt:"Alt",pause:"Pausa",capslock:"Bloqueig de majúscules",escape:"Escape",
-pageUp:"Pàgina Amunt",pageDown:"Pàgina Avall",end:"Fi",home:"Inici",leftArrow:"Fletxa Esquerra",upArrow:"Fletxa Amunt",rightArrow:"Fletxa Dreta",downArrow:"Fletxa Avall",insert:"Inserir","delete":"Eliminar",leftWindowKey:"Tecla Windows Esquerra",rightWindowKey:"Tecla Windows Dreta",selectKey:"Tecla Seleccionar",numpad0:"Teclat Numèric 0",numpad1:"Teclat Numèric 1",numpad2:"Teclat Numèric 2",numpad3:"Teclat Numèric 3",numpad4:"Teclat Numèric 4",numpad5:"Teclat Numèric 5",numpad6:"Teclat Numèric 6",
-numpad7:"Teclat Numèric 7",numpad8:"Teclat Numèric 8",numpad9:"Teclat Numèric 9",multiply:"Multiplicació",add:"Suma",subtract:"Resta",decimalPoint:"Punt Decimal",divide:"Divisió",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloqueig Teclat Numèric",scrollLock:"Bloqueig de Desplaçament",semiColon:"Punt i Coma",equalSign:"Símbol Igual",comma:"Coma",dash:"Guió",period:"Punt",forwardSlash:"Barra Diagonal",graveAccent:"Accent Obert",openBracket:"Claudàtor Obert",
-backSlash:"Barra Invertida",closeBracket:"Claudàtor Tancat",singleQuote:"Cometa Simple"});
\ No newline at end of file
+{name:"Editor de quadre de diàleg",legend:"Dins d'un quadre de diàleg, premi la tecla TAB per desplaçar-se fins al següent element del quadre de diàleg, premi la tecla Shift + TAB per desplaçar-se a l'anterior element del quadre de diàleg, premi la tecla ENTER per confirmar el quadre de diàleg, premi la tecla ESC per cancel·lar el quadre de diàleg. Quan un quadre de diàleg té diverses pestanyes, la llista de pestanyes pot ser assolit ja sigui amb ALT + F10 o TAB, com a part de l'ordre de tabulació del quadre de diàleg. Amb la llista de pestanyes seleccionada, pot anar a la fitxa següent i anterior amb la tecla FLETXA DRETA i ESQUERRA, respectivament."},
+{name:"Editor de menú contextual",legend:"Premi ${contextMenu} o APPLICATION KEY per obrir el menú contextual. Després desplacis a la següent opció del menú amb TAB o DOWN ARROW. Desplacis a l'anterior opció amb SHIFT+TAB o UP ARROW. Premi SPACE o ENTER per seleccionar l'opció del menú. Obri el submenú de l'actual opció utilitzant SPACE o ENTER o RIGHT ARROW. Pot tornar a l'opció del menú pare amb ESC o LEFT ARROW. Tanqui el menú contextual amb ESC."},{name:"Editor de caixa de llista",legend:"Dins d'un quadre de llista, desplacis al següent element de la llista amb TAB o DOWN ARROW. Desplacis a l'anterior element de la llista amb SHIFT+TAB o UP ARROW. Premi SPACE o ENTER per seleccionar l'opció de la llista. Premi ESC per tancar el quadre de llista."},
+{name:"Editor de barra de ruta de l'element",legend:"Premi ${elementsPathFocus} per anar als elements de la barra de ruta. Desplacis al botó de l'element següent amb TAB o RIGHT ARROW. Desplacis a l'anterior botó amb SHIFT+TAB o LEFT ARROW. Premi SPACE o ENTER per seleccionar l'element a l'editor."}]},{name:"Ordres",items:[{name:"Desfer ordre",legend:"Premi ${undo}"},{name:"Refer ordre",legend:"Premi ${redo}"},{name:"Ordre negreta",legend:"Premi ${bold}"},{name:"Ordre cursiva",legend:"Premi ${italic}"},
+{name:"Ordre subratllat",legend:"Premi ${underline}"},{name:"Ordre enllaç",legend:"Premi ${link}"},{name:"Ordre amagar barra d'eines",legend:"Premi ${toolbarCollapse}"},{name:"Ordre per accedir a l'anterior espai enfocat",legend:"Premi ${accessPreviousSpace} per accedir a l'enfocament d'espai més proper inabastable abans del símbol d'intercalació, per exemple: dos elements HR adjacents. Repetiu la combinació de tecles per arribar a enfocaments d'espais distants."},{name:"Ordre per accedir al següent espai enfocat",
+legend:"Premi ${accessNextSpace} per accedir a l'enfocament d'espai més proper inabastable després del símbol d'intercalació, per exemple: dos elements HR adjacents. Repetiu la combinació de tecles per arribar a enfocaments d'espais distants."},{name:"Ajuda d'accessibilitat",legend:"Premi ${a11yHelp}"}]}],tab:"Tabulació",pause:"Pausa",capslock:"Bloqueig de majúscules",escape:"Escape",pageUp:"Pàgina Amunt",pageDown:"Pàgina Avall",leftArrow:"Fletxa Esquerra",upArrow:"Fletxa Amunt",rightArrow:"Fletxa Dreta",
+downArrow:"Fletxa Avall",insert:"Inserir",leftWindowKey:"Tecla Windows Esquerra",rightWindowKey:"Tecla Windows Dreta",selectKey:"Tecla Seleccionar",numpad0:"Teclat Numèric 0",numpad1:"Teclat Numèric 1",numpad2:"Teclat Numèric 2",numpad3:"Teclat Numèric 3",numpad4:"Teclat Numèric 4",numpad5:"Teclat Numèric 5",numpad6:"Teclat Numèric 6",numpad7:"Teclat Numèric 7",numpad8:"Teclat Numèric 8",numpad9:"Teclat Numèric 9",multiply:"Multiplicació",add:"Suma",subtract:"Resta",decimalPoint:"Punt Decimal",divide:"Divisió",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloqueig Teclat Numèric",scrollLock:"Bloqueig de Desplaçament",semiColon:"Punt i Coma",equalSign:"Símbol Igual",comma:"Coma",dash:"Guió",period:"Punt",forwardSlash:"Barra Diagonal",graveAccent:"Accent Obert",openBracket:"Claudàtor Obert",backSlash:"Barra Invertida",closeBracket:"Claudàtor Tancat",singleQuote:"Cometa Simple"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
index 88a393c6a..de8ef8c1b 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
@@ -1,12 +1,12 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","cs",{title:"Instrukce pro přístupnost",contents:"Obsah nápovědy. Pro uzavření tohoto dialogu stiskněte klávesu ESC.",legend:[{name:"Obecné",items:[{name:"Panel nástrojů editoru",legend:"Stiskněte${toolbarFocus} k procházení panelu nástrojů. Přejděte na další a předchozí skupiny pomocí TAB a SHIFT+TAB. Přechod na další a předchozí tlačítko panelu nástrojů je pomocí ŠIPKA VPRAVO nebo ŠIPKA VLEVO. Stisknutím mezerníku nebo klávesy ENTER tlačítko aktivujete."},{name:"Dialogové okno editoru",
 legend:"Uvnitř dialogového okna stiskněte TAB pro přesunutí na další prvek okna, stiskněte SHIFT+TAB pro přesun na předchozí prvek okna, stiskněte ENTER pro odeslání dialogu, stiskněte ESC pro jeho zrušení. Pro dialogová okna, která mají mnoho karet stiskněte ALT+F10 pro zaměření seznamu karet, nebo TAB, pro posun podle pořadí karet.Při zaměření seznamu karet se můžete jimi posouvat pomocí ŠIPKY VPRAVO a VLEVO."},{name:"Kontextové menu editoru",legend:"Stiskněte ${contextMenu} nebo klávesu APPLICATION k otevření kontextového menu. Pak se přesuňte na další možnost menu pomocí TAB nebo ŠIPKY DOLŮ. Přesuňte se na předchozí možnost pomocí  SHIFT+TAB nebo ŠIPKY NAHORU. Stiskněte MEZERNÍK nebo ENTER pro zvolení možnosti menu. Podmenu současné možnosti otevřete pomocí MEZERNÍKU nebo ENTER či ŠIPKY DOLEVA. Kontextové menu uzavřete stiskem ESC."},
 {name:"Rámeček seznamu editoru",legend:"Uvnitř rámečku seznamu se přesunete na další položku menu pomocí TAB nebo ŠIPKA DOLŮ. Na předchozí položku se přesunete SHIFT+TAB nebo ŠIPKA NAHORU. Stiskněte MEZERNÍK nebo ENTER pro zvolení možnosti seznamu. Stiskněte ESC pro uzavření seznamu."},{name:"Lišta cesty prvku v editoru",legend:"Stiskněte ${elementsPathFocus} pro procházení lišty cesty prvku. Na další tlačítko prvku se přesunete pomocí TAB nebo ŠIPKA VPRAVO. Na předchozí tlačítko se přesunete pomocí SHIFT+TAB nebo ŠIPKA VLEVO. Stiskněte MEZERNÍK nebo ENTER pro vybrání prvku v editoru."}]},
 {name:"Příkazy",items:[{name:" Příkaz Zpět",legend:"Stiskněte ${undo}"},{name:" Příkaz Znovu",legend:"Stiskněte ${redo}"},{name:" Příkaz Tučné",legend:"Stiskněte ${bold}"},{name:" Příkaz Kurzíva",legend:"Stiskněte ${italic}"},{name:" Příkaz Podtržení",legend:"Stiskněte ${underline}"},{name:" Příkaz Odkaz",legend:"Stiskněte ${link}"},{name:" Příkaz Skrýt panel nástrojů",legend:"Stiskněte ${toolbarCollapse}"},{name:"Příkaz pro přístup k předchozímu prostoru zaměření",legend:"Stiskněte ${accessPreviousSpace} pro přístup k nejbližšímu nedosažitelnému prostoru zaměření před stříškou, například: dva přilehlé prvky HR. Pro dosažení vzdálených prostorů zaměření tuto kombinaci kláves opakujte."},
-{name:"Příkaz pro přístup k dalšímu prostoru zaměření",legend:"Stiskněte ${accessNextSpace} pro přístup k nejbližšímu nedosažitelnému prostoru zaměření po stříšce, například: dva přilehlé prvky HR. Pro dosažení vzdálených prostorů zaměření tuto kombinaci kláves opakujte."},{name:" Nápověda přístupnosti",legend:"Stiskněte ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tabulátor",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pauza",capslock:"Caps lock",escape:"Escape",pageUp:"Stránka nahoru",
-pageDown:"Stránka dolů",end:"Konec",home:"Domů",leftArrow:"Šipka vlevo",upArrow:"Šipka nahoru",rightArrow:"Šipka vpravo",downArrow:"Šipka dolů",insert:"Vložit","delete":"Smazat",leftWindowKey:"Levá klávesa Windows",rightWindowKey:"Pravá klávesa Windows",selectKey:"Vyberte klávesu",numpad0:"Numerická klávesa 0",numpad1:"Numerická klávesa 1",numpad2:"Numerická klávesa 2",numpad3:"Numerická klávesa 3",numpad4:"Numerická klávesa 4",numpad5:"Numerická klávesa 5",numpad6:"Numerická klávesa 6",numpad7:"Numerická klávesa 7",
-numpad8:"Numerická klávesa 8",numpad9:"Numerická klávesa 9",multiply:"Numerická klávesa násobení",add:"Přidat",subtract:"Numerická klávesa odečítání",decimalPoint:"Desetinná tečka",divide:"Numerická klávesa dělení",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num lock",scrollLock:"Scroll lock",semiColon:"Středník",equalSign:"Rovnítko",comma:"Čárka",dash:"Pomlčka",period:"Tečka",forwardSlash:"Lomítko",graveAccent:"Přízvuk",openBracket:"Otevřená hranatá závorka",
-backSlash:"Obrácené lomítko",closeBracket:"Uzavřená hranatá závorka",singleQuote:"Jednoduchá uvozovka"});
\ No newline at end of file
+{name:"Příkaz pro přístup k dalšímu prostoru zaměření",legend:"Stiskněte ${accessNextSpace} pro přístup k nejbližšímu nedosažitelnému prostoru zaměření po stříšce, například: dva přilehlé prvky HR. Pro dosažení vzdálených prostorů zaměření tuto kombinaci kláves opakujte."},{name:" Nápověda přístupnosti",legend:"Stiskněte ${a11yHelp}"}]}],tab:"Tabulátor",pause:"Pauza",capslock:"Caps lock",escape:"Escape",pageUp:"Stránka nahoru",pageDown:"Stránka dolů",leftArrow:"Šipka vlevo",upArrow:"Šipka nahoru",
+rightArrow:"Šipka vpravo",downArrow:"Šipka dolů",insert:"Vložit",leftWindowKey:"Levá klávesa Windows",rightWindowKey:"Pravá klávesa Windows",selectKey:"Vyberte klávesu",numpad0:"Numerická klávesa 0",numpad1:"Numerická klávesa 1",numpad2:"Numerická klávesa 2",numpad3:"Numerická klávesa 3",numpad4:"Numerická klávesa 4",numpad5:"Numerická klávesa 5",numpad6:"Numerická klávesa 6",numpad7:"Numerická klávesa 7",numpad8:"Numerická klávesa 8",numpad9:"Numerická klávesa 9",multiply:"Numerická klávesa násobení",
+add:"Přidat",subtract:"Numerická klávesa odečítání",decimalPoint:"Desetinná tečka",divide:"Numerická klávesa dělení",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num lock",scrollLock:"Scroll lock",semiColon:"Středník",equalSign:"Rovnítko",comma:"Čárka",dash:"Pomlčka",period:"Tečka",forwardSlash:"Lomítko",graveAccent:"Přízvuk",openBracket:"Otevřená hranatá závorka",backSlash:"Obrácené lomítko",closeBracket:"Uzavřená hranatá závorka",
+singleQuote:"Jednoduchá uvozovka"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
index 97fc7117c..31e94af26 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","cy",{title:"Canllawiau Hygyrchedd",contents:"Cynnwys Cymorth. I gau y deialog hwn, pwyswch ESC.",legend:[{name:"Cyffredinol",items:[{name:"Bar Offer y Golygydd",legend:"Pwyswch $ {toolbarFocus} i fynd at y bar offer. Symudwch i'r grŵp bar offer nesaf a blaenorol gyda TAB a SHIFT+TAB. Symudwch i'r botwm bar offer nesaf a blaenorol gyda SAETH DDE neu SAETH CHWITH. Pwyswch SPACE neu ENTER i wneud botwm y bar offer yn weithredol."},{name:"Deialog y Golygydd",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Dewislen Cyd-destun y Golygydd",legend:"Pwyswch $ {contextMenu} neu'r ALLWEDD 'APPLICATION' i agor y ddewislen cyd-destun. Yna symudwch i'r opsiwn ddewislen nesaf gyda'r TAB neu'r SAETH I LAWR. Symudwch i'r opsiwn blaenorol gyda SHIFT+TAB neu'r SAETH I FYNY. Pwyswch SPACE neu ENTER i ddewis yr opsiwn ddewislen. Agorwch is-dewislen yr opsiwn cyfredol gyda SPACE neu ENTER neu SAETH DDE. Ewch yn ôl i'r eitem ar y ddewislen uwch gydag ESC neu SAETH CHWITH. Ceuwch y ddewislen cyd-destun gydag ESC."},
 {name:"Blwch Rhestr y Golygydd",legend:"Tu mewn y blwch rhestr, ewch i'r eitem rhestr nesaf gyda TAB neu'r SAETH I LAWR. Symudwch i restr eitem flaenorol gyda SHIFT+TAB neu SAETH I FYNY. Pwyswch SPACE neu ENTER i ddewis yr opsiwn o'r rhestr. Pwyswch ESC i gau'r rhestr."},{name:"Bar Llwybr Elfen y Golygydd",legend:"Pwyswch ${elementsPathFocus} i fynd i'r bar llwybr elfennau. Symudwch i fotwm yr elfen nesaf gyda TAB neu SAETH DDE. Symudwch i fotwm blaenorol gyda SHIFT+TAB neu SAETH CHWITH. Pwyswch SPACE neu ENTER i ddewis yr elfen yn y golygydd."}]},
 {name:"Gorchmynion",items:[{name:"Gorchymyn dadwneud",legend:"Pwyswch ${undo}"},{name:"Gorchymyn ailadrodd",legend:"Pwyswch ${redo}"},{name:"Gorchymyn Bras",legend:"Pwyswch ${bold}"},{name:"Gorchymyn italig",legend:"Pwyswch ${italig}"},{name:"Gorchymyn tanlinellu",legend:"Pwyso ${underline}"},{name:"Gorchymyn dolen",legend:"Pwyswch ${link}"},{name:"Gorchymyn Cwympo'r Dewislen",legend:"Pwyswch ${toolbarCollapse}"},{name:"Myned i orchymyn bwlch ffocws blaenorol",legend:"Pwyswch ${accessPreviousSpace} i fyned i'r \"blwch ffocws sydd methu ei gyrraedd\" cyn y caret, er enghraifft: dwy elfen HR drws nesaf i'w gilydd. AIladroddwch y cyfuniad allwedd i gyrraedd bylchau ffocws pell."},
-{name:"Ewch i'r gorchymyn blwch ffocws nesaf",legend:"Pwyswch ${accessNextSpace} i fyned i'r blwch ffocws agosaf nad oes modd ei gyrraedd ar ôl y caret, er enghraifft: dwy elfen HR drws nesaf i'w gilydd. Ailadroddwch y cyfuniad allwedd i gyrraedd blychau ffocws pell."},{name:"Cymorth Hygyrchedd",legend:"Pwyswch ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",
-divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Ewch i'r gorchymyn blwch ffocws nesaf",legend:"Pwyswch ${accessNextSpace} i fyned i'r blwch ffocws agosaf nad oes modd ei gyrraedd ar ôl y caret, er enghraifft: dwy elfen HR drws nesaf i'w gilydd. Ailadroddwch y cyfuniad allwedd i gyrraedd blychau ffocws pell."},{name:"Cymorth Hygyrchedd",legend:"Pwyswch ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",
+insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",
+scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
index 70bebb0a2..c3e4a97c7 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","da",{title:"Tilgængelighedsinstrukser",contents:"Onlinehjælp. For at lukke dette vindue klik ESC",legend:[{name:"Generelt",items:[{name:"Editor værktøjslinje",legend:"Tryk ${toolbarFocus} for at navigere til værktøjslinjen. Flyt til næste eller forrige værktøjsline gruppe ved hjælp af TAB eller SHIFT+TAB. Flyt til næste eller forrige værktøjslinje knap med venstre- eller højre piltast. Tryk på SPACE eller ENTER for at aktivere værktøjslinje knappen."},{name:"Editor dialogboks",
-legend:"Inde i en dialogboks kan du, trykke på TAB for at navigere til næste element, trykke på SHIFT+TAB for at navigere til forrige element, trykke på ENTER for at afsende eller trykke på ESC for at lukke dialogboksen.\r\nNår en dialogboks har flere faner, fanelisten kan tilgås med ALT+F10 eller med TAB. Hvis fanelisten er i fokus kan du skifte til næste eller forrige tab, med højre- og venstre piltast."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
-{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
-{name:"Kommandoer",items:[{name:"Fortryd kommando",legend:"Klik på ${undo}"},{name:"Gentag kommando",legend:"Klik ${redo}"},{name:"Fed kommando",legend:"Klik ${bold}"},{name:"Kursiv kommando",legend:"Klik ${italic}"},{name:"Understregnings kommando",legend:"Klik ${underline}"},{name:"Link kommando",legend:"Klik ${link}"},{name:" Toolbar Collapse command",legend:"Klik ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Tilgængelighedshjælp",legend:"Kilk ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Venstre pil",
-upArrow:"Pil op",rightArrow:"Højre pil",downArrow:"Pil ned",insert:"Insert","delete":"Delete",leftWindowKey:"Venstre Windows tast",rightWindowKey:"Højre Windows tast",selectKey:"Select-knap",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Gange",add:"Plus",subtract:"Minus",decimalPoint:"Komma",divide:"Divider",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",
-f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Lighedstegn",comma:"Komma",dash:"Bindestreg",period:"Punktum",forwardSlash:"Skråstreg",graveAccent:"Accent grave",openBracket:"Start klamme",backSlash:"Omvendt skråstreg",closeBracket:"Slut klamme",singleQuote:"Enkelt citationstegn"});
\ No newline at end of file
+legend:"Inde i en dialogboks kan du, trykke på TAB for at navigere til næste element, trykke på SHIFT+TAB for at navigere til forrige element, trykke på ENTER for at afsende eller trykke på ESC for at lukke dialogboksen.\r\nNår en dialogboks har flere faner, fanelisten kan tilgås med ALT+F10 eller med TAB. Hvis fanelisten er i fokus kan du skifte til næste eller forrige tab, med højre- og venstre piltast."},{name:"Redaktør kontekstmenu",legend:"Tryk ${contextMenu} eller APPLICATION KEY for at åbne kontekstmenuen. Flyt derefter til næste menuvalg med TAB eller PIL NED. Flyt til forrige valg med SHIFT+TAB eller PIL OP. Tryk MELLEMRUM eller RETUR for at vælge menu-muligheder. Åben under-menu af aktuelle valg med MELLEMRUM eller RETUR eller HØJRE PIL. Gå tilbage til overliggende menu-emne med ESC eller VENSTRE PIL. Luk kontekstmenu med ESC."},
+{name:"Redaktør listeboks",legend:"Flyt til næste emne med TAB eller PIL NED inde i en listeboks. Flyt til forrige listeemne med SHIFT+TAB eller PIL OP. Tryk MELLEMRUM eller RETUR for at vælge liste-muligheder. Tryk ESC for at lukke liste-boksen."},{name:"Redaktør elementsti-bar",legend:"Tryk ${elementsPathFocus} for at navigere til elementernes sti-bar. Flyt til næste element-knap med TAB eller HØJRE PIL. Flyt til forrige knap med SHIFT+TAB eller VENSTRE PIL. Klik MELLEMRUM eller RETUR for at vælge element i editoren."}]},
+{name:"Kommandoer",items:[{name:"Fortryd kommando",legend:"Klik på ${undo}"},{name:"Gentag kommando",legend:"Klik ${redo}"},{name:"Fed kommando",legend:"Klik ${bold}"},{name:"Kursiv kommando",legend:"Klik ${italic}"},{name:"Understregnings kommando",legend:"Klik ${underline}"},{name:"Link kommando",legend:"Klik ${link}"},{name:"Klap værktøjslinje sammen kommando ",legend:"Klik ${toolbarCollapse}"},{name:"Adgang til forrige fokusområde kommando",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Tilgængelighedshjælp",legend:"Kilk ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Venstre pil",upArrow:"Pil op",rightArrow:"Højre pil",downArrow:"Pil ned",insert:"Insert",leftWindowKey:"Venstre Windows tast",
+rightWindowKey:"Højre Windows tast",selectKey:"Select-knap",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Gange",add:"Plus",subtract:"Minus",decimalPoint:"Komma",divide:"Divider",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",
+equalSign:"Lighedstegn",comma:"Komma",dash:"Bindestreg",period:"Punktum",forwardSlash:"Skråstreg",graveAccent:"Accent grave",openBracket:"Start klamme",backSlash:"Omvendt skråstreg",closeBracket:"Slut klamme",singleQuote:"Enkelt citationstegn"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
index 6bdca7806..a09f8821a 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","de-ch",{title:"Barrierefreiheitinformationen",contents:"Hilfeinhalt. Um den Dialog zu schliessen die Taste ESC drücken.",legend:[{name:"Allgemein",items:[{name:"Editorwerkzeugleiste",legend:"Drücken Sie ${toolbarFocus} auf der Symbolleiste. Gehen Sie zur nächsten oder vorherigen Symbolleistengruppe mit TAB und SHIFT+TAB. Gehen Sie zur nächsten oder vorherigen Symbolleiste auf die Schaltfläche mit dem RECHTS- oder LINKS-Pfeil. Drücken Sie die Leertaste oder Eingabetaste, um die Schaltfläche in der Symbolleiste aktivieren."},
 {name:"Editordialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor-Kontextmenü",legend:"Dürcken Sie ${contextMenu} oder die Anwendungstaste um das Kontextmenü zu öffnen. Man kann die Pfeiltasten zum Wechsel benutzen. Mit der Leertaste oder der Enter-Taste kann man den Menüpunkt aufrufen. Schliessen Sie das Kontextmenü mit der ESC-Taste."},
 {name:"Editor-Listenbox",legend:"Innerhalb einer Listenbox kann man mit der TAB-Taste oder den Pfeilrunter-Taste den nächsten Menüeintrag wählen. Mit der SHIFT+TAB Tastenkombination oder der Pfeilhoch-Taste gelangt man zum vorherigen Menüpunkt. Mit der Leertaste oder Enter kann man den Menüpunkt auswählen. Drücken Sie ESC zum Verlassen des Menüs."},{name:"Editor-Elementpfadleiste",legend:"Drücken Sie ${elementsPathFocus} um sich durch die Pfadleiste zu bewegen. Um zum nächsten Element zu gelangen drücken Sie TAB oder die Pfeilrechts-Taste. Zum vorherigen Element gelangen Sie mit der SHIFT+TAB oder der Pfeillinks-Taste. Drücken Sie die Leertaste oder Enter um das Element auszuwählen."}]},
 {name:"Befehle",items:[{name:"Rückgängig-Befehl",legend:"Drücken Sie ${undo}"},{name:"Wiederherstellen-Befehl",legend:"Drücken Sie ${redo}"},{name:"Fettschrift-Befehl",legend:"Drücken Sie ${bold}"},{name:"Kursiv-Befehl",legend:"Drücken Sie ${italic}"},{name:"Unterstreichen-Befehl",legend:"Drücken Sie ${underline}"},{name:"Link-Befehl",legend:"Drücken Sie ${link}"},{name:"Werkzeugleiste einklappen-Befehl",legend:"Drücken Sie ${toolbarCollapse}"},{name:"Zugang bisheriger Fokussierung Raumbefehl ",legend:"Drücken Sie ${accessPreviousSpace}  auf den am nächsten nicht erreichbar Fokus-Abstand vor die Einfügemarke zugreifen: zwei benachbarte HR-Elemente. Wiederholen Sie die Tastenkombination um entfernte Fokusräume zu erreichen. "},
-{name:"Zugang nächster Schwerpunkt Raumbefehl ",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbar Fokus Leerzeichen nach dem Cursor zum Beispiel auf: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination zum fernen Fokus Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"}]}],backspace:"Rücktaste",tab:"Tab",enter:"Eingabe",shift:"Umschalt",ctrl:"Strg",alt:"Alt",pause:"Pause",capslock:"Feststell",escape:"Escape",pageUp:"Bild auf",pageDown:"Bild ab",
-end:"Ende",home:"Pos1",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",downArrow:"Untere Pfeiltaste",insert:"Einfügen","delete":"Entfernen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",numpad8:"Ziffernblock 8",
-numpad9:"Ziffernblock 9",multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Gravis",openBracket:"Öffnende eckige Klammer",backSlash:"Rückwärtsgewandter Schrägstrich",
-closeBracket:"Schliessende eckige Klammer",singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
+{name:"Zugang nächster Schwerpunkt Raumbefehl ",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbar Fokus Leerzeichen nach dem Cursor zum Beispiel auf: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination zum fernen Fokus Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Feststell",escape:"Escape",pageUp:"Bild auf",pageDown:"Bild ab",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",
+downArrow:"Untere Pfeiltaste",insert:"Einfügen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",numpad8:"Ziffernblock 8",numpad9:"Ziffernblock 9",multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Gravis",openBracket:"Öffnende eckige Klammer",backSlash:"Rückwärtsgewandter Schrägstrich",closeBracket:"Schliessende eckige Klammer",singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
index 24d782a9f..0a09795ae 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","de",{title:"Barrierefreiheitinformationen",contents:"Hilfeinhalt. Um den Dialog zu schliessen die Taste ESC drücken.",legend:[{name:"Allgemein",items:[{name:"Editorwerkzeugleiste",legend:"Drücken Sie ${toolbarFocus} auf der Symbolleiste. Gehen Sie zur nächsten oder vorherigen Symbolleistengruppe mit TAB und SHIFT+TAB. Gehen Sie zur nächsten oder vorherigen Symbolleiste auf die Schaltfläche mit dem RECHTS- oder LINKS-Pfeil. Drücken Sie die Leertaste oder Eingabetaste, um die Schaltfläche in der Symbolleiste aktivieren."},
 {name:"Editordialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor-Kontextmenü",legend:"Dürcken Sie ${contextMenu} oder die Anwendungstaste um das Kontextmenü zu öffnen. Man kann die Pfeiltasten zum Wechsel benutzen. Mit der Leertaste oder der Enter-Taste kann man den Menüpunkt aufrufen. Schliessen Sie das Kontextmenü mit der ESC-Taste."},
 {name:"Editor-Listenbox",legend:"Innerhalb einer Listenbox kann man mit der TAB-Taste oder den Pfeilrunter-Taste den nächsten Menüeintrag wählen. Mit der SHIFT+TAB Tastenkombination oder der Pfeilhoch-Taste gelangt man zum vorherigen Menüpunkt. Mit der Leertaste oder Enter kann man den Menüpunkt auswählen. Drücken Sie ESC zum Verlassen des Menüs."},{name:"Editor-Elementpfadleiste",legend:"Drücken Sie ${elementsPathFocus} um sich durch die Pfadleiste zu bewegen. Um zum nächsten Element zu gelangen drücken Sie TAB oder die Pfeilrechts-Taste. Zum vorherigen Element gelangen Sie mit der SHIFT+TAB oder der Pfeillinks-Taste. Drücken Sie die Leertaste oder Enter um das Element auszuwählen."}]},
 {name:"Befehle",items:[{name:"Rückgängig-Befehl",legend:"Drücken Sie ${undo}"},{name:"Wiederherstellen-Befehl",legend:"Drücken Sie ${redo}"},{name:"Fettschrift-Befehl",legend:"Drücken Sie ${bold}"},{name:"Kursiv-Befehl",legend:"Drücken Sie ${italic}"},{name:"Unterstreichen-Befehl",legend:"Drücken Sie ${underline}"},{name:"Link-Befehl",legend:"Drücken Sie ${link}"},{name:"Werkzeugleiste einklappen-Befehl",legend:"Drücken Sie ${toolbarCollapse}"},{name:"Zugang bisheriger Fokussierung Raumbefehl ",legend:"Drücken Sie ${accessPreviousSpace}  auf den am nächsten nicht erreichbar Fokus-Abstand vor die Einfügemarke zugreifen: zwei benachbarte HR-Elemente. Wiederholen Sie die Tastenkombination um entfernte Fokusräume zu erreichen. "},
-{name:"Zugang nächster Schwerpunkt Raumbefehl ",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbar Fokus Leerzeichen nach dem Cursor zum Beispiel auf: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination zum fernen Fokus Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"}]}],backspace:"Rücktaste",tab:"Tab",enter:"Eingabe",shift:"Umschalt",ctrl:"Strg",alt:"Alt",pause:"Pause",capslock:"Feststell",escape:"Escape",pageUp:"Bild auf",pageDown:"Bild ab",
-end:"Ende",home:"Pos1",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",downArrow:"Untere Pfeiltaste",insert:"Einfügen","delete":"Entfernen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",numpad8:"Ziffernblock 8",
-numpad9:"Ziffernblock 9",multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Gravis",openBracket:"Öffnende eckige Klammer",backSlash:"Rückwärtsgewandter Schrägstrich",
-closeBracket:"Schließende eckige Klammer",singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
+{name:"Zugang nächster Schwerpunkt Raumbefehl ",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbar Fokus Leerzeichen nach dem Cursor zum Beispiel auf: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination zum fernen Fokus Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Feststell",escape:"Escape",pageUp:"Bild auf",pageDown:"Bild ab",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",
+downArrow:"Untere Pfeiltaste",insert:"Einfügen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",numpad8:"Ziffernblock 8",numpad9:"Ziffernblock 9",multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Gravis",openBracket:"Öffnende eckige Klammer",backSlash:"Rückwärtsgewandter Schrägstrich",closeBracket:"Schließende eckige Klammer",singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
index ae73cabcd..19a44b0f4 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","el",{title:"Οδηγίες Προσβασιμότητας",contents:"Περιεχόμενα Βοήθειας. Πατήστε ESC για κλείσιμο.",legend:[{name:"Γενικά",items:[{name:"Εργαλειοθήκη Επεξεργαστή",legend:"Πατήστε ${toolbarFocus} για να περιηγηθείτε στην γραμμή εργαλείων. Μετακινηθείτε ανάμεσα στις ομάδες της γραμμής εργαλείων με TAB και SHIFT+TAB. Μετακινηθείτε ανάμεσα στα κουμπιά εργαλείων με το ΔΕΞΙ ή ΑΡΙΣΤΕΡΟ ΒΕΛΑΚΙ. Πατήστε ΔΙΑΣΤΗΜΑ ή ENTER για να ενεργοποιήσετε το ενεργό κουμπί εργαλείου."},{name:"Παράθυρο Διαλόγου Επεξεργαστή",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Αναδυόμενο Μενού Επεξεργαστή",legend:"Πατήστε ${contextMenu} ή APPLICATION KEY για να ανοίξετε το αναδυόμενο μενού. Μετά μετακινηθείτε στην επόμενη επιλογή του μενού με  TAB ή ΚΑΤΩ ΒΕΛΑΚΙ. Μετακινηθείτε στην προηγούμενη επιλογή με SHIFT+TAB ή το ΠΑΝΩ ΒΕΛΑΚΙ. Πατήστε ΔΙΑΣΤΗΜΑ ή ENTER για να επιλέξτε το τρέχων στοιχείο. Ανοίξτε το αναδυόμενο μενού της τρέχουσας επιλογής με ΔΙΑΣΤΗΜΑ ή ENTER ή το ΔΕΞΙ ΒΕΛΑΚΙ. Μεταβείτε πίσω στο αρχικό στοιχείο μενού με το ESC ή το ΑΡΙΣΤΕΡΟ ΒΕΛΑΚΙ. Κλείστε το αναδυόμενο μενού με ESC."},
 {name:"Κουτί Λίστας Επεξεργαστών",legend:"Μέσα σε ένα κουτί λίστας, μετακινηθείτε στο επόμενο στοιχείο με TAB ή ΚΑΤΩ ΒΕΛΑΚΙ. Μετακινηθείτε στο προηγούμενο στοιχείο με SHIFT+TAB ή το ΠΑΝΩ ΒΕΛΑΚΙ. Πατήστε ΔΙΑΣΤΗΜΑ ή ENTER για να επιλέξετε ένα στοιχείο. Πατήστε ESC για να κλείσετε το κουτί της λίστας."},{name:"Μπάρα Διαδρομών Στοιχείων Επεξεργαστή",legend:"Πατήστε ${elementsPathFocus} για να περιηγηθείτε στην μπάρα διαδρομών στοιχείων του επεξεργαστή. Μετακινηθείτε στο κουμπί του επόμενου στοιχείου με το TAB ή το ΔΕΞΙ ΒΕΛΑΚΙ. Μετακινηθείτε στο κουμπί του προηγούμενου στοιχείου με το SHIFT+TAB ή το ΑΡΙΣΤΕΡΟ ΒΕΛΑΚΙ. Πατήστε ΔΙΑΣΤΗΜΑ ή ENTER για να επιλέξετε το στοιχείο στον επεξεργαστή."}]},
 {name:"Εντολές",items:[{name:"Εντολή αναίρεσης",legend:"Πατήστε ${undo}"},{name:"Εντολή επανάληψης",legend:"Πατήστε ${redo}"},{name:"Εντολή έντονης γραφής",legend:"Πατήστε ${bold}"},{name:"Εντολή πλάγιας γραφής",legend:"Πατήστε ${italic}"},{name:"Εντολή υπογράμμισης",legend:"Πατήστε ${underline}"},{name:"Εντολή συνδέσμου",legend:"Πατήστε ${link}"},{name:"Εντολή Σύμπτηξης Εργαλειοθήκης",legend:"Πατήστε ${toolbarCollapse}"},{name:"Πρόσβαση στην προηγούμενη εντολή του χώρου εστίασης ",legend:"Πατήστε ${accessPreviousSpace} για να έχετε πρόσβαση στον πιο κοντινό χώρο εστίασης πριν το δρομέα, για παράδειγμα: δύο παρακείμενα στοιχεία ΥΕ. Επαναλάβετε το συνδυασμό πλήκτρων για να φθάσετε στους χώρους μακρινής εστίασης. "},
-{name:"Πρόσβαση στην επόμενη εντολή του χώρου εστίασης",legend:"Πατήστε ${accessNextSpace} για να έχετε πρόσβαση στον πιο κοντινό χώρο εστίασης μετά το δρομέα, για παράδειγμα: δύο παρακείμενα στοιχεία ΥΕ. Επαναλάβετε το συνδυασμό πλήκτρων για τους χώρους μακρινής εστίασης. "},{name:"Βοήθεια Προσβασιμότητας",legend:"Πατήστε ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"Αριστερό Βέλος",upArrow:"Πάνω Βέλος",rightArrow:"Δεξί Βέλος",downArrow:"Κάτω Βέλος",insert:"Insert ","delete":"Delete",leftWindowKey:"Αριστερό Πλήκτρο Windows",rightWindowKey:"Δεξί Πλήκτρο Windows",selectKey:"Πλήκτρο Select",numpad0:"Αριθμητικό πληκτρολόγιο 0",numpad1:"Αριθμητικό Πληκτρολόγιο 1",numpad2:"Αριθμητικό πληκτρολόγιο 2",numpad3:"Αριθμητικό πληκτρολόγιο 3",numpad4:"Αριθμητικό πληκτρολόγιο 4",numpad5:"Αριθμητικό πληκτρολόγιο 5",numpad6:"Αριθμητικό πληκτρολόγιο 6",
-numpad7:"Αριθμητικό πληκτρολόγιο 7",numpad8:"Αριθμητικό πληκτρολόγιο 8",numpad9:"Αριθμητικό πληκτρολόγιο 9",multiply:"Πολλαπλασιασμός",add:"Πρόσθεση",subtract:"Αφαίρεση",decimalPoint:"Υποδιαστολή",divide:"Διαίρεση",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"6",f7:"7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Ερωτηματικό",equalSign:"Σύμβολο Ισότητας",comma:"Κόμμα",dash:"Παύλα",period:"Τελεία",forwardSlash:"Κάθετος",graveAccent:"Βαρεία",openBracket:"Άνοιγμα Παρένθεσης",
-backSlash:"Ανάστροφη Κάθετος",closeBracket:"Κλείσιμο Παρένθεσης",singleQuote:"Απόστροφος"});
\ No newline at end of file
+{name:"Πρόσβαση στην επόμενη εντολή του χώρου εστίασης",legend:"Πατήστε ${accessNextSpace} για να έχετε πρόσβαση στον πιο κοντινό χώρο εστίασης μετά το δρομέα, για παράδειγμα: δύο παρακείμενα στοιχεία ΥΕ. Επαναλάβετε το συνδυασμό πλήκτρων για τους χώρους μακρινής εστίασης. "},{name:"Βοήθεια Προσβασιμότητας",legend:"Πατήστε ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Αριστερό Βέλος",upArrow:"Πάνω Βέλος",rightArrow:"Δεξί Βέλος",
+downArrow:"Κάτω Βέλος",insert:"Insert ",leftWindowKey:"Αριστερό Πλήκτρο Windows",rightWindowKey:"Δεξί Πλήκτρο Windows",selectKey:"Πλήκτρο Select",numpad0:"Αριθμητικό πληκτρολόγιο 0",numpad1:"Αριθμητικό Πληκτρολόγιο 1",numpad2:"Αριθμητικό πληκτρολόγιο 2",numpad3:"Αριθμητικό πληκτρολόγιο 3",numpad4:"Αριθμητικό πληκτρολόγιο 4",numpad5:"Αριθμητικό πληκτρολόγιο 5",numpad6:"Αριθμητικό πληκτρολόγιο 6",numpad7:"Αριθμητικό πληκτρολόγιο 7",numpad8:"Αριθμητικό πληκτρολόγιο 8",numpad9:"Αριθμητικό πληκτρολόγιο 9",
+multiply:"Πολλαπλασιασμός",add:"Πρόσθεση",subtract:"Αφαίρεση",decimalPoint:"Υποδιαστολή",divide:"Διαίρεση",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"6",f7:"7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Ερωτηματικό",equalSign:"Σύμβολο Ισότητας",comma:"Κόμμα",dash:"Παύλα",period:"Τελεία",forwardSlash:"Κάθετος",graveAccent:"Βαρεία",openBracket:"Άνοιγμα Παρένθεσης",backSlash:"Ανάστροφη Κάθετος",closeBracket:"Κλείσιμο Παρένθεσης",singleQuote:"Απόστροφος"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
index a5da9379e..26dfdf0bd 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","en-gb",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
index 3a62e4ad1..52708c937 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","en",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
index 8c798a71e..01edb4d27 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","eo",{title:"Uzindikoj pri atingeblo",contents:"Helpilenhavo. Por fermi tiun dialogon, premu la ESKAPAN klavon.",legend:[{name:"Ĝeneralaĵoj",items:[{name:"Ilbreto de la redaktilo",legend:"Premu ${toolbarFocus} por atingi la ilbreton. Moviĝu al la sekva aŭ antaŭa grupoj de la ilbreto per la klavoj TABA kaj MAJUSKLIGA+TABA. Moviĝu al la sekva aŭ antaŭa butonoj de la ilbreto per la klavoj SAGO DEKSTREN kaj SAGO MALDEKSTREN. Premu la SPACETklavon aŭ la ENENklavon por aktivigi la ilbretbutonon."},
@@ -7,7 +7,6 @@ CKEDITOR.plugins.setLang("a11yhelp","eo",{title:"Uzindikoj pri atingeblo",conten
 {name:"Kunteksta menuo de la redaktilo",legend:"Premu ${contextMenu} aŭ entajpu la KLAVKOMBINAĴON por malfermi la kuntekstan menuon. Poste moviĝu al la sekva opcio de la menuo per la klavoj TABA aŭ SAGO SUBEN. Moviĝu al la antaŭa opcio per la klavoj MAJUSKLGA + TABA aŭ SAGO SUPREN. Premu la SPACETklavon aŭ ENENklavon por selekti la menuopcion. Malfermu la submenuon de la kuranta opcio per la SPACETklavo aŭ la ENENklavo aŭ la SAGO DEKSTREN. Revenu al la elemento de la patra menuo per la klavoj ESKAPA aŭ SAGO MALDEKSTREN. Fermu la kuntekstan menuon per la ESKAPA klavo."},
 {name:"Fallisto de la redaktilo",legend:"En fallisto, moviĝu al la sekva listelemento per la klavoj TABA aŭ SAGO SUBEN. Moviĝu al la antaŭa listelemento per la klavoj MAJUSKLIGA+TABA aŭ SAGO SUPREN. Premu la SPACETklavon aŭ ENENklavon por selekti la opcion en la listo. Premu la ESKAPAN klavon por fermi la falmenuon."},{name:"Breto indikanta la vojon al la redaktilelementoj",legend:"Premu ${elementsPathFocus} por navigi al la breto indikanta la vojon al la redaktilelementoj. Moviĝu al la butono de la sekva elemento per la klavoj TABA aŭ SAGO DEKSTREN. Moviĝu al la butono de la antaŭa elemento per la klavoj MAJUSKLIGA+TABA aŭ SAGO MALDEKSTREN. Premu la SPACETklavon aŭ ENENklavon por selekti la elementon en la redaktilo."}]},
 {name:"Komandoj",items:[{name:"Komando malfari",legend:"Premu ${undo}"},{name:"Komando refari",legend:"Premu ${redo}"},{name:"Komando grasa",legend:"Premu ${bold}"},{name:"Komando kursiva",legend:"Premu ${italic}"},{name:"Komando substreki",legend:"Premu ${underline}"},{name:"Komando ligilo",legend:"Premu ${link}"},{name:"Komando faldi la ilbreton",legend:"Premu ${toolbarCollapse}"},{name:"Komando por atingi la antaŭan fokusan spacon",legend:"Press ${accessPreviousSpace} por atingi la plej proksiman neatingeblan fokusan spacon antaŭ la kursoro, ekzemple : du kuntuŝiĝajn HR elementojn. Ripetu la klavkombinaĵon por atingi malproksimajn fokusajn spacojn."},
-{name:"Komando por atingi la sekvan fokusan spacon",legend:"Press ${accessNextSpace} por atingi la plej proksiman neatingeblan fokusan spacon post la kursoro, ekzemple : du kuntuŝiĝajn HR elementojn. Ripetu la klavkombinajôn por atingi malproksimajn fokusajn spacojn"},{name:"Helpilo pri atingeblo",legend:"Premu ${a11yHelp}"}]}],backspace:"Retropaŝo",tab:"Tabo",enter:"Enigi",shift:"Registrumo",ctrl:"Stirklavo",alt:"Alt-klavo",pause:"Paŭzo",capslock:"Majuskla baskulo",escape:"Eskapa klavo",pageUp:"Antaŭa Paĝo",
-pageDown:"Sekva Paĝo",end:"Fino",home:"Hejmo",leftArrow:"Sago Maldekstren",upArrow:"Sago Supren",rightArrow:"Sago Dekstren",downArrow:"Sago Suben",insert:"Enmeti","delete":"Forigi",leftWindowKey:"Maldekstra Windows-klavo",rightWindowKey:"Dekstra Windows-klavo",selectKey:"Selektklavo",numpad0:"Nombra Klavaro 0",numpad1:"Nombra Klavaro 1",numpad2:"Nombra Klavaro 2",numpad3:"Nombra Klavaro 3",numpad4:"Nombra Klavaro 4",numpad5:"Nombra Klavaro 5",numpad6:"Nombra Klavaro 6",numpad7:"Nombra Klavaro 7",
-numpad8:"Nombra Klavaro 8",numpad9:"Nombra Klavaro 9",multiply:"Obligi",add:"Almeti",subtract:"Subtrahi",decimalPoint:"Dekuma Punkto",divide:"Dividi",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Nombra Baskulo",scrollLock:"Ruluma Baskulo",semiColon:"Punktokomo",equalSign:"Egalsigno",comma:"Komo",dash:"Haltostreko",period:"Punkto",forwardSlash:"Oblikvo",graveAccent:"Malakuto",openBracket:"Malferma Krampo",backSlash:"Retroklino",closeBracket:"Ferma Krampo",
-singleQuote:"Citilo"});
\ No newline at end of file
+{name:"Komando por atingi la sekvan fokusan spacon",legend:"Press ${accessNextSpace} por atingi la plej proksiman neatingeblan fokusan spacon post la kursoro, ekzemple : du kuntuŝiĝajn HR elementojn. Ripetu la klavkombinajôn por atingi malproksimajn fokusajn spacojn"},{name:"Helpilo pri atingeblo",legend:"Premu ${a11yHelp}"}]}],tab:"Tabo",pause:"Paŭzo",capslock:"Majuskla baskulo",escape:"Eskapa klavo",pageUp:"Antaŭa Paĝo",pageDown:"Sekva Paĝo",leftArrow:"Sago Maldekstren",upArrow:"Sago Supren",rightArrow:"Sago Dekstren",
+downArrow:"Sago Suben",insert:"Enmeti",leftWindowKey:"Maldekstra Windows-klavo",rightWindowKey:"Dekstra Windows-klavo",selectKey:"Selektklavo",numpad0:"Nombra Klavaro 0",numpad1:"Nombra Klavaro 1",numpad2:"Nombra Klavaro 2",numpad3:"Nombra Klavaro 3",numpad4:"Nombra Klavaro 4",numpad5:"Nombra Klavaro 5",numpad6:"Nombra Klavaro 6",numpad7:"Nombra Klavaro 7",numpad8:"Nombra Klavaro 8",numpad9:"Nombra Klavaro 9",multiply:"Obligi",add:"Almeti",subtract:"Subtrahi",decimalPoint:"Dekuma Punkto",divide:"Dividi",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Nombra Baskulo",scrollLock:"Ruluma Baskulo",semiColon:"Punktokomo",equalSign:"Egalsigno",comma:"Komo",dash:"Haltostreko",period:"Punkto",forwardSlash:"Oblikvo",graveAccent:"Malakuto",openBracket:"Malferma Krampo",backSlash:"Retroklino",closeBracket:"Ferma Krampo",singleQuote:"Citilo"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
index 640627e2a..2aa0c5cb0 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","es",{title:"Instrucciones de accesibilidad",contents:"Ayuda. Para cerrar presione ESC.",legend:[{name:"General",items:[{name:"Barra de herramientas del editor",legend:'Presiona ${toolbarFocus} para navegar por la barra de herramientas. Para moverse por los distintos grupos de herramientas usa las teclas TAB y MAY+TAB. Para moverse por las distintas herramientas usa FLECHA DERECHA o FECHA IZQUIERDA. Presiona "espacio" o "intro" para activar la herramienta.'},{name:"Editor de diálogo",
@@ -7,7 +7,7 @@ legend:"Dentro del diálogo, presione TAB para navegar a los siguientes elemento
 {name:"Editor del menú contextual",legend:"Presiona ${contextMenu} o TECLA MENÚ para abrir el menú contextual. Entonces muévete a la siguiente opción del menú con TAB o FLECHA ABAJO. Muévete a la opción previa con SHIFT + TAB o FLECHA ARRIBA. Presiona ESPACIO o ENTER para seleccionar la opción del menú. Abre el submenú de la opción actual con ESPACIO o ENTER o FLECHA DERECHA. Regresa al elemento padre del menú con ESC o FLECHA IZQUIERDA. Cierra el menú contextual con ESC."},{name:"Lista del Editor",
 legend:"Dentro de una lista, te mueves al siguiente elemento de la lista con TAB o FLECHA ABAJO. Te mueves al elemento previo de la lista con SHIFT+TAB o FLECHA ARRIBA. Presiona ESPACIO o ENTER para elegir la opción de la lista. Presiona ESC para cerrar la lista."},{name:"Barra de Ruta del Elemento en el Editor",legend:"Presiona ${elementsPathFocus} para navegar a los elementos de la barra de ruta. Te mueves al siguiente elemento botón con TAB o FLECHA DERECHA. Te mueves al botón previo con SHIFT+TAB o FLECHA IZQUIERDA. Presiona ESPACIO o ENTER para seleccionar el elemento en el editor."}]},
 {name:"Comandos",items:[{name:"Comando deshacer",legend:"Presiona ${undo}"},{name:"Comando rehacer",legend:"Presiona ${redo}"},{name:"Comando negrita",legend:"Presiona ${bold}"},{name:"Comando itálica",legend:"Presiona ${italic}"},{name:"Comando subrayar",legend:"Presiona ${underline}"},{name:"Comando liga",legend:"Presiona ${liga}"},{name:"Comando colapsar barra de herramientas",legend:"Presiona ${toolbarCollapse}"},{name:"Comando accesar el anterior espacio de foco",legend:"Presiona ${accessPreviousSpace} para accesar el espacio de foco no disponible más cercano anterior al cursor, por ejemplo: dos elementos HR adyacentes. Repite la combinación de teclas para alcanzar espacios de foco distantes."},
-{name:"Comando accesar el siguiente spacio de foco",legend:"Presiona ${accessNextSpace} para accesar el espacio de foco no disponible más cercano después del cursor, por ejemplo: dos elementos HR adyacentes. Repite la combinación de teclas para alcanzar espacios de foco distantes."},{name:"Ayuda de Accesibilidad",legend:"Presiona ${a11yHelp}"}]}],backspace:"Retroceso",tab:"Tabulador",enter:"Ingresar",shift:"Mayús.",ctrl:"Ctrl",alt:"Alt",pause:"Pausa",capslock:"Bloq. Mayús.",escape:"Escape",pageUp:"Regresar Página",
-pageDown:"Avanzar Página",end:"Fin",home:"Inicio",leftArrow:"Flecha Izquierda",upArrow:"Flecha Arriba",rightArrow:"Flecha Derecha",downArrow:"Flecha Abajo",insert:"Insertar","delete":"Suprimir",leftWindowKey:"Tecla Windows Izquierda",rightWindowKey:"Tecla Windows Derecha",selectKey:"Tecla de Selección",numpad0:"Tecla 0 del teclado numérico",numpad1:"Tecla 1 del teclado numérico",numpad2:"Tecla 2 del teclado numérico",numpad3:"Tecla 3 del teclado numérico",numpad4:"Tecla 4 del teclado numérico",numpad5:"Tecla 5 del teclado numérico",
-numpad6:"Tecla 6 del teclado numérico",numpad7:"Tecla 7 del teclado numérico",numpad8:"Tecla 8 del teclado numérico",numpad9:"Tecla 9 del teclado numérico",multiply:"Multiplicar",add:"Sumar",subtract:"Restar",decimalPoint:"Punto Decimal",divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Punto y coma",equalSign:"Signo de Igual",comma:"Coma",dash:"Guión",period:"Punto",forwardSlash:"Diagonal",
-graveAccent:"Acento Grave",openBracket:"Abrir llave",backSlash:"Diagonal Invertida",closeBracket:"Cerrar llave",singleQuote:"Comillas simples"});
\ No newline at end of file
+{name:"Comando accesar el siguiente spacio de foco",legend:"Presiona ${accessNextSpace} para accesar el espacio de foco no disponible más cercano después del cursor, por ejemplo: dos elementos HR adyacentes. Repite la combinación de teclas para alcanzar espacios de foco distantes."},{name:"Ayuda de Accesibilidad",legend:"Presiona ${a11yHelp}"}]}],tab:"Tabulador",pause:"Pausa",capslock:"Bloq. Mayús.",escape:"Escape",pageUp:"Regresar Página",pageDown:"Avanzar Página",leftArrow:"Flecha Izquierda",upArrow:"Flecha Arriba",
+rightArrow:"Flecha Derecha",downArrow:"Flecha Abajo",insert:"Insertar",leftWindowKey:"Tecla Windows Izquierda",rightWindowKey:"Tecla Windows Derecha",selectKey:"Tecla de Selección",numpad0:"Tecla 0 del teclado numérico",numpad1:"Tecla 1 del teclado numérico",numpad2:"Tecla 2 del teclado numérico",numpad3:"Tecla 3 del teclado numérico",numpad4:"Tecla 4 del teclado numérico",numpad5:"Tecla 5 del teclado numérico",numpad6:"Tecla 6 del teclado numérico",numpad7:"Tecla 7 del teclado numérico",numpad8:"Tecla 8 del teclado numérico",
+numpad9:"Tecla 9 del teclado numérico",multiply:"Multiplicar",add:"Sumar",subtract:"Restar",decimalPoint:"Punto Decimal",divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Punto y coma",equalSign:"Signo de Igual",comma:"Coma",dash:"Guión",period:"Punto",forwardSlash:"Diagonal",graveAccent:"Acento Grave",openBracket:"Abrir llave",backSlash:"Diagonal Invertida",closeBracket:"Cerrar llave",
+singleQuote:"Comillas simples"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
index 9fded4c88..c5987d424 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","et",{title:"Accessibility Instructions",contents:"Abi sisu. Selle dialoogi sulgemiseks vajuta ESC klahvi.",legend:[{name:"Üldine",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
index cfcd553d5..36cf17774 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","eu",{title:"Erabilerraztasunaren argibideak",contents:"Laguntzaren edukiak. Elkarrizketa-koadro hau ixteko sakatu ESC.",legend:[{name:"Orokorra",items:[{name:"Editorearen tresna-barra",legend:"Sakatu ${toolbarFocus} tresna-barrara nabigatzeko. Tresna-barrako aurreko eta hurrengo taldera joateko erabili TAB eta MAIUS+TAB. Tresna-barrako aurreko eta hurrengo botoira joateko erabili ESKUIN-GEZIA eta EZKER-GEZIA. Sakatu ZURIUNEA edo SARTU tresna-barrako botoia aktibatzeko."},
@@ -7,6 +7,6 @@ CKEDITOR.plugins.setLang("a11yhelp","eu",{title:"Erabilerraztasunaren argibideak
 legend:"Sakatu ${contextMenu} edo APLIKAZIO TEKLA testuinguru-menua irekitzeko. Menuko hurrengo aukerara joateko erabili TAB edo BEHERA GEZIA. Aurreko aukerara nabigatzeko erabili MAIUS+TAB edo GORA GEZIA. Sakatu ZURIUNEA edo SARTU menuko aukera hautatzeko. Ireki uneko aukeraren azpi-menua ZURIUNEA edo SARTU edo ESKUIN-GEZIA erabiliz. Menuko aukera gurasora itzultzeko erabili ESC edo EZKER-GEZIA. Testuinguru-menua ixteko sakatu ESC."},{name:"Editorearen zerrenda-koadroa",legend:"Zerrenda-koadro baten barruan, zerrendako hurrengo elementura joateko erabili TAB edo BEHERA GEZIA. Zerrendako aurreko elementura nabigatzeko MAIUS+TAB edo GORA GEZIA. Sakatu ZURIUNEA edo SARTU zerrendako aukera hautatzeko. Sakatu ESC zerrenda-koadroa ixteko."},
 {name:"Editorearen elementuaren bide-barra",legend:"Sakatu ${elementsPathFocus} elementuaren bide-barrara nabigatzeko. Hurrengo elementuaren botoira joateko erabili TAB edo ESKUIN-GEZIA. Aurreko botoira joateko aldiz erabili MAIUS+TAB edo EZKER-GEZIA. Elementua editorean hautatzeko sakatu ZURIUNEA edo SARTU."}]},{name:"Komandoak",items:[{name:"Desegin komandoa",legend:"Sakatu ${undo}"},{name:"Berregin komandoa",legend:"Sakatu ${redo}"},{name:"Lodia komandoa",legend:"Sakatu ${bold}"},{name:"Etzana komandoa",
 legend:"Sakatu ${italic}"},{name:"Azpimarratu komandoa",legend:"Sakatu ${underline}"},{name:"Esteka komandoa",legend:"Sakatu ${link}"},{name:"Tolestu tresna-barra komandoa",legend:"Sakatu ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:"Erabilerraztasunaren laguntza",legend:"Sakatu ${a11yHelp}"}]}],backspace:"Atzera tekla",tab:"Tabuladorea",enter:"Sartu",shift:"Maius",ctrl:"Ktrl",alt:"Alt",pause:"Pausatu",capslock:"Blok Maius",escape:"Ihes",pageUp:"Page Up",pageDown:"Page Down",end:"Buka",home:"Etxea",leftArrow:"Ezker-gezia",upArrow:"Gora gezia",rightArrow:"Eskuin-gezia",downArrow:"Behera gezia",insert:"Txertatu","delete":"Ezabatu",leftWindowKey:"Ezkerreko Windows tekla",rightWindowKey:"Eskuineko Windows tekla",selectKey:"Hautatu tekla",
-numpad0:"Zenbakizko teklatua 0",numpad1:"Zenbakizko teklatua 1",numpad2:"Zenbakizko teklatua 2",numpad3:"Zenbakizko teklatua 3",numpad4:"Zenbakizko teklatua 4",numpad5:"Zenbakizko teklatua 5",numpad6:"Zenbakizko teklatua 6",numpad7:"Zenbakizko teklatua 7",numpad8:"Zenbakizko teklatua 8",numpad9:"Zenbakizko teklatua 9",multiply:"Biderkatu",add:"Gehitu",subtract:"Kendu",decimalPoint:"Koma hamartarra",divide:"Zatitu",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",
-f12:"F12",numLock:"Blok Zenb",scrollLock:"Blok Korr",semiColon:"Puntu eta koma",equalSign:"Berdin zeinua",comma:"Koma",dash:"Marratxoa",period:"Puntua",forwardSlash:"Barra",graveAccent:"Azentu kamutsa",openBracket:"Parentesia ireki",backSlash:"Alderantzizko barra",closeBracket:"Itxi parentesia",singleQuote:"Komatxo bakuna"});
\ No newline at end of file
+{name:"Erabilerraztasunaren laguntza",legend:"Sakatu ${a11yHelp}"}]}],tab:"Tabuladorea",pause:"Pausatu",capslock:"Blok Maius",escape:"Ihes",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Ezker-gezia",upArrow:"Gora gezia",rightArrow:"Eskuin-gezia",downArrow:"Behera gezia",insert:"Txertatu",leftWindowKey:"Ezkerreko Windows tekla",rightWindowKey:"Eskuineko Windows tekla",selectKey:"Hautatu tekla",numpad0:"Zenbakizko teklatua 0",numpad1:"Zenbakizko teklatua 1",numpad2:"Zenbakizko teklatua 2",numpad3:"Zenbakizko teklatua 3",
+numpad4:"Zenbakizko teklatua 4",numpad5:"Zenbakizko teklatua 5",numpad6:"Zenbakizko teklatua 6",numpad7:"Zenbakizko teklatua 7",numpad8:"Zenbakizko teklatua 8",numpad9:"Zenbakizko teklatua 9",multiply:"Biderkatu",add:"Gehitu",subtract:"Kendu",decimalPoint:"Koma hamartarra",divide:"Zatitu",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Blok Zenb",scrollLock:"Blok Korr",semiColon:"Puntu eta koma",equalSign:"Berdin zeinua",comma:"Koma",
+dash:"Marratxoa",period:"Puntua",forwardSlash:"Barra",graveAccent:"Azentu kamutsa",openBracket:"Parentesia ireki",backSlash:"Alderantzizko barra",closeBracket:"Itxi parentesia",singleQuote:"Komatxo bakuna"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
index 12eb03526..be36987bf 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fa",{title:"دستورالعمل‌های دسترسی",contents:"راهنمای فهرست مطالب. برای بستن این کادر محاوره‌ای ESC را فشار دهید.",legend:[{name:"عمومی",items:[{name:"نوار ابزار ویرایشگر",legend:"${toolbarFocus} را برای باز کردن نوار ابزار بفشارید. با کلید Tab و Shift+Tab در مجموعه نوار ابزار بعدی و قبلی حرکت کنید. برای حرکت در کلید نوار ابزار قبلی و بعدی با کلید جهت‌نمای راست و چپ جابجا شوید. کلید Space یا Enter را برای فعال کردن کلید نوار ابزار بفشارید."},{name:"پنجره محاورهای ویرایشگر",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"منوی متنی ویرایشگر",legend:"${contextMenu} یا کلید برنامههای کاربردی را برای باز کردن منوی متن را بفشارید. سپس میتوانید برای حرکت به گزینه بعدی منو با کلید Tab و یا کلید جهتنمای پایین جابجا شوید. حرکت به گزینه قبلی با Shift+Tab یا کلید جهتنمای بالا. فشردن Space یا Enter برای انتخاب یک گزینه از منو. باز کردن زیر شاخه گزینه منو جاری با کلید Space یا Enter و یا کلید جهتنمای راست و چپ. بازگشت به منوی والد با کلید Esc یا کلید جهتنمای چپ. بستن منوی متن با Esc."},
 {name:"جعبه فهرست ویرایشگر",legend:"در داخل جعبه لیست، قلم دوم از اقلام لیست بعدی را با TAB و یا Arrow Down حرکت دهید. انتقال به قلم دوم از اقلام لیست قبلی را با SHIFT + TAB یا UP ARROW. کلید Space یا ENTER را برای انتخاب گزینه لیست بفشارید. کلید ESC را برای بستن جعبه لیست بفشارید."},{name:"ویرایشگر عنصر نوار راه",legend:"برای رفتن به مسیر عناصر ${elementsPathFocus} را بفشارید. حرکت به کلید عنصر بعدی با کلید Tab یا کلید جهت‌نمای راست. برگشت به کلید قبلی با Shift+Tab یا کلید جهت‌نمای چپ. فشردن Space یا Enter برای انتخاب یک عنصر در ویرایشگر."}]},
 {name:"فرمان‌ها",items:[{name:"بازگشت به آخرین فرمان",legend:"فشردن ${undo}"},{name:"انجام مجدد فرمان",legend:"فشردن ${redo}"},{name:"فرمان درشت کردن متن",legend:"فشردن ${bold}"},{name:"فرمان کج کردن متن",legend:"فشردن ${italic}"},{name:"فرمان زیرخطدار کردن متن",legend:"فشردن ${underline}"},{name:"فرمان پیوند دادن",legend:"فشردن ${link}"},{name:"بستن نوار ابزار فرمان",legend:"فشردن ${toolbarCollapse}"},{name:"دسترسی به فرمان محل تمرکز قبلی",legend:"فشردن ${accessPreviousSpace} برای دسترسی به نزدیک‌ترین فضای قابل دسترسی تمرکز قبل از هشتک، برای مثال: دو عنصر مجاور HR -خط افقی-. تکرار کلید ترکیبی برای رسیدن به فضاهای تمرکز از راه دور."},
-{name:"دسترسی به فضای دستور بعدی",legend:"برای دسترسی به نزدیک‌ترین فضای تمرکز غیر قابل دسترس، ${accessNextSpace} را پس از علامت هشتک بفشارید، برای مثال:  دو عنصر مجاور HR -خط افقی-. کلید ترکیبی را برای رسیدن به فضای تمرکز تکرار کنید."},{name:"راهنمای دسترسی",legend:"فشردن ${a11yHelp}"}]}],backspace:"عقبگرد",tab:"برگه",enter:"ورود",shift:"تعویض",ctrl:"کنترل",alt:"دگرساز",pause:"توقف",capslock:"Caps Lock",escape:"گریز",pageUp:"صفحه به بالا",pageDown:"صفحه به پایین",end:"پایان",home:"خانه",leftArrow:"پیکان چپ",
-upArrow:"پیکان بالا",rightArrow:"پیکان راست",downArrow:"پیکان پایین",insert:"ورود","delete":"حذف",leftWindowKey:"کلید چپ ویندوز",rightWindowKey:"کلید راست ویندوز",selectKey:"انتخاب کلید",numpad0:"کلید شماره 0",numpad1:"کلید شماره 1",numpad2:"کلید شماره 2",numpad3:"کلید شماره 3",numpad4:"کلید شماره 4",numpad5:"کلید شماره 5",numpad6:"کلید شماره 6",numpad7:"کلید شماره 7",numpad8:"کلید شماره 8",numpad9:"کلید شماره 9",multiply:"ضرب",add:"افزودن",subtract:"تفریق",decimalPoint:"نقطه‌ی اعشار",divide:"جدا کردن",
-f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"علامت تساوی",comma:"کاما",dash:"خط تیره",period:"دوره",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"دسترسی به فضای دستور بعدی",legend:"برای دسترسی به نزدیک‌ترین فضای تمرکز غیر قابل دسترس، ${accessNextSpace} را پس از علامت هشتک بفشارید، برای مثال:  دو عنصر مجاور HR -خط افقی-. کلید ترکیبی را برای رسیدن به فضای تمرکز تکرار کنید."},{name:"راهنمای دسترسی",legend:"فشردن ${a11yHelp}"}]}],tab:"برگه",pause:"توقف",capslock:"Caps Lock",escape:"گریز",pageUp:"صفحه به بالا",pageDown:"صفحه به پایین",leftArrow:"پیکان چپ",upArrow:"پیکان بالا",rightArrow:"پیکان راست",downArrow:"پیکان پایین",insert:"ورود",
+leftWindowKey:"کلید چپ ویندوز",rightWindowKey:"کلید راست ویندوز",selectKey:"انتخاب کلید",numpad0:"کلید شماره 0",numpad1:"کلید شماره 1",numpad2:"کلید شماره 2",numpad3:"کلید شماره 3",numpad4:"کلید شماره 4",numpad5:"کلید شماره 5",numpad6:"کلید شماره 6",numpad7:"کلید شماره 7",numpad8:"کلید شماره 8",numpad9:"کلید شماره 9",multiply:"ضرب",add:"افزودن",subtract:"تفریق",decimalPoint:"نقطه‌ی اعشار",divide:"جدا کردن",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",
+f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"علامت تساوی",comma:"کاما",dash:"خط تیره",period:"دوره",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
index 98f8127c3..28b5d28d6 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fi",{title:"Saavutettavuus ohjeet",contents:"Ohjeen sisällöt. Sulkeaksesi tämän dialogin paina ESC.",legend:[{name:"Yleinen",items:[{name:"Editorin työkalupalkki",legend:"Paina ${toolbarFocus} siirtyäksesi työkalupalkkiin. Siirry seuraavaan ja edelliseen työkalupalkin ryhmään TAB ja SHIFT+TAB näppäimillä. Siirry seuraavaan ja edelliseen työkalupainikkeeseen käyttämällä NUOLI OIKEALLE tai NUOLI VASEMMALLE näppäimillä. Paina VÄLILYÖNTI tai ENTER näppäintä aktivoidaksesi työkalupainikkeen."},
 {name:"Editorin dialogi",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editorin oheisvalikko",legend:"Paina ${contextMenu} tai SOVELLUSPAINIKETTA avataksesi oheisvalikon. Liiku seuraavaan valikon vaihtoehtoon TAB tai NUOLI ALAS näppäimillä. Siirry edelliseen vaihtoehtoon SHIFT+TAB tai NUOLI YLÖS näppäimillä. Paina VÄLILYÖNTI tai ENTER valitaksesi valikon kohdan. Avataksesi nykyisen kohdan alivalikon paina VÄLILYÖNTI tai ENTER tai NUOLI OIKEALLE painiketta. Siirtyäksesi takaisin valikon ylemmälle tasolle paina ESC tai NUOLI vasemmalle. Oheisvalikko suljetaan ESC painikkeella."},
 {name:"Editorin listalaatikko",legend:"Listalaatikon sisällä siirry seuraavaan listan kohtaan TAB tai NUOLI ALAS painikkeilla. Siirry edelliseen listan kohtaan SHIFT+TAB tai NUOLI YLÖS painikkeilla. Paina VÄLILYÖNTI tai ENTER valitaksesi listan vaihtoehdon. Paina ESC sulkeaksesi listalaatikon."},{name:"Editorin elementtipolun palkki",legend:"Paina ${elementsPathFocus} siirtyäksesi elementtipolun palkkiin. Siirry seuraavaan elementtipainikkeeseen TAB tai NUOLI OIKEALLE painikkeilla. Siirry aiempaan painikkeeseen SHIFT+TAB tai NUOLI VASEMMALLE painikkeilla. Paina VÄLILYÖNTI tai ENTER valitaksesi elementin editorissa."}]},
 {name:"Komennot",items:[{name:"Peruuta komento",legend:"Paina ${undo}"},{name:"Tee uudelleen komento",legend:"Paina ${redo}"},{name:"Lihavoi komento",legend:"Paina ${bold}"},{name:"Kursivoi komento",legend:"Paina ${italic}"},{name:"Alleviivaa komento",legend:"Paina ${underline}"},{name:"Linkki komento",legend:"Paina ${link}"},{name:"Pienennä työkalupalkki komento",legend:"Paina ${toolbarCollapse}"},{name:"Siirry aiempaan fokustilaan komento",legend:"Paina ${accessPreviousSpace} siiryäksesi lähimpään kursorin edellä olevaan saavuttamattomaan fokustilaan, esimerkiksi: kaksi vierekkäistä HR elementtiä. Toista näppäinyhdistelmää päästäksesi kauempana oleviin fokustiloihin."},
-{name:"Siirry seuraavaan fokustilaan komento",legend:"Paina ${accessPreviousSpace} siiryäksesi lähimpään kursorin jälkeen olevaan saavuttamattomaan fokustilaan, esimerkiksi: kaksi vierekkäistä HR elementtiä. Toista näppäinyhdistelmää päästäksesi kauempana oleviin fokustiloihin."},{name:"Saavutettavuus ohjeet",legend:"Paina ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numeronäppäimistö 0",numpad1:"Numeronäppäimistö 1",numpad2:"Numeronäppäimistö 2",numpad3:"Numeronäppäimistö 3",numpad4:"Numeronäppäimistö 4",numpad5:"Numeronäppäimistö 5",numpad6:"Numeronäppäimistö 6",numpad7:"Numeronäppäimistö 7",numpad8:"Numeronäppäimistö 8",
-numpad9:"Numeronäppäimistö 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Puolipiste",equalSign:"Equal Sign",comma:"Pilkku",dash:"Dash",period:"Piste",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Siirry seuraavaan fokustilaan komento",legend:"Paina ${accessPreviousSpace} siiryäksesi lähimpään kursorin jälkeen olevaan saavuttamattomaan fokustilaan, esimerkiksi: kaksi vierekkäistä HR elementtiä. Toista näppäinyhdistelmää päästäksesi kauempana oleviin fokustiloihin."},{name:"Saavutettavuus ohjeet",legend:"Paina ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",
+downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numeronäppäimistö 0",numpad1:"Numeronäppäimistö 1",numpad2:"Numeronäppäimistö 2",numpad3:"Numeronäppäimistö 3",numpad4:"Numeronäppäimistö 4",numpad5:"Numeronäppäimistö 5",numpad6:"Numeronäppäimistö 6",numpad7:"Numeronäppäimistö 7",numpad8:"Numeronäppäimistö 8",numpad9:"Numeronäppäimistö 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",
+divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Puolipiste",equalSign:"Equal Sign",comma:"Pilkku",dash:"Dash",period:"Piste",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
index f1b05e890..03e54f1fe 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fo",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Falda",add:"Pluss",subtract:"Frádráttar",decimalPoint:"Decimal Point",divide:"Býta",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Javnatekn",comma:"Komma",dash:"Dash",period:"Punktum",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Falda",add:"Pluss",subtract:"Frádráttar",decimalPoint:"Decimal Point",divide:"Býta",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Javnatekn",comma:"Komma",dash:"Dash",period:"Punktum",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
index 888804be6..5aac06be5 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fr-ca",{title:"Instructions d'accessibilité",contents:"Contenu de l'aide.  Pour fermer cette fenêtre, appuyez sur ESC.",legend:[{name:"Général",items:[{name:"Barre d'outil de l'éditeur",legend:"Appuyer sur ${toolbarFocus} pour accéder à la barre d'outils. Se déplacer vers les groupes suivant ou précédent de la barre d'outil avec les touches TAB et SHIFT+TAB. Se déplacer vers les boutons suivant ou précédent de la barre d'outils avec les touches FLECHE DROITE et FLECHE GAUCHE. Appuyer sur la barre d'espace ou la touche ENTRER pour activer le bouton de barre d'outils."},
 {name:"Dialogue de l'éditeur",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Menu contextuel de l'éditeur",legend:"Appuyer sur ${contextMenu} ou entrer le RACCOURCI CLAVIER pour ouvrir le menu contextuel. Puis se déplacer vers l'option suivante du menu avec les touches TAB ou FLECHE BAS. Se déplacer vers l'option précédente avec les touches SHIFT+TAB ou FLECHE HAUT. appuyer sur la BARRE D'ESPACE ou la touche ENTREE pour sélectionner l'option du menu. Oovrir le sous-menu de l'option courante avec la BARRE D'ESPACE ou les touches ENTREE ou FLECHE DROITE. Revenir à l'élément de menu parent avec les touches ESC ou FLECHE GAUCHE. Fermer le menu contextuel avec ESC."},
 {name:"Menu déroulant de l'éditeur",legend:"A l'intérieur d'une liste en menu déroulant, se déplacer vers l'élément suivant de la liste avec les touches TAB ou FLECHE BAS. Se déplacer vers l'élément précédent de la liste avec les touches SHIFT+TAB ou FLECHE HAUT. Appuyer sur la BARRE D'ESPACE ou sur ENTREE pour sélectionner l'option dans la liste. Appuyer sur ESC pour fermer le menu déroulant."},{name:"Barre d'emplacement des éléments de l'éditeur",legend:"Appuyer sur ${elementsPathFocus} pour naviguer vers la barre d'emplacement des éléments de léditeur. Se déplacer vers le bouton d'élément suivant avec les touches TAB ou FLECHE DROITE. Se déplacer vers le bouton d'élément précédent avec les touches SHIFT+TAB ou FLECHE GAUCHE. Appuyer sur la BARRE D'ESPACE ou sur ENTREE pour sélectionner l'élément dans l'éditeur."}]},
 {name:"Commandes",items:[{name:"Annuler",legend:"Appuyer sur ${undo}"},{name:"Refaire",legend:"Appuyer sur ${redo}"},{name:"Gras",legend:"Appuyer sur ${bold}"},{name:"Italique",legend:"Appuyer sur ${italic}"},{name:"Souligné",legend:"Appuyer sur ${underline}"},{name:"Lien",legend:"Appuyer sur ${link}"},{name:"Enrouler la barre d'outils",legend:"Appuyer sur ${toolbarCollapse}"},{name:"Accéder à l'objet de focus précédent",legend:"Appuyer ${accessPreviousSpace} pour accéder au prochain espace disponible avant le curseur, par exemple: deux éléments HR adjacents.  Répéter la combinaison pour joindre les éléments d'espaces distantes."},
-{name:"Accéder au prochain objet de focus",legend:"Appuyer ${accessNextSpace} pour accéder au prochain espace disponible après le curseur, par exemple: deux éléments HR adjacents.  Répéter la combinaison pour joindre les éléments d'espaces distantes."},{name:"Aide d'accessibilité",legend:"Appuyer sur ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",
-leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",
-f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Accéder au prochain objet de focus",legend:"Appuyer ${accessNextSpace} pour accéder au prochain espace disponible après le curseur, par exemple: deux éléments HR adjacents.  Répéter la combinaison pour joindre les éléments d'espaces distantes."},{name:"Aide d'accessibilité",legend:"Appuyer sur ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",
+insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",
+scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
index dab550a7b..0cf67e8d1 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fr",{title:"Instructions d'accessibilité",contents:"Contenu de l'aide. Pour fermer cette fenêtre, appuyez sur la touche Échap.",legend:[{name:"Général",items:[{name:"Barre d'outils de l'éditeur",legend:"Appuyer sur ${toolbarFocus} pour accéder à la barre d'outils. Se déplacer vers le groupe suivant ou précédent de la barre d'outils avec les touches Tab et Maj+Tab. Se déplacer vers le bouton suivant ou précédent de la barre d'outils avec les touches Flèche droite et Flèche gauche. Appuyer sur la barre d'espace ou la touche Entrée pour activer le bouton de barre d'outils."},
@@ -8,6 +8,6 @@ legend:"Appuyer sur ${contextMenu} ou sur la touche Menu pour ouvrir le menu con
 {name:"Zone de liste de l'éditeur",legend:"Dans une liste en menu déroulant, se déplacer vers l'élément suivant de la liste avec les touches Tab ou Flèche bas. Se déplacer vers l'élément précédent de la liste avec les touches Maj+Tab ou Flèche haut. Appuyer sur la barre d'espace ou sur Entrée pour sélectionner l'option dans la liste. Appuyer sur Échap pour fermer le menu déroulant."},{name:"Barre du chemin d'éléments de l'éditeur",legend:"Appuyer sur ${elementsPathFocus} pour naviguer vers la barre du fil d'Ariane des éléments. Se déplacer vers le bouton de l'élément suivant avec les touches Tab ou Flèche droite. Se déplacer vers le bouton précédent avec les touches Maj+Tab ou Flèche gauche. Appuyer sur la barre d'espace ou sur Entrée pour sélectionner l'élément dans l'éditeur."}]},
 {name:"Commandes",items:[{name:" Annuler la commande",legend:"Appuyer sur ${undo}"},{name:"Commande restaurer",legend:"Appuyer sur ${redo}"},{name:" Commande gras",legend:"Appuyer sur ${bold}"},{name:" Commande italique",legend:"Appuyer sur ${italic}"},{name:" Commande souligné",legend:"Appuyer sur ${underline}"},{name:" Commande lien",legend:"Appuyer sur ${link}"},{name:" Commande enrouler la barre d'outils",legend:"Appuyer sur ${toolbarCollapse}"},{name:"Commande d'accès à l'élément sélectionnable précédent",
 legend:"Appuyer sur ${accessNextSpace} pour accéder à l'élément sélectionnable inatteignable le plus proche avant le curseur, par exemple : deux lignes horizontales adjacentes. Répéter la combinaison de touches pour atteindre les éléments sélectionnables précédents."},{name:"Commande d'accès à l'élément sélectionnable suivant",legend:"Appuyer sur ${accessNextSpace} pour accéder à l'élément sélectionnable inatteignable le plus proche après le curseur, par exemple : deux lignes horizontales adjacentes. Répéter la combinaison de touches pour atteindre les éléments sélectionnables suivants."},
-{name:" Aide sur l'accessibilité",legend:"Appuyer sur ${a11yHelp}"}]}],backspace:"Retour arrière",tab:"Tabulation",enter:"Entrée",shift:"Majuscule",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Verr. Maj.",escape:"Échap",pageUp:"Page supérieure",pageDown:"Page suivante",end:"Fin",home:"Origine",leftArrow:"Flèche gauche",upArrow:"Flèche haut",rightArrow:"Flèche droite",downArrow:"Flèche basse",insert:"Inser","delete":"Supprimer",leftWindowKey:"Touche Windows gauche",rightWindowKey:"Touche Windows droite",
-selectKey:"Touche Sélectionner",numpad0:"0 du pavé numérique",numpad1:"1 du pavé numérique",numpad2:"2 du pavé numérique",numpad3:"3 du pavé numérique",numpad4:"4 du pavé numérique",numpad5:"5 du pavé numérique",numpad6:"6 du pavé numérique",numpad7:"7 du pavé numérique",numpad8:"Pavé numérique 8",numpad9:"9 du pavé numérique",multiply:"Multiplier",add:"Plus",subtract:"Moins",decimalPoint:"Point décimal",divide:"Diviser",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",
-f11:"F11",f12:"F12",numLock:"Verr. Num.",scrollLock:"Arrêt défil.",semiColon:"Point-virgule",equalSign:"Signe égal",comma:"Virgule",dash:"Tiret",period:"Point",forwardSlash:"Barre oblique",graveAccent:"Accent grave",openBracket:"Parenthèse ouvrante",backSlash:"Barre oblique inverse",closeBracket:"Parenthèse fermante",singleQuote:"Apostrophe"});
\ No newline at end of file
+{name:" Aide sur l'accessibilité",legend:"Appuyer sur ${a11yHelp}"}]}],tab:"Tabulation",pause:"Pause",capslock:"Verr. Maj.",escape:"Échap",pageUp:"Page supérieure",pageDown:"Page suivante",leftArrow:"Flèche gauche",upArrow:"Flèche haut",rightArrow:"Flèche droite",downArrow:"Flèche basse",insert:"Inser",leftWindowKey:"Touche Windows gauche",rightWindowKey:"Touche Windows droite",selectKey:"Touche Sélectionner",numpad0:"0 du pavé numérique",numpad1:"1 du pavé numérique",numpad2:"2 du pavé numérique",
+numpad3:"3 du pavé numérique",numpad4:"4 du pavé numérique",numpad5:"5 du pavé numérique",numpad6:"6 du pavé numérique",numpad7:"7 du pavé numérique",numpad8:"Pavé numérique 8",numpad9:"9 du pavé numérique",multiply:"Multiplier",add:"Plus",subtract:"Moins",decimalPoint:"Point décimal",divide:"Diviser",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Verr. Num.",scrollLock:"Arrêt défil.",semiColon:"Point-virgule",equalSign:"Signe égal",
+comma:"Virgule",dash:"Tiret",period:"Point",forwardSlash:"Barre oblique",graveAccent:"Accent grave",openBracket:"Parenthèse ouvrante",backSlash:"Barre oblique inverse",closeBracket:"Parenthèse fermante",singleQuote:"Apostrophe"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
index 6a7c80837..43dc741d6 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","gl",{title:"Instrucións de accesibilidade",contents:"Axuda. Para pechar este diálogo prema ESC.",legend:[{name:"Xeral",items:[{name:"Barra de ferramentas do editor",legend:"Prema ${toolbarFocus} para navegar pola barra de ferramentas. Para moverse polos distintos grupos de ferramentas use as teclas TAB e MAIÚS+TAB. Para moverse polas distintas ferramentas use FRECHA DEREITA ou FRECHA ESQUERDA. Prema ESPAZO ou INTRO para activar o botón da barra de ferramentas."},
 {name:"Editor de diálogo",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor do menú contextual",legend:"Prema ${contextMenu} ou a TECLA MENÚ para abrir o menú contextual. A seguir móvase á seguinte opción do menú con TAB ou FRECHA ABAIXO. Móvase á opción anterior con MAIÚS + TAB ou FRECHA ARRIBA. Prema ESPAZO ou INTRO para seleccionar a opción do menú. Abra o submenú da opción actual con ESPAZO ou INTRO ou FRECHA DEREITA. Regrese ao elemento principal do menú con ESC ou FRECHA ESQUERDA. Peche o menú contextual con ESC."},
 {name:"Lista do editor",legend:"Dentro dunha lista, móvase ao seguinte elemento da lista con TAB ou FRECHA ABAIXO. Móvase ao elemento anterior da lista con MAIÚS+TAB ou FRECHA ARRIBA. Prema ESPAZO ou INTRO para escoller a opción da lista. Prema ESC para pechar a lista."},{name:"Barra da ruta ao elemento no editor",legend:"Prema ${elementsPathFocus} para navegar ata os elementos da barra de ruta. Móvase ao seguinte elemento botón con TAB ou FRECHA DEREITA. Móvase ao botón anterior con MAIÚS+TAB ou FRECHA ESQUERDA. Prema ESPAZO ou INTRO para seleccionar o elemento no editor."}]},
 {name:"Ordes",items:[{name:"Orde «desfacer»",legend:"Prema ${undo}"},{name:"Orde «refacer»",legend:"Prema ${redo}"},{name:"Orde «negra»",legend:"Prema ${bold}"},{name:"Orde «cursiva»",legend:"Prema ${italic}"},{name:"Orde «subliñar»",legend:"Prema ${underline}"},{name:"Orde «ligazón»",legend:"Prema ${link}"},{name:"Orde «contraer a barra de ferramentas»",legend:"Prema ${toolbarCollapse}"},{name:"Orde «acceder ao anterior espazo en foco»",legend:"Prema ${accessPreviousSpace} para acceder ao espazo máis próximo de foco inalcanzábel anterior ao cursor, por exemplo: dous elementos HR adxacentes. Repita a combinación de teclas para chegar a espazos de foco distantes."},
-{name:"Orde «acceder ao seguinte espazo en foco»",legend:"Prema ${accessNextSpace} para acceder ao espazo máis próximo de foco inalcanzábel posterior ao cursor, por exemplo: dous elementos HR adxacentes. Repita a combinación de teclas para chegar a espazos de foco distantes."},{name:"Axuda da accesibilidade",legend:"Prema ${a11yHelp}"}]}],backspace:"Ir atrás",tab:"Tabulador",enter:"Intro",shift:"Maiús",ctrl:"Ctrl",alt:"Alt",pause:"Pausa",capslock:"Bloq. Maiús",escape:"Escape",pageUp:"Páxina arriba",
-pageDown:"Páxina abaixo",end:"Fin",home:"Inicio",leftArrow:"Frecha esquerda",upArrow:"Frecha arriba",rightArrow:"Frecha dereita",downArrow:"Frecha abaixo",insert:"Inserir","delete":"Supr",leftWindowKey:"Tecla Windows esquerda",rightWindowKey:"Tecla Windows dereita",selectKey:"Escolla a tecla",numpad0:"Tec. numérico 0",numpad1:"Tec. numérico 1",numpad2:"Tec. numérico 2",numpad3:"Tec. numérico 3",numpad4:"Tec. numérico 4",numpad5:"Tec. numérico 5",numpad6:"Tec. numérico 6",numpad7:"Tec. numérico 7",
-numpad8:"Tec. numérico 8",numpad9:"Tec. numérico 9",multiply:"Multiplicar",add:"Sumar",subtract:"Restar",decimalPoint:"Punto decimal",divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloq. num.",scrollLock:"Bloq. despraz.",semiColon:"Punto e coma",equalSign:"Signo igual",comma:"Coma",dash:"Guión",period:"Punto",forwardSlash:"Barra inclinada",graveAccent:"Acento grave",openBracket:"Abrir corchete",backSlash:"Barra invertida",
-closeBracket:"Pechar corchete",singleQuote:"Comiña simple"});
\ No newline at end of file
+{name:"Orde «acceder ao seguinte espazo en foco»",legend:"Prema ${accessNextSpace} para acceder ao espazo máis próximo de foco inalcanzábel posterior ao cursor, por exemplo: dous elementos HR adxacentes. Repita a combinación de teclas para chegar a espazos de foco distantes."},{name:"Axuda da accesibilidade",legend:"Prema ${a11yHelp}"}]}],tab:"Tabulador",pause:"Pausa",capslock:"Bloq. Maiús",escape:"Escape",pageUp:"Páxina arriba",pageDown:"Páxina abaixo",leftArrow:"Frecha esquerda",upArrow:"Frecha arriba",
+rightArrow:"Frecha dereita",downArrow:"Frecha abaixo",insert:"Inserir",leftWindowKey:"Tecla Windows esquerda",rightWindowKey:"Tecla Windows dereita",selectKey:"Escolla a tecla",numpad0:"Tec. numérico 0",numpad1:"Tec. numérico 1",numpad2:"Tec. numérico 2",numpad3:"Tec. numérico 3",numpad4:"Tec. numérico 4",numpad5:"Tec. numérico 5",numpad6:"Tec. numérico 6",numpad7:"Tec. numérico 7",numpad8:"Tec. numérico 8",numpad9:"Tec. numérico 9",multiply:"Multiplicar",add:"Sumar",subtract:"Restar",decimalPoint:"Punto decimal",
+divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloq. num.",scrollLock:"Bloq. despraz.",semiColon:"Punto e coma",equalSign:"Signo igual",comma:"Coma",dash:"Guión",period:"Punto",forwardSlash:"Barra inclinada",graveAccent:"Acento grave",openBracket:"Abrir corchete",backSlash:"Barra invertida",closeBracket:"Pechar corchete",singleQuote:"Comiña simple"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
index 54e2ec285..f6e83f36a 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","gu",{title:"એક્ક્ષેબિલિટી ની વિગતો",contents:"હેલ્પ. આ બંધ કરવા ESC દબાવો.",legend:[{name:"જનરલ",items:[{name:"એડિટર ટૂલબાર",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"એડિટર ડાયલોગ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"કમાંડસ",items:[{name:"અન્ડું કમાંડ",legend:"$ દબાવો {undo}"},{name:"ફરી કરો કમાંડ",legend:"$ દબાવો {redo}"},{name:"બોલ્દનો કમાંડ",legend:"$ દબાવો {bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
index bd63abe2f..9c86b8c08 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","he",{title:"הוראות נגישות",contents:"הוראות נגישות. לסגירה לחץ אסקייפ (ESC).",legend:[{name:"כללי",items:[{name:"סרגל הכלים",legend:"לחץ על ${toolbarFocus} כדי לנווט לסרגל הכלים. עבור לכפתור הבא עם מקש הטאב (TAB) או חץ שמאלי. עבור לכפתור הקודם עם מקש השיפט (SHIFT) + טאב (TAB) או חץ ימני. לחץ רווח או אנטר (ENTER) כדי להפעיל את הכפתור הנבחר."},{name:"דיאלוגים (חלונות תשאול)",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"תפריט ההקשר (Context Menu)",legend:"לחץ ${contextMenu} או APPLICATION KEYכדי לפתוח את תפריט ההקשר. עבור לאפשרות הבאה עם טאב (TAB) או חץ למטה. עבור לאפשרות הקודמת עם שיפט (SHIFT) + טאב (TAB) או חץ למעלה. לחץ רווח או אנטר (ENTER) כדי לבחור את האפשרות. פתח את תת התפריט (Sub-menu) של האפשרות הנוכחית עם רווח או אנטר (ENTER) או חץ שמאלי. חזור לתפריט האב עם אסקייפ (ESC) או חץ שמאלי. סגור את תפריט ההקשר עם אסקייפ (ESC)."},{name:"תפריטים צפים (List boxes)",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"עץ אלמנטים (Elements Path)",legend:"לחץ ${elementsPathFocus} כדי לנווט לעץ האלמנטים. עבור לפריט הבא עם טאב (TAB) או חץ ימני. עבור לפריט הקודם עם שיפט (SHIFT) + טאב (TAB) או חץ שמאלי. לחץ רווח או אנטר (ENTER) כדי לבחור את האלמנט בעורך."}]},{name:"פקודות",items:[{name:" ביטול צעד אחרון",legend:"לחץ ${undo}"},{name:" חזרה על צעד אחרון",legend:"לחץ ${redo}"},{name:" הדגשה",legend:"לחץ ${bold}"},{name:" הטייה",legend:"לחץ ${italic}"},{name:" הוספת קו תחתון",legend:"לחץ ${underline}"},{name:" הוספת לינק",
 legend:"לחץ ${link}"},{name:" כיווץ סרגל הכלים",legend:"לחץ ${toolbarCollapse}"},{name:"גישה למיקום המיקוד הקודם",legend:"לחץ ${accessPreviousSpace} כדי לגשת למיקום המיקוד הלא-נגיש הקרוב לפני הסמן, למשל בין שני אלמנטים סמוכים מסוג HR. חזור על צירוף מקשים זה כדי להגיע למקומות מיקוד רחוקים יותר."},{name:"גישה למיקום המיקוד הבא",legend:"לחץ ${accessNextSpace} כדי לגשת למיקום המיקוד הלא-נגיש הקרוב אחרי הסמן, למשל בין שני אלמנטים סמוכים מסוג HR. חזור על צירוף מקשים זה כדי להגיע למקומות מיקוד רחוקים יותר."},
-{name:" הוראות נגישות",legend:"לחץ ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"חץ שמאלה",upArrow:"חץ למעלה",rightArrow:"חץ ימינה",downArrow:"חץ למטה",insert:"הכנס","delete":"מחק",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"בחר מקש",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",
-numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"הוסף",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"סלאש",graveAccent:"Grave Accent",
-openBracket:"Open Bracket",backSlash:"סלאש הפוך",closeBracket:"Close Bracket",singleQuote:"ציטוט יחיד"});
\ No newline at end of file
+{name:" הוראות נגישות",legend:"לחץ ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"חץ שמאלה",upArrow:"חץ למעלה",rightArrow:"חץ ימינה",downArrow:"חץ למטה",insert:"הכנס",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"בחר מקש",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",
+numpad9:"Numpad 9",multiply:"Multiply",add:"הוסף",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"סלאש",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"סלאש הפוך",closeBracket:"Close Bracket",singleQuote:"ציטוט יחיד"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
index 9f0d6bea5..5443d24b6 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hi",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"सामान्य",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
index 92ba67202..7434d616c 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hr",{title:"Upute dostupnosti",contents:"Sadržaj pomoći. Za zatvaranje pritisnite ESC.",legend:[{name:"Općenito",items:[{name:"Alatna traka",legend:"Pritisni ${toolbarFocus} za navigaciju do alatne trake. Pomicanje do prethodne ili sljedeće alatne grupe vrši se pomoću SHIFT+TAB i TAB. Pomicanje do prethodnog ili sljedećeg gumba u alatnoj traci vrši se pomoću lijeve i desne strelice kursora. Pritisnite SPACE ili ENTER za aktivaciju alatne trake."},{name:"Dijalog",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Kontekstni izbornik",legend:"Pritisnite ${contextMenu} ili APPLICATION tipku za otvaranje kontekstnog izbornika. Pomicanje se vrši TAB ili strelicom kursora prema dolje ili SHIFT+TAB ili strelica kursora prema gore. SPACE ili ENTER odabiru opciju izbornika. Otvorite podizbornik trenutne opcije sa  SPACE, ENTER ili desna strelica kursora. Povratak na prethodni izbornik vrši se sa ESC ili lijevom strelicom kursora. Zatvaranje se vrši pritiskom na tipku ESC."},
 {name:"Lista",legend:"Unutar list-boxa, pomicanje na sljedeću stavku vrši se sa TAB ili strelica kursora prema dolje. Na prethodnu sa SHIFT+TAB ili strelica prema gore. Pritiskom na SPACE ili ENTER odabire se stavka ili ESC za zatvaranje."},{name:"Traka putanje elemenata",legend:"Pritisnite ${elementsPathFocus} za navigaciju po putanji elemenata. Pritisnite TAB ili desnu strelicu kursora za pomicanje na sljedeći element ili SHIFT+TAB ili lijeva strelica kursora za pomicanje na prethodni element. Pritiskom na SPACE ili ENTER vrši se odabir elementa."}]},
 {name:"Naredbe",items:[{name:"Vrati naredbu",legend:"Pritisni ${undo}"},{name:"Ponovi naredbu",legend:"Pritisni ${redo}"},{name:"Bold naredba",legend:"Pritisni ${bold}"},{name:"Italic naredba",legend:"Pritisni ${italic}"},{name:"Underline naredba",legend:"Pritisni ${underline}"},{name:"Link naredba",legend:"Pritisni ${link}"},{name:"Smanji alatnu traku naredba",legend:"Pritisni ${toolbarCollapse}"},{name:"Access previous focus space naredba",legend:"Pritisni ${accessPreviousSpace} za pristup najbližem nedostupnom razmaku prije kursora, npr.: dva spojena HR elementa. Ponovnim pritiskom dohvatiti će se sljedeći nedostupni razmak."},
-{name:"Access next focus space naredba",legend:"Pritisni ${accessNextSpace} za pristup najbližem nedostupnom razmaku nakon kursora, npr.: dva spojena HR elementa. Ponovnim pritiskom dohvatiti će se sljedeći nedostupni razmak."},{name:"Pomoć za dostupnost",legend:"Pritisni ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",
-upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
-f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Access next focus space naredba",legend:"Pritisni ${accessNextSpace} za pristup najbližem nedostupnom razmaku nakon kursora, npr.: dva spojena HR elementa. Ponovnim pritiskom dohvatiti će se sljedeći nedostupni razmak."},{name:"Pomoć za dostupnost",legend:"Pritisni ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",
+rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",
+equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
index 81c48da19..b547453ae 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hu",{title:"Kisegítő utasítások",contents:"Súgó tartalmak. A párbeszédablak bezárásához nyomjon ESC-et.",legend:[{name:"Általános",items:[{name:"Szerkesztő Eszköztár",legend:"Nyomjon ${toolbarFocus} hogy kijelölje az eszköztárat. A következő és előző eszköztár csoporthoz a TAB és SHIFT+TAB-al juthat el. A következő és előző eszköztár gombhoz a BAL NYÍL vagy JOBB NYÍL gombbal juthat el. Nyomjon SPACE-t vagy ENTER-t hogy aktiválja az eszköztár gombot."},{name:"Szerkesző párbeszéd ablak",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Szerkesztő helyi menü",legend:"Nyomjon ${contextMenu}-t vagy ALKALMAZÁS BILLENTYŰT a helyi menü megnyitásához. Ezután a következő menüpontra léphet a TAB vagy LEFELÉ NYÍLLAL. Az előző opciót a SHIFT+TAB vagy FELFELÉ NYÍLLAL érheti el. Nyomjon SPACE-t vagy ENTER-t a menüpont kiválasztásához. A jelenlegi menüpont almenüjének megnyitásához nyomjon SPACE-t vagy ENTER-t, vagy JOBB NYILAT. A főmenühöz való visszatéréshez nyomjon ESC-et vagy BAL NYILAT. A helyi menü bezárása az ESC billentyűvel lehetséges."},
 {name:"Szerkesztő lista",legend:"A listán belül a következő elemre a TAB vagy LEFELÉ NYÍLLAL mozoghat. Az előző elem kiválasztásához nyomjon SHIFT+TAB-ot vagy FELFELÉ NYILAT. Nyomjon SPACE-t vagy ENTER-t az elem kiválasztásához. Az ESC billentyű megnyomásával bezárhatja a listát."},{name:"Szerkesztő elem utak sáv",legend:"Nyomj ${elementsPathFocus} hogy kijelöld a elemek út sávját. A következő elem gombhoz a TAB-al vagy a JOBB NYÍLLAL juthatsz el. Az előző gombhoz a SHIFT+TAB vagy BAL NYÍLLAL mehetsz. A SPACE vagy ENTER billentyűvel kiválaszthatod az elemet a szerkesztőben."}]},
 {name:"Parancsok",items:[{name:"Parancs visszavonása",legend:"Nyomj ${undo}"},{name:"Parancs megismétlése",legend:"Nyomjon ${redo}"},{name:"Félkövér parancs",legend:"Nyomjon ${bold}"},{name:"Dőlt parancs",legend:"Nyomjon ${italic}"},{name:"Aláhúzott parancs",legend:"Nyomjon ${underline}"},{name:"Link parancs",legend:"Nyomjon ${link}"},{name:"Szerkesztősáv összecsukása parancs",legend:"Nyomjon ${toolbarCollapse}"},{name:"Hozzáférés az előző fókusz helyhez parancs",legend:"Nyomj ${accessNextSpace} hogy hozzáférj a legközelebbi elérhetetlen fókusz helyhez a hiányjel előtt, például: két szomszédos HR elemhez. Ismételd meg a billentyűkombinációt hogy megtaláld a távolabbi fókusz helyeket."},
-{name:"Hozzáférés a következő fókusz helyhez parancs",legend:"Nyomj ${accessNextSpace} hogy hozzáférj a legközelebbi elérhetetlen fókusz helyhez a hiányjel után, például: két szomszédos HR elemhez. Ismételd meg a billentyűkombinációt hogy megtaláld a távolabbi fókusz helyeket."},{name:"Kisegítő súgó",legend:"Nyomjon ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"balra nyíl",upArrow:"felfelé nyíl",rightArrow:"jobbra nyíl",downArrow:"lefelé nyíl",insert:"Insert","delete":"Delete",leftWindowKey:"bal Windows-billentyű",rightWindowKey:"jobb Windows-billentyű",selectKey:"Billentyű választása",numpad0:"Számbillentyűk 0",numpad1:"Számbillentyűk 1",numpad2:"Számbillentyűk 2",numpad3:"Számbillentyűk 3",numpad4:"Számbillentyűk 4",numpad5:"Számbillentyűk 5",numpad6:"Számbillentyűk 6",numpad7:"Számbillentyűk 7",numpad8:"Számbillentyűk 8",
-numpad9:"Számbillentyűk 9",multiply:"Szorzás",add:"Hozzáadás",subtract:"Kivonás",decimalPoint:"Tizedespont",divide:"Osztás",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Pontosvessző",equalSign:"Egyenlőségjel",comma:"Vessző",dash:"Kötőjel",period:"Pont",forwardSlash:"Perjel",graveAccent:"Visszafelé dőlő ékezet",openBracket:"Nyitó szögletes zárójel",backSlash:"fordított perjel",closeBracket:"Záró szögletes zárójel",
-singleQuote:"szimpla idézőjel"});
\ No newline at end of file
+{name:"Hozzáférés a következő fókusz helyhez parancs",legend:"Nyomj ${accessNextSpace} hogy hozzáférj a legközelebbi elérhetetlen fókusz helyhez a hiányjel után, például: két szomszédos HR elemhez. Ismételd meg a billentyűkombinációt hogy megtaláld a távolabbi fókusz helyeket."},{name:"Kisegítő súgó",legend:"Nyomjon ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"balra nyíl",upArrow:"felfelé nyíl",rightArrow:"jobbra nyíl",
+downArrow:"lefelé nyíl",insert:"Insert",leftWindowKey:"bal Windows-billentyű",rightWindowKey:"jobb Windows-billentyű",selectKey:"Billentyű választása",numpad0:"Számbillentyűk 0",numpad1:"Számbillentyűk 1",numpad2:"Számbillentyűk 2",numpad3:"Számbillentyűk 3",numpad4:"Számbillentyűk 4",numpad5:"Számbillentyűk 5",numpad6:"Számbillentyűk 6",numpad7:"Számbillentyűk 7",numpad8:"Számbillentyűk 8",numpad9:"Számbillentyűk 9",multiply:"Szorzás",add:"Hozzáadás",subtract:"Kivonás",decimalPoint:"Tizedespont",
+divide:"Osztás",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Pontosvessző",equalSign:"Egyenlőségjel",comma:"Vessző",dash:"Kötőjel",period:"Pont",forwardSlash:"Perjel",graveAccent:"Visszafelé dőlő ékezet",openBracket:"Nyitó szögletes zárójel",backSlash:"fordított perjel",closeBracket:"Záró szögletes zárójel",singleQuote:"szimpla idézőjel"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
index c8d5686ba..8177096a4 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.plugins.setLang("a11yhelp","id",{title:"Accessibility Instructions",contents:"Bantuan. Tekan ESC untuk menutup dialog ini.",legend:[{name:"Umum",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","id",{title:"Instruksi Accessibility",contents:"Bantuan. Tekan ESC untuk menutup dialog ini.",legend:[{name:"Umum",items:[{name:"Toolbar Editor",legend:"Tekan ${toolbarFocus} untuk berpindah ke toolbar. Untuk berpindah ke group toolbar selanjutnya dan sebelumnya gunakan TAB dan SHIFT+TAB. Untuk berpindah ke tombol toolbar selanjutnya dan sebelumnya gunakan RIGHT ARROW atau LEFT ARROW. Tekan SPASI atau ENTER untuk mengaktifkan tombol toolbar."},{name:"Dialog Editor",
+legend:"Pada jendela dialog, tekan TAB untuk berpindah pada elemen dialog selanjutnya, tekan SHIFT+TAB untuk berpindah pada elemen dialog sebelumnya, tekan ENTER untuk submit dialog, tekan ESC untuk membatalkan dialog. Pada dialog dengan multi tab, daftar tab dapat diakses dengan ALT+F10 ataupun dengan tombol TAB sesuai urutan tab pada dialog. Jika daftar tab aktif terpilih, untuk berpindah tab dapat menggunakan RIGHT dan LEFT ARROW."},{name:"Context Menu Editor",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"List Box Editor",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",
+rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",
+equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
index 5151f605d..882487438 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","it",{title:"Istruzioni di Accessibilità",contents:"Contenuti di Aiuto. Per chiudere questa finestra premi ESC.",legend:[{name:"Generale",items:[{name:"Barra degli strumenti Editor",legend:"Premere ${toolbarFocus} per passare alla barra degli strumenti. Usare TAB per spostarsi al gruppo successivo, MAIUSC+TAB per spostarsi a quello precedente. Usare FRECCIA DESTRA per spostarsi al pulsante successivo, FRECCIA SINISTRA per spostarsi a quello precedente. Premere SPAZIO o INVIO per attivare il pulsante della barra degli strumenti."},
@@ -7,7 +7,7 @@ CKEDITOR.plugins.setLang("a11yhelp","it",{title:"Istruzioni di Accessibilità",c
 {name:"Menù contestuale Editor",legend:"Premi ${contextMenu} o TASTO APPLICAZIONE per aprire il menu contestuale. Dunque muoviti all'opzione successiva del menu con il tasto TAB o con la Freccia Sotto. Muoviti all'opzione precedente con  MAIUSC+TAB o con Freccia Sopra. Premi SPAZIO o INVIO per scegliere l'opzione di menu. Apri il sottomenu dell'opzione corrente con SPAZIO o INVIO oppure con la Freccia Destra. Torna indietro al menu superiore con ESC oppure Freccia Sinistra. Chiudi il menu contestuale con ESC."},
 {name:"Box Lista Editor",legend:"All'interno di un elenco di opzioni, per spostarsi all'elemento successivo premere TAB oppure FRECCIA GIÙ. Per spostarsi all'elemento precedente usare SHIFT+TAB oppure FRECCIA SU. Premere SPAZIO o INVIO per selezionare l'elemento della lista. Premere ESC per chiudere l'elenco di opzioni."},{name:"Barra percorso elementi editor",legend:"Premere ${elementsPathFocus} per passare agli elementi della barra del percorso. Usare TAB o FRECCIA DESTRA per passare al pulsante successivo. Per passare al pulsante precedente premere MAIUSC+TAB o FRECCIA SINISTRA. Premere SPAZIO o INVIO per selezionare l'elemento nell'editor."}]},
 {name:"Comandi",items:[{name:" Annulla comando",legend:"Premi ${undo}"},{name:" Ripeti comando",legend:"Premi ${redo}"},{name:" Comando Grassetto",legend:"Premi ${bold}"},{name:" Comando Corsivo",legend:"Premi ${italic}"},{name:" Comando Sottolineato",legend:"Premi ${underline}"},{name:" Comando Link",legend:"Premi ${link}"},{name:" Comando riduci barra degli strumenti",legend:"Premi ${toolbarCollapse}"},{name:"Comando di accesso al precedente spazio di focus",legend:"Premi ${accessPreviousSpace} per accedere il più vicino spazio di focus non raggiungibile prima del simbolo caret, per esempio due elementi HR adiacenti. Ripeti la combinazione di tasti per raggiungere spazi di focus distanti."},
-{name:"Comando di accesso al prossimo spazio di focus",legend:"Premi ${accessNextSpace} per accedere il più vicino spazio di focus non raggiungibile dopo il simbolo caret, per esempio due elementi HR adiacenti. Ripeti la combinazione di tasti per raggiungere spazi di focus distanti."},{name:" Aiuto Accessibilità",legend:"Premi ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Invio",shift:"Maiusc",ctrl:"Ctrl",alt:"Alt",pause:"Pausa",capslock:"Bloc Maiusc",escape:"Esc",pageUp:"Pagina sù",pageDown:"Pagina giù",
-end:"Fine",home:"Inizio",leftArrow:"Freccia sinistra",upArrow:"Freccia su",rightArrow:"Freccia destra",downArrow:"Freccia giù",insert:"Ins","delete":"Canc",leftWindowKey:"Tasto di Windows sinistro",rightWindowKey:"Tasto di Windows destro",selectKey:"Tasto di selezione",numpad0:"0 sul tastierino numerico",numpad1:"1 sul tastierino numerico",numpad2:"2 sul tastierino numerico",numpad3:"3 sul tastierino numerico",numpad4:"4 sul tastierino numerico",numpad5:"5 sul tastierino numerico",numpad6:"6 sul tastierino numerico",
-numpad7:"7 sul tastierino numerico",numpad8:"8 sul tastierino numerico",numpad9:"9 sul tastierino numerico",multiply:"Moltiplicazione",add:"Più",subtract:"Sottrazione",decimalPoint:"Punto decimale",divide:"Divisione",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloc Num",scrollLock:"Bloc Scorr",semiColon:"Punto-e-virgola",equalSign:"Segno di uguale",comma:"Virgola",dash:"Trattino",period:"Punto",forwardSlash:"Barra",graveAccent:"Accento grave",
-openBracket:"Parentesi quadra aperta",backSlash:"Barra rovesciata",closeBracket:"Parentesi quadra chiusa",singleQuote:"Apostrofo"});
\ No newline at end of file
+{name:"Comando di accesso al prossimo spazio di focus",legend:"Premi ${accessNextSpace} per accedere il più vicino spazio di focus non raggiungibile dopo il simbolo caret, per esempio due elementi HR adiacenti. Ripeti la combinazione di tasti per raggiungere spazi di focus distanti."},{name:" Aiuto Accessibilità",legend:"Premi ${a11yHelp}"}]}],tab:"Tab",pause:"Pausa",capslock:"Bloc Maiusc",escape:"Esc",pageUp:"Pagina sù",pageDown:"Pagina giù",leftArrow:"Freccia sinistra",upArrow:"Freccia su",rightArrow:"Freccia destra",
+downArrow:"Freccia giù",insert:"Ins",leftWindowKey:"Tasto di Windows sinistro",rightWindowKey:"Tasto di Windows destro",selectKey:"Tasto di selezione",numpad0:"0 sul tastierino numerico",numpad1:"1 sul tastierino numerico",numpad2:"2 sul tastierino numerico",numpad3:"3 sul tastierino numerico",numpad4:"4 sul tastierino numerico",numpad5:"5 sul tastierino numerico",numpad6:"6 sul tastierino numerico",numpad7:"7 sul tastierino numerico",numpad8:"8 sul tastierino numerico",numpad9:"9 sul tastierino numerico",
+multiply:"Moltiplicazione",add:"Più",subtract:"Sottrazione",decimalPoint:"Punto decimale",divide:"Divisione",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Bloc Num",scrollLock:"Bloc Scorr",semiColon:"Punto-e-virgola",equalSign:"Segno di uguale",comma:"Virgola",dash:"Trattino",period:"Punto",forwardSlash:"Barra",graveAccent:"Accento grave",openBracket:"Parentesi quadra aperta",backSlash:"Barra rovesciata",closeBracket:"Parentesi quadra chiusa",
+singleQuote:"Apostrofo"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
index ec5ed673c..abcca247f 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ja",{title:"ユーザー補助の説明",contents:"ヘルプ　このダイアログを閉じるには ESCを押してください。",legend:[{name:"全般",items:[{name:"エディターツールバー",legend:"${toolbarFocus} を押すとツールバーのオン/オフ操作ができます。カーソルをツールバーのグループで移動させるにはTabかSHIFT+Tabを押します。グループ内でカーソルを移動させるには、右カーソルか左カーソルを押します。スペースキーやエンターを押すとボタンを有効/無効にすることができます。"},{name:"編集ダイアログ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"エディターのメニュー",legend:"${contextMenu} キーかAPPLICATION KEYを押すとコンテキストメニューが開きます。Tabか下カーソルでメニューのオプション選択が下に移動します。戻るには、SHIFT+Tabか上カーソルです。スペースもしくはENTERキーでメニューオプションを決定できます。現在選んでいるオプションのサブメニューを開くには、スペース、もしくは右カーソルを押します。サブメニューから親メニューに戻るには、ESCか左カーソルを押してください。ESCでコンテキストメニュー自体をキャンセルできます。"},{name:"エディターリストボックス",legend:"リストボックス内で移動するには、Tabか下カーソルで次のアイテムへ移動します。SHIFT+Tabで前のアイテムに戻ります。リストのオプションを選択するには、スペースもしくは、ENTERを押してください。リストボックスを閉じるには、ESCを押してください。"},{name:"エディター要素パスバー",legend:"${elementsPathFocus} を押すとエレメントパスバーを操作出来ます。Tabか右カーソルで次のエレメントを選択できます。前のエレメントを選択するには、SHIFT+Tabか左カーソルです。スペースもしくは、ENTERでエディタ内の対象エレメントを選択出来ます。"}]},
 {name:"コマンド",items:[{name:"元に戻す",legend:"${undo} をクリック"},{name:"やり直し",legend:"${redo} をクリック"},{name:"太字",legend:"${bold} をクリック"},{name:"斜体 ",legend:"${italic} をクリック"},{name:"下線",legend:"${underline} をクリック"},{name:"リンク",legend:"${link} をクリック"},{name:"ツールバーを縮める",legend:"${toolbarCollapse} をクリック"},{name:"前のカーソル移動のできないポイントへ",legend:"${accessPreviousSpace} を押すとカーソルより前にあるカーソルキーで入り込めないスペースへ移動できます。例えば、HRエレメントが2つ接している場合などです。離れた場所へは、複数回キーを押します。"},{name:"次のカーソル移動のできないポイントへ",legend:"${accessNextSpace} を押すとカーソルより後ろにあるカーソルキーで入り込めないスペースへ移動できます。例えば、HRエレメントが2つ接している場合などです。離れた場所へは、複数回キーを押します。"},
-{name:"ユーザー補助ヘルプ",legend:"${a11yHelp} をクリック"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"左矢印",upArrow:"上矢印",rightArrow:"右矢印",downArrow:"下矢印",insert:"Insert","delete":"Delete",leftWindowKey:"左Windowキー",rightWindowKey:"右のWindowキー",selectKey:"Select",numpad0:"Num 0",numpad1:"Num 1",numpad2:"Num 2",numpad3:"Num 3",numpad4:"Num 4",numpad5:"Num 5",
-numpad6:"Num 6",numpad7:"Num 7",numpad8:"Num 8",numpad9:"Num 9",multiply:"掛ける",add:"足す",subtract:"引く",decimalPoint:"小数点",divide:"割る",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"セミコロン",equalSign:"イコール記号",comma:"カンマ",dash:"ダッシュ",period:"ピリオド",forwardSlash:"フォワードスラッシュ",graveAccent:"グレイヴアクセント",openBracket:"開きカッコ",backSlash:"バックスラッシュ",closeBracket:"閉じカッコ",singleQuote:"シングルクォート"});
\ No newline at end of file
+{name:"ユーザー補助ヘルプ",legend:"${a11yHelp} をクリック"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"左矢印",upArrow:"上矢印",rightArrow:"右矢印",downArrow:"下矢印",insert:"Insert",leftWindowKey:"左Windowキー",rightWindowKey:"右のWindowキー",selectKey:"Select",numpad0:"Num 0",numpad1:"Num 1",numpad2:"Num 2",numpad3:"Num 3",numpad4:"Num 4",numpad5:"Num 5",numpad6:"Num 6",numpad7:"Num 7",numpad8:"Num 8",numpad9:"Num 9",multiply:"掛ける",add:"足す",subtract:"引く",decimalPoint:"小数点",
+divide:"割る",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"セミコロン",equalSign:"イコール記号",comma:"カンマ",dash:"ダッシュ",period:"ピリオド",forwardSlash:"フォワードスラッシュ",graveAccent:"グレイヴアクセント",openBracket:"開きカッコ",backSlash:"バックスラッシュ",closeBracket:"閉じカッコ",singleQuote:"シングルクォート"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
index 6b6e7a928..203551215 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","km",{title:"Accessibility Instructions",contents:"មាតិកា​ជំនួយ។ ដើម្បី​បិទ​ផ្ទាំង​នេះ សូម​ចុច ESC ។",legend:[{name:"ទូទៅ",items:[{name:"របារ​ឧបករណ៍​កម្មវិធី​និពន្ធ",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"ផ្ទាំង​កម្មវិធីនិពន្ធ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"ម៉ីនុយបរិបទអ្នកកែសម្រួល",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"ប្រអប់បញ្ជីអ្នកកែសម្រួល",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"ពាក្យបញ្ជា",items:[{name:"ការ​បញ្ជា​មិនធ្វើវិញ",legend:"ចុច ${undo}"},{name:"ការបញ្ជា​ធ្វើវិញ",legend:"ចុច ${redo}"},{name:"ការបញ្ជា​អក្សរ​ដិត",legend:"ចុច ${bold}"},{name:"ការបញ្ជា​អក្សរ​ទ្រេត",legend:"ចុច ${italic}"},{name:"ពាក្យបញ្ជា​បន្ទាត់​ពីក្រោម",
 legend:"ចុច ${underline}"},{name:"ពាក្យបញ្ជា​តំណ",legend:"ចុច ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:"ជំនួយ​ពី​ភាព​ងាយស្រួល",legend:"ជួយ ${a11yHelp}"}]}],backspace:"លុបថយក្រោយ",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"ផ្អាក",capslock:"Caps Lock",escape:"ចាកចេញ",pageUp:"ទំព័រ​លើ",pageDown:"ទំព័រ​ក្រោម",end:"ចុង",home:"ផ្ទះ",leftArrow:"ព្រួញ​ឆ្វេង",upArrow:"ព្រួញ​លើ",rightArrow:"ព្រួញ​ស្ដាំ",downArrow:"ព្រួញ​ក្រោម",insert:"បញ្ចូល","delete":"លុប",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"ជ្រើស​គ្រាប់​ចុច",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"គុណ",add:"បន្ថែម",subtract:"ដក",decimalPoint:"ចំណុចទសភាគ",divide:"ចែក",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"បិទ​រំកិល",semiColon:"ចុច​ក្បៀស",equalSign:"សញ្ញា​អឺរ៉ូ",comma:"ក្បៀស",dash:"Dash",period:"ចុច",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",
-openBracket:"តង្កៀប​បើក",backSlash:"Backslash",closeBracket:"តង្កៀប​បិទ",singleQuote:"បន្តក់​មួយ"});
\ No newline at end of file
+{name:"ជំនួយ​ពី​ភាព​ងាយស្រួល",legend:"ជួយ ${a11yHelp}"}]}],tab:"Tab",pause:"ផ្អាក",capslock:"Caps Lock",escape:"ចាកចេញ",pageUp:"ទំព័រ​លើ",pageDown:"ទំព័រ​ក្រោម",leftArrow:"ព្រួញ​ឆ្វេង",upArrow:"ព្រួញ​លើ",rightArrow:"ព្រួញ​ស្ដាំ",downArrow:"ព្រួញ​ក្រោម",insert:"បញ្ចូល",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"ជ្រើស​គ្រាប់​ចុច",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"គុណ",add:"បន្ថែម",subtract:"ដក",decimalPoint:"ចំណុចទសភាគ",divide:"ចែក",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"បិទ​រំកិល",semiColon:"ចុច​ក្បៀស",equalSign:"សញ្ញា​អឺរ៉ូ",comma:"ក្បៀស",dash:"Dash",period:"ចុច",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"តង្កៀប​បើក",backSlash:"Backslash",closeBracket:"តង្កៀប​បិទ",singleQuote:"បន្តក់​មួយ"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
index 9b2b07031..f493dc141 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ko",{title:"접근성 설명",contents:"도움말. 이 창을 닫으시려면 ESC 를 누르세요.",legend:[{name:"일반",items:[{name:"편집기 툴바",legend:"툴바를 탐색하시려면 ${toolbarFocus} 를 투르세요. 이전/다음 툴바 그룹으로 이동하시려면 TAB 키 또는 SHIFT+TAB 키를 누르세요. 이전/다음 툴바 버튼으로 이동하시려면 오른쪽 화살표 키 또는 왼쪽 화살표 키를 누르세요. 툴바 버튼을 활성화 하려면 SPACE 키 또는 ENTER 키를 누르세요."},{name:"편집기 다이얼로그",legend:"TAB 키를 누르면 다음 대화상자로 이동하고, SHIFT+TAB 키를 누르면 이전 대화상자로 이동합니다. 대화상자를 제출하려면 ENTER 키를 누르고, ESC 키를 누르면 대화상자를 취소합니다. 대화상자에 탭이 여러개 있을 때, ALT+F10 키 또는 TAB 키를 누르면 순서에 따라 탭 목록에 도달할 수 있습니다. 탭 목록에 초점이 맞을 때, 오른쪽과 왼쪽 화살표 키를 이용하면 각각 다음과 이전 탭으로 이동할 수 있습니다."},
 {name:"편집기 환경 메뉴",legend:"${contextMenu} 또는 어플리케이션 키를 누르면 환경-메뉴를 열 수 있습니다. 환경-메뉴에서 TAB 키 또는 아래 화살표 키를 누르면 다음 메뉴 옵션으로 이동할 수 있습니다. 이전 옵션으로 이동은 SHIFT+TAB 키 또는 위 화살표 키를 눌러서 할 수 있습니다. 스페이스 키 또는 ENTER 키를 눌러서 메뉴 옵션을 선택할 수 있습니다. 스페이스 키 또는 ENTER 키 또는 오른쪽 화살표 키를 눌러서 하위 메뉴를 열 수 있습니다. 부모 메뉴 항목으로 돌아가려면 ESC 키 또는 왼쪽 화살표 키를 누릅니다. ESC 키를 눌러서 환경-메뉴를 닫습니다."},{name:"편집기 목록 박스",legend:"리스트-박스 내에서, 목록의 다음 항목으로 이동하려면 TAB 키 또는 아래쪽 화살표 키를 누릅니다. 목록의 이전 항목으로 이동하려면 SHIFT+TAB 키 또는 위쪽 화살표 키를 누릅니다. 스페이스 키 또는 ENTER 키를 누르면 목록의 해당 옵션을 선택합니다. ESC 키를 눌러서 리스트-박스를 닫을 수 있습니다."},
 {name:"편집기 요소 경로 막대",legend:"${elementsPathFocus}를 눌러서 요소 경로 막대를 탐색할 수 있습니다. 다음 요소로 이동하려면 TAB 키 또는 오른쪽 화살표 키를 누릅니다. SHIFT+TAB 키 또는 왼쪽 화살표 키를 누르면 이전 버튼으로 이동할 수 있습니다. 스페이스 키나 ENTER 키를 누르면 편집기의 해당 항목을 선택합니다."}]},{name:"명령",items:[{name:" 명령 실행 취소",legend:"${undo} 누르시오"},{name:" 명령 다시 실행",legend:"${redo} 누르시오"},{name:" 굵게 명령",legend:"${bold} 누르시오"},{name:" 기울임 꼴 명령",legend:"${italic} 누르시오"},{name:" 밑줄 명령",legend:"${underline} 누르시오"},{name:" 링크 명령",legend:"${link} 누르시오"},{name:" 툴바 줄이기 명령",legend:"${toolbarCollapse} 누르시오"},
-{name:" 이전 포커스 공간 접근 명령",legend:"탈자 기호(^) 이전에 ${accessPreviousSpace} 를 누르면, 접근 불가능하면서 가장 가까운 포커스 영역에 접근합니다. 예를 들면, 두 인접한 HR 요소가 있습니다. 키 조합을 반복해서 멀리있는 포커스 영역들에 도달할 수 있습니다."},{name:"다음 포커스 공간 접근 명령",legend:"탈자 기호(^) 다음에 ${accessNextSpace} 를 누르면, 접근 불가능하면서 가장 가까운 포커스 영역에 접근합니다. 예를 들면, 두 인접한 HR 요소가 있습니다. 키 조합을 반복해서 멀리있는 포커스 영역들에 도달할 수 있습니다. "},{name:" 접근성 도움말",legend:"${a11yHelp} 누르시오"}]}],backspace:"Backspace 키",tab:"탭 키",enter:"엔터 키",shift:"시프트 키",ctrl:"컨트롤 키",alt:"알트 키",pause:"일시정지 키",capslock:"캡스 록 키",
-escape:"이스케이프 키",pageUp:"페이지 업 키",pageDown:"페이지 다운 키",end:"엔드 키",home:"홈 키",leftArrow:"왼쪽 화살표 키",upArrow:"위쪽 화살표 키",rightArrow:"오른쪽 화살표 키",downArrow:"아래쪽 화살표 키",insert:"인서트 키","delete":"삭제 키",leftWindowKey:"왼쪽 윈도우 키",rightWindowKey:"오른쪽 윈도우 키",selectKey:"셀렉트 키",numpad0:"숫자 패드 0 키",numpad1:"숫자 패드 1 키",numpad2:"숫자 패드 2 키",numpad3:"숫자 패드 3 키",numpad4:"숫자 패드 4 키",numpad5:"숫자 패드 5 키",numpad6:"숫자 패드 6 키",numpad7:"숫자 패드 7 키",numpad8:"숫자 패드 8 키",numpad9:"숫자 패드 9 키",multiply:"곱셈(*) 키",add:"덧셈(+) 키",subtract:"뺄셈(-) 키",
-decimalPoint:"온점(.) 키",divide:"나눗셈(/) 키",f1:"F1 키",f2:"F2 키",f3:"F3 키",f4:"F4 키",f5:"F5 키",f6:"F6 키",f7:"F7 키",f8:"F8 키",f9:"F9 키",f10:"F10 키",f11:"F11 키",f12:"F12 키",numLock:"Num Lock 키",scrollLock:"Scroll Lock 키",semiColon:"세미콜론(;) 키",equalSign:"등호(\x3d) 키",comma:"쉼표(,) 키",dash:"대시(-) 키",period:"온점(.) 키",forwardSlash:"슬래시(/) 키",graveAccent:"억음 악센트(`) 키",openBracket:"브라켓 열기([) 키",backSlash:"역슬래시(\\\\) 키",closeBracket:"브라켓 닫기(]) 키",singleQuote:"외 따옴표(') 키"});
\ No newline at end of file
+{name:" 이전 포커스 공간 접근 명령",legend:"탈자 기호(^) 이전에 ${accessPreviousSpace} 를 누르면, 접근 불가능하면서 가장 가까운 포커스 영역에 접근합니다. 예를 들면, 두 인접한 HR 요소가 있습니다. 키 조합을 반복해서 멀리있는 포커스 영역들에 도달할 수 있습니다."},{name:"다음 포커스 공간 접근 명령",legend:"탈자 기호(^) 다음에 ${accessNextSpace} 를 누르면, 접근 불가능하면서 가장 가까운 포커스 영역에 접근합니다. 예를 들면, 두 인접한 HR 요소가 있습니다. 키 조합을 반복해서 멀리있는 포커스 영역들에 도달할 수 있습니다. "},{name:" 접근성 도움말",legend:"${a11yHelp} 누르시오"}]}],tab:"탭 키",pause:"일시정지 키",capslock:"캡스 록 키",escape:"이스케이프 키",pageUp:"페이지 업 키",pageDown:"페이지 다운 키",leftArrow:"왼쪽 화살표 키",
+upArrow:"위쪽 화살표 키",rightArrow:"오른쪽 화살표 키",downArrow:"아래쪽 화살표 키",insert:"인서트 키",leftWindowKey:"왼쪽 윈도우 키",rightWindowKey:"오른쪽 윈도우 키",selectKey:"셀렉트 키",numpad0:"숫자 패드 0 키",numpad1:"숫자 패드 1 키",numpad2:"숫자 패드 2 키",numpad3:"숫자 패드 3 키",numpad4:"숫자 패드 4 키",numpad5:"숫자 패드 5 키",numpad6:"숫자 패드 6 키",numpad7:"숫자 패드 7 키",numpad8:"숫자 패드 8 키",numpad9:"숫자 패드 9 키",multiply:"곱셈(*) 키",add:"덧셈(+) 키",subtract:"뺄셈(-) 키",decimalPoint:"온점(.) 키",divide:"나눗셈(/) 키",f1:"F1 키",f2:"F2 키",f3:"F3 키",f4:"F4 키",f5:"F5 키",f6:"F6 키",
+f7:"F7 키",f8:"F8 키",f9:"F9 키",f10:"F10 키",f11:"F11 키",f12:"F12 키",numLock:"Num Lock 키",scrollLock:"Scroll Lock 키",semiColon:"세미콜론(;) 키",equalSign:"등호(\x3d) 키",comma:"쉼표(,) 키",dash:"대시(-) 키",period:"온점(.) 키",forwardSlash:"슬래시(/) 키",graveAccent:"억음 악센트(`) 키",openBracket:"브라켓 열기([) 키",backSlash:"역슬래시(\\\\) 키",closeBracket:"브라켓 닫기(]) 키",singleQuote:"외 따옴표(') 키"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
index e73789b9f..9bf5eab7d 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ku",{title:"ڕێنمای لەبەردەستدابوون",contents:"پێکهاتەی یارمەتی. کلیك ESC بۆ داخستنی ئەم دیالۆگه.",legend:[{name:"گشتی",items:[{name:"تووڵامرازی دەستكاریكەر",legend:"کلیك ${toolbarFocus} بۆ ڕابەری تووڵامراز. بۆ گواستنەوەی پێشوو داهاتووی گرووپی تووڵامرازی داگرتنی کلیلی TAB لەگەڵ‌ SHIFT+TAB. بۆ گواستنەوەی پێشوو داهاتووی دووگمەی تووڵامرازی لەڕێی کلیلی تیری دەستی ڕاست یان کلیلی تیری دەستی چەپ. کلیکی کلیلی SPACE یان ENTER بۆ چالاککردنی دووگمەی تووڵامراز."},{name:"دیالۆگی دەستكاریكەر",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"پێڕستی سەرنووسەر",legend:"کلیك ${contextMenu} یان دوگمەی لیسته‌(Menu) بۆ کردنەوەی لیستەی دەق. بۆ چوونە هەڵبژاردەیەکی تر له‌ لیسته‌ کلیکی کلیلی TAB یان کلیلی تیری ڕوو لەخوارەوه‌ بۆ چوون بۆ هەڵبژاردەی پێشوو کلیکی کلیلی SHIFT+TAB یان کلیلی تیری ڕوو له‌ سەرەوە. داگرتنی کلیلی SPACE یان ENTER بۆ هەڵبژاردنی هەڵبژاردەی لیسته‌. بۆ کردنەوەی لقی ژێر لیسته‌ لەهەڵبژاردەی لیستە کلیکی کلیلی SPACE یان ENTER یان کلیلی تیری دەستی ڕاست. بۆ گەڕانەوه بۆ سەرەوەی لیسته‌ کلیکی کلیلی ESC یان کلیلی تیری دەستی چەپ. بۆ داخستنی لیستە کلیكی کلیلی ESC بکە."},
 {name:"لیستی سنووقی سەرنووسەر",legend:"لەناو سنوقی لیست, چۆن بۆ هەڵنبژاردەی لیستێکی تر کلیکی کلیلی TAB یان کلیلی تیری ڕوو لەخوار. چوون بۆ هەڵبژاردەی لیستی پێشوو کلیکی کلیلی SHIFT+TAB یان کلیلی تیری ڕوو لەسەرەوه‌. کلیکی کلیلی SPACE یان ENTER بۆ دیاریکردنی ‌هەڵبژاردەی لیست. کلیکی کلیلی ESC بۆ داخستنی سنوقی لیست."},{name:"تووڵامرازی توخم",legend:"کلیك ${elementsPathFocus} بۆ ڕابەری تووڵامرازی توخمەکان. چوون بۆ دوگمەی توخمێکی تر کلیکی کلیلی TAB یان کلیلی تیری دەستی ڕاست. چوون بۆ دوگمەی توخمی پێشوو کلیلی SHIFT+TAB یان کلیکی کلیلی تیری دەستی چەپ. داگرتنی کلیلی SPACE یان ENTER بۆ دیاریکردنی توخمەکه‌ لەسەرنووسه."}]},
 {name:"فەرمانەکان",items:[{name:"پووچکردنەوەی فەرمان",legend:"کلیك ${undo}"},{name:"هەڵگەڕانەوەی فەرمان",legend:"کلیك ${redo}"},{name:"فەرمانی دەقی قەڵەو",legend:"کلیك ${bold}"},{name:"فەرمانی دەقی لار",legend:"کلیك ${italic}"},{name:"فەرمانی ژێرهێڵ",legend:"کلیك ${underline}"},{name:"فەرمانی به‌ستەر",legend:"کلیك ${link}"},{name:"شاردەنەوەی تووڵامراز",legend:"کلیك ${toolbarCollapse}"},{name:"چوونەناو سەرنجدانی پێشوی فەرمانی بۆشایی",legend:"کلیک ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:"چوونەناو سەرنجدانی داهاتووی فەرمانی بۆشایی",legend:"کلیک ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"دەستپێگەیشتنی یارمەتی",legend:"کلیك ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",
-upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"پەنجەرەی چەپ",rightWindowKey:"پەنجەرەی ڕاست",selectKey:"Select",numpad0:"Numpad 0",numpad1:"1",numpad2:"2",numpad3:"3",numpad4:"4",numpad5:"5",numpad6:"6",numpad7:"7",numpad8:"8",numpad9:"9",multiply:"*",add:"+",subtract:"-",decimalPoint:".",divide:"/",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",
-semiColon:";",equalSign:"\x3d",comma:",",dash:"-",period:".",forwardSlash:"/",graveAccent:"`",openBracket:"[",backSlash:"\\\\",closeBracket:"}",singleQuote:"'"});
\ No newline at end of file
+{name:"چوونەناو سەرنجدانی داهاتووی فەرمانی بۆشایی",legend:"کلیک ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"دەستپێگەیشتنی یارمەتی",legend:"کلیك ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",
+leftWindowKey:"پەنجەرەی چەپ",rightWindowKey:"پەنجەرەی ڕاست",selectKey:"Select",numpad0:"Numpad 0",numpad1:"1",numpad2:"2",numpad3:"3",numpad4:"4",numpad5:"5",numpad6:"6",numpad7:"7",numpad8:"8",numpad9:"9",multiply:"*",add:"+",subtract:"-",decimalPoint:".",divide:"/",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:";",equalSign:"\x3d",comma:",",dash:"-",period:".",forwardSlash:"/",graveAccent:"`",
+openBracket:"[",backSlash:"\\\\",closeBracket:"}",singleQuote:"'"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
index ffabb15ca..c76623621 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","lt",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Bendros savybės",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
index 873f6e4f1..dddea9987 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","lv",{title:"Pieejamības instrukcija",contents:"Palīdzības saturs. Lai aizvērtu ciet šo dialogu nospiediet ESC.",legend:[{name:"Galvenais",items:[{name:"Redaktora rīkjosla",legend:"Nospiediet ${toolbarFocus} lai pārvietotos uz rīkjoslu. Lai pārvietotos uz nākošo vai iepriekšējo rīkjoslas grupu izmantojiet pogu TAB un SHIFT+TAB. Lai pārvietotos uz nākošo vai iepriekšējo rīkjoslas pogu izmantojiet Kreiso vai Labo bultiņu. Nospiediet Atstarpi vai ENTER lai aktivizētu rīkjosla pogu."},
@@ -7,6 +7,5 @@ CKEDITOR.plugins.setLang("a11yhelp","lv",{title:"Pieejamības instrukcija",conte
 {name:"Redaktora saraksta lauks",legend:"Saraksta laukā, lai pārvietotos uz nākošo saraksta elementu nospiediet TAB vai pogu Bultiņa uz leju. Lai pārvietotos uz iepriekšējo saraksta elementu nospiediet SHIFT+TAB vai pogu Bultiņa uz augšu. Nospiediet SPACE vai ENTER lai izvēlētos saraksta opcijas. Nospiediet ESC lai aizvērtu saraksta lauku."},{name:"Redaktora elementa ceļa josla",legend:"Nospiediet ${elementsPathFocus} lai pārvietotos uz elementa ceļa joslu. Lai pārvietotos uz nākošo elementa pogu izmantojiet TAB vai Labo bultiņu. Lai pārvietotos uz iepriekšējo elementa pogu izmantojiet SHIFT+TAB vai Kreiso bultiņu. Nospiediet SPACE vai ENTER lai izvēlētos elementu redaktorā."}]},
 {name:"Komandas",items:[{name:"Komanda atcelt darbību",legend:"Nospiediet ${undo}"},{name:"Komanda atkārtot darbību",legend:"Nospiediet ${redo}"},{name:"Treknraksta komanda",legend:"Nospiediet ${bold}"},{name:"Kursīva komanda",legend:"Nospiediet ${italic}"},{name:"Apakšsvītras komanda ",legend:"Nospiediet ${underline}"},{name:"Hipersaites komanda",legend:"Nospiediet ${link}"},{name:"Rīkjoslas aizvēršanas komanda",legend:"Nospiediet ${toolbarCollapse}"},{name:"Piekļūt iepriekšējai fokusa vietas komandai",
 legend:"Nospiediet ${accessPreviousSpace} lai piekļūtu tuvākajai nepieejamajai fokusa vietai pirms kursora. Piemēram: diviem blakus esošiem līnijas HR elementiem. Atkārtojiet taustiņu kombināciju lai piekļūtu pie tālākām vietām."},{name:"Piekļūt nākošā fokusa apgabala komandai",legend:"Nospiediet ${accessNextSpace} lai piekļūtu tuvākajai nepieejamajai fokusa vietai pēc kursora. Piemēram: diviem blakus esošiem līnijas HR elementiem. Atkārtojiet taustiņu kombināciju lai piekļūtu pie tālākām vietām."},
-{name:"Pieejamības palīdzība",legend:"Nospiediet ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Pieejamības palīdzība",legend:"Nospiediet ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
index ad67570de..f29427135 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","mk",{title:"Инструкции за пристапност",contents:"Содржина на делот за помош. За да го затворите овој дијалог притиснете ESC.",legend:[{name:"Општо",items:[{name:"Мени за уредувачот",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Дијалот за едиторот",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Контекст-мени на уредувачот",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
 {name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
 {name:"Наредби",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Пауза",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Up",end:"End",home:"Home",leftArrow:"Стрелка лево",
-upArrow:"Стрелка горе",rightArrow:"Стрелка десно",downArrow:"Стрелка доле",insert:"Insert","delete":"Delete",leftWindowKey:"Лево Windows копче",rightWindowKey:"Десно Windows копче",selectKey:"Select копче",numpad0:"Нум. таст. 0",numpad1:"Нум. таст. 1",numpad2:"Нум. таст. 2",numpad3:"Нум. таст. 3",numpad4:"Нум. таст. 4",numpad5:"Нум. таст. 5",numpad6:"Нум. таст. 6",numpad7:"Нум. таст. 7",numpad8:"Нум. таст. 8",numpad9:"Нум. таст. 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",
-divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Пауза",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Up",leftArrow:"Стрелка лево",upArrow:"Стрелка горе",rightArrow:"Стрелка десно",downArrow:"Стрелка доле",insert:"Insert",
+leftWindowKey:"Лево Windows копче",rightWindowKey:"Десно Windows копче",selectKey:"Select копче",numpad0:"Нум. таст. 0",numpad1:"Нум. таст. 1",numpad2:"Нум. таст. 2",numpad3:"Нум. таст. 3",numpad4:"Нум. таст. 4",numpad5:"Нум. таст. 5",numpad6:"Нум. таст. 6",numpad7:"Нум. таст. 7",numpad8:"Нум. таст. 8",numpad9:"Нум. таст. 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",
+f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
index c88985748..1f1af29ca 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","mn",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Ерөнхий",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
index 819372d0d..340d60494 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","nb",{title:"Instruksjoner for tilgjengelighet",contents:"Innhold for hjelp. Trykk ESC for å lukke denne dialogen.",legend:[{name:"Generelt",items:[{name:"Verktøylinje for editor",legend:"Trykk ${toolbarFocus} for å navigere til verktøylinjen. Flytt til neste og forrige verktøylinjegruppe med TAB og SHIFT+TAB. Flytt til neste og forrige verktøylinjeknapp med HØYRE PILTAST og VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å aktivere verktøylinjeknappen."},{name:"Dialog for editor",
 legend:"Mens du er i en dialog, trykk TAB for å navigere til neste dialogelement, trykk SHIFT+TAB for å flytte til forrige dialogelement, trykk ENTER for å akseptere dialogen, trykk ESC for å avbryte dialogen. Når en dialog har flere faner, kan fanelisten nås med enten ALT+F10 eller med TAB. Når fanelisten er fokusert, går man til neste og forrige fane med henholdsvis HØYRE og VENSTRE PILTAST."},{name:"Kontekstmeny for editor",legend:"Trykk ${contextMenu} eller MENYKNAPP for å åpne kontekstmeny. Gå til neste alternativ i menyen med TAB eller PILTAST NED. Gå til forrige alternativ med SHIFT+TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge menyalternativet. Åpne undermenyen på valgt alternativ med MELLOMROM eller ENTER eller HØYRE PILTAST. Gå tilbake til overordnet menyelement med ESC eller VENSTRE PILTAST. Lukk kontekstmenyen med ESC."},
 {name:"Listeboks for editor",legend:"I en listeboks, gå til neste alternativ i listen med TAB eller PILTAST NED. Gå til forrige alternativ i listen med SHIFT+TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge alternativet i listen. Trykk ESC for å lukke listeboksen."},{name:"Verktøylinje for elementsti",legend:"Trykk ${elementsPathFocus} for å navigere til verktøylinjen som viser elementsti. Gå til neste elementknapp med TAB eller HØYRE PILTAST. Gå til forrige elementknapp med SHIFT+TAB eller VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å velge elementet i editoren."}]},
 {name:"Hurtigtaster",items:[{name:"Angre",legend:"Trykk ${undo}"},{name:"Gjør om",legend:"Trykk ${redo}"},{name:"Fet tekst",legend:"Trykk ${bold}"},{name:"Kursiv tekst",legend:"Trykk ${italic}"},{name:"Understreking",legend:"Trykk ${underline}"},{name:"Lenke",legend:"Trykk ${link}"},{name:"Skjul verktøylinje",legend:"Trykk ${toolbarCollapse}"},{name:"Gå til forrige fokusområde",legend:"Trykk ${accessPreviousSpace} for å komme til nærmeste fokusområde før skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},
-{name:"Gå til neste fokusområde",legend:"Trykk ${accessNextSpace} for å komme til nærmeste fokusområde etter skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},{name:"Hjelp for tilgjengelighet",legend:"Trykk ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tabulator",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",
-pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Venstre piltast",upArrow:"Opp-piltast",rightArrow:"Høyre piltast",downArrow:"Ned-piltast",insert:"Insert","delete":"Delete",leftWindowKey:"Venstre Windows-tast",rightWindowKey:"Høyre Windows-tast",selectKey:"Velg nøkkel",numpad0:"Numerisk tastatur 0",numpad1:"Numerisk tastatur 1",numpad2:"Numerisk tastatur 2",numpad3:"Numerisk tastatur 3",numpad4:"Numerisk tastatur 4",numpad5:"Numerisk tastatur 5",numpad6:"Numerisk tastatur 6",numpad7:"Numerisk tastatur 7",
-numpad8:"Numerisk tastatur 8",numpad9:"Numerisk tastatur 9",multiply:"Multipliser",add:"Legg til",subtract:"Trekk fra",decimalPoint:"Desimaltegn",divide:"Divider",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Likhetstegn",comma:"Komma",dash:"Bindestrek",period:"Punktum",forwardSlash:"Forover skråstrek",graveAccent:"Grav aksent",openBracket:"Åpne parentes",backSlash:"Bakover skråstrek",
-closeBracket:"Lukk parentes",singleQuote:"Enkelt sitattegn"});
\ No newline at end of file
+{name:"Gå til neste fokusområde",legend:"Trykk ${accessNextSpace} for å komme til nærmeste fokusområde etter skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},{name:"Hjelp for tilgjengelighet",legend:"Trykk ${a11yHelp}"}]}],tab:"Tabulator",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Venstre piltast",upArrow:"Opp-piltast",
+rightArrow:"Høyre piltast",downArrow:"Ned-piltast",insert:"Insert",leftWindowKey:"Venstre Windows-tast",rightWindowKey:"Høyre Windows-tast",selectKey:"Velg nøkkel",numpad0:"Numerisk tastatur 0",numpad1:"Numerisk tastatur 1",numpad2:"Numerisk tastatur 2",numpad3:"Numerisk tastatur 3",numpad4:"Numerisk tastatur 4",numpad5:"Numerisk tastatur 5",numpad6:"Numerisk tastatur 6",numpad7:"Numerisk tastatur 7",numpad8:"Numerisk tastatur 8",numpad9:"Numerisk tastatur 9",multiply:"Multipliser",add:"Legg til",
+subtract:"Trekk fra",decimalPoint:"Desimaltegn",divide:"Divider",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Likhetstegn",comma:"Komma",dash:"Bindestrek",period:"Punktum",forwardSlash:"Forover skråstrek",graveAccent:"Grav aksent",openBracket:"Åpne parentes",backSlash:"Bakover skråstrek",closeBracket:"Lukk parentes",singleQuote:"Enkelt sitattegn"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
index 98e465230..62df667c5 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
@@ -1,11 +1,12 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","nl",{title:"Toegankelijkheidsinstructies",contents:"Help-inhoud. Druk op ESC om dit dialoog te sluiten.",legend:[{name:"Algemeen",items:[{name:"Werkbalk tekstverwerker",legend:"Druk op ${toolbarFocus} om naar de werkbalk te navigeren. Om te schakelen naar de volgende en vorige werkbalkgroep, gebruik TAB en SHIFT+TAB. Om te schakelen naar de volgende en vorige werkbalkknop, gebruik de PIJL RECHTS en PIJL LINKS. Druk op SPATIE of ENTER om een werkbalkknop te activeren."},
-{name:"Dialoog tekstverwerker",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Contextmenu tekstverwerker",legend:"Druk op ${contextMenu} of APPLICATION KEY om het contextmenu te openen. Schakel naar de volgende menuoptie met TAB of PIJL OMLAAG. Schakel naar de vorige menuoptie met SHIFT+TAB of PIJL OMHOOG. Druk op SPATIE of ENTER om een menuoptie te selecteren. Op een submenu van de huidige optie met SPATIE, ENTER of PIJL RECHTS. Ga terug naar de bovenliggende menuoptie met ESC of PIJL LINKS. Sluit het contextmenu met ESC."},
-{name:"Keuzelijst tekstverwerker",legend:"In een keuzelijst, schakel naar het volgende item met TAB of PIJL OMLAAG. Schakel naar het vorige item met SHIFT+TAB of PIJL OMHOOG. Druk op SPATIE of ENTER om het item te selecteren. Druk op ESC om de keuzelijst te sluiten."},{name:"Elementenpad werkbalk tekstverwerker",legend:"Druk op ${elementsPathFocus} om naar het elementenpad te navigeren. Om te schakelen naar het volgende element, gebruik TAB of PIJL RECHTS. Om te schakelen naar het vorige element, gebruik SHIFT+TAB or PIJL LINKS. Druk op SPATIE of ENTER om een element te selecteren in de tekstverwerker."}]},
-{name:"Opdrachten",items:[{name:"Ongedaan maken opdracht",legend:"Druk op ${undo}"},{name:"Opnieuw uitvoeren opdracht",legend:"Druk op ${redo}"},{name:"Vetgedrukt opdracht",legend:"Druk op ${bold}"},{name:"Cursief opdracht",legend:"Druk op ${italic}"},{name:"Onderstrepen opdracht",legend:"Druk op ${underline}"},{name:"Link opdracht",legend:"Druk op ${link}"},{name:"Werkbalk inklappen opdracht",legend:"Druk op ${toolbarCollapse}"},{name:"Ga naar vorige focus spatie commando",legend:"Druk ${accessPreviousSpace} om toegang te verkrijgen tot de dichtstbijzijnde onbereikbare focus spatie voor de caret, bijvoorbeeld: twee aangrenzende HR elementen. Herhaal de toetscombinatie om de verste focus spatie te bereiken."},
-{name:"Ga naar volgende focus spatie commando",legend:"Druk ${accessNextSpace} om toegang te verkrijgen tot de dichtstbijzijnde onbereikbare focus spatie na de caret, bijvoorbeeld: twee aangrenzende HR elementen. Herhaal de toetscombinatie om de verste focus spatie te bereiken."},{name:"Toegankelijkheidshulp",legend:"Druk op ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"Pijl naar links",upArrow:"Pijl omhoog",rightArrow:"Pijl naar rechts",downArrow:"Pijl naar beneden",insert:"Invoegen","delete":"Verwijderen",leftWindowKey:"Linker Windows-toets",rightWindowKey:"Rechter Windows-toets",selectKey:"Selecteer toets",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Vermenigvuldigen",add:"Toevoegen",
-subtract:"Aftrekken",decimalPoint:"Decimaalteken",divide:"Delen",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Puntkomma",equalSign:"Is gelijk-teken",comma:"Komma",dash:"Koppelteken",period:"Punt",forwardSlash:"Slash",graveAccent:"Accent grave",openBracket:"Vierkant haakje openen",backSlash:"Backslash",closeBracket:"Vierkant haakje sluiten",singleQuote:"Apostrof"});
\ No newline at end of file
+{name:"Dialoog tekstverwerker",legend:"In een dialoogvenster, druk op TAB om te navigeren naar het volgende veld. Druk op SHIFT+TAB om naar het vorige veld te navigeren. Druk op ENTER om het dialoogvenster te verzenden. Druk op ESC om het dialoogvenster te sluiten. Bij dialoogvensters met meerdere tabbladen kan de tabset bereikt worden met ALT+F10 of met TAB als onderdeel van de tabvolgorde in het dialoogvenster. Als de tabset focus heeft, kun je schakalen naar het volgende en vorige tabblad met respectievelijk PIJL RECHTS en PIJL LINKS."},
+{name:"Contextmenu tekstverwerker",legend:"Druk op ${contextMenu} of APPLICATION KEY om het contextmenu te openen. Schakel naar de volgende menuoptie met TAB of PIJL OMLAAG. Schakel naar de vorige menuoptie met SHIFT+TAB of PIJL OMHOOG. Druk op SPATIE of ENTER om een menuoptie te selecteren. Op een submenu van de huidige optie met SPATIE, ENTER of PIJL RECHTS. Ga terug naar de bovenliggende menuoptie met ESC of PIJL LINKS. Sluit het contextmenu met ESC."},{name:"Keuzelijst tekstverwerker",legend:"In een keuzelijst, schakel naar het volgende item met TAB of PIJL OMLAAG. Schakel naar het vorige item met SHIFT+TAB of PIJL OMHOOG. Druk op SPATIE of ENTER om het item te selecteren. Druk op ESC om de keuzelijst te sluiten."},
+{name:"Elementenpad werkbalk tekstverwerker",legend:"Druk op ${elementsPathFocus} om naar het elementenpad te navigeren. Om te schakelen naar het volgende element, gebruik TAB of PIJL RECHTS. Om te schakelen naar het vorige element, gebruik SHIFT+TAB or PIJL LINKS. Druk op SPATIE of ENTER om een element te selecteren in de tekstverwerker."}]},{name:"Opdrachten",items:[{name:"Ongedaan maken opdracht",legend:"Druk op ${undo}"},{name:"Opnieuw uitvoeren opdracht",legend:"Druk op ${redo}"},{name:"Vetgedrukt opdracht",
+legend:"Druk op ${bold}"},{name:"Cursief opdracht",legend:"Druk op ${italic}"},{name:"Onderstrepen opdracht",legend:"Druk op ${underline}"},{name:"Link opdracht",legend:"Druk op ${link}"},{name:"Werkbalk inklappen opdracht",legend:"Druk op ${toolbarCollapse}"},{name:"Ga naar vorige focus spatie commando",legend:"Druk ${accessPreviousSpace} om toegang te verkrijgen tot de dichtstbijzijnde onbereikbare focus spatie voor de caret, bijvoorbeeld: twee aangrenzende HR elementen. Herhaal de toetscombinatie om de verste focus spatie te bereiken."},
+{name:"Ga naar volgende focus spatie commando",legend:"Druk ${accessNextSpace} om toegang te verkrijgen tot de dichtstbijzijnde onbereikbare focus spatie na de caret, bijvoorbeeld: twee aangrenzende HR elementen. Herhaal de toetscombinatie om de verste focus spatie te bereiken."},{name:"Toegankelijkheidshulp",legend:"Druk op ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Pijl naar links",upArrow:"Pijl omhoog",rightArrow:"Pijl naar rechts",
+downArrow:"Pijl naar beneden",insert:"Invoegen",leftWindowKey:"Linker Windows-toets",rightWindowKey:"Rechter Windows-toets",selectKey:"Selecteer toets",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Vermenigvuldigen",add:"Toevoegen",subtract:"Aftrekken",decimalPoint:"Decimaalteken",divide:"Delen",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",
+f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Puntkomma",equalSign:"Is gelijk-teken",comma:"Komma",dash:"Koppelteken",period:"Punt",forwardSlash:"Slash",graveAccent:"Accent grave",openBracket:"Vierkant haakje openen",backSlash:"Backslash",closeBracket:"Vierkant haakje sluiten",singleQuote:"Apostrof"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
index 4fb70ddea..8aa90a48d 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","no",{title:"Instruksjoner for tilgjengelighet",contents:"Innhold for hjelp. Trykk ESC for å lukke denne dialogen.",legend:[{name:"Generelt",items:[{name:"Verktøylinje for editor",legend:"Trykk ${toolbarFocus} for å navigere til verktøylinjen. Flytt til neste og forrige verktøylinjegruppe med TAB og SHIFT+TAB. Flytt til neste og forrige verktøylinjeknapp med HØYRE PILTAST og VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å aktivere verktøylinjeknappen."},{name:"Dialog for editor",
 legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Kontekstmeny for editor",legend:"Trykk ${contextMenu} eller MENYKNAPP for å åpne kontekstmeny. Gå til neste alternativ i menyen med TAB eller PILTAST NED. Gå til forrige alternativ med SHIFT+TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge menyalternativet. Åpne undermenyen på valgt alternativ med MELLOMROM eller ENTER eller HØYRE PILTAST. Gå tilbake til overordnet menyelement med ESC eller VENSTRE PILTAST. Lukk kontekstmenyen med ESC."},
 {name:"Listeboks for editor",legend:"I en listeboks, gå til neste alternativ i listen med TAB eller PILTAST NED. Gå til forrige alternativ i listen med SHIFT+TAB eller PILTAST OPP. Trykk MELLOMROM eller ENTER for å velge alternativet i listen. Trykk ESC for å lukke listeboksen."},{name:"Verktøylinje for elementsti",legend:"Trykk ${elementsPathFocus} for å navigere til verktøylinjen som viser elementsti. Gå til neste elementknapp med TAB eller HØYRE PILTAST. Gå til forrige elementknapp med SHIFT+TAB eller VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å velge elementet i editoren."}]},
 {name:"Kommandoer",items:[{name:"Angre",legend:"Trykk ${undo}"},{name:"Gjør om",legend:"Trykk ${redo}"},{name:"Fet tekst",legend:"Trykk ${bold}"},{name:"Kursiv tekst",legend:"Trykk ${italic}"},{name:"Understreking",legend:"Trykk ${underline}"},{name:"Link",legend:"Trykk ${link}"},{name:"Skjul verktøylinje",legend:"Trykk ${toolbarCollapse}"},{name:"Gå til forrige fokusområde",legend:"Trykk ${accessPreviousSpace} for å komme til nærmeste fokusområde før skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},
-{name:"Gå til neste fokusområde",legend:"Trykk ${accessNextSpace} for å komme til nærmeste fokusområde etter skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},{name:"Hjelp for tilgjengelighet",legend:"Trykk ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",
-divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Gå til neste fokusområde",legend:"Trykk ${accessNextSpace} for å komme til nærmeste fokusområde etter skrivemarkøren som ikke kan nås på vanlig måte, for eksempel to tilstøtende HR-elementer. Gjenta tastekombinasjonen for å komme til fokusområder lenger unna i dokumentet."},{name:"Hjelp for tilgjengelighet",legend:"Trykk ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",
+downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",
+f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js
new file mode 100644
index 000000000..f63c1198b
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js
@@ -0,0 +1,12 @@
+/*
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang("a11yhelp","oc",{title:"Instruccions d'accessibilitat",contents:"Contengut de l'ajuda. Per tampar aquesta fenèstra, quichatz sus la tòca Escap.",legend:[{name:"General",items:[{name:"Barra d'aisinas de l'editor",legend:"Quichar sus ${toolbarFocus} per accedir a la barra d'aisinas. Se desplaçar cap al groupe seguent o precedent de la barra d'aisinas amb las tòcas Tab e Maj+Tab. Se desplaçar cap al boton seguent o precedent de la barra d'aisinas amb las tòcas Sageta dreita e Sageta esquèrra. Quichar sus la barra d'espaci o la tòca Entrada per activer lo boton de barra d'aisinas."},
+{name:"Fenèstra de l'editor",legend:"Dins una bóstia de dialòg, quichar sus Tab per passar a l'element seguent, quichar sus Maj+Tab per passar a l'element precedent, quichar sus Entrada per validar, quichar sus Escap per anullar. Quand una bóstia de dialòg possedís des onglets, la lista pòt èsser atenta amb Alt+F10 o amb Tab. Dins la lista dels onglets, se desplaçar cap al seguent e lo precedent amb las tòcas Sageta dreita e Sageta esquèrra respectivament."},{name:"Menú contextual de l'editor",legend:"Quichar sus ${contextMenu} o sus la tòca Menú per dobrir lo menú contextual. Se desplaçar ensuite cap a l'opcion seguenta del menú amb las tòcas Tab o Sageta bas. Se desplaçar cap a l'opcion precedenta amb las tòcas Maj+Tab o Sageta naut. Quichar sus la barra d'espaci o la tòca Entrada per seleccionar l'opcion del menu. Quichar sus la barra d'espaci, la tòca Entrada o Sageta dreita per dobrir lo sosmenú de l'opcion seleccionada. Tornar a l'element de menú parent amb la tòca Escap o Sageta esquèrra. Tampar lo menú contextual amb Escap."},
+{name:"Zòna de lista de l'editor",legend:"Dins una lista en menú desenrotlant, se desplaçar cap a l'element seguent de la lista amb las tòcas Tab o Sageta bas. Se desplaçar cap a l'element precedent de la lista amb las tòcas Maj+Tab o Sageta naut. Quichar sus la barra d'espaci o sus Entrada per seleccionar l'opcion dins la lista. Quichar sus Escap per tampar lo menú desenrotlant."},{name:"Barra del camin d'elements de l'editor",legend:"Quichar sus ${elementsPathFocus} per naviguer cap a la barra del fial d'Ariana dels elements. Se desplaçar cap al boton de l'element seguent amb las tòcas Tab o Sageta dreita. Se desplaçar cap al boton precedent amb las tòcas Maj+Tab o Sageta esquèrra. Quichar sus la barra d'espaci o sus Entrada per seleccionar l'element dins l'editor."}]},
+{name:"Comandas",items:[{name:"Anullar la comanda",legend:"Quichar sus ${undo}"},{name:"Comanda restablir",legend:"Quichar sus ${redo}"},{name:" Comanda gras",legend:"Quichar sus ${bold}"},{name:" Comanda italica",legend:"Quichar sus ${italic}"},{name:" Comanda solinhat",legend:"Quichar sus ${underline}"},{name:" Comanda ligam",legend:"Quichar sus ${link}"},{name:"Comanda enrotlar la barra d'aisinas",legend:"Quichar sus ${toolbarCollapse}"},{name:"Comanda d'accès a l'element seleccionable precedent",
+legend:"Quichar sus ${accessNextSpace} per accedir a l'element seleccionable inategnible lo mai pròche abans lo cursor, per exemple : doas linhas orizontalas adjacentas. Repetir la combinason de tòcas per aténher los elements seleccionables precedents."},{name:"Comanda d'accès a l'element seleccionable seguent",legend:"Quichar sus ${accessNextSpace} per accedir a l'element seleccionable inatenhible lo mai pròche aprèp lo cursor, per exemple : doas linhas orizontalas adjacentas. Repetir la combinason de tòcas per aténher los elements seleccionables seguents."},
+{name:" Ajuda sus l'accessibilitat",legend:"Quichar sus ${a11yHelp}"}]}],tab:"Tabulacion",pause:"Pausa",capslock:"Verr. Maj.",escape:"Escap",pageUp:"Pagina superiora",pageDown:"Pagina seguenta",leftArrow:"Sageta esquèrra",upArrow:"Sageta naut",rightArrow:"Sageta dreita",downArrow:"Sageta bassa",insert:"Inser",leftWindowKey:"Tòca Windows esquèrra",rightWindowKey:"Tòca Windows dreita",selectKey:"Tòca Seleccionar",numpad0:"0 del pavat numeric",numpad1:"1 del pavat numeric",numpad2:"2 del pavat numeric",
+numpad3:"3 del pavat numeric",numpad4:"4 del pavat numeric",numpad5:"5 del pavat numeric",numpad6:"6 del pavat numeric",numpad7:"7 del pavat numeric",numpad8:"Pavat numeric 8",numpad9:"9 del pavat numeric",multiply:"Multiplicar",add:"Plus",subtract:"Mens",decimalPoint:"Punt decimal",divide:"Devesir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Verr. Num.",scrollLock:"Arrèst desfil.",semiColon:"Punt-virgula",equalSign:"Signe egal",comma:"Virgula",
+dash:"Jonhent",period:"Punt",forwardSlash:"Barra oblica",graveAccent:"Accent grèu",openBracket:"Parentèsi dobèrta",backSlash:"Barra oblica invèrsa",closeBracket:"Parentèsi tampanta",singleQuote:"Apostròfa"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
index 33580a23e..da634dd75 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pl",{title:"Instrukcje dotyczące dostępności",contents:"Zawartość pomocy. Wciśnij ESC, aby zamknąć to okno.",legend:[{name:"Informacje ogólne",items:[{name:"Pasek narzędzi edytora",legend:"Naciśnij ${toolbarFocus}, by przejść do paska narzędzi. Przejdź do następnej i poprzedniej grupy narzędzi używając TAB oraz SHIFT+TAB. Przejdź do następnego i poprzedniego przycisku paska narzędzi za pomocą STRZAŁKI W PRAWO lub STRZAŁKI W LEWO. Naciśnij SPACJĘ lub ENTER by aktywować przycisk paska narzędzi."},
@@ -7,7 +7,7 @@ CKEDITOR.plugins.setLang("a11yhelp","pl",{title:"Instrukcje dotyczące dostępno
 {name:"Menu kontekstowe edytora",legend:"Wciśnij ${contextMenu} lub PRZYCISK APLIKACJI aby otworzyć menu kontekstowe. Przejdź do następnej pozycji menu wciskając TAB lub STRZAŁKĘ W DÓŁ. Przejdź do poprzedniej pozycji menu wciskając SHIFT + TAB lub STRZAŁKĘ W GÓRĘ. Wciśnij SPACJĘ lub ENTER aby wygrać pozycję menu. Otwórz pod-menu obecnej pozycji wciskając SPACJĘ lub ENTER lub STRZAŁKĘ W PRAWO. Wróć do pozycji nadrzędnego menu wciskając ESC lub STRZAŁKĘ W LEWO. Zamknij menu wciskając ESC."},{name:"Lista w edytorze",
 legend:"Wewnątrz listy przejdź do kolejnego elementu listy za pomocą przycisku TAB lub STRZAŁKI W DÓŁ. Przejdź do poprzedniego elementu listy za pomocą SHIFT+TAB lub STRZAŁKI W GÓRĘ. Naciśnij SPACJĘ lub ENTER w celu wybrania opcji z listy. Naciśnij ESC, by zamknąć listę."},{name:"Pasek ścieżki elementów edytora",legend:"Naciśnij ${elementsPathFocus} w celu przejścia do paska ścieżki elementów edytora. W celu przejścia do kolejnego elementu naciśnij klawisz TAB lub STRZAŁKI W PRAWO. W celu przejścia do poprzedniego elementu naciśnij klawisze SHIFT+TAB lub STRZAŁKI W LEWO. By wybrać element w edytorze, użyj klawisza SPACJI lub ENTER."}]},
 {name:"Polecenia",items:[{name:"Polecenie Cofnij",legend:"Naciśnij ${undo}"},{name:"Polecenie Ponów",legend:"Naciśnij ${redo}"},{name:"Polecenie Pogrubienie",legend:"Naciśnij ${bold}"},{name:"Polecenie Kursywa",legend:"Naciśnij ${italic}"},{name:"Polecenie Podkreślenie",legend:"Naciśnij ${underline}"},{name:"Polecenie Wstaw/ edytuj odnośnik",legend:"Naciśnij ${link}"},{name:"Polecenie schowaj pasek narzędzi",legend:"Naciśnij ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Pomoc dotycząca dostępności",legend:"Naciśnij ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Strzałka w lewo",
-upArrow:"Strzałka w górę",rightArrow:"Strzałka w prawo",downArrow:"Strzałka w dół",insert:"Insert","delete":"Delete",leftWindowKey:"Lewy klawisz Windows",rightWindowKey:"Prawy klawisz Windows",selectKey:"Klawisz wyboru",numpad0:"Klawisz 0 na klawiaturze numerycznej",numpad1:"Klawisz 1 na klawiaturze numerycznej",numpad2:"Klawisz 2 na klawiaturze numerycznej",numpad3:"Klawisz 3 na klawiaturze numerycznej",numpad4:"Klawisz 4 na klawiaturze numerycznej",numpad5:"Klawisz 5 na klawiaturze numerycznej",
-numpad6:"Klawisz 6 na klawiaturze numerycznej",numpad7:"Klawisz 7 na klawiaturze numerycznej",numpad8:"Klawisz 8 na klawiaturze numerycznej",numpad9:"Klawisz 9 na klawiaturze numerycznej",multiply:"Przemnóż",add:"Plus",subtract:"Minus",decimalPoint:"Separator dziesiętny",divide:"Podziel",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Średnik",equalSign:"Znak równości",comma:"Przecinek",dash:"Pauza",
-period:"Kropka",forwardSlash:"Ukośnik prawy",graveAccent:"Akcent słaby",openBracket:"Nawias kwadratowy otwierający",backSlash:"Ukośnik lewy",closeBracket:"Nawias kwadratowy zamykający",singleQuote:"Apostrof"});
\ No newline at end of file
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Pomoc dotycząca dostępności",legend:"Naciśnij ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Strzałka w lewo",upArrow:"Strzałka w górę",rightArrow:"Strzałka w prawo",downArrow:"Strzałka w dół",
+insert:"Insert",leftWindowKey:"Lewy klawisz Windows",rightWindowKey:"Prawy klawisz Windows",selectKey:"Klawisz wyboru",numpad0:"Klawisz 0 na klawiaturze numerycznej",numpad1:"Klawisz 1 na klawiaturze numerycznej",numpad2:"Klawisz 2 na klawiaturze numerycznej",numpad3:"Klawisz 3 na klawiaturze numerycznej",numpad4:"Klawisz 4 na klawiaturze numerycznej",numpad5:"Klawisz 5 na klawiaturze numerycznej",numpad6:"Klawisz 6 na klawiaturze numerycznej",numpad7:"Klawisz 7 na klawiaturze numerycznej",numpad8:"Klawisz 8 na klawiaturze numerycznej",
+numpad9:"Klawisz 9 na klawiaturze numerycznej",multiply:"Przemnóż",add:"Plus",subtract:"Minus",decimalPoint:"Separator dziesiętny",divide:"Podziel",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Średnik",equalSign:"Znak równości",comma:"Przecinek",dash:"Pauza",period:"Kropka",forwardSlash:"Ukośnik prawy",graveAccent:"Akcent słaby",openBracket:"Nawias kwadratowy otwierający",backSlash:"Ukośnik lewy",
+closeBracket:"Nawias kwadratowy zamykający",singleQuote:"Apostrof"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
index 1cf81f779..5f0735274 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pt-br",{title:"Instruções de Acessibilidade",contents:"Conteúdo da Ajuda. Para fechar este diálogo pressione ESC.",legend:[{name:"Geral",items:[{name:"Barra de Ferramentas do Editor",legend:"Pressione ${toolbarFocus} para navegar para a barra de ferramentas. Mova para o anterior ou próximo grupo de ferramentas com TAB e SHIFT+TAB. Mova para o anterior ou próximo botão com SETA PARA DIREITA or SETA PARA ESQUERDA. Pressione ESPAÇO ou ENTER para ativar o botão da barra de ferramentas."},
@@ -7,7 +7,6 @@ CKEDITOR.plugins.setLang("a11yhelp","pt-br",{title:"Instruções de Acessibilida
 {name:"Menu de Contexto do Editor",legend:"Pressione ${contextMenu} ou TECLA DE MENU para abrir o menu de contexto, então mova para a próxima opção com TAB ou SETA PARA BAIXO. Mova para a anterior com SHIFT+TAB ou SETA PARA CIMA. Pressione ESPAÇO ou ENTER para selecionar a opção do menu. Abra o submenu da opção atual com ESPAÇO ou ENTER ou SETA PARA DIREITA. Volte para o menu pai com ESC ou SETA PARA ESQUERDA. Feche o menu de contexto com ESC."},{name:"Caixa de Lista do Editor",legend:"Dentro de uma caixa de lista, mova para o próximo item com TAB ou SETA PARA BAIXO. Mova para o item anterior com SHIFT+TAB ou SETA PARA CIMA. Pressione ESPAÇO ou ENTER para selecionar uma opção na lista. Pressione ESC para fechar a caixa de lista."},
 {name:"Barra de Caminho do Elementos do Editor",legend:"Pressione ${elementsPathFocus} para a barra de caminho dos elementos. Mova para o próximo botão de elemento com TAB ou SETA PARA DIREITA. Mova para o botão anterior com SHIFT+TAB ou SETA PARA ESQUERDA. Pressione ESPAÇO ou ENTER para selecionar o elemento no editor."}]},{name:"Comandos",items:[{name:" Comando Desfazer",legend:"Pressione ${undo}"},{name:" Comando Refazer",legend:"Pressione ${redo}"},{name:" Comando Negrito",legend:"Pressione ${bold}"},
 {name:" Comando Itálico",legend:"Pressione ${italic}"},{name:" Comando Sublinhado",legend:"Pressione ${underline}"},{name:" Comando Link",legend:"Pressione ${link}"},{name:" Comando Fechar Barra de Ferramentas",legend:"Pressione ${toolbarCollapse}"},{name:"Acessar o comando anterior de spaço de foco",legend:"Pressione ${accessNextSpace} para acessar o espaço de foco não alcançável mais próximo antes do cursor, por exemplo: dois elementos HR adjacentes. Repita a combinação de teclas para alcançar espaços de foco distantes."},
-{name:"Acessar próximo fomando de spaço de foco",legend:"Pressione ${accessNextSpace} para acessar o espaço de foco não alcançável mais próximo após o cursor, por exemplo: dois elementos HR adjacentes. Repita a combinação de teclas para alcançar espaços de foco distantes."},{name:" Ajuda de Acessibilidade",legend:"Pressione ${a11yHelp}"}]}],backspace:"Tecla Backspace",tab:"Tecla Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",
-pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Seta à Esquerda",upArrow:"Seta à Cima",rightArrow:"Seta à Direita",downArrow:"Seta à Baixo",insert:"Insert","delete":"Delete",leftWindowKey:"Tecla do Windows Esquerda",rightWindowKey:"Tecla do Windows Direita",selectKey:"Tecla Selecionar",numpad0:"0 do Teclado Numérico",numpad1:"1 do Teclado Numérico",numpad2:"2 do Teclado Numérico",numpad3:"3 do Teclado Numérico",numpad4:"4 do Teclado Numérico",numpad5:"5 do Teclado Numérico",numpad6:"6 do Teclado Numérico",
-numpad7:"7 do Teclado Numérico",numpad8:"8 do Teclado Numérico",numpad9:"9 do Teclado Numérico",multiply:"Multiplicar",add:"Mais",subtract:"Subtrair",decimalPoint:"Ponto",divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Ponto-e-vírgula",equalSign:"Igual",comma:"Vírgula",dash:"Hífen",period:"Ponto",forwardSlash:"Barra",graveAccent:"Acento Grave",openBracket:"Abrir Conchetes",
-backSlash:"Contra-barra",closeBracket:"Fechar Colchetes",singleQuote:"Aspas Simples"});
\ No newline at end of file
+{name:"Acessar próximo fomando de spaço de foco",legend:"Pressione ${accessNextSpace} para acessar o espaço de foco não alcançável mais próximo após o cursor, por exemplo: dois elementos HR adjacentes. Repita a combinação de teclas para alcançar espaços de foco distantes."},{name:" Ajuda de Acessibilidade",legend:"Pressione ${a11yHelp}"}]}],tab:"Tecla Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Seta à Esquerda",upArrow:"Seta à Cima",rightArrow:"Seta à Direita",
+downArrow:"Seta à Baixo",insert:"Insert",leftWindowKey:"Tecla do Windows Esquerda",rightWindowKey:"Tecla do Windows Direita",selectKey:"Tecla Selecionar",numpad0:"0 do Teclado Numérico",numpad1:"1 do Teclado Numérico",numpad2:"2 do Teclado Numérico",numpad3:"3 do Teclado Numérico",numpad4:"4 do Teclado Numérico",numpad5:"5 do Teclado Numérico",numpad6:"6 do Teclado Numérico",numpad7:"7 do Teclado Numérico",numpad8:"8 do Teclado Numérico",numpad9:"9 do Teclado Numérico",multiply:"Multiplicar",add:"Mais",
+subtract:"Subtrair",decimalPoint:"Ponto",divide:"Dividir",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Ponto-e-vírgula",equalSign:"Igual",comma:"Vírgula",dash:"Hífen",period:"Ponto",forwardSlash:"Barra",graveAccent:"Acento Grave",openBracket:"Abrir Conchetes",backSlash:"Contra-barra",closeBracket:"Fechar Colchetes",singleQuote:"Aspas Simples"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
index e8475876a..9d3a27e40 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pt",{title:"Instruções de acessibilidade",contents:"Conteúdo de ajuda. Use a tecla ESC para fechar esta janela.",legend:[{name:"Geral",items:[{name:"Barra de ferramentas do editor",legend:"Clique em ${toolbarFocus} para navegar na barra de ferramentas. Para navegar entre o grupo da barra de ferramentas anterior e seguinte use TAB e SHIFT+TAB. Para navegar entre o botão da barra de ferramentas seguinte e anterior use a SETA DIREITA ou SETA ESQUERDA. Carregue em ESPAÇO ou ENTER para ativar o botão da barra de ferramentas."},
@@ -7,6 +7,6 @@ CKEDITOR.plugins.setLang("a11yhelp","pt",{title:"Instruções de acessibilidade"
 {name:"Editor de caixa em lista",legend:"Dentro de uma lista, para navegar para o item seguinte da lista use TAB ou SETA PARA BAIXO. Para o item anterior da lista use SHIFT+TAB ou SETA PARA BAIXO. Carregue em ESPAÇO ou ENTER para selecionar a opção lista. Carregue em ESC para fechar a caixa da lista."},{name:"Editor da barra de caminho dos elementos",legend:"Clique em ${elementsPathFocus} para navegar na barra de caminho dos elementos. Para o botão do elemento seguinte use TAB ou SETA DIREITA. para o botão anterior use SHIFT+TAB ou SETA ESQUERDA. Carregue em ESPAÇO ou ENTER para selecionar o elemento no editor."}]},
 {name:"Comandos",items:[{name:"Comando de anular",legend:"Carregar ${undo}"},{name:"Comando de refazer",legend:"Clique ${redo}"},{name:"Comando de negrito",legend:"Pressione ${bold}"},{name:"Comando de itálico",legend:"Pressione ${italic}"},{name:"Comando de sublinhado",legend:"Pressione ${underline}"},{name:"Comando de hiperligação",legend:"Pressione ${link}"},{name:"Comando de ocultar barra de ferramentas",legend:"Pressione ${toolbarCollapse}"},{name:"Aceder ao comando espaço de foco anterior",
 legend:"Clique em ${accessPreviousSpace} para aceder ao espaço do focos inalcançável mais perto antes do sinal de omissão, por exemplo: dois elementos HR adjacentes. Repetir a combinação da chave para alcançar os espaços dos focos distantes."},{name:"Acesso comando do espaço focus seguinte",legend:"Pressione ${accessNextSpace} para aceder ao espaço do focos inalcançável mais perto depois do sinal de omissão, por exemplo: dois elementos HR adjacentes. Repetir a combinação da chave para alcançar os espaços dos focos distantes."},
-{name:"Ajuda a acessibilidade",legend:"Pressione ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pausa",capslock:"Maiúsculas",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",end:"Fim",home:"Entrada",leftArrow:"Seta esquerda",upArrow:"Seta para cima",rightArrow:"Seta direita",downArrow:"Seta para baixo",insert:"Inserir","delete":"Eliminar",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",
-numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiplicar",add:"Adicionar",subtract:"Subtrair",decimalPoint:"Decimal Point",divide:"Separar",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Vírgula",dash:"Cardinal",period:"Ponto",
-forwardSlash:"Forward Slash",graveAccent:"Acento grave",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Plica"});
\ No newline at end of file
+{name:"Ajuda a acessibilidade",legend:"Pressione ${a11yHelp}"}]}],tab:"Tab",pause:"Pausa",capslock:"Maiúsculas",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Seta esquerda",upArrow:"Seta para cima",rightArrow:"Seta direita",downArrow:"Seta para baixo",insert:"Inserir",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",
+numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiplicar",add:"Adicionar",subtract:"Subtrair",decimalPoint:"Decimal Point",divide:"Separar",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Vírgula",dash:"Cardinal",period:"Ponto",forwardSlash:"Forward Slash",graveAccent:"Acento grave",openBracket:"Open Bracket",backSlash:"Backslash",
+closeBracket:"Close Bracket",singleQuote:"Plica"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
index a92f60f22..7a916d29b 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ro",{title:"Instrucțiuni de accesibilitate",contents:"Cuprins. Pentru a închide acest dialog, apăsați tasta ESC.",legend:[{name:"General",items:[{name:"Editează bara instrumente.",legend:"Apasă ${toolbarFocus} pentru a naviga prin bara de instrumente. Pentru a te mișca prin grupurile de instrumente folosește tastele TAB și SHIFT+TAB. Pentru a te mișca intre diverse instrumente folosește tastele SĂGEATĂ DREAPTA sau SĂGEATĂ STÂNGA. Apasă butonul SPAȚIU sau ENTER pentru activarea instrumentului."},
 {name:"Dialog editor",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor meniu contextual",legend:"Apasă ${contextMenu} sau TASTA MENIU pentru a deschide meniul contextual. Treci la următoarea opțiune din meniu cu TAB sau SĂGEATĂ JOS. Treci la opțiunea anterioară cu  SHIFT+TAB sau SĂGEATĂ SUS. Apasă SPAȚIU sau ENTER pentru a selecta opțiunea din meniu. Deschide sub-meniul opțiunii curente cu SPAȚIU sau ENTER sau SĂGEATĂ DREAPTA. Revino la elementul din meniul părinte cu ESC sau SĂGEATĂ STÂNGA. Închide meniul de context cu ESC."},
 {name:"Editor Casetă Listă",legend:"În interiorul unei liste, treci la următorull element cu TAB sau SĂGEATĂ JOS. Treci la elementul anterior din listă cu SHIFT+TAB sau SĂGEATĂ SUS. Apasă SPAȚIU sau ENTER pentru a selecta opțiunea din listă. Apasă ESC pentru a închide lista."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
 {name:"Comenzi",items:[{name:" Undo command",legend:"Apasă ${undo}"},{name:"Comanda precedentă",legend:"Apasă ${redo}"},{name:"Comanda Îngroșat",legend:"Apasă ${bold}"},{name:"Comanda Inclinat",legend:"Apasă ${italic}"},{name:"Comanda Subliniere",legend:"Apasă ${underline}"},{name:"Comanda Legatură",legend:"Apasă ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",
-upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
-f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",
+rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",
+equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
index 667c872d8..34f5cea9e 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ru",{title:"Горячие клавиши",contents:"Помощь. Для закрытия этого окна нажмите ESC.",legend:[{name:"Основное",items:[{name:"Панель инструментов",legend:"Нажмите ${toolbarFocus} для перехода к панели инструментов. Для перемещения между группами панели инструментов используйте TAB и SHIFT+TAB. Для перемещения между кнопками панели иструментов используйте кнопки ВПРАВО или ВЛЕВО. Нажмите ПРОБЕЛ или ENTER для запуска кнопки панели инструментов."},{name:"Диалоги",legend:'Внутри диалога, нажмите TAB чтобы перейти к следующему элементу диалога, нажмите SHIFT+TAB чтобы перейти к предыдущему элементу диалога, нажмите ENTER чтобы отправить диалог, нажмите ESC чтобы отменить диалог. Когда диалоговое окно имеет несколько вкладок, получить доступ к панели вкладок как части диалога можно нажатием или сочетания ALT+F10 или TAB, при этом активные элементы диалога будут перебираться с учетом порядка табуляции. При активной панели вкладок, переход к следующей или предыдущей вкладке осуществляется нажатием стрелки "ВПРАВО" или стрелки "ВЛЕВО" соответственно.'},
 {name:"Контекстное меню",legend:'Нажмите ${contextMenu} или клавишу APPLICATION, чтобы открыть контекстное меню. Затем перейдите к следующему пункту меню с помощью TAB или стрелкой "ВНИЗ". Переход к предыдущей опции - SHIFT+TAB или стрелкой "ВВЕРХ". Нажмите SPACE, или ENTER, чтобы задействовать опцию меню. Открыть подменю текущей опции - SPACE или ENTER или стрелкой "ВПРАВО". Возврат к родительскому пункту меню - ESC или стрелкой "ВЛЕВО". Закрытие контекстного меню - ESC.'},{name:"Редактор списка",
 legend:'Внутри окна списка, переход к следующему пункту списка - TAB или стрелкой "ВНИЗ". Переход к предыдущему пункту списка - SHIFT+TAB или стрелкой "ВВЕРХ". Нажмите SPACE, или ENTER, чтобы задействовать опцию списка. Нажмите ESC, чтобы закрыть окно списка.'},{name:"Путь к элементу",legend:'Нажмите ${elementsPathFocus}, чтобы перейти к панели пути элементов. Переход к следующей кнопке элемента - TAB или стрелкой "ВПРАВО". Переход к предыдущей кнопку - SHIFT+TAB или стрелкой "ВЛЕВО". Нажмите SPACE, или ENTER, чтобы выбрать элемент в редакторе.'}]},
 {name:"Команды",items:[{name:"Отменить",legend:"Нажмите ${undo}"},{name:"Повторить",legend:"Нажмите ${redo}"},{name:"Полужирный",legend:"Нажмите ${bold}"},{name:"Курсив",legend:"Нажмите ${italic}"},{name:"Подчеркнутый",legend:"Нажмите ${underline}"},{name:"Гиперссылка",legend:"Нажмите ${link}"},{name:"Свернуть панель инструментов",legend:"Нажмите ${toolbarCollapse}"},{name:"Команды доступа к предыдущему фокусному пространству",legend:'Нажмите ${accessPreviousSpace}, чтобы обратиться к ближайшему недостижимому фокусному пространству перед символом "^", например: два смежных HR элемента. Повторите комбинацию клавиш, чтобы достичь отдаленных фокусных пространств.'},
-{name:"Команды доступа к следующему фокусному пространству",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Справка по горячим клавишам",legend:"Нажмите ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",end:"End",
-home:"Home",leftArrow:"Стрелка влево",upArrow:"Стрелка вверх",rightArrow:"Стрелка вправо",downArrow:"Стрелка вниз",insert:"Insert","delete":"Delete",leftWindowKey:"Левая клавиша Windows",rightWindowKey:"Правая клавиша Windows",selectKey:"Выбрать",numpad0:"Цифра 0",numpad1:"Цифра 1",numpad2:"Цифра 2",numpad3:"Цифра 3",numpad4:"Цифра 4",numpad5:"Цифра 5",numpad6:"Цифра 6",numpad7:"Цифра 7",numpad8:"Цифра 8",numpad9:"Цифра 9",multiply:"Умножить",add:"Плюс",subtract:"Вычесть",decimalPoint:"Десятичная точка",
-divide:"Делить",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Точка с запятой",equalSign:"Равно",comma:"Запятая",dash:"Тире",period:"Точка",forwardSlash:"Наклонная черта",graveAccent:"Апостроф",openBracket:"Открыть скобку",backSlash:"Обратная наклонная черта",closeBracket:"Закрыть скобку",singleQuote:"Одинарная кавычка"});
\ No newline at end of file
+{name:"Команды доступа к следующему фокусному пространству",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Справка по горячим клавишам",legend:"Нажмите ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Стрелка влево",upArrow:"Стрелка вверх",rightArrow:"Стрелка вправо",downArrow:"Стрелка вниз",
+insert:"Insert",leftWindowKey:"Левая клавиша Windows",rightWindowKey:"Правая клавиша Windows",selectKey:"Выбрать",numpad0:"Цифра 0",numpad1:"Цифра 1",numpad2:"Цифра 2",numpad3:"Цифра 3",numpad4:"Цифра 4",numpad5:"Цифра 5",numpad6:"Цифра 6",numpad7:"Цифра 7",numpad8:"Цифра 8",numpad9:"Цифра 9",multiply:"Умножить",add:"Плюс",subtract:"Вычесть",decimalPoint:"Десятичная точка",divide:"Делить",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",
+scrollLock:"Scroll Lock",semiColon:"Точка с запятой",equalSign:"Равно",comma:"Запятая",dash:"Тире",period:"Точка",forwardSlash:"Наклонная черта",graveAccent:"Апостроф",openBracket:"Открыть скобку",backSlash:"Обратная наклонная черта",closeBracket:"Закрыть скобку",singleQuote:"Одинарная кавычка"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
index 56b5b92ad..7ca73410c 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","si",{title:"ළඟා වියහැකි ",contents:"උදව් සඳහා අන්තර්ගතය.නික්මයෙමට ESC බොත්තම ඔබන්න",legend:[{name:"පොදු කරුණු",items:[{name:"සංස්කරණ මෙවලම් ",legend:"ඔබන්න ${මෙවලම් තීරු අවධානය} මෙවලම් තීරුවේ එහා මෙහා යෑමට.ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරුකාණ්ඩය හා TAB හා SHIFT+TAB .ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරු බොත්තම සමග RIGHT ARROW හෝ LEFT ARROW.මෙවලම් තීරු බොත්තම සක්‍රිය කර ගැනීමට SPACE හෝ ENTER බොත්තම ඔබන්න."},{name:"සංස්කරණ ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"සංස්කරණ අඩංගුවට ",legend:"ඔබන්න ${අන්තර්ගත මෙනුව} හෝ  APPLICATION KEY  අන්තර්ගත-මෙනුව විවුරතකිරීමට. ඊළඟ මෙනුව-ව්කල්පයන්ට යෑමට TAB හෝ DOWN ARROW බොත්තම ද, පෙර විකල්පයන්ටයෑමට SHIFT+TAB හෝ  UP ARROW බොත්තම ද, මෙනුව-ව්කල්පයන් තේරීමට SPACE හෝ ENTER බොත්තම ද,  දැනට විවුර්තව ඇති උප-මෙනුවක වීකල්ප තේරීමට SPACE හෝ ENTER හෝ RIGHT ARROW ද, නැවත පෙර ප්‍රධාන මෙනුවට යෑමට  ESC හෝ LEFT ARROW බොත්තම ද.  අන්තර්ගත-මෙනුව වැසීමට  ESC බොත්තම ද ඔබන්න."},{name:"සංස්කරණ තේරුම් ",legend:"තේරුම් කොටුව තුළ , ඊළඟ අයිතමයට යෑමට TAB හෝ DOWN ARROW , පෙර අයිතමයට යෑමට SHIFT+TAB හෝ UP ARROW . අයිතම විකල්පයන් තේරීමට SPACE හෝ ENTER ,තේරුම් කොටුව වැසීමට ESC බොත්තම් ද ඔබන්න."},
 {name:"සංස්කරණ අංග සහිත ",legend:"ඔබන්න ${මෙවලම් තීරු අවධානය} මෙවලම් තීරුවේ එහා මෙහා යෑමට.ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරුකාණ්ඩය හා TAB හා SHIFT+TAB .ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරු බොත්තම සමග RIGHT ARROW හෝ LEFT ARROW.මෙවලම් තීරු බොත්තම සක්‍රිය කර ගැනීමට SPACE හෝ ENTER බොත්තම ඔබන්න."}]},{name:"විධාන",items:[{name:"විධානය වෙනස් ",legend:"ඔබන්න ${වෙනස් කිරීම}"},{name:"විධාන නැවත් පෙර පරිදිම වෙනස්කර ගැනීම.",legend:"ඔබන්න ${නැවත් පෙර පරිදිම වෙනස්කර ගැනීම}"},{name:"තද අකුරින් විධාන",legend:"ඔබන්න ${තද }"},
-{name:"බැධී අකුරු විධාන",legend:"ඔබන්න ${බැධී අකුරු }"},{name:"යටින් ඉරි ඇද ඇති විධාන.",legend:"ඔබන්න ${යටින් ඉරි ඇද ඇති}"},{name:"සම්බන්ධිත විධාන",legend:"ඔබන්න ${සම්බන්ධ }"},{name:"මෙවලම් තීරු හැකුලුම් විධාන",legend:"ඔබන්න ${මෙවලම් තීරු හැකුලුම් }"},{name:"යොමුවීමට පෙර  වැදගත්  විධාන",legend:"ඔබන්න ${යොමුවීමට ඊළඟ }"},{name:"යොමුවීමට ඊළග වැදගත්  විධාන",legend:"ඔබන්න ${යොමුවීමට ඊළඟ }"},{name:"ප්‍රවේශ ",legend:"ඔබන්න  ${a11y }"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",
-alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",
-numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"බැධී අකුරු විධාන",legend:"ඔබන්න ${බැධී අකුරු }"},{name:"යටින් ඉරි ඇද ඇති විධාන.",legend:"ඔබන්න ${යටින් ඉරි ඇද ඇති}"},{name:"සම්බන්ධිත විධාන",legend:"ඔබන්න ${සම්බන්ධ }"},{name:"මෙවලම් තීරු හැකුලුම් විධාන",legend:"ඔබන්න ${මෙවලම් තීරු හැකුලුම් }"},{name:"යොමුවීමට පෙර  වැදගත්  විධාන",legend:"ඔබන්න ${යොමුවීමට ඊළඟ }"},{name:"යොමුවීමට ඊළග වැදගත්  විධාන",legend:"ඔබන්න ${යොමුවීමට ඊළඟ }"},{name:"ප්‍රවේශ ",legend:"ඔබන්න  ${a11y }"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",
+pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
index 6f16ff964..f637562a4 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sk",{title:"Inštrukcie prístupnosti",contents:"Pomocný obsah. Pre zatvorenie tohto okna, stlačte ESC.",legend:[{name:"Všeobecne",items:[{name:"Lišta nástrojov editora",legend:"Stlačte ${toolbarFocus} pre navigáciu na lištu nástrojov. Medzi ďalšou a predchádzajúcou lištou nástrojov sa pohybujete s TAB a SHIFT+TAB. Medzi ďalším a predchádzajúcim tlačidlom na lište nástrojov sa pohybujete s pravou šípkou a ľavou šípkou. Stlačte medzerník alebo ENTER pre aktiváciu tlačidla lišty nástrojov."},
-{name:"Editorový dialóg",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editorové kontextové menu",legend:"Stlačte ${contextMenu} alebo APPLICATION KEY pre otvorenie kontextového menu. Potom sa presúvajte na ďalšie možnosti menu s TAB alebo dolnou šípkou. Presunte sa k predchádzajúcej možnosti s SHIFT+TAB alebo hornou šípkou. Stlačte medzerník alebo ENTER pre výber možnosti menu. Otvorte pod-menu danej možnosti s medzerníkom, alebo ENTER, alebo pravou šípkou. Vráťte sa späť do položky rodičovského menu s ESC alebo ľavou šípkou. Zatvorte kontextové menu s ESC."},
+{name:"Editorový dialóg",legend:"V dialógovom okne stlačte TAB pre presun na ďalší prvok, SHIFT+TAB pre presun na predchádzajúci prvok, ENTER pre odoslanie, ESC pre zrušenie. Keď má dialógové okno viacero kariet, zoznam kariet dosiahnete buď stlačením ALT+F10 alebo s TAB v príslušnom poradí kariet. So zameraným zoznamom kariet sa pohybujte k ďalšej alebo predchádzajúcej karte cez PRAVÚ a ĽAVÚ ŠÍPKU."},{name:"Editorové kontextové menu",legend:"Stlačte ${contextMenu} alebo APPLICATION KEY pre otvorenie kontextového menu. Potom sa presúvajte na ďalšie možnosti menu s TAB alebo dolnou šípkou. Presunte sa k predchádzajúcej možnosti s SHIFT+TAB alebo hornou šípkou. Stlačte medzerník alebo ENTER pre výber možnosti menu. Otvorte pod-menu danej možnosti s medzerníkom, alebo ENTER, alebo pravou šípkou. Vráťte sa späť do položky rodičovského menu s ESC alebo ľavou šípkou. Zatvorte kontextové menu s ESC."},
 {name:"Editorov box zoznamu",legend:"V boxe zoznamu, presuňte sa na ďalšiu položku v zozname s TAB alebo dolnou šípkou. Presuňte sa k predchádzajúcej položke v zozname so SHIFT+TAB alebo hornou šípkou. Stlačte medzerník alebo ENTER pre výber možnosti zoznamu. Stlačte ESC pre zatvorenie boxu zoznamu."},{name:"Editorove pásmo cesty prvku",legend:"Stlačte ${elementsPathFocus} pre navigovanie na pásmo cesty elementu. Presuňte sa na tlačidlo ďalšieho prvku s TAB alebo pravou šípkou. Presuňte sa k predchádzajúcemu tlačidlu s SHIFT+TAB alebo ľavou šípkou. Stlačte medzerník alebo ENTER pre výber prvku v editore."}]},
 {name:"Príkazy",items:[{name:"Vrátiť príkazy",legend:"Stlačte ${undo}"},{name:"Nanovo vrátiť príkaz",legend:"Stlačte ${redo}"},{name:"Príkaz na stučnenie",legend:"Stlačte ${bold}"},{name:"Príkaz na kurzívu",legend:"Stlačte ${italic}"},{name:"Príkaz na podčiarknutie",legend:"Stlačte ${underline}"},{name:"Príkaz na odkaz",legend:"Stlačte ${link}"},{name:"Príkaz na zbalenie lišty nástrojov",legend:"Stlačte ${toolbarCollapse}"},{name:"Prejsť na predchádzajúcu zamerateľnú medzeru príkazu",legend:"Stlačte ${accessPreviousSpace} pre prístup na najbližšie nedosiahnuteľné zamerateľné medzery pred vsuvkuo. Napríklad: dve za sebou idúce horizontálne čiary. Opakujte kombináciu klávesov pre dosiahnutie vzdialených zamerateľných medzier."},
-{name:"Prejsť na ďalší ",legend:"Stlačte ${accessNextSpace} pre prístup na najbližšie nedosiahnuteľné zamerateľné medzery po vsuvke. Napríklad: dve za sebou idúce horizontálne čiary. Opakujte kombináciu klávesov pre dosiahnutie vzdialených zamerateľných medzier."},{name:"Pomoc prístupnosti",legend:"Stlačte ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Stránka hore",pageDown:"Stránka dole",
-end:"End",home:"Home",leftArrow:"Šípka naľavo",upArrow:"Šípka hore",rightArrow:"Šípka napravo",downArrow:"Šípka dole",insert:"Insert","delete":"Delete",leftWindowKey:"Ľavé Windows tlačidlo",rightWindowKey:"Pravé Windows tlačidlo",selectKey:"Tlačidlo Select",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Násobenie",add:"Sčítanie",subtract:"Odčítanie",
-decimalPoint:"Desatinná čiarka",divide:"Delenie",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Bodkočiarka",equalSign:"Rovná sa",comma:"Čiarka",dash:"Pomĺčka",period:"Bodka",forwardSlash:"Lomítko",graveAccent:"Zdôrazňovanie prízvuku",openBracket:"Hranatá zátvorka otváracia",backSlash:"Backslash",closeBracket:"Hranatá zátvorka zatváracia",singleQuote:"Jednoduché úvodzovky"});
\ No newline at end of file
+{name:"Prejsť na ďalší ",legend:"Stlačte ${accessNextSpace} pre prístup na najbližšie nedosiahnuteľné zamerateľné medzery po vsuvke. Napríklad: dve za sebou idúce horizontálne čiary. Opakujte kombináciu klávesov pre dosiahnutie vzdialených zamerateľných medzier."},{name:"Pomoc prístupnosti",legend:"Stlačte ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Stránka hore",pageDown:"Stránka dole",leftArrow:"Šípka naľavo",upArrow:"Šípka hore",rightArrow:"Šípka napravo",
+downArrow:"Šípka dole",insert:"Insert",leftWindowKey:"Ľavé Windows tlačidlo",rightWindowKey:"Pravé Windows tlačidlo",selectKey:"Tlačidlo Select",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Násobenie",add:"Sčítanie",subtract:"Odčítanie",decimalPoint:"Desatinná čiarka",divide:"Delenie",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",
+f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Bodkočiarka",equalSign:"Rovná sa",comma:"Čiarka",dash:"Pomĺčka",period:"Bodka",forwardSlash:"Lomítko",graveAccent:"Zdôrazňovanie prízvuku",openBracket:"Hranatá zátvorka otváracia",backSlash:"Backslash",closeBracket:"Hranatá zátvorka zatváracia",singleQuote:"Jednoduché úvodzovky"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
index eab5ea933..01cfc7fd9 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sl",{title:"Navodila za dostopnost",contents:"Vsebina pomoči. Če želite zapreti pogovorno okno, pritisnite ESC.",legend:[{name:"Splošno",items:[{name:"Orodna vrstica urejevalnika",legend:"Pritisnite ${toolbarFocus} za pomik v orodno vrstico. Z TAB in SHIFT+TAB se pomikate na naslednjo in prejšnjo skupino orodne vrstice. Z DESNO PUŠČICO ali LEVO PUŠČICO se pomikate na naslednji in prejšnji gumb orodne vrstice. Pritisnite SPACE ali ENTER, da aktivirate gumb orodne vrstice."},
 {name:"Urejevalno Pogovorno Okno",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Kontekstni meni urejevalnika",legend:"Pritisnite ${contextMenu} ali APPLICATION KEY, da odprete kontekstni meni. Nato se premaknite na naslednjo možnost menija s tipko TAB ali PUŠČICA DOL. Premakniti se na prejšnjo možnost z SHIFT + TAB ali PUŠČICA GOR. Pritisnite SPACE ali ENTER za izbiro možnosti menija. Odprite podmeni trenutne možnosti menija s tipko SPACE ali ENTER ali DESNA PUŠČICA. Vrnite se na matični element menija s tipko ESC ali LEVA PUŠČICA. Zaprite kontekstni meni z ESC."},
 {name:"Urejevalno Seznamsko Polje",legend:"Znotraj seznama, se premaknete na naslednji element seznama s tipko TAB ali PUŠČICO DOL. Z SHIFT+TAB ali PUŠČICO GOR se premaknete na prejšnji element seznama. Pritisnite tipko SPACE ali ENTER za izbiro elementa. Pritisnite tipko ESC, da zaprete seznam."},{name:"Urejevalna vrstica poti elementa",legend:"Pritisnite ${elementsPathFocus} za pomikanje po vrstici elementnih poti. S TAB ali DESNA PUŠČICA se premaknete na naslednji gumb elementa. Z SHIFT+TAB ali LEVO PUŠČICO se premaknete na prejšnji gumb elementa. Pritisnite SPACE ali ENTER za izbiro elementa v urejevalniku."}]},
 {name:"Ukazi",items:[{name:"Razveljavi ukaz",legend:"Pritisnite ${undo}"},{name:"Ponovi ukaz",legend:"Pritisnite ${redo}"},{name:"Krepki ukaz",legend:"Pritisnite ${bold}"},{name:"Ležeči ukaz",legend:"Pritisnite ${italic}"},{name:"Poudarni ukaz",legend:"Pritisnite ${underline}"},{name:"Ukaz povezave",legend:"Pritisnite ${link}"},{name:"Skrči Orodno Vrstico Ukaz",legend:"Pritisnite ${toolbarCollapse}"},{name:"Dostop do prejšnjega ukaza ostrenja",legend:"Pritisnite ${accessPreviousSpace} za dostop do najbližjega nedosegljivega osredotočenega prostora pred strešico, npr.: dva sosednja HR elementa. Ponovite kombinacijo tipk, da dosežete oddaljene osredotočene prostore."},
-{name:"Dostop do naslednjega ukaza ostrenja",legend:"Pritisnite ${accessNextSpace} za dostop do najbližjega nedosegljivega osredotočenega prostora po strešici, npr.: dva sosednja HR elementa. Ponovite kombinacijo tipk, da dosežete oddaljene osredotočene prostore."},{name:"Pomoč dostopnosti",legend:"Pritisnite ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",
-home:"Home",leftArrow:"Puščica levo",upArrow:"Puščica gor",rightArrow:"Puščica desno",downArrow:"Puščica dol",insert:"Insert","delete":"Delete",leftWindowKey:"Leva tipka Windows",rightWindowKey:"Desna tipka Windows",selectKey:"Select tipka",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Zmnoži",add:"Dodaj",subtract:"Odštej",decimalPoint:"Decimalna vejica",
-divide:"Deli",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Podpičje",equalSign:"Enačaj",comma:"Vejica",dash:"Vezaj",period:"Pika",forwardSlash:"Desna poševnica",graveAccent:"Krativec",openBracket:"Oklepaj",backSlash:"Leva poševnica",closeBracket:"Zaklepaj",singleQuote:"Opuščaj"});
\ No newline at end of file
+{name:"Dostop do naslednjega ukaza ostrenja",legend:"Pritisnite ${accessNextSpace} za dostop do najbližjega nedosegljivega osredotočenega prostora po strešici, npr.: dva sosednja HR elementa. Ponovite kombinacijo tipk, da dosežete oddaljene osredotočene prostore."},{name:"Pomoč dostopnosti",legend:"Pritisnite ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Puščica levo",upArrow:"Puščica gor",rightArrow:"Puščica desno",
+downArrow:"Puščica dol",insert:"Insert",leftWindowKey:"Leva tipka Windows",rightWindowKey:"Desna tipka Windows",selectKey:"Select tipka",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Zmnoži",add:"Dodaj",subtract:"Odštej",decimalPoint:"Decimalna vejica",divide:"Deli",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",
+f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Podpičje",equalSign:"Enačaj",comma:"Vejica",dash:"Vezaj",period:"Pika",forwardSlash:"Desna poševnica",graveAccent:"Krativec",openBracket:"Oklepaj",backSlash:"Leva poševnica",closeBracket:"Zaklepaj",singleQuote:"Opuščaj"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
index 8f9d5c782..247e9faaa 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sq",{title:"Udhëzimet e Qasjes",contents:"Përmbajtja ndihmëse. Për ta mbyllur dialogun shtyp ESC.",legend:[{name:"Të përgjithshme",items:[{name:"Shiriti i Redaktuesit",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Dialogu i Redaktuesit",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Komandat",items:[{name:"Rikthe komandën",legend:"Shtyp ${undo}"},{name:"Ribëj komandën",legend:"Shtyp ${redo}"},{name:"Komanda e trashjes së tekstit",legend:"Shtyp ${bold}"},{name:"Komanda kursive",legend:"Shtyp ${italic}"},
 {name:"Komanda e nënvijëzimit",legend:"Shtyp ${underline}"},{name:"Komanda e Nyjes",legend:"Shtyp ${link}"},{name:" Toolbar Collapse command",legend:"Shtyp ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:"Ndihmë Qasjeje",legend:"Shtyp ${a11yHelp}"}]}],backspace:"Prapa",tab:"Fletë",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Shenja majtas",upArrow:"Shenja sipër",rightArrow:"Shenja djathtas",downArrow:"Shenja poshtë",insert:"Shto","delete":"Grise",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Shto",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Presje",dash:"vizë",period:"Pikë",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Hape kllapën",backSlash:"Backslash",closeBracket:"Mbylle kllapën",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Ndihmë Qasjeje",legend:"Shtyp ${a11yHelp}"}]}],tab:"Fletë",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Shenja majtas",upArrow:"Shenja sipër",rightArrow:"Shenja djathtas",downArrow:"Shenja poshtë",insert:"Shto",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Shto",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Presje",dash:"vizë",period:"Pikë",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Hape kllapën",backSlash:"Backslash",closeBracket:"Mbylle kllapën",
+singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
index ee71b676c..da29ebdfb 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sr-latn",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Opšte",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
index fd04d223c..02ebb1c35 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sr",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Опште",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
 legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
index 751a0751f..720193fb8 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sv",{title:"Hjälpmedelsinstruktioner",contents:"Hjälpinnehåll. För att stänga denna dialogruta trycker du på ESC.",legend:[{name:"Allmänt",items:[{name:"Editor verktygsfält",legend:"Tryck på ${toolbarFocus} för att navigera till verktygsfältet. Flytta till nästa och föregående verktygsfältsgrupp med TAB och SHIFT+TAB. Flytta till nästa och föregående knapp i verktygsfältet med HÖGERPIL eller VÄNSTERPIL. Tryck SPACE eller ENTER för att aktivera knappen i verktygsfältet."},
 {name:"Dialogeditor",legend:"Inuti en dialogruta, tryck TAB för att navigera till nästa fält i dialogrutan, tryck SKIFT+TAB för att flytta till föregående fält, tryck ENTER för att skicka. Du avbryter och stänger dialogen med ESC. För dialogrutor som har flera flikar, tryck ALT+F10 eller TAB för att navigera till fliklistan. med fliklistan vald flytta till nästa och föregående flik med HÖGER- eller VÄNSTERPIL."},{name:"Editor för innehållsmeny",legend:"Tryck på $ {contextMenu} eller PROGRAMTANGENTEN för att öppna snabbmenyn. Flytta sedan till nästa menyalternativ med TAB eller NEDPIL. Flytta till föregående alternativ med SHIFT + TABB eller UPPIL. Tryck Space eller ENTER för att välja menyalternativ. Öppna undermeny av nuvarande alternativ med SPACE eller ENTER eller HÖGERPIL. Gå tillbaka till överordnade menyalternativ med ESC eller VÄNSTERPIL. Stäng snabbmenyn med ESC."},
 {name:"Editor för list-box",legend:"Inuti en list-box, gå till nästa listobjekt med TAB eller NEDPIL. Flytta till föregående listobjekt med SHIFT+TAB eller UPPIL. Tryck SPACE eller ENTER för att välja listan alternativet. Tryck ESC för att stänga list-boxen."},{name:"Editor för elementens sökväg",legend:"Tryck på ${elementsPathFocus} för att navigera till verktygsfältet för elementens sökvägar. Flytta till nästa elementknapp med TAB eller HÖGERPIL. Flytta till föregående knapp med SKIFT+TAB eller VÄNSTERPIL. Tryck SPACE eller ENTER för att välja element i redigeraren."}]},
 {name:"Kommandon",items:[{name:"Ångra kommando",legend:"Tryck på ${undo}"},{name:"Gör om kommando",legend:"Tryck på ${redo}"},{name:"Kommandot fet stil",legend:"Tryck på ${bold}"},{name:"Kommandot kursiv",legend:"Tryck på ${italic}"},{name:"Kommandot understruken",legend:"Tryck på ${underline}"},{name:"Kommandot länk",legend:"Tryck på ${link}"},{name:"Verktygsfält Dölj kommandot",legend:"Tryck på ${toolbarCollapse}"},{name:"Gå till föregående fokus plats",legend:"Tryck på ${accessPreviousSpace} för att gå till närmast onåbara utrymme före markören, exempel: två intilliggande HR element. Repetera tangentkombinationen för att gå till nästa."},
-{name:"Tillgå nästa fokuskommandots utrymme",legend:"Tryck ${accessNextSpace} på för att komma åt den närmaste onåbar fokus utrymme efter cirkumflex, till exempel: två intilliggande HR element. Upprepa tangentkombinationen för att nå avlägsna fokus utrymmen."},{name:"Hjälp om tillgänglighet",legend:"Tryck ${a11yHelp}"}]}],backspace:"Backsteg",tab:"Tab",enter:"Retur",shift:"Skift",ctrl:"Ctrl",alt:"Alt",pause:"Paus",capslock:"Caps lock",escape:"Escape",pageUp:"Sida Up",pageDown:"Sida Ned",end:"Slut",
-home:"Hem",leftArrow:"Vänsterpil",upArrow:"Uppil",rightArrow:"Högerpil",downArrow:"Nedåtpil",insert:"Infoga","delete":"Radera",leftWindowKey:"Vänster Windowstangent",rightWindowKey:"Höger Windowstangent",selectKey:"Välj tangent",numpad0:"Nummer 0",numpad1:"Nummer 1",numpad2:"Nummer 2",numpad3:"Nummer 3",numpad4:"Nummer 4",numpad5:"Nummer 5",numpad6:"Nummer 6",numpad7:"Nummer 7",numpad8:"Nummer 8",numpad9:"Nummer 9",multiply:"Multiplicera",add:"Addera",subtract:"Minus",decimalPoint:"Decimalpunkt",
-divide:"Dividera",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Lika med tecken",comma:"Komma",dash:"Minus",period:"Punkt",forwardSlash:"Snedstreck framåt",graveAccent:"Accent",openBracket:"Öppningsparentes",backSlash:"Snedstreck bakåt",closeBracket:"Slutparentes",singleQuote:"Enkelt Citattecken"});
\ No newline at end of file
+{name:"Tillgå nästa fokuskommandots utrymme",legend:"Tryck ${accessNextSpace} på för att komma åt den närmaste onåbar fokus utrymme efter cirkumflex, till exempel: två intilliggande HR element. Upprepa tangentkombinationen för att nå avlägsna fokus utrymmen."},{name:"Hjälp om tillgänglighet",legend:"Tryck ${a11yHelp}"}]}],tab:"Tab",pause:"Paus",capslock:"Caps lock",escape:"Escape",pageUp:"Sida Up",pageDown:"Sida Ned",leftArrow:"Vänsterpil",upArrow:"Uppil",rightArrow:"Högerpil",downArrow:"Nedåtpil",
+insert:"Infoga",leftWindowKey:"Vänster Windowstangent",rightWindowKey:"Höger Windowstangent",selectKey:"Välj tangent",numpad0:"Nummer 0",numpad1:"Nummer 1",numpad2:"Nummer 2",numpad3:"Nummer 3",numpad4:"Nummer 4",numpad5:"Nummer 5",numpad6:"Nummer 6",numpad7:"Nummer 7",numpad8:"Nummer 8",numpad9:"Nummer 9",multiply:"Multiplicera",add:"Addera",subtract:"Minus",decimalPoint:"Decimalpunkt",divide:"Dividera",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",
+numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Lika med tecken",comma:"Komma",dash:"Minus",period:"Punkt",forwardSlash:"Snedstreck framåt",graveAccent:"Accent",openBracket:"Öppningsparentes",backSlash:"Snedstreck bakåt",closeBracket:"Slutparentes",singleQuote:"Enkelt Citattecken"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
index 2499b992f..a61d6cf7b 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
@@ -1,11 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","th",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"ทั่วไป",items:[{name:"แถบเครื่องมือสำหรับเครื่องมือช่วยพิมพ์",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"คำสั่ง",items:[{name:"เลิกทำคำสั่ง",legend:"วาง ${undo}"},{name:"คำสั่งสำหรับทำซ้ำ",legend:"วาง ${redo}"},{name:"คำสั่งสำหรับตัวหนา",legend:"วาง ${bold}"},{name:"คำสั่งสำหรับตัวเอียง",legend:"วาง ${italic}"},{name:"คำสั่งสำหรับขีดเส้นใต้",
 legend:"วาง ${underline}"},{name:"คำสั่งสำหรับลิงก์",legend:"วาง ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",
+numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
index 1eb46ce39..87769c2c2 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","tr",{title:"Erişilebilirlik Talimatları",contents:"Yardım içeriği. Bu pencereyi kapatmak için ESC tuşuna basın.",legend:[{name:"Genel",items:[{name:"Düzenleyici Araç Çubuğu",legend:"Araç çubuğunda gezinmek için ${toolbarFocus} basın. TAB ve SHIFT+TAB ile önceki ve sonraki araç çubuğu grubuna taşıyın. SAĞ OK veya SOL OK ile önceki ve sonraki bir araç çubuğu düğmesini hareket ettirin. SPACE tuşuna basın veya araç çubuğu düğmesini etkinleştirmek için ENTER tuşna basın."},
@@ -7,6 +7,6 @@ CKEDITOR.plugins.setLang("a11yhelp","tr",{title:"Erişilebilirlik Talimatları",
 {name:"İçerik Menü Editörü",legend:"İçerik menüsünü açmak için ${contextMenu} veya UYGULAMA TUŞU'na basın. Daha sonra SEKME veya AŞAĞI OK ile bir sonraki menü seçeneği taşıyın. SHIFT + TAB veya YUKARI OK ile önceki seçeneğe gider. Menü seçeneğini seçmek için SPACE veya ENTER tuşuna basın. Seçili seçeneğin alt menüsünü SPACE ya da ENTER veya SAĞ OK açın. Üst menü öğesini geçmek için ESC veya SOL OK ile geri dönün. ESC ile bağlam menüsünü kapatın."},{name:"Liste Kutusu Editörü",legend:"Liste kutusu içinde, bir sonraki liste öğesine SEKME VEYA AŞAĞI OK ile taşıyın. SHIFT+TAB veya YUKARI önceki liste öğesi taşıyın. Liste seçeneği seçmek için SPACE veya ENTER tuşuna basın. Liste kutusunu kapatmak için ESC tuşuna basın."},
 {name:"Element Yol Çubuğu Editörü",legend:"Elementlerin yol çubuğunda gezinmek için ${ElementsPathFocus} basın. SEKME veya SAĞ OK ile sonraki element düğmesine taşıyın. SHIFT+TAB veya SOL OK önceki düğmeye hareket ettirin. Editör içindeki elementi seçmek için ENTER veya SPACE tuşuna basın."}]},{name:"Komutlar",items:[{name:"Komutu geri al",legend:"$(undo)'ya basın"},{name:"Komutu geri al",legend:"${redo} basın"},{name:" Kalın komut",legend:"${bold} basın"},{name:" İtalik komutu",legend:"${italic} basın"},
 {name:" Alttan çizgi komutu",legend:"${underline} basın"},{name:" Bağlantı komutu",legend:"${link} basın"},{name:" Araç çubuğu Toplama komutu",legend:"${toolbarCollapse} basın"},{name:"Önceki komut alanına odaklan",legend:"Düzeltme imleçinden önce, en yakın uzaktaki alana erişmek için ${accessPreviousSpace} basın, örneğin: iki birleşik HR elementleri. Aynı tuş kombinasyonu tekrarıyla diğer alanlarada ulaşın."},{name:"Sonraki komut alanına odaklan",legend:"Düzeltme imleçinden sonra, en yakın uzaktaki alana erişmek için ${accessNextSpace} basın, örneğin: iki birleşik HR elementleri. Aynı tuş kombinasyonu tekrarıyla diğer alanlarada ulaşın."},
-{name:"Erişilebilirlik Yardımı",legend:"${a11yHelp}'e basın"}]}],backspace:"Silme",tab:"Sekme tuşu",enter:"Gir tuşu",shift:'"Shift" Kaydırma tuşu',ctrl:'"Ctrl" Kontrol tuşu',alt:'"Alt" Anahtar tuşu',pause:"Durdurma tuşu",capslock:"Büyük harf tuşu",escape:"Vazgeç tuşu",pageUp:"Sayfa Yukarı",pageDown:"Sayfa Aşağı",end:"Sona",home:"En başa",leftArrow:"Sol ok",upArrow:"Yukarı ok",rightArrow:"Sağ ok",downArrow:"Aşağı ok",insert:"Araya gir","delete":"Silme",leftWindowKey:"Sol windows tuşu",rightWindowKey:"Sağ windows tuşu",
-selectKey:"Seçme tuşu",numpad0:"Nümerik 0",numpad1:"Nümerik 1",numpad2:"Nümerik 2",numpad3:"Nümerik 3",numpad4:"Nümerik 4",numpad5:"Nümerik 5",numpad6:"Nümerik 6",numpad7:"Nümerik 7",numpad8:"Nümerik 8",numpad9:"Nümerik 9",multiply:"Çarpma",add:"Toplama",subtract:"Çıkarma",decimalPoint:"Ondalık işareti",divide:"Bölme",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lk",scrollLock:"Scr Lk",semiColon:"Noktalı virgül",equalSign:"Eşittir",
-comma:"Virgül",dash:"Eksi",period:"Nokta",forwardSlash:"İleri eğik çizgi",graveAccent:"Üst tırnak",openBracket:"Parantez aç",backSlash:"Ters eğik çizgi",closeBracket:"Parantez kapa",singleQuote:"Tek tırnak"});
\ No newline at end of file
+{name:"Erişilebilirlik Yardımı",legend:"${a11yHelp}'e basın"}]}],tab:"Sekme tuşu",pause:"Durdurma tuşu",capslock:"Büyük harf tuşu",escape:"Vazgeç tuşu",pageUp:"Sayfa Yukarı",pageDown:"Sayfa Aşağı",leftArrow:"Sol ok",upArrow:"Yukarı ok",rightArrow:"Sağ ok",downArrow:"Aşağı ok",insert:"Araya gir",leftWindowKey:"Sol windows tuşu",rightWindowKey:"Sağ windows tuşu",selectKey:"Seçme tuşu",numpad0:"Nümerik 0",numpad1:"Nümerik 1",numpad2:"Nümerik 2",numpad3:"Nümerik 3",numpad4:"Nümerik 4",numpad5:"Nümerik 5",
+numpad6:"Nümerik 6",numpad7:"Nümerik 7",numpad8:"Nümerik 8",numpad9:"Nümerik 9",multiply:"Çarpma",add:"Toplama",subtract:"Çıkarma",decimalPoint:"Ondalık işareti",divide:"Bölme",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lk",scrollLock:"Scr Lk",semiColon:"Noktalı virgül",equalSign:"Eşittir",comma:"Virgül",dash:"Eksi",period:"Nokta",forwardSlash:"İleri eğik çizgi",graveAccent:"Üst tırnak",openBracket:"Parantez aç",backSlash:"Ters eğik çizgi",
+closeBracket:"Parantez kapa",singleQuote:"Tek tırnak"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
index 40d8b2833..665dd37ca 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","tt",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Гомуми",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
 {name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Командалар",items:[{name:"Кайтару",legend:"${undo} басыгыз"},{name:"Кабатлау",legend:"${redo} басыгыз"},{name:"Калын",legend:"${bold} басыгыз"},{name:"Курсив",legend:"${italic} басыгыз"},{name:"Астына сызылган",legend:"${underline} басыгыз"},
 {name:"Сылталама",legend:"${link} басыгыз"},{name:" Toolbar Collapse command",legend:"${toolbarCollapse} басыгыз"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"${a11yHelp} басыгыз"}]}],backspace:"Кайтару",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Тыныш",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Сул якка ук",upArrow:"Өскә таба ук",rightArrow:"Уң якка ук",downArrow:"Аска таба ук",insert:"Өстәү","delete":"Бетерү",leftWindowKey:"Сул Windows төймəсе",rightWindowKey:"Уң Windows төймəсе",selectKey:"Select төймəсе",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Тапкырлау",add:"Кушу",subtract:"Алу",decimalPoint:"Унарлы нокта",divide:"Бүлү",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Нокталы өтер",equalSign:"Тигезлек билгесе",comma:"Өтер",dash:"Сызык",period:"Дәрәҗә",forwardSlash:"Кыек сызык",
-graveAccent:"Гравис",openBracket:"Җәя ачу",backSlash:"Кире кыек сызык",closeBracket:"Җәя ябу",singleQuote:"Бер иңле куштырнаклар"});
\ No newline at end of file
+{name:" Accessibility Help",legend:"${a11yHelp} басыгыз"}]}],tab:"Tab",pause:"Тыныш",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Сул якка ук",upArrow:"Өскә таба ук",rightArrow:"Уң якка ук",downArrow:"Аска таба ук",insert:"Өстәү",leftWindowKey:"Сул Windows төймəсе",rightWindowKey:"Уң Windows төймəсе",selectKey:"Select төймəсе",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",
+numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Тапкырлау",add:"Кушу",subtract:"Алу",decimalPoint:"Унарлы нокта",divide:"Бүлү",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Нокталы өтер",equalSign:"Тигезлек билгесе",comma:"Өтер",dash:"Сызык",period:"Дәрәҗә",forwardSlash:"Кыек сызык",graveAccent:"Гравис",openBracket:"Җәя ачу",backSlash:"Кире кыек сызык",closeBracket:"Җәя ябу",
+singleQuote:"Бер иңле куштырнаклар"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
index c7fe6fd2b..fb74e518c 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
@@ -1,12 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ug",{title:"قوشۇمچە چۈشەندۈرۈش",contents:"ياردەم مەزمۇنى. بۇ سۆزلەشكۈنى ياپماقچى بولسىڭىز ESC نى بېسىڭ.",legend:[{name:"ئادەتتىكى",items:[{name:"قورال بالداق تەھرىر",legend:"${toolbarFocus} بېسىلسا قورال بالداققا يېتەكلەيدۇ، TAB ياكى SHIFT+TAB ئارقىلىق قورال بالداق گۇرۇپپىسى تاللىنىدۇ، ئوڭ سول يا ئوقتا توپچا تاللىنىدۇ، بوشلۇق ياكى Enter كۇنۇپكىسىدا تاللانغان توپچىنى قوللىنىدۇ."},{name:"تەھرىرلىگۈچ سۆزلەشكۈسى",legend:"سۆزلەشكۈدە TAB كۇنۇپكىسىدا كېيىنكى سۆز بۆلىكىگە يۆتكىلىدۇ، SHIFT+TAB بىرىكمە كۇنۇپكىسىدا ئالدىنقى سۆز بۆلىكىگە يۆتكىلىدۇ، ENTER كۇنۇپكىسىدا سۆزلەشكۈنى تاپشۇرىدۇ، ESC كۇنۇپكىسى سۆزلەشكۈدىن ۋاز كېچىدۇ. كۆپ بەتكۈچلۈك سۆزلەشكۈگە نىسبەتەن، ALT+F10 دا بەتكۈچ تىزىمىغا يۆتكەيدۇ. ئاندىن TAB كۇنۇپكىسى ياكى ئوڭ يا ئوق كۇنۇپكىسى كېيىنكى بەتكۈچكە يۆتكەيدۇ؛SHIFT+ TAB كۇنۇپكىسى ياكى سول يا ئوق كۇنۇپكىسى ئالدىنقى بەتكۈچكە يۆتكەيدۇ. بوشلۇق كۇنۇپكىسى ياكى ENTER كۇنۇپكىسى بەتكۈچنى تاللايدۇ."},
 {name:"تەھرىرلىگۈچ تىل مۇھىت تىزىملىكى",legend:"${contextMenu} ياكى ئەپ كۇنۇپكىسىدا تىل مۇھىت تىزىملىكىنى ئاچىدۇ. ئاندىن TAB ياكى ئاستى يا ئوق كۇنۇپكىسىدا كېيىنكى تىزىملىك تۈرىگە يۆتكەيدۇ؛ SHIFT+TAB ياكى ئۈستى يا ئوق كۇنۇپكىسىدا ئالدىنقى تىزىملىك تۈرىگە يۆتكەيدۇ. بوشلۇق ياكى ENTER كۇنۇپكىسىدا تىزىملىك تۈرىنى تاللايدۇ. بوشلۇق، ENTER ياكى ئوڭ يا ئوق كۇنۇپكىسىدا تارماق تىزىملىكنى ئاچىدۇ. قايتىش تىزىملىكىگە ESC ياكى سول يا ئوق كۇنۇپكىسى ئىشلىتىلىدۇ. ESC كۇنۇپكىسىدا تىل مۇھىت تىزىملىكى تاقىلىدۇ."},{name:"تەھرىرلىگۈچ تىزىمى",
 legend:"تىزىم قۇتىسىدا، كېيىنكى تىزىم تۈرىگە يۆتكەشتە TAB ياكى ئاستى يا ئوق كۇنۇپكىسى ئىشلىتىلىدۇ. ئالدىنقى تىزىم تۈرىگە يۆتكەشتە SHIFT+TAB ياكى ئۈستى يا ئوق كۇنۇپكىسى ئىشلىتىلىدۇ. بوشلۇق ياكى ENTER كۇنۇپكىسىدا تىزىم تۈرىنى تاللايدۇ.ESC كۇنۇپكىسىدا تىزىم قۇتىسىنى يىغىدۇ."},{name:"تەھرىرلىگۈچ ئېلېمېنت يول بالداق",legend:"${elementsPathFocus} بېسىلسا ئېلېمېنت يول بالداققا يېتەكلەيدۇ، TAB ياكى ئوڭ يا ئوقتا كېيىنكى ئېلېمېنت تاللىنىدۇ، SHIFT+TAB ياكى سول يا ئوقتا ئالدىنقى ئېلېمېنت تاللىنىدۇ، بوشلۇق ياكى Enter كۇنۇپكىسىدا تەھرىرلىگۈچتىكى ئېلېمېنت تاللىنىدۇ."}]},
 {name:"بۇيرۇق",items:[{name:"بۇيرۇقتىن يېنىۋال",legend:"${undo} نى بېسىڭ"},{name:"قايتىلاش بۇيرۇقى",legend:"${redo} نى بېسىڭ"},{name:"توملىتىش بۇيرۇقى",legend:"${bold} نى بېسىڭ"},{name:"يانتۇ بۇيرۇقى",legend:"${italic} نى بېسىڭ"},{name:"ئاستى سىزىق بۇيرۇقى",legend:"${underline} نى بېسىڭ"},{name:"ئۇلانما بۇيرۇقى",legend:"${link} نى بېسىڭ"},{name:"قورال بالداق قاتلاش بۇيرۇقى",legend:"${toolbarCollapse} نى بېسىڭ"},{name:"ئالدىنقى فوكۇس نۇقتىسىنى زىيارەت قىلىدىغان بۇيرۇق",legend:"${accessPreviousSpace} بېسىپ ^ بەلگىسىگە ئەڭ يېقىن زىيارەت قىلغىلى بولمايدىغان فوكۇس نۇقتا رايونىنىڭ ئالدىنى زىيارەت قىلىدۇ، مەسىلەن: ئۆز ئارا قوشنا ئىككى HR ئېلېمېنت. بۇ بىرىكمە كۇنۇپكا تەكرارلانسا يىراقتىكى فوكۇس نۇقتا رايونىغا يەتكىلى بولىدۇ."},
-{name:"كېيىنكى فوكۇس نۇقتىسىنى زىيارەت قىلىدىغان بۇيرۇق",legend:"${accessNextSpace} بېسىپ ^ بەلگىسىگە ئەڭ يېقىن زىيارەت قىلغىلى بولمايدىغان فوكۇس نۇقتا رايونىنىڭ كەينىنى زىيارەت قىلىدۇ، مەسىلەن: ئۆز ئارا قوشنا ئىككى HR ئېلېمېنت. بۇ بىرىكمە كۇنۇپكا تەكرارلانسا يىراقتىكى فوكۇس نۇقتا رايونىغا يەتكىلى بولىدۇ."},{name:"توسالغۇسىز لايىھە چۈشەندۈرۈشى",legend:"${a11yHelp} نى بېسىڭ"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",
-pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"سول يا ئوق",upArrow:"ئۈستى يا ئوق",rightArrow:"ئوڭ يا ئوق",downArrow:"ئاستى يا ئوق",insert:"قىستۇر","delete":"ئۆچۈر",leftWindowKey:"سول Windows كۇنۇپكىسى",rightWindowKey:"ئوڭ Windows كۇنۇپكىسى",selectKey:"تاللاش كۇنۇپكىسى",numpad0:"سان تاختا 0",numpad1:"سان تاختا 1",numpad2:"سان تاختا 2",numpad3:"سان تاختا 3",numpad4:"سان تاختا 4",numpad5:"سان تاختا 5",numpad6:"سان تاختا 6",numpad7:"سان تاختا 7",numpad8:"سان تاختا 8",numpad9:"سان تاختا 9",
-multiply:"يۇلتۇز كۇنۇپكىسى",add:"قوشۇش",subtract:"ئېلىش",decimalPoint:"كەسىر چېكىت",divide:"بۆلۈش",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"سان قۇلۇپ كۇنۇپكىسى",scrollLock:"سۈرگۈچ قۇلۇپ كۇنۇپكىسى",semiColon:"چېكىتلىك پەش",equalSign:"تەڭلىك بەلگىسى",comma:"پەش",dash:"سىزىقچە",period:"چېكىت",forwardSlash:"سولغا يانتۇ سىزىق",graveAccent:"ئۇرغۇ بەلگىسى",openBracket:"ئېچىلغان تىرناق",backSlash:"ئوڭغا يانتۇ سىزىق",closeBracket:"يېپىلغان تىرناق",
-singleQuote:"يالاڭ پەش"});
\ No newline at end of file
+{name:"كېيىنكى فوكۇس نۇقتىسىنى زىيارەت قىلىدىغان بۇيرۇق",legend:"${accessNextSpace} بېسىپ ^ بەلگىسىگە ئەڭ يېقىن زىيارەت قىلغىلى بولمايدىغان فوكۇس نۇقتا رايونىنىڭ كەينىنى زىيارەت قىلىدۇ، مەسىلەن: ئۆز ئارا قوشنا ئىككى HR ئېلېمېنت. بۇ بىرىكمە كۇنۇپكا تەكرارلانسا يىراقتىكى فوكۇس نۇقتا رايونىغا يەتكىلى بولىدۇ."},{name:"توسالغۇسىز لايىھە چۈشەندۈرۈشى",legend:"${a11yHelp} نى بېسىڭ"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"سول يا ئوق",
+upArrow:"ئۈستى يا ئوق",rightArrow:"ئوڭ يا ئوق",downArrow:"ئاستى يا ئوق",insert:"قىستۇر",leftWindowKey:"سول Windows كۇنۇپكىسى",rightWindowKey:"ئوڭ Windows كۇنۇپكىسى",selectKey:"تاللاش كۇنۇپكىسى",numpad0:"سان تاختا 0",numpad1:"سان تاختا 1",numpad2:"سان تاختا 2",numpad3:"سان تاختا 3",numpad4:"سان تاختا 4",numpad5:"سان تاختا 5",numpad6:"سان تاختا 6",numpad7:"سان تاختا 7",numpad8:"سان تاختا 8",numpad9:"سان تاختا 9",multiply:"يۇلتۇز كۇنۇپكىسى",add:"قوشۇش",subtract:"ئېلىش",decimalPoint:"كەسىر چېكىت",divide:"بۆلۈش",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"سان قۇلۇپ كۇنۇپكىسى",scrollLock:"سۈرگۈچ قۇلۇپ كۇنۇپكىسى",semiColon:"چېكىتلىك پەش",equalSign:"تەڭلىك بەلگىسى",comma:"پەش",dash:"سىزىقچە",period:"چېكىت",forwardSlash:"سولغا يانتۇ سىزىق",graveAccent:"ئۇرغۇ بەلگىسى",openBracket:"ئېچىلغان تىرناق",backSlash:"ئوڭغا يانتۇ سىزىق",closeBracket:"يېپىلغان تىرناق",singleQuote:"يالاڭ پەش"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
index c7aac2bf5..4aff22c8c 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","uk",{title:"Спеціальні Інструкції",contents:"Довідка. Натисніть ESC і вона зникне.",legend:[{name:"Основне",items:[{name:"Панель Редактора",legend:"Натисніть ${toolbarFocus} для переходу до панелі інструментів. Для переміщення між групами панелі інструментів використовуйте TAB і SHIFT+TAB. Для переміщення між кнопками панелі іструментів використовуйте кнопки СТРІЛКА ВПРАВО або ВЛІВО. Натисніть ПРОПУСК або ENTER для запуску кнопки панелі інструментів."},{name:"Діалог Редактора",
@@ -7,6 +7,6 @@ legend:'Усередині діалогу, натисніть TAB щоб пер
 {name:"Контекстне Меню Редактора",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Потім перейдіть до наступного пункту меню за допомогою TAB або СТРІЛКИ ВНИЗ. Натисніть ПРОПУСК або ENTER для вибору параметру меню. Відкрийте підменю поточного параметру, натиснувши ПРОПУСК або ENTER або СТРІЛКУ ВПРАВО. Перейдіть до батьківського елемента меню, натиснувши ESC або СТРІЛКУ ВЛІВО. Закрийте контекстне меню, натиснувши ESC."},{name:"Скринька Списків Редактора",legend:"Усередині списку, перехід до наступного пункту списку виконується клавішею TAB або СТРІЛКА ВНИЗ. Перехід до попереднього елемента списку клавішею SHIFT+TAB або СТРІЛКА ВГОРУ. Натисніть ПРОПУСК або ENTER, щоб вибрати параметр списку. Натисніть клавішу ESC, щоб закрити список."},
 {name:"Шлях до елемента редактора",legend:"Натисніть ${elementsPathFocus} для навігації між елементами панелі. Перейдіть до наступного елемента кнопкою TAB або СТРІЛКА ВПРАВО. Перейдіть до попереднього елемента кнопкою SHIFT+TAB або СТРІЛКА ВЛІВО. Натисніть ПРОПУСК або ENTER для вибору елемента в редакторі."}]},{name:"Команди",items:[{name:"Відмінити команду",legend:"Натисніть ${undo}"},{name:"Повторити",legend:"Натисніть ${redo}"},{name:"Жирний",legend:"Натисніть ${bold}"},{name:"Курсив",legend:"Натисніть ${italic}"},
 {name:"Підкреслений",legend:"Натисніть ${underline}"},{name:"Посилання",legend:"Натисніть ${link}"},{name:"Згорнути панель інструментів",legend:"Натисніть ${toolbarCollapse}"},{name:"Доступ до попереднього місця фокусування",legend:"Натисніть ${accessNextSpace} для доступу до найближчої недосяжної області фокусування перед кареткою, наприклад: два сусідні елементи HR. Повторіть комбінацію клавіш для досягнення віддалених областей фокусування."},{name:"Доступ до наступного місця фокусування",legend:"Натисніть ${accessNextSpace} для доступу до найближчої недосяжної області фокусування після каретки, наприклад: два сусідні елементи HR. Повторіть комбінацію клавіш для досягнення віддалених областей фокусування."},
-{name:"Допомога з доступності",legend:"Натисніть ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Ліва стрілка",upArrow:"Стрілка вгору",rightArrow:"Права стрілка",downArrow:"Стрілка вниз",insert:"Вставити","delete":"Видалити",leftWindowKey:"Ліва клавіша Windows",rightWindowKey:"Права клавіша Windows",selectKey:"Виберіть клавішу",numpad0:"Numpad 0",
-numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Множення",add:"Додати",subtract:"Віднімання",decimalPoint:"Десяткова кома",divide:"Ділення",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Крапка з комою",equalSign:"Знак рівності",comma:"Кома",dash:"Тире",period:"Період",
-forwardSlash:"Коса риска",graveAccent:"Гравіс",openBracket:"Відкрити дужку",backSlash:"Зворотна коса риска",closeBracket:"Закрити дужку",singleQuote:"Одинарні лапки"});
\ No newline at end of file
+{name:"Допомога з доступності",legend:"Натисніть ${a11yHelp}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Ліва стрілка",upArrow:"Стрілка вгору",rightArrow:"Права стрілка",downArrow:"Стрілка вниз",insert:"Вставити",leftWindowKey:"Ліва клавіша Windows",rightWindowKey:"Права клавіша Windows",selectKey:"Виберіть клавішу",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",
+numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Множення",add:"Додати",subtract:"Віднімання",decimalPoint:"Десяткова кома",divide:"Ділення",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Крапка з комою",equalSign:"Знак рівності",comma:"Кома",dash:"Тире",period:"Період",forwardSlash:"Коса риска",graveAccent:"Гравіс",openBracket:"Відкрити дужку",backSlash:"Зворотна коса риска",
+closeBracket:"Закрити дужку",singleQuote:"Одинарні лапки"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
index 18ba88260..616286be5 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","vi",{title:"Hướng dẫn trợ năng",contents:"Nội dung Hỗ trợ. Nhấn ESC để đóng hộp thoại.",legend:[{name:"Chung",items:[{name:"Thanh công cụ soạn thảo",legend:"Nhấn ${toolbarFocus} để điều hướng đến thanh công cụ. Nhấn TAB và SHIFT+TAB để chuyển đến nhóm thanh công cụ khác. Nhấn MŨI TÊN PHẢI hoặc MŨI TÊN TRÁI để chuyển sang nút khác trên thanh công cụ. Nhấn PHÍM CÁCH hoặc ENTER để kích hoạt nút trên thanh công cụ."},{name:"Hộp thoại Biên t",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
 {name:"Trình đơn Ngữ cảnh cBộ soạn thảo",legend:"Nhấn ${contextMenu} hoặc PHÍM ỨNG DỤNG để mở thực đơn ngữ cảnh. Sau đó nhấn TAB hoặc MŨI TÊN XUỐNG để di chuyển đến tuỳ chọn tiếp theo của thực đơn. Nhấn SHIFT+TAB hoặc MŨI TÊN LÊN để quay lại tuỳ chọn trước. Nhấn DẤU CÁCH hoặc ENTER để chọn tuỳ chọn của thực đơn. Nhấn DẤU CÁCH hoặc ENTER hoặc MŨI TÊN SANG PHẢI để mở thực đơn con của tuỳ chọn hiện tại. Nhấn ESC hoặc MŨI TÊN SANG TRÁI để quay trở lại thực đơn gốc. Nhấn ESC để đóng thực đơn ngữ cảnh."},
 {name:"Hộp danh sách trình biên tập",legend:"Trong một danh sách chọn, di chuyển đối tượng tiếp theo với phím TAB hoặc phím mũi tên hướng xuống. Di chuyển đến đối tượng trước đó bằng cách nhấn tổ hợp phím SHIFT+TAB hoặc mũi tên hướng lên. Phím khoảng cách hoặc phím ENTER để chọn các tùy chọn trong danh sách. Nhấn phím ESC để đóng lại danh sách chọn."},{name:"Thanh đường dẫn các đối tượng",legend:"Nhấn ${elementsPathFocus} để điều hướng các đối tượng trong thanh đường dẫn. Di chuyển đến đối tượng tiếp theo bằng phím TAB hoặc phím mũi tên bên phải. Di chuyển đến đối tượng trước đó bằng tổ hợp phím SHIFT+TAB hoặc phím mũi tên bên trái. Nhấn phím khoảng cách hoặc ENTER để chọn đối tượng trong trình soạn thảo."}]},
 {name:"Lệnh",items:[{name:"Làm lại lện",legend:"Ấn ${undo}"},{name:"Làm lại lệnh",legend:"Ấn ${redo}"},{name:"Lệnh in đậm",legend:"Ấn ${bold}"},{name:"Lệnh in nghiêng",legend:"Ấn ${italic}"},{name:"Lệnh gạch dưới",legend:"Ấn ${underline}"},{name:"Lệnh liên kết",legend:"Nhấn ${link}"},{name:"Lệnh hiển thị thanh công cụ",legend:"Nhấn${toolbarCollapse}"},{name:"Truy cập đến lệnh tập trung vào khoảng cách trước đó",legend:"Ấn ${accessPreviousSpace} để truy cập đến phần tập trung khoảng cách sau phần còn sót lại của khoảng cách gần nhất vốn không tác động đến được , thí dụ: hai yếu tố điều chỉnh HR. Lặp lại các phím kết họep này để vươn đến phần khoảng cách."},
-{name:"Truy cập phần đối tượng lệnh khoảng trống",legend:"Ấn ${accessNextSpace} để truy cập đến phần tập trung khoảng cách sau phần còn sót lại của khoảng cách gần nhất vốn không tác động đến được , thí dụ: hai yếu tố điều chỉnh HR. Lặp lại các phím kết họep này để vươn đến phần khoảng cách."},{name:"Trợ giúp liên quan",legend:"Nhấn ${a11yHelp}"}]}],backspace:"Phím Backspace",tab:"Phím Tab",enter:"Phím Tab",shift:"Phím Shift",ctrl:"Phím Ctrl",alt:"Phím Alt",pause:"Phím Pause",capslock:"Phím Caps Lock",
-escape:"Phím Escape",pageUp:"Phím Page Up",pageDown:"Phím Page Down",end:"Phím End",home:"Phím Home",leftArrow:"Phím Left Arrow",upArrow:"Phím Up Arrow",rightArrow:"Phím Right Arrow",downArrow:"Phím Down Arrow",insert:"Chèn","delete":"Xóa",leftWindowKey:"Phím Left Windows",rightWindowKey:"Phím Right Windows ",selectKey:"Chọn phím",numpad0:"Phím 0",numpad1:"Phím 1",numpad2:"Phím 2",numpad3:"Phím 3",numpad4:"Phím 4",numpad5:"Phím 5",numpad6:"Phím 6",numpad7:"Phím 7",numpad8:"Phím 8",numpad9:"Phím 9",
-multiply:"Nhân",add:"Thêm",subtract:"Trừ",decimalPoint:"Điểm số thập phân",divide:"Chia",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Dấu chấm phẩy",equalSign:"Đăng nhập bằng",comma:"Dấu phẩy",dash:"Dấu gạch ngang",period:"Phím .",forwardSlash:"Phím /",graveAccent:"Phím `",openBracket:"Open Bracket",backSlash:"Dấu gạch chéo ngược",closeBracket:"Gần giá đỡ",singleQuote:"Trích dẫn"});
\ No newline at end of file
+{name:"Truy cập phần đối tượng lệnh khoảng trống",legend:"Ấn ${accessNextSpace} để truy cập đến phần tập trung khoảng cách sau phần còn sót lại của khoảng cách gần nhất vốn không tác động đến được , thí dụ: hai yếu tố điều chỉnh HR. Lặp lại các phím kết họep này để vươn đến phần khoảng cách."},{name:"Trợ giúp liên quan",legend:"Nhấn ${a11yHelp}"}]}],tab:"Phím Tab",pause:"Phím Pause",capslock:"Phím Caps Lock",escape:"Phím Escape",pageUp:"Phím Page Up",pageDown:"Phím Page Down",leftArrow:"Phím Left Arrow",
+upArrow:"Phím Up Arrow",rightArrow:"Phím Right Arrow",downArrow:"Phím Down Arrow",insert:"Chèn",leftWindowKey:"Phím Left Windows",rightWindowKey:"Phím Right Windows ",selectKey:"Chọn phím",numpad0:"Phím 0",numpad1:"Phím 1",numpad2:"Phím 2",numpad3:"Phím 3",numpad4:"Phím 4",numpad5:"Phím 5",numpad6:"Phím 6",numpad7:"Phím 7",numpad8:"Phím 8",numpad9:"Phím 9",multiply:"Nhân",add:"Thêm",subtract:"Trừ",decimalPoint:"Điểm số thập phân",divide:"Chia",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",
+f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Dấu chấm phẩy",equalSign:"Đăng nhập bằng",comma:"Dấu phẩy",dash:"Dấu gạch ngang",period:"Phím .",forwardSlash:"Phím /",graveAccent:"Phím `",openBracket:"Open Bracket",backSlash:"Dấu gạch chéo ngược",closeBracket:"Gần giá đỡ",singleQuote:"Trích dẫn"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
index b63d413b7..6c16130b3 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","zh-cn",{title:"辅助功能说明",contents:"帮助内容。要关闭此对话框请按 ESC 键。",legend:[{name:"常规",items:[{name:"编辑器工具栏",legend:"按 ${toolbarFocus} 切换到工具栏，使用 TAB 键和 SHIFT+TAB 组合键移动到上一个和下一个工具栏组。使用左右箭头键移动到上一个或下一个工具栏按钮。按空格键或回车键以选中工具栏按钮。"},{name:"编辑器对话框",legend:"在对话框内，按 TAB 键移动到下一个字段，按 SHIFT + TAB 组合键移动到上一个字段，按 ENTER 键提交对话框，按 ESC 键取消对话框。对于有多选项卡的对话框，可以按 ALT + F10 直接切换到或者按 TAB 键逐步移到选项卡列表，当焦点移到选项卡列表时可以用左右箭头键来移动到前后的选项卡。"},{name:"编辑器上下文菜单",legend:"用 ${contextMenu} 或者“应用程序键”打开上下文菜单。然后用 TAB 键或者下箭头键来移动到下一个菜单项；SHIFT + TAB 组合键或者上箭头键移动到上一个菜单项。用 SPACE 键或者 ENTER 键选择菜单项。用 SPACE 键，ENTER 键或者右箭头键打开子菜单。返回菜单用 ESC 键或者左箭头键。用 ESC 键关闭上下文菜单。"},
 {name:"编辑器列表框",legend:"在列表框中，移到下一列表项用 TAB 键或者下箭头键。移到上一列表项用SHIFT+TAB 组合键或者上箭头键，用 SPACE 键或者 ENTER 键选择列表项。用 ESC 键收起列表框。"},{name:"编辑器元素路径栏",legend:"按 ${elementsPathFocus} 以导航到元素路径栏，使用 TAB 键或右箭头键选择下一个元素，使用 SHIFT+TAB 组合键或左箭头键选择上一个元素，按空格键或回车键以选定编辑器里的元素。"}]},{name:"命令",items:[{name:" 撤消命令",legend:"按 ${undo}"},{name:" 重做命令",legend:"按 ${redo}"},{name:" 加粗命令",legend:"按 ${bold}"},{name:" 倾斜命令",legend:"按 ${italic}"},{name:" 下划线命令",legend:"按 ${underline}"},{name:" 链接命令",legend:"按 ${link}"},{name:" 工具栏折叠命令",legend:"按 ${toolbarCollapse}"},
-{name:"访问前一个焦点区域的命令",legend:"按 ${accessPreviousSpace} 访问^符号前最近的不可访问的焦点区域，例如：两个相邻的 HR 元素。重复此组合按键可以到达远处的焦点区域。"},{name:"访问下一个焦点区域命令",legend:"按 ${accessNextSpace} 以访问^符号后最近的不可访问的焦点区域。例如：两个相邻的 HR 元素。重复此组合按键可以到达远处的焦点区域。"},{name:"辅助功能帮助",legend:"按 ${a11yHelp}"}]}],backspace:"退格键",tab:"Tab 键",enter:"回车键",shift:"Shift 键",ctrl:"Ctrl 键",alt:"Alt 键",pause:"暂停键",capslock:"大写锁定键",escape:"Esc 键",pageUp:"上翻页键",pageDown:"下翻页键",end:"行尾键",home:"行首键",leftArrow:"向左箭头键",upArrow:"向上箭头键",rightArrow:"向右箭头键",downArrow:"向下箭头键",
-insert:"插入键","delete":"删除键",leftWindowKey:"左 WIN 键",rightWindowKey:"右 WIN 键",selectKey:"选择键",numpad0:"小键盘 0 键",numpad1:"小键盘 1 键",numpad2:"小键盘 2 键",numpad3:"小键盘 3 键",numpad4:"小键盘 4 键",numpad5:"小键盘 5 键",numpad6:"小键盘 6 键",numpad7:"小键盘 7 键",numpad8:"小键盘 8 键",numpad9:"小键盘 9 键",multiply:"星号键",add:"加号键",subtract:"减号键",decimalPoint:"小数点键",divide:"除号键",f1:"F1 键",f2:"F2 键",f3:"F3 键",f4:"F4 键",f5:"F5 键",f6:"F6 键",f7:"F7 键",f8:"F8 键",f9:"F9 键",f10:"F10 键",f11:"F11 键",f12:"F12 键",numLock:"数字锁定键",scrollLock:"滚动锁定键",
-semiColon:"分号键",equalSign:"等号键",comma:"逗号键",dash:"短划线键",period:"句号键",forwardSlash:"斜杠键",graveAccent:"重音符键",openBracket:"左中括号键",backSlash:"反斜杠键",closeBracket:"右中括号键",singleQuote:"单引号键"});
\ No newline at end of file
+{name:"访问前一个焦点区域的命令",legend:"按 ${accessPreviousSpace} 访问^符号前最近的不可访问的焦点区域，例如：两个相邻的 HR 元素。重复此组合按键可以到达远处的焦点区域。"},{name:"访问下一个焦点区域命令",legend:"按 ${accessNextSpace} 以访问^符号后最近的不可访问的焦点区域。例如：两个相邻的 HR 元素。重复此组合按键可以到达远处的焦点区域。"},{name:"辅助功能帮助",legend:"按 ${a11yHelp}"}]}],tab:"Tab 键",pause:"暂停键",capslock:"大写锁定键",escape:"Esc 键",pageUp:"上翻页键",pageDown:"下翻页键",leftArrow:"向左箭头键",upArrow:"向上箭头键",rightArrow:"向右箭头键",downArrow:"向下箭头键",insert:"插入键",leftWindowKey:"左 WIN 键",rightWindowKey:"右 WIN 键",selectKey:"选择键",numpad0:"小键盘 0 键",
+numpad1:"小键盘 1 键",numpad2:"小键盘 2 键",numpad3:"小键盘 3 键",numpad4:"小键盘 4 键",numpad5:"小键盘 5 键",numpad6:"小键盘 6 键",numpad7:"小键盘 7 键",numpad8:"小键盘 8 键",numpad9:"小键盘 9 键",multiply:"星号键",add:"加号键",subtract:"减号键",decimalPoint:"小数点键",divide:"除号键",f1:"F1 键",f2:"F2 键",f3:"F3 键",f4:"F4 键",f5:"F5 键",f6:"F6 键",f7:"F7 键",f8:"F8 键",f9:"F9 键",f10:"F10 键",f11:"F11 键",f12:"F12 键",numLock:"数字锁定键",scrollLock:"滚动锁定键",semiColon:"分号键",equalSign:"等号键",comma:"逗号键",dash:"短划线键",period:"句号键",forwardSlash:"斜杠键",graveAccent:"重音符键",
+openBracket:"左中括号键",backSlash:"反斜杠键",closeBracket:"右中括号键",singleQuote:"单引号键"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
index 3305d9c60..a43d47a6d 100644
--- a/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
+++ b/web/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","zh",{title:"輔助工具指南",contents:"說明內容。若要關閉此對話框請按「ESC」。",legend:[{name:"一般",items:[{name:"編輯器工具列",legend:"請按 ${toolbarFocus} 以導覽到工具列。利用 TAB 或 SHIFT+TAB 以便移動到下一個及前一個工具列群組。利用右方向鍵或左方向鍵以便移動到下一個及上一個工具列按鈕。按下空白鍵或 ENTER 鍵啟用工具列按鈕。"},{name:"編輯器對話方塊",legend:"在對話框中，按下 TAB 鍵以導覽到下一個對話框元素，按下 SHIFT+TAB 以移動到上一個對話框元素，按下 ENTER 以遞交對話框，按下 ESC 以取消對話框。當對話框有多個分頁時，可以使用 ALT+F10 或是在對話框分頁順序中的一部份按下 TAB 以使用分頁列表。焦點在分頁列表上時，分別使用右方向鍵及左方向鍵移動到下一個及上一個分頁。"},{name:"編輯器內容功能表",legend:"請按下「${contextMenu}」或是「應用程式鍵」以開啟內容選單。以「TAB」或是「↓」鍵移動到下一個選單選項。以「SHIFT + TAB」或是「↑」鍵移動到上一個選單選項。按下「空白鍵」或是「ENTER」鍵以選取選單選項。以「空白鍵」或「ENTER」或「→」開啟目前選項之子選單。以「ESC」或「←」回到父選單。以「ESC」鍵關閉內容選單」。"},
 {name:"編輯器清單方塊",legend:"在清單方塊中，使用 TAB 或下方向鍵移動到下一個列表項目。使用 SHIFT+TAB 或上方向鍵移動到上一個列表項目。按下空白鍵或 ENTER 以選取列表選項。按下 ESC 以關閉清單方塊。"},{name:"編輯器元件路徑工具列",legend:"請按 ${elementsPathFocus} 以瀏覽元素路徑列。利用 TAB 或右方向鍵以便移動到下一個元素按鈕。利用 SHIFT 或左方向鍵以便移動到上一個按鈕。按下空白鍵或 ENTER 鍵來選取在編輯器中的元素。"}]},{name:"命令",items:[{name:"復原命令",legend:"請按下「${undo}」"},{name:"重複命令",legend:"請按下「 ${redo}」"},{name:"粗體命令",legend:"請按下「${bold}」"},{name:"斜體",legend:"請按下「${italic}」"},{name:"底線命令",legend:"請按下「${underline}」"},{name:"連結",legend:"請按下「${link}」"},
-{name:"隱藏工具列",legend:"請按下「${toolbarCollapse}」"},{name:"存取前一個焦點空間命令",legend:"請按下 ${accessPreviousSpace} 以存取最近但無法靠近之插字符號前的焦點空間。舉例：二個相鄰的 HR 元素。\r\n重複按鍵以存取較遠的焦點空間。"},{name:"存取下一個焦點空間命令",legend:"請按下 ${accessNextSpace} 以存取最近但無法靠近之插字符號後的焦點空間。舉例：二個相鄰的 HR 元素。\r\n重複按鍵以存取較遠的焦點空間。"},{name:"協助工具說明",legend:"請按下「${a11yHelp}」"}]}],backspace:"退格鍵",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",
-leftArrow:"向左箭號",upArrow:"向上鍵號",rightArrow:"向右鍵號",downArrow:"向下鍵號",insert:"插入","delete":"刪除",leftWindowKey:"左方 Windows 鍵",rightWindowKey:"右方 Windows 鍵",selectKey:"選擇鍵",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"乘號",add:"新增",subtract:"減號",decimalPoint:"小數點",divide:"除號",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",
-f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"分號",equalSign:"等號",comma:"逗號",dash:"虛線",period:"句點",forwardSlash:"斜線",graveAccent:"抑音符號",openBracket:"左方括號",backSlash:"反斜線",closeBracket:"右方括號",singleQuote:"單引號"});
\ No newline at end of file
+{name:"隱藏工具列",legend:"請按下「${toolbarCollapse}」"},{name:"存取前一個焦點空間命令",legend:"請按下 ${accessPreviousSpace} 以存取最近但無法靠近之插字符號前的焦點空間。舉例：二個相鄰的 HR 元素。\r\n重複按鍵以存取較遠的焦點空間。"},{name:"存取下一個焦點空間命令",legend:"請按下 ${accessNextSpace} 以存取最近但無法靠近之插字符號後的焦點空間。舉例：二個相鄰的 HR 元素。\r\n重複按鍵以存取較遠的焦點空間。"},{name:"協助工具說明",legend:"請按下「${a11yHelp}」"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"向左箭號",upArrow:"向上鍵號",rightArrow:"向右鍵號",downArrow:"向下鍵號",insert:"插入",leftWindowKey:"左方 Windows 鍵",
+rightWindowKey:"右方 Windows 鍵",selectKey:"選擇鍵",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"乘號",add:"新增",subtract:"減號",decimalPoint:"小數點",divide:"除號",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"分號",equalSign:"等號",comma:"逗號",dash:"虛線",
+period:"句點",forwardSlash:"斜線",graveAccent:"抑音符號",openBracket:"左方括號",backSlash:"反斜線",closeBracket:"右方括號",singleQuote:"單引號"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/about/dialogs/about.js b/web/core/assets/vendor/ckeditor/plugins/about/dialogs/about.js
index 6b08e3935..14eba697c 100644
--- a/web/core/assets/vendor/ckeditor/plugins/about/dialogs/about.js
+++ b/web/core/assets/vendor/ckeditor/plugins/about/dialogs/about.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("about",function(a){a=a.lang.about;var b=CKEDITOR.getUrl(CKEDITOR.plugins.get("about").path+"dialogs/"+(CKEDITOR.env.hidpi?"hidpi/":"")+"logo_ckeditor.png");return{title:CKEDITOR.env.ie?a.dlgTitle:a.title,minWidth:390,minHeight:230,contents:[{id:"tab1",label:"",title:"",expand:!0,padding:0,elements:[{type:"html",html:'\x3cstyle type\x3d"text/css"\x3e.cke_about_container{color:#000 !important;padding:10px 10px 0;margin-top:5px}.cke_about_container p{margin: 0 0 10px;}.cke_about_container .cke_about_logo{height:81px;background-color:#fff;background-image:url('+
diff --git a/web/core/assets/vendor/ckeditor/plugins/clipboard/dialogs/paste.js b/web/core/assets/vendor/ckeditor/plugins/clipboard/dialogs/paste.js
index 8039751b9..927b942b1 100644
--- a/web/core/assets/vendor/ckeditor/plugins/clipboard/dialogs/paste.js
+++ b/web/core/assets/vendor/ckeditor/plugins/clipboard/dialogs/paste.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("paste",function(c){function k(a){var b=new CKEDITOR.dom.document(a.document),g=b.getBody(),d=b.getById("cke_actscrpt");d&&d.remove();g.setAttribute("contenteditable",!0);g.on(e.mainPasteEvent,function(a){a=e.initPasteDataTransfer(a);f?a!=f&&(f=e.initPasteDataTransfer()):f=a});if(CKEDITOR.env.ie&&8>CKEDITOR.env.version)b.getWindow().on("blur",function(){b.$.selection.empty()});b.on("keydown",function(a){a=a.data;var b;switch(a.getKeystroke()){case 27:this.hide();b=1;break;case 9:case CKEDITOR.SHIFT+
diff --git a/web/core/assets/vendor/ckeditor/plugins/dialog/dialogDefinition.js b/web/core/assets/vendor/ckeditor/plugins/dialog/dialogDefinition.js
index 26c2feb30..5c35976df 100644
--- a/web/core/assets/vendor/ckeditor/plugins/dialog/dialogDefinition.js
+++ b/web/core/assets/vendor/ckeditor/plugins/dialog/dialogDefinition.js
@@ -1,4 +1,4 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/web/core/assets/vendor/ckeditor/plugins/icons.png b/web/core/assets/vendor/ckeditor/plugins/icons.png
index fd52e4086..cf5548c7b 100644
Binary files a/web/core/assets/vendor/ckeditor/plugins/icons.png and b/web/core/assets/vendor/ckeditor/plugins/icons.png differ
diff --git a/web/core/assets/vendor/ckeditor/plugins/icons_hidpi.png b/web/core/assets/vendor/ckeditor/plugins/icons_hidpi.png
index 7269c52c4..9547434ae 100644
Binary files a/web/core/assets/vendor/ckeditor/plugins/icons_hidpi.png and b/web/core/assets/vendor/ckeditor/plugins/icons_hidpi.png differ
diff --git a/web/core/assets/vendor/ckeditor/plugins/image2/dialogs/image2.js b/web/core/assets/vendor/ckeditor/plugins/image2/dialogs/image2.js
index 3eee0244f..087dcb804 100644
--- a/web/core/assets/vendor/ckeditor/plugins/image2/dialogs/image2.js
+++ b/web/core/assets/vendor/ckeditor/plugins/image2/dialogs/image2.js
@@ -1,14 +1,15 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.dialog.add("image2",function(k){function D(){var a=this.getValue().match(E);(a=!(!a||0===parseInt(a[1],10)))||alert(c["invalid"+CKEDITOR.tools.capitalize(this.id)]);return a}function O(){function a(a,b){d.push(l.once(a,function(a){for(var l;l=d.pop();)l.removeListener();b(a)}))}var l=t.createElement("img"),d=[];return function(d,b,c){a("load",function(){var a=F(l);b.call(c,l,a.width,a.height)});a("error",function(){b(null)});a("abort",function(){b(null)});l.setAttribute("src",(x.baseHref||
-"")+d+"?"+Math.random().toString(16).substring(2))}}function G(){var a=this.getValue();u(!1);a!==y.data.src?(H(a,function(a,d,b){u(!0);if(!a)return m(!1);g.setValue(!1===k.config.image2_prefillDimensions?0:d);h.setValue(!1===k.config.image2_prefillDimensions?0:b);v=d;w=b;m(I.checkHasNaturalRatio(a))}),n=!0):n?(u(!0),g.setValue(p),h.setValue(q),n=!1):u(!0)}function J(){if(e){var a=this.getValue();if(a&&(a.match(E)||m(!1),"0"!==a)){var b="width"==this.id,d=p||v,c=q||w,a=b?Math.round(a/d*c):Math.round(a/
-c*d);isNaN(a)||(b?h:g).setValue(a)}}}function m(a){if(f){if("boolean"==typeof a){if(z)return;e=a}else a=g.getValue(),z=!0,(e=!e)&&a&&(a*=q/p,isNaN(a)||h.setValue(Math.round(a)));f[e?"removeClass":"addClass"]("cke_btn_unlocked");f.setAttribute("aria-checked",e);CKEDITOR.env.hc&&f.getChild(0).setHtml(e?CKEDITOR.env.ie?"■":"▣":CKEDITOR.env.ie?"□":"▢")}}function u(a){a=a?"enable":"disable";g[a]();h[a]()}var E=/(^\s*(\d+)(px)?\s*$)|^$/i,K=CKEDITOR.tools.getNextId(),L=CKEDITOR.tools.getNextId(),b=k.lang.image2,
-c=k.lang.common,P=(new CKEDITOR.template('\x3cdiv\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+b.lockRatio+'" class\x3d"cke_btn_locked" id\x3d"{lockButtonId}" role\x3d"checkbox"\x3e\x3cspan class\x3d"cke_icon"\x3e\x3c/span\x3e\x3cspan class\x3d"cke_label"\x3e'+b.lockRatio+'\x3c/span\x3e\x3c/a\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+b.resetSize+'" class\x3d"cke_btn_reset" id\x3d"{resetButtonId}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3e'+
-b.resetSize+"\x3c/span\x3e\x3c/a\x3e\x3c/div\x3e")).output({lockButtonId:K,resetButtonId:L}),I=CKEDITOR.plugins.image2,x=k.config,A=k.widgets.registered.image.features,F=I.getNatural,t,y,M,H,p,q,v,w,n,e,z,f,r,g,h,B,C=!(!x.filebrowserImageBrowseUrl&&!x.filebrowserBrowseUrl),N=[{id:"src",type:"text",label:c.url,onKeyup:G,onChange:G,setup:function(a){this.setValue(a.data.src)},commit:function(a){a.setData("src",this.getValue())},validate:CKEDITOR.dialog.validate.notEmpty(b.urlMissing)}];C&&N.push({type:"button",
-id:"browse",style:"display:inline-block;margin-top:14px;",align:"center",label:k.lang.common.browseServer,hidden:!0,filebrowser:"info:src"});return{title:b.title,minWidth:250,minHeight:100,onLoad:function(){t=this._.element.getDocument();H=O()},onShow:function(){y=this.widget;M=y.parts.image;n=z=e=!1;B=F(M);v=p=B.width;w=q=B.height},contents:[{id:"info",label:b.infoTab,elements:[{type:"vbox",padding:0,children:[{type:"hbox",widths:["100%"],children:N}]},{id:"alt",type:"text",label:b.alt,setup:function(a){this.setValue(a.data.alt)},
-commit:function(a){a.setData("alt",this.getValue())}},{type:"hbox",widths:["25%","25%","50%"],requiredContent:A.dimension.requiredContent,children:[{type:"text",width:"45px",id:"width",label:c.width,validate:D,onKeyUp:J,onLoad:function(){g=this},setup:function(a){this.setValue(a.data.width)},commit:function(a){a.setData("width",this.getValue())}},{type:"text",id:"height",width:"45px",label:c.height,validate:D,onKeyUp:J,onLoad:function(){h=this},setup:function(a){this.setValue(a.data.height)},commit:function(a){a.setData("height",
-this.getValue())}},{id:"lock",type:"html",style:"margin-top:18px;width:40px;height:20px;",onLoad:function(){function a(a){a.on("mouseover",function(){this.addClass("cke_btn_over")},a);a.on("mouseout",function(){this.removeClass("cke_btn_over")},a)}var b=this.getDialog();f=t.getById(K);r=t.getById(L);f&&(b.addFocusable(f,4+C),f.on("click",function(a){m();a.data&&a.data.preventDefault()},this.getDialog()),a(f));r&&(b.addFocusable(r,5+C),r.on("click",function(a){n?(g.setValue(v),h.setValue(w)):(g.setValue(p),
-h.setValue(q));a.data&&a.data.preventDefault()},this),a(r))},setup:function(a){m(a.data.lock)},commit:function(a){a.setData("lock",e)},html:P}]},{type:"hbox",id:"alignment",requiredContent:A.align.requiredContent,children:[{id:"align",type:"radio",items:[[c.alignNone,"none"],[c.alignLeft,"left"],[c.alignCenter,"center"],[c.alignRight,"right"]],label:c.align,setup:function(a){this.setValue(a.data.align)},commit:function(a){a.setData("align",this.getValue())}}]},{id:"hasCaption",type:"checkbox",label:b.captioned,
-requiredContent:A.caption.requiredContent,setup:function(a){this.setValue(a.data.hasCaption)},commit:function(a){a.setData("hasCaption",this.getValue())}}]},{id:"Upload",hidden:!0,filebrowser:"uploadButton",label:b.uploadTab,elements:[{type:"file",id:"upload",label:b.btnUpload,style:"height:40px"},{type:"fileButton",id:"uploadButton",filebrowser:"info:src",label:b.btnUpload,"for":["Upload","upload"]}]}]}});
\ No newline at end of file
+CKEDITOR.dialog.add("image2",function(f){function C(){var a=this.getValue().match(D);(a=!(!a||0===parseInt(a[1],10)))||alert(c["invalid"+CKEDITOR.tools.capitalize(this.id)]);return a}function N(){function a(a,c){q.push(b.once(a,function(a){for(var b;b=q.pop();)b.removeListener();c(a)}))}var b=r.createElement("img"),q=[];return function(q,c,e){a("load",function(){var a=E(b);c.call(e,b,a.width,a.height)});a("error",function(){c(null)});a("abort",function(){c(null)});b.setAttribute("src",(w.baseHref||
+"")+q+"?"+Math.random().toString(16).substring(2))}}function F(){var a=this.getValue();t(!1);a!==x.data.src?(G(a,function(a,b,c){t(!0);if(!a)return k(!1);g.setValue(!1===f.config.image2_prefillDimensions?0:b);h.setValue(!1===f.config.image2_prefillDimensions?0:c);u=b;v=c;k(H.checkHasNaturalRatio(a))}),l=!0):l?(t(!0),g.setValue(m),h.setValue(n),l=!1):t(!0)}function I(){if(e){var a=this.getValue();if(a&&(a.match(D)||k(!1),"0"!==a)){var b="width"==this.id,c=m||u,d=n||v,a=b?Math.round(a/c*d):Math.round(a/
+d*c);isNaN(a)||(b?h:g).setValue(a)}}}function k(a){if(d){if("boolean"==typeof a){if(y)return;e=a}else a=g.getValue(),y=!0,(e=!e)&&a&&(a*=n/m,isNaN(a)||h.setValue(Math.round(a)));d[e?"removeClass":"addClass"]("cke_btn_unlocked");d.setAttribute("aria-checked",e);CKEDITOR.env.hc&&d.getChild(0).setHtml(e?CKEDITOR.env.ie?"■":"▣":CKEDITOR.env.ie?"□":"▢")}}function t(a){a=a?"enable":"disable";g[a]();h[a]()}var D=/(^\s*(\d+)(px)?\s*$)|^$/i,J=CKEDITOR.tools.getNextId(),K=CKEDITOR.tools.getNextId(),b=f.lang.image2,
+c=f.lang.common,O=(new CKEDITOR.template('\x3cdiv\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+b.lockRatio+'" class\x3d"cke_btn_locked" id\x3d"{lockButtonId}" role\x3d"checkbox"\x3e\x3cspan class\x3d"cke_icon"\x3e\x3c/span\x3e\x3cspan class\x3d"cke_label"\x3e'+b.lockRatio+'\x3c/span\x3e\x3c/a\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+b.resetSize+'" class\x3d"cke_btn_reset" id\x3d"{resetButtonId}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3e'+
+b.resetSize+"\x3c/span\x3e\x3c/a\x3e\x3c/div\x3e")).output({lockButtonId:J,resetButtonId:K}),H=CKEDITOR.plugins.image2,w=f.config,z=!(!w.filebrowserImageBrowseUrl&&!w.filebrowserBrowseUrl),A=f.widgets.registered.image.features,E=H.getNatural,r,x,L,G,m,n,u,v,l,e,y,d,p,g,h,B,M=[{id:"src",type:"text",label:c.url,onKeyup:F,onChange:F,setup:function(a){this.setValue(a.data.src)},commit:function(a){a.setData("src",this.getValue())},validate:CKEDITOR.dialog.validate.notEmpty(b.urlMissing)}];z&&M.push({type:"button",
+id:"browse",style:"display:inline-block;margin-top:14px;",align:"center",label:f.lang.common.browseServer,hidden:!0,filebrowser:"info:src"});return{title:b.title,minWidth:250,minHeight:100,onLoad:function(){r=this._.element.getDocument();G=N()},onShow:function(){x=this.widget;L=x.parts.image;l=y=e=!1;B=E(L);u=m=B.width;v=n=B.height},contents:[{id:"info",label:b.infoTab,elements:[{type:"vbox",padding:0,children:[{type:"hbox",widths:["100%"],className:"cke_dialog_image_url",children:M}]},{id:"alt",
+type:"text",label:b.alt,setup:function(a){this.setValue(a.data.alt)},commit:function(a){a.setData("alt",this.getValue())},validate:!0===f.config.image2_altRequired?CKEDITOR.dialog.validate.notEmpty(b.altMissing):null},{type:"hbox",widths:["25%","25%","50%"],requiredContent:A.dimension.requiredContent,children:[{type:"text",width:"45px",id:"width",label:c.width,validate:C,onKeyUp:I,onLoad:function(){g=this},setup:function(a){this.setValue(a.data.width)},commit:function(a){a.setData("width",this.getValue())}},
+{type:"text",id:"height",width:"45px",label:c.height,validate:C,onKeyUp:I,onLoad:function(){h=this},setup:function(a){this.setValue(a.data.height)},commit:function(a){a.setData("height",this.getValue())}},{id:"lock",type:"html",style:"margin-top:18px;width:40px;height:20px;",onLoad:function(){function a(a){a.on("mouseover",function(){this.addClass("cke_btn_over")},a);a.on("mouseout",function(){this.removeClass("cke_btn_over")},a)}var b=this.getDialog();d=r.getById(J);p=r.getById(K);d&&(b.addFocusable(d,
+4+z),d.on("click",function(a){k();a.data&&a.data.preventDefault()},this.getDialog()),a(d));p&&(b.addFocusable(p,5+z),p.on("click",function(a){l?(g.setValue(u),h.setValue(v)):(g.setValue(m),h.setValue(n));a.data&&a.data.preventDefault()},this),a(p))},setup:function(a){k(a.data.lock)},commit:function(a){a.setData("lock",e)},html:O}]},{type:"hbox",id:"alignment",requiredContent:A.align.requiredContent,children:[{id:"align",type:"radio",items:[[c.alignNone,"none"],[c.alignLeft,"left"],[c.alignCenter,
+"center"],[c.alignRight,"right"]],label:c.align,setup:function(a){this.setValue(a.data.align)},commit:function(a){a.setData("align",this.getValue())}}]},{id:"hasCaption",type:"checkbox",label:b.captioned,requiredContent:A.caption.requiredContent,setup:function(a){this.setValue(a.data.hasCaption)},commit:function(a){a.setData("hasCaption",this.getValue())}}]},{id:"Upload",hidden:!0,filebrowser:"uploadButton",label:b.uploadTab,elements:[{type:"file",id:"upload",label:b.btnUpload,style:"height:40px"},
+{type:"fileButton",id:"uploadButton",filebrowser:"info:src",label:b.btnUpload,"for":["Upload","upload"]}]}]}});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/pastefromword/filter/default.js b/web/core/assets/vendor/ckeditor/plugins/pastefromword/filter/default.js
index 75c116dbb..21e14be03 100644
--- a/web/core/assets/vendor/ckeditor/plugins/pastefromword/filter/default.js
+++ b/web/core/assets/vendor/ckeditor/plugins/pastefromword/filter/default.js
@@ -1,32 +1,43 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-(function(){function C(a){a=a.toUpperCase();for(var c=D.length,b=0,f=0;f<c;++f)for(var d=D[f],e=d[1].length;a.substr(0,e)==d[1];a=a.substr(e))b+=d[0];return b}function E(a){a=a.toUpperCase();for(var c=1,b=1;0<a.length;b*=26)c+="ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(a.charAt(a.length-1))*b,a=a.substr(0,a.length-1);return c}var F=CKEDITOR.htmlParser.fragment.prototype,r=CKEDITOR.htmlParser.element.prototype;F.onlyChild=r.onlyChild=function(){var a=this.children;return 1==a.length&&a[0]||null};r.removeAnyChildWithName=
-function(a){for(var c=this.children,b=[],f,d=0;d<c.length;d++)f=c[d],f.name&&(f.name==a&&(b.push(f),c.splice(d--,1)),b=b.concat(f.removeAnyChildWithName(a)));return b};r.getAncestor=function(a){for(var c=this.parent;c&&(!c.name||!c.name.match(a));)c=c.parent;return c};F.firstChild=r.firstChild=function(a){for(var c,b=0;b<this.children.length;b++)if(c=this.children[b],a(c)||c.name&&(c=c.firstChild(a)))return c;return null};r.addStyle=function(a,c,b){var f="";if("string"==typeof c)f+=a+":"+c+";";else{if("object"==
-typeof a)for(var d in a)a.hasOwnProperty(d)&&(f+=d+":"+a[d]+";");else f+=a;b=c}this.attributes||(this.attributes={});a=this.attributes.style||"";a=(b?[f,a]:[a,f]).join(";");this.attributes.style=a.replace(/^;+|;(?=;)/g,"")};r.getStyle=function(a){var c=this.attributes.style;if(c)return c=CKEDITOR.tools.parseCssText(c,1),c[a]};CKEDITOR.dtd.parentOf=function(a){var c={},b;for(b in this)-1==b.indexOf("$")&&this[b][a]&&(c[b]=1);return c};var G=/^(?:\b0[^\s]*\s*){1,4}$/,B={ol:{decimal:/\d+/,"lower-roman":/^m{0,4}(cm|cd|d?c{0,3})(xc|xl|l?x{0,3})(ix|iv|v?i{0,3})$/,
-"upper-roman":/^M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$/,"lower-alpha":/^[a-z]+$/,"upper-alpha":/^[A-Z]+$/},ul:{disc:/[l\u00B7\u2002]/,circle:/[\u006F\u00D8]/,square:/[\u006E\u25C6]/}},D=[[1E3,"M"],[900,"CM"],[500,"D"],[400,"CD"],[100,"C"],[90,"XC"],[50,"L"],[40,"XL"],[10,"X"],[9,"IX"],[5,"V"],[4,"IV"],[1,"I"]],w=0,x=null,A,H=CKEDITOR.plugins.pastefromword={utils:{createListBulletMarker:function(a,c){var b=new CKEDITOR.htmlParser.element("cke:listbullet");b.attributes={"cke:listsymbol":a[0]};
-b.add(new CKEDITOR.htmlParser.text(c));return b},isListBulletIndicator:function(a){if(/mso-list\s*:\s*Ignore/i.test(a.attributes&&a.attributes.style))return!0},isContainingOnlySpaces:function(a){var c;return(c=a.onlyChild())&&/^(:?\s|&nbsp;)+$/.test(c.value)},resolveList:function(a){var c=a.attributes,b;if((b=a.removeAnyChildWithName("cke:listbullet"))&&b.length&&(b=b[0]))return a.name="cke:li",c.style&&(c.style=H.filters.stylesFilter([["text-indent"],["line-height"],[/^margin(:?-left)?$/,null,function(a){a=
-a.split(" ");a=CKEDITOR.tools.convertToPx(a[3]||a[1]||a[0]);!w&&null!==x&&a>x&&(w=a-x);x=a;c["cke:indent"]=w&&Math.ceil(a/w)+1||1}],[/^mso-list$/,null,function(a){a=a.split(" ");if(!(2>a.length)){var b=Number(a[0].match(/\d+/));a=Number(a[1].match(/\d+/));1==a&&(b!==A&&(c["cke:reset"]=1),A=b);c["cke:indent"]=a}}]])(c.style,a)||""),c["cke:indent"]||(x=0,c["cke:indent"]=1),CKEDITOR.tools.extend(c,b.attributes),!0;A=x=w=null;return!1},getStyleComponents:function(){var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;"\x3e\x3c/div\x3e',
-CKEDITOR.document);CKEDITOR.document.getBody().append(a);return function(c,b,f){a.setStyle(c,b);c={};b=f.length;for(var d=0;d<b;d++)c[f[d]]=a.getStyle(f[d]);return c}}(),listDtdParents:CKEDITOR.dtd.parentOf("ol")},filters:{flattenList:function(a,c){c="number"==typeof c?c:1;var b=a.attributes,f;switch(b.type){case "a":f="lower-alpha";break;case "1":f="decimal"}for(var d=a.children,e,k=0;k<d.length;k++)if(e=d[k],e.name in CKEDITOR.dtd.$listItem){var l=e.attributes,g=e.children,n=g[0],h=g[g.length-1];
-n.attributes&&n.attributes.style&&-1<n.attributes.style.indexOf("mso-list")&&(e.attributes.style=n.attributes.style,n.replaceWithChildren());h.name in CKEDITOR.dtd.$list&&(a.add(h,k+1),--g.length||d.splice(k--,1));e.name="cke:li";b.start&&!k&&(l.value=b.start);H.filters.stylesFilter([["tab-stops",null,function(a){(a=a.match(/0$|\d+\.?\d*\w+/))&&(x=CKEDITOR.tools.convertToPx(a[0]))}],1==c?["mso-list",null,function(a){a=a.split(" ");a=Number(a[0].match(/\d+/));a!==A&&(l["cke:reset"]=1);A=a}]:null])(l.style);
-l["cke:indent"]=c;l["cke:listtype"]=a.name;l["cke:list-style-type"]=f}else if(e.name in CKEDITOR.dtd.$list){arguments.callee.apply(this,[e,c+1]);d=d.slice(0,k).concat(e.children).concat(d.slice(k+1));a.children=[];e=0;for(g=d.length;e<g;e++)a.add(d[e]);d=a.children}delete a.name;b["cke:list"]=1},assembleList:function(a){var c=a.children,b,f,d,e,k,l;a=[];for(var g,n,h,p,m,t,q=0;q<c.length;q++)if(b=c[q],"cke:li"==b.name)if(b.name="li",f=b.attributes,h=(h=f["cke:listsymbol"])&&h.match(/^(?:[(]?)([^\s]+?)([.)]?)$/),
-p=m=t=null,f["cke:ignored"])c.splice(q--,1);else{f["cke:reset"]&&(l=e=k=null);d=Number(f["cke:indent"]);d!=e&&(n=g=null);if(h){if(n&&B[n][g].test(h[1]))p=n,m=g;else for(var u in B)for(var y in B[u])if(B[u][y].test(h[1]))if("ol"==u&&/alpha|roman/.test(y)){if(g=/roman/.test(y)?C(h[1]):E(h[1]),!t||g<t)t=g,p=u,m=y}else{p=u;m=y;break}!p&&(p=h[2]?"ol":"ul")}else p=f["cke:listtype"]||"ol",m=f["cke:list-style-type"];n=p;g=m||("ol"==p?"decimal":"disc");m&&m!=("ol"==p?"decimal":"disc")&&b.addStyle("list-style-type",
-m);if("ol"==p&&h){switch(m){case "decimal":t=Number(h[1]);break;case "lower-roman":case "upper-roman":t=C(h[1]);break;case "lower-alpha":case "upper-alpha":t=E(h[1])}b.attributes.value=t}if(l){if(d>e)a.push(l=new CKEDITOR.htmlParser.element(p)),l.add(b),k.add(l);else{if(d<e){e-=d;for(var v;e--&&(v=l.parent);)l=v.parent}l.add(b)}c.splice(q--,1)}else a.push(l=new CKEDITOR.htmlParser.element(p)),l.add(b),c[q]=l;k=b;e=d}else l&&(l=e=k=null);for(q=0;q<a.length;q++)if(l=a[q],u=l.children,g=g=void 0,y=l.children.length,
-v=g=void 0,c=/list-style-type:(.*?)(?:;|$)/,e=CKEDITOR.plugins.pastefromword.filters.stylesFilter,g=l.attributes,!c.exec(g.style)){for(k=0;k<y;k++)if(g=u[k],g.attributes.value&&Number(g.attributes.value)==k+1&&delete g.attributes.value,g=c.exec(g.attributes.style))if(g[1]!=v&&v){v=null;break}else v=g[1];if(v){for(k=0;k<y;k++)g=u[k].attributes,g.style&&(g.style=e([["list-style-type"]])(g.style)||"");l.addStyle("list-style-type",v)}}A=x=w=null},falsyFilter:function(){return!1},stylesFilter:function(a,
-c){return function(b,f){var d=[];(b||"").replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(b,e,g){e=e.toLowerCase();"font-family"==e&&(g=g.replace(/["']/g,""));for(var n,h,p,m=0;m<a.length;m++)if(a[m]&&(b=a[m][0],n=a[m][1],h=a[m][2],p=a[m][3],e.match(b)&&(!n||g.match(n)))){e=p||e;c&&(h=h||g);"function"==typeof h&&(h=h(g,f,e));h&&h.push&&(e=h[0],h=h[1]);"string"==typeof h&&d.push([e,h]);return}!c&&d.push([e,g])});for(var e=0;e<d.length;e++)d[e]=d[e].join(":");return d.length?
-d.join(";")+";":!1}},elementMigrateFilter:function(a,c){return a?function(b){var f=c?(new CKEDITOR.style(a,c))._.definition:a;b.name=f.element;CKEDITOR.tools.extend(b.attributes,CKEDITOR.tools.clone(f.attributes));b.addStyle(CKEDITOR.style.getStyleText(f));f.attributes&&f.attributes["class"]&&(b.classWhiteList=" "+f.attributes["class"]+" ")}:function(){}},styleMigrateFilter:function(a,c){var b=this.elementMigrateFilter;return a?function(f,d){var e=new CKEDITOR.htmlParser.element(null),k={};k[c]=f;
-b(a,k)(e);e.children=d.children;d.children=[e];e.filter=function(){};e.parent=d}:function(){}},bogusAttrFilter:function(a,c){if(-1==c.name.indexOf("cke:"))return!1},applyStyleFilter:null},getRules:function(a,c){var b=CKEDITOR.dtd,f=CKEDITOR.tools.extend({},b.$block,b.$listItem,b.$tableContent),d=a.config,e=this.filters,k=e.falsyFilter,l=e.stylesFilter,g=e.elementMigrateFilter,n=CKEDITOR.tools.bind(this.filters.styleMigrateFilter,this.filters),h=this.utils.createListBulletMarker,p=e.flattenList,m=
-e.assembleList,t=this.utils.isListBulletIndicator,q=this.utils.isContainingOnlySpaces,u=this.utils.resolveList,y=function(a){a=CKEDITOR.tools.convertToPx(a);return isNaN(a)?a:a+"px"},v=this.utils.getStyleComponents,x=this.utils.listDtdParents,r=!1!==d.pasteFromWordRemoveFontStyles,w=!1!==d.pasteFromWordRemoveStyles;return{elementNames:[[/meta|link|script/,""]],root:function(a){a.filterChildren(c);m(a)},elements:{"^":function(a){var c;CKEDITOR.env.gecko&&(c=e.applyStyleFilter)&&c(a)},$:function(a){var z=
-a.name||"",e=a.attributes;z in f&&e.style&&(e.style=l([[/^(:?width|height)$/,null,y]])(e.style)||"");if(z.match(/h\d/)){a.filterChildren(c);if(u(a))return;g(d["format_"+z])(a)}else if(z in b.$inline)a.filterChildren(c),q(a)&&delete a.name;else if(-1!=z.indexOf(":")&&-1==z.indexOf("cke")){a.filterChildren(c);if("v:imagedata"==z){if(z=a.attributes["o:href"])a.attributes.src=z;a.name="img";return}delete a.name}z in x&&(a.filterChildren(c),m(a))},style:function(a){if(CKEDITOR.env.gecko){a=(a=a.onlyChild().value.match(/\/\* Style Definitions \*\/([\s\S]*?)\/\*/))&&
-a[1];var c={};a&&(a.replace(/[\n\r]/g,"").replace(/(.+?)\{(.+?)\}/g,function(a,b,I){b=b.split(",");a=b.length;for(var d=0;d<a;d++)CKEDITOR.tools.trim(b[d]).replace(/^(\w+)(\.[\w-]+)?$/g,function(a,b,d){b=b||"*";d=d.substring(1,d.length);d.match(/MsoNormal/)||(c[b]||(c[b]={}),d?c[b][d]=I:c[b]=I)})}),e.applyStyleFilter=function(a){var b=c["*"]?"*":a.name,d=a.attributes&&a.attributes["class"];b in c&&(b=c[b],"object"==typeof b&&(b=b[d]),b&&a.addStyle(b,!0))})}return!1},p:function(a){if(/MsoListParagraph/i.exec(a.attributes["class"])||
-a.getStyle("mso-list")&&!a.getStyle("mso-list").match(/^(none|skip)$/i)){var b=a.firstChild(function(a){return a.type==CKEDITOR.NODE_TEXT&&!q(a.parent)});(b=b&&b.parent)&&b.addStyle("mso-list","Ignore")}a.filterChildren(c);u(a)||(d.enterMode==CKEDITOR.ENTER_BR?(delete a.name,a.add(new CKEDITOR.htmlParser.element("br"))):g(d["format_"+(d.enterMode==CKEDITOR.ENTER_P?"p":"div")])(a))},div:function(a){var c=a.onlyChild();if(c&&"table"==c.name){var b=a.attributes;c.attributes=CKEDITOR.tools.extend(c.attributes,
-b);b.style&&c.addStyle(b.style);c=new CKEDITOR.htmlParser.element("div");c.addStyle("clear","both");a.add(c);delete a.name}},td:function(a){a.getAncestor("thead")&&(a.name="th")},ol:p,ul:p,dl:p,font:function(a){if(t(a.parent))delete a.name;else{a.filterChildren(c);var b=a.attributes,d=b.style,e=a.parent;"font"==e.name?(CKEDITOR.tools.extend(e.attributes,a.attributes),d&&e.addStyle(d),delete a.name):(d=(d||"").split(";"),b.color&&("#000000"!=b.color&&d.push("color:"+b.color),delete b.color),b.face&&
-(d.push("font-family:"+b.face),delete b.face),b.size&&(d.push("font-size:"+(3<b.size?"large":3>b.size?"small":"medium")),delete b.size),a.name="span",a.addStyle(d.join(";")))}},span:function(a){if(t(a.parent))return!1;a.filterChildren(c);if(q(a))return delete a.name,null;if(t(a)){var b=a.firstChild(function(a){return a.value||"img"==a.name}),e=(b=b&&(b.value||"l."))&&b.match(/^(?:[(]?)([^\s]+?)([.)]?)$/);if(e)return b=h(e,b),(a=a.getAncestor("span"))&&/ mso-hide:\s*all|display:\s*none /.test(a.attributes.style)&&
-(b.attributes["cke:ignored"]=1),b}if(e=(b=a.attributes)&&b.style)b.style=l([["line-height"],[/^font-family$/,null,r?null:n(d.font_style,"family")],[/^font-size$/,null,r?null:n(d.fontSize_style,"size")],[/^color$/,null,r?null:n(d.colorButton_foreStyle,"color")],[/^background-color$/,null,r?null:n(d.colorButton_backStyle,"color")]])(e,a)||"";b.style||delete b.style;CKEDITOR.tools.isEmpty(b)&&delete a.name;return null},b:g(d.coreStyles_bold),i:g(d.coreStyles_italic),u:g(d.coreStyles_underline),s:g(d.coreStyles_strike),
-sup:g(d.coreStyles_superscript),sub:g(d.coreStyles_subscript),a:function(a){var b=a.attributes;b.name&&b.name.match(/ole_link\d+/i)?delete a.name:b.href&&b.href.match(/^file:\/\/\/[\S]+#/i)&&(b.href=b.href.replace(/^file:\/\/\/[^#]+/i,""))},"cke:listbullet":function(a){a.getAncestor(/h\d/)&&!d.pasteFromWordNumberedHeadingToList&&delete a.name}},attributeNames:[[/^onmouse(:?out|over)/,""],[/^onload$/,""],[/(?:v|o):\w+/,""],[/^lang/,""]],attributes:{style:l(w?[[/^list-style-type$/,null],[/^margin$|^margin-(?!bottom|top)/,
-null,function(a,b,c){if(b.name in{p:1,div:1}){b="ltr"==d.contentsLangDirection?"margin-left":"margin-right";if("margin"==c)a=v(c,a,[b])[b];else if(c!=b)return null;if(a&&!G.test(a))return[b,a]}return null}],[/^clear$/],[/^border.*|margin.*|vertical-align|float$/,null,function(a,b){if("img"==b.name)return a}],[/^width|height$/,null,function(a,b){if(b.name in{table:1,td:1,th:1,img:1})return a}]]:[[/^mso-/],[/-color$/,null,function(a){if("transparent"==a)return!1;if(CKEDITOR.env.gecko)return a.replace(/-moz-use-text-color/g,
-"transparent")}],[/^margin$/,G],["text-indent","0cm"],["page-break-before"],["tab-stops"],["display","none"],r?[/font-?/]:null],w),width:function(a,c){if(c.name in b.$tableContent)return!1},border:function(a,c){if(c.name in b.$tableContent)return!1},"class":function(a,b){return b.classWhiteList&&-1!=b.classWhiteList.indexOf(" "+a+" ")?a:!1},bgcolor:k,valign:w?k:function(a,b){b.addStyle("vertical-align",a);return!1}},comment:CKEDITOR.env.ie?k:function(a,b){var c=a.match(/<img.*?>/),d=a.match(/^\[if !supportLists\]([\s\S]*?)\[endif\]$/);
-return d?(d=(c=d[1]||c&&"l.")&&c.match(/>(?:[(]?)([^\s]+?)([.)]?)</),h(d,c)):CKEDITOR.env.gecko&&c?(c=CKEDITOR.htmlParser.fragment.fromHtml(c[0]).children[0],(d=(d=(d=b.previous)&&d.value.match(/<v:imagedata[^>]*o:href=['"](.*?)['"]/))&&d[1])&&(c.attributes.src=d),c):!1}}}},J=function(){this.dataFilter=new CKEDITOR.htmlParser.filter};J.prototype={toHtml:function(a){a=CKEDITOR.htmlParser.fragment.fromHtml(a);var c=new CKEDITOR.htmlParser.basicWriter;a.writeHtml(c,this.dataFilter);return c.getHtml(!0)}};
-CKEDITOR.cleanWord=function(a,c){a=a.replace(/<!\[([^\]]*?)\]>/g,"\x3c!--[$1]--\x3e");CKEDITOR.env.gecko&&(a=a.replace(/(\x3c!--\[if[^<]*?\])--\x3e([\S\s]*?)\x3c!--(\[endif\]--\x3e)/gi,"$1$2$3"));CKEDITOR.env.webkit&&(a=a.replace(/(class="MsoListParagraph[^>]+>\x3c!--\[if !supportLists\]--\x3e)([^<]+<span[^<]+<\/span>)(\x3c!--\[endif\]--\x3e)/gi,"$1\x3cspan\x3e$2\x3c/span\x3e$3"));var b=new J,f=b.dataFilter;f.addRules(CKEDITOR.plugins.pastefromword.getRules(c,f));c.fire("beforeCleanWord",{filter:f});
-try{a=b.toHtml(a)}catch(d){c.showNotification(c.lang.pastefromword.error)}a=a.replace(/cke:.*?".*?"/g,"");a=a.replace(/style=""/g,"");return a=a.replace(/<span>/g,"")}})();
\ No newline at end of file
+(function(){function t(){return!1}function x(a,b){var c,d=[];a.filterChildren(b);for(c=a.children.length-1;0<=c;c--)d.unshift(a.children[c]),a.children[c].remove();c=a.attributes;var e=a,h=!0,g;for(g in c)if(h)h=!1;else{var m=new CKEDITOR.htmlParser.element(a.name);m.attributes[g]=c[g];e.add(m);e=m;delete c[g]}for(c=0;c<d.length;c++)e.add(d[c])}var f,k,u,r,l=CKEDITOR.tools,y=["o:p","xml","script","meta","link"],w={},v=0;CKEDITOR.plugins.pastefromword={};CKEDITOR.cleanWord=function(a,b){var c=Boolean(a.match(/mso-list:\s*l\d+\s+level\d+\s+lfo\d+/));
+a=a.replace(/<!\[/g,"\x3c!--[").replace(/\]>/g,"]--\x3e");var d=CKEDITOR.htmlParser.fragment.fromHtml(a);r=new CKEDITOR.htmlParser.filter({root:function(a){a.filterChildren(r);CKEDITOR.plugins.pastefromword.lists.cleanup(f.createLists(a))},elementNames:[[/^\?xml:namespace$/,""],[/^v:shapetype/,""],[new RegExp(y.join("|")),""]],elements:{a:function(a){if(a.attributes.name){if("_GoBack"==a.attributes.name){delete a.name;return}if(a.attributes.name.match(/^OLE_LINK\d+$/)){delete a.name;return}}if(a.attributes.href&&
+a.attributes.href.match(/#.+$/)){var b=a.attributes.href.match(/#(.+)$/)[1];w[b]=a}a.attributes.name&&w[a.attributes.name]&&(a=w[a.attributes.name],a.attributes.href=a.attributes.href.replace(/.*#(.*)$/,"#$1"))},div:function(a){k.createStyleStack(a,r,b)},img:function(a){if(a.parent){var b=a.parent.attributes;(b=b.style||b.STYLE)&&b.match(/mso\-list:\s?Ignore/)&&(a.attributes["cke-ignored"]=!0)}k.mapStyles(a,{width:function(b){k.setStyle(a,"width",b+"px")},height:function(b){k.setStyle(a,"height",
+b+"px")}});a.attributes.src&&a.attributes.src.match(/^file:\/\//)&&a.attributes.alt&&a.attributes.alt.match(/^https?:\/\//)&&(a.attributes.src=a.attributes.alt)},p:function(a){a.filterChildren(r);if(a.attributes.style&&a.attributes.style.match(/display:\s*none/i))return!1;if(f.thisIsAListItem(b,a))f.convertToFakeListItem(b,a);else{var c=a.getAscendant(function(a){return"ul"==a.name||"ol"==a.name}),d=l.parseCssText(a.attributes.style);c&&!c.attributes["cke-list-level"]&&d["mso-list"]&&d["mso-list"].match(/level/)&&
+(c.attributes["cke-list-level"]=d["mso-list"].match(/level(\d+)/)[1])}k.createStyleStack(a,r,b)},pre:function(a){f.thisIsAListItem(b,a)&&f.convertToFakeListItem(b,a);k.createStyleStack(a,r,b)},h1:function(a){f.thisIsAListItem(b,a)&&f.convertToFakeListItem(b,a);k.createStyleStack(a,r,b)},font:function(a){if(a.getHtml().match(/^\s*$/))return(new CKEDITOR.htmlParser.text(" ")).insertAfter(a),!1;b&&!0===b.config.pasteFromWordRemoveFontStyles&&a.attributes.size&&delete a.attributes.size;x(a,r)},ul:function(a){if(c)return"li"==
+a.parent.name&&0===l.indexOf(a.parent.children,a)&&k.setStyle(a.parent,"list-style-type","none"),f.dissolveList(a),!1},li:function(a){c&&(a.attributes.style=k.normalizedStyles(a,b),k.pushStylesLower(a))},ol:function(a){if(c)return"li"==a.parent.name&&0===l.indexOf(a.parent.children,a)&&k.setStyle(a.parent,"list-style-type","none"),f.dissolveList(a),!1},span:function(a){a.filterChildren(r);a.attributes.style=k.normalizedStyles(a,b);if(!a.attributes.style||a.attributes.style.match(/^mso\-bookmark:OLE_LINK\d+$/)||
+a.getHtml().match(/^(\s|&nbsp;)+$/)){for(var c=a.children.length-1;0<=c;c--)a.children[c].insertAfter(a);return!1}k.createStyleStack(a,r,b)},table:function(a){a._tdBorders={};a.filterChildren(r);var b,c=0,d;for(d in a._tdBorders)a._tdBorders[d]>c&&(c=a._tdBorders[d],b=d);k.setStyle(a,"border",b)},td:function(a){var b=a.getAscendant("table"),c=b._tdBorders,d=["border","border-top","border-right","border-bottom","border-left"],b=l.parseCssText(b.attributes.style),e=b.background||b.BACKGROUND;e&&k.setStyle(a,
+"background",e,!0);(b=b["background-color"]||b["BACKGROUND-COLOR"])&&k.setStyle(a,"background-color",b,!0);var b=l.parseCssText(a.attributes.style),p;for(p in b)e=b[p],delete b[p],b[p.toLowerCase()]=e;for(p=0;p<d.length;p++)b[d[p]]&&(e=b[d[p]],c[e]=c[e]?c[e]+1:1);k.pushStylesLower(a,{background:!0})},"v:imagedata":t,"v:shape":function(a){var b=!1;a.parent.getFirst(function(c){"img"==c.name&&c.attributes&&c.attributes["v:shapes"]==a.attributes.id&&(b=!0)});if(b)return!1;var c="";a.forEach(function(a){a.attributes&&
+a.attributes.src&&(c=a.attributes.src)},CKEDITOR.NODE_ELEMENT,!0);a.filterChildren(r);a.name="img";a.attributes.src=a.attributes.src||c;delete a.attributes.type},style:function(){return!1}},attributes:{style:function(a,c){return k.normalizedStyles(c,b)||!1},"class":function(a){a=a.replace(/msonormal|msolistparagraph\w*/ig,"");return""===a?!1:a},cellspacing:t,cellpadding:t,border:t,valign:t,"v:shapes":t,"o:spid":t},comment:function(a){a.match(/\[if.* supportFields.*\]/)&&v++;"[endif]"==a&&(v=0<v?v-
+1:0);return!1},text:function(a){return v?"":a.replace(/&nbsp;/g," ")}});var e=new CKEDITOR.htmlParser.basicWriter;r.applyTo(d);d.writeHtml(e);return e.getHtml()};CKEDITOR.plugins.pastefromword.styles={setStyle:function(a,b,c,d){var e=l.parseCssText(a.attributes.style);d&&e[b]||(""===c?delete e[b]:e[b]=c,a.attributes.style=CKEDITOR.tools.writeCssText(e))},mapStyles:function(a,b){for(var c in b)if(a.attributes[c]){if("function"===typeof b[c])b[c](a.attributes[c]);else k.setStyle(a,b[c],a.attributes[c]);
+delete a.attributes[c]}},normalizedStyles:function(a,b){var c="background-color:transparent border-image:none color:windowtext direction:ltr mso- text-indent visibility:visible div:border:none".split(" "),d="font-family font font-size color background-color line-height text-decoration".split(" "),e=function(){for(var a=[],b=0;b<arguments.length;b++)arguments[b]&&a.push(arguments[b]);return-1!==l.indexOf(c,a.join(":"))},h=b&&!0===b.config.pasteFromWordRemoveFontStyles,g=l.parseCssText(a.attributes.style);
+"cke:li"==a.name&&g["TEXT-INDENT"]&&g.MARGIN&&(a.attributes["cke-indentation"]=f.getElementIndentation(a),g.MARGIN=g.MARGIN.replace(/(([\w\.]+ ){3,3})[\d\.]+(\w+$)/,"$10$3"));for(var m=l.objectKeys(g),q=0;q<m.length;q++){var n=m[q].toLowerCase(),p=g[m[q]],k=CKEDITOR.tools.indexOf;(h&&-1!==k(d,n.toLowerCase())||e(null,n,p)||e(null,n.replace(/\-.*$/,"-"))||e(null,n)||e(a.name,n,p)||e(a.name,n.replace(/\-.*$/,"-"))||e(a.name,n)||e(p))&&delete g[m[q]]}return CKEDITOR.tools.writeCssText(g)},createStyleStack:function(a,
+b,c){var d=[];a.filterChildren(b);for(b=a.children.length-1;0<=b;b--)d.unshift(a.children[b]),a.children[b].remove();k.sortStyles(a);b=l.parseCssText(k.normalizedStyles(a,c));c=a;var e="span"===a.name,h;for(h in b)if(!h.match(/margin|text\-align|width|border|padding/i))if(e)e=!1;else{var g=new CKEDITOR.htmlParser.element("span");g.attributes.style=h+":"+b[h];c.add(g);c=g;delete b[h]}"{}"!==JSON.stringify(b)?a.attributes.style=CKEDITOR.tools.writeCssText(b):delete a.attributes.style;for(b=0;b<d.length;b++)c.add(d[b])},
+sortStyles:function(a){for(var b=["border","border-bottom","font-size","background"],c=l.parseCssText(a.attributes.style),d=l.objectKeys(c),e=[],h=[],g=0;g<d.length;g++)-1!==l.indexOf(b,d[g].toLowerCase())?e.push(d[g]):h.push(d[g]);e.sort(function(a,c){var d=l.indexOf(b,a.toLowerCase()),e=l.indexOf(b,c.toLowerCase());return d-e});d=[].concat(e,h);e={};for(g=0;g<d.length;g++)e[d[g]]=c[d[g]];a.attributes.style=CKEDITOR.tools.writeCssText(e)},pushStylesLower:function(a,b){if(!a.attributes.style||0===
+a.children.length)return!1;b=b||{};var c={"list-style-type":!0,width:!0,border:!0,"border-":!0},d=l.parseCssText(a.attributes.style),e;for(e in d)if(!(e.toLowerCase()in c||c[e.toLowerCase().replace(/\-.*$/,"-")]||e.toLowerCase()in b)){for(var h=!1,g=0;g<a.children.length;g++){var m=a.children[g];m.type===CKEDITOR.NODE_ELEMENT&&(h=!0,k.setStyle(m,e,d[e]))}h&&delete d[e]}a.attributes.style=CKEDITOR.tools.writeCssText(d);return!0}};k=CKEDITOR.plugins.pastefromword.styles;CKEDITOR.plugins.pastefromword.lists=
+{thisIsAListItem:function(a,b){return u.isEdgeListItem(a,b)||b.attributes.style&&b.attributes.style.match(/mso\-list:\s?l\d/)&&"li"!==b.parent.name||b.attributes["cke-dissolved"]||b.getHtml().match(/<!\-\-\[if !supportLists]\-\->/)||b.getHtml().match(/^( )*.*?[\.\)] ( ){2,700}/)?!0:!1},convertToFakeListItem:function(a,b){u.isEdgeListItem(a,b)&&u.assignListLevels(a,b);this.getListItemInfo(b);if(!b.attributes["cke-dissolved"]){var c;b.forEach(function(a){!c&&"img"==a.name&&a.attributes["cke-ignored"]&&
+"*"==a.attributes.alt&&(c="·",a.remove())},CKEDITOR.NODE_ELEMENT);b.forEach(function(a){c||a.value.match(/^ /)||(c=a.value)},CKEDITOR.NODE_TEXT);if("undefined"==typeof c)return;b.attributes["cke-symbol"]=c.replace(/ .*$/,"");f.removeSymbolText(b)}if(b.attributes.style){var d=l.parseCssText(b.attributes.style);d["margin-left"]&&(delete d["margin-left"],b.attributes.style=CKEDITOR.tools.writeCssText(d))}b.name="cke:li"},convertToRealListItems:function(a){var b=[];a.forEach(function(a){"cke:li"==a.name&&
+(a.name="li",b.push(a))},CKEDITOR.NODE_ELEMENT,!1);return b},removeSymbolText:function(a){var b,c=a.attributes["cke-symbol"];a.forEach(function(d){!b&&d.value.match(c.replace(")","\\)").replace("(",""))&&(d.value=d.value.replace(c,""),d.parent.getHtml().match(/^(\s|&nbsp;)*$/)&&(b=d.parent!==a?d.parent:null))},CKEDITOR.NODE_TEXT);b&&b.remove()},setListSymbol:function(a,b,c){c=c||1;var d=l.parseCssText(a.attributes.style);if("ol"==a.name){if(a.attributes.type||d["list-style-type"])return;var e={"[ivx]":"lower-roman",
+"[IVX]":"upper-roman","[a-z]":"lower-alpha","[A-Z]":"upper-alpha","\\d":"decimal"},h;for(h in e)if(f.getSubsectionSymbol(b).match(new RegExp(h))){d["list-style-type"]=e[h];break}a.attributes["cke-list-style-type"]=d["list-style-type"]}else e={"·":"disc",o:"circle","§":"square"},!d["list-style-type"]&&e[b]&&(d["list-style-type"]=e[b]);f.setListSymbol.removeRedundancies(d,c);(a.attributes.style=CKEDITOR.tools.writeCssText(d))||delete a.attributes.style},setListStart:function(a){for(var b=[],c=0,d=0;d<
+a.children.length;d++)b.push(a.children[d].attributes["cke-symbol"]||"");b[0]||c++;switch(a.attributes["cke-list-style-type"]){case "lower-roman":case "upper-roman":a.attributes.start=f.toArabic(f.getSubsectionSymbol(b[c]))-c;break;case "lower-alpha":case "upper-alpha":a.attributes.start=f.getSubsectionSymbol(b[c]).replace(/\W/g,"").toLowerCase().charCodeAt(0)-96-c;break;case "decimal":a.attributes.start=parseInt(f.getSubsectionSymbol(b[c]),10)-c||1}"1"==a.attributes.start&&delete a.attributes.start;
+delete a.attributes["cke-list-style-type"]},numbering:{toNumber:function(a,b){function c(a){a=a.toUpperCase();for(var b=1,c=1;0<a.length;c*=26)b+="ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(a.charAt(a.length-1))*c,a=a.substr(0,a.length-1);return b}function d(a){var b=[[1E3,"M"],[900,"CM"],[500,"D"],[400,"CD"],[100,"C"],[90,"XC"],[50,"L"],[40,"XL"],[10,"X"],[9,"IX"],[5,"V"],[4,"IV"],[1,"I"]];a=a.toUpperCase();for(var c=b.length,d=0,f=0;f<c;++f)for(var n=b[f],p=n[1].length;a.substr(0,p)==n[1];a=a.substr(p))d+=
+n[0];return d}return"decimal"==b?Number(a):"upper-roman"==b||"lower-roman"==b?d(a.toUpperCase()):"lower-alpha"==b||"upper-alpha"==b?c(a):1},getStyle:function(a){a=a.slice(0,1);var b={i:"lower-roman",v:"lower-roman",x:"lower-roman",l:"lower-roman",m:"lower-roman",I:"upper-roman",V:"upper-roman",X:"upper-roman",L:"upper-roman",M:"upper-roman"}[a];b||(b="decimal",a.match(/[a-z]/)&&(b="lower-alpha"),a.match(/[A-Z]/)&&(b="upper-alpha"));return b}},getSubsectionSymbol:function(a){return(a.match(/([\da-zA-Z]+).?$/)||
+["placeholder",1])[1]},setListDir:function(a){var b=0,c=0;a.forEach(function(a){"li"==a.name&&("rtl"==(a.attributes.dir||a.attributes.DIR||"").toLowerCase()?c++:b++)},CKEDITOR.ELEMENT_NODE);c>b&&(a.attributes.dir="rtl")},createList:function(a){return(a.attributes["cke-symbol"].match(/([\da-np-zA-NP-Z]).?/)||[])[1]?new CKEDITOR.htmlParser.element("ol"):new CKEDITOR.htmlParser.element("ul")},createLists:function(a){var b,c,d,e=f.convertToRealListItems(a);if(0===e.length)return[];var h=f.groupLists(e);
+for(a=0;a<h.length;a++){var g=h[a],m=g[0];for(d=0;d<g.length;d++)if(1==g[d].attributes["cke-list-level"]){m=g[d];break}var m=[f.createList(m)],k=m[0],n=[m[0]];k.insertBefore(g[0]);for(d=0;d<g.length;d++){b=g[d];for(c=b.attributes["cke-list-level"];c>m.length;){var p=f.createList(b),l=k.children;0<l.length?l[l.length-1].add(p):(l=new CKEDITOR.htmlParser.element("li",{style:"list-style-type:none"}),l.add(p),k.add(l));m.push(p);n.push(p);k=p;c==m.length&&f.setListSymbol(p,b.attributes["cke-symbol"],
+c)}for(;c<m.length;)m.pop(),k=m[m.length-1],c==m.length&&f.setListSymbol(k,b.attributes["cke-symbol"],c);b.remove();k.add(b)}m[0].children.length&&(d=m[0].children[0].attributes["cke-symbol"],!d&&1<m[0].children.length&&(d=m[0].children[1].attributes["cke-symbol"]),d&&f.setListSymbol(m[0],d));for(d=0;d<n.length;d++)f.setListStart(n[d]);for(d=0;d<g.length;d++)this.determineListItemValue(g[d])}return e},cleanup:function(a){var b=["cke-list-level","cke-symbol","cke-list-id","cke-indentation","cke-dissolved"],
+c,d;for(c=0;c<a.length;c++)for(d=0;d<b.length;d++)delete a[c].attributes[b[d]]},determineListItemValue:function(a){if("ol"===a.parent.name){var b=this.calculateValue(a),c=a.attributes["cke-symbol"].match(/[a-z0-9]+/gi),d;c&&(c=c[c.length-1],d=a.parent.attributes["cke-list-style-type"]||this.numbering.getStyle(c),c=this.numbering.toNumber(c,d),c!==b&&(a.attributes.value=c))}},calculateValue:function(a){if(!a.parent)return 1;var b=a.parent;a=a.getIndex();var c=null,d,e,h;for(h=a;0<=h&&null===c;h--)e=
+b.children[h],e.attributes&&void 0!==e.attributes.value&&(d=h,c=parseInt(e.attributes.value,10));null===c&&(c=void 0!==b.attributes.start?parseInt(b.attributes.start,10):1,d=0);return c+(a-d)},dissolveList:function(a){function b(a){return 50<=a?"l"+b(a-50):40<=a?"xl"+b(a-40):10<=a?"x"+b(a-10):9==a?"ix":5<=a?"v"+b(a-5):4==a?"iv":1<=a?"i"+b(a-1):""}function c(a,b){function c(b,d){return b&&b.parent?a(b.parent)?c(b.parent,d+1):c(b.parent,d):d}return c(b,0)}var d=function(a){return function(b){return b.name==
+a}},e=function(a){return d("ul")(a)||d("ol")(a)},h=CKEDITOR.tools.array,g=[],f,q;a.forEach(function(a){g.push(a)},CKEDITOR.NODE_ELEMENT,!1);f=h.filter(g,d("li"));var n=h.filter(g,e);h.forEach(n,function(a){var g=a.attributes.type,f=parseInt(a.attributes.start,10)||1,k=c(e,a)+1;g||(g=l.parseCssText(a.attributes.style)["list-style-type"]);h.forEach(h.filter(a.children,d("li")),function(c,d){var e;switch(g){case "disc":e="·";break;case "circle":e="o";break;case "square":e="§";break;case "1":case "decimal":e=
+f+d+".";break;case "a":case "lower-alpha":e=String.fromCharCode(97+f-1+d)+".";break;case "A":case "upper-alpha":e=String.fromCharCode(65+f-1+d)+".";break;case "i":case "lower-roman":e=b(f+d)+".";break;case "I":case "upper-roman":e=b(f+d).toUpperCase()+".";break;default:e="ul"==a.name?"·":f+d+"."}c.attributes["cke-symbol"]=e;c.attributes["cke-list-level"]=k})});f=h.reduce(f,function(a,b){var c=b.children[0];if(c&&c.name&&c.attributes.style&&c.attributes.style.match(/mso-list:/i)){k.pushStylesLower(b,
+{"list-style-type":!0,display:!0});var d=l.parseCssText(c.attributes.style,!0);k.setStyle(b,"mso-list",d["mso-list"],!0);k.setStyle(c,"mso-list","");delete b["cke-list-level"];(c=d.display?"display":d.DISPLAY?"DISPLAY":"")&&k.setStyle(b,"display",d[c],!0)}if(1===b.children.length&&e(b.children[0]))return a;b.name="p";b.attributes["cke-dissolved"]=!0;a.push(b);return a},[]);for(q=f.length-1;0<=q;q--)f[q].insertAfter(a);for(q=n.length-1;0<=q;q--)delete n[q].name},groupLists:function(a){var b,c,d=[[a[0]]],
+e=d[0];c=a[0];c.attributes["cke-indentation"]=c.attributes["cke-indentation"]||f.getElementIndentation(c);for(b=1;b<a.length;b++){c=a[b];var h=a[b-1];c.attributes["cke-indentation"]=c.attributes["cke-indentation"]||f.getElementIndentation(c);c.previous!==h&&(f.chopDiscontinuousLists(e,d),d.push(e=[]));e.push(c)}f.chopDiscontinuousLists(e,d);return d},chopDiscontinuousLists:function(a,b){for(var c={},d=[[]],e,h=0;h<a.length;h++){var g=c[a[h].attributes["cke-list-level"]],k=this.getListItemInfo(a[h]),
+q,n;g?(n=g.type.match(/alpha/)&&7==g.index?"alpha":n,n="o"==a[h].attributes["cke-symbol"]&&14==g.index?"alpha":n,q=f.getSymbolInfo(a[h].attributes["cke-symbol"],n),k=this.getListItemInfo(a[h]),(g.type!=q.type||e&&k.id!=e.id&&!this.isAListContinuation(a[h]))&&d.push([])):q=f.getSymbolInfo(a[h].attributes["cke-symbol"]);for(e=parseInt(a[h].attributes["cke-list-level"],10)+1;20>e;e++)c[e]&&delete c[e];c[a[h].attributes["cke-list-level"]]=q;d[d.length-1].push(a[h]);e=k}[].splice.apply(b,[].concat([l.indexOf(b,
+a),1],d))},isAListContinuation:function(a){var b=a;do if((b=b.previous)&&b.type===CKEDITOR.NODE_ELEMENT){if(void 0===b.attributes["cke-list-level"])break;if(b.attributes["cke-list-level"]===a.attributes["cke-list-level"])return b.attributes["cke-list-id"]===a.attributes["cke-list-id"]}while(b);return!1},getElementIndentation:function(a){a=l.parseCssText(a.attributes.style);if(a.margin||a.MARGIN){a.margin=a.margin||a.MARGIN;var b={styles:{margin:a.margin}};CKEDITOR.filter.transformationsTools.splitMarginShorthand(b);
+a["margin-left"]=b.styles["margin-left"]}return parseInt(l.convertToPx(a["margin-left"]||"0px"),10)},toArabic:function(a){return a.match(/[ivxl]/i)?a.match(/^l/i)?50+f.toArabic(a.slice(1)):a.match(/^lx/i)?40+f.toArabic(a.slice(1)):a.match(/^x/i)?10+f.toArabic(a.slice(1)):a.match(/^ix/i)?9+f.toArabic(a.slice(2)):a.match(/^v/i)?5+f.toArabic(a.slice(1)):a.match(/^iv/i)?4+f.toArabic(a.slice(2)):a.match(/^i/i)?1+f.toArabic(a.slice(1)):f.toArabic(a.slice(1)):0},getSymbolInfo:function(a,b){var c=a.toUpperCase()==
+a?"upper-":"lower-",d={"·":["disc",-1],o:["circle",-2],"§":["square",-3]};if(a in d||b&&b.match(/(disc|circle|square)/))return{index:d[a][1],type:d[a][0]};if(a.match(/\d/))return{index:a?parseInt(f.getSubsectionSymbol(a),10):0,type:"decimal"};a=a.replace(/\W/g,"").toLowerCase();return!b&&a.match(/[ivxl]+/i)||b&&"alpha"!=b||"roman"==b?{index:f.toArabic(a),type:c+"roman"}:a.match(/[a-z]/i)?{index:a.charCodeAt(0)-97,type:c+"alpha"}:{index:-1,type:"disc"}},getListItemInfo:function(a){if(void 0!==a.attributes["cke-list-id"])return{id:a.attributes["cke-list-id"],
+level:a.attributes["cke-list-level"]};var b=l.parseCssText(a.attributes.style)["mso-list"],c={id:"0",level:"1"};b&&(b+=" ",c.level=b.match(/level(.+?)\s+/)[1],c.id=b.match(/l(\d+?)\s+/)[1]);a.attributes["cke-list-level"]=void 0!==a.attributes["cke-list-level"]?a.attributes["cke-list-level"]:c.level;a.attributes["cke-list-id"]=c.id;return c}};f=CKEDITOR.plugins.pastefromword.lists;CKEDITOR.plugins.pastefromword.heuristics={isEdgeListItem:function(a,b){return CKEDITOR.env.edge&&a.config.pasteFromWord_heuristicsEdgeList?
+b.attributes.style&&!b.attributes.style.match(/mso\-list/)&&!!b.find(function(a){var b=l.parseCssText(a.attributes&&a.attributes.style);if(!b)return!1;var e=b["font-family"]||"";return(b.font||b["font-size"]||"").match(/7pt/i)&&!!a.previous||e.match(/symbol/i)},!0).length:!1},assignListLevels:function(a,b){if(!b.attributes||void 0===b.attributes["cke-list-level"]){for(var c=[f.getElementIndentation(b)],d=[b],e=[],h=CKEDITOR.tools.array,g=h.map;b.next&&b.next.attributes&&!b.next.attributes["cke-list-level"]&&
+u.isEdgeListItem(a,b.next);)b=b.next,c.push(f.getElementIndentation(b)),d.push(b);var k=g(c,function(a,b){return 0===b?0:a-c[b-1]}),l=this.guessIndentationStep(h.filter(c,function(a){return 0!==a})),e=g(c,function(a){return Math.round(a/l)});-1!==h.indexOf(e,0)&&(e=g(e,function(a){return a+1}));h.forEach(d,function(a,b){a.attributes["cke-list-level"]=e[b]});return{indents:c,levels:e,diffs:k}}},guessIndentationStep:function(a){return a.length?Math.min.apply(null,a):null}};u=CKEDITOR.plugins.pastefromword.heuristics;
+f.setListSymbol.removeRedundancies=function(a,b){(1===b&&"disc"===a["list-style-type"]||"decimal"===a["list-style-type"])&&delete a["list-style-type"]};CKEDITOR.plugins.pastefromword.createAttributeStack=x;CKEDITOR.config.pasteFromWord_heuristicsEdgeList=!0})();
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js b/web/core/assets/vendor/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
index b89250375..048361c60 100644
--- a/web/core/assets/vendor/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
+++ b/web/core/assets/vendor/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("sourcedialog",function(a){var b=CKEDITOR.document.getWindow().getViewPaneSize(),e=Math.min(b.width-70,800),b=b.height/1.5,d;return{title:a.lang.sourcedialog.title,minWidth:100,minHeight:100,onShow:function(){this.setValueOf("main","data",d=a.getData())},onOk:function(){function b(f,c){a.focus();a.setData(c,function(){f.hide();var b=a.createRange();b.moveToElementEditStart(a.editable());b.select()})}return function(){var a=this.getValueOf("main","data").replace(/\r/g,""),c=this;
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
index 1b0d421de..58f21b07c 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 
 cs.js      Found: 118 Missing: 0
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/af.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/af.js
index 41780d290..4203e53ed 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/af.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/af.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","af",{euro:"Euroteken",lsquo:"Linker enkelkwotasie",rsquo:"Regter enkelkwotasie",ldquo:"Linker dubbelkwotasie",rdquo:"Regter dubbelkwotasie",ndash:"Kortkoppelteken",mdash:"Langkoppelteken",iexcl:"Omgekeerdeuitroepteken",cent:"Centteken",pound:"Pondteken",curren:"Geldeenheidteken",yen:"Yenteken",brvbar:"Gebreekte balk",sect:"Afdeelingsteken",uml:"Deelteken",copy:"Kopieregteken",ordf:"Vroulikekenteken",laquo:"Linkgeoorienteerde aanhaalingsteken",not:"Verbodeteken",
 reg:"Regestrasieteken",macr:"Lengteteken",deg:"Gradeteken",sup2:"Kwadraatteken",sup3:"Kubiekteken",acute:"Akuutaksentteken",micro:"Mikroteken",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ar.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
index cdd1c9034..0b2a258c3 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ar",{euro:"رمز اليورو",lsquo:"علامة تنصيص فردية علي اليسار",rsquo:"علامة تنصيص فردية علي اليمين",ldquo:"علامة تنصيص مزدوجة علي اليسار",rdquo:"علامة تنصيص مزدوجة علي اليمين",ndash:"En dash",mdash:"Em dash",iexcl:"علامة تعجب مقلوبة",cent:"رمز السنت",pound:"رمز الاسترليني",curren:"رمز العملة",yen:"رمز الين",brvbar:"شريط مقطوع",sect:"رمز القسم",uml:"Diaeresis",copy:"علامة حقوق الطبع",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"ليست علامة",reg:"علامة مسجّلة",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"علامة الإستفهام غير صحيحة",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/bg.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
index 3406b35dc..0ffe11643 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","bg",{euro:"Евро знак",lsquo:"Лява маркировка за цитат",rsquo:"Дясна маркировка за цитат",ldquo:"Лява двойна кавичка за цитат",rdquo:"Дясна двойна кавичка за цитат",ndash:"\\\\",mdash:"/",iexcl:"Обърната питанка",cent:"Знак за цент",pound:"Знак за паунд",curren:"Валутен знак",yen:"Знак за йена",brvbar:"Прекъсната линия",sect:"Знак за секция",uml:"Diaeresis",copy:"Знак за Copyright",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Registered sign",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
index a87218911..2e5c266b1 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ca",{euro:"Símbol d'euro",lsquo:"Signe de cometa simple esquerra",rsquo:"Signe de cometa simple dreta",ldquo:"Signe de cometa doble esquerra",rdquo:"Signe de cometa doble dreta",ndash:"Guió",mdash:"Guió baix",iexcl:"Signe d'exclamació inversa",cent:"Símbol de percentatge",pound:"Símbol de lliura",curren:"Símbol de moneda",yen:"Símbol de Yen",brvbar:"Barra trencada",sect:"Símbol de secció",uml:"Dièresi",copy:"Símbol de Copyright",ordf:"Indicador ordinal femení",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
index 1d98c29f8..eaae5bd72 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","cs",{euro:"Znak eura",lsquo:"Počáteční uvozovka jednoduchá",rsquo:"Koncová uvozovka jednoduchá",ldquo:"Počáteční uvozovka dvojitá",rdquo:"Koncová uvozovka dvojitá",ndash:"En pomlčka",mdash:"Em pomlčka",iexcl:"Obrácený vykřičník",cent:"Znak centu",pound:"Znak libry",curren:"Znak měny",yen:"Znak jenu",brvbar:"Přerušená svislá čára",sect:"Znak oddílu",uml:"Přehláska",copy:"Znak copyrightu",ordf:"Ženský indikátor rodu",laquo:"Znak dvojitých lomených uvozovek vlevo",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
index 1ceb05b2a..630ae3190 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","cy",{euro:"Arwydd yr Ewro",lsquo:"Dyfynnod chwith unigol",rsquo:"Dyfynnod dde unigol",ldquo:"Dyfynnod chwith dwbl",rdquo:"Dyfynnod dde dwbl",ndash:"Cysylltnod en",mdash:"Cysylltnod em",iexcl:"Ebychnod gwrthdro",cent:"Arwydd sent",pound:"Arwydd punt",curren:"Arwydd arian cyfred",yen:"Arwydd yen",brvbar:"Bar toriedig",sect:"Arwydd adran",uml:"Didolnod",copy:"Arwydd hawlfraint",ordf:"Dangosydd benywaidd",laquo:"Dyfynnod dwbl ar ongl i'r chwith",not:"Arwydd Nid",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/da.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/da.js
index 7b26e4c30..10e47c392 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/da.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/da.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","da",{euro:"Euro-tegn",lsquo:"Venstre enkelt anførselstegn",rsquo:"Højre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Højre dobbelt anførselstegn",ndash:"Bindestreg",mdash:"Tankestreg",iexcl:"Omvendt udråbstegn",cent:"Cent-tegn",pound:"Pund-tegn",curren:"Kurs-tegn",yen:"Yen-tegn",brvbar:"Brudt streg",sect:"Paragraftegn",uml:"Umlaut",copy:"Copyright-tegn",ordf:"Feminin ordinal indikator",laquo:"Venstre dobbel citations-vinkel",not:"Negation",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
index 60673f088..e4e5907f9 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","de-ch",{euro:"Euro Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"Kleiner Strich",mdash:"Mittlerer Strich",iexcl:"Invertiertes Ausrufezeichen",cent:"Cent-Zeichen",pound:"Pfund-Zeichen",curren:"Währungszeichen",yen:"Yen",brvbar:"Gestrichelte Linie",sect:"Paragrafenzeichen",uml:"Diäresis",copy:"Copyright-Zeichen",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de.js
index 2f67f0c11..427639713 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","de",{euro:"Euro Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"Kleiner Strich",mdash:"Mittlerer Strich",iexcl:"Invertiertes Ausrufezeichen",cent:"Cent-Zeichen",pound:"Pfund-Zeichen",curren:"Währungszeichen",yen:"Yen",brvbar:"Gestrichelte Linie",sect:"Paragrafenzeichen",uml:"Diäresis",copy:"Copyright-Zeichen",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/el.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/el.js
index c27777e8f..dc1d28a88 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/el.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/el.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","el",{euro:"Σύμβολο Ευρώ",lsquo:"Αριστερός χαρακτήρας μονού εισαγωγικού",rsquo:"Δεξιός χαρακτήρας μονού εισαγωγικού",ldquo:"Αριστερός χαρακτήρας ευθύγραμμων εισαγωγικών",rdquo:"Δεξιός χαρακτήρας ευθύγραμμων εισαγωγικών",ndash:"Παύλα en",mdash:"Παύλα em",iexcl:"Ανάποδο θαυμαστικό",cent:"Σύμβολο σεντ",pound:"Σύμβολο λίρας",curren:"Σύμβολο συναλλαγματικής μονάδας",yen:"Σύμβολο Γιεν",brvbar:"Σπασμένη μπάρα",sect:"Σύμβολο τμήματος",uml:"Διαίρεση",copy:"Σύμβολο πνευματικών δικαιωμάτων",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
index e0128d6a2..ff73fe863 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","en-gb",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en.js
index d89d46d3b..361a6858b 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","en",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Registered sign",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
index 4c1734046..5f4fa9de3 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","eo",{euro:"Eŭrosigno",lsquo:"Supra 6-citilo",rsquo:"Supra 9-citilo",ldquo:"Supra 66-citilo",rdquo:"Supra 99-citilo",ndash:"Streketo",mdash:"Substreko",iexcl:"Renversita krisigno",cent:"Cendosigno",pound:"Pundosigno",curren:"Monersigno",yen:"Enosigno",brvbar:"Rompita vertikala streko",sect:"Kurba paragrafo",uml:"Tremao",copy:"Kopirajtosigno",ordf:"Adjektiva numerfinaĵo",laquo:"Duobla malplio-citilo",not:"Negohoko",reg:"Registrita marko",macr:"Superstreko",deg:"Gradosigno",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/es.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/es.js
index 875b6448f..dd395e54a 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/es.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/es.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","es",{euro:"Símbolo de euro",lsquo:"Comilla simple izquierda",rsquo:"Comilla simple derecha",ldquo:"Comilla doble izquierda",rdquo:"Comilla doble derecha",ndash:"Guión corto",mdash:"Guión medio largo",iexcl:"Signo de admiración invertido",cent:"Símbolo centavo",pound:"Símbolo libra",curren:"Símbolo moneda",yen:"Símbolo yen",brvbar:"Barra vertical rota",sect:"Símbolo sección",uml:"Diéresis",copy:"Signo de derechos de autor",ordf:"Indicador ordinal femenino",laquo:"Abre comillas angulares",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/et.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/et.js
index ca6f88087..b7a2e1f02 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/et.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/et.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","et",{euro:"Euromärk",lsquo:"Alustav ühekordne jutumärk",rsquo:"Lõpetav ühekordne jutumärk",ldquo:"Alustav kahekordne jutumärk",rdquo:"Lõpetav kahekordne jutumärk",ndash:"Enn-kriips",mdash:"Emm-kriips",iexcl:"Pööratud hüüumärk",cent:"Sendimärk",pound:"Naela märk",curren:"Valuutamärk",yen:"Jeeni märk",brvbar:"Katkestatud kriips",sect:"Lõigu märk",uml:"Täpid",copy:"Autoriõiguse märk",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Ei-märk",reg:"Registered sign",macr:"Macron",deg:"Kraadimärk",sup2:"Ülaindeks kaks",sup3:"Ülaindeks kolm",acute:"Acute accent",micro:"Mikro-märk",para:"Pilcrow sign",middot:"Keskpunkt",cedil:"Cedilla",sup1:"Ülaindeks üks",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Ladina suur A tildega",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Ladina suur A tildega",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Täppidega ladina suur O",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Kandilise katusega suur ladina U",Uuml:"Täppidega ladina suur U",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Ladina väike terav s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Kandilise katusega ladina väike a",atilde:"Tildega ladina väike a",auml:"Täppidega ladina väike a",aring:"Latin small letter a with ring above",
 aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",ntilde:"Latin small letter n with tilde",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eu.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
index d18fecae5..26ac3d8ab 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","eu",{euro:"Euro zeinua",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Libera zeinua",curren:"Currency sign",yen:"Yen zeinua",brvbar:"Broken bar",sect:"Section sign",uml:"Dieresia",copy:"Copyright zeinua",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Ez zeinua",reg:"Registered sign",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Bider zeinua",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
index 6351d73ce..5028d03a1 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fa",{euro:"نشان یورو",lsquo:"علامت نقل قول تکی چپ",rsquo:"علامت نقل قول تکی راست",ldquo:"علامت نقل قول دوتایی چپ",rdquo:"علامت نقل قول دوتایی راست",ndash:"خط تیره En",mdash:"خط تیره Em",iexcl:"علامت تعجب وارونه",cent:"نشان سنت",pound:"نشان پوند",curren:"نشان ارز",yen:"نشان ین",brvbar:"نوار شکسته",sect:"نشان بخش",uml:"نشان سواگیری",copy:"نشان کپی رایت",ordf:"شاخص ترتیبی مونث",laquo:"اشاره چپ مکرر برای زاویه علامت نقل قول",not:"نشان ثبت نشده",reg:"نشان ثبت شده",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
index 7132cd197..af6f9105b 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fi",{euro:"Euron merkki",lsquo:"Vasen yksittäinen lainausmerkki",rsquo:"Oikea yksittäinen lainausmerkki",ldquo:"Vasen kaksoislainausmerkki",rdquo:"Oikea kaksoislainausmerkki",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Sentin merkki",pound:"Punnan merkki",curren:"Valuuttamerkki",yen:"Yenin merkki",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Rekisteröity merkki",macr:"Macron",deg:"Asteen merkki",sup2:"Yläindeksi kaksi",sup3:"Yläindeksi kolme",acute:"Acute accent",micro:"Mikron merkki",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Yläindeksi yksi",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Ylösalaisin oleva kysymysmerkki",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Kertomerkki",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
index 326a6e5c6..5cda5e8b7 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fr-ca",{euro:"Symbole Euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret haut",mdash:"Tiret",iexcl:"Point d'exclamation inversé",cent:"Symbole de cent",pound:"Symbole de Livre Sterling",curren:"Symbole monétaire",yen:"Symbole du Yen",brvbar:"Barre scindée",sect:"Symbole de section",uml:"Tréma",copy:"Symbole de copyright",ordf:"Indicateur ordinal féminin",laquo:"Guillemet français ouvrant",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
index 6da8c316e..88a63431b 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fr",{euro:"Symbole euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret demi-cadratin",mdash:"Tiret cadratin",iexcl:"Point d'exclamation inversé",cent:"Symbole cent",pound:"Symbole Livre sterling",curren:"Symbole monétaire",yen:"Symbole yen",brvbar:"Barre verticale scindée",sect:"Signe de section",uml:"Tréma",copy:"Symbole Copyright",ordf:"Indicateur ordinal féminin",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/gl.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
index 6a31fdcfc..ef2a19398 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","gl",{euro:"Símbolo do euro",lsquo:"Comiña simple esquerda",rsquo:"Comiña simple dereita",ldquo:"Comiñas dobres esquerda",rdquo:"Comiñas dobres dereita",ndash:"Guión",mdash:"Raia",iexcl:"Signo de admiración invertido",cent:"Símbolo do centavo",pound:"Símbolo da libra",curren:"Símbolo de moeda",yen:"Símbolo do yen",brvbar:"Barra vertical rota",sect:"Símbolo de sección",uml:"Diérese",copy:"Símbolo de dereitos de autoría",ordf:"Indicador ordinal feminino",laquo:"Comiñas latinas, apertura",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/he.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/he.js
index 5fabd82d5..2d6d956b2 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/he.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/he.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","he",{euro:"יורו",lsquo:"סימן ציטוט יחיד שמאלי",rsquo:"סימן ציטוט יחיד ימני",ldquo:"סימן ציטוט כפול שמאלי",rdquo:"סימן ציטוט כפול ימני",ndash:"קו מפריד קצר",mdash:"קו מפריד ארוך",iexcl:"סימן קריאה הפוך",cent:"סנט",pound:"פאונד",curren:"מטבע",yen:"ין",brvbar:"קו שבור",sect:"סימן מקטע",uml:"שתי נקודות אופקיות (Diaeresis)",copy:"סימן זכויות יוצרים (Copyright)",ordf:"סימן אורדינאלי נקבי",laquo:"סימן ציטוט זווית כפולה לשמאל",not:"סימן שלילה מתמטי",reg:"סימן רשום",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
index 41dfd8ffb..8b0d52975 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","hr",{euro:"Euro znak",lsquo:"Lijevi jednostruki navodnik",rsquo:"Desni jednostruki navodnik",ldquo:"Lijevi dvostruki navodnik",rdquo:"Desni dvostruki navodnik",ndash:"En crtica",mdash:"Em crtica",iexcl:"Naopaki uskličnik",cent:"Cent znak",pound:"Funta znak",curren:"Znak valute",yen:"Yen znak",brvbar:"Potrgana prečka",sect:"Znak odjeljka",uml:"Prijeglasi",copy:"Copyright znak",ordf:"Feminine ordinal indicator",laquo:"Lijevi dvostruki uglati navodnik",not:"Not znak",
 reg:"Registered znak",macr:"Macron",deg:"Stupanj znak",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Mikro znak",para:"Pilcrow sign",middot:"Srednja točka",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Desni dvostruku uglati navodnik",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Naopaki upitnik",Agrave:"Veliko latinsko slovo A s akcentom",Aacute:"Latinično veliko slovo A sa oštrim naglaskom",
-Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
+Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
 Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",Ugrave:"Latin capital letter U with grave accent",
 Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",aring:"Latin small letter a with ring above",
 aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",ntilde:"Latin small letter n with tilde",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hu.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
index fd56ab131..944721f4a 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","hu",{euro:"Euró jel",lsquo:"Bal szimpla idézőjel",rsquo:"Jobb szimpla idézőjel",ldquo:"Bal dupla idézőjel",rdquo:"Jobb dupla idézőjel",ndash:"Rövid gondolatjel",mdash:"Hosszú gondolatjel",iexcl:"Fordított felkiáltójel",cent:"Cent jel",pound:"Font jel",curren:"Valuta jel",yen:"Yen jel",brvbar:"Hosszú kettőspont",sect:"Paragrafus jel",uml:"Kettős hangzó jel",copy:"Szerzői jog jel",ordf:"Női sorrend mutatója",laquo:"Balra mutató duplanyíl",not:"Feltételes kötőjel",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/id.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/id.js
index 45803cae5..35ccd46a3 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/id.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/id.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","id",{euro:"Tanda Euro",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Tanda Yen",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Tanda Hak Cipta",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Tanda Telah Terdaftar",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/it.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/it.js
index f1f94663d..ef772b983 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/it.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/it.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","it",{euro:"Simbolo Euro",lsquo:"Virgoletta singola sinistra",rsquo:"Virgoletta singola destra",ldquo:"Virgolette aperte",rdquo:"Virgolette chiuse",ndash:"Trattino",mdash:"Trattino lungo",iexcl:"Punto esclavamativo invertito",cent:"Simbolo Cent",pound:"Simbolo Sterlina",curren:"Simbolo Moneta",yen:"Simbolo Yen",brvbar:"Barra interrotta",sect:"Simbolo di sezione",uml:"Dieresi",copy:"Simbolo Copyright",ordf:"Indicatore ordinale femminile",laquo:"Virgolette basse aperte",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ja.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
index ba348aae4..47393e472 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ja",{euro:"ユーロ記号",lsquo:"左シングル引用符",rsquo:"右シングル引用符",ldquo:"左ダブル引用符",rdquo:"右ダブル引用符",ndash:"半角ダッシュ",mdash:"全角ダッシュ",iexcl:"逆さ感嘆符",cent:"セント記号",pound:"ポンド記号",curren:"通貨記号",yen:"円記号",brvbar:"上下に分かれた縦棒",sect:"節記号",uml:"分音記号(ウムラウト)",copy:"著作権表示記号",ordf:"女性序数標識",laquo:" 始め二重山括弧引用記号",not:"論理否定記号",reg:"登録商標記号",macr:"長音符",deg:"度記号",sup2:"上つき2, 2乗",sup3:"上つき3, 3乗",acute:"揚音符",micro:"ミクロン記号",para:"段落記号",middot:"中黒",cedil:"セディラ",sup1:"上つき1",ordm:"男性序数標識",raquo:"終わり二重山括弧引用記号",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/km.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/km.js
index 8f9fd7fcd..40a0828dc 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/km.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/km.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","km",{euro:"សញ្ញា​អឺរ៉ូ",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"សញ្ញា​សេន",pound:"សញ្ញា​ផោន",curren:"សញ្ញា​រូបិយបណ្ណ",yen:"សញ្ញា​យ៉េន",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"សញ្ញា​រក្សា​សិទ្ធិ",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Registered sign",macr:"Macron",deg:"សញ្ញា​ដឺក្រេ",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"សញ្ញា​មីក្រូ",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ko.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
index 05759fcf9..426b392c3 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ko",{euro:"유로화 기호",lsquo:"왼쪽 외 따옴표",rsquo:"오른쪽 외 따옴표",ldquo:"왼쪽 쌍 따옴표",rdquo:"오른쪽 쌍 따옴표",ndash:"반각 대시",mdash:"전각 대시",iexcl:"반전된 느낌표",cent:"센트 기호",pound:"파운드화 기호",curren:"커런시 기호",yen:"위안화 기호",brvbar:"Broken bar",sect:"섹션 기호",uml:"분음 부호",copy:"저작권 기호",ordf:"Feminine ordinal indicator",laquo:"왼쪽 쌍꺽쇠 인용 부호",not:"금지 기호",reg:"등록 기호",macr:"장음 기호",deg:"도 기호",sup2:"위첨자 2",sup3:"위첨자 3",acute:"양음 악센트 부호",micro:"마이크로 기호",para:"단락 기호",middot:"가운데 점",cedil:"세디유",sup1:"위첨자 1",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
index 1da11107a..736193fd7 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ku",{euro:"نیشانەی یۆرۆ",lsquo:"نیشانەی فاریزەی سەرووژێری تاکی چەپ",rsquo:"نیشانەی فاریزەی سەرووژێری تاکی ڕاست",ldquo:"نیشانەی فاریزەی سەرووژێری دووهێندەی چه‌پ",rdquo:"نیشانەی فاریزەی سەرووژێری دووهێندەی ڕاست",ndash:"تەقەڵی کورت",mdash:"تەقەڵی درێژ",iexcl:"نیشانەی هەڵەوگێڕی سەرسوڕهێنەر",cent:"نیشانەی سەنت",pound:"نیشانەی پاوەند",curren:"نیشانەی دراو",yen:"نیشانەی یەنی ژاپۆنی",brvbar:"شریتی ئەستوونی پچڕاو",sect:"نیشانەی دوو s لەسەریەک",uml:"خاڵ",copy:"نیشانەی مافی چاپ",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lt.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
index c1fdd117d..ab3797e32 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","lt",{euro:"Euro ženklas",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cento ženklas",pound:"Svaro ženklas",curren:"Valiutos ženklas",yen:"Jenos ženklas",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Ne ženklas",reg:"Registered sign",macr:"Makronas",deg:"Laipsnio ženklas",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Mikro ženklas",para:"Pilcrow sign",middot:"Vidurinis taškas",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
index b3a2aa002..4e8f1d204 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","lv",{euro:"Euro zīme",lsquo:"Kreisā  vienkārtīga pēdiņa",rsquo:"Labā  vienkārtīga pēdiņa",ldquo:"Kreisā  dubult pēdiņa",rdquo:"Labā dubult pēdiņa",ndash:"En svītra",mdash:"Em svītra",iexcl:"Apgriezta izsaukuma zīme",cent:"Centu naudas zīme",pound:"Sterliņu mārciņu naudas zīme",curren:"Valūtas zīme",yen:"Jenu naudas zīme",brvbar:"Vertikāla pārrauta līnija",sect:"Paragrāfa zīme",uml:"Diakritiska zīme",copy:"Autortiesību zīme",ordf:"Sievišķas kārtas rādītājs",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
index 9f2684efc..87d18532d 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","nb",{euro:"Eurosymbol",lsquo:"Venstre enkelt anførselstegn",rsquo:"Høyre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Høyre anførsesltegn",ndash:"Kort tankestrek",mdash:"Lang tankestrek",iexcl:"Omvendt utropstegn",cent:"Centsymbol",pound:"Pundsymbol",curren:"Valutategn",yen:"Yensymbol",brvbar:"Brutt loddrett strek",sect:"Paragraftegn",uml:"Tøddel",copy:"Copyrighttegn",ordf:"Feminin ordensindikator",laquo:"Venstre anførselstegn",not:"Negasjonstegn",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
index 5274e6f14..7d973f8b3 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","nl",{euro:"Euro-teken",lsquo:"Linker enkel aanhalingsteken",rsquo:"Rechter enkel aanhalingsteken",ldquo:"Linker dubbel aanhalingsteken",rdquo:"Rechter dubbel aanhalingsteken",ndash:"En dash",mdash:"Em dash",iexcl:"Omgekeerd uitroepteken",cent:"Cent-teken",pound:"Pond-teken",curren:"Valuta-teken",yen:"Yen-teken",brvbar:"Gebroken streep",sect:"Paragraaf-teken",uml:"Trema",copy:"Copyright-teken",ordf:"Vrouwelijk ordinaal",laquo:"Linker guillemet",not:"Ongelijk-teken",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/no.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/no.js
index 87695334c..7f2359123 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/no.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/no.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","no",{euro:"Eurosymbol",lsquo:"Venstre enkelt anførselstegn",rsquo:"Høyre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Høyre anførsesltegn",ndash:"Kort tankestrek",mdash:"Lang tankestrek",iexcl:"Omvendt utropstegn",cent:"Centsymbol",pound:"Pundsymbol",curren:"Valutategn",yen:"Yensymbol",brvbar:"Brutt loddrett strek",sect:"Paragraftegn",uml:"Tøddel",copy:"Copyrighttegn",ordf:"Feminin ordensindikator",laquo:"Venstre anførselstegn",not:"Negasjonstegn",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/oc.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/oc.js
new file mode 100644
index 000000000..18474316c
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/oc.js
@@ -0,0 +1,12 @@
+/*
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang("specialchar","oc",{euro:"Simbòl èuro",lsquo:"Vergueta simpla dobrenta",rsquo:"Vergueta simpla tampanta",ldquo:"Vergueta dobla dobrenta",rdquo:"Vergueta dobla tampanta",ndash:"Jonhent semi-quadratin",mdash:"Jonhent quadratin",iexcl:"Punt d'exclamacion inversat",cent:"Simbòl cent",pound:"Simbòl Liura sterling",curren:"Simbòl monetari",yen:"Simbòl ièn",brvbar:"Barra verticala separada",sect:"Signe de seccion",uml:"Trèma",copy:"Simbòl Copyright",ordf:"Indicador ordinal femenin",
+laquo:"Vergueta francesa dobrenta",not:"Croquet de negacion",reg:"Simbòl de marca depausada",macr:"Macron",deg:"Simbòl gra",sup2:"Exponent 2",sup3:"Exponent 3",acute:"Accent agut",micro:"Simbòl micro",para:"Simbòl pè de mòsca",middot:"Punt median",cedil:"Cedilha",sup1:"Exponent 1",ordm:"Indicador ordenal masculin",raquo:"Vergueta francesa tampanta",frac14:"Fraccion un quart",frac12:"Fraccion un mièg",frac34:"Fraccion tres quarts",iquest:"Punt d'interrogacion inversat",Agrave:"A accent grèu majuscula",
+Aacute:"A accent agut majuscula",Acirc:"A accent circonflèxe majuscula",Atilde:"A caron majuscula",Auml:"A trèma majuscula",Aring:"A redond majuscula",AElig:"Ligatura Æ majuscula",Ccedil:"C cédille majuscula",Egrave:"E accent grèu majuscula",Eacute:"E accent agut majuscula",Ecirc:"E accent circonflèxe majuscula",Euml:"E trèma majuscula",Igrave:"I accent grèu majuscula",Iacute:"I accent agut majuscula",Icirc:"I accent circonflèxe majuscula",Iuml:"I trèma majuscula",ETH:"Letra majuscula islandaise ED",
+Ntilde:"N caron majuscula",Ograve:"O accent grèu majuscula",Oacute:"O accent agut majuscula",Ocirc:"O accent circonflèxe majuscula",Otilde:"O caron majuscula",Ouml:"O trèma majuscula",times:"Simbòl de multiplicacion",Oslash:"O raiat majuscula",Ugrave:"U accent grèu majuscula",Uacute:"U accent agut majuscula",Ucirc:"U accent circonflèxe majuscula",Uuml:"U trèma majuscula",Yacute:"Y accent agut majuscula",THORN:"Letra islandesa thorn majuscula",szlig:"Letra minuscula alemanda S dur",agrave:"A accent grèu minuscula",
+aacute:"A accent agut minuscula",acirc:"A accent circonflèxe minuscula",atilde:"A tilda minuscula",auml:"A trèma minuscula",aring:"A redond minuscula",aelig:"Ligatura Æ minuscula",ccedil:"C cédille minuscula",egrave:"E accent grèu minuscula",eacute:"E accent agut minuscula",ecirc:"E accent circonflèxe minuscula",euml:"E trèma minuscula",igrave:"I accent grèu minuscula",iacute:"I accent agut minuscula",icirc:"I accent circonflèxe minuscula",iuml:"i minuscula trèma",eth:"Letra minuscula islandaise ED",
+ntilde:"N caron minuscula",ograve:"O minuscula accent grèu",oacute:"O accent agut minuscula",ocirc:"O accent circonflèxe minuscula",otilde:"O tilda minuscula",ouml:"O trèma minuscula",divide:"Simbòl de division",oslash:"O raiat minuscula",ugrave:"U accent grèu minuscula",uacute:"U accent agut minuscula",ucirc:"U accent circonflèxe minuscula",uuml:"U trèma minuscula",yacute:"Y accent agut minuscula",thorn:"Letra islandaise thorn minuscula",yuml:"Y trèma minuscula",OElig:"Ligatura Œ majuscula",oelig:"Ligatura Œ minuscula",
+372:"W accent circonflèxe majuscula",374:"Y accent circonflèxe majuscula",373:"W accent circonflèxe minuscula",375:"Y accent circonflèxe minuscula",sbquo:"Vergueta simpla tampanta inferior",8219:"Vergueta-virgula superior culbuté",bdquo:"Vergueta-virgula double inferior",hellip:"Punts de suspension",trade:"Simbòl de marca comerciala",9658:"Sageta negra puntant cap a dreita",bull:"Gròs punt median",rarr:"Sageta cap a dreita",rArr:"Sageta dobla cap a dreita",hArr:"Sageta dobla cap a esquèrra",diams:"Lausange negre",
+asymp:"Environ egal"});
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pl.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
index c560a3135..b5dc457e1 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","pl",{euro:"Znak euro",lsquo:"Cudzysłów pojedynczy otwierający",rsquo:"Cudzysłów pojedynczy zamykający",ldquo:"Cudzysłów apostrofowy otwierający",rdquo:"Cudzysłów apostrofowy zamykający",ndash:"Półpauza",mdash:"Pauza",iexcl:"Odwrócony wykrzyknik",cent:"Znak centa",pound:"Znak funta",curren:"Znak waluty",yen:"Znak jena",brvbar:"Przerwana pionowa kreska",sect:"Paragraf",uml:"Diereza",copy:"Znak praw autorskich",ordf:"Wskaźnik rodzaju żeńskiego liczebnika porządkowego",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
index b8486afe3..76eb659e8 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","pt-br",{euro:"Euro",lsquo:"Aspas simples esquerda",rsquo:"Aspas simples direita",ldquo:"Aspas duplas esquerda",rdquo:"Aspas duplas direita",ndash:"Traço",mdash:"Travessão",iexcl:"Ponto de exclamação invertido",cent:"Cent",pound:"Cerquilha",curren:"Dinheiro",yen:"Yen",brvbar:"Bara interrompida",sect:"Símbolo de Parágrafo",uml:"Trema",copy:"Direito de Cópia",ordf:"Indicador ordinal feminino",laquo:"Aspas duplas angulares esquerda",not:"Negação",reg:"Marca Registrada",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
index a94bd58fe..c431a2f90 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","pt",{euro:"Símbolo de Euro",lsquo:"Aspa esquerda simples",rsquo:"Aspa direita simples",ldquo:"Aspa esquerda dupla",rdquo:"Aspa direita dupla",ndash:"Travessão simples",mdash:"Travessão longo",iexcl:"Ponto de exclamação invertido",cent:"Símbolo de cêntimo",pound:"Símbolo de Libra",curren:"Símbolo de Moeda",yen:"Símbolo de Iene",brvbar:"Barra quebrada",sect:"Símbolo de secção",uml:"Trema",copy:"Símbolo de direitos de autor",ordf:"Indicador ordinal feminino",laquo:"Aspa esquerda ângulo duplo",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ru.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
index c0218667b..b7bf674eb 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ru",{euro:"Знак евро",lsquo:"Левая одинарная кавычка",rsquo:"Правая одинарная кавычка",ldquo:"Левая двойная кавычка",rdquo:"Левая двойная кавычка",ndash:"Среднее тире",mdash:"Длинное тире",iexcl:"перевёрнутый восклицательный знак",cent:"Цент",pound:"Фунт",curren:"Знак валюты",yen:"Йена",brvbar:"Вертикальная черта с разрывом",sect:"Знак параграфа",uml:"Умлаут",copy:"Знак охраны авторского права",ordf:"Указатель окончания женского рода ...ая",laquo:"Левая кавычка-«ёлочка»",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/si.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/si.js
index d6d445e09..cc4679c2e 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/si.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/si.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","si",{euro:"යුරෝ සලකුණ",lsquo:"වමේ තනි උපුටා දක්වීම ",rsquo:"දකුණේ තනි උපුටා දක්වීම ",ldquo:"වමේ දිත්ව  උපුටා දක්වීම ",rdquo:"දකුණේ දිත්ව  උපුටා දක්වීම ",ndash:"En dash",mdash:"Em dash",iexcl:"යටිකුරු හර්ෂදී ",cent:"Cent sign",pound:"Pound sign",curren:"මුල්‍යමය ",yen:"යෙන් ",brvbar:"Broken bar",sect:"තෙරේම් ",uml:"Diaeresis",copy:"පිටපත් අයිතිය ",ordf:"දර්ශකය",laquo:"Left-pointing double angle quotation mark",not:"සලකුණක් නොවේ",reg:"සලකුණක් ලියාපදිංචි කිරීම",
 macr:"මුද්‍රිත ",deg:"සලකුණේ ",sup2:"උඩු ලකුණු දෙක",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",Aacute:"Latin capital letter A with acute accent",
-Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
+Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
 Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",Ugrave:"Latin capital letter U with grave accent",
 Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",aring:"Latin small letter a with ring above",
 aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",ntilde:"Latin small letter n with tilde",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
index 83e1e2fa1..5d6a583d3 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sk",{euro:"Znak eura",lsquo:"Ľavá jednoduchá úvodzovka",rsquo:"Pravá jednoduchá úvodzovka",ldquo:"Pravá dvojitá úvodzovka",rdquo:"Pravá dvojitá úvodzovka",ndash:"En pomlčka",mdash:"Em pomlčka",iexcl:"Obrátený výkričník",cent:"Znak centu",pound:"Znak libry",curren:"Znak meny",yen:"Znak jenu",brvbar:"Prerušená zvislá čiara",sect:"Znak odseku",uml:"Prehláska",copy:"Znak copyrightu",ordf:"Ženský indikátor rodu",laquo:"Znak dvojitých lomených úvodzoviek vľavo",not:"Logistický zápor",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sl.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
index 8c5ef116d..7ecf707a2 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sl",{euro:"Znak za evro",lsquo:"Levi enojni narekovaj",rsquo:"Desni enojni narekovaj",ldquo:"Levi dvojni narekovaj",rdquo:"Desni dvojni narekovaj",ndash:"Pomišljaj",mdash:"Dolgi pomišljaj",iexcl:"Obrnjen klicaj",cent:"Znak za cent",pound:"Znak za funt",curren:"Znak valute",yen:"Znak za jen",brvbar:"Zlomljena črta",sect:"Znak za člen",uml:"Diereza",copy:"Znak avtorskih pravic",ordf:"Ženski zaporedni kazalnik",laquo:"Levi dvojni lomljeni narekovaj",not:"Znak za ne",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sq.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
index f4fbecc64..6e284bc30 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sq",{euro:"Shenja e Euros",lsquo:"Thonjëza majtas me një vi",rsquo:"Thonjëza djathtas me një vi",ldquo:"Thonjëza majtas",rdquo:"Thonjëza djathtas",ndash:"En viza lidhëse",mdash:"Em viza lidhëse",iexcl:"Pikëçuditëse e përmbysur",cent:"Shenja e Centit",pound:"Shejna e Funtit",curren:"Shenja e valutës",yen:"Shenja e Jenit",brvbar:"Viza e këputur",sect:"Shenja e pjesës",uml:"Diaeresis",copy:"Shenja e të drejtave të kopjimit",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sv.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
index ac1f4ac6b..9c2419cc6 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sv",{euro:"Eurotecken",lsquo:"Enkelt vänster citattecken",rsquo:"Enkelt höger citattecken",ldquo:"Dubbelt vänster citattecken",rdquo:"Dubbelt höger citattecken",ndash:"Snedstreck",mdash:"Långt tankstreck",iexcl:"Inverterad utropstecken",cent:"Centtecken",pound:"Pundtecken",curren:"Valutatecken",yen:"Yentecken",brvbar:"Brutet lodrätt streck",sect:"Paragraftecken",uml:"Diaeresis",copy:"Upphovsrättstecken",ordf:"Feminit ordningstalsindikator",laquo:"Vänsterställt dubbelt vinkelcitationstecken",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/th.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/th.js
index 9c2b30724..fa51766e0 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/th.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/th.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","th",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"สัญลักษณ์สกุลเงิน",yen:"สัญลักษณ์เงินเยน",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
 not:"Not sign",reg:"Registered sign",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
+Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
 Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
 Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
 aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
index f5815b946..1bcfbcd71 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","tr",{euro:"Euro işareti",lsquo:"Sol tek tırnak işareti",rsquo:"Sağ tek tırnak işareti",ldquo:"Sol çift tırnak işareti",rdquo:"Sağ çift tırnak işareti",ndash:"En tire",mdash:"Em tire",iexcl:"Ters ünlem işareti",cent:"Cent işareti",pound:"Pound işareti",curren:"Para birimi işareti",yen:"Yen işareti",brvbar:"Kırık bar",sect:"Bölüm işareti",uml:"İki sesli harfin ayrılması",copy:"Telif hakkı işareti",ordf:"Dişil sıralı gösterge",laquo:"Sol-işaret çift açı tırnak işareti",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tt.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
index 1fef21e08..bdf01c3e3 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","tt",{euro:"Евро тамгасы",lsquo:"Сул бер иңле куштырнаклар",rsquo:"Уң бер иңле куштырнаклар",ldquo:"Сул ике иңле куштырнаклар",rdquo:"Уң ике иңле куштырнаклар",ndash:"Кыска сызык",mdash:"Озын сызык",iexcl:"Әйләндерелгән өндәү билгесе",cent:"Цент тамгасы",pound:"Фунт тамгасы",curren:"Акча берәмлеге тамгасы",yen:"Иена тамгасы",brvbar:"Broken bar",sect:"Параграф билгесе",uml:"Диерезис",copy:"Хокук иясе булу билгесе",ordf:"Feminine ordinal indicator",laquo:"Ачылучы чыршысыман җәя",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
index 68eaeb391..a1fbf4a92 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ug",{euro:"ياۋرو بەلگىسى",lsquo:"يالاڭ پەش سول",rsquo:"يالاڭ پەش ئوڭ",ldquo:"قوش پەش سول",rdquo:"قوش پەش ئوڭ",ndash:"سىزىقچە",mdash:"سىزىق",iexcl:"ئۈندەش",cent:"تىيىن بەلگىسى",pound:"فوند ستېرلىڭ",curren:"پۇل بەلگىسى",yen:"ياپونىيە يىنى",brvbar:"ئۈزۈك بالداق",sect:"پاراگراف بەلگىسى",uml:"تاۋۇش ئايرىش بەلگىسى",copy:"نەشر ھوقۇقى بەلگىسى",ordf:"Feminine ordinal indicator",laquo:"قوش تىرناق سول",not:"غەيرى بەلگە",reg:"خەتلەتكەن تاۋار ماركىسى",macr:"سوزۇش بەلگىسى",
 deg:"گىرادۇس بەلگىسى",sup2:"يۇقىرى ئىندېكىس 2",sup3:"يۇقىرى ئىندېكىس 3",acute:"ئۇرغۇ بەلگىسى",micro:"Micro sign",para:"ئابزاس بەلگىسى",middot:"ئوتتۇرا چېكىت",cedil:"ئاستىغا قوشۇلىدىغان بەلگە",sup1:"يۇقىرى ئىندېكىس 1",ordm:"Masculine ordinal indicator",raquo:"قوش تىرناق ئوڭ",frac14:"ئاددىي كەسىر تۆتتىن بىر",frac12:"ئاددىي كەسىر ئىككىدىن بىر",frac34:"ئاددىي كەسىر ئۈچتىن تۆرت",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",Aacute:"Latin capital letter A with acute accent",
-Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
+Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",
 Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"قوش پەش ئوڭ",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",
 Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",
 ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",ntilde:"تىك موللاق سوئال بەلگىسى",ograve:"Latin small letter o with grave accent",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/uk.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
index 001c62667..a976a0ce1 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","uk",{euro:"Знак євро",lsquo:"Ліві одинарні лапки",rsquo:"Праві одинарні лапки",ldquo:"Ліві подвійні лапки",rdquo:"Праві подвійні лапки",ndash:"Середнє тире",mdash:"Довге тире",iexcl:"Перевернутий знак оклику",cent:"Знак цента",pound:"Знак фунта",curren:"Знак валюти",yen:"Знак єни",brvbar:"Переривчаста вертикальна лінія",sect:"Знак параграфу",uml:"Умлаут",copy:"Знак авторських прав",ordf:"Жіночий порядковий вказівник",laquo:"ліві вказівні подвійні кутові дужки",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/vi.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
index 3bf84b6e4..9ebd877e4 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","vi",{euro:"Ký hiệu Euro",lsquo:"Dấu ngoặc đơn trái",rsquo:"Dấu ngoặc đơn phải",ldquo:"Dấu ngoặc đôi trái",rdquo:"Dấu ngoặc đôi phải",ndash:"Gạch ngang tiếng anh",mdash:"Gạch ngang Em",iexcl:"Chuyển đổi dấu chấm than",cent:"Ký tự tiền Mỹ",pound:"Ký tự tiền Anh",curren:"Ký tự tiền tệ",yen:"Ký tự tiền Yên Nhật",brvbar:"Thanh hỏng",sect:"Ký tự khu vực",uml:"Dấu tách đôi",copy:"Ký tự bản quyền",ordf:"Phần chỉ thị giống cái",laquo:"Chọn dấu ngoặc đôi trái",not:"Không có ký tự",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
index eb64eaa8c..57db383e8 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","zh-cn",{euro:"欧元符号",lsquo:"左单引号",rsquo:"右单引号",ldquo:"左双引号",rdquo:"右双引号",ndash:"短划线",mdash:"长划线",iexcl:"竖翻叹号",cent:"分币符号",pound:"英镑符号",curren:"货币符号",yen:"日元符号",brvbar:"间断条",sect:"节标记",uml:"分音符",copy:"版权所有标记",ordf:"阴性顺序指示符",laquo:"左指双尖引号",not:"非标记",reg:"注册标记",macr:"长音符",deg:"度标记",sup2:"上标二",sup3:"上标三",acute:"锐音符",micro:"微符",para:"段落标记",middot:"中间点",cedil:"下加符",sup1:"上标一",ordm:"阳性顺序指示符",raquo:"右指双尖引号",frac14:"普通分数四分之一",frac12:"普通分数二分之一",frac34:"普通分数四分之三",iquest:"竖翻问号",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
index 774087117..297f96e01 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","zh",{euro:"歐元符號",lsquo:"左單引號",rsquo:"右單引號",ldquo:"左雙引號",rdquo:"右雙引號",ndash:"短破折號",mdash:"長破折號",iexcl:"倒置的驚嘆號",cent:"美分符號",pound:"英鎊符號",curren:"貨幣符號",yen:"日圓符號",brvbar:"破折號",sect:"章節符號",uml:"分音符號",copy:"版權符號",ordf:"雌性符號",laquo:"左雙角括號",not:"Not 符號",reg:"註冊商標符號",macr:"長音符號",deg:"度數符號",sup2:"上標字 2",sup3:"上標字 3",acute:"尖音符號",micro:"微",para:"段落符號",middot:"中間點",cedil:"字母 C 下面的尾型符號 ",sup1:"上標",ordm:"雄性符號",raquo:"右雙角括號",frac14:"四分之一符號",frac12:"二分之一符號",frac34:"四分之三符號",
diff --git a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/specialchar.js b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/specialchar.js
index 012d34bf3..d04c18674 100644
--- a/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/specialchar.js
+++ b/web/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/specialchar.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("specialchar",function(k){var e,n=k.lang.specialchar,m=function(c){var b;c=c.data?c.data.getTarget():new CKEDITOR.dom.element(c);"a"==c.getName()&&(b=c.getChild(0).getHtml())&&(c.removeClass("cke_light_background"),e.hide(),c=k.document.createElement("span"),c.setHtml(b),k.insertText(c.getText()))},p=CKEDITOR.tools.addFunction(m),l,g=function(c,b){var a;b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());if("a"==b.getName()&&(a=b.getChild(0).getHtml())){l&&d(null,l);
diff --git a/web/core/assets/vendor/ckeditor/plugins/table/dialogs/table.js b/web/core/assets/vendor/ckeditor/plugins/table/dialogs/table.js
index 081f38f30..3206bfe7a 100644
--- a/web/core/assets/vendor/ckeditor/plugins/table/dialogs/table.js
+++ b/web/core/assets/vendor/ckeditor/plugins/table/dialogs/table.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(){function v(a){for(var f=0,n=0,l=0,p,e=a.$.rows.length;l<e;l++){p=a.$.rows[l];for(var d=f=0,b,c=p.cells.length;d<c;d++)b=p.cells[d],f+=b.colSpan;f>n&&(n=f)}return n}function r(a){return function(){var f=this.getValue(),f=!!(CKEDITOR.dialog.validate.integer()(f)&&0<f);f||(alert(a),this.select());return f}}function q(a,f){var n=function(e){return new CKEDITOR.dom.element(e,a.document)},q=a.editable(),p=a.plugins.dialogadvtab;return{title:a.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?
diff --git a/web/core/assets/vendor/ckeditor/plugins/tabletools/dialogs/tableCell.js b/web/core/assets/vendor/ckeditor/plugins/tabletools/dialogs/tableCell.js
index 25b664a10..101d6c093 100644
--- a/web/core/assets/vendor/ckeditor/plugins/tabletools/dialogs/tableCell.js
+++ b/web/core/assets/vendor/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("cellProperties",function(g){function d(a){return function(b){for(var c=a(b[0]),d=1;d<b.length;d++)if(a(b[d])!==c){c=null;break}"undefined"!=typeof c&&(this.setValue(c),CKEDITOR.env.gecko&&"select"==this.type&&!c&&(this.getInputElement().$.selectedIndex=-1))}}function l(a){if(a=n.exec(a.getStyle("width")||a.getAttribute("width")))return a[2]}var h=g.lang.table,c=h.cell,e=g.lang.common,k=CKEDITOR.dialog.validate,n=/^(\d+(?:\.\d+)?)(px|%)$/,f={type:"html",html:"\x26nbsp;"},p="rtl"==
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog.css b/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog.css
new file mode 100644
index 000000000..4806c2b2a
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog_ie.css b/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog_ie.css
new file mode 100644
index 000000000..a5522cc25
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog_ie.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog_ie8.css b/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog_ie8.css
new file mode 100644
index 000000000..8833e5cad
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog_ie8.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button{min-height:18px}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{min-height:18px}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus{padding-top:4px;padding-bottom:2px}select.cke_dialog_ui_input_select{width:100%!important}select.cke_dialog_ui_input_select:focus{margin-left:1px;width:100%!important;padding-top:2px;padding-bottom:2px}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog_iequirks.css b/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog_iequirks.css
new file mode 100644
index 000000000..590c5c227
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/skins/moono-lisa/dialog_iequirks.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor.css b/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor.css
new file mode 100644
index 000000000..2ff07a051
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=H1AG) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=H1AG) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=H1AG) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=H1AG) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=H1AG) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=H1AG) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=H1AG) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=H1AG) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=H1AG) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=H1AG) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=H1AG) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=H1AG) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=H1AG) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=H1AG) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=H1AG) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=H1AG) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=H1AG) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=H1AG) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=H1AG) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=H1AG) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=H1AG) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=H1AG) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=H1AG) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=H1AG) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=H1AG) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=H1AG) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=H1AG) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=H1AG) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=H1AG) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=H1AG) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=H1AG) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=H1AG) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=H1AG) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=H1AG) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -2256px!important}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_gecko.css b/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_gecko.css
new file mode 100644
index 000000000..9d76b22db
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_gecko.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=H1AG) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=H1AG) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=H1AG) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=H1AG) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=H1AG) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=H1AG) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=H1AG) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=H1AG) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=H1AG) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=H1AG) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=H1AG) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=H1AG) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=H1AG) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=H1AG) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=H1AG) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=H1AG) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=H1AG) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=H1AG) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=H1AG) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=H1AG) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=H1AG) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=H1AG) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=H1AG) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=H1AG) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=H1AG) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=H1AG) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=H1AG) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=H1AG) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=H1AG) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=H1AG) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=H1AG) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=H1AG) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=H1AG) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=H1AG) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -2256px!important}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_ie.css b/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_ie.css
new file mode 100644
index 000000000..fb125225f
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_ie.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=H1AG) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=H1AG) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=H1AG) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=H1AG) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=H1AG) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=H1AG) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=H1AG) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=H1AG) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=H1AG) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=H1AG) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=H1AG) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=H1AG) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=H1AG) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=H1AG) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=H1AG) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=H1AG) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=H1AG) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=H1AG) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=H1AG) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=H1AG) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=H1AG) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=H1AG) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=H1AG) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=H1AG) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=H1AG) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=H1AG) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=H1AG) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=H1AG) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=H1AG) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=H1AG) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=H1AG) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=H1AG) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=H1AG) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=H1AG) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_ie8.css b/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_ie8.css
new file mode 100644
index 000000000..a9d3fe4a5
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_ie8.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=H1AG) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=H1AG) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=H1AG) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=H1AG) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=H1AG) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=H1AG) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=H1AG) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=H1AG) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=H1AG) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=H1AG) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=H1AG) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=H1AG) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=H1AG) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=H1AG) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=H1AG) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=H1AG) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=H1AG) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=H1AG) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=H1AG) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=H1AG) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=H1AG) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=H1AG) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=H1AG) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=H1AG) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=H1AG) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=H1AG) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=H1AG) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=H1AG) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=H1AG) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=H1AG) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=H1AG) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=H1AG) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=H1AG) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=H1AG) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbar{position:relative}.cke_rtl .cke_toolbar_end{right:auto;left:0}.cke_toolbar_end:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:1px;right:2px}.cke_rtl .cke_toolbar_end:after{right:auto;left:2px}.cke_hc .cke_toolbar_end:after{top:2px;right:5px;border-color:#000}.cke_hc.cke_rtl .cke_toolbar_end:after{right:auto;left:5px}.cke_combo+.cke_toolbar_end:after,.cke_toolbar.cke_toolbar_last .cke_toolbar_end:after{content:none;border:0}.cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:0}.cke_rtl .cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:auto;left:0}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_iequirks.css b/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_iequirks.css
new file mode 100644
index 000000000..3c14f20f2
--- /dev/null
+++ b/web/core/assets/vendor/ckeditor/skins/moono-lisa/editor_iequirks.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=H1AG) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=H1AG) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=H1AG) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=H1AG) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=H1AG) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=H1AG) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=H1AG) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=H1AG) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=H1AG) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=H1AG) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=H1AG) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=H1AG) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=H1AG) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=H1AG) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=H1AG) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=H1AG) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=H1AG) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=H1AG) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=H1AG) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=H1AG) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=H1AG) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=H1AG) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=H1AG) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=H1AG) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=H1AG) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=H1AG) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=H1AG) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=H1AG) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=H1AG) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=H1AG) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=H1AG) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=H1AG) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=H1AG) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=H1AG) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=H1AG) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=H1AG) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=H1AG) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=H1AG) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/icons.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/icons.png
new file mode 100644
index 000000000..cf5548c7b
Binary files /dev/null and b/web/core/assets/vendor/ckeditor/skins/moono-lisa/icons.png differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/icons_hidpi.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/icons_hidpi.png
new file mode 100644
index 000000000..9547434ae
Binary files /dev/null and b/web/core/assets/vendor/ckeditor/skins/moono-lisa/icons_hidpi.png differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/images/arrow.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/arrow.png
similarity index 100%
rename from web/core/assets/vendor/ckeditor/skins/moono/images/arrow.png
rename to web/core/assets/vendor/ckeditor/skins/moono-lisa/images/arrow.png
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/close.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/close.png
new file mode 100644
index 000000000..40caa6ddf
Binary files /dev/null and b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/close.png differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/close.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/close.png
new file mode 100644
index 000000000..fa00f4fce
Binary files /dev/null and b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/close.png differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png
new file mode 100644
index 000000000..c89978907
Binary files /dev/null and b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/lock.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/lock.png
new file mode 100644
index 000000000..25ad0f4a3
Binary files /dev/null and b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/lock.png differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/refresh.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/refresh.png
new file mode 100644
index 000000000..117a2d4a4
Binary files /dev/null and b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/hidpi/refresh.png differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/lock-open.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/lock-open.png
new file mode 100644
index 000000000..42df5f411
Binary files /dev/null and b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/lock-open.png differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/lock.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/lock.png
new file mode 100644
index 000000000..bde67727d
Binary files /dev/null and b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/lock.png differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/refresh.png b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/refresh.png
new file mode 100644
index 000000000..e363764e3
Binary files /dev/null and b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/refresh.png differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/images/spinner.gif b/web/core/assets/vendor/ckeditor/skins/moono-lisa/images/spinner.gif
similarity index 100%
rename from web/core/assets/vendor/ckeditor/skins/moono/images/spinner.gif
rename to web/core/assets/vendor/ckeditor/skins/moono-lisa/images/spinner.gif
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/dialog.css b/web/core/assets/vendor/ckeditor/skins/moono/dialog.css
deleted file mode 100644
index 4394f15e7..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/dialog.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/dialog_ie.css b/web/core/assets/vendor/ckeditor/skins/moono/dialog_ie.css
deleted file mode 100644
index eb1d271f2..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/dialog_ie.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/dialog_ie7.css b/web/core/assets/vendor/ckeditor/skins/moono/dialog_ie7.css
deleted file mode 100644
index 629d4369d..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/dialog_ie7.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_title{zoom:1}.cke_dialog_footer{border-top:1px solid #bfbfbf}.cke_dialog_footer_buttons{position:static}.cke_dialog_footer_buttons a.cke_dialog_ui_button{vertical-align:top}.cke_dialog .cke_resizer_ltr{padding-left:4px}.cke_dialog .cke_resizer_rtl{padding-right:4px}.cke_dialog_ui_input_text,.cke_dialog_ui_input_password,.cke_dialog_ui_input_textarea,.cke_dialog_ui_input_select{padding:0!important}.cke_dialog_ui_checkbox_input,.cke_dialog_ui_ratio_input,.cke_btn_reset,.cke_btn_locked,.cke_btn_unlocked{border:1px solid transparent!important}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/dialog_ie8.css b/web/core/assets/vendor/ckeditor/skins/moono/dialog_ie8.css
deleted file mode 100644
index 9e9a77188..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/dialog_ie8.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{display:block}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/dialog_iequirks.css b/web/core/assets/vendor/ckeditor/skins/moono/dialog_iequirks.css
deleted file mode 100644
index 0d6505035..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/dialog_iequirks.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/editor.css b/web/core/assets/vendor/ckeditor/skins/moono/editor.css
deleted file mode 100644
index d8d2ae50d..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/editor.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=G88J) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=G88J) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=G88J) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=G88J) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=G88J) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=G88J) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=G88J) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=G88J) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=G88J) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=G88J) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=G88J) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=G88J) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=G88J) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=G88J) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=G88J) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=G88J) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=G88J) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=G88J) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -2256px!important}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/editor_gecko.css b/web/core/assets/vendor/ckeditor/skins/moono/editor_gecko.css
deleted file mode 100644
index 718408773..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/editor_gecko.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=G88J) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=G88J) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=G88J) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=G88J) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=G88J) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=G88J) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=G88J) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=G88J) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=G88J) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=G88J) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=G88J) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=G88J) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=G88J) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=G88J) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=G88J) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=G88J) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=G88J) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=G88J) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -2256px!important}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/editor_ie.css b/web/core/assets/vendor/ckeditor/skins/moono/editor_ie.css
deleted file mode 100644
index 9538310eb..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/editor_ie.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=G88J) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=G88J) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=G88J) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=G88J) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=G88J) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=G88J) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=G88J) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=G88J) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=G88J) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=G88J) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=G88J) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=G88J) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=G88J) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=G88J) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=G88J) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=G88J) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=G88J) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=G88J) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/editor_ie7.css b/web/core/assets/vendor/ckeditor/skins/moono/editor_ie7.css
deleted file mode 100644
index 0c87eead0..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/editor_ie7.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=G88J) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=G88J) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=G88J) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=G88J) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=G88J) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=G88J) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=G88J) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=G88J) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=G88J) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=G88J) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=G88J) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=G88J) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=G88J) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=G88J) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=G88J) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=G88J) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=G88J) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=G88J) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_toolbox{display:inline-block;padding-bottom:5px;height:100%}.cke_rtl .cke_toolbox{padding-bottom:0}.cke_toolbar{margin-bottom:5px}.cke_rtl .cke_toolbar{margin-bottom:0}.cke_toolgroup{height:26px}.cke_toolgroup,.cke_combo{position:relative}a.cke_button{float:none;vertical-align:top}.cke_toolbar_separator{display:inline-block;float:none;vertical-align:top;background-color:#c0c0c0}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_rtl .cke_button_arrow{padding-top:8px;margin-right:2px}.cke_rtl .cke_combo_inlinelabel{display:table-cell;vertical-align:middle}.cke_menubutton{display:block;height:24px}.cke_menubutton_inner{display:block;position:relative}.cke_menubutton_icon{height:16px;width:16px}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:inline-block}.cke_menubutton_label{width:auto;vertical-align:top;line-height:24px;height:24px;margin:0 10px 0 0}.cke_menuarrow{width:5px;height:6px;padding:0;position:absolute;right:8px;top:10px;background-position:0 0}.cke_rtl .cke_menubutton_icon{position:absolute;right:0;top:0}.cke_rtl .cke_menubutton_label{float:right;clear:both;margin:0 24px 0 10px}.cke_hc .cke_rtl .cke_menubutton_label{margin-right:0}.cke_rtl .cke_menuarrow{left:8px;right:auto;background-position:0 -24px}.cke_hc .cke_menuarrow{top:5px;padding:0 5px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{position:relative}.cke_wysiwyg_div{padding-top:0!important;padding-bottom:0!important}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/editor_ie8.css b/web/core/assets/vendor/ckeditor/skins/moono/editor_ie8.css
deleted file mode 100644
index 867a9bfe5..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/editor_ie8.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=G88J) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=G88J) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=G88J) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=G88J) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=G88J) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=G88J) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=G88J) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=G88J) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=G88J) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=G88J) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=G88J) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=G88J) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=G88J) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=G88J) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=G88J) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=G88J) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=G88J) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=G88J) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/editor_iequirks.css b/web/core/assets/vendor/ckeditor/skins/moono/editor_iequirks.css
deleted file mode 100644
index f30420bb3..000000000
--- a/web/core/assets/vendor/ckeditor/skins/moono/editor_iequirks.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png?t=G88J) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png?t=G88J) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png?t=G88J) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png?t=G88J) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png?t=G88J) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png?t=G88J) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png?t=G88J) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png?t=G88J) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png?t=G88J) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png?t=G88J) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png?t=G88J) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png?t=G88J) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png?t=G88J) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png?t=G88J) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png?t=G88J) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png?t=G88J) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png?t=G88J) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png?t=G88J) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png?t=G88J) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png?t=G88J) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png?t=G88J) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png?t=G88J) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png?t=G88J) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png?t=G88J) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png?t=G88J) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png?t=G88J) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png?t=G88J) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png?t=G88J) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png?t=G88J) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png?t=G88J) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png?t=G88J) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png?t=G88J) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}
\ No newline at end of file
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/icons.png b/web/core/assets/vendor/ckeditor/skins/moono/icons.png
deleted file mode 100644
index fd52e4086..000000000
Binary files a/web/core/assets/vendor/ckeditor/skins/moono/icons.png and /dev/null differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/icons_hidpi.png b/web/core/assets/vendor/ckeditor/skins/moono/icons_hidpi.png
deleted file mode 100644
index 7269c52c4..000000000
Binary files a/web/core/assets/vendor/ckeditor/skins/moono/icons_hidpi.png and /dev/null differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/images/close.png b/web/core/assets/vendor/ckeditor/skins/moono/images/close.png
deleted file mode 100644
index 6a04ab527..000000000
Binary files a/web/core/assets/vendor/ckeditor/skins/moono/images/close.png and /dev/null differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/close.png b/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/close.png
deleted file mode 100644
index e406c2c35..000000000
Binary files a/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/close.png and /dev/null differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/lock-open.png b/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/lock-open.png
deleted file mode 100644
index edbd12f3b..000000000
Binary files a/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/lock-open.png and /dev/null differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/lock.png b/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/lock.png
deleted file mode 100644
index 1b87bbb7a..000000000
Binary files a/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/lock.png and /dev/null differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/refresh.png b/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/refresh.png
deleted file mode 100644
index c6c2b86e6..000000000
Binary files a/web/core/assets/vendor/ckeditor/skins/moono/images/hidpi/refresh.png and /dev/null differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/images/lock-open.png b/web/core/assets/vendor/ckeditor/skins/moono/images/lock-open.png
deleted file mode 100644
index 04769877a..000000000
Binary files a/web/core/assets/vendor/ckeditor/skins/moono/images/lock-open.png and /dev/null differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/images/lock.png b/web/core/assets/vendor/ckeditor/skins/moono/images/lock.png
deleted file mode 100644
index c5a14400d..000000000
Binary files a/web/core/assets/vendor/ckeditor/skins/moono/images/lock.png and /dev/null differ
diff --git a/web/core/assets/vendor/ckeditor/skins/moono/images/refresh.png b/web/core/assets/vendor/ckeditor/skins/moono/images/refresh.png
deleted file mode 100644
index 1ff63c309..000000000
Binary files a/web/core/assets/vendor/ckeditor/skins/moono/images/refresh.png and /dev/null differ
diff --git a/web/core/assets/vendor/jquery/jquery.js b/web/core/assets/vendor/jquery/jquery.js
index 385474756..5c3c456ac 100644
--- a/web/core/assets/vendor/jquery/jquery.js
+++ b/web/core/assets/vendor/jquery/jquery.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v2.2.3
+ * jQuery JavaScript Library v2.2.4
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2016-04-05T19:26Z
+ * Date: 2016-05-20T17:23Z
  */
 
 (function( global, factory ) {
@@ -65,7 +65,7 @@ var support = {};
 
 
 var
-	version = "2.2.3",
+	version = "2.2.4",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -5006,13 +5006,14 @@ jQuery.Event.prototype = {
 	isDefaultPrevented: returnFalse,
 	isPropagationStopped: returnFalse,
 	isImmediatePropagationStopped: returnFalse,
+	isSimulated: false,
 
 	preventDefault: function() {
 		var e = this.originalEvent;
 
 		this.isDefaultPrevented = returnTrue;
 
-		if ( e ) {
+		if ( e && !this.isSimulated ) {
 			e.preventDefault();
 		}
 	},
@@ -5021,7 +5022,7 @@ jQuery.Event.prototype = {
 
 		this.isPropagationStopped = returnTrue;
 
-		if ( e ) {
+		if ( e && !this.isSimulated ) {
 			e.stopPropagation();
 		}
 	},
@@ -5030,7 +5031,7 @@ jQuery.Event.prototype = {
 
 		this.isImmediatePropagationStopped = returnTrue;
 
-		if ( e ) {
+		if ( e && !this.isSimulated ) {
 			e.stopImmediatePropagation();
 		}
 
@@ -5961,19 +5962,6 @@ function getWidthOrHeight( elem, name, extra ) {
 		styles = getStyles( elem ),
 		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
 
-	// Support: IE11 only
-	// In IE 11 fullscreen elements inside of an iframe have
-	// 100x too small dimensions (gh-1764).
-	if ( document.msFullscreenElement && window.top !== window ) {
-
-		// Support: IE11 only
-		// Running getBoundingClientRect on a disconnected node
-		// in IE throws an error.
-		if ( elem.getClientRects().length ) {
-			val = Math.round( elem.getBoundingClientRect()[ name ] * 100 );
-		}
-	}
-
 	// Some non-html elements return undefined for offsetWidth, so check for null/undefined
 	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
 	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
@@ -7864,6 +7852,7 @@ jQuery.extend( jQuery.event, {
 	},
 
 	// Piggyback on a donor event to simulate a different one
+	// Used only for `focus(in | out)` events
 	simulate: function( type, elem, event ) {
 		var e = jQuery.extend(
 			new jQuery.Event(),
@@ -7871,27 +7860,10 @@ jQuery.extend( jQuery.event, {
 			{
 				type: type,
 				isSimulated: true
-
-				// Previously, `originalEvent: {}` was set here, so stopPropagation call
-				// would not be triggered on donor event, since in our own
-				// jQuery.event.stopPropagation function we had a check for existence of
-				// originalEvent.stopPropagation method, so, consequently it would be a noop.
-				//
-				// But now, this "simulate" function is used only for events
-				// for which stopPropagation() is noop, so there is no need for that anymore.
-				//
-				// For the 1.x branch though, guard for "click" and "submit"
-				// events is still used, but was moved to jQuery.event.stopPropagation function
-				// because `originalEvent` should point to the original event for the constancy
-				// with other events and for more focused logic
 			}
 		);
 
 		jQuery.event.trigger( e, null, elem );
-
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
 	}
 
 } );
diff --git a/web/core/assets/vendor/jquery/jquery.min.js b/web/core/assets/vendor/jquery/jquery.min.js
index b8c4187de..4024b6622 100644
--- a/web/core/assets/vendor/jquery/jquery.min.js
+++ b/web/core/assets/vendor/jquery/jquery.min.js
@@ -1,4 +1,4 @@
-/*! jQuery v2.2.3 | (c) jQuery Foundation | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.3",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isPlainObject:function(a){var b;if("object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype||{},"isPrototypeOf"))return!1;for(b in a);return void 0===b||k.call(a,b)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=d.createElement("script"),b.text=a,d.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:h.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=R.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return h.call(b,a)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&f.parentNode&&(this.length=1,this[0]=f),this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?h.call(n(a),this[0]):h.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||n.uniqueSort(e),D.test(a)&&e.reverse()),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.removeEventListener("DOMContentLoaded",J),a.removeEventListener("load",J),n.ready()}n.ready.promise=function(b){return I||(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(n.ready):(d.addEventListener("DOMContentLoaded",J),a.addEventListener("load",J))),I.promise(b)},n.ready.promise();var K=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)K(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},L=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function M(){this.expando=n.expando+M.uid++}M.uid=1,M.prototype={register:function(a,b){var c=b||{};return a.nodeType?a[this.expando]=c:Object.defineProperty(a,this.expando,{value:c,writable:!0,configurable:!0}),a[this.expando]},cache:function(a){if(!L(a))return{};var b=a[this.expando];return b||(b={},L(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[b]=c;else for(d in b)e[d]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=a[this.expando];if(void 0!==f){if(void 0===b)this.register(a);else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in f?d=[b,e]:(d=e,d=d in f?[d]:d.match(G)||[])),c=d.length;while(c--)delete f[d[c]]}(void 0===b||n.isEmptyObject(f))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!n.isEmptyObject(b)}};var N=new M,O=new M,P=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Q=/[A-Z]/g;function R(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Q,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:P.test(c)?n.parseJSON(c):c;
-}catch(e){}O.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return O.hasData(a)||N.hasData(a)},data:function(a,b,c){return O.access(a,b,c)},removeData:function(a,b){O.remove(a,b)},_data:function(a,b,c){return N.access(a,b,c)},_removeData:function(a,b){N.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=O.get(f),1===f.nodeType&&!N.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),R(f,d,e[d])));N.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){O.set(this,a)}):K(this,function(b){var c,d;if(f&&void 0===b){if(c=O.get(f,a)||O.get(f,a.replace(Q,"-$&").toLowerCase()),void 0!==c)return c;if(d=n.camelCase(a),c=O.get(f,d),void 0!==c)return c;if(c=R(f,d,void 0),void 0!==c)return c}else d=n.camelCase(a),this.each(function(){var c=O.get(this,d);O.set(this,d,b),a.indexOf("-")>-1&&void 0!==c&&O.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){O.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=N.get(a,b),c&&(!d||n.isArray(c)?d=N.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return N.get(a,c)||N.access(a,c,{empty:n.Callbacks("once memory").add(function(){N.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=N.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function W(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&T.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var X=/^(?:checkbox|radio)$/i,Y=/<([\w:-]+)/,Z=/^$|\/(?:java|ecma)script/i,$={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};$.optgroup=$.option,$.tbody=$.tfoot=$.colgroup=$.caption=$.thead,$.th=$.td;function _(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function aa(a,b){for(var c=0,d=a.length;d>c;c++)N.set(a[c],"globalEval",!b||N.get(b[c],"globalEval"))}var ba=/<|&#?\w+;/;function ca(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],o=0,p=a.length;p>o;o++)if(f=a[o],f||0===f)if("object"===n.type(f))n.merge(m,f.nodeType?[f]:f);else if(ba.test(f)){g=g||l.appendChild(b.createElement("div")),h=(Y.exec(f)||["",""])[1].toLowerCase(),i=$[h]||$._default,g.innerHTML=i[1]+n.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;n.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",o=0;while(f=m[o++])if(d&&n.inArray(f,d)>-1)e&&e.push(f);else if(j=n.contains(f.ownerDocument,f),g=_(l.appendChild(f),"script"),j&&aa(g),c){k=0;while(f=g[k++])Z.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var da=/^key/,ea=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,fa=/^([^.]*)(?:\.(.+)|)/;function ga(){return!0}function ha(){return!1}function ia(){try{return d.activeElement}catch(a){}}function ja(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ja(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ha;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return"undefined"!=typeof n&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(G)||[""],j=b.length;while(j--)h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.hasData(a)&&N.get(a);if(r&&(i=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&N.remove(a,"handle events")}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(N.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||d,e=c.documentElement,f=c.body,a.pageX=b.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ea.test(f)?this.mouseHooks:da.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=d),3===a.target.nodeType&&(a.target=a.target.parentNode),h.filter?h.filter(a,g):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==ia()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===ia()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ga:ha):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:ha,isPropagationStopped:ha,isImmediatePropagationStopped:ha,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ga,a&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ga,a&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ga,a&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||n.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),n.fn.extend({on:function(a,b,c,d){return ja(this,a,b,c,d)},one:function(a,b,c,d){return ja(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=ha),this.each(function(){n.event.remove(this,a,c,b)})}});var ka=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,la=/<script|<style|<link/i,ma=/checked\s*(?:[^=]|=\s*.checked.)/i,na=/^true\/(.*)/,oa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function pa(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function qa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function ra(a){var b=na.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function sa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(N.hasData(a)&&(f=N.access(a),g=N.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}O.hasData(a)&&(h=O.access(a),i=n.extend({},h),O.set(b,i))}}function ta(a,b){var c=b.nodeName.toLowerCase();"input"===c&&X.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function ua(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&ma.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),ua(f,b,c,d)});if(o&&(e=ca(b,a[0].ownerDocument,!1,a,d),g=e.firstChild,1===e.childNodes.length&&(e=g),g||d)){for(h=n.map(_(e,"script"),qa),i=h.length;o>m;m++)j=e,m!==p&&(j=n.clone(j,!0,!0),i&&n.merge(h,_(j,"script"))),c.call(a[m],j,m);if(i)for(k=h[h.length-1].ownerDocument,n.map(h,ra),m=0;i>m;m++)j=h[m],Z.test(j.type||"")&&!N.access(j,"globalEval")&&n.contains(k,j)&&(j.src?n._evalUrl&&n._evalUrl(j.src):n.globalEval(j.textContent.replace(oa,"")))}return a}function va(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(_(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&aa(_(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(ka,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=_(h),f=_(a),d=0,e=f.length;e>d;d++)ta(f[d],g[d]);if(b)if(c)for(f=f||_(a),g=g||_(h),d=0,e=f.length;e>d;d++)sa(f[d],g[d]);else sa(a,h);return g=_(h,"script"),g.length>0&&aa(g,!i&&_(a,"script")),h},cleanData:function(a){for(var b,c,d,e=n.event.special,f=0;void 0!==(c=a[f]);f++)if(L(c)){if(b=c[N.expando]){if(b.events)for(d in b.events)e[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);c[N.expando]=void 0}c[O.expando]&&(c[O.expando]=void 0)}}}),n.fn.extend({domManip:ua,detach:function(a){return va(this,a,!0)},remove:function(a){return va(this,a)},text:function(a){return K(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.appendChild(a)}})},prepend:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(_(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return K(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!la.test(a)&&!$[(Y.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(_(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return ua(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(_(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),f=e.length-1,h=0;f>=h;h++)c=h===f?this:this.clone(!0),n(e[h])[b](c),g.apply(d,c.get());return this.pushStack(d)}});var wa,xa={HTML:"block",BODY:"block"};function ya(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function za(a){var b=d,c=xa[a];return c||(c=ya(a,b),"none"!==c&&c||(wa=(wa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=wa[0].contentDocument,b.write(),b.close(),c=ya(a,b),wa.detach()),xa[a]=c),c}var Aa=/^margin/,Ba=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ca=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Da=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Ea=d.documentElement;!function(){var b,c,e,f,g=d.createElement("div"),h=d.createElement("div");if(h.style){h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,g.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",g.appendChild(h);function i(){h.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",h.innerHTML="",Ea.appendChild(g);var d=a.getComputedStyle(h);b="1%"!==d.top,f="2px"===d.marginLeft,c="4px"===d.width,h.style.marginRight="50%",e="4px"===d.marginRight,Ea.removeChild(g)}n.extend(l,{pixelPosition:function(){return i(),b},boxSizingReliable:function(){return null==c&&i(),c},pixelMarginRight:function(){return null==c&&i(),e},reliableMarginLeft:function(){return null==c&&i(),f},reliableMarginRight:function(){var b,c=h.appendChild(d.createElement("div"));return c.style.cssText=h.style.cssText="-webkit-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",h.style.width="1px",Ea.appendChild(g),b=!parseFloat(a.getComputedStyle(c).marginRight),Ea.removeChild(g),h.removeChild(c),b}})}}();function Fa(a,b,c){var d,e,f,g,h=a.style;return c=c||Ca(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Ba.test(g)&&Aa.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0!==g?g+"":g}function Ga(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Ha=/^(none|table(?!-c[ea]).+)/,Ia={position:"absolute",visibility:"hidden",display:"block"},Ja={letterSpacing:"0",fontWeight:"400"},Ka=["Webkit","O","Moz","ms"],La=d.createElement("div").style;function Ma(a){if(a in La)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ka.length;while(c--)if(a=Ka[c]+b,a in La)return a}function Na(a,b,c){var d=T.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Oa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Pa(b,c,e){var f=!0,g="width"===c?b.offsetWidth:b.offsetHeight,h=Ca(b),i="border-box"===n.css(b,"boxSizing",!1,h);if(d.msFullscreenElement&&a.top!==a&&b.getClientRects().length&&(g=Math.round(100*b.getBoundingClientRect()[c])),0>=g||null==g){if(g=Fa(b,c,h),(0>g||null==g)&&(g=b.style[c]),Ba.test(g))return g;f=i&&(l.boxSizingReliable()||g===b.style[c]),g=parseFloat(g)||0}return g+Oa(b,c,e||(i?"border":"content"),f,h)+"px"}function Qa(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=N.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=N.access(d,"olddisplay",za(d.nodeName)))):(e=V(d),"none"===c&&e||N.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Fa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=T.exec(c))&&e[1]&&(c=W(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Fa(a,b,d)),"normal"===e&&b in Ja&&(e=Ja[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Ha.test(n.css(a,"display"))&&0===a.offsetWidth?Da(a,Ia,function(){return Pa(a,b,d)}):Pa(a,b,d):void 0},set:function(a,c,d){var e,f=d&&Ca(a),g=d&&Oa(a,b,d,"border-box"===n.css(a,"boxSizing",!1,f),f);return g&&(e=T.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=n.css(a,b)),Na(a,c,g)}}}),n.cssHooks.marginLeft=Ga(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Fa(a,"marginLeft"))||a.getBoundingClientRect().left-Da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px":void 0}),n.cssHooks.marginRight=Ga(l.reliableMarginRight,function(a,b){return b?Da(a,{display:"inline-block"},Fa,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Aa.test(a)||(n.cssHooks[a+b].set=Na)}),n.fn.extend({css:function(a,b){return K(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ca(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Qa(this,!0)},hide:function(){return Qa(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function Ra(a,b,c,d,e){return new Ra.prototype.init(a,b,c,d,e)}n.Tween=Ra,Ra.prototype={constructor:Ra,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ra.propHooks[this.prop];return a&&a.get?a.get(this):Ra.propHooks._default.get(this)},run:function(a){var b,c=Ra.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ra.propHooks._default.set(this),this}},Ra.prototype.init.prototype=Ra.prototype,Ra.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},Ra.propHooks.scrollTop=Ra.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=Ra.prototype.init,n.fx.step={};var Sa,Ta,Ua=/^(?:toggle|show|hide)$/,Va=/queueHooks$/;function Wa(){return a.setTimeout(function(){Sa=void 0}),Sa=n.now()}function Xa(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=U[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ya(a,b,c){for(var d,e=(_a.tweeners[b]||[]).concat(_a.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Za(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&V(a),q=N.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?N.get(a,"olddisplay")||za(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Ua.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?za(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=N.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;N.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ya(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function $a(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function _a(a,b,c){var d,e,f=0,g=_a.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Sa||Wa(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:Sa||Wa(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for($a(k,j.opts.specialEasing);g>f;f++)if(d=_a.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,Ya,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(_a,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return W(c.elem,a,T.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],_a.tweeners[c]=_a.tweeners[c]||[],_a.tweeners[c].unshift(b)},prefilters:[Za],prefilter:function(a,b){b?_a.prefilters.unshift(a):_a.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=_a(this,n.extend({},a),f);(e||N.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=N.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Va.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=N.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Xa(b,!0),a,d,e)}}),n.each({slideDown:Xa("show"),slideUp:Xa("hide"),slideToggle:Xa("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Sa=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Sa=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Ta||(Ta=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(Ta),Ta=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=d.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var ab,bb=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return K(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ab:void 0)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)}}),ab={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=bb[b]||n.find.attr;bb[b]=function(a,b,d){var e,f;return d||(f=bb[b],bb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,bb[b]=f),e}});var cb=/^(?:input|select|textarea|button)$/i,db=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return K(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(b=n.propFix[b]||b,
-e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):cb.test(a.nodeName)||db.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var eb=/[\t\r\n\f]/g;function fb(a){return a.getAttribute&&a.getAttribute("class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,fb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,fb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,fb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=fb(this),b&&N.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":N.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+fb(c)+" ").replace(eb," ").indexOf(b)>-1)return!0;return!1}});var gb=/\r/g,hb=/[\x20\t\r\n\f]+/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(gb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a)).replace(hb," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],(c.selected||i===e)&&(l.optDisabled?!c.disabled:null===c.getAttribute("disabled"))&&(!c.parentNode.disabled||!n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(n.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var ib=/^(?:focusinfocus|focusoutblur)$/;n.extend(n.event,{trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!ib.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),l=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},f||!o.trigger||o.trigger.apply(e,c)!==!1)){if(!f&&!o.noBubble&&!n.isWindow(e)){for(j=o.delegateType||q,ib.test(j+q)||(h=h.parentNode);h;h=h.parentNode)p.push(h),i=h;i===(e.ownerDocument||d)&&p.push(i.defaultView||i.parentWindow||a)}g=0;while((h=p[g++])&&!b.isPropagationStopped())b.type=g>1?j:o.bindType||q,m=(N.get(h,"events")||{})[b.type]&&N.get(h,"handle"),m&&m.apply(h,c),m=l&&h[l],m&&m.apply&&L(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=q,f||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!L(e)||l&&n.isFunction(e[q])&&!n.isWindow(e)&&(i=e[l],i&&(e[l]=null),n.event.triggered=q,e[q](),n.event.triggered=void 0,i&&(e[l]=i)),b.result}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}}),n.fn.extend({trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),l.focusin="onfocusin"in a,l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=N.access(d,b);e||d.addEventListener(a,c,!0),N.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=N.access(d,b)-1;e?N.access(d,b,e):(d.removeEventListener(a,c,!0),N.remove(d,b))}}});var jb=a.location,kb=n.now(),lb=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var mb=/#.*$/,nb=/([?&])_=[^&]*/,ob=/^(.*?):[ \t]*([^\r\n]*)$/gm,pb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,qb=/^(?:GET|HEAD)$/,rb=/^\/\//,sb={},tb={},ub="*/".concat("*"),vb=d.createElement("a");vb.href=jb.href;function wb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function xb(a,b,c,d){var e={},f=a===tb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function yb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function zb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Ab(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:jb.href,type:"GET",isLocal:pb.test(jb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":ub,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?yb(yb(a,n.ajaxSettings),b):yb(n.ajaxSettings,a)},ajaxPrefilter:wb(sb),ajaxTransport:wb(tb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m=n.ajaxSetup({},c),o=m.context||m,p=m.context&&(o.nodeType||o.jquery)?n(o):n.event,q=n.Deferred(),r=n.Callbacks("once memory"),s=m.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,getResponseHeader:function(a){var b;if(2===v){if(!h){h={};while(b=ob.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===v?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return v||(a=u[c]=u[c]||a,t[a]=b),this},overrideMimeType:function(a){return v||(m.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>v)for(b in a)s[b]=[s[b],a[b]];else x.always(a[x.status]);return this},abort:function(a){var b=a||w;return e&&e.abort(b),z(0,b),this}};if(q.promise(x).complete=r.add,x.success=x.done,x.error=x.fail,m.url=((b||m.url||jb.href)+"").replace(mb,"").replace(rb,jb.protocol+"//"),m.type=c.method||c.type||m.method||m.type,m.dataTypes=n.trim(m.dataType||"*").toLowerCase().match(G)||[""],null==m.crossDomain){j=d.createElement("a");try{j.href=m.url,j.href=j.href,m.crossDomain=vb.protocol+"//"+vb.host!=j.protocol+"//"+j.host}catch(y){m.crossDomain=!0}}if(m.data&&m.processData&&"string"!=typeof m.data&&(m.data=n.param(m.data,m.traditional)),xb(sb,m,c,x),2===v)return x;k=n.event&&m.global,k&&0===n.active++&&n.event.trigger("ajaxStart"),m.type=m.type.toUpperCase(),m.hasContent=!qb.test(m.type),f=m.url,m.hasContent||(m.data&&(f=m.url+=(lb.test(f)?"&":"?")+m.data,delete m.data),m.cache===!1&&(m.url=nb.test(f)?f.replace(nb,"$1_="+kb++):f+(lb.test(f)?"&":"?")+"_="+kb++)),m.ifModified&&(n.lastModified[f]&&x.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&x.setRequestHeader("If-None-Match",n.etag[f])),(m.data&&m.hasContent&&m.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",m.contentType),x.setRequestHeader("Accept",m.dataTypes[0]&&m.accepts[m.dataTypes[0]]?m.accepts[m.dataTypes[0]]+("*"!==m.dataTypes[0]?", "+ub+"; q=0.01":""):m.accepts["*"]);for(l in m.headers)x.setRequestHeader(l,m.headers[l]);if(m.beforeSend&&(m.beforeSend.call(o,x,m)===!1||2===v))return x.abort();w="abort";for(l in{success:1,error:1,complete:1})x[l](m[l]);if(e=xb(tb,m,c,x)){if(x.readyState=1,k&&p.trigger("ajaxSend",[x,m]),2===v)return x;m.async&&m.timeout>0&&(i=a.setTimeout(function(){x.abort("timeout")},m.timeout));try{v=1,e.send(t,z)}catch(y){if(!(2>v))throw y;z(-1,y)}}else z(-1,"No Transport");function z(b,c,d,h){var j,l,t,u,w,y=c;2!==v&&(v=2,i&&a.clearTimeout(i),e=void 0,g=h||"",x.readyState=b>0?4:0,j=b>=200&&300>b||304===b,d&&(u=zb(m,x,d)),u=Ab(m,u,x,j),j?(m.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(n.lastModified[f]=w),w=x.getResponseHeader("etag"),w&&(n.etag[f]=w)),204===b||"HEAD"===m.type?y="nocontent":304===b?y="notmodified":(y=u.state,l=u.data,t=u.error,j=!t)):(t=y,!b&&y||(y="error",0>b&&(b=0))),x.status=b,x.statusText=(c||y)+"",j?q.resolveWith(o,[l,y,x]):q.rejectWith(o,[x,y,t]),x.statusCode(s),s=void 0,k&&p.trigger(j?"ajaxSuccess":"ajaxError",[x,m,j?l:t]),r.fireWith(o,[x,y]),k&&(p.trigger("ajaxComplete",[x,m]),--n.active||n.event.trigger("ajaxStop")))}return x},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&a))}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return!n.expr.filters.visible(a)},n.expr.filters.visible=function(a){return a.offsetWidth>0||a.offsetHeight>0||a.getClientRects().length>0};var Bb=/%20/g,Cb=/\[\]$/,Db=/\r?\n/g,Eb=/^(?:submit|button|image|reset|file)$/i,Fb=/^(?:input|select|textarea|keygen)/i;function Gb(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Cb.test(a)?d(a,e):Gb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Gb(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Gb(c,a[c],b,e);return d.join("&").replace(Bb,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Fb.test(this.nodeName)&&!Eb.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Db,"\r\n")}}):{name:b.name,value:c.replace(Db,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Hb={0:200,1223:204},Ib=n.ajaxSettings.xhr();l.cors=!!Ib&&"withCredentials"in Ib,l.ajax=Ib=!!Ib,n.ajaxTransport(function(b){var c,d;return l.cors||Ib&&!b.crossDomain?{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Hb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=n("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Jb=[],Kb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Jb.pop()||n.expando+"_"+kb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Kb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Kb.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Kb,"$1"+e):b.jsonp!==!1&&(b.url+=(lb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Jb.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||d;var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ca([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var Lb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Lb)return Lb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function Mb(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(e=d.getBoundingClientRect(),c=Mb(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ea})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;n.fn[a]=function(d){return K(this,function(a,d,e){var f=Mb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ga(l.pixelPosition,function(a,c){return c?(c=Fa(a,b),Ba.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return K(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)},size:function(){return this.length}}),n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Nb=a.jQuery,Ob=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Ob),b&&a.jQuery===n&&(a.jQuery=Nb),n},b||(a.jQuery=a.$=n),n});
+/*! jQuery v2.2.4 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isPlainObject:function(a){var b;if("object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype||{},"isPrototypeOf"))return!1;for(b in a);return void 0===b||k.call(a,b)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=d.createElement("script"),b.text=a,d.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:h.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=R.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return h.call(b,a)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&f.parentNode&&(this.length=1,this[0]=f),this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?h.call(n(a),this[0]):h.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||n.uniqueSort(e),D.test(a)&&e.reverse()),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.removeEventListener("DOMContentLoaded",J),a.removeEventListener("load",J),n.ready()}n.ready.promise=function(b){return I||(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(n.ready):(d.addEventListener("DOMContentLoaded",J),a.addEventListener("load",J))),I.promise(b)},n.ready.promise();var K=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)K(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},L=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function M(){this.expando=n.expando+M.uid++}M.uid=1,M.prototype={register:function(a,b){var c=b||{};return a.nodeType?a[this.expando]=c:Object.defineProperty(a,this.expando,{value:c,writable:!0,configurable:!0}),a[this.expando]},cache:function(a){if(!L(a))return{};var b=a[this.expando];return b||(b={},L(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[b]=c;else for(d in b)e[d]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=a[this.expando];if(void 0!==f){if(void 0===b)this.register(a);else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in f?d=[b,e]:(d=e,d=d in f?[d]:d.match(G)||[])),c=d.length;while(c--)delete f[d[c]]}(void 0===b||n.isEmptyObject(f))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!n.isEmptyObject(b)}};var N=new M,O=new M,P=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Q=/[A-Z]/g;function R(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Q,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:P.test(c)?n.parseJSON(c):c;
+}catch(e){}O.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return O.hasData(a)||N.hasData(a)},data:function(a,b,c){return O.access(a,b,c)},removeData:function(a,b){O.remove(a,b)},_data:function(a,b,c){return N.access(a,b,c)},_removeData:function(a,b){N.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=O.get(f),1===f.nodeType&&!N.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),R(f,d,e[d])));N.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){O.set(this,a)}):K(this,function(b){var c,d;if(f&&void 0===b){if(c=O.get(f,a)||O.get(f,a.replace(Q,"-$&").toLowerCase()),void 0!==c)return c;if(d=n.camelCase(a),c=O.get(f,d),void 0!==c)return c;if(c=R(f,d,void 0),void 0!==c)return c}else d=n.camelCase(a),this.each(function(){var c=O.get(this,d);O.set(this,d,b),a.indexOf("-")>-1&&void 0!==c&&O.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){O.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=N.get(a,b),c&&(!d||n.isArray(c)?d=N.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return N.get(a,c)||N.access(a,c,{empty:n.Callbacks("once memory").add(function(){N.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=N.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function W(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&T.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var X=/^(?:checkbox|radio)$/i,Y=/<([\w:-]+)/,Z=/^$|\/(?:java|ecma)script/i,$={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};$.optgroup=$.option,$.tbody=$.tfoot=$.colgroup=$.caption=$.thead,$.th=$.td;function _(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function aa(a,b){for(var c=0,d=a.length;d>c;c++)N.set(a[c],"globalEval",!b||N.get(b[c],"globalEval"))}var ba=/<|&#?\w+;/;function ca(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],o=0,p=a.length;p>o;o++)if(f=a[o],f||0===f)if("object"===n.type(f))n.merge(m,f.nodeType?[f]:f);else if(ba.test(f)){g=g||l.appendChild(b.createElement("div")),h=(Y.exec(f)||["",""])[1].toLowerCase(),i=$[h]||$._default,g.innerHTML=i[1]+n.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;n.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",o=0;while(f=m[o++])if(d&&n.inArray(f,d)>-1)e&&e.push(f);else if(j=n.contains(f.ownerDocument,f),g=_(l.appendChild(f),"script"),j&&aa(g),c){k=0;while(f=g[k++])Z.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var da=/^key/,ea=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,fa=/^([^.]*)(?:\.(.+)|)/;function ga(){return!0}function ha(){return!1}function ia(){try{return d.activeElement}catch(a){}}function ja(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ja(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ha;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return"undefined"!=typeof n&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(G)||[""],j=b.length;while(j--)h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.hasData(a)&&N.get(a);if(r&&(i=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&N.remove(a,"handle events")}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(N.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||d,e=c.documentElement,f=c.body,a.pageX=b.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ea.test(f)?this.mouseHooks:da.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=d),3===a.target.nodeType&&(a.target=a.target.parentNode),h.filter?h.filter(a,g):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==ia()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===ia()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ga:ha):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:ha,isPropagationStopped:ha,isImmediatePropagationStopped:ha,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ga,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ga,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ga,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||n.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),n.fn.extend({on:function(a,b,c,d){return ja(this,a,b,c,d)},one:function(a,b,c,d){return ja(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=ha),this.each(function(){n.event.remove(this,a,c,b)})}});var ka=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,la=/<script|<style|<link/i,ma=/checked\s*(?:[^=]|=\s*.checked.)/i,na=/^true\/(.*)/,oa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function pa(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function qa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function ra(a){var b=na.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function sa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(N.hasData(a)&&(f=N.access(a),g=N.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}O.hasData(a)&&(h=O.access(a),i=n.extend({},h),O.set(b,i))}}function ta(a,b){var c=b.nodeName.toLowerCase();"input"===c&&X.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function ua(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&ma.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),ua(f,b,c,d)});if(o&&(e=ca(b,a[0].ownerDocument,!1,a,d),g=e.firstChild,1===e.childNodes.length&&(e=g),g||d)){for(h=n.map(_(e,"script"),qa),i=h.length;o>m;m++)j=e,m!==p&&(j=n.clone(j,!0,!0),i&&n.merge(h,_(j,"script"))),c.call(a[m],j,m);if(i)for(k=h[h.length-1].ownerDocument,n.map(h,ra),m=0;i>m;m++)j=h[m],Z.test(j.type||"")&&!N.access(j,"globalEval")&&n.contains(k,j)&&(j.src?n._evalUrl&&n._evalUrl(j.src):n.globalEval(j.textContent.replace(oa,"")))}return a}function va(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(_(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&aa(_(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(ka,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=_(h),f=_(a),d=0,e=f.length;e>d;d++)ta(f[d],g[d]);if(b)if(c)for(f=f||_(a),g=g||_(h),d=0,e=f.length;e>d;d++)sa(f[d],g[d]);else sa(a,h);return g=_(h,"script"),g.length>0&&aa(g,!i&&_(a,"script")),h},cleanData:function(a){for(var b,c,d,e=n.event.special,f=0;void 0!==(c=a[f]);f++)if(L(c)){if(b=c[N.expando]){if(b.events)for(d in b.events)e[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);c[N.expando]=void 0}c[O.expando]&&(c[O.expando]=void 0)}}}),n.fn.extend({domManip:ua,detach:function(a){return va(this,a,!0)},remove:function(a){return va(this,a)},text:function(a){return K(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.appendChild(a)}})},prepend:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(_(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return K(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!la.test(a)&&!$[(Y.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(_(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return ua(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(_(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),f=e.length-1,h=0;f>=h;h++)c=h===f?this:this.clone(!0),n(e[h])[b](c),g.apply(d,c.get());return this.pushStack(d)}});var wa,xa={HTML:"block",BODY:"block"};function ya(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function za(a){var b=d,c=xa[a];return c||(c=ya(a,b),"none"!==c&&c||(wa=(wa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=wa[0].contentDocument,b.write(),b.close(),c=ya(a,b),wa.detach()),xa[a]=c),c}var Aa=/^margin/,Ba=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ca=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Da=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Ea=d.documentElement;!function(){var b,c,e,f,g=d.createElement("div"),h=d.createElement("div");if(h.style){h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,g.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",g.appendChild(h);function i(){h.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",h.innerHTML="",Ea.appendChild(g);var d=a.getComputedStyle(h);b="1%"!==d.top,f="2px"===d.marginLeft,c="4px"===d.width,h.style.marginRight="50%",e="4px"===d.marginRight,Ea.removeChild(g)}n.extend(l,{pixelPosition:function(){return i(),b},boxSizingReliable:function(){return null==c&&i(),c},pixelMarginRight:function(){return null==c&&i(),e},reliableMarginLeft:function(){return null==c&&i(),f},reliableMarginRight:function(){var b,c=h.appendChild(d.createElement("div"));return c.style.cssText=h.style.cssText="-webkit-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",h.style.width="1px",Ea.appendChild(g),b=!parseFloat(a.getComputedStyle(c).marginRight),Ea.removeChild(g),h.removeChild(c),b}})}}();function Fa(a,b,c){var d,e,f,g,h=a.style;return c=c||Ca(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Ba.test(g)&&Aa.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0!==g?g+"":g}function Ga(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Ha=/^(none|table(?!-c[ea]).+)/,Ia={position:"absolute",visibility:"hidden",display:"block"},Ja={letterSpacing:"0",fontWeight:"400"},Ka=["Webkit","O","Moz","ms"],La=d.createElement("div").style;function Ma(a){if(a in La)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ka.length;while(c--)if(a=Ka[c]+b,a in La)return a}function Na(a,b,c){var d=T.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Oa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Pa(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ca(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Fa(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ba.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Oa(a,b,c||(g?"border":"content"),d,f)+"px"}function Qa(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=N.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=N.access(d,"olddisplay",za(d.nodeName)))):(e=V(d),"none"===c&&e||N.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Fa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=T.exec(c))&&e[1]&&(c=W(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Fa(a,b,d)),"normal"===e&&b in Ja&&(e=Ja[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Ha.test(n.css(a,"display"))&&0===a.offsetWidth?Da(a,Ia,function(){return Pa(a,b,d)}):Pa(a,b,d):void 0},set:function(a,c,d){var e,f=d&&Ca(a),g=d&&Oa(a,b,d,"border-box"===n.css(a,"boxSizing",!1,f),f);return g&&(e=T.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=n.css(a,b)),Na(a,c,g)}}}),n.cssHooks.marginLeft=Ga(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Fa(a,"marginLeft"))||a.getBoundingClientRect().left-Da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px":void 0}),n.cssHooks.marginRight=Ga(l.reliableMarginRight,function(a,b){return b?Da(a,{display:"inline-block"},Fa,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Aa.test(a)||(n.cssHooks[a+b].set=Na)}),n.fn.extend({css:function(a,b){return K(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ca(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Qa(this,!0)},hide:function(){return Qa(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function Ra(a,b,c,d,e){return new Ra.prototype.init(a,b,c,d,e)}n.Tween=Ra,Ra.prototype={constructor:Ra,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ra.propHooks[this.prop];return a&&a.get?a.get(this):Ra.propHooks._default.get(this)},run:function(a){var b,c=Ra.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ra.propHooks._default.set(this),this}},Ra.prototype.init.prototype=Ra.prototype,Ra.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},Ra.propHooks.scrollTop=Ra.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=Ra.prototype.init,n.fx.step={};var Sa,Ta,Ua=/^(?:toggle|show|hide)$/,Va=/queueHooks$/;function Wa(){return a.setTimeout(function(){Sa=void 0}),Sa=n.now()}function Xa(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=U[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ya(a,b,c){for(var d,e=(_a.tweeners[b]||[]).concat(_a.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Za(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&V(a),q=N.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?N.get(a,"olddisplay")||za(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Ua.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?za(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=N.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;N.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ya(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function $a(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function _a(a,b,c){var d,e,f=0,g=_a.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Sa||Wa(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:Sa||Wa(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for($a(k,j.opts.specialEasing);g>f;f++)if(d=_a.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,Ya,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(_a,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return W(c.elem,a,T.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],_a.tweeners[c]=_a.tweeners[c]||[],_a.tweeners[c].unshift(b)},prefilters:[Za],prefilter:function(a,b){b?_a.prefilters.unshift(a):_a.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=_a(this,n.extend({},a),f);(e||N.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=N.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Va.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=N.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Xa(b,!0),a,d,e)}}),n.each({slideDown:Xa("show"),slideUp:Xa("hide"),slideToggle:Xa("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Sa=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Sa=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Ta||(Ta=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(Ta),Ta=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=d.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var ab,bb=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return K(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ab:void 0)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)}}),ab={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=bb[b]||n.find.attr;bb[b]=function(a,b,d){var e,f;return d||(f=bb[b],bb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,bb[b]=f),e}});var cb=/^(?:input|select|textarea|button)$/i,db=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return K(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(b=n.propFix[b]||b,e=n.propHooks[b]),
+void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):cb.test(a.nodeName)||db.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var eb=/[\t\r\n\f]/g;function fb(a){return a.getAttribute&&a.getAttribute("class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,fb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,fb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,fb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=fb(this),b&&N.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":N.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+fb(c)+" ").replace(eb," ").indexOf(b)>-1)return!0;return!1}});var gb=/\r/g,hb=/[\x20\t\r\n\f]+/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(gb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a)).replace(hb," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],(c.selected||i===e)&&(l.optDisabled?!c.disabled:null===c.getAttribute("disabled"))&&(!c.parentNode.disabled||!n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(n.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var ib=/^(?:focusinfocus|focusoutblur)$/;n.extend(n.event,{trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!ib.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),l=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},f||!o.trigger||o.trigger.apply(e,c)!==!1)){if(!f&&!o.noBubble&&!n.isWindow(e)){for(j=o.delegateType||q,ib.test(j+q)||(h=h.parentNode);h;h=h.parentNode)p.push(h),i=h;i===(e.ownerDocument||d)&&p.push(i.defaultView||i.parentWindow||a)}g=0;while((h=p[g++])&&!b.isPropagationStopped())b.type=g>1?j:o.bindType||q,m=(N.get(h,"events")||{})[b.type]&&N.get(h,"handle"),m&&m.apply(h,c),m=l&&h[l],m&&m.apply&&L(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=q,f||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!L(e)||l&&n.isFunction(e[q])&&!n.isWindow(e)&&(i=e[l],i&&(e[l]=null),n.event.triggered=q,e[q](),n.event.triggered=void 0,i&&(e[l]=i)),b.result}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b)}}),n.fn.extend({trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),l.focusin="onfocusin"in a,l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=N.access(d,b);e||d.addEventListener(a,c,!0),N.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=N.access(d,b)-1;e?N.access(d,b,e):(d.removeEventListener(a,c,!0),N.remove(d,b))}}});var jb=a.location,kb=n.now(),lb=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var mb=/#.*$/,nb=/([?&])_=[^&]*/,ob=/^(.*?):[ \t]*([^\r\n]*)$/gm,pb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,qb=/^(?:GET|HEAD)$/,rb=/^\/\//,sb={},tb={},ub="*/".concat("*"),vb=d.createElement("a");vb.href=jb.href;function wb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function xb(a,b,c,d){var e={},f=a===tb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function yb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function zb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Ab(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:jb.href,type:"GET",isLocal:pb.test(jb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":ub,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?yb(yb(a,n.ajaxSettings),b):yb(n.ajaxSettings,a)},ajaxPrefilter:wb(sb),ajaxTransport:wb(tb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m=n.ajaxSetup({},c),o=m.context||m,p=m.context&&(o.nodeType||o.jquery)?n(o):n.event,q=n.Deferred(),r=n.Callbacks("once memory"),s=m.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,getResponseHeader:function(a){var b;if(2===v){if(!h){h={};while(b=ob.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===v?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return v||(a=u[c]=u[c]||a,t[a]=b),this},overrideMimeType:function(a){return v||(m.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>v)for(b in a)s[b]=[s[b],a[b]];else x.always(a[x.status]);return this},abort:function(a){var b=a||w;return e&&e.abort(b),z(0,b),this}};if(q.promise(x).complete=r.add,x.success=x.done,x.error=x.fail,m.url=((b||m.url||jb.href)+"").replace(mb,"").replace(rb,jb.protocol+"//"),m.type=c.method||c.type||m.method||m.type,m.dataTypes=n.trim(m.dataType||"*").toLowerCase().match(G)||[""],null==m.crossDomain){j=d.createElement("a");try{j.href=m.url,j.href=j.href,m.crossDomain=vb.protocol+"//"+vb.host!=j.protocol+"//"+j.host}catch(y){m.crossDomain=!0}}if(m.data&&m.processData&&"string"!=typeof m.data&&(m.data=n.param(m.data,m.traditional)),xb(sb,m,c,x),2===v)return x;k=n.event&&m.global,k&&0===n.active++&&n.event.trigger("ajaxStart"),m.type=m.type.toUpperCase(),m.hasContent=!qb.test(m.type),f=m.url,m.hasContent||(m.data&&(f=m.url+=(lb.test(f)?"&":"?")+m.data,delete m.data),m.cache===!1&&(m.url=nb.test(f)?f.replace(nb,"$1_="+kb++):f+(lb.test(f)?"&":"?")+"_="+kb++)),m.ifModified&&(n.lastModified[f]&&x.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&x.setRequestHeader("If-None-Match",n.etag[f])),(m.data&&m.hasContent&&m.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",m.contentType),x.setRequestHeader("Accept",m.dataTypes[0]&&m.accepts[m.dataTypes[0]]?m.accepts[m.dataTypes[0]]+("*"!==m.dataTypes[0]?", "+ub+"; q=0.01":""):m.accepts["*"]);for(l in m.headers)x.setRequestHeader(l,m.headers[l]);if(m.beforeSend&&(m.beforeSend.call(o,x,m)===!1||2===v))return x.abort();w="abort";for(l in{success:1,error:1,complete:1})x[l](m[l]);if(e=xb(tb,m,c,x)){if(x.readyState=1,k&&p.trigger("ajaxSend",[x,m]),2===v)return x;m.async&&m.timeout>0&&(i=a.setTimeout(function(){x.abort("timeout")},m.timeout));try{v=1,e.send(t,z)}catch(y){if(!(2>v))throw y;z(-1,y)}}else z(-1,"No Transport");function z(b,c,d,h){var j,l,t,u,w,y=c;2!==v&&(v=2,i&&a.clearTimeout(i),e=void 0,g=h||"",x.readyState=b>0?4:0,j=b>=200&&300>b||304===b,d&&(u=zb(m,x,d)),u=Ab(m,u,x,j),j?(m.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(n.lastModified[f]=w),w=x.getResponseHeader("etag"),w&&(n.etag[f]=w)),204===b||"HEAD"===m.type?y="nocontent":304===b?y="notmodified":(y=u.state,l=u.data,t=u.error,j=!t)):(t=y,!b&&y||(y="error",0>b&&(b=0))),x.status=b,x.statusText=(c||y)+"",j?q.resolveWith(o,[l,y,x]):q.rejectWith(o,[x,y,t]),x.statusCode(s),s=void 0,k&&p.trigger(j?"ajaxSuccess":"ajaxError",[x,m,j?l:t]),r.fireWith(o,[x,y]),k&&(p.trigger("ajaxComplete",[x,m]),--n.active||n.event.trigger("ajaxStop")))}return x},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&a))}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return!n.expr.filters.visible(a)},n.expr.filters.visible=function(a){return a.offsetWidth>0||a.offsetHeight>0||a.getClientRects().length>0};var Bb=/%20/g,Cb=/\[\]$/,Db=/\r?\n/g,Eb=/^(?:submit|button|image|reset|file)$/i,Fb=/^(?:input|select|textarea|keygen)/i;function Gb(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Cb.test(a)?d(a,e):Gb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Gb(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Gb(c,a[c],b,e);return d.join("&").replace(Bb,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Fb.test(this.nodeName)&&!Eb.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Db,"\r\n")}}):{name:b.name,value:c.replace(Db,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Hb={0:200,1223:204},Ib=n.ajaxSettings.xhr();l.cors=!!Ib&&"withCredentials"in Ib,l.ajax=Ib=!!Ib,n.ajaxTransport(function(b){var c,d;return l.cors||Ib&&!b.crossDomain?{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Hb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=n("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Jb=[],Kb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Jb.pop()||n.expando+"_"+kb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Kb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Kb.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Kb,"$1"+e):b.jsonp!==!1&&(b.url+=(lb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Jb.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||d;var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ca([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var Lb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Lb)return Lb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function Mb(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(e=d.getBoundingClientRect(),c=Mb(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ea})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;n.fn[a]=function(d){return K(this,function(a,d,e){var f=Mb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ga(l.pixelPosition,function(a,c){return c?(c=Fa(a,b),Ba.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return K(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)},size:function(){return this.length}}),n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Nb=a.jQuery,Ob=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Ob),b&&a.jQuery===n&&(a.jQuery=Nb),n},b||(a.jQuery=a.$=n),n});
diff --git a/web/core/assets/vendor/jquery/jquery.min.map b/web/core/assets/vendor/jquery/jquery.min.map
index 17333ca83..49efa4b37 100644
--- a/web/core/assets/vendor/jquery/jquery.min.map
+++ b/web/core/assets/vendor/jquery/jquery.min.map
@@ -1 +1 @@
-{"version":3,"sources":["jquery.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","slice","concat","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","support","version","jQuery","selector","context","fn","init","rtrim","rmsPrefix","rdashAlpha","fcamelCase","all","letter","toUpperCase","prototype","jquery","constructor","length","toArray","call","get","num","pushStack","elems","ret","merge","prevObject","each","callback","map","elem","i","apply","arguments","first","eq","last","len","j","end","sort","splice","extend","options","name","src","copy","copyIsArray","clone","target","deep","isFunction","isPlainObject","isArray","undefined","expando","Math","random","replace","isReady","error","msg","noop","obj","type","Array","isWindow","isNumeric","realStringObj","parseFloat","key","nodeType","isEmptyObject","globalEval","code","script","indirect","eval","trim","createElement","text","head","appendChild","parentNode","removeChild","camelCase","string","nodeName","toLowerCase","isArrayLike","makeArray","results","Object","inArray","second","grep","invert","callbackInverse","matches","callbackExpect","arg","value","guid","proxy","tmp","args","now","Date","Symbol","iterator","split","Sizzle","Expr","getText","isXML","tokenize","compile","select","outermostContext","sortInput","hasDuplicate","setDocument","docElem","documentIsHTML","rbuggyQSA","rbuggyMatches","contains","preferredDoc","dirruns","done","classCache","createCache","tokenCache","compilerCache","sortOrder","a","b","MAX_NEGATIVE","pop","push_native","list","booleans","whitespace","identifier","attributes","pseudos","rwhitespace","RegExp","rcomma","rcombinators","rattributeQuotes","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rinputs","rheader","rnative","rquickExpr","rsibling","rescape","runescape","funescape","_","escaped","escapedWhitespace","high","String","fromCharCode","unloadHandler","childNodes","e","els","seed","m","nid","nidselect","match","groups","newSelector","newContext","ownerDocument","exec","getElementById","id","getElementsByTagName","getElementsByClassName","qsa","test","getAttribute","setAttribute","toSelector","join","testContext","querySelectorAll","qsaError","removeAttribute","keys","cache","cacheLength","shift","markFunction","assert","div","addHandle","attrs","handler","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","createButtonPseudo","createPositionalPseudo","argument","matchIndexes","documentElement","node","hasCompare","parent","doc","defaultView","top","addEventListener","attachEvent","className","createComment","getById","getElementsByName","find","filter","attrId","getAttributeNode","tag","innerHTML","input","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","attr","val","specified","uniqueSort","duplicates","detectDuplicates","sortStable","textContent","firstChild","nodeValue","selectors","createPseudo","relative",">","dir"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","simple","forward","ofType","xml","uniqueCache","outerCache","nodeIndex","start","useCache","lastChild","uniqueID","pseudo","setFilters","idx","matched","not","matcher","unmatched","has","innerText","lang","elemLang","hash","location","root","focus","activeElement","hasFocus","href","tabIndex","enabled","disabled","checked","selected","selectedIndex","empty","header","button","even","odd","lt","gt","radio","checkbox","file","password","image","submit","reset","filters","parseOnly","tokens","soFar","preFilters","cached","addCombinator","combinator","base","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","multipleContexts","contexts","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","matcherFromGroupMatchers","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","token","compiled","div1","defaultValue","unique","isXMLDoc","until","truncate","is","siblings","n","rneedsContext","rsingleTag","risSimple","winnow","qualifier","self","rootjQuery","parseHTML","ready","rparentsprev","guaranteedUnique","children","contents","next","prev","targets","l","closest","pos","index","prevAll","add","addBack","sibling","parents","parentsUntil","nextAll","nextUntil","prevUntil","contentDocument","reverse","rnotwhite","createOptions","object","flag","Callbacks","firing","memory","fired","locked","queue","firingIndex","fire","once","stopOnFalse","remove","disable","lock","fireWith","Deferred","func","tuples","state","promise","always","deferred","fail","then","fns","newDefer","tuple","returned","progress","notify","resolve","reject","pipe","stateString","when","subordinate","resolveValues","remaining","updateFunc","values","progressValues","notifyWith","resolveWith","progressContexts","resolveContexts","readyList","readyWait","holdReady","hold","wait","triggerHandler","off","completed","removeEventListener","readyState","doScroll","setTimeout","access","chainable","emptyGet","raw","bulk","acceptData","owner","Data","uid","register","initial","defineProperty","writable","configurable","set","data","prop","stored","camel","hasData","dataPriv","dataUser","rbrace","rmultiDash","dataAttr","parseJSON","removeData","_data","_removeData","camelKey","dequeue","startLength","hooks","_queueHooks","stop","setter","clearQueue","count","defer","pnum","source","rcssNum","cssExpand","isHidden","el","css","adjustCSS","valueParts","tween","adjusted","scale","maxIterations","currentValue","unit","cssNumber","initialInUnit","style","rcheckableType","rtagName","rscriptType","wrapMap","option","thead","col","tr","td","_default","optgroup","tbody","tfoot","colgroup","caption","th","getAll","setGlobalEval","refElements","rhtml","buildFragment","scripts","selection","ignored","wrap","fragment","createDocumentFragment","nodes","htmlPrefilter","createTextNode","checkClone","cloneNode","noCloneChecked","rkeyEvent","rmouseEvent","rtypenamespace","returnTrue","returnFalse","safeActiveElement","err","on","types","one","origFn","event","handleObjIn","eventHandle","events","t","handleObj","special","handlers","namespaces","origType","elemData","handle","triggered","dispatch","delegateType","bindType","namespace","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","fix","handlerQueue","delegateTarget","preDispatch","isPropagationStopped","currentTarget","isImmediatePropagationStopped","rnamespace","preventDefault","stopPropagation","postDispatch","sel","isNaN","props","fixHooks","keyHooks","original","which","charCode","keyCode","mouseHooks","eventDoc","body","pageX","clientX","scrollLeft","clientLeft","pageY","clientY","scrollTop","clientTop","originalEvent","fixHook","Event","load","noBubble","trigger","blur","click","beforeunload","returnValue","isDefaultPrevented","defaultPrevented","timeStamp","stopImmediatePropagation","mouseenter","mouseleave","pointerenter","pointerleave","orig","related","relatedTarget","rxhtmlTag","rnoInnerhtml","rchecked","rscriptTypeMasked","rcleanScript","manipulationTarget","content","disableScript","restoreScript","cloneCopyEvent","dest","pdataOld","pdataCur","udataOld","udataCur","fixInput","domManip","collection","hasScripts","iNoClone","html","_evalUrl","keepData","cleanData","dataAndEvents","deepDataAndEvents","srcElements","destElements","inPage","detach","append","prepend","insertBefore","before","after","replaceWith","replaceChild","appendTo","prependTo","insertAfter","replaceAll","insert","iframe","elemdisplay","HTML","BODY","actualDisplay","display","defaultDisplay","write","close","rmargin","rnumnonpx","getStyles","view","opener","getComputedStyle","swap","old","pixelPositionVal","boxSizingReliableVal","pixelMarginRightVal","reliableMarginLeftVal","container","backgroundClip","clearCloneStyle","cssText","computeStyleTests","divStyle","marginLeft","width","marginRight","pixelPosition","boxSizingReliable","pixelMarginRight","reliableMarginLeft","reliableMarginRight","marginDiv","curCSS","computed","minWidth","maxWidth","getPropertyValue","addGetHookIf","conditionFn","hookFn","rdisplayswap","cssShow","position","visibility","cssNormalTransform","letterSpacing","fontWeight","cssPrefixes","emptyStyle","vendorPropName","capName","setPositiveNumber","subtract","max","augmentWidthOrHeight","extra","isBorderBox","styles","getWidthOrHeight","valueIsBorderBox","offsetWidth","offsetHeight","msFullscreenElement","getClientRects","round","getBoundingClientRect","showHide","show","hidden","cssHooks","opacity","animationIterationCount","columnCount","fillOpacity","flexGrow","flexShrink","lineHeight","order","orphans","widows","zIndex","zoom","cssProps","float","origName","isFinite","left","margin","padding","border","prefix","suffix","expand","expanded","parts","hide","toggle","Tween","easing","propHooks","run","percent","eased","duration","step","fx","linear","p","swing","cos","PI","fxNow","timerId","rfxtypes","rrun","createFxNow","genFx","includeWidth","height","createTween","animation","Animation","tweeners","defaultPrefilter","opts","oldfire","checkDisplay","anim","dataShow","unqueued","overflow","overflowX","overflowY","propFilter","specialEasing","properties","stopped","prefilters","tick","currentTime","startTime","tweens","originalProperties","originalOptions","gotoEnd","rejectWith","timer","complete","*","tweener","prefilter","speed","opt","speeds","fadeTo","to","animate","optall","doAnimation","finish","stopQueue","timers","cssFn","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","interval","setInterval","clearInterval","slow","fast","delay","time","timeout","clearTimeout","checkOn","optSelected","optDisabled","radioValue","boolHook","removeAttr","nType","attrHooks","propName","attrNames","propFix","getter","rfocusable","rclickable","removeProp","tabindex","parseInt","for","class","rclass","getClass","addClass","classes","curValue","clazz","finalValue","removeClass","toggleClass","stateVal","classNames","hasClass","rreturn","rspaces","valHooks","optionSet","rfocusMorph","onlyHandlers","bubbleType","ontype","eventPath","isTrigger","parentWindow","simulate","isSimulated","hover","fnOver","fnOut","focusin","attaches","nonce","rquery","JSON","parse","parseXML","DOMParser","parseFromString","rhash","rts","rheaders","rlocalProtocol","rnoContent","rprotocol","transports","allTypes","originAnchor","addToPrefiltersOrTransports","structure","dataTypeExpression","dataType","dataTypes","inspectPrefiltersOrTransports","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","ajaxSettings","ajaxHandleResponses","s","responses","ct","finalDataType","firstDataType","mimeType","getResponseHeader","converters","ajaxConvert","response","isSuccess","conv2","current","conv","responseFields","dataFilter","active","lastModified","etag","url","isLocal","protocol","processData","async","contentType","accepts","json","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","ajax","transport","cacheURL","responseHeadersString","responseHeaders","timeoutTimer","urlAnchor","fireGlobals","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getAllResponseHeaders","setRequestHeader","lname","overrideMimeType","status","abort","statusText","finalText","success","method","crossDomain","host","param","traditional","hasContent","ifModified","headers","beforeSend","send","nativeStatusText","modified","getJSON","getScript","throws","wrapAll","firstElementChild","wrapInner","unwrap","visible","r20","rbracket","rCRLF","rsubmitterTypes","rsubmittable","buildParams","v","encodeURIComponent","serialize","serializeArray","xhr","XMLHttpRequest","xhrSuccessStatus",0,1223,"xhrSupported","cors","errorCallback","open","username","xhrFields","onload","onerror","onabort","onreadystatechange","responseType","responseText","binary","text script","charset","scriptCharset","evt","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","keepScripts","parsed","_load","params","animated","getWindow","offset","setOffset","curPosition","curLeft","curCSSTop","curTop","curOffset","curCSSLeft","calculatePosition","curElem","using","win","box","pageYOffset","pageXOffset","offsetParent","parentOffset","scrollTo","Height","Width","","defaultExtra","funcName","bind","unbind","delegate","undelegate","size","andSelf","define","amd","_jQuery","_$","$","noConflict"],"mappings":";CAcC,SAAUA,EAAQC,GAEK,gBAAXC,SAAiD,gBAAnBA,QAAOC,QAQhDD,OAAOC,QAAUH,EAAOI,SACvBH,EAASD,GAAQ,GACjB,SAAUK,GACT,IAAMA,EAAED,SACP,KAAM,IAAIE,OAAO,2CAElB,OAAOL,GAASI,IAGlBJ,EAASD,IAIS,mBAAXO,QAAyBA,OAASC,KAAM,SAAUD,EAAQE,GAOnE,GAAIC,MAEAN,EAAWG,EAAOH,SAElBO,EAAQD,EAAIC,MAEZC,EAASF,EAAIE,OAEbC,EAAOH,EAAIG,KAEXC,EAAUJ,EAAII,QAEdC,KAEAC,EAAWD,EAAWC,SAEtBC,EAASF,EAAWG,eAEpBC,KAKHC,EAAU,QAGVC,EAAS,SAAUC,EAAUC,GAI5B,MAAO,IAAIF,GAAOG,GAAGC,KAAMH,EAAUC,IAKtCG,EAAQ,qCAGRC,EAAY,QACZC,EAAa,eAGbC,EAAa,SAAUC,EAAKC,GAC3B,MAAOA,GAAOC,cAGhBX,GAAOG,GAAKH,EAAOY,WAGlBC,OAAQd,EAERe,YAAad,EAGbC,SAAU,GAGVc,OAAQ,EAERC,QAAS,WACR,MAAO1B,GAAM2B,KAAM9B,OAKpB+B,IAAK,SAAUC,GACd,MAAc,OAAPA,EAGE,EAANA,EAAUhC,KAAMgC,EAAMhC,KAAK4B,QAAW5B,KAAMgC,GAG9C7B,EAAM2B,KAAM9B,OAKdiC,UAAW,SAAUC,GAGpB,GAAIC,GAAMtB,EAAOuB,MAAOpC,KAAK2B,cAAeO,EAO5C,OAJAC,GAAIE,WAAarC,KACjBmC,EAAIpB,QAAUf,KAAKe,QAGZoB,GAIRG,KAAM,SAAUC,GACf,MAAO1B,GAAOyB,KAAMtC,KAAMuC,IAG3BC,IAAK,SAAUD,GACd,MAAOvC,MAAKiC,UAAWpB,EAAO2B,IAAKxC,KAAM,SAAUyC,EAAMC,GACxD,MAAOH,GAAST,KAAMW,EAAMC,EAAGD,OAIjCtC,MAAO,WACN,MAAOH,MAAKiC,UAAW9B,EAAMwC,MAAO3C,KAAM4C,aAG3CC,MAAO,WACN,MAAO7C,MAAK8C,GAAI,IAGjBC,KAAM,WACL,MAAO/C,MAAK8C,GAAI,KAGjBA,GAAI,SAAUJ,GACb,GAAIM,GAAMhD,KAAK4B,OACdqB,GAAKP,GAAU,EAAJA,EAAQM,EAAM,EAC1B,OAAOhD,MAAKiC,UAAWgB,GAAK,GAASD,EAAJC,GAAYjD,KAAMiD,SAGpDC,IAAK,WACJ,MAAOlD,MAAKqC,YAAcrC,KAAK2B,eAKhCtB,KAAMA,EACN8C,KAAMjD,EAAIiD,KACVC,OAAQlD,EAAIkD,QAGbvC,EAAOwC,OAASxC,EAAOG,GAAGqC,OAAS,WAClC,GAAIC,GAASC,EAAMC,EAAKC,EAAMC,EAAaC,EAC1CC,EAAShB,UAAW,OACpBF,EAAI,EACJd,EAASgB,UAAUhB,OACnBiC,GAAO,CAsBR,KAnBuB,iBAAXD,KACXC,EAAOD,EAGPA,EAAShB,UAAWF,OACpBA,KAIsB,gBAAXkB,IAAwB/C,EAAOiD,WAAYF,KACtDA,MAIIlB,IAAMd,IACVgC,EAAS5D,KACT0C,KAGWd,EAAJc,EAAYA,IAGnB,GAAqC,OAA9BY,EAAUV,UAAWF,IAG3B,IAAMa,IAAQD,GACbE,EAAMI,EAAQL,GACdE,EAAOH,EAASC,GAGXK,IAAWH,IAKXI,GAAQJ,IAAU5C,EAAOkD,cAAeN,KAC1CC,EAAc7C,EAAOmD,QAASP,MAE3BC,GACJA,GAAc,EACdC,EAAQH,GAAO3C,EAAOmD,QAASR,GAAQA,MAGvCG,EAAQH,GAAO3C,EAAOkD,cAAeP,GAAQA,KAI9CI,EAAQL,GAAS1C,EAAOwC,OAAQQ,EAAMF,EAAOF,IAGzBQ,SAATR,IACXG,EAAQL,GAASE,GAOrB,OAAOG,IAGR/C,EAAOwC,QAGNa,QAAS,UAAatD,EAAUuD,KAAKC,UAAWC,QAAS,MAAO,IAGhEC,SAAS,EAETC,MAAO,SAAUC,GAChB,KAAM,IAAI1E,OAAO0E,IAGlBC,KAAM,aAENX,WAAY,SAAUY,GACrB,MAA8B,aAAvB7D,EAAO8D,KAAMD,IAGrBV,QAASY,MAAMZ,QAEfa,SAAU,SAAUH,GACnB,MAAc,OAAPA,GAAeA,IAAQA,EAAI3E,QAGnC+E,UAAW,SAAUJ,GAMpB,GAAIK,GAAgBL,GAAOA,EAAIlE,UAC/B,QAAQK,EAAOmD,QAASU,IAAWK,EAAgBC,WAAYD,GAAkB,GAAO,GAGzFhB,cAAe,SAAUW,GACxB,GAAIO,EAMJ,IAA4B,WAAvBpE,EAAO8D,KAAMD,IAAsBA,EAAIQ,UAAYrE,EAAOgE,SAAUH,GACxE,OAAO,CAIR,IAAKA,EAAI/C,cACNlB,EAAOqB,KAAM4C,EAAK,iBAClBjE,EAAOqB,KAAM4C,EAAI/C,YAAYF,cAAiB,iBAChD,OAAO,CAKR,KAAMwD,IAAOP,IAEb,MAAeT,UAARgB,GAAqBxE,EAAOqB,KAAM4C,EAAKO,IAG/CE,cAAe,SAAUT,GACxB,GAAInB,EACJ,KAAMA,IAAQmB,GACb,OAAO,CAER,QAAO,GAGRC,KAAM,SAAUD,GACf,MAAY,OAAPA,EACGA,EAAM,GAIQ,gBAARA,IAAmC,kBAARA,GACxCnE,EAAYC,EAASsB,KAAM4C,KAAW,eAC/BA,IAITU,WAAY,SAAUC,GACrB,GAAIC,GACHC,EAAWC,IAEZH,GAAOxE,EAAO4E,KAAMJ,GAEfA,IAKkC,IAAjCA,EAAK/E,QAAS,eAClBgF,EAAS1F,EAAS8F,cAAe,UACjCJ,EAAOK,KAAON,EACdzF,EAASgG,KAAKC,YAAaP,GAASQ,WAAWC,YAAaT,IAM5DC,EAAUF,KAQbW,UAAW,SAAUC,GACpB,MAAOA,GAAO5B,QAASlD,EAAW,OAAQkD,QAASjD,EAAYC,IAGhE6E,SAAU,SAAUzD,EAAMc,GACzB,MAAOd,GAAKyD,UAAYzD,EAAKyD,SAASC,gBAAkB5C,EAAK4C,eAG9D7D,KAAM,SAAUoC,EAAKnC,GACpB,GAAIX,GAAQc,EAAI,CAEhB,IAAK0D,EAAa1B,IAEjB,IADA9C,EAAS8C,EAAI9C,OACDA,EAAJc,EAAYA,IACnB,GAAKH,EAAST,KAAM4C,EAAKhC,GAAKA,EAAGgC,EAAKhC,OAAU,EAC/C,UAIF,KAAMA,IAAKgC,GACV,GAAKnC,EAAST,KAAM4C,EAAKhC,GAAKA,EAAGgC,EAAKhC,OAAU,EAC/C,KAKH,OAAOgC,IAIRe,KAAM,SAAUE,GACf,MAAe,OAARA,EACN,IACEA,EAAO,IAAKtB,QAASnD,EAAO,KAIhCmF,UAAW,SAAUnG,EAAKoG,GACzB,GAAInE,GAAMmE,KAaV,OAXY,OAAPpG,IACCkG,EAAaG,OAAQrG,IACzBW,EAAOuB,MAAOD,EACE,gBAARjC,IACLA,GAAQA,GAGXG,EAAKyB,KAAMK,EAAKjC,IAIXiC,GAGRqE,QAAS,SAAU/D,EAAMvC,EAAKwC,GAC7B,MAAc,OAAPxC,EAAc,GAAKI,EAAQwB,KAAM5B,EAAKuC,EAAMC,IAGpDN,MAAO,SAAUS,EAAO4D,GAKvB,IAJA,GAAIzD,IAAOyD,EAAO7E,OACjBqB,EAAI,EACJP,EAAIG,EAAMjB,OAECoB,EAAJC,EAASA,IAChBJ,EAAOH,KAAQ+D,EAAQxD,EAKxB,OAFAJ,GAAMjB,OAASc,EAERG,GAGR6D,KAAM,SAAUxE,EAAOK,EAAUoE,GAShC,IARA,GAAIC,GACHC,KACAnE,EAAI,EACJd,EAASM,EAAMN,OACfkF,GAAkBH,EAIP/E,EAAJc,EAAYA,IACnBkE,GAAmBrE,EAAUL,EAAOQ,GAAKA,GACpCkE,IAAoBE,GACxBD,EAAQxG,KAAM6B,EAAOQ,GAIvB,OAAOmE,IAIRrE,IAAK,SAAUN,EAAOK,EAAUwE,GAC/B,GAAInF,GAAQoF,EACXtE,EAAI,EACJP,IAGD,IAAKiE,EAAalE,GAEjB,IADAN,EAASM,EAAMN,OACHA,EAAJc,EAAYA,IACnBsE,EAAQzE,EAAUL,EAAOQ,GAAKA,EAAGqE,GAEnB,MAATC,GACJ7E,EAAI9B,KAAM2G,OAMZ,KAAMtE,IAAKR,GACV8E,EAAQzE,EAAUL,EAAOQ,GAAKA,EAAGqE,GAEnB,MAATC,GACJ7E,EAAI9B,KAAM2G,EAMb,OAAO5G,GAAOuC,SAAWR,IAI1B8E,KAAM,EAINC,MAAO,SAAUlG,EAAID,GACpB,GAAIoG,GAAKC,EAAMF,CAUf,OARwB,gBAAZnG,KACXoG,EAAMnG,EAAID,GACVA,EAAUC,EACVA,EAAKmG,GAKAtG,EAAOiD,WAAY9C,IAKzBoG,EAAOjH,EAAM2B,KAAMc,UAAW,GAC9BsE,EAAQ,WACP,MAAOlG,GAAG2B,MAAO5B,GAAWf,KAAMoH,EAAKhH,OAAQD,EAAM2B,KAAMc,cAI5DsE,EAAMD,KAAOjG,EAAGiG,KAAOjG,EAAGiG,MAAQpG,EAAOoG,OAElCC,GAbP,QAgBDG,IAAKC,KAAKD,IAIV1G,QAASA,IAQa,kBAAX4G,UACX1G,EAAOG,GAAIuG,OAAOC,UAAatH,EAAKqH,OAAOC,WAK5C3G,EAAOyB,KAAM,uEAAuEmF,MAAO,KAC3F,SAAU/E,EAAGa,GACZhD,EAAY,WAAagD,EAAO,KAAQA,EAAK4C,eAG9C,SAASC,GAAa1B,GAMrB,GAAI9C,KAAW8C,GAAO,UAAYA,IAAOA,EAAI9C,OAC5C+C,EAAO9D,EAAO8D,KAAMD,EAErB,OAAc,aAATC,GAAuB9D,EAAOgE,SAAUH,IACrC,EAGQ,UAATC,GAA+B,IAAX/C,GACR,gBAAXA,IAAuBA,EAAS,GAAOA,EAAS,IAAO8C,GAEhE,GAAIgD,GAWJ,SAAW3H,GAEX,GAAI2C,GACH/B,EACAgH,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EAGAC,EACAxI,EACAyI,EACAC,EACAC,EACAC,EACA3B,EACA4B,EAGAvE,EAAU,SAAW,EAAI,GAAIoD,MAC7BoB,EAAe3I,EAAOH,SACtB+I,EAAU,EACVC,EAAO,EACPC,EAAaC,KACbC,EAAaD,KACbE,EAAgBF,KAChBG,EAAY,SAAUC,EAAGC,GAIxB,MAHKD,KAAMC,IACVhB,GAAe,GAET,GAIRiB,EAAe,GAAK,GAGpB3I,KAAcC,eACdR,KACAmJ,EAAMnJ,EAAImJ,IACVC,EAAcpJ,EAAIG,KAClBA,EAAOH,EAAIG,KACXF,EAAQD,EAAIC,MAGZG,EAAU,SAAUiJ,EAAM9G,GAGzB,IAFA,GAAIC,GAAI,EACPM,EAAMuG,EAAK3H,OACAoB,EAAJN,EAASA,IAChB,GAAK6G,EAAK7G,KAAOD,EAChB,MAAOC,EAGT,OAAO,IAGR8G,EAAW,6HAKXC,EAAa,sBAGbC,EAAa,mCAGbC,EAAa,MAAQF,EAAa,KAAOC,EAAa,OAASD,EAE9D,gBAAkBA,EAElB,2DAA6DC,EAAa,OAASD,EACnF,OAEDG,EAAU,KAAOF,EAAa,wFAKAC,EAAa,eAM3CE,EAAc,GAAIC,QAAQL,EAAa,IAAK,KAC5CvI,EAAQ,GAAI4I,QAAQ,IAAML,EAAa,8BAAgCA,EAAa,KAAM,KAE1FM,EAAS,GAAID,QAAQ,IAAML,EAAa,KAAOA,EAAa,KAC5DO,EAAe,GAAIF,QAAQ,IAAML,EAAa,WAAaA,EAAa,IAAMA,EAAa,KAE3FQ,EAAmB,GAAIH,QAAQ,IAAML,EAAa,iBAAmBA,EAAa,OAAQ,KAE1FS,EAAU,GAAIJ,QAAQF,GACtBO,EAAc,GAAIL,QAAQ,IAAMJ,EAAa,KAE7CU,GACCC,GAAM,GAAIP,QAAQ,MAAQJ,EAAa,KACvCY,MAAS,GAAIR,QAAQ,QAAUJ,EAAa,KAC5Ca,IAAO,GAAIT,QAAQ,KAAOJ,EAAa,SACvCc,KAAQ,GAAIV,QAAQ,IAAMH,GAC1Bc,OAAU,GAAIX,QAAQ,IAAMF,GAC5Bc,MAAS,GAAIZ,QAAQ,yDAA2DL,EAC/E,+BAAiCA,EAAa,cAAgBA,EAC9D,aAAeA,EAAa,SAAU,KACvCkB,KAAQ,GAAIb,QAAQ,OAASN,EAAW,KAAM,KAG9CoB,aAAgB,GAAId,QAAQ,IAAML,EAAa,mDAC9CA,EAAa,mBAAqBA,EAAa,mBAAoB,MAGrEoB,EAAU,sCACVC,EAAU,SAEVC,EAAU,yBAGVC,EAAa,mCAEbC,EAAW,OACXC,GAAU,QAGVC,GAAY,GAAIrB,QAAQ,qBAAuBL,EAAa,MAAQA,EAAa,OAAQ,MACzF2B,GAAY,SAAUC,EAAGC,EAASC,GACjC,GAAIC,GAAO,KAAOF,EAAU,KAI5B,OAAOE,KAASA,GAAQD,EACvBD,EACO,EAAPE,EAECC,OAAOC,aAAcF,EAAO,OAE5BC,OAAOC,aAAcF,GAAQ,GAAK,MAAe,KAAPA,EAAe,QAO5DG,GAAgB,WACfvD,IAIF,KACC/H,EAAKsC,MACHzC,EAAMC,EAAM2B,KAAM4G,EAAakD,YAChClD,EAAakD,YAId1L,EAAKwI,EAAakD,WAAWhK,QAASsD,SACrC,MAAQ2G,IACTxL,GAASsC,MAAOzC,EAAI0B,OAGnB,SAAUgC,EAAQkI,GACjBxC,EAAY3G,MAAOiB,EAAQzD,EAAM2B,KAAKgK,KAKvC,SAAUlI,EAAQkI,GACjB,GAAI7I,GAAIW,EAAOhC,OACdc,EAAI,CAEL,OAASkB,EAAOX,KAAO6I,EAAIpJ,MAC3BkB,EAAOhC,OAASqB,EAAI,IAKvB,QAASyE,IAAQ5G,EAAUC,EAASuF,EAASyF,GAC5C,GAAIC,GAAGtJ,EAAGD,EAAMwJ,EAAKC,EAAWC,EAAOC,EAAQC,EAC9CC,EAAavL,GAAWA,EAAQwL,cAGhCrH,EAAWnE,EAAUA,EAAQmE,SAAW,CAKzC,IAHAoB,EAAUA,MAGe,gBAAbxF,KAA0BA,GACxB,IAAboE,GAA+B,IAAbA,GAA+B,KAAbA,EAEpC,MAAOoB,EAIR,KAAMyF,KAEEhL,EAAUA,EAAQwL,eAAiBxL,EAAU2H,KAAmB9I,GACtEwI,EAAarH,GAEdA,EAAUA,GAAWnB,EAEhB0I,GAAiB,CAIrB,GAAkB,KAAbpD,IAAoBiH,EAAQnB,EAAWwB,KAAM1L,IAGjD,GAAMkL,EAAIG,EAAM,IAGf,GAAkB,IAAbjH,EAAiB,CACrB,KAAMzC,EAAO1B,EAAQ0L,eAAgBT,IAUpC,MAAO1F,EALP,IAAK7D,EAAKiK,KAAOV,EAEhB,MADA1F,GAAQjG,KAAMoC,GACP6D,MAYT,IAAKgG,IAAe7J,EAAO6J,EAAWG,eAAgBT,KACrDvD,EAAU1H,EAAS0B,IACnBA,EAAKiK,KAAOV,EAGZ,MADA1F,GAAQjG,KAAMoC,GACP6D,MAKH,CAAA,GAAK6F,EAAM,GAEjB,MADA9L,GAAKsC,MAAO2D,EAASvF,EAAQ4L,qBAAsB7L,IAC5CwF,CAGD,KAAM0F,EAAIG,EAAM,KAAOxL,EAAQiM,wBACrC7L,EAAQ6L,uBAGR,MADAvM,GAAKsC,MAAO2D,EAASvF,EAAQ6L,uBAAwBZ,IAC9C1F,EAKT,GAAK3F,EAAQkM,MACX7D,EAAelI,EAAW,QACzByH,IAAcA,EAAUuE,KAAMhM,IAAc,CAE9C,GAAkB,IAAboE,EACJoH,EAAavL,EACbsL,EAAcvL,MAMR,IAAwC,WAAnCC,EAAQmF,SAASC,cAA6B,EAGnD8F,EAAMlL,EAAQgM,aAAc,OACjCd,EAAMA,EAAI5H,QAAS6G,GAAS,QAE5BnK,EAAQiM,aAAc,KAAOf,EAAM/H,GAIpCkI,EAAStE,EAAUhH,GACnB4B,EAAI0J,EAAOxK,OACXsK,EAAY/B,EAAY2C,KAAMb,GAAQ,IAAMA,EAAM,QAAUA,EAAM,IAClE,OAAQvJ,IACP0J,EAAO1J,GAAKwJ,EAAY,IAAMe,GAAYb,EAAO1J,GAElD2J,GAAcD,EAAOc,KAAM,KAG3BZ,EAAarB,EAAS6B,KAAMhM,IAAcqM,GAAapM,EAAQ+E,aAC9D/E,EAGF,GAAKsL,EACJ,IAIC,MAHAhM,GAAKsC,MAAO2D,EACXgG,EAAWc,iBAAkBf,IAEvB/F,EACN,MAAQ+G,IACR,QACIpB,IAAQ/H,GACZnD,EAAQuM,gBAAiB,QAS/B,MAAOtF,GAAQlH,EAASuD,QAASnD,EAAO,MAAQH,EAASuF,EAASyF,GASnE,QAASjD,MACR,GAAIyE,KAEJ,SAASC,GAAOvI,EAAK+B,GAMpB,MAJKuG,GAAKlN,KAAM4E,EAAM,KAAQ0C,EAAK8F,mBAE3BD,GAAOD,EAAKG,SAEZF,EAAOvI,EAAM,KAAQ+B,EAE9B,MAAOwG,GAOR,QAASG,IAAc3M,GAEtB,MADAA,GAAIkD,IAAY,EACTlD,EAOR,QAAS4M,IAAQ5M,GAChB,GAAI6M,GAAMjO,EAAS8F,cAAc,MAEjC,KACC,QAAS1E,EAAI6M,GACZ,MAAOhC,GACR,OAAO,EACN,QAEIgC,EAAI/H,YACR+H,EAAI/H,WAAWC,YAAa8H,GAG7BA,EAAM,MASR,QAASC,IAAWC,EAAOC,GAC1B,GAAI9N,GAAM6N,EAAMtG,MAAM,KACrB/E,EAAIxC,EAAI0B,MAET,OAAQc,IACPiF,EAAKsG,WAAY/N,EAAIwC,IAAOsL,EAU9B,QAASE,IAAchF,EAAGC,GACzB,GAAIgF,GAAMhF,GAAKD,EACdkF,EAAOD,GAAsB,IAAfjF,EAAEhE,UAAiC,IAAfiE,EAAEjE,YAChCiE,EAAEkF,aAAejF,KACjBF,EAAEmF,aAAejF,EAGtB,IAAKgF,EACJ,MAAOA,EAIR,IAAKD,EACJ,MAASA,EAAMA,EAAIG,YAClB,GAAKH,IAAQhF,EACZ,MAAO,EAKV,OAAOD,GAAI,EAAI,GAOhB,QAASqF,IAAmB5J,GAC3B,MAAO,UAAUlC,GAChB,GAAIc,GAAOd,EAAKyD,SAASC,aACzB,OAAgB,UAAT5C,GAAoBd,EAAKkC,OAASA,GAQ3C,QAAS6J,IAAoB7J,GAC5B,MAAO,UAAUlC,GAChB,GAAIc,GAAOd,EAAKyD,SAASC,aACzB,QAAiB,UAAT5C,GAA6B,WAATA,IAAsBd,EAAKkC,OAASA,GAQlE,QAAS8J,IAAwBzN,GAChC,MAAO2M,IAAa,SAAUe,GAE7B,MADAA,IAAYA,EACLf,GAAa,SAAU5B,EAAMlF,GACnC,GAAI5D,GACH0L,EAAe3N,KAAQ+K,EAAKnK,OAAQ8M,GACpChM,EAAIiM,EAAa/M,MAGlB,OAAQc,IACFqJ,EAAO9I,EAAI0L,EAAajM,MAC5BqJ,EAAK9I,KAAO4D,EAAQ5D,GAAK8I,EAAK9I,SAYnC,QAASkK,IAAapM,GACrB,MAAOA,IAAmD,mBAAjCA,GAAQ4L,sBAAwC5L,EAI1EJ,EAAU+G,GAAO/G,WAOjBkH,EAAQH,GAAOG,MAAQ,SAAUpF,GAGhC,GAAImM,GAAkBnM,IAASA,EAAK8J,eAAiB9J,GAAMmM,eAC3D,OAAOA,GAA+C,SAA7BA,EAAgB1I,UAAsB,GAQhEkC,EAAcV,GAAOU,YAAc,SAAUyG,GAC5C,GAAIC,GAAYC,EACfC,EAAMH,EAAOA,EAAKtC,eAAiBsC,EAAOnG,CAG3C,OAAKsG,KAAQpP,GAA6B,IAAjBoP,EAAI9J,UAAmB8J,EAAIJ,iBAKpDhP,EAAWoP,EACX3G,EAAUzI,EAASgP,gBACnBtG,GAAkBT,EAAOjI,IAInBmP,EAASnP,EAASqP,cAAgBF,EAAOG,MAAQH,IAEjDA,EAAOI,iBACXJ,EAAOI,iBAAkB,SAAUxD,IAAe,GAGvCoD,EAAOK,aAClBL,EAAOK,YAAa,WAAYzD,KAUlChL,EAAQgJ,WAAaiE,GAAO,SAAUC,GAErC,MADAA,GAAIwB,UAAY,KACRxB,EAAId,aAAa,eAO1BpM,EAAQgM,qBAAuBiB,GAAO,SAAUC,GAE/C,MADAA,GAAIhI,YAAajG,EAAS0P,cAAc,MAChCzB,EAAIlB,qBAAqB,KAAK/K,SAIvCjB,EAAQiM,uBAAyB7B,EAAQ+B,KAAMlN,EAASgN,wBAMxDjM,EAAQ4O,QAAU3B,GAAO,SAAUC,GAElC,MADAxF,GAAQxC,YAAagI,GAAMnB,GAAKxI,GACxBtE,EAAS4P,oBAAsB5P,EAAS4P,kBAAmBtL,GAAUtC,SAIzEjB,EAAQ4O,SACZ5H,EAAK8H,KAAS,GAAI,SAAU/C,EAAI3L,GAC/B,GAAuC,mBAA3BA,GAAQ0L,gBAAkCnE,EAAiB,CACtE,GAAI0D,GAAIjL,EAAQ0L,eAAgBC,EAChC,OAAOV,IAAMA,QAGfrE,EAAK+H,OAAW,GAAI,SAAUhD,GAC7B,GAAIiD,GAASjD,EAAGrI,QAAS8G,GAAWC,GACpC,OAAO,UAAU3I,GAChB,MAAOA,GAAKsK,aAAa,QAAU4C,YAM9BhI,GAAK8H,KAAS,GAErB9H,EAAK+H,OAAW,GAAK,SAAUhD,GAC9B,GAAIiD,GAASjD,EAAGrI,QAAS8G,GAAWC,GACpC,OAAO,UAAU3I,GAChB,GAAIoM,GAAwC,mBAA1BpM,GAAKmN,kBACtBnN,EAAKmN,iBAAiB,KACvB,OAAOf,IAAQA,EAAK7H,QAAU2I,KAMjChI,EAAK8H,KAAU,IAAI9O,EAAQgM,qBAC1B,SAAUkD,EAAK9O,GACd,MAA6C,mBAAjCA,GAAQ4L,qBACZ5L,EAAQ4L,qBAAsBkD,GAG1BlP,EAAQkM,IACZ9L,EAAQqM,iBAAkByC,GAD3B,QAKR,SAAUA,EAAK9O,GACd,GAAI0B,GACH0E,KACAzE,EAAI,EAEJ4D,EAAUvF,EAAQ4L,qBAAsBkD,EAGzC,IAAa,MAARA,EAAc,CAClB,MAASpN,EAAO6D,EAAQ5D,KACA,IAAlBD,EAAKyC,UACTiC,EAAI9G,KAAMoC,EAIZ,OAAO0E,GAER,MAAOb,IAITqB,EAAK8H,KAAY,MAAI9O,EAAQiM,wBAA0B,SAAUyC,EAAWtO,GAC3E,MAA+C,mBAAnCA,GAAQ6L,wBAA0CtE,EACtDvH,EAAQ6L,uBAAwByC,GADxC,QAWD7G,KAOAD,MAEM5H,EAAQkM,IAAM9B,EAAQ+B,KAAMlN,EAASwN,qBAG1CQ,GAAO,SAAUC,GAMhBxF,EAAQxC,YAAagI,GAAMiC,UAAY,UAAY5L,EAAU,qBAC3CA,EAAU,kEAOvB2J,EAAIT,iBAAiB,wBAAwBxL,QACjD2G,EAAUlI,KAAM,SAAWoJ,EAAa,gBAKnCoE,EAAIT,iBAAiB,cAAcxL,QACxC2G,EAAUlI,KAAM,MAAQoJ,EAAa,aAAeD,EAAW,KAI1DqE,EAAIT,iBAAkB,QAAUlJ,EAAU,MAAOtC,QACtD2G,EAAUlI,KAAK,MAMVwN,EAAIT,iBAAiB,YAAYxL,QACtC2G,EAAUlI,KAAK,YAMVwN,EAAIT,iBAAkB,KAAOlJ,EAAU,MAAOtC,QACnD2G,EAAUlI,KAAK,cAIjBuN,GAAO,SAAUC,GAGhB,GAAIkC,GAAQnQ,EAAS8F,cAAc,QACnCqK,GAAM/C,aAAc,OAAQ,UAC5Ba,EAAIhI,YAAakK,GAAQ/C,aAAc,OAAQ,KAI1Ca,EAAIT,iBAAiB,YAAYxL,QACrC2G,EAAUlI,KAAM,OAASoJ,EAAa,eAKjCoE,EAAIT,iBAAiB,YAAYxL,QACtC2G,EAAUlI,KAAM,WAAY,aAI7BwN,EAAIT,iBAAiB,QACrB7E,EAAUlI,KAAK,YAIXM,EAAQqP,gBAAkBjF,EAAQ+B,KAAOjG,EAAUwB,EAAQxB,SAChEwB,EAAQ4H,uBACR5H,EAAQ6H,oBACR7H,EAAQ8H,kBACR9H,EAAQ+H,qBAERxC,GAAO,SAAUC,GAGhBlN,EAAQ0P,kBAAoBxJ,EAAQ/E,KAAM+L,EAAK,OAI/ChH,EAAQ/E,KAAM+L,EAAK,aACnBrF,EAAcnI,KAAM,KAAMuJ,KAI5BrB,EAAYA,EAAU3G,QAAU,GAAIkI,QAAQvB,EAAU2E,KAAK,MAC3D1E,EAAgBA,EAAc5G,QAAU,GAAIkI,QAAQtB,EAAc0E,KAAK,MAIvE4B,EAAa/D,EAAQ+B,KAAMzE,EAAQiI,yBAKnC7H,EAAWqG,GAAc/D,EAAQ+B,KAAMzE,EAAQI,UAC9C,SAAUS,EAAGC,GACZ,GAAIoH,GAAuB,IAAfrH,EAAEhE,SAAiBgE,EAAE0F,gBAAkB1F,EAClDsH,EAAMrH,GAAKA,EAAErD,UACd,OAAOoD,KAAMsH,MAAWA,GAAwB,IAAjBA,EAAItL,YAClCqL,EAAM9H,SACL8H,EAAM9H,SAAU+H,GAChBtH,EAAEoH,yBAA8D,GAAnCpH,EAAEoH,wBAAyBE,MAG3D,SAAUtH,EAAGC,GACZ,GAAKA,EACJ,MAASA,EAAIA,EAAErD,WACd,GAAKqD,IAAMD,EACV,OAAO,CAIV,QAAO,GAOTD,EAAY6F,EACZ,SAAU5F,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,MADAhB,IAAe,EACR,CAIR,IAAIsI,IAAWvH,EAAEoH,yBAA2BnH,EAAEmH,uBAC9C,OAAKG,GACGA,GAIRA,GAAYvH,EAAEqD,eAAiBrD,MAAUC,EAAEoD,eAAiBpD,GAC3DD,EAAEoH,wBAAyBnH,GAG3B,EAGc,EAAVsH,IACF9P,EAAQ+P,cAAgBvH,EAAEmH,wBAAyBpH,KAAQuH,EAGxDvH,IAAMtJ,GAAYsJ,EAAEqD,gBAAkB7D,GAAgBD,EAASC,EAAcQ,GAC1E,GAEHC,IAAMvJ,GAAYuJ,EAAEoD,gBAAkB7D,GAAgBD,EAASC,EAAcS,GAC1E,EAIDjB,EACJ5H,EAAS4H,EAAWgB,GAAM5I,EAAS4H,EAAWiB,GAChD,EAGe,EAAVsH,EAAc,GAAK,IAE3B,SAAUvH,EAAGC,GAEZ,GAAKD,IAAMC,EAEV,MADAhB,IAAe,EACR,CAGR,IAAIgG,GACHzL,EAAI,EACJiO,EAAMzH,EAAEpD,WACR0K,EAAMrH,EAAErD,WACR8K,GAAO1H,GACP2H,GAAO1H,EAGR,KAAMwH,IAAQH,EACb,MAAOtH,KAAMtJ,EAAW,GACvBuJ,IAAMvJ,EAAW,EACjB+Q,EAAM,GACNH,EAAM,EACNtI,EACE5H,EAAS4H,EAAWgB,GAAM5I,EAAS4H,EAAWiB,GAChD,CAGK,IAAKwH,IAAQH,EACnB,MAAOtC,IAAchF,EAAGC,EAIzBgF,GAAMjF,CACN,OAASiF,EAAMA,EAAIrI,WAClB8K,EAAGE,QAAS3C,EAEbA,GAAMhF,CACN,OAASgF,EAAMA,EAAIrI,WAClB+K,EAAGC,QAAS3C,EAIb,OAAQyC,EAAGlO,KAAOmO,EAAGnO,GACpBA,GAGD,OAAOA,GAENwL,GAAc0C,EAAGlO,GAAImO,EAAGnO,IAGxBkO,EAAGlO,KAAOgG,EAAe,GACzBmI,EAAGnO,KAAOgG,EAAe,EACzB,GAGK9I,GArWCA,GAwWT8H,GAAOb,QAAU,SAAUkK,EAAMC,GAChC,MAAOtJ,IAAQqJ,EAAM,KAAM,KAAMC,IAGlCtJ,GAAOsI,gBAAkB,SAAUvN,EAAMsO,GASxC,IAPOtO,EAAK8J,eAAiB9J,KAAW7C,GACvCwI,EAAa3F,GAIdsO,EAAOA,EAAK1M,QAAS4F,EAAkB,UAElCtJ,EAAQqP,iBAAmB1H,IAC9BU,EAAe+H,EAAO,QACpBvI,IAAkBA,EAAcsE,KAAMiE,OACtCxI,IAAkBA,EAAUuE,KAAMiE,IAErC,IACC,GAAI5O,GAAM0E,EAAQ/E,KAAMW,EAAMsO,EAG9B,IAAK5O,GAAOxB,EAAQ0P,mBAGlB5N,EAAK7C,UAAuC,KAA3B6C,EAAK7C,SAASsF,SAChC,MAAO/C,GAEP,MAAO0J,IAGV,MAAOnE,IAAQqJ,EAAMnR,EAAU,MAAQ6C,IAASb,OAAS,GAG1D8F,GAAOe,SAAW,SAAU1H,EAAS0B,GAKpC,OAHO1B,EAAQwL,eAAiBxL,KAAcnB,GAC7CwI,EAAarH,GAEP0H,EAAU1H,EAAS0B,IAG3BiF,GAAOuJ,KAAO,SAAUxO,EAAMc,IAEtBd,EAAK8J,eAAiB9J,KAAW7C,GACvCwI,EAAa3F,EAGd,IAAIzB,GAAK2G,EAAKsG,WAAY1K,EAAK4C,eAE9B+K,EAAMlQ,GAAMP,EAAOqB,KAAM6F,EAAKsG,WAAY1K,EAAK4C,eAC9CnF,EAAIyB,EAAMc,GAAO+E,GACjBrE,MAEF,OAAeA,UAARiN,EACNA,EACAvQ,EAAQgJ,aAAerB,EACtB7F,EAAKsK,aAAcxJ,IAClB2N,EAAMzO,EAAKmN,iBAAiBrM,KAAU2N,EAAIC,UAC1CD,EAAIlK,MACJ,MAGJU,GAAOnD,MAAQ,SAAUC,GACxB,KAAM,IAAI1E,OAAO,0CAA4C0E,IAO9DkD,GAAO0J,WAAa,SAAU9K,GAC7B,GAAI7D,GACH4O,KACApO,EAAI,EACJP,EAAI,CAOL,IAJAyF,GAAgBxH,EAAQ2Q,iBACxBpJ,GAAavH,EAAQ4Q,YAAcjL,EAAQnG,MAAO,GAClDmG,EAAQnD,KAAM8F,GAETd,EAAe,CACnB,MAAS1F,EAAO6D,EAAQ5D,KAClBD,IAAS6D,EAAS5D,KACtBO,EAAIoO,EAAWhR,KAAMqC,GAGvB,OAAQO,IACPqD,EAAQlD,OAAQiO,EAAYpO,GAAK,GAQnC,MAFAiF,GAAY,KAEL5B,GAORsB,EAAUF,GAAOE,QAAU,SAAUnF,GACpC,GAAIoM,GACH1M,EAAM,GACNO,EAAI,EACJwC,EAAWzC,EAAKyC,QAEjB,IAAMA,GAMC,GAAkB,IAAbA,GAA+B,IAAbA,GAA+B,KAAbA,EAAkB,CAGjE,GAAiC,gBAArBzC,GAAK+O,YAChB,MAAO/O,GAAK+O,WAGZ,KAAM/O,EAAOA,EAAKgP,WAAYhP,EAAMA,EAAOA,EAAK6L,YAC/CnM,GAAOyF,EAASnF,OAGZ,IAAkB,IAAbyC,GAA+B,IAAbA,EAC7B,MAAOzC,GAAKiP,cAhBZ,OAAS7C,EAAOpM,EAAKC,KAEpBP,GAAOyF,EAASiH,EAkBlB,OAAO1M,IAGRwF,EAAOD,GAAOiK,WAGblE,YAAa,GAEbmE,aAAcjE,GAEdxB,MAAO/B,EAEP6D,cAEAwB,QAEAoC,UACCC,KAAOC,IAAK,aAAclP,OAAO,GACjCmP,KAAOD,IAAK,cACZE,KAAOF,IAAK,kBAAmBlP,OAAO,GACtCqP,KAAOH,IAAK,oBAGbI,WACC3H,KAAQ,SAAU2B,GAUjB,MATAA,GAAM,GAAKA,EAAM,GAAG9H,QAAS8G,GAAWC,IAGxCe,EAAM,IAAOA,EAAM,IAAMA,EAAM,IAAMA,EAAM,IAAM,IAAK9H,QAAS8G,GAAWC,IAExD,OAAbe,EAAM,KACVA,EAAM,GAAK,IAAMA,EAAM,GAAK,KAGtBA,EAAMhM,MAAO,EAAG,IAGxBuK,MAAS,SAAUyB,GA6BlB,MAlBAA,GAAM,GAAKA,EAAM,GAAGhG,cAEY,QAA3BgG,EAAM,GAAGhM,MAAO,EAAG,IAEjBgM,EAAM,IACXzE,GAAOnD,MAAO4H,EAAM,IAKrBA,EAAM,KAAQA,EAAM,GAAKA,EAAM,IAAMA,EAAM,IAAM,GAAK,GAAmB,SAAbA,EAAM,IAA8B,QAAbA,EAAM,KACzFA,EAAM,KAAUA,EAAM,GAAKA,EAAM,IAAqB,QAAbA,EAAM,KAGpCA,EAAM,IACjBzE,GAAOnD,MAAO4H,EAAM,IAGdA,GAGR1B,OAAU,SAAU0B,GACnB,GAAIiG,GACHC,GAAYlG,EAAM,IAAMA,EAAM,EAE/B,OAAK/B,GAAiB,MAAE0C,KAAMX,EAAM,IAC5B,MAIHA,EAAM,GACVA,EAAM,GAAKA,EAAM,IAAMA,EAAM,IAAM,GAGxBkG,GAAYnI,EAAQ4C,KAAMuF,KAEpCD,EAAStK,EAAUuK,GAAU,MAE7BD,EAASC,EAAS/R,QAAS,IAAK+R,EAASzQ,OAASwQ,GAAWC,EAASzQ,UAGvEuK,EAAM,GAAKA,EAAM,GAAGhM,MAAO,EAAGiS,GAC9BjG,EAAM,GAAKkG,EAASlS,MAAO,EAAGiS,IAIxBjG,EAAMhM,MAAO,EAAG,MAIzBuP,QAECnF,IAAO,SAAU+H,GAChB,GAAIpM,GAAWoM,EAAiBjO,QAAS8G,GAAWC,IAAYjF,aAChE,OAA4B,MAArBmM,EACN,WAAa,OAAO,GACpB,SAAU7P,GACT,MAAOA,GAAKyD,UAAYzD,EAAKyD,SAASC,gBAAkBD,IAI3DoE,MAAS,SAAU+E,GAClB,GAAIkD,GAAU1J,EAAYwG,EAAY,IAEtC,OAAOkD,KACLA,EAAU,GAAIzI,QAAQ,MAAQL,EAAa,IAAM4F,EAAY,IAAM5F,EAAa,SACjFZ,EAAYwG,EAAW,SAAU5M,GAChC,MAAO8P,GAAQzF,KAAgC,gBAAnBrK,GAAK4M,WAA0B5M,EAAK4M,WAA0C,mBAAtB5M,GAAKsK,cAAgCtK,EAAKsK,aAAa,UAAY,OAI1JvC,KAAQ,SAAUjH,EAAMiP,EAAUC,GACjC,MAAO,UAAUhQ,GAChB,GAAIiQ,GAAShL,GAAOuJ,KAAMxO,EAAMc,EAEhC,OAAe,OAAVmP,EACgB,OAAbF,EAEFA,GAINE,GAAU,GAEU,MAAbF,EAAmBE,IAAWD,EACvB,OAAbD,EAAoBE,IAAWD,EAClB,OAAbD,EAAoBC,GAAqC,IAA5BC,EAAOpS,QAASmS,GAChC,OAAbD,EAAoBC,GAASC,EAAOpS,QAASmS,GAAU,GAC1C,OAAbD,EAAoBC,GAASC,EAAOvS,OAAQsS,EAAM7Q,UAAa6Q,EAClD,OAAbD,GAAsB,IAAME,EAAOrO,QAASwF,EAAa,KAAQ,KAAMvJ,QAASmS,GAAU,GAC7E,OAAbD,EAAoBE,IAAWD,GAASC,EAAOvS,MAAO,EAAGsS,EAAM7Q,OAAS,KAAQ6Q,EAAQ,KACxF,IAZO,IAgBV/H,MAAS,SAAU/F,EAAMgO,EAAMjE,EAAU7L,EAAOE,GAC/C,GAAI6P,GAAgC,QAAvBjO,EAAKxE,MAAO,EAAG,GAC3B0S,EAA+B,SAArBlO,EAAKxE,MAAO,IACtB2S,EAAkB,YAATH,CAEV,OAAiB,KAAV9P,GAAwB,IAATE,EAGrB,SAAUN,GACT,QAASA,EAAKqD,YAGf,SAAUrD,EAAM1B,EAASgS,GACxB,GAAIvF,GAAOwF,EAAaC,EAAYpE,EAAMqE,EAAWC,EACpDpB,EAAMa,IAAWC,EAAU,cAAgB,kBAC3C9D,EAAStM,EAAKqD,WACdvC,EAAOuP,GAAUrQ,EAAKyD,SAASC,cAC/BiN,GAAYL,IAAQD,EACpB1E,GAAO,CAER,IAAKW,EAAS,CAGb,GAAK6D,EAAS,CACb,MAAQb,EAAM,CACblD,EAAOpM,CACP,OAASoM,EAAOA,EAAMkD,GACrB,GAAKe,EACJjE,EAAK3I,SAASC,gBAAkB5C,EACd,IAAlBsL,EAAK3J,SAEL,OAAO,CAITiO,GAAQpB,EAAe,SAATpN,IAAoBwO,GAAS,cAE5C,OAAO,EAMR,GAHAA,GAAUN,EAAU9D,EAAO0C,WAAa1C,EAAOsE,WAG1CR,GAAWO,EAAW,CAK1BvE,EAAOE,EACPkE,EAAapE,EAAM3K,KAAc2K,EAAM3K,OAIvC8O,EAAcC,EAAYpE,EAAKyE,YAC7BL,EAAYpE,EAAKyE,cAEnB9F,EAAQwF,EAAarO,OACrBuO,EAAY1F,EAAO,KAAQ7E,GAAW6E,EAAO,GAC7CY,EAAO8E,GAAa1F,EAAO,GAC3BqB,EAAOqE,GAAanE,EAAOnD,WAAYsH,EAEvC,OAASrE,IAASqE,GAAarE,GAAQA,EAAMkD,KAG3C3D,EAAO8E,EAAY,IAAMC,EAAM9J,MAGhC,GAAuB,IAAlBwF,EAAK3J,YAAoBkJ,GAAQS,IAASpM,EAAO,CACrDuQ,EAAarO,IAAWgE,EAASuK,EAAW9E,EAC5C,YAuBF,IAjBKgF,IAEJvE,EAAOpM,EACPwQ,EAAapE,EAAM3K,KAAc2K,EAAM3K,OAIvC8O,EAAcC,EAAYpE,EAAKyE,YAC7BL,EAAYpE,EAAKyE,cAEnB9F,EAAQwF,EAAarO,OACrBuO,EAAY1F,EAAO,KAAQ7E,GAAW6E,EAAO,GAC7CY,EAAO8E,GAKH9E,KAAS,EAEb,MAASS,IAASqE,GAAarE,GAAQA,EAAMkD,KAC3C3D,EAAO8E,EAAY,IAAMC,EAAM9J,MAEhC,IAAOyJ,EACNjE,EAAK3I,SAASC,gBAAkB5C,EACd,IAAlBsL,EAAK3J,aACHkJ,IAGGgF,IACJH,EAAapE,EAAM3K,KAAc2K,EAAM3K,OAIvC8O,EAAcC,EAAYpE,EAAKyE,YAC7BL,EAAYpE,EAAKyE,cAEnBN,EAAarO,IAAWgE,EAASyF,IAG7BS,IAASpM,GACb,KASL,OADA2L,IAAQrL,EACDqL,IAASvL,GAAWuL,EAAOvL,IAAU,GAAKuL,EAAOvL,GAAS,KAKrE4H,OAAU,SAAU8I,EAAQ7E,GAK3B,GAAItH,GACHpG,EAAK2G,EAAKiC,QAAS2J,IAAY5L,EAAK6L,WAAYD,EAAOpN,gBACtDuB,GAAOnD,MAAO,uBAAyBgP,EAKzC,OAAKvS,GAAIkD,GACDlD,EAAI0N,GAIP1N,EAAGY,OAAS,GAChBwF,GAASmM,EAAQA,EAAQ,GAAI7E,GACtB/G,EAAK6L,WAAW9S,eAAgB6S,EAAOpN,eAC7CwH,GAAa,SAAU5B,EAAMlF,GAC5B,GAAI4M,GACHC,EAAU1S,EAAI+K,EAAM2C,GACpBhM,EAAIgR,EAAQ9R,MACb,OAAQc,IACP+Q,EAAMnT,EAASyL,EAAM2H,EAAQhR,IAC7BqJ,EAAM0H,KAAW5M,EAAS4M,GAAQC,EAAQhR,MAG5C,SAAUD,GACT,MAAOzB,GAAIyB,EAAM,EAAG2E,KAIhBpG,IAIT4I,SAEC+J,IAAOhG,GAAa,SAAU7M,GAI7B,GAAIiP,MACHzJ,KACAsN,EAAU7L,EAASjH,EAASuD,QAASnD,EAAO,MAE7C,OAAO0S,GAAS1P,GACfyJ,GAAa,SAAU5B,EAAMlF,EAAS9F,EAASgS,GAC9C,GAAItQ,GACHoR,EAAYD,EAAS7H,EAAM,KAAMgH,MACjCrQ,EAAIqJ,EAAKnK,MAGV,OAAQc,KACDD,EAAOoR,EAAUnR,MACtBqJ,EAAKrJ,KAAOmE,EAAQnE,GAAKD,MAI5B,SAAUA,EAAM1B,EAASgS,GAKxB,MAJAhD,GAAM,GAAKtN,EACXmR,EAAS7D,EAAO,KAAMgD,EAAKzM,GAE3ByJ,EAAM,GAAK,MACHzJ,EAAQ+C,SAInByK,IAAOnG,GAAa,SAAU7M,GAC7B,MAAO,UAAU2B,GAChB,MAAOiF,IAAQ5G,EAAU2B,GAAOb,OAAS,KAI3C6G,SAAYkF,GAAa,SAAUhI,GAElC,MADAA,GAAOA,EAAKtB,QAAS8G,GAAWC,IACzB,SAAU3I,GAChB,OAASA,EAAK+O,aAAe/O,EAAKsR,WAAanM,EAASnF,IAASnC,QAASqF,GAAS,MAWrFqO,KAAQrG,GAAc,SAAUqG,GAM/B,MAJM7J,GAAY2C,KAAKkH,GAAQ,KAC9BtM,GAAOnD,MAAO,qBAAuByP,GAEtCA,EAAOA,EAAK3P,QAAS8G,GAAWC,IAAYjF,cACrC,SAAU1D,GAChB,GAAIwR,EACJ,GACC,IAAMA,EAAW3L,EAChB7F,EAAKuR,KACLvR,EAAKsK,aAAa,aAAetK,EAAKsK,aAAa,QAGnD,MADAkH,GAAWA,EAAS9N,cACb8N,IAAaD,GAA2C,IAAnCC,EAAS3T,QAAS0T,EAAO,YAE5CvR,EAAOA,EAAKqD,aAAiC,IAAlBrD,EAAKyC,SAC3C,QAAO,KAKTtB,OAAU,SAAUnB,GACnB,GAAIyR,GAAOnU,EAAOoU,UAAYpU,EAAOoU,SAASD,IAC9C,OAAOA,IAAQA,EAAK/T,MAAO,KAAQsC,EAAKiK,IAGzC0H,KAAQ,SAAU3R,GACjB,MAAOA,KAAS4F,GAGjBgM,MAAS,SAAU5R,GAClB,MAAOA,KAAS7C,EAAS0U,iBAAmB1U,EAAS2U,UAAY3U,EAAS2U,gBAAkB9R,EAAKkC,MAAQlC,EAAK+R,OAAS/R,EAAKgS,WAI7HC,QAAW,SAAUjS,GACpB,MAAOA,GAAKkS,YAAa,GAG1BA,SAAY,SAAUlS,GACrB,MAAOA,GAAKkS,YAAa,GAG1BC,QAAW,SAAUnS,GAGpB,GAAIyD,GAAWzD,EAAKyD,SAASC,aAC7B,OAAqB,UAAbD,KAA0BzD,EAAKmS,SAA0B,WAAb1O,KAA2BzD,EAAKoS,UAGrFA,SAAY,SAAUpS,GAOrB,MAJKA,GAAKqD,YACTrD,EAAKqD,WAAWgP,cAGVrS,EAAKoS,YAAa,GAI1BE,MAAS,SAAUtS,GAKlB,IAAMA,EAAOA,EAAKgP,WAAYhP,EAAMA,EAAOA,EAAK6L,YAC/C,GAAK7L,EAAKyC,SAAW,EACpB,OAAO,CAGT,QAAO,GAGR6J,OAAU,SAAUtM,GACnB,OAAQkF,EAAKiC,QAAe,MAAGnH,IAIhCuS,OAAU,SAAUvS,GACnB,MAAOqI,GAAQgC,KAAMrK,EAAKyD,WAG3B6J,MAAS,SAAUtN,GAClB,MAAOoI,GAAQiC,KAAMrK,EAAKyD,WAG3B+O,OAAU,SAAUxS,GACnB,GAAIc,GAAOd,EAAKyD,SAASC,aACzB,OAAgB,UAAT5C,GAAkC,WAAdd,EAAKkC,MAA8B,WAATpB,GAGtDoC,KAAQ,SAAUlD,GACjB,GAAIwO,EACJ,OAAuC,UAAhCxO,EAAKyD,SAASC,eACN,SAAd1D,EAAKkC,OAImC,OAArCsM,EAAOxO,EAAKsK,aAAa,UAA2C,SAAvBkE,EAAK9K,gBAIvDtD,MAAS4L,GAAuB,WAC/B,OAAS,KAGV1L,KAAQ0L,GAAuB,SAAUE,EAAc/M,GACtD,OAASA,EAAS,KAGnBkB,GAAM2L,GAAuB,SAAUE,EAAc/M,EAAQ8M,GAC5D,OAAoB,EAAXA,EAAeA,EAAW9M,EAAS8M,KAG7CwG,KAAQzG,GAAuB,SAAUE,EAAc/M,GAEtD,IADA,GAAIc,GAAI,EACId,EAAJc,EAAYA,GAAK,EACxBiM,EAAatO,KAAMqC,EAEpB,OAAOiM,KAGRwG,IAAO1G,GAAuB,SAAUE,EAAc/M,GAErD,IADA,GAAIc,GAAI,EACId,EAAJc,EAAYA,GAAK,EACxBiM,EAAatO,KAAMqC,EAEpB,OAAOiM,KAGRyG,GAAM3G,GAAuB,SAAUE,EAAc/M,EAAQ8M,GAE5D,IADA,GAAIhM,GAAe,EAAXgM,EAAeA,EAAW9M,EAAS8M,IACjChM,GAAK,GACdiM,EAAatO,KAAMqC,EAEpB,OAAOiM,KAGR0G,GAAM5G,GAAuB,SAAUE,EAAc/M,EAAQ8M,GAE5D,IADA,GAAIhM,GAAe,EAAXgM,EAAeA,EAAW9M,EAAS8M,IACjChM,EAAId,GACb+M,EAAatO,KAAMqC,EAEpB,OAAOiM,OAKVhH,EAAKiC,QAAa,IAAIjC,EAAKiC,QAAY,EAGvC,KAAMlH,KAAO4S,OAAO,EAAMC,UAAU,EAAMC,MAAM,EAAMC,UAAU,EAAMC,OAAO,GAC5E/N,EAAKiC,QAASlH,GAAM6L,GAAmB7L,EAExC,KAAMA,KAAOiT,QAAQ,EAAMC,OAAO,GACjCjO,EAAKiC,QAASlH,GAAM8L,GAAoB9L,EAIzC,SAAS8Q,OACTA,GAAW/R,UAAYkG,EAAKkO,QAAUlO,EAAKiC,QAC3CjC,EAAK6L,WAAa,GAAIA,IAEtB1L,EAAWJ,GAAOI,SAAW,SAAUhH,EAAUgV,GAChD,GAAIpC,GAASvH,EAAO4J,EAAQpR,EAC3BqR,EAAO5J,EAAQ6J,EACfC,EAASnN,EAAYjI,EAAW,IAEjC,IAAKoV,EACJ,MAAOJ,GAAY,EAAII,EAAO/V,MAAO,EAGtC6V,GAAQlV,EACRsL,KACA6J,EAAatO,EAAKwK,SAElB,OAAQ6D,EAAQ,CAGTtC,KAAYvH,EAAQpC,EAAOyC,KAAMwJ,MACjC7J,IAEJ6J,EAAQA,EAAM7V,MAAOgM,EAAM,GAAGvK,SAAYoU,GAE3C5J,EAAO/L,KAAO0V,OAGfrC,GAAU,GAGJvH,EAAQnC,EAAawC,KAAMwJ,MAChCtC,EAAUvH,EAAMuB,QAChBqI,EAAO1V,MACN2G,MAAO0M,EAEP/O,KAAMwH,EAAM,GAAG9H,QAASnD,EAAO,OAEhC8U,EAAQA,EAAM7V,MAAOuT,EAAQ9R,QAI9B,KAAM+C,IAAQgD,GAAK+H,SACZvD,EAAQ/B,EAAWzF,GAAO6H,KAAMwJ,KAAcC,EAAYtR,MAC9DwH,EAAQ8J,EAAYtR,GAAQwH,MAC7BuH,EAAUvH,EAAMuB,QAChBqI,EAAO1V,MACN2G,MAAO0M,EACP/O,KAAMA,EACNkC,QAASsF,IAEV6J,EAAQA,EAAM7V,MAAOuT,EAAQ9R,QAI/B,KAAM8R,EACL,MAOF,MAAOoC,GACNE,EAAMpU,OACNoU,EACCtO,GAAOnD,MAAOzD,GAEdiI,EAAYjI,EAAUsL,GAASjM,MAAO,GAGzC,SAAS8M,IAAY8I,GAIpB,IAHA,GAAIrT,GAAI,EACPM,EAAM+S,EAAOnU,OACbd,EAAW,GACAkC,EAAJN,EAASA,IAChB5B,GAAYiV,EAAOrT,GAAGsE,KAEvB,OAAOlG,GAGR,QAASqV,IAAevC,EAASwC,EAAYC,GAC5C,GAAItE,GAAMqE,EAAWrE,IACpBuE,EAAmBD,GAAgB,eAARtE,EAC3BwE,EAAW3N,GAEZ,OAAOwN,GAAWvT,MAEjB,SAAUJ,EAAM1B,EAASgS,GACxB,MAAStQ,EAAOA,EAAMsP,GACrB,GAAuB,IAAlBtP,EAAKyC,UAAkBoR,EAC3B,MAAO1C,GAASnR,EAAM1B,EAASgS,IAMlC,SAAUtQ,EAAM1B,EAASgS,GACxB,GAAIyD,GAAUxD,EAAaC,EAC1BwD,GAAa9N,EAAS4N,EAGvB,IAAKxD,GACJ,MAAStQ,EAAOA,EAAMsP,GACrB,IAAuB,IAAlBtP,EAAKyC,UAAkBoR,IACtB1C,EAASnR,EAAM1B,EAASgS,GAC5B,OAAO,MAKV,OAAStQ,EAAOA,EAAMsP,GACrB,GAAuB,IAAlBtP,EAAKyC,UAAkBoR,EAAmB,CAO9C,GANArD,EAAaxQ,EAAMyB,KAAczB,EAAMyB,OAIvC8O,EAAcC,EAAYxQ,EAAK6Q,YAAeL,EAAYxQ,EAAK6Q,eAEzDkD,EAAWxD,EAAajB,KAC7ByE,EAAU,KAAQ7N,GAAW6N,EAAU,KAAQD,EAG/C,MAAQE,GAAU,GAAMD,EAAU,EAMlC,IAHAxD,EAAajB,GAAQ0E,EAGfA,EAAU,GAAM7C,EAASnR,EAAM1B,EAASgS,GAC7C,OAAO,IASf,QAAS2D,IAAgBC,GACxB,MAAOA,GAAS/U,OAAS,EACxB,SAAUa,EAAM1B,EAASgS,GACxB,GAAIrQ,GAAIiU,EAAS/U,MACjB,OAAQc,IACP,IAAMiU,EAASjU,GAAID,EAAM1B,EAASgS,GACjC,OAAO,CAGT,QAAO,GAER4D,EAAS,GAGX,QAASC,IAAkB9V,EAAU+V,EAAUvQ,GAG9C,IAFA,GAAI5D,GAAI,EACPM,EAAM6T,EAASjV,OACJoB,EAAJN,EAASA,IAChBgF,GAAQ5G,EAAU+V,EAASnU,GAAI4D,EAEhC,OAAOA,GAGR,QAASwQ,IAAUjD,EAAWrR,EAAKkN,EAAQ3O,EAASgS,GAOnD,IANA,GAAItQ,GACHsU,KACArU,EAAI,EACJM,EAAM6Q,EAAUjS,OAChBoV,EAAgB,MAAPxU,EAEEQ,EAAJN,EAASA,KACVD,EAAOoR,EAAUnR,MAChBgN,IAAUA,EAAQjN,EAAM1B,EAASgS,KACtCgE,EAAa1W,KAAMoC,GACduU,GACJxU,EAAInC,KAAMqC,IAMd,OAAOqU,GAGR,QAASE,IAAY9E,EAAWrR,EAAU8S,EAASsD,EAAYC,EAAYC,GAO1E,MANKF,KAAeA,EAAYhT,KAC/BgT,EAAaD,GAAYC,IAErBC,IAAeA,EAAYjT,KAC/BiT,EAAaF,GAAYE,EAAYC,IAE/BzJ,GAAa,SAAU5B,EAAMzF,EAASvF,EAASgS,GACrD,GAAIsE,GAAM3U,EAAGD,EACZ6U,KACAC,KACAC,EAAclR,EAAQ1E,OAGtBM,EAAQ6J,GAAQ6K,GAAkB9V,GAAY,IAAKC,EAAQmE,UAAanE,GAAYA,MAGpF0W,GAAYtF,IAAepG,GAASjL,EAEnCoB,EADA4U,GAAU5U,EAAOoV,EAAQnF,EAAWpR,EAASgS,GAG9C2E,EAAa9D,EAEZuD,IAAgBpL,EAAOoG,EAAYqF,GAAeN,MAMjD5Q,EACDmR,CAQF,IALK7D,GACJA,EAAS6D,EAAWC,EAAY3W,EAASgS,GAIrCmE,EAAa,CACjBG,EAAOP,GAAUY,EAAYH,GAC7BL,EAAYG,KAAUtW,EAASgS,GAG/BrQ,EAAI2U,EAAKzV,MACT,OAAQc,KACDD,EAAO4U,EAAK3U,MACjBgV,EAAYH,EAAQ7U,MAAS+U,EAAWF,EAAQ7U,IAAOD,IAK1D,GAAKsJ,GACJ,GAAKoL,GAAchF,EAAY,CAC9B,GAAKgF,EAAa,CAEjBE,KACA3U,EAAIgV,EAAW9V,MACf,OAAQc,KACDD,EAAOiV,EAAWhV,KAEvB2U,EAAKhX,KAAOoX,EAAU/U,GAAKD,EAG7B0U,GAAY,KAAOO,KAAkBL,EAAMtE,GAI5CrQ,EAAIgV,EAAW9V,MACf,OAAQc,KACDD,EAAOiV,EAAWhV,MACtB2U,EAAOF,EAAa7W,EAASyL,EAAMtJ,GAAS6U,EAAO5U,IAAM,KAE1DqJ,EAAKsL,KAAU/Q,EAAQ+Q,GAAQ5U,SAOlCiV,GAAaZ,GACZY,IAAepR,EACdoR,EAAWtU,OAAQoU,EAAaE,EAAW9V,QAC3C8V,GAEGP,EACJA,EAAY,KAAM7Q,EAASoR,EAAY3E,GAEvC1S,EAAKsC,MAAO2D,EAASoR,KAMzB,QAASC,IAAmB5B,GAwB3B,IAvBA,GAAI6B,GAAchE,EAAS3Q,EAC1BD,EAAM+S,EAAOnU,OACbiW,EAAkBlQ,EAAKkK,SAAUkE,EAAO,GAAGpR,MAC3CmT,EAAmBD,GAAmBlQ,EAAKkK,SAAS,KACpDnP,EAAImV,EAAkB,EAAI,EAG1BE,EAAe5B,GAAe,SAAU1T,GACvC,MAAOA,KAASmV,GACdE,GAAkB,GACrBE,EAAkB7B,GAAe,SAAU1T,GAC1C,MAAOnC,GAASsX,EAAcnV,GAAS,IACrCqV,GAAkB,GACrBnB,GAAa,SAAUlU,EAAM1B,EAASgS,GACrC,GAAI5Q,IAAS0V,IAAqB9E,GAAOhS,IAAYkH,MACnD2P,EAAe7W,GAASmE,SACxB6S,EAActV,EAAM1B,EAASgS,GAC7BiF,EAAiBvV,EAAM1B,EAASgS,GAGlC,OADA6E,GAAe,KACRzV,IAGGa,EAAJN,EAASA,IAChB,GAAMkR,EAAUjM,EAAKkK,SAAUkE,EAAOrT,GAAGiC,MACxCgS,GAAaR,GAAcO,GAAgBC,GAAY/C,QACjD,CAIN,GAHAA,EAAUjM,EAAK+H,OAAQqG,EAAOrT,GAAGiC,MAAOhC,MAAO,KAAMoT,EAAOrT,GAAGmE,SAG1D+M,EAAS1P,GAAY,CAGzB,IADAjB,IAAMP,EACMM,EAAJC,EAASA,IAChB,GAAK0E,EAAKkK,SAAUkE,EAAO9S,GAAG0B,MAC7B,KAGF,OAAOsS,IACNvU,EAAI,GAAKgU,GAAgBC,GACzBjU,EAAI,GAAKuK,GAER8I,EAAO5V,MAAO,EAAGuC,EAAI,GAAItC,QAAS4G,MAAgC,MAAzB+O,EAAQrT,EAAI,GAAIiC,KAAe,IAAM,MAC7EN,QAASnD,EAAO,MAClB0S,EACI3Q,EAAJP,GAASiV,GAAmB5B,EAAO5V,MAAOuC,EAAGO,IACzCD,EAAJC,GAAW0U,GAAoB5B,EAASA,EAAO5V,MAAO8C,IAClDD,EAAJC,GAAWgK,GAAY8I,IAGzBY,EAAStW,KAAMuT,GAIjB,MAAO8C,IAAgBC,GAGxB,QAASsB,IAA0BC,EAAiBC,GACnD,GAAIC,GAAQD,EAAYvW,OAAS,EAChCyW,EAAYH,EAAgBtW,OAAS,EACrC0W,EAAe,SAAUvM,EAAMhL,EAASgS,EAAKzM,EAASiS,GACrD,GAAI9V,GAAMQ,EAAG2Q,EACZ4E,EAAe,EACf9V,EAAI,IACJmR,EAAY9H,MACZ0M,KACAC,EAAgBzQ,EAEhB/F,EAAQ6J,GAAQsM,GAAa1Q,EAAK8H,KAAU,IAAG,IAAK8I,GAEpDI,EAAiBhQ,GAA4B,MAAjB+P,EAAwB,EAAIvU,KAAKC,UAAY,GACzEpB,EAAMd,EAAMN,MASb,KAPK2W,IACJtQ,EAAmBlH,IAAYnB,GAAYmB,GAAWwX,GAM/C7V,IAAMM,GAA4B,OAApBP,EAAOP,EAAMQ,IAAaA,IAAM,CACrD,GAAK2V,GAAa5V,EAAO,CACxBQ,EAAI,EACElC,GAAW0B,EAAK8J,gBAAkB3M,IACvCwI,EAAa3F,GACbsQ,GAAOzK,EAER,OAASsL,EAAUsE,EAAgBjV,KAClC,GAAK2Q,EAASnR,EAAM1B,GAAWnB,EAAUmT,GAAO,CAC/CzM,EAAQjG,KAAMoC,EACd,OAGG8V,IACJ5P,EAAUgQ,GAKPP,KAEE3V,GAAQmR,GAAWnR,IACxB+V,IAIIzM,GACJ8H,EAAUxT,KAAMoC,IAgBnB,GATA+V,GAAgB9V,EASX0V,GAAS1V,IAAM8V,EAAe,CAClCvV,EAAI,CACJ,OAAS2Q,EAAUuE,EAAYlV,KAC9B2Q,EAASC,EAAW4E,EAAY1X,EAASgS,EAG1C,IAAKhH,EAAO,CAEX,GAAKyM,EAAe,EACnB,MAAQ9V,IACAmR,EAAUnR,IAAM+V,EAAW/V,KACjC+V,EAAW/V,GAAK2G,EAAIvH,KAAMwE,GAM7BmS,GAAa3B,GAAU2B,GAIxBpY,EAAKsC,MAAO2D,EAASmS,GAGhBF,IAAcxM,GAAQ0M,EAAW7W,OAAS,GAC5C4W,EAAeL,EAAYvW,OAAW,GAExC8F,GAAO0J,WAAY9K,GAUrB,MALKiS,KACJ5P,EAAUgQ,EACV1Q,EAAmByQ,GAGb7E,EAGT,OAAOuE,GACNzK,GAAc2K,GACdA,EAgLF,MA7KAvQ,GAAUL,GAAOK,QAAU,SAAUjH,EAAUqL,GAC9C,GAAIzJ,GACHyV,KACAD,KACAhC,EAASlN,EAAelI,EAAW,IAEpC,KAAMoV,EAAS,CAER/J,IACLA,EAAQrE,EAAUhH,IAEnB4B,EAAIyJ,EAAMvK,MACV,OAAQc,IACPwT,EAASyB,GAAmBxL,EAAMzJ,IAC7BwT,EAAQhS,GACZiU,EAAY9X,KAAM6V,GAElBgC,EAAgB7X,KAAM6V,EAKxBA,GAASlN,EAAelI,EAAUmX,GAA0BC,EAAiBC,IAG7EjC,EAAOpV,SAAWA,EAEnB,MAAOoV,IAYRlO,EAASN,GAAOM,OAAS,SAAUlH,EAAUC,EAASuF,EAASyF,GAC9D,GAAIrJ,GAAGqT,EAAQ6C,EAAOjU,EAAM8K,EAC3BoJ,EAA+B,kBAAb/X,IAA2BA,EAC7CqL,GAASJ,GAAQjE,EAAWhH,EAAW+X,EAAS/X,UAAYA,EAM7D,IAJAwF,EAAUA,MAIY,IAAjB6F,EAAMvK,OAAe,CAIzB,GADAmU,EAAS5J,EAAM,GAAKA,EAAM,GAAGhM,MAAO,GAC/B4V,EAAOnU,OAAS,GAAkC,QAA5BgX,EAAQ7C,EAAO,IAAIpR,MAC5ChE,EAAQ4O,SAAgC,IAArBxO,EAAQmE,UAAkBoD,GAC7CX,EAAKkK,SAAUkE,EAAO,GAAGpR,MAAS,CAGnC,GADA5D,GAAY4G,EAAK8H,KAAS,GAAGmJ,EAAM/R,QAAQ,GAAGxC,QAAQ8G,GAAWC,IAAYrK,QAAkB,IACzFA,EACL,MAAOuF,EAGIuS,KACX9X,EAAUA,EAAQ+E,YAGnBhF,EAAWA,EAASX,MAAO4V,EAAOrI,QAAQ1G,MAAMpF,QAIjDc,EAAI0H,EAAwB,aAAE0C,KAAMhM,GAAa,EAAIiV,EAAOnU,MAC5D,OAAQc,IAAM,CAIb,GAHAkW,EAAQ7C,EAAOrT,GAGViF,EAAKkK,SAAWlN,EAAOiU,EAAMjU,MACjC,KAED,KAAM8K,EAAO9H,EAAK8H,KAAM9K,MAEjBoH,EAAO0D,EACZmJ,EAAM/R,QAAQ,GAAGxC,QAAS8G,GAAWC,IACrCH,EAAS6B,KAAMiJ,EAAO,GAAGpR,OAAUwI,GAAapM,EAAQ+E,aAAgB/E,IACpE,CAKJ,GAFAgV,EAAO3S,OAAQV,EAAG,GAClB5B,EAAWiL,EAAKnK,QAAUqL,GAAY8I,IAChCjV,EAEL,MADAT,GAAKsC,MAAO2D,EAASyF,GACdzF,CAGR,SAeJ,OAPEuS,GAAY9Q,EAASjH,EAAUqL,IAChCJ,EACAhL,GACCuH,EACDhC,GACCvF,GAAWkK,EAAS6B,KAAMhM,IAAcqM,GAAapM,EAAQ+E,aAAgB/E,GAExEuF,GAMR3F,EAAQ4Q,WAAarN,EAAQuD,MAAM,IAAItE,KAAM8F,GAAYiE,KAAK,MAAQhJ,EAItEvD,EAAQ2Q,mBAAqBnJ,EAG7BC,IAIAzH,EAAQ+P,aAAe9C,GAAO,SAAUkL,GAEvC,MAAuE,GAAhEA,EAAKxI,wBAAyB1Q,EAAS8F,cAAc,UAMvDkI,GAAO,SAAUC,GAEtB,MADAA,GAAIiC,UAAY,mBAC+B,MAAxCjC,EAAI4D,WAAW1E,aAAa,WAEnCe,GAAW,yBAA0B,SAAUrL,EAAMc,EAAMsE,GAC1D,MAAMA,GAAN,OACQpF,EAAKsK,aAAcxJ,EAA6B,SAAvBA,EAAK4C,cAA2B,EAAI,KAOjExF,EAAQgJ,YAAeiE,GAAO,SAAUC,GAG7C,MAFAA,GAAIiC,UAAY,WAChBjC,EAAI4D,WAAWzE,aAAc,QAAS,IACY,KAA3Ca,EAAI4D,WAAW1E,aAAc,YAEpCe,GAAW,QAAS,SAAUrL,EAAMc,EAAMsE,GACzC,MAAMA,IAAyC,UAAhCpF,EAAKyD,SAASC,cAA7B,OACQ1D,EAAKsW,eAOTnL,GAAO,SAAUC,GACtB,MAAuC,OAAhCA,EAAId,aAAa,eAExBe,GAAWtE,EAAU,SAAU/G,EAAMc,EAAMsE,GAC1C,GAAIqJ,EACJ,OAAMrJ,GAAN,OACQpF,EAAMc,MAAW,EAAOA,EAAK4C,eACjC+K,EAAMzO,EAAKmN,iBAAkBrM,KAAW2N,EAAIC,UAC7CD,EAAIlK,MACL,OAKGU,IAEH3H,EAIJc,GAAO4O,KAAO/H,EACd7G,EAAOkQ,KAAOrJ,EAAOiK,UACrB9Q,EAAOkQ,KAAM,KAAQlQ,EAAOkQ,KAAKnH,QACjC/I,EAAOuQ,WAAavQ,EAAOmY,OAAStR,EAAO0J,WAC3CvQ,EAAO8E,KAAO+B,EAAOE,QACrB/G,EAAOoY,SAAWvR,EAAOG,MACzBhH,EAAO4H,SAAWf,EAAOe,QAIzB,IAAIsJ,GAAM,SAAUtP,EAAMsP,EAAKmH,GAC9B,GAAIxF,MACHyF,EAAqBlV,SAAViV,CAEZ,QAAUzW,EAAOA,EAAMsP,KAA6B,IAAlBtP,EAAKyC,SACtC,GAAuB,IAAlBzC,EAAKyC,SAAiB,CAC1B,GAAKiU,GAAYtY,EAAQ4B,GAAO2W,GAAIF,GACnC,KAEDxF,GAAQrT,KAAMoC,GAGhB,MAAOiR,IAIJ2F,EAAW,SAAUC,EAAG7W,GAG3B,IAFA,GAAIiR,MAEI4F,EAAGA,EAAIA,EAAEhL,YACI,IAAfgL,EAAEpU,UAAkBoU,IAAM7W,GAC9BiR,EAAQrT,KAAMiZ,EAIhB,OAAO5F,IAIJ6F,EAAgB1Y,EAAOkQ,KAAK5E,MAAMvB,aAElC4O,EAAa,gCAIbC,EAAY,gBAGhB,SAASC,GAAQ1I,EAAU2I,EAAWhG,GACrC,GAAK9S,EAAOiD,WAAY6V,GACvB,MAAO9Y,GAAO6F,KAAMsK,EAAU,SAAUvO,EAAMC,GAE7C,QAASiX,EAAU7X,KAAMW,EAAMC,EAAGD,KAAWkR,GAK/C,IAAKgG,EAAUzU,SACd,MAAOrE,GAAO6F,KAAMsK,EAAU,SAAUvO,GACvC,MAASA,KAASkX,IAAgBhG,GAKpC,IAA0B,gBAAdgG,GAAyB,CACpC,GAAKF,EAAU3M,KAAM6M,GACpB,MAAO9Y,GAAO6O,OAAQiK,EAAW3I,EAAU2C,EAG5CgG,GAAY9Y,EAAO6O,OAAQiK,EAAW3I,GAGvC,MAAOnQ,GAAO6F,KAAMsK,EAAU,SAAUvO,GACvC,MAASnC,GAAQwB,KAAM6X,EAAWlX,GAAS,KAASkR,IAItD9S,EAAO6O,OAAS,SAAUqB,EAAM7O,EAAOyR,GACtC,GAAIlR,GAAOP,EAAO,EAMlB,OAJKyR,KACJ5C,EAAO,QAAUA,EAAO,KAGD,IAAjB7O,EAAMN,QAAkC,IAAlBa,EAAKyC,SACjCrE,EAAO4O,KAAKO,gBAAiBvN,EAAMsO,IAAWtO,MAC9C5B,EAAO4O,KAAK5I,QAASkK,EAAMlQ,EAAO6F,KAAMxE,EAAO,SAAUO,GACxD,MAAyB,KAAlBA,EAAKyC,aAIfrE,EAAOG,GAAGqC,QACToM,KAAM,SAAU3O,GACf,GAAI4B,GACHM,EAAMhD,KAAK4B,OACXO,KACAyX,EAAO5Z,IAER,IAAyB,gBAAbc,GACX,MAAOd,MAAKiC,UAAWpB,EAAQC,GAAW4O,OAAQ,WACjD,IAAMhN,EAAI,EAAOM,EAAJN,EAASA,IACrB,GAAK7B,EAAO4H,SAAUmR,EAAMlX,GAAK1C,MAChC,OAAO,IAMX,KAAM0C,EAAI,EAAOM,EAAJN,EAASA,IACrB7B,EAAO4O,KAAM3O,EAAU8Y,EAAMlX,GAAKP,EAMnC,OAFAA,GAAMnC,KAAKiC,UAAWe,EAAM,EAAInC,EAAOmY,OAAQ7W,GAAQA,GACvDA,EAAIrB,SAAWd,KAAKc,SAAWd,KAAKc,SAAW,IAAMA,EAAWA,EACzDqB,GAERuN,OAAQ,SAAU5O,GACjB,MAAOd,MAAKiC,UAAWyX,EAAQ1Z,KAAMc,OAAgB,KAEtD6S,IAAK,SAAU7S,GACd,MAAOd,MAAKiC,UAAWyX,EAAQ1Z,KAAMc,OAAgB,KAEtDsY,GAAI,SAAUtY,GACb,QAAS4Y,EACR1Z,KAIoB,gBAAbc,IAAyByY,EAAczM,KAAMhM,GACnDD,EAAQC,GACRA,OACD,GACCc,SASJ,IAAIiY,GAKH7O,EAAa,sCAEb/J,EAAOJ,EAAOG,GAAGC,KAAO,SAAUH,EAAUC,EAASqT,GACpD,GAAIjI,GAAO1J,CAGX,KAAM3B,EACL,MAAOd,KAQR,IAHAoU,EAAOA,GAAQyF,EAGU,gBAAb/Y,GAAwB,CAanC,GAPCqL,EALsB,MAAlBrL,EAAU,IACsB,MAApCA,EAAUA,EAASc,OAAS,IAC5Bd,EAASc,QAAU,GAGT,KAAMd,EAAU,MAGlBkK,EAAWwB,KAAM1L,IAIrBqL,IAAWA,EAAO,IAAQpL,EAkDxB,OAAMA,GAAWA,EAAQW,QACtBX,GAAWqT,GAAO3E,KAAM3O,GAK1Bd,KAAK2B,YAAaZ,GAAU0O,KAAM3O,EArDzC,IAAKqL,EAAO,GAAM,CAYjB,GAXApL,EAAUA,YAAmBF,GAASE,EAAS,GAAMA,EAIrDF,EAAOuB,MAAOpC,KAAMa,EAAOiZ,UAC1B3N,EAAO,GACPpL,GAAWA,EAAQmE,SAAWnE,EAAQwL,eAAiBxL,EAAUnB,GACjE,IAII4Z,EAAW1M,KAAMX,EAAO,KAAStL,EAAOkD,cAAehD,GAC3D,IAAMoL,IAASpL,GAGTF,EAAOiD,WAAY9D,KAAMmM,IAC7BnM,KAAMmM,GAASpL,EAASoL,IAIxBnM,KAAKiR,KAAM9E,EAAOpL,EAASoL,GAK9B,OAAOnM,MAiBP,MAbAyC,GAAO7C,EAAS6M,eAAgBN,EAAO,IAIlC1J,GAAQA,EAAKqD,aAGjB9F,KAAK4B,OAAS,EACd5B,KAAM,GAAMyC,GAGbzC,KAAKe,QAAUnB,EACfI,KAAKc,SAAWA,EACTd,KAcH,MAAKc,GAASoE,UACpBlF,KAAKe,QAAUf,KAAM,GAAMc,EAC3Bd,KAAK4B,OAAS,EACP5B,MAIIa,EAAOiD,WAAYhD,GACRmD,SAAfmQ,EAAK2F,MACX3F,EAAK2F,MAAOjZ,GAGZA,EAAUD,IAGeoD,SAAtBnD,EAASA,WACbd,KAAKc,SAAWA,EAASA,SACzBd,KAAKe,QAAUD,EAASC,SAGlBF,EAAOwF,UAAWvF,EAAUd,OAIrCiB,GAAKQ,UAAYZ,EAAOG,GAGxB6Y,EAAahZ,EAAQjB,EAGrB,IAAIoa,GAAe,iCAGlBC,GACCC,UAAU,EACVC,UAAU,EACVC,MAAM,EACNC,MAAM,EAGRxZ,GAAOG,GAAGqC,QACTyQ,IAAK,SAAUlQ,GACd,GAAI0W,GAAUzZ,EAAQ+C,EAAQ5D,MAC7Bua,EAAID,EAAQ1Y,MAEb,OAAO5B,MAAK0P,OAAQ,WAEnB,IADA,GAAIhN,GAAI,EACI6X,EAAJ7X,EAAOA,IACd,GAAK7B,EAAO4H,SAAUzI,KAAMsa,EAAS5X,IACpC,OAAO,KAMX8X,QAAS,SAAU7I,EAAW5Q,GAS7B,IARA,GAAIoN,GACHzL,EAAI,EACJ6X,EAAIva,KAAK4B,OACT8R,KACA+G,EAAMlB,EAAczM,KAAM6E,IAAoC,gBAAdA,GAC/C9Q,EAAQ8Q,EAAW5Q,GAAWf,KAAKe,SACnC,EAEUwZ,EAAJ7X,EAAOA,IACd,IAAMyL,EAAMnO,KAAM0C,GAAKyL,GAAOA,IAAQpN,EAASoN,EAAMA,EAAIrI,WAGxD,GAAKqI,EAAIjJ,SAAW,KAAQuV,EAC3BA,EAAIC,MAAOvM,GAAQ,GAGF,IAAjBA,EAAIjJ,UACHrE,EAAO4O,KAAKO,gBAAiB7B,EAAKwD,IAAgB,CAEnD+B,EAAQrT,KAAM8N,EACd,OAKH,MAAOnO,MAAKiC,UAAWyR,EAAQ9R,OAAS,EAAIf,EAAOuQ,WAAYsC,GAAYA,IAI5EgH,MAAO,SAAUjY,GAGhB,MAAMA,GAKe,gBAATA,GACJnC,EAAQwB,KAAMjB,EAAQ4B,GAAQzC,KAAM,IAIrCM,EAAQwB,KAAM9B,KAGpByC,EAAKf,OAASe,EAAM,GAAMA,GAZjBzC,KAAM,IAAOA,KAAM,GAAI8F,WAAe9F,KAAK6C,QAAQ8X,UAAU/Y,OAAS,IAgBjFgZ,IAAK,SAAU9Z,EAAUC,GACxB,MAAOf,MAAKiC,UACXpB,EAAOuQ,WACNvQ,EAAOuB,MAAOpC,KAAK+B,MAAOlB,EAAQC,EAAUC,OAK/C8Z,QAAS,SAAU/Z,GAClB,MAAOd,MAAK4a,IAAiB,MAAZ9Z,EAChBd,KAAKqC,WAAarC,KAAKqC,WAAWqN,OAAQ5O,MAK7C,SAASga,GAAS3M,EAAK4D,GACtB,OAAU5D,EAAMA,EAAK4D,KAA4B,IAAjB5D,EAAIjJ,UACpC,MAAOiJ,GAGRtN,EAAOyB,MACNyM,OAAQ,SAAUtM,GACjB,GAAIsM,GAAStM,EAAKqD,UAClB,OAAOiJ,IAA8B,KAApBA,EAAO7J,SAAkB6J,EAAS,MAEpDgM,QAAS,SAAUtY,GAClB,MAAOsP,GAAKtP,EAAM,eAEnBuY,aAAc,SAAUvY,EAAMC,EAAGwW,GAChC,MAAOnH,GAAKtP,EAAM,aAAcyW,IAEjCkB,KAAM,SAAU3X,GACf,MAAOqY,GAASrY,EAAM,gBAEvB4X,KAAM,SAAU5X,GACf,MAAOqY,GAASrY,EAAM,oBAEvBwY,QAAS,SAAUxY,GAClB,MAAOsP,GAAKtP,EAAM,gBAEnBkY,QAAS,SAAUlY,GAClB,MAAOsP,GAAKtP,EAAM,oBAEnByY,UAAW,SAAUzY,EAAMC,EAAGwW,GAC7B,MAAOnH,GAAKtP,EAAM,cAAeyW,IAElCiC,UAAW,SAAU1Y,EAAMC,EAAGwW,GAC7B,MAAOnH,GAAKtP,EAAM,kBAAmByW,IAEtCG,SAAU,SAAU5W,GACnB,MAAO4W,IAAY5W,EAAKqD,gBAAmB2L,WAAYhP,IAExDyX,SAAU,SAAUzX,GACnB,MAAO4W,GAAU5W,EAAKgP,aAEvB0I,SAAU,SAAU1X,GACnB,MAAOA,GAAK2Y,iBAAmBva,EAAOuB,SAAWK,EAAKmJ,cAErD,SAAUrI,EAAMvC,GAClBH,EAAOG,GAAIuC,GAAS,SAAU2V,EAAOpY,GACpC,GAAI4S,GAAU7S,EAAO2B,IAAKxC,KAAMgB,EAAIkY,EAuBpC,OArB0B,UAArB3V,EAAKpD,MAAO,MAChBW,EAAWoY,GAGPpY,GAAgC,gBAAbA,KACvB4S,EAAU7S,EAAO6O,OAAQ5O,EAAU4S,IAG/B1T,KAAK4B,OAAS,IAGZqY,EAAkB1W,IACvB1C,EAAOuQ,WAAYsC,GAIfsG,EAAalN,KAAMvJ,IACvBmQ,EAAQ2H,WAIHrb,KAAKiC,UAAWyR,KAGzB,IAAI4H,GAAY,MAKhB,SAASC,GAAejY,GACvB,GAAIkY,KAIJ,OAHA3a,GAAOyB,KAAMgB,EAAQ6I,MAAOmP,OAAmB,SAAUjQ,EAAGoQ,GAC3DD,EAAQC,IAAS,IAEXD,EAyBR3a,EAAO6a,UAAY,SAAUpY,GAI5BA,EAA6B,gBAAZA,GAChBiY,EAAejY,GACfzC,EAAOwC,UAAYC,EAEpB,IACCqY,GAGAC,EAGAC,EAGAC,EAGAvS,KAGAwS,KAGAC,EAAc,GAGdC,EAAO,WAQN,IALAH,EAASxY,EAAQ4Y,KAIjBL,EAAQF,GAAS,EACTI,EAAMna,OAAQoa,EAAc,GAAK,CACxCJ,EAASG,EAAMrO,OACf,SAAUsO,EAAczS,EAAK3H,OAGvB2H,EAAMyS,GAAcrZ,MAAOiZ,EAAQ,GAAKA,EAAQ,OAAU,GAC9DtY,EAAQ6Y,cAGRH,EAAczS,EAAK3H,OACnBga,GAAS,GAMNtY,EAAQsY,SACbA,GAAS,GAGVD,GAAS,EAGJG,IAIHvS,EADIqS,KAKG,KAMVhC,GAGCgB,IAAK,WA2BJ,MA1BKrR,KAGCqS,IAAWD,IACfK,EAAczS,EAAK3H,OAAS,EAC5Bma,EAAM1b,KAAMub,IAGb,QAAWhB,GAAKxT,GACfvG,EAAOyB,KAAM8E,EAAM,SAAUiE,EAAGtE,GAC1BlG,EAAOiD,WAAYiD,GACjBzD,EAAQ0V,QAAWY,EAAK9F,IAAK/M,IAClCwC,EAAKlJ,KAAM0G,GAEDA,GAAOA,EAAInF,QAAiC,WAAvBf,EAAO8D,KAAMoC,IAG7C6T,EAAK7T,MAGHnE,WAEAgZ,IAAWD,GACfM,KAGKjc,MAIRoc,OAAQ,WAYP,MAXAvb,GAAOyB,KAAMM,UAAW,SAAUyI,EAAGtE,GACpC,GAAI2T,EACJ,QAAUA,EAAQ7Z,EAAO2F,QAASO,EAAKwC,EAAMmR,IAAY,GACxDnR,EAAKnG,OAAQsX,EAAO,GAGNsB,GAATtB,GACJsB,MAIIhc,MAKR8T,IAAK,SAAU9S,GACd,MAAOA,GACNH,EAAO2F,QAASxF,EAAIuI,GAAS,GAC7BA,EAAK3H,OAAS,GAIhBmT,MAAO,WAIN,MAHKxL,KACJA,MAEMvJ,MAMRqc,QAAS,WAGR,MAFAP,GAASC,KACTxS,EAAOqS,EAAS,GACT5b,MAER2U,SAAU,WACT,OAAQpL,GAMT+S,KAAM,WAKL,MAJAR,GAASC,KACHH,IACLrS,EAAOqS,EAAS,IAEV5b,MAER8b,OAAQ,WACP,QAASA,GAIVS,SAAU,SAAUxb,EAASqG,GAS5B,MARM0U,KACL1U,EAAOA,MACPA,GAASrG,EAASqG,EAAKjH,MAAQiH,EAAKjH,QAAUiH,GAC9C2U,EAAM1b,KAAM+G,GACNuU,GACLM,KAGKjc,MAIRic,KAAM,WAEL,MADArC,GAAK2C,SAAUvc,KAAM4C,WACd5C,MAIR6b,MAAO,WACN,QAASA,GAIZ,OAAOjC,IAIR/Y,EAAOwC,QAENmZ,SAAU,SAAUC,GACnB,GAAIC,KAGA,UAAW,OAAQ7b,EAAO6a,UAAW,eAAiB,aACtD,SAAU,OAAQ7a,EAAO6a,UAAW,eAAiB,aACrD,SAAU,WAAY7a,EAAO6a,UAAW,YAE3CiB,EAAQ,UACRC,GACCD,MAAO,WACN,MAAOA,IAERE,OAAQ,WAEP,MADAC,GAASlU,KAAMhG,WAAYma,KAAMna,WAC1B5C,MAERgd,KAAM,WACL,GAAIC,GAAMra,SACV,OAAO/B,GAAO2b,SAAU,SAAUU,GACjCrc,EAAOyB,KAAMoa,EAAQ,SAAUha,EAAGya,GACjC,GAAInc,GAAKH,EAAOiD,WAAYmZ,EAAKva,KAASua,EAAKva,EAG/Coa,GAAUK,EAAO,IAAO,WACvB,GAAIC,GAAWpc,GAAMA,EAAG2B,MAAO3C,KAAM4C,UAChCwa,IAAYvc,EAAOiD,WAAYsZ,EAASR,SAC5CQ,EAASR,UACPS,SAAUH,EAASI,QACnB1U,KAAMsU,EAASK,SACfR,KAAMG,EAASM,QAEjBN,EAAUC,EAAO,GAAM,QACtBnd,OAAS4c,EAAUM,EAASN,UAAY5c,KACxCgB,GAAOoc,GAAaxa,eAKxBqa,EAAM,OACHL,WAKLA,QAAS,SAAUlY,GAClB,MAAc,OAAPA,EAAc7D,EAAOwC,OAAQqB,EAAKkY,GAAYA,IAGvDE,IAyCD,OAtCAF,GAAQa,KAAOb,EAAQI,KAGvBnc,EAAOyB,KAAMoa,EAAQ,SAAUha,EAAGya,GACjC,GAAI5T,GAAO4T,EAAO,GACjBO,EAAcP,EAAO,EAGtBP,GAASO,EAAO,IAAQ5T,EAAKqR,IAGxB8C,GACJnU,EAAKqR,IAAK,WAGT+B,EAAQe,GAGNhB,EAAY,EAAJha,GAAS,GAAI2Z,QAASK,EAAQ,GAAK,GAAIJ,MAInDQ,EAAUK,EAAO,IAAQ,WAExB,MADAL,GAAUK,EAAO,GAAM,QAAUnd,OAAS8c,EAAWF,EAAU5c,KAAM4C,WAC9D5C,MAER8c,EAAUK,EAAO,GAAM,QAAW5T,EAAKgT,WAIxCK,EAAQA,QAASE,GAGZL,GACJA,EAAK3a,KAAMgb,EAAUA,GAIfA,GAIRa,KAAM,SAAUC,GACf,GAAIlb,GAAI,EACPmb,EAAgB1d,EAAM2B,KAAMc,WAC5BhB,EAASic,EAAcjc,OAGvBkc,EAAuB,IAAXlc,GACTgc,GAAe/c,EAAOiD,WAAY8Z,EAAYhB,SAAchb,EAAS,EAIxEkb,EAAyB,IAAdgB,EAAkBF,EAAc/c,EAAO2b,WAGlDuB,EAAa,SAAUrb,EAAGmU,EAAUmH,GACnC,MAAO,UAAUhX,GAChB6P,EAAUnU,GAAM1C,KAChBge,EAAQtb,GAAME,UAAUhB,OAAS,EAAIzB,EAAM2B,KAAMc,WAAcoE,EAC1DgX,IAAWC,EACfnB,EAASoB,WAAYrH,EAAUmH,KACfF,GAChBhB,EAASqB,YAAatH,EAAUmH,KAKnCC,EAAgBG,EAAkBC,CAGnC,IAAKzc,EAAS,EAIb,IAHAqc,EAAiB,GAAIrZ,OAAOhD,GAC5Bwc,EAAmB,GAAIxZ,OAAOhD,GAC9Byc,EAAkB,GAAIzZ,OAAOhD,GACjBA,EAAJc,EAAYA,IACdmb,EAAenb,IAAO7B,EAAOiD,WAAY+Z,EAAenb,GAAIka,SAChEiB,EAAenb,GAAIka,UACjBS,SAAUU,EAAYrb,EAAG0b,EAAkBH,IAC3CrV,KAAMmV,EAAYrb,EAAG2b,EAAiBR,IACtCd,KAAMD,EAASU,UAEfM,CAUL,OAJMA,IACLhB,EAASqB,YAAaE,EAAiBR,GAGjCf,EAASF,YAMlB,IAAI0B,EAEJzd,GAAOG,GAAG+Y,MAAQ,SAAU/Y,GAK3B,MAFAH,GAAOkZ,MAAM6C,UAAUhU,KAAM5H,GAEtBhB,MAGRa,EAAOwC,QAGNiB,SAAS,EAITia,UAAW,EAGXC,UAAW,SAAUC,GACfA,EACJ5d,EAAO0d,YAEP1d,EAAOkZ,OAAO,IAKhBA,MAAO,SAAU2E,IAGXA,KAAS,IAAS7d,EAAO0d,UAAY1d,EAAOyD,WAKjDzD,EAAOyD,SAAU,EAGZoa,KAAS,KAAU7d,EAAO0d,UAAY,IAK3CD,EAAUH,YAAave,GAAYiB,IAG9BA,EAAOG,GAAG2d,iBACd9d,EAAQjB,GAAW+e,eAAgB,SACnC9d,EAAQjB,GAAWgf,IAAK,cAQ3B,SAASC,KACRjf,EAASkf,oBAAqB,mBAAoBD,GAClD9e,EAAO+e,oBAAqB,OAAQD,GACpChe,EAAOkZ,QAGRlZ,EAAOkZ,MAAM6C,QAAU,SAAUlY,GAwBhC,MAvBM4Z,KAELA,EAAYzd,EAAO2b,WAMU,aAAxB5c,EAASmf,YACa,YAAxBnf,EAASmf,aAA6Bnf,EAASgP,gBAAgBoQ,SAGjEjf,EAAOkf,WAAYpe,EAAOkZ,QAK1Bna,EAASuP,iBAAkB,mBAAoB0P,GAG/C9e,EAAOoP,iBAAkB,OAAQ0P,KAG5BP,EAAU1B,QAASlY,IAI3B7D,EAAOkZ,MAAM6C,SAOb,IAAIsC,GAAS,SAAUhd,EAAOlB,EAAIiE,EAAK+B,EAAOmY,EAAWC,EAAUC,GAClE,GAAI3c,GAAI,EACPM,EAAMd,EAAMN,OACZ0d,EAAc,MAAPra,CAGR,IAA4B,WAAvBpE,EAAO8D,KAAMM,GAAqB,CACtCka,GAAY,CACZ,KAAMzc,IAAKuC,GACVia,EAAQhd,EAAOlB,EAAI0B,EAAGuC,EAAKvC,IAAK,EAAM0c,EAAUC,OAI3C,IAAepb,SAAV+C,IACXmY,GAAY,EAENte,EAAOiD,WAAYkD,KACxBqY,GAAM,GAGFC,IAGCD,GACJre,EAAGc,KAAMI,EAAO8E,GAChBhG,EAAK,OAILse,EAAOte,EACPA,EAAK,SAAUyB,EAAMwC,EAAK+B,GACzB,MAAOsY,GAAKxd,KAAMjB,EAAQ4B,GAAQuE,MAKhChG,GACJ,KAAYgC,EAAJN,EAASA,IAChB1B,EACCkB,EAAOQ,GAAKuC,EAAKoa,EACjBrY,EACAA,EAAMlF,KAAMI,EAAOQ,GAAKA,EAAG1B,EAAIkB,EAAOQ,GAAKuC,IAM/C,OAAOka,GACNjd,EAGAod,EACCte,EAAGc,KAAMI,GACTc,EAAMhC,EAAIkB,EAAO,GAAK+C,GAAQma,GAE7BG,EAAa,SAAUC,GAS1B,MAA0B,KAAnBA,EAAMta,UAAqC,IAAnBsa,EAAMta,YAAsBsa,EAAMta,SAMlE,SAASua,KACRzf,KAAKkE,QAAUrD,EAAOqD,QAAUub,EAAKC,MAGtCD,EAAKC,IAAM,EAEXD,EAAKhe,WAEJke,SAAU,SAAUH,EAAOI,GAC1B,GAAI5Y,GAAQ4Y,KAiBZ,OAbKJ,GAAMta,SACVsa,EAAOxf,KAAKkE,SAAY8C,EAMxBT,OAAOsZ,eAAgBL,EAAOxf,KAAKkE,SAClC8C,MAAOA,EACP8Y,UAAU,EACVC,cAAc,IAGTP,EAAOxf,KAAKkE,UAEpBsJ,MAAO,SAAUgS,GAKhB,IAAMD,EAAYC,GACjB,QAID,IAAIxY,GAAQwY,EAAOxf,KAAKkE,QA4BxB,OAzBM8C,KACLA,KAKKuY,EAAYC,KAIXA,EAAMta,SACVsa,EAAOxf,KAAKkE,SAAY8C,EAMxBT,OAAOsZ,eAAgBL,EAAOxf,KAAKkE,SAClC8C,MAAOA,EACP+Y,cAAc,MAMX/Y,GAERgZ,IAAK,SAAUR,EAAOS,EAAMjZ,GAC3B,GAAIkZ,GACH1S,EAAQxN,KAAKwN,MAAOgS,EAGrB,IAAqB,gBAATS,GACXzS,EAAOyS,GAASjZ,MAMhB,KAAMkZ,IAAQD,GACbzS,EAAO0S,GAASD,EAAMC,EAGxB,OAAO1S,IAERzL,IAAK,SAAUyd,EAAOva,GACrB,MAAehB,UAARgB,EACNjF,KAAKwN,MAAOgS,GACZA,EAAOxf,KAAKkE,UAAasb,EAAOxf,KAAKkE,SAAWe,IAElDia,OAAQ,SAAUM,EAAOva,EAAK+B,GAC7B,GAAImZ,EAaJ,OAAalc,UAARgB,GACCA,GAAsB,gBAARA,IAAgChB,SAAV+C,GAEzCmZ,EAASngB,KAAK+B,IAAKyd,EAAOva,GAERhB,SAAXkc,EACNA,EAASngB,KAAK+B,IAAKyd,EAAO3e,EAAOmF,UAAWf,MAS9CjF,KAAKggB,IAAKR,EAAOva,EAAK+B,GAIL/C,SAAV+C,EAAsBA,EAAQ/B,IAEtCmX,OAAQ,SAAUoD,EAAOva,GACxB,GAAIvC,GAAGa,EAAM6c,EACZ5S,EAAQgS,EAAOxf,KAAKkE,QAErB,IAAeD,SAAVuJ,EAAL,CAIA,GAAavJ,SAARgB,EACJjF,KAAK2f,SAAUH,OAET,CAGD3e,EAAOmD,QAASiB,GAQpB1B,EAAO0B,EAAI7E,OAAQ6E,EAAIzC,IAAK3B,EAAOmF,aAEnCoa,EAAQvf,EAAOmF,UAAWf,GAGrBA,IAAOuI,GACXjK,GAAS0B,EAAKmb,IAKd7c,EAAO6c,EACP7c,EAAOA,IAAQiK,IACZjK,GAAWA,EAAK4I,MAAOmP,SAI5B5Y,EAAIa,EAAK3B,MAET,OAAQc,UACA8K,GAAOjK,EAAMb,KAKTuB,SAARgB,GAAqBpE,EAAOsE,cAAeqI,MAM1CgS,EAAMta,SACVsa,EAAOxf,KAAKkE,SAAYD,aAEjBub,GAAOxf,KAAKkE,YAItBmc,QAAS,SAAUb,GAClB,GAAIhS,GAAQgS,EAAOxf,KAAKkE,QACxB,OAAiBD,UAAVuJ,IAAwB3M,EAAOsE,cAAeqI,IAGvD,IAAI8S,GAAW,GAAIb,GAEfc,EAAW,GAAId,GAcfe,EAAS,gCACZC,EAAa,QAEd,SAASC,GAAUje,EAAMwC,EAAKgb,GAC7B,GAAI1c,EAIJ,IAAcU,SAATgc,GAAwC,IAAlBxd,EAAKyC,SAI/B,GAHA3B,EAAO,QAAU0B,EAAIZ,QAASoc,EAAY,OAAQta,cAClD8Z,EAAOxd,EAAKsK,aAAcxJ,GAEL,gBAAT0c,GAAoB,CAC/B,IACCA,EAAgB,SAATA,GAAkB,EACf,UAATA,GAAmB,EACV,SAATA,EAAkB,MAGjBA,EAAO,KAAOA,GAAQA,EACvBO,EAAO1T,KAAMmT,GAASpf,EAAO8f,UAAWV,GACxCA;CACA,MAAQpU,IAGV0U,EAASP,IAAKvd,EAAMwC,EAAKgb,OAEzBA,GAAOhc,MAGT,OAAOgc,GAGRpf,EAAOwC,QACNgd,QAAS,SAAU5d,GAClB,MAAO8d,GAASF,QAAS5d,IAAU6d,EAASD,QAAS5d,IAGtDwd,KAAM,SAAUxd,EAAMc,EAAM0c,GAC3B,MAAOM,GAASrB,OAAQzc,EAAMc,EAAM0c,IAGrCW,WAAY,SAAUne,EAAMc,GAC3Bgd,EAASnE,OAAQ3Z,EAAMc,IAKxBsd,MAAO,SAAUpe,EAAMc,EAAM0c,GAC5B,MAAOK,GAASpB,OAAQzc,EAAMc,EAAM0c,IAGrCa,YAAa,SAAUre,EAAMc,GAC5B+c,EAASlE,OAAQ3Z,EAAMc,MAIzB1C,EAAOG,GAAGqC,QACT4c,KAAM,SAAUhb,EAAK+B,GACpB,GAAItE,GAAGa,EAAM0c,EACZxd,EAAOzC,KAAM,GACb+N,EAAQtL,GAAQA,EAAKkH,UAGtB,IAAa1F,SAARgB,EAAoB,CACxB,GAAKjF,KAAK4B,SACTqe,EAAOM,EAASxe,IAAKU,GAEE,IAAlBA,EAAKyC,WAAmBob,EAASve,IAAKU,EAAM,iBAAmB,CACnEC,EAAIqL,EAAMnM,MACV,OAAQc,IAIFqL,EAAOrL,KACXa,EAAOwK,EAAOrL,GAAIa,KACe,IAA5BA,EAAKjD,QAAS,WAClBiD,EAAO1C,EAAOmF,UAAWzC,EAAKpD,MAAO,IACrCugB,EAAUje,EAAMc,EAAM0c,EAAM1c,KAI/B+c,GAASN,IAAKvd,EAAM,gBAAgB,GAItC,MAAOwd,GAIR,MAAoB,gBAARhb,GACJjF,KAAKsC,KAAM,WACjBie,EAASP,IAAKhgB,KAAMiF,KAIfia,EAAQlf,KAAM,SAAUgH,GAC9B,GAAIiZ,GAAMc,CAOV,IAAKte,GAAkBwB,SAAV+C,EAAb,CAUC,GANAiZ,EAAOM,EAASxe,IAAKU,EAAMwC,IAI1Bsb,EAASxe,IAAKU,EAAMwC,EAAIZ,QAASoc,EAAY,OAAQta,eAExClC,SAATgc,EACJ,MAAOA,EAQR,IALAc,EAAWlgB,EAAOmF,UAAWf,GAI7Bgb,EAAOM,EAASxe,IAAKU,EAAMse,GACb9c,SAATgc,EACJ,MAAOA,EAMR,IADAA,EAAOS,EAAUje,EAAMse,EAAU9c,QACnBA,SAATgc,EACJ,MAAOA,OAQTc,GAAWlgB,EAAOmF,UAAWf,GAC7BjF,KAAKsC,KAAM,WAIV,GAAI2d,GAAOM,EAASxe,IAAK/B,KAAM+gB,EAK/BR,GAASP,IAAKhgB,KAAM+gB,EAAU/Z,GAKzB/B,EAAI3E,QAAS,KAAQ,IAAe2D,SAATgc,GAC/BM,EAASP,IAAKhgB,KAAMiF,EAAK+B,MAGzB,KAAMA,EAAOpE,UAAUhB,OAAS,EAAG,MAAM,IAG7Cgf,WAAY,SAAU3b,GACrB,MAAOjF,MAAKsC,KAAM,WACjBie,EAASnE,OAAQpc,KAAMiF,QAM1BpE,EAAOwC,QACN0Y,MAAO,SAAUtZ,EAAMkC,EAAMsb,GAC5B,GAAIlE,EAEJ,OAAKtZ,IACJkC,GAASA,GAAQ,MAAS,QAC1BoX,EAAQuE,EAASve,IAAKU,EAAMkC,GAGvBsb,KACElE,GAASlb,EAAOmD,QAASic,GAC9BlE,EAAQuE,EAASpB,OAAQzc,EAAMkC,EAAM9D,EAAOwF,UAAW4Z,IAEvDlE,EAAM1b,KAAM4f,IAGPlE,OAZR,QAgBDiF,QAAS,SAAUve,EAAMkC,GACxBA,EAAOA,GAAQ,IAEf,IAAIoX,GAAQlb,EAAOkb,MAAOtZ,EAAMkC,GAC/Bsc,EAAclF,EAAMna,OACpBZ,EAAK+a,EAAMrO,QACXwT,EAAQrgB,EAAOsgB,YAAa1e,EAAMkC,GAClCyV,EAAO,WACNvZ,EAAOmgB,QAASve,EAAMkC,GAIZ,gBAAP3D,IACJA,EAAK+a,EAAMrO,QACXuT,KAGIjgB,IAIU,OAAT2D,GACJoX,EAAMjL,QAAS,oBAIToQ,GAAME,KACbpgB,EAAGc,KAAMW,EAAM2X,EAAM8G,KAGhBD,GAAeC,GACpBA,EAAMnM,MAAMkH,QAKdkF,YAAa,SAAU1e,EAAMkC,GAC5B,GAAIM,GAAMN,EAAO,YACjB,OAAO2b,GAASve,IAAKU,EAAMwC,IAASqb,EAASpB,OAAQzc,EAAMwC,GAC1D8P,MAAOlU,EAAO6a,UAAW,eAAgBd,IAAK,WAC7C0F,EAASlE,OAAQ3Z,GAAQkC,EAAO,QAASM,WAM7CpE,EAAOG,GAAGqC,QACT0Y,MAAO,SAAUpX,EAAMsb,GACtB,GAAIoB,GAAS,CAQb,OANqB,gBAAT1c,KACXsb,EAAOtb,EACPA,EAAO,KACP0c,KAGIze,UAAUhB,OAASyf,EAChBxgB,EAAOkb,MAAO/b,KAAM,GAAK2E,GAGjBV,SAATgc,EACNjgB,KACAA,KAAKsC,KAAM,WACV,GAAIyZ,GAAQlb,EAAOkb,MAAO/b,KAAM2E,EAAMsb,EAGtCpf,GAAOsgB,YAAanhB,KAAM2E,GAEZ,OAATA,GAAgC,eAAfoX,EAAO,IAC5Blb,EAAOmgB,QAAShhB,KAAM2E,MAI1Bqc,QAAS,SAAUrc,GAClB,MAAO3E,MAAKsC,KAAM,WACjBzB,EAAOmgB,QAAShhB,KAAM2E,MAGxB2c,WAAY,SAAU3c,GACrB,MAAO3E,MAAK+b,MAAOpX,GAAQ,UAK5BiY,QAAS,SAAUjY,EAAMD,GACxB,GAAIyC,GACHoa,EAAQ,EACRC,EAAQ3gB,EAAO2b,WACfxL,EAAWhR,KACX0C,EAAI1C,KAAK4B,OACT2b,EAAU,aACCgE,GACTC,EAAMrD,YAAanN,GAAYA,IAIb,iBAATrM,KACXD,EAAMC,EACNA,EAAOV,QAERU,EAAOA,GAAQ,IAEf,OAAQjC,IACPyE,EAAMmZ,EAASve,IAAKiP,EAAUtO,GAAKiC,EAAO,cACrCwC,GAAOA,EAAI4N,QACfwM,IACApa,EAAI4N,MAAM6F,IAAK2C,GAIjB,OADAA,KACOiE,EAAM5E,QAASlY,KAGxB,IAAI+c,GAAO,sCAA0CC,OAEjDC,EAAU,GAAI7X,QAAQ,iBAAmB2X,EAAO,cAAe,KAG/DG,GAAc,MAAO,QAAS,SAAU,QAExCC,EAAW,SAAUpf,EAAMqf,GAK7B,MADArf,GAAOqf,GAAMrf,EAC4B,SAAlC5B,EAAOkhB,IAAKtf,EAAM,aACvB5B,EAAO4H,SAAUhG,EAAK8J,cAAe9J,GAKzC,SAASuf,GAAWvf,EAAMyd,EAAM+B,EAAYC,GAC3C,GAAIC,GACHC,EAAQ,EACRC,EAAgB,GAChBC,EAAeJ,EACd,WAAa,MAAOA,GAAM/T,OAC1B,WAAa,MAAOtN,GAAOkhB,IAAKtf,EAAMyd,EAAM,KAC7CN,EAAU0C,IACVC,EAAON,GAAcA,EAAY,KAASphB,EAAO2hB,UAAWtC,GAAS,GAAK,MAG1EuC,GAAkB5hB,EAAO2hB,UAAWtC,IAAmB,OAATqC,IAAkB3C,IAC/D+B,EAAQnV,KAAM3L,EAAOkhB,IAAKtf,EAAMyd,GAElC,IAAKuC,GAAiBA,EAAe,KAAQF,EAAO,CAGnDA,EAAOA,GAAQE,EAAe,GAG9BR,EAAaA,MAGbQ,GAAiB7C,GAAW,CAE5B,GAICwC,GAAQA,GAAS,KAGjBK,GAAgCL,EAChCvhB,EAAO6hB,MAAOjgB,EAAMyd,EAAMuC,EAAgBF,SAK1CH,KAAYA,EAAQE,IAAiB1C,IAAuB,IAAVwC,KAAiBC,GAiBrE,MAbKJ,KACJQ,GAAiBA,IAAkB7C,GAAW,EAG9CuC,EAAWF,EAAY,GACtBQ,GAAkBR,EAAY,GAAM,GAAMA,EAAY,IACrDA,EAAY,GACTC,IACJA,EAAMK,KAAOA,EACbL,EAAM/O,MAAQsP,EACdP,EAAMhf,IAAMif,IAGPA,EAER,GAAIQ,GAAiB,wBAEjBC,EAAW,aAEXC,EAAc,4BAKdC,GAGHC,QAAU,EAAG,+BAAgC,aAK7CC,OAAS,EAAG,UAAW,YACvBC,KAAO,EAAG,oBAAqB,uBAC/BC,IAAM,EAAG,iBAAkB,oBAC3BC,IAAM,EAAG,qBAAsB,yBAE/BC,UAAY,EAAG,GAAI,IAIpBN,GAAQO,SAAWP,EAAQC,OAE3BD,EAAQQ,MAAQR,EAAQS,MAAQT,EAAQU,SAAWV,EAAQW,QAAUX,EAAQE,MAC7EF,EAAQY,GAAKZ,EAAQK,EAGrB,SAASQ,GAAQ5iB,EAAS8O,GAIzB,GAAI1N,GAA8C,mBAAjCpB,GAAQ4L,qBACvB5L,EAAQ4L,qBAAsBkD,GAAO,KACD,mBAA7B9O,GAAQqM,iBACdrM,EAAQqM,iBAAkByC,GAAO,OAGpC,OAAe5L,UAAR4L,GAAqBA,GAAOhP,EAAOqF,SAAUnF,EAAS8O,GAC5DhP,EAAOuB,OAASrB,GAAWoB,GAC3BA,EAKF,QAASyhB,IAAe1hB,EAAO2hB,GAI9B,IAHA,GAAInhB,GAAI,EACP6X,EAAIrY,EAAMN,OAEC2Y,EAAJ7X,EAAOA,IACd4d,EAASN,IACR9d,EAAOQ,GACP,cACCmhB,GAAevD,EAASve,IAAK8hB,EAAanhB,GAAK,eAMnD,GAAIohB,IAAQ,WAEZ,SAASC,IAAe7hB,EAAOnB,EAASijB,EAASC,EAAWC,GAO3D,IANA,GAAIzhB,GAAM0E,EAAK0I,EAAKsU,EAAM1b,EAAUxF,EACnCmhB,EAAWrjB,EAAQsjB,yBACnBC,KACA5hB,EAAI,EACJ6X,EAAIrY,EAAMN,OAEC2Y,EAAJ7X,EAAOA,IAGd,GAFAD,EAAOP,EAAOQ,GAETD,GAAiB,IAATA,EAGZ,GAA6B,WAAxB5B,EAAO8D,KAAMlC,GAIjB5B,EAAOuB,MAAOkiB,EAAO7hB,EAAKyC,UAAazC,GAASA,OAG1C,IAAMqhB,GAAMhX,KAAMrK,GAIlB,CACN0E,EAAMA,GAAOid,EAASve,YAAa9E,EAAQ2E,cAAe,QAG1DmK,GAAQ+S,EAASpW,KAAM/J,KAAY,GAAI,KAAQ,GAAI0D,cACnDge,EAAOrB,EAASjT,IAASiT,EAAQM,SACjCjc,EAAI2I,UAAYqU,EAAM,GAAMtjB,EAAO0jB,cAAe9hB,GAAS0hB,EAAM,GAGjElhB,EAAIkhB,EAAM,EACV,OAAQlhB,IACPkE,EAAMA,EAAIkM,SAKXxS,GAAOuB,MAAOkiB,EAAOnd,EAAIyE,YAGzBzE,EAAMid,EAAS3S,WAGftK,EAAIqK,YAAc,OAzBlB8S,GAAMjkB,KAAMU,EAAQyjB,eAAgB/hB,GA+BvC2hB,GAAS5S,YAAc,GAEvB9O,EAAI,CACJ,OAAUD,EAAO6hB,EAAO5hB,KAGvB,GAAKuhB,GAAapjB,EAAO2F,QAAS/D,EAAMwhB,GAAc,GAChDC,GACJA,EAAQ7jB,KAAMoC,OAgBhB,IAXAgG,EAAW5H,EAAO4H,SAAUhG,EAAK8J,cAAe9J,GAGhD0E,EAAMwc,EAAQS,EAASve,YAAapD,GAAQ,UAGvCgG,GACJmb,GAAezc,GAIX6c,EAAU,CACd/gB,EAAI,CACJ,OAAUR,EAAO0E,EAAKlE,KAChB4f,EAAY/V,KAAMrK,EAAKkC,MAAQ,KACnCqf,EAAQ3jB,KAAMoC,GAMlB,MAAO2hB,IAIR,WACC,GAAIA,GAAWxkB,EAASykB,yBACvBxW,EAAMuW,EAASve,YAAajG,EAAS8F,cAAe,QACpDqK,EAAQnQ,EAAS8F,cAAe,QAMjCqK,GAAM/C,aAAc,OAAQ,SAC5B+C,EAAM/C,aAAc,UAAW,WAC/B+C,EAAM/C,aAAc,OAAQ,KAE5Ba,EAAIhI,YAAakK,GAIjBpP,EAAQ8jB,WAAa5W,EAAI6W,WAAW,GAAOA,WAAW,GAAOrR,UAAUuB,QAIvE/G,EAAIiC,UAAY,yBAChBnP,EAAQgkB,iBAAmB9W,EAAI6W,WAAW,GAAOrR,UAAU0F,eAI5D,IACC6L,IAAY,OACZC,GAAc,iDACdC,GAAiB,qBAElB,SAASC,MACR,OAAO,EAGR,QAASC,MACR,OAAO,EAKR,QAASC,MACR,IACC,MAAOrlB,GAAS0U,cACf,MAAQ4Q,KAGX,QAASC,IAAI1iB,EAAM2iB,EAAOtkB,EAAUmf,EAAMjf,EAAIqkB,GAC7C,GAAIC,GAAQ3gB,CAGZ,IAAsB,gBAAVygB,GAAqB,CAGP,gBAAbtkB,KAGXmf,EAAOA,GAAQnf,EACfA,EAAWmD,OAEZ,KAAMU,IAAQygB,GACbD,GAAI1iB,EAAMkC,EAAM7D,EAAUmf,EAAMmF,EAAOzgB,GAAQ0gB,EAEhD,OAAO5iB,GAsBR,GAnBa,MAARwd,GAAsB,MAANjf,GAGpBA,EAAKF,EACLmf,EAAOnf,EAAWmD,QACD,MAANjD,IACc,gBAAbF,IAGXE,EAAKif,EACLA,EAAOhc,SAIPjD,EAAKif,EACLA,EAAOnf,EACPA,EAAWmD,SAGRjD,KAAO,EACXA,EAAKgkB,OACC,KAAMhkB,EACZ,MAAOyB,EAeR,OAZa,KAAR4iB,IACJC,EAAStkB,EACTA,EAAK,SAAUukB,GAId,MADA1kB,KAAS+d,IAAK2G,GACPD,EAAO3iB,MAAO3C,KAAM4C,YAI5B5B,EAAGiG,KAAOqe,EAAOre,OAAUqe,EAAOre,KAAOpG,EAAOoG,SAE1CxE,EAAKH,KAAM,WACjBzB,EAAO0kB,MAAM3K,IAAK5a,KAAMolB,EAAOpkB,EAAIif,EAAMnf,KAQ3CD,EAAO0kB,OAEN/lB,UAEAob,IAAK,SAAUnY,EAAM2iB,EAAOpX,EAASiS,EAAMnf,GAE1C,GAAI0kB,GAAaC,EAAate,EAC7Bue,EAAQC,EAAGC,EACXC,EAASC,EAAUnhB,EAAMohB,EAAYC,EACrCC,EAAW3F,EAASve,IAAKU,EAG1B,IAAMwjB,EAAN,CAKKjY,EAAQA,UACZwX,EAAcxX,EACdA,EAAUwX,EAAYxX,QACtBlN,EAAW0kB,EAAY1kB,UAIlBkN,EAAQ/G,OACb+G,EAAQ/G,KAAOpG,EAAOoG,SAIfye,EAASO,EAASP,UACzBA,EAASO,EAASP,YAEXD,EAAcQ,EAASC,UAC9BT,EAAcQ,EAASC,OAAS,SAAUra,GAIzC,MAAyB,mBAAXhL,IAA0BA,EAAO0kB,MAAMY,YAActa,EAAElH,KACpE9D,EAAO0kB,MAAMa,SAASzjB,MAAOF,EAAMG,WAAcqB,SAKpDmhB,GAAUA,GAAS,IAAKjZ,MAAOmP,KAAiB,IAChDqK,EAAIP,EAAMxjB,MACV,OAAQ+jB,IACPxe,EAAM2d,GAAetY,KAAM4Y,EAAOO,QAClChhB,EAAOqhB,EAAW7e,EAAK,GACvB4e,GAAe5e,EAAK,IAAO,IAAKM,MAAO,KAAMtE,OAGvCwB,IAKNkhB,EAAUhlB,EAAO0kB,MAAMM,QAASlhB,OAGhCA,GAAS7D,EAAW+kB,EAAQQ,aAAeR,EAAQS,WAAc3hB,EAGjEkhB,EAAUhlB,EAAO0kB,MAAMM,QAASlhB,OAGhCihB,EAAY/kB,EAAOwC,QAClBsB,KAAMA,EACNqhB,SAAUA,EACV/F,KAAMA,EACNjS,QAASA,EACT/G,KAAM+G,EAAQ/G,KACdnG,SAAUA,EACV8J,aAAc9J,GAAYD,EAAOkQ,KAAK5E,MAAMvB,aAAakC,KAAMhM,GAC/DylB,UAAWR,EAAW7Y,KAAM,MAC1BsY,IAGKM,EAAWJ,EAAQ/gB,MAC1BmhB,EAAWJ,EAAQ/gB,MACnBmhB,EAASU,cAAgB,EAGnBX,EAAQY,OACbZ,EAAQY,MAAM3kB,KAAMW,EAAMwd,EAAM8F,EAAYN,MAAkB,GAEzDhjB,EAAK0M,kBACT1M,EAAK0M,iBAAkBxK,EAAM8gB,IAK3BI,EAAQjL,MACZiL,EAAQjL,IAAI9Y,KAAMW,EAAMmjB,GAElBA,EAAU5X,QAAQ/G,OACvB2e,EAAU5X,QAAQ/G,KAAO+G,EAAQ/G,OAK9BnG,EACJglB,EAAS1iB,OAAQ0iB,EAASU,gBAAiB,EAAGZ,GAE9CE,EAASzlB,KAAMulB,GAIhB/kB,EAAO0kB,MAAM/lB,OAAQmF,IAAS,KAMhCyX,OAAQ,SAAU3Z,EAAM2iB,EAAOpX,EAASlN,EAAU4lB,GAEjD,GAAIzjB,GAAG0jB,EAAWxf,EACjBue,EAAQC,EAAGC,EACXC,EAASC,EAAUnhB,EAAMohB,EAAYC,EACrCC,EAAW3F,EAASD,QAAS5d,IAAU6d,EAASve,IAAKU,EAEtD,IAAMwjB,IAAeP,EAASO,EAASP,QAAvC,CAKAN,GAAUA,GAAS,IAAKjZ,MAAOmP,KAAiB,IAChDqK,EAAIP,EAAMxjB,MACV,OAAQ+jB,IAMP,GALAxe,EAAM2d,GAAetY,KAAM4Y,EAAOO,QAClChhB,EAAOqhB,EAAW7e,EAAK,GACvB4e,GAAe5e,EAAK,IAAO,IAAKM,MAAO,KAAMtE,OAGvCwB,EAAN,CAOAkhB,EAAUhlB,EAAO0kB,MAAMM,QAASlhB,OAChCA,GAAS7D,EAAW+kB,EAAQQ,aAAeR,EAAQS,WAAc3hB,EACjEmhB,EAAWJ,EAAQ/gB,OACnBwC,EAAMA,EAAK,IACV,GAAI2C,QAAQ,UAAYic,EAAW7Y,KAAM,iBAAoB,WAG9DyZ,EAAY1jB,EAAI6iB,EAASlkB,MACzB,OAAQqB,IACP2iB,EAAYE,EAAU7iB,IAEfyjB,GAAeV,IAAaJ,EAAUI,UACzChY,GAAWA,EAAQ/G,OAAS2e,EAAU3e,MACtCE,IAAOA,EAAI2F,KAAM8Y,EAAUW,YAC3BzlB,GAAYA,IAAa8kB,EAAU9kB,WACxB,OAAbA,IAAqB8kB,EAAU9kB,YAChCglB,EAAS1iB,OAAQH,EAAG,GAEf2iB,EAAU9kB,UACdglB,EAASU,gBAELX,EAAQzJ,QACZyJ,EAAQzJ,OAAOta,KAAMW,EAAMmjB,GAOzBe,KAAcb,EAASlkB,SACrBikB,EAAQe,UACbf,EAAQe,SAAS9kB,KAAMW,EAAMsjB,EAAYE,EAASC,WAAa,GAE/DrlB,EAAOgmB,YAAapkB,EAAMkC,EAAMshB,EAASC,cAGnCR,GAAQ/gB,QA1Cf,KAAMA,IAAQ+gB,GACb7kB,EAAO0kB,MAAMnJ,OAAQ3Z,EAAMkC,EAAOygB,EAAOO,GAAK3X,EAASlN,GAAU,EA8C/DD,GAAOsE,cAAeugB,IAC1BpF,EAASlE,OAAQ3Z,EAAM,mBAIzB2jB,SAAU,SAAUb,GAGnBA,EAAQ1kB,EAAO0kB,MAAMuB,IAAKvB,EAE1B,IAAI7iB,GAAGO,EAAGd,EAAKuR,EAASkS,EACvBmB,KACA3f,EAAOjH,EAAM2B,KAAMc,WACnBkjB,GAAaxF,EAASve,IAAK/B,KAAM,eAAoBulB,EAAM5gB,UAC3DkhB,EAAUhlB,EAAO0kB,MAAMM,QAASN,EAAM5gB,SAOvC,IAJAyC,EAAM,GAAMme,EACZA,EAAMyB,eAAiBhnB,MAGlB6lB,EAAQoB,aAAepB,EAAQoB,YAAYnlB,KAAM9B,KAAMulB,MAAY,EAAxE,CAKAwB,EAAelmB,EAAO0kB,MAAMO,SAAShkB,KAAM9B,KAAMulB,EAAOO,GAGxDpjB,EAAI,CACJ,QAAUgR,EAAUqT,EAAcrkB,QAAY6iB,EAAM2B,uBAAyB,CAC5E3B,EAAM4B,cAAgBzT,EAAQjR,KAE9BQ,EAAI,CACJ,QAAU2iB,EAAYlS,EAAQoS,SAAU7iB,QACtCsiB,EAAM6B,gCAID7B,EAAM8B,aAAc9B,EAAM8B,WAAWva,KAAM8Y,EAAUW,aAE1DhB,EAAMK,UAAYA,EAClBL,EAAMtF,KAAO2F,EAAU3F,KAEvB9d,IAAUtB,EAAO0kB,MAAMM,QAASD,EAAUI,eAAmBE,QAC5DN,EAAU5X,SAAUrL,MAAO+Q,EAAQjR,KAAM2E,GAE7BnD,SAAR9B,IACGojB,EAAM7S,OAASvQ,MAAU,IAC/BojB,EAAM+B,iBACN/B,EAAMgC,oBAYX,MAJK1B,GAAQ2B,cACZ3B,EAAQ2B,aAAa1lB,KAAM9B,KAAMulB,GAG3BA,EAAM7S,SAGdoT,SAAU,SAAUP,EAAOO,GAC1B,GAAIpjB,GAAGmE,EAAS4gB,EAAK7B,EACpBmB,KACAP,EAAgBV,EAASU,cACzBrY,EAAMoX,EAAM3hB,MAQb,IAAK4iB,GAAiBrY,EAAIjJ,WACR,UAAfqgB,EAAM5gB,MAAoB+iB,MAAOnC,EAAMtQ,SAAYsQ,EAAMtQ,OAAS,GAEpE,KAAQ9G,IAAQnO,KAAMmO,EAAMA,EAAIrI,YAAc9F,KAI7C,GAAsB,IAAjBmO,EAAIjJ,WAAoBiJ,EAAIwG,YAAa,GAAuB,UAAf4Q,EAAM5gB,MAAqB,CAEhF,IADAkC,KACMnE,EAAI,EAAO8jB,EAAJ9jB,EAAmBA,IAC/BkjB,EAAYE,EAAUpjB,GAGtB+kB,EAAM7B,EAAU9kB,SAAW,IAEHmD,SAAnB4C,EAAS4gB,KACb5gB,EAAS4gB,GAAQ7B,EAAUhb,aAC1B/J,EAAQ4mB,EAAKznB,MAAO0a,MAAOvM,GAAQ,GACnCtN,EAAO4O,KAAMgY,EAAKznB,KAAM,MAAQmO,IAAQvM,QAErCiF,EAAS4gB,IACb5gB,EAAQxG,KAAMulB,EAGX/e,GAAQjF,QACZmlB,EAAa1mB,MAAQoC,KAAM0L,EAAK2X,SAAUjf,IAW9C,MAJK2f,GAAgBV,EAASlkB,QAC7BmlB,EAAa1mB,MAAQoC,KAAMzC,KAAM8lB,SAAUA,EAAS3lB,MAAOqmB,KAGrDO,GAIRY,MAAO,+HACyDlgB,MAAO,KAEvEmgB,YAEAC,UACCF,MAAO,4BAA4BlgB,MAAO,KAC1CiI,OAAQ,SAAU6V,EAAOuC,GAOxB,MAJoB,OAAfvC,EAAMwC,QACVxC,EAAMwC,MAA6B,MAArBD,EAASE,SAAmBF,EAASE,SAAWF,EAASG,SAGjE1C,IAIT2C,YACCP,MAAO,uFACwBlgB,MAAO,KACtCiI,OAAQ,SAAU6V,EAAOuC,GACxB,GAAIK,GAAUnZ,EAAKoZ,EAClBnT,EAAS6S,EAAS7S,MAsBnB,OAnBoB,OAAfsQ,EAAM8C,OAAqC,MAApBP,EAASQ,UACpCH,EAAW5C,EAAM3hB,OAAO2I,eAAiB3M,EACzCoP,EAAMmZ,EAASvZ,gBACfwZ,EAAOD,EAASC,KAEhB7C,EAAM8C,MAAQP,EAASQ,SACpBtZ,GAAOA,EAAIuZ,YAAcH,GAAQA,EAAKG,YAAc,IACpDvZ,GAAOA,EAAIwZ,YAAcJ,GAAQA,EAAKI,YAAc,GACvDjD,EAAMkD,MAAQX,EAASY,SACpB1Z,GAAOA,EAAI2Z,WAAcP,GAAQA,EAAKO,WAAc,IACpD3Z,GAAOA,EAAI4Z,WAAcR,GAAQA,EAAKQ,WAAc,IAKlDrD,EAAMwC,OAAoB9jB,SAAXgR,IACpBsQ,EAAMwC,MAAmB,EAAT9S,EAAa,EAAe,EAATA,EAAa,EAAe,EAATA,EAAa,EAAI,GAGjEsQ,IAITuB,IAAK,SAAUvB,GACd,GAAKA,EAAO1kB,EAAOqD,SAClB,MAAOqhB,EAIR,IAAI7iB,GAAGwd,EAAMzc,EACZkB,EAAO4gB,EAAM5gB,KACbkkB,EAAgBtD,EAChBuD,EAAU9oB,KAAK4nB,SAAUjjB,EAEpBmkB,KACL9oB,KAAK4nB,SAAUjjB,GAASmkB,EACvBjE,GAAY/X,KAAMnI,GAAS3E,KAAKkoB,WAChCtD,GAAU9X,KAAMnI,GAAS3E,KAAK6nB,aAGhCpkB,EAAOqlB,EAAQnB,MAAQ3nB,KAAK2nB,MAAMvnB,OAAQ0oB,EAAQnB,OAAU3nB,KAAK2nB,MAEjEpC,EAAQ,GAAI1kB,GAAOkoB,MAAOF,GAE1BnmB,EAAIe,EAAK7B,MACT,OAAQc,IACPwd,EAAOzc,EAAMf,GACb6iB,EAAOrF,GAAS2I,EAAe3I,EAehC,OAVMqF,GAAM3hB,SACX2hB,EAAM3hB,OAAShE,GAKe,IAA1B2lB,EAAM3hB,OAAOsB,WACjBqgB,EAAM3hB,OAAS2hB,EAAM3hB,OAAOkC,YAGtBgjB,EAAQpZ,OAASoZ,EAAQpZ,OAAQ6V,EAAOsD,GAAkBtD,GAGlEM,SACCmD,MAGCC,UAAU,GAEX5U,OAGC6U,QAAS,WACR,MAAKlpB,QAASilB,MAAuBjlB,KAAKqU,OACzCrU,KAAKqU,SACE,GAFR,QAKDgS,aAAc,WAEf8C,MACCD,QAAS,WACR,MAAKlpB,QAASilB,MAAuBjlB,KAAKmpB,MACzCnpB,KAAKmpB,QACE,GAFR,QAKD9C,aAAc,YAEf+C,OAGCF,QAAS,WACR,MAAmB,aAAdlpB,KAAK2E,MAAuB3E,KAAKopB,OAASvoB,EAAOqF,SAAUlG,KAAM,UACrEA,KAAKopB,SACE,GAFR,QAODhG,SAAU,SAAUmC,GACnB,MAAO1kB,GAAOqF,SAAUqf,EAAM3hB,OAAQ,OAIxCylB,cACC7B,aAAc,SAAUjC,GAIDthB,SAAjBshB,EAAM7S,QAAwB6S,EAAMsD,gBACxCtD,EAAMsD,cAAcS,YAAc/D,EAAM7S,YAO7C7R,EAAOgmB,YAAc,SAAUpkB,EAAMkC,EAAMuhB,GAGrCzjB,EAAKqc,qBACTrc,EAAKqc,oBAAqBna,EAAMuhB,IAIlCrlB,EAAOkoB,MAAQ,SAAUvlB,EAAKmkB,GAG7B,MAAQ3nB,gBAAgBa,GAAOkoB,OAK1BvlB,GAAOA,EAAImB,MACf3E,KAAK6oB,cAAgBrlB,EACrBxD,KAAK2E,KAAOnB,EAAImB,KAIhB3E,KAAKupB,mBAAqB/lB,EAAIgmB,kBACHvlB,SAAzBT,EAAIgmB,kBAGJhmB,EAAI8lB,eAAgB,EACrBvE,GACAC,IAIDhlB,KAAK2E,KAAOnB,EAIRmkB,GACJ9mB,EAAOwC,OAAQrD,KAAM2nB,GAItB3nB,KAAKypB,UAAYjmB,GAAOA,EAAIimB,WAAa5oB,EAAOwG,WAGhDrH,KAAMa,EAAOqD,UAAY,IAhCjB,GAAIrD,GAAOkoB,MAAOvlB,EAAKmkB,IAqChC9mB,EAAOkoB,MAAMtnB,WACZE,YAAad,EAAOkoB,MACpBQ,mBAAoBvE,GACpBkC,qBAAsBlC,GACtBoC,8BAA+BpC,GAE/BsC,eAAgB,WACf,GAAIzb,GAAI7L,KAAK6oB,aAEb7oB,MAAKupB,mBAAqBxE,GAErBlZ,GACJA,EAAEyb,kBAGJC,gBAAiB,WAChB,GAAI1b,GAAI7L,KAAK6oB,aAEb7oB,MAAKknB,qBAAuBnC,GAEvBlZ,GACJA,EAAE0b,mBAGJmC,yBAA0B,WACzB,GAAI7d,GAAI7L,KAAK6oB,aAEb7oB,MAAKonB,8BAAgCrC,GAEhClZ,GACJA,EAAE6d,2BAGH1pB,KAAKunB,oBAYP1mB,EAAOyB,MACNqnB,WAAY,YACZC,WAAY,WACZC,aAAc,cACdC,aAAc,cACZ,SAAUC,EAAMjD,GAClBjmB,EAAO0kB,MAAMM,QAASkE,IACrB1D,aAAcS,EACdR,SAAUQ,EAEVZ,OAAQ,SAAUX,GACjB,GAAIpjB,GACHyB,EAAS5D,KACTgqB,EAAUzE,EAAM0E,cAChBrE,EAAYL,EAAMK,SASnB,OALMoE,KAAaA,IAAYpmB,GAAW/C,EAAO4H,SAAU7E,EAAQomB,MAClEzE,EAAM5gB,KAAOihB,EAAUI,SACvB7jB,EAAMyjB,EAAU5X,QAAQrL,MAAO3C,KAAM4C,WACrC2iB,EAAM5gB,KAAOmiB,GAEP3kB,MAKVtB,EAAOG,GAAGqC,QACT8hB,GAAI,SAAUC,EAAOtkB,EAAUmf,EAAMjf,GACpC,MAAOmkB,IAAInlB,KAAMolB,EAAOtkB,EAAUmf,EAAMjf,IAEzCqkB,IAAK,SAAUD,EAAOtkB,EAAUmf,EAAMjf,GACrC,MAAOmkB,IAAInlB,KAAMolB,EAAOtkB,EAAUmf,EAAMjf,EAAI,IAE7C4d,IAAK,SAAUwG,EAAOtkB,EAAUE,GAC/B,GAAI4kB,GAAWjhB,CACf,IAAKygB,GAASA,EAAMkC,gBAAkBlC,EAAMQ,UAW3C,MARAA,GAAYR,EAAMQ,UAClB/kB,EAAQukB,EAAM4B,gBAAiBpI,IAC9BgH,EAAUW,UACTX,EAAUI,SAAW,IAAMJ,EAAUW,UACrCX,EAAUI,SACXJ,EAAU9kB,SACV8kB,EAAU5X,SAEJhO,IAER,IAAsB,gBAAVolB,GAAqB,CAGhC,IAAMzgB,IAAQygB,GACbplB,KAAK4e,IAAKja,EAAM7D,EAAUskB,EAAOzgB,GAElC,OAAO3E,MAWR,MATKc,MAAa,GAA6B,kBAAbA,KAGjCE,EAAKF,EACLA,EAAWmD,QAEPjD,KAAO,IACXA,EAAKgkB,IAEChlB,KAAKsC,KAAM,WACjBzB,EAAO0kB,MAAMnJ,OAAQpc,KAAMolB,EAAOpkB,EAAIF,OAMzC,IACCopB,IAAY,2EAKZC,GAAe,wBAGfC,GAAW,oCACXC,GAAoB,cACpBC,GAAe,0CAGhB,SAASC,IAAoB9nB,EAAM+nB,GAClC,MAAO3pB,GAAOqF,SAAUzD,EAAM,UAC7B5B,EAAOqF,SAA+B,KAArBskB,EAAQtlB,SAAkBslB,EAAUA,EAAQ/Y,WAAY,MAEzEhP,EAAKkK,qBAAsB,SAAW,IACrClK,EAAKoD,YAAapD,EAAK8J,cAAc7G,cAAe,UACrDjD,EAIF,QAASgoB,IAAehoB,GAEvB,MADAA,GAAKkC,MAAyC,OAAhClC,EAAKsK,aAAc,SAAsB,IAAMtK,EAAKkC,KAC3DlC,EAER,QAASioB,IAAejoB,GACvB,GAAI0J,GAAQke,GAAkB7d,KAAM/J,EAAKkC,KAQzC,OANKwH,GACJ1J,EAAKkC,KAAOwH,EAAO,GAEnB1J,EAAK6K,gBAAiB,QAGhB7K,EAGR,QAASkoB,IAAgBnnB,EAAKonB,GAC7B,GAAIloB,GAAG6X,EAAG5V,EAAMkmB,EAAUC,EAAUC,EAAUC,EAAUtF,CAExD,IAAuB,IAAlBkF,EAAK1lB,SAAV,CAKA,GAAKob,EAASD,QAAS7c,KACtBqnB,EAAWvK,EAASpB,OAAQ1b,GAC5BsnB,EAAWxK,EAASN,IAAK4K,EAAMC,GAC/BnF,EAASmF,EAASnF,QAEJ,OACNoF,GAAS5E,OAChB4E,EAASpF,SAET,KAAM/gB,IAAQ+gB,GACb,IAAMhjB,EAAI,EAAG6X,EAAImL,EAAQ/gB,GAAO/C,OAAY2Y,EAAJ7X,EAAOA,IAC9C7B,EAAO0kB,MAAM3K,IAAKgQ,EAAMjmB,EAAM+gB,EAAQ/gB,GAAQjC,IAO7C6d,EAASF,QAAS7c,KACtBunB,EAAWxK,EAASrB,OAAQ1b,GAC5BwnB,EAAWnqB,EAAOwC,UAAY0nB,GAE9BxK,EAASP,IAAK4K,EAAMI,KAKtB,QAASC,IAAUznB,EAAKonB,GACvB,GAAI1kB,GAAW0kB,EAAK1kB,SAASC,aAGX,WAAbD,GAAwByc,EAAe7V,KAAMtJ,EAAImB,MACrDimB,EAAKhW,QAAUpR,EAAIoR,QAGK,UAAb1O,GAAqC,aAAbA,IACnC0kB,EAAK7R,aAAevV,EAAIuV,cAI1B,QAASmS,IAAUC,EAAY/jB,EAAM7E,EAAU2hB,GAG9C9c,EAAOhH,EAAOuC,SAAWyE,EAEzB,IAAIgd,GAAUvhB,EAAOmhB,EAASoH,EAAYvc,EAAMG,EAC/CtM,EAAI,EACJ6X,EAAI4Q,EAAWvpB,OACfypB,EAAW9Q,EAAI,EACfvT,EAAQI,EAAM,GACdtD,EAAajD,EAAOiD,WAAYkD,EAGjC,IAAKlD,GACDyW,EAAI,GAAsB,gBAAVvT,KAChBrG,EAAQ8jB,YAAc2F,GAAStd,KAAM9F,GACxC,MAAOmkB,GAAW7oB,KAAM,SAAUoY,GACjC,GAAId,GAAOuR,EAAWroB,GAAI4X,EACrB5W,KACJsD,EAAM,GAAMJ,EAAMlF,KAAM9B,KAAM0a,EAAOd,EAAK0R,SAE3CJ,GAAUtR,EAAMxS,EAAM7E,EAAU2hB,IAIlC,IAAK3J,IACJ6J,EAAWL,GAAe3c,EAAM+jB,EAAY,GAAI5e,eAAe,EAAO4e,EAAYjH,GAClFrhB,EAAQuhB,EAAS3S,WAEmB,IAA/B2S,EAASxY,WAAWhK,SACxBwiB,EAAWvhB,GAIPA,GAASqhB,GAAU,CAOvB,IANAF,EAAUnjB,EAAO2B,IAAKmhB,EAAQS,EAAU,UAAYqG,IACpDW,EAAapH,EAAQpiB,OAKT2Y,EAAJ7X,EAAOA,IACdmM,EAAOuV,EAEF1hB,IAAM2oB,IACVxc,EAAOhO,EAAO8C,MAAOkL,GAAM,GAAM,GAG5Buc,GAIJvqB,EAAOuB,MAAO4hB,EAASL,EAAQ9U,EAAM,YAIvCtM,EAAST,KAAMqpB,EAAYzoB,GAAKmM,EAAMnM,EAGvC,IAAK0oB,EAOJ,IANApc,EAAMgV,EAASA,EAAQpiB,OAAS,GAAI2K,cAGpC1L,EAAO2B,IAAKwhB,EAAS0G,IAGfhoB,EAAI,EAAO0oB,EAAJ1oB,EAAgBA,IAC5BmM,EAAOmV,EAASthB,GACXmgB,EAAY/V,KAAM+B,EAAKlK,MAAQ,MAClC2b,EAASpB,OAAQrQ,EAAM,eACxBhO,EAAO4H,SAAUuG,EAAKH,KAEjBA,EAAKrL,IAGJ3C,EAAO0qB,UACX1qB,EAAO0qB,SAAU1c,EAAKrL,KAGvB3C,EAAOuE,WAAYyJ,EAAK2C,YAAYnN,QAASimB,GAAc,MAQjE,MAAOa,GAGR,QAAS/O,IAAQ3Z,EAAM3B,EAAU0qB,GAKhC,IAJA,GAAI3c,GACHyV,EAAQxjB,EAAWD,EAAO6O,OAAQ5O,EAAU2B,GAASA,EACrDC,EAAI,EAE4B,OAAvBmM,EAAOyV,EAAO5hB,IAAeA,IAChC8oB,GAA8B,IAAlB3c,EAAK3J,UACtBrE,EAAO4qB,UAAW9H,EAAQ9U,IAGtBA,EAAK/I,aACJ0lB,GAAY3qB,EAAO4H,SAAUoG,EAAKtC,cAAesC,IACrD+U,GAAeD,EAAQ9U,EAAM,WAE9BA,EAAK/I,WAAWC,YAAa8I,GAI/B,OAAOpM,GAGR5B,EAAOwC,QACNkhB,cAAe,SAAU+G,GACxB,MAAOA,GAAKjnB,QAAS6lB,GAAW,cAGjCvmB,MAAO,SAAUlB,EAAMipB,EAAeC,GACrC,GAAIjpB,GAAG6X,EAAGqR,EAAaC,EACtBloB,EAAQlB,EAAKiiB,WAAW,GACxBoH,EAASjrB,EAAO4H,SAAUhG,EAAK8J,cAAe9J,EAG/C,MAAM9B,EAAQgkB,gBAAsC,IAAlBliB,EAAKyC,UAAoC,KAAlBzC,EAAKyC,UAC3DrE,EAAOoY,SAAUxW,IAMnB,IAHAopB,EAAelI,EAAQhgB,GACvBioB,EAAcjI,EAAQlhB,GAEhBC,EAAI,EAAG6X,EAAIqR,EAAYhqB,OAAY2Y,EAAJ7X,EAAOA,IAC3CuoB,GAAUW,EAAalpB,GAAKmpB,EAAcnpB,GAK5C,IAAKgpB,EACJ,GAAKC,EAIJ,IAHAC,EAAcA,GAAejI,EAAQlhB,GACrCopB,EAAeA,GAAgBlI,EAAQhgB,GAEjCjB,EAAI,EAAG6X,EAAIqR,EAAYhqB,OAAY2Y,EAAJ7X,EAAOA,IAC3CioB,GAAgBiB,EAAalpB,GAAKmpB,EAAcnpB,QAGjDioB,IAAgBloB,EAAMkB,EAWxB,OANAkoB,GAAelI,EAAQhgB,EAAO,UACzBkoB,EAAajqB,OAAS,GAC1BgiB,GAAeiI,GAAeC,GAAUnI,EAAQlhB,EAAM,WAIhDkB,GAGR8nB,UAAW,SAAUvpB,GAKpB,IAJA,GAAI+d,GAAMxd,EAAMkC,EACfkhB,EAAUhlB,EAAO0kB,MAAMM,QACvBnjB,EAAI,EAE6BuB,UAAxBxB,EAAOP,EAAOQ,IAAqBA,IAC5C,GAAK6c,EAAY9c,GAAS,CACzB,GAAOwd,EAAOxd,EAAM6d,EAASpc,SAAc,CAC1C,GAAK+b,EAAKyF,OACT,IAAM/gB,IAAQsb,GAAKyF,OACbG,EAASlhB,GACb9D,EAAO0kB,MAAMnJ,OAAQ3Z,EAAMkC,GAI3B9D,EAAOgmB,YAAapkB,EAAMkC,EAAMsb,EAAKiG,OAOxCzjB,GAAM6d,EAASpc,SAAYD,OAEvBxB,EAAM8d,EAASrc,WAInBzB,EAAM8d,EAASrc,SAAYD,YAOhCpD,EAAOG,GAAGqC,QAGT6nB,SAAUA,GAEVa,OAAQ,SAAUjrB,GACjB,MAAOsb,IAAQpc,KAAMc,GAAU,IAGhCsb,OAAQ,SAAUtb,GACjB,MAAOsb,IAAQpc,KAAMc,IAGtB6E,KAAM,SAAUqB,GACf,MAAOkY,GAAQlf,KAAM,SAAUgH,GAC9B,MAAiB/C,UAAV+C,EACNnG,EAAO8E,KAAM3F,MACbA,KAAK+U,QAAQzS,KAAM,WACK,IAAlBtC,KAAKkF,UAAoC,KAAlBlF,KAAKkF,UAAqC,IAAlBlF,KAAKkF,WACxDlF,KAAKwR,YAAcxK,MAGpB,KAAMA,EAAOpE,UAAUhB,SAG3BoqB,OAAQ,WACP,MAAOd,IAAUlrB,KAAM4C,UAAW,SAAUH,GAC3C,GAAuB,IAAlBzC,KAAKkF,UAAoC,KAAlBlF,KAAKkF,UAAqC,IAAlBlF,KAAKkF,SAAiB,CACzE,GAAItB,GAAS2mB,GAAoBvqB,KAAMyC,EACvCmB,GAAOiC,YAAapD,OAKvBwpB,QAAS,WACR,MAAOf,IAAUlrB,KAAM4C,UAAW,SAAUH,GAC3C,GAAuB,IAAlBzC,KAAKkF,UAAoC,KAAlBlF,KAAKkF,UAAqC,IAAlBlF,KAAKkF,SAAiB,CACzE,GAAItB,GAAS2mB,GAAoBvqB,KAAMyC,EACvCmB,GAAOsoB,aAAczpB,EAAMmB,EAAO6N,gBAKrC0a,OAAQ,WACP,MAAOjB,IAAUlrB,KAAM4C,UAAW,SAAUH,GACtCzC,KAAK8F,YACT9F,KAAK8F,WAAWomB,aAAczpB,EAAMzC,SAKvCosB,MAAO,WACN,MAAOlB,IAAUlrB,KAAM4C,UAAW,SAAUH,GACtCzC,KAAK8F,YACT9F,KAAK8F,WAAWomB,aAAczpB,EAAMzC,KAAKsO,gBAK5CyG,MAAO,WAIN,IAHA,GAAItS,GACHC,EAAI,EAE2B,OAAtBD,EAAOzC,KAAM0C,IAAeA,IACd,IAAlBD,EAAKyC,WAGTrE,EAAO4qB,UAAW9H,EAAQlhB,GAAM,IAGhCA,EAAK+O,YAAc,GAIrB,OAAOxR,OAGR2D,MAAO,SAAU+nB,EAAeC,GAI/B,MAHAD,GAAiC,MAAjBA,GAAwB,EAAQA,EAChDC,EAAyC,MAArBA,EAA4BD,EAAgBC,EAEzD3rB,KAAKwC,IAAK,WAChB,MAAO3B,GAAO8C,MAAO3D,KAAM0rB,EAAeC,MAI5CL,KAAM,SAAUtkB,GACf,MAAOkY,GAAQlf,KAAM,SAAUgH,GAC9B,GAAIvE,GAAOzC,KAAM,OAChB0C,EAAI,EACJ6X,EAAIva,KAAK4B,MAEV,IAAeqC,SAAV+C,GAAyC,IAAlBvE,EAAKyC,SAChC,MAAOzC,GAAKqN,SAIb,IAAsB,gBAAV9I,KAAuBmjB,GAAard,KAAM9F,KACpD8b,GAAWF,EAASpW,KAAMxF,KAAa,GAAI,KAAQ,GAAIb,eAAkB,CAE1Ea,EAAQnG,EAAO0jB,cAAevd,EAE9B,KACC,KAAYuT,EAAJ7X,EAAOA,IACdD,EAAOzC,KAAM0C,OAGU,IAAlBD,EAAKyC,WACTrE,EAAO4qB,UAAW9H,EAAQlhB,GAAM,IAChCA,EAAKqN,UAAY9I,EAInBvE,GAAO,EAGN,MAAQoJ,KAGNpJ,GACJzC,KAAK+U,QAAQiX,OAAQhlB,IAEpB,KAAMA,EAAOpE,UAAUhB,SAG3ByqB,YAAa,WACZ,GAAInI,KAGJ,OAAOgH,IAAUlrB,KAAM4C,UAAW,SAAUH,GAC3C,GAAIsM,GAAS/O,KAAK8F,UAEbjF,GAAO2F,QAASxG,KAAMkkB,GAAY,IACtCrjB,EAAO4qB,UAAW9H,EAAQ3jB,OACrB+O,GACJA,EAAOud,aAAc7pB,EAAMzC,QAK3BkkB,MAILrjB,EAAOyB,MACNiqB,SAAU,SACVC,UAAW,UACXN,aAAc,SACdO,YAAa,QACbC,WAAY,eACV,SAAUnpB,EAAMukB,GAClBjnB,EAAOG,GAAIuC,GAAS,SAAUzC,GAO7B,IANA,GAAIoB,GACHC,KACAwqB,EAAS9rB,EAAQC,GACjBiC,EAAO4pB,EAAO/qB,OAAS,EACvBc,EAAI,EAEQK,GAALL,EAAWA,IAClBR,EAAQQ,IAAMK,EAAO/C,KAAOA,KAAK2D,OAAO,GACxC9C,EAAQ8rB,EAAQjqB,IAAOolB,GAAY5lB,GAInC7B,EAAKsC,MAAOR,EAAKD,EAAMH,MAGxB,OAAO/B,MAAKiC,UAAWE,KAKzB,IAAIyqB,IACHC,IAICC,KAAM,QACNC,KAAM,QAUR,SAASC,IAAezpB,EAAMyL,GAC7B,GAAIvM,GAAO5B,EAAQmO,EAAItJ,cAAenC,IAASgpB,SAAUvd,EAAIoZ,MAE5D6E,EAAUpsB,EAAOkhB,IAAKtf,EAAM,GAAK,UAMlC,OAFAA,GAAKspB,SAEEkB,EAOR,QAASC,IAAgBhnB,GACxB,GAAI8I,GAAMpP,EACTqtB,EAAUJ,GAAa3mB,EA2BxB,OAzBM+mB,KACLA,EAAUD,GAAe9mB,EAAU8I,GAGlB,SAAZie,GAAuBA,IAG3BL,IAAWA,IAAU/rB,EAAQ,mDAC3B0rB,SAAUvd,EAAIJ,iBAGhBI,EAAM4d,GAAQ,GAAIxR,gBAGlBpM,EAAIme,QACJne,EAAIoe,QAEJH,EAAUD,GAAe9mB,EAAU8I,GACnC4d,GAAOb,UAIRc,GAAa3mB,GAAa+mB,GAGpBA,EAER,GAAII,IAAU,UAEVC,GAAY,GAAIxjB,QAAQ,KAAO2X,EAAO,kBAAmB,KAEzD8L,GAAY,SAAU9qB,GAKxB,GAAI+qB,GAAO/qB,EAAK8J,cAAc0C,WAM9B,OAJMue,IAASA,EAAKC,SACnBD,EAAOztB,GAGDytB,EAAKE,iBAAkBjrB,IAG5BkrB,GAAO,SAAUlrB,EAAMa,EAASf,EAAU6E,GAC7C,GAAIjF,GAAKoB,EACRqqB,IAGD,KAAMrqB,IAAQD,GACbsqB,EAAKrqB,GAASd,EAAKigB,MAAOnf,GAC1Bd,EAAKigB,MAAOnf,GAASD,EAASC,EAG/BpB,GAAMI,EAASI,MAAOF,EAAM2E,MAG5B,KAAM7D,IAAQD,GACbb,EAAKigB,MAAOnf,GAASqqB,EAAKrqB,EAG3B,OAAOpB,IAIJyM,GAAkBhP,EAASgP,iBAI/B,WACC,GAAIif,GAAkBC,EAAsBC,EAAqBC,EAChEC,EAAYruB,EAAS8F,cAAe,OACpCmI,EAAMjO,EAAS8F,cAAe,MAG/B,IAAMmI,EAAI6U,MAAV,CAMA7U,EAAI6U,MAAMwL,eAAiB,cAC3BrgB,EAAI6W,WAAW,GAAOhC,MAAMwL,eAAiB,GAC7CvtB,EAAQwtB,gBAA+C,gBAA7BtgB,EAAI6U,MAAMwL,eAEpCD,EAAUvL,MAAM0L,QAAU,4FAE1BH,EAAUpoB,YAAagI,EAIvB,SAASwgB,KACRxgB,EAAI6U,MAAM0L,QAIT,qKAIDvgB,EAAIiC,UAAY,GAChBlB,GAAgB/I,YAAaooB,EAE7B,IAAIK,GAAWvuB,EAAO2tB,iBAAkB7f,EACxCggB,GAAoC,OAAjBS,EAASpf,IAC5B8e,EAAgD,QAAxBM,EAASC,WACjCT,EAA0C,QAAnBQ,EAASE,MAIhC3gB,EAAI6U,MAAM+L,YAAc,MACxBV,EAA+C,QAAzBO,EAASG,YAE/B7f,GAAgB7I,YAAakoB,GAG9BptB,EAAOwC,OAAQ1C,GACd+tB,cAAe,WAMd,MADAL,KACOR,GAERc,kBAAmB,WAIlB,MAH6B,OAAxBb,GACJO,IAEMP,GAERc,iBAAkB,WAQjB,MAH6B,OAAxBd,GACJO,IAEMN,GAERc,mBAAoB,WAMnB,MAH6B,OAAxBf,GACJO,IAEML,GAERc,oBAAqB,WAOpB,GAAI3sB,GACH4sB,EAAYlhB,EAAIhI,YAAajG,EAAS8F,cAAe,OAkBtD,OAfAqpB,GAAUrM,MAAM0L,QAAUvgB,EAAI6U,MAAM0L,QAInC,kGAEDW,EAAUrM,MAAM+L,YAAcM,EAAUrM,MAAM8L,MAAQ,IACtD3gB,EAAI6U,MAAM8L,MAAQ,MAClB5f,GAAgB/I,YAAaooB,GAE7B9rB,GAAO6C,WAAYjF,EAAO2tB,iBAAkBqB,GAAYN,aAExD7f,GAAgB7I,YAAakoB,GAC7BpgB,EAAI9H,YAAagpB,GAEV5sB,QAMV,SAAS6sB,IAAQvsB,EAAMc,EAAM0rB,GAC5B,GAAIT,GAAOU,EAAUC,EAAUhtB,EAC9BugB,EAAQjgB,EAAKigB,KAuCd,OArCAuM,GAAWA,GAAY1B,GAAW9qB,GAClCN,EAAM8sB,EAAWA,EAASG,iBAAkB7rB,IAAU0rB,EAAU1rB,GAASU,OAK1D,KAAR9B,GAAsB8B,SAAR9B,GAAwBtB,EAAO4H,SAAUhG,EAAK8J,cAAe9J,KACjFN,EAAMtB,EAAO6hB,MAAOjgB,EAAMc,IAKtB0rB,IAOEtuB,EAAQiuB,oBAAsBtB,GAAUxgB,KAAM3K,IAASkrB,GAAQvgB,KAAMvJ,KAG1EirB,EAAQ9L,EAAM8L,MACdU,EAAWxM,EAAMwM,SACjBC,EAAWzM,EAAMyM,SAGjBzM,EAAMwM,SAAWxM,EAAMyM,SAAWzM,EAAM8L,MAAQrsB,EAChDA,EAAM8sB,EAAST,MAGf9L,EAAM8L,MAAQA,EACd9L,EAAMwM,SAAWA,EACjBxM,EAAMyM,SAAWA,GAIJlrB,SAAR9B,EAINA,EAAM,GACNA,EAIF,QAASktB,IAAcC,EAAaC,GAGnC,OACCxtB,IAAK,WACJ,MAAKutB,gBAIGtvB,MAAK+B,KAKJ/B,KAAK+B,IAAMwtB,GAAS5sB,MAAO3C,KAAM4C,aAM7C,GAKC4sB,IAAe,4BAEfC,IAAYC,SAAU,WAAYC,WAAY,SAAU1C,QAAS,SACjE2C,IACCC,cAAe,IACfC,WAAY,OAGbC,IAAgB,SAAU,IAAK,MAAO,MACtCC,GAAapwB,EAAS8F,cAAe,OAAQgd,KAG9C,SAASuN,IAAgB1sB,GAGxB,GAAKA,IAAQysB,IACZ,MAAOzsB,EAIR,IAAI2sB,GAAU3sB,EAAM,GAAI/B,cAAgB+B,EAAKpD,MAAO,GACnDuC,EAAIqtB,GAAYnuB,MAEjB,OAAQc,IAEP,GADAa,EAAOwsB,GAAartB,GAAMwtB,EACrB3sB,IAAQysB,IACZ,MAAOzsB,GAKV,QAAS4sB,IAAmB1tB,EAAMuE,EAAOopB,GAIxC,GAAIvpB,GAAU8a,EAAQnV,KAAMxF,EAC5B,OAAOH,GAGN1C,KAAKksB,IAAK,EAAGxpB,EAAS,IAAQupB,GAAY,KAAUvpB,EAAS,IAAO,MACpEG,EAGF,QAASspB,IAAsB7tB,EAAMc,EAAMgtB,EAAOC,EAAaC,GAW9D,IAVA,GAAI/tB,GAAI6tB,KAAYC,EAAc,SAAW,WAG5C,EAGS,UAATjtB,EAAmB,EAAI,EAEvB2N,EAAM,EAEK,EAAJxO,EAAOA,GAAK,EAGJ,WAAV6tB,IACJrf,GAAOrQ,EAAOkhB,IAAKtf,EAAM8tB,EAAQ3O,EAAWlf,IAAK,EAAM+tB,IAGnDD,GAGW,YAAVD,IACJrf,GAAOrQ,EAAOkhB,IAAKtf,EAAM,UAAYmf,EAAWlf,IAAK,EAAM+tB,IAI7C,WAAVF,IACJrf,GAAOrQ,EAAOkhB,IAAKtf,EAAM,SAAWmf,EAAWlf,GAAM,SAAS,EAAM+tB,MAKrEvf,GAAOrQ,EAAOkhB,IAAKtf,EAAM,UAAYmf,EAAWlf,IAAK,EAAM+tB,GAG5C,YAAVF,IACJrf,GAAOrQ,EAAOkhB,IAAKtf,EAAM,SAAWmf,EAAWlf,GAAM,SAAS,EAAM+tB,IAKvE,OAAOvf,GAGR,QAASwf,IAAkBjuB,EAAMc,EAAMgtB,GAGtC,GAAII,IAAmB,EACtBzf,EAAe,UAAT3N,EAAmBd,EAAKmuB,YAAcnuB,EAAKouB,aACjDJ,EAASlD,GAAW9qB,GACpB+tB,EAAiE,eAAnD3vB,EAAOkhB,IAAKtf,EAAM,aAAa,EAAOguB,EAkBrD,IAbK7wB,EAASkxB,qBAAuB/wB,EAAOmP,MAAQnP,GAK9C0C,EAAKsuB,iBAAiBnvB,SAC1BsP,EAAM/M,KAAK6sB,MAA8C,IAAvCvuB,EAAKwuB,wBAAyB1tB,KAOtC,GAAP2N,GAAmB,MAAPA,EAAc,CAS9B,GANAA,EAAM8d,GAAQvsB,EAAMc,EAAMktB,IACf,EAANvf,GAAkB,MAAPA,KACfA,EAAMzO,EAAKigB,MAAOnf,IAId+pB,GAAUxgB,KAAMoE,GACpB,MAAOA,EAKRyf,GAAmBH,IAChB7vB,EAAQguB,qBAAuBzd,IAAQzO,EAAKigB,MAAOnf,IAGtD2N,EAAMlM,WAAYkM,IAAS,EAI5B,MAASA,GACRof,GACC7tB,EACAc,EACAgtB,IAAWC,EAAc,SAAW,WACpCG,EACAF,GAEE,KAGL,QAASS,IAAUlgB,EAAUmgB,GAM5B,IALA,GAAIlE,GAASxqB,EAAM2uB,EAClBpT,KACAtD,EAAQ,EACR9Y,EAASoP,EAASpP,OAEHA,EAAR8Y,EAAgBA,IACvBjY,EAAOuO,EAAU0J,GACXjY,EAAKigB,QAIX1E,EAAQtD,GAAU4F,EAASve,IAAKU,EAAM,cACtCwqB,EAAUxqB,EAAKigB,MAAMuK,QAChBkE,GAIEnT,EAAQtD,IAAuB,SAAZuS,IACxBxqB,EAAKigB,MAAMuK,QAAU,IAMM,KAAvBxqB,EAAKigB,MAAMuK,SAAkBpL,EAAUpf,KAC3Cub,EAAQtD,GAAU4F,EAASpB,OAC1Bzc,EACA,aACAyqB,GAAgBzqB,EAAKyD,cAIvBkrB,EAASvP,EAAUpf,GAEF,SAAZwqB,GAAuBmE,GAC3B9Q,EAASN,IACRvd,EACA,aACA2uB,EAASnE,EAAUpsB,EAAOkhB,IAAKtf,EAAM,aAQzC,KAAMiY,EAAQ,EAAW9Y,EAAR8Y,EAAgBA,IAChCjY,EAAOuO,EAAU0J,GACXjY,EAAKigB,QAGLyO,GAA+B,SAAvB1uB,EAAKigB,MAAMuK,SAA6C,KAAvBxqB,EAAKigB,MAAMuK,UACzDxqB,EAAKigB,MAAMuK,QAAUkE,EAAOnT,EAAQtD,IAAW,GAAK,QAItD,OAAO1J,GAGRnQ,EAAOwC,QAINguB,UACCC,SACCvvB,IAAK,SAAUU,EAAMwsB,GACpB,GAAKA,EAAW,CAGf,GAAI9sB,GAAM6sB,GAAQvsB,EAAM,UACxB,OAAe,KAARN,EAAa,IAAMA,MAO9BqgB,WACC+O,yBAA2B,EAC3BC,aAAe,EACfC,aAAe,EACfC,UAAY,EACZC,YAAc,EACd7B,YAAc,EACd8B,YAAc,EACdN,SAAW,EACXO,OAAS,EACTC,SAAW,EACXC,QAAU,EACVC,QAAU,EACVC,MAAQ,GAKTC,UACCC,QAAS,YAIVzP,MAAO,SAAUjgB,EAAMc,EAAMyD,EAAOupB,GAGnC,GAAM9tB,GAA0B,IAAlBA,EAAKyC,UAAoC,IAAlBzC,EAAKyC,UAAmBzC,EAAKigB,MAAlE,CAKA,GAAIvgB,GAAKwC,EAAMuc,EACdkR,EAAWvxB,EAAOmF,UAAWzC,GAC7Bmf,EAAQjgB,EAAKigB,KASd,OAPAnf,GAAO1C,EAAOqxB,SAAUE,KACrBvxB,EAAOqxB,SAAUE,GAAanC,GAAgBmC,IAAcA,GAG/DlR,EAAQrgB,EAAOwwB,SAAU9tB,IAAU1C,EAAOwwB,SAAUe,GAGrCnuB,SAAV+C,EAqCCka,GAAS,OAASA,IACwBjd,UAA5C9B,EAAM+e,EAAMnf,IAAKU,GAAM,EAAO8tB,IAEzBpuB,EAIDugB,EAAOnf,IA3CdoB,QAAcqC,GAGA,WAATrC,IAAuBxC,EAAMwf,EAAQnV,KAAMxF,KAAa7E,EAAK,KACjE6E,EAAQgb,EAAWvf,EAAMc,EAAMpB,GAG/BwC,EAAO,UAIM,MAATqC,GAAiBA,IAAUA,IAKlB,WAATrC,IACJqC,GAAS7E,GAAOA,EAAK,KAAStB,EAAO2hB,UAAW4P,GAAa,GAAK,OAK7DzxB,EAAQwtB,iBAA6B,KAAVnnB,GAAiD,IAAjCzD,EAAKjD,QAAS,gBAC9DoiB,EAAOnf,GAAS,WAIX2d,GAAY,OAASA,IACsBjd,UAA9C+C,EAAQka,EAAMlB,IAAKvd,EAAMuE,EAAOupB,MAElC7N,EAAOnf,GAASyD,IAnBjB,UAoCF+a,IAAK,SAAUtf,EAAMc,EAAMgtB,EAAOE,GACjC,GAAIvf,GAAKlP,EAAKkf,EACbkR,EAAWvxB,EAAOmF,UAAWzC,EAyB9B,OAtBAA,GAAO1C,EAAOqxB,SAAUE,KACrBvxB,EAAOqxB,SAAUE,GAAanC,GAAgBmC,IAAcA,GAG/DlR,EAAQrgB,EAAOwwB,SAAU9tB,IAAU1C,EAAOwwB,SAAUe,GAG/ClR,GAAS,OAASA,KACtBhQ,EAAMgQ,EAAMnf,IAAKU,GAAM,EAAM8tB,IAIjBtsB,SAARiN,IACJA,EAAM8d,GAAQvsB,EAAMc,EAAMktB,IAId,WAARvf,GAAoB3N,IAAQqsB,MAChC1e,EAAM0e,GAAoBrsB,IAIZ,KAAVgtB,GAAgBA,GACpBvuB,EAAMgD,WAAYkM,GACXqf,KAAU,GAAQ8B,SAAUrwB,GAAQA,GAAO,EAAIkP,GAEhDA,KAITrQ,EAAOyB,MAAQ,SAAU,SAAW,SAAUI,EAAGa,GAChD1C,EAAOwwB,SAAU9tB,IAChBxB,IAAK,SAAUU,EAAMwsB,EAAUsB,GAC9B,MAAKtB,GAIGO,GAAa1iB,KAAMjM,EAAOkhB,IAAKtf,EAAM,aACtB,IAArBA,EAAKmuB,YACJjD,GAAMlrB,EAAMgtB,GAAS,WACpB,MAAOiB,IAAkBjuB,EAAMc,EAAMgtB,KAEtCG,GAAkBjuB,EAAMc,EAAMgtB,GATjC,QAaDvQ,IAAK,SAAUvd,EAAMuE,EAAOupB,GAC3B,GAAI1pB,GACH4pB,EAASF,GAAShD,GAAW9qB,GAC7B2tB,EAAWG,GAASD,GACnB7tB,EACAc,EACAgtB,EACmD,eAAnD1vB,EAAOkhB,IAAKtf,EAAM,aAAa,EAAOguB,GACtCA,EAWF,OAPKL,KAAcvpB,EAAU8a,EAAQnV,KAAMxF,KACb,QAA3BH,EAAS,IAAO,QAElBpE,EAAKigB,MAAOnf,GAASyD,EACrBA,EAAQnG,EAAOkhB,IAAKtf,EAAMc,IAGpB4sB,GAAmB1tB,EAAMuE,EAAOopB,OAK1CvvB,EAAOwwB,SAAS9C,WAAac,GAAc1uB,EAAQkuB,mBAClD,SAAUpsB,EAAMwsB,GACf,MAAKA,IACKjqB,WAAYgqB,GAAQvsB,EAAM,gBAClCA,EAAKwuB,wBAAwBqB,KAC5B3E,GAAMlrB,GAAQ8rB,WAAY,GAAK,WAC9B,MAAO9rB,GAAKwuB,wBAAwBqB,QAElC,KANN,SAYFzxB,EAAOwwB,SAAS5C,YAAcY,GAAc1uB,EAAQmuB,oBACnD,SAAUrsB,EAAMwsB,GACf,MAAKA,GACGtB,GAAMlrB,GAAQwqB,QAAW,gBAC/B+B,IAAUvsB,EAAM,gBAFlB,SAQF5B,EAAOyB,MACNiwB,OAAQ,GACRC,QAAS,GACTC,OAAQ,SACN,SAAUC,EAAQC,GACpB9xB,EAAOwwB,SAAUqB,EAASC,IACzBC,OAAQ,SAAU5rB,GAOjB,IANA,GAAItE,GAAI,EACPmwB,KAGAC,EAAyB,gBAAV9rB,GAAqBA,EAAMS,MAAO,MAAUT,GAEhD,EAAJtE,EAAOA,IACdmwB,EAAUH,EAAS9Q,EAAWlf,GAAMiwB,GACnCG,EAAOpwB,IAAOowB,EAAOpwB,EAAI,IAAOowB,EAAO,EAGzC,OAAOD,KAIHxF,GAAQvgB,KAAM4lB,KACnB7xB,EAAOwwB,SAAUqB,EAASC,GAAS3S,IAAMmQ,MAI3CtvB,EAAOG,GAAGqC,QACT0e,IAAK,SAAUxe,EAAMyD,GACpB,MAAOkY,GAAQlf,KAAM,SAAUyC,EAAMc,EAAMyD,GAC1C,GAAIypB,GAAQztB,EACXR,KACAE,EAAI,CAEL,IAAK7B,EAAOmD,QAAST,GAAS,CAI7B,IAHAktB,EAASlD,GAAW9qB,GACpBO,EAAMO,EAAK3B,OAECoB,EAAJN,EAASA,IAChBF,EAAKe,EAAMb,IAAQ7B,EAAOkhB,IAAKtf,EAAMc,EAAMb,IAAK,EAAO+tB,EAGxD,OAAOjuB,GAGR,MAAiByB,UAAV+C,EACNnG,EAAO6hB,MAAOjgB,EAAMc,EAAMyD,GAC1BnG,EAAOkhB,IAAKtf,EAAMc,IACjBA,EAAMyD,EAAOpE,UAAUhB,OAAS,IAEpCuvB,KAAM,WACL,MAAOD,IAAUlxB,MAAM,IAExB+yB,KAAM,WACL,MAAO7B,IAAUlxB,OAElBgzB,OAAQ,SAAUrW,GACjB,MAAsB,iBAAVA,GACJA,EAAQ3c,KAAKmxB,OAASnxB,KAAK+yB,OAG5B/yB,KAAKsC,KAAM,WACZuf,EAAU7hB,MACda,EAAQb,MAAOmxB,OAEftwB,EAAQb,MAAO+yB,WAOnB,SAASE,IAAOxwB,EAAMa,EAAS4c,EAAMhd,EAAKgwB,GACzC,MAAO,IAAID,IAAMxxB,UAAUR,KAAMwB,EAAMa,EAAS4c,EAAMhd,EAAKgwB,GAE5DryB,EAAOoyB,MAAQA,GAEfA,GAAMxxB,WACLE,YAAasxB,GACbhyB,KAAM,SAAUwB,EAAMa,EAAS4c,EAAMhd,EAAKgwB,EAAQ3Q,GACjDviB,KAAKyC,KAAOA,EACZzC,KAAKkgB,KAAOA,EACZlgB,KAAKkzB,OAASA,GAAUryB,EAAOqyB,OAAO9P,SACtCpjB,KAAKsD,QAAUA,EACftD,KAAKmT,MAAQnT,KAAKqH,IAAMrH,KAAKmO,MAC7BnO,KAAKkD,IAAMA,EACXlD,KAAKuiB,KAAOA,IAAU1hB,EAAO2hB,UAAWtC,GAAS,GAAK,OAEvD/R,IAAK,WACJ,GAAI+S,GAAQ+R,GAAME,UAAWnzB,KAAKkgB,KAElC,OAAOgB,IAASA,EAAMnf,IACrBmf,EAAMnf,IAAK/B,MACXizB,GAAME,UAAU/P,SAASrhB,IAAK/B,OAEhCozB,IAAK,SAAUC,GACd,GAAIC,GACHpS,EAAQ+R,GAAME,UAAWnzB,KAAKkgB,KAoB/B,OAlBKlgB,MAAKsD,QAAQiwB,SACjBvzB,KAAKya,IAAM6Y,EAAQzyB,EAAOqyB,OAAQlzB,KAAKkzB,QACtCG,EAASrzB,KAAKsD,QAAQiwB,SAAWF,EAAS,EAAG,EAAGrzB,KAAKsD,QAAQiwB,UAG9DvzB,KAAKya,IAAM6Y,EAAQD,EAEpBrzB,KAAKqH,KAAQrH,KAAKkD,IAAMlD,KAAKmT,OAAUmgB,EAAQtzB,KAAKmT,MAE/CnT,KAAKsD,QAAQkwB,MACjBxzB,KAAKsD,QAAQkwB,KAAK1xB,KAAM9B,KAAKyC,KAAMzC,KAAKqH,IAAKrH,MAGzCkhB,GAASA,EAAMlB,IACnBkB,EAAMlB,IAAKhgB,MAEXizB,GAAME,UAAU/P,SAASpD,IAAKhgB,MAExBA,OAITizB,GAAMxxB,UAAUR,KAAKQ,UAAYwxB,GAAMxxB,UAEvCwxB,GAAME,WACL/P,UACCrhB,IAAK,SAAUmgB,GACd,GAAIxP,EAIJ,OAA6B,KAAxBwP,EAAMzf,KAAKyC,UACa,MAA5Bgd,EAAMzf,KAAMyf,EAAMhC,OAAoD,MAAlCgC,EAAMzf,KAAKigB,MAAOR,EAAMhC,MACrDgC,EAAMzf,KAAMyf,EAAMhC,OAO1BxN,EAAS7R,EAAOkhB,IAAKG,EAAMzf,KAAMyf,EAAMhC,KAAM,IAGrCxN,GAAqB,SAAXA,EAAwBA,EAAJ,IAEvCsN,IAAK,SAAUkC,GAKTrhB,EAAO4yB,GAAGD,KAAMtR,EAAMhC,MAC1Brf,EAAO4yB,GAAGD,KAAMtR,EAAMhC,MAAQgC,GACK,IAAxBA,EAAMzf,KAAKyC,UACiC,MAArDgd,EAAMzf,KAAKigB,MAAO7hB,EAAOqxB,SAAUhQ,EAAMhC,SAC1Crf,EAAOwwB,SAAUnP,EAAMhC,MAGxBgC,EAAMzf,KAAMyf,EAAMhC,MAASgC,EAAM7a,IAFjCxG,EAAO6hB,MAAOR,EAAMzf,KAAMyf,EAAMhC,KAAMgC,EAAM7a,IAAM6a,EAAMK,SAU5D0Q,GAAME,UAAUxK,UAAYsK,GAAME,UAAU5K,YAC3CvI,IAAK,SAAUkC,GACTA,EAAMzf,KAAKyC,UAAYgd,EAAMzf,KAAKqD,aACtCoc,EAAMzf,KAAMyf,EAAMhC,MAASgC,EAAM7a,OAKpCxG,EAAOqyB,QACNQ,OAAQ,SAAUC,GACjB,MAAOA,IAERC,MAAO,SAAUD,GAChB,MAAO,GAAMxvB,KAAK0vB,IAAKF,EAAIxvB,KAAK2vB,IAAO,GAExC1Q,SAAU,SAGXviB,EAAO4yB,GAAKR,GAAMxxB,UAAUR,KAG5BJ,EAAO4yB,GAAGD,OAKV,IACCO,IAAOC,GACPC,GAAW,yBACXC,GAAO,aAGR,SAASC,MAIR,MAHAp0B,GAAOkf,WAAY,WAClB8U,GAAQ9vB,SAEA8vB,GAAQlzB,EAAOwG,MAIzB,QAAS+sB,IAAOzvB,EAAM0vB,GACrB,GAAItM,GACHrlB,EAAI,EACJqL,GAAUumB,OAAQ3vB,EAKnB,KADA0vB,EAAeA,EAAe,EAAI,EACtB,EAAJ3xB,EAAQA,GAAK,EAAI2xB,EACxBtM,EAAQnG,EAAWlf,GACnBqL,EAAO,SAAWga,GAAUha,EAAO,UAAYga,GAAUpjB,CAO1D,OAJK0vB,KACJtmB,EAAMujB,QAAUvjB,EAAMygB,MAAQ7pB,GAGxBoJ,EAGR,QAASwmB,IAAavtB,EAAOkZ,EAAMsU,GAKlC,IAJA,GAAItS,GACHiJ,GAAesJ,GAAUC,SAAUxU,QAAe9f,OAAQq0B,GAAUC,SAAU,MAC9Eha,EAAQ,EACR9Y,EAASupB,EAAWvpB,OACLA,EAAR8Y,EAAgBA,IACvB,GAAOwH,EAAQiJ,EAAYzQ,GAAQ5Y,KAAM0yB,EAAWtU,EAAMlZ,GAGzD,MAAOkb,GAKV,QAASyS,IAAkBlyB,EAAMklB,EAAOiN,GAEvC,GAAI1U,GAAMlZ,EAAOgsB,EAAQ9Q,EAAOhB,EAAO2T,EAAS5H,EAAS6H,EACxDC,EAAO/0B,KACP+pB,KACArH,EAAQjgB,EAAKigB,MACb0O,EAAS3uB,EAAKyC,UAAY2c,EAAUpf,GACpCuyB,EAAW1U,EAASve,IAAKU,EAAM,SAG1BmyB,GAAK7Y,QACVmF,EAAQrgB,EAAOsgB,YAAa1e,EAAM,MACX,MAAlBye,EAAM+T,WACV/T,EAAM+T,SAAW,EACjBJ,EAAU3T,EAAMnM,MAAMkH,KACtBiF,EAAMnM,MAAMkH,KAAO,WACZiF,EAAM+T,UACXJ,MAIH3T,EAAM+T,WAENF,EAAKlY,OAAQ,WAGZkY,EAAKlY,OAAQ,WACZqE,EAAM+T,WACAp0B,EAAOkb,MAAOtZ,EAAM,MAAOb,QAChCsf,EAAMnM,MAAMkH,YAOO,IAAlBxZ,EAAKyC,WAAoB,UAAYyiB,IAAS,SAAWA,MAM7DiN,EAAKM,UAAaxS,EAAMwS,SAAUxS,EAAMyS,UAAWzS,EAAM0S,WAIzDnI,EAAUpsB,EAAOkhB,IAAKtf,EAAM,WAG5BqyB,EAA2B,SAAZ7H,EACd3M,EAASve,IAAKU,EAAM,eAAkByqB,GAAgBzqB,EAAKyD,UAAa+mB,EAEnD,WAAjB6H,GAA6D,SAAhCj0B,EAAOkhB,IAAKtf,EAAM,WACnDigB,EAAMuK,QAAU,iBAIb2H,EAAKM,WACTxS,EAAMwS,SAAW,SACjBH,EAAKlY,OAAQ,WACZ6F,EAAMwS,SAAWN,EAAKM,SAAU,GAChCxS,EAAMyS,UAAYP,EAAKM,SAAU,GACjCxS,EAAM0S,UAAYR,EAAKM,SAAU,KAKnC,KAAMhV,IAAQyH,GAEb,GADA3gB,EAAQ2gB,EAAOzH,GACV+T,GAASznB,KAAMxF,GAAU,CAG7B,SAFO2gB,GAAOzH,GACd8S,EAASA,GAAoB,WAAVhsB,EACdA,KAAYoqB,EAAS,OAAS,QAAW,CAI7C,GAAe,SAAVpqB,IAAoBguB,GAAiC/wB,SAArB+wB,EAAU9U,GAG9C,QAFAkR,IAAS,EAKXrH,EAAM7J,GAAS8U,GAAYA,EAAU9U,IAAUrf,EAAO6hB,MAAOjgB,EAAMyd,OAInE+M,GAAUhpB,MAIZ,IAAMpD,EAAOsE,cAAe4kB,GAyCuD,YAAzD,SAAZkD,EAAqBC,GAAgBzqB,EAAKyD,UAAa+mB,KACpEvK,EAAMuK,QAAUA,OA1CoB,CAC/B+H,EACC,UAAYA,KAChB5D,EAAS4D,EAAS5D,QAGnB4D,EAAW1U,EAASpB,OAAQzc,EAAM,aAI9BuwB,IACJgC,EAAS5D,QAAUA,GAEfA,EACJvwB,EAAQ4B,GAAO0uB,OAEf4D,EAAKnsB,KAAM,WACV/H,EAAQ4B,GAAOswB,SAGjBgC,EAAKnsB,KAAM,WACV,GAAIsX,EAEJI,GAASlE,OAAQ3Z,EAAM,SACvB,KAAMyd,IAAQ6J,GACblpB,EAAO6hB,MAAOjgB,EAAMyd,EAAM6J,EAAM7J,KAGlC,KAAMA,IAAQ6J,GACb7H,EAAQqS,GAAanD,EAAS4D,EAAU9U,GAAS,EAAGA,EAAM6U,GAElD7U,IAAQ8U,KACfA,EAAU9U,GAASgC,EAAM/O,MACpBie,IACJlP,EAAMhf,IAAMgf,EAAM/O,MAClB+O,EAAM/O,MAAiB,UAAT+M,GAA6B,WAATA,EAAoB,EAAI,KAW/D,QAASmV,IAAY1N,EAAO2N,GAC3B,GAAI5a,GAAOnX,EAAM2vB,EAAQlsB,EAAOka,CAGhC,KAAMxG,IAASiN,GAed,GAdApkB,EAAO1C,EAAOmF,UAAW0U,GACzBwY,EAASoC,EAAe/xB,GACxByD,EAAQ2gB,EAAOjN,GACV7Z,EAAOmD,QAASgD,KACpBksB,EAASlsB,EAAO,GAChBA,EAAQ2gB,EAAOjN,GAAU1T,EAAO,IAG5B0T,IAAUnX,IACdokB,EAAOpkB,GAASyD,QACT2gB,GAAOjN,IAGfwG,EAAQrgB,EAAOwwB,SAAU9tB,GACpB2d,GAAS,UAAYA,GAAQ,CACjCla,EAAQka,EAAM0R,OAAQ5rB,SACf2gB,GAAOpkB,EAId,KAAMmX,IAAS1T,GACN0T,IAASiN,KAChBA,EAAOjN,GAAU1T,EAAO0T,GACxB4a,EAAe5a,GAAUwY,OAI3BoC,GAAe/xB,GAAS2vB,EAK3B,QAASuB,IAAWhyB,EAAM8yB,EAAYjyB,GACrC,GAAIoP,GACH8iB,EACA9a,EAAQ,EACR9Y,EAAS6yB,GAAUgB,WAAW7zB,OAC9Bkb,EAAWjc,EAAO2b,WAAWK,OAAQ,iBAG7B6Y,GAAKjzB,OAEbizB,EAAO,WACN,GAAKF,EACJ,OAAO,CAYR,KAVA,GAAIG,GAAc5B,IAASI,KAC1BrW,EAAY3Z,KAAKksB,IAAK,EAAGmE,EAAUoB,UAAYpB,EAAUjB,SAAWoC,GAIpEte,EAAOyG,EAAY0W,EAAUjB,UAAY,EACzCF,EAAU,EAAIhc,EACdqD,EAAQ,EACR9Y,EAAS4yB,EAAUqB,OAAOj0B,OAEXA,EAAR8Y,EAAiBA,IACxB8Z,EAAUqB,OAAQnb,GAAQ0Y,IAAKC,EAKhC,OAFAvW,GAASoB,WAAYzb,GAAQ+xB,EAAWnB,EAASvV,IAElC,EAAVuV,GAAezxB,EACZkc,GAEPhB,EAASqB,YAAa1b,GAAQ+xB,KACvB,IAGTA,EAAY1X,EAASF,SACpBna,KAAMA,EACNklB,MAAO9mB,EAAOwC,UAAYkyB,GAC1BX,KAAM/zB,EAAOwC,QAAQ,GACpBiyB,iBACApC,OAAQryB,EAAOqyB,OAAO9P,UACpB9f,GACHwyB,mBAAoBP,EACpBQ,gBAAiBzyB,EACjBsyB,UAAW7B,IAASI,KACpBZ,SAAUjwB,EAAQiwB,SAClBsC,UACAtB,YAAa,SAAUrU,EAAMhd,GAC5B,GAAIgf,GAAQrhB,EAAOoyB,MAAOxwB,EAAM+xB,EAAUI,KAAM1U,EAAMhd,EACpDsxB,EAAUI,KAAKU,cAAepV,IAAUsU,EAAUI,KAAK1B,OAEzD,OADAsB,GAAUqB,OAAOx1B,KAAM6hB,GAChBA,GAERd,KAAM,SAAU4U,GACf,GAAItb,GAAQ,EAIX9Y,EAASo0B,EAAUxB,EAAUqB,OAAOj0B,OAAS,CAC9C,IAAK4zB,EACJ,MAAOx1B,KAGR,KADAw1B,GAAU,EACM5zB,EAAR8Y,EAAiBA,IACxB8Z,EAAUqB,OAAQnb,GAAQ0Y,IAAK,EAUhC,OANK4C,IACJlZ,EAASoB,WAAYzb,GAAQ+xB,EAAW,EAAG,IAC3C1X,EAASqB,YAAa1b,GAAQ+xB,EAAWwB,KAEzClZ,EAASmZ,WAAYxzB,GAAQ+xB,EAAWwB,IAElCh2B,QAGT2nB,EAAQ6M,EAAU7M,KAInB,KAFA0N,GAAY1N,EAAO6M,EAAUI,KAAKU,eAElB1zB,EAAR8Y,EAAiBA,IAExB,GADAhI,EAAS+hB,GAAUgB,WAAY/a,GAAQ5Y,KAAM0yB,EAAW/xB,EAAMklB,EAAO6M,EAAUI,MAM9E,MAJK/zB,GAAOiD,WAAY4O,EAAO0O,QAC9BvgB,EAAOsgB,YAAaqT,EAAU/xB,KAAM+xB,EAAUI,KAAK7Y,OAAQqF,KAC1DvgB,EAAOqG,MAAOwL,EAAO0O,KAAM1O,IAEtBA,CAmBT,OAfA7R,GAAO2B,IAAKmlB,EAAO4M,GAAaC,GAE3B3zB,EAAOiD,WAAY0wB,EAAUI,KAAKzhB,QACtCqhB,EAAUI,KAAKzhB,MAAMrR,KAAMW,EAAM+xB,GAGlC3zB,EAAO4yB,GAAGyC,MACTr1B,EAAOwC,OAAQqyB,GACdjzB,KAAMA,EACNsyB,KAAMP,EACNzY,MAAOyY,EAAUI,KAAK7Y,SAKjByY,EAAUnX,SAAUmX,EAAUI,KAAKvX,UACxCzU,KAAM4rB,EAAUI,KAAKhsB,KAAM4rB,EAAUI,KAAKuB,UAC1CpZ,KAAMyX,EAAUI,KAAK7X,MACrBF,OAAQ2X,EAAUI,KAAK/X,QAG1Bhc,EAAO4zB,UAAY5zB,EAAOwC,OAAQoxB,IACjCC,UACC0B,KAAO,SAAUlW,EAAMlZ,GACtB,GAAIkb,GAAQliB,KAAKu0B,YAAarU,EAAMlZ,EAEpC,OADAgb,GAAWE,EAAMzf,KAAMyd,EAAMyB,EAAQnV,KAAMxF,GAASkb,GAC7CA,KAITmU,QAAS,SAAU1O,EAAOplB,GACpB1B,EAAOiD,WAAY6jB,IACvBplB,EAAWolB,EACXA,GAAU,MAEVA,EAAQA,EAAMxb,MAAOmP,EAOtB,KAJA,GAAI4E,GACHxF,EAAQ,EACR9Y,EAAS+lB,EAAM/lB,OAEAA,EAAR8Y,EAAiBA,IACxBwF,EAAOyH,EAAOjN,GACd+Z,GAAUC,SAAUxU,GAASuU,GAAUC,SAAUxU,OACjDuU,GAAUC,SAAUxU,GAAOpP,QAASvO,IAItCkzB,YAAcd,IAEd2B,UAAW,SAAU/zB,EAAU0pB,GACzBA,EACJwI,GAAUgB,WAAW3kB,QAASvO,GAE9BkyB,GAAUgB,WAAWp1B,KAAMkC,MAK9B1B,EAAO01B,MAAQ,SAAUA,EAAOrD,EAAQlyB,GACvC,GAAIw1B,GAAMD,GAA0B,gBAAVA,GAAqB11B,EAAOwC,UAAYkzB,IACjEJ,SAAUn1B,IAAOA,GAAMkyB,GACtBryB,EAAOiD,WAAYyyB,IAAWA,EAC/BhD,SAAUgD,EACVrD,OAAQlyB,GAAMkyB,GAAUA,IAAWryB,EAAOiD,WAAYovB,IAAYA,EAyBnE,OAtBAsD,GAAIjD,SAAW1yB,EAAO4yB,GAAG7U,IAAM,EAA4B,gBAAjB4X,GAAIjD,SAC7CiD,EAAIjD,SAAWiD,EAAIjD,WAAY1yB,GAAO4yB,GAAGgD,OACxC51B,EAAO4yB,GAAGgD,OAAQD,EAAIjD,UAAa1yB,EAAO4yB,GAAGgD,OAAOrT,SAGpC,MAAboT,EAAIza,OAAiBya,EAAIza,SAAU,IACvCya,EAAIza,MAAQ,MAIbya,EAAI5I,IAAM4I,EAAIL,SAEdK,EAAIL,SAAW,WACTt1B,EAAOiD,WAAY0yB,EAAI5I,MAC3B4I,EAAI5I,IAAI9rB,KAAM9B,MAGVw2B,EAAIza,OACRlb,EAAOmgB,QAAShhB,KAAMw2B,EAAIza,QAIrBya,GAGR31B,EAAOG,GAAGqC,QACTqzB,OAAQ,SAAUH,EAAOI,EAAIzD,EAAQ3wB,GAGpC,MAAOvC,MAAK0P,OAAQmS,GAAWE,IAAK,UAAW,GAAIoP,OAGjDjuB,MAAM0zB,SAAWtF,QAASqF,GAAMJ,EAAOrD,EAAQ3wB,IAElDq0B,QAAS,SAAU1W,EAAMqW,EAAOrD,EAAQ3wB,GACvC,GAAIwS,GAAQlU,EAAOsE,cAAe+a,GACjC2W,EAASh2B,EAAO01B,MAAOA,EAAOrD,EAAQ3wB,GACtCu0B,EAAc,WAGb,GAAI/B,GAAON,GAAWz0B,KAAMa,EAAOwC,UAAY6c,GAAQ2W,IAGlD9hB,GAASuL,EAASve,IAAK/B,KAAM,YACjC+0B,EAAK3T,MAAM,GAKd,OAFC0V,GAAYC,OAASD,EAEf/hB,GAAS8hB,EAAO9a,SAAU,EAChC/b,KAAKsC,KAAMw0B,GACX92B,KAAK+b,MAAO8a,EAAO9a,MAAO+a,IAE5B1V,KAAM,SAAUzc,EAAM2c,EAAY0U,GACjC,GAAIgB,GAAY,SAAU9V,GACzB,GAAIE,GAAOF,EAAME,WACVF,GAAME,KACbA,EAAM4U,GAYP,OATqB,gBAATrxB,KACXqxB,EAAU1U,EACVA,EAAa3c,EACbA,EAAOV,QAEHqd,GAAc3c,KAAS,GAC3B3E,KAAK+b,MAAOpX,GAAQ,SAGd3E,KAAKsC,KAAM,WACjB,GAAI0e,IAAU,EACbtG,EAAgB,MAAR/V,GAAgBA,EAAO,aAC/BsyB,EAASp2B,EAAOo2B,OAChBhX,EAAOK,EAASve,IAAK/B,KAEtB,IAAK0a,EACCuF,EAAMvF,IAAWuF,EAAMvF,GAAQ0G,MACnC4V,EAAW/W,EAAMvF,QAGlB,KAAMA,IAASuF,GACTA,EAAMvF,IAAWuF,EAAMvF,GAAQ0G,MAAQ8S,GAAKpnB,KAAM4N,IACtDsc,EAAW/W,EAAMvF,GAKpB,KAAMA,EAAQuc,EAAOr1B,OAAQ8Y,KACvBuc,EAAQvc,GAAQjY,OAASzC,MACnB,MAAR2E,GAAgBsyB,EAAQvc,GAAQqB,QAAUpX,IAE5CsyB,EAAQvc,GAAQqa,KAAK3T,KAAM4U,GAC3BhV,GAAU,EACViW,EAAO7zB,OAAQsX,EAAO,KAOnBsG,GAAYgV,GAChBn1B,EAAOmgB,QAAShhB,KAAM2E,MAIzBoyB,OAAQ,SAAUpyB,GAIjB,MAHKA,MAAS,IACbA,EAAOA,GAAQ,MAET3E,KAAKsC,KAAM,WACjB,GAAIoY,GACHuF,EAAOK,EAASve,IAAK/B,MACrB+b,EAAQkE,EAAMtb,EAAO,SACrBuc,EAAQjB,EAAMtb,EAAO,cACrBsyB,EAASp2B,EAAOo2B,OAChBr1B,EAASma,EAAQA,EAAMna,OAAS,CAajC,KAVAqe,EAAK8W,QAAS,EAGdl2B,EAAOkb,MAAO/b,KAAM2E,MAEfuc,GAASA,EAAME,MACnBF,EAAME,KAAKtf,KAAM9B,MAAM,GAIlB0a,EAAQuc,EAAOr1B,OAAQ8Y,KACvBuc,EAAQvc,GAAQjY,OAASzC,MAAQi3B,EAAQvc,GAAQqB,QAAUpX,IAC/DsyB,EAAQvc,GAAQqa,KAAK3T,MAAM,GAC3B6V,EAAO7zB,OAAQsX,EAAO,GAKxB,KAAMA,EAAQ,EAAW9Y,EAAR8Y,EAAgBA,IAC3BqB,EAAOrB,IAAWqB,EAAOrB,GAAQqc,QACrChb,EAAOrB,GAAQqc,OAAOj1B,KAAM9B,YAKvBigB,GAAK8W,YAKfl2B,EAAOyB,MAAQ,SAAU,OAAQ,QAAU,SAAUI,EAAGa,GACvD,GAAI2zB,GAAQr2B,EAAOG,GAAIuC,EACvB1C,GAAOG,GAAIuC,GAAS,SAAUgzB,EAAOrD,EAAQ3wB,GAC5C,MAAgB,OAATg0B,GAAkC,iBAAVA,GAC9BW,EAAMv0B,MAAO3C,KAAM4C,WACnB5C,KAAK42B,QAASxC,GAAO7wB,GAAM,GAAQgzB,EAAOrD,EAAQ3wB,MAKrD1B,EAAOyB,MACN60B,UAAW/C,GAAO,QAClBgD,QAAShD,GAAO,QAChBiD,YAAajD,GAAO,UACpBkD,QAAUhG,QAAS,QACnBiG,SAAWjG,QAAS,QACpBkG,YAAclG,QAAS,WACrB,SAAU/tB,EAAMokB,GAClB9mB,EAAOG,GAAIuC,GAAS,SAAUgzB,EAAOrD,EAAQ3wB,GAC5C,MAAOvC,MAAK42B,QAASjP,EAAO4O,EAAOrD,EAAQ3wB,MAI7C1B,EAAOo2B,UACPp2B,EAAO4yB,GAAGiC,KAAO,WAChB,GAAIQ,GACHxzB,EAAI,EACJu0B,EAASp2B,EAAOo2B,MAIjB,KAFAlD,GAAQlzB,EAAOwG,MAEP3E,EAAIu0B,EAAOr1B,OAAQc,IAC1BwzB,EAAQe,EAAQv0B,GAGVwzB,KAAWe,EAAQv0B,KAAQwzB,GAChCe,EAAO7zB,OAAQV,IAAK,EAIhBu0B,GAAOr1B,QACZf,EAAO4yB,GAAGrS,OAEX2S,GAAQ9vB,QAGTpD,EAAO4yB,GAAGyC,MAAQ,SAAUA,GAC3Br1B,EAAOo2B,OAAO52B,KAAM61B,GACfA,IACJr1B,EAAO4yB,GAAGtgB,QAEVtS,EAAOo2B,OAAO5tB,OAIhBxI,EAAO4yB,GAAGgE,SAAW,GACrB52B,EAAO4yB,GAAGtgB,MAAQ,WACX6gB,KACLA,GAAUj0B,EAAO23B,YAAa72B,EAAO4yB,GAAGiC,KAAM70B,EAAO4yB,GAAGgE,YAI1D52B,EAAO4yB,GAAGrS,KAAO,WAChBrhB,EAAO43B,cAAe3D,IAEtBA,GAAU,MAGXnzB,EAAO4yB,GAAGgD,QACTmB,KAAM,IACNC,KAAM,IAGNzU,SAAU,KAMXviB,EAAOG,GAAG82B,MAAQ,SAAUC,EAAMpzB,GAIjC,MAHAozB,GAAOl3B,EAAO4yB,GAAK5yB,EAAO4yB,GAAGgD,OAAQsB,IAAUA,EAAOA,EACtDpzB,EAAOA,GAAQ,KAER3E,KAAK+b,MAAOpX,EAAM,SAAUyV,EAAM8G,GACxC,GAAI8W,GAAUj4B,EAAOkf,WAAY7E,EAAM2d,EACvC7W,GAAME,KAAO,WACZrhB,EAAOk4B,aAAcD,OAMxB,WACC,GAAIjoB,GAAQnQ,EAAS8F,cAAe,SACnCsC,EAASpI,EAAS8F,cAAe,UACjC8wB,EAAMxuB,EAAOnC,YAAajG,EAAS8F,cAAe,UAEnDqK,GAAMpL,KAAO,WAIbhE,EAAQu3B,QAA0B,KAAhBnoB,EAAM/I,MAIxBrG,EAAQw3B,YAAc3B,EAAI3hB,SAI1B7M,EAAO2M,UAAW,EAClBhU,EAAQy3B,aAAe5B,EAAI7hB,SAI3B5E,EAAQnQ,EAAS8F,cAAe,SAChCqK,EAAM/I,MAAQ,IACd+I,EAAMpL,KAAO,QACbhE,EAAQ03B,WAA6B,MAAhBtoB,EAAM/I,QAI5B,IAAIsxB,IACHrqB,GAAapN,EAAOkQ,KAAK9C,UAE1BpN,GAAOG,GAAGqC,QACT4N,KAAM,SAAU1N,EAAMyD,GACrB,MAAOkY,GAAQlf,KAAMa,EAAOoQ,KAAM1N,EAAMyD,EAAOpE,UAAUhB,OAAS,IAGnE22B,WAAY,SAAUh1B,GACrB,MAAOvD,MAAKsC,KAAM,WACjBzB,EAAO03B,WAAYv4B,KAAMuD,QAK5B1C,EAAOwC,QACN4N,KAAM,SAAUxO,EAAMc,EAAMyD,GAC3B,GAAI7E,GAAK+e,EACRsX,EAAQ/1B,EAAKyC,QAGd,IAAe,IAAVszB,GAAyB,IAAVA,GAAyB,IAAVA,EAKnC,MAAkC,mBAAtB/1B,GAAKsK,aACTlM,EAAOqf,KAAMzd,EAAMc,EAAMyD,IAKlB,IAAVwxB,GAAgB33B,EAAOoY,SAAUxW,KACrCc,EAAOA,EAAK4C,cACZ+a,EAAQrgB,EAAO43B,UAAWl1B,KACvB1C,EAAOkQ,KAAK5E,MAAMxB,KAAKmC,KAAMvJ,GAAS+0B,GAAWr0B,SAGtCA,SAAV+C,EACW,OAAVA,MACJnG,GAAO03B,WAAY91B,EAAMc,GAIrB2d,GAAS,OAASA,IACuBjd,UAA3C9B,EAAM+e,EAAMlB,IAAKvd,EAAMuE,EAAOzD,IACzBpB,GAGRM,EAAKuK,aAAczJ,EAAMyD,EAAQ,IAC1BA,GAGHka,GAAS,OAASA,IAA+C,QAApC/e,EAAM+e,EAAMnf,IAAKU,EAAMc,IACjDpB,GAGRA,EAAMtB,EAAO4O,KAAKwB,KAAMxO,EAAMc,GAGhB,MAAPpB,EAAc8B,OAAY9B,KAGlCs2B,WACC9zB,MACCqb,IAAK,SAAUvd,EAAMuE,GACpB,IAAMrG,EAAQ03B,YAAwB,UAAVrxB,GAC3BnG,EAAOqF,SAAUzD,EAAM,SAAY,CACnC,GAAIyO,GAAMzO,EAAKuE,KAKf,OAJAvE,GAAKuK,aAAc,OAAQhG,GACtBkK,IACJzO,EAAKuE,MAAQkK,GAEPlK,MAMXuxB,WAAY,SAAU91B,EAAMuE,GAC3B,GAAIzD,GAAMm1B,EACTh2B,EAAI,EACJi2B,EAAY3xB,GAASA,EAAMmF,MAAOmP,EAEnC,IAAKqd,GAA+B,IAAlBl2B,EAAKyC,SACtB,MAAU3B,EAAOo1B,EAAWj2B,KAC3Bg2B,EAAW73B,EAAO+3B,QAASr1B,IAAUA,EAGhC1C,EAAOkQ,KAAK5E,MAAMxB,KAAKmC,KAAMvJ,KAGjCd,EAAMi2B,IAAa,GAGpBj2B,EAAK6K,gBAAiB/J,MAO1B+0B,IACCtY,IAAK,SAAUvd,EAAMuE,EAAOzD,GAQ3B,MAPKyD,MAAU,EAGdnG,EAAO03B,WAAY91B,EAAMc,GAEzBd,EAAKuK,aAAczJ,EAAMA,GAEnBA,IAGT1C,EAAOyB,KAAMzB,EAAOkQ,KAAK5E,MAAMxB,KAAK+W,OAAOvV,MAAO,QAAU,SAAUzJ,EAAGa,GACxE,GAAIs1B,GAAS5qB,GAAY1K,IAAU1C,EAAO4O,KAAKwB,IAE/ChD,IAAY1K,GAAS,SAAUd,EAAMc,EAAMsE,GAC1C,GAAI1F,GAAK+jB,CAWT,OAVMre,KAGLqe,EAASjY,GAAY1K,GACrB0K,GAAY1K,GAASpB,EACrBA,EAAqC,MAA/B02B,EAAQp2B,EAAMc,EAAMsE,GACzBtE,EAAK4C,cACL,KACD8H,GAAY1K,GAAS2iB,GAEf/jB,IAOT,IAAI22B,IAAa,sCAChBC,GAAa,eAEdl4B,GAAOG,GAAGqC,QACT6c,KAAM,SAAU3c,EAAMyD,GACrB,MAAOkY,GAAQlf,KAAMa,EAAOqf,KAAM3c,EAAMyD,EAAOpE,UAAUhB,OAAS,IAGnEo3B,WAAY,SAAUz1B,GACrB,MAAOvD,MAAKsC,KAAM,iBACVtC,MAAMa,EAAO+3B,QAASr1B,IAAUA,QAK1C1C,EAAOwC,QACN6c,KAAM,SAAUzd,EAAMc,EAAMyD,GAC3B,GAAI7E,GAAK+e,EACRsX,EAAQ/1B,EAAKyC,QAGd,IAAe,IAAVszB,GAAyB,IAAVA,GAAyB,IAAVA,EAWnC,MAPe,KAAVA,GAAgB33B,EAAOoY,SAAUxW,KAGrCc,EAAO1C,EAAO+3B,QAASr1B,IAAUA;AACjC2d,EAAQrgB,EAAOsyB,UAAW5vB,IAGZU,SAAV+C,EACCka,GAAS,OAASA,IACuBjd,UAA3C9B,EAAM+e,EAAMlB,IAAKvd,EAAMuE,EAAOzD,IACzBpB,EAGCM,EAAMc,GAASyD,EAGpBka,GAAS,OAASA,IAA+C,QAApC/e,EAAM+e,EAAMnf,IAAKU,EAAMc,IACjDpB,EAGDM,EAAMc,IAGd4vB,WACC1e,UACC1S,IAAK,SAAUU,GAMd,GAAIw2B,GAAWp4B,EAAO4O,KAAKwB,KAAMxO,EAAM,WAEvC,OAAOw2B,GACNC,SAAUD,EAAU,IACpBH,GAAWhsB,KAAMrK,EAAKyD,WACrB6yB,GAAWjsB,KAAMrK,EAAKyD,WAAczD,EAAK+R,KACxC,EACA,MAKNokB,SACCO,MAAO,UACPC,QAAS,eAULz4B,EAAQw3B,cACbt3B,EAAOsyB,UAAUte,UAChB9S,IAAK,SAAUU,GACd,GAAIsM,GAAStM,EAAKqD,UAIlB,OAHKiJ,IAAUA,EAAOjJ,YACrBiJ,EAAOjJ,WAAWgP,cAEZ,MAERkL,IAAK,SAAUvd,GACd,GAAIsM,GAAStM,EAAKqD,UACbiJ,KACJA,EAAO+F,cAEF/F,EAAOjJ,YACXiJ,EAAOjJ,WAAWgP,kBAOvBjU,EAAOyB,MACN,WACA,WACA,YACA,cACA,cACA,UACA,UACA,SACA,cACA,mBACE,WACFzB,EAAO+3B,QAAS54B,KAAKmG,eAAkBnG,MAMxC,IAAIq5B,IAAS,aAEb,SAASC,IAAU72B,GAClB,MAAOA,GAAKsK,cAAgBtK,EAAKsK,aAAc,UAAa,GAG7DlM,EAAOG,GAAGqC,QACTk2B,SAAU,SAAUvyB,GACnB,GAAIwyB,GAAS/2B,EAAM0L,EAAKsrB,EAAUC,EAAOz2B,EAAG02B,EAC3Cj3B,EAAI,CAEL,IAAK7B,EAAOiD,WAAYkD,GACvB,MAAOhH,MAAKsC,KAAM,SAAUW,GAC3BpC,EAAQb,MAAOu5B,SAAUvyB,EAAMlF,KAAM9B,KAAMiD,EAAGq2B,GAAUt5B,SAI1D,IAAsB,gBAAVgH,IAAsBA,EAAQ,CACzCwyB,EAAUxyB,EAAMmF,MAAOmP,MAEvB,OAAU7Y,EAAOzC,KAAM0C,KAKtB,GAJA+2B,EAAWH,GAAU72B,GACrB0L,EAAwB,IAAlB1L,EAAKyC,WACR,IAAMu0B,EAAW,KAAMp1B,QAASg1B,GAAQ,KAEhC,CACVp2B,EAAI,CACJ,OAAUy2B,EAAQF,EAASv2B,KACrBkL,EAAI7N,QAAS,IAAMo5B,EAAQ,KAAQ,IACvCvrB,GAAOurB,EAAQ,IAKjBC,GAAa94B,EAAO4E,KAAM0I,GACrBsrB,IAAaE,GACjBl3B,EAAKuK,aAAc,QAAS2sB,IAMhC,MAAO35B,OAGR45B,YAAa,SAAU5yB,GACtB,GAAIwyB,GAAS/2B,EAAM0L,EAAKsrB,EAAUC,EAAOz2B,EAAG02B,EAC3Cj3B,EAAI,CAEL,IAAK7B,EAAOiD,WAAYkD,GACvB,MAAOhH,MAAKsC,KAAM,SAAUW,GAC3BpC,EAAQb,MAAO45B,YAAa5yB,EAAMlF,KAAM9B,KAAMiD,EAAGq2B,GAAUt5B,SAI7D,KAAM4C,UAAUhB,OACf,MAAO5B,MAAKiR,KAAM,QAAS,GAG5B,IAAsB,gBAAVjK,IAAsBA,EAAQ,CACzCwyB,EAAUxyB,EAAMmF,MAAOmP,MAEvB,OAAU7Y,EAAOzC,KAAM0C,KAOtB,GANA+2B,EAAWH,GAAU72B,GAGrB0L,EAAwB,IAAlB1L,EAAKyC,WACR,IAAMu0B,EAAW,KAAMp1B,QAASg1B,GAAQ,KAEhC,CACVp2B,EAAI,CACJ,OAAUy2B,EAAQF,EAASv2B,KAG1B,MAAQkL,EAAI7N,QAAS,IAAMo5B,EAAQ,KAAQ,GAC1CvrB,EAAMA,EAAI9J,QAAS,IAAMq1B,EAAQ,IAAK,IAKxCC,GAAa94B,EAAO4E,KAAM0I,GACrBsrB,IAAaE,GACjBl3B,EAAKuK,aAAc,QAAS2sB,IAMhC,MAAO35B,OAGR65B,YAAa,SAAU7yB,EAAO8yB,GAC7B,GAAIn1B,SAAcqC,EAElB,OAAyB,iBAAb8yB,IAAmC,WAATn1B,EAC9Bm1B,EAAW95B,KAAKu5B,SAAUvyB,GAAUhH,KAAK45B,YAAa5yB,GAGzDnG,EAAOiD,WAAYkD,GAChBhH,KAAKsC,KAAM,SAAUI,GAC3B7B,EAAQb,MAAO65B,YACd7yB,EAAMlF,KAAM9B,KAAM0C,EAAG42B,GAAUt5B,MAAQ85B,GACvCA,KAKI95B,KAAKsC,KAAM,WACjB,GAAI+M,GAAW3M,EAAGkX,EAAMmgB,CAExB,IAAc,WAATp1B,EAAoB,CAGxBjC,EAAI,EACJkX,EAAO/Y,EAAQb,MACf+5B,EAAa/yB,EAAMmF,MAAOmP,MAE1B,OAAUjM,EAAY0qB,EAAYr3B,KAG5BkX,EAAKogB,SAAU3qB,GACnBuK,EAAKggB,YAAavqB,GAElBuK,EAAK2f,SAAUlqB,OAKIpL,UAAV+C,GAAgC,YAATrC,IAClC0K,EAAYiqB,GAAUt5B,MACjBqP,GAGJiR,EAASN,IAAKhgB,KAAM,gBAAiBqP,GAOjCrP,KAAKgN,cACThN,KAAKgN,aAAc,QAClBqC,GAAarI,KAAU,EACvB,GACAsZ,EAASve,IAAK/B,KAAM,kBAAqB,QAO9Cg6B,SAAU,SAAUl5B,GACnB,GAAIuO,GAAW5M,EACdC,EAAI,CAEL2M,GAAY,IAAMvO,EAAW,GAC7B,OAAU2B,EAAOzC,KAAM0C,KACtB,GAAuB,IAAlBD,EAAKyC,WACP,IAAMo0B,GAAU72B,GAAS,KAAM4B,QAASg1B,GAAQ,KAChD/4B,QAAS+O,GAAc,GAEzB,OAAO,CAIT,QAAO,IAOT,IAAI4qB,IAAU,MACbC,GAAU,kBAEXr5B,GAAOG,GAAGqC,QACT6N,IAAK,SAAUlK,GACd,GAAIka,GAAO/e,EAAK2B,EACfrB,EAAOzC,KAAM,EAEd,EAAA,GAAM4C,UAAUhB,OA4BhB,MAFAkC,GAAajD,EAAOiD,WAAYkD,GAEzBhH,KAAKsC,KAAM,SAAUI,GAC3B,GAAIwO,EAEmB,KAAlBlR,KAAKkF,WAKTgM,EADIpN,EACEkD,EAAMlF,KAAM9B,KAAM0C,EAAG7B,EAAQb,MAAOkR,OAEpClK,EAIK,MAAPkK,EACJA,EAAM,GAEoB,gBAARA,GAClBA,GAAO,GAEIrQ,EAAOmD,QAASkN,KAC3BA,EAAMrQ,EAAO2B,IAAK0O,EAAK,SAAUlK,GAChC,MAAgB,OAATA,EAAgB,GAAKA,EAAQ,MAItCka,EAAQrgB,EAAOs5B,SAAUn6B,KAAK2E,OAAU9D,EAAOs5B,SAAUn6B,KAAKkG,SAASC,eAGjE+a,GAAY,OAASA,IAA+Cjd,SAApCid,EAAMlB,IAAKhgB,KAAMkR,EAAK,WAC3DlR,KAAKgH,MAAQkK,KAzDd,IAAKzO,EAIJ,MAHAye,GAAQrgB,EAAOs5B,SAAU13B,EAAKkC,OAC7B9D,EAAOs5B,SAAU13B,EAAKyD,SAASC,eAE3B+a,GACJ,OAASA,IACgCjd,UAAvC9B,EAAM+e,EAAMnf,IAAKU,EAAM,UAElBN,GAGRA,EAAMM,EAAKuE,MAEW,gBAAR7E,GAGbA,EAAIkC,QAAS41B,GAAS,IAGf,MAAP93B,EAAc,GAAKA,OA4CxBtB,EAAOwC,QACN82B,UACCpX,QACChhB,IAAK,SAAUU,GAEd,GAAIyO,GAAMrQ,EAAO4O,KAAKwB,KAAMxO,EAAM,QAClC,OAAc,OAAPyO,EACNA,EAMArQ,EAAO4E,KAAM5E,EAAO8E,KAAMlD,IAAS4B,QAAS61B,GAAS,OAGxDlyB,QACCjG,IAAK,SAAUU,GAYd,IAXA,GAAIuE,GAAO+b,EACVzf,EAAUb,EAAKa,QACfoX,EAAQjY,EAAKqS,cACbuQ,EAAoB,eAAd5iB,EAAKkC,MAAiC,EAAR+V,EACpCsD,EAASqH,EAAM,QACfgL,EAAMhL,EAAM3K,EAAQ,EAAIpX,EAAQ1B,OAChCc,EAAY,EAARgY,EACH2V,EACAhL,EAAM3K,EAAQ,EAGJ2V,EAAJ3tB,EAASA,IAIhB,GAHAqgB,EAASzf,EAASZ,IAGXqgB,EAAOlO,UAAYnS,IAAMgY,KAG5B/Z,EAAQy3B,aACRrV,EAAOpO,SAAiD,OAAtCoO,EAAOhW,aAAc,gBACtCgW,EAAOjd,WAAW6O,WACnB9T,EAAOqF,SAAU6c,EAAOjd,WAAY,aAAiB,CAMxD,GAHAkB,EAAQnG,EAAQkiB,GAAS7R,MAGpBmU,EACJ,MAAOre,EAIRgX,GAAO3d,KAAM2G,GAIf,MAAOgX,IAGRgC,IAAK,SAAUvd,EAAMuE,GACpB,GAAIozB,GAAWrX,EACdzf,EAAUb,EAAKa,QACf0a,EAASnd,EAAOwF,UAAWW,GAC3BtE,EAAIY,EAAQ1B,MAEb,OAAQc,IACPqgB,EAASzf,EAASZ,IACbqgB,EAAOlO,SACXhU,EAAO2F,QAAS3F,EAAOs5B,SAASpX,OAAOhhB,IAAKghB,GAAU/E,GAAW,MAEjEoc,GAAY,EAQd,OAHMA,KACL33B,EAAKqS,cAAgB,IAEfkJ,OAOXnd,EAAOyB,MAAQ,QAAS,YAAc,WACrCzB,EAAOs5B,SAAUn6B,OAChBggB,IAAK,SAAUvd,EAAMuE,GACpB,MAAKnG,GAAOmD,QAASgD,GACXvE,EAAKmS,QAAU/T,EAAO2F,QAAS3F,EAAQ4B,GAAOyO,MAAOlK,GAAU,GADzE,SAKIrG,EAAQu3B,UACbr3B,EAAOs5B,SAAUn6B,MAAO+B,IAAM,SAAUU,GACvC,MAAwC,QAAjCA,EAAKsK,aAAc,SAAqB,KAAOtK,EAAKuE,SAW9D,IAAIqzB,IAAc,iCAElBx5B,GAAOwC,OAAQxC,EAAO0kB,OAErB2D,QAAS,SAAU3D,EAAOtF,EAAMxd,EAAM63B,GAErC,GAAI53B,GAAGyL,EAAKhH,EAAKozB,EAAYC,EAAQtU,EAAQL,EAC5C4U,GAAch4B,GAAQ7C,GACtB+E,EAAOlE,EAAOqB,KAAMyjB,EAAO,QAAWA,EAAM5gB,KAAO4gB,EACnDQ,EAAatlB,EAAOqB,KAAMyjB,EAAO,aAAgBA,EAAMgB,UAAU9e,MAAO,OAKzE,IAHA0G,EAAMhH,EAAM1E,EAAOA,GAAQ7C,EAGJ,IAAlB6C,EAAKyC,UAAoC,IAAlBzC,EAAKyC,WAK5Bm1B,GAAYvtB,KAAMnI,EAAO9D,EAAO0kB,MAAMY,aAItCxhB,EAAKrE,QAAS,KAAQ,KAG1BylB,EAAaphB,EAAK8C,MAAO,KACzB9C,EAAOohB,EAAWrY,QAClBqY,EAAW5iB,QAEZq3B,EAAS71B,EAAKrE,QAAS,KAAQ,GAAK,KAAOqE,EAG3C4gB,EAAQA,EAAO1kB,EAAOqD,SACrBqhB,EACA,GAAI1kB,GAAOkoB,MAAOpkB,EAAuB,gBAAV4gB,IAAsBA,GAGtDA,EAAMmV,UAAYJ,EAAe,EAAI,EACrC/U,EAAMgB,UAAYR,EAAW7Y,KAAM,KACnCqY,EAAM8B,WAAa9B,EAAMgB,UACxB,GAAIzc,QAAQ,UAAYic,EAAW7Y,KAAM,iBAAoB,WAC7D,KAGDqY,EAAM7S,OAASzO,OACTshB,EAAM3hB,SACX2hB,EAAM3hB,OAASnB,GAIhBwd,EAAe,MAARA,GACJsF,GACF1kB,EAAOwF,UAAW4Z,GAAQsF,IAG3BM,EAAUhlB,EAAO0kB,MAAMM,QAASlhB,OAC1B21B,IAAgBzU,EAAQqD,SAAWrD,EAAQqD,QAAQvmB,MAAOF,EAAMwd,MAAW,GAAjF,CAMA,IAAMqa,IAAiBzU,EAAQoD,WAAapoB,EAAOgE,SAAUpC,GAAS,CAMrE,IAJA83B,EAAa1U,EAAQQ,cAAgB1hB,EAC/B01B,GAAYvtB,KAAMytB,EAAa51B,KACpCwJ,EAAMA,EAAIrI,YAEHqI,EAAKA,EAAMA,EAAIrI,WACtB20B,EAAUp6B,KAAM8N,GAChBhH,EAAMgH,CAIFhH,MAAU1E,EAAK8J,eAAiB3M,IACpC66B,EAAUp6B,KAAM8G,EAAI8H,aAAe9H,EAAIwzB,cAAgB56B,GAKzD2C,EAAI,CACJ,QAAUyL,EAAMssB,EAAW/3B,QAAY6iB,EAAM2B,uBAE5C3B,EAAM5gB,KAAOjC,EAAI,EAChB63B,EACA1U,EAAQS,UAAY3hB,EAGrBuhB,GAAW5F,EAASve,IAAKoM,EAAK,eAAoBoX,EAAM5gB,OACvD2b,EAASve,IAAKoM,EAAK,UACf+X,GACJA,EAAOvjB,MAAOwL,EAAK8R,GAIpBiG,EAASsU,GAAUrsB,EAAKqsB,GACnBtU,GAAUA,EAAOvjB,OAAS4c,EAAYpR,KAC1CoX,EAAM7S,OAASwT,EAAOvjB,MAAOwL,EAAK8R,GAC7BsF,EAAM7S,UAAW,GACrB6S,EAAM+B,iBAoCT,OAhCA/B,GAAM5gB,KAAOA,EAGP21B,GAAiB/U,EAAMgE,sBAEpB1D,EAAQzC,UACfyC,EAAQzC,SAASzgB,MAAO83B,EAAUpxB,MAAO4W,MAAW,IACpDV,EAAY9c,IAIP+3B,GAAU35B,EAAOiD,WAAYrB,EAAMkC,MAAa9D,EAAOgE,SAAUpC,KAGrE0E,EAAM1E,EAAM+3B,GAEPrzB,IACJ1E,EAAM+3B,GAAW,MAIlB35B,EAAO0kB,MAAMY,UAAYxhB,EACzBlC,EAAMkC,KACN9D,EAAO0kB,MAAMY,UAAYliB,OAEpBkD,IACJ1E,EAAM+3B,GAAWrzB,IAMdoe,EAAM7S,SAIdkoB,SAAU,SAAUj2B,EAAMlC,EAAM8iB,GAC/B,GAAI1Z,GAAIhL,EAAOwC,OACd,GAAIxC,GAAOkoB,MACXxD,GAEC5gB,KAAMA,EACNk2B,aAAa,GAiBfh6B,GAAO0kB,MAAM2D,QAASrd,EAAG,KAAMpJ,GAE1BoJ,EAAE0d,sBACNhE,EAAM+B,oBAMTzmB,EAAOG,GAAGqC,QAET6lB,QAAS,SAAUvkB,EAAMsb,GACxB,MAAOjgB,MAAKsC,KAAM,WACjBzB,EAAO0kB,MAAM2D,QAASvkB,EAAMsb,EAAMjgB,SAGpC2e,eAAgB,SAAUha,EAAMsb,GAC/B,GAAIxd,GAAOzC,KAAM,EACjB,OAAKyC,GACG5B,EAAO0kB,MAAM2D,QAASvkB,EAAMsb,EAAMxd,GAAM,GADhD,UAOF5B,EAAOyB,KAAM,0MAEsDmF,MAAO,KACzE,SAAU/E,EAAGa,GAGb1C,EAAOG,GAAIuC,GAAS,SAAU0c,EAAMjf,GACnC,MAAO4B,WAAUhB,OAAS,EACzB5B,KAAKmlB,GAAI5hB,EAAM,KAAM0c,EAAMjf,GAC3BhB,KAAKkpB,QAAS3lB,MAIjB1C,EAAOG,GAAGqC,QACTy3B,MAAO,SAAUC,EAAQC,GACxB,MAAOh7B,MAAK2pB,WAAYoR,GAASnR,WAAYoR,GAASD,MAOxDp6B,EAAQs6B,QAAU,aAAel7B,GAW3BY,EAAQs6B,SACbp6B,EAAOyB,MAAQ+R,MAAO,UAAW8U,KAAM,YAAc,SAAUY,EAAMjD,GAGpE,GAAI9Y,GAAU,SAAUuX,GACvB1kB,EAAO0kB,MAAMqV,SAAU9T,EAAKvB,EAAM3hB,OAAQ/C,EAAO0kB,MAAMuB,IAAKvB,IAG7D1kB,GAAO0kB,MAAMM,QAASiB,IACrBL,MAAO,WACN,GAAIzX,GAAMhP,KAAKuM,eAAiBvM,KAC/Bk7B,EAAW5a,EAASpB,OAAQlQ,EAAK8X,EAE5BoU,IACLlsB,EAAIG,iBAAkB4a,EAAM/b,GAAS,GAEtCsS,EAASpB,OAAQlQ,EAAK8X,GAAOoU,GAAY,GAAM,IAEhDtU,SAAU,WACT,GAAI5X,GAAMhP,KAAKuM,eAAiBvM,KAC/Bk7B,EAAW5a,EAASpB,OAAQlQ,EAAK8X,GAAQ,CAEpCoU,GAKL5a,EAASpB,OAAQlQ,EAAK8X,EAAKoU,IAJ3BlsB,EAAI8P,oBAAqBiL,EAAM/b,GAAS,GACxCsS,EAASlE,OAAQpN,EAAK8X,OAS3B,IAAI3S,IAAWpU,EAAOoU,SAElBgnB,GAAQt6B,EAAOwG,MAEf+zB,GAAS,IAMbv6B,GAAO8f,UAAY,SAAUV,GAC5B,MAAOob,MAAKC,MAAOrb,EAAO,KAK3Bpf,EAAO06B,SAAW,SAAUtb,GAC3B,GAAIlN,EACJ,KAAMkN,GAAwB,gBAATA,GACpB,MAAO,KAIR,KACClN,GAAM,GAAMhT,GAAOy7B,WAAcC,gBAAiBxb,EAAM,YACvD,MAAQpU,GACTkH,EAAM9O,OAMP,MAHM8O,KAAOA,EAAIpG,qBAAsB,eAAgB/K,QACtDf,EAAO0D,MAAO,gBAAkB0b,GAE1BlN,EAIR,IACC2oB,IAAQ,OACRC,GAAM,gBACNC,GAAW,6BAGXC,GAAiB,4DACjBC,GAAa,iBACbC,GAAY,QAWZtG,MAOAuG,MAGAC,GAAW,KAAK77B,OAAQ,KAGxB87B,GAAet8B,EAAS8F,cAAe,IACvCw2B,IAAa1nB,KAAOL,GAASK,IAG9B,SAAS2nB,IAA6BC,GAGrC,MAAO,UAAUC,EAAoB5f,GAED,gBAAvB4f,KACX5f,EAAO4f,EACPA,EAAqB,IAGtB,IAAIC,GACH55B,EAAI,EACJ65B,EAAYF,EAAmBl2B,cAAcgG,MAAOmP,MAErD,IAAKza,EAAOiD,WAAY2Y,GAGvB,MAAU6f,EAAWC,EAAW75B,KAGR,MAAlB45B,EAAU,IACdA,EAAWA,EAASn8B,MAAO,IAAO,KAChCi8B,EAAWE,GAAaF,EAAWE,QAAmBxrB,QAAS2L,KAI/D2f,EAAWE,GAAaF,EAAWE,QAAmBj8B,KAAMoc,IAQnE,QAAS+f,IAA+BJ,EAAW94B,EAASyyB,EAAiB0G,GAE5E,GAAIC,MACHC,EAAqBP,IAAcJ,EAEpC,SAASY,GAASN,GACjB,GAAIznB,EAcJ,OAbA6nB,GAAWJ,IAAa,EACxBz7B,EAAOyB,KAAM85B,EAAWE,OAAkB,SAAUjxB,EAAGwxB,GACtD,GAAIC,GAAsBD,EAAoBv5B,EAASyyB,EAAiB0G,EACxE,OAAoC,gBAAxBK,IACVH,GAAqBD,EAAWI,GAKtBH,IACD9nB,EAAWioB,GADf,QAHNx5B,EAAQi5B,UAAUzrB,QAASgsB,GAC3BF,EAASE,IACF,KAKFjoB,EAGR,MAAO+nB,GAASt5B,EAAQi5B,UAAW,MAAUG,EAAW,MAASE,EAAS,KAM3E,QAASG,IAAYn5B,EAAQJ,GAC5B,GAAIyB,GAAKpB,EACRm5B,EAAcn8B,EAAOo8B,aAAaD,eAEnC,KAAM/3B,IAAOzB,GACQS,SAAfT,EAAKyB,MACP+3B,EAAa/3B,GAAQrB,EAAWC,IAAUA,OAAiBoB,GAAQzB,EAAKyB,GAO5E,OAJKpB,IACJhD,EAAOwC,QAAQ,EAAMO,EAAQC,GAGvBD,EAOR,QAASs5B,IAAqBC,EAAGV,EAAOW,GAEvC,GAAIC,GAAI14B,EAAM24B,EAAeC,EAC5BpjB,EAAWgjB,EAAEhjB,SACboiB,EAAYY,EAAEZ,SAGf,OAA2B,MAAnBA,EAAW,GAClBA,EAAU7uB,QACEzJ,SAAPo5B,IACJA,EAAKF,EAAEK,UAAYf,EAAMgB,kBAAmB,gBAK9C,IAAKJ,EACJ,IAAM14B,IAAQwV,GACb,GAAKA,EAAUxV,IAAUwV,EAAUxV,GAAOmI,KAAMuwB,GAAO,CACtDd,EAAUzrB,QAASnM,EACnB,OAMH,GAAK43B,EAAW,IAAOa,GACtBE,EAAgBf,EAAW,OACrB,CAGN,IAAM53B,IAAQy4B,GAAY,CACzB,IAAMb,EAAW,IAAOY,EAAEO,WAAY/4B,EAAO,IAAM43B,EAAW,IAAQ,CACrEe,EAAgB34B,CAChB,OAEK44B,IACLA,EAAgB54B,GAKlB24B,EAAgBA,GAAiBC,EAMlC,MAAKD,IACCA,IAAkBf,EAAW,IACjCA,EAAUzrB,QAASwsB,GAEbF,EAAWE,IAJnB,OAWD,QAASK,IAAaR,EAAGS,EAAUnB,EAAOoB,GACzC,GAAIC,GAAOC,EAASC,EAAM72B,EAAKkT,EAC9BqjB,KAGAnB,EAAYY,EAAEZ,UAAUp8B,OAGzB,IAAKo8B,EAAW,GACf,IAAMyB,IAAQb,GAAEO,WACfA,EAAYM,EAAK73B,eAAkBg3B,EAAEO,WAAYM,EAInDD,GAAUxB,EAAU7uB,OAGpB,OAAQqwB,EAcP,GAZKZ,EAAEc,eAAgBF,KACtBtB,EAAOU,EAAEc,eAAgBF,IAAcH,IAIlCvjB,GAAQwjB,GAAaV,EAAEe,aAC5BN,EAAWT,EAAEe,WAAYN,EAAUT,EAAEb,WAGtCjiB,EAAO0jB,EACPA,EAAUxB,EAAU7uB,QAKnB,GAAiB,MAAZqwB,EAEJA,EAAU1jB,MAGJ,IAAc,MAATA,GAAgBA,IAAS0jB,EAAU,CAM9C,GAHAC,EAAON,EAAYrjB,EAAO,IAAM0jB,IAAaL,EAAY,KAAOK,IAG1DC,EACL,IAAMF,IAASJ,GAId,GADAv2B,EAAM22B,EAAMr2B,MAAO,KACdN,EAAK,KAAQ42B,IAGjBC,EAAON,EAAYrjB,EAAO,IAAMlT,EAAK,KACpCu2B,EAAY,KAAOv2B,EAAK,KACb,CAGN62B,KAAS,EACbA,EAAON,EAAYI,GAGRJ,EAAYI,MAAY,IACnCC,EAAU52B,EAAK,GACfo1B,EAAUzrB,QAAS3J,EAAK,IAEzB,OAOJ,GAAK62B,KAAS,EAGb,GAAKA,GAAQb,EAAAA,UACZS,EAAWI,EAAMJ,OAEjB,KACCA,EAAWI,EAAMJ,GAChB,MAAQ/xB,GACT,OACC8Q,MAAO,cACPpY,MAAOy5B,EAAOnyB,EAAI,sBAAwBwO,EAAO,OAAS0jB,IASjE,OAASphB,MAAO,UAAWsD,KAAM2d,GAGlC/8B,EAAOwC,QAGN86B,OAAQ,EAGRC,gBACAC,QAEApB,cACCqB,IAAKnqB,GAASK,KACd7P,KAAM,MACN45B,QAAS1C,GAAe/uB,KAAMqH,GAASqqB,UACvCh/B,QAAQ,EACRi/B,aAAa,EACbC,OAAO,EACPC,YAAa,mDAabC,SACCxI,IAAK6F,GACLt2B,KAAM,aACN2lB,KAAM,YACNvY,IAAK,4BACL8rB,KAAM,qCAGP1kB,UACCpH,IAAK,UACLuY,KAAM,SACNuT,KAAM,YAGPZ,gBACClrB,IAAK,cACLpN,KAAM,eACNk5B,KAAM,gBAKPnB,YAGCoB,SAAUrzB,OAGVszB,aAAa,EAGbC,YAAan+B,EAAO8f,UAGpBse,WAAYp+B,EAAO06B,UAOpByB,aACCsB,KAAK,EACLv9B,SAAS,IAOXm+B,UAAW,SAAUt7B,EAAQu7B,GAC5B,MAAOA,GAGNpC,GAAYA,GAAYn5B,EAAQ/C,EAAOo8B,cAAgBkC,GAGvDpC,GAAYl8B,EAAOo8B,aAAcr5B,IAGnCw7B,cAAejD,GAA6B1G,IAC5C4J,cAAelD,GAA6BH,IAG5CsD,KAAM,SAAUhB,EAAKh7B,GAGA,gBAARg7B,KACXh7B,EAAUg7B,EACVA,EAAMr6B,QAIPX,EAAUA,KAEV,IAAIi8B,GAGHC,EAGAC,EACAC,EAGAC,EAGAC,EAGAC,EAGAn9B,EAGAy6B,EAAIt8B,EAAOq+B,aAAe57B,GAG1Bw8B,EAAkB3C,EAAEp8B,SAAWo8B,EAG/B4C,EAAqB5C,EAAEp8B,UACpB++B,EAAgB56B,UAAY46B,EAAgBp+B,QAC7Cb,EAAQi/B,GACRj/B,EAAO0kB,MAGTzI,EAAWjc,EAAO2b,WAClBwjB,EAAmBn/B,EAAO6a,UAAW,eAGrCukB,EAAa9C,EAAE8C,eAGfC,KACAC,KAGAxjB,EAAQ,EAGRyjB,EAAW,WAGX3D,GACC1d,WAAY,EAGZ0e,kBAAmB,SAAUx4B,GAC5B,GAAIkH,EACJ,IAAe,IAAVwQ,EAAc,CAClB,IAAM+iB,EAAkB,CACvBA,IACA,OAAUvzB,EAAQyvB,GAASpvB,KAAMizB,GAChCC,EAAiBvzB,EAAO,GAAIhG,eAAkBgG,EAAO,GAGvDA,EAAQuzB,EAAiBz6B,EAAIkB,eAE9B,MAAgB,OAATgG,EAAgB,KAAOA,GAI/Bk0B,sBAAuB,WACtB,MAAiB,KAAV1jB,EAAc8iB,EAAwB,MAI9Ca,iBAAkB,SAAU/8B,EAAMyD,GACjC,GAAIu5B,GAAQh9B,EAAK4C,aAKjB,OAJMwW,KACLpZ,EAAO48B,EAAqBI,GAAUJ,EAAqBI,IAAWh9B,EACtE28B,EAAgB38B,GAASyD,GAEnBhH,MAIRwgC,iBAAkB,SAAU77B,GAI3B,MAHMgY,KACLwgB,EAAEK,SAAW74B,GAEP3E,MAIRigC,WAAY,SAAUz9B,GACrB,GAAI6C,EACJ,IAAK7C,EACJ,GAAa,EAARma,EACJ,IAAMtX,IAAQ7C,GAGby9B,EAAY56B,IAAW46B,EAAY56B,GAAQ7C,EAAK6C,QAKjDo3B,GAAM5f,OAAQra,EAAKi6B,EAAMgE,QAG3B,OAAOzgC,OAIR0gC,MAAO,SAAUC,GAChB,GAAIC,GAAYD,GAAcP,CAK9B,OAJKb,IACJA,EAAUmB,MAAOE,GAElBh4B,EAAM,EAAGg4B,GACF5gC,MAuBV,IAlBA8c,EAASF,QAAS6f,GAAQtG,SAAW6J,EAAiBplB,IACtD6hB,EAAMoE,QAAUpE,EAAM7zB,KACtB6zB,EAAMl4B,MAAQk4B,EAAM1f,KAMpBogB,EAAEmB,MAAUA,GAAOnB,EAAEmB,KAAOnqB,GAASK,MAAS,IAAKnQ,QAASq3B,GAAO,IACjEr3B,QAAS03B,GAAW5nB,GAASqqB,SAAW,MAG1CrB,EAAEx4B,KAAOrB,EAAQw9B,QAAUx9B,EAAQqB,MAAQw4B,EAAE2D,QAAU3D,EAAEx4B,KAGzDw4B,EAAEZ,UAAY17B,EAAO4E,KAAM03B,EAAEb,UAAY,KAAMn2B,cAAcgG,MAAOmP,KAAiB,IAG/D,MAAjB6hB,EAAE4D,YAAsB,CAC5BnB,EAAYhgC,EAAS8F,cAAe,IAIpC,KACCk6B,EAAUprB,KAAO2oB,EAAEmB,IAInBsB,EAAUprB,KAAOorB,EAAUprB,KAC3B2oB,EAAE4D,YAAc7E,GAAasC,SAAW,KAAOtC,GAAa8E,MAC3DpB,EAAUpB,SAAW,KAAOoB,EAAUoB,KACtC,MAAQn1B,GAITsxB,EAAE4D,aAAc,GAalB,GARK5D,EAAEld,MAAQkd,EAAEsB,aAAiC,gBAAXtB,GAAEld,OACxCkd,EAAEld,KAAOpf,EAAOogC,MAAO9D,EAAEld,KAAMkd,EAAE+D,cAIlC1E,GAA+B/G,GAAY0H,EAAG75B,EAASm5B,GAGxC,IAAV9f,EACJ,MAAO8f,EAKRoD,GAAch/B,EAAO0kB,OAAS4X,EAAE39B,OAG3BqgC,GAAmC,IAApBh/B,EAAOs9B,UAC1Bt9B,EAAO0kB,MAAM2D,QAAS,aAIvBiU,EAAEx4B,KAAOw4B,EAAEx4B,KAAKnD,cAGhB27B,EAAEgE,YAAcrF,GAAWhvB,KAAMqwB,EAAEx4B,MAInC66B,EAAWrC,EAAEmB,IAGPnB,EAAEgE,aAGFhE,EAAEld,OACNuf,EAAarC,EAAEmB,MAASlD,GAAOtuB,KAAM0yB,GAAa,IAAM,KAAQrC,EAAEld,WAG3Dkd,GAAEld,MAILkd,EAAE3vB,SAAU,IAChB2vB,EAAEmB,IAAM3C,GAAI7uB,KAAM0yB,GAGjBA,EAASn7B,QAASs3B,GAAK,OAASR,MAGhCqE,GAAapE,GAAOtuB,KAAM0yB,GAAa,IAAM,KAAQ,KAAOrE,OAK1DgC,EAAEiE,aACDvgC,EAAOu9B,aAAcoB,IACzB/C,EAAM6D,iBAAkB,oBAAqBz/B,EAAOu9B,aAAcoB,IAE9D3+B,EAAOw9B,KAAMmB,IACjB/C,EAAM6D,iBAAkB,gBAAiBz/B,EAAOw9B,KAAMmB,MAKnDrC,EAAEld,MAAQkd,EAAEgE,YAAchE,EAAEwB,eAAgB,GAASr7B,EAAQq7B,cACjElC,EAAM6D,iBAAkB,eAAgBnD,EAAEwB,aAI3ClC,EAAM6D,iBACL,SACAnD,EAAEZ,UAAW,IAAOY,EAAEyB,QAASzB,EAAEZ,UAAW,IAC3CY,EAAEyB,QAASzB,EAAEZ,UAAW,KACA,MAArBY,EAAEZ,UAAW,GAAc,KAAON,GAAW,WAAa,IAC7DkB,EAAEyB,QAAS,KAIb,KAAMl8B,IAAKy6B,GAAEkE,QACZ5E,EAAM6D,iBAAkB59B,EAAGy6B,EAAEkE,QAAS3+B,GAIvC,IAAKy6B,EAAEmE,aACJnE,EAAEmE,WAAWx/B,KAAMg+B,EAAiBrD,EAAOU,MAAQ,GAAmB,IAAVxgB,GAG9D,MAAO8f,GAAMiE,OAIdN,GAAW,OAGX,KAAM19B,KAAOm+B,QAAS,EAAGt8B,MAAO,EAAG4xB,SAAU,GAC5CsG,EAAO/5B,GAAKy6B,EAAGz6B,GAOhB,IAHA68B,EAAY/C,GAA+BR,GAAYmB,EAAG75B,EAASm5B,GAK5D,CASN,GARAA,EAAM1d,WAAa,EAGd8gB,GACJE,EAAmB7W,QAAS,YAAcuT,EAAOU,IAInC,IAAVxgB,EACJ,MAAO8f,EAIHU,GAAEuB,OAASvB,EAAEnF,QAAU,IAC3B2H,EAAe5/B,EAAOkf,WAAY,WACjCwd,EAAMiE,MAAO,YACXvD,EAAEnF,SAGN,KACCrb,EAAQ,EACR4iB,EAAUgC,KAAMrB,EAAgBt3B,GAC/B,MAAQiD,GAGT,KAAa,EAAR8Q,GAKJ,KAAM9Q,EAJNjD,GAAM,GAAIiD,QA5BZjD,GAAM,GAAI,eAsCX,SAASA,GAAM63B,EAAQe,EAAkBpE,EAAWiE,GACnD,GAAIxD,GAAWgD,EAASt8B,EAAOq5B,EAAU6D,EACxCd,EAAaa,CAGC,KAAV7kB,IAKLA,EAAQ,EAGHgjB,GACJ5/B,EAAOk4B,aAAc0H,GAKtBJ,EAAYt7B,OAGZw7B,EAAwB4B,GAAW,GAGnC5E,EAAM1d,WAAa0hB,EAAS,EAAI,EAAI,EAGpC5C,EAAY4C,GAAU,KAAgB,IAATA,GAA2B,MAAXA,EAGxCrD,IACJQ,EAAWV,GAAqBC,EAAGV,EAAOW,IAI3CQ,EAAWD,GAAaR,EAAGS,EAAUnB,EAAOoB,GAGvCA,GAGCV,EAAEiE,aACNK,EAAWhF,EAAMgB,kBAAmB,iBAC/BgE,IACJ5gC,EAAOu9B,aAAcoB,GAAaiC,GAEnCA,EAAWhF,EAAMgB,kBAAmB,QAC/BgE,IACJ5gC,EAAOw9B,KAAMmB,GAAaiC,IAKZ,MAAXhB,GAA6B,SAAXtD,EAAEx4B,KACxBg8B,EAAa,YAGS,MAAXF,EACXE,EAAa,eAIbA,EAAa/C,EAASjhB,MACtBkkB,EAAUjD,EAAS3d,KACnB1b,EAAQq5B,EAASr5B,MACjBs5B,GAAat5B,KAKdA,EAAQo8B,GACHF,GAAWE,IACfA,EAAa,QACC,EAATF,IACJA,EAAS,KAMZhE,EAAMgE,OAASA,EACfhE,EAAMkE,YAAea,GAAoBb,GAAe,GAGnD9C,EACJ/gB,EAASqB,YAAa2hB,GAAmBe,EAASF,EAAYlE,IAE9D3f,EAASmZ,WAAY6J,GAAmBrD,EAAOkE,EAAYp8B,IAI5Dk4B,EAAMwD,WAAYA,GAClBA,EAAah8B,OAER47B,GACJE,EAAmB7W,QAAS2U,EAAY,cAAgB,aACrDpB,EAAOU,EAAGU,EAAYgD,EAAUt8B,IAIpCy7B,EAAiBzjB,SAAUujB,GAAmBrD,EAAOkE,IAEhDd,IACJE,EAAmB7W,QAAS,gBAAkBuT,EAAOU,MAG3Ct8B,EAAOs9B,QAChBt9B,EAAO0kB,MAAM2D,QAAS,cAKzB,MAAOuT,IAGRiF,QAAS,SAAUpD,EAAKre,EAAM1d,GAC7B,MAAO1B,GAAOkB,IAAKu8B,EAAKre,EAAM1d,EAAU,SAGzCo/B,UAAW,SAAUrD,EAAK/7B,GACzB,MAAO1B,GAAOkB,IAAKu8B,EAAKr6B,OAAW1B,EAAU,aAI/C1B,EAAOyB,MAAQ,MAAO,QAAU,SAAUI,EAAGo+B,GAC5CjgC,EAAQigC,GAAW,SAAUxC,EAAKre,EAAM1d,EAAUoC,GAUjD,MAPK9D,GAAOiD,WAAYmc,KACvBtb,EAAOA,GAAQpC,EACfA,EAAW0d,EACXA,EAAOhc,QAIDpD,EAAOy+B,KAAMz+B,EAAOwC,QAC1Bi7B,IAAKA,EACL35B,KAAMm8B,EACNxE,SAAU33B,EACVsb,KAAMA,EACN4gB,QAASt+B,GACP1B,EAAOkD,cAAeu6B,IAASA,OAKpCz9B,EAAO0qB,SAAW,SAAU+S,GAC3B,MAAOz9B,GAAOy+B,MACbhB,IAAKA,EAGL35B,KAAM,MACN23B,SAAU,SACVoC,OAAO,EACPl/B,QAAQ,EACRoiC,UAAU,KAKZ/gC,EAAOG,GAAGqC,QACTw+B,QAAS,SAAUvW,GAClB,GAAInH,EAEJ,OAAKtjB,GAAOiD,WAAYwnB,GAChBtrB,KAAKsC,KAAM,SAAUI,GAC3B7B,EAAQb,MAAO6hC,QAASvW,EAAKxpB,KAAM9B,KAAM0C,OAItC1C,KAAM,KAGVmkB,EAAOtjB,EAAQyqB,EAAMtrB,KAAM,GAAIuM,eAAgBzJ,GAAI,GAAIa,OAAO,GAEzD3D,KAAM,GAAI8F,YACdqe,EAAK+H,aAAclsB,KAAM,IAG1BmkB,EAAK3hB,IAAK,WACT,GAAIC,GAAOzC,IAEX,OAAQyC,EAAKq/B,kBACZr/B,EAAOA,EAAKq/B,iBAGb,OAAOr/B,KACJupB,OAAQhsB,OAGNA,OAGR+hC,UAAW,SAAUzW,GACpB,MAAKzqB,GAAOiD,WAAYwnB,GAChBtrB,KAAKsC,KAAM,SAAUI,GAC3B7B,EAAQb,MAAO+hC,UAAWzW,EAAKxpB,KAAM9B,KAAM0C,MAItC1C,KAAKsC,KAAM,WACjB,GAAIsX,GAAO/Y,EAAQb,MAClBma,EAAWP,EAAKO,UAEZA,GAASvY,OACbuY,EAAS0nB,QAASvW,GAGlB1R,EAAKoS,OAAQV,MAKhBnH,KAAM,SAAUmH,GACf,GAAIxnB,GAAajD,EAAOiD,WAAYwnB,EAEpC,OAAOtrB,MAAKsC,KAAM,SAAUI,GAC3B7B,EAAQb,MAAO6hC,QAAS/9B,EAAawnB,EAAKxpB,KAAM9B,KAAM0C,GAAM4oB,MAI9D0W,OAAQ,WACP,MAAOhiC,MAAK+O,SAASzM,KAAM,WACpBzB,EAAOqF,SAAUlG,KAAM,SAC5Ba,EAAQb,MAAOqsB,YAAarsB,KAAK4L,cAE/B1I,SAKNrC,EAAOkQ,KAAK8E,QAAQub,OAAS,SAAU3uB,GACtC,OAAQ5B,EAAOkQ,KAAK8E,QAAQosB,QAASx/B,IAEtC5B,EAAOkQ,KAAK8E,QAAQosB,QAAU,SAAUx/B,GAMvC,MAAOA,GAAKmuB,YAAc,GAAKnuB,EAAKouB,aAAe,GAAKpuB,EAAKsuB,iBAAiBnvB,OAAS,EAMxF,IAAIsgC,IAAM,OACTC,GAAW,QACXC,GAAQ,SACRC,GAAkB,wCAClBC,GAAe,oCAEhB,SAASC,IAAa7P,EAAQhuB,EAAKw8B,EAAatmB,GAC/C,GAAIrX,EAEJ,IAAK1C,EAAOmD,QAASU,GAGpB7D,EAAOyB,KAAMoC,EAAK,SAAUhC,EAAG8/B,GACzBtB,GAAeiB,GAASr1B,KAAM4lB,GAGlC9X,EAAK8X,EAAQ8P,GAKbD,GACC7P,EAAS,KAAqB,gBAAN8P,IAAuB,MAALA,EAAY9/B,EAAI,IAAO,IACjE8/B,EACAtB,EACAtmB,SAKG,IAAMsmB,GAAsC,WAAvBrgC,EAAO8D,KAAMD,GAUxCkW,EAAK8X,EAAQhuB,OAPb,KAAMnB,IAAQmB,GACb69B,GAAa7P,EAAS,IAAMnvB,EAAO,IAAKmB,EAAKnB,GAAQ29B,EAAatmB,GAYrE/Z,EAAOogC,MAAQ,SAAU/3B,EAAGg4B,GAC3B,GAAIxO,GACHyK,KACAviB,EAAM,SAAU3V,EAAK+B,GAGpBA,EAAQnG,EAAOiD,WAAYkD,GAAUA,IAAqB,MAATA,EAAgB,GAAKA,EACtEm2B,EAAGA,EAAEv7B,QAAW6gC,mBAAoBx9B,GAAQ,IAAMw9B,mBAAoBz7B,GASxE,IALqB/C,SAAhBi9B,IACJA,EAAcrgC,EAAOo8B,cAAgBp8B,EAAOo8B,aAAaiE,aAIrDrgC,EAAOmD,QAASkF,IAASA,EAAExH,SAAWb,EAAOkD,cAAemF,GAGhErI,EAAOyB,KAAM4G,EAAG,WACf0R,EAAK5a,KAAKuD,KAAMvD,KAAKgH,aAOtB,KAAM0rB,IAAUxpB,GACfq5B,GAAa7P,EAAQxpB,EAAGwpB,GAAUwO,EAAatmB,EAKjD,OAAOuiB,GAAEjwB,KAAM,KAAM7I,QAAS69B,GAAK,MAGpCrhC,EAAOG,GAAGqC,QACTq/B,UAAW,WACV,MAAO7hC,GAAOogC,MAAOjhC,KAAK2iC,mBAE3BA,eAAgB,WACf,MAAO3iC,MAAKwC,IAAK,WAGhB,GAAIwO,GAAWnQ,EAAOqf,KAAMlgB,KAAM,WAClC,OAAOgR,GAAWnQ,EAAOwF,UAAW2K,GAAahR,OAEjD0P,OAAQ,WACR,GAAI/K,GAAO3E,KAAK2E,IAGhB,OAAO3E,MAAKuD,OAAS1C,EAAQb,MAAOoZ,GAAI,cACvCkpB,GAAax1B,KAAM9M,KAAKkG,YAAem8B,GAAgBv1B,KAAMnI,KAC3D3E,KAAK4U,UAAY+N,EAAe7V,KAAMnI,MAEzCnC,IAAK,SAAUE,EAAGD,GAClB,GAAIyO,GAAMrQ,EAAQb,MAAOkR,KAEzB,OAAc,OAAPA,EACN,KACArQ,EAAOmD,QAASkN,GACfrQ,EAAO2B,IAAK0O,EAAK,SAAUA,GAC1B,OAAS3N,KAAMd,EAAKc,KAAMyD,MAAOkK,EAAI7M,QAAS+9B,GAAO,YAEpD7+B,KAAMd,EAAKc,KAAMyD,MAAOkK,EAAI7M,QAAS+9B,GAAO,WAC7CrgC,SAKNlB,EAAOo8B,aAAa2F,IAAM,WACzB,IACC,MAAO,IAAI7iC,GAAO8iC,eACjB,MAAQh3B,KAGX,IAAIi3B,KAGFC,EAAG,IAIHC,KAAM,KAEPC,GAAepiC,EAAOo8B,aAAa2F,KAEpCjiC,GAAQuiC,OAASD,IAAkB,mBAAqBA,IACxDtiC,EAAQ2+B,KAAO2D,KAAiBA,GAEhCpiC,EAAOw+B,cAAe,SAAU/7B,GAC/B,GAAIf,GAAU4gC,CAGd,OAAKxiC,GAAQuiC,MAAQD,KAAiB3/B,EAAQy9B,aAE5CQ,KAAM,SAAUF,EAASlL,GACxB,GAAIzzB,GACHkgC,EAAMt/B,EAAQs/B,KAWf,IATAA,EAAIQ,KACH9/B,EAAQqB,KACRrB,EAAQg7B,IACRh7B,EAAQo7B,MACRp7B,EAAQ+/B,SACR//B,EAAQmS,UAIJnS,EAAQggC,UACZ,IAAM5gC,IAAKY,GAAQggC,UAClBV,EAAKlgC,GAAMY,EAAQggC,UAAW5gC,EAK3BY,GAAQk6B,UAAYoF,EAAIpC,kBAC5BoC,EAAIpC,iBAAkBl9B,EAAQk6B,UAQzBl6B,EAAQy9B,aAAgBM,EAAS,sBACtCA,EAAS,oBAAuB,iBAIjC,KAAM3+B,IAAK2+B,GACVuB,EAAItC,iBAAkB59B,EAAG2+B,EAAS3+B,GAInCH,GAAW,SAAUoC,GACpB,MAAO,YACDpC,IACJA,EAAW4gC,EAAgBP,EAAIW,OAC9BX,EAAIY,QAAUZ,EAAIa,QAAUb,EAAIc,mBAAqB,KAExC,UAAT/+B,EACJi+B,EAAIlC,QACgB,UAAT/7B,EAKgB,gBAAfi+B,GAAInC,OACftK,EAAU,EAAG,SAEbA,EAGCyM,EAAInC,OACJmC,EAAIjC,YAINxK,EACC2M,GAAkBF,EAAInC,SAAYmC,EAAInC,OACtCmC,EAAIjC,WAK+B,UAAjCiC,EAAIe,cAAgB,SACM,gBAArBf,GAAIgB,cACRC,OAAQjB,EAAIhF,WACZj4B,KAAMi9B,EAAIgB,cACbhB,EAAIvC,4BAQTuC,EAAIW,OAAShhC,IACb4gC,EAAgBP,EAAIY,QAAUjhC,EAAU,SAKnB0B,SAAhB2+B,EAAIa,QACRb,EAAIa,QAAUN,EAEdP,EAAIc,mBAAqB,WAGA,IAAnBd,EAAI7jB,YAMRhf,EAAOkf,WAAY,WACb1c,GACJ4gC,OAQL5gC,EAAWA,EAAU,QAErB,KAGCqgC,EAAIrB,KAAMj+B,EAAQ69B,YAAc79B,EAAQ2c,MAAQ,MAC/C,MAAQpU,GAGT,GAAKtJ,EACJ,KAAMsJ,KAKT60B,MAAO,WACDn+B,GACJA,MAjIJ,SA4ID1B,EAAOq+B,WACNN,SACCt5B,OAAQ,6FAGT6U,UACC7U,OAAQ,2BAETo4B,YACCoG,cAAe,SAAUn+B,GAExB,MADA9E,GAAOuE,WAAYO,GACZA,MAMV9E,EAAOu+B,cAAe,SAAU,SAAUjC,GACxBl5B,SAAZk5B,EAAE3vB,QACN2vB,EAAE3vB,OAAQ,GAEN2vB,EAAE4D,cACN5D,EAAEx4B,KAAO,SAKX9D,EAAOw+B,cAAe,SAAU,SAAUlC,GAGzC,GAAKA,EAAE4D,YAAc,CACpB,GAAIz7B,GAAQ/C,CACZ,QACCg/B,KAAM,SAAUl2B,EAAG8qB,GAClB7wB,EAASzE,EAAQ,YAAaqf,MAC7B6jB,QAAS5G,EAAE6G,cACXxgC,IAAK25B,EAAEmB,MACJnZ,GACH,aACA5iB,EAAW,SAAU0hC,GACpB3+B,EAAO8W,SACP7Z,EAAW,KACN0hC,GACJ9N,EAAuB,UAAb8N,EAAIt/B,KAAmB,IAAM,IAAKs/B,EAAIt/B,QAMnD/E,EAASgG,KAAKC,YAAaP,EAAQ,KAEpCo7B,MAAO,WACDn+B,GACJA,QAUL,IAAI2hC,OACHC,GAAS,mBAGVtjC,GAAOq+B,WACNkF,MAAO,WACPC,cAAe,WACd,GAAI9hC,GAAW2hC,GAAa76B,OAAWxI,EAAOqD,QAAU,IAAQi3B,IAEhE,OADAn7B,MAAMuC,IAAa,EACZA,KAKT1B,EAAOu+B,cAAe,aAAc,SAAUjC,EAAGmH,EAAkB7H,GAElE,GAAI8H,GAAcC,EAAaC,EAC9BC,EAAWvH,EAAEiH,SAAU,IAAWD,GAAOr3B,KAAMqwB,EAAEmB,KAChD,MACkB,gBAAXnB,GAAEld,MAE6C,KADnDkd,EAAEwB,aAAe,IACjBr+B,QAAS,sCACX6jC,GAAOr3B,KAAMqwB,EAAEld,OAAU,OAI5B,OAAKykB,IAAiC,UAArBvH,EAAEZ,UAAW,IAG7BgI,EAAepH,EAAEkH,cAAgBxjC,EAAOiD,WAAYq5B,EAAEkH,eACrDlH,EAAEkH,gBACFlH,EAAEkH,cAGEK,EACJvH,EAAGuH,GAAavH,EAAGuH,GAAWrgC,QAAS8/B,GAAQ,KAAOI,GAC3CpH,EAAEiH,SAAU,IACvBjH,EAAEmB,MAASlD,GAAOtuB,KAAMqwB,EAAEmB,KAAQ,IAAM,KAAQnB,EAAEiH,MAAQ,IAAMG,GAIjEpH,EAAEO,WAAY,eAAkB,WAI/B,MAHM+G,IACL5jC,EAAO0D,MAAOggC,EAAe,mBAEvBE,EAAmB,IAI3BtH,EAAEZ,UAAW,GAAM,OAGnBiI,EAAczkC,EAAQwkC,GACtBxkC,EAAQwkC,GAAiB,WACxBE,EAAoB7hC,WAIrB65B,EAAM5f,OAAQ,WAGQ5Y,SAAhBugC,EACJ3jC,EAAQd,GAASi5B,WAAYuL,GAI7BxkC,EAAQwkC,GAAiBC,EAIrBrH,EAAGoH,KAGPpH,EAAEkH,cAAgBC,EAAiBD,cAGnCH,GAAa7jC,KAAMkkC,IAIfE,GAAqB5jC,EAAOiD,WAAY0gC,IAC5CA,EAAaC,EAAmB,IAGjCA,EAAoBD,EAAcvgC,SAI5B,UA9DR,SAyEDpD,EAAOiZ,UAAY,SAAUmG,EAAMlf,EAAS4jC,GAC3C,IAAM1kB,GAAwB,gBAATA,GACpB,MAAO,KAEgB,kBAAZlf,KACX4jC,EAAc5jC,EACdA,GAAU,GAEXA,EAAUA,GAAWnB,CAErB,IAAIglC,GAASprB,EAAWhN,KAAMyT,GAC7B+D,GAAW2gB,KAGZ,OAAKC,IACK7jC,EAAQ2E,cAAek/B,EAAQ,MAGzCA,EAAS7gB,IAAiB9D,GAAQlf,EAASijB,GAEtCA,GAAWA,EAAQpiB,QACvBf,EAAQmjB,GAAU5H,SAGZvb,EAAOuB,SAAWwiC,EAAOh5B,aAKjC,IAAIi5B,IAAQhkC,EAAOG,GAAGgoB,IAKtBnoB,GAAOG,GAAGgoB,KAAO,SAAUsV,EAAKwG,EAAQviC,GACvC,GAAoB,gBAAR+7B,IAAoBuG,GAC/B,MAAOA,IAAMliC,MAAO3C,KAAM4C,UAG3B,IAAI9B,GAAU6D,EAAMi5B,EACnBhkB,EAAO5Z,KACP4e,EAAM0f,EAAIh+B,QAAS,IAsDpB,OApDKse,GAAM,KACV9d,EAAWD,EAAO4E,KAAM64B,EAAIn+B,MAAOye,IACnC0f,EAAMA,EAAIn+B,MAAO,EAAGye,IAIhB/d,EAAOiD,WAAYghC,IAGvBviC,EAAWuiC,EACXA,EAAS7gC,QAGE6gC,GAA4B,gBAAXA,KAC5BngC,EAAO,QAIHiV,EAAKhY,OAAS,GAClBf,EAAOy+B,MACNhB,IAAKA,EAKL35B,KAAMA,GAAQ,MACd23B,SAAU,OACVrc,KAAM6kB,IACHl8B,KAAM,SAAUg7B,GAGnBhG,EAAWh7B,UAEXgX,EAAK0R,KAAMxqB,EAIVD,EAAQ,SAAUmrB,OAAQnrB,EAAOiZ,UAAW8pB,IAAiBn0B,KAAM3O,GAGnE8iC,KAKE/mB,OAAQta,GAAY,SAAUk6B,EAAOgE,GACxC7mB,EAAKtX,KAAM,WACVC,EAASI,MAAO3C,KAAM49B,IAAcnB,EAAMmH,aAAcnD,EAAQhE,QAK5Dz8B,MAORa,EAAOyB,MACN,YACA,WACA,eACA,YACA,cACA,YACE,SAAUI,EAAGiC,GACf9D,EAAOG,GAAI2D,GAAS,SAAU3D,GAC7B,MAAOhB,MAAKmlB,GAAIxgB,EAAM3D,MAOxBH,EAAOkQ,KAAK8E,QAAQkvB,SAAW,SAAUtiC,GACxC,MAAO5B,GAAO6F,KAAM7F,EAAOo2B,OAAQ,SAAUj2B,GAC5C,MAAOyB,KAASzB,EAAGyB,OAChBb,OASL,SAASojC,IAAWviC,GACnB,MAAO5B,GAAOgE,SAAUpC,GAASA,EAAyB,IAAlBA,EAAKyC,UAAkBzC,EAAKwM,YAGrEpO,EAAOokC,QACNC,UAAW,SAAUziC,EAAMa,EAASZ,GACnC,GAAIyiC,GAAaC,EAASC,EAAWC,EAAQC,EAAWC,EAAYC,EACnE/V,EAAW7uB,EAAOkhB,IAAKtf,EAAM,YAC7BijC,EAAU7kC,EAAQ4B,GAClBklB,IAGiB,YAAb+H,IACJjtB,EAAKigB,MAAMgN,SAAW,YAGvB6V,EAAYG,EAAQT,SACpBI,EAAYxkC,EAAOkhB,IAAKtf,EAAM,OAC9B+iC,EAAa3kC,EAAOkhB,IAAKtf,EAAM,QAC/BgjC,GAAmC,aAAb/V,GAAwC,UAAbA,KAC9C2V,EAAYG,GAAallC,QAAS,QAAW,GAI3CmlC,GACJN,EAAcO,EAAQhW,WACtB4V,EAASH,EAAYj2B,IACrBk2B,EAAUD,EAAY7S,OAGtBgT,EAAStgC,WAAYqgC,IAAe,EACpCD,EAAUpgC,WAAYwgC,IAAgB,GAGlC3kC,EAAOiD,WAAYR,KAGvBA,EAAUA,EAAQxB,KAAMW,EAAMC,EAAG7B,EAAOwC,UAAYkiC,KAGjC,MAAfjiC,EAAQ4L,MACZyY,EAAMzY,IAAQ5L,EAAQ4L,IAAMq2B,EAAUr2B,IAAQo2B,GAE1B,MAAhBhiC,EAAQgvB,OACZ3K,EAAM2K,KAAShvB,EAAQgvB,KAAOiT,EAAUjT,KAAS8S,GAG7C,SAAW9hC,GACfA,EAAQqiC,MAAM7jC,KAAMW,EAAMklB,GAG1B+d,EAAQ3jB,IAAK4F,KAKhB9mB,EAAOG,GAAGqC,QACT4hC,OAAQ,SAAU3hC,GACjB,GAAKV,UAAUhB,OACd,MAAmBqC,UAAZX,EACNtD,KACAA,KAAKsC,KAAM,SAAUI,GACpB7B,EAAOokC,OAAOC,UAAWllC,KAAMsD,EAASZ,IAI3C,IAAI2F,GAASu9B,EACZnjC,EAAOzC,KAAM,GACb6lC,GAAQ32B,IAAK,EAAGojB,KAAM,GACtBtjB,EAAMvM,GAAQA,EAAK8J,aAEpB,IAAMyC,EAON,MAHA3G,GAAU2G,EAAIJ,gBAGR/N,EAAO4H,SAAUJ,EAAS5F,IAIhCojC,EAAMpjC,EAAKwuB,wBACX2U,EAAMZ,GAAWh2B,IAEhBE,IAAK22B,EAAI32B,IAAM02B,EAAIE,YAAcz9B,EAAQugB,UACzC0J,KAAMuT,EAAIvT,KAAOsT,EAAIG,YAAc19B,EAAQmgB,aAPpCqd,GAWTnW,SAAU,WACT,GAAM1vB,KAAM,GAAZ,CAIA,GAAIgmC,GAAcf,EACjBxiC,EAAOzC,KAAM,GACbimC,GAAiB/2B,IAAK,EAAGojB,KAAM,EA0BhC,OAtBwC,UAAnCzxB,EAAOkhB,IAAKtf,EAAM,YAGtBwiC,EAASxiC,EAAKwuB,yBAKd+U,EAAehmC,KAAKgmC,eAGpBf,EAASjlC,KAAKilC,SACRpkC,EAAOqF,SAAU8/B,EAAc,GAAK,UACzCC,EAAeD,EAAaf,UAI7BgB,EAAa/2B,KAAOrO,EAAOkhB,IAAKikB,EAAc,GAAK,kBAAkB,GACrEC,EAAa3T,MAAQzxB,EAAOkhB,IAAKikB,EAAc,GAAK,mBAAmB,KAKvE92B,IAAK+1B,EAAO/1B,IAAM+2B,EAAa/2B,IAAMrO,EAAOkhB,IAAKtf,EAAM,aAAa,GACpE6vB,KAAM2S,EAAO3S,KAAO2T,EAAa3T,KAAOzxB,EAAOkhB,IAAKtf,EAAM,cAAc,MAc1EujC,aAAc,WACb,MAAOhmC,MAAKwC,IAAK,WAChB,GAAIwjC,GAAehmC,KAAKgmC,YAExB,OAAQA,GAA2D,WAA3CnlC,EAAOkhB,IAAKikB,EAAc,YACjDA,EAAeA,EAAaA,YAG7B,OAAOA,IAAgBp3B,QAM1B/N,EAAOyB,MAAQimB,WAAY,cAAeI,UAAW,eAAiB,SAAUmY,EAAQ5gB,GACvF,GAAIhR,GAAM,gBAAkBgR,CAE5Brf,GAAOG,GAAI8/B,GAAW,SAAU5vB,GAC/B,MAAOgO,GAAQlf,KAAM,SAAUyC,EAAMq+B,EAAQ5vB,GAC5C,GAAI00B,GAAMZ,GAAWviC,EAErB,OAAawB,UAARiN,EACG00B,EAAMA,EAAK1lB,GAASzd,EAAMq+B,QAG7B8E,EACJA,EAAIM,SACFh3B,EAAY02B,EAAIG,YAAV70B,EACPhC,EAAMgC,EAAM00B,EAAIE,aAIjBrjC,EAAMq+B,GAAW5vB,IAEhB4vB,EAAQ5vB,EAAKtO,UAAUhB,WAU5Bf,EAAOyB,MAAQ,MAAO,QAAU,SAAUI,EAAGwd,GAC5Crf,EAAOwwB,SAAUnR,GAASmP,GAAc1uB,EAAQ+tB,cAC/C,SAAUjsB,EAAMwsB,GACf,MAAKA,IACJA,EAAWD,GAAQvsB,EAAMyd,GAGlBoN,GAAUxgB,KAAMmiB,GACtBpuB,EAAQ4B,GAAOitB,WAAYxP,GAAS,KACpC+O,GANF,WAcHpuB,EAAOyB,MAAQ6jC,OAAQ,SAAUC,MAAO,SAAW,SAAU7iC,EAAMoB,GAClE9D,EAAOyB,MAAQkwB,QAAS,QAAUjvB,EAAMinB,QAAS7lB,EAAM0hC,GAAI,QAAU9iC,GACpE,SAAU+iC,EAAcC,GAGxB1lC,EAAOG,GAAIulC,GAAa,SAAUhU,EAAQvrB,GACzC,GAAImY,GAAYvc,UAAUhB,SAAY0kC,GAAkC,iBAAX/T,IAC5DhC,EAAQ+V,IAAkB/T,KAAW,GAAQvrB,KAAU,EAAO,SAAW,SAE1E,OAAOkY,GAAQlf,KAAM,SAAUyC,EAAMkC,EAAMqC,GAC1C,GAAIgI,EAEJ,OAAKnO,GAAOgE,SAAUpC,GAKdA,EAAK7C,SAASgP,gBAAiB,SAAWrL,GAI3B,IAAlBd,EAAKyC,UACT8J,EAAMvM,EAAKmM,gBAIJzK,KAAKksB,IACX5tB,EAAK2lB,KAAM,SAAW7kB,GAAQyL,EAAK,SAAWzL,GAC9Cd,EAAK2lB,KAAM,SAAW7kB,GAAQyL,EAAK,SAAWzL,GAC9CyL,EAAK,SAAWzL,KAIDU,SAAV+C,EAGNnG,EAAOkhB,IAAKtf,EAAMkC,EAAM4rB,GAGxB1vB,EAAO6hB,MAAOjgB,EAAMkC,EAAMqC,EAAOupB,IAChC5rB,EAAMwa,EAAYoT,EAAStuB,OAAWkb,EAAW,WAMvDte,EAAOG,GAAGqC,QAETmjC,KAAM,SAAUphB,EAAOnF,EAAMjf,GAC5B,MAAOhB,MAAKmlB,GAAIC,EAAO,KAAMnF,EAAMjf,IAEpCylC,OAAQ,SAAUrhB,EAAOpkB,GACxB,MAAOhB,MAAK4e,IAAKwG,EAAO,KAAMpkB,IAG/B0lC,SAAU,SAAU5lC,EAAUskB,EAAOnF,EAAMjf,GAC1C,MAAOhB,MAAKmlB,GAAIC,EAAOtkB,EAAUmf,EAAMjf,IAExC2lC,WAAY,SAAU7lC,EAAUskB,EAAOpkB,GAGtC,MAA4B,KAArB4B,UAAUhB,OAChB5B,KAAK4e,IAAK9d,EAAU,MACpBd,KAAK4e,IAAKwG,EAAOtkB,GAAY,KAAME,IAErC4lC,KAAM,WACL,MAAO5mC,MAAK4B,UAIdf,EAAOG,GAAG6lC,QAAUhmC,EAAOG,GAAG6Z,QAkBP,kBAAXisB,SAAyBA,OAAOC,KAC3CD,OAAQ,YAAc,WACrB,MAAOjmC,IAMT,IAGCmmC,IAAUjnC,EAAOc,OAGjBomC,GAAKlnC,EAAOmnC,CAqBb,OAnBArmC,GAAOsmC,WAAa,SAAUtjC,GAS7B,MARK9D,GAAOmnC,IAAMrmC,IACjBd,EAAOmnC,EAAID,IAGPpjC,GAAQ9D,EAAOc,SAAWA,IAC9Bd,EAAOc,OAASmmC,IAGVnmC,GAMFZ,IACLF,EAAOc,OAASd,EAAOmnC,EAAIrmC,GAGrBA","file":"jquery.min.js"}
\ No newline at end of file
+{"version":3,"sources":["jquery.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","slice","concat","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","support","version","jQuery","selector","context","fn","init","rtrim","rmsPrefix","rdashAlpha","fcamelCase","all","letter","toUpperCase","prototype","jquery","constructor","length","toArray","call","get","num","pushStack","elems","ret","merge","prevObject","each","callback","map","elem","i","apply","arguments","first","eq","last","len","j","end","sort","splice","extend","options","name","src","copy","copyIsArray","clone","target","deep","isFunction","isPlainObject","isArray","undefined","expando","Math","random","replace","isReady","error","msg","noop","obj","type","Array","isWindow","isNumeric","realStringObj","parseFloat","key","nodeType","isEmptyObject","globalEval","code","script","indirect","eval","trim","createElement","text","head","appendChild","parentNode","removeChild","camelCase","string","nodeName","toLowerCase","isArrayLike","makeArray","results","Object","inArray","second","grep","invert","callbackInverse","matches","callbackExpect","arg","value","guid","proxy","tmp","args","now","Date","Symbol","iterator","split","Sizzle","Expr","getText","isXML","tokenize","compile","select","outermostContext","sortInput","hasDuplicate","setDocument","docElem","documentIsHTML","rbuggyQSA","rbuggyMatches","contains","preferredDoc","dirruns","done","classCache","createCache","tokenCache","compilerCache","sortOrder","a","b","MAX_NEGATIVE","pop","push_native","list","booleans","whitespace","identifier","attributes","pseudos","rwhitespace","RegExp","rcomma","rcombinators","rattributeQuotes","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rinputs","rheader","rnative","rquickExpr","rsibling","rescape","runescape","funescape","_","escaped","escapedWhitespace","high","String","fromCharCode","unloadHandler","childNodes","e","els","seed","m","nid","nidselect","match","groups","newSelector","newContext","ownerDocument","exec","getElementById","id","getElementsByTagName","getElementsByClassName","qsa","test","getAttribute","setAttribute","toSelector","join","testContext","querySelectorAll","qsaError","removeAttribute","keys","cache","cacheLength","shift","markFunction","assert","div","addHandle","attrs","handler","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","createButtonPseudo","createPositionalPseudo","argument","matchIndexes","documentElement","node","hasCompare","parent","doc","defaultView","top","addEventListener","attachEvent","className","createComment","getById","getElementsByName","find","filter","attrId","getAttributeNode","tag","innerHTML","input","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","attr","val","specified","uniqueSort","duplicates","detectDuplicates","sortStable","textContent","firstChild","nodeValue","selectors","createPseudo","relative",">","dir"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","simple","forward","ofType","xml","uniqueCache","outerCache","nodeIndex","start","useCache","lastChild","uniqueID","pseudo","setFilters","idx","matched","not","matcher","unmatched","has","innerText","lang","elemLang","hash","location","root","focus","activeElement","hasFocus","href","tabIndex","enabled","disabled","checked","selected","selectedIndex","empty","header","button","even","odd","lt","gt","radio","checkbox","file","password","image","submit","reset","filters","parseOnly","tokens","soFar","preFilters","cached","addCombinator","combinator","base","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","multipleContexts","contexts","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","matcherFromGroupMatchers","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","token","compiled","div1","defaultValue","unique","isXMLDoc","until","truncate","is","siblings","n","rneedsContext","rsingleTag","risSimple","winnow","qualifier","self","rootjQuery","parseHTML","ready","rparentsprev","guaranteedUnique","children","contents","next","prev","targets","l","closest","pos","index","prevAll","add","addBack","sibling","parents","parentsUntil","nextAll","nextUntil","prevUntil","contentDocument","reverse","rnotwhite","createOptions","object","flag","Callbacks","firing","memory","fired","locked","queue","firingIndex","fire","once","stopOnFalse","remove","disable","lock","fireWith","Deferred","func","tuples","state","promise","always","deferred","fail","then","fns","newDefer","tuple","returned","progress","notify","resolve","reject","pipe","stateString","when","subordinate","resolveValues","remaining","updateFunc","values","progressValues","notifyWith","resolveWith","progressContexts","resolveContexts","readyList","readyWait","holdReady","hold","wait","triggerHandler","off","completed","removeEventListener","readyState","doScroll","setTimeout","access","chainable","emptyGet","raw","bulk","acceptData","owner","Data","uid","register","initial","defineProperty","writable","configurable","set","data","prop","stored","camel","hasData","dataPriv","dataUser","rbrace","rmultiDash","dataAttr","parseJSON","removeData","_data","_removeData","camelKey","dequeue","startLength","hooks","_queueHooks","stop","setter","clearQueue","count","defer","pnum","source","rcssNum","cssExpand","isHidden","el","css","adjustCSS","valueParts","tween","adjusted","scale","maxIterations","currentValue","unit","cssNumber","initialInUnit","style","rcheckableType","rtagName","rscriptType","wrapMap","option","thead","col","tr","td","_default","optgroup","tbody","tfoot","colgroup","caption","th","getAll","setGlobalEval","refElements","rhtml","buildFragment","scripts","selection","ignored","wrap","fragment","createDocumentFragment","nodes","htmlPrefilter","createTextNode","checkClone","cloneNode","noCloneChecked","rkeyEvent","rmouseEvent","rtypenamespace","returnTrue","returnFalse","safeActiveElement","err","on","types","one","origFn","event","handleObjIn","eventHandle","events","t","handleObj","special","handlers","namespaces","origType","elemData","handle","triggered","dispatch","delegateType","bindType","namespace","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","fix","handlerQueue","delegateTarget","preDispatch","isPropagationStopped","currentTarget","isImmediatePropagationStopped","rnamespace","preventDefault","stopPropagation","postDispatch","sel","isNaN","props","fixHooks","keyHooks","original","which","charCode","keyCode","mouseHooks","eventDoc","body","pageX","clientX","scrollLeft","clientLeft","pageY","clientY","scrollTop","clientTop","originalEvent","fixHook","Event","load","noBubble","trigger","blur","click","beforeunload","returnValue","isDefaultPrevented","defaultPrevented","timeStamp","isSimulated","stopImmediatePropagation","mouseenter","mouseleave","pointerenter","pointerleave","orig","related","relatedTarget","rxhtmlTag","rnoInnerhtml","rchecked","rscriptTypeMasked","rcleanScript","manipulationTarget","content","disableScript","restoreScript","cloneCopyEvent","dest","pdataOld","pdataCur","udataOld","udataCur","fixInput","domManip","collection","hasScripts","iNoClone","html","_evalUrl","keepData","cleanData","dataAndEvents","deepDataAndEvents","srcElements","destElements","inPage","detach","append","prepend","insertBefore","before","after","replaceWith","replaceChild","appendTo","prependTo","insertAfter","replaceAll","insert","iframe","elemdisplay","HTML","BODY","actualDisplay","display","defaultDisplay","write","close","rmargin","rnumnonpx","getStyles","view","opener","getComputedStyle","swap","old","pixelPositionVal","boxSizingReliableVal","pixelMarginRightVal","reliableMarginLeftVal","container","backgroundClip","clearCloneStyle","cssText","computeStyleTests","divStyle","marginLeft","width","marginRight","pixelPosition","boxSizingReliable","pixelMarginRight","reliableMarginLeft","reliableMarginRight","marginDiv","curCSS","computed","minWidth","maxWidth","getPropertyValue","addGetHookIf","conditionFn","hookFn","rdisplayswap","cssShow","position","visibility","cssNormalTransform","letterSpacing","fontWeight","cssPrefixes","emptyStyle","vendorPropName","capName","setPositiveNumber","subtract","max","augmentWidthOrHeight","extra","isBorderBox","styles","getWidthOrHeight","valueIsBorderBox","offsetWidth","offsetHeight","showHide","show","hidden","cssHooks","opacity","animationIterationCount","columnCount","fillOpacity","flexGrow","flexShrink","lineHeight","order","orphans","widows","zIndex","zoom","cssProps","float","origName","isFinite","getBoundingClientRect","left","margin","padding","border","prefix","suffix","expand","expanded","parts","hide","toggle","Tween","easing","propHooks","run","percent","eased","duration","step","fx","linear","p","swing","cos","PI","fxNow","timerId","rfxtypes","rrun","createFxNow","genFx","includeWidth","height","createTween","animation","Animation","tweeners","defaultPrefilter","opts","oldfire","checkDisplay","anim","dataShow","unqueued","overflow","overflowX","overflowY","propFilter","specialEasing","properties","stopped","prefilters","tick","currentTime","startTime","tweens","originalProperties","originalOptions","gotoEnd","rejectWith","timer","complete","*","tweener","prefilter","speed","opt","speeds","fadeTo","to","animate","optall","doAnimation","finish","stopQueue","timers","cssFn","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","interval","setInterval","clearInterval","slow","fast","delay","time","timeout","clearTimeout","checkOn","optSelected","optDisabled","radioValue","boolHook","removeAttr","nType","attrHooks","propName","attrNames","propFix","getter","rfocusable","rclickable","removeProp","tabindex","parseInt","for","class","rclass","getClass","addClass","classes","curValue","clazz","finalValue","removeClass","toggleClass","stateVal","classNames","hasClass","rreturn","rspaces","valHooks","optionSet","rfocusMorph","onlyHandlers","bubbleType","ontype","eventPath","isTrigger","parentWindow","simulate","hover","fnOver","fnOut","focusin","attaches","nonce","rquery","JSON","parse","parseXML","DOMParser","parseFromString","rhash","rts","rheaders","rlocalProtocol","rnoContent","rprotocol","transports","allTypes","originAnchor","addToPrefiltersOrTransports","structure","dataTypeExpression","dataType","dataTypes","inspectPrefiltersOrTransports","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","ajaxSettings","ajaxHandleResponses","s","responses","ct","finalDataType","firstDataType","mimeType","getResponseHeader","converters","ajaxConvert","response","isSuccess","conv2","current","conv","responseFields","dataFilter","active","lastModified","etag","url","isLocal","protocol","processData","async","contentType","accepts","json","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","ajax","transport","cacheURL","responseHeadersString","responseHeaders","timeoutTimer","urlAnchor","fireGlobals","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getAllResponseHeaders","setRequestHeader","lname","overrideMimeType","status","abort","statusText","finalText","success","method","crossDomain","host","param","traditional","hasContent","ifModified","headers","beforeSend","send","nativeStatusText","modified","getJSON","getScript","throws","wrapAll","firstElementChild","wrapInner","unwrap","visible","getClientRects","r20","rbracket","rCRLF","rsubmitterTypes","rsubmittable","buildParams","v","encodeURIComponent","serialize","serializeArray","xhr","XMLHttpRequest","xhrSuccessStatus","0","1223","xhrSupported","cors","errorCallback","open","username","xhrFields","onload","onerror","onabort","onreadystatechange","responseType","responseText","binary","text script","charset","scriptCharset","evt","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","keepScripts","parsed","_load","params","animated","getWindow","offset","setOffset","curPosition","curLeft","curCSSTop","curTop","curOffset","curCSSLeft","calculatePosition","curElem","using","win","box","pageYOffset","pageXOffset","offsetParent","parentOffset","scrollTo","Height","Width","","defaultExtra","funcName","bind","unbind","delegate","undelegate","size","andSelf","define","amd","_jQuery","_$","$","noConflict"],"mappings":";CAcC,SAAUA,EAAQC,GAEK,gBAAXC,SAAiD,gBAAnBA,QAAOC,QAQhDD,OAAOC,QAAUH,EAAOI,SACvBH,EAASD,GAAQ,GACjB,SAAUK,GACT,IAAMA,EAAED,SACP,KAAM,IAAIE,OAAO,2CAElB,OAAOL,GAASI,IAGlBJ,EAASD,IAIS,mBAAXO,QAAyBA,OAASC,KAAM,SAAUD,EAAQE,GAOnE,GAAIC,MAEAN,EAAWG,EAAOH,SAElBO,EAAQD,EAAIC,MAEZC,EAASF,EAAIE,OAEbC,EAAOH,EAAIG,KAEXC,EAAUJ,EAAII,QAEdC,KAEAC,EAAWD,EAAWC,SAEtBC,EAASF,EAAWG,eAEpBC,KAKHC,EAAU,QAGVC,EAAS,SAAUC,EAAUC,GAI5B,MAAO,IAAIF,GAAOG,GAAGC,KAAMH,EAAUC,IAKtCG,EAAQ,qCAGRC,EAAY,QACZC,EAAa,eAGbC,EAAa,SAAUC,EAAKC,GAC3B,MAAOA,GAAOC,cAGhBX,GAAOG,GAAKH,EAAOY,WAGlBC,OAAQd,EAERe,YAAad,EAGbC,SAAU,GAGVc,OAAQ,EAERC,QAAS,WACR,MAAO1B,GAAM2B,KAAM9B,OAKpB+B,IAAK,SAAUC,GACd,MAAc,OAAPA,EAGE,EAANA,EAAUhC,KAAMgC,EAAMhC,KAAK4B,QAAW5B,KAAMgC,GAG9C7B,EAAM2B,KAAM9B,OAKdiC,UAAW,SAAUC,GAGpB,GAAIC,GAAMtB,EAAOuB,MAAOpC,KAAK2B,cAAeO,EAO5C,OAJAC,GAAIE,WAAarC,KACjBmC,EAAIpB,QAAUf,KAAKe,QAGZoB,GAIRG,KAAM,SAAUC,GACf,MAAO1B,GAAOyB,KAAMtC,KAAMuC,IAG3BC,IAAK,SAAUD,GACd,MAAOvC,MAAKiC,UAAWpB,EAAO2B,IAAKxC,KAAM,SAAUyC,EAAMC,GACxD,MAAOH,GAAST,KAAMW,EAAMC,EAAGD,OAIjCtC,MAAO,WACN,MAAOH,MAAKiC,UAAW9B,EAAMwC,MAAO3C,KAAM4C,aAG3CC,MAAO,WACN,MAAO7C,MAAK8C,GAAI,IAGjBC,KAAM,WACL,MAAO/C,MAAK8C,GAAI,KAGjBA,GAAI,SAAUJ,GACb,GAAIM,GAAMhD,KAAK4B,OACdqB,GAAKP,GAAU,EAAJA,EAAQM,EAAM,EAC1B,OAAOhD,MAAKiC,UAAWgB,GAAK,GAASD,EAAJC,GAAYjD,KAAMiD,SAGpDC,IAAK,WACJ,MAAOlD,MAAKqC,YAAcrC,KAAK2B,eAKhCtB,KAAMA,EACN8C,KAAMjD,EAAIiD,KACVC,OAAQlD,EAAIkD,QAGbvC,EAAOwC,OAASxC,EAAOG,GAAGqC,OAAS,WAClC,GAAIC,GAASC,EAAMC,EAAKC,EAAMC,EAAaC,EAC1CC,EAAShB,UAAW,OACpBF,EAAI,EACJd,EAASgB,UAAUhB,OACnBiC,GAAO,CAsBR,KAnBuB,iBAAXD,KACXC,EAAOD,EAGPA,EAAShB,UAAWF,OACpBA,KAIsB,gBAAXkB,IAAwB/C,EAAOiD,WAAYF,KACtDA,MAIIlB,IAAMd,IACVgC,EAAS5D,KACT0C,KAGWd,EAAJc,EAAYA,IAGnB,GAAqC,OAA9BY,EAAUV,UAAWF,IAG3B,IAAMa,IAAQD,GACbE,EAAMI,EAAQL,GACdE,EAAOH,EAASC,GAGXK,IAAWH,IAKXI,GAAQJ,IAAU5C,EAAOkD,cAAeN,KAC1CC,EAAc7C,EAAOmD,QAASP,MAE3BC,GACJA,GAAc,EACdC,EAAQH,GAAO3C,EAAOmD,QAASR,GAAQA,MAGvCG,EAAQH,GAAO3C,EAAOkD,cAAeP,GAAQA,KAI9CI,EAAQL,GAAS1C,EAAOwC,OAAQQ,EAAMF,EAAOF,IAGzBQ,SAATR,IACXG,EAAQL,GAASE,GAOrB,OAAOG,IAGR/C,EAAOwC,QAGNa,QAAS,UAAatD,EAAUuD,KAAKC,UAAWC,QAAS,MAAO,IAGhEC,SAAS,EAETC,MAAO,SAAUC,GAChB,KAAM,IAAI1E,OAAO0E,IAGlBC,KAAM,aAENX,WAAY,SAAUY,GACrB,MAA8B,aAAvB7D,EAAO8D,KAAMD,IAGrBV,QAASY,MAAMZ,QAEfa,SAAU,SAAUH,GACnB,MAAc,OAAPA,GAAeA,IAAQA,EAAI3E,QAGnC+E,UAAW,SAAUJ,GAMpB,GAAIK,GAAgBL,GAAOA,EAAIlE,UAC/B,QAAQK,EAAOmD,QAASU,IAAWK,EAAgBC,WAAYD,GAAkB,GAAO,GAGzFhB,cAAe,SAAUW,GACxB,GAAIO,EAMJ,IAA4B,WAAvBpE,EAAO8D,KAAMD,IAAsBA,EAAIQ,UAAYrE,EAAOgE,SAAUH,GACxE,OAAO,CAIR,IAAKA,EAAI/C,cACNlB,EAAOqB,KAAM4C,EAAK,iBAClBjE,EAAOqB,KAAM4C,EAAI/C,YAAYF,cAAiB,iBAChD,OAAO,CAKR,KAAMwD,IAAOP,IAEb,MAAeT,UAARgB,GAAqBxE,EAAOqB,KAAM4C,EAAKO,IAG/CE,cAAe,SAAUT,GACxB,GAAInB,EACJ,KAAMA,IAAQmB,GACb,OAAO,CAER,QAAO,GAGRC,KAAM,SAAUD,GACf,MAAY,OAAPA,EACGA,EAAM,GAIQ,gBAARA,IAAmC,kBAARA,GACxCnE,EAAYC,EAASsB,KAAM4C,KAAW,eAC/BA,IAITU,WAAY,SAAUC,GACrB,GAAIC,GACHC,EAAWC,IAEZH,GAAOxE,EAAO4E,KAAMJ,GAEfA,IAKkC,IAAjCA,EAAK/E,QAAS,eAClBgF,EAAS1F,EAAS8F,cAAe,UACjCJ,EAAOK,KAAON,EACdzF,EAASgG,KAAKC,YAAaP,GAASQ,WAAWC,YAAaT,IAM5DC,EAAUF,KAQbW,UAAW,SAAUC,GACpB,MAAOA,GAAO5B,QAASlD,EAAW,OAAQkD,QAASjD,EAAYC,IAGhE6E,SAAU,SAAUzD,EAAMc,GACzB,MAAOd,GAAKyD,UAAYzD,EAAKyD,SAASC,gBAAkB5C,EAAK4C,eAG9D7D,KAAM,SAAUoC,EAAKnC,GACpB,GAAIX,GAAQc,EAAI,CAEhB,IAAK0D,EAAa1B,IAEjB,IADA9C,EAAS8C,EAAI9C,OACDA,EAAJc,EAAYA,IACnB,GAAKH,EAAST,KAAM4C,EAAKhC,GAAKA,EAAGgC,EAAKhC,OAAU,EAC/C,UAIF,KAAMA,IAAKgC,GACV,GAAKnC,EAAST,KAAM4C,EAAKhC,GAAKA,EAAGgC,EAAKhC,OAAU,EAC/C,KAKH,OAAOgC,IAIRe,KAAM,SAAUE,GACf,MAAe,OAARA,EACN,IACEA,EAAO,IAAKtB,QAASnD,EAAO,KAIhCmF,UAAW,SAAUnG,EAAKoG,GACzB,GAAInE,GAAMmE,KAaV,OAXY,OAAPpG,IACCkG,EAAaG,OAAQrG,IACzBW,EAAOuB,MAAOD,EACE,gBAARjC,IACLA,GAAQA,GAGXG,EAAKyB,KAAMK,EAAKjC,IAIXiC,GAGRqE,QAAS,SAAU/D,EAAMvC,EAAKwC,GAC7B,MAAc,OAAPxC,EAAc,GAAKI,EAAQwB,KAAM5B,EAAKuC,EAAMC,IAGpDN,MAAO,SAAUS,EAAO4D,GAKvB,IAJA,GAAIzD,IAAOyD,EAAO7E,OACjBqB,EAAI,EACJP,EAAIG,EAAMjB,OAECoB,EAAJC,EAASA,IAChBJ,EAAOH,KAAQ+D,EAAQxD,EAKxB,OAFAJ,GAAMjB,OAASc,EAERG,GAGR6D,KAAM,SAAUxE,EAAOK,EAAUoE,GAShC,IARA,GAAIC,GACHC,KACAnE,EAAI,EACJd,EAASM,EAAMN,OACfkF,GAAkBH,EAIP/E,EAAJc,EAAYA,IACnBkE,GAAmBrE,EAAUL,EAAOQ,GAAKA,GACpCkE,IAAoBE,GACxBD,EAAQxG,KAAM6B,EAAOQ,GAIvB,OAAOmE,IAIRrE,IAAK,SAAUN,EAAOK,EAAUwE,GAC/B,GAAInF,GAAQoF,EACXtE,EAAI,EACJP,IAGD,IAAKiE,EAAalE,GAEjB,IADAN,EAASM,EAAMN,OACHA,EAAJc,EAAYA,IACnBsE,EAAQzE,EAAUL,EAAOQ,GAAKA,EAAGqE,GAEnB,MAATC,GACJ7E,EAAI9B,KAAM2G,OAMZ,KAAMtE,IAAKR,GACV8E,EAAQzE,EAAUL,EAAOQ,GAAKA,EAAGqE,GAEnB,MAATC,GACJ7E,EAAI9B,KAAM2G,EAMb,OAAO5G,GAAOuC,SAAWR,IAI1B8E,KAAM,EAINC,MAAO,SAAUlG,EAAID,GACpB,GAAIoG,GAAKC,EAAMF,CAUf,OARwB,gBAAZnG,KACXoG,EAAMnG,EAAID,GACVA,EAAUC,EACVA,EAAKmG,GAKAtG,EAAOiD,WAAY9C,IAKzBoG,EAAOjH,EAAM2B,KAAMc,UAAW,GAC9BsE,EAAQ,WACP,MAAOlG,GAAG2B,MAAO5B,GAAWf,KAAMoH,EAAKhH,OAAQD,EAAM2B,KAAMc,cAI5DsE,EAAMD,KAAOjG,EAAGiG,KAAOjG,EAAGiG,MAAQpG,EAAOoG,OAElCC,GAbP,QAgBDG,IAAKC,KAAKD,IAIV1G,QAASA,IAQa,kBAAX4G,UACX1G,EAAOG,GAAIuG,OAAOC,UAAatH,EAAKqH,OAAOC,WAK5C3G,EAAOyB,KAAM,uEAAuEmF,MAAO,KAC3F,SAAU/E,EAAGa,GACZhD,EAAY,WAAagD,EAAO,KAAQA,EAAK4C,eAG9C,SAASC,GAAa1B,GAMrB,GAAI9C,KAAW8C,GAAO,UAAYA,IAAOA,EAAI9C,OAC5C+C,EAAO9D,EAAO8D,KAAMD,EAErB,OAAc,aAATC,GAAuB9D,EAAOgE,SAAUH,IACrC,EAGQ,UAATC,GAA+B,IAAX/C,GACR,gBAAXA,IAAuBA,EAAS,GAAOA,EAAS,IAAO8C,GAEhE,GAAIgD,GAWJ,SAAW3H,GAEX,GAAI2C,GACH/B,EACAgH,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EAGAC,EACAxI,EACAyI,EACAC,EACAC,EACAC,EACA3B,EACA4B,EAGAvE,EAAU,SAAW,EAAI,GAAIoD,MAC7BoB,EAAe3I,EAAOH,SACtB+I,EAAU,EACVC,EAAO,EACPC,EAAaC,KACbC,EAAaD,KACbE,EAAgBF,KAChBG,EAAY,SAAUC,EAAGC,GAIxB,MAHKD,KAAMC,IACVhB,GAAe,GAET,GAIRiB,EAAe,GAAK,GAGpB3I,KAAcC,eACdR,KACAmJ,EAAMnJ,EAAImJ,IACVC,EAAcpJ,EAAIG,KAClBA,EAAOH,EAAIG,KACXF,EAAQD,EAAIC,MAGZG,EAAU,SAAUiJ,EAAM9G,GAGzB,IAFA,GAAIC,GAAI,EACPM,EAAMuG,EAAK3H,OACAoB,EAAJN,EAASA,IAChB,GAAK6G,EAAK7G,KAAOD,EAChB,MAAOC,EAGT,OAAO,IAGR8G,EAAW,6HAKXC,EAAa,sBAGbC,EAAa,mCAGbC,EAAa,MAAQF,EAAa,KAAOC,EAAa,OAASD,EAE9D,gBAAkBA,EAElB,2DAA6DC,EAAa,OAASD,EACnF,OAEDG,EAAU,KAAOF,EAAa,wFAKAC,EAAa,eAM3CE,EAAc,GAAIC,QAAQL,EAAa,IAAK,KAC5CvI,EAAQ,GAAI4I,QAAQ,IAAML,EAAa,8BAAgCA,EAAa,KAAM,KAE1FM,EAAS,GAAID,QAAQ,IAAML,EAAa,KAAOA,EAAa,KAC5DO,EAAe,GAAIF,QAAQ,IAAML,EAAa,WAAaA,EAAa,IAAMA,EAAa,KAE3FQ,EAAmB,GAAIH,QAAQ,IAAML,EAAa,iBAAmBA,EAAa,OAAQ,KAE1FS,EAAU,GAAIJ,QAAQF,GACtBO,EAAc,GAAIL,QAAQ,IAAMJ,EAAa,KAE7CU,GACCC,GAAM,GAAIP,QAAQ,MAAQJ,EAAa,KACvCY,MAAS,GAAIR,QAAQ,QAAUJ,EAAa,KAC5Ca,IAAO,GAAIT,QAAQ,KAAOJ,EAAa,SACvCc,KAAQ,GAAIV,QAAQ,IAAMH,GAC1Bc,OAAU,GAAIX,QAAQ,IAAMF,GAC5Bc,MAAS,GAAIZ,QAAQ,yDAA2DL,EAC/E,+BAAiCA,EAAa,cAAgBA,EAC9D,aAAeA,EAAa,SAAU,KACvCkB,KAAQ,GAAIb,QAAQ,OAASN,EAAW,KAAM,KAG9CoB,aAAgB,GAAId,QAAQ,IAAML,EAAa,mDAC9CA,EAAa,mBAAqBA,EAAa,mBAAoB,MAGrEoB,EAAU,sCACVC,EAAU,SAEVC,EAAU,yBAGVC,EAAa,mCAEbC,EAAW,OACXC,GAAU,QAGVC,GAAY,GAAIrB,QAAQ,qBAAuBL,EAAa,MAAQA,EAAa,OAAQ,MACzF2B,GAAY,SAAUC,EAAGC,EAASC,GACjC,GAAIC,GAAO,KAAOF,EAAU,KAI5B,OAAOE,KAASA,GAAQD,EACvBD,EACO,EAAPE,EAECC,OAAOC,aAAcF,EAAO,OAE5BC,OAAOC,aAAcF,GAAQ,GAAK,MAAe,KAAPA,EAAe,QAO5DG,GAAgB,WACfvD,IAIF,KACC/H,EAAKsC,MACHzC,EAAMC,EAAM2B,KAAM4G,EAAakD,YAChClD,EAAakD,YAId1L,EAAKwI,EAAakD,WAAWhK,QAASsD,SACrC,MAAQ2G,IACTxL,GAASsC,MAAOzC,EAAI0B,OAGnB,SAAUgC,EAAQkI,GACjBxC,EAAY3G,MAAOiB,EAAQzD,EAAM2B,KAAKgK,KAKvC,SAAUlI,EAAQkI,GACjB,GAAI7I,GAAIW,EAAOhC,OACdc,EAAI,CAEL,OAASkB,EAAOX,KAAO6I,EAAIpJ,MAC3BkB,EAAOhC,OAASqB,EAAI,IAKvB,QAASyE,IAAQ5G,EAAUC,EAASuF,EAASyF,GAC5C,GAAIC,GAAGtJ,EAAGD,EAAMwJ,EAAKC,EAAWC,EAAOC,EAAQC,EAC9CC,EAAavL,GAAWA,EAAQwL,cAGhCrH,EAAWnE,EAAUA,EAAQmE,SAAW,CAKzC,IAHAoB,EAAUA,MAGe,gBAAbxF,KAA0BA,GACxB,IAAboE,GAA+B,IAAbA,GAA+B,KAAbA,EAEpC,MAAOoB,EAIR,KAAMyF,KAEEhL,EAAUA,EAAQwL,eAAiBxL,EAAU2H,KAAmB9I,GACtEwI,EAAarH,GAEdA,EAAUA,GAAWnB,EAEhB0I,GAAiB,CAIrB,GAAkB,KAAbpD,IAAoBiH,EAAQnB,EAAWwB,KAAM1L,IAGjD,GAAMkL,EAAIG,EAAM,IAGf,GAAkB,IAAbjH,EAAiB,CACrB,KAAMzC,EAAO1B,EAAQ0L,eAAgBT,IAUpC,MAAO1F,EALP,IAAK7D,EAAKiK,KAAOV,EAEhB,MADA1F,GAAQjG,KAAMoC,GACP6D,MAYT,IAAKgG,IAAe7J,EAAO6J,EAAWG,eAAgBT,KACrDvD,EAAU1H,EAAS0B,IACnBA,EAAKiK,KAAOV,EAGZ,MADA1F,GAAQjG,KAAMoC,GACP6D,MAKH,CAAA,GAAK6F,EAAM,GAEjB,MADA9L,GAAKsC,MAAO2D,EAASvF,EAAQ4L,qBAAsB7L,IAC5CwF,CAGD,KAAM0F,EAAIG,EAAM,KAAOxL,EAAQiM,wBACrC7L,EAAQ6L,uBAGR,MADAvM,GAAKsC,MAAO2D,EAASvF,EAAQ6L,uBAAwBZ,IAC9C1F,EAKT,GAAK3F,EAAQkM,MACX7D,EAAelI,EAAW,QACzByH,IAAcA,EAAUuE,KAAMhM,IAAc,CAE9C,GAAkB,IAAboE,EACJoH,EAAavL,EACbsL,EAAcvL,MAMR,IAAwC,WAAnCC,EAAQmF,SAASC,cAA6B,EAGnD8F,EAAMlL,EAAQgM,aAAc,OACjCd,EAAMA,EAAI5H,QAAS6G,GAAS,QAE5BnK,EAAQiM,aAAc,KAAOf,EAAM/H,GAIpCkI,EAAStE,EAAUhH,GACnB4B,EAAI0J,EAAOxK,OACXsK,EAAY/B,EAAY2C,KAAMb,GAAQ,IAAMA,EAAM,QAAUA,EAAM,IAClE,OAAQvJ,IACP0J,EAAO1J,GAAKwJ,EAAY,IAAMe,GAAYb,EAAO1J,GAElD2J,GAAcD,EAAOc,KAAM,KAG3BZ,EAAarB,EAAS6B,KAAMhM,IAAcqM,GAAapM,EAAQ+E,aAC9D/E,EAGF,GAAKsL,EACJ,IAIC,MAHAhM,GAAKsC,MAAO2D,EACXgG,EAAWc,iBAAkBf,IAEvB/F,EACN,MAAQ+G,IACR,QACIpB,IAAQ/H,GACZnD,EAAQuM,gBAAiB,QAS/B,MAAOtF,GAAQlH,EAASuD,QAASnD,EAAO,MAAQH,EAASuF,EAASyF,GASnE,QAASjD,MACR,GAAIyE,KAEJ,SAASC,GAAOvI,EAAK+B,GAMpB,MAJKuG,GAAKlN,KAAM4E,EAAM,KAAQ0C,EAAK8F,mBAE3BD,GAAOD,EAAKG,SAEZF,EAAOvI,EAAM,KAAQ+B,EAE9B,MAAOwG,GAOR,QAASG,IAAc3M,GAEtB,MADAA,GAAIkD,IAAY,EACTlD,EAOR,QAAS4M,IAAQ5M,GAChB,GAAI6M,GAAMjO,EAAS8F,cAAc,MAEjC,KACC,QAAS1E,EAAI6M,GACZ,MAAOhC,GACR,OAAO,EACN,QAEIgC,EAAI/H,YACR+H,EAAI/H,WAAWC,YAAa8H,GAG7BA,EAAM,MASR,QAASC,IAAWC,EAAOC,GAC1B,GAAI9N,GAAM6N,EAAMtG,MAAM,KACrB/E,EAAIxC,EAAI0B,MAET,OAAQc,IACPiF,EAAKsG,WAAY/N,EAAIwC,IAAOsL,EAU9B,QAASE,IAAchF,EAAGC,GACzB,GAAIgF,GAAMhF,GAAKD,EACdkF,EAAOD,GAAsB,IAAfjF,EAAEhE,UAAiC,IAAfiE,EAAEjE,YAChCiE,EAAEkF,aAAejF,KACjBF,EAAEmF,aAAejF,EAGtB,IAAKgF,EACJ,MAAOA,EAIR,IAAKD,EACJ,MAASA,EAAMA,EAAIG,YAClB,GAAKH,IAAQhF,EACZ,MAAO,EAKV,OAAOD,GAAI,EAAI,GAOhB,QAASqF,IAAmB5J,GAC3B,MAAO,UAAUlC,GAChB,GAAIc,GAAOd,EAAKyD,SAASC,aACzB,OAAgB,UAAT5C,GAAoBd,EAAKkC,OAASA,GAQ3C,QAAS6J,IAAoB7J,GAC5B,MAAO,UAAUlC,GAChB,GAAIc,GAAOd,EAAKyD,SAASC,aACzB,QAAiB,UAAT5C,GAA6B,WAATA,IAAsBd,EAAKkC,OAASA,GAQlE,QAAS8J,IAAwBzN,GAChC,MAAO2M,IAAa,SAAUe,GAE7B,MADAA,IAAYA,EACLf,GAAa,SAAU5B,EAAMlF,GACnC,GAAI5D,GACH0L,EAAe3N,KAAQ+K,EAAKnK,OAAQ8M,GACpChM,EAAIiM,EAAa/M,MAGlB,OAAQc,IACFqJ,EAAO9I,EAAI0L,EAAajM,MAC5BqJ,EAAK9I,KAAO4D,EAAQ5D,GAAK8I,EAAK9I,SAYnC,QAASkK,IAAapM,GACrB,MAAOA,IAAmD,mBAAjCA,GAAQ4L,sBAAwC5L,EAI1EJ,EAAU+G,GAAO/G,WAOjBkH,EAAQH,GAAOG,MAAQ,SAAUpF,GAGhC,GAAImM,GAAkBnM,IAASA,EAAK8J,eAAiB9J,GAAMmM,eAC3D,OAAOA,GAA+C,SAA7BA,EAAgB1I,UAAsB,GAQhEkC,EAAcV,GAAOU,YAAc,SAAUyG,GAC5C,GAAIC,GAAYC,EACfC,EAAMH,EAAOA,EAAKtC,eAAiBsC,EAAOnG,CAG3C,OAAKsG,KAAQpP,GAA6B,IAAjBoP,EAAI9J,UAAmB8J,EAAIJ,iBAKpDhP,EAAWoP,EACX3G,EAAUzI,EAASgP,gBACnBtG,GAAkBT,EAAOjI,IAInBmP,EAASnP,EAASqP,cAAgBF,EAAOG,MAAQH,IAEjDA,EAAOI,iBACXJ,EAAOI,iBAAkB,SAAUxD,IAAe,GAGvCoD,EAAOK,aAClBL,EAAOK,YAAa,WAAYzD,KAUlChL,EAAQgJ,WAAaiE,GAAO,SAAUC,GAErC,MADAA,GAAIwB,UAAY,KACRxB,EAAId,aAAa,eAO1BpM,EAAQgM,qBAAuBiB,GAAO,SAAUC,GAE/C,MADAA,GAAIhI,YAAajG,EAAS0P,cAAc,MAChCzB,EAAIlB,qBAAqB,KAAK/K,SAIvCjB,EAAQiM,uBAAyB7B,EAAQ+B,KAAMlN,EAASgN,wBAMxDjM,EAAQ4O,QAAU3B,GAAO,SAAUC,GAElC,MADAxF,GAAQxC,YAAagI,GAAMnB,GAAKxI,GACxBtE,EAAS4P,oBAAsB5P,EAAS4P,kBAAmBtL,GAAUtC,SAIzEjB,EAAQ4O,SACZ5H,EAAK8H,KAAS,GAAI,SAAU/C,EAAI3L,GAC/B,GAAuC,mBAA3BA,GAAQ0L,gBAAkCnE,EAAiB,CACtE,GAAI0D,GAAIjL,EAAQ0L,eAAgBC,EAChC,OAAOV,IAAMA,QAGfrE,EAAK+H,OAAW,GAAI,SAAUhD,GAC7B,GAAIiD,GAASjD,EAAGrI,QAAS8G,GAAWC,GACpC,OAAO,UAAU3I,GAChB,MAAOA,GAAKsK,aAAa,QAAU4C,YAM9BhI,GAAK8H,KAAS,GAErB9H,EAAK+H,OAAW,GAAK,SAAUhD,GAC9B,GAAIiD,GAASjD,EAAGrI,QAAS8G,GAAWC,GACpC,OAAO,UAAU3I,GAChB,GAAIoM,GAAwC,mBAA1BpM,GAAKmN,kBACtBnN,EAAKmN,iBAAiB,KACvB,OAAOf,IAAQA,EAAK7H,QAAU2I,KAMjChI,EAAK8H,KAAU,IAAI9O,EAAQgM,qBAC1B,SAAUkD,EAAK9O,GACd,MAA6C,mBAAjCA,GAAQ4L,qBACZ5L,EAAQ4L,qBAAsBkD,GAG1BlP,EAAQkM,IACZ9L,EAAQqM,iBAAkByC,GAD3B,QAKR,SAAUA,EAAK9O,GACd,GAAI0B,GACH0E,KACAzE,EAAI,EAEJ4D,EAAUvF,EAAQ4L,qBAAsBkD,EAGzC,IAAa,MAARA,EAAc,CAClB,MAASpN,EAAO6D,EAAQ5D,KACA,IAAlBD,EAAKyC,UACTiC,EAAI9G,KAAMoC,EAIZ,OAAO0E,GAER,MAAOb,IAITqB,EAAK8H,KAAY,MAAI9O,EAAQiM,wBAA0B,SAAUyC,EAAWtO,GAC3E,MAA+C,mBAAnCA,GAAQ6L,wBAA0CtE,EACtDvH,EAAQ6L,uBAAwByC,GADxC,QAWD7G,KAOAD,MAEM5H,EAAQkM,IAAM9B,EAAQ+B,KAAMlN,EAASwN,qBAG1CQ,GAAO,SAAUC,GAMhBxF,EAAQxC,YAAagI,GAAMiC,UAAY,UAAY5L,EAAU,qBAC3CA,EAAU,kEAOvB2J,EAAIT,iBAAiB,wBAAwBxL,QACjD2G,EAAUlI,KAAM,SAAWoJ,EAAa,gBAKnCoE,EAAIT,iBAAiB,cAAcxL,QACxC2G,EAAUlI,KAAM,MAAQoJ,EAAa,aAAeD,EAAW,KAI1DqE,EAAIT,iBAAkB,QAAUlJ,EAAU,MAAOtC,QACtD2G,EAAUlI,KAAK,MAMVwN,EAAIT,iBAAiB,YAAYxL,QACtC2G,EAAUlI,KAAK,YAMVwN,EAAIT,iBAAkB,KAAOlJ,EAAU,MAAOtC,QACnD2G,EAAUlI,KAAK,cAIjBuN,GAAO,SAAUC,GAGhB,GAAIkC,GAAQnQ,EAAS8F,cAAc,QACnCqK,GAAM/C,aAAc,OAAQ,UAC5Ba,EAAIhI,YAAakK,GAAQ/C,aAAc,OAAQ,KAI1Ca,EAAIT,iBAAiB,YAAYxL,QACrC2G,EAAUlI,KAAM,OAASoJ,EAAa,eAKjCoE,EAAIT,iBAAiB,YAAYxL,QACtC2G,EAAUlI,KAAM,WAAY,aAI7BwN,EAAIT,iBAAiB,QACrB7E,EAAUlI,KAAK,YAIXM,EAAQqP,gBAAkBjF,EAAQ+B,KAAOjG,EAAUwB,EAAQxB,SAChEwB,EAAQ4H,uBACR5H,EAAQ6H,oBACR7H,EAAQ8H,kBACR9H,EAAQ+H,qBAERxC,GAAO,SAAUC,GAGhBlN,EAAQ0P,kBAAoBxJ,EAAQ/E,KAAM+L,EAAK,OAI/ChH,EAAQ/E,KAAM+L,EAAK,aACnBrF,EAAcnI,KAAM,KAAMuJ,KAI5BrB,EAAYA,EAAU3G,QAAU,GAAIkI,QAAQvB,EAAU2E,KAAK,MAC3D1E,EAAgBA,EAAc5G,QAAU,GAAIkI,QAAQtB,EAAc0E,KAAK,MAIvE4B,EAAa/D,EAAQ+B,KAAMzE,EAAQiI,yBAKnC7H,EAAWqG,GAAc/D,EAAQ+B,KAAMzE,EAAQI,UAC9C,SAAUS,EAAGC,GACZ,GAAIoH,GAAuB,IAAfrH,EAAEhE,SAAiBgE,EAAE0F,gBAAkB1F,EAClDsH,EAAMrH,GAAKA,EAAErD,UACd,OAAOoD,KAAMsH,MAAWA,GAAwB,IAAjBA,EAAItL,YAClCqL,EAAM9H,SACL8H,EAAM9H,SAAU+H,GAChBtH,EAAEoH,yBAA8D,GAAnCpH,EAAEoH,wBAAyBE,MAG3D,SAAUtH,EAAGC,GACZ,GAAKA,EACJ,MAASA,EAAIA,EAAErD,WACd,GAAKqD,IAAMD,EACV,OAAO,CAIV,QAAO,GAOTD,EAAY6F,EACZ,SAAU5F,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,MADAhB,IAAe,EACR,CAIR,IAAIsI,IAAWvH,EAAEoH,yBAA2BnH,EAAEmH,uBAC9C,OAAKG,GACGA,GAIRA,GAAYvH,EAAEqD,eAAiBrD,MAAUC,EAAEoD,eAAiBpD,GAC3DD,EAAEoH,wBAAyBnH,GAG3B,EAGc,EAAVsH,IACF9P,EAAQ+P,cAAgBvH,EAAEmH,wBAAyBpH,KAAQuH,EAGxDvH,IAAMtJ,GAAYsJ,EAAEqD,gBAAkB7D,GAAgBD,EAASC,EAAcQ,GAC1E,GAEHC,IAAMvJ,GAAYuJ,EAAEoD,gBAAkB7D,GAAgBD,EAASC,EAAcS,GAC1E,EAIDjB,EACJ5H,EAAS4H,EAAWgB,GAAM5I,EAAS4H,EAAWiB,GAChD,EAGe,EAAVsH,EAAc,GAAK,IAE3B,SAAUvH,EAAGC,GAEZ,GAAKD,IAAMC,EAEV,MADAhB,IAAe,EACR,CAGR,IAAIgG,GACHzL,EAAI,EACJiO,EAAMzH,EAAEpD,WACR0K,EAAMrH,EAAErD,WACR8K,GAAO1H,GACP2H,GAAO1H,EAGR,KAAMwH,IAAQH,EACb,MAAOtH,KAAMtJ,EAAW,GACvBuJ,IAAMvJ,EAAW,EACjB+Q,EAAM,GACNH,EAAM,EACNtI,EACE5H,EAAS4H,EAAWgB,GAAM5I,EAAS4H,EAAWiB,GAChD,CAGK,IAAKwH,IAAQH,EACnB,MAAOtC,IAAchF,EAAGC,EAIzBgF,GAAMjF,CACN,OAASiF,EAAMA,EAAIrI,WAClB8K,EAAGE,QAAS3C,EAEbA,GAAMhF,CACN,OAASgF,EAAMA,EAAIrI,WAClB+K,EAAGC,QAAS3C,EAIb,OAAQyC,EAAGlO,KAAOmO,EAAGnO,GACpBA,GAGD,OAAOA,GAENwL,GAAc0C,EAAGlO,GAAImO,EAAGnO,IAGxBkO,EAAGlO,KAAOgG,EAAe,GACzBmI,EAAGnO,KAAOgG,EAAe,EACzB,GAGK9I,GArWCA,GAwWT8H,GAAOb,QAAU,SAAUkK,EAAMC,GAChC,MAAOtJ,IAAQqJ,EAAM,KAAM,KAAMC,IAGlCtJ,GAAOsI,gBAAkB,SAAUvN,EAAMsO,GASxC,IAPOtO,EAAK8J,eAAiB9J,KAAW7C,GACvCwI,EAAa3F,GAIdsO,EAAOA,EAAK1M,QAAS4F,EAAkB,UAElCtJ,EAAQqP,iBAAmB1H,IAC9BU,EAAe+H,EAAO,QACpBvI,IAAkBA,EAAcsE,KAAMiE,OACtCxI,IAAkBA,EAAUuE,KAAMiE,IAErC,IACC,GAAI5O,GAAM0E,EAAQ/E,KAAMW,EAAMsO,EAG9B,IAAK5O,GAAOxB,EAAQ0P,mBAGlB5N,EAAK7C,UAAuC,KAA3B6C,EAAK7C,SAASsF,SAChC,MAAO/C,GAEP,MAAO0J,IAGV,MAAOnE,IAAQqJ,EAAMnR,EAAU,MAAQ6C,IAASb,OAAS,GAG1D8F,GAAOe,SAAW,SAAU1H,EAAS0B,GAKpC,OAHO1B,EAAQwL,eAAiBxL,KAAcnB,GAC7CwI,EAAarH,GAEP0H,EAAU1H,EAAS0B,IAG3BiF,GAAOuJ,KAAO,SAAUxO,EAAMc,IAEtBd,EAAK8J,eAAiB9J,KAAW7C,GACvCwI,EAAa3F,EAGd,IAAIzB,GAAK2G,EAAKsG,WAAY1K,EAAK4C,eAE9B+K,EAAMlQ,GAAMP,EAAOqB,KAAM6F,EAAKsG,WAAY1K,EAAK4C,eAC9CnF,EAAIyB,EAAMc,GAAO+E,GACjBrE,MAEF,OAAeA,UAARiN,EACNA,EACAvQ,EAAQgJ,aAAerB,EACtB7F,EAAKsK,aAAcxJ,IAClB2N,EAAMzO,EAAKmN,iBAAiBrM,KAAU2N,EAAIC,UAC1CD,EAAIlK,MACJ,MAGJU,GAAOnD,MAAQ,SAAUC,GACxB,KAAM,IAAI1E,OAAO,0CAA4C0E,IAO9DkD,GAAO0J,WAAa,SAAU9K,GAC7B,GAAI7D,GACH4O,KACApO,EAAI,EACJP,EAAI,CAOL,IAJAyF,GAAgBxH,EAAQ2Q,iBACxBpJ,GAAavH,EAAQ4Q,YAAcjL,EAAQnG,MAAO,GAClDmG,EAAQnD,KAAM8F,GAETd,EAAe,CACnB,MAAS1F,EAAO6D,EAAQ5D,KAClBD,IAAS6D,EAAS5D,KACtBO,EAAIoO,EAAWhR,KAAMqC,GAGvB,OAAQO,IACPqD,EAAQlD,OAAQiO,EAAYpO,GAAK,GAQnC,MAFAiF,GAAY,KAEL5B,GAORsB,EAAUF,GAAOE,QAAU,SAAUnF,GACpC,GAAIoM,GACH1M,EAAM,GACNO,EAAI,EACJwC,EAAWzC,EAAKyC,QAEjB,IAAMA,GAMC,GAAkB,IAAbA,GAA+B,IAAbA,GAA+B,KAAbA,EAAkB,CAGjE,GAAiC,gBAArBzC,GAAK+O,YAChB,MAAO/O,GAAK+O,WAGZ,KAAM/O,EAAOA,EAAKgP,WAAYhP,EAAMA,EAAOA,EAAK6L,YAC/CnM,GAAOyF,EAASnF,OAGZ,IAAkB,IAAbyC,GAA+B,IAAbA,EAC7B,MAAOzC,GAAKiP,cAhBZ,OAAS7C,EAAOpM,EAAKC,KAEpBP,GAAOyF,EAASiH,EAkBlB,OAAO1M,IAGRwF,EAAOD,GAAOiK,WAGblE,YAAa,GAEbmE,aAAcjE,GAEdxB,MAAO/B,EAEP6D,cAEAwB,QAEAoC,UACCC,KAAOC,IAAK,aAAclP,OAAO,GACjCmP,KAAOD,IAAK,cACZE,KAAOF,IAAK,kBAAmBlP,OAAO,GACtCqP,KAAOH,IAAK,oBAGbI,WACC3H,KAAQ,SAAU2B,GAUjB,MATAA,GAAM,GAAKA,EAAM,GAAG9H,QAAS8G,GAAWC,IAGxCe,EAAM,IAAOA,EAAM,IAAMA,EAAM,IAAMA,EAAM,IAAM,IAAK9H,QAAS8G,GAAWC,IAExD,OAAbe,EAAM,KACVA,EAAM,GAAK,IAAMA,EAAM,GAAK,KAGtBA,EAAMhM,MAAO,EAAG,IAGxBuK,MAAS,SAAUyB,GA6BlB,MAlBAA,GAAM,GAAKA,EAAM,GAAGhG,cAEY,QAA3BgG,EAAM,GAAGhM,MAAO,EAAG,IAEjBgM,EAAM,IACXzE,GAAOnD,MAAO4H,EAAM,IAKrBA,EAAM,KAAQA,EAAM,GAAKA,EAAM,IAAMA,EAAM,IAAM,GAAK,GAAmB,SAAbA,EAAM,IAA8B,QAAbA,EAAM,KACzFA,EAAM,KAAUA,EAAM,GAAKA,EAAM,IAAqB,QAAbA,EAAM,KAGpCA,EAAM,IACjBzE,GAAOnD,MAAO4H,EAAM,IAGdA,GAGR1B,OAAU,SAAU0B,GACnB,GAAIiG,GACHC,GAAYlG,EAAM,IAAMA,EAAM,EAE/B,OAAK/B,GAAiB,MAAE0C,KAAMX,EAAM,IAC5B,MAIHA,EAAM,GACVA,EAAM,GAAKA,EAAM,IAAMA,EAAM,IAAM,GAGxBkG,GAAYnI,EAAQ4C,KAAMuF,KAEpCD,EAAStK,EAAUuK,GAAU,MAE7BD,EAASC,EAAS/R,QAAS,IAAK+R,EAASzQ,OAASwQ,GAAWC,EAASzQ,UAGvEuK,EAAM,GAAKA,EAAM,GAAGhM,MAAO,EAAGiS,GAC9BjG,EAAM,GAAKkG,EAASlS,MAAO,EAAGiS,IAIxBjG,EAAMhM,MAAO,EAAG,MAIzBuP,QAECnF,IAAO,SAAU+H,GAChB,GAAIpM,GAAWoM,EAAiBjO,QAAS8G,GAAWC,IAAYjF,aAChE,OAA4B,MAArBmM,EACN,WAAa,OAAO,GACpB,SAAU7P,GACT,MAAOA,GAAKyD,UAAYzD,EAAKyD,SAASC,gBAAkBD,IAI3DoE,MAAS,SAAU+E,GAClB,GAAIkD,GAAU1J,EAAYwG,EAAY,IAEtC,OAAOkD,KACLA,EAAU,GAAIzI,QAAQ,MAAQL,EAAa,IAAM4F,EAAY,IAAM5F,EAAa,SACjFZ,EAAYwG,EAAW,SAAU5M,GAChC,MAAO8P,GAAQzF,KAAgC,gBAAnBrK,GAAK4M,WAA0B5M,EAAK4M,WAA0C,mBAAtB5M,GAAKsK,cAAgCtK,EAAKsK,aAAa,UAAY,OAI1JvC,KAAQ,SAAUjH,EAAMiP,EAAUC,GACjC,MAAO,UAAUhQ,GAChB,GAAIiQ,GAAShL,GAAOuJ,KAAMxO,EAAMc,EAEhC,OAAe,OAAVmP,EACgB,OAAbF,EAEFA,GAINE,GAAU,GAEU,MAAbF,EAAmBE,IAAWD,EACvB,OAAbD,EAAoBE,IAAWD,EAClB,OAAbD,EAAoBC,GAAqC,IAA5BC,EAAOpS,QAASmS,GAChC,OAAbD,EAAoBC,GAASC,EAAOpS,QAASmS,GAAU,GAC1C,OAAbD,EAAoBC,GAASC,EAAOvS,OAAQsS,EAAM7Q,UAAa6Q,EAClD,OAAbD,GAAsB,IAAME,EAAOrO,QAASwF,EAAa,KAAQ,KAAMvJ,QAASmS,GAAU,GAC7E,OAAbD,EAAoBE,IAAWD,GAASC,EAAOvS,MAAO,EAAGsS,EAAM7Q,OAAS,KAAQ6Q,EAAQ,KACxF,IAZO,IAgBV/H,MAAS,SAAU/F,EAAMgO,EAAMjE,EAAU7L,EAAOE,GAC/C,GAAI6P,GAAgC,QAAvBjO,EAAKxE,MAAO,EAAG,GAC3B0S,EAA+B,SAArBlO,EAAKxE,MAAO,IACtB2S,EAAkB,YAATH,CAEV,OAAiB,KAAV9P,GAAwB,IAATE,EAGrB,SAAUN,GACT,QAASA,EAAKqD,YAGf,SAAUrD,EAAM1B,EAASgS,GACxB,GAAIvF,GAAOwF,EAAaC,EAAYpE,EAAMqE,EAAWC,EACpDpB,EAAMa,IAAWC,EAAU,cAAgB,kBAC3C9D,EAAStM,EAAKqD,WACdvC,EAAOuP,GAAUrQ,EAAKyD,SAASC,cAC/BiN,GAAYL,IAAQD,EACpB1E,GAAO,CAER,IAAKW,EAAS,CAGb,GAAK6D,EAAS,CACb,MAAQb,EAAM,CACblD,EAAOpM,CACP,OAASoM,EAAOA,EAAMkD,GACrB,GAAKe,EACJjE,EAAK3I,SAASC,gBAAkB5C,EACd,IAAlBsL,EAAK3J,SAEL,OAAO,CAITiO,GAAQpB,EAAe,SAATpN,IAAoBwO,GAAS,cAE5C,OAAO,EAMR,GAHAA,GAAUN,EAAU9D,EAAO0C,WAAa1C,EAAOsE,WAG1CR,GAAWO,EAAW,CAK1BvE,EAAOE,EACPkE,EAAapE,EAAM3K,KAAc2K,EAAM3K,OAIvC8O,EAAcC,EAAYpE,EAAKyE,YAC7BL,EAAYpE,EAAKyE,cAEnB9F,EAAQwF,EAAarO,OACrBuO,EAAY1F,EAAO,KAAQ7E,GAAW6E,EAAO,GAC7CY,EAAO8E,GAAa1F,EAAO,GAC3BqB,EAAOqE,GAAanE,EAAOnD,WAAYsH,EAEvC,OAASrE,IAASqE,GAAarE,GAAQA,EAAMkD,KAG3C3D,EAAO8E,EAAY,IAAMC,EAAM9J,MAGhC,GAAuB,IAAlBwF,EAAK3J,YAAoBkJ,GAAQS,IAASpM,EAAO,CACrDuQ,EAAarO,IAAWgE,EAASuK,EAAW9E,EAC5C,YAuBF,IAjBKgF,IAEJvE,EAAOpM,EACPwQ,EAAapE,EAAM3K,KAAc2K,EAAM3K,OAIvC8O,EAAcC,EAAYpE,EAAKyE,YAC7BL,EAAYpE,EAAKyE,cAEnB9F,EAAQwF,EAAarO,OACrBuO,EAAY1F,EAAO,KAAQ7E,GAAW6E,EAAO,GAC7CY,EAAO8E,GAKH9E,KAAS,EAEb,MAASS,IAASqE,GAAarE,GAAQA,EAAMkD,KAC3C3D,EAAO8E,EAAY,IAAMC,EAAM9J,MAEhC,IAAOyJ,EACNjE,EAAK3I,SAASC,gBAAkB5C,EACd,IAAlBsL,EAAK3J,aACHkJ,IAGGgF,IACJH,EAAapE,EAAM3K,KAAc2K,EAAM3K,OAIvC8O,EAAcC,EAAYpE,EAAKyE,YAC7BL,EAAYpE,EAAKyE,cAEnBN,EAAarO,IAAWgE,EAASyF,IAG7BS,IAASpM,GACb,KASL,OADA2L,IAAQrL,EACDqL,IAASvL,GAAWuL,EAAOvL,IAAU,GAAKuL,EAAOvL,GAAS,KAKrE4H,OAAU,SAAU8I,EAAQ7E,GAK3B,GAAItH,GACHpG,EAAK2G,EAAKiC,QAAS2J,IAAY5L,EAAK6L,WAAYD,EAAOpN,gBACtDuB,GAAOnD,MAAO,uBAAyBgP,EAKzC,OAAKvS,GAAIkD,GACDlD,EAAI0N,GAIP1N,EAAGY,OAAS,GAChBwF,GAASmM,EAAQA,EAAQ,GAAI7E,GACtB/G,EAAK6L,WAAW9S,eAAgB6S,EAAOpN,eAC7CwH,GAAa,SAAU5B,EAAMlF,GAC5B,GAAI4M,GACHC,EAAU1S,EAAI+K,EAAM2C,GACpBhM,EAAIgR,EAAQ9R,MACb,OAAQc,IACP+Q,EAAMnT,EAASyL,EAAM2H,EAAQhR,IAC7BqJ,EAAM0H,KAAW5M,EAAS4M,GAAQC,EAAQhR,MAG5C,SAAUD,GACT,MAAOzB,GAAIyB,EAAM,EAAG2E,KAIhBpG,IAIT4I,SAEC+J,IAAOhG,GAAa,SAAU7M,GAI7B,GAAIiP,MACHzJ,KACAsN,EAAU7L,EAASjH,EAASuD,QAASnD,EAAO,MAE7C,OAAO0S,GAAS1P,GACfyJ,GAAa,SAAU5B,EAAMlF,EAAS9F,EAASgS,GAC9C,GAAItQ,GACHoR,EAAYD,EAAS7H,EAAM,KAAMgH,MACjCrQ,EAAIqJ,EAAKnK,MAGV,OAAQc,KACDD,EAAOoR,EAAUnR,MACtBqJ,EAAKrJ,KAAOmE,EAAQnE,GAAKD,MAI5B,SAAUA,EAAM1B,EAASgS,GAKxB,MAJAhD,GAAM,GAAKtN,EACXmR,EAAS7D,EAAO,KAAMgD,EAAKzM,GAE3ByJ,EAAM,GAAK,MACHzJ,EAAQ+C,SAInByK,IAAOnG,GAAa,SAAU7M,GAC7B,MAAO,UAAU2B,GAChB,MAAOiF,IAAQ5G,EAAU2B,GAAOb,OAAS,KAI3C6G,SAAYkF,GAAa,SAAUhI,GAElC,MADAA,GAAOA,EAAKtB,QAAS8G,GAAWC,IACzB,SAAU3I,GAChB,OAASA,EAAK+O,aAAe/O,EAAKsR,WAAanM,EAASnF,IAASnC,QAASqF,GAAS,MAWrFqO,KAAQrG,GAAc,SAAUqG,GAM/B,MAJM7J,GAAY2C,KAAKkH,GAAQ,KAC9BtM,GAAOnD,MAAO,qBAAuByP,GAEtCA,EAAOA,EAAK3P,QAAS8G,GAAWC,IAAYjF,cACrC,SAAU1D,GAChB,GAAIwR,EACJ,GACC,IAAMA,EAAW3L,EAChB7F,EAAKuR,KACLvR,EAAKsK,aAAa,aAAetK,EAAKsK,aAAa,QAGnD,MADAkH,GAAWA,EAAS9N,cACb8N,IAAaD,GAA2C,IAAnCC,EAAS3T,QAAS0T,EAAO,YAE5CvR,EAAOA,EAAKqD,aAAiC,IAAlBrD,EAAKyC,SAC3C,QAAO,KAKTtB,OAAU,SAAUnB,GACnB,GAAIyR,GAAOnU,EAAOoU,UAAYpU,EAAOoU,SAASD,IAC9C,OAAOA,IAAQA,EAAK/T,MAAO,KAAQsC,EAAKiK,IAGzC0H,KAAQ,SAAU3R,GACjB,MAAOA,KAAS4F,GAGjBgM,MAAS,SAAU5R,GAClB,MAAOA,KAAS7C,EAAS0U,iBAAmB1U,EAAS2U,UAAY3U,EAAS2U,gBAAkB9R,EAAKkC,MAAQlC,EAAK+R,OAAS/R,EAAKgS,WAI7HC,QAAW,SAAUjS,GACpB,MAAOA,GAAKkS,YAAa,GAG1BA,SAAY,SAAUlS,GACrB,MAAOA,GAAKkS,YAAa,GAG1BC,QAAW,SAAUnS,GAGpB,GAAIyD,GAAWzD,EAAKyD,SAASC,aAC7B,OAAqB,UAAbD,KAA0BzD,EAAKmS,SAA0B,WAAb1O,KAA2BzD,EAAKoS,UAGrFA,SAAY,SAAUpS,GAOrB,MAJKA,GAAKqD,YACTrD,EAAKqD,WAAWgP,cAGVrS,EAAKoS,YAAa,GAI1BE,MAAS,SAAUtS,GAKlB,IAAMA,EAAOA,EAAKgP,WAAYhP,EAAMA,EAAOA,EAAK6L,YAC/C,GAAK7L,EAAKyC,SAAW,EACpB,OAAO,CAGT,QAAO,GAGR6J,OAAU,SAAUtM,GACnB,OAAQkF,EAAKiC,QAAe,MAAGnH,IAIhCuS,OAAU,SAAUvS,GACnB,MAAOqI,GAAQgC,KAAMrK,EAAKyD,WAG3B6J,MAAS,SAAUtN,GAClB,MAAOoI,GAAQiC,KAAMrK,EAAKyD,WAG3B+O,OAAU,SAAUxS,GACnB,GAAIc,GAAOd,EAAKyD,SAASC,aACzB,OAAgB,UAAT5C,GAAkC,WAAdd,EAAKkC,MAA8B,WAATpB,GAGtDoC,KAAQ,SAAUlD,GACjB,GAAIwO,EACJ,OAAuC,UAAhCxO,EAAKyD,SAASC,eACN,SAAd1D,EAAKkC,OAImC,OAArCsM,EAAOxO,EAAKsK,aAAa,UAA2C,SAAvBkE,EAAK9K,gBAIvDtD,MAAS4L,GAAuB,WAC/B,OAAS,KAGV1L,KAAQ0L,GAAuB,SAAUE,EAAc/M,GACtD,OAASA,EAAS,KAGnBkB,GAAM2L,GAAuB,SAAUE,EAAc/M,EAAQ8M,GAC5D,OAAoB,EAAXA,EAAeA,EAAW9M,EAAS8M,KAG7CwG,KAAQzG,GAAuB,SAAUE,EAAc/M,GAEtD,IADA,GAAIc,GAAI,EACId,EAAJc,EAAYA,GAAK,EACxBiM,EAAatO,KAAMqC,EAEpB,OAAOiM,KAGRwG,IAAO1G,GAAuB,SAAUE,EAAc/M,GAErD,IADA,GAAIc,GAAI,EACId,EAAJc,EAAYA,GAAK,EACxBiM,EAAatO,KAAMqC,EAEpB,OAAOiM,KAGRyG,GAAM3G,GAAuB,SAAUE,EAAc/M,EAAQ8M,GAE5D,IADA,GAAIhM,GAAe,EAAXgM,EAAeA,EAAW9M,EAAS8M,IACjChM,GAAK,GACdiM,EAAatO,KAAMqC,EAEpB,OAAOiM,KAGR0G,GAAM5G,GAAuB,SAAUE,EAAc/M,EAAQ8M,GAE5D,IADA,GAAIhM,GAAe,EAAXgM,EAAeA,EAAW9M,EAAS8M,IACjChM,EAAId,GACb+M,EAAatO,KAAMqC,EAEpB,OAAOiM,OAKVhH,EAAKiC,QAAa,IAAIjC,EAAKiC,QAAY,EAGvC,KAAMlH,KAAO4S,OAAO,EAAMC,UAAU,EAAMC,MAAM,EAAMC,UAAU,EAAMC,OAAO,GAC5E/N,EAAKiC,QAASlH,GAAM6L,GAAmB7L,EAExC,KAAMA,KAAOiT,QAAQ,EAAMC,OAAO,GACjCjO,EAAKiC,QAASlH,GAAM8L,GAAoB9L,EAIzC,SAAS8Q,OACTA,GAAW/R,UAAYkG,EAAKkO,QAAUlO,EAAKiC,QAC3CjC,EAAK6L,WAAa,GAAIA,IAEtB1L,EAAWJ,GAAOI,SAAW,SAAUhH,EAAUgV,GAChD,GAAIpC,GAASvH,EAAO4J,EAAQpR,EAC3BqR,EAAO5J,EAAQ6J,EACfC,EAASnN,EAAYjI,EAAW,IAEjC,IAAKoV,EACJ,MAAOJ,GAAY,EAAII,EAAO/V,MAAO,EAGtC6V,GAAQlV,EACRsL,KACA6J,EAAatO,EAAKwK,SAElB,OAAQ6D,EAAQ,CAGTtC,KAAYvH,EAAQpC,EAAOyC,KAAMwJ,MACjC7J,IAEJ6J,EAAQA,EAAM7V,MAAOgM,EAAM,GAAGvK,SAAYoU,GAE3C5J,EAAO/L,KAAO0V,OAGfrC,GAAU,GAGJvH,EAAQnC,EAAawC,KAAMwJ,MAChCtC,EAAUvH,EAAMuB,QAChBqI,EAAO1V,MACN2G,MAAO0M,EAEP/O,KAAMwH,EAAM,GAAG9H,QAASnD,EAAO,OAEhC8U,EAAQA,EAAM7V,MAAOuT,EAAQ9R,QAI9B,KAAM+C,IAAQgD,GAAK+H,SACZvD,EAAQ/B,EAAWzF,GAAO6H,KAAMwJ,KAAcC,EAAYtR,MAC9DwH,EAAQ8J,EAAYtR,GAAQwH,MAC7BuH,EAAUvH,EAAMuB,QAChBqI,EAAO1V,MACN2G,MAAO0M,EACP/O,KAAMA,EACNkC,QAASsF,IAEV6J,EAAQA,EAAM7V,MAAOuT,EAAQ9R,QAI/B,KAAM8R,EACL,MAOF,MAAOoC,GACNE,EAAMpU,OACNoU,EACCtO,GAAOnD,MAAOzD,GAEdiI,EAAYjI,EAAUsL,GAASjM,MAAO,GAGzC,SAAS8M,IAAY8I,GAIpB,IAHA,GAAIrT,GAAI,EACPM,EAAM+S,EAAOnU,OACbd,EAAW,GACAkC,EAAJN,EAASA,IAChB5B,GAAYiV,EAAOrT,GAAGsE,KAEvB,OAAOlG,GAGR,QAASqV,IAAevC,EAASwC,EAAYC,GAC5C,GAAItE,GAAMqE,EAAWrE,IACpBuE,EAAmBD,GAAgB,eAARtE,EAC3BwE,EAAW3N,GAEZ,OAAOwN,GAAWvT,MAEjB,SAAUJ,EAAM1B,EAASgS,GACxB,MAAStQ,EAAOA,EAAMsP,GACrB,GAAuB,IAAlBtP,EAAKyC,UAAkBoR,EAC3B,MAAO1C,GAASnR,EAAM1B,EAASgS,IAMlC,SAAUtQ,EAAM1B,EAASgS,GACxB,GAAIyD,GAAUxD,EAAaC,EAC1BwD,GAAa9N,EAAS4N,EAGvB,IAAKxD,GACJ,MAAStQ,EAAOA,EAAMsP,GACrB,IAAuB,IAAlBtP,EAAKyC,UAAkBoR,IACtB1C,EAASnR,EAAM1B,EAASgS,GAC5B,OAAO,MAKV,OAAStQ,EAAOA,EAAMsP,GACrB,GAAuB,IAAlBtP,EAAKyC,UAAkBoR,EAAmB,CAO9C,GANArD,EAAaxQ,EAAMyB,KAAczB,EAAMyB,OAIvC8O,EAAcC,EAAYxQ,EAAK6Q,YAAeL,EAAYxQ,EAAK6Q,eAEzDkD,EAAWxD,EAAajB,KAC7ByE,EAAU,KAAQ7N,GAAW6N,EAAU,KAAQD,EAG/C,MAAQE,GAAU,GAAMD,EAAU,EAMlC,IAHAxD,EAAajB,GAAQ0E,EAGfA,EAAU,GAAM7C,EAASnR,EAAM1B,EAASgS,GAC7C,OAAO,IASf,QAAS2D,IAAgBC,GACxB,MAAOA,GAAS/U,OAAS,EACxB,SAAUa,EAAM1B,EAASgS,GACxB,GAAIrQ,GAAIiU,EAAS/U,MACjB,OAAQc,IACP,IAAMiU,EAASjU,GAAID,EAAM1B,EAASgS,GACjC,OAAO,CAGT,QAAO,GAER4D,EAAS,GAGX,QAASC,IAAkB9V,EAAU+V,EAAUvQ,GAG9C,IAFA,GAAI5D,GAAI,EACPM,EAAM6T,EAASjV,OACJoB,EAAJN,EAASA,IAChBgF,GAAQ5G,EAAU+V,EAASnU,GAAI4D,EAEhC,OAAOA,GAGR,QAASwQ,IAAUjD,EAAWrR,EAAKkN,EAAQ3O,EAASgS,GAOnD,IANA,GAAItQ,GACHsU,KACArU,EAAI,EACJM,EAAM6Q,EAAUjS,OAChBoV,EAAgB,MAAPxU,EAEEQ,EAAJN,EAASA,KACVD,EAAOoR,EAAUnR,MAChBgN,IAAUA,EAAQjN,EAAM1B,EAASgS,KACtCgE,EAAa1W,KAAMoC,GACduU,GACJxU,EAAInC,KAAMqC,IAMd,OAAOqU,GAGR,QAASE,IAAY9E,EAAWrR,EAAU8S,EAASsD,EAAYC,EAAYC,GAO1E,MANKF,KAAeA,EAAYhT,KAC/BgT,EAAaD,GAAYC,IAErBC,IAAeA,EAAYjT,KAC/BiT,EAAaF,GAAYE,EAAYC,IAE/BzJ,GAAa,SAAU5B,EAAMzF,EAASvF,EAASgS,GACrD,GAAIsE,GAAM3U,EAAGD,EACZ6U,KACAC,KACAC,EAAclR,EAAQ1E,OAGtBM,EAAQ6J,GAAQ6K,GAAkB9V,GAAY,IAAKC,EAAQmE,UAAanE,GAAYA,MAGpF0W,GAAYtF,IAAepG,GAASjL,EAEnCoB,EADA4U,GAAU5U,EAAOoV,EAAQnF,EAAWpR,EAASgS,GAG9C2E,EAAa9D,EAEZuD,IAAgBpL,EAAOoG,EAAYqF,GAAeN,MAMjD5Q,EACDmR,CAQF,IALK7D,GACJA,EAAS6D,EAAWC,EAAY3W,EAASgS,GAIrCmE,EAAa,CACjBG,EAAOP,GAAUY,EAAYH,GAC7BL,EAAYG,KAAUtW,EAASgS,GAG/BrQ,EAAI2U,EAAKzV,MACT,OAAQc,KACDD,EAAO4U,EAAK3U,MACjBgV,EAAYH,EAAQ7U,MAAS+U,EAAWF,EAAQ7U,IAAOD,IAK1D,GAAKsJ,GACJ,GAAKoL,GAAchF,EAAY,CAC9B,GAAKgF,EAAa,CAEjBE,KACA3U,EAAIgV,EAAW9V,MACf,OAAQc,KACDD,EAAOiV,EAAWhV,KAEvB2U,EAAKhX,KAAOoX,EAAU/U,GAAKD,EAG7B0U,GAAY,KAAOO,KAAkBL,EAAMtE,GAI5CrQ,EAAIgV,EAAW9V,MACf,OAAQc,KACDD,EAAOiV,EAAWhV,MACtB2U,EAAOF,EAAa7W,EAASyL,EAAMtJ,GAAS6U,EAAO5U,IAAM,KAE1DqJ,EAAKsL,KAAU/Q,EAAQ+Q,GAAQ5U,SAOlCiV,GAAaZ,GACZY,IAAepR,EACdoR,EAAWtU,OAAQoU,EAAaE,EAAW9V,QAC3C8V,GAEGP,EACJA,EAAY,KAAM7Q,EAASoR,EAAY3E,GAEvC1S,EAAKsC,MAAO2D,EAASoR,KAMzB,QAASC,IAAmB5B,GAwB3B,IAvBA,GAAI6B,GAAchE,EAAS3Q,EAC1BD,EAAM+S,EAAOnU,OACbiW,EAAkBlQ,EAAKkK,SAAUkE,EAAO,GAAGpR,MAC3CmT,EAAmBD,GAAmBlQ,EAAKkK,SAAS,KACpDnP,EAAImV,EAAkB,EAAI,EAG1BE,EAAe5B,GAAe,SAAU1T,GACvC,MAAOA,KAASmV,GACdE,GAAkB,GACrBE,EAAkB7B,GAAe,SAAU1T,GAC1C,MAAOnC,GAASsX,EAAcnV,GAAS,IACrCqV,GAAkB,GACrBnB,GAAa,SAAUlU,EAAM1B,EAASgS,GACrC,GAAI5Q,IAAS0V,IAAqB9E,GAAOhS,IAAYkH,MACnD2P,EAAe7W,GAASmE,SACxB6S,EAActV,EAAM1B,EAASgS,GAC7BiF,EAAiBvV,EAAM1B,EAASgS,GAGlC,OADA6E,GAAe,KACRzV,IAGGa,EAAJN,EAASA,IAChB,GAAMkR,EAAUjM,EAAKkK,SAAUkE,EAAOrT,GAAGiC,MACxCgS,GAAaR,GAAcO,GAAgBC,GAAY/C,QACjD,CAIN,GAHAA,EAAUjM,EAAK+H,OAAQqG,EAAOrT,GAAGiC,MAAOhC,MAAO,KAAMoT,EAAOrT,GAAGmE,SAG1D+M,EAAS1P,GAAY,CAGzB,IADAjB,IAAMP,EACMM,EAAJC,EAASA,IAChB,GAAK0E,EAAKkK,SAAUkE,EAAO9S,GAAG0B,MAC7B,KAGF,OAAOsS,IACNvU,EAAI,GAAKgU,GAAgBC,GACzBjU,EAAI,GAAKuK,GAER8I,EAAO5V,MAAO,EAAGuC,EAAI,GAAItC,QAAS4G,MAAgC,MAAzB+O,EAAQrT,EAAI,GAAIiC,KAAe,IAAM,MAC7EN,QAASnD,EAAO,MAClB0S,EACI3Q,EAAJP,GAASiV,GAAmB5B,EAAO5V,MAAOuC,EAAGO,IACzCD,EAAJC,GAAW0U,GAAoB5B,EAASA,EAAO5V,MAAO8C,IAClDD,EAAJC,GAAWgK,GAAY8I,IAGzBY,EAAStW,KAAMuT,GAIjB,MAAO8C,IAAgBC,GAGxB,QAASsB,IAA0BC,EAAiBC,GACnD,GAAIC,GAAQD,EAAYvW,OAAS,EAChCyW,EAAYH,EAAgBtW,OAAS,EACrC0W,EAAe,SAAUvM,EAAMhL,EAASgS,EAAKzM,EAASiS,GACrD,GAAI9V,GAAMQ,EAAG2Q,EACZ4E,EAAe,EACf9V,EAAI,IACJmR,EAAY9H,MACZ0M,KACAC,EAAgBzQ,EAEhB/F,EAAQ6J,GAAQsM,GAAa1Q,EAAK8H,KAAU,IAAG,IAAK8I,GAEpDI,EAAiBhQ,GAA4B,MAAjB+P,EAAwB,EAAIvU,KAAKC,UAAY,GACzEpB,EAAMd,EAAMN,MASb,KAPK2W,IACJtQ,EAAmBlH,IAAYnB,GAAYmB,GAAWwX,GAM/C7V,IAAMM,GAA4B,OAApBP,EAAOP,EAAMQ,IAAaA,IAAM,CACrD,GAAK2V,GAAa5V,EAAO,CACxBQ,EAAI,EACElC,GAAW0B,EAAK8J,gBAAkB3M,IACvCwI,EAAa3F,GACbsQ,GAAOzK,EAER,OAASsL,EAAUsE,EAAgBjV,KAClC,GAAK2Q,EAASnR,EAAM1B,GAAWnB,EAAUmT,GAAO,CAC/CzM,EAAQjG,KAAMoC,EACd,OAGG8V,IACJ5P,EAAUgQ,GAKPP,KAEE3V,GAAQmR,GAAWnR,IACxB+V,IAIIzM,GACJ8H,EAAUxT,KAAMoC,IAgBnB,GATA+V,GAAgB9V,EASX0V,GAAS1V,IAAM8V,EAAe,CAClCvV,EAAI,CACJ,OAAS2Q,EAAUuE,EAAYlV,KAC9B2Q,EAASC,EAAW4E,EAAY1X,EAASgS,EAG1C,IAAKhH,EAAO,CAEX,GAAKyM,EAAe,EACnB,MAAQ9V,IACAmR,EAAUnR,IAAM+V,EAAW/V,KACjC+V,EAAW/V,GAAK2G,EAAIvH,KAAMwE,GAM7BmS,GAAa3B,GAAU2B,GAIxBpY,EAAKsC,MAAO2D,EAASmS,GAGhBF,IAAcxM,GAAQ0M,EAAW7W,OAAS,GAC5C4W,EAAeL,EAAYvW,OAAW,GAExC8F,GAAO0J,WAAY9K,GAUrB,MALKiS,KACJ5P,EAAUgQ,EACV1Q,EAAmByQ,GAGb7E,EAGT,OAAOuE,GACNzK,GAAc2K,GACdA,EAgLF,MA7KAvQ,GAAUL,GAAOK,QAAU,SAAUjH,EAAUqL,GAC9C,GAAIzJ,GACHyV,KACAD,KACAhC,EAASlN,EAAelI,EAAW,IAEpC,KAAMoV,EAAS,CAER/J,IACLA,EAAQrE,EAAUhH,IAEnB4B,EAAIyJ,EAAMvK,MACV,OAAQc,IACPwT,EAASyB,GAAmBxL,EAAMzJ,IAC7BwT,EAAQhS,GACZiU,EAAY9X,KAAM6V,GAElBgC,EAAgB7X,KAAM6V,EAKxBA,GAASlN,EAAelI,EAAUmX,GAA0BC,EAAiBC,IAG7EjC,EAAOpV,SAAWA,EAEnB,MAAOoV,IAYRlO,EAASN,GAAOM,OAAS,SAAUlH,EAAUC,EAASuF,EAASyF,GAC9D,GAAIrJ,GAAGqT,EAAQ6C,EAAOjU,EAAM8K,EAC3BoJ,EAA+B,kBAAb/X,IAA2BA,EAC7CqL,GAASJ,GAAQjE,EAAWhH,EAAW+X,EAAS/X,UAAYA,EAM7D,IAJAwF,EAAUA,MAIY,IAAjB6F,EAAMvK,OAAe,CAIzB,GADAmU,EAAS5J,EAAM,GAAKA,EAAM,GAAGhM,MAAO,GAC/B4V,EAAOnU,OAAS,GAAkC,QAA5BgX,EAAQ7C,EAAO,IAAIpR,MAC5ChE,EAAQ4O,SAAgC,IAArBxO,EAAQmE,UAAkBoD,GAC7CX,EAAKkK,SAAUkE,EAAO,GAAGpR,MAAS,CAGnC,GADA5D,GAAY4G,EAAK8H,KAAS,GAAGmJ,EAAM/R,QAAQ,GAAGxC,QAAQ8G,GAAWC,IAAYrK,QAAkB,IACzFA,EACL,MAAOuF,EAGIuS,KACX9X,EAAUA,EAAQ+E,YAGnBhF,EAAWA,EAASX,MAAO4V,EAAOrI,QAAQ1G,MAAMpF,QAIjDc,EAAI0H,EAAwB,aAAE0C,KAAMhM,GAAa,EAAIiV,EAAOnU,MAC5D,OAAQc,IAAM,CAIb,GAHAkW,EAAQ7C,EAAOrT,GAGViF,EAAKkK,SAAWlN,EAAOiU,EAAMjU,MACjC,KAED,KAAM8K,EAAO9H,EAAK8H,KAAM9K,MAEjBoH,EAAO0D,EACZmJ,EAAM/R,QAAQ,GAAGxC,QAAS8G,GAAWC,IACrCH,EAAS6B,KAAMiJ,EAAO,GAAGpR,OAAUwI,GAAapM,EAAQ+E,aAAgB/E,IACpE,CAKJ,GAFAgV,EAAO3S,OAAQV,EAAG,GAClB5B,EAAWiL,EAAKnK,QAAUqL,GAAY8I,IAChCjV,EAEL,MADAT,GAAKsC,MAAO2D,EAASyF,GACdzF,CAGR,SAeJ,OAPEuS,GAAY9Q,EAASjH,EAAUqL,IAChCJ,EACAhL,GACCuH,EACDhC,GACCvF,GAAWkK,EAAS6B,KAAMhM,IAAcqM,GAAapM,EAAQ+E,aAAgB/E,GAExEuF,GAMR3F,EAAQ4Q,WAAarN,EAAQuD,MAAM,IAAItE,KAAM8F,GAAYiE,KAAK,MAAQhJ,EAItEvD,EAAQ2Q,mBAAqBnJ,EAG7BC,IAIAzH,EAAQ+P,aAAe9C,GAAO,SAAUkL,GAEvC,MAAuE,GAAhEA,EAAKxI,wBAAyB1Q,EAAS8F,cAAc,UAMvDkI,GAAO,SAAUC,GAEtB,MADAA,GAAIiC,UAAY,mBAC+B,MAAxCjC,EAAI4D,WAAW1E,aAAa,WAEnCe,GAAW,yBAA0B,SAAUrL,EAAMc,EAAMsE,GAC1D,MAAMA,GAAN,OACQpF,EAAKsK,aAAcxJ,EAA6B,SAAvBA,EAAK4C,cAA2B,EAAI,KAOjExF,EAAQgJ,YAAeiE,GAAO,SAAUC,GAG7C,MAFAA,GAAIiC,UAAY,WAChBjC,EAAI4D,WAAWzE,aAAc,QAAS,IACY,KAA3Ca,EAAI4D,WAAW1E,aAAc,YAEpCe,GAAW,QAAS,SAAUrL,EAAMc,EAAMsE,GACzC,MAAMA,IAAyC,UAAhCpF,EAAKyD,SAASC,cAA7B,OACQ1D,EAAKsW,eAOTnL,GAAO,SAAUC,GACtB,MAAuC,OAAhCA,EAAId,aAAa,eAExBe,GAAWtE,EAAU,SAAU/G,EAAMc,EAAMsE,GAC1C,GAAIqJ,EACJ,OAAMrJ,GAAN,OACQpF,EAAMc,MAAW,EAAOA,EAAK4C,eACjC+K,EAAMzO,EAAKmN,iBAAkBrM,KAAW2N,EAAIC,UAC7CD,EAAIlK,MACL,OAKGU,IAEH3H,EAIJc,GAAO4O,KAAO/H,EACd7G,EAAOkQ,KAAOrJ,EAAOiK,UACrB9Q,EAAOkQ,KAAM,KAAQlQ,EAAOkQ,KAAKnH,QACjC/I,EAAOuQ,WAAavQ,EAAOmY,OAAStR,EAAO0J,WAC3CvQ,EAAO8E,KAAO+B,EAAOE,QACrB/G,EAAOoY,SAAWvR,EAAOG,MACzBhH,EAAO4H,SAAWf,EAAOe,QAIzB,IAAIsJ,GAAM,SAAUtP,EAAMsP,EAAKmH,GAC9B,GAAIxF,MACHyF,EAAqBlV,SAAViV,CAEZ,QAAUzW,EAAOA,EAAMsP,KAA6B,IAAlBtP,EAAKyC,SACtC,GAAuB,IAAlBzC,EAAKyC,SAAiB,CAC1B,GAAKiU,GAAYtY,EAAQ4B,GAAO2W,GAAIF,GACnC,KAEDxF,GAAQrT,KAAMoC,GAGhB,MAAOiR,IAIJ2F,EAAW,SAAUC,EAAG7W,GAG3B,IAFA,GAAIiR,MAEI4F,EAAGA,EAAIA,EAAEhL,YACI,IAAfgL,EAAEpU,UAAkBoU,IAAM7W,GAC9BiR,EAAQrT,KAAMiZ,EAIhB,OAAO5F,IAIJ6F,EAAgB1Y,EAAOkQ,KAAK5E,MAAMvB,aAElC4O,EAAa,gCAIbC,EAAY,gBAGhB,SAASC,GAAQ1I,EAAU2I,EAAWhG,GACrC,GAAK9S,EAAOiD,WAAY6V,GACvB,MAAO9Y,GAAO6F,KAAMsK,EAAU,SAAUvO,EAAMC,GAE7C,QAASiX,EAAU7X,KAAMW,EAAMC,EAAGD,KAAWkR,GAK/C,IAAKgG,EAAUzU,SACd,MAAOrE,GAAO6F,KAAMsK,EAAU,SAAUvO,GACvC,MAASA,KAASkX,IAAgBhG,GAKpC,IAA0B,gBAAdgG,GAAyB,CACpC,GAAKF,EAAU3M,KAAM6M,GACpB,MAAO9Y,GAAO6O,OAAQiK,EAAW3I,EAAU2C,EAG5CgG,GAAY9Y,EAAO6O,OAAQiK,EAAW3I,GAGvC,MAAOnQ,GAAO6F,KAAMsK,EAAU,SAAUvO,GACvC,MAASnC,GAAQwB,KAAM6X,EAAWlX,GAAS,KAASkR,IAItD9S,EAAO6O,OAAS,SAAUqB,EAAM7O,EAAOyR,GACtC,GAAIlR,GAAOP,EAAO,EAMlB,OAJKyR,KACJ5C,EAAO,QAAUA,EAAO,KAGD,IAAjB7O,EAAMN,QAAkC,IAAlBa,EAAKyC,SACjCrE,EAAO4O,KAAKO,gBAAiBvN,EAAMsO,IAAWtO,MAC9C5B,EAAO4O,KAAK5I,QAASkK,EAAMlQ,EAAO6F,KAAMxE,EAAO,SAAUO,GACxD,MAAyB,KAAlBA,EAAKyC,aAIfrE,EAAOG,GAAGqC,QACToM,KAAM,SAAU3O,GACf,GAAI4B,GACHM,EAAMhD,KAAK4B,OACXO,KACAyX,EAAO5Z,IAER,IAAyB,gBAAbc,GACX,MAAOd,MAAKiC,UAAWpB,EAAQC,GAAW4O,OAAQ,WACjD,IAAMhN,EAAI,EAAOM,EAAJN,EAASA,IACrB,GAAK7B,EAAO4H,SAAUmR,EAAMlX,GAAK1C,MAChC,OAAO,IAMX,KAAM0C,EAAI,EAAOM,EAAJN,EAASA,IACrB7B,EAAO4O,KAAM3O,EAAU8Y,EAAMlX,GAAKP,EAMnC,OAFAA,GAAMnC,KAAKiC,UAAWe,EAAM,EAAInC,EAAOmY,OAAQ7W,GAAQA,GACvDA,EAAIrB,SAAWd,KAAKc,SAAWd,KAAKc,SAAW,IAAMA,EAAWA,EACzDqB,GAERuN,OAAQ,SAAU5O,GACjB,MAAOd,MAAKiC,UAAWyX,EAAQ1Z,KAAMc,OAAgB,KAEtD6S,IAAK,SAAU7S,GACd,MAAOd,MAAKiC,UAAWyX,EAAQ1Z,KAAMc,OAAgB,KAEtDsY,GAAI,SAAUtY,GACb,QAAS4Y,EACR1Z,KAIoB,gBAAbc,IAAyByY,EAAczM,KAAMhM,GACnDD,EAAQC,GACRA,OACD,GACCc,SASJ,IAAIiY,GAKH7O,EAAa,sCAEb/J,EAAOJ,EAAOG,GAAGC,KAAO,SAAUH,EAAUC,EAASqT,GACpD,GAAIjI,GAAO1J,CAGX,KAAM3B,EACL,MAAOd,KAQR,IAHAoU,EAAOA,GAAQyF,EAGU,gBAAb/Y,GAAwB,CAanC,GAPCqL,EALsB,MAAlBrL,EAAU,IACsB,MAApCA,EAAUA,EAASc,OAAS,IAC5Bd,EAASc,QAAU,GAGT,KAAMd,EAAU,MAGlBkK,EAAWwB,KAAM1L,IAIrBqL,IAAWA,EAAO,IAAQpL,EAkDxB,OAAMA,GAAWA,EAAQW,QACtBX,GAAWqT,GAAO3E,KAAM3O,GAK1Bd,KAAK2B,YAAaZ,GAAU0O,KAAM3O,EArDzC,IAAKqL,EAAO,GAAM,CAYjB,GAXApL,EAAUA,YAAmBF,GAASE,EAAS,GAAMA,EAIrDF,EAAOuB,MAAOpC,KAAMa,EAAOiZ,UAC1B3N,EAAO,GACPpL,GAAWA,EAAQmE,SAAWnE,EAAQwL,eAAiBxL,EAAUnB,GACjE,IAII4Z,EAAW1M,KAAMX,EAAO,KAAStL,EAAOkD,cAAehD,GAC3D,IAAMoL,IAASpL,GAGTF,EAAOiD,WAAY9D,KAAMmM,IAC7BnM,KAAMmM,GAASpL,EAASoL,IAIxBnM,KAAKiR,KAAM9E,EAAOpL,EAASoL,GAK9B,OAAOnM,MAiBP,MAbAyC,GAAO7C,EAAS6M,eAAgBN,EAAO,IAIlC1J,GAAQA,EAAKqD,aAGjB9F,KAAK4B,OAAS,EACd5B,KAAM,GAAMyC,GAGbzC,KAAKe,QAAUnB,EACfI,KAAKc,SAAWA,EACTd,KAcH,MAAKc,GAASoE,UACpBlF,KAAKe,QAAUf,KAAM,GAAMc,EAC3Bd,KAAK4B,OAAS,EACP5B,MAIIa,EAAOiD,WAAYhD,GACRmD,SAAfmQ,EAAK2F,MACX3F,EAAK2F,MAAOjZ,GAGZA,EAAUD,IAGeoD,SAAtBnD,EAASA,WACbd,KAAKc,SAAWA,EAASA,SACzBd,KAAKe,QAAUD,EAASC,SAGlBF,EAAOwF,UAAWvF,EAAUd,OAIrCiB,GAAKQ,UAAYZ,EAAOG,GAGxB6Y,EAAahZ,EAAQjB,EAGrB,IAAIoa,GAAe,iCAGlBC,GACCC,UAAU,EACVC,UAAU,EACVC,MAAM,EACNC,MAAM,EAGRxZ,GAAOG,GAAGqC,QACTyQ,IAAK,SAAUlQ,GACd,GAAI0W,GAAUzZ,EAAQ+C,EAAQ5D,MAC7Bua,EAAID,EAAQ1Y,MAEb,OAAO5B,MAAK0P,OAAQ,WAEnB,IADA,GAAIhN,GAAI,EACI6X,EAAJ7X,EAAOA,IACd,GAAK7B,EAAO4H,SAAUzI,KAAMsa,EAAS5X,IACpC,OAAO,KAMX8X,QAAS,SAAU7I,EAAW5Q,GAS7B,IARA,GAAIoN,GACHzL,EAAI,EACJ6X,EAAIva,KAAK4B,OACT8R,KACA+G,EAAMlB,EAAczM,KAAM6E,IAAoC,gBAAdA,GAC/C9Q,EAAQ8Q,EAAW5Q,GAAWf,KAAKe,SACnC,EAEUwZ,EAAJ7X,EAAOA,IACd,IAAMyL,EAAMnO,KAAM0C,GAAKyL,GAAOA,IAAQpN,EAASoN,EAAMA,EAAIrI,WAGxD,GAAKqI,EAAIjJ,SAAW,KAAQuV,EAC3BA,EAAIC,MAAOvM,GAAQ,GAGF,IAAjBA,EAAIjJ,UACHrE,EAAO4O,KAAKO,gBAAiB7B,EAAKwD,IAAgB,CAEnD+B,EAAQrT,KAAM8N,EACd,OAKH,MAAOnO,MAAKiC,UAAWyR,EAAQ9R,OAAS,EAAIf,EAAOuQ,WAAYsC,GAAYA,IAI5EgH,MAAO,SAAUjY,GAGhB,MAAMA,GAKe,gBAATA,GACJnC,EAAQwB,KAAMjB,EAAQ4B,GAAQzC,KAAM,IAIrCM,EAAQwB,KAAM9B,KAGpByC,EAAKf,OAASe,EAAM,GAAMA,GAZjBzC,KAAM,IAAOA,KAAM,GAAI8F,WAAe9F,KAAK6C,QAAQ8X,UAAU/Y,OAAS,IAgBjFgZ,IAAK,SAAU9Z,EAAUC,GACxB,MAAOf,MAAKiC,UACXpB,EAAOuQ,WACNvQ,EAAOuB,MAAOpC,KAAK+B,MAAOlB,EAAQC,EAAUC,OAK/C8Z,QAAS,SAAU/Z,GAClB,MAAOd,MAAK4a,IAAiB,MAAZ9Z,EAChBd,KAAKqC,WAAarC,KAAKqC,WAAWqN,OAAQ5O,MAK7C,SAASga,GAAS3M,EAAK4D,GACtB,OAAU5D,EAAMA,EAAK4D,KAA4B,IAAjB5D,EAAIjJ,UACpC,MAAOiJ,GAGRtN,EAAOyB,MACNyM,OAAQ,SAAUtM,GACjB,GAAIsM,GAAStM,EAAKqD,UAClB,OAAOiJ,IAA8B,KAApBA,EAAO7J,SAAkB6J,EAAS,MAEpDgM,QAAS,SAAUtY,GAClB,MAAOsP,GAAKtP,EAAM,eAEnBuY,aAAc,SAAUvY,EAAMC,EAAGwW,GAChC,MAAOnH,GAAKtP,EAAM,aAAcyW,IAEjCkB,KAAM,SAAU3X,GACf,MAAOqY,GAASrY,EAAM,gBAEvB4X,KAAM,SAAU5X,GACf,MAAOqY,GAASrY,EAAM,oBAEvBwY,QAAS,SAAUxY,GAClB,MAAOsP,GAAKtP,EAAM,gBAEnBkY,QAAS,SAAUlY,GAClB,MAAOsP,GAAKtP,EAAM,oBAEnByY,UAAW,SAAUzY,EAAMC,EAAGwW,GAC7B,MAAOnH,GAAKtP,EAAM,cAAeyW,IAElCiC,UAAW,SAAU1Y,EAAMC,EAAGwW,GAC7B,MAAOnH,GAAKtP,EAAM,kBAAmByW,IAEtCG,SAAU,SAAU5W,GACnB,MAAO4W,IAAY5W,EAAKqD,gBAAmB2L,WAAYhP,IAExDyX,SAAU,SAAUzX,GACnB,MAAO4W,GAAU5W,EAAKgP,aAEvB0I,SAAU,SAAU1X,GACnB,MAAOA,GAAK2Y,iBAAmBva,EAAOuB,SAAWK,EAAKmJ,cAErD,SAAUrI,EAAMvC,GAClBH,EAAOG,GAAIuC,GAAS,SAAU2V,EAAOpY,GACpC,GAAI4S,GAAU7S,EAAO2B,IAAKxC,KAAMgB,EAAIkY,EAuBpC,OArB0B,UAArB3V,EAAKpD,MAAO,MAChBW,EAAWoY,GAGPpY,GAAgC,gBAAbA,KACvB4S,EAAU7S,EAAO6O,OAAQ5O,EAAU4S,IAG/B1T,KAAK4B,OAAS,IAGZqY,EAAkB1W,IACvB1C,EAAOuQ,WAAYsC,GAIfsG,EAAalN,KAAMvJ,IACvBmQ,EAAQ2H,WAIHrb,KAAKiC,UAAWyR,KAGzB,IAAI4H,GAAY,MAKhB,SAASC,GAAejY,GACvB,GAAIkY,KAIJ,OAHA3a,GAAOyB,KAAMgB,EAAQ6I,MAAOmP,OAAmB,SAAUjQ,EAAGoQ,GAC3DD,EAAQC,IAAS,IAEXD,EAyBR3a,EAAO6a,UAAY,SAAUpY,GAI5BA,EAA6B,gBAAZA,GAChBiY,EAAejY,GACfzC,EAAOwC,UAAYC,EAEpB,IACCqY,GAGAC,EAGAC,EAGAC,EAGAvS,KAGAwS,KAGAC,EAAc,GAGdC,EAAO,WAQN,IALAH,EAASxY,EAAQ4Y,KAIjBL,EAAQF,GAAS,EACTI,EAAMna,OAAQoa,EAAc,GAAK,CACxCJ,EAASG,EAAMrO,OACf,SAAUsO,EAAczS,EAAK3H,OAGvB2H,EAAMyS,GAAcrZ,MAAOiZ,EAAQ,GAAKA,EAAQ,OAAU,GAC9DtY,EAAQ6Y,cAGRH,EAAczS,EAAK3H,OACnBga,GAAS,GAMNtY,EAAQsY,SACbA,GAAS,GAGVD,GAAS,EAGJG,IAIHvS,EADIqS,KAKG,KAMVhC,GAGCgB,IAAK,WA2BJ,MA1BKrR,KAGCqS,IAAWD,IACfK,EAAczS,EAAK3H,OAAS,EAC5Bma,EAAM1b,KAAMub,IAGb,QAAWhB,GAAKxT,GACfvG,EAAOyB,KAAM8E,EAAM,SAAUiE,EAAGtE,GAC1BlG,EAAOiD,WAAYiD,GACjBzD,EAAQ0V,QAAWY,EAAK9F,IAAK/M,IAClCwC,EAAKlJ,KAAM0G,GAEDA,GAAOA,EAAInF,QAAiC,WAAvBf,EAAO8D,KAAMoC,IAG7C6T,EAAK7T,MAGHnE,WAEAgZ,IAAWD,GACfM,KAGKjc,MAIRoc,OAAQ,WAYP,MAXAvb,GAAOyB,KAAMM,UAAW,SAAUyI,EAAGtE,GACpC,GAAI2T,EACJ,QAAUA,EAAQ7Z,EAAO2F,QAASO,EAAKwC,EAAMmR,IAAY,GACxDnR,EAAKnG,OAAQsX,EAAO,GAGNsB,GAATtB,GACJsB,MAIIhc,MAKR8T,IAAK,SAAU9S,GACd,MAAOA,GACNH,EAAO2F,QAASxF,EAAIuI,GAAS,GAC7BA,EAAK3H,OAAS,GAIhBmT,MAAO,WAIN,MAHKxL,KACJA,MAEMvJ,MAMRqc,QAAS,WAGR,MAFAP,GAASC,KACTxS,EAAOqS,EAAS,GACT5b,MAER2U,SAAU,WACT,OAAQpL,GAMT+S,KAAM,WAKL,MAJAR,GAASC,KACHH,IACLrS,EAAOqS,EAAS,IAEV5b,MAER8b,OAAQ,WACP,QAASA,GAIVS,SAAU,SAAUxb,EAASqG,GAS5B,MARM0U,KACL1U,EAAOA,MACPA,GAASrG,EAASqG,EAAKjH,MAAQiH,EAAKjH,QAAUiH,GAC9C2U,EAAM1b,KAAM+G,GACNuU,GACLM,KAGKjc,MAIRic,KAAM,WAEL,MADArC,GAAK2C,SAAUvc,KAAM4C,WACd5C,MAIR6b,MAAO,WACN,QAASA,GAIZ,OAAOjC,IAIR/Y,EAAOwC,QAENmZ,SAAU,SAAUC,GACnB,GAAIC,KAGA,UAAW,OAAQ7b,EAAO6a,UAAW,eAAiB,aACtD,SAAU,OAAQ7a,EAAO6a,UAAW,eAAiB,aACrD,SAAU,WAAY7a,EAAO6a,UAAW,YAE3CiB,EAAQ,UACRC,GACCD,MAAO,WACN,MAAOA,IAERE,OAAQ,WAEP,MADAC,GAASlU,KAAMhG,WAAYma,KAAMna,WAC1B5C,MAERgd,KAAM,WACL,GAAIC,GAAMra,SACV,OAAO/B,GAAO2b,SAAU,SAAUU,GACjCrc,EAAOyB,KAAMoa,EAAQ,SAAUha,EAAGya,GACjC,GAAInc,GAAKH,EAAOiD,WAAYmZ,EAAKva,KAASua,EAAKva,EAG/Coa,GAAUK,EAAO,IAAO,WACvB,GAAIC,GAAWpc,GAAMA,EAAG2B,MAAO3C,KAAM4C,UAChCwa,IAAYvc,EAAOiD,WAAYsZ,EAASR,SAC5CQ,EAASR,UACPS,SAAUH,EAASI,QACnB1U,KAAMsU,EAASK,SACfR,KAAMG,EAASM,QAEjBN,EAAUC,EAAO,GAAM,QACtBnd,OAAS4c,EAAUM,EAASN,UAAY5c,KACxCgB,GAAOoc,GAAaxa,eAKxBqa,EAAM,OACHL,WAKLA,QAAS,SAAUlY,GAClB,MAAc,OAAPA,EAAc7D,EAAOwC,OAAQqB,EAAKkY,GAAYA,IAGvDE,IAyCD,OAtCAF,GAAQa,KAAOb,EAAQI,KAGvBnc,EAAOyB,KAAMoa,EAAQ,SAAUha,EAAGya,GACjC,GAAI5T,GAAO4T,EAAO,GACjBO,EAAcP,EAAO,EAGtBP,GAASO,EAAO,IAAQ5T,EAAKqR,IAGxB8C,GACJnU,EAAKqR,IAAK,WAGT+B,EAAQe,GAGNhB,EAAY,EAAJha,GAAS,GAAI2Z,QAASK,EAAQ,GAAK,GAAIJ,MAInDQ,EAAUK,EAAO,IAAQ,WAExB,MADAL,GAAUK,EAAO,GAAM,QAAUnd,OAAS8c,EAAWF,EAAU5c,KAAM4C,WAC9D5C,MAER8c,EAAUK,EAAO,GAAM,QAAW5T,EAAKgT,WAIxCK,EAAQA,QAASE,GAGZL,GACJA,EAAK3a,KAAMgb,EAAUA,GAIfA,GAIRa,KAAM,SAAUC,GACf,GAAIlb,GAAI,EACPmb,EAAgB1d,EAAM2B,KAAMc,WAC5BhB,EAASic,EAAcjc,OAGvBkc,EAAuB,IAAXlc,GACTgc,GAAe/c,EAAOiD,WAAY8Z,EAAYhB,SAAchb,EAAS,EAIxEkb,EAAyB,IAAdgB,EAAkBF,EAAc/c,EAAO2b,WAGlDuB,EAAa,SAAUrb,EAAGmU,EAAUmH,GACnC,MAAO,UAAUhX,GAChB6P,EAAUnU,GAAM1C,KAChBge,EAAQtb,GAAME,UAAUhB,OAAS,EAAIzB,EAAM2B,KAAMc,WAAcoE,EAC1DgX,IAAWC,EACfnB,EAASoB,WAAYrH,EAAUmH,KACfF,GAChBhB,EAASqB,YAAatH,EAAUmH,KAKnCC,EAAgBG,EAAkBC,CAGnC,IAAKzc,EAAS,EAIb,IAHAqc,EAAiB,GAAIrZ,OAAOhD,GAC5Bwc,EAAmB,GAAIxZ,OAAOhD,GAC9Byc,EAAkB,GAAIzZ,OAAOhD,GACjBA,EAAJc,EAAYA,IACdmb,EAAenb,IAAO7B,EAAOiD,WAAY+Z,EAAenb,GAAIka,SAChEiB,EAAenb,GAAIka,UACjBS,SAAUU,EAAYrb,EAAG0b,EAAkBH,IAC3CrV,KAAMmV,EAAYrb,EAAG2b,EAAiBR,IACtCd,KAAMD,EAASU,UAEfM,CAUL,OAJMA,IACLhB,EAASqB,YAAaE,EAAiBR,GAGjCf,EAASF,YAMlB,IAAI0B,EAEJzd,GAAOG,GAAG+Y,MAAQ,SAAU/Y,GAK3B,MAFAH,GAAOkZ,MAAM6C,UAAUhU,KAAM5H,GAEtBhB,MAGRa,EAAOwC,QAGNiB,SAAS,EAITia,UAAW,EAGXC,UAAW,SAAUC,GACfA,EACJ5d,EAAO0d,YAEP1d,EAAOkZ,OAAO,IAKhBA,MAAO,SAAU2E,IAGXA,KAAS,IAAS7d,EAAO0d,UAAY1d,EAAOyD,WAKjDzD,EAAOyD,SAAU,EAGZoa,KAAS,KAAU7d,EAAO0d,UAAY,IAK3CD,EAAUH,YAAave,GAAYiB,IAG9BA,EAAOG,GAAG2d,iBACd9d,EAAQjB,GAAW+e,eAAgB,SACnC9d,EAAQjB,GAAWgf,IAAK,cAQ3B,SAASC,KACRjf,EAASkf,oBAAqB,mBAAoBD,GAClD9e,EAAO+e,oBAAqB,OAAQD,GACpChe,EAAOkZ,QAGRlZ,EAAOkZ,MAAM6C,QAAU,SAAUlY,GAwBhC,MAvBM4Z,KAELA,EAAYzd,EAAO2b,WAMU,aAAxB5c,EAASmf,YACa,YAAxBnf,EAASmf,aAA6Bnf,EAASgP,gBAAgBoQ,SAGjEjf,EAAOkf,WAAYpe,EAAOkZ,QAK1Bna,EAASuP,iBAAkB,mBAAoB0P,GAG/C9e,EAAOoP,iBAAkB,OAAQ0P,KAG5BP,EAAU1B,QAASlY,IAI3B7D,EAAOkZ,MAAM6C,SAOb,IAAIsC,GAAS,SAAUhd,EAAOlB,EAAIiE,EAAK+B,EAAOmY,EAAWC,EAAUC,GAClE,GAAI3c,GAAI,EACPM,EAAMd,EAAMN,OACZ0d,EAAc,MAAPra,CAGR,IAA4B,WAAvBpE,EAAO8D,KAAMM,GAAqB,CACtCka,GAAY,CACZ,KAAMzc,IAAKuC,GACVia,EAAQhd,EAAOlB,EAAI0B,EAAGuC,EAAKvC,IAAK,EAAM0c,EAAUC,OAI3C,IAAepb,SAAV+C,IACXmY,GAAY,EAENte,EAAOiD,WAAYkD,KACxBqY,GAAM,GAGFC,IAGCD,GACJre,EAAGc,KAAMI,EAAO8E,GAChBhG,EAAK,OAILse,EAAOte,EACPA,EAAK,SAAUyB,EAAMwC,EAAK+B,GACzB,MAAOsY,GAAKxd,KAAMjB,EAAQ4B,GAAQuE,MAKhChG,GACJ,KAAYgC,EAAJN,EAASA,IAChB1B,EACCkB,EAAOQ,GAAKuC,EAAKoa,EACjBrY,EACAA,EAAMlF,KAAMI,EAAOQ,GAAKA,EAAG1B,EAAIkB,EAAOQ,GAAKuC,IAM/C,OAAOka,GACNjd,EAGAod,EACCte,EAAGc,KAAMI,GACTc,EAAMhC,EAAIkB,EAAO,GAAK+C,GAAQma,GAE7BG,EAAa,SAAUC,GAS1B,MAA0B,KAAnBA,EAAMta,UAAqC,IAAnBsa,EAAMta,YAAsBsa,EAAMta,SAMlE,SAASua,KACRzf,KAAKkE,QAAUrD,EAAOqD,QAAUub,EAAKC,MAGtCD,EAAKC,IAAM,EAEXD,EAAKhe,WAEJke,SAAU,SAAUH,EAAOI,GAC1B,GAAI5Y,GAAQ4Y,KAiBZ,OAbKJ,GAAMta,SACVsa,EAAOxf,KAAKkE,SAAY8C,EAMxBT,OAAOsZ,eAAgBL,EAAOxf,KAAKkE,SAClC8C,MAAOA,EACP8Y,UAAU,EACVC,cAAc,IAGTP,EAAOxf,KAAKkE,UAEpBsJ,MAAO,SAAUgS,GAKhB,IAAMD,EAAYC,GACjB,QAID,IAAIxY,GAAQwY,EAAOxf,KAAKkE,QA4BxB,OAzBM8C,KACLA,KAKKuY,EAAYC,KAIXA,EAAMta,SACVsa,EAAOxf,KAAKkE,SAAY8C,EAMxBT,OAAOsZ,eAAgBL,EAAOxf,KAAKkE,SAClC8C,MAAOA,EACP+Y,cAAc,MAMX/Y,GAERgZ,IAAK,SAAUR,EAAOS,EAAMjZ,GAC3B,GAAIkZ,GACH1S,EAAQxN,KAAKwN,MAAOgS,EAGrB,IAAqB,gBAATS,GACXzS,EAAOyS,GAASjZ,MAMhB,KAAMkZ,IAAQD,GACbzS,EAAO0S,GAASD,EAAMC,EAGxB,OAAO1S,IAERzL,IAAK,SAAUyd,EAAOva,GACrB,MAAehB,UAARgB,EACNjF,KAAKwN,MAAOgS,GACZA,EAAOxf,KAAKkE,UAAasb,EAAOxf,KAAKkE,SAAWe,IAElDia,OAAQ,SAAUM,EAAOva,EAAK+B,GAC7B,GAAImZ,EAaJ,OAAalc,UAARgB,GACCA,GAAsB,gBAARA,IAAgChB,SAAV+C,GAEzCmZ,EAASngB,KAAK+B,IAAKyd,EAAOva,GAERhB,SAAXkc,EACNA,EAASngB,KAAK+B,IAAKyd,EAAO3e,EAAOmF,UAAWf,MAS9CjF,KAAKggB,IAAKR,EAAOva,EAAK+B,GAIL/C,SAAV+C,EAAsBA,EAAQ/B,IAEtCmX,OAAQ,SAAUoD,EAAOva,GACxB,GAAIvC,GAAGa,EAAM6c,EACZ5S,EAAQgS,EAAOxf,KAAKkE,QAErB,IAAeD,SAAVuJ,EAAL,CAIA,GAAavJ,SAARgB,EACJjF,KAAK2f,SAAUH,OAET,CAGD3e,EAAOmD,QAASiB,GAQpB1B,EAAO0B,EAAI7E,OAAQ6E,EAAIzC,IAAK3B,EAAOmF,aAEnCoa,EAAQvf,EAAOmF,UAAWf,GAGrBA,IAAOuI,GACXjK,GAAS0B,EAAKmb,IAKd7c,EAAO6c,EACP7c,EAAOA,IAAQiK,IACZjK,GAAWA,EAAK4I,MAAOmP,SAI5B5Y,EAAIa,EAAK3B,MAET,OAAQc,UACA8K,GAAOjK,EAAMb,KAKTuB,SAARgB,GAAqBpE,EAAOsE,cAAeqI,MAM1CgS,EAAMta,SACVsa,EAAOxf,KAAKkE,SAAYD,aAEjBub,GAAOxf,KAAKkE,YAItBmc,QAAS,SAAUb,GAClB,GAAIhS,GAAQgS,EAAOxf,KAAKkE,QACxB,OAAiBD,UAAVuJ,IAAwB3M,EAAOsE,cAAeqI,IAGvD,IAAI8S,GAAW,GAAIb,GAEfc,EAAW,GAAId,GAcfe,EAAS,gCACZC,EAAa,QAEd,SAASC,GAAUje,EAAMwC,EAAKgb,GAC7B,GAAI1c,EAIJ,IAAcU,SAATgc,GAAwC,IAAlBxd,EAAKyC,SAI/B,GAHA3B,EAAO,QAAU0B,EAAIZ,QAASoc,EAAY,OAAQta,cAClD8Z,EAAOxd,EAAKsK,aAAcxJ,GAEL,gBAAT0c,GAAoB,CAC/B,IACCA,EAAgB,SAATA,GAAkB,EACf,UAATA,GAAmB,EACV,SAATA,EAAkB,MAGjBA,EAAO,KAAOA,GAAQA,EACvBO,EAAO1T,KAAMmT,GAASpf,EAAO8f,UAAWV,GACxCA;CACA,MAAQpU,IAGV0U,EAASP,IAAKvd,EAAMwC,EAAKgb,OAEzBA,GAAOhc,MAGT,OAAOgc,GAGRpf,EAAOwC,QACNgd,QAAS,SAAU5d,GAClB,MAAO8d,GAASF,QAAS5d,IAAU6d,EAASD,QAAS5d,IAGtDwd,KAAM,SAAUxd,EAAMc,EAAM0c,GAC3B,MAAOM,GAASrB,OAAQzc,EAAMc,EAAM0c,IAGrCW,WAAY,SAAUne,EAAMc,GAC3Bgd,EAASnE,OAAQ3Z,EAAMc,IAKxBsd,MAAO,SAAUpe,EAAMc,EAAM0c,GAC5B,MAAOK,GAASpB,OAAQzc,EAAMc,EAAM0c,IAGrCa,YAAa,SAAUre,EAAMc,GAC5B+c,EAASlE,OAAQ3Z,EAAMc,MAIzB1C,EAAOG,GAAGqC,QACT4c,KAAM,SAAUhb,EAAK+B,GACpB,GAAItE,GAAGa,EAAM0c,EACZxd,EAAOzC,KAAM,GACb+N,EAAQtL,GAAQA,EAAKkH,UAGtB,IAAa1F,SAARgB,EAAoB,CACxB,GAAKjF,KAAK4B,SACTqe,EAAOM,EAASxe,IAAKU,GAEE,IAAlBA,EAAKyC,WAAmBob,EAASve,IAAKU,EAAM,iBAAmB,CACnEC,EAAIqL,EAAMnM,MACV,OAAQc,IAIFqL,EAAOrL,KACXa,EAAOwK,EAAOrL,GAAIa,KACe,IAA5BA,EAAKjD,QAAS,WAClBiD,EAAO1C,EAAOmF,UAAWzC,EAAKpD,MAAO,IACrCugB,EAAUje,EAAMc,EAAM0c,EAAM1c,KAI/B+c,GAASN,IAAKvd,EAAM,gBAAgB,GAItC,MAAOwd,GAIR,MAAoB,gBAARhb,GACJjF,KAAKsC,KAAM,WACjBie,EAASP,IAAKhgB,KAAMiF,KAIfia,EAAQlf,KAAM,SAAUgH,GAC9B,GAAIiZ,GAAMc,CAOV,IAAKte,GAAkBwB,SAAV+C,EAAb,CAUC,GANAiZ,EAAOM,EAASxe,IAAKU,EAAMwC,IAI1Bsb,EAASxe,IAAKU,EAAMwC,EAAIZ,QAASoc,EAAY,OAAQta,eAExClC,SAATgc,EACJ,MAAOA,EAQR,IALAc,EAAWlgB,EAAOmF,UAAWf,GAI7Bgb,EAAOM,EAASxe,IAAKU,EAAMse,GACb9c,SAATgc,EACJ,MAAOA,EAMR,IADAA,EAAOS,EAAUje,EAAMse,EAAU9c,QACnBA,SAATgc,EACJ,MAAOA,OAQTc,GAAWlgB,EAAOmF,UAAWf,GAC7BjF,KAAKsC,KAAM,WAIV,GAAI2d,GAAOM,EAASxe,IAAK/B,KAAM+gB,EAK/BR,GAASP,IAAKhgB,KAAM+gB,EAAU/Z,GAKzB/B,EAAI3E,QAAS,KAAQ,IAAe2D,SAATgc,GAC/BM,EAASP,IAAKhgB,KAAMiF,EAAK+B,MAGzB,KAAMA,EAAOpE,UAAUhB,OAAS,EAAG,MAAM,IAG7Cgf,WAAY,SAAU3b,GACrB,MAAOjF,MAAKsC,KAAM,WACjBie,EAASnE,OAAQpc,KAAMiF,QAM1BpE,EAAOwC,QACN0Y,MAAO,SAAUtZ,EAAMkC,EAAMsb,GAC5B,GAAIlE,EAEJ,OAAKtZ,IACJkC,GAASA,GAAQ,MAAS,QAC1BoX,EAAQuE,EAASve,IAAKU,EAAMkC,GAGvBsb,KACElE,GAASlb,EAAOmD,QAASic,GAC9BlE,EAAQuE,EAASpB,OAAQzc,EAAMkC,EAAM9D,EAAOwF,UAAW4Z,IAEvDlE,EAAM1b,KAAM4f,IAGPlE,OAZR,QAgBDiF,QAAS,SAAUve,EAAMkC,GACxBA,EAAOA,GAAQ,IAEf,IAAIoX,GAAQlb,EAAOkb,MAAOtZ,EAAMkC,GAC/Bsc,EAAclF,EAAMna,OACpBZ,EAAK+a,EAAMrO,QACXwT,EAAQrgB,EAAOsgB,YAAa1e,EAAMkC,GAClCyV,EAAO,WACNvZ,EAAOmgB,QAASve,EAAMkC,GAIZ,gBAAP3D,IACJA,EAAK+a,EAAMrO,QACXuT,KAGIjgB,IAIU,OAAT2D,GACJoX,EAAMjL,QAAS,oBAIToQ,GAAME,KACbpgB,EAAGc,KAAMW,EAAM2X,EAAM8G,KAGhBD,GAAeC,GACpBA,EAAMnM,MAAMkH,QAKdkF,YAAa,SAAU1e,EAAMkC,GAC5B,GAAIM,GAAMN,EAAO,YACjB,OAAO2b,GAASve,IAAKU,EAAMwC,IAASqb,EAASpB,OAAQzc,EAAMwC,GAC1D8P,MAAOlU,EAAO6a,UAAW,eAAgBd,IAAK,WAC7C0F,EAASlE,OAAQ3Z,GAAQkC,EAAO,QAASM,WAM7CpE,EAAOG,GAAGqC,QACT0Y,MAAO,SAAUpX,EAAMsb,GACtB,GAAIoB,GAAS,CAQb,OANqB,gBAAT1c,KACXsb,EAAOtb,EACPA,EAAO,KACP0c,KAGIze,UAAUhB,OAASyf,EAChBxgB,EAAOkb,MAAO/b,KAAM,GAAK2E,GAGjBV,SAATgc,EACNjgB,KACAA,KAAKsC,KAAM,WACV,GAAIyZ,GAAQlb,EAAOkb,MAAO/b,KAAM2E,EAAMsb,EAGtCpf,GAAOsgB,YAAanhB,KAAM2E,GAEZ,OAATA,GAAgC,eAAfoX,EAAO,IAC5Blb,EAAOmgB,QAAShhB,KAAM2E,MAI1Bqc,QAAS,SAAUrc,GAClB,MAAO3E,MAAKsC,KAAM,WACjBzB,EAAOmgB,QAAShhB,KAAM2E,MAGxB2c,WAAY,SAAU3c,GACrB,MAAO3E,MAAK+b,MAAOpX,GAAQ,UAK5BiY,QAAS,SAAUjY,EAAMD,GACxB,GAAIyC,GACHoa,EAAQ,EACRC,EAAQ3gB,EAAO2b,WACfxL,EAAWhR,KACX0C,EAAI1C,KAAK4B,OACT2b,EAAU,aACCgE,GACTC,EAAMrD,YAAanN,GAAYA,IAIb,iBAATrM,KACXD,EAAMC,EACNA,EAAOV,QAERU,EAAOA,GAAQ,IAEf,OAAQjC,IACPyE,EAAMmZ,EAASve,IAAKiP,EAAUtO,GAAKiC,EAAO,cACrCwC,GAAOA,EAAI4N,QACfwM,IACApa,EAAI4N,MAAM6F,IAAK2C,GAIjB,OADAA,KACOiE,EAAM5E,QAASlY,KAGxB,IAAI+c,GAAO,sCAA0CC,OAEjDC,EAAU,GAAI7X,QAAQ,iBAAmB2X,EAAO,cAAe,KAG/DG,GAAc,MAAO,QAAS,SAAU,QAExCC,EAAW,SAAUpf,EAAMqf,GAK7B,MADArf,GAAOqf,GAAMrf,EAC4B,SAAlC5B,EAAOkhB,IAAKtf,EAAM,aACvB5B,EAAO4H,SAAUhG,EAAK8J,cAAe9J,GAKzC,SAASuf,GAAWvf,EAAMyd,EAAM+B,EAAYC,GAC3C,GAAIC,GACHC,EAAQ,EACRC,EAAgB,GAChBC,EAAeJ,EACd,WAAa,MAAOA,GAAM/T,OAC1B,WAAa,MAAOtN,GAAOkhB,IAAKtf,EAAMyd,EAAM,KAC7CN,EAAU0C,IACVC,EAAON,GAAcA,EAAY,KAASphB,EAAO2hB,UAAWtC,GAAS,GAAK,MAG1EuC,GAAkB5hB,EAAO2hB,UAAWtC,IAAmB,OAATqC,IAAkB3C,IAC/D+B,EAAQnV,KAAM3L,EAAOkhB,IAAKtf,EAAMyd,GAElC,IAAKuC,GAAiBA,EAAe,KAAQF,EAAO,CAGnDA,EAAOA,GAAQE,EAAe,GAG9BR,EAAaA,MAGbQ,GAAiB7C,GAAW,CAE5B,GAICwC,GAAQA,GAAS,KAGjBK,GAAgCL,EAChCvhB,EAAO6hB,MAAOjgB,EAAMyd,EAAMuC,EAAgBF,SAK1CH,KAAYA,EAAQE,IAAiB1C,IAAuB,IAAVwC,KAAiBC,GAiBrE,MAbKJ,KACJQ,GAAiBA,IAAkB7C,GAAW,EAG9CuC,EAAWF,EAAY,GACtBQ,GAAkBR,EAAY,GAAM,GAAMA,EAAY,IACrDA,EAAY,GACTC,IACJA,EAAMK,KAAOA,EACbL,EAAM/O,MAAQsP,EACdP,EAAMhf,IAAMif,IAGPA,EAER,GAAIQ,GAAiB,wBAEjBC,EAAW,aAEXC,EAAc,4BAKdC,GAGHC,QAAU,EAAG,+BAAgC,aAK7CC,OAAS,EAAG,UAAW,YACvBC,KAAO,EAAG,oBAAqB,uBAC/BC,IAAM,EAAG,iBAAkB,oBAC3BC,IAAM,EAAG,qBAAsB,yBAE/BC,UAAY,EAAG,GAAI,IAIpBN,GAAQO,SAAWP,EAAQC,OAE3BD,EAAQQ,MAAQR,EAAQS,MAAQT,EAAQU,SAAWV,EAAQW,QAAUX,EAAQE,MAC7EF,EAAQY,GAAKZ,EAAQK,EAGrB,SAASQ,GAAQ5iB,EAAS8O,GAIzB,GAAI1N,GAA8C,mBAAjCpB,GAAQ4L,qBACvB5L,EAAQ4L,qBAAsBkD,GAAO,KACD,mBAA7B9O,GAAQqM,iBACdrM,EAAQqM,iBAAkByC,GAAO,OAGpC,OAAe5L,UAAR4L,GAAqBA,GAAOhP,EAAOqF,SAAUnF,EAAS8O,GAC5DhP,EAAOuB,OAASrB,GAAWoB,GAC3BA,EAKF,QAASyhB,IAAe1hB,EAAO2hB,GAI9B,IAHA,GAAInhB,GAAI,EACP6X,EAAIrY,EAAMN,OAEC2Y,EAAJ7X,EAAOA,IACd4d,EAASN,IACR9d,EAAOQ,GACP,cACCmhB,GAAevD,EAASve,IAAK8hB,EAAanhB,GAAK,eAMnD,GAAIohB,IAAQ,WAEZ,SAASC,IAAe7hB,EAAOnB,EAASijB,EAASC,EAAWC,GAO3D,IANA,GAAIzhB,GAAM0E,EAAK0I,EAAKsU,EAAM1b,EAAUxF,EACnCmhB,EAAWrjB,EAAQsjB,yBACnBC,KACA5hB,EAAI,EACJ6X,EAAIrY,EAAMN,OAEC2Y,EAAJ7X,EAAOA,IAGd,GAFAD,EAAOP,EAAOQ,GAETD,GAAiB,IAATA,EAGZ,GAA6B,WAAxB5B,EAAO8D,KAAMlC,GAIjB5B,EAAOuB,MAAOkiB,EAAO7hB,EAAKyC,UAAazC,GAASA,OAG1C,IAAMqhB,GAAMhX,KAAMrK,GAIlB,CACN0E,EAAMA,GAAOid,EAASve,YAAa9E,EAAQ2E,cAAe,QAG1DmK,GAAQ+S,EAASpW,KAAM/J,KAAY,GAAI,KAAQ,GAAI0D,cACnDge,EAAOrB,EAASjT,IAASiT,EAAQM,SACjCjc,EAAI2I,UAAYqU,EAAM,GAAMtjB,EAAO0jB,cAAe9hB,GAAS0hB,EAAM,GAGjElhB,EAAIkhB,EAAM,EACV,OAAQlhB,IACPkE,EAAMA,EAAIkM,SAKXxS,GAAOuB,MAAOkiB,EAAOnd,EAAIyE,YAGzBzE,EAAMid,EAAS3S,WAGftK,EAAIqK,YAAc,OAzBlB8S,GAAMjkB,KAAMU,EAAQyjB,eAAgB/hB,GA+BvC2hB,GAAS5S,YAAc,GAEvB9O,EAAI,CACJ,OAAUD,EAAO6hB,EAAO5hB,KAGvB,GAAKuhB,GAAapjB,EAAO2F,QAAS/D,EAAMwhB,GAAc,GAChDC,GACJA,EAAQ7jB,KAAMoC,OAgBhB,IAXAgG,EAAW5H,EAAO4H,SAAUhG,EAAK8J,cAAe9J,GAGhD0E,EAAMwc,EAAQS,EAASve,YAAapD,GAAQ,UAGvCgG,GACJmb,GAAezc,GAIX6c,EAAU,CACd/gB,EAAI,CACJ,OAAUR,EAAO0E,EAAKlE,KAChB4f,EAAY/V,KAAMrK,EAAKkC,MAAQ,KACnCqf,EAAQ3jB,KAAMoC,GAMlB,MAAO2hB,IAIR,WACC,GAAIA,GAAWxkB,EAASykB,yBACvBxW,EAAMuW,EAASve,YAAajG,EAAS8F,cAAe,QACpDqK,EAAQnQ,EAAS8F,cAAe,QAMjCqK,GAAM/C,aAAc,OAAQ,SAC5B+C,EAAM/C,aAAc,UAAW,WAC/B+C,EAAM/C,aAAc,OAAQ,KAE5Ba,EAAIhI,YAAakK,GAIjBpP,EAAQ8jB,WAAa5W,EAAI6W,WAAW,GAAOA,WAAW,GAAOrR,UAAUuB,QAIvE/G,EAAIiC,UAAY,yBAChBnP,EAAQgkB,iBAAmB9W,EAAI6W,WAAW,GAAOrR,UAAU0F,eAI5D,IACC6L,IAAY,OACZC,GAAc,iDACdC,GAAiB,qBAElB,SAASC,MACR,OAAO,EAGR,QAASC,MACR,OAAO,EAKR,QAASC,MACR,IACC,MAAOrlB,GAAS0U,cACf,MAAQ4Q,KAGX,QAASC,IAAI1iB,EAAM2iB,EAAOtkB,EAAUmf,EAAMjf,EAAIqkB,GAC7C,GAAIC,GAAQ3gB,CAGZ,IAAsB,gBAAVygB,GAAqB,CAGP,gBAAbtkB,KAGXmf,EAAOA,GAAQnf,EACfA,EAAWmD,OAEZ,KAAMU,IAAQygB,GACbD,GAAI1iB,EAAMkC,EAAM7D,EAAUmf,EAAMmF,EAAOzgB,GAAQ0gB,EAEhD,OAAO5iB,GAsBR,GAnBa,MAARwd,GAAsB,MAANjf,GAGpBA,EAAKF,EACLmf,EAAOnf,EAAWmD,QACD,MAANjD,IACc,gBAAbF,IAGXE,EAAKif,EACLA,EAAOhc,SAIPjD,EAAKif,EACLA,EAAOnf,EACPA,EAAWmD,SAGRjD,KAAO,EACXA,EAAKgkB,OACC,KAAMhkB,EACZ,MAAOyB,EAeR,OAZa,KAAR4iB,IACJC,EAAStkB,EACTA,EAAK,SAAUukB,GAId,MADA1kB,KAAS+d,IAAK2G,GACPD,EAAO3iB,MAAO3C,KAAM4C,YAI5B5B,EAAGiG,KAAOqe,EAAOre,OAAUqe,EAAOre,KAAOpG,EAAOoG,SAE1CxE,EAAKH,KAAM,WACjBzB,EAAO0kB,MAAM3K,IAAK5a,KAAMolB,EAAOpkB,EAAIif,EAAMnf,KAQ3CD,EAAO0kB,OAEN/lB,UAEAob,IAAK,SAAUnY,EAAM2iB,EAAOpX,EAASiS,EAAMnf,GAE1C,GAAI0kB,GAAaC,EAAate,EAC7Bue,EAAQC,EAAGC,EACXC,EAASC,EAAUnhB,EAAMohB,EAAYC,EACrCC,EAAW3F,EAASve,IAAKU,EAG1B,IAAMwjB,EAAN,CAKKjY,EAAQA,UACZwX,EAAcxX,EACdA,EAAUwX,EAAYxX,QACtBlN,EAAW0kB,EAAY1kB,UAIlBkN,EAAQ/G,OACb+G,EAAQ/G,KAAOpG,EAAOoG,SAIfye,EAASO,EAASP,UACzBA,EAASO,EAASP,YAEXD,EAAcQ,EAASC,UAC9BT,EAAcQ,EAASC,OAAS,SAAUra,GAIzC,MAAyB,mBAAXhL,IAA0BA,EAAO0kB,MAAMY,YAActa,EAAElH,KACpE9D,EAAO0kB,MAAMa,SAASzjB,MAAOF,EAAMG,WAAcqB,SAKpDmhB,GAAUA,GAAS,IAAKjZ,MAAOmP,KAAiB,IAChDqK,EAAIP,EAAMxjB,MACV,OAAQ+jB,IACPxe,EAAM2d,GAAetY,KAAM4Y,EAAOO,QAClChhB,EAAOqhB,EAAW7e,EAAK,GACvB4e,GAAe5e,EAAK,IAAO,IAAKM,MAAO,KAAMtE,OAGvCwB,IAKNkhB,EAAUhlB,EAAO0kB,MAAMM,QAASlhB,OAGhCA,GAAS7D,EAAW+kB,EAAQQ,aAAeR,EAAQS,WAAc3hB,EAGjEkhB,EAAUhlB,EAAO0kB,MAAMM,QAASlhB,OAGhCihB,EAAY/kB,EAAOwC,QAClBsB,KAAMA,EACNqhB,SAAUA,EACV/F,KAAMA,EACNjS,QAASA,EACT/G,KAAM+G,EAAQ/G,KACdnG,SAAUA,EACV8J,aAAc9J,GAAYD,EAAOkQ,KAAK5E,MAAMvB,aAAakC,KAAMhM,GAC/DylB,UAAWR,EAAW7Y,KAAM,MAC1BsY,IAGKM,EAAWJ,EAAQ/gB,MAC1BmhB,EAAWJ,EAAQ/gB,MACnBmhB,EAASU,cAAgB,EAGnBX,EAAQY,OACbZ,EAAQY,MAAM3kB,KAAMW,EAAMwd,EAAM8F,EAAYN,MAAkB,GAEzDhjB,EAAK0M,kBACT1M,EAAK0M,iBAAkBxK,EAAM8gB,IAK3BI,EAAQjL,MACZiL,EAAQjL,IAAI9Y,KAAMW,EAAMmjB,GAElBA,EAAU5X,QAAQ/G,OACvB2e,EAAU5X,QAAQ/G,KAAO+G,EAAQ/G,OAK9BnG,EACJglB,EAAS1iB,OAAQ0iB,EAASU,gBAAiB,EAAGZ,GAE9CE,EAASzlB,KAAMulB,GAIhB/kB,EAAO0kB,MAAM/lB,OAAQmF,IAAS,KAMhCyX,OAAQ,SAAU3Z,EAAM2iB,EAAOpX,EAASlN,EAAU4lB,GAEjD,GAAIzjB,GAAG0jB,EAAWxf,EACjBue,EAAQC,EAAGC,EACXC,EAASC,EAAUnhB,EAAMohB,EAAYC,EACrCC,EAAW3F,EAASD,QAAS5d,IAAU6d,EAASve,IAAKU,EAEtD,IAAMwjB,IAAeP,EAASO,EAASP,QAAvC,CAKAN,GAAUA,GAAS,IAAKjZ,MAAOmP,KAAiB,IAChDqK,EAAIP,EAAMxjB,MACV,OAAQ+jB,IAMP,GALAxe,EAAM2d,GAAetY,KAAM4Y,EAAOO,QAClChhB,EAAOqhB,EAAW7e,EAAK,GACvB4e,GAAe5e,EAAK,IAAO,IAAKM,MAAO,KAAMtE,OAGvCwB,EAAN,CAOAkhB,EAAUhlB,EAAO0kB,MAAMM,QAASlhB,OAChCA,GAAS7D,EAAW+kB,EAAQQ,aAAeR,EAAQS,WAAc3hB,EACjEmhB,EAAWJ,EAAQ/gB,OACnBwC,EAAMA,EAAK,IACV,GAAI2C,QAAQ,UAAYic,EAAW7Y,KAAM,iBAAoB,WAG9DyZ,EAAY1jB,EAAI6iB,EAASlkB,MACzB,OAAQqB,IACP2iB,EAAYE,EAAU7iB,IAEfyjB,GAAeV,IAAaJ,EAAUI,UACzChY,GAAWA,EAAQ/G,OAAS2e,EAAU3e,MACtCE,IAAOA,EAAI2F,KAAM8Y,EAAUW,YAC3BzlB,GAAYA,IAAa8kB,EAAU9kB,WACxB,OAAbA,IAAqB8kB,EAAU9kB,YAChCglB,EAAS1iB,OAAQH,EAAG,GAEf2iB,EAAU9kB,UACdglB,EAASU,gBAELX,EAAQzJ,QACZyJ,EAAQzJ,OAAOta,KAAMW,EAAMmjB,GAOzBe,KAAcb,EAASlkB,SACrBikB,EAAQe,UACbf,EAAQe,SAAS9kB,KAAMW,EAAMsjB,EAAYE,EAASC,WAAa,GAE/DrlB,EAAOgmB,YAAapkB,EAAMkC,EAAMshB,EAASC,cAGnCR,GAAQ/gB,QA1Cf,KAAMA,IAAQ+gB,GACb7kB,EAAO0kB,MAAMnJ,OAAQ3Z,EAAMkC,EAAOygB,EAAOO,GAAK3X,EAASlN,GAAU,EA8C/DD,GAAOsE,cAAeugB,IAC1BpF,EAASlE,OAAQ3Z,EAAM,mBAIzB2jB,SAAU,SAAUb,GAGnBA,EAAQ1kB,EAAO0kB,MAAMuB,IAAKvB,EAE1B,IAAI7iB,GAAGO,EAAGd,EAAKuR,EAASkS,EACvBmB,KACA3f,EAAOjH,EAAM2B,KAAMc,WACnBkjB,GAAaxF,EAASve,IAAK/B,KAAM,eAAoBulB,EAAM5gB,UAC3DkhB,EAAUhlB,EAAO0kB,MAAMM,QAASN,EAAM5gB,SAOvC,IAJAyC,EAAM,GAAMme,EACZA,EAAMyB,eAAiBhnB,MAGlB6lB,EAAQoB,aAAepB,EAAQoB,YAAYnlB,KAAM9B,KAAMulB,MAAY,EAAxE,CAKAwB,EAAelmB,EAAO0kB,MAAMO,SAAShkB,KAAM9B,KAAMulB,EAAOO,GAGxDpjB,EAAI,CACJ,QAAUgR,EAAUqT,EAAcrkB,QAAY6iB,EAAM2B,uBAAyB,CAC5E3B,EAAM4B,cAAgBzT,EAAQjR,KAE9BQ,EAAI,CACJ,QAAU2iB,EAAYlS,EAAQoS,SAAU7iB,QACtCsiB,EAAM6B,gCAID7B,EAAM8B,aAAc9B,EAAM8B,WAAWva,KAAM8Y,EAAUW,aAE1DhB,EAAMK,UAAYA,EAClBL,EAAMtF,KAAO2F,EAAU3F,KAEvB9d,IAAUtB,EAAO0kB,MAAMM,QAASD,EAAUI,eAAmBE,QAC5DN,EAAU5X,SAAUrL,MAAO+Q,EAAQjR,KAAM2E,GAE7BnD,SAAR9B,IACGojB,EAAM7S,OAASvQ,MAAU,IAC/BojB,EAAM+B,iBACN/B,EAAMgC,oBAYX,MAJK1B,GAAQ2B,cACZ3B,EAAQ2B,aAAa1lB,KAAM9B,KAAMulB,GAG3BA,EAAM7S,SAGdoT,SAAU,SAAUP,EAAOO,GAC1B,GAAIpjB,GAAGmE,EAAS4gB,EAAK7B,EACpBmB,KACAP,EAAgBV,EAASU,cACzBrY,EAAMoX,EAAM3hB,MAQb,IAAK4iB,GAAiBrY,EAAIjJ,WACR,UAAfqgB,EAAM5gB,MAAoB+iB,MAAOnC,EAAMtQ,SAAYsQ,EAAMtQ,OAAS,GAEpE,KAAQ9G,IAAQnO,KAAMmO,EAAMA,EAAIrI,YAAc9F,KAI7C,GAAsB,IAAjBmO,EAAIjJ,WAAoBiJ,EAAIwG,YAAa,GAAuB,UAAf4Q,EAAM5gB,MAAqB,CAEhF,IADAkC,KACMnE,EAAI,EAAO8jB,EAAJ9jB,EAAmBA,IAC/BkjB,EAAYE,EAAUpjB,GAGtB+kB,EAAM7B,EAAU9kB,SAAW,IAEHmD,SAAnB4C,EAAS4gB,KACb5gB,EAAS4gB,GAAQ7B,EAAUhb,aAC1B/J,EAAQ4mB,EAAKznB,MAAO0a,MAAOvM,GAAQ,GACnCtN,EAAO4O,KAAMgY,EAAKznB,KAAM,MAAQmO,IAAQvM,QAErCiF,EAAS4gB,IACb5gB,EAAQxG,KAAMulB,EAGX/e,GAAQjF,QACZmlB,EAAa1mB,MAAQoC,KAAM0L,EAAK2X,SAAUjf,IAW9C,MAJK2f,GAAgBV,EAASlkB,QAC7BmlB,EAAa1mB,MAAQoC,KAAMzC,KAAM8lB,SAAUA,EAAS3lB,MAAOqmB,KAGrDO,GAIRY,MAAO,+HACyDlgB,MAAO,KAEvEmgB,YAEAC,UACCF,MAAO,4BAA4BlgB,MAAO,KAC1CiI,OAAQ,SAAU6V,EAAOuC,GAOxB,MAJoB,OAAfvC,EAAMwC,QACVxC,EAAMwC,MAA6B,MAArBD,EAASE,SAAmBF,EAASE,SAAWF,EAASG,SAGjE1C,IAIT2C,YACCP,MAAO,uFACwBlgB,MAAO,KACtCiI,OAAQ,SAAU6V,EAAOuC,GACxB,GAAIK,GAAUnZ,EAAKoZ,EAClBnT,EAAS6S,EAAS7S,MAsBnB,OAnBoB,OAAfsQ,EAAM8C,OAAqC,MAApBP,EAASQ,UACpCH,EAAW5C,EAAM3hB,OAAO2I,eAAiB3M,EACzCoP,EAAMmZ,EAASvZ,gBACfwZ,EAAOD,EAASC,KAEhB7C,EAAM8C,MAAQP,EAASQ,SACpBtZ,GAAOA,EAAIuZ,YAAcH,GAAQA,EAAKG,YAAc,IACpDvZ,GAAOA,EAAIwZ,YAAcJ,GAAQA,EAAKI,YAAc,GACvDjD,EAAMkD,MAAQX,EAASY,SACpB1Z,GAAOA,EAAI2Z,WAAcP,GAAQA,EAAKO,WAAc,IACpD3Z,GAAOA,EAAI4Z,WAAcR,GAAQA,EAAKQ,WAAc,IAKlDrD,EAAMwC,OAAoB9jB,SAAXgR,IACpBsQ,EAAMwC,MAAmB,EAAT9S,EAAa,EAAe,EAATA,EAAa,EAAe,EAATA,EAAa,EAAI,GAGjEsQ,IAITuB,IAAK,SAAUvB,GACd,GAAKA,EAAO1kB,EAAOqD,SAClB,MAAOqhB,EAIR,IAAI7iB,GAAGwd,EAAMzc,EACZkB,EAAO4gB,EAAM5gB,KACbkkB,EAAgBtD,EAChBuD,EAAU9oB,KAAK4nB,SAAUjjB,EAEpBmkB,KACL9oB,KAAK4nB,SAAUjjB,GAASmkB,EACvBjE,GAAY/X,KAAMnI,GAAS3E,KAAKkoB,WAChCtD,GAAU9X,KAAMnI,GAAS3E,KAAK6nB,aAGhCpkB,EAAOqlB,EAAQnB,MAAQ3nB,KAAK2nB,MAAMvnB,OAAQ0oB,EAAQnB,OAAU3nB,KAAK2nB,MAEjEpC,EAAQ,GAAI1kB,GAAOkoB,MAAOF,GAE1BnmB,EAAIe,EAAK7B,MACT,OAAQc,IACPwd,EAAOzc,EAAMf,GACb6iB,EAAOrF,GAAS2I,EAAe3I,EAehC,OAVMqF,GAAM3hB,SACX2hB,EAAM3hB,OAAShE,GAKe,IAA1B2lB,EAAM3hB,OAAOsB,WACjBqgB,EAAM3hB,OAAS2hB,EAAM3hB,OAAOkC,YAGtBgjB,EAAQpZ,OAASoZ,EAAQpZ,OAAQ6V,EAAOsD,GAAkBtD,GAGlEM,SACCmD,MAGCC,UAAU,GAEX5U,OAGC6U,QAAS,WACR,MAAKlpB,QAASilB,MAAuBjlB,KAAKqU,OACzCrU,KAAKqU,SACE,GAFR,QAKDgS,aAAc,WAEf8C,MACCD,QAAS,WACR,MAAKlpB,QAASilB,MAAuBjlB,KAAKmpB,MACzCnpB,KAAKmpB,QACE,GAFR,QAKD9C,aAAc,YAEf+C,OAGCF,QAAS,WACR,MAAmB,aAAdlpB,KAAK2E,MAAuB3E,KAAKopB,OAASvoB,EAAOqF,SAAUlG,KAAM,UACrEA,KAAKopB,SACE,GAFR,QAODhG,SAAU,SAAUmC,GACnB,MAAO1kB,GAAOqF,SAAUqf,EAAM3hB,OAAQ,OAIxCylB,cACC7B,aAAc,SAAUjC,GAIDthB,SAAjBshB,EAAM7S,QAAwB6S,EAAMsD,gBACxCtD,EAAMsD,cAAcS,YAAc/D,EAAM7S,YAO7C7R,EAAOgmB,YAAc,SAAUpkB,EAAMkC,EAAMuhB,GAGrCzjB,EAAKqc,qBACTrc,EAAKqc,oBAAqBna,EAAMuhB,IAIlCrlB,EAAOkoB,MAAQ,SAAUvlB,EAAKmkB,GAG7B,MAAQ3nB,gBAAgBa,GAAOkoB,OAK1BvlB,GAAOA,EAAImB,MACf3E,KAAK6oB,cAAgBrlB,EACrBxD,KAAK2E,KAAOnB,EAAImB,KAIhB3E,KAAKupB,mBAAqB/lB,EAAIgmB,kBACHvlB,SAAzBT,EAAIgmB,kBAGJhmB,EAAI8lB,eAAgB,EACrBvE,GACAC,IAIDhlB,KAAK2E,KAAOnB,EAIRmkB,GACJ9mB,EAAOwC,OAAQrD,KAAM2nB,GAItB3nB,KAAKypB,UAAYjmB,GAAOA,EAAIimB,WAAa5oB,EAAOwG,WAGhDrH,KAAMa,EAAOqD,UAAY,IAhCjB,GAAIrD,GAAOkoB,MAAOvlB,EAAKmkB,IAqChC9mB,EAAOkoB,MAAMtnB,WACZE,YAAad,EAAOkoB,MACpBQ,mBAAoBvE,GACpBkC,qBAAsBlC,GACtBoC,8BAA+BpC,GAC/B0E,aAAa,EAEbpC,eAAgB,WACf,GAAIzb,GAAI7L,KAAK6oB,aAEb7oB,MAAKupB,mBAAqBxE,GAErBlZ,IAAM7L,KAAK0pB,aACf7d,EAAEyb,kBAGJC,gBAAiB,WAChB,GAAI1b,GAAI7L,KAAK6oB,aAEb7oB,MAAKknB,qBAAuBnC,GAEvBlZ,IAAM7L,KAAK0pB,aACf7d,EAAE0b,mBAGJoC,yBAA0B,WACzB,GAAI9d,GAAI7L,KAAK6oB,aAEb7oB,MAAKonB,8BAAgCrC,GAEhClZ,IAAM7L,KAAK0pB,aACf7d,EAAE8d,2BAGH3pB,KAAKunB,oBAYP1mB,EAAOyB,MACNsnB,WAAY,YACZC,WAAY,WACZC,aAAc,cACdC,aAAc,cACZ,SAAUC,EAAMlD,GAClBjmB,EAAO0kB,MAAMM,QAASmE,IACrB3D,aAAcS,EACdR,SAAUQ,EAEVZ,OAAQ,SAAUX,GACjB,GAAIpjB,GACHyB,EAAS5D,KACTiqB,EAAU1E,EAAM2E,cAChBtE,EAAYL,EAAMK,SASnB,OALMqE,KAAaA,IAAYrmB,GAAW/C,EAAO4H,SAAU7E,EAAQqmB,MAClE1E,EAAM5gB,KAAOihB,EAAUI,SACvB7jB,EAAMyjB,EAAU5X,QAAQrL,MAAO3C,KAAM4C,WACrC2iB,EAAM5gB,KAAOmiB,GAEP3kB,MAKVtB,EAAOG,GAAGqC,QACT8hB,GAAI,SAAUC,EAAOtkB,EAAUmf,EAAMjf,GACpC,MAAOmkB,IAAInlB,KAAMolB,EAAOtkB,EAAUmf,EAAMjf,IAEzCqkB,IAAK,SAAUD,EAAOtkB,EAAUmf,EAAMjf,GACrC,MAAOmkB,IAAInlB,KAAMolB,EAAOtkB,EAAUmf,EAAMjf,EAAI,IAE7C4d,IAAK,SAAUwG,EAAOtkB,EAAUE,GAC/B,GAAI4kB,GAAWjhB,CACf,IAAKygB,GAASA,EAAMkC,gBAAkBlC,EAAMQ,UAW3C,MARAA,GAAYR,EAAMQ,UAClB/kB,EAAQukB,EAAM4B,gBAAiBpI,IAC9BgH,EAAUW,UACTX,EAAUI,SAAW,IAAMJ,EAAUW,UACrCX,EAAUI,SACXJ,EAAU9kB,SACV8kB,EAAU5X,SAEJhO,IAER,IAAsB,gBAAVolB,GAAqB,CAGhC,IAAMzgB,IAAQygB,GACbplB,KAAK4e,IAAKja,EAAM7D,EAAUskB,EAAOzgB,GAElC,OAAO3E,MAWR,MATKc,MAAa,GAA6B,kBAAbA,KAGjCE,EAAKF,EACLA,EAAWmD,QAEPjD,KAAO,IACXA,EAAKgkB,IAEChlB,KAAKsC,KAAM,WACjBzB,EAAO0kB,MAAMnJ,OAAQpc,KAAMolB,EAAOpkB,EAAIF,OAMzC,IACCqpB,IAAY,2EAKZC,GAAe,wBAGfC,GAAW,oCACXC,GAAoB,cACpBC,GAAe,0CAGhB,SAASC,IAAoB/nB,EAAMgoB,GAClC,MAAO5pB,GAAOqF,SAAUzD,EAAM,UAC7B5B,EAAOqF,SAA+B,KAArBukB,EAAQvlB,SAAkBulB,EAAUA,EAAQhZ,WAAY,MAEzEhP,EAAKkK,qBAAsB,SAAW,IACrClK,EAAKoD,YAAapD,EAAK8J,cAAc7G,cAAe,UACrDjD,EAIF,QAASioB,IAAejoB,GAEvB,MADAA,GAAKkC,MAAyC,OAAhClC,EAAKsK,aAAc,SAAsB,IAAMtK,EAAKkC,KAC3DlC,EAER,QAASkoB,IAAeloB,GACvB,GAAI0J,GAAQme,GAAkB9d,KAAM/J,EAAKkC,KAQzC,OANKwH,GACJ1J,EAAKkC,KAAOwH,EAAO,GAEnB1J,EAAK6K,gBAAiB,QAGhB7K,EAGR,QAASmoB,IAAgBpnB,EAAKqnB,GAC7B,GAAInoB,GAAG6X,EAAG5V,EAAMmmB,EAAUC,EAAUC,EAAUC,EAAUvF,CAExD,IAAuB,IAAlBmF,EAAK3lB,SAAV,CAKA,GAAKob,EAASD,QAAS7c,KACtBsnB,EAAWxK,EAASpB,OAAQ1b,GAC5BunB,EAAWzK,EAASN,IAAK6K,EAAMC,GAC/BpF,EAASoF,EAASpF,QAEJ,OACNqF,GAAS7E,OAChB6E,EAASrF,SAET,KAAM/gB,IAAQ+gB,GACb,IAAMhjB,EAAI,EAAG6X,EAAImL,EAAQ/gB,GAAO/C,OAAY2Y,EAAJ7X,EAAOA,IAC9C7B,EAAO0kB,MAAM3K,IAAKiQ,EAAMlmB,EAAM+gB,EAAQ/gB,GAAQjC,IAO7C6d,EAASF,QAAS7c,KACtBwnB,EAAWzK,EAASrB,OAAQ1b,GAC5BynB,EAAWpqB,EAAOwC,UAAY2nB,GAE9BzK,EAASP,IAAK6K,EAAMI,KAKtB,QAASC,IAAU1nB,EAAKqnB,GACvB,GAAI3kB,GAAW2kB,EAAK3kB,SAASC,aAGX,WAAbD,GAAwByc,EAAe7V,KAAMtJ,EAAImB,MACrDkmB,EAAKjW,QAAUpR,EAAIoR,QAGK,UAAb1O,GAAqC,aAAbA,IACnC2kB,EAAK9R,aAAevV,EAAIuV,cAI1B,QAASoS,IAAUC,EAAYhkB,EAAM7E,EAAU2hB,GAG9C9c,EAAOhH,EAAOuC,SAAWyE,EAEzB,IAAIgd,GAAUvhB,EAAOmhB,EAASqH,EAAYxc,EAAMG,EAC/CtM,EAAI,EACJ6X,EAAI6Q,EAAWxpB,OACf0pB,EAAW/Q,EAAI,EACfvT,EAAQI,EAAM,GACdtD,EAAajD,EAAOiD,WAAYkD,EAGjC,IAAKlD,GACDyW,EAAI,GAAsB,gBAAVvT,KAChBrG,EAAQ8jB,YAAc4F,GAASvd,KAAM9F,GACxC,MAAOokB,GAAW9oB,KAAM,SAAUoY,GACjC,GAAId,GAAOwR,EAAWtoB,GAAI4X,EACrB5W,KACJsD,EAAM,GAAMJ,EAAMlF,KAAM9B,KAAM0a,EAAOd,EAAK2R,SAE3CJ,GAAUvR,EAAMxS,EAAM7E,EAAU2hB,IAIlC,IAAK3J,IACJ6J,EAAWL,GAAe3c,EAAMgkB,EAAY,GAAI7e,eAAe,EAAO6e,EAAYlH,GAClFrhB,EAAQuhB,EAAS3S,WAEmB,IAA/B2S,EAASxY,WAAWhK,SACxBwiB,EAAWvhB,GAIPA,GAASqhB,GAAU,CAOvB,IANAF,EAAUnjB,EAAO2B,IAAKmhB,EAAQS,EAAU,UAAYsG,IACpDW,EAAarH,EAAQpiB,OAKT2Y,EAAJ7X,EAAOA,IACdmM,EAAOuV,EAEF1hB,IAAM4oB,IACVzc,EAAOhO,EAAO8C,MAAOkL,GAAM,GAAM,GAG5Bwc,GAIJxqB,EAAOuB,MAAO4hB,EAASL,EAAQ9U,EAAM,YAIvCtM,EAAST,KAAMspB,EAAY1oB,GAAKmM,EAAMnM,EAGvC,IAAK2oB,EAOJ,IANArc,EAAMgV,EAASA,EAAQpiB,OAAS,GAAI2K,cAGpC1L,EAAO2B,IAAKwhB,EAAS2G,IAGfjoB,EAAI,EAAO2oB,EAAJ3oB,EAAgBA,IAC5BmM,EAAOmV,EAASthB,GACXmgB,EAAY/V,KAAM+B,EAAKlK,MAAQ,MAClC2b,EAASpB,OAAQrQ,EAAM,eACxBhO,EAAO4H,SAAUuG,EAAKH,KAEjBA,EAAKrL,IAGJ3C,EAAO2qB,UACX3qB,EAAO2qB,SAAU3c,EAAKrL,KAGvB3C,EAAOuE,WAAYyJ,EAAK2C,YAAYnN,QAASkmB,GAAc,MAQjE,MAAOa,GAGR,QAAShP,IAAQ3Z,EAAM3B,EAAU2qB,GAKhC,IAJA,GAAI5c,GACHyV,EAAQxjB,EAAWD,EAAO6O,OAAQ5O,EAAU2B,GAASA,EACrDC,EAAI,EAE4B,OAAvBmM,EAAOyV,EAAO5hB,IAAeA,IAChC+oB,GAA8B,IAAlB5c,EAAK3J,UACtBrE,EAAO6qB,UAAW/H,EAAQ9U,IAGtBA,EAAK/I,aACJ2lB,GAAY5qB,EAAO4H,SAAUoG,EAAKtC,cAAesC,IACrD+U,GAAeD,EAAQ9U,EAAM,WAE9BA,EAAK/I,WAAWC,YAAa8I,GAI/B,OAAOpM,GAGR5B,EAAOwC,QACNkhB,cAAe,SAAUgH,GACxB,MAAOA,GAAKlnB,QAAS8lB,GAAW,cAGjCxmB,MAAO,SAAUlB,EAAMkpB,EAAeC,GACrC,GAAIlpB,GAAG6X,EAAGsR,EAAaC,EACtBnoB,EAAQlB,EAAKiiB,WAAW,GACxBqH,EAASlrB,EAAO4H,SAAUhG,EAAK8J,cAAe9J,EAG/C,MAAM9B,EAAQgkB,gBAAsC,IAAlBliB,EAAKyC,UAAoC,KAAlBzC,EAAKyC,UAC3DrE,EAAOoY,SAAUxW,IAMnB,IAHAqpB,EAAenI,EAAQhgB,GACvBkoB,EAAclI,EAAQlhB,GAEhBC,EAAI,EAAG6X,EAAIsR,EAAYjqB,OAAY2Y,EAAJ7X,EAAOA,IAC3CwoB,GAAUW,EAAanpB,GAAKopB,EAAcppB,GAK5C,IAAKipB,EACJ,GAAKC,EAIJ,IAHAC,EAAcA,GAAelI,EAAQlhB,GACrCqpB,EAAeA,GAAgBnI,EAAQhgB,GAEjCjB,EAAI,EAAG6X,EAAIsR,EAAYjqB,OAAY2Y,EAAJ7X,EAAOA,IAC3CkoB,GAAgBiB,EAAanpB,GAAKopB,EAAcppB,QAGjDkoB,IAAgBnoB,EAAMkB,EAWxB,OANAmoB,GAAenI,EAAQhgB,EAAO,UACzBmoB,EAAalqB,OAAS,GAC1BgiB,GAAekI,GAAeC,GAAUpI,EAAQlhB,EAAM,WAIhDkB,GAGR+nB,UAAW,SAAUxpB,GAKpB,IAJA,GAAI+d,GAAMxd,EAAMkC,EACfkhB,EAAUhlB,EAAO0kB,MAAMM,QACvBnjB,EAAI,EAE6BuB,UAAxBxB,EAAOP,EAAOQ,IAAqBA,IAC5C,GAAK6c,EAAY9c,GAAS,CACzB,GAAOwd,EAAOxd,EAAM6d,EAASpc,SAAc,CAC1C,GAAK+b,EAAKyF,OACT,IAAM/gB,IAAQsb,GAAKyF,OACbG,EAASlhB,GACb9D,EAAO0kB,MAAMnJ,OAAQ3Z,EAAMkC,GAI3B9D,EAAOgmB,YAAapkB,EAAMkC,EAAMsb,EAAKiG,OAOxCzjB,GAAM6d,EAASpc,SAAYD,OAEvBxB,EAAM8d,EAASrc,WAInBzB,EAAM8d,EAASrc,SAAYD,YAOhCpD,EAAOG,GAAGqC,QAGT8nB,SAAUA,GAEVa,OAAQ,SAAUlrB,GACjB,MAAOsb,IAAQpc,KAAMc,GAAU,IAGhCsb,OAAQ,SAAUtb,GACjB,MAAOsb,IAAQpc,KAAMc,IAGtB6E,KAAM,SAAUqB,GACf,MAAOkY,GAAQlf,KAAM,SAAUgH,GAC9B,MAAiB/C,UAAV+C,EACNnG,EAAO8E,KAAM3F,MACbA,KAAK+U,QAAQzS,KAAM,WACK,IAAlBtC,KAAKkF,UAAoC,KAAlBlF,KAAKkF,UAAqC,IAAlBlF,KAAKkF,WACxDlF,KAAKwR,YAAcxK,MAGpB,KAAMA,EAAOpE,UAAUhB,SAG3BqqB,OAAQ,WACP,MAAOd,IAAUnrB,KAAM4C,UAAW,SAAUH,GAC3C,GAAuB,IAAlBzC,KAAKkF,UAAoC,KAAlBlF,KAAKkF,UAAqC,IAAlBlF,KAAKkF,SAAiB,CACzE,GAAItB,GAAS4mB,GAAoBxqB,KAAMyC,EACvCmB,GAAOiC,YAAapD,OAKvBypB,QAAS,WACR,MAAOf,IAAUnrB,KAAM4C,UAAW,SAAUH,GAC3C,GAAuB,IAAlBzC,KAAKkF,UAAoC,KAAlBlF,KAAKkF,UAAqC,IAAlBlF,KAAKkF,SAAiB,CACzE,GAAItB,GAAS4mB,GAAoBxqB,KAAMyC,EACvCmB,GAAOuoB,aAAc1pB,EAAMmB,EAAO6N,gBAKrC2a,OAAQ,WACP,MAAOjB,IAAUnrB,KAAM4C,UAAW,SAAUH,GACtCzC,KAAK8F,YACT9F,KAAK8F,WAAWqmB,aAAc1pB,EAAMzC,SAKvCqsB,MAAO,WACN,MAAOlB,IAAUnrB,KAAM4C,UAAW,SAAUH,GACtCzC,KAAK8F,YACT9F,KAAK8F,WAAWqmB,aAAc1pB,EAAMzC,KAAKsO,gBAK5CyG,MAAO,WAIN,IAHA,GAAItS,GACHC,EAAI,EAE2B,OAAtBD,EAAOzC,KAAM0C,IAAeA,IACd,IAAlBD,EAAKyC,WAGTrE,EAAO6qB,UAAW/H,EAAQlhB,GAAM,IAGhCA,EAAK+O,YAAc,GAIrB,OAAOxR,OAGR2D,MAAO,SAAUgoB,EAAeC,GAI/B,MAHAD,GAAiC,MAAjBA,GAAwB,EAAQA,EAChDC,EAAyC,MAArBA,EAA4BD,EAAgBC,EAEzD5rB,KAAKwC,IAAK,WAChB,MAAO3B,GAAO8C,MAAO3D,KAAM2rB,EAAeC,MAI5CL,KAAM,SAAUvkB,GACf,MAAOkY,GAAQlf,KAAM,SAAUgH,GAC9B,GAAIvE,GAAOzC,KAAM,OAChB0C,EAAI,EACJ6X,EAAIva,KAAK4B,MAEV,IAAeqC,SAAV+C,GAAyC,IAAlBvE,EAAKyC,SAChC,MAAOzC,GAAKqN,SAIb,IAAsB,gBAAV9I,KAAuBojB,GAAatd,KAAM9F,KACpD8b,GAAWF,EAASpW,KAAMxF,KAAa,GAAI,KAAQ,GAAIb,eAAkB,CAE1Ea,EAAQnG,EAAO0jB,cAAevd,EAE9B,KACC,KAAYuT,EAAJ7X,EAAOA,IACdD,EAAOzC,KAAM0C,OAGU,IAAlBD,EAAKyC,WACTrE,EAAO6qB,UAAW/H,EAAQlhB,GAAM,IAChCA,EAAKqN,UAAY9I,EAInBvE,GAAO,EAGN,MAAQoJ,KAGNpJ,GACJzC,KAAK+U,QAAQkX,OAAQjlB,IAEpB,KAAMA,EAAOpE,UAAUhB,SAG3B0qB,YAAa,WACZ,GAAIpI,KAGJ,OAAOiH,IAAUnrB,KAAM4C,UAAW,SAAUH,GAC3C,GAAIsM,GAAS/O,KAAK8F,UAEbjF,GAAO2F,QAASxG,KAAMkkB,GAAY,IACtCrjB,EAAO6qB,UAAW/H,EAAQ3jB,OACrB+O,GACJA,EAAOwd,aAAc9pB,EAAMzC,QAK3BkkB,MAILrjB,EAAOyB,MACNkqB,SAAU,SACVC,UAAW,UACXN,aAAc,SACdO,YAAa,QACbC,WAAY,eACV,SAAUppB,EAAMukB,GAClBjnB,EAAOG,GAAIuC,GAAS,SAAUzC,GAO7B,IANA,GAAIoB,GACHC,KACAyqB,EAAS/rB,EAAQC,GACjBiC,EAAO6pB,EAAOhrB,OAAS,EACvBc,EAAI,EAEQK,GAALL,EAAWA,IAClBR,EAAQQ,IAAMK,EAAO/C,KAAOA,KAAK2D,OAAO,GACxC9C,EAAQ+rB,EAAQlqB,IAAOolB,GAAY5lB,GAInC7B,EAAKsC,MAAOR,EAAKD,EAAMH,MAGxB,OAAO/B,MAAKiC,UAAWE,KAKzB,IAAI0qB,IACHC,IAICC,KAAM,QACNC,KAAM,QAUR,SAASC,IAAe1pB,EAAMyL,GAC7B,GAAIvM,GAAO5B,EAAQmO,EAAItJ,cAAenC,IAASipB,SAAUxd,EAAIoZ,MAE5D8E,EAAUrsB,EAAOkhB,IAAKtf,EAAM,GAAK,UAMlC,OAFAA,GAAKupB,SAEEkB,EAOR,QAASC,IAAgBjnB,GACxB,GAAI8I,GAAMpP,EACTstB,EAAUJ,GAAa5mB,EA2BxB,OAzBMgnB,KACLA,EAAUD,GAAe/mB,EAAU8I,GAGlB,SAAZke,GAAuBA,IAG3BL,IAAWA,IAAUhsB,EAAQ,mDAC3B2rB,SAAUxd,EAAIJ,iBAGhBI,EAAM6d,GAAQ,GAAIzR,gBAGlBpM,EAAIoe,QACJpe,EAAIqe,QAEJH,EAAUD,GAAe/mB,EAAU8I,GACnC6d,GAAOb,UAIRc,GAAa5mB,GAAagnB,GAGpBA,EAER,GAAII,IAAU,UAEVC,GAAY,GAAIzjB,QAAQ,KAAO2X,EAAO,kBAAmB,KAEzD+L,GAAY,SAAU/qB,GAKxB,GAAIgrB,GAAOhrB,EAAK8J,cAAc0C,WAM9B,OAJMwe,IAASA,EAAKC,SACnBD,EAAO1tB,GAGD0tB,EAAKE,iBAAkBlrB,IAG5BmrB,GAAO,SAAUnrB,EAAMa,EAASf,EAAU6E,GAC7C,GAAIjF,GAAKoB,EACRsqB,IAGD,KAAMtqB,IAAQD,GACbuqB,EAAKtqB,GAASd,EAAKigB,MAAOnf,GAC1Bd,EAAKigB,MAAOnf,GAASD,EAASC,EAG/BpB,GAAMI,EAASI,MAAOF,EAAM2E,MAG5B,KAAM7D,IAAQD,GACbb,EAAKigB,MAAOnf,GAASsqB,EAAKtqB,EAG3B,OAAOpB,IAIJyM,GAAkBhP,EAASgP,iBAI/B,WACC,GAAIkf,GAAkBC,EAAsBC,EAAqBC,EAChEC,EAAYtuB,EAAS8F,cAAe,OACpCmI,EAAMjO,EAAS8F,cAAe,MAG/B,IAAMmI,EAAI6U,MAAV,CAMA7U,EAAI6U,MAAMyL,eAAiB,cAC3BtgB,EAAI6W,WAAW,GAAOhC,MAAMyL,eAAiB,GAC7CxtB,EAAQytB,gBAA+C,gBAA7BvgB,EAAI6U,MAAMyL,eAEpCD,EAAUxL,MAAM2L,QAAU,4FAE1BH,EAAUroB,YAAagI,EAIvB,SAASygB,KACRzgB,EAAI6U,MAAM2L,QAIT,qKAIDxgB,EAAIiC,UAAY,GAChBlB,GAAgB/I,YAAaqoB,EAE7B,IAAIK,GAAWxuB,EAAO4tB,iBAAkB9f,EACxCigB,GAAoC,OAAjBS,EAASrf,IAC5B+e,EAAgD,QAAxBM,EAASC,WACjCT,EAA0C,QAAnBQ,EAASE,MAIhC5gB,EAAI6U,MAAMgM,YAAc,MACxBV,EAA+C,QAAzBO,EAASG,YAE/B9f,GAAgB7I,YAAamoB,GAG9BrtB,EAAOwC,OAAQ1C,GACdguB,cAAe,WAMd,MADAL,KACOR,GAERc,kBAAmB,WAIlB,MAH6B,OAAxBb,GACJO,IAEMP,GAERc,iBAAkB,WAQjB,MAH6B,OAAxBd,GACJO,IAEMN,GAERc,mBAAoB,WAMnB,MAH6B,OAAxBf,GACJO,IAEML,GAERc,oBAAqB,WAOpB,GAAI5sB,GACH6sB,EAAYnhB,EAAIhI,YAAajG,EAAS8F,cAAe,OAkBtD,OAfAspB,GAAUtM,MAAM2L,QAAUxgB,EAAI6U,MAAM2L,QAInC,kGAEDW,EAAUtM,MAAMgM,YAAcM,EAAUtM,MAAM+L,MAAQ,IACtD5gB,EAAI6U,MAAM+L,MAAQ,MAClB7f,GAAgB/I,YAAaqoB,GAE7B/rB,GAAO6C,WAAYjF,EAAO4tB,iBAAkBqB,GAAYN,aAExD9f,GAAgB7I,YAAamoB,GAC7BrgB,EAAI9H,YAAaipB,GAEV7sB,QAMV,SAAS8sB,IAAQxsB,EAAMc,EAAM2rB,GAC5B,GAAIT,GAAOU,EAAUC,EAAUjtB,EAC9BugB,EAAQjgB,EAAKigB,KAuCd,OArCAwM,GAAWA,GAAY1B,GAAW/qB,GAClCN,EAAM+sB,EAAWA,EAASG,iBAAkB9rB,IAAU2rB,EAAU3rB,GAASU,OAK1D,KAAR9B,GAAsB8B,SAAR9B,GAAwBtB,EAAO4H,SAAUhG,EAAK8J,cAAe9J,KACjFN,EAAMtB,EAAO6hB,MAAOjgB,EAAMc,IAKtB2rB,IAOEvuB,EAAQkuB,oBAAsBtB,GAAUzgB,KAAM3K,IAASmrB,GAAQxgB,KAAMvJ,KAG1EkrB,EAAQ/L,EAAM+L,MACdU,EAAWzM,EAAMyM,SACjBC,EAAW1M,EAAM0M,SAGjB1M,EAAMyM,SAAWzM,EAAM0M,SAAW1M,EAAM+L,MAAQtsB,EAChDA,EAAM+sB,EAAST,MAGf/L,EAAM+L,MAAQA,EACd/L,EAAMyM,SAAWA,EACjBzM,EAAM0M,SAAWA,GAIJnrB,SAAR9B,EAINA,EAAM,GACNA,EAIF,QAASmtB,IAAcC,EAAaC,GAGnC,OACCztB,IAAK,WACJ,MAAKwtB,gBAIGvvB,MAAK+B,KAKJ/B,KAAK+B,IAAMytB,GAAS7sB,MAAO3C,KAAM4C,aAM7C,GAKC6sB,IAAe,4BAEfC,IAAYC,SAAU,WAAYC,WAAY,SAAU1C,QAAS,SACjE2C,IACCC,cAAe,IACfC,WAAY,OAGbC,IAAgB,SAAU,IAAK,MAAO,MACtCC,GAAarwB,EAAS8F,cAAe,OAAQgd,KAG9C,SAASwN,IAAgB3sB,GAGxB,GAAKA,IAAQ0sB,IACZ,MAAO1sB,EAIR,IAAI4sB,GAAU5sB,EAAM,GAAI/B,cAAgB+B,EAAKpD,MAAO,GACnDuC,EAAIstB,GAAYpuB,MAEjB,OAAQc,IAEP,GADAa,EAAOysB,GAAattB,GAAMytB,EACrB5sB,IAAQ0sB,IACZ,MAAO1sB,GAKV,QAAS6sB,IAAmB3tB,EAAMuE,EAAOqpB,GAIxC,GAAIxpB,GAAU8a,EAAQnV,KAAMxF,EAC5B,OAAOH,GAGN1C,KAAKmsB,IAAK,EAAGzpB,EAAS,IAAQwpB,GAAY,KAAUxpB,EAAS,IAAO,MACpEG,EAGF,QAASupB,IAAsB9tB,EAAMc,EAAMitB,EAAOC,EAAaC,GAW9D,IAVA,GAAIhuB,GAAI8tB,KAAYC,EAAc,SAAW,WAG5C,EAGS,UAATltB,EAAmB,EAAI,EAEvB2N,EAAM,EAEK,EAAJxO,EAAOA,GAAK,EAGJ,WAAV8tB,IACJtf,GAAOrQ,EAAOkhB,IAAKtf,EAAM+tB,EAAQ5O,EAAWlf,IAAK,EAAMguB,IAGnDD,GAGW,YAAVD,IACJtf,GAAOrQ,EAAOkhB,IAAKtf,EAAM,UAAYmf,EAAWlf,IAAK,EAAMguB,IAI7C,WAAVF,IACJtf,GAAOrQ,EAAOkhB,IAAKtf,EAAM,SAAWmf,EAAWlf,GAAM,SAAS,EAAMguB,MAKrExf,GAAOrQ,EAAOkhB,IAAKtf,EAAM,UAAYmf,EAAWlf,IAAK,EAAMguB,GAG5C,YAAVF,IACJtf,GAAOrQ,EAAOkhB,IAAKtf,EAAM,SAAWmf,EAAWlf,GAAM,SAAS,EAAMguB,IAKvE,OAAOxf,GAGR,QAASyf,IAAkBluB,EAAMc,EAAMitB,GAGtC,GAAII,IAAmB,EACtB1f,EAAe,UAAT3N,EAAmBd,EAAKouB,YAAcpuB,EAAKquB,aACjDJ,EAASlD,GAAW/qB,GACpBguB,EAAiE,eAAnD5vB,EAAOkhB,IAAKtf,EAAM,aAAa,EAAOiuB,EAKrD,IAAY,GAAPxf,GAAmB,MAAPA,EAAc,CAS9B,GANAA,EAAM+d,GAAQxsB,EAAMc,EAAMmtB,IACf,EAANxf,GAAkB,MAAPA,KACfA,EAAMzO,EAAKigB,MAAOnf,IAIdgqB,GAAUzgB,KAAMoE,GACpB,MAAOA,EAKR0f,GAAmBH,IAChB9vB,EAAQiuB,qBAAuB1d,IAAQzO,EAAKigB,MAAOnf,IAGtD2N,EAAMlM,WAAYkM,IAAS,EAI5B,MAASA,GACRqf,GACC9tB,EACAc,EACAitB,IAAWC,EAAc,SAAW,WACpCG,EACAF,GAEE,KAGL,QAASK,IAAU/f,EAAUggB,GAM5B,IALA,GAAI9D,GAASzqB,EAAMwuB,EAClBjT,KACAtD,EAAQ,EACR9Y,EAASoP,EAASpP,OAEHA,EAAR8Y,EAAgBA,IACvBjY,EAAOuO,EAAU0J,GACXjY,EAAKigB,QAIX1E,EAAQtD,GAAU4F,EAASve,IAAKU,EAAM,cACtCyqB,EAAUzqB,EAAKigB,MAAMwK,QAChB8D,GAIEhT,EAAQtD,IAAuB,SAAZwS,IACxBzqB,EAAKigB,MAAMwK,QAAU,IAMM,KAAvBzqB,EAAKigB,MAAMwK,SAAkBrL,EAAUpf,KAC3Cub,EAAQtD,GAAU4F,EAASpB,OAC1Bzc,EACA,aACA0qB,GAAgB1qB,EAAKyD,cAIvB+qB,EAASpP,EAAUpf,GAEF,SAAZyqB,GAAuB+D,GAC3B3Q,EAASN,IACRvd,EACA,aACAwuB,EAAS/D,EAAUrsB,EAAOkhB,IAAKtf,EAAM,aAQzC,KAAMiY,EAAQ,EAAW9Y,EAAR8Y,EAAgBA,IAChCjY,EAAOuO,EAAU0J,GACXjY,EAAKigB,QAGLsO,GAA+B,SAAvBvuB,EAAKigB,MAAMwK,SAA6C,KAAvBzqB,EAAKigB,MAAMwK,UACzDzqB,EAAKigB,MAAMwK,QAAU8D,EAAOhT,EAAQtD,IAAW,GAAK,QAItD,OAAO1J,GAGRnQ,EAAOwC,QAIN6tB,UACCC,SACCpvB,IAAK,SAAUU,EAAMysB,GACpB,GAAKA,EAAW,CAGf,GAAI/sB,GAAM8sB,GAAQxsB,EAAM,UACxB,OAAe,KAARN,EAAa,IAAMA,MAO9BqgB,WACC4O,yBAA2B,EAC3BC,aAAe,EACfC,aAAe,EACfC,UAAY,EACZC,YAAc,EACdzB,YAAc,EACd0B,YAAc,EACdN,SAAW,EACXO,OAAS,EACTC,SAAW,EACXC,QAAU,EACVC,QAAU,EACVC,MAAQ,GAKTC,UACCC,QAAS,YAIVtP,MAAO,SAAUjgB,EAAMc,EAAMyD,EAAOwpB,GAGnC,GAAM/tB,GAA0B,IAAlBA,EAAKyC,UAAoC,IAAlBzC,EAAKyC,UAAmBzC,EAAKigB,MAAlE,CAKA,GAAIvgB,GAAKwC,EAAMuc,EACd+Q,EAAWpxB,EAAOmF,UAAWzC,GAC7Bmf,EAAQjgB,EAAKigB,KASd,OAPAnf,GAAO1C,EAAOkxB,SAAUE,KACrBpxB,EAAOkxB,SAAUE,GAAa/B,GAAgB+B,IAAcA,GAG/D/Q,EAAQrgB,EAAOqwB,SAAU3tB,IAAU1C,EAAOqwB,SAAUe,GAGrChuB,SAAV+C,EAqCCka,GAAS,OAASA,IACwBjd,UAA5C9B,EAAM+e,EAAMnf,IAAKU,GAAM,EAAO+tB,IAEzBruB,EAIDugB,EAAOnf,IA3CdoB,QAAcqC,GAGA,WAATrC,IAAuBxC,EAAMwf,EAAQnV,KAAMxF,KAAa7E,EAAK,KACjE6E,EAAQgb,EAAWvf,EAAMc,EAAMpB,GAG/BwC,EAAO,UAIM,MAATqC,GAAiBA,IAAUA,IAKlB,WAATrC,IACJqC,GAAS7E,GAAOA,EAAK,KAAStB,EAAO2hB,UAAWyP,GAAa,GAAK,OAK7DtxB,EAAQytB,iBAA6B,KAAVpnB,GAAiD,IAAjCzD,EAAKjD,QAAS,gBAC9DoiB,EAAOnf,GAAS,WAIX2d,GAAY,OAASA,IACsBjd,UAA9C+C,EAAQka,EAAMlB,IAAKvd,EAAMuE,EAAOwpB,MAElC9N,EAAOnf,GAASyD,IAnBjB,UAoCF+a,IAAK,SAAUtf,EAAMc,EAAMitB,EAAOE,GACjC,GAAIxf,GAAKlP,EAAKkf,EACb+Q,EAAWpxB,EAAOmF,UAAWzC,EAyB9B,OAtBAA,GAAO1C,EAAOkxB,SAAUE,KACrBpxB,EAAOkxB,SAAUE,GAAa/B,GAAgB+B,IAAcA,GAG/D/Q,EAAQrgB,EAAOqwB,SAAU3tB,IAAU1C,EAAOqwB,SAAUe,GAG/C/Q,GAAS,OAASA,KACtBhQ,EAAMgQ,EAAMnf,IAAKU,GAAM,EAAM+tB,IAIjBvsB,SAARiN,IACJA,EAAM+d,GAAQxsB,EAAMc,EAAMmtB,IAId,WAARxf,GAAoB3N,IAAQssB,MAChC3e,EAAM2e,GAAoBtsB,IAIZ,KAAVitB,GAAgBA,GACpBxuB,EAAMgD,WAAYkM,GACXsf,KAAU,GAAQ0B,SAAUlwB,GAAQA,GAAO,EAAIkP,GAEhDA,KAITrQ,EAAOyB,MAAQ,SAAU,SAAW,SAAUI,EAAGa,GAChD1C,EAAOqwB,SAAU3tB,IAChBxB,IAAK,SAAUU,EAAMysB,EAAUsB,GAC9B,MAAKtB,GAIGO,GAAa3iB,KAAMjM,EAAOkhB,IAAKtf,EAAM,aACtB,IAArBA,EAAKouB,YACJjD,GAAMnrB,EAAMitB,GAAS,WACpB,MAAOiB,IAAkBluB,EAAMc,EAAMitB,KAEtCG,GAAkBluB,EAAMc,EAAMitB,GATjC,QAaDxQ,IAAK,SAAUvd,EAAMuE,EAAOwpB,GAC3B,GAAI3pB,GACH6pB,EAASF,GAAShD,GAAW/qB,GAC7B4tB,EAAWG,GAASD,GACnB9tB,EACAc,EACAitB,EACmD,eAAnD3vB,EAAOkhB,IAAKtf,EAAM,aAAa,EAAOiuB,GACtCA,EAWF,OAPKL,KAAcxpB,EAAU8a,EAAQnV,KAAMxF,KACb,QAA3BH,EAAS,IAAO,QAElBpE,EAAKigB,MAAOnf,GAASyD,EACrBA,EAAQnG,EAAOkhB,IAAKtf,EAAMc,IAGpB6sB,GAAmB3tB,EAAMuE,EAAOqpB,OAK1CxvB,EAAOqwB,SAAS1C,WAAac,GAAc3uB,EAAQmuB,mBAClD,SAAUrsB,EAAMysB,GACf,MAAKA,IACKlqB,WAAYiqB,GAAQxsB,EAAM,gBAClCA,EAAK0vB,wBAAwBC,KAC5BxE,GAAMnrB,GAAQ+rB,WAAY,GAAK,WAC9B,MAAO/rB,GAAK0vB,wBAAwBC,QAElC,KANN,SAYFvxB,EAAOqwB,SAASxC,YAAcY,GAAc3uB,EAAQouB,oBACnD,SAAUtsB,EAAMysB,GACf,MAAKA,GACGtB,GAAMnrB,GAAQyqB,QAAW,gBAC/B+B,IAAUxsB,EAAM,gBAFlB,SAQF5B,EAAOyB,MACN+vB,OAAQ,GACRC,QAAS,GACTC,OAAQ,SACN,SAAUC,EAAQC,GACpB5xB,EAAOqwB,SAAUsB,EAASC,IACzBC,OAAQ,SAAU1rB,GAOjB,IANA,GAAItE,GAAI,EACPiwB,KAGAC,EAAyB,gBAAV5rB,GAAqBA,EAAMS,MAAO,MAAUT,GAEhD,EAAJtE,EAAOA,IACdiwB,EAAUH,EAAS5Q,EAAWlf,GAAM+vB,GACnCG,EAAOlwB,IAAOkwB,EAAOlwB,EAAI,IAAOkwB,EAAO,EAGzC,OAAOD,KAIHrF,GAAQxgB,KAAM0lB,KACnB3xB,EAAOqwB,SAAUsB,EAASC,GAASzS,IAAMoQ,MAI3CvvB,EAAOG,GAAGqC,QACT0e,IAAK,SAAUxe,EAAMyD,GACpB,MAAOkY,GAAQlf,KAAM,SAAUyC,EAAMc,EAAMyD,GAC1C,GAAI0pB,GAAQ1tB,EACXR,KACAE,EAAI,CAEL,IAAK7B,EAAOmD,QAAST,GAAS,CAI7B,IAHAmtB,EAASlD,GAAW/qB,GACpBO,EAAMO,EAAK3B,OAECoB,EAAJN,EAASA,IAChBF,EAAKe,EAAMb,IAAQ7B,EAAOkhB,IAAKtf,EAAMc,EAAMb,IAAK,EAAOguB,EAGxD,OAAOluB,GAGR,MAAiByB,UAAV+C,EACNnG,EAAO6hB,MAAOjgB,EAAMc,EAAMyD,GAC1BnG,EAAOkhB,IAAKtf,EAAMc,IACjBA,EAAMyD,EAAOpE,UAAUhB,OAAS,IAEpCovB,KAAM,WACL,MAAOD,IAAU/wB,MAAM,IAExB6yB,KAAM,WACL,MAAO9B,IAAU/wB,OAElB8yB,OAAQ,SAAUnW,GACjB,MAAsB,iBAAVA,GACJA,EAAQ3c,KAAKgxB,OAAShxB,KAAK6yB,OAG5B7yB,KAAKsC,KAAM,WACZuf,EAAU7hB,MACda,EAAQb,MAAOgxB,OAEfnwB,EAAQb,MAAO6yB,WAOnB,SAASE,IAAOtwB,EAAMa,EAAS4c,EAAMhd,EAAK8vB,GACzC,MAAO,IAAID,IAAMtxB,UAAUR,KAAMwB,EAAMa,EAAS4c,EAAMhd,EAAK8vB,GAE5DnyB,EAAOkyB,MAAQA,GAEfA,GAAMtxB,WACLE,YAAaoxB,GACb9xB,KAAM,SAAUwB,EAAMa,EAAS4c,EAAMhd,EAAK8vB,EAAQzQ,GACjDviB,KAAKyC,KAAOA,EACZzC,KAAKkgB,KAAOA,EACZlgB,KAAKgzB,OAASA,GAAUnyB,EAAOmyB,OAAO5P,SACtCpjB,KAAKsD,QAAUA,EACftD,KAAKmT,MAAQnT,KAAKqH,IAAMrH,KAAKmO,MAC7BnO,KAAKkD,IAAMA,EACXlD,KAAKuiB,KAAOA,IAAU1hB,EAAO2hB,UAAWtC,GAAS,GAAK,OAEvD/R,IAAK,WACJ,GAAI+S,GAAQ6R,GAAME,UAAWjzB,KAAKkgB,KAElC,OAAOgB,IAASA,EAAMnf,IACrBmf,EAAMnf,IAAK/B,MACX+yB,GAAME,UAAU7P,SAASrhB,IAAK/B,OAEhCkzB,IAAK,SAAUC,GACd,GAAIC,GACHlS,EAAQ6R,GAAME,UAAWjzB,KAAKkgB,KAoB/B,OAlBKlgB,MAAKsD,QAAQ+vB,SACjBrzB,KAAKya,IAAM2Y,EAAQvyB,EAAOmyB,OAAQhzB,KAAKgzB,QACtCG,EAASnzB,KAAKsD,QAAQ+vB,SAAWF,EAAS,EAAG,EAAGnzB,KAAKsD,QAAQ+vB,UAG9DrzB,KAAKya,IAAM2Y,EAAQD,EAEpBnzB,KAAKqH,KAAQrH,KAAKkD,IAAMlD,KAAKmT,OAAUigB,EAAQpzB,KAAKmT,MAE/CnT,KAAKsD,QAAQgwB,MACjBtzB,KAAKsD,QAAQgwB,KAAKxxB,KAAM9B,KAAKyC,KAAMzC,KAAKqH,IAAKrH,MAGzCkhB,GAASA,EAAMlB,IACnBkB,EAAMlB,IAAKhgB,MAEX+yB,GAAME,UAAU7P,SAASpD,IAAKhgB,MAExBA,OAIT+yB,GAAMtxB,UAAUR,KAAKQ,UAAYsxB,GAAMtxB,UAEvCsxB,GAAME,WACL7P,UACCrhB,IAAK,SAAUmgB,GACd,GAAIxP,EAIJ,OAA6B,KAAxBwP,EAAMzf,KAAKyC,UACa,MAA5Bgd,EAAMzf,KAAMyf,EAAMhC,OAAoD,MAAlCgC,EAAMzf,KAAKigB,MAAOR,EAAMhC,MACrDgC,EAAMzf,KAAMyf,EAAMhC,OAO1BxN,EAAS7R,EAAOkhB,IAAKG,EAAMzf,KAAMyf,EAAMhC,KAAM,IAGrCxN,GAAqB,SAAXA,EAAwBA,EAAJ,IAEvCsN,IAAK,SAAUkC,GAKTrhB,EAAO0yB,GAAGD,KAAMpR,EAAMhC,MAC1Brf,EAAO0yB,GAAGD,KAAMpR,EAAMhC,MAAQgC,GACK,IAAxBA,EAAMzf,KAAKyC,UACiC,MAArDgd,EAAMzf,KAAKigB,MAAO7hB,EAAOkxB,SAAU7P,EAAMhC,SAC1Crf,EAAOqwB,SAAUhP,EAAMhC,MAGxBgC,EAAMzf,KAAMyf,EAAMhC,MAASgC,EAAM7a,IAFjCxG,EAAO6hB,MAAOR,EAAMzf,KAAMyf,EAAMhC,KAAMgC,EAAM7a,IAAM6a,EAAMK,SAU5DwQ,GAAME,UAAUtK,UAAYoK,GAAME,UAAU1K,YAC3CvI,IAAK,SAAUkC,GACTA,EAAMzf,KAAKyC,UAAYgd,EAAMzf,KAAKqD,aACtCoc,EAAMzf,KAAMyf,EAAMhC,MAASgC,EAAM7a,OAKpCxG,EAAOmyB,QACNQ,OAAQ,SAAUC,GACjB,MAAOA,IAERC,MAAO,SAAUD,GAChB,MAAO,GAAMtvB,KAAKwvB,IAAKF,EAAItvB,KAAKyvB,IAAO,GAExCxQ,SAAU,SAGXviB,EAAO0yB,GAAKR,GAAMtxB,UAAUR,KAG5BJ,EAAO0yB,GAAGD,OAKV,IACCO,IAAOC,GACPC,GAAW,yBACXC,GAAO,aAGR,SAASC,MAIR,MAHAl0B,GAAOkf,WAAY,WAClB4U,GAAQ5vB,SAEA4vB,GAAQhzB,EAAOwG,MAIzB,QAAS6sB,IAAOvvB,EAAMwvB,GACrB,GAAIpM,GACHrlB,EAAI,EACJqL,GAAUqmB,OAAQzvB,EAKnB,KADAwvB,EAAeA,EAAe,EAAI,EACtB,EAAJzxB,EAAQA,GAAK,EAAIyxB,EACxBpM,EAAQnG,EAAWlf,GACnBqL,EAAO,SAAWga,GAAUha,EAAO,UAAYga,GAAUpjB,CAO1D,OAJKwvB,KACJpmB,EAAMojB,QAAUpjB,EAAM0gB,MAAQ9pB,GAGxBoJ,EAGR,QAASsmB,IAAartB,EAAOkZ,EAAMoU,GAKlC,IAJA,GAAIpS,GACHkJ,GAAemJ,GAAUC,SAAUtU,QAAe9f,OAAQm0B,GAAUC,SAAU,MAC9E9Z,EAAQ,EACR9Y,EAASwpB,EAAWxpB,OACLA,EAAR8Y,EAAgBA,IACvB,GAAOwH,EAAQkJ,EAAY1Q,GAAQ5Y,KAAMwyB,EAAWpU,EAAMlZ,GAGzD,MAAOkb,GAKV,QAASuS,IAAkBhyB,EAAMklB,EAAO+M,GAEvC,GAAIxU,GAAMlZ,EAAO8rB,EAAQ5Q,EAAOhB,EAAOyT,EAASzH,EAAS0H,EACxDC,EAAO70B,KACPgqB,KACAtH,EAAQjgB,EAAKigB,MACbuO,EAASxuB,EAAKyC,UAAY2c,EAAUpf,GACpCqyB,EAAWxU,EAASve,IAAKU,EAAM,SAG1BiyB,GAAK3Y,QACVmF,EAAQrgB,EAAOsgB,YAAa1e,EAAM,MACX,MAAlBye,EAAM6T,WACV7T,EAAM6T,SAAW,EACjBJ,EAAUzT,EAAMnM,MAAMkH,KACtBiF,EAAMnM,MAAMkH,KAAO,WACZiF,EAAM6T,UACXJ,MAIHzT,EAAM6T,WAENF,EAAKhY,OAAQ,WAGZgY,EAAKhY,OAAQ,WACZqE,EAAM6T,WACAl0B,EAAOkb,MAAOtZ,EAAM,MAAOb,QAChCsf,EAAMnM,MAAMkH,YAOO,IAAlBxZ,EAAKyC,WAAoB,UAAYyiB,IAAS,SAAWA,MAM7D+M,EAAKM,UAAatS,EAAMsS,SAAUtS,EAAMuS,UAAWvS,EAAMwS,WAIzDhI,EAAUrsB,EAAOkhB,IAAKtf,EAAM,WAG5BmyB,EAA2B,SAAZ1H,EACd5M,EAASve,IAAKU,EAAM,eAAkB0qB,GAAgB1qB,EAAKyD,UAAagnB,EAEnD,WAAjB0H,GAA6D,SAAhC/zB,EAAOkhB,IAAKtf,EAAM,WACnDigB,EAAMwK,QAAU,iBAIbwH,EAAKM,WACTtS,EAAMsS,SAAW,SACjBH,EAAKhY,OAAQ,WACZ6F,EAAMsS,SAAWN,EAAKM,SAAU,GAChCtS,EAAMuS,UAAYP,EAAKM,SAAU,GACjCtS,EAAMwS,UAAYR,EAAKM,SAAU,KAKnC,KAAM9U,IAAQyH,GAEb,GADA3gB,EAAQ2gB,EAAOzH,GACV6T,GAASvnB,KAAMxF,GAAU,CAG7B,SAFO2gB,GAAOzH,GACd4S,EAASA,GAAoB,WAAV9rB,EACdA,KAAYiqB,EAAS,OAAS,QAAW,CAI7C,GAAe,SAAVjqB,IAAoB8tB,GAAiC7wB,SAArB6wB,EAAU5U,GAG9C,QAFA+Q,IAAS,EAKXjH,EAAM9J,GAAS4U,GAAYA,EAAU5U,IAAUrf,EAAO6hB,MAAOjgB,EAAMyd,OAInEgN,GAAUjpB,MAIZ,IAAMpD,EAAOsE,cAAe6kB,GAyCuD,YAAzD,SAAZkD,EAAqBC,GAAgB1qB,EAAKyD,UAAagnB,KACpExK,EAAMwK,QAAUA,OA1CoB,CAC/B4H,EACC,UAAYA,KAChB7D,EAAS6D,EAAS7D,QAGnB6D,EAAWxU,EAASpB,OAAQzc,EAAM,aAI9BqwB,IACJgC,EAAS7D,QAAUA,GAEfA,EACJpwB,EAAQ4B,GAAOuuB,OAEf6D,EAAKjsB,KAAM,WACV/H,EAAQ4B,GAAOowB,SAGjBgC,EAAKjsB,KAAM,WACV,GAAIsX,EAEJI,GAASlE,OAAQ3Z,EAAM,SACvB,KAAMyd,IAAQ8J,GACbnpB,EAAO6hB,MAAOjgB,EAAMyd,EAAM8J,EAAM9J,KAGlC,KAAMA,IAAQ8J,GACb9H,EAAQmS,GAAapD,EAAS6D,EAAU5U,GAAS,EAAGA,EAAM2U,GAElD3U,IAAQ4U,KACfA,EAAU5U,GAASgC,EAAM/O,MACpB8d,IACJ/O,EAAMhf,IAAMgf,EAAM/O,MAClB+O,EAAM/O,MAAiB,UAAT+M,GAA6B,WAATA,EAAoB,EAAI,KAW/D,QAASiV,IAAYxN,EAAOyN,GAC3B,GAAI1a,GAAOnX,EAAMyvB,EAAQhsB,EAAOka,CAGhC,KAAMxG,IAASiN,GAed,GAdApkB,EAAO1C,EAAOmF,UAAW0U,GACzBsY,EAASoC,EAAe7xB,GACxByD,EAAQ2gB,EAAOjN,GACV7Z,EAAOmD,QAASgD,KACpBgsB,EAAShsB,EAAO,GAChBA,EAAQ2gB,EAAOjN,GAAU1T,EAAO,IAG5B0T,IAAUnX,IACdokB,EAAOpkB,GAASyD,QACT2gB,GAAOjN,IAGfwG,EAAQrgB,EAAOqwB,SAAU3tB,GACpB2d,GAAS,UAAYA,GAAQ,CACjCla,EAAQka,EAAMwR,OAAQ1rB,SACf2gB,GAAOpkB,EAId,KAAMmX,IAAS1T,GACN0T,IAASiN,KAChBA,EAAOjN,GAAU1T,EAAO0T,GACxB0a,EAAe1a,GAAUsY,OAI3BoC,GAAe7xB,GAASyvB,EAK3B,QAASuB,IAAW9xB,EAAM4yB,EAAY/xB,GACrC,GAAIoP,GACH4iB,EACA5a,EAAQ,EACR9Y,EAAS2yB,GAAUgB,WAAW3zB,OAC9Bkb,EAAWjc,EAAO2b,WAAWK,OAAQ,iBAG7B2Y,GAAK/yB,OAEb+yB,EAAO,WACN,GAAKF,EACJ,OAAO,CAYR,KAVA,GAAIG,GAAc5B,IAASI,KAC1BnW,EAAY3Z,KAAKmsB,IAAK,EAAGgE,EAAUoB,UAAYpB,EAAUjB,SAAWoC,GAIpEpe,EAAOyG,EAAYwW,EAAUjB,UAAY,EACzCF,EAAU,EAAI9b,EACdqD,EAAQ,EACR9Y,EAAS0yB,EAAUqB,OAAO/zB,OAEXA,EAAR8Y,EAAiBA,IACxB4Z,EAAUqB,OAAQjb,GAAQwY,IAAKC,EAKhC,OAFArW,GAASoB,WAAYzb,GAAQ6xB,EAAWnB,EAASrV,IAElC,EAAVqV,GAAevxB,EACZkc,GAEPhB,EAASqB,YAAa1b,GAAQ6xB,KACvB,IAGTA,EAAYxX,EAASF,SACpBna,KAAMA,EACNklB,MAAO9mB,EAAOwC,UAAYgyB,GAC1BX,KAAM7zB,EAAOwC,QAAQ,GACpB+xB,iBACApC,OAAQnyB,EAAOmyB,OAAO5P,UACpB9f,GACHsyB,mBAAoBP,EACpBQ,gBAAiBvyB,EACjBoyB,UAAW7B,IAASI,KACpBZ,SAAU/vB,EAAQ+vB,SAClBsC,UACAtB,YAAa,SAAUnU,EAAMhd,GAC5B,GAAIgf,GAAQrhB,EAAOkyB,MAAOtwB,EAAM6xB,EAAUI,KAAMxU,EAAMhd,EACpDoxB,EAAUI,KAAKU,cAAelV,IAAUoU,EAAUI,KAAK1B,OAEzD,OADAsB,GAAUqB,OAAOt1B,KAAM6hB,GAChBA,GAERd,KAAM,SAAU0U,GACf,GAAIpb,GAAQ,EAIX9Y,EAASk0B,EAAUxB,EAAUqB,OAAO/zB,OAAS,CAC9C,IAAK0zB,EACJ,MAAOt1B,KAGR,KADAs1B,GAAU,EACM1zB,EAAR8Y,EAAiBA,IACxB4Z,EAAUqB,OAAQjb,GAAQwY,IAAK,EAUhC,OANK4C,IACJhZ,EAASoB,WAAYzb,GAAQ6xB,EAAW,EAAG,IAC3CxX,EAASqB,YAAa1b,GAAQ6xB,EAAWwB,KAEzChZ,EAASiZ,WAAYtzB,GAAQ6xB,EAAWwB,IAElC91B,QAGT2nB,EAAQ2M,EAAU3M,KAInB,KAFAwN,GAAYxN,EAAO2M,EAAUI,KAAKU,eAElBxzB,EAAR8Y,EAAiBA,IAExB,GADAhI,EAAS6hB,GAAUgB,WAAY7a,GAAQ5Y,KAAMwyB,EAAW7xB,EAAMklB,EAAO2M,EAAUI,MAM9E,MAJK7zB,GAAOiD,WAAY4O,EAAO0O,QAC9BvgB,EAAOsgB,YAAamT,EAAU7xB,KAAM6xB,EAAUI,KAAK3Y,OAAQqF,KAC1DvgB,EAAOqG,MAAOwL,EAAO0O,KAAM1O,IAEtBA,CAmBT,OAfA7R,GAAO2B,IAAKmlB,EAAO0M,GAAaC,GAE3BzzB,EAAOiD,WAAYwwB,EAAUI,KAAKvhB,QACtCmhB,EAAUI,KAAKvhB,MAAMrR,KAAMW,EAAM6xB,GAGlCzzB,EAAO0yB,GAAGyC,MACTn1B,EAAOwC,OAAQmyB,GACd/yB,KAAMA,EACNoyB,KAAMP,EACNvY,MAAOuY,EAAUI,KAAK3Y,SAKjBuY,EAAUjX,SAAUiX,EAAUI,KAAKrX,UACxCzU,KAAM0rB,EAAUI,KAAK9rB,KAAM0rB,EAAUI,KAAKuB,UAC1ClZ,KAAMuX,EAAUI,KAAK3X,MACrBF,OAAQyX,EAAUI,KAAK7X,QAG1Bhc,EAAO0zB,UAAY1zB,EAAOwC,OAAQkxB,IACjCC,UACC0B,KAAO,SAAUhW,EAAMlZ,GACtB,GAAIkb,GAAQliB,KAAKq0B,YAAanU,EAAMlZ,EAEpC,OADAgb,GAAWE,EAAMzf,KAAMyd,EAAMyB,EAAQnV,KAAMxF,GAASkb,GAC7CA,KAITiU,QAAS,SAAUxO,EAAOplB,GACpB1B,EAAOiD,WAAY6jB,IACvBplB,EAAWolB,EACXA,GAAU,MAEVA,EAAQA,EAAMxb,MAAOmP,EAOtB,KAJA,GAAI4E,GACHxF,EAAQ,EACR9Y,EAAS+lB,EAAM/lB,OAEAA,EAAR8Y,EAAiBA,IACxBwF,EAAOyH,EAAOjN,GACd6Z,GAAUC,SAAUtU,GAASqU,GAAUC,SAAUtU,OACjDqU,GAAUC,SAAUtU,GAAOpP,QAASvO,IAItCgzB,YAAcd,IAEd2B,UAAW,SAAU7zB,EAAU2pB,GACzBA,EACJqI,GAAUgB,WAAWzkB,QAASvO,GAE9BgyB,GAAUgB,WAAWl1B,KAAMkC,MAK9B1B,EAAOw1B,MAAQ,SAAUA,EAAOrD,EAAQhyB,GACvC,GAAIs1B,GAAMD,GAA0B,gBAAVA,GAAqBx1B,EAAOwC,UAAYgzB,IACjEJ,SAAUj1B,IAAOA,GAAMgyB,GACtBnyB,EAAOiD,WAAYuyB,IAAWA,EAC/BhD,SAAUgD,EACVrD,OAAQhyB,GAAMgyB,GAAUA,IAAWnyB,EAAOiD,WAAYkvB,IAAYA,EAyBnE,OAtBAsD,GAAIjD,SAAWxyB,EAAO0yB,GAAG3U,IAAM,EAA4B,gBAAjB0X,GAAIjD,SAC7CiD,EAAIjD,SAAWiD,EAAIjD,WAAYxyB,GAAO0yB,GAAGgD,OACxC11B,EAAO0yB,GAAGgD,OAAQD,EAAIjD,UAAaxyB,EAAO0yB,GAAGgD,OAAOnT,SAGpC,MAAbkT,EAAIva,OAAiBua,EAAIva,SAAU,IACvCua,EAAIva,MAAQ,MAIbua,EAAIzI,IAAMyI,EAAIL,SAEdK,EAAIL,SAAW,WACTp1B,EAAOiD,WAAYwyB,EAAIzI,MAC3ByI,EAAIzI,IAAI/rB,KAAM9B,MAGVs2B,EAAIva,OACRlb,EAAOmgB,QAAShhB,KAAMs2B,EAAIva,QAIrBua,GAGRz1B,EAAOG,GAAGqC,QACTmzB,OAAQ,SAAUH,EAAOI,EAAIzD,EAAQzwB,GAGpC,MAAOvC,MAAK0P,OAAQmS,GAAWE,IAAK,UAAW,GAAIiP,OAGjD9tB,MAAMwzB,SAAWvF,QAASsF,GAAMJ,EAAOrD,EAAQzwB,IAElDm0B,QAAS,SAAUxW,EAAMmW,EAAOrD,EAAQzwB,GACvC,GAAIwS,GAAQlU,EAAOsE,cAAe+a,GACjCyW,EAAS91B,EAAOw1B,MAAOA,EAAOrD,EAAQzwB,GACtCq0B,EAAc,WAGb,GAAI/B,GAAON,GAAWv0B,KAAMa,EAAOwC,UAAY6c,GAAQyW,IAGlD5hB,GAASuL,EAASve,IAAK/B,KAAM,YACjC60B,EAAKzT,MAAM,GAKd,OAFCwV,GAAYC,OAASD,EAEf7hB,GAAS4hB,EAAO5a,SAAU,EAChC/b,KAAKsC,KAAMs0B,GACX52B,KAAK+b,MAAO4a,EAAO5a,MAAO6a,IAE5BxV,KAAM,SAAUzc,EAAM2c,EAAYwU,GACjC,GAAIgB,GAAY,SAAU5V,GACzB,GAAIE,GAAOF,EAAME,WACVF,GAAME,KACbA,EAAM0U,GAYP,OATqB,gBAATnxB,KACXmxB,EAAUxU,EACVA,EAAa3c,EACbA,EAAOV,QAEHqd,GAAc3c,KAAS,GAC3B3E,KAAK+b,MAAOpX,GAAQ,SAGd3E,KAAKsC,KAAM,WACjB,GAAI0e,IAAU,EACbtG,EAAgB,MAAR/V,GAAgBA,EAAO,aAC/BoyB,EAASl2B,EAAOk2B,OAChB9W,EAAOK,EAASve,IAAK/B,KAEtB,IAAK0a,EACCuF,EAAMvF,IAAWuF,EAAMvF,GAAQ0G,MACnC0V,EAAW7W,EAAMvF,QAGlB,KAAMA,IAASuF,GACTA,EAAMvF,IAAWuF,EAAMvF,GAAQ0G,MAAQ4S,GAAKlnB,KAAM4N,IACtDoc,EAAW7W,EAAMvF,GAKpB,KAAMA,EAAQqc,EAAOn1B,OAAQ8Y,KACvBqc,EAAQrc,GAAQjY,OAASzC,MACnB,MAAR2E,GAAgBoyB,EAAQrc,GAAQqB,QAAUpX,IAE5CoyB,EAAQrc,GAAQma,KAAKzT,KAAM0U,GAC3B9U,GAAU,EACV+V,EAAO3zB,OAAQsX,EAAO,KAOnBsG,GAAY8U,GAChBj1B,EAAOmgB,QAAShhB,KAAM2E,MAIzBkyB,OAAQ,SAAUlyB,GAIjB,MAHKA,MAAS,IACbA,EAAOA,GAAQ,MAET3E,KAAKsC,KAAM,WACjB,GAAIoY,GACHuF,EAAOK,EAASve,IAAK/B,MACrB+b,EAAQkE,EAAMtb,EAAO,SACrBuc,EAAQjB,EAAMtb,EAAO,cACrBoyB,EAASl2B,EAAOk2B,OAChBn1B,EAASma,EAAQA,EAAMna,OAAS,CAajC,KAVAqe,EAAK4W,QAAS,EAGdh2B,EAAOkb,MAAO/b,KAAM2E,MAEfuc,GAASA,EAAME,MACnBF,EAAME,KAAKtf,KAAM9B,MAAM,GAIlB0a,EAAQqc,EAAOn1B,OAAQ8Y,KACvBqc,EAAQrc,GAAQjY,OAASzC,MAAQ+2B,EAAQrc,GAAQqB,QAAUpX,IAC/DoyB,EAAQrc,GAAQma,KAAKzT,MAAM,GAC3B2V,EAAO3zB,OAAQsX,EAAO,GAKxB,KAAMA,EAAQ,EAAW9Y,EAAR8Y,EAAgBA,IAC3BqB,EAAOrB,IAAWqB,EAAOrB,GAAQmc,QACrC9a,EAAOrB,GAAQmc,OAAO/0B,KAAM9B,YAKvBigB,GAAK4W,YAKfh2B,EAAOyB,MAAQ,SAAU,OAAQ,QAAU,SAAUI,EAAGa,GACvD,GAAIyzB,GAAQn2B,EAAOG,GAAIuC,EACvB1C,GAAOG,GAAIuC,GAAS,SAAU8yB,EAAOrD,EAAQzwB,GAC5C,MAAgB,OAAT8zB,GAAkC,iBAAVA,GAC9BW,EAAMr0B,MAAO3C,KAAM4C,WACnB5C,KAAK02B,QAASxC,GAAO3wB,GAAM,GAAQ8yB,EAAOrD,EAAQzwB,MAKrD1B,EAAOyB,MACN20B,UAAW/C,GAAO,QAClBgD,QAAShD,GAAO,QAChBiD,YAAajD,GAAO,UACpBkD,QAAUjG,QAAS,QACnBkG,SAAWlG,QAAS,QACpBmG,YAAcnG,QAAS,WACrB,SAAU5tB,EAAMokB,GAClB9mB,EAAOG,GAAIuC,GAAS,SAAU8yB,EAAOrD,EAAQzwB,GAC5C,MAAOvC,MAAK02B,QAAS/O,EAAO0O,EAAOrD,EAAQzwB,MAI7C1B,EAAOk2B,UACPl2B,EAAO0yB,GAAGiC,KAAO,WAChB,GAAIQ,GACHtzB,EAAI,EACJq0B,EAASl2B,EAAOk2B,MAIjB,KAFAlD,GAAQhzB,EAAOwG,MAEP3E,EAAIq0B,EAAOn1B,OAAQc,IAC1BszB,EAAQe,EAAQr0B,GAGVszB,KAAWe,EAAQr0B,KAAQszB,GAChCe,EAAO3zB,OAAQV,IAAK,EAIhBq0B,GAAOn1B,QACZf,EAAO0yB,GAAGnS,OAEXyS,GAAQ5vB,QAGTpD,EAAO0yB,GAAGyC,MAAQ,SAAUA,GAC3Bn1B,EAAOk2B,OAAO12B,KAAM21B,GACfA,IACJn1B,EAAO0yB,GAAGpgB,QAEVtS,EAAOk2B,OAAO1tB,OAIhBxI,EAAO0yB,GAAGgE,SAAW,GACrB12B,EAAO0yB,GAAGpgB,MAAQ,WACX2gB,KACLA,GAAU/zB,EAAOy3B,YAAa32B,EAAO0yB,GAAGiC,KAAM30B,EAAO0yB,GAAGgE,YAI1D12B,EAAO0yB,GAAGnS,KAAO,WAChBrhB,EAAO03B,cAAe3D,IAEtBA,GAAU,MAGXjzB,EAAO0yB,GAAGgD,QACTmB,KAAM,IACNC,KAAM,IAGNvU,SAAU,KAMXviB,EAAOG,GAAG42B,MAAQ,SAAUC,EAAMlzB,GAIjC,MAHAkzB,GAAOh3B,EAAO0yB,GAAK1yB,EAAO0yB,GAAGgD,OAAQsB,IAAUA,EAAOA,EACtDlzB,EAAOA,GAAQ,KAER3E,KAAK+b,MAAOpX,EAAM,SAAUyV,EAAM8G,GACxC,GAAI4W,GAAU/3B,EAAOkf,WAAY7E,EAAMyd,EACvC3W,GAAME,KAAO,WACZrhB,EAAOg4B,aAAcD,OAMxB,WACC,GAAI/nB,GAAQnQ,EAAS8F,cAAe,SACnCsC,EAASpI,EAAS8F,cAAe,UACjC4wB,EAAMtuB,EAAOnC,YAAajG,EAAS8F,cAAe,UAEnDqK,GAAMpL,KAAO,WAIbhE,EAAQq3B,QAA0B,KAAhBjoB,EAAM/I,MAIxBrG,EAAQs3B,YAAc3B,EAAIzhB,SAI1B7M,EAAO2M,UAAW,EAClBhU,EAAQu3B,aAAe5B,EAAI3hB,SAI3B5E,EAAQnQ,EAAS8F,cAAe,SAChCqK,EAAM/I,MAAQ,IACd+I,EAAMpL,KAAO,QACbhE,EAAQw3B,WAA6B,MAAhBpoB,EAAM/I,QAI5B,IAAIoxB,IACHnqB,GAAapN,EAAOkQ,KAAK9C,UAE1BpN,GAAOG,GAAGqC,QACT4N,KAAM,SAAU1N,EAAMyD,GACrB,MAAOkY,GAAQlf,KAAMa,EAAOoQ,KAAM1N,EAAMyD,EAAOpE,UAAUhB,OAAS,IAGnEy2B,WAAY,SAAU90B,GACrB,MAAOvD,MAAKsC,KAAM,WACjBzB,EAAOw3B,WAAYr4B,KAAMuD,QAK5B1C,EAAOwC,QACN4N,KAAM,SAAUxO,EAAMc,EAAMyD,GAC3B,GAAI7E,GAAK+e,EACRoX,EAAQ71B,EAAKyC,QAGd,IAAe,IAAVozB,GAAyB,IAAVA,GAAyB,IAAVA,EAKnC,MAAkC,mBAAtB71B,GAAKsK,aACTlM,EAAOqf,KAAMzd,EAAMc,EAAMyD,IAKlB,IAAVsxB,GAAgBz3B,EAAOoY,SAAUxW,KACrCc,EAAOA,EAAK4C,cACZ+a,EAAQrgB,EAAO03B,UAAWh1B,KACvB1C,EAAOkQ,KAAK5E,MAAMxB,KAAKmC,KAAMvJ,GAAS60B,GAAWn0B,SAGtCA,SAAV+C,EACW,OAAVA,MACJnG,GAAOw3B,WAAY51B,EAAMc,GAIrB2d,GAAS,OAASA,IACuBjd,UAA3C9B,EAAM+e,EAAMlB,IAAKvd,EAAMuE,EAAOzD,IACzBpB,GAGRM,EAAKuK,aAAczJ,EAAMyD,EAAQ,IAC1BA,GAGHka,GAAS,OAASA,IAA+C,QAApC/e,EAAM+e,EAAMnf,IAAKU,EAAMc,IACjDpB,GAGRA,EAAMtB,EAAO4O,KAAKwB,KAAMxO,EAAMc,GAGhB,MAAPpB,EAAc8B,OAAY9B,KAGlCo2B,WACC5zB,MACCqb,IAAK,SAAUvd,EAAMuE,GACpB,IAAMrG,EAAQw3B,YAAwB,UAAVnxB,GAC3BnG,EAAOqF,SAAUzD,EAAM,SAAY,CACnC,GAAIyO,GAAMzO,EAAKuE,KAKf,OAJAvE,GAAKuK,aAAc,OAAQhG,GACtBkK,IACJzO,EAAKuE,MAAQkK,GAEPlK,MAMXqxB,WAAY,SAAU51B,EAAMuE,GAC3B,GAAIzD,GAAMi1B,EACT91B,EAAI,EACJ+1B,EAAYzxB,GAASA,EAAMmF,MAAOmP,EAEnC,IAAKmd,GAA+B,IAAlBh2B,EAAKyC,SACtB,MAAU3B,EAAOk1B,EAAW/1B,KAC3B81B,EAAW33B,EAAO63B,QAASn1B,IAAUA,EAGhC1C,EAAOkQ,KAAK5E,MAAMxB,KAAKmC,KAAMvJ,KAGjCd,EAAM+1B,IAAa,GAGpB/1B,EAAK6K,gBAAiB/J,MAO1B60B,IACCpY,IAAK,SAAUvd,EAAMuE,EAAOzD,GAQ3B,MAPKyD,MAAU,EAGdnG,EAAOw3B,WAAY51B,EAAMc,GAEzBd,EAAKuK,aAAczJ,EAAMA,GAEnBA,IAGT1C,EAAOyB,KAAMzB,EAAOkQ,KAAK5E,MAAMxB,KAAK+W,OAAOvV,MAAO,QAAU,SAAUzJ,EAAGa,GACxE,GAAIo1B,GAAS1qB,GAAY1K,IAAU1C,EAAO4O,KAAKwB,IAE/ChD,IAAY1K,GAAS,SAAUd,EAAMc,EAAMsE,GAC1C,GAAI1F,GAAK+jB,CAWT,OAVMre,KAGLqe,EAASjY,GAAY1K,GACrB0K,GAAY1K,GAASpB,EACrBA,EAAqC,MAA/Bw2B,EAAQl2B,EAAMc,EAAMsE,GACzBtE,EAAK4C,cACL,KACD8H,GAAY1K,GAAS2iB,GAEf/jB,IAOT,IAAIy2B,IAAa,sCAChBC,GAAa,eAEdh4B,GAAOG,GAAGqC,QACT6c,KAAM,SAAU3c,EAAMyD,GACrB,MAAOkY,GAAQlf,KAAMa,EAAOqf,KAAM3c,EAAMyD,EAAOpE,UAAUhB,OAAS,IAGnEk3B,WAAY,SAAUv1B,GACrB,MAAOvD,MAAKsC,KAAM,iBACVtC,MAAMa,EAAO63B,QAASn1B,IAAUA,QAK1C1C,EAAOwC,QACN6c,KAAM,SAAUzd,EAAMc,EAAMyD,GAC3B,GAAI7E,GAAK+e,EACRoX,EAAQ71B,EAAKyC,QAGd,IAAe,IAAVozB,GAAyB,IAAVA,GAAyB,IAAVA,EAWnC,MAPe,KAAVA,GAAgBz3B,EAAOoY,SAAUxW,KAGrCc,EAAO1C,EAAO63B,QAASn1B,IAAUA,EACjC2d,EAAQrgB,EAAOoyB,UAAW1vB;AAGZU,SAAV+C,EACCka,GAAS,OAASA,IACuBjd,UAA3C9B,EAAM+e,EAAMlB,IAAKvd,EAAMuE,EAAOzD,IACzBpB,EAGCM,EAAMc,GAASyD,EAGpBka,GAAS,OAASA,IAA+C,QAApC/e,EAAM+e,EAAMnf,IAAKU,EAAMc,IACjDpB,EAGDM,EAAMc,IAGd0vB,WACCxe,UACC1S,IAAK,SAAUU,GAMd,GAAIs2B,GAAWl4B,EAAO4O,KAAKwB,KAAMxO,EAAM,WAEvC,OAAOs2B,GACNC,SAAUD,EAAU,IACpBH,GAAW9rB,KAAMrK,EAAKyD,WACrB2yB,GAAW/rB,KAAMrK,EAAKyD,WAAczD,EAAK+R,KACxC,EACA,MAKNkkB,SACCO,MAAO,UACPC,QAAS,eAULv4B,EAAQs3B,cACbp3B,EAAOoyB,UAAUpe,UAChB9S,IAAK,SAAUU,GACd,GAAIsM,GAAStM,EAAKqD,UAIlB,OAHKiJ,IAAUA,EAAOjJ,YACrBiJ,EAAOjJ,WAAWgP,cAEZ,MAERkL,IAAK,SAAUvd,GACd,GAAIsM,GAAStM,EAAKqD,UACbiJ,KACJA,EAAO+F,cAEF/F,EAAOjJ,YACXiJ,EAAOjJ,WAAWgP,kBAOvBjU,EAAOyB,MACN,WACA,WACA,YACA,cACA,cACA,UACA,UACA,SACA,cACA,mBACE,WACFzB,EAAO63B,QAAS14B,KAAKmG,eAAkBnG,MAMxC,IAAIm5B,IAAS,aAEb,SAASC,IAAU32B,GAClB,MAAOA,GAAKsK,cAAgBtK,EAAKsK,aAAc,UAAa,GAG7DlM,EAAOG,GAAGqC,QACTg2B,SAAU,SAAUryB,GACnB,GAAIsyB,GAAS72B,EAAM0L,EAAKorB,EAAUC,EAAOv2B,EAAGw2B,EAC3C/2B,EAAI,CAEL,IAAK7B,EAAOiD,WAAYkD,GACvB,MAAOhH,MAAKsC,KAAM,SAAUW,GAC3BpC,EAAQb,MAAOq5B,SAAUryB,EAAMlF,KAAM9B,KAAMiD,EAAGm2B,GAAUp5B,SAI1D,IAAsB,gBAAVgH,IAAsBA,EAAQ,CACzCsyB,EAAUtyB,EAAMmF,MAAOmP,MAEvB,OAAU7Y,EAAOzC,KAAM0C,KAKtB,GAJA62B,EAAWH,GAAU32B,GACrB0L,EAAwB,IAAlB1L,EAAKyC,WACR,IAAMq0B,EAAW,KAAMl1B,QAAS80B,GAAQ,KAEhC,CACVl2B,EAAI,CACJ,OAAUu2B,EAAQF,EAASr2B,KACrBkL,EAAI7N,QAAS,IAAMk5B,EAAQ,KAAQ,IACvCrrB,GAAOqrB,EAAQ,IAKjBC,GAAa54B,EAAO4E,KAAM0I,GACrBorB,IAAaE,GACjBh3B,EAAKuK,aAAc,QAASysB,IAMhC,MAAOz5B,OAGR05B,YAAa,SAAU1yB,GACtB,GAAIsyB,GAAS72B,EAAM0L,EAAKorB,EAAUC,EAAOv2B,EAAGw2B,EAC3C/2B,EAAI,CAEL,IAAK7B,EAAOiD,WAAYkD,GACvB,MAAOhH,MAAKsC,KAAM,SAAUW,GAC3BpC,EAAQb,MAAO05B,YAAa1yB,EAAMlF,KAAM9B,KAAMiD,EAAGm2B,GAAUp5B,SAI7D,KAAM4C,UAAUhB,OACf,MAAO5B,MAAKiR,KAAM,QAAS,GAG5B,IAAsB,gBAAVjK,IAAsBA,EAAQ,CACzCsyB,EAAUtyB,EAAMmF,MAAOmP,MAEvB,OAAU7Y,EAAOzC,KAAM0C,KAOtB,GANA62B,EAAWH,GAAU32B,GAGrB0L,EAAwB,IAAlB1L,EAAKyC,WACR,IAAMq0B,EAAW,KAAMl1B,QAAS80B,GAAQ,KAEhC,CACVl2B,EAAI,CACJ,OAAUu2B,EAAQF,EAASr2B,KAG1B,MAAQkL,EAAI7N,QAAS,IAAMk5B,EAAQ,KAAQ,GAC1CrrB,EAAMA,EAAI9J,QAAS,IAAMm1B,EAAQ,IAAK,IAKxCC,GAAa54B,EAAO4E,KAAM0I,GACrBorB,IAAaE,GACjBh3B,EAAKuK,aAAc,QAASysB,IAMhC,MAAOz5B,OAGR25B,YAAa,SAAU3yB,EAAO4yB,GAC7B,GAAIj1B,SAAcqC,EAElB,OAAyB,iBAAb4yB,IAAmC,WAATj1B,EAC9Bi1B,EAAW55B,KAAKq5B,SAAUryB,GAAUhH,KAAK05B,YAAa1yB,GAGzDnG,EAAOiD,WAAYkD,GAChBhH,KAAKsC,KAAM,SAAUI,GAC3B7B,EAAQb,MAAO25B,YACd3yB,EAAMlF,KAAM9B,KAAM0C,EAAG02B,GAAUp5B,MAAQ45B,GACvCA,KAKI55B,KAAKsC,KAAM,WACjB,GAAI+M,GAAW3M,EAAGkX,EAAMigB,CAExB,IAAc,WAATl1B,EAAoB,CAGxBjC,EAAI,EACJkX,EAAO/Y,EAAQb,MACf65B,EAAa7yB,EAAMmF,MAAOmP,MAE1B,OAAUjM,EAAYwqB,EAAYn3B,KAG5BkX,EAAKkgB,SAAUzqB,GACnBuK,EAAK8f,YAAarqB,GAElBuK,EAAKyf,SAAUhqB,OAKIpL,UAAV+C,GAAgC,YAATrC,IAClC0K,EAAY+pB,GAAUp5B,MACjBqP,GAGJiR,EAASN,IAAKhgB,KAAM,gBAAiBqP,GAOjCrP,KAAKgN,cACThN,KAAKgN,aAAc,QAClBqC,GAAarI,KAAU,EACvB,GACAsZ,EAASve,IAAK/B,KAAM,kBAAqB,QAO9C85B,SAAU,SAAUh5B,GACnB,GAAIuO,GAAW5M,EACdC,EAAI,CAEL2M,GAAY,IAAMvO,EAAW,GAC7B,OAAU2B,EAAOzC,KAAM0C,KACtB,GAAuB,IAAlBD,EAAKyC,WACP,IAAMk0B,GAAU32B,GAAS,KAAM4B,QAAS80B,GAAQ,KAChD74B,QAAS+O,GAAc,GAEzB,OAAO,CAIT,QAAO,IAOT,IAAI0qB,IAAU,MACbC,GAAU,kBAEXn5B,GAAOG,GAAGqC,QACT6N,IAAK,SAAUlK,GACd,GAAIka,GAAO/e,EAAK2B,EACfrB,EAAOzC,KAAM,EAEd,EAAA,GAAM4C,UAAUhB,OA4BhB,MAFAkC,GAAajD,EAAOiD,WAAYkD,GAEzBhH,KAAKsC,KAAM,SAAUI,GAC3B,GAAIwO,EAEmB,KAAlBlR,KAAKkF,WAKTgM,EADIpN,EACEkD,EAAMlF,KAAM9B,KAAM0C,EAAG7B,EAAQb,MAAOkR,OAEpClK,EAIK,MAAPkK,EACJA,EAAM,GAEoB,gBAARA,GAClBA,GAAO,GAEIrQ,EAAOmD,QAASkN,KAC3BA,EAAMrQ,EAAO2B,IAAK0O,EAAK,SAAUlK,GAChC,MAAgB,OAATA,EAAgB,GAAKA,EAAQ,MAItCka,EAAQrgB,EAAOo5B,SAAUj6B,KAAK2E,OAAU9D,EAAOo5B,SAAUj6B,KAAKkG,SAASC,eAGjE+a,GAAY,OAASA,IAA+Cjd,SAApCid,EAAMlB,IAAKhgB,KAAMkR,EAAK,WAC3DlR,KAAKgH,MAAQkK,KAzDd,IAAKzO,EAIJ,MAHAye,GAAQrgB,EAAOo5B,SAAUx3B,EAAKkC,OAC7B9D,EAAOo5B,SAAUx3B,EAAKyD,SAASC,eAE3B+a,GACJ,OAASA,IACgCjd,UAAvC9B,EAAM+e,EAAMnf,IAAKU,EAAM,UAElBN,GAGRA,EAAMM,EAAKuE,MAEW,gBAAR7E,GAGbA,EAAIkC,QAAS01B,GAAS,IAGf,MAAP53B,EAAc,GAAKA,OA4CxBtB,EAAOwC,QACN42B,UACClX,QACChhB,IAAK,SAAUU,GAEd,GAAIyO,GAAMrQ,EAAO4O,KAAKwB,KAAMxO,EAAM,QAClC,OAAc,OAAPyO,EACNA,EAMArQ,EAAO4E,KAAM5E,EAAO8E,KAAMlD,IAAS4B,QAAS21B,GAAS,OAGxDhyB,QACCjG,IAAK,SAAUU,GAYd,IAXA,GAAIuE,GAAO+b,EACVzf,EAAUb,EAAKa,QACfoX,EAAQjY,EAAKqS,cACbuQ,EAAoB,eAAd5iB,EAAKkC,MAAiC,EAAR+V,EACpCsD,EAASqH,EAAM,QACfiL,EAAMjL,EAAM3K,EAAQ,EAAIpX,EAAQ1B,OAChCc,EAAY,EAARgY,EACH4V,EACAjL,EAAM3K,EAAQ,EAGJ4V,EAAJ5tB,EAASA,IAIhB,GAHAqgB,EAASzf,EAASZ,IAGXqgB,EAAOlO,UAAYnS,IAAMgY,KAG5B/Z,EAAQu3B,aACRnV,EAAOpO,SAAiD,OAAtCoO,EAAOhW,aAAc,gBACtCgW,EAAOjd,WAAW6O,WACnB9T,EAAOqF,SAAU6c,EAAOjd,WAAY,aAAiB,CAMxD,GAHAkB,EAAQnG,EAAQkiB,GAAS7R,MAGpBmU,EACJ,MAAOre,EAIRgX,GAAO3d,KAAM2G,GAIf,MAAOgX,IAGRgC,IAAK,SAAUvd,EAAMuE,GACpB,GAAIkzB,GAAWnX,EACdzf,EAAUb,EAAKa,QACf0a,EAASnd,EAAOwF,UAAWW,GAC3BtE,EAAIY,EAAQ1B,MAEb,OAAQc,IACPqgB,EAASzf,EAASZ,IACbqgB,EAAOlO,SACXhU,EAAO2F,QAAS3F,EAAOo5B,SAASlX,OAAOhhB,IAAKghB,GAAU/E,GAAW,MAEjEkc,GAAY,EAQd,OAHMA,KACLz3B,EAAKqS,cAAgB,IAEfkJ,OAOXnd,EAAOyB,MAAQ,QAAS,YAAc,WACrCzB,EAAOo5B,SAAUj6B,OAChBggB,IAAK,SAAUvd,EAAMuE,GACpB,MAAKnG,GAAOmD,QAASgD,GACXvE,EAAKmS,QAAU/T,EAAO2F,QAAS3F,EAAQ4B,GAAOyO,MAAOlK,GAAU,GADzE,SAKIrG,EAAQq3B,UACbn3B,EAAOo5B,SAAUj6B,MAAO+B,IAAM,SAAUU,GACvC,MAAwC,QAAjCA,EAAKsK,aAAc,SAAqB,KAAOtK,EAAKuE,SAW9D,IAAImzB,IAAc,iCAElBt5B,GAAOwC,OAAQxC,EAAO0kB,OAErB2D,QAAS,SAAU3D,EAAOtF,EAAMxd,EAAM23B,GAErC,GAAI13B,GAAGyL,EAAKhH,EAAKkzB,EAAYC,EAAQpU,EAAQL,EAC5C0U,GAAc93B,GAAQ7C,GACtB+E,EAAOlE,EAAOqB,KAAMyjB,EAAO,QAAWA,EAAM5gB,KAAO4gB,EACnDQ,EAAatlB,EAAOqB,KAAMyjB,EAAO,aAAgBA,EAAMgB,UAAU9e,MAAO,OAKzE,IAHA0G,EAAMhH,EAAM1E,EAAOA,GAAQ7C,EAGJ,IAAlB6C,EAAKyC,UAAoC,IAAlBzC,EAAKyC,WAK5Bi1B,GAAYrtB,KAAMnI,EAAO9D,EAAO0kB,MAAMY,aAItCxhB,EAAKrE,QAAS,KAAQ,KAG1BylB,EAAaphB,EAAK8C,MAAO,KACzB9C,EAAOohB,EAAWrY,QAClBqY,EAAW5iB,QAEZm3B,EAAS31B,EAAKrE,QAAS,KAAQ,GAAK,KAAOqE,EAG3C4gB,EAAQA,EAAO1kB,EAAOqD,SACrBqhB,EACA,GAAI1kB,GAAOkoB,MAAOpkB,EAAuB,gBAAV4gB,IAAsBA,GAGtDA,EAAMiV,UAAYJ,EAAe,EAAI,EACrC7U,EAAMgB,UAAYR,EAAW7Y,KAAM,KACnCqY,EAAM8B,WAAa9B,EAAMgB,UACxB,GAAIzc,QAAQ,UAAYic,EAAW7Y,KAAM,iBAAoB,WAC7D,KAGDqY,EAAM7S,OAASzO,OACTshB,EAAM3hB,SACX2hB,EAAM3hB,OAASnB,GAIhBwd,EAAe,MAARA,GACJsF,GACF1kB,EAAOwF,UAAW4Z,GAAQsF,IAG3BM,EAAUhlB,EAAO0kB,MAAMM,QAASlhB,OAC1By1B,IAAgBvU,EAAQqD,SAAWrD,EAAQqD,QAAQvmB,MAAOF,EAAMwd,MAAW,GAAjF,CAMA,IAAMma,IAAiBvU,EAAQoD,WAAapoB,EAAOgE,SAAUpC,GAAS,CAMrE,IAJA43B,EAAaxU,EAAQQ,cAAgB1hB,EAC/Bw1B,GAAYrtB,KAAMutB,EAAa11B,KACpCwJ,EAAMA,EAAIrI,YAEHqI,EAAKA,EAAMA,EAAIrI,WACtBy0B,EAAUl6B,KAAM8N,GAChBhH,EAAMgH,CAIFhH,MAAU1E,EAAK8J,eAAiB3M,IACpC26B,EAAUl6B,KAAM8G,EAAI8H,aAAe9H,EAAIszB,cAAgB16B,GAKzD2C,EAAI,CACJ,QAAUyL,EAAMosB,EAAW73B,QAAY6iB,EAAM2B,uBAE5C3B,EAAM5gB,KAAOjC,EAAI,EAChB23B,EACAxU,EAAQS,UAAY3hB,EAGrBuhB,GAAW5F,EAASve,IAAKoM,EAAK,eAAoBoX,EAAM5gB,OACvD2b,EAASve,IAAKoM,EAAK,UACf+X,GACJA,EAAOvjB,MAAOwL,EAAK8R,GAIpBiG,EAASoU,GAAUnsB,EAAKmsB,GACnBpU,GAAUA,EAAOvjB,OAAS4c,EAAYpR,KAC1CoX,EAAM7S,OAASwT,EAAOvjB,MAAOwL,EAAK8R,GAC7BsF,EAAM7S,UAAW,GACrB6S,EAAM+B,iBAoCT,OAhCA/B,GAAM5gB,KAAOA,EAGPy1B,GAAiB7U,EAAMgE,sBAEpB1D,EAAQzC,UACfyC,EAAQzC,SAASzgB,MAAO43B,EAAUlxB,MAAO4W,MAAW,IACpDV,EAAY9c,IAIP63B,GAAUz5B,EAAOiD,WAAYrB,EAAMkC,MAAa9D,EAAOgE,SAAUpC,KAGrE0E,EAAM1E,EAAM63B,GAEPnzB,IACJ1E,EAAM63B,GAAW,MAIlBz5B,EAAO0kB,MAAMY,UAAYxhB,EACzBlC,EAAMkC,KACN9D,EAAO0kB,MAAMY,UAAYliB,OAEpBkD,IACJ1E,EAAM63B,GAAWnzB,IAMdoe,EAAM7S,SAKdgoB,SAAU,SAAU/1B,EAAMlC,EAAM8iB,GAC/B,GAAI1Z,GAAIhL,EAAOwC,OACd,GAAIxC,GAAOkoB,MACXxD,GAEC5gB,KAAMA,EACN+kB,aAAa,GAIf7oB,GAAO0kB,MAAM2D,QAASrd,EAAG,KAAMpJ,MAKjC5B,EAAOG,GAAGqC,QAET6lB,QAAS,SAAUvkB,EAAMsb,GACxB,MAAOjgB,MAAKsC,KAAM,WACjBzB,EAAO0kB,MAAM2D,QAASvkB,EAAMsb,EAAMjgB,SAGpC2e,eAAgB,SAAUha,EAAMsb,GAC/B,GAAIxd,GAAOzC,KAAM,EACjB,OAAKyC,GACG5B,EAAO0kB,MAAM2D,QAASvkB,EAAMsb,EAAMxd,GAAM,GADhD,UAOF5B,EAAOyB,KAAM,0MAEsDmF,MAAO,KACzE,SAAU/E,EAAGa,GAGb1C,EAAOG,GAAIuC,GAAS,SAAU0c,EAAMjf,GACnC,MAAO4B,WAAUhB,OAAS,EACzB5B,KAAKmlB,GAAI5hB,EAAM,KAAM0c,EAAMjf,GAC3BhB,KAAKkpB,QAAS3lB,MAIjB1C,EAAOG,GAAGqC,QACTs3B,MAAO,SAAUC,EAAQC,GACxB,MAAO76B,MAAK4pB,WAAYgR,GAAS/Q,WAAYgR,GAASD,MAOxDj6B,EAAQm6B,QAAU,aAAe/6B,GAW3BY,EAAQm6B,SACbj6B,EAAOyB,MAAQ+R,MAAO,UAAW8U,KAAM,YAAc,SAAUa,EAAMlD,GAGpE,GAAI9Y,GAAU,SAAUuX,GACvB1kB,EAAO0kB,MAAMmV,SAAU5T,EAAKvB,EAAM3hB,OAAQ/C,EAAO0kB,MAAMuB,IAAKvB,IAG7D1kB,GAAO0kB,MAAMM,QAASiB,IACrBL,MAAO,WACN,GAAIzX,GAAMhP,KAAKuM,eAAiBvM,KAC/B+6B,EAAWza,EAASpB,OAAQlQ,EAAK8X,EAE5BiU,IACL/rB,EAAIG,iBAAkB6a,EAAMhc,GAAS,GAEtCsS,EAASpB,OAAQlQ,EAAK8X,GAAOiU,GAAY,GAAM,IAEhDnU,SAAU,WACT,GAAI5X,GAAMhP,KAAKuM,eAAiBvM,KAC/B+6B,EAAWza,EAASpB,OAAQlQ,EAAK8X,GAAQ,CAEpCiU,GAKLza,EAASpB,OAAQlQ,EAAK8X,EAAKiU,IAJ3B/rB,EAAI8P,oBAAqBkL,EAAMhc,GAAS,GACxCsS,EAASlE,OAAQpN,EAAK8X,OAS3B,IAAI3S,IAAWpU,EAAOoU,SAElB6mB,GAAQn6B,EAAOwG,MAEf4zB,GAAS,IAMbp6B,GAAO8f,UAAY,SAAUV,GAC5B,MAAOib,MAAKC,MAAOlb,EAAO,KAK3Bpf,EAAOu6B,SAAW,SAAUnb,GAC3B,GAAIlN,EACJ,KAAMkN,GAAwB,gBAATA,GACpB,MAAO,KAIR,KACClN,GAAM,GAAMhT,GAAOs7B,WAAcC,gBAAiBrb,EAAM,YACvD,MAAQpU,GACTkH,EAAM9O,OAMP,MAHM8O,KAAOA,EAAIpG,qBAAsB,eAAgB/K,QACtDf,EAAO0D,MAAO,gBAAkB0b,GAE1BlN,EAIR,IACCwoB,IAAQ,OACRC,GAAM,gBACNC,GAAW,6BAGXC,GAAiB,4DACjBC,GAAa,iBACbC,GAAY,QAWZrG,MAOAsG,MAGAC,GAAW,KAAK17B,OAAQ,KAGxB27B,GAAen8B,EAAS8F,cAAe,IACvCq2B,IAAavnB,KAAOL,GAASK,IAG9B,SAASwnB,IAA6BC,GAGrC,MAAO,UAAUC,EAAoBzf,GAED,gBAAvByf,KACXzf,EAAOyf,EACPA,EAAqB,IAGtB,IAAIC,GACHz5B,EAAI,EACJ05B,EAAYF,EAAmB/1B,cAAcgG,MAAOmP,MAErD,IAAKza,EAAOiD,WAAY2Y,GAGvB,MAAU0f,EAAWC,EAAW15B,KAGR,MAAlBy5B,EAAU,IACdA,EAAWA,EAASh8B,MAAO,IAAO,KAChC87B,EAAWE,GAAaF,EAAWE,QAAmBrrB,QAAS2L,KAI/Dwf,EAAWE,GAAaF,EAAWE,QAAmB97B,KAAMoc,IAQnE,QAAS4f,IAA+BJ,EAAW34B,EAASuyB,EAAiByG,GAE5E,GAAIC,MACHC,EAAqBP,IAAcJ,EAEpC,SAASY,GAASN,GACjB,GAAItnB,EAcJ,OAbA0nB,GAAWJ,IAAa,EACxBt7B,EAAOyB,KAAM25B,EAAWE,OAAkB,SAAU9wB,EAAGqxB,GACtD,GAAIC,GAAsBD,EAAoBp5B,EAASuyB,EAAiByG,EACxE,OAAoC,gBAAxBK,IACVH,GAAqBD,EAAWI,GAKtBH,IACD3nB,EAAW8nB,GADf,QAHNr5B,EAAQ84B,UAAUtrB,QAAS6rB,GAC3BF,EAASE,IACF,KAKF9nB,EAGR,MAAO4nB,GAASn5B,EAAQ84B,UAAW,MAAUG,EAAW,MAASE,EAAS,KAM3E,QAASG,IAAYh5B,EAAQJ,GAC5B,GAAIyB,GAAKpB,EACRg5B,EAAch8B,EAAOi8B,aAAaD,eAEnC,KAAM53B,IAAOzB,GACQS,SAAfT,EAAKyB,MACP43B,EAAa53B,GAAQrB,EAAWC,IAAUA,OAAiBoB,GAAQzB,EAAKyB,GAO5E,OAJKpB,IACJhD,EAAOwC,QAAQ,EAAMO,EAAQC,GAGvBD,EAOR,QAASm5B,IAAqBC,EAAGV,EAAOW,GAEvC,GAAIC,GAAIv4B,EAAMw4B,EAAeC,EAC5BjjB,EAAW6iB,EAAE7iB,SACbiiB,EAAYY,EAAEZ,SAGf,OAA2B,MAAnBA,EAAW,GAClBA,EAAU1uB,QACEzJ,SAAPi5B,IACJA,EAAKF,EAAEK,UAAYf,EAAMgB,kBAAmB,gBAK9C,IAAKJ,EACJ,IAAMv4B,IAAQwV,GACb,GAAKA,EAAUxV,IAAUwV,EAAUxV,GAAOmI,KAAMowB,GAAO,CACtDd,EAAUtrB,QAASnM,EACnB,OAMH,GAAKy3B,EAAW,IAAOa,GACtBE,EAAgBf,EAAW,OACrB,CAGN,IAAMz3B,IAAQs4B,GAAY,CACzB,IAAMb,EAAW,IAAOY,EAAEO,WAAY54B,EAAO,IAAMy3B,EAAW,IAAQ,CACrEe,EAAgBx4B,CAChB,OAEKy4B,IACLA,EAAgBz4B,GAKlBw4B,EAAgBA,GAAiBC,EAMlC,MAAKD,IACCA,IAAkBf,EAAW,IACjCA,EAAUtrB,QAASqsB,GAEbF,EAAWE,IAJnB,OAWD,QAASK,IAAaR,EAAGS,EAAUnB,EAAOoB,GACzC,GAAIC,GAAOC,EAASC,EAAM12B,EAAKkT,EAC9BkjB,KAGAnB,EAAYY,EAAEZ,UAAUj8B,OAGzB,IAAKi8B,EAAW,GACf,IAAMyB,IAAQb,GAAEO,WACfA,EAAYM,EAAK13B,eAAkB62B,EAAEO,WAAYM,EAInDD,GAAUxB,EAAU1uB,OAGpB,OAAQkwB,EAcP,GAZKZ,EAAEc,eAAgBF,KACtBtB,EAAOU,EAAEc,eAAgBF,IAAcH,IAIlCpjB,GAAQqjB,GAAaV,EAAEe,aAC5BN,EAAWT,EAAEe,WAAYN,EAAUT,EAAEb,WAGtC9hB,EAAOujB,EACPA,EAAUxB,EAAU1uB,QAKnB,GAAiB,MAAZkwB,EAEJA,EAAUvjB,MAGJ,IAAc,MAATA,GAAgBA,IAASujB,EAAU,CAM9C,GAHAC,EAAON,EAAYljB,EAAO,IAAMujB,IAAaL,EAAY,KAAOK,IAG1DC,EACL,IAAMF,IAASJ,GAId,GADAp2B,EAAMw2B,EAAMl2B,MAAO,KACdN,EAAK,KAAQy2B,IAGjBC,EAAON,EAAYljB,EAAO,IAAMlT,EAAK,KACpCo2B,EAAY,KAAOp2B,EAAK,KACb,CAGN02B,KAAS,EACbA,EAAON,EAAYI,GAGRJ,EAAYI,MAAY,IACnCC,EAAUz2B,EAAK,GACfi1B,EAAUtrB,QAAS3J,EAAK,IAEzB,OAOJ,GAAK02B,KAAS,EAGb,GAAKA,GAAQb,EAAAA,UACZS,EAAWI,EAAMJ,OAEjB,KACCA,EAAWI,EAAMJ,GAChB,MAAQ5xB,GACT,OACC8Q,MAAO,cACPpY,MAAOs5B,EAAOhyB,EAAI,sBAAwBwO,EAAO,OAASujB,IASjE,OAASjhB,MAAO,UAAWsD,KAAMwd,GAGlC58B,EAAOwC,QAGN26B,OAAQ,EAGRC,gBACAC,QAEApB,cACCqB,IAAKhqB,GAASK,KACd7P,KAAM,MACNy5B,QAAS1C,GAAe5uB,KAAMqH,GAASkqB,UACvC7+B,QAAQ,EACR8+B,aAAa,EACbC,OAAO,EACPC,YAAa,mDAabC,SACCvI,IAAK4F,GACLn2B,KAAM,aACN4lB,KAAM,YACNxY,IAAK,4BACL2rB,KAAM,qCAGPvkB,UACCpH,IAAK,UACLwY,KAAM,SACNmT,KAAM,YAGPZ,gBACC/qB,IAAK,cACLpN,KAAM,eACN+4B,KAAM,gBAKPnB,YAGCoB,SAAUlzB,OAGVmzB,aAAa,EAGbC,YAAah+B,EAAO8f,UAGpBme,WAAYj+B,EAAOu6B,UAOpByB,aACCsB,KAAK,EACLp9B,SAAS,IAOXg+B,UAAW,SAAUn7B,EAAQo7B,GAC5B,MAAOA,GAGNpC,GAAYA,GAAYh5B,EAAQ/C,EAAOi8B,cAAgBkC,GAGvDpC,GAAY/7B,EAAOi8B,aAAcl5B,IAGnCq7B,cAAejD,GAA6BzG,IAC5C2J,cAAelD,GAA6BH,IAG5CsD,KAAM,SAAUhB,EAAK76B,GAGA,gBAAR66B,KACX76B,EAAU66B,EACVA,EAAMl6B,QAIPX,EAAUA,KAEV,IAAI87B,GAGHC,EAGAC,EACAC,EAGAC,EAGAC,EAGAC,EAGAh9B,EAGAs6B,EAAIn8B,EAAOk+B,aAAez7B,GAG1Bq8B,EAAkB3C,EAAEj8B,SAAWi8B,EAG/B4C,EAAqB5C,EAAEj8B,UACpB4+B,EAAgBz6B,UAAYy6B,EAAgBj+B,QAC7Cb,EAAQ8+B,GACR9+B,EAAO0kB,MAGTzI,EAAWjc,EAAO2b,WAClBqjB,EAAmBh/B,EAAO6a,UAAW,eAGrCokB,EAAa9C,EAAE8C,eAGfC,KACAC,KAGArjB,EAAQ,EAGRsjB,EAAW,WAGX3D,GACCvd,WAAY,EAGZue,kBAAmB,SAAUr4B,GAC5B,GAAIkH,EACJ,IAAe,IAAVwQ,EAAc,CAClB,IAAM4iB,EAAkB,CACvBA,IACA,OAAUpzB,EAAQsvB,GAASjvB,KAAM8yB,GAChCC,EAAiBpzB,EAAO,GAAIhG,eAAkBgG,EAAO,GAGvDA,EAAQozB,EAAiBt6B,EAAIkB,eAE9B,MAAgB,OAATgG,EAAgB,KAAOA,GAI/B+zB,sBAAuB,WACtB,MAAiB,KAAVvjB,EAAc2iB,EAAwB,MAI9Ca,iBAAkB,SAAU58B,EAAMyD,GACjC,GAAIo5B,GAAQ78B,EAAK4C,aAKjB,OAJMwW,KACLpZ,EAAOy8B,EAAqBI,GAAUJ,EAAqBI,IAAW78B,EACtEw8B,EAAgBx8B,GAASyD,GAEnBhH,MAIRqgC,iBAAkB,SAAU17B,GAI3B,MAHMgY,KACLqgB,EAAEK,SAAW14B,GAEP3E,MAIR8/B,WAAY,SAAUt9B,GACrB,GAAI6C,EACJ,IAAK7C,EACJ,GAAa,EAARma,EACJ,IAAMtX,IAAQ7C,GAGbs9B,EAAYz6B,IAAWy6B,EAAYz6B,GAAQ7C,EAAK6C,QAKjDi3B,GAAMzf,OAAQra,EAAK85B,EAAMgE,QAG3B,OAAOtgC,OAIRugC,MAAO,SAAUC,GAChB,GAAIC,GAAYD,GAAcP,CAK9B,OAJKb,IACJA,EAAUmB,MAAOE,GAElB73B,EAAM,EAAG63B,GACFzgC,MAuBV,IAlBA8c,EAASF,QAAS0f,GAAQrG,SAAW4J,EAAiBjlB,IACtD0hB,EAAMoE,QAAUpE,EAAM1zB,KACtB0zB,EAAM/3B,MAAQ+3B,EAAMvf,KAMpBigB,EAAEmB,MAAUA,GAAOnB,EAAEmB,KAAOhqB,GAASK,MAAS,IAAKnQ,QAASk3B,GAAO,IACjEl3B,QAASu3B,GAAWznB,GAASkqB,SAAW,MAG1CrB,EAAEr4B,KAAOrB,EAAQq9B,QAAUr9B,EAAQqB,MAAQq4B,EAAE2D,QAAU3D,EAAEr4B,KAGzDq4B,EAAEZ,UAAYv7B,EAAO4E,KAAMu3B,EAAEb,UAAY,KAAMh2B,cAAcgG,MAAOmP,KAAiB,IAG/D,MAAjB0hB,EAAE4D,YAAsB,CAC5BnB,EAAY7/B,EAAS8F,cAAe,IAIpC,KACC+5B,EAAUjrB,KAAOwoB,EAAEmB,IAInBsB,EAAUjrB,KAAOirB,EAAUjrB,KAC3BwoB,EAAE4D,YAAc7E,GAAasC,SAAW,KAAOtC,GAAa8E,MAC3DpB,EAAUpB,SAAW,KAAOoB,EAAUoB,KACtC,MAAQh1B,GAITmxB,EAAE4D,aAAc,GAalB,GARK5D,EAAE/c,MAAQ+c,EAAEsB,aAAiC,gBAAXtB,GAAE/c,OACxC+c,EAAE/c,KAAOpf,EAAOigC,MAAO9D,EAAE/c,KAAM+c,EAAE+D,cAIlC1E,GAA+B9G,GAAYyH,EAAG15B,EAASg5B,GAGxC,IAAV3f,EACJ,MAAO2f,EAKRoD,GAAc7+B,EAAO0kB,OAASyX,EAAEx9B,OAG3BkgC,GAAmC,IAApB7+B,EAAOm9B,UAC1Bn9B,EAAO0kB,MAAM2D,QAAS,aAIvB8T,EAAEr4B,KAAOq4B,EAAEr4B,KAAKnD,cAGhBw7B,EAAEgE,YAAcrF,GAAW7uB,KAAMkwB,EAAEr4B,MAInC06B,EAAWrC,EAAEmB,IAGPnB,EAAEgE,aAGFhE,EAAE/c,OACNof,EAAarC,EAAEmB,MAASlD,GAAOnuB,KAAMuyB,GAAa,IAAM,KAAQrC,EAAE/c,WAG3D+c,GAAE/c,MAIL+c,EAAExvB,SAAU,IAChBwvB,EAAEmB,IAAM3C,GAAI1uB,KAAMuyB,GAGjBA,EAASh7B,QAASm3B,GAAK,OAASR,MAGhCqE,GAAapE,GAAOnuB,KAAMuyB,GAAa,IAAM,KAAQ,KAAOrE,OAK1DgC,EAAEiE,aACDpgC,EAAOo9B,aAAcoB,IACzB/C,EAAM6D,iBAAkB,oBAAqBt/B,EAAOo9B,aAAcoB,IAE9Dx+B,EAAOq9B,KAAMmB,IACjB/C,EAAM6D,iBAAkB,gBAAiBt/B,EAAOq9B,KAAMmB,MAKnDrC,EAAE/c,MAAQ+c,EAAEgE,YAAchE,EAAEwB,eAAgB,GAASl7B,EAAQk7B,cACjElC,EAAM6D,iBAAkB,eAAgBnD,EAAEwB,aAI3ClC,EAAM6D,iBACL,SACAnD,EAAEZ,UAAW,IAAOY,EAAEyB,QAASzB,EAAEZ,UAAW,IAC3CY,EAAEyB,QAASzB,EAAEZ,UAAW,KACA,MAArBY,EAAEZ,UAAW,GAAc,KAAON,GAAW,WAAa,IAC7DkB,EAAEyB,QAAS,KAIb,KAAM/7B,IAAKs6B,GAAEkE,QACZ5E,EAAM6D,iBAAkBz9B,EAAGs6B,EAAEkE,QAASx+B,GAIvC,IAAKs6B,EAAEmE,aACJnE,EAAEmE,WAAWr/B,KAAM69B,EAAiBrD,EAAOU,MAAQ,GAAmB,IAAVrgB,GAG9D,MAAO2f,GAAMiE,OAIdN,GAAW,OAGX,KAAMv9B,KAAOg+B,QAAS,EAAGn8B,MAAO,EAAG0xB,SAAU,GAC5CqG,EAAO55B,GAAKs6B,EAAGt6B,GAOhB,IAHA08B,EAAY/C,GAA+BR,GAAYmB,EAAG15B,EAASg5B,GAK5D,CASN,GARAA,EAAMvd,WAAa,EAGd2gB,GACJE,EAAmB1W,QAAS,YAAcoT,EAAOU,IAInC,IAAVrgB,EACJ,MAAO2f,EAIHU,GAAEuB,OAASvB,EAAElF,QAAU,IAC3B0H,EAAez/B,EAAOkf,WAAY,WACjCqd,EAAMiE,MAAO,YACXvD,EAAElF,SAGN,KACCnb,EAAQ,EACRyiB,EAAUgC,KAAMrB,EAAgBn3B,GAC/B,MAAQiD,GAGT,KAAa,EAAR8Q,GAKJ,KAAM9Q,EAJNjD,GAAM,GAAIiD,QA5BZjD,GAAM,GAAI,eAsCX,SAASA,GAAM03B,EAAQe,EAAkBpE,EAAWiE,GACnD,GAAIxD,GAAWgD,EAASn8B,EAAOk5B,EAAU6D,EACxCd,EAAaa,CAGC,KAAV1kB,IAKLA,EAAQ,EAGH6iB,GACJz/B,EAAOg4B,aAAcyH,GAKtBJ,EAAYn7B,OAGZq7B,EAAwB4B,GAAW,GAGnC5E,EAAMvd,WAAauhB,EAAS,EAAI,EAAI,EAGpC5C,EAAY4C,GAAU,KAAgB,IAATA,GAA2B,MAAXA,EAGxCrD,IACJQ,EAAWV,GAAqBC,EAAGV,EAAOW,IAI3CQ,EAAWD,GAAaR,EAAGS,EAAUnB,EAAOoB,GAGvCA,GAGCV,EAAEiE,aACNK,EAAWhF,EAAMgB,kBAAmB,iBAC/BgE,IACJzgC,EAAOo9B,aAAcoB,GAAaiC,GAEnCA,EAAWhF,EAAMgB,kBAAmB,QAC/BgE,IACJzgC,EAAOq9B,KAAMmB,GAAaiC,IAKZ,MAAXhB,GAA6B,SAAXtD,EAAEr4B,KACxB67B,EAAa,YAGS,MAAXF,EACXE,EAAa,eAIbA,EAAa/C,EAAS9gB,MACtB+jB,EAAUjD,EAASxd,KACnB1b,EAAQk5B,EAASl5B,MACjBm5B,GAAan5B,KAKdA,EAAQi8B,GACHF,GAAWE,IACfA,EAAa,QACC,EAATF,IACJA,EAAS,KAMZhE,EAAMgE,OAASA,EACfhE,EAAMkE,YAAea,GAAoBb,GAAe,GAGnD9C,EACJ5gB,EAASqB,YAAawhB,GAAmBe,EAASF,EAAYlE,IAE9Dxf,EAASiZ,WAAY4J,GAAmBrD,EAAOkE,EAAYj8B,IAI5D+3B,EAAMwD,WAAYA,GAClBA,EAAa77B,OAERy7B,GACJE,EAAmB1W,QAASwU,EAAY,cAAgB,aACrDpB,EAAOU,EAAGU,EAAYgD,EAAUn8B,IAIpCs7B,EAAiBtjB,SAAUojB,GAAmBrD,EAAOkE,IAEhDd,IACJE,EAAmB1W,QAAS,gBAAkBoT,EAAOU,MAG3Cn8B,EAAOm9B,QAChBn9B,EAAO0kB,MAAM2D,QAAS,cAKzB,MAAOoT,IAGRiF,QAAS,SAAUpD,EAAKle,EAAM1d,GAC7B,MAAO1B,GAAOkB,IAAKo8B,EAAKle,EAAM1d,EAAU,SAGzCi/B,UAAW,SAAUrD,EAAK57B,GACzB,MAAO1B,GAAOkB,IAAKo8B,EAAKl6B,OAAW1B,EAAU,aAI/C1B,EAAOyB,MAAQ,MAAO,QAAU,SAAUI,EAAGi+B,GAC5C9/B,EAAQ8/B,GAAW,SAAUxC,EAAKle,EAAM1d,EAAUoC,GAUjD,MAPK9D,GAAOiD,WAAYmc,KACvBtb,EAAOA,GAAQpC,EACfA,EAAW0d,EACXA,EAAOhc,QAIDpD,EAAOs+B,KAAMt+B,EAAOwC,QAC1B86B,IAAKA,EACLx5B,KAAMg8B,EACNxE,SAAUx3B,EACVsb,KAAMA,EACNygB,QAASn+B,GACP1B,EAAOkD,cAAeo6B,IAASA,OAKpCt9B,EAAO2qB,SAAW,SAAU2S,GAC3B,MAAOt9B,GAAOs+B,MACbhB,IAAKA,EAGLx5B,KAAM,MACNw3B,SAAU,SACVoC,OAAO,EACP/+B,QAAQ,EACRiiC,UAAU,KAKZ5gC,EAAOG,GAAGqC,QACTq+B,QAAS,SAAUnW,GAClB,GAAIpH,EAEJ,OAAKtjB,GAAOiD,WAAYynB,GAChBvrB,KAAKsC,KAAM,SAAUI,GAC3B7B,EAAQb,MAAO0hC,QAASnW,EAAKzpB,KAAM9B,KAAM0C,OAItC1C,KAAM,KAGVmkB,EAAOtjB,EAAQ0qB,EAAMvrB,KAAM,GAAIuM,eAAgBzJ,GAAI,GAAIa,OAAO,GAEzD3D,KAAM,GAAI8F,YACdqe,EAAKgI,aAAcnsB,KAAM,IAG1BmkB,EAAK3hB,IAAK,WACT,GAAIC,GAAOzC,IAEX,OAAQyC,EAAKk/B,kBACZl/B,EAAOA,EAAKk/B,iBAGb,OAAOl/B,KACJwpB,OAAQjsB,OAGNA,OAGR4hC,UAAW,SAAUrW,GACpB,MAAK1qB,GAAOiD,WAAYynB,GAChBvrB,KAAKsC,KAAM,SAAUI,GAC3B7B,EAAQb,MAAO4hC,UAAWrW,EAAKzpB,KAAM9B,KAAM0C,MAItC1C,KAAKsC,KAAM,WACjB,GAAIsX,GAAO/Y,EAAQb,MAClBma,EAAWP,EAAKO,UAEZA,GAASvY,OACbuY,EAASunB,QAASnW,GAGlB3R,EAAKqS,OAAQV,MAKhBpH,KAAM,SAAUoH,GACf,GAAIznB,GAAajD,EAAOiD,WAAYynB,EAEpC,OAAOvrB,MAAKsC,KAAM,SAAUI,GAC3B7B,EAAQb,MAAO0hC,QAAS59B,EAAaynB,EAAKzpB,KAAM9B,KAAM0C,GAAM6oB,MAI9DsW,OAAQ,WACP,MAAO7hC,MAAK+O,SAASzM,KAAM,WACpBzB,EAAOqF,SAAUlG,KAAM,SAC5Ba,EAAQb,MAAOssB,YAAatsB,KAAK4L,cAE/B1I,SAKNrC,EAAOkQ,KAAK8E,QAAQob,OAAS,SAAUxuB,GACtC,OAAQ5B,EAAOkQ,KAAK8E,QAAQisB,QAASr/B,IAEtC5B,EAAOkQ,KAAK8E,QAAQisB,QAAU,SAAUr/B,GAMvC,MAAOA,GAAKouB,YAAc,GAAKpuB,EAAKquB,aAAe,GAAKruB,EAAKs/B,iBAAiBngC,OAAS,EAMxF,IAAIogC,IAAM,OACTC,GAAW,QACXC,GAAQ,SACRC,GAAkB,wCAClBC,GAAe,oCAEhB,SAASC,IAAa7P,EAAQ9tB,EAAKq8B,EAAanmB,GAC/C,GAAIrX,EAEJ,IAAK1C,EAAOmD,QAASU,GAGpB7D,EAAOyB,KAAMoC,EAAK,SAAUhC,EAAG4/B,GACzBvB,GAAekB,GAASn1B,KAAM0lB,GAGlC5X,EAAK4X,EAAQ8P,GAKbD,GACC7P,EAAS,KAAqB,gBAAN8P,IAAuB,MAALA,EAAY5/B,EAAI,IAAO,IACjE4/B,EACAvB,EACAnmB,SAKG,IAAMmmB,GAAsC,WAAvBlgC,EAAO8D,KAAMD,GAUxCkW,EAAK4X,EAAQ9tB,OAPb,KAAMnB,IAAQmB,GACb29B,GAAa7P,EAAS,IAAMjvB,EAAO,IAAKmB,EAAKnB,GAAQw9B,EAAanmB,GAYrE/Z,EAAOigC,MAAQ,SAAU53B,EAAG63B,GAC3B,GAAIvO,GACHwK,KACApiB,EAAM,SAAU3V,EAAK+B,GAGpBA,EAAQnG,EAAOiD,WAAYkD,GAAUA,IAAqB,MAATA,EAAgB,GAAKA,EACtEg2B,EAAGA,EAAEp7B,QAAW2gC,mBAAoBt9B,GAAQ,IAAMs9B,mBAAoBv7B,GASxE,IALqB/C,SAAhB88B,IACJA,EAAclgC,EAAOi8B,cAAgBj8B,EAAOi8B,aAAaiE,aAIrDlgC,EAAOmD,QAASkF,IAASA,EAAExH,SAAWb,EAAOkD,cAAemF,GAGhErI,EAAOyB,KAAM4G,EAAG,WACf0R,EAAK5a,KAAKuD,KAAMvD,KAAKgH,aAOtB,KAAMwrB,IAAUtpB,GACfm5B,GAAa7P,EAAQtpB,EAAGspB,GAAUuO,EAAanmB,EAKjD,OAAOoiB,GAAE9vB,KAAM,KAAM7I,QAAS29B,GAAK,MAGpCnhC,EAAOG,GAAGqC,QACTm/B,UAAW,WACV,MAAO3hC,GAAOigC,MAAO9gC,KAAKyiC,mBAE3BA,eAAgB,WACf,MAAOziC,MAAKwC,IAAK,WAGhB,GAAIwO,GAAWnQ,EAAOqf,KAAMlgB,KAAM,WAClC,OAAOgR,GAAWnQ,EAAOwF,UAAW2K,GAAahR,OAEjD0P,OAAQ,WACR,GAAI/K,GAAO3E,KAAK2E,IAGhB,OAAO3E,MAAKuD,OAAS1C,EAAQb,MAAOoZ,GAAI,cACvCgpB,GAAat1B,KAAM9M,KAAKkG,YAAei8B,GAAgBr1B,KAAMnI,KAC3D3E,KAAK4U,UAAY+N,EAAe7V,KAAMnI,MAEzCnC,IAAK,SAAUE,EAAGD,GAClB,GAAIyO,GAAMrQ,EAAQb,MAAOkR,KAEzB,OAAc,OAAPA,EACN,KACArQ,EAAOmD,QAASkN,GACfrQ,EAAO2B,IAAK0O,EAAK,SAAUA,GAC1B,OAAS3N,KAAMd,EAAKc,KAAMyD,MAAOkK,EAAI7M,QAAS69B,GAAO,YAEpD3+B,KAAMd,EAAKc,KAAMyD,MAAOkK,EAAI7M,QAAS69B,GAAO,WAC7CngC,SAKNlB,EAAOi8B,aAAa4F,IAAM,WACzB,IACC,MAAO,IAAI3iC,GAAO4iC,eACjB,MAAQ92B,KAGX,IAAI+2B,KAGFC,EAAG,IAIHC,KAAM,KAEPC,GAAeliC,EAAOi8B,aAAa4F,KAEpC/hC,GAAQqiC,OAASD,IAAkB,mBAAqBA,IACxDpiC,EAAQw+B,KAAO4D,KAAiBA,GAEhCliC,EAAOq+B,cAAe,SAAU57B,GAC/B,GAAIf,GAAU0gC,CAGd,OAAKtiC,GAAQqiC,MAAQD,KAAiBz/B,EAAQs9B,aAE5CQ,KAAM,SAAUF,EAASjL,GACxB,GAAIvzB,GACHggC,EAAMp/B,EAAQo/B,KAWf,IATAA,EAAIQ,KACH5/B,EAAQqB,KACRrB,EAAQ66B,IACR76B,EAAQi7B,MACRj7B,EAAQ6/B,SACR7/B,EAAQmS,UAIJnS,EAAQ8/B,UACZ,IAAM1gC,IAAKY,GAAQ8/B,UAClBV,EAAKhgC,GAAMY,EAAQ8/B,UAAW1gC,EAK3BY,GAAQ+5B,UAAYqF,EAAIrC,kBAC5BqC,EAAIrC,iBAAkB/8B,EAAQ+5B,UAQzB/5B,EAAQs9B,aAAgBM,EAAS,sBACtCA,EAAS,oBAAuB,iBAIjC,KAAMx+B,IAAKw+B,GACVwB,EAAIvC,iBAAkBz9B,EAAGw+B,EAASx+B,GAInCH,GAAW,SAAUoC,GACpB,MAAO,YACDpC,IACJA,EAAW0gC,EAAgBP,EAAIW,OAC9BX,EAAIY,QAAUZ,EAAIa,QAAUb,EAAIc,mBAAqB,KAExC,UAAT7+B,EACJ+9B,EAAInC,QACgB,UAAT57B,EAKgB,gBAAf+9B,GAAIpC,OACfrK,EAAU,EAAG,SAEbA,EAGCyM,EAAIpC,OACJoC,EAAIlC,YAINvK,EACC2M,GAAkBF,EAAIpC,SAAYoC,EAAIpC,OACtCoC,EAAIlC,WAK+B,UAAjCkC,EAAIe,cAAgB,SACM,gBAArBf,GAAIgB,cACRC,OAAQjB,EAAIjF,WACZ93B,KAAM+8B,EAAIgB,cACbhB,EAAIxC,4BAQTwC,EAAIW,OAAS9gC,IACb0gC,EAAgBP,EAAIY,QAAU/gC,EAAU,SAKnB0B,SAAhBy+B,EAAIa,QACRb,EAAIa,QAAUN,EAEdP,EAAIc,mBAAqB,WAGA,IAAnBd,EAAI3jB,YAMRhf,EAAOkf,WAAY,WACb1c,GACJ0gC,OAQL1gC,EAAWA,EAAU,QAErB,KAGCmgC,EAAItB,KAAM99B,EAAQ09B,YAAc19B,EAAQ2c,MAAQ,MAC/C,MAAQpU,GAGT,GAAKtJ,EACJ,KAAMsJ,KAKT00B,MAAO,WACDh+B,GACJA,MAjIJ,SA4ID1B,EAAOk+B,WACNN,SACCn5B,OAAQ,6FAGT6U,UACC7U,OAAQ,2BAETi4B,YACCqG,cAAe,SAAUj+B,GAExB,MADA9E,GAAOuE,WAAYO,GACZA,MAMV9E,EAAOo+B,cAAe,SAAU,SAAUjC,GACxB/4B,SAAZ+4B,EAAExvB,QACNwvB,EAAExvB,OAAQ,GAENwvB,EAAE4D,cACN5D,EAAEr4B,KAAO,SAKX9D,EAAOq+B,cAAe,SAAU,SAAUlC,GAGzC,GAAKA,EAAE4D,YAAc,CACpB,GAAIt7B,GAAQ/C,CACZ,QACC6+B,KAAM,SAAU/1B,EAAG4qB,GAClB3wB,EAASzE,EAAQ,YAAaqf,MAC7B2jB,QAAS7G,EAAE8G,cACXtgC,IAAKw5B,EAAEmB,MACJhZ,GACH,aACA5iB,EAAW,SAAUwhC,GACpBz+B,EAAO8W,SACP7Z,EAAW,KACNwhC,GACJ9N,EAAuB,UAAb8N,EAAIp/B,KAAmB,IAAM,IAAKo/B,EAAIp/B,QAMnD/E,EAASgG,KAAKC,YAAaP,EAAQ,KAEpCi7B,MAAO,WACDh+B,GACJA,QAUL,IAAIyhC,OACHC,GAAS,mBAGVpjC,GAAOk+B,WACNmF,MAAO,WACPC,cAAe,WACd,GAAI5hC,GAAWyhC,GAAa36B,OAAWxI,EAAOqD,QAAU,IAAQ82B,IAEhE,OADAh7B,MAAMuC,IAAa,EACZA,KAKT1B,EAAOo+B,cAAe,aAAc,SAAUjC,EAAGoH,EAAkB9H,GAElE,GAAI+H,GAAcC,EAAaC,EAC9BC,EAAWxH,EAAEkH,SAAU,IAAWD,GAAOn3B,KAAMkwB,EAAEmB,KAChD,MACkB,gBAAXnB,GAAE/c,MAE6C,KADnD+c,EAAEwB,aAAe,IACjBl+B,QAAS,sCACX2jC,GAAOn3B,KAAMkwB,EAAE/c,OAAU,OAI5B,OAAKukB,IAAiC,UAArBxH,EAAEZ,UAAW,IAG7BiI,EAAerH,EAAEmH,cAAgBtjC,EAAOiD,WAAYk5B,EAAEmH,eACrDnH,EAAEmH,gBACFnH,EAAEmH,cAGEK,EACJxH,EAAGwH,GAAaxH,EAAGwH,GAAWngC,QAAS4/B,GAAQ,KAAOI,GAC3CrH,EAAEkH,SAAU,IACvBlH,EAAEmB,MAASlD,GAAOnuB,KAAMkwB,EAAEmB,KAAQ,IAAM,KAAQnB,EAAEkH,MAAQ,IAAMG,GAIjErH,EAAEO,WAAY,eAAkB,WAI/B,MAHMgH,IACL1jC,EAAO0D,MAAO8/B,EAAe,mBAEvBE,EAAmB,IAI3BvH,EAAEZ,UAAW,GAAM,OAGnBkI,EAAcvkC,EAAQskC,GACtBtkC,EAAQskC,GAAiB,WACxBE,EAAoB3hC,WAIrB05B,EAAMzf,OAAQ,WAGQ5Y,SAAhBqgC,EACJzjC,EAAQd,GAAS+4B,WAAYuL,GAI7BtkC,EAAQskC,GAAiBC,EAIrBtH,EAAGqH,KAGPrH,EAAEmH,cAAgBC,EAAiBD,cAGnCH,GAAa3jC,KAAMgkC,IAIfE,GAAqB1jC,EAAOiD,WAAYwgC,IAC5CA,EAAaC,EAAmB,IAGjCA,EAAoBD,EAAcrgC,SAI5B,UA9DR,SAyEDpD,EAAOiZ,UAAY,SAAUmG,EAAMlf,EAAS0jC,GAC3C,IAAMxkB,GAAwB,gBAATA,GACpB,MAAO,KAEgB,kBAAZlf,KACX0jC,EAAc1jC,EACdA,GAAU,GAEXA,EAAUA,GAAWnB,CAErB,IAAI8kC,GAASlrB,EAAWhN,KAAMyT,GAC7B+D,GAAWygB,KAGZ,OAAKC,IACK3jC,EAAQ2E,cAAeg/B,EAAQ,MAGzCA,EAAS3gB,IAAiB9D,GAAQlf,EAASijB,GAEtCA,GAAWA,EAAQpiB,QACvBf,EAAQmjB,GAAU5H,SAGZvb,EAAOuB,SAAWsiC,EAAO94B,aAKjC,IAAI+4B,IAAQ9jC,EAAOG,GAAGgoB,IAKtBnoB,GAAOG,GAAGgoB,KAAO,SAAUmV,EAAKyG,EAAQriC,GACvC,GAAoB,gBAAR47B,IAAoBwG,GAC/B,MAAOA,IAAMhiC,MAAO3C,KAAM4C,UAG3B,IAAI9B,GAAU6D,EAAM84B,EACnB7jB,EAAO5Z,KACP4e,EAAMuf,EAAI79B,QAAS,IAsDpB,OApDKse,GAAM,KACV9d,EAAWD,EAAO4E,KAAM04B,EAAIh+B,MAAOye,IACnCuf,EAAMA,EAAIh+B,MAAO,EAAGye,IAIhB/d,EAAOiD,WAAY8gC,IAGvBriC,EAAWqiC,EACXA,EAAS3gC,QAGE2gC,GAA4B,gBAAXA,KAC5BjgC,EAAO,QAIHiV,EAAKhY,OAAS,GAClBf,EAAOs+B,MACNhB,IAAKA,EAKLx5B,KAAMA,GAAQ,MACdw3B,SAAU,OACVlc,KAAM2kB,IACHh8B,KAAM,SAAU86B,GAGnBjG,EAAW76B,UAEXgX,EAAK2R,KAAMzqB,EAIVD,EAAQ,SAAUorB,OAAQprB,EAAOiZ,UAAW4pB,IAAiBj0B,KAAM3O,GAGnE4iC,KAKE7mB,OAAQta,GAAY,SAAU+5B,EAAOgE,GACxC1mB,EAAKtX,KAAM,WACVC,EAASI,MAAO3C,KAAMy9B,IAAcnB,EAAMoH,aAAcpD,EAAQhE,QAK5Dt8B,MAORa,EAAOyB,MACN,YACA,WACA,eACA,YACA,cACA,YACE,SAAUI,EAAGiC,GACf9D,EAAOG,GAAI2D,GAAS,SAAU3D,GAC7B,MAAOhB,MAAKmlB,GAAIxgB,EAAM3D,MAOxBH,EAAOkQ,KAAK8E,QAAQgvB,SAAW,SAAUpiC,GACxC,MAAO5B,GAAO6F,KAAM7F,EAAOk2B,OAAQ,SAAU/1B,GAC5C,MAAOyB,KAASzB,EAAGyB,OAChBb,OASL,SAASkjC,IAAWriC,GACnB,MAAO5B,GAAOgE,SAAUpC,GAASA,EAAyB,IAAlBA,EAAKyC,UAAkBzC,EAAKwM,YAGrEpO,EAAOkkC,QACNC,UAAW,SAAUviC,EAAMa,EAASZ,GACnC,GAAIuiC,GAAaC,EAASC,EAAWC,EAAQC,EAAWC,EAAYC,EACnE5V,EAAW9uB,EAAOkhB,IAAKtf,EAAM,YAC7B+iC,EAAU3kC,EAAQ4B,GAClBklB,IAGiB,YAAbgI,IACJltB,EAAKigB,MAAMiN,SAAW,YAGvB0V,EAAYG,EAAQT,SACpBI,EAAYtkC,EAAOkhB,IAAKtf,EAAM,OAC9B6iC,EAAazkC,EAAOkhB,IAAKtf,EAAM,QAC/B8iC,GAAmC,aAAb5V,GAAwC,UAAbA,KAC9CwV,EAAYG,GAAahlC,QAAS,QAAW,GAI3CilC,GACJN,EAAcO,EAAQ7V,WACtByV,EAASH,EAAY/1B,IACrBg2B,EAAUD,EAAY7S,OAGtBgT,EAASpgC,WAAYmgC,IAAe,EACpCD,EAAUlgC,WAAYsgC,IAAgB,GAGlCzkC,EAAOiD,WAAYR,KAGvBA,EAAUA,EAAQxB,KAAMW,EAAMC,EAAG7B,EAAOwC,UAAYgiC,KAGjC,MAAf/hC,EAAQ4L,MACZyY,EAAMzY,IAAQ5L,EAAQ4L,IAAMm2B,EAAUn2B,IAAQk2B,GAE1B,MAAhB9hC,EAAQ8uB,OACZzK,EAAMyK,KAAS9uB,EAAQ8uB,KAAOiT,EAAUjT,KAAS8S,GAG7C,SAAW5hC,GACfA,EAAQmiC,MAAM3jC,KAAMW,EAAMklB,GAG1B6d,EAAQzjB,IAAK4F,KAKhB9mB,EAAOG,GAAGqC,QACT0hC,OAAQ,SAAUzhC,GACjB,GAAKV,UAAUhB,OACd,MAAmBqC,UAAZX,EACNtD,KACAA,KAAKsC,KAAM,SAAUI,GACpB7B,EAAOkkC,OAAOC,UAAWhlC,KAAMsD,EAASZ,IAI3C,IAAI2F,GAASq9B,EACZjjC,EAAOzC,KAAM,GACb2lC,GAAQz2B,IAAK,EAAGkjB,KAAM,GACtBpjB,EAAMvM,GAAQA,EAAK8J,aAEpB,IAAMyC,EAON,MAHA3G,GAAU2G,EAAIJ,gBAGR/N,EAAO4H,SAAUJ,EAAS5F,IAIhCkjC,EAAMljC,EAAK0vB,wBACXuT,EAAMZ,GAAW91B,IAEhBE,IAAKy2B,EAAIz2B,IAAMw2B,EAAIE,YAAcv9B,EAAQugB,UACzCwJ,KAAMuT,EAAIvT,KAAOsT,EAAIG,YAAcx9B,EAAQmgB,aAPpCmd,GAWThW,SAAU,WACT,GAAM3vB,KAAM,GAAZ,CAIA,GAAI8lC,GAAcf,EACjBtiC,EAAOzC,KAAM,GACb+lC,GAAiB72B,IAAK,EAAGkjB,KAAM,EA0BhC,OAtBwC,UAAnCvxB,EAAOkhB,IAAKtf,EAAM,YAGtBsiC,EAAStiC,EAAK0vB,yBAKd2T,EAAe9lC,KAAK8lC,eAGpBf,EAAS/kC,KAAK+kC,SACRlkC,EAAOqF,SAAU4/B,EAAc,GAAK,UACzCC,EAAeD,EAAaf,UAI7BgB,EAAa72B,KAAOrO,EAAOkhB,IAAK+jB,EAAc,GAAK,kBAAkB,GACrEC,EAAa3T,MAAQvxB,EAAOkhB,IAAK+jB,EAAc,GAAK,mBAAmB,KAKvE52B,IAAK61B,EAAO71B,IAAM62B,EAAa72B,IAAMrO,EAAOkhB,IAAKtf,EAAM,aAAa,GACpE2vB,KAAM2S,EAAO3S,KAAO2T,EAAa3T,KAAOvxB,EAAOkhB,IAAKtf,EAAM,cAAc,MAc1EqjC,aAAc,WACb,MAAO9lC,MAAKwC,IAAK,WAChB,GAAIsjC,GAAe9lC,KAAK8lC,YAExB,OAAQA,GAA2D,WAA3CjlC,EAAOkhB,IAAK+jB,EAAc,YACjDA,EAAeA,EAAaA,YAG7B,OAAOA,IAAgBl3B,QAM1B/N,EAAOyB,MAAQimB,WAAY,cAAeI,UAAW,eAAiB,SAAUgY,EAAQzgB,GACvF,GAAIhR,GAAM,gBAAkBgR,CAE5Brf,GAAOG,GAAI2/B,GAAW,SAAUzvB,GAC/B,MAAOgO,GAAQlf,KAAM,SAAUyC,EAAMk+B,EAAQzvB,GAC5C,GAAIw0B,GAAMZ,GAAWriC,EAErB,OAAawB,UAARiN,EACGw0B,EAAMA,EAAKxlB,GAASzd,EAAMk+B,QAG7B+E,EACJA,EAAIM,SACF92B,EAAYw2B,EAAIG,YAAV30B,EACPhC,EAAMgC,EAAMw0B,EAAIE,aAIjBnjC,EAAMk+B,GAAWzvB,IAEhByvB,EAAQzvB,EAAKtO,UAAUhB,WAU5Bf,EAAOyB,MAAQ,MAAO,QAAU,SAAUI,EAAGwd,GAC5Crf,EAAOqwB,SAAUhR,GAASoP,GAAc3uB,EAAQguB,cAC/C,SAAUlsB,EAAMysB,GACf,MAAKA,IACJA,EAAWD,GAAQxsB,EAAMyd,GAGlBqN,GAAUzgB,KAAMoiB,GACtBruB,EAAQ4B,GAAOktB,WAAYzP,GAAS,KACpCgP,GANF,WAcHruB,EAAOyB,MAAQ2jC,OAAQ,SAAUC,MAAO,SAAW,SAAU3iC,EAAMoB,GAClE9D,EAAOyB,MAAQgwB,QAAS,QAAU/uB,EAAMknB,QAAS9lB,EAAMwhC,GAAI,QAAU5iC,GACpE,SAAU6iC,EAAcC,GAGxBxlC,EAAOG,GAAIqlC,GAAa,SAAUhU,EAAQrrB,GACzC,GAAImY,GAAYvc,UAAUhB,SAAYwkC,GAAkC,iBAAX/T,IAC5D7B,EAAQ4V,IAAkB/T,KAAW,GAAQrrB,KAAU,EAAO,SAAW,SAE1E,OAAOkY,GAAQlf,KAAM,SAAUyC,EAAMkC,EAAMqC,GAC1C,GAAIgI,EAEJ,OAAKnO,GAAOgE,SAAUpC,GAKdA,EAAK7C,SAASgP,gBAAiB,SAAWrL,GAI3B,IAAlBd,EAAKyC,UACT8J,EAAMvM,EAAKmM,gBAIJzK,KAAKmsB,IACX7tB,EAAK2lB,KAAM,SAAW7kB,GAAQyL,EAAK,SAAWzL,GAC9Cd,EAAK2lB,KAAM,SAAW7kB,GAAQyL,EAAK,SAAWzL,GAC9CyL,EAAK,SAAWzL,KAIDU,SAAV+C,EAGNnG,EAAOkhB,IAAKtf,EAAMkC,EAAM6rB,GAGxB3vB,EAAO6hB,MAAOjgB,EAAMkC,EAAMqC,EAAOwpB,IAChC7rB,EAAMwa,EAAYkT,EAASpuB,OAAWkb,EAAW,WAMvDte,EAAOG,GAAGqC,QAETijC,KAAM,SAAUlhB,EAAOnF,EAAMjf,GAC5B,MAAOhB,MAAKmlB,GAAIC,EAAO,KAAMnF,EAAMjf,IAEpCulC,OAAQ,SAAUnhB,EAAOpkB,GACxB,MAAOhB,MAAK4e,IAAKwG,EAAO,KAAMpkB,IAG/BwlC,SAAU,SAAU1lC,EAAUskB,EAAOnF,EAAMjf,GAC1C,MAAOhB,MAAKmlB,GAAIC,EAAOtkB,EAAUmf,EAAMjf,IAExCylC,WAAY,SAAU3lC,EAAUskB,EAAOpkB,GAGtC,MAA4B,KAArB4B,UAAUhB,OAChB5B,KAAK4e,IAAK9d,EAAU,MACpBd,KAAK4e,IAAKwG,EAAOtkB,GAAY,KAAME,IAErC0lC,KAAM,WACL,MAAO1mC,MAAK4B,UAIdf,EAAOG,GAAG2lC,QAAU9lC,EAAOG,GAAG6Z,QAkBP,kBAAX+rB,SAAyBA,OAAOC,KAC3CD,OAAQ,YAAc,WACrB,MAAO/lC,IAMT,IAGCimC,IAAU/mC,EAAOc,OAGjBkmC,GAAKhnC,EAAOinC,CAqBb,OAnBAnmC,GAAOomC,WAAa,SAAUpjC,GAS7B,MARK9D,GAAOinC,IAAMnmC,IACjBd,EAAOinC,EAAID,IAGPljC,GAAQ9D,EAAOc,SAAWA,IAC9Bd,EAAOc,OAASimC,IAGVjmC,GAMFZ,IACLF,EAAOc,OAASd,EAAOinC,EAAInmC,GAGrBA","file":"jquery.min.js"}
\ No newline at end of file
diff --git a/web/core/authorize.php b/web/core/authorize.php
index 073770a07..a72e0ac68 100644
--- a/web/core/authorize.php
+++ b/web/core/authorize.php
@@ -116,10 +116,10 @@ if ($is_allowed) {
       drupal_set_message($results['page_message']['message'], $results['page_message']['type']);
     }
 
-    $content['authorize_report'] = array(
+    $content['authorize_report'] = [
       '#theme' => 'authorize_report',
       '#messages' => $results['messages'],
-    );
+    ];
 
     if (is_array($results['tasks'])) {
       $links = $results['tasks'];
@@ -148,11 +148,11 @@ if ($is_allowed) {
       ];
     }
 
-    $content['next_steps'] = array(
+    $content['next_steps'] = [
       '#theme' => 'item_list',
       '#items' => $links,
       '#title' => t('Next steps'),
-    );
+    ];
   }
   // If a batch is running, let it run.
   elseif ($request->query->has('batch')) {
@@ -189,9 +189,9 @@ else {
 }
 
 $bare_html_page_renderer = \Drupal::service('bare_html_page_renderer');
-$response = $bare_html_page_renderer->renderBarePage($content, $page_title, 'maintenance_page', array(
+$response = $bare_html_page_renderer->renderBarePage($content, $page_title, 'maintenance_page', [
   '#show_messages' => $show_messages,
-));
+]);
 if (!$is_allowed) {
   $response->setStatusCode(403);
 }
diff --git a/web/core/composer.json b/web/core/composer.json
index 6782469d6..4cdea59f3 100644
--- a/web/core/composer.json
+++ b/web/core/composer.json
@@ -19,7 +19,7 @@
         "symfony/polyfill-iconv": "~1.0",
         "symfony/yaml": "~2.8",
         "twig/twig": "^1.23.1",
-        "doctrine/common": "2.5.*",
+        "doctrine/common": "^2.5",
         "doctrine/annotations": "1.2.*",
         "guzzlehttp/guzzle": "^6.2.1",
         "symfony-cmf/routing": "~1.4",
@@ -28,19 +28,21 @@
         "stack/builder": "1.0.*",
         "egulias/email-validator": "1.2.*",
         "masterminds/html5": "~2.1",
-        "symfony/psr-http-message-bridge": "v0.2",
+        "symfony/psr-http-message-bridge": "^1.0",
         "zendframework/zend-diactoros": "~1.1",
         "composer/semver": "~1.0",
-        "paragonie/random_compat": "^1|^2",
+        "paragonie/random_compat": "^1.0|^2.0",
         "asm89/stack-cors": "~1.0"
     },
     "require-dev": {
-        "behat/mink": "~1.7",
+        "behat/mink": "1.7.x-dev",
         "behat/mink-goutte-driver": "~1.2",
+        "drupal/coder": "8.2.12",
         "jcalderonzumba/gastonjs": "~1.0.2",
         "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
         "mikey179/vfsStream": "~1.2",
         "phpunit/phpunit": ">=4.8.28 <5",
+        "symfony/browser-kit": ">=2.8.13 <3.0",
         "symfony/css-selector": "~2.8"
     },
     "replace": {
@@ -94,6 +96,7 @@
         "drupal/editor": "self.version",
         "drupal/entity_reference": "self.version",
         "drupal/field": "self.version",
+        "drupal/field_layout": "self.version",
         "drupal/field_ui": "self.version",
         "drupal/file": "self.version",
         "drupal/filter": "self.version",
@@ -104,6 +107,7 @@
         "drupal/image": "self.version",
         "drupal/inline_form_errors": "self.version",
         "drupal/language": "self.version",
+        "drupal/layout_discovery": "self.version",
         "drupal/link": "self.version",
         "drupal/locale": "self.version",
         "drupal/minimal": "self.version",
@@ -140,7 +144,8 @@
         "drupal/update": "self.version",
         "drupal/user": "self.version",
         "drupal/views": "self.version",
-        "drupal/views_ui": "self.version"
+        "drupal/views_ui": "self.version",
+        "drupal/workflows": "self.version"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -166,6 +171,9 @@
     },
     "scripts": {
         "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
-        "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess"
+        "post-autoload-dump": [
+          "Drupal\\Core\\Composer\\Composer::ensureHtaccess",
+          "Drupal\\Core\\Composer\\Composer::configurePhpcs"
+        ]
     }
 }
diff --git a/web/core/config/install/core.extension.yml b/web/core/config/install/core.extension.yml
index ce74baed1..659446cc6 100644
--- a/web/core/config/install/core.extension.yml
+++ b/web/core/config/install/core.extension.yml
@@ -1,2 +1,3 @@
 module: {}
 theme: {}
+profile: ''
diff --git a/web/core/config/schema/core.data_types.schema.yml b/web/core/config/schema/core.data_types.schema.yml
index 73db36182..eeac1aea0 100644
--- a/web/core/config/schema/core.data_types.schema.yml
+++ b/web/core/config/schema/core.data_types.schema.yml
@@ -361,6 +361,13 @@ display_variant.plugin:
       type: string
       label: 'UUID'
 
+layout_plugin.settings:
+  type: mapping
+  label: 'Layout settings'
+
+layout_plugin.settings.*:
+  type: layout_plugin.settings
+
 base_entity_reference_field_settings:
   type: mapping
   mapping:
@@ -480,7 +487,7 @@ field.value.string:
   label: 'Default value'
   mapping:
     value:
-      type: string
+      type: label
       label: 'Value'
 
 # Schema for the configuration of the  String (long) field type.
diff --git a/web/core/config/schema/core.entity.schema.yml b/web/core/config/schema/core.entity.schema.yml
index bf0e12d93..df2a2fd02 100644
--- a/web/core/config/schema/core.entity.schema.yml
+++ b/web/core/config/schema/core.entity.schema.yml
@@ -64,6 +64,9 @@ core.entity_view_display.*.*.*:
           weight:
             type: integer
             label: 'Weight'
+          region:
+            type: string
+            label: 'Region'
           label:
              type: string
              label: 'Label setting machine name'
@@ -115,6 +118,9 @@ core.entity_form_display.*.*.*:
           weight:
             type: integer
             label: 'Weight'
+          region:
+            type: string
+            label: 'Region'
           settings:
             type: field.widget.settings.[%parent.type]
             label: 'Settings'
@@ -249,10 +255,10 @@ field.formatter.settings.boolean:
       type: string
       label: 'Output format'
     format_custom_false:
-      type: string
+      type: label
       label: 'Custom output for FALSE'
     format_custom_true:
-      type: string
+      type: label
       label: 'Custom output for TRUE'
 
 field.formatter.settings.string:
diff --git a/web/core/config/schema/core.extension.schema.yml b/web/core/config/schema/core.extension.schema.yml
index bdc84b9fe..087e2e3b9 100644
--- a/web/core/config/schema/core.extension.schema.yml
+++ b/web/core/config/schema/core.extension.schema.yml
@@ -14,3 +14,6 @@ core.extension:
       sequence:
         type: integer
         label: 'Weight'
+    profile:
+      type: string
+      label: 'Install profile'
diff --git a/web/core/core.api.php b/web/core/core.api.php
index eb16ee098..7c4ebf40b 100644
--- a/web/core/core.api.php
+++ b/web/core/core.api.php
@@ -1272,7 +1272,7 @@
  *   site; CSS files, which alter the styling applied to the HTML; and
  *   JavaScript, Flash, images, and other files. For more information, see the
  *   @link theme_render Theme system and render API topic @endlink and
- *   https://www.drupal.org/theme-guide/8
+ *   https://www.drupal.org/docs/8/theming
  * - Modules: Modules add to or alter the behavior and functionality of Drupal,
  *   by using one or more of the methods listed below. For more information
  *   about creating modules, see https://www.drupal.org/developing/modules/8
@@ -1768,8 +1768,8 @@
  * processing state.
  *
  * The argument to \Drupal::formBuilder()->getForm() is the name of a class that
- * implements FormBuilderInterface. Any additional arguments passed to the
- * getForm() method will be passed along as additional arguments to the
+ * implements FormInterface. Any additional arguments passed to the getForm()
+ * method will be passed along as additional arguments to the
  * ExampleForm::buildForm() method.
  *
  * For example:
@@ -2103,39 +2103,39 @@ function hook_mail_alter(&$message) {
 function hook_mail($key, &$message, $params) {
   $account = $params['account'];
   $context = $params['context'];
-  $variables = array(
+  $variables = [
     '%site_name' => \Drupal::config('system.site')->get('name'),
     '%username' => $account->getDisplayName(),
-  );
+  ];
   if ($context['hook'] == 'taxonomy') {
     $entity = $params['entity'];
     $vocabulary = Vocabulary::load($entity->id());
-    $variables += array(
+    $variables += [
       '%term_name' => $entity->name,
       '%term_description' => $entity->description,
       '%term_id' => $entity->id(),
       '%vocabulary_name' => $vocabulary->label(),
       '%vocabulary_description' => $vocabulary->getDescription(),
       '%vocabulary_id' => $vocabulary->id(),
-    );
+    ];
   }
 
   // Node-based variable translation is only available if we have a node.
   if (isset($params['node'])) {
     /** @var \Drupal\node\NodeInterface $node */
     $node = $params['node'];
-    $variables += array(
+    $variables += [
       '%uid' => $node->getOwnerId(),
-      '%url' => $node->url('canonical', array('absolute' => TRUE)),
+      '%url' => $node->url('canonical', ['absolute' => TRUE]),
       '%node_type' => node_get_type_label($node),
       '%title' => $node->getTitle(),
       '%teaser' => $node->teaser,
       '%body' => $node->body,
-    );
+    ];
   }
   $subject = strtr($context['subject'], $variables);
   $body = strtr($context['message'], $variables);
-  $message['subject'] .= str_replace(array("\r", "\n"), '', $subject);
+  $message['subject'] .= str_replace(["\r", "\n"], '', $subject);
   $message['body'][] = MailFormatHelper::htmlToText($body);
 }
 
@@ -2178,6 +2178,17 @@ function hook_display_variant_plugin_alter(array &$definitions) {
   $definitions['full_page']['admin_label'] = t('Block layout');
 }
 
+/**
+ * Allow modules to alter layout plugin definitions.
+ *
+ * @param \Drupal\Core\Layout\LayoutDefinition[] $definitions
+ *   The array of layout definitions, keyed by plugin ID.
+ */
+function hook_layout_alter(&$definitions) {
+  // Remove a layout.
+  unset($definitions['twocol']);
+}
+
 /**
  * Flush all persistent and static caches.
  *
diff --git a/web/core/core.libraries.yml b/web/core/core.libraries.yml
index ce12db520..5da51e8ae 100644
--- a/web/core/core.libraries.yml
+++ b/web/core/core.libraries.yml
@@ -24,10 +24,10 @@ classList:
 
 ckeditor:
   remote: https://github.com/ckeditor/ckeditor-dev
-  version: "4.5.11"
+  version: "4.6.2"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://github.com/ckeditor/ckeditor-dev/blob/4.5.11/LICENSE.md
+    url: https://github.com/ckeditor/ckeditor-dev/blob/4.6.2/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor/ckeditor.js: { preprocess: false, minified: true }
@@ -46,6 +46,7 @@ drupal:
   version: VERSION
   js:
     misc/drupal.js: { weight: -18 }
+    misc/drupal.init.js: { weight: -17 }
   dependencies:
     - core/domready
     - core/drupalSettings
@@ -203,6 +204,13 @@ drupal.dropbutton:
     - core/drupalSettings
     - core/jquery.once
 
+drupal.entity-form:
+  version: VERSION
+  js:
+    misc/entity-form.js: {}
+  dependencies:
+    - core/drupal.form
+
 drupal.form:
   version: VERSION
   js:
@@ -333,10 +341,10 @@ html5shiv:
 
 jquery:
   remote: https://github.com/jquery/jquery
-  version: "2.2.3"
+  version: "2.2.4"
   license:
     name: MIT
-    url: https://github.com/jquery/jquery/blob/2.2.3/MIT-LICENSE.txt
+    url: https://github.com/jquery/jquery/blob/2.2.4/LICENSE.txt
     gpl-compatible: true
   js:
     assets/vendor/jquery/jquery.min.js: { minified: true, weight: -20 }
diff --git a/web/core/core.link_relation_types.yml b/web/core/core.link_relation_types.yml
new file mode 100644
index 000000000..88fea0e31
--- /dev/null
+++ b/web/core/core.link_relation_types.yml
@@ -0,0 +1,293 @@
+# Drupal core's extension relation types.
+# See https://tools.ietf.org/html/rfc5988#section-4.2.
+add-form:
+  uri: https://drupal.org/link-relations/add-form
+  description: A form where a resource of this type can be created.
+delete-form:
+  uri: https://drupal.org/link-relations/delete-form
+  description: A form where a resource of this type can be deleted.
+revision:
+  uri: https://drupal.org/link-relations/revision
+  description: A particular version of this resource.
+create:
+  uri: https://drupal.org/link-relations/create
+  description: A REST resource URL where a resource of this type can be created.
+enable:
+  uri: https://drupal.org/link-relations/enable
+  description: A REST resource URL where a resource of this type can be enabled.
+disable:
+  uri: https://drupal.org/link-relations/disable
+  description: A REST resource URL where a resource of this type can be disabled.
+edit-permissions-form:
+  uri: https://drupal.org/link-relations/edit-permissions-form
+  description: A form where permissions assigned to a resource of this type can be edited.
+overview-form:
+  uri: https://drupal.org/link-relations/overview-form
+  description: A form where an overview of the collection of resources belonging to a resource of this type can be edited in bulk.
+reset-form:
+  uri: https://drupal.org/link-relations/reset-form
+  description: A form where an overview of the collection of resources belonging to a resource of this type can be reset.
+cancel-form:
+  uri: https://drupal.org/link-relations/cancel-form
+  description: A form where a resource of this type can be canceled.
+flush-form:
+  uri: https://drupal.org/link-relations/flush-form
+  description: A form where a resource of this type can be flushed.
+
+# All registered relation types.
+# See https://tools.ietf.org/html/rfc5988#section-4.1.
+# See https://www.iana.org/assignments/link-relations/link-relations.xhtml.
+about:
+  description: "Refers to a resource that is the subject of the link's context."
+  reference: '[RFC6903], section 2'
+alternate:
+  description: 'Refers to a substitute for this context'
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-alternate]'
+appendix:
+  description: 'Refers to an appendix.'
+  reference: '[http://www.w3.org/TR/1999/REC-html401-19991224]'
+archives:
+  description: "Refers to a collection of records, documents, or other materials of historical interest."
+  reference: '[http://www.w3.org/TR/2011/WD-html5-20110113/links.html#rel-archives]'
+author:
+  description: "Refers to the context's author."
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-author]'
+blocked-by:
+  description: "Identifies the entity that blocks access to a resource following receipt of a legal demand."
+  reference: '[RFC7725]'
+bookmark:
+  description: 'Gives a permanent link to use for bookmarking purposes.'
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-bookmark]'
+canonical:
+  description: 'Designates the preferred version of a resource (the IRI and its contents).'
+  reference: '[RFC6596]'
+chapter:
+  description: 'Refers to a chapter in a collection of resources.'
+  reference: '[http://www.w3.org/TR/1999/REC-html401-19991224]'
+collection:
+  description: 'The target IRI points to a resource which represents the collection resource for the context IRI.'
+  reference: '[RFC6573]'
+contents:
+  description: 'Refers to a table of contents.'
+  reference: '[http://www.w3.org/TR/1999/REC-html401-19991224]'
+copyright:
+  description: "Refers to a copyright statement that applies to the link's context."
+  reference: '[http://www.w3.org/TR/1999/REC-html401-19991224]'
+create-form:
+  description: 'The target IRI points to a resource where a submission form can be obtained.'
+  reference: '[RFC6861]'
+current:
+  description: "Refers to a resource containing the most recent item(s) in a collection of resources."
+  reference: '[RFC5005]'
+derivedfrom:
+  description: 'The target IRI points to a resource from which this material was derived.'
+  reference: '[draft-hoffman-xml2rfc]'
+describedby:
+  description: "Refers to a resource providing information about the link's context."
+  reference: '[http://www.w3.org/TR/powder-dr/#assoc-linking]'
+describes:
+  description: "The relationship A 'describes' B asserts that resource A provides a description of resource B. There are no constraints on the format or representation of either A or B, neither are there any further constraints on either resource."
+  reference: '[RFC6892]'
+  notes: "This link relation type is the inverse of the 'describedby' relation type.  While 'describedby' establishes a relation from the described resource back to the resource that describes it, 'describes' established a relation from the describing resource to the resource it describes.  If B is 'describedby' A, then A 'describes' B."
+disclosure:
+  description: "Refers to a list of patent disclosures made with respect to  material for which 'disclosure' relation is specified."
+  reference: '[RFC6579]'
+dns-prefetch:
+  description: "Used to indicate an origin that will be used to fetch required  resources for the link context, and that the user agent ought to resolve  as early as possible."
+  reference: '[https://www.w3.org/TR/resource-hints/]'
+duplicate:
+  description: "Refers to a resource whose available representations are byte-for-byte identical with the corresponding representations of the context IRI."
+  reference: '[RFC6249]'
+  notes: "This relation is for static resources.  That is, an HTTP GET request on any duplicate will return the same representation.  It does not make sense for dynamic or POSTable resources and should not be used for them."
+edit:
+  description: "Refers to a resource that can be used to edit the link's context."
+  reference: '[RFC5023]'
+edit-form:
+  description: "The target IRI points to a resource where a submission form for editing associated resource can be obtained."
+  reference: '[RFC6861]'
+edit-media:
+  description: "Refers to a resource that can be used to edit media associated with the link's context."
+  reference: '[RFC5023]'
+enclosure:
+  description: "Identifies a related resource that is potentially large and might require special handling."
+  reference: '[RFC4287]'
+first:
+  description: "An IRI that refers to the furthest preceding resource in a series of resources."
+  reference: '[RFC5988]'
+  notes: "This relation type registration did not indicate a reference.  Originally requested by Mark Nottingham in December 2004."
+glossary:
+  description: 'Refers to a glossary of terms.'
+  reference: '[http://www.w3.org/TR/1999/REC-html401-19991224]'
+help:
+  description: 'Refers to context-sensitive help.'
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-help]'
+hosts:
+  description: "Refers to a resource hosted by the server indicated by the link context."
+  reference: '[RFC6690]'
+  notes: "This relation is used in CoRE where links are retrieved as a \"/.well-known/core\" resource representation, and is the default relation type in the CoRE Link Format."
+hub:
+  description: "Refers to a hub that enables registration for notification of updates to the context."
+  reference: '[http://pubsubhubbub.googlecode.com]'
+  notes: 'This relation type was requested by Brett Slatkin.'
+icon:
+  description: "Refers to an icon representing the link's context."
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-icon]'
+index:
+  description: 'Refers to an index.'
+  reference: '[http://www.w3.org/TR/1999/REC-html401-19991224]'
+item:
+  description: 'The target IRI points to a resource that is a member of the collection represented by the context IRI.'
+  reference: '[RFC6573]'
+last:
+  description: "An IRI that refers to the furthest following resource in a series of resources."
+  reference: '[RFC5988]'
+  notes: "This relation type registration did not indicate a reference. Originally requested by Mark Nottingham in December 2004."
+latest-version:
+  description: "Points to a resource containing the latest (e.g., current) version of the context."
+  reference: '[RFC5829]'
+license:
+  description: 'Refers to a license associated with this context.'
+  reference: '[RFC4946]'
+  notes: "For implications of use in HTML, see:  http://www.w3.org/TR/html5/links.html#link-type-license"
+lrdd:
+  description: "Refers to further information about the link's context, expressed as a LRDD (\"Link-based Resource Descriptor Document\") resource.  See [RFC6415] for information about processing this relation type in host-meta documents. When used elsewhere, it refers to additional links and other metadata. Multiple instances indicate additional LRDD resources. LRDD resources MUST have an \"application/xrd+xml\" representation, and MAY have others."
+  reference: '[RFC6415]'
+memento:
+  description: 'The Target IRI points to a Memento, a fixed resource that will not change state anymore.'
+  reference: '[RFC7089]'
+  notes: "A Memento for an Original Resource is a resource that encapsulates a prior state of the Original Resource."
+monitor:
+  description: 'Refers to a resource that can be used to monitor changes in an HTTP resource.'
+  reference: '[RFC5989]'
+monitor-group:
+  description: 'Refers to a resource that can be used to monitor changes in a specified group of HTTP resources.'
+  reference: '[RFC5989]'
+next:
+  description: "Indicates that the link's context is a part of a series, and that the next in the series is the link target."
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-next]'
+next-archive:
+  description: 'Refers to the immediately following archive resource.'
+  reference: '[RFC5005]'
+nofollow:
+  description: 'Indicates that the context’s original author or publisher does not endorse the link target.'
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-nofollow]'
+noreferrer:
+  description: 'Indicates that no referrer information is to be leaked when following the link.'
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-noreferrer]'
+original:
+  description: 'The Target IRI points to an Original Resource.'
+  reference: '[RFC7089]'
+  notes: "An Original Resource is a resource that exists or used to exist, and for which access to one of its prior states may be required."
+payment:
+  description: 'Indicates a resource where payment is accepted.'
+  reference: '[RFC5988]'
+  notes: "This relation type registration did not indicate a reference.  Requested by Joshua Kinberg and Robert Sayre.  It is meant as a general way to facilitate acts of payment, and thus this specification makes no assumptions on the type of payment or transaction protocol.  Examples may include a web page where donations are accepted or where goods and services are available for purchase. rel=\"payment\" is not intended to initiate an automated transaction.  In Atom documents, a link element with a rel=\"payment\" attribute may exist at the feed/channel level and/or the entry/item level.  For example, a rel=\"payment\" link at the feed/channel level may point to a \"tip jar\" URI, whereas an entry/ item containing a book review may include a rel=\"payment\" link that points to the location where the book may be purchased through an online retailer."
+pingback:
+  description: 'Gives the address of the pingback resource for the link context.'
+  reference: '[http://www.hixie.ch/specs/pingback/pingback]'
+preconnect:
+  description: "Used to indicate an origin that will be used to fetch required  resources for the link context. Initiating an early connection, which  includes the DNS lookup, TCP handshake, and optional TLS negotiation,  allows the user agent to mask the high latency costs of establishing a  connection."
+  reference: '[https://www.w3.org/TR/resource-hints/]'
+predecessor-version:
+  description: "Points to a resource containing the predecessor version in the version history."
+  reference: '[RFC5829]'
+prefetch:
+  description: "The prefetch link relation type is used to identify a resource  that might be required by the next navigation from the link context, and  that the user agent ought to fetch, such that the user agent can deliver a  faster response once the resource is requested in the future."
+  reference: '[http://www.w3.org/TR/resource-hints/]'
+preload:
+  description: "Refers to a resource that should be loaded early in the  processing of the link's context, without blocking rendering."
+  reference: '[http://www.w3.org/TR/preload/]'
+  notes: 'Additional target attributes establish the detailed fetch properties of the link.'
+prerender:
+  description: "Used to identify a resource that might be required by the next  navigation from the link context, and that the user agent ought to fetch  and execute, such that the user agent can deliver a faster response once  the resource is requested in the future."
+  reference: '[https://www.w3.org/TR/resource-hints/]'
+prev:
+  description: "Indicates that the link's context is a part of a series, and that the previous in the series is the link target."
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-prev]'
+preview:
+  description: "Refers to a resource that provides a preview of the link's context."
+  reference: '[RFC6903], section 3'
+previous:
+  description: "Refers to the previous resource in an ordered series of resources.  Synonym for \"prev\"."
+  reference: '[http://www.w3.org/TR/1999/REC-html401-19991224]'
+prev-archive:
+  description: 'Refers to the immediately preceding archive resource.'
+  reference: '[RFC5005]'
+privacy-policy:
+  description: "Refers to a privacy policy associated with the link's context."
+  reference: '[RFC6903], section 4'
+profile:
+  description: "Identifying that a resource representation conforms to a certain profile, without affecting the non-profile semantics of the resource representation."
+  reference: '[RFC6906]'
+  notes: "Profile URIs are primarily intended to be used as identifiers, and thus clients SHOULD NOT indiscriminately access profile URIs."
+related:
+  description: 'Identifies a related resource.'
+  reference: '[RFC4287]'
+replies:
+  description: "Identifies a resource that is a reply to the context of the link."
+  reference: '[RFC4685]'
+search:
+  description: "Refers to a resource that can be used to search through the link's context and related resources."
+  reference: '[http://www.opensearch.org/Specifications/OpenSearch/1.1]'
+section:
+  description: 'Refers to a section in a collection of resources.'
+  reference: '[http://www.w3.org/TR/1999/REC-html401-19991224]'
+self:
+  description: "Conveys an identifier for the link's context."
+  reference: '[RFC4287]'
+set-default:
+  description: "Indicates a URI that can be used to set a resource as the default."
+  reference: '[RFC5023]'
+service:
+  description: "Indicates a URI that can be used to retrieve a service document."
+  reference: '[RFC5023]'
+  notes: "When used in an Atom document, this relation type specifies Atom Publishing Protocol service documents by default.  Requested by James Snell."
+start:
+  description: "Refers to the first resource in a collection of resources."
+  reference: '[http://www.w3.org/TR/1999/REC-html401-19991224]'
+stylesheet:
+  description: 'Refers to a stylesheet.'
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-stylesheet]'
+subsection:
+  description: "Refers to a resource serving as a subsection in a collection of resources."
+  reference: '[http://www.w3.org/TR/1999/REC-html401-19991224]'
+successor-version:
+  description: "Points to a resource containing the successor version in the version history."
+  reference: '[RFC5829]'
+tag:
+  description: "Gives a tag (identified by the given address) that applies to the current document."
+  reference: '[http://www.w3.org/TR/html5/links.html#link-type-tag]'
+terms-of-service:
+  description: "Refers to the terms of service associated with the link's context."
+  reference: '[RFC6903], section 5'
+timegate:
+  description: 'The Target IRI points to a TimeGate for an Original Resource.'
+  reference: '[RFC7089]'
+  notes: "A TimeGate for an Original Resource is a resource that is capable of datetime negotiation to support access to prior states of the Original Resource."
+timemap:
+  description: 'The Target IRI points to a TimeMap for an Original Resource.'
+  reference: '[RFC7089]'
+  notes: "A TimeMap for an Original Resource is a resource from which a list of URIs of Mementos of the Original Resource is available."
+type:
+  description: "Refers to a resource identifying the abstract semantic type of which the link's context is considered to be an instance."
+  reference: '[RFC6903], section 6'
+up:
+  description: "Refers to a parent document in a hierarchy of documents."
+  reference: '[RFC5988]'
+  notes: "This relation type registration did not indicate a reference.  Requested by Noah Slater."
+version-history:
+  description: "Points to a resource containing the version history for the context."
+  reference: '[RFC5829]'
+via:
+  description: "Identifies a resource that is the source of the information in the link's context."
+  reference: '[RFC4287]'
+webmention:
+  description: "Identifies a target URI that supports the Webmention protcol. This allows clients that mention a resource in some form of publishing process to contact that endpoint and inform it that this resource has been mentioned."
+  reference: '[http://www.w3.org/TR/webmention/]'
+  notes: "This is a similar \"Linkback\" mechanism to the ones of Refback, Trackback, and Pingback. It uses a different protocol, though, and thus should be discoverable through its own link relation type."
+working-copy:
+  description: 'Points to a working copy for this resource.'
+  reference: '[RFC5829]'
+working-copy-of:
+  description: "Points to the versioned resource from which this working copy was obtained."
+  reference: '[RFC5829]'
diff --git a/web/core/core.services.yml b/web/core/core.services.yml
index 0b18c3b19..40c6a8a6b 100644
--- a/web/core/core.services.yml
+++ b/web/core/core.services.yml
@@ -93,6 +93,11 @@ services:
     arguments: ['@request_stack']
     tags:
       - { name: cache.context }
+  cache_context.url.path.is_front:
+    class: Drupal\Core\Cache\Context\IsFrontPathCacheContext
+    arguments: ['@path.matcher']
+    tags:
+      - { name: cache.context }
   cache_context.url.query_args:
     class: Drupal\Core\Cache\Context\QueryArgsCacheContext
     arguments: ['@request_stack']
@@ -298,7 +303,7 @@ services:
       - { name: event_subscriber }
   config.installer:
     class: Drupal\Core\Config\ConfigInstaller
-    arguments: ['@config.factory', '@config.storage', '@config.typed', '@config.manager', '@event_dispatcher']
+    arguments: ['@config.factory', '@config.storage', '@config.typed', '@config.manager', '@event_dispatcher', '%install_profile%']
     lazy: true
   config.storage:
     class: Drupal\Core\Config\CachedStorage
@@ -323,7 +328,7 @@ services:
       - { name: backend_overridable }
   config.storage.schema:
     class: Drupal\Core\Config\ExtensionInstallStorage
-    arguments: ['@config.storage', 'config/schema']
+    arguments: ['@config.storage', 'config/schema', '', true, '%install_profile%']
   config.typed:
     class: Drupal\Core\Config\TypedConfigManager
     arguments: ['@config.storage', '@config.storage.schema', '@cache.discovery', '@module_handler']
@@ -346,6 +351,9 @@ services:
     class: Drupal\Core\Database\Connection
     factory: Drupal\Core\Database\Database::getConnection
     arguments: [default]
+  datetime.time:
+    class: Drupal\Component\Datetime\Time
+    arguments: ['@request_stack']
   file_system:
     class: Drupal\Core\File\FileSystem
     arguments: ['@stream_wrapper_manager', '@settings', '@logger.channel.file']
@@ -419,7 +427,9 @@ services:
     factory: Drupal\Core\Site\Settings::getInstance
   state:
     class: Drupal\Core\State\State
-    arguments: ['@keyvalue']
+    arguments: ['@keyvalue', '@cache.bootstrap', '@lock']
+    tags:
+      - { name: needs_destruction }
   queue:
     class: Drupal\Core\Queue\QueueFactory
     arguments: ['@settings']
@@ -454,6 +464,9 @@ services:
   http_client_factory:
     class: Drupal\Core\Http\ClientFactory
     arguments: ['@http_handler_stack']
+  plugin.manager.link_relation_type:
+    class: \Drupal\Core\Http\LinkRelationTypeManager
+    arguments: ['@app.root', '@module_handler', '@cache.discovery']
   theme.negotiator:
     class: Drupal\Core\Theme\ThemeNegotiator
     arguments: ['@access_check.theme']
@@ -609,7 +622,7 @@ services:
     arguments: ['@menu.tree_storage', '@plugin.manager.menu.link', '@router.route_provider', '@menu.active_trail', '@controller_resolver']
   menu.default_tree_manipulators:
     class: Drupal\Core\Menu\DefaultMenuLinkTreeManipulators
-    arguments: ['@access_manager', '@current_user', '@entity.query']
+    arguments: ['@access_manager', '@current_user', '@entity_type.manager']
   menu.active_trail:
     class: Drupal\Core\Menu\MenuActiveTrail
     arguments: ['@plugin.manager.menu.link', '@current_route_match', '@cache.menu', '@lock']
@@ -798,6 +811,7 @@ services:
   router.matcher.final_matcher:
     class: Drupal\Core\Routing\UrlMatcher
     arguments: ['@path.current']
+    deprecated: The "%service_id%" service is deprecated. You should use the 'router.no_access_checks' service instead.
   router.matcher:
     class: Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher
     arguments: ['@router.route_provider']
@@ -805,6 +819,7 @@ services:
       - [setFinalMatcher, ['@router.matcher.final_matcher']]
     tags:
       - { name: service_collector, tag: non_lazy_route_filter, call: addRouteFilter }
+    deprecated: The "%service_id%" service is deprecated. You should use the 'router.no_access_checks' service instead.
   route_filter.lazy_collector:
     class: Drupal\Core\Routing\LazyRouteFilter
     tags:
@@ -843,11 +858,15 @@ services:
     arguments: ['@router.request_context', '@router.matcher', '@url_generator']
     tags:
       - { name: service_collector, tag: non_lazy_route_enhancer, call: addRouteEnhancer }
+    deprecated: The "%service_id%" service is deprecated. You should use the 'router.no_access_checks' service instead.
   router.no_access_checks:
-    class: Symfony\Cmf\Component\Routing\ChainRouter
+    class: \Drupal\Core\Routing\Router
+    arguments: ['@router.route_provider', '@path.current', '@url_generator']
+    tags:
+      - { name: service_collector, tag: non_lazy_route_enhancer, call: addRouteEnhancer }
+      - { name: service_collector, tag: non_lazy_route_filter, call: addRouteFilter }
     calls:
       - [setContext, ['@router.request_context']]
-      - [add, ['@router.dynamic']]
   router.path_roots_subscriber:
     class: Drupal\Core\EventSubscriber\PathRootsSubscriber
     arguments: ['@state']
@@ -1197,6 +1216,11 @@ services:
     tags:
       - { name: event_subscriber }
     arguments: ['@config.manager', '@config.storage', '@config.storage.snapshot']
+  exception.needs_installer:
+    class: Drupal\Core\EventSubscriber\ExceptionDetectNeedsInstallSubscriber
+    arguments: ['@database']
+    tags:
+      - { name: event_subscriber }
   exception.default_json:
     class: Drupal\Core\EventSubscriber\ExceptionJsonSubscriber
     tags:
@@ -1216,11 +1240,6 @@ services:
     tags:
       - { name: event_subscriber }
     arguments: ['@logger.factory']
-  exception.custom_page_json:
-    class: Drupal\Core\EventSubscriber\ExceptionJsonSubscriber
-    tags:
-      - { name: event_subscriber }
-    arguments: ['@config.factory', '@path.alias_manager', '@http_kernel']
   exception.custom_page_html:
     class: Drupal\Core\EventSubscriber\CustomPageExceptionHtmlSubscriber
     tags:
@@ -1331,7 +1350,7 @@ services:
       - { name: service_collector, tag: breadcrumb_builder, call: addBuilder }
   token:
     class: Drupal\Core\Utility\Token
-    arguments: ['@module_handler', '@cache.discovery', '@language_manager', '@cache_tags.invalidator', '@renderer']
+    arguments: ['@module_handler', '@cache.default', '@language_manager', '@cache_tags.invalidator', '@renderer']
   batch.storage:
     class: Drupal\Core\Batch\BatchStorage
     arguments: ['@database', '@session', '@csrf_token']
@@ -1433,7 +1452,7 @@ services:
     arguments: ['@app.root', '@theme_handler', '@cache.bootstrap', '@module_handler']
   theme.registry:
     class: Drupal\Core\Theme\Registry
-    arguments: ['@app.root', '@cache.default', '@lock', '@module_handler', '@theme_handler', '@theme.initialization']
+    arguments: ['@app.root', '@cache.default', '@lock', '@module_handler', '@theme_handler', '@theme.initialization', null, '@cache.bootstrap']
     tags:
       - { name: needs_destruction }
     calls:
@@ -1540,18 +1559,14 @@ services:
     class: Drupal\Core\Extension\InfoParser
   twig:
     class: Drupal\Core\Template\TwigEnvironment
-    arguments: ['@app.root', '@cache.default', '%twig_extension_hash%', '@twig.loader', '%twig.config%']
+    arguments: ['@app.root', '@cache.default', '%twig_extension_hash%', '@state', '@twig.loader', '%twig.config%']
     tags:
       - { name: service_collector, tag: 'twig.extension', call: addExtension }
   twig.extension:
     class: Drupal\Core\Template\TwigExtension
-    arguments: ['@renderer']
+    arguments: ['@renderer', '@url_generator', '@theme.manager', '@date.formatter']
     tags:
       - { name: twig.extension, priority: 100 }
-    calls:
-      - [setUrlGenerator, ['@url_generator']]
-      - [setThemeManager, ['@theme.manager']]
-      - [setDateFormatter, ['@date.formatter']]
   # @todo Figure out what to do about debugging functions.
   # @see https://www.drupal.org/node/1804998
   twig.extension.debug:
diff --git a/web/core/includes/batch.inc b/web/core/includes/batch.inc
index f84c01b9b..5d05cd503 100644
--- a/web/core/includes/batch.inc
+++ b/web/core/includes/batch.inc
@@ -50,7 +50,7 @@ function _batch_page(Request $request) {
   // Register database update for the end of processing.
   drupal_register_shutdown_function('_batch_shutdown');
 
-  $build = array();
+  $build = [];
 
   // Add batch-specific libraries.
   foreach ($batch['sets'] as $batch_set) {
@@ -94,7 +94,7 @@ function _batch_do() {
   // Perform actual processing.
   list($percentage, $message, $label) = _batch_process();
 
-  return new JsonResponse(array('status' => TRUE, 'percentage' => $percentage, 'message' => $message, 'label' => $label));
+  return new JsonResponse(['status' => TRUE, 'percentage' => $percentage, 'message' => $message, 'label' => $label]);
 }
 
 /**
@@ -130,9 +130,9 @@ function _batch_progress_page() {
     // it. While this causes invalid HTML, the same would be true if we didn't,
     // as content is not allowed to appear after </html> anyway.
     $bare_html_page_renderer = \Drupal::service('bare_html_page_renderer');
-    $response = $bare_html_page_renderer->renderBarePage(['#markup' => $fallback], $current_set['title'], 'maintenance_page', array(
+    $response = $bare_html_page_renderer->renderBarePage(['#markup' => $fallback], $current_set['title'], 'maintenance_page', [
       '#show_messages' => FALSE,
-    ));
+    ]);
 
     // Just use the content of the response.
     $fallback = $response->getContent();
@@ -159,26 +159,26 @@ function _batch_progress_page() {
 
   $url = $batch['url']->toString(TRUE)->getGeneratedUrl();
 
-  $build = array(
+  $build = [
     '#theme' => 'progress_bar',
     '#percent' => $percentage,
-    '#message' => array('#markup' => $message),
+    '#message' => ['#markup' => $message],
     '#label' => $label,
-    '#attached' => array(
-      'html_head' => array(
-        array(
-          array(
+    '#attached' => [
+      'html_head' => [
+        [
+          [
             // Redirect through a 'Refresh' meta tag if JavaScript is disabled.
             '#tag' => 'meta',
             '#noscript' => TRUE,
-            '#attributes' => array(
+            '#attributes' => [
               'http-equiv' => 'Refresh',
               'content' => '0; URL=' . $url,
-            ),
-          ),
+            ],
+          ],
           'batch_progress_meta_refresh',
-        ),
-      ),
+        ],
+      ],
       // Adds JavaScript code and settings for clients where JavaScript is enabled.
       'drupalSettings' => [
         'batch' => [
@@ -187,11 +187,11 @@ function _batch_progress_page() {
           'uri' => $url,
         ],
       ],
-      'library' => array(
+      'library' => [
         'core/drupal.batch',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
   return $build;
 }
 
@@ -243,13 +243,13 @@ function _batch_process() {
       list($callback, $args) = $item->data;
 
       // Build the 'context' array and execute the function call.
-      $batch_context = array(
+      $batch_context = [
         'sandbox'  => &$current_set['sandbox'],
         'results'  => &$current_set['results'],
         'finished' => &$finished,
         'message'  => &$task_message,
-      );
-      call_user_func_array($callback, array_merge($args, array(&$batch_context)));
+      ];
+      call_user_func_array($callback, array_merge($args, [&$batch_context]));
 
       if ($finished >= 1) {
         // Make sure this step is not counted twice when computing $current.
@@ -257,7 +257,7 @@ function _batch_process() {
         // Remove the processed operation and clear the sandbox.
         $queue->deleteItem($item);
         $current_set['count']--;
-        $current_set['sandbox'] = array();
+        $current_set['sandbox'] = [];
       }
     }
 
@@ -312,7 +312,7 @@ function _batch_process() {
     $current    = $total - $remaining + $finished;
     $percentage = _batch_api_percentage($total, $current);
     $elapsed    = isset($current_set['elapsed']) ? $current_set['elapsed'] : 0;
-    $values     = array(
+    $values     = [
       '@remaining'  => $remaining,
       '@total'      => $total,
       '@current'    => floor($current),
@@ -320,13 +320,13 @@ function _batch_process() {
       '@elapsed'    => \Drupal::service('date.formatter')->formatInterval($elapsed / 1000),
       // If possible, estimate remaining processing time.
       '@estimate'   => ($current > 0) ? \Drupal::service('date.formatter')->formatInterval(($elapsed * ($total - $current) / $current) / 1000) : '-',
-    );
+    ];
     $message = strtr($progress_message, $values);
     if (!empty($task_message)) {
       $label = $task_message;
     }
 
-    return array($percentage, $message, $label);
+    return [$percentage, $message, $label];
   }
   else {
     // If we are not in progressive mode, the entire batch has been processed.
@@ -385,7 +385,7 @@ function _batch_next_set() {
       // We use our stored copies of $form and $form_state to account for
       // possible alterations by previous form submit handlers.
       $complete_form = &$batch['form_state']->getCompleteForm();
-      call_user_func_array($callback, array(&$complete_form, &$batch['form_state']));
+      call_user_func_array($callback, [&$complete_form, &$batch['form_state']]);
     }
     return TRUE;
   }
@@ -411,7 +411,7 @@ function _batch_finished() {
       if (is_callable($batch_set['finished'])) {
         $queue = _batch_queue($batch_set);
         $operations = $queue->getAllItems();
-        $batch_set_result = call_user_func_array($batch_set['finished'], array($batch_set['success'], $batch_set['results'], $operations, \Drupal::service('date.formatter')->formatInterval($batch_set['elapsed'] / 1000)));
+        $batch_set_result = call_user_func_array($batch_set['finished'], [$batch_set['success'], $batch_set['results'], $operations, \Drupal::service('date.formatter')->formatInterval($batch_set['elapsed'] / 1000)]);
         // If a batch 'finished' callback requested a redirect after the batch
         // is complete, save that for later use. If more than one batch set
         // returned a redirect, the last one is used.
@@ -491,17 +491,13 @@ function _batch_finished() {
       $_SESSION['batch_form_state'] = $_batch['form_state'];
     }
     $callback = $_batch['redirect_callback'];
-    /** @var \Drupal\Core\Url $source_url */
-    $source_url = $_batch['source_url'];
+    $_batch['source_url']->mergeOptions(['query' => ['op' => 'finish', 'id' => $_batch['id']]]);
     if (is_callable($callback)) {
-      $callback($_batch['source_url'], array('query' => array('op' => 'finish', 'id' => $_batch['id'])));
+      $callback($_batch['source_url'], $_batch['source_url']->getOption('query'));
     }
     elseif ($callback === NULL) {
       // Default to RedirectResponse objects when nothing specified.
-      $url = $source_url
-        ->setAbsolute()
-        ->setOption('query', ['op' => 'finish', 'id' => $_batch['id']]);
-      return new RedirectResponse($url->toString());
+      return new RedirectResponse($_batch['source_url']->setAbsolute()->toString());
     }
   }
 }
diff --git a/web/core/includes/bootstrap.inc b/web/core/includes/bootstrap.inc
index 71895b2da..293f25ae9 100644
--- a/web/core/includes/bootstrap.inc
+++ b/web/core/includes/bootstrap.inc
@@ -9,6 +9,7 @@ use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Config\BootstrapConfigStorageFactory;
 use Drupal\Core\Logger\RfcLogLevel;
 use Drupal\Core\Render\Markup;
 use Drupal\Component\Render\MarkupInterface;
@@ -84,6 +85,9 @@ const DRUPAL_EXTENSION_NAME_MAX_LENGTH = 50;
  *
  * @see http://php.net/manual/reserved.variables.server.php
  * @see http://php.net/manual/function.time.php
+ *
+ * @deprecated in Drupal 8.3.0, will be removed before Drupal 9.0.0.
+ *   Use \Drupal::time()->getRequestTime();
  */
 define('REQUEST_TIME', (int) $_SERVER['REQUEST_TIME']);
 
@@ -193,7 +197,7 @@ function config_get_config_directory($type) {
 function drupal_get_filename($type, $name, $filename = NULL) {
   // The location of files will not change during the request, so do not use
   // drupal_static().
-  static $files = array();
+  static $files = [];
 
   // Type 'core' only exists to simplify application-level logic; it always maps
   // to the /core directory, whereas $name is ignored. It is only requested via
@@ -209,7 +213,7 @@ function drupal_get_filename($type, $name, $filename = NULL) {
     $type = 'module';
   }
   if (!isset($files[$type])) {
-    $files[$type] = array();
+    $files[$type] = [];
   }
 
   if (isset($filename)) {
@@ -229,11 +233,11 @@ function drupal_get_filename($type, $name, $filename = NULL) {
     // system_rebuild_module_data() and
     // \Drupal\Core\Extension\ThemeHandlerInterface::rebuildThemeData().
     if (!isset($files[$type][$name]) && \Drupal::hasService('state')) {
-      $files[$type] += \Drupal::state()->get('system.' . $type . '.files', array());
+      $files[$type] += \Drupal::state()->get('system.' . $type . '.files', []);
     }
     // If still unknown, create a user-level error message.
     if (!isset($files[$type][$name])) {
-      trigger_error(SafeMarkup::format('The following @type is missing from the file system: @name', array('@type' => $type, '@name' => $name)), E_USER_WARNING);
+      trigger_error(SafeMarkup::format('The following @type is missing from the file system: @name', ['@type' => $type, '@name' => $name]), E_USER_WARNING);
     }
   }
 
@@ -297,7 +301,7 @@ function drupal_get_path($type, $name) {
  *
  * @ingroup sanitization
  */
-function t($string, array $args = array(), array $options = array()) {
+function t($string, array $args = [], array $options = []) {
   return new TranslatableMarkup($string, $args, $options);
 }
 
@@ -372,7 +376,7 @@ function drupal_validate_utf8($text) {
  *
  * @see \Drupal\Core\Utility\Error::decodeException()
  */
-function watchdog_exception($type, Exception $exception, $message = NULL, $variables = array(), $severity = RfcLogLevel::ERROR, $link = NULL) {
+function watchdog_exception($type, Exception $exception, $message = NULL, $variables = [], $severity = RfcLogLevel::ERROR, $link = NULL) {
 
   // Use a default value if $message is not set.
   if (empty($message)) {
@@ -443,7 +447,7 @@ function watchdog_exception($type, Exception $exception, $message = NULL, $varia
 function drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE) {
   if (isset($message)) {
     if (!isset($_SESSION['messages'][$type])) {
-      $_SESSION['messages'][$type] = array();
+      $_SESSION['messages'][$type] = [];
     }
 
     // Convert strings which are safe to the simplest Markup objects.
@@ -497,7 +501,7 @@ function drupal_get_messages($type = NULL, $clear_queue = TRUE) {
         unset($_SESSION['messages'][$type]);
       }
       if (isset($messages[$type])) {
-        return array($type => $messages[$type]);
+        return [$type => $messages[$type]];
       }
     }
     else {
@@ -507,7 +511,7 @@ function drupal_get_messages($type = NULL, $clear_queue = TRUE) {
       return $messages;
     }
   }
-  return array();
+  return [];
 }
 
 /**
@@ -724,12 +728,20 @@ function drupal_installation_attempted() {
  * When this function is called during Drupal's initial installation process,
  * the name of the profile that's about to be installed is stored in the global
  * installation state. At all other times, the "install_profile" setting will be
- * available in settings.php.
+ * available in container as a parameter.
  *
- * @return string|null $profile
+ * @return string|null
  *   The name of the installation profile or NULL if no installation profile is
  *   currently active. This is the case for example during the first steps of
  *   the installer or during unit tests.
+ *
+ * @deprecated in Drupal 8.3.0, will be removed before Drupal 9.0.0.
+ *   Use the install_profile container parameter or \Drupal::installProfile()
+ *   instead. If you are accessing the value before it is written to
+ *   configuration during the installer use the $install_state global. If you
+ *   need to access the value before container is available you can use
+ *   BootstrapConfigStorageFactory to load the value directly from
+ *   configuration.
  */
 function drupal_get_profile() {
   global $install_state;
@@ -744,8 +756,18 @@ function drupal_get_profile() {
     }
   }
   else {
-    // Fall back to NULL, if there is no 'install_profile' setting.
-    $profile = Settings::get('install_profile');
+    if (\Drupal::hasContainer()) {
+      $profile = \Drupal::installProfile();
+    }
+    else {
+      $profile = BootstrapConfigStorageFactory::getDatabaseStorage()->read('core.extension')['profile'];
+    }
+
+    // A BC layer just in in case this only exists in Settings. Introduced in
+    // Drupal 8.3.x and will be removed before Drupal 9.0.0.
+    if (empty($profile)) {
+      $profile = Settings::get('install_profile');
+    }
   }
 
   return $profile;
@@ -877,7 +899,7 @@ function drupal_classloader_register($name, $path) {
  * @see drupal_static_reset()
  */
 function &drupal_static($name, $default_value = NULL, $reset = FALSE) {
-  static $data = array(), $default = array();
+  static $data = [], $default = [];
   // First check if dealing with a previously defined static variable.
   if (isset($data[$name]) || array_key_exists($name, $data)) {
     // Non-NULL $name and both $data[$name] and $default[$name] statics exist.
@@ -956,7 +978,7 @@ function drupal_placeholder($text) {
 function &drupal_register_shutdown_function($callback = NULL) {
   // We cannot use drupal_static() here because the static cache is reset during
   // batch processing, which breaks batch handling.
-  static $callbacks = array();
+  static $callbacks = [];
 
   if (isset($callback)) {
     // Only register the internal shutdown function once.
@@ -967,7 +989,7 @@ function &drupal_register_shutdown_function($callback = NULL) {
     // Remove $callback from the arguments.
     unset($args[0]);
     // Save callback and arguments
-    $callbacks[] = array('callback' => $callback, 'arguments' => $args);
+    $callbacks[] = ['callback' => $callback, 'arguments' => $args];
   }
   return $callbacks;
 }
diff --git a/web/core/includes/common.inc b/web/core/includes/common.inc
index 037c5b0f4..323a666b8 100644
--- a/web/core/includes/common.inc
+++ b/web/core/includes/common.inc
@@ -249,7 +249,7 @@ function check_url($uri) {
  */
 function format_size($size, $langcode = NULL) {
   if ($size < Bytes::KILOBYTE) {
-    return \Drupal::translation()->formatPlural($size, '1 byte', '@count bytes', array(), array('langcode' => $langcode));
+    return \Drupal::translation()->formatPlural($size, '1 byte', '@count bytes', [], ['langcode' => $langcode]);
   }
   else {
     $size = $size / Bytes::KILOBYTE; // Convert bytes to kilobytes.
@@ -352,7 +352,7 @@ function date_iso8601($date) {
  *   A ; separated string ready for insertion in a HTTP header. No escaping is
  *   performed for HTML entities, so this string is not safe to be printed.
  */
-function drupal_http_header_attributes(array $attributes = array()) {
+function drupal_http_header_attributes(array $attributes = []) {
   foreach ($attributes as $attribute => &$data) {
     if (is_array($data)) {
       $data = implode(' ', $data);
@@ -433,18 +433,18 @@ function drupal_clear_css_cache() {
  * @see hook_js_alter()
  */
 function drupal_js_defaults($data = NULL) {
-  return array(
+  return [
     'type' => 'file',
     'group' => JS_DEFAULT,
     'weight' => 0,
     'scope' => 'header',
     'cache' => TRUE,
     'preprocess' => TRUE,
-    'attributes' => array(),
+    'attributes' => [],
     'version' => NULL,
     'data' => $data,
-    'browsers' => array(),
-  );
+    'browsers' => [],
+  ];
 }
 
 /**
@@ -704,12 +704,12 @@ function drupal_process_states(&$elements) {
  */
 function drupal_attach_tabledrag(&$element, array $options) {
   // Add default values to elements.
-  $options = $options + array(
+  $options = $options + [
     'subgroup' => NULL,
     'source' => NULL,
     'hidden' => TRUE,
     'limit' => 0
-  );
+  ];
 
   $group = $options['group'];
 
@@ -719,14 +719,14 @@ function drupal_attach_tabledrag(&$element, array $options) {
   // If a subgroup or source isn't set, assume it is the same as the group.
   $target = isset($options['subgroup']) ? $options['subgroup'] : $group;
   $source = isset($options['source']) ? $options['source'] : $target;
-  $element['#attached']['drupalSettings']['tableDrag'][$options['table_id']][$group][$tabledrag_id] = array(
+  $element['#attached']['drupalSettings']['tableDrag'][$options['table_id']][$group][$tabledrag_id] = [
     'target' => $target,
     'source' => $source,
     'relationship' => $options['relationship'],
     'action' => $options['action'],
     'hidden' => $options['hidden'],
     'limit' => $options['limit'],
-  );
+  ];
 
   $element['#attached']['library'][] = 'core/drupal.tabledrag';
 }
@@ -827,7 +827,7 @@ function drupal_pre_render_link($element) {
  * properties of the parent are used.
  */
 function drupal_pre_render_links($element) {
-  $element += array('#links' => array(), '#attached' => array());
+  $element += ['#links' => [], '#attached' => []];
   foreach (Element::children($element) as $key) {
     $child = &$element[$key];
     // If the child has links which have not been printed yet and the user has
@@ -1115,7 +1115,7 @@ function drupal_flush_all_caches() {
   // Rebuild and reboot a new kernel. A simple DrupalKernel reboot is not
   // sufficient, since the list of enabled modules might have been adjusted
   // above due to changed code.
-  $files = array();
+  $files = [];
   foreach ($module_data as $name => $extension) {
     if ($extension->status) {
       $files[$name] = $extension;
@@ -1217,7 +1217,7 @@ function drupal_check_incompatibility($v, $current_version) {
  *   validation system.
  */
 function archiver_get_extensions() {
-  $valid_extensions = array();
+  $valid_extensions = [];
   foreach (\Drupal::service('plugin.manager.archiver')->getDefinitions() as $archive) {
     foreach ($archive['extensions'] as $extension) {
       foreach (explode('.', $extension) as $part) {
@@ -1246,9 +1246,9 @@ function archiver_get_archiver($file) {
   // Archivers can only work on local paths
   $filepath = drupal_realpath($file);
   if (!is_file($filepath)) {
-    throw new Exception(t('Archivers can only operate on local files: %file not supported', array('%file' => $file)));
+    throw new Exception(t('Archivers can only operate on local files: %file not supported', ['%file' => $file]));
   }
-  return \Drupal::service('plugin.manager.archiver')->getInstance(array('filepath' => $filepath));
+  return \Drupal::service('plugin.manager.archiver')->getInstance(['filepath' => $filepath]);
 }
 
 /**
@@ -1270,7 +1270,7 @@ function drupal_get_updaters() {
   if (!isset($updaters)) {
     $updaters = \Drupal::moduleHandler()->invokeAll('updater_info');
     \Drupal::moduleHandler()->alter('updater_info', $updaters);
-    uasort($updaters, array(SortArray::class, 'sortByWeightElement'));
+    uasort($updaters, [SortArray::class, 'sortByWeightElement']);
   }
   return $updaters;
 }
@@ -1290,7 +1290,7 @@ function drupal_get_filetransfer_info() {
   if (!isset($info)) {
     $info = \Drupal::moduleHandler()->invokeAll('filetransfer_info');
     \Drupal::moduleHandler()->alter('filetransfer_info', $info);
-    uasort($info, array(SortArray::class, 'sortByWeightElement'));
+    uasort($info, [SortArray::class, 'sortByWeightElement']);
   }
   return $info;
 }
diff --git a/web/core/includes/database.inc b/web/core/includes/database.inc
index ff03885a2..d4cb593af 100644
--- a/web/core/includes/database.inc
+++ b/web/core/includes/database.inc
@@ -53,7 +53,7 @@ use Drupal\Core\Site\Settings;
  * @see \Drupal\Core\Database\Connection::query()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
-function db_query($query, array $args = array(), array $options = array()) {
+function db_query($query, array $args = [], array $options = []) {
   if (empty($options['target'])) {
     $options['target'] = 'default';
   }
@@ -91,7 +91,7 @@ function db_query($query, array $args = array(), array $options = array()) {
  * @see \Drupal\Core\Database\Connection::queryRange()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
-function db_query_range($query, $from, $count, array $args = array(), array $options = array()) {
+function db_query_range($query, $from, $count, array $args = [], array $options = []) {
   if (empty($options['target'])) {
     $options['target'] = 'default';
   }
@@ -127,7 +127,7 @@ function db_query_range($query, $from, $count, array $args = array(), array $opt
  * @see \Drupal\Core\Database\Connection::queryTemporary()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
-function db_query_temporary($query, array $args = array(), array $options = array()) {
+function db_query_temporary($query, array $args = [], array $options = []) {
   if (empty($options['target'])) {
     $options['target'] = 'default';
   }
@@ -154,7 +154,7 @@ function db_query_temporary($query, array $args = array(), array $options = arra
  * @see \Drupal\Core\Database\Connection::insert()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
-function db_insert($table, array $options = array()) {
+function db_insert($table, array $options = []) {
   if (empty($options['target']) || $options['target'] == 'replica') {
     $options['target'] = 'default';
   }
@@ -180,7 +180,7 @@ function db_insert($table, array $options = array()) {
  * @see \Drupal\Core\Database\Connection::merge()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
-function db_merge($table, array $options = array()) {
+function db_merge($table, array $options = []) {
   if (empty($options['target']) || $options['target'] == 'replica') {
     $options['target'] = 'default';
   }
@@ -206,7 +206,7 @@ function db_merge($table, array $options = array()) {
  * @see \Drupal\Core\Database\Connection::update()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
-function db_update($table, array $options = array()) {
+function db_update($table, array $options = []) {
   if (empty($options['target']) || $options['target'] == 'replica') {
     $options['target'] = 'default';
   }
@@ -232,7 +232,7 @@ function db_update($table, array $options = array()) {
  * @see \Drupal\Core\Database\Connection::delete()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
-function db_delete($table, array $options = array()) {
+function db_delete($table, array $options = []) {
   if (empty($options['target']) || $options['target'] == 'replica') {
     $options['target'] = 'default';
   }
@@ -258,7 +258,7 @@ function db_delete($table, array $options = array()) {
  * @see \Drupal\Core\Database\Connection::truncate()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
-function db_truncate($table, array $options = array()) {
+function db_truncate($table, array $options = []) {
   if (empty($options['target']) || $options['target'] == 'replica') {
     $options['target'] = 'default';
   }
@@ -288,7 +288,7 @@ function db_truncate($table, array $options = array()) {
  * @see \Drupal\Core\Database\Connection::select()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
-function db_select($table, $alias = NULL, array $options = array()) {
+function db_select($table, $alias = NULL, array $options = []) {
   if (empty($options['target'])) {
     $options['target'] = 'default';
   }
@@ -315,7 +315,7 @@ function db_select($table, $alias = NULL, array $options = array()) {
  * @see \Drupal\Core\Database\Connection::startTransaction()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
-function db_transaction($name = NULL, array $options = array()) {
+function db_transaction($name = NULL, array $options = []) {
   if (empty($options['target'])) {
     $options['target'] = 'default';
   }
@@ -451,7 +451,7 @@ function db_driver() {
  *
  * @see \Drupal\Core\Database\Database::closeConnection()
  */
-function db_close(array $options = array()) {
+function db_close(array $options = []) {
   if (empty($options['target'])) {
     $options['target'] = NULL;
   }
@@ -752,7 +752,7 @@ function db_drop_table($table) {
  * @see \Drupal\Core\Database\Schema::addField()
  * @see db_change_field()
  */
-function db_add_field($table, $field, $spec, $keys_new = array()) {
+function db_add_field($table, $field, $spec, $keys_new = []) {
   return Database::getConnection()->schema()->addField($table, $field, $spec, $keys_new);
 }
 
@@ -1020,7 +1020,7 @@ function db_drop_index($table, $name) {
  *
  * @see \Drupal\Core\Database\Schema::changeField()
  */
-function db_change_field($table, $field, $field_new, $spec, $keys_new = array()) {
+function db_change_field($table, $field, $field_new, $spec, $keys_new = []) {
   return Database::getConnection()->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
 }
 
diff --git a/web/core/includes/entity.inc b/web/core/includes/entity.inc
index 8b4eb22f0..45eaa3d8e 100644
--- a/web/core/includes/entity.inc
+++ b/web/core/includes/entity.inc
@@ -80,7 +80,7 @@ function entity_get_bundles($entity_type = NULL) {
 function entity_load($entity_type, $id, $reset = FALSE) {
   $controller = \Drupal::entityManager()->getStorage($entity_type);
   if ($reset) {
-    $controller->resetCache(array($id));
+    $controller->resetCache([$id]);
   }
   return $controller->load($id);
 }
@@ -305,7 +305,7 @@ function entity_delete_multiple($entity_type, array $ids) {
  * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getStorage()
  * @see \Drupal\Core\Entity\EntityStorageInterface::create()
  */
-function entity_create($entity_type, array $values = array()) {
+function entity_create($entity_type, array $values = []) {
   return \Drupal::entityManager()
     ->getStorage($entity_type)
     ->create($values);
@@ -483,12 +483,12 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
   // configuration entries are only created when a display object is explicitly
   // configured and saved.
   if (!$display) {
-    $display = EntityViewDisplay::create(array(
+    $display = EntityViewDisplay::create([
       'targetEntityType' => $entity_type,
       'bundle' => $bundle,
       'mode' => $view_mode,
       'status' => TRUE,
-    ));
+    ]);
   }
 
   return $display;
@@ -514,7 +514,7 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
  *     'weight' => 1,
  *   ))
  *   ->setComponent('field_image', array(
- *     'type' => 'hidden',
+ *     'region' => 'hidden',
  *   ))
  *   ->save();
  * @endcode
@@ -563,12 +563,12 @@ function entity_get_form_display($entity_type, $bundle, $form_mode) {
   // configuration entries are only created when an entity form display is
   // explicitly configured and saved.
   if (!$entity_form_display) {
-    $entity_form_display = EntityFormDisplay::create(array(
+    $entity_form_display = EntityFormDisplay::create([
       'targetEntityType' => $entity_type,
       'bundle' => $bundle,
       'mode' => $form_mode,
       'status' => TRUE,
-    ));
+    ]);
   }
 
   return $entity_form_display;
diff --git a/web/core/includes/errors.inc b/web/core/includes/errors.inc
index e3ad1c89e..40e290338 100644
--- a/web/core/includes/errors.inc
+++ b/web/core/includes/errors.inc
@@ -21,23 +21,23 @@ use Symfony\Component\HttpFoundation\Response;
  * @ingroup logging_severity_levels
  */
 function drupal_error_levels() {
-  $types = array(
-    E_ERROR => array('Error', RfcLogLevel::ERROR),
-    E_WARNING => array('Warning', RfcLogLevel::WARNING),
-    E_PARSE => array('Parse error', RfcLogLevel::ERROR),
-    E_NOTICE => array('Notice', RfcLogLevel::NOTICE),
-    E_CORE_ERROR => array('Core error', RfcLogLevel::ERROR),
-    E_CORE_WARNING => array('Core warning', RfcLogLevel::WARNING),
-    E_COMPILE_ERROR => array('Compile error', RfcLogLevel::ERROR),
-    E_COMPILE_WARNING => array('Compile warning', RfcLogLevel::WARNING),
-    E_USER_ERROR => array('User error', RfcLogLevel::ERROR),
-    E_USER_WARNING => array('User warning', RfcLogLevel::WARNING),
-    E_USER_NOTICE => array('User notice', RfcLogLevel::NOTICE),
-    E_STRICT => array('Strict warning', RfcLogLevel::DEBUG),
-    E_RECOVERABLE_ERROR => array('Recoverable fatal error', RfcLogLevel::ERROR),
-    E_DEPRECATED => array('Deprecated function', RfcLogLevel::DEBUG),
-    E_USER_DEPRECATED => array('User deprecated function', RfcLogLevel::DEBUG),
-  );
+  $types = [
+    E_ERROR => ['Error', RfcLogLevel::ERROR],
+    E_WARNING => ['Warning', RfcLogLevel::WARNING],
+    E_PARSE => ['Parse error', RfcLogLevel::ERROR],
+    E_NOTICE => ['Notice', RfcLogLevel::NOTICE],
+    E_CORE_ERROR => ['Core error', RfcLogLevel::ERROR],
+    E_CORE_WARNING => ['Core warning', RfcLogLevel::WARNING],
+    E_COMPILE_ERROR => ['Compile error', RfcLogLevel::ERROR],
+    E_COMPILE_WARNING => ['Compile warning', RfcLogLevel::WARNING],
+    E_USER_ERROR => ['User error', RfcLogLevel::ERROR],
+    E_USER_WARNING => ['User warning', RfcLogLevel::WARNING],
+    E_USER_NOTICE => ['User notice', RfcLogLevel::NOTICE],
+    E_STRICT => ['Strict warning', RfcLogLevel::DEBUG],
+    E_RECOVERABLE_ERROR => ['Recoverable fatal error', RfcLogLevel::ERROR],
+    E_DEPRECATED => ['Deprecated function', RfcLogLevel::DEBUG],
+    E_USER_DEPRECATED => ['User deprecated function', RfcLogLevel::DEBUG],
+  ];
 
   return $types;
 }
@@ -70,7 +70,7 @@ function _drupal_error_handler_real($error_level, $message, $filename, $line, $c
     // in PHP, we allow them to trigger a fatal error by emitting a user error
     // using trigger_error().
     $to_string = $error_level == E_USER_ERROR && substr($caller['function'], -strlen('__toString()')) == '__toString()';
-    _drupal_log_error(array(
+    _drupal_log_error([
       '%type' => isset($types[$error_level]) ? $severity_msg : 'Unknown error',
       // The standard PHP error handler considers that the error messages
       // are HTML. We mimick this behavior here.
@@ -81,7 +81,7 @@ function _drupal_error_handler_real($error_level, $message, $filename, $line, $c
       'severity_level' => $severity_level,
       'backtrace' => $backtrace,
       '@backtrace_string' => (new \Exception())->getTraceAsString(),
-    ), $recoverable || $to_string);
+    ], $recoverable || $to_string);
   }
 }
 
@@ -139,15 +139,15 @@ function _drupal_log_error($error, $fatal = FALSE) {
     // $number does not use drupal_static as it should not be reset
     // as it uniquely identifies each PHP error.
     static $number = 0;
-    $assertion = array(
+    $assertion = [
       $error['@message'],
       $error['%type'],
-      array(
+      [
         'function' => $error['%function'],
         'file' => $error['%file'],
         'line' => $error['%line'],
-      ),
-    );
+      ],
+    ];
     // For non-fatal errors (e.g. PHP notices) _drupal_log_error can be called
     // multiple times per request. In that case the response is typically
     // generated outside of the error handler, e.g., in a controller. As a
@@ -257,10 +257,10 @@ function _drupal_log_error($error, $fatal = FALSE) {
 
       if ($is_installer) {
         // install_display_output() prints the output and ends script execution.
-        $output = array(
+        $output = [
           '#title' => 'Error',
           '#markup' => $message,
-        );
+        ];
         install_display_output($output, $GLOBALS['install_state'], $response->headers->all());
         exit;
       }
diff --git a/web/core/includes/file.inc b/web/core/includes/file.inc
index 0dcd141ca..c78ee5ba9 100644
--- a/web/core/includes/file.inc
+++ b/web/core/includes/file.inc
@@ -367,7 +367,7 @@ function file_save_htaccess($directory, $private = TRUE, $force_overwrite = FALS
     return drupal_chmod($htaccess_path, 0444);
   }
   else {
-    $variables = array('%directory' => $directory, '@htaccess' => $htaccess_lines);
+    $variables = ['%directory' => $directory, '@htaccess' => $htaccess_lines];
     \Drupal::logger('security')->error("Security warning: Couldn't write .htaccess file. Please create a .htaccess file in your %directory directory which contains the following lines: <pre><code>@htaccess</code></pre>", $variables);
     return FALSE;
   }
@@ -456,7 +456,7 @@ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXIST
   $real_destination = drupal_realpath($destination) ?: $destination;
   // Perform the copy operation.
   if (!@copy($real_source, $real_destination)) {
-    \Drupal::logger('file')->error('The specified file %file could not be copied to %destination.', array('%file' => $source, '%destination' => $destination));
+    \Drupal::logger('file')->error('The specified file %file could not be copied to %destination.', ['%file' => $source, '%destination' => $destination]);
     return FALSE;
   }
   // Set the permissions on the new file.
@@ -501,12 +501,12 @@ function file_unmanaged_prepare($source, &$destination = NULL, $replace = FILE_E
   // Assert that the source file actually exists.
   if (!file_exists($source)) {
     // @todo Replace drupal_set_message() calls with exceptions instead.
-    drupal_set_message(t('The specified file %file could not be moved/copied because no file by that name exists. Please check that you supplied the correct filename.', array('%file' => $original_source)), 'error');
+    drupal_set_message(t('The specified file %file could not be moved/copied because no file by that name exists. Please check that you supplied the correct filename.', ['%file' => $original_source]), 'error');
     if (($realpath = drupal_realpath($original_source)) !== FALSE) {
-      $logger->notice('File %file (%realpath) could not be moved/copied because it does not exist.', array('%file' => $original_source, '%realpath' => $realpath));
+      $logger->notice('File %file (%realpath) could not be moved/copied because it does not exist.', ['%file' => $original_source, '%realpath' => $realpath]);
     }
     else {
-      $logger->notice('File %file could not be moved/copied because it does not exist.', array('%file' => $original_source));
+      $logger->notice('File %file could not be moved/copied because it does not exist.', ['%file' => $original_source]);
     }
     return FALSE;
   }
@@ -527,8 +527,8 @@ function file_unmanaged_prepare($source, &$destination = NULL, $replace = FILE_E
     $dirname = drupal_dirname($destination);
     if (!file_prepare_directory($dirname)) {
       // The destination is not valid.
-      $logger->notice('File %file could not be moved/copied because the destination directory %destination is not configured correctly.', array('%file' => $original_source, '%destination' => $dirname));
-      drupal_set_message(t('The specified file %file could not be moved/copied because the destination directory is not properly configured. This may be caused by a problem with file or directory permissions. More information is available in the system log.', array('%file' => $original_source)), 'error');
+      $logger->notice('File %file could not be moved/copied because the destination directory %destination is not configured correctly.', ['%file' => $original_source, '%destination' => $dirname]);
+      drupal_set_message(t('The specified file %file could not be moved/copied because the destination directory is not properly configured. This may be caused by a problem with file or directory permissions. More information is available in the system log.', ['%file' => $original_source]), 'error');
       return FALSE;
     }
   }
@@ -536,8 +536,8 @@ function file_unmanaged_prepare($source, &$destination = NULL, $replace = FILE_E
   // Determine whether we can perform this operation based on overwrite rules.
   $destination = file_destination($destination, $replace);
   if ($destination === FALSE) {
-    drupal_set_message(t('The file %file could not be moved/copied because a file by that name already exists in the destination directory.', array('%file' => $original_source)), 'error');
-    $logger->notice('File %file could not be moved/copied because a file by that name already exists in the destination directory (%destination)', array('%file' => $original_source, '%destination' => $destination));
+    drupal_set_message(t('The file %file could not be moved/copied because a file by that name already exists in the destination directory.', ['%file' => $original_source]), 'error');
+    $logger->notice('File %file could not be moved/copied because a file by that name already exists in the destination directory (%destination)', ['%file' => $original_source, '%destination' => $destination]);
     return FALSE;
   }
 
@@ -545,8 +545,8 @@ function file_unmanaged_prepare($source, &$destination = NULL, $replace = FILE_E
   $real_source = drupal_realpath($source);
   $real_destination = drupal_realpath($destination);
   if ($source == $destination || ($real_source !== FALSE) && ($real_source == $real_destination)) {
-    drupal_set_message(t('The specified file %file was not moved/copied because it would overwrite itself.', array('%file' => $source)), 'error');
-    $logger->notice('File %file could not be moved/copied because it would overwrite itself.', array('%file' => $source));
+    drupal_set_message(t('The specified file %file was not moved/copied because it would overwrite itself.', ['%file' => $source]), 'error');
+    $logger->notice('File %file could not be moved/copied because it would overwrite itself.', ['%file' => $source]);
     return FALSE;
   }
   // Make sure the .htaccess files are present.
@@ -652,7 +652,7 @@ function file_unmanaged_move($source, $destination = NULL, $replace = FILE_EXIST
     // implemented. It's not necessary to use drupal_unlink() as the Windows
     // issue has already been resolved above.
     if (!@copy($real_source, $real_destination) || !@unlink($real_source)) {
-      \Drupal::logger('file')->error('The specified file %file could not be moved to %destination.', array('%file' => $source, '%destination' => $destination));
+      \Drupal::logger('file')->error('The specified file %file could not be moved to %destination.', ['%file' => $source, '%destination' => $destination]);
       return FALSE;
     }
   }
@@ -721,7 +721,7 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
     $filename = $new_filename . '.' . $final_extension;
 
     if ($alerts && $original != $filename) {
-      drupal_set_message(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $filename)));
+      drupal_set_message(t('For security reasons, your upload has been renamed to %filename.', ['%filename' => $filename]));
     }
   }
 
@@ -762,7 +762,7 @@ function file_create_filename($basename, $directory) {
   $basename = preg_replace('/[\x00-\x1F]/u', '_', $basename);
   if (substr(PHP_OS, 0, 3) == 'WIN') {
     // These characters are not allowed in Windows filenames
-    $basename = str_replace(array(':', '*', '?', '"', '<', '>', '|'), '_', $basename);
+    $basename = str_replace([':', '*', '?', '"', '<', '>', '|'], '_', $basename);
   }
 
   // A URI or path may already have a trailing slash or look like "public://".
@@ -810,7 +810,7 @@ function file_create_filename($basename, $directory) {
  * @see \Drupal\file\FileUsage\FileUsageBase::delete()
  */
 function file_delete($fid) {
-  return file_delete_multiple(array($fid));
+  return file_delete_multiple([$fid]);
 }
 
 /**
@@ -852,18 +852,18 @@ function file_unmanaged_delete($path) {
   }
   $logger = \Drupal::logger('file');
   if (is_dir($path)) {
-    $logger->error('%path is a directory and cannot be removed using file_unmanaged_delete().', array('%path' => $path));
+    $logger->error('%path is a directory and cannot be removed using file_unmanaged_delete().', ['%path' => $path]);
     return FALSE;
   }
   // Return TRUE for non-existent file, but log that nothing was actually
   // deleted, as the current state is the intended result.
   if (!file_exists($path)) {
-    $logger->notice('The file %path was not deleted because it does not exist.', array('%path' => $path));
+    $logger->notice('The file %path was not deleted because it does not exist.', ['%path' => $path]);
     return TRUE;
   }
   // We cannot handle anything other than files and directories. Log an error
   // for everything else (sockets, symbolic links, etc).
-  $logger->error('The file %path is not of a recognized type so it was not deleted.', array('%path' => $path));
+  $logger->error('The file %path is not of a recognized type so it was not deleted.', ['%path' => $path]);
   return FALSE;
 }
 
@@ -999,14 +999,14 @@ function file_unmanaged_save_data($data, $destination = NULL, $replace = FILE_EX
  *   An associative array (keyed on the chosen key) of objects with 'uri',
  *   'filename', and 'name' properties corresponding to the matched files.
  */
-function file_scan_directory($dir, $mask, $options = array(), $depth = 0) {
+function file_scan_directory($dir, $mask, $options = [], $depth = 0) {
   // Merge in defaults.
-  $options += array(
+  $options += [
     'callback' => 0,
     'recurse' => TRUE,
     'key' => 'uri',
     'min_depth' => 0,
-  );
+  ];
   // Normalize $dir only once.
   if ($depth == 0) {
     $dir = file_stream_wrapper_uri_normalize($dir);
@@ -1025,8 +1025,8 @@ function file_scan_directory($dir, $mask, $options = array(), $depth = 0) {
     $default_nomask = '/^' . implode('|', $ignore_directories) . '$/';
   }
 
-  $options['key'] = in_array($options['key'], array('uri', 'filename', 'name')) ? $options['key'] : 'uri';
-  $files = array();
+  $options['key'] = in_array($options['key'], ['uri', 'filename', 'name']) ? $options['key'] : 'uri';
+  $files = [];
   // Avoid warnings when opendir does not have the permissions to open a
   // directory.
   if (is_dir($dir)) {
@@ -1067,7 +1067,7 @@ function file_scan_directory($dir, $mask, $options = array(), $depth = 0) {
       closedir($handle);
     }
     else {
-      \Drupal::logger('file')->error('@dir can not be opened', array('@dir' => $dir));
+      \Drupal::logger('file')->error('@dir can not be opened', ['@dir' => $dir]);
     }
   }
 
diff --git a/web/core/includes/form.inc b/web/core/includes/form.inc
index 7db0ff10d..05f2a9e1f 100644
--- a/web/core/includes/form.inc
+++ b/web/core/includes/form.inc
@@ -29,8 +29,8 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
  */
 function template_preprocess_select(&$variables) {
   $element = $variables['element'];
-  Element::setAttributes($element, array('id', 'name', 'size'));
-  RenderElement::setAttributes($element, array('form-select'));
+  Element::setAttributes($element, ['id', 'name', 'size']);
+  RenderElement::setAttributes($element, ['form-select']);
 
   $variables['attributes'] = $element['#attributes'];
   $variables['options'] = form_select_options($element);
@@ -161,7 +161,7 @@ function form_select_options($element, $choices = NULL) {
  *   empty if no elements were found. FALSE if optgroups were found.
  */
 function form_get_options($element, $key) {
-  $keys = array();
+  $keys = [];
   foreach ($element['#options'] as $index => $choice) {
     if (is_array($choice)) {
       return FALSE;
@@ -191,9 +191,9 @@ function form_get_options($element, $key) {
  */
 function template_preprocess_fieldset(&$variables) {
   $element = $variables['element'];
-  Element::setAttributes($element, array('id'));
+  Element::setAttributes($element, ['id']);
   RenderElement::setAttributes($element);
-  $variables['attributes'] = isset($element['#attributes']) ? $element['#attributes'] : array();
+  $variables['attributes'] = isset($element['#attributes']) ? $element['#attributes'] : [];
   $variables['prefix'] = isset($element['#field_prefix']) ? $element['#field_prefix'] : NULL;
   $variables['suffix'] = isset($element['#field_suffix']) ? $element['#field_suffix'] : NULL;
   $variables['title_display'] = isset($element['#title_display']) ? $element['#title_display'] : NULL;
@@ -207,7 +207,7 @@ function template_preprocess_fieldset(&$variables) {
   $variables['legend']['attributes'] = new Attribute();
   // Add 'visually-hidden' class to legend span.
   if ($variables['title_display'] == 'invisible') {
-    $variables['legend_span']['attributes'] = new Attribute(array('class' => 'visually-hidden'));
+    $variables['legend_span']['attributes'] = new Attribute(['class' => ['visually-hidden']]);
   }
   else {
     $variables['legend_span']['attributes'] = new Attribute();
@@ -273,7 +273,7 @@ function template_preprocess_details(&$variables) {
  */
 function template_preprocess_radios(&$variables) {
   $element = $variables['element'];
-  $variables['attributes'] = array();
+  $variables['attributes'] = [];
   if (isset($element['#id'])) {
     $variables['attributes']['id'] = $element['#id'];
   }
@@ -295,7 +295,7 @@ function template_preprocess_radios(&$variables) {
  */
 function template_preprocess_checkboxes(&$variables) {
   $element = $variables['element'];
-  $variables['attributes'] = array();
+  $variables['attributes'] = [];
   if (isset($element['#id'])) {
     $variables['attributes']['id'] = $element['#id'];
   }
@@ -354,7 +354,7 @@ function template_preprocess_form(&$variables) {
   if (isset($element['#action'])) {
     $element['#attributes']['action'] = UrlHelper::stripDangerousProtocols($element['#action']);
   }
-  Element::setAttributes($element, array('method', 'id'));
+  Element::setAttributes($element, ['method', 'id']);
   if (empty($element['#attributes']['accept-charset'])) {
     $element['#attributes']['accept-charset'] = "UTF-8";
   }
@@ -375,8 +375,8 @@ function template_preprocess_form(&$variables) {
  */
 function template_preprocess_textarea(&$variables) {
   $element = $variables['element'];
-  Element::setAttributes($element, array('id', 'name', 'rows', 'cols', 'placeholder'));
-  RenderElement::setAttributes($element, array('form-textarea'));
+  Element::setAttributes($element, ['id', 'name', 'rows', 'cols', 'placeholder']);
+  RenderElement::setAttributes($element, ['form-textarea']);
   $variables['wrapper_attributes'] = new Attribute();
   $variables['attributes'] = new Attribute($element['#attributes']);
   $variables['value'] = $element['#value'];
@@ -429,10 +429,11 @@ function template_preprocess_form_element(&$variables) {
   // This function is invoked as theme wrapper, but the rendered form element
   // may not necessarily have been processed by
   // \Drupal::formBuilder()->doBuildForm().
-  $element += array(
+  $element += [
     '#title_display' => 'before',
-    '#wrapper_attributes' => array(),
-  );
+    '#wrapper_attributes' => [],
+    '#label_attributes' => [],
+  ];
   $variables['attributes'] = $element['#wrapper_attributes'];
 
   // Add element #id for #type 'item'.
@@ -477,8 +478,9 @@ function template_preprocess_form_element(&$variables) {
 
   // Add label_display and label variables to template.
   $variables['label_display'] = $element['#title_display'];
-  $variables['label'] = array('#theme' => 'form_element_label');
-  $variables['label'] += array_intersect_key($element, array_flip(array('#id', '#required', '#title', '#title_display')));
+  $variables['label'] = ['#theme' => 'form_element_label'];
+  $variables['label'] += array_intersect_key($element, array_flip(['#id', '#required', '#title', '#title_display']));
+  $variables['label']['#attributes'] = $element['#label_attributes'];
 
   $variables['children'] = $element['#children'];
 }
@@ -566,7 +568,7 @@ function template_preprocess_form_element_label(&$variables) {
  * Note: if the batch 'title', 'init_message', 'progress_message', or
  * 'error_message' could contain any user input, it is the responsibility of
  * the code calling batch_set() to sanitize them first with a function like
- * \Drupal\Component\Utility\SafeMarkup::checkPlain() or
+ * \Drupal\Component\Utility\Html::escape() or
  * \Drupal\Component\Utility\Xss::filter(). Furthermore, if the batch operation
  * returns any user input in the 'results' or 'message' keys of $context, it
  * must also sanitize them first.
@@ -594,8 +596,8 @@ function template_preprocess_form_element_label(&$variables) {
  *   $nodes = \Drupal::entityTypeManager()->getStorage('node')
  *     ->loadByProperties(['uid' => $uid, 'type' => $type]);
  *   $node = reset($nodes);
- *   $context['results'][] = $node->id() . ' : ' . SafeMarkup::checkPlain($node->label());
- *   $context['message'] = SafeMarkup::checkPlain($node->label());
+ *   $context['results'][] = $node->id() . ' : ' . Html::escape($node->label());
+ *   $context['message'] = Html::escape($node->label());
  * }
  *
  * // A more advanced example is a multi-step operation that loads all rows,
@@ -614,10 +616,10 @@ function template_preprocess_form_element_label(&$variables) {
  *     ->range(0, $limit)
  *     ->execute();
  *   foreach ($result as $row) {
- *     $context['results'][] = $row->id . ' : ' . SafeMarkup::checkPlain($row->title);
+ *     $context['results'][] = $row->id . ' : ' . Html::escape($row->title);
  *     $context['sandbox']['progress']++;
  *     $context['sandbox']['current_id'] = $row->id;
- *     $context['message'] = SafeMarkup::checkPlain($row->title);
+ *     $context['message'] = Html::escape($row->title);
  *   }
  *   if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
  *     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
@@ -691,7 +693,7 @@ function template_preprocess_form_element_label(&$variables) {
  *     'finished' functions, for instance if they don't reside in the main
  *     .module file. The path should be relative to base_path(), and thus should
  *     be built using drupal_get_path().
- *   - css: Array of paths to CSS files to be used on the progress page.
+ *   - library: An array of batch-specific CSS and JS libraries.
  *   - url_options: options passed to the \Drupal\Core\Url object when
  *     constructing redirect URLs for the batch.
  *   - progressive: A Boolean that indicates whether or not the batch needs to
@@ -715,27 +717,26 @@ function batch_set($batch_definition) {
 
     // Initialize the batch if needed.
     if (empty($batch)) {
-      $batch = array(
-        'sets' => array(),
+      $batch = [
+        'sets' => [],
         'has_form_submits' => FALSE,
-      );
+      ];
     }
 
     // Base and default properties for the batch set.
-    $init = array(
-      'sandbox' => array(),
-      'results' => array(),
+    $init = [
+      'sandbox' => [],
+      'results' => [],
       'success' => FALSE,
       'start' => 0,
       'elapsed' => 0,
-    );
-    $defaults = array(
+    ];
+    $defaults = [
       'title' => t('Processing'),
       'init_message' => t('Initializing.'),
       'progress_message' => t('Completed @current of @total.'),
       'error_message' => t('An error has occurred.'),
-      'css' => array(),
-    );
+    ];
     $batch_set = $init + $batch_definition + $defaults;
 
     // Tweak init_message to avoid the bottom of the page flickering down after
@@ -759,7 +760,7 @@ function batch_set($batch_definition) {
       $index = $batch['current_set'] + 1;
       $slice1 = array_slice($batch['sets'], 0, $index);
       $slice2 = array_slice($batch['sets'], $index);
-      $batch['sets'] = array_merge($slice1, array($batch_set), $slice2);
+      $batch['sets'] = array_merge($slice1, [$batch_set], $slice2);
       _batch_populate_queue($batch, $index);
     }
   }
@@ -781,6 +782,9 @@ function batch_set($batch_definition) {
  *   \Symfony\Component\HttpFoundation\RedirectResponse, which will be used
  *   automatically by the standard batch processing pipeline (and which takes
  *   precedence over this parameter).
+ *   User will be redirected to the page that started the batch if this argument
+ *   is omitted and no redirect response was returned by the 'finished'
+ *   callback. Any query arguments will be automatically persisted.
  * @param \Drupal\Core\Url $url
  *   (optional - should only be used for separate scripts like update.php)
  *   URL of the batch processing page.
@@ -796,15 +800,15 @@ function batch_process($redirect = NULL, Url $url = NULL, $redirect_callback = N
 
   if (isset($batch)) {
     // Add process information
-    $process_info = array(
+    $process_info = [
       'current_set' => 0,
       'progressive' => TRUE,
       'url' => isset($url) ? $url : Url::fromRoute('system.batch_page.html'),
-      'source_url' => Url::fromRouteMatch(\Drupal::routeMatch()),
+      'source_url' => Url::fromRouteMatch(\Drupal::routeMatch())->mergeOptions(['query' => \Drupal::request()->query->all()]),
       'batch_redirect' => $redirect,
       'theme' => \Drupal::theme()->getActiveTheme()->getName(),
       'redirect_callback' => $redirect_callback,
-    );
+    ];
     $batch += $process_info;
 
     // The batch is now completely built. Allow other modules to make changes
@@ -835,7 +839,7 @@ function batch_process($redirect = NULL, Url $url = NULL, $redirect_callback = N
       $query_options['op'] = 'finished';
       $error_url->setOption('query', $query_options);
 
-      $batch['error_message'] = t('Please continue to <a href=":error_url">the error page</a>', array(':error_url' => $error_url->toString(TRUE)->getGeneratedUrl()));
+      $batch['error_message'] = t('Please continue to <a href=":error_url">the error page</a>', [':error_url' => $error_url->toString(TRUE)->getGeneratedUrl()]);
 
       // Clear the way for the redirection to the batch processing page, by
       // saving and unsetting the 'destination', if there is any.
@@ -882,7 +886,7 @@ function &batch_get() {
   // that are part of the Batch API and need to reset the batch information may
   // call batch_get() and manipulate the result by reference. Functions that are
   // not part of the Batch API can also do this, but shouldn't.
-  static $batch = array();
+  static $batch = [];
   return $batch;
 }
 
@@ -903,12 +907,12 @@ function _batch_populate_queue(&$batch, $set_id) {
   $batch_set = &$batch['sets'][$set_id];
 
   if (isset($batch_set['operations'])) {
-    $batch_set += array(
-      'queue' => array(
+    $batch_set += [
+      'queue' => [
         'name' => 'drupal_batch:' . $batch['id'] . ':' . $set_id,
         'class' => $batch['progressive'] ? 'Drupal\Core\Queue\Batch' : 'Drupal\Core\Queue\BatchMemory',
-      ),
-    );
+      ],
+    ];
 
     $queue = _batch_queue($batch_set);
     $queue->createQueue();
@@ -933,7 +937,7 @@ function _batch_queue($batch_set) {
   static $queues;
 
   if (!isset($queues)) {
-    $queues = array();
+    $queues = [];
   }
 
   if (isset($batch_set['queue'])) {
diff --git a/web/core/includes/install.core.inc b/web/core/includes/install.core.inc
index 839b038c7..cfc0497bb 100644
--- a/web/core/includes/install.core.inc
+++ b/web/core/includes/install.core.inc
@@ -12,6 +12,7 @@ use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Form\FormState;
 use Drupal\Core\Installer\Exception\AlreadyInstalledException;
 use Drupal\Core\Installer\Exception\InstallerException;
+use Drupal\Core\Installer\Exception\InstallProfileMismatchException;
 use Drupal\Core\Installer\Exception\NoProfilesException;
 use Drupal\Core\Installer\InstallerKernel;
 use Drupal\Core\Language\Language;
@@ -91,11 +92,11 @@ const INSTALL_TASK_RUN_IF_NOT_COMPLETED = 3;
  *
  * @see install_state_defaults()
  */
-function install_drupal($class_loader, $settings = array()) {
+function install_drupal($class_loader, $settings = []) {
   // Support the old way of calling this function with just a settings array.
   // @todo Remove this when Drush is updated in the Drupal testing
   //   infrastructure in https://www.drupal.org/node/2389243
-  if (is_array($class_loader) && $settings === array()) {
+  if (is_array($class_loader) && $settings === []) {
     $settings = $class_loader;
     $class_loader = require __DIR__ . '/../../autoload.php';
   }
@@ -105,7 +106,7 @@ function install_drupal($class_loader, $settings = array()) {
   // as well as a boolean indicating whether or not this is an interactive
   // installation.
   $interactive = empty($settings);
-  $install_state = $settings + array('interactive' => $interactive) + install_state_defaults();
+  $install_state = $settings + ['interactive' => $interactive] + install_state_defaults();
 
   try {
     // Begin the page request. This adds information about the current state of
@@ -120,10 +121,10 @@ function install_drupal($class_loader, $settings = array()) {
     if (!$install_state['interactive']) {
       throw $e;
     }
-    $output = array(
+    $output = [
       '#title' => $e->getTitle(),
       '#markup' => $e->getMessage(),
-    );
+    ];
   }
 
   // After execution, all tasks might be complete, in which case
@@ -181,7 +182,7 @@ function install_drupal($class_loader, $settings = array()) {
  * @see \Drupal\Core\Form\FormBuilderInterface::submitForm()
  */
 function install_state_defaults() {
-  $defaults = array(
+  $defaults = [
     // The current task being processed.
     'active_task' => NULL,
     // The last task that was completed during the previous installation
@@ -206,7 +207,7 @@ function install_state_defaults() {
     // installation task that the form submission is for, and the values are
     // used as the $form_state->getValues() array that is passed on to the form
     // submission via \Drupal::formBuilder()->submitForm().
-    'forms' => array(),
+    'forms' => [],
     // This becomes TRUE only at the end of the installation process, after
     // all available tasks have been completed and Drupal is fully installed.
     // It is used by the installer to store correct information in the database
@@ -223,16 +224,16 @@ function install_state_defaults() {
     // and 'langcode' (the code of the chosen installation language), since
     // these settings need to persist from page request to page request before
     // the database is available for storage.
-    'parameters' => array(),
+    'parameters' => [],
     // Whether or not the parameters have changed during the current page
     // request. For interactive installations, this will trigger a page
     // redirect.
     'parameters_changed' => FALSE,
     // An array of information about the chosen installation profile. This will
     // be filled in based on the profile's .info.yml file.
-    'profile_info' => array(),
+    'profile_info' => [],
     // An array of available installation profiles.
-    'profiles' => array(),
+    'profiles' => [],
     // The name of the theme to use during installation.
     'theme' => 'seven',
     // The server URL where the interface translation files can be downloaded.
@@ -260,11 +261,11 @@ function install_state_defaults() {
     'task_not_complete' => FALSE,
     // A list of installation tasks which have already been performed during
     // the current page request.
-    'tasks_performed' => array(),
+    'tasks_performed' => [],
     // An array of translation files URIs available for the installation. Keyed
     // by the translation language code.
-    'translations' => array(),
-  );
+    'translations' => [],
+  ];
   return $defaults;
 }
 
@@ -352,7 +353,7 @@ function install_begin_request($class_loader, &$install_state) {
   // Register the stream wrapper manager.
   $container
     ->register('stream_wrapper_manager', 'Drupal\Core\StreamWrapper\StreamWrapperManager')
-    ->addMethodCall('setContainer', array(new Reference('service_container')));
+    ->addMethodCall('setContainer', [new Reference('service_container')]);
   $container
     ->register('file_system', 'Drupal\Core\File\FileSystem')
     ->addArgument(new Reference('stream_wrapper_manager'))
@@ -428,7 +429,7 @@ function install_begin_request($class_loader, &$install_state) {
 
   // Add list of all available profiles to the installation state.
   $listing = new ExtensionDiscovery($container->get('app.root'));
-  $listing->setProfileDirectories(array());
+  $listing->setProfileDirectories([]);
   $install_state['profiles'] += $listing->scan('profile');
 
   // Prime drupal_get_filename()'s static cache.
@@ -452,7 +453,7 @@ function install_begin_request($class_loader, &$install_state) {
 
   // Set the default language to the selected language, if any.
   if (isset($install_state['parameters']['langcode'])) {
-    $default_language = new Language(array('id' => $install_state['parameters']['langcode']));
+    $default_language = new Language(['id' => $install_state['parameters']['langcode']]);
     $container->get('language.default')->set($default_language);
     \Drupal::translation()->setDefaultLangcode($install_state['parameters']['langcode']);
   }
@@ -595,7 +596,7 @@ function install_run_task($task, &$install_state) {
       }
       // Create a one item list of batches if only one batch was provided.
       if (isset($batches['operations'])) {
-        $batches = array($batches);
+        $batches = [$batches];
       }
       foreach ($batches as $batch) {
         batch_set($batch);
@@ -725,26 +726,26 @@ function install_tasks($install_state) {
 
   // Start with the core installation tasks that run before handing control
   // to the installation profile.
-  $tasks = array(
-    'install_select_language' => array(
+  $tasks = [
+    'install_select_language' => [
       'display_name' => t('Choose language'),
       'run' => INSTALL_TASK_RUN_IF_REACHED,
-    ),
-    'install_download_translation' => array(
+    ],
+    'install_download_translation' => [
       'run' => $needs_download ? INSTALL_TASK_RUN_IF_REACHED : INSTALL_TASK_SKIP,
-    ),
-    'install_select_profile' => array(
+    ],
+    'install_select_profile' => [
       'display_name' => t('Choose profile'),
       'display' => empty($install_state['profile_info']['distribution']['name']) && count($install_state['profiles']) != 1,
       'run' => INSTALL_TASK_RUN_IF_REACHED,
-    ),
-    'install_load_profile' => array(
+    ],
+    'install_load_profile' => [
       'run' => INSTALL_TASK_RUN_IF_REACHED,
-    ),
-    'install_verify_requirements' => array(
+    ],
+    'install_verify_requirements' => [
       'display_name' => t('Verify requirements'),
-    ),
-    'install_settings_form' => array(
+    ],
+    'install_settings_form' => [
       'display_name' => t('Set up database'),
       'type' => 'form',
       // Even though the form only allows the user to enter database settings,
@@ -752,39 +753,39 @@ function install_tasks($install_state) {
       // since the form submit handler is where settings.php is rewritten.
       'run' => $install_state['settings_verified'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED,
       'function' => 'Drupal\Core\Installer\Form\SiteSettingsForm',
-    ),
-    'install_write_profile' => array(
-    ),
-    'install_verify_database_ready' => array(
+    ],
+    'install_write_profile' => [
+    ],
+    'install_verify_database_ready' => [
       'run' => $install_state['database_ready'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED,
-    ),
-    'install_base_system' => array(
+    ],
+    'install_base_system' => [
       'run' => $install_state['base_system_verified'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED,
-    ),
+    ],
     // All tasks below are executed in a regular, full Drupal environment.
-    'install_bootstrap_full' => array(
+    'install_bootstrap_full' => [
       'run' => INSTALL_TASK_RUN_IF_REACHED,
-    ),
-    'install_profile_modules' => array(
+    ],
+    'install_profile_modules' => [
       'display_name' => t('Install site'),
       'type' => 'batch',
-    ),
-    'install_profile_themes' => array(
-    ),
-    'install_install_profile' => array(
-    ),
-    'install_import_translations' => array(
+    ],
+    'install_profile_themes' => [
+    ],
+    'install_install_profile' => [
+    ],
+    'install_import_translations' => [
       'display_name' => t('Set up translations'),
       'display' => $needs_translations,
       'type' => 'batch',
       'run' => $needs_translations ? INSTALL_TASK_RUN_IF_NOT_COMPLETED : INSTALL_TASK_SKIP,
-    ),
-    'install_configure_form' => array(
+    ],
+    'install_configure_form' => [
       'display_name' => t('Configure site'),
       'type' => 'form',
       'function' => 'Drupal\Core\Installer\Form\SiteConfigureForm',
-    ),
-  );
+    ],
+  ];
 
   // Now add any tasks defined by the installation profile.
   if (!empty($install_state['parameters']['profile'])) {
@@ -805,16 +806,16 @@ function install_tasks($install_state) {
   }
 
   // Finish by adding the remaining core tasks.
-  $tasks += array(
-    'install_finish_translations' => array(
+  $tasks += [
+    'install_finish_translations' => [
       'display_name' => t('Finish translations'),
       'display' => $needs_translations,
       'type' => 'batch',
       'run' => $needs_translations ? INSTALL_TASK_RUN_IF_NOT_COMPLETED : INSTALL_TASK_SKIP,
-    ),
-    'install_finished' => array(
-    ),
-  );
+    ],
+    'install_finished' => [
+    ],
+  ];
 
   // Allow the installation profile to modify the full list of tasks.
   if (!empty($install_state['parameters']['profile'])) {
@@ -829,13 +830,13 @@ function install_tasks($install_state) {
 
   // Fill in default parameters for each task before returning the list.
   foreach ($tasks as $task_name => &$task) {
-    $task += array(
+    $task += [
       'display_name' => NULL,
       'display' => !empty($task['display_name']),
       'type' => 'normal',
       'run' => INSTALL_TASK_RUN_IF_NOT_COMPLETED,
       'function' => $task_name,
-    );
+    ];
   }
   return $tasks;
 }
@@ -856,7 +857,7 @@ function install_tasks($install_state) {
  * @see maintenance-task-list.html.twig
  */
 function install_tasks_to_display($install_state) {
-  $displayed_tasks = array();
+  $displayed_tasks = [];
   foreach (install_tasks($install_state) as $name => $task) {
     if ($task['display']) {
       $displayed_tasks[$name] = $task['display_name'];
@@ -970,39 +971,39 @@ function install_display_output($output, $install_state) {
   // resulting in /subfolder/install.php being found through search engines.
   // When settings.php is writeable this can be used via an external database
   // leading a malicious user to gain php access to the server.
-  $noindex_meta_tag = array(
+  $noindex_meta_tag = [
     '#tag' => 'meta',
-    '#attributes' => array(
+    '#attributes' => [
       'name' => 'robots',
       'content' => 'noindex, nofollow',
-    ),
-  );
+    ],
+  ];
   $output['#attached']['html_head'][] = [$noindex_meta_tag, 'install_meta_robots'];
 
   // Only show the task list if there is an active task; otherwise, the page
   // request has ended before tasks have even been started, so there is nothing
   // meaningful to show.
-  $regions = array();
+  $regions = [];
   if (isset($install_state['active_task'])) {
     // Let the theming function know when every step of the installation has
     // been completed.
     $active_task = $install_state['installation_finished'] ? NULL : $install_state['active_task'];
-    $task_list = array(
+    $task_list = [
       '#theme' => 'maintenance_task_list',
       '#items' => install_tasks_to_display($install_state),
       '#active' => $active_task,
-    );
+    ];
     $regions['sidebar_first'] = $task_list;
   }
 
   $bare_html_page_renderer = \Drupal::service('bare_html_page_renderer');
   $response = $bare_html_page_renderer->renderBarePage($output, $output['#title'], 'install_page', $regions);
-  $default_headers = array(
+  $default_headers = [
     'Expires' => 'Sun, 19 Nov 1978 05:00:00 GMT',
     'Last-Modified' => gmdate(DATE_RFC1123, REQUEST_TIME),
     'Cache-Control' => 'no-cache, must-revalidate',
     'ETag' => '"' . REQUEST_TIME . '"',
-  );
+  ];
   $response->headers->add($default_headers);
   $response->send();
   exit;
@@ -1068,13 +1069,13 @@ function install_base_system(&$install_state) {
 
   // Enable the user module so that sessions can be recorded during the
   // upcoming bootstrap step.
-  \Drupal::service('module_installer')->install(array('user'), FALSE);
+  \Drupal::service('module_installer')->install(['user'], FALSE);
 
   // Save the list of other modules to install for the upcoming tasks.
   // State can be set to the database now that system.module is installed.
   $modules = $install_state['profile_info']['dependencies'];
 
-  \Drupal::state()->set('install_profile_modules', array_diff($modules, array('system')));
+  \Drupal::state()->set('install_profile_modules', array_diff($modules, ['system']));
   $install_state['base_system_verified'] = TRUE;
 }
 
@@ -1141,13 +1142,13 @@ function install_verify_database_ready() {
  * Checks a database connection and returns any errors.
  */
 function install_database_errors($database, $settings_file) {
-  $errors = array();
+  $errors = [];
 
   // Check database type.
   $database_types = drupal_get_database_types();
   $driver = $database['driver'];
   if (!isset($database_types[$driver])) {
-    $errors['driver'] = t("In your %settings_file file you have configured @drupal to use a %driver server, however your PHP installation currently does not support this database type.", array('%settings_file' => $settings_file, '@drupal' => drupal_install_profile_distribution_name(), '%driver' => $driver));
+    $errors['driver'] = t("In your %settings_file file you have configured @drupal to use a %driver server, however your PHP installation currently does not support this database type.", ['%settings_file' => $settings_file, '@drupal' => drupal_install_profile_distribution_name(), '%driver' => $driver]);
   }
   else {
     // Run driver specific validation
@@ -1259,10 +1260,10 @@ function _install_select_profile(&$install_state) {
  * @see file_scan_directory()
  */
 function install_find_translations() {
-  $translations = array();
+  $translations = [];
   $files = \Drupal::service('string_translator.file_translation')->findTranslationFiles();
   // English does not need a translation file.
-  array_unshift($files, (object) array('name' => 'en'));
+  array_unshift($files, (object) ['name' => 'en']);
   foreach ($files as $uri => $file) {
     // Strip off the file name component before the language code.
     $langcode = preg_replace('!^(.+\.)?([^\.]+)$!', '\2', $file->name);
@@ -1383,7 +1384,7 @@ function install_retrieve_file($uri, $destination) {
   }
 
   try {
-    $response = \Drupal::httpClient()->get($uri, array('headers' => array('Accept' => 'text/plain')));
+    $response = \Drupal::httpClient()->get($uri, ['headers' => ['Accept' => 'text/plain']]);
     $data = (string) $response->getBody();
     if (empty($data)) {
       return FALSE;
@@ -1490,14 +1491,14 @@ function install_profile_modules(&$install_state) {
   // as those will not be handled by the module installer.
   install_core_entity_type_definitions();
 
-  $modules = \Drupal::state()->get('install_profile_modules') ?: array();
+  $modules = \Drupal::state()->get('install_profile_modules') ?: [];
   $files = system_rebuild_module_data();
   \Drupal::state()->delete('install_profile_modules');
 
   // Always install required modules first. Respect the dependencies between
   // the modules.
-  $required = array();
-  $non_required = array();
+  $required = [];
+  $non_required = [];
 
   // Add modules that other modules depend on.
   foreach ($modules as $module) {
@@ -1517,15 +1518,15 @@ function install_profile_modules(&$install_state) {
   arsort($required);
   arsort($non_required);
 
-  $operations = array();
+  $operations = [];
   foreach ($required + $non_required as $module => $weight) {
-    $operations[] = array('_install_module_batch', array($module, $files[$module]->info['name']));
+    $operations[] = ['_install_module_batch', [$module, $files[$module]->info['name']]];
   }
-  $batch = array(
+  $batch = [
     'operations' => $operations,
-    'title' => t('Installing @drupal', array('@drupal' => drupal_install_profile_distribution_name())),
+    'title' => t('Installing @drupal', ['@drupal' => drupal_install_profile_distribution_name()]),
     'error_message' => t('The installation has encountered an error.'),
-  );
+  ];
   return $batch;
 }
 
@@ -1558,7 +1559,7 @@ function install_profile_themes(&$install_state) {
 
   // Ensure that the install profile's theme is used.
   // @see _drupal_maintenance_theme()
-  \Drupal::service('theme.manager')->resetActiveTheme();
+  \Drupal::theme()->resetActiveTheme();
 }
 
 /**
@@ -1568,7 +1569,7 @@ function install_profile_themes(&$install_state) {
  *   An array of information about the current installation state.
  */
 function install_install_profile(&$install_state) {
-  \Drupal::service('module_installer')->install(array(drupal_get_profile()), FALSE);
+  \Drupal::service('module_installer')->install([drupal_get_profile()], FALSE);
   // Install all available optional config. During installation the module order
   // is determined by dependencies. If there are no dependencies between modules
   // then the order in which they are installed is dependent on random factors
@@ -1580,7 +1581,7 @@ function install_install_profile(&$install_state) {
 
   // Ensure that the install profile's theme is used.
   // @see _drupal_maintenance_theme()
-  \Drupal::service('theme.manager')->resetActiveTheme();
+  \Drupal::theme()->resetActiveTheme();
 }
 
 /**
@@ -1611,21 +1612,21 @@ function install_download_additional_translations_operations(&$install_state) {
       ->save();
     \Drupal::service('language.default')->set($language);
     if (empty($install_state['profile_info']['keep_english'])) {
-      entity_delete_multiple('configurable_language', array('en'));
+      entity_delete_multiple('configurable_language', ['en']);
     }
   }
 
   // If there is more than one language or the single one is not English, we
   // should download/import translations.
   $languages = \Drupal::languageManager()->getLanguages();
-  $operations = array();
+  $operations = [];
   foreach ($languages as $langcode => $language) {
     // The installer language was already downloaded. Check downloads for the
     // other languages if any. Ignore any download errors here, since we
     // are in the middle of an install process and there is no way back. We
     // will not import what we cannot download.
     if ($langcode != 'en' && $langcode != $install_state['parameters']['langcode']) {
-      $operations[] = array('install_check_translations', array($langcode, $install_state['server_pattern']));
+      $operations[] = ['install_check_translations', [$langcode, $install_state['server_pattern']]];
     }
   }
   return $operations;
@@ -1648,26 +1649,26 @@ function install_import_translations(&$install_state) {
   $operations = install_download_additional_translations_operations($install_state);
   $languages = \Drupal::languageManager()->getLanguages();
   if (count($languages) > 1 || !isset($languages['en'])) {
-    $operations[] = array('_install_prepare_import', array(array_keys($languages), $install_state['server_pattern']));
+    $operations[] = ['_install_prepare_import', [array_keys($languages), $install_state['server_pattern']]];
 
     // Set up a batch to import translations for drupal core. Translation import
     // for contrib modules happens in install_import_translations_remaining.
     foreach ($languages as $language) {
       if (locale_translation_use_remote_source()) {
-        $operations[] = array('locale_translation_batch_fetch_download', array('drupal', $language->getId()));
+        $operations[] = ['locale_translation_batch_fetch_download', ['drupal', $language->getId()]];
       }
-      $operations[] = array('locale_translation_batch_fetch_import', array('drupal', $language->getId(), array()));
+      $operations[] = ['locale_translation_batch_fetch_import', ['drupal', $language->getId(), []]];
     }
 
     module_load_include('fetch.inc', 'locale');
-    $batch = array(
+    $batch = [
       'operations' => $operations,
       'title' => t('Updating translations.'),
       'progress_message' => '',
       'error_message' => t('Error importing translation files'),
       'finished' => 'locale_translation_batch_fetch_finished',
       'file' => drupal_get_path('module', 'locale') . '/locale.batch.inc',
-    );
+    ];
     return $batch;
   }
 }
@@ -1682,11 +1683,11 @@ function install_import_translations(&$install_state) {
  */
 function _install_prepare_import($langcodes, $server_pattern) {
   \Drupal::moduleHandler()->loadInclude('locale', 'bulk.inc');
-  $matches = array();
+  $matches = [];
 
   foreach ($langcodes as $langcode) {
     // Get the translation files located in the translations directory.
-    $files = locale_translate_get_interface_translation_files(array('drupal'), array($langcode));
+    $files = locale_translate_get_interface_translation_files(['drupal'], [$langcode]);
     // Pick the first file which matches the language, if any.
     $file = reset($files);
     if (is_object($file)) {
@@ -1699,17 +1700,17 @@ function _install_prepare_import($langcodes, $server_pattern) {
         // we check if at least the major version number is available.
         if ($info['major']) {
           $core = $info['major'] . '.x';
-          $data = array(
+          $data = [
             'name' => 'drupal',
             'project_type' => 'module',
             'core' => $core,
             'version' => $version,
             'server_pattern' => $server_pattern,
             'status' => 1,
-          );
+          ];
           \Drupal::service('locale.project')->set($data['name'], $data);
           module_load_include('compare.inc', 'locale');
-          locale_translation_check_projects_local(array('drupal'), array($langcode));
+          locale_translation_check_projects_local(['drupal'], [$langcode]);
         }
       }
     }
@@ -1738,16 +1739,16 @@ function install_finish_translations(&$install_state) {
   // using a batch.
   $projects = locale_translation_build_projects();
   $languages = \Drupal::languageManager()->getLanguages();
-  $batches = array();
+  $batches = [];
   if (count($projects) > 1) {
     $options = _locale_translation_default_update_options();
-    if ($batch = locale_translation_batch_update_build(array(), array_keys($languages), $options)) {
+    if ($batch = locale_translation_batch_update_build([], array_keys($languages), $options)) {
       $batches[] = $batch;
     }
   }
 
   // Creates configuration translations.
-  $batches[] = locale_config_batch_update_components(array(), array_keys($languages));
+  $batches[] = locale_config_batch_update_components([], array_keys($languages));
   return $batches;
 }
 
@@ -1784,9 +1785,9 @@ function install_finished(&$install_state) {
     user_login_finalize($account);
   }
 
-  $success_message = t('Congratulations, you installed @drupal!', array(
+  $success_message = t('Congratulations, you installed @drupal!', [
     '@drupal' => drupal_install_profile_distribution_name(),
-  ));
+  ]);
   drupal_set_message($success_message);
 }
 
@@ -1796,9 +1797,9 @@ function install_finished(&$install_state) {
  * Performs batch installation of modules.
  */
 function _install_module_batch($module, $module_name, &$context) {
-  \Drupal::service('module_installer')->install(array($module), FALSE);
+  \Drupal::service('module_installer')->install([$module], FALSE);
   $context['results'][] = $module;
-  $context['message'] = t('Installed %module module.', array('%module' => $module_name));
+  $context['message'] = t('Installed %module module.', ['%module' => $module_name]);
 }
 
 /**
@@ -1815,7 +1816,7 @@ function _install_module_batch($module, $module_name, &$context) {
  *   error with detailed information.
  */
 function install_check_translations($langcode, $server_pattern) {
-  $requirements = array();
+  $requirements = [];
 
   $readable = FALSE;
   $writable = FALSE;
@@ -1844,12 +1845,12 @@ function install_check_translations($langcode, $server_pattern) {
   }
 
   // Build URL for the translation file and the translation server.
-  $variables = array(
+  $variables = [
     '%project' => 'drupal',
     '%version' => \Drupal::VERSION,
     '%core' => \Drupal::CORE_COMPATIBILITY,
     '%language' => $langcode,
-  );
+  ];
   $translation_url = strtr($server_pattern, $variables);
 
   $elements = parse_url($translation_url);
@@ -1873,73 +1874,73 @@ function install_check_translations($langcode, $server_pattern) {
 
   // If the translations directory does not exists, throw an error.
   if (!$translations_directory_exists) {
-    $requirements['translations directory exists'] = array(
+    $requirements['translations directory exists'] = [
       'title'       => t('Translations directory'),
       'value'       => t('The translations directory does not exist.'),
       'severity'    => REQUIREMENT_ERROR,
-      'description' => t('The installer requires that you create a translations directory as part of the installation process. Create the directory %translations_directory . More details about installing Drupal are available in <a href=":install_txt">INSTALL.txt</a>.', array('%translations_directory' => $translations_directory, ':install_txt' => base_path() . 'core/INSTALL.txt')),
-    );
+      'description' => t('The installer requires that you create a translations directory as part of the installation process. Create the directory %translations_directory . More details about installing Drupal are available in <a href=":install_txt">INSTALL.txt</a>.', ['%translations_directory' => $translations_directory, ':install_txt' => base_path() . 'core/INSTALL.txt']),
+    ];
   }
   else {
-    $requirements['translations directory exists'] = array(
+    $requirements['translations directory exists'] = [
       'title'       => t('Translations directory'),
-      'value'       => t('The directory %translations_directory exists.', array('%translations_directory' => $translations_directory)),
-    );
+      'value'       => t('The directory %translations_directory exists.', ['%translations_directory' => $translations_directory]),
+    ];
     // If the translations directory is not readable, throw an error.
     if (!$readable) {
-      $requirements['translations directory readable'] = array(
+      $requirements['translations directory readable'] = [
         'title'       => t('Translations directory'),
         'value'       => t('The translations directory is not readable.'),
         'severity'    => REQUIREMENT_ERROR,
-        'description' => t('The installer requires read permissions to %translations_directory at all times. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', array('%translations_directory' => $translations_directory, ':handbook_url' => 'https://www.drupal.org/server-permissions')),
-      );
+        'description' => t('The installer requires read permissions to %translations_directory at all times. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', ['%translations_directory' => $translations_directory, ':handbook_url' => 'https://www.drupal.org/server-permissions']),
+      ];
     }
     // If translations directory is not writable, throw an error.
     if (!$writable) {
-      $requirements['translations directory writable'] = array(
+      $requirements['translations directory writable'] = [
         'title'       => t('Translations directory'),
         'value'       => t('The translations directory is not writable.'),
         'severity'    => REQUIREMENT_ERROR,
-        'description' => t('The installer requires write permissions to %translations_directory during the installation process. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', array('%translations_directory' => $translations_directory, ':handbook_url' => 'https://www.drupal.org/server-permissions')),
-      );
+        'description' => t('The installer requires write permissions to %translations_directory during the installation process. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', ['%translations_directory' => $translations_directory, ':handbook_url' => 'https://www.drupal.org/server-permissions']),
+      ];
     }
     else {
-      $requirements['translations directory writable'] = array(
+      $requirements['translations directory writable'] = [
         'title'       => t('Translations directory'),
         'value'       => t('The translations directory is writable.'),
-      );
+      ];
     }
   }
 
   // If the translations server can not be contacted, throw an error.
   if (!$online) {
-    $requirements['online'] = array(
+    $requirements['online'] = [
       'title'       => t('Internet'),
       'value'       => t('The translation server is offline.'),
       'severity'    => REQUIREMENT_ERROR,
-      'description' => t('The installer requires to contact the translation server to download a translation file. Check your internet connection and verify that your website can reach the translation server at <a href=":server_url">@server_url</a>.', array(':server_url' => $server_url, '@server_url' => $server_url)),
-    );
+      'description' => t('The installer requires to contact the translation server to download a translation file. Check your internet connection and verify that your website can reach the translation server at <a href=":server_url">@server_url</a>.', [':server_url' => $server_url, '@server_url' => $server_url]),
+    ];
   }
   else {
-    $requirements['online'] = array(
+    $requirements['online'] = [
       'title'       => t('Internet'),
       'value'       => t('The translation server is online.'),
-    );
+    ];
     // If translation file is not found at the translation server, throw an
     // error.
     if (!$translation_available) {
-      $requirements['translation available'] = array(
+      $requirements['translation available'] = [
         'title'       => t('Translation'),
-        'value'       => t('The %language translation is not available.', array('%language' => $language)),
+        'value'       => t('The %language translation is not available.', ['%language' => $language]),
         'severity'    => REQUIREMENT_ERROR,
-        'description' => t('The %language translation file is not available at the translation server. <a href=":url">Choose a different language</a> or select English and translate your website later.', array('%language' => $language, ':url' => $_SERVER['SCRIPT_NAME'])),
-      );
+        'description' => t('The %language translation file is not available at the translation server. <a href=":url">Choose a different language</a> or select English and translate your website later.', ['%language' => $language, ':url' => $_SERVER['SCRIPT_NAME']]),
+      ];
     }
     else {
-      $requirements['translation available'] = array(
+      $requirements['translation available'] = [
         'title'       => t('Translation'),
-        'value'       => t('The %language translation is available.', array('%language' => $language)),
-      );
+        'value'       => t('The %language translation is available.', ['%language' => $language]),
+      ];
     }
   }
 
@@ -1947,12 +1948,12 @@ function install_check_translations($langcode, $server_pattern) {
     $translation_downloaded = install_retrieve_file($translation_url, $translations_directory);
 
     if (!$translation_downloaded) {
-      $requirements['translation downloaded'] = array(
+      $requirements['translation downloaded'] = [
         'title'       => t('Translation'),
-        'value'       => t('The %language translation could not be downloaded.', array('%language' => $language)),
+        'value'       => t('The %language translation could not be downloaded.', ['%language' => $language]),
         'severity'    => REQUIREMENT_ERROR,
-        'description' => t('The %language translation file could not be downloaded. <a href=":url">Choose a different language</a> or select English and translate your website later.', array('%language' => $language, ':url' => $_SERVER['SCRIPT_NAME'])),
-      );
+        'description' => t('The %language translation file could not be downloaded. <a href=":url">Choose a different language</a> or select English and translate your website later.', ['%language' => $language, ':url' => $_SERVER['SCRIPT_NAME']]),
+      ];
     }
   }
 
@@ -1974,14 +1975,14 @@ function install_check_requirements($install_state) {
 
   // If Drupal is not set up already, we need to try to create the default
   // settings and services files.
-  $default_files = array();
-  $default_files['settings.php'] = array(
+  $default_files = [];
+  $default_files['settings.php'] = [
     'file' => 'settings.php',
     'file_default' => 'default.settings.php',
     'title_default' => t('Default settings file'),
     'description_default' => t('The default settings file does not exist.'),
     'title' => t('Settings file'),
-  );
+  ];
 
   foreach ($default_files as $default_file_info) {
     $readable = FALSE;
@@ -2003,15 +2004,15 @@ function install_check_requirements($install_state) {
     // If the default $default_file does not exist, or is not readable,
     // report an error.
     if (!drupal_verify_install_file($default_file, FILE_EXIST | FILE_READABLE)) {
-      $requirements["default $file file exists"] = array(
+      $requirements["default $file file exists"] = [
         'title' => $default_file_info['title_default'],
         'value' => $default_file_info['description_default'],
         'severity' => REQUIREMENT_ERROR,
-        'description' => t('The @drupal installer requires that the %default-file file not be modified in any way from the original download.', array(
+        'description' => t('The @drupal installer requires that the %default-file file not be modified in any way from the original download.', [
             '@drupal' => drupal_install_profile_distribution_name(),
             '%default-file' => $default_file
-          )),
-      );
+          ]),
+      ];
     }
     // Otherwise, if $file does not exist yet, we can try to copy
     // $default_file to create it.
@@ -2062,68 +2063,68 @@ function install_check_requirements($install_state) {
 
     // If the $file does not exist, throw an error.
     if (!$exists) {
-      $requirements["$file file exists"] = array(
+      $requirements["$file file exists"] = [
         'title' => $default_file_info['title'],
-        'value' => t('The %file does not exist.', array('%file' => $default_file_info['title'])),
+        'value' => t('The %file does not exist.', ['%file' => $default_file_info['title']]),
         'severity' => REQUIREMENT_ERROR,
-        'description' => t('The @drupal installer requires that you create a %file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in <a href=":install_txt">INSTALL.txt</a>.', array(
+        'description' => t('The @drupal installer requires that you create a %file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in <a href=":install_txt">INSTALL.txt</a>.', [
             '@drupal' => drupal_install_profile_distribution_name(),
             '%file' => $file,
             '%default_file' => $default_file,
             ':install_txt' => base_path() . 'core/INSTALL.txt'
-          )),
-      );
+          ]),
+      ];
     }
     else {
-      $requirements["$file file exists"] = array(
+      $requirements["$file file exists"] = [
         'title' => $default_file_info['title'],
-        'value' => t('The %file exists.', array('%file' => $file)),
-      );
+        'value' => t('The %file exists.', ['%file' => $file]),
+      ];
       // If the $file is not readable, throw an error.
       if (!$readable) {
-        $requirements["$file file readable"] = array(
+        $requirements["$file file readable"] = [
           'title' => $default_file_info['title'],
-          'value' => t('The %file is not readable.', array('%file' => $default_file_info['title'])),
+          'value' => t('The %file is not readable.', ['%file' => $default_file_info['title']]),
           'severity' => REQUIREMENT_ERROR,
-          'description' => t('@drupal requires read permissions to %file at all times. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', array(
+          'description' => t('@drupal requires read permissions to %file at all times. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', [
               '@drupal' => drupal_install_profile_distribution_name(),
               '%file' => $file,
               ':handbook_url' => 'https://www.drupal.org/server-permissions'
-            )),
-        );
+            ]),
+        ];
       }
       // If the $file is not writable, throw an error.
       if (!$writable) {
-        $requirements["$file file writeable"] = array(
+        $requirements["$file file writeable"] = [
           'title' => $default_file_info['title'],
-          'value' => t('The %file is not writable.', array('%file' => $default_file_info['title'])),
+          'value' => t('The %file is not writable.', ['%file' => $default_file_info['title']]),
           'severity' => REQUIREMENT_ERROR,
-          'description' => t('The @drupal installer requires write permissions to %file during the installation process. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', array(
+          'description' => t('The @drupal installer requires write permissions to %file during the installation process. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', [
               '@drupal' => drupal_install_profile_distribution_name(),
               '%file' => $file,
               ':handbook_url' => 'https://www.drupal.org/server-permissions'
-            )),
-        );
+            ]),
+        ];
       }
       else {
-        $requirements["$file file"] = array(
+        $requirements["$file file"] = [
           'title' => $default_file_info['title'],
-          'value' => t('The @file is writable.', array('@file' => $default_file_info['title'])),
-        );
+          'value' => t('The @file is writable.', ['@file' => $default_file_info['title']]),
+        ];
       }
       if (!empty($settings_file_ownership_error)) {
-        $requirements["$file file ownership"] = array(
+        $requirements["$file file ownership"] = [
           'title' => $default_file_info['title'],
-          'value' => t('The @file is owned by the web server.', array('@file' => $default_file_info['title'])),
+          'value' => t('The @file is owned by the web server.', ['@file' => $default_file_info['title']]),
           'severity' => REQUIREMENT_ERROR,
-          'description' => t('The @drupal installer failed to create a %file file with proper file ownership. Log on to your web server, remove the existing %file file, and create a new one by copying the %default_file file to %file. More details about installing Drupal are available in <a href=":install_txt">INSTALL.txt</a>. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', array(
+          'description' => t('The @drupal installer failed to create a %file file with proper file ownership. Log on to your web server, remove the existing %file file, and create a new one by copying the %default_file file to %file. More details about installing Drupal are available in <a href=":install_txt">INSTALL.txt</a>. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', [
               '@drupal' => drupal_install_profile_distribution_name(),
               '%file' => $file,
               '%default_file' => $default_file,
               ':install_txt' => base_path() . 'core/INSTALL.txt',
               ':handbook_url' => 'https://www.drupal.org/server-permissions'
-            )),
-        );
+            ]),
+        ];
       }
     }
   }
@@ -2157,21 +2158,21 @@ function install_display_requirements($install_state, $requirements) {
   // and indicating a desire to continue anyway. See drupal_requirements_url().
   if ($severity == REQUIREMENT_ERROR || ($severity == REQUIREMENT_WARNING && empty($install_state['parameters']['continue']))) {
     if ($install_state['interactive']) {
-      $build['report']['#theme'] = 'status_report';
+      $build['report']['#type'] = 'status_report';
       $build['report']['#requirements'] = $requirements;
       if ($severity == REQUIREMENT_WARNING) {
         $build['#title'] = t('Requirements review');
-        $build['#suffix'] = t('Check the messages and <a href=":retry">retry</a>, or you may choose to <a href=":cont">continue anyway</a>.', array(':retry' => drupal_requirements_url(REQUIREMENT_ERROR), ':cont' => drupal_requirements_url($severity)));
+        $build['#suffix'] = t('Check the messages and <a href=":retry">retry</a>, or you may choose to <a href=":cont">continue anyway</a>.', [':retry' => drupal_requirements_url(REQUIREMENT_ERROR), ':cont' => drupal_requirements_url($severity)]);
       }
       else {
         $build['#title'] = t('Requirements problem');
-        $build['#suffix'] = t('Check the messages and <a href=":url">try again</a>.', array(':url' => drupal_requirements_url($severity)));
+        $build['#suffix'] = t('Check the messages and <a href=":url">try again</a>.', [':url' => drupal_requirements_url($severity)]);
       }
       return $build;
     }
     else {
       // Throw an exception showing any unmet requirements.
-      $failures = array();
+      $failures = [];
       foreach ($requirements as $requirement) {
         // Skip warnings altogether for non-interactive installations; these
         // proceed in a single request so there is no good opportunity (and no
@@ -2188,18 +2189,31 @@ function install_display_requirements($install_state, $requirements) {
 }
 
 /**
- * Installation task; ensures install profile is written to settings.php.
+ * Installation task; writes profile to settings.php if possible.
  *
  * @param array $install_state
  *   An array of information about the current installation state.
+ *
+ * @see _install_select_profile()
+ *
+ * @throws \Drupal\Core\Installer\Exception\InstallProfileMismatchException
+ *
+ * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. The
+ *    install profile is written to core.extension.
  */
 function install_write_profile($install_state) {
-  if (Settings::get('install_profile') !== $install_state['parameters']['profile']) {
+  // Only need to write to settings.php if it is possible. The primary storage
+  // for the install profile is the core.extension configuration.
+  $settings_path = \Drupal::service('site.path') . '/settings.php';
+  if (is_writable($settings_path)) {
     // Remember the profile which was used.
-    $settings['settings']['install_profile'] = (object) array(
+    $settings['settings']['install_profile'] = (object) [
       'value' => $install_state['parameters']['profile'],
       'required' => TRUE,
-    );
+    ];
     drupal_rewrite_settings($settings);
   }
+  elseif (($settings_profile = Settings::get('install_profile')) && $settings_profile !== $install_state['parameters']['profile']) {
+    throw new InstallProfileMismatchException($install_state['parameters']['profile'], $settings_profile, $settings_path, \Drupal::translation());
+  }
 }
diff --git a/web/core/includes/install.inc b/web/core/includes/install.inc
index 49dd4cb57..c5b93b58a 100644
--- a/web/core/includes/install.inc
+++ b/web/core/includes/install.inc
@@ -96,7 +96,7 @@ function drupal_load_updates() {
 function drupal_install_profile_distribution_name() {
   // During installation, the profile information is stored in the global
   // installation state (it might not be saved anywhere yet).
-  $info = array();
+  $info = [];
   if (drupal_installation_attempted()) {
     global $install_state;
     if (isset($install_state['profile_info'])) {
@@ -158,14 +158,14 @@ function drupal_detect_database_types() {
  *   An array of available database driver installer objects.
  */
 function drupal_get_database_types() {
-  $databases = array();
-  $drivers = array();
+  $databases = [];
+  $drivers = [];
 
   // The internal database driver name is any valid PHP identifier.
   $mask = '/^' . DRUPAL_PHP_FUNCTION_PATTERN . '$/';
-  $files = file_scan_directory(DRUPAL_ROOT . '/core/lib/Drupal/Core/Database/Driver', $mask, array('recurse' => FALSE));
+  $files = file_scan_directory(DRUPAL_ROOT . '/core/lib/Drupal/Core/Database/Driver', $mask, ['recurse' => FALSE]);
   if (is_dir(DRUPAL_ROOT . '/drivers/lib/Drupal/Driver/Database')) {
-    $files += file_scan_directory(DRUPAL_ROOT . '/drivers/lib/Drupal/Driver/Database/', $mask, array('recurse' => FALSE));
+    $files += file_scan_directory(DRUPAL_ROOT . '/drivers/lib/Drupal/Driver/Database/', $mask, ['recurse' => FALSE]);
   }
   foreach ($files as $file) {
     if (file_exists($file->uri . '/Install/Tasks.php')) {
@@ -183,7 +183,7 @@ function drupal_get_database_types() {
   if (isset($databases['mysql'])) {
     $mysql_database = $databases['mysql'];
     unset($databases['mysql']);
-    $databases = array('mysql' => $mysql_database) + $databases;
+    $databases = ['mysql' => $mysql_database] + $databases;
   }
 
   return $databases;
@@ -213,13 +213,13 @@ function drupal_get_database_types() {
  *   $config_directories['sync'] = 'config_hash/sync'
  *   @endcode
  */
-function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
+function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
   if (!isset($settings_file)) {
     $settings_file = \Drupal::service('site.path') . '/settings.php';
   }
   // Build list of setting names and insert the values into the global namespace.
-  $variable_names = array();
-  $settings_settings = array();
+  $variable_names = [];
+  $settings_settings = [];
   foreach ($settings as $setting => $data) {
     if ($setting != 'settings') {
       _drupal_rewrite_settings_global($GLOBALS[$setting], $data);
@@ -248,7 +248,7 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
         $value = $token;
       }
       // Do not operate on whitespace.
-      if (!in_array($type, array(T_WHITESPACE, T_COMMENT, T_DOC_COMMENT))) {
+      if (!in_array($type, [T_WHITESPACE, T_COMMENT, T_DOC_COMMENT])) {
         switch ($state) {
           case 'default':
             if ($type === T_VARIABLE && isset($variable_names[$value])) {
@@ -335,7 +335,7 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
 
     // Write the new settings file.
     if (file_put_contents($settings_file, $buffer) === FALSE) {
-      throw new Exception(t('Failed to modify %settings. Verify the file permissions.', array('%settings' => $settings_file)));
+      throw new Exception(t('Failed to modify %settings. Verify the file permissions.', ['%settings' => $settings_file]));
     }
     else {
       // In case any $settings variables were written, import them into the
@@ -352,7 +352,7 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
     }
   }
   else {
-    throw new Exception(t('Failed to open %settings. Verify the file permissions.', array('%settings' => $settings_file)));
+    throw new Exception(t('Failed to open %settings. Verify the file permissions.', ['%settings' => $settings_file]));
   }
 }
 
@@ -375,7 +375,7 @@ function _drupal_rewrite_settings_is_simple($type, $value) {
   $is_integer = $type == T_LNUMBER;
   $is_float = $type == T_DNUMBER;
   $is_string = $type == T_CONSTANT_ENCAPSED_STRING;
-  $is_boolean_or_null = $type == T_STRING && in_array(strtoupper($value), array('TRUE', 'FALSE', 'NULL'));
+  $is_boolean_or_null = $type == T_STRING && in_array(strtoupper($value), ['TRUE', 'FALSE', 'NULL']);
   return $is_integer || $is_float || $is_string || $is_boolean_or_null;
 }
 
@@ -504,10 +504,10 @@ function drupal_install_config_directories() {
   // Bail out using a similar error message as in system_requirements().
   if (!file_prepare_directory($config_directories[CONFIG_SYNC_DIRECTORY], FILE_CREATE_DIRECTORY)
     && !file_exists($config_directories[CONFIG_SYNC_DIRECTORY])) {
-    throw new Exception(t('The directory %directory could not be created. To proceed with the installation, either create the directory or ensure that the installer has the permissions to create it automatically. For more information, see the <a href=":handbook_url">online handbook</a>.', array(
+    throw new Exception(t('The directory %directory could not be created. To proceed with the installation, either create the directory or ensure that the installer has the permissions to create it automatically. For more information, see the <a href=":handbook_url">online handbook</a>.', [
       '%directory' => config_get_config_directory(CONFIG_SYNC_DIRECTORY),
       ':handbook_url' => 'https://www.drupal.org/server-permissions',
-    )));
+    ]));
   }
   elseif (is_writable($config_directories[CONFIG_SYNC_DIRECTORY])) {
     // Put a README.txt into the sync config directory. This is required so that
@@ -560,7 +560,7 @@ function drupal_verify_profile($install_state) {
 
   // Get the list of available modules for the selected installation profile.
   $listing = new ExtensionDiscovery(\Drupal::root());
-  $present_modules = array();
+  $present_modules = [];
   foreach ($listing->scan('module') as $present_module) {
     $present_modules[] = $present_module->getName();
   }
@@ -572,7 +572,7 @@ function drupal_verify_profile($install_state) {
   // Verify that all of the profile's required modules are present.
   $missing_modules = array_diff($info['dependencies'], $present_modules);
 
-  $requirements = array();
+  $requirements = [];
 
   if ($missing_modules) {
     $build = [
@@ -581,16 +581,16 @@ function drupal_verify_profile($install_state) {
     ];
 
     foreach ($missing_modules as $module) {
-      $build['#items'][] = array('#markup' => '<span class="admin-missing">' . Unicode::ucfirst($module) . '</span>');
+      $build['#items'][] = ['#markup' => '<span class="admin-missing">' . Unicode::ucfirst($module) . '</span>'];
     }
 
     $modules_list = \Drupal::service('renderer')->renderPlain($build);
-    $requirements['required_modules'] = array(
+    $requirements['required_modules'] = [
       'title' => t('Required modules'),
       'value' => t('Required modules not found.'),
       'severity' => REQUIREMENT_ERROR,
-      'description' => t('The following modules are required but were not found. Move them into the appropriate modules subdirectory, such as <em>/modules</em>. Missing modules: @modules', array('@modules' => $modules_list)),
-    );
+      'description' => t('The following modules are required but were not found. Move them into the appropriate modules subdirectory, such as <em>/modules</em>. Missing modules: @modules', ['@modules' => $modules_list]),
+    ];
   }
   return $requirements;
 }
@@ -621,8 +621,14 @@ function drupal_install_system($install_state) {
   // Install base system configuration.
   \Drupal::service('config.installer')->installDefaultConfig('core', 'core');
 
+  // Store the installation profile in configuration to populate the
+  // 'install_profile' container parameter.
+  \Drupal::configFactory()->getEditable('core.extension')
+    ->set('profile', $install_state['parameters']['profile'])
+    ->save();
+
   // Install System module and rebuild the newly available routes.
-  $kernel->getContainer()->get('module_installer')->install(array('system'), FALSE);
+  $kernel->getContainer()->get('module_installer')->install(['system'], FALSE);
   \Drupal::service('router.builder')->rebuild();
 
   // Ensure default language is saved.
@@ -663,7 +669,7 @@ function drupal_verify_install_file($file, $mask = NULL, $type = 'file') {
 
   // Verify file permissions.
   if (isset($mask)) {
-    $masks = array(FILE_EXIST, FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE);
+    $masks = [FILE_EXIST, FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE];
     foreach ($masks as $current_mask) {
       if ($mask & $current_mask) {
         switch ($current_mask) {
@@ -729,7 +735,7 @@ function drupal_verify_install_file($file, $mask = NULL, $type = 'file') {
  */
 function drupal_install_mkdir($file, $mask, $message = TRUE) {
   $mod = 0;
-  $masks = array(FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE);
+  $masks = [FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE];
   foreach ($masks as $m) {
     if ($mask & $m) {
       switch ($m) {
@@ -783,7 +789,7 @@ function drupal_install_fix_file($file, $mask, $message = TRUE) {
   }
 
   $mod = fileperms($file) & 0777;
-  $masks = array(FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE);
+  $masks = [FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE];
 
   // FILE_READABLE, FILE_WRITABLE, and FILE_EXECUTABLE permission strings
   // can theoretically be 0400, 0200, and 0100 respectively, but to be safe
@@ -845,10 +851,10 @@ function drupal_install_fix_file($file, $mask, $message = TRUE) {
  */
 function install_goto($path) {
   global $base_url;
-  $headers = array(
+  $headers = [
     // Not a permanent redirect.
     'Cache-Control' => 'no-cache',
-  );
+  ];
   $response = new RedirectResponse($base_url . '/' . $path, 302, $headers);
   $response->send();
 }
@@ -880,7 +886,7 @@ function install_goto($path) {
  * @see drupal_requirements_url()
  * @see Drupal\Component\Utility\UrlHelper::filterBadProtocol()
  */
-function drupal_current_script_url($query = array()) {
+function drupal_current_script_url($query = []) {
   $uri = $_SERVER['SCRIPT_NAME'];
   $query = array_merge(UrlHelper::filterQueryParameters(\Drupal::request()->query->all()), $query);
   if (!empty($query)) {
@@ -910,7 +916,7 @@ function drupal_current_script_url($query = array()) {
  * @see \Drupal\Component\Utility\UrlHelper::filterBadProtocol()
  */
 function drupal_requirements_url($severity) {
-  $query = array();
+  $query = [];
   // If there are no errors, only warnings, append 'continue=1' to the URL so
   // the user can bypass this screen on the next page load.
   if ($severity == REQUIREMENT_WARNING) {
@@ -931,7 +937,7 @@ function drupal_requirements_url($severity) {
 function drupal_check_profile($profile) {
   $info = install_profile_info($profile);
   // Collect requirement testing results.
-  $requirements = array();
+  $requirements = [];
   // Performs an ExtensionDiscovery scan as the system module is unavailable and
   // we don't yet know where all the modules are located.
   // @todo Remove as part of https://www.drupal.org/node/2186491
@@ -994,14 +1000,14 @@ function drupal_requirements_severity(&$requirements) {
 function drupal_check_module($module) {
   module_load_install($module);
   // Check requirements
-  $requirements = \Drupal::moduleHandler()->invoke($module, 'requirements', array('install'));
+  $requirements = \Drupal::moduleHandler()->invoke($module, 'requirements', ['install']);
   if (is_array($requirements) && drupal_requirements_severity($requirements) == REQUIREMENT_ERROR) {
     // Print any error messages
     foreach ($requirements as $requirement) {
       if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) {
         $message = $requirement['description'];
         if (isset($requirement['value']) && $requirement['value']) {
-          $message = t('@requirements_message (Currently using @item version @version)', array('@requirements_message' => $requirement['description'], '@item' => $requirement['title'], '@version' => $requirement['value']));
+          $message = t('@requirements_message (Currently using @item version @version)', ['@requirements_message' => $requirement['description'], '@item' => $requirement['title'], '@version' => $requirement['value']]);
         }
         drupal_set_message($message, 'error');
       }
@@ -1060,27 +1066,27 @@ function drupal_check_module($module) {
  *   The info array.
  */
 function install_profile_info($profile, $langcode = 'en') {
-  $cache = &drupal_static(__FUNCTION__, array());
+  $cache = &drupal_static(__FUNCTION__, []);
 
   if (!isset($cache[$profile][$langcode])) {
     // Set defaults for module info.
-    $defaults = array(
-      'dependencies' => array(),
-      'themes' => array('stark'),
+    $defaults = [
+      'dependencies' => [],
+      'themes' => ['stark'],
       'description' => '',
       'version' => NULL,
       'hidden' => FALSE,
       'php' => DRUPAL_MINIMUM_PHP,
-    );
+    ];
     $profile_file = drupal_get_path('profile', $profile) . "/$profile.info.yml";
     $info = \Drupal::service('info_parser')->parse($profile_file);
     $info += $defaults;
 
     // drupal_required_modules() includes the current profile as a dependency.
     // Remove that dependency, since a module cannot depend on itself.
-    $required = array_diff(drupal_required_modules(), array($profile));
+    $required = array_diff(drupal_required_modules(), [$profile]);
 
-    $locale = !empty($langcode) && $langcode != 'en' ? array('locale') : array();
+    $locale = !empty($langcode) && $langcode != 'en' ? ['locale'] : [];
 
     $info['dependencies'] = array_unique(array_merge($required, $info['dependencies'], $locale));
 
diff --git a/web/core/includes/menu.inc b/web/core/includes/menu.inc
index 9dbbc2037..a75d008c8 100644
--- a/web/core/includes/menu.inc
+++ b/web/core/includes/menu.inc
@@ -28,27 +28,27 @@ use Drupal\Core\Render\Element;
  */
 function template_preprocess_menu_local_task(&$variables) {
   $link = $variables['element']['#link'];
-  $link += array(
-    'localized_options' => array(),
-  );
+  $link += [
+    'localized_options' => [],
+  ];
   $link_text = $link['title'];
 
   if (!empty($variables['element']['#active'])) {
     $variables['is_active'] = TRUE;
 
     // Add text to indicate active tab for non-visual users.
-    $active = SafeMarkup::format('<span class="visually-hidden">@label</span>', array('@label' => t('(active tab)')));
-    $link_text = t('@local-task-title@active', array('@local-task-title' => $link_text, '@active' => $active));
+    $active = SafeMarkup::format('<span class="visually-hidden">@label</span>', ['@label' => t('(active tab)')]);
+    $link_text = t('@local-task-title@active', ['@local-task-title' => $link_text, '@active' => $active]);
   }
 
   $link['localized_options']['set_active_class'] = TRUE;
 
-  $variables['link'] = array(
+  $variables['link'] = [
     '#type' => 'link',
     '#title' => $link_text,
     '#url' => $link['url'],
     '#options' => $link['localized_options'],
-  );
+  ];
 }
 
 /**
@@ -64,32 +64,32 @@ function template_preprocess_menu_local_task(&$variables) {
  */
 function template_preprocess_menu_local_action(&$variables) {
   $link = $variables['element']['#link'];
-  $link += array(
-    'localized_options' => array(),
-  );
+  $link += [
+    'localized_options' => [],
+  ];
   $link['localized_options']['attributes']['class'][] = 'button';
   $link['localized_options']['attributes']['class'][] = 'button-action';
   $link['localized_options']['set_active_class'] = TRUE;
 
-  $variables['link'] = array(
+  $variables['link'] = [
     '#type' => 'link',
     '#title' => $link['title'],
     '#options' => $link['localized_options'],
     '#url' => $link['url'],
-  );
+  ];
 }
 
 /**
  * Returns an array containing the names of system-defined (default) menus.
  */
 function menu_list_system_menus() {
-  return array(
+  return [
     'tools' => 'Tools',
     'admin' => 'Administration',
     'account' => 'User account menu',
     'main' => 'Main navigation',
     'footer' => 'Footer menu',
-  );
+  ];
 }
 
 /**
@@ -144,12 +144,12 @@ function menu_secondary_local_tasks() {
  * Returns a renderable element for the primary and secondary tabs.
  */
 function menu_local_tabs() {
-  $build = array(
+  $build = [
     '#theme' => 'menu_local_tasks',
     '#primary' => menu_primary_local_tasks(),
     '#secondary' => menu_secondary_local_tasks(),
-  );
-  return !empty($build['#primary']) || !empty($build['#secondary']) ? $build : array();
+  ];
+  return !empty($build['#primary']) || !empty($build['#secondary']) ? $build : [];
 }
 
 /**
diff --git a/web/core/includes/module.inc b/web/core/includes/module.inc
index d80d74bb1..e3f446c66 100644
--- a/web/core/includes/module.inc
+++ b/web/core/includes/module.inc
@@ -27,19 +27,19 @@ function system_list($type) {
     $lists = $cached->data;
   }
   else {
-    $lists = array(
-      'theme' => array(),
-      'filepaths' => array(),
-    );
+    $lists = [
+      'theme' => [],
+      'filepaths' => [],
+    ];
     // ThemeHandler maintains the 'system.theme.data' state record.
-    $theme_data = \Drupal::state()->get('system.theme.data', array());
+    $theme_data = \Drupal::state()->get('system.theme.data', []);
     foreach ($theme_data as $name => $theme) {
       $lists['theme'][$name] = $theme;
-      $lists['filepaths'][] = array(
+      $lists['filepaths'][] = [
         'type' => 'theme',
         'name' => $name,
         'filepath' => $theme->getPathname(),
-      );
+      ];
     }
     \Drupal::cache('bootstrap')->set('system_list', $lists);
   }
@@ -146,7 +146,7 @@ function module_load_include($type, $module, $name = NULL) {
 function drupal_required_modules() {
   $listing = new ExtensionDiscovery(\Drupal::root());
   $files = $listing->scan('module');
-  $required = array();
+  $required = [];
 
   // Unless called by the installer, an installation profile is required and
   // must always be loaded. drupal_get_profile() also returns the installation
@@ -191,7 +191,7 @@ function module_set_weight($module, $weight) {
     $current_module_filenames = $module_handler->getModuleList();
     $current_modules = array_fill_keys(array_keys($current_module_filenames), 0);
     $current_modules = module_config_sort(array_merge($current_modules, $extension_config->get('module')));
-    $module_filenames = array();
+    $module_filenames = [];
     foreach ($current_modules as $name => $weight) {
       $module_filenames[$name] = $current_module_filenames[$name];
     }
@@ -222,7 +222,7 @@ function module_config_sort($data) {
   // two modules and weights (spaces added for clarity):
   // - Block with weight -5: 0 0000000000000000005 block
   // - Node  with weight  0: 1 0000000000000000000 node
-  $sort = array();
+  $sort = [];
   foreach ($data as $name => $weight) {
     // Prefix negative weights with 0, positive weights with 1.
     // +/- signs cannot be used, since + (ASCII 43) is before - (ASCII 45).
diff --git a/web/core/includes/pager.inc b/web/core/includes/pager.inc
index 6b6bbb736..62e8278ed 100644
--- a/web/core/includes/pager.inc
+++ b/web/core/includes/pager.inc
@@ -147,7 +147,7 @@ function pager_default_initialize($total, $limit, $element = 0) {
 function pager_get_query_parameters() {
   $query = &drupal_static(__FUNCTION__);
   if (!isset($query)) {
-    $query = UrlHelper::filterQueryParameters(\Drupal::request()->query->all(), array('page'));
+    $query = UrlHelper::filterQueryParameters(\Drupal::request()->query->all(), ['page']);
   }
   return $query;
 }
@@ -216,19 +216,19 @@ function template_preprocess_pager(&$variables) {
 
   // Create the "first" and "previous" links if we are not on the first page.
   if ($pager_page_array[$element] > 0) {
-    $items['first'] = array();
-    $options = array(
+    $items['first'] = [];
+    $options = [
       'query' => pager_query_add_page($parameters, $element, 0),
-    );
+    ];
     $items['first']['href'] = \Drupal::url($route_name, $route_parameters, $options);
     if (isset($tags[0])) {
       $items['first']['text'] = $tags[0];
     }
 
-    $items['previous'] = array();
-    $options = array(
+    $items['previous'] = [];
+    $options = [
       'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] - 1),
-    );
+    ];
     $items['previous']['href'] = \Drupal::url($route_name, $route_parameters, $options);
     if (isset($tags[1])) {
       $items['previous']['text'] = $tags[1];
@@ -242,9 +242,9 @@ function template_preprocess_pager(&$variables) {
     }
     // Now generate the actual pager piece.
     for (; $i <= $pager_last && $i <= $pager_max; $i++) {
-      $options = array(
+      $options = [
         'query' => pager_query_add_page($parameters, $element, $i - 1),
-      );
+      ];
       $items['pages'][$i]['href'] = \Drupal::url($route_name, $route_parameters, $options);
       if ($i == $pager_current) {
         $variables['current'] = $i;
@@ -258,19 +258,19 @@ function template_preprocess_pager(&$variables) {
 
   // Create the "next" and "last" links if we are not on the last page.
   if ($pager_page_array[$element] < ($pager_max - 1)) {
-    $items['next'] = array();
-    $options = array(
+    $items['next'] = [];
+    $options = [
       'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] + 1),
-    );
+    ];
     $items['next']['href'] = \Drupal::url($route_name, $route_parameters, $options);
     if (isset($tags[3])) {
       $items['next']['text'] = $tags[3];
     }
 
-    $items['last'] = array();
-    $options = array(
+    $items['last'] = [];
+    $options = [
       'query' => pager_query_add_page($parameters, $element, $pager_max - 1),
-    );
+    ];
     $items['last']['href'] = \Drupal::url($route_name, $route_parameters, $options);
     if (isset($tags[4])) {
       $items['last']['text'] = $tags[4];
diff --git a/web/core/includes/schema.inc b/web/core/includes/schema.inc
index aa3984b91..a2f9d23dc 100644
--- a/web/core/includes/schema.inc
+++ b/web/core/includes/schema.inc
@@ -28,9 +28,9 @@ const SCHEMA_UNINSTALLED = -1;
 function drupal_get_schema_versions($module) {
   $updates = &drupal_static(__FUNCTION__, NULL);
   if (!isset($updates[$module])) {
-    $updates = array();
+    $updates = [];
     foreach (\Drupal::moduleHandler()->getModuleList() as $loaded_module => $filename) {
-      $updates[$loaded_module] = array();
+      $updates[$loaded_module] = [];
     }
 
     // Prepare regular expression to match all possible defined hook_update_N().
@@ -74,15 +74,15 @@ function drupal_get_schema_versions($module) {
  *   module is not installed.
  */
 function drupal_get_installed_schema_version($module, $reset = FALSE, $array = FALSE) {
-  $versions = &drupal_static(__FUNCTION__, array());
+  $versions = &drupal_static(__FUNCTION__, []);
 
   if ($reset) {
-    $versions = array();
+    $versions = [];
   }
 
   if (!$versions) {
     if (!$versions = \Drupal::keyValue('system.schema')->getAll()) {
-      $versions = array();
+      $versions = [];
     }
   }
 
@@ -162,12 +162,12 @@ function drupal_get_module_schema($module, $table = NULL) {
     if (isset($schema[$table])) {
       return $schema[$table];
     }
-    return array();
+    return [];
   }
   elseif (!empty($schema)) {
     return $schema;
   }
-  return array();
+  return [];
 }
 
 /**
diff --git a/web/core/includes/tablesort.inc b/web/core/includes/tablesort.inc
index 95642b386..d8f162431 100644
--- a/web/core/includes/tablesort.inc
+++ b/web/core/includes/tablesort.inc
@@ -41,7 +41,7 @@ function tablesort_init($header) {
 function tablesort_header(&$cell_content, array &$cell_attributes, array $header, array $ts) {
   // Special formatting for the currently sorted column header.
   if (isset($cell_attributes['field'])) {
-    $title = t('sort by @s', array('@s' => $cell_content));
+    $title = t('sort by @s', ['@s' => $cell_content]);
     if ($cell_content == $ts['name']) {
       // aria-sort is a WAI-ARIA property that indicates if items in a table
       // or grid are sorted in ascending or descending order. See
@@ -49,10 +49,10 @@ function tablesort_header(&$cell_content, array &$cell_attributes, array $header
       $cell_attributes['aria-sort'] = ($ts['sort'] == 'asc') ? 'ascending' : 'descending';
       $ts['sort'] = (($ts['sort'] == 'asc') ? 'desc' : 'asc');
       $cell_attributes['class'][] = 'is-active';
-      $tablesort_indicator = array(
+      $tablesort_indicator = [
         '#theme' => 'tablesort_indicator',
         '#style' => $ts['sort'],
-      );
+      ];
       $image = drupal_render($tablesort_indicator);
     }
     else {
@@ -60,12 +60,12 @@ function tablesort_header(&$cell_content, array &$cell_attributes, array $header
       $ts['sort'] = 'asc';
       $image = '';
     }
-    $cell_content = \Drupal::l(SafeMarkup::format('@cell_content@image', array('@cell_content' => $cell_content, '@image' => $image)), new Url('<current>', [], [
-      'attributes' => array('title' => $title),
-      'query' => array_merge($ts['query'], array(
+    $cell_content = \Drupal::l(SafeMarkup::format('@cell_content@image', ['@cell_content' => $cell_content, '@image' => $image]), new Url('<current>', [], [
+      'attributes' => ['title' => $title],
+      'query' => array_merge($ts['query'], [
         'sort' => $ts['sort'],
         'order' => $cell_content,
-      )),
+      ]),
     ]));
 
     unset($cell_attributes['field'], $cell_attributes['sort']);
@@ -80,7 +80,7 @@ function tablesort_header(&$cell_content, array &$cell_attributes, array $header
  *   page request except for those pertaining to table sorting.
  */
 function tablesort_get_query_parameters() {
-  return UrlHelper::filterQueryParameters(\Drupal::request()->query->all(), array('sort', 'order'));
+  return UrlHelper::filterQueryParameters(\Drupal::request()->query->all(), ['sort', 'order']);
 }
 
 /**
@@ -112,12 +112,12 @@ function tablesort_get_order($headers) {
   if (!isset($default)) {
     $default = reset($headers);
     if (!is_array($default)) {
-      $default = array('data' => $default);
+      $default = ['data' => $default];
     }
   }
 
-  $default += array('data' => NULL, 'field' => NULL);
-  return array('name' => $default['data'], 'sql' => $default['field']);
+  $default += ['data' => NULL, 'field' => NULL];
+  return ['name' => $default['data'], 'sql' => $default['field']];
 }
 
 /**
diff --git a/web/core/includes/theme.inc b/web/core/includes/theme.inc
index 9b89250fc..498c490be 100644
--- a/web/core/includes/theme.inc
+++ b/web/core/includes/theme.inc
@@ -102,13 +102,13 @@ function theme_get_registry($complete = TRUE) {
  * @see \Drupal\Core\Extension\ThemeHandler::$defaultFeatures
  */
 function _system_default_theme_features() {
-  return array(
+  return [
     'favicon',
     'logo',
     'node_user_picture',
     'comment_user_picture',
     'comment_user_verification',
-  );
+  ];
 }
 
 /**
@@ -134,7 +134,7 @@ function drupal_theme_rebuild() {
  */
 function drupal_find_theme_functions($cache, $prefixes) {
   $implementations = [];
-  $grouped_functions = \Drupal::service('theme.registry')->getPrefixGroupedUserFunctions();
+  $grouped_functions = \Drupal::service('theme.registry')->getPrefixGroupedUserFunctions($prefixes);
 
   foreach ($cache as $hook => $info) {
     foreach ($prefixes as $prefix) {
@@ -158,11 +158,11 @@ function drupal_find_theme_functions($cache, $prefixes) {
           foreach ($matches as $match) {
             $new_hook = substr($match, strlen($prefix) + 1);
             $arg_name = isset($info['variables']) ? 'variables' : 'render element';
-            $implementations[$new_hook] = array(
+            $implementations[$new_hook] = [
               'function' => $match,
               $arg_name => $info[$arg_name],
               'base hook' => $hook,
-            );
+            ];
           }
         }
       }
@@ -170,9 +170,9 @@ function drupal_find_theme_functions($cache, $prefixes) {
       // that in what is returned so that the registry knows that the theme has
       // this implementation.
       if (function_exists($prefix . '_' . $hook)) {
-        $implementations[$hook] = array(
+        $implementations[$hook] = [
           'function' => $prefix . '_' . $hook,
-        );
+        ];
       }
     }
   }
@@ -191,12 +191,12 @@ function drupal_find_theme_functions($cache, $prefixes) {
  *   The path to search.
  */
 function drupal_find_theme_templates($cache, $extension, $path) {
-  $implementations = array();
+  $implementations = [];
 
   // Collect paths to all sub-themes grouped by base themes. These will be
   // used for filtering. This allows base themes to have sub-themes in its
   // folder hierarchy without affecting the base themes template discovery.
-  $theme_paths = array();
+  $theme_paths = [];
   foreach (\Drupal::service('theme_handler')->listInfo() as $theme_info) {
     if (!empty($theme_info->base_theme)) {
       $theme_paths[$theme_info->base_theme][$theme_info->getName()] = $theme_info->getPath();
@@ -210,12 +210,12 @@ function drupal_find_theme_templates($cache, $extension, $path) {
     }
   }
   $theme = \Drupal::theme()->getActiveTheme()->getName();
-  $subtheme_paths = isset($theme_paths[$theme]) ? $theme_paths[$theme] : array();
+  $subtheme_paths = isset($theme_paths[$theme]) ? $theme_paths[$theme] : [];
 
   // Escape the periods in the extension.
   $regex = '/' . str_replace('.', '\.', $extension) . '$/';
   // Get a listing of all template files in the path to search.
-  $files = file_scan_directory($path, $regex, array('key' => 'filename'));
+  $files = file_scan_directory($path, $regex, ['key' => 'filename']);
 
   // Find templates that implement registered theme hooks and include that in
   // what is returned so that the registry knows that the theme has this
@@ -231,21 +231,21 @@ function drupal_find_theme_templates($cache, $extension, $path) {
     // for the purposes of searching.
     $hook = strtr($template, '-', '_');
     if (isset($cache[$hook])) {
-      $implementations[$hook] = array(
+      $implementations[$hook] = [
         'template' => $template,
         'path' => dirname($file->uri),
-      );
+      ];
     }
 
     // Match templates based on the 'template' filename.
     foreach ($cache as $hook => $info) {
       if (isset($info['template'])) {
-        $template_candidates = array($info['template'], str_replace($info['theme path'] . '/templates/', '', $info['template']));
+        $template_candidates = [$info['template'], str_replace($info['theme path'] . '/templates/', '', $info['template'])];
         if (in_array($template, $template_candidates)) {
-          $implementations[$hook] = array(
+          $implementations[$hook] = [
             'template' => $template,
             'path' => dirname($file->uri),
-          );
+          ];
         }
       }
     }
@@ -272,12 +272,12 @@ function drupal_find_theme_templates($cache, $extension, $path) {
           // Put the underscores back in for the hook name and register this
           // pattern.
           $arg_name = isset($info['variables']) ? 'variables' : 'render element';
-          $implementations[strtr($file, '-', '_')] = array(
+          $implementations[strtr($file, '-', '_')] = [
             'template' => $file,
             'path' => dirname($files[$match]->uri),
             $arg_name => $info[$arg_name],
             'base hook' => $hook,
-          );
+          ];
         }
       }
     }
@@ -305,7 +305,7 @@ function drupal_find_theme_templates($cache, $extension, $path) {
  */
 function theme_get_setting($setting_name, $theme = NULL) {
   /** @var \Drupal\Core\Theme\ThemeSettings[] $cache */
-  $cache = &drupal_static(__FUNCTION__, array());
+  $cache = &drupal_static(__FUNCTION__, []);
 
   // If no key is given, use the current theme if we can determine it.
   if (!isset($theme)) {
@@ -488,7 +488,7 @@ function theme_settings_convert_to_config(array $theme_settings, Config $config)
     elseif (substr($key, 0, 7) == 'toggle_') {
       $config->set('features.' . Unicode::substr($key, 7), $value);
     }
-    elseif (!in_array($key, array('theme', 'logo_upload'))) {
+    elseif (!in_array($key, ['theme', 'logo_upload'])) {
       $config->set($key, $value);
     }
   }
@@ -545,7 +545,7 @@ function template_preprocess_time(&$variables) {
 function template_preprocess_datetime_form(&$variables) {
   $element = $variables['element'];
 
-  $variables['attributes'] = array();
+  $variables['attributes'] = [];
   if (isset($element['#id'])) {
     $variables['attributes']['id'] = $element['#id'];
   }
@@ -576,8 +576,14 @@ function template_preprocess_datetime_wrapper(&$variables) {
   // Suppress error messages.
   $variables['errors'] = NULL;
 
+  $variables['description'] = NULL;
   if (!empty($element['#description'])) {
+    $description_attributes = [];
+    if (!empty($element['#id'])) {
+      $description_attributes['id'] = $element['#id'] . '--description';
+    }
     $variables['description'] = $element['#description'];
+    $variables['description_attributes'] = new Attribute($description_attributes);
   }
 
   $variables['required'] = FALSE;
@@ -658,34 +664,34 @@ function template_preprocess_links(&$variables) {
     if (!empty($heading)) {
       // Convert a string heading into an array, using a <h2> tag by default.
       if (is_string($heading)) {
-        $heading = array('text' => $heading);
+        $heading = ['text' => $heading];
       }
       // Merge in default array properties into $heading.
-      $heading += array(
+      $heading += [
         'level' => 'h2',
-        'attributes' => array(),
-      );
+        'attributes' => [],
+      ];
       // Convert the attributes array into an Attribute object.
       $heading['attributes'] = new Attribute($heading['attributes']);
     }
 
-    $variables['links'] = array();
+    $variables['links'] = [];
     foreach ($links as $key => $link) {
-      $item = array();
-      $link += array(
+      $item = [];
+      $link += [
         'ajax' => NULL,
         'url' => NULL,
-      );
+      ];
 
-      $li_attributes = array();
+      $li_attributes = [];
       $keys = ['title', 'url'];
-      $link_element = array(
+      $link_element = [
         '#type' => 'link',
         '#title' => $link['title'],
         '#options' => array_diff_key($link, array_combine($keys, $keys)),
         '#url' => $link['url'],
         '#ajax' => $link['ajax'],
-      );
+      ];
 
       // Handle links and ensure that the active class is added on the LIs, but
       // only if the 'set_active_class' option is not empty.
@@ -773,7 +779,7 @@ function template_preprocess_image(&$variables) {
   // Generate a srcset attribute conforming to the spec at
   // http://www.w3.org/html/wg/drafts/html/master/embedded-content.html#attr-img-srcset
   if (!empty($variables['srcset'])) {
-    $srcset = array();
+    $srcset = [];
     foreach ($variables['srcset'] as $src) {
       // URI is mandatory.
       $source = file_url_transform_relative(file_create_url($src['uri']));
@@ -788,7 +794,7 @@ function template_preprocess_image(&$variables) {
     $variables['attributes']['srcset'] = implode(', ', $srcset);
   }
 
-  foreach (array('width', 'height', 'alt', 'title', 'sizes') as $key) {
+  foreach (['width', 'height', 'alt', 'title', 'sizes'] as $key) {
     if (isset($variables[$key])) {
       // If the property has already been defined in the attributes,
       // do not override, including NULL.
@@ -902,11 +908,11 @@ function template_preprocess_table(&$variables) {
       }
       else {
         $cols = $colgroup;
-        $colgroup_attributes = array();
+        $colgroup_attributes = [];
       }
-      $colgroup = array();
+      $colgroup = [];
       $colgroup['attributes'] = new Attribute($colgroup_attributes);
-      $colgroup['cols'] = array();
+      $colgroup['cols'] = [];
 
       // Build columns.
       if (is_array($cols) && !empty($cols)) {
@@ -918,10 +924,10 @@ function template_preprocess_table(&$variables) {
   }
 
   // Build an associative array of responsive classes keyed by column.
-  $responsive_classes = array();
+  $responsive_classes = [];
 
   // Format the table header:
-  $ts = array();
+  $ts = [];
   $header_columns = 0;
   if (!empty($variables['header'])) {
     $ts = tablesort_init($variables['header']);
@@ -973,7 +979,7 @@ function template_preprocess_table(&$variables) {
         // tablesort_header() removes the 'sort' and 'field' keys.
         $cell_attributes = new Attribute($cell);
       }
-      $variables['header'][$col_key] = array();
+      $variables['header'][$col_key] = [];
       $variables['header'][$col_key]['tag'] = $is_header ? 'th' : 'td';
       $variables['header'][$col_key]['attributes'] = $cell_attributes;
       $variables['header'][$col_key]['content'] = $cell_content;
@@ -982,12 +988,12 @@ function template_preprocess_table(&$variables) {
   $variables['header_columns'] = $header_columns;
 
   // Rows and footer have the same structure.
-  $sections = array('rows' , 'footer');
+  $sections = ['rows' , 'footer'];
   foreach ($sections as $section) {
     if (!empty($variables[$section])) {
       foreach ($variables[$section] as $row_key => $row) {
         $cells = $row;
-        $row_attributes = array();
+        $row_attributes = [];
 
         // Check if we're dealing with a simple or complex row
         if (isset($row['data'])) {
@@ -1001,9 +1007,9 @@ function template_preprocess_table(&$variables) {
         }
 
         // Build row.
-        $variables[$section][$row_key] = array();
+        $variables[$section][$row_key] = [];
         $variables[$section][$row_key]['attributes'] = new Attribute($row_attributes);
-        $variables[$section][$row_key]['cells'] = array();
+        $variables[$section][$row_key]['cells'] = [];
         if (!empty($cells)) {
           // Reset the responsive index.
           $responsive_index = -1;
@@ -1013,7 +1019,7 @@ function template_preprocess_table(&$variables) {
 
             if (!is_array($cell)) {
               $cell_content = $cell;
-              $cell_attributes = array();
+              $cell_attributes = [];
               $is_header = FALSE;
             }
             else {
@@ -1073,7 +1079,7 @@ function template_preprocess_table(&$variables) {
 function template_preprocess_item_list(&$variables) {
   $variables['wrapper_attributes'] = new Attribute($variables['wrapper_attributes']);
   foreach ($variables['items'] as &$item) {
-    $attributes = array();
+    $attributes = [];
     // If the item value is an array, then it is a render array.
     if (is_array($item)) {
       // List items support attributes via the '#wrapper_attributes' property.
@@ -1112,10 +1118,10 @@ function template_preprocess_item_list(&$variables) {
     }
 
     // Set the item's value and attributes for the template.
-    $item = array(
+    $item = [
       'value' => $item,
       'attributes' => new Attribute($attributes),
-    );
+    ];
   }
 }
 
@@ -1133,7 +1139,7 @@ function template_preprocess_container(&$variables) {
   $variables['has_parent'] = FALSE;
   $element = $variables['element'];
   // Ensure #attributes is set.
-  $element += array('#attributes' => array());
+  $element += ['#attributes' => []];
 
   // Special handling for form elements.
   if (isset($element['#array_parents'])) {
@@ -1222,16 +1228,16 @@ function template_preprocess(&$variables, $hook, $info) {
  */
 function _template_preprocess_default_variables() {
   // Variables that don't depend on a database connection.
-  $variables = array(
-    'attributes' => array(),
-    'title_attributes' => array(),
-    'content_attributes' => array(),
-    'title_prefix' => array(),
-    'title_suffix' => array(),
+  $variables = [
+    'attributes' => [],
+    'title_attributes' => [],
+    'content_attributes' => [],
+    'title_prefix' => [],
+    'title_suffix' => [],
     'db_is_active' => !defined('MAINTENANCE_MODE'),
     'is_admin' => FALSE,
     'logged_in' => FALSE,
-  );
+  ];
 
   // Give modules a chance to alter the default template variables.
   \Drupal::moduleHandler()->alter('template_preprocess_default_variables', $variables);
@@ -1296,19 +1302,19 @@ function template_preprocess_html(&$variables) {
     $variables['page']['#title'] = (string) \Drupal::service('renderer')->render($variables['page']['#title']);
   }
   if (!empty($variables['page']['#title'])) {
-    $head_title = array(
+    $head_title = [
       // Marking the title as safe since it has had the tags stripped.
       'title' => Markup::create(trim(strip_tags($variables['page']['#title']))),
       'name' => $site_config->get('name'),
-    );
+    ];
   }
   // @todo Remove once views is not bypassing the view subscriber anymore.
   //   @see https://www.drupal.org/node/2068471
   elseif ($is_front_page) {
-    $head_title = array(
+    $head_title = [
       'title' => t('Home'),
       'name' => $site_config->get('name'),
-    );
+    ];
   }
   else {
     $head_title = ['name' => $site_config->get('name')];
@@ -1348,7 +1354,7 @@ function template_preprocess_page(&$variables) {
 
   foreach (\Drupal::theme()->getActiveTheme()->getRegions() as $region) {
     if (!isset($variables['page'][$region])) {
-      $variables['page'][$region] = array();
+      $variables['page'][$region] = [];
     }
   }
 
@@ -1408,7 +1414,7 @@ function theme_get_suggestions($args, $base, $delimiter = '__') {
   // page__node__1
   // page__node__edit
 
-  $suggestions = array();
+  $suggestions = [];
   $prefix = $base;
   foreach ($args as $arg) {
     // Remove slashes or null per SA-CORE-2009-003 and change - (hyphen) to _
@@ -1423,7 +1429,7 @@ function theme_get_suggestions($args, $base, $delimiter = '__') {
     // converted to underscores so here we must convert any hyphens in path
     // arguments to underscores here before fetching theme hook suggestions
     // to ensure the templates are appropriately recognized.
-    $arg = str_replace(array("/", "\\", "\0", '-'), array('', '', '', '_'), $arg);
+    $arg = str_replace(["/", "\\", "\0", '-'], ['', '', '', '_'], $arg);
     // The percent acts as a wildcard for numeric arguments since
     // asterisks are not valid filename characters on many filesystems.
     if (is_numeric($arg)) {
@@ -1556,7 +1562,7 @@ function template_preprocess_field(&$variables, $hook) {
   // on those keys is faster than calling Element::children() or looping on all
   // keys within $element, since that requires traversal of all element
   // properties.
-  $variables['items'] = array();
+  $variables['items'] = [];
   $delta = 0;
   while (!empty($element[$delta])) {
     $variables['items'][$delta]['content'] = $element[$delta];
@@ -1591,31 +1597,29 @@ function template_preprocess_field_multiple_value_form(&$variables) {
   if ($variables['multiple']) {
     $table_id = Html::getUniqueId($element['#field_name'] . '_values');
     $order_class = $element['#field_name'] . '-delta-order';
-    $header_attributes = new Attribute(array('class' => array('label')));
+    $header_attributes = new Attribute(['class' => ['label']]);
     if (!empty($element['#required'])) {
       $header_attributes['class'][] = 'js-form-required';
       $header_attributes['class'][] = 'form-required';
     }
-    $header = array(
-      array(
-        'data' => array(
+    $header = [
+      [
+        'data' => [
           '#prefix' => '<h4' . $header_attributes . '>',
-          'title' => array(
-            '#markup' => $element['#title'],
-          ),
+          '#markup' => $element['#title'],
           '#suffix' => '</h4>',
-        ),
+        ],
         'colspan' => 2,
-        'class' => array('field-label'),
-      ),
-      t('Order', array(), array('context' => 'Sort order')),
-    );
-    $rows = array();
+        'class' => ['field-label'],
+      ],
+      t('Order', [], ['context' => 'Sort order']),
+    ];
+    $rows = [];
 
     // Sort items according to '_weight' (needed when the form comes back after
     // preview or failed validation).
-    $items = array();
-    $variables['button'] = array();
+    $items = [];
+    $variables['button'] = [];
     foreach (Element::children($element) as $key) {
       if ($key === 'add_more') {
         $variables['button'] = &$element[$key];
@@ -1628,40 +1632,40 @@ function template_preprocess_field_multiple_value_form(&$variables) {
 
     // Add the items as table rows.
     foreach ($items as $item) {
-      $item['_weight']['#attributes']['class'] = array($order_class);
+      $item['_weight']['#attributes']['class'] = [$order_class];
 
       // Remove weight form element from item render array so it can be rendered
       // in a separate table column.
       $delta_element = $item['_weight'];
       unset($item['_weight']);
 
-      $cells = array(
-        array('data' => '', 'class' => array('field-multiple-drag')),
-        array('data' => $item),
-        array('data' => $delta_element, 'class' => array('delta-order')),
-      );
-      $rows[] = array(
+      $cells = [
+        ['data' => '', 'class' => ['field-multiple-drag']],
+        ['data' => $item],
+        ['data' => $delta_element, 'class' => ['delta-order']],
+      ];
+      $rows[] = [
         'data' => $cells,
-        'class' => array('draggable'),
-      );
+        'class' => ['draggable'],
+      ];
     }
 
-    $variables['table'] = array(
+    $variables['table'] = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
-      '#attributes' => array(
+      '#attributes' => [
         'id' => $table_id,
-        'class' => array('field-multiple-table'),
-      ),
-      '#tabledrag' => array(
-        array(
+        'class' => ['field-multiple-table'],
+      ],
+      '#tabledrag' => [
+        [
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => $order_class,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     if (!empty($element['#description'])) {
       $description_id = $element['#attributes']['aria-describedby'];
@@ -1674,7 +1678,7 @@ function template_preprocess_field_multiple_value_form(&$variables) {
     }
   }
   else {
-    $variables['elements'] = array();
+    $variables['elements'] = [];
     foreach (Element::children($element) as $key) {
       $variables['elements'][] = $element[$key];
     }
@@ -1691,10 +1695,10 @@ function template_preprocess_field_multiple_value_form(&$variables) {
  *   - links: A list of \Drupal\Core\Link objects which should be rendered.
  */
 function template_preprocess_breadcrumb(&$variables) {
-  $variables['breadcrumb'] = array();
+  $variables['breadcrumb'] = [];
   /** @var \Drupal\Core\Link $link */
   foreach ($variables['links'] as $key => $link) {
-    $variables['breadcrumb'][$key] = array('text' => $link->getText(), 'url' => $link->getUrl()->toString());
+    $variables['breadcrumb'][$key] = ['text' => $link->getText(), 'url' => $link->getUrl()->toString()];
   }
 }
 
@@ -1713,39 +1717,39 @@ function _field_multiple_value_form_sort_helper($a, $b) {
  * Provides theme registration for themes across .inc files.
  */
 function drupal_common_theme() {
-  return array(
+  return [
     // From theme.inc.
-    'html' => array(
+    'html' => [
       'render element' => 'html',
-    ),
-    'page' => array(
+    ],
+    'page' => [
       'render element' => 'page',
-    ),
-    'page_title' => array(
-      'variables' => array('title' => NULL),
-    ),
-    'region' => array(
+    ],
+    'page_title' => [
+      'variables' => ['title' => NULL],
+    ],
+    'region' => [
       'render element' => 'elements',
-    ),
-    'time' => array(
-      'variables' => array('timestamp' => NULL, 'text' => NULL, 'attributes' => array()),
-    ),
-    'datetime_form' => array(
+    ],
+    'time' => [
+      'variables' => ['timestamp' => NULL, 'text' => NULL, 'attributes' => []],
+    ],
+    'datetime_form' => [
       'render element' => 'element',
-    ),
-    'datetime_wrapper' => array(
+    ],
+    'datetime_wrapper' => [
       'render element' => 'element',
-    ),
-    'status_messages' => array(
+    ],
+    'status_messages' => [
       'variables' => ['status_headings' => [], 'message_list' => NULL],
-    ),
-    'links' => array(
-      'variables' => array('links' => array(), 'attributes' => array('class' => array('links')), 'heading' => array(), 'set_active_class' => FALSE),
-    ),
-    'dropbutton_wrapper' => array(
-      'variables' => array('children' => NULL),
-    ),
-    'image' => array(
+    ],
+    'links' => [
+      'variables' => ['links' => [], 'attributes' => ['class' => ['links']], 'heading' => [], 'set_active_class' => FALSE],
+    ],
+    'dropbutton_wrapper' => [
+      'variables' => ['children' => NULL],
+    ],
+    'image' => [
       // HTML 4 and XHTML 1.0 always require an alt attribute. The HTML 5 draft
       // allows the alt attribute to be omitted in some cases. Therefore,
       // default the alt attribute to an empty string, but allow code providing
@@ -1759,107 +1763,107 @@ function drupal_common_theme() {
       // - http://dev.w3.org/html5/spec/Overview.html#alt
       // The title attribute is optional in all cases, so it is omitted by
       // default.
-      'variables' => array('uri' => NULL, 'width' => NULL, 'height' => NULL, 'alt' => '', 'title' => NULL, 'attributes' => array(), 'sizes' => NULL, 'srcset' => array(), 'style_name' => NULL),
-    ),
-    'breadcrumb' => array(
-      'variables' => array('links' => array()),
-    ),
-    'table' => array(
-      'variables' => array('header' => NULL, 'rows' => NULL, 'footer' => NULL, 'attributes' => array(), 'caption' => NULL, 'colgroups' => array(), 'sticky' => FALSE, 'responsive' => TRUE, 'empty' => ''),
-    ),
-    'tablesort_indicator' => array(
-      'variables' => array('style' => NULL),
-    ),
-    'mark' => array(
-      'variables' => array('status' => MARK_NEW),
-    ),
-    'item_list' => array(
-      'variables' => array('items' => array(), 'title' => '', 'list_type' => 'ul', 'wrapper_attributes' => array(), 'attributes' => array(), 'empty' => NULL, 'context' => array()),
-    ),
-    'feed_icon' => array(
-      'variables' => array('url' => NULL, 'title' => NULL),
-    ),
-    'progress_bar' => array(
-      'variables' => array('label' => NULL, 'percent' => NULL, 'message' => NULL),
-    ),
-    'indentation' => array(
-      'variables' => array('size' => 1),
-    ),
+      'variables' => ['uri' => NULL, 'width' => NULL, 'height' => NULL, 'alt' => '', 'title' => NULL, 'attributes' => [], 'sizes' => NULL, 'srcset' => [], 'style_name' => NULL],
+    ],
+    'breadcrumb' => [
+      'variables' => ['links' => []],
+    ],
+    'table' => [
+      'variables' => ['header' => NULL, 'rows' => NULL, 'footer' => NULL, 'attributes' => [], 'caption' => NULL, 'colgroups' => [], 'sticky' => FALSE, 'responsive' => TRUE, 'empty' => ''],
+    ],
+    'tablesort_indicator' => [
+      'variables' => ['style' => NULL],
+    ],
+    'mark' => [
+      'variables' => ['status' => MARK_NEW],
+    ],
+    'item_list' => [
+      'variables' => ['items' => [], 'title' => '', 'list_type' => 'ul', 'wrapper_attributes' => [], 'attributes' => [], 'empty' => NULL, 'context' => []],
+    ],
+    'feed_icon' => [
+      'variables' => ['url' => NULL, 'title' => NULL],
+    ],
+    'progress_bar' => [
+      'variables' => ['label' => NULL, 'percent' => NULL, 'message' => NULL],
+    ],
+    'indentation' => [
+      'variables' => ['size' => 1],
+    ],
     // From theme.maintenance.inc.
-    'maintenance_page' => array(
+    'maintenance_page' => [
       'render element' => 'page',
-    ),
-    'install_page' => array(
+    ],
+    'install_page' => [
       'render element' => 'page',
-    ),
-    'maintenance_task_list' => array(
-      'variables' => array('items' => NULL, 'active' => NULL, 'variant' => NULL),
-    ),
-    'authorize_report' => array(
+    ],
+    'maintenance_task_list' => [
+      'variables' => ['items' => NULL, 'active' => NULL, 'variant' => NULL],
+    ],
+    'authorize_report' => [
       'variables' => ['messages' => [], 'attributes' => []],
       'includes' => ['core/includes/theme.maintenance.inc'],
       'template' => 'authorize-report',
-    ),
+    ],
     // From pager.inc.
-    'pager' => array(
+    'pager' => [
       'render element' => 'pager',
-    ),
+    ],
     // From menu.inc.
-    'menu' => array(
-      'variables' => array('menu_name' => NULL, 'items' => array(), 'attributes' => array()),
-    ),
-    'menu_local_task' => array(
+    'menu' => [
+      'variables' => ['menu_name' => NULL, 'items' => [], 'attributes' => []],
+    ],
+    'menu_local_task' => [
       'render element' => 'element',
-    ),
-    'menu_local_action' => array(
+    ],
+    'menu_local_action' => [
       'render element' => 'element',
-    ),
-    'menu_local_tasks' => array(
-      'variables' => array('primary' => array(), 'secondary' => array()),
-    ),
+    ],
+    'menu_local_tasks' => [
+      'variables' => ['primary' => [], 'secondary' => []],
+    ],
     // From form.inc.
-    'input' => array(
+    'input' => [
       'render element' => 'element',
-    ),
-    'select' => array(
+    ],
+    'select' => [
       'render element' => 'element',
-    ),
-    'fieldset' => array(
+    ],
+    'fieldset' => [
       'render element' => 'element',
-    ),
-    'details' => array(
+    ],
+    'details' => [
       'render element' => 'element',
-    ),
-    'radios' => array(
+    ],
+    'radios' => [
       'render element' => 'element',
-    ),
-    'checkboxes' => array(
+    ],
+    'checkboxes' => [
       'render element' => 'element',
-    ),
-    'form' => array(
+    ],
+    'form' => [
       'render element' => 'element',
-    ),
-    'textarea' => array(
+    ],
+    'textarea' => [
       'render element' => 'element',
-    ),
-    'form_element' => array(
+    ],
+    'form_element' => [
       'render element' => 'element',
-    ),
-    'form_element_label' => array(
+    ],
+    'form_element_label' => [
       'render element' => 'element',
-    ),
-    'vertical_tabs' => array(
+    ],
+    'vertical_tabs' => [
       'render element' => 'element',
-    ),
-    'container' => array(
+    ],
+    'container' => [
       'render element' => 'element',
-    ),
+    ],
     // From field system.
-    'field' => array(
+    'field' => [
       'render element' => 'element',
-    ),
-    'field_multiple_value_form' => array(
+    ],
+    'field_multiple_value_form' => [
       'render element' => 'element',
-    ),
-  );
+    ],
+  ];
 }
diff --git a/web/core/includes/unicode.inc b/web/core/includes/unicode.inc
index f0df33ede..f6b3ee70d 100644
--- a/web/core/includes/unicode.inc
+++ b/web/core/includes/unicode.inc
@@ -11,24 +11,24 @@ use Drupal\Component\Utility\Unicode;
  * Returns Unicode library status and errors.
  */
 function unicode_requirements() {
-  $libraries = array(
+  $libraries = [
     Unicode::STATUS_SINGLEBYTE => t('Standard PHP'),
     Unicode::STATUS_MULTIBYTE => t('PHP Mbstring Extension'),
     Unicode::STATUS_ERROR => t('Error'),
-  );
-  $severities = array(
+  ];
+  $severities = [
     Unicode::STATUS_SINGLEBYTE => REQUIREMENT_WARNING,
     Unicode::STATUS_MULTIBYTE => NULL,
     Unicode::STATUS_ERROR => REQUIREMENT_ERROR,
-  );
+  ];
   $failed_check = Unicode::check();
   $library = Unicode::getStatus();
 
-  $requirements['unicode'] = array(
+  $requirements['unicode'] = [
     'title' => t('Unicode library'),
     'value' => $libraries[$library],
     'severity' => $severities[$library],
-  );
+  ];
   switch ($failed_check) {
     case 'mb_strlen':
       $requirements['unicode']['description'] = t('Operations on Unicode strings are emulated on a best-effort basis. Install the <a href="http://php.net/mbstring">PHP mbstring extension</a> for improved Unicode support.');
@@ -74,6 +74,11 @@ function unicode_requirements() {
  *   An XML parser object or FALSE on error.
  *
  * @ingroup php_wrappers
+ *
+ * @deprecated in Drupal 8.3.0 and will bre removed in Drupal 9.0.0. Use
+ *   xml_parser_create() and
+ *   xml_parser_set_option($xml_parser, XML_OPTION_TARGET_ENCODING, 'utf-8')
+ *   instead.
  */
 function drupal_xml_parser_create(&$data) {
   // Default XML encoding is UTF-8
@@ -92,7 +97,7 @@ function drupal_xml_parser_create(&$data) {
   }
 
   // Unsupported encodings are converted here into UTF-8.
-  $php_supported = array('utf-8', 'iso-8859-1', 'us-ascii');
+  $php_supported = ['utf-8', 'iso-8859-1', 'us-ascii'];
   if (!in_array(strtolower($encoding), $php_supported)) {
     $out = Unicode::convertToUtf8($data, $encoding);
     if ($out !== FALSE) {
@@ -100,7 +105,7 @@ function drupal_xml_parser_create(&$data) {
       $data = preg_replace('/^(<\?xml[^>]+encoding)="(.+?)"/', '\\1="utf-8"', $out);
     }
     else {
-      \Drupal::logger('php')->warning('Could not convert XML encoding %s to UTF-8.', array('%s' => $encoding));
+      \Drupal::logger('php')->warning('Could not convert XML encoding %s to UTF-8.', ['%s' => $encoding]);
       return FALSE;
     }
   }
diff --git a/web/core/includes/update.inc b/web/core/includes/update.inc
index a9b5de923..2caa6ca3f 100644
--- a/web/core/includes/update.inc
+++ b/web/core/includes/update.inc
@@ -17,7 +17,7 @@ use Drupal\Core\Utility\Error;
 function update_fix_compatibility() {
   $extension_config = \Drupal::configFactory()->getEditable('core.extension');
   $save = FALSE;
-  foreach (array('module', 'theme') as $type) {
+  foreach (['module', 'theme'] as $type) {
     foreach ($extension_config->get($type) as $name => $weight) {
       if (update_check_incompatibility($name, $type)) {
         $extension_config->clear("$type.$name");
@@ -68,23 +68,23 @@ function update_check_incompatibility($name, $type = 'module') {
  *   A requirements info array.
  */
 function update_system_schema_requirements() {
-  $requirements = array();
+  $requirements = [];
 
   $system_schema = drupal_get_installed_schema_version('system');
 
   $requirements['minimum schema']['title'] = 'Minimum schema version';
   if ($system_schema >= \Drupal::CORE_MINIMUM_SCHEMA_VERSION) {
-    $requirements['minimum schema'] += array(
+    $requirements['minimum schema'] += [
       'value' => 'The installed schema version meets the minimum.',
       'description' => 'Schema version: ' . $system_schema,
-    );
+    ];
   }
   else {
-    $requirements['minimum schema'] += array(
+    $requirements['minimum schema'] += [
       'value' => 'The installed schema version does not meet the minimum.',
       'severity' => REQUIREMENT_ERROR,
       'description' => 'Your system schema version is ' . $system_schema . '. Updating directly from a schema version prior to 8000 is not supported. You must <a href="https://www.drupal.org/node/2179269">migrate your site to Drupal 8</a> first.',
-    );
+    ];
   }
 
   return $requirements;
@@ -95,7 +95,7 @@ function update_system_schema_requirements() {
  */
 function update_check_requirements() {
   // Check requirements of all loaded modules.
-  $requirements = \Drupal::moduleHandler()->invokeAll('requirements', array('update'));
+  $requirements = \Drupal::moduleHandler()->invokeAll('requirements', ['update']);
   $requirements += update_system_schema_requirements();
   return $requirements;
 }
@@ -168,11 +168,11 @@ function update_do_one($module, $number, $dependency_map, &$context) {
 
   // If this update was aborted in a previous step, or has a dependency that
   // was aborted in a previous step, go no further.
-  if (!empty($context['results']['#abort']) && array_intersect($context['results']['#abort'], array_merge($dependency_map, array($function)))) {
+  if (!empty($context['results']['#abort']) && array_intersect($context['results']['#abort'], array_merge($dependency_map, [$function]))) {
     return;
   }
 
-  $ret = array();
+  $ret = [];
   if (function_exists($function)) {
     try {
       $ret['results']['query'] = $function($context['sandbox']);
@@ -187,7 +187,7 @@ function update_do_one($module, $number, $dependency_map, &$context) {
 
       $variables = Error::decodeException($e);
       unset($variables['backtrace']);
-      $ret['#abort'] = array('success' => FALSE, 'query' => t('%type: @message in %function (line %line of %file).', $variables));
+      $ret['#abort'] = ['success' => FALSE, 'query' => t('%type: @message in %function (line %line of %file).', $variables)];
     }
   }
 
@@ -197,10 +197,10 @@ function update_do_one($module, $number, $dependency_map, &$context) {
   }
 
   if (!isset($context['results'][$module])) {
-    $context['results'][$module] = array();
+    $context['results'][$module] = [];
   }
   if (!isset($context['results'][$module][$number])) {
-    $context['results'][$module][$number] = array();
+    $context['results'][$module][$number] = [];
   }
   $context['results'][$module][$number] = array_merge($context['results'][$module][$number], $ret);
 
@@ -266,7 +266,7 @@ function update_invoke_post_update($function, &$context) {
     unset($context['sandbox']['#finished']);
   }
   if (!isset($context['results'][$module][$name])) {
-    $context['results'][$module][$name] = array();
+    $context['results'][$module][$name] = [];
   }
   $context['results'][$module][$name] = array_merge($context['results'][$module][$name], $ret);
 
@@ -298,7 +298,7 @@ function update_invoke_post_update($function, &$context) {
  */
 function update_get_update_list() {
   // Make sure that the system module is first in the list of updates.
-  $ret = array('system' => array());
+  $ret = ['system' => []];
 
   $modules = drupal_get_installed_schema_version(NULL, FALSE, TRUE);
   foreach ($modules as $module => $schema_version) {
@@ -332,7 +332,7 @@ function update_get_update_list() {
         if ($update > $schema_version) {
           // The description for an update comes from its Doxygen.
           $func = new ReflectionFunction($module . '_update_' . $update);
-          $description = str_replace(array("\n", '*', '/'), '', $func->getDocComment());
+          $description = str_replace(["\n", '*', '/'], '', $func->getDocComment());
           $ret[$module]['pending'][$update] = "$update - $description";
           if (!isset($ret[$module]['start'])) {
             $ret[$module]['start'] = $update;
@@ -400,7 +400,7 @@ function update_resolve_dependencies($starting_updates) {
   // Perform the depth-first search and sort on the results.
   $graph_object = new Graph($graph);
   $graph = $graph_object->searchAndSort();
-  uasort($graph, array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
+  uasort($graph, ['Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
 
   foreach ($graph as $function => &$data) {
     $module = $data['module'];
@@ -416,7 +416,7 @@ function update_resolve_dependencies($starting_updates) {
     }
     elseif (!isset($data['allowed'])) {
       $data['allowed'] = TRUE;
-      $data['missing_dependencies'] = array();
+      $data['missing_dependencies'] = [];
     }
     // Now that we have finished processing this function, remove it from the
     // graph if it was not part of the original list. This ensures that we
@@ -448,9 +448,9 @@ function update_resolve_dependencies($starting_updates) {
 function update_get_update_function_list($starting_updates) {
   // Go through each module and find all updates that we need (including the
   // first update that was requested and any updates that run after it).
-  $update_functions = array();
+  $update_functions = [];
   foreach ($starting_updates as $module => $version) {
-    $update_functions[$module] = array();
+    $update_functions[$module] = [];
     $updates = drupal_get_schema_versions($module);
     if ($updates !== FALSE) {
       $max_version = max($updates);
@@ -512,7 +512,7 @@ function update_get_update_function_list($starting_updates) {
 function update_build_dependency_graph($update_functions) {
   // Initialize an array that will define a directed graph representing the
   // dependencies between update functions.
-  $graph = array();
+  $graph = [];
 
   // Go through each update function and build an initial list of dependencies.
   foreach ($update_functions as $module => $functions) {
@@ -600,7 +600,7 @@ function update_already_performed($module, $number) {
  * @see hook_update_dependencies()
  */
 function update_retrieve_dependencies() {
-  $return = array();
+  $return = [];
   // Get a list of installed modules, arranged so that we invoke their hooks in
   // the same order that \Drupal::moduleHandler()->invokeAll() does.
   foreach (\Drupal::keyValue('system.schema')->getAll() as $module => $schema) {
@@ -675,7 +675,7 @@ function update_replace_permissions($replace) {
   foreach ($role_names as $role_name) {
     $rid = substr($role_name, $cut);
     $config = \Drupal::config("user.role.$rid");
-    $permissions = $config->get('permissions') ?: array();
+    $permissions = $config->get('permissions') ?: [];
     foreach ($replace as $old_permission => $new_permissions) {
       if (($index = array_search($old_permission, $permissions)) !== FALSE) {
         unset($permissions[$index]);
@@ -687,78 +687,3 @@ function update_replace_permissions($replace) {
       ->save();
   }
 }
-
-/**
- * Returns a list of languages set up on the site during upgrades.
- *
- * @param $flags
- *   (optional) Specifies the state of the languages that have to be returned.
- *   It can be: LanguageInterface::STATE_CONFIGURABLE,
- *   LanguageInterface::STATE_LOCKED, or LanguageInterface::STATE_ALL.
- *
- * @return \Drupal\Core\Language\LanguageInterface[]
- *   An associative array of languages, keyed by the language code, ordered by
- *   weight ascending and name ascending.
- */
-function update_language_list($flags = LanguageInterface::STATE_CONFIGURABLE) {
-
-  $languages = &drupal_static(__FUNCTION__);
-
-  // Initialize master language list.
-  if (!isset($languages)) {
-    // Initialize local language list cache.
-    $languages = array();
-
-    // Fill in master language list based on current configuration.
-    $default = \Drupal::languageManager()->getDefaultLanguage();
-    if (\Drupal::languageManager()->isMultilingual() || \Drupal::moduleHandler()->moduleExists('language')) {
-      // Use language module configuration if available. We can not use
-      // entity_load_multiple() because this breaks during updates.
-      $language_entities = \Drupal::configFactory()->listAll('language.entity.');
-
-      // Initialize default property so callers have an easy reference and can
-      // save the same object without data loss.
-      foreach ($language_entities as $langcode_config_name) {
-        $langcode = substr($langcode_config_name, strlen('language.entity.'));
-        $info = \Drupal::config($langcode_config_name)->get();
-        $languages[$langcode] = new Language(array(
-          'default' => ($info['id'] == $default->getId()),
-          'name' => $info['label'],
-          'id' => $info['id'],
-          'direction' => $info['direction'],
-          'locked' => $info['locked'],
-          'weight' => $info['weight'],
-        ));
-      }
-      Language::sort($languages);
-    }
-    else {
-      // No language module, so use the default language only.
-      $languages = array($default->getId() => $default);
-      // Add the special languages, they will be filtered later if needed.
-      $languages += \Drupal::languageManager()->getDefaultLockedLanguages($default->getWeight());
-    }
-  }
-
-  // Filter the full list of languages based on the value of the $all flag. By
-  // default we remove the locked languages, but the caller may request for
-  // those languages to be added as well.
-  $filtered_languages = array();
-
-  // Add the site's default language if flagged as allowed value.
-  if ($flags & LanguageInterface::STATE_SITE_DEFAULT) {
-    $default = \Drupal::languageManager()->getDefaultLanguage();
-    // Rename the default language.
-    $default->setName(t("Site's default language (@lang_name)", array('@lang_name' => $default->getName())));
-    $filtered_languages[LanguageInterface::LANGCODE_SITE_DEFAULT] = $default;
-  }
-
-  foreach ($languages as $langcode => $language) {
-    if (($language->isLocked() && !($flags & LanguageInterface::STATE_LOCKED)) || (!$language->isLocked() && !($flags & LanguageInterface::STATE_CONFIGURABLE))) {
-      continue;
-    }
-    $filtered_languages[$langcode] = $language;
-  }
-
-  return $filtered_languages;
-}
diff --git a/web/core/includes/utility.inc b/web/core/includes/utility.inc
index 2bb650776..70d74a1ef 100644
--- a/web/core/includes/utility.inc
+++ b/web/core/includes/utility.inc
@@ -9,19 +9,20 @@ use Drupal\Core\PhpStorage\PhpStorageFactory;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\DrupalKernel;
 use Symfony\Component\HttpFoundation\Request;
-use Composer\Autoload\ClassLoader;
 
 /**
  * Rebuilds all caches even when Drupal itself does not work.
  *
- * @param \Composer\Autoload\ClassLoader $class_loader
- *   The class loader.
+ * @param $class_loader
+ *   The class loader. Normally Composer's ClassLoader, as included by the
+ *   front controller, but may also be decorated; e.g.,
+ *   \Symfony\Component\ClassLoader\ApcClassLoader, \Symfony\Component\ClassLoader\WinCacheClassLoader, or \Symfony\Component\ClassLoader\XcacheClassLoader
  * @param \Symfony\Component\HttpFoundation\Request $request
  *   The current request.
  *
  * @see rebuild.php
  */
-function drupal_rebuild(ClassLoader $class_loader, Request $request) {
+function drupal_rebuild($class_loader, Request $request) {
   // Remove Drupal's error and exception handlers; they rely on a working
   // service container and other subsystems and will only cause a fatal error
   // that hides the actual error.
diff --git a/web/core/lib/Drupal.php b/web/core/lib/Drupal.php
index 03a952a88..f15548071 100644
--- a/web/core/lib/Drupal.php
+++ b/web/core/lib/Drupal.php
@@ -81,7 +81,7 @@ class Drupal {
   /**
    * The current system version.
    */
-  const VERSION = '8.2.7';
+  const VERSION = '8.3.0';
 
   /**
    * Core API compatibility.
@@ -181,6 +181,16 @@ class Drupal {
     return static::getContainer()->get('app.root');
   }
 
+  /**
+   * Gets the active install profile.
+   *
+   * @return string|null
+   *   The name of the active install profile.
+   */
+  public static function installProfile() {
+    return static::getContainer()->getParameter('install_profile');
+  }
+
   /**
    * Indicates if there is a currently active request object.
    *
@@ -299,6 +309,23 @@ class Drupal {
     return static::getContainer()->get('cache.' . $bin);
   }
 
+  /**
+   * Retrieves the class resolver.
+   *
+   * This is to be used in procedural code such as module files to instantiate
+   * an object of a class that implements
+   * \Drupal\Core\DependencyInjection\ContainerInjectionInterface.
+   *
+   * One common usecase is to provide a class which contains the actual code
+   * of a hook implementation, without having to create a service.
+   *
+   * @return \Drupal\Core\DependencyInjection\ClassResolverInterface
+   *   The class resolver.
+   */
+  public static function classResolver() {
+    return static::getContainer()->get('class_resolver');
+  }
+
   /**
    * Returns an expirable key value store collection.
    *
@@ -433,7 +460,7 @@ class Drupal {
    *   The query object that can query the given entity type.
    */
   public static function entityQuery($entity_type, $conjunction = 'AND') {
-    return static::getContainer()->get('entity.query')->get($entity_type, $conjunction);
+    return static::entityTypeManager()->getStorage($entity_type)->getQuery($conjunction);
   }
 
   /**
@@ -450,7 +477,7 @@ class Drupal {
    *   The query object that can query the given entity type.
    */
   public static function entityQueryAggregate($entity_type, $conjunction = 'AND') {
-    return static::getContainer()->get('entity.query')->getAggregate($entity_type, $conjunction);
+    return static::entityTypeManager()->getStorage($entity_type)->getAggregateQuery($conjunction);
   }
 
   /**
@@ -539,7 +566,7 @@ class Drupal {
    *   Instead create a \Drupal\Core\Url object directly, for example using
    *   Url::fromRoute().
    */
-  public static function url($route_name, $route_parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE) {
+  public static function url($route_name, $route_parameters = [], $options = [], $collect_bubbleable_metadata = FALSE) {
     return static::getContainer()->get('url_generator')->generateFromRoute($route_name, $route_parameters, $options, $collect_bubbleable_metadata);
   }
 
@@ -720,4 +747,14 @@ class Drupal {
     return static::getContainer()->get('entity.definition_update_manager');
   }
 
+  /**
+   * Returns the time service.
+   *
+   * @return \Drupal\Component\Datetime\TimeInterface
+   *   The time service.
+   */
+  public static function time() {
+    return static::getContainer()->get('datetime.time');
+  }
+
 }
diff --git a/web/core/lib/Drupal/Component/Annotation/Plugin.php b/web/core/lib/Drupal/Component/Annotation/Plugin.php
index 29f36759c..790440d11 100644
--- a/web/core/lib/Drupal/Component/Annotation/Plugin.php
+++ b/web/core/lib/Drupal/Component/Annotation/Plugin.php
@@ -52,7 +52,7 @@ class Plugin implements AnnotationInterface {
    *   The parsed annotation as a definition.
    */
   protected function parse(array $values) {
-    $definitions = array();
+    $definitions = [];
     foreach ($values as $key => $value) {
       if ($value instanceof AnnotationInterface) {
         $definitions[$key] = $value->get();
diff --git a/web/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php b/web/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
index e564fd087..000c337db 100644
--- a/web/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/web/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -10,6 +10,7 @@ use Doctrine\Common\Annotations\SimpleAnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\Reflection\StaticReflectionParser;
 use Drupal\Component\Plugin\Discovery\DiscoveryTrait;
+use Drupal\Component\Utility\Crypt;
 
 /**
  * Defines a discovery mechanism to find annotated plugins in PSR-0 namespaces.
@@ -68,13 +69,13 @@ class AnnotatedClassDiscovery implements DiscoveryInterface {
    * @param string[] $annotation_namespaces
    *   (optional) Additional namespaces to be scanned for annotation classes.
    */
-  function __construct($plugin_namespaces = array(), $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin', array $annotation_namespaces = []) {
+  public function __construct($plugin_namespaces = [], $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin', array $annotation_namespaces = []) {
     $this->pluginNamespaces = $plugin_namespaces;
     $this->pluginDefinitionAnnotationName = $plugin_definition_annotation_name;
     $this->annotationNamespaces = $annotation_namespaces;
 
     $file_cache_suffix = str_replace('\\', '_', $plugin_definition_annotation_name);
-    $file_cache_suffix .= ':' . hash('crc32b', serialize($annotation_namespaces));
+    $file_cache_suffix .= ':' . Crypt::hashBase64(serialize($annotation_namespaces));
     $this->fileCache = FileCacheFactory::get('annotation_discovery:' . $file_cache_suffix);
   }
 
@@ -104,7 +105,7 @@ class AnnotatedClassDiscovery implements DiscoveryInterface {
    * {@inheritdoc}
    */
   public function getDefinitions() {
-    $definitions = array();
+    $definitions = [];
 
     $reader = $this->getAnnotationReader();
 
diff --git a/web/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotationBridgeDecorator.php b/web/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotationBridgeDecorator.php
new file mode 100644
index 000000000..53d70d152
--- /dev/null
+++ b/web/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotationBridgeDecorator.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Drupal\Component\Annotation\Plugin\Discovery;
+
+use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
+use Drupal\Component\Plugin\Discovery\DiscoveryTrait;
+
+/**
+ * Ensures that all definitions are run through the annotation process.
+ */
+class AnnotationBridgeDecorator implements DiscoveryInterface {
+
+  use DiscoveryTrait;
+
+  /**
+   * The decorated plugin discovery.
+   *
+   * @var \Drupal\Component\Plugin\Discovery\DiscoveryInterface
+   */
+  protected $decorated;
+
+  /**
+   * The name of the annotation that contains the plugin definition.
+   *
+   * @var string|null
+   */
+  protected $pluginDefinitionAnnotationName;
+
+  /**
+   * ObjectDefinitionDiscoveryDecorator constructor.
+   *
+   * @param \Drupal\Component\Plugin\Discovery\DiscoveryInterface $decorated
+   *   The discovery object that is being decorated.
+   * @param string $plugin_definition_annotation_name
+   *   The name of the annotation that contains the plugin definition. The class
+   *   corresponding to this name must implement
+   *   \Drupal\Component\Annotation\AnnotationInterface.
+   */
+  public function __construct(DiscoveryInterface $decorated, $plugin_definition_annotation_name) {
+    $this->decorated = $decorated;
+    $this->pluginDefinitionAnnotationName = $plugin_definition_annotation_name;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefinitions() {
+    $definitions = $this->decorated->getDefinitions();
+    foreach ($definitions as $id => $definition) {
+      // Annotation constructors expect an array of values. If the definition is
+      // not an array, it usually means it has been processed already and can be
+      // ignored.
+      if (is_array($definition)) {
+        $definitions[$id] = (new $this->pluginDefinitionAnnotationName($definition))->get();
+      }
+    }
+    return $definitions;
+  }
+
+  /**
+   * Passes through all unknown calls onto the decorated object.
+   *
+   * @param string $method
+   *   The method to call on the decorated plugin discovery.
+   * @param array $args
+   *   The arguments to send to the method.
+   *
+   * @return mixed
+   *   The method result.
+   */
+  public function __call($method, $args) {
+    return call_user_func_array([$this->decorated, $method], $args);
+  }
+
+}
diff --git a/web/core/lib/Drupal/Component/Annotation/PluginID.php b/web/core/lib/Drupal/Component/Annotation/PluginID.php
index 6120d19f6..462ebd413 100644
--- a/web/core/lib/Drupal/Component/Annotation/PluginID.php
+++ b/web/core/lib/Drupal/Component/Annotation/PluginID.php
@@ -22,11 +22,11 @@ class PluginID extends AnnotationBase {
    * {@inheritdoc}
    */
   public function get() {
-    return array(
+    return [
       'id' => $this->value,
       'class' => $this->class,
       'provider' => $this->provider,
-    );
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php b/web/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
index 3d8f77b17..c6579465e 100644
--- a/web/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
+++ b/web/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
@@ -25,7 +25,7 @@ class ZfExtensionManagerSfContainer implements ReaderManagerInterface, WriterMan
    *
    * @see \Drupal\Component\Bridge\ZfExtensionManagerSfContainer::canonicalizeName().
    */
-  protected $canonicalNamesReplacements = array('-' => '', '_' => '', ' ' => '', '\\' => '', '/' => '');
+  protected $canonicalNamesReplacements = ['-' => '', '_' => '', ' ' => '', '\\' => '', '/' => ''];
 
   /**
    * The prefix to be used when retrieving plugins from the container.
@@ -55,7 +55,7 @@ class ZfExtensionManagerSfContainer implements ReaderManagerInterface, WriterMan
    *   The prefix to be used when retrieving plugins from the container.
    */
   public function __construct($prefix = '') {
-    return $this->prefix = $prefix;
+    $this->prefix = $prefix;
   }
 
   /**
diff --git a/web/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/web/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index 56bd92f23..0158eac4b 100644
--- a/web/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/web/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -41,14 +41,14 @@ class DateTimePlus {
   /**
    * An array of possible date parts.
    */
-  protected static $dateParts = array(
+  protected static $dateParts = [
     'year',
     'month',
     'day',
     'hour',
     'minute',
     'second',
-  );
+  ];
 
   /**
    * The value of the time value passed to the constructor.
@@ -88,7 +88,7 @@ class DateTimePlus {
   /**
    * An array of errors encountered when creating this date.
    */
-  protected $errors = array();
+  protected $errors = [];
 
   /**
    * The DateTime object.
@@ -108,7 +108,7 @@ class DateTimePlus {
    * @return static
    *   A new DateTimePlus object.
    */
-  public static function createFromDateTime(\DateTime $datetime, $settings = array()) {
+  public static function createFromDateTime(\DateTime $datetime, $settings = []) {
     return new static($datetime->format(static::FORMAT), $datetime->getTimezone(), $settings);
   }
 
@@ -130,10 +130,10 @@ class DateTimePlus {
    * @return static
    *   A new DateTimePlus object.
    *
-   * @throws \Exception
+   * @throws \InvalidArgumentException
    *   If the array date values or value combination is not correct.
    */
-  public static function createFromArray(array $date_parts, $timezone = NULL, $settings = array()) {
+  public static function createFromArray(array $date_parts, $timezone = NULL, $settings = []) {
     $date_parts = static::prepareArray($date_parts, TRUE);
     if (static::checkArray($date_parts)) {
       // Even with validation, we can end up with a value that the
@@ -144,7 +144,7 @@ class DateTimePlus {
       return new static($iso_date, $timezone, $settings);
     }
     else {
-      throw new \Exception('The array contains invalid values.');
+      throw new \InvalidArgumentException('The array contains invalid values.');
     }
   }
 
@@ -164,12 +164,12 @@ class DateTimePlus {
    * @return static
    *   A new DateTimePlus object.
    *
-   * @throws \Exception
+   * @throws \InvalidArgumentException
    *   If the timestamp is not numeric.
    */
-  public static function createFromTimestamp($timestamp, $timezone = NULL, $settings = array()) {
+  public static function createFromTimestamp($timestamp, $timezone = NULL, $settings = []) {
     if (!is_numeric($timestamp)) {
-      throw new \Exception('The timestamp must be numeric.');
+      throw new \InvalidArgumentException('The timestamp must be numeric.');
     }
     $datetime = new static('', $timezone, $settings);
     $datetime->setTimestamp($timestamp);
@@ -202,11 +202,12 @@ class DateTimePlus {
    * @return static
    *   A new DateTimePlus object.
    *
-   * @throws \Exception
-   *   If the a date cannot be created from the given format, or if the
-   *   created date does not match the input value.
+   * @throws \InvalidArgumentException
+   *   If the a date cannot be created from the given format.
+   * @throws \UnexpectedValueException
+   *   If the created date does not match the input value.
    */
-  public static function createFromFormat($format, $time, $timezone = NULL, $settings = array()) {
+  public static function createFromFormat($format, $time, $timezone = NULL, $settings = []) {
     if (!isset($settings['validate_format'])) {
       $settings['validate_format'] = TRUE;
     }
@@ -218,7 +219,7 @@ class DateTimePlus {
 
     $date = \DateTime::createFromFormat($format, $time, $datetimeplus->getTimezone());
     if (!$date instanceof \DateTime) {
-      throw new \Exception('The date cannot be created from a format.');
+      throw new \InvalidArgumentException('The date cannot be created from a format.');
     }
     else {
       // Functions that parse date is forgiving, it might create a date that
@@ -236,7 +237,7 @@ class DateTimePlus {
       $datetimeplus->setTimezone($date->getTimezone());
 
       if ($settings['validate_format'] && $test_time != $time) {
-        throw new \Exception('The created date does not match the input value.');
+        throw new \UnexpectedValueException('The created date does not match the input value.');
       }
     }
     return $datetimeplus;
@@ -257,7 +258,7 @@ class DateTimePlus {
    *   - debug: (optional) Boolean choice to leave debug values in the
    *     date object for debugging purposes. Defaults to FALSE.
    */
-  public function __construct($time = 'now', $timezone = NULL, $settings = array()) {
+  public function __construct($time = 'now', $timezone = NULL, $settings = []) {
 
     // Unpack settings.
     $this->langcode = !empty($settings['langcode']) ? $settings['langcode'] : NULL;
@@ -267,10 +268,11 @@ class DateTimePlus {
     $prepared_timezone = $this->prepareTimezone($timezone);
 
     try {
+      $this->errors = [];
       if (!empty($prepared_time)) {
         $test = date_parse($prepared_time);
         if (!empty($test['errors'])) {
-          $this->errors[] = $test['errors'];
+          $this->errors = $test['errors'];
         }
       }
 
@@ -284,7 +286,6 @@ class DateTimePlus {
 
     // Clean up the error messages.
     $this->checkErrors();
-    $this->errors = array_unique($this->errors);
   }
 
   /**
@@ -309,7 +310,7 @@ class DateTimePlus {
     if (!method_exists($this->dateTimeObject, $method)) {
       throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', get_class($this), $method));
     }
-    return call_user_func_array(array($this->dateTimeObject, $method), $args);
+    return call_user_func_array([$this->dateTimeObject, $method], $args);
   }
 
   /**
@@ -345,7 +346,7 @@ class DateTimePlus {
     if (!method_exists('\DateTime', $method)) {
       throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', get_called_class(), $method));
     }
-    return call_user_func_array(array('\DateTime', $method), $args);
+    return call_user_func_array(['\DateTime', $method], $args);
   }
 
   /**
@@ -441,7 +442,7 @@ class DateTimePlus {
   public function checkErrors() {
     $errors = \DateTime::getLastErrors();
     if (!empty($errors['errors'])) {
-      $this->errors += $errors['errors'];
+      $this->errors = array_merge($this->errors, $errors['errors']);
     }
     // Most warnings are messages that the date could not be parsed
     // which causes it to be altered. For validation purposes, a warning
@@ -450,6 +451,8 @@ class DateTimePlus {
     if (!empty($errors['warnings'])) {
       $this->errors[] = 'The date is invalid.';
     }
+
+    $this->errors = array_values(array_unique($this->errors));
   }
 
   /**
@@ -528,24 +531,24 @@ class DateTimePlus {
   public static function prepareArray($array, $force_valid_date = FALSE) {
     if ($force_valid_date) {
       $now = new \DateTime();
-      $array += array(
+      $array += [
         'year'   => $now->format('Y'),
         'month'  => 1,
         'day'    => 1,
         'hour'   => 0,
         'minute' => 0,
         'second' => 0,
-      );
+      ];
     }
     else {
-      $array += array(
+      $array += [
         'year'   => '',
         'month'  => '',
         'day'    => '',
         'hour'   => '',
         'minute' => '',
         'second' => '',
-      );
+      ];
     }
     return $array;
   }
@@ -576,7 +579,7 @@ class DateTimePlus {
     }
     // Testing for valid time is reversed. Missing time is OK,
     // but incorrect values are not.
-    foreach (array('hour', 'minute', 'second') as $key) {
+    foreach (['hour', 'minute', 'second'] as $key) {
       if (array_key_exists($key, $array)) {
         $value = $array[$key];
         switch ($key) {
@@ -627,7 +630,7 @@ class DateTimePlus {
    * @return string
    *   The formatted value of the date.
    */
-  public function format($format, $settings = array()) {
+  public function format($format, $settings = []) {
 
     // If there were construction errors, we can't format the date.
     if ($this->hasErrors()) {
diff --git a/web/core/lib/Drupal/Component/Datetime/Time.php b/web/core/lib/Drupal/Component/Datetime/Time.php
new file mode 100644
index 000000000..77da2e2c1
--- /dev/null
+++ b/web/core/lib/Drupal/Component/Datetime/Time.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\Component\Datetime;
+
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Provides a class for obtaining system time.
+ */
+class Time implements TimeInterface {
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * Constructs a Time object.
+   *
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
+   */
+  public function __construct(RequestStack $request_stack) {
+    $this->requestStack = $request_stack;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRequestTime() {
+    return $this->requestStack->getCurrentRequest()->server->get('REQUEST_TIME');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRequestMicroTime() {
+    return $this->requestStack->getCurrentRequest()->server->get('REQUEST_TIME_FLOAT');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCurrentTime() {
+    return time();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCurrentMicroTime() {
+    return microtime(TRUE);
+  }
+
+}
diff --git a/web/core/lib/Drupal/Component/Datetime/TimeInterface.php b/web/core/lib/Drupal/Component/Datetime/TimeInterface.php
new file mode 100644
index 000000000..0c81575c7
--- /dev/null
+++ b/web/core/lib/Drupal/Component/Datetime/TimeInterface.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace Drupal\Component\Datetime;
+
+/**
+ * Defines an interface for obtaining system time.
+ */
+interface TimeInterface {
+
+  /**
+   * Returns the timestamp for the current request.
+   *
+   * This method should be used to obtain the current system time at the start
+   * of the request. It will be the same value for the life of the request
+   * (even for long execution times).
+   *
+   * This method can replace instances of
+   * @code
+   * $request_time = $_SERVER['REQUEST_TIME'];
+   * $request_time = REQUEST_TIME;
+   * $request_time = $requestStack->getCurrentRequest()->server->get('REQUEST_TIME');
+   * $request_time = $request->server->get('REQUEST_TIME');
+   * @endcode
+   * and most instances of
+   * @code
+   * $time = time();
+   * @endcode
+   * with
+   * @code
+   * $request_time = \Drupal::time()->getRequestTime();
+   * @endcode
+   * or the equivalent using the injected service.
+   *
+   * Using the time service, rather than other methods, is especially important
+   * when creating tests, which require predictable timestamps.
+   *
+   * @return int
+   *   A Unix timestamp.
+   *
+   * @see \Drupal\Component\Datetime\TimeInterface::getRequestMicroTime()
+   * @see \Drupal\Component\Datetime\TimeInterface::getCurrentTime()
+   * @see \Drupal\Component\Datetime\TimeInterface::getCurrentMicroTime()
+   */
+  public function getRequestTime();
+
+  /**
+   * Returns the timestamp for the current request with microsecond precision.
+   *
+   * This method should be used to obtain the current system time, with
+   * microsecond precision, at the start of the request. It will be the same
+   * value for the life of the request (even for long execution times).
+   *
+   * This method can replace instances of
+   * @code
+   * $request_time_float = $_SERVER['REQUEST_TIME_FLOAT'];
+   * $request_time_float = $requestStack->getCurrentRequest()->server->get('REQUEST_TIME_FLOAT');
+   * $request_time_float = $request->server->get('REQUEST_TIME_FLOAT');
+   * @endcode
+   * and many instances of
+   * @code
+   * $microtime = microtime();
+   * $microtime = microtime(TRUE);
+   * @endcode
+   * with
+   * @code
+   * $request_time = \Drupal::time()->getRequestMicroTime();
+   * @endcode
+   * or the equivalent using the injected service.
+   *
+   * Using the time service, rather than other methods, is especially important
+   * when creating tests, which require predictable timestamps.
+   *
+   * @return float
+   *   A Unix timestamp with a fractional portion.
+   *
+   * @see \Drupal\Component\Datetime\TimeInterface::getRequestTime()
+   * @see \Drupal\Component\Datetime\TimeInterface::getCurrentTime()
+   * @see \Drupal\Component\Datetime\TimeInterface::getCurrentMicroTime()
+   */
+  public function getRequestMicroTime();
+
+  /**
+   * Returns the current system time as an integer.
+   *
+   * This method should be used to obtain the current system time, at the time
+   * the method was called.
+   *
+   * This method can replace many instances of
+   * @code
+   * $time = time();
+   * @endcode
+   * with
+   * @code
+   * $request_time = \Drupal::time()->getCurrentTime();
+   * @endcode
+   * or the equivalent using the injected service.
+   *
+   * This method should only be used when the current system time is actually
+   * needed, such as with timers or time interval calculations. If only the
+   * time at the start of the request is needed,
+   * use TimeInterface::getRequestTime().
+   *
+   * Using the time service, rather than other methods, is especially important
+   * when creating tests, which require predictable timestamps.
+   *
+   * @return int
+   *   A Unix timestamp.
+   *
+   * @see \Drupal\Component\Datetime\TimeInterface::getRequestTime()
+   * @see \Drupal\Component\Datetime\TimeInterface::getRequestMicroTime()
+   * @see \Drupal\Component\Datetime\TimeInterface::getCurrentMicroTime()
+   */
+  public function getCurrentTime();
+
+  /**
+   * Returns the current system time with microsecond precision.
+   *
+   * This method should be used to obtain the current system time, with
+   * microsecond precision, at the time the method was called.
+   *
+   * This method can replace many instances of
+   * @code
+   * $microtime = microtime();
+   * $microtime = microtime(TRUE);
+   * @endcode
+   * with
+   * @code
+   * $request_time = \Drupal::time()->getCurrentMicroTime();
+   * @endcode
+   * or the equivalent using the injected service.
+   *
+   * This method should only be used when the current system time is actually
+   * needed, such as with timers or time interval calculations. If only the
+   * time at the start of the request and microsecond precision is needed,
+   * use TimeInterface::getRequestMicroTime().
+   *
+   * Using the time service, rather than other methods, is especially important
+   * when creating tests, which require predictable timestamps.
+   *
+   * @return float
+   *   A Unix timestamp with a fractional portion.
+   *
+   * @see \Drupal\Component\Datetime\TimeInterface::getRequestTime()
+   * @see \Drupal\Component\Datetime\TimeInterface::getRequestMicroTime()
+   * @see \Drupal\Component\Datetime\TimeInterface::getCurrentTime()
+   */
+  public function getCurrentMicroTime();
+
+}
diff --git a/web/core/lib/Drupal/Component/DependencyInjection/Container.php b/web/core/lib/Drupal/Component/DependencyInjection/Container.php
index 452a2c84d..673736954 100644
--- a/web/core/lib/Drupal/Component/DependencyInjection/Container.php
+++ b/web/core/lib/Drupal/Component/DependencyInjection/Container.php
@@ -57,42 +57,42 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
    *
    * @var array
    */
-  protected $parameters = array();
+  protected $parameters = [];
 
   /**
    * The aliases of the container.
    *
    * @var array
    */
-  protected $aliases = array();
+  protected $aliases = [];
 
   /**
    * The service definitions of the container.
    *
    * @var array
    */
-  protected $serviceDefinitions = array();
+  protected $serviceDefinitions = [];
 
   /**
    * The instantiated services.
    *
    * @var array
    */
-  protected $services = array();
+  protected $services = [];
 
   /**
    * The instantiated private services.
    *
    * @var array
    */
-  protected $privateServices = array();
+  protected $privateServices = [];
 
   /**
    * The currently loading services.
    *
    * @var array
    */
-  protected $loading = array();
+  protected $loading = [];
 
   /**
    * Whether the container parameters can still be changed.
@@ -116,14 +116,14 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
    *   - machine_format: Whether this container definition uses the optimized
    *     machine-readable container format.
    */
-  public function __construct(array $container_definition = array()) {
+  public function __construct(array $container_definition = []) {
     if (!empty($container_definition) && (!isset($container_definition['machine_format']) || $container_definition['machine_format'] !== TRUE)) {
       throw new InvalidArgumentException('The non-optimized format is not supported by this class. Use an optimized machine-readable format instead, e.g. as produced by \Drupal\Component\DependencyInjection\Dumper\OptimizedPhpArrayDumper.');
     }
 
-    $this->aliases = isset($container_definition['aliases']) ? $container_definition['aliases'] : array();
-    $this->parameters = isset($container_definition['parameters']) ? $container_definition['parameters'] : array();
-    $this->serviceDefinitions = isset($container_definition['services']) ? $container_definition['services'] : array();
+    $this->aliases = isset($container_definition['aliases']) ? $container_definition['aliases'] : [];
+    $this->parameters = isset($container_definition['parameters']) ? $container_definition['parameters'] : [];
+    $this->serviceDefinitions = isset($container_definition['services']) ? $container_definition['services'] : [];
     $this->frozen = isset($container_definition['frozen']) ? $container_definition['frozen'] : FALSE;
 
     // Register the service_container with itself.
@@ -228,7 +228,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
       throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The service container does not know how to construct this service. The service will need to be set before it is first used.', $id));
     }
 
-    $arguments = array();
+    $arguments = [];
     if (isset($definition['arguments'])) {
       $arguments = $definition['arguments'];
 
@@ -238,14 +238,14 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
     }
 
     if (isset($definition['file'])) {
-      $file = $this->frozen ? $definition['file'] : current($this->resolveServicesAndParameters(array($definition['file'])));
+      $file = $this->frozen ? $definition['file'] : current($this->resolveServicesAndParameters([$definition['file']]));
       require_once $file;
     }
 
     if (isset($definition['factory'])) {
       $factory = $definition['factory'];
       if (is_array($factory)) {
-        $factory = $this->resolveServicesAndParameters(array($factory[0], $factory[1]));
+        $factory = $this->resolveServicesAndParameters([$factory[0], $factory[1]]);
       }
       elseif (!is_string($factory)) {
         throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id));
@@ -254,7 +254,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
       $service = call_user_func_array($factory, $arguments);
     }
     else {
-      $class = $this->frozen ? $definition['class'] : current($this->resolveServicesAndParameters(array($definition['class'])));
+      $class = $this->frozen ? $definition['class'] : current($this->resolveServicesAndParameters([$definition['class']]));
       $length = isset($definition['arguments_count']) ? $definition['arguments_count'] : count($arguments);
 
       // Optimize class instantiation for services with up to 10 parameters as
@@ -322,14 +322,14 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
     if (isset($definition['calls'])) {
       foreach ($definition['calls'] as $call) {
         $method = $call[0];
-        $arguments = array();
+        $arguments = [];
         if (!empty($call[1])) {
           $arguments = $call[1];
           if ($arguments instanceof \stdClass) {
             $arguments = $this->resolveServicesAndParameters($arguments);
           }
         }
-        call_user_func_array(array($service, $method), $arguments);
+        call_user_func_array([$service, $method], $arguments);
       }
     }
 
@@ -362,7 +362,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
    * {@inheritdoc}
    */
   public function set($id, $service, $scope = ContainerInterface::SCOPE_CONTAINER) {
-    if (!in_array($scope, array('container', 'request')) || ('request' === $scope && 'request' !== $id)) {
+    if (!in_array($scope, ['container', 'request']) || ('request' === $scope && 'request' !== $id)) {
       @trigger_error('The concept of container scopes is deprecated since version 2.8 and will be removed in 3.0. Omit the third parameter.', E_USER_DEPRECATED);
     }
 
@@ -549,7 +549,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
    *   An array of strings with suitable alternatives.
    */
   protected function getAlternatives($search_key, array $keys) {
-    $alternatives = array();
+    $alternatives = [];
     foreach ($keys as $key) {
       $lev = levenshtein($search_key, $key);
       if ($lev <= strlen($search_key) / 3 || strpos($key, $search_key) !== FALSE) {
diff --git a/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php b/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
index 984ec509b..7673cef8b 100644
--- a/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
+++ b/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Component\DependencyInjection\Dumper;
 
+use Drupal\Component\Utility\Crypt;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Parameter;
@@ -48,7 +49,7 @@ class OptimizedPhpArrayDumper extends Dumper {
   /**
    * {@inheritdoc}
    */
-  public function dump(array $options = array()) {
+  public function dump(array $options = []) {
     return serialize($this->getArray());
   }
 
@@ -59,7 +60,7 @@ class OptimizedPhpArrayDumper extends Dumper {
    *   A PHP array representation of the service container.
    */
   public function getArray() {
-    $definition = array();
+    $definition = [];
     $this->aliases = $this->getAliases();
     $definition['aliases'] = $this->getAliases();
     $definition['parameters'] = $this->getParameters();
@@ -76,7 +77,7 @@ class OptimizedPhpArrayDumper extends Dumper {
    *   The aliases.
    */
   protected function getAliases() {
-    $alias_definitions = array();
+    $alias_definitions = [];
 
     $aliases = $this->container->getAliases();
     foreach ($aliases as $alias => $id) {
@@ -98,7 +99,7 @@ class OptimizedPhpArrayDumper extends Dumper {
    */
   protected function getParameters() {
     if (!$this->container->getParameterBag()->all()) {
-      return array();
+      return [];
     }
 
     $parameters = $this->container->getParameterBag()->all();
@@ -114,10 +115,10 @@ class OptimizedPhpArrayDumper extends Dumper {
    */
   protected function getServiceDefinitions() {
     if (!$this->container->getDefinitions()) {
-      return array();
+      return [];
     }
 
-    $services = array();
+    $services = [];
     foreach ($this->container->getDefinitions() as $id => $definition) {
       // Only store public service definitions, references to shared private
       // services are handled in ::getReferenceCall().
@@ -142,7 +143,7 @@ class OptimizedPhpArrayDumper extends Dumper {
    *   An array of prepared parameters.
    */
   protected function prepareParameters(array $parameters, $escape = TRUE) {
-    $filtered = array();
+    $filtered = [];
     foreach ($parameters as $key => $value) {
       if (is_array($value)) {
         $value = $this->prepareParameters($value, $escape);
@@ -167,7 +168,7 @@ class OptimizedPhpArrayDumper extends Dumper {
    *   The escaped parameters.
    */
   protected function escape(array $parameters) {
-    $args = array();
+    $args = [];
 
     foreach ($parameters as $key => $value) {
       if (is_array($value)) {
@@ -198,7 +199,7 @@ class OptimizedPhpArrayDumper extends Dumper {
    *   scope different from SCOPE_CONTAINER and SCOPE_PROTOTYPE.
    */
   protected function getServiceDefinition(Definition $definition) {
-    $service = array();
+    $service = [];
     if ($definition->getClass()) {
       $service['class'] = $definition->getClass();
     }
@@ -278,11 +279,11 @@ class OptimizedPhpArrayDumper extends Dumper {
    *   The PHP array representation of the method calls.
    */
   protected function dumpMethodCalls(array $calls) {
-    $code = array();
+    $code = [];
 
     foreach ($calls as $key => $call) {
       $method = $call[0];
-      $arguments = array();
+      $arguments = [];
       if (!empty($call[1])) {
         $arguments = $this->dumpCollection($call[1]);
       }
@@ -308,7 +309,7 @@ class OptimizedPhpArrayDumper extends Dumper {
    *   The collection in a suitable format.
    */
   protected function dumpCollection($collection, &$resolve = FALSE) {
-    $code = array();
+    $code = [];
 
     foreach ($collection as $key => $value) {
       if (is_array($value)) {
@@ -331,11 +332,11 @@ class OptimizedPhpArrayDumper extends Dumper {
       return $collection;
     }
 
-    return (object) array(
+    return (object) [
       'type' => 'collection',
       'value' => $code,
       'resolve' => $resolve,
-    );
+    ];
   }
 
   /**
@@ -350,7 +351,7 @@ class OptimizedPhpArrayDumper extends Dumper {
   protected function dumpCallable($callable) {
     if (is_array($callable)) {
       $callable[0] = $this->dumpValue($callable[0]);
-      $callable = array($callable[0], $callable[1]);
+      $callable = [$callable[0], $callable[1]];
     }
 
     return $callable;
@@ -373,15 +374,15 @@ class OptimizedPhpArrayDumper extends Dumper {
   protected function getPrivateServiceCall($id, Definition $definition, $shared = FALSE) {
     $service_definition = $this->getServiceDefinition($definition);
     if (!$id) {
-      $hash = hash('sha1', serialize($service_definition));
+      $hash = Crypt::hashBase64(serialize($service_definition));
       $id = 'private__' . $hash;
     }
-    return (object) array(
+    return (object) [
       'type' => 'private_service',
       'id' => $id,
       'value' => $service_definition,
       'shared' => $shared,
-    );
+    ];
   }
 
   /**
@@ -398,7 +399,7 @@ class OptimizedPhpArrayDumper extends Dumper {
    */
   protected function dumpValue($value) {
     if (is_array($value)) {
-      $code = array();
+      $code = [];
       foreach ($value as $k => $v) {
         $code[$k] = $this->dumpValue($v);
       }
@@ -481,11 +482,11 @@ class OptimizedPhpArrayDumper extends Dumper {
    *   A suitable representation of the service reference.
    */
   protected function getServiceCall($id, $invalid_behavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE) {
-    return (object) array(
+    return (object) [
       'type' => 'service',
       'id' => $id,
       'invalidBehavior' => $invalid_behavior,
-    );
+    ];
   }
 
   /**
@@ -498,10 +499,10 @@ class OptimizedPhpArrayDumper extends Dumper {
    *   A suitable representation of the parameter reference.
    */
   protected function getParameterCall($name) {
-    return (object) array(
+    return (object) [
       'type' => 'parameter',
       'name' => $name,
-    );
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Component/DependencyInjection/Dumper/PhpArrayDumper.php b/web/core/lib/Drupal/Component/DependencyInjection/Dumper/PhpArrayDumper.php
index 7be318f71..a6fa2b9b0 100644
--- a/web/core/lib/Drupal/Component/DependencyInjection/Dumper/PhpArrayDumper.php
+++ b/web/core/lib/Drupal/Component/DependencyInjection/Dumper/PhpArrayDumper.php
@@ -30,7 +30,7 @@ class PhpArrayDumper extends OptimizedPhpArrayDumper {
    * {@inheritdoc}
    */
   protected function dumpCollection($collection, &$resolve = FALSE) {
-    $code = array();
+    $code = [];
 
     foreach ($collection as $key => $value) {
       if (is_array($value)) {
diff --git a/web/core/lib/Drupal/Component/DependencyInjection/PhpArrayContainer.php b/web/core/lib/Drupal/Component/DependencyInjection/PhpArrayContainer.php
index 3ec208630..83d558cbd 100644
--- a/web/core/lib/Drupal/Component/DependencyInjection/PhpArrayContainer.php
+++ b/web/core/lib/Drupal/Component/DependencyInjection/PhpArrayContainer.php
@@ -27,16 +27,16 @@ class PhpArrayContainer extends Container {
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $container_definition = array()) {
+  public function __construct(array $container_definition = []) {
     if (isset($container_definition['machine_format']) && $container_definition['machine_format'] === TRUE) {
       throw new InvalidArgumentException('The machine-optimized format is not supported by this class. Use a human-readable format instead, e.g. as produced by \Drupal\Component\DependencyInjection\Dumper\PhpArrayDumper.');
     }
 
     // Do not call the parent's constructor as it would bail on the
     // machine-optimized format.
-    $this->aliases = isset($container_definition['aliases']) ? $container_definition['aliases'] : array();
-    $this->parameters = isset($container_definition['parameters']) ? $container_definition['parameters'] : array();
-    $this->serviceDefinitions = isset($container_definition['services']) ? $container_definition['services'] : array();
+    $this->aliases = isset($container_definition['aliases']) ? $container_definition['aliases'] : [];
+    $this->parameters = isset($container_definition['parameters']) ? $container_definition['parameters'] : [];
+    $this->serviceDefinitions = isset($container_definition['services']) ? $container_definition['services'] : [];
     $this->frozen = isset($container_definition['frozen']) ? $container_definition['frozen'] : FALSE;
 
     // Register the service_container with itself.
@@ -57,20 +57,20 @@ class PhpArrayContainer extends Container {
       throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The service container does not know how to construct this service. The service will need to be set before it is first used.', $id));
     }
 
-    $arguments = array();
+    $arguments = [];
     if (isset($definition['arguments'])) {
       $arguments = $this->resolveServicesAndParameters($definition['arguments']);
     }
 
     if (isset($definition['file'])) {
-      $file = $this->frozen ? $definition['file'] : current($this->resolveServicesAndParameters(array($definition['file'])));
+      $file = $this->frozen ? $definition['file'] : current($this->resolveServicesAndParameters([$definition['file']]));
       require_once $file;
     }
 
     if (isset($definition['factory'])) {
       $factory = $definition['factory'];
       if (is_array($factory)) {
-        $factory = $this->resolveServicesAndParameters(array($factory[0], $factory[1]));
+        $factory = $this->resolveServicesAndParameters([$factory[0], $factory[1]]);
       }
       elseif (!is_string($factory)) {
         throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id));
@@ -79,7 +79,7 @@ class PhpArrayContainer extends Container {
       $service = call_user_func_array($factory, $arguments);
     }
     else {
-      $class = $this->frozen ? $definition['class'] : current($this->resolveServicesAndParameters(array($definition['class'])));
+      $class = $this->frozen ? $definition['class'] : current($this->resolveServicesAndParameters([$definition['class']]));
       $length = isset($definition['arguments_count']) ? $definition['arguments_count'] : count($arguments);
 
       // Optimize class instantiation for services with up to 10 parameters as
@@ -147,12 +147,12 @@ class PhpArrayContainer extends Container {
     if (isset($definition['calls'])) {
       foreach ($definition['calls'] as $call) {
         $method = $call[0];
-        $arguments = array();
+        $arguments = [];
         if (!empty($call[1])) {
           $arguments = $call[1];
           $arguments = $this->resolveServicesAndParameters($arguments);
         }
-        call_user_func_array(array($service, $method), $arguments);
+        call_user_func_array([$service, $method], $arguments);
       }
     }
 
diff --git a/web/core/lib/Drupal/Component/Diff/Diff.php b/web/core/lib/Drupal/Component/Diff/Diff.php
index 2e35611db..d9042bcca 100644
--- a/web/core/lib/Drupal/Component/Diff/Diff.php
+++ b/web/core/lib/Drupal/Component/Diff/Diff.php
@@ -49,7 +49,7 @@ class Diff {
    */
   public function reverse() {
     $rev = $this;
-    $rev->edits = array();
+    $rev->edits = [];
     foreach ($this->edits as $edit) {
       $rev->edits[] = $edit->reverse();
     }
@@ -96,7 +96,7 @@ class Diff {
    * @return array The original sequence of strings.
    */
   public function orig() {
-    $lines = array();
+    $lines = [];
 
     foreach ($this->edits as $edit) {
       if ($edit->orig) {
@@ -115,7 +115,7 @@ class Diff {
    * @return array The sequence of strings.
    */
   public function closing() {
-    $lines = array();
+    $lines = [];
 
     foreach ($this->edits as $edit) {
       if ($edit->closing) {
diff --git a/web/core/lib/Drupal/Component/Diff/DiffFormatter.php b/web/core/lib/Drupal/Component/Diff/DiffFormatter.php
index edcb84df7..d70f3e61a 100644
--- a/web/core/lib/Drupal/Component/Diff/DiffFormatter.php
+++ b/web/core/lib/Drupal/Component/Diff/DiffFormatter.php
@@ -41,10 +41,10 @@ class DiffFormatter {
    *
    * @var array
    */
-  protected $line_stats = array(
-    'counter' => array('x' => 0, 'y' => 0),
-    'offset' => array('x' => 0, 'y' => 0),
-  );
+  protected $line_stats = [
+    'counter' => ['x' => 0, 'y' => 0],
+    'offset' => ['x' => 0, 'y' => 0],
+  ];
 
   /**
    * Format a diff.
@@ -58,7 +58,7 @@ class DiffFormatter {
   public function format(Diff $diff) {
     $xi = $yi = 1;
     $block = FALSE;
-    $context = array();
+    $context = [];
 
     $nlead = $this->leading_context_lines;
     $ntrail = $this->trailing_context_lines;
@@ -87,7 +87,7 @@ class DiffFormatter {
           $context = array_slice($context, sizeof($context) - $nlead);
           $x0 = $xi - sizeof($context);
           $y0 = $yi - sizeof($context);
-          $block = array();
+          $block = [];
           if ($context) {
             $block[] = new DiffOpCopy($context);
           }
diff --git a/web/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php b/web/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
index b27886d36..7885c6f00 100644
--- a/web/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
+++ b/web/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
@@ -38,9 +38,9 @@ class DiffEngine {
     $n_from = sizeof($from_lines);
     $n_to = sizeof($to_lines);
 
-    $this->xchanged = $this->ychanged = array();
-    $this->xv = $this->yv = array();
-    $this->xind = $this->yind = array();
+    $this->xchanged = $this->ychanged = [];
+    $this->xv = $this->yv = [];
+    $this->xind = $this->yind = [];
     unset($this->seq);
     unset($this->in_seq);
     unset($this->lcs);
@@ -93,14 +93,14 @@ class DiffEngine {
     $this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged);
 
     // Compute the edit operations.
-    $edits = array();
+    $edits = [];
     $xi = $yi = 0;
     while ($xi < $n_from || $yi < $n_to) {
       $this::USE_ASSERTS && assert($yi < $n_to || $this->xchanged[$xi]);
       $this::USE_ASSERTS && assert($xi < $n_from || $this->ychanged[$yi]);
 
       // Skip matching "snake".
-      $copy = array();
+      $copy = [];
       while ( $xi < $n_from && $yi < $n_to && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
         $copy[] = $from_lines[$xi++];
         ++$yi;
@@ -109,11 +109,11 @@ class DiffEngine {
         $edits[] = new DiffOpCopy($copy);
       }
       // Find deletes & adds.
-      $delete = array();
+      $delete = [];
       while ($xi < $n_from && $this->xchanged[$xi]) {
         $delete[] = $from_lines[$xi++];
       }
-      $add = array();
+      $add = [];
       while ($yi < $n_to && $this->ychanged[$yi]) {
         $add[] = $to_lines[$yi++];
       }
@@ -167,7 +167,7 @@ class DiffEngine {
       // Things seems faster (I'm not sure I understand why)
       // when the shortest sequence in X.
       $flip = TRUE;
-      list($xoff, $xlim, $yoff, $ylim) = array($yoff, $ylim, $xoff, $xlim);
+      list($xoff, $xlim, $yoff, $ylim) = [$yoff, $ylim, $xoff, $xlim];
     }
 
     if ($flip) {
@@ -182,8 +182,8 @@ class DiffEngine {
     }
     $this->lcs = 0;
     $this->seq[0] = $yoff - 1;
-    $this->in_seq = array();
-    $ymids[0] = array();
+    $this->in_seq = [];
+    $ymids[0] = [];
 
     $numer = $xlim - $xoff + $nchunks - 1;
     $x = $xoff;
@@ -228,16 +228,16 @@ class DiffEngine {
       }
     }
 
-    $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
+    $seps[] = $flip ? [$yoff, $xoff] : [$xoff, $yoff];
     $ymid = $ymids[$this->lcs];
     for ($n = 0; $n < $nchunks - 1; $n++) {
       $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
       $y1 = $ymid[$n] + 1;
-      $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
+      $seps[] = $flip ? [$y1, $x1] : [$x1, $y1];
     }
-    $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
+    $seps[] = $flip ? [$ylim, $xlim] : [$xlim, $ylim];
 
-    return array($this->lcs, $seps);
+    return [$this->lcs, $seps];
   }
 
   protected function _lcs_pos($ypos) {
diff --git a/web/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php b/web/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
index 532c7014c..eb7d9434c 100644
--- a/web/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
+++ b/web/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
@@ -20,7 +20,7 @@ class HWLDFWordAccumulator {
    */
   const NBSP = '&#160;';
 
-  protected $lines = array();
+  protected $lines = [];
 
   protected $line = '';
 
diff --git a/web/core/lib/Drupal/Component/Diff/WordLevelDiff.php b/web/core/lib/Drupal/Component/Diff/WordLevelDiff.php
index a19c687ef..a8c2f80f2 100644
--- a/web/core/lib/Drupal/Component/Diff/WordLevelDiff.php
+++ b/web/core/lib/Drupal/Component/Diff/WordLevelDiff.php
@@ -22,8 +22,8 @@ class WordLevelDiff extends MappedDiff {
   }
 
   protected function _split($lines) {
-    $words = array();
-    $stripped = array();
+    $words = [];
+    $stripped = [];
     $first = TRUE;
     foreach ($lines as $line) {
       // If the line is too long, just pretend the entire line is one big word
@@ -46,7 +46,7 @@ class WordLevelDiff extends MappedDiff {
         }
       }
     }
-    return array($words, $stripped);
+    return [$words, $stripped];
   }
 
   public function orig() {
diff --git a/web/core/lib/Drupal/Component/Discovery/YamlDirectoryDiscovery.php b/web/core/lib/Drupal/Component/Discovery/YamlDirectoryDiscovery.php
index 6d0eceb52..db2c3cc96 100644
--- a/web/core/lib/Drupal/Component/Discovery/YamlDirectoryDiscovery.php
+++ b/web/core/lib/Drupal/Component/Discovery/YamlDirectoryDiscovery.php
@@ -65,7 +65,7 @@ class YamlDirectoryDiscovery implements DiscoverableInterface {
    * {@inheritdoc}
    */
   public function findAll() {
-    $all = array();
+    $all = [];
 
     $files = $this->findFiles();
 
diff --git a/web/core/lib/Drupal/Component/Discovery/YamlDiscovery.php b/web/core/lib/Drupal/Component/Discovery/YamlDiscovery.php
index ea5c9c25b..f13e60b97 100644
--- a/web/core/lib/Drupal/Component/Discovery/YamlDiscovery.php
+++ b/web/core/lib/Drupal/Component/Discovery/YamlDiscovery.php
@@ -22,7 +22,7 @@ class YamlDiscovery implements DiscoverableInterface {
    *
    * @var array
    */
-  protected $directories = array();
+  protected $directories = [];
 
   /**
    * Constructs a YamlDiscovery object.
@@ -42,7 +42,7 @@ class YamlDiscovery implements DiscoverableInterface {
    * {@inheritdoc}
    */
   public function findAll() {
-    $all = array();
+    $all = [];
 
     $files = $this->findFiles();
     $provider_by_files = array_flip($files);
@@ -86,7 +86,7 @@ class YamlDiscovery implements DiscoverableInterface {
    * @return array
    */
   protected function findFiles() {
-    $files = array();
+    $files = [];
     foreach ($this->directories as $provider => $directory) {
       $file = $directory . '/' . $provider . '.' . $this->name . '.yml';
       if (file_exists($file)) {
diff --git a/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
index a933b0659..6c1e20082 100644
--- a/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
+++ b/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -230,14 +230,14 @@ class ContainerAwareEventDispatcher implements EventDispatcherInterface {
   public function addSubscriber(EventSubscriberInterface $subscriber) {
     foreach ($subscriber->getSubscribedEvents() as $event_name => $params) {
       if (is_string($params)) {
-        $this->addListener($event_name, array($subscriber, $params));
+        $this->addListener($event_name, [$subscriber, $params]);
       }
       elseif (is_string($params[0])) {
-        $this->addListener($event_name, array($subscriber, $params[0]), isset($params[1]) ? $params[1] : 0);
+        $this->addListener($event_name, [$subscriber, $params[0]], isset($params[1]) ? $params[1] : 0);
       }
       else {
         foreach ($params as $listener) {
-          $this->addListener($event_name, array($subscriber, $listener[0]), isset($listener[1]) ? $listener[1] : 0);
+          $this->addListener($event_name, [$subscriber, $listener[0]], isset($listener[1]) ? $listener[1] : 0);
         }
       }
     }
@@ -250,11 +250,11 @@ class ContainerAwareEventDispatcher implements EventDispatcherInterface {
     foreach ($subscriber->getSubscribedEvents() as $event_name => $params) {
       if (is_array($params) && is_array($params[0])) {
         foreach ($params as $listener) {
-          $this->removeListener($event_name, array($subscriber, $listener[0]));
+          $this->removeListener($event_name, [$subscriber, $listener[0]]);
         }
       }
       else {
-        $this->removeListener($event_name, array($subscriber, is_string($params) ? $params : $params[0]));
+        $this->removeListener($event_name, [$subscriber, is_string($params) ? $params : $params[0]]);
       }
     }
   }
diff --git a/web/core/lib/Drupal/Component/FileSystem/FileSystem.php b/web/core/lib/Drupal/Component/FileSystem/FileSystem.php
index 26989cdb5..7a1c551f2 100644
--- a/web/core/lib/Drupal/Component/FileSystem/FileSystem.php
+++ b/web/core/lib/Drupal/Component/FileSystem/FileSystem.php
@@ -15,7 +15,7 @@ class FileSystem {
    *   suitable temporary directory can be found.
    */
   public static function getOsTemporaryDirectory() {
-    $directories = array();
+    $directories = [];
 
     // Has PHP been set with an upload_tmp_dir?
     if (ini_get('upload_tmp_dir')) {
diff --git a/web/core/lib/Drupal/Component/Gettext/PoHeader.php b/web/core/lib/Drupal/Component/Gettext/PoHeader.php
index 59223014d..5dd13a5d5 100644
--- a/web/core/lib/Drupal/Component/Gettext/PoHeader.php
+++ b/web/core/lib/Drupal/Component/Gettext/PoHeader.php
@@ -85,7 +85,7 @@ class PoHeader {
    *   Plural form component from the header, for example:
    *   'nplurals=2; plural=(n > 1);'.
    */
-  function getPluralForms() {
+  public function getPluralForms() {
     return $this->_pluralForms;
   }
 
@@ -95,7 +95,7 @@ class PoHeader {
    * @param string $languageName
    *   Human readable language name.
    */
-  function setLanguageName($languageName) {
+  public function setLanguageName($languageName) {
     $this->_languageName = $languageName;
   }
 
@@ -105,7 +105,7 @@ class PoHeader {
    * @return string
    *   The human readable language name.
    */
-  function getLanguageName() {
+  public function getLanguageName() {
     return $this->_languageName;
   }
 
@@ -115,7 +115,7 @@ class PoHeader {
    * @param string $projectName
    *   Human readable project name.
    */
-  function setProjectName($projectName) {
+  public function setProjectName($projectName) {
     $this->_projectName = $projectName;
   }
 
@@ -125,7 +125,7 @@ class PoHeader {
    * @return string
    *   The human readable project name.
    */
-  function getProjectName() {
+  public function getProjectName() {
     return $this->_projectName;
   }
 
@@ -190,10 +190,10 @@ class PoHeader {
    *
    * @throws Exception
    */
-  function parsePluralForms($pluralforms) {
-    $plurals = array();
+  public function parsePluralForms($pluralforms) {
+    $plurals = [];
     // First, delete all whitespace.
-    $pluralforms = strtr($pluralforms, array(" " => "", "\t" => ""));
+    $pluralforms = strtr($pluralforms, [" " => "", "\t" => ""]);
 
     // Select the parts that define nplurals and plural.
     $nplurals = strstr($pluralforms, "nplurals=");
@@ -215,7 +215,7 @@ class PoHeader {
 
     // If the number of plurals is zero, we return a default result.
     if ($nplurals == 0) {
-      return array($nplurals, array('default' => 0));
+      return [$nplurals, ['default' => 0]];
     }
 
     // Calculate possible plural positions of different plural values. All known
@@ -233,7 +233,7 @@ class PoHeader {
       });
       $plurals['default'] = $default;
 
-      return array($nplurals, $plurals);
+      return [$nplurals, $plurals];
     }
     else {
       throw new \Exception('The plural formula could not be parsed.');
@@ -250,7 +250,7 @@ class PoHeader {
    *   An associative array of key-value pairs.
    */
   private function parseHeader($header) {
-    $header_parsed = array();
+    $header_parsed = [];
     $lines = array_map('trim', explode("\n", $header));
     foreach ($lines as $line) {
       if ($line) {
@@ -275,17 +275,17 @@ class PoHeader {
    */
   private function parseArithmetic($string) {
     // Operator precedence table.
-    $precedence = array("(" => -1, ")" => -1, "?" => 1, ":" => 1, "||" => 3, "&&" => 4, "==" => 5, "!=" => 5, "<" => 6, ">" => 6, "<=" => 6, ">=" => 6, "+" => 7, "-" => 7, "*" => 8, "/" => 8, "%" => 8);
+    $precedence = ["(" => -1, ")" => -1, "?" => 1, ":" => 1, "||" => 3, "&&" => 4, "==" => 5, "!=" => 5, "<" => 6, ">" => 6, "<=" => 6, ">=" => 6, "+" => 7, "-" => 7, "*" => 8, "/" => 8, "%" => 8];
     // Right associativity.
-    $right_associativity = array("?" => 1, ":" => 1);
+    $right_associativity = ["?" => 1, ":" => 1];
 
     $tokens = $this->tokenizeFormula($string);
 
     // Parse by converting into infix notation then back into postfix
     // Operator stack - holds math operators and symbols.
-    $operator_stack = array();
+    $operator_stack = [];
     // Element Stack - holds data to be operated on.
-    $element_stack = array();
+    $element_stack = [];
 
     foreach ($tokens as $token) {
       $current_token = $token;
@@ -373,7 +373,7 @@ class PoHeader {
    */
   private function tokenizeFormula($formula) {
     $formula = str_replace(" ", "", $formula);
-    $tokens = array();
+    $tokens = [];
     for ($i = 0; $i < strlen($formula); $i++) {
       if (is_numeric($formula[$i])) {
         $num = $formula[$i];
diff --git a/web/core/lib/Drupal/Component/Gettext/PoItem.php b/web/core/lib/Drupal/Component/Gettext/PoItem.php
index 6cedff110..1f05bbd59 100644
--- a/web/core/lib/Drupal/Component/Gettext/PoItem.php
+++ b/web/core/lib/Drupal/Component/Gettext/PoItem.php
@@ -59,7 +59,7 @@ class PoItem {
    *
    * @return string with langcode
    */
-  function getLangcode() {
+  public function getLangcode() {
     return $this->_langcode;
   }
 
@@ -68,7 +68,7 @@ class PoItem {
    *
    * @param string $langcode
    */
-  function setLangcode($langcode) {
+  public function setLangcode($langcode) {
     $this->_langcode = $langcode;
   }
 
@@ -77,7 +77,7 @@ class PoItem {
    *
    * @return string $context
    */
-  function getContext() {
+  public function getContext() {
     return $this->_context;
   }
 
@@ -86,7 +86,7 @@ class PoItem {
    *
    * @param string $context
    */
-  function setContext($context) {
+  public function setContext($context) {
     $this->_context = $context;
   }
 
@@ -96,7 +96,7 @@ class PoItem {
    *
    * @return string or array $translation
    */
-  function getSource() {
+  public function getSource() {
     return $this->_source;
   }
 
@@ -106,7 +106,7 @@ class PoItem {
    *
    * @param string or array $source
    */
-  function setSource($source) {
+  public function setSource($source) {
     $this->_source = $source;
   }
 
@@ -116,7 +116,7 @@ class PoItem {
    *
    * @return string or array $translation
    */
-  function getTranslation() {
+  public function getTranslation() {
     return $this->_translation;
   }
 
@@ -126,7 +126,7 @@ class PoItem {
    *
    * @param string or array $translation
    */
-  function setTranslation($translation) {
+  public function setTranslation($translation) {
     $this->_translation = $translation;
   }
 
@@ -135,7 +135,7 @@ class PoItem {
    *
    * @param bool $plural
    */
-  function setPlural($plural) {
+  public function setPlural($plural) {
     $this->_plural = $plural;
   }
 
@@ -144,7 +144,7 @@ class PoItem {
    *
    * @return bool
    */
-  function isPlural() {
+  public function isPlural() {
     return $this->_plural;
   }
 
@@ -153,7 +153,7 @@ class PoItem {
    *
    * @return String $comment
    */
-  function getComment() {
+  public function getComment() {
     return $this->_comment;
   }
 
@@ -162,7 +162,7 @@ class PoItem {
    *
    * @param string $comment
    */
-  function setComment($comment) {
+  public function setComment($comment) {
     $this->_comment = $comment;
   }
 
@@ -171,7 +171,7 @@ class PoItem {
    *
    * @param array $values
    */
-  public function setFromArray(array $values = array()) {
+  public function setFromArray(array $values = []) {
     if (isset($values['context'])) {
       $this->setContext($values['context']);
     }
diff --git a/web/core/lib/Drupal/Component/Gettext/PoMemoryWriter.php b/web/core/lib/Drupal/Component/Gettext/PoMemoryWriter.php
index 37070cb9b..c5416b6fa 100644
--- a/web/core/lib/Drupal/Component/Gettext/PoMemoryWriter.php
+++ b/web/core/lib/Drupal/Component/Gettext/PoMemoryWriter.php
@@ -17,8 +17,8 @@ class PoMemoryWriter implements PoWriterInterface {
   /**
    * Constructor, initialize empty items.
    */
-  function __construct() {
-    $this->_items = array();
+  public function __construct() {
+    $this->_items = [];
   }
 
   /**
@@ -57,7 +57,7 @@ class PoMemoryWriter implements PoWriterInterface {
    *
    * Not implemented. Not relevant for the MemoryWriter.
    */
-  function setLangcode($langcode) {
+  public function setLangcode($langcode) {
   }
 
   /**
@@ -65,7 +65,7 @@ class PoMemoryWriter implements PoWriterInterface {
    *
    * Not implemented. Not relevant for the MemoryWriter.
    */
-  function getLangcode() {
+  public function getLangcode() {
   }
 
   /**
@@ -73,7 +73,7 @@ class PoMemoryWriter implements PoWriterInterface {
    *
    * Not implemented. Not relevant for the MemoryWriter.
    */
-  function getHeader() {
+  public function getHeader() {
   }
 
   /**
@@ -81,7 +81,7 @@ class PoMemoryWriter implements PoWriterInterface {
    *
    * Not implemented. Not relevant for the MemoryWriter.
    */
-  function setHeader(PoHeader $header) {
+  public function setHeader(PoHeader $header) {
   }
 
 }
diff --git a/web/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php b/web/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php
index db8559d2a..28d9f831b 100644
--- a/web/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php
+++ b/web/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php
@@ -37,7 +37,7 @@ interface PoMetadataInterface {
   /**
    * Get header metadata.
    *
-   * @return \Drupal\Component\Gettext\PoHeader $header
+   * @return \Drupal\Component\Gettext\PoHeader
    *   Header instance representing metadata in a PO header.
    */
   public function getHeader();
diff --git a/web/core/lib/Drupal/Component/Gettext/PoStreamReader.php b/web/core/lib/Drupal/Component/Gettext/PoStreamReader.php
index faaa95f91..f84d2514c 100644
--- a/web/core/lib/Drupal/Component/Gettext/PoStreamReader.php
+++ b/web/core/lib/Drupal/Component/Gettext/PoStreamReader.php
@@ -39,7 +39,7 @@ class PoStreamReader implements PoStreamInterface, PoReaderInterface {
    *
    * @var array
    */
-  private $_current_item = array();
+  private $_current_item = [];
 
   /**
    * Current plural index for plural translations.
@@ -261,14 +261,14 @@ class PoStreamReader implements PoStreamInterface, PoReaderInterface {
       $this->_line_number++;
 
       // Initialize common values for error logging.
-      $log_vars = array(
+      $log_vars = [
         '%uri' => $this->getURI(),
         '%line' => $this->_line_number,
-      );
+      ];
 
       // Trim away the linefeed. \\n might appear at the end of the string if
       // another line continuing the same string follows. We can remove that.
-      $line = trim(strtr($line, array("\\\n" => "")));
+      $line = trim(strtr($line, ["\\\n" => ""]));
 
       if (!strncmp('#', $line, 1)) {
         // Lines starting with '#' are comments.
@@ -282,7 +282,7 @@ class PoStreamReader implements PoStreamInterface, PoReaderInterface {
           $this->setItemFromArray($this->_current_item);
 
           // Start a new entry for the comment.
-          $this->_current_item = array();
+          $this->_current_item = [];
           $this->_current_item['#'][] = substr($line, 1);
 
           $this->_context = 'COMMENT';
@@ -319,7 +319,7 @@ class PoStreamReader implements PoStreamInterface, PoReaderInterface {
         if (is_string($this->_current_item['msgid'])) {
           // The first value was stored as string. Now we know the context is
           // plural, it is converted to array.
-          $this->_current_item['msgid'] = array($this->_current_item['msgid']);
+          $this->_current_item['msgid'] = [$this->_current_item['msgid']];
         }
         $this->_current_item['msgid'][] = $quoted;
 
@@ -334,7 +334,7 @@ class PoStreamReader implements PoStreamInterface, PoReaderInterface {
           $this->setItemFromArray($this->_current_item);
 
           // Start a new context for the msgid.
-          $this->_current_item = array();
+          $this->_current_item = [];
         }
         elseif ($this->_context == 'MSGID') {
           // We are currently already in the context, meaning we passed an id with no data.
@@ -363,7 +363,7 @@ class PoStreamReader implements PoStreamInterface, PoReaderInterface {
         if (($this->_context == 'MSGSTR') || ($this->_context == 'MSGSTR_ARR')) {
           // We are currently in string context, save current item.
           $this->setItemFromArray($this->_current_item);
-          $this->_current_item = array();
+          $this->_current_item = [];
         }
         elseif (!empty($this->_current_item['msgctxt'])) {
           // A context cannot apply to another context.
@@ -421,7 +421,7 @@ class PoStreamReader implements PoStreamInterface, PoReaderInterface {
           return FALSE;
         }
         if (!isset($this->_current_item['msgstr']) || !is_array($this->_current_item['msgstr'])) {
-          $this->_current_item['msgstr'] = array();
+          $this->_current_item['msgstr'] = [];
         }
 
         $this->_current_item['msgstr'][$this->_current_plural_index] = $quoted;
@@ -500,7 +500,7 @@ class PoStreamReader implements PoStreamInterface, PoReaderInterface {
     // Empty line read or EOF of PO stream, close out the last entry.
     if (($this->_context == 'MSGSTR') || ($this->_context == 'MSGSTR_ARR')) {
       $this->setItemFromArray($this->_current_item);
-      $this->_current_item = array();
+      $this->_current_item = [];
     }
     elseif ($this->_context != 'COMMENT') {
       $this->_errors[] = SafeMarkup::format('The translation stream %uri ended unexpectedly at line %line.', $log_vars);
@@ -547,7 +547,7 @@ class PoStreamReader implements PoStreamInterface, PoReaderInterface {
    * @return
    *   The string parsed from inside the quotes.
    */
-  function parseQuoted($string) {
+  public function parseQuoted($string) {
     if (substr($string, 0, 1) != substr($string, -1, 1)) {
       // Start and end quotes must be the same.
       return FALSE;
diff --git a/web/core/lib/Drupal/Component/Graph/Graph.php b/web/core/lib/Drupal/Component/Graph/Graph.php
index 5d8d5caf8..b155faa66 100644
--- a/web/core/lib/Drupal/Component/Graph/Graph.php
+++ b/web/core/lib/Drupal/Component/Graph/Graph.php
@@ -56,13 +56,13 @@ class Graph {
    *     identifier.
    */
   public function searchAndSort() {
-    $state = array(
+    $state = [
       // The order of last visit of the depth first search. This is the reverse
       // of the topological order if the graph is acyclic.
-      'last_visit_order' => array(),
+      'last_visit_order' => [],
       // The components of the graph.
-      'components' => array(),
-    );
+      'components' => [],
+    ];
     // Perform the actual search.
     foreach ($this->graph as $start => $data) {
       $this->depthFirstSearch($state, $start);
@@ -71,7 +71,7 @@ class Graph {
     // We do such a numbering that every component starts with 0. This is useful
     // for module installs as we can install every 0 weighted module in one
     // request, and then every 1 weighted etc.
-    $component_weights = array();
+    $component_weights = [];
 
     foreach ($state['last_visit_order'] as $vertex) {
       $component = $this->graph[$vertex]['component'];
@@ -108,7 +108,7 @@ class Graph {
       return;
     }
     // Mark $start as visited.
-    $this->graph[$start]['paths'] = array();
+    $this->graph[$start]['paths'] = [];
 
     // Assign $start to the current component.
     $this->graph[$start]['component'] = $component;
diff --git a/web/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php b/web/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php
index 5dc159ff5..1fb2f217f 100644
--- a/web/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php
+++ b/web/core/lib/Drupal/Component/PhpStorage/FileReadOnlyStorage.php
@@ -68,7 +68,7 @@ class FileReadOnlyStorage implements PhpStorageInterface {
   /**
    * {@inheritdoc}
    */
-  function writeable() {
+  public function writeable() {
     return FALSE;
   }
 
@@ -83,7 +83,7 @@ class FileReadOnlyStorage implements PhpStorageInterface {
    * {@inheritdoc}
    */
   public function listAll() {
-    $names = array();
+    $names = [];
     if (file_exists($this->directory)) {
       foreach (new \DirectoryIterator($this->directory) as $fileinfo) {
         if (!$fileinfo->isDot()) {
diff --git a/web/core/lib/Drupal/Component/PhpStorage/FileStorage.php b/web/core/lib/Drupal/Component/PhpStorage/FileStorage.php
index 1e6a2b30e..e82ec2d6d 100644
--- a/web/core/lib/Drupal/Component/PhpStorage/FileStorage.php
+++ b/web/core/lib/Drupal/Component/PhpStorage/FileStorage.php
@@ -49,12 +49,7 @@ class FileStorage implements PhpStorageInterface {
   public function save($name, $code) {
     $path = $this->getFullPath($name);
     $directory = dirname($path);
-    if ($this->ensureDirectory($directory)) {
-      $htaccess_path = $directory . '/.htaccess';
-      if (!file_exists($htaccess_path) && file_put_contents($htaccess_path, static::htaccessLines())) {
-        @chmod($htaccess_path, 0444);
-      }
-    }
+    $this->ensureDirectory($directory);
     return (bool) file_put_contents($path, $code);
   }
 
@@ -120,9 +115,6 @@ EOF;
    *   The directory path.
    * @param int $mode
    *   The mode, permissions, the directory should have.
-   *
-   * @return bool
-   *   TRUE if the directory exists or has been created, FALSE otherwise.
    */
   protected function ensureDirectory($directory, $mode = 0777) {
     if ($this->createDirectory($directory, $mode)) {
@@ -246,7 +238,7 @@ EOF;
    * {@inheritdoc}
    */
   public function listAll() {
-    $names = array();
+    $names = [];
     if (file_exists($this->directory)) {
       foreach (new \DirectoryIterator($this->directory) as $fileinfo) {
         if (!$fileinfo->isDot()) {
diff --git a/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php b/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
index 3c5d55dfa..c7e6febe9 100644
--- a/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
+++ b/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Component\PhpStorage;
 
+use Drupal\Component\Utility\Crypt;
+
 /**
  * Stores PHP code in files with securely hashed names.
  *
@@ -130,7 +132,7 @@ class MTimeProtectedFastFileStorage extends FileStorage {
     if (!isset($directory_mtime)) {
       $directory_mtime = file_exists($directory) ? filemtime($directory) : 0;
     }
-    return $directory . '/' . hash_hmac('sha256', $name, $this->secret . $directory_mtime) . '.php';
+    return $directory . '/' . Crypt::hmacBase64($name, $this->secret . $directory_mtime) . '.php';
   }
 
   /**
@@ -225,7 +227,7 @@ class MTimeProtectedFastFileStorage extends FileStorage {
    */
   protected function tempnam($directory, $prefix) {
     do {
-      $path = $directory . '/' . $prefix . substr(str_shuffle(hash('sha256', microtime())), 0, 10);
+      $path = $directory . '/' . $prefix . Crypt::randomBytesBase64(20);
     } while (file_exists($path));
     return $path;
   }
diff --git a/web/core/lib/Drupal/Component/Plugin/Context/Context.php b/web/core/lib/Drupal/Component/Plugin/Context/Context.php
index 3713d4809..8a225d4a4 100644
--- a/web/core/lib/Drupal/Component/Plugin/Context/Context.php
+++ b/web/core/lib/Drupal/Component/Plugin/Context/Context.php
@@ -79,7 +79,7 @@ class Context implements ContextInterface {
     if (empty($this->contextDefinition['class'])) {
       throw new ContextException("An error was encountered while trying to validate the context.");
     }
-    return array(new Type($this->contextDefinition['class']));
+    return [new Type($this->contextDefinition['class'])];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php b/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
index 96318ac79..b9f6e0221 100644
--- a/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
+++ b/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
@@ -67,7 +67,7 @@ abstract class ContextAwarePluginBase extends PluginBase implements ContextAware
    */
   public function getContextDefinitions() {
     $definition = $this->getPluginDefinition();
-    return !empty($definition['context']) ? $definition['context'] : array();
+    return !empty($definition['context']) ? $definition['context'] : [];
   }
 
   /**
@@ -114,7 +114,7 @@ abstract class ContextAwarePluginBase extends PluginBase implements ContextAware
    * {@inheritdoc}
    */
   public function getContextValues() {
-    $values = array();
+    $values = [];
     foreach ($this->getContextDefinitions() as $name => $definition) {
       $values[$name] = isset($this->context[$name]) ? $this->context[$name]->getContextValue() : NULL;
     }
diff --git a/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php b/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php
index 667c6203c..37d9078a0 100644
--- a/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php
+++ b/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php
@@ -28,7 +28,7 @@ interface ContextAwarePluginInterface extends PluginInspectionInterface {
    * @param string $name
    *   The name of the context in the plugin definition.
    *
-   * @return \Drupal\Component\Plugin\Context\ContextDefinitionInterface.
+   * @return \Drupal\Component\Plugin\Context\ContextDefinitionInterface
    *   The definition against which the context value must validate.
    *
    * @throws \Drupal\Component\Plugin\Exception\PluginException
@@ -103,7 +103,7 @@ interface ContextAwarePluginInterface extends PluginInspectionInterface {
    *   The value to set the context to. The value has to validate against the
    *   provided context definition.
    *
-   * @return \Drupal\Component\Plugin\ContextAwarePluginInterface.
+   * @return \Drupal\Component\Plugin\ContextAwarePluginInterface
    *   A context aware plugin object for chaining.
    *
    * @throws \Drupal\Component\Plugin\Exception\PluginException
diff --git a/web/core/lib/Drupal/Component/Plugin/Definition/DerivablePluginDefinitionInterface.php b/web/core/lib/Drupal/Component/Plugin/Definition/DerivablePluginDefinitionInterface.php
new file mode 100644
index 000000000..6aaa3adb3
--- /dev/null
+++ b/web/core/lib/Drupal/Component/Plugin/Definition/DerivablePluginDefinitionInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\Component\Plugin\Definition;
+
+/**
+ * Provides an interface for a derivable plugin definition.
+ *
+ * @see \Drupal\Component\Plugin\Derivative\DeriverInterface
+ */
+interface DerivablePluginDefinitionInterface extends PluginDefinitionInterface {
+
+  /**
+   * Gets the name of the deriver of this plugin definition, if it exists.
+   *
+   * @return string|null
+   *   Either the deriver class name, or NULL if the plugin is not derived.
+   */
+  public function getDeriver();
+
+  /**
+   * Sets the deriver of this plugin definition.
+   *
+   * @param string|null $deriver
+   *   Either the name of a class that implements
+   *   \Drupal\Component\Plugin\Derivative\DeriverInterface, or NULL.
+   *
+   * @return $this
+   */
+  public function setDeriver($deriver);
+
+}
diff --git a/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinition.php b/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinition.php
new file mode 100644
index 000000000..ed1ac91c2
--- /dev/null
+++ b/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinition.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Drupal\Component\Plugin\Definition;
+
+/**
+ * Provides object-based plugin definitions.
+ */
+class PluginDefinition implements PluginDefinitionInterface {
+
+  /**
+   * The plugin ID.
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * A fully qualified class name.
+   *
+   * @var string
+   */
+  protected $class;
+
+  /**
+   * The plugin provider.
+   *
+   * @var string
+   */
+  protected $provider;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function id() {
+    return $this->id;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setClass($class) {
+    $this->class = $class;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getClass() {
+    return $this->class;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getProvider() {
+    return $this->provider;
+  }
+
+}
diff --git a/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php b/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php
index ed2cc8ffd..4599a0b6b 100644
--- a/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php
+++ b/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php
@@ -11,6 +11,14 @@ namespace Drupal\Component\Plugin\Definition;
  */
 interface PluginDefinitionInterface {
 
+  /**
+   * Gets the unique identifier of the plugin.
+   *
+   * @return string
+   *   The unique identifier of the plugin.
+   */
+  public function id();
+
   /**
    * Sets the class.
    *
@@ -32,4 +40,15 @@ interface PluginDefinitionInterface {
    */
   public function getClass();
 
+  /**
+   * Gets the plugin provider.
+   *
+   * The provider is the name of the module that provides the plugin, or "core',
+   * or "component".
+   *
+   * @return string
+   *   The provider.
+   */
+  public function getProvider();
+
 }
diff --git a/web/core/lib/Drupal/Component/Plugin/Derivative/DeriverBase.php b/web/core/lib/Drupal/Component/Plugin/Derivative/DeriverBase.php
index 0c97c6df0..f49ab9920 100644
--- a/web/core/lib/Drupal/Component/Plugin/Derivative/DeriverBase.php
+++ b/web/core/lib/Drupal/Component/Plugin/Derivative/DeriverBase.php
@@ -12,7 +12,7 @@ abstract class DeriverBase implements DeriverInterface {
    *
    * @var array
    */
-  protected $derivatives = array();
+  protected $derivatives = [];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php b/web/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php
index 2028f405e..6b47af017 100644
--- a/web/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php
+++ b/web/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Component\Plugin\Discovery;
 
+use Drupal\Component\Plugin\Definition\DerivablePluginDefinitionInterface;
 use Drupal\Component\Plugin\Exception\InvalidDeriverException;
 
 /**
@@ -20,7 +21,7 @@ class DerivativeDiscoveryDecorator implements DiscoveryInterface {
    * @var \Drupal\Component\Plugin\Derivative\DeriverInterface[]
    *   Keys are base plugin IDs.
    */
-  protected $derivers = array();
+  protected $derivers = [];
 
   /**
    * The decorated plugin discovery.
@@ -93,7 +94,7 @@ class DerivativeDiscoveryDecorator implements DiscoveryInterface {
    * DiscoveryInterface::getDefinitions().
    */
   protected function getDerivatives(array $base_plugin_definitions) {
-    $plugin_definitions = array();
+    $plugin_definitions = [];
     foreach ($base_plugin_definitions as $base_plugin_id => $plugin_definition) {
       $deriver = $this->getDeriver($base_plugin_id, $plugin_definition);
       if ($deriver) {
@@ -136,7 +137,7 @@ class DerivativeDiscoveryDecorator implements DiscoveryInterface {
       return explode(':', $plugin_id, 2);
     }
 
-    return array($plugin_id, NULL);
+    return [$plugin_id, NULL];
   }
 
   /**
@@ -203,12 +204,21 @@ class DerivativeDiscoveryDecorator implements DiscoveryInterface {
    */
   protected function getDeriverClass($base_definition) {
     $class = NULL;
-    if ((is_array($base_definition) || ($base_definition = (array) $base_definition)) && (isset($base_definition['deriver']) && $class = $base_definition['deriver'])) {
+    $id = NULL;
+    if ($base_definition instanceof DerivablePluginDefinitionInterface) {
+      $class = $base_definition->getDeriver();
+      $id = $base_definition->id();
+    }
+    if ((is_array($base_definition) || ($base_definition = (array) $base_definition)) && (isset($base_definition['deriver']))) {
+      $class = $base_definition['deriver'];
+      $id = $base_definition['id'];
+    }
+    if ($class) {
       if (!class_exists($class)) {
-        throw new InvalidDeriverException(sprintf('Plugin (%s) deriver "%s" does not exist.', $base_definition['id'], $class));
+        throw new InvalidDeriverException(sprintf('Plugin (%s) deriver "%s" does not exist.', $id, $class));
       }
       if (!is_subclass_of($class, '\Drupal\Component\Plugin\Derivative\DeriverInterface')) {
-        throw new InvalidDeriverException(sprintf('Plugin (%s) deriver "%s" must implement \Drupal\Component\Plugin\Derivative\DeriverInterface.', $base_definition['id'], $class));
+        throw new InvalidDeriverException(sprintf('Plugin (%s) deriver "%s" must implement \Drupal\Component\Plugin\Derivative\DeriverInterface.', $id, $class));
       }
     }
     return $class;
@@ -229,7 +239,7 @@ class DerivativeDiscoveryDecorator implements DiscoveryInterface {
     // Use this definition as defaults if a plugin already defined itself as
     // this derivative, but filter out empty values first.
     $filtered_base = array_filter($base_plugin_definition);
-    $derivative_definition = $filtered_base + ($derivative_definition ?: array());
+    $derivative_definition = $filtered_base + ($derivative_definition ?: []);
     // Add back any empty keys that the derivative didn't have.
     return $derivative_definition + $base_plugin_definition;
   }
@@ -238,7 +248,7 @@ class DerivativeDiscoveryDecorator implements DiscoveryInterface {
    * Passes through all unknown calls onto the decorated object.
    */
   public function __call($method, $args) {
-    return call_user_func_array(array($this->decorated, $method), $args);
+    return call_user_func_array([$this->decorated, $method], $args);
   }
 
 }
diff --git a/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php b/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php
index f7ee6718a..281860254 100644
--- a/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php
+++ b/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscovery.php
@@ -15,7 +15,7 @@ class StaticDiscovery implements DiscoveryInterface {
    */
   public function getDefinitions() {
     if (!$this->definitions) {
-      $this->definitions = array();
+      $this->definitions = [];
     }
     return $this->definitions;
   }
diff --git a/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php b/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
index 889d146b9..968dcb9e3 100644
--- a/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
+++ b/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
@@ -61,7 +61,7 @@ class StaticDiscoveryDecorator extends StaticDiscovery {
    * Passes through all unknown calls onto the decorated object
    */
   public function __call($method, $args) {
-    return call_user_func_array(array($this->decorated, $method), $args);
+    return call_user_func_array([$this->decorated, $method], $args);
   }
 
 }
diff --git a/web/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php b/web/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php
index 2cca811f8..1f203fb20 100644
--- a/web/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php
+++ b/web/core/lib/Drupal/Component/Plugin/Factory/DefaultFactory.php
@@ -49,7 +49,7 @@ class DefaultFactory implements FactoryInterface {
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     $plugin_definition = $this->discovery->getDefinition($plugin_id);
     $plugin_class = static::getPluginClass($plugin_id, $plugin_definition, $this->interface);
     return new $plugin_class($configuration, $plugin_id, $plugin_definition);
diff --git a/web/core/lib/Drupal/Component/Plugin/Factory/FactoryInterface.php b/web/core/lib/Drupal/Component/Plugin/Factory/FactoryInterface.php
index f1d07ff7d..8cf046b9c 100644
--- a/web/core/lib/Drupal/Component/Plugin/Factory/FactoryInterface.php
+++ b/web/core/lib/Drupal/Component/Plugin/Factory/FactoryInterface.php
@@ -21,6 +21,6 @@ interface FactoryInterface {
    * @throws \Drupal\Component\Plugin\Exception\PluginException
    *   If the instance cannot be created, such as if the ID is invalid.
    */
-  public function createInstance($plugin_id, array $configuration = array());
+  public function createInstance($plugin_id, array $configuration = []);
 
 }
diff --git a/web/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php b/web/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php
index 9954422d2..8a42ce3d2 100644
--- a/web/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php
+++ b/web/core/lib/Drupal/Component/Plugin/Factory/ReflectionFactory.php
@@ -13,7 +13,7 @@ class ReflectionFactory extends DefaultFactory {
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     $plugin_definition = $this->discovery->getDefinition($plugin_id);
     $plugin_class = static::getPluginClass($plugin_id, $plugin_definition, $this->interface);
 
@@ -51,7 +51,7 @@ class ReflectionFactory extends DefaultFactory {
    */
   protected function getInstanceArguments(\ReflectionClass $reflector, $plugin_id, $plugin_definition, array $configuration) {
 
-    $arguments = array();
+    $arguments = [];
     foreach ($reflector->getMethod('__construct')->getParameters() as $param) {
       $param_name = $param->getName();
 
diff --git a/web/core/lib/Drupal/Component/Plugin/FallbackPluginManagerInterface.php b/web/core/lib/Drupal/Component/Plugin/FallbackPluginManagerInterface.php
index 7af6c8aff..0a85e67e1 100644
--- a/web/core/lib/Drupal/Component/Plugin/FallbackPluginManagerInterface.php
+++ b/web/core/lib/Drupal/Component/Plugin/FallbackPluginManagerInterface.php
@@ -18,6 +18,6 @@ interface FallbackPluginManagerInterface {
    * @return string
    *   The id of an existing plugin to use when the plugin does not exist.
    */
-  public function getFallbackPluginId($plugin_id, array $configuration = array());
+  public function getFallbackPluginId($plugin_id, array $configuration = []);
 
 }
diff --git a/web/core/lib/Drupal/Component/Plugin/LazyPluginCollection.php b/web/core/lib/Drupal/Component/Plugin/LazyPluginCollection.php
index 1d90af79d..b55b04e95 100644
--- a/web/core/lib/Drupal/Component/Plugin/LazyPluginCollection.php
+++ b/web/core/lib/Drupal/Component/Plugin/LazyPluginCollection.php
@@ -14,14 +14,14 @@ abstract class LazyPluginCollection implements \IteratorAggregate, \Countable {
    *
    * @var array
    */
-  protected $pluginInstances = array();
+  protected $pluginInstances = [];
 
   /**
    * Stores the IDs of all potential plugin instances.
    *
    * @var array
    */
-  protected $instanceIDs = array();
+  protected $instanceIDs = [];
 
   /**
    * Initializes and stores a plugin.
@@ -53,7 +53,7 @@ abstract class LazyPluginCollection implements \IteratorAggregate, \Countable {
    * Clears all instantiated plugins.
    */
   public function clear() {
-    $this->pluginInstances = array();
+    $this->pluginInstances = [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Component/Plugin/PluginManagerBase.php b/web/core/lib/Drupal/Component/Plugin/PluginManagerBase.php
index 5fb32a2a6..34416ff43 100644
--- a/web/core/lib/Drupal/Component/Plugin/PluginManagerBase.php
+++ b/web/core/lib/Drupal/Component/Plugin/PluginManagerBase.php
@@ -68,7 +68,7 @@ abstract class PluginManagerBase implements PluginManagerInterface {
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     // If this PluginManager has fallback capabilities catch
     // PluginNotFoundExceptions.
     if ($this instanceof FallbackPluginManagerInterface) {
diff --git a/web/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php b/web/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
index c20168df0..3cd8d6856 100644
--- a/web/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
+++ b/web/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
@@ -44,7 +44,7 @@ class PhpTransliteration implements TransliterationInterface {
    *
    * @var array
    */
-  protected $languageOverrides = array();
+  protected $languageOverrides = [];
 
   /**
    * Non-language-specific transliteration tables.
@@ -56,7 +56,7 @@ class PhpTransliteration implements TransliterationInterface {
    *
    * @var array
    */
-  protected $genericMap = array();
+  protected $genericMap = [];
 
   /**
    * Constructs a transliteration object.
@@ -83,9 +83,9 @@ class PhpTransliteration implements TransliterationInterface {
       // few characters that aren't accented letters mixed in. So define the
       // ranges and the excluded characters.
       $range1 = $code > 0x00bf && $code < 0x017f;
-      $exclusions_range1 = array(0x00d0, 0x00d7, 0x00f0, 0x00f7, 0x0138, 0x014a, 0x014b);
+      $exclusions_range1 = [0x00d0, 0x00d7, 0x00f0, 0x00f7, 0x0138, 0x014a, 0x014b];
       $range2 = $code > 0x01cc && $code < 0x0250;
-      $exclusions_range2 = array(0x01DD, 0x01f7, 0x021c, 0x021d, 0x0220, 0x0221, 0x0241, 0x0242, 0x0245);
+      $exclusions_range2 = [0x01DD, 0x01f7, 0x021c, 0x021d, 0x0220, 0x0221, 0x0241, 0x0242, 0x0245];
 
       $replacement = $character;
       if (($range1 && !in_array($code, $exclusions_range1)) || ($range2 && !in_array($code, $exclusions_range2))) {
@@ -246,7 +246,7 @@ class PhpTransliteration implements TransliterationInterface {
       include $file;
     }
     if (!isset($overrides) || !is_array($overrides)) {
-      $overrides = array($langcode => array());
+      $overrides = [$langcode => []];
     }
     $this->languageOverrides[$langcode] = $overrides[$langcode];
   }
@@ -274,7 +274,7 @@ class PhpTransliteration implements TransliterationInterface {
       include $file;
     }
     if (!isset($base) || !is_array($base)) {
-      $base = array();
+      $base = [];
     }
 
     // Save this data.
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/de.php b/web/core/lib/Drupal/Component/Transliteration/data/de.php
index a0b7e78a2..49a08c519 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/de.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/de.php
@@ -5,11 +5,11 @@
  * German transliteration data for the PhpTransliteration class.
  */
 
-$overrides['de'] = array(
+$overrides['de'] = [
   0xC4 => 'Ae',
   0xD6 => 'Oe',
   0xDC => 'Ue',
   0xE4 => 'ae',
   0xF6 => 'oe',
   0xFC => 'ue',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/dk.php b/web/core/lib/Drupal/Component/Transliteration/data/dk.php
index 4a3056a57..e46b013fd 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/dk.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/dk.php
@@ -5,9 +5,9 @@
  * Danish transliteration data for the PhpTransliteration class.
  */
 
-$overrides['dk'] = array(
+$overrides['dk'] = [
   0xC5 => 'Aa',
   0xD8 => 'Oe',
   0xE5 => 'aa',
   0xF8 => 'oe',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/eo.php b/web/core/lib/Drupal/Component/Transliteration/data/eo.php
index 565af1902..e115866b5 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/eo.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/eo.php
@@ -5,7 +5,7 @@
  * Esperanto transliteration data for the PhpTransliteration class.
  */
 
-$overrides['eo'] = array(
+$overrides['eo'] = [
   0x18 => 'Cx',
   0x19 => 'cx',
   0x11C => 'Gx',
@@ -18,4 +18,4 @@ $overrides['eo'] = array(
   0x15D => 'sx',
   0x16C => 'Ux',
   0x16D => 'ux',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/kg.php b/web/core/lib/Drupal/Component/Transliteration/data/kg.php
index 1f8ad0596..549f075ce 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/kg.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/kg.php
@@ -5,7 +5,7 @@
  * Kyrgyz transliteration data for the PhpTransliteration class.
  */
 
-$overrides['kg'] = array(
+$overrides['kg'] = [
   0x41 => 'E',
   0x416 => 'C',
   0x419 => 'J',
@@ -28,4 +28,4 @@ $overrides['kg'] = array(
   0x4AF => 'w',
   0x4E8 => 'Q',
   0x4E9 => 'q',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x00.php b/web/core/lib/Drupal/Component/Transliteration/data/x00.php
index 868568036..fd7c3f76e 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x00.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x00.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   // Note: to save memory plain ASCII mappings have been left out.
   0x80 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
   0x90 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
@@ -15,4 +15,4 @@ $base = array(
   0xD0 => 'D', 'N', 'O', 'O', 'O', 'O', 'O', '*', 'O', 'U', 'U', 'U', 'U', 'Y', 'TH', 'ss',
   0xE0 => 'a', 'a', 'a', 'a', 'a', 'a', 'ae', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i',
   0xF0 => 'd', 'n', 'o', 'o', 'o', 'o', 'o', '/', 'o', 'u', 'u', 'u', 'u', 'y', 'th', 'y',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x01.php b/web/core/lib/Drupal/Component/Transliteration/data/x01.php
index 535692ac1..a30aaa0e0 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x01.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x01.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'A', 'a', 'A', 'a', 'A', 'a', 'C', 'c', 'C', 'c', 'C', 'c', 'C', 'c', 'D', 'd',
   0x10 => 'D', 'd', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'G', 'g', 'G', 'g',
   0x20 => 'G', 'g', 'G', 'g', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i', 'I', 'i', 'I', 'i',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'i', 'O', 'o', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', '@', 'A', 'a',
   0xE0 => 'A', 'a', 'AE', 'ae', 'G', 'g', 'G', 'g', 'K', 'k', 'O', 'o', 'O', 'o', 'ZH', 'zh',
   0xF0 => 'j', 'DZ', 'Dz', 'dz', 'G', 'g', 'HV', 'W', 'N', 'n', 'A', 'a', 'AE', 'ae', 'O', 'o',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x02.php b/web/core/lib/Drupal/Component/Transliteration/data/x02.php
index b57d54b7b..ba9420700 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x02.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x02.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'A', 'a', 'A', 'a', 'E', 'e', 'E', 'e', 'I', 'i', 'I', 'i', 'O', 'o', 'O', 'o',
   0x10 => 'R', 'r', 'R', 'r', 'U', 'u', 'U', 'u', 'S', 's', 'T', 't', 'Y', 'y', 'H', 'h',
   0x20 => 'N', 'd', 'OU', 'ou', 'Z', 'z', 'A', 'a', 'E', 'e', 'O', 'o', 'O', 'o', 'O', 'o',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => ':', '.', '`', '\'', '^', 'V', '+', '-', 'V', '.', '@', ',', '~', '"', 'R', 'X',
   0xE0 => 'G', 'l', 's', 'x', '?', '', '', '', '', '', '', '', 'V', '=', '"', NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x03.php b/web/core/lib/Drupal/Component/Transliteration/data/x03.php
index 098428123..f61602d2e 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x03.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x03.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
   0x10 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
   0x20 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'b', 'th', 'Y', 'Y', 'Y', 'ph', 'p', '&', NULL, NULL, 'St', 'st', 'W', 'w', 'Q', 'q',
   0xE0 => 'Sp', 'sp', 'Sh', 'sh', 'F', 'f', 'Kh', 'kh', 'H', 'h', 'G', 'g', 'CH', 'ch', 'Ti', 'ti',
   0xF0 => 'k', 'r', 's', 'j', 'TH', 'e', NULL, 'S', 's', 'S', 'S', 's', NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x04.php b/web/core/lib/Drupal/Component/Transliteration/data/x04.php
index a8fee7da7..1be0d4332 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x04.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x04.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'E', 'E', 'D', 'G', 'E', 'Z', 'I', 'I', 'J', 'L', 'N', 'C', 'K', 'I', 'U', 'D',
   0x10 => 'A', 'B', 'V', 'G', 'D', 'E', 'Z', 'Z', 'I', 'I', 'K', 'L', 'M', 'N', 'O', 'P',
   0x20 => 'R', 'S', 'T', 'U', 'F', 'H', 'C', 'C', 'S', 'S', '', 'Y', '', 'E', 'U', 'A',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'A', 'a', 'A', 'a', 'AE', 'ae', 'E', 'e', '@', '@', '@', '@', 'Z', 'z', 'Z', 'z',
   0xE0 => 'Dz', 'dz', 'I', 'i', 'I', 'i', 'O', 'o', 'O', 'o', 'O', 'o', 'E', 'e', 'U', 'u',
   0xF0 => 'U', 'u', 'U', 'u', 'C', 'c', NULL, NULL, 'Y', 'y', NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x05.php b/web/core/lib/Drupal/Component/Transliteration/data/x05.php
index 29b523226..f39fa5b46 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x05.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x05.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x10 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x20 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => '', 'b', 'g', 'd', 'h', 'w', 'z', 'h', 't', 'y', 'k', 'k', 'l', 'm', 'm', 'n',
   0xE0 => 'n', 's', '`', 'p', 'p', 'z', 'z', 'q', 'r', 's', 't', NULL, NULL, NULL, NULL, NULL,
   0xF0 => 'ww', 'wy', 'yy', '\'', '"', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x06.php b/web/core/lib/Drupal/Component/Transliteration/data/x06.php
index 68ea125b7..6999d90c7 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x06.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x06.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ',', NULL, NULL, NULL,
   0x10 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ';', NULL, NULL, NULL, '?',
   0x20 => NULL, '', 'a', 'a', 'w', 'a', 'y', 'a', 'b', 't', 't', 'th', 'j', 'h', 'kh', 'd',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => '', '', 'y', 'y\'', '.', 'ae', '', '', '', '', '', '', '', '@', '#', '',
   0xE0 => '', '', '', '', '', '', '', '', '', '^', '', '', '', '', NULL, NULL,
   0xF0 => '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'Sh', 'D', 'Gh', '&', '+m', NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x07.php b/web/core/lib/Drupal/Component/Transliteration/data/x07.php
index c141b66b3..35873139c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x07.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x07.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => '//', '/', ',', '!', '!', '-', ',', ',', ';', '?', '~', '{', '}', '*', NULL, '',
   0x10 => '\'', '', 'b', 'g', 'g', 'd', 'dr', 'h', 'w', 'z', 'h', 't', 't', 'y', 'yh', 'k',
   0x20 => 'l', 'm', 'n', 's', 's', '`', 'p', 'p', 's', 'q', 'r', 'sh', 't', NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x09.php b/web/core/lib/Drupal/Component/Transliteration/data/x09.php
index 88c28451d..6250925d8 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x09.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x09.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, 'N', 'N', 'h', NULL, 'a', 'a', 'i', 'i', 'u', 'u', 'r', 'l', 'e', 'e', 'e',
   0x10 => 'ai', 'o', 'o', 'o', 'au', 'ka', 'kha', 'ga', 'gha', 'na', 'ca', 'cha', 'ja', 'jha', 'na', 'ta',
   0x20 => 'tha', 'da', 'dha', 'na', 'ta', 'tha', 'da', 'dha', 'na', 'na', 'pa', 'pha', 'ba', 'bha', 'ma', 'ya',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, '+', NULL, NULL, NULL, NULL, 'da', 'dha', NULL, 'ya',
   0xE0 => 'r', 'l', 'L', 'LL', NULL, NULL, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
   0xF0 => 'ra', 'ra', 'Rs', 'Rs', '1/', '2/', '3/', '4/', ' 1 - 1/', '/16', '', NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x0a.php b/web/core/lib/Drupal/Component/Transliteration/data/x0a.php
index 5d14d3f4a..0dc613f36 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x0a.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x0a.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, 'N', NULL, NULL, 'a', 'a', 'i', 'i', 'u', 'u', NULL, NULL, NULL, NULL, 'e',
   0x10 => 'ai', NULL, NULL, 'o', 'au', 'ka', 'kha', 'ga', 'gha', 'na', 'ca', 'cha', 'ja', 'jha', 'na', 'ta',
   0x20 => 'tha', 'da', 'dha', 'na', 'ta', 'tha', 'da', 'dha', 'na', NULL, 'pa', 'pha', 'ba', 'bha', 'ma', 'ya',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => '\'om', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => 'r', 'l', NULL, NULL, NULL, NULL, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x0b.php b/web/core/lib/Drupal/Component/Transliteration/data/x0b.php
index e700c6d86..2f95b1bb0 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x0b.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x0b.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, 'N', 'm', 'h', NULL, 'a', 'a', 'i', 'i', 'u', 'u', 'r', 'l', NULL, NULL, 'e',
   0x10 => 'ai', NULL, NULL, 'o', 'au', 'ka', 'kha', 'ga', 'gha', 'na', 'ca', 'cha', 'ja', 'jha', 'na', 'ta',
   0x20 => 'tha', 'da', 'dha', 'na', 'ta', 'tha', 'da', 'dha', 'na', NULL, 'pa', 'pha', 'ba', 'bha', 'ma', 'ya',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, '+', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
   0xF0 => '10', '100', '1000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x0c.php b/web/core/lib/Drupal/Component/Transliteration/data/x0c.php
index 51f7f50b7..1638bfdde 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x0c.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x0c.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, 'm', 'm', 'h', NULL, 'a', 'a', 'i', 'i', 'u', 'u', 'r', 'l', NULL, 'e', 'e',
   0x10 => 'ai', NULL, 'o', 'o', 'au', 'ka', 'kha', 'ga', 'gha', 'na', 'ca', 'cha', 'ja', 'jha', 'na', 'ta',
   0x20 => 'tha', 'da', 'dha', 'na', 'ta', 'tha', 'da', 'dha', 'na', NULL, 'pa', 'pha', 'ba', 'bha', 'ma', 'ya',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, '+', '+', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'la', NULL,
   0xE0 => 'r', 'l', NULL, NULL, NULL, NULL, '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x0d.php b/web/core/lib/Drupal/Component/Transliteration/data/x0d.php
index d92a68ce6..8aa517b74 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x0d.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x0d.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, 'm', 'h', NULL, 'a', 'a', 'i', 'i', 'u', 'u', 'r', 'l', NULL, 'e', 'e',
   0x10 => 'ai', NULL, 'o', 'o', 'au', 'ka', 'kha', 'ga', 'gha', 'na', 'ca', 'cha', 'ja', 'jha', 'na', 'ta',
   0x20 => 'tha', 'da', 'dha', 'na', 'ta', 'tha', 'da', 'dha', 'na', NULL, 'pa', 'pha', 'ba', 'bha', 'ma', 'ya',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ae', 'aae', 'i', 'ii', 'u', NULL, 'uu', NULL, 'R', 'e', 'ee', 'ai', 'o', 'oo', 'au', 'L',
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, 'RR', 'LL', ' . ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x0e.php b/web/core/lib/Drupal/Component/Transliteration/data/x0e.php
index 03fb5a958..13a589d90 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x0e.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x0e.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, 'k', 'kh', 'kh', 'kh', 'kh', 'kh', 'ng', 'c', 'ch', 'ch', 's', 'ch', 'y', 'd', 't',
   0x10 => 'th', 'th', 'th', 'n', 'd', 't', 'th', 'th', 'th', 'n', 'b', 'p', 'ph', 'f', 'ph', 'f',
   0x20 => 'ph', 'm', 'y', 'r', 'v', 'l', 'l', 'w', 's', 's', 's', 'h', 'l', 'x', 'h', '~',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', NULL, NULL, 'hn', 'hm', NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x0f.php b/web/core/lib/Drupal/Component/Transliteration/data/x0f.php
index addfa7501..32262e53a 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x0f.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x0f.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'AUM', '', '', '', '', '', '', '', ' // ', ' * ', '', '-', ' / ', ' / ', ' // ', ' -/ ',
   0x10 => ' +/ ', ' X/ ', ' /XX/ ', ' /X/ ', ',', '', '', '', '', '', '', '', '', '', '', '',
   0x20 => '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.5', '1.5', '2.5', '3.5', '4.5', '5.5',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x10.php b/web/core/lib/Drupal/Component/Transliteration/data/x10.php
index 9aedcce80..cb1b13dce 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x10.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x10.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'k', 'kh', 'g', 'gh', 'ng', 'c', 'ch', 'j', 'jh', 'ny', 'nny', 'tt', 'tth', 'dd', 'ddh', 'nn',
   0x10 => 'tt', 'th', 'd', 'dh', 'n', 'p', 'ph', 'b', 'bh', 'm', 'y', 'r', 'l', 'w', 's', 'h',
   0x20 => 'll', 'a', NULL, 'i', 'ii', 'u', 'uu', 'e', NULL, 'o', 'au', NULL, 'aa', 'i', 'ii', 'u',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'a', 'b', 'g', 'd', 'e', 'v', 'z', 't', 'i', 'k', 'l', 'm', 'n', 'o', 'p', 'zh',
   0xE0 => 'r', 's', 't', 'u', 'p', 'k', 'gh', 'q', 'sh', 'ch', 'ts', 'dz', 'c', 'ch', 'kh', 'j',
   0xF0 => 'h', 'e', 'y', 'ui', 'q', 'oe', 'f', NULL, NULL, NULL, NULL, ' // ', NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x11.php b/web/core/lib/Drupal/Component/Transliteration/data/x11.php
index 66d2fe677..bf1a13e60 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x11.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x11.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'g', 'kk', 'n', 'd', 'tt', 'l', 'm', 'b', 'pp', 's', 'ss', '', 'j', 'jj', 'ch', 'k',
   0x10 => 't', 'p', 'h', 'ng', 'nn', 'nd', 'nb', 'dg', 'rn', 'rr', 'rh', 'rN', 'mb', 'mN', 'bg', 'bn',
   0x20 => '', 'bs', 'bsg', 'bst', 'bsb', 'bss', 'bsj', 'bj', 'bc', 'bt', 'bp', 'bN', 'bbN', 'sg', 'sn', 'sd',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'll', 'lmg', 'lms', 'lbs', 'lbh', 'rNp', 'lss', 'lZ', 'lk', 'lQ', 'mg', 'ml', 'mb', 'ms', 'mss', 'mZ',
   0xE0 => 'mc', 'mh', 'mN', 'bl', 'bp', 'ph', 'pN', 'sg', 'sd', 'sl', 'sb', 'Z', 'g', 'ss', '', 'kh',
   0xF0 => 'N', 'Ns', 'NZ', 'pb', 'pN', 'hn', 'hl', 'hm', 'hb', 'Q', NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x12.php b/web/core/lib/Drupal/Component/Transliteration/data/x12.php
index 1248209ef..43fdd369a 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x12.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x12.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ha', 'hu', 'hi', 'haa', 'hee', 'he', 'ho', NULL, 'la', 'lu', 'li', 'laa', 'lee', 'le', 'lo', 'lwa',
   0x10 => 'hha', 'hhu', 'hhi', 'hhaa', 'hhee', 'hhe', 'hho', 'hhwa', 'ma', 'mu', 'mi', 'maa', 'mee', 'me', 'mo', 'mwa',
   0x20 => 'sza', 'szu', 'szi', 'szaa', 'szee', 'sze', 'szo', 'szwa', 'ra', 'ru', 'ri', 'raa', 'ree', 're', 'ro', 'rwa',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => '`a', '`u', '`i', '`aa', '`ee', '`e', '`o', NULL, 'za', 'zu', 'zi', 'zaa', 'zee', 'ze', 'zo', 'zwa',
   0xE0 => 'zha', 'zhu', 'zhi', 'zhaa', 'zhee', 'zhe', 'zho', 'zhwa', 'ya', 'yu', 'yi', 'yaa', 'yee', 'ye', 'yo', NULL,
   0xF0 => 'da', 'du', 'di', 'daa', 'dee', 'de', 'do', 'dwa', 'dda', 'ddu', 'ddi', 'ddaa', 'ddee', 'dde', 'ddo', 'ddwa',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x13.php b/web/core/lib/Drupal/Component/Transliteration/data/x13.php
index 73976a8e9..a6a593605 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x13.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x13.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ja', 'ju', 'ji', 'jaa', 'jee', 'je', 'jo', 'jwa', 'ga', 'gu', 'gi', 'gaa', 'gee', 'ge', 'go', NULL,
   0x10 => 'gwa', NULL, 'gwi', 'gwaa', 'gwee', 'gwe', NULL, NULL, 'gga', 'ggu', 'ggi', 'ggaa', 'ggee', 'gge', 'ggo', NULL,
   0x20 => 'tha', 'thu', 'thi', 'thaa', 'thee', 'the', 'tho', 'thwa', 'cha', 'chu', 'chi', 'chaa', 'chee', 'che', 'cho', 'chwa',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'so', 'su', 'sv', 'da', 'ta', 'de', 'te', 'di', 'ti', 'do', 'du', 'dv', 'dla', 'tla', 'tle', 'tli',
   0xE0 => 'tlo', 'tlu', 'tlv', 'tsa', 'tse', 'tsi', 'tso', 'tsu', 'tsv', 'wa', 'we', 'wi', 'wo', 'wu', 'wv', 'ya',
   0xF0 => 'ye', 'yi', 'yo', 'yu', 'yv', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x14.php b/web/core/lib/Drupal/Component/Transliteration/data/x14.php
index 8b4995e57..e752a0702 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x14.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x14.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, 'ai', 'aai', 'i', 'ii', 'u', 'uu', 'oo', 'ee', 'i', 'a', 'aa', 'we', 'we', 'wi', 'wi',
   0x10 => 'wii', 'wii', 'wo', 'wo', 'woo', 'woo', 'woo', 'wa', 'wa', 'waa', 'waa', 'waa', 'ai', 'w', '\'', 't',
   0x20 => 'k', 'sh', 's', 'n', 'w', 'n', NULL, 'w', 'c', '?', 'l', 'en', 'in', 'on', 'an', 'pai',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'n', 'ng', 'nh', 'lai', 'laai', 'li', 'lii', 'lu', 'luu', 'loo', 'la', 'laa', 'lwe', 'lwe', 'lwi', 'lwi',
   0xE0 => 'lwii', 'lwii', 'lwo', 'lwo', 'lwoo', 'lwoo', 'lwa', 'lwa', 'lwaa', 'lwaa', 'l', 'l', 'l', 'sai', 'saai', 'si',
   0xF0 => 'sii', 'su', 'suu', 'soo', 'sa', 'saa', 'swe', 'swe', 'swi', 'swi', 'swii', 'swii', 'swo', 'swo', 'swoo', 'swoo',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x15.php b/web/core/lib/Drupal/Component/Transliteration/data/x15.php
index e40fc68b4..426578393 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x15.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x15.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'swa', 'swa', 'swaa', 'swaa', 'swaa', 's', 's', 'sw', 's', 'sk', 'skw', 'sW', 'spwa', 'stwa', 'skwa', 'scwa',
   0x10 => 'she', 'shi', 'shii', 'sho', 'shoo', 'sha', 'shaa', 'shwe', 'shwe', 'shwi', 'shwi', 'shwii', 'shwii', 'shwo', 'shwo', 'shwoo',
   0x20 => 'shwoo', 'shwa', 'shwa', 'shwaa', 'shwaa', 'sh', 'jai', 'yaai', 'ji', 'jii', 'ju', 'juu', 'yoo', 'ja', 'jaa', 'ywe',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'wu', 'wo', 'we', 'wee', 'wi', 'wa', 'hwu', 'hwo', 'hwe', 'hwee', 'hwi', 'hwa', 'thu', 'tho', 'the', 'thee',
   0xE0 => 'thi', 'tha', 'ttu', 'tto', 'tte', 'ttee', 'tti', 'tta', 'pu', 'po', 'pe', 'pee', 'pi', 'pa', 'p', 'gu',
   0xF0 => 'go', 'ge', 'gee', 'gi', 'ga', 'khu', 'kho', 'khe', 'khee', 'khi', 'kha', 'kku', 'kko', 'kke', 'kkee', 'kki',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x16.php b/web/core/lib/Drupal/Component/Transliteration/data/x16.php
index 9d977475d..dbb3d60b3 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x16.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x16.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'kka', 'kk', 'nu', 'no', 'ne', 'nee', 'ni', 'na', 'mu', 'mo', 'me', 'mee', 'mi', 'ma', 'yu', 'yo',
   0x10 => 'ye', 'yee', 'yi', 'ya', 'ju', 'ju', 'jo', 'je', 'jee', 'ji', 'ji', 'ja', 'jju', 'jjo', 'jje', 'jjee',
   0x20 => 'jji', 'jja', 'lu', 'lo', 'le', 'lee', 'li', 'la', 'dlu', 'dlo', 'dle', 'dlee', 'dli', 'dla', 'lhu', 'lho',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 't', 'd', 'b', 'b', 'p', 'p', 'e', 'm', 'm', 'm', 'l', 'l', 'ng', 'ng', 'd', 'o',
   0xE0 => 'ear', 'ior', 'qu', 'qu', 'qu', 's', 'yr', 'yr', 'yr', 'q', 'x', '.', ':', '+', '17', '18',
   0xF0 => '19', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x17.php b/web/core/lib/Drupal/Component/Transliteration/data/x17.php
index f98d03a7d..f08a09d65 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x17.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x17.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x10 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x20 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => '', '', '', '', '.', ' // ', ':', '+', '++', ' * ', ' /// ', 'KR', '\'', NULL, NULL, NULL,
   0xE0 => '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x18.php b/web/core/lib/Drupal/Component/Transliteration/data/x18.php
index 05c85a497..b46d30df8 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x18.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x18.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => ' @ ', ' ... ', ',', '. ', ': ', ' // ', '', '-', ',', '. ', '', '', '', '', '', NULL,
   0x10 => '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', NULL, NULL, NULL, NULL, NULL, NULL,
   0x20 => 'a', 'e', 'i', 'o', 'u', 'O', 'U', 'ee', 'n', 'ng', 'b', 'p', 'q', 'g', 'm', 'l',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x1d.php b/web/core/lib/Drupal/Component/Transliteration/data/x1d.php
index ab6b5d4cf..1d6bacfd6 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x1d.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x1d.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'A', 'AE', NULL, 'B', 'C', 'D', 'D', 'E', NULL, NULL, 'J', 'K', 'L', 'M', NULL, 'O',
   0x10 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'P', NULL, NULL, 'T', 'U', NULL, NULL, NULL,
   0x20 => 'V', 'W', 'Z', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x1e.php b/web/core/lib/Drupal/Component/Transliteration/data/x1e.php
index 71b45bb9c..592deec33 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x1e.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x1e.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'A', 'a', 'B', 'b', 'B', 'b', 'B', 'b', 'C', 'c', 'D', 'd', 'D', 'd', 'D', 'd',
   0x10 => 'D', 'd', 'D', 'd', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'E', 'e', 'F', 'f',
   0x20 => 'G', 'g', 'H', 'h', 'H', 'h', 'H', 'h', 'H', 'h', 'H', 'h', 'I', 'i', 'I', 'i',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o', 'O', 'o',
   0xE0 => 'O', 'o', 'O', 'o', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u', 'U', 'u',
   0xF0 => 'U', 'u', 'Y', 'y', 'Y', 'y', 'Y', 'y', 'Y', 'y', 'LL', 'll', 'V', 'v', 'Y', 'y',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x1f.php b/web/core/lib/Drupal/Component/Transliteration/data/x1f.php
index 9e0a60ebf..33fa4bcf0 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x1f.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x1f.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A',
   0x10 => 'e', 'e', 'e', 'e', 'e', 'e', NULL, NULL, 'E', 'E', 'E', 'E', 'E', 'E', NULL, NULL,
   0x20 => 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'E', 'E', 'E', 'E', 'E', 'E', 'E', 'E',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'i', 'i', 'i', 'i', NULL, NULL, 'i', 'i', 'I', 'I', 'I', 'I', NULL, '`\'', '`\'', '`~',
   0xE0 => 'y', 'y', 'y', 'y', 'r', 'r', 'y', 'y', 'Y', 'Y', 'Y', 'Y', 'R', '"`', '"\'', '`',
   0xF0 => NULL, NULL, 'o', 'o', 'o', NULL, 'o', 'o', 'O', 'O', 'O', 'O', 'O', '\'', '`', NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x20.php b/web/core/lib/Drupal/Component/Transliteration/data/x20.php
index e1069537a..a556d497e 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x20.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x20.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', '', '',
   0x10 => '-', '-', '-', '-', '-', '-', '||', '_', '\'', '\'', ',', '\'', '"', '"', ',,', '"',
   0x20 => '+', '++', '*', '*>', '.', '..', '...', '.', '
@@ -25,4 +25,4 @@ $base = array(
   0xD0 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
   0xE0 => '', '', '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x21.php b/web/core/lib/Drupal/Component/Transliteration/data/x21.php
index 1da0f418f..44645a92b 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x21.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x21.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'a/c', 'a/s', 'C', '', '', 'c/o', 'c/u', '', '', '', 'g', 'H', 'x', 'H', 'h', '',
   0x10 => 'I', 'I', 'L', 'l', 'lb', 'N', 'No', '(p)', 'P', 'P', 'Q', 'R', 'R', 'R', 'Rx', '',
   0x20 => '(sm)', 'TEL', '(tm)', '', 'Z', '', 'O', 'mho', 'Z', '', 'K', 'A', 'B', 'C', 'e', 'e',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => '=', '|', '=', '|', '=', '|', '\\', '/', '\\', '/', '=', '=', '~', '~', '|', '|',
   0xE0 => '-', '|', '-', '|', '-', '-', '-', '|', '-', '|', '|', '|', '|', '|', '|', '|',
   0xF0 => '-', '\\', '\\', '|', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x22.php b/web/core/lib/Drupal/Component/Transliteration/data/x22.php
index e346ffbbe..fa289784e 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x22.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x22.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x10 => NULL, NULL, '-', NULL, NULL, '/', '\\', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x20 => NULL, NULL, NULL, '|', '|', '||', '||', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x23.php b/web/core/lib/Drupal/Component/Transliteration/data/x23.php
index 3cef84f96..e38c438e5 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x23.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x23.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x10 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x20 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '<', '>', NULL, NULL, NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x24.php b/web/core/lib/Drupal/Component/Transliteration/data/x24.php
index 3e7b33bff..17ffeee58 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x24.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x24.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
   0x10 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
   0x20 => '', '', '', '', '', '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
   0xE0 => '', '', '', '', '', '', '', '', '', '', '', NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x25.php b/web/core/lib/Drupal/Component/Transliteration/data/x25.php
index 786bfceaa..b24b056ad 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x25.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x25.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => '-', '-', '|', '|', '-', '-', '|', '|', '-', '-', '|', '|', '+', '+', '+', '+',
   0x10 => '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
   0x20 => '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+', '+',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*',
   0xE0 => '*', '*', '*', '*', '*', '*', '*', '#', '#', '#', '#', '#', '^', '^', '^', 'O',
   0xF0 => '#', '#', '#', '#', '#', '#', '#', '#', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x26.php b/web/core/lib/Drupal/Component/Transliteration/data/x26.php
index c7dc40694..3ef34ee65 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x26.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x26.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
   0x10 => '', '', '', '', NULL, NULL, NULL, NULL, NULL, '', '', '', '', '', '', '',
   0x20 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x27.php b/web/core/lib/Drupal/Component/Transliteration/data/x27.php
index 9c001d283..f067a78b9 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x27.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x27.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
   0x10 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
   0x20 => '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x28.php b/web/core/lib/Drupal/Component/Transliteration/data/x28.php
index 456f8e41c..ce1789d4f 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x28.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x28.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => ' ', 'a', '1', 'b', '\'', 'k', '2', 'l', '@', 'c', 'i', 'f', '/', 'm', 's', 'p',
   0x10 => '"', 'e', '3', 'h', '9', 'o', '6', 'r', '^', 'd', 'j', 'g', '>', 'n', 't', 'q',
   0x20 => ',', '*', '5', '<', '-', 'u', '8', 'v', '.', '%', '[', '$', '+', 'x', '!', '&',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => '[d578]', '[d1578]', '[d2578]', '[d12578]', '[d3578]', '[d13578]', '[d23578]', '[d123578]', '[d4578]', '[d14578]', '[d24578]', '[d124578]', '[d34578]', '[d134578]', '[d234578]', '[d1234578]',
   0xE0 => '[d678]', '[d1678]', '[d2678]', '[d12678]', '[d3678]', '[d13678]', '[d23678]', '[d123678]', '[d4678]', '[d14678]', '[d24678]', '[d124678]', '[d34678]', '[d134678]', '[d234678]', '[d1234678]',
   0xF0 => '[d5678]', '[d15678]', '[d25678]', '[d125678]', '[d35678]', '[d135678]', '[d235678]', '[d1235678]', '[d45678]', '[d145678]', '[d245678]', '[d1245678]', '[d345678]', '[d1345678]', '[d2345678]', '[d12345678]',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x29.php b/web/core/lib/Drupal/Component/Transliteration/data/x29.php
index 98390e61a..cd18ef950 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x29.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x29.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x10 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x20 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x2a.php b/web/core/lib/Drupal/Component/Transliteration/data/x2a.php
index 93349c594..24013a35d 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x2a.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x2a.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x10 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x20 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x2e.php b/web/core/lib/Drupal/Component/Transliteration/data/x2e.php
index f9b3b3333..e62f56a1d 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x2e.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x2e.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x10 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x20 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jin', 'chang', 'chang', 'zhang', 'men', NULL, 'fu', 'yu', 'qing', 'wei', 'ye', 'feng', 'fei', 'shi', NULL, 'shi',
   0xE0 => 'shi', NULL, 'ma', 'gu', 'gui', 'yu', 'niao', 'lu', 'mai', 'huang', 'mian', 'qi', 'qi', 'chi', 'chi', 'long',
   0xF0 => 'long', 'gui', 'gui', 'gui', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x2f.php b/web/core/lib/Drupal/Component/Transliteration/data/x2f.php
index a5e702928..ecf6f0b4c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x2f.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x2f.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yi', 'gun', 'zhu', 'pie', 'yi', 'jue', 'er', 'tou', 'ren', 'er', 'ru', 'ba', 'jiong', 'mi', 'bing', 'ji',
   0x10 => 'qian', 'dao', 'li', 'bao', 'bi', 'fang', 'xi', 'shi', 'bo', 'jie', 'chang', 'si', 'you', 'kou', 'wei', 'tu',
   0x20 => 'shi', 'zhi', 'sui', 'xi', 'da', 'nu', 'zi', 'mian', 'cun', 'xiao', 'you', 'shi', 'che', 'shan', 'chuan', 'gong',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'bi', 'qi', 'chi', 'long', 'gui', 'yue', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x30.php b/web/core/lib/Drupal/Component/Transliteration/data/x30.php
index c92c0a651..3fe856787 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x30.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x30.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => ' ', ',', '.', '"', '[JIS]', '"', '/', 'ling', '<', '>', '<<', '>>', '[', '] ', '{', '} ',
   0x10 => '[(', ')] ', '@', 'X ', '[', ']', '[[', ']] ', '[', ']', '[', ']', '~ ', '"', '"', ',,',
   0x20 => '@', '1', '2', '3', '4', '5', '6', '7', '8', '9', '', '', '', '', '', '',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ha', 'ha', 'hi', 'hi', 'hi', 'fu', 'fu', 'fu', 'he', 'he', 'he', 'ho', 'ho', 'ho', 'ma', 'mi',
   0xE0 => 'mu', 'me', 'mo', '~ya', 'ya', '~yu', 'yu', '~yo', 'yo', 'ra', 'ri', 'ru', 're', 'ro', '~wa', 'wa',
   0xF0 => 'wi', 'we', 'wo', 'n', 'u', '~ka', '~ke', 'wa', 'wi', 'we', 'wo', '', '', '"', '"', NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x31.php b/web/core/lib/Drupal/Component/Transliteration/data/x31.php
index 95b59f4a2..59ceddec6 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x31.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x31.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, NULL, NULL, NULL, 'b', 'p', 'm1', 'f', 'd', 't', 'n1', 'l', 'g', 'k', 'h',
   0x10 => 'j', 'q', 'x', 'zhi1', 'chi1', 'shi1', 'ri1', 'zi1', 'ci1', 'si1', 'a1', 'o1', 'e1', 'eh1', 'ai1', 'ei1',
   0x20 => 'ao1', 'ou1', 'an1', 'en1', 'ang1', 'eng1', 'er1', 'yi1', 'wu1', 'yu1', 'V', 'NG', 'GN', NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x32.php b/web/core/lib/Drupal/Component/Transliteration/data/x32.php
index 25cc5f3e6..20ffe7665 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x32.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x32.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => '(g)', '(n)', '(d)', '(l)', '(m)', '(b)', '(s)', '()', '(j)', '(ch)', '(k)', '(t)', '(p)', '(h)', '(ga)', '(na)',
   0x10 => '(da)', '(la)', '(ma)', '(ba)', '(sa)', '(a)', '(ja)', '(cha)', '(ka)', '(ta)', '(pa)', '(ha)', '(ju)', NULL, NULL, NULL,
   0x20 => '(1) ', '(2) ', '(3) ', '(4) ', '(5) ', '(6) ', '(7) ', '(8) ', '(9) ', '(10) ', '(Yue) ', '(Huo) ', '(Shui) ', '(Mu) ', '(Jin) ', '(Tu) ',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'a', 'i', 'u', 'u', 'o', 'ka', 'ki', 'ku', 'ke', 'ko', 'sa', 'si', 'su', 'se', 'so', 'ta',
   0xE0 => 'ti', 'tu', 'te', 'to', 'na', 'ni', 'nu', 'ne', 'no', 'ha', 'hi', 'hu', 'he', 'ho', 'ma', 'mi',
   0xF0 => 'mu', 'me', 'mo', 'ya', 'yu', 'yo', 'ra', 'ri', 'ru', 're', 'ro', 'wa', 'wi', 'we', 'wo', NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x33.php b/web/core/lib/Drupal/Component/Transliteration/data/x33.php
index 8094290fc..9eae12813 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x33.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x33.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'apartment', 'alpha', 'ampere', 'are', 'inning', 'inch', 'won', 'escudo', 'acre', 'ounce', 'ohm', 'kai-ri', 'carat', 'calorie', 'gallon', 'gamma',
   0x10 => 'giga', 'guinea', 'curie', 'guilder', 'kilo', 'kilogram', 'kilometer', 'kilowatt', 'gram', 'gram ton', 'cruzeiro', 'krone', 'case', 'koruna', 'co-op', 'cycle',
   0x20 => 'centime', 'shilling', 'centi', 'cent', 'dozen', 'desi', 'dollar', 'ton', 'nano', 'knot', 'heights', 'percent', 'parts', 'barrel', 'piaster', 'picul',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'lm', 'ln', 'log', 'lx', 'mb', 'mil', 'mol', 'pH', 'p.m.', 'PPM', 'PR', 'sr', 'Sv', 'Wb', 'V/m', 'A/m',
   0xE0 => '1d', '2d', '3d', '4d', '5d', '6d', '7d', '8d', '9d', '10d', '11d', '12d', '13d', '14d', '15d', '16d',
   0xF0 => '17d', '18d', '19d', '20d', '21d', '22d', '23d', '24d', '25d', '26d', '27d', '28d', '29d', '30d', '31d', NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x34.php b/web/core/lib/Drupal/Component/Transliteration/data/x34.php
index 1281649f1..ef4dcea43 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x34.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x34.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'qiu', 'tian', NULL, NULL, 'kua', 'wu', 'yin', NULL, NULL, NULL, NULL, NULL, 'yi', NULL, NULL, NULL,
   0x10 => NULL, NULL, NULL, NULL, NULL, NULL, 'xie', NULL, NULL, NULL, NULL, NULL, 'chou', NULL, NULL, NULL,
   0x20 => NULL, 'nuo', NULL, NULL, 'dan', NULL, NULL, NULL, 'xu', 'xing', NULL, 'xiong', 'liu', 'lin', 'xiang', 'yong',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'lu', 'xing', NULL, 'nan', 'xie', NULL, 'bi', 'jie', 'su', NULL, 'gong', NULL, 'you', 'xing', 'qia', 'pi',
   0xE0 => 'dian', 'fu', 'luo', 'qia', 'qia', 'tang', 'bai', 'gan', 'ci', 'xuan', 'lang', NULL, NULL, 'she', NULL, 'li',
   0xF0 => 'hua', 'tou', 'pian', 'di', 'ruan', 'e', 'qie', 'yi', 'zhuo', 'rui', 'jian', NULL, 'chi', 'chong', 'xi', NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x35.php b/web/core/lib/Drupal/Component/Transliteration/data/x35.php
index 08b6f5d7d..e3e0b888e 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x35.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x35.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'lue', 'deng', 'lin', 'jue', 'su', 'xiao', 'zan', NULL, NULL, 'zhu', 'zhan', 'jian', 'zou', 'chua', 'xie', 'li',
   0x10 => NULL, 'chi', 'xi', 'jian', NULL, 'ji', NULL, 'fei', 'chu', 'beng', 'jie', NULL, 'ba', 'liang', 'kuai', NULL,
   0x20 => 'xia', 'bie', 'jue', 'lei', 'xin', 'bai', 'yang', 'lu', 'bei', 'e', 'lu', NULL, NULL, 'che', 'nuo', 'xuan',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, 'bai', 'ai', 'zhui', 'qian', 'gou', 'dan', 'bei', 'bo', 'chu', 'li', 'xiao', 'xiu', NULL, NULL, NULL,
   0xE0 => NULL, NULL, 'hong', 'ti', 'cu', 'kuo', 'lao', 'zhi', 'xie', 'xi', NULL, 'qie', 'zha', 'xi', NULL, NULL,
   0xF0 => 'cong', 'ji', 'huo', 'ta', 'yan', 'xu', 'po', 'sai', NULL, NULL, NULL, 'guo', 'ye', 'xiang', 'xue', 'he',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x36.php b/web/core/lib/Drupal/Component/Transliteration/data/x36.php
index f015cbeca..975949b5f 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x36.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x36.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'zuo', 'yi', 'ci', NULL, 'leng', 'xian', 'tai', 'rong', 'yi', 'zhi', 'xi', 'xian', 'ju', 'ji', 'han', NULL,
   0x10 => 'pao', 'li', NULL, 'lan', 'sai', 'han', 'yan', 'qu', NULL, 'yan', 'han', 'kan', 'chi', 'nie', 'huo', NULL,
   0x20 => 'bi', 'xia', 'weng', 'xuan', 'wan', 'you', 'qin', 'xu', 'nie', 'bi', 'hao', 'jing', 'ao', 'ao', NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'sou', 'can', 'dou', 'xi', 'feng', 'yi', 'suo', 'qie', 'po', 'xin', 'tong', 'xin', 'you', 'bei', 'long', NULL,
   0xE0 => NULL, NULL, NULL, 'yun', 'li', 'ta', 'lan', 'man', 'qiang', 'zhou', 'yan', 'xi', 'lu', 'xi', 'sao', 'fan',
   0xF0 => NULL, 'wei', 'fa', 'yi', 'nao', 'cheng', 'tan', 'ji', 'shu', 'pian', 'an', 'kua', 'cha', NULL, 'xian', 'zhi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x37.php b/web/core/lib/Drupal/Component/Transliteration/data/x37.php
index b3a9b7cb8..f584aea75 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x37.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x37.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, 'feng', 'lian', 'xun', 'xu', 'mi', 'hui', 'mu', 'yong', 'zhan', 'yi', 'nou', 'tang', 'xi', 'yun',
   0x10 => 'shu', 'fu', 'yi', 'da', NULL, 'lian', 'cao', 'can', 'ju', 'lu', 'su', 'nen', 'ao', 'an', 'qian', NULL,
   0x20 => 'cui', 'cong', NULL, 'ran', 'nian', 'mai', 'xin', 'yue', 'nai', 'ao', 'shen', 'ma', NULL, NULL, 'lan', 'xi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'mang', 'bo', 'qun', 'qi', 'han', NULL, 'long', NULL, 'tiao', 'ze', 'qi', 'zan', 'mi', 'pei', 'zhan', 'xiang',
   0xE0 => 'gang', NULL, 'qi', NULL, 'lu', NULL, 'yun', 'e', 'duan', 'min', 'wei', 'quan', 'sou', 'min', 'tu', NULL,
   0xF0 => 'ming', 'yao', 'jue', 'li', 'kuai', 'gang', 'yuan', 'da', NULL, 'lao', 'lou', 'qian', 'ao', 'biao', 'yong', 'mang',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x38.php b/web/core/lib/Drupal/Component/Transliteration/data/x38.php
index b807b9c86..c175ad5a1 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x38.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x38.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'dao', NULL, 'ao', NULL, 'xi', 'fu', 'dan', 'jiu', 'run', 'tong', 'qu', 'e', 'qi', 'ji', 'ji', 'hua',
   0x10 => 'jiao', 'zui', 'biao', 'meng', 'bai', 'wei', 'yi', 'ao', 'yu', 'hao', 'dui', 'wo', 'ni', 'cuan', NULL, 'li',
   0x20 => 'lu', 'niao', 'huai', 'li', NULL, 'lu', 'feng', 'mi', 'yu', NULL, 'ju', NULL, NULL, 'zhan', 'peng', 'yi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'bian', 'rong', 'ceng', 'can', 'ding', NULL, NULL, NULL, NULL, 'di', 'tong', 'ta', 'xing', 'song', 'duo', 'xi',
   0xE0 => 'tao', NULL, 'ti', 'shan', 'jian', 'zhi', 'wei', 'yin', NULL, NULL, 'huan', 'zhong', 'qi', 'zong', NULL, 'xie',
   0xF0 => 'xie', 'ze', 'wei', NULL, NULL, 'ta', 'zhan', 'ning', NULL, NULL, NULL, 'yi', 'ren', 'shu', 'cha', 'zhuo',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x39.php b/web/core/lib/Drupal/Component/Transliteration/data/x39.php
index d96877d3a..b550c1c33 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x39.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x39.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, 'mian', 'ji', 'fang', 'pei', 'ai', 'fan', 'ao', 'qin', 'qia', 'xiao', 'fen', 'gan', 'qiao', 'ge', 'tong',
   0x10 => 'chan', 'you', 'gao', 'ben', 'fu', 'chu', 'zhu', NULL, 'zhou', NULL, 'hang', 'nin', 'jue', 'chong', 'cha', 'kong',
   0x20 => 'lie', 'li', 'yu', NULL, 'yu', 'hai', 'li', 'hou', 'gong', 'ke', 'yuan', 'de', 'hui', NULL, 'guang', 'jiong',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'song', 'hui', 'yu', 'gua', 'guai', 'liu', 'e', 'zi', 'zi', 'bi', 'wa', NULL, 'lie', NULL, NULL, 'kuai',
   0xE0 => NULL, 'hai', 'yin', 'zhu', 'chong', 'xian', 'xuan', NULL, 'qiu', 'pei', 'gui', 'er', 'gong', 'qiong', 'hu', 'lao',
   0xF0 => 'li', 'chen', 'san', 'zhuo', 'wo', 'pou', 'keng', 'tun', 'peng', 'te', 'ta', 'zhuo', 'biao', 'gu', 'hu', NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x3a.php b/web/core/lib/Drupal/Component/Transliteration/data/x3a.php
index e1ae1ade5..dd38ed1f5 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x3a.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x3a.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'bing', 'zhi', 'dong', 'dui', 'zhou', 'nei', 'lin', 'po', 'ji', 'min', 'wei', 'che', 'gou', 'bang', 'ru', 'tan',
   0x10 => 'bu', 'zong', 'kui', 'lao', 'han', 'ying', 'zhi', 'jie', 'xing', 'xie', 'xun', 'shan', 'qian', 'xie', 'su', 'hai',
   0x20 => 'mi', 'hun', 'pi', NULL, 'hui', 'na', 'song', 'ben', 'chou', 'jie', 'huang', 'lan', NULL, 'hu', 'dou', 'huo',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'yao', 'zhi', 'gong', 'qi', 'gen', NULL, NULL, 'hou', 'mi', 'fu', 'hu', 'guang', 'tan', 'di', NULL, 'yan',
   0xE0 => NULL, NULL, 'qu', NULL, 'chang', 'ming', 'tao', 'bao', 'an', NULL, NULL, 'xian', NULL, NULL, NULL, 'mao',
   0xF0 => 'lang', 'nan', 'bei', 'chen', NULL, 'fei', 'zhou', 'ji', 'jie', 'shu', NULL, 'kun', 'die', 'lu', NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x3b.php b/web/core/lib/Drupal/Component/Transliteration/data/x3b.php
index 4ce0a1e7b..8fc526cb5 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x3b.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x3b.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, 'yu', 'tai', 'chan', 'man', 'min', 'huan', 'wen', 'nuan', 'huan', 'hou', 'jing', 'bo', 'xian', 'li',
   0x10 => 'jin', NULL, 'mang', 'piao', 'hao', 'yang', NULL, 'xian', 'su', 'wei', 'che', 'xi', 'jin', 'ceng', 'he', 'fen',
   0x20 => 'shai', 'ling', NULL, 'dui', 'qi', 'pu', 'yue', 'bo', NULL, 'hui', 'die', 'yan', 'ju', 'jiao', 'nan', 'lie',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'fang', NULL, NULL, 'ta', 'cui', 'xi', 'de', 'xian', 'kuan', 'zhe', 'ta', 'hu', 'cui', 'lu', 'juan', 'lu',
   0xE0 => 'qian', 'pao', 'zhen', NULL, 'li', 'cao', 'qi', NULL, NULL, 'ti', 'ling', 'qu', 'lian', 'lu', 'shu', 'gong',
   0xF0 => 'zhe', 'pao', 'jin', 'qing', NULL, NULL, 'zong', 'pu', 'jin', 'biao', 'jian', 'gun', NULL, NULL, 'zao', 'lie',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x3c.php b/web/core/lib/Drupal/Component/Transliteration/data/x3c.php
index 31267d9cd..c60d93602 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x3c.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x3c.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'li', 'luo', 'shen', 'mian', 'jian', 'di', 'bei', NULL, 'lian', NULL, 'xian', 'pin', 'que', 'long', 'zui', NULL,
   0x10 => 'jue', 'shan', 'xue', NULL, 'xie', NULL, 'lan', 'qi', 'yi', 'nuo', 'li', 'yue', NULL, 'yi', 'chi', 'ji',
   0x20 => 'hang', 'xie', 'keng', 'zi', 'he', 'xi', 'qu', 'hai', 'xia', 'hai', 'gui', 'chan', 'xun', 'xu', 'shen', 'kou',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'zha', 'yi', 'bian', NULL, 'dui', 'lan', 'yi', 'chai', 'chong', 'xuan', 'xu', 'yu', 'xiu', NULL, NULL, NULL,
   0xE0 => 'ta', 'guo', NULL, NULL, NULL, 'long', 'xie', 'che', 'jian', 'tan', 'pi', 'zan', 'xuan', 'xian', 'niao', NULL,
   0xF0 => NULL, NULL, NULL, NULL, 'mi', 'ji', 'nou', 'hu', 'hua', 'wang', 'you', 'ze', 'bi', 'mi', 'qiang', 'xie',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x3d.php b/web/core/lib/Drupal/Component/Transliteration/data/x3d.php
index f83e669f6..78b313142 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x3d.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x3d.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'fan', 'yi', 'tan', 'lei', 'yong', NULL, 'jin', 'she', 'yin', 'ji', NULL, 'su', NULL, NULL, NULL, 'wang',
   0x10 => 'mian', 'su', 'yi', 'shai', 'xi', 'ji', 'luo', 'you', 'mao', 'zha', 'sui', 'zhi', 'bian', 'li', NULL, NULL,
   0x20 => NULL, NULL, NULL, NULL, NULL, 'qiao', 'guan', 'xi', 'zhen', 'yong', 'nie', 'jun', 'xie', 'yao', 'xie', 'zhi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'hui', NULL, 'yu', 'zong', 'yan', 'qiu', 'zhao', 'jiong', 'tai', NULL, NULL, NULL, NULL, NULL, NULL, 'tui',
   0xE0 => 'lin', 'jiong', 'zha', 'xing', 'hu', NULL, 'xu', NULL, NULL, NULL, 'cui', 'qing', 'mo', NULL, 'zao', 'beng',
   0xF0 => 'chi', NULL, NULL, 'yan', 'ge', 'mo', 'bei', 'juan', 'die', 'zhao', NULL, 'wu', 'yan', NULL, 'jue', 'xian',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x3e.php b/web/core/lib/Drupal/Component/Transliteration/data/x3e.php
index 1c2e517bd..f4b1fd439 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x3e.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x3e.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'tai', 'han', NULL, 'dian', 'ji', 'jie', NULL, 'zuan', NULL, 'xie', 'lai', 'fan', 'huo', 'xi', 'nie', 'mi',
   0x10 => 'ran', 'cuan', 'yin', 'mi', NULL, 'jue', 'qu', 'tong', 'wan', 'zhe', 'li', 'shao', 'kong', 'xian', 'zhe', 'zhi',
   0x20 => 'tiao', 'shu', 'bei', 'ye', 'pian', 'chan', 'hu', 'ken', 'jiu', 'an', 'chun', 'qian', 'bei', 'ba', 'fen', 'ke',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, 'ji', 'jun', 'zou', 'duo', 'jue', 'dai', 'bei', NULL, NULL, NULL, NULL, NULL, 'la', 'bin', 'sui',
   0xE0 => 'tu', 'xue', NULL, NULL, NULL, NULL, NULL, 'duo', NULL, NULL, 'sui', 'bi', 'tu', 'se', 'can', 'tu',
   0xF0 => 'mian', 'jin', 'lu', NULL, NULL, 'zhan', 'bi', 'ji', 'zen', 'xuan', 'li', NULL, NULL, 'sui', 'yong', 'shu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x3f.php b/web/core/lib/Drupal/Component/Transliteration/data/x3f.php
index 7b6015891..1d2272837 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x3f.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x3f.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, 'e', NULL, NULL, NULL, NULL, 'qiong', 'luo', 'zhen', 'tun', 'gu', 'yu', 'lei', 'bo', 'nei',
   0x10 => 'pian', 'lian', 'tang', 'lian', 'wen', 'dang', 'li', 'ting', 'wa', 'zhou', 'gang', 'xing', 'ang', 'fan', 'peng', 'bo',
   0x20 => 'tuo', 'shu', 'yi', 'bo', 'qie', 'tou', 'gong', 'tong', 'han', 'cheng', 'jie', 'huan', 'xing', 'dian', 'chai', 'dong',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, 'yao', 'dao', 'jia', 'lei', 'yan', 'lu', 'tui', 'ying', 'pi', 'luo', 'li', 'bie', NULL, 'mao', 'bai',
   0xE0 => 'huang', NULL, 'yao', 'he', 'chun', 'he', 'ning', 'chou', 'li', 'tang', 'huan', 'bi', 'ba', 'che', 'yang', 'da',
   0xF0 => 'ao', 'xue', NULL, 'zi', 'da', 'ran', 'bang', 'cuo', 'wan', 'ta', 'bao', 'gan', 'yan', 'xi', 'zhu', 'ya',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x40.php b/web/core/lib/Drupal/Component/Transliteration/data/x40.php
index 9e7c307da..ba952e9ba 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x40.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x40.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'fan', 'you', 'an', 'tui', 'meng', 'she', 'jin', 'gu', 'ji', 'qiao', 'jiao', 'yan', 'xi', 'kan', 'mian', 'xuan',
   0x10 => 'shan', 'wo', 'qian', 'huan', 'ren', 'zhen', 'tian', 'jue', 'xie', 'qi', 'ang', 'mei', 'gu', NULL, 'tao', 'fan',
   0x20 => 'ju', 'chan', 'shun', 'bi', 'mao', 'shuo', 'gu', 'hong', 'hua', 'luo', 'hang', 'jia', 'quan', 'gai', 'huang', 'bu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, 'ban', 'he', 'gou', 'hong', 'lao', 'wu', 'bo', 'keng', 'lu', 'cu', 'lian', 'yi', 'qiao', 'shu', NULL,
   0xE0 => 'xuan', 'jin', 'qin', 'hui', 'su', 'chuang', 'dun', 'long', NULL, 'nao', 'tan', 'dan', 'wei', 'gan', 'da', 'li',
   0xF0 => 'ca', 'xian', 'pan', 'la', 'zhu', 'niao', 'huai', 'ying', 'xian', 'lan', 'mo', 'ba', NULL, 'gui', 'bi', 'fu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x41.php b/web/core/lib/Drupal/Component/Transliteration/data/x41.php
index f32b7e52d..bb33c8bdd 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x41.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x41.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'huo', 'yi', 'liu', NULL, 'yin', 'juan', 'huo', 'cheng', 'dou', 'e', NULL, 'yan', 'zhui', 'zha', 'qi', 'yu',
   0x10 => 'quan', 'huo', 'nie', 'huang', 'ju', 'she', NULL, NULL, 'peng', 'ming', 'cao', 'lou', 'li', 'chuang', NULL, 'cui',
   0x20 => 'shan', 'dan', 'qi', NULL, 'lai', 'ling', 'liao', 'reng', 'yu', 'yi', 'diao', 'qi', 'yi', 'nian', 'fu', 'jian',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'li', 'ba', 'jie', 'xu', 'luo', NULL, 'yun', 'zhong', 'hu', 'yin', NULL, 'zhi', 'qian', NULL, 'gan', 'jian',
   0xE0 => 'zhu', 'zhu', 'ku', 'nie', 'rui', 'ze', 'ang', 'zhi', 'gong', 'yi', 'chi', 'ji', 'zhu', 'lao', 'ren', 'rong',
   0xF0 => 'zheng', 'na', 'ce', NULL, NULL, 'yi', 'jue', 'bie', 'cheng', 'jun', 'dou', 'wei', 'yi', 'zhe', 'yan', NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x42.php b/web/core/lib/Drupal/Component/Transliteration/data/x42.php
index 27e73385d..d5043fc89 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x42.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x42.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'san', 'lun', 'ping', 'zhao', 'han', 'yu', 'dai', 'zhao', 'fei', 'sha', 'ling', 'ta', 'qu', 'mang', 'ye', 'bao',
   0x10 => 'gui', 'gua', 'nan', 'ge', NULL, 'shi', 'ke', 'suo', 'ci', 'zhou', 'tai', 'kuai', 'qin', 'xu', 'du', 'ce',
   0x20 => 'huan', 'cong', 'sai', 'zheng', 'qian', 'jin', 'zong', 'wei', NULL, NULL, 'xi', 'na', 'pu', 'sou', 'ju', 'zhen',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'yue', 'lie', NULL, 'zhou', 'bi', 'ren', 'yu', NULL, 'chuo', 'er', 'yi', 'mi', 'qing', NULL, 'wang', 'ji',
   0xE0 => 'bu', NULL, 'bie', 'fan', 'yue', 'li', 'fan', 'qu', 'fu', 'er', 'e', 'zheng', 'tian', 'yu', 'jin', 'qi',
   0xF0 => 'ju', 'lai', 'che', 'bei', 'niu', 'yi', 'xu', 'mou', 'xun', 'fu', NULL, 'nin', 'ting', 'beng', 'zha', 'wei',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x43.php b/web/core/lib/Drupal/Component/Transliteration/data/x43.php
index 8291d9d39..81efa7dc6 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x43.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x43.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ke', 'yao', 'ou', 'xiao', 'geng', 'tang', 'gui', 'hui', 'ta', NULL, 'yao', 'da', 'qi', 'jin', 'lue', 'mi',
   0x10 => 'mi', 'jian', 'lu', 'fan', 'ou', 'mi', 'jie', 'fu', 'bie', 'huang', 'su', 'yao', 'nie', 'jin', 'lian', 'bo',
   0x20 => 'jian', 'ti', 'ling', 'zuan', 'shi', 'yin', 'dao', 'chou', 'ca', 'mie', 'yan', 'lan', 'chong', 'jiao', 'shuang', 'quan',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jue', 'di', 'pian', 'guan', 'niu', 'ren', 'zhen', 'gai', 'pi', 'tan', 'chao', 'chun', 'he', 'zhuan', 'mo', 'bie',
   0xE0 => 'qi', 'shi', 'bi', 'jue', 'si', NULL, 'gua', 'na', 'hui', 'xi', 'er', 'xiu', 'mou', NULL, 'xi', 'zhi',
   0xF0 => 'run', 'ju', 'die', 'zhe', 'shao', 'meng', 'bi', 'han', 'yu', 'xian', 'pang', 'neng', 'can', 'bu', NULL, 'qi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x44.php b/web/core/lib/Drupal/Component/Transliteration/data/x44.php
index af44abbf2..8bbb72676 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x44.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x44.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ji', 'zhuo', 'lu', 'jun', 'xian', 'xi', 'cai', 'wen', 'zhi', 'zi', 'kun', 'cong', 'tian', 'chu', 'di', 'chun',
   0x10 => 'qiu', 'zhe', 'zha', 'rou', 'bin', 'ji', 'xi', 'zhu', 'jue', 'ge', 'ji', 'da', 'chen', 'suo', 'ruo', 'xiang',
   0x20 => 'huang', 'qi', 'zhu', 'sun', 'chai', 'weng', 'ke', 'kao', 'gu', 'gai', 'fan', 'cong', 'cao', 'zhi', 'chan', 'lei',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'chun', 'ping', 'kuai', 'chou', NULL, 'tuo', 'qiong', 'cong', 'gao', 'kua', 'qu', 'qu', 'zhi', 'meng', 'li', 'zhou',
   0xE0 => 'ta', 'zhi', 'gu', 'liang', 'hu', 'la', 'dian', 'ci', 'ying', NULL, NULL, 'qi', NULL, 'cha', 'mao', 'du',
   0xF0 => 'yin', 'chai', 'rui', 'hen', 'ruan', 'fu', 'lai', 'xing', 'jian', 'yi', 'mei', NULL, 'mang', 'ji', 'suo', 'han',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x45.php b/web/core/lib/Drupal/Component/Transliteration/data/x45.php
index 0ba25ac50..88a0b2794 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x45.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x45.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, 'li', 'zi', 'zu', 'yao', 'ge', 'li', 'qi', 'gong', 'li', 'bing', 'suo', NULL, NULL, 'su', 'chou',
   0x10 => 'jian', 'xie', 'bei', 'xu', 'jing', 'pu', 'ling', 'xiang', 'zuo', 'diao', 'chun', 'qing', 'nan', 'zhai', 'lu', 'yi',
   0x20 => 'shao', 'yu', 'hua', 'li', 'pa', NULL, NULL, 'li', NULL, NULL, 'shuang', NULL, 'yi', 'ning', 'si', 'ku',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'shi', 'yi', 'bing', 'cong', 'hou', 'wan', 'di', 'ji', 'ge', 'han', 'bo', 'xiu', 'liu', 'can', 'can', 'yi',
   0xE0 => 'xuan', 'yan', 'zao', 'han', 'yong', 'zong', NULL, 'kang', 'yu', 'qi', 'zhe', 'ma', NULL, NULL, 'shuang', 'jin',
   0xF0 => 'guan', 'pu', 'lin', NULL, 'ting', 'jiang', 'la', 'yi', 'yong', 'ci', 'yan', 'jie', 'xun', 'wei', 'xian', 'ning',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x46.php b/web/core/lib/Drupal/Component/Transliteration/data/x46.php
index 331164125..032f0833c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x46.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x46.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'fu', 'ge', NULL, 'mo', 'zhu', 'nai', 'xian', 'wen', 'li', 'can', 'mie', 'jian', 'ni', 'chai', 'wan', 'xu',
   0x10 => 'nu', 'mai', 'zui', 'kan', 'ka', 'hang', NULL, NULL, 'yu', 'wei', 'zhu', NULL, NULL, 'yi', NULL, 'diao',
   0x20 => 'fu', 'bi', 'zhu', 'zi', 'shu', 'xia', 'ni', NULL, 'jiao', 'xun', 'chong', 'nou', 'rong', 'zhi', 'sang', NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ci', 'mi', 'bian', NULL, 'na', 'yu', 'e', 'zhi', 'ren', 'xu', 'lue', 'hui', 'xun', 'nao', 'han', 'jia',
   0xE0 => 'dou', 'hua', 'tu', 'ping', 'cu', 'xi', 'song', 'mi', 'xin', 'wu', 'qiong', 'zhang', 'tao', 'xing', 'jiu', 'ju',
   0xF0 => 'hun', 'ti', 'man', 'yan', 'ji', 'shou', 'lei', 'wan', 'che', 'can', 'jie', 'you', 'hui', 'zha', 'su', 'ge',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x47.php b/web/core/lib/Drupal/Component/Transliteration/data/x47.php
index 58a79c46d..4981e9fd1 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x47.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x47.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'nao', 'xi', NULL, 'dui', 'chi', 'wei', 'zhe', 'gun', 'chao', 'chi', 'zao', 'hui', 'luan', 'liao', 'lao', 'tuo',
   0x10 => 'hui', 'wu', 'ao', 'she', 'sui', 'mai', 'tan', 'xin', 'jing', 'an', 'ta', 'chan', 'wei', 'tuan', 'ji', 'chen',
   0x20 => 'che', 'yu', 'xian', 'xin', NULL, NULL, NULL, 'nao', NULL, 'yan', 'qiu', 'jiang', 'song', 'jun', 'liao', 'ju',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'li', 'yue', 'quan', 'cheng', 'fu', 'cha', 'tang', 'shi', 'hang', 'qie', 'qi', 'bo', 'na', 'tou', 'chu', 'cu',
   0xE0 => 'yue', 'zhi', 'chen', 'chu', 'bi', 'meng', 'ba', 'tian', 'min', 'lie', 'feng', 'cheng', 'qiu', 'tiao', 'fu', 'kuo',
   0xF0 => 'jian', NULL, NULL, NULL, 'zhen', 'qiu', 'zuo', 'chi', 'kui', 'lie', 'bei', 'du', 'wu', NULL, 'zhuo', 'lu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x48.php b/web/core/lib/Drupal/Component/Transliteration/data/x48.php
index 668713dbd..c5ee78f50 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x48.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x48.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'tang', NULL, 'chu', 'liang', 'tian', 'kun', 'chang', 'jue', 'tu', 'huan', 'fei', 'bi', NULL, 'xia', 'wo', 'ji',
   0x10 => 'qu', 'kui', 'hu', 'qiu', 'sui', 'cai', NULL, 'qiu', 'pi', 'pang', 'wa', 'yao', 'rong', 'xun', 'cu', 'die',
   0x20 => 'chi', 'cuo', 'meng', 'xuan', 'duo', 'bie', 'zhe', 'chu', 'chan', 'gui', 'duan', 'zou', 'deng', 'lai', 'teng', 'yue',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ying', 'chan', NULL, 'li', 'suo', 'ma', 'ma', NULL, 'tang', 'pei', 'lou', 'qi', 'cuo', 'tu', 'e', 'can',
   0xE0 => 'jie', 'yi', 'ji', 'dang', 'jue', 'bi', 'lei', 'yi', 'chun', 'chun', 'po', 'li', 'zai', 'tai', 'po', 'cu',
   0xF0 => 'ju', 'xu', 'fan', NULL, 'xu', 'er', 'huo', 'zhu', 'ran', 'fa', 'juan', 'han', 'liang', 'zhi', 'mi', 'yu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x49.php b/web/core/lib/Drupal/Component/Transliteration/data/x49.php
index d9bde7a81..75c9bafe6 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x49.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x49.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, 'cen', 'mei', 'yin', 'mian', 'tu', 'kui', NULL, NULL, 'mi', 'rong', 'yu', 'qiang', 'mi', 'ju', 'pi',
   0x10 => 'jin', 'wang', 'ji', 'meng', 'jian', 'xue', 'bao', 'gan', 'chan', 'li', 'li', 'qiu', 'dun', 'ying', 'yun', 'chen',
   0x20 => 'zhi', 'ran', NULL, 'lue', 'kai', 'gui', 'yue', 'hui', 'pi', 'cha', 'duo', 'chan', 'sha', 'shi', 'she', 'xing',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, 'di', 'lai', 'zhou', 'nian', 'cheng', 'jian', 'bi', 'zhuan', 'ling', 'hao', 'bang', 'tang', 'chi', 'ma', 'xian',
   0xE0 => 'shuan', 'yong', 'qu', NULL, 'pu', 'hui', 'wei', 'yi', 'ye', NULL, 'che', 'hao', 'bin', NULL, 'xian', 'chan',
   0xF0 => 'hun', NULL, 'han', 'ci', 'zhi', 'qi', 'kui', 'rou', NULL, 'ying', 'xiong', NULL, 'hu', 'cui', NULL, 'que',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x4a.php b/web/core/lib/Drupal/Component/Transliteration/data/x4a.php
index 60e658b75..12d5aee8d 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x4a.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x4a.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'di', 'wu', 'qiu', NULL, 'yan', 'liao', 'bi', NULL, 'bin', NULL, 'yuan', 'nue', 'bao', 'ying', 'hong', 'ci',
   0x10 => 'qia', 'ti', 'yu', 'lei', 'bao', NULL, 'ji', 'fu', 'xian', 'cen', 'hu', 'se', 'beng', 'qing', 'yu', 'wa',
   0x20 => 'ai', 'han', 'dan', 'ge', 'di', 'huo', 'pang', NULL, 'zhui', 'ling', 'mai', 'mai', 'lian', 'xiao', 'xue', 'zhen',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'lin', 'yi', 'men', 'wu', 'qi', 'die', 'chen', 'xia', 'he', 'sang', 'gua', 'hou', 'ao', 'fu', 'qiao', 'hun',
   0xE0 => 'pi', 'yan', 'si', 'xi', 'ming', 'kui', 'ge', NULL, 'ao', 'san', 'shuang', 'lou', 'zhen', 'hui', 'chan', NULL,
   0xF0 => 'lin', 'na', 'han', 'du', 'jin', 'mian', 'fan', 'e', 'chao', 'hong', 'hong', 'yu', 'xue', 'pao', 'bi', 'chao',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x4b.php b/web/core/lib/Drupal/Component/Transliteration/data/x4b.php
index 625a88040..8b542e0ce 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x4b.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x4b.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'you', 'yi', 'xue', 'sa', 'xu', 'li', 'li', 'yuan', 'dui', 'huo', 'sha', 'leng', 'pou', 'hu', 'guo', 'bu',
   0x10 => 'rui', 'wei', 'sou', 'an', 'yu', 'xiang', 'heng', 'yang', 'xiao', 'yao', NULL, 'bi', NULL, 'heng', 'tao', 'liu',
   0x20 => NULL, 'zhu', NULL, 'xi', 'zan', 'yi', 'dou', 'yuan', 'jiu', NULL, 'bo', 'ti', 'ying', NULL, 'yi', 'nian',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'hai', 'kuang', 'heng', 'kui', 'ze', 'ting', 'lang', 'bi', 'huan', 'po', 'yao', 'wan', 'ti', 'sui', 'kua', 'dui',
   0xE0 => 'ao', 'jian', 'mo', 'kui', 'kuai', 'an', 'ma', 'qing', 'qiao', NULL, 'kao', 'hao', 'duo', 'xian', 'nai', 'suo',
   0xF0 => 'jie', 'pi', 'pa', 'song', 'chang', 'nie', 'man', 'song', 'ci', 'xian', 'kuo', NULL, 'di', 'pou', 'tiao', 'zu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x4c.php b/web/core/lib/Drupal/Component/Transliteration/data/x4c.php
index aa1852ce4..38398a2d1 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x4c.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x4c.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'wo', 'fei', 'cai', 'peng', 'sai', NULL, 'rou', 'qi', 'cuo', 'pan', 'bo', 'man', 'zong', 'ci', 'kui', 'ji',
   0x10 => 'lan', NULL, 'meng', 'mian', 'pan', 'lu', 'zuan', NULL, 'liu', 'yi', 'wen', 'li', 'li', 'zeng', 'zhu', 'hun',
   0x20 => 'shen', 'chi', 'xing', 'wang', 'dong', 'huo', 'pi', 'hu', 'mei', 'che', 'mei', 'chao', 'ju', 'nou', NULL, 'yi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ci', 'you', 'yuan', 'lao', 'ju', 'fu', 'nie', 'e', 'e', 'xing', 'kan', 'yan', 'tu', 'pou', 'beng', 'ming',
   0xE0 => 'shui', 'yan', 'qi', 'yuan', 'bie', NULL, 'xuan', 'hou', 'huang', 'yao', 'juan', 'kui', 'e', 'ji', 'mo', 'chong',
   0xF0 => 'bao', 'wu', 'zhen', 'xu', 'ta', 'chi', 'xi', 'cong', 'ma', 'kou', 'yan', 'can', NULL, 'he', 'deng', 'ran',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x4d.php b/web/core/lib/Drupal/Component/Transliteration/data/x4d.php
index b77e98895..fb9737fa8 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x4d.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x4d.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'tong', 'yu', 'xiang', 'nao', 'shun', 'fen', 'pu', 'ling', 'ao', 'huan', 'yi', 'huan', 'meng', 'ying', 'lei', 'yan',
   0x10 => 'bao', 'die', 'ling', 'shi', 'jiao', 'lie', 'jing', 'ju', 'ti', 'pi', 'gang', 'xiao', 'wai', 'chuai', 'di', 'huan',
   0x20 => 'yao', 'li', 'mi', 'hu', 'sheng', 'jia', 'yin', 'wei', NULL, 'piao', 'lu', 'ling', 'yi', 'cai', 'shan', 'hu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x4e.php b/web/core/lib/Drupal/Component/Transliteration/data/x4e.php
index 868c80d3c..1d833446e 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x4e.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x4e.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yi', 'ding', 'kao', 'qi', 'shang', 'xia', 'han', 'wan', 'zhang', 'san', 'shang', 'xia', 'ji', 'bu', 'yu', 'mian',
   0x10 => 'gai', 'chou', 'chou', 'zhuan', 'qie', 'pi', 'shi', 'shi', 'qiu', 'bing', 'ye', 'cong', 'dong', 'si', 'cheng', 'diu',
   0x20 => 'qiu', 'liang', 'diu', 'you', 'liang', 'yan', 'bing', 'sang', 'gun', 'jiu', 'ge', 'ya', 'qiang', 'zhong', 'ji', 'jie',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'san', 'lun', 'bing', 'cang', 'zi', 'shi', 'ta', 'zhang', 'fu', 'xian', 'xian', 'tuo', 'hong', 'tong', 'ren', 'qian',
   0xE0 => 'gan', 'ge', 'bo', 'dai', 'ling', 'yi', 'chao', 'chang', 'sa', 'shang', 'yi', 'mu', 'men', 'ren', 'jia', 'chao',
   0xF0 => 'yang', 'qian', 'zhong', 'pi', 'wo', 'wu', 'jian', 'jia', 'yao', 'feng', 'cang', 'ren', 'wang', 'fen', 'di', 'fang',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x4f.php b/web/core/lib/Drupal/Component/Transliteration/data/x4f.php
index 01144a550..ee4723b10 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x4f.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x4f.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'zhong', 'qi', 'pei', 'yu', 'diao', 'dun', 'wu', 'yi', 'xin', 'kang', 'yi', 'ji', 'ai', 'wu', 'ji', 'fu',
   0x10 => 'fa', 'xiu', 'jin', 'pi', 'dan', 'fu', 'tang', 'zhong', 'you', 'huo', 'hui', 'yu', 'cui', 'chuan', 'san', 'wei',
   0x20 => 'chuan', 'che', 'ya', 'xian', 'shang', 'chang', 'lun', 'cang', 'xun', 'xin', 'wei', 'zhu', 'ze', 'xian', 'nu', 'bo',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'li', 'yong', 'hun', 'jing', 'qian', 'san', 'pei', 'su', 'fu', 'xi', 'li', 'fu', 'ping', 'bao', 'yu', 'qi',
   0xE0 => 'xia', 'xin', 'xiu', 'yu', 'di', 'che', 'chou', 'zhi', 'yan', 'lia', 'li', 'lai', 'si', 'jian', 'xiu', 'fu',
   0xF0 => 'huo', 'ju', 'xiao', 'pai', 'jian', 'biao', 'chu', 'fei', 'feng', 'ya', 'an', 'bei', 'yu', 'xin', 'bi', 'hu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x50.php b/web/core/lib/Drupal/Component/Transliteration/data/x50.php
index f3e3e5309..1fd5d9dd0 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x50.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x50.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'chang', 'zhi', 'bing', 'jiu', 'yao', 'cui', 'lia', 'wan', 'lai', 'cang', 'zong', 'ge', 'guan', 'bei', 'tian', 'shu',
   0x10 => 'shu', 'men', 'dao', 'tan', 'jue', 'chui', 'xing', 'peng', 'tang', 'hou', 'yi', 'qi', 'ti', 'gan', 'jing', 'jie',
   0x20 => 'sui', 'chang', 'jie', 'fang', 'zhi', 'kong', 'juan', 'zong', 'ju', 'qian', 'ni', 'lun', 'zhuo', 'wo', 'luo', 'song',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'shan', 'qiao', 'jiong', 'tui', 'zun', 'pu', 'xi', 'lao', 'chang', 'guang', 'liao', 'qi', 'cheng', 'chan', 'wei', 'ji',
   0xE0 => 'bo', 'hui', 'chuan', 'tie', 'dan', 'jiao', 'jiu', 'seng', 'fen', 'xian', 'ju', 'e', 'jiao', 'jian', 'tong', 'lin',
   0xF0 => 'bo', 'gu', 'xian', 'su', 'xian', 'jiang', 'min', 'ye', 'jin', 'jia', 'qiao', 'pi', 'feng', 'zhou', 'ai', 'sai',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x51.php b/web/core/lib/Drupal/Component/Transliteration/data/x51.php
index 3f00d5ab9..f5ad0080e 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x51.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x51.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yi', 'jun', 'nong', 'chan', 'yi', 'dang', 'jing', 'xuan', 'kuai', 'jian', 'chu', 'dan', 'jiao', 'sha', 'zai', 'can',
   0x10 => 'bin', 'an', 'ru', 'tai', 'chou', 'chai', 'lan', 'ni', 'jin', 'qian', 'meng', 'wu', 'ning', 'qiong', 'ni', 'chang',
   0x20 => 'lie', 'lei', 'lu', 'kuang', 'bao', 'yu', 'biao', 'zan', 'zhi', 'si', 'you', 'hao', 'chen', 'chen', 'li', 'teng',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'yin', 'cou', 'yi', 'li', 'chuang', 'ming', 'zhun', 'cui', 'si', 'duo', 'jin', 'lin', 'lin', 'ning', 'xi', 'du',
   0xE0 => 'ji', 'fan', 'fan', 'fan', 'feng', 'ju', 'chu', 'zheng', 'feng', 'mu', 'zhi', 'fu', 'feng', 'ping', 'feng', 'kai',
   0xF0 => 'huang', 'kai', 'gan', 'deng', 'ping', 'qian', 'xiong', 'kuai', 'tu', 'ao', 'chu', 'ji', 'dang', 'han', 'han', 'zao',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x52.php b/web/core/lib/Drupal/Component/Transliteration/data/x52.php
index c09edddd5..a3df0ee40 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x52.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x52.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'dao', 'diao', 'dao', 'ren', 'ren', 'chuang', 'fen', 'qie', 'yi', 'ji', 'kan', 'qian', 'cun', 'chu', 'wen', 'ji',
   0x10 => 'dan', 'xing', 'hua', 'wan', 'jue', 'li', 'yue', 'lie', 'liu', 'ze', 'gang', 'chuang', 'fu', 'chu', 'qu', 'ju',
   0x20 => 'shan', 'min', 'ling', 'zhong', 'pan', 'bie', 'jie', 'jie', 'pao', 'li', 'shan', 'bie', 'chan', 'jing', 'gua', 'geng',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'meng', 'chi', 'lei', 'kai', 'mian', 'dong', 'xu', 'xu', 'kan', 'wu', 'yi', 'xun', 'weng', 'sheng', 'lao', 'mu',
   0xE0 => 'lu', 'piao', 'shi', 'ji', 'qin', 'jiang', 'chao', 'quan', 'xiang', 'yi', 'jue', 'fan', 'juan', 'tong', 'ju', 'dan',
   0xF0 => 'xie', 'mai', 'xun', 'xun', 'lu', 'li', 'che', 'rang', 'quan', 'bao', 'shao', 'yun', 'jiu', 'bao', 'gou', 'wu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x53.php b/web/core/lib/Drupal/Component/Transliteration/data/x53.php
index 0af1ffc10..bee5a9674 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x53.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x53.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yun', 'wen', 'bi', 'gai', 'gai', 'bao', 'cong', 'yi', 'xiong', 'peng', 'ju', 'tao', 'ge', 'pu', 'e', 'pao',
   0x10 => 'fu', 'gong', 'da', 'jiu', 'qiong', 'bi', 'hua', 'bei', 'nao', 'shi', 'fang', 'jiu', 'yi', 'za', 'jiang', 'kang',
   0x20 => 'jiang', 'kuang', 'hu', 'xia', 'qu', 'bian', 'gui', 'qie', 'zang', 'kuang', 'fei', 'hu', 'yu', 'gui', 'kui', 'hui',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ba', 'fa', 'ruo', 'shi', 'shu', 'zhuo', 'qu', 'shou', 'bian', 'xu', 'jia', 'pan', 'sou', 'gao', 'wei', 'sou',
   0xE0 => 'die', 'rui', 'cong', 'kou', 'gu', 'ju', 'ling', 'gua', 'dao', 'kou', 'zhi', 'jiao', 'zhao', 'ba', 'ding', 'ke',
   0xF0 => 'tai', 'chi', 'shi', 'you', 'qiu', 'po', 'ye', 'hao', 'si', 'tan', 'chi', 'le', 'diao', 'ji', 'liao', 'hong',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x54.php b/web/core/lib/Drupal/Component/Transliteration/data/x54.php
index 85b047619..ae0339870 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x54.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x54.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'mie', 'xu', 'mang', 'chi', 'ge', 'xuan', 'yao', 'zi', 'he', 'ji', 'diao', 'cun', 'tong', 'ming', 'hou', 'li',
   0x10 => 'tu', 'xiang', 'zha', 'xia', 'ye', 'lu', 'ya', 'ma', 'ou', 'huo', 'yi', 'jun', 'chou', 'lin', 'tun', 'yin',
   0x20 => 'fei', 'bi', 'qin', 'qin', 'jie', 'bu', 'fou', 'ba', 'dun', 'fen', 'e', 'han', 'ting', 'keng', 'shun', 'qi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'kuang', 'ya', 'da', 'xiao', 'bi', 'hui', 'nian', 'hua', 'xing', 'kuai', 'duo', 'fen', 'ji', 'nong', 'mou', 'yo',
   0xE0 => 'hao', 'yuan', 'long', 'pou', 'mang', 'ge', 'o', 'chi', 'shao', 'li', 'na', 'zu', 'he', 'ku', 'xiao', 'xian',
   0xF0 => 'lao', 'bo', 'zhe', 'zha', 'liang', 'ba', 'mie', 'lie', 'sui', 'fu', 'bu', 'han', 'heng', 'geng', 'shuo', 'ge',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x55.php b/web/core/lib/Drupal/Component/Transliteration/data/x55.php
index 3f16ee5c2..af2d7772c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x55.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x55.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'you', 'yan', 'gu', 'gu', 'bei', 'han', 'suo', 'chun', 'yi', 'ai', 'jia', 'tu', 'xian', 'wan', 'li', 'xi',
   0x10 => 'tang', 'zuo', 'qiu', 'che', 'wu', 'zao', 'ya', 'dou', 'qi', 'di', 'qin', 'ma', 'mo', 'gong', 'dou', 'qu',
   0x20 => 'lao', 'liang', 'suo', 'zao', 'huan', 'lang', 'sha', 'ji', 'zuo', 'wo', 'feng', 'jin', 'hu', 'qi', 'shou', 'wei',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'hai', 'ke', 'da', 'sang', 'chen', 'ru', 'sou', 'wa', 'ji', 'pang', 'wu', 'qian', 'shi', 'ge', 'zi', 'jie',
   0xE0 => 'luo', 'weng', 'wa', 'si', 'chi', 'hao', 'suo', 'Jia ', 'hai', 'suo', 'qin', 'nie', 'he', 'zhi', 'sai', 'n',
   0xF0 => 'ge', 'na', 'dia', 'ai', 'qiang', 'tong', 'bi', 'ao', 'ao', 'lian', 'zui', 'zhe', 'mo', 'sou', 'sou', 'tan',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x56.php b/web/core/lib/Drupal/Component/Transliteration/data/x56.php
index 8f34d3c0c..3d35d4447 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x56.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x56.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'di', 'qi', 'jiao', 'chong', 'jiao', 'kai', 'tan', 'shan', 'cao', 'jia', 'ai', 'xiao', 'piao', 'lou', 'ga', 'gu',
   0x10 => 'xiao', 'hu', 'hui', 'guo', 'ou', 'xian', 'ze', 'chang', 'xu', 'po', 'de', 'ma', 'ma', 'hu', 'lei', 'du',
   0x20 => 'ga', 'tang', 'ye', 'beng', 'ying', 'sai', 'jiao', 'mi', 'xiao', 'hua', 'mai', 'ran', 'chuai', 'peng', 'lao', 'xiao',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'za', 'zhu', 'lan', 'nie', 'nang', 'lan', 'lo', 'wei', 'hui', 'yin', 'qiu', 'si', 'nin', 'jian', 'hui', 'xin',
   0xE0 => 'yin', 'nan', 'tuan', 'tuan', 'dun', 'kang', 'yuan', 'jiong', 'pian', 'yun', 'cong', 'hu', 'hui', 'yuan', 'e', 'guo',
   0xF0 => 'kun', 'cong', 'tong', 'tu', 'wei', 'lun', 'guo', 'qun', 'ri', 'ling', 'gu', 'guo', 'tai', 'guo', 'tu', 'you',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x57.php b/web/core/lib/Drupal/Component/Transliteration/data/x57.php
index 7983c7a8f..f337892b7 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x57.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x57.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'guo', 'yin', 'hun', 'pu', 'yu', 'han', 'yuan', 'lun', 'quan', 'yu', 'qing', 'guo', 'chuan', 'wei', 'yuan', 'quan',
   0x10 => 'ku', 'fu', 'yuan', 'yuan', 'ya', 'tu', 'tu', 'tu', 'tuan', 'lue', 'hui', 'yi', 'huan', 'luan', 'luan', 'tu',
   0x20 => 'ya', 'tu', 'ting', 'sheng', 'pu', 'lu', 'kuai', 'ya', 'zai', 'wei', 'ge', 'yu', 'wu', 'gui', 'pi', 'yi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jin', 'zhe', 'lie', 'lie', 'bu', 'cheng', 'hua', 'bu', 'shi', 'xun', 'guo', 'jiong', 'ye', 'nian', 'di', 'yu',
   0xE0 => 'bu', 'ya', 'quan', 'sui', 'pi', 'qing', 'wan', 'ju', 'lun', 'zheng', 'kong', 'chong', 'dong', 'dai', 'tan', 'an',
   0xF0 => 'cai', 'chu', 'beng', 'kan', 'zhi', 'duo', 'yi', 'zhi', 'yi', 'pei', 'ji', 'zhun', 'qi', 'sao', 'ju', 'ni',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x58.php b/web/core/lib/Drupal/Component/Transliteration/data/x58.php
index 73a217c73..1e6255580 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x58.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x58.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ku', 'ke', 'tang', 'kun', 'ni', 'jian', 'dui', 'jin', 'gang', 'yu', 'e', 'peng', 'gu', 'tu', 'leng', 'fang',
   0x10 => 'ya', 'qian', 'kun', 'an', 'shen', 'duo', 'nao', 'tu', 'cheng', 'yin', 'hun', 'bi', 'lian', 'guo', 'die', 'zhuan',
   0x20 => 'hou', 'bao', 'bao', 'yu', 'di', 'mao', 'jie', 'ruan', 'ye', 'geng', 'kan', 'zong', 'yu', 'huang', 'e', 'yao',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'xi', 'he', 'ai', 'ya', 'dao', 'hao', 'ruan', 'jin', 'lei', 'kuang', 'lu', 'yan', 'tan', 'wei', 'huai', 'long',
   0xE0 => 'long', 'rui', 'li', 'lin', 'rang', 'chan', 'xun', 'yan', 'lei', 'ba', 'wan', 'shi', 'ren', 'san', 'zhuang', 'zhuang',
   0xF0 => 'sheng', 'yi', 'mai', 'ke', 'zhu', 'zhuang', 'hu', 'hu', 'kun', 'yi', 'hu', 'xu', 'kun', 'shou', 'mang', 'zun',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x59.php b/web/core/lib/Drupal/Component/Transliteration/data/x59.php
index 5755e53b3..5df464c6a 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x59.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x59.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'shou', 'yi', 'zhi', 'gu', 'chu', 'jiang', 'feng', 'bei', 'zhai', 'bian', 'sui', 'qun', 'ling', 'fu', 'cuo', 'xia',
   0x10 => 'xiong', 'xie', 'nao', 'xia', 'kui', 'xi', 'wai', 'yuan', 'mao', 'su', 'duo', 'duo', 'ye', 'qing', 'wai', 'gou',
   0x20 => 'gou', 'qi', 'meng', 'meng', 'yin', 'huo', 'chen', 'da', 'ze', 'tian', 'tai', 'fu', 'guai', 'yao', 'yang', 'hang',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jie', 'gu', 'si', 'xing', 'wei', 'zi', 'ju', 'shan', 'pin', 'ren', 'yao', 'dong', 'jiang', 'shu', 'ji', 'gai',
   0xE0 => 'xiang', 'hua', 'juan', 'jiao', 'gou', 'lao', 'jian', 'jian', 'yi', 'nian', 'zhi', 'ji', 'ji', 'xian', 'heng', 'guang',
   0xF0 => 'jun', 'kua', 'yan', 'ming', 'lie', 'pei', 'e', 'you', 'yan', 'cha', 'shen', 'yin', 'shi', 'gui', 'quan', 'zi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x5a.php b/web/core/lib/Drupal/Component/Transliteration/data/x5a.php
index 306fce933..49b18ae92 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x5a.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x5a.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'song', 'wei', 'hong', 'wa', 'lou', 'ya', 'rao', 'jiao', 'luan', 'ping', 'xian', 'shao', 'li', 'cheng', 'xie', 'mang',
   0x10 => 'fu', 'suo', 'mei', 'wei', 'ke', 'chuo', 'chuo', 'ting', 'niang', 'xing', 'nan', 'yu', 'na', 'pou', 'nei', 'juan',
   0x20 => 'shen', 'zhi', 'han', 'di', 'zhuang', 'e', 'pin', 'tui', 'xian', 'mian', 'wu', 'yan', 'wu', 'ai', 'yan', 'yu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'nao', 'bao', 'ai', 'pi', 'pin', 'yi', 'piao', 'yu', 'lei', 'xuan', 'man', 'yi', 'zhang', 'kang', 'yong', 'ni',
   0xE0 => 'li', 'di', 'gui', 'yan', 'jin', 'zhuan', 'chang', 'ze', 'han', 'nen', 'lao', 'mo', 'zhe', 'hu', 'hu', 'ao',
   0xF0 => 'nen', 'qiang', 'ma', 'pie', 'gu', 'wu', 'qiao', 'tuo', 'zhan', 'mao', 'xian', 'xian', 'mo', 'liao', 'lian', 'hua',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x5b.php b/web/core/lib/Drupal/Component/Transliteration/data/x5b.php
index 8f6c4adff..0c6a1b42a 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x5b.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x5b.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'gui', 'deng', 'zhi', 'xu', 'yi', 'hua', 'xi', 'kui', 'rao', 'xi', 'yan', 'chan', 'jiao', 'mei', 'fan', 'fan',
   0x10 => 'xian', 'yi', 'hui', 'jiao', 'fu', 'shi', 'bi', 'shan', 'sui', 'qiang', 'lian', 'huan', 'xin', 'niao', 'dong', 'yi',
   0x20 => 'can', 'ai', 'niang', 'ning', 'ma', 'tiao', 'chou', 'jin', 'ci', 'yu', 'pin', 'rong', 'ru', 'nai', 'yan', 'tai',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'mei', 'qin', 'han', 'yu', 'shi', 'ning', 'jin', 'ning', 'zhi', 'yu', 'bao', 'kuan', 'ning', 'qin', 'mo', 'cha',
   0xE0 => 'ju', 'gua', 'qin', 'hu', 'wu', 'liao', 'shi', 'ning', 'zhai', 'shen', 'wei', 'xie', 'kuan', 'hui', 'liao', 'jun',
   0xF0 => 'huan', 'yi', 'yi', 'bao', 'qin', 'chong', 'bao', 'feng', 'cun', 'dui', 'si', 'xun', 'dao', 'lu', 'dui', 'shou',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x5c.php b/web/core/lib/Drupal/Component/Transliteration/data/x5c.php
index a4173f26b..fd2835201 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x5c.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x5c.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'po', 'feng', 'zhuan', 'fu', 'she', 'ke', 'jiang', 'jiang', 'zhuan', 'wei', 'zun', 'xun', 'shu', 'dui', 'dao', 'xiao',
   0x10 => 'jie', 'shao', 'er', 'er', 'er', 'ga', 'jian', 'shu', 'chen', 'shang', 'shang', 'mo', 'ga', 'chang', 'liao', 'xian',
   0x20 => 'xian', 'kun', 'you', 'wang', 'you', 'liao', 'liao', 'yao', 'mang', 'wang', 'wang', 'wang', 'ga', 'yao', 'duo', 'kui',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'gai', 'quan', 'dong', 'yi', 'mu', 'shi', 'an', 'wei', 'huan', 'zhi', 'mi', 'li', 'ji', 'tong', 'wei', 'you',
   0xE0 => 'gu', 'xia', 'li', 'yao', 'jiao', 'zheng', 'luan', 'jiao', 'e', 'e', 'yu', 'xie', 'bu', 'qiao', 'qun', 'feng',
   0xF0 => 'feng', 'nao', 'li', 'you', 'xian', 'hong', 'dao', 'shen', 'cheng', 'tu', 'geng', 'jun', 'hao', 'xia', 'yin', 'yu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x5d.php b/web/core/lib/Drupal/Component/Transliteration/data/x5d.php
index f6e54155b..bfa89e1ae 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x5d.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x5d.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'lang', 'kan', 'lao', 'lai', 'xian', 'que', 'kong', 'chong', 'chong', 'ta', 'lin', 'hua', 'ju', 'lai', 'qi', 'min',
   0x10 => 'kun', 'kun', 'zu', 'gu', 'cui', 'ya', 'ya', 'gang', 'lun', 'lun', 'leng', 'jue', 'duo', 'zheng', 'guo', 'yin',
   0x20 => 'dong', 'han', 'zheng', 'wei', 'xiao', 'pi', 'yan', 'song', 'jie', 'beng', 'zu', 'ku', 'dong', 'zhan', 'gu', 'yin',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'chao', 'cuan', 'luan', 'dian', 'dian', 'nie', 'yan', 'yan', 'yan', 'kui', 'yan', 'chuan', 'kuai', 'chuan', 'zhou', 'huang',
   0xE0 => 'jing', 'xun', 'chao', 'chao', 'lie', 'gong', 'zuo', 'qiao', 'ju', 'gong', 'ju', 'wu', 'pu', 'pu', 'cha', 'qiu',
   0xF0 => 'qiu', 'ji', 'yi', 'si', 'ba', 'zhi', 'zhao', 'xiang', 'yi', 'jin', 'xun', 'juan', 'ba', 'xun', 'jin', 'fu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x5e.php b/web/core/lib/Drupal/Component/Transliteration/data/x5e.php
index 75c829d2e..5d02629d4 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x5e.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x5e.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'za', 'bi', 'shi', 'bu', 'ding', 'shuai', 'fan', 'nie', 'shi', 'fen', 'pa', 'zhi', 'xi', 'hu', 'dan', 'wei',
   0x10 => 'zhang', 'tang', 'dai', 'mo', 'pei', 'pa', 'tie', 'bo', 'lian', 'zhi', 'zhou', 'bo', 'zhi', 'di', 'mo', 'yi',
   0x20 => 'yi', 'ping', 'qia', 'juan', 'ru', 'shuai', 'dai', 'zheng', 'shui', 'qiao', 'zhen', 'shi', 'qun', 'xi', 'bang', 'dai',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jiu', 'jin', 'ao', 'kuo', 'lou', 'yin', 'liao', 'dai', 'lu', 'yi', 'chu', 'chan', 'tu', 'si', 'xin', 'miao',
   0xE0 => 'chang', 'wu', 'fei', 'guang', 'ku', 'kuai', 'bi', 'qiang', 'xie', 'lin', 'lin', 'liao', 'lu', 'ji', 'ying', 'xian',
   0xF0 => 'ting', 'yong', 'li', 'ting', 'yin', 'xun', 'yan', 'ting', 'di', 'pai', 'jian', 'hui', 'nai', 'hui', 'gong', 'nian',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x5f.php b/web/core/lib/Drupal/Component/Transliteration/data/x5f.php
index 675ad3ee6..25fe4acd7 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x5f.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x5f.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'kai', 'bian', 'yi', 'qi', 'nong', 'fen', 'ju', 'yan', 'yi', 'zang', 'bi', 'yi', 'yi', 'er', 'san', 'shi',
   0x10 => 'er', 'shi', 'shi', 'gong', 'diao', 'yin', 'hu', 'fu', 'hong', 'wu', 'tui', 'chi', 'jiang', 'ba', 'shen', 'di',
   0x20 => 'zhang', 'jue', 'tao', 'fu', 'di', 'mi', 'xian', 'hu', 'chao', 'nu', 'jing', 'zhen', 'yi', 'mi', 'quan', 'wan',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'tan', 'te', 'te', 'gan', 'qi', 'shi', 'cun', 'zhi', 'wang', 'mang', 'xi', 'fan', 'ying', 'tian', 'min', 'wen',
   0xE0 => 'zhong', 'chong', 'wu', 'ji', 'wu', 'xi', 'jia', 'you', 'wan', 'cong', 'song', 'kuai', 'yu', 'bian', 'zhi', 'qi',
   0xF0 => 'cui', 'chen', 'tai', 'tun', 'qian', 'nian', 'hun', 'xiong', 'niu', 'kuang', 'xian', 'xin', 'kang', 'hu', 'kai', 'fen',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x60.php b/web/core/lib/Drupal/Component/Transliteration/data/x60.php
index 8186748f4..27467cc97 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x60.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x60.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'huai', 'tai', 'song', 'wu', 'ou', 'chang', 'chuang', 'ju', 'yi', 'bao', 'chao', 'min', 'pei', 'zuo', 'zen', 'yang',
   0x10 => 'ju', 'ban', 'nu', 'nao', 'zheng', 'pa', 'bu', 'tie', 'hu', 'hu', 'ju', 'da', 'lian', 'si', 'chou', 'di',
   0x20 => 'dai', 'yi', 'tu', 'you', 'fu', 'ji', 'peng', 'xing', 'yuan', 'ni', 'guai', 'fu', 'xi', 'bi', 'you', 'qie',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'yu', 'huo', 'he', 'quan', 'tan', 'ti', 'ti', 'nie', 'wang', 'chuo', 'hu', 'hun', 'xi', 'chang', 'xin', 'wei',
   0xE0 => 'hui', 'e', 'suo', 'zong', 'jian', 'yong', 'dian', 'ju', 'can', 'cheng', 'de', 'bei', 'qie', 'can', 'dan', 'guan',
   0xF0 => 'duo', 'nao', 'yun', 'xiang', 'zhui', 'die', 'huang', 'chun', 'qiong', 're', 'xing', 'ce', 'bian', 'min', 'zong', 'ti',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x61.php b/web/core/lib/Drupal/Component/Transliteration/data/x61.php
index 21b7a80b2..9890aff4a 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x61.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x61.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'qiao', 'chou', 'bei', 'xuan', 'wei', 'ge', 'qian', 'wei', 'yu', 'yu', 'bi', 'xuan', 'huan', 'min', 'bi', 'yi',
   0x10 => 'mian', 'yong', 'kai', 'dang', 'yin', 'e', 'chen', 'mao', 'qia', 'ke', 'yu', 'ai', 'qie', 'yan', 'nuo', 'gan',
   0x20 => 'yun', 'zong', 'sai', 'leng', 'fen', 'ying', 'kui', 'kui', 'que', 'gong', 'yun', 'su', 'su', 'qi', 'yao', 'song',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'huai', 'men', 'lan', 'ai', 'lin', 'yan', 'kuo', 'xia', 'chi', 'yu', 'yin', 'dai', 'meng', 'ai', 'meng', 'dui',
   0xE0 => 'qi', 'mo', 'lan', 'men', 'chou', 'zhi', 'nuo', 'nuo', 'yan', 'yang', 'bo', 'zhi', 'kuang', 'kuang', 'you', 'fu',
   0xF0 => 'liu', 'mie', 'cheng', 'hui', 'chan', 'meng', 'lan', 'huai', 'xuan', 'rang', 'chan', 'ji', 'ju', 'huan', 'she', 'yi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x62.php b/web/core/lib/Drupal/Component/Transliteration/data/x62.php
index 0de5674f2..9f2315bd4 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x62.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x62.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'lian', 'nan', 'mi', 'tang', 'jue', 'gang', 'gang', 'zhuang', 'ge', 'yue', 'wu', 'jian', 'xu', 'shu', 'rong', 'xi',
   0x10 => 'cheng', 'wo', 'jie', 'ge', 'jian', 'qiang', 'huo', 'qiang', 'zhan', 'dong', 'qi', 'jia', 'die', 'zei', 'jia', 'ji',
   0x20 => 'zhi', 'kan', 'ji', 'kui', 'gai', 'deng', 'zhan', 'qiang', 'ge', 'jian', 'jie', 'yu', 'jian', 'yan', 'lu', 'hu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'guai', 'qian', 'ju', 'ta', 'ba', 'tuo', 'tuo', 'ao', 'ju', 'zhuo', 'pan', 'zhao', 'bai', 'bai', 'di', 'ni',
   0xE0 => 'ju', 'kuo', 'long', 'jian', 'qia', 'yong', 'lan', 'ning', 'bo', 'ze', 'qian', 'hen', 'kuo', 'shi', 'jie', 'zheng',
   0xF0 => 'nin', 'gong', 'gong', 'quan', 'shuan', 'cun', 'za', 'kao', 'yi', 'xie', 'ce', 'hui', 'pin', 'zhuai', 'shi', 'na',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x63.php b/web/core/lib/Drupal/Component/Transliteration/data/x63.php
index 9108c93cc..e74aa0fee 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x63.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x63.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'bai', 'chi', 'gua', 'zhi', 'kuo', 'duo', 'duo', 'zhi', 'qie', 'an', 'nong', 'zhen', 'ge', 'jiao', 'kua', 'dong',
   0x10 => 'na', 'tiao', 'lie', 'zha', 'lu', 'die', 'wa', 'jue', 'lie', 'ju', 'zhi', 'luan', 'ya', 'wo', 'ta', 'xie',
   0x20 => 'nao', 'dang', 'jiao', 'zheng', 'ji', 'hui', 'xian', 'yu', 'ai', 'tuo', 'nuo', 'cuo', 'bo', 'geng', 'ti', 'zhen',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ti', 'nie', 'cha', 'shi', 'zong', 'zhen', 'yi', 'xun', 'yong', 'bian', 'yang', 'huan', 'yan', 'zan', 'an', 'xu',
   0xE0 => 'ya', 'wo', 'ke', 'chuai', 'ji', 'ti', 'la', 'la', 'chen', 'kai', 'jiu', 'jiu', 'tu', 'jie', 'hui', 'gen',
   0xF0 => 'chong', 'xiao', 'die', 'xie', 'yuan', 'qian', 'ye', 'cha', 'zha', 'bei', 'yao', 'wei', 'beng', 'lan', 'wen', 'qin',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x64.php b/web/core/lib/Drupal/Component/Transliteration/data/x64.php
index 68f1e0577..29e7caa6b 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x64.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x64.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'chan', 'ge', 'lou', 'zong', 'geng', 'jiao', 'gou', 'qin', 'rong', 'que', 'chou', 'chuai', 'zhan', 'sun', 'sun', 'bo',
   0x10 => 'chu', 'rong', 'bang', 'cuo', 'sao', 'ke', 'yao', 'dao', 'zhi', 'nu', 'la', 'jian', 'sou', 'qiu', 'gao', 'xian',
   0x20 => 'shuo', 'sang', 'jin', 'mie', 'e', 'chui', 'nuo', 'shan', 'ta', 'zha', 'tang', 'pan', 'ban', 'da', 'li', 'tao',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'huan', 'jie', 'qin', 'kuai', 'dan', 'xie', 'ka', 'pi', 'bai', 'ao', 'ju', 'ye', 'e', 'meng', 'sou', 'mi',
   0xE0 => 'ji', 'tai', 'zhuo', 'dao', 'xing', 'lan', 'ca', 'ju', 'ye', 'ru', 'ye', 'ye', 'ni', 'wo', 'ji', 'bin',
   0xF0 => 'ning', 'ge', 'zhi', 'zhi', 'kuo', 'mo', 'jian', 'xie', 'lie', 'tan', 'bai', 'sou', 'lu', 'lue', 'rao', 'ti',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x65.php b/web/core/lib/Drupal/Component/Transliteration/data/x65.php
index ff100d4a0..f8b74f829 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x65.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x65.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'pan', 'yang', 'lei', 'ca', 'shu', 'zan', 'nian', 'xian', 'jun', 'huo', 'li', 'la', 'huan', 'ying', 'lu', 'long',
   0x10 => 'qian', 'qian', 'zan', 'qian', 'lan', 'xian', 'ying', 'mei', 'rang', 'chan', 'ying', 'cuan', 'xie', 'she', 'luo', 'jun',
   0x20 => 'mi', 'li', 'zan', 'luan', 'tan', 'zuan', 'li', 'dian', 'wa', 'dang', 'jiao', 'jue', 'lan', 'li', 'nang', 'zhi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'zhao', 'yi', 'liu', 'shao', 'jian', 'yu', 'yi', 'qi', 'zhi', 'fan', 'piao', 'fan', 'zhan', 'kuai', 'sui', 'yu',
   0xE0 => 'wu', 'ji', 'ji', 'ji', 'huo', 'ri', 'dan', 'jiu', 'zhi', 'zao', 'xie', 'tiao', 'xun', 'xu', 'ga', 'la',
   0xF0 => 'gan', 'han', 'tai', 'di', 'xu', 'chan', 'shi', 'kuang', 'yang', 'shi', 'wang', 'min', 'min', 'tun', 'chun', 'wu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x66.php b/web/core/lib/Drupal/Component/Transliteration/data/x66.php
index edebef0e5..23aa7d422 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x66.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x66.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yun', 'bei', 'ang', 'ze', 'ban', 'jie', 'kun', 'sheng', 'hu', 'fang', 'hao', 'gui', 'chang', 'xuan', 'ming', 'hun',
   0x10 => 'fen', 'qin', 'hu', 'yi', 'xi', 'xin', 'yan', 'ze', 'fang', 'tan', 'shen', 'ju', 'yang', 'zan', 'bing', 'xing',
   0x20 => 'ying', 'xuan', 'po', 'zhen', 'ling', 'chun', 'hao', 'mei', 'zuo', 'mo', 'bian', 'xu', 'hun', 'zhao', 'zong', 'shi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'xing', 'shen', 'jiao', 'bao', 'jing', 'yan', 'ai', 'ye', 'ru', 'shu', 'meng', 'xun', 'yao', 'pu', 'li', 'chen',
   0xE0 => 'kuang', 'die', 'liao', 'yan', 'huo', 'lu', 'xi', 'rong', 'long', 'nang', 'luo', 'luan', 'shai', 'tang', 'yan', 'zhu',
   0xF0 => 'yue', 'yue', 'qu', 'ye', 'geng', 'ye', 'hu', 'he', 'shu', 'cao', 'cao', 'sheng', 'man', 'ceng', 'ceng', 'ti',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x67.php b/web/core/lib/Drupal/Component/Transliteration/data/x67.php
index d0e5d1a8c..2b5e33feb 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x67.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x67.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'zui', 'can', 'xu', 'hui', 'yin', 'qie', 'fen', 'pi', 'yue', 'you', 'ruan', 'peng', 'fen', 'fu', 'ling', 'fei',
   0x10 => 'qu', 'ti', 'nu', 'tiao', 'shuo', 'zhen', 'lang', 'lang', 'zui', 'ming', 'huang', 'wang', 'tun', 'chao', 'ji', 'qi',
   0x20 => 'ying', 'zong', 'wang', 'tong', 'lang', 'lao', 'meng', 'long', 'mu', 'deng', 'wei', 'mo', 'ben', 'zha', 'shu', 'shu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'mou', 'gan', 'qi', 'ran', 'rou', 'mao', 'shao', 'song', 'zhe', 'xia', 'you', 'shen', 'gui', 'tuo', 'zha', 'nan',
   0xE0 => 'ning', 'yong', 'di', 'zhi', 'zha', 'cha', 'dan', 'gu', 'bu', 'jiu', 'ao', 'fu', 'jian', 'ba', 'duo', 'ke',
   0xF0 => 'nai', 'zhu', 'bi', 'liu', 'chai', 'shan', 'si', 'chu', 'pei', 'shi', 'guai', 'zha', 'yao', 'cheng', 'jiu', 'shi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x68.php b/web/core/lib/Drupal/Component/Transliteration/data/x68.php
index 84f944786..39662ffa8 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x68.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x68.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'zhi', 'liu', 'mei', 'li', 'rong', 'zha', 'zao', 'biao', 'zhan', 'zhi', 'long', 'dong', 'lu', 'sheng', 'li', 'lan',
   0x10 => 'yong', 'shu', 'xun', 'shuan', 'qi', 'zhen', 'qi', 'li', 'yi', 'xiang', 'zhen', 'li', 'se', 'gua', 'kan', 'ben',
   0x20 => 'ren', 'xiao', 'bai', 'ren', 'bing', 'zi', 'chou', 'yi', 'ci', 'xu', 'zhu', 'jian', 'zui', 'er', 'er', 'you',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'fei', 'pai', 'bang', 'bang', 'hun', 'zong', 'cheng', 'zao', 'ji', 'li', 'peng', 'yu', 'yu', 'gu', 'jun', 'dong',
   0xE0 => 'tang', 'gang', 'wang', 'di', 'cuo', 'fan', 'cheng', 'zhan', 'qi', 'yuan', 'yan', 'yu', 'quan', 'yi', 'sen', 'ren',
   0xF0 => 'chui', 'leng', 'qi', 'zhuo', 'fu', 'ke', 'lai', 'zou', 'zou', 'zhao', 'guan', 'fen', 'fen', 'shen', 'qing', 'ni',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x69.php b/web/core/lib/Drupal/Component/Transliteration/data/x69.php
index fcc08f281..4d094cb61 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x69.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x69.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'wan', 'guo', 'lu', 'hao', 'jie', 'yi', 'chou', 'ju', 'ju', 'cheng', 'zuo', 'liang', 'qiang', 'zhi', 'chui', 'ya',
   0x10 => 'ju', 'bei', 'jiao', 'zhuo', 'zi', 'bin', 'peng', 'ding', 'chu', 'chang', 'men', 'hua', 'jian', 'gui', 'xi', 'du',
   0x20 => 'qian', 'dao', 'gui', 'dian', 'luo', 'zhi', 'quan', 'ming', 'fu', 'geng', 'peng', 'zhan', 'yi', 'tuo', 'sen', 'duo',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'huai', 'mei', 'xu', 'gang', 'gao', 'zhuo', 'tuo', 'qiao', 'yang', 'dian', 'jia', 'kan', 'zui', 'dao', 'long', 'bin',
   0xE0 => 'zhu', 'sang', 'xi', 'ji', 'lian', 'hui', 'yong', 'qian', 'guo', 'gai', 'gai', 'tuan', 'hua', 'qi', 'sen', 'cui',
   0xF0 => 'peng', 'you', 'hu', 'jiang', 'hu', 'huan', 'gui', 'nie', 'yi', 'gao', 'kang', 'gui', 'gui', 'cao', 'man', 'jin',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x6a.php b/web/core/lib/Drupal/Component/Transliteration/data/x6a.php
index d5557b843..4a34fa639 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x6a.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x6a.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'di', 'zhuang', 'le', 'lang', 'chen', 'cong', 'li', 'xiu', 'qing', 'shuang', 'fan', 'tong', 'guan', 'ze', 'su', 'lei',
   0x10 => 'lu', 'liang', 'mi', 'lou', 'chao', 'su', 'ke', 'chu', 'tang', 'biao', 'lu', 'jiu', 'zhe', 'zha', 'shu', 'zhang',
   0x20 => 'man', 'mo', 'niao', 'yang', 'tiao', 'peng', 'zhu', 'sha', 'xi', 'quan', 'heng', 'jian', 'cong', 'ji', 'yan', 'qiang',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'lei', 'lei', 'sa', 'lu', 'li', 'cuan', 'lu', 'mie', 'hui', 'ou', 'lu', 'zhi', 'gao', 'du', 'yuan', 'li',
   0xE0 => 'fei', 'zhuo', 'sou', 'lian', 'jiang', 'chu', 'qing', 'zhu', 'lu', 'yan', 'li', 'zhu', 'chen', 'jie', 'e', 'su',
   0xF0 => 'huai', 'nie', 'yu', 'long', 'lai', 'jiao', 'xian', 'gui', 'ju', 'xiao', 'ling', 'ying', 'jian', 'yin', 'you', 'ying',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x6b.php b/web/core/lib/Drupal/Component/Transliteration/data/x6b.php
index 98dbdd198..0df032938 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x6b.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x6b.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'xiang', 'nong', 'bo', 'chan', 'lan', 'ju', 'shuang', 'she', 'wei', 'cong', 'quan', 'qu', 'cang', 'jiu', 'yu', 'luo',
   0x10 => 'li', 'cuan', 'luan', 'dang', 'jue', 'yan', 'lan', 'lan', 'zhu', 'lei', 'li', 'ba', 'nang', 'yu', 'ling', 'guang',
   0x20 => 'qian', 'ci', 'huan', 'xin', 'yu', 'yi', 'qian', 'ou', 'xu', 'chao', 'chu', 'qi', 'kai', 'yi', 'jue', 'xi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ai', 'jie', 'du', 'yu', 'bi', 'bi', 'bi', 'pi', 'pi', 'bi', 'chan', 'mao', 'hao', 'cai', 'pi', 'lie',
   0xE0 => 'jia', 'zhan', 'sai', 'mu', 'tuo', 'xun', 'er', 'rong', 'xian', 'ju', 'mu', 'hao', 'qiu', 'dou', 'sha', 'tan',
   0xF0 => 'pei', 'ju', 'duo', 'cui', 'bi', 'san', 'san', 'mao', 'sai', 'shu', 'yu', 'tuo', 'he', 'jian', 'ta', 'san',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x6c.php b/web/core/lib/Drupal/Component/Transliteration/data/x6c.php
index 37501ff61..52c6c42a3 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x6c.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x6c.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'lu', 'mu', 'mao', 'tong', 'rong', 'chang', 'pu', 'lu', 'zhan', 'sao', 'zhan', 'meng', 'lu', 'qu', 'die', 'shi',
   0x10 => 'di', 'min', 'jue', 'mang', 'qi', 'pie', 'nai', 'qi', 'dao', 'xian', 'chuan', 'fen', 'yang', 'nei', 'bin', 'fu',
   0x20 => 'shen', 'dong', 'qing', 'qi', 'yin', 'xi', 'hai', 'yang', 'an', 'ya', 'ke', 'qing', 'ya', 'dong', 'dan', 'lu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'le', 'you', 'gu', 'hong', 'gan', 'fa', 'mao', 'si', 'hu', 'ping', 'ci', 'fan', 'zhi', 'su', 'ning', 'cheng',
   0xE0 => 'ling', 'pao', 'bo', 'qi', 'si', 'ni', 'ju', 'sa', 'zhu', 'sheng', 'lei', 'xuan', 'jue', 'fu', 'pan', 'min',
   0xF0 => 'tai', 'yang', 'ji', 'yong', 'guan', 'beng', 'xue', 'long', 'lu', 'dan', 'luo', 'xie', 'po', 'ze', 'jing', 'yin',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x6d.php b/web/core/lib/Drupal/Component/Transliteration/data/x6d.php
index 7c0efb343..db015464a 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x6d.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x6d.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'pan', 'jie', 'yi', 'hui', 'hui', 'zai', 'cheng', 'yin', 'wei', 'hou', 'jian', 'yang', 'lie', 'si', 'ji', 'er',
   0x10 => 'xing', 'fu', 'sa', 'se', 'zhi', 'yin', 'wu', 'xi', 'kao', 'zhu', 'jiang', 'luo', 'luo', 'an', 'dong', 'ti',
   0x20 => 'mou', 'lei', 'yi', 'mi', 'quan', 'jin', 'po', 'wei', 'xiao', 'xie', 'hong', 'xu', 'su', 'kuang', 'tao', 'qie',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'chang', 'shu', 'qi', 'fang', 'zhi', 'lu', 'nao', 'ju', 'tao', 'cong', 'lei', 'zhe', 'ping', 'fei', 'song', 'tian',
   0xE0 => 'pi', 'dan', 'yu', 'ni', 'yu', 'lu', 'gan', 'mi', 'jing', 'ling', 'lun', 'yin', 'cui', 'qu', 'huai', 'yu',
   0xF0 => 'nian', 'shen', 'biao', 'chun', 'hu', 'yuan', 'lai', 'hun', 'qing', 'yan', 'qian', 'tian', 'miao', 'zhi', 'yin', 'mi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x6e.php b/web/core/lib/Drupal/Component/Transliteration/data/x6e.php
index 50c7e503d..ea795fe92 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x6e.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x6e.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ben', 'yuan', 'wen', 'ruo', 'fei', 'qing', 'yuan', 'ke', 'ji', 'she', 'yuan', 'se', 'lu', 'zi', 'du', 'qi',
   0x10 => 'jian', 'mian', 'pi', 'xi', 'yu', 'yuan', 'shen', 'shen', 'rou', 'huan', 'zhu', 'jian', 'nuan', 'yu', 'qiu', 'ting',
   0x20 => 'qu', 'du', 'fan', 'zha', 'bo', 'wo', 'wo', 'di', 'wei', 'wen', 'ru', 'xie', 'ce', 'wei', 'he', 'gang',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jie', 'hua', 'ge', 'zi', 'tao', 'teng', 'sui', 'bi', 'jiao', 'hui', 'gun', 'yin', 'gao', 'long', 'zhi', 'yan',
   0xE0 => 'she', 'man', 'ying', 'chun', 'lu', 'lan', 'luan', 'xiao', 'bin', 'tan', 'yu', 'xiu', 'hu', 'bi', 'biao', 'zhi',
   0xF0 => 'jiang', 'kou', 'shen', 'shang', 'di', 'mi', 'ao', 'lu', 'hu', 'hu', 'you', 'chan', 'fan', 'yong', 'gun', 'man',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x6f.php b/web/core/lib/Drupal/Component/Transliteration/data/x6f.php
index bcb08f819..1b63e5c94 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x6f.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x6f.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'qing', 'yu', 'piao', 'ji', 'ya', 'chao', 'qi', 'xi', 'ji', 'lu', 'lou', 'long', 'jin', 'guo', 'cong', 'lou',
   0x10 => 'zhi', 'gai', 'qiang', 'li', 'yan', 'cao', 'jiao', 'cong', 'chun', 'tuan', 'ou', 'teng', 'ye', 'xi', 'mi', 'tang',
   0x20 => 'mo', 'shang', 'han', 'lian', 'lan', 'wa', 'chi', 'gan', 'feng', 'xuan', 'yi', 'man', 'zi', 'mang', 'kang', 'luo',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'zhu', 'lai', 'bin', 'lian', 'mi', 'shi', 'shu', 'mi', 'ning', 'ying', 'ying', 'meng', 'jin', 'qi', 'bi', 'ji',
   0xE0 => 'hao', 'ru', 'cui', 'wo', 'tao', 'yin', 'yin', 'dui', 'ci', 'huo', 'jing', 'lan', 'jun', 'ai', 'pu', 'zhuo',
   0xF0 => 'wei', 'bin', 'gu', 'qian', 'ying', 'bin', 'kuo', 'fei', 'cang', 'me', 'jian', 'wei', 'luo', 'zan', 'lu', 'li',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x70.php b/web/core/lib/Drupal/Component/Transliteration/data/x70.php
index a04c26a87..6b837726d 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x70.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x70.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'you', 'yang', 'lu', 'si', 'zhi', 'ying', 'du', 'wang', 'hui', 'xie', 'pan', 'shen', 'biao', 'chan', 'mo', 'liu',
   0x10 => 'jian', 'pu', 'se', 'cheng', 'gu', 'bin', 'huo', 'xian', 'lu', 'qin', 'han', 'ying', 'rong', 'li', 'jing', 'xiao',
   0x20 => 'ying', 'sui', 'wei', 'xie', 'huai', 'xue', 'zhu', 'long', 'lai', 'dui', 'fan', 'hu', 'lai', 'shu', 'ling', 'ying',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'zhou', 'yao', 'shi', 'wei', 'tong', 'mie', 'zai', 'kai', 'hong', 'lao', 'xia', 'zhu', 'xuan', 'zheng', 'po', 'yan',
   0xE0 => 'hui', 'guang', 'che', 'hui', 'kao', 'chen', 'fan', 'shao', 'ye', 'hui', NULL, 'tang', 'jin', 're', 'lie', 'xi',
   0xF0 => 'fu', 'jiong', 'xie', 'pu', 'ting', 'zhuo', 'ting', 'wan', 'hai', 'peng', 'lang', 'yan', 'xu', 'feng', 'chi', 'rong',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x71.php b/web/core/lib/Drupal/Component/Transliteration/data/x71.php
index bec4af6ae..df33f2f01 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x71.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x71.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'hu', 'xi', 'shu', 'he', 'xun', 'ku', 'juan', 'xiao', 'xi', 'yan', 'han', 'zhuang', 'jun', 'di', 'xie', 'ji',
   0x10 => 'wu', 'yan', 'lu', 'han', 'yan', 'huan', 'men', 'ju', 'dao', 'bei', 'fen', 'lin', 'kun', 'hun', 'tun', 'xi',
   0x20 => 'cui', 'wu', 'hong', 'chao', 'fu', 'wo', 'jiao', 'cong', 'feng', 'ping', 'qiong', 'ruo', 'xi', 'qiong', 'xin', 'chao',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'lin', 'tong', 'shao', 'fen', 'fan', 'yan', 'xun', 'lan', 'mei', 'tang', 'yi', 'jing', 'men', 'jing', 'jiao', 'ying',
   0xE0 => 'yu', 'yi', 'xue', 'lan', 'tai', 'zao', 'can', 'sui', 'xi', 'que', 'cong', 'lian', 'hui', 'zhu', 'xie', 'ling',
   0xF0 => 'wei', 'yi', 'xie', 'zhao', 'hui', 'da', 'nong', 'lan', 'ru', 'xian', 'kao', 'xun', 'jin', 'chou', 'dao', 'yao',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x72.php b/web/core/lib/Drupal/Component/Transliteration/data/x72.php
index bea999b7d..7a84a0c38 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x72.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x72.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'he', 'lan', 'biao', 'rong', 'li', 'mo', 'bao', 'ruo', 'lu', 'la', 'ao', 'xun', 'kuang', 'shuo', 'liao', 'li',
   0x10 => 'lu', 'jue', 'liao', 'yan', 'xi', 'xie', 'long', 'ye', 'can', 'rang', 'yue', 'lan', 'cong', 'jue', 'chong', 'guan',
   0x20 => 'ju', 'che', 'mi', 'tang', 'lan', 'zhu', 'lan', 'ling', 'cuan', 'yu', 'zhao', 'zhao', 'pa', 'zheng', 'pao', 'cheng',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'hu', 'ling', 'fei', 'pi', 'ni', 'yao', 'you', 'gou', 'xue', 'ju', 'dan', 'bo', 'ku', 'xian', 'ning', 'huan',
   0xE0 => 'hen', 'jiao', 'he', 'zhao', 'ji', 'xun', 'shan', 'ta', 'rong', 'shou', 'tong', 'lao', 'du', 'xia', 'shi', 'kuai',
   0xF0 => 'zheng', 'yu', 'sun', 'yu', 'bi', 'mang', 'xi', 'juan', 'li', 'xia', 'yin', 'suan', 'lang', 'bei', 'zhi', 'yan',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x73.php b/web/core/lib/Drupal/Component/Transliteration/data/x73.php
index 237fe058e..62f3521ff 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x73.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x73.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'sha', 'li', 'han', 'xian', 'jing', 'pai', 'fei', 'xiao', 'bai', 'qi', 'ni', 'biao', 'yin', 'lai', 'lie', 'jian',
   0x10 => 'qiang', 'kun', 'yan', 'guo', 'zong', 'mi', 'chang', 'yi', 'zhi', 'zheng', 'ya', 'meng', 'cai', 'cu', 'she', 'lie',
   0x20 => 'dian', 'luo', 'hu', 'zong', 'gui', 'wei', 'feng', 'wo', 'yuan', 'xing', 'zhu', 'mao', 'wei', 'chuan', 'xian', 'tuan',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'fa', 'long', 'jin', 'jiao', 'jian', 'li', 'guang', 'xian', 'zhou', 'gong', 'yan', 'xiu', 'yang', 'xu', 'luo', 'su',
   0xE0 => 'zhu', 'qin', 'yin', 'xun', 'bao', 'er', 'xiang', 'yao', 'xia', 'hang', 'gui', 'chong', 'xu', 'ban', 'pei', 'lao',
   0xF0 => 'dang', 'ying', 'hui', 'wen', 'e', 'cheng', 'di', 'wu', 'wu', 'cheng', 'jun', 'mei', 'bei', 'ting', 'xian', 'chu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x74.php b/web/core/lib/Drupal/Component/Transliteration/data/x74.php
index e94a71c04..c7d14a4a3 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x74.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x74.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'han', 'xuan', 'yan', 'qiu', 'xuan', 'lang', 'li', 'xiu', 'fu', 'liu', 'ya', 'xi', 'ling', 'li', 'jin', 'lian',
   0x10 => 'suo', 'suo', 'feng', 'wan', 'dian', 'pin', 'zhan', 'se', 'min', 'yu', 'ju', 'chen', 'lai', 'wen', 'sheng', 'wei',
   0x20 => 'tian', 'chu', 'zuo', 'beng', 'cheng', 'hu', 'qi', 'e', 'kun', 'chang', 'qi', 'beng', 'wan', 'lu', 'cong', 'guan',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'lu', 'li', 'zan', 'lan', 'ying', 'mi', 'xiang', 'qiong', 'guan', 'dao', 'zan', 'huan', 'gua', 'bo', 'die', 'bo',
   0xE0 => 'hu', 'zhi', 'piao', 'ban', 'rang', 'li', 'wa', 'Dekaguramu ', 'xiang', 'qian', 'ban', 'pen', 'fang', 'dan', 'weng', 'ou',
   0xF0 => 'Deshiguramu ', 'Miriguramu ', 'wa', 'hu', 'ling', 'yi', 'ping', 'ci', 'bai', 'juan', 'chang', 'chi', 'Sarake ', 'dang', 'meng', 'bu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x75.php b/web/core/lib/Drupal/Component/Transliteration/data/x75.php
index fd88d444f..5db5531a7 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x75.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x75.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'zhui', 'ping', 'bian', 'zhou', 'zhen', 'Senchigura ', 'ci', 'ying', 'qi', 'xian', 'lou', 'di', 'ou', 'meng', 'zhuan', 'beng',
   0x10 => 'lin', 'zeng', 'wu', 'pi', 'dan', 'weng', 'ying', 'yan', 'gan', 'dai', 'shen', 'tian', 'tian', 'han', 'chang', 'sheng',
   0x20 => 'qing', 'shen', 'chan', 'chan', 'rui', 'sheng', 'su', 'shen', 'yong', 'shuai', 'lu', 'fu', 'yong', 'beng', 'feng', 'ning',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'hui', 'tan', 'yang', 'chi', 'zhi', 'hen', 'ya', 'mei', 'dou', 'jing', 'xiao', 'tong', 'tu', 'mang', 'pi', 'xiao',
   0xE0 => 'suan', 'fu', 'li', 'zhi', 'cuo', 'duo', 'wu', 'sha', 'lao', 'shou', 'huan', 'xian', 'yi', 'beng', 'zhang', 'guan',
   0xF0 => 'tan', 'fei', 'ma', 'lin', 'chi', 'ji', 'tian', 'an', 'chi', 'bi', 'bi', 'min', 'gu', 'dui', 'e', 'wei',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x76.php b/web/core/lib/Drupal/Component/Transliteration/data/x76.php
index abfbd36d8..eb3eafa14 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x76.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x76.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yu', 'cui', 'ya', 'zhu', 'cu', 'dan', 'shen', 'zhong', 'chi', 'yu', 'hou', 'feng', 'la', 'yang', 'chen', 'tu',
   0x10 => 'yu', 'guo', 'wen', 'huan', 'ku', 'jia', 'yin', 'yi', 'lou', 'sao', 'jue', 'chi', 'xi', 'guan', 'yi', 'wen',
   0x20 => 'ji', 'chuang', 'ban', 'hui', 'liu', 'chai', 'shou', 'nue', 'dian', 'da', 'bie', 'tan', 'zhang', 'biao', 'shen', 'cu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'yan', 'jian', 'he', 'yu', 'kui', 'fan', 'gai', 'dao', 'pan', 'fu', 'qiu', 'sheng', 'dao', 'lu', 'zhan', 'meng',
   0xE0 => 'li', 'jin', 'xu', 'jian', 'pan', 'guan', 'an', 'lu', 'xu', 'zhou', 'dang', 'an', 'gu', 'li', 'mu', 'ding',
   0xF0 => 'gan', 'xu', 'mang', 'wang', 'zhi', 'qi', 'yuan', 'tian', 'xiang', 'dun', 'xin', 'xi', 'pan', 'feng', 'dun', 'min',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x77.php b/web/core/lib/Drupal/Component/Transliteration/data/x77.php
index 6a6c4b985..ecde8bb8f 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x77.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x77.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ming', 'sheng', 'shi', 'yun', 'mian', 'pan', 'fang', 'miao', 'dan', 'mei', 'mao', 'kan', 'xian', 'kou', 'shi', 'yang',
   0x10 => 'zheng', 'yao', 'shen', 'huo', 'da', 'zhen', 'kuang', 'ju', 'shen', 'yi', 'sheng', 'mei', 'mo', 'zhu', 'zhen', 'zhen',
   0x20 => 'mian', 'shi', 'yuan', 'die', 'ni', 'zi', 'zi', 'chao', 'zha', 'xuan', 'bing', 'mi', 'long', 'sui', 'tong', 'mi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'huo', 'lu', 'meng', 'long', 'guan', 'man', 'xi', 'chu', 'tang', 'kan', 'zhu', 'mao', 'jin', 'lin', 'yu', 'shuo',
   0xE0 => 'ze', 'jue', 'shi', 'yi', 'shen', 'zhi', 'hou', 'shen', 'ying', 'ju', 'zhou', 'jiao', 'cuo', 'duan', 'ai', 'jiao',
   0xF0 => 'zeng', 'yue', 'ba', 'shi', 'ding', 'qi', 'ji', 'zi', 'gan', 'wu', 'zhe', 'ku', 'gang', 'xi', 'fan', 'kuang',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x78.php b/web/core/lib/Drupal/Component/Transliteration/data/x78.php
index b7e4041c0..c79005b68 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x78.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x78.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'dang', 'ma', 'sha', 'dan', 'jue', 'li', 'fu', 'min', 'e', 'huo', 'kang', 'zhi', 'qi', 'kan', 'jie', 'bin',
   0x10 => 'e', 'ya', 'pi', 'zhe', 'yan', 'sui', 'zhuan', 'che', 'dun', 'pan', 'yan', 'jin', 'feng', 'fa', 'mo', 'zha',
   0x20 => 'ju', 'yu', 'ke', 'tuo', 'tuo', 'di', 'zhai', 'zhen', 'e', 'fu', 'mu', 'zhu', 'la', 'bian', 'nu', 'ping',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'pan', 'wei', 'yun', 'dui', 'zhe', 'ke', 'la', 'zhuan', 'qing', 'gun', 'zhuan', 'chan', 'qi', 'ao', 'peng', 'liu',
   0xE0 => 'lu', 'kan', 'chuang', 'chen', 'yin', 'lei', 'biao', 'qi', 'mo', 'qi', 'cui', 'zong', 'qing', 'chuo', 'lun', 'ji',
   0xF0 => 'shan', 'lao', 'qu', 'zeng', 'deng', 'jian', 'xi', 'lin', 'ding', 'tan', 'huang', 'pan', 'za', 'qiao', 'di', 'li',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x79.php b/web/core/lib/Drupal/Component/Transliteration/data/x79.php
index 77915644f..babcfd2ff 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x79.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x79.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'jian', 'jiao', 'xi', 'zhang', 'qiao', 'dun', 'jian', 'yu', 'zhui', 'he', 'ke', 'ze', 'lei', 'ke', 'chu', 'ye',
   0x10 => 'que', 'dang', 'yi', 'jiang', 'pi', 'pi', 'yu', 'pin', 'e', 'ai', 'ke', 'jian', 'yu', 'ruan', 'meng', 'pao',
   0x20 => 'ci', 'bo', 'yang', 'ma', 'ca', 'xian', 'kuang', 'lei', 'lei', 'zhi', 'li', 'li', 'fan', 'que', 'pao', 'ying',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'yun', 'ke', 'miao', 'zhi', 'jing', 'bi', 'zhi', 'yu', 'mi', 'ku', 'ban', 'pi', 'ni', 'li', 'you', 'zu',
   0xE0 => 'pi', 'bo', 'ling', 'mo', 'cheng', 'nian', 'qin', 'yang', 'zuo', 'zhi', 'zhi', 'shu', 'ju', 'zi', 'huo', 'ji',
   0xF0 => 'cheng', 'tong', 'zhi', 'huo', 'he', 'yin', 'zi', 'zhi', 'jie', 'ren', 'du', 'yi', 'zhu', 'hui', 'nong', 'fu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x7a.php b/web/core/lib/Drupal/Component/Transliteration/data/x7a.php
index db12d9b36..eebb25760 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x7a.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x7a.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'xi', 'kao', 'lang', 'fu', 'xun', 'shui', 'lu', 'kun', 'gan', 'jing', 'ti', 'cheng', 'tu', 'shao', 'shui', 'ya',
   0x10 => 'lun', 'lu', 'gu', 'zuo', 'ren', 'zhun', 'bang', 'bai', 'ji', 'zhi', 'zhi', 'kun', 'leng', 'peng', 'ke', 'bing',
   0x20 => 'chou', 'zui', 'yu', 'su', 'lue', 'xiang', 'yi', 'xi', 'bian', 'ji', 'fu', 'pi', 'nuo', 'jie', 'zhong', 'zong',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'chu', 'hong', 'qi', 'hao', 'sheng', 'fen', 'shu', 'miao', 'qu', 'zhan', 'zhu', 'ling', 'long', 'bing', 'jing', 'jing',
   0xE0 => 'zhang', 'bai', 'si', 'jun', 'hong', 'tong', 'song', 'jing', 'diao', 'yi', 'shu', 'jing', 'qu', 'jie', 'ping', 'duan',
   0xF0 => 'shao', 'zhuan', 'ceng', 'deng', 'cun', 'wai', 'jing', 'kan', 'jing', 'zhu', 'zhu', 'le', 'peng', 'yu', 'chi', 'gan',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x7b.php b/web/core/lib/Drupal/Component/Transliteration/data/x7b.php
index 9db59111a..29d7b0345 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x7b.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x7b.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'mang', 'zhu', 'wan', 'du', 'ji', 'xiao', 'ba', 'suan', 'ji', 'qin', 'zhao', 'sun', 'ya', 'zhui', 'yuan', 'hu',
   0x10 => 'hang', 'xiao', 'cen', 'bi', 'bi', 'jian', 'yi', 'dong', 'shan', 'sheng', 'da', 'di', 'zhu', 'na', 'chi', 'gu',
   0x20 => 'li', 'qie', 'min', 'bao', 'tiao', 'si', 'fu', 'ce', 'ben', 'pei', 'da', 'zi', 'di', 'ling', 'ze', 'nu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'gu', 'kui', 'shi', 'lou', 'yun', 'he', 'tang', 'yue', 'chou', 'gao', 'fei', 'ruo', 'zheng', 'gou', 'nie', 'qian',
   0xE0 => 'xiao', 'cuan', 'long', 'peng', 'du', 'li', 'bi', 'zhuo', 'chu', 'shai', 'chi', 'zhu', 'qiang', 'long', 'lan', 'jian',
   0xF0 => 'bu', 'li', 'hui', 'bi', 'di', 'cong', 'yan', 'peng', 'can', 'zhuan', 'pi', 'piao', 'dou', 'yu', 'mie', 'tuan',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x7c.php b/web/core/lib/Drupal/Component/Transliteration/data/x7c.php
index 49aa0a667..3fff1c7a0 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x7c.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x7c.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ze', 'shai', 'gui', 'yi', 'hu', 'chan', 'kou', 'cu', 'ping', 'zao', 'ji', 'gui', 'su', 'lou', 'ce', 'lu',
   0x10 => 'nian', 'suo', 'cuan', 'diao', 'suo', 'le', 'duan', 'liang', 'xiao', 'bo', 'mi', 'shai', 'dang', 'liao', 'dan', 'dian',
   0x20 => 'fu', 'jian', 'min', 'kui', 'dai', 'jiao', 'deng', 'huang', 'sun', 'lao', 'zan', 'xiao', 'lu', 'shi', 'zan', 'qi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'fu', 'nuo', 'bei', 'gu', 'xiu', 'gao', 'tang', 'qiu', 'jia', 'cao', 'zhuang', 'tang', 'mi', 'san', 'fen', 'zao',
   0xE0 => 'kang', 'jiang', 'mo', 'san', 'san', 'nuo', 'xi', 'liang', 'jiang', 'kuai', 'bo', 'huan', 'shu', 'zong', 'xian', 'nuo',
   0xF0 => 'tuan', 'nie', 'li', 'zuo', 'di', 'nie', 'tiao', 'lan', 'mi', 'si', 'jiu', 'xi', 'gong', 'zheng', 'jiu', 'you',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x7d.php b/web/core/lib/Drupal/Component/Transliteration/data/x7d.php
index 1cfdab205..352293d3b 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x7d.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x7d.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ji', 'cha', 'zhou', 'xun', 'yue', 'hong', 'yu', 'he', 'wan', 'ren', 'wen', 'wen', 'qiu', 'na', 'zi', 'tou',
   0x10 => 'niu', 'fou', 'ji', 'shu', 'chun', 'pi', 'zhen', 'sha', 'hong', 'zhi', 'ji', 'fen', 'yun', 'ren', 'dan', 'jin',
   0x20 => 'su', 'fang', 'suo', 'cui', 'jiu', 'za', 'ba', 'jin', 'fu', 'zhi', 'ci', 'zi', 'chou', 'hong', 'za', 'lei',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'fan', 'lu', 'xu', 'ying', 'shang', 'qi', 'xu', 'xiang', 'jian', 'ke', 'xian', 'ruan', 'mian', 'ji', 'duan', 'chong',
   0xE0 => 'di', 'min', 'miao', 'yuan', 'xie', 'bao', 'si', 'qiu', 'bian', 'huan', 'geng', 'cong', 'mian', 'wei', 'fu', 'wei',
   0xF0 => 'tou', 'gou', 'miao', 'xie', 'lian', 'zong', 'bian', 'yun', 'yin', 'ti', 'gua', 'zhi', 'yun', 'cheng', 'chan', 'dai',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x7e.php b/web/core/lib/Drupal/Component/Transliteration/data/x7e.php
index e66acc5bb..a278c2d19 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x7e.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x7e.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'xia', 'yuan', 'zong', 'xu', 'ying', 'wei', 'geng', 'xuan', 'ying', 'jin', 'yi', 'zhui', 'ni', 'bang', 'gu', 'pan',
   0x10 => 'zhou', 'jian', 'ci', 'quan', 'shuang', 'yun', 'xia', 'cui', 'xi', 'rong', 'tao', 'fu', 'yun', 'chen', 'gao', 'ru',
   0x20 => 'hu', 'zai', 'teng', 'xian', 'su', 'zhen', 'zong', 'tao', 'huang', 'cai', 'bi', 'feng', 'cu', 'li', 'suo', 'yan',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'dai', 'bang', 'rong', 'jie', 'ku', 'rao', 'die', 'hang', 'hui', 'gei', 'xuan', 'jiang', 'luo', 'jue', 'jiao', 'tong',
   0xE0 => 'geng', 'xiao', 'juan', 'xiu', 'xi', 'sui', 'tao', 'ji', 'ti', 'ji', 'xu', 'ling', 'ying', 'xu', 'qi', 'fei',
   0xF0 => 'chuo', 'shang', 'gun', 'sheng', 'wei', 'mian', 'shou', 'beng', 'chou', 'tao', 'liu', 'quan', 'zong', 'zhan', 'wan', 'lu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x7f.php b/web/core/lib/Drupal/Component/Transliteration/data/x7f.php
index 7f586dd13..78e32434d 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x7f.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x7f.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'zhui', 'zi', 'ke', 'xiang', 'jian', 'mian', 'lan', 'ti', 'miao', 'ji', 'yun', 'hui', 'si', 'duo', 'duan', 'bian',
   0x10 => 'xian', 'gou', 'zhui', 'huan', 'di', 'lu', 'bian', 'min', 'yuan', 'jin', 'fu', 'ru', 'zhen', 'feng', 'cui', 'gao',
   0x20 => 'chan', 'li', 'yi', 'jian', 'bin', 'piao', 'man', 'lei', 'ying', 'suo', 'mou', 'sao', 'xie', 'liao', 'shan', 'zeng',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'zhi', 'qu', 'xi', 'xie', 'xiang', 'xi', 'xi', 'ke', 'qiao', 'hui', 'hui', 'xiao', 'sha', 'hong', 'jiang', 'di',
   0xE0 => 'cui', 'fei', 'dao', 'sha', 'chi', 'zhu', 'jian', 'xuan', 'chi', 'pian', 'zong', 'wan', 'hui', 'hou', 'he', 'he',
   0xF0 => 'han', 'ao', 'piao', 'yi', 'lian', 'hou', 'ao', 'lin', 'pen', 'qiao', 'ao', 'fan', 'yi', 'hui', 'xuan', 'dao',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x80.php b/web/core/lib/Drupal/Component/Transliteration/data/x80.php
index 33b80ca74..0cbf2aae1 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x80.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x80.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yao', 'lao', 'lao', 'kao', 'mao', 'zhe', 'qi', 'gou', 'gou', 'gou', 'die', 'die', 'er', 'shua', 'ruan', 'nai',
   0x10 => 'nai', 'duan', 'lei', 'ting', 'zi', 'geng', 'chao', 'hao', 'yun', 'ba', 'pi', 'yi', 'si', 'qu', 'jia', 'ju',
   0x20 => 'huo', 'chu', 'lao', 'lun', 'ji', 'tang', 'ou', 'lou', 'nou', 'jiang', 'pang', 'zha', 'lou', 'ji', 'lao', 'huo',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ku', 'zhi', 'ni', 'ping', 'zi', 'fu', 'pang', 'zhen', 'xian', 'zuo', 'pei', 'jia', 'sheng', 'zhi', 'bao', 'mu',
   0xE0 => 'qu', 'hu', 'ke', 'chi', 'yin', 'xu', 'yang', 'long', 'dong', 'ka', 'lu', 'jing', 'nu', 'yan', 'pang', 'kua',
   0xF0 => 'yi', 'guang', 'hai', 'ge', 'dong', 'chi', 'jiao', 'xiong', 'xiong', 'er', 'an', 'heng', 'pian', 'neng', 'zi', 'gui',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x81.php b/web/core/lib/Drupal/Component/Transliteration/data/x81.php
index 81fb4245e..dd5afc1e5 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x81.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x81.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'cheng', 'tiao', 'zhi', 'cui', 'mei', 'xie', 'cui', 'xie', 'mai', 'mai', 'ji', 'xie', 'nin', 'kuai', 'sa', 'zang',
   0x10 => 'qi', 'nao', 'mi', 'nong', 'luan', 'wan', 'bo', 'wen', 'wan', 'xiu', 'jiao', 'jing', 'you', 'heng', 'cuo', 'lie',
   0x20 => 'shan', 'ting', 'mei', 'chun', 'shen', 'qian', 'de', 'juan', 'cu', 'xiu', 'xin', 'tuo', 'pao', 'cheng', 'nei', 'pu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'xun', 'nao', 'wo', 'zang', 'xian', 'biao', 'xing', 'kuan', 'la', 'yan', 'lu', 'huo', 'za', 'luo', 'qu', 'zang',
   0xE0 => 'luan', 'ni', 'za', 'chen', 'qian', 'wo', 'guang', 'zang', 'lin', 'guang', 'zi', 'jiao', 'nie', 'chou', 'ji', 'gao',
   0xF0 => 'chou', 'mian', 'nie', 'zhi', 'zhi', 'ge', 'jian', 'die', 'zhi', 'xiu', 'tai', 'zhen', 'jiu', 'xian', 'yu', 'cha',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x82.php b/web/core/lib/Drupal/Component/Transliteration/data/x82.php
index 101305755..415fdb575 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x82.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x82.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yao', 'yu', 'chong', 'xi', 'xi', 'jiu', 'yu', 'yu', 'xing', 'ju', 'jiu', 'xin', 'she', 'she', 'she', 'jiu',
   0x10 => 'shi', 'tan', 'shu', 'shi', 'tian', 'tan', 'pu', 'pu', 'guan', 'hua', 'tian', 'chuan', 'shun', 'xia', 'wu', 'zhou',
   0x20 => 'dao', 'chuan', 'shan', 'yi', 'fan', 'pa', 'tai', 'fan', 'ban', 'chuan', 'hang', 'fang', 'ban', 'bi', 'lu', 'zhong',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ti', 'yuan', 'ran', 'ling', 'tai', 'shao', 'di', 'miao', 'qing', 'li', 'yong', 'ke', 'mu', 'bei', 'bao', 'gou',
   0xE0 => 'min', 'yi', 'yi', 'ju', 'pie', 'ruo', 'ku', 'ning', 'ni', 'bo', 'bing', 'shan', 'xiu', 'yao', 'xian', 'ben',
   0xF0 => 'hong', 'ying', 'zha', 'dong', 'ju', 'die', 'nie', 'gan', 'hu', 'ping', 'mei', 'fu', 'sheng', 'gu', 'bi', 'wei',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x83.php b/web/core/lib/Drupal/Component/Transliteration/data/x83.php
index 0c2a63177..73fe3fc66 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x83.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x83.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'fu', 'zhuo', 'mao', 'fan', 'jia', 'mao', 'mao', 'ba', 'ci', 'mo', 'zi', 'di', 'chi', 'ji', 'jing', 'long',
   0x10 => 'cong', 'niao', 'yuan', 'xue', 'ying', 'qiong', 'ge', 'ming', 'li', 'rong', 'yin', 'gen', 'qian', 'chai', 'chen', 'yu',
   0x20 => 'hao', 'zi', 'lie', 'wu', 'ji', 'gui', 'ci', 'jian', 'ci', 'gou', 'guang', 'mang', 'cha', 'jiao', 'jiao', 'fu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'pu', 'zai', 'gao', 'guo', 'fu', 'lun', 'chang', 'chou', 'song', 'chui', 'zhan', 'men', 'cai', 'ba', 'li', 'tu',
   0xE0 => 'bo', 'han', 'bao', 'qin', 'juan', 'xi', 'qin', 'di', 'jie', 'pu', 'dang', 'jin', 'qiao', 'tai', 'geng', 'hua',
   0xF0 => 'gu', 'ling', 'fei', 'qin', 'an', 'wang', 'beng', 'zhou', 'yan', 'ju', 'jian', 'lin', 'tan', 'shu', 'tian', 'dao',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x84.php b/web/core/lib/Drupal/Component/Transliteration/data/x84.php
index 683997904..4714535b7 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x84.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x84.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'hu', 'qi', 'he', 'cui', 'tao', 'chun', 'bi', 'chang', 'huan', 'fei', 'lai', 'qi', 'meng', 'ping', 'wei', 'dan',
   0x10 => 'sha', 'huan', 'yan', 'yi', 'tiao', 'qi', 'wan', 'ce', 'nai', 'zhen', 'tuo', 'jiu', 'tie', 'luo', 'bi', 'yi',
   0x20 => 'meng', 'bo', 'pao', 'ding', 'ying', 'ying', 'ying', 'xiao', 'sa', 'qiu', 'ke', 'xiang', 'wan', 'yu', 'yu', 'fu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ru', 'suo', 'xuan', 'bei', 'yao', 'gui', 'bi', 'zong', 'gun', 'zuo', 'tiao', 'ce', 'pei', 'lan', 'dan', 'ji',
   0xE0 => 'li', 'shen', 'lang', 'yu', 'ling', 'ying', 'mo', 'diao', 'tiao', 'mao', 'tong', 'chu', 'peng', 'an', 'lian', 'cong',
   0xF0 => 'xi', 'ping', 'qiu', 'jin', 'chun', 'jie', 'wei', 'tui', 'cao', 'yu', 'yi', 'zi', 'liao', 'bi', 'lu', 'xu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x85.php b/web/core/lib/Drupal/Component/Transliteration/data/x85.php
index 7fb87f17e..a5e4cd512 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x85.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x85.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'bu', 'zhang', 'lei', 'qiang', 'man', 'yan', 'ling', 'ji', 'biao', 'gun', 'han', 'di', 'su', 'lu', 'she', 'shang',
   0x10 => 'di', 'mie', 'xun', 'man', 'bo', 'di', 'cuo', 'zhe', 'shen', 'xuan', 'wei', 'hu', 'ao', 'mi', 'lou', 'cu',
   0x20 => 'zhong', 'cai', 'po', 'jiang', 'mi', 'cong', 'niao', 'hui', 'juan', 'yin', 'jian', 'nian', 'shu', 'yin', 'guo', 'chen',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'miao', 'qiong', 'qie', 'xian', 'liao', 'ou', 'xian', 'su', 'lu', 'yi', 'xu', 'xie', 'li', 'yi', 'la', 'lei',
   0xE0 => 'jiao', 'di', 'zhi', 'bei', 'teng', 'yao', 'mo', 'huan', 'biao', 'fan', 'sou', 'tan', 'tui', 'qiong', 'qiao', 'wei',
   0xF0 => 'liu', 'hui', 'ou', 'gao', 'yun', 'bao', 'li', 'shu', 'chu', 'ai', 'lin', 'zao', 'xuan', 'qin', 'lai', 'huo',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x86.php b/web/core/lib/Drupal/Component/Transliteration/data/x86.php
index 8615a1d20..285c2d12c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x86.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x86.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'tuo', 'wu', 'rui', 'rui', 'qi', 'heng', 'lu', 'su', 'tui', 'meng', 'yun', 'ping', 'yu', 'xun', 'ji', 'jiong',
   0x10 => 'xuan', 'mo', 'qiu', 'su', 'jiong', 'feng', 'nie', 'bo', 'rang', 'yi', 'xian', 'yu', 'ju', 'lian', 'lian', 'yin',
   0x20 => 'qiang', 'ying', 'long', 'tou', 'wei', 'yue', 'ling', 'qu', 'yao', 'fan', 'mei', 'han', 'kui', 'lan', 'ji', 'dang',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'qu', 'mou', 'ge', 'ci', 'hui', 'hui', 'mang', 'fu', 'yang', 'wa', 'lie', 'zhu', 'yi', 'xian', 'kuo', 'jiao',
   0xE0 => 'li', 'yi', 'ping', 'qi', 'ha', 'she', 'yi', 'wang', 'mo', 'qiong', 'qie', 'gui', 'qiong', 'zhi', 'man', 'lao',
   0xF0 => 'zhe', 'jia', 'nao', 'si', 'qi', 'xing', 'jie', 'qiu', 'shao', 'yong', 'jia', 'tui', 'che', 'bai', 'e', 'han',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x87.php b/web/core/lib/Drupal/Component/Transliteration/data/x87.php
index be4f22705..c9a120867 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x87.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x87.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'shu', 'xuan', 'feng', 'shen', 'shen', 'fu', 'xian', 'zhe', 'wu', 'fu', 'li', 'lang', 'bi', 'chu', 'yuan', 'you',
   0x10 => 'jie', 'dan', 'yan', 'ting', 'dian', 'tui', 'hui', 'wo', 'zhi', 'song', 'fei', 'ju', 'mi', 'qi', 'qi', 'yu',
   0x20 => 'jun', 'la', 'meng', 'qiang', 'si', 'xi', 'lun', 'li', 'die', 'tiao', 'tao', 'kun', 'han', 'han', 'yu', 'bang',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'chang', 'zhang', 'mang', 'xiang', 'mo', 'zui', 'si', 'qiu', 'te', 'zhi', 'peng', 'peng', 'jiao', 'qu', 'bie', 'liao',
   0xE0 => 'pan', 'gui', 'xi', 'ji', 'zhuan', 'huang', 'fei', 'lao', 'jue', 'jue', 'hui', 'yin', 'chan', 'jiao', 'shan', 'nao',
   0xF0 => 'xiao', 'wu', 'chong', 'xun', 'si', 'chu', 'cheng', 'dang', 'li', 'xie', 'shan', 'yi', 'jing', 'da', 'chan', 'qi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x88.php b/web/core/lib/Drupal/Component/Transliteration/data/x88.php
index 884306026..45feb58f5 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x88.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x88.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ci', 'xiang', 'she', 'luo', 'qin', 'ying', 'chai', 'li', 'zei', 'xuan', 'lian', 'zhu', 'ze', 'xie', 'mang', 'xie',
   0x10 => 'qi', 'rong', 'jian', 'meng', 'hao', 'ru', 'huo', 'zhuo', 'jie', 'pin', 'he', 'mie', 'fan', 'lei', 'jie', 'la',
   0x20 => 'min', 'li', 'chun', 'li', 'qiu', 'nie', 'lu', 'du', 'xiao', 'zhu', 'long', 'li', 'long', 'feng', 'ye', 'beng',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'juan', 'shen', 'pou', 'ge', 'yi', 'yu', 'zhen', 'liu', 'qiu', 'qun', 'ji', 'yi', 'bu', 'zhuang', 'shui', 'sha',
   0xE0 => 'qun', 'li', 'lian', 'lian', 'ku', 'jian', 'fou', 'chan', 'bi', 'kun', 'tao', 'yuan', 'ling', 'chi', 'chang', 'chou',
   0xF0 => 'duo', 'biao', 'liang', 'shang', 'pei', 'pei', 'fei', 'yuan', 'luo', 'guo', 'yan', 'du', 'ti', 'zhi', 'ju', 'yi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x89.php b/web/core/lib/Drupal/Component/Transliteration/data/x89.php
index 050496362..fbef66d8c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x89.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x89.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ji', 'zhi', 'gua', 'ken', 'qi', 'ti', 'ti', 'fu', 'chong', 'xie', 'bian', 'die', 'kun', 'duan', 'xiu', 'xiu',
   0x10 => 'he', 'yuan', 'bao', 'bao', 'fu', 'yu', 'tuan', 'yan', 'hui', 'bei', 'chu', 'lu', 'pao', 'dan', 'yun', 'ta',
   0x20 => 'gou', 'da', 'huai', 'rong', 'yuan', 'ru', 'nai', 'jiong', 'suo', 'ban', 'tui', 'chi', 'sang', 'niao', 'ying', 'jie',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jin', 'qu', 'jiao', 'qiu', 'jin', 'cu', 'jue', 'zhi', 'chao', 'ji', 'gu', 'dan', 'zi', 'di', 'shang', 'hua',
   0xE0 => 'quan', 'ge', 'shi', 'jie', 'gui', 'gong', 'chu', 'jie', 'hun', 'qiu', 'xing', 'su', 'ni', 'ji', 'lu', 'zhi',
   0xF0 => 'zha', 'bi', 'xing', 'hu', 'shang', 'gong', 'zhi', 'xue', 'chu', 'xi', 'yi', 'li', 'jue', 'xi', 'yan', 'xi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x8a.php b/web/core/lib/Drupal/Component/Transliteration/data/x8a.php
index 111894c12..03abb6687 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x8a.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x8a.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yan', 'yan', 'ding', 'fu', 'qiu', 'qiu', 'jiao', 'hong', 'ji', 'fan', 'xun', 'diao', 'hong', 'chai', 'tao', 'xu',
   0x10 => 'jie', 'yi', 'ren', 'xun', 'yin', 'shan', 'qi', 'tuo', 'ji', 'xun', 'yin', 'e', 'fen', 'ya', 'yao', 'song',
   0x20 => 'shen', 'yin', 'xin', 'jue', 'xiao', 'ne', 'chen', 'you', 'zhi', 'xiong', 'fang', 'xin', 'chao', 'she', 'xian', 'sa',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'qian', 'zhuo', 'liang', 'jian', 'chu', 'hao', 'lun', 'shen', 'biao', 'huai', 'pian', 'yu', 'die', 'xu', 'pian', 'shi',
   0xE0 => 'xuan', 'shi', 'hun', 'hua', 'e', 'zhong', 'di', 'xie', 'fu', 'pu', 'ting', 'jian', 'qi', 'yu', 'zi', 'zhuan',
   0xF0 => 'xi', 'hui', 'yin', 'an', 'xian', 'nan', 'chen', 'feng', 'zhu', 'yang', 'yan', 'huang', 'xuan', 'ge', 'nuo', 'qi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x8b.php b/web/core/lib/Drupal/Component/Transliteration/data/x8b.php
index 0a535f724..2cdc115ef 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x8b.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x8b.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'mou', 'ye', 'wei', 'xing', 'teng', 'zhou', 'shan', 'jian', 'po', 'kui', 'huang', 'huo', 'ge', 'ying', 'mi', 'xiao',
   0x10 => 'mi', 'xi', 'qiang', 'chen', 'xue', 'ti', 'su', 'bang', 'chi', 'qian', 'shi', 'jiang', 'yuan', 'xie', 'he', 'tao',
   0x20 => 'yao', 'yao', 'zhi', 'yu', 'biao', 'cong', 'qing', 'li', 'mo', 'mo', 'shang', 'zhe', 'miu', 'jian', 'ze', 'jie',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'bi', 'yi', 'yi', 'kuang', 'lei', 'shi', 'gua', 'shi', 'ji', 'hui', 'cheng', 'zhu', 'shen', 'hua', 'dan', 'gou',
   0xE0 => 'quan', 'gui', 'xun', 'yi', 'zheng', 'gai', 'xiang', 'cha', 'hun', 'xu', 'zhou', 'jie', 'wu', 'yu', 'qiao', 'wu',
   0xF0 => 'gao', 'you', 'hui', 'kuang', 'shuo', 'song', 'ei', 'qing', 'zhu', 'zou', 'nuo', 'du', 'zhuo', 'fei', 'ke', 'wei',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x8c.php b/web/core/lib/Drupal/Component/Transliteration/data/x8c.php
index 5e805ad21..8b3d3baae 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x8c.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x8c.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yu', 'shui', 'shen', 'diao', 'chan', 'liang', 'zhun', 'sui', 'tan', 'shen', 'yi', 'mou', 'chen', 'die', 'huang', 'jian',
   0x10 => 'xie', 'xue', 'ye', 'wei', 'e', 'yu', 'xuan', 'chan', 'zi', 'an', 'yan', 'di', 'mi', 'pian', 'xu', 'mo',
   0x20 => 'dang', 'su', 'xie', 'yao', 'bang', 'shi', 'qian', 'mi', 'jin', 'man', 'zhe', 'jian', 'miu', 'tan', 'zen', 'qiao',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'xun', 'zhen', 'she', 'bin', 'bin', 'qiu', 'she', 'chuan', 'zang', 'zhou', 'lai', 'zan', 'ci', 'chen', 'shang', 'tian',
   0xE0 => 'pei', 'geng', 'xian', 'mai', 'jian', 'sui', 'fu', 'tan', 'cong', 'cong', 'zhi', 'ji', 'zhang', 'du', 'jin', 'xiong',
   0xF0 => 'chun', 'yun', 'bao', 'zai', 'lai', 'feng', 'cang', 'ji', 'sheng', 'yi', 'zhuan', 'fu', 'gou', 'sai', 'ze', 'liao',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x8d.php b/web/core/lib/Drupal/Component/Transliteration/data/x8d.php
index c4b869515..07fc8d7fa 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x8d.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x8d.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yi', 'bai', 'chen', 'wan', 'zhi', 'zhui', 'biao', 'yun', 'zeng', 'dan', 'zan', 'yan', 'pu', 'shan', 'wan', 'ying',
   0x10 => 'jin', 'gan', 'xian', 'zang', 'bi', 'du', 'shu', 'yan', 'shang', 'xuan', 'long', 'gan', 'zang', 'bei', 'zhen', 'fu',
   0x20 => 'yuan', 'gong', 'cai', 'ze', 'xian', 'bai', 'zhang', 'huo', 'zhi', 'fan', 'tan', 'pin', 'bian', 'gou', 'zhu', 'guan',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ci', 'pao', 'qia', 'zhu', 'ju', 'dian', 'zhi', 'fu', 'pan', 'ju', 'shan', 'bo', 'ni', 'ju', 'li', 'gen',
   0xE0 => 'yi', 'ji', 'duo', 'xian', 'jiao', 'duo', 'zhu', 'quan', 'kua', 'zhuai', 'gui', 'qiong', 'kui', 'xiang', 'chi', 'lu',
   0xF0 => 'pian', 'zhi', 'jia', 'tiao', 'cai', 'jian', 'ta', 'qiao', 'bi', 'xian', 'duo', 'ji', 'ju', 'ji', 'shu', 'tu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x8e.php b/web/core/lib/Drupal/Component/Transliteration/data/x8e.php
index 80ef740c9..c48ec1da8 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x8e.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x8e.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'chu', 'jing', 'nie', 'xiao', 'bu', 'xue', 'cun', 'mu', 'shu', 'liang', 'yong', 'jiao', 'chou', 'qiao', 'mou', 'ta',
   0x10 => 'jian', 'qi', 'wo', 'wei', 'chuo', 'jie', 'ji', 'nie', 'ju', 'ju', 'lun', 'lu', 'leng', 'huai', 'ju', 'chi',
   0x20 => 'wan', 'quan', 'ti', 'bo', 'zu', 'qie', 'yi', 'cu', 'zong', 'cai', 'zong', 'peng', 'zhi', 'zheng', 'dian', 'zhi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'xin', 'dai', 'xuan', 'fan', 'ren', 'shan', 'kuang', 'shu', 'tun', 'chen', 'dai', 'e', 'na', 'qi', 'mao', 'ruan',
   0xE0 => 'ren', 'qian', 'zhuan', 'hong', 'hu', 'qu', 'kuang', 'di', 'ling', 'dai', 'ao', 'zhen', 'fan', 'kuang', 'yang', 'peng',
   0xF0 => 'bei', 'gu', 'gu', 'pao', 'zhu', 'rong', 'e', 'ba', 'zhou', 'zhi', 'yao', 'ke', 'yi', 'zhi', 'shi', 'ping',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x8f.php b/web/core/lib/Drupal/Component/Transliteration/data/x8f.php
index a4cd21b3a..e7185a9c0 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x8f.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x8f.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'er', 'gong', 'ju', 'jiao', 'guang', 'he', 'kai', 'quan', 'zhou', 'zai', 'zhi', 'she', 'liang', 'yu', 'shao', 'you',
   0x10 => 'wan', 'yin', 'zhe', 'wan', 'fu', 'qing', 'zhou', 'ni', 'leng', 'zhe', 'zhan', 'liang', 'zi', 'hui', 'wang', 'chuo',
   0x20 => 'guo', 'kan', 'yi', 'peng', 'qian', 'gun', 'nian', 'ping', 'guan', 'bei', 'lun', 'pai', 'liang', 'ruan', 'rou', 'ji',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'yun', 'jin', 'hang', 'ya', 'fan', 'wu', 'da', 'e', 'hai', 'zhe', 'zhong', 'jin', 'yuan', 'wei', 'lian', 'chi',
   0xE0 => 'che', 'ni', 'tiao', 'zhi', 'yi', 'jiong', 'jia', 'chen', 'dai', 'er', 'di', 'po', 'zhu', 'die', 'ze', 'tao',
   0xF0 => 'shu', 'tuo', 'qu', 'jing', 'hui', 'dong', 'you', 'mi', 'beng', 'ji', 'nai', 'yi', 'jie', 'zhui', 'lie', 'xun',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x90.php b/web/core/lib/Drupal/Component/Transliteration/data/x90.php
index e2a817ba7..97821c452 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x90.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x90.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'tui', 'song', 'shi', 'tao', 'pang', 'hou', 'ni', 'dun', 'jiong', 'xuan', 'xun', 'bu', 'you', 'xiao', 'qiu', 'tou',
   0x10 => 'zhu', 'qiu', 'di', 'di', 'tu', 'jing', 'ti', 'dou', 'yi', 'zhe', 'tong', 'guang', 'wu', 'shi', 'cheng', 'su',
   0x20 => 'zao', 'qun', 'feng', 'lian', 'suo', 'hui', 'li', 'gu', 'lai', 'ben', 'cuo', 'jue', 'beng', 'huan', 'dai', 'lu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'kuai', 'zheng', 'lang', 'yun', 'yan', 'cheng', 'dou', 'xi', 'lu', 'fu', 'wu', 'fu', 'gao', 'hao', 'lang', 'jia',
   0xE0 => 'geng', 'jun', 'ying', 'bo', 'xi', 'bei', 'li', 'yun', 'bu', 'xiao', 'qi', 'pi', 'qing', 'guo', 'zhou', 'tan',
   0xF0 => 'zou', 'ping', 'lai', 'ni', 'chen', 'you', 'bu', 'xiang', 'dan', 'ju', 'yong', 'qiao', 'yi', 'dou', 'yan', 'mei',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x91.php b/web/core/lib/Drupal/Component/Transliteration/data/x91.php
index 2de4466a4..4f1058266 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x91.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x91.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ruo', 'bei', 'e', 'shu', 'juan', 'yu', 'yun', 'hou', 'kui', 'xiang', 'xiang', 'sou', 'tang', 'ming', 'xi', 'ru',
   0x10 => 'chu', 'zi', 'zou', 'ye', 'wu', 'xiang', 'yun', 'hao', 'yong', 'bi', 'mao', 'chao', 'fu', 'liao', 'yin', 'zhuan',
   0x20 => 'hu', 'qiao', 'yan', 'zhang', 'man', 'qiao', 'xu', 'deng', 'bi', 'xun', 'bi', 'zeng', 'wei', 'zheng', 'mao', 'shan',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'li', 'jin', 'jin', 'qiu', 'yi', 'liao', 'dao', 'zhao', 'ding', 'po', 'qiu', 'ba', 'fu', 'zhen', 'zhi', 'ba',
   0xE0 => 'luan', 'fu', 'nai', 'diao', 'shan', 'qiao', 'kou', 'chuan', 'zi', 'fan', 'hua', 'hua', 'han', 'gang', 'qi', 'mang',
   0xF0 => 'ri', 'di', 'si', 'xi', 'yi', 'chai', 'shi', 'tu', 'xi', 'nu', 'qian', 'qiu', 'jian', 'pi', 'ye', 'jin',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x92.php b/web/core/lib/Drupal/Component/Transliteration/data/x92.php
index 037b461c6..2602bf68f 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x92.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x92.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ba', 'fang', 'chen', 'xing', 'dou', 'yue', 'qian', 'fu', 'pi', 'na', 'xin', 'e', 'jue', 'dun', 'gou', 'yin',
   0x10 => 'qian', 'ban', 'sa', 'ren', 'chao', 'niu', 'fen', 'yun', 'ji', 'qin', 'pi', 'guo', 'hong', 'yin', 'jun', 'shi',
   0x20 => 'yi', 'zhong', 'xi', 'gai', 'ri', 'huo', 'tai', 'kang', 'yuan', 'lu', 'e', 'wen', 'duo', 'zi', 'ni', 'tu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'hong', 'cuan', 'feng', 'chan', 'wan', 'zhi', 'si', 'xuan', 'hua', 'yu', 'tiao', 'gong', 'zhuo', 'lue', 'xing', 'qin',
   0xE0 => 'shen', 'han', 'lue', 'ye', 'chu', 'zeng', 'ju', 'xian', 'tie', 'mang', 'pu', 'li', 'pan', 'rui', 'cheng', 'gao',
   0xF0 => 'li', 'te', 'bing', 'zhu', 'zhen', 'tu', 'liu', 'zui', 'ju', 'chang', 'yuan', 'jian', 'gang', 'diao', 'tao', 'chang',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x93.php b/web/core/lib/Drupal/Component/Transliteration/data/x93.php
index 34928a9d1..cecc3174f 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x93.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x93.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'lun', 'guo', 'ling', 'bei', 'lu', 'li', 'qiang', 'pou', 'juan', 'min', 'zui', 'peng', 'an', 'pi', 'xian', 'ya',
   0x10 => 'zhui', 'lei', 'ke', 'kong', 'ta', 'kun', 'du', 'nei', 'chui', 'zi', 'zheng', 'ben', 'nie', 'zong', 'chun', 'tan',
   0x20 => 'ding', 'qi', 'qian', 'zhui', 'ji', 'yu', 'jin', 'guan', 'mao', 'chang', 'tian', 'xi', 'lian', 'tao', 'gu', 'cuo',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'liu', 'di', 'san', 'zong', 'yi', 'lu', 'ao', 'keng', 'qiang', 'cui', 'qi', 'chang', 'tang', 'man', 'yong', 'chan',
   0xE0 => 'feng', 'jing', 'biao', 'shu', 'lou', 'xiu', 'cong', 'long', 'zan', 'jian', 'cao', 'li', 'xia', 'xi', 'kang', 'shuang',
   0xF0 => 'beng', 'zhang', 'qian', 'cheng', 'lu', 'hua', 'ji', 'pu', 'hui', 'qiang', 'po', 'lin', 'se', 'xiu', 'san', 'cheng',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x94.php b/web/core/lib/Drupal/Component/Transliteration/data/x94.php
index 9763fbcc7..1bb228ac7 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x94.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x94.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'kui', 'si', 'liu', 'nao', 'huang', 'pie', 'sui', 'fan', 'qiao', 'quan', 'yang', 'tang', 'xiang', 'jue', 'jiao', 'zun',
   0x10 => 'liao', 'qie', 'lao', 'dui', 'xin', 'zan', 'ji', 'jian', 'zhong', 'deng', 'ya', 'ying', 'dui', 'jue', 'nou', 'zan',
   0x20 => 'pu', 'tie', 'fan', 'zhang', 'ding', 'shan', 'kai', 'jian', 'fei', 'sui', 'lu', 'juan', 'hui', 'yu', 'lian', 'zhuo',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'kao', 'lao', 'er', 'mang', 'ya', 'you', 'cheng', 'jia', 'ye', 'nao', 'zhi', 'dang', 'tong', 'lu', 'diao', 'yin',
   0xE0 => 'kai', 'zha', 'zhu', 'xi', 'ding', 'diu', 'xian', 'hua', 'quan', 'sha', 'ha', 'diao', 'ge', 'ming', 'zheng', 'se',
   0xF0 => 'jiao', 'yi', 'chan', 'chong', 'tang', 'an', 'yin', 'ru', 'zhu', 'lao', 'pu', 'wu', 'lai', 'te', 'lian', 'keng',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x95.php b/web/core/lib/Drupal/Component/Transliteration/data/x95.php
index 84f2f89af..fc95f3641 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x95.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x95.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'xiao', 'suo', 'li', 'zeng', 'chu', 'guo', 'gao', 'e', 'xiu', 'cuo', 'lue', 'feng', 'xin', 'liu', 'kai', 'jian',
   0x10 => 'rui', 'ti', 'lang', 'qin', 'ju', 'a', 'qiang', 'zhe', 'nuo', 'cuo', 'mao', 'ben', 'qi', 'de', 'ke', 'kun',
   0x20 => 'chang', 'xi', 'gu', 'luo', 'chui', 'zhui', 'jin', 'zhi', 'xian', 'juan', 'huo', 'pei', 'tan', 'ding', 'jian', 'ju',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'tian', 'nie', 'ta', 'kai', 'he', 'que', 'chuang', 'guan', 'dou', 'qi', 'kui', 'tang', 'guan', 'piao', 'kan', 'xi',
   0xE0 => 'hui', 'chan', 'pi', 'dang', 'huan', 'ta', 'wen', 'ta', 'men', 'shuan', 'shan', 'yan', 'han', 'bi', 'wen', 'chuang',
   0xF0 => 'run', 'wei', 'xian', 'hong', 'jian', 'min', 'kang', 'men', 'zha', 'nao', 'gui', 'wen', 'ta', 'min', 'lu', 'kai',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x96.php b/web/core/lib/Drupal/Component/Transliteration/data/x96.php
index f665409c7..7f62e4788 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x96.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x96.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'fa', 'ge', 'he', 'kun', 'jiu', 'yue', 'lang', 'du', 'yu', 'yan', 'chang', 'xi', 'wen', 'hun', 'yan', 'e',
   0x10 => 'chan', 'lan', 'qu', 'hui', 'kuo', 'que', 'he', 'tian', 'da', 'que', 'han', 'huan', 'fu', 'fu', 'le', 'dui',
   0x20 => 'xin', 'qian', 'wu', 'gai', 'zhi', 'yin', 'yang', 'dou', 'e', 'sheng', 'ban', 'pei', 'keng', 'yun', 'ruan', 'zhi',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'hu', 'za', 'luo', 'yu', 'chou', 'diao', 'sui', 'han', 'wo', 'shuang', 'guan', 'chu', 'za', 'yong', 'ji', 'xi',
   0xE0 => 'chou', 'liu', 'li', 'nan', 'xue', 'za', 'ji', 'ji', 'yu', 'yu', 'xue', 'na', 'fou', 'se', 'mu', 'wen',
   0xF0 => 'fen', 'pang', 'yun', 'li', 'chi', 'yang', 'ling', 'lei', 'an', 'bao', 'wu', 'dian', 'dang', 'hu', 'wu', 'diao',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x97.php b/web/core/lib/Drupal/Component/Transliteration/data/x97.php
index 1187fbb78..f9296c7be 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x97.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x97.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'xu', 'ji', 'mu', 'chen', 'xiao', 'zha', 'ting', 'zhen', 'pei', 'mei', 'ling', 'qi', 'zhou', 'huo', 'sha', 'fei',
   0x10 => 'hong', 'zhan', 'yin', 'ni', 'zhu', 'tun', 'lin', 'ling', 'dong', 'ying', 'wu', 'ling', 'shuang', 'ling', 'xia', 'hong',
   0x20 => 'yin', 'mai', 'mai', 'yun', 'liu', 'meng', 'bin', 'wu', 'wei', 'kuo', 'yin', 'xi', 'yi', 'ai', 'dan', 'teng',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ge', 'wei', 'qiao', 'han', 'chang', 'kuo', 'rou', 'yun', 'she', 'wei', 'ge', 'bai', 'tao', 'gou', 'yun', 'gao',
   0xE0 => 'bi', 'wei', 'sui', 'du', 'wa', 'du', 'wei', 'ren', 'fu', 'han', 'wei', 'yun', 'tao', 'jiu', 'jiu', 'xian',
   0xF0 => 'xie', 'xian', 'ji', 'yin', 'za', 'yun', 'shao', 'le', 'peng', 'huang', 'ying', 'yun', 'peng', 'an', 'yin', 'xiang',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x98.php b/web/core/lib/Drupal/Component/Transliteration/data/x98.php
index 8e1ff9251..cb1ec6aa3 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x98.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x98.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'hu', 'ye', 'ding', 'qing', 'kui', 'xiang', 'shun', 'han', 'xu', 'yi', 'xu', 'e', 'song', 'kui', 'qi', 'hang',
   0x10 => 'yu', 'wan', 'ban', 'dun', 'di', 'dan', 'pan', 'po', 'ling', 'che', 'jing', 'lei', 'he', 'qiao', 'e', 'e',
   0x20 => 'wei', 'xie', 'kuo', 'shen', 'yi', 'shen', 'hai', 'dui', 'yu', 'ping', 'lei', 'fu', 'jia', 'tou', 'hui', 'kui',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'zhan', 'biao', 'sa', 'ju', 'si', 'sou', 'yao', 'liu', 'piao', 'biao', 'biao', 'fei', 'fan', 'fei', 'fei', 'shi',
   0xE0 => 'shi', 'can', 'ji', 'ding', 'si', 'tuo', 'zhan', 'sun', 'xiang', 'tun', 'ren', 'yu', 'juan', 'chi', 'yin', 'fan',
   0xF0 => 'fan', 'sun', 'yin', 'tou', 'yi', 'zuo', 'bi', 'jie', 'tao', 'liu', 'ci', 'tie', 'si', 'bao', 'shi', 'duo',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x99.php b/web/core/lib/Drupal/Component/Transliteration/data/x99.php
index 7e99ac0c0..6f6fb47f8 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x99.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x99.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'hai', 'ren', 'tian', 'jiao', 'jia', 'bing', 'yao', 'tong', 'ci', 'xiang', 'yang', 'juan', 'er', 'yan', 'le', 'xi',
   0x10 => 'can', 'bo', 'nei', 'e', 'bu', 'jun', 'dou', 'su', 'yu', 'shi', 'yao', 'hun', 'guo', 'shi', 'jian', 'zhui',
   0x20 => 'bing', 'xian', 'bu', 'ye', 'tan', 'fei', 'zhang', 'wei', 'guan', 'e', 'nuan', 'yun', 'hu', 'huang', 'tie', 'hui',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'zhu', 'nu', 'ju', 'pi', 'zang', 'jia', 'ling', 'zhen', 'tai', 'fu', 'yang', 'shi', 'bi', 'tuo', 'tuo', 'si',
   0xE0 => 'liu', 'ma', 'pian', 'tao', 'zhi', 'rong', 'teng', 'dong', 'xun', 'quan', 'shen', 'jiong', 'er', 'hai', 'bo', 'zhu',
   0xF0 => 'yin', 'luo', 'zhou', 'dan', 'xie', 'liu', 'ju', 'song', 'qin', 'mang', 'lang', 'han', 'tu', 'xuan', 'tui', 'jun',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x9a.php b/web/core/lib/Drupal/Component/Transliteration/data/x9a.php
index 3c8554043..cd576596c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x9a.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x9a.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'e', 'cheng', 'xing', 'ai', 'lu', 'zhui', 'zhou', 'she', 'pian', 'kun', 'tao', 'lai', 'zong', 'ke', 'qi', 'qi',
   0x10 => 'yan', 'fei', 'sao', 'yan', 'ge', 'yao', 'wu', 'pian', 'cong', 'pian', 'qian', 'fei', 'huang', 'qian', 'huo', 'yu',
   0x20 => 'ti', 'quan', 'xia', 'zong', 'kui', 'rou', 'si', 'gua', 'tuo', 'gui', 'sou', 'qian', 'cheng', 'zhi', 'liu', 'peng',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'xiao', 'du', 'zang', 'sui', 'ti', 'bin', 'kuan', 'lu', 'gao', 'gao', 'qiao', 'kao', 'qiao', 'lao', 'sao', 'biao',
   0xE0 => 'kun', 'kun', 'di', 'fang', 'xiu', 'ran', 'mao', 'dan', 'kun', 'bin', 'fa', 'tiao', 'pi', 'zi', 'fa', 'ran',
   0xF0 => 'ti', 'bao', 'bi', 'mao', 'fu', 'er', 'rong', 'qu', 'gong', 'xiu', 'kuo', 'ji', 'peng', 'zhua', 'shao', 'suo',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x9b.php b/web/core/lib/Drupal/Component/Transliteration/data/x9b.php
index 9617f9745..2cbbd7eaf 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x9b.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x9b.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ti', 'li', 'bin', 'zong', 'di', 'peng', 'song', 'zheng', 'quan', 'zong', 'shun', 'jian', 'tuo', 'hu', 'la', 'jiu',
   0x10 => 'qi', 'lian', 'zhen', 'bin', 'peng', 'ma', 'san', 'man', 'man', 'seng', 'xu', 'lie', 'qian', 'qian', 'nang', 'huan',
   0x20 => 'kuo', 'ning', 'bin', 'lie', 'rang', 'dou', 'dou', 'nao', 'hong', 'xi', 'dou', 'han', 'dou', 'dou', 'jiu', 'chang',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'zou', 'xi', 'yong', 'ni', 'zi', 'qi', 'zheng', 'xiang', 'nei', 'chun', 'ji', 'diao', 'qie', 'gu', 'zhou', 'dong',
   0xE0 => 'lai', 'fei', 'ni', 'yi', 'kun', 'lu', 'jiu', 'chang', 'jing', 'lun', 'ling', 'zou', 'li', 'meng', 'zong', 'zhi',
   0xF0 => 'nian', 'hu', 'yu', 'di', 'shi', 'shen', 'hun', 'ti', 'hou', 'xing', 'zhu', 'la', 'zong', 'zei', 'bian', 'bian',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x9c.php b/web/core/lib/Drupal/Component/Transliteration/data/x9c.php
index 76be43eb3..4ca423cb1 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x9c.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x9c.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'huan', 'quan', 'zei', 'wei', 'wei', 'yu', 'chun', 'rou', 'die', 'huang', 'lian', 'yan', 'qiu', 'qiu', 'jian', 'bi',
   0x10 => 'e', 'yang', 'fu', 'sai', 'gan', 'xia', 'tuo', 'hu', 'shi', 'ruo', 'xuan', 'wen', 'qian', 'hao', 'wu', 'fang',
   0x20 => 'sao', 'liu', 'ma', 'shi', 'shi', 'guan', 'zi', 'teng', 'ta', 'yao', 'e', 'yong', 'qian', 'qi', 'wen', 'ruo',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'yao', 'pang', 'jian', 'le', 'biao', 'xue', 'bie', 'man', 'min', 'yong', 'wei', 'xi', 'gui', 'shan', 'lin', 'zun',
   0xE0 => 'hu', 'gan', 'li', 'zhan', 'guan', 'niao', 'yi', 'fu', 'li', 'jiu', 'bu', 'yan', 'fu', 'diao', 'ji', 'feng',
   0xF0 => 'ru', 'gan', 'shi', 'feng', 'ming', 'bao', 'yuan', 'zhi', 'hu', 'qin', 'fu', 'ban', 'wen', 'jian', 'shi', 'yu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x9d.php b/web/core/lib/Drupal/Component/Transliteration/data/x9d.php
index 21e997732..d3b4d78c9 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x9d.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x9d.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'fou', 'yao', 'jue', 'jue', 'pi', 'huan', 'zhen', 'bao', 'yan', 'ya', 'zheng', 'fang', 'feng', 'wen', 'ou', 'dai',
   0x10 => 'ge', 'ru', 'ling', 'mie', 'fu', 'tuo', 'min', 'li', 'bian', 'zhi', 'ge', 'yuan', 'ci', 'qu', 'xiao', 'chi',
   0x20 => 'dan', 'ju', 'yao', 'gu', 'dong', 'yu', 'yang', 'rong', 'ya', 'tie', 'yu', 'tian', 'ying', 'dui', 'wu', 'er',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'chen', 'ji', 'tuan', 'zhe', 'ao', 'yao', 'yi', 'ou', 'chi', 'zhi', 'liu', 'yong', 'lu', 'bi', 'shuang', 'zhuo',
   0xE0 => 'yu', 'wu', 'jue', 'yin', 'ti', 'si', 'jiao', 'yi', 'hua', 'bi', 'ying', 'su', 'huang', 'fan', 'jiao', 'liao',
   0xF0 => 'yan', 'gao', 'jiu', 'xian', 'xian', 'tu', 'mai', 'zun', 'yu', 'ying', 'lu', 'tuan', 'xian', 'xue', 'yi', 'pi',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x9e.php b/web/core/lib/Drupal/Component/Transliteration/data/x9e.php
index b50dd0fe3..db7e7f04e 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x9e.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x9e.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'chu', 'luo', 'xi', 'yi', 'ji', 'ze', 'yu', 'zhan', 'ye', 'yang', 'pi', 'ning', 'hu', 'mi', 'ying', 'meng',
   0x10 => 'di', 'yue', 'yu', 'lei', 'bao', 'lu', 'he', 'long', 'shuang', 'yue', 'ying', 'guan', 'qu', 'li', 'luan', 'niao',
   0x20 => 'jiu', 'ji', 'yuan', 'ming', 'shi', 'ou', 'ya', 'cang', 'bao', 'zhen', 'gu', 'dong', 'lu', 'ya', 'xiao', 'yang',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'chi', 'hei', 'hei', 'yi', 'qian', 'dan', 'xi', 'tun', 'mo', 'mo', 'qian', 'dai', 'chu', 'you', 'dian', 'yi',
   0xE0 => 'xia', 'yan', 'qu', 'mei', 'yan', 'qing', 'yue', 'li', 'dang', 'du', 'can', 'yan', 'yan', 'yan', 'dan', 'an',
   0xF0 => 'zhen', 'dai', 'can', 'yi', 'mei', 'zhan', 'yan', 'du', 'lu', 'zhi', 'fen', 'fu', 'fu', 'mian', 'mian', 'yuan',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/x9f.php b/web/core/lib/Drupal/Component/Transliteration/data/x9f.php
index 49f08e5ab..13ecd6e82 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/x9f.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/x9f.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'cu', 'qu', 'chao', 'wa', 'zhu', 'zhi', 'meng', 'ao', 'bie', 'tuo', 'bi', 'yuan', 'chao', 'tuo', 'ding', 'mi',
   0x10 => 'nai', 'ding', 'zi', 'gu', 'gu', 'dong', 'fen', 'tao', 'yuan', 'pi', 'chang', 'gao', 'qi', 'yuan', 'tang', 'teng',
   0x20 => 'shu', 'shu', 'fen', 'fei', 'wen', 'ba', 'diao', 'tuo', 'zhong', 'qu', 'sheng', 'shi', 'you', 'shi', 'ting', 'wu',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xa0.php b/web/core/lib/Drupal/Component/Transliteration/data/xa0.php
index b7fee6243..ca55187fe 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xa0.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xa0.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'it', 'ix', 'i', 'ip', 'iet', 'iex', 'ie', 'iep', 'at', 'ax', 'a', 'ap', 'uox', 'uo', 'uop', 'ot',
   0x10 => 'ox', 'o', 'op', 'ex', 'e', 'wu', 'bit', 'bix', 'bi', 'bip', 'biet', 'biex', 'bie', 'biep', 'bat', 'bax',
   0x20 => 'ba', 'bap', 'buox', 'buo', 'buop', 'bot', 'box', 'bo', 'bop', 'bex', 'be', 'bep', 'but', 'bux', 'bu', 'bup',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'fip', 'fat', 'fax', 'fa', 'fap', 'fox', 'fo', 'fop', 'fut', 'fux', 'fu', 'fup', 'furx', 'fur', 'fyt', 'fyx',
   0xE0 => 'fy', 'fyp', 'vit', 'vix', 'vi', 'vip', 'viet', 'viex', 'vie', 'viep', 'vat', 'vax', 'va', 'vap', 'vot', 'vox',
   0xF0 => 'vo', 'vop', 'vex', 'vep', 'vut', 'vux', 'vu', 'vup', 'vurx', 'vur', 'vyt', 'vyx', 'vy', 'vyp', 'vyrx', 'vyr',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xa1.php b/web/core/lib/Drupal/Component/Transliteration/data/xa1.php
index 66cc4466e..19ca96ec0 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xa1.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xa1.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'dit', 'dix', 'di', 'dip', 'diex', 'die', 'diep', 'dat', 'dax', 'da', 'dap', 'duox', 'duo', 'dot', 'dox', 'do',
   0x10 => 'dop', 'dex', 'de', 'dep', 'dut', 'dux', 'du', 'dup', 'durx', 'dur', 'tit', 'tix', 'ti', 'tip', 'tiex', 'tie',
   0x20 => 'tiep', 'tat', 'tax', 'ta', 'tap', 'tuot', 'tuox', 'tuo', 'tuop', 'tot', 'tox', 'to', 'top', 'tex', 'te', 'tep',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'lu', 'lup', 'lurx', 'lur', 'lyt', 'lyx', 'ly', 'lyp', 'lyrx', 'lyr', 'git', 'gix', 'gi', 'gip', 'giet', 'giex',
   0xE0 => 'gie', 'giep', 'gat', 'gax', 'ga', 'gap', 'guot', 'guox', 'guo', 'guop', 'got', 'gox', 'go', 'gop', 'get', 'gex',
   0xF0 => 'ge', 'gep', 'gut', 'gux', 'gu', 'gup', 'gurx', 'gur', 'kit', 'kix', 'ki', 'kip', 'kiex', 'kie', 'kiep', 'kat',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xa2.php b/web/core/lib/Drupal/Component/Transliteration/data/xa2.php
index 95d4c8c6e..0603d5fb9 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xa2.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xa2.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'kax', 'ka', 'kap', 'kuox', 'kuo', 'kuop', 'kot', 'kox', 'ko', 'kop', 'ket', 'kex', 'ke', 'kep', 'kut', 'kux',
   0x10 => 'ku', 'kup', 'kurx', 'kur', 'ggit', 'ggix', 'ggi', 'ggiex', 'ggie', 'ggiep', 'ggat', 'ggax', 'gga', 'ggap', 'gguot', 'gguox',
   0x20 => 'gguo', 'gguop', 'ggot', 'ggox', 'ggo', 'ggop', 'gget', 'ggex', 'gge', 'ggep', 'ggut', 'ggux', 'ggu', 'ggup', 'ggurx', 'ggur',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'zzit', 'zzix', 'zzi', 'zzip', 'zziet', 'zziex', 'zzie', 'zziep', 'zzat', 'zzax', 'zza', 'zzap', 'zzox', 'zzo', 'zzop', 'zzex',
   0xE0 => 'zze', 'zzep', 'zzux', 'zzu', 'zzup', 'zzurx', 'zzur', 'zzyt', 'zzyx', 'zzy', 'zzyp', 'zzyrx', 'zzyr', 'nzit', 'nzix', 'nzi',
   0xF0 => 'nzip', 'nziex', 'nzie', 'nziep', 'nzat', 'nzax', 'nza', 'nzap', 'nzuox', 'nzuo', 'nzox', 'nzop', 'nzex', 'nze', 'nzux', 'nzu',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xa3.php b/web/core/lib/Drupal/Component/Transliteration/data/xa3.php
index a63b28159..207736f93 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xa3.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xa3.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'nzup', 'nzurx', 'nzur', 'nzyt', 'nzyx', 'nzy', 'nzyp', 'nzyrx', 'nzyr', 'sit', 'six', 'si', 'sip', 'siex', 'sie', 'siep',
   0x10 => 'sat', 'sax', 'sa', 'sap', 'suox', 'suo', 'suop', 'sot', 'sox', 'so', 'sop', 'sex', 'se', 'sep', 'sut', 'sux',
   0x20 => 'su', 'sup', 'surx', 'sur', 'syt', 'syx', 'sy', 'syp', 'syrx', 'syr', 'ssit', 'ssix', 'ssi', 'ssip', 'ssiex', 'ssie',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'rop', 'rex', 're', 'rep', 'rut', 'rux', 'ru', 'rup', 'rurx', 'rur', 'ryt', 'ryx', 'ry', 'ryp', 'ryrx', 'ryr',
   0xE0 => 'jit', 'jix', 'ji', 'jip', 'jiet', 'jiex', 'jie', 'jiep', 'juot', 'juox', 'juo', 'juop', 'jot', 'jox', 'jo', 'jop',
   0xF0 => 'jut', 'jux', 'ju', 'jup', 'jurx', 'jur', 'jyt', 'jyx', 'jy', 'jyp', 'jyrx', 'jyr', 'qit', 'qix', 'qi', 'qip',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xa4.php b/web/core/lib/Drupal/Component/Transliteration/data/xa4.php
index 2210454a8..736b03ca2 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xa4.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xa4.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'qiet', 'qiex', 'qie', 'qiep', 'quot', 'quox', 'quo', 'quop', 'qot', 'qox', 'qo', 'qop', 'qut', 'qux', 'qu', 'qup',
   0x10 => 'qurx', 'qur', 'qyt', 'qyx', 'qy', 'qyp', 'qyrx', 'qyr', 'jjit', 'jjix', 'jji', 'jjip', 'jjiet', 'jjiex', 'jjie', 'jjiep',
   0x20 => 'jjuox', 'jjuo', 'jjuop', 'jjot', 'jjox', 'jjo', 'jjop', 'jjut', 'jjux', 'jju', 'jjup', 'jjurx', 'jjur', 'jjyt', 'jjyx', 'jjy',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xac.php b/web/core/lib/Drupal/Component/Transliteration/data/xac.php
index 87c2d1438..7ece9df04 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xac.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xac.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ga', 'gag', 'gakk', 'gags', 'gan', 'ganj', 'ganh', 'gad', 'gal', 'galg', 'galm', 'galb', 'gals', 'galt', 'galp', 'galh',
   0x10 => 'gam', 'gab', 'gabs', 'gas', 'gass', 'gang', 'gaj', 'gach', 'gak', 'gat', 'gap', 'gah', 'gae', 'gaeg', 'gaekk', 'gaegs',
   0x20 => 'gaen', 'gaenj', 'gaenh', 'gaed', 'gael', 'gaelg', 'gaelm', 'gaelb', 'gaels', 'gaelt', 'gaelp', 'gaelh', 'gaem', 'gaeb', 'gaebs', 'gaes',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'gyels', 'gyelt', 'gyelp', 'gyelh', 'gyem', 'gyeb', 'gyebs', 'gyes', 'gyess', 'gyeng', 'gyej', 'gyech', 'gyek', 'gyet', 'gyep', 'gyeh',
   0xE0 => 'go', 'gog', 'gokk', 'gogs', 'gon', 'gonj', 'gonh', 'god', 'gol', 'golg', 'golm', 'golb', 'gols', 'golt', 'golp', 'golh',
   0xF0 => 'gom', 'gob', 'gobs', 'gos', 'goss', 'gong', 'goj', 'goch', 'gok', 'got', 'gop', 'goh', 'gwa', 'gwag', 'gwakk', 'gwags',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xad.php b/web/core/lib/Drupal/Component/Transliteration/data/xad.php
index 4e8eb27d2..8dd61dee9 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xad.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xad.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'gwan', 'gwanj', 'gwanh', 'gwad', 'gwal', 'gwalg', 'gwalm', 'gwalb', 'gwals', 'gwalt', 'gwalp', 'gwalh', 'gwam', 'gwab', 'gwabs', 'gwas',
   0x10 => 'gwass', 'gwang', 'gwaj', 'gwach', 'gwak', 'gwat', 'gwap', 'gwah', 'gwae', 'gwaeg', 'gwaekk', 'gwaegs', 'gwaen', 'gwaenj', 'gwaenh', 'gwaed',
   0x20 => 'gwael', 'gwaelg', 'gwaelm', 'gwaelb', 'gwaels', 'gwaelt', 'gwaelp', 'gwaelh', 'gwaem', 'gwaeb', 'gwaebs', 'gwaes', 'gwaess', 'gwaeng', 'gwaej', 'gwaech',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'gwim', 'gwib', 'gwibs', 'gwis', 'gwiss', 'gwing', 'gwij', 'gwich', 'gwik', 'gwit', 'gwip', 'gwih', 'gyu', 'gyug', 'gyukk', 'gyugs',
   0xE0 => 'gyun', 'gyunj', 'gyunh', 'gyud', 'gyul', 'gyulg', 'gyulm', 'gyulb', 'gyuls', 'gyult', 'gyulp', 'gyulh', 'gyum', 'gyub', 'gyubs', 'gyus',
   0xF0 => 'gyuss', 'gyung', 'gyuj', 'gyuch', 'gyuk', 'gyut', 'gyup', 'gyuh', 'geu', 'geug', 'geukk', 'geugs', 'geun', 'geunj', 'geunh', 'geud',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xae.php b/web/core/lib/Drupal/Component/Transliteration/data/xae.php
index 52f7f5c40..1584a5c01 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xae.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xae.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'geul', 'geulg', 'geulm', 'geulb', 'geuls', 'geult', 'geulp', 'geulh', 'geum', 'geub', 'geubs', 'geus', 'geuss', 'geung', 'geuj', 'geuch',
   0x10 => 'geuk', 'geut', 'geup', 'geuh', 'gui', 'guig', 'guikk', 'guigs', 'guin', 'guinj', 'guinh', 'guid', 'guil', 'guilg', 'guilm', 'guilb',
   0x20 => 'guils', 'guilt', 'guilp', 'guilh', 'guim', 'guib', 'guibs', 'guis', 'guiss', 'guing', 'guij', 'guich', 'guik', 'guit', 'guip', 'guih',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'kkeoss', 'kkeong', 'kkeoj', 'kkeoch', 'kkeok', 'kkeot', 'kkeop', 'kkeoh', 'kke', 'kkeg', 'kkekk', 'kkegs', 'kken', 'kkenj', 'kkenh', 'kked',
   0xE0 => 'kkel', 'kkelg', 'kkelm', 'kkelb', 'kkels', 'kkelt', 'kkelp', 'kkelh', 'kkem', 'kkeb', 'kkebs', 'kkes', 'kkess', 'kkeng', 'kkej', 'kkech',
   0xF0 => 'kkek', 'kket', 'kkep', 'kkeh', 'kkyeo', 'kkyeog', 'kkyeokk', 'kkyeogs', 'kkyeon', 'kkyeonj', 'kkyeonh', 'kkyeod', 'kkyeol', 'kkyeolg', 'kkyeolm', 'kkyeolb',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xaf.php b/web/core/lib/Drupal/Component/Transliteration/data/xaf.php
index e5f37fe45..26c61c5cb 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xaf.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xaf.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'kkyeols', 'kkyeolt', 'kkyeolp', 'kkyeolh', 'kkyeom', 'kkyeob', 'kkyeobs', 'kkyeos', 'kkyeoss', 'kkyeong', 'kkyeoj', 'kkyeoch', 'kkyeok', 'kkyeot', 'kkyeop', 'kkyeoh',
   0x10 => 'kkye', 'kkyeg', 'kkyekk', 'kkyegs', 'kkyen', 'kkyenj', 'kkyenh', 'kkyed', 'kkyel', 'kkyelg', 'kkyelm', 'kkyelb', 'kkyels', 'kkyelt', 'kkyelp', 'kkyelh',
   0x20 => 'kkyem', 'kkyeb', 'kkyebs', 'kkyes', 'kkyess', 'kkyeng', 'kkyej', 'kkyech', 'kkyek', 'kkyet', 'kkyep', 'kkyeh', 'kko', 'kkog', 'kkokk', 'kkogs',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'kkuk', 'kkut', 'kkup', 'kkuh', 'kkwo', 'kkwog', 'kkwokk', 'kkwogs', 'kkwon', 'kkwonj', 'kkwonh', 'kkwod', 'kkwol', 'kkwolg', 'kkwolm', 'kkwolb',
   0xE0 => 'kkwols', 'kkwolt', 'kkwolp', 'kkwolh', 'kkwom', 'kkwob', 'kkwobs', 'kkwos', 'kkwoss', 'kkwong', 'kkwoj', 'kkwoch', 'kkwok', 'kkwot', 'kkwop', 'kkwoh',
   0xF0 => 'kkwe', 'kkweg', 'kkwekk', 'kkwegs', 'kkwen', 'kkwenj', 'kkwenh', 'kkwed', 'kkwel', 'kkwelg', 'kkwelm', 'kkwelb', 'kkwels', 'kkwelt', 'kkwelp', 'kkwelh',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xb0.php b/web/core/lib/Drupal/Component/Transliteration/data/xb0.php
index 96071fde9..0ebe37070 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xb0.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xb0.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'kkwem', 'kkweb', 'kkwebs', 'kkwes', 'kkwess', 'kkweng', 'kkwej', 'kkwech', 'kkwek', 'kkwet', 'kkwep', 'kkweh', 'kkwi', 'kkwig', 'kkwikk', 'kkwigs',
   0x10 => 'kkwin', 'kkwinj', 'kkwinh', 'kkwid', 'kkwil', 'kkwilg', 'kkwilm', 'kkwilb', 'kkwils', 'kkwilt', 'kkwilp', 'kkwilh', 'kkwim', 'kkwib', 'kkwibs', 'kkwis',
   0x20 => 'kkwiss', 'kkwing', 'kkwij', 'kkwich', 'kkwik', 'kkwit', 'kkwip', 'kkwih', 'kkyu', 'kkyug', 'kkyukk', 'kkyugs', 'kkyun', 'kkyunj', 'kkyunh', 'kkyud',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'nya', 'nyag', 'nyakk', 'nyags', 'nyan', 'nyanj', 'nyanh', 'nyad', 'nyal', 'nyalg', 'nyalm', 'nyalb', 'nyals', 'nyalt', 'nyalp', 'nyalh',
   0xE0 => 'nyam', 'nyab', 'nyabs', 'nyas', 'nyass', 'nyang', 'nyaj', 'nyach', 'nyak', 'nyat', 'nyap', 'nyah', 'nyae', 'nyaeg', 'nyaekk', 'nyaegs',
   0xF0 => 'nyaen', 'nyaenj', 'nyaenh', 'nyaed', 'nyael', 'nyaelg', 'nyaelm', 'nyaelb', 'nyaels', 'nyaelt', 'nyaelp', 'nyaelh', 'nyaem', 'nyaeb', 'nyaebs', 'nyaes',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xb1.php b/web/core/lib/Drupal/Component/Transliteration/data/xb1.php
index d90ecfce3..2f4d010cd 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xb1.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xb1.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'nyaess', 'nyaeng', 'nyaej', 'nyaech', 'nyaek', 'nyaet', 'nyaep', 'nyaeh', 'neo', 'neog', 'neokk', 'neogs', 'neon', 'neonj', 'neonh', 'neod',
   0x10 => 'neol', 'neolg', 'neolm', 'neolb', 'neols', 'neolt', 'neolp', 'neolh', 'neom', 'neob', 'neobs', 'neos', 'neoss', 'neong', 'neoj', 'neoch',
   0x20 => 'neok', 'neot', 'neop', 'neoh', 'ne', 'neg', 'nekk', 'negs', 'nen', 'nenj', 'nenh', 'ned', 'nel', 'nelg', 'nelm', 'nelb',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'noen', 'noenj', 'noenh', 'noed', 'noel', 'noelg', 'noelm', 'noelb', 'noels', 'noelt', 'noelp', 'noelh', 'noem', 'noeb', 'noebs', 'noes',
   0xE0 => 'noess', 'noeng', 'noej', 'noech', 'noek', 'noet', 'noep', 'noeh', 'nyo', 'nyog', 'nyokk', 'nyogs', 'nyon', 'nyonj', 'nyonh', 'nyod',
   0xF0 => 'nyol', 'nyolg', 'nyolm', 'nyolb', 'nyols', 'nyolt', 'nyolp', 'nyolh', 'nyom', 'nyob', 'nyobs', 'nyos', 'nyoss', 'nyong', 'nyoj', 'nyoch',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xb2.php b/web/core/lib/Drupal/Component/Transliteration/data/xb2.php
index 1dced88cb..ef3617bdc 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xb2.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xb2.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'nyok', 'nyot', 'nyop', 'nyoh', 'nu', 'nug', 'nukk', 'nugs', 'nun', 'nunj', 'nunh', 'nud', 'nul', 'nulg', 'nulm', 'nulb',
   0x10 => 'nuls', 'nult', 'nulp', 'nulh', 'num', 'nub', 'nubs', 'nus', 'nuss', 'nung', 'nuj', 'nuch', 'nuk', 'nut', 'nup', 'nuh',
   0x20 => 'nwo', 'nwog', 'nwokk', 'nwogs', 'nwon', 'nwonj', 'nwonh', 'nwod', 'nwol', 'nwolg', 'nwolm', 'nwolb', 'nwols', 'nwolt', 'nwolp', 'nwolh',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'nil', 'nilg', 'nilm', 'nilb', 'nils', 'nilt', 'nilp', 'nilh', 'nim', 'nib', 'nibs', 'nis', 'niss', 'ning', 'nij', 'nich',
   0xE0 => 'nik', 'nit', 'nip', 'nih', 'da', 'dag', 'dakk', 'dags', 'dan', 'danj', 'danh', 'dad', 'dal', 'dalg', 'dalm', 'dalb',
   0xF0 => 'dals', 'dalt', 'dalp', 'dalh', 'dam', 'dab', 'dabs', 'das', 'dass', 'dang', 'daj', 'dach', 'dak', 'dat', 'dap', 'dah',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xb3.php b/web/core/lib/Drupal/Component/Transliteration/data/xb3.php
index 37a9a0724..6b798078f 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xb3.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xb3.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'dae', 'daeg', 'daekk', 'daegs', 'daen', 'daenj', 'daenh', 'daed', 'dael', 'daelg', 'daelm', 'daelb', 'daels', 'daelt', 'daelp', 'daelh',
   0x10 => 'daem', 'daeb', 'daebs', 'daes', 'daess', 'daeng', 'daej', 'daech', 'daek', 'daet', 'daep', 'daeh', 'dya', 'dyag', 'dyakk', 'dyags',
   0x20 => 'dyan', 'dyanj', 'dyanh', 'dyad', 'dyal', 'dyalg', 'dyalm', 'dyalb', 'dyals', 'dyalt', 'dyalp', 'dyalh', 'dyam', 'dyab', 'dyabs', 'dyas',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'dols', 'dolt', 'dolp', 'dolh', 'dom', 'dob', 'dobs', 'dos', 'doss', 'dong', 'doj', 'doch', 'dok', 'dot', 'dop', 'doh',
   0xE0 => 'dwa', 'dwag', 'dwakk', 'dwags', 'dwan', 'dwanj', 'dwanh', 'dwad', 'dwal', 'dwalg', 'dwalm', 'dwalb', 'dwals', 'dwalt', 'dwalp', 'dwalh',
   0xF0 => 'dwam', 'dwab', 'dwabs', 'dwas', 'dwass', 'dwang', 'dwaj', 'dwach', 'dwak', 'dwat', 'dwap', 'dwah', 'dwae', 'dwaeg', 'dwaekk', 'dwaegs',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xb4.php b/web/core/lib/Drupal/Component/Transliteration/data/xb4.php
index 2c46b3a77..0ae19d447 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xb4.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xb4.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'dwaen', 'dwaenj', 'dwaenh', 'dwaed', 'dwael', 'dwaelg', 'dwaelm', 'dwaelb', 'dwaels', 'dwaelt', 'dwaelp', 'dwaelh', 'dwaem', 'dwaeb', 'dwaebs', 'dwaes',
   0x10 => 'dwaess', 'dwaeng', 'dwaej', 'dwaech', 'dwaek', 'dwaet', 'dwaep', 'dwaeh', 'doe', 'doeg', 'doekk', 'doegs', 'doen', 'doenj', 'doenh', 'doed',
   0x20 => 'doel', 'doelg', 'doelm', 'doelb', 'doels', 'doelt', 'doelp', 'doelh', 'doem', 'doeb', 'doebs', 'does', 'doess', 'doeng', 'doej', 'doech',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'dyum', 'dyub', 'dyubs', 'dyus', 'dyuss', 'dyung', 'dyuj', 'dyuch', 'dyuk', 'dyut', 'dyup', 'dyuh', 'deu', 'deug', 'deukk', 'deugs',
   0xE0 => 'deun', 'deunj', 'deunh', 'deud', 'deul', 'deulg', 'deulm', 'deulb', 'deuls', 'deult', 'deulp', 'deulh', 'deum', 'deub', 'deubs', 'deus',
   0xF0 => 'deuss', 'deung', 'deuj', 'deuch', 'deuk', 'deut', 'deup', 'deuh', 'dui', 'duig', 'duikk', 'duigs', 'duin', 'duinj', 'duinh', 'duid',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xb5.php b/web/core/lib/Drupal/Component/Transliteration/data/xb5.php
index ee61e5430..22be8a0ac 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xb5.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xb5.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'duil', 'duilg', 'duilm', 'duilb', 'duils', 'duilt', 'duilp', 'duilh', 'duim', 'duib', 'duibs', 'duis', 'duiss', 'duing', 'duij', 'duich',
   0x10 => 'duik', 'duit', 'duip', 'duih', 'di', 'dig', 'dikk', 'digs', 'din', 'dinj', 'dinh', 'did', 'dil', 'dilg', 'dilm', 'dilb',
   0x20 => 'dils', 'dilt', 'dilp', 'dilh', 'dim', 'dib', 'dibs', 'dis', 'diss', 'ding', 'dij', 'dich', 'dik', 'dit', 'dip', 'dih',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ttess', 'tteng', 'ttej', 'ttech', 'ttek', 'ttet', 'ttep', 'tteh', 'ttyeo', 'ttyeog', 'ttyeokk', 'ttyeogs', 'ttyeon', 'ttyeonj', 'ttyeonh', 'ttyeod',
   0xE0 => 'ttyeol', 'ttyeolg', 'ttyeolm', 'ttyeolb', 'ttyeols', 'ttyeolt', 'ttyeolp', 'ttyeolh', 'ttyeom', 'ttyeob', 'ttyeobs', 'ttyeos', 'ttyeoss', 'ttyeong', 'ttyeoj', 'ttyeoch',
   0xF0 => 'ttyeok', 'ttyeot', 'ttyeop', 'ttyeoh', 'ttye', 'ttyeg', 'ttyekk', 'ttyegs', 'ttyen', 'ttyenj', 'ttyenh', 'ttyed', 'ttyel', 'ttyelg', 'ttyelm', 'ttyelb',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xb6.php b/web/core/lib/Drupal/Component/Transliteration/data/xb6.php
index 5b209ee81..9a40cdcc2 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xb6.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xb6.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ttyels', 'ttyelt', 'ttyelp', 'ttyelh', 'ttyem', 'ttyeb', 'ttyebs', 'ttyes', 'ttyess', 'ttyeng', 'ttyej', 'ttyech', 'ttyek', 'ttyet', 'ttyep', 'ttyeh',
   0x10 => 'tto', 'ttog', 'ttokk', 'ttogs', 'tton', 'ttonj', 'ttonh', 'ttod', 'ttol', 'ttolg', 'ttolm', 'ttolb', 'ttols', 'ttolt', 'ttolp', 'ttolh',
   0x20 => 'ttom', 'ttob', 'ttobs', 'ttos', 'ttoss', 'ttong', 'ttoj', 'ttoch', 'ttok', 'ttot', 'ttop', 'ttoh', 'ttwa', 'ttwag', 'ttwakk', 'ttwags',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ttwok', 'ttwot', 'ttwop', 'ttwoh', 'ttwe', 'ttweg', 'ttwekk', 'ttwegs', 'ttwen', 'ttwenj', 'ttwenh', 'ttwed', 'ttwel', 'ttwelg', 'ttwelm', 'ttwelb',
   0xE0 => 'ttwels', 'ttwelt', 'ttwelp', 'ttwelh', 'ttwem', 'ttweb', 'ttwebs', 'ttwes', 'ttwess', 'ttweng', 'ttwej', 'ttwech', 'ttwek', 'ttwet', 'ttwep', 'ttweh',
   0xF0 => 'ttwi', 'ttwig', 'ttwikk', 'ttwigs', 'ttwin', 'ttwinj', 'ttwinh', 'ttwid', 'ttwil', 'ttwilg', 'ttwilm', 'ttwilb', 'ttwils', 'ttwilt', 'ttwilp', 'ttwilh',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xb7.php b/web/core/lib/Drupal/Component/Transliteration/data/xb7.php
index c19b876fd..419dbe1bc 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xb7.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xb7.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ttwim', 'ttwib', 'ttwibs', 'ttwis', 'ttwiss', 'ttwing', 'ttwij', 'ttwich', 'ttwik', 'ttwit', 'ttwip', 'ttwih', 'ttyu', 'ttyug', 'ttyukk', 'ttyugs',
   0x10 => 'ttyun', 'ttyunj', 'ttyunh', 'ttyud', 'ttyul', 'ttyulg', 'ttyulm', 'ttyulb', 'ttyuls', 'ttyult', 'ttyulp', 'ttyulh', 'ttyum', 'ttyub', 'ttyubs', 'ttyus',
   0x20 => 'ttyuss', 'ttyung', 'ttyuj', 'ttyuch', 'ttyuk', 'ttyut', 'ttyup', 'ttyuh', 'tteu', 'tteug', 'tteukk', 'tteugs', 'tteun', 'tteunj', 'tteunh', 'tteud',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'lyae', 'lyaeg', 'lyaekk', 'lyaegs', 'lyaen', 'lyaenj', 'lyaenh', 'lyaed', 'lyael', 'lyaelg', 'lyaelm', 'lyaelb', 'lyaels', 'lyaelt', 'lyaelp', 'lyaelh',
   0xE0 => 'lyaem', 'lyaeb', 'lyaebs', 'lyaes', 'lyaess', 'lyaeng', 'lyaej', 'lyaech', 'lyaek', 'lyaet', 'lyaep', 'lyaeh', 'leo', 'leog', 'leokk', 'leogs',
   0xF0 => 'leon', 'leonj', 'leonh', 'leod', 'leol', 'leolg', 'leolm', 'leolb', 'leols', 'leolt', 'leolp', 'leolh', 'leom', 'leob', 'leobs', 'leos',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xb8.php b/web/core/lib/Drupal/Component/Transliteration/data/xb8.php
index 3743ce2a1..0abd8a036 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xb8.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xb8.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'leoss', 'leong', 'leoj', 'leoch', 'leok', 'leot', 'leop', 'leoh', 'le', 'leg', 'lekk', 'legs', 'len', 'lenj', 'lenh', 'led',
   0x10 => 'lel', 'lelg', 'lelm', 'lelb', 'lels', 'lelt', 'lelp', 'lelh', 'lem', 'leb', 'lebs', 'les', 'less', 'leng', 'lej', 'lech',
   0x20 => 'lek', 'let', 'lep', 'leh', 'lyeo', 'lyeog', 'lyeokk', 'lyeogs', 'lyeon', 'lyeonj', 'lyeonh', 'lyeod', 'lyeol', 'lyeolg', 'lyeolm', 'lyeolb',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'lyon', 'lyonj', 'lyonh', 'lyod', 'lyol', 'lyolg', 'lyolm', 'lyolb', 'lyols', 'lyolt', 'lyolp', 'lyolh', 'lyom', 'lyob', 'lyobs', 'lyos',
   0xE0 => 'lyoss', 'lyong', 'lyoj', 'lyoch', 'lyok', 'lyot', 'lyop', 'lyoh', 'lu', 'lug', 'lukk', 'lugs', 'lun', 'lunj', 'lunh', 'lud',
   0xF0 => 'lul', 'lulg', 'lulm', 'lulb', 'luls', 'lult', 'lulp', 'lulh', 'lum', 'lub', 'lubs', 'lus', 'luss', 'lung', 'luj', 'luch',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xb9.php b/web/core/lib/Drupal/Component/Transliteration/data/xb9.php
index 0307106cf..9b5fcd157 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xb9.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xb9.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'luk', 'lut', 'lup', 'luh', 'lwo', 'lwog', 'lwokk', 'lwogs', 'lwon', 'lwonj', 'lwonh', 'lwod', 'lwol', 'lwolg', 'lwolm', 'lwolb',
   0x10 => 'lwols', 'lwolt', 'lwolp', 'lwolh', 'lwom', 'lwob', 'lwobs', 'lwos', 'lwoss', 'lwong', 'lwoj', 'lwoch', 'lwok', 'lwot', 'lwop', 'lwoh',
   0x20 => 'lwe', 'lweg', 'lwekk', 'lwegs', 'lwen', 'lwenj', 'lwenh', 'lwed', 'lwel', 'lwelg', 'lwelm', 'lwelb', 'lwels', 'lwelt', 'lwelp', 'lwelh',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'mal', 'malg', 'malm', 'malb', 'mals', 'malt', 'malp', 'malh', 'mam', 'mab', 'mabs', 'mas', 'mass', 'mang', 'maj', 'mach',
   0xE0 => 'mak', 'mat', 'map', 'mah', 'mae', 'maeg', 'maekk', 'maegs', 'maen', 'maenj', 'maenh', 'maed', 'mael', 'maelg', 'maelm', 'maelb',
   0xF0 => 'maels', 'maelt', 'maelp', 'maelh', 'maem', 'maeb', 'maebs', 'maes', 'maess', 'maeng', 'maej', 'maech', 'maek', 'maet', 'maep', 'maeh',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xba.php b/web/core/lib/Drupal/Component/Transliteration/data/xba.php
index 30878974e..5a5448a39 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xba.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xba.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'mya', 'myag', 'myakk', 'myags', 'myan', 'myanj', 'myanh', 'myad', 'myal', 'myalg', 'myalm', 'myalb', 'myals', 'myalt', 'myalp', 'myalh',
   0x10 => 'myam', 'myab', 'myabs', 'myas', 'myass', 'myang', 'myaj', 'myach', 'myak', 'myat', 'myap', 'myah', 'myae', 'myaeg', 'myaekk', 'myaegs',
   0x20 => 'myaen', 'myaenj', 'myaenh', 'myaed', 'myael', 'myaelg', 'myaelm', 'myaelb', 'myaels', 'myaelt', 'myaelp', 'myaelh', 'myaem', 'myaeb', 'myaebs', 'myaes',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'mwals', 'mwalt', 'mwalp', 'mwalh', 'mwam', 'mwab', 'mwabs', 'mwas', 'mwass', 'mwang', 'mwaj', 'mwach', 'mwak', 'mwat', 'mwap', 'mwah',
   0xE0 => 'mwae', 'mwaeg', 'mwaekk', 'mwaegs', 'mwaen', 'mwaenj', 'mwaenh', 'mwaed', 'mwael', 'mwaelg', 'mwaelm', 'mwaelb', 'mwaels', 'mwaelt', 'mwaelp', 'mwaelh',
   0xF0 => 'mwaem', 'mwaeb', 'mwaebs', 'mwaes', 'mwaess', 'mwaeng', 'mwaej', 'mwaech', 'mwaek', 'mwaet', 'mwaep', 'mwaeh', 'moe', 'moeg', 'moekk', 'moegs',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xbb.php b/web/core/lib/Drupal/Component/Transliteration/data/xbb.php
index 0f582fa79..1b1ab3ce0 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xbb.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xbb.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'moen', 'moenj', 'moenh', 'moed', 'moel', 'moelg', 'moelm', 'moelb', 'moels', 'moelt', 'moelp', 'moelh', 'moem', 'moeb', 'moebs', 'moes',
   0x10 => 'moess', 'moeng', 'moej', 'moech', 'moek', 'moet', 'moep', 'moeh', 'myo', 'myog', 'myokk', 'myogs', 'myon', 'myonj', 'myonh', 'myod',
   0x20 => 'myol', 'myolg', 'myolm', 'myolb', 'myols', 'myolt', 'myolp', 'myolh', 'myom', 'myob', 'myobs', 'myos', 'myoss', 'myong', 'myoj', 'myoch',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'meum', 'meub', 'meubs', 'meus', 'meuss', 'meung', 'meuj', 'meuch', 'meuk', 'meut', 'meup', 'meuh', 'mui', 'muig', 'muikk', 'muigs',
   0xE0 => 'muin', 'muinj', 'muinh', 'muid', 'muil', 'muilg', 'muilm', 'muilb', 'muils', 'muilt', 'muilp', 'muilh', 'muim', 'muib', 'muibs', 'muis',
   0xF0 => 'muiss', 'muing', 'muij', 'muich', 'muik', 'muit', 'muip', 'muih', 'mi', 'mig', 'mikk', 'migs', 'min', 'minj', 'minh', 'mid',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xbc.php b/web/core/lib/Drupal/Component/Transliteration/data/xbc.php
index e145545c4..df91ce6ae 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xbc.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xbc.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'mil', 'milg', 'milm', 'milb', 'mils', 'milt', 'milp', 'milh', 'mim', 'mib', 'mibs', 'mis', 'miss', 'ming', 'mij', 'mich',
   0x10 => 'mik', 'mit', 'mip', 'mih', 'ba', 'bag', 'bakk', 'bags', 'ban', 'banj', 'banh', 'bad', 'bal', 'balg', 'balm', 'balb',
   0x20 => 'bals', 'balt', 'balp', 'balh', 'bam', 'bab', 'babs', 'bas', 'bass', 'bang', 'baj', 'bach', 'bak', 'bat', 'bap', 'bah',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'byeoss', 'byeong', 'byeoj', 'byeoch', 'byeok', 'byeot', 'byeop', 'byeoh', 'bye', 'byeg', 'byekk', 'byegs', 'byen', 'byenj', 'byenh', 'byed',
   0xE0 => 'byel', 'byelg', 'byelm', 'byelb', 'byels', 'byelt', 'byelp', 'byelh', 'byem', 'byeb', 'byebs', 'byes', 'byess', 'byeng', 'byej', 'byech',
   0xF0 => 'byek', 'byet', 'byep', 'byeh', 'bo', 'bog', 'bokk', 'bogs', 'bon', 'bonj', 'bonh', 'bod', 'bol', 'bolg', 'bolm', 'bolb',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xbd.php b/web/core/lib/Drupal/Component/Transliteration/data/xbd.php
index 539bb316f..5cb779c3a 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xbd.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xbd.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'bols', 'bolt', 'bolp', 'bolh', 'bom', 'bob', 'bobs', 'bos', 'boss', 'bong', 'boj', 'boch', 'bok', 'bot', 'bop', 'boh',
   0x10 => 'bwa', 'bwag', 'bwakk', 'bwags', 'bwan', 'bwanj', 'bwanh', 'bwad', 'bwal', 'bwalg', 'bwalm', 'bwalb', 'bwals', 'bwalt', 'bwalp', 'bwalh',
   0x20 => 'bwam', 'bwab', 'bwabs', 'bwas', 'bwass', 'bwang', 'bwaj', 'bwach', 'bwak', 'bwat', 'bwap', 'bwah', 'bwae', 'bwaeg', 'bwaekk', 'bwaegs',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'bwek', 'bwet', 'bwep', 'bweh', 'bwi', 'bwig', 'bwikk', 'bwigs', 'bwin', 'bwinj', 'bwinh', 'bwid', 'bwil', 'bwilg', 'bwilm', 'bwilb',
   0xE0 => 'bwils', 'bwilt', 'bwilp', 'bwilh', 'bwim', 'bwib', 'bwibs', 'bwis', 'bwiss', 'bwing', 'bwij', 'bwich', 'bwik', 'bwit', 'bwip', 'bwih',
   0xF0 => 'byu', 'byug', 'byukk', 'byugs', 'byun', 'byunj', 'byunh', 'byud', 'byul', 'byulg', 'byulm', 'byulb', 'byuls', 'byult', 'byulp', 'byulh',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xbe.php b/web/core/lib/Drupal/Component/Transliteration/data/xbe.php
index 7d3bf6e82..380003663 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xbe.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xbe.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'byum', 'byub', 'byubs', 'byus', 'byuss', 'byung', 'byuj', 'byuch', 'byuk', 'byut', 'byup', 'byuh', 'beu', 'beug', 'beukk', 'beugs',
   0x10 => 'beun', 'beunj', 'beunh', 'beud', 'beul', 'beulg', 'beulm', 'beulb', 'beuls', 'beult', 'beulp', 'beulh', 'beum', 'beub', 'beubs', 'beus',
   0x20 => 'beuss', 'beung', 'beuj', 'beuch', 'beuk', 'beut', 'beup', 'beuh', 'bui', 'buig', 'buikk', 'buigs', 'buin', 'buinj', 'buinh', 'buid',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ppeo', 'ppeog', 'ppeokk', 'ppeogs', 'ppeon', 'ppeonj', 'ppeonh', 'ppeod', 'ppeol', 'ppeolg', 'ppeolm', 'ppeolb', 'ppeols', 'ppeolt', 'ppeolp', 'ppeolh',
   0xE0 => 'ppeom', 'ppeob', 'ppeobs', 'ppeos', 'ppeoss', 'ppeong', 'ppeoj', 'ppeoch', 'ppeok', 'ppeot', 'ppeop', 'ppeoh', 'ppe', 'ppeg', 'ppekk', 'ppegs',
   0xF0 => 'ppen', 'ppenj', 'ppenh', 'pped', 'ppel', 'ppelg', 'ppelm', 'ppelb', 'ppels', 'ppelt', 'ppelp', 'ppelh', 'ppem', 'ppeb', 'ppebs', 'ppes',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xbf.php b/web/core/lib/Drupal/Component/Transliteration/data/xbf.php
index 5681ed1b8..e35565108 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xbf.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xbf.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ppess', 'ppeng', 'ppej', 'ppech', 'ppek', 'ppet', 'ppep', 'ppeh', 'ppyeo', 'ppyeog', 'ppyeokk', 'ppyeogs', 'ppyeon', 'ppyeonj', 'ppyeonh', 'ppyeod',
   0x10 => 'ppyeol', 'ppyeolg', 'ppyeolm', 'ppyeolb', 'ppyeols', 'ppyeolt', 'ppyeolp', 'ppyeolh', 'ppyeom', 'ppyeob', 'ppyeobs', 'ppyeos', 'ppyeoss', 'ppyeong', 'ppyeoj', 'ppyeoch',
   0x20 => 'ppyeok', 'ppyeot', 'ppyeop', 'ppyeoh', 'ppye', 'ppyeg', 'ppyekk', 'ppyegs', 'ppyen', 'ppyenj', 'ppyenh', 'ppyed', 'ppyel', 'ppyelg', 'ppyelm', 'ppyelb',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ppun', 'ppunj', 'ppunh', 'ppud', 'ppul', 'ppulg', 'ppulm', 'ppulb', 'ppuls', 'ppult', 'ppulp', 'ppulh', 'ppum', 'ppub', 'ppubs', 'ppus',
   0xE0 => 'ppuss', 'ppung', 'ppuj', 'ppuch', 'ppuk', 'pput', 'ppup', 'ppuh', 'ppwo', 'ppwog', 'ppwokk', 'ppwogs', 'ppwon', 'ppwonj', 'ppwonh', 'ppwod',
   0xF0 => 'ppwol', 'ppwolg', 'ppwolm', 'ppwolb', 'ppwols', 'ppwolt', 'ppwolp', 'ppwolh', 'ppwom', 'ppwob', 'ppwobs', 'ppwos', 'ppwoss', 'ppwong', 'ppwoj', 'ppwoch',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xc0.php b/web/core/lib/Drupal/Component/Transliteration/data/xc0.php
index 89512d1b1..003544e00 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xc0.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xc0.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ppwok', 'ppwot', 'ppwop', 'ppwoh', 'ppwe', 'ppweg', 'ppwekk', 'ppwegs', 'ppwen', 'ppwenj', 'ppwenh', 'ppwed', 'ppwel', 'ppwelg', 'ppwelm', 'ppwelb',
   0x10 => 'ppwels', 'ppwelt', 'ppwelp', 'ppwelh', 'ppwem', 'ppweb', 'ppwebs', 'ppwes', 'ppwess', 'ppweng', 'ppwej', 'ppwech', 'ppwek', 'ppwet', 'ppwep', 'ppweh',
   0x20 => 'ppwi', 'ppwig', 'ppwikk', 'ppwigs', 'ppwin', 'ppwinj', 'ppwinh', 'ppwid', 'ppwil', 'ppwilg', 'ppwilm', 'ppwilb', 'ppwils', 'ppwilt', 'ppwilp', 'ppwilh',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'sael', 'saelg', 'saelm', 'saelb', 'saels', 'saelt', 'saelp', 'saelh', 'saem', 'saeb', 'saebs', 'saes', 'saess', 'saeng', 'saej', 'saech',
   0xE0 => 'saek', 'saet', 'saep', 'saeh', 'sya', 'syag', 'syakk', 'syags', 'syan', 'syanj', 'syanh', 'syad', 'syal', 'syalg', 'syalm', 'syalb',
   0xF0 => 'syals', 'syalt', 'syalp', 'syalh', 'syam', 'syab', 'syabs', 'syas', 'syass', 'syang', 'syaj', 'syach', 'syak', 'syat', 'syap', 'syah',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xc1.php b/web/core/lib/Drupal/Component/Transliteration/data/xc1.php
index ae62f6667..217d8772b 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xc1.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xc1.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'syae', 'syaeg', 'syaekk', 'syaegs', 'syaen', 'syaenj', 'syaenh', 'syaed', 'syael', 'syaelg', 'syaelm', 'syaelb', 'syaels', 'syaelt', 'syaelp', 'syaelh',
   0x10 => 'syaem', 'syaeb', 'syaebs', 'syaes', 'syaess', 'syaeng', 'syaej', 'syaech', 'syaek', 'syaet', 'syaep', 'syaeh', 'seo', 'seog', 'seokk', 'seogs',
   0x20 => 'seon', 'seonj', 'seonh', 'seod', 'seol', 'seolg', 'seolm', 'seolb', 'seols', 'seolt', 'seolp', 'seolh', 'seom', 'seob', 'seobs', 'seos',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'swaels', 'swaelt', 'swaelp', 'swaelh', 'swaem', 'swaeb', 'swaebs', 'swaes', 'swaess', 'swaeng', 'swaej', 'swaech', 'swaek', 'swaet', 'swaep', 'swaeh',
   0xE0 => 'soe', 'soeg', 'soekk', 'soegs', 'soen', 'soenj', 'soenh', 'soed', 'soel', 'soelg', 'soelm', 'soelb', 'soels', 'soelt', 'soelp', 'soelh',
   0xF0 => 'soem', 'soeb', 'soebs', 'soes', 'soess', 'soeng', 'soej', 'soech', 'soek', 'soet', 'soep', 'soeh', 'syo', 'syog', 'syokk', 'syogs',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xc2.php b/web/core/lib/Drupal/Component/Transliteration/data/xc2.php
index e540707e1..76a573824 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xc2.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xc2.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'syon', 'syonj', 'syonh', 'syod', 'syol', 'syolg', 'syolm', 'syolb', 'syols', 'syolt', 'syolp', 'syolh', 'syom', 'syob', 'syobs', 'syos',
   0x10 => 'syoss', 'syong', 'syoj', 'syoch', 'syok', 'syot', 'syop', 'syoh', 'su', 'sug', 'sukk', 'sugs', 'sun', 'sunj', 'sunh', 'sud',
   0x20 => 'sul', 'sulg', 'sulm', 'sulb', 'suls', 'sult', 'sulp', 'sulh', 'sum', 'sub', 'subs', 'sus', 'suss', 'sung', 'suj', 'such',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'suim', 'suib', 'suibs', 'suis', 'suiss', 'suing', 'suij', 'suich', 'suik', 'suit', 'suip', 'suih', 'si', 'sig', 'sikk', 'sigs',
   0xE0 => 'sin', 'sinj', 'sinh', 'sid', 'sil', 'silg', 'silm', 'silb', 'sils', 'silt', 'silp', 'silh', 'sim', 'sib', 'sibs', 'sis',
   0xF0 => 'siss', 'sing', 'sij', 'sich', 'sik', 'sit', 'sip', 'sih', 'ssa', 'ssag', 'ssakk', 'ssags', 'ssan', 'ssanj', 'ssanh', 'ssad',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xc3.php b/web/core/lib/Drupal/Component/Transliteration/data/xc3.php
index 4fd97551e..24c8c2474 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xc3.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xc3.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ssal', 'ssalg', 'ssalm', 'ssalb', 'ssals', 'ssalt', 'ssalp', 'ssalh', 'ssam', 'ssab', 'ssabs', 'ssas', 'ssass', 'ssang', 'ssaj', 'ssach',
   0x10 => 'ssak', 'ssat', 'ssap', 'ssah', 'ssae', 'ssaeg', 'ssaekk', 'ssaegs', 'ssaen', 'ssaenj', 'ssaenh', 'ssaed', 'ssael', 'ssaelg', 'ssaelm', 'ssaelb',
   0x20 => 'ssaels', 'ssaelt', 'ssaelp', 'ssaelh', 'ssaem', 'ssaeb', 'ssaebs', 'ssaes', 'ssaess', 'ssaeng', 'ssaej', 'ssaech', 'ssaek', 'ssaet', 'ssaep', 'ssaeh',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'ssyess', 'ssyeng', 'ssyej', 'ssyech', 'ssyek', 'ssyet', 'ssyep', 'ssyeh', 'sso', 'ssog', 'ssokk', 'ssogs', 'sson', 'ssonj', 'ssonh', 'ssod',
   0xE0 => 'ssol', 'ssolg', 'ssolm', 'ssolb', 'ssols', 'ssolt', 'ssolp', 'ssolh', 'ssom', 'ssob', 'ssobs', 'ssos', 'ssoss', 'ssong', 'ssoj', 'ssoch',
   0xF0 => 'ssok', 'ssot', 'ssop', 'ssoh', 'sswa', 'sswag', 'sswakk', 'sswags', 'sswan', 'sswanj', 'sswanh', 'sswad', 'sswal', 'sswalg', 'sswalm', 'sswalb',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xc4.php b/web/core/lib/Drupal/Component/Transliteration/data/xc4.php
index 0e9034f32..5e0b9704a 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xc4.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xc4.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'sswals', 'sswalt', 'sswalp', 'sswalh', 'sswam', 'sswab', 'sswabs', 'sswas', 'sswass', 'sswang', 'sswaj', 'sswach', 'sswak', 'sswat', 'sswap', 'sswah',
   0x10 => 'sswae', 'sswaeg', 'sswaekk', 'sswaegs', 'sswaen', 'sswaenj', 'sswaenh', 'sswaed', 'sswael', 'sswaelg', 'sswaelm', 'sswaelb', 'sswaels', 'sswaelt', 'sswaelp', 'sswaelh',
   0x20 => 'sswaem', 'sswaeb', 'sswaebs', 'sswaes', 'sswaess', 'sswaeng', 'sswaej', 'sswaech', 'sswaek', 'sswaet', 'sswaep', 'sswaeh', 'ssoe', 'ssoeg', 'ssoekk', 'ssoegs',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'sswik', 'sswit', 'sswip', 'sswih', 'ssyu', 'ssyug', 'ssyukk', 'ssyugs', 'ssyun', 'ssyunj', 'ssyunh', 'ssyud', 'ssyul', 'ssyulg', 'ssyulm', 'ssyulb',
   0xE0 => 'ssyuls', 'ssyult', 'ssyulp', 'ssyulh', 'ssyum', 'ssyub', 'ssyubs', 'ssyus', 'ssyuss', 'ssyung', 'ssyuj', 'ssyuch', 'ssyuk', 'ssyut', 'ssyup', 'ssyuh',
   0xF0 => 'sseu', 'sseug', 'sseukk', 'sseugs', 'sseun', 'sseunj', 'sseunh', 'sseud', 'sseul', 'sseulg', 'sseulm', 'sseulb', 'sseuls', 'sseult', 'sseulp', 'sseulh',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xc5.php b/web/core/lib/Drupal/Component/Transliteration/data/xc5.php
index 21085ce7e..f67992816 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xc5.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xc5.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'sseum', 'sseub', 'sseubs', 'sseus', 'sseuss', 'sseung', 'sseuj', 'sseuch', 'sseuk', 'sseut', 'sseup', 'sseuh', 'ssui', 'ssuig', 'ssuikk', 'ssuigs',
   0x10 => 'ssuin', 'ssuinj', 'ssuinh', 'ssuid', 'ssuil', 'ssuilg', 'ssuilm', 'ssuilb', 'ssuils', 'ssuilt', 'ssuilp', 'ssuilh', 'ssuim', 'ssuib', 'ssuibs', 'ssuis',
   0x20 => 'ssuiss', 'ssuing', 'ssuij', 'ssuich', 'ssuik', 'ssuit', 'ssuip', 'ssuih', 'ssi', 'ssig', 'ssikk', 'ssigs', 'ssin', 'ssinj', 'ssinh', 'ssid',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'e', 'eg', 'ekk', 'egs', 'en', 'enj', 'enh', 'ed', 'el', 'elg', 'elm', 'elb', 'els', 'elt', 'elp', 'elh',
   0xE0 => 'em', 'eb', 'ebs', 'es', 'ess', 'eng', 'ej', 'ech', 'ek', 'et', 'ep', 'eh', 'yeo', 'yeog', 'yeokk', 'yeogs',
   0xF0 => 'yeon', 'yeonj', 'yeonh', 'yeod', 'yeol', 'yeolg', 'yeolm', 'yeolb', 'yeols', 'yeolt', 'yeolp', 'yeolh', 'yeom', 'yeob', 'yeobs', 'yeos',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xc6.php b/web/core/lib/Drupal/Component/Transliteration/data/xc6.php
index 7cd53f297..fc2d89605 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xc6.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xc6.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yeoss', 'yeong', 'yeoj', 'yeoch', 'yeok', 'yeot', 'yeop', 'yeoh', 'ye', 'yeg', 'yekk', 'yegs', 'yen', 'yenj', 'yenh', 'yed',
   0x10 => 'yel', 'yelg', 'yelm', 'yelb', 'yels', 'yelt', 'yelp', 'yelh', 'yem', 'yeb', 'yebs', 'yes', 'yess', 'yeng', 'yej', 'yech',
   0x20 => 'yek', 'yet', 'yep', 'yeh', 'o', 'og', 'okk', 'ogs', 'on', 'onj', 'onh', 'od', 'ol', 'olg', 'olm', 'olb',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'won', 'wonj', 'wonh', 'wod', 'wol', 'wolg', 'wolm', 'wolb', 'wols', 'wolt', 'wolp', 'wolh', 'wom', 'wob', 'wobs', 'wos',
   0xE0 => 'woss', 'wong', 'woj', 'woch', 'wok', 'wot', 'wop', 'woh', 'we', 'weg', 'wekk', 'wegs', 'wen', 'wenj', 'wenh', 'wed',
   0xF0 => 'wel', 'welg', 'welm', 'welb', 'wels', 'welt', 'welp', 'welh', 'wem', 'web', 'webs', 'wes', 'wess', 'weng', 'wej', 'wech',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xc7.php b/web/core/lib/Drupal/Component/Transliteration/data/xc7.php
index f362ad40e..405fd1622 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xc7.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xc7.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'wek', 'wet', 'wep', 'weh', 'wi', 'wig', 'wikk', 'wigs', 'win', 'winj', 'winh', 'wid', 'wil', 'wilg', 'wilm', 'wilb',
   0x10 => 'wils', 'wilt', 'wilp', 'wilh', 'wim', 'wib', 'wibs', 'wis', 'wiss', 'wing', 'wij', 'wich', 'wik', 'wit', 'wip', 'wih',
   0x20 => 'yu', 'yug', 'yukk', 'yugs', 'yun', 'yunj', 'yunh', 'yud', 'yul', 'yulg', 'yulm', 'yulb', 'yuls', 'yult', 'yulp', 'yulh',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jyal', 'jyalg', 'jyalm', 'jyalb', 'jyals', 'jyalt', 'jyalp', 'jyalh', 'jyam', 'jyab', 'jyabs', 'jyas', 'jyass', 'jyang', 'jyaj', 'jyach',
   0xE0 => 'jyak', 'jyat', 'jyap', 'jyah', 'jyae', 'jyaeg', 'jyaekk', 'jyaegs', 'jyaen', 'jyaenj', 'jyaenh', 'jyaed', 'jyael', 'jyaelg', 'jyaelm', 'jyaelb',
   0xF0 => 'jyaels', 'jyaelt', 'jyaelp', 'jyaelh', 'jyaem', 'jyaeb', 'jyaebs', 'jyaes', 'jyaess', 'jyaeng', 'jyaej', 'jyaech', 'jyaek', 'jyaet', 'jyaep', 'jyaeh',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xc8.php b/web/core/lib/Drupal/Component/Transliteration/data/xc8.php
index 656a0703f..952a13917 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xc8.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xc8.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'jeo', 'jeog', 'jeokk', 'jeogs', 'jeon', 'jeonj', 'jeonh', 'jeod', 'jeol', 'jeolg', 'jeolm', 'jeolb', 'jeols', 'jeolt', 'jeolp', 'jeolh',
   0x10 => 'jeom', 'jeob', 'jeobs', 'jeos', 'jeoss', 'jeong', 'jeoj', 'jeoch', 'jeok', 'jeot', 'jeop', 'jeoh', 'je', 'jeg', 'jekk', 'jegs',
   0x20 => 'jen', 'jenj', 'jenh', 'jed', 'jel', 'jelg', 'jelm', 'jelb', 'jels', 'jelt', 'jelp', 'jelh', 'jem', 'jeb', 'jebs', 'jes',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'joels', 'joelt', 'joelp', 'joelh', 'joem', 'joeb', 'joebs', 'joes', 'joess', 'joeng', 'joej', 'joech', 'joek', 'joet', 'joep', 'joeh',
   0xE0 => 'jyo', 'jyog', 'jyokk', 'jyogs', 'jyon', 'jyonj', 'jyonh', 'jyod', 'jyol', 'jyolg', 'jyolm', 'jyolb', 'jyols', 'jyolt', 'jyolp', 'jyolh',
   0xF0 => 'jyom', 'jyob', 'jyobs', 'jyos', 'jyoss', 'jyong', 'jyoj', 'jyoch', 'jyok', 'jyot', 'jyop', 'jyoh', 'ju', 'jug', 'jukk', 'jugs',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xc9.php b/web/core/lib/Drupal/Component/Transliteration/data/xc9.php
index 5fd5eb506..0d990f77d 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xc9.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xc9.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'jun', 'junj', 'junh', 'jud', 'jul', 'julg', 'julm', 'julb', 'juls', 'jult', 'julp', 'julh', 'jum', 'jub', 'jubs', 'jus',
   0x10 => 'juss', 'jung', 'juj', 'juch', 'juk', 'jut', 'jup', 'juh', 'jwo', 'jwog', 'jwokk', 'jwogs', 'jwon', 'jwonj', 'jwonh', 'jwod',
   0x20 => 'jwol', 'jwolg', 'jwolm', 'jwolb', 'jwols', 'jwolt', 'jwolp', 'jwolh', 'jwom', 'jwob', 'jwobs', 'jwos', 'jwoss', 'jwong', 'jwoj', 'jwoch',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jim', 'jib', 'jibs', 'jis', 'jiss', 'jing', 'jij', 'jich', 'jik', 'jit', 'jip', 'jih', 'jja', 'jjag', 'jjakk', 'jjags',
   0xE0 => 'jjan', 'jjanj', 'jjanh', 'jjad', 'jjal', 'jjalg', 'jjalm', 'jjalb', 'jjals', 'jjalt', 'jjalp', 'jjalh', 'jjam', 'jjab', 'jjabs', 'jjas',
   0xF0 => 'jjass', 'jjang', 'jjaj', 'jjach', 'jjak', 'jjat', 'jjap', 'jjah', 'jjae', 'jjaeg', 'jjaekk', 'jjaegs', 'jjaen', 'jjaenj', 'jjaenh', 'jjaed',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xca.php b/web/core/lib/Drupal/Component/Transliteration/data/xca.php
index 7ebaa7553..be314ec4f 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xca.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xca.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'jjael', 'jjaelg', 'jjaelm', 'jjaelb', 'jjaels', 'jjaelt', 'jjaelp', 'jjaelh', 'jjaem', 'jjaeb', 'jjaebs', 'jjaes', 'jjaess', 'jjaeng', 'jjaej', 'jjaech',
   0x10 => 'jjaek', 'jjaet', 'jjaep', 'jjaeh', 'jjya', 'jjyag', 'jjyakk', 'jjyags', 'jjyan', 'jjyanj', 'jjyanh', 'jjyad', 'jjyal', 'jjyalg', 'jjyalm', 'jjyalb',
   0x20 => 'jjyals', 'jjyalt', 'jjyalp', 'jjyalh', 'jjyam', 'jjyab', 'jjyabs', 'jjyas', 'jjyass', 'jjyang', 'jjyaj', 'jjyach', 'jjyak', 'jjyat', 'jjyap', 'jjyah',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jjoss', 'jjong', 'jjoj', 'jjoch', 'jjok', 'jjot', 'jjop', 'jjoh', 'jjwa', 'jjwag', 'jjwakk', 'jjwags', 'jjwan', 'jjwanj', 'jjwanh', 'jjwad',
   0xE0 => 'jjwal', 'jjwalg', 'jjwalm', 'jjwalb', 'jjwals', 'jjwalt', 'jjwalp', 'jjwalh', 'jjwam', 'jjwab', 'jjwabs', 'jjwas', 'jjwass', 'jjwang', 'jjwaj', 'jjwach',
   0xF0 => 'jjwak', 'jjwat', 'jjwap', 'jjwah', 'jjwae', 'jjwaeg', 'jjwaekk', 'jjwaegs', 'jjwaen', 'jjwaenj', 'jjwaenh', 'jjwaed', 'jjwael', 'jjwaelg', 'jjwaelm', 'jjwaelb',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xcb.php b/web/core/lib/Drupal/Component/Transliteration/data/xcb.php
index cbd291ab0..c396fcd3c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xcb.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xcb.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'jjwaels', 'jjwaelt', 'jjwaelp', 'jjwaelh', 'jjwaem', 'jjwaeb', 'jjwaebs', 'jjwaes', 'jjwaess', 'jjwaeng', 'jjwaej', 'jjwaech', 'jjwaek', 'jjwaet', 'jjwaep', 'jjwaeh',
   0x10 => 'jjoe', 'jjoeg', 'jjoekk', 'jjoegs', 'jjoen', 'jjoenj', 'jjoenh', 'jjoed', 'jjoel', 'jjoelg', 'jjoelm', 'jjoelb', 'jjoels', 'jjoelt', 'jjoelp', 'jjoelh',
   0x20 => 'jjoem', 'jjoeb', 'jjoebs', 'jjoes', 'jjoess', 'jjoeng', 'jjoej', 'jjoech', 'jjoek', 'jjoet', 'jjoep', 'jjoeh', 'jjyo', 'jjyog', 'jjyokk', 'jjyogs',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'jjyuk', 'jjyut', 'jjyup', 'jjyuh', 'jjeu', 'jjeug', 'jjeukk', 'jjeugs', 'jjeun', 'jjeunj', 'jjeunh', 'jjeud', 'jjeul', 'jjeulg', 'jjeulm', 'jjeulb',
   0xE0 => 'jjeuls', 'jjeult', 'jjeulp', 'jjeulh', 'jjeum', 'jjeub', 'jjeubs', 'jjeus', 'jjeuss', 'jjeung', 'jjeuj', 'jjeuch', 'jjeuk', 'jjeut', 'jjeup', 'jjeuh',
   0xF0 => 'jjui', 'jjuig', 'jjuikk', 'jjuigs', 'jjuin', 'jjuinj', 'jjuinh', 'jjuid', 'jjuil', 'jjuilg', 'jjuilm', 'jjuilb', 'jjuils', 'jjuilt', 'jjuilp', 'jjuilh',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xcc.php b/web/core/lib/Drupal/Component/Transliteration/data/xcc.php
index d543b26fa..4dc25f26e 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xcc.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xcc.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'jjuim', 'jjuib', 'jjuibs', 'jjuis', 'jjuiss', 'jjuing', 'jjuij', 'jjuich', 'jjuik', 'jjuit', 'jjuip', 'jjuih', 'jji', 'jjig', 'jjikk', 'jjigs',
   0x10 => 'jjin', 'jjinj', 'jjinh', 'jjid', 'jjil', 'jjilg', 'jjilm', 'jjilb', 'jjils', 'jjilt', 'jjilp', 'jjilh', 'jjim', 'jjib', 'jjibs', 'jjis',
   0x20 => 'jjiss', 'jjing', 'jjij', 'jjich', 'jjik', 'jjit', 'jjip', 'jjih', 'cha', 'chag', 'chakk', 'chags', 'chan', 'chanj', 'chanh', 'chad',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'chyeo', 'chyeog', 'chyeokk', 'chyeogs', 'chyeon', 'chyeonj', 'chyeonh', 'chyeod', 'chyeol', 'chyeolg', 'chyeolm', 'chyeolb', 'chyeols', 'chyeolt', 'chyeolp', 'chyeolh',
   0xE0 => 'chyeom', 'chyeob', 'chyeobs', 'chyeos', 'chyeoss', 'chyeong', 'chyeoj', 'chyeoch', 'chyeok', 'chyeot', 'chyeop', 'chyeoh', 'chye', 'chyeg', 'chyekk', 'chyegs',
   0xF0 => 'chyen', 'chyenj', 'chyenh', 'chyed', 'chyel', 'chyelg', 'chyelm', 'chyelb', 'chyels', 'chyelt', 'chyelp', 'chyelh', 'chyem', 'chyeb', 'chyebs', 'chyes',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xcd.php b/web/core/lib/Drupal/Component/Transliteration/data/xcd.php
index 6f730e57e..21f2ed7f9 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xcd.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xcd.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'chyess', 'chyeng', 'chyej', 'chyech', 'chyek', 'chyet', 'chyep', 'chyeh', 'cho', 'chog', 'chokk', 'chogs', 'chon', 'chonj', 'chonh', 'chod',
   0x10 => 'chol', 'cholg', 'cholm', 'cholb', 'chols', 'cholt', 'cholp', 'cholh', 'chom', 'chob', 'chobs', 'chos', 'choss', 'chong', 'choj', 'choch',
   0x20 => 'chok', 'chot', 'chop', 'choh', 'chwa', 'chwag', 'chwakk', 'chwags', 'chwan', 'chwanj', 'chwanh', 'chwad', 'chwal', 'chwalg', 'chwalm', 'chwalb',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'chwen', 'chwenj', 'chwenh', 'chwed', 'chwel', 'chwelg', 'chwelm', 'chwelb', 'chwels', 'chwelt', 'chwelp', 'chwelh', 'chwem', 'chweb', 'chwebs', 'chwes',
   0xE0 => 'chwess', 'chweng', 'chwej', 'chwech', 'chwek', 'chwet', 'chwep', 'chweh', 'chwi', 'chwig', 'chwikk', 'chwigs', 'chwin', 'chwinj', 'chwinh', 'chwid',
   0xF0 => 'chwil', 'chwilg', 'chwilm', 'chwilb', 'chwils', 'chwilt', 'chwilp', 'chwilh', 'chwim', 'chwib', 'chwibs', 'chwis', 'chwiss', 'chwing', 'chwij', 'chwich',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xce.php b/web/core/lib/Drupal/Component/Transliteration/data/xce.php
index 099354e87..08dff787c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xce.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xce.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'chwik', 'chwit', 'chwip', 'chwih', 'chyu', 'chyug', 'chyukk', 'chyugs', 'chyun', 'chyunj', 'chyunh', 'chyud', 'chyul', 'chyulg', 'chyulm', 'chyulb',
   0x10 => 'chyuls', 'chyult', 'chyulp', 'chyulh', 'chyum', 'chyub', 'chyubs', 'chyus', 'chyuss', 'chyung', 'chyuj', 'chyuch', 'chyuk', 'chyut', 'chyup', 'chyuh',
   0x20 => 'cheu', 'cheug', 'cheukk', 'cheugs', 'cheun', 'cheunj', 'cheunh', 'cheud', 'cheul', 'cheulg', 'cheulm', 'cheulb', 'cheuls', 'cheult', 'cheulp', 'cheulh',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'kyael', 'kyaelg', 'kyaelm', 'kyaelb', 'kyaels', 'kyaelt', 'kyaelp', 'kyaelh', 'kyaem', 'kyaeb', 'kyaebs', 'kyaes', 'kyaess', 'kyaeng', 'kyaej', 'kyaech',
   0xE0 => 'kyaek', 'kyaet', 'kyaep', 'kyaeh', 'keo', 'keog', 'keokk', 'keogs', 'keon', 'keonj', 'keonh', 'keod', 'keol', 'keolg', 'keolm', 'keolb',
   0xF0 => 'keols', 'keolt', 'keolp', 'keolh', 'keom', 'keob', 'keobs', 'keos', 'keoss', 'keong', 'keoj', 'keoch', 'keok', 'keot', 'keop', 'keoh',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xcf.php b/web/core/lib/Drupal/Component/Transliteration/data/xcf.php
index 434113f8f..2a0a946cd 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xcf.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xcf.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ke', 'keg', 'kekk', 'kegs', 'ken', 'kenj', 'kenh', 'ked', 'kel', 'kelg', 'kelm', 'kelb', 'kels', 'kelt', 'kelp', 'kelh',
   0x10 => 'kem', 'keb', 'kebs', 'kes', 'kess', 'keng', 'kej', 'kech', 'kek', 'ket', 'kep', 'keh', 'kyeo', 'kyeog', 'kyeokk', 'kyeogs',
   0x20 => 'kyeon', 'kyeonj', 'kyeonh', 'kyeod', 'kyeol', 'kyeolg', 'kyeolm', 'kyeolb', 'kyeols', 'kyeolt', 'kyeolp', 'kyeolh', 'kyeom', 'kyeob', 'kyeobs', 'kyeos',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'kyols', 'kyolt', 'kyolp', 'kyolh', 'kyom', 'kyob', 'kyobs', 'kyos', 'kyoss', 'kyong', 'kyoj', 'kyoch', 'kyok', 'kyot', 'kyop', 'kyoh',
   0xE0 => 'ku', 'kug', 'kukk', 'kugs', 'kun', 'kunj', 'kunh', 'kud', 'kul', 'kulg', 'kulm', 'kulb', 'kuls', 'kult', 'kulp', 'kulh',
   0xF0 => 'kum', 'kub', 'kubs', 'kus', 'kuss', 'kung', 'kuj', 'kuch', 'kuk', 'kut', 'kup', 'kuh', 'kwo', 'kwog', 'kwokk', 'kwogs',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xd0.php b/web/core/lib/Drupal/Component/Transliteration/data/xd0.php
index 848b49c7d..3c94c6835 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xd0.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xd0.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'kwon', 'kwonj', 'kwonh', 'kwod', 'kwol', 'kwolg', 'kwolm', 'kwolb', 'kwols', 'kwolt', 'kwolp', 'kwolh', 'kwom', 'kwob', 'kwobs', 'kwos',
   0x10 => 'kwoss', 'kwong', 'kwoj', 'kwoch', 'kwok', 'kwot', 'kwop', 'kwoh', 'kwe', 'kweg', 'kwekk', 'kwegs', 'kwen', 'kwenj', 'kwenh', 'kwed',
   0x20 => 'kwel', 'kwelg', 'kwelm', 'kwelb', 'kwels', 'kwelt', 'kwelp', 'kwelh', 'kwem', 'kweb', 'kwebs', 'kwes', 'kwess', 'kweng', 'kwej', 'kwech',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'tam', 'tab', 'tabs', 'tas', 'tass', 'tang', 'taj', 'tach', 'tak', 'tat', 'tap', 'tah', 'tae', 'taeg', 'taekk', 'taegs',
   0xE0 => 'taen', 'taenj', 'taenh', 'taed', 'tael', 'taelg', 'taelm', 'taelb', 'taels', 'taelt', 'taelp', 'taelh', 'taem', 'taeb', 'taebs', 'taes',
   0xF0 => 'taess', 'taeng', 'taej', 'taech', 'taek', 'taet', 'taep', 'taeh', 'tya', 'tyag', 'tyakk', 'tyags', 'tyan', 'tyanj', 'tyanh', 'tyad',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xd1.php b/web/core/lib/Drupal/Component/Transliteration/data/xd1.php
index c6504f4c8..418f2070d 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xd1.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xd1.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'tyal', 'tyalg', 'tyalm', 'tyalb', 'tyals', 'tyalt', 'tyalp', 'tyalh', 'tyam', 'tyab', 'tyabs', 'tyas', 'tyass', 'tyang', 'tyaj', 'tyach',
   0x10 => 'tyak', 'tyat', 'tyap', 'tyah', 'tyae', 'tyaeg', 'tyaekk', 'tyaegs', 'tyaen', 'tyaenj', 'tyaenh', 'tyaed', 'tyael', 'tyaelg', 'tyaelm', 'tyaelb',
   0x20 => 'tyaels', 'tyaelt', 'tyaelp', 'tyaelh', 'tyaem', 'tyaeb', 'tyaebs', 'tyaes', 'tyaess', 'tyaeng', 'tyaej', 'tyaech', 'tyaek', 'tyaet', 'tyaep', 'tyaeh',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'twass', 'twang', 'twaj', 'twach', 'twak', 'twat', 'twap', 'twah', 'twae', 'twaeg', 'twaekk', 'twaegs', 'twaen', 'twaenj', 'twaenh', 'twaed',
   0xE0 => 'twael', 'twaelg', 'twaelm', 'twaelb', 'twaels', 'twaelt', 'twaelp', 'twaelh', 'twaem', 'twaeb', 'twaebs', 'twaes', 'twaess', 'twaeng', 'twaej', 'twaech',
   0xF0 => 'twaek', 'twaet', 'twaep', 'twaeh', 'toe', 'toeg', 'toekk', 'toegs', 'toen', 'toenj', 'toenh', 'toed', 'toel', 'toelg', 'toelm', 'toelb',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xd2.php b/web/core/lib/Drupal/Component/Transliteration/data/xd2.php
index 741c229f7..d749276f8 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xd2.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xd2.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'toels', 'toelt', 'toelp', 'toelh', 'toem', 'toeb', 'toebs', 'toes', 'toess', 'toeng', 'toej', 'toech', 'toek', 'toet', 'toep', 'toeh',
   0x10 => 'tyo', 'tyog', 'tyokk', 'tyogs', 'tyon', 'tyonj', 'tyonh', 'tyod', 'tyol', 'tyolg', 'tyolm', 'tyolb', 'tyols', 'tyolt', 'tyolp', 'tyolh',
   0x20 => 'tyom', 'tyob', 'tyobs', 'tyos', 'tyoss', 'tyong', 'tyoj', 'tyoch', 'tyok', 'tyot', 'tyop', 'tyoh', 'tu', 'tug', 'tukk', 'tugs',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'teuk', 'teut', 'teup', 'teuh', 'tui', 'tuig', 'tuikk', 'tuigs', 'tuin', 'tuinj', 'tuinh', 'tuid', 'tuil', 'tuilg', 'tuilm', 'tuilb',
   0xE0 => 'tuils', 'tuilt', 'tuilp', 'tuilh', 'tuim', 'tuib', 'tuibs', 'tuis', 'tuiss', 'tuing', 'tuij', 'tuich', 'tuik', 'tuit', 'tuip', 'tuih',
   0xF0 => 'ti', 'tig', 'tikk', 'tigs', 'tin', 'tinj', 'tinh', 'tid', 'til', 'tilg', 'tilm', 'tilb', 'tils', 'tilt', 'tilp', 'tilh',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xd3.php b/web/core/lib/Drupal/Component/Transliteration/data/xd3.php
index 54aab18ed..d56ee58a2 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xd3.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xd3.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'tim', 'tib', 'tibs', 'tis', 'tiss', 'ting', 'tij', 'tich', 'tik', 'tit', 'tip', 'tih', 'pa', 'pag', 'pakk', 'pags',
   0x10 => 'pan', 'panj', 'panh', 'pad', 'pal', 'palg', 'palm', 'palb', 'pals', 'palt', 'palp', 'palh', 'pam', 'pab', 'pabs', 'pas',
   0x20 => 'pass', 'pang', 'paj', 'pach', 'pak', 'pat', 'pap', 'pah', 'pae', 'paeg', 'paekk', 'paegs', 'paen', 'paenj', 'paenh', 'paed',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'pye', 'pyeg', 'pyekk', 'pyegs', 'pyen', 'pyenj', 'pyenh', 'pyed', 'pyel', 'pyelg', 'pyelm', 'pyelb', 'pyels', 'pyelt', 'pyelp', 'pyelh',
   0xE0 => 'pyem', 'pyeb', 'pyebs', 'pyes', 'pyess', 'pyeng', 'pyej', 'pyech', 'pyek', 'pyet', 'pyep', 'pyeh', 'po', 'pog', 'pokk', 'pogs',
   0xF0 => 'pon', 'ponj', 'ponh', 'pod', 'pol', 'polg', 'polm', 'polb', 'pols', 'polt', 'polp', 'polh', 'pom', 'pob', 'pobs', 'pos',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xd4.php b/web/core/lib/Drupal/Component/Transliteration/data/xd4.php
index 0df64106a..dcbf3ecba 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xd4.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xd4.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'poss', 'pong', 'poj', 'poch', 'pok', 'pot', 'pop', 'poh', 'pwa', 'pwag', 'pwakk', 'pwags', 'pwan', 'pwanj', 'pwanh', 'pwad',
   0x10 => 'pwal', 'pwalg', 'pwalm', 'pwalb', 'pwals', 'pwalt', 'pwalp', 'pwalh', 'pwam', 'pwab', 'pwabs', 'pwas', 'pwass', 'pwang', 'pwaj', 'pwach',
   0x20 => 'pwak', 'pwat', 'pwap', 'pwah', 'pwae', 'pwaeg', 'pwaekk', 'pwaegs', 'pwaen', 'pwaenj', 'pwaenh', 'pwaed', 'pwael', 'pwaelg', 'pwaelm', 'pwaelb',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'pwin', 'pwinj', 'pwinh', 'pwid', 'pwil', 'pwilg', 'pwilm', 'pwilb', 'pwils', 'pwilt', 'pwilp', 'pwilh', 'pwim', 'pwib', 'pwibs', 'pwis',
   0xE0 => 'pwiss', 'pwing', 'pwij', 'pwich', 'pwik', 'pwit', 'pwip', 'pwih', 'pyu', 'pyug', 'pyukk', 'pyugs', 'pyun', 'pyunj', 'pyunh', 'pyud',
   0xF0 => 'pyul', 'pyulg', 'pyulm', 'pyulb', 'pyuls', 'pyult', 'pyulp', 'pyulh', 'pyum', 'pyub', 'pyubs', 'pyus', 'pyuss', 'pyung', 'pyuj', 'pyuch',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xd5.php b/web/core/lib/Drupal/Component/Transliteration/data/xd5.php
index 2dbeadaae..0b3efb145 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xd5.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xd5.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'pyuk', 'pyut', 'pyup', 'pyuh', 'peu', 'peug', 'peukk', 'peugs', 'peun', 'peunj', 'peunh', 'peud', 'peul', 'peulg', 'peulm', 'peulb',
   0x10 => 'peuls', 'peult', 'peulp', 'peulh', 'peum', 'peub', 'peubs', 'peus', 'peuss', 'peung', 'peuj', 'peuch', 'peuk', 'peut', 'peup', 'peuh',
   0x20 => 'pui', 'puig', 'puikk', 'puigs', 'puin', 'puinj', 'puinh', 'puid', 'puil', 'puilg', 'puilm', 'puilb', 'puils', 'puilt', 'puilp', 'puilh',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'heol', 'heolg', 'heolm', 'heolb', 'heols', 'heolt', 'heolp', 'heolh', 'heom', 'heob', 'heobs', 'heos', 'heoss', 'heong', 'heoj', 'heoch',
   0xE0 => 'heok', 'heot', 'heop', 'heoh', 'he', 'heg', 'hekk', 'hegs', 'hen', 'henj', 'henh', 'hed', 'hel', 'helg', 'helm', 'helb',
   0xF0 => 'hels', 'helt', 'help', 'helh', 'hem', 'heb', 'hebs', 'hes', 'hess', 'heng', 'hej', 'hech', 'hek', 'het', 'hep', 'heh',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xd6.php b/web/core/lib/Drupal/Component/Transliteration/data/xd6.php
index e86914f08..ae1dcf781 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xd6.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xd6.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'hyeo', 'hyeog', 'hyeokk', 'hyeogs', 'hyeon', 'hyeonj', 'hyeonh', 'hyeod', 'hyeol', 'hyeolg', 'hyeolm', 'hyeolb', 'hyeols', 'hyeolt', 'hyeolp', 'hyeolh',
   0x10 => 'hyeom', 'hyeob', 'hyeobs', 'hyeos', 'hyeoss', 'hyeong', 'hyeoj', 'hyeoch', 'hyeok', 'hyeot', 'hyeop', 'hyeoh', 'hye', 'hyeg', 'hyekk', 'hyegs',
   0x20 => 'hyen', 'hyenj', 'hyenh', 'hyed', 'hyel', 'hyelg', 'hyelm', 'hyelb', 'hyels', 'hyelt', 'hyelp', 'hyelh', 'hyem', 'hyeb', 'hyebs', 'hyes',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'huls', 'hult', 'hulp', 'hulh', 'hum', 'hub', 'hubs', 'hus', 'huss', 'hung', 'huj', 'huch', 'huk', 'hut', 'hup', 'huh',
   0xE0 => 'hwo', 'hwog', 'hwokk', 'hwogs', 'hwon', 'hwonj', 'hwonh', 'hwod', 'hwol', 'hwolg', 'hwolm', 'hwolb', 'hwols', 'hwolt', 'hwolp', 'hwolh',
   0xF0 => 'hwom', 'hwob', 'hwobs', 'hwos', 'hwoss', 'hwong', 'hwoj', 'hwoch', 'hwok', 'hwot', 'hwop', 'hwoh', 'hwe', 'hweg', 'hwekk', 'hwegs',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xd7.php b/web/core/lib/Drupal/Component/Transliteration/data/xd7.php
index af74c89b6..c0f75b54c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xd7.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xd7.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'hwen', 'hwenj', 'hwenh', 'hwed', 'hwel', 'hwelg', 'hwelm', 'hwelb', 'hwels', 'hwelt', 'hwelp', 'hwelh', 'hwem', 'hweb', 'hwebs', 'hwes',
   0x10 => 'hwess', 'hweng', 'hwej', 'hwech', 'hwek', 'hwet', 'hwep', 'hweh', 'hwi', 'hwig', 'hwikk', 'hwigs', 'hwin', 'hwinj', 'hwinh', 'hwid',
   0x20 => 'hwil', 'hwilg', 'hwilm', 'hwilb', 'hwils', 'hwilt', 'hwilp', 'hwilh', 'hwim', 'hwib', 'hwibs', 'hwis', 'hwiss', 'hwing', 'hwij', 'hwich',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xf9.php b/web/core/lib/Drupal/Component/Transliteration/data/xf9.php
index efc84995a..29eaa3bf6 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xf9.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xf9.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'qi', 'geng', 'che', 'jia', 'hua', 'chuan', 'ju', 'gui', 'gui', 'qi', 'jin', 'la', 'nai', 'lan', 'lai', 'luo',
   0x10 => 'luo', 'luo', 'luo', 'luo', 'le', 'luo', 'lao', 'luo', 'luo', 'lao', 'luo', 'luan', 'luan', 'lan', 'lan', 'lan',
   0x20 => 'luan', 'lan', 'lan', 'lan', 'lan', 'la', 'la', 'la', 'lang', 'lang', 'lang', 'lang', 'lang', 'lai', 'leng', 'lao',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'lei', 'liu', 'lu', 'lu', 'lun', 'lun', 'lun', 'lun', 'lu', 'li', 'li', 'lu', 'long', 'li', 'li', 'lu',
   0xE0 => 'yi', 'li', 'li', 'ni', 'li', 'li', 'li', 'li', 'li', 'li', 'li', 'ni', 'ni', 'lin', 'lin', 'lin',
   0xF0 => 'lin', 'lin', 'lin', 'lin', 'lin', 'lin', 'lin', 'li', 'li', 'li', 'zhuang', 'zhi', 'shi', 'shen', 'cha', 'ci',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xfa.php b/web/core/lib/Drupal/Component/Transliteration/data/xfa.php
index 7ba4ae8c0..d5b92f636 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xfa.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xfa.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'qie', 'du', 'ta', 'tang', 'zhai', 'dong', 'bao', 'fu', 'xing', 'jiang', 'jian', 'kuo', 'wu', 'hu', NULL, NULL,
   0x10 => 'zhong', NULL, 'qing', NULL, NULL, 'xi', 'zhu', 'yi', 'li', 'shen', 'xiang', 'fu', 'jing', 'jing', 'yu', NULL,
   0x20 => 'qiu', NULL, 'zhu', NULL, NULL, 'yi', 'dou', NULL, NULL, NULL, 'fan', 'si', 'guan', 'he', NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, 'he', 'xie', 'jie', NULL, 'qian', 'beng', 'e', 'pang', NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xfb.php b/web/core/lib/Drupal/Component/Transliteration/data/xfb.php
index 7dd47aee8..aa734cd7b 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xfb.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xfb.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'ff', 'fi', 'fl', 'ffi', 'ffl', 'st', 'st', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x10 => NULL, NULL, NULL, 'mn', 'me', 'mi', 'vn', 'mkh', NULL, NULL, NULL, NULL, NULL, 'y', '', 'yy',
   0x20 => '`', '', 'd', 'h', 'k', 'l', 'm', 'r', 't', '+', 's', 's', 's', 's', 'a', 'a',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, 'ng', 'ng', 'ng', 'ng', '', '', '', '', '', '', '', 'v', 'v',
   0xE0 => '', '', '', '', '', '', '', '', 'y', 'y', 'ya', 'ya', '', '', 'yw', 'yw',
   0xF0 => '', '', '', '', '', '', '', '', '', 'yy', 'yy', 'yy', 'y', 'y', 'y', 'y',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xfc.php b/web/core/lib/Drupal/Component/Transliteration/data/xfc.php
index 959ef1e79..aac2f66ce 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xfc.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xfc.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'yj', 'yh', 'ym', 'yy', 'yy', 'bj', 'bh', 'bkh', 'bm', 'by', 'by', 'tj', 'th', 'tkh', 'tm', 'ty',
   0x10 => 'ty', 'thj', 'thm', 'thy', 'thy', 'jh', 'jm', 'hj', 'hm', 'khj', 'khh', 'khm', 'sj', 'sh', 'skh', 'sm',
   0x20 => 'sh', 'sm', 'dj', 'dh', 'dkh', 'dm', 'th', 'tm', 'zm', '', '', 'ghj', 'ghm', 'fj', 'fh', 'fkh',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'mkh', 'mm', 'nj', 'nh', 'nkh', 'nm', 'nh', 'hj', 'hm', 'h', 'yj', 'yh', 'ykh', 'ym', 'yh', 'ym',
   0xE0 => 'yh', 'bm', 'bh', 'tm', 'th', 'thm', 'thh', 'sm', 'sh', 'shm', 'shh', 'kl', 'km', 'lm', 'nm', 'nh',
   0xF0 => 'ym', 'yh', 'a', 'u', 'i', 'ty', 'ty', '', '', 'ghy', 'ghy', 'sy', 'sy', 'shy', 'shy', 'hy',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xfd.php b/web/core/lib/Drupal/Component/Transliteration/data/xfd.php
index 26372c483..a97073299 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xfd.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xfd.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => 'hy', 'jy', 'jy', 'khy', 'khy', 'sy', 'sy', 'dy', 'dy', 'shj', 'shh', 'shkh', 'shm', 'shr', 'sr', 'sr',
   0x10 => 'dr', 'ty', 'ty', '', '', 'ghy', 'ghy', 'sy', 'sy', 'shy', 'shy', 'hy', 'hy', 'jy', 'jy', 'khy',
   0x20 => 'khy', 'sy', 'sy', 'dy', 'dy', 'shj', 'shh', 'shkh', 'shm', 'shr', 'sr', 'sr', 'dr', 'shj', 'shh', 'shkh',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xE0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0xF0 => '', '', 'allh', 'akbr', 'mhmd', '', 'rswl', '', 'wslm', 'sly', '', 'jl jlalh', 'ryal', NULL, NULL, NULL,
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xfe.php b/web/core/lib/Drupal/Component/Transliteration/data/xfe.php
index c53867bd4..d05402004 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xfe.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xfe.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
   0x10 => ',', ',', '.', ':', ';', '!', '?', NULL, NULL, '...', NULL, NULL, NULL, NULL, NULL, NULL,
   0x20 => '', '', '', '~', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => 'gh', 'f', 'f', 'f', 'f', 'q', 'q', 'q', 'q', 'k', 'k', 'k', 'k', 'l', 'l', 'l',
   0xE0 => 'l', 'm', 'm', 'm', 'm', 'n', 'n', 'n', 'n', 'h', 'h', 'h', 'h', 'w', 'w', 'y',
   0xF0 => 'y', 'y', 'y', 'y', 'y', 'la', 'la', 'la', 'la', 'la', 'la', 'la', 'la', NULL, NULL, '',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Transliteration/data/xff.php b/web/core/lib/Drupal/Component/Transliteration/data/xff.php
index 808529806..3f669bd23 100644
--- a/web/core/lib/Drupal/Component/Transliteration/data/xff.php
+++ b/web/core/lib/Drupal/Component/Transliteration/data/xff.php
@@ -5,7 +5,7 @@
  * Generic transliteration data for the PhpTransliteration class.
  */
 
-$base = array(
+$base = [
   0x00 => NULL, '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/',
   0x10 => '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?',
   0x20 => '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
@@ -22,4 +22,4 @@ $base = array(
   0xD0 => NULL, NULL, 'yo', 'u', 'wo', 'we', 'wi', 'yu', NULL, NULL, 'eu', 'ui', 'i', NULL, NULL, NULL,
   0xE0 => '/C', 'PS', '!', '-', '|', 'Y=', 'W=', NULL, '|', '-', '|', '-', '|', '#', 'O', NULL,
   0xF0 => NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '{', '|', '}', '', '', '', '',
-);
+];
diff --git a/web/core/lib/Drupal/Component/Utility/ArgumentsResolver.php b/web/core/lib/Drupal/Component/Utility/ArgumentsResolver.php
index e04cc353a..0bd53b214 100644
--- a/web/core/lib/Drupal/Component/Utility/ArgumentsResolver.php
+++ b/web/core/lib/Drupal/Component/Utility/ArgumentsResolver.php
@@ -49,7 +49,7 @@ class ArgumentsResolver implements ArgumentsResolverInterface {
    * {@inheritdoc}
    */
   public function getArguments(callable $callable) {
-    $arguments = array();
+    $arguments = [];
     foreach ($this->getReflector($callable)->getParameters() as $parameter) {
       $arguments[] = $this->getArgument($parameter);
     }
diff --git a/web/core/lib/Drupal/Component/Utility/Color.php b/web/core/lib/Drupal/Component/Utility/Color.php
index d53261ca6..aa296e94b 100644
--- a/web/core/lib/Drupal/Component/Utility/Color.php
+++ b/web/core/lib/Drupal/Component/Utility/Color.php
@@ -56,11 +56,11 @@ class Color {
 
     $c = hexdec($hex);
 
-    return array(
+    return [
       'red' => $c >> 16 & 0xFF,
       'green' => $c >> 8 & 0xFF,
       'blue' => $c & 0xFF,
-    );
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Component/Utility/Crypt.php b/web/core/lib/Drupal/Component/Utility/Crypt.php
index ace4ebda1..6ebdc4aac 100644
--- a/web/core/lib/Drupal/Component/Utility/Crypt.php
+++ b/web/core/lib/Drupal/Component/Utility/Crypt.php
@@ -19,7 +19,8 @@ class Crypt {
    *
    * In PHP 7 and up, this uses the built-in PHP function random_bytes().
    * In older PHP versions, this uses the random_bytes() function provided by
-   * the random_compat library.
+   * the random_compat library, or the fallback hash-based generator from Drupal
+   * 7.x.
    *
    * @param int $count
    *   The number of characters (bytes) to return in the string.
@@ -28,7 +29,43 @@ class Crypt {
    *   A randomly generated string.
    */
   public static function randomBytes($count) {
-    return random_bytes($count);
+    try {
+      return random_bytes($count);
+    }
+    catch (\Exception $e) {
+      // $random_state does not use drupal_static as it stores random bytes.
+      static $random_state, $bytes;
+      // If the compatibility library fails, this simple hash-based PRNG will
+      // generate a good set of pseudo-random bytes on any system.
+      // Note that it may be important that our $random_state is passed
+      // through hash() prior to being rolled into $output, that the two hash()
+      // invocations are different, and that the extra input into the first one
+      // - the microtime() - is prepended rather than appended. This is to avoid
+      // directly leaking $random_state via the $output stream, which could
+      // allow for trivial prediction of further "random" numbers.
+      if (strlen($bytes) < $count) {
+        // Initialize on the first call. The $_SERVER variable includes user and
+        // system-specific information that varies a little with each page.
+        if (!isset($random_state)) {
+          $random_state = print_r($_SERVER, TRUE);
+          if (function_exists('getmypid')) {
+            // Further initialize with the somewhat random PHP process ID.
+            $random_state .= getmypid();
+          }
+          $bytes = '';
+          // Ensure mt_rand() is reseeded before calling it the first time.
+          mt_srand();
+        }
+
+        do {
+          $random_state = hash('sha256', microtime() . mt_rand() . $random_state);
+          $bytes .= hash('sha256', mt_rand() . $random_state, TRUE);
+        } while (strlen($bytes) < $count);
+      }
+      $output = substr($bytes, 0, $count);
+      $bytes = substr($bytes, $count);
+      return $output;
+    }
   }
 
   /**
diff --git a/web/core/lib/Drupal/Component/Utility/DiffArray.php b/web/core/lib/Drupal/Component/Utility/DiffArray.php
index 719049e30..825648eb7 100644
--- a/web/core/lib/Drupal/Component/Utility/DiffArray.php
+++ b/web/core/lib/Drupal/Component/Utility/DiffArray.php
@@ -25,7 +25,7 @@ class DiffArray {
    *   in array2.
    */
   public static function diffAssocRecursive(array $array1, array $array2) {
-    $difference = array();
+    $difference = [];
 
     foreach ($array1 as $key => $value) {
       if (is_array($value)) {
diff --git a/web/core/lib/Drupal/Component/Utility/Html.php b/web/core/lib/Drupal/Component/Utility/Html.php
index 5456cfaaf..75bb62f80 100644
--- a/web/core/lib/Drupal/Component/Utility/Html.php
+++ b/web/core/lib/Drupal/Component/Utility/Html.php
@@ -14,7 +14,7 @@ class Html {
    *
    * @var array
    */
-  protected static $classes = array();
+  protected static $classes = [];
 
   /**
    * An array of the initial IDs used in one request.
@@ -89,13 +89,13 @@ class Html {
    * @return string
    *   The cleaned identifier.
    */
-  public static function cleanCssIdentifier($identifier, array $filter = array(
+  public static function cleanCssIdentifier($identifier, array $filter = [
     ' ' => '-',
     '_' => '-',
     '/' => '-',
     '[' => '-',
     ']' => '',
-  )) {
+  ]) {
     // We could also use strtr() here but its much slower than str_replace(). In
     // order to keep '__' to stay '__' we first replace it with a different
     // placeholder after checking that it is not defined as a filter.
@@ -120,10 +120,10 @@ class Html {
     // We strip out any character not in the above list.
     $identifier = preg_replace('/[^\x{002D}\x{0030}-\x{0039}\x{0041}-\x{005A}\x{005F}\x{0061}-\x{007A}\x{00A1}-\x{FFFF}]/u', '', $identifier);
     // Identifiers cannot start with a digit, two hyphens, or a hyphen followed by a digit.
-    $identifier = preg_replace(array(
+    $identifier = preg_replace([
       '/^[0-9]/',
       '/^(-[0-9])|^(--)/'
-    ), array('_', '__'), $identifier);
+    ], ['_', '__'], $identifier);
     return $identifier;
   }
 
@@ -176,7 +176,7 @@ class Html {
     // @todo Remove all that code once we switch over to random IDs only,
     // see https://www.drupal.org/node/1090592.
     if (!isset(static::$seenIdsInit)) {
-      static::$seenIdsInit = array();
+      static::$seenIdsInit = [];
     }
     if (!isset(static::$seenIds)) {
       static::$seenIds = static::$seenIdsInit;
@@ -279,7 +279,7 @@ EOD;
     // PHP's \DOMDocument serialization adds extra whitespace when the markup
     // of the wrapping document contains newlines, so ensure we remove all
     // newlines before injecting the actual HTML body to be processed.
-    $document = strtr($document, array("\n" => '', '!html' => $html));
+    $document = strtr($document, ["\n" => '', '!html' => $html]);
 
     $dom = new \DOMDocument();
     // Ignore warnings during HTML soup loading.
diff --git a/web/core/lib/Drupal/Component/Utility/NestedArray.php b/web/core/lib/Drupal/Component/Utility/NestedArray.php
index 0b7cf4fa5..c11d6a658 100644
--- a/web/core/lib/Drupal/Component/Utility/NestedArray.php
+++ b/web/core/lib/Drupal/Component/Utility/NestedArray.php
@@ -150,7 +150,7 @@ class NestedArray {
       // PHP auto-creates container arrays and NULL entries without error if $ref
       // is NULL, but throws an error if $ref is set, but not an array.
       if ($force && isset($ref) && !is_array($ref)) {
-        $ref = array();
+        $ref = [];
       }
       $ref = &$ref[$parent];
     }
@@ -322,7 +322,7 @@ class NestedArray {
    * @see NestedArray::mergeDeep()
    */
   public static function mergeDeepArray(array $arrays, $preserve_integer_keys = FALSE) {
-    $result = array();
+    $result = [];
     foreach ($arrays as $array) {
       foreach ($array as $key => $value) {
         // Renumber integer keys as array_merge_recursive() does unless
@@ -333,7 +333,7 @@ class NestedArray {
         }
         // Recurse when both values are arrays.
         elseif (isset($result[$key]) && is_array($result[$key]) && is_array($value)) {
-          $result[$key] = self::mergeDeepArray(array($result[$key], $value), $preserve_integer_keys);
+          $result[$key] = self::mergeDeepArray([$result[$key], $value], $preserve_integer_keys);
         }
         // Otherwise, use the latter value, overriding any previous value.
         else {
diff --git a/web/core/lib/Drupal/Component/Utility/Random.php b/web/core/lib/Drupal/Component/Utility/Random.php
index 1aeeb958d..3c98b83b6 100644
--- a/web/core/lib/Drupal/Component/Utility/Random.php
+++ b/web/core/lib/Drupal/Component/Utility/Random.php
@@ -24,14 +24,14 @@ class Random {
    *
    * @var array
    */
-  protected $strings = array();
+  protected $strings = [];
 
   /**
    * A list of unique names generated by name().
    *
    * @var array
    */
-  protected $names = array();
+  protected $names = [];
 
   /**
    * Generates a random string of ASCII characters of codes 32 to 126.
@@ -141,9 +141,9 @@ class Random {
   public function word($length) {
     mt_srand((double) microtime() * 1000000);
 
-    $vowels = array("a", "e", "i", "o", "u");
-    $cons = array("b", "c", "d", "g", "h", "j", "k", "l", "m", "n", "p", "r", "s", "t", "u", "v", "w", "tr",
-      "cr", "br", "fr", "th", "dr", "ch", "ph", "wr", "st", "sp", "sw", "pr", "sl", "cl", "sh");
+    $vowels = ["a", "e", "i", "o", "u"];
+    $cons = ["b", "c", "d", "g", "h", "j", "k", "l", "m", "n", "p", "r", "s", "t", "u", "v", "w", "tr",
+      "cr", "br", "fr", "th", "dr", "ch", "ph", "wr", "st", "sp", "sw", "pr", "sl", "cl", "sh"];
 
     $num_vowels = count($vowels);
     $num_cons = count($cons);
@@ -190,7 +190,7 @@ class Random {
    *   Nonsense latin words which form sentence(s).
    */
   public function sentences($min_word_count, $capitalize = FALSE) {
-    $dictionary = array("abbas", "abdo", "abico", "abigo", "abluo", "accumsan",
+    $dictionary = ["abbas", "abdo", "abico", "abigo", "abluo", "accumsan",
       "acsi", "ad", "adipiscing", "aliquam", "aliquip", "amet", "antehabeo",
       "appellatio", "aptent", "at", "augue", "autem", "bene", "blandit",
       "brevitas", "caecus", "camur", "capto", "causa", "cogo", "comis",
@@ -219,7 +219,7 @@ class Random {
       "utrum", "uxor", "valde", "valetudo", "validus", "vel", "velit",
       "veniam", "venio", "vereor", "vero", "verto", "vicis", "vindico",
       "virtus", "voco", "volutpat", "vulpes", "vulputate", "wisi", "ymo",
-      "zelus");
+      "zelus"];
     $dictionary_flipped = array_flip($dictionary);
     $greeking = '';
 
diff --git a/web/core/lib/Drupal/Component/Utility/Tags.php b/web/core/lib/Drupal/Component/Utility/Tags.php
index 3f8ed13eb..ac0ce6081 100644
--- a/web/core/lib/Drupal/Component/Utility/Tags.php
+++ b/web/core/lib/Drupal/Component/Utility/Tags.php
@@ -25,7 +25,7 @@ class Tags {
     preg_match_all($regexp, $tags, $matches);
     $typed_tags = array_unique($matches[1]);
 
-    $tags = array();
+    $tags = [];
     foreach ($typed_tags as $tag) {
       // If a user has escaped a term (to demonstrate that it is a group,
       // or includes a comma or quote character), we remove the escape
@@ -65,7 +65,7 @@ class Tags {
    *   The imploded string.
    */
   public static function implode($tags) {
-    $encoded_tags = array();
+    $encoded_tags = [];
     foreach ($tags as $tag) {
       $encoded_tags[] = self::encode($tag);
     }
diff --git a/web/core/lib/Drupal/Component/Utility/Timer.php b/web/core/lib/Drupal/Component/Utility/Timer.php
index 959eeb339..b8dc02697 100644
--- a/web/core/lib/Drupal/Component/Utility/Timer.php
+++ b/web/core/lib/Drupal/Component/Utility/Timer.php
@@ -9,7 +9,7 @@ namespace Drupal\Component\Utility;
  */
 class Timer {
 
-  static protected $timers = array();
+  static protected $timers = [];
 
   /**
    * Starts the timer with the specified name.
diff --git a/web/core/lib/Drupal/Component/Utility/Unicode.php b/web/core/lib/Drupal/Component/Utility/Unicode.php
index f6b466848..98db80431 100644
--- a/web/core/lib/Drupal/Component/Utility/Unicode.php
+++ b/web/core/lib/Drupal/Component/Utility/Unicode.php
@@ -125,7 +125,7 @@ EOD;
    *   The new status of multibyte support.
    */
   public static function setStatus($status) {
-    if (!in_array($status, array(static::STATUS_SINGLEBYTE, static::STATUS_MULTIBYTE, static::STATUS_ERROR))) {
+    if (!in_array($status, [static::STATUS_SINGLEBYTE, static::STATUS_MULTIBYTE, static::STATUS_ERROR])) {
       throw new \InvalidArgumentException('Invalid status value for unicode support.');
     }
     static::$status = $status;
@@ -189,7 +189,7 @@ EOD;
    *   The name of the encoding, or FALSE if no byte order mark was present.
    */
   public static function encodingFromBOM($data) {
-    static $bomMap = array(
+    static $bomMap = [
       "\xEF\xBB\xBF" => 'UTF-8',
       "\xFE\xFF" => 'UTF-16BE',
       "\xFF\xFE" => 'UTF-16LE',
@@ -200,7 +200,7 @@ EOD;
       "\x2B\x2F\x76\x2B" => 'UTF-7',
       "\x2B\x2F\x76\x2F" => 'UTF-7',
       "\x2B\x2F\x76\x38\x2D" => 'UTF-7',
-    );
+    ];
 
     foreach ($bomMap as $bom => $encoding) {
       if (strpos($data, $bom) === 0) {
@@ -542,7 +542,7 @@ EOD;
     }
 
     if ($wordsafe) {
-      $matches = array();
+      $matches = [];
       // Find the last word boundary, if there is one within $min_wordsafe_length
       // to $max_length characters. preg_match() is always greedy, so it will
       // find the longest string possible.
diff --git a/web/core/lib/Drupal/Component/Utility/UrlHelper.php b/web/core/lib/Drupal/Component/Utility/UrlHelper.php
index 1395d818f..04c217b6a 100644
--- a/web/core/lib/Drupal/Component/Utility/UrlHelper.php
+++ b/web/core/lib/Drupal/Component/Utility/UrlHelper.php
@@ -14,7 +14,7 @@ class UrlHelper {
    *
    * @var array
    */
-  protected static $allowedProtocols = array('http', 'https');
+  protected static $allowedProtocols = ['http', 'https'];
 
   /**
    * Parses an array into a valid, rawurlencoded query string.
@@ -43,7 +43,7 @@ class UrlHelper {
    * @ingroup php_wrappers
    */
   public static function buildQuery(array $query, $parent = '') {
-    $params = array();
+    $params = [];
 
     foreach ($query as $key => $value) {
       $key = ($parent ? $parent . '[' . rawurlencode($key) . ']' : rawurlencode($key));
@@ -79,7 +79,7 @@ class UrlHelper {
    * @return
    *   An array containing query parameters.
    */
-  public static function filterQueryParameters(array $query, array $exclude = array(), $parent = '') {
+  public static function filterQueryParameters(array $query, array $exclude = [], $parent = '') {
     // If $exclude is empty, there is nothing to filter.
     if (empty($exclude)) {
       return $query;
@@ -88,7 +88,7 @@ class UrlHelper {
       $exclude = array_flip($exclude);
     }
 
-    $params = array();
+    $params = [];
     foreach ($query as $key => $value) {
       $string_key = ($parent ? $parent . '[' . $key . ']' : $key);
       if (isset($exclude[$string_key])) {
@@ -134,11 +134,11 @@ class UrlHelper {
    * @ingroup php_wrappers
    */
   public static function parse($url) {
-    $options = array(
+    $options = [
       'path' => NULL,
-      'query' => array(),
+      'query' => [],
       'fragment' => '',
-    );
+    ];
 
     // External URLs: not using parse_url() here, so we do not have to rebuild
     // the scheme, host, and path without having any use for it.
@@ -294,7 +294,7 @@ class UrlHelper {
    * @param array $protocols
    *   An array of protocols, for example http, https and irc.
    */
-  public static function setAllowedProtocols(array $protocols = array()) {
+  public static function setAllowedProtocols(array $protocols = []) {
     static::$allowedProtocols = $protocols;
   }
 
diff --git a/web/core/lib/Drupal/Component/Utility/UserAgent.php b/web/core/lib/Drupal/Component/Utility/UserAgent.php
index 2fc67d67d..c80c44e19 100644
--- a/web/core/lib/Drupal/Component/Utility/UserAgent.php
+++ b/web/core/lib/Drupal/Component/Utility/UserAgent.php
@@ -36,7 +36,7 @@ class UserAgent {
    *   The selected language code or FALSE if no valid language can be
    *   identified.
    */
-  public static function getBestMatchingLangcode($http_accept_language, $langcodes, $mappings = array()) {
+  public static function getBestMatchingLangcode($http_accept_language, $langcodes, $mappings = []) {
     // The Accept-Language header contains information about the language
     // preferences configured in the user's user agent / operating system.
     // RFC 2616 (section 14.4) defines the Accept-Language header as follows:
@@ -44,7 +44,7 @@ class UserAgent {
     //                  1#( language-range [ ";" "q" "=" qvalue ] )
     //   language-range  = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" )
     // Samples: "hu, en-us;q=0.66, en;q=0.33", "hu,en-us;q=0.5"
-    $ua_langcodes = array();
+    $ua_langcodes = [];
     if (preg_match_all('@(?<=[, ]|^)([a-zA-Z-]+|\*)(?:;q=([0-9.]+))?(?:$|\s*,\s*)@', trim($http_accept_language), $matches, PREG_SET_ORDER)) {
       foreach ($matches as $match) {
         if ($mappings) {
diff --git a/web/core/lib/Drupal/Component/Utility/Variable.php b/web/core/lib/Drupal/Component/Utility/Variable.php
index 5a8307971..c6c6935a9 100644
--- a/web/core/lib/Drupal/Component/Utility/Variable.php
+++ b/web/core/lib/Drupal/Component/Utility/Variable.php
@@ -43,7 +43,7 @@ class Variable {
         // If the string contains a line break or a single quote, use the
         // double quote export mode. Encode backslash, dollar symbols, and
         // double quotes and transform some common control characters.
-        $var = str_replace(array('\\', '$', '"', "\n", "\r", "\t"), array('\\\\', '\$', '\"', '\n', '\r', '\t'), $var);
+        $var = str_replace(['\\', '$', '"', "\n", "\r", "\t"], ['\\\\', '\$', '\"', '\n', '\r', '\t'], $var);
         $output = '"' . $var . '"';
       }
       else {
diff --git a/web/core/lib/Drupal/Component/Utility/Xss.php b/web/core/lib/Drupal/Component/Utility/Xss.php
index d9f24b4e8..f5e99fe88 100644
--- a/web/core/lib/Drupal/Component/Utility/Xss.php
+++ b/web/core/lib/Drupal/Component/Utility/Xss.php
@@ -16,7 +16,7 @@ class Xss {
    *
    * @see \Drupal\Component\Utility\Xss::filterAdmin()
    */
-  protected static $adminTags = array('a', 'abbr', 'acronym', 'address', 'article', 'aside', 'b', 'bdi', 'bdo', 'big', 'blockquote', 'br', 'caption', 'cite', 'code', 'col', 'colgroup', 'command', 'dd', 'del', 'details', 'dfn', 'div', 'dl', 'dt', 'em', 'figcaption', 'figure', 'footer', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hgroup', 'hr', 'i', 'img', 'ins', 'kbd', 'li', 'mark', 'menu', 'meter', 'nav', 'ol', 'output', 'p', 'pre', 'progress', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'section', 'small', 'span', 'strong', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time', 'tr', 'tt', 'u', 'ul', 'var', 'wbr');
+  protected static $adminTags = ['a', 'abbr', 'acronym', 'address', 'article', 'aside', 'b', 'bdi', 'bdo', 'big', 'blockquote', 'br', 'caption', 'cite', 'code', 'col', 'colgroup', 'command', 'dd', 'del', 'details', 'dfn', 'div', 'dl', 'dt', 'em', 'figcaption', 'figure', 'footer', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hgroup', 'hr', 'i', 'img', 'ins', 'kbd', 'li', 'mark', 'menu', 'meter', 'nav', 'ol', 'output', 'p', 'pre', 'progress', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'section', 'small', 'span', 'strong', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time', 'tr', 'tt', 'u', 'ul', 'var', 'wbr'];
 
   /**
    * The default list of HTML tags allowed by filter().
@@ -25,7 +25,7 @@ class Xss {
    *
    * @see \Drupal\Component\Utility\Xss::filter()
    */
-  protected static $htmlTags = array('a', 'em', 'strong', 'cite', 'blockquote', 'code', 'ul', 'ol', 'li', 'dl', 'dt', 'dd');
+  protected static $htmlTags = ['a', 'em', 'strong', 'cite', 'blockquote', 'code', 'ul', 'ol', 'li', 'dl', 'dt', 'dd'];
 
   /**
    * Filters HTML to prevent cross-site-scripting (XSS) vulnerabilities.
@@ -196,7 +196,7 @@ class Xss {
    *   Cleaned up version of the HTML attributes.
    */
   protected static function attributes($attributes) {
-    $attributes_array = array();
+    $attributes_array = [];
     $mode = 0;
     $attribute_name = '';
     $skip = FALSE;
@@ -221,12 +221,12 @@ class Xss {
             // such attributes.
             // @see \Drupal\Component\Utility\UrlHelper::filterBadProtocol()
             // @see http://www.w3.org/TR/html4/index/attributes.html
-            $skip_protocol_filtering = substr($attribute_name, 0, 5) === 'data-' || in_array($attribute_name, array(
+            $skip_protocol_filtering = substr($attribute_name, 0, 5) === 'data-' || in_array($attribute_name, [
               'title',
               'alt',
               'rel',
               'property',
-            ));
+            ]);
 
             $working = $mode = 1;
             $attributes = preg_replace('/^[-a-zA-Z][-a-zA-Z0-9]*/', '', $attributes);
diff --git a/web/core/lib/Drupal/Component/Utility/composer.json b/web/core/lib/Drupal/Component/Utility/composer.json
index a23634fac..13671efef 100644
--- a/web/core/lib/Drupal/Component/Utility/composer.json
+++ b/web/core/lib/Drupal/Component/Utility/composer.json
@@ -6,7 +6,7 @@
   "license": "GPL-2.0+",
   "require": {
     "php": ">=5.5.9",
-    "paragonie/random_compat": "~1.0",
+    "paragonie/random_compat": "^1.0|^2.0",
     "drupal/core-render": "~8.2"
   },
   "autoload": {
diff --git a/web/core/lib/Drupal/Core/Access/AccessManager.php b/web/core/lib/Drupal/Core/Access/AccessManager.php
index b0a71ae45..b7b7c0bfc 100644
--- a/web/core/lib/Drupal/Core/Access/AccessManager.php
+++ b/web/core/lib/Drupal/Core/Access/AccessManager.php
@@ -78,7 +78,7 @@ class AccessManager implements AccessManagerInterface {
   /**
    * {@inheritdoc}
    */
-  public function checkNamedRoute($route_name, array $parameters = array(), AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function checkNamedRoute($route_name, array $parameters = [], AccountInterface $account = NULL, $return_as_object = FALSE) {
     try {
       $route = $this->routeProvider->getRouteByName($route_name, $parameters);
 
@@ -120,7 +120,7 @@ class AccessManager implements AccessManagerInterface {
       $account = $this->currentUser;
     }
     $route = $route_match->getRouteObject();
-    $checks = $route->getOption('_access_checks') ?: array();
+    $checks = $route->getOption('_access_checks') ?: [];
 
     // Filter out checks which require the incoming request.
     if (!isset($request)) {
@@ -130,10 +130,6 @@ class AccessManager implements AccessManagerInterface {
     $result = AccessResult::neutral();
     if (!empty($checks)) {
       $arguments_resolver = $this->argumentsResolverFactory->getArgumentsResolver($route_match, $account, $request);
-
-      if (!$checks) {
-        return AccessResult::neutral();
-      }
       $result = AccessResult::allowed();
       foreach ($checks as $service_id) {
         $result = $result->andIf($this->performCheck($service_id, $arguments_resolver));
diff --git a/web/core/lib/Drupal/Core/Access/AccessManagerInterface.php b/web/core/lib/Drupal/Core/Access/AccessManagerInterface.php
index fc2a0e83c..bbb1ec95e 100644
--- a/web/core/lib/Drupal/Core/Access/AccessManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Access/AccessManagerInterface.php
@@ -33,7 +33,7 @@ interface AccessManagerInterface {
    *   returned, i.e. TRUE means access is explicitly allowed, FALSE means
    *   access is either explicitly forbidden or "no opinion".
    */
-  public function checkNamedRoute($route_name, array $parameters = array(), AccountInterface $account = NULL, $return_as_object = FALSE);
+  public function checkNamedRoute($route_name, array $parameters = [], AccountInterface $account = NULL, $return_as_object = FALSE);
 
   /**
    * Execute access checks against the incoming request.
diff --git a/web/core/lib/Drupal/Core/Access/AccessResult.php b/web/core/lib/Drupal/Core/Access/AccessResult.php
index f67b9f529..1cd6b8bac 100644
--- a/web/core/lib/Drupal/Core/Access/AccessResult.php
+++ b/web/core/lib/Drupal/Core/Access/AccessResult.php
@@ -31,17 +31,22 @@ abstract class AccessResult implements AccessResultInterface, RefinableCacheable
   /**
    * Creates an AccessResultInterface object with isNeutral() === TRUE.
    *
-   * @return \Drupal\Core\Access\AccessResult
+   * @param string|null $reason
+   *   (optional) The reason why access is forbidden. Intended for developers,
+   *   hence not translatable.
+   *
+   * @return \Drupal\Core\Access\AccessResultNeutral
    *   isNeutral() will be TRUE.
    */
-  public static function neutral() {
-    return new AccessResultNeutral();
+  public static function neutral($reason = NULL) {
+    assert('is_string($reason) || is_null($reason)');
+    return new AccessResultNeutral($reason);
   }
 
   /**
    * Creates an AccessResultInterface object with isAllowed() === TRUE.
    *
-   * @return \Drupal\Core\Access\AccessResult
+   * @return \Drupal\Core\Access\AccessResultAllowed
    *   isAllowed() will be TRUE.
    */
   public static function allowed() {
@@ -55,7 +60,7 @@ abstract class AccessResult implements AccessResultInterface, RefinableCacheable
    *   (optional) The reason why access is forbidden. Intended for developers,
    *   hence not translatable.
    *
-   * @return \Drupal\Core\Access\AccessResult
+   * @return \Drupal\Core\Access\AccessResultForbidden
    *   isForbidden() will be TRUE.
    */
   public static function forbidden($reason = NULL) {
@@ -106,7 +111,12 @@ abstract class AccessResult implements AccessResultInterface, RefinableCacheable
    *   isNeutral() will be TRUE.
    */
   public static function allowedIfHasPermission(AccountInterface $account, $permission) {
-    return static::allowedIf($account->hasPermission($permission))->addCacheContexts(['user.permissions']);
+    $access_result = static::allowedIf($account->hasPermission($permission))->addCacheContexts(['user.permissions']);
+
+    if ($access_result instanceof AccessResultReasonInterface) {
+      $access_result->setReason("The '$permission' permission is required.");
+    }
+    return $access_result;
   }
 
   /**
@@ -147,7 +157,21 @@ abstract class AccessResult implements AccessResultInterface, RefinableCacheable
       }
     }
 
-    return static::allowedIf($access)->addCacheContexts(empty($permissions) ? [] : ['user.permissions']);
+    $access_result = static::allowedIf($access)->addCacheContexts(empty($permissions) ? [] : ['user.permissions']);
+
+    if ($access_result instanceof AccessResultReasonInterface) {
+      if (count($permissions) === 1) {
+        $access_result->setReason("The '$permission' permission is required.");
+      }
+      elseif (count($permissions) > 1) {
+        $quote = function ($s) {
+          return "'$s'";
+        };
+        $access_result->setReason(sprintf("The following permissions are required: %s.", implode(" $conjunction ", array_map($quote, $permissions))));
+      }
+    }
+
+    return $access_result;
   }
 
   /**
@@ -237,7 +261,7 @@ abstract class AccessResult implements AccessResultInterface, RefinableCacheable
    * @return $this
    */
   public function cachePerPermissions() {
-    $this->addCacheContexts(array('user.permissions'));
+    $this->addCacheContexts(['user.permissions']);
     return $this;
   }
 
@@ -247,7 +271,7 @@ abstract class AccessResult implements AccessResultInterface, RefinableCacheable
    * @return $this
    */
   public function cachePerUser() {
-    $this->addCacheContexts(array('user'));
+    $this->addCacheContexts(['user']);
     return $this;
   }
 
@@ -308,6 +332,13 @@ abstract class AccessResult implements AccessResultInterface, RefinableCacheable
       if (!$this->isForbidden() || ($this->getCacheMaxAge() === 0 && $other->isForbidden())) {
         $merge_other = TRUE;
       }
+
+      if ($this->isForbidden() && $this instanceof AccessResultReasonInterface) {
+        $result->setReason($this->getReason());
+      }
+      elseif ($other->isForbidden() && $other instanceof AccessResultReasonInterface) {
+        $result->setReason($other->getReason());
+      }
     }
     elseif ($this->isAllowed() || $other->isAllowed()) {
       $result = static::allowed();
@@ -319,6 +350,14 @@ abstract class AccessResult implements AccessResultInterface, RefinableCacheable
       $result = static::neutral();
       if (!$this->isNeutral() || ($this->getCacheMaxAge() === 0 && $other->isNeutral()) || ($this->getCacheMaxAge() !== 0 && $other instanceof CacheableDependencyInterface && $other->getCacheMaxAge() !== 0)) {
         $merge_other = TRUE;
+        if ($other instanceof AccessResultReasonInterface) {
+          $result->setReason($other->getReason());
+        }
+      }
+      else {
+        if ($this instanceof AccessResultReasonInterface) {
+          $result->setReason($this->getReason());
+        }
       }
     }
     $result->inheritCacheability($this);
@@ -358,6 +397,14 @@ abstract class AccessResult implements AccessResultInterface, RefinableCacheable
       $result = static::neutral();
       if (!$this->isNeutral()) {
         $merge_other = TRUE;
+        if ($other instanceof AccessResultReasonInterface) {
+          $result->setReason($other->getReason());
+        }
+      }
+      else {
+        if ($this instanceof AccessResultReasonInterface) {
+          $result->setReason($this->getReason());
+        }
       }
     }
     $result->inheritCacheability($this);
diff --git a/web/core/lib/Drupal/Core/Access/AccessResultNeutral.php b/web/core/lib/Drupal/Core/Access/AccessResultNeutral.php
index 7a180f80c..2fb75eb50 100644
--- a/web/core/lib/Drupal/Core/Access/AccessResultNeutral.php
+++ b/web/core/lib/Drupal/Core/Access/AccessResultNeutral.php
@@ -5,7 +5,24 @@ namespace Drupal\Core\Access;
 /**
  * Value object indicating a neutral access result, with cacheability metadata.
  */
-class AccessResultNeutral extends AccessResult {
+class AccessResultNeutral extends AccessResult implements AccessResultReasonInterface {
+
+  /**
+   * The reason why access is neutral. For use in messages.
+   *
+   * @var string|null
+   */
+  protected $reason;
+
+  /**
+   * Constructs a new AccessResultNeutral instance.
+   *
+   * @param null|string $reason
+   *   (optional) a message to provide details about this access result
+   */
+  public function __construct($reason = NULL) {
+    $this->reason = $reason;
+  }
 
   /**
    * {@inheritdoc}
@@ -14,4 +31,19 @@ class AccessResultNeutral extends AccessResult {
     return TRUE;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getReason() {
+    return $this->reason;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setReason($reason) {
+    $this->reason = $reason;
+    return $this;
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Access/CheckProvider.php b/web/core/lib/Drupal/Core/Access/CheckProvider.php
index c68cf38a2..d6ba1cf6d 100644
--- a/web/core/lib/Drupal/Core/Access/CheckProvider.php
+++ b/web/core/lib/Drupal/Core/Access/CheckProvider.php
@@ -20,7 +20,7 @@ class CheckProvider implements CheckProviderInterface, ContainerAwareInterface {
    *
    * @var array
    */
-  protected $checkIds = array();
+  protected $checkIds = [];
 
   /**
    * Array of access check objects keyed by service id.
@@ -34,12 +34,12 @@ class CheckProvider implements CheckProviderInterface, ContainerAwareInterface {
    *
    * @var array
    */
-  protected $checkMethods = array();
+  protected $checkMethods = [];
 
   /**
    * Array of access checks which only will be run on the incoming request.
    */
-  protected $checksNeedsRequest = array();
+  protected $checksNeedsRequest = [];
 
   /**
    * An array to map static requirement keys to service IDs.
@@ -58,7 +58,7 @@ class CheckProvider implements CheckProviderInterface, ContainerAwareInterface {
   /**
    * {@inheritdoc}
    */
-  public function addCheckService($service_id, $service_method, array $applies_checks = array(), $needs_incoming_request = FALSE) {
+  public function addCheckService($service_id, $service_method, array $applies_checks = [], $needs_incoming_request = FALSE) {
     $this->checkIds[] = $service_id;
     $this->checkMethods[$service_id] = $service_method;
     if ($needs_incoming_request) {
@@ -102,7 +102,7 @@ class CheckProvider implements CheckProviderInterface, ContainerAwareInterface {
       if (!($check instanceof AccessInterface)) {
         throw new AccessException('All access checks must implement AccessInterface.');
       }
-      if (!is_callable(array($check, $this->checkMethods[$service_id]))) {
+      if (!is_callable([$check, $this->checkMethods[$service_id]])) {
         throw new AccessException(sprintf('Access check method %s in service %s must be callable.', $this->checkMethods[$service_id], $service_id));
       }
 
@@ -122,7 +122,7 @@ class CheckProvider implements CheckProviderInterface, ContainerAwareInterface {
    *   route.
    */
   protected function applies(Route $route) {
-    $checks = array();
+    $checks = [];
 
     // Iterate through map requirements from appliesTo() on access checkers.
     // Only iterate through all checkIds if this is not used.
@@ -151,7 +151,7 @@ class CheckProvider implements CheckProviderInterface, ContainerAwareInterface {
     }
 
     // Set them here, so we can use the isset() check above.
-    $this->dynamicRequirementMap = array();
+    $this->dynamicRequirementMap = [];
 
     foreach ($this->checkIds as $service_id) {
       if (empty($this->checks[$service_id])) {
diff --git a/web/core/lib/Drupal/Core/Access/CheckProviderInterface.php b/web/core/lib/Drupal/Core/Access/CheckProviderInterface.php
index bb0dd4af9..a94a92c97 100644
--- a/web/core/lib/Drupal/Core/Access/CheckProviderInterface.php
+++ b/web/core/lib/Drupal/Core/Access/CheckProviderInterface.php
@@ -37,7 +37,7 @@ interface CheckProviderInterface {
    * @param bool $needs_incoming_request
    *   (optional) True if access-check method only acts on an incoming request.
    */
-  public function addCheckService($service_id, $service_method, array $applies_checks = array(), $needs_incoming_request = FALSE);
+  public function addCheckService($service_id, $service_method, array $applies_checks = [], $needs_incoming_request = FALSE);
 
   /**
    * Lazy-loads access check services.
diff --git a/web/core/lib/Drupal/Core/Access/CsrfAccessCheck.php b/web/core/lib/Drupal/Core/Access/CsrfAccessCheck.php
index 753a00899..48e75acb5 100644
--- a/web/core/lib/Drupal/Core/Access/CsrfAccessCheck.php
+++ b/web/core/lib/Drupal/Core/Access/CsrfAccessCheck.php
@@ -58,7 +58,7 @@ class CsrfAccessCheck implements RoutingAccessInterface {
       $result = AccessResult::allowed();
     }
     else {
-      $result = AccessResult::forbidden();
+      $result = AccessResult::forbidden($request->query->has('token') ? "'csrf_token' URL query argument is invalid." : "'csrf_token' URL query argument is missing.");
     }
     // Not cacheable because the CSRF token is highly dynamic.
     return $result->setCacheMaxAge(0);
diff --git a/web/core/lib/Drupal/Core/Access/CsrfRequestHeaderAccessCheck.php b/web/core/lib/Drupal/Core/Access/CsrfRequestHeaderAccessCheck.php
index 5548c7f90..563355a6b 100644
--- a/web/core/lib/Drupal/Core/Access/CsrfRequestHeaderAccessCheck.php
+++ b/web/core/lib/Drupal/Core/Access/CsrfRequestHeaderAccessCheck.php
@@ -64,7 +64,7 @@ class CsrfRequestHeaderAccessCheck implements AccessCheckInterface {
         $methods = explode('|', $requirements['_method']);
         // CSRF protection only applies to write operations, so we can filter
         // out any routes that require reading methods only.
-        $write_methods = array_diff($methods, array('GET', 'HEAD', 'OPTIONS', 'TRACE'));
+        $write_methods = array_diff($methods, ['GET', 'HEAD', 'OPTIONS', 'TRACE']);
         if (empty($write_methods)) {
           return FALSE;
         }
@@ -93,7 +93,7 @@ class CsrfRequestHeaderAccessCheck implements AccessCheckInterface {
     // 1. this is a write operation
     // 2. the user was successfully authenticated and
     // 3. the request comes with a session cookie.
-    if (!in_array($method, array('GET', 'HEAD', 'OPTIONS', 'TRACE'))
+    if (!in_array($method, ['GET', 'HEAD', 'OPTIONS', 'TRACE'])
       && $account->isAuthenticated()
       && $this->sessionConfiguration->hasSession($request)
     ) {
diff --git a/web/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php b/web/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php
index ce0a2611e..9f2e7d409 100644
--- a/web/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php
+++ b/web/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Access;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\RouteProcessor\OutboundRouteProcessorInterface;
 use Symfony\Component\Routing\Route;
@@ -24,7 +25,7 @@ class RouteProcessorCsrf implements OutboundRouteProcessorInterface {
    * @param \Drupal\Core\Access\CsrfTokenGenerator $csrf_token
    *   The CSRF token generator.
    */
-  function __construct(CsrfTokenGenerator $csrf_token) {
+  public function __construct(CsrfTokenGenerator $csrf_token) {
     $this->csrfToken = $csrf_token;
   }
 
@@ -45,7 +46,7 @@ class RouteProcessorCsrf implements OutboundRouteProcessorInterface {
       }
       else {
         // Generate a placeholder and a render array to replace it.
-        $placeholder = hash('sha1', $path);
+        $placeholder = Crypt::hashBase64($path);
         $placeholder_render_array = [
           '#lazy_builder' => ['route_processor_csrf:renderPlaceholderCsrfToken', [$path]],
         ];
diff --git a/web/core/lib/Drupal/Core/Action/ConfigurableActionBase.php b/web/core/lib/Drupal/Core/Action/ConfigurableActionBase.php
index 6c19540bd..cde7d5699 100644
--- a/web/core/lib/Drupal/Core/Action/ConfigurableActionBase.php
+++ b/web/core/lib/Drupal/Core/Action/ConfigurableActionBase.php
@@ -24,7 +24,7 @@ abstract class ConfigurableActionBase extends ActionBase implements Configurable
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array();
+    return [];
   }
 
   /**
@@ -51,7 +51,7 @@ abstract class ConfigurableActionBase extends ActionBase implements Configurable
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/AddCssCommand.php b/web/core/lib/Drupal/Core/Ajax/AddCssCommand.php
index fbb5ce4bb..80ee17aa0 100644
--- a/web/core/lib/Drupal/Core/Ajax/AddCssCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/AddCssCommand.php
@@ -39,10 +39,10 @@ class AddCssCommand implements CommandInterface {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'add_css',
       'data' => $this->styles,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/AfterCommand.php b/web/core/lib/Drupal/Core/Ajax/AfterCommand.php
index 05060a6ce..41e232d20 100644
--- a/web/core/lib/Drupal/Core/Ajax/AfterCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/AfterCommand.php
@@ -23,13 +23,13 @@ class AfterCommand extends InsertCommand {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'insert',
       'method' => 'after',
       'selector' => $this->selector,
       'data' => $this->getRenderedContent(),
       'settings' => $this->settings,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/AjaxResponse.php b/web/core/lib/Drupal/Core/Ajax/AjaxResponse.php
index 4b12578d8..4d1c12334 100644
--- a/web/core/lib/Drupal/Core/Ajax/AjaxResponse.php
+++ b/web/core/lib/Drupal/Core/Ajax/AjaxResponse.php
@@ -21,7 +21,7 @@ class AjaxResponse extends JsonResponse implements AttachmentsInterface {
    *
    * @var array
    */
-  protected $commands = array();
+  protected $commands = [];
 
   /**
    * Add an AJAX command to the response.
diff --git a/web/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php b/web/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php
index 45aa45e4f..ee5208b07 100644
--- a/web/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php
+++ b/web/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php
@@ -167,7 +167,7 @@ class AjaxResponseAttachmentsProcessor implements AttachmentsResponseProcessorIn
     }
 
     // Prepend commands to add the assets, preserving their relative order.
-    $resource_commands = array();
+    $resource_commands = [];
     if ($css_assets) {
       $css_render_array = $this->cssCollectionRenderer->render($css_assets);
       $resource_commands[] = new AddCssCommand($this->renderer->renderPlain($css_render_array));
diff --git a/web/core/lib/Drupal/Core/Ajax/AlertCommand.php b/web/core/lib/Drupal/Core/Ajax/AlertCommand.php
index 46388d005..360036f45 100644
--- a/web/core/lib/Drupal/Core/Ajax/AlertCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/AlertCommand.php
@@ -31,10 +31,10 @@ class AlertCommand implements CommandInterface {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'alert',
       'text' => $this->text,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/AppendCommand.php b/web/core/lib/Drupal/Core/Ajax/AppendCommand.php
index e1830914c..34c751d7e 100644
--- a/web/core/lib/Drupal/Core/Ajax/AppendCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/AppendCommand.php
@@ -23,13 +23,13 @@ class AppendCommand extends InsertCommand {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'insert',
       'method' => 'append',
       'selector' => $this->selector,
       'data' => $this->getRenderedContent(),
       'settings' => $this->settings,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/BaseCommand.php b/web/core/lib/Drupal/Core/Ajax/BaseCommand.php
index f15065796..eeb36cf2b 100644
--- a/web/core/lib/Drupal/Core/Ajax/BaseCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/BaseCommand.php
@@ -38,10 +38,10 @@ class BaseCommand implements CommandInterface {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => $this->command,
       'data' => $this->data,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/BeforeCommand.php b/web/core/lib/Drupal/Core/Ajax/BeforeCommand.php
index 04290e026..8de47c8e6 100644
--- a/web/core/lib/Drupal/Core/Ajax/BeforeCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/BeforeCommand.php
@@ -23,13 +23,13 @@ class BeforeCommand extends InsertCommand {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'insert',
       'method' => 'before',
       'selector' => $this->selector,
       'data' => $this->getRenderedContent(),
       'settings' => $this->settings,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/ChangedCommand.php b/web/core/lib/Drupal/Core/Ajax/ChangedCommand.php
index b128cfc4f..0027d7c59 100644
--- a/web/core/lib/Drupal/Core/Ajax/ChangedCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/ChangedCommand.php
@@ -50,11 +50,11 @@ class ChangedCommand implements CommandInterface {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'changed',
       'selector' => $this->selector,
       'asterisk' => $this->asterisk,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/CloseDialogCommand.php b/web/core/lib/Drupal/Core/Ajax/CloseDialogCommand.php
index fa58208b4..1feeb0c8c 100644
--- a/web/core/lib/Drupal/Core/Ajax/CloseDialogCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/CloseDialogCommand.php
@@ -40,11 +40,11 @@ class CloseDialogCommand implements CommandInterface {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => 'closeDialog',
       'selector' => $this->selector,
       'persist' => $this->persist,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/CssCommand.php b/web/core/lib/Drupal/Core/Ajax/CssCommand.php
index b12cc09fc..016c8134f 100644
--- a/web/core/lib/Drupal/Core/Ajax/CssCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/CssCommand.php
@@ -32,7 +32,7 @@ class CssCommand implements CommandInterface {
    *
    * @var array
    */
-  protected $css = array();
+  protected $css = [];
 
   /**
    * Constructs a CssCommand object.
@@ -42,7 +42,7 @@ class CssCommand implements CommandInterface {
    * @param array $css
    *   An array of CSS property/value pairs to set.
    */
-  public function __construct($selector, array $css = array()) {
+  public function __construct($selector, array $css = []) {
     $this->selector = $selector;
     $this->css = $css;
   }
@@ -67,11 +67,11 @@ class CssCommand implements CommandInterface {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'css',
       'selector' => $this->selector,
       'argument' => $this->css,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/DataCommand.php b/web/core/lib/Drupal/Core/Ajax/DataCommand.php
index 92b87bde8..a1bee2146 100644
--- a/web/core/lib/Drupal/Core/Ajax/DataCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/DataCommand.php
@@ -62,12 +62,12 @@ class DataCommand implements CommandInterface {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'data',
       'selector' => $this->selector,
       'name' => $this->name,
       'value' => $this->value,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/HtmlCommand.php b/web/core/lib/Drupal/Core/Ajax/HtmlCommand.php
index 39635c3ca..e39f08f59 100644
--- a/web/core/lib/Drupal/Core/Ajax/HtmlCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/HtmlCommand.php
@@ -23,13 +23,13 @@ class HtmlCommand extends InsertCommand {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'insert',
       'method' => 'html',
       'selector' => $this->selector,
       'data' => $this->getRenderedContent(),
       'settings' => $this->settings,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/InsertCommand.php b/web/core/lib/Drupal/Core/Ajax/InsertCommand.php
index 00cb616ef..1813e5006 100644
--- a/web/core/lib/Drupal/Core/Ajax/InsertCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/InsertCommand.php
@@ -66,13 +66,13 @@ class InsertCommand implements CommandInterface, CommandWithAttachedAssetsInterf
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'insert',
       'method' => NULL,
       'selector' => $this->selector,
       'data' => $this->getRenderedContent(),
       'settings' => $this->settings,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/InvokeCommand.php b/web/core/lib/Drupal/Core/Ajax/InvokeCommand.php
index 41958885b..46e37ffea 100644
--- a/web/core/lib/Drupal/Core/Ajax/InvokeCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/InvokeCommand.php
@@ -51,7 +51,7 @@ class InvokeCommand implements CommandInterface {
    * @param array $arguments
    *   An optional array of arguments to pass to the method.
    */
-  public function __construct($selector, $method, array $arguments = array()) {
+  public function __construct($selector, $method, array $arguments = []) {
     $this->selector = $selector;
     $this->method = $method;
     $this->arguments = $arguments;
@@ -62,12 +62,12 @@ class InvokeCommand implements CommandInterface {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'invoke',
       'selector' => $this->selector,
       'method' => $this->method,
       'args' => $this->arguments,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php b/web/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
index 30b65fac4..2b0fcdd26 100644
--- a/web/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
@@ -70,9 +70,9 @@ class OpenDialogCommand implements CommandInterface, CommandWithAttachedAssetsIn
    *   on the content of the dialog. If left empty, the settings will be
    *   populated automatically from the current request.
    */
-  public function __construct($selector, $title, $content, array $dialog_options = array(), $settings = NULL) {
+  public function __construct($selector, $title, $content, array $dialog_options = [], $settings = NULL) {
     $title = PlainTextOutput::renderFromHtml($title);
-    $dialog_options += array('title' => $title);
+    $dialog_options += ['title' => $title];
     $this->selector = $selector;
     $this->content = $content;
     $this->dialogOptions = $dialog_options;
@@ -128,13 +128,13 @@ class OpenDialogCommand implements CommandInterface, CommandWithAttachedAssetsIn
   public function render() {
     // For consistency ensure the modal option is set to TRUE or FALSE.
     $this->dialogOptions['modal'] = isset($this->dialogOptions['modal']) && $this->dialogOptions['modal'];
-    return array(
+    return [
       'command' => 'openDialog',
       'selector' => $this->selector,
       'settings' => $this->settings,
       'data' => $this->getRenderedContent(),
       'dialogOptions' => $this->dialogOptions,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php b/web/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php
index edb4fe308..53d6e823e 100644
--- a/web/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/OpenModalDialogCommand.php
@@ -29,7 +29,7 @@ class OpenModalDialogCommand extends OpenDialogCommand {
    *   on the content of the dialog. If left empty, the settings will be
    *   populated automatically from the current request.
    */
-  public function __construct($title, $content, array $dialog_options = array(), $settings = NULL) {
+  public function __construct($title, $content, array $dialog_options = [], $settings = NULL) {
     $dialog_options['modal'] = TRUE;
     parent::__construct('#drupal-modal', $title, $content, $dialog_options, $settings);
   }
diff --git a/web/core/lib/Drupal/Core/Ajax/PrependCommand.php b/web/core/lib/Drupal/Core/Ajax/PrependCommand.php
index 5e41baec4..e3902b8f4 100644
--- a/web/core/lib/Drupal/Core/Ajax/PrependCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/PrependCommand.php
@@ -23,13 +23,13 @@ class PrependCommand extends InsertCommand {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'insert',
       'method' => 'prepend',
       'selector' => $this->selector,
       'data' => $this->getRenderedContent(),
       'settings' => $this->settings,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/RedirectCommand.php b/web/core/lib/Drupal/Core/Ajax/RedirectCommand.php
index 7dbf26eb9..572c62f46 100644
--- a/web/core/lib/Drupal/Core/Ajax/RedirectCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/RedirectCommand.php
@@ -31,10 +31,10 @@ class RedirectCommand implements CommandInterface {
    * Implements \Drupal\Core\Ajax\CommandInterface:render().
    */
   public function render() {
-    return array(
+    return [
       'command' => 'redirect',
       'url' => $this->url,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/RemoveCommand.php b/web/core/lib/Drupal/Core/Ajax/RemoveCommand.php
index c52211d80..d7f86ddd2 100644
--- a/web/core/lib/Drupal/Core/Ajax/RemoveCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/RemoveCommand.php
@@ -38,10 +38,10 @@ class RemoveCommand implements CommandInterface {
    * Implements Drupal\Core\Ajax\CommandInterface:render().
    */
   public function render() {
-    return array(
+    return [
       'command' => 'remove',
       'selector' => $this->selector,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/ReplaceCommand.php b/web/core/lib/Drupal/Core/Ajax/ReplaceCommand.php
index 8ccb7c125..25927b799 100644
--- a/web/core/lib/Drupal/Core/Ajax/ReplaceCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/ReplaceCommand.php
@@ -24,13 +24,13 @@ class ReplaceCommand extends InsertCommand {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'insert',
       'method' => 'replaceWith',
       'selector' => $this->selector,
       'data' => $this->getRenderedContent(),
       'settings' => $this->settings,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/RestripeCommand.php b/web/core/lib/Drupal/Core/Ajax/RestripeCommand.php
index 331e1bff0..33b7e2526 100644
--- a/web/core/lib/Drupal/Core/Ajax/RestripeCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/RestripeCommand.php
@@ -40,10 +40,10 @@ class RestripeCommand implements CommandInterface {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'restripe',
       'selector' => $this->selector,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/SetDialogOptionCommand.php b/web/core/lib/Drupal/Core/Ajax/SetDialogOptionCommand.php
index 9e7836b29..f24f97caf 100644
--- a/web/core/lib/Drupal/Core/Ajax/SetDialogOptionCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/SetDialogOptionCommand.php
@@ -52,12 +52,12 @@ class SetDialogOptionCommand implements CommandInterface {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => 'setDialogOption',
       'selector' => $this->selector,
       'optionName' => $this->optionName,
       'optionValue' => $this->optionValue,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Ajax/SettingsCommand.php b/web/core/lib/Drupal/Core/Ajax/SettingsCommand.php
index 154ab9c81..ca41720dc 100644
--- a/web/core/lib/Drupal/Core/Ajax/SettingsCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/SettingsCommand.php
@@ -54,11 +54,11 @@ class SettingsCommand implements CommandInterface {
    */
   public function render() {
 
-    return array(
+    return [
       'command' => 'settings',
       'settings' => $this->settings,
       'merge' => $this->merge,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Annotation/ContextDefinition.php b/web/core/lib/Drupal/Core/Annotation/ContextDefinition.php
index abe14e5c9..0ff61e6f1 100644
--- a/web/core/lib/Drupal/Core/Annotation/ContextDefinition.php
+++ b/web/core/lib/Drupal/Core/Annotation/ContextDefinition.php
@@ -99,11 +99,11 @@ class ContextDefinition extends Plugin {
    *   ContextDefinitionInterface implementing class.
    */
   public function __construct(array $values) {
-    $values += array(
+    $values += [
       'required' => TRUE,
       'multiple' => FALSE,
       'default_value' => NULL,
-    );
+    ];
     // Annotation classes extract data from passed annotation classes directly
     // used in the classes they pass to.
     foreach (['label', 'description'] as $key) {
diff --git a/web/core/lib/Drupal/Core/Annotation/Translation.php b/web/core/lib/Drupal/Core/Annotation/Translation.php
index 4fcfb9e45..90fe5e02d 100644
--- a/web/core/lib/Drupal/Core/Annotation/Translation.php
+++ b/web/core/lib/Drupal/Core/Annotation/Translation.php
@@ -74,12 +74,12 @@ class Translation extends AnnotationBase {
    */
   public function __construct(array $values) {
     $string = $values['value'];
-    $arguments = isset($values['arguments']) ? $values['arguments'] : array();
-    $options = array();
+    $arguments = isset($values['arguments']) ? $values['arguments'] : [];
+    $options = [];
     if (!empty($values['context'])) {
-      $options = array(
+      $options = [
         'context' => $values['context'],
-      );
+      ];
     }
     $this->translation = new TranslatableMarkup($string, $arguments, $options);
   }
diff --git a/web/core/lib/Drupal/Core/Archiver/ArchiverInterface.php b/web/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
index 38c62cb92..2e635364b 100644
--- a/web/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
+++ b/web/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
@@ -47,7 +47,7 @@ interface ArchiverInterface {
    * @return \Drupal\Core\Archiver\ArchiverInterface
    *   The called object.
    */
-  public function extract($path, array $files = array());
+  public function extract($path, array $files = []);
 
   /**
    * Lists all files in the archive.
diff --git a/web/core/lib/Drupal/Core/Archiver/ArchiverManager.php b/web/core/lib/Drupal/Core/Archiver/ArchiverManager.php
index ee2dad5d1..7cd11f90a 100644
--- a/web/core/lib/Drupal/Core/Archiver/ArchiverManager.php
+++ b/web/core/lib/Drupal/Core/Archiver/ArchiverManager.php
@@ -36,7 +36,7 @@ class ArchiverManager extends DefaultPluginManager {
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     $plugin_definition = $this->getDefinition($plugin_id);
     $plugin_class = DefaultFactory::getPluginClass($plugin_id, $plugin_definition, 'Drupal\Core\Archiver\ArchiverInterface');
     return new $plugin_class($configuration['filepath']);
diff --git a/web/core/lib/Drupal/Core/Archiver/Tar.php b/web/core/lib/Drupal/Core/Archiver/Tar.php
index 33f4de63c..3b33dddfe 100644
--- a/web/core/lib/Drupal/Core/Archiver/Tar.php
+++ b/web/core/lib/Drupal/Core/Archiver/Tar.php
@@ -52,7 +52,7 @@ class Tar implements ArchiverInterface {
   /**
    * {@inheritdoc}
    */
-  public function extract($path, array $files = array()) {
+  public function extract($path, array $files = []) {
     if ($files) {
       $this->tar->extractList($files, $path);
     }
@@ -67,7 +67,7 @@ class Tar implements ArchiverInterface {
    * {@inheritdoc}
    */
   public function listContents() {
-    $files = array();
+    $files = [];
     foreach ($this->tar->listContent() as $file_data) {
       $files[] = $file_data['filename'];
     }
diff --git a/web/core/lib/Drupal/Core/Archiver/Zip.php b/web/core/lib/Drupal/Core/Archiver/Zip.php
index 640bcde80..fd769c13c 100644
--- a/web/core/lib/Drupal/Core/Archiver/Zip.php
+++ b/web/core/lib/Drupal/Core/Archiver/Zip.php
@@ -29,7 +29,7 @@ class Zip implements ArchiverInterface {
   public function __construct($file_path) {
     $this->zip = new \ZipArchive();
     if ($this->zip->open($file_path) !== TRUE) {
-      throw new ArchiverException(t('Cannot open %file_path', array('%file_path' => $file_path)));
+      throw new ArchiverException(t('Cannot open %file_path', ['%file_path' => $file_path]));
     }
   }
 
@@ -54,7 +54,7 @@ class Zip implements ArchiverInterface {
   /**
    * {@inheritdoc}
    */
-  public function extract($path, array $files = array()) {
+  public function extract($path, array $files = []) {
     if ($files) {
       $this->zip->extractTo($path, $files);
     }
@@ -69,7 +69,7 @@ class Zip implements ArchiverInterface {
    * {@inheritdoc}
    */
   public function listContents() {
-    $files = array();
+    $files = [];
     for ($i = 0; $i < $this->zip->numFiles; $i++) {
       $files[] = $this->zip->getNameIndex($i);
     }
diff --git a/web/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php b/web/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php
index 2c4122d58..4dedfa6b3 100644
--- a/web/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php
+++ b/web/core/lib/Drupal/Core/Asset/CssCollectionGrouper.php
@@ -20,7 +20,7 @@ class CssCollectionGrouper implements AssetCollectionGrouperInterface {
    * type, media, and browsers, if needed to accommodate other items in between.
    */
   public function group(array $css_assets) {
-    $groups = array();
+    $groups = [];
     // If a group can contain multiple items, we track the information that must
     // be the same for each item in the group, so that when we iterate the next
     // item, we can determine if it can be put into the current group, or if a
@@ -52,7 +52,7 @@ class CssCollectionGrouper implements AssetCollectionGrouperInterface {
           // Group file items if their 'preprocess' flag is TRUE.
           // Help ensure maximum reuse of aggregate files by only grouping
           // together items that share the same 'group' value.
-          $group_keys = $item['preprocess'] ? array($item['type'], $item['group'], $item['media'], $item['browsers']) : FALSE;
+          $group_keys = $item['preprocess'] ? [$item['type'], $item['group'], $item['media'], $item['browsers']] : FALSE;
           break;
 
         case 'external':
@@ -71,7 +71,7 @@ class CssCollectionGrouper implements AssetCollectionGrouperInterface {
         // the group.
         $groups[$i] = $item;
         unset($groups[$i]['data'], $groups[$i]['weight'], $groups[$i]['basename']);
-        $groups[$i]['items'] = array();
+        $groups[$i]['items'] = [];
         $current_group_keys = $group_keys ? $group_keys : NULL;
       }
 
diff --git a/web/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php b/web/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php
index eb47cb2c5..5f23af497 100644
--- a/web/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php
+++ b/web/core/lib/Drupal/Core/Asset/CssCollectionOptimizer.php
@@ -80,8 +80,8 @@ class CssCollectionOptimizer implements AssetCollectionOptimizerInterface {
     // Drupal contrib can override this default CSS aggregator to keep the same
     // grouping, optimizing and dumping, but change the strategy that is used to
     // determine when the aggregate should be rebuilt (e.g. mtime, HTTPS …).
-    $map = $this->state->get('drupal_css_cache_files') ?: array();
-    $css_assets = array();
+    $map = $this->state->get('drupal_css_cache_files') ?: [];
+    $css_assets = [];
     foreach ($css_groups as $order => $css_group) {
       // We have to return a single asset, not a group of assets. It is now up
       // to one of the pieces of code in the switch statement below to set the
@@ -155,7 +155,7 @@ class CssCollectionOptimizer implements AssetCollectionOptimizerInterface {
    *   A hash to uniquely identify the given group of CSS assets.
    */
   protected function generateHash(array $css_group) {
-    $css_data = array();
+    $css_data = [];
     foreach ($css_group['items'] as $css_file) {
       $css_data[] = $css_file['data'];
     }
@@ -181,7 +181,7 @@ class CssCollectionOptimizer implements AssetCollectionOptimizerInterface {
         file_unmanaged_delete($uri);
       }
     };
-    file_scan_directory('public://css', '/.*/', array('callback' => $delete_stale));
+    file_scan_directory('public://css', '/.*/', ['callback' => $delete_stale]);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php b/web/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
index 63721e65f..c3c83e119 100644
--- a/web/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
+++ b/web/core/lib/Drupal/Core/Asset/CssCollectionRenderer.php
@@ -74,7 +74,7 @@ class CssCollectionRenderer implements AssetCollectionRendererInterface {
    * {@inheritdoc}
    */
   public function render(array $css_assets) {
-    $elements = array();
+    $elements = [];
 
     // A dummy query-string is added to filenames, to gain control over
     // browser-caching. The string changes on every update or full cache
@@ -83,22 +83,22 @@ class CssCollectionRenderer implements AssetCollectionRendererInterface {
     $query_string = $this->state->get('system.css_js_query_string') ?: '0';
 
     // Defaults for LINK and STYLE elements.
-    $link_element_defaults = array(
+    $link_element_defaults = [
       '#type' => 'html_tag',
       '#tag' => 'link',
-      '#attributes' => array(
+      '#attributes' => [
         'rel' => 'stylesheet',
-      ),
-    );
-    $style_element_defaults = array(
+      ],
+    ];
+    $style_element_defaults = [
       '#type' => 'html_tag',
       '#tag' => 'style',
-    );
+    ];
 
     // For filthy IE hack.
     $current_ie_group_keys = NULL;
     $get_ie_group_key = function ($css_asset) {
-      return array($css_asset['type'], $css_asset['preprocess'], $css_asset['group'], $css_asset['media'], $css_asset['browsers']);
+      return [$css_asset['type'], $css_asset['preprocess'], $css_asset['group'], $css_asset['media'], $css_asset['browsers']];
     };
 
     // Loop through all CSS assets, by key, to allow for the special IE
@@ -151,7 +151,7 @@ class CssCollectionRenderer implements AssetCollectionRendererInterface {
             // The file CSS asset can be aggregated, but hasn't been: combine
             // multiple items into as few STYLE tags as possible.
             else {
-              $import = array();
+              $import = [];
               // Start with the current CSS asset, iterate over subsequent CSS
               // assets and find which ones have the same 'type', 'group',
               // 'preprocess', 'media' and 'browsers' properties.
diff --git a/web/core/lib/Drupal/Core/Asset/CssOptimizer.php b/web/core/lib/Drupal/Core/Asset/CssOptimizer.php
index 87575e0e5..4ad7ba134 100644
--- a/web/core/lib/Drupal/Core/Asset/CssOptimizer.php
+++ b/web/core/lib/Drupal/Core/Asset/CssOptimizer.php
@@ -61,7 +61,7 @@ class CssOptimizer implements AssetOptimizerInterface {
     $this->rewriteFileURIBasePath = $css_base_path . '/';
 
     // Anchor all paths in the CSS with its base URL, ignoring external and absolute paths.
-    return preg_replace_callback('/url\(\s*[\'"]?(?![a-z]+:|\/+)([^\'")]+)[\'"]?\s*\)/i', array($this, 'rewriteFileURI'), $contents);
+    return preg_replace_callback('/url\(\s*[\'"]?(?![a-z]+:|\/+)([^\'")]+)[\'"]?\s*\)/i', [$this, 'rewriteFileURI'], $contents);
   }
 
   /**
@@ -205,8 +205,10 @@ class CssOptimizer implements AssetOptimizerInterface {
       // whitespace.
       // @see http://php.net/manual/regexp.reference.subpatterns.php
       $contents = preg_replace('<
+        # Do not strip any space from within single or double quotes
+          (' . $double_quot . '|' . $single_quot . ')
         # Strip leading and trailing whitespace.
-          \s*([@{};,])\s*
+        | \s*([@{};,])\s*
         # Strip only leading whitespace from:
         # - Closing parenthesis: Retain "@media (bar) and foo".
         | \s+([\)])
@@ -214,11 +216,11 @@ class CssOptimizer implements AssetOptimizerInterface {
         # - Opening parenthesis: Retain "@media (bar) and foo".
         # - Colon: Retain :pseudo-selectors.
         | ([\(:])\s+
-      >xS',
-        // Only one of the three capturing groups will match, so its reference
+      >xSs',
+        // Only one of the four capturing groups will match, so its reference
         // will contain the wanted value and the references for the
         // two non-matching groups will be replaced with empty strings.
-        '$1$2$3',
+        '$1$2$3$4',
         $contents
       );
       // End the file with a new line.
@@ -228,7 +230,7 @@ class CssOptimizer implements AssetOptimizerInterface {
 
     // Replaces @import commands with the actual stylesheet content.
     // This happens recursively but omits external files.
-    $contents = preg_replace_callback('/@import\s*(?:url\(\s*)?[\'"]?(?![a-z]+:)(?!\/\/)([^\'"\()]+)[\'"]?\s*\)?\s*;/', array($this, 'loadNestedFile'), $contents);
+    $contents = preg_replace_callback('/@import\s*(?:url\(\s*)?[\'"]?(?![a-z]+:)(?!\/\/)([^\'"\()]+)[\'"]?\s*\)?\s*;/', [$this, 'loadNestedFile'], $contents);
 
     return $contents;
   }
diff --git a/web/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php b/web/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php
index 710e3c0b9..9d29c40f2 100644
--- a/web/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php
+++ b/web/core/lib/Drupal/Core/Asset/JsCollectionGrouper.php
@@ -19,7 +19,7 @@ class JsCollectionGrouper implements AssetCollectionGrouperInterface {
    * type and browsers, if needed to accommodate other items in between.
    */
   public function group(array $js_assets) {
-    $groups = array();
+    $groups = [];
     // If a group can contain multiple items, we track the information that must
     // be the same for each item in the group, so that when we iterate the next
     // item, we can determine if it can be put into the current group, or if a
@@ -38,7 +38,7 @@ class JsCollectionGrouper implements AssetCollectionGrouperInterface {
           // Group file items if their 'preprocess' flag is TRUE.
           // Help ensure maximum reuse of aggregate files by only grouping
           // together items that share the same 'group' value.
-          $group_keys = $item['preprocess'] ? array($item['type'], $item['group'], $item['browsers']) : FALSE;
+          $group_keys = $item['preprocess'] ? [$item['type'], $item['group'], $item['browsers']] : FALSE;
           break;
 
         case 'external':
@@ -56,7 +56,7 @@ class JsCollectionGrouper implements AssetCollectionGrouperInterface {
         // unique to the item and should not be carried over to the group.
         $groups[$index] = $item;
         unset($groups[$index]['data'], $groups[$index]['weight']);
-        $groups[$index]['items'] = array();
+        $groups[$index]['items'] = [];
         $current_group_keys = $group_keys ? $group_keys : NULL;
       }
 
diff --git a/web/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php b/web/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
index 566722dfb..4d49d87b4 100644
--- a/web/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
+++ b/web/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php
@@ -81,8 +81,8 @@ class JsCollectionOptimizer implements AssetCollectionOptimizerInterface {
     // Drupal contrib can override this default JS aggregator to keep the same
     // grouping, optimizing and dumping, but change the strategy that is used to
     // determine when the aggregate should be rebuilt (e.g. mtime, HTTPS …).
-    $map = $this->state->get('system.js_cache_files') ?: array();
-    $js_assets = array();
+    $map = $this->state->get('system.js_cache_files') ?: [];
+    $js_assets = [];
     foreach ($js_groups as $order => $js_group) {
       // We have to return a single asset, not a group of assets. It is now up
       // to one of the pieces of code in the switch statement below to set the
@@ -159,7 +159,7 @@ class JsCollectionOptimizer implements AssetCollectionOptimizerInterface {
    *   A hash to uniquely identify the given group of JavaScript assets.
    */
   protected function generateHash(array $js_group) {
-    $js_data = array();
+    $js_data = [];
     foreach ($js_group['items'] as $js_file) {
       $js_data[] = $js_file['data'];
     }
@@ -184,7 +184,7 @@ class JsCollectionOptimizer implements AssetCollectionOptimizerInterface {
         file_unmanaged_delete($uri);
       }
     };
-    file_scan_directory('public://js', '/.*/', array('callback' => $delete_stale));
+    file_scan_directory('public://js', '/.*/', ['callback' => $delete_stale]);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php b/web/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
index 2e47d0f3d..d3a062c94 100644
--- a/web/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
+++ b/web/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
@@ -37,7 +37,7 @@ class JsCollectionRenderer implements AssetCollectionRendererInterface {
    * logic for grouping and aggregating files.
    */
   public function render(array $js_assets) {
-    $elements = array();
+    $elements = [];
 
     // A dummy query-string is added to filenames, to gain control over
     // browser-caching. The string changes on every update or full cache
@@ -47,11 +47,11 @@ class JsCollectionRenderer implements AssetCollectionRendererInterface {
     $default_query_string = $this->state->get('system.css_js_query_string') ?: '0';
 
     // Defaults for each SCRIPT element.
-    $element_defaults = array(
+    $element_defaults = [
       '#type' => 'html_tag',
       '#tag' => 'script',
       '#value' => '',
-    );
+    ];
 
     // Loop through all JS assets.
     foreach ($js_assets as $js_asset) {
@@ -62,12 +62,12 @@ class JsCollectionRenderer implements AssetCollectionRendererInterface {
       // Element properties that depend on item type.
       switch ($js_asset['type']) {
         case 'setting':
-          $element['#attributes'] = array(
+          $element['#attributes'] = [
             // This type attribute prevents this from being parsed as an
             // inline script.
             'type' => 'application/json',
             'data-drupal-selector' => 'drupal-settings-json',
-          );
+          ];
           $element['#value'] = Json::encode($js_asset['data']);
           break;
 
diff --git a/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php b/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
index 799ee07f9..b4c716d50 100644
--- a/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
+++ b/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
@@ -69,7 +69,7 @@ class LibraryDiscoveryParser {
    *   Thrown when a js file defines a positive weight.
    */
   public function buildByExtension($extension) {
-    $libraries = array();
+    $libraries = [];
 
     if ($extension === 'core') {
       $path = 'core';
@@ -92,7 +92,7 @@ class LibraryDiscoveryParser {
       if (!isset($library['js']) && !isset($library['css']) && !isset($library['drupalSettings'])) {
         throw new IncompleteLibraryDefinitionException(sprintf("Incomplete library definition for definition '%s' in extension '%s'", $id, $extension));
       }
-      $library += array('dependencies' => array(), 'js' => array(), 'css' => array());
+      $library += ['dependencies' => [], 'js' => [], 'css' => []];
 
       if (isset($library['header']) && !is_bool($library['header'])) {
         throw new \LogicException(sprintf("The 'header' key in the library definition '%s' in extension '%s' is invalid: it must be a boolean.", $id, $extension));
@@ -116,14 +116,14 @@ class LibraryDiscoveryParser {
 
       // Assign Drupal's license to libraries that don't have license info.
       if (!isset($library['license'])) {
-        $library['license'] = array(
+        $library['license'] = [
           'name' => 'GNU-GPL-2.0-or-later',
           'url' => 'https://www.drupal.org/licensing/faq',
           'gpl-compatible' => TRUE,
-        );
+        ];
       }
 
-      foreach (array('js', 'css') as $type) {
+      foreach (['js', 'css'] as $type) {
         // Prepare (flatten) the SMACSS-categorized definitions.
         // @todo After Asset(ic) changes, retain the definitions as-is and
         //   properly resolve dependencies for all (css) libraries per category,
@@ -145,7 +145,7 @@ class LibraryDiscoveryParser {
           unset($library[$type][$source]);
           // Allow to omit the options hashmap in YAML declarations.
           if (!is_array($options)) {
-            $options = array();
+            $options = [];
           }
           if ($type == 'js' && isset($options['weight']) && $options['weight'] > 0) {
             throw new \UnexpectedValueException("The $extension/$id library defines a positive weight for '$source'. Only negative weights are allowed (but should be avoided). Instead of a positive weight, specify accurate dependencies for this library.");
diff --git a/web/core/lib/Drupal/Core/Batch/BatchStorage.php b/web/core/lib/Drupal/Core/Batch/BatchStorage.php
index 789703c32..82f5b6576 100644
--- a/web/core/lib/Drupal/Core/Batch/BatchStorage.php
+++ b/web/core/lib/Drupal/Core/Batch/BatchStorage.php
@@ -58,10 +58,10 @@ class BatchStorage implements BatchStorageInterface {
     // Ensure that a session is started before using the CSRF token generator.
     $this->session->start();
     try {
-      $batch = $this->connection->query("SELECT batch FROM {batch} WHERE bid = :bid AND token = :token", array(
+      $batch = $this->connection->query("SELECT batch FROM {batch} WHERE bid = :bid AND token = :token", [
         ':bid' => $id,
         ':token' => $this->csrfToken->get($id),
-      ))->fetchField();
+      ])->fetchField();
     }
     catch (\Exception $e) {
       $this->catchException($e);
@@ -93,7 +93,7 @@ class BatchStorage implements BatchStorageInterface {
   public function update(array $batch) {
     try {
       $this->connection->update('batch')
-        ->fields(array('batch' => serialize($batch)))
+        ->fields(['batch' => serialize($batch)])
         ->condition('bid', $batch['id'])
         ->execute();
     }
@@ -150,12 +150,12 @@ class BatchStorage implements BatchStorageInterface {
    */
   protected function doCreate(array $batch) {
     $this->connection->insert('batch')
-      ->fields(array(
+      ->fields([
         'bid' => $batch['id'],
         'timestamp' => REQUEST_TIME,
         'token' => $this->csrfToken->get($batch['id']),
         'batch' => serialize($batch),
-      ))
+      ])
       ->execute();
   }
 
diff --git a/web/core/lib/Drupal/Core/Block/BlockBase.php b/web/core/lib/Drupal/Core/Block/BlockBase.php
index 02e5def89..ee9078335 100644
--- a/web/core/lib/Drupal/Core/Block/BlockBase.php
+++ b/web/core/lib/Drupal/Core/Block/BlockBase.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Core\Block;
 
-use Drupal\block\BlockInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContextAwarePluginAssignmentTrait;
@@ -83,19 +82,19 @@ abstract class BlockBase extends ContextAwarePluginBase implements BlockPluginIn
    *   An associative array with the default configuration.
    */
   protected function baseConfigurationDefaults() {
-    return array(
+    return [
       'id' => $this->getPluginId(),
       'label' => '',
       'provider' => $this->pluginDefinition['provider'],
-      'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
-    );
+      'label_display' => static::BLOCK_LABEL_VISIBLE,
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array();
+    return [];
   }
 
   /**
@@ -109,7 +108,7 @@ abstract class BlockBase extends ContextAwarePluginBase implements BlockPluginIn
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    return array();
+    return [];
   }
 
   /**
@@ -152,29 +151,29 @@ abstract class BlockBase extends ContextAwarePluginBase implements BlockPluginIn
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $definition = $this->getPluginDefinition();
-    $form['provider'] = array(
+    $form['provider'] = [
       '#type' => 'value',
       '#value' => $definition['provider'],
-    );
+    ];
 
-    $form['admin_label'] = array(
+    $form['admin_label'] = [
       '#type' => 'item',
       '#title' => $this->t('Block description'),
       '#plain_text' => $definition['admin_label'],
-    );
-    $form['label'] = array(
+    ];
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Title'),
       '#maxlength' => 255,
       '#default_value' => $this->label(),
       '#required' => TRUE,
-    );
-    $form['label_display'] = array(
+    ];
+    $form['label_display'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Display title'),
-      '#default_value' => ($this->configuration['label_display'] === BlockInterface::BLOCK_LABEL_VISIBLE),
-      '#return_value' => BlockInterface::BLOCK_LABEL_VISIBLE,
-    );
+      '#default_value' => ($this->configuration['label_display'] === static::BLOCK_LABEL_VISIBLE),
+      '#return_value' => static::BLOCK_LABEL_VISIBLE,
+    ];
 
     // Add context mapping UI form elements.
     $contexts = $form_state->getTemporaryValue('gathered_contexts') ?: [];
@@ -188,7 +187,7 @@ abstract class BlockBase extends ContextAwarePluginBase implements BlockPluginIn
    * {@inheritdoc}
    */
   public function blockForm($form, FormStateInterface $form_state) {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Block/BlockManager.php b/web/core/lib/Drupal/Core/Block/BlockManager.php
index 3c88bdcc0..a837340a3 100644
--- a/web/core/lib/Drupal/Core/Block/BlockManager.php
+++ b/web/core/lib/Drupal/Core/Block/BlockManager.php
@@ -74,7 +74,7 @@ class BlockManager extends DefaultPluginManager implements BlockManagerInterface
   /**
    * {@inheritdoc}
    */
-  public function getFallbackPluginId($plugin_id, array $configuration = array()) {
+  public function getFallbackPluginId($plugin_id, array $configuration = []) {
     return 'broken';
   }
 
diff --git a/web/core/lib/Drupal/Core/Block/BlockPluginInterface.php b/web/core/lib/Drupal/Core/Block/BlockPluginInterface.php
index 66ef8368e..b3cf88e0b 100644
--- a/web/core/lib/Drupal/Core/Block/BlockPluginInterface.php
+++ b/web/core/lib/Drupal/Core/Block/BlockPluginInterface.php
@@ -22,6 +22,11 @@ use Drupal\Core\Session\AccountInterface;
  */
 interface BlockPluginInterface extends ConfigurablePluginInterface, PluginFormInterface, PluginInspectionInterface, CacheableDependencyInterface, DerivativeInspectionInterface {
 
+  /**
+   * Indicates the block label (title) should be displayed to end users.
+   */
+  const BLOCK_LABEL_VISIBLE = 'visible';
+
   /**
    * Returns the user-facing block label.
    *
@@ -97,7 +102,7 @@ interface BlockPluginInterface extends ConfigurablePluginInterface, PluginFormIn
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return array $form
+   * @return array
    *   The renderable form array representing the entire configuration form.
    */
   public function blockForm($form, FormStateInterface $form_state);
diff --git a/web/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php b/web/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
index bb651ccf1..f418a5ee2 100644
--- a/web/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
+++ b/web/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
@@ -29,7 +29,7 @@ class BreadcrumbManager implements ChainBreadcrumbBuilderInterface {
    *
    * @var array
    */
-  protected $builders = array();
+  protected $builders = [];
 
   /**
    * Holds the array of breadcrumb builders sorted by priority.
@@ -71,7 +71,7 @@ class BreadcrumbManager implements ChainBreadcrumbBuilderInterface {
    */
   public function build(RouteMatchInterface $route_match) {
     $breadcrumb = new Breadcrumb();
-    $context = array('builder' => NULL);
+    $context = ['builder' => NULL];
     // Call the build method of registered breadcrumb builders,
     // until one of them returns an array.
     foreach ($this->getSortedBuilders() as $builder) {
@@ -107,7 +107,7 @@ class BreadcrumbManager implements ChainBreadcrumbBuilderInterface {
       // Sort the builders according to priority.
       krsort($this->builders);
       // Merge nested builders from $this->builders into $this->sortedBuilders.
-      $this->sortedBuilders = array();
+      $this->sortedBuilders = [];
       foreach ($this->builders as $builders) {
         $this->sortedBuilders = array_merge($this->sortedBuilders, $builders);
       }
diff --git a/web/core/lib/Drupal/Core/Cache/ApcuBackend.php b/web/core/lib/Drupal/Core/Cache/ApcuBackend.php
index 5338a747a..d7847ffb8 100644
--- a/web/core/lib/Drupal/Core/Cache/ApcuBackend.php
+++ b/web/core/lib/Drupal/Core/Cache/ApcuBackend.php
@@ -80,13 +80,13 @@ class ApcuBackend implements CacheBackendInterface {
    */
   public function getMultiple(&$cids, $allow_invalid = FALSE) {
     // Translate the requested cache item IDs to APCu keys.
-    $map = array();
+    $map = [];
     foreach ($cids as $cid) {
       $map[$this->getApcuKey($cid)] = $cid;
     }
 
     $result = apcu_fetch(array_keys($map));
-    $cache = array();
+    $cache = [];
     if ($result) {
       foreach ($result as $key => $item) {
         $item = $this->prepareItem($item, $allow_invalid);
@@ -140,7 +140,7 @@ class ApcuBackend implements CacheBackendInterface {
       return FALSE;
     }
 
-    $cache->tags = $cache->tags ? explode(' ', $cache->tags) : array();
+    $cache->tags = $cache->tags ? explode(' ', $cache->tags) : [];
 
     // Check expire time.
     $cache->valid = $cache->expire == Cache::PERMANENT || $cache->expire >= REQUEST_TIME;
@@ -160,7 +160,7 @@ class ApcuBackend implements CacheBackendInterface {
   /**
    * {@inheritdoc}
    */
-  public function set($cid, $data, $expire = CacheBackendInterface::CACHE_PERMANENT, array $tags = array()) {
+  public function set($cid, $data, $expire = CacheBackendInterface::CACHE_PERMANENT, array $tags = []) {
     assert('\Drupal\Component\Assertion\Inspector::assertAllStrings($tags)', 'Cache tags must be strings.');
     $tags = array_unique($tags);
     $cache = new \stdClass();
@@ -180,9 +180,9 @@ class ApcuBackend implements CacheBackendInterface {
   /**
    * {@inheritdoc}
    */
-  public function setMultiple(array $items = array()) {
+  public function setMultiple(array $items = []) {
     foreach ($items as $cid => $item) {
-      $this->set($cid, $item['data'], isset($item['expire']) ? $item['expire'] : CacheBackendInterface::CACHE_PERMANENT, isset($item['tags']) ? $item['tags'] : array());
+      $this->set($cid, $item['data'], isset($item['expire']) ? $item['expire'] : CacheBackendInterface::CACHE_PERMANENT, isset($item['tags']) ? $item['tags'] : []);
     }
   }
 
@@ -197,7 +197,7 @@ class ApcuBackend implements CacheBackendInterface {
    * {@inheritdoc}
    */
   public function deleteMultiple(array $cids) {
-    apcu_delete(array_map(array($this, 'getApcuKey'), $cids));
+    apcu_delete(array_map([$this, 'getApcuKey'], $cids));
   }
 
   /**
@@ -225,7 +225,7 @@ class ApcuBackend implements CacheBackendInterface {
    * {@inheritdoc}
    */
   public function invalidate($cid) {
-    $this->invalidateMultiple(array($cid));
+    $this->invalidateMultiple([$cid]);
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Cache/BackendChain.php b/web/core/lib/Drupal/Core/Cache/BackendChain.php
index 851978b29..a8cef19fd 100644
--- a/web/core/lib/Drupal/Core/Cache/BackendChain.php
+++ b/web/core/lib/Drupal/Core/Cache/BackendChain.php
@@ -26,7 +26,7 @@ class BackendChain implements CacheBackendInterface, CacheTagsInvalidatorInterfa
    *
    * @var array
    */
-  protected $backends = array();
+  protected $backends = [];
 
   /**
    * Constructs a DatabaseBackend object.
@@ -91,7 +91,7 @@ class BackendChain implements CacheBackendInterface, CacheTagsInvalidatorInterfa
    * {@inheritdoc}
    */
   public function getMultiple(&$cids, $allow_invalid = FALSE) {
-    $return = array();
+    $return = [];
 
     foreach ($this->backends as $index => $backend) {
       $items = $backend->getMultiple($cids, $allow_invalid);
@@ -121,7 +121,7 @@ class BackendChain implements CacheBackendInterface, CacheTagsInvalidatorInterfa
   /**
    * {@inheritdoc}
    */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array()) {
+  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []) {
     foreach ($this->backends as $backend) {
       $backend->set($cid, $data, $expire, $tags);
     }
diff --git a/web/core/lib/Drupal/Core/Cache/Cache.php b/web/core/lib/Drupal/Core/Cache/Cache.php
index d90513289..f02a4e7cd 100644
--- a/web/core/lib/Drupal/Core/Cache/Cache.php
+++ b/web/core/lib/Drupal/Core/Cache/Cache.php
@@ -152,7 +152,7 @@ class Cache {
    *   An array of cache backend objects keyed by cache bins.
    */
   public static function getBins() {
-    $bins = array();
+    $bins = [];
     $container = \Drupal::getContainer();
     foreach ($container->getParameter('cache_bins') as $service_id => $bin) {
       $bins[$bin] = $container->get($service_id);
@@ -178,7 +178,7 @@ class Cache {
    */
   public static function keyFromQuery(SelectInterface $query) {
     $query->preExecute();
-    $keys = array((string) $query, $query->getArguments());
+    $keys = [(string) $query, $query->getArguments()];
     return hash('sha256', serialize($keys));
   }
 
diff --git a/web/core/lib/Drupal/Core/Cache/CacheBackendInterface.php b/web/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
index 68c5b5ab1..a8ce88890 100644
--- a/web/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
+++ b/web/core/lib/Drupal/Core/Cache/CacheBackendInterface.php
@@ -96,7 +96,7 @@ interface CacheBackendInterface {
    * @see \Drupal\Core\Cache\CacheBackendInterface::get()
    * @see \Drupal\Core\Cache\CacheBackendInterface::getMultiple()
    */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array());
+  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []);
 
   /**
    * Store multiple items in the persistent cache.
diff --git a/web/core/lib/Drupal/Core/Cache/CacheCollector.php b/web/core/lib/Drupal/Core/Cache/CacheCollector.php
index 2db46084b..acbbf006a 100644
--- a/web/core/lib/Drupal/Core/Cache/CacheCollector.php
+++ b/web/core/lib/Drupal/Core/Cache/CacheCollector.php
@@ -56,21 +56,21 @@ abstract class CacheCollector implements CacheCollectorInterface, DestructableIn
    *
    * @var array
    */
-  protected $keysToPersist = array();
+  protected $keysToPersist = [];
 
   /**
    * An array of keys to remove from the cache on service termination.
    *
    * @var array
    */
-  protected $keysToRemove = array();
+  protected $keysToRemove = [];
 
   /**
    * Storage for the data itself.
    *
    * @var array
    */
-  protected $storage = array();
+  protected $storage = [];
 
   /**
    * Stores the cache creation time.
@@ -110,7 +110,7 @@ abstract class CacheCollector implements CacheCollectorInterface, DestructableIn
    * @param array $tags
    *   (optional) The tags to specify for the cache item.
    */
-  public function __construct($cid, CacheBackendInterface $cache, LockBackendInterface $lock, array $tags = array()) {
+  public function __construct($cid, CacheBackendInterface $cache, LockBackendInterface $lock, array $tags = []) {
     assert('\Drupal\Component\Assertion\Inspector::assertAllStrings($tags)', 'Cache tags must be strings.');
     $this->cid = $cid;
     $this->cache = $cache;
@@ -216,7 +216,7 @@ abstract class CacheCollector implements CacheCollectorInterface, DestructableIn
    *   TRUE.
    */
   protected function updateCache($lock = TRUE) {
-    $data = array();
+    $data = [];
     foreach ($this->keysToPersist as $offset => $persist) {
       if ($persist) {
         $data[$offset] = $this->storage[$offset];
@@ -256,8 +256,8 @@ abstract class CacheCollector implements CacheCollectorInterface, DestructableIn
       }
     }
 
-    $this->keysToPersist = array();
-    $this->keysToRemove = array();
+    $this->keysToPersist = [];
+    $this->keysToRemove = [];
   }
 
   /**
@@ -288,9 +288,9 @@ abstract class CacheCollector implements CacheCollectorInterface, DestructableIn
    * {@inheritdoc}
    */
   public function reset() {
-    $this->storage = array();
-    $this->keysToPersist = array();
-    $this->keysToRemove = array();
+    $this->storage = [];
+    $this->keysToPersist = [];
+    $this->keysToRemove = [];
     $this->cacheLoaded = FALSE;
   }
 
diff --git a/web/core/lib/Drupal/Core/Cache/CacheFactory.php b/web/core/lib/Drupal/Core/Cache/CacheFactory.php
index d9b39e4f4..d029cc1fe 100644
--- a/web/core/lib/Drupal/Core/Cache/CacheFactory.php
+++ b/web/core/lib/Drupal/Core/Cache/CacheFactory.php
@@ -42,7 +42,7 @@ class CacheFactory implements CacheFactoryInterface, ContainerAwareInterface {
    *   (optional) A mapping of bin to backend service name. Mappings in
    *   $settings take precedence over this.
    */
-  public function __construct(Settings $settings, array $default_bin_backends = array()) {
+  public function __construct(Settings $settings, array $default_bin_backends = []) {
     $this->settings = $settings;
     $this->defaultBinBackends = $default_bin_backends;
   }
diff --git a/web/core/lib/Drupal/Core/Cache/CacheTagsInvalidator.php b/web/core/lib/Drupal/Core/Cache/CacheTagsInvalidator.php
index cfc64f2a9..ceb8f49e8 100644
--- a/web/core/lib/Drupal/Core/Cache/CacheTagsInvalidator.php
+++ b/web/core/lib/Drupal/Core/Cache/CacheTagsInvalidator.php
@@ -16,7 +16,7 @@ class CacheTagsInvalidator implements CacheTagsInvalidatorInterface {
    *
    * @var \Drupal\Core\Cache\CacheTagsInvalidatorInterface[]
    */
-  protected $invalidators = array();
+  protected $invalidators = [];
 
   /**
    * {@inheritdoc}
@@ -66,7 +66,7 @@ class CacheTagsInvalidator implements CacheTagsInvalidatorInterface {
    *   interface, keyed by their cache bin.
    */
   protected function getInvalidatorCacheBins() {
-    $bins = array();
+    $bins = [];
     foreach ($this->container->getParameter('cache_bins') as $service_id => $bin) {
       $service = $this->container->get($service_id);
       if ($service instanceof CacheTagsInvalidatorInterface) {
diff --git a/web/core/lib/Drupal/Core/Cache/ChainedFastBackend.php b/web/core/lib/Drupal/Core/Cache/ChainedFastBackend.php
index 62839c2b0..9f6be9d8a 100644
--- a/web/core/lib/Drupal/Core/Cache/ChainedFastBackend.php
+++ b/web/core/lib/Drupal/Core/Cache/ChainedFastBackend.php
@@ -99,7 +99,7 @@ class ChainedFastBackend implements CacheBackendInterface, CacheTagsInvalidatorI
    * {@inheritdoc}
    */
   public function get($cid, $allow_invalid = FALSE) {
-    $cids = array($cid);
+    $cids = [$cid];
     $cache = $this->getMultiple($cids, $allow_invalid);
     return reset($cache);
   }
@@ -109,7 +109,7 @@ class ChainedFastBackend implements CacheBackendInterface, CacheTagsInvalidatorI
    */
   public function getMultiple(&$cids, $allow_invalid = FALSE) {
     $cids_copy = $cids;
-    $cache = array();
+    $cache = [];
 
     // If we can determine the time at which the last write to the consistent
     // backend occurred (we might not be able to if it has been recently
@@ -142,7 +142,7 @@ class ChainedFastBackend implements CacheBackendInterface, CacheTagsInvalidatorI
       }
       catch (\Exception $e) {
         $cids = $cids_copy;
-        $items = array();
+        $items = [];
       }
 
       // Even if items were successfully fetched from the fast backend, they
@@ -176,7 +176,7 @@ class ChainedFastBackend implements CacheBackendInterface, CacheTagsInvalidatorI
   /**
    * {@inheritdoc}
    */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array()) {
+  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []) {
     $this->consistentBackend->set($cid, $data, $expire, $tags);
     $this->markAsOutdated();
     // Don't write the cache tags to the fast backend as any cache tag
@@ -202,7 +202,7 @@ class ChainedFastBackend implements CacheBackendInterface, CacheTagsInvalidatorI
    * {@inheritdoc}
    */
   public function delete($cid) {
-    $this->consistentBackend->deleteMultiple(array($cid));
+    $this->consistentBackend->deleteMultiple([$cid]);
     $this->markAsOutdated();
   }
 
@@ -226,7 +226,7 @@ class ChainedFastBackend implements CacheBackendInterface, CacheTagsInvalidatorI
    * {@inheritdoc}
    */
   public function invalidate($cid) {
-    $this->invalidateMultiple(array($cid));
+    $this->invalidateMultiple([$cid]);
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php b/web/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php
index 00dc9b513..e4da328a9 100644
--- a/web/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php
+++ b/web/core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php
@@ -43,7 +43,7 @@ class ChainedFastBackendFactory implements CacheFactoryInterface {
   public function __construct(Settings $settings = NULL, $consistent_service_name = NULL, $fast_service_name = NULL) {
     // Default the consistent backend to the site's default backend.
     if (!isset($consistent_service_name)) {
-      $cache_settings = isset($settings) ? $settings->get('cache') : array();
+      $cache_settings = isset($settings) ? $settings->get('cache') : [];
       $consistent_service_name = isset($cache_settings['default']) ? $cache_settings['default'] : 'cache.backend.database';
     }
 
diff --git a/web/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php b/web/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
index 0e89fb9d4..9a555f8bf 100644
--- a/web/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
+++ b/web/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
@@ -71,7 +71,7 @@ class CacheContextsManager {
    *   An array of available cache contexts and corresponding labels.
    */
   public function getLabels($include_calculated_cache_contexts = FALSE) {
-    $with_labels = array();
+    $with_labels = [];
     foreach ($this->contexts as $context) {
       $service = $this->getService($context);
       if (!$include_calculated_cache_contexts && $service instanceof CalculatedCacheContextInterface) {
diff --git a/web/core/lib/Drupal/Core/Cache/Context/IsFrontPathCacheContext.php b/web/core/lib/Drupal/Core/Cache/Context/IsFrontPathCacheContext.php
new file mode 100644
index 000000000..141b13a63
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Cache/Context/IsFrontPathCacheContext.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\Core\Cache\Context;
+
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Path\PathMatcherInterface;
+
+/**
+ * Defines a cache context for whether the URL is the front page of the site.
+ *
+ * Cache context ID: 'url.path.is_front'.
+ */
+class IsFrontPathCacheContext implements CacheContextInterface {
+
+  /**
+   * @var \Drupal\Core\Path\PathMatcherInterface
+   */
+  protected $pathMatcher;
+
+  /**
+   * Constructs an IsFrontPathCacheContext object.
+   *
+   * @param \Drupal\Core\Path\PathMatcherInterface $path_matcher
+   */
+  public function __construct(PathMatcherInterface $path_matcher) {
+    $this->pathMatcher = $path_matcher;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getLabel() {
+    return t('Is front page');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getContext() {
+    return 'is_front.' . (int) $this->pathMatcher->isFrontPage();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    $metadata = new CacheableMetadata();
+    $metadata->addCacheTags(['config:system.site']);
+    return $metadata;
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php b/web/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
index a13b763fa..952dc14ad 100644
--- a/web/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
+++ b/web/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
@@ -50,7 +50,7 @@ class LanguagesCacheContext implements CalculatedCacheContextInterface {
    */
   public function getContext($type = NULL) {
     if ($type === NULL) {
-      $context_parts = array();
+      $context_parts = [];
       if ($this->languageManager->isMultilingual()) {
         foreach ($this->languageManager->getLanguageTypes() as $type) {
           $context_parts[] = $this->languageManager->getCurrentLanguage($type)->getId();
diff --git a/web/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/web/core/lib/Drupal/Core/Cache/DatabaseBackend.php
index a96d18347..d53c51c2f 100644
--- a/web/core/lib/Drupal/Core/Cache/DatabaseBackend.php
+++ b/web/core/lib/Drupal/Core/Cache/DatabaseBackend.php
@@ -59,7 +59,7 @@ class DatabaseBackend implements CacheBackendInterface {
    * {@inheritdoc}
    */
   public function get($cid, $allow_invalid = FALSE) {
-    $cids = array($cid);
+    $cids = [$cid];
     $cache = $this->getMultiple($cids, $allow_invalid);
     return reset($cache);
   }
@@ -68,7 +68,7 @@ class DatabaseBackend implements CacheBackendInterface {
    * {@inheritdoc}
    */
   public function getMultiple(&$cids, $allow_invalid = FALSE) {
-    $cid_mapping = array();
+    $cid_mapping = [];
     foreach ($cids as $cid) {
       $cid_mapping[$this->normalizeCid($cid)] = $cid;
     }
@@ -79,14 +79,14 @@ class DatabaseBackend implements CacheBackendInterface {
     // is used here only due to the performance overhead we would incur
     // otherwise. When serving an uncached page, the overhead of using
     // ::select() is a much smaller proportion of the request.
-    $result = array();
+    $result = [];
     try {
-      $result = $this->connection->query('SELECT cid, data, created, expire, serialized, tags, checksum FROM {' . $this->connection->escapeTable($this->bin) . '} WHERE cid IN ( :cids[] ) ORDER BY cid', array(':cids[]' => array_keys($cid_mapping)));
+      $result = $this->connection->query('SELECT cid, data, created, expire, serialized, tags, checksum FROM {' . $this->connection->escapeTable($this->bin) . '} WHERE cid IN ( :cids[] ) ORDER BY cid', [':cids[]' => array_keys($cid_mapping)]);
     }
     catch (\Exception $e) {
       // Nothing to do.
     }
-    $cache = array();
+    $cache = [];
     foreach ($result as $item) {
       // Map the cache ID back to the original.
       $item->cid = $cid_mapping[$item->cid];
@@ -119,7 +119,7 @@ class DatabaseBackend implements CacheBackendInterface {
       return FALSE;
     }
 
-    $cache->tags = $cache->tags ? explode(' ', $cache->tags) : array();
+    $cache->tags = $cache->tags ? explode(' ', $cache->tags) : [];
 
     // Check expire time.
     $cache->valid = $cache->expire == Cache::PERMANENT || $cache->expire >= REQUEST_TIME;
@@ -144,7 +144,7 @@ class DatabaseBackend implements CacheBackendInterface {
   /**
    * {@inheritdoc}
    */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array()) {
+  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []) {
     $this->setMultiple([
       $cid => [
         'data' => $data,
@@ -186,26 +186,26 @@ class DatabaseBackend implements CacheBackendInterface {
    * @see \Drupal\Core\Cache\CacheBackendInterface::setMultiple()
    */
   protected function doSetMultiple(array $items) {
-    $values = array();
+    $values = [];
 
     foreach ($items as $cid => $item) {
-      $item += array(
+      $item += [
         'expire' => CacheBackendInterface::CACHE_PERMANENT,
-        'tags' => array(),
-      );
+        'tags' => [],
+      ];
 
       assert('\Drupal\Component\Assertion\Inspector::assertAllStrings($item[\'tags\'])', 'Cache Tags must be strings.');
       $item['tags'] = array_unique($item['tags']);
       // Sort the cache tags so that they are stored consistently in the DB.
       sort($item['tags']);
 
-      $fields = array(
+      $fields = [
         'cid' => $this->normalizeCid($cid),
         'expire' => $item['expire'],
         'created' => round(microtime(TRUE), 3),
         'tags' => implode(' ', $item['tags']),
         'checksum' => $this->checksumProvider->getCurrentChecksum($item['tags']),
-      );
+      ];
 
       if (!is_string($item['data'])) {
         $fields['data'] = serialize($item['data']);
@@ -223,7 +223,7 @@ class DatabaseBackend implements CacheBackendInterface {
     $query = $this->connection
       ->upsert($this->bin)
       ->key('cid')
-      ->fields(array('cid', 'expire', 'created', 'tags', 'checksum', 'data', 'serialized'));
+      ->fields(['cid', 'expire', 'created', 'tags', 'checksum', 'data', 'serialized']);
     foreach ($values as $fields) {
       // Only pass the values since the order of $fields matches the order of
       // the insert fields. This is a performance optimization to avoid
@@ -238,14 +238,14 @@ class DatabaseBackend implements CacheBackendInterface {
    * {@inheritdoc}
    */
   public function delete($cid) {
-    $this->deleteMultiple(array($cid));
+    $this->deleteMultiple([$cid]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function deleteMultiple(array $cids) {
-    $cids = array_values(array_map(array($this, 'normalizeCid'), $cids));
+    $cids = array_values(array_map([$this, 'normalizeCid'], $cids));
     try {
       // Delete in chunks when a large array is passed.
       foreach (array_chunk($cids, 1000) as $cids_chunk) {
@@ -285,19 +285,19 @@ class DatabaseBackend implements CacheBackendInterface {
    * {@inheritdoc}
    */
   public function invalidate($cid) {
-    $this->invalidateMultiple(array($cid));
+    $this->invalidateMultiple([$cid]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function invalidateMultiple(array $cids) {
-    $cids = array_values(array_map(array($this, 'normalizeCid'), $cids));
+    $cids = array_values(array_map([$this, 'normalizeCid'], $cids));
     try {
       // Update in chunks when a large array is passed.
       foreach (array_chunk($cids, 1000) as $cids_chunk) {
         $this->connection->update($this->bin)
-          ->fields(array('expire' => REQUEST_TIME - 1))
+          ->fields(['expire' => REQUEST_TIME - 1])
           ->condition('cid', $cids_chunk, 'IN')
           ->execute();
       }
@@ -313,7 +313,7 @@ class DatabaseBackend implements CacheBackendInterface {
   public function invalidateAll() {
     try {
       $this->connection->update($this->bin)
-        ->fields(array('expire' => REQUEST_TIME - 1))
+        ->fields(['expire' => REQUEST_TIME - 1])
         ->execute();
     }
     catch (\Exception $e) {
@@ -419,62 +419,62 @@ class DatabaseBackend implements CacheBackendInterface {
    * Defines the schema for the {cache_*} bin tables.
    */
   public function schemaDefinition() {
-    $schema = array(
+    $schema = [
       'description' => 'Storage for the cache API.',
-      'fields' => array(
-        'cid' => array(
+      'fields' => [
+        'cid' => [
           'description' => 'Primary Key: Unique cache ID.',
           'type' => 'varchar_ascii',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
           'binary' => TRUE,
-        ),
-        'data' => array(
+        ],
+        'data' => [
           'description' => 'A collection of data to cache.',
           'type' => 'blob',
           'not null' => FALSE,
           'size' => 'big',
-        ),
-        'expire' => array(
+        ],
+        'expire' => [
           'description' => 'A Unix timestamp indicating when the cache entry should expire, or ' . Cache::PERMANENT . ' for never.',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'created' => array(
+        ],
+        'created' => [
           'description' => 'A timestamp with millisecond precision indicating when the cache entry was created.',
           'type' => 'numeric',
           'precision' => 14,
           'scale' => 3,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'serialized' => array(
+        ],
+        'serialized' => [
           'description' => 'A flag to indicate whether content is serialized (1) or not (0).',
           'type' => 'int',
           'size' => 'small',
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'tags' => array(
+        ],
+        'tags' => [
           'description' => 'Space-separated list of cache tags for this entry.',
           'type' => 'text',
           'size' => 'big',
           'not null' => FALSE,
-        ),
-        'checksum' => array(
+        ],
+        'checksum' => [
           'description' => 'The tag invalidation checksum when this entry was saved.',
           'type' => 'varchar_ascii',
           'length' => 255,
           'not null' => TRUE,
-        ),
-      ),
-      'indexes' => array(
-        'expire' => array('expire'),
-      ),
-      'primary key' => array('cid'),
-    );
+        ],
+      ],
+      'indexes' => [
+        'expire' => ['expire'],
+      ],
+      'primary key' => ['cid'],
+    ];
     return $schema;
   }
 
diff --git a/web/core/lib/Drupal/Core/Cache/DatabaseBackendFactory.php b/web/core/lib/Drupal/Core/Cache/DatabaseBackendFactory.php
index 5cc87e91d..8aa018ec4 100644
--- a/web/core/lib/Drupal/Core/Cache/DatabaseBackendFactory.php
+++ b/web/core/lib/Drupal/Core/Cache/DatabaseBackendFactory.php
@@ -28,7 +28,7 @@ class DatabaseBackendFactory implements CacheFactoryInterface {
    * @param \Drupal\Core\Cache\CacheTagsChecksumInterface $checksum_provider
    *   The cache tags checksum provider.
    */
-  function __construct(Connection $connection, CacheTagsChecksumInterface $checksum_provider) {
+  public function __construct(Connection $connection, CacheTagsChecksumInterface $checksum_provider) {
     $this->connection = $connection;
     $this->checksumProvider = $checksum_provider;
   }
@@ -42,7 +42,7 @@ class DatabaseBackendFactory implements CacheFactoryInterface {
    * @return \Drupal\Core\Cache\DatabaseBackend
    *   The cache backend object for the specified cache bin.
    */
-  function get($bin) {
+  public function get($bin) {
     return new DatabaseBackend($this->connection, $this->checksumProvider, $bin);
   }
 
diff --git a/web/core/lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php b/web/core/lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php
index a133d88f6..450b4411a 100644
--- a/web/core/lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php
+++ b/web/core/lib/Drupal/Core/Cache/DatabaseCacheTagsChecksum.php
@@ -22,7 +22,7 @@ class DatabaseCacheTagsChecksum implements CacheTagsChecksumInterface, CacheTags
    *
    * @var array
    */
-  protected $tagCache = array();
+  protected $tagCache = [];
 
   /**
    * A list of tags that have already been invalidated in this request.
@@ -31,7 +31,7 @@ class DatabaseCacheTagsChecksum implements CacheTagsChecksumInterface, CacheTags
    *
    * @var array
    */
-  protected $invalidatedTags = array();
+  protected $invalidatedTags = [];
 
   /**
    * Constructs a DatabaseCacheTagsChecksum object.
@@ -56,7 +56,7 @@ class DatabaseCacheTagsChecksum implements CacheTagsChecksumInterface, CacheTags
         $this->invalidatedTags[$tag] = TRUE;
         unset($this->tagCache[$tag]);
         $this->connection->merge('cachetags')
-          ->insertFields(array('invalidations' => 1))
+          ->insertFields(['invalidations' => 1])
           ->expression('invalidations', 'invalidations + 1')
           ->key('tag', $tag)
           ->execute();
@@ -107,9 +107,9 @@ class DatabaseCacheTagsChecksum implements CacheTagsChecksumInterface, CacheTags
 
     $query_tags = array_diff($tags, array_keys($this->tagCache));
     if ($query_tags) {
-      $db_tags = array();
+      $db_tags = [];
       try {
-        $db_tags = $this->connection->query('SELECT tag, invalidations FROM {cachetags} WHERE tag IN ( :tags[] )', array(':tags[]' => $query_tags))
+        $db_tags = $this->connection->query('SELECT tag, invalidations FROM {cachetags} WHERE tag IN ( :tags[] )', [':tags[]' => $query_tags])
           ->fetchAllKeyed();
         $this->tagCache += $db_tags;
       }
@@ -134,8 +134,8 @@ class DatabaseCacheTagsChecksum implements CacheTagsChecksumInterface, CacheTags
    * {@inheritdoc}
    */
   public function reset() {
-    $this->tagCache = array();
-    $this->invalidatedTags = array();
+    $this->tagCache = [];
+    $this->invalidatedTags = [];
   }
 
   /**
@@ -165,25 +165,25 @@ class DatabaseCacheTagsChecksum implements CacheTagsChecksumInterface, CacheTags
    * Defines the schema for the {cachetags} table.
    */
   public function schemaDefinition() {
-    $schema = array(
+    $schema = [
       'description' => 'Cache table for tracking cache tag invalidations.',
-      'fields' => array(
-        'tag' => array(
+      'fields' => [
+        'tag' => [
           'description' => 'Namespace-prefixed tag string.',
           'type' => 'varchar_ascii',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'invalidations' => array(
+        ],
+        'invalidations' => [
           'description' => 'Number incremented when the tag is invalidated.',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
-        ),
-      ),
-      'primary key' => array('tag'),
-    );
+        ],
+      ],
+      'primary key' => ['tag'],
+    ];
     return $schema;
   }
 
diff --git a/web/core/lib/Drupal/Core/Cache/ListCacheBinsPass.php b/web/core/lib/Drupal/Core/Cache/ListCacheBinsPass.php
index 27886ace0..32bac09c0 100644
--- a/web/core/lib/Drupal/Core/Cache/ListCacheBinsPass.php
+++ b/web/core/lib/Drupal/Core/Cache/ListCacheBinsPass.php
@@ -16,8 +16,8 @@ class ListCacheBinsPass implements CompilerPassInterface {
    * Collects the cache bins into the cache_bins parameter.
    */
   public function process(ContainerBuilder $container) {
-    $cache_bins = array();
-    $cache_default_bin_backends = array();
+    $cache_bins = [];
+    $cache_default_bin_backends = [];
     foreach ($container->findTaggedServiceIds('cache.bin') as $id => $attributes) {
       $bin = substr($id, strpos($id, '.') + 1);
       $cache_bins[$id] = $bin;
diff --git a/web/core/lib/Drupal/Core/Cache/MemoryBackend.php b/web/core/lib/Drupal/Core/Cache/MemoryBackend.php
index a0d32bd98..edda4d37f 100644
--- a/web/core/lib/Drupal/Core/Cache/MemoryBackend.php
+++ b/web/core/lib/Drupal/Core/Cache/MemoryBackend.php
@@ -10,6 +10,11 @@ namespace Drupal\Core\Cache;
  * Should be used for unit tests and specialist use-cases only, does not
  * store cached items between requests.
  *
+ * The functions ::prepareItem()/::set() use unserialize()/serialize(). It
+ * behaves as an external cache backend to avoid changing the cached data by
+ * reference. In ::prepareItem(), the object is not modified by the call to
+ * unserialize() because we make a clone of it.
+ *
  * @ingroup cache
  */
 class MemoryBackend implements CacheBackendInterface, CacheTagsInvalidatorInterface {
@@ -17,16 +22,7 @@ class MemoryBackend implements CacheBackendInterface, CacheTagsInvalidatorInterf
   /**
    * Array to store cache objects.
    */
-  protected $cache = array();
-
-  /**
-   * Constructs a MemoryBackend object.
-   *
-   * @param string $bin
-   *   The cache bin for which the object is created.
-   */
-  public function __construct($bin) {
-  }
+  protected $cache = [];
 
   /**
    * {@inheritdoc}
@@ -44,7 +40,7 @@ class MemoryBackend implements CacheBackendInterface, CacheTagsInvalidatorInterf
    * {@inheritdoc}
    */
   public function getMultiple(&$cids, $allow_invalid = FALSE) {
-    $ret = array();
+    $ret = [];
 
     $items = array_intersect_key($this->cache, array_flip($cids));
 
@@ -101,26 +97,26 @@ class MemoryBackend implements CacheBackendInterface, CacheTagsInvalidatorInterf
   /**
    * {@inheritdoc}
    */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array()) {
+  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []) {
     assert('\Drupal\Component\Assertion\Inspector::assertAllStrings($tags)', 'Cache Tags must be strings.');
     $tags = array_unique($tags);
     // Sort the cache tags so that they are stored consistently in the database.
     sort($tags);
-    $this->cache[$cid] = (object) array(
+    $this->cache[$cid] = (object) [
       'cid' => $cid,
       'data' => serialize($data),
       'created' => $this->getRequestTime(),
       'expire' => $expire,
       'tags' => $tags,
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function setMultiple(array $items = array()) {
+  public function setMultiple(array $items = []) {
     foreach ($items as $cid => $item) {
-      $this->set($cid, $item['data'], isset($item['expire']) ? $item['expire'] : CacheBackendInterface::CACHE_PERMANENT, isset($item['tags']) ? $item['tags'] : array());
+      $this->set($cid, $item['data'], isset($item['expire']) ? $item['expire'] : CacheBackendInterface::CACHE_PERMANENT, isset($item['tags']) ? $item['tags'] : []);
     }
   }
 
@@ -142,7 +138,7 @@ class MemoryBackend implements CacheBackendInterface, CacheTagsInvalidatorInterf
    * {@inheritdoc}
    */
   public function deleteAll() {
-    $this->cache = array();
+    $this->cache = [];
   }
 
   /**
@@ -159,7 +155,9 @@ class MemoryBackend implements CacheBackendInterface, CacheTagsInvalidatorInterf
    */
   public function invalidateMultiple(array $cids) {
     foreach ($cids as $cid) {
-      $this->cache[$cid]->expire = $this->getRequestTime() - 1;
+      if (isset($this->cache[$cid])) {
+        $this->cache[$cid]->expire = $this->getRequestTime() - 1;
+      }
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/Cache/MemoryBackendFactory.php b/web/core/lib/Drupal/Core/Cache/MemoryBackendFactory.php
index 221ee1a78..c5c6a950a 100644
--- a/web/core/lib/Drupal/Core/Cache/MemoryBackendFactory.php
+++ b/web/core/lib/Drupal/Core/Cache/MemoryBackendFactory.php
@@ -9,14 +9,14 @@ class MemoryBackendFactory implements CacheFactoryInterface {
    *
    * @var \Drupal\Core\Cache\MemoryBackend[]
    */
-  protected $bins = array();
+  protected $bins = [];
 
   /**
    * {@inheritdoc}
    */
-  function get($bin) {
+  public function get($bin) {
     if (!isset($this->bins[$bin])) {
-      $this->bins[$bin] = new MemoryBackend($bin);
+      $this->bins[$bin] = new MemoryBackend();
     }
     return $this->bins[$bin];
   }
diff --git a/web/core/lib/Drupal/Core/Cache/MemoryCounterBackend.php b/web/core/lib/Drupal/Core/Cache/MemoryCounterBackend.php
index 5ec490c59..63d20076c 100644
--- a/web/core/lib/Drupal/Core/Cache/MemoryCounterBackend.php
+++ b/web/core/lib/Drupal/Core/Cache/MemoryCounterBackend.php
@@ -17,7 +17,7 @@ class MemoryCounterBackend extends MemoryBackend {
    *
    * @var array
    */
-  protected $counter = array();
+  protected $counter = [];
 
   /**
    * {@inheritdoc}
@@ -30,7 +30,7 @@ class MemoryCounterBackend extends MemoryBackend {
   /**
    * {@inheritdoc}
    */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array()) {
+  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []) {
     $this->increaseCounter(__FUNCTION__, $cid);
     parent::set($cid, $data, $expire, $tags);
   }
@@ -76,7 +76,7 @@ class MemoryCounterBackend extends MemoryBackend {
       return isset($this->counter[$method][$cid]) ? $this->counter[$method][$cid] : 0;
     }
     elseif ($method) {
-      return isset($this->counter[$method]) ? $this->counter[$method] : array();
+      return isset($this->counter[$method]) ? $this->counter[$method] : [];
     }
     else {
       return $this->counter;
@@ -87,7 +87,7 @@ class MemoryCounterBackend extends MemoryBackend {
    * Resets the call counter.
    */
   public function resetCounter() {
-    $this->counter = array();
+    $this->counter = [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Cache/NullBackend.php b/web/core/lib/Drupal/Core/Cache/NullBackend.php
index fec549f12..b0077a50e 100644
--- a/web/core/lib/Drupal/Core/Cache/NullBackend.php
+++ b/web/core/lib/Drupal/Core/Cache/NullBackend.php
@@ -36,18 +36,18 @@ class NullBackend implements CacheBackendInterface {
    * {@inheritdoc}
    */
   public function getMultiple(&$cids, $allow_invalid = FALSE) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array()) {}
+  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []) {}
 
   /**
    * {@inheritdoc}
    */
-  public function setMultiple(array $items = array()) {}
+  public function setMultiple(array $items = []) {}
 
   /**
    * {@inheritdoc}
diff --git a/web/core/lib/Drupal/Core/Cache/NullBackendFactory.php b/web/core/lib/Drupal/Core/Cache/NullBackendFactory.php
index 3f11f5652..909b10531 100644
--- a/web/core/lib/Drupal/Core/Cache/NullBackendFactory.php
+++ b/web/core/lib/Drupal/Core/Cache/NullBackendFactory.php
@@ -7,7 +7,7 @@ class NullBackendFactory implements CacheFactoryInterface {
   /**
    * {@inheritdoc}
    */
-  function get($bin) {
+  public function get($bin) {
     return new NullBackend($bin);
   }
 
diff --git a/web/core/lib/Drupal/Core/Cache/PhpBackend.php b/web/core/lib/Drupal/Core/Cache/PhpBackend.php
index 38f9b9b4b..240449340 100644
--- a/web/core/lib/Drupal/Core/Cache/PhpBackend.php
+++ b/web/core/lib/Drupal/Core/Cache/PhpBackend.php
@@ -28,7 +28,7 @@ class PhpBackend implements CacheBackendInterface {
   /**
    * Array to store cache objects.
    */
-  protected $cache = array();
+  protected $cache = [];
 
   /**
    * The cache tags checksum provider.
@@ -83,7 +83,7 @@ class PhpBackend implements CacheBackendInterface {
    */
   public function setMultiple(array $items) {
     foreach ($items as $cid => $item) {
-      $this->set($cid, $item['data'], isset($item['expire']) ? $item['expire'] : CacheBackendInterface::CACHE_PERMANENT, isset($item['tags']) ? $item['tags'] : array());
+      $this->set($cid, $item['data'], isset($item['expire']) ? $item['expire'] : CacheBackendInterface::CACHE_PERMANENT, isset($item['tags']) ? $item['tags'] : []);
     }
   }
 
@@ -91,7 +91,7 @@ class PhpBackend implements CacheBackendInterface {
    * {@inheritdoc}
    */
   public function getMultiple(&$cids, $allow_invalid = FALSE) {
-    $ret = array();
+    $ret = [];
 
     foreach ($cids as $cid) {
       if ($item = $this->get($cid, $allow_invalid)) {
@@ -142,16 +142,16 @@ class PhpBackend implements CacheBackendInterface {
   /**
    * {@inheritdoc}
    */
-  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = array()) {
+  public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = []) {
     assert('\Drupal\Component\Assertion\Inspector::assertAllStrings($tags)', 'Cache Tags must be strings.');
-    $item = (object) array(
+    $item = (object) [
       'cid' => $cid,
       'data' => $data,
       'created' => round(microtime(TRUE), 3),
       'expire' => $expire,
       'tags' => array_unique($tags),
       'checksum' => $this->checksumProvider->getCurrentChecksum($tags),
-    );
+    ];
     $this->writeItem($this->normalizeCid($cid), $item);
   }
 
@@ -226,7 +226,7 @@ class PhpBackend implements CacheBackendInterface {
    * {@inheritdoc}
    */
   public function removeBin() {
-    $this->cache = array();
+    $this->cache = [];
     $this->storage()->deleteAll();
   }
 
diff --git a/web/core/lib/Drupal/Core/Cache/PhpBackendFactory.php b/web/core/lib/Drupal/Core/Cache/PhpBackendFactory.php
index fdb327193..0091ed307 100644
--- a/web/core/lib/Drupal/Core/Cache/PhpBackendFactory.php
+++ b/web/core/lib/Drupal/Core/Cache/PhpBackendFactory.php
@@ -30,7 +30,7 @@ class PhpBackendFactory implements CacheFactoryInterface {
    * @return \Drupal\Core\Cache\PhpBackend
    *   The cache backend object for the specified cache bin.
    */
-  function get($bin) {
+  public function get($bin) {
     return new PhpBackend($bin, $this->checksumProvider);
   }
 
diff --git a/web/core/lib/Drupal/Core/Composer/Composer.php b/web/core/lib/Drupal/Core/Composer/Composer.php
index 263be4c6e..1ca6262c9 100644
--- a/web/core/lib/Drupal/Core/Composer/Composer.php
+++ b/web/core/lib/Drupal/Core/Composer/Composer.php
@@ -6,6 +6,7 @@ use Drupal\Component\PhpStorage\FileStorage;
 use Composer\Script\Event;
 use Composer\Installer\PackageEvent;
 use Composer\Semver\Constraint\Constraint;
+use PHP_CodeSniffer;
 
 /**
  * Provides static functions for composer script events.
@@ -18,6 +19,7 @@ class Composer {
     'behat/mink' => ['tests', 'driver-testsuite'],
     'behat/mink-browserkit-driver' => ['tests'],
     'behat/mink-goutte-driver' => ['tests'],
+    'drupal/coder' => ['coder_sniffer/Drupal/Test', 'coder_sniffer/DrupalPractice/Test'],
     'doctrine/cache' => ['tests'],
     'doctrine/collections' => ['tests'],
     'doctrine/common' => ['tests'],
@@ -82,22 +84,22 @@ class Composer {
     // Check for our packages, and then optimize them if they're present.
     if ($repository->findPackage('symfony/http-foundation', $constraint)) {
       $autoload = $package->getAutoload();
-      $autoload['classmap'] = array_merge($autoload['classmap'], array(
+      $autoload['classmap'] = array_merge($autoload['classmap'], [
         'vendor/symfony/http-foundation/Request.php',
         'vendor/symfony/http-foundation/ParameterBag.php',
         'vendor/symfony/http-foundation/FileBag.php',
         'vendor/symfony/http-foundation/ServerBag.php',
         'vendor/symfony/http-foundation/HeaderBag.php',
-      ));
+      ]);
       $package->setAutoload($autoload);
     }
     if ($repository->findPackage('symfony/http-kernel', $constraint)) {
       $autoload = $package->getAutoload();
-      $autoload['classmap'] = array_merge($autoload['classmap'], array(
+      $autoload['classmap'] = array_merge($autoload['classmap'], [
         'vendor/symfony/http-kernel/HttpKernel.php',
         'vendor/symfony/http-kernel/HttpKernelInterface.php',
         'vendor/symfony/http-kernel/TerminableInterface.php',
-      ));
+      ]);
       $package->setAutoload($autoload);
     }
   }
@@ -135,6 +137,28 @@ EOT;
     }
   }
 
+  /**
+   * Configures phpcs if present.
+   *
+   * @param \Composer\Script\Event $event
+   */
+  public static function configurePhpcs(Event $event) {
+    // Grab the local repo which tells us what's been installed.
+    $local_repository = $event->getComposer()
+      ->getRepositoryManager()
+      ->getLocalRepository();
+    // Make sure both phpcs and coder are installed.
+    $phpcs_package = $local_repository->findPackage('squizlabs/php_codesniffer', '*');
+    $coder_package = $local_repository->findPackage('drupal/coder', '*');
+    if (!empty($phpcs_package) && !empty($coder_package)) {
+      $config = $event->getComposer()->getConfig();
+      $vendor_dir = $config->get('vendor-dir');
+      // Set phpcs' installed_paths config to point to our coder_sniffer
+      // directory.
+      PHP_CodeSniffer::setConfigData('installed_paths', $vendor_dir . '/drupal/coder/coder_sniffer');
+    }
+  }
+
   /**
    * Remove possibly problematic test files from vendored projects.
    *
diff --git a/web/core/lib/Drupal/Core/Condition/Annotation/Condition.php b/web/core/lib/Drupal/Core/Condition/Annotation/Condition.php
index 0959ef7c7..b6686cf6b 100644
--- a/web/core/lib/Drupal/Core/Condition/Annotation/Condition.php
+++ b/web/core/lib/Drupal/Core/Condition/Annotation/Condition.php
@@ -55,7 +55,7 @@ class Condition extends Plugin {
    *
    * @var \Drupal\Core\Annotation\ContextDefinition[]
    */
-  public $context = array();
+  public $context = [];
 
   /**
    * The category under which the condition should listed in the UI.
diff --git a/web/core/lib/Drupal/Core/Condition/ConditionManager.php b/web/core/lib/Drupal/Core/Condition/ConditionManager.php
index bbe6fe76c..2c6b61b6a 100644
--- a/web/core/lib/Drupal/Core/Condition/ConditionManager.php
+++ b/web/core/lib/Drupal/Core/Condition/ConditionManager.php
@@ -46,7 +46,7 @@ class ConditionManager extends DefaultPluginManager implements ExecutableManager
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     $plugin = $this->getFactory()->createInstance($plugin_id, $configuration);
 
     // If we receive any context values via config set it into the plugin.
diff --git a/web/core/lib/Drupal/Core/Condition/ConditionPluginBase.php b/web/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
index aaa7ee817..b5134fb51 100644
--- a/web/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
+++ b/web/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
@@ -53,11 +53,11 @@ abstract class ConditionPluginBase extends ExecutablePluginBase implements Condi
     }
     $contexts = $form_state->getTemporaryValue('gathered_contexts') ?: [];
     $form['context_mapping'] = $this->addContextAssignmentElement($this, $contexts);
-    $form['negate'] = array(
+    $form['negate'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Negate the condition'),
       '#default_value' => $this->configuration['negate'],
-    );
+    ];
     return $form;
   }
 
@@ -88,9 +88,9 @@ abstract class ConditionPluginBase extends ExecutablePluginBase implements Condi
    * {@inheritdoc}
    */
   public function getConfiguration() {
-    return array(
+    return [
       'id' => $this->getPluginId(),
-    ) + $this->configuration;
+    ] + $this->configuration;
   }
 
   /**
@@ -105,16 +105,16 @@ abstract class ConditionPluginBase extends ExecutablePluginBase implements Condi
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'negate' => FALSE,
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Condition/ConditionPluginCollection.php b/web/core/lib/Drupal/Core/Condition/ConditionPluginCollection.php
index 5801ac14e..4d6dd7043 100644
--- a/web/core/lib/Drupal/Core/Condition/ConditionPluginCollection.php
+++ b/web/core/lib/Drupal/Core/Condition/ConditionPluginCollection.php
@@ -15,7 +15,7 @@ class ConditionPluginCollection extends DefaultLazyPluginCollection {
    *
    * @var \Drupal\Component\Plugin\Context\ContextInterface[]
    */
-  protected $conditionContexts = array();
+  protected $conditionContexts = [];
 
   /**
    * {@inheritdoc}
@@ -33,7 +33,7 @@ class ConditionPluginCollection extends DefaultLazyPluginCollection {
     $configuration = parent::getConfiguration();
     // Remove configuration if it matches the defaults.
     foreach ($configuration as $instance_id => $instance_config) {
-      $default_config = array();
+      $default_config = [];
       $default_config['id'] = $instance_id;
       $default_config += $this->get($instance_id)->defaultConfiguration();
       // In order to determine if a plugin is configured, we must compare it to
diff --git a/web/core/lib/Drupal/Core/Config/CachedStorage.php b/web/core/lib/Drupal/Core/Config/CachedStorage.php
index 363fcd08e..7286fbcb3 100644
--- a/web/core/lib/Drupal/Core/Config/CachedStorage.php
+++ b/web/core/lib/Drupal/Core/Config/CachedStorage.php
@@ -34,7 +34,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
    *
    * @var array
    */
-  protected $findByPrefixCache = array();
+  protected $findByPrefixCache = [];
 
   /**
    * Constructs a new CachedStorage.
@@ -80,7 +80,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
    * {@inheritdoc}
    */
   public function readMultiple(array $names) {
-    $data_to_return = array();
+    $data_to_return = [];
 
     $cache_keys_map = $this->getCacheKeys($names);
     $cache_keys = array_values($cache_keys_map);
@@ -95,11 +95,11 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
       $list = $this->storage->readMultiple($names_to_get);
       // Cache configuration objects that were loaded from the storage, cache
       // missing configuration objects as an explicit FALSE.
-      $items = array();
+      $items = [];
       foreach ($names_to_get as $name) {
         $data = isset($list[$name]) ? $list[$name] : FALSE;
         $data_to_return[$name] = $data;
-        $items[$cache_keys_map[$name]] = array('data' => $data);
+        $items[$cache_keys_map[$name]] = ['data' => $data];
       }
 
       $this->cache->setMultiple($items);
@@ -125,7 +125,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
       // While not all written data is read back, setting the cache instead of
       // just deleting it avoids cache rebuild stampedes.
       $this->cache->set($this->getCacheKey($name), $data);
-      $this->findByPrefixCache = array();
+      $this->findByPrefixCache = [];
       return TRUE;
     }
     return FALSE;
@@ -139,7 +139,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
     // rebuilding the cache before the storage is gone.
     if ($this->storage->delete($name)) {
       $this->cache->delete($this->getCacheKey($name));
-      $this->findByPrefixCache = array();
+      $this->findByPrefixCache = [];
       return TRUE;
     }
     return FALSE;
@@ -154,7 +154,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
     if ($this->storage->rename($name, $new_name)) {
       $this->cache->delete($this->getCacheKey($name));
       $this->cache->delete($this->getCacheKey($new_name));
-      $this->findByPrefixCache = array();
+      $this->findByPrefixCache = [];
       return TRUE;
     }
     return FALSE;
@@ -227,7 +227,7 @@ class CachedStorage implements StorageInterface, StorageCacheInterface {
    * Clears the static list cache.
    */
   public function resetListCache() {
-    $this->findByPrefixCache = array();
+    $this->findByPrefixCache = [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Config/Config.php b/web/core/lib/Drupal/Core/Config/Config.php
index 0128c66fd..584feb7c5 100644
--- a/web/core/lib/Drupal/Core/Config/Config.php
+++ b/web/core/lib/Drupal/Core/Config/Config.php
@@ -155,10 +155,10 @@ class Config extends StorableConfigBase {
   protected function setOverriddenData() {
     $this->overriddenData = $this->data;
     if (isset($this->moduleOverrides) && is_array($this->moduleOverrides)) {
-      $this->overriddenData = NestedArray::mergeDeepArray(array($this->overriddenData, $this->moduleOverrides), TRUE);
+      $this->overriddenData = NestedArray::mergeDeepArray([$this->overriddenData, $this->moduleOverrides], TRUE);
     }
     if (isset($this->settingsOverrides) && is_array($this->settingsOverrides)) {
-      $this->overriddenData = NestedArray::mergeDeepArray(array($this->overriddenData, $this->settingsOverrides), TRUE);
+      $this->overriddenData = NestedArray::mergeDeepArray([$this->overriddenData, $this->settingsOverrides], TRUE);
     }
     return $this;
   }
@@ -239,7 +239,7 @@ class Config extends StorableConfigBase {
    *   The configuration object.
    */
   public function delete() {
-    $this->data = array();
+    $this->data = [];
     $this->storage->delete($this->name);
     Cache::invalidateTags($this->getCacheTags());
     $this->isNew = TRUE;
@@ -281,10 +281,10 @@ class Config extends StorableConfigBase {
     if ($apply_overrides) {
       // Apply overrides.
       if (isset($this->moduleOverrides) && is_array($this->moduleOverrides)) {
-        $original_data = NestedArray::mergeDeepArray(array($original_data, $this->moduleOverrides), TRUE);
+        $original_data = NestedArray::mergeDeepArray([$original_data, $this->moduleOverrides], TRUE);
       }
       if (isset($this->settingsOverrides) && is_array($this->settingsOverrides)) {
-        $original_data = NestedArray::mergeDeepArray(array($original_data, $this->settingsOverrides), TRUE);
+        $original_data = NestedArray::mergeDeepArray([$original_data, $this->settingsOverrides], TRUE);
       }
     }
 
diff --git a/web/core/lib/Drupal/Core/Config/ConfigBase.php b/web/core/lib/Drupal/Core/Config/ConfigBase.php
index 6dfa962d1..596ed9215 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigBase.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigBase.php
@@ -40,7 +40,7 @@ abstract class ConfigBase implements RefinableCacheableDependencyInterface {
    *
    * @var array
    */
-  protected $data = array();
+  protected $data = [];
 
   /**
    * The maximum length of a configuration object name.
@@ -247,7 +247,7 @@ abstract class ConfigBase implements RefinableCacheableDependencyInterface {
    */
   public function merge(array $data_to_merge) {
     // Preserve integer keys so that configuration keys are not changed.
-    $this->setData(NestedArray::mergeDeepArray(array($this->data, $data_to_merge), TRUE));
+    $this->setData(NestedArray::mergeDeepArray([$this->data, $data_to_merge], TRUE));
     return $this;
   }
 
diff --git a/web/core/lib/Drupal/Core/Config/ConfigCollectionInfo.php b/web/core/lib/Drupal/Core/Config/ConfigCollectionInfo.php
index 483c96d20..dfdd0b8da 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigCollectionInfo.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigCollectionInfo.php
@@ -17,7 +17,7 @@ class ConfigCollectionInfo extends Event {
    *
    * @var array
    */
-  protected $collections = array();
+  protected $collections = [];
 
   /**
    * Adds a collection to the list of possible collections.
diff --git a/web/core/lib/Drupal/Core/Config/ConfigFactory.php b/web/core/lib/Drupal/Core/Config/ConfigFactory.php
index 1189a4a15..8c06cd1ed 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -43,7 +43,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
    *
    * @var \Drupal\Core\Config\Config[]
    */
-  protected $cache = array();
+  protected $cache = [];
 
   /**
    * The typed config manager.
@@ -57,7 +57,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
    *
    * @var \Drupal\Core\Config\ConfigFactoryOverrideInterface[]
    */
-  protected $configFactoryOverrides = array();
+  protected $configFactoryOverrides = [];
 
   /**
    * Constructs the Config factory.
@@ -101,7 +101,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
    *   A configuration object.
    */
   protected function doGet($name, $immutable = TRUE) {
-    if ($config = $this->doLoadMultiple(array($name), $immutable)) {
+    if ($config = $this->doLoadMultiple([$name], $immutable)) {
       return $config[$name];
     }
     else {
@@ -111,7 +111,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
 
       if ($immutable) {
         // Get and apply any overrides.
-        $overrides = $this->loadOverrides(array($name));
+        $overrides = $this->loadOverrides([$name]);
         if (isset($overrides[$name])) {
           $config->setModuleOverride($overrides[$name]);
         }
@@ -148,7 +148,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
    *   List of successfully loaded configuration objects, keyed by name.
    */
   protected function doLoadMultiple(array $names, $immutable = TRUE) {
-    $list = array();
+    $list = [];
 
     foreach ($names as $key => $name) {
       $cache_key = $this->getConfigCacheKey($name, $immutable);
@@ -161,7 +161,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
     // Pre-load remaining configuration files.
     if (!empty($names)) {
       // Initialise override information.
-      $module_overrides = array();
+      $module_overrides = [];
       $storage_data = $this->storage->readMultiple($names);
 
       if ($immutable && !empty($storage_data)) {
@@ -202,11 +202,11 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
    *   An array of overrides keyed by the configuration object name.
    */
   protected function loadOverrides(array $names) {
-    $overrides = array();
+    $overrides = [];
     foreach ($this->configFactoryOverrides as $override) {
       // Existing overrides take precedence since these will have been added
       // by events with a higher priority.
-      $overrides = NestedArray::mergeDeepArray(array($override->loadOverrides($names), $overrides), TRUE);
+      $overrides = NestedArray::mergeDeepArray([$override->loadOverrides($names), $overrides], TRUE);
     }
     return $overrides;
   }
@@ -236,7 +236,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
       }
     }
     else {
-      $this->cache = array();
+      $this->cache = [];
     }
 
     // Clear the static list cache if supported by the storage.
@@ -317,7 +317,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
    * {@inheritdoc}
    */
   public function clearStaticCache() {
-    $this->cache = array();
+    $this->cache = [];
     return $this;
   }
 
@@ -365,9 +365,9 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = array('onConfigSave', 255);
-    $events[ConfigEvents::DELETE][] = array('onConfigDelete', 255);
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::SAVE][] = ['onConfigSave', 255];
+    $events[ConfigEvents::DELETE][] = ['onConfigDelete', 255];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/Config/ConfigFactoryOverrideBase.php b/web/core/lib/Drupal/Core/Config/ConfigFactoryOverrideBase.php
index 79eb29403..82e066965 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigFactoryOverrideBase.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigFactoryOverrideBase.php
@@ -44,11 +44,11 @@ abstract class ConfigFactoryOverrideBase implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::COLLECTION_INFO][] = array('addCollections');
-    $events[ConfigEvents::SAVE][] = array('onConfigSave', 20);
-    $events[ConfigEvents::DELETE][] = array('onConfigDelete', 20);
-    $events[ConfigEvents::RENAME][] = array('onConfigRename', 20);
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::COLLECTION_INFO][] = ['addCollections'];
+    $events[ConfigEvents::SAVE][] = ['onConfigSave', 20];
+    $events[ConfigEvents::DELETE][] = ['onConfigDelete', 20];
+    $events[ConfigEvents::RENAME][] = ['onConfigRename', 20];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/Config/ConfigImportValidateEventSubscriberBase.php b/web/core/lib/Drupal/Core/Config/ConfigImportValidateEventSubscriberBase.php
index 4f172a365..13263656c 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigImportValidateEventSubscriberBase.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigImportValidateEventSubscriberBase.php
@@ -22,8 +22,8 @@ abstract class ConfigImportValidateEventSubscriberBase implements EventSubscribe
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::IMPORT_VALIDATE][] = array('onConfigImporterValidate', 20);
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::IMPORT_VALIDATE][] = ['onConfigImporterValidate', 20];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/Config/ConfigImporter.php b/web/core/lib/Drupal/Core/Config/ConfigImporter.php
index 25071b006..06fed4b1b 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -135,7 +135,7 @@ class ConfigImporter {
    *
    * @var array
    */
-  protected $errors = array();
+  protected $errors = [];
 
   /**
    * The total number of extensions to process.
@@ -253,16 +253,16 @@ class ConfigImporter {
    *   An empty list of extensions to process.
    */
   protected function getEmptyExtensionsProcessedList() {
-    return array(
-      'module' => array(
-        'install' => array(),
-        'uninstall' => array(),
-      ),
-      'theme' => array(
-        'install' => array(),
-        'uninstall' => array(),
-      ),
-    );
+    return [
+      'module' => [
+        'install' => [],
+        'uninstall' => [],
+      ],
+      'theme' => [
+        'install' => [],
+        'uninstall' => [],
+      ],
+    ];
   }
 
   /**
@@ -273,7 +273,7 @@ class ConfigImporter {
    */
   public function hasUnprocessedConfigurationChanges() {
     foreach ($this->storageComparer->getAllCollectionNames() as $collection) {
-      foreach (array('delete', 'create', 'rename', 'update') as $op) {
+      foreach (['delete', 'create', 'rename', 'update'] as $op) {
         if (count($this->getUnprocessedConfiguration($op, $collection))) {
           return TRUE;
         }
@@ -440,10 +440,10 @@ class ConfigImporter {
    */
   protected function getUnprocessedExtensions($type) {
     $changelist = $this->getExtensionChangelist($type);
-    return array(
+    return [
       'install' => array_diff($changelist['install'], $this->processedExtensions[$type]['install']),
       'uninstall' => array_diff($changelist['uninstall'], $this->processedExtensions[$type]['uninstall']),
-    );
+    ];
   }
 
   /**
@@ -459,7 +459,7 @@ class ConfigImporter {
       $sync_steps = $this->initialize();
 
       foreach ($sync_steps as $step) {
-        $context = array();
+        $context = [];
         do {
           $this->doSyncStep($step, $context);
         } while ($context['finished'] < 1);
@@ -489,7 +489,7 @@ class ConfigImporter {
     }
     elseif (is_callable($sync_step)) {
       \Drupal::service('config.installer')->setSyncing(TRUE);
-      call_user_func_array($sync_step, array(&$context, $this));
+      call_user_func_array($sync_step, [&$context, $this]);
     }
     else {
       throw new \InvalidArgumentException('Invalid configuration synchronization step');
@@ -517,13 +517,13 @@ class ConfigImporter {
       throw new ConfigImporterException(sprintf('%s is already importing', static::LOCK_NAME));
     }
 
-    $sync_steps = array();
+    $sync_steps = [];
     $modules = $this->getUnprocessedExtensions('module');
-    foreach (array('install', 'uninstall') as $op) {
+    foreach (['install', 'uninstall'] as $op) {
       $this->totalExtensionsToProcess += count($modules[$op]);
     }
     $themes = $this->getUnprocessedExtensions('theme');
-    foreach (array('install', 'uninstall') as $op) {
+    foreach (['install', 'uninstall'] as $op) {
       $this->totalExtensionsToProcess += count($themes[$op]);
     }
 
@@ -542,14 +542,14 @@ class ConfigImporter {
   /**
    * Processes extensions as a batch operation.
    *
-   * @param array|\ArrayAccess $context.
+   * @param array|\ArrayAccess $context
    *   The batch context.
    */
   protected function processExtensions(&$context) {
     $operation = $this->getNextExtensionOperation();
     if (!empty($operation)) {
       $this->processExtension($operation['type'], $operation['op'], $operation['name']);
-      $context['message'] = t('Synchronizing extensions: @op @name.', array('@op' => $operation['op'], '@name' => $operation['name']));
+      $context['message'] = t('Synchronizing extensions: @op @name.', ['@op' => $operation['op'], '@name' => $operation['name']]);
       $processed_count = count($this->processedExtensions['module']['install']) + count($this->processedExtensions['module']['uninstall']);
       $processed_count += count($this->processedExtensions['theme']['uninstall']) + count($this->processedExtensions['theme']['install']);
       $context['finished'] = $processed_count / $this->totalExtensionsToProcess;
@@ -562,7 +562,7 @@ class ConfigImporter {
   /**
    * Processes configuration as a batch operation.
    *
-   * @param array|\ArrayAccess $context.
+   * @param array|\ArrayAccess $context
    *   The batch context.
    */
   protected function processConfigurations(&$context) {
@@ -573,7 +573,7 @@ class ConfigImporter {
     if ($this->totalConfigurationToProcess == 0) {
       $this->storageComparer->reset();
       foreach ($this->storageComparer->getAllCollectionNames() as $collection) {
-        foreach (array('delete', 'create', 'rename', 'update') as $op) {
+        foreach (['delete', 'create', 'rename', 'update'] as $op) {
           $this->totalConfigurationToProcess += count($this->getUnprocessedConfiguration($op, $collection));
         }
       }
@@ -584,14 +584,14 @@ class ConfigImporter {
         $this->processConfiguration($operation['collection'], $operation['op'], $operation['name']);
       }
       if ($operation['collection'] == StorageInterface::DEFAULT_COLLECTION) {
-        $context['message'] = $this->t('Synchronizing configuration: @op @name.', array('@op' => $operation['op'], '@name' => $operation['name']));
+        $context['message'] = $this->t('Synchronizing configuration: @op @name.', ['@op' => $operation['op'], '@name' => $operation['name']]);
       }
       else {
-        $context['message'] = $this->t('Synchronizing configuration: @op @name in @collection.', array('@op' => $operation['op'], '@name' => $operation['name'], '@collection' => $operation['collection']));
+        $context['message'] = $this->t('Synchronizing configuration: @op @name in @collection.', ['@op' => $operation['op'], '@name' => $operation['name'], '@collection' => $operation['collection']]);
       }
       $processed_count = 0;
       foreach ($this->storageComparer->getAllCollectionNames() as $collection) {
-        foreach (array('delete', 'create', 'rename', 'update') as $op) {
+        foreach (['delete', 'create', 'rename', 'update'] as $op) {
           $processed_count += count($this->processedConfiguration[$collection][$op]);
         }
       }
@@ -605,7 +605,7 @@ class ConfigImporter {
   /**
    * Handles processing of missing content.
    *
-   * @param array|\ArrayAccess $context.
+   * @param array|\ArrayAccess $context
    *   Standard batch context.
    */
   protected function processMissingContent(&$context) {
@@ -637,7 +637,7 @@ class ConfigImporter {
   /**
    * Finishes the batch.
    *
-   * @param array|\ArrayAccess $context.
+   * @param array|\ArrayAccess $context
    *   The batch context.
    */
   protected function finish(&$context) {
@@ -657,15 +657,15 @@ class ConfigImporter {
    *   on. If there is nothing left to do returns FALSE;
    */
   protected function getNextExtensionOperation() {
-    foreach (array('module', 'theme') as $type) {
-      foreach (array('install', 'uninstall') as $op) {
+    foreach (['module', 'theme'] as $type) {
+      foreach (['install', 'uninstall'] as $op) {
         $unprocessed = $this->getUnprocessedExtensions($type);
         if (!empty($unprocessed[$op])) {
-          return array(
+          return [
             'op' => $op,
             'type' => $type,
             'name' => array_shift($unprocessed[$op]),
-          );
+          ];
         }
       }
     }
@@ -683,14 +683,14 @@ class ConfigImporter {
     // The order configuration operations is processed is important. Deletes
     // have to come first so that recreates can work.
     foreach ($this->storageComparer->getAllCollectionNames() as $collection) {
-      foreach (array('delete', 'create', 'rename', 'update') as $op) {
+      foreach (['delete', 'create', 'rename', 'update'] as $op) {
         $config_names = $this->getUnprocessedConfiguration($op, $collection);
         if (!empty($config_names)) {
-          return array(
+          return [
             'op' => $op,
             'name' => array_shift($config_names),
             'collection' => $collection,
-          );
+          ];
         }
       }
     }
@@ -716,11 +716,11 @@ class ConfigImporter {
         $old_entity_type_id = $this->configManager->getEntityTypeIdByName($names['old_name']);
         $new_entity_type_id = $this->configManager->getEntityTypeIdByName($names['new_name']);
         if ($old_entity_type_id != $new_entity_type_id) {
-          $this->logError($this->t('Entity type mismatch on rename. @old_type not equal to @new_type for existing configuration @old_name and staged configuration @new_name.', array('@old_type' => $old_entity_type_id, '@new_type' => $new_entity_type_id, '@old_name' => $names['old_name'], '@new_name' => $names['new_name'])));
+          $this->logError($this->t('Entity type mismatch on rename. @old_type not equal to @new_type for existing configuration @old_name and staged configuration @new_name.', ['@old_type' => $old_entity_type_id, '@new_type' => $new_entity_type_id, '@old_name' => $names['old_name'], '@new_name' => $names['new_name']]));
         }
         // Has to be a configuration entity.
         if (!$old_entity_type_id) {
-          $this->logError($this->t('Rename operation for simple configuration. Existing configuration @old_name and staged configuration @new_name.', array('@old_name' => $names['old_name'], '@new_name' => $names['new_name'])));
+          $this->logError($this->t('Rename operation for simple configuration. Existing configuration @old_name and staged configuration @new_name.', ['@old_name' => $names['old_name'], '@new_name' => $names['new_name']]));
         }
       }
       $this->eventDispatcher->dispatch(ConfigEvents::IMPORT_VALIDATE, new ConfigImporterEvent($this));
@@ -760,7 +760,7 @@ class ConfigImporter {
       }
     }
     catch (\Exception $e) {
-      $this->logError($this->t('Unexpected error during import with operation @op for @name: @message', array('@op' => $op, '@name' => $name, '@message' => $e->getMessage())));
+      $this->logError($this->t('Unexpected error during import with operation @op for @name: @message', ['@op' => $op, '@name' => $name, '@message' => $e->getMessage()]));
       // Error for that operation was logged, mark it as processed so that
       // the import can continue.
       $this->setProcessedConfiguration($collection, $op, $name);
@@ -783,7 +783,7 @@ class ConfigImporter {
     \Drupal::service('config.installer')
       ->setSourceStorage($this->storageComparer->getSourceStorage());
     if ($type == 'module') {
-      $this->moduleInstaller->$op(array($name), FALSE);
+      $this->moduleInstaller->$op([$name], FALSE);
       // Installing a module can cause a kernel boot therefore reinject all the
       // services.
       $this->reInjectMe();
@@ -803,7 +803,7 @@ class ConfigImporter {
         $this->configManager->getConfigFactory()->reset('system.theme');
         $this->processedSystemTheme = TRUE;
       }
-      $this->themeHandler->$op(array($name));
+      $this->themeHandler->$op([$name]);
     }
 
     $this->setProcessedExtension($type, $op, $name);
@@ -863,11 +863,11 @@ class ConfigImporter {
             $entity_type = $this->configManager->getEntityManager()->getDefinition($entity_type_id);
             $entity = $entity_storage->load($entity_storage->getIDFromConfigName($name, $entity_type->getConfigPrefix()));
             $entity->delete();
-            $this->logError($this->t('Deleted and replaced configuration entity "@name"', array('@name' => $name)));
+            $this->logError($this->t('Deleted and replaced configuration entity "@name"', ['@name' => $name]));
           }
           else {
             $this->storageComparer->getTargetStorage($collection)->delete($name);
-            $this->logError($this->t('Deleted and replaced configuration "@name"', array('@name' => $name)));
+            $this->logError($this->t('Deleted and replaced configuration "@name"', ['@name' => $name]));
           }
           return TRUE;
         }
@@ -875,7 +875,7 @@ class ConfigImporter {
 
       case 'update':
         if (!$target_exists) {
-          $this->logError($this->t('Update target "@name" is missing.', array('@name' => $name)));
+          $this->logError($this->t('Update target "@name" is missing.', ['@name' => $name]));
           // Mark as processed so that the synchronization continues. Once the
           // the current synchronization is complete it will show up as a
           // create.
@@ -912,7 +912,7 @@ class ConfigImporter {
     }
     else {
       $data = $this->storageComparer->getSourceStorage($collection)->read($name);
-      $config->setData($data ? $data : array());
+      $config->setData($data ? $data : []);
       $config->save();
     }
     $this->setProcessedConfiguration($collection, $op, $name);
@@ -1037,7 +1037,7 @@ class ConfigImporter {
    * keep the services used by the importer in sync.
    */
   protected function reInjectMe() {
-    $this->_serviceIds = array();
+    $this->_serviceIds = [];
     $vars = get_object_vars($this);
     foreach ($vars as $key => $value) {
       if (is_object($value) && isset($value->_serviceId)) {
diff --git a/web/core/lib/Drupal/Core/Config/ConfigInstaller.php b/web/core/lib/Drupal/Core/Config/ConfigInstaller.php
index 97c36882f..c632aa8bb 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigInstaller.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigInstaller.php
@@ -6,7 +6,6 @@ use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Config\Entity\ConfigDependencyManager;
 use Drupal\Core\Config\Entity\ConfigEntityDependency;
-use Drupal\Core\Site\Settings;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class ConfigInstaller implements ConfigInstallerInterface {
@@ -60,6 +59,13 @@ class ConfigInstaller implements ConfigInstallerInterface {
    */
   protected $isSyncing = FALSE;
 
+  /**
+   * The name of the currently active installation profile.
+   *
+   * @var string
+   */
+  protected $installProfile;
+
   /**
    * Constructs the configuration installer.
    *
@@ -73,13 +79,16 @@ class ConfigInstaller implements ConfigInstallerInterface {
    *   The configuration manager.
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
    *   The event dispatcher.
+   * @param string $install_profile
+   *   The name of the currently active installation profile.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, StorageInterface $active_storage, TypedConfigManagerInterface $typed_config, ConfigManagerInterface $config_manager, EventDispatcherInterface $event_dispatcher) {
+  public function __construct(ConfigFactoryInterface $config_factory, StorageInterface $active_storage, TypedConfigManagerInterface $typed_config, ConfigManagerInterface $config_manager, EventDispatcherInterface $event_dispatcher, $install_profile) {
     $this->configFactory = $config_factory;
     $this->activeStorages[$active_storage->getCollectionName()] = $active_storage;
     $this->typedConfig = $typed_config;
     $this->configManager = $config_manager;
     $this->eventDispatcher = $event_dispatcher;
+    $this->installProfile = $install_profile;
   }
 
   /**
@@ -140,7 +149,7 @@ class ConfigInstaller implements ConfigInstallerInterface {
       // Install any optional configuration entities whose dependencies can now
       // be met. This searches all the installed modules config/optional
       // directories.
-      $storage = new ExtensionInstallStorage($this->getActiveStorages(StorageInterface::DEFAULT_COLLECTION), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, FALSE);
+      $storage = new ExtensionInstallStorage($this->getActiveStorages(StorageInterface::DEFAULT_COLLECTION), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, FALSE, $this->installProfile);
       $this->installOptionalConfig($storage, [$type => $name]);
     }
 
@@ -156,11 +165,11 @@ class ConfigInstaller implements ConfigInstallerInterface {
     $optional_profile_config = [];
     if (!$storage) {
       // Search the install profile's optional configuration too.
-      $storage = new ExtensionInstallStorage($this->getActiveStorages(StorageInterface::DEFAULT_COLLECTION), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, TRUE);
+      $storage = new ExtensionInstallStorage($this->getActiveStorages(StorageInterface::DEFAULT_COLLECTION), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, TRUE, $this->installProfile);
       // The extension install storage ensures that overrides are used.
       $profile_storage = NULL;
     }
-    elseif (isset($profile)) {
+    elseif (!empty($profile)) {
       // Creates a profile storage to search for overrides.
       $profile_install_path = $this->drupalGetPath('module', $profile) . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
       $profile_storage = new FileStorage($profile_install_path, StorageInterface::DEFAULT_COLLECTION);
@@ -331,7 +340,7 @@ class ConfigInstaller implements ConfigInstallerInterface {
    * {@inheritdoc}
    */
   public function installCollectionDefaultConfig($collection) {
-    $storage = new ExtensionInstallStorage($this->getActiveStorages(StorageInterface::DEFAULT_COLLECTION), InstallStorage::CONFIG_INSTALL_DIRECTORY, $collection, $this->drupalInstallationAttempted());
+    $storage = new ExtensionInstallStorage($this->getActiveStorages(StorageInterface::DEFAULT_COLLECTION), InstallStorage::CONFIG_INSTALL_DIRECTORY, $collection, $this->drupalInstallationAttempted(), $this->installProfile);
     // Only install configuration for enabled extensions.
     $enabled_extensions = $this->getEnabledExtensions();
     $config_to_install = array_filter($storage->listAll(), function ($config_name) use ($enabled_extensions) {
@@ -416,7 +425,7 @@ class ConfigInstaller implements ConfigInstallerInterface {
    *   collection.
    */
   protected function findPreExistingConfiguration(StorageInterface $storage) {
-    $existing_configuration = array();
+    $existing_configuration = [];
     // Gather information about all the supported collections.
     $collection_info = $this->configManager->getConfigCollectionInfo();
 
@@ -455,9 +464,9 @@ class ConfigInstaller implements ConfigInstallerInterface {
     $profile_storages = $this->getProfileStorages($name);
 
     // Check the dependencies of configuration provided by the module.
-    $invalid_default_config = $this->findDefaultConfigWithUnmetDependencies($storage, $enabled_extensions, $profile_storages);
+    list($invalid_default_config, $missing_dependencies) = $this->findDefaultConfigWithUnmetDependencies($storage, $enabled_extensions, $profile_storages);
     if (!empty($invalid_default_config)) {
-      throw UnmetDependenciesException::create($name, $invalid_default_config);
+      throw UnmetDependenciesException::create($name, array_unique($missing_dependencies));
     }
 
     // Install profiles can not have config clashes. Configuration that
@@ -485,14 +494,24 @@ class ConfigInstaller implements ConfigInstallerInterface {
    *   for overrides.
    *
    * @return array
-   *   List of configuration that has unmet dependencies
+   *   An array containing:
+   *     - A list of configuration that has unmet dependencies.
+   *     - An array that will be filled with the missing dependency names, keyed
+   *       by the dependents' names.
    */
   protected function findDefaultConfigWithUnmetDependencies(StorageInterface $storage, array $enabled_extensions, array $profile_storages = []) {
+    $missing_dependencies = [];
     $config_to_create = $this->getConfigToCreate($storage, StorageInterface::DEFAULT_COLLECTION, '', $profile_storages);
     $all_config = array_merge($this->configFactory->listAll(), array_keys($config_to_create));
-    return array_filter(array_keys($config_to_create), function($config_name) use ($enabled_extensions, $all_config, $config_to_create) {
-      return !$this->validateDependencies($config_name, $config_to_create[$config_name], $enabled_extensions, $all_config);
-    });
+    foreach ($config_to_create as $config_name => $config) {
+      if ($missing = $this->getMissingDependencies($config_name, $config, $enabled_extensions, $all_config)) {
+        $missing_dependencies[$config_name] = $missing;
+      }
+    }
+    return [
+      array_intersect_key($config_to_create, $missing_dependencies),
+      $missing_dependencies,
+    ];
   }
 
   /**
@@ -508,11 +527,38 @@ class ConfigInstaller implements ConfigInstallerInterface {
    *   A list of all the active configuration names.
    *
    * @return bool
-   *   TRUE if the dependencies are met, FALSE if not.
+   *   TRUE if all dependencies are present, FALSE otherwise.
    */
   protected function validateDependencies($config_name, array $data, array $enabled_extensions, array $all_config) {
-    list($provider) = explode('.', $config_name, 2);
+    if (!isset($data['dependencies'])) {
+      // Simple config or a config entity without dependencies.
+      list($provider) = explode('.', $config_name, 2);
+      return in_array($provider, $enabled_extensions, TRUE);
+    }
+
+    $missing = $this->getMissingDependencies($config_name, $data, $enabled_extensions, $all_config);
+    return empty($missing);
+  }
+
+  /**
+   * Returns an array of missing dependencies for a config object.
+   *
+   * @param string $config_name
+   *   The name of the configuration object that is being validated.
+   * @param array $data
+   *   Configuration data.
+   * @param array $enabled_extensions
+   *   A list of all the currently enabled modules and themes.
+   * @param array $all_config
+   *   A list of all the active configuration names.
+   *
+   * @return array
+   *   A list of missing config dependencies.
+   */
+  protected function getMissingDependencies($config_name, array $data, array $enabled_extensions, array $all_config) {
+    $missing = [];
     if (isset($data['dependencies'])) {
+      list($provider) = explode('.', $config_name, 2);
       $all_dependencies = $data['dependencies'];
 
       // Ensure enforced dependencies are included.
@@ -522,10 +568,7 @@ class ConfigInstaller implements ConfigInstallerInterface {
       }
       // Ensure the configuration entity type provider is in the list of
       // dependencies.
-      if (!isset($all_dependencies['module'])) {
-        $all_dependencies['module'][] = $provider;
-      }
-      elseif (!in_array($provider, $all_dependencies['module'])) {
+      if (!isset($all_dependencies['module']) || !in_array($provider, $all_dependencies['module'])) {
         $all_dependencies['module'][] = $provider;
       }
 
@@ -541,18 +584,12 @@ class ConfigInstaller implements ConfigInstallerInterface {
             break;
         }
         if (!empty($list_to_check)) {
-          $missing = array_diff($dependencies, $list_to_check);
-          if (!empty($missing)) {
-            return FALSE;
-          }
+          $missing = array_merge($missing, array_diff($dependencies, $list_to_check));
         }
       }
     }
-    else {
-      // Simple config or a config entity without dependencies.
-      return in_array($provider, $enabled_extensions, TRUE);
-    }
-    return TRUE;
+
+    return $missing;
   }
 
   /**
@@ -638,15 +675,13 @@ class ConfigInstaller implements ConfigInstallerInterface {
   /**
    * Gets the install profile from settings.
    *
-   * @return string|null $profile
+   * @return string|null
    *   The name of the installation profile or NULL if no installation profile
    *   is currently active. This is the case for example during the first steps
    *   of the installer or during unit tests.
    */
   protected function drupalGetProfile() {
-    // Settings is safe to use because settings.php is written before any module
-    // is installed.
-    return Settings::get('install_profile');
+    return $this->installProfile;
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Config/ConfigManager.php b/web/core/lib/Drupal/Core/Config/ConfigManager.php
index b5b1c905e..65da2e913 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigManager.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigManager.php
@@ -148,17 +148,17 @@ class ConfigManager implements ConfigManagerInterface {
     $target_data = explode("\n", Yaml::encode($target_storage->read($target_name)));
 
     // Check for new or removed files.
-    if ($source_data === array('false')) {
+    if ($source_data === ['false']) {
       // Added file.
       // Cast the result of t() to a string, as the diff engine doesn't know
       // about objects.
-      $source_data = array((string) $this->t('File added'));
+      $source_data = [(string) $this->t('File added')];
     }
-    if ($target_data === array('false')) {
+    if ($target_data === ['false']) {
       // Deleted file.
       // Cast the result of t() to a string, as the diff engine doesn't know
       // about objects.
-      $target_data = array((string) $this->t('File removed'));
+      $target_data = [(string) $this->t('File removed')];
     }
 
     return new Diff($source_data, $target_data);
@@ -251,7 +251,7 @@ class ConfigManager implements ConfigManagerInterface {
     if (!$dependency_manager) {
       $dependency_manager = $this->getConfigDependencyManager();
     }
-    $dependencies = array();
+    $dependencies = [];
     foreach ($names as $name) {
       $dependencies = array_merge($dependencies, $dependency_manager->getDependentEntities($type, $name));
     }
@@ -263,7 +263,7 @@ class ConfigManager implements ConfigManagerInterface {
    */
   public function findConfigEntityDependentsAsEntities($type, array $names, ConfigDependencyManager $dependency_manager = NULL) {
     $dependencies = $this->findConfigEntityDependents($type, $names, $dependency_manager);
-    $entities = array();
+    $entities = [];
     $definitions = $this->entityManager->getDefinitions();
     foreach ($dependencies as $config_name => $dependency) {
       // Group by entity type to efficient load entities using
@@ -278,7 +278,7 @@ class ConfigManager implements ConfigManagerInterface {
         $entities[$entity_type_id][] = $id;
       }
     }
-    $entities_to_return = array();
+    $entities_to_return = [];
     foreach ($entities as $entity_type_id => $entities_to_load) {
       $storage = $this->entityManager->getStorage($entity_type_id);
       // Remove the keys since there are potential ID clashes from different
@@ -411,12 +411,12 @@ class ConfigManager implements ConfigManagerInterface {
       return FALSE;
     }
 
-    $affected_dependencies = array(
-      'config' => array(),
-      'content' => array(),
-      'module' => array(),
-      'theme' => array(),
-    );
+    $affected_dependencies = [
+      'config' => [],
+      'content' => [],
+      'module' => [],
+      'theme' => [],
+    ];
 
     // Work out if any of the entity's dependencies are going to be affected.
     if (isset($entity_dependencies[$type])) {
@@ -465,8 +465,8 @@ class ConfigManager implements ConfigManagerInterface {
    * {@inheritdoc}
    */
   public function findMissingContentDependencies() {
-    $content_dependencies = array();
-    $missing_dependencies = array();
+    $content_dependencies = [];
+    $missing_dependencies = [];
     foreach ($this->activeStorage->readMultiple($this->activeStorage->listAll()) as $config_data) {
       if (isset($config_data['dependencies']['content'])) {
         $content_dependencies = array_merge($content_dependencies, $config_data['dependencies']['content']);
@@ -479,11 +479,11 @@ class ConfigManager implements ConfigManagerInterface {
       // Format of the dependency is entity_type:bundle:uuid.
       list($entity_type, $bundle, $uuid) = explode(':', $content_dependency, 3);
       if (!$this->entityManager->loadEntityByUuid($entity_type, $uuid)) {
-        $missing_dependencies[$uuid] = array(
+        $missing_dependencies[$uuid] = [
           'entity_type' => $entity_type,
           'bundle' => $bundle,
           'uuid' => $uuid,
-        );
+        ];
       }
     }
     return $missing_dependencies;
diff --git a/web/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php b/web/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php
index be5be93a1..c4b4230df 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php
@@ -43,7 +43,7 @@ class ConfigModuleOverridesEvent extends Event {
   public function __construct(array $names, LanguageInterface $language = NULL) {
     $this->names = $names;
     $this->language = $language;
-    $this->overrides = array();
+    $this->overrides = [];
   }
 
   /**
@@ -69,7 +69,7 @@ class ConfigModuleOverridesEvent extends Event {
   /**
    * Get configuration overrides.
    *
-   * @return array.
+   * @return array
    *   The array of configuration overrides.
    */
   public function getOverrides() {
@@ -91,7 +91,7 @@ class ConfigModuleOverridesEvent extends Event {
       if (isset($this->overrides[$name])) {
         // Existing overrides take precedence since these will have been added
         // by events with a higher priority.
-        $this->overrides[$name] = NestedArray::mergeDeepArray(array($values, $this->overrides[$name]), TRUE);
+        $this->overrides[$name] = NestedArray::mergeDeepArray([$values, $this->overrides[$name]], TRUE);
       }
       else {
         $this->overrides[$name] = $values;
diff --git a/web/core/lib/Drupal/Core/Config/DatabaseStorage.php b/web/core/lib/Drupal/Core/Config/DatabaseStorage.php
index 4e0c1844b..1368dfff5 100644
--- a/web/core/lib/Drupal/Core/Config/DatabaseStorage.php
+++ b/web/core/lib/Drupal/Core/Config/DatabaseStorage.php
@@ -32,7 +32,7 @@ class DatabaseStorage implements StorageInterface {
    *
    * @var array
    */
-  protected $options = array();
+  protected $options = [];
 
   /**
    * The storage collection.
@@ -54,7 +54,7 @@ class DatabaseStorage implements StorageInterface {
    *   (optional) The collection to store configuration in. Defaults to the
    *   default collection.
    */
-  public function __construct(Connection $connection, $table, array $options = array(), $collection = StorageInterface::DEFAULT_COLLECTION) {
+  public function __construct(Connection $connection, $table, array $options = [], $collection = StorageInterface::DEFAULT_COLLECTION) {
     $this->connection = $connection;
     $this->table = $table;
     $this->options = $options;
@@ -66,10 +66,10 @@ class DatabaseStorage implements StorageInterface {
    */
   public function exists($name) {
     try {
-      return (bool) $this->connection->queryRange('SELECT 1 FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND name = :name', 0, 1, array(
+      return (bool) $this->connection->queryRange('SELECT 1 FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND name = :name', 0, 1, [
         ':collection' => $this->collection,
         ':name' => $name,
-      ), $this->options)->fetchField();
+      ], $this->options)->fetchField();
     }
     catch (\Exception $e) {
       // If we attempt a read without actually having the database or the table
@@ -84,7 +84,7 @@ class DatabaseStorage implements StorageInterface {
   public function read($name) {
     $data = FALSE;
     try {
-      $raw = $this->connection->query('SELECT data FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND name = :name', array(':collection' => $this->collection, ':name' => $name), $this->options)->fetchField();
+      $raw = $this->connection->query('SELECT data FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND name = :name', [':collection' => $this->collection, ':name' => $name], $this->options)->fetchField();
       if ($raw !== FALSE) {
         $data = $this->decode($raw);
       }
@@ -100,9 +100,9 @@ class DatabaseStorage implements StorageInterface {
    * {@inheritdoc}
    */
   public function readMultiple(array $names) {
-    $list = array();
+    $list = [];
     try {
-      $list = $this->connection->query('SELECT name, data FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND name IN ( :names[] )', array(':collection' => $this->collection, ':names[]' => $names), $this->options)->fetchAllKeyed();
+      $list = $this->connection->query('SELECT name, data FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND name IN ( :names[] )', [':collection' => $this->collection, ':names[]' => $names], $this->options)->fetchAllKeyed();
       foreach ($list as &$data) {
         $data = $this->decode($data);
       }
@@ -143,10 +143,10 @@ class DatabaseStorage implements StorageInterface {
    * @return bool
    */
   protected function doWrite($name, $data) {
-    $options = array('return' => Database::RETURN_AFFECTED) + $this->options;
+    $options = ['return' => Database::RETURN_AFFECTED] + $this->options;
     return (bool) $this->connection->merge($this->table, $options)
-      ->keys(array('collection', 'name'), array($this->collection, $name))
-      ->fields(array('data' => $data))
+      ->keys(['collection', 'name'], [$this->collection, $name])
+      ->fields(['data' => $data])
       ->execute();
   }
 
@@ -182,32 +182,32 @@ class DatabaseStorage implements StorageInterface {
    * Defines the schema for the configuration table.
    */
   protected static function schemaDefinition() {
-    $schema = array(
+    $schema = [
       'description' => 'The base table for configuration data.',
-      'fields' => array(
-        'collection' => array(
+      'fields' => [
+        'collection' => [
           'description' => 'Primary Key: Config object collection.',
           'type' => 'varchar_ascii',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'name' => array(
+        ],
+        'name' => [
           'description' => 'Primary Key: Config object name.',
           'type' => 'varchar_ascii',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'data' => array(
+        ],
+        'data' => [
           'description' => 'A serialized configuration object data.',
           'type' => 'blob',
           'not null' => FALSE,
           'size' => 'big',
-        ),
-      ),
-      'primary key' => array('collection', 'name'),
-    );
+        ],
+      ],
+      'primary key' => ['collection', 'name'],
+    ];
     return $schema;
   }
 
@@ -219,7 +219,7 @@ class DatabaseStorage implements StorageInterface {
    * @todo Ignore replica targets for data manipulation operations.
    */
   public function delete($name) {
-    $options = array('return' => Database::RETURN_AFFECTED) + $this->options;
+    $options = ['return' => Database::RETURN_AFFECTED] + $this->options;
     return (bool) $this->connection->delete($this->table, $options)
       ->condition('collection', $this->collection)
       ->condition('name', $name)
@@ -233,9 +233,9 @@ class DatabaseStorage implements StorageInterface {
    * @throws PDOException
    */
   public function rename($name, $new_name) {
-    $options = array('return' => Database::RETURN_AFFECTED) + $this->options;
+    $options = ['return' => Database::RETURN_AFFECTED] + $this->options;
     return (bool) $this->connection->update($this->table, $options)
-      ->fields(array('name' => $new_name))
+      ->fields(['name' => $new_name])
       ->condition('name', $name)
       ->condition('collection', $this->collection)
       ->execute();
@@ -266,14 +266,14 @@ class DatabaseStorage implements StorageInterface {
   public function listAll($prefix = '') {
     try {
       $query = $this->connection->select($this->table);
-      $query->fields($this->table, array('name'));
+      $query->fields($this->table, ['name']);
       $query->condition('collection', $this->collection, '=');
       $query->condition('name', $prefix . '%', 'LIKE');
       $query->orderBy('collection')->orderBy('name');
       return $query->execute()->fetchCol();
     }
     catch (\Exception $e) {
-      return array();
+      return [];
     }
   }
 
@@ -282,7 +282,7 @@ class DatabaseStorage implements StorageInterface {
    */
   public function deleteAll($prefix = '') {
     try {
-      $options = array('return' => Database::RETURN_AFFECTED) + $this->options;
+      $options = ['return' => Database::RETURN_AFFECTED] + $this->options;
       return (bool) $this->connection->delete($this->table, $options)
         ->condition('name', $prefix . '%', 'LIKE')
         ->condition('collection', $this->collection)
@@ -317,12 +317,12 @@ class DatabaseStorage implements StorageInterface {
    */
   public function getAllCollectionNames() {
     try {
-      return $this->connection->query('SELECT DISTINCT collection FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection <> :collection ORDER by collection', array(
-        ':collection' => StorageInterface::DEFAULT_COLLECTION)
+      return $this->connection->query('SELECT DISTINCT collection FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection <> :collection ORDER by collection', [
+        ':collection' => StorageInterface::DEFAULT_COLLECTION]
       )->fetchCol();
     }
     catch (\Exception $e) {
-      return array();
+      return [];
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/Config/Development/ConfigSchemaChecker.php b/web/core/lib/Drupal/Core/Config/Development/ConfigSchemaChecker.php
new file mode 100644
index 000000000..ba69001f4
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Config/Development/ConfigSchemaChecker.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Drupal\Core\Config\Development;
+
+use Drupal\Component\Utility\Crypt;
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Config\ConfigCrudEvent;
+use Drupal\Core\Config\ConfigEvents;
+use Drupal\Core\Config\Schema\SchemaCheckTrait;
+use Drupal\Core\Config\Schema\SchemaIncompleteException;
+use Drupal\Core\Config\StorageInterface;
+use Drupal\Core\Config\TypedConfigManagerInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Listens to the config save event and validates schema.
+ *
+ * If tests have the $strictConfigSchema property set to TRUE this event
+ * listener will be added to the container and throw exceptions if configuration
+ * is invalid.
+ *
+ * @see \Drupal\KernelTests\KernelTestBase::register()
+ * @see \Drupal\simpletest\WebTestBase::setUp()
+ * @see \Drupal\simpletest\KernelTestBase::containerBuild()
+ */
+class ConfigSchemaChecker implements EventSubscriberInterface {
+  use SchemaCheckTrait;
+
+  /**
+   * The typed config manger.
+   *
+   * @var \Drupal\Core\Config\TypedConfigManagerInterface
+   */
+  protected $typedManager;
+
+  /**
+   * An array of config checked already. Keyed by config name and a checksum.
+   *
+   * @var array
+   */
+  protected $checked = [];
+
+  /**
+   * An array of config object names that are excluded from schema checking.
+   *
+   * @var string[]
+   */
+  protected $exclude = [];
+
+  /**
+   * Constructs the ConfigSchemaChecker object.
+   *
+   * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_manager
+   *   The typed config manager.
+   * @param string[] $exclude
+   *   An array of config object names that are excluded from schema checking.
+   */
+  public function __construct(TypedConfigManagerInterface $typed_manager, array $exclude = []) {
+    $this->typedManager = $typed_manager;
+    $this->exclude = $exclude;
+  }
+
+  /**
+   * Checks that configuration complies with its schema on config save.
+   *
+   * @param \Drupal\Core\Config\ConfigCrudEvent $event
+   *   The configuration event.
+   *
+   * @throws \Drupal\Core\Config\Schema\SchemaIncompleteException
+   *   Exception thrown when configuration does not match its schema.
+   */
+  public function onConfigSave(ConfigCrudEvent $event) {
+    // Only validate configuration if in the default collection. Other
+    // collections may have incomplete configuration (for example language
+    // overrides only). These are not valid in themselves.
+    $saved_config = $event->getConfig();
+    if ($saved_config->getStorage()->getCollectionName() != StorageInterface::DEFAULT_COLLECTION) {
+      return;
+    }
+
+    $name = $saved_config->getName();
+    $data = $saved_config->get();
+    $checksum = Crypt::hashBase64(serialize($data));
+    if (!in_array($name, $this->exclude) && !isset($this->checked[$name . ':' . $checksum])) {
+      $this->checked[$name . ':' . $checksum] = TRUE;
+      $errors = $this->checkConfigSchema($this->typedManager, $name, $data);
+      if ($errors === FALSE) {
+        throw new SchemaIncompleteException("No schema for $name");
+      }
+      elseif (is_array($errors)) {
+        $text_errors = [];
+        foreach ($errors as $key => $error) {
+          $text_errors[] = SafeMarkup::format('@key @error', ['@key' => $key, '@error' => $error]);
+        }
+        throw new SchemaIncompleteException("Schema errors for $name with the following errors: " . implode(', ', $text_errors));
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::SAVE][] = ['onConfigSave', 255];
+    return $events;
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php
index 44c02e3f8..2ec87ddfa 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php
@@ -17,7 +17,7 @@ trait ConfigDependencyDeleteFormTrait {
    *
    * Provided by \Drupal\Core\StringTranslation\StringTranslationTrait.
    */
-  abstract protected function t($string, array $args = array(), array $options = array());
+  abstract protected function t($string, array $args = [], array $options = []);
 
   /**
    * Adds form elements to list affected configuration entities.
@@ -41,15 +41,15 @@ trait ConfigDependencyDeleteFormTrait {
   protected function addDependencyListsToForm(array &$form, $type, array $names, ConfigManagerInterface $config_manager, EntityManagerInterface $entity_manager) {
     // Get the dependent entities.
     $dependent_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval($type, $names);
-    $entity_types = array();
+    $entity_types = [];
 
-    $form['entity_updates'] = array(
+    $form['entity_updates'] = [
       '#type' => 'details',
       '#title' => $this->t('Configuration updates'),
       '#description' => $this->t('The listed configuration will be updated.'),
       '#open' => TRUE,
       '#access' => FALSE,
-    );
+    ];
 
     foreach ($dependent_entities['update'] as $entity) {
       /** @var \Drupal\Core\Config\Entity\ConfigEntityInterface  $entity */
@@ -59,11 +59,11 @@ trait ConfigDependencyDeleteFormTrait {
         // Store the ID and label to sort the entity types and entities later.
         $label = $entity_type->getLabel();
         $entity_types[$entity_type_id] = $label;
-        $form['entity_updates'][$entity_type_id] = array(
+        $form['entity_updates'][$entity_type_id] = [
           '#theme' => 'item_list',
           '#title' => $label,
-          '#items' => array(),
-        );
+          '#items' => [],
+        ];
       }
       $form['entity_updates'][$entity_type_id]['#items'][$entity->id()] = $entity->label() ?: $entity->id();
     }
@@ -81,13 +81,13 @@ trait ConfigDependencyDeleteFormTrait {
       }
     }
 
-    $form['entity_deletes'] = array(
+    $form['entity_deletes'] = [
       '#type' => 'details',
       '#title' => $this->t('Configuration deletions'),
       '#description' => $this->t('The listed configuration will be deleted.'),
       '#open' => TRUE,
       '#access' => FALSE,
-    );
+    ];
 
     foreach ($dependent_entities['delete'] as $entity) {
       $entity_type_id = $entity->getEntityTypeId();
@@ -96,11 +96,11 @@ trait ConfigDependencyDeleteFormTrait {
         // Store the ID and label to sort the entity types and entities later.
         $label = $entity_type->getLabel();
         $entity_types[$entity_type_id] = $label;
-        $form['entity_deletes'][$entity_type_id] = array(
+        $form['entity_deletes'][$entity_type_id] = [
           '#theme' => 'item_list',
           '#title' => $label,
-          '#items' => array(),
-        );
+          '#items' => [],
+        ];
       }
       $form['entity_deletes'][$entity_type_id]['#items'][$entity->id()] = $entity->label() ?: $entity->id();
     }
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
index 0dc197138..237929d42 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
@@ -126,7 +126,7 @@ class ConfigDependencyManager {
    *
    * @var \Drupal\Core\Config\Entity\ConfigEntityDependency[]
    */
-  protected $data = array();
+  protected $data = [];
 
   /**
    * The directed acyclic graph.
@@ -150,9 +150,9 @@ class ConfigDependencyManager {
    *   An array of config entity dependency objects that are dependent.
    */
   public function getDependentEntities($type, $name) {
-    $dependent_entities = array();
+    $dependent_entities = [];
 
-    $entities_to_check = array();
+    $entities_to_check = [];
     if ($type == 'config') {
       $entities_to_check[] = $name;
     }
@@ -281,7 +281,7 @@ class ConfigDependencyManager {
    *   supplied entities to check.
    */
   protected function createGraphConfigEntityDependencies($entities_to_check) {
-    $dependent_entities = array();
+    $dependent_entities = [];
     $graph = $this->getGraph();
 
     foreach ($entities_to_check as $entity) {
@@ -304,7 +304,7 @@ class ConfigDependencyManager {
    */
   protected function getGraph() {
     if (!isset($this->graph)) {
-      $graph = array();
+      $graph = [];
       foreach ($this->data as $entity) {
         $graph_key = $entity->getConfigDependencyName();
         if (!isset($graph[$graph_key])) {
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 08e7e1917..90bb70237 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -86,7 +86,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
    *
    * @var array
    */
-  protected $third_party_settings = array();
+  protected $third_party_settings = [];
 
   /**
    * Information maintained by Drupal core about configuration.
@@ -263,7 +263,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
    * {@inheritdoc}
    */
   public function toArray() {
-    $properties = array();
+    $properties = [];
     /** @var \Drupal\Core\Config\Entity\ConfigEntityTypeInterface $entity_type */
     $entity_type = $this->getEntityType();
 
@@ -411,7 +411,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
   /**
    * {@inheritdoc}
    */
-  public function url($rel = 'edit-form', $options = array()) {
+  public function url($rel = 'edit-form', $options = []) {
     // Do not remove this override: the default value of $rel is different.
     return parent::url($rel, $options);
   }
@@ -551,7 +551,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
    * {@inheritdoc}
    */
   public function getThirdPartySettings($module) {
-    return isset($this->third_party_settings[$module]) ? $this->third_party_settings[$module] : array();
+    return isset($this->third_party_settings[$module]) ? $this->third_party_settings[$module] : [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php
index dc17e0546..59128d86c 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBundleBase.php
@@ -109,7 +109,7 @@ abstract class ConfigEntityBundleBase extends ConfigEntityBase {
       $storage = $this->entityManager()->getStorage($entity_type_id);
       return $storage->loadMultiple($ids);
     }
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityDependency.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityDependency.php
index 1b9a80edd..d92b55b6e 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityDependency.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityDependency.php
@@ -57,7 +57,7 @@ class ConfigEntityDependency {
    *   The list of dependencies of the supplied type.
    */
   public function getDependencies($type) {
-    $dependencies = array();
+    $dependencies = [];
     if (isset($this->dependencies[$type])) {
       $dependencies = $this->dependencies[$type];
     }
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityListBuilder.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityListBuilder.php
index acd9d030a..38b7fa87a 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityListBuilder.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityListBuilder.php
@@ -21,7 +21,7 @@ class ConfigEntityListBuilder extends EntityListBuilder {
 
     // Sort the entities using the entity class's sort() method.
     // See \Drupal\Core\Config\Entity\ConfigEntityBase::sort().
-    uasort($entities, array($this->entityType->getClass(), 'sort'));
+    uasort($entities, [$this->entityType->getClass(), 'sort']);
     return $entities;
   }
 
@@ -34,18 +34,18 @@ class ConfigEntityListBuilder extends EntityListBuilder {
 
     if ($this->entityType->hasKey('status')) {
       if (!$entity->status() && $entity->hasLinkTemplate('enable')) {
-        $operations['enable'] = array(
+        $operations['enable'] = [
           'title' => t('Enable'),
           'weight' => -10,
           'url' => $entity->urlInfo('enable'),
-        );
+        ];
       }
       elseif ($entity->hasLinkTemplate('disable')) {
-        $operations['disable'] = array(
+        $operations['disable'] = [
           'title' => t('Disable'),
           'weight' => 40,
           'url' => $entity->urlInfo('disable'),
-        );
+        ];
       }
     }
 
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index 3834dae08..11b66fc7a 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -84,7 +84,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
    * @var array
    * @see \Drupal\Core\Config\ConfigFactoryInterface::getCacheKeys().
    */
-  protected $entities = array();
+  protected $entities = [];
 
   /**
    * Determines if the underlying configuration is retrieved override free.
@@ -170,7 +170,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
       $names = $this->configFactory->listAll($prefix);
     }
     else {
-      $names = array();
+      $names = [];
       foreach ($ids as $id) {
         // Add the prefix to the ID to serve as the configuration object name.
         $names[] = $prefix . $id;
@@ -220,7 +220,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
    */
   protected function doCreate(array $values) {
     // Set default language to current language if not provided.
-    $values += array($this->langcodeKey => $this->languageManager->getCurrentLanguage()->getId());
+    $values += [$this->langcodeKey => $this->languageManager->getCurrentLanguage()->getId()];
     $entity = new $this->entityClass($values, $this->entityTypeId);
 
     return $entity;
@@ -282,7 +282,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
     // Update the entity with the values stored in configuration. It is possible
     // that configuration schema has casted some of the values.
     if (!$entity->hasTrustedData()) {
-      $data = $this->mapFromStorageRecords(array($config->get()));
+      $data = $this->mapFromStorageRecords([$config->get()]);
       $updated_entity = current($data);
 
       foreach (array_keys($config->get()) as $property) {
@@ -326,7 +326,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
    *   Array of entities from the entity cache.
    */
   protected function getFromStaticCache(array $ids) {
-    $entities = array();
+    $entities = [];
     // Load any available entities from the internal cache.
     if ($this->entityType->isStaticallyCacheable() && !empty($this->entities)) {
       $config_overrides_key = $this->overrideFree ? '' : implode(':', $this->configFactory->getCacheKeys());
@@ -366,9 +366,9 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
    */
   protected function invokeHook($hook, EntityInterface $entity) {
     // Invoke the hook.
-    $this->moduleHandler->invokeAll($this->entityTypeId . '_' . $hook, array($entity));
+    $this->moduleHandler->invokeAll($this->entityTypeId . '_' . $hook, [$entity]);
     // Invoke the respective entity-level hook.
-    $this->moduleHandler->invokeAll('entity_' . $hook, array($entity, $this->entityTypeId));
+    $this->moduleHandler->invokeAll('entity_' . $hook, [$entity, $this->entityTypeId]);
   }
 
   /**
@@ -449,7 +449,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
     if ($this->uuidKey && $this->uuidService && !isset($values[$this->uuidKey])) {
       $values[$this->uuidKey] = $this->uuidService->generate();
     }
-    $data = $this->mapFromStorageRecords(array($values));
+    $data = $this->mapFromStorageRecords([$values]);
     $entity = current($data);
     $entity->original = clone $entity;
     $entity->setSyncing($is_syncing);
@@ -469,7 +469,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
   public function updateFromStorageRecord(ConfigEntityInterface $entity, array $values) {
     $entity->original = clone $entity;
 
-    $data = $this->mapFromStorageRecords(array($values));
+    $data = $this->mapFromStorageRecords([$values]);
     $updated_entity = current($data);
 
     foreach (array_keys($values) as $property) {
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
index 1a3642723..11c9ff1bf 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
@@ -64,9 +64,9 @@ class ConfigEntityType extends EntityType implements ConfigEntityTypeInterface {
     // Always add a default 'uuid' key.
     $this->entity_keys['uuid'] = 'uuid';
     $this->entity_keys['langcode'] = 'langcode';
-    $this->handlers += array(
+    $this->handlers += [
       'storage' => 'Drupal\Core\Config\Entity\ConfigEntityStorage',
-    );
+    ];
     $this->lookup_keys[] = 'uuid';
   }
 
diff --git a/web/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php b/web/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php
index 3aed1ece8..f6bf463b1 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/DraggableListBuilder.php
@@ -25,7 +25,7 @@ abstract class DraggableListBuilder extends ConfigEntityListBuilder implements F
    *
    * @var \Drupal\Core\Entity\EntityInterface[]
    */
-  protected $entities = array();
+  protected $entities = [];
 
   /**
    * Name of the entity's weight field or FALSE if no field is provided.
@@ -62,7 +62,7 @@ abstract class DraggableListBuilder extends ConfigEntityListBuilder implements F
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header = array();
+    $header = [];
     if (!empty($this->weightKey)) {
       $header['weight'] = t('Weight');
     }
@@ -73,19 +73,19 @@ abstract class DraggableListBuilder extends ConfigEntityListBuilder implements F
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    $row = array();
+    $row = [];
     if (!empty($this->weightKey)) {
       // Override default values to markup elements.
       $row['#attributes']['class'][] = 'draggable';
       $row['#weight'] = $entity->get($this->weightKey);
       // Add weight column.
-      $row['weight'] = array(
+      $row['weight'] = [
         '#type' => 'weight',
-        '#title' => t('Weight for @title', array('@title' => $entity->label())),
+        '#title' => t('Weight for @title', ['@title' => $entity->label()]),
         '#title_display' => 'invisible',
         '#default_value' => $entity->get($this->weightKey),
-        '#attributes' => array('class' => array('weight')),
-      );
+        '#attributes' => ['class' => ['weight']],
+      ];
     }
     return $row + parent::buildRow($entity);
   }
@@ -104,18 +104,18 @@ abstract class DraggableListBuilder extends ConfigEntityListBuilder implements F
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form[$this->entitiesKey] = array(
+    $form[$this->entitiesKey] = [
       '#type' => 'table',
       '#header' => $this->buildHeader(),
-      '#empty' => t('There is no @label yet.', array('@label' => $this->entityType->getLabel())),
-      '#tabledrag' => array(
-        array(
+      '#empty' => t('There is no @label yet.', ['@label' => $this->entityType->getLabel()]),
+      '#tabledrag' => [
+        [
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'weight',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     $this->entities = $this->load();
     $delta = 10;
@@ -129,7 +129,7 @@ abstract class DraggableListBuilder extends ConfigEntityListBuilder implements F
     foreach ($this->entities as $entity) {
       $row = $this->buildRow($entity);
       if (isset($row['label'])) {
-        $row['label'] = array('#markup' => $row['label']);
+        $row['label'] = ['#markup' => $row['label']];
       }
       if (isset($row['weight'])) {
         $row['weight']['#delta'] = $delta;
@@ -138,11 +138,11 @@ abstract class DraggableListBuilder extends ConfigEntityListBuilder implements F
     }
 
     $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => t('Save'),
       '#button_type' => 'primary',
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/lib/Drupal/Core/Config/Entity/Query/Condition.php b/web/core/lib/Drupal/Core/Config/Entity/Query/Condition.php
index c7e993db1..6764d01ea 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/Query/Condition.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/Query/Condition.php
@@ -19,8 +19,8 @@ class Condition extends ConditionBase {
    */
   public function compile($configs) {
     $and = strtoupper($this->conjunction) == 'AND';
-    $single_conditions = array();
-    $condition_groups = array();
+    $single_conditions = [];
+    $condition_groups = [];
     foreach ($this->conditions as $condition) {
       if ($condition['field'] instanceof ConditionInterface) {
         $condition_groups[] = $condition;
@@ -41,7 +41,7 @@ class Condition extends ConditionBase {
         $single_conditions[] = $condition;
       }
     }
-    $return = array();
+    $return = [];
     if ($single_conditions) {
       foreach ($configs as $config_name => $config) {
         foreach ($single_conditions as $condition) {
@@ -110,7 +110,7 @@ class Condition extends ConditionBase {
    * @return bool
    *   TRUE when the condition matched to the data else FALSE.
    */
-  protected function matchArray(array $condition, array $data, array $needs_matching, array $parents = array()) {
+  protected function matchArray(array $condition, array $data, array $needs_matching, array $parents = []) {
     $parent = array_shift($needs_matching);
     if ($parent === '*') {
       $candidates = array_keys($data);
@@ -120,7 +120,7 @@ class Condition extends ConditionBase {
       if (!isset($data[$parent])) {
         $data[$parent] = NULL;
       }
-      $candidates = array($parent);
+      $candidates = [$parent];
     }
     foreach ($candidates as $key) {
       if ($needs_matching) {
diff --git a/web/core/lib/Drupal/Core/Config/Entity/Query/Query.php b/web/core/lib/Drupal/Core/Config/Entity/Query/Query.php
index eee073f56..918853d34 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/Query/Query.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/Query/Query.php
@@ -49,7 +49,7 @@ class Query extends QueryBase implements QueryInterface {
    * @param array $namespaces
    *   List of potential namespaces of the classes belonging to this query.
    */
-  function __construct(EntityTypeInterface $entity_type, $conjunction, ConfigFactoryInterface $config_factory, KeyValueFactoryInterface $key_value_factory, array $namespaces) {
+  public function __construct(EntityTypeInterface $entity_type, $conjunction, ConfigFactoryInterface $config_factory, KeyValueFactoryInterface $key_value_factory, array $namespaces) {
     parent::__construct($entity_type, $conjunction, $namespaces);
     $this->configFactory = $config_factory;
     $this->keyValueFactory = $key_value_factory;
@@ -141,7 +141,7 @@ class Query extends QueryBase implements QueryInterface {
           elseif (in_array($condition['field'], $lookup_keys)) {
             // If we don't find anything then there are no matches. No point in
             // listing anything.
-            $names = array();
+            $names = [];
             $keys = (array) $condition['value'];
             $keys = array_map(function ($value) use ($condition) {
               return $condition['field'] . ':' . $value;
@@ -208,7 +208,7 @@ class Query extends QueryBase implements QueryInterface {
     }
 
     // Load the corresponding records.
-    $records = array();
+    $records = [];
     foreach ($this->configFactory->loadMultiple($names) as $config) {
       $records[substr($config->getName(), $prefix_length)] = $config->get();
     }
diff --git a/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php b/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
index 0327e902b..f87e618b3 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
@@ -163,7 +163,7 @@ class QueryFactory implements QueryFactoryInterface, EventSubscriberInterface {
 
     $values = (array) $this->getValues($config, $parts[0], $get_method, $parts);
 
-    $output = array();
+    $output = [];
     // Flatten the array to a single dimension and add the key to all the
     // values.
     array_walk_recursive($values, function ($current) use (&$output, $key) {
@@ -249,9 +249,9 @@ class QueryFactory implements QueryFactoryInterface, EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = array('onConfigSave', 128);
-    $events[ConfigEvents::DELETE][] = array('onConfigDelete', 128);
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::SAVE][] = ['onConfigSave', 128];
+    $events[ConfigEvents::DELETE][] = ['onConfigDelete', 128];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php b/web/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php
index 14e80dd88..9103ab8c0 100644
--- a/web/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php
+++ b/web/core/lib/Drupal/Core/Config/ExtensionInstallStorage.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Core\Config;
 
-use Drupal\Core\Site\Settings;
 use Drupal\Core\Extension\ExtensionDiscovery;
 
 /**
@@ -27,6 +26,13 @@ class ExtensionInstallStorage extends InstallStorage {
    */
   protected $includeProfile = TRUE;
 
+  /**
+   * The name of the currently active installation profile.
+   *
+   * @var string
+   */
+  protected $installProfile;
+
   /**
    * Overrides \Drupal\Core\Config\InstallStorage::__construct().
    *
@@ -42,11 +48,19 @@ class ExtensionInstallStorage extends InstallStorage {
    * @param bool $include_profile
    *   (optional) Whether to include the install profile in extensions to
    *   search and to get overrides from.
+   * @param string $profile
+   *   (optional) The current installation profile. This parameter will be
+   *   mandatory in Drupal 9.0.0. In Drupal 8.3.0 not providing this parameter
+   *   will trigger a silenced deprecation warning.
    */
-  public function __construct(StorageInterface $config_storage, $directory = self::CONFIG_INSTALL_DIRECTORY, $collection = StorageInterface::DEFAULT_COLLECTION, $include_profile = TRUE) {
+  public function __construct(StorageInterface $config_storage, $directory = self::CONFIG_INSTALL_DIRECTORY, $collection = StorageInterface::DEFAULT_COLLECTION, $include_profile = TRUE, $profile = NULL) {
     parent::__construct($directory, $collection);
     $this->configStorage = $config_storage;
     $this->includeProfile = $include_profile;
+    if (is_null($profile)) {
+      @trigger_error('Install profile will be a mandatory parameter in Drupal 9.0.', E_USER_DEPRECATED);
+    }
+    $this->installProfile = $profile ?: \Drupal::installProfile();
   }
 
   /**
@@ -74,28 +88,26 @@ class ExtensionInstallStorage extends InstallStorage {
    */
   protected function getAllFolders() {
     if (!isset($this->folders)) {
-      $this->folders = array();
+      $this->folders = [];
       $this->folders += $this->getCoreNames();
 
-      $install_profile = Settings::get('install_profile');
-      $profile = drupal_get_profile();
       $extensions = $this->configStorage->read('core.extension');
       // @todo Remove this scan as part of https://www.drupal.org/node/2186491
       $listing = new ExtensionDiscovery(\Drupal::root());
       if (!empty($extensions['module'])) {
         $modules = $extensions['module'];
         // Remove the install profile as this is handled later.
-        unset($modules[$install_profile]);
+        unset($modules[$this->installProfile]);
         $profile_list = $listing->scan('profile');
-        if ($profile && isset($profile_list[$profile])) {
+        if ($this->installProfile && isset($profile_list[$this->installProfile])) {
           // Prime the drupal_get_filename() static cache with the profile info
           // file location so we can use drupal_get_path() on the active profile
           // during the module scan.
           // @todo Remove as part of https://www.drupal.org/node/2186491
-          drupal_get_filename('profile', $profile, $profile_list[$profile]->getPathname());
+          drupal_get_filename('profile', $this->installProfile, $profile_list[$this->installProfile]->getPathname());
         }
         $module_list_scan = $listing->scan('module');
-        $module_list = array();
+        $module_list = [];
         foreach (array_keys($modules) as $module) {
           if (isset($module_list_scan[$module])) {
             $module_list[$module] = $module_list_scan[$module];
@@ -117,12 +129,12 @@ class ExtensionInstallStorage extends InstallStorage {
         // The install profile can override module default configuration. We do
         // this by replacing the config file path from the module/theme with the
         // install profile version if there are any duplicates.
-        if (isset($profile)) {
+        if ($this->installProfile) {
           if (!isset($profile_list)) {
             $profile_list = $listing->scan('profile');
           }
-          if (isset($profile_list[$profile])) {
-            $profile_folders = $this->getComponentNames(array($profile_list[$profile]));
+          if (isset($profile_list[$this->installProfile])) {
+            $profile_folders = $this->getComponentNames([$profile_list[$this->installProfile]]);
             $this->folders = $profile_folders + $this->folders;
           }
         }
diff --git a/web/core/lib/Drupal/Core/Config/FileStorage.php b/web/core/lib/Drupal/Core/Config/FileStorage.php
index 4904576e2..84d23d327 100644
--- a/web/core/lib/Drupal/Core/Config/FileStorage.php
+++ b/web/core/lib/Drupal/Core/Config/FileStorage.php
@@ -125,7 +125,7 @@ class FileStorage implements StorageInterface {
    * {@inheritdoc}
    */
   public function readMultiple(array $names) {
-    $list = array();
+    $list = [];
     foreach ($names as $name) {
       if ($data = $this->read($name)) {
         $list[$name] = $data;
@@ -217,7 +217,7 @@ class FileStorage implements StorageInterface {
   public function listAll($prefix = '') {
     $dir = $this->getCollectionDirectory();
     if (!is_dir($dir)) {
-      return array();
+      return [];
     }
     $extension = '.' . static::getFileExtension();
 
@@ -227,7 +227,7 @@ class FileStorage implements StorageInterface {
     // @see https://github.com/mikey179/vfsStream/issues/2
     $files = scandir($dir);
 
-    $names = array();
+    $names = [];
     $pattern = '/^' . preg_quote($prefix, '/') . '.*' . preg_quote($extension, '/') . '$/';
     foreach ($files as $file) {
       if ($file[0] !== '.' && preg_match($pattern, $file)) {
@@ -311,7 +311,7 @@ class FileStorage implements StorageInterface {
    *   A list of collection names contained within the provided directory.
    */
   protected function getAllCollectionNamesHelper($directory) {
-    $collections = array();
+    $collections = [];
     $pattern = '/\.' . preg_quote($this->getFileExtension(), '/') . '$/';
     foreach (new \DirectoryIterator($directory) as $fileinfo) {
       if ($fileinfo->isDir() && !$fileinfo->isDot()) {
diff --git a/web/core/lib/Drupal/Core/Config/FileStorageFactory.php b/web/core/lib/Drupal/Core/Config/FileStorageFactory.php
index 70c2582a8..9e324975f 100644
--- a/web/core/lib/Drupal/Core/Config/FileStorageFactory.php
+++ b/web/core/lib/Drupal/Core/Config/FileStorageFactory.php
@@ -15,7 +15,7 @@ class FileStorageFactory {
    * @deprecated in Drupal 8.0.x and will be removed before 9.0.0. Drupal core
    * no longer creates an active directory.
    */
-  static function getActive() {
+  public static function getActive() {
     return new FileStorage(config_get_config_directory(CONFIG_ACTIVE_DIRECTORY));
   }
 
@@ -24,7 +24,7 @@ class FileStorageFactory {
    *
    * @return \Drupal\Core\Config\FileStorage FileStorage
    */
-  static function getSync() {
+  public static function getSync() {
     return new FileStorage(config_get_config_directory(CONFIG_SYNC_DIRECTORY));
   }
 
diff --git a/web/core/lib/Drupal/Core/Config/Importer/FinalMissingContentSubscriber.php b/web/core/lib/Drupal/Core/Config/Importer/FinalMissingContentSubscriber.php
index 9def6df92..3dca3fbf0 100644
--- a/web/core/lib/Drupal/Core/Config/Importer/FinalMissingContentSubscriber.php
+++ b/web/core/lib/Drupal/Core/Config/Importer/FinalMissingContentSubscriber.php
@@ -33,7 +33,7 @@ class FinalMissingContentSubscriber implements EventSubscriberInterface {
   public static function getSubscribedEvents() {
     // This should always be the final event as it will mark all content
     // dependencies as resolved.
-    $events[ConfigEvents::IMPORT_MISSING_CONTENT][] = array('onMissingContent', -1024);
+    $events[ConfigEvents::IMPORT_MISSING_CONTENT][] = ['onMissingContent', -1024];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/Config/InstallStorage.php b/web/core/lib/Drupal/Core/Config/InstallStorage.php
index bd9bf3055..9fea3df47 100644
--- a/web/core/lib/Drupal/Core/Config/InstallStorage.php
+++ b/web/core/lib/Drupal/Core/Config/InstallStorage.php
@@ -131,7 +131,7 @@ class InstallStorage extends FileStorage {
       return $names;
     }
     else {
-      $return = array();
+      $return = [];
       foreach ($names as $index => $name) {
         if (strpos($name, $prefix) === 0 ) {
           $return[$index] = $names[$index];
@@ -149,7 +149,7 @@ class InstallStorage extends FileStorage {
    */
   protected function getAllFolders() {
     if (!isset($this->folders)) {
-      $this->folders = array();
+      $this->folders = [];
       $this->folders += $this->getCoreNames();
       // Perform an ExtensionDiscovery scan as we cannot use drupal_get_path()
       // yet because the system module may not yet be enabled during install.
@@ -163,7 +163,7 @@ class InstallStorage extends FileStorage {
           // during the module scan.
           // @todo Remove as part of https://www.drupal.org/node/2186491
           drupal_get_filename('profile', $profile, $profile_list[$profile]->getPathname());
-          $this->folders += $this->getComponentNames(array($profile_list[$profile]));
+          $this->folders += $this->getComponentNames([$profile_list[$profile]]);
         }
       }
       // @todo Remove as part of https://www.drupal.org/node/2186491
@@ -185,7 +185,7 @@ class InstallStorage extends FileStorage {
   public function getComponentNames(array $list) {
     $extension = '.' . $this->getFileExtension();
     $pattern = '/' . preg_quote($extension, '/') . '$/';
-    $folders = array();
+    $folders = [];
     foreach ($list as $extension_object) {
       // We don't have to use ExtensionDiscovery here because our list of
       // extensions was already obtained through an ExtensionDiscovery scan.
@@ -216,7 +216,7 @@ class InstallStorage extends FileStorage {
   public function getCoreNames() {
     $extension = '.' . $this->getFileExtension();
     $pattern = '/' . preg_quote($extension, '/') . '$/';
-    $folders = array();
+    $folders = [];
     $directory = $this->getCoreFolder();
     if (is_dir($directory)) {
       // glob() directly calls into libc glob(), which is not aware of PHP
diff --git a/web/core/lib/Drupal/Core/Config/NullStorage.php b/web/core/lib/Drupal/Core/Config/NullStorage.php
index 796603368..0dd14730a 100644
--- a/web/core/lib/Drupal/Core/Config/NullStorage.php
+++ b/web/core/lib/Drupal/Core/Config/NullStorage.php
@@ -29,14 +29,14 @@ class NullStorage implements StorageInterface {
    * {@inheritdoc}
    */
   public function read($name) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function readMultiple(array $names) {
-    return array();
+    return [];
   }
 
   /**
@@ -78,7 +78,7 @@ class NullStorage implements StorageInterface {
    * {@inheritdoc}
    */
   public function listAll($prefix = '') {
-    return array();
+    return [];
   }
 
   /**
@@ -99,7 +99,7 @@ class NullStorage implements StorageInterface {
    * {@inheritdoc}
    */
   public function getAllCollectionNames() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Config/PreExistingConfigException.php b/web/core/lib/Drupal/Core/Config/PreExistingConfigException.php
index 4c19dfaff..57f54b296 100644
--- a/web/core/lib/Drupal/Core/Config/PreExistingConfigException.php
+++ b/web/core/lib/Drupal/Core/Config/PreExistingConfigException.php
@@ -57,10 +57,10 @@ class PreExistingConfigException extends ConfigException {
    */
   public static function create($extension, array $config_objects) {
     $message = SafeMarkup::format('Configuration objects (@config_names) provided by @extension already exist in active configuration',
-      array(
+      [
         '@config_names' => implode(', ', static::flattenConfigObjects($config_objects)),
         '@extension' => $extension
-      )
+      ]
     );
     $e = new static($message);
     $e->configObjects = $config_objects;
@@ -80,7 +80,7 @@ class PreExistingConfigException extends ConfigException {
    *   collection.
    */
   public static function flattenConfigObjects(array $config_objects) {
-    $flat_config_objects = array();
+    $flat_config_objects = [];
     foreach ($config_objects as $collection => $config_names) {
       $config_names = array_map(function ($config_name) use ($collection) {
         if ($collection != StorageInterface::DEFAULT_COLLECTION) {
diff --git a/web/core/lib/Drupal/Core/Config/Schema/ArrayElement.php b/web/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
index 7fc6cc515..c50765544 100644
--- a/web/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
+++ b/web/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
@@ -19,7 +19,7 @@ abstract class ArrayElement extends Element implements \IteratorAggregate, Typed
    *   Array of valid configuration data keys.
    */
   protected function getAllKeys() {
-    return is_array($this->value) ? array_keys($this->value) : array();
+    return is_array($this->value) ? array_keys($this->value) : [];
   }
 
   /**
@@ -29,7 +29,7 @@ abstract class ArrayElement extends Element implements \IteratorAggregate, Typed
    *   An array of elements contained in this element.
    */
   protected function parse() {
-    $elements = array();
+    $elements = [];
     foreach ($this->getAllKeys() as $key) {
       $value = isset($this->value[$key]) ? $this->value[$key] : NULL;
       $definition = $this->getElementDefinition($key);
@@ -96,7 +96,7 @@ abstract class ArrayElement extends Element implements \IteratorAggregate, Typed
    * {@inheritdoc}
    */
   public function toArray() {
-    return isset($this->value) ? $this->value : array();
+    return isset($this->value) ? $this->value : [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Config/Schema/ConfigSchemaDiscovery.php b/web/core/lib/Drupal/Core/Config/Schema/ConfigSchemaDiscovery.php
index f74cc91c1..3e6301046 100644
--- a/web/core/lib/Drupal/Core/Config/Schema/ConfigSchemaDiscovery.php
+++ b/web/core/lib/Drupal/Core/Config/Schema/ConfigSchemaDiscovery.php
@@ -26,7 +26,7 @@ class ConfigSchemaDiscovery implements DiscoveryInterface {
    * @param $schema_storage
    *   The storage object to use for reading schema data.
    */
-  function __construct(StorageInterface $schema_storage) {
+  public function __construct(StorageInterface $schema_storage) {
     $this->schemaStorage = $schema_storage;
   }
 
@@ -34,7 +34,7 @@ class ConfigSchemaDiscovery implements DiscoveryInterface {
    * {@inheritdoc}
    */
   public function getDefinitions() {
-    $definitions = array();
+    $definitions = [];
     foreach ($this->schemaStorage->readMultiple($this->schemaStorage->listAll()) as $schema) {
       foreach ($schema as $type => $definition) {
         $definitions[$type] = $definition;
diff --git a/web/core/lib/Drupal/Core/Config/Schema/Mapping.php b/web/core/lib/Drupal/Core/Config/Schema/Mapping.php
index 2f4b58f8e..220a35049 100644
--- a/web/core/lib/Drupal/Core/Config/Schema/Mapping.php
+++ b/web/core/lib/Drupal/Core/Config/Schema/Mapping.php
@@ -22,7 +22,7 @@ class Mapping extends ArrayElement {
    */
   protected function getElementDefinition($key) {
     $value = isset($this->value[$key]) ? $this->value[$key] : NULL;
-    $definition = isset($this->definition['mapping'][$key]) ? $this->definition['mapping'][$key] : array();
+    $definition = isset($this->definition['mapping'][$key]) ? $this->definition['mapping'][$key] : [];
     return $this->buildDataDefinition($definition, $value, $key);
   }
 
diff --git a/web/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php b/web/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
index 972eda438..9230281f5 100644
--- a/web/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
+++ b/web/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
@@ -58,7 +58,7 @@ trait SchemaCheckTrait {
     $definition = $typed_config->getDefinition($config_name);
     $data_definition = $typed_config->buildDataDefinition($definition, $config_data);
     $this->schema = $typed_config->create($data_definition, $config_data);
-    $errors = array();
+    $errors = [];
     foreach ($config_data as $key => $value) {
       $errors = array_merge($errors, $this->checkValue($key, $value));
     }
@@ -83,12 +83,12 @@ trait SchemaCheckTrait {
     $error_key = $this->configName . ':' . $key;
     $element = $this->schema->get($key);
     if ($element instanceof Undefined) {
-      return array($error_key => 'missing schema');
+      return [$error_key => 'missing schema'];
     }
 
     // Do not check value if it is defined to be ignored.
     if ($element && $element instanceof Ignore) {
-      return array();
+      return [];
     }
 
     if ($element && is_scalar($value) || $value === NULL) {
@@ -110,11 +110,11 @@ trait SchemaCheckTrait {
       }
       $class = get_class($element);
       if (!$success) {
-        return array($error_key => "variable type is $type but applied schema class is $class");
+        return [$error_key => "variable type is $type but applied schema class is $class"];
       }
     }
     else {
-      $errors = array();
+      $errors = [];
       if (!$element instanceof TraversableTypedDataInterface) {
         $errors[$error_key] = 'non-scalar value but not defined as an array (such as mapping or sequence)';
       }
@@ -131,7 +131,7 @@ trait SchemaCheckTrait {
       return $errors;
     }
     // No errors found.
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Config/Schema/Sequence.php b/web/core/lib/Drupal/Core/Config/Schema/Sequence.php
index e03427e6b..ce8dc1bc0 100644
--- a/web/core/lib/Drupal/Core/Config/Schema/Sequence.php
+++ b/web/core/lib/Drupal/Core/Config/Schema/Sequence.php
@@ -19,7 +19,7 @@ class Sequence extends ArrayElement {
   protected function getElementDefinition($key) {
     $value = isset($this->value[$key]) ? $this->value[$key] : NULL;
     // @todo: Remove BC layer for sequence with hyphen in front. https://www.drupal.org/node/2444979
-    $definition = array();
+    $definition = [];
     if (isset($this->definition['sequence'][0])) {
       $definition = $this->definition['sequence'][0];
     }
diff --git a/web/core/lib/Drupal/Core/Config/StorableConfigBase.php b/web/core/lib/Drupal/Core/Config/StorableConfigBase.php
index 40a25ef30..4b227c9ef 100644
--- a/web/core/lib/Drupal/Core/Config/StorableConfigBase.php
+++ b/web/core/lib/Drupal/Core/Config/StorableConfigBase.php
@@ -55,7 +55,7 @@ abstract class StorableConfigBase extends ConfigBase {
    *
    * @var array
    */
-  protected $originalData = array();
+  protected $originalData = [];
 
   /**
    * Saves the configuration object.
diff --git a/web/core/lib/Drupal/Core/Config/StorageComparer.php b/web/core/lib/Drupal/Core/Config/StorageComparer.php
index 224136f3c..55aeebc56 100644
--- a/web/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/web/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -63,7 +63,7 @@ class StorageComparer implements StorageComparerInterface {
    *
    * @var array
    */
-  protected $sourceNames = array();
+  protected $sourceNames = [];
 
   /**
    * Sorted list of all the configuration object names in the target storage.
@@ -72,7 +72,7 @@ class StorageComparer implements StorageComparerInterface {
    *
    * @var array
    */
-  protected $targetNames = array();
+  protected $targetNames = [];
 
   /**
    * A memory cache backend to statically cache source configuration data.
@@ -101,12 +101,12 @@ class StorageComparer implements StorageComparerInterface {
   public function __construct(StorageInterface $source_storage, StorageInterface $target_storage, ConfigManagerInterface $config_manager) {
     // Wrap the storages in a static cache so that multiple reads of the same
     // raw configuration object are not costly.
-    $this->sourceCacheStorage = new MemoryBackend(__CLASS__ . '::source');
+    $this->sourceCacheStorage = new MemoryBackend();
     $this->sourceStorage = new CachedStorage(
       $source_storage,
       $this->sourceCacheStorage
     );
-    $this->targetCacheStorage = new MemoryBackend(__CLASS__ . '::target');
+    $this->targetCacheStorage = new MemoryBackend();
     $this->targetStorage = new CachedStorage(
       $target_storage,
       $this->targetCacheStorage
@@ -149,12 +149,12 @@ class StorageComparer implements StorageComparerInterface {
    * {@inheritdoc}
    */
   public function getEmptyChangelist() {
-    return array(
-      'create' => array(),
-      'update' => array(),
-      'delete' => array(),
-      'rename' => array(),
-    );
+    return [
+      'create' => [],
+      'update' => [],
+      'delete' => [],
+      'rename' => [],
+    ];
   }
 
   /**
@@ -254,7 +254,7 @@ class StorageComparer implements StorageComparerInterface {
    *   The storage collection to operate on.
    */
   protected function addChangelistUpdate($collection) {
-    $recreates = array();
+    $recreates = [];
     foreach (array_intersect($this->sourceNames[$collection], $this->targetNames[$collection]) as $name) {
       $source_data = $this->getSourceStorage($collection)->read($name);
       $target_data = $this->getTargetStorage($collection)->read($name);
@@ -266,7 +266,7 @@ class StorageComparer implements StorageComparerInterface {
           $recreates[] = $name;
         }
         else {
-          $this->addChangeList($collection, 'update', array($name));
+          $this->addChangeList($collection, 'update', [$name]);
         }
       }
     }
@@ -298,7 +298,7 @@ class StorageComparer implements StorageComparerInterface {
       return;
     }
 
-    $create_uuids = array();
+    $create_uuids = [];
     foreach ($this->sourceNames[$collection] as $name) {
       $data = $this->getSourceStorage($collection)->read($name);
       if (isset($data['uuid']) && in_array($name, $create_list)) {
@@ -309,7 +309,7 @@ class StorageComparer implements StorageComparerInterface {
       return;
     }
 
-    $renames = array();
+    $renames = [];
 
     // Renames should be ordered so that dependencies are renamed last. This
     // ensures that if there is logic in the configuration entity class to keep
@@ -357,15 +357,15 @@ class StorageComparer implements StorageComparerInterface {
   public function moveRenameToUpdate($rename, $collection = StorageInterface::DEFAULT_COLLECTION) {
     $names = $this->extractRenameNames($rename);
     $this->removeFromChangelist($collection, 'rename', $rename);
-    $this->addChangeList($collection, 'update', array($names['new_name']), $this->sourceNames[$collection]);
+    $this->addChangeList($collection, 'update', [$names['new_name']], $this->sourceNames[$collection]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function reset() {
-    $this->changelist = array(StorageInterface::DEFAULT_COLLECTION => $this->getEmptyChangelist());
-    $this->sourceNames = $this->targetNames = array();
+    $this->changelist = [StorageInterface::DEFAULT_COLLECTION => $this->getEmptyChangelist()];
+    $this->sourceNames = $this->targetNames = [];
     // Reset the static configuration data caches.
     $this->sourceCacheStorage->deleteAll();
     $this->targetCacheStorage->deleteAll();
@@ -377,7 +377,7 @@ class StorageComparer implements StorageComparerInterface {
    */
   public function hasChanges() {
     foreach ($this->getAllCollectionNames() as $collection) {
-      foreach (array('delete', 'create', 'update', 'rename') as $op) {
+      foreach (['delete', 'create', 'update', 'rename'] as $op) {
         if (!empty($this->changelist[$collection][$op])) {
           return TRUE;
         }
@@ -442,10 +442,10 @@ class StorageComparer implements StorageComparerInterface {
    */
   public function extractRenameNames($name) {
     $names = explode('::', $name, 2);
-    return array(
+    return [
       'old_name' => $names[0],
       'new_name' => $names[1],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php b/web/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
index e863b35ad..ea8e27e41 100644
--- a/web/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
+++ b/web/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
@@ -2,14 +2,7 @@
 
 namespace Drupal\Core\Config\Testing;
 
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Config\ConfigCrudEvent;
-use Drupal\Core\Config\ConfigEvents;
-use Drupal\Core\Config\Schema\SchemaCheckTrait;
-use Drupal\Core\Config\Schema\SchemaIncompleteException;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Config\TypedConfigManagerInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Drupal\Core\Config\Development\ConfigSchemaChecker as SchemaChecker;
 
 /**
  * Listens to the config save event and validates schema.
@@ -18,89 +11,12 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  * listener will be added to the container and throw exceptions if configuration
  * is invalid.
  *
- * @see \Drupal\simpletest\WebTestBase::setUp()
  * @see \Drupal\KernelTests\KernelTestBase::register()
+ * @see \Drupal\simpletest\WebTestBase::setUp()
+ * @see \Drupal\simpletest\KernelTestBase::containerBuild()
+ *
+ * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0.
+ *   Use Drupal\Core\Config\Development\ConfigSchemaChecker.
  */
-class ConfigSchemaChecker implements EventSubscriberInterface {
-  use SchemaCheckTrait;
-
-  /**
-   * The typed config manger.
-   *
-   * @var \Drupal\Core\Config\TypedConfigManagerInterface
-   */
-  protected $typedManager;
-
-  /**
-   * An array of config checked already. Keyed by config name and a checksum.
-   *
-   * @var array
-   */
-  protected $checked = array();
-
-  /**
-   * An array of config object names that are excluded from schema checking.
-   *
-   * @var string[]
-   */
-  protected $exclude = array();
-
-  /**
-   * Constructs the ConfigSchemaChecker object.
-   *
-   * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_manager
-   *   The typed config manager.
-   * @param string[] $exclude
-   *   An array of config object names that are excluded from schema checking.
-   */
-  public function __construct(TypedConfigManagerInterface $typed_manager, array $exclude = array()) {
-    $this->typedManager = $typed_manager;
-    $this->exclude = $exclude;
-  }
-
-  /**
-   * Checks that configuration complies with its schema on config save.
-   *
-   * @param \Drupal\Core\Config\ConfigCrudEvent $event
-   *   The configuration event.
-   *
-   * @throws \Drupal\Core\Config\Schema\SchemaIncompleteException
-   *   Exception thrown when configuration does not match its schema.
-   */
-  public function onConfigSave(ConfigCrudEvent $event) {
-    // Only validate configuration if in the default collection. Other
-    // collections may have incomplete configuration (for example language
-    // overrides only). These are not valid in themselves.
-    $saved_config = $event->getConfig();
-    if ($saved_config->getStorage()->getCollectionName() != StorageInterface::DEFAULT_COLLECTION) {
-      return;
-    }
-
-    $name = $saved_config->getName();
-    $data = $saved_config->get();
-    $checksum = hash('crc32b', serialize($data));
-    if (!in_array($name, $this->exclude) && !isset($this->checked[$name . ':' . $checksum])) {
-      $this->checked[$name . ':' . $checksum] = TRUE;
-      $errors = $this->checkConfigSchema($this->typedManager, $name, $data);
-      if ($errors === FALSE) {
-        throw new SchemaIncompleteException("No schema for $name");
-      }
-      elseif (is_array($errors)) {
-        $text_errors = [];
-        foreach ($errors as $key => $error) {
-          $text_errors[] = SafeMarkup::format('@key @error', array('@key' => $key, '@error' => $error));
-        }
-        throw new SchemaIncompleteException("Schema errors for $name with the following errors: " . implode(', ', $text_errors));
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = array('onConfigSave', 255);
-    return $events;
-  }
-
+class ConfigSchemaChecker extends SchemaChecker {
 }
diff --git a/web/core/lib/Drupal/Core/Config/TypedConfigManager.php b/web/core/lib/Drupal/Core/Config/TypedConfigManager.php
index 8e3ea454e..22795ad6f 100644
--- a/web/core/lib/Drupal/Core/Config/TypedConfigManager.php
+++ b/web/core/lib/Drupal/Core/Config/TypedConfigManager.php
@@ -6,6 +6,7 @@ use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Config\Schema\ConfigSchemaAlterException;
 use Drupal\Core\Config\Schema\ConfigSchemaDiscovery;
+use Drupal\Core\Config\Schema\Undefined;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\TypedData\TypedDataManager;
 
@@ -63,7 +64,6 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
     return $this->discovery;
   }
 
-
   /**
    * {@inheritdoc}
    */
@@ -79,13 +79,13 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
    */
   public function buildDataDefinition(array $definition, $value, $name = NULL, $parent = NULL) {
     // Add default values for data type and replace variables.
-    $definition += array('type' => 'undefined');
+    $definition += ['type' => 'undefined'];
 
     $replace = [];
     $type = $definition['type'];
     if (strpos($type, ']')) {
       // Replace variable names in definition.
-      $replace = is_array($value) ? $value : array();
+      $replace = is_array($value) ? $value : [];
       if (isset($parent)) {
         $replace['%parent'] = $parent;
       }
@@ -161,14 +161,19 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
       $merge = $this->getDefinition($definition['type'], $exception_on_invalid);
       // Preserve integer keys on merge, so sequence item types can override
       // parent settings as opposed to adding unused second, third, etc. items.
-      $definition = NestedArray::mergeDeepArray(array($merge, $definition), TRUE);
+      $definition = NestedArray::mergeDeepArray([$merge, $definition], TRUE);
 
       // Replace dynamic portions of the definition type.
       if (!empty($replacements) && strpos($definition['type'], ']')) {
         $sub_type = $this->determineType($this->replaceName($definition['type'], $replacements), $definitions);
+        $sub_definition = $definitions[$sub_type];
+        if (isset($definitions[$sub_type]['type'])) {
+          $sub_merge = $this->getDefinition($definitions[$sub_type]['type'], $exception_on_invalid);
+          $sub_definition = NestedArray::mergeDeepArray([$sub_merge, $definitions[$sub_type]], TRUE);
+        }
         // Merge the newly determined subtype definition with the original
         // definition.
-        $definition = NestedArray::mergeDeepArray([$definitions[$sub_type], $definition], TRUE);
+        $definition = NestedArray::mergeDeepArray([$sub_definition, $definition], TRUE);
         $type = "$type||$sub_type";
       }
       // Unset type so we try the merge only once per type.
@@ -176,10 +181,10 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
       $this->definitions[$type] = $definition;
     }
     // Add type and default definition class.
-    $definition += array(
+    $definition += [
       'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
       'type' => $type,
-    );
+    ];
     return $definition;
   }
 
@@ -265,7 +270,7 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
   protected function replaceName($name, $data) {
     if (preg_match_all("/\[(.*)\]/U", $name, $matches)) {
       // Build our list of '[value]' => replacement.
-      $replace = array();
+      $replace = [];
       foreach (array_combine($matches[0], $matches[1]) as $key => $value) {
         $replace[$key] = $this->replaceVariable($value, $data);
       }
@@ -349,7 +354,7 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
   public function hasConfigSchema($name) {
     // The schema system falls back on the Undefined class for unknown types.
     $definition = $this->getDefinition($name);
-    return is_array($definition) && ($definition['class'] != '\Drupal\Core\Config\Schema\Undefined');
+    return is_array($definition) && ($definition['class'] != Undefined::class);
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Config/UnmetDependenciesException.php b/web/core/lib/Drupal/Core/Config/UnmetDependenciesException.php
index c74513c31..6c37c7637 100644
--- a/web/core/lib/Drupal/Core/Config/UnmetDependenciesException.php
+++ b/web/core/lib/Drupal/Core/Config/UnmetDependenciesException.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Core\Config;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\StringTranslation\TranslationInterface;
 
 /**
@@ -13,6 +13,20 @@ class UnmetDependenciesException extends ConfigException {
   /**
    * A list of configuration objects that have unmet dependencies.
    *
+   * The list is keyed by the config object name, and the value is an array of
+   * the missing dependencies:
+   *
+   * @code
+   *
+   * self::configObjects = [
+   *   config_object_name => [
+   *     'missing_dependency_1',
+   *     'missing_dependency_2',
+   *   ]
+   * ];
+   *
+   * @endcode
+   *
    * @var array
    */
   protected $configObjects = [];
@@ -28,7 +42,8 @@ class UnmetDependenciesException extends ConfigException {
    * Gets the list of configuration objects that have unmet dependencies.
    *
    * @return array
-   *   A list of configuration objects that have unmet dependencies.
+   *   A list of configuration objects that have unmet dependencies, keyed by
+   *   object name, with the value being a list of the unmet dependencies.
    */
   public function getConfigObjects() {
     return $this->configObjects;
@@ -53,13 +68,11 @@ class UnmetDependenciesException extends ConfigException {
    * @return string
    */
   public function getTranslatedMessage(TranslationInterface $string_translation, $extension) {
-    return $string_translation->formatPlural(
-      count($this->getConfigObjects()),
-      'Unable to install @extension, %config_names has unmet dependencies.',
-      'Unable to install @extension, %config_names have unmet dependencies.',
+    return $string_translation->translate(
+      'Unable to install %extension due to unmet dependencies: %config_names',
       [
-        '%config_names' => implode(', ', $this->getConfigObjects()),
-        '@extension' => $extension,
+        '%config_names' => static::formatConfigObjectList($this->configObjects),
+        '%extension' => $extension,
       ]
     );
   }
@@ -70,16 +83,17 @@ class UnmetDependenciesException extends ConfigException {
    * @param $extension
    *   The name of the extension that is being installed.
    * @param array $config_objects
-   *   A list of configuration object names that have unmet dependencies
+   *   A list of configuration keyed by configuration name, with unmet
+   *   dependencies as the value.
    *
    * @return \Drupal\Core\Config\PreExistingConfigException
    */
   public static function create($extension, array $config_objects) {
-    $message = SafeMarkup::format('Configuration objects (@config_names) provided by @extension have unmet dependencies',
-      array(
-        '@config_names' => implode(', ', $config_objects),
-        '@extension' => $extension
-      )
+    $message = new FormattableMarkup('Configuration objects provided by %extension have unmet dependencies: %config_names',
+      [
+        '%config_names' => static::formatConfigObjectList($config_objects),
+        '%extension' => $extension
+      ]
     );
     $e = new static($message);
     $e->configObjects = $config_objects;
@@ -87,4 +101,21 @@ class UnmetDependenciesException extends ConfigException {
     return $e;
   }
 
+  /**
+   * Formats a list of configuration objects.
+   *
+   * @param array $config_objects
+   *   A list of configuration object names that have unmet dependencies.
+   *
+   * @return string
+   *   The imploded config_objects, formatted in an easy to read string.
+   */
+  protected static function formatConfigObjectList(array $config_objects) {
+    $list = [];
+    foreach ($config_objects as $config_object => $missing_dependencies) {
+      $list[] = $config_object . ' (' . implode(', ', $missing_dependencies) . ')';
+    }
+    return implode(', ', $list);
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Controller/ControllerBase.php b/web/core/lib/Drupal/Core/Controller/ControllerBase.php
index fef091015..a46279f2f 100644
--- a/web/core/lib/Drupal/Core/Controller/ControllerBase.php
+++ b/web/core/lib/Drupal/Core/Controller/ControllerBase.php
@@ -287,7 +287,7 @@ abstract class ControllerBase implements ContainerInjectionInterface {
    * \Drupal\Core\DependencyInjection\ContainerInjectionInterface should be used
    * for injecting services.
    *
-   * @return \Symfony\Component\DependencyInjection\ContainerInterface $container
+   * @return \Symfony\Component\DependencyInjection\ContainerInterface
    *   The service container.
    */
   private function container() {
diff --git a/web/core/lib/Drupal/Core/Controller/ControllerResolver.php b/web/core/lib/Drupal/Core/Controller/ControllerResolver.php
index 3a1d8684a..c16a08744 100644
--- a/web/core/lib/Drupal/Core/Controller/ControllerResolver.php
+++ b/web/core/lib/Drupal/Core/Controller/ControllerResolver.php
@@ -122,7 +122,7 @@ class ControllerResolver extends BaseControllerResolver implements ControllerRes
 
     $controller = $this->classResolver->getInstanceFromDefinition($class_or_service);
 
-    return array($controller, $method);
+    return [$controller, $method];
   }
 
   /**
@@ -131,7 +131,7 @@ class ControllerResolver extends BaseControllerResolver implements ControllerRes
   protected function doGetArguments(Request $request, $controller, array $parameters) {
     $attributes = $request->attributes->all();
     $raw_parameters = $request->attributes->has('_raw_variables') ? $request->attributes->get('_raw_variables') : [];
-    $arguments = array();
+    $arguments = [];
     foreach ($parameters as $param) {
       if (array_key_exists($param->name, $attributes)) {
         $arguments[] = $attributes[$param->name];
diff --git a/web/core/lib/Drupal/Core/Controller/TitleResolver.php b/web/core/lib/Drupal/Core/Controller/TitleResolver.php
index e5e5fcebf..954835d75 100644
--- a/web/core/lib/Drupal/Core/Controller/TitleResolver.php
+++ b/web/core/lib/Drupal/Core/Controller/TitleResolver.php
@@ -47,11 +47,11 @@ class TitleResolver implements TitleResolverInterface {
       $route_title = call_user_func_array($callable, $arguments);
     }
     elseif ($title = $route->getDefault('_title')) {
-      $options = array();
+      $options = [];
       if ($context = $route->getDefault('_title_context')) {
         $options['context'] = $context;
       }
-      $args = array();
+      $args = [];
       if (($raw_parameters = $request->attributes->get('_raw_variables'))) {
         foreach ($raw_parameters->all() as $key => $value) {
           $args['@' . $key] = $value;
diff --git a/web/core/lib/Drupal/Core/Cron.php b/web/core/lib/Drupal/Core/Cron.php
index 74d286640..a544ca8db 100644
--- a/web/core/lib/Drupal/Core/Cron.php
+++ b/web/core/lib/Drupal/Core/Cron.php
@@ -13,6 +13,7 @@ use Drupal\Core\Session\AnonymousUserSession;
 use Drupal\Core\Session\AccountSwitcherInterface;
 use Drupal\Core\Queue\SuspendQueueException;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 /**
  * The Drupal core Cron service.
@@ -196,16 +197,20 @@ class Cron implements CronInterface {
   protected function invokeCronHandlers() {
     $module_previous = '';
 
+    // If detailed logging isn't enabled, don't log individual execution times.
+    $time_logging_enabled = \Drupal::config('system.cron')->get('logging');
+    $logger = $time_logging_enabled ? $this->logger : new NullLogger();
+
     // Iterate through the modules calling their cron handlers (if any):
     foreach ($this->moduleHandler->getImplementations('cron') as $module) {
 
       if (!$module_previous) {
-        $this->logger->notice('Starting execution of @module_cron().', [
+        $logger->notice('Starting execution of @module_cron().', [
           '@module' => $module,
         ]);
       }
       else {
-        $this->logger->notice('Starting execution of @module_cron(), execution of @module_previous_cron() took @time.', [
+        $logger->notice('Starting execution of @module_cron(), execution of @module_previous_cron() took @time.', [
           '@module' => $module,
           '@module_previous' => $module_previous,
           '@time' => Timer::read('cron_' . $module_previous) . 'ms',
@@ -225,7 +230,7 @@ class Cron implements CronInterface {
       $module_previous = $module;
     }
     if ($module_previous) {
-      $this->logger->notice('Execution of @module_previous_cron() took @time.', [
+      $logger->notice('Execution of @module_previous_cron() took @time.', [
         '@module_previous' => $module_previous,
         '@time' => Timer::read('cron_' . $module_previous) . 'ms',
       ]);
diff --git a/web/core/lib/Drupal/Core/Database/Connection.php b/web/core/lib/Drupal/Core/Database/Connection.php
index 791bf7a01..803689b2c 100644
--- a/web/core/lib/Drupal/Core/Database/Connection.php
+++ b/web/core/lib/Drupal/Core/Database/Connection.php
@@ -50,14 +50,14 @@ abstract class Connection {
    *
    * @var array
    */
-  protected $transactionLayers = array();
+  protected $transactionLayers = [];
 
   /**
    * Index of what driver-specific class to use for various operations.
    *
    * @var array
    */
-  protected $driverClasses = array();
+  protected $driverClasses = [];
 
   /**
    * The name of the Statement class for this connection.
@@ -101,7 +101,7 @@ abstract class Connection {
    *
    * @var array
    */
-  protected $connectionOptions = array();
+  protected $connectionOptions = [];
 
   /**
    * The schema object for this connection.
@@ -117,21 +117,21 @@ abstract class Connection {
    *
    * @var array
    */
-  protected $prefixes = array();
+  protected $prefixes = [];
 
   /**
    * List of search values for use in prefixTables().
    *
    * @var array
    */
-  protected $prefixSearch = array();
+  protected $prefixSearch = [];
 
   /**
    * List of replacement values for use in prefixTables().
    *
    * @var array
    */
-  protected $prefixReplace = array();
+  protected $prefixReplace = [];
 
   /**
    * List of un-prefixed table names, keyed by prefixed table names.
@@ -140,6 +140,20 @@ abstract class Connection {
    */
   protected $unprefixedTablesMap = [];
 
+  /**
+   * List of escaped database, table, and field names, keyed by unescaped names.
+   *
+   * @var array
+   */
+  protected $escapedNames = [];
+
+  /**
+   * List of escaped aliases names, keyed by unescaped aliases.
+   *
+   * @var array
+   */
+  protected $escapedAliases = [];
+
   /**
    * Constructs a Connection object.
    *
@@ -157,7 +171,7 @@ abstract class Connection {
 
     // Set a Statement class, unless the driver opted out.
     if (!empty($this->statementClass)) {
-      $connection->setAttribute(\PDO::ATTR_STATEMENT_CLASS, array($this->statementClass, array($this)));
+      $connection->setAttribute(\PDO::ATTR_STATEMENT_CLASS, [$this->statementClass, [$this]]);
     }
 
     $this->connection = $connection;
@@ -173,7 +187,7 @@ abstract class Connection {
    * @return \PDO
    *   A \PDO object.
    */
-  public static function open(array &$connection_options = array()) { }
+  public static function open(array &$connection_options = []) { }
 
   /**
    * Destroys this Connection object.
@@ -188,7 +202,7 @@ abstract class Connection {
     // The Statement class attribute only accepts a new value that presents a
     // proper callable, so we reset it to PDOStatement.
     if (!empty($this->statementClass)) {
-      $this->connection->setAttribute(\PDO::ATTR_STATEMENT_CLASS, array('PDOStatement', array()));
+      $this->connection->setAttribute(\PDO::ATTR_STATEMENT_CLASS, ['PDOStatement', []]);
     }
     $this->schema = NULL;
   }
@@ -245,13 +259,13 @@ abstract class Connection {
    *   An array of default query options.
    */
   protected function defaultOptions() {
-    return array(
+    return [
       'target' => 'default',
       'fetch' => \PDO::FETCH_OBJ,
       'return' => Database::RETURN_STATEMENT,
       'throw_exception' => TRUE,
       'allow_delimiter_in_query' => FALSE,
-    );
+    ];
   }
 
   /**
@@ -279,16 +293,16 @@ abstract class Connection {
    */
   protected function setPrefix($prefix) {
     if (is_array($prefix)) {
-      $this->prefixes = $prefix + array('default' => '');
+      $this->prefixes = $prefix + ['default' => ''];
     }
     else {
-      $this->prefixes = array('default' => $prefix);
+      $this->prefixes = ['default' => $prefix];
     }
 
     // Set up variables for use in prefixTables(). Replace table-specific
     // prefixes first.
-    $this->prefixSearch = array();
-    $this->prefixReplace = array();
+    $this->prefixSearch = [];
+    $this->prefixReplace = [];
     foreach ($this->prefixes as $key => $val) {
       if ($key != 'default') {
         $this->prefixSearch[] = '{' . $key . '}';
@@ -582,7 +596,7 @@ abstract class Connection {
    *
    * @see \Drupal\Core\Database\Connection::defaultOptions()
    */
-  public function query($query, array $args = array(), $options = array()) {
+  public function query($query, array $args = [], $options = []) {
     // Use default values if not already set.
     $options += $this->defaultOptions();
 
@@ -656,7 +670,7 @@ abstract class Connection {
    * @throws \Drupal\Core\Database\DatabaseExceptionWrapper
    * @throws \Drupal\Core\Database\IntegrityConstraintViolationException
    */
-  protected function handleQueryException(\PDOException $e, $query, array $args = array(), $options = array()) {
+  protected function handleQueryException(\PDOException $e, $query, array $args = [], $options = []) {
     if ($options['throw_exception']) {
       // Wrap the exception in another exception, because PHP does not allow
       // overriding Exception::getMessage(). Its message is the extra database
@@ -718,7 +732,7 @@ abstract class Connection {
       }
       // Handle expansion of arrays.
       $key_name = str_replace('[]', '__', $key);
-      $new_keys = array();
+      $new_keys = [];
       // We require placeholders to have trailing brackets if the developer
       // intends them to be expanded to an array to make the intent explicit.
       foreach (array_values($data) as $i => $value) {
@@ -782,7 +796,7 @@ abstract class Connection {
    *
    * @see \Drupal\Core\Database\Query\Select
    */
-  public function select($table, $alias = NULL, array $options = array()) {
+  public function select($table, $alias = NULL, array $options = []) {
     $class = $this->getDriverClass('Select');
     return new $class($table, $alias, $this, $options);
   }
@@ -800,7 +814,7 @@ abstract class Connection {
    *
    * @see \Drupal\Core\Database\Query\Insert
    */
-  public function insert($table, array $options = array()) {
+  public function insert($table, array $options = []) {
     $class = $this->getDriverClass('Insert');
     return new $class($this, $table, $options);
   }
@@ -818,7 +832,7 @@ abstract class Connection {
    *
    * @see \Drupal\Core\Database\Query\Merge
    */
-  public function merge($table, array $options = array()) {
+  public function merge($table, array $options = []) {
     $class = $this->getDriverClass('Merge');
     return new $class($this, $table, $options);
   }
@@ -836,7 +850,7 @@ abstract class Connection {
    *
    * @see \Drupal\Core\Database\Query\Upsert
    */
-  public function upsert($table, array $options = array()) {
+  public function upsert($table, array $options = []) {
     $class = $this->getDriverClass('Upsert');
     return new $class($this, $table, $options);
   }
@@ -854,7 +868,7 @@ abstract class Connection {
    *
    * @see \Drupal\Core\Database\Query\Update
    */
-  public function update($table, array $options = array()) {
+  public function update($table, array $options = []) {
     $class = $this->getDriverClass('Update');
     return new $class($this, $table, $options);
   }
@@ -872,7 +886,7 @@ abstract class Connection {
    *
    * @see \Drupal\Core\Database\Query\Delete
    */
-  public function delete($table, array $options = array()) {
+  public function delete($table, array $options = []) {
     $class = $this->getDriverClass('Delete');
     return new $class($this, $table, $options);
   }
@@ -890,7 +904,7 @@ abstract class Connection {
    *
    * @see \Drupal\Core\Database\Query\Truncate
    */
-  public function truncate($table, array $options = array()) {
+  public function truncate($table, array $options = []) {
     $class = $this->getDriverClass('Truncate');
     return new $class($this, $table, $options);
   }
@@ -925,7 +939,10 @@ abstract class Connection {
    *   The sanitized database name.
    */
   public function escapeDatabase($database) {
-    return preg_replace('/[^A-Za-z0-9_.]+/', '', $database);
+    if (!isset($this->escapedNames[$database])) {
+      $this->escapedNames[$database] = preg_replace('/[^A-Za-z0-9_.]+/', '', $database);
+    }
+    return $this->escapedNames[$database];
   }
 
   /**
@@ -942,7 +959,10 @@ abstract class Connection {
    *   The sanitized table name.
    */
   public function escapeTable($table) {
-    return preg_replace('/[^A-Za-z0-9_.]+/', '', $table);
+    if (!isset($this->escapedNames[$table])) {
+      $this->escapedNames[$table] = preg_replace('/[^A-Za-z0-9_.]+/', '', $table);
+    }
+    return $this->escapedNames[$table];
   }
 
   /**
@@ -959,7 +979,10 @@ abstract class Connection {
    *   The sanitized field name.
    */
   public function escapeField($field) {
-    return preg_replace('/[^A-Za-z0-9_.]+/', '', $field);
+    if (!isset($this->escapedNames[$field])) {
+      $this->escapedNames[$field] = preg_replace('/[^A-Za-z0-9_.]+/', '', $field);
+    }
+    return $this->escapedNames[$field];
   }
 
   /**
@@ -977,7 +1000,10 @@ abstract class Connection {
    *   The sanitized alias name.
    */
   public function escapeAlias($field) {
-    return preg_replace('/[^A-Za-z0-9_]+/', '', $field);
+    if (!isset($this->escapedAliases[$field])) {
+      $this->escapedAliases[$field] = preg_replace('/[^A-Za-z0-9_]+/', '', $field);
+    }
+    return $this->escapedAliases[$field];
   }
 
   /**
@@ -1057,9 +1083,9 @@ abstract class Connection {
    * @throws \Drupal\Core\Database\TransactionOutOfOrderException
    * @throws \Drupal\Core\Database\TransactionNoActiveException
    *
-   * @see \Drupal\Core\Database\Transaction::rollback()
+   * @see \Drupal\Core\Database\Transaction::rollBack()
    */
-  public function rollback($savepoint_name = 'drupal_transaction') {
+  public function rollBack($savepoint_name = 'drupal_transaction') {
     if (!$this->supportsTransactions()) {
       return;
     }
@@ -1153,7 +1179,7 @@ abstract class Connection {
     // The transaction has already been committed earlier. There is nothing we
     // need to do. If this transaction was part of an earlier out-of-order
     // rollback, an exception would already have been thrown by
-    // Database::rollback().
+    // Database::rollBack().
     if (!isset($this->transactionLayers[$name])) {
       return;
     }
@@ -1211,7 +1237,7 @@ abstract class Connection {
    *   A database query result resource, or NULL if the query was not executed
    *   correctly.
    */
-  abstract public function queryRange($query, $from, $count, array $args = array(), array $options = array());
+  abstract public function queryRange($query, $from, $count, array $args = [], array $options = []);
 
   /**
    * Generates a temporary table name.
@@ -1248,7 +1274,7 @@ abstract class Connection {
    * @return string
    *   The name of the temporary table.
    */
-  abstract function queryTemporary($query, array $args = array(), array $options = array());
+  abstract public function queryTemporary($query, array $args = [], array $options = []);
 
   /**
    * Returns the type of database driver.
@@ -1395,7 +1421,7 @@ abstract class Connection {
    *
    * @see \PDO::prepare()
    */
-  public function prepare($statement, array $driver_options = array()) {
+  public function prepare($statement, array $driver_options = []) {
     return $this->connection->prepare($statement, $driver_options);
   }
 
@@ -1418,6 +1444,26 @@ abstract class Connection {
     return $this->connection->quote($string, $parameter_type);
   }
 
+  /**
+   * Extracts the SQLSTATE error from the PDOException.
+   *
+   * @param \Exception $e
+   *   The exception
+   *
+   * @return string
+   *   The five character error code.
+   */
+  protected static function getSQLState(\Exception $e) {
+    // The PDOException code is not always reliable, try to see whether the
+    // message has something usable.
+    if (preg_match('/^SQLSTATE\[(\w{5})\]/', $e->getMessage(), $matches)) {
+      return $matches[1];
+    }
+    else {
+      return $e->getCode();
+    }
+  }
+
   /**
    * Prevents the database connection from being serialized.
    */
diff --git a/web/core/lib/Drupal/Core/Database/Database.php b/web/core/lib/Drupal/Core/Database/Database.php
index 8fe1c453e..dd1901882 100644
--- a/web/core/lib/Drupal/Core/Database/Database.php
+++ b/web/core/lib/Drupal/Core/Database/Database.php
@@ -40,21 +40,21 @@ abstract class Database {
    *
    * @var array
    */
-  static protected $connections = array();
+  static protected $connections = [];
 
   /**
    * A processed copy of the database connection information from settings.php.
    *
    * @var array
    */
-  static protected $databaseInfo = array();
+  static protected $databaseInfo = [];
 
   /**
    * A list of key/target credentials to simply ignore.
    *
    * @var array
    */
-  static protected $ignoreTargets = array();
+  static protected $ignoreTargets = [];
 
   /**
    * The key of the currently active database connection.
@@ -75,7 +75,7 @@ abstract class Database {
    *
    * @var array
    */
-  static protected $logs = array();
+  static protected $logs = [];
 
   /**
    * Starts logging a given logging key on the specified connection.
@@ -214,15 +214,15 @@ abstract class Database {
     // Parse the prefix information.
     if (!isset($info['prefix'])) {
       // Default to an empty prefix.
-      $info['prefix'] = array(
+      $info['prefix'] = [
         'default' => '',
-      );
+      ];
     }
     elseif (!is_array($info['prefix'])) {
       // Transform the flat form into an array form.
-      $info['prefix'] = array(
+      $info['prefix'] = [
         'default' => $info['prefix'],
-      );
+      ];
     }
     return $info;
   }
@@ -459,11 +459,11 @@ abstract class Database {
     if (!isset($info['scheme'], $info['host'], $info['path'])) {
       throw new \InvalidArgumentException('Minimum requirement: driver://host/database');
     }
-    $info += array(
+    $info += [
       'user' => '',
       'pass' => '',
       'fragment' => '',
-    );
+    ];
 
     // A SQLite database path with two leading slashes indicates a system path.
     // Otherwise the path is relative to the Drupal root.
@@ -474,13 +474,13 @@ abstract class Database {
       $info['path'] = $root . '/' . $info['path'];
     }
 
-    $database = array(
+    $database = [
       'driver' => $info['scheme'],
       'username' => $info['user'],
       'password' => $info['pass'],
       'host' => $info['host'],
       'database' => $info['path'],
-    );
+    ];
     if (isset($info['port'])) {
       $database['port'] = $info['port'];
     }
diff --git a/web/core/lib/Drupal/Core/Database/DatabaseAccessDeniedException.php b/web/core/lib/Drupal/Core/Database/DatabaseAccessDeniedException.php
new file mode 100644
index 000000000..85bfea9d8
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Database/DatabaseAccessDeniedException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Drupal\Core\Database;
+
+/**
+ * Exception thrown if access credentials fail.
+ */
+class DatabaseAccessDeniedException extends \RuntimeException implements DatabaseException {}
diff --git a/web/core/lib/Drupal/Core/Database/DatabaseNotFoundException.php b/web/core/lib/Drupal/Core/Database/DatabaseNotFoundException.php
index 63eb9a3a0..1c5b5eb32 100644
--- a/web/core/lib/Drupal/Core/Database/DatabaseNotFoundException.php
+++ b/web/core/lib/Drupal/Core/Database/DatabaseNotFoundException.php
@@ -5,4 +5,4 @@ namespace Drupal\Core\Database;
 /**
  * Exception thrown if specified database is not found.
  */
-class DatabaseNotFoundException extends \RuntimeException {}
+class DatabaseNotFoundException extends \RuntimeException implements DatabaseException {}
diff --git a/web/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php b/web/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
index df5106721..164f68a94 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Database\Driver\mysql;
 
+use Drupal\Core\Database\DatabaseAccessDeniedException;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
 
 use Drupal\Core\Database\Database;
@@ -26,6 +27,11 @@ class Connection extends DatabaseConnection {
    */
   const DATABASE_NOT_FOUND = 1049;
 
+  /**
+   * Error code for "Access denied" error.
+   */
+  const ACCESS_DENIED = 1045;
+
   /**
    * Error code for "Can't initialize character set" error.
    */
@@ -61,7 +67,7 @@ class Connection extends DatabaseConnection {
   /**
    * Constructs a Connection object.
    */
-  public function __construct(\PDO $connection, array $connection_options = array()) {
+  public function __construct(\PDO $connection, array $connection_options = []) {
     parent::__construct($connection, $connection_options);
 
     // This driver defaults to transaction support, except if explicitly passed FALSE.
@@ -76,7 +82,7 @@ class Connection extends DatabaseConnection {
   /**
    * {@inheritdoc}
    */
-  public function query($query, array $args = array(), $options = array()) {
+  public function query($query, array $args = [], $options = []) {
     try {
       return parent::query($query, $args, $options);
     }
@@ -95,7 +101,7 @@ class Connection extends DatabaseConnection {
   /**
    * {@inheritdoc}
    */
-  public static function open(array &$connection_options = array()) {
+  public static function open(array &$connection_options = []) {
     if (isset($connection_options['_dsn_utf8_fallback']) && $connection_options['_dsn_utf8_fallback'] === TRUE) {
       // Only used during the installer version check, as a fallback from utf8mb4.
       $charset = 'utf8';
@@ -119,10 +125,10 @@ class Connection extends DatabaseConnection {
       $dsn .= ';dbname=' . $connection_options['database'];
     }
     // Allow PDO options to be overridden.
-    $connection_options += array(
-      'pdo' => array(),
-    );
-    $connection_options['pdo'] += array(
+    $connection_options += [
+      'pdo' => [],
+    ];
+    $connection_options['pdo'] += [
       \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
       // So we don't have to mess around with cursors and unbuffered queries by default.
       \PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => TRUE,
@@ -132,14 +138,25 @@ class Connection extends DatabaseConnection {
       \PDO::MYSQL_ATTR_FOUND_ROWS => TRUE,
       // Because MySQL's prepared statements skip the query cache, because it's dumb.
       \PDO::ATTR_EMULATE_PREPARES => TRUE,
-    );
+    ];
     if (defined('\PDO::MYSQL_ATTR_MULTI_STATEMENTS')) {
       // An added connection option in PHP 5.5.21 to optionally limit SQL to a
       // single statement like mysqli.
       $connection_options['pdo'] += [\PDO::MYSQL_ATTR_MULTI_STATEMENTS => FALSE];
     }
 
-    $pdo = new \PDO($dsn, $connection_options['username'], $connection_options['password'], $connection_options['pdo']);
+    try {
+      $pdo = new \PDO($dsn, $connection_options['username'], $connection_options['password'], $connection_options['pdo']);
+    }
+    catch (\PDOException $e) {
+      if ($e->getCode() == static::DATABASE_NOT_FOUND) {
+        throw new DatabaseNotFoundException($e->getMessage(), $e->getCode(), $e);
+      }
+      if ($e->getCode() == static::ACCESS_DENIED) {
+        throw new DatabaseAccessDeniedException($e->getMessage(), $e->getCode(), $e);
+      }
+      throw $e;
+    }
 
     // Force MySQL to use the UTF-8 character set. Also set the collation, if a
     // certain one has been set; otherwise, MySQL defaults to
@@ -159,12 +176,12 @@ class Connection extends DatabaseConnection {
     // https://www.drupal.org/node/344575 for further discussion. Also, as MySQL
     // 5.5 changed the meaning of TRADITIONAL we need to spell out the modes one
     // by one.
-    $connection_options += array(
-      'init_commands' => array(),
-    );
-    $connection_options['init_commands'] += array(
+    $connection_options += [
+      'init_commands' => [],
+    ];
+    $connection_options['init_commands'] += [
       'sql_mode' => "SET sql_mode = 'ANSI,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,ONLY_FULL_GROUP_BY'",
-    );
+    ];
     // Execute initial commands.
     foreach ($connection_options['init_commands'] as $sql) {
       $pdo->exec($sql);
@@ -195,11 +212,11 @@ class Connection extends DatabaseConnection {
     }
   }
 
-  public function queryRange($query, $from, $count, array $args = array(), array $options = array()) {
+  public function queryRange($query, $from, $count, array $args = [], array $options = []) {
     return $this->query($query . ' LIMIT ' . (int) $from . ', ' . (int) $count, $args, $options);
   }
 
-  public function queryTemporary($query, array $args = array(), array $options = array()) {
+  public function queryTemporary($query, array $args = [], array $options = []) {
     $tablename = $this->generateTemporaryTableName();
     $this->query('CREATE TEMPORARY TABLE {' . $tablename . '} Engine=MEMORY ' . $query, $args, $options);
     return $tablename;
@@ -241,7 +258,7 @@ class Connection extends DatabaseConnection {
   }
 
   public function nextId($existing_id = 0) {
-    $new_id = $this->query('INSERT INTO {sequences} () VALUES ()', array(), array('return' => Database::RETURN_INSERT_ID));
+    $new_id = $this->query('INSERT INTO {sequences} () VALUES ()', [], ['return' => Database::RETURN_INSERT_ID]);
     // This should only happen after an import or similar event.
     if ($existing_id >= $new_id) {
       // If we INSERT a value manually into the sequences table, on the next
@@ -251,8 +268,8 @@ class Connection extends DatabaseConnection {
       // other than duplicate keys. Instead, we use INSERT ... ON DUPLICATE KEY
       // UPDATE in such a way that the UPDATE does not do anything. This way,
       // duplicate keys do not generate errors but everything else does.
-      $this->query('INSERT INTO {sequences} (value) VALUES (:value) ON DUPLICATE KEY UPDATE value = value', array(':value' => $existing_id));
-      $new_id = $this->query('INSERT INTO {sequences} () VALUES ()', array(), array('return' => Database::RETURN_INSERT_ID));
+      $this->query('INSERT INTO {sequences} (value) VALUES (:value) ON DUPLICATE KEY UPDATE value = value', [':value' => $existing_id]);
+      $new_id = $this->query('INSERT INTO {sequences} () VALUES ()', [], ['return' => Database::RETURN_INSERT_ID]);
     }
     $this->needsCleanup = TRUE;
     return $new_id;
@@ -270,7 +287,7 @@ class Connection extends DatabaseConnection {
     try {
       $max_id = $this->query('SELECT MAX(value) FROM {sequences}')->fetchField();
       // We know we are using MySQL here, no need for the slower db_delete().
-      $this->query('DELETE FROM {sequences} WHERE value < :value', array(':value' => $max_id));
+      $this->query('DELETE FROM {sequences} WHERE value < :value', [':value' => $max_id]);
     }
     // During testing, this function is called from shutdown with the
     // simpletest prefix stored in $this->connection, and those tables are gone
@@ -316,7 +333,7 @@ class Connection extends DatabaseConnection {
           if ($e->getPrevious()->errorInfo[1] == '1305') {
             // If one SAVEPOINT was released automatically, then all were.
             // Therefore, clean the transaction stack.
-            $this->transactionLayers = array();
+            $this->transactionLayers = [];
             // We also have to explain to PDO that the transaction stack has
             // been cleaned-up.
             $this->connection->commit();
diff --git a/web/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php b/web/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php
index 213eb83e6..8b7c602e8 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php
@@ -18,7 +18,7 @@ class Insert extends QueryInsert {
     // pass it back, as any remaining options are irrelevant.
     if (empty($this->fromQuery)) {
       $max_placeholder = 0;
-      $values = array();
+      $values = [];
       foreach ($this->insertValues as $insert_values) {
         foreach ($insert_values as $value) {
           $values[':db_insert_placeholder_' . $max_placeholder++] = $value;
@@ -32,7 +32,7 @@ class Insert extends QueryInsert {
     $last_insert_id = $this->connection->query((string) $this, $values, $this->queryOptions);
 
     // Re-initialize the values array so that we can re-use this query.
-    $this->insertValues = array();
+    $this->insertValues = [];
 
     return $last_insert_id;
   }
diff --git a/web/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php b/web/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
index 40a589c12..0b1d7dde7 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
@@ -33,10 +33,10 @@ class Tasks extends InstallTasks {
    * Constructs a \Drupal\Core\Database\Driver\mysql\Install\Tasks object.
    */
   public function __construct() {
-    $this->tasks[] = array(
-      'arguments' => array(),
+    $this->tasks[] = [
+      'arguments' => [],
       'function' => 'ensureInnoDbAvailable',
-    );
+    ];
   }
 
   /**
@@ -67,7 +67,7 @@ class Tasks extends InstallTasks {
       catch (\Exception $e) {
         // Detect utf8mb4 incompability.
         if ($e->getCode() == Connection::UNSUPPORTED_CHARSET || ($e->getCode() == Connection::SQLSTATE_SYNTAX_ERROR && $e->errorInfo[1] == Connection::UNKNOWN_CHARSET)) {
-          $this->fail(t('Your MySQL server and PHP MySQL driver must support utf8mb4 character encoding. Make sure to use a database system that supports this (such as MySQL/MariaDB/Percona 5.5.3 and up), and that the utf8mb4 character set is compiled in. See the <a href=":documentation" target="_blank">MySQL documentation</a> for more information.', array(':documentation' => 'https://dev.mysql.com/doc/refman/5.0/en/cannot-initialize-character-set.html')));
+          $this->fail(t('Your MySQL server and PHP MySQL driver must support utf8mb4 character encoding. Make sure to use a database system that supports this (such as MySQL/MariaDB/Percona 5.5.3 and up), and that the utf8mb4 character set is compiled in. See the <a href=":documentation" target="_blank">MySQL documentation</a> for more information.', [':documentation' => 'https://dev.mysql.com/doc/refman/5.0/en/cannot-initialize-character-set.html']));
           $info = Database::getConnectionInfo();
           $info_copy = $info;
           // Set a flag to fall back to utf8. Note: this flag should only be
@@ -112,13 +112,13 @@ class Tasks extends InstallTasks {
         catch (DatabaseNotFoundException $e) {
           // Still no dice; probably a permission issue. Raise the error to the
           // installer.
-          $this->fail(t('Database %database not found. The server reports the following message when attempting to create the database: %error.', array('%database' => $database, '%error' => $e->getMessage())));
+          $this->fail(t('Database %database not found. The server reports the following message when attempting to create the database: %error.', ['%database' => $database, '%error' => $e->getMessage()]));
         }
       }
       else {
         // Database connection failed for some other reason than the database
         // not existing.
-        $this->fail(t('Failed to connect to your database server. The server reports the following message: %error.<ul><li>Is the database server running?</li><li>Does the database exist or does the database user have sufficient privileges to create the database?</li><li>Have you entered the correct database name?</li><li>Have you entered the correct username and password?</li><li>Have you entered the correct database hostname?</li></ul>', array('%error' => $e->getMessage())));
+        $this->fail(t('Failed to connect to your database server. The server reports the following message: %error.<ul><li>Is the database server running?</li><li>Does the database exist or does the database user have sufficient privileges to create the database?</li><li>Have you entered the correct database name?</li><li>Have you entered the correct username and password?</li><li>Have you entered the correct database hostname?</li></ul>', ['%error' => $e->getMessage()]));
         return FALSE;
       }
     }
@@ -140,7 +140,7 @@ class Tasks extends InstallTasks {
   /**
    * Ensure that InnoDB is available.
    */
-  function ensureInnoDbAvailable() {
+  public function ensureInnoDbAvailable() {
     $engines = Database::getConnection()->query('SHOW ENGINES')->fetchAllKeyed();
     if (isset($engines['MyISAM']) && $engines['MyISAM'] == 'DEFAULT' && !isset($engines['InnoDB'])) {
       $this->fail(t('The MyISAM storage engine is not supported.'));
@@ -159,13 +159,13 @@ class Tasks extends InstallTasks {
       // The mysqlnd driver supports utf8mb4 starting at version 5.0.9.
       $version = preg_replace('/^\D+([\d.]+).*/', '$1', $version);
       if (version_compare($version, self::MYSQLND_MINIMUM_VERSION, '<')) {
-        $this->fail(t("The MySQLnd driver version %version is less than the minimum required version. Upgrade to MySQLnd version %mysqlnd_minimum_version or up, or alternatively switch mysql drivers to libmysqlclient version %libmysqlclient_minimum_version or up.", array('%version' => $version, '%mysqlnd_minimum_version' => self::MYSQLND_MINIMUM_VERSION, '%libmysqlclient_minimum_version' => self::LIBMYSQLCLIENT_MINIMUM_VERSION)));
+        $this->fail(t("The MySQLnd driver version %version is less than the minimum required version. Upgrade to MySQLnd version %mysqlnd_minimum_version or up, or alternatively switch mysql drivers to libmysqlclient version %libmysqlclient_minimum_version or up.", ['%version' => $version, '%mysqlnd_minimum_version' => self::MYSQLND_MINIMUM_VERSION, '%libmysqlclient_minimum_version' => self::LIBMYSQLCLIENT_MINIMUM_VERSION]));
       }
     }
     else {
       // The libmysqlclient driver supports utf8mb4 starting at version 5.5.3.
       if (version_compare($version, self::LIBMYSQLCLIENT_MINIMUM_VERSION, '<')) {
-        $this->fail(t("The libmysqlclient driver version %version is less than the minimum required version. Upgrade to libmysqlclient version %libmysqlclient_minimum_version or up, or alternatively switch mysql drivers to MySQLnd version %mysqlnd_minimum_version or up.", array('%version' => $version, '%libmysqlclient_minimum_version' => self::LIBMYSQLCLIENT_MINIMUM_VERSION, '%mysqlnd_minimum_version' => self::MYSQLND_MINIMUM_VERSION)));
+        $this->fail(t("The libmysqlclient driver version %version is less than the minimum required version. Upgrade to libmysqlclient version %libmysqlclient_minimum_version or up, or alternatively switch mysql drivers to MySQLnd version %mysqlnd_minimum_version or up.", ['%version' => $version, '%libmysqlclient_minimum_version' => self::LIBMYSQLCLIENT_MINIMUM_VERSION, '%mysqlnd_minimum_version' => self::MYSQLND_MINIMUM_VERSION]));
       }
     }
   }
diff --git a/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
index c952630d9..1911d6a88 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
@@ -33,14 +33,14 @@ class Schema extends DatabaseSchema {
    * @var array
    *   List of MySQL string types.
    */
-  protected $mysqlStringTypes = array(
+  protected $mysqlStringTypes = [
     'VARCHAR',
     'CHAR',
     'TINYTEXT',
     'MEDIUMTEXT',
     'LONGTEXT',
     'TEXT',
-  );
+  ];
 
   /**
    * Get information about the table and database name from the prefix.
@@ -49,7 +49,7 @@ class Schema extends DatabaseSchema {
    *   A keyed array with information about the database, table name and prefix.
    */
   protected function getPrefixInfo($table = 'default', $add_prefix = TRUE) {
-    $info = array('prefix' => $this->connection->tablePrefix($table));
+    $info = ['prefix' => $this->connection->tablePrefix($table)];
     if ($add_prefix) {
       $table = $info['prefix'] . $table;
     }
@@ -95,10 +95,10 @@ class Schema extends DatabaseSchema {
     $info = $this->connection->getConnectionOptions();
 
     // Provide defaults if needed.
-    $table += array(
+    $table += [
       'mysql_engine' => 'InnoDB',
       'mysql_character_set' => 'utf8mb4',
-    );
+    ];
 
     $sql = "CREATE TABLE {" . $name . "} (\n";
 
@@ -130,7 +130,7 @@ class Schema extends DatabaseSchema {
       $sql .= ' COMMENT ' . $this->prepareComment($table['description'], self::COMMENT_MAX_TABLE);
     }
 
-    return array($sql);
+    return [$sql];
   }
 
   /**
@@ -231,7 +231,7 @@ class Schema extends DatabaseSchema {
     // it much easier for modules (such as schema.module) to map
     // database types back into schema types.
     // $map does not use drupal_static as its value never changes.
-    static $map = array(
+    static $map = [
       'varchar_ascii:normal' => 'VARCHAR',
 
       'varchar:normal'  => 'VARCHAR',
@@ -265,12 +265,12 @@ class Schema extends DatabaseSchema {
 
       'blob:big'        => 'LONGBLOB',
       'blob:normal'     => 'BLOB',
-    );
+    ];
     return $map;
   }
 
   protected function createKeysSql($spec) {
-    $keys = array();
+    $keys = [];
 
     if (!empty($spec['primary key'])) {
       $keys[] = 'PRIMARY KEY (' . $this->createKeySql($spec['primary key']) . ')';
@@ -349,12 +349,12 @@ class Schema extends DatabaseSchema {
       }
     }
     else {
-      $index = array($index, 191);
+      $index = [$index, 191];
     }
   }
 
   protected function createKeySql($fields) {
-    $return = array();
+    $return = [];
     foreach ($fields as $field) {
       if (is_array($field)) {
         $return[] = '`' . $field[0] . '`(' . $field[1] . ')';
@@ -368,10 +368,10 @@ class Schema extends DatabaseSchema {
 
   public function renameTable($table, $new_name) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", array('@table' => $table, '@table_new' => $new_name)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", ['@table' => $table, '@table_new' => $new_name]));
     }
     if ($this->tableExists($new_name)) {
-      throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", array('@table' => $table, '@table_new' => $new_name)));
+      throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", ['@table' => $table, '@table_new' => $new_name]));
     }
 
     $info = $this->getPrefixInfo($new_name);
@@ -387,28 +387,38 @@ class Schema extends DatabaseSchema {
     return TRUE;
   }
 
-  public function addField($table, $field, $spec, $keys_new = array()) {
+  public function addField($table, $field, $spec, $keys_new = []) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", array('@field' => $field, '@table' => $table)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", ['@field' => $field, '@table' => $table]));
     }
     if ($this->fieldExists($table, $field)) {
-      throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", array('@field' => $field, '@table' => $table)));
+      throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", ['@field' => $field, '@table' => $table]));
     }
 
+    // Fields that are part of a PRIMARY KEY must be added as NOT NULL.
+    $is_primary_key = isset($keys_new['primary key']) && in_array($field, $keys_new['primary key'], TRUE);
+
     $fixnull = FALSE;
-    if (!empty($spec['not null']) && !isset($spec['default'])) {
+    if (!empty($spec['not null']) && !isset($spec['default']) && !$is_primary_key) {
       $fixnull = TRUE;
       $spec['not null'] = FALSE;
     }
     $query = 'ALTER TABLE {' . $table . '} ADD ';
     $query .= $this->createFieldSql($field, $this->processField($spec));
     if ($keys_sql = $this->createKeysSql($keys_new)) {
+      // Make sure to drop the existing primary key before adding a new one.
+      // This is only needed when adding a field because this method, unlike
+      // changeField(), is supposed to handle primary keys automatically.
+      if (isset($keys_new['primary key']) && $this->indexExists($table, 'PRIMARY')) {
+        $query .= ', DROP PRIMARY KEY';
+      }
+
       $query .= ', ADD ' . implode(', ADD ', $keys_sql);
     }
     $this->connection->query($query);
     if (isset($spec['initial'])) {
       $this->connection->update($table)
-        ->fields(array($field => $spec['initial']))
+        ->fields([$field => $spec['initial']])
         ->execute();
     }
     if (isset($spec['initial_from_field'])) {
@@ -433,7 +443,7 @@ class Schema extends DatabaseSchema {
 
   public function fieldSetDefault($table, $field, $default) {
     if (!$this->fieldExists($table, $field)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", array('@table' => $table, '@field' => $field)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
     }
 
     $this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN `' . $field . '` SET DEFAULT ' . $this->escapeDefaultValue($default));
@@ -441,7 +451,7 @@ class Schema extends DatabaseSchema {
 
   public function fieldSetNoDefault($table, $field) {
     if (!$this->fieldExists($table, $field)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", array('@table' => $table, '@field' => $field)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
     }
 
     $this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN `' . $field . '` DROP DEFAULT');
@@ -456,10 +466,10 @@ class Schema extends DatabaseSchema {
 
   public function addPrimaryKey($table, $fields) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", array('@table' => $table)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", ['@table' => $table]));
     }
     if ($this->indexExists($table, 'PRIMARY')) {
-      throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", array('@table' => $table)));
+      throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", ['@table' => $table]));
     }
 
     $this->connection->query('ALTER TABLE {' . $table . '} ADD PRIMARY KEY (' . $this->createKeySql($fields) . ')');
@@ -476,10 +486,10 @@ class Schema extends DatabaseSchema {
 
   public function addUniqueKey($table, $name, $fields) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
     }
     if ($this->indexExists($table, $name)) {
-      throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", ['@table' => $table, '@name' => $name]));
     }
 
     $this->connection->query('ALTER TABLE {' . $table . '} ADD UNIQUE KEY `' . $name . '` (' . $this->createKeySql($fields) . ')');
@@ -499,10 +509,10 @@ class Schema extends DatabaseSchema {
    */
   public function addIndex($table, $name, $fields, array $spec) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
     }
     if ($this->indexExists($table, $name)) {
-      throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", ['@table' => $table, '@name' => $name]));
     }
 
     $spec['indexes'][$name] = $fields;
@@ -520,12 +530,12 @@ class Schema extends DatabaseSchema {
     return TRUE;
   }
 
-  public function changeField($table, $field, $field_new, $spec, $keys_new = array()) {
+  public function changeField($table, $field, $field_new, $spec, $keys_new = []) {
     if (!$this->fieldExists($table, $field)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", array('@table' => $table, '@name' => $field)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", ['@table' => $table, '@name' => $field]));
     }
     if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
-      throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", array('@table' => $table, '@name' => $field, '@name_new' => $field_new)));
+      throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", ['@table' => $table, '@name' => $field, '@name_new' => $field_new]));
     }
 
     $sql = 'ALTER TABLE {' . $table . '} CHANGE `' . $field . '` ' . $this->createFieldSql($field_new, $this->processField($spec));
@@ -542,7 +552,7 @@ class Schema extends DatabaseSchema {
       $comment = Unicode::truncate($this->connection->prefixTables($comment), $length, TRUE, TRUE);
     }
     // Remove semicolons to avoid triggering multi-statement check.
-    $comment = strtr($comment, array(';' => '.'));
+    $comment = strtr($comment, [';' => '.']);
     return $this->connection->quote($comment);
   }
 
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
index 80497962c..3769e5485 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
@@ -4,6 +4,7 @@ namespace Drupal\Core\Database\Driver\pgsql;
 
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\Connection as DatabaseConnection;
+use Drupal\Core\Database\DatabaseAccessDeniedException;
 use Drupal\Core\Database\DatabaseNotFoundException;
 
 /**
@@ -26,6 +27,27 @@ class Connection extends DatabaseConnection {
    */
   const DATABASE_NOT_FOUND = 7;
 
+  /**
+   * Error code for "Connection failure" errors.
+   *
+   * Technically this is an internal error code that will only be shown in the
+   * PDOException message. It will need to get extracted.
+   */
+  const CONNECTION_FAILURE = '08006';
+
+  /**
+   * A map of condition operators to PostgreSQL operators.
+   *
+   * In PostgreSQL, 'LIKE' is case-sensitive. ILKE should be used for
+   * case-insensitive statements.
+   */
+  protected static $postgresqlConditionOperatorMap = [
+    'LIKE' => ['operator' => 'ILIKE'],
+    'LIKE BINARY' => ['operator' => 'LIKE'],
+    'NOT LIKE' => ['operator' => 'NOT ILIKE'],
+    'REGEXP' => ['operator' => '~*'],
+  ];
+
   /**
    * The list of PostgreSQL reserved key words.
    *
@@ -74,7 +96,7 @@ class Connection extends DatabaseConnection {
   /**
    * {@inheritdoc}
    */
-  public static function open(array &$connection_options = array()) {
+  public static function open(array &$connection_options = []) {
     // Default to TCP connection on port 5432.
     if (empty($connection_options['port'])) {
       $connection_options['port'] = 5432;
@@ -98,10 +120,10 @@ class Connection extends DatabaseConnection {
     $dsn = 'pgsql:host=' . $connection_options['host'] . ' dbname=' . $connection_options['database'] . ' port=' . $connection_options['port'];
 
     // Allow PDO options to be overridden.
-    $connection_options += array(
-      'pdo' => array(),
-    );
-    $connection_options['pdo'] += array(
+    $connection_options += [
+      'pdo' => [],
+    ];
+    $connection_options['pdo'] += [
       \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
       // Prepared statements are most effective for performance when queries
       // are recycled (used several times). However, if they are not re-used,
@@ -112,8 +134,22 @@ class Connection extends DatabaseConnection {
       \PDO::ATTR_EMULATE_PREPARES => TRUE,
       // Convert numeric values to strings when fetching.
       \PDO::ATTR_STRINGIFY_FETCHES => TRUE,
-    );
-    $pdo = new \PDO($dsn, $connection_options['username'], $connection_options['password'], $connection_options['pdo']);
+    ];
+
+    try {
+      $pdo = new \PDO($dsn, $connection_options['username'], $connection_options['password'], $connection_options['pdo']);
+    }
+    catch (\PDOException $e) {
+      if (static::getSQLState($e) == static::CONNECTION_FAILURE) {
+        if (strpos($e->getMessage(), 'password authentication failed for user') !== FALSE) {
+          throw new DatabaseAccessDeniedException($e->getMessage(), $e->getCode(), $e);
+        }
+        elseif (strpos($e->getMessage(), 'database') !== FALSE && strpos($e->getMessage(), 'does not exist') !== FALSE) {
+          throw new DatabaseNotFoundException($e->getMessage(), $e->getCode(), $e);
+        }
+      }
+      throw $e;
+    }
 
     return $pdo;
   }
@@ -121,7 +157,7 @@ class Connection extends DatabaseConnection {
   /**
    * {@inheritdoc}
    */
-  public function query($query, array $args = array(), $options = array()) {
+  public function query($query, array $args = [], $options = []) {
     $options += $this->defaultOptions();
 
     // The PDO PostgreSQL driver has a bug which doesn't type cast booleans
@@ -168,21 +204,18 @@ class Connection extends DatabaseConnection {
   }
 
   public function prepareQuery($query) {
-    // mapConditionOperator converts LIKE operations to ILIKE for consistency
-    // with MySQL. However, Postgres does not support ILIKE on bytea (blobs)
-    // fields.
-    // To make the ILIKE operator work, we type-cast bytea fields into text.
-    // @todo This workaround only affects bytea fields, but the involved field
-    //   types involved in the query are unknown, so there is no way to
-    //   conditionally execute this for affected queries only.
-    return parent::prepareQuery(preg_replace('/ ([^ ]+) +(I*LIKE|NOT +I*LIKE) /i', ' ${1}::text ${2} ', $query));
+    // mapConditionOperator converts some operations (LIKE, REGEXP, etc.) to
+    // PostgreSQL equivalents (ILIKE, ~*, etc.). However PostgreSQL doesn't
+    // automatically cast the fields to the right type for these operators,
+    // so we need to alter the query and add the type-cast.
+    return parent::prepareQuery(preg_replace('/ ([^ ]+) +(I*LIKE|NOT +I*LIKE|~\*) /i', ' ${1}::text ${2} ', $query));
   }
 
-  public function queryRange($query, $from, $count, array $args = array(), array $options = array()) {
+  public function queryRange($query, $from, $count, array $args = [], array $options = []) {
     return $this->query($query . ' LIMIT ' . (int) $count . ' OFFSET ' . (int) $from, $args, $options);
   }
 
-  public function queryTemporary($query, array $args = array(), array $options = array()) {
+  public function queryTemporary($query, array $args = [], array $options = []) {
     $tablename = $this->generateTemporaryTableName();
     $this->query('CREATE TEMPORARY TABLE {' . $tablename . '} AS ' . $query, $args, $options);
     return $tablename;
@@ -300,15 +333,7 @@ class Connection extends DatabaseConnection {
   }
 
   public function mapConditionOperator($operator) {
-    static $specials = array(
-      // In PostgreSQL, 'LIKE' is case-sensitive. For case-insensitive LIKE
-      // statements, we need to use ILIKE instead.
-      'LIKE' => array('operator' => 'ILIKE'),
-      'LIKE BINARY' => array('operator' => 'LIKE'),
-      'NOT LIKE' => array('operator' => 'NOT ILIKE'),
-      'REGEXP' => array('operator' => '~*'),
-    );
-    return isset($specials[$operator]) ? $specials[$operator] : NULL;
+    return isset(static::$postgresqlConditionOperatorMap[$operator]) ? static::$postgresqlConditionOperatorMap[$operator] : NULL;
   }
 
   /**
@@ -409,14 +434,14 @@ class Connection extends DatabaseConnection {
    */
   public function rollbackSavepoint($savepoint_name = 'mimic_implicit_commit') {
     if (isset($this->transactionLayers[$savepoint_name])) {
-      $this->rollback($savepoint_name);
+      $this->rollBack($savepoint_name);
     }
   }
 
   /**
    * {@inheritdoc}
    */
-  public function upsert($table, array $options = array()) {
+  public function upsert($table, array $options = []) {
     // Use the (faster) native Upsert implementation for PostgreSQL >= 9.5.
     if (version_compare($this->version(), '9.5', '>=')) {
       $class = $this->getDriverClass('NativeUpsert');
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
index 6b9be78ee..45c7a47ea 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
@@ -26,7 +26,7 @@ class Insert extends QueryInsert {
     $table_information = $this->connection->schema()->queryTableInformation($this->table);
 
     $max_placeholder = 0;
-    $blobs = array();
+    $blobs = [];
     $blob_count = 0;
     foreach ($this->insertValues as $insert_values) {
       foreach ($this->insertFields as $idx => $field) {
@@ -66,7 +66,7 @@ class Insert extends QueryInsert {
             // used twice. However, trying to insert a value into a serial
             // column should only be done in very rare cases and is not thread
             // safe by definition.
-            $this->connection->query("SELECT setval('" . $table_information->sequences[$index] . "', GREATEST(MAX(" . $serial_field . "), :serial_value)) FROM {" . $this->table . "}", array(':serial_value' => (int)$serial_value));
+            $this->connection->query("SELECT setval('" . $table_information->sequences[$index] . "', GREATEST(MAX(" . $serial_field . "), :serial_value)) FROM {" . $this->table . "}", [':serial_value' => (int)$serial_value]);
           }
         }
       }
@@ -103,10 +103,10 @@ class Insert extends QueryInsert {
     try {
       // Only use the returned last_insert_id if it is not already set.
       if (!empty($last_insert_id)) {
-        $this->connection->query($stmt, array(), $options);
+        $this->connection->query($stmt, [], $options);
       }
       else {
-        $last_insert_id = $this->connection->query($stmt, array(), $options);
+        $last_insert_id = $this->connection->query($stmt, [], $options);
       }
       $this->connection->releaseSavepoint();
     }
@@ -116,7 +116,7 @@ class Insert extends QueryInsert {
     }
 
     // Re-initialize the values array so that we can re-use this query.
-    $this->insertValues = array();
+    $this->insertValues = [];
 
     return $last_insert_id;
   }
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
index 7e78b1405..d2cb36b60 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
@@ -4,7 +4,6 @@ namespace Drupal\Core\Database\Driver\pgsql\Install;
 
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\Install\Tasks as InstallTasks;
-use Drupal\Core\Database\Driver\pgsql\Connection;
 use Drupal\Core\Database\DatabaseNotFoundException;
 
 /**
@@ -21,22 +20,22 @@ class Tasks extends InstallTasks {
    * Constructs a \Drupal\Core\Database\Driver\pgsql\Install\Tasks object.
    */
   public function __construct() {
-    $this->tasks[] = array(
+    $this->tasks[] = [
       'function' => 'checkEncoding',
-      'arguments' => array(),
-    );
-    $this->tasks[] = array(
+      'arguments' => [],
+    ];
+    $this->tasks[] = [
       'function' => 'checkBinaryOutput',
-      'arguments' => array(),
-    );
-    $this->tasks[] = array(
+      'arguments' => [],
+    ];
+    $this->tasks[] = [
       'function' => 'checkStandardConformingStrings',
-      'arguments' => array(),
-    );
-    $this->tasks[] = array(
+      'arguments' => [],
+    ];
+    $this->tasks[] = [
       'function' => 'initializeDatabase',
-      'arguments' => array(),
-    );
+      'arguments' => [],
+    ];
   }
 
   /**
@@ -66,7 +65,7 @@ class Tasks extends InstallTasks {
     }
     catch (\Exception $e) {
       // Attempt to create the database if it is not found.
-      if ($e->getCode() == Connection::DATABASE_NOT_FOUND) {
+      if ($e instanceof DatabaseNotFoundException) {
         // Remove the database string from connection info.
         $connection_info = Database::getConnectionInfo();
         $database = $connection_info['default']['database'];
@@ -95,13 +94,13 @@ class Tasks extends InstallTasks {
         catch (DatabaseNotFoundException $e) {
           // Still no dice; probably a permission issue. Raise the error to the
           // installer.
-          $this->fail(t('Database %database not found. The server reports the following message when attempting to create the database: %error.', array('%database' => $database, '%error' => $e->getMessage())));
+          $this->fail(t('Database %database not found. The server reports the following message when attempting to create the database: %error.', ['%database' => $database, '%error' => $e->getMessage()]));
         }
       }
       else {
         // Database connection failed for some other reason than the database
         // not existing.
-        $this->fail(t('Failed to connect to your database server. The server reports the following message: %error.<ul><li>Is the database server running?</li><li>Does the database exist, and have you entered the correct database name?</li><li>Have you entered the correct username and password?</li><li>Have you entered the correct database hostname?</li></ul>', array('%error' => $e->getMessage())));
+        $this->fail(t('Failed to connect to your database server. The server reports the following message: %error.<ul><li>Is the database server running?</li><li>Does the database exist, and have you entered the correct database name?</li><li>Have you entered the correct username and password?</li><li>Have you entered the correct database hostname?</li></ul>', ['%error' => $e->getMessage()]));
         return FALSE;
       }
     }
@@ -117,10 +116,10 @@ class Tasks extends InstallTasks {
         $this->pass(t('Database is encoded in UTF-8'));
       }
       else {
-        $this->fail(t('The %driver database must use %encoding encoding to work with Drupal. Recreate the database with %encoding encoding. See <a href="INSTALL.pgsql.txt">INSTALL.pgsql.txt</a> for more details.', array(
+        $this->fail(t('The %driver database must use %encoding encoding to work with Drupal. Recreate the database with %encoding encoding. See <a href="INSTALL.pgsql.txt">INSTALL.pgsql.txt</a> for more details.', [
           '%encoding' => 'UTF8',
           '%driver' => $this->name(),
-        )));
+        ]));
       }
     }
     catch (\Exception $e) {
@@ -133,7 +132,7 @@ class Tasks extends InstallTasks {
    *
    * Unserializing does not work on Postgresql 9 when bytea_output is 'hex'.
    */
-  function checkBinaryOutput() {
+  public function checkBinaryOutput() {
     // PostgreSQL < 9 doesn't support bytea_output, so verify we are running
     // at least PostgreSQL 9.
     $database_connection = Database::getConnection();
@@ -162,12 +161,12 @@ class Tasks extends InstallTasks {
         // Recheck, if it fails, finally just rely on the end user to do the
         // right thing.
         if (!$this->checkBinaryOutputSuccess()) {
-          $replacements = array(
+          $replacements = [
             '%setting' => 'bytea_output',
             '%current_value' => 'hex',
             '%needed_value' => 'escape',
             '@query' => $query,
-          );
+          ];
           $this->fail(t("The %setting setting is currently set to '%current_value', but needs to be '%needed_value'. Change this by running the following query: <code>@query</code>", $replacements));
         }
       }
@@ -215,12 +214,12 @@ class Tasks extends InstallTasks {
       // Recheck, if it fails, finally just rely on the end user to do the
       // right thing.
       if (!$this->checkStandardConformingStringsSuccess()) {
-        $replacements = array(
+        $replacements = [
           '%setting' => 'standard_conforming_strings',
           '%current_value' => 'off',
           '%needed_value' => 'on',
           '@query' => $query,
-        );
+        ];
         $this->fail(t("The %setting setting is currently set to '%current_value', but needs to be '%needed_value'. Change this by running the following query: <code>@query</code>", $replacements));
       }
     }
@@ -237,7 +236,7 @@ class Tasks extends InstallTasks {
   /**
    * Make PostgreSQL Drupal friendly.
    */
-  function initializeDatabase() {
+  public function initializeDatabase() {
     // We create some functions using global names instead of prefixing them
     // like we do with table names. This is so that we don't double up if more
     // than one instance of Drupal is running on a single database. We therefore
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php
index 23c026429..8cb2ce776 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php
@@ -60,7 +60,7 @@ class NativeUpsert extends QueryUpsert {
             // used twice. However, trying to insert a value into a serial
             // column should only be done in very rare cases and is not thread
             // safe by definition.
-            $this->connection->query("SELECT setval('" . $table_information->sequences[$index] . "', GREATEST(MAX(" . $serial_field . "), :serial_value)) FROM {" . $this->table . "}", array(':serial_value' => (int)$serial_value));
+            $this->connection->query("SELECT setval('" . $table_information->sequences[$index] . "', GREATEST(MAX(" . $serial_field . "), :serial_value)) FROM {" . $this->table . "}", [':serial_value' => (int)$serial_value]);
           }
         }
       }
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index 9b987546d..4586d0105 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -26,7 +26,7 @@ class Schema extends DatabaseSchema {
    * @see \Drupal\Core\Database\Driver\pgsql\Schema::queryTableInformation()
    * @var array
    */
-  protected $tableInformation = array();
+  protected $tableInformation = [];
 
   /**
    * The maximum allowed length for index, primary key and constraint names.
@@ -38,6 +38,13 @@ class Schema extends DatabaseSchema {
    */
   protected $maxIdentifierLength;
 
+  /**
+   * PostgreSQL's temporary namespace name.
+   *
+   * @var string
+   */
+  protected $tempNamespaceName;
+
   /**
    * Make sure to limit identifiers according to PostgreSQL compiled in length.
    *
@@ -97,38 +104,36 @@ class Schema extends DatabaseSchema {
       $key = 'public.' . $key;
     }
     else {
-      $schema = $this->connection->query('SELECT nspname FROM pg_namespace WHERE oid = pg_my_temp_schema()')->fetchField();
-      $key = $schema . '.' . $key;
+      $key = $this->getTempNamespaceName() . '.' . $key;
     }
 
     if (!isset($this->tableInformation[$key])) {
-      // Split the key into schema and table for querying.
-      list($schema, $table_name) = explode('.', $key);
-      $table_information = (object) array(
-        'blob_fields' => array(),
-        'sequences' => array(),
-      );
-      // Don't use {} around information_schema.columns table.
+      $table_information = (object) [
+        'blob_fields' => [],
+        'sequences' => [],
+      ];
       $this->connection->addSavepoint();
 
       try {
-        // Check if the table information exists in the PostgreSQL metadata.
-        $table_information_exists = (bool) $this->connection->query("SELECT 1 FROM pg_class WHERE relname = :table", array(':table' => $table_name))->fetchField();
-
-        // If the table information does not yet exist in the PostgreSQL
-        // metadata, then return the default table information here, so that it
-        // will not be cached.
-        if (!$table_information_exists) {
-          $this->connection->releaseSavepoint();
-          return $table_information;
-        }
-        else {
-          $result = $this->connection->query("SELECT column_name, data_type, column_default FROM information_schema.columns WHERE table_schema = :schema AND table_name = :table AND (data_type = 'bytea' OR (numeric_precision IS NOT NULL AND column_default LIKE :default))", array(
-            ':schema' => $schema,
-            ':table' => $table_name,
-            ':default' => '%nextval%',
-          ));
-        }
+        // The bytea columns and sequences for a table can be found in
+        // pg_attribute, which is significantly faster than querying the
+        // information_schema. The data type of a field can be found by lookup
+        // of the attribute ID, and the default value must be extracted from the
+        // node tree for the attribute definition instead of the historical
+        // human-readable column, adsrc.
+        $sql = <<<'EOD'
+SELECT pg_attribute.attname AS column_name, format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS data_type, pg_get_expr(pg_attrdef.adbin, pg_attribute.attrelid) AS column_default
+FROM pg_attribute
+LEFT JOIN pg_attrdef ON pg_attrdef.adrelid = pg_attribute.attrelid AND pg_attrdef.adnum = pg_attribute.attnum
+WHERE pg_attribute.attnum > 0
+AND NOT pg_attribute.attisdropped
+AND pg_attribute.attrelid = :key::regclass
+AND (format_type(pg_attribute.atttypid, pg_attribute.atttypmod) = 'bytea'
+OR pg_attrdef.adsrc LIKE 'nextval%')
+EOD;
+        $result = $this->connection->query($sql, [
+          ':key' => $key,
+        ]);
       }
       catch (\Exception $e) {
         $this->connection->rollbackSavepoint();
@@ -136,6 +141,13 @@ class Schema extends DatabaseSchema {
       }
       $this->connection->releaseSavepoint();
 
+      // If the table information does not yet exist in the PostgreSQL
+      // metadata, then return the default table information here, so that it
+      // will not be cached.
+      if (empty($result)) {
+        return $table_information;
+      }
+
       foreach ($result as $column) {
         if ($column->data_type == 'bytea') {
           $table_information->blob_fields[$column->column_name] = TRUE;
@@ -153,6 +165,19 @@ class Schema extends DatabaseSchema {
     return $this->tableInformation[$key];
   }
 
+  /**
+   * Gets PostgreSQL's temporary namespace name.
+   *
+   * @return string
+   *   PostgreSQL's temporary namespace name.
+   */
+  protected function getTempNamespaceName() {
+    if (!isset($this->tempNamespaceName)) {
+      $this->tempNamespaceName = $this->connection->query('SELECT nspname FROM pg_namespace WHERE oid = pg_my_temp_schema()')->fetchField();
+    }
+    return $this->tempNamespaceName;
+  }
+
   /**
    * Resets information about table blobs, sequences and serial fields.
    *
@@ -190,11 +215,11 @@ class Schema extends DatabaseSchema {
     $this->connection->addSavepoint();
 
     try {
-      $checks = $this->connection->query("SELECT conname FROM pg_class cl INNER JOIN pg_constraint co ON co.conrelid = cl.oid INNER JOIN pg_attribute attr ON attr.attrelid = cl.oid AND attr.attnum = ANY (co.conkey) INNER JOIN pg_namespace ns ON cl.relnamespace = ns.oid WHERE co.contype = 'c' AND ns.nspname = :schema AND cl.relname = :table AND attr.attname = :column", array(
+      $checks = $this->connection->query("SELECT conname FROM pg_class cl INNER JOIN pg_constraint co ON co.conrelid = cl.oid INNER JOIN pg_attribute attr ON attr.attrelid = cl.oid AND attr.attnum = ANY (co.conkey) INNER JOIN pg_namespace ns ON cl.relnamespace = ns.oid WHERE co.contype = 'c' AND ns.nspname = :schema AND cl.relname = :table AND attr.attname = :column", [
         ':schema' => $schema,
         ':table' => $table_name,
         ':column' => $field,
-      ));
+      ]);
     }
     catch (\Exception $e) {
       $this->connection->rollbackSavepoint();
@@ -219,12 +244,12 @@ class Schema extends DatabaseSchema {
    *   An array of SQL statements to create the table.
    */
   protected function createTableSql($name, $table) {
-    $sql_fields = array();
+    $sql_fields = [];
     foreach ($table['fields'] as $field_name => $field) {
       $sql_fields[] = $this->createFieldSql($field_name, $this->processField($field));
     }
 
-    $sql_keys = array();
+    $sql_keys = [];
     if (isset($table['primary key']) && is_array($table['primary key'])) {
       $sql_keys[] = 'CONSTRAINT ' . $this->ensureIdentifiersLength($name, '', 'pkey') . ' PRIMARY KEY (' . $this->createPrimaryKeySql($table['primary key']) . ')';
     }
@@ -284,7 +309,7 @@ class Schema extends DatabaseSchema {
       unset($spec['not null']);
     }
 
-    if (in_array($spec['pgsql_type'], array('varchar', 'character')) && isset($spec['length'])) {
+    if (in_array($spec['pgsql_type'], ['varchar', 'character']) && isset($spec['length'])) {
       $sql .= '(' . $spec['length'] . ')';
     }
     elseif (isset($spec['precision']) && isset($spec['scale'])) {
@@ -361,12 +386,12 @@ class Schema extends DatabaseSchema {
    * This maps a generic data type in combination with its data size
    * to the engine-specific data type.
    */
-  function getFieldTypeMap() {
+  public function getFieldTypeMap() {
     // Put :normal last so it gets preserved by array_flip. This makes
     // it much easier for modules (such as schema.module) to map
     // database types back into schema types.
     // $map does not use drupal_static as its value never changes.
-    static $map = array(
+    static $map = [
       'varchar_ascii:normal' => 'varchar',
 
       'varchar:normal' => 'varchar',
@@ -400,12 +425,12 @@ class Schema extends DatabaseSchema {
       'serial:medium' => 'serial',
       'serial:big' => 'bigserial',
       'serial:normal' => 'serial',
-      );
+      ];
     return $map;
   }
 
   protected function _createKeySql($fields) {
-    $return = array();
+    $return = [];
     foreach ($fields as $field) {
       if (is_array($field)) {
         $return[] = 'substr(' . $field[0] . ', 1, ' . $field[1] . ')';
@@ -425,7 +450,7 @@ class Schema extends DatabaseSchema {
    * key length defined in the schema is ignored.
    */
   protected function createPrimaryKeySql($fields) {
-    $return = array();
+    $return = [];
     foreach ($fields as $field) {
       if (is_array($field)) {
         $return[] = '"' . $field[0] . '"';
@@ -443,24 +468,24 @@ class Schema extends DatabaseSchema {
   public function tableExists($table) {
     $prefixInfo = $this->getPrefixInfo($table, TRUE);
 
-    return (bool) $this->connection->query("SELECT 1 FROM pg_tables WHERE schemaname = :schema AND tablename = :table", array(':schema' => $prefixInfo['schema'], ':table' => $prefixInfo['table']))->fetchField();
+    return (bool) $this->connection->query("SELECT 1 FROM pg_tables WHERE schemaname = :schema AND tablename = :table", [':schema' => $prefixInfo['schema'], ':table' => $prefixInfo['table']])->fetchField();
   }
 
-  function renameTable($table, $new_name) {
+  public function renameTable($table, $new_name) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", array('@table' => $table, '@table_new' => $new_name)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", ['@table' => $table, '@table_new' => $new_name]));
     }
     if ($this->tableExists($new_name)) {
-      throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", array('@table' => $table, '@table_new' => $new_name)));
+      throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", ['@table' => $table, '@table_new' => $new_name]));
     }
 
     // Get the schema and tablename for the old table.
     $old_full_name = $this->connection->prefixTables('{' . $table . '}');
-    list($old_schema, $old_table_name) = strpos($old_full_name, '.') ? explode('.', $old_full_name) : array('public', $old_full_name);
+    list($old_schema, $old_table_name) = strpos($old_full_name, '.') ? explode('.', $old_full_name) : ['public', $old_full_name];
 
     // Index names and constraint names are global in PostgreSQL, so we need to
     // rename them when renaming the table.
-    $indexes = $this->connection->query('SELECT indexname FROM pg_indexes WHERE schemaname = :schema AND tablename = :table', array(':schema' => $old_schema, ':table' => $old_table_name));
+    $indexes = $this->connection->query('SELECT indexname FROM pg_indexes WHERE schemaname = :schema AND tablename = :table', [':schema' => $old_schema, ':table' => $old_table_name]);
 
     foreach ($indexes as $index) {
       // Get the index type by suffix, e.g. idx/key/pkey
@@ -510,16 +535,19 @@ class Schema extends DatabaseSchema {
     return TRUE;
   }
 
-  public function addField($table, $field, $spec, $new_keys = array()) {
+  public function addField($table, $field, $spec, $new_keys = []) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", array('@field' => $field, '@table' => $table)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", ['@field' => $field, '@table' => $table]));
     }
     if ($this->fieldExists($table, $field)) {
-      throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", array('@field' => $field, '@table' => $table)));
+      throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", ['@field' => $field, '@table' => $table]));
     }
 
+    // Fields that are part of a PRIMARY KEY must be added as NOT NULL.
+    $is_primary_key = isset($keys_new['primary key']) && in_array($field, $keys_new['primary key'], TRUE);
+
     $fixnull = FALSE;
-    if (!empty($spec['not null']) && !isset($spec['default'])) {
+    if (!empty($spec['not null']) && !isset($spec['default']) && !$is_primary_key) {
       $fixnull = TRUE;
       $spec['not null'] = FALSE;
     }
@@ -528,7 +556,7 @@ class Schema extends DatabaseSchema {
     $this->connection->query($query);
     if (isset($spec['initial'])) {
       $this->connection->update($table)
-        ->fields(array($field => $spec['initial']))
+        ->fields([$field => $spec['initial']])
         ->execute();
     }
     if (isset($spec['initial_from_field'])) {
@@ -540,6 +568,12 @@ class Schema extends DatabaseSchema {
       $this->connection->query("ALTER TABLE {" . $table . "} ALTER $field SET NOT NULL");
     }
     if (isset($new_keys)) {
+      // Make sure to drop the existing primary key before adding a new one.
+      // This is only needed when adding a field because this method, unlike
+      // changeField(), is supposed to handle primary keys automatically.
+      if (isset($new_keys['primary key']) && $this->constraintExists($table, 'pkey')) {
+        $this->dropPrimaryKey($table);
+      }
       $this->_createKeys($table, $new_keys);
     }
     // Add column comment.
@@ -561,7 +595,7 @@ class Schema extends DatabaseSchema {
 
   public function fieldSetDefault($table, $field, $default) {
     if (!$this->fieldExists($table, $field)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", array('@table' => $table, '@field' => $field)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
     }
 
     $default = $this->escapeDefaultValue($default);
@@ -571,7 +605,7 @@ class Schema extends DatabaseSchema {
 
   public function fieldSetNoDefault($table, $field) {
     if (!$this->fieldExists($table, $field)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", array('@table' => $table, '@field' => $field)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
     }
 
     $this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN "' . $field . '" DROP DEFAULT');
@@ -619,10 +653,10 @@ class Schema extends DatabaseSchema {
 
   public function addPrimaryKey($table, $fields) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", array('@table' => $table)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", ['@table' => $table]));
     }
     if ($this->constraintExists($table, 'pkey')) {
-      throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", array('@table' => $table)));
+      throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", ['@table' => $table]));
     }
 
     $this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT ' . $this->ensureIdentifiersLength($table, '', 'pkey') . ' PRIMARY KEY (' . $this->createPrimaryKeySql($fields) . ')');
@@ -639,12 +673,12 @@ class Schema extends DatabaseSchema {
     return TRUE;
   }
 
-  function addUniqueKey($table, $name, $fields) {
+  public function addUniqueKey($table, $name, $fields) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
     }
     if ($this->constraintExists($table, $name . '__key')) {
-      throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", ['@table' => $table, '@name' => $name]));
     }
 
     $this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT ' . $this->ensureIdentifiersLength($table, $name, 'key') . ' UNIQUE (' . implode(',', $fields) . ')');
@@ -666,10 +700,10 @@ class Schema extends DatabaseSchema {
    */
   public function addIndex($table, $name, $fields, array $spec) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
     }
     if ($this->indexExists($table, $name)) {
-      throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", ['@table' => $table, '@name' => $name]));
     }
 
     $this->connection->query($this->_createIndexSql($table, $name, $fields));
@@ -686,12 +720,12 @@ class Schema extends DatabaseSchema {
     return TRUE;
   }
 
-  public function changeField($table, $field, $field_new, $spec, $new_keys = array()) {
+  public function changeField($table, $field, $field_new, $spec, $new_keys = []) {
     if (!$this->fieldExists($table, $field)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", array('@table' => $table, '@name' => $field)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", ['@table' => $table, '@name' => $field]));
     }
     if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
-      throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", array('@table' => $table, '@name' => $field, '@name_new' => $field_new)));
+      throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", ['@table' => $table, '@name' => $field, '@name_new' => $field_new]));
     }
 
     $spec = $this->processField($spec);
@@ -699,14 +733,14 @@ class Schema extends DatabaseSchema {
     // Type 'serial' is known to PostgreSQL, but only during table creation,
     // not when altering. Because of that, we create it here as an 'int'. After
     // we create it we manually re-apply the sequence.
-    if (in_array($spec['pgsql_type'], array('serial', 'bigserial'))) {
+    if (in_array($spec['pgsql_type'], ['serial', 'bigserial'])) {
       $field_def = 'int';
     }
     else {
       $field_def = $spec['pgsql_type'];
     }
 
-    if (in_array($spec['pgsql_type'], array('varchar', 'character', 'text')) && isset($spec['length'])) {
+    if (in_array($spec['pgsql_type'], ['varchar', 'character', 'text']) && isset($spec['length'])) {
       $field_def .= '(' . $spec['length'] . ')';
     }
     elseif (isset($spec['precision']) && isset($spec['scale'])) {
@@ -757,7 +791,7 @@ class Schema extends DatabaseSchema {
       $this->connection->query('ALTER TABLE {' . $table . '} ALTER "' . $field . '" ' . $nullaction);
     }
 
-    if (in_array($spec['pgsql_type'], array('serial', 'bigserial'))) {
+    if (in_array($spec['pgsql_type'], ['serial', 'bigserial'])) {
       // Type "serial" is known to PostgreSQL, but *only* during table creation,
       // not when altering. Because of that, the sequence needs to be created
       // and initialized by hand.
@@ -827,10 +861,10 @@ class Schema extends DatabaseSchema {
     $info = $this->getPrefixInfo($table);
     // Don't use {} around pg_class, pg_attribute tables.
     if (isset($column)) {
-      return $this->connection->query('SELECT col_description(oid, attnum) FROM pg_class, pg_attribute WHERE attrelid = oid AND relname = ? AND attname = ?', array($info['table'], $column))->fetchField();
+      return $this->connection->query('SELECT col_description(oid, attnum) FROM pg_class, pg_attribute WHERE attrelid = oid AND relname = ? AND attname = ?', [$info['table'], $column])->fetchField();
     }
     else {
-      return $this->connection->query('SELECT obj_description(oid, ?) FROM pg_class WHERE relname = ?', array('pg_class', $info['table']))->fetchField();
+      return $this->connection->query('SELECT obj_description(oid, ?) FROM pg_class WHERE relname = ?', ['pg_class', $info['table']])->fetchField();
     }
   }
 
@@ -847,7 +881,7 @@ class Schema extends DatabaseSchema {
   protected function hashBase64($data) {
     $hash = base64_encode(hash('sha256', $data, TRUE));
     // Modify the hash so it's safe to use in PostgreSQL identifiers.
-    return strtr($hash, array('+' => '_', '/' => '_', '=' => ''));
+    return strtr($hash, ['+' => '_', '/' => '_', '=' => '']);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
index 3214b332c..e76cb0f95 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
@@ -114,7 +114,7 @@ class Select extends QuerySelect {
   /**
    * {@inheritdoc}
    */
-  public function addExpression($expression, $alias = NULL, $arguments = array()) {
+  public function addExpression($expression, $alias = NULL, $arguments = []) {
     if (empty($alias)) {
       $alias = 'expression';
     }
@@ -127,11 +127,11 @@ class Select extends QuerySelect {
     }
     $alias = $alias_candidate;
 
-    $this->expressions[$alias] = array(
+    $this->expressions[$alias] = [
       'expression' => $expression,
       'alias' => $this->connection->escapeAlias($alias_candidate),
       'arguments' => $arguments,
-    );
+    ];
 
     return $alias;
   }
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php
index f6319523a..e937f6c8e 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php
@@ -13,7 +13,7 @@ class Update extends QueryUpdate {
 
   public function execute() {
     $max_placeholder = 0;
-    $blobs = array();
+    $blobs = [];
     $blob_count = 0;
 
     // Because we filter $fields the same way here and in __toString(), the
@@ -75,7 +75,7 @@ class Update extends QueryUpdate {
 
     $this->connection->addSavepoint();
     try {
-      $result = $this->connection->query($stmt, array(), $options);
+      $result = $this->connection->query($stmt, [], $options);
       $this->connection->releaseSavepoint();
       return $result;
     }
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php
index 9dd4fc2fc..52e077a17 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php
@@ -18,9 +18,9 @@ class Upsert extends QueryUpsert {
     }
 
     // Default options for upsert queries.
-    $this->queryOptions += array(
+    $this->queryOptions += [
       'throw_exception' => TRUE,
-    );
+    ];
 
     // Default fields are always placed first for consistency.
     $insert_fields = array_merge($this->defaultFields, $this->insertFields);
@@ -59,14 +59,14 @@ class Upsert extends QueryUpsert {
     }
     catch (\Exception $e) {
       // One of the queries failed, rollback the whole batch.
-      $transaction->rollback();
+      $transaction->rollBack();
 
       // Rethrow the exception for the calling code.
       throw $e;
     }
 
     // Re-initialize the values array so that we can re-use this query.
-    $this->insertValues = array();
+    $this->insertValues = [];
 
     // Transaction commits here where $transaction looses scope.
 
diff --git a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
index 23dd26132..a14a83f07 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
@@ -23,13 +23,25 @@ class Connection extends DatabaseConnection {
    */
   protected $willRollback;
 
+  /**
+   * A map of condition operators to SQLite operators.
+   *
+   * We don't want to override any of the defaults.
+   */
+  protected static $sqliteConditionOperatorMap = [
+    'LIKE' => ['postfix' => " ESCAPE '\\'"],
+    'NOT LIKE' => ['postfix' => " ESCAPE '\\'"],
+    'LIKE BINARY' => ['postfix' => " ESCAPE '\\'", 'operator' => 'GLOB'],
+    'NOT LIKE BINARY' => ['postfix' => " ESCAPE '\\'", 'operator' => 'NOT GLOB'],
+  ];
+
   /**
    * All databases attached to the current database. This is used to allow
    * prefixes to be safely handled without locking the table
    *
    * @var array
    */
-  protected $attachedDatabases = array();
+  protected $attachedDatabases = [];
 
   /**
    * Whether or not a table has been dropped this request: the destructor will
@@ -70,10 +82,10 @@ class Connection extends DatabaseConnection {
             // In memory database use ':memory:' as database name. According to
             // http://www.sqlite.org/inmemorydb.html it will open a unique
             // database so attaching it twice is not a problem.
-            $this->query('ATTACH DATABASE :database AS :prefix', array(':database' => $connection_options['database'], ':prefix' => $prefix));
+            $this->query('ATTACH DATABASE :database AS :prefix', [':database' => $connection_options['database'], ':prefix' => $prefix]);
           }
           else {
-            $this->query('ATTACH DATABASE :database AS :prefix', array(':database' => $connection_options['database'] . '-' . $prefix, ':prefix' => $prefix));
+            $this->query('ATTACH DATABASE :database AS :prefix', [':database' => $connection_options['database'] . '-' . $prefix, ':prefix' => $prefix]);
           }
         }
 
@@ -89,50 +101,62 @@ class Connection extends DatabaseConnection {
   /**
    * {@inheritdoc}
    */
-  public static function open(array &$connection_options = array()) {
+  public static function open(array &$connection_options = []) {
     // Allow PDO options to be overridden.
-    $connection_options += array(
-      'pdo' => array(),
-    );
-    $connection_options['pdo'] += array(
+    $connection_options += [
+      'pdo' => [],
+    ];
+    $connection_options['pdo'] += [
       \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
       // Convert numeric values to strings when fetching.
       \PDO::ATTR_STRINGIFY_FETCHES => TRUE,
-    );
-    $pdo = new \PDO('sqlite:' . $connection_options['database'], '', '', $connection_options['pdo']);
+    ];
+
+    try {
+      $pdo = new \PDO('sqlite:' . $connection_options['database'], '', '', $connection_options['pdo']);
+    }
+    catch (\PDOException $e) {
+      if ($e->getCode() == static::DATABASE_NOT_FOUND) {
+        throw new DatabaseNotFoundException($e->getMessage(), $e->getCode(), $e);
+      }
+      // SQLite doesn't have a distinct error code for access denied, so don't
+      // deal with that case.
+      throw $e;
+    }
+
 
     // Create functions needed by SQLite.
-    $pdo->sqliteCreateFunction('if', array(__CLASS__, 'sqlFunctionIf'));
-    $pdo->sqliteCreateFunction('greatest', array(__CLASS__, 'sqlFunctionGreatest'));
+    $pdo->sqliteCreateFunction('if', [__CLASS__, 'sqlFunctionIf']);
+    $pdo->sqliteCreateFunction('greatest', [__CLASS__, 'sqlFunctionGreatest']);
     $pdo->sqliteCreateFunction('pow', 'pow', 2);
     $pdo->sqliteCreateFunction('exp', 'exp', 1);
     $pdo->sqliteCreateFunction('length', 'strlen', 1);
     $pdo->sqliteCreateFunction('md5', 'md5', 1);
-    $pdo->sqliteCreateFunction('concat', array(__CLASS__, 'sqlFunctionConcat'));
-    $pdo->sqliteCreateFunction('concat_ws', array(__CLASS__, 'sqlFunctionConcatWs'));
-    $pdo->sqliteCreateFunction('substring', array(__CLASS__, 'sqlFunctionSubstring'), 3);
-    $pdo->sqliteCreateFunction('substring_index', array(__CLASS__, 'sqlFunctionSubstringIndex'), 3);
-    $pdo->sqliteCreateFunction('rand', array(__CLASS__, 'sqlFunctionRand'));
-    $pdo->sqliteCreateFunction('regexp', array(__CLASS__, 'sqlFunctionRegexp'));
+    $pdo->sqliteCreateFunction('concat', [__CLASS__, 'sqlFunctionConcat']);
+    $pdo->sqliteCreateFunction('concat_ws', [__CLASS__, 'sqlFunctionConcatWs']);
+    $pdo->sqliteCreateFunction('substring', [__CLASS__, 'sqlFunctionSubstring'], 3);
+    $pdo->sqliteCreateFunction('substring_index', [__CLASS__, 'sqlFunctionSubstringIndex'], 3);
+    $pdo->sqliteCreateFunction('rand', [__CLASS__, 'sqlFunctionRand']);
+    $pdo->sqliteCreateFunction('regexp', [__CLASS__, 'sqlFunctionRegexp']);
 
     // SQLite does not support the LIKE BINARY operator, so we overload the
     // non-standard GLOB operator for case-sensitive matching. Another option
     // would have been to override another non-standard operator, MATCH, but
     // that does not support the NOT keyword prefix.
-    $pdo->sqliteCreateFunction('glob', array(__CLASS__, 'sqlFunctionLikeBinary'));
+    $pdo->sqliteCreateFunction('glob', [__CLASS__, 'sqlFunctionLikeBinary']);
 
     // Create a user-space case-insensitive collation with UTF-8 support.
-    $pdo->sqliteCreateCollation('NOCASE_UTF8', array('Drupal\Component\Utility\Unicode', 'strcasecmp'));
+    $pdo->sqliteCreateCollation('NOCASE_UTF8', ['Drupal\Component\Utility\Unicode', 'strcasecmp']);
 
     // Set SQLite init_commands if not already defined. Enable the Write-Ahead
     // Logging (WAL) for SQLite. See https://www.drupal.org/node/2348137 and
     // https://www.sqlite.org/wal.html.
-    $connection_options += array(
-      'init_commands' => array(),
-    );
-    $connection_options['init_commands'] += array(
+    $connection_options += [
+      'init_commands' => [],
+    ];
+    $connection_options['init_commands'] += [
       'wal' => "PRAGMA journal_mode=WAL",
-    );
+    ];
 
     // Execute sqlite init_commands.
     if (isset($connection_options['init_commands'])) {
@@ -155,7 +179,7 @@ class Connection extends DatabaseConnection {
       foreach ($this->attachedDatabases as $prefix) {
         // Check if the database is now empty, ignore the internal SQLite tables.
         try {
-          $count = $this->query('SELECT COUNT(*) FROM ' . $prefix . '.sqlite_master WHERE type = :type AND name NOT LIKE :pattern', array(':type' => 'table', ':pattern' => 'sqlite_%'))->fetchField();
+          $count = $this->query('SELECT COUNT(*) FROM ' . $prefix . '.sqlite_master WHERE type = :type AND name NOT LIKE :pattern', [':type' => 'table', ':pattern' => 'sqlite_%'])->fetchField();
 
           // We can prune the database file if it doesn't have any tables.
           if ($count == 0) {
@@ -301,21 +325,21 @@ class Connection extends DatabaseConnection {
     // Replace the SQL LIKE wildcard meta-characters with the equivalent regular
     // expression meta-characters and escape the delimiter that will be used for
     // matching.
-    $pattern = str_replace(array('%', '_'), array('.*?', '.'), preg_quote($pattern, '/'));
+    $pattern = str_replace(['%', '_'], ['.*?', '.'], preg_quote($pattern, '/'));
     return preg_match('/^' . $pattern . '$/', $subject);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function prepare($statement, array $driver_options = array()) {
+  public function prepare($statement, array $driver_options = []) {
     return new Statement($this->connection, $this, $statement, $driver_options);
   }
 
   /**
    * {@inheritdoc}
    */
-  protected function handleQueryException(\PDOException $e, $query, array $args = array(), $options = array()) {
+  protected function handleQueryException(\PDOException $e, $query, array $args = [], $options = []) {
     // The database schema might be changed by another process in between the
     // time that the statement was prepared and the time the statement was run
     // (e.g. usually happens when running tests). In this case, we need to
@@ -329,11 +353,11 @@ class Connection extends DatabaseConnection {
     parent::handleQueryException($e, $query, $args, $options);
   }
 
-  public function queryRange($query, $from, $count, array $args = array(), array $options = array()) {
+  public function queryRange($query, $from, $count, array $args = [], array $options = []) {
     return $this->query($query . ' LIMIT ' . (int) $from . ', ' . (int) $count, $args, $options);
   }
 
-  public function queryTemporary($query, array $args = array(), array $options = array()) {
+  public function queryTemporary($query, array $args = [], array $options = []) {
     // Generate a new temporary table name and protect it from prefixing.
     // SQLite requires that temporary tables to be non-qualified.
     $tablename = $this->generateTemporaryTableName();
@@ -370,14 +394,7 @@ class Connection extends DatabaseConnection {
   }
 
   public function mapConditionOperator($operator) {
-    // We don't want to override any of the defaults.
-    static $specials = array(
-      'LIKE' => array('postfix' => " ESCAPE '\\'"),
-      'NOT LIKE' => array('postfix' => " ESCAPE '\\'"),
-      'LIKE BINARY' => array('postfix' => " ESCAPE '\\'", 'operator' => 'GLOB'),
-      'NOT LIKE BINARY' => array('postfix' => " ESCAPE '\\'", 'operator' => 'NOT GLOB'),
-    );
-    return isset($specials[$operator]) ? $specials[$operator] : NULL;
+    return isset(static::$sqliteConditionOperatorMap[$operator]) ? static::$sqliteConditionOperatorMap[$operator] : NULL;
   }
 
   /**
@@ -397,13 +414,13 @@ class Connection extends DatabaseConnection {
     // wait until this transaction commits. Also, the return value needs to be
     // set to RETURN_AFFECTED as if it were a real update() query otherwise it
     // is not possible to get the row count properly.
-    $affected = $this->query('UPDATE {sequences} SET value = GREATEST(value, :existing_id) + 1', array(
+    $affected = $this->query('UPDATE {sequences} SET value = GREATEST(value, :existing_id) + 1', [
       ':existing_id' => $existing_id,
-    ), array('return' => Database::RETURN_AFFECTED));
+    ], ['return' => Database::RETURN_AFFECTED]);
     if (!$affected) {
-      $this->query('INSERT INTO {sequences} (value) VALUES (:existing_id + 1)', array(
+      $this->query('INSERT INTO {sequences} (value) VALUES (:existing_id + 1)', [
         ':existing_id' => $existing_id,
-      ));
+      ]);
     }
     // The transaction gets committed when the transaction object gets destroyed
     // because it gets out of scope.
diff --git a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php
index 506e65518..0c4fdb668 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php
@@ -21,7 +21,7 @@ class Insert extends QueryInsert {
       return parent::execute();
     }
     else {
-      return $this->connection->query('INSERT INTO {' . $this->table . '} DEFAULT VALUES', array(), $this->queryOptions);
+      return $this->connection->query('INSERT INTO {' . $this->table . '} DEFAULT VALUES', [], $this->queryOptions);
     }
   }
 
@@ -30,7 +30,7 @@ class Insert extends QueryInsert {
     $comments = $this->connection->makeComment($this->comments);
 
     // Produce as many generic placeholders as necessary.
-    $placeholders = array();
+    $placeholders = [];
     if (!empty($this->insertFields)) {
       $placeholders = array_fill(0, count($this->insertFields), '?');
     }
diff --git a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
index f56b26ce4..b0ea18877 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Install/Tasks.php
@@ -42,7 +42,7 @@ class Tasks extends InstallTasks {
 
     // Make the text more accurate for SQLite.
     $form['database']['#title'] = t('Database file');
-    $form['database']['#description'] = t('The absolute path to the file where @drupal data will be stored. This must be writable by the web server and should exist outside of the web root.', array('@drupal' => drupal_install_profile_distribution_name()));
+    $form['database']['#description'] = t('The absolute path to the file where @drupal data will be stored. This must be writable by the web server and should exist outside of the web root.', ['@drupal' => drupal_install_profile_distribution_name()]);
     $default_database = \Drupal::service('site.path') . '/files/.ht.sqlite';
     $form['database']['#default_value'] = empty($database['database']) ? $default_database : $database['database'];
     return $form;
@@ -91,13 +91,13 @@ class Tasks extends InstallTasks {
         catch (DatabaseNotFoundException $e) {
           // Still no dice; probably a permission issue. Raise the error to the
           // installer.
-          $this->fail(t('Database %database not found. The server reports the following message when attempting to create the database: %error.', array('%database' => $database, '%error' => $e->getMessage())));
+          $this->fail(t('Database %database not found. The server reports the following message when attempting to create the database: %error.', ['%database' => $database, '%error' => $e->getMessage()]));
         }
       }
       else {
         // Database connection failed for some other reason than the database
         // not existing.
-        $this->fail(t('Failed to connect to your database server. The server reports the following message: %error.<ul><li>Is the database server running?</li><li>Does the database exist, and have you entered the correct database name?</li><li>Have you entered the correct username and password?</li><li>Have you entered the correct database hostname?</li></ul>', array('%error' => $e->getMessage())));
+        $this->fail(t('Failed to connect to your database server. The server reports the following message: %error.<ul><li>Is the database server running?</li><li>Does the database exist, and have you entered the correct database name?</li><li>Have you entered the correct username and password?</li><li>Have you entered the correct database hostname?</li></ul>', ['%error' => $e->getMessage()]));
         return FALSE;
       }
     }
diff --git a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
index 4b954ed35..90c484835 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -26,7 +26,7 @@ class Schema extends DatabaseSchema {
     $info = $this->getPrefixInfo($table);
 
     // Don't use {} around sqlite_master table.
-    return (bool) $this->connection->query('SELECT 1 FROM ' . $info['schema'] . '.sqlite_master WHERE type = :type AND name = :name', array(':type' => 'table', ':name' => $info['table']))->fetchField();
+    return (bool) $this->connection->query('SELECT 1 FROM ' . $info['schema'] . '.sqlite_master WHERE type = :type AND name = :name', [':type' => 'table', ':name' => $info['table']])->fetchField();
   }
 
   public function fieldExists($table, $column) {
@@ -45,7 +45,7 @@ class Schema extends DatabaseSchema {
    *   An array of SQL statements to create the table.
    */
   public function createTableSql($name, $table) {
-    $sql = array();
+    $sql = [];
     $sql[] = "CREATE TABLE {" . $name . "} (\n" . $this->createColumnsSql($name, $table) . "\n)\n";
     return array_merge($sql, $this->createIndexSql($name, $table));
   }
@@ -54,7 +54,7 @@ class Schema extends DatabaseSchema {
    * Build the SQL expression for indexes.
    */
   protected function createIndexSql($tablename, $schema) {
-    $sql = array();
+    $sql = [];
     $info = $this->getPrefixInfo($tablename);
     if (!empty($schema['unique keys'])) {
       foreach ($schema['unique keys'] as $key => $fields) {
@@ -73,7 +73,7 @@ class Schema extends DatabaseSchema {
    * Build the SQL expression for creating columns.
    */
   protected function createColumnsSql($tablename, $schema) {
-    $sql_array = array();
+    $sql_array = [];
 
     // Add the SQL statement for each field.
     foreach ($schema['fields'] as $name => $field) {
@@ -97,7 +97,7 @@ class Schema extends DatabaseSchema {
    * Build the SQL expression for keys.
    */
   protected function createKeySql($fields) {
-    $return = array();
+    $return = [];
     foreach ($fields as $field) {
       if (is_array($field)) {
         $return[] = $field[0];
@@ -163,7 +163,7 @@ class Schema extends DatabaseSchema {
     else {
       $sql = $name . ' ' . $spec['sqlite_type'];
 
-      if (in_array($spec['sqlite_type'], array('VARCHAR', 'TEXT'))) {
+      if (in_array($spec['sqlite_type'], ['VARCHAR', 'TEXT'])) {
         if (isset($spec['length'])) {
           $sql .= '(' . $spec['length'] . ')';
         }
@@ -209,7 +209,7 @@ class Schema extends DatabaseSchema {
     // it much easier for modules (such as schema.module) to map
     // database types back into schema types.
     // $map does not use drupal_static as its value never changes.
-    static $map = array(
+    static $map = [
       'varchar_ascii:normal' => 'VARCHAR',
 
       'varchar:normal'  => 'VARCHAR',
@@ -243,16 +243,16 @@ class Schema extends DatabaseSchema {
 
       'blob:big'        => 'BLOB',
       'blob:normal'     => 'BLOB',
-    );
+    ];
     return $map;
   }
 
   public function renameTable($table, $new_name) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", array('@table' => $table, '@table_new' => $new_name)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", ['@table' => $table, '@table_new' => $new_name]));
     }
     if ($this->tableExists($new_name)) {
-      throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", array('@table' => $table, '@table_new' => $new_name)));
+      throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", ['@table' => $table, '@table_new' => $new_name]));
     }
 
     $schema = $this->introspectSchema($table);
@@ -293,12 +293,12 @@ class Schema extends DatabaseSchema {
     return TRUE;
   }
 
-  public function addField($table, $field, $specification, $keys_new = array()) {
+  public function addField($table, $field, $specification, $keys_new = []) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", array('@field' => $field, '@table' => $table)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", ['@field' => $field, '@table' => $table]));
     }
     if ($this->fieldExists($table, $field)) {
-      throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", array('@field' => $field, '@table' => $table)));
+      throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", ['@field' => $field, '@table' => $table]));
     }
 
     // SQLite doesn't have a full-featured ALTER TABLE statement. It only
@@ -313,7 +313,7 @@ class Schema extends DatabaseSchema {
       // Apply the initial value if set.
       if (isset($specification['initial'])) {
         $this->connection->update($table)
-          ->fields(array($field => $specification['initial']))
+          ->fields([$field => $specification['initial']])
           ->execute();
       }
       if (isset($specification['initial_from_field'])) {
@@ -332,20 +332,20 @@ class Schema extends DatabaseSchema {
       $new_schema['fields'][$field] = $specification;
 
       // Build the mapping between the old fields and the new fields.
-      $mapping = array();
+      $mapping = [];
       if (isset($specification['initial'])) {
         // If we have a initial value, copy it over.
-        $mapping[$field] = array(
+        $mapping[$field] = [
           'expression' => ':newfieldinitial',
-          'arguments' => array(':newfieldinitial' => $specification['initial']),
-        );
+          'arguments' => [':newfieldinitial' => $specification['initial']],
+        ];
       }
       elseif (isset($specification['initial_from_field'])) {
         // If we have a initial value, copy it over.
-        $mapping[$field] = array(
+        $mapping[$field] = [
           'expression' => $specification['initial_from_field'],
           'arguments' => [],
-        );
+        ];
       }
       else {
         // Else use the default of the field.
@@ -353,7 +353,7 @@ class Schema extends DatabaseSchema {
       }
 
       // Add the new indexes.
-      $new_schema += $keys_new;
+      $new_schema = array_merge($new_schema, $keys_new);
 
       $this->alterTable($table, $old_schema, $new_schema, $mapping);
     }
@@ -380,7 +380,7 @@ class Schema extends DatabaseSchema {
    *     - an associative array with two keys 'expression' and 'arguments',
    *       that will be used as an expression field.
    */
-  protected function alterTable($table, $old_schema, $new_schema, array $mapping = array()) {
+  protected function alterTable($table, $old_schema, $new_schema, array $mapping = []) {
     $i = 0;
     do {
       $new_table = $table . '_' . $i++;
@@ -441,12 +441,12 @@ class Schema extends DatabaseSchema {
    */
   protected function introspectSchema($table) {
     $mapped_fields = array_flip($this->getFieldTypeMap());
-    $schema = array(
-      'fields' => array(),
-      'primary key' => array(),
-      'unique keys' => array(),
-      'indexes' => array(),
-    );
+    $schema = [
+      'fields' => [],
+      'primary key' => [],
+      'unique keys' => [],
+      'indexes' => [],
+    ];
 
     $info = $this->getPrefixInfo($table);
     $result = $this->connection->query('PRAGMA ' . $info['schema'] . '.table_info(' . $info['table'] . ')');
@@ -461,12 +461,12 @@ class Schema extends DatabaseSchema {
       }
       if (isset($mapped_fields[$type])) {
         list($type, $size) = explode(':', $mapped_fields[$type]);
-        $schema['fields'][$row->name] = array(
+        $schema['fields'][$row->name] = [
           'type' => $type,
           'size' => $size,
           'not null' => !empty($row->notnull),
           'default' => trim($row->dflt_value, "'"),
-        );
+        ];
         if ($length) {
           $schema['fields'][$row->name]['length'] = $length;
         }
@@ -478,14 +478,14 @@ class Schema extends DatabaseSchema {
         throw new \Exception("Unable to parse the column type " . $row->type);
       }
     }
-    $indexes = array();
+    $indexes = [];
     $result = $this->connection->query('PRAGMA ' . $info['schema'] . '.index_list(' . $info['table'] . ')');
     foreach ($result as $row) {
       if (strpos($row->name, 'sqlite_autoindex_') !== 0) {
-        $indexes[] = array(
+        $indexes[] = [
           'schema_key' => $row->unique ? 'unique keys' : 'indexes',
           'name' => $row->name,
-        );
+        ];
       }
     }
     foreach ($indexes as $index) {
@@ -531,12 +531,12 @@ class Schema extends DatabaseSchema {
     return TRUE;
   }
 
-  public function changeField($table, $field, $field_new, $spec, $keys_new = array()) {
+  public function changeField($table, $field, $field_new, $spec, $keys_new = []) {
     if (!$this->fieldExists($table, $field)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", array('@table' => $table, '@name' => $field)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", ['@table' => $table, '@name' => $field]));
     }
     if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
-      throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", array('@table' => $table, '@name' => $field, '@name_new' => $field_new)));
+      throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", ['@table' => $table, '@name' => $field, '@name_new' => $field_new]));
     }
 
     $old_schema = $this->introspectSchema($table);
@@ -547,7 +547,7 @@ class Schema extends DatabaseSchema {
       $mapping[$field_new] = $field;
     }
     else {
-      $mapping = array();
+      $mapping = [];
     }
 
     // Remove the previous definition and swap in the new one.
@@ -556,7 +556,7 @@ class Schema extends DatabaseSchema {
 
     // Map the former indexes to the new column name.
     $new_schema['primary key'] = $this->mapKeyDefinition($new_schema['primary key'], $mapping);
-    foreach (array('unique keys', 'indexes') as $k) {
+    foreach (['unique keys', 'indexes'] as $k) {
       foreach ($new_schema[$k] as &$key_definition) {
         $key_definition = $this->mapKeyDefinition($key_definition, $mapping);
       }
@@ -566,7 +566,7 @@ class Schema extends DatabaseSchema {
     if (isset($keys_new['primary key'])) {
       $new_schema['primary key'] = $keys_new['primary key'];
     }
-    foreach (array('unique keys', 'indexes') as $k) {
+    foreach (['unique keys', 'indexes'] as $k) {
       if (!empty($keys_new[$k])) {
         $new_schema[$k] = $keys_new[$k] + $new_schema[$k];
       }
@@ -601,10 +601,10 @@ class Schema extends DatabaseSchema {
    */
   public function addIndex($table, $name, $fields, array $spec) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
     }
     if ($this->indexExists($table, $name)) {
-      throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", ['@table' => $table, '@name' => $name]));
     }
 
     $schema['indexes'][$name] = $fields;
@@ -633,10 +633,10 @@ class Schema extends DatabaseSchema {
 
   public function addUniqueKey($table, $name, $fields) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
     }
     if ($this->indexExists($table, $name)) {
-      throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", array('@table' => $table, '@name' => $name)));
+      throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", ['@table' => $table, '@name' => $name]));
     }
 
     $schema['unique keys'][$name] = $fields;
@@ -659,14 +659,14 @@ class Schema extends DatabaseSchema {
 
   public function addPrimaryKey($table, $fields) {
     if (!$this->tableExists($table)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", array('@table' => $table)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", ['@table' => $table]));
     }
 
     $old_schema = $this->introspectSchema($table);
     $new_schema = $old_schema;
 
     if (!empty($new_schema['primary key'])) {
-      throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", array('@table' => $table)));
+      throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", ['@table' => $table]));
     }
 
     $new_schema['primary key'] = $fields;
@@ -688,7 +688,7 @@ class Schema extends DatabaseSchema {
 
   public function fieldSetDefault($table, $field, $default) {
     if (!$this->fieldExists($table, $field)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", array('@table' => $table, '@field' => $field)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
     }
 
     $old_schema = $this->introspectSchema($table);
@@ -700,7 +700,7 @@ class Schema extends DatabaseSchema {
 
   public function fieldSetNoDefault($table, $field) {
     if (!$this->fieldExists($table, $field)) {
-      throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", array('@table' => $table, '@field' => $field)));
+      throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
     }
 
     $old_schema = $this->introspectSchema($table);
@@ -726,11 +726,11 @@ class Schema extends DatabaseSchema {
       // Can't use query placeholders for the schema because the query would
       // have to be :prefixsqlite_master, which does not work. We also need to
       // ignore the internal SQLite tables.
-      $result = $this->connection->query("SELECT name FROM " . $schema . ".sqlite_master WHERE type = :type AND name LIKE :table_name AND name NOT LIKE :pattern", array(
+      $result = $this->connection->query("SELECT name FROM " . $schema . ".sqlite_master WHERE type = :type AND name LIKE :table_name AND name NOT LIKE :pattern", [
         ':type' => 'table',
         ':table_name' => $table_expression,
         ':pattern' => 'sqlite_%',
-      ));
+      ]);
       $tables += $result->fetchAllKeyed(0, 0);
     }
 
diff --git a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
index adc537cc3..5610d071c 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
@@ -26,13 +26,13 @@ class Statement extends StatementPrefetch implements StatementInterface {
    *
    * See http://bugs.php.net/bug.php?id=45259 for more details.
    */
-  protected function getStatement($query, &$args = array()) {
+  protected function getStatement($query, &$args = []) {
     if (count($args)) {
       // Check if $args is a simple numeric array.
       if (range(0, count($args) - 1) === array_keys($args)) {
         // In that case, we have unnamed placeholders.
         $count = 0;
-        $new_args = array();
+        $new_args = [];
         foreach ($args as $value) {
           if (is_float($value) || is_int($value)) {
             if (is_float($value)) {
@@ -85,7 +85,7 @@ class Statement extends StatementPrefetch implements StatementInterface {
   /**
    * {@inheritdoc}
    */
-  public function execute($args = array(), $options = array()) {
+  public function execute($args = [], $options = []) {
     try {
       $return = parent::execute($args, $options);
     }
@@ -103,7 +103,7 @@ class Statement extends StatementPrefetch implements StatementInterface {
     // In some weird cases, SQLite will prefix some column names by the name
     // of the table. We post-process the data, by renaming the column names
     // using the same convention as MySQL and PostgreSQL.
-    $rename_columns = array();
+    $rename_columns = [];
     foreach ($this->columnNames as $k => $column) {
       // In some SQLite versions, SELECT DISTINCT(field) will return "(field)"
       // instead of "field".
diff --git a/web/core/lib/Drupal/Core/Database/Install/Tasks.php b/web/core/lib/Drupal/Core/Database/Install/Tasks.php
index 281961549..a2ea41b0d 100644
--- a/web/core/lib/Drupal/Core/Database/Install/Tasks.php
+++ b/web/core/lib/Drupal/Core/Database/Install/Tasks.php
@@ -26,58 +26,58 @@ abstract class Tasks {
    * Each value of the tasks array is an associative array defining the function
    * to call (optional) and any arguments to be passed to the function.
    */
-  protected $tasks = array(
-    array(
+  protected $tasks = [
+    [
       'function'    => 'checkEngineVersion',
-      'arguments'   => array(),
-    ),
-    array(
-      'arguments'   => array(
+      'arguments'   => [],
+    ],
+    [
+      'arguments'   => [
         'CREATE TABLE {drupal_install_test} (id int NULL)',
         'Drupal can use CREATE TABLE database commands.',
         'Failed to <strong>CREATE</strong> a test table on your database server with the command %query. The server reports the following message: %error.<p>Are you sure the configured username has the necessary permissions to create tables in the database?</p>',
         TRUE,
-      ),
-    ),
-    array(
-      'arguments'   => array(
+      ],
+    ],
+    [
+      'arguments'   => [
         'INSERT INTO {drupal_install_test} (id) VALUES (1)',
         'Drupal can use INSERT database commands.',
         'Failed to <strong>INSERT</strong> a value into a test table on your database server. We tried inserting a value with the command %query and the server reported the following error: %error.',
-      ),
-    ),
-    array(
-      'arguments'   => array(
+      ],
+    ],
+    [
+      'arguments'   => [
         'UPDATE {drupal_install_test} SET id = 2',
         'Drupal can use UPDATE database commands.',
         'Failed to <strong>UPDATE</strong> a value in a test table on your database server. We tried updating a value with the command %query and the server reported the following error: %error.',
-      ),
-    ),
-    array(
-      'arguments'   => array(
+      ],
+    ],
+    [
+      'arguments'   => [
         'DELETE FROM {drupal_install_test}',
         'Drupal can use DELETE database commands.',
         'Failed to <strong>DELETE</strong> a value from a test table on your database server. We tried deleting a value with the command %query and the server reported the following error: %error.',
-      ),
-    ),
-    array(
-      'arguments'   => array(
+      ],
+    ],
+    [
+      'arguments'   => [
         'DROP TABLE {drupal_install_test}',
         'Drupal can use DROP TABLE database commands.',
         'Failed to <strong>DROP</strong> a test table from your database server. We tried dropping a table with the command %query and the server reported the following error %error.',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
   /**
    * Results from tasks.
    *
    * @var array
    */
-  protected $results = array(
-    'fail' => array(),
-    'pass' => array(),
-  );
+  protected $results = [
+    'fail' => [],
+    'pass' => [],
+  ];
 
   /**
    * Ensure the PDO driver is supported by the version of PHP in use.
@@ -138,12 +138,12 @@ abstract class Tasks {
         }
         if (method_exists($this, $task['function'])) {
           // Returning false is fatal. No other tasks can run.
-          if (FALSE === call_user_func_array(array($this, $task['function']), $task['arguments'])) {
+          if (FALSE === call_user_func_array([$this, $task['function']], $task['arguments'])) {
             break;
           }
         }
         else {
-          $this->fail(t("Failed to run all tasks against the database server. The task %task wasn't found.", array('%task' => $task['function'])));
+          $this->fail(t("Failed to run all tasks against the database server. The task %task wasn't found.", ['%task' => $task['function']]));
         }
       }
     }
@@ -162,7 +162,7 @@ abstract class Tasks {
       $this->pass('Drupal can CONNECT to the database ok.');
     }
     catch (\Exception $e) {
-      $this->fail(t('Failed to connect to your database server. The server reports the following message: %error.<ul><li>Is the database server running?</li><li>Does the database exist, and have you entered the correct database name?</li><li>Have you entered the correct username and password?</li><li>Have you entered the correct database hostname?</li></ul>', array('%error' => $e->getMessage())));
+      $this->fail(t('Failed to connect to your database server. The server reports the following message: %error.<ul><li>Is the database server running?</li><li>Does the database exist, and have you entered the correct database name?</li><li>Have you entered the correct username and password?</li><li>Have you entered the correct database hostname?</li></ul>', ['%error' => $e->getMessage()]));
       return FALSE;
     }
     return TRUE;
@@ -177,7 +177,7 @@ abstract class Tasks {
       $this->pass(t($pass));
     }
     catch (\Exception $e) {
-      $this->fail(t($fail, array('%query' => $query, '%error' => $e->getMessage(), '%name' => $this->name())));
+      $this->fail(t($fail, ['%query' => $query, '%error' => $e->getMessage(), '%name' => $this->name()]));
       return !$fatal;
     }
   }
@@ -188,7 +188,7 @@ abstract class Tasks {
   protected function checkEngineVersion() {
     // Ensure that the database server has the right version.
     if ($this->minimumVersion() && version_compare(Database::getConnection()->version(), $this->minimumVersion(), '<')) {
-      $this->fail(t("The database server version %version is less than the minimum required version %minimum_version.", array('%version' => Database::getConnection()->version(), '%minimum_version' => $this->minimumVersion())));
+      $this->fail(t("The database server version %version is less than the minimum required version %minimum_version.", ['%version' => Database::getConnection()->version(), '%minimum_version' => $this->minimumVersion()]));
     }
   }
 
@@ -202,58 +202,58 @@ abstract class Tasks {
    *   The options form array.
    */
   public function getFormOptions(array $database) {
-    $form['database'] = array(
+    $form['database'] = [
       '#type' => 'textfield',
       '#title' => t('Database name'),
       '#default_value' => empty($database['database']) ? '' : $database['database'],
       '#size' => 45,
       '#required' => TRUE,
-      '#states' => array(
-        'required' => array(
-          ':input[name=driver]' => array('value' => $this->pdoDriver),
-        ),
-      ),
-    );
+      '#states' => [
+        'required' => [
+          ':input[name=driver]' => ['value' => $this->pdoDriver],
+        ],
+      ],
+    ];
 
-    $form['username'] = array(
+    $form['username'] = [
       '#type' => 'textfield',
       '#title' => t('Database username'),
       '#default_value' => empty($database['username']) ? '' : $database['username'],
       '#size' => 45,
       '#required' => TRUE,
-      '#states' => array(
-        'required' => array(
-          ':input[name=driver]' => array('value' => $this->pdoDriver),
-        ),
-      ),
-    );
+      '#states' => [
+        'required' => [
+          ':input[name=driver]' => ['value' => $this->pdoDriver],
+        ],
+      ],
+    ];
 
-    $form['password'] = array(
+    $form['password'] = [
       '#type' => 'password',
       '#title' => t('Database password'),
       '#default_value' => empty($database['password']) ? '' : $database['password'],
       '#required' => FALSE,
       '#size' => 45,
-    );
+    ];
 
-    $form['advanced_options'] = array(
+    $form['advanced_options'] = [
       '#type' => 'details',
       '#title' => t('Advanced options'),
       '#weight' => 10,
-    );
+    ];
 
     $profile = drupal_get_profile();
     $db_prefix = ($profile == 'standard') ? 'drupal_' : $profile . '_';
-    $form['advanced_options']['prefix'] = array(
+    $form['advanced_options']['prefix'] = [
       '#type' => 'textfield',
       '#title' => t('Table name prefix'),
       '#default_value' => empty($database['prefix']) ? '' : $database['prefix'],
       '#size' => 45,
-      '#description' => t('If more than one application will be sharing this database, a unique table name prefix – such as %prefix – will prevent collisions.', array('%prefix' => $db_prefix)),
+      '#description' => t('If more than one application will be sharing this database, a unique table name prefix – such as %prefix – will prevent collisions.', ['%prefix' => $db_prefix]),
       '#weight' => 10,
-    );
+    ];
 
-    $form['advanced_options']['host'] = array(
+    $form['advanced_options']['host'] = [
       '#type' => 'textfield',
       '#title' => t('Host'),
       '#default_value' => empty($database['host']) ? 'localhost' : $database['host'],
@@ -261,15 +261,15 @@ abstract class Tasks {
       // Hostnames can be 255 characters long.
       '#maxlength' => 255,
       '#required' => TRUE,
-    );
+    ];
 
-    $form['advanced_options']['port'] = array(
+    $form['advanced_options']['port'] = [
       '#type' => 'number',
       '#title' => t('Port number'),
       '#default_value' => empty($database['port']) ? '' : $database['port'],
       '#min' => 0,
       '#max' => 65535,
-    );
+    ];
 
     return $form;
   }
@@ -287,11 +287,11 @@ abstract class Tasks {
    *   An array of driver configuration errors, keyed by form element name.
    */
   public function validateDatabaseSettings($database) {
-    $errors = array();
+    $errors = [];
 
     // Verify the table prefix.
     if (!empty($database['prefix']) && is_string($database['prefix']) && !preg_match('/^[A-Za-z0-9_.]+$/', $database['prefix'])) {
-      $errors[$database['driver'] . '][prefix'] = t('The database table prefix you have entered, %prefix, is invalid. The table prefix can only contain alphanumeric characters, periods, or underscores.', array('%prefix' => $database['prefix']));
+      $errors[$database['driver'] . '][prefix'] = t('The database table prefix you have entered, %prefix, is invalid. The table prefix can only contain alphanumeric characters, periods, or underscores.', ['%prefix' => $database['prefix']]);
     }
 
     return $errors;
diff --git a/web/core/lib/Drupal/Core/Database/Log.php b/web/core/lib/Drupal/Core/Database/Log.php
index 76c39db29..bf142c2cd 100644
--- a/web/core/lib/Drupal/Core/Database/Log.php
+++ b/web/core/lib/Drupal/Core/Database/Log.php
@@ -29,7 +29,7 @@ class Log {
    *
    * @var array
    */
-  protected $queryLog = array();
+  protected $queryLog = [];
 
   /**
    * The connection key for which this object is logging.
@@ -86,7 +86,7 @@ class Log {
    *   The logging key to empty.
    */
   public function clear($logging_key) {
-    $this->queryLog[$logging_key] = array();
+    $this->queryLog[$logging_key] = [];
   }
 
   /**
@@ -111,13 +111,13 @@ class Log {
    */
   public function log(StatementInterface $statement, $args, $time) {
     foreach (array_keys($this->queryLog) as $key) {
-      $this->queryLog[$key][] = array(
+      $this->queryLog[$key][] = [
         'query' => $statement->getQueryString(),
         'args' => $args,
         'target' => $statement->dbh->getTarget(),
         'caller' => $this->findCaller(),
         'time' => $time,
-      );
+      ];
     }
   }
 
@@ -151,15 +151,15 @@ class Log {
         $stack[$i]['class'] = '';
       }
       if (strpos($stack[$i]['class'], __NAMESPACE__) === FALSE && strpos($stack[$i + 1]['function'], 'db_') === FALSE && !empty($stack[$i]['file'])) {
-        $stack[$i] += array('file' => '?', 'line' => '?', 'args' => array());
-        return array(
+        $stack[$i] += ['file' => '?', 'line' => '?', 'args' => []];
+        return [
           'file' => $stack[$i]['file'],
           'line' => $stack[$i]['line'],
           'function' => $stack[$i + 1]['function'],
           'class' => isset($stack[$i + 1]['class']) ? $stack[$i + 1]['class'] : NULL,
           'type' => isset($stack[$i + 1]['type']) ? $stack[$i + 1]['type'] : NULL,
           'args' => $stack[$i + 1]['args'],
-        );
+        ];
       }
     }
   }
diff --git a/web/core/lib/Drupal/Core/Database/Query/Condition.php b/web/core/lib/Drupal/Core/Database/Query/Condition.php
index ad7397ef8..51693576e 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Condition.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Condition.php
@@ -10,19 +10,44 @@ use Drupal\Core\Database\InvalidQueryException;
  */
 class Condition implements ConditionInterface, \Countable {
 
+  /**
+   * Provides a map of condition operators to condition operator options.
+   */
+  protected static $conditionOperatorMap = [
+    'BETWEEN' => ['delimiter' => ' AND '],
+    'NOT BETWEEN' => ['delimiter' => ' AND '],
+    'IN' => ['delimiter' => ', ', 'prefix' => '(', 'postfix' => ')'],
+    'NOT IN' => ['delimiter' => ', ', 'prefix' => '(', 'postfix' => ')'],
+    'IS NULL' => ['use_value' => FALSE],
+    'IS NOT NULL' => ['use_value' => FALSE],
+    // Use backslash for escaping wildcard characters.
+    'LIKE' => ['postfix' => " ESCAPE '\\\\'"],
+    'NOT LIKE' => ['postfix' => " ESCAPE '\\\\'"],
+    // Exists expects an already bracketed subquery as right hand part. Do
+    // not define additional brackets.
+    'EXISTS' => [],
+    'NOT EXISTS' => [],
+    // These ones are here for performance reasons.
+    '=' => [],
+    '<' => [],
+    '>' => [],
+    '>=' => [],
+    '<=' => [],
+  ];
+
   /**
    * Array of conditions.
    *
    * @var array
    */
-  protected $conditions = array();
+  protected $conditions = [];
 
   /**
    * Array of arguments.
    *
    * @var array
    */
-  protected $arguments = array();
+  protected $arguments = [];
 
   /**
    * Whether the conditions have been changed.
@@ -39,6 +64,13 @@ class Condition implements ConditionInterface, \Countable {
    */
   protected $queryPlaceholderIdentifier;
 
+  /**
+   * Contains the string version of the Condition.
+   *
+   * @var string
+   */
+  protected $stringVersion;
+
   /**
    * Constructs a Condition object.
    *
@@ -71,11 +103,11 @@ class Condition implements ConditionInterface, \Countable {
       throw new InvalidQueryException(sprintf("Query condition '%s %s ()' cannot be empty.", $field, $operator));
     }
 
-    $this->conditions[] = array(
+    $this->conditions[] = [
       'field' => $field,
       'value' => $value,
       'operator' => $operator,
-    );
+    ];
 
     $this->changed = TRUE;
 
@@ -85,12 +117,12 @@ class Condition implements ConditionInterface, \Countable {
   /**
    * {@inheritdoc}
    */
-  public function where($snippet, $args = array()) {
-    $this->conditions[] = array(
+  public function where($snippet, $args = []) {
+    $this->conditions[] = [
       'field' => $snippet,
       'value' => $args,
       'operator' => NULL,
-    );
+    ];
     $this->changed = TRUE;
 
     return $this;
@@ -151,93 +183,134 @@ class Condition implements ConditionInterface, \Countable {
     if ($this->changed || isset($this->queryPlaceholderIdentifier) && ($this->queryPlaceholderIdentifier != $queryPlaceholder->uniqueIdentifier())) {
       $this->queryPlaceholderIdentifier = $queryPlaceholder->uniqueIdentifier();
 
-      $condition_fragments = array();
-      $arguments = array();
+      $condition_fragments = [];
+      $arguments = [];
 
       $conditions = $this->conditions;
       $conjunction = $conditions['#conjunction'];
       unset($conditions['#conjunction']);
       foreach ($conditions as $condition) {
-        if (empty($condition['operator'])) {
-          // This condition is a literal string, so let it through as is.
-          $condition_fragments[] = ' (' . $condition['field'] . ') ';
+        // Process field.
+        if ($condition['field'] instanceof ConditionInterface) {
+          // Left hand part is a structured condition or a subquery. Compile,
+          // put brackets around it (if it is a query), and collect any
+          // arguments.
+          $condition['field']->compile($connection, $queryPlaceholder);
+          $field_fragment = (string) $condition['field'];
+          if ($condition['field'] instanceof SelectInterface) {
+            $field_fragment = '(' . $field_fragment . ')';
+          }
+          $arguments += $condition['field']->arguments();
+          // If the operator and value were not passed in to the
+          // @see ConditionInterface::condition() method (and thus have the
+          // default value as defined over there) it is assumed to be a valid
+          // condition on its own: ignore the operator and value parts.
+          $ignore_operator = $condition['operator'] === '=' && $condition['value'] === NULL;
+        }
+        elseif (!isset($condition['operator'])) {
+          // Left hand part is a literal string added with the
+          // @see ConditionInterface::where() method. Put brackets around
+          // the snippet and collect the arguments from the value part.
+          // Also ignore the operator and value parts.
+          $field_fragment = '(' . $condition['field'] . ')';
           $arguments += $condition['value'];
+          $ignore_operator = TRUE;
         }
         else {
-          // It's a structured condition, so parse it out accordingly.
-          // Note that $condition['field'] will only be an object for a dependent
-          // DatabaseCondition object, not for a dependent subquery.
-          if ($condition['field'] instanceof ConditionInterface) {
-            // Compile the sub-condition recursively and add it to the list.
-            $condition['field']->compile($connection, $queryPlaceholder);
-            $condition_fragments[] = '(' . (string) $condition['field'] . ')';
-            $arguments += $condition['field']->arguments();
-          }
-          else {
-            // For simplicity, we treat all operators as the same data structure.
-            // In the typical degenerate case, this won't get changed.
-            $operator_defaults = array(
-              'prefix' => '',
-              'postfix' => '',
-              'delimiter' => '',
-              'operator' => $condition['operator'],
-              'use_value' => TRUE,
-            );
-            // Remove potentially dangerous characters.
-            // If something passed in an invalid character stop early, so we
-            // don't rely on a broken SQL statement when we would just replace
-            // those characters.
-            if (stripos($condition['operator'], 'UNION') !== FALSE || strpbrk($condition['operator'], '[-\'"();') !== FALSE) {
-              $this->changed = TRUE;
-              $this->arguments = [];
-              // Provide a string which will result into an empty query result.
-              $this->stringVersion = '( AND 1 = 0 )';
-
-              // Conceptually throwing an exception caused by user input is bad
-              // as you result into a WSOD, which depending on your webserver
-              // configuration can result into the assumption that your site is
-              // broken.
-              // On top of that the database API relies on __toString() which
-              // does not allow to throw exceptions.
-              trigger_error('Invalid characters in query operator: ' . $condition['operator'], E_USER_ERROR);
-              return;
-            }
-            $operator = $connection->mapConditionOperator($condition['operator']);
-            if (!isset($operator)) {
-              $operator = $this->mapConditionOperator($condition['operator']);
-            }
-            $operator += $operator_defaults;
-
-            $placeholders = array();
-            if ($condition['value'] instanceof SelectInterface) {
-              $condition['value']->compile($connection, $queryPlaceholder);
-              $placeholders[] = (string) $condition['value'];
-              $arguments += $condition['value']->arguments();
-              // Subqueries are the actual value of the operator, we don't
-              // need to add another below.
-              $operator['use_value'] = FALSE;
-            }
-            // We assume that if there is a delimiter, then the value is an
-            // array. If not, it is a scalar. For simplicity, we first convert
-            // up to an array so that we can build the placeholders in the same way.
-            elseif (!$operator['delimiter'] && !is_array($condition['value'])) {
-              $condition['value'] = array($condition['value']);
-            }
-            if ($operator['use_value']) {
-              foreach ($condition['value'] as $value) {
-                $placeholder = ':db_condition_placeholder_' . $queryPlaceholder->nextPlaceholder();
-                $arguments[$placeholder] = $value;
-                $placeholders[] = $placeholder;
-              }
-            }
-            $condition_fragments[] = ' (' . $connection->escapeField($condition['field']) . ' ' . $operator['operator'] . ' ' . $operator['prefix'] . implode($operator['delimiter'], $placeholders) . $operator['postfix'] . ') ';
-          }
+          // Left hand part is a normal field. Add it as is.
+          $field_fragment = $connection->escapeField($condition['field']);
+          $ignore_operator = FALSE;
         }
+
+        // Process operator.
+        if ($ignore_operator) {
+          $operator = ['operator' => '', 'use_value' => FALSE];
+        }
+        else {
+          // Remove potentially dangerous characters.
+          // If something passed in an invalid character stop early, so we
+          // don't rely on a broken SQL statement when we would just replace
+          // those characters.
+          if (stripos($condition['operator'], 'UNION') !== FALSE || strpbrk($condition['operator'], '[-\'"();') !== FALSE) {
+            $this->changed = TRUE;
+            $this->arguments = [];
+            // Provide a string which will result into an empty query result.
+            $this->stringVersion = '( AND 1 = 0 )';
+
+            // Conceptually throwing an exception caused by user input is bad
+            // as you result into a WSOD, which depending on your webserver
+            // configuration can result into the assumption that your site is
+            // broken.
+            // On top of that the database API relies on __toString() which
+            // does not allow to throw exceptions.
+            trigger_error('Invalid characters in query operator: ' . $condition['operator'], E_USER_ERROR);
+            return;
+          }
+
+          // For simplicity, we convert all operators to a data structure to
+          // allow to specify a prefix, a delimiter and such. Find the
+          // associated data structure by first doing a database specific
+          // lookup, followed by a specification according to the SQL standard.
+          $operator = $connection->mapConditionOperator($condition['operator']);
+          if (!isset($operator)) {
+            $operator = $this->mapConditionOperator($condition['operator']);
+          }
+          $operator += ['operator' => $condition['operator']];
+        }
+        // Add defaults.
+        $operator += [
+          'prefix' => '',
+          'postfix' => '',
+          'delimiter' => '',
+          'use_value' => TRUE,
+        ];
+        $operator_fragment = $operator['operator'];
+
+        // Process value.
+        $value_fragment = '';
+        if ($operator['use_value']) {
+          // For simplicity, we first convert to an array, so that we can handle
+          // the single and multi value cases the same.
+          if (!is_array($condition['value'])) {
+            if ($condition['value'] instanceof SelectInterface && ($operator['operator'] === 'IN' || $operator['operator'] === 'NOT IN')) {
+              // Special case: IN is followed by a single select query instead
+              // of a set of values: unset prefix and postfix to prevent double
+              // brackets.
+              $operator['prefix'] = '';
+              $operator['postfix'] = '';
+            }
+            $condition['value'] = [$condition['value']];
+          }
+          // Process all individual values.
+          $value_fragment = [];
+          foreach ($condition['value'] as $value) {
+            if ($value instanceof SelectInterface) {
+              // Right hand part is a subquery. Compile, put brackets around it
+              // and collect any arguments.
+              $value->compile($connection, $queryPlaceholder);
+              $value_fragment[] = '(' . (string) $value . ')';
+              $arguments += $value->arguments();
+            }
+            else {
+              // Right hand part is a normal value. Replace the value with a
+              // placeholder and add the value as an argument.
+              $placeholder = ':db_condition_placeholder_' . $queryPlaceholder->nextPlaceholder();
+              $value_fragment[] = $placeholder;
+              $arguments[$placeholder] = $value;
+            }
+          }
+          $value_fragment = $operator['prefix'] . implode($operator['delimiter'], $value_fragment) . $operator['postfix'];
+        }
+
+        // Concatenate the left hand part, operator and right hand part.
+        $condition_fragments[] = trim(implode(' ', [$field_fragment, $operator_fragment, $value_fragment]));
       }
 
-      $this->changed = FALSE;
-      $this->stringVersion = implode($conjunction, $condition_fragments);
+      // Concatenate all conditions using the conjunction and brackets around
+      // the individual conditions to assure the proper evaluation order.
+      $this->stringVersion = count($condition_fragments) > 1 ? '(' . implode(") $conjunction (", $condition_fragments) . ')' : implode($condition_fragments);
       $this->arguments = $arguments;
+      $this->changed = FALSE;
     }
   }
 
@@ -268,7 +341,7 @@ class Condition implements ConditionInterface, \Countable {
    * Only copies fields that implement Drupal\Core\Database\Query\ConditionInterface. Also sets
    * $this->changed to TRUE.
    */
-  function __clone() {
+  public function __clone() {
     $this->changed = TRUE;
     foreach ($this->conditions as $key => $condition) {
       if ($key !== '#conjunction') {
@@ -289,7 +362,7 @@ class Condition implements ConditionInterface, \Countable {
    * the value data they pass in is not a simple value. This is a simple
    * overridable lookup function.
    *
-   * @param $operator
+   * @param string $operator
    *   The condition operator, such as "IN", "BETWEEN", etc. Case-sensitive.
    *
    * @return array
@@ -297,37 +370,17 @@ class Condition implements ConditionInterface, \Countable {
    *   array if there are no extra handling directives.
    */
   protected function mapConditionOperator($operator) {
-    // $specials does not use drupal_static as its value never changes.
-    static $specials = array(
-      'BETWEEN' => array('delimiter' => ' AND '),
-      'NOT BETWEEN' => array('delimiter' => ' AND '),
-      'IN' => array('delimiter' => ', ', 'prefix' => ' (', 'postfix' => ')'),
-      'NOT IN' => array('delimiter' => ', ', 'prefix' => ' (', 'postfix' => ')'),
-      'EXISTS' => array('prefix' => ' (', 'postfix' => ')'),
-      'NOT EXISTS' => array('prefix' => ' (', 'postfix' => ')'),
-      'IS NULL' => array('use_value' => FALSE),
-      'IS NOT NULL' => array('use_value' => FALSE),
-      // Use backslash for escaping wildcard characters.
-      'LIKE' => array('postfix' => " ESCAPE '\\\\'"),
-      'NOT LIKE' => array('postfix' => " ESCAPE '\\\\'"),
-      // These ones are here for performance reasons.
-      '=' => array(),
-      '<' => array(),
-      '>' => array(),
-      '>=' => array(),
-      '<=' => array(),
-    );
-    if (isset($specials[$operator])) {
-      $return = $specials[$operator];
+    if (isset(static::$conditionOperatorMap[$operator])) {
+      $return = static::$conditionOperatorMap[$operator];
     }
     else {
       // We need to upper case because PHP index matches are case sensitive but
       // do not need the more expensive Unicode::strtoupper() because SQL statements are ASCII.
       $operator = strtoupper($operator);
-      $return = isset($specials[$operator]) ? $specials[$operator] : array();
+      $return = isset(static::$conditionOperatorMap[$operator]) ? static::$conditionOperatorMap[$operator] : [];
     }
 
-    $return += array('operator' => $operator);
+    $return += ['operator' => $operator];
 
     return $return;
   }
diff --git a/web/core/lib/Drupal/Core/Database/Query/ConditionInterface.php b/web/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
index bd0b52bd2..aa5090a89 100644
--- a/web/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
+++ b/web/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
@@ -12,13 +12,21 @@ interface ConditionInterface {
   /**
    * Helper function: builds the most common conditional clauses.
    *
-   * This method can take a variable number of parameters. If called with two
-   * parameters, they are taken as $field and $value with $operator having a
-   * value of =.
+   * This method takes 1 to 3 parameters.
+   *
+   * If called with 1 parameter, it should be a ConditionInterface that in
+   * itself forms a valid where clause. Use e.g. to build clauses with nested
+   * AND's and OR's.
+   *
+   * If called with 2 parameters, they are taken as $field and $value with
+   * $operator having a value of =.
    *
    * Do not use this method to test for NULL values. Instead, use
    * QueryConditionInterface::isNull() or QueryConditionInterface::isNotNull().
    *
+   * To improve readability, the operators EXISTS and NOT EXISTS have their own
+   * utility method defined.
+   *
    * Drupal considers LIKE case insensitive and the following is often used
    * to tell the database that case insensitive equivalence is desired:
    * @code
@@ -32,44 +40,59 @@ interface ConditionInterface {
    * be case sensitive and when a case insensitive collation is used, the =
    * operator will also be case insensitive.
    *
-   * @param $field
-   *   The name of the field to check. If you would like to add a more complex
-   *   condition involving operators or functions, use where().
-   * @param $value
-   *   The value to test the field against. In most cases, this is a scalar.
-   *   For more complex options, it is an array. The meaning of each element in
-   *   the array is dependent on the $operator.
-   * @param $operator
-   *   The comparison operator, such as =, <, or >=. It also accepts more
-   *   complex options such as IN, LIKE, LIKE BINARY, or BETWEEN. Defaults to =.
+   * @param string|\Drupal\Core\Database\Query\ConditionInterface $field
+   *   The name of the field to check. This can also be QueryConditionInterface
+   *   in itself. Use where(), if you would like to add a more complex condition
+   *   involving operators or functions, or an already compiled condition.
+   * @param string|array|\Drupal\Core\Database\Query\SelectInterface|null $value
+   *   The value to test the field against. In most cases, and depending on the
+   *   operator, this will be a scalar or an array. As SQL accepts select
+   *   queries on any place where a scalar value or set is expected, $value may
+   *   also be a(n array of) SelectInterface(s). If $operator is a unary
+   *   operator, e.g. IS NULL, $value will be ignored and should be null. If
+   *   the operator requires a subquery, e.g. EXISTS, the $field will be ignored
+   *   and $value should be a SelectInterface object.
+   * @param string|null $operator
+   *   The operator to use. Supported for all supported databases are at least:
+   *   - The comparison operators =, <>, <, <=, >, >=.
+   *   - The operators (NOT) BETWEEN, (NOT) IN, (NOT) EXISTS, (NOT) LIKE.
+   *   Other operators (e.g. LIKE, BINARY) may or may not work. Defaults to =.
    *
    * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    *
+   * @throws \Drupal\Core\Database\InvalidQueryException
+   *   If passed invalid arguments, such as an empty array as $value.
+   *
    * @see \Drupal\Core\Database\Query\ConditionInterface::isNull()
    * @see \Drupal\Core\Database\Query\ConditionInterface::isNotNull()
+   * @see \Drupal\Core\Database\Query\ConditionInterface::exists()
+   * @see \Drupal\Core\Database\Query\ConditionInterface::notExist()
+   * @see \Drupal\Core\Database\Query\ConditionInterface::where()
    */
   public function condition($field, $value = NULL, $operator = '=');
 
   /**
    * Adds an arbitrary WHERE clause to the query.
    *
-   * @param $snippet
+   * @param string $snippet
    *   A portion of a WHERE clause as a prepared statement. It must use named
-   *   placeholders, not ? placeholders.
-   * @param $args
-   *   An associative array of arguments.
+   *   placeholders, not ? placeholders. The caller is responsible for providing
+   *   unique placeholders that do not interfere with the placeholders generated
+   *   by this QueryConditionInterface object.
+   * @param array $args
+   *   An associative array of arguments keyed by the named placeholders.
    *
    * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    */
-  public function where($snippet, $args = array());
+  public function where($snippet, $args = []);
 
   /**
    * Sets a condition that the specified field be NULL.
    *
-   * @param $field
-   *   The name of the field to check.
+   * @param string|\Drupal\Core\Database\Query\SelectInterface $field
+   *   The name of the field or a subquery to check.
    *
    * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
@@ -79,8 +102,8 @@ interface ConditionInterface {
   /**
    * Sets a condition that the specified field be NOT NULL.
    *
-   * @param $field
-   *   The name of the field to check.
+   * @param string|\Drupal\Core\Database\Query\SelectInterface $field
+   *   The name of the field or a subquery to check.
    *
    * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
@@ -110,7 +133,7 @@ interface ConditionInterface {
   public function notExists(SelectInterface $select);
 
   /**
-   * Gets a complete list of all conditions in this conditional clause.
+   * Gets the, possibly nested, list of conditions in this conditional clause.
    *
    * This method returns by reference. That allows alter hooks to access the
    * data structure directly and manipulate it before it gets compiled.
@@ -131,6 +154,9 @@ interface ConditionInterface {
    *
    * There will also be a single array entry of #conjunction, which is the
    * conjunction that will be applied to the array, such as AND.
+   *
+   * @return array
+   *   The, possibly nested, list of all conditions (by reference).
    */
   public function &conditions();
 
diff --git a/web/core/lib/Drupal/Core/Database/Query/Delete.php b/web/core/lib/Drupal/Core/Database/Query/Delete.php
index 65f96c947..def88385e 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Delete.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Delete.php
@@ -31,7 +31,7 @@ class Delete extends Query implements ConditionInterface {
    * @param array $options
    *   Array of database options.
    */
-  public function __construct(Connection $connection, $table, array $options = array()) {
+  public function __construct(Connection $connection, $table, array $options = []) {
     $options['return'] = Database::RETURN_AFFECTED;
     parent::__construct($connection, $options);
     $this->table = $table;
@@ -46,7 +46,7 @@ class Delete extends Query implements ConditionInterface {
    *   The number of rows affected by the delete query.
    */
   public function execute() {
-    $values = array();
+    $values = [];
     if (count($this->condition)) {
       $this->condition->compile($this->connection, $this);
       $values = $this->condition->arguments();
diff --git a/web/core/lib/Drupal/Core/Database/Query/Insert.php b/web/core/lib/Drupal/Core/Database/Query/Insert.php
index a0fa59913..3af2d2ac6 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Insert.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Insert.php
@@ -30,7 +30,7 @@ class Insert extends Query implements \Countable {
    * @param array $options
    *   Array of database options.
    */
-  public function __construct($connection, $table, array $options = array()) {
+  public function __construct($connection, $table, array $options = []) {
     if (!isset($options['return'])) {
       $options['return'] = Database::RETURN_INSERT_ID;
     }
@@ -91,13 +91,13 @@ class Insert extends Query implements \Countable {
     }
     catch (\Exception $e) {
       // One of the INSERTs failed, rollback the whole batch.
-      $transaction->rollback();
+      $transaction->rollBack();
       // Rethrow the exception for the calling code.
       throw $e;
     }
 
     // Re-initialize the values array so that we can re-use this query.
-    $this->insertValues = array();
+    $this->insertValues = [];
 
     // Transaction commits here where $transaction looses scope.
 
@@ -124,7 +124,7 @@ class Insert extends Query implements \Countable {
     // For simplicity, we will use the $placeholders array to inject
     // default keywords even though they are not, strictly speaking,
     // placeholders for prepared statements.
-    $placeholders = array();
+    $placeholders = [];
     $placeholders = array_pad($placeholders, count($this->defaultFields), 'default');
     $placeholders = array_pad($placeholders, count($this->insertFields), '?');
 
diff --git a/web/core/lib/Drupal/Core/Database/Query/InsertTrait.php b/web/core/lib/Drupal/Core/Database/Query/InsertTrait.php
index a97c132b8..f291da1a8 100644
--- a/web/core/lib/Drupal/Core/Database/Query/InsertTrait.php
+++ b/web/core/lib/Drupal/Core/Database/Query/InsertTrait.php
@@ -21,14 +21,14 @@ trait InsertTrait {
    *
    * @var array
    */
-  protected $insertFields = array();
+  protected $insertFields = [];
 
   /**
    * An array of fields that should be set to their database-defined defaults.
    *
    * @var array
    */
-  protected $defaultFields = array();
+  protected $defaultFields = [];
 
   /**
    * A nested array of values to insert.
@@ -45,7 +45,7 @@ trait InsertTrait {
    *
    * @var array
    */
-  protected $insertValues = array();
+  protected $insertValues = [];
 
   /**
    * Adds a set of field->value pairs to be inserted.
@@ -67,7 +67,7 @@ trait InsertTrait {
    * @return $this
    *   The called object.
    */
-  public function fields(array $fields, array $values = array()) {
+  public function fields(array $fields, array $values = []) {
     if (empty($this->insertFields)) {
       if (empty($values)) {
         if (!is_numeric(key($fields))) {
@@ -150,10 +150,10 @@ trait InsertTrait {
    */
   protected function getInsertPlaceholderFragment(array $nested_insert_values, array $default_fields) {
     $max_placeholder = 0;
-    $values = array();
+    $values = [];
     if ($nested_insert_values) {
       foreach ($nested_insert_values as $insert_values) {
-        $placeholders = array();
+        $placeholders = [];
 
         // Default fields aren't really placeholders, but this is the most convenient
         // way to handle them.
diff --git a/web/core/lib/Drupal/Core/Database/Query/Merge.php b/web/core/lib/Drupal/Core/Database/Query/Merge.php
index 8bd02fab9..43188ec8c 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Merge.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Merge.php
@@ -74,7 +74,7 @@ class Merge extends Query implements ConditionInterface {
    *
    * @var array
    */
-  protected $insertFields = array();
+  protected $insertFields = [];
 
   /**
    * An array of fields which should be set to their database-defined defaults.
@@ -83,21 +83,21 @@ class Merge extends Query implements ConditionInterface {
    *
    * @var array
    */
-  protected $defaultFields = array();
+  protected $defaultFields = [];
 
   /**
    * An array of values to be inserted.
    *
    * @var string
    */
-  protected $insertValues = array();
+  protected $insertValues = [];
 
   /**
    * An array of fields that will be updated.
    *
    * @var array
    */
-  protected $updateFields = array();
+  protected $updateFields = [];
 
   /**
    * Array of fields to update to an expression in case of a duplicate record.
@@ -112,7 +112,7 @@ class Merge extends Query implements ConditionInterface {
    *
    * @var array
    */
-  protected $expressionFields = array();
+  protected $expressionFields = [];
 
   /**
    * Flag indicating whether an UPDATE is necessary.
@@ -131,7 +131,7 @@ class Merge extends Query implements ConditionInterface {
    * @param array $options
    *   Array of database options.
    */
-  public function __construct(Connection $connection, $table, array $options = array()) {
+  public function __construct(Connection $connection, $table, array $options = []) {
     $options['return'] = Database::RETURN_AFFECTED;
     parent::__construct($connection, $options);
     $this->table = $table;
@@ -190,10 +190,10 @@ class Merge extends Query implements ConditionInterface {
    *   The called object.
    */
   public function expression($field, $expression, array $arguments = NULL) {
-    $this->expressionFields[$field] = array(
+    $this->expressionFields[$field] = [
       'expression' => $expression,
       'arguments' => $arguments,
-    );
+    ];
     $this->needsUpdate = TRUE;
     return $this;
   }
@@ -214,7 +214,7 @@ class Merge extends Query implements ConditionInterface {
    * @return \Drupal\Core\Database\Query\Merge
    *   The called object.
    */
-  public function insertFields(array $fields, array $values = array()) {
+  public function insertFields(array $fields, array $values = []) {
     if ($values) {
       $fields = array_combine($fields, $values);
     }
@@ -267,7 +267,7 @@ class Merge extends Query implements ConditionInterface {
    * @return \Drupal\Core\Database\Query\Merge
    *   The called object.
    */
-  public function fields(array $fields, array $values = array()) {
+  public function fields(array $fields, array $values = []) {
     if ($values) {
       $fields = array_combine($fields, $values);
     }
@@ -300,7 +300,7 @@ class Merge extends Query implements ConditionInterface {
    *
    * @return $this
    */
-  public function keys(array $fields, array $values = array()) {
+  public function keys(array $fields, array $values = []) {
     if ($values) {
       $fields = array_combine($fields, $values);
     }
@@ -329,10 +329,10 @@ class Merge extends Query implements ConditionInterface {
   public function key($field, $value = NULL) {
     // @todo D9: Remove this backwards-compatibility shim.
     if (is_array($field)) {
-      $this->keys($field, isset($value) ? $value : array());
+      $this->keys($field, isset($value) ? $value : []);
     }
     else {
-      $this->keys(array($field => $value));
+      $this->keys([$field => $value]);
     }
     return $this;
   }
@@ -351,9 +351,9 @@ class Merge extends Query implements ConditionInterface {
 
   public function execute() {
     // Default options for merge queries.
-    $this->queryOptions += array(
+    $this->queryOptions += [
       'throw_exception' => TRUE,
-    );
+    ];
 
     try {
       if (!count($this->condition)) {
diff --git a/web/core/lib/Drupal/Core/Database/Query/Query.php b/web/core/lib/Drupal/Core/Database/Query/Query.php
index 6fe3db5b6..94f71a5a4 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Query.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Query.php
@@ -56,7 +56,7 @@ abstract class Query implements PlaceholderInterface {
    *
    * @var array
    */
-  protected $comments = array();
+  protected $comments = [];
 
   /**
    * Constructs a Query object.
diff --git a/web/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php b/web/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php
index bc7ed5a15..44cc2208a 100644
--- a/web/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php
+++ b/web/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php
@@ -77,7 +77,7 @@ trait QueryConditionTrait {
   /**
    * {@inheritdoc}
    */
-  public function where($snippet, $args = array()) {
+  public function where($snippet, $args = []) {
     $this->condition->where($snippet, $args);
     return $this;
   }
diff --git a/web/core/lib/Drupal/Core/Database/Query/Select.php b/web/core/lib/Drupal/Core/Database/Query/Select.php
index 04efcf4ea..b3426e6d4 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Select.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Select.php
@@ -19,14 +19,14 @@ class Select extends Query implements SelectInterface {
    *
    * @var array
    */
-  protected $fields = array();
+  protected $fields = [];
 
   /**
    * The expressions to SELECT as virtual fields.
    *
    * @var array
    */
-  protected $expressions = array();
+  protected $expressions = [];
 
   /**
    * The tables against which to JOIN.
@@ -52,7 +52,7 @@ class Select extends Query implements SelectInterface {
    *
    * @var array
    */
-  protected $tables = array();
+  protected $tables = [];
 
   /**
    * The fields by which to order this query.
@@ -62,14 +62,14 @@ class Select extends Query implements SelectInterface {
    *
    * @var array
    */
-  protected $order = array();
+  protected $order = [];
 
   /**
    * The fields by which to group.
    *
    * @var array
    */
-  protected $group = array();
+  protected $group = [];
 
   /**
    * The conditional object for the HAVING clause.
@@ -103,7 +103,7 @@ class Select extends Query implements SelectInterface {
    *
    * @var array
    */
-  protected $union = array();
+  protected $union = [];
 
   /**
    * Indicates if preExecute() has already been called.
@@ -128,7 +128,7 @@ class Select extends Query implements SelectInterface {
    * @param array $options
    *   Array of query options.
    */
-  public function __construct($table, $alias = NULL, Connection $connection, $options = array()) {
+  public function __construct($table, $alias = NULL, Connection $connection, $options = []) {
     $options['return'] = Database::RETURN_STATEMENT;
     parent::__construct($connection, $options);
     $conjunction = isset($options['conjunction']) ? $options['conjunction'] : 'AND';
@@ -300,7 +300,7 @@ class Select extends Query implements SelectInterface {
   /**
    * {@inheritdoc}
    */
-  public function having($snippet, $args = array()) {
+  public function having($snippet, $args = []) {
     $this->having->where($snippet, $args);
     return $this;
   }
@@ -467,11 +467,11 @@ class Select extends Query implements SelectInterface {
       //   issue.
       // - Emit E_USER_DEPRECATED if term_access is used.
       //   https://www.drupal.org/node/2575081
-      $term_access_tags = array('term_access' => 1, 'taxonomy_term_access' => 1);
+      $term_access_tags = ['term_access' => 1, 'taxonomy_term_access' => 1];
       if (array_intersect_key($this->alterTags, $term_access_tags)) {
         $this->alterTags += $term_access_tags;
       }
-      $hooks = array('query');
+      $hooks = ['query'];
       foreach ($this->alterTags as $tag => $value) {
         $hooks[] = 'query_' . $tag;
       }
@@ -538,11 +538,11 @@ class Select extends Query implements SelectInterface {
     }
     $alias = $alias_candidate;
 
-    $this->fields[$alias] = array(
+    $this->fields[$alias] = [
       'field' => $field,
       'table' => $table_alias,
       'alias' => $alias,
-    );
+    ];
 
     return $alias;
   }
@@ -550,7 +550,7 @@ class Select extends Query implements SelectInterface {
   /**
    * {@inheritdoc}
    */
-  public function fields($table_alias, array $fields = array()) {
+  public function fields($table_alias, array $fields = []) {
     if ($fields) {
       foreach ($fields as $field) {
         // We don't care what alias was assigned.
@@ -568,7 +568,7 @@ class Select extends Query implements SelectInterface {
   /**
    * {@inheritdoc}
    */
-  public function addExpression($expression, $alias = NULL, $arguments = array()) {
+  public function addExpression($expression, $alias = NULL, $arguments = []) {
     if (empty($alias)) {
       $alias = 'expression';
     }
@@ -580,11 +580,11 @@ class Select extends Query implements SelectInterface {
     }
     $alias = $alias_candidate;
 
-    $this->expressions[$alias] = array(
+    $this->expressions[$alias] = [
       'expression' => $expression,
       'alias' => $alias,
       'arguments' => $arguments,
-    );
+    ];
 
     return $alias;
   }
@@ -592,35 +592,35 @@ class Select extends Query implements SelectInterface {
   /**
    * {@inheritdoc}
    */
-  public function join($table, $alias = NULL, $condition = NULL, $arguments = array()) {
+  public function join($table, $alias = NULL, $condition = NULL, $arguments = []) {
     return $this->addJoin('INNER', $table, $alias, $condition, $arguments);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function innerJoin($table, $alias = NULL, $condition = NULL, $arguments = array()) {
+  public function innerJoin($table, $alias = NULL, $condition = NULL, $arguments = []) {
     return $this->addJoin('INNER', $table, $alias, $condition, $arguments);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function leftJoin($table, $alias = NULL, $condition = NULL, $arguments = array()) {
+  public function leftJoin($table, $alias = NULL, $condition = NULL, $arguments = []) {
     return $this->addJoin('LEFT OUTER', $table, $alias, $condition, $arguments);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function rightJoin($table, $alias = NULL, $condition = NULL, $arguments = array()) {
+  public function rightJoin($table, $alias = NULL, $condition = NULL, $arguments = []) {
     return $this->addJoin('RIGHT OUTER', $table, $alias, $condition, $arguments);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function addJoin($type, $table, $alias = NULL, $condition = NULL, $arguments = array()) {
+  public function addJoin($type, $table, $alias = NULL, $condition = NULL, $arguments = []) {
     if (empty($alias)) {
       if ($table instanceof SelectInterface) {
         $alias = 'subquery';
@@ -641,13 +641,13 @@ class Select extends Query implements SelectInterface {
       $condition = str_replace('%alias', $alias, $condition);
     }
 
-    $this->tables[$alias] = array(
+    $this->tables[$alias] = [
       'join type' => $type,
       'table' => $table,
       'alias' => $alias,
       'condition' => $condition,
       'arguments' => $arguments,
-    );
+    ];
 
     return $alias;
   }
@@ -675,7 +675,7 @@ class Select extends Query implements SelectInterface {
    * {@inheritdoc}
    */
   public function range($start = NULL, $length = NULL) {
-    $this->range = $start !== NULL ? array('start' => $start, 'length' => $length) : array();
+    $this->range = $start !== NULL ? ['start' => $start, 'length' => $length] : [];
     return $this;
   }
 
@@ -696,10 +696,10 @@ class Select extends Query implements SelectInterface {
       default:
     }
 
-    $this->union[] = array(
+    $this->union[] = [
       'type' => $type,
       'query' => $query,
-    );
+    ];
 
     return $this;
   }
@@ -770,7 +770,7 @@ class Select extends Query implements SelectInterface {
     // Ordering a count query is a waste of cycles, and breaks on some
     // databases anyway.
     $orders = &$count->getOrderBy();
-    $orders = array();
+    $orders = [];
 
     if ($count->distinct && !empty($group_by)) {
       // If the query is distinct and contains a GROUP BY, we need to remove the
@@ -809,7 +809,7 @@ class Select extends Query implements SelectInterface {
     }
 
     // FIELDS and EXPRESSIONS
-    $fields = array();
+    $fields = [];
     foreach ($this->tables as $alias => $table) {
       if (!empty($table['all_fields'])) {
         $fields[] = $this->connection->escapeTable($alias) . '.*';
@@ -886,7 +886,7 @@ class Select extends Query implements SelectInterface {
     // ORDER BY
     if ($this->order) {
       $query .= "\nORDER BY ";
-      $fields = array();
+      $fields = [];
       foreach ($this->order as $field => $direction) {
         $fields[] = $this->connection->escapeField($field) . ' ' . $direction;
       }
diff --git a/web/core/lib/Drupal/Core/Database/Query/SelectExtender.php b/web/core/lib/Drupal/Core/Database/Query/SelectExtender.php
index 808593c58..9082ca805 100644
--- a/web/core/lib/Drupal/Core/Database/Query/SelectExtender.php
+++ b/web/core/lib/Drupal/Core/Database/Query/SelectExtender.php
@@ -72,14 +72,14 @@ class SelectExtender implements SelectInterface {
    * {@inheritdoc}
    */
   public function hasAllTags() {
-    return call_user_func_array(array($this->query, 'hasAllTags'), func_get_args());
+    return call_user_func_array([$this->query, 'hasAllTags'], func_get_args());
   }
 
   /**
    * {@inheritdoc}
    */
   public function hasAnyTag() {
-    return call_user_func_array(array($this->query, 'hasAnyTag'), func_get_args());
+    return call_user_func_array([$this->query, 'hasAnyTag'], func_get_args());
   }
 
   /**
@@ -122,7 +122,7 @@ class SelectExtender implements SelectInterface {
   /**
    * {@inheritdoc}
    */
-  public function where($snippet, $args = array()) {
+  public function where($snippet, $args = []) {
     $this->query->where($snippet, $args);
     return $this;
   }
@@ -166,7 +166,7 @@ class SelectExtender implements SelectInterface {
   /**
    * {@inheritdoc}
    */
-  public function having($snippet, $args = array()) {
+  public function having($snippet, $args = []) {
     $this->query->having($snippet, $args);
     return $this;
   }
@@ -335,7 +335,7 @@ class SelectExtender implements SelectInterface {
   /**
    * {@inheritdoc}
    */
-  public function fields($table_alias, array $fields = array()) {
+  public function fields($table_alias, array $fields = []) {
     $this->query->fields($table_alias, $fields);
     return $this;
   }
@@ -343,42 +343,42 @@ class SelectExtender implements SelectInterface {
   /**
    * {@inheritdoc}
    */
-  public function addExpression($expression, $alias = NULL, $arguments = array()) {
+  public function addExpression($expression, $alias = NULL, $arguments = []) {
     return $this->query->addExpression($expression, $alias, $arguments);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function join($table, $alias = NULL, $condition = NULL, $arguments = array()) {
+  public function join($table, $alias = NULL, $condition = NULL, $arguments = []) {
     return $this->query->join($table, $alias, $condition, $arguments);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function innerJoin($table, $alias = NULL, $condition = NULL, $arguments = array()) {
+  public function innerJoin($table, $alias = NULL, $condition = NULL, $arguments = []) {
     return $this->query->innerJoin($table, $alias, $condition, $arguments);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function leftJoin($table, $alias = NULL, $condition = NULL, $arguments = array()) {
+  public function leftJoin($table, $alias = NULL, $condition = NULL, $arguments = []) {
     return $this->query->leftJoin($table, $alias, $condition, $arguments);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function rightJoin($table, $alias = NULL, $condition = NULL, $arguments = array()) {
+  public function rightJoin($table, $alias = NULL, $condition = NULL, $arguments = []) {
     return $this->query->rightJoin($table, $alias, $condition, $arguments);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function addJoin($type, $table, $alias = NULL, $condition = NULL, $arguments = array()) {
+  public function addJoin($type, $table, $alias = NULL, $condition = NULL, $arguments = []) {
     return $this->query->addJoin($type, $table, $alias, $condition, $arguments);
   }
 
@@ -440,7 +440,7 @@ class SelectExtender implements SelectInterface {
   /**
    * {@inheritdoc}
    */
-  function isNull($field) {
+  public function isNull($field) {
     $this->query->isNull($field);
     return $this;
   }
@@ -448,7 +448,7 @@ class SelectExtender implements SelectInterface {
   /**
    * {@inheritdoc}
    */
-  function isNotNull($field) {
+  public function isNotNull($field) {
     $this->query->isNotNull($field);
     return $this;
   }
@@ -497,7 +497,7 @@ class SelectExtender implements SelectInterface {
    * to handle any additional methods.
    */
   public function __call($method, $args) {
-    $return = call_user_func_array(array($this->query, $method), $args);
+    $return = call_user_func_array([$this->query, $method], $args);
 
     // Some methods will return the called object as part of a fluent interface.
     // Others will return some useful value.  If it's a value, then the caller
diff --git a/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
index aa358d3c2..59b15d079 100644
--- a/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -214,7 +214,7 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
-  public function fields($table_alias, array $fields = array());
+  public function fields($table_alias, array $fields = []);
 
   /**
    * Adds an expression to the list of "fields" to be SELECTed.
@@ -235,7 +235,7 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    * @return
    *   The unique alias that was assigned for this expression.
    */
-  public function addExpression($expression, $alias = NULL, $arguments = array());
+  public function addExpression($expression, $alias = NULL, $arguments = []);
 
   /**
    * Default Join against another table in the database.
@@ -263,7 +263,7 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    * @return
    *   The unique alias that was assigned for this table.
    */
-  public function join($table, $alias = NULL, $condition = NULL, $arguments = array());
+  public function join($table, $alias = NULL, $condition = NULL, $arguments = []);
 
   /**
    * Inner Join against another table in the database.
@@ -289,7 +289,7 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    * @return
    *   The unique alias that was assigned for this table.
    */
-  public function innerJoin($table, $alias = NULL, $condition = NULL, $arguments = array());
+  public function innerJoin($table, $alias = NULL, $condition = NULL, $arguments = []);
 
   /**
    * Left Outer Join against another table in the database.
@@ -315,7 +315,7 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    * @return
    *   The unique alias that was assigned for this table.
    */
-  public function leftJoin($table, $alias = NULL, $condition = NULL, $arguments = array());
+  public function leftJoin($table, $alias = NULL, $condition = NULL, $arguments = []);
 
   /**
    * Right Outer Join against another table in the database.
@@ -347,7 +347,7 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    *   db_query('B')->leftJoin('A'). This functionality has been deprecated
    *   because SQLite does not support it.
    */
-  public function rightJoin($table, $alias = NULL, $condition = NULL, $arguments = array());
+  public function rightJoin($table, $alias = NULL, $condition = NULL, $arguments = []);
 
   /**
    * Join against another table in the database.
@@ -380,7 +380,7 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    * @return
    *   The unique alias that was assigned for this table.
    */
-  public function addJoin($type, $table, $alias = NULL, $condition = NULL, $arguments = array());
+  public function addJoin($type, $table, $alias = NULL, $condition = NULL, $arguments = []);
 
   /**
    * Orders the result set by a given field.
@@ -574,7 +574,7 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    *
    * @return $this
    */
-  public function having($snippet, $args = array());
+  public function having($snippet, $args = []);
 
   /**
    * Compiles the HAVING clause for later retrieval.
diff --git a/web/core/lib/Drupal/Core/Database/Query/TableSortExtender.php b/web/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
index 285f1d6a9..4f739ee30 100644
--- a/web/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
+++ b/web/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
@@ -12,7 +12,7 @@ class TableSortExtender extends SelectExtender {
   /**
    * The array of fields that can be sorted by.
    */
-  protected $header = array();
+  protected $header = [];
 
   public function __construct(SelectInterface $query, Connection $connection) {
     parent::__construct($query, $connection);
diff --git a/web/core/lib/Drupal/Core/Database/Query/Truncate.php b/web/core/lib/Drupal/Core/Database/Query/Truncate.php
index 64520ee97..1711adee5 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Truncate.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Truncate.php
@@ -28,7 +28,7 @@ class Truncate extends Query {
    * @param array $options
    *   Array of database options.
    */
-  public function __construct(Connection $connection, $table, array $options = array()) {
+  public function __construct(Connection $connection, $table, array $options = []) {
     $options['return'] = Database::RETURN_AFFECTED;
     parent::__construct($connection, $options);
     $this->table = $table;
@@ -55,7 +55,7 @@ class Truncate extends Query {
    *   Return value is dependent on the database type.
    */
   public function execute() {
-    return $this->connection->query((string) $this, array(), $this->queryOptions);
+    return $this->connection->query((string) $this, [], $this->queryOptions);
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Database/Query/Update.php b/web/core/lib/Drupal/Core/Database/Query/Update.php
index d6b93b76f..ba0661c7a 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Update.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Update.php
@@ -26,14 +26,14 @@ class Update extends Query implements ConditionInterface {
    *
    * @var array
    */
-  protected $fields = array();
+  protected $fields = [];
 
   /**
    * An array of values to update to.
    *
    * @var array
    */
-  protected $arguments = array();
+  protected $arguments = [];
 
   /**
    * Array of fields to update to an expression in case of a duplicate record.
@@ -48,7 +48,7 @@ class Update extends Query implements ConditionInterface {
    *
    * @var array
    */
-  protected $expressionFields = array();
+  protected $expressionFields = [];
 
   /**
    * Constructs an Update query object.
@@ -60,7 +60,7 @@ class Update extends Query implements ConditionInterface {
    * @param array $options
    *   Array of database options.
    */
-  public function __construct(Connection $connection, $table, array $options = array()) {
+  public function __construct(Connection $connection, $table, array $options = []) {
     $options['return'] = Database::RETURN_AFFECTED;
     parent::__construct($connection, $options);
     $this->table = $table;
@@ -102,10 +102,10 @@ class Update extends Query implements ConditionInterface {
    *   The called object.
    */
   public function expression($field, $expression, array $arguments = NULL) {
-    $this->expressionFields[$field] = array(
+    $this->expressionFields[$field] = [
       'expression' => $expression,
       'arguments' => $arguments,
-    );
+    ];
 
     return $this;
   }
@@ -121,7 +121,7 @@ class Update extends Query implements ConditionInterface {
     // Expressions take priority over literal fields, so we process those first
     // and remove any literal fields that conflict.
     $fields = $this->fields;
-    $update_values = array();
+    $update_values = [];
     foreach ($this->expressionFields as $field => $data) {
       if (!empty($data['arguments'])) {
         $update_values += $data['arguments'];
@@ -161,7 +161,7 @@ class Update extends Query implements ConditionInterface {
     // Expressions take priority over literal fields, so we process those first
     // and remove any literal fields that conflict.
     $fields = $this->fields;
-    $update_fields = array();
+    $update_fields = [];
     foreach ($this->expressionFields as $field => $data) {
       if ($data['expression'] instanceof SelectInterface) {
         // Compile and cast expression subquery to a string.
diff --git a/web/core/lib/Drupal/Core/Database/Query/Upsert.php b/web/core/lib/Drupal/Core/Database/Query/Upsert.php
index dec2d3b3e..a406d7ab9 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Upsert.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Upsert.php
@@ -96,7 +96,7 @@ abstract class Upsert extends Query implements \Countable {
     }
 
     $max_placeholder = 0;
-    $values = array();
+    $values = [];
     foreach ($this->insertValues as $insert_values) {
       foreach ($insert_values as $value) {
         $values[':db_insert_placeholder_' . $max_placeholder++] = $value;
@@ -106,7 +106,7 @@ abstract class Upsert extends Query implements \Countable {
     $last_insert_id = $this->connection->query((string) $this, $values, $this->queryOptions);
 
     // Re-initialize the values array so that we can re-use this query.
-    $this->insertValues = array();
+    $this->insertValues = [];
 
     return $last_insert_id;
   }
diff --git a/web/core/lib/Drupal/Core/Database/Schema.php b/web/core/lib/Drupal/Core/Database/Schema.php
index 8b9eb7e12..80a68f6e5 100644
--- a/web/core/lib/Drupal/Core/Database/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Schema.php
@@ -77,10 +77,10 @@ abstract class Schema implements PlaceholderInterface {
    *   A keyed array with information about the schema, table name and prefix.
    */
   protected function getPrefixInfo($table = 'default', $add_prefix = TRUE) {
-    $info = array(
+    $info = [
       'schema' => $this->defaultSchema,
       'prefix' => $this->connection->tablePrefix($table),
-    );
+    ];
     if ($add_prefix) {
       $table = $info['prefix'] . $table;
     }
@@ -105,7 +105,7 @@ abstract class Schema implements PlaceholderInterface {
    *
    * This prevents using {} around non-table names like indexes and keys.
    */
-  function prefixNonTable($table) {
+  public function prefixNonTable($table) {
     $args = func_get_args();
     $info = $this->getPrefixInfo($table);
     $args[0] = $info['table'];
@@ -224,7 +224,7 @@ abstract class Schema implements PlaceholderInterface {
 
     // Convert the table expression from its SQL LIKE syntax to a regular
     // expression and escape the delimiter that will be used for matching.
-    $table_expression = str_replace(array('%', '_'), array('.*?', '.'), preg_quote($table_expression, '/'));
+    $table_expression = str_replace(['%', '_'], ['.*?', '.'], preg_quote($table_expression, '/'));
     $tables = preg_grep('/^' . $table_expression . '$/i', $tables);
 
     return $tables;
@@ -320,7 +320,7 @@ abstract class Schema implements PlaceholderInterface {
    * @throws \Drupal\Core\Database\SchemaObjectExistsException
    *   If the specified table already has a field by that name.
    */
-  abstract public function addField($table, $field, $spec, $keys_new = array());
+  abstract public function addField($table, $field, $spec, $keys_new = []);
 
   /**
    * Drop a field.
@@ -576,7 +576,7 @@ abstract class Schema implements PlaceholderInterface {
    * @throws \Drupal\Core\Database\SchemaObjectExistsException
    *   If the specified destination field already exists.
    */
-  abstract public function changeField($table, $field, $field_new, $spec, $keys_new = array());
+  abstract public function changeField($table, $field, $field_new, $spec, $keys_new = []);
 
   /**
    * Create a new table from a Drupal table definition.
@@ -591,7 +591,7 @@ abstract class Schema implements PlaceholderInterface {
    */
   public function createTable($name, $table) {
     if ($this->tableExists($name)) {
-      throw new SchemaObjectExistsException(t('Table @name already exists.', array('@name' => $name)));
+      throw new SchemaObjectExistsException(t('Table @name already exists.', ['@name' => $name]));
     }
     $statements = $this->createTableSql($name, $table);
     foreach ($statements as $statement) {
@@ -612,7 +612,7 @@ abstract class Schema implements PlaceholderInterface {
    *   An array of field names.
    */
   public function fieldNames($fields) {
-    $return = array();
+    $return = [];
     foreach ($fields as $field) {
       if (is_array($field)) {
         $return[] = $field[0];
diff --git a/web/core/lib/Drupal/Core/Database/Statement.php b/web/core/lib/Drupal/Core/Database/Statement.php
index d44853279..8060fbcde 100644
--- a/web/core/lib/Drupal/Core/Database/Statement.php
+++ b/web/core/lib/Drupal/Core/Database/Statement.php
@@ -39,7 +39,7 @@ class Statement extends \PDOStatement implements StatementInterface {
   /**
    * {@inheritdoc}
    */
-  public function execute($args = array(), $options = array()) {
+  public function execute($args = [], $options = []) {
     if (isset($options['fetch'])) {
       if (is_string($options['fetch'])) {
         // \PDO::FETCH_PROPS_LATE tells __construct() to run before properties
@@ -84,7 +84,7 @@ class Statement extends \PDOStatement implements StatementInterface {
    * {@inheritdoc}
    */
   public function fetchAllAssoc($key, $fetch = NULL) {
-    $return = array();
+    $return = [];
     if (isset($fetch)) {
       if (is_string($fetch)) {
         $this->setFetchMode(\PDO::FETCH_CLASS, $fetch);
@@ -106,7 +106,7 @@ class Statement extends \PDOStatement implements StatementInterface {
    * {@inheritdoc}
    */
   public function fetchAllKeyed($key_index = 0, $value_index = 1) {
-    $return = array();
+    $return = [];
     $this->setFetchMode(\PDO::FETCH_NUM);
     foreach ($this as $record) {
       $return[$record[$key_index]] = $record[$value_index];
@@ -146,7 +146,7 @@ class Statement extends \PDOStatement implements StatementInterface {
   /**
    * {@inheritdoc}
    */
-  public function setFetchMode($mode, $a1 = NULL, $a2 = array()) {
+  public function setFetchMode($mode, $a1 = NULL, $a2 = []) {
     // Call \PDOStatement::setFetchMode to set fetch mode.
     // \PDOStatement is picky about the number of arguments in some cases so we
     // need to be pass the exact number of arguments we where given.
diff --git a/web/core/lib/Drupal/Core/Database/StatementEmpty.php b/web/core/lib/Drupal/Core/Database/StatementEmpty.php
index 32b29d5e9..343b90ce8 100644
--- a/web/core/lib/Drupal/Core/Database/StatementEmpty.php
+++ b/web/core/lib/Drupal/Core/Database/StatementEmpty.php
@@ -26,7 +26,7 @@ class StatementEmpty implements \Iterator, StatementInterface {
   /**
    * {@inheritdoc}
    */
-  public function execute($args = array(), $options = array()) {
+  public function execute($args = [], $options = []) {
     return FALSE;
   }
 
@@ -50,7 +50,7 @@ class StatementEmpty implements \Iterator, StatementInterface {
   /**
    * {@inheritdoc}
    */
-  public function setFetchMode($mode, $a1 = NULL, $a2 = array()) {
+  public function setFetchMode($mode, $a1 = NULL, $a2 = []) {
     return;
   }
 
@@ -86,28 +86,28 @@ class StatementEmpty implements \Iterator, StatementInterface {
    * {@inheritdoc}
    */
   public function fetchAll($mode = NULL, $column_index = NULL, $constructor_arguments = NULL) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function fetchCol($index = 0) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function fetchAllKeyed($key_index = 0, $value_index = 1) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function fetchAllAssoc($key, $fetch = NULL) {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Database/StatementInterface.php b/web/core/lib/Drupal/Core/Database/StatementInterface.php
index 971d031e0..a34bf617f 100644
--- a/web/core/lib/Drupal/Core/Database/StatementInterface.php
+++ b/web/core/lib/Drupal/Core/Database/StatementInterface.php
@@ -51,7 +51,7 @@ interface StatementInterface extends \Traversable {
    * @return
    *   TRUE on success, or FALSE on failure.
    */
-  public function execute($args = array(), $options = array());
+  public function execute($args = [], $options = []);
 
   /**
    * Gets the query string of this statement.
@@ -90,7 +90,7 @@ interface StatementInterface extends \Traversable {
    *   If $mode is PDO::FETCH_CLASS, the optional arguments to pass to the
    *   constructor.
    */
-  public function setFetchMode($mode, $a1 = NULL, $a2 = array());
+  public function setFetchMode($mode, $a1 = NULL, $a2 = []);
 
   /**
    * Fetches the next row from a result set.
@@ -155,7 +155,7 @@ interface StatementInterface extends \Traversable {
    * @return
    *   An array of results.
    */
-  function fetchAll($mode = NULL, $column_index = NULL, $constructor_arguments = NULL);
+  public function fetchAll($mode = NULL, $column_index = NULL, $constructor_arguments = NULL);
 
   /**
    * Returns an entire single column of a result set as an indexed array.
diff --git a/web/core/lib/Drupal/Core/Database/StatementPrefetch.php b/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
index 6864f00ef..80252209e 100644
--- a/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -43,7 +43,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
    *
    * @var Array
    */
-  protected $data = array();
+  protected $data = [];
 
   /**
    * The current row, retrieved in \PDO::FETCH_ASSOC format.
@@ -93,12 +93,12 @@ class StatementPrefetch implements \Iterator, StatementInterface {
    *
    * @var Array
    */
-  protected $fetchOptions = array(
+  protected $fetchOptions = [
     'class' => 'stdClass',
-    'constructor_args' => array(),
+    'constructor_args' => [],
     'object' => NULL,
     'column' => 0,
-  );
+  ];
 
   /**
    * Holds the default fetch style.
@@ -112,12 +112,12 @@ class StatementPrefetch implements \Iterator, StatementInterface {
    *
    * @var Array
    */
-  protected $defaultFetchOptions = array(
+  protected $defaultFetchOptions = [
     'class' => 'stdClass',
-    'constructor_args' => array(),
+    'constructor_args' => [],
     'object' => NULL,
     'column' => 0,
-  );
+  ];
 
   /**
    * Is rowCount() execution allowed.
@@ -126,7 +126,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
    */
   public $allowRowCount = FALSE;
 
-  public function __construct(\PDO $pdo_connection, Connection $connection, $query, array $driver_options = array()) {
+  public function __construct(\PDO $pdo_connection, Connection $connection, $query, array $driver_options = []) {
     $this->pdoConnection = $pdo_connection;
     $this->dbh = $connection;
     $this->queryString = $query;
@@ -136,7 +136,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   /**
    * {@inheritdoc}
    */
-  public function execute($args = array(), $options = array()) {
+  public function execute($args = [], $options = []) {
     if (isset($options['fetch'])) {
       if (is_string($options['fetch'])) {
         // Default to an object. Note: db fields will be added to the object
@@ -181,7 +181,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
       $this->columnNames = array_keys($this->data[0]);
     }
     else {
-      $this->columnNames = array();
+      $this->columnNames = [];
     }
 
     if (!empty($logger)) {
@@ -219,7 +219,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
    * @return \PDOStatement
    *   A PDOStatement object.
    */
-  protected function getStatement($query, &$args = array()) {
+  protected function getStatement($query, &$args = []) {
     return $this->dbh->prepare($query);
   }
 
@@ -233,7 +233,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   /**
    * {@inheritdoc}
    */
-  public function setFetchMode($mode, $a1 = NULL, $a2 = array()) {
+  public function setFetchMode($mode, $a1 = NULL, $a2 = []) {
     $this->defaultFetchStyle = $mode;
     switch ($mode) {
       case \PDO::FETCH_CLASS:
@@ -409,7 +409,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   /**
    * {@inheritdoc}
    */
-  public function fetchObject($class_name = NULL, $constructor_args = array()) {
+  public function fetchObject($class_name = NULL, $constructor_args = []) {
     if (isset($this->currentRow)) {
       if (!isset($class_name)) {
         // Directly cast to an object to avoid a function call.
@@ -417,7 +417,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
       }
       else {
         $this->fetchStyle = \PDO::FETCH_CLASS;
-        $this->fetchOptions = array('constructor_args' => $constructor_args);
+        $this->fetchOptions = ['constructor_args' => $constructor_args];
         // Grab the row in the format specified above.
         $result = $this->current();
         // Reset the fetch parameters to the value stored using setFetchMode().
@@ -461,7 +461,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
       $this->fetchOptions['constructor_args'] = $constructor_arguments;
     }
 
-    $result = array();
+    $result = [];
     // Traverse the array as PHP would have done.
     while (isset($this->currentRow)) {
       // Grab the row in the format specified above.
@@ -480,7 +480,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
    */
   public function fetchCol($index = 0) {
     if (isset($this->columnNames[$index])) {
-      $result = array();
+      $result = [];
       // Traverse the array as PHP would have done.
       while (isset($this->currentRow)) {
         $result[] = $this->currentRow[$this->columnNames[$index]];
@@ -489,7 +489,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
       return $result;
     }
     else {
-      return array();
+      return [];
     }
   }
 
@@ -498,12 +498,12 @@ class StatementPrefetch implements \Iterator, StatementInterface {
    */
   public function fetchAllKeyed($key_index = 0, $value_index = 1) {
     if (!isset($this->columnNames[$key_index]) || !isset($this->columnNames[$value_index]))
-      return array();
+      return [];
 
     $key = $this->columnNames[$key_index];
     $value = $this->columnNames[$value_index];
 
-    $result = array();
+    $result = [];
     // Traverse the array as PHP would have done.
     while (isset($this->currentRow)) {
       $result[$this->currentRow[$key]] = $this->currentRow[$value];
@@ -519,7 +519,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
     $this->fetchStyle = isset($fetch_style) ? $fetch_style : $this->defaultFetchStyle;
     $this->fetchOptions = $this->defaultFetchOptions;
 
-    $result = array();
+    $result = [];
     // Traverse the array as PHP would have done.
     while (isset($this->currentRow)) {
       // Grab the row in its raw \PDO::FETCH_ASSOC format.
diff --git a/web/core/lib/Drupal/Core/Database/Transaction.php b/web/core/lib/Drupal/Core/Database/Transaction.php
index 8db30ab88..837afda6d 100644
--- a/web/core/lib/Drupal/Core/Database/Transaction.php
+++ b/web/core/lib/Drupal/Core/Database/Transaction.php
@@ -86,12 +86,12 @@ class Transaction {
    * transaction has been rolled back or the log messages will be rolled back
    * too.
    *
-   * @see \Drupal\Core\Database\Connection::rollback()
+   * @see \Drupal\Core\Database\Connection::rollBack()
    * @see watchdog_exception()
    */
-  public function rollback() {
+  public function rollBack() {
     $this->rolledBack = TRUE;
-    $this->connection->rollback($this->name);
+    $this->connection->rollBack($this->name);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Database/TransactionOutOfOrderException.php b/web/core/lib/Drupal/Core/Database/TransactionOutOfOrderException.php
index 0a014cfec..7084eda0e 100644
--- a/web/core/lib/Drupal/Core/Database/TransactionOutOfOrderException.php
+++ b/web/core/lib/Drupal/Core/Database/TransactionOutOfOrderException.php
@@ -3,6 +3,6 @@
 namespace Drupal\Core\Database;
 
 /**
- * Exception thrown when a rollback() resulted in other active transactions being rolled-back.
+ * Exception thrown when a rollBack() resulted in other active transactions being rolled-back.
  */
 class TransactionOutOfOrderException extends TransactionException implements DatabaseException { }
diff --git a/web/core/lib/Drupal/Core/Database/database.api.php b/web/core/lib/Drupal/Core/Database/database.api.php
index 3e0fbf885..885c6cba2 100644
--- a/web/core/lib/Drupal/Core/Database/database.api.php
+++ b/web/core/lib/Drupal/Core/Database/database.api.php
@@ -175,7 +175,7 @@
  *   }
  *   catch (Exception $e) {
  *     // Something went wrong somewhere, so roll back now.
- *     $txn->rollback();
+ *     $txn->rollBack();
  *     // Log the exception to watchdog.
  *     watchdog_exception('type', $e);
  *   }
@@ -482,60 +482,60 @@ function hook_query_TAG_alter(Drupal\Core\Database\Query\AlterableInterface $que
  * @ingroup schemaapi
  */
 function hook_schema() {
-  $schema['node'] = array(
+  $schema['node'] = [
     // Example (partial) specification for table "node".
     'description' => 'The base table for nodes.',
-    'fields' => array(
-      'nid' => array(
+    'fields' => [
+      'nid' => [
         'description' => 'The primary identifier for a node.',
         'type' => 'serial',
         'unsigned' => TRUE,
         'not null' => TRUE,
-      ),
-      'vid' => array(
+      ],
+      'vid' => [
         'description' => 'The current {node_field_revision}.vid version identifier.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'type' => array(
+      ],
+      'type' => [
         'description' => 'The type of this node.',
         'type' => 'varchar',
         'length' => 32,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'title' => array(
+      ],
+      'title' => [
         'description' => 'The node title.',
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
-      ),
-    ),
-    'indexes' => array(
-      'node_changed'        => array('changed'),
-      'node_created'        => array('created'),
-    ),
-    'unique keys' => array(
-      'nid_vid' => array('nid', 'vid'),
-      'vid'     => array('vid'),
-    ),
+      ],
+    ],
+    'indexes' => [
+      'node_changed'        => ['changed'],
+      'node_created'        => ['created'],
+    ],
+    'unique keys' => [
+      'nid_vid' => ['nid', 'vid'],
+      'vid'     => ['vid'],
+    ],
     // For documentation purposes only; foreign keys are not created in the
     // database.
-    'foreign keys' => array(
-      'node_revision' => array(
+    'foreign keys' => [
+      'node_revision' => [
         'table' => 'node_field_revision',
-        'columns' => array('vid' => 'vid'),
-      ),
-      'node_author' => array(
+        'columns' => ['vid' => 'vid'],
+      ],
+      'node_author' => [
         'table' => 'users',
-        'columns' => array('uid' => 'uid'),
-      ),
-    ),
-    'primary key' => array('nid'),
-  );
+        'columns' => ['uid' => 'uid'],
+      ],
+    ],
+    'primary key' => ['nid'],
+  ];
   return $schema;
 }
 
diff --git a/web/core/lib/Drupal/Core/Datetime/DateFormatter.php b/web/core/lib/Drupal/Core/Datetime/DateFormatter.php
index eb107e8e3..772908035 100644
--- a/web/core/lib/Drupal/Core/Datetime/DateFormatter.php
+++ b/web/core/lib/Drupal/Core/Datetime/DateFormatter.php
@@ -54,7 +54,7 @@ class DateFormatter implements DateFormatterInterface {
   protected $requestStack;
 
   protected $country = NULL;
-  protected $dateFormats = array();
+  protected $dateFormats = [];
 
   /**
    * Contains the different date interval units.
@@ -65,7 +65,7 @@ class DateFormatter implements DateFormatterInterface {
    *
    * @var array
    */
-  protected $units = array(
+  protected $units = [
     '1 year|@count years' => 31536000,
     '1 month|@count months' => 2592000,
     '1 week|@count weeks' => 604800,
@@ -73,7 +73,7 @@ class DateFormatter implements DateFormatterInterface {
     '1 hour|@count hours' => 3600,
     '1 min|@count min' => 60,
     '1 sec|@count sec' => 1,
-  );
+  ];
 
   /**
    * Constructs a Date object.
@@ -115,26 +115,30 @@ class DateFormatter implements DateFormatterInterface {
     }
 
     // Create a DrupalDateTime object from the timestamp and timezone.
-    $create_settings = array(
+    $create_settings = [
       'langcode' => $langcode,
       'country' => $this->country(),
-    );
+    ];
     $date = DrupalDateTime::createFromTimestamp($timestamp, $this->timezones[$timezone], $create_settings);
 
     // If we have a non-custom date format use the provided date format pattern.
-    if ($date_format = $this->dateFormat($type, $langcode)) {
-      $format = $date_format->getPattern();
+    if ($type !== 'custom') {
+      if ($date_format = $this->dateFormat($type, $langcode)) {
+        $format = $date_format->getPattern();
+      }
     }
 
-    // Fall back to medium if a format was not found.
+    // Fall back to the 'medium' date format type if the format string is
+    // empty, either from not finding a requested date format or being given an
+    // empty custom format string.
     if (empty($format)) {
       $format = $this->dateFormat('fallback', $langcode)->getPattern();
     }
 
     // Call $date->format().
-    $settings = array(
+    $settings = [
       'langcode' => $langcode,
-    );
+    ];
     return $date->format($format, $settings);
   }
 
@@ -146,7 +150,7 @@ class DateFormatter implements DateFormatterInterface {
     foreach ($this->units as $key => $value) {
       $key = explode('|', $key);
       if ($interval >= $value) {
-        $output .= ($output ? ' ' : '') . $this->formatPlural(floor($interval / $value), $key[0], $key[1], array(), array('langcode' => $langcode));
+        $output .= ($output ? ' ' : '') . $this->formatPlural(floor($interval / $value), $key[0], $key[1], [], ['langcode' => $langcode]);
         $interval %= $value;
         $granularity--;
       }
@@ -160,7 +164,7 @@ class DateFormatter implements DateFormatterInterface {
         break;
       }
     }
-    return $output ? $output : $this->t('0 sec', array(), array('langcode' => $langcode));
+    return $output ? $output : $this->t('0 sec', [], ['langcode' => $langcode]);
   }
 
   /**
@@ -179,7 +183,7 @@ class DateFormatter implements DateFormatterInterface {
   /**
    * {@inheritdoc}
    */
-  public function formatTimeDiffUntil($timestamp, $options = array()) {
+  public function formatTimeDiffUntil($timestamp, $options = []) {
     $request_time = $this->requestStack->getCurrentRequest()->server->get('REQUEST_TIME');
     return $this->formatDiff($request_time, $timestamp, $options);
   }
@@ -187,7 +191,7 @@ class DateFormatter implements DateFormatterInterface {
   /**
    * {@inheritdoc}
    */
-  public function formatTimeDiffSince($timestamp, $options = array()) {
+  public function formatTimeDiffSince($timestamp, $options = []) {
     $request_time = $this->requestStack->getCurrentRequest()->server->get('REQUEST_TIME');
     return $this->formatDiff($timestamp, $request_time, $options);
   }
@@ -195,14 +199,14 @@ class DateFormatter implements DateFormatterInterface {
   /**
    * {@inheritdoc}
    */
-  public function formatDiff($from, $to, $options = array()) {
+  public function formatDiff($from, $to, $options = []) {
 
-    $options += array(
+    $options += [
       'granularity' => 2,
       'langcode' => NULL,
       'strict' => TRUE,
       'return_as_object' => FALSE,
-    );
+    ];
 
     if ($options['strict'] && $from > $to) {
       $string = $this->t('0 seconds');
@@ -227,18 +231,18 @@ class DateFormatter implements DateFormatterInterface {
     // don't take the "invert" property into account, the resulting output value
     // will always be positive.
     $max_age = 1e99;
-    foreach (array('y', 'm', 'd', 'h', 'i', 's') as $value) {
+    foreach (['y', 'm', 'd', 'h', 'i', 's'] as $value) {
       if ($interval->$value > 0) {
         // Switch over the keys to call formatPlural() explicitly with literal
         // strings for all different possibilities.
         switch ($value) {
           case 'y':
-            $interval_output = $this->formatPlural($interval->y, '1 year', '@count years', array(), array('langcode' => $options['langcode']));
+            $interval_output = $this->formatPlural($interval->y, '1 year', '@count years', [], ['langcode' => $options['langcode']]);
             $max_age = min($max_age, 365 * 86400);
             break;
 
           case 'm':
-            $interval_output = $this->formatPlural($interval->m, '1 month', '@count months', array(), array('langcode' => $options['langcode']));
+            $interval_output = $this->formatPlural($interval->m, '1 month', '@count months', [], ['langcode' => $options['langcode']]);
             $max_age = min($max_age, 30 * 86400);
             break;
 
@@ -249,14 +253,14 @@ class DateFormatter implements DateFormatterInterface {
             $days = $interval->d;
             $weeks = floor($days / 7);
             if ($weeks) {
-              $interval_output .= $this->formatPlural($weeks, '1 week', '@count weeks', array(), array('langcode' => $options['langcode']));
+              $interval_output .= $this->formatPlural($weeks, '1 week', '@count weeks', [], ['langcode' => $options['langcode']]);
               $days -= $weeks * 7;
               $granularity--;
               $max_age = min($max_age, 7 * 86400);
             }
 
             if ((!$output || $weeks > 0) && $granularity > 0 && $days > 0) {
-              $interval_output .= ($interval_output ? ' ' : '') . $this->formatPlural($days, '1 day', '@count days', array(), array('langcode' => $options['langcode']));
+              $interval_output .= ($interval_output ? ' ' : '') . $this->formatPlural($days, '1 day', '@count days', [], ['langcode' => $options['langcode']]);
               $max_age = min($max_age, 86400);
             }
             else {
@@ -267,17 +271,17 @@ class DateFormatter implements DateFormatterInterface {
             break;
 
           case 'h':
-            $interval_output = $this->formatPlural($interval->h, '1 hour', '@count hours', array(), array('langcode' => $options['langcode']));
+            $interval_output = $this->formatPlural($interval->h, '1 hour', '@count hours', [], ['langcode' => $options['langcode']]);
             $max_age = min($max_age, 3600);
             break;
 
           case 'i':
-            $interval_output = $this->formatPlural($interval->i, '1 minute', '@count minutes', array(), array('langcode' => $options['langcode']));
+            $interval_output = $this->formatPlural($interval->i, '1 minute', '@count minutes', [], ['langcode' => $options['langcode']]);
             $max_age = min($max_age, 60);
             break;
 
           case 's':
-            $interval_output = $this->formatPlural($interval->s, '1 second', '@count seconds', array(), array('langcode' => $options['langcode']));
+            $interval_output = $this->formatPlural($interval->s, '1 second', '@count seconds', [], ['langcode' => $options['langcode']]);
             $max_age = min($max_age, 1);
             break;
 
@@ -316,14 +320,14 @@ class DateFormatter implements DateFormatterInterface {
    * @param string $langcode
    *   The langcode of the language to use.
    *
-   * @return string|null
-   *   The pattern for the date format in the given language for non-custom
-   *   formats, NULL otherwise.
+   * @return \Drupal\Core\Datetime\DateFormatInterface|null
+   *   The configuration entity for the date format in the given language for
+   *   non-custom formats, NULL otherwise.
    */
   protected function dateFormat($format, $langcode) {
     if (!isset($this->dateFormats[$format][$langcode])) {
       $original_language = $this->languageManager->getConfigOverrideLanguage();
-      $this->languageManager->setConfigOverrideLanguage(new Language(array('id' => $langcode)));
+      $this->languageManager->setConfigOverrideLanguage(new Language(['id' => $langcode]));
       $this->dateFormats[$format][$langcode] = $this->dateFormatStorage->load($format);
       $this->languageManager->setConfigOverrideLanguage($original_language);
     }
diff --git a/web/core/lib/Drupal/Core/Datetime/DateFormatterInterface.php b/web/core/lib/Drupal/Core/Datetime/DateFormatterInterface.php
index 3515ee4da..6bddf8fe3 100644
--- a/web/core/lib/Drupal/Core/Datetime/DateFormatterInterface.php
+++ b/web/core/lib/Drupal/Core/Datetime/DateFormatterInterface.php
@@ -112,7 +112,7 @@ interface DateFormatterInterface {
    * @see \Drupal\Core\Datetime\DateFormatterInterface::formatDiff()
    * @see \Drupal\Core\Datetime\DateFormatterInterface::formatTimeDiffSince()
    */
-  public function formatTimeDiffUntil($timestamp, $options = array());
+  public function formatTimeDiffUntil($timestamp, $options = []);
 
   /**
    * Formats the time difference from a timestamp to the current request time.
@@ -142,7 +142,7 @@ interface DateFormatterInterface {
    * @see \Drupal\Core\Datetime\DateFormatterInterface::formatDiff()
    * @see \Drupal\Core\Datetime\DateFormatterInterface::formatTimeDiffUntil()
    */
-  public function formatTimeDiffSince($timestamp, $options = array());
+  public function formatTimeDiffSince($timestamp, $options = []);
 
   /**
    * Formats a time interval between two timestamps.
@@ -174,6 +174,6 @@ interface DateFormatterInterface {
    * @see \Drupal\Core\Datetime\DateFormatterInterface::formatTimeDiffSince()
    * @see \Drupal\Core\Datetime\DateFormatterInterface::formatTimeDiffUntil()
    */
-  public function formatDiff($from, $to, $options = array());
+  public function formatDiff($from, $to, $options = []);
 
 }
diff --git a/web/core/lib/Drupal/Core/Datetime/DateHelper.php b/web/core/lib/Drupal/Core/Datetime/DateHelper.php
index 70db9b3c4..b3a8ce75d 100644
--- a/web/core/lib/Drupal/Core/Datetime/DateHelper.php
+++ b/web/core/lib/Drupal/Core/Datetime/DateHelper.php
@@ -27,7 +27,7 @@ class DateHelper {
   public static function monthNamesUntranslated() {
     // Force the key to use the correct month value, rather than
     // starting with zero.
-    return array(
+    return [
       1  => 'January',
       2  => 'February',
       3  => 'March',
@@ -40,7 +40,7 @@ class DateHelper {
       10 => 'October',
       11 => 'November',
       12 => 'December',
-    );
+    ];
   }
 
   /**
@@ -52,7 +52,7 @@ class DateHelper {
   public static function monthNamesAbbrUntranslated() {
     // Force the key to use the correct month value, rather than
     // starting with zero.
-    return array(
+    return [
       1  => 'Jan',
       2  => 'Feb',
       3  => 'Mar',
@@ -65,7 +65,7 @@ class DateHelper {
       10 => 'Oct',
       11 => 'Nov',
       12 => 'Dec',
-    );
+    ];
   }
 
   /**
@@ -81,21 +81,21 @@ class DateHelper {
   public static function monthNames($required = FALSE) {
     // Force the key to use the correct month value, rather than
     // starting with zero.
-    $monthnames = array(
-      1  => t('January', array(), array('context' => 'Long month name')),
-      2  => t('February', array(), array('context' => 'Long month name')),
-      3  => t('March', array(), array('context' => 'Long month name')),
-      4  => t('April', array(), array('context' => 'Long month name')),
-      5  => t('May', array(), array('context' => 'Long month name')),
-      6  => t('June', array(), array('context' => 'Long month name')),
-      7  => t('July', array(), array('context' => 'Long month name')),
-      8  => t('August', array(), array('context' => 'Long month name')),
-      9  => t('September', array(), array('context' => 'Long month name')),
-      10 => t('October', array(), array('context' => 'Long month name')),
-      11 => t('November', array(), array('context' => 'Long month name')),
-      12 => t('December', array(), array('context' => 'Long month name')),
-    );
-    $none = array('' => '');
+    $monthnames = [
+      1  => t('January', [], ['context' => 'Long month name']),
+      2  => t('February', [], ['context' => 'Long month name']),
+      3  => t('March', [], ['context' => 'Long month name']),
+      4  => t('April', [], ['context' => 'Long month name']),
+      5  => t('May', [], ['context' => 'Long month name']),
+      6  => t('June', [], ['context' => 'Long month name']),
+      7  => t('July', [], ['context' => 'Long month name']),
+      8  => t('August', [], ['context' => 'Long month name']),
+      9  => t('September', [], ['context' => 'Long month name']),
+      10 => t('October', [], ['context' => 'Long month name']),
+      11 => t('November', [], ['context' => 'Long month name']),
+      12 => t('December', [], ['context' => 'Long month name']),
+    ];
+    $none = ['' => ''];
     return !$required ? $none + $monthnames : $monthnames;
   }
 
@@ -112,21 +112,21 @@ class DateHelper {
   public static function monthNamesAbbr($required = FALSE) {
     // Force the key to use the correct month value, rather than
     // starting with zero.
-    $monthnames = array(
-      1  => t('Jan', array(), array('context' => 'Abbreviated month name')),
-      2  => t('Feb', array(), array('context' => 'Abbreviated month name')),
-      3  => t('Mar', array(), array('context' => 'Abbreviated month name')),
-      4  => t('Apr', array(), array('context' => 'Abbreviated month name')),
-      5  => t('May', array(), array('context' => 'Abbreviated month name')),
-      6  => t('Jun', array(), array('context' => 'Abbreviated month name')),
-      7  => t('Jul', array(), array('context' => 'Abbreviated month name')),
-      8  => t('Aug', array(), array('context' => 'Abbreviated month name')),
-      9  => t('Sep', array(), array('context' => 'Abbreviated month name')),
-      10 => t('Oct', array(), array('context' => 'Abbreviated month name')),
-      11 => t('Nov', array(), array('context' => 'Abbreviated month name')),
-      12 => t('Dec', array(), array('context' => 'Abbreviated month name')),
-    );
-    $none = array('' => '');
+    $monthnames = [
+      1  => t('Jan', [], ['context' => 'Abbreviated month name']),
+      2  => t('Feb', [], ['context' => 'Abbreviated month name']),
+      3  => t('Mar', [], ['context' => 'Abbreviated month name']),
+      4  => t('Apr', [], ['context' => 'Abbreviated month name']),
+      5  => t('May', [], ['context' => 'Abbreviated month name']),
+      6  => t('Jun', [], ['context' => 'Abbreviated month name']),
+      7  => t('Jul', [], ['context' => 'Abbreviated month name']),
+      8  => t('Aug', [], ['context' => 'Abbreviated month name']),
+      9  => t('Sep', [], ['context' => 'Abbreviated month name']),
+      10 => t('Oct', [], ['context' => 'Abbreviated month name']),
+      11 => t('Nov', [], ['context' => 'Abbreviated month name']),
+      12 => t('Dec', [], ['context' => 'Abbreviated month name']),
+    ];
+    $none = ['' => ''];
     return !$required ? $none + $monthnames : $monthnames;
   }
 
@@ -137,7 +137,7 @@ class DateHelper {
    *   An array of week day names
    */
   public static function weekDaysUntranslated() {
-    return array(
+    return [
       'Sunday',
       'Monday',
       'Tuesday',
@@ -145,7 +145,7 @@ class DateHelper {
       'Thursday',
       'Friday',
       'Saturday',
-    );
+    ];
   }
 
   /**
@@ -159,7 +159,7 @@ class DateHelper {
    *   An array of week day names
    */
   public static function weekDays($required = FALSE) {
-    $weekdays = array(
+    $weekdays = [
       t('Sunday'),
       t('Monday'),
       t('Tuesday'),
@@ -167,8 +167,8 @@ class DateHelper {
       t('Thursday'),
       t('Friday'),
       t('Saturday'),
-    );
-    $none = array('' => '');
+    ];
+    $none = ['' => ''];
     return !$required ? $none + $weekdays : $weekdays;
   }
 
@@ -183,16 +183,16 @@ class DateHelper {
    *   An array of week day abbreviations
    */
   public static function weekDaysAbbr($required = FALSE) {
-    $weekdays = array(
-      t('Sun', array(), array('context' => 'Abbreviated weekday')),
-      t('Mon', array(), array('context' => 'Abbreviated weekday')),
-      t('Tue', array(), array('context' => 'Abbreviated weekday')),
-      t('Wed', array(), array('context' => 'Abbreviated weekday')),
-      t('Thu', array(), array('context' => 'Abbreviated weekday')),
-      t('Fri', array(), array('context' => 'Abbreviated weekday')),
-      t('Sat', array(), array('context' => 'Abbreviated weekday')),
-    );
-    $none = array('' => '');
+    $weekdays = [
+      t('Sun', [], ['context' => 'Abbreviated weekday']),
+      t('Mon', [], ['context' => 'Abbreviated weekday']),
+      t('Tue', [], ['context' => 'Abbreviated weekday']),
+      t('Wed', [], ['context' => 'Abbreviated weekday']),
+      t('Thu', [], ['context' => 'Abbreviated weekday']),
+      t('Fri', [], ['context' => 'Abbreviated weekday']),
+      t('Sat', [], ['context' => 'Abbreviated weekday']),
+    ];
+    $none = ['' => ''];
     return !$required ? $none + $weekdays : $weekdays;
   }
 
@@ -207,16 +207,16 @@ class DateHelper {
    *   An array of week day 2 letter abbreviations
    */
   public static function weekDaysAbbr2($required = FALSE) {
-    $weekdays = array(
-      t('Su', array(), array('context' => 'Abbreviated weekday')),
-      t('Mo', array(), array('context' => 'Abbreviated weekday')),
-      t('Tu', array(), array('context' => 'Abbreviated weekday')),
-      t('We', array(), array('context' => 'Abbreviated weekday')),
-      t('Th', array(), array('context' => 'Abbreviated weekday')),
-      t('Fr', array(), array('context' => 'Abbreviated weekday')),
-      t('Sa', array(), array('context' => 'Abbreviated weekday')),
-    );
-    $none = array('' => '');
+    $weekdays = [
+      t('Su', [], ['context' => 'Abbreviated weekday']),
+      t('Mo', [], ['context' => 'Abbreviated weekday']),
+      t('Tu', [], ['context' => 'Abbreviated weekday']),
+      t('We', [], ['context' => 'Abbreviated weekday']),
+      t('Th', [], ['context' => 'Abbreviated weekday']),
+      t('Fr', [], ['context' => 'Abbreviated weekday']),
+      t('Sa', [], ['context' => 'Abbreviated weekday']),
+    ];
+    $none = ['' => ''];
     return !$required ? $none + $weekdays : $weekdays;
   }
 
@@ -231,16 +231,16 @@ class DateHelper {
    *   An array of week day 1 letter abbreviations
    */
   public static function weekDaysAbbr1($required = FALSE) {
-    $weekdays = array(
-      t('S', array(), array('context' => 'Abbreviated 1 letter weekday Sunday')),
-      t('M', array(), array('context' => 'Abbreviated 1 letter weekday Monday')),
-      t('T', array(), array('context' => 'Abbreviated 1 letter weekday Tuesday')),
-      t('W', array(), array('context' => 'Abbreviated 1 letter weekday Wednesday')),
-      t('T', array(), array('context' => 'Abbreviated 1 letter weekday Thursday')),
-      t('F', array(), array('context' => 'Abbreviated 1 letter weekday Friday')),
-      t('S', array(), array('context' => 'Abbreviated 1 letter weekday Saturday')),
-    );
-    $none = array('' => '');
+    $weekdays = [
+      t('S', [], ['context' => 'Abbreviated 1 letter weekday Sunday']),
+      t('M', [], ['context' => 'Abbreviated 1 letter weekday Monday']),
+      t('T', [], ['context' => 'Abbreviated 1 letter weekday Tuesday']),
+      t('W', [], ['context' => 'Abbreviated 1 letter weekday Wednesday']),
+      t('T', [], ['context' => 'Abbreviated 1 letter weekday Thursday']),
+      t('F', [], ['context' => 'Abbreviated 1 letter weekday Friday']),
+      t('S', [], ['context' => 'Abbreviated 1 letter weekday Saturday']),
+    ];
+    $none = ['' => ''];
     return !$required ? $none + $weekdays : $weekdays;
   }
 
@@ -296,7 +296,7 @@ class DateHelper {
     if (empty($max)) {
       $max = intval(date('Y', REQUEST_TIME) + 3);
     }
-    $none = array('' => '');
+    $none = ['' => ''];
     $range = range($min, $max);
     $range = array_combine($range, $range);
     return !$required ? $none + $range : $range;
@@ -328,7 +328,7 @@ class DateHelper {
     if (empty($max)) {
       $max = 31;
     }
-    $none = array('' => '');
+    $none = ['' => ''];
     $range = range(1, $max);
     $range = array_combine($range, $range);
     return !$required ? $none + $range : $range;
@@ -349,7 +349,7 @@ class DateHelper {
    *   An array of hours in the selected format.
    */
   public static function hours($format = 'H', $required = FALSE) {
-    $hours = array();
+    $hours = [];
     if ($format == 'h' || $format == 'g') {
       $min = 1;
       $max = 12;
@@ -362,7 +362,7 @@ class DateHelper {
       $formatted = ($format == 'H' || $format == 'h') ? DrupalDateTime::datePad($i) : $i;
       $hours[$i] = $formatted;
     }
-    $none = array('' => '');
+    $none = ['' => ''];
     return !$required ? $none + $hours : $hours;
   }
 
@@ -382,7 +382,7 @@ class DateHelper {
    *   An array of minutes in the selected format.
    */
   public static function minutes($format = 'i', $required = FALSE, $increment = 1) {
-    $minutes = array();
+    $minutes = [];
     // Ensure $increment has a value so we don't loop endlessly.
     if (empty($increment)) {
       $increment = 1;
@@ -391,7 +391,7 @@ class DateHelper {
       $formatted = $format == 'i' ? DrupalDateTime::datePad($i) : $i;
       $minutes[$i] = $formatted;
     }
-    $none = array('' => '');
+    $none = ['' => ''];
     return !$required ? $none + $minutes : $minutes;
   }
 
@@ -411,7 +411,7 @@ class DateHelper {
    *   An array of seconds in the selected format.
    */
   public static function seconds($format = 's', $required = FALSE, $increment = 1) {
-    $seconds = array();
+    $seconds = [];
     // Ensure $increment has a value so we don't loop endlessly.
     if (empty($increment)) {
       $increment = 1;
@@ -420,7 +420,7 @@ class DateHelper {
       $formatted = $format == 's' ? DrupalDateTime::datePad($i) : $i;
       $seconds[$i] = $formatted;
     }
-    $none = array('' => '');
+    $none = ['' => ''];
     return !$required ? $none + $seconds : $seconds;
   }
 
@@ -435,11 +435,11 @@ class DateHelper {
    *   An array of AM and PM options.
    */
   public static function ampm($required = FALSE) {
-    $none = array('' => '');
-    $ampm = array(
-             'am' => t('am', array(), array('context' => 'ampm')),
-             'pm' => t('pm', array(), array('context' => 'ampm')),
-            );
+    $none = ['' => ''];
+    $ampm = [
+             'am' => t('am', [], ['context' => 'ampm']),
+             'pm' => t('pm', [], ['context' => 'ampm']),
+            ];
     return !$required ? $none + $ampm : $ampm;
   }
 
diff --git a/web/core/lib/Drupal/Core/Datetime/DrupalDateTime.php b/web/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
index faa0d0223..572a6e3c6 100644
--- a/web/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
+++ b/web/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
@@ -48,7 +48,7 @@ class DrupalDateTime extends DateTimePlus {
    *   - debug: (optional) Boolean choice to leave debug values in the
    *     date object for debugging purposes. Defaults to FALSE.
    */
-  public function __construct($time = 'now', $timezone = NULL, $settings = array()) {
+  public function __construct($time = 'now', $timezone = NULL, $settings = []) {
     if (!isset($settings['langcode'])) {
       $settings['langcode'] = \Drupal::languageManager()->getCurrentLanguage()->getId();
     }
@@ -87,7 +87,7 @@ class DrupalDateTime extends DateTimePlus {
    *   The formatted value of the date. Since the format may contain user input,
    *   this value should be escaped when output.
    */
-  public function format($format, $settings = array()) {
+  public function format($format, $settings = []) {
     $langcode = !empty($settings['langcode']) ? $settings['langcode'] : $this->langcode;
     $value = '';
     // Format the date and catch errors.
@@ -98,7 +98,7 @@ class DrupalDateTime extends DateTimePlus {
       // Paired backslashes are isolated to prevent errors in
       // read-ahead evaluation. The read-ahead expression ensures that
       // A matches, but not \A.
-      $format = preg_replace(array('/\\\\\\\\/', '/(?<!\\\\)([AaeDlMTF])/'), array("\xEF\\\\\\\\\xFF", "\xEF\\\\\$1\$1\xFF"), $format);
+      $format = preg_replace(['/\\\\\\\\/', '/(?<!\\\\)([AaeDlMTF])/'], ["\xEF\\\\\\\\\xFF", "\xEF\\\\\$1\$1\xFF"], $format);
 
       // Call date_format().
       $format = parent::format($format, $settings);
@@ -108,7 +108,7 @@ class DrupalDateTime extends DateTimePlus {
         $code = $matches[1];
         $string = $matches[2];
         if (!isset($this->formatTranslationCache[$langcode][$code][$string])) {
-          $options = array('langcode' => $langcode);
+          $options = ['langcode' => $langcode];
           if ($code == 'F') {
             $options['context'] = 'Long month name';
           }
@@ -117,7 +117,7 @@ class DrupalDateTime extends DateTimePlus {
             $this->formatTranslationCache[$langcode][$code][$string] = $string;
           }
           else {
-            $this->formatTranslationCache[$langcode][$code][$string] = $this->t($string, array(), $options);
+            $this->formatTranslationCache[$langcode][$code][$string] = $this->t($string, [], $options);
           }
         }
         return $this->formatTranslationCache[$langcode][$code][$string];
diff --git a/web/core/lib/Drupal/Core/Datetime/Element/DateElementBase.php b/web/core/lib/Drupal/Core/Datetime/Element/DateElementBase.php
index 12ab03ba3..63b9abb87 100644
--- a/web/core/lib/Drupal/Core/Datetime/Element/DateElementBase.php
+++ b/web/core/lib/Drupal/Core/Datetime/Element/DateElementBase.php
@@ -66,7 +66,7 @@ abstract class DateElementBase extends FormElement {
       $min_year = min($value_year, $min_year);
       $max_year = max($value_year, $max_year);
     }
-    return array($min_year, $max_year);
+    return [$min_year, $max_year];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php b/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php
index f39d0a290..59177e77e 100644
--- a/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php
+++ b/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php
@@ -19,22 +19,22 @@ class Datelist extends DateElementBase {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
-      '#element_validate' => array(
-        array($class, 'validateDatelist'),
-      ),
-      '#process' => array(
-        array($class, 'processDatelist'),
-      ),
+      '#element_validate' => [
+        [$class, 'validateDatelist'],
+      ],
+      '#process' => [
+        [$class, 'processDatelist'],
+      ],
       '#theme' => 'datetime_form',
-      '#theme_wrappers' => array('datetime_wrapper'),
-      '#date_part_order' => array('year', 'month', 'day', 'hour', 'minute'),
+      '#theme_wrappers' => ['datetime_wrapper'],
+      '#date_part_order' => ['year', 'month', 'day', 'hour', 'minute'],
       '#date_year_range' => '1900:2050',
       '#date_increment' => 1,
-      '#date_date_callbacks' => array(),
+      '#date_date_callbacks' => [],
       '#date_timezone' => '',
-    );
+    ];
   }
 
   /**
@@ -197,8 +197,8 @@ class Datelist extends DateElementBase {
     $element['#tree'] = TRUE;
 
     // Determine the order of the date elements.
-    $order = !empty($element['#date_part_order']) ? $element['#date_part_order'] : array('year', 'month', 'day');
-    $text_parts = !empty($element['#date_text_parts']) ? $element['#date_text_parts'] : array();
+    $order = !empty($element['#date_part_order']) ? $element['#date_part_order'] : ['year', 'month', 'day'];
+    $text_parts = !empty($element['#date_text_parts']) ? $element['#date_text_parts'] : [];
 
     // Output multi-selector for date.
     foreach ($order as $part) {
@@ -248,7 +248,7 @@ class Datelist extends DateElementBase {
 
         default:
           $format = '';
-          $options = array();
+          $options = [];
           $title = '';
       }
 
@@ -259,7 +259,7 @@ class Datelist extends DateElementBase {
       }
 
       $element['#attributes']['title'] = $title;
-      $element[$part] = array(
+      $element[$part] = [
         '#type' => in_array($part, $text_parts) ? 'textfield' : 'select',
         '#title' => $title,
         '#title_display' => 'invisible',
@@ -269,7 +269,7 @@ class Datelist extends DateElementBase {
         '#required' => $element['#required'],
         '#error_no_message' => FALSE,
         '#empty_option' => $title,
-      );
+      ];
     }
 
     // Allows custom callbacks to alter the element.
@@ -315,7 +315,7 @@ class Datelist extends DateElementBase {
       }
       elseif (!empty($all_empty)) {
         foreach ($all_empty as $value) {
-          $form_state->setError($element[$value], t('A value must be selected for %part.', array('%part' => $value)));
+          $form_state->setError($element[$value], t('A value must be selected for %part.', ['%part' => $value]));
         }
       }
       else {
@@ -326,7 +326,7 @@ class Datelist extends DateElementBase {
         }
         // If the input is invalid and an error doesn't exist, set one.
         elseif ($form_state->getError($element) === NULL) {
-          $form_state->setError($element, t('The %field date is invalid.', array('%field' => !empty($element['#title']) ? $element['#title'] : '')));
+          $form_state->setError($element, t('The %field date is invalid.', ['%field' => !empty($element['#title']) ? $element['#title'] : '']));
         }
       }
     }
diff --git a/web/core/lib/Drupal/Core/Datetime/Element/Datetime.php b/web/core/lib/Drupal/Core/Datetime/Element/Datetime.php
index 44a394907..d00547535 100644
--- a/web/core/lib/Drupal/Core/Datetime/Element/Datetime.php
+++ b/web/core/lib/Drupal/Core/Datetime/Element/Datetime.php
@@ -38,30 +38,30 @@ class Datetime extends DateElementBase {
     }
 
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
-      '#element_validate' => array(
-        array($class, 'validateDatetime'),
-      ),
-      '#process' => array(
-        array($class, 'processDatetime'),
-        array($class, 'processGroup'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderGroup'),
-      ),
+      '#element_validate' => [
+        [$class, 'validateDatetime'],
+      ],
+      '#process' => [
+        [$class, 'processDatetime'],
+        [$class, 'processGroup'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderGroup'],
+      ],
       '#theme' => 'datetime_form',
-      '#theme_wrappers' => array('datetime_wrapper'),
+      '#theme_wrappers' => ['datetime_wrapper'],
       '#date_date_format' => $date_format,
       '#date_date_element' => 'date',
-      '#date_date_callbacks' => array(),
+      '#date_date_callbacks' => [],
       '#date_time_format' => $time_format,
       '#date_time_element' => 'time',
-      '#date_time_callbacks' => array(),
+      '#date_time_callbacks' => [],
       '#date_year_range' => '1900:2050',
       '#date_increment' => 1,
       '#date_timezone' => '',
-    );
+    ];
   }
 
   /**
@@ -88,27 +88,27 @@ class Datetime extends DateElementBase {
       catch (\Exception $e) {
         $date = NULL;
       }
-      $input = array(
+      $input = [
         'date'   => $date_input,
         'time'   => $time_input,
         'object' => $date,
-      );
+      ];
     }
     else {
       $date = $element['#default_value'];
       if ($date instanceof DrupalDateTime && !$date->hasErrors()) {
-        $input = array(
+        $input = [
           'date'   => $date->format($element['#date_date_format']),
           'time'   => $date->format($element['#date_time_format']),
           'object' => $date,
-        );
+        ];
       }
       else {
-        $input = array(
+        $input = [
           'date'   => '',
           'time'   => '',
           'object' => NULL,
-        );
+        ];
       }
     }
     return $input;
@@ -213,7 +213,7 @@ class Datetime extends DateElementBase {
    *   The form element whose value has been processed.
    */
   public static function processDatetime(&$element, FormStateInterface $form_state, &$complete_form) {
-    $format_settings = array();
+    $format_settings = [];
     // The value callback has populated the #value array.
     $date = !empty($element['#value']['object']) ? $element['#value']['object'] : NULL;
 
@@ -235,10 +235,10 @@ class Datetime extends DateElementBase {
       // Creating format examples on every individual date item is messy, and
       // placeholders are invalid for HTML5 date and datetime, so an example
       // format is appended to the title to appear in tooltips.
-      $extra_attributes = array(
-        'title' => t('Date (e.g. @format)', array('@format' => static::formatExample($date_format))),
+      $extra_attributes = [
+        'title' => t('Date (e.g. @format)', ['@format' => static::formatExample($date_format)]),
         'type' => $element['#date_date_element'],
-      );
+      ];
 
       // Adds the HTML5 date attributes.
       if ($date instanceof DrupalDateTime && !$date->hasErrors()) {
@@ -248,13 +248,13 @@ class Datetime extends DateElementBase {
         $html5_max = clone($date);
         $html5_max->setDate($range[1], 12, 31)->setTime(23, 59, 59);
 
-        $extra_attributes += array(
+        $extra_attributes += [
           'min' => $html5_min->format($date_format, $format_settings),
           'max' => $html5_max->format($date_format, $format_settings),
-        );
+        ];
       }
 
-      $element['date'] = array(
+      $element['date'] = [
         '#type' => 'date',
         '#title' => t('Date'),
         '#title_display' => 'invisible',
@@ -264,7 +264,7 @@ class Datetime extends DateElementBase {
         '#size' => max(12, strlen($element['#value']['date'])),
         '#error_no_message' => TRUE,
         '#date_date_format' => $element['#date_date_format'],
-      );
+      ];
 
       // Allows custom callbacks to alter the element.
       if (!empty($element['#date_date_callbacks'])) {
@@ -282,12 +282,12 @@ class Datetime extends DateElementBase {
       $time_value = !empty($date) ? $date->format($time_format, $format_settings) : $element['#value']['time'];
 
       // Adds the HTML5 attributes.
-      $extra_attributes = array(
-        'title' => t('Time (e.g. @format)', array('@format' => static::formatExample($time_format))),
+      $extra_attributes = [
+        'title' => t('Time (e.g. @format)', ['@format' => static::formatExample($time_format)]),
         'type' => $element['#date_time_element'],
         'step' => $element['#date_increment'],
-      );
-      $element['time'] = array(
+      ];
+      $element['time'] = [
         '#type' => 'date',
         '#title' => t('Time'),
         '#title_display' => 'invisible',
@@ -296,7 +296,7 @@ class Datetime extends DateElementBase {
         '#required' => $element['#required'],
         '#size' => 12,
         '#error_no_message' => TRUE,
-      );
+      ];
 
       // Allows custom callbacks to alter the element.
       if (!empty($element['#date_time_callbacks'])) {
@@ -343,7 +343,7 @@ class Datetime extends DateElementBase {
       // If there's empty input and the field is required, set an error. A
       // reminder of the required format in the message provides a good UX.
       elseif (empty($input['date']) && empty($input['time']) && $element['#required']) {
-        $form_state->setError($element, t('The %field date is required. Please enter a date in the format %format.', array('%field' => $title, '%format' => static::formatExample($format))));
+        $form_state->setError($element, t('The %field date is required. Please enter a date in the format %format.', ['%field' => $title, '%format' => static::formatExample($format)]));
       }
       else {
         // If the date is valid, set it.
@@ -354,7 +354,7 @@ class Datetime extends DateElementBase {
         // If the date is invalid, set an error. A reminder of the required
         // format in the message provides a good UX.
         else {
-          $form_state->setError($element, t('The %field date is invalid. Please enter a date in the format %format.', array('%field' => $title, '%format' => static::formatExample($format))));
+          $form_state->setError($element, t('The %field date is invalid. Please enter a date in the format %format.', ['%field' => $title, '%format' => static::formatExample($format)]));
         }
       }
     }
diff --git a/web/core/lib/Drupal/Core/Datetime/Plugin/Field/FieldWidget/TimestampDatetimeWidget.php b/web/core/lib/Drupal/Core/Datetime/Plugin/Field/FieldWidget/TimestampDatetimeWidget.php
index d11cf54eb..1ffa01091 100644
--- a/web/core/lib/Drupal/Core/Datetime/Plugin/Field/FieldWidget/TimestampDatetimeWidget.php
+++ b/web/core/lib/Drupal/Core/Datetime/Plugin/Field/FieldWidget/TimestampDatetimeWidget.php
@@ -30,12 +30,12 @@ class TimestampDatetimeWidget extends WidgetBase {
     $date_format = DateFormat::load('html_date')->getPattern();
     $time_format = DateFormat::load('html_time')->getPattern();
     $default_value = isset($items[$delta]->value) ? DrupalDateTime::createFromTimestamp($items[$delta]->value) : '';
-    $element['value'] = $element + array(
+    $element['value'] = $element + [
       '#type' => 'datetime',
       '#default_value' => $default_value,
       '#date_year_range' => '1902:2037',
-    );
-    $element['value']['#description'] = $this->t('Format: %format. Leave blank to use the time of form submission.', array('%format' => Datetime::formatExample($date_format . ' ' . $time_format)));
+    ];
+    $element['value']['#description'] = $this->t('Format: %format. Leave blank to use the time of form submission.', ['%format' => Datetime::formatExample($date_format . ' ' . $time_format)]);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php
index 52254a1bd..f636fb023 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php
@@ -20,7 +20,7 @@ class RegisterAccessChecksPass implements CompilerPassInterface {
     // Add services tagged 'access_check' to the access_manager service.
     $access_manager = $container->getDefinition('access_manager.check_provider');
     foreach ($container->findTaggedServiceIds('access_check') as $id => $attributes) {
-      $applies = array();
+      $applies = [];
       $method = 'access';
       $needs_incoming_request = FALSE;
       foreach ($attributes as $attribute) {
@@ -34,7 +34,7 @@ class RegisterAccessChecksPass implements CompilerPassInterface {
           $needs_incoming_request = TRUE;
         }
       }
-      $access_manager->addMethodCall('addCheckService', array($id, $method, $applies, $needs_incoming_request));
+      $access_manager->addMethodCall('addCheckService', [$id, $method, $applies, $needs_incoming_request]);
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterServicesForDestructionPass.php b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterServicesForDestructionPass.php
index a106cfcab..5e13eea02 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterServicesForDestructionPass.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterServicesForDestructionPass.php
@@ -24,7 +24,7 @@ class RegisterServicesForDestructionPass implements CompilerPassInterface {
     $definition = $container->getDefinition('kernel_destruct_subscriber');
     $services = $container->findTaggedServiceIds('needs_destruction');
     foreach ($services as $id => $attributes) {
-      $definition->addMethodCall('registerService', array($id));
+      $definition->addMethodCall('registerService', [$id]);
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterStreamWrappersPass.php b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterStreamWrappersPass.php
index 7abf49f49..f1ea8cd5b 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterStreamWrappersPass.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterStreamWrappersPass.php
@@ -24,7 +24,7 @@ class RegisterStreamWrappersPass implements CompilerPassInterface {
       $class = $container->getDefinition($id)->getClass();
       $scheme = $attributes[0]['scheme'];
 
-      $stream_wrapper_manager->addMethodCall('addStreamWrapper', array($id, $class, $scheme));
+      $stream_wrapper_manager->addMethodCall('addStreamWrapper', [$id, $class, $scheme]);
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/TaggedHandlersPass.php b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/TaggedHandlersPass.php
index 04b56aa44..bb87d5e48 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/TaggedHandlersPass.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/TaggedHandlersPass.php
@@ -77,6 +77,7 @@ class TaggedHandlersPass implements CompilerPassInterface {
   public function process(ContainerBuilder $container) {
     foreach ($container->findTaggedServiceIds('service_collector') as $consumer_id => $passes) {
       foreach ($passes as $pass) {
+        $interface = NULL;
         $tag = isset($pass['tag']) ? $pass['tag'] : $consumer_id;
         $method_name = isset($pass['call']) ? $pass['call'] : 'addHandler';
         $required = isset($pass['required']) ? $pass['required'] : FALSE;
@@ -107,17 +108,17 @@ class TaggedHandlersPass implements CompilerPassInterface {
         // Determine the ID.
 
         if (!isset($interface)) {
-          throw new LogicException(vsprintf("Service consumer '%s' class method %s::%s() has to type-hint an interface.", array(
+          throw new LogicException(vsprintf("Service consumer '%s' class method %s::%s() has to type-hint an interface.", [
             $consumer_id,
             $consumer->getClass(),
             $method_name,
-          )));
+          ]));
         }
         $interface = $interface->getName();
 
         // Find all tagged handlers.
-        $handlers = array();
-        $extra_arguments = array();
+        $handlers = [];
+        $extra_arguments = [];
         foreach ($container->findTaggedServiceIds($tag) as $id => $attributes) {
           // Validate the interface.
           $handler = $container->getDefinition($id);
@@ -142,7 +143,7 @@ class TaggedHandlersPass implements CompilerPassInterface {
         // Add a method call for each handler to the consumer service
         // definition.
         foreach ($handlers as $id => $priority) {
-          $arguments = array();
+          $arguments = [];
           $arguments[$interface_pos] = new Reference($id);
           if (isset($priority_pos)) {
             $arguments[$priority_pos] = $priority;
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/TwigExtensionPass.php b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/TwigExtensionPass.php
index d5c793199..73ee17b68 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/TwigExtensionPass.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/TwigExtensionPass.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\DependencyInjection\Compiler;
 
+use Drupal\Component\Utility\Crypt;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -26,7 +27,7 @@ class TwigExtensionPass implements CompilerPassInterface {
       $twig_extension_hash .= $class_name . filemtime($reflection->getFileName());
     }
 
-    $container->setParameter('twig_extension_hash', hash('crc32b', $twig_extension_hash));
+    $container->setParameter('twig_extension_hash', Crypt::hashBase64($twig_extension_hash));
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php b/web/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
index ed2b35fb7..7f3cb5d6f 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
@@ -14,13 +14,13 @@ trait DependencySerializationTrait {
    *
    * @var array
    */
-  protected $_serviceIds = array();
+  protected $_serviceIds = [];
 
   /**
    * {@inheritdoc}
    */
   public function __sleep() {
-    $this->_serviceIds = array();
+    $this->_serviceIds = [];
     $vars = get_object_vars($this);
     foreach ($vars as $key => $value) {
       if (is_object($value) && isset($value->_serviceId)) {
@@ -52,7 +52,7 @@ trait DependencySerializationTrait {
     foreach ($this->_serviceIds as $key => $service_id) {
       $this->$key = $container->get($service_id);
     }
-    $this->_serviceIds = array();
+    $this->_serviceIds = [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Diff/DiffFormatter.php b/web/core/lib/Drupal/Core/Diff/DiffFormatter.php
index 8ebe2f479..a613711f5 100644
--- a/web/core/lib/Drupal/Core/Diff/DiffFormatter.php
+++ b/web/core/lib/Drupal/Core/Diff/DiffFormatter.php
@@ -17,7 +17,7 @@ class DiffFormatter extends DiffFormatterBase {
    *
    * @var array
    */
-  protected $rows = array();
+  protected $rows = [];
 
   /**
    * Creates a DiffFormatter to render diffs in a table.
@@ -35,7 +35,7 @@ class DiffFormatter extends DiffFormatterBase {
    * {@inheritdoc}
    */
   protected function _start_diff() {
-    $this->rows = array();
+    $this->rows = [];
   }
 
   /**
@@ -49,16 +49,16 @@ class DiffFormatter extends DiffFormatterBase {
    * {@inheritdoc}
    */
   protected function _block_header($xbeg, $xlen, $ybeg, $ylen) {
-    return array(
-      array(
+    return [
+      [
         'data' => $xbeg + $this->line_stats['offset']['x'],
         'colspan' => 2,
-      ),
-      array(
+      ],
+      [
         'data' => $ybeg + $this->line_stats['offset']['y'],
         'colspan' => 2,
-      )
-    );
+      ]
+    ];
   }
 
   /**
@@ -86,16 +86,16 @@ class DiffFormatter extends DiffFormatterBase {
    *   An array representing a table row.
    */
   protected function addedLine($line) {
-    return array(
-      array(
+    return [
+      [
         'data' => '+',
         'class' => 'diff-marker',
-      ),
-      array(
+      ],
+      [
         'data' => ['#markup' => $line],
         'class' => 'diff-context diff-addedline',
-      )
-    );
+      ]
+    ];
   }
 
   /**
@@ -108,16 +108,16 @@ class DiffFormatter extends DiffFormatterBase {
    *   An array representing a table row.
    */
   protected function deletedLine($line) {
-    return array(
-      array(
+    return [
+      [
         'data' => '-',
         'class' => 'diff-marker',
-      ),
-      array(
+      ],
+      [
         'data' => ['#markup' => $line],
         'class' => 'diff-context diff-deletedline',
-      )
-    );
+      ]
+    ];
   }
 
   /**
@@ -130,13 +130,13 @@ class DiffFormatter extends DiffFormatterBase {
    *   An array representing a table row.
    */
   protected function contextLine($line) {
-    return array(
+    return [
       ' ',
-      array(
+      [
         'data' => ['#markup' => $line],
         'class' => 'diff-context',
-      )
-    );
+      ]
+    ];
   }
 
   /**
@@ -146,10 +146,10 @@ class DiffFormatter extends DiffFormatterBase {
    *   An array representing a table row.
    */
   protected function emptyLine() {
-    return array(
+    return [
       ' ',
       ' ',
-    );
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Display/VariantBase.php b/web/core/lib/Drupal/Core/Display/VariantBase.php
index 5110d209b..4f7ce9e9f 100644
--- a/web/core/lib/Drupal/Core/Display/VariantBase.php
+++ b/web/core/lib/Drupal/Core/Display/VariantBase.php
@@ -69,9 +69,9 @@ abstract class VariantBase extends PluginBase implements VariantInterface {
    * {@inheritdoc}
    */
   public function getConfiguration() {
-    return array(
+    return [
       'id' => $this->getPluginId(),
-    ) + $this->configuration;
+    ] + $this->configuration;
   }
 
   /**
@@ -86,11 +86,11 @@ abstract class VariantBase extends PluginBase implements VariantInterface {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'label' => '',
       'uuid' => '',
       'weight' => 0,
-    );
+    ];
   }
 
   /**
@@ -104,13 +104,13 @@ abstract class VariantBase extends PluginBase implements VariantInterface {
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label'),
       '#description' => $this->t('The label for this display variant.'),
       '#default_value' => $this->label(),
       '#maxlength' => '255',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/lib/Drupal/Core/DrupalKernel.php b/web/core/lib/Drupal/Core/DrupalKernel.php
index 16ebb9713..db773ed28 100644
--- a/web/core/lib/Drupal/Core/DrupalKernel.php
+++ b/web/core/lib/Drupal/Core/DrupalKernel.php
@@ -17,11 +17,14 @@ use Drupal\Core\DependencyInjection\YamlFileLoader;
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\Core\File\MimeType\MimeTypeGuesser;
 use Drupal\Core\Http\TrustedHostsRequestFactory;
+use Drupal\Core\Installer\InstallerRedirectTrait;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Test\TestDatabase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\ClassLoader\ApcClassLoader;
+use Symfony\Component\ClassLoader\WinCacheClassLoader;
+use Symfony\Component\ClassLoader\XcacheClassLoader;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -46,6 +49,7 @@ use Symfony\Component\Routing\Route;
  * container, or modify existing services.
  */
 class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
+  use InstallerRedirectTrait;
 
   /**
    * Holds the class used for dumping the container to a PHP array.
@@ -138,7 +142,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    *
    * @var \Drupal\Core\Extension\Extension[]
    */
-  protected $moduleData = array();
+  protected $moduleData = [];
 
   /**
    * The class loader object.
@@ -383,7 +387,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     }
     $http_host = $request->getHttpHost();
 
-    $sites = array();
+    $sites = [];
     include $app_root . '/sites/sites.php';
 
     $uri = explode('/', $script_name);
@@ -476,7 +480,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     $this->booted = FALSE;
     $this->container = NULL;
     $this->moduleList = NULL;
-    $this->moduleData = array();
+    $this->moduleData = [];
   }
 
   /**
@@ -565,21 +569,21 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    * {@inheritdoc}
    */
   public function discoverServiceProviders() {
-    $this->serviceYamls = array(
-      'app' => array(),
-      'site' => array(),
-    );
-    $this->serviceProviderClasses = array(
-      'app' => array(),
-      'site' => array(),
-    );
+    $this->serviceYamls = [
+      'app' => [],
+      'site' => [],
+    ];
+    $this->serviceProviderClasses = [
+      'app' => [],
+      'site' => [],
+    ];
     $this->serviceYamls['app']['core'] = 'core/core.services.yml';
     $this->serviceProviderClasses['app']['core'] = 'Drupal\Core\CoreServiceProvider';
 
     // Retrieve enabled modules and register their namespaces.
     if (!isset($this->moduleList)) {
       $extensions = $this->getConfigStorage()->read('core.extension');
-      $this->moduleList = isset($extensions['module']) ? $extensions['module'] : array();
+      $this->moduleList = isset($extensions['module']) ? $extensions['module'] : [];
     }
     $module_filenames = $this->getModuleFileNames();
     $this->classLoaderAddMultiplePsr4($this->getModuleNamespacesPsr4($module_filenames));
@@ -645,7 +649,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
       // installed yet (i.e., if no $databases array has been defined in the
       // settings.php file) and we are not already installing.
       if (!Database::getConnectionInfo() && !drupal_installation_attempted() && PHP_SAPI !== 'cli') {
-        $response = new RedirectResponse($request->getBasePath() . '/core/install.php');
+        $response = new RedirectResponse($request->getBasePath() . '/core/install.php', 302, ['Cache-Control' => 'no-cache']);
       }
       else {
         $this->boot();
@@ -684,14 +688,17 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    *   If the passed in exception cannot be turned into a response.
    */
   protected function handleException(\Exception $e, $request, $type) {
+    if ($this->shouldRedirectToInstaller($e, $this->container ? $this->container->get('database') : NULL)) {
+      return new RedirectResponse($request->getBasePath() . '/core/install.php', 302, ['Cache-Control' => 'no-cache']);
+    }
+
     if ($e instanceof HttpExceptionInterface) {
       $response = new Response($e->getMessage(), $e->getStatusCode());
       $response->headers->add($e->getHeaders());
       return $response;
     }
-    else {
-      throw $e;
-    }
+
+    throw $e;
   }
 
   /**
@@ -725,7 +732,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     if (!$this->moduleData) {
       // First, find profiles.
       $listing = new ExtensionDiscovery($this->root);
-      $listing->setProfileDirectories(array());
+      $listing->setProfileDirectories([]);
       $all_profiles = $listing->scan('profile');
       $profiles = array_intersect_key($all_profiles, $this->moduleList);
 
@@ -736,7 +743,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
       if ($parent_profile && !isset($profiles[$parent_profile])) {
         // In case both profile directories contain the same extension, the
         // actual profile always has precedence.
-        $profiles = array($parent_profile => $all_profiles[$parent_profile]) + $profiles;
+        $profiles = [$parent_profile => $all_profiles[$parent_profile]] + $profiles;
       }
 
       $profile_directories = array_map(function ($profile) {
@@ -756,7 +763,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    * @todo Remove obsolete $module_list parameter. Only $module_filenames is
    *   needed.
    */
-  public function updateModules(array $module_list, array $module_filenames = array()) {
+  public function updateModules(array $module_list, array $module_filenames = []) {
     $pre_existing_module_namespaces = [];
     if ($this->booted && is_array($this->moduleList)) {
       $pre_existing_module_namespaces = $this->getModuleNamespacesPsr4($this->getModuleFileNames());
@@ -807,7 +814,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    *   The cache key used for the service container.
    */
   protected function getContainerCacheKey() {
-    $parts = array('service_container', $this->environment, \Drupal::VERSION, Settings::get('deployment_identifier'), PHP_OS, serialize(Settings::get('container_yamls')));
+    $parts = ['service_container', $this->environment, \Drupal::VERSION, Settings::get('deployment_identifier'), PHP_OS, serialize(Settings::get('container_yamls'))];
     return implode(':', $parts);
   }
 
@@ -817,9 +824,9 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    * @return array An array of kernel parameters
    */
   protected function getKernelParameters() {
-    return array(
+    return [
       'kernel.environment' => $this->environment,
-    );
+    ];
   }
 
   /**
@@ -1016,32 +1023,45 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
 
     // Initialize our list of trusted HTTP Host headers to protect against
     // header attacks.
-    $host_patterns = Settings::get('trusted_host_patterns', array());
+    $host_patterns = Settings::get('trusted_host_patterns', []);
     if (PHP_SAPI !== 'cli' && !empty($host_patterns)) {
       if (static::setupTrustedHosts($request, $host_patterns) === FALSE) {
         throw new BadRequestHttpException('The provided host name is not valid for this server.');
       }
     }
 
-    // If the class loader is still the same, possibly upgrade to the APC class
-    // loader.
+    // If the class loader is still the same, possibly
+    // upgrade to an optimized class loader.
     if ($class_loader_class == get_class($this->classLoader)
-        && Settings::get('class_loader_auto_detect', TRUE)
-        && function_exists('apcu_fetch')) {
+        && Settings::get('class_loader_auto_detect', TRUE)) {
       $prefix = Settings::getApcuPrefix('class_loader', $this->root);
-      $apc_loader = new ApcClassLoader($prefix, $this->classLoader);
-      $this->classLoader->unregister();
-      // The optimized classloader might be persistent and store cache misses.
-      // For example, once a cache miss is stored in APCu clearing it on a
-      // specific web-head will not clear any other web-heads. Therefore
-      // fallback to the composer class loader that only statically caches
-      // misses.
-      $old_loader = $this->classLoader;
-      $this->classLoader = $apc_loader;
-      // Our class loaders are preprended to ensure they come first like the
-      // class loader they are replacing.
-      $old_loader->register(TRUE);
-      $apc_loader->register(TRUE);
+      $loader = NULL;
+
+      // We autodetect one of the following three optimized classloaders, if
+      // their underlying extension exists.
+      if (function_exists('apcu_fetch')) {
+        $loader = new ApcClassLoader($prefix, $this->classLoader);
+      }
+      elseif (extension_loaded('wincache')) {
+        $loader = new WinCacheClassLoader($prefix, $this->classLoader);
+      }
+      elseif (extension_loaded('xcache')) {
+        $loader = new XcacheClassLoader($prefix, $this->classLoader);
+      }
+      if (!empty($loader)) {
+        $this->classLoader->unregister();
+        // The optimized classloader might be persistent and store cache misses.
+        // For example, once a cache miss is stored in APCu clearing it on a
+        // specific web-head will not clear any other web-heads. Therefore
+        // fallback to the composer class loader that only statically caches
+        // misses.
+        $old_loader = $this->classLoader;
+        $this->classLoader = $loader;
+        // Our class loaders are preprended to ensure they come first like the
+        // class loader they are replacing.
+        $old_loader->register(TRUE);
+        $loader->register(TRUE);
+      }
     }
   }
 
@@ -1089,7 +1109,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    * Returns service instances to persist from an old container to a new one.
    */
   protected function getServicesToPersist(ContainerInterface $container) {
-    $persist = array();
+    $persist = [];
     foreach ($container->getParameter('persist_ids') as $id) {
       // It's pointless to persist services not yet initialized.
       if ($container->initialized($id)) {
@@ -1118,7 +1138,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
   public function rebuildContainer() {
     // Empty module properties and for them to be reloaded from scratch.
     $this->moduleList = NULL;
-    $this->moduleData = array();
+    $this->moduleData = [];
     $this->containerNeedsRebuild = TRUE;
     return $this->initializeContainer();
   }
@@ -1150,7 +1170,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    * @return ContainerInterface
    */
   protected function attachSynthetic(ContainerInterface $container) {
-    $persist = array();
+    $persist = [];
     if (isset($this->container)) {
       $persist = $this->getServicesToPersist($this->container);
     }
@@ -1184,6 +1204,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     $container = $this->getContainerBuilder();
     $container->set('kernel', $this);
     $container->setParameter('container.modules', $this->getModulesParameter());
+    $container->setParameter('install_profile', $this->getInstallProfile());
 
     // Get a list of namespaces and put it onto the container.
     $namespaces = $this->getModuleNamespacesPsr4($this->getModuleFileNames());
@@ -1192,7 +1213,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     // - Element
     // - Entity
     // - Plugin
-    foreach (array('Core', 'Component') as $parent_directory) {
+    foreach (['Core', 'Component'] as $parent_directory) {
       $path = 'core/lib/Drupal/' . $parent_directory;
       $parent_namespace = 'Drupal\\' . $parent_directory;
       foreach (new \DirectoryIterator($this->root . '/' . $path) as $component) {
@@ -1217,7 +1238,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     $default_language_values = Language::$defaultValues;
     if ($system = $this->getConfigStorage()->read('system.site')) {
       if ($default_language_values['id'] != $system['langcode']) {
-        $default_language_values = array('id' => $system['langcode']);
+        $default_language_values = ['id' => $system['langcode']];
       }
     }
     $container->setParameter('language.default_values', $default_language_values);
@@ -1251,7 +1272,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     // the container during the lifetime of the kernel (e.g., during a kernel
     // reboot). Include synthetic services, because by definition, they cannot
     // be automatically reinstantiated. Also include services tagged to persist.
-    $persist_ids = array();
+    $persist_ids = [];
     foreach ($container->getDefinitions() as $id => $definition) {
       // It does not make sense to persist the container itself, exclude it.
       if ($id !== 'service_container' && ($definition->isSynthetic() || $definition->getTag('persist'))) {
@@ -1271,10 +1292,10 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    */
   protected function initializeServiceProviders() {
     $this->discoverServiceProviders();
-    $this->serviceProviders = array(
-      'app' => array(),
-      'site' => array(),
-    );
+    $this->serviceProviders = [
+      'app' => [],
+      'site' => [],
+    ];
     foreach ($this->serviceProviderClasses as $origin => $classes) {
       foreach ($classes as $name => $class) {
         if (!is_object($class)) {
@@ -1354,14 +1375,14 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    * @return array
    */
   protected function getModulesParameter() {
-    $extensions = array();
+    $extensions = [];
     foreach ($this->moduleList as $name => $weight) {
       if ($data = $this->moduleData($name)) {
-        $extensions[$name] = array(
+        $extensions[$name] = [
           'type' => $data->getType(),
           'pathname' => $data->getPathname(),
           'filename' => $data->getExtensionFilename(),
-        );
+        ];
       }
     }
     return $extensions;
@@ -1375,7 +1396,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    *   respective *.info.yml file.
    */
   protected function getModuleFileNames() {
-    $filenames = array();
+    $filenames = [];
     foreach ($this->moduleList as $module => $weight) {
       if ($data = $this->moduleData($module)) {
         $filenames[$module] = $data->getPathname();
@@ -1396,7 +1417,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    *   value is the PSR-4 base directory associated with the module namespace.
    */
   protected function getModuleNamespacesPsr4($module_file_names) {
-    $namespaces = array();
+    $namespaces = [];
     foreach ($module_file_names as $module => $filename) {
       $namespaces["Drupal\\$module"] = dirname($filename) . '/src';
     }
@@ -1415,7 +1436,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    *   the front controller, but may also be decorated; e.g.,
    *   \Symfony\Component\ClassLoader\ApcClassLoader.
    */
-  protected function classLoaderAddMultiplePsr4(array $namespaces = array(), $class_loader = NULL) {
+  protected function classLoaderAddMultiplePsr4(array $namespaces = [], $class_loader = NULL) {
     if ($class_loader === NULL) {
       $class_loader = $this->classLoader;
     }
@@ -1541,4 +1562,25 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     $this->serviceYamls['site'] = array_filter($service_yamls, 'file_exists');
   }
 
+  /**
+   * Gets the active install profile.
+   *
+   * @return string|null
+   *   The name of the any active install profile or distribution.
+   */
+  protected function getInstallProfile() {
+    $config = $this->getConfigStorage()->read('core.extension');
+    if (!empty($config['profile'])) {
+      $install_profile = $config['profile'];
+    }
+    // @todo https://www.drupal.org/node/2831065 remove the BC layer.
+    else {
+      // If system_update_8300() has not yet run fallback to using settings.
+      $install_profile = Settings::get('install_profile');
+    }
+
+    // Normalize an empty string to a NULL value.
+    return empty($install_profile) ? NULL : $install_profile;
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/DrupalKernelInterface.php b/web/core/lib/Drupal/Core/DrupalKernelInterface.php
index 862fbec59..c38fff5db 100644
--- a/web/core/lib/Drupal/Core/DrupalKernelInterface.php
+++ b/web/core/lib/Drupal/Core/DrupalKernelInterface.php
@@ -100,7 +100,7 @@ interface DrupalKernelInterface extends HttpKernelInterface, ContainerAwareInter
    * @param array $module_filenames
    *   List of module filenames, keyed by module name.
    */
-  public function updateModules(array $module_list, array $module_filenames = array());
+  public function updateModules(array $module_list, array $module_filenames = []);
 
   /**
    * Force a container rebuild.
diff --git a/web/core/lib/Drupal/Core/Entity/Annotation/ConfigEntityType.php b/web/core/lib/Drupal/Core/Entity/Annotation/ConfigEntityType.php
index b74f21b5f..4e1785299 100644
--- a/web/core/lib/Drupal/Core/Entity/Annotation/ConfigEntityType.php
+++ b/web/core/lib/Drupal/Core/Entity/Annotation/ConfigEntityType.php
@@ -31,7 +31,7 @@ class ConfigEntityType extends EntityType {
    * {@inheritdoc}
    */
   public function get() {
-    $this->definition['group_label'] = new TranslatableMarkup('Configuration', array(), array('context' => 'Entity type group'));
+    $this->definition['group_label'] = new TranslatableMarkup('Configuration', [], ['context' => 'Entity type group']);
 
     return parent::get();
   }
diff --git a/web/core/lib/Drupal/Core/Entity/Annotation/ContentEntityType.php b/web/core/lib/Drupal/Core/Entity/Annotation/ContentEntityType.php
index 4995d449f..0817c930f 100644
--- a/web/core/lib/Drupal/Core/Entity/Annotation/ContentEntityType.php
+++ b/web/core/lib/Drupal/Core/Entity/Annotation/ContentEntityType.php
@@ -32,7 +32,7 @@ class ContentEntityType extends EntityType {
    * {@inheritdoc}
    */
   public function get() {
-    $this->definition['group_label'] = new TranslatableMarkup('Content', array(), array('context' => 'Entity type group'));
+    $this->definition['group_label'] = new TranslatableMarkup('Content', [], ['context' => 'Entity type group']);
 
     return parent::get();
   }
diff --git a/web/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php b/web/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php
index c3949e709..96bc6b127 100644
--- a/web/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php
+++ b/web/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php
@@ -60,7 +60,7 @@ class EntityReferenceSelection extends Plugin {
    *
    * @var array (optional)
    */
-  public $entity_types = array();
+  public $entity_types = [];
 
   /**
    * The weight of the plugin in it's group.
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/web/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 7c0a4581d..30f5c7a86 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -5,10 +5,12 @@ namespace Drupal\Core\Entity;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\Plugin\DataType\EntityReference;
 use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Field\ChangedFieldItemList;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\TypedData\TranslationStatusInterface;
 use Drupal\Core\TypedData\TypedDataInterface;
 
 /**
@@ -16,22 +18,7 @@ use Drupal\Core\TypedData\TypedDataInterface;
  *
  * @ingroup entity_api
  */
-abstract class ContentEntityBase extends Entity implements \IteratorAggregate, ContentEntityInterface {
-
-  /**
-   * Status code identifying a removed translation.
-   */
-  const TRANSLATION_REMOVED = 0;
-
-  /**
-   * Status code identifying an existing translation.
-   */
-  const TRANSLATION_EXISTING = 1;
-
-  /**
-   * Status code identifying a newly created translation.
-   */
-  const TRANSLATION_CREATED = 2;
+abstract class ContentEntityBase extends Entity implements \IteratorAggregate, ContentEntityInterface, TranslationStatusInterface {
 
   /**
    * The plain data values of the contained fields.
@@ -46,14 +33,14 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    *
    * @var array
    */
-  protected $values = array();
+  protected $values = [];
 
   /**
    * The array of fields, each being an instance of FieldItemListInterface.
    *
    * @var array
    */
-  protected $fields = array();
+  protected $fields = [];
 
   /**
    * Local cache for field definitions.
@@ -111,7 +98,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    *
    * @var array
    */
-  protected $translations = array();
+  protected $translations = [];
 
   /**
    * A flag indicating whether a translation object is being initialized.
@@ -139,14 +126,14 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    *
    * @var array
    */
-  protected $entityKeys = array();
+  protected $entityKeys = [];
 
   /**
    * Holds translatable entity keys such as the label.
    *
    * @var array
    */
-  protected $translatableEntityKeys = array();
+  protected $translatableEntityKeys = [];
 
   /**
    * Whether entity validation was performed.
@@ -162,10 +149,17 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    */
   protected $validationRequired = FALSE;
 
+  /**
+   * The loaded revision ID before the new revision was set.
+   *
+   * @var int
+   */
+  protected $loadedRevisionId;
+
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $values, $entity_type, $bundle = FALSE, $translations = array()) {
+  public function __construct(array $values, $entity_type, $bundle = FALSE, $translations = []) {
     $this->entityTypeId = $entity_type;
     $this->entityKeys['bundle'] = $bundle ? $bundle : $this->entityTypeId;
     $this->langcodeKey = $this->getEntityType()->getKey('langcode');
@@ -220,7 +214,10 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
 
     // Initialize translations. Ensure we have at least an entry for the default
     // language.
-    $data = array('status' => static::TRANSLATION_EXISTING);
+    // We determine if the entity is new by checking in the entity values for
+    // the presence of the id entity key, as the usage of ::isNew() is not
+    // possible in the constructor.
+    $data = isset($values[$this->getEntityType()->getKey('id')]) ? ['status' => static::TRANSLATION_EXISTING] : ['status' => static::TRANSLATION_CREATED];
     $this->translations[LanguageInterface::LANGCODE_DEFAULT] = $data;
     $this->setDefaultLangcode();
     if ($translations) {
@@ -230,6 +227,11 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
         }
       }
     }
+    if ($this->getEntityType()->isRevisionable()) {
+      // Store the loaded revision ID the entity has been loaded with to
+      // keep it safe from changes.
+      $this->updateLoadedRevisionId();
+    }
   }
 
   /**
@@ -242,7 +244,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
       // we return a mock language object to avoid disrupting the consuming
       // code.
       if (!isset($this->languages[$this->defaultLangcode])) {
-        $this->languages[$this->defaultLangcode] = new Language(array('id' => $this->defaultLangcode));
+        $this->languages[$this->defaultLangcode] = new Language(['id' => $this->defaultLangcode]);
       }
     }
     return $this->languages;
@@ -281,6 +283,21 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     $this->newRevision = $value;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getLoadedRevisionId() {
+    return $this->loadedRevisionId;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function updateLoadedRevisionId() {
+    $this->loadedRevisionId = $this->getRevisionId() ?: $this->loadedRevisionId;
+    return $this;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -296,7 +313,9 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     if (isset($new_value)) {
       $this->isDefaultRevision = (bool) $new_value;
     }
-    return $return;
+    // New entities should always ensure at least one default revision exists,
+    // creating an entity without a default revision is an invalid state.
+    return $this->isNew() || $return;
   }
 
   /**
@@ -365,6 +384,25 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
   public function preSaveRevision(EntityStorageInterface $storage, \stdClass $record) {
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function postSave(EntityStorageInterface $storage, $update = TRUE) {
+    parent::postSave($storage, $update);
+
+    // Update the status of all saved translations.
+    $removed = [];
+    foreach ($this->translations as $langcode => &$data) {
+      if ($data['status'] == static::TRANSLATION_REMOVED) {
+        $removed[$langcode] = TRUE;
+      }
+      else {
+        $data['status'] = static::TRANSLATION_EXISTING;
+      }
+    }
+    $this->translations = array_diff_key($this->translations, $removed);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -408,7 +446,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
         $this->values[$name][$langcode] = $field->getValue();
       }
     }
-    $this->fields = array();
+    $this->fields = [];
     $this->fieldDefinitions = NULL;
     $this->languages = NULL;
     $this->clearTranslationCache();
@@ -517,7 +555,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    * {@inheritdoc}
    */
   public function getFields($include_computed = TRUE) {
-    $fields = array();
+    $fields = [];
     foreach ($this->getFieldDefinitions() as $name => $definition) {
       if ($include_computed || !$definition->isComputed()) {
         $fields[$name] = $this->get($name);
@@ -572,7 +610,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    * {@inheritdoc}
    */
   public function toArray() {
-    $values = array();
+    $values = [];
     foreach ($this->getFields() as $name => $property) {
       $values[$name] = $property->getValue();
     }
@@ -684,7 +722,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
           // Update the default internal language cache.
           $this->setDefaultLangcode();
           if (isset($this->translations[$this->defaultLangcode])) {
-            $message = SafeMarkup::format('A translation already exists for the specified language (@langcode).', array('@langcode' => $this->defaultLangcode));
+            $message = SafeMarkup::format('A translation already exists for the specified language (@langcode).', ['@langcode' => $this->defaultLangcode]);
             throw new \InvalidArgumentException($message);
           }
           $this->updateFieldLangcodes($this->defaultLangcode);
@@ -695,7 +733,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
           $items = $this->get($this->langcodeKey);
           if ($items->value != $this->activeLangcode) {
             $items->setValue($this->activeLangcode, FALSE);
-            $message = SafeMarkup::format('The translation language cannot be changed (@langcode).', array('@langcode' => $this->activeLangcode));
+            $message = SafeMarkup::format('The translation language cannot be changed (@langcode).', ['@langcode' => $this->activeLangcode]);
             throw new \LogicException($message);
           }
         }
@@ -706,7 +744,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
         //   read-only. See https://www.drupal.org/node/2443991.
         if (isset($this->values[$this->defaultLangcodeKey]) && $this->get($this->defaultLangcodeKey)->value != $this->isDefaultTranslation()) {
           $this->get($this->defaultLangcodeKey)->setValue($this->isDefaultTranslation(), FALSE);
-          $message = SafeMarkup::format('The default translation flag cannot be changed (@langcode).', array('@langcode' => $this->activeLangcode));
+          $message = SafeMarkup::format('The default translation flag cannot be changed (@langcode).', ['@langcode' => $this->activeLangcode]);
           throw new \LogicException($message);
         }
         break;
@@ -791,6 +829,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     $translation->translatableEntityKeys = &$this->translatableEntityKeys;
     $translation->translationInitialize = FALSE;
     $translation->typedData = NULL;
+    $translation->loadedRevisionId = &$this->loadedRevisionId;
 
     return $translation;
   }
@@ -815,7 +854,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
   /**
    * {@inheritdoc}
    */
-  public function addTranslation($langcode, array $values = array()) {
+  public function addTranslation($langcode, array $values = []) {
     // Make sure we do not attempt to create a translation if an invalid
     // language is specified or the entity cannot be translated.
     $this->getLanguages();
@@ -829,7 +868,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     // Initialize the translation object.
     /** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
     $storage = $this->entityManager()->getStorage($this->getEntityTypeId());
-    $this->translations[$langcode]['status'] = static::TRANSLATION_CREATED;
+    $this->translations[$langcode]['status'] = !isset($this->translations[$langcode]['status_existed']) ? static::TRANSLATION_CREATED : static::TRANSLATION_EXISTING;
     return $storage->createTranslation($this, $langcode, $values);
   }
 
@@ -844,13 +883,34 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
           unset($this->fields[$name][$langcode]);
         }
       }
-      $this->translations[$langcode]['status'] = static::TRANSLATION_REMOVED;
+      // If removing a translation which has not been saved yet, then we have
+      // to remove it completely so that ::getTranslationStatus returns the
+      // proper status.
+      if ($this->translations[$langcode]['status'] == static::TRANSLATION_CREATED) {
+        unset($this->translations[$langcode]);
+      }
+      else {
+        if ($this->translations[$langcode]['status'] == static::TRANSLATION_EXISTING) {
+          $this->translations[$langcode]['status_existed'] = TRUE;
+        }
+        $this->translations[$langcode]['status'] = static::TRANSLATION_REMOVED;
+      }
     }
     else {
       throw new \InvalidArgumentException("The specified translation ($langcode) cannot be removed.");
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getTranslationStatus($langcode) {
+    if ($langcode == $this->defaultLangcode) {
+      $langcode = LanguageInterface::LANGCODE_DEFAULT;
+    }
+    return isset($this->translations[$langcode]) ? $this->translations[$langcode]['status'] : NULL;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -951,14 +1011,9 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    * Implements the magic method for isset().
    */
   public function __isset($name) {
-    // "Official" Field API fields are always set.
-    if ($this->hasField($name)) {
-      return TRUE;
-    }
-    // For non-field properties, check the internal values.
-    else {
-      return isset($this->values[$name]);
-    }
+    // "Official" Field API fields are always set. For non-field properties,
+    // check the internal values.
+    return $this->hasField($name) ? TRUE : isset($this->values[$name]);
   }
 
   /**
@@ -967,7 +1022,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
   public function __unset($name) {
     // Unsetting a field means emptying it.
     if ($this->hasField($name)) {
-      $this->get($name)->setValue(array());
+      $this->get($name)->setValue([]);
     }
     // For non-field properties, unset the internal value.
     else {
@@ -996,6 +1051,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     // Check whether the entity type supports revisions and initialize it if so.
     if ($entity_type->isRevisionable()) {
       $duplicate->{$entity_type->getKey('revision')}->value = NULL;
+      $duplicate->loadedRevisionId = NULL;
     }
 
     return $duplicate;
@@ -1007,36 +1063,73 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
   public function __clone() {
     // Avoid deep-cloning when we are initializing a translation object, since
     // it will represent the same entity, only with a different active language.
-    if (!$this->translationInitialize) {
-      // The translation is a different object, and needs its own TypedData
-      // adapter object.
-      $this->typedData = NULL;
-      $definitions = $this->getFieldDefinitions();
-      foreach ($this->fields as $name => $values) {
-        $this->fields[$name] = array();
-        // Untranslatable fields may have multiple references for the same field
-        // object keyed by language. To avoid creating different field objects
-        // we retain just the original value, as references will be recreated
-        // later as needed.
-        if (!$definitions[$name]->isTranslatable() && count($values) > 1) {
-          $values = array_intersect_key($values, array(LanguageInterface::LANGCODE_DEFAULT => TRUE));
-        }
-        foreach ($values as $langcode => $items) {
-          $this->fields[$name][$langcode] = clone $items;
-          $this->fields[$name][$langcode]->setContext($name, $this->getTranslation($langcode)->getTypedData());
-        }
+    if ($this->translationInitialize) {
+      return;
+    }
+
+    // The translation is a different object, and needs its own TypedData
+    // adapter object.
+    $this->typedData = NULL;
+    $definitions = $this->getFieldDefinitions();
+
+    // The translation cache has to be cleared before cloning the fields
+    // below so that the call to getTranslation() does not re-use the
+    // translation objects of the old entity but instead creates new
+    // translation objects from the newly cloned entity. Otherwise the newly
+    // cloned field item lists would hold references to the old translation
+    // objects in their $parent property after the call to setContext().
+    $this->clearTranslationCache();
+
+    // Because the new translation objects that are created below are
+    // themselves created by *cloning* the newly cloned entity we need to
+    // make sure that the references to property values are properly cloned
+    // before cloning the fields. Otherwise calling
+    // $items->getEntity()->isNew(), for example, would return the
+    // $enforceIsNew value of the old entity.
+
+    // Ensure the translations array is actually cloned by overwriting the
+    // original reference with one pointing to a copy of the array.
+    $translations = $this->translations;
+    $this->translations = &$translations;
+
+    // Ensure that the following properties are actually cloned by
+    // overwriting the original references with ones pointing to copies of
+    // them: enforceIsNew, newRevision, loadedRevisionId, fields, entityKeys,
+    // translatableEntityKeys and values.
+    $enforce_is_new = $this->enforceIsNew;
+    $this->enforceIsNew = &$enforce_is_new;
+
+    $new_revision = $this->newRevision;
+    $this->newRevision = &$new_revision;
+
+    $original_revision_id = $this->loadedRevisionId;
+    $this->loadedRevisionId = &$original_revision_id;
+
+    $fields = $this->fields;
+    $this->fields = &$fields;
+
+    $entity_keys = $this->entityKeys;
+    $this->entityKeys = &$entity_keys;
+
+    $translatable_entity_keys = $this->translatableEntityKeys;
+    $this->translatableEntityKeys = &$translatable_entity_keys;
+
+    $values = $this->values;
+    $this->values = &$values;
+
+    foreach ($this->fields as $name => $fields_by_langcode) {
+      $this->fields[$name] = [];
+      // Untranslatable fields may have multiple references for the same field
+      // object keyed by language. To avoid creating different field objects
+      // we retain just the original value, as references will be recreated
+      // later as needed.
+      if (!$definitions[$name]->isTranslatable() && count($fields_by_langcode) > 1) {
+        $fields_by_langcode = array_intersect_key($fields_by_langcode, [LanguageInterface::LANGCODE_DEFAULT => TRUE]);
+      }
+      foreach ($fields_by_langcode as $langcode => $items) {
+        $this->fields[$name][$langcode] = clone $items;
+        $this->fields[$name][$langcode]->setContext($name, $this->getTranslation($langcode)->getTypedData());
       }
-
-      // Ensure the translations array is actually cloned by overwriting the
-      // original reference with one pointing to a copy of the array.
-      $this->clearTranslationCache();
-      $translations = $this->translations;
-      $this->translations = &$translations;
-
-      // Ensure the enforceIsNew property is actually cloned by overwriting the
-      // original reference with one pointing to a copy of it.
-      $enforce_is_new = $this->enforceIsNew;
-      $this->enforceIsNew = &$enforce_is_new;
     }
   }
 
@@ -1059,7 +1152,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    * {@inheritdoc}
    */
   public function referencedEntities() {
-    $referenced_entities = array();
+    $referenced_entities = [];
 
     // Gather a list of referenced entities.
     foreach ($this->getFields() as $field_items) {
@@ -1142,7 +1235,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
       $fields[$entity_type->getKey('langcode')] = BaseFieldDefinition::create('language')
         ->setLabel(new TranslatableMarkup('Language'))
         ->setDisplayOptions('view', [
-          'type' => 'hidden',
+          'region' => 'hidden',
         ])
         ->setDisplayOptions('form', [
           'type' => 'language_select',
@@ -1178,7 +1271,32 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    * {@inheritdoc}
    */
   public static function bundleFieldDefinitions(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
-    return array();
+    return [];
+  }
+
+  /**
+   * Returns an array of field names to skip in ::hasTranslationChanges.
+   *
+   * @return array
+   *   An array of field names.
+   */
+  protected function getFieldsToSkipFromTranslationChangesCheck() {
+    // A list of known revision metadata fields which should be skipped from
+    // the comparision.
+    // @todo Replace the hard coded list of revision metadata fields with the
+    // solution from https://www.drupal.org/node/2615016.
+    $fields = [
+      $this->getEntityType()->getKey('revision'),
+      'revision_translation_affected',
+      'revision_uid',
+      'revision_user',
+      'revision_timestamp',
+      'revision_created',
+      'revision_log',
+      'revision_log_message',
+    ];
+
+    return $fields;
   }
 
   /**
@@ -1214,14 +1332,24 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     // possible or be meaningless.
     /** @var \Drupal\Core\Entity\ContentEntityBase $translation */
     $translation = $original->getTranslation($this->activeLangcode);
+
+    // The list of fields to skip from the comparision.
+    $skip_fields = $this->getFieldsToSkipFromTranslationChangesCheck();
+
     foreach ($this->getFieldDefinitions() as $field_name => $definition) {
       // @todo Avoid special-casing the following fields. See
       //    https://www.drupal.org/node/2329253.
-      if ($field_name == 'revision_translation_affected' || $field_name == 'revision_id') {
+      if (in_array($field_name, $skip_fields, TRUE)) {
         continue;
       }
-      if (!$definition->isComputed() && (!$translated || $definition->isTranslatable())) {
-        $items = $this->get($field_name)->filterEmptyItems();
+      $field = $this->get($field_name);
+      // When saving entities in the user interface, the changed timestamp is
+      // automatically incremented by ContentEntityForm::submitForm() even if
+      // nothing was actually changed. Thus, the changed time needs to be
+      // ignored when determining whether there are any actual changes in the
+      // entity.
+      if (!($field instanceof ChangedFieldItemList) && !$definition->isComputed()) {
+        $items = $field->filterEmptyItems();
         $original_items = $translation->get($field_name)->filterEmptyItems();
         if (!$items->equals($original_items)) {
           return TRUE;
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php b/web/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
index 84d24de73..bc0bdf3a2 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
@@ -55,8 +55,8 @@ abstract class ContentEntityConfirmFormBase extends ContentEntityForm implements
     $form['#title'] = $this->getQuestion();
 
     $form['#attributes']['class'][] = 'confirmation';
-    $form['description'] = array('#markup' => $this->getDescription());
-    $form[$this->getFormName()] = array('#type' => 'hidden', '#value' => 1);
+    $form['description'] = ['#markup' => $this->getDescription()];
+    $form[$this->getFormName()] = ['#type' => 'hidden', '#value' => 1];
 
     // By default, render the form using theme_confirm_form().
     if (!isset($form['#theme'])) {
@@ -77,16 +77,16 @@ abstract class ContentEntityConfirmFormBase extends ContentEntityForm implements
    * {@inheritdoc}
    */
   protected function actions(array $form, FormStateInterface $form_state) {
-    return array(
-      'submit' => array(
+    return [
+      'submit' => [
         '#type' => 'submit',
         '#value' => $this->getConfirmText(),
-        '#submit' => array(
-          array($this, 'submitForm'),
-        ),
-      ),
+        '#submit' => [
+          [$this, 'submitForm'],
+        ],
+      ],
       'cancel' => ConfirmFormHelper::buildCancelLink($this, $this->getRequest()),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php b/web/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php
index ac94c26d0..9a70ef5bc 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityDeleteForm.php
@@ -34,19 +34,19 @@ class ContentEntityDeleteForm extends ContentEntityConfirmFormBase {
           $languages[] = $language->getName();
         }
 
-        $form['deleted_translations'] = array(
+        $form['deleted_translations'] = [
           '#theme' => 'item_list',
           '#title' => $this->t('The following @entity-type translations will be deleted:', [
             '@entity-type' => $entity->getEntityType()->getLowercaseLabel()
           ]),
           '#items' => $languages,
-        );
+        ];
 
         $form['actions']['submit']['#value'] = $this->t('Delete all translations');
       }
     }
     else {
-      $form['actions']['submit']['#value'] = $this->t('Delete @language translation', array('@language' => $entity->language()->getName()));
+      $form['actions']['submit']['#value'] = $this->t('Delete @language translation', ['@language' => $entity->language()->getName()]);
     }
 
     return $form;
@@ -129,11 +129,11 @@ class ContentEntityDeleteForm extends ContentEntityConfirmFormBase {
     $entity = $this->getEntity();
 
     if (!$entity->isDefaultTranslation()) {
-      return $this->t('Are you sure you want to delete the @language translation of the @entity-type %label?', array(
+      return $this->t('Are you sure you want to delete the @language translation of the @entity-type %label?', [
         '@language' => $entity->language()->getName(),
         '@entity-type' => $this->getEntity()->getEntityType()->getLowercaseLabel(),
         '%label' => $this->getEntity()->label(),
-      ));
+      ]);
     }
 
     return $this->traitGetQuestion();
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityForm.php b/web/core/lib/Drupal/Core/Entity/ContentEntityForm.php
index 542017508..14e910d1e 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityForm.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityForm.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Entity;
 
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Form\FormStateInterface;
@@ -21,14 +22,42 @@ class ContentEntityForm extends EntityForm implements ContentEntityFormInterface
    */
   protected $entityManager;
 
+  /**
+   * The entity being used by this form.
+   *
+   * @var \Drupal\Core\Entity\ContentEntityInterface|\Drupal\Core\Entity\RevisionLogInterface
+   */
+  protected $entity;
+
+  /**
+   * The entity type bundle info service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $entityTypeBundleInfo;
+
+  /**
+   * The time service.
+   *
+   * @var \Drupal\Component\Datetime\TimeInterface
+   */
+  protected $time;
+
   /**
    * Constructs a ContentEntityForm object.
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle service.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time service.
    */
-  public function __construct(EntityManagerInterface $entity_manager) {
+  public function __construct(EntityManagerInterface $entity_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
     $this->entityManager = $entity_manager;
+
+    $this->entityTypeBundleInfo = $entity_type_bundle_info ?: \Drupal::service('entity_type.bundle.info');
+    $this->time = $time ?: \Drupal::service('datetime.time');
   }
 
   /**
@@ -36,15 +65,54 @@ class ContentEntityForm extends EntityForm implements ContentEntityFormInterface
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager')
+      $container->get('entity.manager'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time')
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function prepareEntity() {
+    parent::prepareEntity();
+
+    // Hide the current revision log message in UI.
+    if ($this->showRevisionUi() && !$this->entity->isNew() && $this->entity instanceof RevisionLogInterface) {
+      $this->entity->setRevisionLogMessage(NULL);
+    }
+  }
+
+  /**
+   * Returns the bundle entity of the entity, or NULL if there is none.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface|null
+   *   The bundle entity.
+   */
+  protected function getBundleEntity() {
+    if ($bundle_entity_type = $this->entity->getEntityType()->getBundleEntityType()) {
+      return $this->entityTypeManager->getStorage($bundle_entity_type)->load($this->entity->bundle());
+    }
+    return NULL;
+  }
+
   /**
    * {@inheritdoc}
    */
   public function form(array $form, FormStateInterface $form_state) {
+
+    if ($this->showRevisionUi()) {
+      // Advanced tab must be the first, because other fields rely on that.
+      if (!isset($form['advanced'])) {
+        $form['advanced'] = [
+          '#type' => 'vertical_tabs',
+          '#weight' => 99,
+        ];
+      }
+    }
+
     $form = parent::form($form, $form_state);
+
     // Content entity forms do not use the parent's #after_build callback
     // because they only need to rebuild the entity in the validation and the
     // submit handler because Field API uses its own #after_build callback for
@@ -53,7 +121,12 @@ class ContentEntityForm extends EntityForm implements ContentEntityFormInterface
 
     $this->getFormDisplay($form_state)->buildForm($this->entity, $form, $form_state);
     // Allow modules to act before and after form language is updated.
-    $form['#entity_builders']['update_form_langcode'] = [$this, 'updateFormLangcode'];
+    $form['#entity_builders']['update_form_langcode'] = '::updateFormLangcode';
+
+    if ($this->showRevisionUi()) {
+      $this->addRevisionableFormFields($form);
+    }
+
     return $form;
   }
 
@@ -76,6 +149,17 @@ class ContentEntityForm extends EntityForm implements ContentEntityFormInterface
     // Mark the entity as requiring validation.
     $entity->setValidationRequired(!$form_state->getTemporaryValue('entity_validated'));
 
+    // Save as a new revision if requested to do so.
+    if ($this->showRevisionUi() && !$form_state->isValueEmpty('revision')) {
+      $entity->setNewRevision();
+      if ($entity instanceof RevisionLogInterface) {
+        // If a new revision is created, save the current user as
+        // revision author.
+        $entity->setRevisionUserId($this->currentUser()->id());
+        $entity->setRevisionCreationTime($this->time->getRequestTime());
+      }
+    }
+
     return $entity;
   }
 
@@ -266,10 +350,13 @@ class ContentEntityForm extends EntityForm implements ContentEntityFormInterface
    * @see \Drupal\Core\Entity\ContentEntityForm::form()
    */
   public function updateFormLangcode($entity_type_id, EntityInterface $entity, array $form, FormStateInterface $form_state) {
-    // Update the form language as it might have changed.
-    if ($this->isDefaultFormLangcode($form_state)) {
-      $langcode = $entity->language()->getId();
-      $form_state->set('langcode', $langcode);
+    $langcode = $entity->language()->getId();
+    $form_state->set('langcode', $langcode);
+
+    // If this is the original entity language, also update the default
+    // langcode.
+    if ($langcode == $entity->getUntranslated()->language()->getId()) {
+      $form_state->set('entity_default_langcode', $langcode);
     }
   }
 
@@ -282,9 +369,85 @@ class ContentEntityForm extends EntityForm implements ContentEntityFormInterface
    *   The entity updated with the submitted values.
    */
   public function updateChangedTime(EntityInterface $entity) {
-    if ($entity->getEntityType()->isSubclassOf(EntityChangedInterface::class)) {
-      $entity->setChangedTime(REQUEST_TIME);
+    if ($entity instanceof EntityChangedInterface) {
+      $entity->setChangedTime($this->time->getRequestTime());
     }
   }
 
+  /**
+   * Add revision form fields if the entity enabled the UI.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   */
+  protected function addRevisionableFormFields(array &$form) {
+    $entity_type = $this->entity->getEntityType();
+
+    $new_revision_default = $this->getNewRevisionDefault();
+
+    // Add a log field if the "Create new revision" option is checked, or if the
+    // current user has the ability to check that option.
+    $form['revision_information'] = [
+      '#type' => 'details',
+      '#title' => $this->t('Revision information'),
+      // Open by default when "Create new revision" is checked.
+      '#open' => $new_revision_default,
+      '#group' => 'advanced',
+      '#weight' => 20,
+      '#access' => $new_revision_default || $this->entity->get($entity_type->getKey('revision'))->access('update'),
+      '#optional' => TRUE,
+      '#attributes' => [
+        'class' => ['entity-content-form-revision-information'],
+      ],
+      '#attached' => [
+        'library' => ['core/drupal.entity-form'],
+      ],
+    ];
+
+    $form['revision'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Create new revision'),
+      '#default_value' => $new_revision_default,
+      '#access' => !$this->entity->isNew() && $this->entity->get($entity_type->getKey('revision'))->access('update'),
+      '#group' => 'revision_information',
+    ];
+
+    if (isset($form['revision_log'])) {
+      $form['revision_log'] += [
+        '#group' => 'revision_information',
+        '#states' => [
+          'visible' => [
+            ':input[name="revision"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+    }
+  }
+
+  /**
+   * Should new revisions created on default.
+   *
+   * @return bool
+   *   New revision on default.
+   */
+  protected function getNewRevisionDefault() {
+    $new_revision_default = FALSE;
+    $bundle_entity = $this->getBundleEntity();
+    if ($bundle_entity instanceof RevisionableEntityBundleInterface) {
+      // Always use the default revision setting.
+      $new_revision_default = $bundle_entity->shouldCreateNewRevision();
+    }
+    return $new_revision_default;
+  }
+
+  /**
+   * Checks whether the revision form fields should be added to the form.
+   *
+   * @return bool
+   *   TRUE if the form field should be added, FALSE otherwise.
+   */
+  protected function showRevisionUi() {
+    return $this->entity->getEntityType()->showRevisionUi();
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php b/web/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
index 94bf70a65..9688b1f1c 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
@@ -16,7 +16,7 @@ interface ContentEntityFormInterface extends EntityFormInterface {
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface.
+   * @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface
    *   The current form display.
    */
   public function getFormDisplay(FormStateInterface $form_state);
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityInterface.php b/web/core/lib/Drupal/Core/Entity/ContentEntityInterface.php
index 0c3f04b98..d045152f6 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityInterface.php
@@ -25,9 +25,6 @@ interface ContentEntityInterface extends \Traversable, FieldableEntityInterface,
   /**
    * Determines if the current translation of the entity has unsaved changes.
    *
-   * If the entity is translatable only translatable fields will be checked for
-   * changes.
-   *
    * @return bool
    *   TRUE if the current translation of the entity has changes.
    */
@@ -53,4 +50,25 @@ interface ContentEntityInterface extends \Traversable, FieldableEntityInterface,
    */
   public function isRevisionTranslationAffected();
 
+  /**
+   * Gets the loaded Revision ID of the entity.
+   *
+   * @return int
+   *   The loaded Revision identifier of the entity, or NULL if the entity
+   *   does not have a revision identifier.
+   */
+  public function getLoadedRevisionId();
+
+  /**
+   * Updates the loaded Revision ID with the revision ID.
+   *
+   * This method should not be used, it could unintentionally cause the original
+   * revision ID property value to be lost.
+   *
+   * @internal
+   *
+   * @return $this
+   */
+  public function updateLoadedRevisionId();
+
 }
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php b/web/core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php
index 5d3379f61..3dc00c9a9 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php
@@ -15,7 +15,7 @@ class ContentEntityNullStorage extends ContentEntityStorageBase {
    * {@inheritdoc}
    */
   public function loadMultiple(array $ids = NULL) {
-    return array();
+    return [];
   }
 
   /**
@@ -47,8 +47,8 @@ class ContentEntityNullStorage extends ContentEntityStorageBase {
   /**
    * {@inheritdoc}
    */
-  public function loadByProperties(array $values = array()) {
-    return array();
+  public function loadByProperties(array $values = []) {
+    return [];
   }
 
   /**
@@ -104,7 +104,7 @@ class ContentEntityNullStorage extends ContentEntityStorageBase {
    * {@inheritdoc}
    */
   protected function readFieldItemsToPurge(FieldDefinitionInterface $field_definition, $batch_size) {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
index afdce408e..9d6b8d64f 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -84,7 +84,7 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Con
       }
       $bundle = $values[$this->bundleKey];
     }
-    $entity = new $this->entityClass(array(), $this->entityTypeId, $bundle);
+    $entity = new $this->entityClass([], $this->entityTypeId, $bundle);
     $this->initFieldValues($entity, $values);
     return $entity;
   }
@@ -288,7 +288,29 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Con
     // Sync the changes made in the fields array to the internal values array.
     $entity->updateOriginalValues();
 
-    return parent::doPreSave($entity);
+    if ($entity->getEntityType()->isRevisionable() && !$entity->isNew() && empty($entity->getLoadedRevisionId())) {
+      // Update the loaded revision id for rare special cases when no loaded
+      // revision is given when updating an existing entity. This for example
+      // happens when calling save() in hook_entity_insert().
+      $entity->updateLoadedRevisionId();
+    }
+
+    $id = parent::doPreSave($entity);
+
+    if (!$entity->isNew()) {
+      // If the ID changed then original can't be loaded, throw an exception
+      // in that case.
+      if (empty($entity->original) || $entity->id() != $entity->original->id()) {
+        throw new EntityStorageException("Update existing '{$this->entityTypeId}' entity while changing the ID is not supported.");
+      }
+      // Do not allow changing the revision ID when resaving the current
+      // revision.
+      if (!$entity->isNewRevision() && $entity->getRevisionId() != $entity->getLoadedRevisionId()) {
+        throw new EntityStorageException("Update existing '{$this->entityTypeId}' entity revision while changing the revision ID is not supported.");
+      }
+    }
+
+    return $id;
   }
 
   /**
@@ -305,6 +327,7 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Con
 
     // The revision is stored, it should no longer be marked as new now.
     if ($this->entityType->isRevisionable()) {
+      $entity->updateLoadedRevisionId();
       $entity->setNewRevision(FALSE);
     }
   }
@@ -582,11 +605,11 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Con
    */
   protected function getFromPersistentCache(array &$ids = NULL) {
     if (!$this->entityType->isPersistentlyCacheable() || empty($ids)) {
-      return array();
+      return [];
     }
-    $entities = array();
+    $entities = [];
     // Build the list of cache entries to retrieve.
-    $cid_map = array();
+    $cid_map = [];
     foreach ($ids as $id) {
       $cid_map[$id] = $this->buildCacheId($id);
     }
@@ -615,21 +638,61 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Con
       return;
     }
 
-    $cache_tags = array(
+    $cache_tags = [
       $this->entityTypeId . '_values',
       'entity_field_info',
-    );
+    ];
     foreach ($entities as $id => $entity) {
       $this->cacheBackend->set($this->buildCacheId($id), $entity, CacheBackendInterface::CACHE_PERMANENT, $cache_tags);
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function loadUnchanged($id) {
+    $ids = [$id];
+
+    // The cache invalidation in the parent has the side effect that loading the
+    // same entity again during the save process (for example in
+    // hook_entity_presave()) will load the unchanged entity. Simulate this
+    // by explicitly removing the entity from the static cache.
+    parent::resetCache($ids);
+
+    // The default implementation in the parent class unsets the current cache
+    // and then reloads the entity. That is slow, especially if this is done
+    // repeatedly in the same request, e.g. when validating and then saving
+    // an entity. Optimize this for content entities by trying to load them
+    // directly from the persistent cache again, as in contrast to the static
+    // cache the persistent one will never be changed until the entity is saved.
+    $entities = $this->getFromPersistentCache($ids);
+
+    if (!$entities) {
+      $entities[$id] = $this->load($id);
+    }
+    else {
+      // As the entities are put into the persistent cache before the post load
+      // has been executed we have to execute it if we have retrieved the
+      // entity directly from the persistent cache.
+      $this->postLoad($entities);
+
+      if ($this->entityType->isStaticallyCacheable()) {
+        // As we've removed the entity from the static cache already we have to
+        // put the loaded unchanged entity there to simulate the behavior of the
+        // parent.
+        $this->setStaticCache($entities);
+      }
+    }
+
+    return $entities[$id];
+  }
+
   /**
    * {@inheritdoc}
    */
   public function resetCache(array $ids = NULL) {
     if ($ids) {
-      $cids = array();
+      $cids = [];
       foreach ($ids as $id) {
         unset($this->entities[$id]);
         $cids[] = $this->buildCacheId($id);
@@ -639,9 +702,9 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Con
       }
     }
     else {
-      $this->entities = array();
+      $this->entities = [];
       if ($this->entityType->isPersistentlyCacheable()) {
-        Cache::invalidateTags(array($this->entityTypeId . '_values'));
+        Cache::invalidateTags([$this->entityTypeId . '_values']);
       }
     }
   }
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityType.php b/web/core/lib/Drupal/Core/Entity/ContentEntityType.php
index 6d8d61969..400374b00 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityType.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityType.php
@@ -12,10 +12,10 @@ class ContentEntityType extends EntityType implements ContentEntityTypeInterface
    */
   public function __construct($definition) {
     parent::__construct($definition);
-    $this->handlers += array(
+    $this->handlers += [
       'storage' => 'Drupal\Core\Entity\Sql\SqlContentEntityStorage',
       'view_builder' => 'Drupal\Core\Entity\EntityViewBuilder',
-    );
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/Controller/EntityController.php b/web/core/lib/Drupal/Core/Entity/Controller/EntityController.php
index d65166e3a..776368e01 100644
--- a/web/core/lib/Drupal/Core/Entity/Controller/EntityController.php
+++ b/web/core/lib/Drupal/Core/Entity/Controller/EntityController.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Entity\Controller;
 
+use Drupal\Core\Entity\EntityDescriptionInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
@@ -307,7 +308,7 @@ class EntityController implements ContainerInjectionInterface {
    *   The expanded array of bundle information.
    */
   protected function loadBundleDescriptions(array $bundles, EntityTypeInterface $bundle_entity_type) {
-    if (!$bundle_entity_type->isSubclassOf('\Drupal\Core\Entity\EntityDescriptionInterface')) {
+    if (!$bundle_entity_type->entityClassImplements(EntityDescriptionInterface::class)) {
       return $bundles;
     }
     $bundle_names = array_keys($bundles);
diff --git a/web/core/lib/Drupal/Core/Entity/DependencyTrait.php b/web/core/lib/Drupal/Core/Entity/DependencyTrait.php
index f56a6a0a5..81112eb72 100644
--- a/web/core/lib/Drupal/Core/Entity/DependencyTrait.php
+++ b/web/core/lib/Drupal/Core/Entity/DependencyTrait.php
@@ -12,7 +12,7 @@ trait DependencyTrait {
    *
    * @var array
    */
-  protected $dependencies = array();
+  protected $dependencies = [];
 
   /**
    * Adds a dependency.
@@ -30,7 +30,7 @@ trait DependencyTrait {
    */
   protected function addDependency($type, $name) {
     if (empty($this->dependencies[$type])) {
-      $this->dependencies[$type] = array($name);
+      $this->dependencies[$type] = [$name];
       if (count($this->dependencies) > 1) {
         // Ensure a consistent order of type keys.
         ksort($this->dependencies);
@@ -47,7 +47,7 @@ trait DependencyTrait {
   /**
    * Adds multiple dependencies.
    *
-   * @param array $dependencies.
+   * @param array $dependencies
    *   An array of dependencies keyed by the type of dependency. One example:
    *   @code
    *   array(
diff --git a/web/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php b/web/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php
index 7fa45a51f..38baa15fe 100644
--- a/web/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php
@@ -54,7 +54,7 @@ interface EntityDisplayInterface extends ConfigEntityInterface, EntityWithPlugin
    *
    * @return $this
    */
-  public function setComponent($name, array $options = array());
+  public function setComponent($name, array $options = []);
 
   /**
    * Sets a component to be hidden.
diff --git a/web/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php b/web/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
index 9c3e705bd..3e10f4a1c 100644
--- a/web/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
+++ b/web/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
@@ -31,7 +31,7 @@ class EntityAutocomplete extends Textfield {
     // Apply default form element properties.
     $info['#target_type'] = NULL;
     $info['#selection_handler'] = 'default';
-    $info['#selection_settings'] = array();
+    $info['#selection_settings'] = [];
     $info['#tags'] = FALSE;
     $info['#autocreate'] = NULL;
     // This should only be set to FALSE if proper validation by the selection
@@ -42,8 +42,8 @@ class EntityAutocomplete extends Textfield {
     // it's value is properly checked for access.
     $info['#process_default_value'] = TRUE;
 
-    $info['#element_validate'] = array(array($class, 'validateEntityAutocomplete'));
-    array_unshift($info['#process'], array($class, 'processEntityAutocomplete'));
+    $info['#element_validate'] = [[$class, 'validateEntityAutocomplete']];
+    array_unshift($info['#process'], [$class, 'processEntityAutocomplete']);
 
     return $info;
   }
@@ -60,7 +60,7 @@ class EntityAutocomplete extends Textfield {
       elseif (!empty($element['#default_value']) && !is_array($element['#default_value'])) {
         // Convert the default value into an array for easier processing in
         // static::getEntityLabels().
-        $element['#default_value'] = array($element['#default_value']);
+        $element['#default_value'] = [$element['#default_value']];
       }
 
       if ($element['#default_value']) {
@@ -136,11 +136,11 @@ class EntityAutocomplete extends Textfield {
     }
 
     $element['#autocomplete_route_name'] = 'system.entity_autocomplete';
-    $element['#autocomplete_route_parameters'] = array(
+    $element['#autocomplete_route_parameters'] = [
       'target_type' => $element['#target_type'],
       'selection_handler' => $element['#selection_handler'],
       'selection_settings_key' => $selection_settings_key,
-    );
+    ];
 
     return $element;
   }
@@ -152,11 +152,11 @@ class EntityAutocomplete extends Textfield {
     $value = NULL;
 
     if (!empty($element['#value'])) {
-      $options = array(
+      $options = [
         'target_type' => $element['#target_type'],
         'handler' => $element['#selection_handler'],
         'handler_settings' => $element['#selection_settings'],
-      );
+      ];
       /** @var /Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface $handler */
       $handler = \Drupal::service('plugin.manager.entity_reference_selection')->getInstance($options);
       $autocreate = (bool) $element['#autocreate'] && $handler instanceof SelectionWithAutocreateInterface;
@@ -167,7 +167,7 @@ class EntityAutocomplete extends Textfield {
         $value = $element['#value'];
       }
       else {
-        $input_values = $element['#tags'] ? Tags::explode($element['#value']) : array($element['#value']);
+        $input_values = $element['#tags'] ? Tags::explode($element['#value']) : [$element['#value']];
 
         foreach ($input_values as $input) {
           $match = static::extractEntityIdFromAutocompleteInput($input);
@@ -178,17 +178,17 @@ class EntityAutocomplete extends Textfield {
           }
 
           if ($match !== NULL) {
-            $value[] = array(
+            $value[] = [
               'target_id' => $match,
-            );
+            ];
           }
           elseif ($autocreate) {
             /** @var \Drupal\Core\Entity\EntityReferenceSelection\SelectionWithAutocreateInterface $handler */
             // Auto-create item. See an example of how this is handled in
             // \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem::presave().
-            $value[] = array(
+            $value[] = [
               'entity' => $handler->createNewEntity($element['#target_type'], $element['#autocreate']['bundle'], $input, $element['#autocreate']['uid']),
-            );
+            ];
           }
         }
       }
@@ -207,7 +207,7 @@ class EntityAutocomplete extends Textfield {
           $valid_ids = $handler->validateReferenceableEntities($ids);
           if ($invalid_ids = array_diff($ids, $valid_ids)) {
             foreach ($invalid_ids as $invalid_id) {
-              $form_state->setError($element, t('The referenced entity (%type: %id) does not exist.', array('%type' => $element['#target_type'], '%id' => $invalid_id)));
+              $form_state->setError($element, t('The referenced entity (%type: %id) does not exist.', ['%type' => $element['#target_type'], '%id' => $invalid_id]));
             }
           }
         }
@@ -233,7 +233,7 @@ class EntityAutocomplete extends Textfield {
 
           foreach ($invalid_new_entities as $entity) {
             /** @var \Drupal\Core\Entity\EntityInterface $entity */
-            $form_state->setError($element, t('This entity (%type: %label) cannot be referenced.', array('%type' => $element['#target_type'], '%label' => $entity->label())));
+            $form_state->setError($element, t('This entity (%type: %label) cannot be referenced.', ['%type' => $element['#target_type'], '%label' => $entity->label()]));
           }
         }
       }
@@ -275,10 +275,10 @@ class EntityAutocomplete extends Textfield {
     $entities = array_reduce($entities_by_bundle, function ($flattened, $bundle_entities) {
       return $flattened + $bundle_entities;
     }, []);
-    $params = array(
+    $params = [
       '%value' => $input,
       '@value' => $input,
-    );
+    ];
     if (empty($entities)) {
       if ($strict) {
         // Error if there are no entities available for a required field.
@@ -292,12 +292,12 @@ class EntityAutocomplete extends Textfield {
     }
     elseif (count($entities) > 1) {
       // More helpful error if there are only a few matching entities.
-      $multiples = array();
+      $multiples = [];
       foreach ($entities as $id => $name) {
         $multiples[] = $name . ' (' . $id . ')';
       }
       $params['@id'] = $id;
-      $form_state->setError($element, t('Multiple entities match this reference; "%multiple". Specify the one you want by appending the id in parentheses, like "@value (@id)".', array('%multiple' => implode('", "', $multiples)) + $params));
+      $form_state->setError($element, t('Multiple entities match this reference; "%multiple". Specify the one you want by appending the id in parentheses, like "@value (@id)".', ['%multiple' => implode('", "', $multiples)] + $params));
     }
     else {
       // Take the one and only matching entity.
@@ -318,7 +318,7 @@ class EntityAutocomplete extends Textfield {
    *   A string of entity labels separated by commas.
    */
   public static function getEntityLabels(array $entities) {
-    $entity_labels = array();
+    $entity_labels = [];
     foreach ($entities as $entity) {
       // Use the special view label, since some entities allow the label to be
       // viewed, even if the entity is not allowed to be viewed.
diff --git a/web/core/lib/Drupal/Core/Entity/Entity.php b/web/core/lib/Drupal/Core/Entity/Entity.php
index 2c6dbc118..f36f74fe6 100644
--- a/web/core/lib/Drupal/Core/Entity/Entity.php
+++ b/web/core/lib/Drupal/Core/Entity/Entity.php
@@ -190,7 +190,7 @@ abstract class Entity implements EntityInterface {
 
     if (isset($link_templates[$rel])) {
       $route_parameters = $this->urlRouteParameters($rel);
-      $route_name = "entity.{$this->entityTypeId}." . str_replace(array('-', 'drupal:'), array('_', ''), $rel);
+      $route_name = "entity.{$this->entityTypeId}." . str_replace(['-', 'drupal:'], ['_', ''], $rel);
       $uri = new Url($route_name, $route_parameters);
     }
     else {
@@ -275,7 +275,7 @@ abstract class Entity implements EntityInterface {
   /**
    * {@inheritdoc}
    */
-  public function url($rel = 'canonical', $options = array()) {
+  public function url($rel = 'canonical', $options = []) {
     // While self::toUrl() will throw an exception if the entity has no id,
     // the expected result for a URL is always a string.
     if ($this->id() === NULL || !$this->hasLinkTemplate($rel)) {
@@ -353,7 +353,7 @@ abstract class Entity implements EntityInterface {
     }
     // Make sure we return a proper language object.
     $langcode = !empty($this->langcode) ? $this->langcode : LanguageInterface::LANGCODE_NOT_SPECIFIED;
-    $language = new Language(array('id' => $langcode));
+    $language = new Language(['id' => $langcode]);
     return $language;
   }
 
@@ -369,7 +369,7 @@ abstract class Entity implements EntityInterface {
    */
   public function delete() {
     if (!$this->isNew()) {
-      $this->entityManager()->getStorage($this->entityTypeId)->delete(array($this->id() => $this));
+      $this->entityManager()->getStorage($this->entityTypeId)->delete([$this->id() => $this]);
     }
   }
 
@@ -452,7 +452,7 @@ abstract class Entity implements EntityInterface {
    * {@inheritdoc}
    */
   public function referencedEntities() {
-    return array();
+    return [];
   }
 
   /**
@@ -510,7 +510,7 @@ abstract class Entity implements EntityInterface {
   /**
    * {@inheritdoc}
    */
-  public static function create(array $values = array()) {
+  public static function create(array $values = []) {
     $entity_manager = \Drupal::entityManager();
     return $entity_manager->getStorage($entity_manager->getEntityTypeFromClass(get_called_class()))->create($values);
   }
@@ -585,7 +585,7 @@ abstract class Entity implements EntityInterface {
    * {@inheritdoc}
    */
   public function toArray() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php b/web/core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php
index cd90ecce0..faa6d0d6a 100644
--- a/web/core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php
+++ b/web/core/lib/Drupal/Core/Entity/Entity/EntityFormDisplay.php
@@ -95,23 +95,23 @@ class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayIn
     }
     // Else create a fresh runtime object.
     if (empty($display)) {
-      $display = $storage->create(array(
+      $display = $storage->create([
         'targetEntityType' => $entity_type,
         'bundle' => $bundle,
         'mode' => $form_mode,
         'status' => TRUE,
-      ));
+      ]);
     }
 
     // Let the display know which form mode was originally requested.
     $display->originalMode = $form_mode;
 
     // Let modules alter the display.
-    $display_context = array(
+    $display_context = [
       'entity_type' => $entity_type,
       'bundle' => $bundle,
       'form_mode' => $form_mode,
-    );
+    ];
     \Drupal::moduleHandler()->alter('entity_form_display', $display, $display_context);
 
     return $display;
@@ -136,13 +136,13 @@ class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayIn
 
     // Instantiate the widget object from the stored display properties.
     if (($configuration = $this->getComponent($field_name)) && isset($configuration['type']) && ($definition = $this->getFieldDefinition($field_name))) {
-      $widget = $this->pluginManager->getInstance(array(
+      $widget = $this->pluginManager->getInstance([
         'field_definition' => $definition,
         'form_mode' => $this->originalMode,
         // No need to prepare, defaults have been merged in setComponent().
         'prepare' => FALSE,
         'configuration' => $configuration
-      ));
+      ]);
     }
     else {
       $widget = NULL;
@@ -158,7 +158,7 @@ class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayIn
    */
   public function buildForm(FieldableEntityInterface $entity, array &$form, FormStateInterface $form_state) {
     // Set #parents to 'top-level' by default.
-    $form += array('#parents' => array());
+    $form += ['#parents' => []];
 
     // Let each widget generate the form elements.
     foreach ($this->getComponents() as $name => $options) {
@@ -185,7 +185,7 @@ class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayIn
     $this->renderer->addCacheableDependency($form, $this);
 
     // Add a process callback so we can assign weights and hide extra fields.
-    $form['#process'][] = array($this, 'processForm');
+    $form['#process'][] = [$this, 'processForm'];
   }
 
   /**
@@ -203,7 +203,7 @@ class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayIn
 
     // Hide extra fields.
     $extra_fields = \Drupal::entityManager()->getExtraFields($this->targetEntityType, $this->bundle);
-    $extra_fields = isset($extra_fields['form']) ? $extra_fields['form'] : array();
+    $extra_fields = isset($extra_fields['form']) ? $extra_fields['form'] : [];
     foreach ($extra_fields as $extra_field => $info) {
       if (!$this->getComponent($extra_field)) {
         $element[$extra_field]['#access'] = FALSE;
@@ -216,7 +216,7 @@ class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayIn
    * {@inheritdoc}
    */
   public function extractFormValues(FieldableEntityInterface $entity, array &$form, FormStateInterface $form_state) {
-    $extracted = array();
+    $extracted = [];
     foreach ($entity as $name => $items) {
       if ($widget = $this->getRenderer($name)) {
         $widget->extractFormValues($items, $form, $form_state);
@@ -316,19 +316,19 @@ class EntityFormDisplay extends EntityDisplayBase implements EntityFormDisplayIn
    * {@inheritdoc}
    */
   public function getPluginCollections() {
-    $configurations = array();
+    $configurations = [];
     foreach ($this->getComponents() as $field_name => $configuration) {
       if (!empty($configuration['type']) && ($field_definition = $this->getFieldDefinition($field_name))) {
-        $configurations[$configuration['type']] = $configuration + array(
+        $configurations[$configuration['type']] = $configuration + [
           'field_definition' => $field_definition,
           'form_mode' => $this->mode,
-        );
+        ];
       }
     }
 
-    return array(
+    return [
       'widgets' => new EntityDisplayPluginCollection($this->pluginManager, $configurations)
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php b/web/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
index a6b83cf2c..74b15b65f 100644
--- a/web/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
+++ b/web/core/lib/Drupal/Core/Entity/Entity/EntityViewDisplay.php
@@ -70,12 +70,12 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
    */
   public static function collectRenderDisplays($entities, $view_mode) {
     if (empty($entities)) {
-      return array();
+      return [];
     }
 
     // Collect entity type and bundles.
     $entity_type = current($entities)->getEntityTypeId();
-    $bundles = array();
+    $bundles = [];
     foreach ($entities as $entity) {
       $bundles[$entity->bundle()] = TRUE;
     }
@@ -84,7 +84,7 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
     // For each bundle, check the existence and status of:
     // - the display for the view mode,
     // - the 'default' display.
-    $candidate_ids = array();
+    $candidate_ids = [];
     foreach ($bundles as $bundle) {
       if ($view_mode != 'default') {
         $candidate_ids[$bundle][] = $entity_type . '.' . $bundle . '.' . $view_mode;
@@ -97,7 +97,7 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
       ->execute();
 
     // For each bundle, select the first valid candidate display, if any.
-    $load_ids = array();
+    $load_ids = [];
     foreach ($bundles as $bundle) {
       foreach ($candidate_ids[$bundle] as $candidate_id) {
         if (isset($results[$candidate_id])) {
@@ -111,30 +111,30 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
     $storage = \Drupal::entityManager()->getStorage('entity_view_display');
     $displays = $storage->loadMultiple($load_ids);
 
-    $displays_by_bundle = array();
+    $displays_by_bundle = [];
     foreach ($bundles as $bundle) {
       // Use the selected display if any, or create a fresh runtime object.
       if (isset($load_ids[$bundle])) {
         $display = $displays[$load_ids[$bundle]];
       }
       else {
-        $display = $storage->create(array(
+        $display = $storage->create([
           'targetEntityType' => $entity_type,
           'bundle' => $bundle,
           'mode' => $view_mode,
           'status' => TRUE,
-        ));
+        ]);
       }
 
       // Let the display know which view mode was originally requested.
       $display->originalMode = $view_mode;
 
       // Let modules alter the display.
-      $display_context = array(
+      $display_context = [
         'entity_type' => $entity_type,
         'bundle' => $bundle,
         'view_mode' => $view_mode,
-      );
+      ];
       \Drupal::moduleHandler()->alter('entity_view_display', $display, $display_context);
 
       $displays_by_bundle[$bundle] = $display;
@@ -159,7 +159,7 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
    * @see \Drupal\Core\Entity\Entity\EntityViewDisplay::collectRenderDisplays()
    */
   public static function collectRenderDisplay(FieldableEntityInterface $entity, $view_mode) {
-    $displays = static::collectRenderDisplays(array($entity), $view_mode);
+    $displays = static::collectRenderDisplays([$entity], $view_mode);
     return $displays[$entity->bundle()];
   }
 
@@ -193,13 +193,13 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
 
     // Instantiate the formatter object from the stored display properties.
     if (($configuration = $this->getComponent($field_name)) && isset($configuration['type']) && ($definition = $this->getFieldDefinition($field_name))) {
-      $formatter = $this->pluginManager->getInstance(array(
+      $formatter = $this->pluginManager->getInstance([
         'field_definition' => $definition,
         'view_mode' => $this->originalMode,
         // No need to prepare, defaults have been merged in setComponent().
         'prepare' => FALSE,
         'configuration' => $configuration
-      ));
+      ]);
     }
     else {
       $formatter = NULL;
@@ -214,7 +214,7 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
    * {@inheritdoc}
    */
   public function build(FieldableEntityInterface $entity) {
-    $build = $this->buildMultiple(array($entity));
+    $build = $this->buildMultiple([$entity]);
     return $build[0];
   }
 
@@ -222,9 +222,9 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
    * {@inheritdoc}
    */
   public function buildMultiple(array $entities) {
-    $build_list = array();
+    $build_list = [];
     foreach ($entities as $key => $entity) {
-      $build_list[$key] = array();
+      $build_list[$key] = [];
     }
 
     // Run field formatters.
@@ -232,7 +232,7 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
       if ($formatter = $this->getRenderer($name)) {
         // Group items across all entities and pass them to the formatter's
         // prepareView() method.
-        $grouped_items = array();
+        $grouped_items = [];
         foreach ($entities as $id => $entity) {
           $items = $entity->get($name);
           $items->filterEmptyItems();
@@ -272,11 +272,11 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
       }
 
       // Let other modules alter the renderable array.
-      $context = array(
+      $context = [
         'entity' => $entity,
         'view_mode' => $this->originalMode,
         'display' => $this,
-      );
+      ];
       \Drupal::moduleHandler()->alter('entity_display_build', $build_list[$id], $context);
     }
 
@@ -287,19 +287,19 @@ class EntityViewDisplay extends EntityDisplayBase implements EntityViewDisplayIn
    * {@inheritdoc}
    */
   public function getPluginCollections() {
-    $configurations = array();
+    $configurations = [];
     foreach ($this->getComponents() as $field_name => $configuration) {
       if (!empty($configuration['type']) && ($field_definition = $this->getFieldDefinition($field_name))) {
-        $configurations[$configuration['type']] = $configuration + array(
+        $configurations[$configuration['type']] = $configuration + [
           'field_definition' => $field_definition,
           'view_mode' => $this->originalMode,
-        );
+        ];
       }
     }
 
-    return array(
+    return [
       'formatters' => new EntityDisplayPluginCollection($this->pluginManager, $configurations)
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Entity/EntityAccessCheck.php b/web/core/lib/Drupal/Core/Entity/EntityAccessCheck.php
index bc8bd5973..8ca8cf66c 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityAccessCheck.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityAccessCheck.php
@@ -16,28 +16,32 @@ class EntityAccessCheck implements AccessInterface {
   /**
    * Checks access to the entity operation on the given route.
    *
-   * The value of the '_entity_access' key must be in the pattern
-   * 'entity_slug_name.operation.' For example, this will check a node for
-   * 'update' access:
+   * The route's '_entity_access' requirement must follow the pattern
+   * 'entity_stub_name.operation', where available operations are:
+   * 'view', 'update', 'create', and 'delete'.
+   *
+   * For example, this route configuration invokes a permissions check for
+   * 'update' access to entities of type 'node':
    * @code
    * pattern: '/foo/{node}/bar'
    * requirements:
    *   _entity_access: 'node.update'
    * @endcode
-   * And this will check a dynamic entity type:
+   * And this will check 'delete' access to a dynamic entity type:
    * @code
    * example.route:
    *   path: foo/{entity_type}/{example}
    *   requirements:
-   *     _entity_access: example.update
+   *     _entity_access: example.delete
    *   options:
    *     parameters:
    *       example:
    *         type: entity:{entity_type}
    * @endcode
-   * @see \Drupal\Core\ParamConverter\EntityConverter
+   * The route match parameter corresponding to the stub name is checked to
+   * see if it is entity-like i.e. implements EntityInterface.
    *
-   * Available operations are 'view', 'update', 'create', and 'delete'.
+   * @see \Drupal\Core\ParamConverter\EntityConverter
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route to check against.
@@ -53,7 +57,7 @@ class EntityAccessCheck implements AccessInterface {
     // Split the entity type and the operation.
     $requirement = $route->getRequirement('_entity_access');
     list($entity_type, $operation) = explode('.', $requirement);
-    // If there is valid entity of the given entity type, check its access.
+    // If $entity_type parameter is a valid entity, call its own access check.
     $parameters = $route_match->getParameters();
     if ($parameters->has($entity_type)) {
       $entity = $parameters->get($entity_type);
diff --git a/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php b/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php
index 153069346..d1d43ee90 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php
@@ -18,7 +18,7 @@ class EntityAccessControlHandler extends EntityHandlerBase implements EntityAcce
    *
    * @var array
    */
-  protected $accessCache = array();
+  protected $accessCache = [];
 
   /**
    * The entity type ID of the access control handler instance.
@@ -207,18 +207,18 @@ class EntityAccessControlHandler extends EntityHandlerBase implements EntityAcce
    * {@inheritdoc}
    */
   public function resetCache() {
-    $this->accessCache = array();
+    $this->accessCache = [];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = array(), $return_as_object = FALSE) {
+  public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = [], $return_as_object = FALSE) {
     $account = $this->prepareUser($account);
-    $context += array(
+    $context += [
       'entity_type_id' => $this->entityTypeId,
       'langcode' => LanguageInterface::LANGCODE_DEFAULT,
-    );
+    ];
 
     $cid = $entity_bundle ? 'create:' . $entity_bundle : 'create';
     if (($access = $this->getCache($cid, 'create', $context['langcode'], $account)) !== NULL) {
@@ -236,8 +236,8 @@ class EntityAccessControlHandler extends EntityHandlerBase implements EntityAcce
     // - No modules say to deny access.
     // - At least one module says to grant access.
     $access = array_merge(
-      $this->moduleHandler()->invokeAll('entity_create_access', array($account, $context, $entity_bundle)),
-      $this->moduleHandler()->invokeAll($this->entityTypeId . '_create_access', array($account, $context, $entity_bundle))
+      $this->moduleHandler()->invokeAll('entity_create_access', [$account, $context, $entity_bundle]),
+      $this->moduleHandler()->invokeAll($this->entityTypeId . '_create_access', [$account, $context, $entity_bundle])
     );
 
     $return = $this->processAccessHookResults($access);
@@ -312,19 +312,19 @@ class EntityAccessControlHandler extends EntityHandlerBase implements EntityAcce
 
     // Invoke hook and collect grants/denies for field access from other
     // modules. Our default access flag is masked under the ':default' key.
-    $grants = array(':default' => $default);
+    $grants = [':default' => $default];
     $hook_implementations = $this->moduleHandler()->getImplementations('entity_field_access');
     foreach ($hook_implementations as $module) {
-      $grants = array_merge($grants, array($module => $this->moduleHandler()->invoke($module, 'entity_field_access', array($operation, $field_definition, $account, $items))));
+      $grants = array_merge($grants, [$module => $this->moduleHandler()->invoke($module, 'entity_field_access', [$operation, $field_definition, $account, $items])]);
     }
 
     // Also allow modules to alter the returned grants/denies.
-    $context = array(
+    $context = [
       'operation' => $operation,
       'field_definition' => $field_definition,
       'items' => $items,
       'account' => $account,
-    );
+    ];
     $this->moduleHandler()->alter('entity_field_access', $grants, $context);
 
     $result = $this->processAccessHookResults($grants);
diff --git a/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php b/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php
index 0bec9c203..5532996b2 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php
@@ -60,7 +60,7 @@ interface EntityAccessControlHandlerInterface {
    *   returned, i.e. TRUE means access is explicitly allowed, FALSE means
    *   access is either explicitly forbidden or "no opinion".
    */
-  public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = array(), $return_as_object = FALSE);
+  public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = [], $return_as_object = FALSE);
 
   /**
    * Clears all cached access checks.
diff --git a/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php b/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
index 01a29b26b..55372f9e7 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
@@ -50,13 +50,13 @@ class EntityAutocompleteMatcher {
    * @see \Drupal\system\Controller\EntityAutocompleteController
    */
   public function getMatches($target_type, $selection_handler, $selection_settings, $string = '') {
-    $matches = array();
+    $matches = [];
 
-    $options = array(
+    $options = [
       'target_type' => $target_type,
       'handler' => $selection_handler,
       'handler_settings' => $selection_settings,
-    );
+    ];
     $handler = $this->selectionManager->getInstance($options);
 
     if (isset($string)) {
@@ -73,7 +73,7 @@ class EntityAutocompleteMatcher {
           $key = preg_replace('/\s\s+/', ' ', str_replace("\n", '', trim(Html::decodeEntities(strip_tags($key)))));
           // Names containing commas or quotes must be wrapped in quotes.
           $key = Tags::encode($key);
-          $matches[] = array('value' => $key, 'label' => $label);
+          $matches[] = ['value' => $key, 'label' => $label];
         }
       }
     }
diff --git a/web/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php b/web/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
index 759183b90..d8c39e439 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
@@ -57,8 +57,8 @@ abstract class EntityConfirmFormBase extends EntityForm implements ConfirmFormIn
     $form['#title'] = $this->getQuestion();
 
     $form['#attributes']['class'][] = 'confirmation';
-    $form['description'] = array('#markup' => $this->getDescription());
-    $form[$this->getFormName()] = array('#type' => 'hidden', '#value' => 1);
+    $form['description'] = ['#markup' => $this->getDescription()];
+    $form[$this->getFormName()] = ['#type' => 'hidden', '#value' => 1];
 
     // By default, render the form using theme_confirm_form().
     if (!isset($form['#theme'])) {
@@ -71,16 +71,16 @@ abstract class EntityConfirmFormBase extends EntityForm implements ConfirmFormIn
    * {@inheritdoc}
    */
   protected function actions(array $form, FormStateInterface $form_state) {
-    return array(
-      'submit' => array(
+    return [
+      'submit' => [
         '#type' => 'submit',
         '#value' => $this->getConfirmText(),
-        '#submit' => array(
-          array($this, 'submitForm'),
-        ),
-      ),
+        '#submit' => [
+          [$this, 'submitForm'],
+        ],
+      ],
       'cancel' => ConfirmFormHelper::buildCancelLink($this, $this->getRequest()),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php b/web/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
index 927dcd340..c3404b6fa 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
@@ -47,7 +47,7 @@ class EntityConstraintViolationList extends ConstraintViolationList implements E
    * @param array $violations
    *   The array of violations.
    */
-  public function __construct(FieldableEntityInterface $entity, array $violations = array()) {
+  public function __construct(FieldableEntityInterface $entity, array $violations = []) {
     parent::__construct($violations);
     $this->entity = $entity;
   }
@@ -156,7 +156,7 @@ class EntityConstraintViolationList extends ConstraintViolationList implements E
    * {@inheritdoc}
    */
   public function filterByFieldAccess(AccountInterface $account = NULL) {
-    $filtered_fields = array();
+    $filtered_fields = [];
     foreach ($this->getFieldNames() as $field_name) {
       if (!$this->entity->get($field_name)->access('edit', $account)) {
         $filtered_fields[] = $field_name;
diff --git a/web/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php b/web/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php
index 3ead81735..70dec2c27 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php
@@ -42,7 +42,7 @@ class EntityDefinitionUpdateManager implements EntityDefinitionUpdateManagerInte
    * {@inheritdoc}
    */
   public function getChangeSummary() {
-    $summary = array();
+    $summary = [];
 
     foreach ($this->getChangeList() as $entity_type_id => $change_list) {
       // Process entity type definition changes.
@@ -259,7 +259,7 @@ class EntityDefinitionUpdateManager implements EntityDefinitionUpdateManagerInte
    */
   protected function getChangeList() {
     $this->entityManager->useCaches(FALSE);
-    $change_list = array();
+    $change_list = [];
 
     foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
       $original = $this->entityManager->getLastInstalledDefinition($entity_type_id);
@@ -275,7 +275,7 @@ class EntityDefinitionUpdateManager implements EntityDefinitionUpdateManagerInte
         }
 
         if ($this->entityManager->getStorage($entity_type_id) instanceof DynamicallyFieldableEntityStorageInterface) {
-          $field_changes = array();
+          $field_changes = [];
           $storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
           $original_storage_definitions = $this->entityManager->getLastInstalledFieldStorageDefinitions($entity_type_id);
 
diff --git a/web/core/lib/Drupal/Core/Entity/EntityDeleteFormTrait.php b/web/core/lib/Drupal/Core/Entity/EntityDeleteFormTrait.php
index 8d5352bf2..2faf45c44 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityDeleteFormTrait.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityDeleteFormTrait.php
@@ -44,10 +44,10 @@ trait EntityDeleteFormTrait {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete the @entity-type %label?', array(
+    return $this->t('Are you sure you want to delete the @entity-type %label?', [
       '@entity-type' => $this->getEntity()->getEntityType()->getLowercaseLabel(),
       '%label' => $this->getEntity()->label(),
-    ));
+    ]);
   }
 
   /**
@@ -65,10 +65,10 @@ trait EntityDeleteFormTrait {
    */
   protected function getDeletionMessage() {
     $entity = $this->getEntity();
-    return $this->t('The @entity-type %label has been deleted.', array(
+    return $this->t('The @entity-type %label has been deleted.', [
       '@entity-type' => $entity->getEntityType()->getLowercaseLabel(),
       '%label' => $entity->label(),
-    ));
+    ]);
   }
 
   /**
@@ -109,10 +109,10 @@ trait EntityDeleteFormTrait {
    */
   protected function logDeletionMessage() {
     $entity = $this->getEntity();
-    $this->logger($entity->getEntityType()->getProvider())->notice('The @entity-type %label has been deleted.', array(
+    $this->logger($entity->getEntityType()->getProvider())->notice('The @entity-type %label has been deleted.', [
       '@entity-type' => $entity->getEntityType()->getLowercaseLabel(),
       '%label' => $entity->label(),
-    ));
+    ]);
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index f8683e3da..ca106b290 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -69,14 +69,14 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
    *
    * @var array
    */
-  protected $content = array();
+  protected $content = [];
 
   /**
    * List of components that are set to be hidden.
    *
    * @var array
    */
-  protected $hidden = array();
+  protected $hidden = [];
 
   /**
    * The original view or form mode that was requested (case of view/form modes
@@ -91,7 +91,7 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
    *
    * @var array
    */
-  protected $plugins = array();
+  protected $plugins = [];
 
   /**
    * Context in which this entity will be used (e.g. 'view', 'form').
@@ -122,7 +122,7 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
       throw new \InvalidArgumentException('Missing required properties for an EntityDisplay entity.');
     }
 
-    if (!$this->entityManager()->getDefinition($values['targetEntityType'])->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface')) {
+    if (!$this->entityTypeManager()->getDefinition($values['targetEntityType'])->entityClassImplements(FieldableEntityInterface::class)) {
       throw new \InvalidArgumentException('EntityDisplay entities can only handle fieldable entity types.');
     }
 
@@ -154,22 +154,27 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
   protected function init() {
     // Only populate defaults for "official" view modes and form modes.
     if ($this->mode !== static::CUSTOM_MODE) {
+      $default_region = $this->getDefaultRegion();
       // Fill in defaults for extra fields.
       $context = $this->displayContext == 'view' ? 'display' : $this->displayContext;
       $extra_fields = \Drupal::entityManager()->getExtraFields($this->targetEntityType, $this->bundle);
-      $extra_fields = isset($extra_fields[$context]) ? $extra_fields[$context] : array();
+      $extra_fields = isset($extra_fields[$context]) ? $extra_fields[$context] : [];
       foreach ($extra_fields as $name => $definition) {
         if (!isset($this->content[$name]) && !isset($this->hidden[$name])) {
           // Extra fields are visible by default unless they explicitly say so.
           if (!isset($definition['visible']) || $definition['visible'] == TRUE) {
-            $this->content[$name] = array(
+            $this->content[$name] = [
               'weight' => $definition['weight']
-            );
+            ];
           }
           else {
             $this->hidden[$name] = TRUE;
           }
         }
+        // Ensure extra fields have a 'region'.
+        if (isset($this->content[$name])) {
+          $this->content[$name] += ['region' => $default_region];
+        }
       }
 
       // Fill in defaults for fields.
@@ -178,10 +183,17 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
         if (!$definition->isDisplayConfigurable($this->displayContext) || (!isset($this->content[$name]) && !isset($this->hidden[$name]))) {
           $options = $definition->getDisplayOptions($this->displayContext);
 
-          if (!empty($options['type']) && $options['type'] == 'hidden') {
+          // @todo Remove handling of 'type' in https://www.drupal.org/node/2799641.
+          if (!isset($options['region']) && !empty($options['type']) && $options['type'] === 'hidden') {
+            $options['region'] = 'hidden';
+            @trigger_error("Specifying 'type' => 'hidden' is deprecated, use 'region' => 'hidden' instead.", E_USER_DEPRECATED);
+          }
+
+          if (!empty($options['region']) && $options['region'] === 'hidden') {
             $this->hidden[$name] = TRUE;
           }
           elseif ($options) {
+            $options += ['region' => $default_region];
             $this->content[$name] = $this->pluginManager->prepareConfiguration($definition->getType(), $options);
           }
           // Note: (base) fields that do not specify display options are not
@@ -239,11 +251,39 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
    * {@inheritdoc}
    */
   public function preSave(EntityStorageInterface $storage, $update = TRUE) {
+    // Ensure that a region is set on each component.
+    foreach ($this->getComponents() as $name => $component) {
+      $this->handleHiddenType($name, $component);
+      // Ensure that a region is set.
+      if (isset($this->content[$name]) && !isset($component['region'])) {
+        // Directly set the component to bypass other changes in setComponent().
+        $this->content[$name]['region'] = $this->getDefaultRegion();
+      }
+    }
+
     ksort($this->content);
     ksort($this->hidden);
     parent::preSave($storage, $update);
   }
 
+  /**
+   * Handles a component type of 'hidden'.
+   *
+   * @deprecated This method exists only for backwards compatibility.
+   *
+   * @todo Remove this in https://www.drupal.org/node/2799641.
+   *
+   * @param string $name
+   *   The name of the component.
+   * @param array $component
+   *   The component array.
+   */
+  protected function handleHiddenType($name, array $component) {
+    if (!isset($component['region']) && isset($component['type']) && $component['type'] === 'hidden') {
+      $this->removeComponent($name);
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -319,7 +359,7 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
   /**
    * {@inheritdoc}
    */
-  public function setComponent($name, array $options = array()) {
+  public function setComponent($name, array $options = []) {
     // If no weight specified, make sure the field sinks at the bottom.
     if (!isset($options['weight'])) {
       $max = $this->getHighestWeight();
@@ -356,7 +396,7 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
    * {@inheritdoc}
    */
   public function getHighestWeight() {
-    $weights = array();
+    $weights = [];
 
     // Collect weights for the components in the display.
     foreach ($this->content as $options) {
@@ -366,7 +406,7 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
     }
 
     // Let other modules feedback about their own additions.
-    $weights = array_merge($weights, \Drupal::moduleHandler()->invokeAll('field_info_max_weight', array($this->targetEntityType, $this->bundle, $this->displayContext, $this->mode)));
+    $weights = array_merge($weights, \Drupal::moduleHandler()->invokeAll('field_info_max_weight', [$this->targetEntityType, $this->bundle, $this->displayContext, $this->mode]));
 
     return $weights ? max($weights) : NULL;
   }
@@ -388,7 +428,7 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
       // For "official" view modes and form modes, ignore fields whose
       // definition states they should not be displayed.
       if ($this->mode !== static::CUSTOM_MODE) {
-        $definitions = array_filter($definitions, array($this, 'fieldHasDisplayOptions'));
+        $definitions = array_filter($definitions, [$this, 'fieldHasDisplayOptions']);
       }
       $this->fieldDefinitions = $definitions;
     }
@@ -504,6 +544,16 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
     return $intersect;
   }
 
+  /**
+   * Gets the default region.
+   *
+   * @return string
+   *   The default region for this display.
+   */
+  protected function getDefaultRegion() {
+    return 'content';
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/lib/Drupal/Core/Entity/EntityDisplayRepository.php b/web/core/lib/Drupal/Core/Entity/EntityDisplayRepository.php
index 0ee431738..d959881ea 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityDisplayRepository.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityDisplayRepository.php
@@ -187,7 +187,7 @@ class EntityDisplayRepository implements EntityDisplayRepositoryInterface {
    *   An array of display mode labels, keyed by the display mode ID.
    */
   protected function getDisplayModeOptions($display_type, $entity_type_id) {
-    $options = array('default' => t('Default'));
+    $options = ['default' => t('Default')];
     foreach ($this->getDisplayModesByEntityType($display_type, $entity_type_id) as $mode => $settings) {
       $options[$mode] = $settings['label'];
     }
@@ -213,7 +213,7 @@ class EntityDisplayRepository implements EntityDisplayRepositoryInterface {
 
     // Filter out modes for which the entity display is disabled
     // (or non-existent).
-    $load_ids = array();
+    $load_ids = [];
     // Get the list of available entity displays for the current bundle.
     foreach (array_keys($options) as $mode) {
       $load_ids[] = $entity_type_id . '.' . $bundle . '.' . $mode;
diff --git a/web/core/lib/Drupal/Core/Entity/EntityFieldManager.php b/web/core/lib/Drupal/Core/Entity/EntityFieldManager.php
index 533728819..378a95ca9 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityFieldManager.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityFieldManager.php
@@ -195,7 +195,7 @@ class EntityFieldManager implements EntityFieldManagerInterface {
     $keys = array_filter($entity_type->getKeys());
 
     // Fail with an exception for non-fieldable entity types.
-    if (!$entity_type->isSubclassOf(FieldableEntityInterface::class)) {
+    if (!$entity_type->entityClassImplements(FieldableEntityInterface::class)) {
       throw new \LogicException("Getting the base fields is not supported for entity type {$entity_type->getLabel()}.");
     }
 
@@ -435,7 +435,7 @@ class EntityFieldManager implements EntityFieldManagerInterface {
         // bundles, and we do not expect to have so many different entity
         // types for this to become a bottleneck.
         foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-          if ($entity_type->isSubclassOf(FieldableEntityInterface::class)) {
+          if ($entity_type->entityClassImplements(FieldableEntityInterface::class)) {
             $bundles = array_keys($this->entityTypeBundleInfo->getBundleInfo($entity_type_id));
             foreach ($this->getBaseFieldDefinitions($entity_type_id) as $field_name => $base_field_definition) {
               $this->fieldMap[$entity_type_id][$field_name] = [
diff --git a/web/core/lib/Drupal/Core/Entity/EntityForm.php b/web/core/lib/Drupal/Core/Entity/EntityForm.php
index a83af35db..35062185e 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -204,9 +204,9 @@ class EntityForm extends FormBase implements EntityFormInterface {
 
     $count = 0;
     foreach (Element::children($element) as $action) {
-      $element[$action] += array(
+      $element[$action] += [
         '#weight' => ++$count * 5,
-      );
+      ];
     }
 
     if (!empty($element)) {
@@ -226,11 +226,11 @@ class EntityForm extends FormBase implements EntityFormInterface {
     // @todo Consider renaming the action key from submit to save. The impacts
     //   are hard to predict. For example, see
     //   \Drupal\language\Element\LanguageConfiguration::processLanguageConfiguration().
-    $actions['submit'] = array(
+    $actions['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
-      '#submit' => array('::submitForm', '::save'),
-    );
+      '#submit' => ['::submitForm', '::save'],
+    ];
 
     if (!$this->entity->isNew() && $this->entity->hasLinkTemplate('delete-form')) {
       $route_info = $this->entity->urlInfo('delete-form');
@@ -239,14 +239,14 @@ class EntityForm extends FormBase implements EntityFormInterface {
         $query['destination'] = $this->getRequest()->query->get('destination');
         $route_info->setOption('query', $query);
       }
-      $actions['delete'] = array(
+      $actions['delete'] = [
         '#type' => 'link',
         '#title' => $this->t('Delete'),
         '#access' => $this->entity->access('delete'),
-        '#attributes' => array(
-          'class' => array('button', 'button--danger'),
-        ),
-      );
+        '#attributes' => [
+          'class' => ['button', 'button--danger'],
+        ],
+      ];
       $actions['delete']['#url'] = $route_info;
     }
 
@@ -294,7 +294,7 @@ class EntityForm extends FormBase implements EntityFormInterface {
     // properties.
     if (isset($form['#entity_builders'])) {
       foreach ($form['#entity_builders'] as $function) {
-        call_user_func_array($function, array($entity->getEntityTypeId(), $entity, &$form, &$form_state));
+        call_user_func_array($form_state->prepareCallback($function), [$entity->getEntityTypeId(), $entity, &$form, &$form_state]);
       }
     }
 
@@ -391,7 +391,7 @@ class EntityForm extends FormBase implements EntityFormInterface {
       if (function_exists($function)) {
         // Ensure we pass an updated translation object and form display at
         // each invocation, since they depend on form state which is alterable.
-        $args = array($this->entity, $this->operation, &$form_state);
+        $args = [$this->entity, $this->operation, &$form_state];
         call_user_func_array($function, $args);
       }
     }
diff --git a/web/core/lib/Drupal/Core/Entity/EntityFormBuilder.php b/web/core/lib/Drupal/Core/Entity/EntityFormBuilder.php
index ff4b9178b..d5f0baf00 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityFormBuilder.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityFormBuilder.php
@@ -40,7 +40,7 @@ class EntityFormBuilder implements EntityFormBuilderInterface {
   /**
    * {@inheritdoc}
    */
-  public function getForm(EntityInterface $entity, $operation = 'default', array $form_state_additions = array()) {
+  public function getForm(EntityInterface $entity, $operation = 'default', array $form_state_additions = []) {
     $form_object = $this->entityManager->getFormObject($entity->getEntityTypeId(), $operation);
     $form_object->setEntity($entity);
 
diff --git a/web/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php b/web/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
index bfcead12b..2265cd0ff 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
@@ -53,6 +53,6 @@ interface EntityFormBuilderInterface {
    * @see \Drupal\Core\Entity\EntityTypeInterface::setFormClass()
    * @see system_entity_type_build()
    */
-  public function getForm(EntityInterface $entity, $operation = 'default', array $form_state_additions = array());
+  public function getForm(EntityInterface $entity, $operation = 'default', array $form_state_additions = []);
 
 }
diff --git a/web/core/lib/Drupal/Core/Entity/EntityInterface.php b/web/core/lib/Drupal/Core/Entity/EntityInterface.php
index 3a38e072d..8890fb7f3 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -112,7 +112,7 @@ interface EntityInterface extends AccessibleInterface, CacheableDependencyInterf
    *
    * @see \Drupal\Core\Entity\EntityInterface::toUrl
    */
-  public function urlInfo($rel = 'canonical', array $options = array());
+  public function urlInfo($rel = 'canonical', array $options = []);
 
   /**
    * Gets the URL object for the entity.
@@ -150,7 +150,7 @@ interface EntityInterface extends AccessibleInterface, CacheableDependencyInterf
    * @throws \Drupal\Core\Entity\EntityMalformedException
    * @throws \Drupal\Core\Entity\Exception\UndefinedLinkTemplateException
    */
-  public function toUrl($rel = 'canonical', array $options = array());
+  public function toUrl($rel = 'canonical', array $options = []);
 
   /**
    * Gets the public URL for this entity.
@@ -169,7 +169,7 @@ interface EntityInterface extends AccessibleInterface, CacheableDependencyInterf
    *
    * @see \Drupal\Core\Entity\EntityInterface::toUrl
    */
-  public function url($rel = 'canonical', $options = array());
+  public function url($rel = 'canonical', $options = []);
 
   /**
    * Deprecated way of generating a link to the entity. See toLink().
@@ -264,7 +264,7 @@ interface EntityInterface extends AccessibleInterface, CacheableDependencyInterf
    * @return static
    *   The entity object.
    */
-  public static function create(array $values = array());
+  public static function create(array $values = []);
 
   /**
    * Saves an entity permanently.
diff --git a/web/core/lib/Drupal/Core/Entity/EntityListBuilder.php b/web/core/lib/Drupal/Core/Entity/EntityListBuilder.php
index b9c8db3d0..7f46915ae 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityListBuilder.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityListBuilder.php
@@ -120,7 +120,7 @@ class EntityListBuilder extends EntityHandlerBase implements EntityListBuilderIn
    */
   public function getOperations(EntityInterface $entity) {
     $operations = $this->getDefaultOperations($entity);
-    $operations += $this->moduleHandler()->invokeAll('entity_operation', array($entity));
+    $operations += $this->moduleHandler()->invokeAll('entity_operation', [$entity]);
     $this->moduleHandler->alter('entity_operation', $operations, $entity);
     uasort($operations, '\Drupal\Component\Utility\SortArray::sortByWeightElement');
 
@@ -138,20 +138,20 @@ class EntityListBuilder extends EntityHandlerBase implements EntityListBuilderIn
    *   self::getOperations().
    */
   protected function getDefaultOperations(EntityInterface $entity) {
-    $operations = array();
+    $operations = [];
     if ($entity->access('update') && $entity->hasLinkTemplate('edit-form')) {
-      $operations['edit'] = array(
+      $operations['edit'] = [
         'title' => $this->t('Edit'),
         'weight' => 10,
         'url' => $entity->urlInfo('edit-form'),
-      );
+      ];
     }
     if ($entity->access('delete') && $entity->hasLinkTemplate('delete-form')) {
-      $operations['delete'] = array(
+      $operations['delete'] = [
         'title' => $this->t('Delete'),
         'weight' => 100,
         'url' => $entity->urlInfo('delete-form'),
-      );
+      ];
     }
 
     return $operations;
@@ -198,10 +198,10 @@ class EntityListBuilder extends EntityHandlerBase implements EntityListBuilderIn
    * @see \Drupal\Core\Entity\EntityListBuilder::buildRow()
    */
   public function buildOperations(EntityInterface $entity) {
-    $build = array(
+    $build = [
       '#type' => 'operations',
       '#links' => $this->getOperations($entity),
-    );
+    ];
 
     return $build;
   }
@@ -214,17 +214,17 @@ class EntityListBuilder extends EntityHandlerBase implements EntityListBuilderIn
    * @todo Add a link to add a new item to the #empty text.
    */
   public function render() {
-    $build['table'] = array(
+    $build['table'] = [
       '#type' => 'table',
       '#header' => $this->buildHeader(),
       '#title' => $this->getTitle(),
-      '#rows' => array(),
-      '#empty' => $this->t('There is no @label yet.', array('@label' => $this->entityType->getLabel())),
+      '#rows' => [],
+      '#empty' => $this->t('There is no @label yet.', ['@label' => $this->entityType->getLabel()]),
       '#cache' => [
         'contexts' => $this->entityType->getListCacheContexts(),
         'tags' => $this->entityType->getListCacheTags(),
       ],
-    );
+    ];
     foreach ($this->load() as $entity) {
       if ($row = $this->buildRow($entity)) {
         $build['table']['#rows'][$entity->id()] = $row;
@@ -233,9 +233,9 @@ class EntityListBuilder extends EntityHandlerBase implements EntityListBuilderIn
 
     // Only add the pager if a limit is specified.
     if ($this->limit) {
-      $build['pager'] = array(
+      $build['pager'] = [
         '#type' => 'pager',
-      );
+      ];
     }
     return $build;
   }
diff --git a/web/core/lib/Drupal/Core/Entity/EntityManager.php b/web/core/lib/Drupal/Core/Entity/EntityManager.php
index bf4acf357..fa2ddf8c7 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -265,7 +265,7 @@ class EntityManager implements EntityManagerInterface, ContainerAwareInterface {
    *
    * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
    */
-  public function getTranslationFromContext(EntityInterface $entity, $langcode = NULL, $context = array()) {
+  public function getTranslationFromContext(EntityInterface $entity, $langcode = NULL, $context = []) {
     return $this->container->get('entity.repository')->getTranslationFromContext($entity, $langcode, $context);
   }
 
diff --git a/web/core/lib/Drupal/Core/Entity/EntityPublishedInterface.php b/web/core/lib/Drupal/Core/Entity/EntityPublishedInterface.php
new file mode 100644
index 000000000..4372008c1
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Entity/EntityPublishedInterface.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Drupal\Core\Entity;
+
+/**
+ * Provides an interface for access to an entity's published state.
+ */
+interface EntityPublishedInterface {
+
+  /**
+   * Returns whether or not the entity is published.
+   *
+   * @return bool
+   *   TRUE if the entity is published, FALSE otherwise.
+   */
+  public function isPublished();
+
+  /**
+   * Sets the entity as published.
+   *
+   * @param bool|null $published
+   *   (optional and deprecated) TRUE to set this entity to published, FALSE to
+   *   set it to unpublished. Defaults to NULL. This parameter is deprecated in
+   *   Drupal 8.3.0 and will be removed before Drupal 9.0.0. Use this method,
+   *   without any parameter, to set the entity as published and
+   *   setUnpublished() to set the entity as unpublished.
+   *
+   * @return $this
+   *
+   * @see \Drupal\Core\Entity\EntityPublishedInterface::setUnpublished()
+   */
+  public function setPublished($published = NULL);
+
+  /**
+   * Sets the entity as unpublished.
+   *
+   * @return $this
+   */
+  public function setUnpublished();
+
+}
diff --git a/web/core/lib/Drupal/Core/Entity/EntityPublishedTrait.php b/web/core/lib/Drupal/Core/Entity/EntityPublishedTrait.php
new file mode 100644
index 000000000..871aceb36
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Entity/EntityPublishedTrait.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Drupal\Core\Entity;
+
+use Drupal\Core\Entity\Exception\UnsupportedEntityTypeDefinitionException;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+
+/**
+ * Provides a trait for published status.
+ */
+trait EntityPublishedTrait {
+
+  /**
+   * Returns an array of base field definitions for publishing status.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type to add the publishing status field to.
+   *
+   * @return \Drupal\Core\Field\BaseFieldDefinition[]
+   *   An array of base field definitions.
+   *
+   * @throws \Drupal\Core\Entity\Exception\UnsupportedEntityTypeDefinitionException
+   *   Thrown when the entity type does not implement EntityPublishedInterface
+   *   or if it does not have a "published" entity key.
+   */
+  public static function publishedBaseFieldDefinitions(EntityTypeInterface $entity_type) {
+    if (!is_subclass_of($entity_type->getClass(), EntityPublishedInterface::class)) {
+      throw new UnsupportedEntityTypeDefinitionException('The entity type ' . $entity_type->id() . ' does not implement \Drupal\Core\Entity\EntityPublishedInterface.');
+    }
+    if (!$entity_type->hasKey('published')) {
+      throw new UnsupportedEntityTypeDefinitionException('The entity type ' . $entity_type->id() . ' does not have a "published" entity key.');
+    }
+
+    return [$entity_type->getKey('published') => BaseFieldDefinition::create('boolean')
+      ->setLabel(new TranslatableMarkup('Publishing status'))
+      ->setDescription(new TranslatableMarkup('A boolean indicating the published state.'))
+      ->setRevisionable(TRUE)
+      ->setTranslatable(TRUE)
+      ->setDefaultValue(TRUE)];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isPublished() {
+    $key = $this->getEntityType()->getKey('published');
+    return (bool) $this->get($key)->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setPublished($published = NULL) {
+    if ($published !== NULL) {
+      @trigger_error('The $published parameter is deprecated since version 8.3.x and will be removed in 9.0.0.', E_USER_DEPRECATED);
+      $value = (bool) $published;
+    }
+    else {
+      $value = TRUE;
+    }
+    $key = $this->getEntityType()->getKey('published');
+    $this->set($key, $value);
+
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUnpublished() {
+    $key = $this->getEntityType()->getKey('published');
+    $this->set($key, FALSE);
+
+    return $this;
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginManager.php b/web/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginManager.php
index 1b35d4aaf..53b43fdc6 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginManager.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionPluginManager.php
@@ -37,10 +37,10 @@ class SelectionPluginManager extends DefaultPluginManager implements SelectionPl
     }
 
     // Initialize default options.
-    $options += array(
+    $options += [
       'handler' => $this->getPluginId($options['target_type'], 'default'),
-      'handler_settings' => array(),
-    );
+      'handler_settings' => [],
+    ];
 
     // A specific selection plugin ID was already specified.
     if (strpos($options['handler'], ':') !== FALSE) {
@@ -62,7 +62,7 @@ class SelectionPluginManager extends DefaultPluginManager implements SelectionPl
     $selection_handler_groups = $this->getSelectionGroups($target_type);
 
     // Sort the selection plugins by weight and select the best match.
-    uasort($selection_handler_groups[$base_plugin_id], array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
+    uasort($selection_handler_groups[$base_plugin_id], ['Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
     end($selection_handler_groups[$base_plugin_id]);
     $plugin_id = key($selection_handler_groups[$base_plugin_id]);
 
@@ -73,7 +73,7 @@ class SelectionPluginManager extends DefaultPluginManager implements SelectionPl
    * {@inheritdoc}
    */
   public function getSelectionGroups($entity_type_id) {
-    $plugins = array();
+    $plugins = [];
     $definitions = $this->getDefinitions();
 
     // Do not display the 'broken' plugin in the UI.
@@ -92,19 +92,19 @@ class SelectionPluginManager extends DefaultPluginManager implements SelectionPl
    * {@inheritdoc}
    */
   public function getSelectionHandler(FieldDefinitionInterface $field_definition, EntityInterface $entity = NULL) {
-    $options = array(
+    $options = [
       'target_type' => $field_definition->getFieldStorageDefinition()->getSetting('target_type'),
       'handler' => $field_definition->getSetting('handler'),
-      'handler_settings' => $field_definition->getSetting('handler_settings') ?: array(),
+      'handler_settings' => $field_definition->getSetting('handler_settings') ?: [],
       'entity' => $entity,
-    );
+    ];
     return $this->getInstance($options);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function getFallbackPluginId($plugin_id, array $configuration = array()) {
+  public function getFallbackPluginId($plugin_id, array $configuration = []) {
     return 'broken';
   }
 
diff --git a/web/core/lib/Drupal/Core/Entity/EntityRepository.php b/web/core/lib/Drupal/Core/Entity/EntityRepository.php
index 5fb7501f0..986cc50b5 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityRepository.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityRepository.php
@@ -79,7 +79,7 @@ class EntityRepository implements EntityRepositoryInterface {
   /**
    * {@inheritdoc}
    */
-  public function getTranslationFromContext(EntityInterface $entity, $langcode = NULL, $context = array()) {
+  public function getTranslationFromContext(EntityInterface $entity, $langcode = NULL, $context = []) {
     $translation = $entity;
 
     if ($entity instanceof TranslatableInterface && count($entity->getTranslationLanguages()) > 1) {
@@ -92,7 +92,7 @@ class EntityRepository implements EntityRepositoryInterface {
       // negotiation, unless the current translation is already the desired one.
       if ($entity->language()->getId() != $langcode) {
         $context['data'] = $entity;
-        $context += array('operation' => 'entity_view', 'langcode' => $langcode);
+        $context += ['operation' => 'entity_view', 'langcode' => $langcode];
         $candidates = $this->languageManager->getFallbackCandidates($context);
 
         // Ensure the default language has the proper language code.
diff --git a/web/core/lib/Drupal/Core/Entity/EntityRepositoryInterface.php b/web/core/lib/Drupal/Core/Entity/EntityRepositoryInterface.php
index efbfb6be0..d1229d455 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityRepositoryInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityRepositoryInterface.php
@@ -67,6 +67,6 @@ interface EntityRepositoryInterface {
    *
    * @see \Drupal\Core\Language\LanguageManagerInterface::getFallbackCandidates()
    */
-  public function getTranslationFromContext(EntityInterface $entity, $langcode = NULL, $context = array());
+  public function getTranslationFromContext(EntityInterface $entity, $langcode = NULL, $context = []);
 
 }
diff --git a/web/core/lib/Drupal/Core/Entity/EntityResolverManager.php b/web/core/lib/Drupal/Core/Entity/EntityResolverManager.php
index 847a480e4..e9a87d6a6 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityResolverManager.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityResolverManager.php
@@ -70,13 +70,13 @@ class EntityResolverManager {
       // Check if the class exists and if so use the buildForm() method from the
       // interface.
       if (class_exists($controller)) {
-        return array($controller, 'buildForm');
+        return [$controller, 'buildForm'];
       }
     }
 
     if (strpos($controller, ':') === FALSE) {
       if (method_exists($controller, '__invoke')) {
-        return array($controller, '__invoke');
+        return [$controller, '__invoke'];
       }
       if (function_exists($controller)) {
         return $controller;
@@ -91,7 +91,7 @@ class EntityResolverManager {
       // that could not exist at this point. There is however no other way to
       // do it, as the container does not allow static introspection.
       list($class_or_service, $method) = explode(':', $controller, 2);
-      return array($this->classResolver->getInstanceFromDefinition($class_or_service), $method);
+      return [$this->classResolver->getInstanceFromDefinition($class_or_service), $method];
     }
     elseif (strpos($controller, '::') !== FALSE) {
       // Controller in the class::method notation.
@@ -114,7 +114,7 @@ class EntityResolverManager {
    */
   protected function setParametersFromReflection($controller, Route $route) {
     $entity_types = $this->getEntityTypes();
-    $parameter_definitions = $route->getOption('parameters') ?: array();
+    $parameter_definitions = $route->getOption('parameters') ?: [];
 
     $result = FALSE;
 
@@ -136,10 +136,10 @@ class EntityResolverManager {
         $entity_type = $entity_types[$parameter_name];
         $entity_class = $entity_type->getClass();
         if (($reflection_class = $parameter->getClass()) && (is_subclass_of($entity_class, $reflection_class->name) || $entity_class == $reflection_class->name)) {
-          $parameter_definitions += array($parameter_name => array());
-          $parameter_definitions[$parameter_name] += array(
+          $parameter_definitions += [$parameter_name => []];
+          $parameter_definitions[$parameter_name] += [
             'type' => 'entity:' . $parameter_name,
-          );
+          ];
           $result = TRUE;
         }
       }
@@ -170,7 +170,7 @@ class EntityResolverManager {
     // parameter in the first place. This is the case for add forms, for
     // example.
     if (isset($entity_type) && isset($this->getEntityTypes()[$entity_type]) && (strpos($route->getPath(), '{' . $entity_type . '}') !== FALSE)) {
-      $parameter_definitions = $route->getOption('parameters') ?: array();
+      $parameter_definitions = $route->getOption('parameters') ?: [];
 
       // First try to figure out whether there is already a parameter upcasting
       // the same entity type already.
@@ -185,11 +185,11 @@ class EntityResolverManager {
       }
 
       if (!isset($parameter_definitions[$entity_type])) {
-        $parameter_definitions[$entity_type] = array();
+        $parameter_definitions[$entity_type] = [];
       }
-      $parameter_definitions[$entity_type] += array(
+      $parameter_definitions[$entity_type] += [
         'type' => 'entity:' . $entity_type,
-      );
+      ];
       if (!empty($parameter_definitions)) {
         $route->setOption('parameters', $parameter_definitions);
       }
diff --git a/web/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/web/core/lib/Drupal/Core/Entity/EntityStorageBase.php
index f58312106..99698df0a 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityStorageBase.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityStorageBase.php
@@ -14,7 +14,7 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
    *
    * @var array
    */
-  protected $entities = array();
+  protected $entities = [];
 
   /**
    * Entity type ID for this storage.
@@ -105,7 +105,7 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
    * {@inheritdoc}
    */
   public function loadUnchanged($id) {
-    $this->resetCache(array($id));
+    $this->resetCache([$id]);
     return $this->load($id);
   }
 
@@ -119,7 +119,7 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
       }
     }
     else {
-      $this->entities = array();
+      $this->entities = [];
     }
   }
 
@@ -133,7 +133,7 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
    *   Array of entities from the entity cache.
    */
   protected function getFromStaticCache(array $ids) {
-    $entities = array();
+    $entities = [];
     // Load any available entities from the internal cache.
     if ($this->entityType->isStaticallyCacheable() && !empty($this->entities)) {
       $entities += array_intersect_key($this->entities, array_flip($ids));
@@ -164,15 +164,15 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
    */
   protected function invokeHook($hook, EntityInterface $entity) {
     // Invoke the hook.
-    $this->moduleHandler()->invokeAll($this->entityTypeId . '_' . $hook, array($entity));
+    $this->moduleHandler()->invokeAll($this->entityTypeId . '_' . $hook, [$entity]);
     // Invoke the respective entity-level hook.
-    $this->moduleHandler()->invokeAll('entity_' . $hook, array($entity));
+    $this->moduleHandler()->invokeAll('entity_' . $hook, [$entity]);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function create(array $values = array()) {
+  public function create(array $values = []) {
     $entity_class = $this->entityClass;
     $entity_class::preCreate($this, $values);
 
@@ -209,7 +209,7 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
    * {@inheritdoc}
    */
   public function load($id) {
-    $entities = $this->loadMultiple(array($id));
+    $entities = $this->loadMultiple([$id]);
     return isset($entities[$id]) ? $entities[$id] : NULL;
   }
 
@@ -217,7 +217,7 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
    * {@inheritdoc}
    */
   public function loadMultiple(array $ids = NULL) {
-    $entities = array();
+    $entities = [];
 
     // Create a new variable which is either a prepared version of the $ids
     // array for later comparison with the entity cache, or FALSE if no $ids
@@ -317,7 +317,7 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
    *   An array of entity objects implementing the EntityInterface.
    */
   protected function mapFromStorageRecords(array $records) {
-    $entities = array();
+    $entities = [];
     foreach ($records as $record) {
       $entity = new $this->entityClass($record, $this->entityTypeId);
       $entities[$entity->id()] = $entity;
@@ -460,7 +460,7 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
    *   Specifies whether the entity is being updated or created.
    */
   protected function doPostSave(EntityInterface $entity, $update) {
-    $this->resetCache(array($entity->id()));
+    $this->resetCache([$entity->id()]);
 
     // The entity is no longer new.
     $entity->enforceIsNew(FALSE);
@@ -496,12 +496,12 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
   /**
    * {@inheritdoc}
    */
-  public function loadByProperties(array $values = array()) {
+  public function loadByProperties(array $values = []) {
     // Build a query to fetch the entity IDs.
     $entity_query = $this->getQuery();
     $this->buildPropertyQuery($entity_query, $values);
     $result = $entity_query->execute();
-    return $result ? $this->loadMultiple($result) : array();
+    return $result ? $this->loadMultiple($result) : [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/EntityStorageInterface.php b/web/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
index e4031239b..50166d6e2 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
@@ -102,7 +102,7 @@ interface EntityStorageInterface {
    * @return \Drupal\Core\Entity\EntityInterface[]
    *   An array of entity objects indexed by their ids.
    */
-  public function loadByProperties(array $values = array());
+  public function loadByProperties(array $values = []);
 
   /**
    * Constructs a new entity object, without permanently saving it.
@@ -114,7 +114,7 @@ interface EntityStorageInterface {
    * @return \Drupal\Core\Entity\EntityInterface
    *   A new entity object.
    */
-  public function create(array $values = array());
+  public function create(array $values = []);
 
   /**
    * Deletes permanently saved entities.
diff --git a/web/core/lib/Drupal/Core/Entity/EntityType.php b/web/core/lib/Drupal/Core/Entity/EntityType.php
index 89b83cf09..b39fb3fa4 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityType.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityType.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Entity;
 
+use Drupal\Component\Plugin\Definition\PluginDefinition;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\Exception\EntityTypeIdLengthException;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -12,7 +13,7 @@ use Drupal\Core\StringTranslation\TranslatableMarkup;
  *
  * @ingroup entity_api
  */
-class EntityType implements EntityTypeInterface {
+class EntityType extends PluginDefinition implements EntityTypeInterface {
 
   use StringTranslationTrait;
 
@@ -42,7 +43,7 @@ class EntityType implements EntityTypeInterface {
    *
    * @var array
    */
-  protected $entity_keys = array();
+  protected $entity_keys = [];
 
   /**
    * The unique identifier of this entity type.
@@ -51,20 +52,6 @@ class EntityType implements EntityTypeInterface {
    */
   protected $id;
 
-  /**
-   * The name of the provider of this entity type.
-   *
-   * @var string
-   */
-  protected $provider;
-
-  /**
-   * The name of the entity type class.
-   *
-   * @var string
-   */
-  protected $class;
-
   /**
    * The name of the original entity type class.
    *
@@ -79,7 +66,7 @@ class EntityType implements EntityTypeInterface {
    *
    * @var array
    */
-  protected $handlers = array();
+  protected $handlers = [];
 
   /**
    * The name of the default administrative permission.
@@ -101,7 +88,7 @@ class EntityType implements EntityTypeInterface {
    *
    * @var array
    */
-  protected $links = array();
+  protected $links = [];
 
   /**
    * The name of a callback that returns the label of the entity.
@@ -174,17 +161,37 @@ class EntityType implements EntityTypeInterface {
    */
   protected $translatable = FALSE;
 
+  /**
+   * Indicates whether the revision form fields should be added to the form.
+   *
+   * @var bool
+   */
+  protected $show_revision_ui = FALSE;
+
   /**
    * The human-readable name of the type.
    *
    * @var string
+   *
+   * @see \Drupal\Core\Entity\EntityTypeInterface::getLabel()
    */
   protected $label = '';
 
+  /**
+   * The human-readable label for a collection of entities of the type.
+   *
+   * @var string
+   *
+   * @see \Drupal\Core\Entity\EntityTypeInterface::getCollectionLabel()
+   */
+  protected $label_collection = '';
+
   /**
    * The indefinite singular name of the type.
    *
    * @var string
+   *
+   * @see \Drupal\Core\Entity\EntityTypeInterface::getSingularLabel()
    */
   protected $label_singular = '';
 
@@ -192,6 +199,8 @@ class EntityType implements EntityTypeInterface {
    * The indefinite plural name of the type.
    *
    * @var string
+   *
+   * @see \Drupal\Core\Entity\EntityTypeInterface::getPluralLabel()
    */
   protected $label_plural = '';
 
@@ -201,6 +210,8 @@ class EntityType implements EntityTypeInterface {
    * Needed keys: "singular" and "plural".
    *
    * @var string[]
+   *
+   * @see \Drupal\Core\Entity\EntityTypeInterface::getCountLabel()
    */
   protected $label_count = [];
 
@@ -257,7 +268,7 @@ class EntityType implements EntityTypeInterface {
    *
    * @var array[]
    */
-  protected $constraints = array();
+  protected $constraints = [];
 
   /**
    * Any additional properties and values.
@@ -286,22 +297,22 @@ class EntityType implements EntityTypeInterface {
     }
 
     // Ensure defaults.
-    $this->entity_keys += array(
+    $this->entity_keys += [
       'revision' => '',
       'bundle' => '',
       'langcode' => '',
       'default_langcode' => 'default_langcode',
-    );
-    $this->handlers += array(
+    ];
+    $this->handlers += [
       'access' => 'Drupal\Core\Entity\EntityAccessControlHandler',
-    );
+    ];
     if (isset($this->handlers['storage'])) {
       $this->checkStorageClass($this->handlers['storage']);
     }
 
     // Automatically add the EntityChanged constraint if the entity type tracks
     // the changed time.
-    if ($this->isSubclassOf('Drupal\Core\Entity\EntityChangedInterface') ) {
+    if ($this->entityClassImplements(EntityChangedInterface::class) ) {
       $this->addConstraint('EntityChanged');
     }
 
@@ -381,27 +392,6 @@ class EntityType implements EntityTypeInterface {
     return !empty($keys[$key]);
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function id() {
-    return $this->id;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getProvider() {
-    return $this->provider;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getClass() {
-    return $this->class;
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -418,15 +408,22 @@ class EntityType implements EntityTypeInterface {
       // class, assume that is the original class name.
       $this->originalClass = $this->class;
     }
-    $this->class = $class;
-    return $this;
+
+    return parent::setClass($class);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function entityClassImplements($interface) {
+    return is_subclass_of($this->getClass(), $interface);
   }
 
   /**
    * {@inheritdoc}
    */
   public function isSubclassOf($class) {
-    return is_subclass_of($this->getClass(), $class);
+    return $this->entityClassImplements($class);
   }
 
   /**
@@ -689,6 +686,13 @@ class EntityType implements EntityTypeInterface {
     return $this->base_table;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function showRevisionUi() {
+    return $this->isRevisionable() && $this->show_revision_ui;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -739,6 +743,17 @@ class EntityType implements EntityTypeInterface {
     return Unicode::strtolower($this->getLabel());
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCollectionLabel() {
+    if (empty($this->label_collection)) {
+      $label = $this->getLabel();
+      $this->label_collection = new TranslatableMarkup('@label entities', ['@label' => $label], [], $this->getStringTranslation());
+    }
+    return $this->label_collection;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -799,7 +814,7 @@ class EntityType implements EntityTypeInterface {
    * {@inheritdoc}
    */
   public function getGroupLabel() {
-    return !empty($this->group_label) ? $this->group_label : $this->t('Other', array(), array('context' => 'Entity type group'));
+    return !empty($this->group_label) ? $this->group_label : $this->t('Other', [], ['context' => 'Entity type group']);
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/EntityTypeEventSubscriberTrait.php b/web/core/lib/Drupal/Core/Entity/EntityTypeEventSubscriberTrait.php
index 4f4213f7a..98223ce04 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityTypeEventSubscriberTrait.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityTypeEventSubscriberTrait.php
@@ -22,7 +22,7 @@ trait EntityTypeEventSubscriberTrait {
    * @see \Symfony\Component\EventDispatcher\EventSubscriberInterface::getSubscribedEvents()
    */
   public static function getEntityTypeEvents() {
-    $event = array('onEntityTypeEvent', 100);
+    $event = ['onEntityTypeEvent', 100];
     $events[EntityTypeEvents::CREATE][] = $event;
     $events[EntityTypeEvents::UPDATE][] = $event;
     $events[EntityTypeEvents::DELETE][] = $event;
diff --git a/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php b/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
index c6336c950..c8a28b435 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
@@ -47,22 +47,6 @@ interface EntityTypeInterface extends PluginDefinitionInterface {
    */
   public function set($property, $value);
 
-  /**
-   * Gets the unique identifier of the entity type.
-   *
-   * @return string
-   *   The unique identifier of the entity type.
-   */
-  public function id();
-
-  /**
-   * Gets the name of the provider of this entity type.
-   *
-   * @return string
-   *   The name of the provider of this entity type.
-   */
-  public function getProvider();
-
   /**
    * Gets the name of the original entity type class.
    *
@@ -351,6 +335,17 @@ interface EntityTypeInterface extends PluginDefinitionInterface {
    */
   public function setAccessClass($class);
 
+  /**
+   * Indicates if the entity type class implements the given interface.
+   *
+   * @param string $interface
+   *   The class or interface to check.
+   *
+   * @return bool
+   *   TRUE if the entity type class implements the given interface.
+   */
+  public function entityClassImplements($interface);
+
   /**
    * Indicates if the entity type is a subclass of the given class or interface.
    *
@@ -359,6 +354,10 @@ interface EntityTypeInterface extends PluginDefinitionInterface {
    *
    * @return bool
    *   TRUE if the entity type is a subclass of the class or interface.
+   *
+   * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0.
+   *   Use Drupal\Core\Entity\EntityTypeInterface::entityClassImplements()
+   *   instead.
    */
   public function isSubclassOf($class);
 
@@ -573,6 +572,14 @@ interface EntityTypeInterface extends PluginDefinitionInterface {
    */
   public function isTranslatable();
 
+  /**
+   * Indicates whether the revision form fields should be added to the form.
+   *
+   * @return bool
+   *   TRUE if the form field should be added, FALSE otherwise.
+   */
+  public function showRevisionUi();
+
   /**
    * Indicates whether entities of this type have revision support.
    *
@@ -614,6 +621,9 @@ interface EntityTypeInterface extends PluginDefinitionInterface {
   /**
    * Gets the human-readable name of the entity type.
    *
+   * This label should be used to present a human-readable name of the
+   * entity type.
+   *
    * @return string
    *   The human-readable name of the entity type.
    */
@@ -624,11 +634,31 @@ interface EntityTypeInterface extends PluginDefinitionInterface {
    *
    * @return string
    *   The lowercase form of the human-readable entity type name.
+   *
+   * @see \Drupal\Core\Entity\EntityTypeInterface::getLabel()
    */
   public function getLowercaseLabel();
 
   /**
-   * Gets the singular label of the entity type.
+   * Gets the uppercase plural form of the name of the entity type.
+   *
+   * This should return a human-readable version of the name that can refer
+   * to all the entities of the given type, collectively. An example usage of
+   * this is the page title of a page devoted to a collection of entities such
+   * as "Workflows" (instead of "Workflow entities").
+   *
+   * @return string
+   *   The collection label.
+   */
+  public function getCollectionLabel();
+
+  /**
+   * Gets the indefinite singular form of the name of the entity type.
+   *
+   * This should return the human-readable name for a single instance of
+   * the entity type. For example: "opportunity" (with the plural as
+   * "opportunities"), "child" (with the plural as "children"), or "content
+   * item" (with the plural as "content items").
    *
    * @return string
    *   The singular label.
@@ -636,7 +666,12 @@ interface EntityTypeInterface extends PluginDefinitionInterface {
   public function getSingularLabel();
 
   /**
-   * Gets the plural label of the entity type.
+   * Gets the indefinite plural form of the name of the entity type.
+   *
+   * This should return the human-readable name for more than one instance of
+   * the entity type. For example: "opportunities" (with the singular as
+   * "opportunity"), "children" (with the singular as "child"), or "content
+   * items" (with the singular as "content item").
    *
    * @return string
    *   The plural label.
@@ -644,7 +679,12 @@ interface EntityTypeInterface extends PluginDefinitionInterface {
   public function getPluralLabel();
 
   /**
-   * Gets the count label of the entity type
+   * Gets the label's definite article form for use with a count of entities.
+   *
+   * This label should be used when the quantity of entities is provided. The
+   * name should be returned in a form usable with a count of the
+   * entities. For example: "1 opportunity", "5 opportunities", "1 child",
+   * "6 children", "1 content item", "25 content items".
    *
    * @param int $count
    *   The item count to display if the plural form was requested.
diff --git a/web/core/lib/Drupal/Core/Entity/EntityTypeListener.php b/web/core/lib/Drupal/Core/Entity/EntityTypeListener.php
index 91c156dbd..4dc1e9cf3 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityTypeListener.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityTypeListener.php
@@ -74,7 +74,7 @@ class EntityTypeListener implements EntityTypeListenerInterface {
     $this->eventDispatcher->dispatch(EntityTypeEvents::CREATE, new EntityTypeEvent($entity_type));
 
     $this->entityLastInstalledSchemaRepository->setLastInstalledDefinition($entity_type);
-    if ($entity_type->isSubclassOf(FieldableEntityInterface::class)) {
+    if ($entity_type->entityClassImplements(FieldableEntityInterface::class)) {
       $this->entityLastInstalledSchemaRepository->setLastInstalledFieldStorageDefinitions($entity_type_id, $this->entityFieldManager->getFieldStorageDefinitions($entity_type_id));
     }
   }
diff --git a/web/core/lib/Drupal/Core/Entity/EntityTypeManagerInterface.php b/web/core/lib/Drupal/Core/Entity/EntityTypeManagerInterface.php
index c4fce4ec0..2a7a31733 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityTypeManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityTypeManagerInterface.php
@@ -16,7 +16,7 @@ interface EntityTypeManagerInterface extends PluginManagerInterface, CachedDisco
    * @param string $entity_type
    *   The entity type for this access control handler.
    *
-   * @return \Drupal\Core\Entity\EntityAccessControlHandlerInterface.
+   * @return \Drupal\Core\Entity\EntityAccessControlHandlerInterface
    *   A access control handler instance.
    */
   public function getAccessControlHandler($entity_type);
@@ -40,7 +40,7 @@ interface EntityTypeManagerInterface extends PluginManagerInterface, CachedDisco
    * @param string $entity_type
    *   The entity type for this view builder.
    *
-   * @return \Drupal\Core\Entity\EntityViewBuilderInterface.
+   * @return \Drupal\Core\Entity\EntityViewBuilderInterface
    *   A view builder instance.
    */
   public function getViewBuilder($entity_type);
diff --git a/web/core/lib/Drupal/Core/Entity/EntityTypeRepository.php b/web/core/lib/Drupal/Core/Entity/EntityTypeRepository.php
index 6d3d37627..d89b75e3f 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityTypeRepository.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityTypeRepository.php
@@ -62,8 +62,8 @@ class EntityTypeRepository implements EntityTypeRepositoryInterface {
       }
 
       // Make sure that the 'Content' group is situated at the top.
-      $content = $this->t('Content', array(), array('context' => 'Entity type group'));
-      $options = array((string) $content => $options[(string) $content]) + $options;
+      $content = $this->t('Content', [], ['context' => 'Entity type group']);
+      $options = [(string) $content => $options[(string) $content]] + $options;
     }
 
     return $options;
diff --git a/web/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/web/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index 7097b85df..2c3340ec5 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Entity;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
@@ -107,14 +108,14 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
    * {@inheritdoc}
    */
   public function view(EntityInterface $entity, $view_mode = 'full', $langcode = NULL) {
-    $build_list = $this->viewMultiple(array($entity), $view_mode, $langcode);
+    $build_list = $this->viewMultiple([$entity], $view_mode, $langcode);
 
     // The default ::buildMultiple() #pre_render callback won't run, because we
     // extract a child element of the default renderable array. Thus we must
     // assign an alternative #pre_render callback that applies the necessary
     // transformations and then still calls ::buildMultiple().
     $build = $build_list[0];
-    $build['#pre_render'][] = array($this, 'build');
+    $build['#pre_render'][] = [$this, 'build'];
 
     return $build;
   }
@@ -122,11 +123,11 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
   /**
    * {@inheritdoc}
    */
-  public function viewMultiple(array $entities = array(), $view_mode = 'full', $langcode = NULL) {
-    $build_list = array(
+  public function viewMultiple(array $entities = [], $view_mode = 'full', $langcode = NULL) {
+    $build_list = [
       '#sorted' => TRUE,
-      '#pre_render' => array(array($this, 'buildMultiple')),
-    );
+      '#pre_render' => [[$this, 'buildMultiple']],
+    ];
     $weight = 0;
     foreach ($entities as $key => $entity) {
       // Ensure that from now on we are dealing with the proper translation
@@ -136,7 +137,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
       // Set build defaults.
       $build_list[$key] = $this->getBuildDefaults($entity, $view_mode);
       $entityType = $this->entityTypeId;
-      $this->moduleHandler()->alter(array($entityType . '_build_defaults', 'entity_build_defaults'), $build_list[$key], $entity, $view_mode);
+      $this->moduleHandler()->alter([$entityType . '_build_defaults', 'entity_build_defaults'], $build_list[$key], $entity, $view_mode);
 
       $build_list[$key]['#weight'] = $weight++;
     }
@@ -159,16 +160,16 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
     $context = [];
     $this->moduleHandler()->alter('entity_view_mode', $view_mode, $entity, $context);
 
-    $build = array(
+    $build = [
       "#{$this->entityTypeId}" => $entity,
       '#view_mode' => $view_mode,
       // Collect cache defaults for this entity.
-      '#cache' => array(
+      '#cache' => [
         'tags' => Cache::mergeTags($this->getCacheTags(), $entity->getCacheTags()),
         'contexts' => $entity->getCacheContexts(),
         'max-age' => $entity->getCacheMaxAge(),
-      ),
-    );
+      ],
+    ];
 
     // Add the default #theme key if a template exists for it.
     if ($this->themeRegistry->getRuntime()->has($this->entityTypeId)) {
@@ -178,15 +179,15 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
     // Cache the rendered output if permitted by the view mode and global entity
     // type configuration.
     if ($this->isViewModeCacheable($view_mode) && !$entity->isNew() && $entity->isDefaultRevision() && $this->entityType->isRenderCacheable()) {
-      $build['#cache'] += array(
-        'keys' => array(
+      $build['#cache'] += [
+        'keys' => [
           'entity_view',
           $this->entityTypeId,
           $entity->id(),
           $view_mode,
-        ),
+        ],
         'bin' => $this->cacheBin,
-      );
+      ];
 
       if ($entity instanceof TranslatableInterface && count($entity->getTranslationLanguages()) > 1) {
         $build['#cache']['keys'][] = $entity->language()->getId();
@@ -240,7 +241,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
    */
   public function buildMultiple(array $build_list) {
     // Build the view modes and display objects.
-    $view_modes = array();
+    $view_modes = [];
     $entity_type_key = "#{$this->entityTypeId}";
     $view_hook = "{$this->entityTypeId}_view";
 
@@ -281,7 +282,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
         }
 
         // Allow modules to modify the render array.
-        $this->moduleHandler()->alter(array($view_hook, 'entity_view'), $build_list[$key], $entity, $display);
+        $this->moduleHandler()->alter([$view_hook, 'entity_view'], $build_list[$key], $entity, $display);
       }
     }
 
@@ -292,7 +293,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
    * {@inheritdoc}
    */
   public function buildComponents(array &$build, array $entities, array $displays, $view_mode) {
-    $entities_by_bundle = array();
+    $entities_by_bundle = [];
     foreach ($entities as $id => $entity) {
       // Initialize the field item attributes for the fields being displayed.
       // The entity can include fields that are not displayed, and the display
@@ -303,7 +304,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
       foreach ($displays[$entity->bundle()]->getComponents() as $name => $options) {
         if ($entity->hasField($name)) {
           foreach ($entity->get($name) as $item) {
-            $item->_attributes = array();
+            $item->_attributes = [];
           }
         }
       }
@@ -312,7 +313,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
     }
 
     // Invoke hook_entity_prepare_view().
-    $this->moduleHandler()->invokeAll('entity_prepare_view', array($this->entityTypeId, $entities, $displays, $view_mode));
+    $this->moduleHandler()->invokeAll('entity_prepare_view', [$this->entityTypeId, $entities, $displays, $view_mode]);
 
     // Let the displays build their render arrays.
     foreach ($entities_by_bundle as $bundle => $bundle_entities) {
@@ -342,7 +343,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
    * {@inheritdoc}
    */
   public function getCacheTags() {
-    return array($this->entityTypeId . '_view');
+    return [$this->entityTypeId . '_view'];
   }
 
   /**
@@ -393,12 +394,12 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
   /**
    * {@inheritdoc}
    */
-  public function viewField(FieldItemListInterface $items, $display_options = array()) {
+  public function viewField(FieldItemListInterface $items, $display_options = []) {
     $entity = $items->getEntity();
     $field_name = $items->getFieldDefinition()->getName();
     $display = $this->getSingleFieldDisplay($entity, $field_name, $display_options);
 
-    $output = array();
+    $output = [];
     $build = $display->build($entity);
     if (isset($build[$field_name])) {
       $output = $build[$field_name];
@@ -410,7 +411,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
   /**
    * {@inheritdoc}
    */
-  public function viewFieldItem(FieldItemInterface $item, $display = array()) {
+  public function viewFieldItem(FieldItemInterface $item, $display = []) {
     $entity = $item->getEntity();
     $field_name = $item->getFieldDefinition()->getName();
 
@@ -419,11 +420,11 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
 
     // Push the item as the single value for the field, and defer to viewField()
     // to build the render array for the whole list.
-    $clone->{$field_name}->setValue(array($item->getValue()));
+    $clone->{$field_name}->setValue([$item->getValue()]);
     $elements = $this->viewField($clone->{$field_name}, $display);
 
     // Extract the part of the render array we need.
-    $output = isset($elements[0]) ? $elements[0] : array();
+    $output = isset($elements[0]) ? $elements[0] : [];
     if (isset($elements['#access'])) {
       $output['#access'] = $elements['#access'];
     }
@@ -462,13 +463,13 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
       // series of fields individually for cases such as views tables.
       $entity_type_id = $entity->getEntityTypeId();
       $bundle = $entity->bundle();
-      $key = $entity_type_id . ':' . $bundle . ':' . $field_name . ':' . hash('crc32b', serialize($display_options));
+      $key = $entity_type_id . ':' . $bundle . ':' . $field_name . ':' . Crypt::hashBase64(serialize($display_options));
       if (!isset($this->singleFieldDisplays[$key])) {
-        $this->singleFieldDisplays[$key] = EntityViewDisplay::create(array(
+        $this->singleFieldDisplays[$key] = EntityViewDisplay::create([
           'targetEntityType' => $entity_type_id,
           'bundle' => $bundle,
           'status' => TRUE,
-        ))->setComponent($field_name, $display_options);
+        ])->setComponent($field_name, $display_options);
       }
       $display = $this->singleFieldDisplays[$key];
     }
diff --git a/web/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php b/web/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
index b86b5922c..3da448730 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
@@ -70,7 +70,7 @@ interface EntityViewBuilderInterface {
    *   comments belongs to, or not passing one, and having the comments node not
    *   be available for loading.
    */
-  public function viewMultiple(array $entities = array(), $view_mode = 'full', $langcode = NULL);
+  public function viewMultiple(array $entities = [], $view_mode = 'full', $langcode = NULL);
 
   /**
    * Resets the entity render cache.
@@ -122,7 +122,7 @@ interface EntityViewBuilderInterface {
    *
    * @see \Drupal\Core\Entity\EntityViewBuilderInterface::viewFieldItem()
    */
-  public function viewField(FieldItemListInterface $items, $display_options = array());
+  public function viewField(FieldItemListInterface $items, $display_options = []);
 
   /**
    * Builds a renderable array for a single field item.
@@ -138,7 +138,7 @@ interface EntityViewBuilderInterface {
    *
    * @see \Drupal\Core\Entity\EntityViewBuilderInterface::viewField()
    */
-  public function viewFieldItem(FieldItemInterface $item, $display_options = array());
+  public function viewFieldItem(FieldItemInterface $item, $display_options = []);
 
   /**
    * The cache tag associated with this entity view builder.
diff --git a/web/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php b/web/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php
index 680c0e32c..03ef29c58 100644
--- a/web/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php
+++ b/web/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php
@@ -64,7 +64,7 @@ class BundleConfigImportValidate extends ConfigImportValidateEventSubscriberBase
             ->execute();
           if (!empty($entity_ids)) {
             $entity = $this->entityManager->getStorage($entity_type_id)->load($bundle_id);
-            $event->getConfigImporter()->logError($this->t('Entities exist of type %entity_type and %bundle_label %bundle. These entities need to be deleted before importing.', array('%entity_type' => $bundle_of_entity_type->getLabel(), '%bundle_label' => $bundle_of_entity_type->getBundleLabel(), '%bundle' => $entity->label())));
+            $event->getConfigImporter()->logError($this->t('Entities exist of type %entity_type and %bundle_label %bundle. These entities need to be deleted before importing.', ['%entity_type' => $bundle_of_entity_type->getLabel(), '%bundle_label' => $bundle_of_entity_type->getBundleLabel(), '%bundle' => $entity->label()]));
           }
         }
       }
diff --git a/web/core/lib/Drupal/Core/Entity/Exception/UnsupportedEntityTypeDefinitionException.php b/web/core/lib/Drupal/Core/Entity/Exception/UnsupportedEntityTypeDefinitionException.php
new file mode 100644
index 000000000..079b42215
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Entity/Exception/UnsupportedEntityTypeDefinitionException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Drupal\Core\Entity\Exception;
+
+/**
+ * Defines an exception thrown when an entity type definition is invalid.
+ */
+class UnsupportedEntityTypeDefinitionException extends \Exception { }
diff --git a/web/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php b/web/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
index 478bca758..de77e09d2 100644
--- a/web/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
+++ b/web/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
@@ -86,9 +86,9 @@ class KeyValueEntityStorage extends EntityStorageBase {
   /**
    * {@inheritdoc}
    */
-  public function doCreate(array $values = array()) {
+  public function doCreate(array $values = []) {
     // Set default language to site default if not provided.
-    $values += array($this->getEntityType()->getKey('langcode') => $this->languageManager->getDefaultLanguage()->getId());
+    $values += [$this->getEntityType()->getKey('langcode') => $this->languageManager->getDefaultLanguage()->getId()];
     $entity = new $this->entityClass($values, $this->entityTypeId);
 
     // @todo This is handled by ContentEntityStorageBase, which assumes
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php b/web/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php
index 5242e8db4..98be20e04 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php
@@ -17,7 +17,7 @@ class EntityDeriver implements ContainerDeriverInterface {
    *
    * @var array
    */
-  protected $derivatives = array();
+  protected $derivatives = [];
 
   /**
    * The base plugin ID this derivative is for.
@@ -86,18 +86,18 @@ class EntityDeriver implements ContainerDeriverInterface {
     $this->derivatives[''] = $base_plugin_definition;
     // Add definitions for each entity type and bundle.
     foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
-      $this->derivatives[$entity_type_id] = array(
+      $this->derivatives[$entity_type_id] = [
         'label' => $entity_type->getLabel(),
         'constraints' => $entity_type->getConstraints(),
-      ) + $base_plugin_definition;
+      ] + $base_plugin_definition;
 
       // Incorporate the bundles as entity:$entity_type:$bundle, if any.
       foreach ($this->bundleInfoService->getBundleInfo($entity_type_id) as $bundle => $bundle_info) {
         if ($bundle !== $entity_type_id) {
-          $this->derivatives[$entity_type_id . ':' . $bundle] = array(
+          $this->derivatives[$entity_type_id . ':' . $bundle] = [
             'label' => $bundle_info['label'],
             'constraints' => $this->derivatives[$entity_type_id]['constraints']
-          ) + $base_plugin_definition;
+          ] + $base_plugin_definition;
         }
       }
     }
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php b/web/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
index 2a9f1728d..eafb6d88b 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
@@ -113,7 +113,7 @@ class EntityAdapter extends TypedData implements \IteratorAggregate, ComplexData
     if (!$this->entity instanceof FieldableEntityInterface) {
       // @todo: Add support for config entities in
       // https://www.drupal.org/node/1818574.
-      return array();
+      return [];
     }
     return $this->entity->getFields($include_computed);
   }
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php b/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
index 7877289e5..d8d21fdbe 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
@@ -50,8 +50,8 @@ class DefaultSelectionDeriver extends DeriverBase implements ContainerDeriverInt
   public function getDerivativeDefinitions($base_plugin_definition) {
     foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
       $this->derivatives[$entity_type_id] = $base_plugin_definition;
-      $this->derivatives[$entity_type_id]['entity_types'] = array($entity_type_id);
-      $this->derivatives[$entity_type_id]['label'] = t('@entity_type selection', array('@entity_type' => $entity_type->getLabel()));
+      $this->derivatives[$entity_type_id]['entity_types'] = [$entity_type_id];
+      $this->derivatives[$entity_type_id]['label'] = t('@entity_type selection', ['@entity_type' => $entity_type->getLabel()]);
       $this->derivatives[$entity_type_id]['base_plugin_label'] = (string) $base_plugin_definition['label'];
 
       // If the entity type doesn't provide a 'label' key in its plugin
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php b/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php
index d74fb6e11..f53eeb618 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php
@@ -20,9 +20,9 @@ class Broken implements SelectionInterface {
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['selection_handler'] = array(
+    $form['selection_handler'] = [
       '#markup' => t('The selected selection handler is broken.'),
-    );
+    ];
     return $form;
   }
 
@@ -40,7 +40,7 @@ class Broken implements SelectionInterface {
    * {@inheritdoc}
    */
   public function getReferenceableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) {
-    return array();
+    return [];
   }
 
   /**
@@ -54,7 +54,7 @@ class Broken implements SelectionInterface {
    * {@inheritdoc}
    */
   public function validateReferenceableEntities(array $ids) {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php b/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
index 9565e77e2..e3b41b1bb 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
@@ -7,6 +7,7 @@ use Drupal\Core\Database\Query\AlterableInterface;
 use Drupal\Core\Database\Query\SelectInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityReferenceSelection\SelectionWithAutocreateInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem;
 use Drupal\Core\Form\FormStateInterface;
@@ -108,26 +109,26 @@ class DefaultSelection extends PluginBase implements SelectionInterface, Selecti
     $bundles = $this->entityManager->getBundleInfo($entity_type_id);
 
     // Merge-in default values.
-    $selection_handler_settings += array(
+    $selection_handler_settings += [
       // For the 'target_bundles' setting, a NULL value is equivalent to "allow
       // entities from any bundle to be referenced" and an empty array value is
       // equivalent to "no entities from any bundle can be referenced".
       'target_bundles' => NULL,
-      'sort' => array(
+      'sort' => [
         'field' => '_none',
-      ),
+      ],
       'auto_create' => FALSE,
       'auto_create_bundle' => NULL,
-    );
+    ];
 
     if ($entity_type->hasKey('bundle')) {
-      $bundle_options = array();
+      $bundle_options = [];
       foreach ($bundles as $bundle_name => $bundle_info) {
         $bundle_options[$bundle_name] = $bundle_info['label'];
       }
       natsort($bundle_options);
 
-      $form['target_bundles'] = array(
+      $form['target_bundles'] = [
         '#type' => 'checkboxes',
         '#title' => $this->t('Bundles'),
         '#options' => $bundle_options,
@@ -138,7 +139,7 @@ class DefaultSelection extends PluginBase implements SelectionInterface, Selecti
         '#element_validate' => [[get_class($this), 'elementValidateFilter']],
         '#ajax' => TRUE,
         '#limit_validation_errors' => [],
-      );
+      ];
 
       $form['target_bundles_update'] = [
         '#type' => 'submit',
@@ -151,14 +152,14 @@ class DefaultSelection extends PluginBase implements SelectionInterface, Selecti
       ];
     }
     else {
-      $form['target_bundles'] = array(
+      $form['target_bundles'] = [
         '#type' => 'value',
-        '#value' => array(),
-      );
+        '#value' => [],
+      ];
     }
 
-    if ($entity_type->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface')) {
-      $fields = array();
+    if ($entity_type->entityClassImplements(FieldableEntityInterface::class)) {
+      $fields = [];
       foreach (array_keys($bundles) as $bundle) {
         $bundle_fields = array_filter($this->entityManager->getFieldDefinitions($entity_type_id, $bundle), function ($field_definition) {
           return !$field_definition->isComputed();
@@ -171,57 +172,57 @@ class DefaultSelection extends PluginBase implements SelectionInterface, Selecti
           // @todo: Use property labels instead of the column name.
           if (count($columns) > 1) {
             foreach ($columns as $column_name => $column_info) {
-              $fields[$field_name . '.' . $column_name] = $this->t('@label (@column)', array('@label' => $field_definition->getLabel(), '@column' => $column_name));
+              $fields[$field_name . '.' . $column_name] = $this->t('@label (@column)', ['@label' => $field_definition->getLabel(), '@column' => $column_name]);
             }
           }
           else {
-            $fields[$field_name] = $this->t('@label', array('@label' => $field_definition->getLabel()));
+            $fields[$field_name] = $this->t('@label', ['@label' => $field_definition->getLabel()]);
           }
         }
       }
 
-      $form['sort']['field'] = array(
+      $form['sort']['field'] = [
         '#type' => 'select',
         '#title' => $this->t('Sort by'),
-        '#options' => array(
+        '#options' => [
           '_none' => $this->t('- None -'),
-        ) + $fields,
+        ] + $fields,
         '#ajax' => TRUE,
-        '#limit_validation_errors' => array(),
+        '#limit_validation_errors' => [],
         '#default_value' => $selection_handler_settings['sort']['field'],
-      );
+      ];
 
-      $form['sort']['settings'] = array(
+      $form['sort']['settings'] = [
         '#type' => 'container',
-        '#attributes' => array('class' => array('entity_reference-settings')),
+        '#attributes' => ['class' => ['entity_reference-settings']],
         '#process' => [[EntityReferenceItem::class, 'formProcessMergeParent']],
-      );
+      ];
 
       if ($selection_handler_settings['sort']['field'] != '_none') {
         // Merge-in default values.
-        $selection_handler_settings['sort'] += array(
+        $selection_handler_settings['sort'] += [
           'direction' => 'ASC',
-        );
+        ];
 
-        $form['sort']['settings']['direction'] = array(
+        $form['sort']['settings']['direction'] = [
           '#type' => 'select',
           '#title' => $this->t('Sort direction'),
           '#required' => TRUE,
-          '#options' => array(
+          '#options' => [
             'ASC' => $this->t('Ascending'),
             'DESC' => $this->t('Descending'),
-          ),
+          ],
           '#default_value' => $selection_handler_settings['sort']['direction'],
-        );
+        ];
       }
     }
 
-    $form['auto_create'] = array(
+    $form['auto_create'] = [
       '#type' => 'checkbox',
       '#title' => $this->t("Create referenced entities if they don't already exist"),
       '#default_value' => $selection_handler_settings['auto_create'],
       '#weight' => -2,
-    );
+    ];
 
     if ($entity_type->hasKey('bundle')) {
       $bundles = array_intersect_key($bundle_options, array_filter((array) $selection_handler_settings['target_bundles']));
@@ -287,10 +288,10 @@ class DefaultSelection extends PluginBase implements SelectionInterface, Selecti
     $result = $query->execute();
 
     if (empty($result)) {
-      return array();
+      return [];
     }
 
-    $options = array();
+    $options = [];
     $entities = $this->entityManager->getStorage($target_type)->loadMultiple($result);
     foreach ($entities as $entity_id => $entity) {
       $bundle = $entity->bundle();
@@ -314,7 +315,7 @@ class DefaultSelection extends PluginBase implements SelectionInterface, Selecti
    * {@inheritdoc}
    */
   public function validateReferenceableEntities(array $ids) {
-    $result = array();
+    $result = [];
     if ($ids) {
       $target_type = $this->configuration['target_type'];
       $entity_type = $this->entityManager->getDefinition($target_type);
@@ -335,10 +336,10 @@ class DefaultSelection extends PluginBase implements SelectionInterface, Selecti
     $bundle_key = $entity_type->getKey('bundle');
     $label_key = $entity_type->getKey('label');
 
-    $entity = $this->entityManager->getStorage($entity_type_id)->create(array(
+    $entity = $this->entityManager->getStorage($entity_type_id)->create([
       $bundle_key => $bundle,
       $label_key => $label,
-    ));
+    ]);
 
     if ($entity instanceof EntityOwnerInterface) {
       $entity->setOwnerId($uid);
@@ -432,9 +433,9 @@ class DefaultSelection extends PluginBase implements SelectionInterface, Selecti
     $old_tags = $query->alterTags;
     $old_metadata = $query->alterMetaData;
 
-    $query->alterTags = array($tag => TRUE);
+    $query->alterTags = [$tag => TRUE];
     $query->alterMetaData['base_table'] = $base_table;
-    $this->moduleHandler->alter(array('query', 'query_' . $tag), $query);
+    $this->moduleHandler->alter(['query', 'query_' . $tag], $query);
 
     // Restore the tags and metadata.
     $query->alterTags = $old_tags;
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php b/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php
index 513213feb..161e9f2f6 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php
@@ -37,7 +37,7 @@ class BundleConstraint extends Constraint {
   public function getBundleOption() {
     // Support passing the bundle as string, but force it to be an array.
     if (!is_array($this->bundle)) {
-      $this->bundle = array($this->bundle);
+      $this->bundle = [$this->bundle];
     }
     return $this->bundle;
   }
@@ -53,7 +53,7 @@ class BundleConstraint extends Constraint {
    * {@inheritdoc}
    */
   public function getRequiredOptions() {
-    return array('bundle');
+    return ['bundle'];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraintValidator.php b/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraintValidator.php
index 0a0988976..39e99afc5 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraintValidator.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraintValidator.php
@@ -19,7 +19,7 @@ class BundleConstraintValidator extends ConstraintValidator {
     }
 
     if (!in_array($entity->bundle(), $constraint->getBundleOption())) {
-      $this->context->addViolation($constraint->message, array('%bundle' => implode(', ', $constraint->getBundleOption())));
+      $this->context->addViolation($constraint->message, ['%bundle' => implode(', ', $constraint->getBundleOption())]);
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php b/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php
index c9f2d8159..c39152f2a 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php
@@ -40,7 +40,7 @@ class EntityTypeConstraint extends Constraint {
    * {@inheritdoc}
    */
   public function getRequiredOptions() {
-    return array('type');
+    return ['type'];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraintValidator.php b/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraintValidator.php
index 5d2b86258..89c5e8ead 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraintValidator.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraintValidator.php
@@ -20,7 +20,7 @@ class EntityTypeConstraintValidator extends ConstraintValidator {
 
     /** @var $entity \Drupal\Core\Entity\EntityInterface */
     if ($entity->getEntityTypeId() != $constraint->type) {
-      $this->context->addViolation($constraint->message, array('%type' => $constraint->type));
+      $this->context->addViolation($constraint->message, ['%type' => $constraint->type]);
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ReferenceAccessConstraintValidator.php b/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ReferenceAccessConstraintValidator.php
index c57478197..7860c90d6 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ReferenceAccessConstraintValidator.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ReferenceAccessConstraintValidator.php
@@ -43,7 +43,7 @@ class ReferenceAccessConstraintValidator extends ConstraintValidator {
       // referenced entity.
       if ($check_permission && !$referenced_entity->access('view')) {
         $type = $value->getFieldDefinition()->getSetting('target_type');
-        $this->context->addViolation($constraint->message, array('%type' => $type, '%id' => $id));
+        $this->context->addViolation($constraint->message, ['%type' => $type, '%id' => $id]);
       }
     }
   }
diff --git a/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateBase.php b/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateBase.php
index 50884db20..27ec70ce9 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateBase.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateBase.php
@@ -11,13 +11,13 @@ abstract class ConditionAggregateBase extends ConditionFundamentals implements C
    * {@inheritdoc}
    */
   public function condition($field, $function = NULL, $value = NULL, $operator = NULL, $langcode = NULL) {
-    $this->conditions[] = array(
+    $this->conditions[] = [
       'field' => $field,
       'function' => $function,
       'value' => $value,
       'operator' => $operator,
       'langcode' => $langcode,
-    );
+    ];
 
     return $this;
   }
diff --git a/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php b/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
index 1215f08e9..875b8c2f9 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
@@ -44,7 +44,7 @@ interface ConditionAggregateInterface extends \Countable {
    * Queries for the nonexistence of a field.
    *
    * @param string $field
-   * @return ConditionInterface;
+   * @return ConditionInterface
    * @see \Drupal\Core\Entity\Query\QueryInterface::notexists()
    */
   public function notExists($field, $function, $langcode = NULL);
diff --git a/web/core/lib/Drupal/Core/Entity/Query/ConditionBase.php b/web/core/lib/Drupal/Core/Entity/Query/ConditionBase.php
index 4393935c1..030f51dc3 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/ConditionBase.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/ConditionBase.php
@@ -11,12 +11,12 @@ abstract class ConditionBase extends ConditionFundamentals implements ConditionI
    * {@inheritdoc}
    */
   public function condition($field, $value = NULL, $operator = NULL, $langcode = NULL) {
-    $this->conditions[] = array(
+    $this->conditions[] = [
       'field' => $field,
       'value' => $value,
       'operator' => $operator,
       'langcode' => $langcode,
-    );
+    ];
 
     return $this;
   }
diff --git a/web/core/lib/Drupal/Core/Entity/Query/ConditionFundamentals.php b/web/core/lib/Drupal/Core/Entity/Query/ConditionFundamentals.php
index 980d83e60..d03e2b2e8 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/ConditionFundamentals.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/ConditionFundamentals.php
@@ -12,7 +12,7 @@ abstract class ConditionFundamentals {
    *
    * @var array
    */
-  protected $conditions = array();
+  protected $conditions = [];
 
   /**
    * The conjunction of this condition group. The value is one of the following:
@@ -36,7 +36,7 @@ abstract class ConditionFundamentals {
    *
    * @var array
    */
-  protected $namespaces = array();
+  protected $namespaces = [];
 
   /**
    * Constructs a Condition object.
diff --git a/web/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php b/web/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
index 81463fb91..d42e48feb 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
@@ -50,7 +50,7 @@ interface ConditionInterface {
    * Queries for the existence of a field.
    *
    * @param string $field
-   * @return ConditionInterface;
+   * @return ConditionInterface
    * @see \Drupal\Core\Entity\Query\QueryInterface::notexists()
    */
   public function notExists($field, $langcode = NULL);
diff --git a/web/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php b/web/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
index 76c644d12..3c94ba7c7 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
@@ -85,7 +85,7 @@ interface QueryAggregateInterface extends QueryInterface {
   /**
    * Queries for the nonexistence of a field.
    *
-   * @param string $field.
+   * @param string $field
    *   The name of a field.
    * @param string $function
    *   The aggregate function.
diff --git a/web/core/lib/Drupal/Core/Entity/Query/QueryBase.php b/web/core/lib/Drupal/Core/Entity/Query/QueryBase.php
index 227d90c51..ed3d12b2c 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/QueryBase.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/QueryBase.php
@@ -29,7 +29,7 @@ abstract class QueryBase implements QueryInterface {
    *
    * @var array
    */
-  protected $sort = array();
+  protected $sort = [];
 
   /**
    * TRUE if this is a count query, FALSE if it isn't.
@@ -50,14 +50,14 @@ abstract class QueryBase implements QueryInterface {
    *
    * @var array
    */
-  protected $aggregate = array();
+  protected $aggregate = [];
 
   /**
    * The list of columns to group on.
    *
    * @var array
    */
-  protected $groupBy = array();
+  protected $groupBy = [];
 
   /**
    * Aggregate Conditions
@@ -71,14 +71,14 @@ abstract class QueryBase implements QueryInterface {
    *
    * @var array
    */
-  protected $sortAggregate = array();
+  protected $sortAggregate = [];
 
   /**
    * The query range.
    *
    * @var array
    */
-  protected $range = array();
+  protected $range = [];
 
   /**
    * The query metadata for alter purposes.
@@ -115,14 +115,14 @@ abstract class QueryBase implements QueryInterface {
    *
    * @see Query::pager()
    */
-  protected $pager = array();
+  protected $pager = [];
 
   /**
    * List of potential namespaces of the classes belonging to this query.
    *
    * @var array
    */
-  protected $namespaces = array();
+  protected $namespaces = [];
 
   /**
    * Constructs this object.
@@ -181,10 +181,10 @@ abstract class QueryBase implements QueryInterface {
    * {@inheritdoc}
    */
   public function range($start = NULL, $length = NULL) {
-    $this->range = array(
+    $this->range = [
       'start' => $start,
       'length' => $length,
-    );
+    ];
     return $this;
   }
 
@@ -223,11 +223,11 @@ abstract class QueryBase implements QueryInterface {
    * {@inheritdoc}
    */
   public function sort($field, $direction = 'ASC', $langcode = NULL) {
-    $this->sort[] = array(
+    $this->sort[] = [
       'field' => $field,
       'direction' => strtoupper($direction),
       'langcode' => $langcode,
-    );
+    ];
     return $this;
   }
 
@@ -276,10 +276,10 @@ abstract class QueryBase implements QueryInterface {
       PagerSelectExtender::$maxElement = $element + 1;
     }
 
-    $this->pager = array(
+    $this->pager = [
       'limit' => $limit,
       'element' => $element,
-    );
+    ];
     return $this;
   }
 
@@ -325,7 +325,7 @@ abstract class QueryBase implements QueryInterface {
   /**
    * Makes sure that the Condition object is cloned as well.
    */
-  function __clone() {
+  public function __clone() {
     $this->condition = clone $this->condition;
   }
 
@@ -381,12 +381,12 @@ abstract class QueryBase implements QueryInterface {
       $alias = $this->getAggregationAlias($field, $function);
     }
 
-    $this->aggregate[$alias] = array(
+    $this->aggregate[$alias] = [
       'field' => $field,
       'function' => $function,
       'alias' => $alias,
       'langcode' => $langcode,
-    );
+    ];
 
     return $this;
   }
@@ -407,12 +407,12 @@ abstract class QueryBase implements QueryInterface {
   public function sortAggregate($field, $function, $direction = 'ASC', $langcode = NULL) {
     $alias = $this->getAggregationAlias($field, $function);
 
-    $this->sortAggregate[$alias] = array(
+    $this->sortAggregate[$alias] = [
       'field' => $field,
       'function' => $function,
       'direction' => $direction,
       'langcode' => $langcode,
-    );
+    ];
     $this->aggregate($field, $function, $langcode, $alias);
 
     return $this;
@@ -422,10 +422,10 @@ abstract class QueryBase implements QueryInterface {
    * {@inheritdoc}
    */
   public function groupBy($field, $langcode = NULL) {
-    $this->groupBy[] = array(
+    $this->groupBy[] = [
       'field' => $field,
       'langcode' => $langcode,
-    );
+    ];
 
     return $this;
   }
@@ -456,7 +456,7 @@ abstract class QueryBase implements QueryInterface {
    *   parent of the class and so on and so on.
    */
   public static function getNamespaces($object) {
-    $namespaces = array();
+    $namespaces = [];
     for ($class = get_class($object); $class; $class = get_parent_class($class)) {
       $namespaces[] = substr($class, 0, strrpos($class, '\\'));
     }
diff --git a/web/core/lib/Drupal/Core/Entity/Query/QueryFactory.php b/web/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
index dd1133b7f..a3c14b277 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
@@ -14,8 +14,9 @@ use Symfony\Component\DependencyInjection\ContainerAwareTrait;
  *
  * @see \Drupal\Core\Entity\EntityStorageBase::getQuery()
  *
- * @todo https://www.drupal.org/node/2389335 remove entity.query service and
- *   replace with using the entity storage's getQuery() method.
+ * @deprecated in Drupal 8.3.0, will be removed before Drupal 9.0.0. Use
+ *   \Drupal\Core\Entity\EntityStorageInterface::getQuery() or
+ *   \Drupal\Core\Entity\EntityStorageInterface::getAggregateQuery() instead.
  */
 class QueryFactory implements ContainerAwareInterface {
 
diff --git a/web/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/web/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
index 9c05dfa4d..df375207b 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
@@ -114,7 +114,7 @@ interface QueryInterface extends AlterableInterface {
   /**
    * Queries for an empty field.
    *
-   * @param $field.
+   * @param $field
    *   Name of a field.
    * @param $langcode
    *   Language code (optional).
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php
index 7bdf793c6..f48ab65d8 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php
@@ -39,7 +39,7 @@ class ConditionAggregate extends ConditionAggregateBase {
         $condition_class::translateCondition($condition, $sql_query, $tables->isFieldCaseSensitive($condition['field']));
         $function = $condition['function'];
         $placeholder = ':db_placeholder_' . $conditionContainer->nextPlaceholder();
-        $conditionContainer->having("$function($field) {$condition['operator']} $placeholder", array($placeholder => $condition['value']));
+        $conditionContainer->having("$function($field) {$condition['operator']} $placeholder", [$placeholder => $condition['value']]);
       }
     }
   }
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
index 78f831aff..cd245ef7b 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
@@ -31,7 +31,7 @@ class Query extends QueryBase implements QueryInterface {
    *
    * @var array
    */
-  protected $sqlFields = array();
+  protected $sqlFields = [];
 
   /**
    * An array of strings added as to the group by, keyed by the string to avoid
@@ -39,7 +39,7 @@ class Query extends QueryBase implements QueryInterface {
    *
    * @var array
    */
-  protected $sqlGroupBy = array();
+  protected $sqlGroupBy = [];
 
   /**
    * @var \Drupal\Core\Database\Connection
@@ -101,23 +101,23 @@ class Query extends QueryBase implements QueryInterface {
     if ($this->entityType->getDataTable()) {
       $simple_query = FALSE;
     }
-    $this->sqlQuery = $this->connection->select($base_table, 'base_table', array('conjunction' => $this->conjunction));
+    $this->sqlQuery = $this->connection->select($base_table, 'base_table', ['conjunction' => $this->conjunction]);
     $this->sqlQuery->addMetaData('entity_type', $this->entityTypeId);
     $id_field = $this->entityType->getKey('id');
     // Add the key field for fetchAllKeyed().
     if (!$revision_field = $this->entityType->getKey('revision')) {
       // When there is no revision support, the key field is the entity key.
-      $this->sqlFields["base_table.$id_field"] = array('base_table', $id_field);
+      $this->sqlFields["base_table.$id_field"] = ['base_table', $id_field];
       // Now add the value column for fetchAllKeyed(). This is always the
       // entity id.
-      $this->sqlFields["base_table.$id_field" . '_1'] = array('base_table', $id_field);
+      $this->sqlFields["base_table.$id_field" . '_1'] = ['base_table', $id_field];
     }
     else {
       // When there is revision support, the key field is the revision key.
-      $this->sqlFields["base_table.$revision_field"] = array('base_table', $revision_field);
+      $this->sqlFields["base_table.$revision_field"] = ['base_table', $revision_field];
       // Now add the value column for fetchAllKeyed(). This is always the
       // entity id.
-      $this->sqlFields["base_table.$id_field"] = array('base_table', $id_field);
+      $this->sqlFields["base_table.$id_field"] = ['base_table', $id_field];
     }
     if ($this->accessCheck) {
       $this->sqlQuery->addTag($this->entityTypeId . '_access');
@@ -164,12 +164,12 @@ class Query extends QueryBase implements QueryInterface {
    */
   protected function addSort() {
     if ($this->count) {
-      $this->sort = array();
+      $this->sort = [];
     }
     // Gather the SQL field aliases first to make sure every field table
     // necessary is added. This might change whether the query is simple or
     // not. See below for more on simple queries.
-    $sort = array();
+    $sort = [];
     if ($this->sort) {
       foreach ($this->sort as $key => $data) {
         $sort[$key] = $this->getSqlField($data['field'], $data['langcode']);
@@ -291,8 +291,8 @@ class Query extends QueryBase implements QueryInterface {
    */
   public function __clone() {
     parent::__clone();
-    $this->sqlFields = array();
-    $this->sqlGroupBy = array();
+    $this->sqlFields = [];
+    $this->sqlGroupBy = [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
index 0fa2f6652..2d2aacfdf 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
@@ -15,7 +15,7 @@ class QueryAggregate extends Query implements QueryAggregateInterface {
    * @var array
    *   An array of expressions.
    */
-  protected $sqlExpressions = array();
+  protected $sqlExpressions = [];
 
   /**
    * {@inheritdoc}
@@ -39,7 +39,7 @@ class QueryAggregate extends Query implements QueryAggregateInterface {
   public function prepare() {
     parent::prepare();
     // Throw away the id fields.
-    $this->sqlFields = array();
+    $this->sqlFields = [];
     return $this;
   }
 
@@ -105,7 +105,7 @@ class QueryAggregate extends Query implements QueryAggregateInterface {
       $sql_field = $this->getSqlField($field, $group_by['langcode']);
       $this->sqlGroupBy[$sql_field] = $sql_field;
       list($table, $real_sql_field) = explode('.', $sql_field);
-      $this->sqlFields[$sql_field] = array($table, $real_sql_field, $this->createSqlAlias($field, $real_sql_field));
+      $this->sqlFields[$sql_field] = [$table, $real_sql_field, $this->createSqlAlias($field, $real_sql_field)];
     }
 
     return $this;
@@ -151,7 +151,7 @@ class QueryAggregate extends Query implements QueryAggregateInterface {
    *   replaced with underscores and if a default fallback to .value happened,
    *   the _value is stripped.
    */
-  function createSqlAlias($field, $sql_field) {
+  public function createSqlAlias($field, $sql_field) {
     $alias = str_replace('.', '_', $sql_field);
     // If the alias contains of field_*_value remove the _value at the end.
     if (substr($alias, 0, 6) === 'field_' && substr($field, -6) !== '_value' && substr($alias, -6) === '_value') {
@@ -170,7 +170,7 @@ class QueryAggregate extends Query implements QueryAggregateInterface {
     if ($this->count) {
       return parent::result();
     }
-    $return = array();
+    $return = [];
     foreach ($this->sqlQuery->execute() as $row) {
       $return[] = (array)$row;
     }
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index 1a1509cc4..e21824732 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -3,6 +3,7 @@
 namespace Drupal\Core\Entity\Query\Sql;
 
 use Drupal\Core\Database\Query\SelectInterface;
+use Drupal\Core\Entity\EntityType;
 use Drupal\Core\Entity\Query\QueryException;
 use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
 use Drupal\Core\Entity\Sql\TableMappingInterface;
@@ -27,7 +28,7 @@ class Tables implements TablesInterface {
    *
    * @var array
    */
-  protected $entityTables = array();
+  protected $entityTables = [];
 
   /**
    * Field table array, key is table name, value is alias.
@@ -36,7 +37,7 @@ class Tables implements TablesInterface {
    *
    * @var array
    */
-  protected $fieldTables = array();
+  protected $fieldTables = [];
 
   /**
    * The entity manager.
@@ -50,7 +51,7 @@ class Tables implements TablesInterface {
    *
    * @var array
    */
-  protected $caseSensitiveFields = array();
+  protected $caseSensitiveFields = [];
 
   /**
    * @param \Drupal\Core\Database\Query\SelectInterface $sql_query
@@ -79,7 +80,7 @@ class Tables implements TablesInterface {
     $count = count($specifiers) - 1;
     // This will contain the definitions of the last specifier seen by the
     // system.
-    $propertyDefinitions = array();
+    $propertyDefinitions = [];
     $entity_type = $this->entityManager->getDefinition($entity_type_id);
 
     $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
@@ -182,7 +183,7 @@ class Tables implements TablesInterface {
         // queried from the data table or the base table based on where it
         // finds the property first. The data table is preferred, which is why
         // it gets added before the base table.
-        $entity_tables = array();
+        $entity_tables = [];
         if ($all_revisions && $field_storage && $field_storage->isRevisionable()) {
           $data_table = $entity_type->getRevisionDataTable();
           $entity_base_table = $entity_type->getRevisionTable();
@@ -272,9 +273,8 @@ class Tables implements TablesInterface {
           $entity_type = $this->entityManager->getDefinition($entity_type_id);
           $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
           // Add the new entity base table using the table and sql column.
-          $join_condition = '%alias.' . $entity_type->getKey('id') . " = $table.$sql_column";
-          $base_table = $this->sqlQuery->leftJoin($entity_type->getBaseTable(), NULL, $join_condition);
-          $propertyDefinitions = array();
+          $base_table = $this->addNextBaseTable($entity_type, $table, $sql_column);
+          $propertyDefinitions = [];
           $key++;
           $index_prefix .= "$next_index_prefix.";
         }
@@ -340,7 +340,7 @@ class Tables implements TablesInterface {
   }
 
   protected function addJoin($type, $table, $join_condition, $langcode, $delta = NULL) {
-    $arguments = array();
+    $arguments = [];
     if ($langcode) {
       $entity_type_id = $this->sqlQuery->getMetaData('entity_type');
       $entity_type = $this->entityManager->getDefinition($entity_type_id);
@@ -379,4 +379,29 @@ class Tables implements TablesInterface {
     return array_flip($mapping);
   }
 
+  /**
+   * Add the next entity base table.
+   *
+   * For example, when building the SQL query for
+   * @code
+   * condition('uid.entity.name', 'foo', 'CONTAINS')
+   * @endcode
+   *
+   * this adds the users table.
+   *
+   * @param \Drupal\Core\Entity\EntityType $entity_type
+   *   The entity type being joined, in the above example, User.
+   * @param string $table
+   *   This is the table being joined, in the above example, {users}.
+   * @param string $sql_column
+   *   This is the SQL column in the existing table being joined to.
+   *
+   * @return string
+   *   The alias of the next entity table joined in.
+   */
+  protected function addNextBaseTable(EntityType $entity_type, $table, $sql_column) {
+    $join_condition = '%alias.' . $entity_type->getKey('id') . " = $table.$sql_column";
+    return $this->sqlQuery->leftJoin($entity_type->getBaseTable(), NULL, $join_condition);
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Entity/RevisionableEntityBundleInterface.php b/web/core/lib/Drupal/Core/Entity/RevisionableEntityBundleInterface.php
new file mode 100644
index 000000000..caf44f20a
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Entity/RevisionableEntityBundleInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Drupal\Core\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+/**
+ * Provides an interface defining a revisionable entity bundle.
+ */
+interface RevisionableEntityBundleInterface extends ConfigEntityInterface {
+
+  /**
+   * Gets whether a new revision should be created by default.
+   *
+   * @return bool
+   *   TRUE if a new revision should be created by default.
+   */
+  public function shouldCreateNewRevision();
+
+}
diff --git a/web/core/lib/Drupal/Core/Entity/Routing/AdminHtmlRouteProvider.php b/web/core/lib/Drupal/Core/Entity/Routing/AdminHtmlRouteProvider.php
index 504a6ffb1..1abee11ed 100644
--- a/web/core/lib/Drupal/Core/Entity/Routing/AdminHtmlRouteProvider.php
+++ b/web/core/lib/Drupal/Core/Entity/Routing/AdminHtmlRouteProvider.php
@@ -11,8 +11,6 @@ use Drupal\Core\Entity\EntityTypeInterface;
  * administrative theme.
  *
  * @see \Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider.
- *
- * @internal
  */
 class AdminHtmlRouteProvider extends DefaultHtmlRouteProvider {
 
diff --git a/web/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php b/web/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php
index 1ac54bb27..fb40fd5b4 100644
--- a/web/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php
+++ b/web/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php
@@ -26,8 +26,6 @@ use Symfony\Component\Routing\RouteCollection;
  * - collection
  *
  * @see \Drupal\Core\Entity\Routing\AdminHtmlRouteProvider.
- *
- * @internal
  */
 class DefaultHtmlRouteProvider implements EntityRouteProviderInterface, EntityHandlerInterface {
 
@@ -316,13 +314,16 @@ class DefaultHtmlRouteProvider implements EntityRouteProviderInterface, EntityHa
     // If the entity type does not provide an admin permission, there is no way
     // to control access, so we cannot provide a route in a sensible way.
     if ($entity_type->hasLinkTemplate('collection') && $entity_type->hasListBuilderClass() && ($admin_permission = $entity_type->getAdminPermission())) {
+      /** @var \Drupal\Core\StringTranslation\TranslatableMarkup $label */
+      $label = $entity_type->getCollectionLabel();
+
       $route = new Route($entity_type->getLinkTemplate('collection'));
       $route
         ->addDefaults([
           '_entity_list' => $entity_type->id(),
-          // @todo Improve this in https://www.drupal.org/node/2767025
-          '_title' => '@label entities',
-          '_title_arguments' => ['@label' => $entity_type->getLabel()],
+          '_title' => $label->getUntranslatedString(),
+          '_title_arguments' => $label->getArguments(),
+          '_title_context' => $label->getOption('context'),
         ])
         ->setRequirement('_permission', $admin_permission);
 
@@ -341,7 +342,7 @@ class DefaultHtmlRouteProvider implements EntityRouteProviderInterface, EntityHa
    *   type does not support fields.
    */
   protected function getEntityTypeIdKeyType(EntityTypeInterface $entity_type) {
-    if (!$entity_type->isSubclassOf(FieldableEntityInterface::class)) {
+    if (!$entity_type->entityClassImplements(FieldableEntityInterface::class)) {
       return NULL;
     }
 
diff --git a/web/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php b/web/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
index 5f20c3f08..4fd6a32df 100644
--- a/web/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
+++ b/web/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
@@ -22,7 +22,7 @@ class DefaultTableMapping implements TableMappingInterface {
    *
    * @var \Drupal\Core\Field\FieldStorageDefinitionInterface[]
    */
-  protected $fieldStorageDefinitions = array();
+  protected $fieldStorageDefinitions = [];
 
   /**
    * A list of field names per table.
@@ -33,7 +33,7 @@ class DefaultTableMapping implements TableMappingInterface {
    *
    * @var array[]
    */
-  protected $fieldNames = array();
+  protected $fieldNames = [];
 
   /**
    * A list of database columns which store denormalized data per table.
@@ -44,7 +44,7 @@ class DefaultTableMapping implements TableMappingInterface {
    *
    * @var array[]
    */
-  protected $extraColumns = array();
+  protected $extraColumns = [];
 
   /**
    * A mapping of column names per field name.
@@ -58,7 +58,7 @@ class DefaultTableMapping implements TableMappingInterface {
    *
    * @var array[]
    */
-  protected $columnMapping = array();
+  protected $columnMapping = [];
 
   /**
    * A list of all database columns per table.
@@ -73,7 +73,7 @@ class DefaultTableMapping implements TableMappingInterface {
    *
    * @var array[]
    */
-  protected $allColumns = array();
+  protected $allColumns = [];
 
   /**
    * Constructs a DefaultTableMapping.
@@ -101,7 +101,7 @@ class DefaultTableMapping implements TableMappingInterface {
    */
   public function getAllColumns($table_name) {
     if (!isset($this->allColumns[$table_name])) {
-      $this->allColumns[$table_name] = array();
+      $this->allColumns[$table_name] = [];
 
       foreach ($this->getFieldNames($table_name) as $field_name) {
         $this->allColumns[$table_name] = array_merge($this->allColumns[$table_name], array_values($this->getColumnNames($field_name)));
@@ -128,7 +128,7 @@ class DefaultTableMapping implements TableMappingInterface {
     if (isset($this->fieldNames[$table_name])) {
       return $this->fieldNames[$table_name];
     }
-    return array();
+    return [];
   }
 
   /**
@@ -148,15 +148,15 @@ class DefaultTableMapping implements TableMappingInterface {
       /** @var \Drupal\Core\Entity\Sql\SqlContentEntityStorage $storage */
       $storage = \Drupal::entityManager()->getStorage($this->entityType->id());
       $storage_definition = $this->fieldStorageDefinitions[$field_name];
-      $table_names = array(
+      $table_names = [
         $storage->getDataTable(),
         $storage->getBaseTable(),
         $storage->getRevisionTable(),
         $this->getDedicatedDataTableName($storage_definition),
-      );
+      ];
 
       // Collect field columns.
-      $field_columns = array();
+      $field_columns = [];
       foreach (array_keys($storage_definition->getColumns()) as $property_name) {
         $field_columns[] = $this->getFieldColumnName($storage_definition, $property_name);
       }
@@ -184,7 +184,7 @@ class DefaultTableMapping implements TableMappingInterface {
    */
   public function getColumnNames($field_name) {
     if (!isset($this->columnMapping[$field_name])) {
-      $this->columnMapping[$field_name] = array();
+      $this->columnMapping[$field_name] = [];
       if (isset($this->fieldStorageDefinitions[$field_name]) && !$this->fieldStorageDefinitions[$field_name]->hasCustomStorage()) {
         foreach (array_keys($this->fieldStorageDefinitions[$field_name]->getColumns()) as $property_name) {
           $this->columnMapping[$field_name][$property_name] = $this->getFieldColumnName($this->fieldStorageDefinitions[$field_name], $property_name);
@@ -242,7 +242,7 @@ class DefaultTableMapping implements TableMappingInterface {
     if (isset($this->extraColumns[$table_name])) {
       return $this->extraColumns[$table_name];
     }
-    return array();
+    return [];
   }
 
   /**
@@ -307,7 +307,7 @@ class DefaultTableMapping implements TableMappingInterface {
    * {@inheritdoc}
    */
   public function getReservedColumns() {
-    return array('deleted');
+    return ['deleted'];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index d4945cf3f..6df1af08a 100644
--- a/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -286,7 +286,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
         return $table_mapping->allowsSharedTableStorage($definition);
       });
 
-      $key_fields = array_values(array_filter(array($this->idKey, $this->revisionKey, $this->bundleKey, $this->uuidKey, $this->langcodeKey)));
+      $key_fields = array_values(array_filter([$this->idKey, $this->revisionKey, $this->bundleKey, $this->uuidKey, $this->langcodeKey]));
       $all_fields = array_keys($shared_table_definitions);
       $revisionable_fields = array_keys(array_filter($shared_table_definitions, function (FieldStorageDefinitionInterface $definition) {
         return $definition->isRevisionable();
@@ -298,11 +298,11 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       // log.
       // @todo Provide automatic definitions for revision metadata fields in
       //   https://www.drupal.org/node/2248983.
-      $revision_metadata_fields = array_intersect(array(
+      $revision_metadata_fields = array_intersect([
         'revision_timestamp',
         'revision_uid',
         'revision_log',
-      ), $all_fields);
+      ], $all_fields);
 
       $revisionable = $this->entityType->isRevisionable();
       $translatable = $this->entityType->isTranslatable();
@@ -316,7 +316,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
         // denormalized in the base table but also stored in the revision table
         // together with the entity ID and the revision ID as identifiers.
         $table_mapping->setFieldNames($this->baseTable, array_diff($all_fields, $revision_metadata_fields));
-        $revision_key_fields = array($this->idKey, $this->revisionKey);
+        $revision_key_fields = [$this->idKey, $this->revisionKey];
         $table_mapping->setFieldNames($this->revisionTable, array_merge($revision_key_fields, $revisionable_fields));
       }
       elseif (!$revisionable && $translatable) {
@@ -328,7 +328,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
         // the data table.
         $table_mapping
           ->setFieldNames($this->baseTable, $key_fields)
-          ->setFieldNames($this->dataTable, array_values(array_diff($all_fields, array($this->uuidKey))));
+          ->setFieldNames($this->dataTable, array_values(array_diff($all_fields, [$this->uuidKey])));
       }
       elseif ($revisionable && $translatable) {
         // The revisionable multilingual layout stores key field values in the
@@ -343,14 +343,14 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
         // Like in the multilingual, non-revisionable case the UUID is not
         // in the data table. Additionally, do not store revision metadata
         // fields in the data table.
-        $data_fields = array_values(array_diff($all_fields, array($this->uuidKey), $revision_metadata_fields));
+        $data_fields = array_values(array_diff($all_fields, [$this->uuidKey], $revision_metadata_fields));
         $table_mapping->setFieldNames($this->dataTable, $data_fields);
 
-        $revision_base_fields = array_merge(array($this->idKey, $this->revisionKey, $this->langcodeKey), $revision_metadata_fields);
+        $revision_base_fields = array_merge([$this->idKey, $this->revisionKey, $this->langcodeKey], $revision_metadata_fields);
         $table_mapping->setFieldNames($this->revisionTable, $revision_base_fields);
 
-        $revision_data_key_fields = array($this->idKey, $this->revisionKey, $this->langcodeKey);
-        $revision_data_fields = array_diff($revisionable_fields, $revision_metadata_fields, array($this->langcodeKey));
+        $revision_data_key_fields = [$this->idKey, $this->revisionKey, $this->langcodeKey];
+        $revision_data_fields = array_diff($revisionable_fields, $revision_metadata_fields, [$this->langcodeKey]);
         $table_mapping->setFieldNames($this->revisionDataTable, array_merge($revision_data_key_fields, $revision_data_fields));
       }
 
@@ -358,21 +358,21 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       $dedicated_table_definitions = array_filter($definitions, function (FieldStorageDefinitionInterface $definition) use ($table_mapping) {
         return $table_mapping->requiresDedicatedTableStorage($definition);
       });
-      $extra_columns = array(
+      $extra_columns = [
         'bundle',
         'deleted',
         'entity_id',
         'revision_id',
         'langcode',
         'delta',
-      );
+      ];
       foreach ($dedicated_table_definitions as $field_name => $definition) {
         $tables = [$table_mapping->getDedicatedDataTableName($definition)];
         if ($revisionable && $definition->isRevisionable()) {
           $tables[] = $table_mapping->getDedicatedRevisionTableName($definition);
         }
         foreach ($tables as $table_name) {
-          $table_mapping->setFieldNames($table_name, array($field_name));
+          $table_mapping->setFieldNames($table_name, [$field_name]);
           $table_mapping->setExtraColumns($table_name, $extra_columns);
         }
       }
@@ -415,7 +415,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
    *   Array of entities from the storage.
    */
   protected function getFromStorage(array $ids = NULL) {
-    $entities = array();
+    $entities = [];
 
     if (!empty($ids)) {
       // Sanitize IDs. Before feeding ID array into buildQuery, check whether
@@ -450,12 +450,12 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
    */
   protected function mapFromStorageRecords(array $records, $load_from_revision = FALSE) {
     if (!$records) {
-      return array();
+      return [];
     }
 
-    $values = array();
+    $values = [];
     foreach ($records as $id => $record) {
-      $values[$id] = array();
+      $values[$id] = [];
       // Skip the item delta and item value levels (if possible) but let the
       // field assign the value as suiting. This avoids unnecessary array
       // hierarchies and saves memory here.
@@ -475,13 +475,13 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
     }
 
     // Initialize translations array.
-    $translations = array_fill_keys(array_keys($values), array());
+    $translations = array_fill_keys(array_keys($values), []);
 
     // Load values from shared and dedicated tables.
     $this->loadFromSharedTables($values, $translations);
     $this->loadFromDedicatedTables($values, $load_from_revision);
 
-    $entities = array();
+    $entities = [];
     foreach ($values as $id => $entity_values) {
       $bundle = $this->bundleKey ? $entity_values[$this->bundleKey][LanguageInterface::LANGCODE_DEFAULT] : FALSE;
       // Turn the record into an entity class.
@@ -505,7 +505,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       // latest revision. Otherwise we fall back to the data table.
       $table = $this->revisionDataTable ?: $this->dataTable;
       $alias = $this->revisionDataTable ? 'revision' : 'data';
-      $query = $this->database->select($table, $alias, array('fetch' => \PDO::FETCH_ASSOC))
+      $query = $this->database->select($table, $alias, ['fetch' => \PDO::FETCH_ASSOC])
         ->fields($alias)
         ->condition($alias . '.' . $this->idKey, array_keys($values), 'IN')
         ->orderBy($alias . '.' . $this->idKey);
@@ -514,7 +514,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       if ($this->revisionDataTable) {
         // Find revisioned fields that are not entity keys. Exclude the langcode
         // key as the base table holds only the default language.
-        $base_fields = array_diff($table_mapping->getFieldNames($this->baseTable), array($this->langcodeKey));
+        $base_fields = array_diff($table_mapping->getFieldNames($this->baseTable), [$this->langcodeKey]);
         $revisioned_fields = array_diff($table_mapping->getFieldNames($this->revisionDataTable), $base_fields);
 
         // Find fields that are not revisioned or entity keys. Data fields have
@@ -541,7 +541,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
         }
 
         // Get the revision IDs.
-        $revision_ids = array();
+        $revision_ids = [];
         foreach ($values as $entity_values) {
           $revision_ids[] = $entity_values[$this->revisionKey][LanguageInterface::LANGCODE_DEFAULT];
         }
@@ -584,7 +584,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
     $revision = NULL;
 
     // Build and execute the query.
-    $query_result = $this->buildQuery(array(), $revision_id)->execute();
+    $query_result = $this->buildQuery([], $revision_id)->execute();
     $records = $query_result->fetchAllAssoc($this->idKey);
 
     if (!empty($records)) {
@@ -655,7 +655,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
     $query->addTag($this->entityTypeId . '_load_multiple');
 
     if ($revision_id) {
-      $query->join($this->revisionTable, 'revision', "revision.{$this->idKey} = base.{$this->idKey} AND revision.{$this->revisionKey} = :revisionId", array(':revisionId' => $revision_id));
+      $query->join($this->revisionTable, 'revision', "revision.{$this->idKey} = base.{$this->idKey} AND revision.{$this->revisionKey} = :revisionId", [':revisionId' => $revision_id]);
     }
     elseif ($this->revisionTable) {
       $query->join($this->revisionTable, 'revision', "revision.{$this->revisionKey} = base.{$this->revisionKey}");
@@ -713,7 +713,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       db_ignore_replica();
     }
     catch (\Exception $e) {
-      $transaction->rollback();
+      $transaction->rollBack();
       watchdog_exception($this->entityTypeId, $e);
       throw new EntityStorageException($e->getMessage(), $e->getCode(), $e);
     }
@@ -765,7 +765,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       return $return;
     }
     catch (\Exception $e) {
-      $transaction->rollback();
+      $transaction->rollBack();
       watchdog_exception($this->entityTypeId, $e);
       throw new EntityStorageException($e->getMessage(), $e->getCode(), $e);
     }
@@ -838,7 +838,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       }
       else {
         $insert_id = $this->database
-          ->insert($this->baseTable, array('return' => Database::RETURN_INSERT_ID))
+          ->insert($this->baseTable, ['return' => Database::RETURN_INSERT_ID])
           ->fields((array) $record)
           ->execute();
         // Even if this is a new entity the ID key might have been set, in which
@@ -950,7 +950,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
         // @todo Give field types more control over this behavior in
         //   https://www.drupal.org/node/2232427.
         if (!$definition->getMainPropertyName() && count($columns) == 1) {
-          $value = ($item = $entity->$field_name->first()) ? $item->getValue() : array();
+          $value = ($item = $entity->$field_name->first()) ? $item->getValue() : [];
         }
         else {
           $value = isset($entity->$field_name->$column_name) ? $entity->$field_name->$column_name : NULL;
@@ -1037,7 +1037,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
 
     if ($entity->isNewRevision()) {
       $insert_id = $this->database
-        ->insert($this->revisionTable, array('return' => Database::RETURN_INSERT_ID))
+        ->insert($this->revisionTable, ['return' => Database::RETURN_INSERT_ID])
         ->fields((array) $record)
         ->execute();
       // Even if this is a new revision, the revision ID key might have been
@@ -1047,7 +1047,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       }
       if ($entity->isDefaultRevision()) {
         $this->database->update($this->entityType->getBaseTable())
-          ->fields(array($this->revisionKey => $record->{$this->revisionKey}))
+          ->fields([$this->revisionKey => $record->{$this->revisionKey}])
           ->condition($this->idKey, $record->{$this->idKey})
           ->execute();
       }
@@ -1088,9 +1088,9 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
     }
 
     // Collect entities ids, bundles and languages.
-    $bundles = array();
-    $ids = array();
-    $default_langcodes = array();
+    $bundles = [];
+    $ids = [];
+    $default_langcodes = [];
     foreach ($values as $key => $entity_values) {
       $bundles[$this->bundleKey ? $entity_values[$this->bundleKey][LanguageInterface::LANGCODE_DEFAULT] : $this->entityTypeId] = TRUE;
       $ids[] = !$load_from_revision ? $key : $entity_values[$this->revisionKey][LanguageInterface::LANGCODE_DEFAULT];
@@ -1100,8 +1100,8 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
     }
 
     // Collect impacted fields.
-    $storage_definitions = array();
-    $definitions = array();
+    $storage_definitions = [];
+    $definitions = [];
     $table_mapping = $this->getTableMapping();
     foreach ($bundles as $bundle => $v) {
       $definitions[$bundle] = $this->entityManager->getFieldDefinitions($this->entityTypeId, $bundle);
@@ -1140,14 +1140,14 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
         }
 
         if (!isset($values[$row->entity_id][$field_name][$langcode])) {
-          $values[$row->entity_id][$field_name][$langcode] = array();
+          $values[$row->entity_id][$field_name][$langcode] = [];
         }
 
         // Ensure that records for non-translatable fields having invalid
         // languages are skipped.
         if ($langcode == LanguageInterface::LANGCODE_DEFAULT || $definitions[$bundle][$field_name]->isTranslatable()) {
           if ($storage_definition->getCardinality() == FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED || count($values[$row->entity_id][$field_name][$langcode]) < $storage_definition->getCardinality()) {
-            $item = array();
+            $item = [];
             // For each column declared by the field, populate the item from the
             // prefixed database column.
             foreach ($storage_definition->getColumns() as $column => $attributes) {
@@ -1175,7 +1175,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
    *   (optional) The names of the fields to be stored. Defaults to all the
    *   available fields.
    */
-  protected function saveToDedicatedTables(ContentEntityInterface $entity, $update = TRUE, $names = array()) {
+  protected function saveToDedicatedTables(ContentEntityInterface $entity, $update = TRUE, $names = []) {
     $vid = $entity->getRevisionId();
     $id = $entity->id();
     $bundle = $entity->bundle();
@@ -1230,7 +1230,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
 
       // Prepare the multi-insert query.
       $do_insert = FALSE;
-      $columns = array('entity_id', 'revision_id', 'bundle', 'delta', 'langcode');
+      $columns = ['entity_id', 'revision_id', 'bundle', 'delta', 'langcode'];
       foreach ($storage_definition->getColumns() as $column => $attributes) {
         $columns[] = $table_mapping->getFieldColumnName($storage_definition, $column);
       }
@@ -1239,7 +1239,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
         $revision_query = $this->database->insert($revision_name)->fields($columns);
       }
 
-      $langcodes = $field_definition->isTranslatable() ? $translation_langcodes : array($default_langcode);
+      $langcodes = $field_definition->isTranslatable() ? $translation_langcodes : [$default_langcode];
       foreach ($langcodes as $langcode) {
         $delta_count = 0;
         $items = $entity->getTranslation($langcode)->get($field_name);
@@ -1247,13 +1247,13 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
         foreach ($items as $delta => $item) {
           // We now know we have something to insert.
           $do_insert = TRUE;
-          $record = array(
+          $record = [
             'entity_id' => $id,
             'revision_id' => $vid,
             'bundle' => $bundle,
             'delta' => $delta,
             'langcode' => $langcode,
-          );
+          ];
           foreach ($storage_definition->getColumns() as $column => $attributes) {
             $column_name = $table_mapping->getFieldColumnName($storage_definition, $column);
             // Serialize the value if specified in the column schema.
@@ -1440,11 +1440,11 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       $table = $table_mapping->getDedicatedDataTableName($storage_definition);
       $revision_table = $table_mapping->getDedicatedRevisionTableName($storage_definition);
       $this->database->update($table)
-        ->fields(array('deleted' => 1))
+        ->fields(['deleted' => 1])
         ->execute();
       if ($this->entityType->isRevisionable()) {
         $this->database->update($revision_table)
-          ->fields(array('deleted' => 1))
+          ->fields(['deleted' => 1])
           ->execute();
       }
     }
@@ -1490,12 +1490,12 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       $table_name = $table_mapping->getDedicatedDataTableName($storage_definition);
       $revision_name = $table_mapping->getDedicatedRevisionTableName($storage_definition);
       $this->database->update($table_name)
-        ->fields(array('deleted' => 1))
+        ->fields(['deleted' => 1])
         ->condition('bundle', $field_definition->getTargetBundle())
         ->execute();
       if ($this->entityType->isRevisionable()) {
         $this->database->update($revision_name)
-          ->fields(array('deleted' => 1))
+          ->fields(['deleted' => 1])
           ->condition('bundle', $field_definition->getTargetBundle())
           ->execute();
       }
@@ -1524,27 +1524,27 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
     $table_name = $table_mapping->getDedicatedDataTableName($storage_definition, $is_deleted);
 
     // Get the entities which we want to purge first.
-    $entity_query = $this->database->select($table_name, 't', array('fetch' => \PDO::FETCH_ASSOC));
+    $entity_query = $this->database->select($table_name, 't', ['fetch' => \PDO::FETCH_ASSOC]);
     $or = $entity_query->orConditionGroup();
     foreach ($storage_definition->getColumns() as $column_name => $data) {
       $or->isNotNull($table_mapping->getFieldColumnName($storage_definition, $column_name));
     }
     $entity_query
       ->distinct(TRUE)
-      ->fields('t', array('entity_id'))
+      ->fields('t', ['entity_id'])
       ->condition('bundle', $field_definition->getTargetBundle())
       ->range(0, $batch_size);
 
     // Create a map of field data table column names to field column names.
-    $column_map = array();
+    $column_map = [];
     foreach ($storage_definition->getColumns() as $column_name => $data) {
       $column_map[$table_mapping->getFieldColumnName($storage_definition, $column_name)] = $column_name;
     }
 
-    $entities = array();
-    $items_by_entity = array();
+    $entities = [];
+    $items_by_entity = [];
     foreach ($entity_query->execute() as $row) {
-      $item_query = $this->database->select($table_name, 't', array('fetch' => \PDO::FETCH_ASSOC))
+      $item_query = $this->database->select($table_name, 't', ['fetch' => \PDO::FETCH_ASSOC])
         ->fields('t')
         ->condition('entity_id', $row['entity_id'])
         ->condition('deleted', 1)
@@ -1558,7 +1558,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
           // factory, see https://www.drupal.org/node/1867228.
           $entities[$item_row['revision_id']] = _field_create_entity_from_ids((object) $item_row);
         }
-        $item = array();
+        $item = [];
         foreach ($column_map as $db_column => $field_column) {
           $item[$field_column] = $item_row[$db_column];
         }
@@ -1631,7 +1631,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       $query->condition($or);
       if (!$as_bool) {
         $query
-          ->fields('t', array('entity_id'))
+          ->fields('t', ['entity_id'])
           ->distinct(TRUE);
       }
     }
@@ -1656,7 +1656,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       $query->condition($or);
       if (!$as_bool) {
         $query
-          ->fields('t', array($this->idKey))
+          ->fields('t', [$this->idKey])
           ->distinct(TRUE);
       }
     }
diff --git a/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index 0d64e31db..f9dd0c085 100644
--- a/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -7,6 +7,7 @@ use Drupal\Core\Database\DatabaseException;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\ContentEntityTypeInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Entity\EntityStorageException;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
@@ -161,11 +162,19 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    *   Returns TRUE if there have been changes.
    */
   protected function hasSharedTableNameChanges(EntityTypeInterface $entity_type, EntityTypeInterface $original) {
+    $base_table = $this->database->schema()->tableExists($entity_type->getBaseTable());
+    $data_table = $this->database->schema()->tableExists($entity_type->getDataTable());
+    $revision_table = $this->database->schema()->tableExists($entity_type->getRevisionTable());
+    $revision_data_table = $this->database->schema()->tableExists($entity_type->getRevisionDataTable());
+
+    // We first check if the new table already exists because the storage might
+    // have created it even though it wasn't specified in the entity type
+    // definition.
     return
-      $entity_type->getBaseTable() != $original->getBaseTable() ||
-      $entity_type->getDataTable() != $original->getDataTable() ||
-      $entity_type->getRevisionTable() != $original->getRevisionTable() ||
-      $entity_type->getRevisionDataTable() != $original->getRevisionDataTable();
+      (!$base_table && $entity_type->getBaseTable() != $original->getBaseTable()) ||
+      (!$data_table && $entity_type->getDataTable() != $original->getDataTable()) ||
+      (!$revision_table && $entity_type->getRevisionTable() != $original->getRevisionTable()) ||
+      (!$revision_data_table && $entity_type->getRevisionDataTable() != $original->getRevisionDataTable());
   }
 
   /**
@@ -316,7 +325,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
       }
       catch (\Exception $e) {
         if ($this->database->supportsTransactionalDDL()) {
-          $transaction->rollback();
+          $transaction->rollBack();
         }
         else {
           // Recreate original schema.
@@ -521,7 +530,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
       $storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
       foreach ($table_names as $table_name) {
         if (!isset($schema[$table_name])) {
-          $schema[$table_name] = array();
+          $schema[$table_name] = [];
         }
         foreach ($table_mapping->getFieldNames($table_name) as $field_name) {
           if (!isset($storage_definitions[$field_name])) {
@@ -548,6 +557,24 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
         $this->processRevisionDataTable($entity_type, $schema[$tables['revision_data_table']]);
       }
 
+      // Add an index for the 'published' entity key.
+      if (is_subclass_of($entity_type->getClass(), EntityPublishedInterface::class)) {
+        $published_key = $entity_type->getKey('published');
+        if ($published_key && !$storage_definitions[$published_key]->hasCustomStorage()) {
+          $published_field_table = $table_mapping->getFieldTableName($published_key);
+          $id_key = $entity_type->getKey('id');
+          if ($bundle_key = $entity_type->getKey('bundle')) {
+            $key = "{$published_key}_{$bundle_key}";
+            $columns = [$published_key, $bundle_key, $id_key];
+          }
+          else {
+            $key = $published_key;
+            $columns = [$published_key, $id_key];
+          }
+          $schema[$published_field_table]['indexes'][$this->getEntityIndexName($entity_type, $key)] = $columns;
+        }
+      }
+
       $this->schema[$entity_type_id] = $schema;
 
       // Restore the actual definition.
@@ -564,12 +591,12 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    *   A list of entity type tables, keyed by table key.
    */
   protected function getEntitySchemaTables() {
-    return array_filter(array(
+    return array_filter([
       'base_table' => $this->storage->getBaseTable(),
       'revision_table' => $this->storage->getRevisionTable(),
       'data_table' => $this->storage->getDataTable(),
       'revision_data_table' => $this->storage->getRevisionDataTable(),
-    ));
+    ]);
   }
 
   /**
@@ -674,22 +701,22 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    *   The schema definition for the specified key.
    */
   protected function getFieldSchemaData($field_name, array $field_schema, array $column_mapping, $schema_key) {
-    $data = array();
+    $data = [];
 
+    $entity_type_id = $this->entityType->id();
     foreach ($field_schema[$schema_key] as $key => $columns) {
       // To avoid clashes with entity-level indexes or unique keys we use
       // "{$entity_type_id}_field__" as a prefix instead of just
       // "{$entity_type_id}__". We additionally namespace the specifier by the
       // field name to avoid clashes when multiple fields of the same type are
       // added to an entity type.
-      $entity_type_id = $this->entityType->id();
       $real_key = $this->getFieldSchemaIdentifierName($entity_type_id, $field_name, $key);
       foreach ($columns as $column) {
         // Allow for indexes and unique keys to specified as an array of column
         // name and length.
         if (is_array($column)) {
           list($column_name, $length) = $column;
-          $data[$real_key][] = array($column_mapping[$column_name], $length);
+          $data[$real_key][] = [$column_mapping[$column_name], $length];
         }
         else {
           $data[$real_key][] = $column_mapping[$column];
@@ -742,7 +769,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    *   The schema definition for the foreign keys.
    */
   protected function getFieldForeignKeys($field_name, array $field_schema, array $column_mapping) {
-    $foreign_keys = array();
+    $foreign_keys = [];
 
     foreach ($field_schema['foreign keys'] as $specifier => $specification) {
       // To avoid clashes with entity-level foreign keys we use
@@ -771,7 +798,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    *   The entity schema data array.
    */
   protected function loadEntitySchemaData(EntityTypeInterface $entity_type) {
-    return $this->installedStorageSchema()->get($entity_type->id() . '.entity_schema_data', array());
+    return $this->installedStorageSchema()->get($entity_type->id() . '.entity_schema_data', []);
   }
 
   /**
@@ -807,7 +834,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    *   The field schema data array.
    */
   protected function loadFieldSchemaData(FieldStorageDefinitionInterface $storage_definition) {
-    return $this->installedStorageSchema()->get($storage_definition->getTargetEntityTypeId() . '.field_schema_data.' . $storage_definition->getName(), array());
+    return $this->installedStorageSchema()->get($storage_definition->getTargetEntityTypeId() . '.field_schema_data.' . $storage_definition->getName(), []);
   }
 
   /**
@@ -844,21 +871,21 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
   protected function initializeBaseTable(ContentEntityTypeInterface $entity_type) {
     $entity_type_id = $entity_type->id();
 
-    $schema = array(
+    $schema = [
       'description' => "The base table for $entity_type_id entities.",
-      'primary key' => array($entity_type->getKey('id')),
-      'indexes' => array(),
-      'foreign keys' => array(),
-    );
+      'primary key' => [$entity_type->getKey('id')],
+      'indexes' => [],
+      'foreign keys' => [],
+    ];
 
     if ($entity_type->hasKey('revision')) {
       $revision_key = $entity_type->getKey('revision');
       $key_name = $this->getEntityIndexName($entity_type, $revision_key);
-      $schema['unique keys'][$key_name] = array($revision_key);
-      $schema['foreign keys'][$entity_type_id . '__revision'] = array(
+      $schema['unique keys'][$key_name] = [$revision_key];
+      $schema['foreign keys'][$entity_type_id . '__revision'] = [
         'table' => $this->storage->getRevisionTable(),
-        'columns' => array($revision_key => $revision_key),
-      );
+        'columns' => [$revision_key => $revision_key],
+      ];
     }
 
     $this->addTableDefaults($schema);
@@ -880,19 +907,19 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
     $id_key = $entity_type->getKey('id');
     $revision_key = $entity_type->getKey('revision');
 
-    $schema = array(
+    $schema = [
       'description' => "The revision table for $entity_type_id entities.",
-      'primary key' => array($revision_key),
-      'indexes' => array(),
-      'foreign keys' => array(
-        $entity_type_id . '__revisioned' => array(
+      'primary key' => [$revision_key],
+      'indexes' => [],
+      'foreign keys' => [
+        $entity_type_id . '__revisioned' => [
           'table' => $this->storage->getBaseTable(),
-          'columns' => array($id_key => $id_key),
-        ),
-      ),
-    );
+          'columns' => [$id_key => $id_key],
+        ],
+      ],
+    ];
 
-    $schema['indexes'][$this->getEntityIndexName($entity_type, $id_key)] = array($id_key);
+    $schema['indexes'][$this->getEntityIndexName($entity_type, $id_key)] = [$id_key];
 
     $this->addTableDefaults($schema);
 
@@ -912,23 +939,23 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
     $entity_type_id = $entity_type->id();
     $id_key = $entity_type->getKey('id');
 
-    $schema = array(
+    $schema = [
       'description' => "The data table for $entity_type_id entities.",
-      'primary key' => array($id_key, $entity_type->getKey('langcode')),
-      'indexes' => array(
-        $entity_type_id . '__id__default_langcode__langcode' => array($id_key, $entity_type->getKey('default_langcode'), $entity_type->getKey('langcode')),
-      ),
-      'foreign keys' => array(
-        $entity_type_id => array(
+      'primary key' => [$id_key, $entity_type->getKey('langcode')],
+      'indexes' => [
+        $entity_type_id . '__id__default_langcode__langcode' => [$id_key, $entity_type->getKey('default_langcode'), $entity_type->getKey('langcode')],
+      ],
+      'foreign keys' => [
+        $entity_type_id => [
           'table' => $this->storage->getBaseTable(),
-          'columns' => array($id_key => $id_key),
-        ),
-      ),
-    );
+          'columns' => [$id_key => $id_key],
+        ],
+      ],
+    ];
 
     if ($entity_type->hasKey('revision')) {
       $key = $entity_type->getKey('revision');
-      $schema['indexes'][$this->getEntityIndexName($entity_type, $key)] = array($key);
+      $schema['indexes'][$this->getEntityIndexName($entity_type, $key)] = [$key];
     }
 
     $this->addTableDefaults($schema);
@@ -950,23 +977,23 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
     $id_key = $entity_type->getKey('id');
     $revision_key = $entity_type->getKey('revision');
 
-    $schema = array(
+    $schema = [
       'description' => "The revision data table for $entity_type_id entities.",
-      'primary key' => array($revision_key, $entity_type->getKey('langcode')),
-      'indexes' => array(
-        $entity_type_id . '__id__default_langcode__langcode' => array($id_key, $entity_type->getKey('default_langcode'), $entity_type->getKey('langcode')),
-      ),
-      'foreign keys' => array(
-        $entity_type_id => array(
+      'primary key' => [$revision_key, $entity_type->getKey('langcode')],
+      'indexes' => [
+        $entity_type_id . '__id__default_langcode__langcode' => [$id_key, $entity_type->getKey('default_langcode'), $entity_type->getKey('langcode')],
+      ],
+      'foreign keys' => [
+        $entity_type_id => [
           'table' => $this->storage->getBaseTable(),
-          'columns' => array($id_key => $id_key),
-        ),
-        $entity_type_id . '__revision' => array(
+          'columns' => [$id_key => $id_key],
+        ],
+        $entity_type_id . '__revision' => [
           'table' => $this->storage->getRevisionTable(),
-          'columns' => array($revision_key => $revision_key),
-        )
-      ),
-    );
+          'columns' => [$revision_key => $revision_key],
+        ]
+      ],
+    ];
 
     $this->addTableDefaults($schema);
 
@@ -980,12 +1007,12 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    *   The schema definition array for a single table, passed by reference.
    */
   protected function addTableDefaults(&$schema) {
-    $schema += array(
-      'fields' => array(),
-      'unique keys' => array(),
-      'indexes' => array(),
-      'foreign keys' => array(),
-    );
+    $schema += [
+      'fields' => [],
+      'unique keys' => [],
+      'indexes' => [],
+      'foreign keys' => [],
+    ];
   }
 
   /**
@@ -1130,7 +1157,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
 
     // Iterate over the mapped table to find the ones that will host the created
     // field schema.
-    $schema = array();
+    $schema = [];
     foreach ($shared_table_names as $table_name) {
       foreach ($table_mapping->getFieldNames($table_name) as $field_name) {
         if ($field_name == $created_field_name) {
@@ -1271,7 +1298,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
       }
       catch (\Exception $e) {
         if ($this->database->supportsTransactionalDDL()) {
-          $transaction->rollback();
+          $transaction->rollBack();
         }
         else {
           // Recreate tables.
@@ -1310,15 +1337,15 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
       foreach ($schema['indexes'] as $name => $columns) {
         if (!isset($original_schema['indexes'][$name]) || $columns != $original_schema['indexes'][$name]) {
           $real_name = $this->getFieldIndexName($storage_definition, $name);
-          $real_columns = array();
+          $real_columns = [];
           foreach ($columns as $column_name) {
             // Indexes can be specified as either a column name or an array with
             // column name and length. Allow for either case.
             if (is_array($column_name)) {
-              $real_columns[] = array(
+              $real_columns[] = [
                 $table_mapping->getFieldColumnName($storage_definition, $column_name[0]),
                 $column_name[1],
-              );
+              ];
             }
             else {
               $real_columns[] = $table_mapping->getFieldColumnName($storage_definition, $column_name);
@@ -1362,7 +1389,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
       }
       catch (\Exception $e) {
         if ($this->database->supportsTransactionalDDL()) {
-          $transaction->rollback();
+          $transaction->rollBack();
         }
         else {
           // Recreate original schema.
@@ -1384,7 +1411,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
       // Iterate over the mapped table to find the ones that host the deleted
       // field schema.
       $original_schema = $this->loadFieldSchemaData($original);
-      $schema = array();
+      $schema = [];
       foreach ($table_mapping->getTableNames() as $table_name) {
         foreach ($table_mapping->getFieldNames($table_name) as $field_name) {
           if ($field_name == $updated_field_name) {
@@ -1579,7 +1606,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    *   Exception thrown if the schema contains reserved column names.
    */
   protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $storage_definition, $table_name, array $column_mapping) {
-    $schema = array();
+    $schema = [];
     $field_schema = $storage_definition->getSchema();
 
     // Check that the schema does not include forbidden column names.
@@ -1651,7 +1678,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
   protected function addSharedTableFieldIndex(FieldStorageDefinitionInterface $storage_definition, &$schema, $not_null = FALSE, $size = NULL) {
     $name = $storage_definition->getName();
     $real_key = $this->getFieldSchemaIdentifierName($storage_definition->getTargetEntityTypeId(), $name);
-    $schema['indexes'][$real_key] = array($size ? array($name, $size) : $name);
+    $schema['indexes'][$real_key] = [$size ? [$name, $size] : $name];
     if ($not_null) {
       $schema['fields'][$name]['not null'] = TRUE;
     }
@@ -1671,7 +1698,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
   protected function addSharedTableFieldUniqueKey(FieldStorageDefinitionInterface $storage_definition, &$schema) {
     $name = $storage_definition->getName();
     $real_key = $this->getFieldSchemaIdentifierName($storage_definition->getTargetEntityTypeId(), $name);
-    $schema['unique keys'][$real_key] = array($name);
+    $schema['unique keys'][$real_key] = [$name];
     $schema['fields'][$name]['not null'] = TRUE;
   }
 
@@ -1690,10 +1717,10 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
   protected function addSharedTableFieldForeignKey(FieldStorageDefinitionInterface $storage_definition, &$schema, $foreign_table, $foreign_column) {
     $name = $storage_definition->getName();
     $real_key = $this->getFieldSchemaIdentifierName($storage_definition->getTargetEntityTypeId(), $name);
-    $schema['foreign keys'][$real_key] = array(
+    $schema['foreign keys'][$real_key] = [
       'table' => $foreign_table,
-      'columns' => array($name => $foreign_column),
-    );
+      'columns' => [$name => $foreign_column],
+    ];
   }
 
   /**
@@ -1723,20 +1750,20 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
 
     $id_definition = $this->fieldStorageDefinitions[$this->entityType->getKey('id')];
     if ($id_definition->getType() == 'integer') {
-      $id_schema = array(
+      $id_schema = [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'description' => 'The entity id this data is attached to',
-      );
+      ];
     }
     else {
-      $id_schema = array(
+      $id_schema = [
         'type' => 'varchar_ascii',
         'length' => 128,
         'not null' => TRUE,
         'description' => 'The entity id this data is attached to',
-      );
+      ];
     }
 
     // Define the revision ID schema.
@@ -1745,61 +1772,61 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
       $revision_id_schema['description'] = 'The entity revision id this data is attached to, which for an unversioned entity type is the same as the entity id';
     }
     elseif ($this->fieldStorageDefinitions[$this->entityType->getKey('revision')]->getType() == 'integer') {
-      $revision_id_schema = array(
+      $revision_id_schema = [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'description' => 'The entity revision id this data is attached to',
-      );
+      ];
     }
     else {
-      $revision_id_schema = array(
+      $revision_id_schema = [
         'type' => 'varchar',
         'length' => 128,
         'not null' => TRUE,
         'description' => 'The entity revision id this data is attached to',
-      );
+      ];
     }
 
-    $data_schema = array(
+    $data_schema = [
       'description' => $description_current,
-      'fields' => array(
-        'bundle' => array(
+      'fields' => [
+        'bundle' => [
           'type' => 'varchar_ascii',
           'length' => 128,
           'not null' => TRUE,
           'default' => '',
           'description' => 'The field instance bundle to which this row belongs, used when deleting a field instance',
-        ),
-        'deleted' => array(
+        ],
+        'deleted' => [
           'type' => 'int',
           'size' => 'tiny',
           'not null' => TRUE,
           'default' => 0,
           'description' => 'A boolean indicating whether this data item has been deleted'
-        ),
+        ],
         'entity_id' => $id_schema,
         'revision_id' => $revision_id_schema,
-        'langcode' => array(
+        'langcode' => [
           'type' => 'varchar_ascii',
           'length' => 32,
           'not null' => TRUE,
           'default' => '',
           'description' => 'The language code for this data item.',
-        ),
-        'delta' => array(
+        ],
+        'delta' => [
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'description' => 'The sequence number for this data item, used for multi-value fields',
-        ),
-      ),
-      'primary key' => array('entity_id', 'deleted', 'delta', 'langcode'),
-      'indexes' => array(
-        'bundle' => array('bundle'),
-        'revision_id' => array('revision_id'),
-      ),
-    );
+        ],
+      ],
+      'primary key' => ['entity_id', 'deleted', 'delta', 'langcode'],
+      'indexes' => [
+        'bundle' => ['bundle'],
+        'revision_id' => ['revision_id'],
+      ],
+    ];
 
     // Check that the schema does not include forbidden column names.
     $schema = $storage_definition->getSchema();
@@ -1826,10 +1853,10 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
         // Indexes can be specified as either a column name or an array with
         // column name and length. Allow for either case.
         if (is_array($column_name)) {
-          $data_schema['indexes'][$real_name][] = array(
+          $data_schema['indexes'][$real_name][] = [
             $table_mapping->getFieldColumnName($storage_definition, $column_name[0]),
             $column_name[1],
-          );
+          ];
         }
         else {
           $data_schema['indexes'][$real_name][] = $table_mapping->getFieldColumnName($storage_definition, $column_name);
@@ -1844,10 +1871,10 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
         // Unique keys can be specified as either a column name or an array with
         // column name and length. Allow for either case.
         if (is_array($column_name)) {
-          $data_schema['unique keys'][$real_name][] = array(
+          $data_schema['unique keys'][$real_name][] = [
             $table_mapping->getFieldColumnName($storage_definition, $column_name[0]),
             $column_name[1],
-          );
+          ];
         }
         else {
           $data_schema['unique keys'][$real_name][] = $table_mapping->getFieldColumnName($storage_definition, $column_name);
@@ -1865,17 +1892,17 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
       }
     }
 
-    $dedicated_table_schema = array($table_mapping->getDedicatedDataTableName($storage_definition) => $data_schema);
+    $dedicated_table_schema = [$table_mapping->getDedicatedDataTableName($storage_definition) => $data_schema];
 
     // If the entity type is revisionable, construct the revision table.
     $entity_type = $entity_type ?: $this->entityType;
     if ($entity_type->isRevisionable()) {
       $revision_schema = $data_schema;
       $revision_schema['description'] = $description_revision;
-      $revision_schema['primary key'] = array('entity_id', 'revision_id', 'deleted', 'delta', 'langcode');
+      $revision_schema['primary key'] = ['entity_id', 'revision_id', 'deleted', 'delta', 'langcode'];
       $revision_schema['fields']['revision_id']['not null'] = TRUE;
       $revision_schema['fields']['revision_id']['description'] = 'The entity revision id this data is attached to';
-      $dedicated_table_schema += array($table_mapping->getDedicatedRevisionTableName($storage_definition) => $revision_schema);
+      $dedicated_table_schema += [$table_mapping->getDedicatedRevisionTableName($storage_definition) => $revision_schema];
     }
 
     return $dedicated_table_schema;
diff --git a/web/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinition.php b/web/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinition.php
index 12e7f8d78..be6405af4 100644
--- a/web/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinition.php
+++ b/web/core/lib/Drupal/Core/Entity/TypedData/EntityDataDefinition.php
@@ -19,7 +19,7 @@ class EntityDataDefinition extends ComplexDataDefinitionBase implements EntityDa
    * @return static
    */
   public static function create($entity_type_id = NULL) {
-    $definition = new static(array());
+    $definition = new static([]);
     // Set the passed entity type.
     if (isset($entity_type_id)) {
       $definition->setEntityTypeId($entity_type_id);
@@ -41,7 +41,7 @@ class EntityDataDefinition extends ComplexDataDefinitionBase implements EntityDa
       $definition->setEntityTypeId($parts[1]);
     }
     if (isset($parts[2])) {
-      $definition->setBundles(array($parts[2]));
+      $definition->setBundles([$parts[2]]);
     }
     return $definition;
   }
@@ -55,7 +55,7 @@ class EntityDataDefinition extends ComplexDataDefinitionBase implements EntityDa
         // Return an empty array for entities that are not content entities.
         $entity_type_class = \Drupal::entityManager()->getDefinition($entity_type_id)->getClass();
         if (!in_array('Drupal\Core\Entity\FieldableEntityInterface', class_implements($entity_type_class))) {
-          $this->propertyDefinitions = array();
+          $this->propertyDefinitions = [];
         }
         else {
           // @todo: Add support for handling multiple bundles.
@@ -71,7 +71,7 @@ class EntityDataDefinition extends ComplexDataDefinitionBase implements EntityDa
       }
       else {
         // No entity type given.
-        $this->propertyDefinitions = array();
+        $this->propertyDefinitions = [];
       }
     }
     return $this->propertyDefinitions;
@@ -115,7 +115,7 @@ class EntityDataDefinition extends ComplexDataDefinitionBase implements EntityDa
    */
   public function getBundles() {
     $bundle = isset($this->definition['constraints']['Bundle']) ? $this->definition['constraints']['Bundle'] : NULL;
-    return is_string($bundle) ? array($bundle) : $bundle;
+    return is_string($bundle) ? [$bundle] : $bundle;
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Entity/entity.api.php b/web/core/lib/Drupal/Core/Entity/entity.api.php
index 85e205aac..f9f4271e3 100644
--- a/web/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/web/core/lib/Drupal/Core/Entity/entity.api.php
@@ -452,19 +452,16 @@ use Drupal\node\Entity\NodeType;
  * // Simple query:
  * $query = \Drupal::entityQuery('your_entity_type');
  * // Or, if you have a $container variable:
- * $query_service = $container->get('entity.query');
- * $query = $query_service->get('your_entity_type');
+ * $storage = $container->get('entity_type.manager')->getStorage('your_entity_type');
+ * $query = $storage->getQuery();
  * @endcode
  * If you need aggregation, there is an aggregate query available, which
  * implements \Drupal\Core\Entity\Query\QueryAggregateInterface:
  * @code
  * $query \Drupal::entityQueryAggregate('your_entity_type');
  * // Or:
- * $query = $query_service->getAggregate('your_entity_type');
+ * $query = $storage->getAggregateQuery('your_entity_type');
  * @endcode
- * Also, you should use dependency injection to get this object if
- * possible; the service you need is entity.query, and its methods getQuery()
- * or getAggregateQuery() will get the query object.
  *
  * In either case, you can then add conditions to your query, using methods
  * like condition(), exists(), etc. on $query; add sorting, pager, and range
@@ -942,12 +939,12 @@ function hook_ENTITY_TYPE_presave(Drupal\Core\Entity\EntityInterface $entity) {
 function hook_entity_insert(Drupal\Core\Entity\EntityInterface $entity) {
   // Insert the new entity into a fictional table of all entities.
   db_insert('example_entity')
-    ->fields(array(
+    ->fields([
       'type' => $entity->getEntityTypeId(),
       'id' => $entity->id(),
       'created' => REQUEST_TIME,
       'updated' => REQUEST_TIME,
-    ))
+    ])
     ->execute();
 }
 
@@ -966,11 +963,11 @@ function hook_entity_insert(Drupal\Core\Entity\EntityInterface $entity) {
 function hook_ENTITY_TYPE_insert(Drupal\Core\Entity\EntityInterface $entity) {
   // Insert the new entity into a fictional table of this type of entity.
   db_insert('example_entity')
-    ->fields(array(
+    ->fields([
       'id' => $entity->id(),
       'created' => REQUEST_TIME,
       'updated' => REQUEST_TIME,
-    ))
+    ])
     ->execute();
 }
 
@@ -990,9 +987,9 @@ function hook_ENTITY_TYPE_insert(Drupal\Core\Entity\EntityInterface $entity) {
 function hook_entity_update(Drupal\Core\Entity\EntityInterface $entity) {
   // Update the entity's entry in a fictional table of all entities.
   db_update('example_entity')
-    ->fields(array(
+    ->fields([
       'updated' => REQUEST_TIME,
-    ))
+    ])
     ->condition('type', $entity->getEntityTypeId())
     ->condition('id', $entity->id())
     ->execute();
@@ -1014,9 +1011,9 @@ function hook_entity_update(Drupal\Core\Entity\EntityInterface $entity) {
 function hook_ENTITY_TYPE_update(Drupal\Core\Entity\EntityInterface $entity) {
   // Update the entity's entry in a fictional table of this type of entity.
   db_update('example_entity')
-    ->fields(array(
+    ->fields([
       'updated' => REQUEST_TIME,
-    ))
+    ])
     ->condition('id', $entity->id())
     ->execute();
 }
@@ -1066,10 +1063,10 @@ function hook_ENTITY_TYPE_translation_create(\Drupal\Core\Entity\EntityInterface
  * @see hook_ENTITY_TYPE_translation_insert()
  */
 function hook_entity_translation_insert(\Drupal\Core\Entity\EntityInterface $translation) {
-  $variables = array(
+  $variables = [
     '@language' => $translation->language()->getName(),
     '@label' => $translation->getUntranslated()->label(),
-  );
+  ];
   \Drupal::logger('example')->notice('The @language translation of @label has just been stored.', $variables);
 }
 
@@ -1086,10 +1083,10 @@ function hook_entity_translation_insert(\Drupal\Core\Entity\EntityInterface $tra
  * @see hook_entity_translation_insert()
  */
 function hook_ENTITY_TYPE_translation_insert(\Drupal\Core\Entity\EntityInterface $translation) {
-  $variables = array(
+  $variables = [
     '@language' => $translation->language()->getName(),
     '@label' => $translation->getUntranslated()->label(),
-  );
+  ];
   \Drupal::logger('example')->notice('The @language translation of @label has just been stored.', $variables);
 }
 
@@ -1105,10 +1102,10 @@ function hook_ENTITY_TYPE_translation_insert(\Drupal\Core\Entity\EntityInterface
  * @see hook_ENTITY_TYPE_translation_delete()
  */
 function hook_entity_translation_delete(\Drupal\Core\Entity\EntityInterface $translation) {
-  $variables = array(
+  $variables = [
     '@language' => $translation->language()->getName(),
     '@label' => $translation->label(),
-  );
+  ];
   \Drupal::logger('example')->notice('The @language translation of @label has just been deleted.', $variables);
 }
 
@@ -1124,10 +1121,10 @@ function hook_entity_translation_delete(\Drupal\Core\Entity\EntityInterface $tra
  * @see hook_entity_translation_delete()
  */
 function hook_ENTITY_TYPE_translation_delete(\Drupal\Core\Entity\EntityInterface $translation) {
-  $variables = array(
+  $variables = [
     '@language' => $translation->language()->getName(),
     '@label' => $translation->label(),
-  );
+  ];
   \Drupal::logger('example')->notice('The @language translation of @label has just been deleted.', $variables);
 }
 
@@ -1154,8 +1151,8 @@ function hook_entity_predelete(Drupal\Core\Entity\EntityInterface $entity) {
 
   // Log the count in a table that records this statistic for deleted entities.
   db_merge('example_deleted_entity_statistics')
-    ->key(array('type' => $type, 'id' => $id))
-    ->fields(array('count' => $count))
+    ->key(['type' => $type, 'id' => $id])
+    ->fields(['count' => $count])
     ->execute();
 }
 
@@ -1182,8 +1179,8 @@ function hook_ENTITY_TYPE_predelete(Drupal\Core\Entity\EntityInterface $entity)
 
   // Log the count in a table that records this statistic for deleted entities.
   db_merge('example_deleted_entity_statistics')
-    ->key(array('type' => $type, 'id' => $id))
-    ->fields(array('count' => $count))
+    ->key(['type' => $type, 'id' => $id])
+    ->fields(['count' => $count])
     ->execute();
 }
 
@@ -1286,10 +1283,10 @@ function hook_entity_view(array &$build, \Drupal\Core\Entity\EntityInterface $en
   // This assumes a 'mymodule_addition' extra field has been defined for the
   // entity bundle in hook_entity_extra_field_info().
   if ($display->getComponent('mymodule_addition')) {
-    $build['mymodule_addition'] = array(
+    $build['mymodule_addition'] = [
       '#markup' => mymodule_addition($entity),
       '#theme' => 'mymodule_my_additional_field',
-    );
+    ];
   }
 }
 
@@ -1318,10 +1315,10 @@ function hook_ENTITY_TYPE_view(array &$build, \Drupal\Core\Entity\EntityInterfac
   // This assumes a 'mymodule_addition' extra field has been defined for the
   // entity bundle in hook_entity_extra_field_info().
   if ($display->getComponent('mymodule_addition')) {
-    $build['mymodule_addition'] = array(
+    $build['mymodule_addition'] = [
       '#markup' => mymodule_addition($entity),
       '#theme' => 'mymodule_my_additional_field',
-    );
+    ];
   }
 }
 
@@ -1426,7 +1423,7 @@ function hook_entity_prepare_view($entity_type_id, array $entities, array $displ
     // Only do the extra work if the component is configured to be
     // displayed. This assumes a 'mymodule_addition' extra field has been
     // defined for the entity bundle in hook_entity_extra_field_info().
-    $ids = array();
+    $ids = [];
     foreach ($entities as $id => $entity) {
       if ($displays[$entity->bundle()]->getComponent('mymodule_addition')) {
         $ids[] = $id;
@@ -1637,9 +1634,9 @@ function hook_ENTITY_TYPE_prepare_form(\Drupal\Core\Entity\EntityInterface $enti
 function hook_entity_form_display_alter(\Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display, array $context) {
   // Hide the 'user_picture' field from the register form.
   if ($context['entity_type'] == 'user' && $context['form_mode'] == 'register') {
-    $form_display->setComponent('user_picture', array(
-      'type' => 'hidden',
-    ));
+    $form_display->setComponent('user_picture', [
+      'region' => 'hidden',
+    ]);
   }
 }
 
@@ -1660,7 +1657,7 @@ function hook_entity_form_display_alter(\Drupal\Core\Entity\Display\EntityFormDi
  */
 function hook_entity_base_field_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type) {
   if ($entity_type->id() == 'node') {
-    $fields = array();
+    $fields = [];
     $fields['mymodule_text'] = BaseFieldDefinition::create('string')
       ->setLabel(t('The text'))
       ->setDescription(t('A text property added by mymodule.'))
@@ -1724,11 +1721,11 @@ function hook_entity_base_field_info_alter(&$fields, \Drupal\Core\Entity\EntityT
 function hook_entity_bundle_field_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
   // Add a property only to nodes of the 'article' bundle.
   if ($entity_type->id() == 'node' && $bundle == 'article') {
-    $fields = array();
+    $fields = [];
     $fields['mymodule_text_more'] = BaseFieldDefinition::create('string')
-        ->setLabel(t('More text'))
-        ->setComputed(TRUE)
-        ->setClass('\Drupal\mymodule\EntityComputedMoreText');
+      ->setLabel(t('More text'))
+      ->setComputed(TRUE)
+      ->setClass('\Drupal\mymodule\EntityComputedMoreText');
     return $fields;
   }
 }
@@ -1779,7 +1776,7 @@ function hook_entity_field_storage_info(\Drupal\Core\Entity\EntityTypeInterface
       ->execute();
     // Fetch all fields and key them by field name.
     $field_storages = FieldStorageConfig::loadMultiple($ids);
-    $result = array();
+    $result = [];
     foreach ($field_storages as $field_storage) {
       $result[$field_storage->getName()] = $field_storage;
     }
@@ -1818,12 +1815,12 @@ function hook_entity_field_storage_info_alter(&$fields, \Drupal\Core\Entity\Enti
  * @see \Drupal\Core\Entity\EntityListBuilderInterface::getOperations()
  */
 function hook_entity_operation(\Drupal\Core\Entity\EntityInterface $entity) {
-  $operations = array();
-  $operations['translate'] = array(
+  $operations = [];
+  $operations['translate'] = [
     'title' => t('Translate'),
     'url' => \Drupal\Core\Url::fromRoute('foo_module.entity.translate'),
     'weight' => 50,
-  );
+  ];
 
   return $operations;
 }
@@ -1839,9 +1836,9 @@ function hook_entity_operation(\Drupal\Core\Entity\EntityInterface $entity) {
  */
 function hook_entity_operation_alter(array &$operations, \Drupal\Core\Entity\EntityInterface $entity) {
   // Alter the title and weight.
-  $operations['translate']['title'] = t('Translate @entity_type', array(
+  $operations['translate']['title'] = t('Translate @entity_type', [
     '@entity_type' => $entity->getEntityTypeId(),
-  ));
+  ]);
   $operations['translate']['weight'] = 99;
 }
 
@@ -1967,7 +1964,7 @@ function hook_ENTITY_TYPE_field_values_init(\Drupal\Core\Entity\FieldableEntityI
  *   \Drupal\Core\Entity\EntityFieldManagerInterface::getExtraFields().
  */
 function hook_entity_extra_field_info() {
-  $extra = array();
+  $extra = [];
   $module_language_enabled = \Drupal::moduleHandler()->moduleExists('language');
   $description = t('Node module element');
 
@@ -1980,19 +1977,19 @@ function hook_entity_extra_field_info() {
     if ($module_language_enabled) {
       $configuration = ContentLanguageSettings::loadByEntityTypeBundle('node', $bundle->id());
       if ($configuration->isLanguageAlterable()) {
-        $extra['node'][$bundle->id()]['form']['language'] = array(
+        $extra['node'][$bundle->id()]['form']['language'] = [
           'label' => t('Language'),
           'description' => $description,
           'weight' => 0,
-        );
+        ];
       }
     }
-    $extra['node'][$bundle->id()]['display']['language'] = array(
+    $extra['node'][$bundle->id()]['display']['language'] = [
       'label' => t('Language'),
       'description' => $description,
       'weight' => 0,
       'visible' => FALSE,
-    );
+    ];
   }
 
   return $extra;
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php b/web/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php
index d644fa531..61309c64d 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php
@@ -36,7 +36,7 @@ class AcceptNegotiation406 implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
+  public static function getSubscribedEvents() {
     $events[KernelEvents::VIEW][] = ['onViewDetect406', -10];
 
     return $events;
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php b/web/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php
index 2f965e1c8..ea8bff10d 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ActiveLinkResponseFilter.php
@@ -103,7 +103,7 @@ class ActiveLinkResponseFilter implements EventSubscriberInterface {
    *
    * This is a PHP implementation of the drupal.active-link JavaScript library.
    *
-   * @param string $html_markup.
+   * @param string $html_markup
    *   The HTML markup to update.
    * @param string $current_path
    *   The system path of the currently active page.
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/AjaxResponseSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/AjaxResponseSubscriber.php
index e2ffc058e..701c43373 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/AjaxResponseSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/AjaxResponseSubscriber.php
@@ -110,8 +110,8 @@ class AjaxResponseSubscriber implements EventSubscriberInterface {
    * {@inheritdoc}
    */
   public static function getSubscribedEvents() {
-    $events[KernelEvents::RESPONSE][] = array('onResponse', -100);
-    $events[KernelEvents::REQUEST][] = array('onRequest', 50);
+    $events[KernelEvents::RESPONSE][] = ['onResponse', -100];
+    $events[KernelEvents::REQUEST][] = ['onRequest', 50];
 
     return $events;
   }
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/AuthenticationSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/AuthenticationSubscriber.php
index 62f5486cf..be3f55e4a 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/AuthenticationSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/AuthenticationSubscriber.php
@@ -96,7 +96,7 @@ class AuthenticationSubscriber implements EventSubscriberInterface {
     if (isset($this->filter) && $event->getRequestType() === HttpKernelInterface::MASTER_REQUEST) {
       $request = $event->getRequest();
       if ($this->authenticationProvider->applies($request) && !$this->filter->appliesToRoutedRequest($request, TRUE)) {
-        throw new AccessDeniedHttpException();
+        throw new AccessDeniedHttpException('The used authentication method is not allowed on this route.');
       }
     }
   }
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/CacheRouterRebuildSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/CacheRouterRebuildSubscriber.php
index 38007f560..c1f532799 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/CacheRouterRebuildSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/CacheRouterRebuildSubscriber.php
@@ -16,8 +16,8 @@ class CacheRouterRebuildSubscriber implements EventSubscriberInterface {
    */
   public function onRouterFinished() {
     // Requested URLs that formerly gave a 403/404 may now be valid.
-    // Also invalidate all cached routing.
-    Cache::invalidateTags(['4xx-response', 'route_match']);
+    // Also invalidate all cached routing as well as every HTTP response.
+    Cache::invalidateTags(['4xx-response', 'route_match', 'http_response']);
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
index ad2eb5e04..e948aa584 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
@@ -8,7 +8,6 @@ use Drupal\Core\Config\ConfigImporterEvent;
 use Drupal\Core\Config\ConfigImportValidateEventSubscriberBase;
 use Drupal\Core\Config\ConfigNameException;
 use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Core\Site\Settings;
 
 /**
  * Config import subscriber for config import events.
@@ -55,13 +54,13 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
    * @throws \Drupal\Core\Config\ConfigNameException
    */
   public function onConfigImporterValidate(ConfigImporterEvent $event) {
-    foreach (array('delete', 'create', 'update') as $op) {
+    foreach (['delete', 'create', 'update'] as $op) {
       foreach ($event->getConfigImporter()->getUnprocessedConfiguration($op) as $name) {
         try {
           Config::validateName($name);
         }
         catch (ConfigNameException $e) {
-          $message = $this->t('The config name @config_name is invalid.', array('@config_name' => $name));
+          $message = $this->t('The config name @config_name is invalid.', ['@config_name' => $name]);
           $event->getConfigImporter()->logError($message);
         }
       }
@@ -89,7 +88,7 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
     $module_data = $this->getModuleData();
     $nonexistent_modules = array_keys(array_diff_key($core_extension['module'], $module_data));
     foreach ($nonexistent_modules as $module) {
-      $config_importer->logError($this->t('Unable to install the %module module since it does not exist.', array('%module' => $module)));
+      $config_importer->logError($this->t('Unable to install the %module module since it does not exist.', ['%module' => $module]));
     }
 
     // Ensure that all modules being installed have their dependencies met.
@@ -106,15 +105,16 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
         $message = $this->formatPlural(count($missing_dependencies),
           'Unable to install the %module module since it requires the %required_module module.',
           'Unable to install the %module module since it requires the %required_module modules.',
-          array('%module' => $module_name, '%required_module' => implode(', ', $missing_dependencies))
+          ['%module' => $module_name, '%required_module' => implode(', ', $missing_dependencies)]
         );
         $config_importer->logError($message);
       }
     }
 
-    // Settings is safe to use because settings.php is written before any module
-    // is installed.
-    $install_profile = Settings::get('install_profile');
+    // Get the install profile from the site's configuration.
+    $current_core_extension = $config_importer->getStorageComparer()->getTargetStorage()->read('core.extension');
+    $install_profile = isset($current_core_extension['profile']) ? $current_core_extension['profile'] : NULL;
+
     // Ensure that all modules being uninstalled are not required by modules
     // that will be installed after the import.
     $uninstalls = $config_importer->getExtensionChangelist('module', 'uninstall');
@@ -123,15 +123,20 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
         if ($module_data[$dependent_module]->status && !in_array($dependent_module, $uninstalls, TRUE) && $dependent_module !== $install_profile) {
           $module_name = $module_data[$module]->info['name'];
           $dependent_module_name = $module_data[$dependent_module]->info['name'];
-          $config_importer->logError($this->t('Unable to uninstall the %module module since the %dependent_module module is installed.', array('%module' => $module_name, '%dependent_module' => $dependent_module_name)));
+          $config_importer->logError($this->t('Unable to uninstall the %module module since the %dependent_module module is installed.', ['%module' => $module_name, '%dependent_module' => $dependent_module_name]));
         }
       }
     }
 
     // Ensure that the install profile is not being uninstalled.
-    if (in_array($install_profile, $uninstalls)) {
+    if (in_array($install_profile, $uninstalls, TRUE)) {
       $profile_name = $module_data[$install_profile]->info['name'];
-      $config_importer->logError($this->t('Unable to uninstall the %profile profile since it is the install profile.', array('%profile' => $profile_name)));
+      $config_importer->logError($this->t('Unable to uninstall the %profile profile since it is the install profile.', ['%profile' => $profile_name]));
+    }
+
+    // Ensure the profile is not changing.
+    if ($install_profile !== $core_extension['profile']) {
+      $config_importer->logError($this->t('Cannot change the install profile from %new_profile to %profile once Drupal is installed.', ['%profile' => $install_profile, '%new_profile' => $core_extension['profile']]));
     }
   }
 
@@ -148,7 +153,7 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
     $installs = $config_importer->getExtensionChangelist('theme', 'install');
     foreach ($installs as $key => $theme) {
       if (!isset($theme_data[$theme])) {
-        $config_importer->logError($this->t('Unable to install the %theme theme since it does not exist.', array('%theme' => $theme)));
+        $config_importer->logError($this->t('Unable to install the %theme theme since it does not exist.', ['%theme' => $theme]));
         // Remove non-existing installs from the list so we can validate theme
         // dependencies later.
         unset($installs[$key]);
@@ -161,7 +166,7 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
         if (!isset($core_extension['theme'][$required_theme])) {
           $theme_name = $theme_data[$theme]->info['name'];
           $required_theme_name = $theme_data[$required_theme]->info['name'];
-          $config_importer->logError($this->t('Unable to install the %theme theme since it requires the %required_theme theme.', array('%theme' => $theme_name, '%required_theme' => $required_theme_name)));
+          $config_importer->logError($this->t('Unable to install the %theme theme since it requires the %required_theme theme.', ['%theme' => $theme_name, '%required_theme' => $required_theme_name]));
         }
       }
     }
@@ -174,7 +179,7 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
         if ($theme_data[$dependent_theme]->status && !in_array($dependent_theme, $uninstalls, TRUE)) {
           $theme_name = $theme_data[$theme]->info['name'];
           $dependent_theme_name = $theme_data[$dependent_theme]->info['name'];
-          $config_importer->logError($this->t('Unable to uninstall the %theme theme since the %dependent_theme theme is installed.', array('%theme' => $theme_name, '%dependent_theme' => $dependent_theme_name)));
+          $config_importer->logError($this->t('Unable to uninstall the %theme theme since the %dependent_theme theme is installed.', ['%theme' => $theme_name, '%dependent_theme' => $dependent_theme_name]));
         }
       }
     }
@@ -207,22 +212,22 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
       if ($owner !== 'core') {
         $message = FALSE;
         if (!isset($core_extension['module'][$owner]) && isset($module_data[$owner])) {
-          $message = $this->t('Configuration %name depends on the %owner module that will not be installed after import.', array(
+          $message = $this->t('Configuration %name depends on the %owner module that will not be installed after import.', [
             '%name' => $name,
             '%owner' => $module_data[$owner]->info['name']
-          ));
+          ]);
         }
         elseif (!isset($core_extension['theme'][$owner]) && isset($theme_data[$owner])) {
-          $message = $this->t('Configuration %name depends on the %owner theme that will not be installed after import.', array(
+          $message = $this->t('Configuration %name depends on the %owner theme that will not be installed after import.', [
             '%name' => $name,
             '%owner' => $theme_data[$owner]->info['name']
-          ));
+          ]);
         }
         elseif (!isset($core_extension['module'][$owner]) && !isset($core_extension['theme'][$owner])) {
-          $message = $this->t('Configuration %name depends on the %owner extension that will not be installed after import.', array(
+          $message = $this->t('Configuration %name depends on the %owner extension that will not be installed after import.', [
             '%name' => $name,
             '%owner' => $owner
-          ));
+          ]);
         }
 
         if ($message) {
@@ -249,7 +254,7 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
                   count($diffs),
                   'Configuration %name depends on the %module module that will not be installed after import.',
                   'Configuration %name depends on modules (%module) that will not be installed after import.',
-                  array('%name' => $name, '%module' => implode(', ', $this->getNames($diffs, $module_data)))
+                  ['%name' => $name, '%module' => implode(', ', $this->getNames($diffs, $module_data))]
                 );
                 break;
               case 'theme':
@@ -257,7 +262,7 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
                   count($diffs),
                   'Configuration %name depends on the %theme theme that will not be installed after import.',
                   'Configuration %name depends on themes (%theme) that will not be installed after import.',
-                  array('%name' => $name, '%theme' => implode(', ', $this->getNames($diffs, $theme_data)))
+                  ['%name' => $name, '%theme' => implode(', ', $this->getNames($diffs, $theme_data))]
                 );
                 break;
               case 'config':
@@ -265,7 +270,7 @@ class ConfigImportSubscriber extends ConfigImportValidateEventSubscriberBase {
                   count($diffs),
                   'Configuration %name depends on the %config configuration that will not exist after import.',
                   'Configuration %name depends on configuration (%config) that will not exist after import.',
-                  array('%name' => $name, '%config' => implode(', ', $diffs))
+                  ['%name' => $name, '%config' => implode(', ', $diffs)]
                 );
                 break;
             }
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ConfigSnapshotSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ConfigSnapshotSubscriber.php
index e20e52f57..289eae09d 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/ConfigSnapshotSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ConfigSnapshotSubscriber.php
@@ -64,8 +64,8 @@ class ConfigSnapshotSubscriber implements EventSubscriberInterface {
    * @return array
    *   An array of event listener definitions.
    */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::IMPORT][] = array('onConfigImporterImport', 40);
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::IMPORT][] = ['onConfigImporterImport', 40];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/EnforcedFormResponseSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/EnforcedFormResponseSubscriber.php
index fc491af53..351642617 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/EnforcedFormResponseSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/EnforcedFormResponseSubscriber.php
@@ -39,8 +39,8 @@ class EnforcedFormResponseSubscriber implements EventSubscriberInterface {
    * {@inheritdoc}
    */
   public static function getSubscribedEvents() {
-    $events[KernelEvents::EXCEPTION] = array('onKernelException', 128);
-    $events[KernelEvents::RESPONSE] = array('onKernelResponse', 128);
+    $events[KernelEvents::EXCEPTION] = ['onKernelException', 128];
+    $events[KernelEvents::RESPONSE] = ['onKernelResponse', 128];
 
     return $events;
   }
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php
index 3c37195ca..bca8f684b 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/EntityRouteAlterSubscriber.php
@@ -52,8 +52,8 @@ class EntityRouteAlterSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[RoutingEvents::ALTER][] = array('onRoutingRouteAlterSetType', -150);
+  public static function getSubscribedEvents() {
+    $events[RoutingEvents::ALTER][] = ['onRoutingRouteAlterSetType', -150];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ExceptionDetectNeedsInstallSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ExceptionDetectNeedsInstallSubscriber.php
new file mode 100644
index 000000000..9b974f28e
--- /dev/null
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ExceptionDetectNeedsInstallSubscriber.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\Core\EventSubscriber;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Installer\InstallerRedirectTrait;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Exception handler to determine if an exception indicates an uninstalled site.
+ */
+class ExceptionDetectNeedsInstallSubscriber implements EventSubscriberInterface {
+  use InstallerRedirectTrait;
+
+  /**
+   * The default database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $connection;
+
+  /**
+   * Constructs a new ExceptionDetectNeedsInstallSubscriber.
+   *
+   * @param \Drupal\Core\Database\Connection $connection
+   *   The default database connection.
+   */
+  public function __construct(Connection $connection) {
+    $this->connection = $connection;
+  }
+
+  /**
+   * Handles errors for this subscriber.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
+   *   The event to process.
+   */
+  public function onException(GetResponseForExceptionEvent $event) {
+    $exception = $event->getException();
+    if ($this->shouldRedirectToInstaller($exception, $this->connection)) {
+      // Only redirect if this is an HTML response (i.e., a user trying to view
+      // the site in a web browser before installing it).
+      $request = $event->getRequest();
+      $format = $request->query->get(MainContentViewSubscriber::WRAPPER_FORMAT, $request->getRequestFormat());
+      if ($format == 'html') {
+        $event->setResponse(new RedirectResponse($request->getBasePath() . '/core/install.php', 302, ['Cache-Control' => 'no-cache']));
+      }
+    }
+  }
+
+  /**
+   * Registers the methods in this class that should be listeners.
+   *
+   * @return array
+   *   An array of event listener definitions.
+   */
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::EXCEPTION][] = ['onException', 100];
+    return $events;
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ExceptionJsonSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ExceptionJsonSubscriber.php
index 2853b9876..76cc55ee3 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/ExceptionJsonSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ExceptionJsonSubscriber.php
@@ -3,7 +3,6 @@
 namespace Drupal\Core\EventSubscriber;
 
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 
 /**
@@ -28,68 +27,15 @@ class ExceptionJsonSubscriber extends HttpExceptionSubscriberBase {
   }
 
   /**
-   * Handles a 400 error for JSON.
+   * Handles all 4xx errors for JSON.
    *
    * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
    *   The event to process.
    */
-  public function on400(GetResponseForExceptionEvent $event) {
-    $response = new JsonResponse(array('message' => $event->getException()->getMessage()), Response::HTTP_BAD_REQUEST);
-    $event->setResponse($response);
-  }
-
-  /**
-   * Handles a 403 error for JSON.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on403(GetResponseForExceptionEvent $event) {
-    $response = new JsonResponse(array('message' => $event->getException()->getMessage()), Response::HTTP_FORBIDDEN);
-    $event->setResponse($response);
-  }
-
-  /**
-   * Handles a 404 error for JSON.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on404(GetResponseForExceptionEvent $event) {
-    $response = new JsonResponse(array('message' => $event->getException()->getMessage()), Response::HTTP_NOT_FOUND);
-    $event->setResponse($response);
-  }
-
-  /**
-   * Handles a 405 error for JSON.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on405(GetResponseForExceptionEvent $event) {
-    $response = new JsonResponse(array('message' => $event->getException()->getMessage()), Response::HTTP_METHOD_NOT_ALLOWED);
-    $event->setResponse($response);
-  }
-
-  /**
-   * Handles a 406 error for JSON.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on406(GetResponseForExceptionEvent $event) {
-    $response = new JsonResponse(['message' => $event->getException()->getMessage()], Response::HTTP_NOT_ACCEPTABLE);
-    $event->setResponse($response);
-  }
-
-  /**
-   * Handles a 415 error for JSON.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on415(GetResponseForExceptionEvent $event) {
-    $response = new JsonResponse(['message' => $event->getException()->getMessage()], Response::HTTP_UNSUPPORTED_MEDIA_TYPE);
+  public function on4xx(GetResponseForExceptionEvent $event) {
+    /** @var \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface $exception */
+    $exception = $event->getException();
+    $response = new JsonResponse(['message' => $event->getException()->getMessage()], $exception->getStatusCode(), $exception->getHeaders());
     $event->setResponse($response);
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php
index f1088bf25..ab50f217a 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php
@@ -37,7 +37,7 @@ class ExceptionTestSiteSubscriber extends HttpExceptionSubscriberBase {
     $exception = $event->getException();
     $error = Error::decodeException($exception);
 
-    $headers = array();
+    $headers = [];
 
     // When running inside the testing framework, we relay the errors
     // to the tested site by the way of HTTP headers.
@@ -45,15 +45,15 @@ class ExceptionTestSiteSubscriber extends HttpExceptionSubscriberBase {
       // $number does not use drupal_static as it should not be reset
       // as it uniquely identifies each PHP error.
       static $number = 0;
-      $assertion = array(
+      $assertion = [
         $error['@message'],
         $error['%type'],
-        array(
+        [
           'function' => $error['%function'],
           'file' => $error['%file'],
           'line' => $error['%line'],
-        ),
-      );
+        ],
+      ];
       $headers['X-Drupal-Assertion-' . $number] = rawurlencode(serialize($assertion));
       $number++;
     }
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
index 3db181adc..9ea7a8302 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
@@ -88,6 +88,21 @@ class FinishResponseSubscriber implements EventSubscriberInterface {
     $this->debugCacheabilityHeaders = $http_response_debug_cacheability_headers;
   }
 
+  /**
+   * Sets extra headers on any responses, also subrequest ones.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
+   *   The event to process.
+   */
+  public function onAllResponds(FilterResponseEvent $event) {
+    $response = $event->getResponse();
+    // Always add the 'http_response' cache tag to be able to invalidate every
+    // response, for example after rebuilding routes.
+    if ($response instanceof CacheableResponseInterface) {
+      $response->getCacheableMetadata()->addCacheTags(['http_response']);
+    }
+  }
+
   /**
    * Sets extra headers on successful responses.
    *
@@ -283,7 +298,10 @@ class FinishResponseSubscriber implements EventSubscriberInterface {
    *   An array of event listener definitions.
    */
   public static function getSubscribedEvents() {
-    $events[KernelEvents::RESPONSE][] = array('onRespond');
+    $events[KernelEvents::RESPONSE][] = ['onRespond'];
+    // There is no specific reason for choosing 16 beside it should be executed
+    // before ::onRespond().
+    $events[KernelEvents::RESPONSE][] = ['onAllResponds', 16];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/HttpExceptionSubscriberBase.php b/web/core/lib/Drupal/Core/EventSubscriber/HttpExceptionSubscriberBase.php
index 90ff02849..f286c009d 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/HttpExceptionSubscriberBase.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/HttpExceptionSubscriberBase.php
@@ -13,12 +13,20 @@ use Symfony\Component\HttpKernel\KernelEvents;
  * A subscriber may extend this class and implement getHandledFormats() to
  * indicate which request formats it will respond to. Then implement an on*()
  * method for any error code (HTTP response code) that should be handled. For
- * example, to handle 404 Not Found messages add a method:
+ * example, to handle a specific error code like 404 Not Found messages add the
+ * method:
  *
  * @code
  * public function on404(GetResponseForExceptionEvent $event) {}
  * @endcode
  *
+ * To implement a fallback for the entire 4xx class of codes, implement the
+ * method:
+ *
+ * @code
+ * public function on4xx(GetResponseForExceptionEvent $event) {}
+ * @endcode
+ *
  * That method should then call $event->setResponse() to set the response object
  * for the exception. Alternatively, it may opt not to do so and then other
  * listeners will have the opportunity to handle the exception.
@@ -90,6 +98,9 @@ abstract class HttpExceptionSubscriberBase implements EventSubscriberInterface {
 
     if ($exception instanceof HttpExceptionInterface && (empty($handled_formats) || in_array($format, $handled_formats))) {
       $method = 'on' . $exception->getStatusCode();
+      // Keep just the leading number of the status code to produce either a
+      // on400 or a 500 method callback.
+      $method_fallback = 'on' . substr($exception->getStatusCode(), 0, 1) . 'xx';
       // We want to allow the method to be called and still not set a response
       // if it has additional filtering logic to determine when it will apply.
       // It is therefore the method's responsibility to set the response on the
@@ -97,6 +108,9 @@ abstract class HttpExceptionSubscriberBase implements EventSubscriberInterface {
       if (method_exists($this, $method)) {
         $this->$method($event);
       }
+      elseif (method_exists($this, $method_fallback)) {
+        $this->$method_fallback($event);
+      }
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php
index 4b04be6e9..0619695aa 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/KernelDestructionSubscriber.php
@@ -20,7 +20,7 @@ class KernelDestructionSubscriber implements EventSubscriberInterface, Container
    *
    * @var array
    */
-  protected $services = array();
+  protected $services = [];
 
   /**
    * Registers a service for destruction.
@@ -58,8 +58,11 @@ class KernelDestructionSubscriber implements EventSubscriberInterface, Container
    * @return array
    *   An array of event listener definitions.
    */
-  static function getSubscribedEvents() {
-    $events[KernelEvents::TERMINATE][] = array('onKernelTerminate', 100);
+  public static function getSubscribedEvents() {
+    // Run this subscriber after others as those might use services that need
+    // to be terminated as well or run code that needs to run before
+    // termination.
+    $events[KernelEvents::TERMINATE][] = ['onKernelTerminate', -100];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/MainContentViewSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/MainContentViewSubscriber.php
index 04a7fd6d0..f63ade66a 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/MainContentViewSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/MainContentViewSubscriber.php
@@ -101,7 +101,7 @@ class MainContentViewSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
+  public static function getSubscribedEvents() {
     $events[KernelEvents::VIEW][] = ['onViewRenderArray'];
 
     return $events;
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
index 57d43ec0b..ba82988a1 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -103,7 +103,7 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
         // If the request format is not 'html' then show default maintenance
         // mode page else show a text/plain page with maintenance message.
         if ($request->getRequestFormat() !== 'html') {
-          $response = new Response($this->getSiteMaintenanceMessage(), 503, array('Content-Type' => 'text/plain'));
+          $response = new Response($this->getSiteMaintenanceMessage(), 503, ['Content-Type' => 'text/plain']);
           $event->setResponse($response);
           return;
         }
@@ -118,7 +118,7 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
         // settings page.
         if ($route_match->getRouteName() != 'system.site_maintenance_mode') {
           if ($this->account->hasPermission('administer site configuration')) {
-            $this->drupalSetMessage($this->t('Operating in maintenance mode. <a href=":url">Go online.</a>', array(':url' => $this->urlGenerator->generate('system.site_maintenance_mode'))), 'status', FALSE);
+            $this->drupalSetMessage($this->t('Operating in maintenance mode. <a href=":url">Go online.</a>', [':url' => $this->urlGenerator->generate('system.site_maintenance_mode')]), 'status', FALSE);
           }
           else {
             $this->drupalSetMessage($this->t('Operating in maintenance mode.'), 'status', FALSE);
@@ -135,9 +135,9 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
    *   The formatted site maintenance message.
    */
   protected function getSiteMaintenanceMessage() {
-    return SafeMarkup::format($this->config->get('system.maintenance')->get('message'), array(
+    return SafeMarkup::format($this->config->get('system.maintenance')->get('message'), [
       '@site' => $this->config->get('system.site')->get('name'),
-    ));
+    ]);
   }
 
   /**
@@ -151,8 +151,8 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
    * {@inheritdoc}
    */
   public static function getSubscribedEvents() {
-    $events[KernelEvents::REQUEST][] = array('onKernelRequestMaintenance', 30);
-    $events[KernelEvents::EXCEPTION][] = array('onKernelRequestMaintenance');
+    $events[KernelEvents::REQUEST][] = ['onKernelRequestMaintenance', 30];
+    $events[KernelEvents::EXCEPTION][] = ['onKernelRequestMaintenance'];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/MenuRouterRebuildSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/MenuRouterRebuildSubscriber.php
index 56ac921be..521c58206 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/MenuRouterRebuildSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/MenuRouterRebuildSubscriber.php
@@ -47,7 +47,7 @@ class MenuRouterRebuildSubscriber implements EventSubscriberInterface {
    */
   public function onRouterRebuild(Event $event) {
     $this->menuLinksRebuild();
-    Cache::invalidateTags(array('local_task'));
+    Cache::invalidateTags(['local_task']);
   }
 
   /**
@@ -63,7 +63,7 @@ class MenuRouterRebuildSubscriber implements EventSubscriberInterface {
         db_ignore_replica();
       }
       catch (\Exception $e) {
-        $transaction->rollback();
+        $transaction->rollBack();
         watchdog_exception('menu', $e);
       }
 
@@ -80,9 +80,9 @@ class MenuRouterRebuildSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
+  public static function getSubscribedEvents() {
     // Run after CachedRouteRebuildSubscriber.
-    $events[RoutingEvents::FINISHED][] = array('onRouterRebuild', 100);
+    $events[RoutingEvents::FINISHED][] = ['onRouterRebuild', 100];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php
index 271ddbee6..3b1251685 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ParamConverterSubscriber.php
@@ -43,9 +43,9 @@ class ParamConverterSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
+  public static function getSubscribedEvents() {
     // Run after \Drupal\system\EventSubscriber\AdminRouteSubscriber.
-    $events[RoutingEvents::ALTER][] = array('onRoutingRouteAlterSetParameterConverters', -220);
+    $events[RoutingEvents::ALTER][] = ['onRoutingRouteAlterSetParameterConverters', -220];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/PathRootsSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/PathRootsSubscriber.php
index a0bd7b064..0ded041a2 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/PathRootsSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/PathRootsSubscriber.php
@@ -65,10 +65,10 @@ class PathRootsSubscriber implements EventSubscriberInterface {
    * {@inheritdoc}
    */
   public static function getSubscribedEvents() {
-    $events = array();
+    $events = [];
     // Try to set a low priority to ensure that all routes are already added.
-    $events[RoutingEvents::ALTER][] = array('onRouteAlter', -1024);
-    $events[RoutingEvents::FINISHED][] = array('onRouteFinished');
+    $events[RoutingEvents::ALTER][] = ['onRouteAlter', -1024];
+    $events[RoutingEvents::FINISHED][] = ['onRouteFinished'];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php
index 77dbdbc99..1fec198a1 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/PathSubscriber.php
@@ -70,9 +70,9 @@ class PathSubscriber implements EventSubscriberInterface {
    * @return array
    *   An array of event listener definitions.
    */
-  static function getSubscribedEvents() {
-    $events[KernelEvents::CONTROLLER][] = array('onKernelController', 200);
-    $events[KernelEvents::TERMINATE][] = array('onKernelTerminate', 200);
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::CONTROLLER][] = ['onKernelController', 200];
+    $events[KernelEvents::TERMINATE][] = ['onKernelTerminate', 200];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php
index ad7b049c7..635fca1a8 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php
@@ -41,7 +41,7 @@ class RedirectLeadingSlashesSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
+  public static function getSubscribedEvents() {
     $events[KernelEvents::REQUEST][] = ['redirect', 1000];
     return $events;
   }
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php
index b9a64d51b..8397bdef4 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php
@@ -165,9 +165,9 @@ class RedirectResponseSubscriber implements EventSubscriberInterface {
    * @return array
    *   An array of event listener definitions.
    */
-  static function getSubscribedEvents() {
-    $events[KernelEvents::RESPONSE][] = array('checkRedirectUrl');
-    $events[KernelEvents::REQUEST][] = array('sanitizeDestination', 100);
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::RESPONSE][] = ['checkRedirectUrl'];
+    $events[KernelEvents::REQUEST][] = ['sanitizeDestination', 100];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ReplicaDatabaseIgnoreSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ReplicaDatabaseIgnoreSubscriber.php
index 64968ba8a..fc123d36d 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/ReplicaDatabaseIgnoreSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ReplicaDatabaseIgnoreSubscriber.php
@@ -47,8 +47,8 @@ class ReplicaDatabaseIgnoreSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[KernelEvents::REQUEST][] = array('checkReplicaServer');
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::REQUEST][] = ['checkReplicaServer'];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
index 7431e96cb..81dd1efaa 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/RequestCloseSubscriber.php
@@ -23,7 +23,7 @@ class RequestCloseSubscriber implements EventSubscriberInterface {
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler.
    */
-  function __construct(ModuleHandlerInterface $module_handler) {
+  public function __construct(ModuleHandlerInterface $module_handler) {
     $this->moduleHandler = $module_handler;
   }
 
@@ -48,8 +48,8 @@ class RequestCloseSubscriber implements EventSubscriberInterface {
    * @return array
    *   An array of event listener definitions.
    */
-  static function getSubscribedEvents() {
-    $events[KernelEvents::TERMINATE][] = array('onTerminate', 100);
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::TERMINATE][] = ['onTerminate', 100];
 
     return $events;
   }
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/RouteEnhancerSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/RouteEnhancerSubscriber.php
index ebc699b59..8763842b5 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/RouteEnhancerSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/RouteEnhancerSubscriber.php
@@ -40,8 +40,8 @@ class RouteEnhancerSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[RoutingEvents::ALTER][] = array('onRouteAlter', -300);
+  public static function getSubscribedEvents() {
+    $events[RoutingEvents::ALTER][] = ['onRouteAlter', -300];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/RouteFilterSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/RouteFilterSubscriber.php
index 901aa0c9b..f64b8db51 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/RouteFilterSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/RouteFilterSubscriber.php
@@ -42,8 +42,8 @@ class RouteFilterSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[RoutingEvents::ALTER][] = array('onRouteAlter', -300);
+  public static function getSubscribedEvents() {
+    $events[RoutingEvents::ALTER][] = ['onRouteAlter', -300];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/RouteMethodSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/RouteMethodSubscriber.php
index c88e30619..318883521 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/RouteMethodSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/RouteMethodSubscriber.php
@@ -27,7 +27,7 @@ class RouteMethodSubscriber implements EventSubscriberInterface {
     foreach ($event->getRouteCollection() as $route) {
       $methods = $route->getMethods();
       if (empty($methods)) {
-        $route->setMethods(array('GET', 'POST'));
+        $route->setMethods(['GET', 'POST']);
       }
     }
   }
@@ -35,10 +35,10 @@ class RouteMethodSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
+  public static function getSubscribedEvents() {
     // Set a higher priority to ensure that routes get the default HTTP methods
     // as early as possible.
-    $events[RoutingEvents::ALTER][] = array('onRouteBuilding', 5000);
+    $events[RoutingEvents::ALTER][] = ['onRouteBuilding', 5000];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/SpecialAttributesRouteSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/SpecialAttributesRouteSubscriber.php
index 85489cca9..0f40c5a58 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/SpecialAttributesRouteSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/SpecialAttributesRouteSubscriber.php
@@ -16,7 +16,7 @@ class SpecialAttributesRouteSubscriber extends RouteSubscriberBase {
    * {@inheritdoc}
    */
   protected function alterRoutes(RouteCollection $collection) {
-    $special_variables = array(
+    $special_variables = [
       'system_path',
       '_legacy',
       '_raw_variables',
@@ -25,7 +25,7 @@ class SpecialAttributesRouteSubscriber extends RouteSubscriberBase {
       '_content',
       '_controller',
       '_form',
-    );
+    ];
     foreach ($collection->all() as $name => $route) {
       if ($not_allowed_variables = array_intersect($route->compile()->getVariables(), $special_variables)) {
         $reserved = implode(', ', $not_allowed_variables);
diff --git a/web/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php b/web/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
index 1480cbf24..0b758c60c 100644
--- a/web/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
+++ b/web/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
@@ -24,7 +24,7 @@ abstract class ExecutablePluginBase extends ContextAwarePluginBase implements Ex
     if (!empty($definition['configuration'])) {
       return $definition['configuration'];
     }
-    return array();
+    return [];
   }
 
   /**
@@ -69,7 +69,7 @@ abstract class ExecutablePluginBase extends ContextAwarePluginBase implements Ex
    *   https://www.drupal.org/node/1764380.
    * @todo This does not set a value in \Drupal::config(), so the name is confusing.
    *
-   * @return \Drupal\Core\Executable\ExecutablePluginBase.
+   * @return \Drupal\Core\Executable\ExecutablePluginBase
    *   The executable object for chaining.
    */
   public function setConfig($key, $value) {
diff --git a/web/core/lib/Drupal/Core/Extension/Discovery/RecursiveExtensionFilterIterator.php b/web/core/lib/Drupal/Core/Extension/Discovery/RecursiveExtensionFilterIterator.php
index 5c3ebc32b..ac69f01a0 100644
--- a/web/core/lib/Drupal/Core/Extension/Discovery/RecursiveExtensionFilterIterator.php
+++ b/web/core/lib/Drupal/Core/Extension/Discovery/RecursiveExtensionFilterIterator.php
@@ -38,11 +38,11 @@ class RecursiveExtensionFilterIterator extends \RecursiveFilterIterator {
    *
    * @var array
    */
-  protected $whitelist = array(
+  protected $whitelist = [
     'profiles',
     'modules',
     'themes',
-  );
+  ];
 
   /**
    * List of directory names to skip when recursing.
@@ -53,7 +53,7 @@ class RecursiveExtensionFilterIterator extends \RecursiveFilterIterator {
    *
    * @var array
    */
-  protected $blacklist = array(
+  protected $blacklist = [
     // Object-oriented code subdirectories.
     'src',
     'lib',
@@ -72,7 +72,7 @@ class RecursiveExtensionFilterIterator extends \RecursiveFilterIterator {
     'fixtures',
     // @todo ./tests/Drupal should be ./tests/src/Drupal
     'Drupal',
-  );
+  ];
 
   /**
    * Whether to include test directories when recursing.
diff --git a/web/core/lib/Drupal/Core/Extension/Extension.php b/web/core/lib/Drupal/Core/Extension/Extension.php
index 02387147b..7cb6b56be 100644
--- a/web/core/lib/Drupal/Core/Extension/Extension.php
+++ b/web/core/lib/Drupal/Core/Extension/Extension.php
@@ -152,7 +152,7 @@ class Extension implements \Serializable {
     if (!isset($this->splFileInfo)) {
       $this->splFileInfo = new \SplFileInfo($this->pathname);
     }
-    return call_user_func_array(array($this->splFileInfo, $method), $args);
+    return call_user_func_array([$this->splFileInfo, $method], $args);
   }
 
   /**
@@ -163,11 +163,11 @@ class Extension implements \Serializable {
   public function serialize() {
     // Don't serialize the app root, since this could change if the install is
     // moved.
-    $data = array(
+    $data = [
       'type' => $this->type,
       'pathname' => $this->pathname,
       'filename' => $this->filename,
-    );
+    ];
 
     // @todo ThemeHandler::listInfo(), ThemeHandler::rebuildThemeData(), and
     //   system_list() are adding custom properties to the Extension object.
diff --git a/web/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php b/web/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
index 0d9283c65..b74fc04f1 100644
--- a/web/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
+++ b/web/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php
@@ -56,19 +56,12 @@ class ExtensionDiscovery {
    */
   const PHP_FUNCTION_PATTERN = '/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/';
 
-  /**
-   * InfoParser instance for parsing .info.yml files.
-   *
-   * @var \Drupal\Core\Extension\InfoParser
-   */
-  protected $infoParser;
-
   /**
    * Previously discovered files keyed by origin directory and extension type.
    *
    * @var array
    */
-  protected static $files = array();
+  protected static $files = [];
 
   /**
    * List of installation profile directories to additionally scan.
@@ -205,7 +198,7 @@ class ExtensionDiscovery {
       $include_tests = Settings::get('extension_discovery_scan_tests') || drupal_valid_test_ua();
     }
 
-    $files = array();
+    $files = [];
     foreach ($searchdirs as $dir) {
       // Discover all extensions in the directory, unless we did already.
       if (!isset(static::$files[$this->root][$dir][$include_tests])) {
@@ -234,7 +227,7 @@ class ExtensionDiscovery {
    * @return $this
    */
   public function setProfileDirectoriesFromSettings() {
-    $this->profileDirectories = array();
+    $this->profileDirectories = [];
     $profile = drupal_get_profile();
     // For SimpleTest to be able to test modules packaged together with a
     // distribution we need to include the profile of the parent site (in
@@ -281,7 +274,7 @@ class ExtensionDiscovery {
   /**
    * Filters out extensions not belonging to the scanned installation profiles.
    *
-   * @param \Drupal\Core\Extension\Extension[] $all_files.
+   * @param \Drupal\Core\Extension\Extension[] $all_files
    *   The list of all extensions.
    *
    * @return \Drupal\Core\Extension\Extension[]
@@ -314,7 +307,7 @@ class ExtensionDiscovery {
   /**
    * Sorts the discovered extensions.
    *
-   * @param \Drupal\Core\Extension\Extension[] $all_files.
+   * @param \Drupal\Core\Extension\Extension[] $all_files
    *   The list of all extensions.
    * @param array $weights
    *   An array of weights, keyed by originating directory.
@@ -323,8 +316,8 @@ class ExtensionDiscovery {
    *   The sorted list of extensions.
    */
   protected function sort(array $all_files, array $weights) {
-    $origins = array();
-    $profiles = array();
+    $origins = [];
+    $profiles = [];
     foreach ($all_files as $key => $file) {
       // If the extension does not belong to a profile, just apply the weight
       // of the originating directory.
@@ -378,7 +371,7 @@ class ExtensionDiscovery {
    *   The filtered list of extensions, keyed by extension name.
    */
   protected function process(array $all_files) {
-    $files = array();
+    $files = [];
     // Duplicate files found in later search directories take precedence over
     // earlier ones; they replace the extension in the existing $files array.
     foreach ($all_files as $file) {
@@ -404,7 +397,7 @@ class ExtensionDiscovery {
    * @see \Drupal\Core\Extension\Discovery\RecursiveExtensionFilterIterator
    */
   protected function scanDirectory($dir, $include_tests) {
-    $files = array();
+    $files = [];
 
     // In order to scan top-level directories, absolute directory paths have to
     // be used (which also improves performance, since any configured PHP
@@ -503,17 +496,4 @@ class ExtensionDiscovery {
     return $files;
   }
 
-  /**
-   * Returns a parser for .info.yml files.
-   *
-   * @return \Drupal\Core\Extension\InfoParser
-   *   The InfoParser instance.
-   */
-  protected function getInfoParser() {
-    if (!isset($this->infoParser)) {
-      $this->infoParser = new InfoParser();
-    }
-    return $this->infoParser;
-  }
-
 }
diff --git a/web/core/lib/Drupal/Core/Extension/InfoParser.php b/web/core/lib/Drupal/Core/Extension/InfoParser.php
index 4981885bd..594a83ee6 100644
--- a/web/core/lib/Drupal/Core/Extension/InfoParser.php
+++ b/web/core/lib/Drupal/Core/Extension/InfoParser.php
@@ -12,7 +12,7 @@ class InfoParser extends InfoParserDynamic {
    *
    * @var array
    */
-  protected static $parsedInfos = array();
+  protected static $parsedInfos = [];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/lib/Drupal/Core/Extension/InfoParserDynamic.php b/web/core/lib/Drupal/Core/Extension/InfoParserDynamic.php
index 914bb5df6..3b00cea09 100644
--- a/web/core/lib/Drupal/Core/Extension/InfoParserDynamic.php
+++ b/web/core/lib/Drupal/Core/Extension/InfoParserDynamic.php
@@ -15,7 +15,7 @@ class InfoParserDynamic implements InfoParserInterface {
    */
   public function parse($filename) {
     if (!file_exists($filename)) {
-      $parsed_info = array();
+      $parsed_info = [];
     }
     else {
       try {
@@ -42,7 +42,7 @@ class InfoParserDynamic implements InfoParserInterface {
    *   An array of required keys.
    */
   protected function getRequiredKeys() {
-    return array('type', 'core', 'name');
+    return ['type', 'core', 'name'];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleHandler.php b/web/core/lib/Drupal/Core/Extension/ModuleHandler.php
index f857bf10a..cfbaa61a8 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -106,9 +106,9 @@ class ModuleHandler implements ModuleHandlerInterface {
    * @see \Drupal\Core\DrupalKernel
    * @see \Drupal\Core\CoreServiceProvider
    */
-  public function __construct($root, array $module_list = array(), CacheBackendInterface $cache_backend) {
+  public function __construct($root, array $module_list = [], CacheBackendInterface $cache_backend) {
     $this->root = $root;
-    $this->moduleList = array();
+    $this->moduleList = [];
     foreach ($module_list as $name => $module) {
       $this->moduleList[$name] = new Extension($this->root, $module['type'], $module['pathname'], $module['filename']);
     }
@@ -178,7 +178,7 @@ class ModuleHandler implements ModuleHandlerInterface {
   /**
    * {@inheritdoc}
    */
-  public function setModuleList(array $module_list = array()) {
+  public function setModuleList(array $module_list = []) {
     $this->moduleList = $module_list;
     // Reset the implementations, so a new call triggers a reloading of the
     // available hooks.
@@ -221,7 +221,7 @@ class ModuleHandler implements ModuleHandlerInterface {
    */
   public function buildModuleDependencies(array $modules) {
     foreach ($modules as $module) {
-      $graph[$module->getName()]['edges'] = array();
+      $graph[$module->getName()]['edges'] = [];
       if (isset($module->info['dependencies']) && is_array($module->info['dependencies'])) {
         foreach ($module->info['dependencies'] as $dependency) {
           $dependency_data = static::parseDependency($dependency);
@@ -232,8 +232,8 @@ class ModuleHandler implements ModuleHandlerInterface {
     $graph_object = new Graph($graph);
     $graph = $graph_object->searchAndSort();
     foreach ($graph as $module_name => $data) {
-      $modules[$module_name]->required_by = isset($data['reverse_paths']) ? $data['reverse_paths'] : array();
-      $modules[$module_name]->requires = isset($data['paths']) ? $data['paths'] : array();
+      $modules[$module_name]->required_by = isset($data['reverse_paths']) ? $data['reverse_paths'] : [];
+      $modules[$module_name]->requires = isset($data['paths']) ? $data['paths'] : [];
       $modules[$module_name]->sort = $data['weight'];
     }
     return $modules;
@@ -305,7 +305,7 @@ class ModuleHandler implements ModuleHandlerInterface {
    * @see \Drupal\Core\Extension\ModuleHandler::getHookInfo()
    */
   protected function buildHookInfo() {
-    $this->hookInfo = array();
+    $this->hookInfo = [];
     // Make sure that the modules are loaded before checking.
     $this->reload();
     // $this->invokeAll() would cause an infinite recursion.
@@ -356,7 +356,7 @@ class ModuleHandler implements ModuleHandlerInterface {
     // invoked, since this can quickly lead to
     // \Drupal::moduleHandler()->implementsHook() being called several thousand
     // times per request.
-    $this->cacheBackend->set('module_implements', array());
+    $this->cacheBackend->set('module_implements', []);
     $this->cacheBackend->delete('hook_info');
   }
 
@@ -383,7 +383,7 @@ class ModuleHandler implements ModuleHandlerInterface {
   /**
    * {@inheritdoc}
    */
-  public function invoke($module, $hook, array $args = array()) {
+  public function invoke($module, $hook, array $args = []) {
     if (!$this->implementsHook($module, $hook)) {
       return;
     }
@@ -394,8 +394,8 @@ class ModuleHandler implements ModuleHandlerInterface {
   /**
    * {@inheritdoc}
    */
-  public function invokeAll($hook, array $args = array()) {
-    $return = array();
+  public function invokeAll($hook, array $args = []) {
+    $return = [];
     $implementations = $this->getImplementations($hook);
     foreach ($implementations as $module) {
       $function = $module . '_' . $hook;
@@ -438,7 +438,7 @@ class ModuleHandler implements ModuleHandlerInterface {
     // list of functions to call, and on subsequent calls, iterate through them
     // quickly.
     if (!isset($this->alterFunctions[$cid])) {
-      $this->alterFunctions[$cid] = array();
+      $this->alterFunctions[$cid] = [];
       $hook = $type . '_alter';
       $modules = $this->getImplementations($hook);
       if (!isset($extra_types)) {
@@ -452,7 +452,7 @@ class ModuleHandler implements ModuleHandlerInterface {
       else {
         // For multiple hooks, we need $modules to contain every module that
         // implements at least one of them.
-        $extra_modules = array();
+        $extra_modules = [];
         foreach ($extra_types as $extra_type) {
           $extra_modules = array_merge($extra_modules, $this->getImplementations($extra_type . '_alter'));
         }
@@ -516,8 +516,8 @@ class ModuleHandler implements ModuleHandlerInterface {
    */
   protected function getImplementationInfo($hook) {
     if (!isset($this->implementations)) {
-      $this->implementations = array();
-      $this->verified = array();
+      $this->implementations = [];
+      $this->verified = [];
       if ($cache = $this->cacheBackend->get('module_implements')) {
         $this->implementations = $cache->data;
       }
@@ -561,7 +561,7 @@ class ModuleHandler implements ModuleHandlerInterface {
    * @see \Drupal\Core\Extension\ModuleHandler::getImplementationInfo()
    */
   protected function buildImplementationInfo($hook) {
-    $implementations = array();
+    $implementations = [];
     $hook_info = $this->getHookInfo();
     foreach ($this->moduleList as $module => $extension) {
       $include_file = isset($hook_info[$hook]['group']) && $this->loadInclude($module, 'inc', $module . '.' . $hook_info[$hook]['group']);
@@ -658,7 +658,7 @@ class ModuleHandler implements ModuleHandlerInterface {
    * @see drupal_check_incompatibility()
    */
   public static function parseDependency($dependency) {
-    $value = array();
+    $value = [];
     // Split out the optional project name.
     if (strpos($dependency, ':') !== FALSE) {
       list($project_name, $dependency) = explode(':', $dependency);
@@ -691,11 +691,11 @@ class ModuleHandler implements ModuleHandlerInterface {
             }
             // Equivalence can be checked by adding two restrictions.
             if ($op == '=' || $op == '==') {
-              $value['versions'][] = array('op' => '<', 'version' => ($matches['major'] + 1) . '.x');
+              $value['versions'][] = ['op' => '<', 'version' => ($matches['major'] + 1) . '.x'];
               $op = '>=';
             }
           }
-          $value['versions'][] = array('op' => $op, 'version' => $matches['major'] . '.' . $matches['minor']);
+          $value['versions'][] = ['op' => $op, 'version' => $matches['major'] . '.' . $matches['minor']];
         }
       }
     }
@@ -706,7 +706,7 @@ class ModuleHandler implements ModuleHandlerInterface {
    * {@inheritdoc}
    */
   public function getModuleDirectories() {
-    $dirs = array();
+    $dirs = [];
     foreach ($this->getModuleList() as $name => $module) {
       $dirs[$name] = $this->root . '/' . $module->getPath();
     }
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php b/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
index e0336dd0a..6b2738c77 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
@@ -73,7 +73,7 @@ interface ModuleHandlerInterface {
    *   An associative array whose keys are the names of the modules and whose
    *   values are Extension objects.
    */
-  public function setModuleList(array $module_list = array());
+  public function setModuleList(array $module_list = []);
 
   /**
    * Adds a module to the list of currently active modules.
@@ -220,7 +220,7 @@ interface ModuleHandlerInterface {
    * @return mixed
    *   The return value of the hook implementation.
    */
-  public function invoke($module, $hook, array $args = array());
+  public function invoke($module, $hook, array $args = []);
 
   /**
    * Invokes a hook in all enabled modules that implement it.
@@ -236,7 +236,7 @@ interface ModuleHandlerInterface {
    *   recursively. Note: integer keys in arrays will be lost, as the merge is
    *   done using array_merge_recursive().
    */
-  public function invokeAll($hook, array $args = array());
+  public function invokeAll($hook, array $args = []);
 
   /**
    * Passes alterable variables to specific hook_TYPE_alter() implementations.
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
index 0dfe32279..f9500a5fc 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
@@ -79,14 +79,14 @@ class ModuleInstaller implements ModuleInstallerInterface {
     if ($enable_dependencies) {
       // Get all module data so we can find dependencies and sort.
       $module_data = system_rebuild_module_data();
-      $module_list = $module_list ? array_combine($module_list, $module_list) : array();
+      $module_list = $module_list ? array_combine($module_list, $module_list) : [];
       if ($missing_modules = array_diff_key($module_list, $module_data)) {
         // One or more of the given modules doesn't exist.
         throw new MissingDependencyException(sprintf('Unable to install modules %s due to missing modules %s.', implode(', ', $module_list), implode(', ', $missing_modules)));
       }
 
       // Only process currently uninstalled modules.
-      $installed_modules = $extension_config->get('module') ?: array();
+      $installed_modules = $extension_config->get('module') ?: [];
       if (!$module_list = array_diff_key($module_list, $installed_modules)) {
         // Nothing to do. All modules already installed.
         return TRUE;
@@ -127,7 +127,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
     if ($sync_status) {
       $source_storage = $config_installer->getSourceStorage();
     }
-    $modules_installed = array();
+    $modules_installed = [];
     foreach ($module_list as $module) {
       $enabled = $extension_config->get("module.$module") !== NULL;
       if (!$enabled) {
@@ -160,7 +160,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
         $current_module_filenames = $this->moduleHandler->getModuleList();
         $current_modules = array_fill_keys(array_keys($current_module_filenames), 0);
         $current_modules = module_config_sort(array_merge($current_modules, $extension_config->get('module')));
-        $module_filenames = array();
+        $module_filenames = [];
         foreach ($current_modules as $name => $weight) {
           if (isset($current_module_filenames[$name])) {
             $module_filenames[$name] = $current_module_filenames[$name];
@@ -191,7 +191,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
         $this->updateKernel($module_filenames);
 
         // Allow modules to react prior to the installation of a module.
-        $this->moduleHandler->invokeAll('module_preinstall', array($module));
+        $this->moduleHandler->invokeAll('module_preinstall', [$module]);
 
         // Now install the module's schema if necessary.
         drupal_install_schema($module);
@@ -218,7 +218,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
           if ($entity_type->getProvider() == $module) {
             $update_manager->installEntityType($entity_type);
           }
-          elseif ($entity_type->isSubclassOf(FieldableEntityInterface::CLASS)) {
+          elseif ($entity_type->entityClassImplements(FieldableEntityInterface::CLASS)) {
             // The module being installed may be adding new fields to existing
             // entity types. Field definitions for any entity type defined by
             // the module are handled in the if branch.
@@ -287,7 +287,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
         $this->moduleHandler->invoke($module, 'install');
 
         // Record the fact that it was installed.
-        \Drupal::logger('system')->info('%module module installed.', array('%module' => $module));
+        \Drupal::logger('system')->info('%module module installed.', ['%module' => $module]);
       }
     }
 
@@ -302,7 +302,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
         \Drupal::service('router.builder')->rebuild();
       }
 
-      $this->moduleHandler->invokeAll('modules_installed', array($modules_installed));
+      $this->moduleHandler->invokeAll('modules_installed', [$modules_installed]);
     }
 
     return TRUE;
@@ -314,14 +314,14 @@ class ModuleInstaller implements ModuleInstallerInterface {
   public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
     // Get all module data so we can find dependencies and sort.
     $module_data = system_rebuild_module_data();
-    $module_list = $module_list ? array_combine($module_list, $module_list) : array();
+    $module_list = $module_list ? array_combine($module_list, $module_list) : [];
     if (array_diff_key($module_list, $module_data)) {
       // One or more of the given modules doesn't exist.
       return FALSE;
     }
 
     $extension_config = \Drupal::configFactory()->getEditable('core.extension');
-    $installed_modules = $extension_config->get('module') ?: array();
+    $installed_modules = $extension_config->get('module') ?: [];
     if (!$module_list = array_intersect_key($module_list, $installed_modules)) {
       // Nothing to do. All modules already uninstalled.
       return TRUE;
@@ -381,7 +381,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
       }
 
       // Allow modules to react prior to the uninstallation of a module.
-      $this->moduleHandler->invokeAll('module_preuninstall', array($module));
+      $this->moduleHandler->invokeAll('module_preuninstall', [$module]);
 
       // Uninstall the module.
       module_load_install($module);
@@ -403,7 +403,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
         if ($entity_type->getProvider() == $module) {
           $update_manager->uninstallEntityType($entity_type);
         }
-        elseif ($entity_type->isSubclassOf(FieldableEntityInterface::CLASS)) {
+        elseif ($entity_type->entityClassImplements(FieldableEntityInterface::CLASS)) {
           // The module being installed may be adding new fields to existing
           // entity types. Field definitions for any entity type defined by
           // the module are handled in the if branch.
@@ -457,7 +457,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
       // @see https://www.drupal.org/node/2208429
       \Drupal::service('theme_handler')->refreshInfo();
 
-      \Drupal::logger('system')->info('%module module uninstalled.', array('%module' => $module));
+      \Drupal::logger('system')->info('%module module uninstalled.', ['%module' => $module]);
 
       $schema_store = \Drupal::keyValue('system.schema');
       $schema_store->delete($module);
@@ -474,7 +474,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
     drupal_get_installed_schema_version(NULL, TRUE);
 
     // Let other modules react.
-    $this->moduleHandler->invokeAll('modules_uninstalled', array($module_list));
+    $this->moduleHandler->invokeAll('modules_uninstalled', [$module_list]);
 
     // Flush all persistent caches.
     // Any cache entry might implicitly depend on the uninstalled modules,
@@ -509,14 +509,14 @@ class ModuleInstaller implements ModuleInstallerInterface {
                 try {
                   $factory = \Drupal::service($definition['factory_service']);
                   if (method_exists($factory, $definition['factory_method'])) {
-                    $backend = call_user_func_array(array($factory, $definition['factory_method']), $definition['arguments']);
+                    $backend = call_user_func_array([$factory, $definition['factory_method']], $definition['arguments']);
                     if ($backend instanceof CacheBackendInterface) {
                       $backend->removeBin();
                     }
                   }
                 }
                 catch (\Exception $e) {
-                  watchdog_exception('system', $e, 'Failed to remove cache bin defined by the service %id.', array('%id' => $id));
+                  watchdog_exception('system', $e, 'Failed to remove cache bin defined by the service %id.', ['%id' => $id]);
                 }
               }
             }
@@ -548,13 +548,13 @@ class ModuleInstaller implements ModuleInstallerInterface {
    * {@inheritdoc}
    */
   public function validateUninstall(array $module_list) {
-    $reasons = array();
+    $reasons = [];
     foreach ($module_list as $module) {
       foreach ($this->uninstallValidators as $validator) {
         $validation_reasons = $validator->validate($module);
         if (!empty($validation_reasons)) {
           if (!isset($reasons[$module])) {
-            $reasons[$module] = array();
+            $reasons[$module] = [];
           }
           $reasons[$module] = array_merge($reasons[$module], $validation_reasons);
         }
diff --git a/web/core/lib/Drupal/Core/Extension/ThemeHandler.php b/web/core/lib/Drupal/Core/Extension/ThemeHandler.php
index 3363efc51..2fd75e190 100644
--- a/web/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/web/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@ -17,13 +17,13 @@ class ThemeHandler implements ThemeHandlerInterface {
    *
    * @see _system_default_theme_features()
    */
-  protected $defaultFeatures = array(
+  protected $defaultFeatures = [
     'favicon',
     'logo',
     'node_user_picture',
     'comment_user_picture',
     'comment_user_verification',
-  );
+  ];
 
   /**
    * A list of all currently available themes.
@@ -178,14 +178,14 @@ class ThemeHandler implements ThemeHandlerInterface {
    */
   public function listInfo() {
     if (!isset($this->list)) {
-      $this->list = array();
+      $this->list = [];
       $themes = $this->systemThemeList();
       // @todo Ensure that systemThemeList() does not contain an empty list
       //   during the batch installer, see https://www.drupal.org/node/2322619.
       if (empty($themes)) {
         $this->refreshInfo();
-        $this->list = $this->list ?: array();
-        $themes = \Drupal::state()->get('system.theme.data', array());
+        $this->list = $this->list ?: [];
+        $themes = \Drupal::state()->get('system.theme.data', []);
       }
       foreach ($themes as $theme) {
         $this->addTheme($theme);
@@ -247,13 +247,13 @@ class ThemeHandler implements ThemeHandlerInterface {
     $themes = $listing->scan('theme');
     $engines = $listing->scan('theme_engine');
     $extension_config = $this->configFactory->get('core.extension');
-    $installed = $extension_config->get('theme') ?: array();
+    $installed = $extension_config->get('theme') ?: [];
 
     // Set defaults for theme info.
-    $defaults = array(
+    $defaults = [
       'engine' => 'twig',
       'base theme' => 'stable',
-      'regions' => array(
+      'regions' => [
         'sidebar_first' => 'Left sidebar',
         'sidebar_second' => 'Right sidebar',
         'content' => 'Content',
@@ -266,17 +266,17 @@ class ThemeHandler implements ThemeHandlerInterface {
         'page_top' => 'Page top',
         'page_bottom' => 'Page bottom',
         'breadcrumb' => 'Breadcrumb',
-      ),
+      ],
       'description' => '',
       'features' => $this->defaultFeatures,
       'screenshot' => 'screenshot.png',
       'php' => DRUPAL_MINIMUM_PHP,
-      'libraries' => array(),
-    );
+      'libraries' => [],
+    ];
 
-    $sub_themes = array();
-    $files_theme = array();
-    $files_theme_engine = array();
+    $sub_themes = [];
+    $files_theme = [];
+    $files_theme_engine = [];
     // Read info files for each theme.
     foreach ($themes as $key => $theme) {
       // @todo Remove all code that relies on the $status property.
@@ -382,18 +382,18 @@ class ThemeHandler implements ThemeHandlerInterface {
    * @return array
    *   An array of base themes.
    */
-  protected function doGetBaseThemes(array $themes, $theme, $used_themes = array()) {
+  protected function doGetBaseThemes(array $themes, $theme, $used_themes = []) {
     if (!isset($themes[$theme]->info['base theme'])) {
-      return array();
+      return [];
     }
 
     $base_key = $themes[$theme]->info['base theme'];
     // Does the base theme exist?
     if (!isset($themes[$base_key])) {
-      return array($base_key => NULL);
+      return [$base_key => NULL];
     }
 
-    $current_base_theme = array($base_key => $themes[$base_key]->info['name']);
+    $current_base_theme = [$base_key => $themes[$base_key]->info['name']];
 
     // Is the base theme itself a child of another theme?
     if (isset($themes[$base_key]->info['base theme'])) {
@@ -403,7 +403,7 @@ class ThemeHandler implements ThemeHandlerInterface {
       }
       // Prevent loops.
       if (!empty($used_themes[$base_key])) {
-        return array($base_key => NULL);
+        return [$base_key => NULL];
       }
       $used_themes[$base_key] = TRUE;
       return $this->doGetBaseThemes($themes, $base_key, $used_themes) + $current_base_theme;
@@ -457,7 +457,7 @@ class ThemeHandler implements ThemeHandlerInterface {
    * {@inheritdoc}
    */
   public function getThemeDirectories() {
-    $dirs = array();
+    $dirs = [];
     foreach ($this->listInfo() as $name => $theme) {
       $dirs[$name] = $this->root . '/' . $theme->getPath();
     }
diff --git a/web/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php b/web/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
index 33ad5027a..91778e3b7 100644
--- a/web/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
+++ b/web/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
@@ -165,6 +165,9 @@ interface ThemeHandlerInterface {
    *   The new default theme.
    *
    * @return $this
+   *
+   * @deprecated in Drupal 8.2.x-dev and will be removed before Drupal 9.0.0.
+   *   Use \Drupal::config('system.theme')->set('default', $theme)->save().
    */
   public function setDefault($theme);
 
diff --git a/web/core/lib/Drupal/Core/Extension/ThemeInstaller.php b/web/core/lib/Drupal/Core/Extension/ThemeInstaller.php
index 050e04afa..db1226fa9 100644
--- a/web/core/lib/Drupal/Core/Extension/ThemeInstaller.php
+++ b/web/core/lib/Drupal/Core/Extension/ThemeInstaller.php
@@ -16,6 +16,11 @@ use Psr\Log\LoggerInterface;
  */
 class ThemeInstaller implements ThemeInstallerInterface {
 
+  /**
+   * @var \Drupal\Core\Extension\ThemeHandlerInterface
+   */
+  protected $themeHandler;
+
   /**
    * @var \Drupal\Core\Config\ConfigFactoryInterface
    */
@@ -56,7 +61,6 @@ class ThemeInstaller implements ThemeInstallerInterface {
    */
   protected $logger;
 
-
   /**
    * Constructs a new ThemeInstaller.
    *
@@ -111,7 +115,7 @@ class ThemeInstaller implements ThemeInstallerInterface {
       }
 
       // Only process themes that are not installed currently.
-      $installed_themes = $extension_config->get('theme') ?: array();
+      $installed_themes = $extension_config->get('theme') ?: [];
       if (!$theme_list = array_diff_key($theme_list, $installed_themes)) {
         // Nothing to do. All themes already installed.
         return TRUE;
@@ -143,10 +147,10 @@ class ThemeInstaller implements ThemeInstallerInterface {
       $theme_list = array_keys($theme_list);
     }
     else {
-      $installed_themes = $extension_config->get('theme') ?: array();
+      $installed_themes = $extension_config->get('theme') ?: [];
     }
 
-    $themes_installed = array();
+    $themes_installed = [];
     foreach ($theme_list as $key) {
       // Only process themes that are not already installed.
       $installed = $extension_config->get("theme.$key") !== NULL;
@@ -175,7 +179,7 @@ class ThemeInstaller implements ThemeInstallerInterface {
       $this->themeHandler->addTheme($theme_data[$key]);
 
       // Update the current theme data accordingly.
-      $current_theme_data = $this->state->get('system.theme.data', array());
+      $current_theme_data = $this->state->get('system.theme.data', []);
       $current_theme_data[$key] = $theme_data[$key];
       $this->state->set('system.theme.data', $current_theme_data);
 
@@ -196,14 +200,14 @@ class ThemeInstaller implements ThemeInstallerInterface {
       $themes_installed[] = $key;
 
       // Record the fact that it was installed.
-      $this->logger->info('%theme theme installed.', array('%theme' => $key));
+      $this->logger->info('%theme theme installed.', ['%theme' => $key]);
     }
 
     $this->cssCollectionOptimizer->deleteAll();
     $this->resetSystem();
 
     // Invoke hook_themes_installed() after the themes have been installed.
-    $this->moduleHandler->invokeAll('themes_installed', array($themes_installed));
+    $this->moduleHandler->invokeAll('themes_installed', [$themes_installed]);
 
     return !empty($themes_installed);
   }
@@ -240,7 +244,7 @@ class ThemeInstaller implements ThemeInstallerInterface {
     }
 
     $this->cssCollectionOptimizer->deleteAll();
-    $current_theme_data = $this->state->get('system.theme.data', array());
+    $current_theme_data = $this->state->get('system.theme.data', []);
     foreach ($theme_list as $key) {
       // The value is not used; the weight is ignored for themes currently.
       $extension_config->clear("theme.$key");
@@ -280,7 +284,7 @@ class ThemeInstaller implements ThemeInstallerInterface {
 
     // @todo It feels wrong to have the requirement to clear the local tasks
     //   cache here.
-    Cache::invalidateTags(array('local_task'));
+    Cache::invalidateTags(['local_task']);
     $this->themeRegistryRebuild();
   }
 
diff --git a/web/core/lib/Drupal/Core/Extension/module.api.php b/web/core/lib/Drupal/Core/Extension/module.api.php
index 74fc76699..944d3547b 100644
--- a/web/core/lib/Drupal/Core/Extension/module.api.php
+++ b/web/core/lib/Drupal/Core/Extension/module.api.php
@@ -84,12 +84,12 @@ use Drupal\Core\Utility\UpdateException;
  * @see hook_hook_info_alter()
  */
 function hook_hook_info() {
-  $hooks['token_info'] = array(
+  $hooks['token_info'] = [
     'group' => 'tokens',
-  );
-  $hooks['tokens'] = array(
+  ];
+  $hooks['tokens'] = [
     'group' => 'tokens',
-  );
+  ];
   return $hooks;
 }
 
@@ -398,7 +398,7 @@ function hook_install_tasks(&$install_state) {
   // processor-intensive batch process needs to be triggered later on in the
   // installation.
   $myprofile_needs_batch_processing = \Drupal::state()->get('myprofile.needs_batch_processing', FALSE);
-  $tasks = array(
+  $tasks = [
     // This is an example of a task that defines a form which the user who is
     // installing the site will be asked to fill out. To implement this task,
     // your profile would define a function named myprofile_data_import_form()
@@ -408,10 +408,10 @@ function hook_install_tasks(&$install_state) {
     // \Drupal::state()->set('myprofile.needs_batch_processing', TRUE) if the
     // user has entered data which requires that batch processing will need to
     // occur later on.
-    'myprofile_data_import_form' => array(
+    'myprofile_data_import_form' => [
       'display_name' => t('Data import options'),
       'type' => 'form',
-    ),
+    ],
     // Similarly, to implement this task, your profile would define a function
     // named myprofile_settings_form() with associated validation and submit
     // handlers. This form might be used to collect and save additional
@@ -419,10 +419,10 @@ function hook_install_tasks(&$install_state) {
     // steps required for your profile to act as an "installation wizard"; you
     // can simply define as many tasks of type 'form' as you wish to execute,
     // and the forms will be presented to the user, one after another.
-    'myprofile_settings_form' => array(
+    'myprofile_settings_form' => [
       'display_name' => t('Additional options'),
       'type' => 'form',
-    ),
+    ],
     // This is an example of a task that performs batch operations. To
     // implement this task, your profile would define a function named
     // myprofile_batch_processing() which returns a batch API array definition
@@ -430,12 +430,12 @@ function hook_install_tasks(&$install_state) {
     // 'myprofile.needs_batch_processing' variable used here, this task will be
     // hidden and skipped unless your profile set it to TRUE in one of the
     // previous tasks.
-    'myprofile_batch_processing' => array(
+    'myprofile_batch_processing' => [
       'display_name' => t('Import additional data'),
       'display' => $myprofile_needs_batch_processing,
       'type' => 'batch',
       'run' => $myprofile_needs_batch_processing ? INSTALL_TASK_RUN_IF_NOT_COMPLETED : INSTALL_TASK_SKIP,
-    ),
+    ],
     // This is an example of a task that will not be displayed in the list that
     // the user sees. To implement this task, your profile would define a
     // function named myprofile_final_site_setup(), in which additional,
@@ -449,9 +449,9 @@ function hook_install_tasks(&$install_state) {
     // tasks are complete, with a link to reload the current page and therefore
     // pass on to the final Drupal installation tasks when the user is ready to
     // do so).
-    'myprofile_final_site_setup' => array(
-    ),
-  );
+    'myprofile_final_site_setup' => [
+    ],
+  ];
   return $tasks;
 }
 
@@ -622,12 +622,12 @@ function hook_update_N(&$sandbox) {
 
   // Example function body for adding a field to a database table, which does
   // not require a batch operation:
-  $spec = array(
+  $spec = [
     'type' => 'varchar',
     'description' => "New Col",
     'length' => 20,
     'not null' => FALSE,
-  );
+  ];
   $schema = Database::getConnection()->schema();
   $schema->addField('mytable1', 'newcol', $spec);
 
@@ -647,7 +647,7 @@ function hook_update_N(&$sandbox) {
 
   // Update in chunks of 20.
   $records = Database::getConnection()->select('mytable1', 'm')
-    ->fields('m', array('myprimarykey', 'otherfield'))
+    ->fields('m', ['myprimarykey', 'otherfield'])
     ->condition('myprimarykey', $sandbox['current_pk'], '>')
     ->range(0, 20)
     ->orderBy('myprimarykey', 'ASC')
@@ -656,7 +656,7 @@ function hook_update_N(&$sandbox) {
     // Here, you would make an update something related to this record. In this
     // example, some text is added to the other field.
     Database::getConnection()->update('mytable1')
-      ->fields(array('otherfield' => $record->otherfield . '-suffix'))
+      ->fields(['otherfield' => $record->otherfield . '-suffix'])
       ->condition('myprimarykey', $record->myprimarykey)
       ->execute();
 
@@ -767,9 +767,9 @@ function hook_update_dependencies() {
   // Indicate that the mymodule_update_8001() function provided by this module
   // must run after the another_module_update_8003() function provided by the
   // 'another_module' module.
-  $dependencies['mymodule'][8001] = array(
+  $dependencies['mymodule'][8001] = [
     'another_module' => 8003,
-  );
+  ];
   // Indicate that the mymodule_update_8002() function provided by this module
   // must run before the yet_another_module_update_8005() function provided by
   // the 'yet_another_module' module. (Note that declaring dependencies in this
@@ -777,9 +777,9 @@ function hook_update_dependencies() {
   // following problem: If a site has already run the yet_another_module
   // module's database updates before it updates its codebase to pick up the
   // newest mymodule code, then the dependency declared here will be ignored.)
-  $dependencies['yet_another_module'][8005] = array(
+  $dependencies['yet_another_module'][8005] = [
     'mymodule' => 8002,
-  );
+  ];
   return $dependencies;
 }
 
@@ -834,18 +834,18 @@ function hook_update_last_removed() {
  * @see hook_updater_info_alter()
  */
 function hook_updater_info() {
-  return array(
-    'module' => array(
+  return [
+    'module' => [
       'class' => 'Drupal\Core\Updater\Module',
       'name' => t('Update modules'),
       'weight' => 0,
-    ),
-    'theme' => array(
+    ],
+    'theme' => [
       'class' => 'Drupal\Core\Updater\Theme',
       'name' => t('Update themes'),
       'weight' => 0,
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -928,24 +928,24 @@ function hook_updater_info_alter(&$updaters) {
  *     - REQUIREMENT_ERROR: The requirement failed with an error.
  */
 function hook_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
 
   // Report Drupal version
   if ($phase == 'runtime') {
-    $requirements['drupal'] = array(
+    $requirements['drupal'] = [
       'title' => t('Drupal'),
       'value' => \Drupal::VERSION,
       'severity' => REQUIREMENT_INFO
-    );
+    ];
   }
 
   // Test PHP version
-  $requirements['php'] = array(
+  $requirements['php'] = [
     'title' => t('PHP'),
     'value' => ($phase == 'runtime') ? \Drupal::l(phpversion(), new Url('system.php')) : phpversion(),
-  );
+  ];
   if (version_compare(phpversion(), DRUPAL_MINIMUM_PHP) < 0) {
-    $requirements['php']['description'] = t('Your PHP installation is too old. Drupal requires at least PHP %version.', array('%version' => DRUPAL_MINIMUM_PHP));
+    $requirements['php']['description'] = t('Your PHP installation is too old. Drupal requires at least PHP %version.', ['%version' => DRUPAL_MINIMUM_PHP]);
     $requirements['php']['severity'] = REQUIREMENT_ERROR;
   }
 
@@ -954,17 +954,17 @@ function hook_requirements($phase) {
     $cron_last = \Drupal::state()->get('system.cron_last');
 
     if (is_numeric($cron_last)) {
-      $requirements['cron']['value'] = t('Last run @time ago', array('@time' => \Drupal::service('date.formatter')->formatTimeDiffSince($cron_last)));
+      $requirements['cron']['value'] = t('Last run @time ago', ['@time' => \Drupal::service('date.formatter')->formatTimeDiffSince($cron_last)]);
     }
     else {
-      $requirements['cron'] = array(
-        'description' => t('Cron has not run. It appears cron jobs have not been setup on your system. Check the help pages for <a href=":url">configuring cron jobs</a>.', array(':url' => 'https://www.drupal.org/cron')),
+      $requirements['cron'] = [
+        'description' => t('Cron has not run. It appears cron jobs have not been setup on your system. Check the help pages for <a href=":url">configuring cron jobs</a>.', [':url' => 'https://www.drupal.org/cron']),
         'severity' => REQUIREMENT_ERROR,
         'value' => t('Never run'),
-      );
+      ];
     }
 
-    $requirements['cron']['description'] .= ' ' . t('You can <a href=":cron">run cron manually</a>.', array(':cron' => \Drupal::url('system.run_cron')));
+    $requirements['cron']['description'] .= ' ' . t('You can <a href=":cron">run cron manually</a>.', [':cron' => \Drupal::url('system.run_cron')]);
 
     $requirements['cron']['title'] = t('Cron maintenance tasks');
   }
diff --git a/web/core/lib/Drupal/Core/Field/AllowedTagsXssTrait.php b/web/core/lib/Drupal/Core/Field/AllowedTagsXssTrait.php
index 427d7f407..836b8d972 100644
--- a/web/core/lib/Drupal/Core/Field/AllowedTagsXssTrait.php
+++ b/web/core/lib/Drupal/Core/Field/AllowedTagsXssTrait.php
@@ -25,7 +25,7 @@ trait AllowedTagsXssTrait {
    * @param string $string
    *   The string with raw HTML in it.
    *
-   * @return \Drupal\Component\Utility\SafeMarkup
+   * @return \Drupal\Core\Field\FieldFilteredMarkup
    *   An XSS safe version of $string, or an empty string if $string is not
    *   valid UTF-8.
    */
diff --git a/web/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php b/web/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
index 92786b134..1a2439109 100644
--- a/web/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
@@ -61,7 +61,7 @@ class FieldFormatter extends Plugin {
    *
    * @var array
    */
-  public $field_types = array();
+  public $field_types = [];
 
   /**
    * An integer to determine the weight of this formatter relative to other
diff --git a/web/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php b/web/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php
index 22d7796e5..38d3f869e 100644
--- a/web/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php
@@ -60,7 +60,7 @@ class FieldWidget extends Plugin {
    *
    * @var array
    */
-  public $field_types = array();
+  public $field_types = [];
 
   /**
    * Does the field widget handles multiple values at once.
diff --git a/web/core/lib/Drupal/Core/Field/BaseFieldDefinition.php b/web/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
index 594f31d14..c7bb23306 100644
--- a/web/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
+++ b/web/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
@@ -12,7 +12,7 @@ use Drupal\Core\TypedData\OptionsProviderInterface;
 /**
  * A class for defining entity fields.
  */
-class BaseFieldDefinition extends ListDataDefinition implements FieldDefinitionInterface, FieldStorageDefinitionInterface {
+class BaseFieldDefinition extends ListDataDefinition implements FieldDefinitionInterface, FieldStorageDefinitionInterface, RequiredFieldStorageDefinitionInterface {
 
   use UnchangingCacheableDependencyTrait;
 
@@ -42,7 +42,7 @@ class BaseFieldDefinition extends ListDataDefinition implements FieldDefinitionI
   /**
    * @var array
    */
-  protected $indexes = array();
+  protected $indexes = [];
 
   /**
    * Creates a new field definition.
@@ -54,7 +54,7 @@ class BaseFieldDefinition extends ListDataDefinition implements FieldDefinitionI
    *   A new field definition object.
    */
   public static function create($type) {
-    $field_definition = new static(array());
+    $field_definition = new static([]);
     $field_definition->type = $type;
     $field_definition->itemDefinition = FieldItemDataDefinition::create($field_definition);
     // Create a definition for the items, and initialize it with the default
@@ -414,7 +414,7 @@ class BaseFieldDefinition extends ListDataDefinition implements FieldDefinitionI
   public function setDisplayConfigurable($display_context, $configurable) {
     // If no explicit display options have been specified, default to 'hidden'.
     if (empty($this->definition['display'][$display_context])) {
-      $this->definition['display'][$display_context]['options'] = array('type' => 'hidden');
+      $this->definition['display'][$display_context]['options'] = ['region' => 'hidden'];
     }
     $this->definition['display'][$display_context]['configurable'] = $configurable;
     return $this;
@@ -463,9 +463,9 @@ class BaseFieldDefinition extends ListDataDefinition implements FieldDefinitionI
     if (isset($value) && !is_array($value)) {
       $properties = $this->getPropertyNames();
       $property = reset($properties);
-      $value = array(
-        array($property => $value),
-      );
+      $value = [
+        [$property => $value],
+      ];
     }
     // Allow the field type to process default values.
     $field_item_list_class = $this->getClass();
@@ -482,10 +482,10 @@ class BaseFieldDefinition extends ListDataDefinition implements FieldDefinitionI
     // Unless the value is an empty array, we may need to transform it.
     if (!is_array($value) || !empty($value)) {
       if (!is_array($value)) {
-        $value = array(array($this->getMainPropertyName() => $value));
+        $value = [[$this->getMainPropertyName() => $value]];
       }
       elseif (is_array($value) && !is_numeric(array_keys($value)[0])) {
-        $value = array(0 => $value);
+        $value = [0 => $value];
       }
     }
     $this->definition['default_value'] = $value;
@@ -633,12 +633,12 @@ class BaseFieldDefinition extends ListDataDefinition implements FieldDefinitionI
       $class = $definition['class'];
       $schema = $class::schema($this);
       // Fill in default values.
-      $schema += array(
-        'columns' => array(),
-        'unique keys' => array(),
-        'indexes' => array(),
-        'foreign keys' => array(),
-      );
+      $schema += [
+        'columns' => [],
+        'unique keys' => [],
+        'indexes' => [],
+        'foreign keys' => [],
+      ];
 
       // Merge custom indexes with those specified by the field type. Custom
       // indexes prevail.
@@ -723,4 +723,30 @@ class BaseFieldDefinition extends ListDataDefinition implements FieldDefinitionI
     return BaseFieldOverride::createFromBaseFieldDefinition($this, $bundle);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function isStorageRequired() {
+    if (isset($this->definition['storage_required'])) {
+      return (bool) $this->definition['storage_required'];
+    }
+
+    // Default to the 'required' property of the base field.
+    return $this->isRequired();
+  }
+
+  /**
+   * Sets whether the field storage is required.
+   *
+   * @param bool $required
+   *   Whether the field storage is required.
+   *
+   * @return static
+   *   The object itself for chaining.
+   */
+  public function setStorageRequired($required) {
+    $this->definition['storage_required'] = $required;
+    return $this;
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Field/EntityReferenceFieldItemList.php b/web/core/lib/Drupal/Core/Field/EntityReferenceFieldItemList.php
index d21ac9697..0a53d9894 100644
--- a/web/core/lib/Drupal/Core/Field/EntityReferenceFieldItemList.php
+++ b/web/core/lib/Drupal/Core/Field/EntityReferenceFieldItemList.php
@@ -25,12 +25,12 @@ class EntityReferenceFieldItemList extends FieldItemList implements EntityRefere
    */
   public function referencedEntities() {
     if (empty($this->list)) {
-      return array();
+      return [];
     }
 
     // Collect the IDs of existing entities to load, and directly grab the
     // "autocreate" entities that are already populated in $item->entity.
-    $target_entities = $ids = array();
+    $target_entities = $ids = [];
     foreach ($this->list as $delta => $item) {
       if ($item->target_id !== NULL) {
         $ids[$delta] = $item->target_id;
@@ -64,7 +64,7 @@ class EntityReferenceFieldItemList extends FieldItemList implements EntityRefere
 
     if ($default_value) {
       // Convert UUIDs to numeric IDs.
-      $uuids = array();
+      $uuids = [];
       foreach ($default_value as $delta => $properties) {
         if (isset($properties['target_uuid'])) {
           $uuids[$delta] = $properties['target_uuid'];
@@ -79,7 +79,7 @@ class EntityReferenceFieldItemList extends FieldItemList implements EntityRefere
           ->getStorage($target_type)
           ->loadMultiple($entity_ids);
 
-        $entity_uuids = array();
+        $entity_uuids = [];
         foreach ($entities as $id => $entity) {
           $entity_uuids[$entity->uuid()] = $id;
         }
@@ -107,7 +107,7 @@ class EntityReferenceFieldItemList extends FieldItemList implements EntityRefere
     $default_value = parent::defaultValuesFormSubmit($element, $form, $form_state);
 
     // Convert numeric IDs to UUIDs to ensure config deployability.
-    $ids = array();
+    $ids = [];
     foreach ($default_value as $delta => $properties) {
       if (isset($properties['entity']) && $properties['entity']->isNew()) {
         // This may be a newly created term.
diff --git a/web/core/lib/Drupal/Core/Field/FieldConfigBase.php b/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
index d7ddd1898..76366bfe2 100644
--- a/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -89,7 +89,7 @@ abstract class FieldConfigBase extends ConfigEntityBase implements FieldConfigIn
    *
    * @var array
    */
-  protected $settings = array();
+  protected $settings = [];
 
   /**
    * Flag indicating whether the field is required.
@@ -139,7 +139,7 @@ abstract class FieldConfigBase extends ConfigEntityBase implements FieldConfigIn
    *
    * @var array
    */
-  protected $default_value = array();
+  protected $default_value = [];
 
   /**
    * The name of a callback function that returns default values.
@@ -413,9 +413,9 @@ abstract class FieldConfigBase extends ConfigEntityBase implements FieldConfigIn
       $key = $this->getFieldStorageDefinition()->getPropertyNames()[0];
       // Convert to the multi value format to support fields with a cardinality
       // greater than 1.
-      $value = array(
-        array($key => $value),
-      );
+      $value = [
+        [$key => $value],
+      ];
     }
     $this->default_value = $value;
     return $this;
diff --git a/web/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php b/web/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
index a7b613b44..dbfda4476 100644
--- a/web/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
+++ b/web/core/lib/Drupal/Core/Field/FieldDefinitionInterface.php
@@ -137,10 +137,13 @@ interface FieldDefinitionInterface extends ListDataDefinitionInterface, Cacheabl
    *   - label: (string) Position of the field label. The default 'field' theme
    *     implementation supports the values 'inline', 'above' and 'hidden'.
    *     Defaults to 'above'. Only applies to 'view' context.
+   *   - region: (string) The region the field is in, or 'hidden'. If not
+   *     specified, the default region will be used.
    *   - type: (string) The plugin (widget or formatter depending on
-   *     $display_context) to use, or 'hidden'. If not specified or if the
-   *     requested plugin is unknown, the 'default_widget' / 'default_formatter'
-   *     for the field type will be used.
+   *     $display_context) to use. If not specified or if the requested plugin
+   *     is unknown, the 'default_widget' / 'default_formatter' for the field
+   *     type will be used. Previously 'hidden' was a valid value, it is now
+   *     deprecated in favor of specifying 'region' => 'hidden'.
    *   - settings: (array) Settings for the plugin specified above. The default
    *     settings for the plugin will be used for settings left unspecified.
    *   - third_party_settings: (array) Settings provided by other extensions
diff --git a/web/core/lib/Drupal/Core/Field/FieldItemBase.php b/web/core/lib/Drupal/Core/Field/FieldItemBase.php
index d489c8e1b..84d73ec5b 100644
--- a/web/core/lib/Drupal/Core/Field/FieldItemBase.php
+++ b/web/core/lib/Drupal/Core/Field/FieldItemBase.php
@@ -23,14 +23,14 @@ abstract class FieldItemBase extends Map implements FieldItemInterface {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    return array();
+    return [];
   }
 
   /**
@@ -106,7 +106,7 @@ abstract class FieldItemBase extends Map implements FieldItemInterface {
     // given.
     if (isset($values) && !is_array($values)) {
       $keys = array_keys($this->definition->getPropertyDefinitions());
-      $values = array($keys[0] => $values);
+      $values = [$keys[0] => $values];
     }
     parent::setValue($values, $notify);
   }
@@ -183,7 +183,7 @@ abstract class FieldItemBase extends Map implements FieldItemInterface {
   /**
    * {@inheritdoc}
    */
-  public function view($display_options = array()) {
+  public function view($display_options = []) {
     $view_builder = \Drupal::entityManager()->getViewBuilder($this->getEntity()->getEntityTypeId());
     return $view_builder->viewFieldItem($this, $display_options);
   }
@@ -217,14 +217,14 @@ abstract class FieldItemBase extends Map implements FieldItemInterface {
    * {@inheritdoc}
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
-    return array();
+    return [];
   }
 
   /**
@@ -259,7 +259,7 @@ abstract class FieldItemBase extends Map implements FieldItemInterface {
    * {@inheritdoc}
    */
   public static function calculateDependencies(FieldDefinitionInterface $field_definition) {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/FieldItemInterface.php b/web/core/lib/Drupal/Core/Field/FieldItemInterface.php
index a257dd0f7..69906c141 100644
--- a/web/core/lib/Drupal/Core/Field/FieldItemInterface.php
+++ b/web/core/lib/Drupal/Core/Field/FieldItemInterface.php
@@ -173,7 +173,7 @@ interface FieldItemInterface extends ComplexDataInterface {
    * @see \Drupal\Core\Entity\EntityViewBuilderInterface::viewFieldItem()
    * @see \Drupal\Core\Field\FieldItemListInterface::view()
    */
-  public function view($display_options = array());
+  public function view($display_options = []);
 
   /**
    * Defines custom presave behavior for field values.
diff --git a/web/core/lib/Drupal/Core/Field/FieldItemList.php b/web/core/lib/Drupal/Core/Field/FieldItemList.php
index 97dd49319..a1a1ebdb9 100644
--- a/web/core/lib/Drupal/Core/Field/FieldItemList.php
+++ b/web/core/lib/Drupal/Core/Field/FieldItemList.php
@@ -24,7 +24,7 @@ class FieldItemList extends ItemList implements FieldItemListInterface {
    *
    * @var \Drupal\Core\Field\FieldItemInterface[]
    */
-  protected $list = array();
+  protected $list = [];
 
   /**
    * The langcode of the field values held in the object.
@@ -99,7 +99,7 @@ class FieldItemList extends ItemList implements FieldItemListInterface {
    * @todo Revisit the need when all entity types are converted to NG entities.
    */
   public function getValue($include_computed = FALSE) {
-    $values = array();
+    $values = [];
     foreach ($this->list as $delta => $item) {
       $values[$delta] = $item->getValue($include_computed);
     }
@@ -113,7 +113,7 @@ class FieldItemList extends ItemList implements FieldItemListInterface {
     // Support passing in only the value of the first item, either as a literal
     // (value of the first property) or as an array of properties.
     if (isset($values) && (!is_array($values) || (!empty($values) && !is_numeric(current(array_keys($values)))))) {
-      $values = array(0 => $values);
+      $values = [0 => $values];
     }
     parent::setValue($values, $notify);
   }
@@ -249,7 +249,7 @@ class FieldItemList extends ItemList implements FieldItemListInterface {
   /**
    * {@inheritdoc}
    */
-  public function view($display_options = array()) {
+  public function view($display_options = []) {
     $view_builder = \Drupal::entityManager()->getViewBuilder($this->getEntity()->getEntityTypeId());
     return $view_builder->viewField($this, $display_options);
   }
@@ -278,10 +278,10 @@ class FieldItemList extends ItemList implements FieldItemListInterface {
     if ($cardinality != FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED) {
       $constraints[] = $this->getTypedDataManager()
         ->getValidationConstraintManager()
-        ->create('Count', array(
+        ->create('Count', [
           'max' => $cardinality,
-          'maxMessage' => t('%name: this field cannot hold more than @count values.', array('%name' => $this->getFieldDefinition()->getLabel(), '@count' => $cardinality)),
-        ));
+          'maxMessage' => t('%name: this field cannot hold more than @count values.', ['%name' => $this->getFieldDefinition()->getLabel(), '@count' => $cardinality]),
+        ]);
     }
 
     return $constraints;
@@ -294,7 +294,7 @@ class FieldItemList extends ItemList implements FieldItemListInterface {
     if (empty($this->getFieldDefinition()->getDefaultValueCallback())) {
       if ($widget = $this->defaultValueWidget($form_state)) {
         // Place the input in a separate place in the submitted values tree.
-        $element = array('#parents' => array('default_value_input'));
+        $element = ['#parents' => ['default_value_input']];
         $element += $widget->form($this, $element, $form_state);
 
         return $element;
@@ -365,7 +365,7 @@ class FieldItemList extends ItemList implements FieldItemListInterface {
       $entity_form_display = entity_get_form_display($entity->getEntityTypeId(), $entity->bundle(), 'default');
       $widget = $entity_form_display->getRenderer($this->getFieldDefinition()->getName());
       if (!$widget) {
-        $widget = \Drupal::service('plugin.manager.field.widget')->getInstance(array('field_definition' => $this->getFieldDefinition()));
+        $widget = \Drupal::service('plugin.manager.field.widget')->getInstance(['field_definition' => $this->getFieldDefinition()]);
       }
 
       $form_state->set('default_value_widget', $widget);
diff --git a/web/core/lib/Drupal/Core/Field/FieldItemListInterface.php b/web/core/lib/Drupal/Core/Field/FieldItemListInterface.php
index 4e77202b6..c350432e2 100644
--- a/web/core/lib/Drupal/Core/Field/FieldItemListInterface.php
+++ b/web/core/lib/Drupal/Core/Field/FieldItemListInterface.php
@@ -181,7 +181,7 @@ interface FieldItemListInterface extends ListInterface, AccessibleInterface {
    * @see \Drupal\Core\Entity\EntityViewBuilderInterface::viewField()
    * @see \Drupal\Core\Field\FieldItemInterface::view()
    */
-  public function view($display_options = array());
+  public function view($display_options = []);
 
   /**
    * Populates a specified number of field items with valid sample data.
diff --git a/web/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php b/web/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php
index d1adaa932..08a27cb76 100644
--- a/web/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php
+++ b/web/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php
@@ -3,6 +3,7 @@
 namespace Drupal\Core\Field;
 
 use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\FieldableEntityStorageInterface;
 use Drupal\Core\Extension\ModuleUninstallValidatorInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -34,7 +35,7 @@ class FieldModuleUninstallValidator implements ModuleUninstallValidatorInterface
    * {@inheritdoc}
    */
   public function validate($module_name) {
-    $reasons = array();
+    $reasons = [];
 
     // We skip fields provided by the Field module as it implements field
     // purging.
@@ -43,15 +44,15 @@ class FieldModuleUninstallValidator implements ModuleUninstallValidatorInterface
         // We skip entity types defined by the module as there must be no
         // content to be able to uninstall them anyway.
         // See \Drupal\Core\Entity\ContentUninstallValidator.
-        if ($entity_type->getProvider() != $module_name && $entity_type->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface')) {
+        if ($entity_type->getProvider() != $module_name && $entity_type->entityClassImplements(FieldableEntityInterface::class)) {
           foreach ($this->entityManager->getFieldStorageDefinitions($entity_type_id) as $storage_definition) {
             if ($storage_definition->getProvider() == $module_name) {
               $storage = $this->entityManager->getStorage($entity_type_id);
               if ($storage instanceof FieldableEntityStorageInterface && $storage->countFieldData($storage_definition, TRUE)) {
-                $reasons[] = $this->t('There is data for the field @field-name on entity type @entity_type', array(
+                $reasons[] = $this->t('There is data for the field @field-name on entity type @entity_type', [
                   '@field-name' => $storage_definition->getName(),
                   '@entity_type' => $entity_type->getLabel(),
-                ));
+                ]);
               }
             }
           }
diff --git a/web/core/lib/Drupal/Core/Field/FieldStorageDefinitionEventSubscriberTrait.php b/web/core/lib/Drupal/Core/Field/FieldStorageDefinitionEventSubscriberTrait.php
index 5ac4b6e0d..895045bda 100644
--- a/web/core/lib/Drupal/Core/Field/FieldStorageDefinitionEventSubscriberTrait.php
+++ b/web/core/lib/Drupal/Core/Field/FieldStorageDefinitionEventSubscriberTrait.php
@@ -22,7 +22,7 @@ trait FieldStorageDefinitionEventSubscriberTrait {
    * @see \Symfony\Component\EventDispatcher\EventSubscriberInterface::getSubscribedEvents()
    */
   public static function getFieldStorageDefinitionEvents() {
-    $event = array('onFieldStorageDefinitionEvent', 100);
+    $event = ['onFieldStorageDefinitionEvent', 100];
     $events[FieldStorageDefinitionEvents::CREATE][] = $event;
     $events[FieldStorageDefinitionEvents::UPDATE][] = $event;
     $events[FieldStorageDefinitionEvents::DELETE][] = $event;
diff --git a/web/core/lib/Drupal/Core/Field/FieldTypePluginManager.php b/web/core/lib/Drupal/Core/Field/FieldTypePluginManager.php
index 84bb4c091..905cdb4f1 100644
--- a/web/core/lib/Drupal/Core/Field/FieldTypePluginManager.php
+++ b/web/core/lib/Drupal/Core/Field/FieldTypePluginManager.php
@@ -61,7 +61,7 @@ class FieldTypePluginManager extends DefaultPluginManager implements FieldTypePl
    * @return \Drupal\Core\Field\FieldItemInterface
    *   The instantiated object.
    */
-  public function createInstance($field_type, array $configuration = array()) {
+  public function createInstance($field_type, array $configuration = []) {
     $configuration['data_definition'] = $configuration['field_definition']->getItemDefinition();
     return $this->typedDataManager->createInstance("field_item:$field_type", $configuration);
   }
@@ -106,7 +106,7 @@ class FieldTypePluginManager extends DefaultPluginManager implements FieldTypePl
       $plugin_class = DefaultFactory::getPluginClass($type, $plugin_definition);
       return $plugin_class::defaultStorageSettings();
     }
-    return array();
+    return [];
   }
 
   /**
@@ -118,7 +118,7 @@ class FieldTypePluginManager extends DefaultPluginManager implements FieldTypePl
       $plugin_class = DefaultFactory::getPluginClass($type, $plugin_definition);
       return $plugin_class::defaultFieldSettings();
     }
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/FormatterBase.php b/web/core/lib/Drupal/Core/Field/FormatterBase.php
index db7587ae2..3b3abcc61 100644
--- a/web/core/lib/Drupal/Core/Field/FormatterBase.php
+++ b/web/core/lib/Drupal/Core/Field/FormatterBase.php
@@ -60,7 +60,7 @@ abstract class FormatterBase extends PluginSettingsBase implements FormatterInte
    *   Any third party settings.
    */
   public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings) {
-    parent::__construct(array(), $plugin_id, $plugin_definition);
+    parent::__construct([], $plugin_id, $plugin_definition);
 
     $this->fieldDefinition = $field_definition;
     $this->settings = $settings;
@@ -85,7 +85,7 @@ abstract class FormatterBase extends PluginSettingsBase implements FormatterInte
       $entity = $items->getEntity();
       $entity_type = $entity->getEntityTypeId();
       $field_name = $this->fieldDefinition->getName();
-      $info = array(
+      $info = [
         '#theme' => 'field',
         '#title' => $this->fieldDefinition->getLabel(),
         '#label_display' => $this->label,
@@ -100,7 +100,7 @@ abstract class FormatterBase extends PluginSettingsBase implements FormatterInte
         '#items' => $items,
         '#formatter' => $this->getPluginId(),
         '#is_multiple' => $this->fieldDefinition->getFieldStorageDefinition()->isMultiple(),
-      );
+      ];
 
       $elements = array_merge($info, $elements);
     }
@@ -112,14 +112,14 @@ abstract class FormatterBase extends PluginSettingsBase implements FormatterInte
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/FormatterPluginManager.php b/web/core/lib/Drupal/Core/Field/FormatterPluginManager.php
index ca9bd0687..c4df0f5f2 100644
--- a/web/core/lib/Drupal/Core/Field/FormatterPluginManager.php
+++ b/web/core/lib/Drupal/Core/Field/FormatterPluginManager.php
@@ -52,7 +52,7 @@ class FormatterPluginManager extends DefaultPluginManager {
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     $plugin_definition = $this->getDefinition($plugin_id);
     $plugin_class = DefaultFactory::getPluginClass($plugin_id, $plugin_definition);
 
@@ -119,10 +119,10 @@ class FormatterPluginManager extends DefaultPluginManager {
       $plugin_id = $field_type_definition['default_formatter'];
     }
 
-    $configuration += array(
+    $configuration += [
       'field_definition' => $field_definition,
       'view_mode' => $options['view_mode'],
-    );
+    ];
     return $this->createInstance($plugin_id, $configuration);
   }
 
@@ -139,11 +139,11 @@ class FormatterPluginManager extends DefaultPluginManager {
    */
   public function prepareConfiguration($field_type, array $configuration) {
     // Fill in defaults for missing properties.
-    $configuration += array(
+    $configuration += [
       'label' => 'above',
-      'settings' => array(),
-      'third_party_settings' => array(),
-    );
+      'settings' => [],
+      'third_party_settings' => [],
+    ];
     // If no formatter is specified, use the default formatter.
     if (!isset($configuration['type'])) {
       $field_type = $this->fieldTypeManager->getDefinition($field_type);
@@ -168,10 +168,10 @@ class FormatterPluginManager extends DefaultPluginManager {
    */
   public function getOptions($field_type = NULL) {
     if (!isset($this->formatterOptions)) {
-      $options = array();
+      $options = [];
       $field_types = $this->fieldTypeManager->getDefinitions();
       $formatter_types = $this->getDefinitions();
-      uasort($formatter_types, array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
+      uasort($formatter_types, ['Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
       foreach ($formatter_types as $name => $formatter_type) {
         foreach ($formatter_type['field_types'] as $formatter_field_type) {
           // Check that the field type exists.
@@ -183,7 +183,7 @@ class FormatterPluginManager extends DefaultPluginManager {
       $this->formatterOptions = $options;
     }
     if ($field_type) {
-      return !empty($this->formatterOptions[$field_type]) ? $this->formatterOptions[$field_type] : array();
+      return !empty($this->formatterOptions[$field_type]) ? $this->formatterOptions[$field_type] : [];
     }
     return $this->formatterOptions;
   }
@@ -204,7 +204,7 @@ class FormatterPluginManager extends DefaultPluginManager {
       $plugin_class = DefaultFactory::getPluginClass($type, $plugin_definition);
       return $plugin_class::defaultSettings();
     }
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/DataType/Deriver/FieldItemDeriver.php b/web/core/lib/Drupal/Core/Field/Plugin/DataType/Deriver/FieldItemDeriver.php
index 0d9933887..de57317e2 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/DataType/Deriver/FieldItemDeriver.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/DataType/Deriver/FieldItemDeriver.php
@@ -16,7 +16,7 @@ class FieldItemDeriver implements ContainerDeriverInterface {
    *
    * @var array
    */
-  protected $derivatives = array();
+  protected $derivatives = [];
 
   /**
    * The base plugin ID this derivative is for.
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BooleanFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BooleanFormatter.php
index 60c632a44..c52a2d7be 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BooleanFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BooleanFormatter.php
@@ -67,10 +67,10 @@ class BooleanFormatter extends FormatterBase {
     foreach ($this->getOutputFormats() as $format_name => $format) {
       if (is_array($format)) {
         if ($format_name == 'default') {
-          $formats[$format_name] = $this->t('Field settings (@on_label / @off_label)', array('@on_label' => $format[0], '@off_label' => $format[1]));
+          $formats[$format_name] = $this->t('Field settings (@on_label / @off_label)', ['@on_label' => $format[0], '@off_label' => $format[1]]);
         }
         else {
-          $formats[$format_name] = $this->t('@on_label / @off_label', array('@on_label' => $format[0], '@off_label' => $format[1]));
+          $formats[$format_name] = $this->t('@on_label / @off_label', ['@on_label' => $format[0], '@off_label' => $format[1]]);
         }
       }
       else {
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
index 0c389291e..58e8fffc7 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
@@ -26,12 +26,12 @@ class DecimalFormatter extends NumericFormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'thousand_separator' => '',
       'decimal_separator' => '.',
       'scale' => 2,
       'prefix_suffix' => TRUE,
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -40,22 +40,22 @@ class DecimalFormatter extends NumericFormatterBase {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $elements = parent::settingsForm($form, $form_state);
 
-    $elements['decimal_separator'] = array(
+    $elements['decimal_separator'] = [
       '#type' => 'select',
       '#title' => t('Decimal marker'),
-      '#options' => array('.' => t('Decimal point'), ',' => t('Comma')),
+      '#options' => ['.' => t('Decimal point'), ',' => t('Comma')],
       '#default_value' => $this->getSetting('decimal_separator'),
       '#weight' => 5,
-    );
-    $elements['scale'] = array(
+    ];
+    $elements['scale'] = [
       '#type' => 'number',
-      '#title' => t('Scale', array(), array('context' => 'decimal places')),
+      '#title' => t('Scale', [], ['context' => 'decimal places']),
       '#min' => 0,
       '#max' => 10,
       '#default_value' => $this->getSetting('scale'),
       '#description' => t('The number of digits to the right of the decimal.'),
       '#weight' => 6,
-    );
+    ];
 
     return $elements;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
index 2692d84e1..af994361f 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
@@ -118,23 +118,23 @@ class EntityReferenceEntityFormatter extends EntityReferenceFormatterBase implem
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'view_mode' => 'default',
       'link' => FALSE,
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $elements['view_mode'] = array(
+    $elements['view_mode'] = [
       '#type' => 'select',
       '#options' => $this->entityDisplayRepository->getViewModeOptions($this->getFieldSetting('target_type')),
       '#title' => t('View mode'),
       '#default_value' => $this->getSetting('view_mode'),
       '#required' => TRUE,
-    );
+    ];
 
     return $elements;
   }
@@ -143,11 +143,11 @@ class EntityReferenceEntityFormatter extends EntityReferenceFormatterBase implem
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $view_modes = $this->entityDisplayRepository->getViewModeOptions($this->getFieldSetting('target_type'));
     $view_mode = $this->getSetting('view_mode');
-    $summary[] = t('Rendered as @mode', array('@mode' => isset($view_modes[$view_mode]) ? $view_modes[$view_mode] : $view_mode));
+    $summary[] = t('Rendered as @mode', ['@mode' => isset($view_modes[$view_mode]) ? $view_modes[$view_mode] : $view_mode]);
 
     return $summary;
   }
@@ -157,7 +157,7 @@ class EntityReferenceEntityFormatter extends EntityReferenceFormatterBase implem
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
     $view_mode = $this->getSetting('view_mode');
-    $elements = array();
+    $elements = [];
 
     foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) {
       // Due to render caching and delayed calls, the viewElements() method
@@ -199,7 +199,7 @@ class EntityReferenceEntityFormatter extends EntityReferenceFormatterBase implem
       // entity's url. Since we don't know what the markup of the entity will
       // be, we shouldn't rely on it for structured data such as RDFa.
       if (!empty($items[$delta]->_attributes) && !$entity->isNew() && $entity->hasLinkTemplate('canonical')) {
-        $items[$delta]->_attributes += array('resource' => $entity->toUrl()->toString());
+        $items[$delta]->_attributes += ['resource' => $entity->toUrl()->toString()];
       }
     }
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php
index f4132279e..12a349afe 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceFormatterBase.php
@@ -40,7 +40,7 @@ abstract class EntityReferenceFormatterBase extends FormatterBase {
    * @see ::prepareView()
    */
   protected function getEntitiesToView(EntityReferenceFieldItemListInterface $items, $langcode) {
-    $entities = array();
+    $entities = [];
 
     foreach ($items as $delta => $item) {
       // Ignore items where no entity could be loaded in prepareView().
@@ -120,7 +120,7 @@ abstract class EntityReferenceFormatterBase extends FormatterBase {
     // "multiple entity load" to load all the entities for the multiple
     // "entity reference item lists" being displayed. We thus cannot use
     // \Drupal\Core\Field\EntityReferenceFieldItemList::referencedEntities().
-    $ids = array();
+    $ids = [];
     foreach ($entities_items as $items) {
       foreach ($items as $item) {
         // To avoid trying to reload non-existent entities in
@@ -169,9 +169,9 @@ abstract class EntityReferenceFormatterBase extends FormatterBase {
   /**
    * Checks access to the given entity.
    *
-   * By default, entity access is checked. However, a subclass can choose to
-   * exclude certain items from entity access checking by immediately granting
-   * access.
+   * By default, entity 'view' access is checked. However, a subclass can choose
+   * to exclude certain items from entity access checking by immediately
+   * granting access.
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *    The entity to check.
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php
index 62e54a777..9fa695de0 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceIdFormatter.php
@@ -22,19 +22,19 @@ class EntityReferenceIdFormatter extends EntityReferenceFormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) {
       if ($entity->id()) {
-        $elements[$delta] = array(
+        $elements[$delta] = [
           '#plain_text' => $entity->id(),
           // Create a cache tag entry for the referenced entity. In the case
           // that the referenced entity is deleted, the cache for referring
           // entities must be cleared.
-          '#cache' => array(
+          '#cache' => [
             'tags' => $entity->getCacheTags(),
-          ),
-        );
+          ],
+        ];
       }
     }
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php
index 2084339f9..011e3051e 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
 
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Exception\UndefinedLinkTemplateException;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -24,20 +25,20 @@ class EntityReferenceLabelFormatter extends EntityReferenceFormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'link' => TRUE,
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $elements['link'] = array(
+    $elements['link'] = [
       '#title' => t('Link label to the referenced entity'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('link'),
-    );
+    ];
 
     return $elements;
   }
@@ -46,7 +47,7 @@ class EntityReferenceLabelFormatter extends EntityReferenceFormatterBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
     $summary[] = $this->getSetting('link') ? t('Link to the referenced entity') : t('No link');
     return $summary;
   }
@@ -55,7 +56,7 @@ class EntityReferenceLabelFormatter extends EntityReferenceFormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
     $output_as_link = $this->getSetting('link');
 
     foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) {
@@ -84,7 +85,7 @@ class EntityReferenceLabelFormatter extends EntityReferenceFormatterBase {
         ];
 
         if (!empty($items[$delta]->_attributes)) {
-          $elements[$delta]['#options'] += array('attributes' => array());
+          $elements[$delta]['#options'] += ['attributes' => []];
           $elements[$delta]['#options']['attributes'] += $items[$delta]->_attributes;
           // Unset field item attributes since they have been included in the
           // formatter output and shouldn't be rendered in the field template.
@@ -92,7 +93,7 @@ class EntityReferenceLabelFormatter extends EntityReferenceFormatterBase {
         }
       }
       else {
-        $elements[$delta] = array('#plain_text' => $label);
+        $elements[$delta] = ['#plain_text' => $label];
       }
       $elements[$delta]['#cache']['tags'] = $entity->getCacheTags();
     }
@@ -100,4 +101,11 @@ class EntityReferenceLabelFormatter extends EntityReferenceFormatterBase {
     return $elements;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkAccess(EntityInterface $entity) {
+    return $entity->access('view label', NULL, TRUE);
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/IntegerFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/IntegerFormatter.php
index 17ddf9cbc..058de4d34 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/IntegerFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/IntegerFormatter.php
@@ -23,10 +23,10 @@ class IntegerFormatter extends NumericFormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'thousand_separator' => '',
       'prefix_suffix' => TRUE,
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
index 3a0ee89d5..43bbaa530 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/LanguageFormatter.php
@@ -89,11 +89,11 @@ class LanguageFormatter extends StringFormatter {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $form = parent::settingsForm($form, $form_state);
-    $form['native_language'] = array(
+    $form['native_language'] = [
       '#title' => $this->t('Display in native language'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('native_language'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/MailToFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/MailToFormatter.php
index 4b9c011cc..3cc343041 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/MailToFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/MailToFormatter.php
@@ -23,14 +23,14 @@ class MailToFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#type' => 'link',
         '#title' => $item->value,
         '#url' => Url::fromUri('mailto:' . $item->value),
-      );
+      ];
     }
 
     return $elements;
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php
index 0e35629e8..cf75facc8 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php
@@ -18,28 +18,28 @@ abstract class NumericFormatterBase extends FormatterBase {
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $options = array(
+    $options = [
       ''  => t('- None -'),
       '.' => t('Decimal point'),
       ',' => t('Comma'),
       ' ' => t('Space'),
       chr(8201) => t('Thin space'),
       "'" => t('Apostrophe'),
-    );
-    $elements['thousand_separator'] = array(
+    ];
+    $elements['thousand_separator'] = [
       '#type' => 'select',
       '#title' => t('Thousand marker'),
       '#options' => $options,
       '#default_value' => $this->getSetting('thousand_separator'),
       '#weight' => 0,
-    );
+    ];
 
-    $elements['prefix_suffix'] = array(
+    $elements['prefix_suffix'] = [
       '#type' => 'checkbox',
       '#title' => t('Display prefix and suffix'),
       '#default_value' => $this->getSetting('prefix_suffix'),
       '#weight' => 10,
-    );
+    ];
 
     return $elements;
   }
@@ -48,7 +48,7 @@ abstract class NumericFormatterBase extends FormatterBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $summary[] = $this->numberFormat(1234.1234567890);
     if ($this->getSetting('prefix_suffix')) {
@@ -62,7 +62,7 @@ abstract class NumericFormatterBase extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
     $settings = $this->getFieldSettings();
 
     foreach ($items as $delta => $item) {
@@ -70,8 +70,8 @@ abstract class NumericFormatterBase extends FormatterBase {
 
       // Account for prefix and suffix.
       if ($this->getSetting('prefix_suffix')) {
-        $prefixes = isset($settings['prefix']) ? array_map(array('Drupal\Core\Field\FieldFilteredMarkup', 'create'), explode('|', $settings['prefix'])) : array('');
-        $suffixes = isset($settings['suffix']) ? array_map(array('Drupal\Core\Field\FieldFilteredMarkup', 'create'), explode('|', $settings['suffix'])) : array('');
+        $prefixes = isset($settings['prefix']) ? array_map(['Drupal\Core\Field\FieldFilteredMarkup', 'create'], explode('|', $settings['prefix'])) : [''];
+        $suffixes = isset($settings['suffix']) ? array_map(['Drupal\Core\Field\FieldFilteredMarkup', 'create'], explode('|', $settings['suffix'])) : [''];
         $prefix = (count($prefixes) > 1) ? $this->formatPlural($item->value, $prefixes[0], $prefixes[1]) : $prefixes[0];
         $suffix = (count($suffixes) > 1) ? $this->formatPlural($item->value, $suffixes[0], $suffixes[1]) : $suffixes[0];
         $output = $prefix . $output . $suffix;
@@ -79,10 +79,10 @@ abstract class NumericFormatterBase extends FormatterBase {
       // Output the raw value in a content attribute if the text of the HTML
       // element differs from the raw value (for example when a prefix is used).
       if (isset($item->_attributes) && $item->value != $output) {
-        $item->_attributes += array('content' => $item->value);
+        $item->_attributes += ['content' => $item->value];
       }
 
-      $elements[$delta] = array('#markup' => $output);
+      $elements[$delta] = ['#markup' => $output];
     }
 
     return $elements;
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericUnformattedFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericUnformattedFormatter.php
index 9881473d1..63246b3ff 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericUnformattedFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericUnformattedFormatter.php
@@ -24,10 +24,10 @@ class NumericUnformattedFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
-      $elements[$delta] = array('#markup' => $item->value);
+      $elements[$delta] = ['#markup' => $item->value];
     }
 
     return $elements;
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
index a1f618b90..95ab0b2cf 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
@@ -113,7 +113,7 @@ class StringFormatter extends FormatterBase implements ContainerFactoryPluginInt
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
     $url = NULL;
     if ($this->getSetting('link_to_entity')) {
       // For the default revision this falls back to 'canonical'
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
index 2d7ce8100..55a2fb1a0 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
@@ -93,11 +93,11 @@ class TimestampAgoFormatter extends FormatterBase implements ContainerFactoryPlu
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'future_format' => '@interval hence',
       'past_format' => '@interval ago',
       'granularity' => 2,
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -106,28 +106,28 @@ class TimestampAgoFormatter extends FormatterBase implements ContainerFactoryPlu
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $elements = parent::settingsForm($form, $form_state);
 
-    $form['future_format'] = array(
+    $form['future_format'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Future format'),
       '#default_value' => $this->getSetting('future_format'),
       '#description' => $this->t('Use <em>@interval</em> where you want the formatted interval text to appear.'),
-    );
+    ];
 
-    $form['past_format'] = array(
+    $form['past_format'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Past format'),
       '#default_value' => $this->getSetting('past_format'),
       '#description' => $this->t('Use <em>@interval</em> where you want the formatted interval text to appear.'),
-    );
+    ];
 
-    $elements['granularity'] = array(
+    $elements['granularity'] = [
       '#type' => 'number',
       '#title' => $this->t('Granularity'),
       '#description' => $this->t('How many time interval units should be shown in the formatted output.'),
       '#default_value' => $this->getSetting('granularity') ?: 2,
       '#min' => 1,
       '#max' => 6,
-    );
+    ];
 
     return $elements;
   }
@@ -140,8 +140,8 @@ class TimestampAgoFormatter extends FormatterBase implements ContainerFactoryPlu
 
     $future_date = strtotime('1 year 1 month 1 week 1 day 1 hour 1 minute');
     $past_date = strtotime('-1 year -1 month -1 week -1 day -1 hour -1 minute');
-    $summary[] = $this->t('Future date: %display', array('%display' => $this->formatTimestamp($future_date)));
-    $summary[] = $this->t('Past date: %display', array('%display' => $this->formatTimestamp($past_date)));
+    $summary[] = $this->t('Future date: %display', ['%display' => $this->formatTimestamp($future_date)]);
+    $summary[] = $this->t('Past date: %display', ['%display' => $this->formatTimestamp($past_date)]);
 
     return $summary;
   }
@@ -150,7 +150,7 @@ class TimestampAgoFormatter extends FormatterBase implements ContainerFactoryPlu
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
       if ($item->value) {
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php
index 8efe8d5a7..a24f5dd9b 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php
@@ -90,11 +90,11 @@ class TimestampFormatter extends FormatterBase implements ContainerFactoryPlugin
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'date_format' => 'medium',
       'custom_date_format' => '',
       'timezone' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -103,38 +103,38 @@ class TimestampFormatter extends FormatterBase implements ContainerFactoryPlugin
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $elements = parent::settingsForm($form, $form_state);
 
-    $date_formats = array();
+    $date_formats = [];
 
     foreach ($this->dateFormatStorage->loadMultiple() as $machine_name => $value) {
-      $date_formats[$machine_name] = $this->t('@name format: @date', array('@name' => $value->label(), '@date' => $this->dateFormatter->format(REQUEST_TIME, $machine_name)));
+      $date_formats[$machine_name] = $this->t('@name format: @date', ['@name' => $value->label(), '@date' => $this->dateFormatter->format(REQUEST_TIME, $machine_name)]);
     }
 
     $date_formats['custom'] = $this->t('Custom');
 
-    $elements['date_format'] = array(
+    $elements['date_format'] = [
       '#type' => 'select',
       '#title' => $this->t('Date format'),
       '#options' => $date_formats,
       '#default_value' => $this->getSetting('date_format') ?: 'medium',
-    );
+    ];
 
-    $elements['custom_date_format'] = array(
+    $elements['custom_date_format'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Custom date format'),
       '#description' => $this->t('See <a href="http://php.net/manual/function.date.php" target="_blank">the documentation for PHP date formats</a>.'),
       '#default_value' => $this->getSetting('custom_date_format') ?: '',
-    );
+    ];
 
-    $elements['custom_date_format']['#states']['visible'][] = array(
-      ':input[name="fields[' . $this->fieldDefinition->getName() . '][settings_edit_form][settings][date_format]"]' => array('value' => 'custom'),
-    );
+    $elements['custom_date_format']['#states']['visible'][] = [
+      ':input[name="fields[' . $this->fieldDefinition->getName() . '][settings_edit_form][settings][date_format]"]' => ['value' => 'custom'],
+    ];
 
-    $elements['timezone'] = array(
+    $elements['timezone'] = [
       '#type' => 'select',
       '#title' => $this->t('Time zone'),
-      '#options' => array('' => $this->t('- Default site/user time zone -')) + system_time_zones(FALSE),
+      '#options' => ['' => $this->t('- Default site/user time zone -')] + system_time_zones(FALSE),
       '#default_value' => $this->getSetting('timezone'),
-    );
+    ];
 
     return $elements;
   }
@@ -146,12 +146,12 @@ class TimestampFormatter extends FormatterBase implements ContainerFactoryPlugin
     $summary = parent::settingsSummary();
 
     $date_format = $this->getSetting('date_format');
-    $summary[] = $this->t('Date format: @date_format', array('@date_format' => $date_format));
+    $summary[] = $this->t('Date format: @date_format', ['@date_format' => $date_format]);
     if ($this->getSetting('date_format') === 'custom' && ($custom_date_format = $this->getSetting('custom_date_format'))) {
-      $summary[] = $this->t('Custom date format: @custom_date_format', array('@custom_date_format' => $custom_date_format));
+      $summary[] = $this->t('Custom date format: @custom_date_format', ['@custom_date_format' => $custom_date_format]);
     }
     if ($timezone = $this->getSetting('timezone')) {
-      $summary[] = $this->t('Time zone: @timezone', array('@timezone' => $timezone));
+      $summary[] = $this->t('Time zone: @timezone', ['@timezone' => $timezone]);
     }
 
     return $summary;
@@ -161,7 +161,7 @@ class TimestampFormatter extends FormatterBase implements ContainerFactoryPlugin
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     $date_format = $this->getSetting('date_format');
     $custom_date_format = '';
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/UriLinkFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/UriLinkFormatter.php
index 8f2213e13..42163513e 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/UriLinkFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/UriLinkFormatter.php
@@ -23,7 +23,7 @@ class UriLinkFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
       if (!$item->isEmpty()) {
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php
index 01931913a..51a29d860 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/BooleanItem.php
@@ -28,10 +28,10 @@ class BooleanItem extends FieldItemBase implements OptionsProviderInterface {
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    return array(
+    return [
       'on_label' => new TranslatableMarkup('On'),
       'off_label' => new TranslatableMarkup('Off'),
-    ) + parent::defaultFieldSettings();
+    ] + parent::defaultFieldSettings();
   }
 
   /**
@@ -49,34 +49,34 @@ class BooleanItem extends FieldItemBase implements OptionsProviderInterface {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'int',
           'size' => 'tiny',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
-    $element = array();
+    $element = [];
 
-    $element['on_label'] = array(
+    $element['on_label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('"On" label'),
       '#default_value' => $this->getSetting('on_label'),
       '#required' => TRUE,
-    );
-    $element['off_label'] = array(
+    ];
+    $element['off_label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('"Off" label'),
       '#default_value' => $this->getSetting('off_label'),
       '#required' => TRUE,
-    );
+    ];
 
     return $element;
   }
@@ -85,24 +85,24 @@ class BooleanItem extends FieldItemBase implements OptionsProviderInterface {
    * {@inheritdoc}
    */
   public function getPossibleValues(AccountInterface $account = NULL) {
-    return array(0, 1);
+    return [0, 1];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getPossibleOptions(AccountInterface $account = NULL) {
-    return array(
+    return [
       0 => $this->getSetting('off_label'),
       1 => $this->getSetting('on_label'),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getSettableValues(AccountInterface $account = NULL) {
-    return array(0, 1);
+    return [0, 1];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php
index 9f2096f26..9c53665ab 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php
@@ -13,7 +13,7 @@ namespace Drupal\Core\Field\Plugin\Field\FieldType;
  *   label = @Translation("Last changed"),
  *   description = @Translation("An entity field containing a UNIX timestamp of when the entity has been last updated."),
  *   no_ui = TRUE,
- *   default_widget = "datetime_default",
+ *   default_widget = "datetime_timestamp",
  *   default_formatter = "timestamp",
  *   list_class = "\Drupal\Core\Field\ChangedFieldItemList"
  * )
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php
index b4bcac530..da2e2a745 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/CreatedItem.php
@@ -10,7 +10,7 @@ namespace Drupal\Core\Field\Plugin\Field\FieldType;
  *   label = @Translation("Created"),
  *   description = @Translation("An entity field containing a UNIX timestamp of when the entity has been created."),
  *   no_ui = TRUE,
- *   default_widget = "datetime_default",
+ *   default_widget = "datetime_timestamp",
  *   default_formatter = "timestamp"
  * )
  */
@@ -22,7 +22,7 @@ class CreatedItem extends TimestampItem {
   public function applyDefaultValue($notify = TRUE) {
     parent::applyDefaultValue($notify);
     // Created fields default to the current timestamp.
-    $this->setValue(array('value' => REQUEST_TIME), $notify);
+    $this->setValue(['value' => REQUEST_TIME], $notify);
     return $this;
   }
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
index a8849fd37..00fe4098c 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
@@ -25,10 +25,10 @@ class DecimalItem extends NumericItemBase {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'precision' => 10,
       'scale' => 2,
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
@@ -46,25 +46,25 @@ class DecimalItem extends NumericItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'numeric',
           'precision' => $field_definition->getSetting('precision'),
           'scale' => $field_definition->getSetting('scale'),
-        )
-      ),
-    );
+        ]
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $element = array();
+    $element = [];
     $settings = $this->getSettings();
 
-    $element['precision'] = array(
+    $element['precision'] = [
       '#type' => 'number',
       '#title' => t('Precision'),
       '#min' => 10,
@@ -72,17 +72,17 @@ class DecimalItem extends NumericItemBase {
       '#default_value' => $settings['precision'],
       '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'),
       '#disabled' => $has_data,
-    );
+    ];
 
-    $element['scale'] = array(
+    $element['scale'] = [
       '#type' => 'number',
-      '#title' => t('Scale', array(), array('context' => 'decimal places')),
+      '#title' => t('Scale', [], ['context' => 'decimal places']),
       '#min' => 0,
       '#max' => 10,
       '#default_value' => $settings['scale'],
       '#description' => t('The number of digits to the right of the decimal.'),
       '#disabled' => $has_data,
-    );
+    ];
 
     return $element;
   }
@@ -94,13 +94,13 @@ class DecimalItem extends NumericItemBase {
     $constraint_manager = \Drupal::typedDataManager()->getValidationConstraintManager();
     $constraints = parent::getConstraints();
 
-    $constraints[] = $constraint_manager->create('ComplexData', array(
-      'value' => array(
-        'Regex' => array(
+    $constraints[] = $constraint_manager->create('ComplexData', [
+      'value' => [
+        'Regex' => [
           'pattern' => '/^[+-]?((\d+(\.\d*)?)|(\.\d+))$/i',
-        )
-      ),
-    ));
+        ]
+      ],
+    ]);
 
     return $constraints;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
index f42a2b425..ca30ede26 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
@@ -37,14 +37,14 @@ class EmailItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
           'length' => Email::EMAIL_MAX_LENGTH,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -54,14 +54,14 @@ class EmailItem extends FieldItemBase {
     $constraint_manager = \Drupal::typedDataManager()->getValidationConstraintManager();
     $constraints = parent::getConstraints();
 
-    $constraints[] = $constraint_manager->create('ComplexData', array(
-      'value' => array(
-        'Length' => array(
+    $constraints[] = $constraint_manager->create('ComplexData', [
+      'value' => [
+        'Length' => [
           'max' => Email::EMAIL_MAX_LENGTH,
-          'maxMessage' => t('%name: the email address can not be longer than @max characters.', array('%name' => $this->getFieldDefinition()->getLabel(), '@max' => Email::EMAIL_MAX_LENGTH)),
-        )
-      ),
-    ));
+          'maxMessage' => t('%name: the email address can not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => Email::EMAIL_MAX_LENGTH]),
+        ]
+      ],
+    ]);
 
     return $constraints;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
index 63bd90d42..f9922b9f4 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
@@ -6,6 +6,7 @@ use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\TypedData\EntityDataDefinition;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemBase;
@@ -43,19 +44,19 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'target_type' => \Drupal::moduleHandler()->moduleExists('node') ? 'node' : 'user',
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    return array(
+    return [
       'handler' => 'default',
-      'handler_settings' => array(),
-    ) + parent::defaultFieldSettings();
+      'handler_settings' => [],
+    ] + parent::defaultFieldSettings();
   }
 
   /**
@@ -66,7 +67,7 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
     $target_type_info = \Drupal::entityManager()->getDefinition($settings['target_type']);
 
     $target_id_data_type = 'string';
-    if ($target_type_info->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface')) {
+    if ($target_type_info->entityClassImplements(FieldableEntityInterface::class)) {
       $id_definition = \Drupal::entityManager()->getBaseFieldDefinitions($settings['target_type'])[$target_type_info->getKey('id')];
       if ($id_definition->getType() === 'integer') {
         $target_id_data_type = 'integer';
@@ -114,33 +115,33 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
     $target_type = $field_definition->getSetting('target_type');
     $target_type_info = \Drupal::entityManager()->getDefinition($target_type);
     $properties = static::propertyDefinitions($field_definition)['target_id'];
-    if ($target_type_info->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface') && $properties->getDataType() === 'integer') {
-      $columns = array(
-        'target_id' => array(
+    if ($target_type_info->entityClassImplements(FieldableEntityInterface::class) && $properties->getDataType() === 'integer') {
+      $columns = [
+        'target_id' => [
           'description' => 'The ID of the target entity.',
           'type' => 'int',
           'unsigned' => TRUE,
-        ),
-      );
+        ],
+      ];
     }
     else {
-      $columns = array(
-        'target_id' => array(
+      $columns = [
+        'target_id' => [
           'description' => 'The ID of the target entity.',
           'type' => 'varchar_ascii',
           // If the target entities act as bundles for another entity type,
           // their IDs should not exceed the maximum length for bundles.
           'length' => $target_type_info->getBundleOf() ? EntityTypeInterface::BUNDLE_MAX_LENGTH : 255,
-        ),
-      );
+        ],
+      ];
     }
 
-    $schema = array(
+    $schema = [
       'columns' => $columns,
-      'indexes' => array(
-        'target_id' => array('target_id'),
-      ),
-    );
+      'indexes' => [
+        'target_id' => ['target_id'],
+      ],
+    ];
 
     return $schema;
   }
@@ -188,8 +189,11 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
         $entity_id = $this->get('entity')->getTargetIdentifier();
         // If the entity has been saved and we're trying to set both the
         // target_id and the entity values with a non-null target ID, then the
-        // value for target_id should match the ID of the entity value.
-        if (!$this->entity->isNew() && $values['target_id'] !== NULL && ($entity_id !== $values['target_id'])) {
+        // value for target_id should match the ID of the entity value. The
+        // entity ID as returned by $entity->id() might be a string, but the
+        // provided target_id might be an integer - therefore we have to do a
+        // non-strict comparison.
+        if (!$this->entity->isNew() && $values['target_id'] !== NULL && ($entity_id != $values['target_id'])) {
           throw new \InvalidArgumentException('The target id and entity passed to the entity reference item do not match.');
         }
       }
@@ -271,12 +275,12 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
 
     // Instead of calling $manager->getSelectionHandler($field_definition)
     // replicate the behavior to be able to override the sorting settings.
-    $options = array(
+    $options = [
       'target_type' => $field_definition->getFieldStorageDefinition()->getSetting('target_type'),
       'handler' => $field_definition->getSetting('handler'),
-      'handler_settings' => $field_definition->getSetting('handler_settings') ?: array(),
+      'handler_settings' => $field_definition->getSetting('handler_settings') ?: [],
       'entity' => NULL,
-    );
+    ];
 
     $entity_type = \Drupal::entityManager()->getDefinition($options['target_type']);
     $options['handler_settings']['sort'] = [
@@ -298,7 +302,7 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
    * {@inheritdoc}
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $element['target_type'] = array(
+    $element['target_type'] = [
       '#type' => 'select',
       '#title' => t('Type of item to reference'),
       '#options' => \Drupal::entityManager()->getEntityTypeLabels(TRUE),
@@ -306,7 +310,7 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
       '#required' => TRUE,
       '#disabled' => $has_data,
       '#size' => 1,
-    );
+    ];
 
     return $element;
   }
@@ -319,7 +323,7 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
 
     // Get all selection plugins for this entity type.
     $selection_plugins = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionGroups($this->getSetting('target_type'));
-    $handlers_options = array();
+    $handlers_options = [];
     foreach (array_keys($selection_plugins) as $selection_group_id) {
       // We only display base plugins (e.g. 'default', 'views', ...) and not
       // entity type specific plugins (e.g. 'default:node', 'default:user',
@@ -333,46 +337,46 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
       }
     }
 
-    $form = array(
+    $form = [
       '#type' => 'container',
-      '#process' => array(array(get_class($this), 'fieldSettingsAjaxProcess')),
-      '#element_validate' => array(array(get_class($this), 'fieldSettingsFormValidate')),
+      '#process' => [[get_class($this), 'fieldSettingsAjaxProcess']],
+      '#element_validate' => [[get_class($this), 'fieldSettingsFormValidate']],
 
-    );
-    $form['handler'] = array(
+    ];
+    $form['handler'] = [
       '#type' => 'details',
       '#title' => t('Reference type'),
       '#open' => TRUE,
       '#tree' => TRUE,
-      '#process' => array(array(get_class($this), 'formProcessMergeParent')),
-    );
+      '#process' => [[get_class($this), 'formProcessMergeParent']],
+    ];
 
-    $form['handler']['handler'] = array(
+    $form['handler']['handler'] = [
       '#type' => 'select',
       '#title' => t('Reference method'),
       '#options' => $handlers_options,
       '#default_value' => $field->getSetting('handler'),
       '#required' => TRUE,
       '#ajax' => TRUE,
-      '#limit_validation_errors' => array(),
-    );
-    $form['handler']['handler_submit'] = array(
+      '#limit_validation_errors' => [],
+    ];
+    $form['handler']['handler_submit'] = [
       '#type' => 'submit',
       '#value' => t('Change handler'),
-      '#limit_validation_errors' => array(),
-      '#attributes' => array(
-        'class' => array('js-hide'),
-      ),
-      '#submit' => array(array(get_class($this), 'settingsAjaxSubmit')),
-    );
+      '#limit_validation_errors' => [],
+      '#attributes' => [
+        'class' => ['js-hide'],
+      ],
+      '#submit' => [[get_class($this), 'settingsAjaxSubmit']],
+    ];
 
-    $form['handler']['handler_settings'] = array(
+    $form['handler']['handler_settings'] = [
       '#type' => 'container',
-      '#attributes' => array('class' => array('entity_reference-settings')),
-    );
+      '#attributes' => ['class' => ['entity_reference-settings']],
+    ];
 
     $handler = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionHandler($field);
-    $form['handler']['handler_settings'] += $handler->buildConfigurationForm(array(), $form_state);
+    $form['handler']['handler_settings'] += $handler->buildConfigurationForm([], $form_state);
 
     return $form;
   }
@@ -555,14 +559,14 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
   public function getSettableOptions(AccountInterface $account = NULL) {
     $field_definition = $this->getFieldDefinition();
     if (!$options = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionHandler($field_definition, $this->getEntity())->getReferenceableEntities()) {
-      return array();
+      return [];
     }
 
     // Rebuild the array by changing the bundle key into the bundle label.
     $target_type = $field_definition->getSetting('target_type');
     $bundles = \Drupal::entityManager()->getBundleInfo($target_type);
 
-    $return = array();
+    $return = [];
     foreach ($options as $bundle => $entity_ids) {
       // The label does not need sanitizing since it is used as an optgroup
       // which is only supported by select elements and auto-escaped.
@@ -592,11 +596,11 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
    */
   public static function fieldSettingsAjaxProcessElement(&$element, $main_form) {
     if (!empty($element['#ajax'])) {
-      $element['#ajax'] = array(
-        'callback' => array(get_called_class(), 'settingsAjax'),
+      $element['#ajax'] = [
+        'callback' => [get_called_class(), 'settingsAjax'],
         'wrapper' => $main_form['#id'],
         'element' => $main_form['#array_parents'],
-      );
+      ];
     }
 
     foreach (Element::children($element) as $key) {
@@ -640,7 +644,7 @@ class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterf
    * {@inheritdoc}
    */
   public static function getPreconfiguredOptions() {
-    $options = array();
+    $options = [];
 
     // Add all the commonly referenced entity types as distinct pre-configured
     // options.
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php
index 601bc8a19..7b2234c18 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php
@@ -36,13 +36,13 @@ class FloatItem extends NumericItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'float',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
index 0e9541713..846912672 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
@@ -24,24 +24,24 @@ class IntegerItem extends NumericItemBase {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'unsigned' => FALSE,
       // Valid size property values include: 'tiny', 'small', 'medium', 'normal'
       // and 'big'.
       'size' => 'normal',
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    return array(
+    return [
       'min' => '',
       'max' => '',
       'prefix' => '',
       'suffix' => '',
-    ) + parent::defaultFieldSettings();
+    ] + parent::defaultFieldSettings();
   }
 
   /**
@@ -65,17 +65,17 @@ class IntegerItem extends NumericItemBase {
     // integer to be positive.
     if ($this->getSetting('unsigned')) {
       $constraint_manager = \Drupal::typedDataManager()->getValidationConstraintManager();
-      $constraints[] = $constraint_manager->create('ComplexData', array(
-        'value' => array(
-          'Range' => array(
+      $constraints[] = $constraint_manager->create('ComplexData', [
+        'value' => [
+          'Range' => [
             'min' => 0,
-            'minMessage' => t('%name: The integer must be larger or equal to %min.', array(
+            'minMessage' => t('%name: The integer must be larger or equal to %min.', [
               '%name' => $this->getFieldDefinition()->getLabel(),
               '%min' => 0,
-            )),
-          ),
-        ),
-      ));
+            ]),
+          ],
+        ],
+      ]);
     }
 
     return $constraints;
@@ -85,18 +85,18 @@ class IntegerItem extends NumericItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'int',
           // Expose the 'unsigned' setting in the field item schema.
           'unsigned' => $field_definition->getSetting('unsigned'),
           // Expose the 'size' setting in the field item schema. For instance,
           // supply 'big' as a value to produce a 'bigint' type.
           'size' => $field_definition->getSetting('size'),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php
index 0b9bba97c..18935c1b8 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/LanguageItem.php
@@ -65,14 +65,14 @@ class LanguageItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'varchar_ascii',
           'length' => 12,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -99,7 +99,7 @@ class LanguageItem extends FieldItemBase {
   public function applyDefaultValue($notify = TRUE) {
     // Default to the site's default language. When language module is enabled,
     // this behavior is configurable, see language_field_info_alter().
-    $this->setValue(array('value' => \Drupal::languageManager()->getDefaultLanguage()->getId()), $notify);
+    $this->setValue(['value' => \Drupal::languageManager()->getDefaultLanguage()->getId()], $notify);
     return $this;
   }
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php
index cff52d8e9..04045c7d2 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php
@@ -22,22 +22,22 @@ class MapItem extends FieldItemBase {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     // The properties are dynamic and can not be defined statically.
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'blob',
           'size' => 'big',
           'serialize' => TRUE,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -53,7 +53,7 @@ class MapItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public function setValue($values, $notify = TRUE) {
-    $this->values = array();
+    $this->values = [];
     if (!isset($values)) {
       return;
     }
@@ -80,7 +80,7 @@ class MapItem extends FieldItemBase {
    */
   public function __get($name) {
     if (!isset($this->values[$name])) {
-      $this->values[$name] = array();
+      $this->values[$name] = [];
     }
 
     return $this->values[$name];
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
index 678ab1ff2..23f5161f2 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
@@ -14,47 +14,47 @@ abstract class NumericItemBase extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    return array(
+    return [
       'min' => '',
       'max' => '',
       'prefix' => '',
       'suffix' => '',
-    ) + parent::defaultFieldSettings();
+    ] + parent::defaultFieldSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
-    $element = array();
+    $element = [];
     $settings = $this->getSettings();
 
-    $element['min'] = array(
+    $element['min'] = [
       '#type' => 'number',
       '#title' => t('Minimum'),
       '#default_value' => $settings['min'],
       '#description' => t('The minimum value that should be allowed in this field. Leave blank for no minimum.'),
-    );
-    $element['max'] = array(
+    ];
+    $element['max'] = [
       '#type' => 'number',
       '#title' => t('Maximum'),
       '#default_value' => $settings['max'],
       '#description' => t('The maximum value that should be allowed in this field. Leave blank for no maximum.'),
-    );
-    $element['prefix'] = array(
+    ];
+    $element['prefix'] = [
       '#type' => 'textfield',
       '#title' => t('Prefix'),
       '#default_value' => $settings['prefix'],
       '#size' => 60,
       '#description' => t("Define a string that should be prefixed to the value, like '$ ' or '&euro; '. Leave blank for none. Separate singular and plural values with a pipe ('pound|pounds')."),
-    );
-    $element['suffix'] = array(
+    ];
+    $element['suffix'] = [
       '#type' => 'textfield',
       '#title' => t('Suffix'),
       '#default_value' => $settings['suffix'],
       '#size' => 60,
       '#description' => t("Define a string that should be suffixed to the value, like ' m', ' kb/s'. Leave blank for none. Separate singular and plural values with a pipe ('pound|pounds')."),
-    );
+    ];
 
     return $element;
   }
@@ -81,26 +81,26 @@ abstract class NumericItemBase extends FieldItemBase {
 
     if (!empty($settings['min'])) {
       $min = $settings['min'];
-      $constraints[] = $constraint_manager->create('ComplexData', array(
-        'value' => array(
-          'Range' => array(
+      $constraints[] = $constraint_manager->create('ComplexData', [
+        'value' => [
+          'Range' => [
             'min' => $min,
-            'minMessage' => t('%name: the value may be no less than %min.', array('%name' => $label, '%min' => $min)),
-          )
-        ),
-      ));
+            'minMessage' => t('%name: the value may be no less than %min.', ['%name' => $label, '%min' => $min]),
+          ]
+        ],
+      ]);
     }
 
     if (!empty($settings['max'])) {
       $max = $settings['max'];
-      $constraints[] = $constraint_manager->create('ComplexData', array(
-        'value' => array(
-          'Range' => array(
+      $constraints[] = $constraint_manager->create('ComplexData', [
+        'value' => [
+          'Range' => [
             'max' => $max,
-            'maxMessage' => t('%name: the value may be no greater than %max.', array('%name' => $label, '%max' => $max)),
-          )
-        ),
-      ));
+            'maxMessage' => t('%name: the value may be no greater than %max.', ['%name' => $label, '%max' => $max]),
+          ]
+        ],
+      ]);
     }
 
     return $constraints;
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
index 67414d98f..b51764c29 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
@@ -25,25 +25,25 @@ class StringItem extends StringItemBase {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'max_length' => 255,
       'is_ascii' => FALSE,
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => $field_definition->getSetting('is_ascii') === TRUE ? 'varchar_ascii' : 'varchar',
           'length' => (int) $field_definition->getSetting('max_length'),
           'binary' => $field_definition->getSetting('case_sensitive'),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -54,14 +54,14 @@ class StringItem extends StringItemBase {
 
     if ($max_length = $this->getSetting('max_length')) {
       $constraint_manager = \Drupal::typedDataManager()->getValidationConstraintManager();
-      $constraints[] = $constraint_manager->create('ComplexData', array(
-        'value' => array(
-          'Length' => array(
+      $constraints[] = $constraint_manager->create('ComplexData', [
+        'value' => [
+          'Length' => [
             'max' => $max_length,
-            'maxMessage' => t('%name: may not be longer than @max characters.', array('%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length)),
-          ),
-        ),
-      ));
+            'maxMessage' => t('%name: may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length]),
+          ],
+        ],
+      ]);
     }
 
     return $constraints;
@@ -80,9 +80,9 @@ class StringItem extends StringItemBase {
    * {@inheritdoc}
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $element = array();
+    $element = [];
 
-    $element['max_length'] = array(
+    $element['max_length'] = [
       '#type' => 'number',
       '#title' => t('Maximum length'),
       '#default_value' => $this->getSetting('max_length'),
@@ -90,7 +90,7 @@ class StringItem extends StringItemBase {
       '#description' => t('The maximum length of the field in characters.'),
       '#min' => 1,
       '#disabled' => $has_data,
-    );
+    ];
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.php
index 6a784d6ca..f59c10c98 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.php
@@ -16,9 +16,9 @@ abstract class StringItemBase extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'case_sensitive' => FALSE,
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringLongItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringLongItem.php
index ae998d321..93c6b27bc 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringLongItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringLongItem.php
@@ -24,14 +24,14 @@ class StringLongItem extends StringItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => $field_definition->getSetting('case_sensitive') ? 'blob' : 'text',
           'size' => 'big',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.php
index 98094caff..8c3ffd211 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/TimestampItem.php
@@ -13,7 +13,7 @@ use Drupal\Core\TypedData\DataDefinition;
  *   id = "timestamp",
  *   label = @Translation("Timestamp"),
  *   description = @Translation("An entity field containing a UNIX timestamp value."),
- *   default_widget = "datetime_default",
+ *   default_widget = "datetime_timestamp",
  *   default_formatter = "timestamp",
  *   constraints = {
  *     "ComplexData" = {
@@ -44,13 +44,13 @@ class TimestampItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'int',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php
index 034fc164d..8d1d6e649 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UriItem.php
@@ -52,15 +52,15 @@ class UriItem extends StringItem {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
           'length' => (int) $field_definition->getSetting('max_length'),
           'binary' => $field_definition->getSetting('case_sensitive'),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php
index 8bd33ce44..a5f940108 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/UuidItem.php
@@ -24,10 +24,10 @@ class UuidItem extends StringItem {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'max_length' => 128,
       'is_ascii' => TRUE,
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
@@ -36,7 +36,7 @@ class UuidItem extends StringItem {
   public function applyDefaultValue($notify = TRUE) {
     // Default to one field item with a generated UUID.
     $uuid = \Drupal::service('uuid');
-    $this->setValue(array('value' => $uuid->generate()), $notify);
+    $this->setValue(['value' => $uuid->generate()], $notify);
     return $this;
   }
 
@@ -45,7 +45,7 @@ class UuidItem extends StringItem {
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
     $schema = parent::schema($field_definition);
-    $schema['unique keys']['value'] = array('value');
+    $schema['unique keys']['value'] = ['value'];
     return $schema;
   }
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php
index 3106fbe6b..1d4a202f0 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php
@@ -24,21 +24,21 @@ class BooleanCheckboxWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'display_label' => TRUE,
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['display_label'] = array(
+    $element['display_label'] = [
       '#type' => 'checkbox',
       '#title' => t('Use field label instead of the "On label" as label'),
       '#default_value' => $this->getSetting('display_label'),
       '#weight' => -1,
-    );
+    ];
     return $element;
   }
 
@@ -46,10 +46,10 @@ class BooleanCheckboxWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $display_label = $this->getSetting('display_label');
-    $summary[] = t('Use field label: @display_label', array('@display_label' => ($display_label ? t('Yes') : 'No')));
+    $summary[] = t('Use field label: @display_label', ['@display_label' => ($display_label ? t('Yes') : 'No')]);
 
     return $summary;
   }
@@ -58,10 +58,10 @@ class BooleanCheckboxWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element['value'] = $element + array(
+    $element['value'] = $element + [
       '#type' => 'checkbox',
       '#default_value' => !empty($items[0]->value),
-    );
+    ];
 
     // Override the title from the incoming $element.
     if ($this->getSetting('display_label')) {
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php
index 9931d4e6f..07f66cf26 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php
@@ -24,29 +24,29 @@ class EmailDefaultWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'size' => 60,
       'placeholder' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['size'] = array(
+    $element['size'] = [
       '#type' => 'number',
       '#title' => $this->t('Textfield size'),
       '#default_value' => $this->getSetting('size'),
       '#required' => TRUE,
       '#min' => 1,
-    );
-    $element['placeholder'] = array(
+    ];
+    $element['placeholder'] = [
       '#type' => 'textfield',
       '#title' => t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
       '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
-    );
+    ];
     return $element;
   }
 
@@ -54,16 +54,16 @@ class EmailDefaultWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', array('@placeholder' => $placeholder));
+      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
     else {
       $summary[] = t('No placeholder');
     }
-    $summary[] = t('Textfield size: @size', array('@size' => $this->getSetting('size')));
+    $summary[] = t('Textfield size: @size', ['@size' => $this->getSetting('size')]);
 
     return $summary;
   }
@@ -72,13 +72,13 @@ class EmailDefaultWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element['value'] = $element + array(
+    $element['value'] = $element + [
       '#type' => 'email',
       '#default_value' => isset($items[$delta]->value) ? $items[$delta]->value : NULL,
       '#placeholder' => $this->getSetting('placeholder'),
       '#size' => $this->getSetting('size'),
       '#maxlength' => Email::EMAIL_MAX_LENGTH,
-    );
+    ];
     return $element;
   }
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
index 3824810a9..11f048e6f 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
@@ -26,37 +26,37 @@ class EntityReferenceAutocompleteWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'match_operator' => 'CONTAINS',
       'size' => '60',
       'placeholder' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['match_operator'] = array(
+    $element['match_operator'] = [
       '#type' => 'radios',
       '#title' => t('Autocomplete matching'),
       '#default_value' => $this->getSetting('match_operator'),
       '#options' => $this->getMatchOperatorOptions(),
       '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of entities.'),
-    );
-    $element['size'] = array(
+    ];
+    $element['size'] = [
       '#type' => 'number',
       '#title' => t('Size of textfield'),
       '#default_value' => $this->getSetting('size'),
       '#min' => 1,
       '#required' => TRUE,
-    );
-    $element['placeholder'] = array(
+    ];
+    $element['placeholder'] = [
       '#type' => 'textfield',
       '#title' => t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
       '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
-    );
+    ];
     return $element;
   }
 
@@ -64,14 +64,14 @@ class EntityReferenceAutocompleteWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $operators = $this->getMatchOperatorOptions();
-    $summary[] = t('Autocomplete matching: @match_operator', array('@match_operator' => $operators[$this->getSetting('match_operator')]));
-    $summary[] = t('Textfield size: @size', array('@size' => $this->getSetting('size')));
+    $summary[] = t('Autocomplete matching: @match_operator', ['@match_operator' => $operators[$this->getSetting('match_operator')]]);
+    $summary[] = t('Textfield size: @size', ['@size' => $this->getSetting('size')]);
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', array('@placeholder' => $placeholder));
+      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
     else {
       $summary[] = t('No placeholder');
@@ -90,7 +90,7 @@ class EntityReferenceAutocompleteWidget extends WidgetBase {
     // Append the match operation to the selection settings.
     $selection_settings = $this->getFieldSetting('handler_settings') + ['match_operator' => $this->getSetting('match_operator')];
 
-    $element += array(
+    $element += [
       '#type' => 'entity_autocomplete',
       '#target_type' => $this->getFieldSetting('target_type'),
       '#selection_handler' => $this->getFieldSetting('handler'),
@@ -102,16 +102,16 @@ class EntityReferenceAutocompleteWidget extends WidgetBase {
       '#default_value' => isset($referenced_entities[$delta]) ? $referenced_entities[$delta] : NULL,
       '#size' => $this->getSetting('size'),
       '#placeholder' => $this->getSetting('placeholder'),
-    );
+    ];
 
     if ($this->getSelectionHandlerSetting('auto_create') && ($bundle = $this->getAutocreateBundle())) {
-      $element['#autocreate'] = array(
+      $element['#autocreate'] = [
         'bundle' => $bundle,
         'uid' => ($entity instanceof EntityOwnerInterface) ? $entity->getOwnerId() : \Drupal::currentUser()->id()
-      );
+      ];
     }
 
-    return array('target_id' => $element);
+    return ['target_id' => $element];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/LanguageSelectWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/LanguageSelectWidget.php
index cff646d9b..776e060ca 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/LanguageSelectWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/LanguageSelectWidget.php
@@ -24,11 +24,11 @@ class LanguageSelectWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element['value'] = $element + array(
+    $element['value'] = $element + [
       '#type' => 'language_select',
       '#default_value' => $items[$delta]->value,
       '#languages' => LanguageInterface::STATE_ALL,
-    );
+    ];
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/NumberWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/NumberWidget.php
index 82005696d..b4fac537b 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/NumberWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/NumberWidget.php
@@ -27,21 +27,21 @@ class NumberWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'placeholder' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['placeholder'] = array(
+    $element['placeholder'] = [
       '#type' => 'textfield',
       '#title' => t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
       '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
-    );
+    ];
     return $element;
   }
 
@@ -49,11 +49,11 @@ class NumberWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', array('@placeholder' => $placeholder));
+      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
     else {
       $summary[] = t('No placeholder');
@@ -69,11 +69,11 @@ class NumberWidget extends WidgetBase {
     $value = isset($items[$delta]->value) ? $items[$delta]->value : NULL;
     $field_settings = $this->getFieldSettings();
 
-    $element += array(
+    $element += [
       '#type' => 'number',
       '#default_value' => $value,
       '#placeholder' => $this->getSetting('placeholder'),
-    );
+    ];
 
     // Set the step for floating point and decimal numbers.
     switch ($this->fieldDefinition->getType()) {
@@ -104,7 +104,7 @@ class NumberWidget extends WidgetBase {
       $element['#field_suffix'] = FieldFilteredMarkup::create(array_pop($suffixes));
     }
 
-    return array('value' => $element);
+    return ['value' => $element];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php
index 1224c63c0..7787106d8 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php
@@ -35,25 +35,25 @@ class OptionsButtonsWidget extends OptionsWidgetBase {
     // If required and there is one single option, preselect it.
     if ($this->required && count($options) == 1) {
       reset($options);
-      $selected = array(key($options));
+      $selected = [key($options)];
     }
 
     if ($this->multiple) {
-      $element += array(
+      $element += [
         '#type' => 'checkboxes',
         '#default_value' => $selected,
         '#options' => $options,
-      );
+      ];
     }
     else {
-      $element += array(
+      $element += [
         '#type' => 'radios',
         // Radio buttons need a scalar value. Take the first default value, or
         // default to NULL so that the form element is properly recognized as
         // not having a default value.
         '#default_value' => $selected ? reset($selected) : NULL,
         '#options' => $options,
-      );
+      ];
     }
 
     return $element;
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php
index 3a719896f..b623c8755 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php
@@ -29,13 +29,13 @@ class OptionsSelectWidget extends OptionsWidgetBase {
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $element = parent::formElement($items, $delta, $element, $form, $form_state);
 
-    $element += array(
+    $element += [
       '#type' => 'select',
       '#options' => $this->getOptions($items->getEntity()),
       '#default_value' => $this->getSelectedOptions($items),
       // Do not display a 'multiple' select box if there is only one option.
       '#multiple' => $this->multiple && count($this->options) > 1,
-    );
+    ];
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
index ca00bcc64..bb773cdea 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
@@ -50,7 +50,7 @@ abstract class OptionsWidgetBase extends WidgetBase {
     $this->has_value = isset($items[0]->{$this->column});
 
     // Add our custom validator.
-    $element['#element_validate'][] = array(get_class($this), 'validateElement');
+    $element['#element_validate'][] = [get_class($this), 'validateElement'];
     $element['#key_column'] = $this->column;
 
     // The rest of the $element is built by child method implementations.
@@ -68,7 +68,7 @@ abstract class OptionsWidgetBase extends WidgetBase {
    */
   public static function validateElement(array $element, FormStateInterface $form_state) {
     if ($element['#required'] && $element['#value'] == '_none') {
-      $form_state->setError($element, t('@name field is required.', array('@name' => $element['#title'])));
+      $form_state->setError($element, t('@name field is required.', ['@name' => $element['#title']]));
     }
 
     // Massage submitted form values.
@@ -80,7 +80,7 @@ abstract class OptionsWidgetBase extends WidgetBase {
       $values = array_values($element['#value']);
     }
     else {
-      $values = array($element['#value']);
+      $values = [$element['#value']];
     }
 
     // Filter out the 'none' option. Use a strict comparison, because
@@ -91,9 +91,9 @@ abstract class OptionsWidgetBase extends WidgetBase {
     }
 
     // Transpose selections from field => delta to delta => field.
-    $items = array();
+    $items = [];
     foreach ($values as $value) {
-      $items[] = array($element['#key_column'] => $value);
+      $items[] = [$element['#key_column'] => $value];
     }
     $form_state->setValueForElement($element, $items);
   }
@@ -121,13 +121,13 @@ abstract class OptionsWidgetBase extends WidgetBase {
       }
 
       $module_handler = \Drupal::moduleHandler();
-      $context = array(
+      $context = [
         'fieldDefinition' => $this->fieldDefinition,
         'entity' => $entity,
-      );
+      ];
       $module_handler->alter('options_list', $options, $context);
 
-      array_walk_recursive($options, array($this, 'sanitizeLabel'));
+      array_walk_recursive($options, [$this, 'sanitizeLabel']);
 
       // Options might be nested ("optgroups"). If the widget does not support
       // nested options, flatten the list.
@@ -153,7 +153,7 @@ abstract class OptionsWidgetBase extends WidgetBase {
     // We need to check against a flat list of options.
     $flat_options = OptGroup::flattenOptions($this->getOptions($items->getEntity()));
 
-    $selected_options = array();
+    $selected_options = [];
     foreach ($items as $item) {
       $value = $item->{$this->column};
       // Keep the value if it actually is in the list of options (needs to be
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php
index e6b0ff08d..5f21b5edd 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php
@@ -23,29 +23,29 @@ class StringTextareaWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'rows' => '5',
       'placeholder' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['rows'] = array(
+    $element['rows'] = [
       '#type' => 'number',
       '#title' => t('Rows'),
       '#default_value' => $this->getSetting('rows'),
       '#required' => TRUE,
       '#min' => 1,
-    );
-    $element['placeholder'] = array(
+    ];
+    $element['placeholder'] = [
       '#type' => 'textfield',
       '#title' => t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
       '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
-    );
+    ];
     return $element;
   }
 
@@ -53,12 +53,12 @@ class StringTextareaWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
-    $summary[] = t('Number of rows: @rows', array('@rows' => $this->getSetting('rows')));
+    $summary[] = t('Number of rows: @rows', ['@rows' => $this->getSetting('rows')]);
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', array('@placeholder' => $placeholder));
+      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
 
     return $summary;
@@ -68,13 +68,13 @@ class StringTextareaWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element['value'] = $element + array(
+    $element['value'] = $element + [
       '#type' => 'textarea',
       '#default_value' => $items[$delta]->value,
       '#rows' => $this->getSetting('rows'),
       '#placeholder' => $this->getSetting('placeholder'),
-      '#attributes' => array('class' => array('js-text-full', 'text-full')),
-    );
+      '#attributes' => ['class' => ['js-text-full', 'text-full']],
+    ];
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php
index d89f0b2f5..3be168176 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php
@@ -23,29 +23,29 @@ class StringTextfieldWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'size' => 60,
       'placeholder' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['size'] = array(
+    $element['size'] = [
       '#type' => 'number',
       '#title' => t('Size of textfield'),
       '#default_value' => $this->getSetting('size'),
       '#required' => TRUE,
       '#min' => 1,
-    );
-    $element['placeholder'] = array(
+    ];
+    $element['placeholder'] = [
       '#type' => 'textfield',
       '#title' => t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
       '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
-    );
+    ];
     return $element;
   }
 
@@ -53,12 +53,12 @@ class StringTextfieldWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
-    $summary[] = t('Textfield size: @size', array('@size' => $this->getSetting('size')));
+    $summary[] = t('Textfield size: @size', ['@size' => $this->getSetting('size')]);
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', array('@placeholder' => $placeholder));
+      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
 
     return $summary;
@@ -68,14 +68,14 @@ class StringTextfieldWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element['value'] = $element + array(
+    $element['value'] = $element + [
       '#type' => 'textfield',
       '#default_value' => isset($items[$delta]->value) ? $items[$delta]->value : NULL,
       '#size' => $this->getSetting('size'),
       '#placeholder' => $this->getSetting('placeholder'),
       '#maxlength' => $this->getFieldSetting('max_length'),
-      '#attributes' => array('class' => array('js-text-full', 'text-full')),
-    );
+      '#attributes' => ['class' => ['js-text-full', 'text-full']],
+    ];
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/UriWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/UriWidget.php
index 714b4e04d..f89b4442e 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/UriWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/UriWidget.php
@@ -23,29 +23,29 @@ class UriWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'size' => 60,
       'placeholder' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['size'] = array(
+    $element['size'] = [
       '#type' => 'number',
       '#title' => $this->t('Size of URI field'),
       '#default_value' => $this->getSetting('size'),
       '#required' => TRUE,
       '#min' => 1,
-    );
-    $element['placeholder'] = array(
+    ];
+    $element['placeholder'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
       '#description' => $this->t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
-    );
+    ];
     return $element;
   }
 
@@ -53,12 +53,12 @@ class UriWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
-    $summary[] = $this->t('URI field size: @size', array('@size' => $this->getSetting('size')));
+    $summary[] = $this->t('URI field size: @size', ['@size' => $this->getSetting('size')]);
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = $this->t('Placeholder: @placeholder', array('@placeholder' => $placeholder));
+      $summary[] = $this->t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
 
     return $summary;
@@ -68,13 +68,13 @@ class UriWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element['value'] = $element + array(
+    $element['value'] = $element + [
       '#type' => 'url',
       '#default_value' => isset($items[$delta]->value) ? $items[$delta]->value : NULL,
       '#size' => $this->getSetting('size'),
       '#placeholder' => $this->getSetting('placeholder'),
       '#maxlength' => $this->getFieldSetting('max_length'),
-    );
+    ];
     return $element;
   }
 
diff --git a/web/core/lib/Drupal/Core/Field/PluginSettingsBase.php b/web/core/lib/Drupal/Core/Field/PluginSettingsBase.php
index a6196ec52..073bd2c78 100644
--- a/web/core/lib/Drupal/Core/Field/PluginSettingsBase.php
+++ b/web/core/lib/Drupal/Core/Field/PluginSettingsBase.php
@@ -17,7 +17,7 @@ abstract class PluginSettingsBase extends PluginBase implements PluginSettingsIn
    *
    * @var array
    */
-  protected $settings = array();
+  protected $settings = [];
 
   /**
    * The plugin settings injected by third party modules.
@@ -26,7 +26,7 @@ abstract class PluginSettingsBase extends PluginBase implements PluginSettingsIn
    *
    * @var array
    */
-  protected $thirdPartySettings = array();
+  protected $thirdPartySettings = [];
 
   /**
    * Whether default settings have been merged into the current $settings.
@@ -39,7 +39,7 @@ abstract class PluginSettingsBase extends PluginBase implements PluginSettingsIn
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array();
+    return [];
   }
 
   /**
@@ -140,11 +140,11 @@ abstract class PluginSettingsBase extends PluginBase implements PluginSettingsIn
   public function calculateDependencies() {
     if (!empty($this->thirdPartySettings)) {
       // Create dependencies on any modules providing third party settings.
-      return array(
+      return [
         'module' => array_keys($this->thirdPartySettings)
-      );
+      ];
     }
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/RequiredFieldStorageDefinitionInterface.php b/web/core/lib/Drupal/Core/Field/RequiredFieldStorageDefinitionInterface.php
new file mode 100644
index 000000000..d29e56907
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Field/RequiredFieldStorageDefinitionInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\Core\Field;
+
+/**
+ * Defines an interface for required field storage definitions.
+ */
+interface RequiredFieldStorageDefinitionInterface {
+
+  /**
+   * Returns whether the field storage is required.
+   *
+   * If a field storage is required, NOT NULL constraints will be added
+   * automatically for the required properties of a field type.
+   *
+   * @return bool
+   *   TRUE if the field storage is required, FALSE otherwise.
+   */
+  public function isStorageRequired();
+
+}
diff --git a/web/core/lib/Drupal/Core/Field/WidgetBase.php b/web/core/lib/Drupal/Core/Field/WidgetBase.php
index 3d0db4ce4..b1579f244 100644
--- a/web/core/lib/Drupal/Core/Field/WidgetBase.php
+++ b/web/core/lib/Drupal/Core/Field/WidgetBase.php
@@ -48,7 +48,7 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
    *   Any third party settings.
    */
   public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings) {
-    parent::__construct(array(), $plugin_id, $plugin_definition);
+    parent::__construct([], $plugin_id, $plugin_definition);
     $this->fieldDefinition = $field_definition;
     $this->settings = $settings;
     $this->thirdPartySettings = $third_party_settings;
@@ -63,25 +63,25 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
 
     // Store field information in $form_state.
     if (!static::getWidgetState($parents, $field_name, $form_state)) {
-      $field_state = array(
+      $field_state = [
         'items_count' => count($items),
-        'array_parents' => array(),
-      );
+        'array_parents' => [],
+      ];
       static::setWidgetState($parents, $field_name, $form_state, $field_state);
     }
 
     // Collect widget elements.
-    $elements = array();
+    $elements = [];
 
     // If the widget is handling multiple values (e.g Options), or if we are
     // displaying an individual element, just get a single form element and make
     // it the $delta value.
     if ($this->handlesMultipleValues() || isset($get_delta)) {
       $delta = isset($get_delta) ? $get_delta : 0;
-      $element = array(
+      $element = [
         '#title' => $this->fieldDefinition->getLabel(),
         '#description' => FieldFilteredMarkup::create(\Drupal::token()->replace($this->fieldDefinition->getDescription())),
-      );
+      ];
       $element = $this->formSingleElement($items, $delta, $element, $form, $form_state);
 
       if ($element) {
@@ -107,28 +107,28 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
     // Populate the 'array_parents' information in $form_state->get('field')
     // after the form is built, so that we catch changes in the form structure
     // performed in alter() hooks.
-    $elements['#after_build'][] = array(get_class($this), 'afterBuild');
+    $elements['#after_build'][] = [get_class($this), 'afterBuild'];
     $elements['#field_name'] = $field_name;
     $elements['#field_parents'] = $parents;
     // Enforce the structure of submitted values.
-    $elements['#parents'] = array_merge($parents, array($field_name));
+    $elements['#parents'] = array_merge($parents, [$field_name]);
     // Most widgets need their internal structure preserved in submitted values.
-    $elements += array('#tree' => TRUE);
+    $elements += ['#tree' => TRUE];
 
-    return array(
+    return [
       // Aid in theming of widgets by rendering a classified container.
       '#type' => 'container',
       // Assign a different parent, to keep the main id for the widget itself.
-      '#parents' => array_merge($parents, array($field_name . '_wrapper')),
-      '#attributes' => array(
-        'class' => array(
+      '#parents' => array_merge($parents, [$field_name . '_wrapper']),
+      '#attributes' => [
+        'class' => [
           'field--type-' . Html::getClass($this->fieldDefinition->getType()),
           'field--name-' . Html::getClass($field_name),
           'field--widget-' . Html::getClass($this->getPluginId()),
-        ),
-      ),
+        ],
+      ],
       'widget' => $elements,
-    );
+    ];
   }
 
   /**
@@ -161,7 +161,7 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
     $title = $this->fieldDefinition->getLabel();
     $description = FieldFilteredMarkup::create(\Drupal::token()->replace($this->fieldDefinition->getDescription()));
 
-    $elements = array();
+    $elements = [];
 
     for ($delta = 0; $delta <= $max; $delta++) {
       // Add a new empty item if it doesn't exist yet at this delta.
@@ -193,15 +193,15 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
         if ($is_multiple) {
           // We name the element '_weight' to avoid clashing with elements
           // defined by widget.
-          $element['_weight'] = array(
+          $element['_weight'] = [
             '#type' => 'weight',
-            '#title' => $this->t('Weight for row @number', array('@number' => $delta + 1)),
+            '#title' => $this->t('Weight for row @number', ['@number' => $delta + 1]),
             '#title_display' => 'invisible',
             // Note: this 'delta' is the FAPI #type 'weight' element's property.
             '#delta' => $max,
             '#default_value' => $items[$delta]->_weight ?: $delta,
             '#weight' => 100,
-          );
+          ];
         }
 
         $elements[$delta] = $element;
@@ -209,7 +209,7 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
     }
 
     if ($elements) {
-      $elements += array(
+      $elements += [
         '#theme' => 'field_multiple_value_form',
         '#field_name' => $field_name,
         '#cardinality' => $cardinality,
@@ -218,28 +218,28 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
         '#title' => $title,
         '#description' => $description,
         '#max_delta' => $max,
-      );
+      ];
 
       // Add 'add more' button, if not working with a programmed form.
       if ($cardinality == FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED && !$form_state->isProgrammed()) {
-        $id_prefix = implode('-', array_merge($parents, array($field_name)));
+        $id_prefix = implode('-', array_merge($parents, [$field_name]));
         $wrapper_id = Html::getUniqueId($id_prefix . '-add-more-wrapper');
         $elements['#prefix'] = '<div id="' . $wrapper_id . '">';
         $elements['#suffix'] = '</div>';
 
-        $elements['add_more'] = array(
+        $elements['add_more'] = [
           '#type' => 'submit',
           '#name' => strtr($id_prefix, '-', '_') . '_add_more',
           '#value' => t('Add another item'),
-          '#attributes' => array('class' => array('field-add-more-submit')),
-          '#limit_validation_errors' => array(array_merge($parents, array($field_name))),
-          '#submit' => array(array(get_class($this), 'addMoreSubmit')),
-          '#ajax' => array(
-            'callback' => array(get_class($this), 'addMoreAjax'),
+          '#attributes' => ['class' => ['field-add-more-submit']],
+          '#limit_validation_errors' => [array_merge($parents, [$field_name])],
+          '#submit' => [[get_class($this), 'addMoreSubmit']],
+          '#ajax' => [
+            'callback' => [get_class($this), 'addMoreAjax'],
             'wrapper' => $wrapper_id,
             'effect' => 'fade',
-          ),
-        );
+          ],
+        ];
       }
     }
 
@@ -311,28 +311,26 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
    * Generates the form element for a single copy of the widget.
    */
   protected function formSingleElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $entity = $items->getEntity();
-
-    $element += array(
+    $element += [
       '#field_parents' => $form['#parents'],
       // Only the first widget should be required.
       '#required' => $delta == 0 && $this->fieldDefinition->isRequired(),
       '#delta' => $delta,
       '#weight' => $delta,
-    );
+    ];
 
     $element = $this->formElement($items, $delta, $element, $form, $form_state);
 
     if ($element) {
       // Allow modules to alter the field widget form element.
-      $context = array(
+      $context = [
         'form' => $form,
         'widget' => $this,
         'items' => $items,
         'delta' => $delta,
         'default' => $this->isDefaultValueWidget($form_state),
-      );
-      \Drupal::moduleHandler()->alter(array('field_widget_form', 'field_widget_' . $this->getPluginId() . '_form'), $element, $form_state, $context);
+      ];
+      \Drupal::moduleHandler()->alter(['field_widget_form', 'field_widget_' . $this->getPluginId() . '_form'], $element, $form_state, $context);
     }
 
     return $element;
@@ -345,7 +343,7 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
     $field_name = $this->fieldDefinition->getName();
 
     // Extract the values from $form_state->getValues().
-    $path = array_merge($form['#parents'], array($field_name));
+    $path = array_merge($form['#parents'], [$field_name]);
     $key_exists = NULL;
     $values = NestedArray::getValue($form_state->getValues(), $path, $key_exists);
 
@@ -412,7 +410,7 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
       if (Element::isVisibleElement($element)) {
         $handles_multiple = $this->handlesMultipleValues();
 
-        $violations_by_delta = array();
+        $violations_by_delta = [];
         foreach ($violations as $violation) {
           // Separate violations by delta.
           $property_path = explode('.', $violation->getPropertyPath());
@@ -475,21 +473,21 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
     // Field processing data is placed at
     // $form_state->get(['field_storage', '#parents', ...$parents..., '#fields', $field_name]),
     // to avoid clashes between field names and $parents parts.
-    return array_merge(array('field_storage', '#parents'), $parents, array('#fields', $field_name));
+    return array_merge(['field_storage', '#parents'], $parents, ['#fields', $field_name]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/WidgetPluginManager.php b/web/core/lib/Drupal/Core/Field/WidgetPluginManager.php
index 6be1b9ef8..c7c2d796d 100644
--- a/web/core/lib/Drupal/Core/Field/WidgetPluginManager.php
+++ b/web/core/lib/Drupal/Core/Field/WidgetPluginManager.php
@@ -74,10 +74,10 @@ class WidgetPluginManager extends DefaultPluginManager {
    */
   public function getInstance(array $options) {
     // Fill in defaults for missing properties.
-    $options += array(
-      'configuration' => array(),
+    $options += [
+      'configuration' => [],
       'prepare' => TRUE,
-    );
+    ];
 
     $configuration = $options['configuration'];
     $field_definition = $options['field_definition'];
@@ -104,16 +104,16 @@ class WidgetPluginManager extends DefaultPluginManager {
       $plugin_id = $field_type_definition['default_widget'];
     }
 
-    $configuration += array(
+    $configuration += [
       'field_definition' => $field_definition,
-    );
+    ];
     return $this->createInstance($plugin_id, $configuration);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     $plugin_definition = $this->getDefinition($plugin_id);
     $plugin_class = DefaultFactory::getPluginClass($plugin_id, $plugin_definition);
 
@@ -139,10 +139,10 @@ class WidgetPluginManager extends DefaultPluginManager {
    */
   public function prepareConfiguration($field_type, array $configuration) {
     // Fill in defaults for missing properties.
-    $configuration += array(
-      'settings' => array(),
-      'third_party_settings' => array(),
-    );
+    $configuration += [
+      'settings' => [],
+      'third_party_settings' => [],
+    ];
     // If no widget is specified, use the default widget.
     if (!isset($configuration['type'])) {
       $field_type = $this->fieldTypeManager->getDefinition($field_type);
@@ -168,10 +168,10 @@ class WidgetPluginManager extends DefaultPluginManager {
    */
   public function getOptions($field_type = NULL) {
     if (!isset($this->widgetOptions)) {
-      $options = array();
+      $options = [];
       $field_types = $this->fieldTypeManager->getDefinitions();
       $widget_types = $this->getDefinitions();
-      uasort($widget_types, array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
+      uasort($widget_types, ['Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
       foreach ($widget_types as $name => $widget_type) {
         foreach ($widget_type['field_types'] as $widget_field_type) {
           // Check that the field type exists.
@@ -183,7 +183,7 @@ class WidgetPluginManager extends DefaultPluginManager {
       $this->widgetOptions = $options;
     }
     if (isset($field_type)) {
-      return !empty($this->widgetOptions[$field_type]) ? $this->widgetOptions[$field_type] : array();
+      return !empty($this->widgetOptions[$field_type]) ? $this->widgetOptions[$field_type] : [];
     }
 
     return $this->widgetOptions;
@@ -206,7 +206,7 @@ class WidgetPluginManager extends DefaultPluginManager {
       return $plugin_class::defaultSettings();
     }
 
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/File/FileSystem.php b/web/core/lib/Drupal/Core/File/FileSystem.php
index a2fafbb60..9f92d0bd8 100644
--- a/web/core/lib/Drupal/Core/File/FileSystem.php
+++ b/web/core/lib/Drupal/Core/File/FileSystem.php
@@ -95,7 +95,7 @@ class FileSystem implements FileSystemInterface {
       return TRUE;
     }
 
-    $this->logger->error('The file permissions could not be set on %uri.', array('%uri' => $uri));
+    $this->logger->error('The file permissions could not be set on %uri.', ['%uri' => $uri]);
     return FALSE;
   }
 
diff --git a/web/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php b/web/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php
index 8e5c95a2c..cc54d6c1c 100644
--- a/web/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php
+++ b/web/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php
@@ -16,8 +16,8 @@ class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface {
    * @var array
    *   Array of mimetypes correlated to the extensions that relate to them.
    */
-  protected $defaultMapping = array(
-    'mimetypes' => array(
+  protected $defaultMapping = [
+    'mimetypes' => [
       0 => 'application/andrew-inset',
       1 => 'application/atom',
       2 => 'application/atomcat+xml',
@@ -377,10 +377,10 @@ class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface {
       343 => 'x-conference/x-cooltalk',
       344 => 'x-epoc/x-sisx-app',
       345 => 'x-world/x-vrml',
-    ),
+    ],
 
     // Extensions added to this list MUST be lower-case.
-    'extensions' => array(
+    'extensions' => [
       'ez' => 0,
       'atom' => 1,
       'atomcat' => 2,
@@ -856,8 +856,8 @@ class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface {
       'weba' => 356,
       'webm' => 357,
       'vtt' => 358,
-    ),
-  );
+    ],
+  ];
 
   /**
    * The MIME types mapping array after going through the module handler.
diff --git a/web/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/web/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
index 85d026163..a8ad4010b 100644
--- a/web/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
+++ b/web/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
@@ -17,7 +17,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface {
    *
    * @var array
    */
-  protected $guessers = array();
+  protected $guessers = [];
 
   /**
    * Holds the array of guessers sorted by priority.
@@ -98,7 +98,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface {
    *   A sorted array of MIME type guesser objects.
    */
   protected function sortGuessers() {
-    $sorted = array();
+    $sorted = [];
     krsort($this->guessers);
 
     foreach ($this->guessers as $guesser) {
diff --git a/web/core/lib/Drupal/Core/File/file.api.php b/web/core/lib/Drupal/Core/File/file.api.php
index d1e125e53..506884fad 100644
--- a/web/core/lib/Drupal/Core/File/file.api.php
+++ b/web/core/lib/Drupal/Core/File/file.api.php
@@ -33,9 +33,9 @@ function hook_file_download($uri) {
   $scheme = file_uri_scheme($uri);
   $target = file_uri_target($uri);
   if ($scheme == 'temporary' && $target == 'config.tar.gz') {
-    return array(
+    return [
       'Content-disposition' => 'attachment; filename="config.tar.gz"',
-    );
+    ];
   }
 }
 
@@ -64,11 +64,11 @@ function hook_file_url_alter(&$uri) {
 
   $cdn1 = 'http://cdn1.example.com';
   $cdn2 = 'http://cdn2.example.com';
-  $cdn_extensions = array('css', 'js', 'gif', 'jpg', 'jpeg', 'png');
+  $cdn_extensions = ['css', 'js', 'gif', 'jpg', 'jpeg', 'png'];
 
   // Most CDNs don't support private file transfers without a lot of hassle,
   // so don't support this in the common case.
-  $schemes = array('public');
+  $schemes = ['public'];
 
   $scheme = file_uri_scheme($uri);
 
@@ -166,11 +166,11 @@ function hook_archiver_info_alter(&$info) {
  * @see drupal_get_filetransfer_info()
  */
 function hook_filetransfer_info() {
-  $info['sftp'] = array(
+  $info['sftp'] = [
     'title' => t('SFTP (Secure FTP)'),
     'class' => 'Drupal\Core\FileTransfer\SFTP',
     'weight' => 10,
-  );
+  ];
   return $info;
 }
 
diff --git a/web/core/lib/Drupal/Core/FileTransfer/FTP.php b/web/core/lib/Drupal/Core/FileTransfer/FTP.php
index 2238f330c..83cf66bed 100644
--- a/web/core/lib/Drupal/Core/FileTransfer/FTP.php
+++ b/web/core/lib/Drupal/Core/FileTransfer/FTP.php
@@ -21,7 +21,7 @@ abstract class FTP extends FileTransfer {
   /**
    * {@inheritdoc}
    */
-  static function factory($jail, $settings) {
+  public static function factory($jail, $settings) {
     $username = empty($settings['username']) ? '' : $settings['username'];
     $password = empty($settings['password']) ? '' : $settings['password'];
     $hostname = empty($settings['advanced']['hostname']) ? 'localhost' : $settings['advanced']['hostname'];
diff --git a/web/core/lib/Drupal/Core/FileTransfer/FTPExtension.php b/web/core/lib/Drupal/Core/FileTransfer/FTPExtension.php
index 3617a63c9..c5f1b22b3 100644
--- a/web/core/lib/Drupal/Core/FileTransfer/FTPExtension.php
+++ b/web/core/lib/Drupal/Core/FileTransfer/FTPExtension.php
@@ -26,7 +26,7 @@ class FTPExtension extends FTP implements ChmodInterface {
    */
   protected function copyFileJailed($source, $destination) {
     if (!@ftp_put($this->connection, $destination, $source, FTP_BINARY)) {
-      throw new FileTransferException("Cannot move @source to @destination", NULL, array("@source" => $source, "@destination" => $destination));
+      throw new FileTransferException("Cannot move @source to @destination", NULL, ["@source" => $source, "@destination" => $destination]);
     }
   }
 
@@ -35,7 +35,7 @@ class FTPExtension extends FTP implements ChmodInterface {
    */
   protected function createDirectoryJailed($directory) {
     if (!ftp_mkdir($this->connection, $directory)) {
-      throw new FileTransferException("Cannot create directory @directory", NULL, array("@directory" => $directory));
+      throw new FileTransferException("Cannot create directory @directory", NULL, ["@directory" => $directory]);
     }
   }
 
@@ -45,11 +45,11 @@ class FTPExtension extends FTP implements ChmodInterface {
   protected function removeDirectoryJailed($directory) {
     $pwd = ftp_pwd($this->connection);
     if (!ftp_chdir($this->connection, $directory)) {
-      throw new FileTransferException("Unable to change to directory @directory", NULL, array('@directory' => $directory));
+      throw new FileTransferException("Unable to change to directory @directory", NULL, ['@directory' => $directory]);
     }
     $list = @ftp_nlist($this->connection, '.');
     if (!$list) {
-      $list = array();
+      $list = [];
     }
     foreach ($list as $item) {
       if ($item == '.' || $item == '..') {
@@ -65,7 +65,7 @@ class FTPExtension extends FTP implements ChmodInterface {
     }
     ftp_chdir($this->connection, $pwd);
     if (!ftp_rmdir($this->connection, $directory)) {
-      throw new FileTransferException("Unable to remove to directory @directory", NULL, array('@directory' => $directory));
+      throw new FileTransferException("Unable to remove to directory @directory", NULL, ['@directory' => $directory]);
     }
   }
 
@@ -74,7 +74,7 @@ class FTPExtension extends FTP implements ChmodInterface {
    */
   protected function removeFileJailed($destination) {
     if (!ftp_delete($this->connection, $destination)) {
-      throw new FileTransferException("Unable to remove to file @file", NULL, array('@file' => $destination));
+      throw new FileTransferException("Unable to remove to file @file", NULL, ['@file' => $destination]);
     }
   }
 
@@ -101,9 +101,9 @@ class FTPExtension extends FTP implements ChmodInterface {
   /**
    * {@inheritdoc}
    */
-  function chmodJailed($path, $mode, $recursive) {
+  public function chmodJailed($path, $mode, $recursive) {
     if (!ftp_chmod($this->connection, $mode, $path)) {
-      throw new FileTransferException("Unable to set permissions on %file", NULL, array('%file' => $path));
+      throw new FileTransferException("Unable to set permissions on %file", NULL, ['%file' => $path]);
     }
     if ($this->isDirectory($path) && $recursive) {
       $filelist = @ftp_nlist($this->connection, $path);
diff --git a/web/core/lib/Drupal/Core/FileTransfer/FileTransfer.php b/web/core/lib/Drupal/Core/FileTransfer/FileTransfer.php
index dbe2559c0..25014f133 100644
--- a/web/core/lib/Drupal/Core/FileTransfer/FileTransfer.php
+++ b/web/core/lib/Drupal/Core/FileTransfer/FileTransfer.php
@@ -49,7 +49,7 @@ abstract class FileTransfer {
    *   be restricted to. This prevents the FileTransfer classes from being
    *   able to touch other parts of the filesystem.
    */
-  function __construct($jail) {
+  public function __construct($jail) {
     $this->jail = $jail;
   }
 
@@ -73,7 +73,7 @@ abstract class FileTransfer {
    *
    * @throws \Drupal\Core\FileTransfer\FileTransferException
    */
-  static function factory($jail, $settings) {
+  public static function factory($jail, $settings) {
     throw new FileTransferException('FileTransfer::factory() static method not overridden by FileTransfer subclass.');
   }
 
@@ -90,7 +90,7 @@ abstract class FileTransfer {
    * @return string|bool
    *   The variable specified in $name.
    */
-  function __get($name) {
+  public function __get($name) {
     if ($name == 'connection') {
       $this->connect();
       return $this->connection;
@@ -210,7 +210,7 @@ abstract class FileTransfer {
     $full_path = drupal_realpath(substr($this->chroot . $path, 0, strlen($full_jail)));
     $full_path = $this->fixRemotePath($full_path, FALSE);
     if ($full_jail !== $full_path) {
-      throw new FileTransferException('@directory is outside of the @jail', NULL, array('@directory' => $path, '@jail' => $this->jail));
+      throw new FileTransferException('@directory is outside of the @jail', NULL, ['@directory' => $path, '@jail' => $this->jail]);
     }
   }
 
@@ -249,7 +249,7 @@ abstract class FileTransfer {
    * @return string
    *   The modified path.
    */
-  function sanitizePath($path) {
+  public function sanitizePath($path) {
     $path = str_replace('\\', '/', $path); // Windows path sanitization.
     if (substr($path, -1) == '/') {
       $path = substr($path, 0, -1);
@@ -347,7 +347,7 @@ abstract class FileTransfer {
    * @return string|bool
    *   If successful, the chroot path for this connection, otherwise FALSE.
    */
-  function findChroot() {
+  public function findChroot() {
     // If the file exists as is, there is no chroot.
     $path = __FILE__;
     $path = $this->fixRemotePath($path, FALSE);
@@ -373,7 +373,7 @@ abstract class FileTransfer {
   /**
    * Sets the chroot and changes the jail to match the correct path scheme.
    */
-  function setChroot() {
+  public function setChroot() {
     $this->chroot = $this->findChroot();
     $this->jail = $this->fixRemotePath($this->jail);
   }
@@ -388,30 +388,30 @@ abstract class FileTransfer {
    *   An array that contains a Form API definition.
    */
   public function getSettingsForm() {
-    $form['username'] = array(
+    $form['username'] = [
       '#type' => 'textfield',
       '#title' => t('Username'),
-    );
-    $form['password'] = array(
+    ];
+    $form['password'] = [
       '#type' => 'password',
       '#title' => t('Password'),
       '#description' => t('Your password is not saved in the database and is only used to establish a connection.'),
-    );
-    $form['advanced'] = array(
+    ];
+    $form['advanced'] = [
       '#type' => 'details',
       '#title' => t('Advanced settings'),
-    );
-    $form['advanced']['hostname'] = array(
+    ];
+    $form['advanced']['hostname'] = [
       '#type' => 'textfield',
       '#title' => t('Host'),
       '#default_value' => 'localhost',
       '#description' => t('The connection will be created between your web server and the machine hosting the web server files. In the vast majority of cases, this will be the same machine, and "localhost" is correct.'),
-    );
-    $form['advanced']['port'] = array(
+    ];
+    $form['advanced']['port'] = [
       '#type' => 'textfield',
       '#title' => t('Port'),
       '#default_value' => NULL,
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/lib/Drupal/Core/FileTransfer/FileTransferException.php b/web/core/lib/Drupal/Core/FileTransfer/FileTransferException.php
index 15e657012..bcfd602d9 100644
--- a/web/core/lib/Drupal/Core/FileTransfer/FileTransferException.php
+++ b/web/core/lib/Drupal/Core/FileTransfer/FileTransferException.php
@@ -24,7 +24,7 @@ class FileTransferException extends \RuntimeException {
    * @param array $arguments
    *   Arguments to be used in this exception.
    */
-  function __construct($message, $code = 0, $arguments = array()) {
+  public function __construct($message, $code = 0, $arguments = []) {
     parent::__construct($message, $code);
     $this->arguments = $arguments;
   }
diff --git a/web/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php b/web/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
index 647463aad..2adbd1f0f 100644
--- a/web/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
+++ b/web/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
@@ -51,37 +51,37 @@ class FileTransferAuthorizeForm extends FormBase {
     // Get all the available ways to transfer files.
     if (empty($_SESSION['authorize_filetransfer_info'])) {
       drupal_set_message($this->t('Unable to continue, no available methods of file transfer'), 'error');
-      return array();
+      return [];
     }
     $available_backends = $_SESSION['authorize_filetransfer_info'];
 
     if (!$this->getRequest()->isSecure()) {
-      $form['information']['https_warning'] = array(
+      $form['information']['https_warning'] = [
         '#prefix' => '<div class="messages messages--error">',
-        '#markup' => $this->t('WARNING: You are not using an encrypted connection, so your password will be sent in plain text. <a href=":https-link">Learn more</a>.', array(':https-link' => 'https://www.drupal.org/https-information')),
+        '#markup' => $this->t('WARNING: You are not using an encrypted connection, so your password will be sent in plain text. <a href=":https-link">Learn more</a>.', [':https-link' => 'https://www.drupal.org/https-information']),
         '#suffix' => '</div>',
-      );
+      ];
     }
 
     // Decide on a default backend.
-    $authorize_filetransfer_default = $form_state->getValue(array('connection_settings', 'authorize_filetransfer_default'));
+    $authorize_filetransfer_default = $form_state->getValue(['connection_settings', 'authorize_filetransfer_default']);
     if (!$authorize_filetransfer_default) {
       $authorize_filetransfer_default = key($available_backends);
     }
 
-    $form['information']['main_header'] = array(
+    $form['information']['main_header'] = [
       '#prefix' => '<h3>',
       '#markup' => $this->t('To continue, provide your server connection details'),
       '#suffix' => '</h3>',
-    );
+    ];
 
     $form['connection_settings']['#tree'] = TRUE;
-    $form['connection_settings']['authorize_filetransfer_default'] = array(
+    $form['connection_settings']['authorize_filetransfer_default'] = [
       '#type' => 'select',
       '#title' => $this->t('Connection method'),
       '#default_value' => $authorize_filetransfer_default,
       '#weight' => -10,
-    );
+    ];
 
     /*
      * Here we create two submit buttons. For a JS enabled client, they will
@@ -90,46 +90,46 @@ class FileTransferAuthorizeForm extends FormBase {
      * what filetransfer type to use, and submit_process on the second one (which
      * leads to the actual operation).
      */
-    $form['submit_connection'] = array(
+    $form['submit_connection'] = [
       '#prefix' => "<br style='clear:both'/>",
       '#name' => 'enter_connection_settings',
       '#type' => 'submit',
       '#value' => $this->t('Enter connection settings'),
       '#weight' => 100,
-    );
+    ];
 
-    $form['submit_process'] = array(
+    $form['submit_process'] = [
       '#name' => 'process_updates',
       '#type' => 'submit',
       '#value' => $this->t('Continue'),
       '#weight' => 100,
-    );
+    ];
 
     // Build a container for each connection type.
     foreach ($available_backends as $name => $backend) {
       $form['connection_settings']['authorize_filetransfer_default']['#options'][$name] = $backend['title'];
-      $form['connection_settings'][$name] = array(
+      $form['connection_settings'][$name] = [
         '#type' => 'container',
-        '#attributes' => array('class' => array("filetransfer-$name", 'filetransfer')),
-        '#states' => array(
-          'visible' => array(
-            'select[name="connection_settings[authorize_filetransfer_default]"]' => array('value' => $name),
-          ),
-        ),
-      );
+        '#attributes' => ['class' => ["filetransfer-$name", 'filetransfer']],
+        '#states' => [
+          'visible' => [
+            'select[name="connection_settings[authorize_filetransfer_default]"]' => ['value' => $name],
+          ],
+        ],
+      ];
       // We can't use #prefix on the container itself since then the header won't
       // be hidden and shown when the containers are being manipulated via JS.
-      $form['connection_settings'][$name]['header'] = array(
-        '#markup' => '<h4>' . $this->t('@backend connection settings', array('@backend' => $backend['title'])) . '</h4>',
-      );
+      $form['connection_settings'][$name]['header'] = [
+        '#markup' => '<h4>' . $this->t('@backend connection settings', ['@backend' => $backend['title']]) . '</h4>',
+      ];
 
       $form['connection_settings'][$name] += $this->addConnectionSettings($name);
 
       // Start non-JS code.
-      if ($form_state->getValue(array('connection_settings', 'authorize_filetransfer_default')) == $name) {
+      if ($form_state->getValue(['connection_settings', 'authorize_filetransfer_default']) == $name) {
 
         // Change the submit button to the submit_process one.
-        $form['submit_process']['#attributes'] = array();
+        $form['submit_process']['#attributes'] = [];
         unset($form['submit_connection']);
 
         // Activate the proper filetransfer settings form.
@@ -138,13 +138,13 @@ class FileTransferAuthorizeForm extends FormBase {
         $form['connection_settings']['authorize_filetransfer_default']['#disabled'] = TRUE;
 
         // Create a button for changing the type of connection.
-        $form['connection_settings']['change_connection_type'] = array(
+        $form['connection_settings']['change_connection_type'] = [
           '#name' => 'change_connection_type',
           '#type' => 'submit',
           '#value' => $this->t('Change connection type'),
           '#weight' => -5,
-          '#attributes' => array('class' => array('filetransfer-change-connection-type')),
-        );
+          '#attributes' => ['class' => ['filetransfer-change-connection-type']],
+        ];
       }
       // End non-JS code.
     }
@@ -166,17 +166,17 @@ class FileTransferAuthorizeForm extends FormBase {
       $filetransfer = $this->getFiletransfer($backend, $form_connection_settings[$backend]);
       try {
         if (!$filetransfer) {
-          throw new \Exception($this->t('The connection protocol %backend does not exist.', array('%backend' => $backend)));
+          throw new \Exception($this->t('The connection protocol %backend does not exist.', ['%backend' => $backend]));
         }
         $filetransfer->connect();
       }
       catch (\Exception $e) {
         // The format of this error message is similar to that used on the
         // database connection form in the installer.
-        $form_state->setErrorByName('connection_settings', $this->t('Failed to connect to the server. The server reports the following message: <p class="error">@message</p> For more help installing or updating code on your server, see the <a href=":handbook_url">handbook</a>.', array(
+        $form_state->setErrorByName('connection_settings', $this->t('Failed to connect to the server. The server reports the following message: <p class="error">@message</p> For more help installing or updating code on your server, see the <a href=":handbook_url">handbook</a>.', [
           '@message' => $e->getMessage(),
           ':handbook_url' => 'https://www.drupal.org/documentation/install/modules-themes',
-        )));
+        ]));
       }
     }
   }
@@ -218,7 +218,7 @@ class FileTransferAuthorizeForm extends FormBase {
 
       case 'change_connection_type':
         $form_state->setRebuild();
-        $form_state->unsetValue(array('connection_settings', 'authorize_filetransfer_default'));
+        $form_state->unsetValue(['connection_settings', 'authorize_filetransfer_default']);
         break;
     }
   }
@@ -235,7 +235,7 @@ class FileTransferAuthorizeForm extends FormBase {
    *   An instantiated FileTransfer object for the requested method and settings,
    *   or FALSE if there was an error finding or instantiating it.
    */
-  protected function getFiletransfer($backend, $settings = array()) {
+  protected function getFiletransfer($backend, $settings = []) {
     $filetransfer = FALSE;
     if (!empty($_SESSION['authorize_filetransfer_info'][$backend])) {
       $backend_info = $_SESSION['authorize_filetransfer_info'][$backend];
@@ -258,8 +258,8 @@ class FileTransferAuthorizeForm extends FormBase {
    * @see hook_filetransfer_backends()
    */
   protected function addConnectionSettings($backend) {
-    $defaults = array();
-    $form = array();
+    $defaults = [];
+    $form = [];
 
     // Create an instance of the file transfer class to get its settings form.
     $filetransfer = $this->getFiletransfer($backend);
@@ -320,7 +320,7 @@ class FileTransferAuthorizeForm extends FormBase {
     unset($_SESSION['authorize_operation']);
 
     require_once $operation['file'];
-    return call_user_func_array($operation['callback'], array_merge(array($filetransfer), $operation['arguments']));
+    return call_user_func_array($operation['callback'], array_merge([$filetransfer], $operation['arguments']));
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/FileTransfer/Local.php b/web/core/lib/Drupal/Core/FileTransfer/Local.php
index e6879316d..1da4e48ea 100644
--- a/web/core/lib/Drupal/Core/FileTransfer/Local.php
+++ b/web/core/lib/Drupal/Core/FileTransfer/Local.php
@@ -17,7 +17,7 @@ class Local extends FileTransfer implements ChmodInterface {
   /**
    * {@inheritdoc}
    */
-  static function factory($jail, $settings) {
+  public static function factory($jail, $settings) {
     return new Local($jail);
   }
 
@@ -26,7 +26,7 @@ class Local extends FileTransfer implements ChmodInterface {
    */
   protected function copyFileJailed($source, $destination) {
     if (@!copy($source, $destination)) {
-      throw new FileTransferException('Cannot copy %source to %destination.', NULL, array('%source' => $source, '%destination' => $destination));
+      throw new FileTransferException('Cannot copy %source to %destination.', NULL, ['%source' => $source, '%destination' => $destination]);
     }
   }
 
@@ -35,7 +35,7 @@ class Local extends FileTransfer implements ChmodInterface {
    */
   protected function createDirectoryJailed($directory) {
     if (!is_dir($directory) && @!mkdir($directory, 0777, TRUE)) {
-      throw new FileTransferException('Cannot create directory %directory.', NULL, array('%directory' => $directory));
+      throw new FileTransferException('Cannot create directory %directory.', NULL, ['%directory' => $directory]);
     }
   }
 
@@ -45,22 +45,22 @@ class Local extends FileTransfer implements ChmodInterface {
   protected function removeDirectoryJailed($directory) {
     if (!is_dir($directory)) {
       // Programmer error assertion, not something we expect users to see.
-      throw new FileTransferException('removeDirectoryJailed() called with a path (%directory) that is not a directory.', NULL, array('%directory' => $directory));
+      throw new FileTransferException('removeDirectoryJailed() called with a path (%directory) that is not a directory.', NULL, ['%directory' => $directory]);
     }
     foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::CHILD_FIRST) as $filename => $file) {
       if ($file->isDir()) {
         if (@!drupal_rmdir($filename)) {
-          throw new FileTransferException('Cannot remove directory %directory.', NULL, array('%directory' => $filename));
+          throw new FileTransferException('Cannot remove directory %directory.', NULL, ['%directory' => $filename]);
         }
       }
       elseif ($file->isFile()) {
         if (@!drupal_unlink($filename)) {
-          throw new FileTransferException('Cannot remove file %file.', NULL, array('%file' => $filename));
+          throw new FileTransferException('Cannot remove file %file.', NULL, ['%file' => $filename]);
         }
       }
     }
     if (@!drupal_rmdir($directory)) {
-      throw new FileTransferException('Cannot remove directory %directory.', NULL, array('%directory' => $directory));
+      throw new FileTransferException('Cannot remove directory %directory.', NULL, ['%directory' => $directory]);
     }
   }
 
@@ -69,7 +69,7 @@ class Local extends FileTransfer implements ChmodInterface {
    */
   protected function removeFileJailed($file) {
     if (@!drupal_unlink($file)) {
-      throw new FileTransferException('Cannot remove file %file.', NULL, array('%file' => $file));
+      throw new FileTransferException('Cannot remove file %file.', NULL, ['%file' => $file]);
     }
   }
 
@@ -94,12 +94,12 @@ class Local extends FileTransfer implements ChmodInterface {
     if ($recursive && is_dir($path)) {
       foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::SELF_FIRST) as $filename => $file) {
         if (@!chmod($filename, $mode)) {
-          throw new FileTransferException('Cannot chmod %path.', NULL, array('%path' => $filename));
+          throw new FileTransferException('Cannot chmod %path.', NULL, ['%path' => $filename]);
         }
       }
     }
     elseif (@!chmod($path, $mode)) {
-      throw new FileTransferException('Cannot chmod %path.', NULL, array('%path' => $path));
+      throw new FileTransferException('Cannot chmod %path.', NULL, ['%path' => $path]);
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/FileTransfer/SSH.php b/web/core/lib/Drupal/Core/FileTransfer/SSH.php
index 8250c1641..5795526e9 100644
--- a/web/core/lib/Drupal/Core/FileTransfer/SSH.php
+++ b/web/core/lib/Drupal/Core/FileTransfer/SSH.php
@@ -10,7 +10,7 @@ class SSH extends FileTransfer implements ChmodInterface {
   /**
    * {@inheritdoc}
    */
-  function __construct($jail, $username, $password, $hostname = "localhost", $port = 22) {
+  public function __construct($jail, $username, $password, $hostname = "localhost", $port = 22) {
     $this->username = $username;
     $this->password = $password;
     $this->hostname = $hostname;
@@ -24,7 +24,7 @@ class SSH extends FileTransfer implements ChmodInterface {
   public function connect() {
     $this->connection = @ssh2_connect($this->hostname, $this->port);
     if (!$this->connection) {
-      throw new FileTransferException('SSH Connection failed to @host:@port', NULL, array('@host' => $this->hostname, '@port' => $this->port));
+      throw new FileTransferException('SSH Connection failed to @host:@port', NULL, ['@host' => $this->hostname, '@port' => $this->port]);
     }
     if (!@ssh2_auth_password($this->connection, $this->username, $this->password)) {
       throw new FileTransferException('The supplied username/password combination was not accepted.');
@@ -34,7 +34,7 @@ class SSH extends FileTransfer implements ChmodInterface {
   /**
    * {@inheritdoc}
    */
-  static function factory($jail, $settings) {
+  public static function factory($jail, $settings) {
     $username = empty($settings['username']) ? '' : $settings['username'];
     $password = empty($settings['password']) ? '' : $settings['password'];
     $hostname = empty($settings['advanced']['hostname']) ? 'localhost' : $settings['advanced']['hostname'];
@@ -47,7 +47,7 @@ class SSH extends FileTransfer implements ChmodInterface {
    */
   protected function copyFileJailed($source, $destination) {
     if (!@ssh2_scp_send($this->connection, $source, $destination)) {
-      throw new FileTransferException('Cannot copy @source_file to @destination_file.', NULL, array('@source' => $source, '@destination' => $destination));
+      throw new FileTransferException('Cannot copy @source_file to @destination_file.', NULL, ['@source' => $source, '@destination' => $destination]);
     }
   }
 
@@ -56,7 +56,7 @@ class SSH extends FileTransfer implements ChmodInterface {
    */
   protected function copyDirectoryJailed($source, $destination) {
     if (@!ssh2_exec($this->connection, 'cp -Rp ' . escapeshellarg($source) . ' ' . escapeshellarg($destination))) {
-      throw new FileTransferException('Cannot copy directory @directory.', NULL, array('@directory' => $source));
+      throw new FileTransferException('Cannot copy directory @directory.', NULL, ['@directory' => $source]);
     }
   }
 
@@ -65,7 +65,7 @@ class SSH extends FileTransfer implements ChmodInterface {
    */
   protected function createDirectoryJailed($directory) {
     if (@!ssh2_exec($this->connection, 'mkdir ' . escapeshellarg($directory))) {
-      throw new FileTransferException('Cannot create directory @directory.', NULL, array('@directory' => $directory));
+      throw new FileTransferException('Cannot create directory @directory.', NULL, ['@directory' => $directory]);
     }
   }
 
@@ -74,7 +74,7 @@ class SSH extends FileTransfer implements ChmodInterface {
    */
   protected function removeDirectoryJailed($directory) {
     if (@!ssh2_exec($this->connection, 'rm -Rf ' . escapeshellarg($directory))) {
-      throw new FileTransferException('Cannot remove @directory.', NULL, array('@directory' => $directory));
+      throw new FileTransferException('Cannot remove @directory.', NULL, ['@directory' => $directory]);
     }
   }
 
@@ -83,7 +83,7 @@ class SSH extends FileTransfer implements ChmodInterface {
    */
   protected function removeFileJailed($destination) {
     if (!@ssh2_exec($this->connection, 'rm ' . escapeshellarg($destination))) {
-      throw new FileTransferException('Cannot remove @directory.', NULL, array('@directory' => $destination));
+      throw new FileTransferException('Cannot remove @directory.', NULL, ['@directory' => $destination]);
     }
   }
 
@@ -103,7 +103,7 @@ class SSH extends FileTransfer implements ChmodInterface {
       return FALSE;
     }
     else {
-      throw new FileTransferException('Cannot check @path.', NULL, array('@path' => $path));
+      throw new FileTransferException('Cannot check @path.', NULL, ['@path' => $path]);
     }
   }
 
@@ -120,17 +120,17 @@ class SSH extends FileTransfer implements ChmodInterface {
       return FALSE;
     }
     else {
-      throw new FileTransferException('Cannot check @path.', NULL, array('@path' => $path));
+      throw new FileTransferException('Cannot check @path.', NULL, ['@path' => $path]);
     }
   }
 
   /**
    * {@inheritdoc}
    */
-  function chmodJailed($path, $mode, $recursive) {
+  public function chmodJailed($path, $mode, $recursive) {
     $cmd = sprintf("chmod %s%o %s", $recursive ? '-R ' : '', $mode, escapeshellarg($path));
     if (@!ssh2_exec($this->connection, $cmd)) {
-      throw new FileTransferException('Cannot change permissions of @path.', NULL, array('@path' => $path));
+      throw new FileTransferException('Cannot change permissions of @path.', NULL, ['@path' => $path]);
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/Flood/DatabaseBackend.php b/web/core/lib/Drupal/Core/Flood/DatabaseBackend.php
index 4b2f0d00c..12e9102af 100644
--- a/web/core/lib/Drupal/Core/Flood/DatabaseBackend.php
+++ b/web/core/lib/Drupal/Core/Flood/DatabaseBackend.php
@@ -80,12 +80,12 @@ class DatabaseBackend implements FloodInterface {
    */
   protected function doInsert($name, $window, $identifier) {
     $this->connection->insert(static::TABLE_NAME)
-      ->fields(array(
+      ->fields([
         'event' => $name,
         'identifier' => $identifier,
         'timestamp' => REQUEST_TIME,
         'expiration' => REQUEST_TIME + $window,
-      ))
+      ])
       ->execute();
   }
 
diff --git a/web/core/lib/Drupal/Core/Flood/MemoryBackend.php b/web/core/lib/Drupal/Core/Flood/MemoryBackend.php
index 5b3377e8d..ddb42bc4c 100644
--- a/web/core/lib/Drupal/Core/Flood/MemoryBackend.php
+++ b/web/core/lib/Drupal/Core/Flood/MemoryBackend.php
@@ -19,7 +19,7 @@ class MemoryBackend implements FloodInterface {
   /**
    * An array holding flood events, keyed by event name and identifier.
    */
-  protected $events = array();
+  protected $events = [];
 
   /**
    * Construct the MemoryBackend.
diff --git a/web/core/lib/Drupal/Core/Form/ConfigFormBase.php b/web/core/lib/Drupal/Core/Form/ConfigFormBase.php
index fb508f854..e7878a7db 100644
--- a/web/core/lib/Drupal/Core/Form/ConfigFormBase.php
+++ b/web/core/lib/Drupal/Core/Form/ConfigFormBase.php
@@ -35,11 +35,11 @@ abstract class ConfigFormBase extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save configuration'),
       '#button_type' => 'primary',
-    );
+    ];
 
     // By default, render the form using system-config-form.html.twig.
     $form['#theme'] = 'system_config_form';
diff --git a/web/core/lib/Drupal/Core/Form/ConfirmFormBase.php b/web/core/lib/Drupal/Core/Form/ConfirmFormBase.php
index 6de9fdfcd..4214bfcab 100644
--- a/web/core/lib/Drupal/Core/Form/ConfirmFormBase.php
+++ b/web/core/lib/Drupal/Core/Form/ConfirmFormBase.php
@@ -42,15 +42,15 @@ abstract class ConfirmFormBase extends FormBase implements ConfirmFormInterface
     $form['#title'] = $this->getQuestion();
 
     $form['#attributes']['class'][] = 'confirmation';
-    $form['description'] = array('#markup' => $this->getDescription());
-    $form[$this->getFormName()] = array('#type' => 'hidden', '#value' => 1);
+    $form['description'] = ['#markup' => $this->getDescription()];
+    $form[$this->getFormName()] = ['#type' => 'hidden', '#value' => 1];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->getConfirmText(),
       '#button_type' => 'primary',
-    );
+    ];
 
     $form['actions']['cancel'] = ConfirmFormHelper::buildCancelLink($this, $this->getRequest());
 
diff --git a/web/core/lib/Drupal/Core/Form/FormBase.php b/web/core/lib/Drupal/Core/Form/FormBase.php
index 485e6d76a..02a1c3940 100644
--- a/web/core/lib/Drupal/Core/Form/FormBase.php
+++ b/web/core/lib/Drupal/Core/Form/FormBase.php
@@ -147,7 +147,7 @@ abstract class FormBase implements FormInterface, ContainerInjectionInterface {
   /**
    * Gets the request object.
    *
-   * @return \Symfony\Component\HttpFoundation\Request $request
+   * @return \Symfony\Component\HttpFoundation\Request
    *   The request object.
    */
   protected function getRequest() {
@@ -200,7 +200,7 @@ abstract class FormBase implements FormInterface, ContainerInjectionInterface {
    * \Drupal\Core\DependencyInjection\ContainerInjectionInterface should be used
    * for injecting services.
    *
-   * @return \Symfony\Component\DependencyInjection\ContainerInterface $container
+   * @return \Symfony\Component\DependencyInjection\ContainerInterface
    *   The service container.
    */
   private function container() {
diff --git a/web/core/lib/Drupal/Core/Form/FormBuilder.php b/web/core/lib/Drupal/Core/Form/FormBuilder.php
index 878967b9c..c4a1fd266 100644
--- a/web/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/web/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -496,7 +496,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
 
     $callback = [$form_state->getFormObject(), 'buildForm'];
 
-    $form = array();
+    $form = [];
     // Assign a default CSS class name based on $form_id.
     // This happens here and not in self::prepareForm() in order to allow the
     // form constructor function to override or remove the default class.
@@ -509,7 +509,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
     // We need to pass $form_state by reference in order for forms to modify it,
     // since call_user_func_array() requires that referenced variables are
     // passed explicitly.
-    $args = array_merge(array($form, &$form_state), $args);
+    $args = array_merge([$form, &$form_state], $args);
 
     $form = call_user_func_array($callback, $args);
     // If the form returns a response, skip subsequent page construction by
@@ -683,8 +683,9 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
       // will be replaced at the very last moment. This ensures forms with
       // dynamically generated action URLs don't have poor cacheability.
       // Use the proper API to generate the placeholder, when we have one. See
-      // https://www.drupal.org/node/2562341.
-      $placeholder = 'form_action_' . hash('crc32b', __METHOD__);
+      // https://www.drupal.org/node/2562341. The placholder uses a fixed string
+      // that is Crypt::hashBase64('Drupal\Core\Form\FormBuilder::prepareForm');
+      $placeholder = 'form_action_p_pvdeGsVG5zNF_XLGPTvYSKCf43t8qZYSwcfZl2uzM';
 
       $form['#attached']['placeholders'][$placeholder] = [
         '#lazy_builder' => ['form_builder:renderPlaceholderFormAction', []],
@@ -715,7 +716,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
     if (!isset($form['#build_id'])) {
       $form['#build_id'] = 'form-' . Crypt::randomBytesBase64();
     }
-    $form['form_build_id'] = array(
+    $form['form_build_id'] = [
       '#type' => 'hidden',
       '#value' => $form['#build_id'],
       '#id' => $form['#build_id'],
@@ -723,8 +724,8 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
       // Form processing and validation requires this value, so ensure the
       // submitted form value appears literally, regardless of custom #tree
       // and #parents being set elsewhere.
-      '#parents' => array('form_build_id'),
-    );
+      '#parents' => ['form_build_id'],
+    ];
 
     // Add a token, based on either #token or form_id, to any form displayed to
     // authenticated users. This ensures that any submitted form was actually
@@ -744,17 +745,17 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
       if ($user && $user->isAuthenticated()) {
         // Generate a public token based on the form id.
         // Generates a placeholder based on the form ID.
-        $placeholder = 'form_token_placeholder_' . hash('crc32b', $form_id);
+        $placeholder = 'form_token_placeholder_' . Crypt::hashBase64($form_id);
         $form['#token'] = $placeholder;
 
-        $form['form_token'] = array(
+        $form['form_token'] = [
           '#id' => Html::getUniqueId('edit-' . $form_id . '-form-token'),
           '#type' => 'token',
           '#default_value' => $placeholder,
           // Form processing and validation requires this value, so ensure the
           // submitted form value appears literally, regardless of custom #tree
           // and #parents being set elsewhere.
-          '#parents' => array('form_token'),
+          '#parents' => ['form_token'],
           // Instead of setting an actual CSRF token, we've set the placeholder
           // in form_token's #default_value and #placeholder. These will be
           // replaced at the very last moment. This ensures forms with a CSRF
@@ -769,20 +770,20 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
           '#cache' => [
             'max-age' => 0,
           ],
-        );
+        ];
       }
     }
 
     if (isset($form_id)) {
-      $form['form_id'] = array(
+      $form['form_id'] = [
         '#type' => 'hidden',
         '#value' => $form_id,
         '#id' => Html::getUniqueId("edit-$form_id"),
         // Form processing and validation requires this value, so ensure the
         // submitted form value appears literally, regardless of custom #tree
         // and #parents being set elsewhere.
-        '#parents' => array('form_id'),
-      );
+        '#parents' => ['form_id'],
+      ];
     }
     if (!isset($form['#id'])) {
       $form['#id'] = Html::getUniqueId($form_id);
@@ -792,7 +793,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
     }
 
     $form += $this->elementInfo->getInfo('form');
-    $form += array('#tree' => FALSE, '#parents' => array());
+    $form += ['#tree' => FALSE, '#parents' => []];
     $form['#validate'][] = '::validateForm';
     $form['#submit'][] = '::submitForm';
 
@@ -802,7 +803,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
     // is in #theme_wrappers. Therefore, the #theme function only has to care
     // for rendering the inner form elements, not the form itself.
     if (!isset($form['#theme'])) {
-      $form['#theme'] = array($form_id);
+      $form['#theme'] = [$form_id];
       if (isset($build_info['base_form_id'])) {
         $form['#theme'][] = $build_info['base_form_id'];
       }
@@ -810,7 +811,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
 
     // Invoke hook_form_alter(), hook_form_BASE_FORM_ID_alter(), and
     // hook_form_FORM_ID_alter() implementations.
-    $hooks = array('form');
+    $hooks = ['form'];
     if (isset($build_info['base_form_id'])) {
       $hooks[] = 'form_' . $build_info['base_form_id'];
     }
@@ -900,13 +901,13 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
       $element['#defaults_loaded'] = TRUE;
     }
     // Assign basic defaults common for all form elements.
-    $element += array(
+    $element += [
       '#required' => FALSE,
-      '#attributes' => array(),
+      '#attributes' => [],
       '#title_display' => 'before',
       '#description_display' => 'after',
       '#errors' => NULL,
-    );
+    ];
 
     // Special handling if we're on the top level form element.
     if (isset($element['#type']) && $element['#type'] == 'form') {
@@ -948,7 +949,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
       }
 
       // All form elements should have an #array_parents property.
-      $element['#array_parents'] = array();
+      $element['#array_parents'] = [];
     }
 
     if (!isset($element['#id'])) {
@@ -978,7 +979,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
     if (isset($element['#process']) && !$element['#processed']) {
       foreach ($element['#process'] as $callback) {
         $complete_form = &$form_state->getCompleteForm();
-        $element = call_user_func_array($form_state->prepareCallback($callback), array(&$element, &$form_state, &$complete_form));
+        $element = call_user_func_array($form_state->prepareCallback($callback), [&$element, &$form_state, &$complete_form]);
       }
       $element['#processed'] = TRUE;
     }
@@ -1015,7 +1016,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
 
       // Make child elements inherit their parent's #disabled and #allow_focus
       // values unless they specify their own.
-      foreach (array('#disabled', '#allow_focus') as $property) {
+      foreach (['#disabled', '#allow_focus'] as $property) {
         if (isset($element[$property]) && !isset($element[$key][$property])) {
           $element[$key][$property] = $element[$property];
         }
@@ -1025,7 +1026,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
       if (!isset($element[$key]['#parents'])) {
         // Check to see if a tree of child elements is present. If so,
         // continue down the tree if required.
-        $element[$key]['#parents'] = $element[$key]['#tree'] && $element['#tree'] ? array_merge($element['#parents'], array($key)) : array($key);
+        $element[$key]['#parents'] = $element[$key]['#tree'] && $element['#tree'] ? array_merge($element['#parents'], [$key]) : [$key];
       }
       // Ensure #array_parents follows the actual form structure.
       $array_parents = $element['#array_parents'];
@@ -1049,7 +1050,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
     // after normal input parsing has been completed.
     if (isset($element['#after_build']) && !isset($element['#after_build_done'])) {
       foreach ($element['#after_build'] as $callback) {
-        $element = call_user_func_array($form_state->prepareCallback($callback), array($element, &$form_state));
+        $element = call_user_func_array($form_state->prepareCallback($callback), [$element, &$form_state]);
       }
       $element['#after_build_done'] = TRUE;
     }
@@ -1235,7 +1236,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
           // Skip all value callbacks except safe ones like text if the CSRF
           // token was invalid.
           if (!$form_state->hasInvalidToken() || $this->valueCallableIsSafe($value_callable)) {
-            $element['#value'] = call_user_func_array($value_callable, array(&$element, $input, &$form_state));
+            $element['#value'] = call_user_func_array($value_callable, [&$element, $input, &$form_state]);
           }
           else {
             $input = NULL;
@@ -1254,7 +1255,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
       if (!isset($element['#value'])) {
         // Call #type_value without a second argument to request default_value
         // handling.
-        $element['#value'] = call_user_func_array($value_callable, array(&$element, FALSE, &$form_state));
+        $element['#value'] = call_user_func_array($value_callable, [&$element, FALSE, &$form_state]);
 
         // Final catch. If we haven't set a value yet, use the explicit default
         // value. Avoid image buttons (which come with garbage value), so we
diff --git a/web/core/lib/Drupal/Core/Form/FormCache.php b/web/core/lib/Drupal/Core/Form/FormCache.php
index 13e543032..7064e10fb 100644
--- a/web/core/lib/Drupal/Core/Form/FormCache.php
+++ b/web/core/lib/Drupal/Core/Form/FormCache.php
@@ -156,7 +156,7 @@ class FormCache implements FormCacheInterface {
       $build_info += ['files' => []];
       foreach ($build_info['files'] as $file) {
         if (is_array($file)) {
-          $file += array('type' => 'inc', 'name' => $file['module']);
+          $file += ['type' => 'inc', 'name' => $file['module']];
           $this->moduleHandler->loadInclude($file['module'], $file['type'], $file['name']);
         }
         elseif (file_exists($file)) {
diff --git a/web/core/lib/Drupal/Core/Form/FormErrorHandler.php b/web/core/lib/Drupal/Core/Form/FormErrorHandler.php
index 921ab1024..9783cb5c4 100644
--- a/web/core/lib/Drupal/Core/Form/FormErrorHandler.php
+++ b/web/core/lib/Drupal/Core/Form/FormErrorHandler.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Form;
 
+use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Render\Element;
 
 /**
@@ -43,21 +44,115 @@ class FormErrorHandler implements FormErrorHandlerInterface {
   }
 
   /**
-   * Stores the errors of each element directly on the element.
+   * Stores errors and a list of child element errors directly on each element.
    *
-   * We must provide a way for non-form functions to check the errors for a
-   * specific element. The most common usage of this is a #pre_render callback.
+   * Grouping elements like containers, details, fieldgroups and fieldsets may
+   * need error info from their child elements to be able to accessibly show
+   * form error messages to a user. For example, a details element should be
+   * opened when child elements have errors.
    *
-   * @param array $elements
-   *   An associative array containing the structure of a form element.
+   * Grouping example:
+   * Assume you have a 'street' element somewhere in a form, which is displayed
+   * in a details element 'address'. It might be:
+   * @code
+   * $form['street'] = [
+   *   '#type' => 'textfield',
+   *   '#title' => $this->t('Street'),
+   *   '#group' => 'address',
+   *   '#required' => TRUE,
+   * ];
+   * $form['address'] = [
+   *   '#type' => 'details',
+   *   '#title' => $this->t('Address'),
+   * ];
+   * @endcode
+   *
+   * When submitting an empty street field, the generated error is available to
+   * the different render elements like so:
+   * @code
+   * // The street textfield element.
+   * $element = [
+   *   '#errors' => {Drupal\Core\StringTranslation\TranslatableMarkup},
+   *   '#children_errors' => [],
+   * ];
+   * // The address detail element.
+   * $element = [
+   *   '#errors' => null,
+   *   '#children_errors' => [
+   *      'street' => {Drupal\Core\StringTranslation\TranslatableMarkup}
+   *   ],
+   * ];
+   * @endcode
+   *
+   * The list of child element errors of an element is an associative array. A
+   * child element error is keyed with the #array_parents value of the
+   * respective element. The key is formed by imploding this value with '][' as
+   * glue. For example, a value ['contact_info', 'name'] becomes
+   * 'contact_info][name'.
+   *
+   * @param array $form
+   *   An associative array containing a reference to the complete structure of
+   *   the form.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
+   * @param array $elements
+   *   An associative array containing the part of the form structure that will
+   *   be processed while traversing up the tree. For recursion only; leave
+   *   empty when calling this method.
    */
-  protected function setElementErrorsFromFormState(array &$elements, FormStateInterface &$form_state) {
-    // Recurse through all children.
+  protected function setElementErrorsFromFormState(array &$form, FormStateInterface $form_state, array &$elements = []) {
+    // At the start of traversing up the form tree set the to be processed
+    // elements to the complete form structure by reference so that we can
+    // modify the original form. When processing grouped elements a reference to
+    // the complete form is needed.
+    if (empty($elements)) {
+      $elements = &$form;
+    }
+
+    // Recurse through all element children.
     foreach (Element::children($elements) as $key) {
-      if (isset($elements[$key]) && $elements[$key]) {
-        $this->setElementErrorsFromFormState($elements[$key], $form_state);
+      if (!empty($elements[$key])) {
+        // Get the child by reference so that we can update the original form.
+        $child = &$elements[$key];
+
+        // Call self to traverse up the form tree. The current element's child
+        // contains the next elements to be processed.
+        $this->setElementErrorsFromFormState($form, $form_state, $child);
+
+        $children_errors = [];
+
+        // Inherit all recorded "children errors" of the direct child.
+        if (!empty($child['#children_errors'])) {
+          $children_errors = $child['#children_errors'];
+        }
+
+        // Additionally store the errors of the direct child itself, keyed by
+        // it's parent elements structure.
+        if (!empty($child['#errors'])) {
+          $child_parents = implode('][', $child['#array_parents']);
+          $children_errors[$child_parents] = $child['#errors'];
+        }
+
+        if (!empty($elements['#children_errors'])) {
+          $elements['#children_errors'] += $children_errors;
+        }
+        else {
+          $elements['#children_errors'] = $children_errors;
+        }
+
+        // If this direct child belongs to a group populate the grouping element
+        // with the children errors.
+        if (!empty($child['#group'])) {
+          $parents = explode('][', $child['#group']);
+          $group_element = NestedArray::getValue($form, $parents);
+          if (isset($group_element['#children_errors'])) {
+            $group_element['#children_errors'] = $group_element['#children_errors'] + $children_errors;
+          }
+          else {
+            $group_element['#children_errors'] = $children_errors;
+          }
+          NestedArray::setValue($form, $parents, $group_element);
+        }
       }
     }
 
diff --git a/web/core/lib/Drupal/Core/Form/FormState.php b/web/core/lib/Drupal/Core/Form/FormState.php
index 33ca1fafb..b78efb30d 100644
--- a/web/core/lib/Drupal/Core/Form/FormState.php
+++ b/web/core/lib/Drupal/Core/Form/FormState.php
@@ -63,10 +63,10 @@ class FormState implements FormStateInterface {
    *
    * @var array
    */
-  protected $build_info = array(
-    'args' => array(),
-    'files' => array(),
-  );
+  protected $build_info = [
+    'args' => [],
+    'files' => [],
+  ];
 
   /**
    * Similar to self::$build_info, but pertaining to
@@ -76,7 +76,7 @@ class FormState implements FormStateInterface {
    *
    * @var array
    */
-  protected $rebuild_info = array();
+  protected $rebuild_info = [];
 
   /**
    * Normally, after the entire form processing is completed and submit handlers
@@ -216,7 +216,7 @@ class FormState implements FormStateInterface {
    *
    * @var array
    */
-  protected $values = array();
+  protected $values = [];
 
   /**
    * An associative array of form value keys to be removed by cleanValues().
@@ -348,7 +348,7 @@ class FormState implements FormStateInterface {
    *
    * @var array
    */
-  protected $groups = array();
+  protected $groups = [];
 
   /**
    * This is not a special key, and no specific support is provided for it in
@@ -368,7 +368,7 @@ class FormState implements FormStateInterface {
    *
    * @var array
    */
-  protected $storage = array();
+  protected $storage = [];
 
   /**
    * A list containing copies of all submit and button elements in the form.
@@ -377,7 +377,7 @@ class FormState implements FormStateInterface {
    *
    * @var array
    */
-  protected $buttons = array();
+  protected $buttons = [];
 
   /**
    * Holds temporary data accessible during the current page request only.
@@ -413,7 +413,7 @@ class FormState implements FormStateInterface {
    *
    * @var array
    */
-  protected $errors = array();
+  protected $errors = [];
 
   /**
    * Stores which errors should be limited during validation.
@@ -618,7 +618,7 @@ class FormState implements FormStateInterface {
    * @see \Symfony\Component\HttpFoundation\Request::isMethodSafe()
    */
   protected function isRequestMethodSafe() {
-    return in_array($this->requestMethod, array('GET', 'HEAD'));
+    return in_array($this->requestMethod, ['GET', 'HEAD']);
   }
 
   /**
@@ -862,11 +862,11 @@ class FormState implements FormStateInterface {
     if (!isset($build_info['files']["$module:$name.$type"])) {
       // Only add successfully included files to the form state.
       if ($result = $this->moduleLoadInclude($module, $type, $name)) {
-        $build_info['files']["$module:$name.$type"] = array(
+        $build_info['files']["$module:$name.$type"] = [
           'type' => $type,
           'module' => $module,
           'name' => $name,
-        );
+        ];
         $this->setBuildInfo($build_info);
         return $result;
       }
@@ -998,7 +998,7 @@ class FormState implements FormStateInterface {
   /**
    * {@inheritdoc}
    */
-  public function setRedirect($route_name, array $route_parameters = array(), array $options = array()) {
+  public function setRedirect($route_name, array $route_parameters = [], array $options = []) {
     $url = new Url($route_name, $route_parameters, $options);
     return $this->setRedirectUrl($url);
   }
@@ -1108,7 +1108,7 @@ class FormState implements FormStateInterface {
    */
   public function getError(array $element) {
     if ($errors = $this->getErrors()) {
-      $parents = array();
+      $parents = [];
       foreach ($element['#parents'] as $parent) {
         $parents[] = $parent;
         $key = implode('][', $parents);
diff --git a/web/core/lib/Drupal/Core/Form/FormStateInterface.php b/web/core/lib/Drupal/Core/Form/FormStateInterface.php
index b1e3f3bc0..43b2d8ebf 100644
--- a/web/core/lib/Drupal/Core/Form/FormStateInterface.php
+++ b/web/core/lib/Drupal/Core/Form/FormStateInterface.php
@@ -129,7 +129,7 @@ interface FormStateInterface {
    *
    * @see \Drupal\Core\Form\FormSubmitterInterface::redirectForm()
    */
-  public function setRedirect($route_name, array $route_parameters = array(), array $options = array());
+  public function setRedirect($route_name, array $route_parameters = [], array $options = []);
 
   /**
    * Sets the redirect URL for the form.
diff --git a/web/core/lib/Drupal/Core/Form/FormSubmitter.php b/web/core/lib/Drupal/Core/Form/FormSubmitter.php
index a467924fe..4a4275ef8 100644
--- a/web/core/lib/Drupal/Core/Form/FormSubmitter.php
+++ b/web/core/lib/Drupal/Core/Form/FormSubmitter.php
@@ -104,11 +104,11 @@ class FormSubmitter implements FormSubmitterInterface {
         // Some previous submit handler has set a batch. To ensure correct
         // execution order, store the call in a special 'control' batch set.
         // See _batch_next_set().
-        $batch['sets'][] = array('form_submit' => $callback);
+        $batch['sets'][] = ['form_submit' => $callback];
         $batch['has_form_submits'] = TRUE;
       }
       else {
-        call_user_func_array($form_state->prepareCallback($callback), array(&$form, &$form_state));
+        call_user_func_array($form_state->prepareCallback($callback), [&$form, &$form_state]);
       }
     }
   }
diff --git a/web/core/lib/Drupal/Core/Form/FormSubmitterInterface.php b/web/core/lib/Drupal/Core/Form/FormSubmitterInterface.php
index a2309539b..66132f53d 100644
--- a/web/core/lib/Drupal/Core/Form/FormSubmitterInterface.php
+++ b/web/core/lib/Drupal/Core/Form/FormSubmitterInterface.php
@@ -62,7 +62,7 @@ interface FormSubmitterInterface {
    *     ),
    *     'fragment' => 'baz',
    *   ),
-   * ));
+   * );
    * @endcode
    *
    * @param \Drupal\Core\Form\FormStateInterface $form_state
diff --git a/web/core/lib/Drupal/Core/Form/FormValidator.php b/web/core/lib/Drupal/Core/Form/FormValidator.php
index dbefe00a8..7398053bc 100644
--- a/web/core/lib/Drupal/Core/Form/FormValidator.php
+++ b/web/core/lib/Drupal/Core/Form/FormValidator.php
@@ -80,7 +80,7 @@ class FormValidator implements FormValidatorInterface {
     }
 
     foreach ($handlers as $callback) {
-      call_user_func_array($form_state->prepareCallback($callback), array(&$form, &$form_state));
+      call_user_func_array($form_state->prepareCallback($callback), [&$form, &$form_state]);
     }
   }
 
@@ -128,7 +128,7 @@ class FormValidator implements FormValidatorInterface {
     $url = $this->requestStack->getCurrentRequest()->getRequestUri();
 
     // Setting this error will cause the form to fail validation.
-    $form_state->setErrorByName('form_token', $this->t('The form has become outdated. Copy any unsaved work in the form below and then <a href=":link">reload this page</a>.', array(':link' => $url)));
+    $form_state->setErrorByName('form_token', $this->t('The form has become outdated. Copy any unsaved work in the form below and then <a href=":link">reload this page</a>.', [':link' => $url]));
   }
 
   /**
@@ -149,7 +149,7 @@ class FormValidator implements FormValidatorInterface {
     // so that only values that passed validation are left for submit callbacks.
     $triggering_element = $form_state->getTriggeringElement();
     if (isset($triggering_element['#limit_validation_errors']) && $triggering_element['#limit_validation_errors'] !== FALSE) {
-      $values = array();
+      $values = [];
       foreach ($triggering_element['#limit_validation_errors'] as $section) {
         // If the section exists within $form_state->getValues(), even if the
         // value is NULL, copy it to $values.
@@ -274,7 +274,7 @@ class FormValidator implements FormValidatorInterface {
       elseif (isset($elements['#element_validate'])) {
         foreach ($elements['#element_validate'] as $callback) {
           $complete_form = &$form_state->getCompleteForm();
-          call_user_func_array($form_state->prepareCallback($callback), array(&$elements, &$form_state, &$complete_form));
+          call_user_func_array($form_state->prepareCallback($callback), [&$elements, &$form_state, &$complete_form]);
         }
       }
 
@@ -291,7 +291,7 @@ class FormValidator implements FormValidatorInterface {
         // form constructors are encouraged to set #title anyway, and then set
         // #title_display to 'invisible'. This improves accessibility.
         elseif (isset($elements['#title'])) {
-          $form_state->setError($elements, $this->t('@name field is required.', array('@name' => $elements['#title'])));
+          $form_state->setError($elements, $this->t('@name field is required.', ['@name' => $elements['#title']]));
         }
         else {
           $form_state->setError($elements);
@@ -326,7 +326,7 @@ class FormValidator implements FormValidatorInterface {
   protected function performRequiredValidation(&$elements, FormStateInterface &$form_state) {
     // Verify that the value is not longer than #maxlength.
     if (isset($elements['#maxlength']) && Unicode::strlen($elements['#value']) > $elements['#maxlength']) {
-      $form_state->setError($elements, $this->t('@name cannot be longer than %max characters but is currently %length characters long.', array('@name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title'], '%max' => $elements['#maxlength'], '%length' => Unicode::strlen($elements['#value']))));
+      $form_state->setError($elements, $this->t('@name cannot be longer than %max characters but is currently %length characters long.', ['@name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title'], '%max' => $elements['#maxlength'], '%length' => Unicode::strlen($elements['#value'])]));
     }
 
     if (isset($elements['#options']) && isset($elements['#value'])) {
@@ -337,11 +337,11 @@ class FormValidator implements FormValidatorInterface {
         $options = $elements['#options'];
       }
       if (is_array($elements['#value'])) {
-        $value = in_array($elements['#type'], array('checkboxes', 'tableselect')) ? array_keys($elements['#value']) : $elements['#value'];
+        $value = in_array($elements['#type'], ['checkboxes', 'tableselect']) ? array_keys($elements['#value']) : $elements['#value'];
         foreach ($value as $v) {
           if (!isset($options[$v])) {
             $form_state->setError($elements, $this->t('An illegal choice has been detected. Please contact the site administrator.'));
-            $this->logger->error('Illegal choice %choice in %name element.', array('%choice' => $v, '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']));
+            $this->logger->error('Illegal choice %choice in %name element.', ['%choice' => $v, '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']]);
           }
         }
       }
@@ -360,7 +360,7 @@ class FormValidator implements FormValidatorInterface {
       }
       elseif (!isset($options[$elements['#value']])) {
         $form_state->setError($elements, $this->t('An illegal choice has been detected. Please contact the site administrator.'));
-        $this->logger->error('Illegal choice %choice in %name element.', array('%choice' => $elements['#value'], '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']));
+        $this->logger->error('Illegal choice %choice in %name element.', ['%choice' => $elements['#value'], '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']]);
       }
     }
   }
@@ -398,7 +398,7 @@ class FormValidator implements FormValidatorInterface {
     // types, #limit_validation_errors defaults to FALSE, so that full
     // validation is their default behavior.
     elseif ($triggering_element && !isset($triggering_element['#limit_validation_errors']) && !$form_state->isSubmitted()) {
-      return array();
+      return [];
     }
     // As an extra security measure, explicitly turn off error suppression if
     // one of the above conditions wasn't met. Since this is also done at the
diff --git a/web/core/lib/Drupal/Core/Form/OptGroup.php b/web/core/lib/Drupal/Core/Form/OptGroup.php
index ac4e5fb0a..2ba28bde9 100644
--- a/web/core/lib/Drupal/Core/Form/OptGroup.php
+++ b/web/core/lib/Drupal/Core/Form/OptGroup.php
@@ -21,7 +21,7 @@ class OptGroup {
    *   An array with all hierarchical elements flattened to a single array.
    */
   public static function flattenOptions(array $array) {
-    $options = array();
+    $options = [];
     static::doFlattenOptions($array, $options);
     return $options;
   }
diff --git a/web/core/lib/Drupal/Core/Form/form.api.php b/web/core/lib/Drupal/Core/Form/form.api.php
index 701871f92..ba0e345e0 100644
--- a/web/core/lib/Drupal/Core/Form/form.api.php
+++ b/web/core/lib/Drupal/Core/Form/form.api.php
@@ -18,7 +18,7 @@
  * @param $MULTIPLE_PARAMS
  *   Additional parameters specific to the batch. These are specified in the
  *   array passed to batch_set().
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   The batch context array, passed by reference. This contains the following
  *   properties:
  *   - 'finished': A float number between 0 and 1 informing the processing
@@ -73,7 +73,7 @@ function callback_batch_operation($MULTIPLE_PARAMS, &$context) {
   foreach ($result as $row) {
 
     // Here we actually perform our processing on the current node.
-    $node_storage->resetCache(array($row['nid']));
+    $node_storage->resetCache([$row['nid']]);
     $node = $node_storage->load($row['nid']);
     $node->value1 = $options1;
     $node->value2 = $options2;
@@ -85,7 +85,7 @@ function callback_batch_operation($MULTIPLE_PARAMS, &$context) {
     // Update our progress information.
     $context['sandbox']['progress']++;
     $context['sandbox']['current_node'] = $node->nid;
-    $context['message'] = t('Now processing %node', array('%node' => $node->title));
+    $context['message'] = t('Now processing %node', ['%node' => $node->title]);
   }
 
   // Inform the batch engine that we are not finished,
@@ -113,13 +113,13 @@ function callback_batch_operation($MULTIPLE_PARAMS, &$context) {
 function callback_batch_finished($success, $results, $operations) {
   if ($success) {
     // Here we do something meaningful with the results.
-    $message = t("@count items were processed.", array(
+    $message = t("@count items were processed.", [
       '@count' => count($results),
-      ));
-    $list = array(
+      ]);
+    $list = [
       '#theme' => 'item_list',
       '#items' => $results,
-    );
+    ];
     $message .= drupal_render($list);
     drupal_set_message($message);
   }
@@ -127,10 +127,10 @@ function callback_batch_finished($success, $results, $operations) {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = t('An error occurred while processing %error_operation with arguments: @arguments', array(
+    $message = t('An error occurred while processing %error_operation with arguments: @arguments', [
       '%error_operation' => $error_operation[0],
       '@arguments' => print_r($error_operation[1], TRUE)
-    ));
+    ]);
     drupal_set_message($message, 'error');
   }
 }
@@ -152,7 +152,7 @@ function callback_batch_finished($success, $results, $operations) {
  */
 function hook_ajax_render_alter(array &$data) {
   // Inject any new status messages into the content area.
-  $status_messages = array('#type' => 'status_messages');
+  $status_messages = ['#type' => 'status_messages'];
   $command = new \Drupal\Core\Ajax\PrependCommand('#block-system-main .content', \Drupal::service('renderer')->renderRoot($status_messages));
   $data[] = $command->render();
 }
@@ -201,12 +201,12 @@ function hook_ajax_render_alter(array &$data) {
 function hook_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
   if (isset($form['type']) && $form['type']['#value'] . '_node_settings' == $form_id) {
     $upload_enabled_types = \Drupal::config('mymodule.settings')->get('upload_enabled_types');
-    $form['workflow']['upload_' . $form['type']['#value']] = array(
+    $form['workflow']['upload_' . $form['type']['#value']] = [
       '#type' => 'radios',
       '#title' => t('Attachments'),
       '#default_value' => in_array($form['type']['#value'], $upload_enabled_types) ? 1 : 0,
-      '#options' => array(t('Disabled'), t('Enabled')),
-    );
+      '#options' => [t('Disabled'), t('Enabled')],
+    ];
     // Add a custom submit handler to save the array of types back to the config file.
     $form['actions']['submit']['#submit'][] = 'mymodule_upload_enabled_types_submit';
   }
@@ -248,11 +248,11 @@ function hook_form_FORM_ID_alter(&$form, \Drupal\Core\Form\FormStateInterface $f
   // registration form.
 
   // Add a checkbox to registration form about agreeing to terms of use.
-  $form['terms_of_use'] = array(
+  $form['terms_of_use'] = [
     '#type' => 'checkbox',
     '#title' => t("I agree with the website's terms and conditions."),
     '#required' => TRUE,
-  );
+  ];
 }
 
 /**
@@ -298,11 +298,11 @@ function hook_form_BASE_FORM_ID_alter(&$form, \Drupal\Core\Form\FormStateInterfa
   // node form, regardless of node type.
 
   // Add a checkbox to the node form about agreeing to terms of use.
-  $form['terms_of_use'] = array(
+  $form['terms_of_use'] = [
     '#type' => 'checkbox',
     '#title' => t("I agree with the website's terms and conditions."),
     '#required' => TRUE,
-  );
+  ];
 }
 
 /**
diff --git a/web/core/lib/Drupal/Core/Http/LinkRelationType.php b/web/core/lib/Drupal/Core/Http/LinkRelationType.php
new file mode 100644
index 000000000..b0366e5ef
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Http/LinkRelationType.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\Core\Http;
+
+use Drupal\Core\Plugin\PluginBase;
+
+/**
+ * Defines a single link relationship type.
+ */
+class LinkRelationType extends PluginBase implements LinkRelationTypeInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isRegistered() {
+    return !$this->isExtension();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isExtension() {
+    return isset($this->pluginDefinition['uri']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRegisteredName() {
+    return $this->isRegistered() ? $this->getPluginId() : NULL;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getExtensionUri() {
+    return $this->isExtension() ? $this->pluginDefinition['uri'] : NULL;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDescription() {
+    return isset($this->pluginDefinition['description']) ? $this->pluginDefinition['description'] : '';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getReference() {
+    return isset($this->pluginDefinition['reference']) ? $this->pluginDefinition['reference'] : '';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getNotes() {
+    return isset($this->pluginDefinition['notes']) ? $this->pluginDefinition['notes'] : '';
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Http/LinkRelationTypeInterface.php b/web/core/lib/Drupal/Core/Http/LinkRelationTypeInterface.php
new file mode 100644
index 000000000..7faaa0443
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Http/LinkRelationTypeInterface.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Drupal\Core\Http;
+
+/**
+ * Defines a single link relation type.
+ *
+ * An example of a link relation type is 'canonical'. It represents a canonical,
+ * definite representation of a resource.
+ *
+ * @see \Drupal\Core\Http\LinkRelationTypeManager
+ * @see https://tools.ietf.org/html/rfc5988#page-6
+ */
+interface LinkRelationTypeInterface {
+
+  /**
+   * Indicates whether this link relation type is of the 'registered' kind.
+   *
+   * @return bool
+   *
+   * @see https://tools.ietf.org/html/rfc5988#section-4.1
+   */
+  public function isRegistered();
+
+  /**
+   * Indicates whether this link relation type is of the 'extension' kind.
+   *
+   * @return bool
+   *
+   * @see https://tools.ietf.org/html/rfc5988#section-4.2
+   */
+  public function isExtension();
+
+  /**
+   * Returns the registered link relation type name.
+   *
+   * Only available for link relation types of the KIND_REGISTERED kind.
+   *
+   * @return string|null
+   *   The name of the registered relation type.
+   *
+   * @see https://tools.ietf.org/html/rfc5988#section-4.1
+   */
+  public function getRegisteredName();
+
+  /**
+   * Returns the extension link relation type URI.
+   *
+   * Only available for link relation types of the KIND_EXTENSION kind.
+   *
+   * @return string
+   *   The URI of the extension relation type.
+   *
+   * @see https://tools.ietf.org/html/rfc5988#section-4.2
+   */
+  public function getExtensionUri();
+
+  /**
+   * Returns the link relation type description.
+   *
+   * @return string
+   *   The link relation type description.
+   *
+   * @see https://tools.ietf.org/html/rfc5988#section-6.2.1
+   */
+  public function getDescription();
+
+  /**
+   * Returns the URL pointing to the reference of the link relation type.
+   *
+   * @return string
+   *   The URL pointing to the reference.
+   *
+   * @see https://tools.ietf.org/html/rfc5988#section-6.2.1
+   */
+  public function getReference();
+
+  /**
+   * Returns some extra notes/comments about this link relation type.
+   *
+   * @return string
+   *   The notes about the link relation.
+   *
+   * @see https://tools.ietf.org/html/rfc5988#section-6.2.1
+   */
+  public function getNotes();
+
+}
diff --git a/web/core/lib/Drupal/Core/Http/LinkRelationTypeManager.php b/web/core/lib/Drupal/Core/Http/LinkRelationTypeManager.php
new file mode 100644
index 000000000..11887aa18
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Http/LinkRelationTypeManager.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\Core\Http;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\Extension;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
+use Drupal\Core\Plugin\Discovery\YamlDiscovery;
+
+/**
+ * Provides a default plugin manager for link relation types.
+ *
+ * @see \Drupal\Core\Http\LinkRelationTypeInterface
+ */
+class LinkRelationTypeManager extends DefaultPluginManager {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaults = [
+    'class' => LinkRelationType::class,
+  ];
+
+  /**
+   * The app root.
+   *
+   * @var string
+   */
+  protected $root;
+
+  /**
+   * Constructs a new LinkRelationTypeManager.
+   *
+   * @param string $root
+   *   The app root.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
+   *   The cache backend.
+   */
+  public function __construct($root, ModuleHandlerInterface $module_handler, CacheBackendInterface $cache) {
+    $this->root = $root;
+    $this->pluginInterface = LinkRelationTypeInterface::class;
+    $this->moduleHandler = $module_handler;
+    $this->setCacheBackend($cache, 'link_relation_type_plugins', ['link_relation_type']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDiscovery() {
+    if (!$this->discovery) {
+      $directories = ['core' => $this->root . '/core'];
+      $directories += array_map(function (Extension $extension) {
+        return $this->root . '/' . $extension->getPath();
+      }, $this->moduleHandler->getModuleList());
+      $this->discovery = new YamlDiscovery('link_relation_types', $directories);
+    }
+    return $this->discovery;
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Http/TrustedHostsRequestFactory.php b/web/core/lib/Drupal/Core/Http/TrustedHostsRequestFactory.php
index 59751c06b..3aa0490f4 100644
--- a/web/core/lib/Drupal/Core/Http/TrustedHostsRequestFactory.php
+++ b/web/core/lib/Drupal/Core/Http/TrustedHostsRequestFactory.php
@@ -57,7 +57,7 @@ class TrustedHostsRequestFactory {
    * @return \Symfony\Component\HttpFoundation\Request
    *   A new request object.
    */
-  public function createRequest(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = NULL) {
+  public function createRequest(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = NULL) {
     if (empty($server['HTTP_HOST']) || ($server['HTTP_HOST'] === 'localhost' && $this->host !== 'localhost')) {
       $server['HTTP_HOST'] = $this->host;
     }
diff --git a/web/core/lib/Drupal/Core/Image/Image.php b/web/core/lib/Drupal/Core/Image/Image.php
index 42cdc92f8..e4c787632 100644
--- a/web/core/lib/Drupal/Core/Image/Image.php
+++ b/web/core/lib/Drupal/Core/Image/Image.php
@@ -139,7 +139,7 @@ class Image implements ImageInterface {
   /**
    * {@inheritdoc}
    */
-  public function apply($operation, array $arguments = array()) {
+  public function apply($operation, array $arguments = []) {
     return $this->getToolkit()->apply($operation, $arguments);
   }
 
@@ -147,56 +147,56 @@ class Image implements ImageInterface {
    * {@inheritdoc}
    */
   public function createNew($width, $height, $extension = 'png', $transparent_color = '#ffffff') {
-    return $this->apply('create_new', array('width' => $width, 'height' => $height, 'extension' => $extension, 'transparent_color' => $transparent_color));
+    return $this->apply('create_new', ['width' => $width, 'height' => $height, 'extension' => $extension, 'transparent_color' => $transparent_color]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function convert($extension) {
-    return $this->apply('convert', array('extension' => $extension));
+    return $this->apply('convert', ['extension' => $extension]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function crop($x, $y, $width, $height = NULL) {
-    return $this->apply('crop', array('x' => $x, 'y' => $y, 'width' => $width, 'height' => $height));
+    return $this->apply('crop', ['x' => $x, 'y' => $y, 'width' => $width, 'height' => $height]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function desaturate() {
-    return $this->apply('desaturate', array());
+    return $this->apply('desaturate', []);
   }
 
   /**
    * {@inheritdoc}
    */
   public function resize($width, $height) {
-    return $this->apply('resize', array('width' => $width, 'height' => $height));
+    return $this->apply('resize', ['width' => $width, 'height' => $height]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function rotate($degrees, $background = NULL) {
-    return $this->apply('rotate', array('degrees' => $degrees, 'background' => $background));
+    return $this->apply('rotate', ['degrees' => $degrees, 'background' => $background]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function scaleAndCrop($width, $height) {
-    return $this->apply('scale_and_crop', array('width' => $width, 'height' => $height));
+    return $this->apply('scale_and_crop', ['width' => $width, 'height' => $height]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function scale($width, $height = NULL, $upscale = FALSE) {
-    return $this->apply('scale', array('width' => $width, 'height' => $height, 'upscale' => $upscale));
+    return $this->apply('scale', ['width' => $width, 'height' => $height, 'upscale' => $upscale]);
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Image/ImageInterface.php b/web/core/lib/Drupal/Core/Image/ImageInterface.php
index 9e112c67e..29d092a73 100644
--- a/web/core/lib/Drupal/Core/Image/ImageInterface.php
+++ b/web/core/lib/Drupal/Core/Image/ImageInterface.php
@@ -91,7 +91,7 @@ interface ImageInterface {
    * @return bool
    *   TRUE on success, FALSE on failure.
    */
-  public function apply($operation, array $arguments = array());
+  public function apply($operation, array $arguments = []);
 
   /**
    * Closes the image and saves the changes to a file.
diff --git a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php
index 0c7eb7dff..72f3d2925 100644
--- a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php
+++ b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php
@@ -100,7 +100,7 @@ abstract class ImageToolkitBase extends PluginBase implements ImageToolkitInterf
    * {@inheritdoc}
    */
   public function getRequirements() {
-    return array();
+    return [];
   }
 
   /**
@@ -119,17 +119,17 @@ abstract class ImageToolkitBase extends PluginBase implements ImageToolkitInterf
   /**
    * {@inheritdoc}
    */
-  public function apply($operation, array $arguments = array()) {
+  public function apply($operation, array $arguments = []) {
     try {
       // Get the plugin to use for the operation and apply the operation.
       return $this->getToolkitOperation($operation)->apply($arguments);
     }
     catch (PluginNotFoundException $e) {
-      $this->logger->error("The selected image handling toolkit '@toolkit' can not process operation '@operation'.", array('@toolkit' => $this->getPluginId(), '@operation' => $operation));
+      $this->logger->error("The selected image handling toolkit '@toolkit' can not process operation '@operation'.", ['@toolkit' => $this->getPluginId(), '@operation' => $operation]);
       return FALSE;
     }
     catch (\InvalidArgumentException $e) {
-      $this->logger->warning($e->getMessage(), array());
+      $this->logger->warning($e->getMessage(), []);
       return FALSE;
     }
   }
diff --git a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
index f84131529..51867f4c3 100644
--- a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
+++ b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
@@ -169,6 +169,6 @@ interface ImageToolkitInterface extends ContainerFactoryPluginInterface, PluginI
    * @return bool
    *   TRUE if the operation was performed successfully, FALSE otherwise.
    */
-  public function apply($operation, array $arguments = array());
+  public function apply($operation, array $arguments = []);
 
 }
diff --git a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php
index 1c63807c7..d53364704 100644
--- a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php
+++ b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php
@@ -87,7 +87,7 @@ class ImageToolkitManager extends DefaultPluginManager {
     // Use plugin system to get list of available toolkits.
     $toolkits = $this->getDefinitions();
 
-    $output = array();
+    $output = [];
     foreach ($toolkits as $id => $definition) {
       // Only allow modules that aren't marked as unavailable.
       if (call_user_func($definition['class'] . '::isAvailable')) {
diff --git a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
index 2a1e61ec3..c9a93ffe4 100644
--- a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
+++ b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
@@ -103,7 +103,7 @@ abstract class ImageToolkitOperationBase extends PluginBase implements ImageTool
    */
   protected function prepareArguments(array $arguments) {
     foreach ($this->arguments() as $id => $argument) {
-      $argument += array('required' => TRUE);
+      $argument += ['required' => TRUE];
       // Check if the argument is required and, if so, has been provided.
       if ($argument['required']) {
         if (!array_key_exists($id, $arguments)) {
diff --git a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
index b3a3e7571..5fc434ca1 100644
--- a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
+++ b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
@@ -91,7 +91,7 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
         return $this->getToolkitOperationPluginId($base_toolkit, $operation);
       }
 
-      $message = SafeMarkup::format("No image operation plugin for '@toolkit' toolkit and '@operation' operation.", array('@toolkit' => $toolkit_id, '@operation' => $operation));
+      $message = SafeMarkup::format("No image operation plugin for '@toolkit' toolkit and '@operation' operation.", ['@toolkit' => $toolkit_id, '@operation' => $operation]);
       throw new PluginNotFoundException($toolkit_id . '.' . $operation, $message);
     }
     else {
@@ -106,7 +106,7 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array(), ImageToolkitInterface $toolkit = NULL) {
+  public function createInstance($plugin_id, array $configuration = [], ImageToolkitInterface $toolkit = NULL) {
     $plugin_definition = $this->getDefinition($plugin_id);
     $plugin_class = DefaultFactory::getPluginClass($plugin_id, $plugin_definition);
     return new $plugin_class($configuration, $plugin_id, $plugin_definition, $toolkit, $this->logger);
@@ -117,7 +117,7 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
    */
   public function getToolkitOperation(ImageToolkitInterface $toolkit, $operation) {
     $plugin_id = $this->getToolkitOperationPluginId($toolkit, $operation);
-    return $this->createInstance($plugin_id, array(), $toolkit);
+    return $this->createInstance($plugin_id, [], $toolkit);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php b/web/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php
index ed0cfac98..ca00d0be8 100644
--- a/web/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php
+++ b/web/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php
@@ -23,10 +23,10 @@ class AlreadyInstalledException extends InstallerException {
 <li>To start over, you must empty your existing database and copy <em>default.settings.php</em> over <em>settings.php</em>.</li>
 <li>To upgrade an existing installation, proceed to the <a href=":update-url">update script</a>.</li>
 <li>View your <a href=":base-url">existing site</a>.</li>
-</ul>', array(
+</ul>', [
       ':base-url' => $GLOBALS['base_url'],
       ':update-url' => $GLOBALS['base_path'] . 'update.php',
-    ));
+    ]);
     parent::__construct($message, $title);
   }
 
diff --git a/web/core/lib/Drupal/Core/Installer/Exception/InstallProfileMismatchException.php b/web/core/lib/Drupal/Core/Installer/Exception/InstallProfileMismatchException.php
new file mode 100644
index 000000000..d67978986
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Installer/Exception/InstallProfileMismatchException.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Drupal\Core\Installer\Exception;
+
+use Drupal\Core\StringTranslation\TranslationInterface;
+
+/**
+ * Exception thrown if settings.php cannot be written and the chosen profile does not match.
+ */
+class InstallProfileMismatchException extends InstallerException {
+
+  /**
+   * Constructs a new InstallProfileMismatchException exception.
+   *
+   * @param string $selected_profile
+   *   The profile selected by _install_select_profile().
+   * @param string $settings_profile
+   *   The profile in settings.php.
+   * @param string $settings_file
+   *   The path to settigns.php.
+   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
+   *   The string translation manager.
+   *
+   * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. The
+   *    install profile is written to core.extension.
+   *
+   * @see _install_select_profile()
+   * @see install_write_profile
+   */
+  public function __construct($selected_profile, $settings_profile, $settings_file, TranslationInterface $string_translation) {
+    $this->stringTranslation = $string_translation;
+
+    $title = $this->t('Install profile mismatch');
+    $message = $this->t(
+      'The selected profile %profile does not match the install_profile setting, which is %settings_profile. Cannot write updated setting to %settings_file.',
+      [
+        '%profile' => $selected_profile,
+        '%settings_profile' => $settings_profile,
+        '%settings_file' => $settings_file,
+      ]
+    );
+    parent::__construct($message, $title);
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php b/web/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
index 9342f5cf7..686b1a2c3 100644
--- a/web/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
+++ b/web/core/lib/Drupal/Core/Installer/Form/SelectLanguageForm.php
@@ -31,11 +31,11 @@ class SelectLanguageForm extends FormBase {
       $files = $install_state['translations'];
     }
     else {
-      $files = array();
+      $files = [];
     }
     $standard_languages = LanguageManager::getStandardLanguageList();
-    $select_options = array();
-    $browser_options = array();
+    $select_options = [];
+    $browser_options = [];
 
     $form['#title'] = 'Choose language';
 
@@ -57,32 +57,32 @@ class SelectLanguageForm extends FormBase {
     asort($select_options);
     $request = Request::createFromGlobals();
     $browser_langcode = UserAgent::getBestMatchingLangcode($request->server->get('HTTP_ACCEPT_LANGUAGE'), $browser_options);
-    $form['langcode'] = array(
+    $form['langcode'] = [
       '#type' => 'select',
       '#title' => 'Choose language',
       '#title_display' => 'invisible',
       '#options' => $select_options,
       // Use the browser detected language as default or English if nothing found.
       '#default_value' => !empty($browser_langcode) ? $browser_langcode : 'en',
-    );
-    $link_to_english = install_full_redirect_url(array('parameters' => array('langcode' => 'en')));
-    $form['help'] = array(
+    ];
+    $link_to_english = install_full_redirect_url(['parameters' => ['langcode' => 'en']]);
+    $form['help'] = [
       '#type' => 'item',
       // #markup is XSS admin filtered which ensures unsafe protocols will be
       // removed from the url.
       '#markup' => '<p>Translations will be downloaded from the <a href="http://localize.drupal.org">Drupal Translation website</a>. If you do not want this, select <a href="' . $link_to_english . '">English</a>.</p>',
-      '#states' => array(
-        'invisible' => array(
-          'select[name="langcode"]' => array('value' => 'en'),
-        ),
-      ),
-    );
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+      '#states' => [
+        'invisible' => [
+          'select[name="langcode"]' => ['value' => 'en'],
+        ],
+      ],
+    ];
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => 'Save and continue',
       '#button_type' => 'primary',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/lib/Drupal/Core/Installer/Form/SelectProfileForm.php b/web/core/lib/Drupal/Core/Installer/Form/SelectProfileForm.php
index 7ccdf2759..679e6db00 100644
--- a/web/core/lib/Drupal/Core/Installer/Form/SelectProfileForm.php
+++ b/web/core/lib/Drupal/Core/Installer/Form/SelectProfileForm.php
@@ -23,8 +23,8 @@ class SelectProfileForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state, $install_state = NULL) {
     $form['#title'] = $this->t('Select an installation profile');
 
-    $profiles = array();
-    $names = array();
+    $profiles = [];
+    $names = [];
     foreach ($install_state['profiles'] as $profile) {
       /** @var $profile \Drupal\Core\Extension\Extension */
       $details = install_profile_info($profile->getName());
@@ -49,34 +49,34 @@ class SelectProfileForm extends FormBase {
       // any non-core profiles rather than including it with them alphabetically,
       // since the other profiles might be intended to group together in a
       // particular way.
-      $names = array('minimal' => $names['minimal']) + $names;
+      $names = ['minimal' => $names['minimal']] + $names;
     }
     if (isset($names['standard'])) {
       // If the default ("Standard") core profile is present, put it at the very
       // top of the list. This profile will have its radio button pre-selected,
       // so we want it to always appear at the top.
-      $names = array('standard' => $names['standard']) + $names;
+      $names = ['standard' => $names['standard']] + $names;
     }
 
     // The profile name and description are extracted for translation from the
     // .info file, so we can use $this->t() on them even though they are dynamic
     // data at this point.
-    $form['profile'] = array(
+    $form['profile'] = [
       '#type' => 'radios',
       '#title' => $this->t('Select an installation profile'),
       '#title_display' => 'invisible',
-      '#options' => array_map(array($this, 't'), $names),
+      '#options' => array_map([$this, 't'], $names),
       '#default_value' => 'standard',
-    );
+    ];
     foreach (array_keys($names) as $profile_name) {
       $form['profile'][$profile_name]['#description'] = isset($profiles[$profile_name]['description']) ? $this->t($profiles[$profile_name]['description']) : '';
     }
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save and continue'),
       '#button_type' => 'primary',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php b/web/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php
index 6d5fe6526..c28b7f8fd 100644
--- a/web/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php
+++ b/web/core/lib/Drupal/Core/Installer/Form/SiteConfigureForm.php
@@ -132,7 +132,7 @@ class SiteConfigureForm extends ConfigFormBase {
     // successfully.)
     $post_params = $this->getRequest()->request->all();
     if (empty($post_params) && (!drupal_verify_install_file($this->root . '/' . $settings_file, FILE_EXIST | FILE_READABLE | FILE_NOT_WRITABLE) || !drupal_verify_install_file($this->root . '/' . $settings_dir, FILE_NOT_WRITABLE, 'dir'))) {
-      drupal_set_message(t('All necessary changes to %dir and %file have been made, so you should remove write permissions to them now in order to avoid security risks. If you are unsure how to do so, consult the <a href=":handbook_url">online handbook</a>.', array('%dir' => $settings_dir, '%file' => $settings_file, ':handbook_url' => 'https://www.drupal.org/server-permissions')), 'warning');
+      drupal_set_message(t('All necessary changes to %dir and %file have been made, so you should remove write permissions to them now in order to avoid security risks. If you are unsure how to do so, consult the <a href=":handbook_url">online handbook</a>.', ['%dir' => $settings_dir, '%file' => $settings_file, ':handbook_url' => 'https://www.drupal.org/server-permissions']), 'warning');
     }
 
     $form['#attached']['library'][] = 'system/drupal.system';
@@ -142,55 +142,55 @@ class SiteConfigureForm extends ConfigFormBase {
     // work during installation.
     $form['#attached']['drupalSettings']['copyFieldValue']['edit-site-mail'] = ['edit-account-mail'];
 
-    $form['site_information'] = array(
+    $form['site_information'] = [
       '#type' => 'fieldgroup',
       '#title' => $this->t('Site information'),
-    );
-    $form['site_information']['site_name'] = array(
+    ];
+    $form['site_information']['site_name'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Site name'),
       '#required' => TRUE,
       '#weight' => -20,
-    );
-    $form['site_information']['site_mail'] = array(
+    ];
+    $form['site_information']['site_mail'] = [
       '#type' => 'email',
       '#title' => $this->t('Site email address'),
       '#default_value' => ini_get('sendmail_from'),
       '#description' => $this->t("Automated emails, such as registration information, will be sent from this address. Use an address ending in your site's domain to help prevent these emails from being flagged as spam."),
       '#required' => TRUE,
       '#weight' => -15,
-    );
+    ];
 
-    $form['admin_account'] = array(
+    $form['admin_account'] = [
       '#type' => 'fieldgroup',
       '#title' => $this->t('Site maintenance account'),
-    );
-    $form['admin_account']['account']['name'] = array(
+    ];
+    $form['admin_account']['account']['name'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Username'),
       '#maxlength' => USERNAME_MAX_LENGTH,
       '#description' => $this->t("Several special characters are allowed, including space, period (.), hyphen (-), apostrophe ('), underscore (_), and the @ sign."),
       '#required' => TRUE,
-      '#attributes' => array('class' => array('username')),
-    );
-    $form['admin_account']['account']['pass'] = array(
+      '#attributes' => ['class' => ['username']],
+    ];
+    $form['admin_account']['account']['pass'] = [
       '#type' => 'password_confirm',
       '#required' => TRUE,
       '#size' => 25,
-    );
+    ];
     $form['admin_account']['account']['#tree'] = TRUE;
-    $form['admin_account']['account']['mail'] = array(
+    $form['admin_account']['account']['mail'] = [
       '#type' => 'email',
       '#title' => $this->t('Email address'),
       '#required' => TRUE,
-    );
+    ];
 
-    $form['regional_settings'] = array(
+    $form['regional_settings'] = [
       '#type' => 'fieldgroup',
       '#title' => $this->t('Regional settings'),
-    );
+    ];
     $countries = $this->countryManager->getList();
-    $form['regional_settings']['site_default_country'] = array(
+    $form['regional_settings']['site_default_country'] = [
       '#type' => 'select',
       '#title' => $this->t('Default country'),
       '#empty_value' => '',
@@ -198,8 +198,8 @@ class SiteConfigureForm extends ConfigFormBase {
       '#options' => $countries,
       '#description' => $this->t('Select the default country for the site.'),
       '#weight' => 0,
-    );
-    $form['regional_settings']['date_default_timezone'] = array(
+    ];
+    $form['regional_settings']['date_default_timezone'] = [
       '#type' => 'select',
       '#title' => $this->t('Default time zone'),
       // Use system timezone if set, but avoid throwing a warning in PHP >=5.4
@@ -207,39 +207,37 @@ class SiteConfigureForm extends ConfigFormBase {
       '#options' => system_time_zones(),
       '#description' => $this->t('By default, dates in this site will be displayed in the chosen time zone.'),
       '#weight' => 5,
-      '#attributes' => array('class' => array('timezone-detect')),
-    );
+      '#attributes' => ['class' => ['timezone-detect']],
+    ];
 
-    $form['update_notifications'] = array(
+    $form['update_notifications'] = [
       '#type' => 'fieldgroup',
       '#title' => $this->t('Update notifications'),
-    );
-    $form['update_notifications']['update_status_module'] = array(
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Update notifications'),
-      '#options' => array(
-        1 => $this->t('Check for updates automatically'),
-        2 => $this->t('Receive email notifications'),
-      ),
-      '#default_value' => array(1, 2),
-      '#description' => $this->t('The system will notify you when updates and important security releases are available for installed components. Anonymous information about your site is sent to <a href=":drupal">Drupal.org</a>.', array(':drupal' => 'https://www.drupal.org')),
-      '#weight' => 15,
-    );
-    $form['update_notifications']['update_status_module'][2] = array(
-      '#states' => array(
-        'visible' => array(
-          'input[name="update_status_module[1]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#description' => $this->t('The system will notify you when updates and important security releases are available for installed components. Anonymous information about your site is sent to <a href=":drupal">Drupal.org</a>.', [':drupal' => 'https://www.drupal.org']),
+    ];
+    $form['update_notifications']['enable_update_status_module'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Check for updates automatically'),
+      '#default_value' => 1,
+    ];
+    $form['update_notifications']['enable_update_status_emails'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Receive email notifications'),
+      '#default_value' => 1,
+      '#states' => [
+        'visible' => [
+          'input[name="enable_update_status_module"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save and continue'),
       '#weight' => 15,
       '#button_type' => 'primary',
-    );
+    ];
 
     return $form;
   }
@@ -248,7 +246,7 @@ class SiteConfigureForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
-    if ($error = user_validate_name($form_state->getValue(array('account', 'name')))) {
+    if ($error = user_validate_name($form_state->getValue(['account', 'name']))) {
       $form_state->setErrorByName('account][name', $error);
     }
   }
@@ -270,16 +268,17 @@ class SiteConfigureForm extends ConfigFormBase {
     $account_values = $form_state->getValue('account');
 
     // Enable update.module if this option was selected.
-    $update_status_module = $form_state->getValue('update_status_module');
-    if ($update_status_module[1]) {
-      $this->moduleInstaller->install(array('file', 'update'), FALSE);
+    $update_status_module = $form_state->getValue('enable_update_status_module');
+    if ($update_status_module) {
+      $this->moduleInstaller->install(['file', 'update'], FALSE);
 
       // Add the site maintenance account's email address to the list of
       // addresses to be notified when updates are available, if selected.
-      if ($update_status_module[2]) {
+      $email_update_status_emails = $form_state->getValue('enable_update_status_emails');
+      if ($email_update_status_emails) {
         // Reset the configuration factory so it is updated with the new module.
         $this->resetConfigFactory();
-        $this->config('update.settings')->set('notification.emails', array($account_values['mail']))->save(TRUE);
+        $this->config('update.settings')->set('notification.emails', [$account_values['mail']])->save(TRUE);
       }
     }
 
diff --git a/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php b/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
index f5d1c7fe5..5442d1542 100644
--- a/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
+++ b/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
@@ -97,15 +97,15 @@ class SiteSettingsForm extends FormBase {
     // when JavaScript is enabled (see below).
     else {
       $default_driver = current($drivers_keys);
-      $default_options = array();
+      $default_options = [];
     }
 
-    $form['driver'] = array(
+    $form['driver'] = [
       '#type' => 'radios',
       '#title' => $this->t('Database type'),
       '#required' => TRUE,
       '#default_value' => $default_driver,
-    );
+    ];
     if (count($drivers) == 1) {
       $form['driver']['#disabled'] = TRUE;
     }
@@ -115,31 +115,31 @@ class SiteSettingsForm extends FormBase {
       $form['driver']['#options'][$key] = $driver->name();
 
       $form['settings'][$key] = $driver->getFormOptions($default_options);
-      $form['settings'][$key]['#prefix'] = '<h2 class="js-hide">' . $this->t('@driver_name settings', array('@driver_name' => $driver->name())) . '</h2>';
+      $form['settings'][$key]['#prefix'] = '<h2 class="js-hide">' . $this->t('@driver_name settings', ['@driver_name' => $driver->name()]) . '</h2>';
       $form['settings'][$key]['#type'] = 'container';
       $form['settings'][$key]['#tree'] = TRUE;
-      $form['settings'][$key]['advanced_options']['#parents'] = array($key);
-      $form['settings'][$key]['#states'] = array(
-        'visible' => array(
-          ':input[name=driver]' => array('value' => $key),
-        )
-      );
+      $form['settings'][$key]['advanced_options']['#parents'] = [$key];
+      $form['settings'][$key]['#states'] = [
+        'visible' => [
+          ':input[name=driver]' => ['value' => $key],
+        ]
+      ];
     }
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['save'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['save'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save and continue'),
       '#button_type' => 'primary',
-      '#limit_validation_errors' => array(
-        array('driver'),
-        array($default_driver),
-      ),
-      '#submit' => array('::submitForm'),
-    );
+      '#limit_validation_errors' => [
+        ['driver'],
+        [$default_driver],
+      ],
+      '#submit' => ['::submitForm'],
+    ];
 
-    $form['errors'] = array();
-    $form['settings_file'] = array('#type' => 'value', '#value' => $settings_file);
+    $form['errors'] = [];
+    $form['settings_file'] = ['#type' => 'value', '#value' => $settings_file];
 
     return $form;
   }
@@ -213,21 +213,21 @@ class SiteSettingsForm extends FormBase {
     global $install_state;
 
     // Update global settings array and save.
-    $settings = array();
+    $settings = [];
     $database = $form_state->get('database');
-    $settings['databases']['default']['default'] = (object) array(
+    $settings['databases']['default']['default'] = (object) [
       'value'    => $database,
       'required' => TRUE,
-    );
-    $settings['settings']['hash_salt'] = (object) array(
+    ];
+    $settings['settings']['hash_salt'] = (object) [
       'value'    => Crypt::randomBytesBase64(55),
       'required' => TRUE,
-    );
+    ];
     // Remember the profile which was used.
-    $settings['settings']['install_profile'] = (object) array(
+    $settings['settings']['install_profile'] = (object) [
       'value' => $install_state['parameters']['profile'],
       'required' => TRUE,
-    );
+    ];
 
     drupal_rewrite_settings($settings);
 
diff --git a/web/core/lib/Drupal/Core/Installer/InstallerKernel.php b/web/core/lib/Drupal/Core/Installer/InstallerKernel.php
index e00c215c0..adeb5c53e 100644
--- a/web/core/lib/Drupal/Core/Installer/InstallerKernel.php
+++ b/web/core/lib/Drupal/Core/Installer/InstallerKernel.php
@@ -46,4 +46,24 @@ class InstallerKernel extends DrupalKernel {
     return parent::getConfigStorage();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getInstallProfile() {
+    global $install_state;
+    if ($install_state && empty($install_state['installation_finished'])) {
+      // If the profile has been selected return it.
+      if (isset($install_state['parameters']['profile'])) {
+        $profile = $install_state['parameters']['profile'];
+      }
+      else {
+        $profile = NULL;
+      }
+    }
+    else {
+      $profile = parent::getInstallProfile();
+    }
+    return $profile;
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Installer/InstallerRedirectTrait.php b/web/core/lib/Drupal/Core/Installer/InstallerRedirectTrait.php
new file mode 100644
index 000000000..067802d2b
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Installer/InstallerRedirectTrait.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Drupal\Core\Installer;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\DatabaseException;
+use Drupal\Core\Database\DatabaseNotFoundException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Provides methods for checking if Drupal is already installed.
+ */
+trait InstallerRedirectTrait {
+
+  /**
+   * Returns whether the current PHP process runs on CLI.
+   *
+   * @return bool
+   */
+  protected function isCli() {
+    return PHP_SAPI === 'cli';
+  }
+
+  /**
+   * Determines if an exception handler should redirect to the installer.
+   *
+   * @param \Exception $exception
+   *   The exception to check.
+   * @param \Drupal\Core\Database\Connection|null $connection
+   *   (optional) The default database connection. If not provided, a less
+   *   comprehensive check will be performed. This can be the case if the
+   *   exception occurs early enough that a database connection object isn't
+   *   available from the container yet.
+   *
+   * @return bool
+   *   TRUE if the exception handler should redirect to the installer because
+   *   Drupal is not installed yet, or FALSE otherwise.
+   */
+  protected function shouldRedirectToInstaller(\Exception $exception, Connection $connection = NULL) {
+    // Never redirect on the command line.
+    if ($this->isCli()) {
+      return FALSE;
+    }
+
+    // Never redirect if we're already in the installer.
+    if (drupal_installation_attempted()) {
+      return FALSE;
+    }
+
+    // If the database wasn't found, assume the user hasn't entered it properly
+    // and redirect to the installer. This check needs to come first because a
+    // DatabaseNotFoundException is also an instance of DatabaseException.
+    if ($exception instanceof DatabaseNotFoundException) {
+      return TRUE;
+    }
+
+    // To avoid unnecessary queries, only act if the exception is one that is
+    // expected to occur when Drupal has not yet been installed. This includes
+    // NotFoundHttpException because an uninstalled site won't have route
+    // information available yet and therefore can return 404 errors.
+    if (!($exception instanceof \PDOException || $exception instanceof DatabaseException || $exception instanceof NotFoundHttpException)) {
+      return FALSE;
+    }
+
+    // Redirect if there isn't even any database connection information in
+    // settings.php yet, since that means Drupal is not installed.
+    if (!Database::getConnectionInfo()) {
+      return TRUE;
+    }
+
+    // Redirect if the database is empty.
+    if ($connection) {
+      try {
+        return !$connection->schema()->tableExists('sessions');
+      }
+      catch (\Exception $e) {
+        // If we still have an exception at this point, we need to be careful
+        // since we should not redirect if the exception represents an error on
+        // an already-installed site (for example, if the database server went
+        // down). Assume we shouldn't redirect, just in case.
+        return FALSE;
+      }
+    }
+
+    // When in doubt, don't redirect.
+    return FALSE;
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Installer/InstallerRouteBuilder.php b/web/core/lib/Drupal/Core/Installer/InstallerRouteBuilder.php
index c2ec5ede4..a432f2389 100644
--- a/web/core/lib/Drupal/Core/Installer/InstallerRouteBuilder.php
+++ b/web/core/lib/Drupal/Core/Installer/InstallerRouteBuilder.php
@@ -17,7 +17,7 @@ class InstallerRouteBuilder extends RouteBuilder {
    * @todo Convert installer steps into routes; add an installer.routing.yml.
    */
   protected function getRouteDefinitions() {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php b/web/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
index 1ace991de..48341492b 100644
--- a/web/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
+++ b/web/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
@@ -28,8 +28,8 @@ class InstallerServiceProvider implements ServiceProviderInterface, ServiceModif
     // Replace services with in-memory implementations.
     $definition = $container->getDefinition('cache_factory');
     $definition->setClass('Drupal\Core\Cache\MemoryBackendFactory');
-    $definition->setArguments(array());
-    $definition->setMethodCalls(array());
+    $definition->setArguments([]);
+    $definition->setMethodCalls([]);
     $container
       ->register('keyvalue', 'Drupal\Core\KeyValueStore\KeyValueMemoryFactory');
     $container
diff --git a/web/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php b/web/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php
index aca4f31ac..bd96df2f2 100644
--- a/web/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php
+++ b/web/core/lib/Drupal/Core/KeyValueStore/DatabaseStorage.php
@@ -61,19 +61,19 @@ class DatabaseStorage extends StorageBase {
    * {@inheritdoc}
    */
   public function has($key) {
-    return (bool) $this->connection->query('SELECT 1 FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND name = :key', array(
+    return (bool) $this->connection->query('SELECT 1 FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND name = :key', [
       ':collection' => $this->collection,
       ':key' => $key,
-    ))->fetchField();
+    ])->fetchField();
   }
 
   /**
    * {@inheritdoc}
    */
   public function getMultiple(array $keys) {
-    $values = array();
+    $values = [];
     try {
-      $result = $this->connection->query('SELECT name, value FROM {' . $this->connection->escapeTable($this->table) . '} WHERE name IN ( :keys[] ) AND collection = :collection', array(':keys[]' => $keys, ':collection' => $this->collection))->fetchAllAssoc('name');
+      $result = $this->connection->query('SELECT name, value FROM {' . $this->connection->escapeTable($this->table) . '} WHERE name IN ( :keys[] ) AND collection = :collection', [':keys[]' => $keys, ':collection' => $this->collection])->fetchAllAssoc('name');
       foreach ($keys as $key) {
         if (isset($result[$key])) {
           $values[$key] = $this->serializer->decode($result[$key]->value);
@@ -92,8 +92,8 @@ class DatabaseStorage extends StorageBase {
    * {@inheritdoc}
    */
   public function getAll() {
-    $result = $this->connection->query('SELECT name, value FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection', array(':collection' => $this->collection));
-    $values = array();
+    $result = $this->connection->query('SELECT name, value FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection', [':collection' => $this->collection]);
+    $values = [];
 
     foreach ($result as $item) {
       if ($item) {
@@ -108,11 +108,11 @@ class DatabaseStorage extends StorageBase {
    */
   public function set($key, $value) {
     $this->connection->merge($this->table)
-      ->keys(array(
+      ->keys([
         'name' => $key,
         'collection' => $this->collection,
-      ))
-      ->fields(array('value' => $this->serializer->encode($value)))
+      ])
+      ->fields(['value' => $this->serializer->encode($value)])
       ->execute();
   }
 
@@ -121,11 +121,11 @@ class DatabaseStorage extends StorageBase {
    */
   public function setIfNotExists($key, $value) {
     $result = $this->connection->merge($this->table)
-      ->insertFields(array(
+      ->insertFields([
         'collection' => $this->collection,
         'name' => $key,
         'value' => $this->serializer->encode($value),
-      ))
+      ])
       ->condition('collection', $this->collection)
       ->condition('name', $key)
       ->execute();
@@ -137,7 +137,7 @@ class DatabaseStorage extends StorageBase {
    */
   public function rename($key, $new_key) {
     $this->connection->update($this->table)
-      ->fields(array('name' => $new_key))
+      ->fields(['name' => $new_key])
       ->condition('collection', $this->collection)
       ->condition('name', $key)
       ->execute();
diff --git a/web/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php b/web/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php
index 9f3b4284f..c6514962d 100644
--- a/web/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php
+++ b/web/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php
@@ -34,11 +34,11 @@ class DatabaseStorageExpirable extends DatabaseStorage implements KeyValueStoreE
    * {@inheritdoc}
    */
   public function has($key) {
-    return (bool) $this->connection->query('SELECT 1 FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND name = :key AND expire > :now', array(
+    return (bool) $this->connection->query('SELECT 1 FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND name = :key AND expire > :now', [
       ':collection' => $this->collection,
       ':key' => $key,
       ':now' => REQUEST_TIME,
-    ))->fetchField();
+    ])->fetchField();
   }
 
   /**
@@ -47,12 +47,12 @@ class DatabaseStorageExpirable extends DatabaseStorage implements KeyValueStoreE
   public function getMultiple(array $keys) {
     $values = $this->connection->query(
       'SELECT name, value FROM {' . $this->connection->escapeTable($this->table) . '} WHERE expire > :now AND name IN ( :keys[] ) AND collection = :collection',
-      array(
+      [
         ':now' => REQUEST_TIME,
         ':keys[]' => $keys,
         ':collection' => $this->collection,
-      ))->fetchAllKeyed();
-    return array_map(array($this->serializer, 'decode'), $values);
+      ])->fetchAllKeyed();
+    return array_map([$this->serializer, 'decode'], $values);
   }
 
   /**
@@ -61,40 +61,40 @@ class DatabaseStorageExpirable extends DatabaseStorage implements KeyValueStoreE
   public function getAll() {
     $values = $this->connection->query(
       'SELECT name, value FROM {' . $this->connection->escapeTable($this->table) . '} WHERE collection = :collection AND expire > :now',
-      array(
+      [
         ':collection' => $this->collection,
         ':now' => REQUEST_TIME
-      ))->fetchAllKeyed();
-    return array_map(array($this->serializer, 'decode'), $values);
+      ])->fetchAllKeyed();
+    return array_map([$this->serializer, 'decode'], $values);
   }
 
   /**
    * {@inheritdoc}
    */
-  function setWithExpire($key, $value, $expire) {
+  public function setWithExpire($key, $value, $expire) {
     $this->connection->merge($this->table)
-      ->keys(array(
+      ->keys([
         'name' => $key,
         'collection' => $this->collection,
-      ))
-      ->fields(array(
+      ])
+      ->fields([
         'value' => $this->serializer->encode($value),
         'expire' => REQUEST_TIME + $expire,
-      ))
+      ])
       ->execute();
   }
 
   /**
    * {@inheritdoc}
    */
-  function setWithExpireIfNotExists($key, $value, $expire) {
+  public function setWithExpireIfNotExists($key, $value, $expire) {
     $result = $this->connection->merge($this->table)
-      ->insertFields(array(
+      ->insertFields([
         'collection' => $this->collection,
         'name' => $key,
         'value' => $this->serializer->encode($value),
         'expire' => REQUEST_TIME + $expire,
-      ))
+      ])
       ->condition('collection', $this->collection)
       ->condition('name', $key)
       ->execute();
@@ -104,7 +104,7 @@ class DatabaseStorageExpirable extends DatabaseStorage implements KeyValueStoreE
   /**
    * {@inheritdoc}
    */
-  function setMultipleWithExpire(array $data, $expire) {
+  public function setMultipleWithExpire(array $data, $expire) {
     foreach ($data as $key => $value) {
       $this->setWithExpire($key, $value, $expire);
     }
diff --git a/web/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php b/web/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php
index 5670fe5b2..f9c9b4c17 100644
--- a/web/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php
+++ b/web/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php
@@ -15,7 +15,7 @@ class KeyValueDatabaseExpirableFactory implements KeyValueExpirableFactoryInterf
    *
    * @var \Drupal\Core\KeyValueStore\DatabaseStorageExpirable[]
    */
-  protected $storages = array();
+  protected $storages = [];
 
   /**
    * The serialization class to use.
@@ -39,7 +39,7 @@ class KeyValueDatabaseExpirableFactory implements KeyValueExpirableFactoryInterf
    * @param \Drupal\Core\Database\Connection $connection
    *   The Connection object containing the key-value tables.
    */
-  function __construct(SerializationInterface $serializer, Connection $connection) {
+  public function __construct(SerializationInterface $serializer, Connection $connection) {
     $this->serializer = $serializer;
     $this->connection = $connection;
   }
diff --git a/web/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php b/web/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php
index d70cb1196..3bb45c16c 100644
--- a/web/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php
+++ b/web/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php
@@ -32,7 +32,7 @@ class KeyValueDatabaseFactory implements KeyValueFactoryInterface {
    * @param \Drupal\Core\Database\Connection $connection
    *   The Connection object containing the key-value tables.
    */
-  function __construct(SerializationInterface $serializer, Connection $connection) {
+  public function __construct(SerializationInterface $serializer, Connection $connection) {
     $this->serializer = $serializer;
     $this->connection = $connection;
   }
diff --git a/web/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php b/web/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
index 9f6d28cc4..eeaf510ea 100644
--- a/web/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
+++ b/web/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
@@ -37,7 +37,7 @@ class KeyValueFactory implements KeyValueFactoryInterface {
    *
    * @var array
    */
-  protected $stores = array();
+  protected $stores = [];
 
   /**
    * var \Symfony\Component\DependencyInjection\ContainerInterface
@@ -50,7 +50,7 @@ class KeyValueFactory implements KeyValueFactoryInterface {
    * @param array $options
    *   (optional) Collection-specific storage override options.
    */
-  function __construct(ContainerInterface $container, array $options = array()) {
+  public function __construct(ContainerInterface $container, array $options = []) {
     $this->container = $container;
     $this->options = $options;
   }
diff --git a/web/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php b/web/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php
index f1720264c..701e2bd91 100644
--- a/web/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php
+++ b/web/core/lib/Drupal/Core/KeyValueStore/KeyValueMemoryFactory.php
@@ -12,7 +12,7 @@ class KeyValueMemoryFactory implements KeyValueFactoryInterface {
    *
    * @var array
    */
-  protected $collections = array();
+  protected $collections = [];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php b/web/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php
index ea9e056c3..d6a6ca91d 100644
--- a/web/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php
+++ b/web/core/lib/Drupal/Core/KeyValueStore/MemoryStorage.php
@@ -12,7 +12,7 @@ class MemoryStorage extends StorageBase {
    *
    * @var array
    */
-  protected $data = array();
+  protected $data = [];
 
   /**
    * {@inheritdoc}
@@ -95,7 +95,7 @@ class MemoryStorage extends StorageBase {
    * {@inheritdoc}
    */
   public function deleteAll() {
-    $this->data = array();
+    $this->data = [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/KeyValueStore/NullStorageExpirable.php b/web/core/lib/Drupal/Core/KeyValueStore/NullStorageExpirable.php
index 8e7ab5313..5ea8cbc9d 100644
--- a/web/core/lib/Drupal/Core/KeyValueStore/NullStorageExpirable.php
+++ b/web/core/lib/Drupal/Core/KeyValueStore/NullStorageExpirable.php
@@ -12,7 +12,7 @@ class NullStorageExpirable implements KeyValueStoreExpirableInterface {
    *
    * @var array
    */
-  protected $data = array();
+  protected $data = [];
 
   /**
    * The name of the collection holding key and value pairs.
@@ -46,14 +46,14 @@ class NullStorageExpirable implements KeyValueStoreExpirableInterface {
    * {@inheritdoc}
    */
   public function getMultiple(array $keys) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getAll() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/KeyValueStore/StorageBase.php b/web/core/lib/Drupal/Core/KeyValueStore/StorageBase.php
index ecdd08c57..ad5e3b4a5 100644
--- a/web/core/lib/Drupal/Core/KeyValueStore/StorageBase.php
+++ b/web/core/lib/Drupal/Core/KeyValueStore/StorageBase.php
@@ -32,7 +32,7 @@ abstract class StorageBase implements KeyValueStoreInterface {
    * {@inheritdoc}
    */
   public function get($key, $default = NULL) {
-    $values = $this->getMultiple(array($key));
+    $values = $this->getMultiple([$key]);
     return isset($values[$key]) ? $values[$key] : $default;
   }
 
@@ -49,7 +49,7 @@ abstract class StorageBase implements KeyValueStoreInterface {
    * {@inheritdoc}
    */
   public function delete($key) {
-    $this->deleteMultiple(array($key));
+    $this->deleteMultiple([$key]);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Language/Language.php b/web/core/lib/Drupal/Core/Language/Language.php
index abaad81d5..5c4068d05 100644
--- a/web/core/lib/Drupal/Core/Language/Language.php
+++ b/web/core/lib/Drupal/Core/Language/Language.php
@@ -16,13 +16,13 @@ class Language implements LanguageInterface {
    *
    * @var array
    */
-  public static $defaultValues = array(
+  public static $defaultValues = [
     'id' => 'en',
     'name' => 'English',
     'direction' => self::DIRECTION_LTR,
     'weight' => 0,
     'locked' => FALSE,
-  );
+  ];
 
   // Properties within the Language are set up as the default language.
 
@@ -74,7 +74,7 @@ class Language implements LanguageInterface {
    *   An array of property values, keyed by property name, used to construct
    *   the language.
    */
-  public function __construct(array $values = array()) {
+  public function __construct(array $values = []) {
     // Set all the provided properties for the language.
     foreach ($values as $key => $value) {
       if (property_exists($this, $key)) {
diff --git a/web/core/lib/Drupal/Core/Language/LanguageManager.php b/web/core/lib/Drupal/Core/Language/LanguageManager.php
index ef5421713..7f3ddc816 100644
--- a/web/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/web/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -23,7 +23,7 @@ class LanguageManager implements LanguageManagerInterface {
    *
    * @see \Drupal\Core\Language\LanguageManager::getLanguages()
    */
-  protected $languages = array();
+  protected $languages = [];
 
   /**
    * The default language object.
@@ -53,7 +53,7 @@ class LanguageManager implements LanguageManagerInterface {
    * {@inheritdoc}
    */
   public function getLanguageTypes() {
-    return array(LanguageInterface::TYPE_INTERFACE, LanguageInterface::TYPE_CONTENT, LanguageInterface::TYPE_URL);
+    return [LanguageInterface::TYPE_INTERFACE, LanguageInterface::TYPE_CONTENT, LanguageInterface::TYPE_URL];
   }
 
   /**
@@ -77,21 +77,21 @@ class LanguageManager implements LanguageManagerInterface {
    *   hook_language_types_info().
    */
   public function getDefinedLanguageTypesInfo() {
-    $this->definedLanguageTypesInfo = array(
-      LanguageInterface::TYPE_INTERFACE => array(
+    $this->definedLanguageTypesInfo = [
+      LanguageInterface::TYPE_INTERFACE => [
         'name' => new TranslatableMarkup('Interface text'),
         'description' => new TranslatableMarkup('Order of language detection methods for interface text. If a translation of interface text is available in the detected language, it will be displayed.'),
         'locked' => TRUE,
-      ),
-      LanguageInterface::TYPE_CONTENT => array(
+      ],
+      LanguageInterface::TYPE_CONTENT => [
         'name' => new TranslatableMarkup('Content'),
         'description' => new TranslatableMarkup('Order of language detection methods for content. If a version of content is available in the detected language, it will be displayed.'),
         'locked' => TRUE,
-      ),
-      LanguageInterface::TYPE_URL => array(
+      ],
+      LanguageInterface::TYPE_URL => [
         'locked' => TRUE,
-      ),
-    );
+      ],
+    ];
 
     return $this->definedLanguageTypesInfo;
   }
@@ -127,7 +127,7 @@ class LanguageManager implements LanguageManagerInterface {
       // The default language and locked languages comprise the full language
       // list.
       $default = $this->getDefaultLanguage();
-      $languages = array($default->getId() => $default);
+      $languages = [$default->getId() => $default];
       $languages += $this->getDefaultLockedLanguages($default->getWeight());
 
       // Filter the full list of languages based on the value of $flags.
@@ -165,33 +165,33 @@ class LanguageManager implements LanguageManagerInterface {
     if (empty($langcode)) {
       return new TranslatableMarkup('Unknown');
     }
-    return new TranslatableMarkup('Unknown (@langcode)', array('@langcode' => $langcode));
+    return new TranslatableMarkup('Unknown (@langcode)', ['@langcode' => $langcode]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getDefaultLockedLanguages($weight = 0) {
-    $languages = array();
+    $languages = [];
 
-    $locked_language = array(
+    $locked_language = [
       'default' => FALSE,
       'locked' => TRUE,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     // This is called very early while initializing the language system. Prevent
     // early t() calls by using the TranslatableMarkup.
-    $languages[LanguageInterface::LANGCODE_NOT_SPECIFIED] = new Language(array(
+    $languages[LanguageInterface::LANGCODE_NOT_SPECIFIED] = new Language([
       'id' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'name' => new TranslatableMarkup('Not specified'),
       'weight' => ++$weight,
-    ) + $locked_language);
+    ] + $locked_language);
 
-    $languages[LanguageInterface::LANGCODE_NOT_APPLICABLE] = new Language(array(
+    $languages[LanguageInterface::LANGCODE_NOT_APPLICABLE] = new Language([
       'id' => LanguageInterface::LANGCODE_NOT_APPLICABLE,
       'name' => new TranslatableMarkup('Not applicable'),
       'weight' => ++$weight,
-    ) + $locked_language);
+    ] + $locked_language);
 
     return $languages;
   }
@@ -207,15 +207,15 @@ class LanguageManager implements LanguageManagerInterface {
   /**
    * {@inheritdoc}
    */
-  public function getFallbackCandidates(array $context = array()) {
-    return array(LanguageInterface::LANGCODE_DEFAULT);
+  public function getFallbackCandidates(array $context = []) {
+    return [LanguageInterface::LANGCODE_DEFAULT];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getLanguageSwitchLinks($type, Url $url) {
-    return array();
+    return [];
   }
 
   /**
@@ -229,103 +229,103 @@ class LanguageManager implements LanguageManagerInterface {
     // The "Left-to-right marker" comments and the enclosed UTF-8 markers are to
     // make otherwise strange looking PHP syntax natural (to not be displayed in
     // right to left). See https://www.drupal.org/node/128866#comment-528929.
-    return array(
-      'af' => array('Afrikaans', 'Afrikaans'),
-      'am' => array('Amharic', 'አማርኛ'),
-      'ar' => array('Arabic', /* Left-to-right marker "‭" */ 'العربية', LanguageInterface::DIRECTION_RTL),
-      'ast' => array('Asturian', 'Asturianu'),
-      'az' => array('Azerbaijani', 'Azərbaycanca'),
-      'be' => array('Belarusian', 'Беларуская'),
-      'bg' => array('Bulgarian', 'Български'),
-      'bn' => array('Bengali', 'বাংলা'),
-      'bo' => array('Tibetan', 'བོད་སྐད་'),
-      'bs' => array('Bosnian', 'Bosanski'),
-      'ca' => array('Catalan', 'Català'),
-      'cs' => array('Czech', 'Čeština'),
-      'cy' => array('Welsh', 'Cymraeg'),
-      'da' => array('Danish', 'Dansk'),
-      'de' => array('German', 'Deutsch'),
-      'dz' => array('Dzongkha', 'རྫོང་ཁ'),
-      'el' => array('Greek', 'Ελληνικά'),
-      'en' => array('English', 'English'),
-      'en-x-simple' => array('Simple English', 'Simple English'),
-      'eo' => array('Esperanto', 'Esperanto'),
-      'es' => array('Spanish', 'Español'),
-      'et' => array('Estonian', 'Eesti'),
-      'eu' => array('Basque', 'Euskera'),
-      'fa' => array('Persian, Farsi', /* Left-to-right marker "‭" */ 'فارسی', LanguageInterface::DIRECTION_RTL),
-      'fi' => array('Finnish', 'Suomi'),
-      'fil' => array('Filipino', 'Filipino'),
-      'fo' => array('Faeroese', 'Føroyskt'),
-      'fr' => array('French', 'Français'),
-      'fy' => array('Frisian, Western', 'Frysk'),
-      'ga' => array('Irish', 'Gaeilge'),
-      'gd' => array('Scots Gaelic', 'Gàidhlig'),
-      'gl' => array('Galician', 'Galego'),
-      'gsw-berne' => array('Swiss German', 'Schwyzerdütsch'),
-      'gu' => array('Gujarati', 'ગુજરાતી'),
-      'he' => array('Hebrew', /* Left-to-right marker "‭" */ 'עברית', LanguageInterface::DIRECTION_RTL),
-      'hi' => array('Hindi', 'हिन्दी'),
-      'hr' => array('Croatian', 'Hrvatski'),
-      'ht' => array('Haitian Creole', 'Kreyòl ayisyen'),
-      'hu' => array('Hungarian', 'Magyar'),
-      'hy' => array('Armenian', 'Հայերեն'),
-      'id' => array('Indonesian', 'Bahasa Indonesia'),
-      'is' => array('Icelandic', 'Íslenska'),
-      'it' => array('Italian', 'Italiano'),
-      'ja' => array('Japanese', '日本語'),
-      'jv' => array('Javanese', 'Basa Java'),
-      'ka' => array('Georgian', 'ქართული ენა'),
-      'kk' => array('Kazakh', 'Қазақ'),
-      'km' => array('Khmer', 'ភាសាខ្មែរ'),
-      'kn' => array('Kannada', 'ಕನ್ನಡ'),
-      'ko' => array('Korean', '한국어'),
-      'ku' => array('Kurdish', 'Kurdî'),
-      'ky' => array('Kyrgyz', 'Кыргызча'),
-      'lo' => array('Lao', 'ພາສາລາວ'),
-      'lt' => array('Lithuanian', 'Lietuvių'),
-      'lv' => array('Latvian', 'Latviešu'),
-      'mg' => array('Malagasy', 'Malagasy'),
-      'mk' => array('Macedonian', 'Македонски'),
-      'ml' => array('Malayalam', 'മലയാളം'),
-      'mn' => array('Mongolian', 'монгол'),
-      'mr' => array('Marathi', 'मराठी'),
-      'ms' => array('Bahasa Malaysia', 'بهاس ملايو'),
-      'my' => array('Burmese', 'ဗမာစကား'),
-      'ne' => array('Nepali', 'नेपाली'),
-      'nl' => array('Dutch', 'Nederlands'),
-      'nb' => array('Norwegian Bokmål', 'Norsk, bokmål'),
-      'nn' => array('Norwegian Nynorsk', 'Norsk, nynorsk'),
-      'oc' => array('Occitan', 'Occitan'),
-      'pa' => array('Punjabi', 'ਪੰਜਾਬੀ'),
-      'pl' => array('Polish', 'Polski'),
-      'pt-pt' => array('Portuguese, Portugal', 'Português, Portugal'),
-      'pt-br' => array('Portuguese, Brazil', 'Português, Brasil'),
-      'ro' => array('Romanian', 'Română'),
-      'ru' => array('Russian', 'Русский'),
-      'sco' => array('Scots', 'Scots'),
-      'se' => array('Northern Sami', 'Sámi'),
-      'si' => array('Sinhala', 'සිංහල'),
-      'sk' => array('Slovak', 'Slovenčina'),
-      'sl' => array('Slovenian', 'Slovenščina'),
-      'sq' => array('Albanian', 'Shqip'),
-      'sr' => array('Serbian', 'Српски'),
-      'sv' => array('Swedish', 'Svenska'),
-      'sw' => array('Swahili', 'Kiswahili'),
-      'ta' => array('Tamil', 'தமிழ்'),
-      'ta-lk' => array('Tamil, Sri Lanka', 'தமிழ், இலங்கை'),
-      'te' => array('Telugu', 'తెలుగు'),
-      'th' => array('Thai', 'ภาษาไทย'),
-      'tr' => array('Turkish', 'Türkçe'),
-      'tyv' => array('Tuvan', 'Тыва дыл'),
-      'ug' => array('Uyghur', /* Left-to-right marker "‭" */ 'ئۇيغۇرچە', LanguageInterface::DIRECTION_RTL),
-      'uk' => array('Ukrainian', 'Українська'),
-      'ur' => array('Urdu', /* Left-to-right marker "‭" */ 'اردو', LanguageInterface::DIRECTION_RTL),
-      'vi' => array('Vietnamese', 'Tiếng Việt'),
-      'xx-lolspeak' => array('Lolspeak', 'Lolspeak'),
-      'zh-hans' => array('Chinese, Simplified', '简体中文'),
-      'zh-hant' => array('Chinese, Traditional', '繁體中文'),
-    );
+    return [
+      'af' => ['Afrikaans', 'Afrikaans'],
+      'am' => ['Amharic', 'አማርኛ'],
+      'ar' => ['Arabic', /* Left-to-right marker "‭" */ 'العربية', LanguageInterface::DIRECTION_RTL],
+      'ast' => ['Asturian', 'Asturianu'],
+      'az' => ['Azerbaijani', 'Azərbaycanca'],
+      'be' => ['Belarusian', 'Беларуская'],
+      'bg' => ['Bulgarian', 'Български'],
+      'bn' => ['Bengali', 'বাংলা'],
+      'bo' => ['Tibetan', 'བོད་སྐད་'],
+      'bs' => ['Bosnian', 'Bosanski'],
+      'ca' => ['Catalan', 'Català'],
+      'cs' => ['Czech', 'Čeština'],
+      'cy' => ['Welsh', 'Cymraeg'],
+      'da' => ['Danish', 'Dansk'],
+      'de' => ['German', 'Deutsch'],
+      'dz' => ['Dzongkha', 'རྫོང་ཁ'],
+      'el' => ['Greek', 'Ελληνικά'],
+      'en' => ['English', 'English'],
+      'en-x-simple' => ['Simple English', 'Simple English'],
+      'eo' => ['Esperanto', 'Esperanto'],
+      'es' => ['Spanish', 'Español'],
+      'et' => ['Estonian', 'Eesti'],
+      'eu' => ['Basque', 'Euskera'],
+      'fa' => ['Persian, Farsi', /* Left-to-right marker "‭" */ 'فارسی', LanguageInterface::DIRECTION_RTL],
+      'fi' => ['Finnish', 'Suomi'],
+      'fil' => ['Filipino', 'Filipino'],
+      'fo' => ['Faeroese', 'Føroyskt'],
+      'fr' => ['French', 'Français'],
+      'fy' => ['Frisian, Western', 'Frysk'],
+      'ga' => ['Irish', 'Gaeilge'],
+      'gd' => ['Scots Gaelic', 'Gàidhlig'],
+      'gl' => ['Galician', 'Galego'],
+      'gsw-berne' => ['Swiss German', 'Schwyzerdütsch'],
+      'gu' => ['Gujarati', 'ગુજરાતી'],
+      'he' => ['Hebrew', /* Left-to-right marker "‭" */ 'עברית', LanguageInterface::DIRECTION_RTL],
+      'hi' => ['Hindi', 'हिन्दी'],
+      'hr' => ['Croatian', 'Hrvatski'],
+      'ht' => ['Haitian Creole', 'Kreyòl ayisyen'],
+      'hu' => ['Hungarian', 'Magyar'],
+      'hy' => ['Armenian', 'Հայերեն'],
+      'id' => ['Indonesian', 'Bahasa Indonesia'],
+      'is' => ['Icelandic', 'Íslenska'],
+      'it' => ['Italian', 'Italiano'],
+      'ja' => ['Japanese', '日本語'],
+      'jv' => ['Javanese', 'Basa Java'],
+      'ka' => ['Georgian', 'ქართული ენა'],
+      'kk' => ['Kazakh', 'Қазақ'],
+      'km' => ['Khmer', 'ភាសាខ្មែរ'],
+      'kn' => ['Kannada', 'ಕನ್ನಡ'],
+      'ko' => ['Korean', '한국어'],
+      'ku' => ['Kurdish', 'Kurdî'],
+      'ky' => ['Kyrgyz', 'Кыргызча'],
+      'lo' => ['Lao', 'ພາສາລາວ'],
+      'lt' => ['Lithuanian', 'Lietuvių'],
+      'lv' => ['Latvian', 'Latviešu'],
+      'mg' => ['Malagasy', 'Malagasy'],
+      'mk' => ['Macedonian', 'Македонски'],
+      'ml' => ['Malayalam', 'മലയാളം'],
+      'mn' => ['Mongolian', 'монгол'],
+      'mr' => ['Marathi', 'मराठी'],
+      'ms' => ['Bahasa Malaysia', 'بهاس ملايو'],
+      'my' => ['Burmese', 'ဗမာစကား'],
+      'ne' => ['Nepali', 'नेपाली'],
+      'nl' => ['Dutch', 'Nederlands'],
+      'nb' => ['Norwegian Bokmål', 'Norsk, bokmål'],
+      'nn' => ['Norwegian Nynorsk', 'Norsk, nynorsk'],
+      'oc' => ['Occitan', 'Occitan'],
+      'pa' => ['Punjabi', 'ਪੰਜਾਬੀ'],
+      'pl' => ['Polish', 'Polski'],
+      'pt-pt' => ['Portuguese, Portugal', 'Português, Portugal'],
+      'pt-br' => ['Portuguese, Brazil', 'Português, Brasil'],
+      'ro' => ['Romanian', 'Română'],
+      'ru' => ['Russian', 'Русский'],
+      'sco' => ['Scots', 'Scots'],
+      'se' => ['Northern Sami', 'Sámi'],
+      'si' => ['Sinhala', 'සිංහල'],
+      'sk' => ['Slovak', 'Slovenčina'],
+      'sl' => ['Slovenian', 'Slovenščina'],
+      'sq' => ['Albanian', 'Shqip'],
+      'sr' => ['Serbian', 'Српски'],
+      'sv' => ['Swedish', 'Svenska'],
+      'sw' => ['Swahili', 'Kiswahili'],
+      'ta' => ['Tamil', 'தமிழ்'],
+      'ta-lk' => ['Tamil, Sri Lanka', 'தமிழ், இலங்கை'],
+      'te' => ['Telugu', 'తెలుగు'],
+      'th' => ['Thai', 'ภาษาไทย'],
+      'tr' => ['Turkish', 'Türkçe'],
+      'tyv' => ['Tuvan', 'Тыва дыл'],
+      'ug' => ['Uyghur', /* Left-to-right marker "‭" */ 'ئۇيغۇرچە', LanguageInterface::DIRECTION_RTL],
+      'uk' => ['Ukrainian', 'Українська'],
+      'ur' => ['Urdu', /* Left-to-right marker "‭" */ 'اردو', LanguageInterface::DIRECTION_RTL],
+      'vi' => ['Vietnamese', 'Tiếng Việt'],
+      'xx-lolspeak' => ['Lolspeak', 'Lolspeak'],
+      'zh-hans' => ['Chinese, Simplified', '简体中文'],
+      'zh-hant' => ['Chinese, Traditional', '繁體中文'],
+    ];
   }
 
   /**
@@ -391,7 +391,7 @@ class LanguageManager implements LanguageManagerInterface {
       return $languages;
     }
 
-    $filtered_languages = array();
+    $filtered_languages = [];
     // Add the site's default language if requested.
     if ($flags & LanguageInterface::STATE_SITE_DEFAULT) {
 
@@ -399,13 +399,13 @@ class LanguageManager implements LanguageManagerInterface {
       // default language only for runtime.
       $defaultLanguage = $this->getDefaultLanguage();
       $default = new Language(
-        array(
+        [
           'id' => $defaultLanguage->getId(),
           'name' => new TranslatableMarkup("Site's default language (@lang_name)",
-            array('@lang_name' => $defaultLanguage->getName())),
+            ['@lang_name' => $defaultLanguage->getName()]),
           'direction' => $defaultLanguage->getDirection(),
           'weight' => $defaultLanguage->getWeight(),
-        )
+        ]
       );
       $filtered_languages[LanguageInterface::LANGCODE_SITE_DEFAULT] = $default;
     }
diff --git a/web/core/lib/Drupal/Core/Language/LanguageManagerInterface.php b/web/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
index be0188d42..eaefd18a2 100644
--- a/web/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
@@ -161,7 +161,7 @@ interface LanguageManagerInterface {
    *   An array of language codes sorted by priority: first values should be
    *   tried first.
    */
-  public function getFallbackCandidates(array $context = array());
+  public function getFallbackCandidates(array $context = []);
 
   /**
    * Returns the language switch links for the given language type.
diff --git a/web/core/lib/Drupal/Core/Language/language.api.php b/web/core/lib/Drupal/Core/Language/language.api.php
index 1ac4b0835..33c1ce69f 100644
--- a/web/core/lib/Drupal/Core/Language/language.api.php
+++ b/web/core/lib/Drupal/Core/Language/language.api.php
@@ -162,14 +162,14 @@ use Drupal\Core\Language\LanguageInterface;
  * translated link text before going through the link generator, which will
  * just handle the path aliases.
  *
- * @param $links
+ * @param array $links
  *   Nested array of links keyed by language code.
- * @param $type
+ * @param string $type
  *   The language type the links will switch.
- * @param $path
- *   The current path.
+ * @param \Drupal\Core\Url $url
+ *   The URL the switch links will be relative to.
  */
-function hook_language_switch_links_alter(array &$links, $type, $path) {
+function hook_language_switch_links_alter(array &$links, $type, \Drupal\Core\Url $url) {
   $language_interface = \Drupal::languageManager()->getCurrentLanguage();
 
   if ($type == LanguageInterface::TYPE_CONTENT && isset($links[$language_interface->getId()])) {
diff --git a/web/core/lib/Drupal/Core/Layout/Annotation/Layout.php b/web/core/lib/Drupal/Core/Layout/Annotation/Layout.php
new file mode 100644
index 000000000..1cb5ff0a5
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Layout/Annotation/Layout.php
@@ -0,0 +1,157 @@
+<?php
+
+namespace Drupal\Core\Layout\Annotation;
+
+use Drupal\Component\Annotation\Plugin;
+use Drupal\Core\Layout\LayoutDefault;
+use Drupal\Core\Layout\LayoutDefinition;
+
+/**
+ * Defines a Layout annotation object.
+ *
+ * Layouts are used to define a list of regions and then output render arrays
+ * in each of the regions, usually using a template.
+ *
+ * Plugin namespace: Plugin\Layout
+ *
+ * @internal
+ *   The layout system is currently experimental and should only be leveraged by
+ *   experimental modules and development releases of contributed modules.
+ *   See https://www.drupal.org/core/experimental for more information.
+ *
+ * @see \Drupal\Core\Layout\LayoutInterface
+ * @see \Drupal\Core\Layout\LayoutDefault
+ * @see \Drupal\Core\Layout\LayoutPluginManager
+ * @see plugin_api
+ *
+ * @Annotation
+ */
+class Layout extends Plugin {
+
+  /**
+   * The plugin ID.
+   *
+   * @var string
+   */
+  public $id;
+
+  /**
+   * The human-readable name.
+   *
+   * @var string
+   *
+   * @ingroup plugin_translatable
+   */
+  public $label;
+
+  /**
+   * An optional description for advanced layouts.
+   *
+   * Sometimes layouts are so complex that the name is insufficient to describe
+   * a layout such that a visually impaired administrator could layout a page
+   * for a non-visually impaired audience. If specified, it will provide a
+   * description that is used for accessibility purposes.
+   *
+   * @var string
+   *
+   * @ingroup plugin_translatable
+   */
+  public $description;
+
+  /**
+   * The human-readable category.
+   *
+   * @var string
+   *
+   * @see \Drupal\Component\Plugin\CategorizingPluginManagerInterface
+   *
+   * @ingroup plugin_translatable
+   */
+  public $category;
+
+  /**
+   * The template file to render this layout (relative to the 'path' given).
+   *
+   * If specified, then the layout_discovery module will register the template
+   * with hook_theme() and the module or theme registering this layout does not
+   * need to do it.
+   *
+   * @var string optional
+   *
+   * @see hook_theme()
+   */
+  public $template;
+
+  /**
+   * The theme hook used to render this layout.
+   *
+   * If specified, it's assumed that the module or theme registering this layout
+   * will also register the theme hook with hook_theme() itself. This is
+   * mutually exclusive with 'template' - you can't specify both.
+   *
+   * @var string optional
+   *
+   * @see hook_theme()
+   */
+  public $theme_hook = 'layout';
+
+  /**
+   * Path (relative to the module or theme) to resources like icon or template.
+   *
+   * @var string optional
+   */
+  public $path;
+
+  /**
+   * The asset library.
+   *
+   * @var string optional
+   */
+  public $library;
+
+  /**
+   * The path to the preview image (relative to the 'path' given).
+   *
+   * @var string optional
+   */
+  public $icon;
+
+  /**
+   * An associative array of regions in this layout.
+   *
+   * The key of the array is the machine name of the region, and the value is
+   * an associative array with the following keys:
+   * - label: (string) The human-readable name of the region.
+   *
+   * Any remaining keys may have special meaning for the given layout plugin,
+   * but are undefined here.
+   *
+   * @var array
+   */
+  public $regions = [];
+
+  /**
+   * The default region.
+   *
+   * @var string
+   */
+  public $default_region;
+
+  /**
+   * The layout plugin class.
+   *
+   * This default value is used for plugins defined in layouts.yml that do not
+   * specify a class themselves.
+   *
+   * @var string
+   */
+  public $class = LayoutDefault::class;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function get() {
+    return new LayoutDefinition($this->definition);
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Layout/LayoutDefault.php b/web/core/lib/Drupal/Core/Layout/LayoutDefault.php
new file mode 100644
index 000000000..22edb856e
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Layout/LayoutDefault.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Drupal\Core\Layout;
+
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Plugin\PluginBase;
+
+/**
+ * Provides a default class for Layout plugins.
+ *
+ * @internal
+ *   The layout system is currently experimental and should only be leveraged by
+ *   experimental modules and development releases of contributed modules.
+ *   See https://www.drupal.org/core/experimental for more information.
+ */
+class LayoutDefault extends PluginBase implements LayoutInterface {
+
+  /**
+   * The layout definition.
+   *
+   * @var \Drupal\Core\Layout\LayoutDefinition
+   */
+  protected $pluginDefinition;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->setConfiguration($configuration);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build(array $regions) {
+    // Ensure $build only contains defined regions and in the order defined.
+    $build = [];
+    foreach ($this->getPluginDefinition()->getRegionNames() as $region_name) {
+      if (array_key_exists($region_name, $regions)) {
+        $build[$region_name] = $regions[$region_name];
+      }
+    }
+    $build['#settings'] = $this->getConfiguration();
+    $build['#layout'] = $this->pluginDefinition;
+    $build['#theme'] = $this->pluginDefinition->getThemeHook();
+    if ($library = $this->pluginDefinition->getLibrary()) {
+      $build['#attached']['library'][] = $library;
+    }
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfiguration() {
+    return $this->configuration;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setConfiguration(array $configuration) {
+    $this->configuration = NestedArray::mergeDeep($this->defaultConfiguration(), $configuration);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function defaultConfiguration() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * @return \Drupal\Core\Layout\LayoutDefinition
+   */
+  public function getPluginDefinition() {
+    return parent::getPluginDefinition();
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Layout/LayoutDefinition.php b/web/core/lib/Drupal/Core/Layout/LayoutDefinition.php
new file mode 100644
index 000000000..afbce7e1c
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Layout/LayoutDefinition.php
@@ -0,0 +1,466 @@
+<?php
+
+namespace Drupal\Core\Layout;
+
+use Drupal\Component\Plugin\Definition\DerivablePluginDefinitionInterface;
+use Drupal\Component\Plugin\Definition\PluginDefinitionInterface;
+use Drupal\Component\Plugin\Definition\PluginDefinition;
+use Drupal\Core\Plugin\Definition\DependentPluginDefinitionInterface;
+use Drupal\Core\Plugin\Definition\DependentPluginDefinitionTrait;
+
+/**
+ * Provides an implementation of a layout definition and its metadata.
+ *
+ * @internal
+ *   The layout system is currently experimental and should only be leveraged by
+ *   experimental modules and development releases of contributed modules.
+ *   See https://www.drupal.org/core/experimental for more information.
+ */
+class LayoutDefinition extends PluginDefinition implements PluginDefinitionInterface, DerivablePluginDefinitionInterface, DependentPluginDefinitionInterface {
+
+  use DependentPluginDefinitionTrait;
+
+  /**
+   * The name of the deriver of this layout definition, if any.
+   *
+   * @var string|null
+   */
+  protected $deriver;
+
+  /**
+   * The human-readable name.
+   *
+   * @var string
+   */
+  protected $label;
+
+  /**
+   * An optional description for advanced layouts.
+   *
+   * @var string
+   */
+  protected $description;
+
+  /**
+   * The human-readable category.
+   *
+   * @var string
+   */
+  protected $category;
+
+  /**
+   * The template file to render this layout (relative to the 'path' given).
+   *
+   * @var string|null
+   */
+  protected $template;
+
+  /**
+   * The path to the template.
+   *
+   * @var string
+   */
+  protected $templatePath;
+
+  /**
+   * The theme hook used to render this layout.
+   *
+   * @var string|null
+   */
+  protected $theme_hook;
+
+  /**
+   * Path (relative to the module or theme) to resources like icon or template.
+   *
+   * @var string
+   */
+  protected $path;
+
+  /**
+   * The asset library.
+   *
+   * @var string|null
+   */
+  protected $library;
+
+  /**
+   * The path to the preview image.
+   *
+   * @var string
+   */
+  protected $icon;
+
+  /**
+   * An associative array of regions in this layout.
+   *
+   * The key of the array is the machine name of the region, and the value is
+   * an associative array with the following keys:
+   * - label: (string) The human-readable name of the region.
+   *
+   * Any remaining keys may have special meaning for the given layout plugin,
+   * but are undefined here.
+   *
+   * @var array
+   */
+  protected $regions = [];
+
+  /**
+   * The default region.
+   *
+   * @var string
+   */
+  protected $default_region;
+
+  /**
+   * Any additional properties and values.
+   *
+   * @var array
+   */
+  protected $additional = [];
+
+  /**
+   * LayoutDefinition constructor.
+   *
+   * @param array $definition
+   *   An array of values from the annotation.
+   */
+  public function __construct(array $definition) {
+    foreach ($definition as $property => $value) {
+      $this->set($property, $value);
+    }
+  }
+
+  /**
+   * Gets any arbitrary property.
+   *
+   * @param string $property
+   *   The property to retrieve.
+   *
+   * @return mixed
+   *   The value for that property, or NULL if the property does not exist.
+   */
+  public function get($property) {
+    if (property_exists($this, $property)) {
+      $value = isset($this->{$property}) ? $this->{$property} : NULL;
+    }
+    else {
+      $value = isset($this->additional[$property]) ? $this->additional[$property] : NULL;
+    }
+    return $value;
+  }
+
+  /**
+   * Sets a value to an arbitrary property.
+   *
+   * @param string $property
+   *   The property to use for the value.
+   * @param mixed $value
+   *   The value to set.
+   *
+   * @return $this
+   */
+  public function set($property, $value) {
+    if (property_exists($this, $property)) {
+      $this->{$property} = $value;
+    }
+    else {
+      $this->additional[$property] = $value;
+    }
+    return $this;
+  }
+
+  /**
+   * Gets the human-readable name of the layout definition.
+   *
+   * @return string|\Drupal\Core\StringTranslation\TranslatableMarkup
+   *   The human-readable name of the layout definition.
+   */
+  public function getLabel() {
+    return $this->label;
+  }
+
+  /**
+   * Sets the human-readable name of the layout definition.
+   *
+   * @param string|\Drupal\Core\StringTranslation\TranslatableMarkup $label
+   *   The human-readable name of the layout definition.
+   *
+   * @return $this
+   */
+  public function setLabel($label) {
+    $this->label = $label;
+    return $this;
+  }
+
+  /**
+   * Gets the description of the layout definition.
+   *
+   * @return string|\Drupal\Core\StringTranslation\TranslatableMarkup
+   *   The description of the layout definition.
+   */
+  public function getDescription() {
+    return $this->description;
+  }
+
+  /**
+   * Sets the description of the layout definition.
+   *
+   * @param string|\Drupal\Core\StringTranslation\TranslatableMarkup $description
+   *   The description of the layout definition.
+   *
+   * @return $this
+   */
+  public function setDescription($description) {
+    $this->description = $description;
+    return $this;
+  }
+
+  /**
+   * Gets the human-readable category of the layout definition.
+   *
+   * @return string|\Drupal\Core\StringTranslation\TranslatableMarkup
+   *   The human-readable category of the layout definition.
+   */
+  public function getCategory() {
+    return $this->category;
+  }
+
+  /**
+   * Sets the human-readable category of the layout definition.
+   *
+   * @param string|\Drupal\Core\StringTranslation\TranslatableMarkup $category
+   *   The human-readable category of the layout definition.
+   *
+   * @return $this
+   */
+  public function setCategory($category) {
+    $this->category = $category;
+    return $this;
+  }
+
+  /**
+   * Gets the template name.
+   *
+   * @return string|null
+   *   The template name, if it exists.
+   */
+  public function getTemplate() {
+    return $this->template;
+  }
+
+  /**
+   * Sets the template name.
+   *
+   * @param string|null $template
+   *   The template name.
+   *
+   * @return $this
+   */
+  public function setTemplate($template) {
+    $this->template = $template;
+    return $this;
+  }
+
+  /**
+   * Gets the template path.
+   *
+   * @return string
+   *   The template path.
+   */
+  public function getTemplatePath() {
+    return $this->templatePath;
+  }
+
+  /**
+   * Sets the template path.
+   *
+   * @param string $template_path
+   *   The template path.
+   *
+   * @return $this
+   */
+  public function setTemplatePath($template_path) {
+    $this->templatePath = $template_path;
+    return $this;
+  }
+
+  /**
+   * Gets the theme hook.
+   *
+   * @return string|null
+   *   The theme hook, if it exists.
+   */
+  public function getThemeHook() {
+    return $this->theme_hook;
+  }
+
+  /**
+   * Sets the theme hook.
+   *
+   * @param string $theme_hook
+   *   The theme hook.
+   *
+   * @return $this
+   */
+  public function setThemeHook($theme_hook) {
+    $this->theme_hook = $theme_hook;
+    return $this;
+  }
+
+  /**
+   * Gets the base path for this layout definition.
+   *
+   * @return string
+   *   The base path.
+   */
+  public function getPath() {
+    return $this->path;
+  }
+
+  /**
+   * Sets the base path for this layout definition.
+   *
+   * @param string $path
+   *   The base path.
+   *
+   * @return $this
+   */
+  public function setPath($path) {
+    $this->path = $path;
+    return $this;
+  }
+
+  /**
+   * Gets the asset library for this layout definition.
+   *
+   * @return string|null
+   *   The asset library, if it exists.
+   */
+  public function getLibrary() {
+    return $this->library;
+  }
+
+  /**
+   * Sets the asset library for this layout definition.
+   *
+   * @param string|null $library
+   *   The asset library.
+   *
+   * @return $this
+   */
+  public function setLibrary($library) {
+    $this->library = $library;
+    return $this;
+  }
+
+  /**
+   * Gets the icon path for this layout definition.
+   *
+   * @return string|null
+   *   The icon path, if it exists.
+   */
+  public function getIconPath() {
+    return $this->icon;
+  }
+
+  /**
+   * Sets the icon path for this layout definition.
+   *
+   * @param string|null $icon
+   *   The icon path.
+   *
+   * @return $this
+   */
+  public function setIconPath($icon) {
+    $this->icon = $icon;
+    return $this;
+  }
+
+  /**
+   * Gets the regions for this layout definition.
+   *
+   * @return array[]
+   *    The layout regions. The keys of the array are the machine names of the
+   *    regions, and the values are an associative array with the following
+   *    keys:
+   *     - label: (string) The human-readable name of the region.
+   *    Any remaining keys may have special meaning for the given layout plugin,
+   *    but are undefined here.
+   */
+  public function getRegions() {
+    return $this->regions;
+  }
+
+  /**
+   * Sets the regions for this layout definition.
+   *
+   * @param array[] $regions
+   *   An array of regions, see ::getRegions() for the format.
+   *
+   * @return $this
+   */
+  public function setRegions(array $regions) {
+    $this->regions = $regions;
+    return $this;
+  }
+
+  /**
+   * Gets the machine-readable region names.
+   *
+   * @return string[]
+   *   An array of machine-readable region names.
+   */
+  public function getRegionNames() {
+    return array_keys($this->getRegions());
+  }
+
+  /**
+   * Gets the human-readable region labels.
+   *
+   * @return string[]
+   *   An array of human-readable region labels.
+   */
+  public function getRegionLabels() {
+    $regions = $this->getRegions();
+    return array_combine(array_keys($regions), array_column($regions, 'label'));
+  }
+
+  /**
+   * Gets the default region.
+   *
+   * @return string
+   *   The machine-readable name of the default region.
+   */
+  public function getDefaultRegion() {
+    return $this->default_region;
+  }
+
+  /**
+   * Sets the default region.
+   *
+   * @param string $default_region
+   *   The machine-readable name of the default region.
+   *
+   * @return $this
+   */
+  public function setDefaultRegion($default_region) {
+    $this->default_region = $default_region;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDeriver() {
+    return $this->deriver;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setDeriver($deriver) {
+    $this->deriver = $deriver;
+    return $this;
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Layout/LayoutInterface.php b/web/core/lib/Drupal/Core/Layout/LayoutInterface.php
new file mode 100644
index 000000000..bb60df005
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Layout/LayoutInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\Core\Layout;
+
+use Drupal\Component\Plugin\DerivativeInspectionInterface;
+use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\Component\Plugin\ConfigurablePluginInterface;
+
+/**
+ * Provides an interface for static Layout plugins.
+ *
+ * @internal
+ *   The layout system is currently experimental and should only be leveraged by
+ *   experimental modules and development releases of contributed modules.
+ *   See https://www.drupal.org/core/experimental for more information.
+ */
+interface LayoutInterface extends PluginInspectionInterface, DerivativeInspectionInterface, ConfigurablePluginInterface {
+
+  /**
+   * Build a render array for layout with regions.
+   *
+   * @param array $regions
+   *   An associative array keyed by region name, containing render arrays
+   *   representing the content that should be placed in each region.
+   *
+   * @return array
+   *   Render array for the layout with regions.
+   */
+  public function build(array $regions);
+
+  /**
+   * {@inheritdoc}
+   *
+   * @return \Drupal\Core\Layout\LayoutDefinition
+   */
+  public function getPluginDefinition();
+
+}
diff --git a/web/core/lib/Drupal/Core/Layout/LayoutPluginManager.php b/web/core/lib/Drupal/Core/Layout/LayoutPluginManager.php
new file mode 100644
index 000000000..e11f1055b
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Layout/LayoutPluginManager.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace Drupal\Core\Layout;
+
+use Drupal\Component\Annotation\Plugin\Discovery\AnnotationBridgeDecorator;
+use Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator;
+use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Extension\ThemeHandlerInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
+use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
+use Drupal\Core\Plugin\Discovery\YamlDiscoveryDecorator;
+use Drupal\Core\Layout\Annotation\Layout;
+
+/**
+ * Provides a plugin manager for layouts.
+ *
+ * @internal
+ *   The layout system is currently experimental and should only be leveraged by
+ *   experimental modules and development releases of contributed modules.
+ *   See https://www.drupal.org/core/experimental for more information.
+ */
+class LayoutPluginManager extends DefaultPluginManager implements LayoutPluginManagerInterface {
+
+  /**
+   * The theme handler.
+   *
+   * @var \Drupal\Core\Extension\ThemeHandlerInterface
+   */
+  protected $themeHandler;
+
+  /**
+   * LayoutPluginManager constructor.
+   *
+   * @param \Traversable $namespaces
+   *   An object that implements \Traversable which contains the root paths
+   *   keyed by the corresponding namespace to look for plugin implementations.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   Cache backend instance to use.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler to invoke the alter hook with.
+   * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
+   *   The theme handler to invoke the alter hook with.
+   */
+  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler) {
+    parent::__construct('Plugin/Layout', $namespaces, $module_handler, LayoutInterface::class, Layout::class);
+    $this->themeHandler = $theme_handler;
+
+    $this->setCacheBackend($cache_backend, 'layout');
+    $this->alterInfo('layout');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function providerExists($provider) {
+    return $this->moduleHandler->moduleExists($provider) || $this->themeHandler->themeExists($provider);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDiscovery() {
+    if (!$this->discovery) {
+      $discovery = new AnnotatedClassDiscovery($this->subdir, $this->namespaces, $this->pluginDefinitionAnnotationName, $this->additionalAnnotationNamespaces);
+      $discovery = new YamlDiscoveryDecorator($discovery, 'layouts', $this->moduleHandler->getModuleDirectories() + $this->themeHandler->getThemeDirectories());
+      $discovery = new AnnotationBridgeDecorator($discovery, $this->pluginDefinitionAnnotationName);
+      $discovery = new DerivativeDiscoveryDecorator($discovery);
+      $this->discovery = $discovery;
+    }
+    return $this->discovery;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processDefinition(&$definition, $plugin_id) {
+    parent::processDefinition($definition, $plugin_id);
+
+    if (!$definition instanceof LayoutDefinition) {
+      throw new InvalidPluginDefinitionException($plugin_id, sprintf('The "%s" layout definition must extend %s', $plugin_id, LayoutDefinition::class));
+    }
+
+    // Add the module or theme path to the 'path'.
+    $provider = $definition->getProvider();
+    if ($this->moduleHandler->moduleExists($provider)) {
+      $base_path = $this->moduleHandler->getModule($provider)->getPath();
+    }
+    elseif ($this->themeHandler->themeExists($provider)) {
+      $base_path = $this->themeHandler->getTheme($provider)->getPath();
+    }
+    else {
+      $base_path = '';
+    }
+
+    $path = $definition->getPath();
+    $path = !empty($path) ? $base_path . '/' . $path : $base_path;
+    $definition->setPath($path);
+
+    // Add the base path to the icon path.
+    if ($icon_path = $definition->getIconPath()) {
+      $definition->setIconPath($path . '/' . $icon_path);
+    }
+
+    // Add a dependency on the provider of the library.
+    if ($library = $definition->getLibrary()) {
+      $config_dependencies = $definition->getConfigDependencies();
+      list($library_provider) = explode('/', $library, 2);
+      if ($this->moduleHandler->moduleExists($library_provider)) {
+        $config_dependencies['module'][] = $library_provider;
+      }
+      elseif ($this->themeHandler->themeExists($library_provider)) {
+        $config_dependencies['theme'][] = $library_provider;
+      }
+      $definition->setConfigDependencies($config_dependencies);
+    }
+
+    // If 'template' is set, then we'll derive 'template_path' and 'theme_hook'.
+    $template = $definition->getTemplate();
+    if (!empty($template)) {
+      $template_parts = explode('/', $template);
+
+      $template = array_pop($template_parts);
+      $template_path = $path;
+      if (count($template_parts) > 0) {
+        $template_path .= '/' . implode('/', $template_parts);
+      }
+      $definition->setTemplate($template);
+      $definition->setThemeHook(strtr($template, '-', '_'));
+      $definition->setTemplatePath($template_path);
+    }
+
+    if (!$definition->getDefaultRegion()) {
+      $definition->setDefaultRegion(key($definition->getRegions()));
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getThemeImplementations() {
+    $hooks = [];
+    $hooks['layout'] = [
+      'render element' => 'content',
+    ];
+    /** @var \Drupal\Core\Layout\LayoutDefinition[] $definitions */
+    $definitions = $this->getDefinitions();
+    foreach ($definitions as $definition) {
+      if ($template = $definition->getTemplate()) {
+        $hooks[$definition->getThemeHook()] = [
+          'render element' => 'content',
+          'base hook' => 'layout',
+          'template' => $template,
+          'path' => $definition->getTemplatePath(),
+        ];
+      }
+    }
+    return $hooks;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCategories() {
+    // Fetch all categories from definitions and remove duplicates.
+    $categories = array_unique(array_values(array_map(function (LayoutDefinition $definition) {
+      return $definition->getCategory();
+    }, $this->getDefinitions())));
+    natcasesort($categories);
+    return $categories;
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * @return \Drupal\Core\Layout\LayoutDefinition[]
+   */
+  public function getSortedDefinitions(array $definitions = NULL, $label_key = 'label') {
+    // Sort the plugins first by category, then by label.
+    $definitions = isset($definitions) ? $definitions : $this->getDefinitions();
+    // Suppress errors because PHPUnit will indirectly modify the contents,
+    // triggering https://bugs.php.net/bug.php?id=50688.
+    @uasort($definitions, function (LayoutDefinition $a, LayoutDefinition $b) {
+      if ($a->getCategory() != $b->getCategory()) {
+        return strnatcasecmp($a->getCategory(), $b->getCategory());
+      }
+      return strnatcasecmp($a->getLabel(), $b->getLabel());
+    });
+    return $definitions;
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * @return \Drupal\Core\Layout\LayoutDefinition[][]
+   */
+  public function getGroupedDefinitions(array $definitions = NULL, $label_key = 'label') {
+    $definitions = $this->getSortedDefinitions(isset($definitions) ? $definitions : $this->getDefinitions(), $label_key);
+    $grouped_definitions = [];
+    foreach ($definitions as $id => $definition) {
+      $grouped_definitions[(string) $definition->getCategory()][$id] = $definition;
+    }
+    return $grouped_definitions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getLayoutOptions() {
+    $layout_options = [];
+    foreach ($this->getGroupedDefinitions() as $category => $layout_definitions) {
+      foreach ($layout_definitions as $name => $layout_definition) {
+        $layout_options[$category][$name] = $layout_definition->getLabel();
+      }
+    }
+    return $layout_options;
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Layout/LayoutPluginManagerInterface.php b/web/core/lib/Drupal/Core/Layout/LayoutPluginManagerInterface.php
new file mode 100644
index 000000000..df15be03a
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Layout/LayoutPluginManagerInterface.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Drupal\Core\Layout;
+
+use Drupal\Component\Plugin\CategorizingPluginManagerInterface;
+
+/**
+ * Provides the interface for a plugin manager of layouts.
+ *
+ * @internal
+ *   The layout system is currently experimental and should only be leveraged by
+ *   experimental modules and development releases of contributed modules.
+ *   See https://www.drupal.org/core/experimental for more information.
+ */
+interface LayoutPluginManagerInterface extends CategorizingPluginManagerInterface {
+
+  /**
+   * Gets theme implementations for layouts.
+   *
+   * @return array
+   *   An associative array of the same format as returned by hook_theme().
+   *
+   * @see hook_theme()
+   */
+  public function getThemeImplementations();
+
+  /**
+   * {@inheritdoc}
+   *
+   * @return \Drupal\Core\Layout\LayoutInterface
+   */
+  public function createInstance($plugin_id, array $configuration = []);
+
+  /**
+   * {@inheritdoc}
+   *
+   * @return \Drupal\Core\Layout\LayoutDefinition|null
+   */
+  public function getDefinition($plugin_id, $exception_on_invalid = TRUE);
+
+  /**
+   * {@inheritdoc}
+   *
+   * @return \Drupal\Core\Layout\LayoutDefinition[]
+   */
+  public function getDefinitions();
+
+  /**
+   * {@inheritdoc}
+   *
+   * @return \Drupal\Core\Layout\LayoutDefinition[]
+   */
+  public function getSortedDefinitions(array $definitions = NULL);
+
+  /**
+   * {@inheritdoc}
+   *
+   * @return \Drupal\Core\Layout\LayoutDefinition[][]
+   */
+  public function getGroupedDefinitions(array $definitions = NULL);
+
+  /**
+   * Returns an array of layout labels grouped by category.
+   *
+   * @return string[][]
+   *   A nested array of labels suitable for #options.
+   */
+  public function getLayoutOptions();
+
+}
diff --git a/web/core/lib/Drupal/Core/Link.php b/web/core/lib/Drupal/Core/Link.php
index e7c9e3a83..e435d4427 100644
--- a/web/core/lib/Drupal/Core/Link.php
+++ b/web/core/lib/Drupal/Core/Link.php
@@ -57,7 +57,7 @@ class Link implements RenderableInterface {
    *
    * @return static
    */
-  public static function createFromRoute($text, $route_name, $route_parameters = array(), $options = array()) {
+  public static function createFromRoute($text, $route_name, $route_parameters = [], $options = []) {
     return new static($text, new Url($route_name, $route_parameters, $options));
   }
 
diff --git a/web/core/lib/Drupal/Core/Locale/CountryManager.php b/web/core/lib/Drupal/Core/Locale/CountryManager.php
index 451758e08..adc110cae 100644
--- a/web/core/lib/Drupal/Core/Locale/CountryManager.php
+++ b/web/core/lib/Drupal/Core/Locale/CountryManager.php
@@ -37,7 +37,7 @@ class CountryManager implements CountryManagerInterface {
    *   An array of country code => country name pairs.
    */
   public static function getStandardList() {
-    $countries = array(
+    $countries = [
       'AC' => t('Ascension Island'),
       'AD' => t('Andorra'),
       'AE' => t('United Arab Emirates'),
@@ -296,7 +296,7 @@ class CountryManager implements CountryManagerInterface {
       'ZA' => t('South Africa'),
       'ZM' => t('Zambia'),
       'ZW' => t('Zimbabwe'),
-    );
+    ];
 
     // Sort the list.
     natcasesort($countries);
diff --git a/web/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php b/web/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
index d09502826..91077e7ad 100644
--- a/web/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
+++ b/web/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
@@ -34,7 +34,7 @@ class DatabaseLockBackend extends LockBackendAbstract {
   public function __construct(Connection $database) {
     // __destruct() is causing problems with garbage collections, register a
     // shutdown function instead.
-    drupal_register_shutdown_function(array($this, 'releaseAll'));
+    drupal_register_shutdown_function([$this, 'releaseAll']);
     $this->database = $database;
   }
 
@@ -48,7 +48,7 @@ class DatabaseLockBackend extends LockBackendAbstract {
     if (isset($this->locks[$name])) {
       // Try to extend the expiration of a lock we already acquired.
       $success = (bool) $this->database->update('semaphore')
-        ->fields(array('expire' => $expire))
+        ->fields(['expire' => $expire])
         ->condition('name', $name)
         ->condition('value', $this->getLockId())
         ->execute();
@@ -66,11 +66,11 @@ class DatabaseLockBackend extends LockBackendAbstract {
       do {
         try {
           $this->database->insert('semaphore')
-            ->fields(array(
+            ->fields([
               'name' => $name,
               'value' => $this->getLockId(),
               'expire' => $expire,
-            ))
+            ])
             ->execute();
           // We track all acquired locks in the global variable.
           $this->locks[$name] = TRUE;
@@ -107,7 +107,7 @@ class DatabaseLockBackend extends LockBackendAbstract {
    */
   public function lockMayBeAvailable($name) {
     try {
-      $lock = $this->database->query('SELECT expire, value FROM {semaphore} WHERE name = :name', array(':name' => $name))->fetchAssoc();
+      $lock = $this->database->query('SELECT expire, value FROM {semaphore} WHERE name = :name', [':name' => $name])->fetchAssoc();
     }
     catch (\Exception $e) {
       $this->catchException($e);
@@ -154,7 +154,7 @@ class DatabaseLockBackend extends LockBackendAbstract {
   public function releaseAll($lock_id = NULL) {
     // Only attempt to release locks if any were acquired.
     if (!empty($this->locks)) {
-      $this->locks = array();
+      $this->locks = [];
       if (empty($lock_id)) {
         $lock_id = $this->getLockId();
       }
diff --git a/web/core/lib/Drupal/Core/Lock/LockBackendAbstract.php b/web/core/lib/Drupal/Core/Lock/LockBackendAbstract.php
index 32322d4e8..41ee27cab 100644
--- a/web/core/lib/Drupal/Core/Lock/LockBackendAbstract.php
+++ b/web/core/lib/Drupal/Core/Lock/LockBackendAbstract.php
@@ -21,7 +21,7 @@ abstract class LockBackendAbstract implements LockBackendInterface {
    *
    * @var array
    */
-  protected $locks = array();
+  protected $locks = [];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/lib/Drupal/Core/Logger/LogMessageParser.php b/web/core/lib/Drupal/Core/Logger/LogMessageParser.php
index 3ce39bbf4..8a67df12d 100644
--- a/web/core/lib/Drupal/Core/Logger/LogMessageParser.php
+++ b/web/core/lib/Drupal/Core/Logger/LogMessageParser.php
@@ -11,7 +11,7 @@ class LogMessageParser implements LogMessageParserInterface {
    * {@inheritdoc}
    */
   public function parseMessagePlaceholders(&$message, array &$context) {
-    $variables = array();
+    $variables = [];
     $has_psr3 = FALSE;
     if (($start = strpos($message, '{')) !== FALSE && strpos($message, '}') > $start) {
       $has_psr3 = TRUE;
diff --git a/web/core/lib/Drupal/Core/Logger/LoggerChannel.php b/web/core/lib/Drupal/Core/Logger/LoggerChannel.php
index 9253a2495..51141f784 100644
--- a/web/core/lib/Drupal/Core/Logger/LoggerChannel.php
+++ b/web/core/lib/Drupal/Core/Logger/LoggerChannel.php
@@ -46,7 +46,7 @@ class LoggerChannel implements LoggerChannelInterface {
    *
    * @var array
    */
-  protected $levelTranslation = array(
+  protected $levelTranslation = [
     LogLevel::EMERGENCY => RfcLogLevel::EMERGENCY,
     LogLevel::ALERT => RfcLogLevel::ALERT,
     LogLevel::CRITICAL => RfcLogLevel::CRITICAL,
@@ -55,14 +55,14 @@ class LoggerChannel implements LoggerChannelInterface {
     LogLevel::NOTICE => RfcLogLevel::NOTICE,
     LogLevel::INFO => RfcLogLevel::INFO,
     LogLevel::DEBUG => RfcLogLevel::DEBUG,
-  );
+  ];
 
   /**
    * An array of arrays of \Psr\Log\LoggerInterface keyed by priority.
    *
    * @var array
    */
-  protected $loggers = array();
+  protected $loggers = [];
 
   /**
    * The request stack object.
@@ -91,14 +91,14 @@ class LoggerChannel implements LoggerChannelInterface {
   /**
    * {@inheritdoc}
    */
-  public function log($level, $message, array $context = array()) {
+  public function log($level, $message, array $context = []) {
     if ($this->callDepth == self::MAX_CALL_DEPTH) {
       return;
     }
     $this->callDepth++;
 
     // Merge in defaults.
-    $context += array(
+    $context += [
       'channel' => $this->channel,
       'link' => '',
       'user' => NULL,
@@ -107,7 +107,7 @@ class LoggerChannel implements LoggerChannelInterface {
       'referer' => '',
       'ip' => '',
       'timestamp' => time(),
-    );
+    ];
     // Some context values are only available when in a request context.
     if ($this->requestStack && $request = $this->requestStack->getCurrentRequest()) {
       $context['request_uri'] = $request->getUri();
@@ -174,7 +174,7 @@ class LoggerChannel implements LoggerChannelInterface {
    *   An array of sorted loggers by priority.
    */
   protected function sortLoggers() {
-    $sorted = array();
+    $sorted = [];
     krsort($this->loggers);
 
     foreach ($this->loggers as $loggers) {
diff --git a/web/core/lib/Drupal/Core/Logger/LoggerChannelFactory.php b/web/core/lib/Drupal/Core/Logger/LoggerChannelFactory.php
index 2fa55316b..6c487d175 100644
--- a/web/core/lib/Drupal/Core/Logger/LoggerChannelFactory.php
+++ b/web/core/lib/Drupal/Core/Logger/LoggerChannelFactory.php
@@ -17,14 +17,14 @@ class LoggerChannelFactory implements LoggerChannelFactoryInterface, ContainerAw
    *
    * @var \Drupal\Core\Logger\LoggerChannelInterface[]
    */
-  protected $channels = array();
+  protected $channels = [];
 
   /**
    * An array of arrays of \Psr\Log\LoggerInterface keyed by priority.
    *
    * @var array
    */
-  protected $loggers = array();
+  protected $loggers = [];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/lib/Drupal/Core/Logger/RfcLoggerTrait.php b/web/core/lib/Drupal/Core/Logger/RfcLoggerTrait.php
index c05d733b1..0152efe2c 100644
--- a/web/core/lib/Drupal/Core/Logger/RfcLoggerTrait.php
+++ b/web/core/lib/Drupal/Core/Logger/RfcLoggerTrait.php
@@ -17,62 +17,62 @@ trait RfcLoggerTrait {
   /**
    * {@inheritdoc}
    */
-  public function emergency($message, array $context = array()) {
+  public function emergency($message, array $context = []) {
     $this->log(RfcLogLevel::EMERGENCY, $message, $context);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function alert($message, array $context = array()) {
+  public function alert($message, array $context = []) {
     $this->log(RfcLogLevel::ALERT, $message, $context);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function critical($message, array $context = array()) {
+  public function critical($message, array $context = []) {
     $this->log(RfcLogLevel::CRITICAL, $message, $context);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function error($message, array $context = array()) {
+  public function error($message, array $context = []) {
     $this->log(RfcLogLevel::ERROR, $message, $context);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function warning($message, array $context = array()) {
+  public function warning($message, array $context = []) {
     $this->log(RfcLogLevel::WARNING, $message, $context);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function notice($message, array $context = array()) {
+  public function notice($message, array $context = []) {
     $this->log(RfcLogLevel::NOTICE, $message, $context);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function info($message, array $context = array()) {
+  public function info($message, array $context = []) {
     $this->log(RfcLogLevel::INFO, $message, $context);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function debug($message, array $context = array()) {
+  public function debug($message, array $context = []) {
     $this->log(RfcLogLevel::DEBUG, $message, $context);
   }
 
   /**
    * {@inheritdoc}
    */
-  abstract public function log($level, $message, array $context = array());
+  abstract public function log($level, $message, array $context = []);
 
 }
diff --git a/web/core/lib/Drupal/Core/Mail/MailFormatHelper.php b/web/core/lib/Drupal/Core/Mail/MailFormatHelper.php
index 3dffe830c..021028fce 100644
--- a/web/core/lib/Drupal/Core/Mail/MailFormatHelper.php
+++ b/web/core/lib/Drupal/Core/Mail/MailFormatHelper.php
@@ -17,7 +17,7 @@ class MailFormatHelper {
    *
    * @var array
    */
-  protected static $urls = array();
+  protected static $urls = [];
 
   /**
    * Quoted regex expression based on base path.
@@ -31,7 +31,7 @@ class MailFormatHelper {
    *
    * @var array
    */
-  protected static $supportedTags = array();
+  protected static $supportedTags = [];
 
   /**
    * Performs format=flowed soft wrapping for mail (RFC 3676).
@@ -63,12 +63,12 @@ class MailFormatHelper {
       $text = preg_replace('/(?(?<!^--) +\n|  +\n)/m', "\n", $text);
       // Wrap each line at the needed width.
       $lines = explode("\n", $text);
-      array_walk($lines, '\Drupal\Core\Mail\MailFormatHelper::wrapMailLine', array('soft' => $soft, 'length' => strlen($indent)));
+      array_walk($lines, '\Drupal\Core\Mail\MailFormatHelper::wrapMailLine', ['soft' => $soft, 'length' => strlen($indent)]);
       $text = implode("\n", $lines);
     }
     else {
       // Wrap this line.
-      static::wrapMailLine($text, 0, array('soft' => $soft, 'length' => strlen($indent)));
+      static::wrapMailLine($text, 0, ['soft' => $soft, 'length' => strlen($indent)]);
     }
     // Empty lines with nothing but spaces.
     $text = preg_replace('/^ +\n/m', "\n", $text);
@@ -104,9 +104,9 @@ class MailFormatHelper {
   public static function htmlToText($string, $allowed_tags = NULL) {
     // Cache list of supported tags.
     if (empty(static::$supportedTags)) {
-      static::$supportedTags = array('a', 'em', 'i', 'strong', 'b', 'br', 'p',
+      static::$supportedTags = ['a', 'em', 'i', 'strong', 'b', 'br', 'p',
         'blockquote', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'h1', 'h2', 'h3',
-        'h4', 'h5', 'h6', 'hr');
+        'h4', 'h5', 'h6', 'hr'];
     }
 
     // Make sure only supported tags are kept.
@@ -146,9 +146,9 @@ class MailFormatHelper {
     $casing = NULL;
     $output = '';
     // All current indentation string chunks.
-    $indent = array();
+    $indent = [];
     // Array of counters for opened lists.
-    $lists = array();
+    $lists = [];
     foreach ($split as $value) {
       // Holds a string ready to be formatted and output.
       $chunk = NULL;
@@ -302,12 +302,12 @@ class MailFormatHelper {
    */
   protected static function wrapMailLine(&$line, $key, $values) {
     $line_is_mime_header = FALSE;
-    $mime_headers = array(
+    $mime_headers = [
       'Content-Type',
       'Content-Transfer-Encoding',
       'Content-Disposition',
       'Content-Description',
-    );
+    ];
 
     // Do not break MIME headers which could be longer than 77 characters.
     foreach ($mime_headers as $header) {
@@ -336,7 +336,7 @@ class MailFormatHelper {
 
     if ($reset) {
       // Reset internal URL list.
-      static::$urls = array();
+      static::$urls = [];
     }
     else {
       if (empty(static::$regexp)) {
diff --git a/web/core/lib/Drupal/Core/Mail/MailManager.php b/web/core/lib/Drupal/Core/Mail/MailManager.php
index 2abba6b3c..6de2dd818 100644
--- a/web/core/lib/Drupal/Core/Mail/MailManager.php
+++ b/web/core/lib/Drupal/Core/Mail/MailManager.php
@@ -50,7 +50,7 @@ class MailManager extends DefaultPluginManager implements MailManagerInterface {
    *
    * @var array
    */
-  protected $instances = array();
+  protected $instances = [];
 
   /**
    * Constructs the MailManager object.
@@ -163,7 +163,7 @@ class MailManager extends DefaultPluginManager implements MailManagerInterface {
   /**
    * {@inheritdoc}
    */
-  public function mail($module, $key, $to, $langcode, $params = array(), $reply = NULL, $send = TRUE) {
+  public function mail($module, $key, $to, $langcode, $params = [], $reply = NULL, $send = TRUE) {
     // Mailing can invoke rendering (e.g., generating URLs, replacing tokens),
     // but e-mails are not HTTP responses: they're not cached, they don't have
     // attachments. Therefore we perform mailing inside its own render context,
@@ -215,7 +215,7 @@ class MailManager extends DefaultPluginManager implements MailManagerInterface {
    *
    * @see \Drupal\Core\Mail\MailManagerInterface::mail()
    */
-  public function doMail($module, $key, $to, $langcode, $params = array(), $reply = NULL, $send = TRUE) {
+  public function doMail($module, $key, $to, $langcode, $params = [], $reply = NULL, $send = TRUE) {
     $site_config = $this->configFactory->get('system.site');
     $site_mail = $site_config->get('mail');
     if (empty($site_mail)) {
@@ -223,7 +223,7 @@ class MailManager extends DefaultPluginManager implements MailManagerInterface {
     }
 
     // Bundle up the variables into a structured array for altering.
-    $message = array(
+    $message = [
       'id' => $module . '_' . $key,
       'module' => $module,
       'key' => $key,
@@ -234,16 +234,16 @@ class MailManager extends DefaultPluginManager implements MailManagerInterface {
       'params' => $params,
       'send' => TRUE,
       'subject' => '',
-      'body' => array(),
-    );
+      'body' => [],
+    ];
 
     // Build the default headers.
-    $headers = array(
+    $headers = [
       'MIME-Version' => '1.0',
       'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
       'Content-Transfer-Encoding' => '8Bit',
       'X-Mailer' => 'Drupal',
-    );
+    ];
     // To prevent email from looking like spam, the addresses in the Sender and
     // Return-Path headers should have a domain authorized to use the
     // originating SMTP server.
@@ -267,7 +267,7 @@ class MailManager extends DefaultPluginManager implements MailManagerInterface {
     $this->moduleHandler->alter('mail', $message);
 
     // Retrieve the responsible implementation for this message.
-    $system = $this->getInstance(array('module' => $module, 'key' => $key));
+    $system = $this->getInstance(['module' => $module, 'key' => $key]);
 
     // Format the message body.
     $message = $system->format($message);
@@ -292,11 +292,11 @@ class MailManager extends DefaultPluginManager implements MailManagerInterface {
         // Log errors.
         if (!$message['result']) {
           $this->loggerFactory->get('mail')
-            ->error('Error sending email (from %from to %to with reply-to %reply).', array(
+            ->error('Error sending email (from %from to %to with reply-to %reply).', [
             '%from' => $message['from'],
             '%to' => $message['to'],
             '%reply' => $message['reply-to'] ? $message['reply-to'] : $this->t('not set'),
-          ));
+          ]);
           drupal_set_message($this->t('Unable to send email. Contact the site administrator if the problem persists.'), 'error');
         }
       }
diff --git a/web/core/lib/Drupal/Core/Mail/MailManagerInterface.php b/web/core/lib/Drupal/Core/Mail/MailManagerInterface.php
index cdf4c8ae5..0228fbcb9 100644
--- a/web/core/lib/Drupal/Core/Mail/MailManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Mail/MailManagerInterface.php
@@ -119,6 +119,6 @@ interface MailManagerInterface extends PluginManagerInterface {
    *   watchdog. (Success means nothing more than the message being accepted at
    *   php-level, which still doesn't guarantee it to be delivered.)
    */
-  public function mail($module, $key, $to, $langcode, $params = array(), $reply = NULL, $send = TRUE);
+  public function mail($module, $key, $to, $langcode, $params = [], $reply = NULL, $send = TRUE);
 
 }
diff --git a/web/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php b/web/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
index 652c6b305..1fced2e47 100644
--- a/web/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
+++ b/web/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
@@ -61,7 +61,7 @@ class PhpMail implements MailInterface {
         unset($message['headers']['Return-Path']);
       }
     }
-    $mimeheaders = array();
+    $mimeheaders = [];
     foreach ($message['headers'] as $name => $value) {
       $mimeheaders[] = $name . ': ' . Unicode::mimeHeaderEncode($value);
     }
diff --git a/web/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php b/web/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php
index ede465e72..607906f4c 100644
--- a/web/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php
+++ b/web/core/lib/Drupal/Core/Mail/Plugin/Mail/TestMailCollector.php
@@ -21,7 +21,7 @@ class TestMailCollector extends PhpMail implements MailInterface {
    * {@inheritdoc}
    */
   public function mail(array $message) {
-    $captured_emails = \Drupal::state()->get('system.test_mail_collector') ?: array();
+    $captured_emails = \Drupal::state()->get('system.test_mail_collector') ?: [];
     $captured_emails[] = $message;
     \Drupal::state()->set('system.test_mail_collector', $captured_emails);
 
diff --git a/web/core/lib/Drupal/Core/Menu/ContextualLinkManager.php b/web/core/lib/Drupal/Core/Menu/ContextualLinkManager.php
index e264036fc..057f7ded4 100644
--- a/web/core/lib/Drupal/Core/Menu/ContextualLinkManager.php
+++ b/web/core/lib/Drupal/Core/Menu/ContextualLinkManager.php
@@ -27,7 +27,7 @@ class ContextualLinkManager extends DefaultPluginManager implements ContextualLi
    *
    * @var array
    */
-  protected $defaults = array(
+  protected $defaults = [
     // (required) The name of the route to link to.
     'route_name' => '',
     // (required) The contextual links group.
@@ -35,14 +35,14 @@ class ContextualLinkManager extends DefaultPluginManager implements ContextualLi
     // The static title text for the link.
     'title' => '',
     // The default link options.
-    'options' => array(),
+    'options' => [],
     // The weight of the link.
     'weight' => NULL,
     // Default class for contextual link implementations.
     'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
     // The plugin id. Set by the plugin system based on the top-level YAML key.
     'id' => '',
-  );
+  ];
 
   /**
    * A controller resolver object.
@@ -105,7 +105,7 @@ class ContextualLinkManager extends DefaultPluginManager implements ContextualLi
     $this->moduleHandler = $module_handler;
     $this->requestStack = $request_stack;
     $this->alterInfo('contextual_links_plugins');
-    $this->setCacheBackend($cache_backend, 'contextual_links_plugins:' . $language_manager->getCurrentLanguage()->getId(), array('contextual_links_plugins'));
+    $this->setCacheBackend($cache_backend, 'contextual_links_plugins:' . $language_manager->getCurrentLanguage()->getId(), ['contextual_links_plugins']);
   }
 
   /**
@@ -148,7 +148,7 @@ class ContextualLinkManager extends DefaultPluginManager implements ContextualLi
       $this->pluginsByGroup[$group_name] = $contextual_links;
     }
     else {
-      $contextual_links = array();
+      $contextual_links = [];
       foreach ($this->getDefinitions() as $plugin_id => $plugin_definition) {
         if ($plugin_definition['group'] == $group_name) {
           $contextual_links[$plugin_id] = $plugin_definition;
@@ -163,8 +163,8 @@ class ContextualLinkManager extends DefaultPluginManager implements ContextualLi
   /**
    * {@inheritdoc}
    */
-  public function getContextualLinksArrayByGroup($group_name, array $route_parameters, array $metadata = array()) {
-    $links = array();
+  public function getContextualLinksArrayByGroup($group_name, array $route_parameters, array $metadata = []) {
+    $links = [];
     $request = $this->requestStack->getCurrentRequest();
     foreach ($this->getContextualLinkPluginsByGroup($group_name) as $plugin_id => $plugin_definition) {
       /** @var $plugin \Drupal\Core\Menu\ContextualLinkInterface */
@@ -176,14 +176,14 @@ class ContextualLinkManager extends DefaultPluginManager implements ContextualLi
         continue;
       }
 
-      $links[$plugin_id] = array(
+      $links[$plugin_id] = [
         'route_name' => $route_name,
         'route_parameters' => $route_parameters,
         'title' => $plugin->getTitle($request),
         'weight' => $plugin->getWeight(),
         'localized_options' => $plugin->getOptions(),
         'metadata' => $metadata,
-      );
+      ];
     }
 
     $this->moduleHandler->alter('contextual_links', $links, $group_name, $route_parameters);
diff --git a/web/core/lib/Drupal/Core/Menu/ContextualLinkManagerInterface.php b/web/core/lib/Drupal/Core/Menu/ContextualLinkManagerInterface.php
index 9e294364e..12f027558 100644
--- a/web/core/lib/Drupal/Core/Menu/ContextualLinkManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Menu/ContextualLinkManagerInterface.php
@@ -41,6 +41,6 @@ interface ContextualLinkManagerInterface {
    *       to the link generator.
    *     - metadata: The array of additional metadata that was passed in.
    */
-  public function getContextualLinksArrayByGroup($group_name, array $route_parameters, array $metadata = array());
+  public function getContextualLinksArrayByGroup($group_name, array $route_parameters, array $metadata = []);
 
 }
diff --git a/web/core/lib/Drupal/Core/Menu/DefaultMenuLinkTreeManipulators.php b/web/core/lib/Drupal/Core/Menu/DefaultMenuLinkTreeManipulators.php
index 71590832d..7eefd1275 100644
--- a/web/core/lib/Drupal/Core/Menu/DefaultMenuLinkTreeManipulators.php
+++ b/web/core/lib/Drupal/Core/Menu/DefaultMenuLinkTreeManipulators.php
@@ -4,8 +4,9 @@ namespace Drupal\Core\Menu;
 
 use Drupal\Core\Access\AccessManagerInterface;
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\node\NodeInterface;
 
 /**
  * Provides a couple of menu link tree manipulators.
@@ -33,11 +34,11 @@ class DefaultMenuLinkTreeManipulators {
   protected $account;
 
   /**
-   * The entity query factory.
+   * The entity type manager.
    *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $queryFactory;
+  protected $entityTypeManager;
 
   /**
    * Constructs a \Drupal\Core\Menu\DefaultMenuLinkTreeManipulators object.
@@ -46,13 +47,13 @@ class DefaultMenuLinkTreeManipulators {
    *   The access manager.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The current user.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
    */
-  public function __construct(AccessManagerInterface $access_manager, AccountInterface $account, QueryFactory $query_factory) {
+  public function __construct(AccessManagerInterface $access_manager, AccountInterface $account, EntityTypeManagerInterface $entity_type_manager) {
     $this->accessManager = $access_manager;
     $this->account = $account;
-    $this->queryFactory = $query_factory;
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
@@ -129,12 +130,12 @@ class DefaultMenuLinkTreeManipulators {
    *   The manipulated menu link tree.
    */
   public function checkNodeAccess(array $tree) {
-    $node_links = array();
+    $node_links = [];
     $this->collectNodeLinks($tree, $node_links);
     if ($node_links) {
       $nids = array_keys($node_links);
 
-      $query = $this->queryFactory->get('node');
+      $query = $this->entityTypeManager->getStorage('node')->getQuery();
       $query->condition('nid', $nids, 'IN');
 
       // Allows admins to view all nodes, by both disabling node_access
@@ -147,7 +148,7 @@ class DefaultMenuLinkTreeManipulators {
       }
       else {
         $access_result->addCacheContexts(['user.node_grants:view']);
-        $query->condition('status', NODE_PUBLISHED);
+        $query->condition('status', NodeInterface::PUBLISHED);
       }
 
       $nids = $query->execute();
@@ -224,7 +225,7 @@ class DefaultMenuLinkTreeManipulators {
    *   The manipulated menu link tree.
    */
   public function generateIndexAndSort(array $tree) {
-    $new_tree = array();
+    $new_tree = [];
     foreach ($tree as $key => $v) {
       if ($tree[$key]->subtree) {
         $tree[$key]->subtree = $this->generateIndexAndSort($tree[$key]->subtree);
@@ -254,7 +255,7 @@ class DefaultMenuLinkTreeManipulators {
       if ($tree[$key]->subtree) {
         $tree += $this->flatten($tree[$key]->subtree);
       }
-      $tree[$key]->subtree = array();
+      $tree[$key]->subtree = [];
     }
     return $tree;
   }
diff --git a/web/core/lib/Drupal/Core/Menu/Form/MenuLinkDefaultForm.php b/web/core/lib/Drupal/Core/Menu/Form/MenuLinkDefaultForm.php
index e7c04e370..17031199e 100644
--- a/web/core/lib/Drupal/Core/Menu/Form/MenuLinkDefaultForm.php
+++ b/web/core/lib/Drupal/Core/Menu/Form/MenuLinkDefaultForm.php
@@ -98,41 +98,41 @@ class MenuLinkDefaultForm implements MenuLinkFormInterface, ContainerInjectionIn
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['#title'] = $this->t('Edit menu link %title', array('%title' => $this->menuLink->getTitle()));
+    $form['#title'] = $this->t('Edit menu link %title', ['%title' => $this->menuLink->getTitle()]);
 
     $provider = $this->menuLink->getProvider();
-    $form['info'] = array(
+    $form['info'] = [
       '#type' => 'item',
-      '#title' => $this->t('This link is provided by the @name module. The title and path cannot be edited.', array('@name' => $this->moduleHandler->getName($provider))),
-    );
-    $form['id'] = array(
+      '#title' => $this->t('This link is provided by the @name module. The title and path cannot be edited.', ['@name' => $this->moduleHandler->getName($provider)]),
+    ];
+    $form['id'] = [
       '#type' => 'value',
       '#value' => $this->menuLink->getPluginId(),
-    );
-    $link = array(
+    ];
+    $link = [
       '#type' => 'link',
       '#title' => $this->menuLink->getTitle(),
       '#url' => $this->menuLink->getUrlObject(),
-    );
-    $form['path'] = array(
+    ];
+    $form['path'] = [
       'link' => $link,
       '#type' => 'item',
       '#title' => $this->t('Link'),
-    );
+    ];
 
-    $form['enabled'] = array(
+    $form['enabled'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Enable menu link'),
       '#description' => $this->t('Menu links that are not enabled will not be listed in any menu.'),
       '#default_value' => $this->menuLink->isEnabled(),
-    );
+    ];
 
-    $form['expanded'] = array(
+    $form['expanded'] = [
       '#type' => 'checkbox',
       '#title' => t('Show as expanded'),
       '#description' => $this->t('If selected and this menu link has children, the menu will always appear expanded.'),
       '#default_value' => $this->menuLink->isExpanded(),
-    );
+    ];
 
     $menu_parent = $this->menuLink->getMenuName() . ':' . $this->menuLink->getParent();
     $form['menu_parent'] = $this->menuParentSelector->parentSelectElement($menu_parent, $this->menuLink->getPluginId());
@@ -141,14 +141,14 @@ class MenuLinkDefaultForm implements MenuLinkFormInterface, ContainerInjectionIn
     $form['menu_parent']['#attributes']['class'][] = 'menu-title-select';
 
     $delta = max(abs($this->menuLink->getWeight()), 50);
-    $form['weight'] = array(
+    $form['weight'] = [
       '#type' => 'number',
       '#min' => -$delta,
       '#max' => $delta,
       '#default_value' => $this->menuLink->getWeight(),
       '#title' => $this->t('Weight'),
       '#description' => $this->t('Link weight among links in the same menu at the same depth. In the menu, the links with high weight will sink and links with a low weight will be positioned nearer the top.'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/lib/Drupal/Core/Menu/LocalActionDefault.php b/web/core/lib/Drupal/Core/Menu/LocalActionDefault.php
index bfa088e0a..ab562e6dd 100644
--- a/web/core/lib/Drupal/Core/Menu/LocalActionDefault.php
+++ b/web/core/lib/Drupal/Core/Menu/LocalActionDefault.php
@@ -83,7 +83,7 @@ class LocalActionDefault extends PluginBase implements LocalActionInterface, Con
    * {@inheritdoc}
    */
   public function getRouteParameters(RouteMatchInterface $route_match) {
-    $parameters = isset($this->pluginDefinition['route_parameters']) ? $this->pluginDefinition['route_parameters'] : array();
+    $parameters = isset($this->pluginDefinition['route_parameters']) ? $this->pluginDefinition['route_parameters'] : [];
     $route = $this->routeProvider->getRouteByName($this->getRouteName());
     $variables = $route->compile()->getVariables();
 
diff --git a/web/core/lib/Drupal/Core/Menu/LocalActionManager.php b/web/core/lib/Drupal/Core/Menu/LocalActionManager.php
index 924af7c4a..f262d4724 100644
--- a/web/core/lib/Drupal/Core/Menu/LocalActionManager.php
+++ b/web/core/lib/Drupal/Core/Menu/LocalActionManager.php
@@ -28,7 +28,7 @@ class LocalActionManager extends DefaultPluginManager implements LocalActionMana
    *
    * @var array
    */
-  protected $defaults = array(
+  protected $defaults = [
     // The plugin id. Set by the plugin system based on the top-level YAML key.
     'id' => NULL,
     // The static title for the local action.
@@ -38,14 +38,14 @@ class LocalActionManager extends DefaultPluginManager implements LocalActionMana
     // (Required) the route name used to generate a link.
     'route_name' => NULL,
     // Default route parameters for generating links.
-    'route_parameters' => array(),
+    'route_parameters' => [],
     // Associative array of link options.
-    'options' => array(),
+    'options' => [],
     // The route names where this local action appears.
-    'appears_on' => array(),
+    'appears_on' => [],
     // Default class for local action implementations.
     'class' => 'Drupal\Core\Menu\LocalActionDefault',
-  );
+  ];
 
   /**
    * A controller resolver object.
@@ -94,7 +94,7 @@ class LocalActionManager extends DefaultPluginManager implements LocalActionMana
    *
    * @var \Drupal\Core\Menu\LocalActionInterface[]
    */
-  protected $instances = array();
+  protected $instances = [];
 
   /**
    * Constructs a LocalActionManager object.
@@ -130,7 +130,7 @@ class LocalActionManager extends DefaultPluginManager implements LocalActionMana
     $this->moduleHandler = $module_handler;
     $this->account = $account;
     $this->alterInfo('menu_local_actions');
-    $this->setCacheBackend($cache_backend, 'local_action_plugins:' . $language_manager->getCurrentLanguage()->getId(), array('local_action'));
+    $this->setCacheBackend($cache_backend, 'local_action_plugins:' . $language_manager->getCurrentLanguage()->getId(), ['local_action']);
   }
 
   /**
@@ -149,7 +149,7 @@ class LocalActionManager extends DefaultPluginManager implements LocalActionMana
    * {@inheritdoc}
    */
   public function getTitle(LocalActionInterface $local_action) {
-    $controller = array($local_action, 'getTitle');
+    $controller = [$local_action, 'getTitle'];
     $arguments = $this->controllerResolver->getArguments($this->requestStack->getCurrentRequest(), $controller);
     return call_user_func_array($controller, $arguments);
   }
@@ -159,8 +159,8 @@ class LocalActionManager extends DefaultPluginManager implements LocalActionMana
    */
   public function getActionsForRoute($route_appears) {
     if (!isset($this->instances[$route_appears])) {
-      $route_names = array();
-      $this->instances[$route_appears] = array();
+      $route_names = [];
+      $this->instances[$route_appears] = [];
       // @todo - optimize this lookup by compiling or caching.
       foreach ($this->getDefinitions() as $plugin_id => $action_info) {
         if (in_array($route_appears, $action_info['appears_on'])) {
@@ -175,23 +175,23 @@ class LocalActionManager extends DefaultPluginManager implements LocalActionMana
         $this->routeProvider->getRoutesByNames($route_names);
       }
     }
-    $links = array();
+    $links = [];
     /** @var $plugin \Drupal\Core\Menu\LocalActionInterface */
     foreach ($this->instances[$route_appears] as $plugin_id => $plugin) {
       $cacheability = new CacheableMetadata();
       $route_name = $plugin->getRouteName();
       $route_parameters = $plugin->getRouteParameters($this->routeMatch);
       $access = $this->accessManager->checkNamedRoute($route_name, $route_parameters, $this->account, TRUE);
-      $links[$plugin_id] = array(
+      $links[$plugin_id] = [
         '#theme' => 'menu_local_action',
-        '#link' => array(
+        '#link' => [
           'title' => $this->getTitle($plugin),
           'url' => Url::fromRoute($route_name, $route_parameters),
           'localized_options' => $plugin->getOptions($this->routeMatch),
-        ),
+        ],
         '#access' => $access,
         '#weight' => $plugin->getWeight(),
-      );
+      ];
       $cacheability->addCacheableDependency($access)->addCacheableDependency($plugin);
       $cacheability->applyTo($links[$plugin_id]);
     }
diff --git a/web/core/lib/Drupal/Core/Menu/LocalTaskDefault.php b/web/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
index 38534b119..30fba4fb4 100644
--- a/web/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
+++ b/web/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
@@ -41,7 +41,7 @@ class LocalTaskDefault extends PluginBase implements LocalTaskInterface, Cacheab
    * {@inheritdoc}
    */
   public function getRouteParameters(RouteMatchInterface $route_match) {
-    $parameters = isset($this->pluginDefinition['route_parameters']) ? $this->pluginDefinition['route_parameters'] : array();
+    $parameters = isset($this->pluginDefinition['route_parameters']) ? $this->pluginDefinition['route_parameters'] : [];
     $route = $this->routeProvider()->getRouteByName($this->getRouteName());
     $variables = $route->compile()->getVariables();
 
diff --git a/web/core/lib/Drupal/Core/Menu/LocalTaskManager.php b/web/core/lib/Drupal/Core/Menu/LocalTaskManager.php
index 26b2ed5b1..c14d1de1a 100644
--- a/web/core/lib/Drupal/Core/Menu/LocalTaskManager.php
+++ b/web/core/lib/Drupal/Core/Menu/LocalTaskManager.php
@@ -29,11 +29,11 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
   /**
    * {@inheritdoc}
    */
-  protected $defaults = array(
+  protected $defaults = [
     // (required) The name of the route this task links to.
     'route_name' => '',
     // Parameters for route variables when generating a link.
-    'route_parameters' => array(),
+    'route_parameters' => [],
     // The static title for the local task.
     'title' => '',
     // The route name where the root tab appears.
@@ -43,12 +43,12 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
     // The weight of the tab.
     'weight' => NULL,
     // The default link options.
-    'options' => array(),
+    'options' => [],
     // Default class for local task implementations.
     'class' => 'Drupal\Core\Menu\LocalTaskDefault',
     // The plugin id. Set by the plugin system based on the top-level YAML key.
     'id' => '',
-  );
+  ];
 
   /**
    * A controller resolver object.
@@ -76,7 +76,7 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
    *
    * @var array
    */
-  protected $instances = array();
+  protected $instances = [];
 
   /**
    * The local task render arrays for the current route.
@@ -138,7 +138,7 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
     $this->account = $account;
     $this->moduleHandler = $module_handler;
     $this->alterInfo('local_tasks');
-    $this->setCacheBackend($cache, 'local_task_plugins:' . $language_manager->getCurrentLanguage()->getId(), array('local_task'));
+    $this->setCacheBackend($cache, 'local_task_plugins:' . $language_manager->getCurrentLanguage()->getId(), ['local_task']);
   }
 
   /**
@@ -168,7 +168,7 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
    * {@inheritdoc}
    */
   public function getTitle(LocalTaskInterface $local_task) {
-    $controller = array($local_task, 'getTitle');
+    $controller = [$local_task, 'getTitle'];
     $request = $this->requestStack->getCurrentRequest();
     $arguments = $this->controllerResolver->getArguments($request, $controller);
     return call_user_func_array($controller, $arguments);
@@ -196,7 +196,7 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
    */
   public function getLocalTasksForRoute($route_name) {
     if (!isset($this->instances[$route_name])) {
-      $this->instances[$route_name] = array();
+      $this->instances[$route_name] = [];
       if ($cache = $this->cacheBackend->get($this->cacheKey . ':' . $route_name)) {
         $base_routes = $cache->data['base_routes'];
         $parents = $cache->data['parents'];
@@ -206,9 +206,9 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
         $definitions = $this->getDefinitions();
         // We build the hierarchy by finding all tabs that should
         // appear on the current route.
-        $base_routes = array();
-        $parents = array();
-        $children = array();
+        $base_routes = [];
+        $parents = [];
+        $children = [];
         foreach ($definitions as $plugin_id => $task_info) {
           // Fill in the base_route from the parent to insure consistency.
           if (!empty($task_info['parent_id']) && !empty($definitions[$task_info['parent_id']])) {
@@ -242,11 +242,11 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
             }
           }
         }
-        $data = array(
+        $data = [
           'base_routes' => $base_routes,
           'parents' => $parents,
           'children' => $children,
-        );
+        ];
         $this->cacheBackend->set($this->cacheKey . ':' . $route_name, $data, Cache::PERMANENT, $this->cacheTags);
       }
       // Create a plugin instance for each element of the hierarchy.
@@ -288,10 +288,10 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
    */
   public function getTasksBuild($current_route_name, RefinableCacheableDependencyInterface &$cacheability) {
     $tree = $this->getLocalTasksForRoute($current_route_name);
-    $build = array();
+    $build = [];
 
     // Collect all route names.
-    $route_names = array();
+    $route_names = [];
     foreach ($tree as $instances) {
       foreach ($instances as $child) {
         $route_names[] = $child->getRouteName();
diff --git a/web/core/lib/Drupal/Core/Menu/MenuActiveTrail.php b/web/core/lib/Drupal/Core/Menu/MenuActiveTrail.php
index b99a0e48c..353a8143d 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuActiveTrail.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuActiveTrail.php
@@ -98,7 +98,7 @@ class MenuActiveTrail extends CacheCollector implements MenuActiveTrailInterface
   protected function doGetActiveTrailIds($menu_name) {
     // Parent ids; used both as key and value to ensure uniqueness.
     // We always want all the top-level links with parent == ''.
-    $active_trail = array('' => '');
+    $active_trail = ['' => ''];
 
     // If a link in the given menu indeed matches the route, then use it to
     // complete the active trail.
diff --git a/web/core/lib/Drupal/Core/Menu/MenuLinkBase.php b/web/core/lib/Drupal/Core/Menu/MenuLinkBase.php
index 760ced22b..c61b5db0a 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuLinkBase.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuLinkBase.php
@@ -19,7 +19,7 @@ abstract class MenuLinkBase extends PluginBase implements MenuLinkInterface {
    *
    * @var array
    */
-  protected $overrideAllowed = array();
+  protected $overrideAllowed = [];
 
   /**
    * {@inheritdoc}
@@ -92,14 +92,14 @@ abstract class MenuLinkBase extends PluginBase implements MenuLinkInterface {
    * {@inheritdoc}
    */
   public function getOptions() {
-    return $this->pluginDefinition['options'] ?: array();
+    return $this->pluginDefinition['options'] ?: [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getMetaData() {
-    return $this->pluginDefinition['metadata'] ?: array();
+    return $this->pluginDefinition['metadata'] ?: [];
   }
 
   /**
@@ -113,7 +113,7 @@ abstract class MenuLinkBase extends PluginBase implements MenuLinkInterface {
    * {@inheritdoc}
    */
   public function getRouteParameters() {
-    return isset($this->pluginDefinition['route_parameters']) ? $this->pluginDefinition['route_parameters'] : array();
+    return isset($this->pluginDefinition['route_parameters']) ? $this->pluginDefinition['route_parameters'] : [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Menu/MenuLinkDefault.php b/web/core/lib/Drupal/Core/Menu/MenuLinkDefault.php
index 0dda7e167..80a02cdb7 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuLinkDefault.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuLinkDefault.php
@@ -13,13 +13,13 @@ class MenuLinkDefault extends MenuLinkBase implements ContainerFactoryPluginInte
   /**
    * {@inheritdoc}
    */
-  protected $overrideAllowed = array(
+  protected $overrideAllowed = [
     'menu_name' => 1,
     'parent' => 1,
     'weight' => 1,
     'expanded' => 1,
     'enabled' => 1,
-  );
+  ];
 
   /**
    * The static menu link service used to store updates to weight/parent etc.
diff --git a/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php b/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php
index 15b2e4d7c..e9cd165be 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php
@@ -26,13 +26,13 @@ class MenuLinkManager implements MenuLinkManagerInterface {
    *
    * @var array
    */
-  protected $defaults = array(
+  protected $defaults = [
     // (required) The name of the menu for this link.
     'menu_name' => 'tools',
     // (required) The name of the route this links to, unless it's external.
     'route_name' => '',
     // Parameters for route variables when generating a link.
-    'route_parameters' => array(),
+    'route_parameters' => [],
     // The external URL if this link has one (required if route_name is empty).
     'url' => '',
     // The static title for the menu link. If this came from a YAML definition
@@ -46,18 +46,18 @@ class MenuLinkManager implements MenuLinkManagerInterface {
     // The weight of the link.
     'weight' => 0,
     // The default link options.
-    'options' => array(),
+    'options' => [],
     'expanded' => 0,
     'enabled' => 1,
     // The name of the module providing this link.
     'provider' => '',
-    'metadata' => array(),
+    'metadata' => [],
     // Default class for local task implementations.
     'class' => 'Drupal\Core\Menu\MenuLinkDefault',
     'form_class' => 'Drupal\Core\Menu\Form\MenuLinkDefaultForm',
     // The plugin ID. Set by the plugin system based on the top-level YAML key.
     'id' => '',
-  );
+  ];
 
   /**
    * The object that discovers plugins managed by this manager.
@@ -231,7 +231,7 @@ class MenuLinkManager implements MenuLinkManagerInterface {
    * @throws \Drupal\Component\Plugin\Exception\PluginException
    *   If the instance cannot be created, such as if the ID is invalid.
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     return $this->getFactory()->createInstance($plugin_id, $configuration);
   }
 
@@ -248,7 +248,7 @@ class MenuLinkManager implements MenuLinkManagerInterface {
    * {@inheritdoc}
    */
   public function deleteLinksInMenu($menu_name) {
-    foreach ($this->treeStorage->loadByProperties(array('menu_name' => $menu_name)) as $plugin_id => $definition) {
+    foreach ($this->treeStorage->loadByProperties(['menu_name' => $menu_name]) as $plugin_id => $definition) {
       $instance = $this->createInstance($plugin_id);
       if ($instance->isDeletable()) {
         $this->deleteInstance($instance, TRUE);
@@ -333,8 +333,8 @@ class MenuLinkManager implements MenuLinkManagerInterface {
   /**
    * {@inheritdoc}
    */
-  public function loadLinksByRoute($route_name, array $route_parameters = array(), $menu_name = NULL) {
-    $instances = array();
+  public function loadLinksByRoute($route_name, array $route_parameters = [], $menu_name = NULL) {
+    $instances = [];
     $loaded = $this->treeStorage->loadByRoute($route_name, $route_parameters, $menu_name);
     foreach ($loaded as $plugin_id => $definition) {
       $instances[$plugin_id] = $this->createInstance($plugin_id);
diff --git a/web/core/lib/Drupal/Core/Menu/MenuLinkManagerInterface.php b/web/core/lib/Drupal/Core/Menu/MenuLinkManagerInterface.php
index c64c47f42..d415570de 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuLinkManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuLinkManagerInterface.php
@@ -72,7 +72,7 @@ interface MenuLinkManagerInterface extends PluginManagerInterface {
    * @return \Drupal\Core\Menu\MenuLinkInterface[]
    *   An array of instances keyed by plugin ID.
    */
-  public function loadLinksByRoute($route_name, array $route_parameters = array(), $menu_name = NULL);
+  public function loadLinksByRoute($route_name, array $route_parameters = [], $menu_name = NULL);
 
   /**
    * Adds a new menu link definition to the menu tree storage.
diff --git a/web/core/lib/Drupal/Core/Menu/MenuLinkTree.php b/web/core/lib/Drupal/Core/Menu/MenuLinkTree.php
index 72e8ee9df..8dd4c51c9 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuLinkTree.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuLinkTree.php
@@ -107,7 +107,7 @@ class MenuLinkTree implements MenuLinkTreeInterface {
    *   An array containing the elements of a menu tree.
    */
   protected function createInstances(array $data_tree) {
-    $tree = array();
+    $tree = [];
     foreach ($data_tree as $key => $element) {
       $subtree = $this->createInstances($element['subtree']);
       // Build a MenuLinkTreeElement out of the menu tree link definition:
@@ -202,7 +202,7 @@ class MenuLinkTree implements MenuLinkTreeInterface {
    * @throws \DomainException
    */
   protected function buildItems(array $tree, CacheableMetadata &$tree_access_cacheability, CacheableMetadata &$tree_link_cacheability) {
-    $items = array();
+    $items = [];
 
     foreach ($tree as $data) {
       /** @var \Drupal\Core\Menu\MenuLinkInterface $link */
@@ -262,7 +262,7 @@ class MenuLinkTree implements MenuLinkTreeInterface {
       $element['title'] = $link->getTitle();
       $element['url'] = $link->getUrlObject();
       $element['url']->setOption('set_active_class', TRUE);
-      $element['below'] = $data->subtree ? $this->buildItems($data->subtree, $tree_access_cacheability, $tree_link_cacheability) : array();
+      $element['below'] = $data->subtree ? $this->buildItems($data->subtree, $tree_access_cacheability, $tree_link_cacheability) : [];
       if (isset($data->options)) {
         $element['url']->setOptions(NestedArray::mergeDeep($element['url']->getOptions(), $data->options));
       }
diff --git a/web/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php b/web/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php
index e7e12c42b..f58dd913b 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuLinkTreeElement.php
@@ -79,7 +79,7 @@ class MenuLinkTreeElement {
    * \Drupal\Core\Menu\MenuLinkInterface::getOptions(), to allow menu link tree
    * manipulators to add or override link options.
    */
-  public $options = array();
+  public $options = [];
 
   /**
    * Constructs a new \Drupal\Core\Menu\MenuLinkTreeElement.
diff --git a/web/core/lib/Drupal/Core/Menu/MenuParentFormSelector.php b/web/core/lib/Drupal/Core/Menu/MenuParentFormSelector.php
index b112104b3..8add3b06f 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuParentFormSelector.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuParentFormSelector.php
@@ -54,7 +54,7 @@ class MenuParentFormSelector implements MenuParentFormSelectorInterface {
       $menus = $this->getMenuOptions();
     }
 
-    $options = array();
+    $options = [];
     $depth_limit = $this->getParentDepthLimit($id);
     foreach ($menus as $menu_name => $menu_title) {
       $options[$menu_name . ':'] = '<' . $menu_title . '>';
@@ -62,11 +62,11 @@ class MenuParentFormSelector implements MenuParentFormSelectorInterface {
       $parameters = new MenuTreeParameters();
       $parameters->setMaxDepth($depth_limit);
       $tree = $this->menuLinkTree->load($menu_name, $parameters);
-      $manipulators = array(
-        array('callable' => 'menu.default_tree_manipulators:checkNodeAccess'),
-        array('callable' => 'menu.default_tree_manipulators:checkAccess'),
-        array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
-      );
+      $manipulators = [
+        ['callable' => 'menu.default_tree_manipulators:checkNodeAccess'],
+        ['callable' => 'menu.default_tree_manipulators:checkAccess'],
+        ['callable' => 'menu.default_tree_manipulators:generateIndexAndSort'],
+      ];
       $tree = $this->menuLinkTree->transform($tree, $manipulators);
       $this->parentSelectOptionsTreeWalk($tree, $menu_name, '--', $options, $id, $depth_limit, $cacheability);
     }
@@ -81,10 +81,10 @@ class MenuParentFormSelector implements MenuParentFormSelectorInterface {
     $options = $this->getParentSelectOptions($id, $menus, $options_cacheability);
     // If no options were found, there is nothing to select.
     if ($options) {
-      $element = array(
+      $element = [
         '#type' => 'select',
         '#options' => $options,
-      );
+      ];
       if (!isset($options[$menu_parent])) {
         // The requested menu parent cannot be found in the menu anymore. Try
         // setting it to the top level in the current menu.
@@ -93,12 +93,12 @@ class MenuParentFormSelector implements MenuParentFormSelectorInterface {
       }
       if (isset($options[$menu_parent])) {
         // Only provide the default value if it is valid among the options.
-        $element += array('#default_value' => $menu_parent);
+        $element += ['#default_value' => $menu_parent];
       }
       $options_cacheability->applyTo($element);
       return $element;
     }
-    return array();
+    return [];
   }
 
   /**
@@ -183,7 +183,7 @@ class MenuParentFormSelector implements MenuParentFormSelectorInterface {
    */
   protected function getMenuOptions(array $menu_names = NULL) {
     $menus = $this->entityManager->getStorage('menu')->loadMultiple($menu_names);
-    $options = array();
+    $options = [];
     /** @var \Drupal\system\MenuInterface[] $menus */
     foreach ($menus as $menu) {
       $options[$menu->id()] = $menu->label();
diff --git a/web/core/lib/Drupal/Core/Menu/MenuTreeParameters.php b/web/core/lib/Drupal/Core/Menu/MenuTreeParameters.php
index cb2107328..702dcb497 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuTreeParameters.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuTreeParameters.php
@@ -50,7 +50,7 @@ class MenuTreeParameters {
    *
    * @var string[]
    */
-  public $expandedParents = array();
+  public $expandedParents = [];
 
   /**
    * The IDs from the currently active menu link to the root of the whole tree.
@@ -62,7 +62,7 @@ class MenuTreeParameters {
    *
    * @var string[]
    */
-  public $activeTrail = array();
+  public $activeTrail = [];
 
   /**
    * The conditions used to restrict which links are loaded.
@@ -71,7 +71,7 @@ class MenuTreeParameters {
    *
    * @var array
    */
-  public $conditions = array();
+  public $conditions = [];
 
   /**
    * Sets a root for menu tree loading.
@@ -170,7 +170,7 @@ class MenuTreeParameters {
       $this->conditions[$definition_field] = $value;
     }
     else {
-      $this->conditions[$definition_field] = array($value, $operator);
+      $this->conditions[$definition_field] = [$value, $operator];
     }
     return $this;
   }
diff --git a/web/core/lib/Drupal/Core/Menu/MenuTreeStorage.php b/web/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
index e2181cf1c..0b11f8688 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
@@ -55,7 +55,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    *
    * @var array
    */
-  protected $options = array();
+  protected $options = [];
 
   /**
    * Stores definitions that have already been loaded for better performance.
@@ -64,7 +64,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    *
    * @var array
    */
-  protected $definitions = array();
+  protected $definitions = [];
 
   /**
    * List of serialized fields.
@@ -83,7 +83,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    *
    * @var array
    */
-  protected $definitionFields = array(
+  protected $definitionFields = [
     'menu_name',
     'route_name',
     'route_parameters',
@@ -100,7 +100,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     'class',
     'form_class',
     'id',
-  );
+  ];
 
   /**
    * Constructs a new \Drupal\Core\Menu\MenuTreeStorage.
@@ -116,7 +116,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    * @param array $options
    *   (optional) Any additional database connection options to use in queries.
    */
-  public function __construct(Connection $connection, CacheBackendInterface $menu_cache_backend, CacheTagsInvalidatorInterface $cache_tags_invalidator, $table, array $options = array()) {
+  public function __construct(Connection $connection, CacheBackendInterface $menu_cache_backend, CacheTagsInvalidatorInterface $cache_tags_invalidator, $table, array $options = []) {
     $this->connection = $connection;
     $this->menuCacheBackend = $menu_cache_backend;
     $this->cacheTagsInvalidator = $cache_tags_invalidator;
@@ -135,16 +135,16 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    * {@inheritdoc}
    */
   public function resetDefinitions() {
-    $this->definitions = array();
+    $this->definitions = [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function rebuild(array $definitions) {
-    $links = array();
-    $children = array();
-    $top_links = array();
+    $links = [];
+    $children = [];
+    $top_links = [];
     // Fetch the list of existing menus, in case some are not longer populated
     // after the rebuild.
     $before_menus = $this->getMenuNames();
@@ -214,7 +214,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     $loaded = $this->loadFullMultiple($ids);
     foreach ($loaded as $id => $link) {
       if ($link['has_children']) {
-        $children = $this->loadByProperties(array('parent' => $id));
+        $children = $this->loadByProperties(['parent' => $id]);
         foreach ($children as $child) {
           $child['parent'] = $link['parent'];
           $this->save($child);
@@ -286,7 +286,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     // @todo Should we just return here if the link values match the original
     //   values completely?
     //   https://www.drupal.org/node/2302137
-    $affected_menus = array();
+    $affected_menus = [];
 
     $transaction = $this->connection->startTransaction();
     try {
@@ -297,9 +297,9 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
       }
       else {
         // Generate a new mlid.
-        $options = array('return' => Database::RETURN_INSERT_ID) + $this->options;
+        $options = ['return' => Database::RETURN_INSERT_ID] + $this->options;
         $link['mlid'] = $this->connection->insert($this->table, $options)
-          ->fields(array('id' => $link['id'], 'menu_name' => $link['menu_name']))
+          ->fields(['id' => $link['id'], 'menu_name' => $link['menu_name']])
           ->execute();
       }
       $fields = $this->preSave($link, $original);
@@ -315,7 +315,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
       $this->updateParentalStatus($link);
     }
     catch (\Exception $e) {
-      $transaction->rollback();
+      $transaction->rollBack();
       throw $e;
     }
     return $affected_menus;
@@ -401,7 +401,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     // It's possible the link is already deleted.
     if ($item) {
       $parent = $item['parent'];
-      $children = $this->loadByProperties(array('parent' => $id));
+      $children = $this->loadByProperties(['parent' => $id]);
       foreach ($children as $child) {
         $child['parent'] = $parent;
         $this->save($child);
@@ -512,18 +512,18 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
   protected function moveChildren($fields, $original) {
     $query = $this->connection->update($this->table, $this->options);
 
-    $query->fields(array('menu_name' => $fields['menu_name']));
+    $query->fields(['menu_name' => $fields['menu_name']]);
 
-    $expressions = array();
+    $expressions = [];
     for ($i = 1; $i <= $fields['depth']; $i++) {
-      $expressions[] = array("p$i", ":p_$i", array(":p_$i" => $fields["p$i"]));
+      $expressions[] = ["p$i", ":p_$i", [":p_$i" => $fields["p$i"]]];
     }
     $j = $original['depth'] + 1;
     while ($i <= $this->maxDepth() && $j <= $this->maxDepth()) {
-      $expressions[] = array('p' . $i++, 'p' . $j++, array());
+      $expressions[] = ['p' . $i++, 'p' . $j++, []];
     }
     while ($i <= $this->maxDepth()) {
-      $expressions[] = array('p' . $i++, 0, array());
+      $expressions[] = ['p' . $i++, 0, []];
     }
 
     $shift = $fields['depth'] - $original['depth'];
@@ -538,7 +538,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
       $query->expression($expression[0], $expression[1], $expression[2]);
     }
 
-    $query->expression('depth', 'depth + :depth', array(':depth' => $shift));
+    $query->expression('depth', 'depth + :depth', [':depth' => $shift]);
     $query->condition('menu_name', $original['menu_name']);
 
     for ($i = 1; $i <= $this->maxDepth() && $original["p$i"]; $i++) {
@@ -569,7 +569,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     }
 
     // If we have a parent link ID, try to use that.
-    $candidates = array();
+    $candidates = [];
     if (isset($link['parent'])) {
       $candidates[] = $link['parent'];
     }
@@ -607,7 +607,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
 
       $parent_has_children = ((bool) $query->execute()->fetchField()) ? 1 : 0;
       $this->connection->update($this->table, $this->options)
-        ->fields(array('has_children' => $parent_has_children))
+        ->fields(['has_children' => $parent_has_children])
         ->condition('id', $link['parent'])
         ->execute();
     }
@@ -660,7 +660,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
   /**
    * {@inheritdoc}
    */
-  public function loadByRoute($route_name, array $route_parameters = array(), $menu_name = NULL) {
+  public function loadByRoute($route_name, array $route_parameters = [], $menu_name = NULL) {
     // Sort the route parameters so that the query string will be the same.
     asort($route_parameters);
     // Since this will be urlencoded, it's safe to store and match against a
@@ -711,7 +711,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     if (isset($this->definitions[$id])) {
       return $this->definitions[$id];
     }
-    $loaded = $this->loadMultiple(array($id));
+    $loaded = $this->loadMultiple([$id]);
     return isset($loaded[$id]) ? $loaded[$id] : FALSE;
   }
 
@@ -725,8 +725,8 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    *   The loaded menu link definition or an empty array if not be found.
    */
   protected function loadFull($id) {
-    $loaded = $this->loadFullMultiple(array($id));
-    return isset($loaded[$id]) ? $loaded[$id] : array();
+    $loaded = $this->loadFullMultiple([$id]);
+    return isset($loaded[$id]) ? $loaded[$id] : [];
   }
 
   /**
@@ -761,20 +761,20 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     // @todo Consider making this dynamic based on static::MAX_DEPTH or from the
     //   schema if that is generated using static::MAX_DEPTH.
     //   https://www.drupal.org/node/2302043
-    $subquery->fields($this->table, array('p1', 'p2', 'p3', 'p4', 'p5', 'p6', 'p7', 'p8', 'p9'));
+    $subquery->fields($this->table, ['p1', 'p2', 'p3', 'p4', 'p5', 'p6', 'p7', 'p8', 'p9']);
     $subquery->condition('id', $id);
     $result = current($subquery->execute()->fetchAll(\PDO::FETCH_ASSOC));
     $ids = array_filter($result);
     if ($ids) {
       $query = $this->connection->select($this->table, $this->options);
-      $query->fields($this->table, array('id'));
+      $query->fields($this->table, ['id']);
       $query->orderBy('depth', 'DESC');
       $query->condition('mlid', $ids, 'IN');
       // @todo Cache this result in memory if we find it is being used more
       //   than once per page load. https://www.drupal.org/node/2302185
       return $this->safeExecuteSelect($query)->fetchAllKeyed(0, 0);
     }
-    return array();
+    return [];
   }
 
   /**
@@ -785,7 +785,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     //   expanded links? https://www.drupal.org/node/2302187
     do {
       $query = $this->connection->select($this->table, $this->options);
-      $query->fields($this->table, array('id'));
+      $query->fields($this->table, ['id']);
       $query->condition('menu_name', $menu_name);
       $query->condition('expanded', 1);
       $query->condition('has_children', 1);
@@ -843,7 +843,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     else {
       $links = $this->loadLinks($menu_name, $parameters);
       $data['tree'] = $this->doBuildTreeData($links, $parameters->activeTrail, $parameters->minDepth);
-      $data['definitions'] = array();
+      $data['definitions'] = [];
       $data['route_names'] = $this->collectRoutesAndDefinitions($data['tree'], $data['definitions']);
       $this->menuCacheBackend->set($tree_cid, $data, Cache::PERMANENT, ['config:system.menu.' . $menu_name]);
       // The definitions were already added to $this->definitions in
@@ -880,7 +880,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
 
       // If the custom root does not exist, we cannot load the links below it.
       if (!$root) {
-        return array();
+        return [];
       }
 
       // When specifying a custom root, we only want to find links whose
@@ -986,7 +986,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    *   The collected route names.
    */
   protected function doCollectRoutesAndDefinitions(array $tree, array &$definitions) {
-    $route_names = array();
+    $route_names = [];
     foreach (array_keys($tree) as $id) {
       $definitions[$id] = $this->definitions[$id];
       if (!empty($definition['route_name'])) {
@@ -1003,7 +1003,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    * {@inheritdoc}
    */
   public function loadSubtreeData($id, $max_relative_depth = NULL) {
-    $tree = array();
+    $tree = [];
     $root = $this->loadFull($id);
     if (!$root) {
       return $tree;
@@ -1051,10 +1051,10 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
   public function getAllChildIds($id) {
     $root = $this->loadFull($id);
     if (!$root) {
-      return array();
+      return [];
     }
     $query = $this->connection->select($this->table, $this->options);
-    $query->fields($this->table, array('id'));
+    $query->fields($this->table, ['id']);
     $query->condition('menu_name', $root['menu_name']);
     for ($i = 1; $i <= $root['depth']; $i++) {
       $query->condition("p$i", $root["p$i"]);
@@ -1080,7 +1080,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
   /**
    * Prepares the data for calling $this->treeDataRecursive().
    */
-  protected function doBuildTreeData(array $links, array $parents = array(), $depth = 1) {
+  protected function doBuildTreeData(array $links, array $parents = [], $depth = 1) {
     // Reverse the array so we can use the more efficient array_pop() function.
     $links = array_reverse($links);
     return $this->treeDataRecursive($links, $parents, $depth);
@@ -1109,17 +1109,17 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    * @see \Drupal\Core\Menu\MenuTreeStorage::loadTreeData()
    */
   protected function treeDataRecursive(array &$links, array $parents, $depth) {
-    $tree = array();
+    $tree = [];
     while ($tree_link_definition = array_pop($links)) {
-      $tree[$tree_link_definition['id']] = array(
+      $tree[$tree_link_definition['id']] = [
         'definition' => $this->prepareLink($tree_link_definition, TRUE),
         'has_children' => $tree_link_definition['has_children'],
         // We need to determine if we're on the path to root so we can later
         // build the correct active trail.
         'in_active_trail' => in_array($tree_link_definition['id'], $parents),
-        'subtree' => array(),
+        'subtree' => [],
         'depth' => $tree_link_definition['depth'],
-      );
+      ];
       // Look ahead to the next link, but leave it on the array so it's
       // available to other recursive function calls if we return or build a
       // sub-tree.
@@ -1202,211 +1202,211 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    *   The schema API definition for the SQL storage table.
    */
   protected static function schemaDefinition() {
-    $schema = array(
+    $schema = [
       'description' => 'Contains the menu tree hierarchy.',
-      'fields' => array(
-        'menu_name' => array(
+      'fields' => [
+        'menu_name' => [
           'description' => "The menu name. All links with the same menu name (such as 'tools') are part of the same menu.",
           'type' => 'varchar_ascii',
           'length' => 32,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'mlid' => array(
+        ],
+        'mlid' => [
           'description' => 'The menu link ID (mlid) is the integer primary key.',
           'type' => 'serial',
           'unsigned' => TRUE,
           'not null' => TRUE,
-        ),
-        'id' => array(
+        ],
+        'id' => [
           'description' => 'Unique machine name: the plugin ID.',
           'type' => 'varchar_ascii',
           'length' => 255,
           'not null' => TRUE,
-        ),
-        'parent' => array(
+        ],
+        'parent' => [
           'description' => 'The plugin ID for the parent of this link.',
           'type' => 'varchar_ascii',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'route_name' => array(
+        ],
+        'route_name' => [
           'description' => 'The machine name of a defined Symfony Route this menu item represents.',
           'type' => 'varchar_ascii',
           'length' => 255,
-        ),
-        'route_param_key' => array(
+        ],
+        'route_param_key' => [
           'description' => 'An encoded string of route parameters for loading by route.',
           'type' => 'varchar',
           'length' => 255,
-        ),
-        'route_parameters' => array(
+        ],
+        'route_parameters' => [
           'description' => 'Serialized array of route parameters of this menu link.',
           'type' => 'blob',
           'size' => 'big',
           'not null' => FALSE,
           'serialize' => TRUE,
-        ),
-        'url' => array(
+        ],
+        'url' => [
           'description' => 'The external path this link points to (when not using a route).',
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'title' => array(
+        ],
+        'title' => [
           'description' => 'The serialized title for the link. May be a TranslatableMarkup.',
           'type' => 'blob',
           'size' => 'big',
           'not null' => FALSE,
           'serialize' => TRUE,
-        ),
-        'description' => array(
+        ],
+        'description' => [
           'description' => 'The serialized description of this link - used for admin pages and title attribute. May be a TranslatableMarkup.',
           'type' => 'blob',
           'size' => 'big',
           'not null' => FALSE,
           'serialize' => TRUE,
-        ),
-        'class' => array(
+        ],
+        'class' => [
           'description' => 'The class for this link plugin.',
           'type' => 'text',
           'not null' => FALSE,
-        ),
-        'options' => array(
+        ],
+        'options' => [
           'description' => 'A serialized array of URL options, such as a query string or HTML attributes.',
           'type' => 'blob',
           'size' => 'big',
           'not null' => FALSE,
           'serialize' => TRUE,
-        ),
-        'provider' => array(
+        ],
+        'provider' => [
           'description' => 'The name of the module that generated this link.',
           'type' => 'varchar_ascii',
           'length' => DRUPAL_EXTENSION_NAME_MAX_LENGTH,
           'not null' => TRUE,
           'default' => 'system',
-        ),
-        'enabled' => array(
+        ],
+        'enabled' => [
           'description' => 'A flag for whether the link should be rendered in menus. (0 = a disabled menu item that may be shown on admin screens, 1 = a normal, visible link)',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 1,
           'size' => 'small',
-        ),
-        'discovered' => array(
+        ],
+        'discovered' => [
           'description' => 'A flag for whether the link was discovered, so can be purged on rebuild',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
           'size' => 'small',
-        ),
-        'expanded' => array(
+        ],
+        'expanded' => [
           'description' => 'Flag for whether this link should be rendered as expanded in menus - expanded links always have their child links displayed, instead of only when the link is in the active trail (1 = expanded, 0 = not expanded)',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
           'size' => 'small',
-        ),
-        'weight' => array(
+        ],
+        'weight' => [
           'description' => 'Link weight among links in the same menu at the same depth.',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'metadata' => array(
+        ],
+        'metadata' => [
           'description' => 'A serialized array of data that may be used by the plugin instance.',
           'type' => 'blob',
           'size' => 'big',
           'not null' => FALSE,
           'serialize' => TRUE,
-        ),
-        'has_children' => array(
+        ],
+        'has_children' => [
           'description' => 'Flag indicating whether any enabled links have this link as a parent (1 = enabled children exist, 0 = no enabled children).',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
           'size' => 'small',
-        ),
-        'depth' => array(
+        ],
+        'depth' => [
           'description' => 'The depth relative to the top level. A link with empty parent will have depth == 1.',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
           'size' => 'small',
-        ),
-        'p1' => array(
+        ],
+        'p1' => [
           'description' => 'The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the parent link mlid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'p2' => array(
+        ],
+        'p2' => [
           'description' => 'The second mlid in the materialized path. See p1.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'p3' => array(
+        ],
+        'p3' => [
           'description' => 'The third mlid in the materialized path. See p1.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'p4' => array(
+        ],
+        'p4' => [
           'description' => 'The fourth mlid in the materialized path. See p1.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'p5' => array(
+        ],
+        'p5' => [
           'description' => 'The fifth mlid in the materialized path. See p1.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'p6' => array(
+        ],
+        'p6' => [
           'description' => 'The sixth mlid in the materialized path. See p1.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'p7' => array(
+        ],
+        'p7' => [
           'description' => 'The seventh mlid in the materialized path. See p1.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'p8' => array(
+        ],
+        'p8' => [
           'description' => 'The eighth mlid in the materialized path. See p1.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'p9' => array(
+        ],
+        'p9' => [
           'description' => 'The ninth mlid in the materialized path. See p1.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'form_class' => array(
+        ],
+        'form_class' => [
           'description' => 'meh',
           'type' => 'varchar',
           'length' => 255,
-        ),
-      ),
-      'indexes' => array(
-        'menu_parents' => array(
+        ],
+      ],
+      'indexes' => [
+        'menu_parents' => [
           'menu_name',
           'p1',
           'p2',
@@ -1417,24 +1417,24 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
           'p7',
           'p8',
           'p9',
-        ),
+        ],
         // @todo Test this index for effectiveness.
         //   https://www.drupal.org/node/2302197
-        'menu_parent_expand_child' => array(
+        'menu_parent_expand_child' => [
           'menu_name', 'expanded',
           'has_children',
-          array('parent', 16),
-        ),
-        'route_values' => array(
-          array('route_name', 32),
-          array('route_param_key', 16),
-        ),
-      ),
-      'primary key' => array('mlid'),
-      'unique keys' => array(
-        'id' => array('id'),
-      ),
-    );
+          ['parent', 16],
+        ],
+        'route_values' => [
+          ['route_name', 32],
+          ['route_param_key', 16],
+        ],
+      ],
+      'primary key' => ['mlid'],
+      'unique keys' => [
+        'id' => ['id'],
+      ],
+    ];
 
     return $schema;
   }
@@ -1459,7 +1459,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
       $result = $query->execute()->fetchCol();
     }
     else {
-      $result = array();
+      $result = [];
     }
     return $result;
   }
diff --git a/web/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php b/web/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
index 0a580d64a..0e36e13c4 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
@@ -86,7 +86,7 @@ interface MenuTreeStorageInterface {
    * @return array
    *   An array of menu link definitions keyed by ID and ordered by depth.
    */
-  public function loadByRoute($route_name, array $route_parameters = array(), $menu_name = NULL);
+  public function loadByRoute($route_name, array $route_parameters = [], $menu_name = NULL);
 
   /**
    * Saves a plugin definition to the storage.
diff --git a/web/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php b/web/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php
index a2d7591c7..07b7526ba 100644
--- a/web/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php
+++ b/web/core/lib/Drupal/Core/Menu/StaticMenuLinkOverrides.php
@@ -73,7 +73,7 @@ class StaticMenuLinkOverrides implements StaticMenuLinkOverridesInterface {
   public function loadOverride($id) {
     $all_overrides = $this->getConfig()->get('definitions');
     $id = static::encodeId($id);
-    return $id && isset($all_overrides[$id]) ? $all_overrides[$id] : array();
+    return $id && isset($all_overrides[$id]) ? $all_overrides[$id] : [];
   }
 
   /**
@@ -99,16 +99,16 @@ class StaticMenuLinkOverrides implements StaticMenuLinkOverridesInterface {
    * {@inheritdoc}
    */
   public function deleteOverride($id) {
-    return $this->deleteMultipleOverrides(array($id));
+    return $this->deleteMultipleOverrides([$id]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function loadMultipleOverrides(array $ids) {
-    $result = array();
+    $result = [];
     if ($ids) {
-      $all_overrides = $this->getConfig()->get('definitions') ?: array();
+      $all_overrides = $this->getConfig()->get('definitions') ?: [];
       foreach ($ids as $id) {
         $encoded_id = static::encodeId($id);
         if (isset($all_overrides[$encoded_id])) {
@@ -124,13 +124,13 @@ class StaticMenuLinkOverrides implements StaticMenuLinkOverridesInterface {
    */
   public function saveOverride($id, array $definition) {
     // Only allow to override a specific subset of the keys.
-    $expected = array(
+    $expected = [
       'menu_name' => '',
       'parent' => '',
       'weight' => 0,
       'expanded' => FALSE,
       'enabled' => FALSE,
-    );
+    ];
     // Filter the overrides to only those that are expected.
     $definition = array_intersect_key($definition, $expected);
     // Ensure all values are set.
@@ -173,7 +173,7 @@ class StaticMenuLinkOverrides implements StaticMenuLinkOverridesInterface {
    *   The menu plugin ID with double underscore instead of dots.
    */
   protected static function encodeId($id) {
-    return strtr($id, array('.' => '__', '__' => '___'));
+    return strtr($id, ['.' => '__', '__' => '___']);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Menu/menu.api.php b/web/core/lib/Drupal/Core/Menu/menu.api.php
index f522d3ab8..f932cf9bc 100644
--- a/web/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/web/core/lib/Drupal/Core/Menu/menu.api.php
@@ -268,20 +268,21 @@ function hook_menu_links_discovered_alter(&$links) {
   $links['user.logout']['title'] = new \Drupal\Core\StringTranslation\TranslatableMarkup('Logout');
   // Conditionally add an additional link with a title that's not translated.
   if (\Drupal::moduleHandler()->moduleExists('search')) {
-    $links['menu.api.search'] = array(
+    $links['menu.api.search'] = [
       'title' => \Drupal::config('system.site')->get('name'),
       'route_name' => 'menu.api.search',
       'description' => new \Drupal\Core\StringTranslation\TranslatableMarkup('View popular search phrases for this site.'),
       'parent' => 'system.admin_reports',
-    );
+    ];
   }
 }
 
 /**
  * Alter local tasks displayed on the page before they are rendered.
  *
- * This hook is invoked by menu_local_tasks(). The system-determined tabs and
- * actions are passed in by reference. Additional tabs may be added.
+ * This hook is invoked by \Drupal\Core\Menu\LocalTaskManager::getLocalTasks().
+ * The system-determined tabs and actions are passed in by reference. Additional
+ * tabs may be added.
  *
  * The local tasks are under the 'tabs' element and keyed by plugin ID.
  *
@@ -307,18 +308,18 @@ function hook_menu_links_discovered_alter(&$links) {
 function hook_menu_local_tasks_alter(&$data, $route_name) {
 
   // Add a tab linking to node/add to all pages.
-  $data['tabs'][0]['node.add_page'] = array(
+  $data['tabs'][0]['node.add_page'] = [
       '#theme' => 'menu_local_task',
-      '#link' => array(
+      '#link' => [
           'title' => t('Example tab'),
           'url' => Url::fromRoute('node.add_page'),
-          'localized_options' => array(
-              'attributes' => array(
+          'localized_options' => [
+              'attributes' => [
                   'title' => t('Add content'),
-              ),
-          ),
-      ),
-  );
+              ],
+          ],
+      ],
+  ];
 }
 
 /**
@@ -374,7 +375,7 @@ function hook_local_tasks_alter(&$local_tasks) {
  *   links.
  * @param string $group
  *   The group of contextual links being rendered.
- * @param array $route_parameters.
+ * @param array $route_parameters
  *   The route parameters passed to each route_name of the contextual links.
  *   For example:
  *   @code
@@ -390,7 +391,7 @@ function hook_contextual_links_alter(array &$links, $group, array $route_paramet
     // Dynamically use the menu name for the title of the menu_edit contextual
     // link.
     $menu = \Drupal::entityManager()->getStorage('menu')->load($route_parameters['menu']);
-    $links['menu_edit']['title'] = t('Edit menu: @label', array('@label' => $menu->label()));
+    $links['menu_edit']['title'] = t('Edit menu: @label', ['@label' => $menu->label()]);
   }
 }
 
diff --git a/web/core/lib/Drupal/Core/ParamConverter/AdminPathConfigEntityConverter.php b/web/core/lib/Drupal/Core/ParamConverter/AdminPathConfigEntityConverter.php
index 9420e8dbb..438eaf8ca 100644
--- a/web/core/lib/Drupal/Core/ParamConverter/AdminPathConfigEntityConverter.php
+++ b/web/core/lib/Drupal/Core/ParamConverter/AdminPathConfigEntityConverter.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\ParamConverter;
 
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Routing\AdminContext;
 use Symfony\Component\Routing\Route;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -65,7 +66,7 @@ class AdminPathConfigEntityConverter extends EntityConverter {
     // entity types will have performed this check in self::applies().
     if (strpos($definition['type'], 'entity:{') === 0) {
       $entity_type = $this->entityManager->getDefinition($entity_type_id);
-      if (!$entity_type->isSubclassOf('\Drupal\Core\Config\Entity\ConfigEntityInterface')) {
+      if (!$entity_type->entityClassImplements(ConfigEntityInterface::class)) {
         return parent::convert($value, $definition, $name, $defaults);
       }
     }
@@ -93,7 +94,7 @@ class AdminPathConfigEntityConverter extends EntityConverter {
       // As we only want to override EntityConverter for ConfigEntities, find
       // out whether the current entity is a ConfigEntity.
       $entity_type = $this->entityManager->getDefinition($entity_type_id);
-      if ($entity_type->isSubclassOf('\Drupal\Core\Config\Entity\ConfigEntityInterface')) {
+      if ($entity_type->entityClassImplements(ConfigEntityInterface::class)) {
         return $this->adminContext->isAdminRoute($route);
       }
     }
diff --git a/web/core/lib/Drupal/Core/ParamConverter/EntityConverter.php b/web/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
index 573cd49e7..67f6a89c8 100644
--- a/web/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
+++ b/web/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
@@ -65,7 +65,7 @@ class EntityConverter implements ParamConverterInterface {
       // If the entity type is translatable, ensure we return the proper
       // translation object for the current context.
       if ($entity instanceof EntityInterface && $entity instanceof TranslatableInterface) {
-        $entity = $this->entityManager->getTranslationFromContext($entity, NULL, array('operation' => 'entity_upcast'));
+        $entity = $this->entityManager->getTranslationFromContext($entity, NULL, ['operation' => 'entity_upcast']);
       }
       return $entity;
     }
diff --git a/web/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php b/web/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
index d54bd7fe1..cad7609c8 100644
--- a/web/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
+++ b/web/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
@@ -18,7 +18,7 @@ class ParamConverterManager implements ParamConverterManagerInterface {
    *
    * @var array
    */
-  protected $converters = array();
+  protected $converters = [];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php b/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
index 28313d266..0f938a035 100644
--- a/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
+++ b/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
@@ -47,7 +47,7 @@ class PhpassHashedPassword implements PasswordInterface {
    *   The number of times is calculated by raising 2 to the power of the given
    *   value.
    */
-  function __construct($countLog2) {
+  public function __construct($countLog2) {
     // Ensure that $countLog2 is within set bounds.
     $this->countLog2 = $this->enforceLog2Boundaries($countLog2);
   }
diff --git a/web/core/lib/Drupal/Core/Path/AliasManager.php b/web/core/lib/Drupal/Core/Path/AliasManager.php
index 3a3191731..6773e7983 100644
--- a/web/core/lib/Drupal/Core/Path/AliasManager.php
+++ b/web/core/lib/Drupal/Core/Path/AliasManager.php
@@ -52,14 +52,14 @@ class AliasManager implements AliasManagerInterface, CacheDecoratorInterface {
    *
    * @var array
    */
-  protected $lookupMap = array();
+  protected $lookupMap = [];
 
   /**
    * Holds an array of aliases for which no path was found.
    *
    * @var array
    */
-  protected $noPath = array();
+  protected $noPath = [];
 
   /**
    * Holds the array of whitelisted path aliases.
@@ -73,14 +73,14 @@ class AliasManager implements AliasManagerInterface, CacheDecoratorInterface {
    *
    * @var array
    */
-  protected $noAlias = array();
+  protected $noAlias = [];
 
   /**
    * Whether preloaded path lookups has already been loaded.
    *
    * @var array
    */
-  protected $langcodePreloaded = array();
+  protected $langcodePreloaded = [];
 
   /**
    * Holds an array of previously looked up paths for the current request path.
@@ -132,7 +132,7 @@ class AliasManager implements AliasManagerInterface, CacheDecoratorInterface {
     if ($this->cacheNeedsWriting && !empty($this->cacheKey)) {
       // Start with the preloaded path lookups, so that cached entries for other
       // languages will not be lost.
-      $path_lookups = $this->preloadedPathLookups ?: array();
+      $path_lookups = $this->preloadedPathLookups ?: [];
       foreach ($this->lookupMap as $langcode => $lookups) {
         $path_lookups[$langcode] = array_keys($lookups);
         if (!empty($this->noAlias[$langcode])) {
@@ -202,12 +202,12 @@ class AliasManager implements AliasManagerInterface, CacheDecoratorInterface {
     // paths for the page from cache.
     if (empty($this->langcodePreloaded[$langcode])) {
       $this->langcodePreloaded[$langcode] = TRUE;
-      $this->lookupMap[$langcode] = array();
+      $this->lookupMap[$langcode] = [];
 
       // Load the cached paths that should be used for preloading. This only
       // happens if a cache key has been set.
       if ($this->preloadedPathLookups === FALSE) {
-        $this->preloadedPathLookups = array();
+        $this->preloadedPathLookups = [];
         if ($this->cacheKey) {
           if ($cached = $this->cache->get($this->cacheKey)) {
             $this->preloadedPathLookups = $cached->data;
@@ -258,12 +258,12 @@ class AliasManager implements AliasManagerInterface, CacheDecoratorInterface {
       }
     }
     else {
-      $this->lookupMap = array();
+      $this->lookupMap = [];
     }
-    $this->noPath = array();
-    $this->noAlias = array();
-    $this->langcodePreloaded = array();
-    $this->preloadedPathLookups = array();
+    $this->noPath = [];
+    $this->noAlias = [];
+    $this->langcodePreloaded = [];
+    $this->preloadedPathLookups = [];
     $this->cache->delete($this->cacheKey);
     $this->pathAliasWhitelistRebuild($source);
   }
diff --git a/web/core/lib/Drupal/Core/Path/AliasStorage.php b/web/core/lib/Drupal/Core/Path/AliasStorage.php
index 5379edad1..4f380125b 100644
--- a/web/core/lib/Drupal/Core/Path/AliasStorage.php
+++ b/web/core/lib/Drupal/Core/Path/AliasStorage.php
@@ -63,11 +63,11 @@ class AliasStorage implements AliasStorageInterface {
       throw new \InvalidArgumentException(sprintf('Alias path %s has to start with a slash.', $alias));
     }
 
-    $fields = array(
+    $fields = [
       'source' => $source,
       'alias' => $alias,
       'langcode' => $langcode,
-    );
+    ];
 
     // Insert or update the alias.
     if (empty($pid)) {
@@ -99,7 +99,7 @@ class AliasStorage implements AliasStorageInterface {
       // Fetch the current values so that an update hook can identify what
       // exactly changed.
       try {
-        $original = $this->connection->query('SELECT source, alias, langcode FROM {url_alias} WHERE pid = :pid', array(':pid' => $pid))
+        $original = $this->connection->query('SELECT source, alias, langcode FROM {url_alias} WHERE pid = :pid', [':pid' => $pid])
           ->fetchAssoc();
       }
       catch (\Exception $e) {
@@ -116,7 +116,7 @@ class AliasStorage implements AliasStorageInterface {
     }
     if ($pid) {
       // @todo Switch to using an event for this instead of a hook.
-      $this->moduleHandler->invokeAll('path_' . $operation, array($fields));
+      $this->moduleHandler->invokeAll('path_' . $operation, [$fields]);
       Cache::invalidateTags(['route_match']);
       return $fields;
     }
@@ -174,7 +174,7 @@ class AliasStorage implements AliasStorageInterface {
       $deleted = FALSE;
     }
     // @todo Switch to using an event for this instead of a hook.
-    $this->moduleHandler->invokeAll('path_delete', array($path));
+    $this->moduleHandler->invokeAll('path_delete', [$path]);
     Cache::invalidateTags(['route_match']);
     return $deleted;
   }
@@ -313,7 +313,7 @@ class AliasStorage implements AliasStorageInterface {
    */
   public function languageAliasExists() {
     try {
-      return (bool) $this->connection->queryRange('SELECT 1 FROM {url_alias} WHERE langcode <> :langcode', 0, 1, array(':langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED))->fetchField();
+      return (bool) $this->connection->queryRange('SELECT 1 FROM {url_alias} WHERE langcode <> :langcode', 0, 1, [':langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED])->fetchField();
     }
     catch (\Exception $e) {
       $this->catchException($e);
diff --git a/web/core/lib/Drupal/Core/Path/PathMatcher.php b/web/core/lib/Drupal/Core/Path/PathMatcher.php
index 2b616c2e4..cc4f2cccf 100644
--- a/web/core/lib/Drupal/Core/Path/PathMatcher.php
+++ b/web/core/lib/Drupal/Core/Path/PathMatcher.php
@@ -66,19 +66,19 @@ class PathMatcher implements PathMatcherInterface {
 
     if (!isset($this->regexes[$patterns])) {
       // Convert path settings to a regular expression.
-      $to_replace = array(
+      $to_replace = [
         // Replace newlines with a logical 'or'.
         '/(\r\n?|\n)/',
         // Quote asterisks.
         '/\\\\\*/',
         // Quote <front> keyword.
         '/(^|\|)\\\\<front\\\\>($|\|)/',
-      );
-      $replacements = array(
+      ];
+      $replacements = [
         '|',
         '.*',
         '\1' . preg_quote($this->getFrontPagePath(), '/') . '\2',
-      );
+      ];
       $patterns_quoted = preg_quote($patterns, '/');
       $this->regexes[$patterns] = '/^(' . preg_replace($to_replace, $replacements, $patterns_quoted) . ')$/';
     }
diff --git a/web/core/lib/Drupal/Core/Path/PathValidator.php b/web/core/lib/Drupal/Core/Path/PathValidator.php
index f7efdb1a8..efce47305 100644
--- a/web/core/lib/Drupal/Core/Path/PathValidator.php
+++ b/web/core/lib/Drupal/Core/Path/PathValidator.php
@@ -6,6 +6,7 @@ use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\ParamConverter\ParamNotConvertedException;
 use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
 use Drupal\Core\Routing\AccessAwareRouterInterface;
+use Drupal\Core\Routing\RequestContext;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
@@ -152,23 +153,30 @@ class PathValidator implements PathValidatorInterface {
       $router = $this->accessAwareRouter;
     }
 
+    $initial_request_context = $router->getContext() ? $router->getContext() : new RequestContext();
     $path = $this->pathProcessor->processInbound('/' . $path, $request);
 
     try {
-      return $router->match($path);
+      $request_context = new RequestContext();
+      $request_context->fromRequest($request);
+      $router->setContext($request_context);
+      $result = $router->match($path);
     }
     catch (ResourceNotFoundException $e) {
-      return FALSE;
+      $result = FALSE;
     }
     catch (ParamNotConvertedException $e) {
-      return FALSE;
+      $result = FALSE;
     }
     catch (AccessDeniedHttpException $e) {
-      return FALSE;
+      $result = FALSE;
     }
     catch (MethodNotAllowedException $e) {
-      return FALSE;
+      $result = FALSE;
     }
+
+    $router->setContext($initial_request_context);
+    return $result;
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/PathProcessor/NullPathProcessorManager.php b/web/core/lib/Drupal/Core/PathProcessor/NullPathProcessorManager.php
index 3718663a3..9e6d3dae6 100644
--- a/web/core/lib/Drupal/Core/PathProcessor/NullPathProcessorManager.php
+++ b/web/core/lib/Drupal/Core/PathProcessor/NullPathProcessorManager.php
@@ -22,7 +22,7 @@ class NullPathProcessorManager implements InboundPathProcessorInterface, Outboun
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     return $path;
   }
 
diff --git a/web/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php b/web/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
index db7d8969a..a5e6570eb 100644
--- a/web/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
+++ b/web/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
@@ -45,6 +45,6 @@ interface OutboundPathProcessorInterface {
    * @return string
    *   The processed path.
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL);
+  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL);
 
 }
diff --git a/web/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php b/web/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php
index a067b3d6b..b85737f3c 100644
--- a/web/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php
+++ b/web/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php
@@ -39,7 +39,7 @@ class PathProcessorAlias implements InboundPathProcessorInterface, OutboundPathP
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     if (empty($options['alias'])) {
       $langcode = isset($options['language']) ? $options['language']->getId() : NULL;
       $path = $this->aliasManager->getAliasByPath($path, $langcode);
diff --git a/web/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php b/web/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
index a800842c7..94ff1183e 100644
--- a/web/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
+++ b/web/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
@@ -49,7 +49,7 @@ class PathProcessorFront implements InboundPathProcessorInterface, OutboundPathP
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     // The special path '<front>' links to the default front page.
     if ($path === '/<front>') {
       $path = '/';
diff --git a/web/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php b/web/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php
index f1987f807..2a3181ee2 100644
--- a/web/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php
+++ b/web/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php
@@ -20,7 +20,7 @@ class PathProcessorManager implements InboundPathProcessorInterface, OutboundPat
    *   An array whose keys are priorities and whose values are arrays of path
    *   processor objects.
    */
-  protected $inboundProcessors = array();
+  protected $inboundProcessors = [];
 
   /**
    * Holds the array of inbound processors, sorted by priority.
@@ -28,7 +28,7 @@ class PathProcessorManager implements InboundPathProcessorInterface, OutboundPat
    * @var array
    *   An array of path processor objects.
    */
-  protected $sortedInbound = array();
+  protected $sortedInbound = [];
 
 
   /**
@@ -38,7 +38,7 @@ class PathProcessorManager implements InboundPathProcessorInterface, OutboundPat
    *   An array whose keys are priorities and whose values are arrays of path
    *   processor objects.
    */
-  protected $outboundProcessors = array();
+  protected $outboundProcessors = [];
 
   /**
    * Holds the array of outbound processors, sorted by priority.
@@ -46,7 +46,7 @@ class PathProcessorManager implements InboundPathProcessorInterface, OutboundPat
    * @var array
    *   An array of path processor objects.
    */
-  protected $sortedOutbound = array();
+  protected $sortedOutbound = [];
 
   /**
    * Adds an inbound processor object to the $inboundProcessors property.
@@ -58,7 +58,7 @@ class PathProcessorManager implements InboundPathProcessorInterface, OutboundPat
    */
   public function addInbound(InboundPathProcessorInterface $processor, $priority = 0) {
     $this->inboundProcessors[$priority][] = $processor;
-    $this->sortedInbound = array();
+    $this->sortedInbound = [];
   }
 
   /**
@@ -97,13 +97,13 @@ class PathProcessorManager implements InboundPathProcessorInterface, OutboundPat
    */
   public function addOutbound(OutboundPathProcessorInterface $processor, $priority = 0) {
     $this->outboundProcessors[$priority][] = $processor;
-    $this->sortedOutbound = array();
+    $this->sortedOutbound = [];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     $processors = $this->getOutbound();
     foreach ($processors as $processor) {
       $path = $processor->processOutbound($path, $options, $request, $bubbleable_metadata);
@@ -132,7 +132,7 @@ class PathProcessorManager implements InboundPathProcessorInterface, OutboundPat
    *   The processor type to sort, e.g. 'inboundProcessors'.
    */
   protected function sortProcessors($type) {
-    $sorted = array();
+    $sorted = [];
     krsort($this->{$type});
 
     foreach ($this->{$type} as $processors) {
diff --git a/web/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php b/web/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
index e76e27ff2..cdacff6fe 100644
--- a/web/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
+++ b/web/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
@@ -28,8 +28,8 @@ class PhpStorageFactory {
    * @return \Drupal\Component\PhpStorage\PhpStorageInterface
    *   An instantiated storage for the specified name.
    */
-  static function get($name) {
-    $configuration = array();
+  public static function get($name) {
+    $configuration = [];
     $overrides = Settings::get('php_storage');
     if (isset($overrides[$name])) {
       $configuration = $overrides[$name];
diff --git a/web/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearer.php b/web/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearer.php
index 3689df596..80c0adae5 100644
--- a/web/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearer.php
+++ b/web/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearer.php
@@ -14,7 +14,7 @@ class CachedDiscoveryClearer implements CachedDiscoveryClearerInterface {
    *
    * @var \Drupal\Component\Plugin\Discovery\CachedDiscoveryInterface[]
    */
-  protected $cachedDiscoveries = array();
+  protected $cachedDiscoveries = [];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php b/web/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php
index 1426562e9..52d153c3e 100644
--- a/web/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php
+++ b/web/core/lib/Drupal/Core/Plugin/CategorizingPluginManagerTrait.php
@@ -105,7 +105,7 @@ trait CategorizingPluginManagerTrait {
   public function getGroupedDefinitions(array $definitions = NULL, $label_key = 'label') {
     /** @var \Drupal\Core\Plugin\CategorizingPluginManagerTrait|\Drupal\Component\Plugin\PluginManagerInterface $this */
     $definitions = $this->getSortedDefinitions(isset($definitions) ? $definitions : $this->getDefinitions(), $label_key);
-    $grouped_definitions = array();
+    $grouped_definitions = [];
     foreach ($definitions as $id => $definition) {
       $grouped_definitions[(string) $definition['category']][$id] = $definition;
     }
diff --git a/web/core/lib/Drupal/Core/Plugin/Context/ContextAwarePluginManagerInterface.php b/web/core/lib/Drupal/Core/Plugin/Context/ContextAwarePluginManagerInterface.php
index a53de3ff2..5c29411f3 100644
--- a/web/core/lib/Drupal/Core/Plugin/Context/ContextAwarePluginManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Plugin/Context/ContextAwarePluginManagerInterface.php
@@ -21,6 +21,6 @@ interface ContextAwarePluginManagerInterface extends PluginManagerInterface {
    * @return array
    *   An array of plugin definitions.
    */
-  public function getDefinitionsForContexts(array $contexts = array());
+  public function getDefinitionsForContexts(array $contexts = []);
 
 }
diff --git a/web/core/lib/Drupal/Core/Plugin/Context/ContextAwarePluginManagerTrait.php b/web/core/lib/Drupal/Core/Plugin/Context/ContextAwarePluginManagerTrait.php
index fadaebd44..afe2aa59e 100644
--- a/web/core/lib/Drupal/Core/Plugin/Context/ContextAwarePluginManagerTrait.php
+++ b/web/core/lib/Drupal/Core/Plugin/Context/ContextAwarePluginManagerTrait.php
@@ -19,7 +19,7 @@ trait ContextAwarePluginManagerTrait {
   /**
    * See \Drupal\Core\Plugin\Context\ContextAwarePluginManagerInterface::getDefinitionsForContexts().
    */
-  public function getDefinitionsForContexts(array $contexts = array()) {
+  public function getDefinitionsForContexts(array $contexts = []) {
     return $this->contextHandler()->filterPluginDefinitionsByContexts($contexts, $this->getDefinitions());
   }
 
diff --git a/web/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php b/web/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
index 50d8db601..2a13d364d 100644
--- a/web/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
+++ b/web/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
@@ -66,7 +66,7 @@ class ContextHandler implements ContextHandlerInterface {
   /**
    * {@inheritdoc}
    */
-  public function applyContextMapping(ContextAwarePluginInterface $plugin, $contexts, $mappings = array()) {
+  public function applyContextMapping(ContextAwarePluginInterface $plugin, $contexts, $mappings = []) {
     /** @var $contexts \Drupal\Core\Plugin\Context\ContextInterface[] */
     $mappings += $plugin->getContextMapping();
     // Loop through each of the expected contexts.
diff --git a/web/core/lib/Drupal/Core/Plugin/Context/ContextHandlerInterface.php b/web/core/lib/Drupal/Core/Plugin/Context/ContextHandlerInterface.php
index 2a219e937..a0d570360 100644
--- a/web/core/lib/Drupal/Core/Plugin/Context/ContextHandlerInterface.php
+++ b/web/core/lib/Drupal/Core/Plugin/Context/ContextHandlerInterface.php
@@ -75,6 +75,6 @@ interface ContextHandlerInterface {
    * @throws \Drupal\Component\Plugin\Exception\ContextException
    *   Thrown when a context assignment was not satisfied.
    */
-  public function applyContextMapping(ContextAwarePluginInterface $plugin, $contexts, $mappings = array());
+  public function applyContextMapping(ContextAwarePluginInterface $plugin, $contexts, $mappings = []);
 
 }
diff --git a/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php b/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
index a5ef4cf87..31ff649fa 100644
--- a/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
+++ b/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
@@ -12,7 +12,7 @@ trait ContextAwarePluginAssignmentTrait {
    *
    * @see \Drupal\Core\StringTranslation\StringTranslationTrait
    */
-  abstract protected function t($string, array $args = array(), array $options = array());
+  abstract protected function t($string, array $args = [], array $options = []);
 
   /**
    * Wraps the context handler.
diff --git a/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php b/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
index 05ba8a83d..80f10d202 100644
--- a/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
+++ b/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
@@ -17,7 +17,7 @@ use Drupal\Core\Plugin\Context\ContextInterface;
 /**
  * Base class for plugins that are context aware.
  */
-abstract class ContextAwarePluginBase extends ComponentContextAwarePluginBase implements ContextAwarePluginInterface {
+abstract class ContextAwarePluginBase extends ComponentContextAwarePluginBase implements ContextAwarePluginInterface, CacheableDependencyInterface {
   use TypedDataTrait;
   use StringTranslationTrait;
   use DependencySerializationTrait;
diff --git a/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginInterface.php b/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginInterface.php
index 5e61cc092..67f53b697 100644
--- a/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginInterface.php
+++ b/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginInterface.php
@@ -27,7 +27,7 @@ interface ContextAwarePluginInterface extends ComponentContextAwarePluginInterfa
    * @param string $name
    *   The name of the context in the plugin definition.
    *
-   * @return \Drupal\Core\Plugin\Context\ContextDefinitionInterface.
+   * @return \Drupal\Core\Plugin\Context\ContextDefinitionInterface
    *   The definition against which the context value must validate.
    *
    * @throws \Drupal\Component\Plugin\Exception\PluginException
diff --git a/web/core/lib/Drupal/Core/Plugin/DefaultLazyPluginCollection.php b/web/core/lib/Drupal/Core/Plugin/DefaultLazyPluginCollection.php
index 1928bfb00..3c48892ad 100644
--- a/web/core/lib/Drupal/Core/Plugin/DefaultLazyPluginCollection.php
+++ b/web/core/lib/Drupal/Core/Plugin/DefaultLazyPluginCollection.php
@@ -33,7 +33,7 @@ class DefaultLazyPluginCollection extends LazyPluginCollection {
    *   An associative array containing the initial configuration for each plugin
    *   in the collection, keyed by plugin instance ID.
    */
-  protected $configurations = array();
+  protected $configurations = [];
 
   /**
    * The key within the plugin configuration that contains the plugin ID.
@@ -47,7 +47,7 @@ class DefaultLazyPluginCollection extends LazyPluginCollection {
    *
    * @var array
    */
-  protected $originalOrder = array();
+  protected $originalOrder = [];
 
   /**
    * Constructs a new DefaultLazyPluginCollection object.
@@ -58,7 +58,7 @@ class DefaultLazyPluginCollection extends LazyPluginCollection {
    *   (optional) An associative array containing the initial configuration for
    *   each plugin in the collection, keyed by plugin instance ID.
    */
-  public function __construct(PluginManagerInterface $manager, array $configurations = array()) {
+  public function __construct(PluginManagerInterface $manager, array $configurations = []) {
     $this->manager = $manager;
     $this->configurations = $configurations;
 
@@ -74,7 +74,7 @@ class DefaultLazyPluginCollection extends LazyPluginCollection {
    * {@inheritdoc}
    */
   protected function initializePlugin($instance_id) {
-    $configuration = isset($this->configurations[$instance_id]) ? $this->configurations[$instance_id] : array();
+    $configuration = isset($this->configurations[$instance_id]) ? $this->configurations[$instance_id] : [];
     if (!isset($configuration[$this->pluginKey])) {
       throw new PluginNotFoundException($instance_id);
     }
@@ -87,7 +87,7 @@ class DefaultLazyPluginCollection extends LazyPluginCollection {
    * @return $this
    */
   public function sort() {
-    uasort($this->instanceIDs, array($this, 'sortHelper'));
+    uasort($this->instanceIDs, [$this, 'sortHelper']);
     return $this;
   }
 
@@ -104,7 +104,7 @@ class DefaultLazyPluginCollection extends LazyPluginCollection {
    * {@inheritdoc}
    */
   public function getConfiguration() {
-    $instances = array();
+    $instances = [];
     // Store the current order of the instances.
     $current_order = $this->instanceIDs;
     // Reorder the instances to match the original order, adding new instances
diff --git a/web/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php b/web/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
index 62decb22e..5a8a3f334 100644
--- a/web/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
+++ b/web/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Plugin;
 
+use Drupal\Component\Plugin\Definition\PluginDefinitionInterface;
 use Drupal\Component\Plugin\Discovery\CachedDiscoveryInterface;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Cache\CacheBackendInterface;
@@ -131,14 +132,12 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
   /**
    * Initialize the cache backend.
    *
-   * Plugin definitions are cached using the provided cache backend. The
-   * interface language is added as a suffix to the cache key.
+   * Plugin definitions are cached using the provided cache backend.
    *
    * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
    *   Cache backend instance to use.
    * @param string $cache_key
-   *   Cache key prefix to use, the language code will be appended
-   *   automatically.
+   *   Cache key prefix to use.
    * @param array $cache_tags
    *   (optional) When providing a list of cache tags, the cached plugin
    *   definitions are tagged with the provided cache tags. These cache tags can
@@ -148,7 +147,7 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
    *   clearCachedDefinitions() method. Only use cache tags when cached plugin
    *   definitions should be cleared along with other, related cache entries.
    */
-  public function setCacheBackend(CacheBackendInterface $cache_backend, $cache_key, array $cache_tags = array()) {
+  public function setCacheBackend(CacheBackendInterface $cache_backend, $cache_key, array $cache_tags = []) {
     assert('\Drupal\Component\Assertion\Inspector::assertAllStrings($cache_tags)', 'Cache Tags must be strings.');
     $this->cacheBackend = $cache_backend;
     $this->cacheKey = $cache_key;
@@ -239,13 +238,17 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
    * method.
    */
   public function processDefinition(&$definition, $plugin_id) {
-    // Only arrays can be operated on.
-    if (!is_array($definition)) {
-      return;
+    // Only array-based definitions can have defaults merged in.
+    if (is_array($definition) && !empty($this->defaults) && is_array($this->defaults)) {
+      $definition = NestedArray::mergeDeep($this->defaults, $definition);
     }
 
-    if (!empty($this->defaults) && is_array($this->defaults)) {
-      $definition = NestedArray::mergeDeep($this->defaults, $definition);
+    // Keep class definitions standard with no leading slash.
+    if ($definition instanceof PluginDefinitionInterface) {
+      $definition->setClass(ltrim($definition->getClass(), '\\'));
+    }
+    elseif (is_array($definition) && isset($definition['class'])) {
+      $definition['class'] = ltrim($definition['class'], '\\');
     }
   }
 
@@ -285,18 +288,39 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
     // If this plugin was provided by a module that does not exist, remove the
     // plugin definition.
     foreach ($definitions as $plugin_id => $plugin_definition) {
-      // If the plugin definition is an object, attempt to convert it to an
-      // array, if that is not possible, skip further processing.
-      if (is_object($plugin_definition) && !($plugin_definition = (array) $plugin_definition)) {
-        continue;
-      }
-      if (isset($plugin_definition['provider']) && !in_array($plugin_definition['provider'], array('core', 'component')) && !$this->providerExists($plugin_definition['provider'])) {
+      $provider = $this->extractProviderFromDefinition($plugin_definition);
+      if ($provider && !in_array($provider, ['core', 'component']) && !$this->providerExists($provider)) {
         unset($definitions[$plugin_id]);
       }
     }
     return $definitions;
   }
 
+  /**
+   * Extracts the provider from a plugin definition.
+   *
+   * @param mixed $plugin_definition
+   *   The plugin definition. Usually either an array or an instance of
+   *   \Drupal\Component\Plugin\Definition\PluginDefinitionInterface
+   *
+   * @return string|null
+   *   The provider string, if it exists. NULL otherwise.
+   */
+  protected function extractProviderFromDefinition($plugin_definition) {
+    if ($plugin_definition instanceof PluginDefinitionInterface) {
+      return $plugin_definition->getProvider();
+    }
+
+    // Attempt to convert the plugin definition to an array.
+    if (is_object($plugin_definition)) {
+      $plugin_definition = (array) $plugin_definition;
+    }
+
+    if (isset($plugin_definition['provider'])) {
+      return $plugin_definition['provider'];
+    }
+  }
+
   /**
    * Invokes the hook to alter the definitions if the alter hook is set.
    *
diff --git a/web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php b/web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php
index bbcb0f2a6..519e93d63 100644
--- a/web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php
+++ b/web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php
@@ -54,7 +54,7 @@ class DefaultSingleLazyPluginCollection extends LazyPluginCollection {
     $this->manager = $manager;
     $this->instanceId = $instance_id;
     // This is still needed by the parent LazyPluginCollection class.
-    $this->instanceIDs = array($instance_id => $instance_id);
+    $this->instanceIDs = [$instance_id => $instance_id];
     $this->configuration = $configuration;
   }
 
diff --git a/web/core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionInterface.php b/web/core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionInterface.php
new file mode 100644
index 000000000..ca89113f4
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Core\Plugin\Definition;
+
+/**
+ * Provides an interface for a plugin definition that has dependencies.
+ */
+interface DependentPluginDefinitionInterface {
+
+  /**
+   * Gets the config dependencies of this plugin definition.
+   *
+   * @return array
+   *   An array of config dependencies.
+   *
+   * @see \Drupal\Core\Plugin\PluginDependencyTrait::calculatePluginDependencies()
+   */
+  public function getConfigDependencies();
+
+  /**
+   * Sets the config dependencies of this plugin definition.
+   *
+   * @param array $config_dependencies
+   *   An array of config dependencies.
+   *
+   * @return $this
+   */
+  public function setConfigDependencies(array $config_dependencies);
+
+}
diff --git a/web/core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionTrait.php b/web/core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionTrait.php
new file mode 100644
index 000000000..632bf0cd1
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionTrait.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Core\Plugin\Definition;
+
+/**
+ * Provides a trait for a plugin definition that has dependencies.
+ */
+trait DependentPluginDefinitionTrait {
+
+  /**
+   * The dependencies of this plugin definition.
+   *
+   * @var array
+   *
+   * @see \Drupal\Core\Config\Entity\ConfigDependencyManager
+   */
+  protected $config_dependencies = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfigDependencies() {
+    return $this->config_dependencies;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setConfigDependencies(array $config_dependencies) {
+    $this->config_dependencies = $config_dependencies;
+    return $this;
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/web/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
index 770308def..9ecbaa053 100644
--- a/web/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/web/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -50,7 +50,7 @@ class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery {
    * @param string[] $annotation_namespaces
    *   (optional) Additional namespaces to scan for annotation definitions.
    */
-  function __construct($subdir, \Traversable $root_namespaces, $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin', array $annotation_namespaces = []) {
+  public function __construct($subdir, \Traversable $root_namespaces, $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin', array $annotation_namespaces = []) {
     if ($subdir) {
       // Prepend a directory separator to $subdir,
       // if it does not already have one.
@@ -61,7 +61,7 @@ class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery {
       $this->namespaceSuffix = str_replace('/', '\\', $subdir);
     }
     $this->rootNamespacesIterator = $root_namespaces;
-    $plugin_namespaces = array();
+    $plugin_namespaces = [];
     parent::__construct($plugin_namespaces, $plugin_definition_annotation_name, $annotation_namespaces);
   }
 
@@ -113,7 +113,7 @@ class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery {
    * {@inheritdoc}
    */
   protected function getPluginNamespaces() {
-    $plugin_namespaces = array();
+    $plugin_namespaces = [];
     if ($this->namespaceSuffix) {
       foreach ($this->rootNamespacesIterator as $namespace => $dirs) {
         // Append the namespace suffix to the base namespace, to obtain the
diff --git a/web/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php b/web/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
index 24f5caeaf..51040cd0d 100644
--- a/web/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
+++ b/web/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
@@ -36,7 +36,7 @@ class HookDiscovery implements DiscoveryInterface {
    *   The Drupal hook that a module can implement in order to interface to
    *   this discovery class.
    */
-  function __construct(ModuleHandlerInterface $module_handler, $hook) {
+  public function __construct(ModuleHandlerInterface $module_handler, $hook) {
     $this->moduleHandler = $module_handler;
     $this->hook = $hook;
   }
@@ -45,7 +45,7 @@ class HookDiscovery implements DiscoveryInterface {
    * {@inheritdoc}
    */
   public function getDefinitions() {
-    $definitions = array();
+    $definitions = [];
     foreach ($this->moduleHandler->getImplementations($this->hook) as $module) {
       $result = $this->moduleHandler->invoke($module, $this->hook);
       foreach ($result as $plugin_id => $definition) {
diff --git a/web/core/lib/Drupal/Core/Plugin/Discovery/InfoHookDecorator.php b/web/core/lib/Drupal/Core/Plugin/Discovery/InfoHookDecorator.php
index af250d957..6501ce0d1 100644
--- a/web/core/lib/Drupal/Core/Plugin/Discovery/InfoHookDecorator.php
+++ b/web/core/lib/Drupal/Core/Plugin/Discovery/InfoHookDecorator.php
@@ -55,7 +55,7 @@ class InfoHookDecorator implements DiscoveryInterface {
    * Passes through all unknown calls onto the decorated object.
    */
   public function __call($method, $args) {
-    return call_user_func_array(array($this->decorated, $method), $args);
+    return call_user_func_array([$this->decorated, $method], $args);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php b/web/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php
index c149c104d..586655806 100644
--- a/web/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php
+++ b/web/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php
@@ -47,7 +47,7 @@ class YamlDiscovery implements DiscoveryInterface {
    * @param array $directories
    *   An array of directories to scan.
    */
-  function __construct($name, array $directories) {
+  public function __construct($name, array $directories) {
     $this->discovery = new CoreYamlDiscovery($name, $directories);
   }
 
@@ -75,7 +75,7 @@ class YamlDiscovery implements DiscoveryInterface {
     $plugins = $this->discovery->findAll();
 
     // Flatten definitions into what's expected from plugins.
-    $definitions = array();
+    $definitions = [];
     foreach ($plugins as $provider => $list) {
       foreach ($list as $id => $definition) {
         // Add TranslatableMarkup.
@@ -92,10 +92,10 @@ class YamlDiscovery implements DiscoveryInterface {
           }
         }
         // Add ID and provider.
-        $definitions[$id] = $definition + array(
+        $definitions[$id] = $definition + [
           'provider' => $provider,
           'id' => $id,
-        );
+        ];
       }
     }
 
diff --git a/web/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscoveryDecorator.php b/web/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscoveryDecorator.php
index a061f4be3..e415c5b26 100644
--- a/web/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscoveryDecorator.php
+++ b/web/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscoveryDecorator.php
@@ -47,7 +47,7 @@ class YamlDiscoveryDecorator extends YamlDiscovery {
    * Passes through all unknown calls onto the decorated object.
    */
   public function __call($method, $args) {
-    return call_user_func_array(array($this->decorated, $method), $args);
+    return call_user_func_array([$this->decorated, $method], $args);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Plugin/Factory/ContainerFactory.php b/web/core/lib/Drupal/Core/Plugin/Factory/ContainerFactory.php
index 7658b42f6..7aefa5917 100644
--- a/web/core/lib/Drupal/Core/Plugin/Factory/ContainerFactory.php
+++ b/web/core/lib/Drupal/Core/Plugin/Factory/ContainerFactory.php
@@ -12,7 +12,7 @@ class ContainerFactory extends DefaultFactory {
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     $plugin_definition = $this->discovery->getDefinition($plugin_id);
     $plugin_class = static::getPluginClass($plugin_id, $plugin_definition, $this->interface);
 
diff --git a/web/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php b/web/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
index 8eac72ddc..b9dd9e659 100644
--- a/web/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
+++ b/web/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
@@ -2,9 +2,11 @@
 
 namespace Drupal\Core\Plugin;
 
+use Drupal\Component\Plugin\Definition\PluginDefinitionInterface;
 use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Component\Plugin\PluginInspectionInterface;
 use Drupal\Core\Entity\DependencyTrait;
+use Drupal\Core\Plugin\Definition\DependentPluginDefinitionInterface;
 
 /**
  * Provides a trait for calculating the dependencies of a plugin.
@@ -26,11 +28,21 @@ trait PluginDependencyTrait {
    */
   protected function calculatePluginDependencies(PluginInspectionInterface $instance) {
     $definition = $instance->getPluginDefinition();
-    $this->addDependency('module', $definition['provider']);
-    // Plugins can declare additional dependencies in their definition.
-    if (isset($definition['config_dependencies'])) {
-      $this->addDependencies($definition['config_dependencies']);
+
+    if ($definition instanceof PluginDefinitionInterface) {
+      $this->addDependency('module', $definition->getProvider());
+      if ($definition instanceof DependentPluginDefinitionInterface && $config_dependencies = $definition->getConfigDependencies()) {
+        $this->addDependencies($config_dependencies);
+      }
     }
+    elseif (is_array($definition)) {
+      $this->addDependency('module', $definition['provider']);
+      // Plugins can declare additional dependencies in their definition.
+      if (isset($definition['config_dependencies'])) {
+        $this->addDependencies($definition['config_dependencies']);
+      }
+    }
+
     // If a plugin is dependent, calculate its dependencies.
     if ($instance instanceof DependentPluginInterface && $plugin_dependencies = $instance->calculateDependencies()) {
       $this->addDependencies($plugin_dependencies);
diff --git a/web/core/lib/Drupal/Core/Plugin/PluginManagerPass.php b/web/core/lib/Drupal/Core/Plugin/PluginManagerPass.php
index dcacf7b52..9d4a483ae 100644
--- a/web/core/lib/Drupal/Core/Plugin/PluginManagerPass.php
+++ b/web/core/lib/Drupal/Core/Plugin/PluginManagerPass.php
@@ -19,7 +19,7 @@ class PluginManagerPass implements CompilerPassInterface {
     foreach ($container->getDefinitions() as $service_id => $definition) {
       if (strpos($service_id, 'plugin.manager.') === 0 || $definition->hasTag('plugin_manager_cache_clear')) {
         if (is_subclass_of($definition->getClass(), '\Drupal\Component\Plugin\Discovery\CachedDiscoveryInterface')) {
-          $cache_clearer_definition->addMethodCall('addCachedDiscovery', array(new Reference($service_id)));
+          $cache_clearer_definition->addMethodCall('addCachedDiscovery', [new Reference($service_id)]);
         }
       }
     }
diff --git a/web/core/lib/Drupal/Core/PrivateKey.php b/web/core/lib/Drupal/Core/PrivateKey.php
index 9d0f73602..d7ac845f5 100644
--- a/web/core/lib/Drupal/Core/PrivateKey.php
+++ b/web/core/lib/Drupal/Core/PrivateKey.php
@@ -23,7 +23,7 @@ class PrivateKey {
    * @param \Drupal\Core\State\StateInterface $state
    *   The state service.
    */
-  function __construct(StateInterface $state) {
+  public function __construct(StateInterface $state) {
     $this->state = $state;
   }
 
diff --git a/web/core/lib/Drupal/Core/Queue/Batch.php b/web/core/lib/Drupal/Core/Queue/Batch.php
index a7827a992..1be96d877 100644
--- a/web/core/lib/Drupal/Core/Queue/Batch.php
+++ b/web/core/lib/Drupal/Core/Queue/Batch.php
@@ -26,7 +26,7 @@ class Batch extends DatabaseQueue {
    */
   public function claimItem($lease_time = 0) {
     try {
-      $item = $this->connection->queryRange('SELECT data, item_id FROM {queue} q WHERE name = :name ORDER BY item_id ASC', 0, 1, array(':name' => $this->name))->fetchObject();
+      $item = $this->connection->queryRange('SELECT data, item_id FROM {queue} q WHERE name = :name ORDER BY item_id ASC', 0, 1, [':name' => $this->name])->fetchObject();
       if ($item) {
         $item->data = unserialize($item->data);
         return $item;
@@ -48,9 +48,9 @@ class Batch extends DatabaseQueue {
    *   An array of queue items.
    */
   public function getAllItems() {
-    $result = array();
+    $result = [];
     try {
-      $items = $this->connection->query('SELECT data FROM {queue} q WHERE name = :name ORDER BY item_id ASC', array(':name' => $this->name))->fetchAll();
+      $items = $this->connection->query('SELECT data FROM {queue} q WHERE name = :name ORDER BY item_id ASC', [':name' => $this->name])->fetchAll();
       foreach ($items as $item) {
         $result[] = unserialize($item->data);
       }
diff --git a/web/core/lib/Drupal/Core/Queue/BatchMemory.php b/web/core/lib/Drupal/Core/Queue/BatchMemory.php
index 824530842..bf4ba5591 100644
--- a/web/core/lib/Drupal/Core/Queue/BatchMemory.php
+++ b/web/core/lib/Drupal/Core/Queue/BatchMemory.php
@@ -40,7 +40,7 @@ class BatchMemory extends Memory {
    *   An array of queue items.
    */
   public function getAllItems() {
-    $result = array();
+    $result = [];
     foreach ($this->queue as $item) {
       $result[] = $item->data;
     }
diff --git a/web/core/lib/Drupal/Core/Queue/DatabaseQueue.php b/web/core/lib/Drupal/Core/Queue/DatabaseQueue.php
index eaa675766..e70000ee2 100644
--- a/web/core/lib/Drupal/Core/Queue/DatabaseQueue.php
+++ b/web/core/lib/Drupal/Core/Queue/DatabaseQueue.php
@@ -42,7 +42,7 @@ class DatabaseQueue implements ReliableQueueInterface, QueueGarbageCollectionInt
    * @param \Drupal\Core\Database\Connection $connection
    *   The Connection object containing the key-value tables.
    */
-  function __construct($name, Connection $connection) {
+  public function __construct($name, Connection $connection) {
     $this->name = $name;
     $this->connection = $connection;
   }
@@ -84,13 +84,13 @@ class DatabaseQueue implements ReliableQueueInterface, QueueGarbageCollectionInt
    */
   protected function doCreateItem($data) {
     $query = $this->connection->insert(static::TABLE_NAME)
-      ->fields(array(
+      ->fields([
         'name' => $this->name,
         'data' => serialize($data),
         // We cannot rely on REQUEST_TIME because many items might be created
         // by a single request which takes longer than 1 second.
         'created' => time(),
-      ));
+      ]);
     // Return the new serial ID, or FALSE on failure.
     return $query->execute();
   }
@@ -100,7 +100,7 @@ class DatabaseQueue implements ReliableQueueInterface, QueueGarbageCollectionInt
    */
   public function numberOfItems() {
     try {
-      return $this->connection->query('SELECT COUNT(item_id) FROM {' . static::TABLE_NAME . '} WHERE name = :name', array(':name' => $this->name))
+      return $this->connection->query('SELECT COUNT(item_id) FROM {' . static::TABLE_NAME . '} WHERE name = :name', [':name' => $this->name])
         ->fetchField();
     }
     catch (\Exception $e) {
@@ -120,7 +120,7 @@ class DatabaseQueue implements ReliableQueueInterface, QueueGarbageCollectionInt
     // are no unclaimed items left.
     while (TRUE) {
       try {
-        $item = $this->connection->queryRange('SELECT data, created, item_id FROM {' . static::TABLE_NAME . '} q WHERE expire = 0 AND name = :name ORDER BY created, item_id ASC', 0, 1, array(':name' => $this->name))->fetchObject();
+        $item = $this->connection->queryRange('SELECT data, created, item_id FROM {' . static::TABLE_NAME . '} q WHERE expire = 0 AND name = :name ORDER BY created, item_id ASC', 0, 1, [':name' => $this->name])->fetchObject();
       }
       catch (\Exception $e) {
         $this->catchException($e);
@@ -136,9 +136,9 @@ class DatabaseQueue implements ReliableQueueInterface, QueueGarbageCollectionInt
         // time from the lease, and will tend to reset items before the lease
         // should really expire.
         $update = $this->connection->update(static::TABLE_NAME)
-          ->fields(array(
+          ->fields([
             'expire' => time() + $lease_time,
-          ))
+          ])
           ->condition('item_id', $item->item_id)
           ->condition('expire', 0);
         // If there are affected rows, this update succeeded.
@@ -160,9 +160,9 @@ class DatabaseQueue implements ReliableQueueInterface, QueueGarbageCollectionInt
   public function releaseItem($item) {
     try {
       $update = $this->connection->update(static::TABLE_NAME)
-        ->fields(array(
+        ->fields([
           'expire' => 0,
-        ))
+        ])
         ->condition('item_id', $item->item_id);
       return $update->execute();
     }
@@ -223,9 +223,9 @@ class DatabaseQueue implements ReliableQueueInterface, QueueGarbageCollectionInt
       // Reset expired items in the default queue implementation table. If that's
       // not used, this will simply be a no-op.
       $this->connection->update(static::TABLE_NAME)
-        ->fields(array(
+        ->fields([
           'expire' => 0,
-        ))
+        ])
         ->condition('expire', 0, '<>')
         ->condition('expire', REQUEST_TIME, '<')
         ->execute();
diff --git a/web/core/lib/Drupal/Core/Queue/Memory.php b/web/core/lib/Drupal/Core/Queue/Memory.php
index b921d2c0e..2e4ac0f1c 100644
--- a/web/core/lib/Drupal/Core/Queue/Memory.php
+++ b/web/core/lib/Drupal/Core/Queue/Memory.php
@@ -33,7 +33,7 @@ class Memory implements QueueInterface {
    *   An arbitrary string. The name of the queue to work with.
    */
   public function __construct($name) {
-    $this->queue = array();
+    $this->queue = [];
     $this->idSequence = 0;
   }
 
@@ -100,7 +100,7 @@ class Memory implements QueueInterface {
    * {@inheritdoc}
    */
   public function deleteQueue() {
-    $this->queue = array();
+    $this->queue = [];
     $this->idSequence = 0;
   }
 
diff --git a/web/core/lib/Drupal/Core/Queue/QueueDatabaseFactory.php b/web/core/lib/Drupal/Core/Queue/QueueDatabaseFactory.php
index e2bec4868..a64678952 100644
--- a/web/core/lib/Drupal/Core/Queue/QueueDatabaseFactory.php
+++ b/web/core/lib/Drupal/Core/Queue/QueueDatabaseFactory.php
@@ -22,7 +22,7 @@ class QueueDatabaseFactory {
    * @param \Drupal\Core\Database\Connection $connection
    *   The Connection object containing the key-value tables.
    */
-  function __construct(Connection $connection) {
+  public function __construct(Connection $connection) {
     $this->connection = $connection;
   }
 
diff --git a/web/core/lib/Drupal/Core/Queue/QueueFactory.php b/web/core/lib/Drupal/Core/Queue/QueueFactory.php
index db493d9f9..6df7c5e60 100644
--- a/web/core/lib/Drupal/Core/Queue/QueueFactory.php
+++ b/web/core/lib/Drupal/Core/Queue/QueueFactory.php
@@ -18,7 +18,7 @@ class QueueFactory implements ContainerAwareInterface {
    *
    * @var array
    */
-  protected $queues = array();
+  protected $queues = [];
 
   /**
    * The settings object.
@@ -31,7 +31,7 @@ class QueueFactory implements ContainerAwareInterface {
   /**
    * Constructs a queue factory.
    */
-  function __construct(Settings $settings) {
+  public function __construct(Settings $settings) {
     $this->settings = $settings;
   }
 
diff --git a/web/core/lib/Drupal/Core/Render/BubbleableMetadata.php b/web/core/lib/Drupal/Core/Render/BubbleableMetadata.php
index d1e43c9c6..33aa755ea 100644
--- a/web/core/lib/Drupal/Core/Render/BubbleableMetadata.php
+++ b/web/core/lib/Drupal/Core/Render/BubbleableMetadata.php
@@ -149,7 +149,7 @@ class BubbleableMetadata extends CacheableMetadata implements AttachmentsInterfa
     // correctly; adding the same settings multiple times needs to behave
     // idempotently.
     if (!empty($a['drupalSettings']) && !empty($b['drupalSettings'])) {
-      $drupalSettings = NestedArray::mergeDeepArray(array($a['drupalSettings'], $b['drupalSettings']), TRUE);
+      $drupalSettings = NestedArray::mergeDeepArray([$a['drupalSettings'], $b['drupalSettings']], TRUE);
       // No need for re-merging them.
       unset($a['drupalSettings']);
       unset($b['drupalSettings']);
diff --git a/web/core/lib/Drupal/Core/Render/Element.php b/web/core/lib/Drupal/Core/Render/Element.php
index c150519ad..e394a3994 100644
--- a/web/core/lib/Drupal/Core/Render/Element.php
+++ b/web/core/lib/Drupal/Core/Render/Element.php
@@ -74,7 +74,7 @@ class Element {
 
     // Filter out properties from the element, leaving only children.
     $count = count($elements);
-    $child_weights = array();
+    $child_weights = [];
     $i = 0;
     $sortable = FALSE;
     foreach ($elements as $key => $value) {
@@ -94,7 +94,7 @@ class Element {
         // Only trigger an error if the value is not null.
         // @see https://www.drupal.org/node/1283892
         elseif (isset($value)) {
-          trigger_error(SafeMarkup::format('"@key" is an invalid render array key', array('@key' => $key)), E_USER_ERROR);
+          trigger_error(SafeMarkup::format('"@key" is an invalid render array key', ['@key' => $key]), E_USER_ERROR);
         }
       }
       $i++;
@@ -127,7 +127,7 @@ class Element {
    *   The array keys of the element's visible children.
    */
   public static function getVisibleChildren(array $elements) {
-    $visible_children = array();
+    $visible_children = [];
 
     foreach (static::children($elements) as $key) {
       $child = $elements[$key];
diff --git a/web/core/lib/Drupal/Core/Render/Element/Actions.php b/web/core/lib/Drupal/Core/Render/Element/Actions.php
index 1f94466d8..2e7516548 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Actions.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Actions.php
@@ -3,6 +3,7 @@
 namespace Drupal\Core\Render\Element;
 
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Render\Element;
 
 /**
@@ -30,16 +31,16 @@ class Actions extends Container {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#process' => array(
+    return [
+      '#process' => [
         // @todo Move this to #pre_render.
-        array($class, 'preRenderActionsDropbutton'),
-        array($class, 'processActions'),
-        array($class, 'processContainer'),
-      ),
+        [$class, 'preRenderActionsDropbutton'],
+        [$class, 'processActions'],
+        [$class, 'processContainer'],
+      ],
       '#weight' => 100,
-      '#theme_wrappers' => array('container'),
-    );
+      '#theme_wrappers' => ['container'],
+    ];
   }
 
   /**
@@ -86,23 +87,27 @@ class Actions extends Container {
    *   into new #type 'dropbutton' elements.
    */
   public static function preRenderActionsDropbutton(&$element, FormStateInterface $form_state, &$complete_form) {
-    $dropbuttons = array();
+    $dropbuttons = [];
     foreach (Element::children($element, TRUE) as $key) {
       if (isset($element[$key]['#dropbutton'])) {
         $dropbutton = $element[$key]['#dropbutton'];
         // If there is no dropbutton for this button group yet, create one.
         if (!isset($dropbuttons[$dropbutton])) {
-          $dropbuttons[$dropbutton] = array(
+          $dropbuttons[$dropbutton] = [
             '#type' => 'dropbutton',
-          );
+          ];
         }
         // Add this button to the corresponding dropbutton.
         // @todo Change #type 'dropbutton' to be based on item-list.html.twig
         //   instead of links.html.twig to avoid this preemptive rendering.
         $button = \Drupal::service('renderer')->renderPlain($element[$key]);
-        $dropbuttons[$dropbutton]['#links'][$key] = array(
+        $dropbuttons[$dropbutton]['#links'][$key] = [
           'title' => $button,
-        );
+        ];
+        // Merge metadata like drupalSettings.
+        BubbleableMetadata::createFromRenderArray($dropbuttons[$dropbutton])
+          ->merge(BubbleableMetadata::createFromRenderArray($element[$key]))
+          ->applyTo($dropbuttons[$dropbutton]);
       }
     }
     // @todo For now, all dropbuttons appear first. Consider to invent a more
diff --git a/web/core/lib/Drupal/Core/Render/Element/Ajax.php b/web/core/lib/Drupal/Core/Render/Element/Ajax.php
index 672e4ca77..d22d7edf2 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Ajax.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Ajax.php
@@ -21,11 +21,11 @@ class Ajax extends RenderElement {
     // an HTML page, so we don't provide defaults for #theme or #theme_wrappers.
     // However, modules can set these properties (for example, to provide an
     // HTML debugging page that displays rather than executes Ajax commands).
-    return array(
+    return [
       '#header' => TRUE,
-      '#commands' => array(),
+      '#commands' => [],
       '#error' => NULL,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Button.php b/web/core/lib/Drupal/Core/Render/Element/Button.php
index c5b84f078..63451ea06 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Button.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Button.php
@@ -37,21 +37,21 @@ class Button extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#name' => 'op',
       '#is_button' => TRUE,
       '#executes_submit_callback' => FALSE,
       '#limit_validation_errors' => FALSE,
-      '#process' => array(
-        array($class, 'processButton'),
-        array($class, 'processAjaxForm'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderButton'),
-      ),
-      '#theme_wrappers' => array('input__submit'),
-    );
+      '#process' => [
+        [$class, 'processButton'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderButton'],
+      ],
+      '#theme_wrappers' => ['input__submit'],
+    ];
   }
 
   /**
@@ -81,7 +81,7 @@ class Button extends FormElement {
    */
   public static function preRenderButton($element) {
     $element['#attributes']['type'] = 'submit';
-    Element::setAttributes($element, array('id', 'name', 'value'));
+    Element::setAttributes($element, ['id', 'name', 'value']);
 
     $element['#attributes']['class'][] = 'button';
     if (!empty($element['#button_type'])) {
diff --git a/web/core/lib/Drupal/Core/Render/Element/Checkbox.php b/web/core/lib/Drupal/Core/Render/Element/Checkbox.php
index c9b881704..9092314df 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Checkbox.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Checkbox.php
@@ -30,22 +30,22 @@ class Checkbox extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#return_value' => 1,
-      '#process' => array(
-        array($class, 'processCheckbox'),
-        array($class, 'processAjaxForm'),
-        array($class, 'processGroup'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderCheckbox'),
-        array($class, 'preRenderGroup'),
-      ),
+      '#process' => [
+        [$class, 'processCheckbox'],
+        [$class, 'processAjaxForm'],
+        [$class, 'processGroup'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderCheckbox'],
+        [$class, 'preRenderGroup'],
+      ],
       '#theme' => 'input__checkbox',
-      '#theme_wrappers' => array('form_element'),
+      '#theme_wrappers' => ['form_element'],
       '#title_display' => 'after',
-    );
+    ];
   }
 
   /**
@@ -93,13 +93,13 @@ class Checkbox extends FormElement {
    */
   public static function preRenderCheckbox($element) {
     $element['#attributes']['type'] = 'checkbox';
-    Element::setAttributes($element, array('id', 'name', '#return_value' => 'value'));
+    Element::setAttributes($element, ['id', 'name', '#return_value' => 'value']);
 
     // Unchecked checkbox has #value of integer 0.
     if (!empty($element['#checked'])) {
       $element['#attributes']['checked'] = 'checked';
     }
-    static::setAttributes($element, array('form-checkbox'));
+    static::setAttributes($element, ['form-checkbox']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Checkboxes.php b/web/core/lib/Drupal/Core/Render/Element/Checkboxes.php
index 78108b539..3663cd57b 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Checkboxes.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Checkboxes.php
@@ -37,27 +37,27 @@ class Checkboxes extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
-      '#process' => array(
-        array($class, 'processCheckboxes'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderCompositeFormElement'),
-      ),
-      '#theme_wrappers' => array('checkboxes'),
-    );
+      '#process' => [
+        [$class, 'processCheckboxes'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderCompositeFormElement'],
+      ],
+      '#theme_wrappers' => ['checkboxes'],
+    ];
   }
 
   /**
    * Processes a checkboxes form element.
    */
   public static function processCheckboxes(&$element, FormStateInterface $form_state, &$complete_form) {
-    $value = is_array($element['#value']) ? $element['#value'] : array();
+    $value = is_array($element['#value']) ? $element['#value'] : [];
     $element['#tree'] = TRUE;
     if (count($element['#options']) > 0) {
       if (!isset($element['#default_value']) || $element['#default_value'] == 0) {
-        $element['#default_value'] = array();
+        $element['#default_value'] = [];
       }
       $weight = 0;
       foreach ($element['#options'] as $key => $choice) {
@@ -73,8 +73,8 @@ class Checkboxes extends FormElement {
         // sub-elements.
         $weight += 0.001;
 
-        $element += array($key => array());
-        $element[$key] += array(
+        $element += [$key => []];
+        $element[$key] += [
           '#type' => 'checkbox',
           '#title' => $choice,
           '#return_value' => $key,
@@ -84,7 +84,7 @@ class Checkboxes extends FormElement {
           // Errors should only be shown on the parent checkboxes element.
           '#error_no_message' => TRUE,
           '#weight' => $weight,
-        );
+        ];
       }
     }
     return $element;
@@ -95,8 +95,8 @@ class Checkboxes extends FormElement {
    */
   public static function valueCallback(&$element, $input, FormStateInterface $form_state) {
     if ($input === FALSE) {
-      $value = array();
-      $element += array('#default_value' => array());
+      $value = [];
+      $element += ['#default_value' => []];
       foreach ($element['#default_value'] as $key) {
         $value[$key] = $key;
       }
@@ -118,7 +118,7 @@ class Checkboxes extends FormElement {
       return array_combine($input, $input);
     }
     else {
-      return array();
+      return [];
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/Render/Element/Color.php b/web/core/lib/Drupal/Core/Render/Element/Color.php
index 0f0228cc1..716a0760d 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Color.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Color.php
@@ -30,20 +30,20 @@ class Color extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
-      '#process' => array(
-        array($class, 'processAjaxForm'),
-      ),
-      '#element_validate' => array(
-        array($class, 'validateColor'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderColor'),
-      ),
+      '#process' => [
+        [$class, 'processAjaxForm'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateColor'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderColor'],
+      ],
       '#theme' => 'input__color',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -63,7 +63,7 @@ class Color extends FormElement {
         $form_state->setValueForElement($element, ColorUtility::rgbToHex(ColorUtility::hexToRgb($value)));
       }
       catch (\InvalidArgumentException $e) {
-        $form_state->setError($element, t('%name must be a valid color.', array('%name' => empty($element['#title']) ? $element['#parents'][0] : $element['#title'])));
+        $form_state->setError($element, t('%name must be a valid color.', ['%name' => empty($element['#title']) ? $element['#parents'][0] : $element['#title']]));
       }
     }
   }
@@ -80,8 +80,8 @@ class Color extends FormElement {
    */
   public static function preRenderColor($element) {
     $element['#attributes']['type'] = 'color';
-    Element::setAttributes($element, array('id', 'name', 'value'));
-    static::setAttributes($element, array('form-color'));
+    Element::setAttributes($element, ['id', 'name', 'value']);
+    static::setAttributes($element, ['form-color']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Container.php b/web/core/lib/Drupal/Core/Render/Element/Container.php
index eb46f20ce..212000d7b 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Container.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Container.php
@@ -45,16 +45,16 @@ class Container extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#process' => array(
-        array($class, 'processGroup'),
-        array($class, 'processContainer'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderGroup'),
-      ),
-      '#theme_wrappers' => array('container'),
-    );
+    return [
+      '#process' => [
+        [$class, 'processGroup'],
+        [$class, 'processContainer'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderGroup'],
+      ],
+      '#theme_wrappers' => ['container'],
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Render/Element/Date.php b/web/core/lib/Drupal/Core/Render/Element/Date.php
index 7a0801d9c..11e15d844 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Date.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Date.php
@@ -88,8 +88,8 @@ class Date extends FormElement {
     if (empty($element['#attributes']['type'])) {
       $element['#attributes']['type'] = 'date';
     }
-    Element::setAttributes($element, array('id', 'name', 'type', 'min', 'max', 'step', 'value', 'size'));
-    static::setAttributes($element, array('form-' . $element['#attributes']['type']));
+    Element::setAttributes($element, ['id', 'name', 'type', 'min', 'max', 'step', 'value', 'size']);
+    static::setAttributes($element, ['form-' . $element['#attributes']['type']]);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Details.php b/web/core/lib/Drupal/Core/Render/Element/Details.php
index ae25d345a..92bbb32bd 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Details.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Details.php
@@ -41,19 +41,19 @@ class Details extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#open' => FALSE,
       '#value' => NULL,
-      '#process' => array(
-        array($class, 'processGroup'),
-        array($class, 'processAjaxForm'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderDetails'),
-        array($class, 'preRenderGroup'),
-      ),
-      '#theme_wrappers' => array('details'),
-    );
+      '#process' => [
+        [$class, 'processGroup'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderDetails'],
+        [$class, 'preRenderGroup'],
+      ],
+      '#theme_wrappers' => ['details'],
+    ];
   }
 
   /**
@@ -67,15 +67,17 @@ class Details extends RenderElement {
    *   The modified element.
    */
   public static function preRenderDetails($element) {
-    Element::setAttributes($element, array('id'));
+    Element::setAttributes($element, ['id']);
 
     // The .js-form-wrapper class is required for #states to treat details like
     // containers.
-    static::setAttributes($element, array('js-form-wrapper', 'form-wrapper'));
+    static::setAttributes($element, ['js-form-wrapper', 'form-wrapper']);
 
     // Collapsible details.
     $element['#attached']['library'][] = 'core/drupal.collapse';
-    if (!empty($element['#open'])) {
+
+    // Open the detail if specified or if a child has an error.
+    if (!empty($element['#open']) || !empty($element['#children_errors'])) {
       $element['#attributes']['open'] = 'open';
     }
 
diff --git a/web/core/lib/Drupal/Core/Render/Element/Dropbutton.php b/web/core/lib/Drupal/Core/Render/Element/Dropbutton.php
index 30f975532..682f5cce5 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Dropbutton.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Dropbutton.php
@@ -46,12 +46,12 @@ class Dropbutton extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#pre_render' => array(
-        array($class, 'preRenderDropbutton'),
-      ),
+    return [
+      '#pre_render' => [
+        [$class, 'preRenderDropbutton'],
+      ],
       '#theme' => 'links__dropbutton',
-    );
+    ];
   }
 
   /**
@@ -61,7 +61,7 @@ class Dropbutton extends RenderElement {
     $element['#attached']['library'][] = 'core/drupal.dropbutton';
     $element['#attributes']['class'][] = 'dropbutton';
     if (!isset($element['#theme_wrappers'])) {
-      $element['#theme_wrappers'] = array();
+      $element['#theme_wrappers'] = [];
     }
     array_unshift($element['#theme_wrappers'], 'dropbutton_wrapper');
 
diff --git a/web/core/lib/Drupal/Core/Render/Element/ElementInterface.php b/web/core/lib/Drupal/Core/Render/Element/ElementInterface.php
index 320a83dca..12cb67d3a 100644
--- a/web/core/lib/Drupal/Core/Render/Element/ElementInterface.php
+++ b/web/core/lib/Drupal/Core/Render/Element/ElementInterface.php
@@ -47,6 +47,6 @@ interface ElementInterface extends PluginInspectionInterface {
    * @param array $class
    *   Array of new class names to be added.
    */
-  public static function setAttributes(&$element, $class = array());
+  public static function setAttributes(&$element, $class = []);
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Email.php b/web/core/lib/Drupal/Core/Render/Element/Email.php
index 247967667..dce2a344c 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Email.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Email.php
@@ -43,25 +43,25 @@ class Email extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#size' => 60,
       '#maxlength' => self::EMAIL_MAX_LENGTH,
       '#autocomplete_route_name' => FALSE,
-      '#process' => array(
-        array($class, 'processAutocomplete'),
-        array($class, 'processAjaxForm'),
-        array($class, 'processPattern'),
-      ),
-      '#element_validate' => array(
-        array($class, 'validateEmail'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderEmail'),
-      ),
+      '#process' => [
+        [$class, 'processAutocomplete'],
+        [$class, 'processAjaxForm'],
+        [$class, 'processPattern'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateEmail'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderEmail'],
+      ],
       '#theme' => 'input__email',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -74,7 +74,7 @@ class Email extends FormElement {
     $form_state->setValueForElement($element, $value);
 
     if ($value !== '' && !\Drupal::service('email.validator')->isValid($value)) {
-      $form_state->setError($element, t('The email address %mail is not valid.', array('%mail' => $value)));
+      $form_state->setError($element, t('The email address %mail is not valid.', ['%mail' => $value]));
     }
   }
 
@@ -91,8 +91,8 @@ class Email extends FormElement {
    */
   public static function preRenderEmail($element) {
     $element['#attributes']['type'] = 'email';
-    Element::setAttributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
-    static::setAttributes($element, array('form-email'));
+    Element::setAttributes($element, ['id', 'name', 'value', 'size', 'maxlength', 'placeholder']);
+    static::setAttributes($element, ['form-email']);
     return $element;
   }
 
diff --git a/web/core/lib/Drupal/Core/Render/Element/Fieldgroup.php b/web/core/lib/Drupal/Core/Render/Element/Fieldgroup.php
index a1bc1eec2..6c73c35f6 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Fieldgroup.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Fieldgroup.php
@@ -19,9 +19,9 @@ namespace Drupal\Core\Render\Element;
 class Fieldgroup extends Fieldset {
 
   public function getInfo() {
-    return array(
-      '#attributes' => array('class' => array('fieldgroup')),
-    ) + parent::getInfo();
+    return [
+      '#attributes' => ['class' => ['fieldgroup']],
+    ] + parent::getInfo();
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Fieldset.php b/web/core/lib/Drupal/Core/Render/Element/Fieldset.php
index d8cb54033..baed39136 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Fieldset.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Fieldset.php
@@ -30,17 +30,17 @@ class Fieldset extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#process' => array(
-        array($class, 'processGroup'),
-        array($class, 'processAjaxForm'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderGroup'),
-      ),
+    return [
+      '#process' => [
+        [$class, 'processGroup'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderGroup'],
+      ],
       '#value' => NULL,
-      '#theme_wrappers' => array('fieldset'),
-    );
+      '#theme_wrappers' => ['fieldset'],
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/File.php b/web/core/lib/Drupal/Core/Render/Element/File.php
index d37d5c7c1..07bd41507 100644
--- a/web/core/lib/Drupal/Core/Render/Element/File.php
+++ b/web/core/lib/Drupal/Core/Render/Element/File.php
@@ -24,19 +24,19 @@ class File extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#multiple' => FALSE,
-      '#process' => array(
-        array($class, 'processFile'),
-      ),
+      '#process' => [
+        [$class, 'processFile'],
+      ],
       '#size' => 60,
-      '#pre_render' => array(
-        array($class, 'preRenderFile'),
-      ),
+      '#pre_render' => [
+        [$class, 'preRenderFile'],
+      ],
       '#theme' => 'input__file',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -44,7 +44,7 @@ class File extends FormElement {
    */
   public static function processFile(&$element, FormStateInterface $form_state, &$complete_form) {
     if ($element['#multiple']) {
-      $element['#attributes'] = array('multiple' => 'multiple');
+      $element['#attributes'] = ['multiple' => 'multiple'];
       $element['#name'] .= '[]';
     }
     return $element;
@@ -66,8 +66,8 @@ class File extends FormElement {
    */
   public static function preRenderFile($element) {
     $element['#attributes']['type'] = 'file';
-    Element::setAttributes($element, array('id', 'name', 'size'));
-    static::setAttributes($element, array('js-form-file', 'form-file'));
+    Element::setAttributes($element, ['id', 'name', 'size']);
+    static::setAttributes($element, ['js-form-file', 'form-file']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Form.php b/web/core/lib/Drupal/Core/Render/Element/Form.php
index 61739caf0..d81c2545c 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Form.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Form.php
@@ -13,10 +13,10 @@ class Form extends RenderElement {
    * {@inheritdoc}
    */
   public function getInfo() {
-    return array(
+    return [
       '#method' => 'post',
-      '#theme_wrappers' => array('form'),
-    );
+      '#theme_wrappers' => ['form'],
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/FormElement.php b/web/core/lib/Drupal/Core/Render/Element/FormElement.php
index 513f103df..0168d2beb 100644
--- a/web/core/lib/Drupal/Core/Render/Element/FormElement.php
+++ b/web/core/lib/Drupal/Core/Render/Element/FormElement.php
@@ -108,7 +108,7 @@ abstract class FormElement extends RenderElement implements FormElementInterface
   public static function processPattern(&$element, FormStateInterface $form_state, &$complete_form) {
     if (isset($element['#pattern']) && !isset($element['#attributes']['pattern'])) {
       $element['#attributes']['pattern'] = $element['#pattern'];
-      $element['#element_validate'][] = array(get_called_class(), 'validatePattern');
+      $element['#element_validate'][] = [get_called_class(), 'validatePattern'];
     }
 
     return $element;
@@ -136,7 +136,7 @@ abstract class FormElement extends RenderElement implements FormElementInterface
       $pattern = '{^(?:' . $element['#pattern'] . ')$}';
 
       if (!preg_match($pattern, $element['#value'])) {
-        $form_state->setError($element, t('%name field is not in the right format.', array('%name' => $element['#title'])));
+        $form_state->setError($element, t('%name field is not in the right format.', ['%name' => $element['#title']]));
       }
     }
   }
@@ -178,7 +178,7 @@ abstract class FormElement extends RenderElement implements FormElementInterface
     $access = FALSE;
 
     if (!empty($element['#autocomplete_route_name'])) {
-      $parameters = isset($element['#autocomplete_route_parameters']) ? $element['#autocomplete_route_parameters'] : array();
+      $parameters = isset($element['#autocomplete_route_parameters']) ? $element['#autocomplete_route_parameters'] : [];
       $url = Url::fromRoute($element['#autocomplete_route_name'], $parameters)->toString(TRUE);
       /** @var \Drupal\Core\Access\AccessManagerInterface $access_manager */
       $access_manager = \Drupal::service('access_manager');
diff --git a/web/core/lib/Drupal/Core/Render/Element/Hidden.php b/web/core/lib/Drupal/Core/Render/Element/Hidden.php
index 8e1f8560a..6fb62ffc9 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Hidden.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Hidden.php
@@ -31,16 +31,16 @@ class Hidden extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
-      '#process' => array(
-        array($class, 'processAjaxForm'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderHidden'),
-      ),
+      '#process' => [
+        [$class, 'processAjaxForm'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderHidden'],
+      ],
       '#theme' => 'input__hidden',
-    );
+    ];
   }
 
   /**
@@ -55,7 +55,7 @@ class Hidden extends FormElement {
    */
   public static function preRenderHidden($element) {
     $element['#attributes']['type'] = 'hidden';
-    Element::setAttributes($element, array('name', 'value'));
+    Element::setAttributes($element, ['name', 'value']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Html.php b/web/core/lib/Drupal/Core/Render/Element/Html.php
index 0a83d5609..fb79b94e9 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Html.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Html.php
@@ -13,13 +13,13 @@ class Html extends RenderElement {
    * {@inheritdoc}
    */
   public function getInfo() {
-    return array(
+    return [
       '#theme' => 'html',
       // HTML5 Shiv
-      '#attached' => array(
-        'library' => array('core/html5shiv'),
-      ),
-    );
+      '#attached' => [
+        'library' => ['core/html5shiv'],
+      ],
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/web/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 1d71350fa..0b9ac91e4 100644
--- a/web/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/web/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -38,24 +38,24 @@ class HtmlTag extends RenderElement {
    * @see http://www.w3.org/TR/html5/syntax.html#syntax-start-tag
    * @see http://www.w3.org/TR/html5/syntax.html#void-elements
    */
-  static protected $voidElements = array(
+  static protected $voidElements = [
     'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input',
     'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr',
-  );
+  ];
 
   /**
    * {@inheritdoc}
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#pre_render' => array(
-        array($class, 'preRenderConditionalComments'),
-        array($class, 'preRenderHtmlTag'),
-      ),
-      '#attributes' => array(),
+    return [
+      '#pre_render' => [
+        [$class, 'preRenderConditionalComments'],
+        [$class, 'preRenderHtmlTag'],
+      ],
+      '#attributes' => [],
       '#value' => NULL,
-    );
+    ];
   }
 
   /**
@@ -132,11 +132,11 @@ class HtmlTag extends RenderElement {
    *   added to '#prefix' and '#suffix'.
    */
   public static function preRenderConditionalComments($element) {
-    $browsers = isset($element['#browsers']) ? $element['#browsers'] : array();
-    $browsers += array(
+    $browsers = isset($element['#browsers']) ? $element['#browsers'] : [];
+    $browsers += [
       'IE' => TRUE,
       '!IE' => TRUE,
-    );
+    ];
 
     // If rendering in all browsers, no need for conditional comments.
     if ($browsers['IE'] === TRUE && $browsers['!IE']) {
diff --git a/web/core/lib/Drupal/Core/Render/Element/ImageButton.php b/web/core/lib/Drupal/Core/Render/Element/ImageButton.php
index a7d8be376..2404ba808 100644
--- a/web/core/lib/Drupal/Core/Render/Element/ImageButton.php
+++ b/web/core/lib/Drupal/Core/Render/Element/ImageButton.php
@@ -19,12 +19,12 @@ class ImageButton extends Submit {
     $info = parent::getInfo();
     unset($info['name']);
 
-    return array(
+    return [
       '#return_value' => TRUE,
       '#has_garbage_value' => TRUE,
       '#src' => NULL,
-      '#theme_wrappers' => array('input__image_button'),
-    ) + $info;
+      '#theme_wrappers' => ['input__image_button'],
+    ] + $info;
   }
 
   /**
@@ -68,7 +68,7 @@ class ImageButton extends Submit {
    */
   public static function preRenderButton($element) {
     $element['#attributes']['type'] = 'image';
-    Element::setAttributes($element, array('id', 'name', 'value'));
+    Element::setAttributes($element, ['id', 'name', 'value']);
 
     $element['#attributes']['src'] = file_url_transform_relative(file_create_url($element['#src']));
     if (!empty($element['#title'])) {
diff --git a/web/core/lib/Drupal/Core/Render/Element/InlineTemplate.php b/web/core/lib/Drupal/Core/Render/Element/InlineTemplate.php
index 2fbdf433f..0005ea274 100644
--- a/web/core/lib/Drupal/Core/Render/Element/InlineTemplate.php
+++ b/web/core/lib/Drupal/Core/Render/Element/InlineTemplate.php
@@ -30,13 +30,13 @@ class InlineTemplate extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#pre_render' => array(
-        array($class, 'preRenderInlineTemplate'),
-      ),
+    return [
+      '#pre_render' => [
+        [$class, 'preRenderInlineTemplate'],
+      ],
       '#template' => '',
-      '#context' => array(),
-    );
+      '#context' => [],
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Render/Element/Item.php b/web/core/lib/Drupal/Core/Render/Element/Item.php
index b952da1e9..6c282b379 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Item.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Item.php
@@ -17,7 +17,7 @@ class Item extends FormElement {
    * {@inheritdoc}
    */
   public function getInfo() {
-    return array(
+    return [
       // Forms that show author fields to both anonymous and authenticated users
       // need to dynamically switch between #type 'textfield' and #type 'item'
       // to automatically take over the authenticated user's information.
@@ -25,8 +25,8 @@ class Item extends FormElement {
       // assigned by Form API based on the #default_value or #value properties.
       '#input' => TRUE,
       '#markup' => '',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Label.php b/web/core/lib/Drupal/Core/Render/Element/Label.php
index 1dbaa70c8..28eb6a0d4 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Label.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Label.php
@@ -17,9 +17,9 @@ class Label extends RenderElement {
    * {@inheritdoc}
    */
   public function getInfo() {
-    return array(
+    return [
       '#theme' => 'form_element_label',
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/LanguageSelect.php b/web/core/lib/Drupal/Core/Render/Element/LanguageSelect.php
index 0e6011d30..bd0a3c0a4 100644
--- a/web/core/lib/Drupal/Core/Render/Element/LanguageSelect.php
+++ b/web/core/lib/Drupal/Core/Render/Element/LanguageSelect.php
@@ -21,10 +21,10 @@ class LanguageSelect extends FormElement {
    * {@inheritdoc}
    */
   public function getInfo() {
-    return array(
+    return [
       '#input' => TRUE,
       '#default_value' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Link.php b/web/core/lib/Drupal/Core/Render/Element/Link.php
index 3888c7938..216f068a4 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Link.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Link.php
@@ -33,11 +33,11 @@ class Link extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#pre_render' => array(
-        array($class, 'preRenderLink'),
-      ),
-    );
+    return [
+      '#pre_render' => [
+        [$class, 'preRenderLink'],
+      ],
+    ];
   }
 
   /**
@@ -58,12 +58,12 @@ class Link extends RenderElement {
   public static function preRenderLink($element) {
     // By default, link options to pass to the link generator are normally set
     // in #options.
-    $element += array('#options' => array());
+    $element += ['#options' => []];
     // However, within the scope of renderable elements, #attributes is a valid
     // way to specify attributes, too. Take them into account, but do not override
     // attributes from #options.
     if (isset($element['#attributes'])) {
-      $element['#options'] += array('attributes' => array());
+      $element['#options'] += ['attributes' => []];
       $element['#options']['attributes'] += $element['#attributes'];
     }
 
diff --git a/web/core/lib/Drupal/Core/Render/Element/MachineName.php b/web/core/lib/Drupal/Core/Render/Element/MachineName.php
index 6cf455942..ace452b07 100644
--- a/web/core/lib/Drupal/Core/Render/Element/MachineName.php
+++ b/web/core/lib/Drupal/Core/Render/Element/MachineName.php
@@ -75,27 +75,27 @@ class MachineName extends Textfield {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#default_value' => NULL,
       '#required' => TRUE,
       '#maxlength' => 64,
       '#size' => 60,
       '#autocomplete_route_name' => FALSE,
-      '#process' => array(
-        array($class, 'processMachineName'),
-        array($class, 'processAutocomplete'),
-        array($class, 'processAjaxForm'),
-      ),
-      '#element_validate' => array(
-        array($class, 'validateMachineName'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderTextfield'),
-      ),
+      '#process' => [
+        [$class, 'processMachineName'],
+        [$class, 'processAutocomplete'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateMachineName'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderTextfield'],
+      ],
       '#theme' => 'input__textfield',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -128,19 +128,19 @@ class MachineName extends Textfield {
     $language = \Drupal::languageManager()->getCurrentLanguage();
 
     // Apply default form element properties.
-    $element += array(
+    $element += [
       '#title' => t('Machine-readable name'),
       '#description' => t('A unique machine-readable name. Can only contain lowercase letters, numbers, and underscores.'),
-      '#machine_name' => array(),
+      '#machine_name' => [],
       '#field_prefix' => '',
       '#field_suffix' => '',
       '#suffix' => '',
-    );
+    ];
     // A form element that only wants to set one #machine_name property (usually
     // 'source' only) would leave all other properties undefined, if the defaults
     // were defined by an element plugin. Therefore, we apply the defaults here.
-    $element['#machine_name'] += array(
-      'source' => array('label'),
+    $element['#machine_name'] += [
+      'source' => ['label'],
       'target' => '#' . $element['#id'],
       'label' => t('Machine name'),
       'replace_pattern' => '[^a-z0-9_]+',
@@ -148,14 +148,14 @@ class MachineName extends Textfield {
       'standalone' => FALSE,
       'field_prefix' => $element['#field_prefix'],
       'field_suffix' => $element['#field_suffix'],
-    );
+    ];
 
     // By default, machine names are restricted to Latin alphanumeric characters.
     // So, default to LTR directionality.
     if (!isset($element['#attributes'])) {
-      $element['#attributes'] = array();
+      $element['#attributes'] = [];
     }
-    $element['#attributes'] += array('dir' => LanguageInterface::DIRECTION_LTR);
+    $element['#attributes'] += ['dir' => LanguageInterface::DIRECTION_LTR];
 
     // The source element defaults to array('name'), but may have been overridden.
     if (empty($element['#machine_name']['source'])) {
@@ -180,10 +180,10 @@ class MachineName extends Textfield {
     else {
       // Append a field suffix to the source form element, which will contain
       // the live preview of the machine name.
-      $source += array('#field_suffix' => '');
+      $source += ['#field_suffix' => ''];
       $source['#field_suffix'] = $source['#field_suffix'] . ' <small id="' . $suffix_id . '">&nbsp;</small>';
 
-      $parents = array_merge($element['#machine_name']['source'], array('#field_suffix'));
+      $parents = array_merge($element['#machine_name']['source'], ['#field_suffix']);
       NestedArray::setValue($form_state->getCompleteForm(), $parents, $source['#field_suffix']);
     }
 
diff --git a/web/core/lib/Drupal/Core/Render/Element/MoreLink.php b/web/core/lib/Drupal/Core/Render/Element/MoreLink.php
index 7c042b22c..596c66068 100644
--- a/web/core/lib/Drupal/Core/Render/Element/MoreLink.php
+++ b/web/core/lib/Drupal/Core/Render/Element/MoreLink.php
@@ -27,14 +27,14 @@ class MoreLink extends Link {
    */
   public function getInfo() {
     $info = parent::getInfo();
-    return array(
+    return [
       '#title' => $this->t('More'),
-      '#theme_wrappers' => array(
-        'container' => array(
-          '#attributes' => array('class' => array('more-link')),
-        ),
-      ),
-    ) + $info;
+      '#theme_wrappers' => [
+        'container' => [
+          '#attributes' => ['class' => ['more-link']],
+        ],
+      ],
+    ] + $info;
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Number.php b/web/core/lib/Drupal/Core/Render/Element/Number.php
index 788aa1e6c..b7b252412 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Number.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Number.php
@@ -38,21 +38,21 @@ class Number extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#step' => 1,
-      '#process' => array(
-        array($class, 'processAjaxForm'),
-      ),
-      '#element_validate' => array(
-        array($class, 'validateNumber'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderNumber'),
-      ),
+      '#process' => [
+        [$class, 'processAjaxForm'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateNumber'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderNumber'],
+      ],
       '#theme' => 'input__number',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -70,18 +70,18 @@ class Number extends FormElement {
 
     // Ensure the input is numeric.
     if (!is_numeric($value)) {
-      $form_state->setError($element, t('%name must be a number.', array('%name' => $name)));
+      $form_state->setError($element, t('%name must be a number.', ['%name' => $name]));
       return;
     }
 
     // Ensure that the input is greater than the #min property, if set.
     if (isset($element['#min']) && $value < $element['#min']) {
-      $form_state->setError($element, t('%name must be higher than or equal to %min.', array('%name' => $name, '%min' => $element['#min'])));
+      $form_state->setError($element, t('%name must be higher than or equal to %min.', ['%name' => $name, '%min' => $element['#min']]));
     }
 
     // Ensure that the input is less than the #max property, if set.
     if (isset($element['#max']) && $value > $element['#max']) {
-      $form_state->setError($element, t('%name must be lower than or equal to %max.', array('%name' => $name, '%max' => $element['#max'])));
+      $form_state->setError($element, t('%name must be lower than or equal to %max.', ['%name' => $name, '%max' => $element['#max']]));
     }
 
     if (isset($element['#step']) && strtolower($element['#step']) != 'any') {
@@ -90,7 +90,7 @@ class Number extends FormElement {
       $offset = isset($element['#min']) ? $element['#min'] : 0.0;
 
       if (!NumberUtility::validStep($value, $element['#step'], $offset)) {
-        $form_state->setError($element, t('%name is not a valid number.', array('%name' => $name)));
+        $form_state->setError($element, t('%name is not a valid number.', ['%name' => $name]));
       }
     }
   }
@@ -108,8 +108,8 @@ class Number extends FormElement {
    */
   public static function preRenderNumber($element) {
     $element['#attributes']['type'] = 'number';
-    Element::setAttributes($element, array('id', 'name', 'value', 'step', 'min', 'max', 'placeholder', 'size'));
-    static::setAttributes($element, array('form-number'));
+    Element::setAttributes($element, ['id', 'name', 'value', 'step', 'min', 'max', 'placeholder', 'size']);
+    static::setAttributes($element, ['form-number']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Operations.php b/web/core/lib/Drupal/Core/Render/Element/Operations.php
index a0c972836..3a53cd703 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Operations.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Operations.php
@@ -19,9 +19,9 @@ class Operations extends Dropbutton {
    * {@inheritdoc}
    */
   public function getInfo() {
-    return array(
+    return [
       '#theme' => 'links__dropbutton__operations',
-    ) + parent::getInfo();
+    ] + parent::getInfo();
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Page.php b/web/core/lib/Drupal/Core/Render/Element/Page.php
index 7aeef85fe..c7a4e070c 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Page.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Page.php
@@ -15,10 +15,10 @@ class Page extends RenderElement {
    * {@inheritdoc}
    */
   public function getInfo() {
-    return array(
+    return [
       '#theme' => 'page',
       '#title' => '',
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Password.php b/web/core/lib/Drupal/Core/Render/Element/Password.php
index 06d5532e5..4ba205839 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Password.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Password.php
@@ -32,20 +32,20 @@ class Password extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#size' => 60,
       '#maxlength' => 128,
-      '#process' => array(
-        array($class, 'processAjaxForm'),
-        array($class, 'processPattern'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderPassword'),
-      ),
+      '#process' => [
+        [$class, 'processAjaxForm'],
+        [$class, 'processPattern'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderPassword'],
+      ],
       '#theme' => 'input__password',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -61,8 +61,8 @@ class Password extends FormElement {
    */
   public static function preRenderPassword($element) {
     $element['#attributes']['type'] = 'password';
-    Element::setAttributes($element, array('id', 'name', 'size', 'maxlength', 'placeholder'));
-    static::setAttributes($element, array('form-text'));
+    Element::setAttributes($element, ['id', 'name', 'size', 'maxlength', 'placeholder']);
+    static::setAttributes($element, ['form-text']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php b/web/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php
index 0d5e0e286..07c31490f 100644
--- a/web/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php
+++ b/web/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php
@@ -33,14 +33,14 @@ class PasswordConfirm extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#markup' => '',
-      '#process' => array(
-        array($class, 'processPasswordConfirm'),
-      ),
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#process' => [
+        [$class, 'processPasswordConfirm'],
+      ],
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -68,23 +68,23 @@ class PasswordConfirm extends FormElement {
    * Expand a password_confirm field into two text boxes.
    */
   public static function processPasswordConfirm(&$element, FormStateInterface $form_state, &$complete_form) {
-    $element['pass1'] = array(
+    $element['pass1'] = [
       '#type' => 'password',
       '#title' => t('Password'),
       '#value' => empty($element['#value']) ? NULL : $element['#value']['pass1'],
       '#required' => $element['#required'],
-      '#attributes' => array('class' => array('password-field', 'js-password-field')),
+      '#attributes' => ['class' => ['password-field', 'js-password-field']],
       '#error_no_message' => TRUE,
-    );
-    $element['pass2'] = array(
+    ];
+    $element['pass2'] = [
       '#type' => 'password',
       '#title' => t('Confirm password'),
       '#value' => empty($element['#value']) ? NULL : $element['#value']['pass2'],
       '#required' => $element['#required'],
-      '#attributes' => array('class' => array('password-confirm', 'js-password-confirm')),
+      '#attributes' => ['class' => ['password-confirm', 'js-password-confirm']],
       '#error_no_message' => TRUE,
-    );
-    $element['#element_validate'] = array(array(get_called_class(), 'validatePasswordConfirm'));
+    ];
+    $element['#element_validate'] = [[get_called_class(), 'validatePasswordConfirm']];
     $element['#tree'] = TRUE;
 
     if (isset($element['#size'])) {
diff --git a/web/core/lib/Drupal/Core/Render/Element/PathElement.php b/web/core/lib/Drupal/Core/Render/Element/PathElement.php
index ee466ef55..b08dbc7ea 100644
--- a/web/core/lib/Drupal/Core/Render/Element/PathElement.php
+++ b/web/core/lib/Drupal/Core/Render/Element/PathElement.php
@@ -38,9 +38,9 @@ class PathElement extends Textfield {
     $class = get_class($this);
     $info['#validate_path'] = TRUE;
     $info['#convert_path'] = self::CONVERT_ROUTE;
-    $info['#element_validate'] = array(
-      array($class, 'validateMatchedPath'),
-    );
+    $info['#element_validate'] = [
+      [$class, 'validateMatchedPath'],
+    ];
     return $info;
   }
 
@@ -73,10 +73,10 @@ class PathElement extends Textfield {
         // We do the value conversion here whilst the Url object is in scope
         // after validation has occurred.
         if ($element['#convert_path'] == self::CONVERT_ROUTE) {
-          $form_state->setValueForElement($element, array(
+          $form_state->setValueForElement($element, [
             'route_name' => $url->getRouteName(),
             'route_parameters' => $url->getRouteParameters(),
-          ));
+          ]);
           return;
         }
         elseif ($element['#convert_path'] == self::CONVERT_URL) {
@@ -84,9 +84,9 @@ class PathElement extends Textfield {
           return;
         }
       }
-      $form_state->setError($element, t('This path does not exist or you do not have permission to link to %path.', array(
+      $form_state->setError($element, t('This path does not exist or you do not have permission to link to %path.', [
         '%path' => $element['#value'],
-      )));
+      ]));
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/Render/Element/Radio.php b/web/core/lib/Drupal/Core/Render/Element/Radio.php
index ae20284b9..8687a9dcf 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Radio.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Radio.php
@@ -22,19 +22,19 @@ class Radio extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#default_value' => NULL,
-      '#process' => array(
-        array($class, 'processAjaxForm'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderRadio'),
-      ),
+      '#process' => [
+        [$class, 'processAjaxForm'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderRadio'],
+      ],
       '#theme' => 'input__radio',
-      '#theme_wrappers' => array('form_element'),
+      '#theme_wrappers' => ['form_element'],
       '#title_display' => 'after',
-    );
+    ];
   }
 
   /**
@@ -52,12 +52,12 @@ class Radio extends FormElement {
    */
   public static function preRenderRadio($element) {
     $element['#attributes']['type'] = 'radio';
-    Element::setAttributes($element, array('id', 'name', '#return_value' => 'value'));
+    Element::setAttributes($element, ['id', 'name', '#return_value' => 'value']);
 
     if (isset($element['#return_value']) && $element['#value'] !== FALSE && $element['#value'] == $element['#return_value']) {
       $element['#attributes']['checked'] = 'checked';
     }
-    static::setAttributes($element, array('form-radio'));
+    static::setAttributes($element, ['form-radio']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Radios.php b/web/core/lib/Drupal/Core/Render/Element/Radios.php
index e7179f479..2c9797a3c 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Radios.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Radios.php
@@ -37,16 +37,16 @@ class Radios extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
-      '#process' => array(
-        array($class, 'processRadios'),
-      ),
-      '#theme_wrappers' => array('radios'),
-      '#pre_render' => array(
-        array($class, 'preRenderCompositeFormElement'),
-      ),
-    );
+      '#process' => [
+        [$class, 'processRadios'],
+      ],
+      '#theme_wrappers' => ['radios'],
+      '#pre_render' => [
+        [$class, 'preRenderCompositeFormElement'],
+      ],
+    ];
   }
 
   /**
@@ -61,11 +61,11 @@ class Radios extends FormElement {
         // sub-elements.
         $weight += 0.001;
 
-        $element += array($key => array());
+        $element += [$key => []];
         // Generate the parents as the autogenerator does, so we will have a
         // unique id for each radio button.
-        $parents_for_id = array_merge($element['#parents'], array($key));
-        $element[$key] += array(
+        $parents_for_id = array_merge($element['#parents'], [$key]);
+        $element[$key] += [
           '#type' => 'radio',
           '#title' => $choice,
           // The key is sanitized in Drupal\Core\Template\Attribute during output
@@ -81,7 +81,7 @@ class Radios extends FormElement {
           // Errors should only be shown on the parent radios element.
           '#error_no_message' => TRUE,
           '#weight' => $weight,
-        );
+        ];
       }
     }
     return $element;
diff --git a/web/core/lib/Drupal/Core/Render/Element/Range.php b/web/core/lib/Drupal/Core/Render/Element/Range.php
index d28d787c2..24595abdd 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Range.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Range.php
@@ -35,14 +35,14 @@ class Range extends Number {
   public function getInfo() {
     $info = parent::getInfo();
     $class = get_class($this);
-    return array(
+    return [
       '#min' => 0,
       '#max' => 100,
-      '#pre_render' => array(
-        array($class, 'preRenderRange'),
-      ),
+      '#pre_render' => [
+        [$class, 'preRenderRange'],
+      ],
       '#theme' => 'input__range',
-    ) + $info;
+    ] + $info;
   }
 
   /**
@@ -58,8 +58,8 @@ class Range extends Number {
    */
   public static function preRenderRange($element) {
     $element['#attributes']['type'] = 'range';
-    Element::setAttributes($element, array('id', 'name', 'value', 'step', 'min', 'max'));
-    static::setAttributes($element, array('form-range'));
+    Element::setAttributes($element, ['id', 'name', 'value', 'step', 'min', 'max']);
+    static::setAttributes($element, ['form-range']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/RenderElement.php b/web/core/lib/Drupal/Core/Render/Element/RenderElement.php
index 1f39e1050..243a9af76 100644
--- a/web/core/lib/Drupal/Core/Render/Element/RenderElement.php
+++ b/web/core/lib/Drupal/Core/Render/Element/RenderElement.php
@@ -126,10 +126,10 @@ abstract class RenderElement extends PluginBase implements ElementInterface {
   /**
    * {@inheritdoc}
    */
-  public static function setAttributes(&$element, $class = array()) {
+  public static function setAttributes(&$element, $class = []) {
     if (!empty($class)) {
       if (!isset($element['#attributes']['class'])) {
-        $element['#attributes']['class'] = array();
+        $element['#attributes']['class'] = [];
       }
       $element['#attributes']['class'] = array_merge($element['#attributes']['class'], $class);
     }
@@ -398,7 +398,7 @@ abstract class RenderElement extends PluginBase implements ElementInterface {
 
       // Convert a simple #ajax['progress'] string into an array.
       if (isset($settings['progress']) && is_string($settings['progress'])) {
-        $settings['progress'] = array('type' => $settings['progress']);
+        $settings['progress'] = ['type' => $settings['progress']];
       }
       // Change progress path to a full URL.
       if (isset($settings['progress']['url']) && $settings['progress']['url'] instanceof Url) {
diff --git a/web/core/lib/Drupal/Core/Render/Element/Search.php b/web/core/lib/Drupal/Core/Render/Element/Search.php
index 45333c5da..01db3b7ec 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Search.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Search.php
@@ -26,21 +26,21 @@ class Search extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#size' => 60,
       '#maxlength' => 128,
       '#autocomplete_route_name' => FALSE,
-      '#process' => array(
-        array($class, 'processAutocomplete'),
-        array($class, 'processAjaxForm'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderSearch'),
-      ),
+      '#process' => [
+        [$class, 'processAutocomplete'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderSearch'],
+      ],
       '#theme' => 'input__search',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -56,8 +56,8 @@ class Search extends FormElement {
    */
   public static function preRenderSearch($element) {
     $element['#attributes']['type'] = 'search';
-    Element::setAttributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
-    static::setAttributes($element, array('form-search'));
+    Element::setAttributes($element, ['id', 'name', 'value', 'size', 'maxlength', 'placeholder']);
+    static::setAttributes($element, ['form-search']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Select.php b/web/core/lib/Drupal/Core/Render/Element/Select.php
index b1e0f4ab6..300c244fc 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Select.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Select.php
@@ -65,20 +65,20 @@ class Select extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#multiple' => FALSE,
-      '#process' => array(
-        array($class, 'processSelect'),
-        array($class, 'processAjaxForm'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderSelect'),
-      ),
+      '#process' => [
+        [$class, 'processSelect'],
+        [$class, 'processAjaxForm'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderSelect'],
+      ],
       '#theme' => 'select',
-      '#theme_wrappers' => array('form_element'),
-      '#options' => array(),
-    );
+      '#theme_wrappers' => ['form_element'],
+      '#options' => [],
+    ];
   }
 
   /**
@@ -118,14 +118,14 @@ class Select extends FormElement {
       // make a choice. Also, if there's a value for #empty_value or
       // #empty_option, then add an option that represents emptiness.
       if (($required && !isset($element['#default_value'])) || isset($element['#empty_value']) || isset($element['#empty_option'])) {
-        $element += array(
+        $element += [
           '#empty_value' => '',
           '#empty_option' => $required ? t('- Select -') : t('- None -'),
-        );
+        ];
         // The empty option is prepended to #options and purposively not merged
         // to prevent another option in #options mistakenly using the same value
         // as #empty_value.
-        $empty_option = array($element['#empty_value'] => $element['#empty_option']);
+        $empty_option = [$element['#empty_value'] => $element['#empty_option']];
         $element['#options'] = $empty_option + $element['#options'];
       }
     }
@@ -142,10 +142,10 @@ class Select extends FormElement {
         // unselected. A disabled multi-select always submits NULL, and the
         // default value should be used.
         if (empty($element['#disabled'])) {
-          return (is_array($input)) ? array_combine($input, $input) : array();
+          return (is_array($input)) ? array_combine($input, $input) : [];
         }
         else {
-          return (isset($element['#default_value']) && is_array($element['#default_value'])) ? $element['#default_value'] : array();
+          return (isset($element['#default_value']) && is_array($element['#default_value'])) ? $element['#default_value'] : [];
         }
       }
       // Non-multiple select elements may have an empty option prepended to them
@@ -167,8 +167,8 @@ class Select extends FormElement {
    * Prepares a select render element.
    */
   public static function preRenderSelect($element) {
-    Element::setAttributes($element, array('id', 'name', 'size'));
-    static::setAttributes($element, array('form-select'));
+    Element::setAttributes($element, ['id', 'name', 'size']);
+    static::setAttributes($element, ['form-select']);
     return $element;
   }
 
diff --git a/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php b/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
index d16c245a1..530457fd9 100644
--- a/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
+++ b/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
@@ -73,17 +73,22 @@ class StatusMessages extends RenderElement {
    * @see drupal_get_messages()
    */
   public static function renderMessages($type) {
-    // Render the messages.
-    return [
-      '#theme' => 'status_messages',
-      // @todo Improve when https://www.drupal.org/node/2278383 lands.
-      '#message_list' => drupal_get_messages($type),
-      '#status_headings' => [
-        'status' => t('Status message'),
-        'error' => t('Error message'),
-        'warning' => t('Warning message'),
-      ],
-    ];
+    $render = [];
+    $messages = drupal_get_messages($type);
+    if ($messages) {
+      // Render the messages.
+      $render = [
+        '#theme' => 'status_messages',
+        // @todo Improve when https://www.drupal.org/node/2278383 lands.
+        '#message_list' => $messages,
+        '#status_headings' => [
+          'status' => t('Status message'),
+          'error' => t('Error message'),
+          'warning' => t('Warning message'),
+        ],
+      ];
+    }
+    return $render;
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/StatusReport.php b/web/core/lib/Drupal/Core/Render/Element/StatusReport.php
new file mode 100644
index 000000000..d91306613
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Render/Element/StatusReport.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Drupal\Core\Render\Element;
+
+/**
+ * Creates status report page element.
+ *
+ * @RenderElement("status_report")
+ */
+class StatusReport extends RenderElement {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInfo() {
+    $class = get_class($this);
+    return [
+      '#theme' => 'status_report_grouped',
+      '#priorities' => [
+        'error',
+        'warning',
+        'checked',
+        'ok',
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderGroupRequirements'],
+      ],
+    ];
+  }
+
+  /**
+   * #pre_render callback to group requirements.
+   */
+  public static function preRenderGroupRequirements($element) {
+    $severities = static::getSeverities();
+    $grouped_requirements = [];
+    foreach ($element['#requirements'] as $key => $requirement) {
+      $severity = $severities[REQUIREMENT_INFO];
+      if (isset($requirement['severity'])) {
+        $requirement_severity = (int) $requirement['severity'] === REQUIREMENT_OK ? REQUIREMENT_INFO : (int) $requirement['severity'];
+        $severity = $severities[$requirement_severity];
+      }
+      elseif (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') {
+        $severity = $severities[REQUIREMENT_OK];
+      }
+
+      $grouped_requirements[$severity['status']]['title'] = $severity['title'];
+      $grouped_requirements[$severity['status']]['type'] = $severity['status'];
+      $grouped_requirements[$severity['status']]['items'][$key] = $requirement;
+    }
+
+    // Order the grouped requirements by a set order.
+    $order = array_flip($element['#priorities']);
+    uksort($grouped_requirements, function ($a, $b) use ($order) {
+      return $order[$a] > $order[$b];
+    });
+
+    $element['#grouped_requirements'] = $grouped_requirements;
+
+    return $element;
+  }
+
+  /**
+   * Gets the severities.
+   *
+   * @return array
+   */
+  public static function getSeverities() {
+    return [
+      REQUIREMENT_INFO => [
+        'title' => t('Checked'),
+        'status' => 'checked',
+      ],
+      REQUIREMENT_OK => [
+        'title' => t('OK'),
+        'status' => 'ok',
+      ],
+      REQUIREMENT_WARNING => [
+        'title' => t('Warnings found'),
+        'status' => 'warning',
+      ],
+      REQUIREMENT_ERROR => [
+        'title' => t('Errors found'),
+        'status' => 'error',
+      ],
+    ];
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Render/Element/Submit.php b/web/core/lib/Drupal/Core/Render/Element/Submit.php
index 4fa52bd1f..4ac7685a5 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Submit.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Submit.php
@@ -32,9 +32,9 @@ class Submit extends Button {
    * {@inheritdoc}
    */
   public function getInfo() {
-    return array(
+    return [
       '#executes_submit_callback' => TRUE,
-    ) + parent::getInfo();
+    ] + parent::getInfo();
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/SystemCompactLink.php b/web/core/lib/Drupal/Core/Render/Element/SystemCompactLink.php
index 455113d4b..89f39a846 100644
--- a/web/core/lib/Drupal/Core/Render/Element/SystemCompactLink.php
+++ b/web/core/lib/Drupal/Core/Render/Element/SystemCompactLink.php
@@ -24,17 +24,17 @@ class SystemCompactLink extends Link {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#pre_render' => array(
-        array($class, 'preRenderCompactLink'),
-        array($class, 'preRenderLink'),
-      ),
-      '#theme_wrappers' => array(
-        'container' => array(
-          '#attributes' => array('class' => array('compact-link')),
-        ),
-      ),
-    );
+    return [
+      '#pre_render' => [
+        [$class, 'preRenderCompactLink'],
+        [$class, 'preRenderLink'],
+      ],
+      '#theme_wrappers' => [
+        'container' => [
+          '#attributes' => ['class' => ['compact-link']],
+        ],
+      ],
+    ];
   }
 
   /**
@@ -58,23 +58,23 @@ class SystemCompactLink extends Link {
    */
   public static function preRenderCompactLink($element) {
     // By default, link options to pass to l() are normally set in #options.
-    $element += array('#options' => array());
+    $element += ['#options' => []];
 
     if (system_admin_compact_mode()) {
       $element['#title'] = t('Show descriptions');
-      $element['#url'] = BaseUrl::fromRoute('system.admin_compact_page', array('mode' => 'off'));
-      $element['#options'] = array(
-        'attributes' => array('title' => t('Expand layout to include descriptions.')),
+      $element['#url'] = BaseUrl::fromRoute('system.admin_compact_page', ['mode' => 'off']);
+      $element['#options'] = [
+        'attributes' => ['title' => t('Expand layout to include descriptions.')],
         'query' => \Drupal::destination()->getAsArray()
-      );
+      ];
     }
     else {
       $element['#title'] = t('Hide descriptions');
-      $element['#url'] = BaseUrl::fromRoute('system.admin_compact_page', array('mode' => 'on'));
-      $element['#options'] = array(
-        'attributes' => array('title' => t('Compress layout by hiding descriptions.')),
+      $element['#url'] = BaseUrl::fromRoute('system.admin_compact_page', ['mode' => 'on']);
+      $element['#options'] = [
+        'attributes' => ['title' => t('Compress layout by hiding descriptions.')],
         'query' => \Drupal::destination()->getAsArray(),
-      );
+      ];
     }
 
     $options = NestedArray::mergeDeep($element['#url']->getOptions(), $element['#options']);
diff --git a/web/core/lib/Drupal/Core/Render/Element/Table.php b/web/core/lib/Drupal/Core/Render/Element/Table.php
index 298a27fa6..c6c08b106 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Table.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Table.php
@@ -65,9 +65,9 @@ class Table extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#header' => array(),
-      '#rows' => array(),
+    return [
+      '#header' => [],
+      '#rows' => [],
       '#empty' => '',
       // Properties for tableselect support.
       '#input' => TRUE,
@@ -77,24 +77,24 @@ class Table extends FormElement {
       '#responsive' => TRUE,
       '#multiple' => TRUE,
       '#js_select' => TRUE,
-      '#process' => array(
-        array($class, 'processTable'),
-      ),
-      '#element_validate' => array(
-        array($class, 'validateTable'),
-      ),
+      '#process' => [
+        [$class, 'processTable'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateTable'],
+      ],
       // Properties for tabledrag support.
       // The value is a list of arrays that are passed to
       // drupal_attach_tabledrag(). Table::preRenderTable() prepends the HTML ID
       // of the table to each set of options.
       // @see drupal_attach_tabledrag()
-      '#tabledrag' => array(),
+      '#tabledrag' => [],
       // Render properties.
-      '#pre_render' => array(
-        array($class, 'preRenderTable'),
-      ),
+      '#pre_render' => [
+        [$class, 'preRenderTable'],
+      ],
       '#theme' => 'table',
-    );
+    ];
   }
 
   /**
@@ -108,12 +108,12 @@ class Table extends FormElement {
       // #default_value property.
       // @todo D8: Remove this inconsistency.
       if ($input === FALSE) {
-        $element += array('#default_value' => array());
+        $element += ['#default_value' => []];
         $value = array_keys(array_filter($element['#default_value']));
         return array_combine($value, $value);
       }
       else {
-        return is_array($input) ? array_combine($input, $input) : array();
+        return is_array($input) ? array_combine($input, $input) : [];
       }
     }
   }
@@ -135,7 +135,7 @@ class Table extends FormElement {
   public static function processTable(&$element, FormStateInterface $form_state, &$complete_form) {
     if ($element['#tableselect']) {
       if ($element['#multiple']) {
-        $value = is_array($element['#value']) ? $element['#value'] : array();
+        $value = is_array($element['#value']) ? $element['#value'] : [];
       }
       // Advanced selection behavior makes no sense for radios.
       else {
@@ -145,7 +145,7 @@ class Table extends FormElement {
       // @todo D8: Rename into #select_all?
       if ($element['#js_select']) {
         $element['#attached']['library'][] = 'core/drupal.tableselect';
-        array_unshift($element['#header'], array('class' => array('select-all')));
+        array_unshift($element['#header'], ['class' => ['select-all']]);
       }
       // Add an empty header column for radio buttons or when a "Select all"
       // checkbox is not desired.
@@ -154,7 +154,7 @@ class Table extends FormElement {
       }
 
       if (!isset($element['#default_value']) || $element['#default_value'] === 0) {
-        $element['#default_value'] = array();
+        $element['#default_value'] = [];
       }
       // Create a checkbox or radio for each row in a way that the value of the
       // tableselect element behaves as if it had been of #type checkboxes or
@@ -165,7 +165,7 @@ class Table extends FormElement {
         // Their values have to be located in child keys (#tree is ignored),
         // since Table::validateTable() has to be able to validate whether input
         // (for the parent #type 'table' element) has been submitted.
-        $element_parents = array_merge($element['#parents'], array($key));
+        $element_parents = array_merge($element['#parents'], [$key]);
 
         // Since the #parents of the tableselect form element will equal the
         // #parents of the row element, prevent FormBuilder from auto-generating
@@ -202,23 +202,23 @@ class Table extends FormElement {
               }
             }
             if (isset($title) && $title !== '') {
-              $title = t('Update @title', array('@title' => $title));
+              $title = t('Update @title', ['@title' => $title]);
             }
           }
 
           // Prepend the select column to existing columns.
-          $row = array('select' => array()) + $row;
-          $row['select'] += array(
+          $row = ['select' => []] + $row;
+          $row['select'] += [
             '#type' => $element['#multiple'] ? 'checkbox' : 'radio',
             '#id' => HtmlUtility::getUniqueId('edit-' . implode('-', $element_parents)),
             // @todo If rows happen to use numeric indexes instead of string keys,
             //   this results in a first row with $key === 0, which is always FALSE.
             '#return_value' => $key,
             '#attributes' => $element['#attributes'],
-            '#wrapper_attributes' => array(
-              'class' => array('table-select'),
-            ),
-          );
+            '#wrapper_attributes' => [
+              'class' => ['table-select'],
+            ],
+          ];
           if ($element['#multiple']) {
             $row['select']['#default_value'] = isset($value[$key]) ? $key : NULL;
             $row['select']['#parents'] = $element_parents;
@@ -339,7 +339,7 @@ class Table extends FormElement {
    */
   public static function preRenderTable($element) {
     foreach (Element::children($element) as $first) {
-      $row = array('data' => array());
+      $row = ['data' => []];
       // Apply attributes of first-level elements as table row attributes.
       if (isset($element[$first]['#attributes'])) {
         $row += $element[$first]['#attributes'];
@@ -350,7 +350,7 @@ class Table extends FormElement {
       foreach (Element::children($element[$first]) as $second) {
         // Assign the element by reference, so any potential changes to the
         // original element are taken over.
-        $column = array('data' => &$element[$first][$second]);
+        $column = ['data' => &$element[$first][$second]];
 
         // Apply wrapper attributes of second-level elements as table cell
         // attributes.
@@ -364,7 +364,7 @@ class Table extends FormElement {
     }
 
     // Take over $element['#id'] as HTML ID attribute, if not already set.
-    Element::setAttributes($element, array('id'));
+    Element::setAttributes($element, ['id']);
 
     // Add sticky headers, if applicable.
     if (count($element['#header']) && $element['#sticky']) {
diff --git a/web/core/lib/Drupal/Core/Render/Element/Tableselect.php b/web/core/lib/Drupal/Core/Render/Element/Tableselect.php
index faa288e47..a8f0e9596 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Tableselect.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Tableselect.php
@@ -57,23 +57,23 @@ class Tableselect extends Table {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#js_select' => TRUE,
       '#multiple' => TRUE,
       '#responsive' => TRUE,
       '#sticky' => FALSE,
-      '#pre_render' => array(
-        array($class, 'preRenderTable'),
-        array($class, 'preRenderTableselect'),
-      ),
-      '#process' => array(
-        array($class, 'processTableselect'),
-      ),
-      '#options' => array(),
+      '#pre_render' => [
+        [$class, 'preRenderTable'],
+        [$class, 'preRenderTableselect'],
+      ],
+      '#process' => [
+        [$class, 'processTableselect'],
+      ],
+      '#options' => [],
       '#empty' => '',
       '#theme' => 'table__tableselect',
-    );
+    ];
   }
 
   /**
@@ -87,8 +87,8 @@ class Tableselect extends Table {
       // keys of the #default_value property. This differs from the checkboxes
       // element which uses the array values.
       if ($input === FALSE) {
-        $value = array();
-        $element += array('#default_value' => array());
+        $value = [];
+        $element += ['#default_value' => []];
         foreach ($element['#default_value'] as $key => $flag) {
           if ($flag) {
             $value[$key] = $key;
@@ -97,7 +97,7 @@ class Tableselect extends Table {
         return $value;
       }
       else {
-        return is_array($input) ? array_combine($input, $input) : array();
+        return is_array($input) ? array_combine($input, $input) : [];
       }
     }
   }
@@ -147,14 +147,14 @@ class Tableselect extends Table {
    *   The processed element.
    */
   public static function preRenderTableselect($element) {
-    $rows = array();
+    $rows = [];
     $header = $element['#header'];
     if (!empty($element['#options'])) {
       // Generate a table row for each selectable item in #options.
       foreach (Element::children($element) as $key) {
-        $row = array();
+        $row = [];
 
-        $row['data'] = array();
+        $row['data'] = [];
         if (isset($element['#options'][$key]['#attributes'])) {
           $row += $element['#options'][$key]['#attributes'];
         }
@@ -187,7 +187,7 @@ class Tableselect extends Table {
       if ($element['#js_select']) {
         // Add a "Select all" checkbox.
         $element['#attached']['library'][] = 'core/drupal.tableselect';
-        array_unshift($header, array('class' => array('select-all')));
+        array_unshift($header, ['class' => ['select-all']]);
       }
       else {
         // Add an empty header when radio buttons are displayed or a "Select all"
@@ -218,7 +218,7 @@ class Tableselect extends Table {
    */
   public static function processTableselect(&$element, FormStateInterface $form_state, &$complete_form) {
     if ($element['#multiple']) {
-      $value = is_array($element['#value']) ? $element['#value'] : array();
+      $value = is_array($element['#value']) ? $element['#value'] : [];
     }
     else {
       // Advanced selection behavior makes no sense for radios.
@@ -229,7 +229,7 @@ class Tableselect extends Table {
 
     if (count($element['#options']) > 0) {
       if (!isset($element['#default_value']) || $element['#default_value'] === 0) {
-        $element['#default_value'] = array();
+        $element['#default_value'] = [];
       }
 
       // Create a checkbox or radio for each item in #options in such a way that
@@ -242,12 +242,12 @@ class Tableselect extends Table {
             $title = '';
             if (isset($element['#options'][$key]['title']) && is_array($element['#options'][$key]['title'])) {
               if (!empty($element['#options'][$key]['title']['data']['#title'])) {
-                $title = new TranslatableMarkup('Update @title', array(
+                $title = new TranslatableMarkup('Update @title', [
                   '@title' => $element['#options'][$key]['title']['data']['#title'],
-                ));
+                ]);
               }
             }
-            $element[$key] = array(
+            $element[$key] = [
               '#type' => 'checkbox',
               '#title' => $title,
               '#title_display' => 'invisible',
@@ -255,13 +255,13 @@ class Tableselect extends Table {
               '#default_value' => isset($value[$key]) ? $key : NULL,
               '#attributes' => $element['#attributes'],
               '#ajax' => isset($element['#ajax']) ? $element['#ajax'] : NULL,
-            );
+            ];
           }
           else {
             // Generate the parents as the autogenerator does, so we will have a
             // unique id for each radio button.
-            $parents_for_id = array_merge($element['#parents'], array($key));
-            $element[$key] = array(
+            $parents_for_id = array_merge($element['#parents'], [$key]);
+            $element[$key] = [
               '#type' => 'radio',
               '#title' => '',
               '#return_value' => $key,
@@ -270,7 +270,7 @@ class Tableselect extends Table {
               '#parents' => $element['#parents'],
               '#id' => HtmlUtility::getUniqueId('edit-' . implode('-', $parents_for_id)),
               '#ajax' => isset($element['#ajax']) ? $element['#ajax'] : NULL,
-            );
+            ];
           }
           if (isset($element['#options'][$key]['#weight'])) {
             $element[$key]['#weight'] = $element['#options'][$key]['#weight'];
@@ -279,7 +279,7 @@ class Tableselect extends Table {
       }
     }
     else {
-      $element['#value'] = array();
+      $element['#value'] = [];
     }
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Tel.php b/web/core/lib/Drupal/Core/Render/Element/Tel.php
index 090939384..9289a1d02 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Tel.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Tel.php
@@ -32,22 +32,22 @@ class Tel extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#size' => 30,
       '#maxlength' => 128,
       '#autocomplete_route_name' => FALSE,
-      '#process' => array(
-        array($class, 'processAutocomplete'),
-        array($class, 'processAjaxForm'),
-        array($class, 'processPattern'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderTel'),
-      ),
+      '#process' => [
+        [$class, 'processAutocomplete'],
+        [$class, 'processAjaxForm'],
+        [$class, 'processPattern'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderTel'],
+      ],
       '#theme' => 'input__tel',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -63,8 +63,8 @@ class Tel extends FormElement {
    */
   public static function preRenderTel($element) {
     $element['#attributes']['type'] = 'tel';
-    Element::setAttributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
-    static::setAttributes($element, array('form-tel'));
+    Element::setAttributes($element, ['id', 'name', 'value', 'size', 'maxlength', 'placeholder']);
+    static::setAttributes($element, ['form-tel']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Textarea.php b/web/core/lib/Drupal/Core/Render/Element/Textarea.php
index f9286ea64..340bc114e 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Textarea.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Textarea.php
@@ -33,21 +33,21 @@ class Textarea extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#cols' => 60,
       '#rows' => 5,
       '#resizable' => 'vertical',
-      '#process' => array(
-        array($class, 'processAjaxForm'),
-        array($class, 'processGroup'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderGroup'),
-      ),
+      '#process' => [
+        [$class, 'processAjaxForm'],
+        [$class, 'processGroup'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderGroup'],
+      ],
       '#theme' => 'textarea',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Render/Element/Textfield.php b/web/core/lib/Drupal/Core/Render/Element/Textfield.php
index 1cb35e8a3..0bdc294a0 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Textfield.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Textfield.php
@@ -47,24 +47,24 @@ class Textfield extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#size' => 60,
       '#maxlength' => 128,
       '#autocomplete_route_name' => FALSE,
-      '#process' => array(
-        array($class, 'processAutocomplete'),
-        array($class, 'processAjaxForm'),
-        array($class, 'processPattern'),
-        array($class, 'processGroup'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderTextfield'),
-        array($class, 'preRenderGroup'),
-      ),
+      '#process' => [
+        [$class, 'processAutocomplete'],
+        [$class, 'processAjaxForm'],
+        [$class, 'processPattern'],
+        [$class, 'processGroup'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderTextfield'],
+        [$class, 'preRenderGroup'],
+      ],
       '#theme' => 'input__textfield',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -77,7 +77,7 @@ class Textfield extends FormElement {
       if (!is_scalar($input)) {
         $input = '';
       }
-      return str_replace(array("\r", "\n"), '', $input);
+      return str_replace(["\r", "\n"], '', $input);
     }
     return NULL;
   }
@@ -95,8 +95,8 @@ class Textfield extends FormElement {
    */
   public static function preRenderTextfield($element) {
     $element['#attributes']['type'] = 'text';
-    Element::setAttributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
-    static::setAttributes($element, array('form-text'));
+    Element::setAttributes($element, ['id', 'name', 'value', 'size', 'maxlength', 'placeholder']);
+    static::setAttributes($element, ['form-text']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Token.php b/web/core/lib/Drupal/Core/Render/Element/Token.php
index 2f9e03add..aa244356c 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Token.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Token.php
@@ -21,13 +21,13 @@ class Token extends Hidden {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
-      '#pre_render' => array(
-        array($class, 'preRenderHidden'),
-      ),
+      '#pre_render' => [
+        [$class, 'preRenderHidden'],
+      ],
       '#theme' => 'input__hidden',
-    );
+    ];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Render/Element/Url.php b/web/core/lib/Drupal/Core/Render/Element/Url.php
index c66cadc63..c3574b095 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Url.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Url.php
@@ -34,25 +34,25 @@ class Url extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#size' => 60,
       '#maxlength' => 255,
       '#autocomplete_route_name' => FALSE,
-      '#process' => array(
-        array($class, 'processAutocomplete'),
-        array($class, 'processAjaxForm'),
-        array($class, 'processPattern'),
-      ),
-      '#element_validate' => array(
-        array($class, 'validateUrl'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderUrl'),
-      ),
+      '#process' => [
+        [$class, 'processAutocomplete'],
+        [$class, 'processAjaxForm'],
+        [$class, 'processPattern'],
+      ],
+      '#element_validate' => [
+        [$class, 'validateUrl'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderUrl'],
+      ],
       '#theme' => 'input__url',
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
   }
 
   /**
@@ -65,7 +65,7 @@ class Url extends FormElement {
     $form_state->setValueForElement($element, $value);
 
     if ($value !== '' && !UrlHelper::isValid($value, TRUE)) {
-      $form_state->setError($element, t('The URL %url is not valid.', array('%url' => $value)));
+      $form_state->setError($element, t('The URL %url is not valid.', ['%url' => $value]));
     }
   }
 
@@ -82,8 +82,8 @@ class Url extends FormElement {
    */
   public static function preRenderUrl($element) {
     $element['#attributes']['type'] = 'url';
-    Element::setAttributes($element, array('id', 'name', 'value', 'size', 'maxlength', 'placeholder'));
-    static::setAttributes($element, array('form-url'));
+    Element::setAttributes($element, ['id', 'name', 'value', 'size', 'maxlength', 'placeholder']);
+    static::setAttributes($element, ['form-url']);
 
     return $element;
   }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Value.php b/web/core/lib/Drupal/Core/Render/Element/Value.php
index 015b0bdb3..023bb1af0 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Value.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Value.php
@@ -25,9 +25,9 @@ class Value extends FormElement {
    * {@inheritdoc}
    */
   public function getInfo() {
-    return array(
+    return [
       '#input' => TRUE,
-    );
+    ];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/VerticalTabs.php b/web/core/lib/Drupal/Core/Render/Element/VerticalTabs.php
index 1d108aaed..759723b4a 100644
--- a/web/core/lib/Drupal/Core/Render/Element/VerticalTabs.php
+++ b/web/core/lib/Drupal/Core/Render/Element/VerticalTabs.php
@@ -54,16 +54,16 @@ class VerticalTabs extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#default_tab' => '',
-      '#process' => array(
-        array($class, 'processVerticalTabs'),
-      ),
-      '#pre_render' => array(
-        array($class, 'preRenderVerticalTabs'),
-      ),
-      '#theme_wrappers' => array('vertical_tabs', 'form_element'),
-    );
+      '#process' => [
+        [$class, 'processVerticalTabs'],
+      ],
+      '#pre_render' => [
+        [$class, 'preRenderVerticalTabs'],
+      ],
+      '#theme_wrappers' => ['vertical_tabs', 'form_element'],
+    ];
   }
 
   /**
@@ -106,11 +106,11 @@ class VerticalTabs extends RenderElement {
 
     // Inject a new details as child, so that form_process_details() processes
     // this details element like any other details.
-    $element['group'] = array(
+    $element['group'] = [
       '#type' => 'details',
-      '#theme_wrappers' => array(),
+      '#theme_wrappers' => [],
       '#parents' => $element['#parents'],
-    );
+    ];
 
     // Add an invisible label for accessibility.
     if (!isset($element['#title'])) {
@@ -128,11 +128,11 @@ class VerticalTabs extends RenderElement {
     if ($form_state->hasValue($name . '__active_tab')) {
       $element['#default_tab'] = $form_state->getValue($name . '__active_tab');
     }
-    $element[$name . '__active_tab'] = array(
+    $element[$name . '__active_tab'] = [
       '#type' => 'hidden',
       '#default_value' => $element['#default_tab'],
-      '#attributes' => array('class' => array('vertical-tabs__active-tab')),
-    );
+      '#attributes' => ['class' => ['vertical-tabs__active-tab']],
+    ];
     // Clean up the active tab value so it's not accidentally stored in
     // settings forms.
     $form_state->addCleanValueKey($name . '__active_tab');
diff --git a/web/core/lib/Drupal/Core/Render/Element/Weight.php b/web/core/lib/Drupal/Core/Render/Element/Weight.php
index a6ecbee76..468290a1a 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Weight.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Weight.php
@@ -33,15 +33,15 @@ class Weight extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#delta' => 10,
       '#default_value' => 0,
-      '#process' => array(
-        array($class, 'processWeight'),
-        array($class, 'processAjaxForm'),
-      ),
-    );
+      '#process' => [
+        [$class, 'processWeight'],
+        [$class, 'processAjaxForm'],
+      ],
+    ];
   }
 
   /**
@@ -55,7 +55,7 @@ class Weight extends FormElement {
     $max_elements = \Drupal::config('system.site')->get('weight_select_max');
     if ($element['#delta'] <= $max_elements) {
       $element['#type'] = 'select';
-      $weights = array();
+      $weights = [];
       for ($n = (-1 * $element['#delta']); $n <= $element['#delta']; $n++) {
         $weights[$n] = $n;
       }
diff --git a/web/core/lib/Drupal/Core/Render/ElementInfoManager.php b/web/core/lib/Drupal/Core/Render/ElementInfoManager.php
index 175452489..015e3900b 100644
--- a/web/core/lib/Drupal/Core/Render/ElementInfoManager.php
+++ b/web/core/lib/Drupal/Core/Render/ElementInfoManager.php
@@ -75,7 +75,7 @@ class ElementInfoManager extends DefaultPluginManager implements ElementInfoMana
     if (!isset($this->elementInfo[$theme_name])) {
       $this->elementInfo[$theme_name] = $this->buildInfo($theme_name);
     }
-    $info = isset($this->elementInfo[$theme_name][$type]) ? $this->elementInfo[$theme_name][$type] : array();
+    $info = isset($this->elementInfo[$theme_name][$type]) ? $this->elementInfo[$theme_name][$type] : [];
     $info['#defaults_loaded'] = TRUE;
     return $info;
   }
@@ -114,7 +114,7 @@ class ElementInfoManager extends DefaultPluginManager implements ElementInfoMana
       // will receive input, and assign the value callback.
       if ($element instanceof FormElementInterface) {
         $element_info['#input'] = TRUE;
-        $element_info['#value_callback'] = array($definition['class'], 'valueCallback');
+        $element_info['#value_callback'] = [$definition['class'], 'valueCallback'];
       }
       $info[$element_type] = $element_info;
     }
@@ -136,7 +136,7 @@ class ElementInfoManager extends DefaultPluginManager implements ElementInfoMana
    *
    * @return \Drupal\Core\Render\Element\ElementInterface
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     return parent::createInstance($plugin_id, $configuration);
   }
 
diff --git a/web/core/lib/Drupal/Core/Render/ElementInfoManagerInterface.php b/web/core/lib/Drupal/Core/Render/ElementInfoManagerInterface.php
index 1e4948de2..884f21296 100644
--- a/web/core/lib/Drupal/Core/Render/ElementInfoManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Render/ElementInfoManagerInterface.php
@@ -10,8 +10,8 @@ interface ElementInfoManagerInterface {
   /**
    * Retrieves the default properties for the defined element type.
    *
-   * Each of the form element types defined by this hook is assumed to have
-   * a matching theme hook, which should be registered with hook_theme() as
+   * Each of the element types defined by this hook is assumed to have a
+   * matching theme hook, which should be registered with hook_theme() as
    * normal.
    *
    * For more information about custom element types see the explanation at
diff --git a/web/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php b/web/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
index 358b1f1b7..7b171f820 100644
--- a/web/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
+++ b/web/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
@@ -410,10 +410,10 @@ class HtmlResponseAttachmentsProcessor implements AttachmentsResponseProcessorIn
       $attributes = $item[0];
       $should_add_header = isset($item[1]) ? $item[1] : FALSE;
 
-      $element = array(
+      $element = [
         '#tag' => 'link',
         '#attributes' => $attributes,
-      );
+      ];
       $href = $attributes['href'];
       $attached['html_head'][] = [$element, 'html_head_link:' . $attributes['rel'] . ':' . $href];
 
diff --git a/web/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php b/web/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
index 0a1b99398..2b2a2a59b 100644
--- a/web/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
+++ b/web/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
@@ -66,7 +66,7 @@ class AjaxRenderer implements MainContentRendererInterface {
     // replace the element making the Ajax call. The default 'replaceWith'
     // behavior can be changed with #ajax['method'].
     $response->addCommand(new InsertCommand(NULL, $html));
-    $status_messages = array('#type' => 'status_messages');
+    $status_messages = ['#type' => 'status_messages'];
     $output = $this->drupalRenderRoot($status_messages);
     if (!empty($output)) {
       $response->addCommand(new PrependCommand(NULL, $output));
diff --git a/web/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php b/web/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php
index c71604b51..664063a5f 100644
--- a/web/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php
+++ b/web/core/lib/Drupal/Core/Render/MainContent/DialogRenderer.php
@@ -50,7 +50,7 @@ class DialogRenderer implements MainContentRendererInterface {
     $title = isset($main_content['#title']) ? $main_content['#title'] : $this->titleResolver->getTitle($request, $route_match->getRouteObject());
 
     // Determine the dialog options and the target for the OpenDialogCommand.
-    $options = $request->request->get('dialogOptions', array());
+    $options = $request->request->get('dialogOptions', []);
     $target = $this->determineTargetSelector($options, $route_match);
 
     $response->addCommand(new OpenDialogCommand($target, $title, $content, $options));
diff --git a/web/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/web/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
index 54c40f63c..c76a9728d 100644
--- a/web/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
+++ b/web/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
@@ -253,9 +253,9 @@ class HtmlRenderer implements MainContentRendererInterface {
 
       // Generate a #type => page render array using the page display variant,
       // the page display will build the content for the various page regions.
-      $page = array(
+      $page = [
         '#type' => 'page',
-      );
+      ];
       $page += $page_display->build();
     }
 
diff --git a/web/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php b/web/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php
index fcb38e253..60a495122 100644
--- a/web/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php
+++ b/web/core/lib/Drupal/Core/Render/MainContent/ModalRenderer.php
@@ -31,7 +31,7 @@ class ModalRenderer extends DialogRenderer {
 
     // Determine the title: use the title provided by the main content if any,
     // otherwise get it from the routing information.
-    $options = $request->request->get('dialogOptions', array());
+    $options = $request->request->get('dialogOptions', []);
 
     $response->addCommand(new OpenModalDialogCommand($title, $content, $options));
     return $response;
diff --git a/web/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php b/web/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
index de52da2f6..6a5527bde 100644
--- a/web/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
+++ b/web/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
@@ -64,7 +64,7 @@ class MetadataBubblingUrlGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function getPathFromRoute($name, $parameters = array()) {
+  public function getPathFromRoute($name, $parameters = []) {
     return $this->urlGenerator->getPathFromRoute($name, $parameters);
   }
 
@@ -91,7 +91,7 @@ class MetadataBubblingUrlGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH) {
+  public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH) {
     $options['absolute'] = is_bool($referenceType) ? $referenceType : $referenceType === self::ABSOLUTE_URL;
     $generated_url = $this->generateFromRoute($name, $parameters, $options, TRUE);
     $this->bubble($generated_url);
@@ -101,7 +101,7 @@ class MetadataBubblingUrlGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE) {
+  public function generateFromRoute($name, $parameters = [], $options = [], $collect_bubbleable_metadata = FALSE) {
     $generated_url = $this->urlGenerator->generateFromRoute($name, $parameters, $options, TRUE);
     if (!$collect_bubbleable_metadata) {
       $this->bubble($generated_url, $options);
@@ -119,7 +119,7 @@ class MetadataBubblingUrlGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function getRouteDebugMessage($name, array $parameters = array()) {
+  public function getRouteDebugMessage($name, array $parameters = []) {
     return $this->urlGenerator->getRouteDebugMessage($name, $parameters);
   }
 
diff --git a/web/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php b/web/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
index 37ff0f788..3f279c03d 100644
--- a/web/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
+++ b/web/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
@@ -80,7 +80,7 @@ class PageDisplayVariantSelectionEvent extends Event implements RefinableCacheab
   /**
    * The selected page display variant plugin ID.
    *
-   * @return string;
+   * @return string
    */
   public function getPluginId() {
     return $this->pluginId;
diff --git a/web/core/lib/Drupal/Core/Render/PlaceholderGenerator.php b/web/core/lib/Drupal/Core/Render/PlaceholderGenerator.php
index 488ab8812..fad8cf745 100644
--- a/web/core/lib/Drupal/Core/Render/PlaceholderGenerator.php
+++ b/web/core/lib/Drupal/Core/Render/PlaceholderGenerator.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Render;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Cache\Cache;
@@ -84,7 +85,7 @@ class PlaceholderGenerator implements PlaceholderGeneratorInterface {
     // debugging.
     $callback = $placeholder_render_array['#lazy_builder'][0];
     $arguments = UrlHelper::buildQuery($placeholder_render_array['#lazy_builder'][1]);
-    $token = hash('crc32b', serialize($placeholder_render_array));
+    $token = Crypt::hashBase64(serialize($placeholder_render_array));
     $placeholder_markup = '<drupal-render-placeholder callback="' . Html::escape($callback) . '" arguments="' . Html::escape($arguments) . '" token="' . Html::escape($token) . '"></drupal-render-placeholder>';
 
     // Build the placeholder element to return.
diff --git a/web/core/lib/Drupal/Core/Render/Renderer.php b/web/core/lib/Drupal/Core/Render/Renderer.php
index 4bbffc3e7..257349f97 100644
--- a/web/core/lib/Drupal/Core/Render/Renderer.php
+++ b/web/core/lib/Drupal/Core/Render/Renderer.php
@@ -320,9 +320,9 @@ class Renderer implements RendererInterface {
         '#lazy_builder',
         '#cache',
         '#create_placeholder',
-        // These keys are not actually supported, but they are added automatically
-        // by the Renderer, so we don't crash on them; them being missing when
-        // their #lazy_builder callback is invoked won't surprise the developer.
+        // The keys below are not actually supported, but these are added
+        // automatically by the Renderer. Adding them as though they are
+        // supported allows us to avoid throwing an exception 100% of the time.
         '#weight',
         '#printed'
       ];
@@ -383,9 +383,9 @@ class Renderer implements RendererInterface {
     }
 
     // Defaults for bubbleable rendering metadata.
-    $elements['#cache']['tags'] = isset($elements['#cache']['tags']) ? $elements['#cache']['tags'] : array();
+    $elements['#cache']['tags'] = isset($elements['#cache']['tags']) ? $elements['#cache']['tags'] : [];
     $elements['#cache']['max-age'] = isset($elements['#cache']['max-age']) ? $elements['#cache']['max-age'] : Cache::PERMANENT;
-    $elements['#attached'] = isset($elements['#attached']) ? $elements['#attached'] : array();
+    $elements['#attached'] = isset($elements['#attached']) ? $elements['#attached'] : [];
 
     // Allow #pre_render to abort rendering.
     if (!empty($elements['#printed'])) {
@@ -415,11 +415,11 @@ class Renderer implements RendererInterface {
     $theme_is_implemented = isset($elements['#theme']);
     // Check the elements for insecure HTML and pass through sanitization.
     if (isset($elements)) {
-      $markup_keys = array(
+      $markup_keys = [
         '#description',
         '#field_prefix',
         '#field_suffix',
-      );
+      ];
       foreach ($markup_keys as $key) {
         if (!empty($elements[$key]) && is_scalar($elements[$key])) {
           $elements[$key] = $this->xssFilterAdminIfUnsafe($elements[$key]);
diff --git a/web/core/lib/Drupal/Core/Render/theme.api.php b/web/core/lib/Drupal/Core/Render/theme.api.php
index 0dd757322..44fcdd0ca 100644
--- a/web/core/lib/Drupal/Core/Render/theme.api.php
+++ b/web/core/lib/Drupal/Core/Render/theme.api.php
@@ -31,7 +31,7 @@
  * 8 themes.
  *
  * For further information on theming in Drupal 8 see
- * https://www.drupal.org/theme-guide/8
+ * https://www.drupal.org/docs/8/theming
  *
  * For further Twig documentation see
  * http://twig.sensiolabs.org/doc/templates.html
@@ -223,7 +223,7 @@
  * same, which gives users fewer user interface patterns to learn.
  *
  * For further information on the Theme and Render APIs, see:
- * - https://www.drupal.org/documentation/theme
+ * - https://www.drupal.org/docs/8/theming
  * - https://www.drupal.org/developing/api/8/render
  * - https://www.drupal.org/node/722174
  * - https://www.drupal.org/node/933976
@@ -528,12 +528,12 @@
  */
 function hook_form_system_theme_settings_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state) {
   // Add a checkbox to toggle the breadcrumb trail.
-  $form['toggle_breadcrumb'] = array(
+  $form['toggle_breadcrumb'] = [
     '#type' => 'checkbox',
     '#title' => t('Display the breadcrumb'),
     '#default_value' => theme_get_setting('features.breadcrumb'),
     '#description'   => t('Show a trail of links from the homepage to the current page.'),
-  );
+  ];
 }
 
 /**
@@ -603,7 +603,7 @@ function hook_preprocess(&$variables, $hook) {
 function hook_preprocess_HOOK(&$variables) {
   // This example is from rdf_preprocess_image(). It adds an RDF attribute
   // to the image hook's variables.
-  $variables['attributes']['typeof'] = array('foaf:Image');
+  $variables['attributes']['typeof'] = ['foaf:Image'];
 }
 
 /**
@@ -630,7 +630,7 @@ function hook_preprocess_HOOK(&$variables) {
  * @see hook_theme_suggestions_HOOK_alter()
  */
 function hook_theme_suggestions_HOOK(array $variables) {
-  $suggestions = array();
+  $suggestions = [];
 
   $suggestions[] = 'node__' . $variables['elements']['#langcode'];
 
@@ -962,10 +962,10 @@ function hook_library_info_alter(&$libraries, $extension) {
       // relative to the original extension, specify an absolute path (relative
       // to DRUPAL_ROOT / base_path()) to the new location.
       $new_path = '/' . drupal_get_path('module', 'farbtastic_update') . '/js';
-      $new_js = array();
-      $replacements = array(
+      $new_js = [];
+      $replacements = [
         $old_path . '/farbtastic.js' => $new_path . '/farbtastic-2.0.js',
-      );
+      ];
       foreach ($libraries['jquery.farbtastic']['js'] as $source => $options) {
         if (isset($replacements[$source])) {
           $new_js[$replacements[$source]] = $options;
@@ -1138,7 +1138,7 @@ function hook_page_bottom(array &$page_bottom) {
  *     Instead of this suggestion's implementation being used directly, the base
  *     hook will be invoked with this implementation as its first suggestion.
  *     The base hook's files will be included and the base hook's preprocess
- *     functions will be called in place of any suggestion's preprocess
+ *     functions will be called in addition to any suggestion's preprocess
  *     functions. If an implementation of hook_theme_suggestions_HOOK() (where
  *     HOOK is the base hook) changes the suggestion order, a different
  *     suggestion may be used in place of this suggestion. If after
@@ -1178,21 +1178,21 @@ function hook_page_bottom(array &$page_bottom) {
  * @see hook_theme_registry_alter()
  */
 function hook_theme($existing, $type, $theme, $path) {
-  return array(
-    'forum_display' => array(
-      'variables' => array('forums' => NULL, 'topics' => NULL, 'parents' => NULL, 'tid' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL),
-    ),
-    'forum_list' => array(
-      'variables' => array('forums' => NULL, 'parents' => NULL, 'tid' => NULL),
-    ),
-    'forum_icon' => array(
-      'variables' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0),
-    ),
-    'status_report' => array(
+  return [
+    'forum_display' => [
+      'variables' => ['forums' => NULL, 'topics' => NULL, 'parents' => NULL, 'tid' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL],
+    ],
+    'forum_list' => [
+      'variables' => ['forums' => NULL, 'parents' => NULL, 'tid' => NULL],
+    ],
+    'forum_icon' => [
+      'variables' => ['new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0],
+    ],
+    'status_report' => [
       'render element' => 'requirements',
       'file' => 'system.admin.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
diff --git a/web/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php b/web/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php
index 4e710ba9e..74a791dfb 100644
--- a/web/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php
+++ b/web/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php
@@ -20,7 +20,7 @@ class RouteProcessorManager implements OutboundRouteProcessorInterface {
    *   An array whose keys are priorities and whose values are arrays of path
    *   processor objects.
    */
-  protected $outboundProcessors = array();
+  protected $outboundProcessors = [];
 
   /**
    * Holds the array of outbound processors, sorted by priority.
@@ -28,7 +28,7 @@ class RouteProcessorManager implements OutboundRouteProcessorInterface {
    * @var array
    *   An array of path processor objects.
    */
-  protected $sortedOutbound = array();
+  protected $sortedOutbound = [];
 
   /**
    * Adds an outbound processor object to the $outboundProcessors property.
@@ -40,7 +40,7 @@ class RouteProcessorManager implements OutboundRouteProcessorInterface {
    */
   public function addOutbound(OutboundRouteProcessorInterface $processor, $priority = 0) {
     $this->outboundProcessors[$priority][] = $processor;
-    $this->sortedOutbound = array();
+    $this->sortedOutbound = [];
   }
 
   /**
@@ -71,7 +71,7 @@ class RouteProcessorManager implements OutboundRouteProcessorInterface {
    * Sorts the processors according to priority.
    */
   protected function sortProcessors() {
-    $sorted = array();
+    $sorted = [];
     krsort($this->outboundProcessors);
 
     foreach ($this->outboundProcessors as $processors) {
diff --git a/web/core/lib/Drupal/Core/Routing/AccessAwareRouter.php b/web/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
index 9346b0ae1..d8487c6ef 100644
--- a/web/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
+++ b/web/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
@@ -5,10 +5,12 @@ namespace Drupal\Core\Routing;
 use Drupal\Core\Access\AccessManagerInterface;
 use Drupal\Core\Access\AccessResultReasonInterface;
 use Drupal\Core\Session\AccountInterface;
-use Symfony\Cmf\Component\Routing\ChainRouter;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 use Symfony\Component\Routing\RequestContext as SymfonyRequestContext;
+use Symfony\Component\Routing\RequestContextAwareInterface;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * A router class for Drupal with access check and upcasting.
@@ -16,11 +18,11 @@ use Symfony\Component\Routing\RequestContext as SymfonyRequestContext;
 class AccessAwareRouter implements AccessAwareRouterInterface {
 
   /**
-   * The chain router doing the actual routing.
+   * The router doing the actual routing.
    *
-   * @var \Symfony\Cmf\Component\Routing\ChainRouter
+   * @var \Symfony\Component\Routing\Matcher\RequestMatcherInterface
    */
-  protected $chainRouter;
+  protected $router;
 
   /**
    * The access manager.
@@ -39,15 +41,15 @@ class AccessAwareRouter implements AccessAwareRouterInterface {
   /**
    * Constructs a router for Drupal with access check and upcasting.
    *
-   * @param \Symfony\Cmf\Component\Routing\ChainRouter $chain_router
-   *   The chain router doing the actual routing.
+   * @param \Symfony\Component\Routing\Matcher\RequestMatcherInterface $router
+   *   The router doing the actual routing.
    * @param \Drupal\Core\Access\AccessManagerInterface $access_manager
    *   The access manager.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The account to use in access checks.
    */
-  public function __construct(ChainRouter $chain_router, AccessManagerInterface $access_manager, AccountInterface $account) {
-    $this->chainRouter = $chain_router;
+  public function __construct(RequestMatcherInterface $router, AccessManagerInterface $access_manager, AccountInterface $account) {
+    $this->router = $router;
     $this->accessManager = $access_manager;
     $this->account = $account;
   }
@@ -56,23 +58,26 @@ class AccessAwareRouter implements AccessAwareRouterInterface {
    * {@inheritdoc}
    */
   public function __call($name, $arguments) {
-    // Ensure to call every other function to the chained router.
-    // @todo Sadly does the ChainRouter not implement an interface in CMF.
-    return call_user_func_array([$this->chainRouter, $name], $arguments);
+    // Ensure to call every other function to the router.
+    return call_user_func_array([$this->router, $name], $arguments);
   }
 
   /**
    * {@inheritdoc}
    */
   public function setContext(SymfonyRequestContext $context) {
-    $this->chainRouter->setContext($context);
+    if ($this->router instanceof RequestContextAwareInterface) {
+      $this->router->setContext($context);
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function getContext() {
-    return $this->chainRouter->getContext();
+    if ($this->router instanceof RequestContextAwareInterface) {
+      return $this->router->getContext();
+    }
   }
 
   /**
@@ -82,7 +87,7 @@ class AccessAwareRouter implements AccessAwareRouterInterface {
    *   Thrown when access checking failed.
    */
   public function matchRequest(Request $request) {
-    $parameters = $this->chainRouter->matchRequest($request);
+    $parameters = $this->router->matchRequest($request);
     $request->attributes->add($parameters);
     $this->checkAccess($request);
     // We can not return $parameters because the access check can change the
@@ -114,14 +119,18 @@ class AccessAwareRouter implements AccessAwareRouterInterface {
    * {@inheritdoc}
    */
   public function getRouteCollection() {
-    return $this->chainRouter->getRouteCollection();
+    if ($this->router instanceof RouterInterface) {
+      return $this->router->getRouteCollection();
+    }
   }
 
   /**
    * {@inheritdoc}
    */
-  public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH) {
-    return $this->chainRouter->generate($name, $parameters, $referenceType);
+  public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH) {
+    if ($this->router instanceof UrlGeneratorInterface) {
+      return $this->router->generate($name, $parameters, $referenceType);
+    }
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Routing/CompiledRoute.php b/web/core/lib/Drupal/Core/Routing/CompiledRoute.php
index 775d4ae47..a1366a608 100644
--- a/web/core/lib/Drupal/Core/Routing/CompiledRoute.php
+++ b/web/core/lib/Drupal/Core/Routing/CompiledRoute.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Routing;
 
+use Drupal\Component\Utility\Unicode;
 use Symfony\Component\Routing\CompiledRoute as SymfonyCompiledRoute;
 
 /**
@@ -61,11 +62,14 @@ class CompiledRoute extends SymfonyCompiledRoute {
    * @param array $variables
    *   An array of variables (variables defined in the path and in the host patterns)
    */
-  public function __construct($fit, $pattern_outline, $num_parts, $staticPrefix, $regex, array $tokens, array $pathVariables, $hostRegex = NULL, array $hostTokens = array(), array $hostVariables = array(), array $variables = array()) {
+  public function __construct($fit, $pattern_outline, $num_parts, $staticPrefix, $regex, array $tokens, array $pathVariables, $hostRegex = NULL, array $hostTokens = [], array $hostVariables = [], array $variables = []) {
     parent::__construct($staticPrefix, $regex, $tokens, $pathVariables, $hostRegex, $hostTokens, $hostVariables, $variables);
 
     $this->fit = $fit;
-    $this->patternOutline = $pattern_outline;
+    // Support case-insensitive route matching by ensuring the pattern outline
+    // is lowercase.
+    // @see \Drupal\Core\Routing\RouteProvider::getRoutesByPath()
+    $this->patternOutline = Unicode::strtolower($pattern_outline);
     $this->numParts = $num_parts;
   }
 
diff --git a/web/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php b/web/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php
index e804f2e66..09d614811 100644
--- a/web/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php
+++ b/web/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php
@@ -62,7 +62,7 @@ class ParamConversionEnhancer implements RouteEnhancerInterface, EventSubscriber
     // Foreach will copy the values from the array it iterates. Even if they
     // are references, use it to break them. This avoids any scenarios where raw
     // variables also get replaced with converted values.
-    $raw_variables = array();
+    $raw_variables = [];
     foreach (array_intersect_key($defaults, $variables) as $key => $value) {
       $raw_variables[$key] = $value;
     }
@@ -85,7 +85,7 @@ class ParamConversionEnhancer implements RouteEnhancerInterface, EventSubscriber
    * {@inheritdoc}
    */
   public static function getSubscribedEvents() {
-    $events[KernelEvents::EXCEPTION][] = array('onException', 75);
+    $events[KernelEvents::EXCEPTION][] = ['onException', 75];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/Routing/MatcherDumper.php b/web/core/lib/Drupal/Core/Routing/MatcherDumper.php
index 467b02bbb..5e329f7da 100644
--- a/web/core/lib/Drupal/Core/Routing/MatcherDumper.php
+++ b/web/core/lib/Drupal/Core/Routing/MatcherDumper.php
@@ -84,10 +84,10 @@ class MatcherDumper implements MatcherDumperInterface {
    * @param array $options
    *   An array of options.
    */
-  public function dump(array $options = array()) {
+  public function dump(array $options = []) {
     // Convert all of the routes into database records.
     // Accumulate the menu masks on top of any we found before.
-    $masks = array_flip($this->state->get('routing.menu_masks.' . $this->tableName, array()));
+    $masks = array_flip($this->state->get('routing.menu_masks.' . $this->tableName, []));
     // Delete any old records first, then insert the new ones. That avoids
     // stale data. The transaction makes it atomic to avoid unstable router
     // states due to random failures.
@@ -106,15 +106,15 @@ class MatcherDumper implements MatcherDumperInterface {
       // Split the routes into chunks to avoid big INSERT queries.
       $route_chunks = array_chunk($this->routes->all(), 50, TRUE);
       foreach ($route_chunks as $routes) {
-        $insert = $this->connection->insert($this->tableName)->fields(array(
+        $insert = $this->connection->insert($this->tableName)->fields([
           'name',
           'fit',
           'path',
           'pattern_outline',
           'number_parts',
           'route',
-        ));
-        $names = array();
+        ]);
+        $names = [];
         foreach ($routes as $name => $route) {
           /** @var \Symfony\Component\Routing\Route $route */
           $route->setOption('compiler_class', '\Drupal\Core\Routing\RouteCompiler');
@@ -126,14 +126,14 @@ class MatcherDumper implements MatcherDumperInterface {
           // patterns we need to check in the RouteProvider.
           $masks[$compiled->getFit()] = 1;
           $names[] = $name;
-          $values = array(
+          $values = [
             'name' => $name,
             'fit' => $compiled->getFit(),
             'path' => $route->getPath(),
             'pattern_outline' => $compiled->getPatternOutline(),
             'number_parts' => $compiled->getNumParts(),
             'route' => serialize($route),
-          );
+          ];
           $insert->values($values);
         }
 
@@ -144,7 +144,7 @@ class MatcherDumper implements MatcherDumperInterface {
 
     }
     catch (\Exception $e) {
-      $transaction->rollback();
+      $transaction->rollBack();
       watchdog_exception('Routing', $e);
       throw $e;
     }
diff --git a/web/core/lib/Drupal/Core/Routing/NullGenerator.php b/web/core/lib/Drupal/Core/Routing/NullGenerator.php
index d9bc9b048..74db5c969 100644
--- a/web/core/lib/Drupal/Core/Routing/NullGenerator.php
+++ b/web/core/lib/Drupal/Core/Routing/NullGenerator.php
@@ -52,7 +52,7 @@ class NullGenerator extends UrlGenerator {
   /**
    * {@inheritdoc}
    */
-  protected function getInternalPathFromRoute($name, Route $route, $parameters = array(), $query_params = array()) {
+  protected function getInternalPathFromRoute($name, Route $route, $parameters = [], &$query_params = []) {
     return $route->getPath();
   }
 
@@ -71,7 +71,7 @@ class NullGenerator extends UrlGenerator {
   /**
    * {@inheritdoc}
    */
-  protected function processPath($path, &$options = array(), BubbleableMetadata $bubbleable_metadata = NULL) {
+  protected function processPath($path, &$options = [], BubbleableMetadata $bubbleable_metadata = NULL) {
     return $path;
   }
 
diff --git a/web/core/lib/Drupal/Core/Routing/NullMatcherDumper.php b/web/core/lib/Drupal/Core/Routing/NullMatcherDumper.php
index 938a426c4..3378e1bbf 100644
--- a/web/core/lib/Drupal/Core/Routing/NullMatcherDumper.php
+++ b/web/core/lib/Drupal/Core/Routing/NullMatcherDumper.php
@@ -39,7 +39,7 @@ class NullMatcherDumper implements MatcherDumperInterface {
    * @param array $options
    *   An array of options.
    */
-  public function dump(array $options = array()) {
+  public function dump(array $options = []) {
     // The dumper is reused for multiple providers, so reset the queued routes.
     $this->routes = NULL;
   }
diff --git a/web/core/lib/Drupal/Core/Routing/RedirectDestination.php b/web/core/lib/Drupal/Core/Routing/RedirectDestination.php
index 873694a35..1945e333c 100644
--- a/web/core/lib/Drupal/Core/Routing/RedirectDestination.php
+++ b/web/core/lib/Drupal/Core/Routing/RedirectDestination.php
@@ -64,7 +64,7 @@ class RedirectDestination implements RedirectDestinationInterface {
         $this->destination = $query->get('destination');
       }
       else {
-        $this->destination = $this->urlGenerator->generateFromRoute('<current>', [], ['query' => UrlHelper::buildQuery(UrlHelper::filterQueryParameters($query->all()))]);
+        $this->destination = $this->urlGenerator->generateFromRoute('<current>', [], ['query' => UrlHelper::filterQueryParameters($query->all())]);
       }
     }
 
diff --git a/web/core/lib/Drupal/Core/Routing/RequestFormatRouteFilter.php b/web/core/lib/Drupal/Core/Routing/RequestFormatRouteFilter.php
index 8119efa07..547e6117e 100644
--- a/web/core/lib/Drupal/Core/Routing/RequestFormatRouteFilter.php
+++ b/web/core/lib/Drupal/Core/Routing/RequestFormatRouteFilter.php
@@ -23,7 +23,10 @@ class RequestFormatRouteFilter implements RouteFilterInterface {
    * {@inheritdoc}
    */
   public function filter(RouteCollection $collection, Request $request) {
-    $format = $request->getRequestFormat('html');
+    // Determine the request format.
+    $default_format = static::getDefaultFormat($collection);
+    $format = $request->getRequestFormat($default_format);
+
     /** @var \Symfony\Component\Routing\Route $route */
     foreach ($collection as $name => $route) {
       // If the route has no _format specification, we move it to the end. If it
@@ -48,4 +51,29 @@ class RequestFormatRouteFilter implements RouteFilterInterface {
     throw new NotAcceptableHttpException("No route found for the specified format $format.");
   }
 
+  /**
+   * Determines the default request format.
+   *
+   * By default, use 'html' as the default format. But when there's only a
+   * single route match, and that route specifies a '_format' requirement
+   * listing a single format, then use that as the default format.
+   *
+   * @param \Symfony\Component\Routing\RouteCollection $collection
+   *   The route collection to filter.
+   *
+   * @return string
+   *   The default format.
+   */
+  protected static function getDefaultFormat(RouteCollection $collection) {
+    $default_format = 'html';
+    if ($collection->count() === 1) {
+      $only_route = $collection->getIterator()->current();
+      $required_format = $only_route->getRequirement('_format');
+      if (strpos($required_format, '|') === FALSE) {
+        $default_format = $required_format;
+      }
+    }
+    return $default_format;
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Routing/RouteBuilder.php b/web/core/lib/Drupal/Core/Routing/RouteBuilder.php
index 29da76060..2a0720a2d 100644
--- a/web/core/lib/Drupal/Core/Routing/RouteBuilder.php
+++ b/web/core/lib/Drupal/Core/Routing/RouteBuilder.php
@@ -159,15 +159,15 @@ class RouteBuilder implements RouteBuilderInterface, DestructableInterface {
         unset($routes['route_callbacks']);
       }
       foreach ($routes as $name => $route_info) {
-        $route_info += array(
-          'defaults' => array(),
-          'requirements' => array(),
-          'options' => array(),
+        $route_info += [
+          'defaults' => [],
+          'requirements' => [],
+          'options' => [],
           'host' => NULL,
-          'schemes' => array(),
-          'methods' => array(),
+          'schemes' => [],
+          'methods' => [],
           'condition' => '',
-        );
+        ];
 
         $route = new Route($route_info['path'], $route_info['defaults'], $route_info['requirements'], $route_info['options'], $route_info['host'], $route_info['schemes'], $route_info['methods'], $route_info['condition']);
         $collection->add($name, $route);
diff --git a/web/core/lib/Drupal/Core/Routing/RouteCompiler.php b/web/core/lib/Drupal/Core/Routing/RouteCompiler.php
index 937bf485e..e4aef4398 100644
--- a/web/core/lib/Drupal/Core/Routing/RouteCompiler.php
+++ b/web/core/lib/Drupal/Core/Routing/RouteCompiler.php
@@ -46,8 +46,14 @@ class RouteCompiler extends SymfonyRouteCompiler implements RouteCompilerInterfa
       $fit,
       $pattern_outline,
       $num_parts,
-      // These are the Symfony compiled parts.
-      $symfony_compiled->getStaticPrefix(),
+
+      // The following parameters are what Symfony uses in
+      // \Symfony\Component\Routing\Matcher\UrlMatcher::matchCollection().
+
+      // Set the static prefix to an empty string since it is redundant to
+      // the matching in \Drupal\Core\Routing\RouteProvider::getRoutesByPath()
+      // and by skipping it we more easily make the routing case-insensitive.
+      '',
       $symfony_compiled->getRegex(),
       $symfony_compiled->getTokens(),
       $symfony_compiled->getPathVariables(),
@@ -55,14 +61,14 @@ class RouteCompiler extends SymfonyRouteCompiler implements RouteCompilerInterfa
       $symfony_compiled->getHostTokens(),
       $symfony_compiled->getHostVariables(),
       $symfony_compiled->getVariables()
-      );
+    );
   }
 
   /**
    * Returns the pattern outline.
    *
    * The pattern outline is the path pattern but normalized so that all
-   * placeholders are equal strings and default values are removed.
+   * placeholders are the string '%'.
    *
    * @param string $path
    *   The path for which we want the normalized outline.
diff --git a/web/core/lib/Drupal/Core/Routing/RouteMatch.php b/web/core/lib/Drupal/Core/Routing/RouteMatch.php
index 29ff5c6c4..5784b7f7c 100644
--- a/web/core/lib/Drupal/Core/Routing/RouteMatch.php
+++ b/web/core/lib/Drupal/Core/Routing/RouteMatch.php
@@ -52,7 +52,7 @@ class RouteMatch implements RouteMatchInterface {
    * @param array $raw_parameters
    *   The raw $parameters array.
    */
-  public function __construct($route_name, Route $route, array $parameters = array(), array $raw_parameters = array()) {
+  public function __construct($route_name, Route $route, array $parameters = [], array $raw_parameters = []) {
     $this->routeName = $route_name;
     $this->route = $route;
 
@@ -77,7 +77,7 @@ class RouteMatch implements RouteMatchInterface {
    */
   public static function createFromRequest(Request $request) {
     if ($request->attributes->get(RouteObjectInterface::ROUTE_OBJECT)) {
-      $raw_variables = array();
+      $raw_variables = [];
       if ($raw = $request->attributes->get('_raw_variables')) {
         $raw_variables = $raw->all();
       }
@@ -141,7 +141,7 @@ class RouteMatch implements RouteMatchInterface {
    *   Route parameter names as both the keys and values.
    */
   protected function getParameterNames() {
-    $names = array();
+    $names = [];
     if ($route = $this->getRouteObject()) {
       // Variables defined in path and host patterns are route parameters.
       $variables = $route->compile()->getVariables();
diff --git a/web/core/lib/Drupal/Core/Routing/RoutePreloader.php b/web/core/lib/Drupal/Core/Routing/RoutePreloader.php
index 2d382bb74..9e75cdf1f 100644
--- a/web/core/lib/Drupal/Core/Routing/RoutePreloader.php
+++ b/web/core/lib/Drupal/Core/Routing/RoutePreloader.php
@@ -38,7 +38,7 @@ class RoutePreloader implements EventSubscriberInterface {
    *
    * @var array
    */
-  protected $nonAdminRoutesOnRebuild = array();
+  protected $nonAdminRoutesOnRebuild = [];
 
   /**
    * The cache backend used to skip the state loading.
@@ -114,7 +114,7 @@ class RoutePreloader implements EventSubscriberInterface {
    */
   public function onFinishedRoutes(Event $event) {
     $this->state->set('routing.non_admin_routes', $this->nonAdminRoutesOnRebuild);
-    $this->nonAdminRoutesOnRebuild = array();
+    $this->nonAdminRoutesOnRebuild = [];
   }
 
   /**
@@ -122,11 +122,11 @@ class RoutePreloader implements EventSubscriberInterface {
    */
   public static function getSubscribedEvents() {
     // Set a really low priority to catch as many as possible routes.
-    $events[RoutingEvents::ALTER] = array('onAlterRoutes', -1024);
-    $events[RoutingEvents::FINISHED] = array('onFinishedRoutes');
+    $events[RoutingEvents::ALTER] = ['onAlterRoutes', -1024];
+    $events[RoutingEvents::FINISHED] = ['onFinishedRoutes'];
     // Load the routes before the controller is executed (which happens after
     // the kernel request event).
-    $events[KernelEvents::REQUEST][] = array('onRequest');
+    $events[KernelEvents::REQUEST][] = ['onRequest'];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/Routing/RouteProvider.php b/web/core/lib/Drupal/Core/Routing/RouteProvider.php
index 53ed6262e..5d92e77e0 100644
--- a/web/core/lib/Drupal/Core/Routing/RouteProvider.php
+++ b/web/core/lib/Drupal/Core/Routing/RouteProvider.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Routing;
 
+use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
@@ -47,7 +48,7 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
    *
    * @var \Symfony\Component\Routing\Route[]
    */
-  protected $routes = array();
+  protected $routes = [];
 
   /**
    * A cache of already-loaded serialized routes, keyed by route name.
@@ -139,7 +140,9 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
    *
    * @return \Symfony\Component\Routing\RouteCollection with all urls that
    *      could potentially match $request. Empty collection if nothing can
-   *      match.
+   *      match. The collection will be sorted from highest to lowest fit (match
+   *      of path parts) and then in ascending order by route name for routes
+   *      with the same fit.
    */
   public function getRouteCollectionForRequest(Request $request) {
     // Cache both the system path as well as route parameters and matching
@@ -182,7 +185,7 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
    *   Thrown if there is no route with that name in this repository.
    */
   public function getRouteByName($name) {
-    $routes = $this->getRoutesByNames(array($name));
+    $routes = $this->getRoutesByNames([$name]);
     if (empty($routes)) {
       throw new RouteNotFoundException(sprintf('Route "%s" does not exist.', $name));
     }
@@ -207,7 +210,7 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
       }
       else {
         try {
-          $result = $this->connection->query('SELECT name, route FROM {' . $this->connection->escapeTable($this->tableName) . '} WHERE name IN ( :names[] )', array(':names[]' => $routes_to_load));
+          $result = $this->connection->query('SELECT name, route FROM {' . $this->connection->escapeTable($this->tableName) . '} WHERE name IN ( :names[] )', [':names[]' => $routes_to_load]);
           $routes = $result->fetchAllKeyed();
 
           $this->cache->set($cid, $routes, Cache::PERMANENT, ['routes']);
@@ -249,14 +252,14 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
    */
   protected function getCandidateOutlines(array $parts) {
     $number_parts = count($parts);
-    $ancestors = array();
+    $ancestors = [];
     $length = $number_parts - 1;
     $end = (1 << $number_parts) - 1;
 
     // The highest possible mask is a 1 bit for every part of the path. We will
     // check every value down from there to generate a possible outline.
     if ($number_parts == 1) {
-      $masks = array(1);
+      $masks = [1];
     }
     elseif ($number_parts <= 3 && $number_parts > 0) {
       // Optimization - don't query the state system for short paths. This also
@@ -266,11 +269,11 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
     }
     elseif ($number_parts <= 0) {
       // No path can match, short-circuit the process.
-      $masks = array();
+      $masks = [];
     }
     else {
       // Get the actual patterns that exist out of state.
-      $masks = (array) $this->state->get('routing.menu_masks.' . $this->tableName, array());
+      $masks = (array) $this->state->get('routing.menu_masks.' . $this->tableName, []);
     }
 
     // Only examine patterns that actually exist as router items (the masks).
@@ -317,15 +320,20 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
    * Get all routes which match a certain pattern.
    *
    * @param string $path
-   *   The route pattern to search for (contains % as placeholders).
+   *   The route pattern to search for.
    *
    * @return \Symfony\Component\Routing\RouteCollection
-   *   Returns a route collection of matching routes.
+   *   Returns a route collection of matching routes. The collection may be
+   *   empty and will be sorted from highest to lowest fit (match of path parts)
+   *   and then in ascending order by route name for routes with the same fit.
    */
   protected function getRoutesByPath($path) {
     // Split the path up on the slashes, ignoring multiple slashes in a row
-    // or leading or trailing slashes.
-    $parts = preg_split('@/+@', $path, NULL, PREG_SPLIT_NO_EMPTY);
+    // or leading or trailing slashes. Convert to lower case here so we can
+    // have a case-insensitive match from the incoming path to the lower case
+    // pattern outlines from \Drupal\Core\Routing\RouteCompiler::compile().
+    // @see \Drupal\Core\Routing\CompiledRoute::__construct()
+    $parts = preg_split('@/+@', Unicode::strtolower($path), NULL, PREG_SPLIT_NO_EMPTY);
 
     $collection = new RouteCollection();
 
@@ -338,17 +346,18 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
     // trailing wildcard parts as long as the pattern matches, since we
     // dump the route pattern without those optional parts.
     try {
-      $routes = $this->connection->query("SELECT name, route, fit FROM {" . $this->connection->escapeTable($this->tableName) . "} WHERE pattern_outline IN ( :patterns[] ) AND number_parts >= :count_parts", array(
+      $routes = $this->connection->query("SELECT name, route, fit FROM {" . $this->connection->escapeTable($this->tableName) . "} WHERE pattern_outline IN ( :patterns[] ) AND number_parts >= :count_parts", [
         ':patterns[]' => $ancestors, ':count_parts' => count($parts),
-      ))
+      ])
         ->fetchAll(\PDO::FETCH_ASSOC);
     }
     catch (\Exception $e) {
       $routes = [];
     }
 
-    // We sort by fit and name in PHP to avoid a SQL filesort.
-    usort($routes, array($this, 'routeProviderRouteCompare'));
+    // We sort by fit and name in PHP to avoid a SQL filesort and avoid any
+    // difference in the sorting behavior of SQL back-ends.
+    usort($routes, [$this, 'routeProviderRouteCompare']);
 
     foreach ($routes as $row) {
       $collection->add($row['name'], unserialize($row['route']));
@@ -380,16 +389,16 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
    * {@inheritdoc}
    */
   public function reset() {
-    $this->routes  = array();
-    $this->serializedRoutes = array();
+    $this->routes  = [];
+    $this->serializedRoutes = [];
     $this->cacheTagInvalidator->invalidateTags(['routes']);
   }
 
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[RoutingEvents::FINISHED][] = array('reset');
+  public static function getSubscribedEvents() {
+    $events[RoutingEvents::FINISHED][] = ['reset'];
     return $events;
   }
 
diff --git a/web/core/lib/Drupal/Core/Routing/RouteProviderInterface.php b/web/core/lib/Drupal/Core/Routing/RouteProviderInterface.php
index ce07a6ddd..f53593a82 100644
--- a/web/core/lib/Drupal/Core/Routing/RouteProviderInterface.php
+++ b/web/core/lib/Drupal/Core/Routing/RouteProviderInterface.php
@@ -18,7 +18,9 @@ interface RouteProviderInterface extends RouteProviderBaseInterface {
    *   The route pattern to search for (contains {} as placeholders).
    *
    * @return \Symfony\Component\Routing\RouteCollection
-   *   Returns a route collection of matching routes.
+   *   Returns a route collection of matching routes. The collection may be
+   *   empty and will be sorted from highest to lowest fit (match of path parts)
+   *   and then in ascending order by route name for routes with the same fit.
    */
   public function getRoutesByPattern($pattern);
 
diff --git a/web/core/lib/Drupal/Core/Routing/Router.php b/web/core/lib/Drupal/Core/Routing/Router.php
new file mode 100644
index 000000000..e949c5efb
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Routing/Router.php
@@ -0,0 +1,391 @@
+<?php
+
+namespace Drupal\Core\Routing;
+
+use Drupal\Core\Path\CurrentPathStack;
+use Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface as BaseRouteEnhancerInterface;
+use Symfony\Cmf\Component\Routing\LazyRouteCollection;
+use Symfony\Cmf\Component\Routing\NestedMatcher\RouteFilterInterface as BaseRouteFilterInterface;
+use Symfony\Cmf\Component\Routing\RouteProviderInterface as BaseRouteProviderInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface as BaseUrlGeneratorInterface;
+use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\RouterInterface;
+
+/**
+ * Router implementation in Drupal.
+ *
+ * A router determines, for an incoming request, the active controller, which is
+ * a callable that creates a response.
+ *
+ * It consists of several steps, of which each are explained in more details
+ * below:
+ * 1. Get a collection of routes which potentially match the current request.
+ *    This is done by the route provider. See ::getInitialRouteCollection().
+ * 2. Filter the collection down further more. For example this filters out
+ *    routes applying to other formats: See ::applyRouteFilters()
+ * 3. Find the best matching route out of the remaining ones, by applying a
+ *    regex. See ::matchCollection().
+ * 4. Enhance the list of route attributes, for example loading entity objects.
+ *    See ::applyRouteEnhancers().
+ *
+ * This implementation uses ideas of the following routers:
+ * - \Symfony\Cmf\Component\Routing\DynamicRouter
+ * - \Drupal\Core\Routing\UrlMatcher
+ * - \Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher
+ *
+ * @see \Symfony\Cmf\Component\Routing\DynamicRouter
+ * @see \Drupal\Core\Routing\UrlMatcher
+ * @see \Symfony\Cmf\Component\Routing\NestedMatcher\NestedMatcher
+ */
+class Router extends UrlMatcher implements RequestMatcherInterface, RouterInterface {
+
+  /**
+   * The route provider responsible for the first-pass match.
+   *
+   * @var \Symfony\Cmf\Component\Routing\RouteProviderInterface
+   */
+  protected $routeProvider;
+
+  /**
+   * The list of available enhancers.
+   *
+   * @var \Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface[]
+   */
+  protected $enhancers = [];
+
+  /**
+   * Cached sorted list of enhancers.
+   *
+   * @var \Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface[]
+   */
+  protected $sortedEnhancers;
+
+  /**
+   * The list of available route filters.
+   *
+   * @var \Symfony\Cmf\Component\Routing\NestedMatcher\RouteFilterInterface[]
+   */
+  protected $filters = [];
+
+  /**
+   * Cached sorted list route filters.
+   *
+   * @var \Symfony\Cmf\Component\Routing\NestedMatcher\RouteFilterInterface[]
+   */
+  protected $sortedFilters;
+
+  /**
+   * The URL generator.
+   *
+   * @var \Symfony\Component\Routing\Generator\UrlGeneratorInterface
+   */
+  protected $urlGenerator;
+
+  /**
+   * Constructs a new Router.
+   *
+   * @param \Symfony\Cmf\Component\Routing\RouteProviderInterface $route_provider
+   *   The route provider.
+   * @param \Drupal\Core\Path\CurrentPathStack $current_path
+   *   The current path stack.
+   * @param \Symfony\Component\Routing\Generator\UrlGeneratorInterface $url_generator
+   *   The URL generator.
+   */
+  public function __construct(BaseRouteProviderInterface $route_provider, CurrentPathStack $current_path, BaseUrlGeneratorInterface $url_generator) {
+    parent::__construct($current_path);
+    $this->routeProvider = $route_provider;
+    $this->urlGenerator = $url_generator;
+  }
+
+  /**
+   * Adds a route enhancer to the list of used route enhancers.
+   *
+   * @param \Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface $route_enhancer
+   *   A route enhancer.
+   * @param int $priority
+   *   (optional) The priority of the enhancer. Higher number enhancers will be
+   *   used first.
+   *
+   * @return $this
+   */
+  public function addRouteEnhancer(BaseRouteEnhancerInterface $route_enhancer, $priority = 0) {
+    $this->enhancers[$priority][] = $route_enhancer;
+    return $this;
+  }
+
+  /**
+   * Adds a route filter to the list of used route filters.
+   *
+   * @param \Symfony\Cmf\Component\Routing\NestedMatcher\RouteFilterInterface $route_filter
+   *   A route filter.
+   * @param int $priority
+   *   (optional) The priority of the filter. Higher number filters will be used
+   *   first.
+   *
+   * @return $this
+   */
+  public function addRouteFilter(BaseRouteFilterInterface $route_filter, $priority = 0) {
+    $this->filters[$priority][] = $route_filter;
+
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function match($pathinfo) {
+    $request = Request::create($pathinfo);
+
+    return $this->matchRequest($request);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function matchRequest(Request $request) {
+    $collection = $this->getInitialRouteCollection($request);
+    $collection = $this->applyRouteFilters($collection, $request);
+
+    if ($ret = $this->matchCollection(rawurldecode($this->currentPath->getPath($request)), $collection)) {
+      return $this->applyRouteEnhancers($ret, $request);
+    }
+
+    throw 0 < count($this->allow)
+      ? new MethodNotAllowedException(array_unique($this->allow))
+      : new ResourceNotFoundException(sprintf('No routes found for "%s".', $this->currentPath->getPath()));
+  }
+
+  /**
+   * Tries to match a URL with a set of routes.
+   *
+   * @param string $pathinfo
+   *   The path info to be parsed
+   * @param \Symfony\Component\Routing\RouteCollection $routes
+   *   The set of routes.
+   *
+   * @return array|null
+   *   An array of parameters. NULL when there is no match.
+   */
+  protected function matchCollection($pathinfo, RouteCollection $routes) {
+    // Try a case-sensitive match.
+    $match = $this->doMatchCollection($pathinfo, $routes, TRUE);
+    // Try a case-insensitive match.
+    if ($match === NULL && $routes->count() > 0) {
+      $match = $this->doMatchCollection($pathinfo, $routes, FALSE);
+    }
+    return $match;
+  }
+
+  /**
+   * Tries to match a URL with a set of routes.
+   *
+   * This code is very similar to Symfony's UrlMatcher::matchCollection() but it
+   * supports case-insensitive matching. The static prefix optimization is
+   * removed as this duplicates work done by the query in
+   * RouteProvider::getRoutesByPath().
+   *
+   * @param string $pathinfo
+   *   The path info to be parsed
+   * @param \Symfony\Component\Routing\RouteCollection $routes
+   *   The set of routes.
+   * @param bool $case_sensitive
+   *   Determines if the match should be case-sensitive of not.
+   *
+   * @return array|null
+   *   An array of parameters. NULL when there is no match.
+   *
+   * @see \Symfony\Component\Routing\Matcher\UrlMatcher::matchCollection()
+   * @see \Drupal\Core\Routing\RouteProvider::getRoutesByPath()
+   */
+  protected function doMatchCollection($pathinfo, RouteCollection $routes, $case_sensitive) {
+    foreach ($routes as $name => $route) {
+      $compiledRoute = $route->compile();
+
+      // Set the regex to use UTF-8.
+      $regex = $compiledRoute->getRegex() . 'u';
+      if (!$case_sensitive) {
+        $regex = $regex . 'i';
+      }
+      if (!preg_match($regex, $pathinfo, $matches)) {
+        continue;
+      }
+
+      $hostMatches = [];
+      if ($compiledRoute->getHostRegex() && !preg_match($compiledRoute->getHostRegex(), $this->context->getHost(), $hostMatches)) {
+        $routes->remove($name);
+        continue;
+      }
+
+      // Check HTTP method requirement.
+      if ($requiredMethods = $route->getMethods()) {
+        // HEAD and GET are equivalent as per RFC.
+        if ('HEAD' === $method = $this->context->getMethod()) {
+          $method = 'GET';
+        }
+
+        if (!in_array($method, $requiredMethods)) {
+          $this->allow = array_merge($this->allow, $requiredMethods);
+          $routes->remove($name);
+          continue;
+        }
+      }
+
+      $status = $this->handleRouteRequirements($pathinfo, $name, $route);
+
+      if (self::ROUTE_MATCH === $status[0]) {
+        return $status[1];
+      }
+
+      if (self::REQUIREMENT_MISMATCH === $status[0]) {
+        $routes->remove($name);
+        continue;
+      }
+
+      return $this->getAttributes($route, $name, array_replace($matches, $hostMatches));
+    }
+  }
+
+  /**
+   * Returns a collection of potential matching routes for a request.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The current request.
+   *
+   * @return \Symfony\Component\Routing\RouteCollection
+   *   The initial fetched route collection.
+   */
+  protected function getInitialRouteCollection(Request $request) {
+    return $this->routeProvider->getRouteCollectionForRequest($request);
+  }
+
+  /**
+   * Apply the route enhancers to the defaults, according to priorities.
+   *
+   * @param array $defaults
+   *   The defaults coming from the final matched route.
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The request.
+   *
+   * @return array
+   *   The request attributes after applying the enhancers. This might consist
+   *   raw values from the URL but also upcasted values, like entity objects,
+   *   from route enhancers.
+   */
+  protected function applyRouteEnhancers($defaults, Request $request) {
+    foreach ($this->getRouteEnhancers() as $enhancer) {
+      $defaults = $enhancer->enhance($defaults, $request);
+    }
+
+    return $defaults;
+  }
+
+  /**
+   * Sorts the enhancers and flattens them.
+   *
+   * @return \Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface[]
+   *   The enhancers ordered by priority.
+   */
+  public function getRouteEnhancers() {
+    if (!isset($this->sortedEnhancers)) {
+      $this->sortedEnhancers = $this->sortRouteEnhancers();
+    }
+
+    return $this->sortedEnhancers;
+  }
+
+  /**
+   * Sort enhancers by priority.
+   *
+   * The highest priority number is the highest priority (reverse sorting).
+   *
+   * @return \Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface[]
+   *   The sorted enhancers.
+   */
+  protected function sortRouteEnhancers() {
+    $sortedEnhancers = [];
+    krsort($this->enhancers);
+
+    foreach ($this->enhancers as $enhancers) {
+      $sortedEnhancers = array_merge($sortedEnhancers, $enhancers);
+    }
+
+    return $sortedEnhancers;
+  }
+
+  /**
+   * Applies all route filters to a given route collection.
+   *
+   * This method reduces the sets of routes further down, for example by
+   * checking the HTTP method.
+   *
+   * @param \Symfony\Component\Routing\RouteCollection $collection
+   *   The route collection.
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The request.
+   *
+   * @return \Symfony\Component\Routing\RouteCollection
+   *   The filtered/sorted route collection.
+   */
+  protected function applyRouteFilters(RouteCollection $collection, Request $request) {
+    // Route filters are expected to throw an exception themselves if they
+    // end up filtering the list down to 0.
+    foreach ($this->getRouteFilters() as $filter) {
+      $collection = $filter->filter($collection, $request);
+    }
+
+    return $collection;
+  }
+
+  /**
+   * Sorts the filters and flattens them.
+   *
+   * @return \Symfony\Cmf\Component\Routing\NestedMatcher\RouteFilterInterface[]
+   *   The filters ordered by priority
+   */
+  public function getRouteFilters() {
+    if (!isset($this->sortedFilters)) {
+      $this->sortedFilters = $this->sortFilters();
+    }
+
+    return $this->sortedFilters;
+  }
+
+  /**
+   * Sort filters by priority.
+   *
+   * The highest priority number is the highest priority (reverse sorting).
+   *
+   * @return \Symfony\Cmf\Component\Routing\NestedMatcher\RouteFilterInterface[]
+   *   The sorted filters.
+   */
+  protected function sortFilters() {
+    $sortedFilters = [];
+    krsort($this->filters);
+
+    foreach ($this->filters as $filters) {
+      $sortedFilters = array_merge($sortedFilters, $filters);
+    }
+
+    return $sortedFilters;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRouteCollection() {
+    return new LazyRouteCollection($this->routeProvider);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH) {
+    @trigger_error('Use the \Drupal\Core\Url object instead', E_USER_DEPRECATED);
+    return $this->urlGenerator->generate($name, $parameters, $referenceType);
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php b/web/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php
index e959c2a29..625f7a341 100644
--- a/web/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php
+++ b/web/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php
@@ -16,12 +16,12 @@ class TrustedRedirectResponse extends CacheableSecuredRedirectResponse {
    *
    * @var string[]
    */
-  protected $trustedUrls = array();
+  protected $trustedUrls = [];
 
   /**
    * {@inheritdoc}
    */
-  public function __construct($url, $status = 302, $headers = array()) {
+  public function __construct($url, $status = 302, $headers = []) {
     $this->trustedUrls[$url] = TRUE;
     parent::__construct($url, $status, $headers);
   }
diff --git a/web/core/lib/Drupal/Core/Routing/UrlGenerator.php b/web/core/lib/Drupal/Core/Routing/UrlGenerator.php
index ccf2b60d8..63dcd47b6 100644
--- a/web/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/web/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -19,6 +19,13 @@ use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
  */
 class UrlGenerator implements UrlGeneratorInterface {
 
+  /**
+   * The route provider.
+   *
+   * @var \Drupal\Core\Routing\RouteProviderInterface
+   */
+  protected $provider;
+
   /**
    * @var RequestContext
    */
@@ -117,7 +124,7 @@ class UrlGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function getPathFromRoute($name, $parameters = array()) {
+  public function getPathFromRoute($name, $parameters = []) {
     $route = $this->getRoute($name);
     $name = $this->getRouteDebugMessage($name);
     $this->processRoute($name, $route, $parameters);
@@ -149,12 +156,14 @@ class UrlGenerator implements UrlGeneratorInterface {
    *   The route parameters passed to the generator. Parameters that do not
    *   match any variables will be added to the result as query parameters.
    * @param array $query_params
-   *   Query parameters passed to the generator as $options['query'].
+   *   Query parameters passed to the generator as $options['query']. This may
+   *   be modified if there are extra parameters not used as route variables.
    * @param string $name
    *   The route name or other identifying string from ::getRouteDebugMessage().
    *
    * @return string
-   *   The url path, without any base path, including possible query string.
+   *   The url path, without any base path, without the query string, not URL
+   *   encoded.
    *
    * @throws MissingMandatoryParametersException
    *   When some parameters are missing that are mandatory for the route.
@@ -162,7 +171,7 @@ class UrlGenerator implements UrlGeneratorInterface {
    *   When a parameter value for a placeholder is not correct because it does
    *   not match the requirement.
    */
-  protected function doGenerate(array $variables, array $defaults, array $tokens, array $parameters, array $query_params, $name) {
+  protected function doGenerate(array $variables, array $defaults, array $tokens, array $parameters, array &$query_params, $name) {
     $variables = array_flip($variables);
     $mergedParams = array_replace($defaults, $this->context->getParameters(), $parameters);
 
@@ -208,30 +217,8 @@ class UrlGenerator implements UrlGeneratorInterface {
       $url = '/';
     }
 
-    // The contexts base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
-    $url = str_replace($this->decodedChars[0], $this->decodedChars[1], rawurlencode($url));
-
-    // Drupal paths rarely include dots, so skip this processing if possible.
-    if (strpos($url, '/.') !== FALSE) {
-      // the path segments "." and ".." are interpreted as relative reference when
-      // resolving a URI; see http://tools.ietf.org/html/rfc3986#section-3.3
-      // so we need to encode them as they are not used for this purpose here
-      // otherwise we would generate a URI that, when followed by a user agent
-      // (e.g. browser), does not match this route
-      $url = strtr($url, array('/../' => '/%2E%2E/', '/./' => '/%2E/'));
-      if ('/..' === substr($url, -3)) {
-        $url = substr($url, 0, -2) . '%2E%2E';
-      }
-      elseif ('/.' === substr($url, -2)) {
-        $url = substr($url, 0, -1) . '%2E';
-      }
-    }
-
-    // Add a query string if needed, including extra parameters.
+    // Add extra parameters to the query parameters.
     $query_params += array_diff_key($parameters, $variables, $defaults);
-    if ($query_params && $query = UrlHelper::buildQuery($query_params)) {
-      $url .= '?' . $query;
-    }
 
     return $url;
   }
@@ -251,9 +238,10 @@ class UrlGenerator implements UrlGeneratorInterface {
    *   $parameters merged in.
    *
    * @return string
-   *   The url path corresponding to the route, without the base path.
+   *   The URL path corresponding to the route, without the base path, not URL
+   *   encoded.
    */
-  protected function getInternalPathFromRoute($name, SymfonyRoute $route, $parameters = array(), $query_params = array()) {
+  protected function getInternalPathFromRoute($name, SymfonyRoute $route, $parameters = [], &$query_params = []) {
     // The Route has a cache of its own and is not recompiled as long as it does
     // not get modified.
     $compiledRoute = $route->compile();
@@ -264,7 +252,7 @@ class UrlGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH) {
+  public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH) {
     $options['absolute'] = is_bool($referenceType) ? $referenceType : $referenceType === self::ABSOLUTE_URL;
     return $this->generateFromRoute($name, $parameters, $options);
   }
@@ -272,17 +260,15 @@ class UrlGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE) {
-    $options += array('prefix' => '');
+  public function generateFromRoute($name, $parameters = [], $options = [], $collect_bubbleable_metadata = FALSE) {
+    $options += ['prefix' => ''];
+    if (!isset($options['query']) || !is_array($options['query'])) {
+      $options['query'] = [];
+    }
+
     $route = $this->getRoute($name);
     $generated_url = $collect_bubbleable_metadata ? new GeneratedUrl() : NULL;
 
-    $query_params = [];
-    // Symfony adds any parameters that are not path slugs as query strings.
-    if (isset($options['query']) && is_array($options['query'])) {
-      $query_params = $options['query'];
-    }
-
     $fragment = '';
     if (isset($options['fragment'])) {
       if (($fragment = trim($options['fragment'])) != '') {
@@ -292,23 +278,42 @@ class UrlGenerator implements UrlGeneratorInterface {
 
     // Generate a relative URL having no path, just query string and fragment.
     if ($route->getOption('_no_path')) {
-      $query = $query_params ? '?' . http_build_query($query_params, '', '&') : '';
+      $query = $options['query'] ? '?' . UrlHelper::buildQuery($options['query']) : '';
       $url = $query . $fragment;
       return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
     }
 
     $options += $route->getOption('default_url_options') ?: [];
-    $options += array('prefix' => '', 'path_processing' => TRUE);
+    $options += ['prefix' => '', 'path_processing' => TRUE];
 
     $name = $this->getRouteDebugMessage($name);
     $this->processRoute($name, $route, $parameters, $generated_url);
-    $path = $this->getInternalPathFromRoute($name, $route, $parameters, $query_params);
+    $path = $this->getInternalPathFromRoute($name, $route, $parameters, $options['query']);
     // Outbound path processors might need the route object for the path, e.g.
     // to get the path pattern.
     $options['route'] = $route;
     if ($options['path_processing']) {
       $path = $this->processPath($path, $options, $generated_url);
     }
+    // The contexts base URL is already encoded
+    // (see Symfony\Component\HttpFoundation\Request).
+    $path = str_replace($this->decodedChars[0], $this->decodedChars[1], rawurlencode($path));
+
+    // Drupal paths rarely include dots, so skip this processing if possible.
+    if (strpos($path, '/.') !== FALSE) {
+      // the path segments "." and ".." are interpreted as relative reference when
+      // resolving a URI; see http://tools.ietf.org/html/rfc3986#section-3.3
+      // so we need to encode them as they are not used for this purpose here
+      // otherwise we would generate a URI that, when followed by a user agent
+      // (e.g. browser), does not match this route
+      $path = strtr($path, ['/../' => '/%2E%2E/', '/./' => '/%2E/']);
+      if ('/..' === substr($path, -3)) {
+        $path = substr($path, 0, -2) . '%2E%2E';
+      }
+      elseif ('/.' === substr($path, -2)) {
+        $path = substr($path, 0, -1) . '%2E';
+      }
+    }
 
     if (!empty($options['prefix'])) {
       $path = ltrim($path, '/');
@@ -316,6 +321,8 @@ class UrlGenerator implements UrlGeneratorInterface {
       $path = '/' . str_replace('%2F', '/', rawurlencode($prefix)) . $path;
     }
 
+    $query = $options['query'] ? '?' . UrlHelper::buildQuery($options['query']) : '';
+
     // The base_url might be rewritten from the language rewrite in domain mode.
     if (isset($options['base_url'])) {
       $base_url = $options['base_url'];
@@ -329,7 +336,7 @@ class UrlGenerator implements UrlGeneratorInterface {
         }
       }
 
-      $url = $base_url . $path . $fragment;
+      $url = $base_url . $path . $query . $fragment;
       return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
     }
 
@@ -337,7 +344,7 @@ class UrlGenerator implements UrlGeneratorInterface {
 
     $absolute = !empty($options['absolute']);
     if (!$absolute || !$host = $this->context->getHost()) {
-      $url = $base_url . $path . $fragment;
+      $url = $base_url . $path . $query . $fragment;
       return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
     }
 
@@ -363,29 +370,16 @@ class UrlGenerator implements UrlGeneratorInterface {
     if ($collect_bubbleable_metadata) {
       $generated_url->addCacheContexts(['url.site']);
     }
-    $url = $scheme . '://' . $host . $port . $base_url . $path . $fragment;
+    $url = $scheme . '://' . $host . $port . $base_url . $path . $query . $fragment;
     return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
-
   }
 
   /**
    * Passes the path to a processor manager to allow alterations.
    */
-  protected function processPath($path, &$options = array(), BubbleableMetadata $bubbleable_metadata = NULL) {
-    // Router-based paths may have a querystring on them.
-    if ($query_pos = strpos($path, '?')) {
-      // We don't need to do a strict check here because position 0 would mean we
-      // have no actual path to work with.
-      $actual_path = substr($path, 0, $query_pos);
-      $query_string = substr($path, $query_pos);
-    }
-    else {
-      $actual_path = $path;
-      $query_string = '';
-    }
-    $path = $this->pathProcessor->processOutbound($actual_path === '/' ? $actual_path : rtrim($actual_path, '/'), $options, $this->requestStack->getCurrentRequest(), $bubbleable_metadata);
-    $path .= $query_string;
-    return $path;
+  protected function processPath($path, &$options = [], BubbleableMetadata $bubbleable_metadata = NULL) {
+    $actual_path = $path === '/' ? $path : rtrim($path, '/');
+    return $this->pathProcessor->processOutbound($actual_path, $options, $this->requestStack->getCurrentRequest(), $bubbleable_metadata);
   }
 
   /**
@@ -439,7 +433,7 @@ class UrlGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function getRouteDebugMessage($name, array $parameters = array()) {
+  public function getRouteDebugMessage($name, array $parameters = []) {
     if (is_scalar($name)) {
       return $name;
     }
diff --git a/web/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/web/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
index 70829cd68..e63383df5 100644
--- a/web/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
+++ b/web/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
@@ -21,9 +21,10 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
    *   \Symfony\Component\Routing\Generator\UrlGeneratorInterface::generate().
    *
    * @return string
-   *   The internal Drupal path corresponding to the route.
+   *   The internal Drupal path corresponding to the route. This string is
+   *   not urlencoded and will be an empty string for the front page.
    */
-  public function getPathFromRoute($name, $parameters = array());
+  public function getPathFromRoute($name, $parameters = []);
 
   /**
    * Generates a URL or path for a specific route based on the given parameters.
@@ -77,6 +78,6 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
    *   Should not be used in user code.
    *   Use \Drupal\Core\Url instead.
    */
-  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE);
+  public function generateFromRoute($name, $parameters = [], $options = [], $collect_bubbleable_metadata = FALSE);
 
 }
diff --git a/web/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php b/web/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
index 98429d43a..7854a0ac9 100644
--- a/web/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
+++ b/web/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
@@ -38,7 +38,7 @@ trait UrlGeneratorTrait {
    *
    * @see \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute()
    */
-  protected function url($route_name, $route_parameters = array(), $options = array()) {
+  protected function url($route_name, $route_parameters = [], $options = []) {
     return $this->getUrlGenerator()->generateFromRoute($route_name, $route_parameters, $options);
   }
 
diff --git a/web/core/lib/Drupal/Core/Routing/routing.api.php b/web/core/lib/Drupal/Core/Routing/routing.api.php
index 6f4752060..b505465cd 100644
--- a/web/core/lib/Drupal/Core/Routing/routing.api.php
+++ b/web/core/lib/Drupal/Core/Routing/routing.api.php
@@ -43,10 +43,16 @@
  *   by the machine name of the module that defines the route, or the name of
  *   a subsystem.
  * - The 'path' line gives the URL path of the route (relative to the site's
- *   base URL). Note: The path in Drupal is treated case insensitive so
- *   /example and /EXAmplE should return the same page.
- *   @todo Fix https://www.drupal.org/node/2075889 to actually get this
- *   behaviour.
+ *   base URL). Generally, paths in Drupal are treated as case-insensitive,
+ *   which overrides the default Symfony behavior. Specifically:
+ *   - If different routes are defined for /example and /EXAmplE, the exact
+ *   match is respected.
+ *   - If there is no exact match, the route falls back to a case-insensitive
+ *   match, so /example and /EXAmplE will return the same page.
+ *   Relying on case-sensitive path matching is not recommended because it
+ *   negatively affects user experience, and path aliases do not support case-
+ *   sensitive matches. The case-sensitive exact match is currently supported
+ *   only for backwards compatibility and may be deprecated in a later release.
  * - The 'defaults' section tells how to build the main content of the route,
  *   and can also give other information, such as the page title and additional
  *   arguments for the route controller method. There are several possibilities
diff --git a/web/core/lib/Drupal/Core/Session/AccountProxy.php b/web/core/lib/Drupal/Core/Session/AccountProxy.php
index 7aa95ae10..afe800bfa 100644
--- a/web/core/lib/Drupal/Core/Session/AccountProxy.php
+++ b/web/core/lib/Drupal/Core/Session/AccountProxy.php
@@ -22,10 +22,19 @@ class AccountProxy implements AccountProxyInterface {
    */
   protected $account;
 
+  /**
+   * Account id.
+   *
+   * @var int
+   */
+  protected $id = 0;
+
   /**
    * Initial account id.
    *
    * @var int
+   *
+   * @deprecated Scheduled for removal in Drupal 8.4.x. Use $this->id instead.
    */
   protected $initialAccountId;
 
@@ -39,6 +48,7 @@ class AccountProxy implements AccountProxyInterface {
       $account = $account->getAccount();
     }
     $this->account = $account;
+    $this->id = $account->id();
     date_default_timezone_set(drupal_get_user_timezone());
   }
 
@@ -47,11 +57,11 @@ class AccountProxy implements AccountProxyInterface {
    */
   public function getAccount() {
     if (!isset($this->account)) {
-      if ($this->initialAccountId) {
+      if ($this->id) {
         // After the container is rebuilt, DrupalKernel sets the initial
         // account to the id of the logged in user. This is necessary in order
         // to refresh the user account reference here.
-        $this->setAccount($this->loadUserEntity($this->initialAccountId));
+        $this->setAccount($this->loadUserEntity($this->id));
       }
       else {
         $this->account = new AnonymousUserSession();
@@ -65,7 +75,7 @@ class AccountProxy implements AccountProxyInterface {
    * {@inheritdoc}
    */
   public function id() {
-    return $this->getAccount()->id();
+    return $this->id;
   }
 
   /**
@@ -160,7 +170,7 @@ class AccountProxy implements AccountProxyInterface {
       throw new \LogicException('AccountProxyInterface::setInitialAccountId() cannot be called after an account was set on the AccountProxy');
     }
 
-    $this->initialAccountId = $account_id;
+    $this->id = $this->initialAccountId = $account_id;
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Session/AccountSwitcher.php b/web/core/lib/Drupal/Core/Session/AccountSwitcher.php
index cbebac401..3c2b3d88c 100644
--- a/web/core/lib/Drupal/Core/Session/AccountSwitcher.php
+++ b/web/core/lib/Drupal/Core/Session/AccountSwitcher.php
@@ -16,14 +16,14 @@ class AccountSwitcher implements AccountSwitcherInterface {
    *
    * @var \Drupal\Core\Session\AccountInterface[]
    */
-  protected $accountStack = array();
+  protected $accountStack = [];
 
   /**
    * The current user service.
    *
    * @var \Drupal\Core\Session\AccountProxyInterface
    */
-  protected $currentUser = array();
+  protected $currentUser = [];
 
   /**
    * The write-safe session handler.
diff --git a/web/core/lib/Drupal/Core/Session/SessionHandler.php b/web/core/lib/Drupal/Core/Session/SessionHandler.php
index 50bb22ffb..4078d41f6 100644
--- a/web/core/lib/Drupal/Core/Session/SessionHandler.php
+++ b/web/core/lib/Drupal/Core/Session/SessionHandler.php
@@ -72,14 +72,14 @@ class SessionHandler extends AbstractProxy implements \SessionHandlerInterface {
     // manually.
     try {
       $request = $this->requestStack->getCurrentRequest();
-      $fields = array(
+      $fields = [
         'uid' => $request->getSession()->get('uid', 0),
         'hostname' => $request->getClientIP(),
         'session' => $value,
         'timestamp' => REQUEST_TIME,
-      );
+      ];
       $this->connection->merge('sessions')
-        ->keys(array('sid' => Crypt::hashBase64($sid)))
+        ->keys(['sid' => Crypt::hashBase64($sid)])
         ->fields($fields)
         ->execute();
       return TRUE;
diff --git a/web/core/lib/Drupal/Core/Session/SessionManager.php b/web/core/lib/Drupal/Core/Session/SessionManager.php
index 5f986021c..95495cfd0 100644
--- a/web/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/web/core/lib/Drupal/Core/Session/SessionManager.php
@@ -83,7 +83,7 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
    *   @see \Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage::setSaveHandler()
    */
   public function __construct(RequestStack $request_stack, Connection $connection, MetadataBag $metadata_bag, SessionConfigurationInterface $session_configuration, $handler = NULL) {
-    $options = array();
+    $options = [];
     $this->sessionConfiguration = $session_configuration;
     $this->requestStack = $request_stack;
     $this->connection = $connection;
@@ -96,7 +96,7 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
     //   https://www.drupal.org/node/2229145, when we will be using the Symfony
     //   session object (which registers an attribute bag with the
     //   manager upon instantiation).
-    $this->bags = array();
+    $this->bags = [];
   }
 
   /**
@@ -130,7 +130,7 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
       $this->setId(Crypt::randomBytesBase64());
 
       // Initialize the session global and attach the Symfony session bags.
-      $_SESSION = array();
+      $_SESSION = [];
       $this->loadSession();
 
       // NativeSessionStorage::loadSession() sets started to TRUE, reset it to
@@ -305,7 +305,7 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
    */
   protected function getSessionDataMask() {
     if (empty($_SESSION)) {
-      return array();
+      return [];
     }
 
     // Start out with a completely filled mask.
@@ -330,7 +330,7 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
    *   The old session ID. The new session ID is $this->getId().
    */
   protected function migrateStoredSession($old_session_id) {
-    $fields = array('sid' => Crypt::hashBase64($this->getId()));
+    $fields = ['sid' => Crypt::hashBase64($this->getId())];
     $this->connection->update('sessions')
       ->fields($fields)
       ->condition('sid', Crypt::hashBase64($old_session_id))
diff --git a/web/core/lib/Drupal/Core/Session/UserSession.php b/web/core/lib/Drupal/Core/Session/UserSession.php
index d4cdfe73f..f426803ce 100644
--- a/web/core/lib/Drupal/Core/Session/UserSession.php
+++ b/web/core/lib/Drupal/Core/Session/UserSession.php
@@ -23,7 +23,7 @@ class UserSession implements AccountInterface {
    *
    * @var array
    */
-  protected $roles = array(AccountInterface::ANONYMOUS_ROLE);
+  protected $roles = [AccountInterface::ANONYMOUS_ROLE];
 
   /**
    * The Unix timestamp when the user last accessed the site.
@@ -73,7 +73,7 @@ class UserSession implements AccountInterface {
    * @param array $values
    *   Array of initial values for the user session.
    */
-  public function __construct(array $values = array()) {
+  public function __construct(array $values = []) {
     foreach ($values as $key => $value) {
       $this->$key = $value;
     }
@@ -93,7 +93,7 @@ class UserSession implements AccountInterface {
     $roles = $this->roles;
 
     if ($exclude_locked_roles) {
-      $roles = array_values(array_diff($roles, array(AccountInterface::ANONYMOUS_ROLE, AccountInterface::AUTHENTICATED_ROLE)));
+      $roles = array_values(array_diff($roles, [AccountInterface::ANONYMOUS_ROLE, AccountInterface::AUTHENTICATED_ROLE]));
     }
 
     return $roles;
@@ -128,7 +128,7 @@ class UserSession implements AccountInterface {
   /**
    * {@inheritdoc}
    */
-  function getPreferredLangcode($fallback_to_default = TRUE) {
+  public function getPreferredLangcode($fallback_to_default = TRUE) {
     $language_list = \Drupal::languageManager()->getLanguages();
     if (!empty($this->preferred_langcode) && isset($language_list[$this->preferred_langcode])) {
       return $language_list[$this->preferred_langcode]->getId();
@@ -141,7 +141,7 @@ class UserSession implements AccountInterface {
   /**
    * {@inheritdoc}
    */
-  function getPreferredAdminLangcode($fallback_to_default = TRUE) {
+  public function getPreferredAdminLangcode($fallback_to_default = TRUE) {
     $language_list = \Drupal::languageManager()->getLanguages();
     if (!empty($this->preferred_admin_langcode) && isset($language_list[$this->preferred_admin_langcode])) {
       return $language_list[$this->preferred_admin_langcode]->getId();
diff --git a/web/core/lib/Drupal/Core/Site/Settings.php b/web/core/lib/Drupal/Core/Site/Settings.php
index 39a7e5af6..a1a6c3889 100644
--- a/web/core/lib/Drupal/Core/Site/Settings.php
+++ b/web/core/lib/Drupal/Core/Site/Settings.php
@@ -17,14 +17,14 @@ final class Settings {
    *
    * @var array
    */
-  private $storage = array();
+  private $storage = [];
 
   /**
    * Singleton instance.
    *
    * @var \Drupal\Core\Site\Settings
    */
-  private static $instance;
+  private static $instance = NULL;
 
   /**
    * Constructor.
@@ -44,8 +44,14 @@ final class Settings {
    * available.
    *
    * @return \Drupal\Core\Site\Settings
+   *
+   * @throws \BadMethodCallException
+   *   Thrown when the settings instance has not been initialized yet.
    */
   public static function getInstance() {
+    if (self::$instance === NULL) {
+      throw new \BadMethodCallException('Settings::$instance is not initialized yet. Whatever you are trying to do, it might be too early for that. You could call Settings::initialize(), but it is probably better to wait until it is called in the regular way. Also check for recursions.');
+    }
     return self::$instance;
   }
 
@@ -108,9 +114,9 @@ final class Settings {
   public static function initialize($app_root, $site_path, &$class_loader) {
     // Export these settings.php variables to the global namespace.
     global $config_directories, $config;
-    $settings = array();
-    $config = array();
-    $databases = array();
+    $settings = [];
+    $config = [];
+    $databases = [];
 
     if (is_readable($app_root . '/' . $site_path . '/settings.php')) {
       require $app_root . '/' . $site_path . '/settings.php';
diff --git a/web/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php b/web/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php
index 5208a2d0d..e3e4895ef 100644
--- a/web/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php
+++ b/web/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php
@@ -73,7 +73,7 @@ class ReverseProxyMiddleware implements HttpKernelInterface {
       $forwarded_header = $settings->get('reverse_proxy_forwarded_header', 'FORWARDED');
       $request::setTrustedHeaderName($request::HEADER_FORWARDED, $forwarded_header);
 
-      $proxies = $settings->get('reverse_proxy_addresses', array());
+      $proxies = $settings->get('reverse_proxy_addresses', []);
       if (count($proxies) > 0) {
         $request::setTrustedProxies($proxies);
       }
diff --git a/web/core/lib/Drupal/Core/State/State.php b/web/core/lib/Drupal/Core/State/State.php
index a8ecb1e8c..572e5cbf3 100644
--- a/web/core/lib/Drupal/Core/State/State.php
+++ b/web/core/lib/Drupal/Core/State/State.php
@@ -2,12 +2,15 @@
 
 namespace Drupal\Core\State;
 
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Cache\CacheCollector;
 use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
+use Drupal\Core\Lock\LockBackendInterface;
 
 /**
  * Provides the state system using a key value store.
  */
-class State implements StateInterface {
+class State extends CacheCollector implements StateInterface {
 
   /**
    * The key value store to use.
@@ -16,20 +19,18 @@ class State implements StateInterface {
    */
   protected $keyValueStore;
 
-  /**
-   * Static state cache.
-   *
-   * @var array
-   */
-  protected $cache = array();
-
   /**
    * Constructs a State object.
    *
    * @param \Drupal\Core\KeyValueStore\KeyValueFactoryInterface $key_value_factory
    *   The key value store to use.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
+   *   The cache backend.
+   * @param \Drupal\Core\Lock\LockBackendInterface $lock
+   *   The lock backend.
    */
-  function __construct(KeyValueFactoryInterface $key_value_factory) {
+  public function __construct(KeyValueFactoryInterface $key_value_factory, CacheBackendInterface $cache, LockBackendInterface $lock) {
+    parent::__construct('state', $cache, $lock);
     $this->keyValueStore = $key_value_factory->get('state');
   }
 
@@ -37,42 +38,28 @@ class State implements StateInterface {
    * {@inheritdoc}
    */
   public function get($key, $default = NULL) {
-    $values = $this->getMultiple(array($key));
-    return isset($values[$key]) ? $values[$key] : $default;
+    $value = parent::get($key);
+    return $value !== NULL ? $value : $default;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function resolveCacheMiss($key) {
+    $value = $this->keyValueStore->get($key);
+    $this->storage[$key] = $value;
+    $this->persist($key);
+    return $value;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getMultiple(array $keys) {
-    $values = array();
-    $load = array();
+    $values = [];
     foreach ($keys as $key) {
-      // Check if we have a value in the cache.
-      if (isset($this->cache[$key])) {
-        $values[$key] = $this->cache[$key];
-      }
-      // Load the value if we don't have an explicit NULL value.
-      elseif (!array_key_exists($key, $this->cache)) {
-        $load[] = $key;
-      }
+      $values[$key] = $this->get($key);
     }
-
-    if ($load) {
-      $loaded_values = $this->keyValueStore->getMultiple($load);
-      foreach ($load as $key) {
-        // If we find a value, even one that is NULL, add it to the cache and
-        // return it.
-        if (isset($loaded_values[$key]) || array_key_exists($key, $loaded_values)) {
-          $values[$key] = $loaded_values[$key];
-          $this->cache[$key] = $loaded_values[$key];
-        }
-        else {
-          $this->cache[$key] = NULL;
-        }
-      }
-    }
-
     return $values;
   }
 
@@ -80,7 +67,7 @@ class State implements StateInterface {
    * {@inheritdoc}
    */
   public function set($key, $value) {
-    $this->cache[$key] = $value;
+    parent::set($key, $value);
     $this->keyValueStore->set($key, $value);
   }
 
@@ -89,7 +76,7 @@ class State implements StateInterface {
    */
   public function setMultiple(array $data) {
     foreach ($data as $key => $value) {
-      $this->cache[$key] = $value;
+      parent::set($key, $value);
     }
     $this->keyValueStore->setMultiple($data);
   }
@@ -98,7 +85,8 @@ class State implements StateInterface {
    * {@inheritdoc}
    */
   public function delete($key) {
-    $this->deleteMultiple(array($key));
+    parent::delete($key);
+    $this->deleteMultiple([$key]);
   }
 
   /**
@@ -106,7 +94,7 @@ class State implements StateInterface {
    */
   public function deleteMultiple(array $keys) {
     foreach ($keys as $key) {
-      unset($this->cache[$key]);
+      parent::delete($key);
     }
     $this->keyValueStore->deleteMultiple($keys);
   }
@@ -115,7 +103,7 @@ class State implements StateInterface {
    * {@inheritdoc}
    */
   public function resetCache() {
-    $this->cache = array();
+    $this->clear();
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php b/web/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
index 55d896aa4..edcf4b754 100644
--- a/web/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
+++ b/web/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
@@ -26,7 +26,7 @@ abstract class LocalReadOnlyStream extends LocalStream {
    * {@inheritdoc}
    */
   public function stream_open($uri, $mode, $options, &$opened_path) {
-    if (!in_array($mode, array('r', 'rb', 'rt'))) {
+    if (!in_array($mode, ['r', 'rb', 'rt'])) {
       if ($options & STREAM_REPORT_ERRORS) {
         trigger_error('stream_open() write modes not supported for read-only stream wrappers', E_USER_WARNING);
       }
@@ -58,11 +58,11 @@ abstract class LocalReadOnlyStream extends LocalStream {
    */
   public function stream_lock($operation) {
     // Disallow exclusive lock or non-blocking lock requests
-    if (in_array($operation, array(LOCK_EX, LOCK_EX | LOCK_NB))) {
+    if (in_array($operation, [LOCK_EX, LOCK_EX | LOCK_NB])) {
       trigger_error('stream_lock() exclusive lock operations not supported for read-only stream wrappers', E_USER_WARNING);
       return FALSE;
     }
-    if (in_array($operation, array(LOCK_SH, LOCK_UN, LOCK_SH | LOCK_NB))) {
+    if (in_array($operation, [LOCK_SH, LOCK_UN, LOCK_SH | LOCK_NB])) {
       return flock($this->handle, $operation);
     }
 
diff --git a/web/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/web/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
index 343b461ee..ec1980ebd 100644
--- a/web/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
+++ b/web/core/lib/Drupal/Core/StreamWrapper/LocalStream.php
@@ -52,19 +52,19 @@ abstract class LocalStream implements StreamWrapperInterface {
    * @return string
    *   String specifying the path.
    */
-  abstract function getDirectoryPath();
+  abstract public function getDirectoryPath();
 
   /**
    * {@inheritdoc}
    */
-  function setUri($uri) {
+  public function setUri($uri) {
     $this->uri = $uri;
   }
 
   /**
    * {@inheritdoc}
    */
-  function getUri() {
+  public function getUri() {
     return $this->uri;
   }
 
@@ -98,7 +98,7 @@ abstract class LocalStream implements StreamWrapperInterface {
   /**
    * {@inheritdoc}
    */
-  function realpath() {
+  public function realpath() {
     return $this->getLocalPath();
   }
 
@@ -189,7 +189,7 @@ abstract class LocalStream implements StreamWrapperInterface {
    * @see http://php.net/manual/streamwrapper.stream-lock.php
    */
   public function stream_lock($operation) {
-    if (in_array($operation, array(LOCK_SH, LOCK_EX, LOCK_UN, LOCK_NB))) {
+    if (in_array($operation, [LOCK_SH, LOCK_EX, LOCK_UN, LOCK_NB])) {
       return flock($this->handle, $operation);
     }
 
diff --git a/web/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php b/web/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
index 1b48910b4..2bf03f6cd 100644
--- a/web/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
+++ b/web/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
@@ -39,14 +39,14 @@ abstract class ReadOnlyStream implements StreamWrapperInterface {
   /**
    * {@inheritdoc}
    */
-  function setUri($uri) {
+  public function setUri($uri) {
     $this->uri = $uri;
   }
 
   /**
    * {@inheritdoc}
    */
-  function getUri() {
+  public function getUri() {
     return $this->uri;
   }
 
@@ -71,7 +71,7 @@ abstract class ReadOnlyStream implements StreamWrapperInterface {
    * @see http://php.net/manual/streamwrapper.stream-open.php
    */
   public function stream_open($uri, $mode, $options, &$opened_path) {
-    if (!in_array($mode, array('r', 'rb', 'rt'))) {
+    if (!in_array($mode, ['r', 'rb', 'rt'])) {
       if ($options & STREAM_REPORT_ERRORS) {
         trigger_error('stream_open() write modes not supported for read-only stream wrappers', E_USER_WARNING);
       }
@@ -111,11 +111,11 @@ abstract class ReadOnlyStream implements StreamWrapperInterface {
    * @see http://php.net/manual/streamwrapper.stream-lock.php
    */
   public function stream_lock($operation) {
-    if (in_array($operation, array(LOCK_EX, LOCK_EX | LOCK_NB))) {
+    if (in_array($operation, [LOCK_EX, LOCK_EX | LOCK_NB])) {
       trigger_error('stream_lock() exclusive lock operations not supported for read-only stream wrappers', E_USER_WARNING);
       return FALSE;
     }
-    if (in_array($operation, array(LOCK_SH, LOCK_UN, LOCK_SH | LOCK_NB))) {
+    if (in_array($operation, [LOCK_SH, LOCK_UN, LOCK_SH | LOCK_NB])) {
       return flock($this->handle, $operation);
     }
 
diff --git a/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php b/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
index 26b8eeecc..83310f68a 100644
--- a/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
+++ b/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
@@ -23,7 +23,7 @@ class StreamWrapperManager implements ContainerAwareInterface, StreamWrapperMana
    *
    * @var array
    */
-  protected $info = array();
+  protected $info = [];
 
   /**
    * Contains collected stream wrappers.
@@ -41,7 +41,7 @@ class StreamWrapperManager implements ContainerAwareInterface, StreamWrapperMana
    *
    * @var array
    */
-  protected $wrappers = array();
+  protected $wrappers = [];
 
   /**
    * {@inheritdoc}
@@ -51,7 +51,7 @@ class StreamWrapperManager implements ContainerAwareInterface, StreamWrapperMana
       return $this->wrappers[$filter];
     }
     elseif (isset($this->wrappers[StreamWrapperInterface::ALL])) {
-      $this->wrappers[$filter] = array();
+      $this->wrappers[$filter] = [];
       foreach ($this->wrappers[StreamWrapperInterface::ALL] as $scheme => $info) {
         // Bit-wise filter.
         if (($info['type'] & $filter) == $filter) {
@@ -61,7 +61,7 @@ class StreamWrapperManager implements ContainerAwareInterface, StreamWrapperMana
       return $this->wrappers[$filter];
     }
     else {
-      return array();
+      return [];
     }
   }
 
@@ -69,7 +69,7 @@ class StreamWrapperManager implements ContainerAwareInterface, StreamWrapperMana
    * {@inheritdoc}
    */
   public function getNames($filter = StreamWrapperInterface::ALL) {
-    $names = array();
+    $names = [];
     foreach (array_keys($this->getWrappers($filter)) as $scheme) {
       $names[$scheme] = $this->getViaScheme($scheme)->getName();
     }
@@ -81,7 +81,7 @@ class StreamWrapperManager implements ContainerAwareInterface, StreamWrapperMana
    * {@inheritdoc}
    */
   public function getDescriptions($filter = StreamWrapperInterface::ALL) {
-    $descriptions = array();
+    $descriptions = [];
     foreach (array_keys($this->getWrappers($filter)) as $scheme) {
       $descriptions[$scheme] = $this->getViaScheme($scheme)->getDescription();
     }
@@ -149,11 +149,11 @@ class StreamWrapperManager implements ContainerAwareInterface, StreamWrapperMana
    *   The scheme for which the wrapper should be registered.
    */
   public function addStreamWrapper($service_id, $class, $scheme) {
-    $this->info[$scheme] = array(
+    $this->info[$scheme] = [
       'class' => $class,
       'type' => $class::getType(),
       'service_id' => $service_id,
-    );
+    ];
   }
 
   /**
@@ -200,7 +200,7 @@ class StreamWrapperManager implements ContainerAwareInterface, StreamWrapperMana
     }
 
     // Pre-populate the static cache with the filters most typically used.
-    $info = array('type' => $type, 'class' => $class);
+    $info = ['type' => $type, 'class' => $class];
     $this->wrappers[StreamWrapperInterface::ALL][$scheme] = $info;
 
     if (($type & StreamWrapperInterface::WRITE_VISIBLE) == StreamWrapperInterface::WRITE_VISIBLE) {
diff --git a/web/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php b/web/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
index 674145617..4600c170a 100644
--- a/web/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
+++ b/web/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
@@ -62,7 +62,7 @@ class PluralTranslatableMarkup extends TranslatableMarkup {
    */
   public function __construct($count, $singular, $plural, array $args = [], array $options = [], TranslationInterface $string_translation = NULL) {
     $this->count = $count;
-    $translatable_string = implode(static::DELIMITER, array($singular, $plural));
+    $translatable_string = implode(static::DELIMITER, [$singular, $plural]);
     parent::__construct($translatable_string, $args, $options, $string_translation);
   }
 
@@ -161,7 +161,7 @@ class PluralTranslatableMarkup extends TranslatableMarkup {
    * {@inheritdoc}
    */
   public function __sleep() {
-    return array_merge(parent::__sleep(), array('count'));
+    return array_merge(parent::__sleep(), ['count']);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php b/web/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php
index 63ff01915..c435f7950 100644
--- a/web/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php
+++ b/web/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php
@@ -67,7 +67,7 @@ trait StringTranslationTrait {
    *
    * @ingroup sanitization
    */
-  protected function t($string, array $args = array(), array $options = array()) {
+  protected function t($string, array $args = [], array $options = []) {
     return new TranslatableMarkup($string, $args, $options, $this->getStringTranslation());
   }
 
@@ -76,7 +76,7 @@ trait StringTranslationTrait {
    *
    * @see \Drupal\Core\StringTranslation\TranslationInterface::formatPlural()
    */
-  protected function formatPlural($count, $singular, $plural, array $args = array(), array $options = array()) {
+  protected function formatPlural($count, $singular, $plural, array $args = [], array $options = []) {
     return new PluralTranslatableMarkup($count, $singular, $plural, $args, $options, $this->getStringTranslation());
   }
 
diff --git a/web/core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php b/web/core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php
index 8e3c13c64..801621258 100644
--- a/web/core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php
+++ b/web/core/lib/Drupal/Core/StringTranslation/TranslatableMarkup.php
@@ -134,7 +134,7 @@ class TranslatableMarkup extends FormattableMarkup {
    *
    * @ingroup sanitization
    */
-  public function __construct($string, array $arguments = array(), array $options = array(), TranslationInterface $string_translation = NULL) {
+  public function __construct($string, array $arguments = [], array $options = [], TranslationInterface $string_translation = NULL) {
     if (!is_string($string)) {
       $message = $string instanceof TranslatableMarkup ? '$string ("' . $string->getUntranslatedString() . '") must be a string.' : '$string ("' . (string) $string . '") must be a string.';
       throw new \InvalidArgumentException($message);
@@ -210,7 +210,7 @@ class TranslatableMarkup extends FormattableMarkup {
    * Magic __sleep() method to avoid serializing the string translator.
    */
   public function __sleep() {
-    return array('string', 'arguments', 'options');
+    return ['string', 'arguments', 'options'];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php b/web/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
index 8244302e6..6a977b4a5 100644
--- a/web/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
+++ b/web/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
@@ -45,7 +45,7 @@ interface TranslationInterface {
    *
    * @ingroup sanitization
    */
-  public function translate($string, array $args = array(), array $options = array());
+  public function translate($string, array $args = [], array $options = []);
 
   /**
    * Translates a TranslatableMarkup object to a string.
@@ -107,6 +107,6 @@ interface TranslationInterface {
    * @see \Drupal\Component\Utility\SafeMarkup::format()
    * @see \Drupal\Core\StringTranslation\PluralTranslatableMarkup::createFromTranslatedString()
    */
-  public function formatPlural($count, $singular, $plural, array $args = array(), array $options = array());
+  public function formatPlural($count, $singular, $plural, array $args = [], array $options = []);
 
 }
diff --git a/web/core/lib/Drupal/Core/StringTranslation/TranslationManager.php b/web/core/lib/Drupal/Core/StringTranslation/TranslationManager.php
index ce961207a..40bf8f4b3 100644
--- a/web/core/lib/Drupal/Core/StringTranslation/TranslationManager.php
+++ b/web/core/lib/Drupal/Core/StringTranslation/TranslationManager.php
@@ -21,7 +21,7 @@ class TranslationManager implements TranslationInterface, TranslatorInterface {
    * @see \Drupal\Core\StringTranslation\TranslationManager::addTranslator()
    * @see \Drupal\Core\StringTranslation\TranslationManager::sortTranslators()
    */
-  protected $translators = array();
+  protected $translators = [];
 
   /**
    * An array of translators, sorted by priority.
@@ -77,7 +77,7 @@ class TranslationManager implements TranslationInterface, TranslatorInterface {
    *   A sorted array of translator objects.
    */
   protected function sortTranslators() {
-    $sorted = array();
+    $sorted = [];
     krsort($this->translators);
 
     foreach ($this->translators as $translators) {
@@ -106,7 +106,7 @@ class TranslationManager implements TranslationInterface, TranslatorInterface {
   /**
    * {@inheritdoc}
    */
-  public function translate($string, array $args = array(), array $options = array()) {
+  public function translate($string, array $args = [], array $options = []) {
     return new TranslatableMarkup($string, $args, $options, $this);
   }
 
@@ -131,7 +131,7 @@ class TranslationManager implements TranslationInterface, TranslatorInterface {
    * @return string
    *   The translated string.
    */
-  protected function doTranslate($string, array $options = array()) {
+  protected function doTranslate($string, array $options = []) {
     // If a NULL langcode has been provided, unset it.
     if (!isset($options['langcode']) && array_key_exists('langcode', $options)) {
       unset($options['langcode']);
@@ -149,7 +149,7 @@ class TranslationManager implements TranslationInterface, TranslatorInterface {
   /**
    * {@inheritdoc}
    */
-  public function formatPlural($count, $singular, $plural, array $args = array(), array $options = array()) {
+  public function formatPlural($count, $singular, $plural, array $args = [], array $options = []) {
     return new PluralTranslatableMarkup($count, $singular, $plural, $args, $options, $this);
   }
 
diff --git a/web/core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php b/web/core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php
index 8e733d548..286ab61b1 100644
--- a/web/core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php
+++ b/web/core/lib/Drupal/Core/StringTranslation/Translator/CustomStrings.php
@@ -37,7 +37,7 @@ class CustomStrings extends StaticTranslation {
    * {@inheritdoc}
    */
   protected function getLanguage($langcode) {
-    return $this->settings->get('locale_custom_strings_' . $langcode, array());
+    return $this->settings->get('locale_custom_strings_' . $langcode, []);
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php b/web/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php
index abe5e9a7b..deee5f4f0 100644
--- a/web/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php
+++ b/web/core/lib/Drupal/Core/StringTranslation/Translator/FileTranslation.php
@@ -47,7 +47,7 @@ class FileTranslation extends StaticTranslation {
       return $this->filesToArray($langcode, $files);
     }
     else {
-      return array();
+      return [];
     }
   }
 
@@ -70,7 +70,7 @@ class FileTranslation extends StaticTranslation {
    * @see file_scan_directory()
    */
   public function findTranslationFiles($langcode = NULL) {
-    $files = file_scan_directory($this->directory, $this->getTranslationFilesPattern($langcode), array('recurse' => FALSE));
+    $files = file_scan_directory($this->directory, $this->getTranslationFilesPattern($langcode), ['recurse' => FALSE]);
     return $files;
   }
 
diff --git a/web/core/lib/Drupal/Core/StringTranslation/Translator/StaticTranslation.php b/web/core/lib/Drupal/Core/StringTranslation/Translator/StaticTranslation.php
index 375130fb3..15ee5c5a2 100644
--- a/web/core/lib/Drupal/Core/StringTranslation/Translator/StaticTranslation.php
+++ b/web/core/lib/Drupal/Core/StringTranslation/Translator/StaticTranslation.php
@@ -23,7 +23,7 @@ class StaticTranslation implements TranslatorInterface {
    * @param array $translations
    *   Array of override strings indexed by language and context
    */
-  public function __construct($translations = array()) {
+  public function __construct($translations = []) {
     $this->translations = $translations;
   }
 
@@ -46,7 +46,7 @@ class StaticTranslation implements TranslatorInterface {
    * {@inheritdoc}
    */
   public function reset() {
-    $this->translations = array();
+    $this->translations = [];
   }
 
   /**
@@ -66,7 +66,7 @@ class StaticTranslation implements TranslatorInterface {
     // constructor. This can be useful while testing, but it does not support
     // loading specific languages. All available languages should be passed
     // in the constructor array.
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Template/Attribute.php b/web/core/lib/Drupal/Core/Template/Attribute.php
index 945c5bc0d..5449cde3d 100644
--- a/web/core/lib/Drupal/Core/Template/Attribute.php
+++ b/web/core/lib/Drupal/Core/Template/Attribute.php
@@ -69,7 +69,7 @@ class Attribute implements \ArrayAccess, \IteratorAggregate, MarkupInterface {
    *
    * @var \Drupal\Core\Template\AttributeValueBase[]
    */
-  protected $storage = array();
+  protected $storage = [];
 
   /**
    * Constructs a \Drupal\Core\Template\Attribute object.
@@ -77,7 +77,7 @@ class Attribute implements \ArrayAccess, \IteratorAggregate, MarkupInterface {
    * @param array $attributes
    *   An associative array of key-value pairs to be converted to attributes.
    */
-  public function __construct($attributes = array()) {
+  public function __construct($attributes = []) {
     foreach ($attributes as $name => $value) {
       $this->offsetSet($name, $value);
     }
@@ -170,7 +170,7 @@ class Attribute implements \ArrayAccess, \IteratorAggregate, MarkupInterface {
   public function addClass() {
     $args = func_get_args();
     if ($args) {
-      $classes = array();
+      $classes = [];
       foreach ($args as $arg) {
         // Merge the values passed in from the classes array.
         // The argument is cast to an array to support comma separated single
@@ -245,7 +245,7 @@ class Attribute implements \ArrayAccess, \IteratorAggregate, MarkupInterface {
     // With no class attribute, there is no need to remove.
     if (isset($this->storage['class']) && $this->storage['class'] instanceof AttributeArray) {
       $args = func_get_args();
-      $classes = array();
+      $classes = [];
       foreach ($args as $arg) {
         // Merge the values passed in from the classes array.
         // The argument is cast to an array to support comma separated single
diff --git a/web/core/lib/Drupal/Core/Template/AttributeValueBase.php b/web/core/lib/Drupal/Core/Template/AttributeValueBase.php
index a0280e610..0990eb3fd 100644
--- a/web/core/lib/Drupal/Core/Template/AttributeValueBase.php
+++ b/web/core/lib/Drupal/Core/Template/AttributeValueBase.php
@@ -65,6 +65,6 @@ abstract class AttributeValueBase {
   /**
    * Implements the magic __toString() method.
    */
-  abstract function __toString();
+  abstract public function __toString();
 
 }
diff --git a/web/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php b/web/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
index abd4ef24f..3f727cf52 100644
--- a/web/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
+++ b/web/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
@@ -24,11 +24,11 @@ class FilesystemLoader extends \Twig_Loader_Filesystem {
    * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
    *   The theme handler service.
    */
-  public function __construct($paths = array(), ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler) {
+  public function __construct($paths = [], ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler) {
     parent::__construct($paths);
 
     // Add namespaced paths for modules and themes.
-    $namespaces = array();
+    $namespaces = [];
     foreach ($module_handler->getModuleList() as $name => $extension) {
       $namespaces[$name] = $extension->getPath();
     }
@@ -51,7 +51,7 @@ class FilesystemLoader extends \Twig_Loader_Filesystem {
    */
   public function addPath($path, $namespace = self::MAIN_NAMESPACE) {
     // Invalidate the cache.
-    $this->cache = array();
+    $this->cache = [];
     $this->paths[$namespace][] = rtrim($path, '/\\');
   }
 
diff --git a/web/core/lib/Drupal/Core/Template/TwigEnvironment.php b/web/core/lib/Drupal/Core/Template/TwigEnvironment.php
index fe391d8ed..21755a505 100644
--- a/web/core/lib/Drupal/Core/Template/TwigEnvironment.php
+++ b/web/core/lib/Drupal/Core/Template/TwigEnvironment.php
@@ -4,6 +4,7 @@ namespace Drupal\Core\Template;
 
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Render\Markup;
+use Drupal\Core\State\StateInterface;
 
 /**
  * A class that defines a Twig environment for Drupal.
@@ -22,6 +23,8 @@ class TwigEnvironment extends \Twig_Environment {
    */
   protected $templateClasses;
 
+  protected $twigCachePrefix = '';
+
   /**
    * Constructs a TwigEnvironment object and stores cache and storage
    * internally.
@@ -32,24 +35,26 @@ class TwigEnvironment extends \Twig_Environment {
    *   The cache bin.
    * @param string $twig_extension_hash
    *   The Twig extension hash.
+   * @param \Drupal\Core\State\StateInterface $state
+   *   The state service.
    * @param \Twig_LoaderInterface $loader
    *   The Twig loader or loader chain.
    * @param array $options
    *   The options for the Twig environment.
    */
-  public function __construct($root, CacheBackendInterface $cache, $twig_extension_hash, \Twig_LoaderInterface $loader = NULL, $options = array()) {
+  public function __construct($root, CacheBackendInterface $cache, $twig_extension_hash, StateInterface $state, \Twig_LoaderInterface $loader = NULL, $options = []) {
     // Ensure that twig.engine is loaded, given that it is needed to render a
     // template because functions like TwigExtension::escapeFilter() are called.
     require_once $root . '/core/themes/engines/twig/twig.engine';
 
-    $this->templateClasses = array();
+    $this->templateClasses = [];
 
-    $options += array(
+    $options += [
       // @todo Ensure garbage collection of expired files.
       'cache' => TRUE,
       'debug' => FALSE,
       'auto_reload' => NULL,
-    );
+    ];
     // Ensure autoescaping is always on.
     $options['autoescape'] = 'html';
 
@@ -58,13 +63,35 @@ class TwigEnvironment extends \Twig_Environment {
     $this->addExtension($sandbox);
 
     if ($options['cache'] === TRUE) {
-      $options['cache'] = new TwigPhpStorageCache($cache, $twig_extension_hash);
+      $current = $state->get('twig_extension_hash_prefix', ['twig_extension_hash' => '']);
+      if ($current['twig_extension_hash'] !== $twig_extension_hash || empty($current['twig_cache_prefix'])) {
+        $current = [
+          'twig_extension_hash' => $twig_extension_hash,
+          // Generate a new prefix which invalidates any existing cached files.
+          'twig_cache_prefix' => uniqid(),
+
+        ];
+        $state->set('twig_extension_hash_prefix', $current);
+      }
+      $this->twigCachePrefix = $current['twig_cache_prefix'];
+
+      $options['cache'] = new TwigPhpStorageCache($cache, $this->twigCachePrefix);
     }
 
     $this->loader = $loader;
     parent::__construct($this->loader, $options);
   }
 
+  /**
+   * Get the cache prefixed used by \Drupal\Core\Template\TwigPhpStorageCache
+   *
+   * @return string
+   *   The file cache prefix, or empty string if the cache is disabled.
+   */
+  public function getTwigCachePrefix() {
+    return $this->twigCachePrefix;
+  }
+
   /**
    * Gets the template class associated with the given string.
    *
@@ -110,7 +137,7 @@ class TwigEnvironment extends \Twig_Environment {
    *
    * @see \Drupal\Core\Template\Loader\StringLoader::exists()
    */
-  public function renderInline($template_string, array $context = array()) {
+  public function renderInline($template_string, array $context = []) {
     // Prefix all inline templates with a special comment.
     $template_string = '{# inline_template_start #}' . $template_string;
     return Markup::create($this->loadTemplate($template_string, NULL)->render($context));
diff --git a/web/core/lib/Drupal/Core/Template/TwigExtension.php b/web/core/lib/Drupal/Core/Template/TwigExtension.php
index 8270c66d6..520a8beb2 100644
--- a/web/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/web/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -58,9 +58,18 @@ class TwigExtension extends \Twig_Extension {
    *
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
+   * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
+   *   The URL generator.
+   * @param \Drupal\Core\Theme\ThemeManagerInterface $theme_manager
+   *   The theme manager.
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
+   *   The date formatter.
    */
-  public function __construct(RendererInterface $renderer) {
+  public function __construct(RendererInterface $renderer, UrlGeneratorInterface $url_generator, ThemeManagerInterface $theme_manager, DateFormatterInterface $date_formatter) {
     $this->renderer = $renderer;
+    $this->urlGenerator = $url_generator;
+    $this->themeManager = $theme_manager;
+    $this->dateFormatter = $date_formatter;
   }
 
   /**
@@ -72,7 +81,6 @@ class TwigExtension extends \Twig_Extension {
    * @return $this
    *
    * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
-   *   Use \Drupal\Core\Template\TwigExtension::setUrlGenerator().
    */
   public function setGenerators(UrlGeneratorInterface $url_generator) {
     return $this->setUrlGenerator($url_generator);
@@ -85,6 +93,8 @@ class TwigExtension extends \Twig_Extension {
    *   The URL generator.
    *
    * @return $this
+   *
+   * @deprecated in Drupal 8.3.x-dev, will be removed before Drupal 9.0.0.
    */
   public function setUrlGenerator(UrlGeneratorInterface $url_generator) {
     $this->urlGenerator = $url_generator;
@@ -98,6 +108,8 @@ class TwigExtension extends \Twig_Extension {
    *   The theme manager.
    *
    * @return $this
+   *
+   * @deprecated in Drupal 8.3.x-dev, will be removed before Drupal 9.0.0.
    */
   public function setThemeManager(ThemeManagerInterface $theme_manager) {
     $this->themeManager = $theme_manager;
@@ -111,6 +123,8 @@ class TwigExtension extends \Twig_Extension {
    *   The date formatter.
    *
    * @return $this
+   *
+   * @deprecated in Drupal 8.3.x-dev, will be removed before Drupal 9.0.0.
    */
   public function setDateFormatter(DateFormatterInterface $date_formatter) {
     $this->dateFormatter = $date_formatter;
@@ -123,18 +137,19 @@ class TwigExtension extends \Twig_Extension {
   public function getFunctions() {
     return [
       // This function will receive a renderable array, if an array is detected.
-      new \Twig_SimpleFunction('render_var', array($this, 'renderVar')),
+      new \Twig_SimpleFunction('render_var', [$this, 'renderVar']),
       // The url and path function are defined in close parallel to those found
       // in \Symfony\Bridge\Twig\Extension\RoutingExtension
-      new \Twig_SimpleFunction('url', array($this, 'getUrl'), array('is_safe_callback' => array($this, 'isUrlGenerationSafe'))),
-      new \Twig_SimpleFunction('path', array($this, 'getPath'), array('is_safe_callback' => array($this, 'isUrlGenerationSafe'))),
-      new \Twig_SimpleFunction('link', array($this, 'getLink')),
+      new \Twig_SimpleFunction('url', [$this, 'getUrl'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
+      new \Twig_SimpleFunction('path', [$this, 'getPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
+      new \Twig_SimpleFunction('link', [$this, 'getLink']),
       new \Twig_SimpleFunction('file_url', function ($uri) {
         return file_url_transform_relative(file_create_url($uri));
       }),
       new \Twig_SimpleFunction('attach_library', [$this, 'attachLibrary']),
       new \Twig_SimpleFunction('active_theme_path', [$this, 'getActiveThemePath']),
       new \Twig_SimpleFunction('active_theme', [$this, 'getActiveTheme']),
+      new \Twig_SimpleFunction('create_attribute', [$this, 'createAttribute']),
     ];
   }
 
@@ -142,19 +157,19 @@ class TwigExtension extends \Twig_Extension {
    * {@inheritdoc}
    */
   public function getFilters() {
-    return array(
+    return [
       // Translation filters.
-      new \Twig_SimpleFilter('t', 't', array('is_safe' => array('html'))),
-      new \Twig_SimpleFilter('trans', 't', array('is_safe' => array('html'))),
+      new \Twig_SimpleFilter('t', 't', ['is_safe' => ['html']]),
+      new \Twig_SimpleFilter('trans', 't', ['is_safe' => ['html']]),
       // The "raw" filter is not detectable when parsing "trans" tags. To detect
       // which prefix must be used for translation (@, !, %), we must clone the
       // "raw" filter and give it identifiable names. These filters should only
       // be used in "trans" tags.
       // @see TwigNodeTrans::compileString()
-      new \Twig_SimpleFilter('placeholder', [$this, 'escapePlaceholder'], array('is_safe' => array('html'), 'needs_environment' => TRUE)),
+      new \Twig_SimpleFilter('placeholder', [$this, 'escapePlaceholder'], ['is_safe' => ['html'], 'needs_environment' => TRUE]),
 
       // Replace twig's escape filter with our own.
-      new \Twig_SimpleFilter('drupal_escape', [$this, 'escapeFilter'], array('needs_environment' => TRUE, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
+      new \Twig_SimpleFilter('drupal_escape', [$this, 'escapeFilter'], ['needs_environment' => TRUE, 'is_safe_callback' => 'twig_escape_filter_is_safe']),
 
       // Implements safe joining.
       // @todo Make that the default for |join? Upstream issue:
@@ -168,9 +183,9 @@ class TwigExtension extends \Twig_Extension {
       new \Twig_SimpleFilter('clean_class', '\Drupal\Component\Utility\Html::getClass'),
       new \Twig_SimpleFilter('clean_id', '\Drupal\Component\Utility\Html::getId'),
       // This filter will render a renderable array to use the string results.
-      new \Twig_SimpleFilter('render', array($this, 'renderVar')),
-      new \Twig_SimpleFilter('format_date', array($this->dateFormatter, 'format')),
-    );
+      new \Twig_SimpleFilter('render', [$this, 'renderVar']),
+      new \Twig_SimpleFilter('format_date', [$this->dateFormatter, 'format']),
+    ];
   }
 
   /**
@@ -179,18 +194,18 @@ class TwigExtension extends \Twig_Extension {
   public function getNodeVisitors() {
     // The node visitor is needed to wrap all variables with
     // render_var -> TwigExtension->renderVar() function.
-    return array(
+    return [
       new TwigNodeVisitor(),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getTokenParsers() {
-    return array(
+    return [
       new TwigTransTokenParser(),
-    );
+    ];
   }
 
   /**
@@ -216,7 +231,7 @@ class TwigExtension extends \Twig_Extension {
    *
    * @see \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute()
    */
-  public function getPath($name, $parameters = array(), $options = array()) {
+  public function getPath($name, $parameters = [], $options = []) {
     $options['absolute'] = FALSE;
     return $this->urlGenerator->generateFromRoute($name, $parameters, $options);
   }
@@ -237,7 +252,7 @@ class TwigExtension extends \Twig_Extension {
    *
    * @todo Add an option for scheme-relative URLs.
    */
-  public function getUrl($name, $parameters = array(), $options = array()) {
+  public function getUrl($name, $parameters = [], $options = []) {
     // Generate URL.
     $options['absolute'] = TRUE;
     $generated_url = $this->urlGenerator->generateFromRoute($name, $parameters, $options, TRUE);
@@ -265,14 +280,15 @@ class TwigExtension extends \Twig_Extension {
     if (!$url instanceof Url) {
       $url = Url::fromUri($url);
     }
+    // The twig extension should not modify the original URL object, this
+    // ensures consistent rendering.
+    // @see https://www.drupal.org/node/2842399
+    $url = clone $url;
     if ($attributes) {
       if ($attributes instanceof Attribute) {
         $attributes = $attributes->toArray();
       }
-      if ($existing_attributes = $url->getOption('attributes')) {
-        $attributes = array_merge($existing_attributes, $attributes);
-      }
-      $url->setOption('attributes', $attributes);
+      $url->mergeOptions(['attributes' => $attributes]);
     }
     // The text has been processed by twig already, convert it to a safe object
     // for the render system.
@@ -340,10 +356,10 @@ class TwigExtension extends \Twig_Extension {
 
     if (!isset($parameter_node) || $parameter_node instanceof \Twig_Node_Expression_Array && count($parameter_node) <= 2 &&
         (!$parameter_node->hasNode(1) || $parameter_node->getNode(1) instanceof \Twig_Node_Expression_Constant)) {
-      return array('html');
+      return ['html'];
     }
 
-    return array();
+    return [];
   }
 
   /**
@@ -600,4 +616,18 @@ class TwigExtension extends \Twig_Extension {
     }, (array) $value));
   }
 
+  /**
+   * Creates an Attribute object.
+   *
+   * @param array $attributes
+   *   (optional) An associative array of key-value pairs to be converted to
+   *   HTML attributes.
+   *
+   * @return \Drupal\Core\Template\Attribute
+   *   An attributes object that has the given attributes.
+   */
+  public function createAttribute(array $attributes = []) {
+    return new Attribute($attributes);
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Template/TwigNodeTrans.php b/web/core/lib/Drupal/Core/Template/TwigNodeTrans.php
index 21006fd1e..264a51117 100644
--- a/web/core/lib/Drupal/Core/Template/TwigNodeTrans.php
+++ b/web/core/lib/Drupal/Core/Template/TwigNodeTrans.php
@@ -18,12 +18,12 @@ class TwigNodeTrans extends \Twig_Node {
    * {@inheritdoc}
    */
   public function __construct(\Twig_Node $body, \Twig_Node $plural = NULL, \Twig_Node_Expression $count = NULL, \Twig_Node_Expression $options = NULL, $lineno, $tag = NULL) {
-    parent::__construct(array(
+    parent::__construct([
       'count' => $count,
       'body' => $body,
       'plural' => $plural,
       'options' => $options,
-    ), array(), $lineno, $tag);
+    ], [], $lineno, $tag);
   }
 
   /**
@@ -95,10 +95,10 @@ class TwigNodeTrans extends \Twig_Node {
    */
   protected function compileString(\Twig_Node $body) {
     if ($body instanceof \Twig_Node_Expression_Name || $body instanceof \Twig_Node_Expression_Constant || $body instanceof \Twig_Node_Expression_TempName) {
-      return array($body, array());
+      return [$body, []];
     }
 
-    $tokens = array();
+    $tokens = [];
     if (count($body)) {
       $text = '';
 
@@ -135,7 +135,7 @@ class TwigNodeTrans extends \Twig_Node {
             $args = $args->getNode('node');
           }
           if ($args instanceof \Twig_Node_Expression_GetAttr) {
-            $argName = array();
+            $argName = [];
             // Reuse the incoming expression.
             $expr = $args;
             // Assemble a valid argument name by walking through the expression.
@@ -176,7 +176,7 @@ class TwigNodeTrans extends \Twig_Node {
       $text = $body->getAttribute('data');
     }
 
-    return array(new \Twig_Node(array(new \Twig_Node_Expression_Constant(trim($text), $body->getLine()))), $tokens);
+    return [new \Twig_Node([new \Twig_Node_Expression_Constant(trim($text), $body->getLine())]), $tokens];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php b/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
index 6222d69e3..1ebfa57de 100644
--- a/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
+++ b/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
@@ -35,7 +35,7 @@ class TwigNodeVisitor extends \Twig_BaseNodeVisitor {
       $class = get_class($node);
       $line = $node->getLine();
       return new $class(
-        new \Twig_Node_Expression_Function('render_var', new \Twig_Node(array($node->getNode('expr'))), $line),
+        new \Twig_Node_Expression_Function('render_var', new \Twig_Node([$node->getNode('expr')]), $line),
         $line
       );
     }
diff --git a/web/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php b/web/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php
index b9f7cae3c..995ce9780 100644
--- a/web/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php
+++ b/web/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\Template;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\PhpStorage\PhpStorageFactory;
 
@@ -17,6 +18,11 @@ use Drupal\Core\PhpStorage\PhpStorageFactory;
  */
 class TwigPhpStorageCache implements \Twig_CacheInterface {
 
+  /**
+   * The maximum length for each part of the cache key suffix.
+   */
+  const SUFFIX_SUBSTRING_LENGTH = 25;
+
   /**
    * The cache object used for auto-refresh via mtime.
    *
@@ -43,12 +49,12 @@ class TwigPhpStorageCache implements \Twig_CacheInterface {
    *
    * @param \Drupal\Core\Cache\CacheBackendInterface $cache
    *   The cache bin.
-   * @param string $twig_extension_hash
-   *   The Twig extension hash.
+   * @param string $twig_cache_prefix
+   *   A Twig cache file prefix that changes when Twig extensions change.
    */
-  public function __construct(CacheBackendInterface $cache, $twig_extension_hash) {
+  public function __construct(CacheBackendInterface $cache, $twig_cache_prefix) {
     $this->cache = $cache;
-    $this->templateCacheFilenamePrefix = $twig_extension_hash;
+    $this->templateCacheFilenamePrefix = $twig_cache_prefix;
   }
 
   /**
@@ -67,20 +73,28 @@ class TwigPhpStorageCache implements \Twig_CacheInterface {
    * {@inheritdoc}
    */
   public function generateKey($name, $className) {
-    $hash = hash('sha256', $className);
-
     if (strpos($name, '{# inline_template_start #}') === 0) {
       // $name is an inline template, and can have characters that are not valid
-      // for a filename. $hash is unique for each inline template so we just use
-      // the generic name 'inline-template' here.
+      // for a filename. $suffix is unique for each inline template so we just
+      // use the generic name 'inline-template' here.
       $name = 'inline-template';
     }
     else {
       $name = basename($name);
     }
 
-    // The first part is what is invalidated.
-    return $this->templateCacheFilenamePrefix . '_' . $name . '_' . $hash;
+    // Windows (and some encrypted Linux systems) only support 255 characters in
+    // a path. On Windows a requirements error is displayed and installation is
+    // blocked if Drupal's public files path is longer than 120 characters.
+    // Thus, to always be less than 255, file paths may not be more than 135
+    // characters long. Using the default PHP file storage class, the Twig cache
+    // file path will be 124 characters long at most, which provides a margin of
+    // safety.
+    $suffix = substr($name, 0, self::SUFFIX_SUBSTRING_LENGTH) . '_';
+    $suffix .= substr(Crypt::hashBase64($className), 0, self::SUFFIX_SUBSTRING_LENGTH);
+
+    // The cache prefix is what gets invalidated.
+    return $this->templateCacheFilenamePrefix . '_' . $suffix;
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Template/TwigTransTokenParser.php b/web/core/lib/Drupal/Core/Template/TwigTransTokenParser.php
index fb1601753..96f55607f 100644
--- a/web/core/lib/Drupal/Core/Template/TwigTransTokenParser.php
+++ b/web/core/lib/Drupal/Core/Template/TwigTransTokenParser.php
@@ -35,11 +35,11 @@ class TwigTransTokenParser extends \Twig_TokenParser {
     }
     if (!$body) {
       $stream->expect(\Twig_Token::BLOCK_END_TYPE);
-      $body = $this->parser->subparse(array($this, 'decideForFork'));
+      $body = $this->parser->subparse([$this, 'decideForFork']);
       if ('plural' === $stream->next()->getValue()) {
         $count = $this->parser->getExpressionParser()->parseExpression();
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);
-        $plural = $this->parser->subparse(array($this, 'decideForEnd'), TRUE);
+        $plural = $this->parser->subparse([$this, 'decideForEnd'], TRUE);
       }
     }
 
@@ -56,7 +56,7 @@ class TwigTransTokenParser extends \Twig_TokenParser {
    * Detect a 'plural' switch or the end of a 'trans' tag.
    */
   public function decideForFork($token) {
-    return $token->test(array('plural', 'endtrans'));
+    return $token->test(['plural', 'endtrans']);
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php b/web/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
new file mode 100644
index 000000000..e9d8d6686
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
@@ -0,0 +1,451 @@
+<?php
+
+namespace Drupal\Core\Test;
+
+use Drupal\Component\FileCache\FileCacheFactory;
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Config\Development\ConfigSchemaChecker;
+use Drupal\Core\DrupalKernel;
+use Drupal\Core\Extension\MissingDependencyException;
+use Drupal\Core\Serialization\Yaml;
+use Drupal\Core\Session\UserSession;
+use Drupal\Core\Site\Settings;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Yaml\Yaml as SymfonyYaml;
+
+/**
+ * Defines a trait for shared functional test setup functionality.
+ */
+trait FunctionalTestSetupTrait {
+
+  /**
+   * The "#1" admin user.
+   *
+   * @var \Drupal\Core\Session\AccountInterface
+   */
+  protected $rootUser;
+
+  /**
+   * The class loader to use for installation and initialization of setup.
+   *
+   * @var \Symfony\Component\Classloader\Classloader
+   */
+  protected $classLoader;
+
+  /**
+   * The config directories used in this test.
+   */
+  protected $configDirectories = [];
+
+  /**
+   * Prepares site settings and services before installation.
+   */
+  protected function prepareSettings() {
+    // Prepare installer settings that are not install_drupal() parameters.
+    // Copy and prepare an actual settings.php, so as to resemble a regular
+    // installation.
+    // Not using File API; a potential error must trigger a PHP warning.
+    $directory = DRUPAL_ROOT . '/' . $this->siteDirectory;
+    copy(DRUPAL_ROOT . '/sites/default/default.settings.php', $directory . '/settings.php');
+
+    // The public file system path is created during installation. Additionally,
+    // during tests:
+    // - The temporary directory is set and created by install_base_system().
+    // - The private file directory is created post install by
+    //   FunctionalTestSetupTrait::initConfig().
+    // @see system_requirements()
+    // @see TestBase::prepareEnvironment()
+    // @see install_base_system()
+    // @see \Drupal\Core\Test\FunctionalTestSetupTrait::initConfig()
+    $settings['settings']['file_public_path'] = (object) [
+      'value' => $this->publicFilesDirectory,
+      'required' => TRUE,
+    ];
+    $settings['settings']['file_private_path'] = (object) [
+      'value' => $this->privateFilesDirectory,
+      'required' => TRUE,
+    ];
+    // Save the original site directory path, so that extensions in the
+    // site-specific directory can still be discovered in the test site
+    // environment.
+    // @see \Drupal\Core\Extension\ExtensionDiscovery::scan()
+    $settings['settings']['test_parent_site'] = (object) [
+      'value' => $this->originalSite,
+      'required' => TRUE,
+    ];
+    // Add the parent profile's search path to the child site's search paths.
+    // @see \Drupal\Core\Extension\ExtensionDiscovery::getProfileDirectories()
+    $settings['conf']['simpletest.settings']['parent_profile'] = (object) [
+      'value' => $this->originalProfile,
+      'required' => TRUE,
+    ];
+    $this->writeSettings($settings);
+    // Allow for test-specific overrides.
+    $settings_testing_file = DRUPAL_ROOT . '/' . $this->originalSite . '/settings.testing.php';
+    if (file_exists($settings_testing_file)) {
+      // Copy the testing-specific settings.php overrides in place.
+      copy($settings_testing_file, $directory . '/settings.testing.php');
+      // Add the name of the testing class to settings.php and include the
+      // testing specific overrides.
+      file_put_contents($directory . '/settings.php', "\n\$test_class = '" . get_class($this) . "';\n" . 'include DRUPAL_ROOT . \'/\' . $site_path . \'/settings.testing.php\';' . "\n", FILE_APPEND);
+    }
+    $settings_services_file = DRUPAL_ROOT . '/' . $this->originalSite . '/testing.services.yml';
+    if (!file_exists($settings_services_file)) {
+      // Otherwise, use the default services as a starting point for overrides.
+      $settings_services_file = DRUPAL_ROOT . '/sites/default/default.services.yml';
+    }
+    // Copy the testing-specific service overrides in place.
+    copy($settings_services_file, $directory . '/services.yml');
+    if ($this->strictConfigSchema) {
+      // Add a listener to validate configuration schema on save.
+      $yaml = new SymfonyYaml();
+      $content = file_get_contents($directory . '/services.yml');
+      $services = $yaml->parse($content);
+      $services['services']['simpletest.config_schema_checker'] = [
+        'class' => ConfigSchemaChecker::class,
+        'arguments' => ['@config.typed', $this->getConfigSchemaExclusions()],
+        'tags' => [['name' => 'event_subscriber']],
+      ];
+      file_put_contents($directory . '/services.yml', $yaml->dump($services));
+    }
+    // Since Drupal is bootstrapped already, install_begin_request() will not
+    // bootstrap again. Hence, we have to reload the newly written custom
+    // settings.php manually.
+    Settings::initialize(DRUPAL_ROOT, $this->siteDirectory, $this->classLoader);
+  }
+
+  /**
+   * Rewrites the settings.php file of the test site.
+   *
+   * @param array $settings
+   *   An array of settings to write out, in the format expected by
+   *   drupal_rewrite_settings().
+   *
+   * @see drupal_rewrite_settings()
+   */
+  protected function writeSettings(array $settings) {
+    include_once DRUPAL_ROOT . '/core/includes/install.inc';
+    $filename = $this->siteDirectory . '/settings.php';
+    // system_requirements() removes write permissions from settings.php
+    // whenever it is invoked.
+    // Not using File API; a potential error must trigger a PHP warning.
+    chmod($filename, 0666);
+    drupal_rewrite_settings($settings, $filename);
+  }
+
+  /**
+   * Changes parameters in the services.yml file.
+   *
+   * @param string $name
+   *   The name of the parameter.
+   * @param string $value
+   *   The value of the parameter.
+   */
+  protected function setContainerParameter($name, $value) {
+    $filename = $this->siteDirectory . '/services.yml';
+    chmod($filename, 0666);
+
+    $services = Yaml::decode(file_get_contents($filename));
+    $services['parameters'][$name] = $value;
+    file_put_contents($filename, Yaml::encode($services));
+
+    // Ensure that the cache is deleted for the yaml file loader.
+    $file_cache = FileCacheFactory::get('container_yaml_loader');
+    $file_cache->delete($filename);
+  }
+
+  /**
+   * Rebuilds \Drupal::getContainer().
+   *
+   * Use this to update the test process's kernel with a new service container.
+   * For example, when the list of enabled modules is changed via the internal
+   * browser the test process's kernel has a service container with an out of
+   * date module list.
+   *
+   * @see TestBase::prepareEnvironment()
+   * @see TestBase::restoreEnvironment()
+   *
+   * @todo Fix https://www.drupal.org/node/2021959 so that module enable/disable
+   *   changes are immediately reflected in \Drupal::getContainer(). Until then,
+   *   tests can invoke this workaround when requiring services from newly
+   *   enabled modules to be immediately available in the same request.
+   */
+  protected function rebuildContainer() {
+    // Rebuild the kernel and bring it back to a fully bootstrapped state.
+    $this->container = $this->kernel->rebuildContainer();
+
+    // Make sure the url generator has a request object, otherwise calls to
+    // $this->drupalGet() will fail.
+    $this->prepareRequestForGenerator();
+  }
+
+  /**
+   * Resets all data structures after having enabled new modules.
+   *
+   * This method is called by FunctionalTestSetupTrait::rebuildAll() after
+   * enabling the requested modules. It must be called again when additional
+   * modules are enabled later.
+   *
+   * @see \Drupal\Core\Test\FunctionalTestSetupTrait::rebuildAll()
+   * @see \Drupal\Tests\BrowserTestBase::installDrupal()
+   * @see \Drupal\simpletest\WebTestBase::setUp()
+   */
+  protected function resetAll() {
+    // Clear all database and static caches and rebuild data structures.
+    drupal_flush_all_caches();
+    $this->container = \Drupal::getContainer();
+
+    // Reset static variables and reload permissions.
+    $this->refreshVariables();
+  }
+
+  /**
+   * Refreshes in-memory configuration and state information.
+   *
+   * Useful after a page request is made that changes configuration or state in
+   * a different thread.
+   *
+   * In other words calling a settings page with $this->drupalPostForm() with a
+   * changed value would update configuration to reflect that change, but in the
+   * thread that made the call (thread running the test) the changed values
+   * would not be picked up.
+   *
+   * This method clears the cache and loads a fresh copy.
+   */
+  protected function refreshVariables() {
+    // Clear the tag cache.
+    \Drupal::service('cache_tags.invalidator')->resetChecksums();
+    foreach (Cache::getBins() as $backend) {
+      if (is_callable([$backend, 'reset'])) {
+        $backend->reset();
+      }
+    }
+
+    $this->container->get('config.factory')->reset();
+    $this->container->get('state')->resetCache();
+  }
+
+  /**
+   * Creates a mock request and sets it on the generator.
+   *
+   * This is used to manipulate how the generator generates paths during tests.
+   * It also ensures that calls to $this->drupalGet() will work when running
+   * from run-tests.sh because the url generator no longer looks at the global
+   * variables that are set there but relies on getting this information from a
+   * request object.
+   *
+   * @param bool $clean_urls
+   *   Whether to mock the request using clean urls.
+   * @param array $override_server_vars
+   *   An array of server variables to override.
+   *
+   * @return \Symfony\Component\HttpFoundation\Request
+   *   The mocked request object.
+   */
+  protected function prepareRequestForGenerator($clean_urls = TRUE, $override_server_vars = []) {
+    $request = Request::createFromGlobals();
+    $server = $request->server->all();
+    if (basename($server['SCRIPT_FILENAME']) != basename($server['SCRIPT_NAME'])) {
+      // We need this for when the test is executed by run-tests.sh.
+      // @todo Remove this once run-tests.sh has been converted to use a Request
+      //   object.
+      $cwd = getcwd();
+      $server['SCRIPT_FILENAME'] = $cwd . '/' . basename($server['SCRIPT_NAME']);
+      $base_path = rtrim($server['REQUEST_URI'], '/');
+    }
+    else {
+      $base_path = $request->getBasePath();
+    }
+    if ($clean_urls) {
+      $request_path = $base_path ? $base_path . '/user' : 'user';
+    }
+    else {
+      $request_path = $base_path ? $base_path . '/index.php/user' : '/index.php/user';
+    }
+    $server = array_merge($server, $override_server_vars);
+
+    $request = Request::create($request_path, 'GET', [], [], [], $server);
+    // Ensure the request time is REQUEST_TIME to ensure that API calls
+    // in the test use the right timestamp.
+    $request->server->set('REQUEST_TIME', REQUEST_TIME);
+    $this->container->get('request_stack')->push($request);
+
+    // The request context is normally set by the router_listener from within
+    // its KernelEvents::REQUEST listener. In the simpletest parent site this
+    // event is not fired, therefore it is necessary to updated the request
+    // context manually here.
+    $this->container->get('router.request_context')->fromRequest($request);
+
+    return $request;
+  }
+
+  /**
+   * Execute the non-interactive installer.
+   *
+   * @see install_drupal()
+   */
+  protected function doInstall() {
+    require_once DRUPAL_ROOT . '/core/includes/install.core.inc';
+    install_drupal($this->classLoader, $this->installParameters());
+  }
+
+  /**
+   * Initialize settings created during install.
+   */
+  protected function initSettings() {
+    Settings::initialize(DRUPAL_ROOT, $this->siteDirectory, $this->classLoader);
+    foreach ($GLOBALS['config_directories'] as $type => $path) {
+      $this->configDirectories[$type] = $path;
+    }
+
+    // After writing settings.php, the installer removes write permissions
+    // from the site directory. To allow drupal_generate_test_ua() to write
+    // a file containing the private key for drupal_valid_test_ua(), the site
+    // directory has to be writable.
+    // TestBase::restoreEnvironment() will delete the entire site directory.
+    // Not using File API; a potential error must trigger a PHP warning.
+    chmod(DRUPAL_ROOT . '/' . $this->siteDirectory, 0777);
+
+    // During tests, cacheable responses should get the debugging cacheability
+    // headers by default.
+    $this->setContainerParameter('http.response.debug_cacheability_headers', TRUE);
+  }
+
+  /**
+   * Initialize various configurations post-installation.
+   *
+   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+   *   The container.
+   */
+  protected function initConfig(ContainerInterface $container) {
+    $config = $container->get('config.factory');
+
+    // Manually create the private directory.
+    file_prepare_directory($this->privateFilesDirectory, FILE_CREATE_DIRECTORY);
+
+    // Manually configure the test mail collector implementation to prevent
+    // tests from sending out emails and collect them in state instead.
+    // While this should be enforced via settings.php prior to installation,
+    // some tests expect to be able to test mail system implementations.
+    $config->getEditable('system.mail')
+      ->set('interface.default', 'test_mail_collector')
+      ->save();
+
+    // By default, verbosely display all errors and disable all production
+    // environment optimizations for all tests to avoid needless overhead and
+    // ensure a sane default experience for test authors.
+    // @see https://www.drupal.org/node/2259167
+    $config->getEditable('system.logging')
+      ->set('error_level', 'verbose')
+      ->save();
+    $config->getEditable('system.performance')
+      ->set('css.preprocess', FALSE)
+      ->set('js.preprocess', FALSE)
+      ->save();
+
+    // Set an explicit time zone to not rely on the system one, which may vary
+    // from setup to setup. The Australia/Sydney time zone is chosen so all
+    // tests are run using an edge case scenario (UTC10 and DST). This choice
+    // is made to prevent time zone related regressions and reduce the
+    // fragility of the testing system in general.
+    $config->getEditable('system.date')
+      ->set('timezone.default', 'Australia/Sydney')
+      ->save();
+  }
+
+  /**
+   * Initializes user 1 for the site to be installed.
+   */
+  protected function initUserSession() {
+    $password = $this->randomMachineName();
+    // Define information about the user 1 account.
+    $this->rootUser = new UserSession([
+      'uid' => 1,
+      'name' => 'admin',
+      'mail' => 'admin@example.com',
+      'pass_raw' => $password,
+      'passRaw' => $password,
+      'timezone' => date_default_timezone_get(),
+    ]);
+
+    // The child site derives its session name from the database prefix when
+    // running web tests.
+    $this->generateSessionName($this->databasePrefix);
+  }
+
+  /**
+   * Initializes the kernel after installation.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   Request object.
+   *
+   * @return \Symfony\Component\DependencyInjection\ContainerInterface
+   *   The container.
+   */
+  protected function initKernel(Request $request) {
+    $this->kernel = DrupalKernel::createFromRequest($request, $this->classLoader, 'prod', TRUE);
+    $this->kernel->prepareLegacyRequest($request);
+    // Force the container to be built from scratch instead of loaded from the
+    // disk. This forces us to not accidentally load the parent site.
+    return $this->kernel->rebuildContainer();
+  }
+
+  /**
+   * Install modules defined by `static::$modules`.
+   *
+   * To install test modules outside of the testing environment, add
+   * @code
+   * $settings['extension_discovery_scan_tests'] = TRUE;
+   * @endcode
+   * to your settings.php.
+   *
+   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+   *   The container.
+   */
+  protected function installModulesFromClassProperty(ContainerInterface $container) {
+    $class = get_class($this);
+    $modules = [];
+    while ($class) {
+      if (property_exists($class, 'modules')) {
+        $modules = array_merge($modules, $class::$modules);
+      }
+      $class = get_parent_class($class);
+    }
+    if ($modules) {
+      $modules = array_unique($modules);
+      try {
+        $success = $container->get('module_installer')->install($modules, TRUE);
+        $this->assertTrue($success, SafeMarkup::format('Enabled modules: %modules', ['%modules' => implode(', ', $modules)]));
+      }
+      catch (MissingDependencyException $e) {
+        // The exception message has all the details.
+        $this->fail($e->getMessage());
+      }
+
+      $this->rebuildContainer();
+    }
+  }
+
+  /**
+   * Resets and rebuilds the environment after setup.
+   */
+  protected function rebuildAll() {
+    // Reset/rebuild all data structures after enabling the modules, primarily
+    // to synchronize all data structures and caches between the test runner and
+    // the child site.
+    // @see \Drupal\Core\DrupalKernel::bootCode()
+    // @todo Test-specific setUp() methods may set up further fixtures; find a
+    //   way to execute this after setUp() is done, or to eliminate it entirely.
+    $this->resetAll();
+    $this->kernel->prepareLegacyRequest(\Drupal::request());
+
+    // Explicitly call register() again on the container registered in \Drupal.
+    // @todo This should already be called through
+    //   DrupalKernel::prepareLegacyRequest() -> DrupalKernel::boot() but that
+    //   appears to be calling a different container.
+    $this->container->get('stream_wrapper_manager')->register();
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Test/TestRunnerKernel.php b/web/core/lib/Drupal/Core/Test/TestRunnerKernel.php
index 6ab52b4c0..5be2b8366 100644
--- a/web/core/lib/Drupal/Core/Test/TestRunnerKernel.php
+++ b/web/core/lib/Drupal/Core/Test/TestRunnerKernel.php
@@ -33,14 +33,14 @@ class TestRunnerKernel extends DrupalKernel {
     //   \Drupal\Core\Datetime\DateFormatter has a (needless) dependency on the
     //   'date_format' entity, so calls to format_date()/format_interval() cause
     //   a plugin not found exception.
-    $this->moduleList = array(
+    $this->moduleList = [
       'system' => 0,
       'simpletest' => 0,
-    );
-    $this->moduleData = array(
+    ];
+    $this->moduleData = [
       'system' => new Extension($this->root, 'module', 'core/modules/system/system.info.yml', 'system.module'),
       'simpletest' => new Extension($this->root, 'module', 'core/modules/simpletest/simpletest.info.yml', 'simpletest.module'),
-    );
+    ];
   }
 
   /**
@@ -49,13 +49,13 @@ class TestRunnerKernel extends DrupalKernel {
   public function boot() {
     // Ensure that required Settings exist.
     if (!Settings::getAll()) {
-      new Settings(array(
+      new Settings([
         'hash_salt' => 'run-tests',
         'container_yamls' => [],
         // If there is no settings.php, then there is no parent site. In turn,
         // there is no public files directory; use a custom public files path.
         'file_public_path' => 'sites/default/files',
-      ));
+      ]);
     }
 
     // Remove Drupal's error/exception handlers; they are designed for HTML
@@ -70,7 +70,7 @@ class TestRunnerKernel extends DrupalKernel {
 
     $this->getContainer()->get('module_handler')->loadAll();
 
-    simpletest_classloader_register();
+    $this->getContainer()->get('test_discovery')->registerTestNamespaces();
 
     // Register stream wrappers.
     $this->getContainer()->get('stream_wrapper_manager')->register();
diff --git a/web/core/lib/Drupal/Core/Test/TestSetupTrait.php b/web/core/lib/Drupal/Core/Test/TestSetupTrait.php
new file mode 100644
index 000000000..ea9137e47
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Test/TestSetupTrait.php
@@ -0,0 +1,202 @@
+<?php
+
+namespace Drupal\Core\Test;
+
+use Drupal\Core\Database\Database;
+
+/**
+ * Provides a trait for shared test setup functionality.
+ */
+trait TestSetupTrait {
+
+  /**
+   * An array of config object names that are excluded from schema checking.
+   *
+   * @var string[]
+   */
+  protected static $configSchemaCheckerExclusions = [
+    // Following are used to test lack of or partial schema. Where partial
+    // schema is provided, that is explicitly tested in specific tests.
+    'config_schema_test.noschema',
+    'config_schema_test.someschema',
+    'config_schema_test.schema_data_types',
+    'config_schema_test.no_schema_data_types',
+    // Used to test application of schema to filtering of configuration.
+    'config_test.dynamic.system',
+  ];
+
+  /**
+   * The dependency injection container used in the test.
+   *
+   * @var \Symfony\Component\DependencyInjection\ContainerInterface
+   */
+  protected $container;
+
+  /**
+   * The site directory of this test run.
+   *
+   * @var string
+   */
+  protected $siteDirectory = NULL;
+
+  /**
+   * The public file directory for the test environment.
+   *
+   * @see \Drupal\simpletest\TestBase::prepareEnvironment()
+   * @see \Drupal\Tests\BrowserTestBase::prepareEnvironment()
+   *
+   * @var string
+   */
+  protected $publicFilesDirectory;
+
+  /**
+   * The site directory of the original parent site.
+   *
+   * @var string
+   */
+  protected $originalSite;
+
+  /**
+   * The private file directory for the test environment.
+   *
+   * @see \Drupal\simpletest\TestBase::prepareEnvironment()
+   * @see \Drupal\Tests\BrowserTestBase::prepareEnvironment()
+   *
+   * @var string
+   */
+  protected $privateFilesDirectory;
+
+  /**
+   * The original installation profile.
+   *
+   * @var string
+   */
+  protected $originalProfile;
+
+  /**
+   * Set to TRUE to strict check all configuration saved.
+   *
+   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   *
+   * @var bool
+   */
+  protected $strictConfigSchema = TRUE;
+
+  /**
+   * The DrupalKernel instance used in the test.
+   *
+   * @var \Drupal\Core\DrupalKernel
+   */
+  protected $kernel;
+
+  /**
+   * The temporary file directory for the test environment.
+   *
+   * This value has to match the temporary directory created in
+   * install_base_system() for test installs.
+   *
+   * @see \Drupal\simpletest\TestBase::prepareEnvironment()
+   * @see \Drupal\Tests\BrowserTestBase::prepareEnvironment()
+   * @see install_base_system()
+   *
+   * @var string
+   */
+  protected $tempFilesDirectory;
+
+  /**
+   * The test run ID.
+   *
+   * @var string
+   */
+  protected $testId;
+
+  /**
+   * Returns the database connection to the site running Simpletest.
+   *
+   * @return \Drupal\Core\Database\Connection
+   *   The database connection to use for inserting assertions.
+   */
+  public static function getDatabaseConnection() {
+    return TestDatabase::getConnection();
+  }
+
+  /**
+   * Generates a database prefix for running tests.
+   *
+   * The database prefix is used by prepareEnvironment() to setup a public files
+   * directory for the test to be run, which also contains the PHP error log,
+   * which is written to in case of a fatal error. Since that directory is based
+   * on the database prefix, all tests (even unit tests) need to have one, in
+   * order to access and read the error log.
+   *
+   * The generated database table prefix is used for the Drupal installation
+   * being performed for the test. It is also used as user agent HTTP header
+   * value by the cURL-based browser of WebTestBase, which is sent to the Drupal
+   * installation of the test. During early Drupal bootstrap, the user agent
+   * HTTP header is parsed, and if it matches, all database queries use the
+   * database table prefix that has been generated here.
+   *
+   * @see \Drupal\Tests\BrowserTestBase::prepareEnvironment()
+   * @see \Drupal\simpletest\WebTestBase::curlInitialize()
+   * @see \Drupal\simpletest\TestBase::prepareEnvironment()
+   * @see drupal_valid_test_ua()
+   */
+  private function prepareDatabasePrefix() {
+    $test_db = new TestDatabase();
+    $this->siteDirectory = $test_db->getTestSitePath();
+    $this->databasePrefix = $test_db->getDatabasePrefix();
+  }
+
+  /**
+   * Changes the database connection to the prefixed one.
+   */
+  private function changeDatabasePrefix() {
+    if (empty($this->databasePrefix)) {
+      $this->prepareDatabasePrefix();
+    }
+
+    // If the test is run with argument dburl then use it.
+    $db_url = getenv('SIMPLETEST_DB');
+    if (!empty($db_url)) {
+      $database = Database::convertDbUrlToConnectionInfo($db_url, DRUPAL_ROOT);
+      Database::addConnectionInfo('default', 'default', $database);
+    }
+
+    // Clone the current connection and replace the current prefix.
+    $connection_info = Database::getConnectionInfo('default');
+    if (is_null($connection_info)) {
+      throw new \InvalidArgumentException('There is no database connection so no tests can be run. You must provide a SIMPLETEST_DB environment variable to run PHPUnit based functional tests outside of run-tests.sh.');
+    }
+    else {
+      Database::renameConnection('default', 'simpletest_original_default');
+      foreach ($connection_info as $target => $value) {
+        // Replace the full table prefix definition to ensure that no table
+        // prefixes of the test runner leak into the test.
+        $connection_info[$target]['prefix'] = [
+          'default' => $value['prefix']['default'] . $this->databasePrefix,
+        ];
+      }
+      Database::addConnectionInfo('default', 'default', $connection_info['default']);
+    }
+  }
+
+  /**
+   * Gets the config schema exclusions for this test.
+   *
+   * @return string[]
+   *   An array of config object names that are excluded from schema checking.
+   */
+  protected function getConfigSchemaExclusions() {
+    $class = get_class($this);
+    $exceptions = [];
+    while ($class) {
+      if (property_exists($class, 'configSchemaCheckerExclusions')) {
+        $exceptions = array_merge($exceptions, $class::$configSchemaCheckerExclusions);
+      }
+      $class = get_parent_class($class);
+    }
+    // Filter out any duplicates.
+    return array_unique($exceptions);
+  }
+
+}
diff --git a/web/core/lib/Drupal/Core/Theme/Registry.php b/web/core/lib/Drupal/Core/Theme/Registry.php
index d3f04555d..a0af70261 100644
--- a/web/core/lib/Drupal/Core/Theme/Registry.php
+++ b/web/core/lib/Drupal/Core/Theme/Registry.php
@@ -140,6 +140,13 @@ class Registry implements DestructableInterface {
    */
   protected $themeManager;
 
+  /**
+   * The runtime cache.
+   *
+   * @var \Drupal\Core\Cache\CacheBackendInterface
+   */
+  protected $runtimeCache;
+
   /**
    * Constructs a \Drupal\Core\Theme\Registry object.
    *
@@ -157,8 +164,10 @@ class Registry implements DestructableInterface {
    *   The theme initialization.
    * @param string $theme_name
    *   (optional) The name of the theme for which to construct the registry.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $runtime_cache
+   *   The cache backend interface to use for the runtime theme registry data.
    */
-  public function __construct($root, CacheBackendInterface $cache, LockBackendInterface $lock, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, ThemeInitializationInterface $theme_initialization, $theme_name = NULL) {
+  public function __construct($root, CacheBackendInterface $cache, LockBackendInterface $lock, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, ThemeInitializationInterface $theme_initialization, $theme_name = NULL, CacheBackendInterface $runtime_cache = NULL) {
     $this->root = $root;
     $this->cache = $cache;
     $this->lock = $lock;
@@ -166,6 +175,7 @@ class Registry implements DestructableInterface {
     $this->themeName = $theme_name;
     $this->themeHandler = $theme_handler;
     $this->themeInitialization = $theme_initialization;
+    $this->runtimeCache = $runtime_cache;
   }
 
   /**
@@ -239,7 +249,7 @@ class Registry implements DestructableInterface {
   public function getRuntime() {
     $this->init($this->themeName);
     if (!isset($this->runtimeRegistry[$this->theme->getName()])) {
-      $this->runtimeRegistry[$this->theme->getName()] = new ThemeRegistry('theme_registry:runtime:' . $this->theme->getName(), $this->cache, $this->lock, array('theme_registry'), $this->moduleHandler->isLoaded());
+      $this->runtimeRegistry[$this->theme->getName()] = new ThemeRegistry('theme_registry:runtime:' . $this->theme->getName(), $this->runtimeCache ?: $this->cache, $this->lock, ['theme_registry'], $this->moduleHandler->isLoaded());
     }
     return $this->runtimeRegistry[$this->theme->getName()];
   }
@@ -248,7 +258,7 @@ class Registry implements DestructableInterface {
    * Persists the theme registry in the cache backend.
    */
   protected function setCache() {
-    $this->cache->set('theme_registry:' . $this->theme->getName(), $this->registry[$this->theme->getName()], Cache::PERMANENT, array('theme_registry'));
+    $this->cache->set('theme_registry:' . $this->theme->getName(), $this->registry[$this->theme->getName()], Cache::PERMANENT, ['theme_registry']);
   }
 
   /**
@@ -310,7 +320,7 @@ class Registry implements DestructableInterface {
    * @see hook_theme_registry_alter()
    */
   protected function build() {
-    $cache = array();
+    $cache = [];
     // First, preprocess the theme hooks advertised by modules. This will
     // serve as the basic registry. Since the list of enabled modules is the
     // same regardless of the theme used, this is cached in its own entry to
@@ -324,7 +334,7 @@ class Registry implements DestructableInterface {
       }
       // Only cache this registry if all modules are loaded.
       if ($this->moduleHandler->isLoaded()) {
-        $this->cache->set("theme_registry:build:modules", $cache, Cache::PERMANENT, array('theme_registry'));
+        $this->cache->set("theme_registry:build:modules", $cache, Cache::PERMANENT, ['theme_registry']);
       }
     }
 
@@ -418,14 +428,14 @@ class Registry implements DestructableInterface {
    * @throws \BadFunctionCallException
    */
   protected function processExtension(array &$cache, $name, $type, $theme, $path) {
-    $result = array();
+    $result = [];
 
-    $hook_defaults = array(
+    $hook_defaults = [
       'variables' => TRUE,
       'render element' => TRUE,
       'pattern' => TRUE,
       'base hook' => TRUE,
-    );
+    ];
 
     $module_list = array_keys($this->moduleHandler->getModuleList());
 
@@ -509,8 +519,8 @@ class Registry implements DestructableInterface {
         // Preprocess variables for all theming hooks, whether the hook is
         // implemented as a template or as a function. Ensure they are arrays.
         if (!isset($info['preprocess functions']) || !is_array($info['preprocess functions'])) {
-          $info['preprocess functions'] = array();
-          $prefixes = array();
+          $info['preprocess functions'] = [];
+          $prefixes = [];
           if ($type == 'module') {
             // Default variable preprocessor prefix.
             $prefixes[] = 'template';
@@ -568,7 +578,7 @@ class Registry implements DestructableInterface {
         // Check only if not registered by the theme or engine.
         if (empty($result[$hook])) {
           if (!isset($info['preprocess functions'])) {
-            $cache[$hook]['preprocess functions'] = array();
+            $cache[$hook]['preprocess functions'] = [];
           }
           // Only use non-hook-specific variable preprocessors for theme hooks
           // implemented as templates. See the @defgroup themeable topic.
@@ -595,28 +605,57 @@ class Registry implements DestructableInterface {
    */
   protected function completeSuggestion($hook, array &$cache) {
     $previous_hook = $hook;
-    $incomplete_previous_hook = array();
+    $incomplete_previous_hook = [];
+    // Continue looping if the candidate hook doesn't exist or if the candidate
+    // hook has incomplete preprocess functions, and if the candidate hook is a
+    // suggestion (has a double underscore).
     while ((!isset($cache[$previous_hook]) || isset($cache[$previous_hook]['incomplete preprocess functions']))
       && $pos = strrpos($previous_hook, '__')) {
+      // Find the first existing candidate hook that has incomplete preprocess
+      // functions.
       if (isset($cache[$previous_hook]) && !$incomplete_previous_hook && isset($cache[$previous_hook]['incomplete preprocess functions'])) {
         $incomplete_previous_hook = $cache[$previous_hook];
         unset($incomplete_previous_hook['incomplete preprocess functions']);
       }
       $previous_hook = substr($previous_hook, 0, $pos);
+      $this->mergePreprocessFunctions($hook, $previous_hook, $incomplete_previous_hook, $cache);
+    }
 
-      // If base hook exists clone of it for the preprocess function
-      // without a template.
-      // @see https://www.drupal.org/node/2457295
-      if (isset($cache[$previous_hook]) && !isset($cache[$previous_hook]['incomplete preprocess functions'])) {
-        $cache[$hook] = $incomplete_previous_hook + $cache[$previous_hook];
-        if (isset($incomplete_previous_hook['preprocess functions'])) {
-          $diff = array_diff($incomplete_previous_hook['preprocess functions'], $cache[$previous_hook]['preprocess functions']);
-          $cache[$hook]['preprocess functions'] = array_merge($cache[$previous_hook]['preprocess functions'], $diff);
-        }
-        // If a base hook isn't set, this is the actual base hook.
-        if (!isset($cache[$previous_hook]['base hook'])) {
-          $cache[$hook]['base hook'] = $previous_hook;
-        }
+    // In addition to processing suggestions, include base hooks.
+    if (isset($cache[$hook]['base hook'])) {
+      // In order to retain the additions from above, pass in the current hook
+      // as the parent hook, otherwise it will be overwritten.
+      $this->mergePreprocessFunctions($hook, $cache[$hook]['base hook'], $cache[$hook], $cache);
+    }
+  }
+
+  /**
+   * Merges the source hook's preprocess functions into the destination hook's.
+   *
+   * @param string $destination_hook_name
+   *   The name of the hook to merge preprocess functions to.
+   * @param string $source_hook_name
+   *   The name of the hook to merge preprocess functions from.
+   * @param array $parent_hook
+   *   The parent hook if it exists. Either an incomplete hook from suggestions
+   *   or a base hook.
+   * @param array $cache
+   *   The theme registry, as documented in
+   *   \Drupal\Core\Theme\Registry::processExtension().
+   */
+  protected function mergePreprocessFunctions($destination_hook_name, $source_hook_name, $parent_hook, array &$cache) {
+    // If base hook exists clone of it for the preprocess function
+    // without a template.
+    // @see https://www.drupal.org/node/2457295
+    if (isset($cache[$source_hook_name]) && (!isset($cache[$source_hook_name]['incomplete preprocess functions']) || !isset($cache[$destination_hook_name]['incomplete preprocess functions']))) {
+      $cache[$destination_hook_name] = $parent_hook + $cache[$source_hook_name];
+      if (isset($parent_hook['preprocess functions'])) {
+        $diff = array_diff($parent_hook['preprocess functions'], $cache[$source_hook_name]['preprocess functions']);
+        $cache[$destination_hook_name]['preprocess functions'] = array_merge($cache[$source_hook_name]['preprocess functions'], $diff);
+      }
+      // If a base hook isn't set, this is the actual base hook.
+      if (!isset($cache[$source_hook_name]['base hook'])) {
+        $cache[$destination_hook_name]['base hook'] = $source_hook_name;
       }
     }
   }
@@ -633,8 +672,6 @@ class Registry implements DestructableInterface {
    * @see ::processExtension()
    */
   protected function postProcessExtension(array &$cache, ActiveTheme $theme) {
-    $grouped_functions = $this->getPrefixGroupedUserFunctions();
-
     // Gather prefixes. This will be used to limit the found functions to the
     // expected naming conventions.
     $prefixes = array_keys((array) $this->moduleHandler->getModuleList());
@@ -646,6 +683,8 @@ class Registry implements DestructableInterface {
     }
     $prefixes[] = $theme->getName();
 
+    $grouped_functions = $this->getPrefixGroupedUserFunctions($prefixes);
+
     // Collect all variable preprocess functions in the correct order.
     $suggestion_level = [];
     $matches = [];
@@ -728,7 +767,7 @@ class Registry implements DestructableInterface {
     $this->runtimeRegistry = [];
 
     $this->registry = [];
-    Cache::invalidateTags(array('theme_registry'));
+    Cache::invalidateTags(['theme_registry']);
     return $this;
   }
 
@@ -744,15 +783,26 @@ class Registry implements DestructableInterface {
   /**
    * Gets all user functions grouped by the word before the first underscore.
    *
+   * @param $prefixes
+   *   An array of function prefixes by which the list can be limited.
    * @return array
    *   Functions grouped by the first prefix.
    */
-  public function getPrefixGroupedUserFunctions() {
+  public function getPrefixGroupedUserFunctions($prefixes = []) {
     $functions = get_defined_functions();
 
+    // If a list of prefixes is supplied, trim down the list to those items
+    // only as efficiently as possible.
+    if ($prefixes) {
+      $theme_functions = preg_grep('/^(' . implode(')|(', $prefixes) . ')_/', $functions['user']);
+    }
+    else {
+      $theme_functions = $functions['user'];
+    }
+
     $grouped_functions = [];
     // Splitting user defined functions into groups by the first prefix.
-    foreach ($functions['user'] as $function) {
+    foreach ($theme_functions as $function) {
       list($first_prefix,) = explode('_', $function, 2);
       $grouped_functions[$first_prefix][] = $function;
     }
diff --git a/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php b/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
index bf585844b..95ce5f3e9 100644
--- a/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
+++ b/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
@@ -100,7 +100,7 @@ class ThemeInitialization implements ThemeInitializationInterface {
     }
 
     // Find all our ancestor themes and put them in an array.
-    $base_themes = array();
+    $base_themes = [];
     $ancestor = $theme_name;
     while ($ancestor && isset($themes[$ancestor]->base_theme)) {
       $ancestor = $themes[$ancestor]->base_theme;
@@ -220,7 +220,7 @@ class ThemeInitialization implements ThemeInitializationInterface {
     }
 
     // Do basically the same as the above for libraries
-    $values['libraries'] = array();
+    $values['libraries'] = [];
 
     // Grab libraries from base theme
     foreach ($base_themes as $base) {
@@ -242,7 +242,7 @@ class ThemeInitialization implements ThemeInitializationInterface {
     $values['owner'] = isset($theme->owner) ? $theme->owner : NULL;
     $values['extension'] = $theme;
 
-    $base_active_themes = array();
+    $base_active_themes = [];
     foreach ($base_themes as $base_theme) {
       $base_active_themes[$base_theme->getName()] = $this->getActiveTheme($base_theme, array_slice($base_themes, 1));
     }
@@ -310,7 +310,7 @@ class ThemeInitialization implements ThemeInitializationInterface {
     // Prepare stylesheets from this theme as well as all ancestor themes.
     // We work it this way so that we can have child themes remove CSS files
     // easily from parent.
-    $stylesheets_remove = array();
+    $stylesheets_remove = [];
     // Grab stylesheets from base theme.
     foreach ($base_themes as $base) {
       if (!empty($base->info['stylesheets-remove'])) {
diff --git a/web/core/lib/Drupal/Core/Theme/ThemeManager.php b/web/core/lib/Drupal/Core/Theme/ThemeManager.php
index ed18039f7..c58d176d4 100644
--- a/web/core/lib/Drupal/Core/Theme/ThemeManager.php
+++ b/web/core/lib/Drupal/Core/Theme/ThemeManager.php
@@ -171,7 +171,7 @@ class ThemeManager implements ThemeManagerInterface {
         // Only log a message when not trying theme suggestions ($hook being an
         // array).
         if (!isset($candidate)) {
-          \Drupal::logger('theme')->warning('Theme hook %hook not found.', array('%hook' => $hook));
+          \Drupal::logger('theme')->warning('Theme hook %hook not found.', ['%hook' => $hook]);
         }
         // There is no theme implementation for the hook passed. Return FALSE so
         // the function calling
@@ -188,7 +188,7 @@ class ThemeManager implements ThemeManagerInterface {
     // the arguments expected by the theme function.
     if (isset($variables['#theme']) || isset($variables['#theme_wrappers'])) {
       $element = $variables;
-      $variables = array();
+      $variables = [];
       if (isset($info['variables'])) {
         foreach (array_keys($info['variables']) as $name) {
           if (isset($element["#$name"]) || array_key_exists("#$name", $element)) {
@@ -208,12 +208,12 @@ class ThemeManager implements ThemeManagerInterface {
       $variables += $info['variables'];
     }
     elseif (!empty($info['render element'])) {
-      $variables += array($info['render element'] => array());
+      $variables += [$info['render element'] => []];
     }
     // Supply original caller info.
-    $variables += array(
+    $variables += [
       'theme_hook_original' => $original_hook,
-    );
+    ];
 
     // Set base hook for later use. For example if '#theme' => 'node__article'
     // is called, we run hook_theme_suggestions_node_alter() rather than
@@ -227,7 +227,7 @@ class ThemeManager implements ThemeManagerInterface {
     }
 
     // Invoke hook_theme_suggestions_HOOK().
-    $suggestions = $this->moduleHandler->invokeAll('theme_suggestions_' . $base_theme_hook, array($variables));
+    $suggestions = $this->moduleHandler->invokeAll('theme_suggestions_' . $base_theme_hook, [$variables]);
     // If the theme implementation was invoked with a direct theme suggestion
     // like '#theme' => 'node__article', add it to the suggestions array before
     // invoking suggestion alter hooks.
@@ -237,10 +237,10 @@ class ThemeManager implements ThemeManagerInterface {
 
     // Invoke hook_theme_suggestions_alter() and
     // hook_theme_suggestions_HOOK_alter().
-    $hooks = array(
+    $hooks = [
       'theme_suggestions',
       'theme_suggestions_' . $base_theme_hook,
-    );
+    ];
     $this->moduleHandler->alter($hooks, $suggestions, $variables, $base_theme_hook);
     $this->alter($hooks, $suggestions, $variables, $base_theme_hook);
 
@@ -347,14 +347,14 @@ class ThemeManager implements ThemeManagerInterface {
       // intuitive, is reasonably safe, and allows us to save on the overhead of
       // adding some new variable to track that.
       if (!isset($variables['directory'])) {
-        $default_template_variables = array();
+        $default_template_variables = [];
         template_preprocess($default_template_variables, $hook, $info);
         $variables += $default_template_variables;
       }
       if (!isset($default_attributes)) {
         $default_attributes = new Attribute();
       }
-      foreach (array('attributes', 'title_attributes', 'content_attributes') as $key) {
+      foreach (['attributes', 'title_attributes', 'content_attributes'] as $key) {
         if (isset($variables[$key]) && !($variables[$key] instanceof Attribute)) {
           if ($variables[$key]) {
             $variables[$key] = new Attribute($variables[$key]);
@@ -427,13 +427,13 @@ class ThemeManager implements ThemeManagerInterface {
       }
     }
 
-    $theme_keys = array();
+    $theme_keys = [];
     foreach ($theme->getBaseThemes() as $base) {
       $theme_keys[] = $base->getName();
     }
 
     $theme_keys[] = $theme->getName();
-    $functions = array();
+    $functions = [];
     foreach ($theme_keys as $theme_key) {
       $function = $theme_key . '_' . $type . '_alter';
       if (function_exists($function)) {
diff --git a/web/core/lib/Drupal/Core/Theme/ThemeNegotiator.php b/web/core/lib/Drupal/Core/Theme/ThemeNegotiator.php
index 3064eb073..c932e89d5 100644
--- a/web/core/lib/Drupal/Core/Theme/ThemeNegotiator.php
+++ b/web/core/lib/Drupal/Core/Theme/ThemeNegotiator.php
@@ -17,7 +17,7 @@ class ThemeNegotiator implements ThemeNegotiatorInterface {
    *
    * @var array
    */
-  protected $negotiators = array();
+  protected $negotiators = [];
 
   /**
    * Holds the array of theme negotiators sorted by priority.
@@ -71,7 +71,7 @@ class ThemeNegotiator implements ThemeNegotiatorInterface {
       krsort($this->negotiators);
       // Merge nested negotiators from $this->negotiators into
       // $this->sortedNegotiators.
-      $this->sortedNegotiators = array();
+      $this->sortedNegotiators = [];
       foreach ($this->negotiators as $builders) {
         $this->sortedNegotiators = array_merge($this->sortedNegotiators, $builders);
       }
diff --git a/web/core/lib/Drupal/Core/Transliteration/PhpTransliteration.php b/web/core/lib/Drupal/Core/Transliteration/PhpTransliteration.php
index dd4e3c2eb..8fbffc90e 100644
--- a/web/core/lib/Drupal/Core/Transliteration/PhpTransliteration.php
+++ b/web/core/lib/Drupal/Core/Transliteration/PhpTransliteration.php
@@ -24,13 +24,12 @@ class PhpTransliteration extends BaseTransliteration {
    * Constructs a PhpTransliteration object.
    *
    * @param string $data_directory
-   *   (optional) The directory where data files reside. If omitted, defaults
-   *   to subdirectory 'data' underneath the directory where the class's PHP
-   *   file resides.
+   *   The directory where data files reside. If NULL, defaults to subdirectory
+   *   'data' underneath the directory where the class's PHP file resides.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler to execute the transliteration_overrides alter hook.
    */
-  public function __construct($data_directory = NULL, ModuleHandlerInterface $module_handler) {
+  public function __construct($data_directory, ModuleHandlerInterface $module_handler) {
     parent::__construct($data_directory);
 
     $this->moduleHandler = $module_handler;
diff --git a/web/core/lib/Drupal/Core/TypedData/DataDefinition.php b/web/core/lib/Drupal/Core/TypedData/DataDefinition.php
index d0878ede4..7eec1a90c 100644
--- a/web/core/lib/Drupal/Core/TypedData/DataDefinition.php
+++ b/web/core/lib/Drupal/Core/TypedData/DataDefinition.php
@@ -12,7 +12,7 @@ class DataDefinition implements DataDefinitionInterface, \ArrayAccess {
    *
    * @var array
    */
-  protected $definition = array();
+  protected $definition = [];
 
   /**
    * Creates a new data definition.
@@ -41,7 +41,7 @@ class DataDefinition implements DataDefinitionInterface, \ArrayAccess {
    * @param array $values
    *   (optional) If given, an array of initial values to set on the definition.
    */
-  public function __construct(array $values = array()) {
+  public function __construct(array $values = []) {
     $this->definition = $values;
   }
 
@@ -213,7 +213,7 @@ class DataDefinition implements DataDefinitionInterface, \ArrayAccess {
    * {@inheritdoc}
    */
   public function getSettings() {
-    return isset($this->definition['settings']) ? $this->definition['settings'] : array();
+    return isset($this->definition['settings']) ? $this->definition['settings'] : [];
   }
 
   /**
@@ -257,7 +257,7 @@ class DataDefinition implements DataDefinitionInterface, \ArrayAccess {
    * {@inheritdoc}
    */
   public function getConstraints() {
-    $constraints = isset($this->definition['constraints']) ? $this->definition['constraints'] : array();
+    $constraints = isset($this->definition['constraints']) ? $this->definition['constraints'] : [];
     $constraints += \Drupal::typedDataManager()->getDefaultConstraints($this);
     return $constraints;
   }
diff --git a/web/core/lib/Drupal/Core/TypedData/ListDataDefinition.php b/web/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
index 302f501be..3109cd211 100644
--- a/web/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
+++ b/web/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
@@ -41,13 +41,13 @@ class ListDataDefinition extends DataDefinition implements ListDataDefinitionInt
    * {@inheritdoc}
    */
   public static function createFromItemType($item_type) {
-    return new static(array(), \Drupal::typedDataManager()->createDataDefinition($item_type));
+    return new static([], \Drupal::typedDataManager()->createDataDefinition($item_type));
   }
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $values = array(), DataDefinitionInterface $item_definition = NULL) {
+  public function __construct(array $values = [], DataDefinitionInterface $item_definition = NULL) {
     $this->definition = $values;
     $this->itemDefinition = $item_definition;
   }
diff --git a/web/core/lib/Drupal/Core/TypedData/MapDataDefinition.php b/web/core/lib/Drupal/Core/TypedData/MapDataDefinition.php
index 067a0f413..203e4a367 100644
--- a/web/core/lib/Drupal/Core/TypedData/MapDataDefinition.php
+++ b/web/core/lib/Drupal/Core/TypedData/MapDataDefinition.php
@@ -39,7 +39,7 @@ class MapDataDefinition extends ComplexDataDefinitionBase {
    */
   public function getPropertyDefinitions() {
     if (!isset($this->propertyDefinitions)) {
-      $this->propertyDefinitions = array();
+      $this->propertyDefinitions = [];
     }
     return $this->propertyDefinitions;
   }
diff --git a/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/ItemList.php b/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/ItemList.php
index 773342723..4f756dadf 100644
--- a/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/ItemList.php
+++ b/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/ItemList.php
@@ -30,13 +30,13 @@ class ItemList extends TypedData implements \IteratorAggregate, ListInterface {
    *
    * @var \Drupal\Core\TypedData\TypedDataInterface[]
    */
-  protected $list = array();
+  protected $list = [];
 
   /**
    * {@inheritdoc}
    */
   public function getValue() {
-    $values = array();
+    $values = [];
     foreach ($this->list as $delta => $item) {
       $values[$delta] = $item->getValue();
     }
@@ -50,8 +50,8 @@ class ItemList extends TypedData implements \IteratorAggregate, ListInterface {
    *   An array of values of the field items, or NULL to unset the field.
    */
   public function setValue($values, $notify = TRUE) {
-    if (!isset($values) || $values === array()) {
-      $this->list = array();
+    if (!isset($values) || $values === []) {
+      $this->list = [];
     }
     else {
       // Only arrays with numeric keys are supported.
@@ -82,7 +82,7 @@ class ItemList extends TypedData implements \IteratorAggregate, ListInterface {
    * {@inheritdoc}
    */
   public function getString() {
-    $strings = array();
+    $strings = [];
     foreach ($this->list as $item) {
       $strings[] = $item->getString();
     }
diff --git a/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php b/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php
index 3af3a6b30..a95c14b30 100644
--- a/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php
+++ b/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php
@@ -38,14 +38,14 @@ class Map extends TypedData implements \IteratorAggregate, ComplexDataInterface
    *
    * @var array
    */
-  protected $values = array();
+  protected $values = [];
 
   /**
    * The array of properties.
    *
    * @var \Drupal\Core\TypedData\TypedDataInterface[]
    */
-  protected $properties = array();
+  protected $properties = [];
 
   /**
    * {@inheritdoc}
@@ -95,7 +95,7 @@ class Map extends TypedData implements \IteratorAggregate, ComplexDataInterface
    * {@inheritdoc}
    */
   public function getString() {
-    $strings = array();
+    $strings = [];
     foreach ($this->getProperties() as $property) {
       $strings[] = $property->getString();
     }
@@ -154,7 +154,7 @@ class Map extends TypedData implements \IteratorAggregate, ComplexDataInterface
    * {@inheritdoc}
    */
   public function getProperties($include_computed = FALSE) {
-    $properties = array();
+    $properties = [];
     foreach ($this->definition->getPropertyDefinitions() as $name => $definition) {
       if ($include_computed || !$definition->isComputed()) {
         $properties[$name] = $this->get($name);
@@ -167,7 +167,7 @@ class Map extends TypedData implements \IteratorAggregate, ComplexDataInterface
    * {@inheritdoc}
    */
   public function toArray() {
-    $values = array();
+    $values = [];
     foreach ($this->getProperties() as $name => $property) {
       $values[$name] = $property->getValue();
     }
diff --git a/web/core/lib/Drupal/Core/TypedData/TranslatableInterface.php b/web/core/lib/Drupal/Core/TypedData/TranslatableInterface.php
index 5100e6e63..5b57a8717 100644
--- a/web/core/lib/Drupal/Core/TypedData/TranslatableInterface.php
+++ b/web/core/lib/Drupal/Core/TypedData/TranslatableInterface.php
@@ -95,7 +95,7 @@ interface TranslatableInterface {
    * @throws \InvalidArgumentException
    *   If an invalid or existing translation language is specified.
    */
-  public function addTranslation($langcode, array $values = array());
+  public function addTranslation($langcode, array $values = []);
 
   /**
    * Removes the translation identified by the given language code.
diff --git a/web/core/lib/Drupal/Core/TypedData/TranslationStatusInterface.php b/web/core/lib/Drupal/Core/TypedData/TranslationStatusInterface.php
new file mode 100644
index 000000000..520b0fcf8
--- /dev/null
+++ b/web/core/lib/Drupal/Core/TypedData/TranslationStatusInterface.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Drupal\Core\TypedData;
+
+/**
+ * Defines an interface for checking the status of an entity translation.
+ */
+interface TranslationStatusInterface {
+
+  /**
+   * Status code identifying a removed translation.
+   */
+  const TRANSLATION_REMOVED = 0;
+
+  /**
+   * Status code identifying an existing translation.
+   */
+  const TRANSLATION_EXISTING = 1;
+
+  /**
+   * Status code identifying a newly created translation.
+   */
+  const TRANSLATION_CREATED = 2;
+
+  /**
+   * Returns the translation status.
+   *
+   * @param string $langcode
+   *   The language code identifying the translation.
+   *
+   * @return int|null
+   *   One of the TRANSLATION_* constants or NULL if the given translation does
+   *   not exist.
+   */
+  public function getTranslationStatus($langcode);
+
+}
diff --git a/web/core/lib/Drupal/Core/TypedData/TypedData.php b/web/core/lib/Drupal/Core/TypedData/TypedData.php
index 809d0e63b..243d48a92 100644
--- a/web/core/lib/Drupal/Core/TypedData/TypedData.php
+++ b/web/core/lib/Drupal/Core/TypedData/TypedData.php
@@ -121,7 +121,7 @@ abstract class TypedData implements TypedDataInterface, PluginInspectionInterfac
    */
   public function getConstraints() {
     $constraint_manager = $this->getTypedDataManager()->getValidationConstraintManager();
-    $constraints = array();
+    $constraints = [];
     foreach ($this->definition->getConstraints() as $name => $options) {
       $constraints[] = $constraint_manager->create($name, $options);
     }
diff --git a/web/core/lib/Drupal/Core/TypedData/TypedDataManager.php b/web/core/lib/Drupal/Core/TypedData/TypedDataManager.php
index 490415015..8c4f265eb 100644
--- a/web/core/lib/Drupal/Core/TypedData/TypedDataManager.php
+++ b/web/core/lib/Drupal/Core/TypedData/TypedDataManager.php
@@ -40,7 +40,7 @@ class TypedDataManager extends DefaultPluginManager implements TypedDataManagerI
    *
    * @var array
    */
-  protected $prototypes = array();
+  protected $prototypes = [];
 
   /**
    * The class resolver.
@@ -73,7 +73,7 @@ class TypedDataManager extends DefaultPluginManager implements TypedDataManagerI
   /**
    * {@inheritdoc}
    */
-  public function createInstance($data_type, array $configuration = array()) {
+  public function createInstance($data_type, array $configuration = []) {
     $data_definition = $configuration['data_definition'];
     $type_definition = $this->getDefinition($data_type);
 
@@ -97,11 +97,11 @@ class TypedDataManager extends DefaultPluginManager implements TypedDataManagerI
    * {@inheritdoc}
    */
   public function create(DataDefinitionInterface $definition, $value = NULL, $name = NULL, $parent = NULL) {
-    $typed_data = $this->createInstance($definition->getDataType(), array(
+    $typed_data = $this->createInstance($definition->getDataType(), [
       'data_definition' => $definition,
       'name' => $name,
       'parent' => $parent,
-    ));
+    ]);
     if (isset($value)) {
       $typed_data->setValue($value, FALSE);
     }
@@ -158,9 +158,9 @@ class TypedDataManager extends DefaultPluginManager implements TypedDataManagerI
     // Root data type and settings.
     $parts[] = $root_definition->getDataType();
     if ($settings = $root_definition->getSettings()) {
-      // Hash the settings into a string. crc32 is the fastest way to hash
-      // something for non-cryptographic purposes.
-      $parts[] = hash('crc32b', serialize($settings));
+      // Include the settings serialized as JSON as part of the key. The JSON is
+      // a shorter string than the serialized form, so array access is faster.
+      $parts[] = json_encode($settings);
     }
     // Property path for the requested data object. When creating a list item,
     // use 0 in the key as all items look the same.
@@ -239,12 +239,12 @@ class TypedDataManager extends DefaultPluginManager implements TypedDataManagerI
    * {@inheritdoc}
    */
   public function getDefaultConstraints(DataDefinitionInterface $definition) {
-    $constraints = array();
+    $constraints = [];
     $type_definition = $this->getDefinition($definition->getDataType());
     // Auto-generate a constraint for data types implementing a primitive
     // interface.
     if (is_subclass_of($type_definition['class'], '\Drupal\Core\TypedData\PrimitiveInterface')) {
-      $constraints['PrimitiveType'] = array();
+      $constraints['PrimitiveType'] = [];
     }
     // Add in constraints specified by the data type.
     if (isset($type_definition['constraints'])) {
@@ -252,11 +252,11 @@ class TypedDataManager extends DefaultPluginManager implements TypedDataManagerI
     }
     // Add the NotNull constraint for required data.
     if ($definition->isRequired()) {
-      $constraints['NotNull'] = array();
+      $constraints['NotNull'] = [];
     }
     // Check if the class provides allowed values.
     if (is_subclass_of($definition->getClass(), 'Drupal\Core\TypedData\OptionsProviderInterface')) {
-      $constraints['AllowedValues'] = array();
+      $constraints['AllowedValues'] = [];
     }
     return $constraints;
   }
@@ -266,7 +266,7 @@ class TypedDataManager extends DefaultPluginManager implements TypedDataManagerI
    */
   public function clearCachedDefinitions() {
     parent::clearCachedDefinitions();
-    $this->prototypes = array();
+    $this->prototypes = [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/TypedData/TypedDataManagerInterface.php b/web/core/lib/Drupal/Core/TypedData/TypedDataManagerInterface.php
index 20a4a76af..29723c6fc 100644
--- a/web/core/lib/Drupal/Core/TypedData/TypedDataManagerInterface.php
+++ b/web/core/lib/Drupal/Core/TypedData/TypedDataManagerInterface.php
@@ -34,7 +34,7 @@ interface TypedDataManagerInterface extends PluginManagerInterface, CachedDiscov
    *
    * @see \Drupal\Core\TypedData\TypedDataManager::create()
    */
-  public function createInstance($data_type, array $configuration = array());
+  public function createInstance($data_type, array $configuration = []);
 
   /**
    * Creates a new typed data object instance.
diff --git a/web/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php b/web/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php
index a20fa527a..c72cd55d4 100644
--- a/web/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php
+++ b/web/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php
@@ -96,14 +96,14 @@ class ExecutionContext implements ExecutionContextInterface {
    *
    * @var array
    */
-  protected $validatedObjects = array();
+  protected $validatedObjects = [];
 
   /**
    * Stores which class constraint has been validated for which object.
    *
    * @var array
    */
-  protected $validatedConstraints = array();
+  protected $validatedConstraints = [];
 
   /**
    * Creates a new ExecutionContext.
@@ -155,7 +155,7 @@ class ExecutionContext implements ExecutionContextInterface {
   /**
    * {@inheritdoc}
    */
-  public function addViolation($message, array $parameters = array(), $invalidValue = NULL, $plural = NULL, $code = NULL) {
+  public function addViolation($message, array $parameters = [], $invalidValue = NULL, $plural = NULL, $code = NULL) {
     // The parameters $invalidValue and following are ignored by the new
     // API, as they are not present in the new interface anymore.
     // You should use buildViolation() instead.
@@ -169,7 +169,7 @@ class ExecutionContext implements ExecutionContextInterface {
   /**
    * {@inheritdoc}
    */
-  public function buildViolation($message, array $parameters = array()) {
+  public function buildViolation($message, array $parameters = []) {
     return new ConstraintViolationBuilder($this->violations, $this->constraint, $message, $parameters, $this->root, $this->propertyPath, $this->value, $this->translator, $this->translationDomain);
   }
 
@@ -246,7 +246,7 @@ class ExecutionContext implements ExecutionContextInterface {
   /**
    * {@inheritdoc}
    */
-  public function addViolationAt($subPath, $message, array $parameters = array(), $invalidValue = NULL, $plural = NULL, $code = NULL) {
+  public function addViolationAt($subPath, $message, array $parameters = [], $invalidValue = NULL, $plural = NULL, $code = NULL) {
     throw new \LogicException('Legacy validator API is unsupported.');
   }
 
diff --git a/web/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php b/web/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php
index b765b051e..a5d453ae5 100644
--- a/web/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php
+++ b/web/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php
@@ -93,7 +93,7 @@ class RecursiveContextualValidator implements ContextualValidatorInterface {
     // You can pass a single constraint or an array of constraints.
     // Make sure to deal with an array in the rest of the code.
     if (isset($constraints) && !is_array($constraints)) {
-      $constraints = array($constraints);
+      $constraints = [$constraints];
     }
 
     $this->validateNode($data, $constraints, $is_root_call);
diff --git a/web/core/lib/Drupal/Core/Update/UpdateRegistry.php b/web/core/lib/Drupal/Core/Update/UpdateRegistry.php
index 4d4bbf5af..bb0b91f5a 100644
--- a/web/core/lib/Drupal/Core/Update/UpdateRegistry.php
+++ b/web/core/lib/Drupal/Core/Update/UpdateRegistry.php
@@ -187,7 +187,7 @@ class UpdateRegistry {
       list($module, $update) = explode("_{$this->updateType}_", $function);
       // The description for an update comes from its Doxygen.
       $func = new \ReflectionFunction($function);
-      $description = trim(str_replace(array("\n", '*', '/'), '', $func->getDocComment()), ' ');
+      $description = trim(str_replace(["\n", '*', '/'], '', $func->getDocComment()), ' ');
       $ret[$module]['pending'][$update] = $description;
       if (!isset($ret[$module]['start'])) {
         $ret[$module]['start'] = $update;
diff --git a/web/core/lib/Drupal/Core/Updater/Module.php b/web/core/lib/Drupal/Core/Updater/Module.php
index be0d34be3..0a244b46b 100644
--- a/web/core/lib/Drupal/Core/Updater/Module.php
+++ b/web/core/lib/Drupal/Core/Updater/Module.php
@@ -49,7 +49,7 @@ class Module extends Updater implements UpdaterInterface {
   public function isInstalled() {
     // Check if the module exists in the file system, regardless of whether it
     // is enabled or not.
-    $modules = \Drupal::state()->get('system.module.files', array());
+    $modules = \Drupal::state()->get('system.module.files', []);
     return isset($modules[$this->name]);
   }
 
@@ -84,12 +84,12 @@ class Module extends Updater implements UpdaterInterface {
     require_once DRUPAL_ROOT . '/core/includes/update.inc';
 
     if (!self::canUpdate($this->name)) {
-      return array();
+      return [];
     }
     module_load_include('install', $this->name);
 
     if (!$updates = drupal_get_schema_versions($this->name)) {
-      return array();
+      return [];
     }
     $modules_with_updates = update_get_update_list();
     if ($updates = $modules_with_updates[$this->name]) {
@@ -97,7 +97,7 @@ class Module extends Updater implements UpdaterInterface {
         return $updates['pending'];
       }
     }
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Updater/Theme.php b/web/core/lib/Drupal/Core/Updater/Theme.php
index 48f68c756..7ac70f098 100644
--- a/web/core/lib/Drupal/Core/Updater/Theme.php
+++ b/web/core/lib/Drupal/Core/Updater/Theme.php
@@ -49,14 +49,14 @@ class Theme extends Updater implements UpdaterInterface {
   public function isInstalled() {
     // Check if the theme exists in the file system, regardless of whether it
     // is enabled or not.
-    $themes = \Drupal::state()->get('system.theme.files', array());
+    $themes = \Drupal::state()->get('system.theme.files', []);
     return isset($themes[$this->name]);
   }
 
   /**
    * {@inheritdoc}
    */
-  static function canUpdateDirectory($directory) {
+  public static function canUpdateDirectory($directory) {
     $info = static::getExtensionInfo($directory);
 
     return (isset($info['type']) && $info['type'] == 'theme');
diff --git a/web/core/lib/Drupal/Core/Updater/Updater.php b/web/core/lib/Drupal/Core/Updater/Updater.php
index 0381728e9..a1ba10311 100644
--- a/web/core/lib/Drupal/Core/Updater/Updater.php
+++ b/web/core/lib/Drupal/Core/Updater/Updater.php
@@ -86,7 +86,7 @@ class Updater {
     $updaters = drupal_get_updaters();
     foreach ($updaters as $updater) {
       $class = $updater['class'];
-      if (call_user_func(array($class, 'canUpdateDirectory'), $directory)) {
+      if (call_user_func([$class, 'canUpdateDirectory'], $directory)) {
         return $class;
       }
     }
@@ -174,7 +174,7 @@ class Updater {
     $info_file = self::findInfoFile($directory);
     $info = \Drupal::service('info_parser')->parse($info_file);
     if (empty($info)) {
-      throw new UpdaterException(t('Unable to parse info file: %info_file.', array('%info_file' => $info_file)));
+      throw new UpdaterException(t('Unable to parse info file: %info_file.', ['%info_file' => $info_file]));
     }
     return $info['name'];
   }
@@ -188,12 +188,12 @@ class Updater {
    * @return array
    *   An array of configuration parameters for an update or install operation.
    */
-  protected function getInstallArgs($overrides = array()) {
-    $args = array(
+  protected function getInstallArgs($overrides = []) {
+    $args = [
       'make_backup' => FALSE,
       'install_dir' => $this->getInstallDirectory(),
       'backup_dir'  => $this->getBackupDir(),
-    );
+    ];
     return array_merge($args, $overrides);
   }
 
@@ -212,7 +212,7 @@ class Updater {
    * @throws \Drupal\Core\Updater\UpdaterException
    * @throws \Drupal\Core\Updater\UpdaterFileTransferException
    */
-  public function update(&$filetransfer, $overrides = array()) {
+  public function update(&$filetransfer, $overrides = []) {
     try {
       // Establish arguments with possible overrides.
       $args = $this->getInstallArgs($overrides);
@@ -249,7 +249,7 @@ class Updater {
       return $this->postUpdateTasks();
     }
     catch (FileTransferException $e) {
-      throw new UpdaterFileTransferException(t('File Transfer failed, reason: @reason', array('@reason' => strtr($e->getMessage(), $e->arguments))));
+      throw new UpdaterFileTransferException(t('File Transfer failed, reason: @reason', ['@reason' => strtr($e->getMessage(), $e->arguments)]));
     }
   }
 
@@ -266,7 +266,7 @@ class Updater {
    *
    * @throws \Drupal\Core\Updater\UpdaterFileTransferException
    */
-  public function install(&$filetransfer, $overrides = array()) {
+  public function install(&$filetransfer, $overrides = []) {
     try {
       // Establish arguments with possible overrides.
       $args = $this->getInstallArgs($overrides);
@@ -287,7 +287,7 @@ class Updater {
       return $this->postInstallTasks();
     }
     catch (FileTransferException $e) {
-      throw new UpdaterFileTransferException(t('File Transfer failed, reason: @reason', array('@reason' => strtr($e->getMessage(), $e->arguments))));
+      throw new UpdaterFileTransferException(t('File Transfer failed, reason: @reason', ['@reason' => strtr($e->getMessage(), $e->arguments)]));
     }
   }
 
@@ -326,7 +326,7 @@ class Updater {
           }
           catch (FileTransferException $e) {
             $message = t($e->getMessage(), $e->arguments);
-            $throw_message = t('Unable to create %directory due to the following: %reason', array('%directory' => $directory, '%reason' => $message));
+            $throw_message = t('Unable to create %directory due to the following: %reason', ['%directory' => $directory, '%reason' => $message]);
             throw new UpdaterException($throw_message);
           }
         }
@@ -395,7 +395,7 @@ class Updater {
    *   Links which provide actions to take after the install is finished.
    */
   public function postInstallTasks() {
-    return array();
+    return [];
   }
 
   /**
@@ -405,7 +405,7 @@ class Updater {
    *   Links which provide actions to take after the update is finished.
    */
   public function postUpdateTasks() {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Url.php b/web/core/lib/Drupal/Core/Url.php
index e7624d8a6..76dc46c77 100644
--- a/web/core/lib/Drupal/Core/Url.php
+++ b/web/core/lib/Drupal/Core/Url.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core;
 
+use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -50,7 +51,7 @@ class Url {
    *
    * @var array
    */
-  protected $routeParameters = array();
+  protected $routeParameters = [];
 
   /**
    * The URL options.
@@ -59,7 +60,7 @@ class Url {
    *
    * @var array
    */
-  protected $options = array();
+  protected $options = [];
 
   /**
    * Indicates whether this object contains an external URL.
@@ -111,7 +112,7 @@ class Url {
    * @todo Update this documentation for non-routed URIs in
    *   https://www.drupal.org/node/2346787
    */
-  public function __construct($route_name, $route_parameters = array(), $options = array()) {
+  public function __construct($route_name, $route_parameters = [], $options = []) {
     $this->routeName = $route_name;
     $this->routeParameters = $route_parameters;
     $this->options = $options;
@@ -137,7 +138,7 @@ class Url {
    * @see \Drupal\Core\Url::fromUserInput()
    * @see \Drupal\Core\Url::fromUri()
    */
-  public static function fromRoute($route_name, $route_parameters = array(), $options = array()) {
+  public static function fromRoute($route_name, $route_parameters = [], $options = []) {
     return new static($route_name, $route_parameters, $options);
   }
 
@@ -309,7 +310,7 @@ class Url {
       $url = static::fromRouteUri($uri_parts, $uri_options, $uri);
     }
     else {
-      $url = new static($uri, array(), $options);
+      $url = new static($uri, [], $options);
       if ($uri_parts['scheme'] !== 'base') {
         $url->external = TRUE;
         $url->setOption('external', TRUE);
@@ -493,7 +494,7 @@ class Url {
     $this->uri = $this->routeName;
     // Set empty route name and parameters.
     $this->routeName = NULL;
-    $this->routeParameters = array();
+    $this->routeParameters = [];
     return $this;
   }
 
@@ -674,6 +675,23 @@ class Url {
     return $this;
   }
 
+  /**
+   * Merges the URL options with any currently set.
+   *
+   * In the case of conflict with existing options, the new options will replace
+   * the existing options.
+   *
+   * @param array $options
+   *   The array of options. See \Drupal\Core\Url::fromUri() for details on what
+   *   it contains.
+   *
+   * @return $this
+   */
+  public function mergeOptions($options) {
+    $this->options = NestedArray::mergeDeep($this->options, $options);
+    return $this;
+  }
+
   /**
    * Returns the URI value for this Url object.
    *
diff --git a/web/core/lib/Drupal/Core/Utility/Error.php b/web/core/lib/Drupal/Core/Utility/Error.php
index 6105a5902..eb452c242 100644
--- a/web/core/lib/Drupal/Core/Utility/Error.php
+++ b/web/core/lib/Drupal/Core/Utility/Error.php
@@ -23,7 +23,7 @@ class Error {
    *
    * @var array
    */
-  protected static $blacklistFunctions = array('debug', '_drupal_error_handler', '_drupal_exception_handler');
+  protected static $blacklistFunctions = ['debug', '_drupal_error_handler', '_drupal_exception_handler'];
 
   /**
    * Decodes an exception and retrieves the correct caller.
@@ -39,7 +39,7 @@ class Error {
 
     $backtrace = $exception->getTrace();
     // Add the line throwing the exception to the backtrace.
-    array_unshift($backtrace, array('line' => $exception->getLine(), 'file' => $exception->getFile()));
+    array_unshift($backtrace, ['line' => $exception->getLine(), 'file' => $exception->getFile()]);
 
     // For PDOException errors, we try to return the initial caller,
     // skipping internal functions of the database layer.
@@ -47,7 +47,7 @@ class Error {
       // The first element in the stack is the call, the second element gives us
       // the caller. We skip calls that occurred in one of the classes of the
       // database layer or in one of its global functions.
-      $db_functions = array('db_query', 'db_query_range');
+      $db_functions = ['db_query', 'db_query_range'];
       while (!empty($backtrace[1]) && ($caller = $backtrace[1]) &&
         ((isset($caller['class']) && (strpos($caller['class'], 'Query') !== FALSE || strpos($caller['class'], 'Database') !== FALSE || strpos($caller['class'], 'PDO') !== FALSE)) ||
           in_array($caller['function'], $db_functions))) {
@@ -61,7 +61,7 @@ class Error {
 
     $caller = static::getLastCaller($backtrace);
 
-    return array(
+    return [
       '%type' => get_class($exception),
       // The standard PHP exception handler considers that the exception message
       // is plain-text. We mimic this behavior here.
@@ -72,7 +72,7 @@ class Error {
       'severity_level' => static::ERROR,
       'backtrace' => $backtrace,
       '@backtrace_string' => $exception->getTraceAsString(),
-    );
+    ];
   }
 
   /**
@@ -152,7 +152,7 @@ class Error {
     $return = '';
 
     foreach ($backtrace as $trace) {
-      $call = array('function' => '', 'args' => array());
+      $call = ['function' => '', 'args' => []];
 
       if (isset($trace['class'])) {
         $call['function'] = $trace['class'] . $trace['type'] . $trace['function'];
diff --git a/web/core/lib/Drupal/Core/Utility/LinkGenerator.php b/web/core/lib/Drupal/Core/Utility/LinkGenerator.php
index 0ec5280db..836755644 100644
--- a/web/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/web/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -76,6 +76,11 @@ class LinkGenerator implements LinkGeneratorInterface {
    * @see system_page_attachments()
    */
   public function generate($text, Url $url) {
+    // The link generator should not modify the original URL object, this
+    // ensures consistent rendering.
+    // @see https://www.drupal.org/node/2842399
+    $url = clone $url;
+
     // Performance: avoid Url::toString() needing to retrieve the URL generator
     // service from the container.
     $url->setUrlGenerator($this->urlGenerator);
@@ -85,20 +90,20 @@ class LinkGenerator implements LinkGeneratorInterface {
     }
 
     // Start building a structured representation of our link to be altered later.
-    $variables = array(
+    $variables = [
       'text' => $text,
       'url' => $url,
       'options' => $url->getOptions(),
-    );
+    ];
 
     // Merge in default options.
-    $variables['options'] += array(
-      'attributes' => array(),
-      'query' => array(),
+    $variables['options'] += [
+      'attributes' => [],
+      'query' => [],
       'language' => NULL,
       'set_active_class' => FALSE,
       'absolute' => FALSE,
-    );
+    ];
 
     // Add a hreflang attribute if we know the language of this link's url and
     // hreflang has not already been set.
@@ -145,7 +150,7 @@ class LinkGenerator implements LinkGeneratorInterface {
 
     // Move attributes out of options since generateFromRoute() doesn't need
     // them. Make sure the "href" comes first for testing purposes.
-    $attributes = array('href' => '') + $variables['options']['attributes'];
+    $attributes = ['href' => ''] + $variables['options']['attributes'];
     unset($variables['options']['attributes']);
     $url->setOptions($variables['options']);
 
diff --git a/web/core/lib/Drupal/Core/Utility/ProjectInfo.php b/web/core/lib/Drupal/Core/Utility/ProjectInfo.php
index 24043d3b4..395a23bfa 100644
--- a/web/core/lib/Drupal/Core/Utility/ProjectInfo.php
+++ b/web/core/lib/Drupal/Core/Utility/ProjectInfo.php
@@ -39,7 +39,7 @@ class ProjectInfo {
    *   (optional) Array of additional elements to be collected from the .info.yml
    *   file. Defaults to array().
    */
-  function processInfoList(array &$projects, array $list, $project_type, $status, array $additional_whitelist = array()) {
+  public function processInfoList(array &$projects, array $list, $project_type, $status, array $additional_whitelist = []) {
     foreach ($list as $file) {
       // Just projects with a matching status should be listed.
       if ($file->status != $status) {
@@ -107,16 +107,16 @@ class ProjectInfo {
       if (!isset($projects[$project_name])) {
         // Only process this if we haven't done this project, since a single
         // project can have multiple modules or themes.
-        $projects[$project_name] = array(
+        $projects[$project_name] = [
           'name' => $project_name,
           // Only save attributes from the .info.yml file we care about so we do
           // not bloat our RAM usage needlessly.
           'info' => $this->filterProjectInfo($file->info, $additional_whitelist),
           'datestamp' => $file->info['datestamp'],
-          'includes' => array($file->getName() => $file->info['name']),
+          'includes' => [$file->getName() => $file->info['name']],
           'project_type' => $project_display_type,
           'project_status' => $status,
-        );
+        ];
       }
       elseif ($projects[$project_name]['project_type'] == $project_display_type) {
         // Only add the file we're processing to the 'includes' array for this
@@ -148,7 +148,7 @@ class ProjectInfo {
    * @return string
    *   The canonical project short name.
    */
-  function getProjectName(Extension $file) {
+  public function getProjectName(Extension $file) {
     $project_name = '';
     if (isset($file->info['project'])) {
       $project_name = $file->info['project'];
@@ -174,8 +174,8 @@ class ProjectInfo {
    *
    * @see \Drupal\Core\Utility\ProjectInfo::processInfoList()
    */
-  function filterProjectInfo($info, $additional_whitelist = array()) {
-    $whitelist = array(
+  public function filterProjectInfo($info, $additional_whitelist = []) {
+    $whitelist = [
       '_info_file_ctime',
       'datestamp',
       'major',
@@ -184,7 +184,7 @@ class ProjectInfo {
       'project',
       'project status url',
       'version',
-    );
+    ];
     $whitelist = array_merge($whitelist, $additional_whitelist);
     return array_intersect_key($info, array_combine($whitelist, $whitelist));
   }
diff --git a/web/core/lib/Drupal/Core/Utility/ThemeRegistry.php b/web/core/lib/Drupal/Core/Utility/ThemeRegistry.php
index 8dbf42e24..bc2ce5a22 100644
--- a/web/core/lib/Drupal/Core/Utility/ThemeRegistry.php
+++ b/web/core/lib/Drupal/Core/Utility/ThemeRegistry.php
@@ -46,7 +46,7 @@ class ThemeRegistry extends CacheCollector implements DestructableInterface {
    * @param bool $modules_loaded
    *   Whether all modules have already been loaded.
    */
-  function __construct($cid, CacheBackendInterface $cache, LockBackendInterface $lock, $tags = array(), $modules_loaded = FALSE) {
+  public function __construct($cid, CacheBackendInterface $cache, LockBackendInterface $lock, $tags = [], $modules_loaded = FALSE) {
     $this->cid = $cid;
     $this->cache = $cache;
     $this->lock = $lock;
@@ -81,7 +81,7 @@ class ThemeRegistry extends CacheCollector implements DestructableInterface {
    *   An array with the keys of the full theme registry, but the values
    *   initialized to NULL.
    */
-  function initializeRegistry() {
+  public function initializeRegistry() {
     // @todo DIC this.
     $this->completeRegistry = \Drupal::service('theme.registry')->get();
 
@@ -136,7 +136,7 @@ class ThemeRegistry extends CacheCollector implements DestructableInterface {
       return;
     }
     // @todo: Is the custom implementation necessary?
-    $data = array();
+    $data = [];
     foreach ($this->keysToPersist as $offset => $persist) {
       if ($persist) {
         $data[$offset] = $this->storage[$offset];
diff --git a/web/core/lib/Drupal/Core/Utility/Token.php b/web/core/lib/Drupal/Core/Utility/Token.php
index 53432e8cc..2a7fd4a75 100644
--- a/web/core/lib/Drupal/Core/Utility/Token.php
+++ b/web/core/lib/Drupal/Core/Utility/Token.php
@@ -182,7 +182,7 @@ class Token {
    *   otherwise for example the result can be put into #markup, in which case
    *   it would be sanitized by Xss::filterAdmin().
    */
-  public function replace($text, array $data = array(), array $options = array(), BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function replace($text, array $data = [], array $options = [], BubbleableMetadata $bubbleable_metadata = NULL) {
     $text_tokens = $this->scan($text);
     if (empty($text_tokens)) {
       return $text;
@@ -191,7 +191,7 @@ class Token {
     $bubbleable_metadata_is_passed_in = (bool) $bubbleable_metadata;
     $bubbleable_metadata = $bubbleable_metadata ?: new BubbleableMetadata();
 
-    $replacements = array();
+    $replacements = [];
     foreach ($text_tokens as $type => $tokens) {
       $replacements += $this->generate($type, $tokens, $data, $options, $bubbleable_metadata);
       if (!empty($options['clear'])) {
@@ -251,7 +251,7 @@ class Token {
     // Iterate through the matches, building an associative array containing
     // $tokens grouped by $types, pointing to the version of the token found in
     // the source text. For example, $results['node']['title'] = '[node:title]';
-    $results = array();
+    $results = [];
     for ($i = 0; $i < count($tokens); $i++) {
       $results[$types[$i]][$tokens[$i]] = $matches[0][$i];
     }
@@ -304,12 +304,12 @@ class Token {
     $replacements = $this->moduleHandler->invokeAll('tokens', [$type, $tokens, $data, $options, $bubbleable_metadata]);
 
     // Allow other modules to alter the replacements.
-    $context = array(
+    $context = [
       'type' => $type,
       'tokens' => $tokens,
       'data' => $data,
       'options' => $options,
-    );
+    ];
     $this->moduleHandler->alter('tokens', $replacements, $context, $bubbleable_metadata);
 
     return $replacements;
@@ -343,7 +343,7 @@ class Token {
    *   stripped from the key.
    */
   public function findWithPrefix(array $tokens, $prefix, $delimiter = ':') {
-    $results = array();
+    $results = [];
     foreach ($tokens as $token => $raw) {
       $parts = explode($delimiter, $token, 2);
       if (count($parts) == 2 && $parts[0] == $prefix) {
@@ -376,9 +376,9 @@ class Token {
       else {
         $this->tokenInfo = $this->moduleHandler->invokeAll('token_info');
         $this->moduleHandler->alter('token_info', $this->tokenInfo);
-        $this->cache->set($cache_id, $this->tokenInfo, CacheBackendInterface::CACHE_PERMANENT, array(
+        $this->cache->set($cache_id, $this->tokenInfo, CacheBackendInterface::CACHE_PERMANENT, [
           static::TOKEN_INFO_CACHE_TAG,
-        ));
+        ]);
       }
     }
 
diff --git a/web/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php b/web/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
index e0c079433..4422055b0 100644
--- a/web/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
+++ b/web/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
@@ -52,6 +52,6 @@ interface UnroutedUrlAssemblerInterface {
    * @throws \InvalidArgumentException
    *   Thrown when the passed in path has no scheme.
    */
-  public function assemble($uri, array $options = array(), $collect_bubbleable_metadata = FALSE);
+  public function assemble($uri, array $options = [], $collect_bubbleable_metadata = FALSE);
 
 }
diff --git a/web/core/lib/Drupal/Core/Utility/token.api.php b/web/core/lib/Drupal/Core/Utility/token.api.php
index 56d8f3a5f..5916752d5 100644
--- a/web/core/lib/Drupal/Core/Utility/token.api.php
+++ b/web/core/lib/Drupal/Core/Utility/token.api.php
@@ -74,7 +74,7 @@ use Drupal\user\Entity\User;
 function hook_tokens($type, $tokens, array $data, array $options, \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
-  $url_options = array('absolute' => TRUE);
+  $url_options = ['absolute' => TRUE];
   if (isset($options['langcode'])) {
     $url_options['language'] = \Drupal::languageManager()->getLanguage($options['langcode']);
     $langcode = $options['langcode'];
@@ -82,7 +82,7 @@ function hook_tokens($type, $tokens, array $data, array $options, \Drupal\Core\R
   else {
     $langcode = NULL;
   }
-  $replacements = array();
+  $replacements = [];
 
   if ($type == 'node' && !empty($data['node'])) {
     /** @var \Drupal\node\NodeInterface $node */
@@ -117,11 +117,11 @@ function hook_tokens($type, $tokens, array $data, array $options, \Drupal\Core\R
     }
 
     if ($author_tokens = $token_service->findWithPrefix($tokens, 'author')) {
-      $replacements = $token_service->generate('user', $author_tokens, array('user' => $node->getOwner()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('user', $author_tokens, ['user' => $node->getOwner()], $options, $bubbleable_metadata);
     }
 
     if ($created_tokens = $token_service->findWithPrefix($tokens, 'created')) {
-      $replacements = $token_service->generate('date', $created_tokens, array('date' => $node->getCreatedTime()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('date', $created_tokens, ['date' => $node->getCreatedTime()], $options, $bubbleable_metadata);
     }
   }
 
@@ -219,39 +219,39 @@ function hook_tokens_alter(array &$replacements, array $context, \Drupal\Core\Re
  * @see hook_tokens()
  */
 function hook_token_info() {
-  $type = array(
+  $type = [
     'name' => t('Nodes'),
     'description' => t('Tokens related to individual nodes.'),
     'needs-data' => 'node',
-  );
+  ];
 
   // Core tokens for nodes.
-  $node['nid'] = array(
+  $node['nid'] = [
     'name' => t("Node ID"),
     'description' => t("The unique ID of the node."),
-  );
-  $node['title'] = array(
+  ];
+  $node['title'] = [
     'name' => t("Title"),
-  );
-  $node['edit-url'] = array(
+  ];
+  $node['edit-url'] = [
     'name' => t("Edit URL"),
     'description' => t("The URL of the node's edit page."),
-  );
+  ];
 
   // Chained tokens for nodes.
-  $node['created'] = array(
+  $node['created'] = [
     'name' => t("Date created"),
     'type' => 'date',
-  );
-  $node['author'] = array(
+  ];
+  $node['author'] = [
     'name' => t("Author"),
     'type' => 'user',
-  );
+  ];
 
-  return array(
-    'types' => array('node' => $type),
-    'tokens' => array('node' => $node),
-  );
+  return [
+    'types' => ['node' => $type],
+    'tokens' => ['node' => $node],
+  ];
 }
 
 /**
@@ -264,21 +264,21 @@ function hook_token_info() {
  */
 function hook_token_info_alter(&$data) {
   // Modify description of node tokens for our site.
-  $data['tokens']['node']['nid'] = array(
+  $data['tokens']['node']['nid'] = [
     'name' => t("Node ID"),
     'description' => t("The unique ID of the article."),
-  );
-  $data['tokens']['node']['title'] = array(
+  ];
+  $data['tokens']['node']['title'] = [
     'name' => t("Title"),
     'description' => t("The title of the article."),
-  );
+  ];
 
   // Chained tokens for nodes.
-  $data['tokens']['node']['created'] = array(
+  $data['tokens']['node']['created'] = [
     'name' => t("Date created"),
     'description' => t("The date the article was posted."),
     'type' => 'date',
-  );
+  ];
 }
 
 /**
diff --git a/web/core/lib/Drupal/Core/Validation/ConstraintManager.php b/web/core/lib/Drupal/Core/Validation/ConstraintManager.php
index 23bd7eb16..a2bd604c0 100644
--- a/web/core/lib/Drupal/Core/Validation/ConstraintManager.php
+++ b/web/core/lib/Drupal/Core/Validation/ConstraintManager.php
@@ -74,7 +74,7 @@ class ConstraintManager extends DefaultPluginManager {
       // Plugins need an array as configuration, so make sure we have one.
       // The constraint classes support passing the options as part of the
       // 'value' key also.
-      $options = isset($options) ? array('value' => $options) : array();
+      $options = isset($options) ? ['value' => $options] : [];
     }
     return $this->createInstance($name, $options);
   }
@@ -85,26 +85,26 @@ class ConstraintManager extends DefaultPluginManager {
    * @see ConstraintManager::__construct()
    */
   public function registerDefinitions() {
-    $this->getDiscovery()->setDefinition('Callback', array(
+    $this->getDiscovery()->setDefinition('Callback', [
       'label' => new TranslatableMarkup('Callback'),
       'class' => '\Symfony\Component\Validator\Constraints\Callback',
       'type' => FALSE,
-    ));
-    $this->getDiscovery()->setDefinition('Blank', array(
+    ]);
+    $this->getDiscovery()->setDefinition('Blank', [
       'label' => new TranslatableMarkup('Blank'),
       'class' => '\Symfony\Component\Validator\Constraints\Blank',
       'type' => FALSE,
-    ));
-    $this->getDiscovery()->setDefinition('NotBlank', array(
+    ]);
+    $this->getDiscovery()->setDefinition('NotBlank', [
       'label' => new TranslatableMarkup('Not blank'),
       'class' => '\Symfony\Component\Validator\Constraints\NotBlank',
       'type' => FALSE,
-    ));
-    $this->getDiscovery()->setDefinition('Email', array(
+    ]);
+    $this->getDiscovery()->setDefinition('Email', [
       'label' => new TranslatableMarkup('Email'),
       'class' => '\Drupal\Core\Validation\Plugin\Validation\Constraint\EmailConstraint',
-      'type' => array('string'),
-    ));
+      'type' => ['string'],
+    ]);
   }
 
   /**
@@ -113,7 +113,7 @@ class ConstraintManager extends DefaultPluginManager {
   public function processDefinition(&$definition, $plugin_id) {
     // Make sure 'type' is set and either an array or FALSE.
     if ($definition['type'] !== FALSE && !is_array($definition['type'])) {
-      $definition['type'] = array($definition['type']);
+      $definition['type'] = [$definition['type']];
     }
   }
 
@@ -128,7 +128,7 @@ class ConstraintManager extends DefaultPluginManager {
    *   keyed by constraint name (plugin ID).
    */
   public function getDefinitionsByType($type) {
-    $definitions = array();
+    $definitions = [];
     foreach ($this->getDefinitions() as $plugin_id => $definition) {
       if ($definition['type'] === FALSE || in_array($type, $definition['type'])) {
         $definitions[$plugin_id] = $definition;
diff --git a/web/core/lib/Drupal/Core/Validation/DrupalTranslator.php b/web/core/lib/Drupal/Core/Validation/DrupalTranslator.php
index f00df20b8..505decaff 100644
--- a/web/core/lib/Drupal/Core/Validation/DrupalTranslator.php
+++ b/web/core/lib/Drupal/Core/Validation/DrupalTranslator.php
@@ -22,7 +22,7 @@ class DrupalTranslator implements TranslatorInterface {
   /**
    * {@inheritdoc}
    */
-  public function trans($id, array $parameters = array(), $domain = NULL, $locale = NULL) {
+  public function trans($id, array $parameters = [], $domain = NULL, $locale = NULL) {
     // If a TranslatableMarkup object is passed in as $id, return it since the
     // message has already been translated.
     return $id instanceof TranslatableMarkup ? $id : t($id, $this->processParameters($parameters), $this->getOptions($domain, $locale));
@@ -31,7 +31,7 @@ class DrupalTranslator implements TranslatorInterface {
   /**
    * {@inheritdoc}
    */
-  public function transChoice($id, $number, array $parameters = array(), $domain = NULL, $locale = NULL) {
+  public function transChoice($id, $number, array $parameters = [], $domain = NULL, $locale = NULL) {
     // Violation messages can separated singular and plural versions by "|".
     $ids = explode('|', $id);
 
@@ -70,7 +70,7 @@ class DrupalTranslator implements TranslatorInterface {
    * Processes the parameters array for use with t().
    */
   protected function processParameters(array $parameters) {
-    $return = array();
+    $return = [];
     foreach ($parameters as $key => $value) {
       // We allow the values in the parameters to be safe string objects. This
       // can be useful when we want to use parameter values that are
@@ -101,7 +101,7 @@ class DrupalTranslator implements TranslatorInterface {
     // We do not support domains, so we ignore this parameter.
     // If locale is left NULL, t() will default to the interface language.
     $locale = isset($locale) ? $locale : $this->locale;
-    return array('langcode' => $locale);
+    return ['langcode' => $locale];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php b/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php
index 5e7d0c7eb..a020cdc3c 100644
--- a/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php
+++ b/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php
@@ -29,7 +29,7 @@ class ComplexDataConstraint extends Constraint {
   public function __construct($options = NULL) {
     // Allow skipping the 'properties' key in the options.
     if (is_array($options) && !array_key_exists('properties', $options)) {
-      $options = array('properties' => $options);
+      $options = ['properties' => $options];
     }
     parent::__construct($options);
     $constraint_manager = \Drupal::service('validation.constraint');
@@ -55,7 +55,7 @@ class ComplexDataConstraint extends Constraint {
    * {@inheritdoc}
    */
   public function getRequiredOptions() {
-    return array('properties');
+    return ['properties'];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php b/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
index 5829e396e..f71e2e114 100644
--- a/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
+++ b/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
@@ -72,9 +72,9 @@ class PrimitiveTypeConstraintValidator extends ConstraintValidator {
 
     if (!$valid) {
       // @todo: Provide a good violation message for each problem.
-      $this->context->addViolation($constraint->message, array(
+      $this->context->addViolation($constraint->message, [
         '%value' => is_object($value) ? get_class($value) : (is_array($value) ? 'Array' : (string) $value)
-      ));
+      ]);
     }
   }
 
diff --git a/web/core/misc/drupal.init.js b/web/core/misc/drupal.init.js
new file mode 100644
index 000000000..0e55e190e
--- /dev/null
+++ b/web/core/misc/drupal.init.js
@@ -0,0 +1,19 @@
+// Allow other JavaScript libraries to use $.
+if (window.jQuery) {
+  jQuery.noConflict();
+}
+
+// Class indicating that JS is enabled; used for styling purpose.
+document.documentElement.className += ' js';
+
+// JavaScript should be made compatible with libraries other than jQuery by
+// wrapping it in an anonymous closure.
+
+(function (domready, Drupal, drupalSettings) {
+
+  'use strict';
+
+  // Attach all behaviors.
+  domready(function () { Drupal.attachBehaviors(document, drupalSettings); });
+
+})(domready, Drupal, window.drupalSettings);
diff --git a/web/core/misc/drupal.js b/web/core/misc/drupal.js
index 750d90824..d509795b8 100644
--- a/web/core/misc/drupal.js
+++ b/web/core/misc/drupal.js
@@ -40,17 +40,9 @@
  */
 window.Drupal = {behaviors: {}, locale: {}};
 
-// Class indicating that JavaScript is enabled; used for styling purpose.
-document.documentElement.className += ' js';
-
-// Allow other JavaScript libraries to use $.
-if (window.jQuery) {
-  jQuery.noConflict();
-}
-
 // JavaScript should be made compatible with libraries other than jQuery by
 // wrapping it in an anonymous closure.
-(function (domready, Drupal, drupalSettings, drupalTranslations) {
+(function (Drupal, drupalSettings, drupalTranslations) {
 
   'use strict';
 
@@ -174,9 +166,6 @@ if (window.jQuery) {
     }
   };
 
-  // Attach all behaviors.
-  domready(function () { Drupal.attachBehaviors(document, drupalSettings); });
-
   /**
    * Detaches registered behaviors from a page element.
    *
@@ -591,4 +580,4 @@ if (window.jQuery) {
     return '<em class="placeholder">' + Drupal.checkPlain(str) + '</em>';
   };
 
-})(domready, Drupal, window.drupalSettings, window.drupalTranslations);
+})(Drupal, window.drupalSettings, window.drupalTranslations);
diff --git a/web/core/modules/block_content/js/block_content.js b/web/core/misc/entity-form.js
similarity index 80%
rename from web/core/modules/block_content/js/block_content.js
rename to web/core/misc/entity-form.js
index bbc0533b2..87253c902 100644
--- a/web/core/modules/block_content/js/block_content.js
+++ b/web/core/misc/entity-form.js
@@ -8,20 +8,20 @@
   'use strict';
 
   /**
-   * Sets summaries about revision and translation of block content.
+   * Sets summaries about revision and translation of entities.
    *
    * @type {Drupal~behavior}
    *
    * @prop {Drupal~behaviorAttach} attach
-   *   Attaches summary behaviour block content form tabs.
+   *   Attaches summary behaviour entity form tabs.
    *
    *   Specifically, it updates summaries to the revision information and the
    *   translation options.
    */
-  Drupal.behaviors.blockContentDetailsSummaries = {
+  Drupal.behaviors.entityContentDetailsSummaries = {
     attach: function (context) {
       var $context = $(context);
-      $context.find('.block-content-form-revision-information').drupalSetSummary(function (context) {
+      $context.find('.entity-content-form-revision-information').drupalSetSummary(function (context) {
         var $revisionContext = $(context);
         var revisionCheckbox = $revisionContext.find('.js-form-item-revision input');
 
@@ -36,12 +36,12 @@
         return Drupal.t('No revision');
       });
 
-      $context.find('fieldset.block-content-translation-options').drupalSetSummary(function (context) {
+      $context.find('details.entity-translation-options').drupalSetSummary(function (context) {
         var $translationContext = $(context);
         var translate;
         var $checkbox = $translationContext.find('.js-form-item-translation-translate input');
 
-        if ($checkbox.size()) {
+        if ($checkbox.length) {
           translate = $checkbox.is(':checked') ? Drupal.t('Needs to be updated') : Drupal.t('Does not need to be updated');
         }
         else {
diff --git a/web/core/misc/machine-name.js b/web/core/misc/machine-name.js
index 7f3c59d69..e76292e26 100644
--- a/web/core/misc/machine-name.js
+++ b/web/core/misc/machine-name.js
@@ -71,22 +71,22 @@
           xhr = null;
         }
 
-        // Wait 300 milliseconds since the last event to update the machine name
-        // i.e., after the user has stopped typing.
+        // Wait 300 milliseconds for Ajax request since the last event to update
+        // the machine name i.e., after the user has stopped typing.
         if (timeout) {
           clearTimeout(timeout);
           timeout = null;
         }
-        timeout = setTimeout(function () {
-          if (baseValue.toLowerCase() !== expected) {
+        if (baseValue.toLowerCase() !== expected) {
+          timeout = setTimeout(function () {
             xhr = self.transliterate(baseValue, options).done(function (machine) {
               self.showMachineName(machine.substr(0, options.maxlength), data);
             });
-          }
-          else {
-            self.showMachineName(expected, data);
-          }
-        }, 300);
+          }, 300);
+        }
+        else {
+          self.showMachineName(expected, data);
+        }
       }
 
       Object.keys(settings.machineName).forEach(function (source_id) {
diff --git a/web/core/modules/action/action.module b/web/core/modules/action/action.module
index 7461302d1..5004a84b1 100644
--- a/web/core/modules/action/action.module
+++ b/web/core/modules/action/action.module
@@ -15,13 +15,13 @@ function action_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.action':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Actions module provides tasks that can be executed by the site such as unpublishing content, sending email messages, or blocking a user. Other modules can trigger these actions when specific system events happen; for example, when new content is posted or when a user logs in. Modules can also provide additional actions. For more information, see the <a href=":documentation">online documentation for the Actions module</a>.', array(':documentation' => 'https://www.drupal.org/documentation/modules/action')) . '</p>';
+      $output .= '<p>' . t('The Actions module provides tasks that can be executed by the site such as unpublishing content, sending email messages, or blocking a user. Other modules can trigger these actions when specific system events happen; for example, when new content is posted or when a user logs in. Modules can also provide additional actions. For more information, see the <a href=":documentation">online documentation for the Actions module</a>.', [':documentation' => 'https://www.drupal.org/documentation/modules/action']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Using simple actions') . '</dt>';
-      $output .= '<dd>' . t('<em>Simple actions</em> do not require configuration and are listed automatically as available on the <a href=":actions">Actions page</a>.', array(':actions' => \Drupal::url('entity.action.collection'))) . '</dd>';
+      $output .= '<dd>' . t('<em>Simple actions</em> do not require configuration and are listed automatically as available on the <a href=":actions">Actions page</a>.', [':actions' => \Drupal::url('entity.action.collection')]) . '</dd>';
       $output .= '<dt>' . t('Creating and configuring advanced actions') . '</dt>';
-      $output .= '<dd>' . t('<em>Advanced actions</em> are user-created and have to be configured individually. Create an advanced action on the <a href=":actions">Actions page</a> by selecting an action type from the drop-down list. Then configure your action, for example by specifying the recipient of an automated email message.', array(':actions' => \Drupal::url('entity.action.collection'))) . '</dd>';
+      $output .= '<dd>' . t('<em>Advanced actions</em> are user-created and have to be configured individually. Create an advanced action on the <a href=":actions">Actions page</a> by selecting an action type from the drop-down list. Then configure your action, for example by specifying the recipient of an automated email message.', [':actions' => \Drupal::url('entity.action.collection')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
diff --git a/web/core/modules/action/action.views_execution.inc b/web/core/modules/action/action.views_execution.inc
index 5b4f71f81..71b8eebe4 100644
--- a/web/core/modules/action/action.views_execution.inc
+++ b/web/core/modules/action/action.views_execution.inc
@@ -9,12 +9,12 @@
  * Implements hook_views_form_substitutions().
  */
 function action_views_form_substitutions() {
-  $select_all = array(
+  $select_all = [
     '#type' => 'checkbox',
     '#default_value' => FALSE,
-    '#attributes' => array('class' => array('action-table-select-all')),
-  );
-  return array(
+    '#attributes' => ['class' => ['action-table-select-all']],
+  ];
+  return [
     '<!--action-bulk-form-select-all-->' => drupal_render($select_all),
-  );
+  ];
 }
diff --git a/web/core/modules/action/src/ActionFormBase.php b/web/core/modules/action/src/ActionFormBase.php
index 7a5746a36..3fafd035e 100644
--- a/web/core/modules/action/src/ActionFormBase.php
+++ b/web/core/modules/action/src/ActionFormBase.php
@@ -58,32 +58,32 @@ abstract class ActionFormBase extends EntityForm {
    * {@inheritdoc}
    */
   public function form(array $form, FormStateInterface $form_state) {
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label'),
       '#default_value' => $this->entity->label(),
       '#maxlength' => '255',
       '#description' => $this->t('A unique label for this advanced action. This label will be displayed in the interface of modules that integrate with actions.'),
-    );
+    ];
 
-    $form['id'] = array(
+    $form['id'] = [
       '#type' => 'machine_name',
       '#default_value' => $this->entity->id(),
       '#disabled' => !$this->entity->isNew(),
       '#maxlength' => 64,
       '#description' => $this->t('A unique name for this action. It must only contain lowercase letters, numbers and underscores.'),
-      '#machine_name' => array(
-        'exists' => array($this, 'exists'),
-      ),
-    );
-    $form['plugin'] = array(
+      '#machine_name' => [
+        'exists' => [$this, 'exists'],
+      ],
+    ];
+    $form['plugin'] = [
       '#type' => 'value',
       '#value' => $this->entity->get('plugin'),
-    );
-    $form['type'] = array(
+    ];
+    $form['type'] = [
       '#type' => 'value',
       '#value' => $this->entity->getType(),
-    );
+    ];
 
     if ($this->plugin instanceof PluginFormInterface) {
       $form += $this->plugin->buildConfigurationForm($form, $form_state);
diff --git a/web/core/modules/action/src/ActionListBuilder.php b/web/core/modules/action/src/ActionListBuilder.php
index 0a54cd652..2167d8e09 100644
--- a/web/core/modules/action/src/ActionListBuilder.php
+++ b/web/core/modules/action/src/ActionListBuilder.php
@@ -86,10 +86,10 @@ class ActionListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header = array(
+    $header = [
       'type' => t('Action type'),
       'label' => t('Label'),
-    ) + parent::buildHeader();
+    ] + parent::buildHeader();
     return $header;
   }
 
@@ -97,7 +97,7 @@ class ActionListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function getDefaultOperations(EntityInterface $entity) {
-    $operations = $entity->isConfigurable() ? parent::getDefaultOperations($entity) : array();
+    $operations = $entity->isConfigurable() ? parent::getDefaultOperations($entity) : [];
     if (isset($operations['edit'])) {
       $operations['edit']['title'] = t('Configure');
     }
diff --git a/web/core/modules/action/src/Form/ActionAdminManageForm.php b/web/core/modules/action/src/Form/ActionAdminManageForm.php
index de487557d..478e919be 100644
--- a/web/core/modules/action/src/Form/ActionAdminManageForm.php
+++ b/web/core/modules/action/src/Form/ActionAdminManageForm.php
@@ -50,33 +50,33 @@ class ActionAdminManageForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $actions = array();
+    $actions = [];
     foreach ($this->manager->getDefinitions() as $id => $definition) {
       if (is_subclass_of($definition['class'], '\Drupal\Core\Plugin\PluginFormInterface')) {
         $key = Crypt::hashBase64($id);
         $actions[$key] = $definition['label'] . '...';
       }
     }
-    $form['parent'] = array(
+    $form['parent'] = [
       '#type' => 'details',
       '#title' => $this->t('Create an advanced action'),
-      '#attributes' => array('class' => array('container-inline')),
+      '#attributes' => ['class' => ['container-inline']],
       '#open' => TRUE,
-    );
-    $form['parent']['action'] = array(
+    ];
+    $form['parent']['action'] = [
       '#type' => 'select',
       '#title' => $this->t('Action'),
       '#title_display' => 'invisible',
       '#options' => $actions,
       '#empty_option' => $this->t('Choose an advanced action'),
-    );
-    $form['parent']['actions'] = array(
+    ];
+    $form['parent']['actions'] = [
       '#type' => 'actions'
-    );
-    $form['parent']['actions']['submit'] = array(
+    ];
+    $form['parent']['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Create'),
-    );
+    ];
     return $form;
   }
 
@@ -87,7 +87,7 @@ class ActionAdminManageForm extends FormBase {
     if ($form_state->getValue('action')) {
       $form_state->setRedirect(
         'action.admin_add',
-        array('action_id' => $form_state->getValue('action'))
+        ['action_id' => $form_state->getValue('action')]
       );
     }
   }
diff --git a/web/core/modules/action/src/Plugin/Action/EmailAction.php b/web/core/modules/action/src/Plugin/Action/EmailAction.php
index c4ea5ac16..0f469ec6b 100644
--- a/web/core/modules/action/src/Plugin/Action/EmailAction.php
+++ b/web/core/modules/action/src/Plugin/Action/EmailAction.php
@@ -129,7 +129,7 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
     // If the recipient is a registered user with a language preference, use
     // the recipient's preferred language. Otherwise, use the system default
     // language.
-    $recipient_accounts = $this->storage->loadByProperties(array('mail' => $recipient));
+    $recipient_accounts = $this->storage->loadByProperties(['mail' => $recipient]);
     $recipient_account = reset($recipient_accounts);
     if ($recipient_account) {
       $langcode = $recipient_account->getPreferredLangcode();
@@ -137,13 +137,13 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
     else {
       $langcode = $this->languageManager->getDefaultLanguage()->getId();
     }
-    $params = array('context' => $this->configuration);
+    $params = ['context' => $this->configuration];
 
     if ($this->mailManager->mail('system', 'action_send_email', $recipient, $langcode, $params)) {
-      $this->logger->notice('Sent email to %recipient', array('%recipient' => $recipient));
+      $this->logger->notice('Sent email to %recipient', ['%recipient' => $recipient]);
     }
     else {
-      $this->logger->error('Unable to send email to %recipient', array('%recipient' => $recipient));
+      $this->logger->error('Unable to send email to %recipient', ['%recipient' => $recipient]);
     }
   }
 
@@ -151,39 +151,39 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'recipient' => '',
       'subject' => '',
       'message' => '',
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['recipient'] = array(
+    $form['recipient'] = [
       '#type' => 'textfield',
-      '#title' => t('Recipient'),
+      '#title' => t('Recipient email address'),
       '#default_value' => $this->configuration['recipient'],
       '#maxlength' => '254',
-      '#description' => t('The email address to which the message should be sent OR enter [node:author:mail], [comment:author:mail], etc. if you would like to send an email to the author of the original post.'),
-    );
-    $form['subject'] = array(
+      '#description' => t('You may also use tokens: [node:author:mail], [comment:author:mail], etc. Separate recipients with a comma.'),
+    ];
+    $form['subject'] = [
       '#type' => 'textfield',
       '#title' => t('Subject'),
       '#default_value' => $this->configuration['subject'],
       '#maxlength' => '254',
       '#description' => t('The subject of the message.'),
-    );
-    $form['message'] = array(
+    ];
+    $form['message'] = [
       '#type' => 'textarea',
       '#title' => t('Message'),
       '#default_value' => $this->configuration['message'],
       '#cols' => '80',
       '#rows' => '20',
       '#description' => t('The message that should be sent. You may include placeholders like [node:title], [user:account-name], [user:display-name] and [comment:body] to represent data that will be different each time message is sent. Not all placeholders will be available in all contexts.'),
-    );
+    ];
     return $form;
   }
 
@@ -193,7 +193,7 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
   public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
     if (!$this->emailValidator->isValid($form_state->getValue('recipient')) && strpos($form_state->getValue('recipient'), ':mail') === FALSE) {
       // We want the literal %author placeholder to be emphasized in the error message.
-      $form_state->setErrorByName('recipient', t('Enter a valid email address or use a token email address such as %author.', array('%author' => '[node:author:mail]')));
+      $form_state->setErrorByName('recipient', t('Enter a valid email address or use a token email address such as %author.', ['%author' => '[node:author:mail]']));
     }
   }
 
diff --git a/web/core/modules/action/src/Plugin/Action/GotoAction.php b/web/core/modules/action/src/Plugin/Action/GotoAction.php
index 5c1b55220..44e871b92 100644
--- a/web/core/modules/action/src/Plugin/Action/GotoAction.php
+++ b/web/core/modules/action/src/Plugin/Action/GotoAction.php
@@ -103,22 +103,22 @@ class GotoAction extends ConfigurableActionBase implements ContainerFactoryPlugi
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'url' => '',
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['url'] = array(
+    $form['url'] = [
       '#type' => 'textfield',
       '#title' => t('URL'),
-      '#description' => t('The URL to which the user should be redirected. This can be an internal URL like /node/1234 or an external URL like @url.', array('@url' => 'http://example.com')),
+      '#description' => t('The URL to which the user should be redirected. This can be an internal URL like /node/1234 or an external URL like @url.', ['@url' => 'http://example.com']),
       '#default_value' => $this->configuration['url'],
       '#required' => TRUE,
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/action/src/Plugin/Action/MessageAction.php b/web/core/modules/action/src/Plugin/Action/MessageAction.php
index ab32b4c9f..c85d249b0 100644
--- a/web/core/modules/action/src/Plugin/Action/MessageAction.php
+++ b/web/core/modules/action/src/Plugin/Action/MessageAction.php
@@ -84,23 +84,23 @@ class MessageAction extends ConfigurableActionBase implements ContainerFactoryPl
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'message' => '',
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['message'] = array(
+    $form['message'] = [
       '#type' => 'textarea',
       '#title' => t('Message'),
       '#default_value' => $this->configuration['message'],
       '#required' => TRUE,
       '#rows' => '8',
       '#description' => t('The message to be displayed to the current user. You may include placeholders like [node:title], [user:account-name], [user:display-name] and [comment:body] to represent data that will be different each time message is sent. Not all placeholders will be available in all contexts.'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/action/src/Plugin/migrate/source/Action.php b/web/core/modules/action/src/Plugin/migrate/source/Action.php
index e983b0013..ac14a44b4 100644
--- a/web/core/modules/action/src/Plugin/migrate/source/Action.php
+++ b/web/core/modules/action/src/Plugin/migrate/source/Action.php
@@ -27,12 +27,12 @@ class Action extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    $fields = array(
+    $fields = [
       'aid' => $this->t('Action ID'),
       'type' => $this->t('Module'),
       'callback' => $this->t('Callback function'),
       'parameters' => $this->t('Action configuration'),
-    );
+    ];
     if ($this->getModuleSchemaVersion('system') >= 7000) {
       $fields['label'] = $this->t('Label of the action');
     }
diff --git a/web/core/modules/action/src/Tests/ActionListTest.php b/web/core/modules/action/tests/src/Functional/ActionListTest.php
similarity index 83%
rename from web/core/modules/action/src/Tests/ActionListTest.php
rename to web/core/modules/action/tests/src/Functional/ActionListTest.php
index f533cdf1b..309160f4b 100644
--- a/web/core/modules/action/src/Tests/ActionListTest.php
+++ b/web/core/modules/action/tests/src/Functional/ActionListTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\action\Tests;
+namespace Drupal\Tests\action\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test behaviors when visiting the action listing page.
  *
  * @group action
  */
-class ActionListTest extends WebTestBase {
+class ActionListTest extends BrowserTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('action');
+  public static $modules = ['action'];
 
   /**
    * Tests the behavior when there are no actions to list in the admin page.
diff --git a/web/core/modules/action/tests/src/Functional/ActionUninstallTest.php b/web/core/modules/action/tests/src/Functional/ActionUninstallTest.php
index 93e0bc0c2..6b52643bc 100644
--- a/web/core/modules/action/tests/src/Functional/ActionUninstallTest.php
+++ b/web/core/modules/action/tests/src/Functional/ActionUninstallTest.php
@@ -17,19 +17,19 @@ class ActionUninstallTest extends BrowserTestBase {
    *
    * @var array
    */
-  public static $modules = array('views', 'action');
+  public static $modules = ['views', 'action'];
 
   /**
    * Tests Action uninstall.
    */
   public function testActionUninstall() {
-    \Drupal::service('module_installer')->uninstall(array('action'));
+    \Drupal::service('module_installer')->uninstall(['action']);
 
     $storage = $this->container->get('entity_type.manager')->getStorage('action');
     $storage->resetCache(['user_block_user_action']);
     $this->assertTrue($storage->load('user_block_user_action'), 'Configuration entity \'user_block_user_action\' still exists after uninstalling action module.' );
 
-    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $admin_user = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($admin_user);
 
     $this->drupalGet('admin/people');
diff --git a/web/core/modules/action/tests/src/Functional/BulkFormTest.php b/web/core/modules/action/tests/src/Functional/BulkFormTest.php
index 7d32b9471..439ffe4d6 100644
--- a/web/core/modules/action/tests/src/Functional/BulkFormTest.php
+++ b/web/core/modules/action/tests/src/Functional/BulkFormTest.php
@@ -18,7 +18,7 @@ class BulkFormTest extends BrowserTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'action_bulk_test');
+  public static $modules = ['node', 'action_bulk_test'];
 
   /**
    * Tests the bulk form.
@@ -31,30 +31,30 @@ class BulkFormTest extends BrowserTestBase {
     $this->drupalGet('test_bulk_form_empty');
     $this->assertText(t('This view is empty.'), 'Empty text found on empty bulk form.');
 
-    $nodes = array();
+    $nodes = [];
     for ($i = 0; $i < 10; $i++) {
       // Ensure nodes are sorted in the same order they are inserted in the
       // array.
       $timestamp = REQUEST_TIME - $i;
-      $nodes[] = $this->drupalCreateNode(array(
+      $nodes[] = $this->drupalCreateNode([
         'sticky' => FALSE,
         'created' => $timestamp,
         'changed' => $timestamp,
-      ));
+      ]);
     }
 
     $this->drupalGet('test_bulk_form');
 
     // Test that the views edit header appears first.
-    $first_form_element = $this->xpath('//form/div[1][@id = :id]', array(':id' => 'edit-header'));
+    $first_form_element = $this->xpath('//form/div[1][@id = :id]', [':id' => 'edit-header']);
     $this->assertTrue($first_form_element, 'The views form edit header appears first.');
 
     $this->assertFieldById('edit-action', NULL, 'The action select field appears.');
 
     // Make sure a checkbox appears on all rows.
-    $edit = array();
+    $edit = [];
     for ($i = 0; $i < 10; $i++) {
-      $this->assertFieldById('edit-node-bulk-form-' . $i, NULL, format_string('The checkbox on row @row appears.', array('@row' => $i)));
+      $this->assertFieldById('edit-node-bulk-form-' . $i, NULL, format_string('The checkbox on row @row appears.', ['@row' => $i]));
       $edit["node_bulk_form[$i]"] = TRUE;
     }
 
@@ -67,12 +67,12 @@ class BulkFormTest extends BrowserTestBase {
     $this->drupalGet('test_bulk_form');
 
     // Set all nodes to sticky and check that.
-    $edit += array('action' => 'node_make_sticky_action');
+    $edit += ['action' => 'node_make_sticky_action'];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
 
     foreach ($nodes as $node) {
       $changed_node = $node_storage->load($node->id());
-      $this->assertTrue($changed_node->isSticky(), format_string('Node @nid got marked as sticky.', array('@nid' => $node->id())));
+      $this->assertTrue($changed_node->isSticky(), format_string('Node @nid got marked as sticky.', ['@nid' => $node->id()]));
     }
 
     $this->assertText('Make content sticky was applied to 10 items.');
@@ -81,18 +81,18 @@ class BulkFormTest extends BrowserTestBase {
     $node = $node_storage->load($nodes[0]->id());
     $this->assertTrue($node->isPublished(), 'The node is published.');
 
-    $edit = array('node_bulk_form[0]' => TRUE, 'action' => 'node_unpublish_action');
+    $edit = ['node_bulk_form[0]' => TRUE, 'action' => 'node_unpublish_action'];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
 
     $this->assertText('Unpublish content was applied to 1 item.');
 
     // Load the node again.
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $node = $node_storage->load($node->id());
     $this->assertFalse($node->isPublished(), 'A single node has been unpublished.');
 
     // The second node should still be published.
-    $node_storage->resetCache(array($nodes[1]->id()));
+    $node_storage->resetCache([$nodes[1]->id()]);
     $node = $node_storage->load($nodes[1]->id());
     $this->assertTrue($node->isPublished(), 'An unchecked node is still published.');
 
@@ -105,7 +105,7 @@ class BulkFormTest extends BrowserTestBase {
     $view->save();
 
     $this->drupalGet('test_bulk_form');
-    $options = $this->xpath('//select[@id=:id]/option', array(':id' => 'edit-action'));
+    $options = $this->xpath('//select[@id=:id]/option', [':id' => 'edit-action']);
     $this->assertEqual(count($options), 2);
     $this->assertOption('edit-action', 'node_make_sticky_action');
     $this->assertOption('edit-action', 'node_make_unsticky_action');
@@ -137,17 +137,17 @@ class BulkFormTest extends BrowserTestBase {
 
     $this->drupalGet('test_bulk_form');
     // Call the node delete action.
-    $edit = array();
+    $edit = [];
     for ($i = 0; $i < 5; $i++) {
       $edit["node_bulk_form[$i]"] = TRUE;
     }
-    $edit += array('action' => 'node_delete_action');
+    $edit += ['action' => 'node_delete_action'];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     // Make sure we don't show an action message while we are still on the
     // confirmation page.
     $errors = $this->xpath('//div[contains(@class, "messages--status")]');
     $this->assertFalse($errors, 'No action message shown.');
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
     $this->assertText(t('Deleted 5 posts.'));
     // Check if we got redirected to the original page.
     $this->assertUrl('test_bulk_form');
diff --git a/web/core/modules/action/tests/src/Functional/ConfigurationTest.php b/web/core/modules/action/tests/src/Functional/ConfigurationTest.php
index 23d0a3819..472ba1712 100644
--- a/web/core/modules/action/tests/src/Functional/ConfigurationTest.php
+++ b/web/core/modules/action/tests/src/Functional/ConfigurationTest.php
@@ -19,24 +19,24 @@ class ConfigurationTest extends BrowserTestBase {
    *
    * @var array
    */
-  public static $modules = array('action');
+  public static $modules = ['action'];
 
   /**
    * Tests configuration of advanced actions through administration interface.
    */
-  function testActionConfiguration() {
+  public function testActionConfiguration() {
     // Create a user with permission to view the actions administration pages.
-    $user = $this->drupalCreateUser(array('administer actions'));
+    $user = $this->drupalCreateUser(['administer actions']);
     $this->drupalLogin($user);
 
     // Make a POST request to admin/config/system/actions.
-    $edit = array();
+    $edit = [];
     $edit['action'] = Crypt::hashBase64('action_goto_action');
     $this->drupalPostForm('admin/config/system/actions', $edit, t('Create'));
     $this->assertResponse(200);
 
     // Make a POST request to the individual action configuration page.
-    $edit = array();
+    $edit = [];
     $action_label = $this->randomMachineName();
     $edit['label'] = $action_label;
     $edit['id'] = strtolower($action_label);
@@ -52,7 +52,7 @@ class ConfigurationTest extends BrowserTestBase {
     $this->clickLink(t('Configure'));
     preg_match('|admin/config/system/actions/configure/(.+)|', $this->getUrl(), $matches);
     $aid = $matches[1];
-    $edit = array();
+    $edit = [];
     $new_action_label = $this->randomMachineName();
     $edit['label'] = $new_action_label;
     $edit['url'] = 'admin';
@@ -72,12 +72,12 @@ class ConfigurationTest extends BrowserTestBase {
     $this->drupalGet('admin/config/system/actions');
     $this->clickLink(t('Delete'));
     $this->assertResponse(200);
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm("admin/config/system/actions/configure/$aid/delete", $edit, t('Delete'));
     $this->assertResponse(200);
 
     // Make sure that the action was actually deleted.
-    $this->assertRaw(t('The action %action has been deleted.', array('%action' => $new_action_label)), 'Make sure that we get a delete confirmation message.');
+    $this->assertRaw(t('The action %action has been deleted.', ['%action' => $new_action_label]), 'Make sure that we get a delete confirmation message.');
     $this->drupalGet('admin/config/system/actions');
     $this->assertResponse(200);
     $this->assertNoText($new_action_label, "Make sure the action label does not appear on the overview page after we've deleted the action.");
diff --git a/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php b/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
index 0ee18697c..bd87724cf 100644
--- a/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
+++ b/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\action\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
diff --git a/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php b/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php
index 04d0ec9c7..0b1a2caae 100644
--- a/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php
+++ b/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\action\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
diff --git a/web/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php b/web/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php
index 34d24b1ce..1959f6510 100644
--- a/web/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php
+++ b/web/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
 class ActionLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array('action' => 'core/modules/action');
+    $this->directoryList = ['action' => 'core/modules/action'];
     parent::setUp();
   }
 
@@ -20,7 +20,7 @@ class ActionLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Tests local task existence.
    */
   public function testActionLocalTasks() {
-    $this->assertLocalTasks('entity.action.collection', array(array('action.admin')));
+    $this->assertLocalTasks('entity.action.collection', [['action.admin']]);
   }
 
 }
diff --git a/web/core/modules/aggregator/aggregator.install b/web/core/modules/aggregator/aggregator.install
index e2e64a30a..84e961474 100644
--- a/web/core/modules/aggregator/aggregator.install
+++ b/web/core/modules/aggregator/aggregator.install
@@ -10,23 +10,18 @@
  */
 function aggregator_requirements($phase) {
   $has_curl = function_exists('curl_init');
-  $requirements = array();
-  $requirements['curl'] = array(
+  $requirements = [];
+  $requirements['curl'] = [
     'title' => t('cURL'),
     'value' => $has_curl ? t('Enabled') : t('Not found'),
-  );
+  ];
   if (!$has_curl) {
     $requirements['curl']['severity'] = REQUIREMENT_ERROR;
-    $requirements['curl']['description'] = t('The Aggregator module could not be installed because the PHP <a href="http://php.net/manual/curl.setup.php">cURL</a> library is not available.');
+    $requirements['curl']['description'] = t('The Aggregator module requires the <a href="https://secure.php.net/manual/en/curl.setup.php">PHP cURL library</a>. For more information, see the <a href="https://www.drupal.org/requirements/php/curl">online information on installing the PHP cURL extension</a>.');
   }
   return $requirements;
 }
 
-/**
- * @addtogroup updates-8.0.0-rc
- * @{
- */
-
 /**
  * The simple presence of this update function clears cached field definitions.
  */
@@ -34,15 +29,6 @@ function aggregator_update_8001() {
   // Feed ID base field is now required.
 }
 
-/**
- * @} End of "addtogroup updates-8.0.0-rc".
- */
-
-/**
- * @addtogroup updates-8.2.x
- * @{
- */
-
 /**
  * Make the 'Source feed' field for aggregator items required.
  */
@@ -54,7 +40,3 @@ function aggregator_update_8200() {
   $field_definition->setRequired(TRUE);
   $definition_update_manager->updateFieldStorageDefinition($field_definition);
 }
-
-/**
- * @} End of "addtogroup updates-8.2.x".
- */
diff --git a/web/core/modules/aggregator/aggregator.module b/web/core/modules/aggregator/aggregator.module
index 15b735311..0f856e312 100644
--- a/web/core/modules/aggregator/aggregator.module
+++ b/web/core/modules/aggregator/aggregator.module
@@ -10,6 +10,9 @@ use Drupal\Core\Routing\RouteMatchInterface;
 
 /**
  * Denotes that a feed's items should never expire.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\aggregator\FeedStorageInterface::CLEAR_NEVER instead.
  */
 const AGGREGATOR_CLEAR_NEVER = 0;
 
@@ -22,35 +25,35 @@ function aggregator_help($route_name, RouteMatchInterface $route_match) {
       $path_validator = \Drupal::pathValidator();
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Aggregator module is an on-site syndicator and news reader that gathers and displays fresh content from RSS-, RDF-, and Atom-based feeds made available across the web. Thousands of sites (particularly news sites and blogs) publish their latest headlines in feeds, using a number of standardized XML-based formats. For more information, see the <a href=":aggregator-module">online documentation for the Aggregator module</a>.', array(':aggregator-module' => 'https://www.drupal.org/documentation/modules/aggregator')) . '</p>';
+      $output .= '<p>' . t('The Aggregator module is an on-site syndicator and news reader that gathers and displays fresh content from RSS-, RDF-, and Atom-based feeds made available across the web. Thousands of sites (particularly news sites and blogs) publish their latest headlines in feeds, using a number of standardized XML-based formats. For more information, see the <a href=":aggregator-module">online documentation for the Aggregator module</a>.', [':aggregator-module' => 'https://www.drupal.org/documentation/modules/aggregator']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       // Check if the aggregator sources View is enabled.
       if ($url = $path_validator->getUrlIfValid('aggregator/sources')) {
         $output .= '<dt>' . t('Viewing feeds') . '</dt>';
-        $output .= '<dd>' . t('Users view feed content in the <a href=":aggregator">main aggregator display</a>, or by <a href=":aggregator-sources">their source</a> (usually via an RSS feed reader). The most recent content in a feed can be displayed as a block through the <a href=":admin-block">Blocks administration page</a>.', array(':aggregator' => \Drupal::url('aggregator.page_last'), ':aggregator-sources' => $url->toString(), ':admin-block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '</dd>';
+        $output .= '<dd>' . t('Users view feed content in the <a href=":aggregator">main aggregator display</a>, or by <a href=":aggregator-sources">their source</a> (usually via an RSS feed reader). The most recent content in a feed can be displayed as a block through the <a href=":admin-block">Blocks administration page</a>.', [':aggregator' => \Drupal::url('aggregator.page_last'), ':aggregator-sources' => $url->toString(), ':admin-block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#']) . '</dd>';
       }
       $output .= '<dt>' . t('Adding, editing, and deleting feeds') . '</dt>';
-      $output .= '<dd>' . t('Administrators can add, edit, and delete feeds, and choose how often to check each feed for newly updated items on the <a href=":feededit">Aggregator administration page</a>.', array(':feededit' => \Drupal::url('aggregator.admin_overview'))) . '</dd>';
+      $output .= '<dd>' . t('Administrators can add, edit, and delete feeds, and choose how often to check each feed for newly updated items on the <a href=":feededit">Aggregator administration page</a>.', [':feededit' => \Drupal::url('aggregator.admin_overview')]) . '</dd>';
       $output .= '<dt>' . t('Configuring the display of feed items') . '</dt>';
-      $output .= '<dd>' . t('Administrators can choose how many items are displayed in the listing pages, which HTML tags are allowed in the content of feed items, and whether they should be trimmed to a maximum number of characters on the <a href=":settings">Aggregator settings page</a>.', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '</dd>';
+      $output .= '<dd>' . t('Administrators can choose how many items are displayed in the listing pages, which HTML tags are allowed in the content of feed items, and whether they should be trimmed to a maximum number of characters on the <a href=":settings">Aggregator settings page</a>.', [':settings' => \Drupal::url('aggregator.admin_settings')]) . '</dd>';
       $output .= '<dt>' . t('Discarding old feed items') . '</dt>';
-      $output .= '<dd>' . t('Administrators can choose whether to discard feed items that are older than a specified period of time on the <a href=":settings">Aggregator settings page</a>. This requires a correctly configured cron maintenance task (see below).', array(':settings' => \Drupal::url('aggregator.admin_settings'))) . '<dd>';
+      $output .= '<dd>' . t('Administrators can choose whether to discard feed items that are older than a specified period of time on the <a href=":settings">Aggregator settings page</a>. This requires a correctly configured cron maintenance task (see below).', [':settings' => \Drupal::url('aggregator.admin_settings')]) . '<dd>';
 
       $output .= '<dt>' . t('<abbr title="Outline Processor Markup Language">OPML</abbr> integration') . '</dt>';
       // Check if the aggregator opml View is enabled.
       if ($url = $path_validator->getUrlIfValid('aggregator/opml')) {
-        $output .= '<dd>' . t('A <a href=":aggregator-opml">machine-readable OPML file</a> of all feeds is available. OPML is an XML-based file format used to share outline-structured information such as a list of RSS feeds. Feeds can also be <a href=":import-opml">imported via an OPML file</a>.', array(':aggregator-opml' => $url->toString(), ':import-opml' => \Drupal::url('aggregator.opml_add'))) . '</dd>';
+        $output .= '<dd>' . t('A <a href=":aggregator-opml">machine-readable OPML file</a> of all feeds is available. OPML is an XML-based file format used to share outline-structured information such as a list of RSS feeds. Feeds can also be <a href=":import-opml">imported via an OPML file</a>.', [':aggregator-opml' => $url->toString(), ':import-opml' => \Drupal::url('aggregator.opml_add')]) . '</dd>';
       }
       $output .= '<dt>' . t('Configuring cron') . '</dt>';
-      $output .= '<dd>' . t('A working <a href=":cron">cron maintenance task</a> is required to update feeds automatically.', array(':cron' => \Drupal::url('system.cron_settings'))) . '</dd>';
+      $output .= '<dd>' . t('A working <a href=":cron">cron maintenance task</a> is required to update feeds automatically.', [':cron' => \Drupal::url('system.cron_settings')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
     case 'aggregator.admin_overview':
       // Don't use placeholders for possibility to change URLs for translators.
       $output = '<p>' . t('Many sites publish their headlines and posts in feeds, using a number of standardized XML-based formats. The aggregator supports <a href="http://en.wikipedia.org/wiki/Rss">RSS</a>, <a href="http://en.wikipedia.org/wiki/Resource_Description_Framework">RDF</a>, and <a href="http://en.wikipedia.org/wiki/Atom_%28standard%29">Atom</a>.') . '</p>';
-      $output .= '<p>' . t('Current feeds are listed below, and <a href=":addfeed">new feeds may be added</a>. For each feed, the <em>latest items</em> block may be enabled at the <a href=":block">blocks administration page</a>.', array(':addfeed' => \Drupal::url('aggregator.feed_add'), ':block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '</p>';
+      $output .= '<p>' . t('Current feeds are listed below, and <a href=":addfeed">new feeds may be added</a>. For each feed, the <em>latest items</em> block may be enabled at the <a href=":block">blocks administration page</a>.', [':addfeed' => \Drupal::url('aggregator.feed_add'), ':block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#']) . '</p>';
       return $output;
 
     case 'aggregator.feed_add':
@@ -65,66 +68,66 @@ function aggregator_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function aggregator_theme() {
-  return array(
-    'aggregator_feed' => array(
+  return [
+    'aggregator_feed' => [
       'render element' => 'elements',
       'file' => 'aggregator.theme.inc',
-    ),
-    'aggregator_item' => array(
+    ],
+    'aggregator_item' => [
       'render element' => 'elements',
       'file' => 'aggregator.theme.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
  * Implements hook_entity_extra_field_info().
  */
 function aggregator_entity_extra_field_info() {
-  $extra = array();
+  $extra = [];
 
-  $extra['aggregator_feed']['aggregator_feed'] = array(
-    'display' => array(
-      'items' => array(
+  $extra['aggregator_feed']['aggregator_feed'] = [
+    'display' => [
+      'items' => [
         'label' => t('Items'),
         'description' => t('Items associated with this feed'),
         'weight' => 0,
-      ),
+      ],
       // @todo Move to a formatter at https://www.drupal.org/node/2339917.
-      'image' => array(
+      'image' => [
         'label' => t('Image'),
         'description' => t('The feed image'),
         'weight' => 2,
-      ),
+      ],
       // @todo Move to a formatter at https://www.drupal.org/node/2149845.
-      'description' => array(
+      'description' => [
         'label' => t('Description'),
         'description' => t('The description of this feed'),
         'weight' => 3,
-      ),
-      'more_link' => array(
+      ],
+      'more_link' => [
         'label' => t('More link'),
         'description' => t('A more link to the feed detail page'),
         'weight' => 5,
-      ),
-      'feed_icon' => array(
+      ],
+      'feed_icon' => [
         'label' => t('Feed icon'),
         'description' => t('An icon that links to the feed URL'),
         'weight' => 6,
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
-  $extra['aggregator_item']['aggregator_item'] = array(
-    'display' => array(
+  $extra['aggregator_item']['aggregator_item'] = [
+    'display' => [
       // @todo Move to a formatter at https://www.drupal.org/node/2149845.
-      'description' => array(
+      'description' => [
         'label' => t('Description'),
         'description' => t('The description of this feed item'),
         'weight' => 2,
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
   return $extra;
 }
diff --git a/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml b/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml
index e3c23cfb1..e0232cfb5 100644
--- a/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml
+++ b/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml
@@ -11,20 +11,26 @@ content:
   checked:
     type: timestamp_ago
     weight: 1
+    region: content
     settings: {  }
     third_party_settings: {  }
     label: inline
   description:
     weight: 3
+    region: content
   feed_icon:
     weight: 5
+    region: content
   image:
     weight: 2
+    region: content
   items:
     weight: 0
+    region: content
   link:
     type: uri_link
     weight: 4
+    region: content
     settings: {  }
     third_party_settings: {  }
     label: inline
diff --git a/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml b/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml
index 40425f2f5..5e5e468ae 100644
--- a/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml
+++ b/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.summary.yml
@@ -12,8 +12,10 @@ mode: summary
 content:
   items:
     weight: 0
+    region: content
   more_link:
     weight: 1
+    region: content
 hidden:
   checked: true
   description: true
diff --git a/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml b/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml
index 837bee0b6..8e29395a8 100644
--- a/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml
+++ b/web/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml
@@ -12,6 +12,7 @@ mode: summary
 content:
   timestamp:
     weight: 0
+    region: content
 hidden:
   author: true
   description: true
diff --git a/web/core/modules/aggregator/src/AggregatorFeedViewsData.php b/web/core/modules/aggregator/src/AggregatorFeedViewsData.php
index 2eb0d344f..b47f837db 100644
--- a/web/core/modules/aggregator/src/AggregatorFeedViewsData.php
+++ b/web/core/modules/aggregator/src/AggregatorFeedViewsData.php
@@ -15,12 +15,12 @@ class AggregatorFeedViewsData extends EntityViewsData {
   public function getViewsData() {
     $data = parent::getViewsData();
 
-    $data['aggregator_feed']['table']['join'] = array(
-      'aggregator_item' => array(
+    $data['aggregator_feed']['table']['join'] = [
+      'aggregator_item' => [
         'left_field' => 'fid',
         'field' => 'fid',
-      ),
-    );
+      ],
+    ];
 
     $data['aggregator_feed']['fid']['help'] = $this->t('The unique ID of the aggregator feed.');
     $data['aggregator_feed']['fid']['argument']['id'] = 'aggregator_fid';
diff --git a/web/core/modules/aggregator/src/Controller/AggregatorController.php b/web/core/modules/aggregator/src/Controller/AggregatorController.php
index c84fb18b6..021e4d10a 100644
--- a/web/core/modules/aggregator/src/Controller/AggregatorController.php
+++ b/web/core/modules/aggregator/src/Controller/AggregatorController.php
@@ -48,9 +48,9 @@ class AggregatorController extends ControllerBase {
    */
   public function feedAdd() {
     $feed = $this->entityManager()->getStorage('aggregator_feed')
-      ->create(array(
+      ->create([
         'refresh' => 3600,
-      ));
+      ]);
     return $this->entityFormBuilder()->getForm($feed);
   }
 
@@ -67,15 +67,15 @@ class AggregatorController extends ControllerBase {
    */
   protected function buildPageList(array $items, $feed_source = '') {
     // Assemble output.
-    $build = array(
+    $build = [
       '#type' => 'container',
-      '#attributes' => array('class' => array('aggregator-wrapper')),
-    );
-    $build['feed_source'] = is_array($feed_source) ? $feed_source : array('#markup' => $feed_source);
+      '#attributes' => ['class' => ['aggregator-wrapper']],
+    ];
+    $build['feed_source'] = is_array($feed_source) ? $feed_source : ['#markup' => $feed_source];
     if ($items) {
       $build['items'] = $this->entityManager()->getViewBuilder('aggregator_item')
         ->viewMultiple($items, 'default');
-      $build['pager'] = array('#type' => 'pager');
+      $build['pager'] = ['#type' => 'pager'];
     }
     return $build;
   }
@@ -94,8 +94,8 @@ class AggregatorController extends ControllerBase {
    */
   public function feedRefresh(FeedInterface $aggregator_feed) {
     $message = $aggregator_feed->refreshItems()
-      ? $this->t('There is new syndicated content from %site.', array('%site' => $aggregator_feed->label()))
-      : $this->t('There is no new syndicated content from %site.', array('%site' => $aggregator_feed->label()));
+      ? $this->t('There is new syndicated content from %site.', ['%site' => $aggregator_feed->label()])
+      : $this->t('There is no new syndicated content from %site.', ['%site' => $aggregator_feed->label()]);
     drupal_set_message($message);
     return $this->redirect('aggregator.admin_overview');
   }
@@ -111,22 +111,22 @@ class AggregatorController extends ControllerBase {
     $feeds = $entity_manager->getStorage('aggregator_feed')
       ->loadMultiple();
 
-    $header = array($this->t('Title'), $this->t('Items'), $this->t('Last update'), $this->t('Next update'), $this->t('Operations'));
-    $rows = array();
+    $header = [$this->t('Title'), $this->t('Items'), $this->t('Last update'), $this->t('Next update'), $this->t('Operations')];
+    $rows = [];
     /** @var \Drupal\aggregator\FeedInterface[] $feeds */
     foreach ($feeds as $feed) {
-      $row = array();
+      $row = [];
       $row[] = $feed->link();
       $row[] = $this->formatPlural($entity_manager->getStorage('aggregator_item')->getItemCount($feed), '1 item', '@count items');
       $last_checked = $feed->getLastCheckedTime();
       $refresh_rate = $feed->getRefreshRate();
 
-      $row[] = ($last_checked ? $this->t('@time ago', array('@time' => $this->dateFormatter->formatInterval(REQUEST_TIME - $last_checked))) : $this->t('never'));
+      $row[] = ($last_checked ? $this->t('@time ago', ['@time' => $this->dateFormatter->formatInterval(REQUEST_TIME - $last_checked)]) : $this->t('never'));
       if (!$last_checked && $refresh_rate) {
         $next_update = $this->t('imminently');
       }
       elseif ($last_checked && $refresh_rate) {
-        $next_update = $next = $this->t('%time left', array('%time' => $this->dateFormatter->formatInterval($last_checked + $refresh_rate - REQUEST_TIME)));
+        $next_update = $next = $this->t('%time left', ['%time' => $this->dateFormatter->formatInterval($last_checked + $refresh_rate - REQUEST_TIME)]);
       }
       else {
         $next_update = $this->t('never');
@@ -136,33 +136,33 @@ class AggregatorController extends ControllerBase {
         'title' => $this->t('Edit'),
         'url' => Url::fromRoute('entity.aggregator_feed.edit_form', ['aggregator_feed' => $feed->id()]),
       ];
-      $links['delete'] = array(
+      $links['delete'] = [
         'title' => $this->t('Delete'),
         'url' => Url::fromRoute('entity.aggregator_feed.delete_form', ['aggregator_feed' => $feed->id()]),
-      );
-      $links['delete_items'] = array(
+      ];
+      $links['delete_items'] = [
         'title' => $this->t('Delete items'),
         'url' => Url::fromRoute('aggregator.feed_items_delete', ['aggregator_feed' => $feed->id()]),
-      );
-      $links['update'] = array(
+      ];
+      $links['update'] = [
         'title' => $this->t('Update items'),
         'url' => Url::fromRoute('aggregator.feed_refresh', ['aggregator_feed' => $feed->id()]),
-      );
-      $row[] = array(
-        'data' => array(
+      ];
+      $row[] = [
+        'data' => [
           '#type' => 'operations',
           '#links' => $links,
-        ),
-      );
+        ],
+      ];
       $rows[] = $row;
     }
-    $build['feeds'] = array(
+    $build['feeds'] = [
       '#prefix' => '<h3>' . $this->t('Feed overview') . '</h3>',
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
-      '#empty' => $this->t('No feeds available. <a href=":link">Add feed</a>.', array(':link' => $this->url('aggregator.feed_add'))),
-    );
+      '#empty' => $this->t('No feeds available. <a href=":link">Add feed</a>.', [':link' => $this->url('aggregator.feed_add')]),
+    ];
 
     return $build;
   }
@@ -176,7 +176,7 @@ class AggregatorController extends ControllerBase {
   public function pageLast() {
     $items = $this->entityManager()->getStorage('aggregator_item')->loadAll(20);
     $build = $this->buildPageList($items);
-    $build['#attached']['feed'][] = array('aggregator/rss', $this->config('system.site')->get('name') . ' ' . $this->t('aggregator'));
+    $build['#attached']['feed'][] = ['aggregator/rss', $this->config('system.site')->get('name') . ' ' . $this->t('aggregator')];
     return $build;
   }
 
diff --git a/web/core/modules/aggregator/src/Entity/Feed.php b/web/core/modules/aggregator/src/Entity/Feed.php
index 834a55e9a..3b14e8c24 100644
--- a/web/core/modules/aggregator/src/Entity/Feed.php
+++ b/web/core/modules/aggregator/src/Entity/Feed.php
@@ -88,11 +88,11 @@ class Feed extends ContentEntityBase implements FeedInterface {
    * {@inheritdoc}
    */
   public static function preCreate(EntityStorageInterface $storage, array &$values) {
-    $values += array(
+    $values += [
       'link' => '',
       'description' => '',
       'image' => '',
-    );
+    ];
   }
 
   /**
@@ -143,10 +143,10 @@ class Feed extends ContentEntityBase implements FeedInterface {
       ->setDescription(t('The name of the feed (or the name of the website providing the feed).'))
       ->setRequired(TRUE)
       ->setSetting('max_length', 255)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -5,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE)
       ->addConstraint('FeedTitle');
 
@@ -154,15 +154,15 @@ class Feed extends ContentEntityBase implements FeedInterface {
       ->setLabel(t('URL'))
       ->setDescription(t('The fully-qualified URL of the feed.'))
       ->setRequired(TRUE)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'uri',
         'weight' => -3,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE)
       ->addConstraint('FeedUrl');
 
-    $intervals = array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200);
-    $period = array_map(array(\Drupal::service('date.formatter'), 'formatInterval'), array_combine($intervals, $intervals));
+    $intervals = [900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200];
+    $period = array_map([\Drupal::service('date.formatter'), 'formatInterval'], array_combine($intervals, $intervals));
     $period[AGGREGATOR_CLEAR_NEVER] = t('Never');
 
     $fields['refresh'] = BaseFieldDefinition::create('list_integer')
@@ -171,21 +171,21 @@ class Feed extends ContentEntityBase implements FeedInterface {
       ->setSetting('unsigned', TRUE)
       ->setRequired(TRUE)
       ->setSetting('allowed_values', $period)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'options_select',
         'weight' => -2,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['checked'] = BaseFieldDefinition::create('timestamp')
       ->setLabel(t('Checked'))
       ->setDescription(t('Last time feed was checked for new items, as Unix timestamp.'))
       ->setDefaultValue(0)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'inline',
         'type' => 'timestamp_ago',
         'weight' => 1,
-      ))
+      ])
       ->setDisplayConfigurable('view', TRUE);
 
     $fields['queued'] = BaseFieldDefinition::create('timestamp')
@@ -196,15 +196,15 @@ class Feed extends ContentEntityBase implements FeedInterface {
     $fields['link'] = BaseFieldDefinition::create('uri')
       ->setLabel(t('URL'))
       ->setDescription(t('The link of the feed.'))
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'inline',
         'weight' => 4,
-      ))
+      ])
       ->setDisplayConfigurable('view', TRUE);
 
     $fields['description'] = BaseFieldDefinition::create('string_long')
       ->setLabel(t('Description'))
-      ->setDescription(t("The parent website's description that comes from the @description element in the feed.", array('@description' => '<description>')));
+      ->setDescription(t("The parent website's description that comes from the @description element in the feed.", ['@description' => '<description>']));
 
     $fields['image'] = BaseFieldDefinition::create('uri')
       ->setLabel(t('Image'))
diff --git a/web/core/modules/aggregator/src/Entity/Item.php b/web/core/modules/aggregator/src/Entity/Item.php
index 2a2c195ad..ef0c6d245 100644
--- a/web/core/modules/aggregator/src/Entity/Item.php
+++ b/web/core/modules/aggregator/src/Entity/Item.php
@@ -61,11 +61,11 @@ class Item extends ContentEntityBase implements ItemInterface {
       ->setRequired(TRUE)
       ->setDescription(t('The aggregator feed entity associated with this item.'))
       ->setSetting('target_type', 'aggregator_feed')
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'entity_reference_label',
         'weight' => 0,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['title'] = BaseFieldDefinition::create('string')
@@ -75,18 +75,18 @@ class Item extends ContentEntityBase implements ItemInterface {
     $fields['link'] = BaseFieldDefinition::create('uri')
       ->setLabel(t('Link'))
       ->setDescription(t('The link of the feed item.'))
-      ->setDisplayOptions('view', array(
-        'type' => 'hidden',
-      ))
+      ->setDisplayOptions('view', [
+        'region' => 'hidden',
+      ])
       ->setDisplayConfigurable('view', TRUE);
 
     $fields['author'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Author'))
       ->setDescription(t('The author of the feed item.'))
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'weight' => 3,
-      ))
+      ])
       ->setDisplayConfigurable('view', TRUE);
 
     $fields['description'] = BaseFieldDefinition::create('string_long')
@@ -96,11 +96,11 @@ class Item extends ContentEntityBase implements ItemInterface {
     $fields['timestamp'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Posted on'))
       ->setDescription(t('Posted date of the feed item, as a Unix timestamp.'))
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'timestamp_ago',
         'weight' => 1,
-      ))
+      ])
       ->setDisplayConfigurable('view', TRUE);
 
     // @todo Convert to a real UUID field in
diff --git a/web/core/modules/aggregator/src/FeedForm.php b/web/core/modules/aggregator/src/FeedForm.php
index 3447cc8c0..1580a307d 100644
--- a/web/core/modules/aggregator/src/FeedForm.php
+++ b/web/core/modules/aggregator/src/FeedForm.php
@@ -20,12 +20,12 @@ class FeedForm extends ContentEntityForm {
     $label = $feed->label();
     $view_link = $feed->link($label, 'canonical');
     if ($status == SAVED_UPDATED) {
-      drupal_set_message($this->t('The feed %feed has been updated.', array('%feed' => $view_link)));
+      drupal_set_message($this->t('The feed %feed has been updated.', ['%feed' => $view_link]));
       $form_state->setRedirectUrl($feed->urlInfo('canonical'));
     }
     else {
-      $this->logger('aggregator')->notice('Feed %feed added.', array('%feed' => $feed->label(), 'link' => $this->l($this->t('View'), new Url('aggregator.admin_overview'))));
-      drupal_set_message($this->t('The feed %feed has been added.', array('%feed' => $view_link)));
+      $this->logger('aggregator')->notice('Feed %feed added.', ['%feed' => $feed->label(), 'link' => $this->l($this->t('View'), new Url('aggregator.admin_overview'))]);
+      drupal_set_message($this->t('The feed %feed has been added.', ['%feed' => $view_link]));
     }
   }
 
diff --git a/web/core/modules/aggregator/src/FeedStorage.php b/web/core/modules/aggregator/src/FeedStorage.php
index 5085e6d35..ded353138 100644
--- a/web/core/modules/aggregator/src/FeedStorage.php
+++ b/web/core/modules/aggregator/src/FeedStorage.php
@@ -16,10 +16,10 @@ class FeedStorage extends SqlContentEntityStorage implements FeedStorageInterfac
    * {@inheritdoc}
    */
   public function getFeedIdsToRefresh() {
-    return $this->database->query('SELECT fid FROM {aggregator_feed} WHERE queued = 0 AND checked + refresh < :time AND refresh <> :never', array(
+    return $this->database->query('SELECT fid FROM {aggregator_feed} WHERE queued = 0 AND checked + refresh < :time AND refresh <> :never', [
       ':time' => REQUEST_TIME,
       ':never' => AGGREGATOR_CLEAR_NEVER,
-    ))->fetchCol();
+    ])->fetchCol();
   }
 
 }
diff --git a/web/core/modules/aggregator/src/FeedStorageInterface.php b/web/core/modules/aggregator/src/FeedStorageInterface.php
index f0318fd2c..cf30c6a33 100644
--- a/web/core/modules/aggregator/src/FeedStorageInterface.php
+++ b/web/core/modules/aggregator/src/FeedStorageInterface.php
@@ -9,6 +9,11 @@ use Drupal\Core\Entity\ContentEntityStorageInterface;
  */
 interface FeedStorageInterface extends ContentEntityStorageInterface {
 
+  /**
+   * Denotes that a feed's items should never expire.
+   */
+  const CLEAR_NEVER = 0;
+
   /**
    * Returns the fids of feeds that need to be refreshed.
    *
diff --git a/web/core/modules/aggregator/src/FeedStorageSchema.php b/web/core/modules/aggregator/src/FeedStorageSchema.php
index 151a1584d..b58c614fd 100644
--- a/web/core/modules/aggregator/src/FeedStorageSchema.php
+++ b/web/core/modules/aggregator/src/FeedStorageSchema.php
@@ -24,9 +24,6 @@ class FeedStorageSchema extends SqlContentEntityStorageSchema {
           break;
 
         case 'queued':
-          $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
-          break;
-
         case 'title':
           $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
           break;
diff --git a/web/core/modules/aggregator/src/FeedViewBuilder.php b/web/core/modules/aggregator/src/FeedViewBuilder.php
index 5ce69ffd8..1efaa3028 100644
--- a/web/core/modules/aggregator/src/FeedViewBuilder.php
+++ b/web/core/modules/aggregator/src/FeedViewBuilder.php
@@ -68,65 +68,65 @@ class FeedViewBuilder extends EntityViewBuilder {
 
         if ($view_mode == 'full') {
           // Also add the pager.
-          $build[$id]['pager'] = array('#type' => 'pager');
+          $build[$id]['pager'] = ['#type' => 'pager'];
         }
       }
 
       if ($display->getComponent('description')) {
-        $build[$id]['description'] = array(
+        $build[$id]['description'] = [
           '#markup' => $entity->getDescription(),
           '#allowed_tags' => _aggregator_allowed_tags(),
           '#prefix' => '<div class="feed-description">',
           '#suffix' => '</div>',
-        );
+        ];
       }
 
       if ($display->getComponent('image')) {
-        $image_link = array();
+        $image_link = [];
         // Render the image as link if it is available.
         $image = $entity->getImage();
         $label = $entity->label();
         $link_href = $entity->getWebsiteUrl();
         if ($image && $label && $link_href) {
-          $link_title = array(
+          $link_title = [
             '#theme' => 'image',
             '#uri' => $image,
             '#alt' => $label,
-          );
-          $image_link = array(
+          ];
+          $image_link = [
             '#type' => 'link',
             '#title' => $link_title,
             '#url' => Url::fromUri($link_href),
-            '#options' => array(
-              'attributes' => array('class' => array('feed-image')),
-            ),
-          );
+            '#options' => [
+              'attributes' => ['class' => ['feed-image']],
+            ],
+          ];
         }
         $build[$id]['image'] = $image_link;
       }
 
       if ($display->getComponent('feed_icon')) {
-        $build[$id]['feed_icon'] = array(
+        $build[$id]['feed_icon'] = [
           '#theme' => 'feed_icon',
           '#url' => $entity->getUrl(),
-          '#title' => t('@title feed', array('@title' => $entity->label())),
-        );
+          '#title' => t('@title feed', ['@title' => $entity->label()]),
+        ];
       }
 
       if ($display->getComponent('more_link')) {
         $title_stripped = strip_tags($entity->label());
-        $build[$id]['more_link'] = array(
+        $build[$id]['more_link'] = [
           '#type' => 'link',
-          '#title' => t('More<span class="visually-hidden"> posts about @title</span>', array(
+          '#title' => t('More<span class="visually-hidden"> posts about @title</span>', [
             '@title' => $title_stripped,
-          )),
+          ]),
           '#url' => Url::fromRoute('entity.aggregator_feed.canonical', ['aggregator_feed' => $entity->id()]),
-          '#options' => array(
-            'attributes' => array(
+          '#options' => [
+            'attributes' => [
               'title' => $title_stripped,
-            ),
-          ),
-        );
+            ],
+          ],
+        ];
       }
 
     }
diff --git a/web/core/modules/aggregator/src/Form/FeedDeleteForm.php b/web/core/modules/aggregator/src/Form/FeedDeleteForm.php
index bcf1a3273..17a179864 100644
--- a/web/core/modules/aggregator/src/Form/FeedDeleteForm.php
+++ b/web/core/modules/aggregator/src/Form/FeedDeleteForm.php
@@ -28,9 +28,9 @@ class FeedDeleteForm extends ContentEntityDeleteForm {
    * {@inheritdoc}
    */
   protected function getDeletionMessage() {
-    return $this->t('The feed %label has been deleted.', array(
+    return $this->t('The feed %label has been deleted.', [
       '%label' => $this->entity->label(),
-    ));
+    ]);
   }
 
 }
diff --git a/web/core/modules/aggregator/src/Form/FeedItemsDeleteForm.php b/web/core/modules/aggregator/src/Form/FeedItemsDeleteForm.php
index 1117359c0..48c83dc83 100644
--- a/web/core/modules/aggregator/src/Form/FeedItemsDeleteForm.php
+++ b/web/core/modules/aggregator/src/Form/FeedItemsDeleteForm.php
@@ -15,7 +15,7 @@ class FeedItemsDeleteForm extends ContentEntityConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete all items from the feed %feed?', array('%feed' => $this->entity->label()));
+    return $this->t('Are you sure you want to delete all items from the feed %feed?', ['%feed' => $this->entity->label()]);
   }
 
   /**
diff --git a/web/core/modules/aggregator/src/Form/OpmlFeedAdd.php b/web/core/modules/aggregator/src/Form/OpmlFeedAdd.php
index 0ba285a95..59e70d972 100644
--- a/web/core/modules/aggregator/src/Form/OpmlFeedAdd.php
+++ b/web/core/modules/aggregator/src/Form/OpmlFeedAdd.php
@@ -63,33 +63,33 @@ class OpmlFeedAdd extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $intervals = array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200);
-    $period = array_map(array(\Drupal::service('date.formatter'), 'formatInterval'), array_combine($intervals, $intervals));
+    $intervals = [900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200];
+    $period = array_map([\Drupal::service('date.formatter'), 'formatInterval'], array_combine($intervals, $intervals));
 
-    $form['upload'] = array(
+    $form['upload'] = [
       '#type' => 'file',
       '#title' => $this->t('OPML File'),
       '#description' => $this->t('Upload an OPML file containing a list of feeds to be imported.'),
-    );
-    $form['remote'] = array(
+    ];
+    $form['remote'] = [
       '#type' => 'url',
       '#title' => $this->t('OPML Remote URL'),
       '#maxlength' => 1024,
       '#description' => $this->t('Enter the URL of an OPML file. This file will be downloaded and processed only once on submission of the form.'),
-    );
-    $form['refresh'] = array(
+    ];
+    $form['refresh'] = [
       '#type' => 'select',
       '#title' => $this->t('Update interval'),
       '#default_value' => 3600,
       '#options' => $period,
-      '#description' => $this->t('The length of time between feed updates. Requires a correctly configured <a href=":cron">cron maintenance task</a>.', array(':cron' => $this->url('system.status'))),
-    );
+      '#description' => $this->t('The length of time between feed updates. Requires a correctly configured <a href=":cron">cron maintenance task</a>.', [':cron' => $this->url('system.status')]),
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Import'),
-    );
+    ];
 
     return $form;
   }
@@ -109,7 +109,7 @@ class OpmlFeedAdd extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $validators = array('file_validate_extensions' => array('opml xml'));
+    $validators = ['file_validate_extensions' => ['opml xml']];
     if ($file = file_save_upload('upload', $validators, FALSE, 0)) {
       $data = file_get_contents($file->getFileUri());
     }
@@ -120,8 +120,8 @@ class OpmlFeedAdd extends FormBase {
         $data = (string) $response->getBody();
       }
       catch (RequestException $e) {
-        $this->logger('aggregator')->warning('Failed to download OPML file due to "%error".', array('%error' => $e->getMessage()));
-        drupal_set_message($this->t('Failed to download OPML file due to "%error".', array('%error' => $e->getMessage())));
+        $this->logger('aggregator')->warning('Failed to download OPML file due to "%error".', ['%error' => $e->getMessage()]);
+        drupal_set_message($this->t('Failed to download OPML file due to "%error".', ['%error' => $e->getMessage()]));
         return;
       }
     }
@@ -136,7 +136,7 @@ class OpmlFeedAdd extends FormBase {
     foreach ($feeds as $feed) {
       // Ensure URL is valid.
       if (!UrlHelper::isValid($feed['url'], TRUE)) {
-        drupal_set_message($this->t('The URL %url is invalid.', array('%url' => $feed['url'])), 'warning');
+        drupal_set_message($this->t('The URL %url is invalid.', ['%url' => $feed['url']]), 'warning');
         continue;
       }
 
@@ -151,20 +151,20 @@ class OpmlFeedAdd extends FormBase {
       $result = $this->feedStorage->loadMultiple($ids);
       foreach ($result as $old) {
         if (strcasecmp($old->label(), $feed['title']) == 0) {
-          drupal_set_message($this->t('A feed named %title already exists.', array('%title' => $old->label())), 'warning');
+          drupal_set_message($this->t('A feed named %title already exists.', ['%title' => $old->label()]), 'warning');
           continue 2;
         }
         if (strcasecmp($old->getUrl(), $feed['url']) == 0) {
-          drupal_set_message($this->t('A feed with the URL %url already exists.', array('%url' => $old->getUrl())), 'warning');
+          drupal_set_message($this->t('A feed with the URL %url already exists.', ['%url' => $old->getUrl()]), 'warning');
           continue 2;
         }
       }
 
-      $new_feed = $this->feedStorage->create(array(
+      $new_feed = $this->feedStorage->create([
         'title' => $feed['title'],
         'url' => $feed['url'],
         'refresh' => $form_state->getValue('refresh'),
-      ));
+      ]);
       $new_feed->save();
     }
 
@@ -189,14 +189,15 @@ class OpmlFeedAdd extends FormBase {
    * @todo Move this to a parser in https://www.drupal.org/node/1963540.
    */
   protected function parseOpml($opml) {
-    $feeds = array();
-    $xml_parser = drupal_xml_parser_create($opml);
+    $feeds = [];
+    $xml_parser = xml_parser_create();
+    xml_parser_set_option($xml_parser, XML_OPTION_TARGET_ENCODING, 'utf-8');
     if (xml_parse_into_struct($xml_parser, $opml, $values)) {
       foreach ($values as $entry) {
         if ($entry['tag'] == 'OUTLINE' && isset($entry['attributes'])) {
           $item = $entry['attributes'];
           if (!empty($item['XMLURL']) && !empty($item['TEXT'])) {
-            $feeds[] = array('title' => $item['TEXT'], 'url' => $item['XMLURL']);
+            $feeds[] = ['title' => $item['TEXT'], 'url' => $item['XMLURL']];
           }
         }
       }
diff --git a/web/core/modules/aggregator/src/Form/SettingsForm.php b/web/core/modules/aggregator/src/Form/SettingsForm.php
index edd574189..48b2dfe87 100644
--- a/web/core/modules/aggregator/src/Form/SettingsForm.php
+++ b/web/core/modules/aggregator/src/Form/SettingsForm.php
@@ -21,25 +21,25 @@ class SettingsForm extends ConfigFormBase {
    *
    * @var \Drupal\aggregator\Plugin\AggregatorPluginManager[]
    */
-  protected $managers = array();
+  protected $managers = [];
 
   /**
    * The instantiated plugin instances that have configuration forms.
    *
    * @var \Drupal\Core\Plugin\PluginFormInterface[]
    */
-  protected $configurableInstances = array();
+  protected $configurableInstances = [];
 
   /**
    * The aggregator plugin definitions.
    *
    * @var array
    */
-  protected $definitions = array(
-    'fetcher' => array(),
-    'parser' => array(),
-    'processor' => array(),
-  );
+  protected $definitions = [
+    'fetcher' => [],
+    'parser' => [],
+    'processor' => [],
+  ];
 
   /**
    * Constructs a \Drupal\aggregator\SettingsForm object.
@@ -58,15 +58,15 @@ class SettingsForm extends ConfigFormBase {
   public function __construct(ConfigFactoryInterface $config_factory, AggregatorPluginManager $fetcher_manager, AggregatorPluginManager $parser_manager, AggregatorPluginManager $processor_manager, TranslationInterface $string_translation) {
     parent::__construct($config_factory);
     $this->stringTranslation = $string_translation;
-    $this->managers = array(
+    $this->managers = [
       'fetcher' => $fetcher_manager,
       'parser' => $parser_manager,
       'processor' => $processor_manager,
-    );
+    ];
     // Get all available fetcher, parser and processor definitions.
-    foreach (array('fetcher', 'parser', 'processor') as $type) {
+    foreach (['fetcher', 'parser', 'processor'] as $type) {
       foreach ($this->managers[$type]->getDefinitions() as $id => $definition) {
-        $this->definitions[$type][$id] = SafeMarkup::format('@title <span class="description">@description</span>', array('@title' => $definition['title'], '@description' => $definition['description']));
+        $this->definitions[$type][$id] = SafeMarkup::format('@title <span class="description">@description</span>', ['@title' => $definition['title'], '@description' => $definition['description']]);
       }
     }
   }
@@ -105,56 +105,56 @@ class SettingsForm extends ConfigFormBase {
     $config = $this->config('aggregator.settings');
 
     // Global aggregator settings.
-    $form['aggregator_allowed_html_tags'] = array(
+    $form['aggregator_allowed_html_tags'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Allowed HTML tags'),
       '#size' => 80,
       '#maxlength' => 255,
       '#default_value' => $config->get('items.allowed_html'),
       '#description' => $this->t('A space-separated list of HTML tags allowed in the content of feed items. Disallowed tags are stripped from the content.'),
-    );
+    ];
 
     // Only show basic configuration if there are actually options.
-    $basic_conf = array();
+    $basic_conf = [];
     if (count($this->definitions['fetcher']) > 1) {
-      $basic_conf['aggregator_fetcher'] = array(
+      $basic_conf['aggregator_fetcher'] = [
         '#type' => 'radios',
         '#title' => $this->t('Fetcher'),
         '#description' => $this->t('Fetchers download data from an external source. Choose a fetcher suitable for the external source you would like to download from.'),
         '#options' => $this->definitions['fetcher'],
         '#default_value' => $config->get('fetcher'),
-      );
+      ];
     }
     if (count($this->definitions['parser']) > 1) {
-      $basic_conf['aggregator_parser'] = array(
+      $basic_conf['aggregator_parser'] = [
         '#type' => 'radios',
         '#title' => $this->t('Parser'),
         '#description' => $this->t('Parsers transform downloaded data into standard structures. Choose a parser suitable for the type of feeds you would like to aggregate.'),
         '#options' => $this->definitions['parser'],
         '#default_value' => $config->get('parser'),
-      );
+      ];
     }
     if (count($this->definitions['processor']) > 1) {
-      $basic_conf['aggregator_processors'] = array(
+      $basic_conf['aggregator_processors'] = [
         '#type' => 'checkboxes',
         '#title' => $this->t('Processors'),
         '#description' => $this->t('Processors act on parsed feed data, for example they store feed items. Choose the processors suitable for your task.'),
         '#options' => $this->definitions['processor'],
         '#default_value' => $config->get('processors'),
-      );
+      ];
     }
     if (count($basic_conf)) {
-      $form['basic_conf'] = array(
+      $form['basic_conf'] = [
         '#type' => 'details',
         '#title' => $this->t('Basic configuration'),
         '#description' => $this->t('For most aggregation tasks, the default settings are fine.'),
         '#open' => TRUE,
-      );
+      ];
       $form['basic_conf'] += $basic_conf;
     }
 
     // Call buildConfigurationForm() on the active fetcher and parser.
-    foreach (array('fetcher', 'parser') as $type) {
+    foreach (['fetcher', 'parser'] as $type) {
       $active = $config->get($type);
       if (array_key_exists($active, $this->definitions[$type])) {
         $instance = $this->managers[$type]->createInstance($active);
@@ -169,7 +169,7 @@ class SettingsForm extends ConfigFormBase {
     }
 
     // Implementing processor plugins will expect an array at $form['processors'].
-    $form['processors'] = array();
+    $form['processors'] = [];
     // Call buildConfigurationForm() for each active processor.
     foreach ($this->definitions['processor'] as $id => $definition) {
       if (in_array($id, $config->get('processors'))) {
diff --git a/web/core/modules/aggregator/src/ItemViewBuilder.php b/web/core/modules/aggregator/src/ItemViewBuilder.php
index feb0ffafb..feb35b583 100644
--- a/web/core/modules/aggregator/src/ItemViewBuilder.php
+++ b/web/core/modules/aggregator/src/ItemViewBuilder.php
@@ -20,12 +20,12 @@ class ItemViewBuilder extends EntityViewBuilder {
       $display = $displays[$bundle];
 
       if ($display->getComponent('description')) {
-        $build[$id]['description'] = array(
+        $build[$id]['description'] = [
           '#markup' => $entity->getDescription(),
           '#allowed_tags' => _aggregator_allowed_tags(),
           '#prefix' => '<div class="item-description">',
           '#suffix' => '</div>',
-        );
+        ];
       }
     }
   }
diff --git a/web/core/modules/aggregator/src/ItemsImporter.php b/web/core/modules/aggregator/src/ItemsImporter.php
index df0256408..aa18d65c9 100644
--- a/web/core/modules/aggregator/src/ItemsImporter.php
+++ b/web/core/modules/aggregator/src/ItemsImporter.php
@@ -95,7 +95,7 @@ class ItemsImporter implements ItemsImporterInterface {
     }
 
     // Store instances in an array so we dont have to instantiate new objects.
-    $processor_instances = array();
+    $processor_instances = [];
     foreach ($this->config->get('processors') as $processor) {
       try {
         $processor_instances[$processor] = $this->processorManager->createInstance($processor);
@@ -124,10 +124,10 @@ class ItemsImporter implements ItemsImporterInterface {
 
           // Log if feed URL has changed.
           if ($feed->getUrl() != $feed_url) {
-            $this->logger->notice('Updated URL for feed %title to %url.', array('%title' => $feed->label(), '%url' => $feed->getUrl()));
+            $this->logger->notice('Updated URL for feed %title to %url.', ['%title' => $feed->label(), '%url' => $feed->getUrl()]);
           }
 
-          $this->logger->notice('There is new syndicated content from %site.', array('%site' => $feed->label()));
+          $this->logger->notice('There is new syndicated content from %site.', ['%site' => $feed->label()]);
 
           // If there are items on the feed, let enabled processors process them.
           if (!empty($feed->items)) {
diff --git a/web/core/modules/aggregator/src/Plugin/AggregatorPluginManager.php b/web/core/modules/aggregator/src/Plugin/AggregatorPluginManager.php
index cd8a6e3e1..731098798 100644
--- a/web/core/modules/aggregator/src/Plugin/AggregatorPluginManager.php
+++ b/web/core/modules/aggregator/src/Plugin/AggregatorPluginManager.php
@@ -34,16 +34,16 @@ class AggregatorPluginManager extends DefaultPluginManager {
    *   The module handler.
    */
   public function __construct($type, \Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    $type_annotations = array(
+    $type_annotations = [
       'fetcher' => 'Drupal\aggregator\Annotation\AggregatorFetcher',
       'parser' => 'Drupal\aggregator\Annotation\AggregatorParser',
       'processor' => 'Drupal\aggregator\Annotation\AggregatorProcessor',
-    );
-    $plugin_interfaces = array(
+    ];
+    $plugin_interfaces = [
       'fetcher' => 'Drupal\aggregator\Plugin\FetcherInterface',
       'parser' => 'Drupal\aggregator\Plugin\ParserInterface',
       'processor' => 'Drupal\aggregator\Plugin\ProcessorInterface',
-    );
+    ];
 
     parent::__construct("Plugin/aggregator/$type", $namespaces, $module_handler, $plugin_interfaces[$type], $type_annotations[$type]);
     $this->setCacheBackend($cache_backend, 'aggregator_' . $type . '_plugins');
diff --git a/web/core/modules/aggregator/src/Plugin/AggregatorPluginSettingsBase.php b/web/core/modules/aggregator/src/Plugin/AggregatorPluginSettingsBase.php
index bc59ec5eb..403e6a349 100644
--- a/web/core/modules/aggregator/src/Plugin/AggregatorPluginSettingsBase.php
+++ b/web/core/modules/aggregator/src/Plugin/AggregatorPluginSettingsBase.php
@@ -25,7 +25,7 @@ abstract class AggregatorPluginSettingsBase extends PluginBase implements Plugin
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array();
+    return [];
   }
 
   /**
@@ -38,7 +38,7 @@ abstract class AggregatorPluginSettingsBase extends PluginBase implements Plugin
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php b/web/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
index 7380e1dae..90d8f669d 100644
--- a/web/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
+++ b/web/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
@@ -7,7 +7,6 @@ use Drupal\aggregator\ItemStorageInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -38,13 +37,6 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt
    */
   protected $itemStorage;
 
-  /**
-   * The entity query object for feed items.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryInterface
-   */
-  protected $itemQuery;
-
   /**
    * Constructs an AggregatorFeedBlock object.
    *
@@ -58,14 +50,11 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt
    *   The entity storage for feeds.
    * @param \Drupal\aggregator\ItemStorageInterface $item_storage
    *   The entity storage for feed items.
-   * @param \Drupal\Core\Entity\Query\QueryInterface $item_query
-   *   The entity query object for feed items.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, FeedStorageInterface $feed_storage, ItemStorageInterface $item_storage, QueryInterface $item_query) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, FeedStorageInterface $feed_storage, ItemStorageInterface $item_storage) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->feedStorage = $feed_storage;
     $this->itemStorage = $item_storage;
-    $this->itemQuery = $item_query;
   }
 
 
@@ -77,9 +66,8 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('entity.manager')->getStorage('aggregator_feed'),
-      $container->get('entity.manager')->getStorage('aggregator_item'),
-      $container->get('entity.query')->get('aggregator_item')
+      $container->get('entity_type.manager')->getStorage('aggregator_feed'),
+      $container->get('entity_type.manager')->getStorage('aggregator_item')
     );
   }
 
@@ -89,10 +77,10 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt
    */
   public function defaultConfiguration() {
     // By default, the block will contain 10 feed items.
-    return array(
+    return [
       'block_count' => 10,
       'feed' => NULL,
-    );
+    ];
   }
 
   /**
@@ -108,23 +96,23 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt
    */
   public function blockForm($form, FormStateInterface $form_state) {
     $feeds = $this->feedStorage->loadMultiple();
-    $options = array();
+    $options = [];
     foreach ($feeds as $feed) {
       $options[$feed->id()] = $feed->label();
     }
-    $form['feed'] = array(
+    $form['feed'] = [
       '#type' => 'select',
       '#title' => $this->t('Select the feed that should be displayed'),
       '#default_value' => $this->configuration['feed'],
       '#options' => $options,
-    );
+    ];
     $range = range(2, 20);
-    $form['block_count'] = array(
+    $form['block_count'] = [
       '#type' => 'select',
       '#title' => $this->t('Number of news items in block'),
       '#default_value' => $this->configuration['block_count'],
       '#options' => array_combine($range, $range),
-    );
+    ];
     return $form;
   }
 
@@ -142,7 +130,7 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt
   public function build() {
     // Load the selected feed.
     if ($feed = $this->feedStorage->load($this->configuration['feed'])) {
-      $result = $this->itemQuery
+      $result = $this->itemStorage->getQuery()
         ->condition('fid', $feed->id())
         ->range(0, $this->configuration['block_count'])
         ->sort('timestamp', 'DESC')
diff --git a/web/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php b/web/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php
index 99ec48d9c..91c7ac36e 100644
--- a/web/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php
+++ b/web/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php
@@ -112,8 +112,8 @@ class DefaultFetcher implements FetcherInterface, ContainerFactoryPluginInterfac
       return TRUE;
     }
     catch (RequestException $e) {
-      $this->logger->warning('The feed from %site seems to be broken because of error "%error".', array('%site' => $feed->label(), '%error' => $e->getMessage()));
-      drupal_set_message(t('The feed from %site seems to be broken because of error "%error".', array('%site' => $feed->label(), '%error' => $e->getMessage())), 'warning');
+      $this->logger->warning('The feed from %site seems to be broken because of error "%error".', ['%site' => $feed->label(), '%error' => $e->getMessage()]);
+      drupal_set_message(t('The feed from %site seems to be broken because of error "%error".', ['%site' => $feed->label(), '%error' => $e->getMessage()]), 'warning');
       return FALSE;
     }
   }
diff --git a/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php b/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php
index 2fb36823d..03fa55f01 100644
--- a/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php
+++ b/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php
@@ -31,7 +31,7 @@ class DefaultParser implements ParserInterface {
     }
     catch (ExceptionInterface $e) {
       watchdog_exception('aggregator', $e);
-      drupal_set_message(t('The feed from %site seems to be broken because of error "%error".', array('%site' => $feed->label(), '%error' => $e->getMessage())), 'error');
+      drupal_set_message(t('The feed from %site seems to be broken because of error "%error".', ['%site' => $feed->label(), '%error' => $e->getMessage()]), 'error');
 
       return FALSE;
     }
@@ -42,10 +42,10 @@ class DefaultParser implements ParserInterface {
       $feed->setImage($image['uri']);
     }
     // Initialize items array.
-    $feed->items = array();
+    $feed->items = [];
     foreach ($channel as $item) {
       // Reset the parsed item.
-      $parsed_item = array();
+      $parsed_item = [];
       // Move the values to an array as expected by processors.
       $parsed_item['title'] = $item->getTitle();
       $parsed_item['guid'] = $item->getId();
diff --git a/web/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php b/web/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php
index 7f6754d0d..525ef34f1 100644
--- a/web/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php
+++ b/web/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php
@@ -10,7 +10,6 @@ use Drupal\aggregator\FeedInterface;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Datetime\DateFormatterInterface;
-use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\Core\Form\ConfigFormBaseTrait;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
@@ -39,13 +38,6 @@ class DefaultProcessor extends AggregatorPluginSettingsBase implements Processor
    */
   protected $configFactory;
 
-  /**
-   * The entity query object for feed items.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryInterface
-   */
-  protected $itemQuery;
-
   /**
    * The entity storage for items.
    *
@@ -71,17 +63,14 @@ class DefaultProcessor extends AggregatorPluginSettingsBase implements Processor
    *   The plugin implementation definition.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config
    *   The configuration factory object.
-   * @param \Drupal\Core\Entity\Query\QueryInterface $item_query
-   *   The entity query object for feed items.
    * @param \Drupal\aggregator\ItemStorageInterface $item_storage
    *   The entity storage for feed items.
    * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
    *   The date formatter service.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config, QueryInterface $item_query, ItemStorageInterface $item_storage, DateFormatterInterface $date_formatter) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config, ItemStorageInterface $item_storage, DateFormatterInterface $date_formatter) {
     $this->configFactory = $config;
     $this->itemStorage = $item_storage;
-    $this->itemQuery = $item_query;
     $this->dateFormatter = $date_formatter;
     // @todo Refactor aggregator plugins to ConfigEntity so merging
     //   the configuration here is not needed.
@@ -97,8 +86,7 @@ class DefaultProcessor extends AggregatorPluginSettingsBase implements Processor
       $plugin_id,
       $plugin_definition,
       $container->get('config.factory'),
-      $container->get('entity.query')->get('aggregator_item'),
-      $container->get('entity.manager')->getStorage('aggregator_item'),
+      $container->get('entity_type.manager')->getStorage('aggregator_item'),
       $container->get('date.formatter')
     );
   }
@@ -117,53 +105,53 @@ class DefaultProcessor extends AggregatorPluginSettingsBase implements Processor
     $config = $this->config('aggregator.settings');
     $processors = $config->get('processors');
     $info = $this->getPluginDefinition();
-    $counts = array(3, 5, 10, 15, 20, 25);
+    $counts = [3, 5, 10, 15, 20, 25];
     $items = array_map(function ($count) {
       return $this->formatPlural($count, '1 item', '@count items');
     }, array_combine($counts, $counts));
-    $intervals = array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800);
-    $period = array_map(array($this->dateFormatter, 'formatInterval'), array_combine($intervals, $intervals));
+    $intervals = [3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800];
+    $period = array_map([$this->dateFormatter, 'formatInterval'], array_combine($intervals, $intervals));
     $period[AGGREGATOR_CLEAR_NEVER] = t('Never');
 
-    $form['processors'][$info['id']] = array();
+    $form['processors'][$info['id']] = [];
     // Only wrap into details if there is a basic configuration.
     if (isset($form['basic_conf'])) {
-      $form['processors'][$info['id']] = array(
+      $form['processors'][$info['id']] = [
         '#type' => 'details',
         '#title' => t('Default processor settings'),
         '#description' => $info['description'],
         '#open' => in_array($info['id'], $processors),
-      );
+      ];
     }
 
-    $form['processors'][$info['id']]['aggregator_summary_items'] = array(
+    $form['processors'][$info['id']]['aggregator_summary_items'] = [
       '#type' => 'select',
       '#title' => t('Number of items shown in listing pages'),
       '#default_value' => $config->get('source.list_max'),
       '#empty_value' => 0,
       '#options' => $items,
-    );
+    ];
 
-    $form['processors'][$info['id']]['aggregator_clear'] = array(
+    $form['processors'][$info['id']]['aggregator_clear'] = [
       '#type' => 'select',
       '#title' => t('Discard items older than'),
       '#default_value' => $config->get('items.expire'),
       '#options' => $period,
-      '#description' => t('Requires a correctly configured <a href=":cron">cron maintenance task</a>.', array(':cron' => $this->url('system.status'))),
-    );
+      '#description' => t('Requires a correctly configured <a href=":cron">cron maintenance task</a>.', [':cron' => $this->url('system.status')]),
+    ];
 
-    $lengths = array(0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000);
+    $lengths = [0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000];
     $options = array_map(function($length) {
       return ($length == 0) ? t('Unlimited') : $this->formatPlural($length, '1 character', '@count characters');
     }, array_combine($lengths, $lengths));
 
-    $form['processors'][$info['id']]['aggregator_teaser_length'] = array(
+    $form['processors'][$info['id']]['aggregator_teaser_length'] = [
       '#type' => 'select',
       '#title' => t('Length of trimmed description'),
       '#default_value' => $config->get('items.teaser_length'),
       '#options' => $options,
       '#description' => t('The maximum number of characters used in the trimmed version of content.'),
-    );
+    ];
     return $form;
   }
 
@@ -197,13 +185,13 @@ class DefaultProcessor extends AggregatorPluginSettingsBase implements Processor
       // we find a duplicate entry, we resolve it and pass along its ID is such
       // that we can update it if needed.
       if (!empty($item['guid'])) {
-        $values = array('fid' => $feed->id(), 'guid' => $item['guid']);
+        $values = ['fid' => $feed->id(), 'guid' => $item['guid']];
       }
       elseif ($item['link'] && $item['link'] != $feed->link && $item['link'] != $feed->url) {
-        $values = array('fid' => $feed->id(), 'link' => $item['link']);
+        $values = ['fid' => $feed->id(), 'link' => $item['link']];
       }
       else {
-        $values = array('fid' => $feed->id(), 'title' => $item['title']);
+        $values = ['fid' => $feed->id(), 'title' => $item['title']];
       }
 
       // Try to load an existing entry.
@@ -211,7 +199,7 @@ class DefaultProcessor extends AggregatorPluginSettingsBase implements Processor
         $entry = reset($entry);
       }
       else {
-        $entry = Item::create(array('langcode' => $feed->language()->getId()));
+        $entry = Item::create(['langcode' => $feed->language()->getId()]);
       }
       if ($item['timestamp']) {
         $entry->setPostedTime($item['timestamp']);
@@ -243,7 +231,7 @@ class DefaultProcessor extends AggregatorPluginSettingsBase implements Processor
       $this->itemStorage->delete($items);
     }
     // @todo This should be moved out to caller with a different message maybe.
-    drupal_set_message(t('The news items from %site have been deleted.', array('%site' => $feed->label())));
+    drupal_set_message(t('The news items from %site have been deleted.', ['%site' => $feed->label()]));
   }
 
   /**
@@ -257,7 +245,7 @@ class DefaultProcessor extends AggregatorPluginSettingsBase implements Processor
     if ($aggregator_clear != AGGREGATOR_CLEAR_NEVER) {
       // Delete all items that are older than flush item timer.
       $age = REQUEST_TIME - $aggregator_clear;
-      $result = $this->itemQuery
+      $result = $this->itemStorage->getQuery()
         ->condition('fid', $feed->id())
         ->condition('timestamp', $age, '<')
         ->execute();
diff --git a/web/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php b/web/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php
index e623e5fd0..59244d4e4 100644
--- a/web/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php
+++ b/web/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php
@@ -26,7 +26,7 @@ class AggregatorFeed extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    $fields = array(
+    $fields = [
       'fid' => $this->t('The feed ID.'),
       'title' => $this->t('Title of the feed.'),
       'url' => $this->t('URL to the feed.'),
@@ -38,7 +38,7 @@ class AggregatorFeed extends DrupalSqlBase {
       'etag' => $this->t('Entity tag HTTP response header.'),
       'modified' => $this->t('When the feed was last modified.'),
       'block' => $this->t("Number of items to display in the feed's block."),
-    );
+    ];
     if ($this->getModuleSchemaVersion('system') >= 7000) {
       $fields['queued'] = $this->t('Time when this feed was queued for refresh, 0 if not queued.');
     }
diff --git a/web/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php b/web/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php
index fc1c5c6c7..428c558ea 100644
--- a/web/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php
+++ b/web/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php
@@ -27,7 +27,7 @@ class AggregatorItem extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'iid' => $this->t('Primary Key: Unique ID for feed item.'),
       'fid' => $this->t('The {aggregator_feed}.fid to which this item belongs.'),
       'title' => $this->t('Title of the feed item.'),
@@ -36,7 +36,7 @@ class AggregatorItem extends DrupalSqlBase {
       'description' => $this->t('Body of the feed item.'),
       'timestamp' => $this->t('Post date of feed item, as a Unix timestamp.'),
       'guid' => $this->t('Unique identifier for the feed item.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/aggregator/src/Plugin/views/argument/Fid.php b/web/core/modules/aggregator/src/Plugin/views/argument/Fid.php
index bb912e1ce..90564d5bb 100644
--- a/web/core/modules/aggregator/src/Plugin/views/argument/Fid.php
+++ b/web/core/modules/aggregator/src/Plugin/views/argument/Fid.php
@@ -50,7 +50,7 @@ class Fid extends NumericArgument {
    * {@inheritdoc}
    */
   public function titleQuery() {
-    $titles = array();
+    $titles = [];
 
     $feeds = $this->entityManager->getStorage('aggregator_feed')->loadMultiple($this->value);
     foreach ($feeds as $feed) {
diff --git a/web/core/modules/aggregator/src/Plugin/views/argument/Iid.php b/web/core/modules/aggregator/src/Plugin/views/argument/Iid.php
index 9468c9868..44b456977 100644
--- a/web/core/modules/aggregator/src/Plugin/views/argument/Iid.php
+++ b/web/core/modules/aggregator/src/Plugin/views/argument/Iid.php
@@ -50,7 +50,7 @@ class Iid extends NumericArgument {
    * {@inheritdoc}
    */
   public function titleQuery() {
-    $titles = array();
+    $titles = [];
 
     $items = $this->entityManager->getStorage('aggregator_item')->loadMultiple($this->value);
     foreach ($items as $feed) {
diff --git a/web/core/modules/aggregator/src/Plugin/views/row/Rss.php b/web/core/modules/aggregator/src/Plugin/views/row/Rss.php
index ef4646649..464a28592 100644
--- a/web/core/modules/aggregator/src/Plugin/views/row/Rss.php
+++ b/web/core/modules/aggregator/src/Plugin/views/row/Rss.php
@@ -48,31 +48,31 @@ class Rss extends RssPluginBase {
       $item->{$name} = $field->value;
     }
 
-    $item->elements = array(
-      array(
+    $item->elements = [
+      [
         'key' => 'pubDate',
         // views_view_row_rss takes care about the escaping.
         'value' => gmdate('r', $entity->timestamp->value),
-      ),
-      array(
+      ],
+      [
         'key' => 'dc:creator',
         // views_view_row_rss takes care about the escaping.
         'value' => $entity->author->value,
-      ),
-      array(
+      ],
+      [
         'key' => 'guid',
         // views_view_row_rss takes care about the escaping.
         'value' => $entity->guid->value,
-        'attributes' => array('isPermaLink' => 'false'),
-      ),
-    );
+        'attributes' => ['isPermaLink' => 'false'],
+      ],
+    ];
 
-    $build = array(
+    $build = [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#row' => $item,
-    );
+    ];
     return $build;
   }
 
diff --git a/web/core/modules/aggregator/src/Tests/AddFeedTest.php b/web/core/modules/aggregator/src/Tests/AddFeedTest.php
index b7ffe5fbc..4dfeb9557 100644
--- a/web/core/modules/aggregator/src/Tests/AddFeedTest.php
+++ b/web/core/modules/aggregator/src/Tests/AddFeedTest.php
@@ -39,8 +39,8 @@ class AddFeedTest extends AggregatorTestBase {
       'refresh' => '900',
     ];
     $this->drupalPostForm('aggregator/sources/add', $edit, t('Save'));
-    $this->assertRaw(t('A feed named %feed already exists. Enter a unique title.', array('%feed' => $feed->label())));
-    $this->assertRaw(t('A feed with this URL %url already exists. Enter a unique URL.', array('%url' => $feed->getUrl())));
+    $this->assertRaw(t('A feed named %feed already exists. Enter a unique title.', ['%feed' => $feed->label()]));
+    $this->assertRaw(t('A feed with this URL %url already exists. Enter a unique URL.', ['%url' => $feed->getUrl()]));
 
     // Delete feed.
     $this->deleteFeed($feed);
diff --git a/web/core/modules/aggregator/src/Tests/AggregatorAdminTest.php b/web/core/modules/aggregator/src/Tests/AggregatorAdminTest.php
index 487e0ef92..01898b6cf 100644
--- a/web/core/modules/aggregator/src/Tests/AggregatorAdminTest.php
+++ b/web/core/modules/aggregator/src/Tests/AggregatorAdminTest.php
@@ -22,7 +22,7 @@ class AggregatorAdminTest extends AggregatorTestBase {
     $this->assertText('Test processor');
 
     // Set new values and enable test plugins.
-    $edit = array(
+    $edit = [
       'aggregator_allowed_html_tags' => '<a>',
       'aggregator_summary_items' => 10,
       'aggregator_clear' => 3600,
@@ -30,27 +30,27 @@ class AggregatorAdminTest extends AggregatorTestBase {
       'aggregator_fetcher' => 'aggregator_test_fetcher',
       'aggregator_parser' => 'aggregator_test_parser',
       'aggregator_processors[aggregator_test_processor]' => 'aggregator_test_processor',
-    );
+    ];
     $this->drupalPostForm('admin/config/services/aggregator/settings', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));
 
     foreach ($edit as $name => $value) {
-      $this->assertFieldByName($name, $value, format_string('"@name" has correct default value.', array('@name' => $name)));
+      $this->assertFieldByName($name, $value, format_string('"@name" has correct default value.', ['@name' => $name]));
     }
 
     // Check for our test processor settings form.
     $this->assertText(t('Dummy length setting'));
     // Change its value to ensure that settingsSubmit is called.
-    $edit = array(
+    $edit = [
       'dummy_length' => 100,
-    );
+    ];
     $this->drupalPostForm('admin/config/services/aggregator/settings', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));
     $this->assertFieldByName('dummy_length', 100, '"dummy_length" has correct default value.');
 
     // Make sure settings form is still accessible even after uninstalling a module
     // that provides the selected plugins.
-    $this->container->get('module_installer')->uninstall(array('aggregator_test'));
+    $this->container->get('module_installer')->uninstall(['aggregator_test']);
     $this->resetAll();
     $this->drupalGet('admin/config/services/aggregator/settings');
     $this->assertResponse(200);
@@ -59,7 +59,7 @@ class AggregatorAdminTest extends AggregatorTestBase {
   /**
    * Tests the overview page.
    */
-  function testOverviewPage() {
+  public function testOverviewPage() {
     $feed = $this->createFeed($this->getRSS091Sample());
     $this->drupalGet('admin/config/services/aggregator');
 
diff --git a/web/core/modules/aggregator/src/Tests/AggregatorCronTest.php b/web/core/modules/aggregator/src/Tests/AggregatorCronTest.php
index 34a4cb930..9ebb2d25c 100644
--- a/web/core/modules/aggregator/src/Tests/AggregatorCronTest.php
+++ b/web/core/modules/aggregator/src/Tests/AggregatorCronTest.php
@@ -16,30 +16,30 @@ class AggregatorCronTest extends AggregatorTestBase {
     $this->createSampleNodes();
     $feed = $this->createFeed();
     $this->cronRun();
-    $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField());
+    $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField());
     $this->deleteFeedItems($feed);
-    $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField());
+    $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField());
     $this->cronRun();
-    $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField());
+    $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField());
 
     // Test feed locking when queued for update.
     $this->deleteFeedItems($feed);
     db_update('aggregator_feed')
       ->condition('fid', $feed->id())
-      ->fields(array(
+      ->fields([
         'queued' => REQUEST_TIME,
-      ))
+      ])
       ->execute();
     $this->cronRun();
-    $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField());
+    $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField());
     db_update('aggregator_feed')
       ->condition('fid', $feed->id())
-      ->fields(array(
+      ->fields([
         'queued' => 0,
-      ))
+      ])
       ->execute();
     $this->cronRun();
-    $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField());
+    $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField());
   }
 
 }
diff --git a/web/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php b/web/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
index 888f1da56..de7e40105 100644
--- a/web/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
+++ b/web/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php
@@ -17,7 +17,7 @@ class AggregatorRenderingTest extends AggregatorTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'test_page_test');
+  public static $modules = ['block', 'test_page_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -35,15 +35,15 @@ class AggregatorRenderingTest extends AggregatorTestBase {
     $this->updateFeedItems($feed, $this->getDefaultFeedItemCount());
 
     // Need admin user to be able to access block admin.
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'administer blocks',
       'access administration pages',
       'administer news feeds',
       'access news feeds',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
 
-    $block = $this->drupalPlaceBlock("aggregator_feed_block", array('label' => 'feed-' . $feed->label()));
+    $block = $this->drupalPlaceBlock("aggregator_feed_block", ['label' => 'feed-' . $feed->label()]);
 
     // Configure the feed that should be displayed.
     $block->getPlugin()->setConfigurationValue('feed', $feed->id());
@@ -56,20 +56,20 @@ class AggregatorRenderingTest extends AggregatorTestBase {
 
     // Confirm items appear as links.
     $items = $this->container->get('entity.manager')->getStorage('aggregator_item')->loadByFeed($feed->id(), 1);
-    $links = $this->xpath('//a[@href = :href]', array(':href' => reset($items)->getLink()));
+    $links = $this->xpath('//a[@href = :href]', [':href' => reset($items)->getLink()]);
     $this->assert(isset($links[0]), 'Item link found.');
 
     // Find the expected read_more link.
     $href = $feed->url();
-    $links = $this->xpath('//a[@href = :href]', array(':href' => $href));
-    $this->assert(isset($links[0]), format_string('Link to href %href found.', array('%href' => $href)));
+    $links = $this->xpath('//a[@href = :href]', [':href' => $href]);
+    $this->assert(isset($links[0]), format_string('Link to href %href found.', ['%href' => $href]));
     $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
     $cache_tags = explode(' ', $cache_tags_header);
     $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags));
 
     // Visit that page.
     $this->drupalGet($feed->urlInfo()->getInternalPath());
-    $correct_titles = $this->xpath('//h1[normalize-space(text())=:title]', array(':title' => $feed->label()));
+    $correct_titles = $this->xpath('//h1[normalize-space(text())=:title]', [':title' => $feed->label()]);
     $this->assertFalse(empty($correct_titles), 'Aggregator feed page is available and has the correct title.');
     $cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags'));
     $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags));
@@ -103,18 +103,18 @@ class AggregatorRenderingTest extends AggregatorTestBase {
 
     // Check for presence of an aggregator pager.
     $this->drupalGet('aggregator');
-    $elements = $this->xpath("//ul[contains(@class, :class)]", array(':class' => 'pager__items'));
+    $elements = $this->xpath("//ul[contains(@class, :class)]", [':class' => 'pager__items']);
     $this->assertTrue(!empty($elements), 'Individual source page contains a pager.');
 
     // Check for sources page title.
     $this->drupalGet('aggregator/sources');
-    $titles = $this->xpath('//h1[normalize-space(text())=:title]', array(':title' => 'Sources'));
+    $titles = $this->xpath('//h1[normalize-space(text())=:title]', [':title' => 'Sources']);
     $this->assertTrue(!empty($titles), 'Source page contains correct title.');
 
     // Find the expected read_more link on the sources page.
     $href = $feed->url();
-    $links = $this->xpath('//a[@href = :href]', array(':href' => $href));
-    $this->assertTrue(isset($links[0]), SafeMarkup::format('Link to href %href found.', array('%href' => $href)));
+    $links = $this->xpath('//a[@href = :href]', [':href' => $href]);
+    $this->assertTrue(isset($links[0]), SafeMarkup::format('Link to href %href found.', ['%href' => $href]));
     $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
     $cache_tags = explode(' ', $cache_tags_header);
     $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags));
@@ -139,7 +139,7 @@ class AggregatorRenderingTest extends AggregatorTestBase {
 
     // Check for the presence of a pager.
     $this->drupalGet('aggregator/sources/' . $feed->id());
-    $elements = $this->xpath("//ul[contains(@class, :class)]", array(':class' => 'pager__items'));
+    $elements = $this->xpath("//ul[contains(@class, :class)]", [':class' => 'pager__items']);
     $this->assertTrue(!empty($elements), 'Individual source page contains a pager.');
     $cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags'));
     $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags));
diff --git a/web/core/modules/aggregator/src/Tests/AggregatorTestBase.php b/web/core/modules/aggregator/src/Tests/AggregatorTestBase.php
index 15be1448b..f42248975 100644
--- a/web/core/modules/aggregator/src/Tests/AggregatorTestBase.php
+++ b/web/core/modules/aggregator/src/Tests/AggregatorTestBase.php
@@ -9,6 +9,9 @@ use Drupal\aggregator\FeedInterface;
 
 /**
  * Defines a base class for testing the Aggregator module.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\aggregator\Functional\AggregatorTestBase instead.
  */
 abstract class AggregatorTestBase extends WebTestBase {
 
@@ -34,10 +37,10 @@ abstract class AggregatorTestBase extends WebTestBase {
 
     // Create an Article node type.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
     }
 
-    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'administer news feeds', 'access news feeds', 'create article content'));
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer news feeds', 'access news feeds', 'create article content']);
     $this->drupalLogin($this->adminUser);
     $this->drupalPlaceBlock('local_tasks_block');
   }
@@ -58,16 +61,16 @@ abstract class AggregatorTestBase extends WebTestBase {
    *
    * @see getFeedEditArray()
    */
-  public function createFeed($feed_url = NULL, array $edit = array()) {
+  public function createFeed($feed_url = NULL, array $edit = []) {
     $edit = $this->getFeedEditArray($feed_url, $edit);
     $this->drupalPostForm('aggregator/sources/add', $edit, t('Save'));
-    $this->assertText(t('The feed @name has been added.', array('@name' => $edit['title[0][value]'])), format_string('The feed @name has been added.', array('@name' => $edit['title[0][value]'])));
+    $this->assertText(t('The feed @name has been added.', ['@name' => $edit['title[0][value]']]), format_string('The feed @name has been added.', ['@name' => $edit['title[0][value]']]));
 
     // Verify that the creation message contains a link to a feed.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'aggregator/sources/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'aggregator/sources/']);
     $this->assert(isset($view_link), 'The message area contains a link to a feed');
 
-    $fid = db_query("SELECT fid FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $edit['title[0][value]'], ':url' => $edit['url[0][value]']))->fetchField();
+    $fid = db_query("SELECT fid FROM {aggregator_feed} WHERE title = :title AND url = :url", [':title' => $edit['title[0][value]'], ':url' => $edit['url[0][value]']])->fetchField();
     $this->assertTrue(!empty($fid), 'The feed found in database.');
     return Feed::load($fid);
   }
@@ -79,8 +82,8 @@ abstract class AggregatorTestBase extends WebTestBase {
    *   Feed object representing the feed.
    */
   public function deleteFeed(FeedInterface $feed) {
-    $this->drupalPostForm('aggregator/sources/' . $feed->id() . '/delete', array(), t('Delete'));
-    $this->assertRaw(t('The feed %title has been deleted.', array('%title' => $feed->label())), 'Feed deleted successfully.');
+    $this->drupalPostForm('aggregator/sources/' . $feed->id() . '/delete', [], t('Delete'));
+    $this->assertRaw(t('The feed %title has been deleted.', ['%title' => $feed->label()]), 'Feed deleted successfully.');
   }
 
   /**
@@ -95,19 +98,19 @@ abstract class AggregatorTestBase extends WebTestBase {
    * @return array
    *   A feed array.
    */
-  public function getFeedEditArray($feed_url = NULL, array $edit = array()) {
+  public function getFeedEditArray($feed_url = NULL, array $edit = []) {
     $feed_name = $this->randomMachineName(10);
     if (!$feed_url) {
-      $feed_url = \Drupal::url('view.frontpage.feed_1', array(), array(
-        'query' => array('feed' => $feed_name),
+      $feed_url = \Drupal::url('view.frontpage.feed_1', [], [
+        'query' => ['feed' => $feed_name],
         'absolute' => TRUE,
-      ));
+      ]);
     }
-    $edit += array(
+    $edit += [
       'title[0][value]' => $feed_name,
       'url[0][value]' => $feed_url,
       'refresh' => '900',
-    );
+    ];
     return $edit;
   }
 
@@ -123,19 +126,19 @@ abstract class AggregatorTestBase extends WebTestBase {
    * @return \Drupal\aggregator\FeedInterface
    *   A feed object.
    */
-  public function getFeedEditObject($feed_url = NULL, array $values = array()) {
+  public function getFeedEditObject($feed_url = NULL, array $values = []) {
     $feed_name = $this->randomMachineName(10);
     if (!$feed_url) {
-      $feed_url = \Drupal::url('view.frontpage.feed_1', array(
-        'query' => array('feed' => $feed_name),
+      $feed_url = \Drupal::url('view.frontpage.feed_1', [
+        'query' => ['feed' => $feed_name],
         'absolute' => TRUE,
-      ));
+      ]);
     }
-    $values += array(
+    $values += [
       'title' => $feed_name,
       'url' => $feed_url,
       'refresh' => '900',
-    );
+    ];
     return Feed::create($values);
   }
 
@@ -165,7 +168,7 @@ abstract class AggregatorTestBase extends WebTestBase {
   public function updateFeedItems(FeedInterface $feed, $expected_count = NULL) {
     // First, let's ensure we can get to the rss xml.
     $this->drupalGet($feed->getUrl());
-    $this->assertResponse(200, format_string(':url is reachable.', array(':url' => $feed->getUrl())));
+    $this->assertResponse(200, format_string(':url is reachable.', [':url' => $feed->getUrl()]));
 
     // Attempt to access the update link directly without an access token.
     $this->drupalGet('admin/config/services/aggregator/update/' . $feed->id());
@@ -176,15 +179,15 @@ abstract class AggregatorTestBase extends WebTestBase {
     $this->clickLink('Update items');
 
     // Ensure we have the right number of items.
-    $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()));
-    $feed->items = array();
+    $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()]);
+    $feed->items = [];
     foreach ($result as $item) {
       $feed->items[] = $item->iid;
     }
 
     if ($expected_count !== NULL) {
       $feed->item_count = count($feed->items);
-      $this->assertEqual($expected_count, $feed->item_count, format_string('Total items in feed equal to the total items in database (@val1 != @val2)', array('@val1' => $expected_count, '@val2' => $feed->item_count)));
+      $this->assertEqual($expected_count, $feed->item_count, format_string('Total items in feed equal to the total items in database (@val1 != @val2)', ['@val1' => $expected_count, '@val2' => $feed->item_count]));
     }
   }
 
@@ -195,8 +198,8 @@ abstract class AggregatorTestBase extends WebTestBase {
    *   Feed object representing the feed.
    */
   public function deleteFeedItems(FeedInterface $feed) {
-    $this->drupalPostForm('admin/config/services/aggregator/delete/' . $feed->id(), array(), t('Delete items'));
-    $this->assertRaw(t('The news items from %title have been deleted.', array('%title' => $feed->label())), 'Feed items deleted.');
+    $this->drupalPostForm('admin/config/services/aggregator/delete/' . $feed->id(), [], t('Delete items'));
+    $this->assertRaw(t('The news items from %title have been deleted.', ['%title' => $feed->label()]), 'Feed items deleted.');
   }
 
   /**
@@ -209,10 +212,10 @@ abstract class AggregatorTestBase extends WebTestBase {
    */
   public function updateAndDelete(FeedInterface $feed, $expected_count) {
     $this->updateFeedItems($feed, $expected_count);
-    $count = db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField();
+    $count = db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField();
     $this->assertTrue($count);
     $this->deleteFeedItems($feed);
-    $count = db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField();
+    $count = db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField();
     $this->assertTrue($count == 0);
   }
 
@@ -228,7 +231,7 @@ abstract class AggregatorTestBase extends WebTestBase {
    *   TRUE if feed is unique.
    */
   public function uniqueFeed($feed_name, $feed_url) {
-    $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $feed_name, ':url' => $feed_url))->fetchField();
+    $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", [':title' => $feed_name, ':url' => $feed_url])->fetchField();
     return (1 == $result);
   }
 
@@ -271,7 +274,8 @@ abstract class AggregatorTestBase extends WebTestBase {
 EOF;
 
     $path = 'public://valid-opml.xml';
-    return file_unmanaged_save_data($opml, $path);
+    // Add the UTF-8 byte order mark.
+    return file_unmanaged_save_data(chr(239) . chr(187) . chr(191) . $opml, $path);
   }
 
   /**
@@ -354,7 +358,7 @@ EOF;
   public function createSampleNodes($count = 5) {
     // Post $count article nodes.
     for ($i = 0; $i < $count; $i++) {
-      $edit = array();
+      $edit = [];
       $edit['title[0][value]'] = $this->randomMachineName();
       $edit['body[0][value]'] = $this->randomMachineName();
       $this->drupalPostForm('node/add/article', $edit, t('Save'));
@@ -368,10 +372,10 @@ EOF;
     $this->config('aggregator.settings')
       ->set('fetcher', 'aggregator_test_fetcher')
       ->set('parser', 'aggregator_test_parser')
-      ->set('processors', array(
+      ->set('processors', [
         'aggregator_test_processor' => 'aggregator_test_processor',
         'aggregator' => 'aggregator',
-      ))
+      ])
       ->save();
   }
 
diff --git a/web/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php b/web/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php
index 0324e3b9a..0dbb872b5 100644
--- a/web/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php
+++ b/web/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php
@@ -14,7 +14,7 @@ class FeedAdminDisplayTest extends AggregatorTestBase {
    */
   public function testFeedUpdateFields() {
     // Create scheduled feed.
-    $scheduled_feed = $this->createFeed(NULL, array('refresh' => '900'));
+    $scheduled_feed = $this->createFeed(NULL, ['refresh' => '900']);
 
     $this->drupalGet('admin/config/services/aggregator');
     $this->assertResponse(200, 'Aggregator feed overview page exists.');
@@ -40,7 +40,7 @@ class FeedAdminDisplayTest extends AggregatorTestBase {
     $this->deleteFeed($scheduled_feed);
 
     // Create non-scheduled feed.
-    $non_scheduled_feed = $this->createFeed(NULL, array('refresh' => '0'));
+    $non_scheduled_feed = $this->createFeed(NULL, ['refresh' => '0']);
 
     $this->drupalGet('admin/config/services/aggregator');
     // The non scheduled feed shows that it has not been updated yet.
diff --git a/web/core/modules/aggregator/src/Tests/FeedLanguageTest.php b/web/core/modules/aggregator/src/Tests/FeedLanguageTest.php
index af8335e10..98d04fa5c 100644
--- a/web/core/modules/aggregator/src/Tests/FeedLanguageTest.php
+++ b/web/core/modules/aggregator/src/Tests/FeedLanguageTest.php
@@ -16,14 +16,14 @@ class FeedLanguageTest extends AggregatorTestBase {
    *
    * @var array
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * List of langcodes.
    *
    * @var string[]
    */
-  protected $langcodes = array();
+  protected $langcodes = [];
 
   /**
    * {@inheritdoc}
@@ -32,12 +32,12 @@ class FeedLanguageTest extends AggregatorTestBase {
     parent::setUp();
 
     // Create test languages.
-    $this->langcodes = array(ConfigurableLanguage::load('en'));
+    $this->langcodes = [ConfigurableLanguage::load('en')];
     for ($i = 1; $i < 3; ++$i) {
-      $language = ConfigurableLanguage::create(array(
+      $language = ConfigurableLanguage::create([
         'id' => 'l' . $i,
         'label' => $this->randomString(),
-      ));
+      ]);
       $language->save();
       $this->langcodes[$i] = $language->id();
     }
@@ -57,10 +57,10 @@ class FeedLanguageTest extends AggregatorTestBase {
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
 
     /** @var \Drupal\aggregator\FeedInterface[] $feeds */
-    $feeds = array();
+    $feeds = [];
     // Create feeds.
-    $feeds[1] = $this->createFeed(NULL, array('langcode[0][value]' => $this->langcodes[1]));
-    $feeds[2] = $this->createFeed(NULL, array('langcode[0][value]' => $this->langcodes[2]));
+    $feeds[1] = $this->createFeed(NULL, ['langcode[0][value]' => $this->langcodes[1]]);
+    $feeds[2] = $this->createFeed(NULL, ['langcode[0][value]' => $this->langcodes[2]]);
 
     // Make sure that the language has been assigned.
     $this->assertEqual($feeds[1]->language()->getId(), $this->langcodes[1]);
@@ -74,7 +74,7 @@ class FeedLanguageTest extends AggregatorTestBase {
     // the one from the feed.
     foreach ($feeds as $feed) {
       /** @var \Drupal\aggregator\ItemInterface[] $items */
-      $items = entity_load_multiple_by_properties('aggregator_item', array('fid' => $feed->id()));
+      $items = entity_load_multiple_by_properties('aggregator_item', ['fid' => $feed->id()]);
       $this->assertTrue(count($items) > 0, 'Feed items were created.');
       foreach ($items as $item) {
         $this->assertEqual($item->language()->getId(), $feed->language()->getId());
diff --git a/web/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php b/web/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php
index ae78205bc..67e96f172 100644
--- a/web/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php
+++ b/web/core/modules/aggregator/src/Tests/UpdateFeedItemTest.php
@@ -26,47 +26,47 @@ class UpdateFeedItemTest extends AggregatorTestBase {
     $this->deleteFeed($feed);
 
     // Test updating feed items without valid timestamp information.
-    $edit = array(
+    $edit = [
       'title[0][value]' => "Feed without publish timestamp",
       'url[0][value]' => $this->getRSS091Sample(),
-    );
+    ];
 
     $this->drupalGet($edit['url[0][value]']);
     $this->assertResponse(200);
 
     $this->drupalPostForm('aggregator/sources/add', $edit, t('Save'));
-    $this->assertText(t('The feed @name has been added.', array('@name' => $edit['title[0][value]'])), format_string('The feed @name has been added.', array('@name' => $edit['title[0][value]'])));
+    $this->assertText(t('The feed @name has been added.', ['@name' => $edit['title[0][value]']]), format_string('The feed @name has been added.', ['@name' => $edit['title[0][value]']]));
 
     // Verify that the creation message contains a link to a feed.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'aggregator/sources/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'aggregator/sources/']);
     $this->assert(isset($view_link), 'The message area contains a link to a feed');
 
-    $fid = db_query("SELECT fid FROM {aggregator_feed} WHERE url = :url", array(':url' => $edit['url[0][value]']))->fetchField();
+    $fid = db_query("SELECT fid FROM {aggregator_feed} WHERE url = :url", [':url' => $edit['url[0][value]']])->fetchField();
     $feed = Feed::load($fid);
 
     $feed->refreshItems();
-    $before = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField();
+    $before = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField();
 
     // Sleep for 3 second.
     sleep(3);
     db_update('aggregator_feed')
       ->condition('fid', $feed->id())
-      ->fields(array(
+      ->fields([
         'checked' => 0,
         'hash' => '',
         'etag' => '',
         'modified' => 0,
-      ))
+      ])
       ->execute();
     $feed->refreshItems();
 
-    $after = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->id()))->fetchField();
-    $this->assertTrue($before === $after, format_string('Publish timestamp of feed item was not updated (@before === @after)', array('@before' => $before, '@after' => $after)));
+    $after = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField();
+    $this->assertTrue($before === $after, format_string('Publish timestamp of feed item was not updated (@before === @after)', ['@before' => $before, '@after' => $after]));
 
     // Make sure updating items works even after uninstalling a module
     // that provides the selected plugins.
     $this->enableTestPlugins();
-    $this->container->get('module_installer')->uninstall(array('aggregator_test'));
+    $this->container->get('module_installer')->uninstall(['aggregator_test']);
     $this->updateFeedItems($feed);
     $this->assertResponse(200);
   }
diff --git a/web/core/modules/aggregator/src/Tests/UpdateFeedTest.php b/web/core/modules/aggregator/src/Tests/UpdateFeedTest.php
index 8c797a5e8..d2308744c 100644
--- a/web/core/modules/aggregator/src/Tests/UpdateFeedTest.php
+++ b/web/core/modules/aggregator/src/Tests/UpdateFeedTest.php
@@ -12,7 +12,7 @@ class UpdateFeedTest extends AggregatorTestBase {
    * Creates a feed and attempts to update it.
    */
   public function testUpdateFeed() {
-    $remaining_fields = array('title[0][value]', 'url[0][value]', '');
+    $remaining_fields = ['title[0][value]', 'url[0][value]', ''];
     foreach ($remaining_fields as $same_field) {
       $feed = $this->createFeed();
 
@@ -24,10 +24,10 @@ class UpdateFeedTest extends AggregatorTestBase {
         $edit[$same_field] = $feed->{$same_field}->value;
       }
       $this->drupalPostForm('aggregator/sources/' . $feed->id() . '/configure', $edit, t('Save'));
-      $this->assertText(t('The feed @name has been updated.', array('@name' => $edit['title[0][value]'])), format_string('The feed %name has been updated.', array('%name' => $edit['title[0][value]'])));
+      $this->assertText(t('The feed @name has been updated.', ['@name' => $edit['title[0][value]']]), format_string('The feed %name has been updated.', ['%name' => $edit['title[0][value]']]));
 
       // Verify that the creation message contains a link to a feed.
-      $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'aggregator/sources/'));
+      $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'aggregator/sources/']);
       $this->assert(isset($view_link), 'The message area contains a link to a feed');
 
       // Check feed data.
diff --git a/web/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php b/web/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php
index 2f73c5f4a..294697a2b 100644
--- a/web/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php
+++ b/web/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php
@@ -75,20 +75,20 @@ class TestProcessor extends AggregatorPluginSettingsBase implements ProcessorInt
     $processors = $this->config('aggregator.settings')->get('processors');
     $info = $this->getPluginDefinition();
 
-    $form['processors'][$info['id']] = array(
+    $form['processors'][$info['id']] = [
       '#type' => 'details',
       '#title' => t('Test processor settings'),
       '#description' => $info['description'],
       '#open' => in_array($info['id'], $processors),
-    );
+    ];
     // Add some dummy settings to verify settingsForm is called.
-    $form['processors'][$info['id']]['dummy_length'] = array(
+    $form['processors'][$info['id']]['dummy_length'] = [
       '#title' => t('Dummy length setting'),
       '#type' => 'number',
       '#min' => 1,
       '#max' => 1000,
       '#default_value' => $this->configuration['items']['dummy_length'],
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php b/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
new file mode 100644
index 000000000..ddd98bb82
--- /dev/null
+++ b/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
@@ -0,0 +1,379 @@
+<?php
+
+namespace Drupal\Tests\aggregator\Functional;
+
+use Drupal\aggregator\Entity\Feed;
+use Drupal\Component\Utility\Html;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\aggregator\FeedInterface;
+
+/**
+ * Defines a base class for testing the Aggregator module.
+ */
+abstract class AggregatorTestBase extends BrowserTestBase {
+
+  /**
+   * A user with permission to administer feeds and create content.
+   *
+   * @var \Drupal\user\Entity\User
+   */
+  protected $adminUser;
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = ['block', 'node', 'aggregator', 'aggregator_test', 'views'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create an Article node type.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+    }
+
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer news feeds', 'access news feeds', 'create article content']);
+    $this->drupalLogin($this->adminUser);
+    $this->drupalPlaceBlock('local_tasks_block');
+  }
+
+  /**
+   * Creates an aggregator feed.
+   *
+   * This method simulates the form submission on path aggregator/sources/add.
+   *
+   * @param string $feed_url
+   *   (optional) If given, feed will be created with this URL, otherwise
+   *   /rss.xml will be used. Defaults to NULL.
+   * @param array $edit
+   *   Array with additional form fields.
+   *
+   * @return \Drupal\aggregator\FeedInterface
+   *   Full feed object if possible.
+   *
+   * @see getFeedEditArray()
+   */
+  public function createFeed($feed_url = NULL, array $edit = []) {
+    $edit = $this->getFeedEditArray($feed_url, $edit);
+    $this->drupalPostForm('aggregator/sources/add', $edit, t('Save'));
+    $this->assertText(t('The feed @name has been added.', ['@name' => $edit['title[0][value]']]), format_string('The feed @name has been added.', ['@name' => $edit['title[0][value]']]));
+
+    // Verify that the creation message contains a link to a feed.
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'aggregator/sources/']);
+    $this->assert(isset($view_link), 'The message area contains a link to a feed');
+
+    $fid = db_query("SELECT fid FROM {aggregator_feed} WHERE title = :title AND url = :url", [':title' => $edit['title[0][value]'], ':url' => $edit['url[0][value]']])->fetchField();
+    $this->assertTrue(!empty($fid), 'The feed found in database.');
+    return Feed::load($fid);
+  }
+
+  /**
+   * Deletes an aggregator feed.
+   *
+   * @param \Drupal\aggregator\FeedInterface $feed
+   *   Feed object representing the feed.
+   */
+  public function deleteFeed(FeedInterface $feed) {
+    $this->drupalPostForm('aggregator/sources/' . $feed->id() . '/delete', [], t('Delete'));
+    $this->assertRaw(t('The feed %title has been deleted.', ['%title' => $feed->label()]), 'Feed deleted successfully.');
+  }
+
+  /**
+   * Returns a randomly generated feed edit array.
+   *
+   * @param string $feed_url
+   *   (optional) If given, feed will be created with this URL, otherwise
+   *   /rss.xml will be used. Defaults to NULL.
+   * @param array $edit
+   *   Array with additional form fields.
+   *
+   * @return array
+   *   A feed array.
+   */
+  public function getFeedEditArray($feed_url = NULL, array $edit = []) {
+    $feed_name = $this->randomMachineName(10);
+    if (!$feed_url) {
+      $feed_url = \Drupal::url('view.frontpage.feed_1', [], [
+        'query' => ['feed' => $feed_name],
+        'absolute' => TRUE,
+      ]);
+    }
+    $edit += [
+      'title[0][value]' => $feed_name,
+      'url[0][value]' => $feed_url,
+      'refresh' => '900',
+    ];
+    return $edit;
+  }
+
+  /**
+   * Returns a randomly generated feed edit object.
+   *
+   * @param string $feed_url
+   *   (optional) If given, feed will be created with this URL, otherwise
+   *   /rss.xml will be used. Defaults to NULL.
+   * @param array $values
+   *   (optional) Default values to initialize object properties with.
+   *
+   * @return \Drupal\aggregator\FeedInterface
+   *   A feed object.
+   */
+  public function getFeedEditObject($feed_url = NULL, array $values = []) {
+    $feed_name = $this->randomMachineName(10);
+    if (!$feed_url) {
+      $feed_url = \Drupal::url('view.frontpage.feed_1', [
+        'query' => ['feed' => $feed_name],
+        'absolute' => TRUE,
+      ]);
+    }
+    $values += [
+      'title' => $feed_name,
+      'url' => $feed_url,
+      'refresh' => '900',
+    ];
+    return Feed::create($values);
+  }
+
+  /**
+   * Returns the count of the randomly created feed array.
+   *
+   * @return int
+   *   Number of feed items on default feed created by createFeed().
+   */
+  public function getDefaultFeedItemCount() {
+    // Our tests are based off of rss.xml, so let's find out how many elements should be related.
+    $feed_count = db_query_range('SELECT COUNT(DISTINCT nid) FROM {node_field_data} n WHERE n.promote = 1 AND n.status = 1', 0, $this->config('system.rss')->get('items.limit'))->fetchField();
+    return $feed_count > 10 ? 10 : $feed_count;
+  }
+
+  /**
+   * Updates the feed items.
+   *
+   * This method simulates a click to
+   * admin/config/services/aggregator/update/$fid.
+   *
+   * @param \Drupal\aggregator\FeedInterface $feed
+   *   Feed object representing the feed.
+   * @param int|null $expected_count
+   *   Expected number of feed items. If omitted no check will happen.
+   */
+  public function updateFeedItems(FeedInterface $feed, $expected_count = NULL) {
+    // First, let's ensure we can get to the rss xml.
+    $this->drupalGet($feed->getUrl());
+    $this->assertResponse(200, format_string(':url is reachable.', [':url' => $feed->getUrl()]));
+
+    // Attempt to access the update link directly without an access token.
+    $this->drupalGet('admin/config/services/aggregator/update/' . $feed->id());
+    $this->assertResponse(403);
+
+    // Refresh the feed (simulated link click).
+    $this->drupalGet('admin/config/services/aggregator');
+    $this->clickLink('Update items');
+
+    // Ensure we have the right number of items.
+    $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()]);
+    $feed->items = [];
+    foreach ($result as $item) {
+      $feed->items[] = $item->iid;
+    }
+
+    if ($expected_count !== NULL) {
+      $feed->item_count = count($feed->items);
+      $this->assertEqual($expected_count, $feed->item_count, format_string('Total items in feed equal to the total items in database (@val1 != @val2)', ['@val1' => $expected_count, '@val2' => $feed->item_count]));
+    }
+  }
+
+  /**
+   * Confirms an item removal from a feed.
+   *
+   * @param \Drupal\aggregator\FeedInterface $feed
+   *   Feed object representing the feed.
+   */
+  public function deleteFeedItems(FeedInterface $feed) {
+    $this->drupalPostForm('admin/config/services/aggregator/delete/' . $feed->id(), [], t('Delete items'));
+    $this->assertRaw(t('The news items from %title have been deleted.', ['%title' => $feed->label()]), 'Feed items deleted.');
+  }
+
+  /**
+   * Adds and deletes feed items and ensure that the count is zero.
+   *
+   * @param \Drupal\aggregator\FeedInterface $feed
+   *   Feed object representing the feed.
+   * @param int $expected_count
+   *   Expected number of feed items.
+   */
+  public function updateAndDelete(FeedInterface $feed, $expected_count) {
+    $this->updateFeedItems($feed, $expected_count);
+    $count = db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField();
+    $this->assertTrue($count);
+    $this->deleteFeedItems($feed);
+    $count = db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField();
+    $this->assertTrue($count == 0);
+  }
+
+  /**
+   * Checks whether the feed name and URL are unique.
+   *
+   * @param string $feed_name
+   *   String containing the feed name to check.
+   * @param string $feed_url
+   *   String containing the feed url to check.
+   *
+   * @return bool
+   *   TRUE if feed is unique.
+   */
+  public function uniqueFeed($feed_name, $feed_url) {
+    $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", [':title' => $feed_name, ':url' => $feed_url])->fetchField();
+    return (1 == $result);
+  }
+
+  /**
+   * Creates a valid OPML file from an array of feeds.
+   *
+   * @param array $feeds
+   *   An array of feeds.
+   *
+   * @return string
+   *   Path to valid OPML file.
+   */
+  public function getValidOpml(array $feeds) {
+    // Properly escape URLs so that XML parsers don't choke on them.
+    foreach ($feeds as &$feed) {
+      $feed['url[0][value]'] = Html::escape($feed['url[0][value]']);
+    }
+    /**
+     * Does not have an XML declaration, must pass the parser.
+     */
+    $opml = <<<EOF
+<opml version="1.0">
+  <head></head>
+  <body>
+    <!-- First feed to be imported. -->
+    <outline text="{$feeds[0]['title[0][value]']}" xmlurl="{$feeds[0]['url[0][value]']}" />
+
+    <!-- Second feed. Test string delimitation and attribute order. -->
+    <outline xmlurl='{$feeds[1]['url[0][value]']}' text='{$feeds[1]['title[0][value]']}'/>
+
+    <!-- Test for duplicate URL and title. -->
+    <outline xmlurl="{$feeds[0]['url[0][value]']}" text="Duplicate URL"/>
+    <outline xmlurl="http://duplicate.title" text="{$feeds[1]['title[0][value]']}"/>
+
+    <!-- Test that feeds are only added with required attributes. -->
+    <outline text="{$feeds[2]['title[0][value]']}" />
+    <outline xmlurl="{$feeds[2]['url[0][value]']}" />
+  </body>
+</opml>
+EOF;
+
+    $path = 'public://valid-opml.xml';
+    // Add the UTF-8 byte order mark.
+    return file_unmanaged_save_data(chr(239) . chr(187) . chr(191) . $opml, $path);
+  }
+
+  /**
+   * Creates an invalid OPML file.
+   *
+   * @return string
+   *   Path to invalid OPML file.
+   */
+  public function getInvalidOpml() {
+    $opml = <<<EOF
+<opml>
+  <invalid>
+</opml>
+EOF;
+
+    $path = 'public://invalid-opml.xml';
+    return file_unmanaged_save_data($opml, $path);
+  }
+
+  /**
+   * Creates a valid but empty OPML file.
+   *
+   * @return string
+   *   Path to empty OPML file.
+   */
+  public function getEmptyOpml() {
+    $opml = <<<EOF
+<?xml version="1.0" encoding="utf-8"?>
+<opml version="1.0">
+  <head></head>
+  <body>
+    <outline text="Sample text" />
+    <outline text="Sample text" url="Sample URL" />
+  </body>
+</opml>
+EOF;
+
+    $path = 'public://empty-opml.xml';
+    return file_unmanaged_save_data($opml, $path);
+  }
+
+  /**
+   * Returns a example RSS091 feed.
+   *
+   * @return string
+   *   Path to the feed.
+   */
+  public function getRSS091Sample() {
+    return $GLOBALS['base_url'] . '/' . drupal_get_path('module', 'aggregator') . '/tests/modules/aggregator_test/aggregator_test_rss091.xml';
+  }
+
+  /**
+   * Returns a example Atom feed.
+   *
+   * @return string
+   *   Path to the feed.
+   */
+  public function getAtomSample() {
+    // The content of this sample ATOM feed is based directly off of the
+    // example provided in RFC 4287.
+    return $GLOBALS['base_url'] . '/' . drupal_get_path('module', 'aggregator') . '/tests/modules/aggregator_test/aggregator_test_atom.xml';
+  }
+
+  /**
+   * Returns a example feed.
+   *
+   * @return string
+   *   Path to the feed.
+   */
+  public function getHtmlEntitiesSample() {
+    return $GLOBALS['base_url'] . '/' . drupal_get_path('module', 'aggregator') . '/tests/modules/aggregator_test/aggregator_test_title_entities.xml';
+  }
+
+  /**
+   * Creates sample article nodes.
+   *
+   * @param int $count
+   *   (optional) The number of nodes to generate. Defaults to five.
+   */
+  public function createSampleNodes($count = 5) {
+    // Post $count article nodes.
+    for ($i = 0; $i < $count; $i++) {
+      $edit = [];
+      $edit['title[0][value]'] = $this->randomMachineName();
+      $edit['body[0][value]'] = $this->randomMachineName();
+      $this->drupalPostForm('node/add/article', $edit, t('Save'));
+    }
+  }
+
+  /**
+   * Enable the plugins coming with aggregator_test module.
+   */
+  public function enableTestPlugins() {
+    $this->config('aggregator.settings')
+      ->set('fetcher', 'aggregator_test_fetcher')
+      ->set('parser', 'aggregator_test_parser')
+      ->set('processors', [
+        'aggregator_test_processor' => 'aggregator_test_processor',
+        'aggregator' => 'aggregator',
+      ])
+      ->save();
+  }
+
+}
diff --git a/web/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php b/web/core/modules/aggregator/tests/src/Functional/DeleteFeedItemTest.php
similarity index 64%
rename from web/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php
rename to web/core/modules/aggregator/tests/src/Functional/DeleteFeedItemTest.php
index 0261ed5a0..a8527f6b1 100644
--- a/web/core/modules/aggregator/src/Tests/DeleteFeedItemTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/DeleteFeedItemTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 /**
  * Delete feed items from a feed.
@@ -13,15 +13,15 @@ class DeleteFeedItemTest extends AggregatorTestBase {
    */
   public function testDeleteFeedItem() {
     // Create a bunch of test feeds.
-    $feed_urls = array();
+    $feed_urls = [];
     // No last-modified, no etag.
-    $feed_urls[] = \Drupal::url('aggregator_test.feed', array(), array('absolute' => TRUE));
+    $feed_urls[] = \Drupal::url('aggregator_test.feed', [], ['absolute' => TRUE]);
     // Last-modified, but no etag.
-    $feed_urls[] = \Drupal::url('aggregator_test.feed', array('use_last_modified' => 1), array('absolute' => TRUE));
+    $feed_urls[] = \Drupal::url('aggregator_test.feed', ['use_last_modified' => 1], ['absolute' => TRUE]);
     // No Last-modified, but etag.
-    $feed_urls[] = \Drupal::url('aggregator_test.feed', array('use_last_modified' => 0, 'use_etag' => 1), array('absolute' => TRUE));
+    $feed_urls[] = \Drupal::url('aggregator_test.feed', ['use_last_modified' => 0, 'use_etag' => 1], ['absolute' => TRUE]);
     // Last-modified and etag.
-    $feed_urls[] = \Drupal::url('aggregator_test.feed', array('use_last_modified' => 1, 'use_etag' => 1), array('absolute' => TRUE));
+    $feed_urls[] = \Drupal::url('aggregator_test.feed', ['use_last_modified' => 1, 'use_etag' => 1], ['absolute' => TRUE]);
 
     foreach ($feed_urls as $feed_url) {
       $feed = $this->createFeed($feed_url);
diff --git a/web/core/modules/aggregator/src/Tests/DeleteFeedTest.php b/web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
similarity index 88%
rename from web/core/modules/aggregator/src/Tests/DeleteFeedTest.php
rename to web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
index 4cde81ace..7d7569628 100644
--- a/web/core/modules/aggregator/src/Tests/DeleteFeedTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 /**
  * Delete feed test.
@@ -14,7 +14,7 @@ class DeleteFeedTest extends AggregatorTestBase {
    *
    * @var array
    */
-  public static $modules = array('block');
+  public static $modules = ['block'];
 
   /**
    * Deletes a feed and ensures that all of its services are deleted.
@@ -43,7 +43,7 @@ class DeleteFeedTest extends AggregatorTestBase {
     $this->assertResponse(404, 'Deleted feed source does not exists.');
 
     // Check database for feed.
-    $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $feed1->label(), ':url' => $feed1->getUrl()))->fetchField();
+    $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", [':title' => $feed1->label(), ':url' => $feed1->getUrl()])->fetchField();
     $this->assertFalse($result, 'Feed not found in database');
   }
 
diff --git a/web/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php b/web/core/modules/aggregator/tests/src/Functional/FeedCacheTagsTest.php
similarity index 88%
rename from web/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php
rename to web/core/modules/aggregator/tests/src/Functional/FeedCacheTagsTest.php
index 2b85c196b..dc0aab926 100644
--- a/web/core/modules/aggregator/src/Tests/FeedCacheTagsTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/FeedCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
@@ -17,7 +17,7 @@ class FeedCacheTagsTest extends EntityWithUriCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('aggregator');
+  public static $modules = ['aggregator'];
 
   /**
    * {@inheritdoc}
@@ -37,13 +37,13 @@ class FeedCacheTagsTest extends EntityWithUriCacheTagsTestBase {
    */
   protected function createEntity() {
     // Create a "Llama" feed.
-    $feed = Feed::create(array(
+    $feed = Feed::create([
       'title' => 'Llama',
       'url' => 'https://www.drupal.org/',
       'refresh' => 900,
       'checked' => 1389919932,
       'description' => 'Drupal.org',
-    ));
+    ]);
     $feed->save();
 
     return $feed;
diff --git a/web/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php b/web/core/modules/aggregator/tests/src/Functional/FeedFetcherPluginTest.php
similarity index 95%
rename from web/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php
rename to web/core/modules/aggregator/tests/src/Functional/FeedFetcherPluginTest.php
index 4aac85100..1a03186c6 100644
--- a/web/core/modules/aggregator/src/Tests/FeedFetcherPluginTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/FeedFetcherPluginTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 /**
  * Tests the fetcher plugins functionality and discoverability.
diff --git a/web/core/modules/aggregator/src/Tests/FeedParserTest.php b/web/core/modules/aggregator/tests/src/Functional/FeedParserTest.php
similarity index 87%
rename from web/core/modules/aggregator/src/Tests/FeedParserTest.php
rename to web/core/modules/aggregator/tests/src/Functional/FeedParserTest.php
index 6c4a04d4c..ecb2e50c7 100644
--- a/web/core/modules/aggregator/src/Tests/FeedParserTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/FeedParserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\Core\Url;
 use Drupal\aggregator\Entity\Feed;
@@ -30,7 +30,7 @@ class FeedParserTest extends AggregatorTestBase {
     $feed = $this->createFeed($this->getRSS091Sample());
     $feed->refreshItems();
     $this->drupalGet('aggregator/sources/' . $feed->id());
-    $this->assertResponse(200, format_string('Feed %name exists.', array('%name' => $feed->label())));
+    $this->assertResponse(200, format_string('Feed %name exists.', ['%name' => $feed->label()]));
     $this->assertText('First example feed item title');
     $this->assertLinkByHref('http://example.com/example-turns-one');
     $this->assertText('First example feed item description.');
@@ -53,19 +53,19 @@ class FeedParserTest extends AggregatorTestBase {
     $feed = $this->createFeed($this->getAtomSample());
     $feed->refreshItems();
     $this->drupalGet('aggregator/sources/' . $feed->id());
-    $this->assertResponse(200, format_string('Feed %name exists.', array('%name' => $feed->label())));
+    $this->assertResponse(200, format_string('Feed %name exists.', ['%name' => $feed->label()]));
     $this->assertText('Atom-Powered Robots Run Amok');
     $this->assertLinkByHref('http://example.org/2003/12/13/atom03');
     $this->assertText('Some text.');
-    $this->assertEqual('urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a', db_query('SELECT guid FROM {aggregator_item} WHERE link = :link', array(':link' => 'http://example.org/2003/12/13/atom03'))->fetchField(), 'Atom entry id element is parsed correctly.');
+    $this->assertEqual('urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a', db_query('SELECT guid FROM {aggregator_item} WHERE link = :link', [':link' => 'http://example.org/2003/12/13/atom03'])->fetchField(), 'Atom entry id element is parsed correctly.');
 
     // Check for second feed entry.
     $this->assertText('We tried to stop them, but we failed.');
     $this->assertLinkByHref('http://example.org/2003/12/14/atom03');
     $this->assertText('Some other text.');
-    $db_guid = db_query('SELECT guid FROM {aggregator_item} WHERE link = :link', array(
+    $db_guid = db_query('SELECT guid FROM {aggregator_item} WHERE link = :link', [
       ':link' => 'http://example.org/2003/12/14/atom03',
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual('urn:uuid:1225c695-cfb8-4ebb-bbbb-80da344efa6a', $db_guid, 'Atom entry id element is parsed correctly.');
   }
 
@@ -76,7 +76,7 @@ class FeedParserTest extends AggregatorTestBase {
     $feed = $this->createFeed($this->getHtmlEntitiesSample());
     $feed->refreshItems();
     $this->drupalGet('aggregator/sources/' . $feed->id());
-    $this->assertResponse(200, format_string('Feed %name exists.', array('%name' => $feed->label())));
+    $this->assertResponse(200, format_string('Feed %name exists.', ['%name' => $feed->label()]));
     $this->assertRaw("Quote&quot; Amp&amp;");
   }
 
@@ -85,12 +85,12 @@ class FeedParserTest extends AggregatorTestBase {
    */
   public function testRedirectFeed() {
     $redirect_url = Url::fromRoute('aggregator_test.redirect')->setAbsolute()->toString();
-    $feed = Feed::create(array('url' => $redirect_url, 'title' => $this->randomMachineName()));
+    $feed = Feed::create(['url' => $redirect_url, 'title' => $this->randomMachineName()]);
     $feed->save();
     $feed->refreshItems();
 
     // Make sure that the feed URL was updated correctly.
-    $this->assertEqual($feed->getUrl(), \Drupal::url('aggregator_test.feed', array(), array('absolute' => TRUE)));
+    $this->assertEqual($feed->getUrl(), \Drupal::url('aggregator_test.feed', [], ['absolute' => TRUE]));
   }
 
   /**
@@ -99,13 +99,13 @@ class FeedParserTest extends AggregatorTestBase {
   public function testInvalidFeed() {
     // Simulate a typo in the URL to force a curl exception.
     $invalid_url = 'http:/www.drupal.org';
-    $feed = Feed::create(array('url' => $invalid_url, 'title' => $this->randomMachineName()));
+    $feed = Feed::create(['url' => $invalid_url, 'title' => $this->randomMachineName()]);
     $feed->save();
 
     // Update the feed. Use the UI to be able to check the message easily.
     $this->drupalGet('admin/config/services/aggregator');
     $this->clickLink(t('Update items'));
-    $this->assertRaw(t('The feed from %title seems to be broken because of error', array('%title' => $feed->label())));
+    $this->assertRaw(t('The feed from %title seems to be broken because of error', ['%title' => $feed->label()]));
   }
 
 }
diff --git a/web/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php b/web/core/modules/aggregator/tests/src/Functional/FeedProcessorPluginTest.php
similarity index 90%
rename from web/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php
rename to web/core/modules/aggregator/tests/src/Functional/FeedProcessorPluginTest.php
index 8a7ade05a..bdc63f56b 100644
--- a/web/core/modules/aggregator/src/Tests/FeedProcessorPluginTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/FeedProcessorPluginTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\aggregator\Entity\Item;
@@ -45,7 +45,7 @@ class FeedProcessorPluginTest extends AggregatorTestBase {
     $description = $feed->description->value ?: '';
     $this->updateAndDelete($feed, NULL);
     // Make sure the feed title is changed.
-    $entities = entity_load_multiple_by_properties('aggregator_feed', array('description' => $description));
+    $entities = entity_load_multiple_by_properties('aggregator_feed', ['description' => $description]);
     $this->assertTrue(empty($entities));
   }
 
@@ -53,11 +53,11 @@ class FeedProcessorPluginTest extends AggregatorTestBase {
    * Test post-processing functionality.
    */
   public function testPostProcess() {
-    $feed = $this->createFeed(NULL, array('refresh' => 1800));
+    $feed = $this->createFeed(NULL, ['refresh' => 1800]);
     $this->updateFeedItems($feed);
     $feed_id = $feed->id();
     // Reset entity cache manually.
-    \Drupal::entityManager()->getStorage('aggregator_feed')->resetCache(array($feed_id));
+    \Drupal::entityManager()->getStorage('aggregator_feed')->resetCache([$feed_id]);
     // Reload the feed to get new values.
     $feed = Feed::load($feed_id);
     // Make sure its refresh rate doubled.
diff --git a/web/core/modules/aggregator/src/Tests/ImportOpmlTest.php b/web/core/modules/aggregator/tests/src/Functional/ImportOpmlTest.php
similarity index 84%
rename from web/core/modules/aggregator/src/Tests/ImportOpmlTest.php
rename to web/core/modules/aggregator/tests/src/Functional/ImportOpmlTest.php
index 1f1e90d40..2500b9ebb 100644
--- a/web/core/modules/aggregator/src/Tests/ImportOpmlTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/ImportOpmlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 /**
  * Tests OPML import.
@@ -14,7 +14,7 @@ class ImportOpmlTest extends AggregatorTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'help');
+  public static $modules = ['block', 'help'];
 
   /**
    * {@inheritdoc}
@@ -22,7 +22,7 @@ class ImportOpmlTest extends AggregatorTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $admin_user = $this->drupalCreateUser(array('administer news feeds', 'access news feeds', 'create article content', 'administer blocks'));
+    $admin_user = $this->drupalCreateUser(['administer news feeds', 'access news feeds', 'create article content', 'administer blocks']);
     $this->drupalLogin($admin_user);
   }
 
@@ -31,7 +31,7 @@ class ImportOpmlTest extends AggregatorTestBase {
    */
   public function openImportForm() {
     // Enable the help block.
-    $this->drupalPlaceBlock('help_block', array('region' => 'help'));
+    $this->drupalPlaceBlock('help_block', ['region' => 'help']);
 
     $this->drupalGet('admin/config/services/aggregator/add/opml');
     $this->assertText('A single OPML document may contain many feeds.', 'Found OPML help text.');
@@ -46,19 +46,19 @@ class ImportOpmlTest extends AggregatorTestBase {
   public function validateImportFormFields() {
     $before = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
 
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
     $this->assertRaw(t('<em>Either</em> upload a file or enter a URL.'), 'Error if no fields are filled.');
 
     $path = $this->getEmptyOpml();
-    $edit = array(
+    $edit = [
       'files[upload]' => $path,
       'remote' => file_create_url($path),
-    );
+    ];
     $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
     $this->assertRaw(t('<em>Either</em> upload a file or enter a URL.'), 'Error if both fields are filled.');
 
-    $edit = array('remote' => 'invalidUrl://empty');
+    $edit = ['remote' => 'invalidUrl://empty'];
     $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
     $this->assertText(t('The URL invalidUrl://empty is not valid.'), 'Error if the URL is invalid.');
 
@@ -76,7 +76,7 @@ class ImportOpmlTest extends AggregatorTestBase {
     $this->drupalPostForm('admin/config/services/aggregator/add/opml', $form, t('Import'));
     $this->assertText(t('No new feed has been added.'), 'Attempting to upload invalid XML.');
 
-    $edit = array('remote' => file_create_url($this->getEmptyOpml()));
+    $edit = ['remote' => file_create_url($this->getEmptyOpml())];
     $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
     $this->assertText(t('No new feed has been added.'), 'Attempting to load empty OPML from remote URL.');
 
@@ -88,13 +88,13 @@ class ImportOpmlTest extends AggregatorTestBase {
     $feeds[0] = $this->getFeedEditArray();
     $feeds[1] = $this->getFeedEditArray();
     $feeds[2] = $this->getFeedEditArray();
-    $edit = array(
+    $edit = [
       'files[upload]' => $this->getValidOpml($feeds),
       'refresh'       => '900',
-    );
+    ];
     $this->drupalPostForm('admin/config/services/aggregator/add/opml', $edit, t('Import'));
-    $this->assertRaw(t('A feed with the URL %url already exists.', array('%url' => $feeds[0]['url[0][value]'])), 'Verifying that a duplicate URL was identified');
-    $this->assertRaw(t('A feed named %title already exists.', array('%title' => $feeds[1]['title[0][value]'])), 'Verifying that a duplicate title was identified');
+    $this->assertRaw(t('A feed with the URL %url already exists.', ['%url' => $feeds[0]['url[0][value]']]), 'Verifying that a duplicate URL was identified');
+    $this->assertRaw(t('A feed named %title already exists.', ['%title' => $feeds[1]['title[0][value]']]), 'Verifying that a duplicate title was identified');
 
     $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
     $this->assertEqual($after, 2, 'Verifying that two distinct feeds were added.');
diff --git a/web/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php b/web/core/modules/aggregator/tests/src/Functional/ItemCacheTagsTest.php
similarity index 87%
rename from web/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
rename to web/core/modules/aggregator/tests/src/Functional/ItemCacheTagsTest.php
index 1986ceaf5..09da34368 100644
--- a/web/core/modules/aggregator/src/Tests/ItemCacheTagsTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/ItemCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\aggregator\Tests;
+namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\aggregator\Entity\Feed;
 use Drupal\aggregator\Entity\Item;
@@ -19,7 +19,7 @@ class ItemCacheTagsTest extends EntityCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('aggregator');
+  public static $modules = ['aggregator'];
 
   /**
    * {@inheritdoc}
@@ -39,21 +39,21 @@ class ItemCacheTagsTest extends EntityCacheTagsTestBase {
    */
   protected function createEntity() {
     // Create a "Camelids" feed.
-    $feed = Feed::create(array(
+    $feed = Feed::create([
       'title' => 'Camelids',
       'url' => 'https://groups.drupal.org/not_used/167169',
       'refresh' => 900,
       'checked' => 1389919932,
       'description' => 'Drupal Core Group feed',
-    ));
+    ]);
     $feed->save();
 
     // Create a "Llama" aggregator feed item.
-    $item = Item::create(array(
+    $item = Item::create([
       'fid' => $feed->id(),
       'title' => t('Llama'),
       'path' => 'https://www.drupal.org/',
-    ));
+    ]);
     $item->save();
 
     return $item;
@@ -67,14 +67,14 @@ class ItemCacheTagsTest extends EntityCacheTagsTestBase {
     \Drupal::cache('render')->set('foo', 'bar', CacheBackendInterface::CACHE_PERMANENT, $this->entity->getCacheTags());
 
     // Verify a cache hit.
-    $this->verifyRenderCache('foo', array('aggregator_feed:1'));
+    $this->verifyRenderCache('foo', ['aggregator_feed:1']);
 
     // Now create a feed item in that feed.
-    Item::create(array(
+    Item::create([
       'fid' => $this->entity->getFeedId(),
       'title' => t('Llama 2'),
       'path' => 'https://groups.drupal.org/',
-    ))->save();
+    ])->save();
 
     // Verify a cache miss.
     $this->assertFalse(\Drupal::cache('render')->get('foo'), 'Creating a new feed item invalidates the cache tag of the feed.');
diff --git a/web/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php b/web/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php
index 81a501e3b..d8804dd9c 100644
--- a/web/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php
+++ b/web/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php
@@ -17,7 +17,7 @@ class FeedValidationTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('aggregator', 'options');
+  public static $modules = ['aggregator', 'options'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php b/web/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php
index de6c87e66..280a103db 100644
--- a/web/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php
+++ b/web/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\aggregator\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -34,7 +34,7 @@ class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase {
     $config = $this->config('aggregator.settings');
     $this->assertIdentical('aggregator', $config->get('fetcher'));
     $this->assertIdentical('aggregator', $config->get('parser'));
-    $this->assertIdentical(array('aggregator'), $config->get('processors'));
+    $this->assertIdentical(['aggregator'], $config->get('processors'));
     $this->assertIdentical(600, $config->get('items.teaser_length'));
     $this->assertIdentical('<a> <b> <br /> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>', $config->get('items.allowed_html'));
     $this->assertIdentical(9676800, $config->get('items.expire'));
diff --git a/web/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php b/web/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php
index a72da23c8..39f57b251 100644
--- a/web/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php
+++ b/web/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php
@@ -21,14 +21,14 @@ class IntegrationTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('aggregator', 'aggregator_test_views', 'system', 'field', 'options', 'user');
+  public static $modules = ['aggregator', 'aggregator_test_views', 'system', 'field', 'options', 'user'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_aggregator_items');
+  public static $testViews = ['test_aggregator_items'];
 
   /**
    * The entity storage for aggregator items.
@@ -53,7 +53,7 @@ class IntegrationTest extends ViewsKernelTestBase {
     $this->installEntitySchema('aggregator_item');
     $this->installEntitySchema('aggregator_feed');
 
-    ViewTestData::createTestViews(get_class($this), array('aggregator_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['aggregator_test_views']);
 
     $this->itemStorage = $this->container->get('entity.manager')->getStorage('aggregator_item');
     $this->feedStorage = $this->container->get('entity.manager')->getStorage('aggregator_feed');
@@ -66,19 +66,19 @@ class IntegrationTest extends ViewsKernelTestBase {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
 
-    $feed = $this->feedStorage->create(array(
+    $feed = $this->feedStorage->create([
       'title' => $this->randomMachineName(),
       'url' => 'https://www.drupal.org/',
       'refresh' => 900,
       'checked' => 123543535,
       'description' => $this->randomMachineName(),
-    ));
+    ]);
     $feed->save();
 
-    $items = array();
-    $expected = array();
+    $items = [];
+    $expected = [];
     for ($i = 0; $i < 10; $i++) {
-      $values = array();
+      $values = [];
       $values['fid'] = $feed->id();
       $values['timestamp'] = mt_rand(REQUEST_TIME - 10, REQUEST_TIME + 10);
       $values['title'] = $this->randomMachineName();
@@ -99,13 +99,13 @@ class IntegrationTest extends ViewsKernelTestBase {
     $view = Views::getView('test_aggregator_items');
     $this->executeView($view);
 
-    $column_map = array(
+    $column_map = [
       'iid' => 'iid',
       'title' => 'title',
       'aggregator_item_timestamp' => 'timestamp',
       'description' => 'description',
       'aggregator_item_author' => 'author',
-    );
+    ];
     $this->assertIdenticalResultset($view, $expected, $column_map);
 
     // Ensure that the rendering of the linked title works as expected.
diff --git a/web/core/modules/aggregator/tests/src/Unit/Menu/AggregatorLocalTasksTest.php b/web/core/modules/aggregator/tests/src/Unit/Menu/AggregatorLocalTasksTest.php
index c9f6906f6..7a78ad9fb 100644
--- a/web/core/modules/aggregator/tests/src/Unit/Menu/AggregatorLocalTasksTest.php
+++ b/web/core/modules/aggregator/tests/src/Unit/Menu/AggregatorLocalTasksTest.php
@@ -15,7 +15,7 @@ class AggregatorLocalTasksTest extends LocalTaskIntegrationTestBase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->directoryList = array('aggregator' => 'core/modules/aggregator');
+    $this->directoryList = ['aggregator' => 'core/modules/aggregator'];
     parent::setUp();
   }
 
@@ -25,19 +25,19 @@ class AggregatorLocalTasksTest extends LocalTaskIntegrationTestBase {
    * @dataProvider getAggregatorAdminRoutes
    */
   public function testAggregatorAdminLocalTasks($route) {
-    $this->assertLocalTasks($route, array(
-      0 => array('aggregator.admin_overview', 'aggregator.admin_settings'),
-    ));
+    $this->assertLocalTasks($route, [
+      0 => ['aggregator.admin_overview', 'aggregator.admin_settings'],
+    ]);
   }
 
   /**
    * Provides a list of routes to test.
    */
   public function getAggregatorAdminRoutes() {
-    return array(
-      array('aggregator.admin_overview'),
-      array('aggregator.admin_settings'),
-    );
+    return [
+      ['aggregator.admin_overview'],
+      ['aggregator.admin_settings'],
+    ];
   }
 
   /**
@@ -46,9 +46,9 @@ class AggregatorLocalTasksTest extends LocalTaskIntegrationTestBase {
    * @dataProvider getAggregatorSourceRoutes
    */
   public function testAggregatorSourceLocalTasks($route) {
-    $this->assertLocalTasks($route, array(
-      0 => array('entity.aggregator_feed.canonical', 'entity.aggregator_feed.edit_form', 'entity.aggregator_feed.delete_form'),
-    ));
+    $this->assertLocalTasks($route, [
+      0 => ['entity.aggregator_feed.canonical', 'entity.aggregator_feed.edit_form', 'entity.aggregator_feed.delete_form'],
+    ]);
     ;
   }
 
@@ -56,10 +56,10 @@ class AggregatorLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of source routes to test.
    */
   public function getAggregatorSourceRoutes() {
-    return array(
-      array('entity.aggregator_feed.canonical'),
-      array('entity.aggregator_feed.edit_form'),
-    );
+    return [
+      ['entity.aggregator_feed.canonical'],
+      ['entity.aggregator_feed.edit_form'],
+    ];
   }
 
 }
diff --git a/web/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php b/web/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
index 87a5d9343..926723702 100644
--- a/web/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
+++ b/web/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
@@ -39,20 +39,20 @@ class AggregatorPluginSettingsBaseTest extends UnitTestCase {
    */
   protected function setUp() {
     $this->configFactory = $this->getConfigFactoryStub(
-      array(
-        'aggregator.settings' => array(
-          'processors' => array('aggregator_test'),
-        ),
-        'aggregator_test.settings' => array(),
-      )
+      [
+        'aggregator.settings' => [
+          'processors' => ['aggregator_test'],
+        ],
+        'aggregator_test.settings' => [],
+      ]
     );
-    foreach (array('fetcher', 'parser', 'processor') as $type) {
+    foreach (['fetcher', 'parser', 'processor'] as $type) {
       $this->managers[$type] = $this->getMockBuilder('Drupal\aggregator\Plugin\AggregatorPluginManager')
         ->disableOriginalConstructor()
         ->getMock();
       $this->managers[$type]->expects($this->once())
         ->method('getDefinitions')
-        ->will($this->returnValue(array('aggregator_test' => array('title' => '', 'description' => ''))));
+        ->will($this->returnValue(['aggregator_test' => ['title' => '', 'description' => '']]));
     }
 
     $this->settingsForm = new SettingsForm(
@@ -79,8 +79,8 @@ class AggregatorPluginSettingsBaseTest extends UnitTestCase {
 
     $test_processor = $this->getMock(
       'Drupal\aggregator_test\Plugin\aggregator\processor\TestProcessor',
-      array('buildConfigurationForm', 'validateConfigurationForm', 'submitConfigurationForm'),
-      array(array(), 'aggregator_test', array('description' => ''), $this->configFactory)
+      ['buildConfigurationForm', 'validateConfigurationForm', 'submitConfigurationForm'],
+      [[], 'aggregator_test', ['description' => ''], $this->configFactory]
     );
     $test_processor->expects($this->at(0))
       ->method('buildConfigurationForm')
@@ -98,7 +98,7 @@ class AggregatorPluginSettingsBaseTest extends UnitTestCase {
       ->with($this->equalTo('aggregator_test'))
       ->will($this->returnValue($test_processor));
 
-    $form = $this->settingsForm->buildForm(array(), $form_state);
+    $form = $this->settingsForm->buildForm([], $form_state);
     $this->settingsForm->validateForm($form, $form_state);
     $this->settingsForm->submitForm($form, $form_state);
   }
diff --git a/web/core/modules/automated_cron/automated_cron.module b/web/core/modules/automated_cron/automated_cron.module
index 858236f97..6b8c4d243 100644
--- a/web/core/modules/automated_cron/automated_cron.module
+++ b/web/core/modules/automated_cron/automated_cron.module
@@ -34,14 +34,8 @@ function automated_cron_help($route_name, RouteMatchInterface $route_match) {
 function automated_cron_form_system_cron_settings_alter(&$form, &$form_state) {
   $automated_cron_settings = \Drupal::config('automated_cron.settings');
 
-  // Add automated cron settings.
-  $form['automated_cron'] = [
-    '#title' => t('Cron settings'),
-    '#type' => 'details',
-    '#open' => TRUE,
-  ];
   $options = [3600, 10800, 21600, 43200, 86400, 604800];
-  $form['automated_cron']['interval'] = [
+  $form['cron']['interval'] = [
     '#type' => 'select',
     '#title' => t('Run cron every'),
     '#description' => t('More information about setting up scheduled tasks can be found by <a href="@url">reading the cron tutorial on drupal.org</a>.', ['@url' => 'https://www.drupal.org/cron']),
@@ -49,13 +43,6 @@ function automated_cron_form_system_cron_settings_alter(&$form, &$form_state) {
     '#options' => [0 => t('Never')] + array_map([\Drupal::service('date.formatter'), 'formatInterval'], array_combine($options, $options)),
   ];
 
-  $form['actions']['#type'] = 'actions';
-  $form['actions']['submit'] = [
-    '#type' => 'submit',
-    '#value' => t('Save configuration'),
-    '#button_type' => 'primary',
-  ];
-
   // Add submit callback.
   $form['#submit'][] = 'automated_cron_settings_submit';
 
@@ -70,5 +57,4 @@ function automated_cron_settings_submit(array $form, FormStateInterface $form_st
   \Drupal::configFactory()->getEditable('automated_cron.settings')
     ->set('interval', $form_state->getValue('interval'))
     ->save();
-  drupal_set_message(t('The configuration options have been saved.'));
 }
diff --git a/web/core/modules/ban/ban.install b/web/core/modules/ban/ban.install
index b2ea1fe3d..f3c003a91 100644
--- a/web/core/modules/ban/ban.install
+++ b/web/core/modules/ban/ban.install
@@ -9,27 +9,27 @@
  * Implements hook_schema().
  */
 function ban_schema() {
-  $schema['ban_ip'] = array(
+  $schema['ban_ip'] = [
     'description' => 'Stores banned IP addresses.',
-    'fields' => array(
-      'iid' => array(
+    'fields' => [
+      'iid' => [
         'description' => 'Primary Key: unique ID for IP addresses.',
         'type' => 'serial',
         'unsigned' => TRUE,
         'not null' => TRUE,
-      ),
-      'ip' => array(
+      ],
+      'ip' => [
         'description' => 'IP address',
         'type' => 'varchar_ascii',
         'length' => 40,
         'not null' => TRUE,
         'default' => '',
-      ),
-    ),
-    'indexes' => array(
-      'ip' => array('ip'),
-    ),
-    'primary key' => array('iid'),
-  );
+      ],
+    ],
+    'indexes' => [
+      'ip' => ['ip'],
+    ],
+    'primary key' => ['iid'],
+  ];
   return $schema;
 }
diff --git a/web/core/modules/ban/ban.module b/web/core/modules/ban/ban.module
index a1ee23803..b8b72c503 100644
--- a/web/core/modules/ban/ban.module
+++ b/web/core/modules/ban/ban.module
@@ -15,11 +15,11 @@ function ban_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.ban':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Ban module allows administrators to ban visits to their site from individual IP addresses. For more information, see the <a href=":url">online documentation for the Ban module</a>.', array(':url' => 'https://www.drupal.org/documentation/modules/ban')) . '</p>';
+      $output .= '<p>' . t('The Ban module allows administrators to ban visits to their site from individual IP addresses. For more information, see the <a href=":url">online documentation for the Ban module</a>.', [':url' => 'https://www.drupal.org/documentation/modules/ban']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Banning IP addresses') . '</dt>';
-      $output .= '<dd>' . t('Administrators can enter IP addresses to ban on the <a href=":bans">IP address bans</a> page.', array(':bans' => \Drupal::url('ban.admin_page'))) . '</dd>';
+      $output .= '<dd>' . t('Administrators can enter IP addresses to ban on the <a href=":bans">IP address bans</a> page.', [':bans' => \Drupal::url('ban.admin_page')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
diff --git a/web/core/modules/ban/src/BanIpManager.php b/web/core/modules/ban/src/BanIpManager.php
index a92731c28..d354f7a71 100644
--- a/web/core/modules/ban/src/BanIpManager.php
+++ b/web/core/modules/ban/src/BanIpManager.php
@@ -30,7 +30,7 @@ class BanIpManager implements BanIpManagerInterface {
    * {@inheritdoc}
    */
   public function isBanned($ip) {
-    return (bool) $this->connection->query("SELECT * FROM {ban_ip} WHERE ip = :ip", array(':ip' => $ip))->fetchField();
+    return (bool) $this->connection->query("SELECT * FROM {ban_ip} WHERE ip = :ip", [':ip' => $ip])->fetchField();
   }
 
   /**
@@ -45,8 +45,8 @@ class BanIpManager implements BanIpManagerInterface {
    */
   public function banIp($ip) {
     $this->connection->merge('ban_ip')
-      ->key(array('ip' => $ip))
-      ->fields(array('ip' => $ip))
+      ->key(['ip' => $ip])
+      ->fields(['ip' => $ip])
       ->execute();
   }
 
@@ -63,7 +63,7 @@ class BanIpManager implements BanIpManagerInterface {
    * {@inheritdoc}
    */
   public function findById($ban_id) {
-    return $this->connection->query("SELECT ip FROM {ban_ip} WHERE iid = :iid", array(':iid' => $ban_id))->fetchField();
+    return $this->connection->query("SELECT ip FROM {ban_ip} WHERE iid = :iid", [':iid' => $ban_id])->fetchField();
   }
 
 }
diff --git a/web/core/modules/ban/src/Form/BanAdmin.php b/web/core/modules/ban/src/Form/BanAdmin.php
index a0c769fd4..731d06518 100644
--- a/web/core/modules/ban/src/Form/BanAdmin.php
+++ b/web/core/modules/ban/src/Form/BanAdmin.php
@@ -52,47 +52,47 @@ class BanAdmin extends FormBase {
    *   address form field.
    */
   public function buildForm(array $form, FormStateInterface $form_state, $default_ip = '') {
-    $rows = array();
-    $header = array($this->t('banned IP addresses'), $this->t('Operations'));
+    $rows = [];
+    $header = [$this->t('banned IP addresses'), $this->t('Operations')];
     $result = $this->ipManager->findAll();
     foreach ($result as $ip) {
-      $row = array();
+      $row = [];
       $row[] = $ip->ip;
-      $links = array();
-      $links['delete'] = array(
+      $links = [];
+      $links['delete'] = [
         'title' => $this->t('Delete'),
         'url' => Url::fromRoute('ban.delete', ['ban_id' => $ip->iid]),
-      );
-      $row[] = array(
-        'data' => array(
+      ];
+      $row[] = [
+        'data' => [
           '#type' => 'operations',
           '#links' => $links,
-        ),
-      );
+        ],
+      ];
       $rows[] = $row;
     }
 
-    $form['ip'] = array(
+    $form['ip'] = [
       '#title' => $this->t('IP address'),
       '#type' => 'textfield',
       '#size' => 48,
       '#maxlength' => 40,
       '#default_value' => $default_ip,
       '#description' => $this->t('Enter a valid IP address.'),
-    );
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    ];
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Add'),
-    );
+    ];
 
-    $form['ban_ip_banning_table'] = array(
+    $form['ban_ip_banning_table'] = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
       '#empty' => $this->t('No blocked IP addresses available.'),
       '#weight' => 120,
-    );
+    ];
     return $form;
   }
 
@@ -118,7 +118,7 @@ class BanAdmin extends FormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $ip = trim($form_state->getValue('ip'));
     $this->ipManager->banIp($ip);
-    drupal_set_message($this->t('The IP address %ip has been banned.', array('%ip' => $ip)));
+    drupal_set_message($this->t('The IP address %ip has been banned.', ['%ip' => $ip]));
     $form_state->setRedirect('ban.admin_page');
   }
 
diff --git a/web/core/modules/ban/src/Form/BanDelete.php b/web/core/modules/ban/src/Form/BanDelete.php
index a8a496245..3d14ca341 100644
--- a/web/core/modules/ban/src/Form/BanDelete.php
+++ b/web/core/modules/ban/src/Form/BanDelete.php
@@ -58,7 +58,7 @@ class BanDelete extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to unblock %ip?', array('%ip' => $this->banIp));
+    return $this->t('Are you sure you want to unblock %ip?', ['%ip' => $this->banIp]);
   }
 
   /**
@@ -93,8 +93,8 @@ class BanDelete extends ConfirmFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->ipManager->unbanIp($this->banIp);
-    $this->logger('user')->notice('Deleted %ip', array('%ip' => $this->banIp));
-    drupal_set_message($this->t('The IP address %ip was deleted.', array('%ip' => $this->banIp)));
+    $this->logger('user')->notice('Deleted %ip', ['%ip' => $this->banIp]);
+    drupal_set_message($this->t('The IP address %ip was deleted.', ['%ip' => $this->banIp]));
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
 
diff --git a/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php b/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
index 94135fd3f..7c570bb79 100644
--- a/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
+++ b/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
@@ -76,7 +76,7 @@ class BlockedIP extends DestinationBase implements ContainerFactoryPluginInterfa
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     $this->banManager->banIp($row->getDestinationProperty('ip'));
   }
 
diff --git a/web/core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php b/web/core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php
index 973891502..778f3dba9 100644
--- a/web/core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php
+++ b/web/core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php
@@ -18,55 +18,55 @@ class IpAddressBlockingTest extends BrowserTestBase {
    *
    * @var array
    */
-  public static $modules = array('ban');
+  public static $modules = ['ban'];
 
   /**
    * Tests various user input to confirm correct validation and saving of data.
    */
-  function testIPAddressValidation() {
+  public function testIPAddressValidation() {
     // Create user.
-    $admin_user = $this->drupalCreateUser(array('ban IP addresses'));
+    $admin_user = $this->drupalCreateUser(['ban IP addresses']);
     $this->drupalLogin($admin_user);
     $this->drupalGet('admin/config/people/ban');
 
     // Ban a valid IP address.
-    $edit = array();
+    $edit = [];
     $edit['ip'] = '1.2.3.3';
     $this->drupalPostForm('admin/config/people/ban', $edit, t('Add'));
-    $ip = db_query("SELECT iid from {ban_ip} WHERE ip = :ip", array(':ip' => $edit['ip']))->fetchField();
+    $ip = db_query("SELECT iid from {ban_ip} WHERE ip = :ip", [':ip' => $edit['ip']])->fetchField();
     $this->assertTrue($ip, 'IP address found in database.');
-    $this->assertRaw(t('The IP address %ip has been banned.', array('%ip' => $edit['ip'])), 'IP address was banned.');
+    $this->assertRaw(t('The IP address %ip has been banned.', ['%ip' => $edit['ip']]), 'IP address was banned.');
 
     // Try to block an IP address that's already blocked.
-    $edit = array();
+    $edit = [];
     $edit['ip'] = '1.2.3.3';
     $this->drupalPostForm('admin/config/people/ban', $edit, t('Add'));
     $this->assertText(t('This IP address is already banned.'));
 
     // Try to block a reserved IP address.
-    $edit = array();
+    $edit = [];
     $edit['ip'] = '255.255.255.255';
     $this->drupalPostForm('admin/config/people/ban', $edit, t('Add'));
     $this->assertText(t('Enter a valid IP address.'));
 
     // Try to block a reserved IP address.
-    $edit = array();
+    $edit = [];
     $edit['ip'] = 'test.example.com';
     $this->drupalPostForm('admin/config/people/ban', $edit, t('Add'));
     $this->assertText(t('Enter a valid IP address.'));
 
     // Submit an empty form.
-    $edit = array();
+    $edit = [];
     $edit['ip'] = '';
     $this->drupalPostForm('admin/config/people/ban', $edit, t('Add'));
     $this->assertText(t('Enter a valid IP address.'));
 
     // Pass an IP address as a URL parameter and submit it.
     $submit_ip = '1.2.3.4';
-    $this->drupalPostForm('admin/config/people/ban/' . $submit_ip, array(), t('Add'));
-    $ip = db_query("SELECT iid from {ban_ip} WHERE ip = :ip", array(':ip' => $submit_ip))->fetchField();
+    $this->drupalPostForm('admin/config/people/ban/' . $submit_ip, [], t('Add'));
+    $ip = db_query("SELECT iid from {ban_ip} WHERE ip = :ip", [':ip' => $submit_ip])->fetchField();
     $this->assertTrue($ip, 'IP address found in database');
-    $this->assertRaw(t('The IP address %ip has been banned.', array('%ip' => $submit_ip)), 'IP address was banned.');
+    $this->assertRaw(t('The IP address %ip has been banned.', ['%ip' => $submit_ip]), 'IP address was banned.');
 
     // Submit your own IP address. This fails, although it works when testing
     // manually.
@@ -85,7 +85,7 @@ class IpAddressBlockingTest extends BrowserTestBase {
     $banIp->banIp($ip);
     $banIp->banIp($ip);
     $query = db_select('ban_ip', 'bip');
-    $query->fields('bip', array('iid'));
+    $query->fields('bip', ['iid']);
     $query->condition('bip.ip', $ip);
     $ip_count = $query->execute()->fetchAll();
     $this->assertEqual(1, count($ip_count));
@@ -93,7 +93,7 @@ class IpAddressBlockingTest extends BrowserTestBase {
     $banIp->banIp($ip);
     $banIp->banIp($ip);
     $query = db_select('ban_ip', 'bip');
-    $query->fields('bip', array('iid'));
+    $query->fields('bip', ['iid']);
     $query->condition('bip.ip', $ip);
     $ip_count = $query->execute()->fetchAll();
     $this->assertEqual(1, count($ip_count));
diff --git a/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php b/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
index c98d41743..48f35a7e1 100644
--- a/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
+++ b/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\ban\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
diff --git a/web/core/modules/basic_auth/basic_auth.module b/web/core/modules/basic_auth/basic_auth.module
index ea64c5ba1..7d1d01f6b 100644
--- a/web/core/modules/basic_auth/basic_auth.module
+++ b/web/core/modules/basic_auth/basic_auth.module
@@ -15,7 +15,7 @@ function basic_auth_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.basic_auth':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The HTTP Basic Authentication module supplies an <a href="http://en.wikipedia.org/wiki/Basic_access_authentication">HTTP Basic authentication</a> provider for web service requests. This authentication provider authenticates requests using the HTTP Basic Authentication username and password, as an alternative to using Drupal\'s standard cookie-based authentication system. It is only useful if your site provides web services configured to use this type of authentication (for instance, the <a href=":rest_help">RESTful Web Services module</a>). For more information, see the <a href=":hba_do">online documentation for the HTTP Basic Authentication module</a>.', array(':hba_do' => 'https://www.drupal.org/documentation/modules/basic_auth', ':rest_help' => (\Drupal::moduleHandler()->moduleExists('rest')) ? \Drupal::url('help.page', array('name' => 'rest')) : '#')) . '</p>';
+      $output .= '<p>' . t('The HTTP Basic Authentication module supplies an <a href="http://en.wikipedia.org/wiki/Basic_access_authentication">HTTP Basic authentication</a> provider for web service requests. This authentication provider authenticates requests using the HTTP Basic Authentication username and password, as an alternative to using Drupal\'s standard cookie-based authentication system. It is only useful if your site provides web services configured to use this type of authentication (for instance, the <a href=":rest_help">RESTful Web Services module</a>). For more information, see the <a href=":hba_do">online documentation for the HTTP Basic Authentication module</a>.', [':hba_do' => 'https://www.drupal.org/documentation/modules/basic_auth', ':rest_help' => (\Drupal::moduleHandler()->moduleExists('rest')) ? \Drupal::url('help.page', ['name' => 'rest']) : '#']) . '</p>';
       return $output;
   }
 }
diff --git a/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php b/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
index eac482c81..c72e3f0c0 100644
--- a/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
+++ b/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
@@ -88,7 +88,7 @@ class BasicAuth implements AuthenticationProviderInterface, AuthenticationProvid
     // in to many different user accounts.  We have a reasonably high limit
     // since there may be only one apparent IP for all users at an institution.
     if ($this->flood->isAllowed('basic_auth.failed_login_ip', $flood_config->get('ip_limit'), $flood_config->get('ip_window'))) {
-      $accounts = $this->entityManager->getStorage('user')->loadByProperties(array('name' => $username, 'status' => 1));
+      $accounts = $this->entityManager->getStorage('user')->loadByProperties(['name' => $username, 'status' => 1]);
       $account = reset($accounts);
       if ($account) {
         if ($flood_config->get('uid_only')) {
@@ -127,9 +127,9 @@ class BasicAuth implements AuthenticationProviderInterface, AuthenticationProvid
    */
   public function challengeException(Request $request, \Exception $previous) {
     $site_name = $this->configFactory->get('system.site')->get('name');
-    $challenge = SafeMarkup::format('Basic realm="@realm"', array(
+    $challenge = SafeMarkup::format('Basic realm="@realm"', [
       '@realm' => !empty($site_name) ? $site_name : 'Access restricted',
-    ));
+    ]);
     return new UnauthorizedHttpException((string) $challenge, 'No authentication credentials provided.', $previous);
   }
 
diff --git a/web/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php b/web/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php
index b5766fb64..0e0aceb5e 100644
--- a/web/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php
+++ b/web/core/modules/basic_auth/src/Tests/BasicAuthTestTrait.php
@@ -2,8 +2,15 @@
 
 namespace Drupal\basic_auth\Tests;
 
+@trigger_error(__FILE__ . ' is deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. Use \Drupal\Tests\basic_auth\Traits\BasicAuthTestTrait instead. See https://www.drupal.org/node/2862800.', E_USER_DEPRECATED);
+
 /**
  * Provides common functionality for Basic Authentication test classes.
+ *
+ * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Tests\basic_auth\Traits\BasicAuthTestTrait instead.
+ *
+ * @see https://www.drupal.org/node/2862800
  */
 trait BasicAuthTestTrait {
 
@@ -51,7 +58,7 @@ trait BasicAuthTestTrait {
    *
    * @see \Drupal\simpletest\WebTestBase::drupalPostForm()
    */
-  protected function basicAuthPostForm($path, $edit, $submit, $username, $password, array $options = array(), $form_html_id = NULL, $extra_post = NULL) {
+  protected function basicAuthPostForm($path, $edit, $submit, $username, $password, array $options = [], $form_html_id = NULL, $extra_post = NULL) {
     return $this->drupalPostForm($path, $edit, $submit, $options, $this->getBasicAuthHeaders($username, $password), $form_html_id, $extra_post);
   }
 
diff --git a/web/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php b/web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php
similarity index 86%
rename from web/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php
rename to web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php
index 2aca988ee..b197a7631 100644
--- a/web/core/modules/basic_auth/src/Tests/Authentication/BasicAuthTest.php
+++ b/web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\basic_auth\Tests\Authentication;
+namespace Drupal\Tests\basic_auth\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Url;
-use Drupal\basic_auth\Tests\BasicAuthTestTrait;
+use Drupal\Tests\basic_auth\Traits\BasicAuthTestTrait;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for BasicAuth authentication provider.
  *
  * @group basic_auth
  */
-class BasicAuthTest extends WebTestBase {
+class BasicAuthTest extends BrowserTestBase {
 
   use BasicAuthTestTrait;
 
@@ -22,7 +22,7 @@ class BasicAuthTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('basic_auth', 'router_test', 'locale', 'basic_auth_test');
+  public static $modules = ['basic_auth', 'router_test', 'locale', 'basic_auth_test'];
 
   /**
    * Test http basic authentication.
@@ -39,14 +39,14 @@ class BasicAuthTest extends WebTestBase {
     $this->basicAuthGet($url, $account->getUsername(), $account->pass_raw);
     $this->assertText($account->getUsername(), 'Account name is displayed.');
     $this->assertResponse('200', 'HTTP response is OK');
-    $this->curlClose();
+    $this->mink->resetSessions();
     $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'));
     $this->assertIdentical(strpos($this->drupalGetHeader('Cache-Control'), 'public'), FALSE, 'Cache-Control is not set to public');
 
     $this->basicAuthGet($url, $account->getUsername(), $this->randomMachineName());
     $this->assertNoText($account->getUsername(), 'Bad basic auth credentials do not authenticate the user.');
     $this->assertResponse('403', 'Access is not granted.');
-    $this->curlClose();
+    $this->mink->resetSessions();
 
     $this->drupalGet($url);
     $this->assertEqual($this->drupalGetHeader('WWW-Authenticate'), SafeMarkup::format('Basic realm="@realm"', ['@realm' => \Drupal::config('system.site')->get('name')]));
@@ -55,12 +55,12 @@ class BasicAuthTest extends WebTestBase {
     $this->drupalGet('admin');
     $this->assertResponse('403', 'No authentication prompt for routes not explicitly defining authentication providers.');
 
-    $account = $this->drupalCreateUser(array('access administration pages'));
+    $account = $this->drupalCreateUser(['access administration pages']);
 
     $this->basicAuthGet(Url::fromRoute('system.admin'), $account->getUsername(), $account->pass_raw);
     $this->assertNoLink('Log out', 'User is not logged in');
     $this->assertResponse('403', 'No basic authentication for routes not explicitly defining authentication providers.');
-    $this->curlClose();
+    $this->mink->resetSessions();
 
     // Ensure that pages already in the page cache aren't returned from page
     // cache if basic auth credentials are provided.
@@ -75,14 +75,14 @@ class BasicAuthTest extends WebTestBase {
   /**
    * Test the global login flood control.
    */
-  function testGlobalLoginFloodControl() {
+  public function testGlobalLoginFloodControl() {
     $this->config('user.flood')
       ->set('ip_limit', 2)
       // Set a high per-user limit out so that it is not relevant in the test.
       ->set('user_limit', 4000)
       ->save();
 
-    $user = $this->drupalCreateUser(array());
+    $user = $this->drupalCreateUser([]);
     $incorrect_user = clone $user;
     $incorrect_user->pass_raw .= 'incorrect';
     $url = Url::fromRoute('router_test.11');
@@ -100,17 +100,17 @@ class BasicAuthTest extends WebTestBase {
   /**
    * Test the per-user login flood control.
    */
-  function testPerUserLoginFloodControl() {
+  public function testPerUserLoginFloodControl() {
     $this->config('user.flood')
       // Set a high global limit out so that it is not relevant in the test.
       ->set('ip_limit', 4000)
       ->set('user_limit', 2)
       ->save();
 
-    $user = $this->drupalCreateUser(array());
+    $user = $this->drupalCreateUser([]);
     $incorrect_user = clone $user;
     $incorrect_user->pass_raw .= 'incorrect';
-    $user2 = $this->drupalCreateUser(array());
+    $user2 = $this->drupalCreateUser([]);
     $url = Url::fromRoute('router_test.11');
 
     // Try a failed login.
@@ -138,7 +138,7 @@ class BasicAuthTest extends WebTestBase {
   /**
    * Tests compatibility with locale/UI translation.
    */
-  function testLocale() {
+  public function testLocale() {
     ConfigurableLanguage::createFromLangcode('de')->save();
     $this->config('system.site')->set('default_langcode', 'de')->save();
 
@@ -148,13 +148,12 @@ class BasicAuthTest extends WebTestBase {
     $this->basicAuthGet($url, $account->getUsername(), $account->pass_raw);
     $this->assertText($account->getUsername(), 'Account name is displayed.');
     $this->assertResponse('200', 'HTTP response is OK');
-    $this->curlClose();
   }
 
   /**
    * Tests if a comprehensive message is displayed when the route is denied.
    */
-  function testUnauthorizedErrorMessage() {
+  public function testUnauthorizedErrorMessage() {
     $account = $this->drupalCreateUser();
     $url = Url::fromRoute('router_test.11');
 
@@ -173,6 +172,12 @@ class BasicAuthTest extends WebTestBase {
     $this->basicAuthGet($url, $account->getUsername(), $this->randomMachineName());
     $this->assertResponse('403', 'The user is blocked when wrong credentials are passed.');
     $this->assertText('Access denied', "A user friendly access denied message is displayed");
+
+    // Case when correct credentials but hasn't access to the route.
+    $url = Url::fromRoute('router_test.15');
+    $this->basicAuthGet($url, $account->getUsername(), $account->pass_raw);
+    $this->assertResponse('403', 'The used authentication method is not allowed on this route.');
+    $this->assertText('Access denied', "A user friendly access denied message is displayed");
   }
 
   /**
@@ -191,6 +196,8 @@ class BasicAuthTest extends WebTestBase {
     $this->basicAuthGet('/basic_auth_test/state/modify', $account->getUsername(), $account->pass_raw);
     $this->assertResponse(200);
     $this->assertRaw('Done');
+
+    $this->mink->resetSessions();
     $this->drupalGet('/basic_auth_test/state/read');
     $this->assertResponse(200);
     $this->assertRaw('yep');
diff --git a/web/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php b/web/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
new file mode 100644
index 000000000..f8482208e
--- /dev/null
+++ b/web/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Drupal\Tests\basic_auth\Traits;
+
+/**
+ * Provides common functionality for Basic Authentication test classes.
+ */
+trait BasicAuthTestTrait {
+
+  /**
+   * Retrieves a Drupal path or an absolute path using basic authentication.
+   *
+   * @param \Drupal\Core\Url|string $path
+   *   Drupal path or URL to load into the internal browser.
+   * @param string $username
+   *   The username to use for basic authentication.
+   * @param string $password
+   *   The password to use for basic authentication.
+   * @param array $options
+   *   (optional) Options to be forwarded to the url generator.
+   *
+   * @return string
+   *   The retrieved HTML string, also available as $this->getRawContent().
+   */
+  protected function basicAuthGet($path, $username, $password, array $options = []) {
+    return $this->drupalGet($path, $options, $this->getBasicAuthHeaders($username, $password));
+  }
+
+  /**
+   * Executes a form submission using basic authentication.
+   *
+   * @param string $path
+   *   Location of the post form.
+   * @param array $edit
+   *   Field data in an associative array.
+   * @param string $submit
+   *   Value of the submit button whose click is to be emulated.
+   * @param string $username
+   *   The username to use for basic authentication.
+   * @param string $password
+   *   The password to use for basic authentication.
+   * @param array $options
+   *   Options to be forwarded to the url generator.
+   * @param string $form_html_id
+   *   (optional) HTML ID of the form to be submitted.
+   * @param string $extra_post
+   *   (optional) A string of additional data to append to the POST submission.
+   *
+   * @return string
+   *   The retrieved HTML string.
+   *
+   * @see \Drupal\simpletest\WebTestBase::drupalPostForm()
+   */
+  protected function basicAuthPostForm($path, $edit, $submit, $username, $password, array $options = [], $form_html_id = NULL, $extra_post = NULL) {
+    return $this->drupalPostForm($path, $edit, $submit, $options, $this->getBasicAuthHeaders($username, $password), $form_html_id, $extra_post);
+  }
+
+  /**
+   * Returns HTTP headers that can be used for basic authentication in Curl.
+   *
+   * @param string $username
+   *   The username to use for basic authentication.
+   * @param string $password
+   *   The password to use for basic authentication.
+   *
+   * @return array
+   *   An array of raw request headers as used by curl_setopt().
+   */
+  protected function getBasicAuthHeaders($username, $password) {
+    // Set up Curl to use basic authentication with the test user's credentials.
+    return ['Authorization' => 'Basic ' . base64_encode("$username:$password")];
+  }
+
+}
diff --git a/web/core/modules/big_pipe/big_pipe.info.yml b/web/core/modules/big_pipe/big_pipe.info.yml
index 99b62065c..35c301538 100644
--- a/web/core/modules/big_pipe/big_pipe.info.yml
+++ b/web/core/modules/big_pipe/big_pipe.info.yml
@@ -1,6 +1,6 @@
 name: BigPipe
 type: module
 description: 'Sends pages using the BigPipe technique that allows browsers to show them much faster.'
-package: Core (Experimental)
+package: Core
 version: VERSION
 core: 8.x
diff --git a/web/core/modules/big_pipe/big_pipe.module b/web/core/modules/big_pipe/big_pipe.module
index 18bbbb22c..fa0518ad3 100644
--- a/web/core/modules/big_pipe/big_pipe.module
+++ b/web/core/modules/big_pipe/big_pipe.module
@@ -58,8 +58,7 @@ function big_pipe_page_attachments(array &$page) {
           '#noscript' => TRUE,
           '#attributes' => [
             'http-equiv' => 'Refresh',
-            // @todo: Switch to Url::fromRoute() once https://www.drupal.org/node/2589967 is resolved.
-            'content' => '0; URL=' . Url::fromUri('internal:/big_pipe/no-js', ['query' => \Drupal::service('redirect.destination')->getAsArray()])->toString(),
+            'content' => '0; URL=' . Url::fromRoute('big_pipe.nojs', [], ['query' => \Drupal::service('redirect.destination')->getAsArray()])->toString(),
           ],
         ],
         'big_pipe_detect_nojs',
diff --git a/web/core/modules/big_pipe/src/EventSubscriber/HtmlResponseBigPipeSubscriber.php b/web/core/modules/big_pipe/src/EventSubscriber/HtmlResponseBigPipeSubscriber.php
index 80d0cd60e..0bccf0fa6 100644
--- a/web/core/modules/big_pipe/src/EventSubscriber/HtmlResponseBigPipeSubscriber.php
+++ b/web/core/modules/big_pipe/src/EventSubscriber/HtmlResponseBigPipeSubscriber.php
@@ -3,7 +3,7 @@
 namespace Drupal\big_pipe\EventSubscriber;
 
 use Drupal\Core\Render\HtmlResponse;
-use Drupal\big_pipe\Render\BigPipeInterface;
+use Drupal\big_pipe\Render\BigPipe;
 use Drupal\big_pipe\Render\BigPipeResponse;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -12,7 +12,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 /**
  * Response subscriber to replace the HtmlResponse with a BigPipeResponse.
  *
- * @see \Drupal\big_pipe\Render\BigPipeInterface
+ * @see \Drupal\big_pipe\Render\BigPipe
  *
  * @todo Refactor once https://www.drupal.org/node/2577631 lands.
  */
@@ -21,17 +21,17 @@ class HtmlResponseBigPipeSubscriber implements EventSubscriberInterface {
   /**
    * The BigPipe service.
    *
-   * @var \Drupal\big_pipe\Render\BigPipeInterface
+   * @var \Drupal\big_pipe\Render\BigPipe
    */
   protected $bigPipe;
 
   /**
    * Constructs a HtmlResponseBigPipeSubscriber object.
    *
-   * @param \Drupal\big_pipe\Render\BigPipeInterface $big_pipe
+   * @param \Drupal\big_pipe\Render\BigPipe $big_pipe
    *   The BigPipe service.
    */
-  public function __construct(BigPipeInterface $big_pipe) {
+  public function __construct(BigPipe $big_pipe) {
     $this->bigPipe = $big_pipe;
   }
 
@@ -91,38 +91,24 @@ class HtmlResponseBigPipeSubscriber implements EventSubscriberInterface {
       return;
     }
 
-    $big_pipe_response = new BigPipeResponse();
-    $big_pipe_response->setBigPipeService($this->bigPipe);
-
-    // Clone the HtmlResponse's data into the new BigPipeResponse.
-    $big_pipe_response->headers = clone $response->headers;
-    $big_pipe_response
-      ->setStatusCode($response->getStatusCode())
-      ->setContent($response->getContent())
-      ->setAttachments($attachments)
-      ->addCacheableDependency($response->getCacheableMetadata());
-
-    // A BigPipe response can never be cached, because it is intended for a
-    // single user.
-    // @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.1
-    $big_pipe_response->setPrivate();
-
-    // Inform surrogates how they should handle BigPipe responses:
-    // - "no-store" specifies that the response should not be stored in cache;
-    //   it is only to be used for the original request
-    // - "content" identifies what processing surrogates should perform on the
-    //   response before forwarding it. We send, "BigPipe/1.0", which surrogates
-    //   should not process at all, and in fact, they should not even buffer it
-    //   at all.
-    // @see http://www.w3.org/TR/edge-arch/
-    $big_pipe_response->headers->set('Surrogate-Control', 'no-store, content="BigPipe/1.0"');
-
-    // Add header to support streaming on NGINX + php-fpm (nginx >= 1.5.6).
-    $big_pipe_response->headers->set('X-Accel-Buffering', 'no');
-
+    $big_pipe_response = new BigPipeResponse($response);
+    $big_pipe_response->setBigPipeService($this->getBigPipeService($event));
     $event->setResponse($big_pipe_response);
   }
 
+  /**
+   * Returns the BigPipe service to use to send the current response.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
+   *   A response event.
+   *
+   * @return \Drupal\big_pipe\Render\BigPipe
+   *   The BigPipe service.
+   */
+  protected function getBigPipeService(FilterResponseEvent $event) {
+    return $this->bigPipe;
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/big_pipe/src/EventSubscriber/NoBigPipeRouteAlterSubscriber.php b/web/core/modules/big_pipe/src/EventSubscriber/NoBigPipeRouteAlterSubscriber.php
index 516aeb4e0..8b3c9c23a 100644
--- a/web/core/modules/big_pipe/src/EventSubscriber/NoBigPipeRouteAlterSubscriber.php
+++ b/web/core/modules/big_pipe/src/EventSubscriber/NoBigPipeRouteAlterSubscriber.php
@@ -40,7 +40,7 @@ class NoBigPipeRouteAlterSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
+  public static function getSubscribedEvents() {
     $events[RoutingEvents::ALTER][] = ['onRoutingRouteAlterSetNoBigPipe'];
     return $events;
   }
diff --git a/web/core/modules/big_pipe/src/Render/BigPipe.php b/web/core/modules/big_pipe/src/Render/BigPipe.php
index 1894aa96a..b312d7633 100644
--- a/web/core/modules/big_pipe/src/Render/BigPipe.php
+++ b/web/core/modules/big_pipe/src/Render/BigPipe.php
@@ -21,9 +21,133 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
- * The default BigPipe service.
+ * Service for sending an HTML response in chunks (to get faster page loads).
+ *
+ * At a high level, BigPipe sends a HTML response in chunks:
+ * 1. one chunk: everything until just before </body> — this contains BigPipe
+ *    placeholders for the personalized parts of the page. Hence this sends the
+ *    non-personalized parts of the page. Let's call it The Skeleton.
+ * 2. N chunks: a <script> tag per BigPipe placeholder in The Skeleton.
+ * 3. one chunk: </body> and everything after it.
+ *
+ * This is conceptually identical to Facebook's BigPipe (hence the name).
+ *
+ * @see https://www.facebook.com/notes/facebook-engineering/bigpipe-pipelining-web-pages-for-high-performance/389414033919
+ *
+ * The major way in which Drupal differs from Facebook's implementation (and
+ * others) is in its ability to automatically figure out which parts of the page
+ * can benefit from BigPipe-style delivery. Drupal's render system has the
+ * concept of "auto-placeholdering": content that is too dynamic is replaced
+ * with a placeholder that can then be rendered at a later time. On top of that,
+ * it also has the concept of "placeholder strategies": by default, placeholders
+ * are replaced on the server side and the response is blocked on all of them
+ * being replaced. But it's possible to add additional placeholder strategies.
+ * BigPipe is just another placeholder strategy. Others could be ESI, AJAX …
+ *
+ * @see https://www.drupal.org/developing/api/8/render/arrays/cacheability/auto-placeholdering
+ * @see \Drupal\Core\Render\PlaceholderGeneratorInterface::shouldAutomaticallyPlaceholder()
+ * @see \Drupal\Core\Render\Placeholder\PlaceholderStrategyInterface
+ * @see \Drupal\Core\Render\Placeholder\SingleFlushStrategy
+ * @see \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
+ *
+ * There is also one noteworthy technical addition that Drupal makes. BigPipe as
+ * described above, and as implemented by Facebook, can only work if JavaScript
+ * is enabled. The BigPipe module also makes it possible to replace placeholders
+ * using BigPipe in-situ, without JavaScript. This is not technically BigPipe at
+ * all; it's just the use of multiple flushes. Since it is able to reuse much of
+ * the logic though, we choose to call this "no-JS BigPipe".
+ *
+ * However, there is also a tangible benefit: some dynamic/expensive content is
+ * not HTML, but for example a HTML attribute value (or part thereof). It's not
+ * possible to efficiently replace such content using JavaScript, so "classic"
+ * BigPipe is out of the question. For example: CSRF tokens in URLs.
+ *
+ * This allows us to use both no-JS BigPipe and "classic" BigPipe in the same
+ * response to maximize the amount of content we can send as early as possible.
+ *
+ * Finally, a closer look at the implementation, and how it supports and reuses
+ * existing Drupal concepts:
+ * 1. BigPipe placeholders: 1 HtmlResponse + N embedded AjaxResponses.
+ *   - Before a BigPipe response is sent, it is just a HTML response that
+ *     contains BigPipe placeholders. Those placeholders look like
+ *     <span data-big-pipe-placeholder-id="…"></span>. JavaScript is used to
+ *     replace those placeholders.
+ *     Therefore these placeholders are actually sent to the client.
+ *   - The Skeleton of course has attachments, including most notably asset
+ *     libraries. And those we track in drupalSettings.ajaxPageState.libraries —
+ *     so that when we load new content through AJAX, we don't load the same
+ *     asset libraries again. A HTML page can have multiple AJAX responses, each
+ *     of which should take into account the combined AJAX page state of the
+ *     HTML document and all preceding AJAX responses.
+ *   - BigPipe does not make use of multiple AJAX requests/responses. It uses a
+ *     single HTML response. But it is a more long-lived one: The Skeleton is
+ *     sent first, the closing </body> tag is not yet sent, and the connection
+ *     is kept open. Whenever another BigPipe Placeholder is rendered, Drupal
+ *     sends (and so actually appends to the already-sent HTML) something like
+ *     <script type="application/vnd.drupal-ajax">[{"command":"settings","settings":{…}}, {"command":…}.
+ *   - So, for every BigPipe placeholder, we send such a <script
+ *     type="application/vnd.drupal-ajax"> tag. And the contents of that tag is
+ *     exactly like an AJAX response. The BigPipe module has JavaScript that
+ *     listens for these and applies them. Let's call it an Embedded AJAX
+ *     Response (since it is embedded in the HTML response). Now for the
+ *     interesting bit: each of those Embedded AJAX Responses must also take
+ *     into account the cumulative AJAX page state of the HTML document and all
+ *     preceding Embedded AJAX responses.
+ * 2. No-JS BigPipe placeholders: 1 HtmlResponse + N embedded HtmlResponses.
+ *   - Before a BigPipe response is sent, it is just a HTML response that
+ *     contains no-JS BigPipe placeholders. Those placeholders can take two
+ *     different forms:
+ *     1. <span data-big-pipe-nojs-placeholder-id="…"></span> if it's a
+ *        placeholder that will be replaced by HTML
+ *     2. big_pipe_nojs_placeholder_attribute_safe:… if it's a placeholder
+ *        inside a HTML attribute, in which 1. would be invalid (angle brackets
+ *        are not allowed inside HTML attributes)
+ *     No-JS BigPipe placeholders are not replaced using JavaScript, they must
+ *     be replaced upon sending the BigPipe response. So, while the response is
+ *     being sent, upon encountering these placeholders, their corresponding
+ *     placeholder replacements are sent instead.
+ *     Therefore these placeholders are never actually sent to the client.
+ *   - See second bullet of point 1.
+ *   - No-JS BigPipe does not use multiple AJAX requests/responses. It uses a
+ *     single HTML response. But it is a more long-lived one: The Skeleton is
+ *     split into multiple parts, the separators are where the no-JS BigPipe
+ *     placeholders used to be. Whenever another no-JS BigPipe placeholder is
+ *     rendered, Drupal sends (and so actually appends to the already-sent HTML)
+ *     something like
+ *     <link rel="stylesheet" …><script …><content>.
+ *   - So, for every no-JS BigPipe placeholder, we send its associated CSS and
+ *     header JS that has not already been sent (the bottom JS is not yet sent,
+ *     so we can accumulate all of it and send it together at the end). This
+ *     ensures that the markup is rendered as it was originally intended: its
+ *     CSS and JS used to be blocking, and it still is. Let's call it an
+ *     Embedded HTML response. Each of those Embedded HTML Responses must also
+ *     take into account the cumulative AJAX page state of the HTML document and
+ *     all preceding Embedded HTML responses.
+ *   - Finally: any non-critical JavaScript associated with all Embedded HTML
+ *     Responses, i.e. any footer/bottom/non-header JavaScript, is loaded after
+ *     The Skeleton.
+ *
+ * Combining all of the above, when using both BigPipe placeholders and no-JS
+ * BigPipe placeholders, we therefore send: 1 HtmlResponse + M Embedded HTML
+ * Responses + N Embedded AJAX Responses. Schematically, we send these chunks:
+ *  1. Byte zero until 1st no-JS placeholder: headers + <html><head /><span>…</span>
+ *  2. 1st no-JS placeholder replacement: <link rel="stylesheet" …><script …><content>
+ *  3. Content until 2nd no-JS placeholder: <span>…</span>
+ *  4. 2nd no-JS placeholder replacement: <link rel="stylesheet" …><script …><content>
+ *  5. Content until 3rd no-JS placeholder: <span>…</span>
+ *  6. [… repeat until all no-JS placeholder replacements are sent …]
+ *  7. Send content after last no-JS placeholder.
+ *  8. Send script_bottom (markup to load bottom i.e. non-critical JS).
+ *  9. 1st placeholder replacement: <script type="application/vnd.drupal-ajax">[{"command":"settings","settings":{…}}, {"command":…}
+ * 10. 2nd placeholder replacement: <script type="application/vnd.drupal-ajax">[{"command":"settings","settings":{…}}, {"command":…}
+ * 11. [… repeat until all placeholder replacements are sent …]
+ * 12. Send </body> and everything after it.
+ * 13. Terminate request/response cycle.
+ *
+ * @see \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber
+ * @see \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
  */
-class BigPipe implements BigPipeInterface {
+class BigPipe {
 
   /**
    * The BigPipe placeholder replacements start signal.
@@ -107,9 +231,56 @@ class BigPipe implements BigPipeInterface {
   }
 
   /**
-   * {@inheritdoc}
+   * Performs tasks before sending content (and rendering placeholders).
    */
-  public function sendContent($content, array $attachments) {
+  protected function performPreSendTasks() {
+    // The content in the placeholders may depend on the session, and by the
+    // time the response is sent (see index.php), the session is already
+    // closed. Reopen it for the duration that we are rendering placeholders.
+    $this->session->start();
+  }
+
+  /**
+   * Performs tasks after sending content (and rendering placeholders).
+   */
+  protected function performPostSendTasks() {
+    // Close the session again.
+    $this->session->save();
+  }
+
+  /**
+   * Sends a chunk.
+   *
+   * @param string|\Drupal\Core\Render\HtmlResponse $chunk
+   *   The string or response to append. String if there's no cacheability
+   *   metadata or attachments to merge.
+   */
+  protected function sendChunk($chunk) {
+    assert(is_string($chunk) || $chunk instanceof HtmlResponse);
+    if ($chunk instanceof HtmlResponse) {
+      print $chunk->getContent();
+    }
+    else {
+      print $chunk;
+    }
+    flush();
+  }
+
+  /**
+   * Sends an HTML response in chunks using the BigPipe technique.
+   *
+   * @param \Drupal\big_pipe\Render\BigPipeResponse $response
+   *   The BigPipe response to send.
+   *
+   * @internal
+   *   This method should only be invoked by
+   *   \Drupal\big_pipe\Render\BigPipeResponse, which is itself an internal
+   *   class.
+   */
+  public function sendContent(BigPipeResponse $response) {
+    $content = $response->getContent();
+    $attachments = $response->getAttachments();
+
     // First, gather the BigPipe placeholders that must be replaced.
     $placeholders = isset($attachments['big_pipe_placeholders']) ? $attachments['big_pipe_placeholders'] : [];
     $nojs_placeholders = isset($attachments['big_pipe_nojs_placeholders']) ? $attachments['big_pipe_nojs_placeholders'] : [];
@@ -121,10 +292,7 @@ class BigPipe implements BigPipeInterface {
     $cumulative_assets = AttachedAssets::createFromRenderArray(['#attached' => $attachments]);
     $cumulative_assets->setAlreadyLoadedLibraries($attachments['library']);
 
-    // The content in the placeholders may depend on the session, and by the
-    // time the response is sent (see index.php), the session is already closed.
-    // Reopen it for the duration that we are rendering placeholders.
-    $this->session->start();
+    $this->performPreSendTasks();
 
     // Find the closing </body> tag and get the strings before and after. But be
     // careful to use the latest occurrence of the string "</body>", to ensure
@@ -137,10 +305,7 @@ class BigPipe implements BigPipeInterface {
     $this->sendPlaceholders($placeholders, $this->getPlaceholderOrder($pre_body, $placeholders), $cumulative_assets);
     $this->sendPostBody($post_body);
 
-    // Close the session again.
-    $this->session->save();
-
-    return $this;
+    $this->performPostSendTasks();
   }
 
   /**
@@ -158,8 +323,7 @@ class BigPipe implements BigPipeInterface {
     // If there are no no-JS BigPipe placeholders, we can send the pre-</body>
     // part of the page immediately.
     if (empty($no_js_placeholders)) {
-      print $pre_body;
-      flush();
+      $this->sendChunk($pre_body);
       return;
     }
 
@@ -202,8 +366,7 @@ class BigPipe implements BigPipeInterface {
       $scripts_bottom = $html_response->getContent();
     }
 
-    print $scripts_bottom;
-    flush();
+    $this->sendChunk($scripts_bottom);
   }
 
   /**
@@ -244,8 +407,7 @@ class BigPipe implements BigPipeInterface {
       // between placeholders and it must be printed & flushed immediately. The
       // rest of the logic in the loop handles the placeholders.
       if (!isset($no_js_placeholders[$fragment])) {
-        print $fragment;
-        flush();
+        $this->sendChunk($fragment);
         continue;
       }
 
@@ -253,8 +415,7 @@ class BigPipe implements BigPipeInterface {
       // this is the second occurrence, we can skip all calculations and just
       // send the same content.
       if ($placeholder_occurrences[$fragment] > 1 && isset($multi_occurrence_placeholders_content[$fragment])) {
-        print $multi_occurrence_placeholders_content[$fragment];
-        flush();
+        $this->sendChunk($multi_occurrence_placeholders_content[$fragment]);
         continue;
       }
 
@@ -324,8 +485,7 @@ class BigPipe implements BigPipeInterface {
 
 
       // Send this embedded HTML response.
-      print $html_response->getContent();
-      flush();
+      $this->sendChunk($html_response);
 
       // Another placeholder was rendered and sent, track the set of asset
       // libraries sent so far. Any new settings also need to be tracked, so
@@ -369,10 +529,7 @@ class BigPipe implements BigPipeInterface {
     }
 
     // Send the start signal.
-    print "\n";
-    print static::START_SIGNAL;
-    print "\n";
-    flush();
+    $this->sendChunk("\n" . static::START_SIGNAL . "\n");
 
     // A BigPipe response consists of a HTML response plus multiple embedded
     // AJAX responses. To process the attachments of those AJAX responses, we
@@ -444,8 +601,7 @@ class BigPipe implements BigPipeInterface {
     $json
     </script>
 EOF;
-      print $output;
-      flush();
+      $this->sendChunk($output);
 
       // Another placeholder was rendered and sent, track the set of asset
       // libraries sent so far. Any new settings are already sent; we don't need
@@ -456,10 +612,7 @@ EOF;
     }
 
     // Send the stop signal.
-    print "\n";
-    print static::STOP_SIGNAL;
-    print "\n";
-    flush();
+    $this->sendChunk("\n" . static::STOP_SIGNAL . "\n");
   }
 
   /**
@@ -479,8 +632,28 @@ EOF;
    */
   protected function filterEmbeddedResponse(Request $fake_request, Response $embedded_response) {
     assert('$embedded_response instanceof \Drupal\Core\Render\HtmlResponse || $embedded_response instanceof \Drupal\Core\Ajax\AjaxResponse');
-    $this->requestStack->push($fake_request);
-    $event = new FilterResponseEvent($this->httpKernel, $fake_request, HttpKernelInterface::SUB_REQUEST, $embedded_response);
+    return $this->filterResponse($fake_request, HttpKernelInterface::SUB_REQUEST, $embedded_response);
+  }
+
+  /**
+   * Filters the given response.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The request for which a response is being sent.
+   * @param int $request_type
+   *   The request type. Can either be
+   *   \Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST or
+   *   \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST.
+   * @param \Symfony\Component\HttpFoundation\Response $response
+   *   The response to filter.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   The filtered response.
+   */
+  protected function filterResponse(Request $request, $request_type, Response $response) {
+    assert('$request_type === \Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST || $request_type === \Symfony\Component\HttpKernel\HttpKernelInterface::SUB_REQUEST');
+    $this->requestStack->push($request);
+    $event = new FilterResponseEvent($this->httpKernel, $request, $request_type, $response);
     $this->eventDispatcher->dispatch(KernelEvents::RESPONSE, $event);
     $filtered_response = $event->getResponse();
     $this->requestStack->pop();
@@ -494,9 +667,7 @@ EOF;
    *   The HTML response's content after the closing </body> tag.
    */
   protected function sendPostBody($post_body) {
-    print '</body>';
-    print $post_body;
-    flush();
+    $this->sendChunk('</body>' . $post_body);
   }
 
   /**
@@ -545,12 +716,12 @@ EOF;
    *   only keep the first occurrence.
    */
   protected function getPlaceholderOrder($html, $placeholders) {
-    $fragments = explode('<div data-big-pipe-placeholder-id="', $html);
+    $fragments = explode('<span data-big-pipe-placeholder-id="', $html);
     array_shift($fragments);
     $placeholder_ids = [];
 
     foreach ($fragments as $fragment) {
-      $t = explode('"></div>', $fragment, 2);
+      $t = explode('"></span>', $fragment, 2);
       $placeholder_id = $t[0];
       $placeholder_ids[] = $placeholder_id;
     }
diff --git a/web/core/modules/big_pipe/src/Render/BigPipeInterface.php b/web/core/modules/big_pipe/src/Render/BigPipeInterface.php
deleted file mode 100644
index 6d0e5a7c0..000000000
--- a/web/core/modules/big_pipe/src/Render/BigPipeInterface.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-namespace Drupal\big_pipe\Render;
-
-/**
- * Interface for sending an HTML response in chunks (to get faster page loads).
- *
- * At a high level, BigPipe sends a HTML response in chunks:
- * 1. one chunk: everything until just before </body> — this contains BigPipe
- *    placeholders for the personalized parts of the page. Hence this sends the
- *    non-personalized parts of the page. Let's call it The Skeleton.
- * 2. N chunks: a <script> tag per BigPipe placeholder in The Skeleton.
- * 3. one chunk: </body> and everything after it.
- *
- * This is conceptually identical to Facebook's BigPipe (hence the name).
- *
- * @see https://www.facebook.com/notes/facebook-engineering/bigpipe-pipelining-web-pages-for-high-performance/389414033919
- *
- * The major way in which Drupal differs from Facebook's implementation (and
- * others) is in its ability to automatically figure out which parts of the page
- * can benefit from BigPipe-style delivery. Drupal's render system has the
- * concept of "auto-placeholdering": content that is too dynamic is replaced
- * with a placeholder that can then be rendered at a later time. On top of that,
- * it also has the concept of "placeholder strategies": by default, placeholders
- * are replaced on the server side and the response is blocked on all of them
- * being replaced. But it's possible to add additional placeholder strategies.
- * BigPipe is just another placeholder strategy. Others could be ESI, AJAX …
- *
- * @see https://www.drupal.org/developing/api/8/render/arrays/cacheability/auto-placeholdering
- * @see \Drupal\Core\Render\PlaceholderGeneratorInterface::shouldAutomaticallyPlaceholder()
- * @see \Drupal\Core\Render\Placeholder\PlaceholderStrategyInterface
- * @see \Drupal\Core\Render\Placeholder\SingleFlushStrategy
- * @see \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
- *
- * There is also one noteworthy technical addition that Drupal makes. BigPipe as
- * described above, and as implemented by Facebook, can only work if JavaScript
- * is enabled. The BigPipe module also makes it possible to replace placeholders
- * using BigPipe in-situ, without JavaScript. This is not technically BigPipe at
- * all; it's just the use of multiple flushes. Since it is able to reuse much of
- * the logic though, we choose to call this "no-JS BigPipe".
- *
- * However, there is also a tangible benefit: some dynamic/expensive content is
- * not HTML, but for example a HTML attribute value (or part thereof). It's not
- * possible to efficiently replace such content using JavaScript, so "classic"
- * BigPipe is out of the question. For example: CSRF tokens in URLs.
- *
- * This allows us to use both no-JS BigPipe and "classic" BigPipe in the same
- * response to maximize the amount of content we can send as early as possible.
- *
- * Finally, a closer look at the implementation, and how it supports and reuses
- * existing Drupal concepts:
- * 1. BigPipe placeholders: 1 HtmlResponse + N embedded AjaxResponses.
- *   - Before a BigPipe response is sent, it is just a HTML response that
- *     contains BigPipe placeholders. Those placeholders look like
- *     <div data-big-pipe-placeholder-id="…"></div>. JavaScript is used to
- *     replace those placeholders.
- *     Therefore these placeholders are actually sent to the client.
- *   - The Skeleton of course has attachments, including most notably asset
- *     libraries. And those we track in drupalSettings.ajaxPageState.libraries —
- *     so that when we load new content through AJAX, we don't load the same
- *     asset libraries again. A HTML page can have multiple AJAX responses, each
- *     of which should take into account the combined AJAX page state of the
- *     HTML document and all preceding AJAX responses.
- *   - BigPipe does not make use of multiple AJAX requests/responses. It uses a
- *     single HTML response. But it is a more long-lived one: The Skeleton is
- *     sent first, the closing </body> tag is not yet sent, and the connection
- *     is kept open. Whenever another BigPipe Placeholder is rendered, Drupal
- *     sends (and so actually appends to the already-sent HTML) something like
- *     <script type="application/vnd.drupal-ajax">[{"command":"settings","settings":{…}}, {"command":…}.
- *   - So, for every BigPipe placeholder, we send such a <script
- *     type="application/vnd.drupal-ajax"> tag. And the contents of that tag is
- *     exactly like an AJAX response. The BigPipe module has JavaScript that
- *     listens for these and applies them. Let's call it an Embedded AJAX
- *     Response (since it is embedded in the HTML response). Now for the
- *     interesting bit: each of those Embedded AJAX Responses must also take
- *     into account the cumulative AJAX page state of the HTML document and all
- *     preceding Embedded AJAX responses.
- * 2. No-JS BigPipe placeholders: 1 HtmlResponse + N embedded HtmlResponses.
- *   - Before a BigPipe response is sent, it is just a HTML response that
- *     contains no-JS BigPipe placeholders. Those placeholders can take two
- *     different forms:
- *     1. <div data-big-pipe-nojs-placeholder-id="…"></div> if it's a
- *        placeholder that will be replaced by HTML
- *     2. big_pipe_nojs_placeholder_attribute_safe:… if it's a placeholder
- *        inside a HTML attribute, in which 1. would be invalid (angle brackets
- *        are not allowed inside HTML attributes)
- *     No-JS BigPipe placeholders are not replaced using JavaScript, they must
- *     be replaced upon sending the BigPipe response. So, while the response is
- *     being sent, upon encountering these placeholders, their corresponding
- *     placeholder replacements are sent instead.
- *     Therefore these placeholders are never actually sent to the client.
- *   - See second bullet of point 1.
- *   - No-JS BigPipe does not use multiple AJAX requests/responses. It uses a
- *     single HTML response. But it is a more long-lived one: The Skeleton is
- *     split into multiple parts, the separators are where the no-JS BigPipe
- *     placeholders used to be. Whenever another no-JS BigPipe placeholder is
- *     rendered, Drupal sends (and so actually appends to the already-sent HTML)
- *     something like
- *     <link rel="stylesheet" …><script …><content>.
- *   - So, for every no-JS BigPipe placeholder, we send its associated CSS and
- *     header JS that has not already been sent (the bottom JS is not yet sent,
- *     so we can accumulate all of it and send it together at the end). This
- *     ensures that the markup is rendered as it was originally intended: its
- *     CSS and JS used to be blocking, and it still is. Let's call it an
- *     Embedded HTML response. Each of those Embedded HTML Responses must also
- *     take into account the cumulative AJAX page state of the HTML document and
- *     all preceding Embedded HTML responses.
- *   - Finally: any non-critical JavaScript associated with all Embedded HTML
- *     Responses, i.e. any footer/bottom/non-header JavaScript, is loaded after
- *     The Skeleton.
- *
- * Combining all of the above, when using both BigPipe placeholders and no-JS
- * BigPipe placeholders, we therefore send: 1 HtmlResponse + M Embedded HTML
- * Responses + N Embedded AJAX Responses. Schematically, we send these chunks:
- *  1. Byte zero until 1st no-JS placeholder: headers + <html><head /><div>…</div>
- *  2. 1st no-JS placeholder replacement: <link rel="stylesheet" …><script …><content>
- *  3. Content until 2nd no-JS placeholder: <div>…</div>
- *  4. 2nd no-JS placeholder replacement: <link rel="stylesheet" …><script …><content>
- *  5. Content until 3rd no-JS placeholder: <div>…</div>
- *  6. [… repeat until all no-JS placeholder replacements are sent …]
- *  7. Send content after last no-JS placeholder.
- *  8. Send script_bottom (markup to load bottom i.e. non-critical JS).
- *  9. 1st placeholder replacement: <script type="application/vnd.drupal-ajax">[{"command":"settings","settings":{…}}, {"command":…}
- * 10. 2nd placeholder replacement: <script type="application/vnd.drupal-ajax">[{"command":"settings","settings":{…}}, {"command":…}
- * 11. [… repeat until all placeholder replacements are sent …]
- * 12. Send </body> and everything after it.
- * 13. Terminate request/response cycle.
- *
- * @see \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber
- * @see \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
- */
-interface BigPipeInterface {
-
-  /**
-   * Sends an HTML response in chunks using the BigPipe technique.
-   *
-   * @param string $content
-   *   The HTML response content to send.
-   * @param array $attachments
-   *   The HTML response's attachments.
-   *
-   * @internal
-   *   This method should only be invoked by
-   *   \Drupal\big_pipe\Render\BigPipeResponse, which is itself an internal
-   *   class. Furthermore, the signature of this method will change in
-   *   https://www.drupal.org/node/2657684.
-   */
-  public function sendContent($content, array $attachments);
-
-}
diff --git a/web/core/modules/big_pipe/src/Render/BigPipeResponse.php b/web/core/modules/big_pipe/src/Render/BigPipeResponse.php
index c6871d5e2..70b637d34 100644
--- a/web/core/modules/big_pipe/src/Render/BigPipeResponse.php
+++ b/web/core/modules/big_pipe/src/Render/BigPipeResponse.php
@@ -11,7 +11,7 @@ use Drupal\Core\Render\HtmlResponse;
  * it makes the content inaccessible (hidden behind a callback), which means no
  * middlewares are able to modify the content anymore.
  *
- * @see \Drupal\big_pipe\Render\BigPipeInterface
+ * @see \Drupal\big_pipe\Render\BigPipe
  *
  * @internal
  *   This is a temporary solution until a generic response emitter interface is
@@ -23,17 +23,85 @@ class BigPipeResponse extends HtmlResponse {
   /**
    * The BigPipe service.
    *
-   * @var \Drupal\big_pipe\Render\BigPipeInterface
+   * @var \Drupal\big_pipe\Render\BigPipe
    */
   protected $bigPipe;
 
+  /**
+   * The original HTML response.
+   *
+   * Still contains placeholders. Its cacheability metadata and attachments are
+   * for everything except the placeholders (since those are not yet rendered).
+   *
+   * @see \Drupal\Core\Render\StreamedResponseInterface
+   * @see ::getStreamedResponse()
+   *
+   * @var \Drupal\Core\Render\HtmlResponse
+   */
+  protected $originalHtmlResponse;
+
+  /**
+   * Constructs a new BigPipeResponse.
+   *
+   * @param \Drupal\Core\Render\HtmlResponse $response
+   *   The original HTML response.
+   */
+  public function __construct(HtmlResponse $response) {
+    parent::__construct('', $response->getStatusCode(), []);
+
+    $this->originalHtmlResponse = $response;
+
+    $this->populateBasedOnOriginalHtmlResponse();
+  }
+
+  /**
+   * Returns the original HTML response.
+   *
+   * @return \Drupal\Core\Render\HtmlResponse
+   *   The original HTML response.
+   */
+  public function getOriginalHtmlResponse() {
+    return $this->originalHtmlResponse;
+  }
+
+  /**
+   * Populates this BigPipeResponse object based on the original HTML response.
+   */
+  protected function populateBasedOnOriginalHtmlResponse() {
+    // Clone the HtmlResponse's data into the new BigPipeResponse.
+    $this->headers = clone $this->originalHtmlResponse->headers;
+    $this
+      ->setStatusCode($this->originalHtmlResponse->getStatusCode())
+      ->setContent($this->originalHtmlResponse->getContent())
+      ->setAttachments($this->originalHtmlResponse->getAttachments())
+      ->addCacheableDependency($this->originalHtmlResponse->getCacheableMetadata());
+
+    // A BigPipe response can never be cached, because it is intended for a
+    // single user.
+    // @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.1
+    $this->setPrivate();
+
+    // Inform surrogates how they should handle BigPipe responses:
+    // - "no-store" specifies that the response should not be stored in cache;
+    //   it is only to be used for the original request
+    // - "content" identifies what processing surrogates should perform on the
+    //   response before forwarding it. We send, "BigPipe/1.0", which surrogates
+    //   should not process at all, and in fact, they should not even buffer it
+    //   at all.
+    // @see http://www.w3.org/TR/edge-arch/
+    $this->headers->set('Surrogate-Control', 'no-store, content="BigPipe/1.0"');
+
+    // Add header to support streaming on NGINX + php-fpm (nginx >= 1.5.6).
+    $this->headers->set('X-Accel-Buffering', 'no');
+  }
+
   /**
    * Sets the BigPipe service to use.
    *
-   * @param \Drupal\big_pipe\Render\BigPipeInterface $big_pipe
+   * @param \Drupal\big_pipe\Render\BigPipe $big_pipe
    *   The BigPipe service.
    */
-  public function setBigPipeService(BigPipeInterface $big_pipe) {
+  public function setBigPipeService(BigPipe $big_pipe) {
     $this->bigPipe = $big_pipe;
   }
 
@@ -41,7 +109,12 @@ class BigPipeResponse extends HtmlResponse {
    * {@inheritdoc}
    */
   public function sendContent() {
-    $this->bigPipe->sendContent($this->content, $this->getAttachments());
+    $this->bigPipe->sendContent($this);
+
+    // All BigPipe placeholders are processed, so update this response's
+    // attachments.
+    unset($this->attachments['big_pipe_placeholders']);
+    unset($this->attachments['big_pipe_nojs_placeholders']);
 
     return $this;
   }
diff --git a/web/core/modules/big_pipe/src/Render/BigPipeResponseAttachmentsProcessor.php b/web/core/modules/big_pipe/src/Render/BigPipeResponseAttachmentsProcessor.php
index 32640c2f7..94b892370 100644
--- a/web/core/modules/big_pipe/src/Render/BigPipeResponseAttachmentsProcessor.php
+++ b/web/core/modules/big_pipe/src/Render/BigPipeResponseAttachmentsProcessor.php
@@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
  * Processes attachments of HTML responses with BigPipe enabled.
  *
  * @see \Drupal\Core\Render\HtmlResponseAttachmentsProcessor
- * @see \Drupal\big_pipe\Render\BigPipeInterface
+ * @see \Drupal\big_pipe\Render\BigPipe
  */
 class BigPipeResponseAttachmentsProcessor extends HtmlResponseAttachmentsProcessor {
 
diff --git a/web/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php b/web/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
index 91ad604b4..f967ebaff 100644
--- a/web/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
+++ b/web/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\big_pipe\Render\Placeholder;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Render\Placeholder\PlaceholderStrategyInterface;
@@ -55,7 +56,7 @@ use Symfony\Component\HttpFoundation\RequestStack;
  * See \Drupal\big_pipe\Render\BigPipe for detailed documentation on how those
  * different placeholders are actually replaced.
  *
- * @see \Drupal\big_pipe\Render\BigPipeInterface
+ * @see \Drupal\big_pipe\Render\BigPipe
  */
 class BigPipeStrategy implements PlaceholderStrategyInterface {
 
@@ -149,7 +150,7 @@ class BigPipeStrategy implements PlaceholderStrategyInterface {
       // @see \Drupal\Core\Access\RouteProcessorCsrf::renderPlaceholderCsrfToken()
       // @see \Drupal\Core\Form\FormBuilder::renderFormTokenPlaceholder()
       // @see \Drupal\Core\Form\FormBuilder::renderPlaceholderFormAction()
-      if ($placeholder[0] !== '<' || $placeholder !== Html::normalize($placeholder)) {
+      if (static::placeholderIsAttributeSafe($placeholder)) {
         $overridden_placeholders[$placeholder] = static::createBigPipeNoJsPlaceholder($placeholder, $placeholder_elements, TRUE);
       }
       else {
@@ -168,6 +169,21 @@ class BigPipeStrategy implements PlaceholderStrategyInterface {
     return $overridden_placeholders;
   }
 
+  /**
+   * Determines whether the given placeholder is attribute-safe or not.
+   *
+   * @param string $placeholder
+   *   A placeholder.
+   *
+   * @return bool
+   *   Whether the placeholder is safe for use in a HTML attribute (in case it's
+   *   a placeholder for a HTML attribute value or a subset of it).
+   */
+  protected static function placeholderIsAttributeSafe($placeholder) {
+    assert('is_string($placeholder)');
+    return $placeholder[0] !== '<' || $placeholder !== Html::normalize($placeholder);
+  }
+
   /**
    * Creates a BigPipe JS placeholder.
    *
@@ -183,7 +199,7 @@ class BigPipeStrategy implements PlaceholderStrategyInterface {
     $big_pipe_placeholder_id = static::generateBigPipePlaceholderId($original_placeholder, $placeholder_render_array);
 
     return [
-      '#markup' => '<div data-big-pipe-placeholder-id="' . Html::escape($big_pipe_placeholder_id) . '"></div>',
+      '#markup' => '<span data-big-pipe-placeholder-id="' . Html::escape($big_pipe_placeholder_id) . '"></span>',
       '#cache' => [
         'max-age' => 0,
         'contexts' => [
@@ -221,7 +237,7 @@ class BigPipeStrategy implements PlaceholderStrategyInterface {
    */
   protected static function createBigPipeNoJsPlaceholder($original_placeholder, array $placeholder_render_array, $placeholder_must_be_attribute_safe = FALSE) {
     if (!$placeholder_must_be_attribute_safe) {
-      $big_pipe_placeholder = '<div data-big-pipe-nojs-placeholder-id="' . Html::escape(static::generateBigPipePlaceholderId($original_placeholder, $placeholder_render_array)) . '"></div>';
+      $big_pipe_placeholder = '<span data-big-pipe-nojs-placeholder-id="' . Html::escape(static::generateBigPipePlaceholderId($original_placeholder, $placeholder_render_array)) . '"></span>';
     }
     else {
       $big_pipe_placeholder = 'big_pipe_nojs_placeholder_attribute_safe:' . Html::escape($original_placeholder);
@@ -260,7 +276,7 @@ class BigPipeStrategy implements PlaceholderStrategyInterface {
     if (isset($placeholder_render_array['#lazy_builder'])) {
       $callback = $placeholder_render_array['#lazy_builder'][0];
       $arguments = $placeholder_render_array['#lazy_builder'][1];
-      $token = hash('crc32b', serialize($placeholder_render_array));
+      $token = Crypt::hashBase64(serialize($placeholder_render_array));
       return UrlHelper::buildQuery(['callback' => $callback, 'args' => $arguments, 'token' => $token]);
     }
     // When the placeholder's render array is not using a #lazy_builder,
diff --git a/web/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php b/web/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php
index d2db3cb72..69ec86fdc 100644
--- a/web/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php
+++ b/web/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php
@@ -51,7 +51,7 @@ class BigPipePlaceholderTestCases {
     // 1. Real-world example of HTML placeholder.
     $status_messages = new BigPipePlaceholderTestCase(
       ['#type' => 'status_messages'],
-      '<drupal-render-placeholder callback="Drupal\Core\Render\Element\StatusMessages::renderMessages" arguments="0" token="a8c34b5e"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="Drupal\Core\Render\Element\StatusMessages::renderMessages" arguments="0" token="_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA"></drupal-render-placeholder>',
       [
         '#lazy_builder' => [
           'Drupal\Core\Render\Element\StatusMessages::renderMessages',
@@ -59,29 +59,29 @@ class BigPipePlaceholderTestCases {
         ],
       ]
     );
-    $status_messages->bigPipePlaceholderId = 'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e';
+    $status_messages->bigPipePlaceholderId = 'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA';
     $status_messages->bigPipePlaceholderRenderArray = [
-      '#markup' => '<div data-big-pipe-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e"></div>',
+      '#markup' => '<span data-big-pipe-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA"></span>',
       '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
       '#attached' => [
         'library' => ['big_pipe/big_pipe'],
         'drupalSettings' => [
           'bigPipePlaceholderIds' => [
-            'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&args[0]&token=a8c34b5e' => TRUE,
+            'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&args[0]&token=_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA' => TRUE,
           ],
         ],
         'big_pipe_placeholders' => [
-          'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e' => $status_messages->placeholderRenderArray,
+          'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA' => $status_messages->placeholderRenderArray,
         ],
       ],
     ];
-    $status_messages->bigPipeNoJsPlaceholder = '<div data-big-pipe-nojs-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e"></div>';
+    $status_messages->bigPipeNoJsPlaceholder = '<span data-big-pipe-nojs-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA"></span>';
     $status_messages->bigPipeNoJsPlaceholderRenderArray = [
-      '#markup' => '<div data-big-pipe-nojs-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e"></div>',
+      '#markup' => '<span data-big-pipe-nojs-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA"></span>',
       '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
       '#attached' => [
         'big_pipe_nojs_placeholders' => [
-          '<div data-big-pipe-nojs-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e"></div>' => $status_messages->placeholderRenderArray,
+          '<span data-big-pipe-nojs-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA"></span>' => $status_messages->placeholderRenderArray,
         ],
       ],
     ];
@@ -109,7 +109,7 @@ class BigPipePlaceholderTestCases {
         [
           'command' => 'insert',
           'method' => 'replaceWith',
-          'selector' => '[data-big-pipe-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&args[0]&token=a8c34b5e"]',
+          'selector' => '[data-big-pipe-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&args[0]&token=_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA"]',
           'data' => "\n" . '    <div role="contentinfo" aria-label="Status message" class="messages messages--status">' . "\n" . '                  <h2 class="visually-hidden">Status message</h2>' . "\n" . '                    Hello from BigPipe!' . "\n" . '            </div>' . "\n    ",
           'settings' => NULL,
         ],
@@ -225,7 +225,7 @@ class BigPipePlaceholderTestCases {
     );
     $current_time->bigPipePlaceholderId = 'timecurrent-timetime';
     $current_time->bigPipePlaceholderRenderArray = [
-      '#markup' => '<div data-big-pipe-placeholder-id="timecurrent-timetime"></div>',
+      '#markup' => '<span data-big-pipe-placeholder-id="timecurrent-timetime"></span>',
       '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
       '#attached' => [
         'library' => ['big_pipe/big_pipe'],
@@ -248,13 +248,13 @@ class BigPipePlaceholderTestCases {
         'settings' => NULL,
       ],
     ];
-    $current_time->bigPipeNoJsPlaceholder = '<div data-big-pipe-nojs-placeholder-id="timecurrent-timetime"></div>';
+    $current_time->bigPipeNoJsPlaceholder = '<span data-big-pipe-nojs-placeholder-id="timecurrent-timetime"></span>';
     $current_time->bigPipeNoJsPlaceholderRenderArray = [
-      '#markup' => '<div data-big-pipe-nojs-placeholder-id="timecurrent-timetime"></div>',
+      '#markup' => '<span data-big-pipe-nojs-placeholder-id="timecurrent-timetime"></span>',
       '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
       '#attached' => [
         'big_pipe_nojs_placeholders' => [
-          '<div data-big-pipe-nojs-placeholder-id="timecurrent-timetime"></div>' => $current_time->placeholderRenderArray,
+          '<span data-big-pipe-nojs-placeholder-id="timecurrent-timetime"></span>' => $current_time->placeholderRenderArray,
         ],
       ],
     ];
@@ -267,29 +267,29 @@ class BigPipePlaceholderTestCases {
         '#lazy_builder' => ['\Drupal\big_pipe_test\BigPipeTestController::exception', ['llamas', 'suck']],
         '#create_placeholder' => TRUE,
       ],
-      '<drupal-render-placeholder callback="\Drupal\big_pipe_test\BigPipeTestController::exception" arguments="0=llamas&amp;1=suck" token="68a75f1a"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="\Drupal\big_pipe_test\BigPipeTestController::exception" arguments="0=llamas&amp;1=suck" token="uhKFNfT4eF449_W-kDQX8E5z4yHyt0-nSHUlwaGAQeU"></drupal-render-placeholder>',
       [
         '#lazy_builder' => ['\Drupal\big_pipe_test\BigPipeTestController::exception', ['llamas', 'suck']],
       ]
     );
-    $exception->bigPipePlaceholderId = 'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3Aexception&amp;args[0]=llamas&amp;args[1]=suck&amp;token=68a75f1a';
+    $exception->bigPipePlaceholderId = 'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3Aexception&amp;args[0]=llamas&amp;args[1]=suck&amp;token=uhKFNfT4eF449_W-kDQX8E5z4yHyt0-nSHUlwaGAQeU';
     $exception->bigPipePlaceholderRenderArray = [
-      '#markup' => '<div data-big-pipe-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3Aexception&amp;args[0]=llamas&amp;args[1]=suck&amp;token=68a75f1a"></div>',
+      '#markup' => '<span data-big-pipe-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3Aexception&amp;args[0]=llamas&amp;args[1]=suck&amp;token=uhKFNfT4eF449_W-kDQX8E5z4yHyt0-nSHUlwaGAQeU"></span>',
       '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
       '#attached' => [
         'library' => ['big_pipe/big_pipe'],
         'drupalSettings' => [
           'bigPipePlaceholderIds' => [
-            'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3Aexception&args[0]=llamas&args[1]=suck&token=68a75f1a' => TRUE,
+            'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3Aexception&args[0]=llamas&args[1]=suck&token=uhKFNfT4eF449_W-kDQX8E5z4yHyt0-nSHUlwaGAQeU' => TRUE,
           ],
         ],
         'big_pipe_placeholders' => [
-          'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3Aexception&amp;args[0]=llamas&amp;args[1]=suck&amp;token=68a75f1a' => $exception->placeholderRenderArray,
+          'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3Aexception&amp;args[0]=llamas&amp;args[1]=suck&amp;token=uhKFNfT4eF449_W-kDQX8E5z4yHyt0-nSHUlwaGAQeU' => $exception->placeholderRenderArray,
         ],
       ],
     ];
     $exception->embeddedAjaxResponseCommands = NULL;
-    $exception->bigPipeNoJsPlaceholder = '<div data-big-pipe-nojs-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3Aexception&amp;args[0]=llamas&amp;args[1]=suck&amp;token=68a75f1a"></div>';
+    $exception->bigPipeNoJsPlaceholder = '<span data-big-pipe-nojs-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3Aexception&amp;args[0]=llamas&amp;args[1]=suck&amp;token=uhKFNfT4eF449_W-kDQX8E5z4yHyt0-nSHUlwaGAQeU"></span>';
     $exception->bigPipeNoJsPlaceholderRenderArray = [
       '#markup' => $exception->bigPipeNoJsPlaceholder,
       '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
@@ -307,29 +307,29 @@ class BigPipePlaceholderTestCases {
         '#lazy_builder' => ['\Drupal\big_pipe_test\BigPipeTestController::responseException', []],
         '#create_placeholder' => TRUE,
       ],
-      '<drupal-render-placeholder callback="\Drupal\big_pipe_test\BigPipeTestController::responseException" arguments="" token="2a9bd022"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="\Drupal\big_pipe_test\BigPipeTestController::responseException" arguments="" token="PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU"></drupal-render-placeholder>',
       [
         '#lazy_builder' => ['\Drupal\big_pipe_test\BigPipeTestController::responseException', []],
       ]
     );
-    $embedded_response_exception->bigPipePlaceholderId = 'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=2a9bd022';
+    $embedded_response_exception->bigPipePlaceholderId = 'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU';
     $embedded_response_exception->bigPipePlaceholderRenderArray = [
-      '#markup' => '<div data-big-pipe-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=2a9bd022"></div>',
+      '#markup' => '<span data-big-pipe-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU"></span>',
       '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
       '#attached' => [
         'library' => ['big_pipe/big_pipe'],
         'drupalSettings' => [
           'bigPipePlaceholderIds' => [
-            'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&&token=2a9bd022' => TRUE,
+            'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&&token=PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU' => TRUE,
           ],
         ],
         'big_pipe_placeholders' => [
-          'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=2a9bd022' => $embedded_response_exception->placeholderRenderArray,
+          'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU' => $embedded_response_exception->placeholderRenderArray,
         ],
       ],
     ];
     $embedded_response_exception->embeddedAjaxResponseCommands = NULL;
-    $embedded_response_exception->bigPipeNoJsPlaceholder = '<div data-big-pipe-nojs-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=2a9bd022"></div>';
+    $embedded_response_exception->bigPipeNoJsPlaceholder = '<span data-big-pipe-nojs-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU"></span>';
     $embedded_response_exception->bigPipeNoJsPlaceholderRenderArray = [
       '#markup' => $embedded_response_exception->bigPipeNoJsPlaceholder,
       '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
diff --git a/web/core/modules/big_pipe/src/Tests/BigPipeTest.php b/web/core/modules/big_pipe/src/Tests/BigPipeTest.php
index a3f773ee1..9d2b25734 100644
--- a/web/core/modules/big_pipe/src/Tests/BigPipeTest.php
+++ b/web/core/modules/big_pipe/src/Tests/BigPipeTest.php
@@ -158,7 +158,9 @@ class BigPipeTest extends WebTestBase {
 
     $this->drupalGet(Url::fromRoute('big_pipe_test'));
     $this->assertBigPipeResponseHeadersPresent();
+    $this->assertNoCacheTag('cache_tag_set_in_lazy_builder');
 
+    $this->setCsrfTokenSeedInTestEnvironment();
     $cases = $this->getTestCases();
     $this->assertBigPipeNoJsPlaceholders([
       $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholder     => $cases['edge_case__invalid_html']->embeddedHtmlResponse,
@@ -236,7 +238,9 @@ class BigPipeTest extends WebTestBase {
 
     $this->drupalGet(Url::fromRoute('big_pipe_test'));
     $this->assertBigPipeResponseHeadersPresent();
+    $this->assertNoCacheTag('cache_tag_set_in_lazy_builder');
 
+    $this->setCsrfTokenSeedInTestEnvironment();
     $cases = $this->getTestCases();
     $this->assertBigPipeNoJsPlaceholders([
       $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholder           => $cases['edge_case__invalid_html']->embeddedHtmlResponse,
@@ -289,7 +293,7 @@ class BigPipeTest extends WebTestBase {
     // @see performMetaRefresh()
 
     $this->drupalGet(Url::fromRoute('big_pipe_test_multi_occurrence'));
-    $big_pipe_placeholder_id = 'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e';
+    $big_pipe_placeholder_id = 'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA';
     $expected_placeholder_replacement = '<script type="application/vnd.drupal-ajax" data-big-pipe-replacement-for-placeholder-with-id="' . $big_pipe_placeholder_id . '">';
     $this->assertRaw('The count is 1.');
     $this->assertNoRaw('The count is 2.');
@@ -353,7 +357,7 @@ class BigPipeTest extends WebTestBase {
     foreach ($expected_big_pipe_placeholders as $big_pipe_placeholder_id => $expected_ajax_response) {
       $this->pass('BigPipe placeholder: ' . $big_pipe_placeholder_id, 'Debug');
       // Verify expected placeholder.
-      $expected_placeholder_html = '<div data-big-pipe-placeholder-id="' . $big_pipe_placeholder_id . '"></div>';
+      $expected_placeholder_html = '<span data-big-pipe-placeholder-id="' . $big_pipe_placeholder_id . '"></span>';
       $this->assertRaw($expected_placeholder_html, 'BigPipe placeholder for placeholder ID "' . $big_pipe_placeholder_id . '" found.');
       $pos = strpos($this->getRawContent(), $expected_placeholder_html);
       $placeholder_positions[$pos] = $big_pipe_placeholder_id;
@@ -402,14 +406,18 @@ class BigPipeTest extends WebTestBase {
   }
 
   /**
-   * @return \Drupal\big_pipe\Tests\BigPipePlaceholderTestCase[]
+   * Ensures CSRF tokens can be generated for the current user's session.
    */
-  protected function getTestCases() {
-    // Ensure we can generate CSRF tokens for the current user's session.
+  protected function setCsrfTokenSeedInTestEnvironment() {
     $session_data = $this->container->get('session_handler.write_safe')->read($this->cookies[$this->getSessionName()]['value']);
     $csrf_token_seed = unserialize(explode('_sf2_meta|', $session_data)[1])['s'];
     $this->container->get('session_manager.metadata_bag')->setCsrfTokenSeed($csrf_token_seed);
+  }
 
+  /**
+   * @return \Drupal\big_pipe\Tests\BigPipePlaceholderTestCase[]
+   */
+  protected function getTestCases($has_session = TRUE) {
     return BigPipePlaceholderTestCases::cases($this->container, $this->rootUser);
   }
 
diff --git a/web/core/modules/big_pipe/tests/modules/big_pipe_regression_test/big_pipe_regression_test.routing.yml b/web/core/modules/big_pipe/tests/modules/big_pipe_regression_test/big_pipe_regression_test.routing.yml
index a2fc417a1..bd0543b0e 100644
--- a/web/core/modules/big_pipe/tests/modules/big_pipe_regression_test/big_pipe_regression_test.routing.yml
+++ b/web/core/modules/big_pipe/tests/modules/big_pipe_regression_test/big_pipe_regression_test.routing.yml
@@ -4,3 +4,10 @@ big_pipe_regression_test.2678662:
     _controller: '\Drupal\big_pipe_regression_test\BigPipeRegressionTestController::regression2678662'
   requirements:
     _access: 'TRUE'
+
+big_pipe_regression_test.2802923:
+  path: '/big_pipe_regression_test/2802923'
+  defaults:
+    _controller: '\Drupal\big_pipe_regression_test\BigPipeRegressionTestController::regression2802923'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/big_pipe/tests/modules/big_pipe_regression_test/src/BigPipeRegressionTestController.php b/web/core/modules/big_pipe/tests/modules/big_pipe_regression_test/src/BigPipeRegressionTestController.php
index f42c89c71..50e618bee 100644
--- a/web/core/modules/big_pipe/tests/modules/big_pipe_regression_test/src/BigPipeRegressionTestController.php
+++ b/web/core/modules/big_pipe/tests/modules/big_pipe_regression_test/src/BigPipeRegressionTestController.php
@@ -17,4 +17,30 @@ class BigPipeRegressionTestController {
     ];
   }
 
+  /**
+   * @see \Drupal\Tests\big_pipe\FunctionalJavascript\BigPipeRegressionTest::testMultipleBodies_2678662()
+   */
+  public function regression2802923() {
+    return [
+      '#prefix' => BigPipeMarkup::create('<p>Hi, my train will arrive at '),
+      'time' => [
+        '#lazy_builder' => [static::class . '::currentTime', []],
+        '#create_placeholder' => TRUE,
+      ],
+      '#suffix' => BigPipeMarkup::create(' — will I still be able to catch the connection to the center?</p>'),
+    ];
+  }
+
+  /**
+   * #lazy_builder callback; builds <time> markup with current time.
+   *
+   * @return array
+   */
+  public static function currentTime() {
+    return [
+      '#markup' => '<time datetime="' . date('Y-m-d', time()) . '"></time>',
+      '#cache' => ['max-age' => 0]
+    ];
+  }
+
 }
diff --git a/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php b/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
index eeb7b0dc7..22307708f 100644
--- a/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
+++ b/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
@@ -14,13 +14,19 @@ class BigPipeTestController {
    * @return array
    */
   public function test() {
+    $has_session = \Drupal::service('session_configuration')->hasSession(\Drupal::requestStack()->getMasterRequest());
+
     $build = [];
 
     $cases = BigPipePlaceholderTestCases::cases(\Drupal::getContainer());
 
     // 1. HTML placeholder: status messages. Drupal renders those automatically,
     // so all that we need to do in this controller is set a message.
-    drupal_set_message('Hello from BigPipe!');
+    if ($has_session) {
+      // Only set a message if a session already exists, otherwise we always
+      // trigger a session, which means we can't test no-session requests.
+      drupal_set_message('Hello from BigPipe!');
+    }
     $build['html'] = $cases['html']->renderArray;
 
     // 2. HTML attribute value placeholder: form action.
@@ -98,7 +104,10 @@ class BigPipeTestController {
   public static function helloOrYarhar() {
     return [
       '#markup' => BigPipeMarkup::create('<marquee>Yarhar llamas forever!</marquee>'),
-      '#cache' => ['max-age' => 0],
+      '#cache' => [
+        'max-age' => 0,
+        'tags' => ['cache_tag_set_in_lazy_builder'],
+      ],
     ];
   }
 
diff --git a/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/Form/BigPipeTestForm.php b/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/Form/BigPipeTestForm.php
index ccb15b737..c56ee3278 100644
--- a/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/Form/BigPipeTestForm.php
+++ b/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/Form/BigPipeTestForm.php
@@ -20,14 +20,14 @@ class BigPipeTestForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form['#token'] = FALSE;
 
-    $form['big_pipe'] = array(
+    $form['big_pipe'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('BigPipe works…'),
       '#options' => [
         'js' => $this->t('… with JavaScript'),
         'nojs' => $this->t('… without JavaScript'),
       ],
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php b/web/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
index a99d5fcce..b4da7b0a9 100644
--- a/web/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
+++ b/web/core/modules/big_pipe/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
@@ -184,4 +184,16 @@ JS;
     }
   }
 
+  /**
+   * Ensure default BigPipe placeholder HTML cannot split paragraphs.
+   *
+   * @see https://www.drupal.org/node/2802923
+   */
+  public function testPlaceholderInParagraph_2802923() {
+    $this->drupalLogin($this->drupalCreateUser());
+    $this->drupalGet(Url::fromRoute('big_pipe_regression_test.2802923'));
+
+    $this->assertJsCondition('document.querySelectorAll(\'p\').length === 1');
+  }
+
 }
diff --git a/web/core/modules/big_pipe/tests/src/Unit/Render/BigPipeResponseAttachmentsProcessorTest.php b/web/core/modules/big_pipe/tests/src/Unit/Render/BigPipeResponseAttachmentsProcessorTest.php
index 912312929..a4cbacdf9 100644
--- a/web/core/modules/big_pipe/tests/src/Unit/Render/BigPipeResponseAttachmentsProcessorTest.php
+++ b/web/core/modules/big_pipe/tests/src/Unit/Render/BigPipeResponseAttachmentsProcessorTest.php
@@ -28,17 +28,16 @@ class BigPipeResponseAttachmentsProcessorTest extends UnitTestCase {
    * @covers ::processAttachments
    *
    * @dataProvider nonHtmlResponseProvider
-   *
-   * @expectedException \AssertionError
    */
   public function testNonHtmlResponse($response_class) {
     $big_pipe_response_attachments_processor = $this->createBigPipeResponseAttachmentsProcessor($this->prophesize(AttachmentsResponseProcessorInterface::class));
 
     $non_html_response = new $response_class();
+    $this->setExpectedException(\AssertionError::class);
     $big_pipe_response_attachments_processor->processAttachments($non_html_response);
   }
 
-  function nonHtmlResponseProvider() {
+  public function nonHtmlResponseProvider() {
     return [
       'AjaxResponse, which implements AttachmentsInterface' => [AjaxResponse::class],
       'A dummy that implements AttachmentsInterface' => [get_class($this->prophesize(AttachmentsInterface::class)->reveal())],
@@ -51,7 +50,7 @@ class BigPipeResponseAttachmentsProcessorTest extends UnitTestCase {
    * @dataProvider attachmentsProvider
    */
   public function testHtmlResponse(array $attachments) {
-    $big_pipe_response = new BigPipeResponse('original');
+    $big_pipe_response = new BigPipeResponse(new HtmlResponse('original'));
     $big_pipe_response->setAttachments($attachments);
 
     // This mock is the main expectation of this test: verify that the decorated
diff --git a/web/core/modules/block/block.install b/web/core/modules/block/block.install
index 106815c4d..6545a1997 100644
--- a/web/core/modules/block/block.install
+++ b/web/core/modules/block/block.install
@@ -17,11 +17,6 @@ function block_install() {
   Cache::invalidateTags(['rendered']);
 }
 
-/**
- * @addtogroup updates-8.0.0-beta
- * @{
- */
-
 /**
  * Update block visibility context mapping.
  */
@@ -122,7 +117,3 @@ function block_update_8003() {
 
   return t('Block settings updated.');
 }
-
-/**
- * @} End of "addtogroup updates-8.0.0-beta".
- */
diff --git a/web/core/modules/block/block.module b/web/core/modules/block/block.module
index 2f96a90e7..ee6a4a11e 100644
--- a/web/core/modules/block/block.module
+++ b/web/core/modules/block/block.module
@@ -5,7 +5,6 @@
  * Controls the visual building blocks a page is constructed with.
  */
 
-use Drupal\block\BlockInterface;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
@@ -19,24 +18,24 @@ use Drupal\block\Entity\Block;
 function block_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.block':
-      $block_content = \Drupal::moduleHandler()->moduleExists('block_content') ? \Drupal::url('help.page', array('name' => 'block_content')) : '#';
+      $block_content = \Drupal::moduleHandler()->moduleExists('block_content') ? \Drupal::url('help.page', ['name' => 'block_content']) : '#';
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Block module allows you to place blocks in regions of your installed themes, and configure block settings. For more information, see the <a href=":blocks-documentation">online documentation for the Block module</a>.', array(':blocks-documentation' => 'https://www.drupal.org/documentation/modules/block/')) . '</p>';
+      $output .= '<p>' . t('The Block module allows you to place blocks in regions of your installed themes, and configure block settings. For more information, see the <a href=":blocks-documentation">online documentation for the Block module</a>.', [':blocks-documentation' => 'https://www.drupal.org/documentation/modules/block/']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Placing and moving blocks') . '</dt>';
-      $output .= '<dd>' . t('You can place a new block in a region by selecting <em>Place block</em> on the <a href=":blocks">Block layout page</a>. Once a block is placed, it can be moved to a different region by drag-and-drop or by using the <em>Region</em> drop-down list, and then clicking <em>Save blocks</em>.', array(':blocks' => \Drupal::url('block.admin_display'))) . '</dd>';
+      $output .= '<dd>' . t('You can place a new block in a region by selecting <em>Place block</em> on the <a href=":blocks">Block layout page</a>. Once a block is placed, it can be moved to a different region by drag-and-drop or by using the <em>Region</em> drop-down list, and then clicking <em>Save blocks</em>.', [':blocks' => \Drupal::url('block.admin_display')]) . '</dd>';
       $output .= '<dt>' . t('Toggling between different themes') . '</dt>';
       $output .= '<dd>' . t('Blocks are placed and configured specifically for each theme. The Block layout page opens with the default theme, but you can toggle to other installed themes.') . '</dd>';
       $output .= '<dt>' . t('Demonstrating block regions for a theme') . '</dt>';
-      $output .= '<dd>' . t('You can see where the regions are for the current theme by clicking the <em>Demonstrate block regions</em> link on the <a href=":blocks">Block layout page</a>. Regions are specific to each theme.', array(':blocks' => \Drupal::url('block.admin_display'))) . '</dd>';
+      $output .= '<dd>' . t('You can see where the regions are for the current theme by clicking the <em>Demonstrate block regions</em> link on the <a href=":blocks">Block layout page</a>. Regions are specific to each theme.', [':blocks' => \Drupal::url('block.admin_display')]) . '</dd>';
       $output .= '<dt>' . t('Configuring block settings') . '</dt>';
-      $output .= '<dd>' . t('To change the settings of an individual block click on the <em>Configure</em> link on the <a href=":blocks">Block layout page</a>. The available options vary depending on the module that provides the block. For all blocks you can change the block title and toggle whether to display it.', array(':blocks' => Drupal::url('block.admin_display'))) . '</dd>';
+      $output .= '<dd>' . t('To change the settings of an individual block click on the <em>Configure</em> link on the <a href=":blocks">Block layout page</a>. The available options vary depending on the module that provides the block. For all blocks you can change the block title and toggle whether to display it.', [':blocks' => Drupal::url('block.admin_display')]) . '</dd>';
       $output .= '<dt>' . t('Controlling visibility') . '</dt>';
       $output .= '<dd>' . t('You can control the visibility of a block by restricting it to specific pages, content types, and/or roles by setting the appropriate options under <em>Visibility settings</em> of the block configuration.') . '</dd>';
       $output .= '<dt>' . t('Adding custom blocks') . '</dt>';
-      $output .= '<dd>' . t('You can add custom blocks, if the <em>Custom Block</em> module is installed. For more information, see the <a href=":blockcontent-help">Custom Block help page</a>.', array(':blockcontent-help' => $block_content)) . '</dd>';
+      $output .= '<dd>' . t('You can add custom blocks, if the <em>Custom Block</em> module is installed. For more information, see the <a href=":blockcontent-help">Custom Block help page</a>.', [':blockcontent-help' => $block_content]) . '</dd>';
       $output .= '</dl>';
       return $output;
   }
@@ -44,7 +43,7 @@ function block_help($route_name, RouteMatchInterface $route_match) {
     $demo_theme = $route_match->getParameter('theme') ?: \Drupal::config('system.theme')->get('default');
     $themes = \Drupal::service('theme_handler')->listInfo();
     $output = '<p>' . t('Block placement is specific to each theme on your site. Changes will not be saved until you click <em>Save blocks</em> at the bottom of the page.') . '</p>';
-    $output .= '<p>' . \Drupal::l(t('Demonstrate block regions (@theme)', array('@theme' => $themes[$demo_theme]->info['name'])), new Url('block.admin_demo', array('theme' => $demo_theme))) . '</p>';
+    $output .= '<p>' . \Drupal::l(t('Demonstrate block regions (@theme)', ['@theme' => $themes[$demo_theme]->info['name']]), new Url('block.admin_demo', ['theme' => $demo_theme])) . '</p>';
     return $output;
   }
 }
@@ -53,11 +52,11 @@ function block_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function block_theme() {
-  return array(
-    'block' => array(
+  return [
+    'block' => [
       'render element' => 'elements',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -66,12 +65,12 @@ function block_theme() {
 function block_page_top(array &$page_top) {
   if (\Drupal::routeMatch()->getRouteName() === 'block.admin_demo') {
     $theme = \Drupal::theme()->getActiveTheme()->getName();
-    $page_top['backlink'] = array(
+    $page_top['backlink'] = [
       '#type' => 'link',
       '#title' => t('Exit block region demonstration'),
-      '#options' => array('attributes' => array('class' => array('block-demo-backlink'))),
+      '#options' => ['attributes' => ['class' => ['block-demo-backlink']]],
       '#weight' => -10,
-    );
+    ];
     if (\Drupal::config('system.theme')->get('default') == $theme) {
       $page_top['backlink']['#url'] = Url::fromRoute('block.admin_display');
     }
@@ -109,12 +108,12 @@ function block_themes_installed($theme_list) {
  */
 function block_theme_initialize($theme) {
   // Initialize theme's blocks if none already registered.
-  $has_blocks = \Drupal::entityTypeManager()->getStorage('block')->loadByProperties(array('theme' => $theme));
+  $has_blocks = \Drupal::entityTypeManager()->getStorage('block')->loadByProperties(['theme' => $theme]);
   if (!$has_blocks) {
     $default_theme = \Drupal::config('system.theme')->get('default');
     // Apply only to new theme's visible regions.
     $regions = system_region_list($theme, REGIONS_VISIBLE);
-    $default_theme_blocks = \Drupal::entityTypeManager()->getStorage('block')->loadByProperties(array('theme' => $default_theme));
+    $default_theme_blocks = \Drupal::entityTypeManager()->getStorage('block')->loadByProperties(['theme' => $default_theme]);
     foreach ($default_theme_blocks as $default_theme_block_id => $default_theme_block) {
       if (strpos($default_theme_block_id, $default_theme . '_') === 0) {
         $id = str_replace($default_theme, $theme, $default_theme_block_id);
@@ -144,17 +143,14 @@ function block_rebuild() {
       $blocks = \Drupal::entityTypeManager()->getStorage('block')->loadByProperties(['theme' => $theme]);
       foreach ($blocks as $block_id => $block) {
         // Disable blocks in invalid regions.
-        $region = $block->getRegion();
-        if ($region !== BlockInterface::BLOCK_REGION_NONE) {
-          if (!empty($region) && !isset($regions[$region]) && $block->status()) {
-            drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', ['%info' => $block_id, '%region' => $region]), 'warning');
-            $block->disable();
-          }
-          // Set region to none if not enabled.
-          if (!$block->status()) {
-            $block->setRegion(BlockInterface::BLOCK_REGION_NONE);
-            $block->save();
+        if (!isset($regions[$block->getRegion()])) {
+          if ($block->status()) {
+            drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', ['%info' => $block_id, '%region' => $block->getRegion()]), 'warning');
           }
+          $block
+            ->setRegion(system_default_region($theme))
+            ->disable()
+            ->save();
         }
       }
     }
@@ -165,7 +161,7 @@ function block_rebuild() {
  * Implements hook_theme_suggestions_HOOK().
  */
 function block_theme_suggestions_block(array $variables) {
-  $suggestions = array();
+  $suggestions = [];
 
   $suggestions[] = 'block__' . $variables['elements']['#configuration']['provider'];
   // Hyphens (-) and underscores (_) play a special role in theme suggestions.
diff --git a/web/core/modules/block/block.post_update.php b/web/core/modules/block/block.post_update.php
index 6f14a3d50..d5f0852a3 100644
--- a/web/core/modules/block/block.post_update.php
+++ b/web/core/modules/block/block.post_update.php
@@ -5,11 +5,6 @@
  * Post update functions for Block.
  */
 
-/**
- * @addtogroup updates-8.0.0-beta
- * @{
- */
-
 /**
  * Disable all blocks with missing context IDs in block_update_8001().
  */
@@ -63,10 +58,10 @@ function block_post_update_disable_blocks_with_missing_contexts() {
     $message = t('Encountered an unknown context mapping key coming probably from a contributed or custom module: One or more mappings could not be updated. Please manually review your visibility settings for the following blocks, which are disabled now:');
     $message .= '<ul>';
     foreach ($blocks as $disabled_block_id => $disabled_block) {
-      $message .= '<li>' . t('@label (Visibility: @plugin_ids)', array(
+      $message .= '<li>' . t('@label (Visibility: @plugin_ids)', [
           '@label' => $disabled_block->get('settings')['label'],
           '@plugin_ids' => implode(', ', array_intersect_key($condition_plugin_id_label_map, array_flip(array_keys($block_update_8001[$disabled_block_id]['missing_context_ids']))))
-        )) . '</li>';
+        ]) . '</li>';
     }
     $message .= '</ul>';
 
@@ -75,13 +70,11 @@ function block_post_update_disable_blocks_with_missing_contexts() {
 }
 
 /**
- * @} End of "addtogroup updates-8.0.0-beta".
- */
-
-/**
- * @addtogroup updates-8.2.x
- * @{
+ * Disable blocks that are placed into the "disabled" region.
  */
+function block_post_update_disabled_region_update() {
+  // An empty update will flush caches, forcing block_rebuild() to run.
+}
 
 /**
  * Fix invalid 'negate' values in block visibility conditions.
@@ -106,7 +99,3 @@ function block_post_update_fix_negate_in_conditions() {
     }
   }
 }
-
-/**
- * @} End of "addtogroup updates-8.2.x".
- */
diff --git a/web/core/modules/block/block.routing.yml b/web/core/modules/block/block.routing.yml
index 396bf0d17..83648b948 100644
--- a/web/core/modules/block/block.routing.yml
+++ b/web/core/modules/block/block.routing.yml
@@ -25,6 +25,24 @@ entity.block.edit_form:
   requirements:
     _entity_access: 'block.update'
 
+entity.block.enable:
+  path: '/admin/structure/block/manage/{block}/enable'
+  defaults:
+    _controller: '\Drupal\block\Controller\BlockController::performOperation'
+    op: enable
+  requirements:
+    _entity_access: 'block.enable'
+    _csrf_token: 'TRUE'
+
+entity.block.disable:
+  path: '/admin/structure/block/manage/{block}/disable'
+  defaults:
+    _controller: '\Drupal\block\Controller\BlockController::performOperation'
+    op: disable
+  requirements:
+    _entity_access: 'block.disable'
+    _csrf_token: 'TRUE'
+
 block.admin_display:
   path: '/admin/structure/block'
   defaults:
diff --git a/web/core/modules/block/css/block.admin.css b/web/core/modules/block/css/block.admin.css
index ed120389e..7fde3d706 100644
--- a/web/core/modules/block/css/block.admin.css
+++ b/web/core/modules/block/css/block.admin.css
@@ -40,3 +40,7 @@ a.block-demo-backlink:hover {
 .block-form .form-item-settings-admin-label label:after {
   content: ':';
 }
+.block-disabled:not(:hover) {
+  background: #fcfcfa;
+  opacity: 0.675;
+}
diff --git a/web/core/modules/block/src/BlockAccessControlHandler.php b/web/core/modules/block/src/BlockAccessControlHandler.php
index baadda2dd..176c32674 100644
--- a/web/core/modules/block/src/BlockAccessControlHandler.php
+++ b/web/core/modules/block/src/BlockAccessControlHandler.php
@@ -11,7 +11,6 @@ use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityHandlerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Executable\ExecutableManagerInterface;
 use Drupal\Core\Plugin\Context\ContextHandlerInterface;
 use Drupal\Core\Plugin\Context\ContextRepositoryInterface;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
@@ -27,13 +26,6 @@ class BlockAccessControlHandler extends EntityAccessControlHandler implements En
 
   use ConditionAccessResolverTrait;
 
-  /**
-   * The condition plugin manager.
-   *
-   * @var \Drupal\Core\Executable\ExecutableManagerInterface
-   */
-  protected $manager;
-
   /**
    * The plugin context handler.
    *
@@ -54,7 +46,6 @@ class BlockAccessControlHandler extends EntityAccessControlHandler implements En
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
       $entity_type,
-      $container->get('plugin.manager.condition'),
       $container->get('context.handler'),
       $container->get('context.repository')
     );
@@ -65,16 +56,13 @@ class BlockAccessControlHandler extends EntityAccessControlHandler implements En
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
    *   The entity type definition.
-   * @param \Drupal\Core\Executable\ExecutableManagerInterface $manager
-   *   The ConditionManager for checking visibility of blocks.
    * @param \Drupal\Core\Plugin\Context\ContextHandlerInterface $context_handler
    *   The ContextHandler for applying contexts to conditions properly.
    * @param \Drupal\Core\Plugin\Context\ContextRepositoryInterface $context_repository
    *   The lazy context repository service.
    */
-  public function __construct(EntityTypeInterface $entity_type, ExecutableManagerInterface $manager, ContextHandlerInterface $context_handler, ContextRepositoryInterface $context_repository ) {
+  public function __construct(EntityTypeInterface $entity_type, ContextHandlerInterface $context_handler, ContextRepositoryInterface $context_repository ) {
     parent::__construct($entity_type);
-    $this->manager = $manager;
     $this->contextHandler = $context_handler;
     $this->contextRepository = $context_repository;
   }
diff --git a/web/core/modules/block/src/BlockForm.php b/web/core/modules/block/src/BlockForm.php
index bece32dd0..b2d180aa4 100644
--- a/web/core/modules/block/src/BlockForm.php
+++ b/web/core/modules/block/src/BlockForm.php
@@ -140,66 +140,66 @@ class BlockForm extends EntityForm {
     $form['visibility'] = $this->buildVisibilityInterface([], $form_state);
 
     // If creating a new block, calculate a safe default machine name.
-    $form['id'] = array(
+    $form['id'] = [
       '#type' => 'machine_name',
       '#maxlength' => 64,
       '#description' => $this->t('A unique name for this block instance. Must be alpha-numeric and underscore separated.'),
       '#default_value' => !$entity->isNew() ? $entity->id() : $this->getUniqueMachineName($entity),
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => '\Drupal\block\Entity\Block::load',
         'replace_pattern' => '[^a-z0-9_.]+',
-        'source' => array('settings', 'label'),
-      ),
+        'source' => ['settings', 'label'],
+      ],
       '#required' => TRUE,
       '#disabled' => !$entity->isNew(),
-    );
+    ];
 
     // Theme settings.
     if ($entity->getTheme()) {
-      $form['theme'] = array(
+      $form['theme'] = [
         '#type' => 'value',
         '#value' => $theme,
-      );
+      ];
     }
     else {
-      $theme_options = array();
+      $theme_options = [];
       foreach ($this->themeHandler->listInfo() as $theme_name => $theme_info) {
         if (!empty($theme_info->status)) {
           $theme_options[$theme_name] = $theme_info->info['name'];
         }
       }
-      $form['theme'] = array(
+      $form['theme'] = [
         '#type' => 'select',
         '#options' => $theme_options,
         '#title' => t('Theme'),
         '#default_value' => $theme,
-        '#ajax' => array(
+        '#ajax' => [
           'callback' => '::themeSwitch',
           'wrapper' => 'edit-block-region-wrapper',
-        ),
-      );
+        ],
+      ];
     }
 
     // Hidden weight setting.
     $weight = $entity->isNew() ? $this->getRequest()->query->get('weight', 0) : $entity->getWeight();
-    $form['weight'] = array(
+    $form['weight'] = [
       '#type' => 'hidden',
       '#default_value' => $weight,
-    );
+    ];
 
     // Region settings.
     $entity_region = $entity->getRegion();
     $region = $entity->isNew() ? $this->getRequest()->query->get('region', $entity_region) : $entity_region;
-    $form['region'] = array(
+    $form['region'] = [
       '#type' => 'select',
       '#title' => $this->t('Region'),
       '#description' => $this->t('Select the region where this block should be displayed.'),
       '#default_value' => $region,
-      '#empty_value' => BlockInterface::BLOCK_REGION_NONE,
+      '#required' => TRUE,
       '#options' => system_region_list($theme, REGIONS_VISIBLE),
       '#prefix' => '<div id="edit-block-region-wrapper">',
       '#suffix' => '</div>',
-    );
+    ];
     $form['#attached']['library'][] = 'block/drupal.block.admin';
     return $form;
   }
@@ -292,6 +292,7 @@ class BlockForm extends EntityForm {
   protected function actions(array $form, FormStateInterface $form_state) {
     $actions = parent::actions($form, $form_state);
     $actions['submit']['#value'] = $this->t('Save block');
+    $actions['delete']['#title'] = $this->t('Remove block');
     return $actions;
   }
 
@@ -359,10 +360,10 @@ class BlockForm extends EntityForm {
     drupal_set_message($this->t('The block configuration has been saved.'));
     $form_state->setRedirect(
       'block.admin_display_theme',
-      array(
+      [
         'theme' => $form_state->getValue('theme'),
-      ),
-      array('query' => array('block-placement' => Html::getClass($this->entity->id())))
+      ],
+      ['query' => ['block-placement' => Html::getClass($this->entity->id())]]
     );
   }
 
diff --git a/web/core/modules/block/src/BlockInterface.php b/web/core/modules/block/src/BlockInterface.php
index bd46671db..85e5b06dd 100644
--- a/web/core/modules/block/src/BlockInterface.php
+++ b/web/core/modules/block/src/BlockInterface.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\block;
 
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 
 /**
@@ -11,11 +12,16 @@ interface BlockInterface extends ConfigEntityInterface {
 
   /**
    * Indicates the block label (title) should be displayed to end users.
+   *
+   * @deprecated in Drupal 8.3.x, will be removed before Drupal 9.0.0.
+   *   Use \Drupal\Core\Block\BlockPluginInterface::BLOCK_LABEL_VISIBLE.
    */
-  const BLOCK_LABEL_VISIBLE = 'visible';
+  const BLOCK_LABEL_VISIBLE = BlockPluginInterface::BLOCK_LABEL_VISIBLE;
 
   /**
    * Denotes that a block is not enabled in any region and should not be shown.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
    */
   const BLOCK_REGION_NONE = -1;
 
diff --git a/web/core/modules/block/src/BlockListBuilder.php b/web/core/modules/block/src/BlockListBuilder.php
index 3365415be..37b2e8bfc 100644
--- a/web/core/modules/block/src/BlockListBuilder.php
+++ b/web/core/modules/block/src/BlockListBuilder.php
@@ -125,15 +125,15 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
     // Build the form tree.
     $form['blocks'] = $this->buildBlocksForm();
 
-    $form['actions'] = array(
+    $form['actions'] = [
       '#tree' => FALSE,
       '#type' => 'actions',
-    );
-    $form['actions']['submit'] = array(
+    ];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save blocks'),
       '#button_type' => 'primary',
-    );
+    ];
 
     return $form;
   }
@@ -150,28 +150,29 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
     /** @var \Drupal\block\BlockInterface[] $entities */
     foreach ($entities as $entity_id => $entity) {
       $definition = $entity->getPlugin()->getPluginDefinition();
-      $blocks[$entity->getRegion()][$entity_id] = array(
+      $blocks[$entity->getRegion()][$entity_id] = [
         'label' => $entity->label(),
         'entity_id' => $entity_id,
         'weight' => $entity->getWeight(),
         'entity' => $entity,
         'category' => $definition['category'],
-      );
+        'status' => $entity->status(),
+      ];
     }
 
-    $form = array(
+    $form = [
       '#type' => 'table',
-      '#header' => array(
+      '#header' => [
         $this->t('Block'),
         $this->t('Category'),
         $this->t('Region'),
         $this->t('Weight'),
         $this->t('Operations'),
-      ),
-      '#attributes' => array(
+      ],
+      '#attributes' => [
         'id' => 'blocks',
-      ),
-    );
+      ],
+    ];
 
     // Weights range from -delta to +delta, so delta should be at least half
     // of the amount of blocks present. This makes sure all blocks in the same
@@ -186,41 +187,40 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
 
     // Loop over each region and build blocks.
     $regions = $this->systemRegionList($this->getThemeName(), REGIONS_VISIBLE);
-    $block_regions_with_disabled = $regions + array(BlockInterface::BLOCK_REGION_NONE => $this->t('Disabled', array(), array('context' => 'Plural')));
-    foreach ($block_regions_with_disabled as $region => $title) {
-      $form['#tabledrag'][] = array(
+    foreach ($regions as $region => $title) {
+      $form['#tabledrag'][] = [
         'action' => 'match',
         'relationship' => 'sibling',
         'group' => 'block-region-select',
         'subgroup' => 'block-region-' . $region,
         'hidden' => FALSE,
-      );
-      $form['#tabledrag'][] = array(
+      ];
+      $form['#tabledrag'][] = [
         'action' => 'order',
         'relationship' => 'sibling',
         'group' => 'block-weight',
         'subgroup' => 'block-weight-' . $region,
-      );
+      ];
 
-      $form['region-' . $region] = array(
-        '#attributes' => array(
-          'class' => array('region-title', 'region-title-' . $region),
+      $form['region-' . $region] = [
+        '#attributes' => [
+          'class' => ['region-title', 'region-title-' . $region],
           'no_striping' => TRUE,
-        ),
-      );
-      $form['region-' . $region]['title'] = array(
-        '#theme_wrappers' => array(
-          'container' => array(
-            '#attributes' => array('class' => 'region-title__action'),
-          )
-        ),
-        '#prefix' => $region != BlockInterface::BLOCK_REGION_NONE ? $title : $block_regions_with_disabled[$region],
+        ],
+      ];
+      $form['region-' . $region]['title'] = [
+        '#theme_wrappers' => [
+          'container' => [
+            '#attributes' => ['class' => 'region-title__action'],
+          ]
+        ],
+        '#prefix' => $title,
         '#type' => 'link',
-        '#title' => $this->t('Place block <span class="visually-hidden">in the %region region</span>', ['%region' => $block_regions_with_disabled[$region]]),
+        '#title' => $this->t('Place block <span class="visually-hidden">in the %region region</span>', ['%region' => $title]),
         '#url' => Url::fromRoute('block.admin_library', ['theme' => $this->getThemeName()], ['query' => ['region' => $region]]),
-        '#wrapper_attributes' => array(
+        '#wrapper_attributes' => [
           'colspan' => 5,
-        ),
+        ],
         '#attributes' => [
           'class' => ['use-ajax', 'button', 'button--small'],
           'data-dialog-type' => 'modal',
@@ -228,73 +228,74 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
             'width' => 700,
           ]),
         ],
-      );
+      ];
 
-      $form['region-' . $region . '-message'] = array(
-        '#attributes' => array(
-          'class' => array(
+      $form['region-' . $region . '-message'] = [
+        '#attributes' => [
+          'class' => [
             'region-message',
             'region-' . $region . '-message',
             empty($blocks[$region]) ? 'region-empty' : 'region-populated',
-          ),
-        ),
-      );
-      $form['region-' . $region . '-message']['message'] = array(
+          ],
+        ],
+      ];
+      $form['region-' . $region . '-message']['message'] = [
         '#markup' => '<em>' . $this->t('No blocks in this region') . '</em>',
-        '#wrapper_attributes' => array(
+        '#wrapper_attributes' => [
           'colspan' => 5,
-        ),
-      );
+        ],
+      ];
 
       if (isset($blocks[$region])) {
         foreach ($blocks[$region] as $info) {
           $entity_id = $info['entity_id'];
 
-          $form[$entity_id] = array(
-            '#attributes' => array(
-              'class' => array('draggable'),
-            ),
-          );
+          $form[$entity_id] = [
+            '#attributes' => [
+              'class' => ['draggable'],
+            ],
+          ];
+          $form[$entity_id]['#attributes']['class'][] = $info['status'] ? 'block-enabled' : 'block-disabled';
           if ($placement && $placement == Html::getClass($entity_id)) {
             $form[$entity_id]['#attributes']['class'][] = 'color-success';
             $form[$entity_id]['#attributes']['class'][] = 'js-block-placed';
           }
-          $form[$entity_id]['info'] = array(
-            '#plain_text' => $info['label'],
-            '#wrapper_attributes' => array(
-              'class' => array('block'),
-            ),
-          );
-          $form[$entity_id]['type'] = array(
+          $form[$entity_id]['info'] = [
+            '#plain_text' => $info['status'] ? $info['label'] : $this->t('@label (disabled)', ['@label' => $info['label']]),
+            '#wrapper_attributes' => [
+              'class' => ['block'],
+            ],
+          ];
+          $form[$entity_id]['type'] = [
             '#markup' => $info['category'],
-          );
-          $form[$entity_id]['region-theme']['region'] = array(
+          ];
+          $form[$entity_id]['region-theme']['region'] = [
             '#type' => 'select',
             '#default_value' => $region,
-            '#empty_value' => BlockInterface::BLOCK_REGION_NONE,
-            '#title' => $this->t('Region for @block block', array('@block' => $info['label'])),
+            '#required' => TRUE,
+            '#title' => $this->t('Region for @block block', ['@block' => $info['label']]),
             '#title_display' => 'invisible',
             '#options' => $regions,
-            '#attributes' => array(
-              'class' => array('block-region-select', 'block-region-' . $region),
-            ),
-            '#parents' => array('blocks', $entity_id, 'region'),
-          );
-          $form[$entity_id]['region-theme']['theme'] = array(
+            '#attributes' => [
+              'class' => ['block-region-select', 'block-region-' . $region],
+            ],
+            '#parents' => ['blocks', $entity_id, 'region'],
+          ];
+          $form[$entity_id]['region-theme']['theme'] = [
             '#type' => 'hidden',
             '#value' => $this->getThemeName(),
-            '#parents' => array('blocks', $entity_id, 'theme'),
-          );
-          $form[$entity_id]['weight'] = array(
+            '#parents' => ['blocks', $entity_id, 'theme'],
+          ];
+          $form[$entity_id]['weight'] = [
             '#type' => 'weight',
             '#default_value' => $info['weight'],
             '#delta' => $weight_delta,
-            '#title' => $this->t('Weight for @block block', array('@block' => $info['label'])),
+            '#title' => $this->t('Weight for @block block', ['@block' => $info['label']]),
             '#title_display' => 'invisible',
-            '#attributes' => array(
-              'class' => array('block-weight', 'block-weight-' . $region),
-            ),
-          );
+            '#attributes' => [
+              'class' => ['block-weight', 'block-weight-' . $region],
+            ],
+          ];
           $form[$entity_id]['operations'] = $this->buildOperations($info['entity']);
         }
       }
@@ -341,6 +342,9 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
       $operations['edit']['title'] = $this->t('Configure');
     }
 
+    if (isset($operations['delete'])) {
+      $operations['delete']['title'] = $this->t('Remove');
+    }
     return $operations;
   }
 
@@ -358,15 +362,9 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
     $entities = $this->storage->loadMultiple(array_keys($form_state->getValue('blocks')));
     /** @var \Drupal\block\BlockInterface[] $entities */
     foreach ($entities as $entity_id => $entity) {
-      $entity_values = $form_state->getValue(array('blocks', $entity_id));
+      $entity_values = $form_state->getValue(['blocks', $entity_id]);
       $entity->setWeight($entity_values['weight']);
       $entity->setRegion($entity_values['region']);
-      if ($entity->getRegion() == BlockInterface::BLOCK_REGION_NONE) {
-        $entity->disable();
-      }
-      else {
-        $entity->enable();
-      }
       $entity->save();
     }
     drupal_set_message(t('The block settings have been updated.'));
diff --git a/web/core/modules/block/src/BlockRepository.php b/web/core/modules/block/src/BlockRepository.php
index 53620a09f..4cdd71071 100644
--- a/web/core/modules/block/src/BlockRepository.php
+++ b/web/core/modules/block/src/BlockRepository.php
@@ -48,10 +48,10 @@ class BlockRepository implements BlockRepositoryInterface {
   public function getVisibleBlocksPerRegion(array &$cacheable_metadata = []) {
     $active_theme = $this->themeManager->getActiveTheme();
     // Build an array of the region names in the right order.
-    $empty = array_fill_keys($active_theme->getRegions(), array());
+    $empty = array_fill_keys($active_theme->getRegions(), []);
 
-    $full = array();
-    foreach ($this->blockStorage->loadByProperties(array('theme' => $active_theme->getName())) as $block_id => $block) {
+    $full = [];
+    foreach ($this->blockStorage->loadByProperties(['theme' => $active_theme->getName()]) as $block_id => $block) {
       /** @var \Drupal\block\BlockInterface $block */
       $access = $block->access('view', NULL, TRUE);
       $region = $block->getRegion();
diff --git a/web/core/modules/block/src/BlockRepositoryInterface.php b/web/core/modules/block/src/BlockRepositoryInterface.php
index 6e3f904f6..9c4f871a7 100644
--- a/web/core/modules/block/src/BlockRepositoryInterface.php
+++ b/web/core/modules/block/src/BlockRepositoryInterface.php
@@ -4,6 +4,20 @@ namespace Drupal\block;
 
 interface BlockRepositoryInterface {
 
+  /**
+   * Return only visible regions.
+   *
+   * @see system_region_list()
+   */
+  const REGIONS_VISIBLE = 'visible';
+
+  /**
+   * Return all regions.
+   *
+   * @see system_region_list()
+   */
+  const REGIONS_ALL = 'all';
+
   /**
    * Returns an array of regions and their block entities.
    *
diff --git a/web/core/modules/block/src/BlockViewBuilder.php b/web/core/modules/block/src/BlockViewBuilder.php
index d3f501bd7..3b20d7b25 100644
--- a/web/core/modules/block/src/BlockViewBuilder.php
+++ b/web/core/modules/block/src/BlockViewBuilder.php
@@ -68,16 +68,16 @@ class BlockViewBuilder extends EntityViewBuilder {
    * {@inheritdoc}
    */
   public function view(EntityInterface $entity, $view_mode = 'full', $langcode = NULL) {
-    $build = $this->viewMultiple(array($entity), $view_mode, $langcode);
+    $build = $this->viewMultiple([$entity], $view_mode, $langcode);
     return reset($build);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function viewMultiple(array $entities = array(), $view_mode = 'full', $langcode = NULL) {
+  public function viewMultiple(array $entities = [], $view_mode = 'full', $langcode = NULL) {
     /** @var \Drupal\block\BlockInterface[] $entities */
-    $build = array();
+    $build = [];
     foreach ($entities as $entity) {
       $entity_id = $entity->id();
       $plugin = $entity->getPlugin();
@@ -87,7 +87,7 @@ class BlockViewBuilder extends EntityViewBuilder {
 
       // Create the render array for the block as a whole.
       // @see template_preprocess_block().
-      $build[$entity_id] = array(
+      $build[$entity_id] = [
         '#cache' => [
           'keys' => ['entity_view', 'block', $entity->id()],
           'contexts' => Cache::mergeContexts(
@@ -98,7 +98,7 @@ class BlockViewBuilder extends EntityViewBuilder {
           'max-age' => $plugin->getCacheMaxAge(),
         ],
         '#weight' => $entity->getWeight(),
-      );
+      ];
 
       // Allow altering of cacheability metadata or setting #create_placeholder.
       $this->moduleHandler->alter(['block_build', "block_build_" . $plugin->getBaseId()], $build[$entity_id], $plugin);
@@ -216,7 +216,7 @@ class BlockViewBuilder extends EntityViewBuilder {
       // #contextual_links is information about the *entire* block. Therefore,
       // we must move these properties from $content and merge them into the
       // top-level element.
-      foreach (array('#attributes', '#contextual_links') as $property) {
+      foreach (['#attributes', '#contextual_links'] as $property) {
         if (isset($content[$property])) {
           $build[$property] += $content[$property];
           unset($content[$property]);
@@ -231,10 +231,10 @@ class BlockViewBuilder extends EntityViewBuilder {
       // render cached, so we can avoid the work of having to repeatedly
       // determine whether the block is empty. For instance, modifying or adding
       // entities could cause the block to no longer be empty.
-      $build = array(
+      $build = [
         '#markup' => '',
         '#cache' => $build['#cache'],
-      );
+      ];
       // If $content is not empty, then it contains cacheability metadata, and
       // we must merge it with the existing cacheability metadata. This allows
       // blocks to be empty, yet still bubble cacheability metadata, to indicate
diff --git a/web/core/modules/block/src/Controller/BlockAddController.php b/web/core/modules/block/src/Controller/BlockAddController.php
index f983763fc..973a85995 100644
--- a/web/core/modules/block/src/Controller/BlockAddController.php
+++ b/web/core/modules/block/src/Controller/BlockAddController.php
@@ -22,7 +22,7 @@ class BlockAddController extends ControllerBase {
    */
   public function blockAddConfigureForm($plugin_id, $theme) {
     // Create a block entity.
-    $entity = $this->entityManager()->getStorage('block')->create(array('plugin' => $plugin_id, 'theme' => $theme));
+    $entity = $this->entityManager()->getStorage('block')->create(['plugin' => $plugin_id, 'theme' => $theme]);
 
     return $this->entityFormBuilder()->getForm($entity);
   }
diff --git a/web/core/modules/block/src/Controller/BlockController.php b/web/core/modules/block/src/Controller/BlockController.php
index d8f4226d0..7398ff98e 100644
--- a/web/core/modules/block/src/Controller/BlockController.php
+++ b/web/core/modules/block/src/Controller/BlockController.php
@@ -3,6 +3,7 @@
 namespace Drupal\block\Controller;
 
 use Drupal\Component\Utility\Html;
+use Drupal\block\BlockInterface;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Extension\ThemeHandlerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -39,6 +40,23 @@ class BlockController extends ControllerBase {
     );
   }
 
+  /**
+   * Calls a method on a block and reloads the listing page.
+   *
+   * @param \Drupal\block\BlockInterface $block
+   *   The block being acted upon.
+   * @param string $op
+   *   The operation to perform, e.g., 'enable' or 'disable'.
+   *
+   * @return \Symfony\Component\HttpFoundation\RedirectResponse
+   *   A redirect back to the listing page.
+   */
+  public function performOperation(BlockInterface $block, $op) {
+    $block->$op()->save();
+    drupal_set_message($this->t('The block settings have been updated.'));
+    return $this->redirect('block.admin_display');
+  }
+
   /**
    * Returns a block theme demo page.
    *
@@ -56,7 +74,7 @@ class BlockController extends ControllerBase {
     $page = [
       '#title' => Html::escape($this->themeHandler->getName($theme)),
       '#type' => 'page',
-      '#attached' => array(
+      '#attached' => [
         'drupalSettings' => [
           // The block demonstration page is not marked as an administrative
           // page by \Drupal::service('router.admin_context')->isAdminRoute()
@@ -65,20 +83,20 @@ class BlockController extends ControllerBase {
           // is an actual administrative page.
           'path' => ['currentPathIsAdmin' => TRUE],
         ],
-        'library' => array(
+        'library' => [
           'block/drupal.block.admin',
-        ),
-      ),
+        ],
+      ],
     ];
 
     // Show descriptions in each visible page region, nothing else.
     $visible_regions = $this->getVisibleRegionNames($theme);
     foreach (array_keys($visible_regions) as $region) {
-      $page[$region]['block_description'] = array(
+      $page[$region]['block_description'] = [
         '#type' => 'inline_template',
         '#template' => '<div class="block-region demo-block">{{ region_name }}</div>',
-        '#context' => array('region_name' => $visible_regions[$region]),
-      );
+        '#context' => ['region_name' => $visible_regions[$region]],
+      ];
     }
 
     return $page;
diff --git a/web/core/modules/block/src/Controller/CategoryAutocompleteController.php b/web/core/modules/block/src/Controller/CategoryAutocompleteController.php
index a856670f6..c95fd477e 100644
--- a/web/core/modules/block/src/Controller/CategoryAutocompleteController.php
+++ b/web/core/modules/block/src/Controller/CategoryAutocompleteController.php
@@ -51,10 +51,10 @@ class CategoryAutocompleteController implements ContainerInjectionInterface {
    */
   public function autocomplete(Request $request) {
     $typed_category = $request->query->get('q');
-    $matches = array();
+    $matches = [];
     foreach ($this->blockManager->getCategories() as $category) {
       if (stripos($category, $typed_category) === 0) {
-        $matches[] = array('value' => $category, 'label' => Html::escape($category));
+        $matches[] = ['value' => $category, 'label' => Html::escape($category)];
       }
     }
     return new JsonResponse($matches);
diff --git a/web/core/modules/block/src/Entity/Block.php b/web/core/modules/block/src/Entity/Block.php
index 9cbd30b3b..a0bbd25c8 100644
--- a/web/core/modules/block/src/Entity/Block.php
+++ b/web/core/modules/block/src/Entity/Block.php
@@ -28,11 +28,14 @@ use Drupal\Core\Entity\EntityStorageInterface;
  *   },
  *   admin_permission = "administer blocks",
  *   entity_keys = {
- *     "id" = "id"
+ *     "id" = "id",
+ *     "status" = "status"
  *   },
  *   links = {
  *     "delete-form" = "/admin/structure/block/manage/{block}/delete",
- *     "edit-form" = "/admin/structure/block/manage/{block}"
+ *     "edit-form" = "/admin/structure/block/manage/{block}",
+ *     "enable" = "/admin/structure/block/manage/{block}/enable",
+ *     "disable" = "/admin/structure/block/manage/{block}/disable",
  *   },
  *   config_export = {
  *     "id",
@@ -63,14 +66,14 @@ class Block extends ConfigEntityBase implements BlockInterface, EntityWithPlugin
    *
    * @var array
    */
-  protected $settings = array();
+  protected $settings = [];
 
   /**
    * The region this block is placed in.
    *
    * @var string
    */
-  protected $region = self::BLOCK_REGION_NONE;
+  protected $region;
 
   /**
    * The block weight.
@@ -209,13 +212,13 @@ class Block extends ConfigEntityBase implements BlockInterface, EntityWithPlugin
     if ($status !== 0) {
       return $status;
     }
-    // Sort by weight, unless disabled.
-    if ($a->getRegion() != static::BLOCK_REGION_NONE) {
-      $weight = $a->getWeight() - $b->getWeight();
-      if ($weight) {
-        return $weight;
-      }
+
+    // Sort by weight.
+    $weight = $a->getWeight() - $b->getWeight();
+    if ($weight) {
+      return $weight;
     }
+
     // Sort by label.
     return strcmp($a->label(), $b->label());
   }
@@ -327,4 +330,21 @@ class Block extends ConfigEntityBase implements BlockInterface, EntityWithPlugin
     return $duplicate;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    parent::preSave($storage);
+
+    // Ensure the region is valid to mirror the behavior of block_rebuild().
+    // This is done primarily for backwards compatibility support of
+    // \Drupal\block\BlockInterface::BLOCK_REGION_NONE.
+    $regions = system_region_list($this->theme);
+    if (!isset($regions[$this->region]) && $this->status()) {
+      $this
+        ->setRegion(system_default_region($this->theme))
+        ->disable();
+    }
+  }
+
 }
diff --git a/web/core/modules/block/src/EventSubscriber/BlockPageDisplayVariantSubscriber.php b/web/core/modules/block/src/EventSubscriber/BlockPageDisplayVariantSubscriber.php
index 2c85587d2..89f361f44 100644
--- a/web/core/modules/block/src/EventSubscriber/BlockPageDisplayVariantSubscriber.php
+++ b/web/core/modules/block/src/EventSubscriber/BlockPageDisplayVariantSubscriber.php
@@ -26,8 +26,8 @@ class BlockPageDisplayVariantSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[RenderEvents::SELECT_PAGE_DISPLAY_VARIANT][] = array('onSelectPageDisplayVariant');
+  public static function getSubscribedEvents() {
+    $events[RenderEvents::SELECT_PAGE_DISPLAY_VARIANT][] = ['onSelectPageDisplayVariant'];
     return $events;
   }
 
diff --git a/web/core/modules/block/src/Form/BlockDeleteForm.php b/web/core/modules/block/src/Form/BlockDeleteForm.php
index f0e89faad..5209b329b 100644
--- a/web/core/modules/block/src/Form/BlockDeleteForm.php
+++ b/web/core/modules/block/src/Form/BlockDeleteForm.php
@@ -17,4 +17,32 @@ class BlockDeleteForm extends EntityDeleteForm {
     return new Url('block.admin_display');
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Remove');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to remove the @entity-type %label?', [
+      '@entity-type' => $this->getEntity()->getEntityType()->getLowercaseLabel(),
+      '%label' => $this->getEntity()->label(),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDeletionMessage() {
+    $entity = $this->getEntity();
+    return $this->t('The @entity-type %label has been removed.', [
+      '@entity-type' => $entity->getEntityType()->getLowercaseLabel(),
+      '%label' => $entity->label(),
+    ]);
+  }
+
 }
diff --git a/web/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php b/web/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php
index 74da93200..927cb6133 100644
--- a/web/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php
+++ b/web/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php
@@ -48,7 +48,7 @@ class ThemeLocalTask extends DeriverBase implements ContainerDeriverInterface {
       if ($this->themeHandler->hasUi($theme_name)) {
         $this->derivatives[$theme_name] = $base_plugin_definition;
         $this->derivatives[$theme_name]['title'] = $theme->info['name'];
-        $this->derivatives[$theme_name]['route_parameters'] = array('theme' => $theme_name);
+        $this->derivatives[$theme_name]['route_parameters'] = ['theme' => $theme_name];
       }
       // Default task!
       if ($default_theme == $theme_name) {
diff --git a/web/core/modules/block/src/Plugin/migrate/destination/EntityBlock.php b/web/core/modules/block/src/Plugin/migrate/destination/EntityBlock.php
index c904a377a..537b16073 100644
--- a/web/core/modules/block/src/Plugin/migrate/destination/EntityBlock.php
+++ b/web/core/modules/block/src/Plugin/migrate/destination/EntityBlock.php
@@ -17,10 +17,10 @@ class EntityBlock extends EntityConfigBase {
    */
   protected function getEntityId(Row $row) {
     // Try to find the block by its plugin ID and theme.
-    $properties = array(
+    $properties = [
       'plugin' => $row->getDestinationProperty('plugin'),
       'theme' => $row->getDestinationProperty('theme'),
-    );
+    ];
     $blocks = array_keys($this->storage->loadByProperties($properties));
     return reset($blocks);
   }
diff --git a/web/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php b/web/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php
index cd4bce57e..08525674e 100644
--- a/web/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php
+++ b/web/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php
@@ -47,12 +47,12 @@ class BlockPluginId extends ProcessPluginBase implements ContainerFactoryPluginI
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
     $entity_manager = $container->get('entity.manager');
-    $migration_configuration = array(
-      'migration' => array(
+    $migration_configuration = [
+      'migration' => [
         'd6_custom_block',
         'd7_custom_block',
-      ),
-    );
+      ],
+    ];
     return new static(
       $configuration,
       $plugin_id,
diff --git a/web/core/modules/block/src/Plugin/migrate/process/BlockRegion.php b/web/core/modules/block/src/Plugin/migrate/process/BlockRegion.php
index 8aba3ee84..0eb984fd2 100644
--- a/web/core/modules/block/src/Plugin/migrate/process/BlockRegion.php
+++ b/web/core/modules/block/src/Plugin/migrate/process/BlockRegion.php
@@ -43,7 +43,7 @@ class BlockRegion extends StaticMap implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $regions = array();
+    $regions = [];
     foreach ($container->get('theme_handler')->listInfo() as $key => $theme) {
       $regions[$key] = $theme->info['regions'];
     }
diff --git a/web/core/modules/block/src/Plugin/migrate/process/BlockSettings.php b/web/core/modules/block/src/Plugin/migrate/process/BlockSettings.php
index 134bf2848..68e8f186b 100644
--- a/web/core/modules/block/src/Plugin/migrate/process/BlockSettings.php
+++ b/web/core/modules/block/src/Plugin/migrate/process/BlockSettings.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\block\Plugin\migrate\process;
 
-use Drupal\block\BlockInterface;
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
@@ -21,10 +21,10 @@ class BlockSettings extends ProcessPluginBase {
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     list($plugin, $delta, $old_settings, $title) = $value;
-    $settings = array();
+    $settings = [];
     $settings['label'] = $title;
     if ($title) {
-      $settings['label_display'] = BlockInterface::BLOCK_LABEL_VISIBLE;
+      $settings['label_display'] = BlockPluginInterface::BLOCK_LABEL_VISIBLE;
     }
     else {
       $settings['label_display'] = '0';
diff --git a/web/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php b/web/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
index e38d60be9..886079125 100644
--- a/web/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
+++ b/web/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
@@ -59,12 +59,12 @@ class BlockVisibility extends ProcessPluginBase implements ContainerFactoryPlugi
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
-    $migration_configuration = array(
-      'migration' => array(
+    $migration_configuration = [
+      'migration' => [
         'd6_user_role',
         'd7_user_role',
-      ),
-    );
+      ],
+    ];
     return new static(
       $configuration,
       $plugin_id,
@@ -80,18 +80,18 @@ class BlockVisibility extends ProcessPluginBase implements ContainerFactoryPlugi
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     list($old_visibility, $pages, $roles) = $value;
 
-    $visibility = array();
+    $visibility = [];
 
     // If the block is assigned to specific roles, add the user_role condition.
     if ($roles) {
-      $visibility['user_role'] = array(
+      $visibility['user_role'] = [
         'id' => 'user_role',
-        'roles' => array(),
-        'context_mapping' => array(
+        'roles' => [],
+        'context_mapping' => [
           'user' => '@user.current_user_context:current_user',
-        ),
+        ],
         'negate' => FALSE,
-      );
+      ];
 
       foreach ($roles as $key => $role_id) {
         $roles[$key] = $this->migrationPlugin->transform($role_id, $migrate_executable, $row, $destination_property);
@@ -104,12 +104,12 @@ class BlockVisibility extends ProcessPluginBase implements ContainerFactoryPlugi
       if ($old_visibility == 2) {
         // If the PHP module is present, migrate the visibility code unaltered.
         if ($this->moduleHandler->moduleExists('php')) {
-          $visibility['php'] = array(
+          $visibility['php'] = [
             'id' => 'php',
             // PHP code visibility could not be negated in Drupal 6 or 7.
             'negate' => FALSE,
             'php' => $pages,
-          );
+          ];
         }
         // Skip the row if we're configured to. If not, we don't need to do
         // anything else -- the block will simply have no PHP or request_path
@@ -123,11 +123,11 @@ class BlockVisibility extends ProcessPluginBase implements ContainerFactoryPlugi
         foreach ($paths as $key => $path) {
           $paths[$key] = $path === '<front>' ? $path : '/' . ltrim($path, '/');
         }
-        $visibility['request_path'] = array(
+        $visibility['request_path'] = [
           'id' => 'request_path',
           'negate' => !$old_visibility,
           'pages' => implode("\n", $paths),
-        );
+        ];
       }
     }
 
diff --git a/web/core/modules/block/src/Plugin/migrate/source/Block.php b/web/core/modules/block/src/Plugin/migrate/source/Block.php
index b69128369..df4c0e9e1 100644
--- a/web/core/modules/block/src/Plugin/migrate/source/Block.php
+++ b/web/core/modules/block/src/Plugin/migrate/source/Block.php
@@ -81,7 +81,7 @@ class Block extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'bid' => $this->t('The block numeric identifier.'),
       'module' => $this->t('The module providing the block.'),
       'delta' => $this->t('The block\'s delta.'),
@@ -93,7 +93,7 @@ class Block extends DrupalSqlBase {
       'pages' => $this->t('Pages list.'),
       'title' => $this->t('Block title.'),
       'cache' => $this->t('Cache rule.'),
-    );
+    ];
   }
 
   /**
@@ -117,7 +117,7 @@ class Block extends DrupalSqlBase {
     $delta = $row->getSourceProperty('delta');
 
     $query = $this->select($this->blockRoleTable, 'br')
-      ->fields('br', array('rid'))
+      ->fields('br', ['rid'])
       ->condition('module', $module)
       ->condition('delta', $delta);
     $query->join($this->userRoleTable, 'ur', 'br.rid = ur.rid');
@@ -125,7 +125,7 @@ class Block extends DrupalSqlBase {
       ->fetchCol();
     $row->setSourceProperty('roles', $roles);
 
-    $settings = array();
+    $settings = [];
     switch ($module) {
       case 'aggregator':
         list($type, $id) = explode('-', $delta);
@@ -152,7 +152,7 @@ class Block extends DrupalSqlBase {
         $settings['forum']['block_num'] = $this->variableGet('forum_block_num_' . $delta, 5);
         break;
       case 'statistics':
-        foreach (array('statistics_block_top_day_num', 'statistics_block_top_all_num', 'statistics_block_top_last_num') as $name) {
+        foreach (['statistics_block_top_day_num', 'statistics_block_top_all_num', 'statistics_block_top_last_num'] as $name) {
           $settings['statistics'][$name] = $this->variableGet($name, 0);
         }
         break;
diff --git a/web/core/modules/block/src/Tests/BlockAdminThemeTest.php b/web/core/modules/block/src/Tests/BlockAdminThemeTest.php
index ab444d5e3..8773f0362 100644
--- a/web/core/modules/block/src/Tests/BlockAdminThemeTest.php
+++ b/web/core/modules/block/src/Tests/BlockAdminThemeTest.php
@@ -16,14 +16,14 @@ class BlockAdminThemeTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'contextual');
+  public static $modules = ['block', 'contextual'];
 
   /**
    * Check for the accessibility of the admin theme on the block admin page.
    */
-  function testAdminTheme() {
+  public function testAdminTheme() {
     // Create administrative user.
-    $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer themes'));
+    $admin_user = $this->drupalCreateUser(['administer blocks', 'administer themes']);
     $this->drupalLogin($admin_user);
 
     // Ensure that access to block admin page is denied when theme is not
@@ -32,7 +32,7 @@ class BlockAdminThemeTest extends WebTestBase {
     $this->assertResponse(403);
 
     // Install admin theme and confirm that tab is accessible.
-    \Drupal::service('theme_handler')->install(array('bartik'));
+    \Drupal::service('theme_handler')->install(['bartik']);
     $edit['admin_theme'] = 'bartik';
     $this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
     $this->drupalGet('admin/structure/block/list/bartik');
@@ -42,7 +42,7 @@ class BlockAdminThemeTest extends WebTestBase {
   /**
    * Ensure contextual links are disabled in Seven theme.
    */
-  function testSevenAdminTheme() {
+  public function testSevenAdminTheme() {
     // Create administrative user.
     $admin_user = $this->drupalCreateUser([
       'access administration pages',
diff --git a/web/core/modules/block/src/Tests/BlockFormInBlockTest.php b/web/core/modules/block/src/Tests/BlockFormInBlockTest.php
index 20d24b21a..ebe43c8ce 100644
--- a/web/core/modules/block/src/Tests/BlockFormInBlockTest.php
+++ b/web/core/modules/block/src/Tests/BlockFormInBlockTest.php
@@ -2,8 +2,10 @@
 
 namespace Drupal\block\Tests;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\simpletest\WebTestBase;
 
+
 /**
  * Tests form in block caching.
  *
@@ -31,7 +33,7 @@ class BlockFormInBlockTest extends WebTestBase {
   /**
    * Test to see if form in block's redirect isn't cached.
    */
-  function testCachePerPage() {
+  public function testCachePerPage() {
     $form_values = ['email' => 'test@example.com'];
 
     // Go to "test-page" and test if the block is enabled.
@@ -64,7 +66,7 @@ class BlockFormInBlockTest extends WebTestBase {
   public function testPlaceholders() {
     $this->drupalGet('test-multiple-forms');
 
-    $placeholder = 'form_action_' . hash('crc32b', 'Drupal\Core\Form\FormBuilder::prepareForm');
+    $placeholder = 'form_action_' . Crypt::hashBase64('Drupal\Core\Form\FormBuilder::prepareForm');
     $this->assertText('Form action: ' . $placeholder, 'placeholder found.');
   }
 
diff --git a/web/core/modules/block/src/Tests/BlockLanguageCacheTest.php b/web/core/modules/block/src/Tests/BlockLanguageCacheTest.php
index fd5871e3a..269536d9c 100644
--- a/web/core/modules/block/src/Tests/BlockLanguageCacheTest.php
+++ b/web/core/modules/block/src/Tests/BlockLanguageCacheTest.php
@@ -18,25 +18,25 @@ class BlockLanguageCacheTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'language', 'menu_ui');
+  public static $modules = ['block', 'language', 'menu_ui'];
 
   /**
    * List of langcodes.
    *
    * @var array
    */
-  protected $langcodes = array();
+  protected $langcodes = [];
 
   protected function setUp() {
     parent::setUp();
 
     // Create test languages.
-    $this->langcodes = array(ConfigurableLanguage::load('en'));
+    $this->langcodes = [ConfigurableLanguage::load('en')];
     for ($i = 1; $i < 3; ++$i) {
-      $language = ConfigurableLanguage::create(array(
+      $language = ConfigurableLanguage::create([
         'id' => 'l' . $i,
         'label' => $this->randomString(),
-      ));
+      ]);
       $language->save();
       $this->langcodes[$i] = $language;
     }
@@ -47,16 +47,16 @@ class BlockLanguageCacheTest extends WebTestBase {
    */
   public function testBlockLinks() {
     // Create admin user to be able to access block admin.
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'administer blocks',
       'access administration pages',
       'administer menu',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
 
     // Create the block cache for all languages.
     foreach ($this->langcodes as $langcode) {
-      $this->drupalGet('admin/structure/block', array('language' => $langcode));
+      $this->drupalGet('admin/structure/block', ['language' => $langcode]);
       $this->clickLinkPartialName('Place block');
     }
 
@@ -64,11 +64,11 @@ class BlockLanguageCacheTest extends WebTestBase {
     $edit['label'] = $this->randomMachineName();
     $edit['id'] = Unicode::strtolower($edit['label']);
     $this->drupalPostForm('admin/structure/menu/add', $edit, t('Save'));
-    $this->assertText(t('Menu @label has been added.', array('@label' => $edit['label'])));
+    $this->assertText(t('Menu @label has been added.', ['@label' => $edit['label']]));
 
     // Check that the block is listed for all languages.
     foreach ($this->langcodes as $langcode) {
-      $this->drupalGet('admin/structure/block', array('language' => $langcode));
+      $this->drupalGet('admin/structure/block', ['language' => $langcode]);
       $this->clickLinkPartialName('Place block');
       $this->assertText($edit['label']);
     }
diff --git a/web/core/modules/block/src/Tests/BlockRenderOrderTest.php b/web/core/modules/block/src/Tests/BlockRenderOrderTest.php
index faf667ed8..a7e26ded4 100644
--- a/web/core/modules/block/src/Tests/BlockRenderOrderTest.php
+++ b/web/core/modules/block/src/Tests/BlockRenderOrderTest.php
@@ -17,49 +17,49 @@ class BlockRenderOrderTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'block');
+  public static $modules = ['node', 'block'];
 
   protected function setUp() {
     parent::setUp();
     // Create a test user.
-    $end_user = $this->drupalCreateUser(array(
+    $end_user = $this->drupalCreateUser([
       'access content',
-    ));
+    ]);
     $this->drupalLogin($end_user);
   }
 
   /**
    * Tests the render order of the blocks.
    */
-  function testBlockRenderOrder() {
+  public function testBlockRenderOrder() {
     // Enable test blocks and place them in the same region.
     $region = 'header';
-    $test_blocks = array(
-      'stark_powered' => array(
+    $test_blocks = [
+      'stark_powered' => [
         'weight' => '-3',
         'id' => 'stark_powered',
         'label' => 'Test block A',
-      ),
-      'stark_by' => array(
+      ],
+      'stark_by' => [
         'weight' => '3',
         'id' => 'stark_by',
         'label' => 'Test block C',
-      ),
-      'stark_drupal' => array(
+      ],
+      'stark_drupal' => [
         'weight' => '3',
         'id' => 'stark_drupal',
         'label' => 'Test block B',
-      ),
-    );
+      ],
+    ];
 
     // Place the test blocks.
     foreach ($test_blocks as $test_block) {
-      $this->drupalPlaceBlock('system_powered_by_block', array(
+      $this->drupalPlaceBlock('system_powered_by_block', [
         'label' => $test_block['label'],
         'region' => $region,
         'weight' => $test_block['weight'],
         'id' => $test_block['id'],
-      ));
+      ]);
     }
 
     $this->drupalGet('');
diff --git a/web/core/modules/block/src/Tests/BlockSystemBrandingTest.php b/web/core/modules/block/src/Tests/BlockSystemBrandingTest.php
index f3dfa3cdb..b5025e801 100644
--- a/web/core/modules/block/src/Tests/BlockSystemBrandingTest.php
+++ b/web/core/modules/block/src/Tests/BlockSystemBrandingTest.php
@@ -14,7 +14,7 @@ class BlockSystemBrandingTest extends BlockTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'system');
+  public static $modules = ['block', 'system'];
 
   /**
    * {@inheritdoc}
@@ -26,7 +26,7 @@ class BlockSystemBrandingTest extends BlockTestBase {
       ->set('slogan', 'Community plumbing')
       ->save();
     // Add the system branding block to the page.
-    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header', 'id' => 'site-branding'));
+    $this->drupalPlaceBlock('system_branding_block', ['region' => 'header', 'id' => 'site-branding']);
   }
 
   /**
diff --git a/web/core/modules/block/src/Tests/BlockTest.php b/web/core/modules/block/src/Tests/BlockTest.php
index 2427a71c4..5910d4789 100644
--- a/web/core/modules/block/src/Tests/BlockTest.php
+++ b/web/core/modules/block/src/Tests/BlockTest.php
@@ -18,18 +18,18 @@ class BlockTest extends BlockTestBase {
   /**
    * Tests block visibility.
    */
-  function testBlockVisibility() {
+  public function testBlockVisibility() {
     $block_name = 'system_powered_by_block';
     // Create a random title for the block.
     $title = $this->randomMachineName(8);
     // Enable a standard block.
     $default_theme = $this->config('system.theme')->get('default');
-    $edit = array(
+    $edit = [
       'id' => strtolower($this->randomMachineName(8)),
       'region' => 'sidebar_first',
       'settings[label]' => $title,
       'settings[label_display]' => TRUE,
-    );
+    ];
     // Set the block to be hidden on any user path, and to be shown only to
     // authenticated users.
     $edit['visibility[request_path][pages]'] = '/user*';
@@ -69,11 +69,11 @@ class BlockTest extends BlockTestBase {
     $title = $this->randomMachineName(8);
     // Enable a standard block.
     $default_theme = $this->config('system.theme')->get('default');
-    $edit = array(
+    $edit = [
       'id' => strtolower($this->randomMachineName(8)),
       'region' => 'sidebar_first',
       'settings[label]' => $title,
-    );
+    ];
     $block_id = $edit['id'];
     // Set the block to be shown only to authenticated users.
     $edit['visibility[user_role][roles][' . RoleInterface::AUTHENTICATED_ID . ']'] = TRUE;
@@ -99,18 +99,18 @@ class BlockTest extends BlockTestBase {
   /**
    * Test block visibility when leaving "pages" textarea empty.
    */
-  function testBlockVisibilityListedEmpty() {
+  public function testBlockVisibilityListedEmpty() {
     $block_name = 'system_powered_by_block';
     // Create a random title for the block.
     $title = $this->randomMachineName(8);
     // Enable a standard block.
     $default_theme = $this->config('system.theme')->get('default');
-    $edit = array(
+    $edit = [
       'id' => strtolower($this->randomMachineName(8)),
       'region' => 'sidebar_first',
       'settings[label]' => $title,
       'visibility[request_path][negate]' => TRUE,
-    );
+    ];
     // Set the block to be hidden on any user path, and to be shown only to
     // authenticated users.
     $this->drupalPostForm('admin/structure/block/add/' . $block_name . '/' . $default_theme, $edit, t('Save block'));
@@ -176,12 +176,16 @@ class BlockTest extends BlockTestBase {
   /**
    * Test configuring and moving a module-define block to specific regions.
    */
-  function testBlock() {
+  public function testBlock() {
     // Place page title block to test error messages.
     $this->drupalPlaceBlock('page_title_block');
 
+    // Disable the block.
+    $this->drupalGet('admin/structure/block');
+    $this->clickLink('Disable');
+
     // Select the 'Powered by Drupal' block to be configured and moved.
-    $block = array();
+    $block = [];
     $block['id'] = 'system_powered_by_block';
     $block['settings[label]'] = $this->randomMachineName(8);
     $block['settings[label_display]'] = TRUE;
@@ -189,7 +193,7 @@ class BlockTest extends BlockTestBase {
     $block['region'] = 'header';
 
     // Set block title to confirm that interface works and override any custom titles.
-    $this->drupalPostForm('admin/structure/block/add/' . $block['id'] . '/' . $block['theme'], array('settings[label]' => $block['settings[label]'], 'settings[label_display]' => $block['settings[label_display]'], 'id' => $block['id'], 'region' => $block['region']), t('Save block'));
+    $this->drupalPostForm('admin/structure/block/add/' . $block['id'] . '/' . $block['theme'], ['settings[label]' => $block['settings[label]'], 'settings[label_display]' => $block['settings[label_display]'], 'id' => $block['id'], 'region' => $block['region']], t('Save block'));
     $this->assertText(t('The block configuration has been saved.'), 'Block title set.');
     // Check to see if the block was created by checking its configuration.
     $instance = Block::load($block['id']);
@@ -201,36 +205,35 @@ class BlockTest extends BlockTestBase {
       $this->moveBlockToRegion($block, $region);
     }
 
-    // Set the block to the disabled region.
-    $edit = array();
-    $edit['blocks[' . $block['id'] . '][region]'] = -1;
-    $this->drupalPostForm('admin/structure/block', $edit, t('Save blocks'));
+    // Disable the block.
+    $this->drupalGet('admin/structure/block');
+    $this->clickLink('Disable');
 
     // Confirm that the block is now listed as disabled.
-    $this->assertText(t('The block settings have been updated.'), 'Block successfully move to disabled region.');
+    $this->assertText(t('The block settings have been updated.'), 'Block successfully moved to disabled region.');
 
     // Confirm that the block instance title and markup are not displayed.
     $this->drupalGet('node');
     $this->assertNoText(t($block['settings[label]']));
     // Check for <div id="block-my-block-instance-name"> if the machine name
     // is my_block_instance_name.
-    $xpath = $this->buildXPathQuery('//div[@id=:id]/*', array(':id' => 'block-' . str_replace('_', '-', strtolower($block['id']))));
+    $xpath = $this->buildXPathQuery('//div[@id=:id]/*', [':id' => 'block-' . str_replace('_', '-', strtolower($block['id']))]);
     $this->assertNoFieldByXPath($xpath, FALSE, 'Block found in no regions.');
 
     // Test deleting the block from the edit form.
     $this->drupalGet('admin/structure/block/manage/' . $block['id']);
-    $this->clickLink(t('Delete'));
-    $this->assertRaw(t('Are you sure you want to delete the block %name?', array('%name' => $block['settings[label]'])));
-    $this->drupalPostForm(NULL, array(), t('Delete'));
-    $this->assertRaw(t('The block %name has been deleted.', array('%name' => $block['settings[label]'])));
+    $this->clickLink(t('Remove block'));
+    $this->assertRaw(t('Are you sure you want to remove the block @name?', ['@name' => $block['settings[label]']]));
+    $this->drupalPostForm(NULL, [], t('Remove'));
+    $this->assertRaw(t('The block %name has been removed.', ['%name' => $block['settings[label]']]));
 
     // Test deleting a block via "Configure block" link.
     $block = $this->drupalPlaceBlock('system_powered_by_block');
-    $this->drupalGet('admin/structure/block/manage/' . $block->id(), array('query' => array('destination' => 'admin')));
-    $this->clickLink(t('Delete'));
-    $this->assertRaw(t('Are you sure you want to delete the block %name?', array('%name' => $block->label())));
-    $this->drupalPostForm(NULL, array(), t('Delete'));
-    $this->assertRaw(t('The block %name has been deleted.', array('%name' => $block->label())));
+    $this->drupalGet('admin/structure/block/manage/' . $block->id(), ['query' => ['destination' => 'admin']]);
+    $this->clickLink(t('Remove block'));
+    $this->assertRaw(t('Are you sure you want to remove the block @name?', ['@name' => $block->label()]));
+    $this->drupalPostForm(NULL, [], t('Remove'));
+    $this->assertRaw(t('The block %name has been removed.', ['%name' => $block->label()]));
     $this->assertUrl('admin');
     $this->assertNoRaw($block->id());
   }
@@ -246,7 +249,7 @@ class BlockTest extends BlockTestBase {
       $this->drupalGet('admin/structure/block/list/' . $theme);
       $this->assertTitle(t('Block layout') . ' | Drupal');
       // Select the 'Powered by Drupal' block to be placed.
-      $block = array();
+      $block = [];
       $block['id'] = strtolower($this->randomMachineName());
       $block['theme'] = $theme;
       $block['region'] = 'content';
@@ -257,7 +260,7 @@ class BlockTest extends BlockTestBase {
       // Set the default theme and ensure the block is placed.
       $theme_settings->set('default', $theme)->save();
       $this->drupalGet('');
-      $elements = $this->xpath('//div[@id = :id]', array(':id' => Html::getUniqueId('block-' . $block['id'])));
+      $elements = $this->xpath('//div[@id = :id]', [':id' => Html::getUniqueId('block-' . $block['id'])]);
       $this->assertTrue(!empty($elements), 'The block was found.');
     }
   }
@@ -265,13 +268,13 @@ class BlockTest extends BlockTestBase {
   /**
    * Test block display of theme titles.
    */
-  function testThemeName() {
+  public function testThemeName() {
     // Enable the help block.
-    $this->drupalPlaceBlock('help_block', array('region' => 'help'));
+    $this->drupalPlaceBlock('help_block', ['region' => 'help']);
     $this->drupalPlaceBlock('local_tasks_block');
     // Explicitly set the default and admin themes.
     $theme = 'block_test_specialchars_theme';
-    \Drupal::service('theme_handler')->install(array($theme));
+    \Drupal::service('theme_handler')->install([$theme]);
     \Drupal::service('router.builder')->rebuild();
     $this->drupalGet('admin/structure/block');
     $this->assertEscaped('<"Cat" & \'Mouse\'>');
@@ -282,27 +285,27 @@ class BlockTest extends BlockTestBase {
   /**
    * Test block title display settings.
    */
-  function testHideBlockTitle() {
+  public function testHideBlockTitle() {
     $block_name = 'system_powered_by_block';
     // Create a random title for the block.
     $title = $this->randomMachineName(8);
     $id = strtolower($this->randomMachineName(8));
     // Enable a standard block.
     $default_theme = $this->config('system.theme')->get('default');
-    $edit = array(
+    $edit = [
       'id' => $id,
       'region' => 'sidebar_first',
       'settings[label]' => $title,
-    );
+    ];
     $this->drupalPostForm('admin/structure/block/add/' . $block_name . '/' . $default_theme, $edit, t('Save block'));
     $this->assertText('The block configuration has been saved.', 'Block was saved');
 
     $this->drupalGet('user');
     $this->assertNoText($title, 'Block title was not displayed by default.');
 
-    $edit = array(
+    $edit = [
       'settings[label_display]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/block/manage/' . $id, $edit, t('Save block'));
     $this->assertText('The block configuration has been saved.', 'Block was saved');
 
@@ -325,26 +328,26 @@ class BlockTest extends BlockTestBase {
    *   The machine name of the theme region to move the block to, for example
    *   'header' or 'sidebar_first'.
    */
-  function moveBlockToRegion(array $block, $region) {
+  public function moveBlockToRegion(array $block, $region) {
     // Set the created block to a specific region.
-    $block += array('theme' => $this->config('system.theme')->get('default'));
-    $edit = array();
+    $block += ['theme' => $this->config('system.theme')->get('default')];
+    $edit = [];
     $edit['blocks[' . $block['id'] . '][region]'] = $region;
     $this->drupalPostForm('admin/structure/block', $edit, t('Save blocks'));
 
     // Confirm that the block was moved to the proper region.
-    $this->assertText(t('The block settings have been updated.'), format_string('Block successfully moved to %region_name region.', array( '%region_name' => $region)));
+    $this->assertText(t('The block settings have been updated.'), format_string('Block successfully moved to %region_name region.', [ '%region_name' => $region]));
 
     // Confirm that the block is being displayed.
     $this->drupalGet('');
     $this->assertText(t($block['settings[label]']), 'Block successfully being displayed on the page.');
 
     // Confirm that the custom block was found at the proper region.
-    $xpath = $this->buildXPathQuery('//div[@class=:region-class]//div[@id=:block-id]/*', array(
+    $xpath = $this->buildXPathQuery('//div[@class=:region-class]//div[@id=:block-id]/*', [
       ':region-class' => 'region region-' . Html::getClass($region),
       ':block-id' => 'block-' . str_replace('_', '-', strtolower($block['id'])),
-    ));
-    $this->assertFieldByXPath($xpath, NULL, t('Block found in %region_name region.', array('%region_name' => Html::getClass($region))));
+    ]);
+    $this->assertFieldByXPath($xpath, NULL, t('Block found in %region_name region.', ['%region_name' => Html::getClass($region)]));
   }
 
   /**
@@ -364,7 +367,7 @@ class BlockTest extends BlockTestBase {
     $config->save();
 
     // Place the "Powered by Drupal" block.
-    $block = $this->drupalPlaceBlock('system_powered_by_block', array('id' => 'powered'));
+    $block = $this->drupalPlaceBlock('system_powered_by_block', ['id' => 'powered']);
 
     // Prime the page cache.
     $this->drupalGet('<front>');
@@ -374,25 +377,26 @@ class BlockTest extends BlockTestBase {
     // both the page and block caches.
     $this->drupalGet('<front>');
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
-    $cid_parts = array(\Drupal::url('<front>', array(), array('absolute' => TRUE)), 'html');
+    $cid_parts = [\Drupal::url('<front>', [], ['absolute' => TRUE]), 'html'];
     $cid = implode(':', $cid_parts);
     $cache_entry = \Drupal::cache('render')->get($cid);
-    $expected_cache_tags = array(
+    $expected_cache_tags = [
       'config:block_list',
       'block_view',
       'config:block.block.powered',
       'config:user.role.anonymous',
+      'http_response',
       'rendered',
-    );
+    ];
     sort($expected_cache_tags);
     $keys = \Drupal::service('cache_contexts_manager')->convertTokensToKeys(['languages:language_interface', 'theme', 'user.permissions'])->getKeys();
     $this->assertIdentical($cache_entry->tags, $expected_cache_tags);
     $cache_entry = \Drupal::cache('render')->get('entity_view:block:powered:' . implode(':', $keys));
-    $expected_cache_tags = array(
+    $expected_cache_tags = [
       'block_view',
       'config:block.block.powered',
       'rendered',
-    );
+    ];
     sort($expected_cache_tags);
     $this->assertIdentical($cache_entry->tags, $expected_cache_tags);
 
@@ -407,40 +411,41 @@ class BlockTest extends BlockTestBase {
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
 
     // Place the "Powered by Drupal" block another time; verify a cache miss.
-    $block_2 = $this->drupalPlaceBlock('system_powered_by_block', array('id' => 'powered-2'));
+    $block_2 = $this->drupalPlaceBlock('system_powered_by_block', ['id' => 'powered-2']);
     $this->drupalGet('<front>');
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
 
     // Verify a cache hit, but also the presence of the correct cache tags.
     $this->drupalGet('<front>');
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
-    $cid_parts = array(\Drupal::url('<front>', array(), array('absolute' => TRUE)), 'html');
+    $cid_parts = [\Drupal::url('<front>', [], ['absolute' => TRUE]), 'html'];
     $cid = implode(':', $cid_parts);
     $cache_entry = \Drupal::cache('render')->get($cid);
-    $expected_cache_tags = array(
+    $expected_cache_tags = [
       'config:block_list',
       'block_view',
       'config:block.block.powered',
       'config:block.block.powered-2',
       'config:user.role.anonymous',
+      'http_response',
       'rendered',
-    );
+    ];
     sort($expected_cache_tags);
     $this->assertEqual($cache_entry->tags, $expected_cache_tags);
-    $expected_cache_tags = array(
+    $expected_cache_tags = [
       'block_view',
       'config:block.block.powered',
       'rendered',
-    );
+    ];
     sort($expected_cache_tags);
     $keys = \Drupal::service('cache_contexts_manager')->convertTokensToKeys(['languages:language_interface', 'theme', 'user.permissions'])->getKeys();
     $cache_entry = \Drupal::cache('render')->get('entity_view:block:powered:' . implode(':', $keys));
     $this->assertIdentical($cache_entry->tags, $expected_cache_tags);
-    $expected_cache_tags = array(
+    $expected_cache_tags = [
       'block_view',
       'config:block.block.powered-2',
       'rendered',
-    );
+    ];
     sort($expected_cache_tags);
     $keys = \Drupal::service('cache_contexts_manager')->convertTokensToKeys(['languages:language_interface', 'theme', 'user.permissions'])->getKeys();
     $cache_entry = \Drupal::cache('render')->get('entity_view:block:powered-2:' . implode(':', $keys));
@@ -451,7 +456,7 @@ class BlockTest extends BlockTestBase {
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
 
     // Delete the "Powered by Drupal" blocks; verify a cache miss.
-    entity_delete_multiple('block', array('powered', 'powered-2'));
+    entity_delete_multiple('block', ['powered', 'powered-2']);
     $this->drupalGet('<front>');
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
   }
@@ -480,12 +485,12 @@ class BlockTest extends BlockTestBase {
     $theme_handler = \Drupal::service('theme_handler');
 
     $theme_handler->install(['seven']);
-    $theme_handler->setDefault('seven');
+    $this->config('system.theme')->set('default', 'seven')->save();
     $block = $this->drupalPlaceBlock('system_powered_by_block', ['theme' => 'seven', 'region' => 'help']);
     $this->drupalGet('<front>');
     $this->assertText('Powered by Drupal');
 
-    $theme_handler->setDefault('classy');
+    $this->config('system.theme')->set('default', 'classy')->save();
     $theme_handler->uninstall(['seven']);
 
     // Ensure that the block configuration does not exist anymore.
diff --git a/web/core/modules/block/src/Tests/BlockTestBase.php b/web/core/modules/block/src/Tests/BlockTestBase.php
index 970de5266..71f0ae6cf 100644
--- a/web/core/modules/block/src/Tests/BlockTestBase.php
+++ b/web/core/modules/block/src/Tests/BlockTestBase.php
@@ -15,7 +15,7 @@ abstract class BlockTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'filter', 'test_page_test', 'help', 'block_test');
+  public static $modules = ['block', 'filter', 'test_page_test', 'help', 'block_test'];
 
   /**
    * A list of theme regions to test.
@@ -38,31 +38,31 @@ abstract class BlockTestBase extends WebTestBase {
     $this->config('system.site')->set('page.front', '/test-page')->save();
 
     // Create Full HTML text format.
-    $full_html_format = FilterFormat::create(array(
+    $full_html_format = FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
-    ));
+    ]);
     $full_html_format->save();
 
     // Create and log in an administrative user having access to the Full HTML
     // text format.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer blocks',
       $full_html_format->getPermissionName(),
       'access administration pages',
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
 
     // Define the existing regions.
-    $this->regions = array(
+    $this->regions = [
       'header',
       'sidebar_first',
       'content',
       'sidebar_second',
       'footer',
-    );
+    ];
     $block_storage = $this->container->get('entity_type.manager')->getStorage('block');
-    $blocks = $block_storage->loadByProperties(array('theme' => $this->config('system.theme')->get('default')));
+    $blocks = $block_storage->loadByProperties(['theme' => $this->config('system.theme')->get('default')]);
     foreach ($blocks as $block) {
       $block->delete();
     }
diff --git a/web/core/modules/block/src/Tests/BlockUiTest.php b/web/core/modules/block/src/Tests/BlockUiTest.php
index 2ba766386..d4ebda4d9 100644
--- a/web/core/modules/block/src/Tests/BlockUiTest.php
+++ b/web/core/modules/block/src/Tests/BlockUiTest.php
@@ -17,7 +17,7 @@ class BlockUiTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test', 'help', 'condition_test');
+  public static $modules = ['block', 'block_test', 'help', 'condition_test'];
 
   protected $regions;
 
@@ -43,30 +43,30 @@ class BlockUiTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
     // Create and log in an administrative user.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer blocks',
       'access administration pages',
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
 
     // Enable some test blocks.
-    $this->blockValues = array(
-      array(
+    $this->blockValues = [
+      [
         'label' => 'Tools',
         'tr' => '5',
         'plugin_id' => 'system_menu_block:tools',
-        'settings' => array('region' => 'sidebar_second', 'id' => 'tools'),
+        'settings' => ['region' => 'sidebar_second', 'id' => 'tools'],
         'test_weight' => '-1',
-      ),
-      array(
+      ],
+      [
         'label' => 'Powered by Drupal',
         'tr' => '16',
         'plugin_id' => 'system_powered_by_block',
-        'settings' => array('region' => 'footer', 'id' => 'powered'),
+        'settings' => ['region' => 'footer', 'id' => 'powered'],
         'test_weight' => '0',
-      ),
-    );
-    $this->blocks = array();
+      ],
+    ];
+    $this->blocks = [];
     foreach ($this->blockValues as $values) {
       $this->blocks[] = $this->drupalPlaceBlock($values['plugin_id'], $values['settings']);
     }
@@ -76,13 +76,13 @@ class BlockUiTest extends WebTestBase {
    * Test block demo page exists and functions correctly.
    */
   public function testBlockDemoUiPage() {
-    $this->drupalPlaceBlock('help_block', array('region' => 'help'));
+    $this->drupalPlaceBlock('help_block', ['region' => 'help']);
     $this->drupalGet('admin/structure/block');
-    $this->clickLink(t('Demonstrate block regions (@theme)', array('@theme' => 'Classy')));
-    $elements = $this->xpath('//div[contains(@class, "region-highlighted")]/div[contains(@class, "block-region") and contains(text(), :title)]', array(':title' => 'Highlighted'));
+    $this->clickLink(t('Demonstrate block regions (@theme)', ['@theme' => 'Classy']));
+    $elements = $this->xpath('//div[contains(@class, "region-highlighted")]/div[contains(@class, "block-region") and contains(text(), :title)]', [':title' => 'Highlighted']);
     $this->assertTrue(!empty($elements), 'Block demo regions are shown.');
 
-    \Drupal::service('theme_handler')->install(array('test_theme'));
+    \Drupal::service('theme_handler')->install(['test_theme']);
     $this->drupalGet('admin/structure/block/demo/test_theme');
     $this->assertEscaped('<strong>Test theme</strong>');
 
@@ -94,7 +94,7 @@ class BlockUiTest extends WebTestBase {
   /**
    * Test block admin page exists and functions correctly.
    */
-  function testBlockAdminUiPage() {
+  public function testBlockAdminUiPage() {
     // Visit the blocks admin ui.
     $this->drupalGet('admin/structure/block');
     // Look for the blocks table.
@@ -163,11 +163,11 @@ class BlockUiTest extends WebTestBase {
    * Tests the block categories on the listing page.
    */
   public function testCandidateBlockList() {
-    $arguments = array(
+    $arguments = [
       ':title' => 'Display message',
       ':category' => 'Block test',
       ':href' => 'admin/structure/block/add/test_block_instantiation/classy',
-    );
+    ];
     $pattern = '//tr[.//td/div[text()=:title] and .//td[text()=:category] and .//td//a[contains(@href, :href)]]';
 
     $this->drupalGet('admin/structure/block');
@@ -190,11 +190,11 @@ class BlockUiTest extends WebTestBase {
    * Tests the behavior of unsatisfied context-aware blocks.
    */
   public function testContextAwareUnsatisfiedBlocks() {
-    $arguments = array(
+    $arguments = [
       ':category' => 'Block test',
       ':href' => 'admin/structure/block/add/test_context_aware_unsatisfied/classy',
       ':text' => 'Test context-aware unsatisfied block',
-    );
+    ];
 
     $this->drupalGet('admin/structure/block');
     $this->clickLinkPartialName('Place block');
@@ -215,11 +215,11 @@ class BlockUiTest extends WebTestBase {
     $this->assertNoRaw($expected_text);
 
     $block_url = 'admin/structure/block/add/test_context_aware/classy';
-    $arguments = array(
+    $arguments = [
       ':title' => 'Test context-aware block',
       ':category' => 'Block test',
       ':href' => $block_url,
-    );
+    ];
     $pattern = '//tr[.//td/div[text()=:title] and .//td[text()=:category] and .//td//a[contains(@href, :href)]]';
 
     $this->drupalGet('admin/structure/block');
@@ -230,7 +230,7 @@ class BlockUiTest extends WebTestBase {
     $this->assertTrue(!empty($definition), 'The context-aware test block exists.');
     $edit = [
       'region' => 'content',
-      'settings[context_mapping][user]' => '@block_test.multiple_static_context:user2',
+      'settings[context_mapping][user]' => '@block_test.multiple_static_context:userB',
     ];
     $this->drupalPostForm($block_url, $edit, 'Save block');
 
@@ -262,12 +262,15 @@ class BlockUiTest extends WebTestBase {
     $url = 'admin/structure/block/add/test_block_instantiation/classy';
     $this->drupalGet($url);
     $this->assertFieldByName('id', 'displaymessage', 'Block form uses raw machine name suggestion when no instance already exists.');
-    $this->drupalPostForm($url, array(), 'Save block');
+    $edit = ['region' => 'content'];
+    $this->drupalPostForm($url, $edit, 'Save block');
+    $this->assertText('The block configuration has been saved.');
 
     // Now, check to make sure the form starts by autoincrementing correctly.
     $this->drupalGet($url);
     $this->assertFieldByName('id', 'displaymessage_2', 'Block form appends _2 to plugin-suggested machine name when an instance already exists.');
-    $this->drupalPostForm($url, array(), 'Save block');
+    $this->drupalPostForm($url, $edit, 'Save block');
+    $this->assertText('The block configuration has been saved.');
 
     // And verify that it continues working beyond just the first two.
     $this->drupalGet($url);
@@ -279,7 +282,7 @@ class BlockUiTest extends WebTestBase {
    */
   public function testBlockPlacementIndicator() {
     // Select the 'Powered by Drupal' block to be placed.
-    $block = array();
+    $block = [];
     $block['id'] = strtolower($this->randomMachineName());
     $block['theme'] = 'classy';
     $block['region'] = 'content';
@@ -289,7 +292,7 @@ class BlockUiTest extends WebTestBase {
     $this->assertUrl('admin/structure/block/list/classy?block-placement=' . Html::getClass($block['id']));
 
     // Resaving the block page will remove the block indicator.
-    $this->drupalPostForm(NULL, array(), t('Save blocks'));
+    $this->drupalPostForm(NULL, [], t('Save blocks'));
     $this->assertUrl('admin/structure/block/list/classy');
   }
 
@@ -297,7 +300,7 @@ class BlockUiTest extends WebTestBase {
    * Tests if validation errors are passed plugin form to the parent form.
    */
   public function testBlockValidateErrors() {
-    $this->drupalPostForm('admin/structure/block/add/test_settings_validation/classy', ['settings[digits]' => 'abc'], t('Save block'));
+    $this->drupalPostForm('admin/structure/block/add/test_settings_validation/classy', ['region' => 'content', 'settings[digits]' => 'abc'], t('Save block'));
 
     $arguments = [':message' => 'Only digits are allowed'];
     $pattern = '//div[contains(@class,"messages messages--error")]/div[contains(text()[2],:message)]';
@@ -309,4 +312,18 @@ class BlockUiTest extends WebTestBase {
     $this->assertTrue($error_class, 'Plugin error class found in parent form.');
   }
 
+  /**
+   * Tests that the enable/disable routes are protected from CSRF.
+   */
+  public function testRouteProtection() {
+    // Get the first block generated in our setUp method.
+    /** @var \Drupal\block\BlockInterface $block */
+    $block = reset($this->blocks);
+    // Ensure that the enable and disable routes are protected.
+    $this->drupalGet('admin/structure/block/manage/' . $block->id() . '/disable');
+    $this->assertResponse(403);
+    $this->drupalGet('admin/structure/block/manage/' . $block->id() . '/enable');
+    $this->assertResponse(403);
+  }
+
 }
diff --git a/web/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php b/web/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
index 218832d6c..fc2f33c0d 100644
--- a/web/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
+++ b/web/core/modules/block/src/Tests/NonDefaultBlockAdminTest.php
@@ -16,7 +16,7 @@ class NonDefaultBlockAdminTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block');
+  public static $modules = ['block'];
 
   /**
    * {@inheritdoc}
@@ -30,11 +30,11 @@ class NonDefaultBlockAdminTest extends WebTestBase {
   /**
    * Test non-default theme admin.
    */
-  function testNonDefaultBlockAdmin() {
-    $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer themes'));
+  public function testNonDefaultBlockAdmin() {
+    $admin_user = $this->drupalCreateUser(['administer blocks', 'administer themes']);
     $this->drupalLogin($admin_user);
     $new_theme = 'bartik';
-    \Drupal::service('theme_handler')->install(array($new_theme));
+    \Drupal::service('theme_handler')->install([$new_theme]);
     $this->drupalGet('admin/structure/block/list/' . $new_theme);
     $this->assertText('Bartik(' . t('active tab') . ')', 'Tab for non-default theme found.');
   }
diff --git a/web/core/modules/block/src/Tests/Update/BlockRemoveDisabledRegionUpdateTest.php b/web/core/modules/block/src/Tests/Update/BlockRemoveDisabledRegionUpdateTest.php
new file mode 100644
index 000000000..60ba24c71
--- /dev/null
+++ b/web/core/modules/block/src/Tests/Update/BlockRemoveDisabledRegionUpdateTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\block\Tests\Update;
+
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+
+/**
+ * Tests the upgrade path for removal of disabled region.
+ *
+ * @see https://www.drupal.org/node/2513534
+ *
+ * @group Update
+ */
+class BlockRemoveDisabledRegionUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['block_test', 'language'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.update-test-block-disabled-2513534.php',
+    ];
+  }
+
+  /**
+   * Tests that block context mapping is updated properly.
+   */
+  public function testUpdateHookN() {
+    $this->runUpdates();
+
+    // Disable maintenance mode.
+    \Drupal::state()->set('system.maintenance_mode', FALSE);
+
+    // We finished updating so we can login the user now.
+    $this->drupalLogin($this->rootUser);
+
+    // Verify that a disabled block is in the default region.
+    $this->drupalGet('admin/structure/block');
+    $element = $this->xpath("//tr[contains(@data-drupal-selector, :block) and contains(@class, :status)]//select/option[@selected and @value=:region]",
+      [':block' => 'edit-blocks-pagetitle-1', ':status' => 'block-disabled', ':region' => 'header']);
+    $this->assertTrue(!empty($element));
+
+    // Verify that an enabled block is now disabled and in the default region.
+    $this->drupalGet('admin/structure/block');
+    $element = $this->xpath("//tr[contains(@data-drupal-selector, :block) and contains(@class, :status)]//select/option[@selected and @value=:region]",
+      [':block' => 'edit-blocks-pagetitle-2', ':status' => 'block-disabled', ':region' => 'header']);
+    $this->assertTrue(!empty($element));
+
+  }
+
+}
diff --git a/web/core/modules/block/src/Tests/Views/DisplayBlockTest.php b/web/core/modules/block/src/Tests/Views/DisplayBlockTest.php
index faf68c47f..64f4851aa 100644
--- a/web/core/modules/block/src/Tests/Views/DisplayBlockTest.php
+++ b/web/core/modules/block/src/Tests/Views/DisplayBlockTest.php
@@ -26,19 +26,19 @@ class DisplayBlockTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'block_test_views', 'test_page_test', 'contextual', 'views_ui');
+  public static $modules = ['node', 'block_test_views', 'test_page_test', 'contextual', 'views_ui'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view_block', 'test_view_block2');
+  public static $testViews = ['test_view_block', 'test_view_block2'];
 
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('block_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['block_test_views']);
     $this->enableViewsTestModule();
   }
 
@@ -46,10 +46,10 @@ class DisplayBlockTest extends ViewTestBase {
    * Tests default and custom block categories.
    */
   public function testBlockCategory() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer views', 'administer blocks')));
+    $this->drupalLogin($this->drupalCreateUser(['administer views', 'administer blocks']));
 
     // Create a new view in the UI.
-    $edit = array();
+    $edit = [];
     $edit['label'] = $this->randomString();
     $edit['id'] = strtolower($this->randomMachineName());
     $edit['show[wizard_key]'] = 'standard:views_test_data';
@@ -62,20 +62,20 @@ class DisplayBlockTest extends ViewTestBase {
 
     // Test that the block was given a default category corresponding to its
     // base table.
-    $arguments = array(
-      ':href' => \Drupal::Url('block.admin_add', array(
+    $arguments = [
+      ':href' => \Drupal::Url('block.admin_add', [
         'plugin_id' => 'views_block:' . $edit['id'] . '-block_1',
         'theme' => 'classy',
-      )),
+      ]),
       ':category' => t('Lists (Views)'),
-    );
+    ];
     $this->drupalGet('admin/structure/block');
     $this->clickLinkPartialName('Place block');
     $elements = $this->xpath($pattern, $arguments);
     $this->assertTrue(!empty($elements), 'The test block appears in the category for its base table.');
 
     // Duplicate the block before changing the category.
-    $this->drupalPostForm('admin/structure/views/view/' . $edit['id'] . '/edit/block_1', array(), t('Duplicate @display_title', array('@display_title' => 'Block')));
+    $this->drupalPostForm('admin/structure/views/view/' . $edit['id'] . '/edit/block_1', [], t('Duplicate @display_title', ['@display_title' => 'Block']));
     $this->assertUrl('admin/structure/views/view/' . $edit['id'] . '/edit/block_2');
 
     // Change the block category to a random string.
@@ -84,13 +84,13 @@ class DisplayBlockTest extends ViewTestBase {
     $this->assertTrue(!empty($link));
     $this->clickLink(t('Lists (Views)'));
     $category = $this->randomString();
-    $this->drupalPostForm(NULL, array('block_category' => $category), t('Apply'));
+    $this->drupalPostForm(NULL, ['block_category' => $category], t('Apply'));
 
     // Duplicate the block after changing the category.
-    $this->drupalPostForm(NULL, array(), t('Duplicate @display_title', array('@display_title' => 'Block')));
+    $this->drupalPostForm(NULL, [], t('Duplicate @display_title', ['@display_title' => 'Block']));
     $this->assertUrl('admin/structure/views/view/' . $edit['id'] . '/edit/block_3');
 
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     // Test that the blocks are listed under the correct categories.
     $arguments[':category'] = $category;
@@ -99,23 +99,23 @@ class DisplayBlockTest extends ViewTestBase {
     $elements = $this->xpath($pattern, $arguments);
     $this->assertTrue(!empty($elements), 'The test block appears in the custom category.');
 
-    $arguments = array(
-      ':href' => \Drupal::Url('block.admin_add', array(
+    $arguments = [
+      ':href' => \Drupal::Url('block.admin_add', [
         'plugin_id' => 'views_block:' . $edit['id'] . '-block_2',
         'theme' => 'classy',
-      )),
+      ]),
       ':category' => t('Lists (Views)'),
-    );
+    ];
     $elements = $this->xpath($pattern, $arguments);
     $this->assertTrue(!empty($elements), 'The first duplicated test block remains in the original category.');
 
-    $arguments = array(
-      ':href' => \Drupal::Url('block.admin_add', array(
+    $arguments = [
+      ':href' => \Drupal::Url('block.admin_add', [
         'plugin_id' => 'views_block:' . $edit['id'] . '-block_3',
         'theme' => 'classy',
-      )),
+      ]),
       ':category' => $category,
-    );
+    ];
     $elements = $this->xpath($pattern, $arguments);
     $this->assertTrue(!empty($elements), 'The second duplicated test block appears in the custom category.');
   }
@@ -126,13 +126,13 @@ class DisplayBlockTest extends ViewTestBase {
   public function testDeleteBlockDisplay() {
     // To test all combinations possible we first place create two instances
     // of the block display of the first view.
-    $block_1 = $this->drupalPlaceBlock('views_block:test_view_block-block_1', array('label' => 'test_view_block-block_1:1'));
-    $block_2 = $this->drupalPlaceBlock('views_block:test_view_block-block_1', array('label' => 'test_view_block-block_1:2'));
+    $block_1 = $this->drupalPlaceBlock('views_block:test_view_block-block_1', ['label' => 'test_view_block-block_1:1']);
+    $block_2 = $this->drupalPlaceBlock('views_block:test_view_block-block_1', ['label' => 'test_view_block-block_1:2']);
 
     // Then we add one instance of blocks for each of the two displays of the
     // second view.
-    $block_3 = $this->drupalPlaceBlock('views_block:test_view_block2-block_1', array('label' => 'test_view_block2-block_1'));
-    $block_4 = $this->drupalPlaceBlock('views_block:test_view_block2-block_2', array('label' => 'test_view_block2-block_2'));
+    $block_3 = $this->drupalPlaceBlock('views_block:test_view_block2-block_1', ['label' => 'test_view_block2-block_1']);
+    $block_4 = $this->drupalPlaceBlock('views_block:test_view_block2-block_2', ['label' => 'test_view_block2-block_2']);
 
     $this->drupalGet('test-page');
     $this->assertBlockAppears($block_1);
@@ -177,7 +177,7 @@ class DisplayBlockTest extends ViewTestBase {
    * Test the block form for a Views block.
    */
   public function testViewsBlockForm() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer blocks')));
+    $this->drupalLogin($this->drupalCreateUser(['administer blocks']));
     $default_theme = $this->config('system.theme')->get('default');
     $this->drupalGet('admin/structure/block/add/views_block:test_view_block-block_1/' . $default_theme);
     $elements = $this->xpath('//input[@name="label"]');
@@ -185,8 +185,10 @@ class DisplayBlockTest extends ViewTestBase {
     // Test that that machine name field is hidden from display and has been
     // saved as expected from the default value.
     $this->assertNoFieldById('edit-machine-name', 'views_block__test_view_block_1', 'The machine name is hidden on the views block form.');
+
     // Save the block.
-    $this->drupalPostForm(NULL, array(), t('Save block'));
+    $edit = ['region' => 'content'];
+    $this->drupalPostForm(NULL, $edit, t('Save block'));
     $storage = $this->container->get('entity_type.manager')->getStorage('block');
     $block = $storage->load('views_block__test_view_block_block_1');
     // This will only return a result if our new block has been created with the
@@ -195,7 +197,7 @@ class DisplayBlockTest extends ViewTestBase {
 
     for ($i = 2; $i <= 3; $i++) {
       // Place the same block again and make sure we have a new ID.
-      $this->drupalPostForm('admin/structure/block/add/views_block:test_view_block-block_1/' . $default_theme, array(), t('Save block'));
+      $this->drupalPostForm('admin/structure/block/add/views_block:test_view_block-block_1/' . $default_theme, $edit, t('Save block'));
       $block = $storage->load('views_block__test_view_block_block_1_' . $i);
       // This will only return a result if our new block has been created with the
       // expected machine name.
@@ -204,7 +206,7 @@ class DisplayBlockTest extends ViewTestBase {
 
     // Tests the override capability of items per page.
     $this->drupalGet('admin/structure/block/add/views_block:test_view_block-block_1/' . $default_theme);
-    $edit = array();
+    $edit = ['region' => 'content'];
     $edit['settings[override][items_per_page]'] = 10;
 
     $this->drupalPostForm('admin/structure/block/add/views_block:test_view_block-block_1/' . $default_theme, $edit, t('Save block'));
@@ -222,7 +224,7 @@ class DisplayBlockTest extends ViewTestBase {
     $this->assertEqual(5, $config['items_per_page'], "'Items per page' is properly saved.");
 
     // Tests the override of the label capability.
-    $edit = array();
+    $edit = ['region' => 'content'];
     $edit['settings[views_label_checkbox]'] = 1;
     $edit['settings[views_label]'] = 'Custom title';
     $this->drupalPostForm('admin/structure/block/add/views_block:test_view_block-block_1/' . $default_theme, $edit, t('Save block'));
@@ -237,7 +239,7 @@ class DisplayBlockTest extends ViewTestBase {
    */
   public function testBlockRendering() {
     // Create a block and set a custom title.
-    $block = $this->drupalPlaceBlock('views_block:test_view_block-block_1', array('label' => 'test_view_block-block_1:1', 'views_label' => 'Custom title'));
+    $block = $this->drupalPlaceBlock('views_block:test_view_block-block_1', ['label' => 'test_view_block-block_1:1', 'views_label' => 'Custom title']);
     $this->drupalGet('');
 
     $result = $this->xpath('//div[contains(@class, "region-sidebar-first")]/div[contains(@class, "block-views")]/h2');
@@ -260,7 +262,7 @@ class DisplayBlockTest extends ViewTestBase {
     $result = $this->xpath('//div[contains(@class, "region-sidebar-first")]/div[contains(@class, "block-views")]/h2');
     $this->assertTrue(empty($result), 'The title is not visible.');
 
-    $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:system.site', 'config:views.view.test_view_block' , 'rendered']));
+    $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:system.site', 'config:views.view.test_view_block' , 'http_response', 'rendered']));
   }
 
   /**
@@ -274,7 +276,7 @@ class DisplayBlockTest extends ViewTestBase {
     $view = View::load('test_view_block');
     $view->invalidateCaches();
 
-    $block = $this->drupalPlaceBlock('views_block:test_view_block-block_1', array('label' => 'test_view_block-block_1:1', 'views_label' => 'Custom title'));
+    $block = $this->drupalPlaceBlock('views_block:test_view_block-block_1', ['label' => 'test_view_block-block_1:1', 'views_label' => 'Custom title']);
     $this->drupalGet('');
     $this->assertEqual(1, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]')));
 
@@ -286,7 +288,7 @@ class DisplayBlockTest extends ViewTestBase {
     $this->assertEqual(0, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]')));
     // Ensure that the view cachability metadata is propagated even, for an
     // empty block.
-    $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'rendered']));
+    $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'http_response', 'rendered']));
     $this->assertCacheContexts(['url.query_args:_wrapper_format']);
 
     // Add a header displayed on empty result.
@@ -304,7 +306,7 @@ class DisplayBlockTest extends ViewTestBase {
 
     $this->drupalGet($url);
     $this->assertEqual(1, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]')));
-    $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'rendered']));
+    $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'http_response', 'rendered']));
     $this->assertCacheContexts(['url.query_args:_wrapper_format']);
 
     // Hide the header on empty results.
@@ -322,7 +324,7 @@ class DisplayBlockTest extends ViewTestBase {
 
     $this->drupalGet($url);
     $this->assertEqual(0, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]')));
-    $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'rendered']));
+    $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block', 'http_response', 'rendered']));
     $this->assertCacheContexts(['url.query_args:_wrapper_format']);
 
     // Add an empty text.
@@ -339,7 +341,7 @@ class DisplayBlockTest extends ViewTestBase {
 
     $this->drupalGet($url);
     $this->assertEqual(1, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]')));
-    $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block' , 'rendered']));
+    $this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block', 'http_response', 'rendered']));
     $this->assertCacheContexts(['url.query_args:_wrapper_format']);
   }
 
@@ -347,7 +349,7 @@ class DisplayBlockTest extends ViewTestBase {
    * Tests the contextual links on a Views block.
    */
   public function testBlockContextualLinks() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer views', 'access contextual links', 'administer blocks')));
+    $this->drupalLogin($this->drupalCreateUser(['administer views', 'access contextual links', 'administer blocks']));
     $block = $this->drupalPlaceBlock('views_block:test_view_block-block_1');
     $cached_block = $this->drupalPlaceBlock('views_block:test_view_block-block_1');
     $this->drupalGet('test-page');
@@ -355,13 +357,13 @@ class DisplayBlockTest extends ViewTestBase {
     $id = 'block:block=' . $block->id() . ':langcode=en|entity.view.edit_form:view=test_view_block:location=block&name=test_view_block&display_id=block_1&langcode=en';
     $cached_id = 'block:block=' . $cached_block->id() . ':langcode=en|entity.view.edit_form:view=test_view_block:location=block&name=test_view_block&display_id=block_1&langcode=en';
     // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder()
-    $this->assertRaw('<div' . new Attribute(array('data-contextual-id' => $id)) . '></div>', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
-    $this->assertRaw('<div' . new Attribute(array('data-contextual-id' => $cached_id)) . '></div>', format_string('Contextual link placeholder with id @id exists.', array('@id' => $cached_id)));
+    $this->assertRaw('<div' . new Attribute(['data-contextual-id' => $id]) . '></div>', format_string('Contextual link placeholder with id @id exists.', ['@id' => $id]));
+    $this->assertRaw('<div' . new Attribute(['data-contextual-id' => $cached_id]) . '></div>', format_string('Contextual link placeholder with id @id exists.', ['@id' => $cached_id]));
 
     // Get server-rendered contextual links.
     // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:renderContextualLinks()
-    $post = array('ids[0]' => $id, 'ids[1]' => $cached_id);
-    $response = $this->drupalPostWithFormat('contextual/render', 'json', $post, array('query' => array('destination' => 'test-page')));
+    $post = ['ids[0]' => $id, 'ids[1]' => $cached_id];
+    $response = $this->drupalPostWithFormat('contextual/render', 'json', $post, ['query' => ['destination' => 'test-page']]);
     $this->assertResponse(200);
     $json = Json::decode($response);
     $this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="block-configure"><a href="' . base_path() . 'admin/structure/block/manage/' . $block->id() . '">Configure block</a></li><li class="entityviewedit-form"><a href="' . base_path() . 'admin/structure/views/view/test_view_block/edit/block_1">Edit view</a></li></ul>');
diff --git a/web/core/modules/block/tests/modules/block_test/src/ContextProvider/MultipleStaticContext.php b/web/core/modules/block/tests/modules/block_test/src/ContextProvider/MultipleStaticContext.php
index 58a262d63..9ca813290 100644
--- a/web/core/modules/block/tests/modules/block_test/src/ContextProvider/MultipleStaticContext.php
+++ b/web/core/modules/block/tests/modules/block_test/src/ContextProvider/MultipleStaticContext.php
@@ -47,9 +47,9 @@ class MultipleStaticContext implements ContextProviderInterface {
   public function getRuntimeContexts(array $unqualified_context_ids) {
     $current_user = $this->userStorage->load($this->account->id());
 
-    $context1 = new Context(new ContextDefinition('entity:user', 'User 1'), $current_user);
+    $context1 = new Context(new ContextDefinition('entity:user', 'User A'), $current_user);
 
-    $context2 = new Context(new ContextDefinition('entity:user', 'User 2'), $current_user);
+    $context2 = new Context(new ContextDefinition('entity:user', 'User B'), $current_user);
 
     $cacheability = new CacheableMetadata();
     $cacheability->setCacheContexts(['user']);
@@ -58,8 +58,8 @@ class MultipleStaticContext implements ContextProviderInterface {
     $context2->addCacheableDependency($cacheability);
 
     return [
-      'user1' => $context1,
-      'user2' => $context2,
+      'userA' => $context1,
+      'userB' => $context2,
     ];
   }
 
diff --git a/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php b/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php
index e5ad8daec..0d146390c 100644
--- a/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php
+++ b/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php
@@ -21,9 +21,9 @@ class TestBlockInstantiation extends BlockBase {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'display_message' => 'no message set',
-    );
+    ];
   }
 
   /**
@@ -37,11 +37,11 @@ class TestBlockInstantiation extends BlockBase {
    * {@inheritdoc}
    */
   public function blockForm($form, FormStateInterface $form_state) {
-    $form['display_message'] = array(
+    $form['display_message'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Display message'),
       '#default_value' => $this->configuration['display_message'],
-    );
+    ];
     return $form;
   }
 
@@ -56,9 +56,9 @@ class TestBlockInstantiation extends BlockBase {
    * {@inheritdoc}
    */
   public function build() {
-    return array(
+    return [
       '#children' => $this->configuration['display_message'],
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php b/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php
index b395b9266..5fec14ccc 100644
--- a/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php
+++ b/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php
@@ -20,7 +20,7 @@ class TestCacheBlock extends BlockBase {
   public function build() {
     $content = \Drupal::state()->get('block_test.content');
 
-    $build = array();
+    $build = [];
     if (!empty($content)) {
       $build['#markup'] = $content;
     }
diff --git a/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php b/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php
index bc7f20b25..7db350da8 100644
--- a/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php
+++ b/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php
@@ -25,11 +25,11 @@ class TestContextAwareBlock extends BlockBase {
   public function build() {
     /** @var $user \Drupal\user\UserInterface */
     $user = $this->getContextValue('user');
-    return array(
+    return [
       '#prefix' => '<div id="' . $this->getPluginId() . '--username">',
       '#suffix' => '</div>',
       '#markup' => $user ? $user->getUsername() : 'No context mapping selected.' ,
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlBlock.php b/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlBlock.php
index de90af461..35f08c4b0 100644
--- a/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlBlock.php
+++ b/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlBlock.php
@@ -18,10 +18,10 @@ class TestHtmlBlock extends BlockBase {
    * {@inheritdoc}
    */
   public function build() {
-    return array(
+    return [
       '#attributes' => \Drupal::state()->get('block_test.attributes'),
       '#children' => \Drupal::state()->get('block_test.content'),
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block_with_context.yml b/web/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block_with_context.yml
new file mode 100644
index 000000000..4f8a84115
--- /dev/null
+++ b/web/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block_with_context.yml
@@ -0,0 +1,433 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - user
+id: test_view_block_with_context
+label: test_view_block_with_context
+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: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        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: 5
+          offset: 0
+      style:
+        type: default
+      row:
+        type: fields
+      fields:
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: true
+            text: 'Test view row: {{ title }}'
+            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: 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
+          plugin_id: field
+      filters:
+        status:
+          value: '1'
+          table: node_field_data
+          field: status
+          plugin_id: boolean
+          entity_type: node
+          entity_field: status
+          id: status
+          expose:
+            operator: ''
+          group: 1
+      sorts:
+        created:
+          id: created
+          table: node_field_data
+          field: created
+          order: DESC
+          entity_type: node
+          entity_field: created
+          plugin_id: date
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+      title: test_view_block_with_context
+      header: {  }
+      footer: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'Test view: No results found.'
+          plugin_id: text_custom
+      relationships: {  }
+      arguments:
+        'null':
+          id: 'null'
+          table: views
+          field: 'null'
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: fixed
+          default_argument_options:
+            argument: foo
+          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: {  }
+          must_not_be: false
+          plugin_id: 'null'
+        null_1:
+          id: null_1
+          table: views
+          field: 'null'
+          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: {  }
+          must_not_be: false
+          plugin_id: 'null'
+        nid:
+          id: nid
+          table: node_field_data
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          default_action: empty
+          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: 'entity:node'
+            fail: 'not found'
+          validate_options:
+            operation: view
+            multiple: 0
+            bundles: {  }
+            access: false
+          break_phrase: false
+          not: false
+          entity_type: node
+          entity_field: nid
+          plugin_id: node_nid
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      cacheable: false
+      max-age: -1
+      tags: {  }
+  block_1:
+    display_plugin: block
+    id: block_1
+    display_title: Block
+    position: 1
+    display_options:
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      cacheable: false
+      max-age: -1
+      tags: {  }
+  block_2:
+    display_plugin: block
+    id: block_2
+    display_title: 'Block 2'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      arguments:
+        created:
+          id: created
+          table: node_field_data
+          field: created
+          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: numeric
+            fail: 'not found'
+          validate_options: {  }
+          entity_type: node
+          entity_field: created
+          plugin_id: date
+        vid:
+          id: vid
+          table: node_field_data
+          field: vid
+          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: vid
+          plugin_id: numeric
+        title:
+          id: title
+          table: node_field_data
+          field: title
+          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: {  }
+          glossary: false
+          limit: 0
+          case: none
+          path_case: none
+          transform_dash: false
+          break_phrase: false
+          entity_type: node
+          entity_field: title
+          plugin_id: string
+      defaults:
+        arguments: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - 'user.node_grants:view'
+        - user.permissions
+      tags: {  }
diff --git a/web/core/modules/block/src/Tests/BlockCacheTest.php b/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
similarity index 92%
rename from web/core/modules/block/src/Tests/BlockCacheTest.php
rename to web/core/modules/block/tests/src/Functional/BlockCacheTest.php
index 898858021..e5bb360e3 100644
--- a/web/core/modules/block/src/Tests/BlockCacheTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests block caching.
  *
  * @group block
  */
-class BlockCacheTest extends WebTestBase {
+class BlockCacheTest extends BrowserTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test', 'test_page_test');
+  public static $modules = ['block', 'block_test', 'test_page_test'];
 
   /**
    * A user with permission to create and edit books and to administer blocks.
@@ -51,7 +51,7 @@ class BlockCacheTest extends WebTestBase {
     parent::setUp();
 
     // Create an admin user, log in and enable test blocks.
-    $this->adminUser = $this->drupalCreateUser(array('administer blocks', 'access administration pages'));
+    $this->adminUser = $this->drupalCreateUser(['administer blocks', 'access administration pages']);
     $this->drupalLogin($this->adminUser);
 
     // Create additional users to test caching modes.
@@ -69,7 +69,7 @@ class BlockCacheTest extends WebTestBase {
   /**
    * Test "user.roles" cache context.
    */
-  function testCachePerRole() {
+  public function testCachePerRole() {
     \Drupal::state()->set('block_test.cache_contexts', ['user.roles']);
 
     // Enable our test block. Set some content for it to display.
@@ -87,7 +87,7 @@ class BlockCacheTest extends WebTestBase {
     $this->assertText($old_content, 'Block is served from the cache.');
 
     // Clear the cache and verify that the stale data is no longer there.
-    Cache::invalidateTags(array('block_view'));
+    Cache::invalidateTags(['block_view']);
     $this->drupalGet('');
     $this->assertNoText($old_content, 'Block cache clear removes stale cache data.');
     $this->assertText($current_content, 'Fresh block content is displayed after clearing the cache.');
@@ -116,7 +116,7 @@ class BlockCacheTest extends WebTestBase {
   /**
    * Test a cacheable block without any additional cache context.
    */
-  function testCachePermissions() {
+  public function testCachePermissions() {
     // user.permissions is a required context, so a user with different
     // permissions will see a different version of the block.
     \Drupal::state()->set('block_test.cache_contexts', []);
@@ -142,7 +142,7 @@ class BlockCacheTest extends WebTestBase {
   /**
    * Test non-cacheable block.
    */
-  function testNoCache() {
+  public function testNoCache() {
     \Drupal::state()->set('block_test.cache_max_age', 0);
 
     $current_content = $this->randomMachineName();
@@ -162,7 +162,7 @@ class BlockCacheTest extends WebTestBase {
   /**
    * Test "user" cache context.
    */
-  function testCachePerUser() {
+  public function testCachePerUser() {
     \Drupal::state()->set('block_test.cache_contexts', ['user']);
 
     $current_content = $this->randomMachineName();
@@ -191,7 +191,7 @@ class BlockCacheTest extends WebTestBase {
   /**
    * Test "url" cache context.
    */
-  function testCachePerPage() {
+  public function testCachePerPage() {
     \Drupal::state()->set('block_test.cache_contexts', ['url']);
 
     $current_content = $this->randomMachineName();
diff --git a/web/core/modules/block/src/Tests/BlockHiddenRegionTest.php b/web/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
similarity index 84%
rename from web/core/modules/block/src/Tests/BlockHiddenRegionTest.php
rename to web/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
index b7d44ad09..c51551521 100644
--- a/web/core/modules/block/src/Tests/BlockHiddenRegionTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that a newly installed theme does not inherit blocks to its hidden
@@ -10,7 +10,7 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group block
  */
-class BlockHiddenRegionTest extends WebTestBase {
+class BlockHiddenRegionTest extends BrowserTestBase {
 
   /**
    * An administrative user to configure the test environment.
@@ -22,17 +22,17 @@ class BlockHiddenRegionTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test', 'search');
+  public static $modules = ['block', 'block_test', 'search'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create administrative user.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer blocks',
       'administer themes',
       'search content',
-      )
+      ]
     );
 
     $this->drupalLogin($this->adminUser);
@@ -53,7 +53,7 @@ class BlockHiddenRegionTest extends WebTestBase {
     $theme = 'block_test_theme';
     // We need to install a non-hidden theme so that there is more than one
     // local task.
-    \Drupal::service('theme_handler')->install(array($theme, 'stark'));
+    \Drupal::service('theme_handler')->install([$theme, 'stark']);
     $this->config('system.theme')
       ->set('default', $theme)
       ->save();
diff --git a/web/core/modules/block/src/Tests/BlockHookOperationTest.php b/web/core/modules/block/tests/src/Functional/BlockHookOperationTest.php
similarity index 77%
rename from web/core/modules/block/src/Tests/BlockHookOperationTest.php
rename to web/core/modules/block/tests/src/Functional/BlockHookOperationTest.php
index 91ea84300..3a5c1ffbd 100644
--- a/web/core/modules/block/src/Tests/BlockHookOperationTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockHookOperationTest.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for Block module regarding hook_entity_operations_alter().
  *
  * @group block
  */
-class BlockHookOperationTest extends WebTestBase {
+class BlockHookOperationTest extends BrowserTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('block', 'entity_test');
+  public static $modules = ['block', 'entity_test'];
 
   protected function setUp() {
     parent::setUp();
 
-    $permissions = array(
+    $permissions = [
       'administer blocks',
-    );
+    ];
 
     // Create and log in user.
     $admin_user = $this->drupalCreateUser($permissions);
@@ -38,7 +38,7 @@ class BlockHookOperationTest extends WebTestBase {
     // Add a test block, any block will do.
     // Set the machine name so the test_operation link can be built later.
     $block_id = Unicode::strtolower($this->randomMachineName(16));
-    $this->drupalPlaceBlock('system_powered_by_block', array('id' => $block_id));
+    $this->drupalPlaceBlock('system_powered_by_block', ['id' => $block_id]);
 
     // Get the Block listing.
     $this->drupalGet('admin/structure/block');
diff --git a/web/core/modules/block/src/Tests/BlockHtmlTest.php b/web/core/modules/block/tests/src/Functional/BlockHtmlTest.php
similarity index 70%
rename from web/core/modules/block/src/Tests/BlockHtmlTest.php
rename to web/core/modules/block/tests/src/Functional/BlockHtmlTest.php
index baf5d4b8d..5f9afe916 100644
--- a/web/core/modules/block/src/Tests/BlockHtmlTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockHtmlTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests block HTML ID validity.
  *
  * @group block
  */
-class BlockHtmlTest extends WebTestBase {
+class BlockHtmlTest extends BrowserTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test');
+  public static $modules = ['block', 'block_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -24,9 +24,9 @@ class BlockHtmlTest extends WebTestBase {
     $this->drupalLogin($this->rootUser);
 
     // Enable the test_html block, to test HTML ID and attributes.
-    \Drupal::state()->set('block_test.attributes', array('data-custom-attribute' => 'foo'));
+    \Drupal::state()->set('block_test.attributes', ['data-custom-attribute' => 'foo']);
     \Drupal::state()->set('block_test.content', $this->randomMachineName());
-    $this->drupalPlaceBlock('test_html', array('id' => 'test_html_block'));
+    $this->drupalPlaceBlock('test_html', ['id' => 'test_html_block']);
 
     // Enable a menu block, to test more complicated HTML.
     $this->drupalPlaceBlock('system_menu_block:admin');
@@ -35,7 +35,7 @@ class BlockHtmlTest extends WebTestBase {
   /**
    * Tests for valid HTML for a block.
    */
-  function testHtml() {
+  public function testHtml() {
     $this->drupalGet('');
 
     // Ensure that a block's ID is converted to an HTML valid ID, and that
@@ -43,7 +43,7 @@ class BlockHtmlTest extends WebTestBase {
     $this->assertFieldByXPath('//div[@id="block-test-html-block" and @data-custom-attribute="foo"]', NULL, 'HTML ID and attributes for test block are valid and on the same DOM element.');
 
     // Ensure expected markup for a menu block.
-    $elements = $this->xpath('//nav[contains(@class, :nav-class)]/ul[contains(@class, :ul-class)]/li', array(':nav-class' => 'block-menu', ':ul-class' => 'menu'));
+    $elements = $this->xpath('//nav[contains(@class, :nav-class)]/ul[contains(@class, :ul-class)]/li', [':nav-class' => 'block-menu', ':ul-class' => 'menu']);
     $this->assertTrue(!empty($elements), 'The proper block markup was found.');
   }
 
diff --git a/web/core/modules/block/src/Tests/BlockInvalidRegionTest.php b/web/core/modules/block/tests/src/Functional/BlockInvalidRegionTest.php
similarity index 68%
rename from web/core/modules/block/src/Tests/BlockInvalidRegionTest.php
rename to web/core/modules/block/tests/src/Functional/BlockInvalidRegionTest.php
index 438a0c1c2..fe8cdcb56 100644
--- a/web/core/modules/block/src/Tests/BlockInvalidRegionTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockInvalidRegionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\block\Entity\Block;
 
 /**
@@ -11,52 +11,51 @@ use Drupal\block\Entity\Block;
  *
  * @group block
  */
-class BlockInvalidRegionTest extends WebTestBase {
+class BlockInvalidRegionTest extends BrowserTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test');
+  public static $modules = ['block', 'block_test'];
 
   protected function setUp() {
     parent::setUp();
     // Create an admin user.
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'administer site configuration',
       'access administration pages',
       'administer blocks',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
   }
 
   /**
    * Tests that blocks assigned to invalid regions work correctly.
    */
-  function testBlockInInvalidRegion() {
+  public function testBlockInInvalidRegion() {
     // Enable a test block and place it in an invalid region.
     $block = $this->drupalPlaceBlock('test_html');
-    $block->setRegion('invalid_region');
-    $block->save();
+    \Drupal::configFactory()->getEditable('block.block.' . $block->id())->set('region', 'invalid_region')->save();
+    $block = Block::load($block->id());
 
-    $warning_message = t('The block %info was assigned to the invalid region %region and has been disabled.', array('%info' => $block->id(), '%region' => 'invalid_region'));
+    $warning_message = t('The block %info was assigned to the invalid region %region and has been disabled.', ['%info' => $block->id(), '%region' => 'invalid_region']);
 
     // Clearing the cache should disable the test block placed in the invalid region.
-    $this->drupalPostForm('admin/config/development/performance', array(), 'Clear all caches');
+    $this->drupalPostForm('admin/config/development/performance', [], 'Clear all caches');
     $this->assertRaw($warning_message, 'Enabled block was in the invalid region and has been disabled.');
 
     // Clear the cache to check if the warning message is not triggered.
-    $this->drupalPostForm('admin/config/development/performance', array(), 'Clear all caches');
+    $this->drupalPostForm('admin/config/development/performance', [], 'Clear all caches');
     $this->assertNoRaw($warning_message, 'Disabled block in the invalid region will not trigger the warning.');
 
     // Place disabled test block in the invalid region of the default theme.
+    \Drupal::configFactory()->getEditable('block.block.' . $block->id())->set('region', 'invalid_region')->save();
     $block = Block::load($block->id());
-    $block->setRegion('invalid_region');
-    $block->save();
 
     // Clear the cache to check if the warning message is not triggered.
-    $this->drupalPostForm('admin/config/development/performance', array(), 'Clear all caches');
+    $this->drupalPostForm('admin/config/development/performance', [], 'Clear all caches');
     $this->assertNoRaw($warning_message, 'Disabled block in the invalid region will not trigger the warning.');
   }
 
diff --git a/web/core/modules/block/src/Tests/BlockLanguageTest.php b/web/core/modules/block/tests/src/Functional/BlockLanguageTest.php
similarity index 93%
rename from web/core/modules/block/src/Tests/BlockLanguageTest.php
rename to web/core/modules/block/tests/src/Functional/BlockLanguageTest.php
index a2bf24991..cf1b87720 100644
--- a/web/core/modules/block/src/Tests/BlockLanguageTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockLanguageTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\block\Entity\Block;
 
 /**
@@ -11,7 +11,7 @@ use Drupal\block\Entity\Block;
  *
  * @group block
  */
-class BlockLanguageTest extends WebTestBase {
+class BlockLanguageTest extends BrowserTestBase {
 
   /**
    * An administrative user to configure the test environment.
@@ -23,19 +23,19 @@ class BlockLanguageTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'block', 'content_translation');
+  public static $modules = ['language', 'block', 'content_translation'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create a new user, allow him to manage the blocks and the languages.
-    $this->adminUser = $this->drupalCreateUser(array('administer blocks', 'administer languages'));
+    $this->adminUser = $this->drupalCreateUser(['administer blocks', 'administer languages']);
     $this->drupalLogin($this->adminUser);
 
     // Add predefined language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
     $this->assertText('French', 'Language added successfully.');
   }
@@ -52,17 +52,17 @@ class BlockLanguageTest extends WebTestBase {
     $this->assertNoField('visibility[language][context_mapping][language]', 'Language type field is not visible.');
 
     // Enable a standard block and set the visibility setting for one language.
-    $edit = array(
+    $edit = [
       'visibility[language][langcodes][en]' => TRUE,
       'id' => strtolower($this->randomMachineName(8)),
       'region' => 'sidebar_first',
-    );
+    ];
     $this->drupalPostForm('admin/structure/block/add/system_powered_by_block' . '/' . $default_theme, $edit, t('Save block'));
 
     // Change the default language.
-    $edit = array(
+    $edit = [
       'site_default_language' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration'));
 
     // Check that a page has a block.
@@ -79,16 +79,16 @@ class BlockLanguageTest extends WebTestBase {
    */
   public function testLanguageBlockVisibilityLanguageDelete() {
     // Enable a standard block and set the visibility setting for one language.
-    $edit = array(
-      'visibility' => array(
-        'language' => array(
-          'langcodes' => array(
+    $edit = [
+      'visibility' => [
+        'language' => [
+          'langcodes' => [
             'fr' => 'fr',
-          ),
+          ],
           'context_mapping' => ['language' => '@language.current_language_context:language_interface'],
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     $block = $this->drupalPlaceBlock('system_powered_by_block', $edit);
 
     // Check that we have the language in config after saving the setting.
@@ -96,7 +96,7 @@ class BlockLanguageTest extends WebTestBase {
     $this->assertEqual('fr', $visibility['language']['langcodes']['fr'], 'Language is set in the block configuration.');
 
     // Delete the language.
-    $this->drupalPostForm('admin/config/regional/language/delete/fr', array(), t('Delete'));
+    $this->drupalPostForm('admin/config/regional/language/delete/fr', [], t('Delete'));
 
     // Check that the language is no longer stored in the configuration after
     // it is deleted.
diff --git a/web/core/modules/block/src/Tests/BlockTemplateSuggestionsTest.php b/web/core/modules/block/tests/src/Functional/BlockTemplateSuggestionsTest.php
similarity index 69%
rename from web/core/modules/block/src/Tests/BlockTemplateSuggestionsTest.php
rename to web/core/modules/block/tests/src/Functional/BlockTemplateSuggestionsTest.php
index d5ce8e6e0..fd4fd5138 100644
--- a/web/core/modules/block/src/Tests/BlockTemplateSuggestionsTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockTemplateSuggestionsTest.php
@@ -1,48 +1,48 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
 use Drupal\block\Entity\Block;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the block_theme_suggestions_block() function.
  *
  * @group block
  */
-class BlockTemplateSuggestionsTest extends WebTestBase {
+class BlockTemplateSuggestionsTest extends BrowserTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('block');
+  public static $modules = ['block'];
 
   /**
    * Tests template suggestions from block_theme_suggestions_block().
    */
-  function testBlockThemeHookSuggestions() {
+  public function testBlockThemeHookSuggestions() {
     // Define a block with a derivative to be preprocessed, which includes both
     // an underscore (not transformed) and a hyphen (transformed to underscore),
     // and generates possibilities for each level of derivative.
     // @todo Clarify this comment.
-    $block = Block::create(array(
+    $block = Block::create([
       'plugin' => 'system_menu_block:admin',
       'region' => 'footer',
       'id' => 'machinename',
-    ));
+    ]);
 
-    $variables = array();
+    $variables = [];
     $plugin = $block->getPlugin();
     $variables['elements']['#configuration'] = $plugin->getConfiguration();
     $variables['elements']['#plugin_id'] = $plugin->getPluginId();
     $variables['elements']['#id'] = $block->id();
     $variables['elements']['#base_plugin_id'] = $plugin->getBaseId();
     $variables['elements']['#derivative_plugin_id'] = $plugin->getDerivativeId();
-    $variables['elements']['content'] = array();
+    $variables['elements']['content'] = [];
     $suggestions = block_theme_suggestions_block($variables);
-    $this->assertEqual($suggestions, array('block__system', 'block__system_menu_block', 'block__system_menu_block__admin', 'block__machinename'));
+    $this->assertEqual($suggestions, ['block__system', 'block__system_menu_block', 'block__system_menu_block__admin', 'block__machinename']);
   }
 
 }
diff --git a/web/core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php b/web/core/modules/block/tests/src/Functional/NewDefaultThemeBlocksTest.php
similarity index 72%
rename from web/core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php
rename to web/core/modules/block/tests/src/Functional/NewDefaultThemeBlocksTest.php
index 9442df507..adc7da3f1 100644
--- a/web/core/modules/block/src/Tests/NewDefaultThemeBlocksTest.php
+++ b/web/core/modules/block/tests/src/Functional/NewDefaultThemeBlocksTest.php
@@ -1,55 +1,58 @@
 <?php
 
-namespace Drupal\block\Tests;
+namespace Drupal\Tests\block\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that the new default theme gets blocks.
  *
  * @group block
  */
-class NewDefaultThemeBlocksTest extends WebTestBase {
+class NewDefaultThemeBlocksTest extends BrowserTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('block');
+  public static $modules = ['block'];
 
   /**
    * Check the enabled Bartik blocks are correctly copied over.
    */
-  function testNewDefaultThemeBlocks() {
+  public function testNewDefaultThemeBlocks() {
     $default_theme = $this->config('system.theme')->get('default');
 
     // Add two instances of the user login block.
-    $this->drupalPlaceBlock('user_login_block', array(
+    $this->drupalPlaceBlock('user_login_block', [
       'id' => $default_theme . '_' . strtolower($this->randomMachineName(8)),
-    ));
-    $this->drupalPlaceBlock('user_login_block', array(
+    ]);
+    $this->drupalPlaceBlock('user_login_block', [
       'id' => $default_theme . '_' . strtolower($this->randomMachineName(8)),
-    ));
+    ]);
 
     // Add an instance of a different block.
-    $this->drupalPlaceBlock('system_powered_by_block', array(
+    $this->drupalPlaceBlock('system_powered_by_block', [
       'id' => $default_theme . '_' . strtolower($this->randomMachineName(8)),
-    ));
+    ]);
 
     // Install a different theme.
     $new_theme = 'bartik';
     $this->assertFalse($new_theme == $default_theme, 'The new theme is different from the previous default theme.');
-    \Drupal::service('theme_handler')->install(array($new_theme));
+    \Drupal::service('theme_handler')->install([$new_theme]);
     $this->config('system.theme')
       ->set('default', $new_theme)
       ->save();
 
+    /** @var \Drupal\Core\Entity\EntityStorageInterface $block_storage */
+    $block_storage = $this->container->get('entity_type.manager')->getStorage('block');
+
     // Ensure that the new theme has all the blocks as the previous default.
-    $default_block_names = $this->container->get('entity.query')->get('block')
+    $default_block_names = $block_storage->getQuery()
       ->condition('theme', $default_theme)
       ->execute();
-    $new_blocks = $this->container->get('entity.query')->get('block')
+    $new_blocks = $block_storage->getQuery()
       ->condition('theme', $new_theme)
       ->execute();
     $this->assertTrue(count($default_block_names) == count($new_blocks), 'The new default theme has the same number of blocks as the previous theme.');
@@ -64,7 +67,7 @@ class NewDefaultThemeBlocksTest extends WebTestBase {
     // Install a hidden base theme and ensure blocks are not copied.
     $base_theme = 'test_basetheme';
     \Drupal::service('theme_handler')->install([$base_theme]);
-    $new_blocks = $this->container->get('entity.query')->get('block')
+    $new_blocks = $block_storage->getQuery()
       ->condition('theme', $base_theme)
       ->execute();
     $this->assertTrue(empty($new_blocks), 'Installing a hidden base theme does not copy blocks from the default theme.');
diff --git a/web/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php b/web/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php
index 3f7d778aa..2bf41e0f4 100644
--- a/web/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php
+++ b/web/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\block\Kernel;
 
 use Drupal\block\Entity\Block;
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
@@ -18,7 +18,7 @@ class BlockConfigSchemaTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array(
+  public static $modules = [
     'block',
     'aggregator',
     'book',
@@ -32,7 +32,7 @@ class BlockConfigSchemaTest extends KernelTestBase {
     'taxonomy',
     'user',
     'text',
-  );
+  ];
 
   /**
    * The typed config manager.
@@ -59,7 +59,7 @@ class BlockConfigSchemaTest extends KernelTestBase {
     $this->installEntitySchema('block_content');
     $this->installEntitySchema('taxonomy_term');
     $this->installEntitySchema('node');
-    $this->installSchema('book', array('book'));
+    $this->installSchema('book', ['book']);
   }
 
   /**
@@ -68,20 +68,20 @@ class BlockConfigSchemaTest extends KernelTestBase {
   public function testBlockConfigSchema() {
     foreach ($this->blockManager->getDefinitions() as $block_id => $definition) {
       $id = strtolower($this->randomMachineName());
-      $block = Block::create(array(
+      $block = Block::create([
         'id' => $id,
         'theme' => 'classy',
         'weight' => 00,
         'status' => TRUE,
         'region' => 'content',
         'plugin' => $block_id,
-        'settings' => array(
+        'settings' => [
           'label' => $this->randomMachineName(),
           'provider' => 'system',
           'label_display' => FALSE,
-        ),
-        'visibility' => array(),
-      ));
+        ],
+        'visibility' => [],
+      ]);
       $block->save();
 
       $config = $this->config("block.block.$id");
diff --git a/web/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php b/web/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php
index 9216d493d..48d63a302 100644
--- a/web/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php
+++ b/web/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\block\Kernel;
 
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Form\FormState;
-use Drupal\block\BlockInterface;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
@@ -13,7 +13,7 @@ use Drupal\KernelTests\KernelTestBase;
  */
 class BlockInterfaceTest extends KernelTestBase {
 
-  public static $modules = array('system', 'block', 'block_test', 'user');
+  public static $modules = ['system', 'block', 'block_test', 'user'];
 
   /**
    * Test configuration and subsequent form() and build() method calls.
@@ -31,16 +31,16 @@ class BlockInterfaceTest extends KernelTestBase {
    */
   public function testBlockInterface() {
     $manager = $this->container->get('plugin.manager.block');
-    $configuration = array(
+    $configuration = [
       'label' => 'Custom Display Message',
-    );
-    $expected_configuration = array(
+    ];
+    $expected_configuration = [
       'id' => 'test_block_instantiation',
       'label' => 'Custom Display Message',
       'provider' => 'block_test',
-      'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
+      'label_display' => BlockPluginInterface::BLOCK_LABEL_VISIBLE,
       'display_message' => 'no message set',
-    );
+    ];
     // Initial configuration of the block at construction time.
     /** @var $display_block \Drupal\Core\Block\BlockPluginInterface */
     $display_block = $manager->createInstance('test_block_instantiation', $configuration);
@@ -52,46 +52,46 @@ class BlockInterfaceTest extends KernelTestBase {
     $this->assertIdentical($display_block->getConfiguration(), $expected_configuration, 'The block configuration was updated correctly.');
     $definition = $display_block->getPluginDefinition();
 
-    $expected_form = array(
-      'provider' => array(
+    $expected_form = [
+      'provider' => [
         '#type' => 'value',
         '#value' => 'block_test',
-      ),
-      'admin_label' => array(
+      ],
+      'admin_label' => [
         '#type' => 'item',
         '#title' => t('Block description'),
         '#plain_text' => $definition['admin_label'],
-      ),
-      'label' => array(
+      ],
+      'label' => [
         '#type' => 'textfield',
         '#title' => 'Title',
         '#maxlength' => 255,
         '#default_value' => 'Custom Display Message',
         '#required' => TRUE,
-      ),
-      'label_display' => array(
+      ],
+      'label_display' => [
         '#type' => 'checkbox',
         '#title' => 'Display title',
         '#default_value' => TRUE,
         '#return_value' => 'visible',
-      ),
-      'context_mapping' => array(),
-      'display_message' => array(
+      ],
+      'context_mapping' => [],
+      'display_message' => [
         '#type' => 'textfield',
         '#title' => t('Display message'),
         '#default_value' => 'My custom display message.',
-      ),
-    );
+      ],
+    ];
     $form_state = new FormState();
     // Ensure there are no form elements that do not belong to the plugin.
-    $actual_form = $display_block->buildConfigurationForm(array(), $form_state);
+    $actual_form = $display_block->buildConfigurationForm([], $form_state);
     // Remove the visibility sections, as that just tests condition plugins.
     unset($actual_form['visibility'], $actual_form['visibility_tabs']);
     $this->assertIdentical($this->castSafeStrings($actual_form), $this->castSafeStrings($expected_form), 'Only the expected form elements were present.');
 
-    $expected_build = array(
+    $expected_build = [
       '#children' => 'My custom display message.',
-    );
+    ];
     // Ensure the build array is proper.
     $this->assertIdentical($display_block->build(), $expected_build, 'The plugin returned the appropriate build array.');
 
diff --git a/web/core/modules/block/tests/src/Kernel/BlockRebuildTest.php b/web/core/modules/block/tests/src/Kernel/BlockRebuildTest.php
new file mode 100644
index 000000000..33de12ce8
--- /dev/null
+++ b/web/core/modules/block/tests/src/Kernel/BlockRebuildTest.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Drupal\Tests\block\Kernel;
+
+use Drupal\block\Entity\Block;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\simpletest\BlockCreationTrait;
+
+/**
+ * Tests block_rebuild().
+ *
+ * @group block
+ */
+class BlockRebuildTest extends KernelTestBase {
+
+  use BlockCreationTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['block', 'system'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->container->get('theme_installer')->install(['stable', 'classy']);
+    $this->container->get('config.factory')->getEditable('system.theme')->set('default', 'classy')->save();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function setUpBeforeClass() {
+    parent::setUpBeforeClass();
+
+    // @todo Once block_rebuild() is refactored to auto-loadable code, remove
+    //   this require statement.
+    require_once static::getDrupalRoot() . '/core/modules/block/block.module';
+  }
+
+  /**
+   * @covers ::block_rebuild
+   */
+  public function testRebuildNoBlocks() {
+    block_rebuild();
+    $messages = drupal_get_messages();
+    $this->assertEquals([], $messages);
+  }
+
+  /**
+   * @covers ::block_rebuild
+   */
+  public function testRebuildNoInvalidBlocks() {
+    $this->placeBlock('system_powered_by_block', ['region' => 'content']);
+
+    block_rebuild();
+    $messages = drupal_get_messages();
+    $this->assertEquals([], $messages);
+  }
+
+  /**
+   * @covers ::block_rebuild
+   */
+  public function testRebuildInvalidBlocks() {
+    $this->placeBlock('system_powered_by_block', ['region' => 'content']);
+    $block1 = $this->placeBlock('system_powered_by_block');
+    $block2 = $this->placeBlock('system_powered_by_block');
+    $block2->disable()->save();
+    // Use the config API directly to bypass Block::preSave().
+    \Drupal::configFactory()->getEditable('block.block.' . $block1->id())->set('region', 'INVALID')->save();
+    \Drupal::configFactory()->getEditable('block.block.' . $block2->id())->set('region', 'INVALID')->save();
+
+    // Reload block entities.
+    $block1 = Block::load($block1->id());
+    $block2 = Block::load($block2->id());
+
+    $this->assertSame('INVALID', $block1->getRegion());
+    $this->assertTrue($block1->status());
+    $this->assertSame('INVALID', $block2->getRegion());
+    $this->assertFalse($block2->status());
+
+    block_rebuild();
+
+    // Reload block entities.
+    $block1 = Block::load($block1->id());
+    $block2 = Block::load($block2->id());
+
+    $messages = drupal_get_messages();
+    $expected = ['warning' => [new TranslatableMarkup('The block %info was assigned to the invalid region %region and has been disabled.', ['%info' => $block1->id(), '%region' => 'INVALID'])]];
+    $this->assertEquals($expected, $messages);
+
+    $default_region = system_default_region('classy');
+    $this->assertSame($default_region, $block1->getRegion());
+    $this->assertFalse($block1->status());
+    $this->assertSame($default_region, $block2->getRegion());
+    $this->assertFalse($block2->status());
+  }
+
+}
diff --git a/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php b/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
index 6dfc66c83..2a7c7710c 100644
--- a/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
+++ b/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
@@ -2,12 +2,12 @@
 
 namespace Drupal\Tests\block\Kernel;
 
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Config\Entity\ConfigEntityStorage;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\block_test\Plugin\Block\TestHtmlBlock;
 use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\block\Entity\Block;
-use Drupal\block\BlockInterface;
 
 /**
  * Tests the storage of blocks.
@@ -21,7 +21,7 @@ class BlockStorageUnitTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test', 'system');
+  public static $modules = ['block', 'block_test', 'system'];
 
   /**
    * The block storage.
@@ -34,6 +34,8 @@ class BlockStorageUnitTest extends KernelTestBase {
     parent::setUp();
 
     $this->controller = $this->container->get('entity_type.manager')->getStorage('block');
+
+    $this->container->get('theme_installer')->install(['stark']);
   }
 
   /**
@@ -54,7 +56,7 @@ class BlockStorageUnitTest extends KernelTestBase {
   protected function createTests() {
     // Attempt to create a block without a plugin.
     try {
-      $entity = $this->controller->create(array());
+      $entity = $this->controller->create([]);
       $entity->getPlugin();
       $this->fail('A block without a plugin was created with no exception thrown.');
     }
@@ -63,11 +65,12 @@ class BlockStorageUnitTest extends KernelTestBase {
     }
 
     // Create a block with only required values.
-    $entity = $this->controller->create(array(
+    $entity = $this->controller->create([
       'id' => 'test_block',
       'theme' => 'stark',
+      'region' => 'content',
       'plugin' => 'test_html',
-    ));
+    ]);
     $entity->save();
 
     $this->assertTrue($entity instanceof Block, 'The newly created entity is a Block.');
@@ -78,24 +81,24 @@ class BlockStorageUnitTest extends KernelTestBase {
     unset($actual_properties['uuid']);
 
     // Ensure that default values are filled in.
-    $expected_properties = array(
+    $expected_properties = [
       'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
       'status' => TRUE,
-      'dependencies' => array('module' => array('block_test'), 'theme' => array('stark')),
+      'dependencies' => ['module' => ['block_test'], 'theme' => ['stark']],
       'id' => 'test_block',
       'theme' => 'stark',
-      'region' => '-1',
+      'region' => 'content',
       'weight' => NULL,
       'provider' => NULL,
       'plugin' => 'test_html',
-      'settings' => array(
+      'settings' => [
         'id' => 'test_html',
         'label' => '',
         'provider' => 'block_test',
-        'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
-      ),
-      'visibility' => array(),
-    );
+        'label_display' => BlockPluginInterface::BLOCK_LABEL_VISIBLE,
+      ],
+      'visibility' => [],
+    ];
 
     $this->assertIdentical($actual_properties, $expected_properties);
 
@@ -111,7 +114,7 @@ class BlockStorageUnitTest extends KernelTestBase {
     $this->assertTrue($entity instanceof Block, 'The loaded entity is a Block.');
 
     // Verify several properties of the block.
-    $this->assertEqual($entity->getRegion(), '-1');
+    $this->assertSame('content', $entity->getRegion());
     $this->assertTrue($entity->status());
     $this->assertEqual($entity->getTheme(), 'stark');
     $this->assertTrue($entity->uuid());
@@ -145,7 +148,7 @@ class BlockStorageUnitTest extends KernelTestBase {
     $this->assertTrue(empty($entities), 'There are no blocks initially.');
 
     // Install the block_test.module, so that its default config is installed.
-    $this->installConfig(array('block_test'));
+    $this->installConfig(['block_test']);
 
     $entities = $this->controller->loadMultiple();
     $entity = reset($entities);
diff --git a/web/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php b/web/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
index 64b21096c..71c4f55b8 100644
--- a/web/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
+++ b/web/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
@@ -20,7 +20,7 @@ class BlockViewBuilderTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test', 'system', 'user');
+  public static $modules = ['block', 'block_test', 'system', 'user'];
 
   /**
    * The block being tested.
@@ -56,11 +56,11 @@ class BlockViewBuilderTest extends KernelTestBase {
     \Drupal::state()->set('block_test.content', 'Llamas &gt; unicorns!');
 
     // Create a block with only required values.
-    $this->block = $this->controller->create(array(
+    $this->block = $this->controller->create([
       'id' => 'test_block',
       'theme' => 'stark',
       'plugin' => 'test_cache',
-    ));
+    ]);
     $this->block->save();
 
     $this->container->get('cache.render')->deleteAll();
@@ -74,17 +74,17 @@ class BlockViewBuilderTest extends KernelTestBase {
   public function testBasicRendering() {
     \Drupal::state()->set('block_test.content', '');
 
-    $entity = $this->controller->create(array(
+    $entity = $this->controller->create([
       'id' => 'test_block1',
       'theme' => 'stark',
       'plugin' => 'test_html',
-    ));
+    ]);
     $entity->save();
 
     // Test the rendering of a block.
     $entity = Block::load('test_block1');
     $output = entity_view($entity, 'block');
-    $expected = array();
+    $expected = [];
     $expected[] = '<div id="block-test-block1">';
     $expected[] = '  ';
     $expected[] = '    ';
@@ -98,17 +98,17 @@ class BlockViewBuilderTest extends KernelTestBase {
     Html::resetSeenIds();
 
     // Test the rendering of a block with a given title.
-    $entity = $this->controller->create(array(
+    $entity = $this->controller->create([
       'id' => 'test_block2',
       'theme' => 'stark',
       'plugin' => 'test_html',
-      'settings' => array(
+      'settings' => [
         'label' => 'Powered by Bananas',
-      ),
-    ));
+      ],
+    ]);
     $entity->save();
     $output = entity_view($entity, 'block');
-    $expected = array();
+    $expected = [];
     $expected[] = '<div id="block-test-block2">';
     $expected[] = '  ';
     $expected[] = '      <h2>Powered by Bananas</h2>';
@@ -128,11 +128,11 @@ class BlockViewBuilderTest extends KernelTestBase {
     $this->verifyRenderCacheHandling();
 
     // Create an empty block.
-    $this->block = $this->controller->create(array(
+    $this->block = $this->controller->create([
       'id' => 'test_block',
       'theme' => 'stark',
       'plugin' => 'test_cache',
-    ));
+    ]);
     $this->block->save();
     \Drupal::state()->set('block_test.content', NULL);
 
diff --git a/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
index 33afcaa86..c5dfba21c 100644
--- a/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
+++ b/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -28,6 +28,10 @@ class MigrateBlockTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
+
+    // Install the themes used for this test.
+    $this->container->get('theme_installer')->install(['bartik', 'seven', 'test_theme']);
+
     $this->installConfig(['block_content']);
     $this->installEntitySchema('block_content');
 
@@ -37,9 +41,6 @@ class MigrateBlockTest extends MigrateDrupal6TestBase {
     $config->set('admin', 'seven');
     $config->save();
 
-    // Install one of D8's test themes.
-    \Drupal::service('theme_handler')->install(['test_theme']);
-
     $this->executeMigrations([
       'd6_filter_format',
       'block_content_type',
@@ -70,7 +71,7 @@ class MigrateBlockTest extends MigrateDrupal6TestBase {
    * @param string $label_display
    *   The block label display setting.
    * @param bool $status
-   *   (optional) Whether the block is expected to be enabled.
+   *   Whether the block is expected to be enabled or disabled.
    */
   public function assertEntity($id, $visibility, $region, $theme, $weight, $label, $label_display, $status = TRUE) {
     $block = Block::load($id);
@@ -141,10 +142,9 @@ class MigrateBlockTest extends MigrateDrupal6TestBase {
     $visibility['request_path']['id'] = 'request_path';
     $visibility['request_path']['negate'] = FALSE;
     $visibility['request_path']['pages'] = '/node';
-    // bluemarine does not exist in Drupal 8 and the d6_block migration defines
-    // no mapping for its regions, so this block should have been defaulted
-    // to the 'content' region.
-    $this->assertEntity('block_1', $visibility, 'content', 'bluemarine', -4, 'Another Static Block', 'visible');
+    // We expect this block to be disabled because '' is not a valid region,
+    // and block_rebuild() will disable any block in an invalid region.
+    $this->assertEntity('block_1', $visibility, '', 'bluemarine', -4, 'Another Static Block', 'visible', FALSE);
 
     $visibility = [];
     $this->assertEntity('block_2', $visibility, 'right', 'test_theme', -7, '', '0');
diff --git a/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php b/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
index 1ec55ecdb..6f07dc9c2 100644
--- a/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
+++ b/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
@@ -33,6 +33,10 @@ class MigrateBlockTest extends MigrateDrupal7TestBase {
    */
   protected function setUp() {
     parent::setUp();
+
+    // Install the themes used for this test.
+    $this->container->get('theme_installer')->install(['bartik', 'seven']);
+
     $this->installConfig(static::$modules);
     $this->installEntitySchema('block_content');
 
@@ -42,9 +46,6 @@ class MigrateBlockTest extends MigrateDrupal7TestBase {
     $config->set('admin', 'seven');
     $config->save();
 
-    // Install one of D8's test themes.
-    \Drupal::service('theme_handler')->install(['bartik']);
-
     $this->executeMigrations([
       'd7_filter_format',
       'd7_user_role',
@@ -78,7 +79,7 @@ class MigrateBlockTest extends MigrateDrupal7TestBase {
    * @param string $label_display
    *   The block label display setting.
    * @param bool $status
-   *   (optional) Whether the block is expected to be enabled.
+   *   Whether the block is expected to be enabled or disabled.
    */
   public function assertEntity($id, $plugin_id, array $roles, $pages, $region, $theme, $weight, $label, $label_display, $status = TRUE) {
     $block = Block::load($id);
diff --git a/web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php b/web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php
index 453cdcc82..8df0e93a2 100644
--- a/web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php
+++ b/web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php
@@ -69,20 +69,20 @@ class BlockConfigEntityUnitTest extends UnitTestCase {
    * @covers ::calculateDependencies
    */
   public function testCalculateDependencies() {
-    $values = array('theme' => 'stark');
+    $values = ['theme' => 'stark'];
     // Mock the entity under test so that we can mock getPluginCollections().
     $entity = $this->getMockBuilder('\Drupal\block\Entity\Block')
-      ->setConstructorArgs(array($values, $this->entityTypeId))
-      ->setMethods(array('getPluginCollections'))
+      ->setConstructorArgs([$values, $this->entityTypeId])
+      ->setMethods(['getPluginCollections'])
       ->getMock();
     // Create a configurable plugin that would add a dependency.
     $instance_id = $this->randomMachineName();
-    $instance = new TestConfigurablePlugin(array(), $instance_id, array('provider' => 'test'));
+    $instance = new TestConfigurablePlugin([], $instance_id, ['provider' => 'test']);
 
     // Create a plugin collection to contain the instance.
     $plugin_collection = $this->getMockBuilder('\Drupal\Core\Plugin\DefaultLazyPluginCollection')
       ->disableOriginalConstructor()
-      ->setMethods(array('get'))
+      ->setMethods(['get'])
       ->getMock();
     $plugin_collection->expects($this->atLeastOnce())
       ->method('get')
@@ -93,7 +93,7 @@ class BlockConfigEntityUnitTest extends UnitTestCase {
     // Return the mocked plugin collection.
     $entity->expects($this->once())
       ->method('getPluginCollections')
-      ->will($this->returnValue(array($plugin_collection)));
+      ->will($this->returnValue([$plugin_collection]));
 
     $dependencies = $entity->calculateDependencies()->getDependencies();
     $this->assertContains('test', $dependencies['module']);
diff --git a/web/core/modules/block/tests/src/Unit/BlockFormTest.php b/web/core/modules/block/tests/src/Unit/BlockFormTest.php
index d8efe2b79..b8463490b 100644
--- a/web/core/modules/block/tests/src/Unit/BlockFormTest.php
+++ b/web/core/modules/block/tests/src/Unit/BlockFormTest.php
@@ -88,7 +88,7 @@ class BlockFormTest extends UnitTestCase {
    * @see \Drupal\block\BlockForm::getUniqueMachineName()
    */
   public function testGetUniqueMachineName() {
-    $blocks = array();
+    $blocks = [];
 
     $blocks['test'] = $this->getBlockMockWithMachineName('test');
     $blocks['other_test'] = $this->getBlockMockWithMachineName('other_test');
@@ -102,7 +102,7 @@ class BlockFormTest extends UnitTestCase {
 
     $query->expects($this->exactly(5))
       ->method('execute')
-      ->will($this->returnValue(array('test', 'other_test', 'other_test_1', 'other_test_2')));
+      ->will($this->returnValue(['test', 'other_test', 'other_test_1', 'other_test_2']));
 
     $this->storage->expects($this->exactly(5))
       ->method('getQuery')
diff --git a/web/core/modules/block/tests/src/Unit/BlockRepositoryTest.php b/web/core/modules/block/tests/src/Unit/BlockRepositoryTest.php
index aab11fe9f..5584b0bfd 100644
--- a/web/core/modules/block/tests/src/Unit/BlockRepositoryTest.php
+++ b/web/core/modules/block/tests/src/Unit/BlockRepositoryTest.php
@@ -116,25 +116,25 @@ class BlockRepositoryTest extends UnitTestCase {
   }
 
   public function providerBlocksConfig() {
-    $blocks_config = array(
-      'block1' => array(
+    $blocks_config = [
+      'block1' => [
         AccessResult::allowed(), 'top', 0
-      ),
+      ],
       // Test a block without access.
-      'block2' => array(
+      'block2' => [
         AccessResult::forbidden(), 'bottom', 0
-      ),
+      ],
       // Test some blocks in the same region with specific weight.
-      'block4' => array(
+      'block4' => [
         AccessResult::allowed(), 'bottom', 5
-      ),
-      'block3' => array(
+      ],
+      'block3' => [
         AccessResult::allowed(), 'bottom', 5
-      ),
-      'block5' => array(
+      ],
+      'block5' => [
         AccessResult::allowed(), 'bottom', -5
-      ),
-    );
+      ],
+    ];
 
     $test_cases = [];
     $test_cases[] = [$blocks_config,
diff --git a/web/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php b/web/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php
index c47d65ab4..d91ebbcdb 100644
--- a/web/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php
+++ b/web/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php
@@ -24,7 +24,7 @@ class CategoryAutocompleteTest extends UnitTestCase {
     $block_manager = $this->getMock('Drupal\Core\Block\BlockManagerInterface');
     $block_manager->expects($this->any())
       ->method('getCategories')
-      ->will($this->returnValue(array('Comment', 'Node', 'None & Such', 'User')));
+      ->will($this->returnValue(['Comment', 'Node', 'None & Such', 'User']));
 
     $this->autocompleteController = new CategoryAutocompleteController($block_manager);
   }
@@ -43,9 +43,9 @@ class CategoryAutocompleteTest extends UnitTestCase {
    */
   public function testAutocompleteSuggestions($string, $suggestions) {
     $suggestions = array_map(function ($suggestion) {
-      return array('value' => $suggestion, 'label' => Html::escape($suggestion));
+      return ['value' => $suggestion, 'label' => Html::escape($suggestion)];
     }, $suggestions);
-    $result = $this->autocompleteController->autocomplete(new Request(array('q' => $string)));
+    $result = $this->autocompleteController->autocomplete(new Request(['q' => $string]));
     $this->assertSame($suggestions, json_decode($result->getContent(), TRUE));
   }
 
@@ -55,30 +55,30 @@ class CategoryAutocompleteTest extends UnitTestCase {
    * @return array
    */
   public function providerTestAutocompleteSuggestions() {
-    $test_parameters = array();
-    $test_parameters[] = array(
+    $test_parameters = [];
+    $test_parameters[] = [
       'string' => 'Com',
-      'suggestions' => array(
+      'suggestions' => [
         'Comment',
-      ),
-    );
-    $test_parameters[] = array(
+      ],
+    ];
+    $test_parameters[] = [
       'string' => 'No',
-      'suggestions' => array(
+      'suggestions' => [
         'Node',
         'None & Such',
-      ),
-    );
-    $test_parameters[] = array(
+      ],
+    ];
+    $test_parameters[] = [
       'string' => 'us',
-      'suggestions' => array(
+      'suggestions' => [
         'User',
-      ),
-    );
-    $test_parameters[] = array(
+      ],
+    ];
+    $test_parameters[] = [
       'string' => 'Banana',
-      'suggestions' => array(),
-    );
+      'suggestions' => [],
+    ];
     return $test_parameters;
   }
 
diff --git a/web/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php b/web/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php
index a513c4ef7..6d7dbf2b9 100644
--- a/web/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php
+++ b/web/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php
@@ -13,33 +13,33 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 class BlockLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array('block' => 'core/modules/block');
+    $this->directoryList = ['block' => 'core/modules/block'];
     parent::setUp();
 
-    $config_factory = $this->getConfigFactoryStub(array('system.theme' => array(
+    $config_factory = $this->getConfigFactoryStub(['system.theme' => [
       'default' => 'test_c',
-    )));
+    ]]);
 
-    $themes = array();
-    $themes['test_a'] = (object) array(
+    $themes = [];
+    $themes['test_a'] = (object) [
       'status' => 1,
-      'info' => array(
+      'info' => [
         'name' => 'test_a',
         'hidden' => TRUE,
-      ),
-    );
-    $themes['test_b'] = (object) array(
+      ],
+    ];
+    $themes['test_b'] = (object) [
       'status' => 1,
-      'info' => array(
+      'info' => [
         'name' => 'test_b',
-      ),
-    );
-    $themes['test_c'] = (object) array(
+      ],
+    ];
+    $themes['test_c'] = (object) [
       'status' => 1,
-      'info' => array(
+      'info' => [
         'name' => 'test_c',
-      ),
-    );
+      ],
+    ];
     $theme_handler = $this->getMock('Drupal\Core\Extension\ThemeHandlerInterface');
     $theme_handler->expects($this->any())
       ->method('listInfo')
@@ -63,7 +63,7 @@ class BlockLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Tests the admin edit local task.
    */
   public function testBlockAdminLocalTasks() {
-    $this->assertLocalTasks('entity.block.edit_form', array(array('entity.block.edit_form')));
+    $this->assertLocalTasks('entity.block.edit_form', [['entity.block.edit_form']]);
   }
 
   /**
@@ -79,10 +79,10 @@ class BlockLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function providerTestBlockAdminDisplay() {
-    return array(
-      array('block.admin_display', array(array('block.admin_display'), array('block.admin_display_theme:test_b', 'block.admin_display_theme:test_c'))),
-      array('block.admin_display_theme', array(array('block.admin_display'), array('block.admin_display_theme:test_b', 'block.admin_display_theme:test_c'))),
-    );
+    return [
+      ['block.admin_display', [['block.admin_display'], ['block.admin_display_theme:test_b', 'block.admin_display_theme:test_c']]],
+      ['block.admin_display_theme', [['block.admin_display'], ['block.admin_display_theme:test_b', 'block.admin_display_theme:test_c']]],
+    ];
   }
 
 }
diff --git a/web/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php b/web/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php
index 7701ecac0..156941135 100644
--- a/web/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php
+++ b/web/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php
@@ -44,7 +44,7 @@ class BlockPageVariantTest extends UnitTestCase {
    * @return \Drupal\block\Plugin\DisplayVariant\BlockPageVariant|\PHPUnit_Framework_MockObject_MockObject
    *   A mocked display variant plugin.
    */
-  public function setUpDisplayVariant($configuration = array(), $definition = array()) {
+  public function setUpDisplayVariant($configuration = [], $definition = []) {
 
     $container = new Container();
     $cache_context_manager = $this->getMockBuilder('Drupal\Core\Cache\CacheContextsManager')
@@ -60,37 +60,37 @@ class BlockPageVariantTest extends UnitTestCase {
     $this->blockViewBuilder = $this->getMock('Drupal\Core\Entity\EntityViewBuilderInterface');
 
     return $this->getMockBuilder('Drupal\block\Plugin\DisplayVariant\BlockPageVariant')
-      ->setConstructorArgs(array($configuration, 'test', $definition, $this->blockRepository, $this->blockViewBuilder, ['config:block_list']))
-      ->setMethods(array('getRegionNames'))
+      ->setConstructorArgs([$configuration, 'test', $definition, $this->blockRepository, $this->blockViewBuilder, ['config:block_list']])
+      ->setMethods(['getRegionNames'])
       ->getMock();
   }
 
   public function providerBuild() {
-    $blocks_config = array(
-      'block1' => array(
+    $blocks_config = [
+      'block1' => [
         // region, is main content block, is messages block, is title block
         'top', FALSE, FALSE, FALSE,
-      ),
+      ],
       // Test multiple blocks in the same region.
-      'block2' => array(
+      'block2' => [
         'bottom', FALSE, FALSE, FALSE,
-      ),
-      'block3' => array(
+      ],
+      'block3' => [
         'bottom', FALSE, FALSE, FALSE,
-      ),
+      ],
       // Test a block implementing MainContentBlockPluginInterface.
-      'block4' => array(
+      'block4' => [
         'center', TRUE, FALSE, FALSE,
-      ),
+      ],
       // Test a block implementing MessagesBlockPluginInterface.
-      'block5' => array(
+      'block5' => [
         'center', FALSE, TRUE, FALSE,
-      ),
+      ],
       // Test a block implementing TitleBlockPluginInterface.
-      'block6' => array(
+      'block6' => [
         'center', FALSE, FALSE, TRUE,
-      ),
-    );
+      ],
+    ];
 
     $test_cases = [];
     $test_cases[] = [$blocks_config, 6,
@@ -219,7 +219,7 @@ class BlockPageVariantTest extends UnitTestCase {
     }
     $this->blockViewBuilder->expects($this->exactly($visible_block_count))
       ->method('view')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->blockRepository->expects($this->once())
       ->method('getVisibleBlocksPerRegion')
       ->willReturnCallback(function (&$cacheable_metadata) use ($blocks) {
diff --git a/web/core/modules/block_content/block_content.install b/web/core/modules/block_content/block_content.install
index 4279cdef7..6af2ac4e8 100644
--- a/web/core/modules/block_content/block_content.install
+++ b/web/core/modules/block_content/block_content.install
@@ -61,3 +61,14 @@ function block_content_update_8003() {
   \Drupal::entityDefinitionUpdateManager()
     ->installFieldStorageDefinition('revision_user', 'block_content', 'block_content', $revision_user);
 }
+
+/**
+ * Fix the block_content entity type to specify its revision data table.
+ */
+function block_content_update_8300() {
+  $definition_update_manager = \Drupal::entityDefinitionUpdateManager();
+  $entity_type = $definition_update_manager->getEntityType('block_content');
+  $entity_type->set('revision_data_table', 'block_content_field_revision');
+  $definition_update_manager->updateEntityType($entity_type);
+
+}
diff --git a/web/core/modules/block_content/block_content.libraries.yml b/web/core/modules/block_content/block_content.libraries.yml
index 5a1b5b6a7..b9549d461 100644
--- a/web/core/modules/block_content/block_content.libraries.yml
+++ b/web/core/modules/block_content/block_content.libraries.yml
@@ -1,8 +1,7 @@
+# Deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+# This is just for BC and not used anymore. See https://www.drupal.org/node/2669802
 drupal.block_content:
   version: VERSION
-  js:
-    js/block_content.js: {}
+  js: {}
   dependencies:
-    - core/jquery
-    - core/drupal
-    - core/drupal.form
+    - core/drupal.entity-form
diff --git a/web/core/modules/block_content/block_content.links.contextual.yml b/web/core/modules/block_content/block_content.links.contextual.yml
index 0653e2f0e..547f391ff 100644
--- a/web/core/modules/block_content/block_content.links.contextual.yml
+++ b/web/core/modules/block_content/block_content.links.contextual.yml
@@ -2,9 +2,3 @@ block_content.block_edit:
   title: 'Edit'
   group: block_content
   route_name: 'entity.block_content.canonical'
-
-block_content.block_delete:
-  title: 'Delete'
-  group: block_content
-  route_name: 'entity.block_content.delete_form'
-  weight: 1
diff --git a/web/core/modules/block_content/block_content.module b/web/core/modules/block_content/block_content.module
index e0b572956..1b32a5229 100644
--- a/web/core/modules/block_content/block_content.module
+++ b/web/core/modules/block_content/block_content.module
@@ -15,25 +15,25 @@ use Drupal\field\Entity\FieldStorageConfig;
 function block_content_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.block_content':
-      $field_ui = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#';
+      $field_ui = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#';
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Custom Block module allows you to create and manage custom <em>block types</em> and <em>content-containing blocks</em> from the <a href = ":block-library" >Custom block library<a/> page. Custom block types have fields; see the <a href=":field-help">Field module help</a> for more information. Once created, custom blocks can be placed in regions just like blocks provided by other modules; see the <a href=":blocks">Block module help</a> page for details. For more information, see the <a href=":online-help">online documentation for the Custom Block module</a>.', array(':block-library' => \Drupal::url('entity.block_content.collection'), ':block-content' => \Drupal::url('entity.block_content.collection'), ':field-help' => \Drupal::url('help.page', array('name' => 'field')), ':blocks' => \Drupal::url('help.page', array('name' => 'block')), ':online-help' => 'https://www.drupal.org/documentation/modules/block_content')) . '</p>';
+      $output .= '<p>' . t('The Custom Block module allows you to create and manage custom <em>block types</em> and <em>content-containing blocks</em> from the <a href = ":block-library" >Custom block library<a/> page. Custom block types have fields; see the <a href=":field-help">Field module help</a> for more information. Once created, custom blocks can be placed in regions just like blocks provided by other modules; see the <a href=":blocks">Block module help</a> page for details. For more information, see the <a href=":online-help">online documentation for the Custom Block module</a>.', [':block-library' => \Drupal::url('entity.block_content.collection'), ':block-content' => \Drupal::url('entity.block_content.collection'), ':field-help' => \Drupal::url('help.page', ['name' => 'field']), ':blocks' => \Drupal::url('help.page', ['name' => 'block']), ':online-help' => 'https://www.drupal.org/documentation/modules/block_content']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Creating and managing custom block types') . '</dt>';
-      $output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can create and edit custom block types with fields and display settings, from the <a href=":types">Block types</a> page in the Custom block library. For more information about managing fields and display settings, see the <a href=":field-ui">Field UI module help</a>.', array(':types' => \Drupal::url('entity.block_content_type.collection'), ':field-ui' => $field_ui)) . '</dd>';
+      $output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can create and edit custom block types with fields and display settings, from the <a href=":types">Block types</a> page in the Custom block library. For more information about managing fields and display settings, see the <a href=":field-ui">Field UI module help</a>.', [':types' => \Drupal::url('entity.block_content_type.collection'), ':field-ui' => $field_ui]) . '</dd>';
       $output .= '<dt>' . t('Creating custom blocks') . '</dt>';
-      $output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can create, edit, and delete custom blocks of each defined custom block type, from the <a href=":block-library">Blocks</a> page in the Custom block library. After creating a block, place it in a region from the <a href=":blocks">Block layout</a> page; see the <a href=":block_help">Block module help</a> for more information about placing blocks.', array(':blocks' => \Drupal::url('block.admin_display'), ':block-library' => \Drupal::url('entity.block_content.collection'), ':block_help' => \Drupal::url('help.page', array('name' => 'block')))) . '</dd>';
+      $output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can create, edit, and delete custom blocks of each defined custom block type, from the <a href=":block-library">Blocks</a> page in the Custom block library. After creating a block, place it in a region from the <a href=":blocks">Block layout</a> page; see the <a href=":block_help">Block module help</a> for more information about placing blocks.', [':blocks' => \Drupal::url('block.admin_display'), ':block-library' => \Drupal::url('entity.block_content.collection'), ':block_help' => \Drupal::url('help.page', ['name' => 'block'])]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
     case 'entity.block_content.collection':
-      $output = '<p>' . t('Blocks in the block library belong to <a href=":types">Custom block types</a>, each with its own fields and display settings. After creating a block, place it in a region from the <a href=":blocks">Block layout</a> page.', array(':types' => \Drupal::url('entity.block_content_type.collection'), ':blocks' => \Drupal::url('block.admin_display'))) . '</p>';
+      $output = '<p>' . t('Blocks in the block library belong to <a href=":types">Custom block types</a>, each with its own fields and display settings. After creating a block, place it in a region from the <a href=":blocks">Block layout</a> page.', [':types' => \Drupal::url('entity.block_content_type.collection'), ':blocks' => \Drupal::url('block.admin_display')]) . '</p>';
       return $output;
 
     case 'entity.block_content_type.collection':
-      $output = '<p>' . t('Each block type has its own fields and display settings. Create blocks of each type on the <a href=":block-library">Blocks</a> page in the custom block library.', array(':block-library' => \Drupal::url('entity.block_content.collection'))) . '</p>';
+      $output = '<p>' . t('Each block type has its own fields and display settings. Create blocks of each type on the <a href=":block-library">Blocks</a> page in the custom block library.', [':block-library' => \Drupal::url('entity.block_content.collection')]) . '</p>';
       return $output;
 
   }
@@ -43,12 +43,12 @@ function block_content_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function block_content_theme($existing, $type, $theme, $path) {
-  return array(
-    'block_content_add_list' => array(
-      'variables' => array('content' => NULL),
+  return [
+    'block_content_add_list' => [
+      'variables' => ['content' => NULL],
       'file' => 'block_content.pages.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -83,23 +83,23 @@ function block_content_add_body_field($block_type_id, $label = 'Body') {
       'field_storage' => FieldStorageConfig::loadByName('block_content', 'body'),
       'bundle' => $block_type_id,
       'label' => $label,
-      'settings' => array('display_summary' => FALSE),
+      'settings' => ['display_summary' => FALSE],
     ]);
     $field->save();
 
     // Assign widget settings for the 'default' form mode.
     entity_get_form_display('block_content', $block_type_id, 'default')
-      ->setComponent('body', array(
+      ->setComponent('body', [
         'type' => 'text_textarea_with_summary',
-      ))
+      ])
       ->save();
 
     // Assign display settings for 'default' view mode.
     entity_get_display('block_content', $block_type_id, 'default')
-      ->setComponent('body', array(
+      ->setComponent('body', [
         'label' => 'hidden',
         'type' => 'text_default',
-      ))
+      ])
       ->save();
   }
 
diff --git a/web/core/modules/block_content/block_content.pages.inc b/web/core/modules/block_content/block_content.pages.inc
index 86296900d..e50e71787 100644
--- a/web/core/modules/block_content/block_content.pages.inc
+++ b/web/core/modules/block_content/block_content.pages.inc
@@ -19,18 +19,18 @@ use Drupal\Core\Url;
  * @see block_content_add_page()
  */
 function template_preprocess_block_content_add_list(&$variables) {
-  $variables['types'] = array();
+  $variables['types'] = [];
   $query = \Drupal::request()->query->all();
   foreach ($variables['content'] as $type) {
-    $variables['types'][$type->id()] = array(
-      'link' => \Drupal::l($type->label(), new Url('block_content.add_form', array('block_content_type' => $type->id()), array('query' => $query))),
-      'description' => array(
+    $variables['types'][$type->id()] = [
+      'link' => \Drupal::l($type->label(), new Url('block_content.add_form', ['block_content_type' => $type->id()], ['query' => $query])),
+      'description' => [
         '#markup' => $type->getDescription(),
-      ),
+      ],
       'title' => $type->label(),
-      'localized_options' => array(
+      'localized_options' => [
         'query' => $query,
-      ),
-    );
+      ],
+    ];
   }
 }
diff --git a/web/core/modules/block_content/src/BlockContentForm.php b/web/core/modules/block_content/src/BlockContentForm.php
index 8815f5652..eefd4e979 100644
--- a/web/core/modules/block_content/src/BlockContentForm.php
+++ b/web/core/modules/block_content/src/BlockContentForm.php
@@ -4,38 +4,13 @@ namespace Drupal\block_content;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\ContentEntityForm;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Form handler for the custom block edit forms.
  */
 class BlockContentForm extends ContentEntityForm {
 
-  /**
-   * The custom block storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $blockContentStorage;
-
-  /**
-   * The custom block type storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $blockContentTypeStorage;
-
-  /**
-   * The language manager.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
   /**
    * The block content entity.
    *
@@ -43,122 +18,23 @@ class BlockContentForm extends ContentEntityForm {
    */
   protected $entity;
 
-  /**
-   * Constructs a BlockContentForm object.
-   *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $block_content_storage
-   *   The custom block storage.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $block_content_type_storage
-   *   The custom block type storage.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager.
-   */
-  public function __construct(EntityManagerInterface $entity_manager, EntityStorageInterface $block_content_storage, EntityStorageInterface $block_content_type_storage, LanguageManagerInterface $language_manager) {
-    parent::__construct($entity_manager);
-    $this->blockContentStorage = $block_content_storage;
-    $this->blockContentTypeStorage = $block_content_type_storage;
-    $this->languageManager = $language_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    $entity_manager = $container->get('entity.manager');
-    return new static(
-      $entity_manager,
-      $entity_manager->getStorage('block_content'),
-      $entity_manager->getStorage('block_content_type'),
-      $container->get('language_manager')
-    );
-  }
-
-  /**
-   * Overrides \Drupal\Core\Entity\EntityForm::prepareEntity().
-   *
-   * Prepares the custom block object.
-   *
-   * Fills in a few default values, and then invokes
-   * hook_block_content_prepare() on all modules.
-   */
-  protected function prepareEntity() {
-    $block = $this->entity;
-    // Set up default values, if required.
-    $block_type = $this->blockContentTypeStorage->load($block->bundle());
-    if (!$block->isNew()) {
-      $block->setRevisionLogMessage(NULL);
-    }
-    // Always use the default revision setting.
-    $block->setNewRevision($block_type->shouldCreateNewRevision());
-  }
-
   /**
    * {@inheritdoc}
    */
   public function form(array $form, FormStateInterface $form_state) {
     $block = $this->entity;
-    $account = $this->currentUser();
+
+    $form = parent::form($form, $form_state);
 
     if ($this->operation == 'edit') {
-      $form['#title'] = $this->t('Edit custom block %label', array('%label' => $block->label()));
+      $form['#title'] = $this->t('Edit custom block %label', ['%label' => $block->label()]);
     }
     // Override the default CSS class name, since the user-defined custom block
     // type name in 'TYPE-block-form' potentially clashes with third-party class
     // names.
     $form['#attributes']['class'][0] = 'block-' . Html::getClass($block->bundle()) . '-form';
 
-    $form['advanced'] = array(
-      '#type' => 'vertical_tabs',
-      '#weight' => 99,
-    );
-
-    // Add a log field if the "Create new revision" option is checked, or if the
-    // current user has the ability to check that option.
-    $form['revision_information'] = array(
-      '#type' => 'details',
-      '#title' => $this->t('Revision information'),
-      // Open by default when "Create new revision" is checked.
-      '#open' => $block->isNewRevision(),
-      '#group' => 'advanced',
-      '#attributes' => array(
-        'class' => array('block-content-form-revision-information'),
-      ),
-      '#attached' => array(
-        'library' => array('block_content/drupal.block_content'),
-      ),
-      '#weight' => 20,
-      '#access' => $block->isNewRevision() || $account->hasPermission('administer blocks'),
-    );
-
-    $form['revision_information']['revision'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Create new revision'),
-      '#default_value' => $block->isNewRevision(),
-      '#access' => $account->hasPermission('administer blocks'),
-    );
-
-    // Check the revision log checkbox when the log textarea is filled in.
-    // This must not happen if "Create new revision" is enabled by default,
-    // since the state would auto-disable the checkbox otherwise.
-    if (!$block->isNewRevision()) {
-      $form['revision_information']['revision']['#states'] = array(
-        'checked' => array(
-          'textarea[name="revision_log"]' => array('empty' => FALSE),
-        ),
-      );
-    }
-
-    $form['revision_information']['revision_log'] = array(
-      '#type' => 'textarea',
-      '#title' => $this->t('Revision log message'),
-      '#rows' => 4,
-      '#default_value' => $block->getRevisionLog(),
-      '#description' => $this->t('Briefly describe the changes you have made.'),
-    );
-
-    return parent::form($form, $form_state, $block);
+    return $form;
   }
 
   /**
@@ -167,20 +43,12 @@ class BlockContentForm extends ContentEntityForm {
   public function save(array $form, FormStateInterface $form_state) {
     $block = $this->entity;
 
-    // Save as a new revision if requested to do so.
-    if (!$form_state->isValueEmpty('revision')) {
-      $block->setNewRevision();
-      // If a new revision is created, save the current user as revision author.
-      $block->setRevisionCreationTime(REQUEST_TIME);
-      $block->setRevisionUserId(\Drupal::currentUser()->id());
-    }
-
     $insert = $block->isNew();
     $block->save();
-    $context = array('@type' => $block->bundle(), '%info' => $block->label());
+    $context = ['@type' => $block->bundle(), '%info' => $block->label()];
     $logger = $this->logger('block_content');
-    $block_type = $this->blockContentTypeStorage->load($block->bundle());
-    $t_args = array('@type' => $block_type->label(), '%info' => $block->label());
+    $block_type = $this->getBundleEntity();
+    $t_args = ['@type' => $block_type->label(), '%info' => $block->label()];
 
     if ($insert) {
       $logger->notice('@type: added %info.', $context);
@@ -200,10 +68,10 @@ class BlockContentForm extends ContentEntityForm {
         }
         $form_state->setRedirect(
           'block.admin_add',
-          array(
+          [
             'plugin_id' => 'block_content:' . $block->uuid(),
             'theme' => $theme,
-          )
+          ]
         );
       }
       else {
diff --git a/web/core/modules/block_content/src/BlockContentTranslationHandler.php b/web/core/modules/block_content/src/BlockContentTranslationHandler.php
index 781ba1b6d..612613b37 100644
--- a/web/core/modules/block_content/src/BlockContentTranslationHandler.php
+++ b/web/core/modules/block_content/src/BlockContentTranslationHandler.php
@@ -5,36 +5,18 @@ namespace Drupal\block_content;
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\content_translation\ContentTranslationHandler;
-use Drupal\Core\Form\FormStateInterface;
 
 /**
  * Defines the translation handler for custom blocks.
  */
 class BlockContentTranslationHandler extends ContentTranslationHandler {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function entityFormAlter(array &$form, FormStateInterface $form_state, EntityInterface $entity) {
-    parent::entityFormAlter($form, $form_state, $entity);
-    // Move the translation fieldset to a vertical tab.
-    if (isset($form['translation'])) {
-      $form['translation'] += array(
-        '#group' => 'additional_settings',
-        '#weight' => 100,
-        '#attributes' => array(
-          'class' => array('block-content-translation-options'),
-        ),
-      );
-    }
-  }
-
   /**
    * {@inheritdoc}
    */
   protected function entityFormTitle(EntityInterface $entity) {
     $block_type = BlockContentType::load($entity->bundle());
-    return t('<em>Edit @type</em> @title', array('@type' => $block_type->label(), '@title' => $entity->label()));
+    return t('<em>Edit @type</em> @title', ['@type' => $block_type->label(), '@title' => $entity->label()]);
   }
 
 }
diff --git a/web/core/modules/block_content/src/BlockContentTypeForm.php b/web/core/modules/block_content/src/BlockContentTypeForm.php
index d864e8d56..4e140b193 100644
--- a/web/core/modules/block_content/src/BlockContentTypeForm.php
+++ b/web/core/modules/block_content/src/BlockContentTypeForm.php
@@ -25,65 +25,65 @@ class BlockContentTypeForm extends BundleEntityFormBase {
       $form['#title'] = $this->t('Add custom block type');
     }
     else {
-      $form['#title'] = $this->t('Edit %label custom block type', array('%label' => $block_type->label()));
+      $form['#title'] = $this->t('Edit %label custom block type', ['%label' => $block_type->label()]);
     }
 
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => t('Label'),
       '#maxlength' => 255,
       '#default_value' => $block_type->label(),
       '#description' => t("Provide a label for this block type to help identify it in the administration pages."),
       '#required' => TRUE,
-    );
-    $form['id'] = array(
+    ];
+    $form['id'] = [
       '#type' => 'machine_name',
       '#default_value' => $block_type->id(),
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => '\Drupal\block_content\Entity\BlockContentType::load',
-      ),
+      ],
       '#maxlength' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
-    );
+    ];
 
-    $form['description'] = array(
+    $form['description'] = [
       '#type' => 'textarea',
       '#default_value' => $block_type->getDescription(),
       '#description' => t('Enter a description for this block type.'),
       '#title' => t('Description'),
-    );
+    ];
 
-    $form['revision'] = array(
+    $form['revision'] = [
       '#type' => 'checkbox',
       '#title' => t('Create new revision'),
       '#default_value' => $block_type->shouldCreateNewRevision(),
       '#description' => t('Create a new revision by default for this block type.'),
-    );
+    ];
 
     if ($this->moduleHandler->moduleExists('language')) {
-      $form['language'] = array(
+      $form['language'] = [
         '#type' => 'details',
         '#title' => t('Language settings'),
         '#group' => 'additional_settings',
-      );
+      ];
 
       $language_configuration = ContentLanguageSettings::loadByEntityTypeBundle('block_content', $block_type->id());
-      $form['language']['language_configuration'] = array(
+      $form['language']['language_configuration'] = [
         '#type' => 'language_configuration',
-        '#entity_information' => array(
+        '#entity_information' => [
           'entity_type' => 'block_content',
           'bundle' => $block_type->id(),
-        ),
+        ],
         '#default_value' => $language_configuration,
-      );
+      ];
 
       $form['#submit'][] = 'language_configuration_element_submit';
     }
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => t('Save'),
-    );
+    ];
 
     return $this->protectBundleIdElement($form);
   }
@@ -98,13 +98,13 @@ class BlockContentTypeForm extends BundleEntityFormBase {
     $edit_link = $this->entity->link($this->t('Edit'));
     $logger = $this->logger('block_content');
     if ($status == SAVED_UPDATED) {
-      drupal_set_message(t('Custom block type %label has been updated.', array('%label' => $block_type->label())));
-      $logger->notice('Custom block type %label has been updated.', array('%label' => $block_type->label(), 'link' => $edit_link));
+      drupal_set_message(t('Custom block type %label has been updated.', ['%label' => $block_type->label()]));
+      $logger->notice('Custom block type %label has been updated.', ['%label' => $block_type->label(), 'link' => $edit_link]);
     }
     else {
       block_content_add_body_field($block_type->id());
-      drupal_set_message(t('Custom block type %label has been added.', array('%label' => $block_type->label())));
-      $logger->notice('Custom block type %label has been added.', array('%label' => $block_type->label(), 'link' => $edit_link));
+      drupal_set_message(t('Custom block type %label has been added.', ['%label' => $block_type->label()]));
+      $logger->notice('Custom block type %label has been added.', ['%label' => $block_type->label(), 'link' => $edit_link]);
     }
 
     $form_state->setRedirectUrl($this->entity->urlInfo('collection'));
diff --git a/web/core/modules/block_content/src/BlockContentTypeInterface.php b/web/core/modules/block_content/src/BlockContentTypeInterface.php
index 9229dab8a..da3864e1a 100644
--- a/web/core/modules/block_content/src/BlockContentTypeInterface.php
+++ b/web/core/modules/block_content/src/BlockContentTypeInterface.php
@@ -3,11 +3,12 @@
 namespace Drupal\block_content;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
+use Drupal\Core\Entity\RevisionableEntityBundleInterface;
 
 /**
  * Provides an interface defining a custom block type entity.
  */
-interface BlockContentTypeInterface extends ConfigEntityInterface {
+interface BlockContentTypeInterface extends ConfigEntityInterface, RevisionableEntityBundleInterface {
 
   /**
    * Returns the description of the block type.
@@ -17,12 +18,4 @@ interface BlockContentTypeInterface extends ConfigEntityInterface {
    */
   public function getDescription();
 
-  /**
-   * Returns whether a new revision should be created by default.
-   *
-   * @return bool
-   *   TRUE if a new revision should be created by default.
-   */
-  public function shouldCreateNewRevision();
-
 }
diff --git a/web/core/modules/block_content/src/BlockContentViewBuilder.php b/web/core/modules/block_content/src/BlockContentViewBuilder.php
index 322a087d9..29c668cd6 100644
--- a/web/core/modules/block_content/src/BlockContentViewBuilder.php
+++ b/web/core/modules/block_content/src/BlockContentViewBuilder.php
@@ -15,13 +15,13 @@ class BlockContentViewBuilder extends EntityViewBuilder {
    * {@inheritdoc}
    */
   public function view(EntityInterface $entity, $view_mode = 'full', $langcode = NULL) {
-    return $this->viewMultiple(array($entity), $view_mode, $langcode)[0];
+    return $this->viewMultiple([$entity], $view_mode, $langcode)[0];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function viewMultiple(array $entities = array(), $view_mode = 'full', $langcode = NULL) {
+  public function viewMultiple(array $entities = [], $view_mode = 'full', $langcode = NULL) {
     $build_list = parent::viewMultiple($entities, $view_mode, $langcode);
     // Apply the buildMultiple() #pre_render callback immediately, to make
     // bubbling of attributes and contextual links to the actual block work.
@@ -48,10 +48,10 @@ class BlockContentViewBuilder extends EntityViewBuilder {
     parent::alterBuild($build, $entity, $display, $view_mode);
     // Add contextual links for this custom block.
     if (!$entity->isNew()) {
-      $build['#contextual_links']['block_content'] = array(
-        'route_parameters' => array('block_content' => $entity->id()),
-        'metadata' => array('changed' => $entity->getChangedTime()),
-      );
+      $build['#contextual_links']['block_content'] = [
+        'route_parameters' => ['block_content' => $entity->id()],
+        'metadata' => ['changed' => $entity->getChangedTime()],
+      ];
     }
   }
 
diff --git a/web/core/modules/block_content/src/BlockContentViewsData.php b/web/core/modules/block_content/src/BlockContentViewsData.php
index 1d5d46f5f..010ede0ea 100644
--- a/web/core/modules/block_content/src/BlockContentViewsData.php
+++ b/web/core/modules/block_content/src/BlockContentViewsData.php
@@ -23,13 +23,13 @@ class BlockContentViewsData extends EntityViewsData {
 
     $data['block_content_field_data']['type']['field']['id'] = 'field';
 
-    $data['block_content']['block_content_listing_empty'] = array(
+    $data['block_content']['block_content_listing_empty'] = [
       'title' => $this->t('Empty block library behavior'),
       'help' => $this->t('Provides a link to add a new block.'),
-      'area' => array(
+      'area' => [
         'id' => 'block_content_listing_empty',
-      ),
-    );
+      ],
+    ];
     // Advertise this table as a possible base table.
     $data['block_content_field_revision']['table']['base']['help'] = $this->t('Block Content revision is a history of changes to block content.');
     $data['block_content_field_revision']['table']['base']['defaults']['title'] = 'info';
diff --git a/web/core/modules/block_content/src/Controller/BlockContentController.php b/web/core/modules/block_content/src/Controller/BlockContentController.php
index 1caad7415..7c1f8aac3 100644
--- a/web/core/modules/block_content/src/Controller/BlockContentController.php
+++ b/web/core/modules/block_content/src/Controller/BlockContentController.php
@@ -79,14 +79,14 @@ class BlockContentController extends ControllerBase {
       return $this->addForm($type, $request);
     }
     if (count($types) === 0) {
-      return array(
+      return [
         '#markup' => $this->t('You have not created any block types yet. Go to the <a href=":url">block type creation page</a> to add a new block type.', [
           ':url' => Url::fromRoute('block_content.type_add')->toString(),
         ]),
-      );
+      ];
     }
 
-    return array('#theme' => 'block_content_add_list', '#content' => $types);
+    return ['#theme' => 'block_content_add_list', '#content' => $types];
   }
 
   /**
@@ -101,9 +101,9 @@ class BlockContentController extends ControllerBase {
    *   A form array as expected by drupal_render().
    */
   public function addForm(BlockContentTypeInterface $block_content_type, Request $request) {
-    $block = $this->blockContentStorage->create(array(
+    $block = $this->blockContentStorage->create([
       'type' => $block_content_type->id()
-    ));
+    ]);
     if (($theme = $request->query->get('theme')) && in_array($theme, array_keys($this->themeHandler->listInfo()))) {
       // We have navigated to this page from the block library and will keep track
       // of the theme for redirecting the user to the configuration page for the
@@ -123,7 +123,7 @@ class BlockContentController extends ControllerBase {
    *   The page title.
    */
   public function getAddFormTitle(BlockContentTypeInterface $block_content_type) {
-    return $this->t('Add %type custom block', array('%type' => $block_content_type->label()));
+    return $this->t('Add %type custom block', ['%type' => $block_content_type->label()]);
   }
 
 }
diff --git a/web/core/modules/block_content/src/Entity/BlockContent.php b/web/core/modules/block_content/src/Entity/BlockContent.php
index 13af34293..9d0bf743b 100644
--- a/web/core/modules/block_content/src/Entity/BlockContent.php
+++ b/web/core/modules/block_content/src/Entity/BlockContent.php
@@ -35,6 +35,8 @@ use Drupal\user\UserInterface;
  *   base_table = "block_content",
  *   revision_table = "block_content_revision",
  *   data_table = "block_content_field_data",
+ *   revision_data_table = "block_content_field_revision",
+ *   show_revision_ui = TRUE,
  *   links = {
  *     "canonical" = "/block/{block_content}",
  *     "delete-form" = "/block/{block_content}/delete",
@@ -120,7 +122,7 @@ class BlockContent extends ContentEntityBase implements BlockContentInterface {
    * {@inheritdoc}
    */
   public function getInstances() {
-    return \Drupal::entityTypeManager()->getStorage('block')->loadByProperties(array('plugin' => 'block_content:' . $this->uuid()));
+    return \Drupal::entityTypeManager()->getStorage('block')->loadByProperties(['plugin' => 'block_content:' . $this->uuid()]);
   }
 
   /**
@@ -172,17 +174,24 @@ class BlockContent extends ContentEntityBase implements BlockContentInterface {
       ->setRevisionable(TRUE)
       ->setTranslatable(TRUE)
       ->setRequired(TRUE)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -5,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE)
       ->addConstraint('UniqueField', []);
 
     $fields['revision_log'] = BaseFieldDefinition::create('string_long')
       ->setLabel(t('Revision log message'))
       ->setDescription(t('The log entry explaining the changes in this revision.'))
-      ->setRevisionable(TRUE);
+      ->setRevisionable(TRUE)
+      ->setDisplayOptions('form', [
+        'type' => 'string_textarea',
+        'weight' => 25,
+        'settings' => [
+          'rows' => 4,
+        ],
+      ]);
 
     $fields['changed'] = BaseFieldDefinition::create('changed')
       ->setLabel(t('Changed'))
diff --git a/web/core/modules/block_content/src/Form/BlockContentDeleteForm.php b/web/core/modules/block_content/src/Form/BlockContentDeleteForm.php
index 3fe725daa..035ec4c2f 100644
--- a/web/core/modules/block_content/src/Form/BlockContentDeleteForm.php
+++ b/web/core/modules/block_content/src/Form/BlockContentDeleteForm.php
@@ -16,10 +16,10 @@ class BlockContentDeleteForm extends ContentEntityDeleteForm {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $instances = $this->entity->getInstances();
 
-    $form['message'] = array(
+    $form['message'] = [
       '#markup' => $this->formatPlural(count($instances), 'This will also remove 1 placed block instance.', 'This will also remove @count placed block instances.'),
       '#access' => !empty($instances),
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/block_content/src/Form/BlockContentTypeDeleteForm.php b/web/core/modules/block_content/src/Form/BlockContentTypeDeleteForm.php
index 49ba0380f..aea4ab5e8 100644
--- a/web/core/modules/block_content/src/Form/BlockContentTypeDeleteForm.php
+++ b/web/core/modules/block_content/src/Form/BlockContentTypeDeleteForm.php
@@ -3,49 +3,23 @@
 namespace Drupal\block_content\Form;
 
 use Drupal\Core\Entity\EntityDeleteForm;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a confirmation form for deleting a custom block type entity.
  */
 class BlockContentTypeDeleteForm extends EntityDeleteForm {
 
-  /**
-   * The query factory to create entity queries.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  public $queryFactory;
-
-  /**
-   * Constructs a query factory object.
-   *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query object.
-   */
-  public function __construct(QueryFactory $query_factory) {
-    $this->queryFactory = $query_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.query')
-    );
-  }
-
   /**
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $blocks = $this->queryFactory->get('block_content')->condition('type', $this->entity->id())->execute();
+    $blocks = $this->entityTypeManager->getStorage('block_content')->getQuery()
+      ->condition('type', $this->entity->id())
+      ->execute();
     if (!empty($blocks)) {
-      $caption = '<p>' . $this->formatPlural(count($blocks), '%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.', '%label is used by @count custom blocks on your site. You may not remove %label until you have removed all of the %label custom blocks.', array('%label' => $this->entity->label())) . '</p>';
-      $form['description'] = array('#markup' => $caption);
+      $caption = '<p>' . $this->formatPlural(count($blocks), '%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.', '%label is used by @count custom blocks on your site. You may not remove %label until you have removed all of the %label custom blocks.', ['%label' => $this->entity->label()]) . '</p>';
+      $form['description'] = ['#markup' => $caption];
       return $form;
     }
     else {
diff --git a/web/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php b/web/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
index 2afd0402e..e97e74018 100644
--- a/web/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
+++ b/web/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
@@ -105,11 +105,11 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'status' => TRUE,
       'info' => '',
       'view_mode' => 'full',
-    );
+    ];
   }
 
   /**
@@ -122,14 +122,14 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
     $block = $this->entityManager->loadEntityByUuid('block_content', $uuid);
     $options = $this->entityManager->getViewModeOptionsByBundle('block_content', $block->bundle());
 
-    $form['view_mode'] = array(
+    $form['view_mode'] = [
       '#type' => 'select',
       '#options' => $options,
       '#title' => $this->t('View mode'),
       '#description' => $this->t('Output the block in this view mode.'),
       '#default_value' => $this->configuration['view_mode'],
       '#access' => (count($options) > 1),
-    );
+    ];
     $form['title']['#description'] = $this->t('The title of the block as shown to the user.');
     return $form;
   }
@@ -161,13 +161,13 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
       return $this->entityManager->getViewBuilder($block->getEntityTypeId())->view($block, $this->configuration['view_mode']);
     }
     else {
-      return array(
-        '#markup' => $this->t('Block with uuid %uuid does not exist. <a href=":url">Add custom block</a>.', array(
+      return [
+        '#markup' => $this->t('Block with uuid %uuid does not exist. <a href=":url">Add custom block</a>.', [
           '%uuid' => $this->getDerivativeId(),
           ':url' => $this->urlGenerator->generate('block_content.add_page')
-        )),
+        ]),
         '#access' => $this->account->hasPermission('administer blocks')
-      );
+      ];
     }
   }
 
diff --git a/web/core/modules/block_content/src/Plugin/Derivative/BlockContent.php b/web/core/modules/block_content/src/Plugin/Derivative/BlockContent.php
index ab564451c..25806c5f1 100644
--- a/web/core/modules/block_content/src/Plugin/Derivative/BlockContent.php
+++ b/web/core/modules/block_content/src/Plugin/Derivative/BlockContent.php
@@ -50,9 +50,9 @@ class BlockContent extends DeriverBase implements ContainerDeriverInterface {
     foreach ($block_contents as $block_content) {
       $this->derivatives[$block_content->uuid()] = $base_plugin_definition;
       $this->derivatives[$block_content->uuid()]['admin_label'] = $block_content->label();
-      $this->derivatives[$block_content->uuid()]['config_dependencies']['content'] = array(
+      $this->derivatives[$block_content->uuid()]['config_dependencies']['content'] = [
         $block_content->getConfigDependencyName()
-      );
+      ];
     }
     return parent::getDerivativeDefinitions($base_plugin_definition);
   }
diff --git a/web/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php b/web/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php
index 41352336b..a28927bd5 100644
--- a/web/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php
+++ b/web/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php
@@ -18,7 +18,7 @@ class Box extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('boxes', 'b')
-      ->fields('b', array('bid', 'body', 'info', 'format'));
+      ->fields('b', ['bid', 'body', 'info', 'format']);
     $query->orderBy('b.bid');
 
     return $query;
@@ -28,12 +28,12 @@ class Box extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'bid' => $this->t('The numeric identifier of the block/box'),
       'body' => $this->t('The block/box content'),
       'info' => $this->t('Admin title of the block/box.'),
       'format' => $this->t('Input format of the custom block/box content.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php b/web/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php
index 4aee2a459..ea336829b 100644
--- a/web/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php
+++ b/web/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php
@@ -24,12 +24,12 @@ class BlockCustom extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'bid' => $this->t('The numeric identifier of the block/box'),
       'body' => $this->t('The block/box content'),
       'info' => $this->t('Admin title of the block/box.'),
       'format' => $this->t('Input format of the custom block/box content.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/block_content/src/Plugin/views/area/ListingEmpty.php b/web/core/modules/block_content/src/Plugin/views/area/ListingEmpty.php
index d2bd02615..e412f182e 100644
--- a/web/core/modules/block_content/src/Plugin/views/area/ListingEmpty.php
+++ b/web/core/modules/block_content/src/Plugin/views/area/ListingEmpty.php
@@ -71,19 +71,19 @@ class ListingEmpty extends AreaPluginBase {
   public function render($empty = FALSE) {
     if (!$empty || !empty($this->options['empty'])) {
       /** @var \Drupal\Core\Access\AccessResultInterface|\Drupal\Core\Cache\CacheableDependencyInterface $access_result */
-      $access_result = $this->accessManager->checkNamedRoute('block_content.add_page', array(), $this->currentUser, TRUE);
-      $element = array(
-        '#markup' => $this->t('Add a <a href=":url">custom block</a>.', array(':url' => Url::fromRoute('block_content.add_page')->toString())),
+      $access_result = $this->accessManager->checkNamedRoute('block_content.add_page', [], $this->currentUser, TRUE);
+      $element = [
+        '#markup' => $this->t('Add a <a href=":url">custom block</a>.', [':url' => Url::fromRoute('block_content.add_page')->toString()]),
         '#access' => $access_result->isAllowed(),
         '#cache' => [
           'contexts' => $access_result->getCacheContexts(),
           'tags' => $access_result->getCacheTags(),
           'max-age' => $access_result->getCacheMaxAge(),
         ],
-      );
+      ];
       return $element;
     }
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/block_content/src/Tests/BlockContentCreationTest.php b/web/core/modules/block_content/src/Tests/BlockContentCreationTest.php
index 0cca85ee8..ac9e824d4 100644
--- a/web/core/modules/block_content/src/Tests/BlockContentCreationTest.php
+++ b/web/core/modules/block_content/src/Tests/BlockContentCreationTest.php
@@ -21,17 +21,17 @@ class BlockContentCreationTest extends BlockContentTestBase {
    *
    * @var array
    */
-  public static $modules = array('block_content_test', 'dblog', 'field_ui');
+  public static $modules = ['block_content_test', 'dblog', 'field_ui'];
 
   /**
    * Permissions to grant admin user.
    *
    * @var array
    */
-  protected $permissions = array(
+  protected $permissions = [
     'administer blocks',
     'administer block_content display'
-  );
+  ];
 
   /**
    * Sets the test up.
@@ -48,22 +48,22 @@ class BlockContentCreationTest extends BlockContentTestBase {
     $this->drupalLogin($this->adminUser);
 
     // Create a block.
-    $edit = array();
+    $edit = [];
     $edit['info[0][value]'] = 'Test Block';
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm('block/add/basic', $edit, t('Save'));
 
     // Check that the Basic block has been created.
-    $this->assertRaw(format_string('@block %name has been created.', array(
+    $this->assertRaw(format_string('@block %name has been created.', [
       '@block' => 'basic',
       '%name' => $edit['info[0][value]']
-    )), 'Basic block created.');
+    ]), 'Basic block created.');
 
     // Check that the view mode setting is hidden because only one exists.
     $this->assertNoFieldByXPath('//select[@name="settings[view_mode]"]', NULL, 'View mode setting hidden because only one exists');
 
     // Check that the block exists in the database.
-    $blocks = entity_load_multiple_by_properties('block_content', array('info' => $edit['info[0][value]']));
+    $blocks = entity_load_multiple_by_properties('block_content', ['info' => $edit['info[0][value]']]);
     $block = reset($blocks);
     $this->assertTrue($block, 'Custom Block found in database.');
 
@@ -72,9 +72,9 @@ class BlockContentCreationTest extends BlockContentTestBase {
     $this->drupalPostForm('block/add/basic', $edit, t('Save'));
 
     // Check that the Basic block has been created.
-    $this->assertRaw(format_string('A custom block with block description %value already exists.', array(
+    $this->assertRaw(format_string('A custom block with block description %value already exists.', [
       '%value' => $edit['info[0][value]']
-    )));
+    ]));
     $this->assertResponse(200);
   }
 
@@ -83,40 +83,40 @@ class BlockContentCreationTest extends BlockContentTestBase {
    */
   public function testBlockContentCreationMultipleViewModes() {
     // Add a new view mode and verify if it is selected as expected.
-    $this->drupalLogin($this->drupalCreateUser(array('administer display modes')));
+    $this->drupalLogin($this->drupalCreateUser(['administer display modes']));
     $this->drupalGet('admin/structure/display-modes/view/add/block_content');
-    $edit = array(
+    $edit = [
       'id' => 'test_view_mode',
       'label' => 'Test View Mode',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertRaw(t('Saved the %label view mode.', array('%label' => $edit['label'])));
+    $this->assertRaw(t('Saved the %label view mode.', ['%label' => $edit['label']]));
 
     $this->drupalLogin($this->adminUser);
 
     // Create a block.
-    $edit = array();
+    $edit = [];
     $edit['info[0][value]'] = 'Test Block';
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm('block/add/basic', $edit, t('Save'));
 
     // Check that the Basic block has been created.
-    $this->assertRaw(format_string('@block %name has been created.', array(
+    $this->assertRaw(format_string('@block %name has been created.', [
       '@block' => 'basic',
       '%name' => $edit['info[0][value]']
-    )), 'Basic block created.');
+    ]), 'Basic block created.');
 
     // Save our block permanently
-    $this->drupalPostForm(NULL, NULL, t('Save block'));
+    $this->drupalPostForm(NULL, ['region' => 'content'], t('Save block'));
 
     // Set test_view_mode as a custom display to be available on the list.
     $this->drupalGet('admin/structure/block/block-content');
     $this->drupalGet('admin/structure/block/block-content/types');
     $this->clickLink(t('Manage display'));
     $this->drupalGet('admin/structure/block/block-content/manage/basic/display');
-    $custom_view_mode = array(
+    $custom_view_mode = [
       'display_modes_custom[test_view_mode]' => 1,
-    );
+    ];
     $this->drupalPostForm(NULL, $custom_view_mode, t('Save'));
 
     // Go to the configure page and change the view mode.
@@ -134,6 +134,7 @@ class BlockContentCreationTest extends BlockContentTestBase {
     $this->assertFieldByXPath('//select[@name="settings[view_mode]"]', NULL, 'View mode setting shown because multiple exist');
 
     // Change the view mode.
+    $view_mode['region'] = 'content';
     $view_mode['settings[view_mode]'] = 'test_view_mode';
     $this->drupalPostForm(NULL, $view_mode, t('Save block'));
 
@@ -142,7 +143,7 @@ class BlockContentCreationTest extends BlockContentTestBase {
     $this->assertFieldByXPath('//select[@name="settings[view_mode]"]/option[@selected="selected"]/@value', 'test_view_mode', 'View mode changed to Test View Mode');
 
     // Check that the block exists in the database.
-    $blocks = entity_load_multiple_by_properties('block_content', array('info' => $edit['info[0][value]']));
+    $blocks = entity_load_multiple_by_properties('block_content', ['info' => $edit['info[0][value]']]);
     $block = reset($blocks);
     $this->assertTrue($block, 'Custom Block found in database.');
 
@@ -151,9 +152,9 @@ class BlockContentCreationTest extends BlockContentTestBase {
     $this->drupalPostForm('block/add/basic', $edit, t('Save'));
 
     // Check that the Basic block has been created.
-    $this->assertRaw(format_string('A custom block with block description %value already exists.', array(
+    $this->assertRaw(format_string('A custom block with block description %value already exists.', [
       '%value' => $edit['info[0][value]']
-    )));
+    ]));
     $this->assertResponse(200);
   }
 
@@ -164,20 +165,20 @@ class BlockContentCreationTest extends BlockContentTestBase {
    * type is being used.
    */
   public function testDefaultBlockContentCreation() {
-    $edit = array();
+    $edit = [];
     $edit['info[0][value]'] = $this->randomMachineName(8);
     $edit['body[0][value]'] = $this->randomMachineName(16);
     // Don't pass the custom block type in the url so the default is forced.
     $this->drupalPostForm('block/add', $edit, t('Save'));
 
     // Check that the block has been created and that it is a basic block.
-    $this->assertRaw(format_string('@block %name has been created.', array(
+    $this->assertRaw(format_string('@block %name has been created.', [
       '@block' => 'basic',
       '%name' => $edit['info[0][value]'],
-    )), 'Basic block created.');
+    ]), 'Basic block created.');
 
     // Check that the block exists in the database.
-    $blocks = entity_load_multiple_by_properties('block_content', array('info' => $edit['info[0][value]']));
+    $blocks = entity_load_multiple_by_properties('block_content', ['info' => $edit['info[0][value]']]);
     $block = reset($blocks);
     $this->assertTrue($block, 'Default Custom Block found in database.');
   }
@@ -198,7 +199,7 @@ class BlockContentCreationTest extends BlockContentTestBase {
     if (Database::getConnection()->supportsTransactions()) {
       // Check that the block does not exist in the database.
       $id = db_select('block_content_field_data', 'b')
-        ->fields('b', array('id'))
+        ->fields('b', ['id'])
         ->condition('info', 'fail_creation')
         ->execute()
         ->fetchField();
@@ -207,7 +208,7 @@ class BlockContentCreationTest extends BlockContentTestBase {
     else {
       // Check that the block exists in the database.
       $id = db_select('block_content_field_data', 'b')
-        ->fields('b', array('id'))
+        ->fields('b', ['id'])
         ->condition('info', 'fail_creation')
         ->execute()
         ->fetchField();
@@ -224,18 +225,18 @@ class BlockContentCreationTest extends BlockContentTestBase {
    */
   public function testBlockDelete() {
     // Create a block.
-    $edit = array();
+    $edit = [];
     $edit['info[0][value]'] = $this->randomMachineName(8);
     $body = $this->randomMachineName(16);
     $edit['body[0][value]'] = $body;
     $this->drupalPostForm('block/add/basic', $edit, t('Save'));
 
     // Place the block.
-    $instance = array(
+    $instance = [
       'id' => Unicode::strtolower($edit['info[0][value]']),
       'settings[label]' => $edit['info[0][value]'],
       'region' => 'sidebar_first',
-    );
+    ];
     $block = BlockContent::load(1);
     $url = 'admin/structure/block/add/block_content:' . $block->uuid() . '/' . $this->config('system.theme')->get('default');
     $this->drupalPostForm($url, $instance, t('Save block'));
@@ -253,11 +254,11 @@ class BlockContentCreationTest extends BlockContentTestBase {
     $this->drupalGet('block/1/delete');
     $this->assertText(\Drupal::translation()->formatPlural(1, 'This will also remove 1 placed block instance.', 'This will also remove @count placed block instance.'));
 
-    $this->drupalPostForm(NULL, array(), 'Delete');
-    $this->assertRaw(t('The custom block %name has been deleted.', array('%name' => $edit['info[0][value]'])));
+    $this->drupalPostForm(NULL, [], 'Delete');
+    $this->assertRaw(t('The custom block %name has been deleted.', ['%name' => $edit['info[0][value]']]));
 
     // Create another block and force the plugin cache to flush.
-    $edit2 = array();
+    $edit2 = [];
     $edit2['info[0][value]'] = $this->randomMachineName(8);
     $body2 = $this->randomMachineName(16);
     $edit2['body[0][value]'] = $body2;
@@ -267,7 +268,7 @@ class BlockContentCreationTest extends BlockContentTestBase {
 
     // Create another block with no instances, and test we don't get a
     // confirmation message about deleting instances.
-    $edit3 = array();
+    $edit3 = [];
     $edit3['info[0][value]'] = $this->randomMachineName(8);
     $body = $this->randomMachineName(16);
     $edit3['body[0][value]'] = $body;
@@ -285,16 +286,16 @@ class BlockContentCreationTest extends BlockContentTestBase {
     $block = $this->createBlockContent();
     // Place the block.
     $block_placement_id = Unicode::strtolower($block->label());
-    $instance = array(
+    $instance = [
       'id' => $block_placement_id,
       'settings[label]' => $block->label(),
       'region' => 'sidebar_first',
-    );
+    ];
     $block = BlockContent::load(1);
     $url = 'admin/structure/block/add/block_content:' . $block->uuid() . '/' . $this->config('system.theme')->get('default');
     $this->drupalPostForm($url, $instance, t('Save block'));
 
-    $dependencies = \Drupal::service('config.manager')->findConfigEntityDependentsAsEntities('content', array($block->getConfigDependencyName()));
+    $dependencies = \Drupal::service('config.manager')->findConfigEntityDependentsAsEntities('content', [$block->getConfigDependencyName()]);
     $block_placement = reset($dependencies);
     $this->assertEqual($block_placement_id, $block_placement->id(), "The block placement config entity has a dependency on the block content entity.");
   }
diff --git a/web/core/modules/block_content/src/Tests/BlockContentListTest.php b/web/core/modules/block_content/src/Tests/BlockContentListTest.php
index be8ea5e4c..e00706e9f 100644
--- a/web/core/modules/block_content/src/Tests/BlockContentListTest.php
+++ b/web/core/modules/block_content/src/Tests/BlockContentListTest.php
@@ -18,13 +18,13 @@ class BlockContentListTest extends BlockContentTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_content', 'config_translation');
+  public static $modules = ['block', 'block_content', 'config_translation'];
 
   /**
    * Tests the custom block listing page.
    */
   public function testListing() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer blocks', 'translate configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['administer blocks', 'translate configuration']));
     $this->drupalGet('admin/structure/block/block-content');
 
     // Test for the page title.
@@ -39,7 +39,7 @@ class BlockContentListTest extends BlockContentTestBase {
     $this->assertEqual(count($elements), 2, 'Correct number of table header cells found.');
 
     // Test the contents of each th cell.
-    $expected_items = array(t('Block description'), t('Operations'));
+    $expected_items = [t('Block description'), t('Operations')];
     foreach ($elements as $key => $element) {
       $this->assertEqual($element[0], $expected_items[$key]);
     }
@@ -51,7 +51,7 @@ class BlockContentListTest extends BlockContentTestBase {
     $this->assertLink($link_text);
     $this->clickLink($link_text);
     $this->assertResponse(200);
-    $edit = array();
+    $edit = [];
     $edit['info[0][value]'] = $label;
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm(NULL, $edit, t('Save'));
@@ -72,14 +72,14 @@ class BlockContentListTest extends BlockContentTestBase {
     $blocks = $this->container
       ->get('entity.manager')
       ->getStorage('block_content')
-      ->loadByProperties(array('info' => $label));
+      ->loadByProperties(['info' => $label]);
     $block = reset($blocks);
     if (!empty($block)) {
       $this->assertLinkByHref('block/' . $block->id());
       $this->clickLink(t('Edit'));
       $this->assertResponse(200);
-      $this->assertTitle(strip_tags(t('Edit custom block %label', array('%label' => $label)) . ' | Drupal'));
-      $edit = array('info[0][value]' => $new_label);
+      $this->assertTitle(strip_tags(t('Edit custom block %label', ['%label' => $label]) . ' | Drupal'));
+      $edit = ['info[0][value]' => $new_label];
       $this->drupalPostForm(NULL, $edit, t('Save'));
     }
     else {
@@ -95,8 +95,8 @@ class BlockContentListTest extends BlockContentTestBase {
     $delete_text = t('Delete');
     $this->clickLink($delete_text);
     $this->assertResponse(200);
-    $this->assertTitle(strip_tags(t('Are you sure you want to delete the custom block %label?', array('%label' => $new_label)) . ' | Drupal'));
-    $this->drupalPostForm(NULL, array(), $delete_text);
+    $this->assertTitle(strip_tags(t('Are you sure you want to delete the custom block %label?', ['%label' => $new_label]) . ' | Drupal'));
+    $this->drupalPostForm(NULL, [], $delete_text);
 
     // Verify that the text of the label and machine name does not appear in
     // the list (though it may appear elsewhere on the page).
diff --git a/web/core/modules/block_content/src/Tests/BlockContentListViewsTest.php b/web/core/modules/block_content/src/Tests/BlockContentListViewsTest.php
index de0ff3bde..77117fb00 100644
--- a/web/core/modules/block_content/src/Tests/BlockContentListViewsTest.php
+++ b/web/core/modules/block_content/src/Tests/BlockContentListViewsTest.php
@@ -22,7 +22,7 @@ class BlockContentListViewsTest extends BlockContentTestBase {
    * Tests the custom block listing page.
    */
   public function testListing() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer blocks', 'translate configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['administer blocks', 'translate configuration']));
     $this->drupalGet('admin/structure/block/block-content');
 
     // Test for the page title.
@@ -58,7 +58,7 @@ class BlockContentListViewsTest extends BlockContentTestBase {
     $this->assertLink($link_text);
     $this->clickLink($link_text);
     $this->assertResponse(200);
-    $edit = array();
+    $edit = [];
     $edit['info[0][value]'] = $label;
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm(NULL, $edit, t('Save'));
@@ -79,14 +79,14 @@ class BlockContentListViewsTest extends BlockContentTestBase {
     $blocks = $this->container
       ->get('entity.manager')
       ->getStorage('block_content')
-      ->loadByProperties(array('info' => $label));
+      ->loadByProperties(['info' => $label]);
     $block = reset($blocks);
     if (!empty($block)) {
       $this->assertLinkByHref('block/' . $block->id());
       $this->clickLink(t('Edit'));
       $this->assertResponse(200);
-      $this->assertTitle(strip_tags(t('Edit custom block %label', array('%label' => $label)) . ' | Drupal'));
-      $edit = array('info[0][value]' => $new_label);
+      $this->assertTitle(strip_tags(t('Edit custom block %label', ['%label' => $label]) . ' | Drupal'));
+      $edit = ['info[0][value]' => $new_label];
       $this->drupalPostForm(NULL, $edit, t('Save'));
     }
     else {
@@ -102,8 +102,8 @@ class BlockContentListViewsTest extends BlockContentTestBase {
     $delete_text = t('Delete');
     $this->clickLink($delete_text);
     $this->assertResponse(200);
-    $this->assertTitle(strip_tags(t('Are you sure you want to delete the custom block %label?', array('%label' => $new_label)) . ' | Drupal'));
-    $this->drupalPostForm(NULL, array(), $delete_text);
+    $this->assertTitle(strip_tags(t('Are you sure you want to delete the custom block %label?', ['%label' => $new_label]) . ' | Drupal'));
+    $this->drupalPostForm(NULL, [], $delete_text);
 
     // Verify that the text of the label and machine name does not appear in
     // the list (though it may appear elsewhere on the page).
diff --git a/web/core/modules/block_content/src/Tests/BlockContentTestBase.php b/web/core/modules/block_content/src/Tests/BlockContentTestBase.php
index 16df8558e..3794478d5 100644
--- a/web/core/modules/block_content/src/Tests/BlockContentTestBase.php
+++ b/web/core/modules/block_content/src/Tests/BlockContentTestBase.php
@@ -8,6 +8,9 @@ use Drupal\simpletest\WebTestBase;
 
 /**
  * Sets up block content types.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\block_content\Functional\BlockContentTestBase instead.
  */
 abstract class BlockContentTestBase extends WebTestBase {
 
@@ -28,16 +31,16 @@ abstract class BlockContentTestBase extends WebTestBase {
    *
    * @var array
    */
-  protected $permissions = array(
+  protected $permissions = [
     'administer blocks'
-  );
+  ];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('block', 'block_content');
+  public static $modules = ['block', 'block_content'];
 
   /**
    * Whether or not to auto-create the basic block type during setup.
@@ -75,11 +78,11 @@ abstract class BlockContentTestBase extends WebTestBase {
    */
   protected function createBlockContent($title = FALSE, $bundle = 'basic', $save = TRUE) {
     $title = $title ?: $this->randomMachineName();
-    $block_content = BlockContent::create(array(
+    $block_content = BlockContent::create([
       'info' => $title,
       'type' => $bundle,
       'langcode' => 'en'
-    ));
+    ]);
     if ($block_content && $save === TRUE) {
       $block_content->save();
     }
@@ -98,11 +101,11 @@ abstract class BlockContentTestBase extends WebTestBase {
    *   Created custom block type.
    */
   protected function createBlockContentType($label, $create_body = FALSE) {
-    $bundle = BlockContentType::create(array(
+    $bundle = BlockContentType::create([
       'id' => $label,
       'label' => $label,
       'revision' => FALSE,
-    ));
+    ]);
     $bundle->save();
     if ($create_body) {
       block_content_add_body_field($bundle->id());
diff --git a/web/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php b/web/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
index 332bf3d73..198beee8f 100644
--- a/web/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
+++ b/web/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
@@ -19,13 +19,13 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'language',
     'content_translation',
     'block',
     'field_ui',
     'block_content'
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -57,11 +57,11 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
    */
   protected function setupBundle() {
     // Create the basic bundle since it is provided by standard.
-    $bundle = BlockContentType::create(array(
+    $bundle = BlockContentType::create([
       'id' => $this->bundle,
       'label' => $this->bundle,
       'revision' => FALSE
-    ));
+    ]);
     $bundle->save();
   }
 
@@ -69,12 +69,12 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
    * {@inheritdoc}
    */
   public function getTranslatorPermissions() {
-    return array_merge(parent::getTranslatorPermissions(), array(
+    return array_merge(parent::getTranslatorPermissions(), [
       'translate any entity',
       'access administration pages',
       'administer blocks',
       'administer block_content fields'
-    ));
+    ]);
   }
 
   /**
@@ -93,11 +93,11 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
   protected function createBlockContent($title = FALSE, $bundle = FALSE) {
     $title = $title ?: $this->randomMachineName();
     $bundle = $bundle ?: $this->bundle;
-    $block_content = BlockContent::create(array(
+    $block_content = BlockContent::create([
       'info' => $title,
       'type' => $bundle,
       'langcode' => 'en'
-    ));
+    ]);
     $block_content->save();
     return $block_content;
   }
@@ -106,7 +106,7 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
    * {@inheritdoc}
    */
   protected function getNewEntityValues($langcode) {
-    return array('info' => Unicode::strtolower($this->randomMachineName())) + parent::getNewEntityValues($langcode);
+    return ['info' => Unicode::strtolower($this->randomMachineName())] + parent::getNewEntityValues($langcode);
   }
 
   /**
@@ -135,7 +135,7 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
     $values = $this->getNewEntityValues($default_langcode);
     $storage = \Drupal::entityManager()->getStorage($this->entityTypeId);
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-    $entity = $storage->create(array('type' => 'basic') + $values);
+    $entity = $storage->create(['type' => 'basic'] + $values);
     $entity->save();
     $entity->addTranslation('it', $values);
 
@@ -159,11 +159,11 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
   public function testDisabledBundle() {
     // Create a bundle that does not have translation enabled.
     $disabled_bundle = $this->randomMachineName();
-    $bundle = BlockContentType::create(array(
+    $bundle = BlockContentType::create([
       'id' => $disabled_bundle,
       'label' => $disabled_bundle,
       'revision' => FALSE
-    ));
+    ]);
     $bundle->save();
 
     // Create a block content for each bundle.
@@ -171,7 +171,7 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
     $disabled_block_content = $this->createBlockContent(FALSE, $bundle->id());
 
     // Make sure that only a single row was inserted into the block table.
-    $rows = db_query('SELECT * FROM {block_content_field_data} WHERE id = :id', array(':id' => $enabled_block_content->id()))->fetchAll();
+    $rows = db_query('SELECT * FROM {block_content_field_data} WHERE id = :id', [':id' => $enabled_block_content->id()])->fetchAll();
     $this->assertEqual(1, count($rows));
   }
 
@@ -188,15 +188,15 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
     foreach ($this->langcodes as $langcode) {
       // We only want to test the title for non-english translations.
       if ($langcode != 'en') {
-        $options = array('language' => $languages[$langcode]);
+        $options = ['language' => $languages[$langcode]];
         $url = $entity->urlInfo('edit-form', $options);
         $this->drupalGet($url);
 
-        $title = t('<em>Edit @type</em> @title [%language translation]', array(
+        $title = t('<em>Edit @type</em> @title [%language translation]', [
           '@type' => $entity->bundle(),
           '@title' => $entity->getTranslation($langcode)->label(),
           '%language' => $languages[$langcode]->getName(),
-        ));
+        ]);
         $this->assertRaw($title);
       }
     }
diff --git a/web/core/modules/block_content/src/Tests/BlockContentTypeTest.php b/web/core/modules/block_content/src/Tests/BlockContentTypeTest.php
index e73aa2a48..e69394b88 100644
--- a/web/core/modules/block_content/src/Tests/BlockContentTypeTest.php
+++ b/web/core/modules/block_content/src/Tests/BlockContentTypeTest.php
@@ -17,17 +17,17 @@ class BlockContentTypeTest extends BlockContentTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_ui');
+  public static $modules = ['field_ui'];
 
   /**
    * Permissions to grant admin user.
    *
    * @var array
    */
-  protected $permissions = array(
+  protected $permissions = [
     'administer blocks',
     'administer block_content fields'
-  );
+  ];
 
   /**
    * Whether or not to create an initial block type.
@@ -56,10 +56,10 @@ class BlockContentTypeTest extends BlockContentTestBase {
     $this->clickLink('block type creation page');
 
     // Create a block type via the user interface.
-    $edit = array(
+    $edit = [
       'id' => 'foo',
       'label' => 'title for foo',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $block_type = BlockContentType::load('foo');
     $this->assertTrue($block_type, 'The new block type has been created.');
@@ -107,9 +107,9 @@ class BlockContentTypeTest extends BlockContentTestBase {
     $this->assertRaw('Body', 'Body field was found.');
 
     // Change the block type name.
-    $edit = array(
+    $edit = [
       'label' => 'Bar',
-    );
+    ];
     $this->drupalGet('admin/structure/block/block-content/manage/basic');
     $this->assertTitle(format_string('Edit @type custom block type | Drupal', ['@type' => 'basic']));
     $this->drupalPostForm(NULL, $edit, t('Save'));
@@ -121,9 +121,9 @@ class BlockContentTypeTest extends BlockContentTestBase {
     $this->assertUrl(\Drupal::url('block_content.add_form', ['block_content_type' => 'basic'], ['absolute' => TRUE]), [], 'Original machine name was used in URL.');
 
     // Remove the body field.
-    $this->drupalPostForm('admin/structure/block/block-content/manage/basic/fields/block_content.basic.body/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/block/block-content/manage/basic/fields/block_content.basic.body/delete', [], t('Delete'));
     // Resave the settings for this type.
-    $this->drupalPostForm('admin/structure/block/block-content/manage/basic', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/block/block-content/manage/basic', [], t('Save'));
     // Check that the body field doesn't exist.
     $this->drupalGet('block/add/basic');
     $this->assertNoRaw('Body', 'Body field was not found.');
@@ -146,7 +146,7 @@ class BlockContentTypeTest extends BlockContentTestBase {
     // Attempt to delete the block type, which should not be allowed.
     $this->drupalGet('admin/structure/block/block-content/manage/' . $type->id() . '/delete');
     $this->assertRaw(
-      t('%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.', array('%label' => $type->label())),
+      t('%label is used by 1 custom block on your site. You can not remove this block type until you have removed all of the %label blocks.', ['%label' => $type->label()]),
       'The block type will not be deleted until all blocks of that type are removed.'
     );
     $this->assertNoText(t('This action cannot be undone.'), 'The block type deletion confirmation form is not available.');
@@ -156,7 +156,7 @@ class BlockContentTypeTest extends BlockContentTestBase {
     // Attempt to delete the block type, which should now be allowed.
     $this->drupalGet('admin/structure/block/block-content/manage/' . $type->id() . '/delete');
     $this->assertRaw(
-      t('Are you sure you want to delete the custom block type %type?', array('%type' => $type->id())),
+      t('Are you sure you want to delete the custom block type %type?', ['%type' => $type->id()]),
       'The block type is available for deletion.'
     );
     $this->assertText(t('This action cannot be undone.'), 'The custom block type deletion confirmation form is available.');
@@ -197,22 +197,22 @@ class BlockContentTypeTest extends BlockContentTestBase {
         $this->clickLink(t('Add custom block'));
         // The seven theme has markup inside the link, we cannot use clickLink().
         if ($default_theme == 'seven') {
-          $options = $theme != $default_theme ? array('query' => array('theme' => $theme)) : array();
-          $this->assertLinkByHref(\Drupal::url('block_content.add_form', array('block_content_type' => 'foo'), $options));
+          $options = $theme != $default_theme ? ['query' => ['theme' => $theme]] : [];
+          $this->assertLinkByHref(\Drupal::url('block_content.add_form', ['block_content_type' => 'foo'], $options));
           $this->drupalGet('block/add/foo', $options);
         }
         else {
           $this->clickLink('foo');
         }
         // Create a new block.
-        $edit = array('info[0][value]' => $this->randomMachineName(8));
+        $edit = ['info[0][value]' => $this->randomMachineName(8)];
         $this->drupalPostForm(NULL, $edit, t('Save'));
-        $blocks = $storage->loadByProperties(array('info' => $edit['info[0][value]']));
+        $blocks = $storage->loadByProperties(['info' => $edit['info[0][value]']]);
         if (!empty($blocks)) {
           $block = reset($blocks);
-          $this->assertUrl(\Drupal::url('block.admin_add', array('plugin_id' => 'block_content:' . $block->uuid(), 'theme' => $theme), array('absolute' => TRUE)));
-          $this->drupalPostForm(NULL, array(), t('Save block'));
-          $this->assertUrl(\Drupal::url('block.admin_display_theme', array('theme' => $theme), array('absolute' => TRUE, 'query' => array('block-placement' => Html::getClass($edit['info[0][value]'])))));
+          $this->assertUrl(\Drupal::url('block.admin_add', ['plugin_id' => 'block_content:' . $block->uuid(), 'theme' => $theme], ['absolute' => TRUE]));
+          $this->drupalPostForm(NULL, ['region' => 'content'], t('Save block'));
+          $this->assertUrl(\Drupal::url('block.admin_display_theme', ['theme' => $theme], ['absolute' => TRUE, 'query' => ['block-placement' => Html::getClass($edit['info[0][value]'])]]));
         }
         else {
           $this->fail('Could not load created block.');
@@ -225,11 +225,11 @@ class BlockContentTypeTest extends BlockContentTestBase {
     $this->drupalGet('admin/structure/block/block-content');
     $this->clickLink(t('Add custom block'));
     $this->clickLink('foo');
-    $edit = array('info[0][value]' => $this->randomMachineName(8));
+    $edit = ['info[0][value]' => $this->randomMachineName(8)];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $blocks = $storage->loadByProperties(array('info' => $edit['info[0][value]']));
+    $blocks = $storage->loadByProperties(['info' => $edit['info[0][value]']]);
     if (!empty($blocks)) {
-      $this->assertUrl(\Drupal::url('entity.block_content.collection', array(), array('absolute' => TRUE)));
+      $this->assertUrl(\Drupal::url('entity.block_content.collection', [], ['absolute' => TRUE]));
     }
     else {
       $this->fail('Could not load created block.');
diff --git a/web/core/modules/block_content/src/Tests/BlockContentUpdateEntityFields.php b/web/core/modules/block_content/src/Tests/BlockContentUpdateEntityFields.php
deleted file mode 100644
index ab59eba28..000000000
--- a/web/core/modules/block_content/src/Tests/BlockContentUpdateEntityFields.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\block_content\Tests;
-
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\system\Tests\Update\UpdatePathTestBase;
-
-/**
- * Tests adding revision_user and revision_created fields.
- *
- * @group Update
- */
-class BlockContentUpdateEntityFields extends UpdatePathTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setDatabaseDumpFiles() {
-    $this->databaseDumpFiles = [
-      __DIR__ . '/../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
-    ];
-  }
-
-  /**
-   * Tests that email token in status_blocked of user.mail is updated.
-   */
-  public function testAddingFields() {
-    $this->runUpdates();
-
-    $post_revision_created = \Drupal::entityDefinitionUpdateManager()->getFieldStorageDefinition('revision_created', 'block_content');
-    $post_revision_user = \Drupal::entityDefinitionUpdateManager()->getFieldStorageDefinition('revision_user', 'block_content');
-    $this->assertTrue($post_revision_created instanceof BaseFieldDefinition, "Revision created field found");
-    $this->assertTrue($post_revision_user instanceof BaseFieldDefinition, "Revision user field found");
-
-    $this->assertEqual('created', $post_revision_created->getType(), "Field is type created");
-    $this->assertEqual('entity_reference', $post_revision_user->getType(), "Field is type entity_reference");
-  }
-
-}
diff --git a/web/core/modules/block_content/src/Tests/BlockContentUpdateTest.php b/web/core/modules/block_content/src/Tests/BlockContentUpdateTest.php
new file mode 100644
index 000000000..77c12c653
--- /dev/null
+++ b/web/core/modules/block_content/src/Tests/BlockContentUpdateTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\block_content\Tests;
+
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+
+/**
+ * Tests update functions for the Block Content module.
+ *
+ * @group Update
+ */
+class BlockContentUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+    ];
+  }
+
+  /**
+   * Tests the revision metadata fields and revision data table additions.
+   */
+  public function testSimpleUpdates() {
+    $entity_definition_update_manager = \Drupal::entityDefinitionUpdateManager();
+    $entity_type = $entity_definition_update_manager->getEntityType('block_content');
+    $this->assertNull($entity_type->getRevisionDataTable());
+
+    $this->runUpdates();
+
+    $post_revision_created = $entity_definition_update_manager->getFieldStorageDefinition('revision_created', 'block_content');
+    $post_revision_user = $entity_definition_update_manager->getFieldStorageDefinition('revision_user', 'block_content');
+    $this->assertTrue($post_revision_created instanceof BaseFieldDefinition, "Revision created field found");
+    $this->assertTrue($post_revision_user instanceof BaseFieldDefinition, "Revision user field found");
+
+    $this->assertEqual('created', $post_revision_created->getType(), "Field is type created");
+    $this->assertEqual('entity_reference', $post_revision_user->getType(), "Field is type entity_reference");
+
+    $entity_type = $entity_definition_update_manager->getEntityType('block_content');
+    $this->assertEqual('block_content_field_revision', $entity_type->getRevisionDataTable());
+  }
+
+}
diff --git a/web/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php b/web/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php
index 5a46dddd7..1ff4fb55b 100644
--- a/web/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php
+++ b/web/core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php
@@ -15,14 +15,14 @@ class BlockContentFieldFilterTest extends BlockContentTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_field_filters');
+  public static $testViews = ['test_field_filters'];
 
   /**
    * List of block_content infos by language.
@@ -35,7 +35,7 @@ class BlockContentFieldFilterTest extends BlockContentTestBase {
   /**
    * {@inheritdoc}
    */
-  function setUp() {
+  public function setUp() {
     parent::setUp();
 
     // Add two new languages.
@@ -49,15 +49,15 @@ class BlockContentFieldFilterTest extends BlockContentTestBase {
     $field_storage->save();
 
     // Set up block_content infos.
-    $this->blockContentInfos = array(
+    $this->blockContentInfos = [
       'en' => 'Food in Paris',
       'es' => 'Comida en Paris',
       'fr' => 'Nouriture en Paris',
-    );
+    ];
 
     // Create block_content with translations.
     $block_content = $this->createBlockContent(['info' => $this->blockContentInfos['en'], 'langcode' => 'en', 'type' => 'basic', 'body' => [['value' => $this->blockContentInfos['en']]]]);
-    foreach (array('es', 'fr') as $langcode) {
+    foreach (['es', 'fr'] as $langcode) {
       $translation = $block_content->addTranslation($langcode, ['info' => $this->blockContentInfos[$langcode]]);
       $translation->body->value = $this->blockContentInfos[$langcode];
     }
@@ -70,19 +70,19 @@ class BlockContentFieldFilterTest extends BlockContentTestBase {
   public function testFilters() {
     // Test the info filter page, which filters for info contains 'Comida'.
     // Should show just the Spanish translation, once.
-    $this->assertPageCounts('test-info-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida info filter');
+    $this->assertPageCounts('test-info-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida info filter');
 
     // Test the body filter page, which filters for body contains 'Comida'.
     // Should show just the Spanish translation, once.
-    $this->assertPageCounts('test-body-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida body filter');
+    $this->assertPageCounts('test-body-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida body filter');
 
     // Test the info Paris filter page, which filters for info contains
     // 'Paris'. Should show each translation once.
-    $this->assertPageCounts('test-info-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris info filter');
+    $this->assertPageCounts('test-info-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris info filter');
 
     // Test the body Paris filter page, which filters for body contains
     // 'Paris'. Should show each translation once.
-    $this->assertPageCounts('test-body-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris body filter');
+    $this->assertPageCounts('test-body-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris body filter');
   }
 
   /**
diff --git a/web/core/modules/block_content/src/Tests/Views/BlockContentIntegrationTest.php b/web/core/modules/block_content/src/Tests/Views/BlockContentIntegrationTest.php
index d92c5beb4..8ec17e238 100644
--- a/web/core/modules/block_content/src/Tests/Views/BlockContentIntegrationTest.php
+++ b/web/core/modules/block_content/src/Tests/Views/BlockContentIntegrationTest.php
@@ -14,23 +14,23 @@ class BlockContentIntegrationTest extends BlockContentTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_block_content_view');
+  public static $testViews = ['test_block_content_view'];
 
   /**
    * Tests basic block_content view with a block_content_type argument.
    */
   public function testBlockContentViewTypeArgument() {
     // Create two content types with three block_contents each.
-    $types = array();
-    $all_ids = array();
-    $block_contents = array();
+    $types = [];
+    $all_ids = [];
+    $block_contents = [];
     for ($i = 0; $i < 2; $i++) {
       $type = $this->createBlockContentType();
       $types[] = $type;
 
       for ($j = 0; $j < 5; $j++) {
         // Ensure the right order of the block_contents.
-        $block_content = $this->createBlockContent(array('type' => $type->id()));
+        $block_content = $this->createBlockContent(['type' => $type->id()]);
         $block_contents[$type->id()][$block_content->id()] = $block_content;
         $all_ids[] = $block_content->id();
       }
@@ -55,9 +55,9 @@ class BlockContentIntegrationTest extends BlockContentTestBase {
    * @param array $expected_ids
    *   An array of block_content IDs.
    */
-  protected function assertIds(array $expected_ids = array()) {
+  protected function assertIds(array $expected_ids = []) {
     $result = $this->xpath('//span[@class="field-content"]');
-    $ids = array();
+    $ids = [];
     foreach ($result as $element) {
       $ids[] = (int) $element;
     }
diff --git a/web/core/modules/block_content/src/Tests/Views/BlockContentRedirectTest.php b/web/core/modules/block_content/src/Tests/Views/BlockContentRedirectTest.php
index ff80665b5..828aa8468 100644
--- a/web/core/modules/block_content/src/Tests/Views/BlockContentRedirectTest.php
+++ b/web/core/modules/block_content/src/Tests/Views/BlockContentRedirectTest.php
@@ -21,18 +21,18 @@ class BlockContentRedirectTest extends BlockContentTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_content', 'views');
+  public static $modules = ['block', 'block_content', 'views'];
 
   /**
    * Tests the redirect destination when editing block content.
    */
   public function testRedirectDestination() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer blocks')));
+    $this->drupalLogin($this->drupalCreateUser(['administer blocks']));
     $this->drupalGet('admin/structure/block/block-content');
 
     // Create a custom block.
     $this->clickLink('custom block');
-    $edit = array();
+    $edit = [];
     $edit['info[0][value]'] = 'Test redirect destination';
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm(NULL, $edit, 'Save');
diff --git a/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php b/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
index 65d33c88b..db665c9e4 100644
--- a/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
+++ b/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
@@ -25,26 +25,26 @@ abstract class BlockContentTestBase extends ViewTestBase {
    *
    * @var array
    */
-  protected $permissions = array(
+  protected $permissions = [
     'administer blocks',
-  );
+  ];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('block', 'block_content', 'block_content_test_views');
+  public static $modules = ['block', 'block_content', 'block_content_test_views'];
 
   protected function setUp($import_test_views = TRUE) {
     parent::setUp($import_test_views);
     // Ensure the basic bundle exists. This is provided by the standard profile.
-    $this->createBlockContentType(array('id' => 'basic'));
+    $this->createBlockContentType(['id' => 'basic']);
 
     $this->adminUser = $this->drupalCreateUser($this->permissions);
 
     if ($import_test_views) {
-      ViewTestData::createTestViews(get_class($this), array('block_content_test_views'));
+      ViewTestData::createTestViews(get_class($this), ['block_content_test_views']);
     }
   }
 
@@ -58,17 +58,17 @@ abstract class BlockContentTestBase extends ViewTestBase {
    * @return \Drupal\block_content\Entity\BlockContent
    *   Created custom block.
    */
-  protected function createBlockContent(array $settings = array()) {
+  protected function createBlockContent(array $settings = []) {
     $status = 0;
-    $settings += array(
+    $settings += [
       'info' => $this->randomMachineName(),
       'type' => 'basic',
       'langcode' => 'en',
-    );
+    ];
     if ($block_content = BlockContent::create($settings)) {
       $status = $block_content->save();
     }
-    $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created block content %info.', array('%info' => $block_content->label())));
+    $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created block content %info.', ['%info' => $block_content->label()]));
     return $block_content;
   }
 
@@ -81,7 +81,7 @@ abstract class BlockContentTestBase extends ViewTestBase {
    * @return \Drupal\block_content\Entity\BlockContentType
    *   Created custom block type.
    */
-  protected function createBlockContentType(array $values = array()) {
+  protected function createBlockContentType(array $values = []) {
     // Find a non-existent random type name.
     if (!isset($values['id'])) {
       do {
@@ -91,16 +91,16 @@ abstract class BlockContentTestBase extends ViewTestBase {
     else {
       $id = $values['id'];
     }
-    $values += array(
+    $values += [
       'id' => $id,
       'label' => $id,
       'revision' => FALSE
-    );
+    ];
     $bundle = BlockContentType::create($values);
     $status = $bundle->save();
     block_content_add_body_field($bundle->id());
 
-    $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created block content type %bundle.', array('%bundle' => $bundle->id())));
+    $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created block content type %bundle.', ['%bundle' => $bundle->id()]));
     return $bundle;
   }
 
diff --git a/web/core/modules/block_content/src/Tests/Views/FieldTypeTest.php b/web/core/modules/block_content/src/Tests/Views/FieldTypeTest.php
index f14653fea..e9aa33698 100644
--- a/web/core/modules/block_content/src/Tests/Views/FieldTypeTest.php
+++ b/web/core/modules/block_content/src/Tests/Views/FieldTypeTest.php
@@ -16,18 +16,18 @@ class FieldTypeTest extends BlockContentTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_field_type');
+  public static $testViews = ['test_field_type'];
 
   public function testFieldType() {
     $block_content = $this->createBlockContent();
-    $expected_result[] = array(
+    $expected_result[] = [
       'id' => $block_content->id(),
       'type' => $block_content->bundle(),
-    );
-    $column_map = array(
+    ];
+    $column_map = [
       'id' => 'id',
       'type:target_id' => 'type',
-    );
+    ];
 
     $view = Views::getView('test_field_type');
     $this->executeView($view);
diff --git a/web/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php b/web/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
index 516705d2b..7bad093dd 100644
--- a/web/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
+++ b/web/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
@@ -20,72 +20,72 @@ class RevisionRelationshipsTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('block_content' , 'block_content_test_views');
+  public static $modules = ['block_content' , 'block_content_test_views'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_block_content_revision_id', 'test_block_content_revision_revision_id');
+  public static $testViews = ['test_block_content_revision_id', 'test_block_content_revision_revision_id'];
 
   protected function setUp() {
     parent::setUp();
-    BlockContentType::create(array(
+    BlockContentType::create([
       'id' => 'basic',
       'label' => 'basic',
       'revision' => TRUE,
-    ));
-    ViewTestData::createTestViews(get_class($this), array('block_content_test_views'));
+    ]);
+    ViewTestData::createTestViews(get_class($this), ['block_content_test_views']);
   }
 
   /**
    * Create a block_content with revision and rest result count for both views.
    */
   public function testBlockContentRevisionRelationship() {
-    $block_content = BlockContent::create(array(
+    $block_content = BlockContent::create([
       'info' => $this->randomMachineName(),
       'type' => 'basic',
       'langcode' => 'en',
-    ));
+    ]);
     $block_content->save();
     // Create revision of the block_content.
     $block_content_revision = clone $block_content;
     $block_content_revision->setNewRevision();
     $block_content_revision->save();
-    $column_map = array(
+    $column_map = [
       'revision_id' => 'revision_id',
       'id_1' => 'id_1',
       'block_content_field_data_block_content_field_revision_id' => 'block_content_field_data_block_content_field_revision_id',
-    );
+    ];
 
     // Here should be two rows.
     $view_id = Views::getView('test_block_content_revision_id');
-    $this->executeView($view_id, array($block_content->id()));
-    $resultset_id = array(
-      array(
+    $this->executeView($view_id, [$block_content->id()]);
+    $resultset_id = [
+      [
         'revision_id' => '1',
         'id_1' => '1',
         'block_content_field_data_block_content_field_revision_id' => '1',
-      ),
-      array(
+      ],
+      [
         'revision_id' => '2',
         'id_1' => '1',
         'block_content_field_data_block_content_field_revision_id' => '1',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view_id, $resultset_id, $column_map);
 
     // There should be only one row with active revision 2.
     $view_revision_id = Views::getView('test_block_content_revision_revision_id');
-    $this->executeView($view_revision_id, array($block_content->id()));
-    $resultset_revision_id = array(
-      array(
+    $this->executeView($view_revision_id, [$block_content->id()]);
+    $resultset_revision_id = [
+      [
         'revision_id' => '2',
         'id_1' => '1',
         'block_content_field_data_block_content_field_revision_id' => '1',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view_revision_id, $resultset_revision_id, $column_map);
   }
 
diff --git a/web/core/modules/block_content/tests/modules/block_content_test/block_content_test.module b/web/core/modules/block_content/tests/modules/block_content_test/block_content_test.module
index 57ea2a686..0489a617b 100644
--- a/web/core/modules/block_content/tests/modules/block_content_test/block_content_test.module
+++ b/web/core/modules/block_content/tests/modules/block_content_test/block_content_test.module
@@ -15,9 +15,9 @@ use Drupal\block_content\Entity\BlockContent;
  */
 function block_content_test_block_content_view(array &$build, BlockContent $block_content, $view_mode) {
   // Add extra content.
-  $build['extra_content'] = array(
+  $build['extra_content'] = [
     '#markup' => '<blink>Yowser</blink>',
-  );
+  ];
 }
 
 /**
diff --git a/web/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php
similarity index 93%
rename from web/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
rename to web/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php
index 7eefdc7a2..e00de6b5a 100644
--- a/web/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
@@ -20,29 +20,29 @@ class BlockContentCacheTagsTest extends EntityCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('block_content');
+  public static $modules = ['block_content'];
 
   /**
    * {@inheritdoc}
    */
   protected function createEntity() {
-    $block_content_type = BlockContentType::create(array(
+    $block_content_type = BlockContentType::create([
       'id' => 'basic',
       'label' => 'basic',
       'revision' => FALSE
-    ));
+    ]);
     $block_content_type->save();
     block_content_add_body_field($block_content_type->id());
 
     // Create a "Llama" custom block.
-    $block_content = BlockContent::create(array(
+    $block_content = BlockContent::create([
       'info' => 'Llama',
       'type' => 'basic',
-      'body' => array(
+      'body' => [
         'value' => 'The name "llama" was adopted by European settlers from native Peruvians.',
         'format' => 'plain_text',
-      ),
-    ));
+      ],
+    ]);
     $block_content->save();
 
     return $block_content;
diff --git a/web/core/modules/block_content/src/Tests/BlockContentPageViewTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php
similarity index 89%
rename from web/core/modules/block_content/src/Tests/BlockContentPageViewTest.php
rename to web/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php
index 46c19cb9b..355faf1f0 100644
--- a/web/core/modules/block_content/src/Tests/BlockContentPageViewTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 /**
  * Create a block and test block access by attempting to view the block.
@@ -14,7 +14,7 @@ class BlockContentPageViewTest extends BlockContentTestBase {
    *
    * @var array
    */
-  public static $modules = array('block_content_test');
+  public static $modules = ['block_content_test'];
 
   /**
    * Checks block edit and fallback functionality.
diff --git a/web/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
similarity index 92%
rename from web/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php
rename to web/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
index cc08654fb..fa88c64c2 100644
--- a/web/core/modules/block_content/src/Tests/BlockContentRevisionsTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\user\Entity\User;
@@ -37,8 +37,8 @@ class BlockContentRevisionsTest extends BlockContentTestBase {
     // Create initial block.
     $block = $this->createBlockContent('initial');
 
-    $blocks = array();
-    $logs = array();
+    $blocks = [];
+    $logs = [];
 
     // Get original block.
     $blocks[] = $block->getRevisionId();
@@ -70,11 +70,13 @@ class BlockContentRevisionsTest extends BlockContentTestBase {
     foreach ($blocks as $delta => $revision_id) {
       // Confirm the correct revision text appears.
       /** @var \Drupal\block_content\BlockContentInterface  $loaded */
-      $loaded = entity_revision_load('block_content', $revision_id);
+      $loaded = $this->container->get('entity_type.manager')
+        ->getStorage('block_content')
+        ->loadRevision($revision_id);
       // Verify revision log is the same.
-      $this->assertEqual($loaded->getRevisionLogMessage(), $logs[$delta], format_string('Correct log message found for revision @revision', array(
+      $this->assertEqual($loaded->getRevisionLogMessage(), $logs[$delta], format_string('Correct log message found for revision @revision', [
         '@revision' => $loaded->getRevisionId(),
-      )));
+      ]));
       if ($delta > 0) {
         $this->assertTrue($loaded->getRevisionUser() instanceof UserInterface, 'Revision User found.');
         $this->assertTrue(is_numeric($loaded->getRevisionUserId()), 'Revision User ID found.');
diff --git a/web/core/modules/block_content/src/Tests/BlockContentSaveTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentSaveTest.php
similarity index 94%
rename from web/core/modules/block_content/src/Tests/BlockContentSaveTest.php
rename to web/core/modules/block_content/tests/src/Functional/BlockContentSaveTest.php
index aabf7b67c..0f7ae5a2e 100644
--- a/web/core/modules/block_content/src/Tests/BlockContentSaveTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentSaveTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 
@@ -16,7 +16,7 @@ class BlockContentSaveTest extends BlockContentTestBase {
    *
    * @var array
    */
-  public static $modules = array('block_content_test');
+  public static $modules = ['block_content_test'];
 
   /**
    * Sets the test up.
@@ -35,12 +35,12 @@ class BlockContentSaveTest extends BlockContentTestBase {
     $max_id = db_query('SELECT MAX(id) FROM {block_content}')->fetchField();
     $test_id = $max_id + mt_rand(1000, 1000000);
     $info = $this->randomMachineName(8);
-    $block_array = array(
+    $block_array = [
       'info' => $info,
-      'body' => array('value' => $this->randomMachineName(32)),
+      'body' => ['value' => $this->randomMachineName(32)],
       'type' => 'basic',
       'id' => $test_id
-    );
+    ];
     $block = BlockContent::create($block_array);
     $block->enforceIsNew(TRUE);
     $block->save();
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php b/web/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
new file mode 100644
index 000000000..45c7e2699
--- /dev/null
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentTestBase.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Drupal\Tests\block_content\Functional;
+
+use Drupal\block_content\Entity\BlockContent;
+use Drupal\block_content\Entity\BlockContentType;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Sets up block content types.
+ */
+abstract class BlockContentTestBase extends BrowserTestBase {
+
+  /**
+   * Profile to use.
+   */
+  protected $profile = 'testing';
+
+  /**
+   * Admin user
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * Permissions to grant admin user.
+   *
+   * @var array
+   */
+  protected $permissions = [
+    'administer blocks'
+  ];
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['block', 'block_content'];
+
+  /**
+   * Whether or not to auto-create the basic block type during setup.
+   *
+   * @var bool
+   */
+  protected $autoCreateBasicBlockType = TRUE;
+
+  /**
+   * Sets the test up.
+   */
+  protected function setUp() {
+    parent::setUp();
+    if ($this->autoCreateBasicBlockType) {
+      $this->createBlockContentType('basic', TRUE);
+    }
+
+    $this->adminUser = $this->drupalCreateUser($this->permissions);
+    $this->drupalPlaceBlock('local_actions_block');
+  }
+
+  /**
+   * Creates a custom block.
+   *
+   * @param bool|string $title
+   *   (optional) Title of block. When no value is given uses a random name.
+   *   Defaults to FALSE.
+   * @param string $bundle
+   *   (optional) Bundle name. Defaults to 'basic'.
+   * @param bool $save
+   *   (optional) Whether to save the block. Defaults to TRUE.
+   *
+   * @return \Drupal\block_content\Entity\BlockContent
+   *   Created custom block.
+   */
+  protected function createBlockContent($title = FALSE, $bundle = 'basic', $save = TRUE) {
+    $title = $title ?: $this->randomMachineName();
+    $block_content = BlockContent::create([
+      'info' => $title,
+      'type' => $bundle,
+      'langcode' => 'en'
+    ]);
+    if ($block_content && $save === TRUE) {
+      $block_content->save();
+    }
+    return $block_content;
+  }
+
+  /**
+   * Creates a custom block type (bundle).
+   *
+   * @param string $label
+   *   The block type label.
+   * @param bool $create_body
+   *   Whether or not to create the body field
+   *
+   * @return \Drupal\block_content\Entity\BlockContentType
+   *   Created custom block type.
+   */
+  protected function createBlockContentType($label, $create_body = FALSE) {
+    $bundle = BlockContentType::create([
+      'id' => $label,
+      'label' => $label,
+      'revision' => FALSE,
+    ]);
+    $bundle->save();
+    if ($create_body) {
+      block_content_add_body_field($bundle->id());
+    }
+    return $bundle;
+  }
+
+}
diff --git a/web/core/modules/block_content/src/Tests/PageEditTest.php b/web/core/modules/block_content/tests/src/Functional/PageEditTest.php
similarity index 91%
rename from web/core/modules/block_content/src/Tests/PageEditTest.php
rename to web/core/modules/block_content/tests/src/Functional/PageEditTest.php
index 4a3fb9006..41638bd2b 100644
--- a/web/core/modules/block_content/src/Tests/PageEditTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/PageEditTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\block_content\Tests;
+namespace Drupal\Tests\block_content\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\Component\Utility\Unicode;
@@ -27,7 +27,7 @@ class PageEditTest extends BlockContentTestBase {
     $title_key = 'info[0][value]';
     $body_key = 'body[0][value]';
     // Create block to edit.
-    $edit = array();
+    $edit = [];
     $edit['info[0][value]'] = Unicode::strtolower($this->randomMachineName(8));
     $edit[$body_key] = $this->randomMachineName(16);
     $this->drupalPostForm('block/add/basic', $edit, t('Save'));
@@ -43,7 +43,7 @@ class PageEditTest extends BlockContentTestBase {
     $this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
 
     // Edit the content of the block.
-    $edit = array();
+    $edit = [];
     $edit[$title_key] = $this->randomMachineName(8);
     $edit[$body_key] = $this->randomMachineName(16);
     // Stay on the current page, without reloading.
@@ -51,21 +51,21 @@ class PageEditTest extends BlockContentTestBase {
 
     // Edit the same block, creating a new revision.
     $this->drupalGet("block/" . $block->id());
-    $edit = array();
+    $edit = [];
     $edit['info[0][value]'] = $this->randomMachineName(8);
     $edit[$body_key] = $this->randomMachineName(16);
     $edit['revision'] = TRUE;
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Ensure that the block revision has been created.
-    \Drupal::entityManager()->getStorage('block_content')->resetCache(array($block->id()));
+    \Drupal::entityManager()->getStorage('block_content')->resetCache([$block->id()]);
     $revised_block = BlockContent::load($block->id());
     $this->assertNotIdentical($block->getRevisionId(), $revised_block->getRevisionId(), 'A new revision has been created.');
 
     // Test deleting the block.
     $this->drupalGet("block/" . $revised_block->id());
     $this->clickLink(t('Delete'));
-    $this->assertText(format_string('Are you sure you want to delete the custom block @label?', array('@label' => $revised_block->label())));
+    $this->assertText(format_string('Are you sure you want to delete the custom block @label?', ['@label' => $revised_block->label()]));
   }
 
 }
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
index 0bf29fdc6..7d343738c 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
@@ -15,7 +15,7 @@ use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
  */
 class MigrateBlockContentBodyFieldTest extends MigrateDrupal7TestBase {
 
-  public static $modules = array('block', 'block_content', 'filter', 'text');
+  public static $modules = ['block', 'block_content', 'filter', 'text'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
index 9a3cbf046..4accc2040 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
@@ -13,7 +13,7 @@ use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
  */
 class MigrateBlockContentTypeTest extends MigrateDrupal7TestBase {
 
-  public static $modules = array('block', 'block_content', 'filter', 'text');
+  public static $modules = ['block', 'block_content', 'filter', 'text'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
index 42990db76..706a7ccf0 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
@@ -13,11 +13,11 @@ use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
  */
 class MigrateCustomBlockTest extends MigrateDrupal7TestBase {
 
-  public static $modules = array(
+  public static $modules = [
     'block_content',
     'filter',
     'text',
-  );
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php b/web/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php
index 3ab934c0a..ced7e84c3 100644
--- a/web/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php
+++ b/web/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php
@@ -13,32 +13,32 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 class BlockContentLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array(
+    $this->directoryList = [
       'block' => 'core/modules/block',
       'block_content' => 'core/modules/block_content',
-    );
+    ];
     parent::setUp();
 
-    $config_factory = $this->getConfigFactoryStub(array('system.theme' => array(
+    $config_factory = $this->getConfigFactoryStub(['system.theme' => [
       'default' => 'test_c',
-    )));
+    ]]);
 
-    $themes = array();
-    $themes['test_a'] = (object) array(
+    $themes = [];
+    $themes['test_a'] = (object) [
       'status' => 0,
-    );
-    $themes['test_b'] = (object) array(
+    ];
+    $themes['test_b'] = (object) [
       'status' => 1,
-      'info' => array(
+      'info' => [
         'name' => 'test_b',
-      ),
-    );
-    $themes['test_c'] = (object) array(
+      ],
+    ];
+    $themes['test_c'] = (object) [
       'status' => 1,
-      'info' => array(
+      'info' => [
         'name' => 'test_c',
-      ),
-    );
+      ],
+    ];
     $theme_handler = $this->getMock('Drupal\Core\Extension\ThemeHandlerInterface');
     $theme_handler->expects($this->any())
       ->method('listInfo')
@@ -56,25 +56,25 @@ class BlockContentLocalTasksTest extends LocalTaskIntegrationTestBase {
    * @dataProvider getBlockContentListingRoutes
    */
   public function testBlockContentListLocalTasks($route) {
-    $this->assertLocalTasks($route, array(
-      0 => array(
+    $this->assertLocalTasks($route, [
+      0 => [
         'block.admin_display',
         'entity.block_content.collection',
-      ),
-      1 => array(
+      ],
+      1 => [
         'block_content.list_sub',
         'entity.block_content_type.collection',
-      ),
-    ));
+      ],
+    ]);
   }
 
   /**
    * Provides a list of routes to test.
    */
   public function getBlockContentListingRoutes() {
-    return array(
-      array('entity.block_content.collection', 'entity.block_content_type.collection'),
-    );
+    return [
+      ['entity.block_content.collection', 'entity.block_content_type.collection'],
+    ];
   }
 
 }
diff --git a/web/core/modules/block_place/css/block-place.css b/web/core/modules/block_place/css/block-place.css
index 929a84ff1..aa3eccb5a 100644
--- a/web/core/modules/block_place/css/block-place.css
+++ b/web/core/modules/block_place/css/block-place.css
@@ -13,6 +13,7 @@
 }
 
 .block-place-region a.button {
+  position: relative;
   background: url(../../../misc/icons/bebebe/plus.svg) #ffffff center center / 16px 16px no-repeat;
   border: 1px solid #cccccc;
   box-sizing: border-box;
@@ -23,7 +24,35 @@
   white-space: nowrap;
 }
 
-.block-place-region:hover a.button, .block-place-region:focus a.button {
+.block-place-region:hover a.button,
+.block-place-region:focus a.button {
   background-image: url(../../../misc/icons/787878/plus.svg);
-  transition: all 0.25s ease;
+}
+
+.block-place-region .ajax-progress {
+  position: relative;
+  top: -10px;
+  right: 26px; /* LTR */
+  height: 0;
+  width: 0;
+  overflow: visible;
+  padding: 0;
+}
+
+[dir="rtl"] .block-place-region .ajax-progress {
+  float: inherit;
+  left: 26px;
+  right: inherit;
+}
+
+.block-place-region .ajax-progress-throbber .throbber {
+  display: block;
+  padding: 0;
+  height: 26px;
+  width: 26px;
+  background-position: center 6px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 100px;
+  box-sizing: border-box;
 }
diff --git a/web/core/modules/book/book.install b/web/core/modules/book/book.install
index 76ddc81ed..770448336 100644
--- a/web/core/modules/book/book.install
+++ b/web/core/modules/book/book.install
@@ -17,119 +17,119 @@ function book_uninstall() {
  * Implements hook_schema().
  */
 function book_schema() {
-  $schema['book'] = array(
+  $schema['book'] = [
   'description' => 'Stores book outline information. Uniquely defines the location of each node in the book outline',
-    'fields' => array(
-      'nid' => array(
+    'fields' => [
+      'nid' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => "The book page's {node}.nid.",
-      ),
-      'bid' => array(
+      ],
+      'bid' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => "The book ID is the {book}.nid of the top-level page.",
-      ),
-      'pid' => array(
+      ],
+      'pid' => [
         'description' => 'The parent ID (pid) is the id of the node above in the hierarchy, or zero if the node is at the top level in its outline.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'has_children' => array(
+      ],
+      'has_children' => [
         'description' => 'Flag indicating whether any nodes have this node as a parent (1 = children exist, 0 = no children).',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
         'size' => 'small',
-      ),
-      'weight' => array(
+      ],
+      'weight' => [
         'description' => 'Weight among book entries in the same book at the same depth.',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'depth' => array(
+      ],
+      'depth' => [
         'description' => 'The depth relative to the top level. A link with pid == 0 will have depth == 1.',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
         'size' => 'small',
-      ),
-      'p1' => array(
+      ],
+      'p1' => [
         'description' => 'The first nid in the materialized path. If N = depth, then pN must equal the nid. If depth > 1 then p(N-1) must equal the pid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'p2' => array(
+      ],
+      'p2' => [
         'description' => 'The second nid in the materialized path. See p1.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'p3' => array(
+      ],
+      'p3' => [
         'description' => 'The third nid in the materialized path. See p1.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'p4' => array(
+      ],
+      'p4' => [
         'description' => 'The fourth nid in the materialized path. See p1.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'p5' => array(
+      ],
+      'p5' => [
         'description' => 'The fifth nid in the materialized path. See p1.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'p6' => array(
+      ],
+      'p6' => [
         'description' => 'The sixth nid in the materialized path. See p1.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'p7' => array(
+      ],
+      'p7' => [
         'description' => 'The seventh nid in the materialized path. See p1.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'p8' => array(
+      ],
+      'p8' => [
         'description' => 'The eighth nid in the materialized path. See p1.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'p9' => array(
+      ],
+      'p9' => [
         'description' => 'The ninth nid in the materialized path. See p1.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-    ),
-    'primary key' => array('nid'),
-    'indexes' => array(
-      'book_parents' => array('bid', 'p1', 'p2', 'p3', 'p4', 'p5', 'p6', 'p7', 'p8', 'p9'),
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['nid'],
+    'indexes' => [
+      'book_parents' => ['bid', 'p1', 'p2', 'p3', 'p4', 'p5', 'p6', 'p7', 'p8', 'p9'],
+    ],
+  ];
 
   return $schema;
 }
diff --git a/web/core/modules/book/book.module b/web/core/modules/book/book.module
index ecccb7452..988201ee1 100644
--- a/web/core/modules/book/book.module
+++ b/web/core/modules/book/book.module
@@ -25,17 +25,17 @@ function book_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.book':
       $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Book module is used for creating structured, multi-page content, such as site resource guides, manuals, and wikis. It allows you to create content that has chapters, sections, subsections, or any similarly-tiered structure. Enabling the module creates a new content type <em>Book page</em>. For more information, see the <a href=":book">online documentation for the Book module</a>.', array(':book' => 'https://www.drupal.org/documentation/modules/book')) . '</p>';
+      $output .= '<p>' . t('The Book module is used for creating structured, multi-page content, such as site resource guides, manuals, and wikis. It allows you to create content that has chapters, sections, subsections, or any similarly-tiered structure. Enabling the module creates a new content type <em>Book page</em>. For more information, see the <a href=":book">online documentation for the Book module</a>.', [':book' => 'https://www.drupal.org/documentation/modules/book']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Adding and managing book content') . '</dt>';
       $output .= '<dd>' . t('Books have a hierarchical structure, called a <em>book outline</em>. Each book outline can have nested pages up to nine levels deep. Multiple content types can be configured to behave as a book outline. From the content edit form, it is possible to add a page to a book outline or create a new book.') . '</dd>';
-      $output .= '<dd>' . t('You can assign separate permissions for <em>creating new books</em> as well as <em>creating</em>, <em>editing</em> and <em>deleting</em> book content. Users with the <em>Administer book outlines</em> permission can add <em>any</em> type of content to a book by selecting the appropriate book outline while editing the content. They can also view a list of all books, and edit and rearrange section titles on the <a href=":admin-book">Book list page</a>.', array(':admin-book' => \Drupal::url('book.admin'))) . '</dd>';
+      $output .= '<dd>' . t('You can assign separate permissions for <em>creating new books</em> as well as <em>creating</em>, <em>editing</em> and <em>deleting</em> book content. Users with the <em>Administer book outlines</em> permission can add <em>any</em> type of content to a book by selecting the appropriate book outline while editing the content. They can also view a list of all books, and edit and rearrange section titles on the <a href=":admin-book">Book list page</a>.', [':admin-book' => \Drupal::url('book.admin')]) . '</dd>';
       $output .= '<dt>' . t('Configuring content types for books') . '</dt>';
-      $output .= '<dd>' . t('The <em>Book page</em> content type is the initial content type enabled for book outlines. On the <a href=":admin-settings">Book settings page</a> you can configure content types that can used in book outlines.', array(':admin-settings' => \Drupal::url('book.settings'))) . '</dd>';
-      $output .= '<dd>' . t('Users with the <em>Add content and child pages to books</em> permission will see a link to <em>Add child page</em> when viewing a content item that is part of a book outline. This link will allow users to create a new content item of the content type you select on the <a href=":admin-settings">Book settings page</a>. By default this is the <em>Book page</em> content type.', array(':admin-settings' => \Drupal::url('book.settings'))) . '</dd>';
+      $output .= '<dd>' . t('The <em>Book page</em> content type is the initial content type enabled for book outlines. On the <a href=":admin-settings">Book settings page</a> you can configure content types that can used in book outlines.', [':admin-settings' => \Drupal::url('book.settings')]) . '</dd>';
+      $output .= '<dd>' . t('Users with the <em>Add content and child pages to books</em> permission will see a link to <em>Add child page</em> when viewing a content item that is part of a book outline. This link will allow users to create a new content item of the content type you select on the <a href=":admin-settings">Book settings page</a>. By default this is the <em>Book page</em> content type.', [':admin-settings' => \Drupal::url('book.settings')]) . '</dd>';
       $output .= '<dt>' . t('Book navigation') . '</dt>';
-      $output .= '<dd>' . t("Book pages have a default book-specific navigation block. This navigation block contains links that lead to the previous and next pages in the book, and to the level above the current page in the book's structure. This block can be enabled on the <a href=':admin-block'>Blocks layout page</a>. For book pages to show up in the book navigation, they must be added to a book outline.", array(':admin-block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '</dd>';
+      $output .= '<dd>' . t("Book pages have a default book-specific navigation block. This navigation block contains links that lead to the previous and next pages in the book, and to the level above the current page in the book's structure. This block can be enabled on the <a href=':admin-block'>Blocks layout page</a>. For book pages to show up in the book navigation, they must be added to a book outline.", [':admin-block' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#']) . '</dd>';
       $output .= '<dt>' . t('Collaboration') . '</dt>';
       $output .= '<dd>' . t('Books can be created collaboratively, as they allow users with appropriate permissions to add pages into existing books, and add those pages to a custom table of contents.') . '</dd>';
       $output .= '<dt>' . t('Printing books') . '</dt>';
@@ -47,7 +47,7 @@ function book_help($route_name, RouteMatchInterface $route_match) {
       return '<p>' . t('The book module offers a means to organize a collection of related content pages, collectively known as a book. When viewed, this content automatically displays links to adjacent book pages, providing a simple navigation system for creating and reviewing structured content.') . '</p>';
 
     case 'entity.node.book_outline_form':
-      return '<p>' . t('The outline feature allows you to include pages in the <a href=":book">Book hierarchy</a>, as well as move them within the hierarchy or to <a href=":book-admin">reorder an entire book</a>.', array(':book' => \Drupal::url('book.render'), ':book-admin' => \Drupal::url('book.admin'))) . '</p>';
+      return '<p>' . t('The outline feature allows you to include pages in the <a href=":book">Book hierarchy</a>, as well as move them within the hierarchy or to <a href=":book-admin">reorder an entire book</a>.', [':book' => \Drupal::url('book.render'), ':book-admin' => \Drupal::url('book.admin')]) . '</p>';
   }
 }
 
@@ -55,23 +55,23 @@ function book_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function book_theme() {
-  return array(
-    'book_navigation' => array(
-      'variables' => array('book_link' => NULL),
-    ),
-    'book_tree' => array(
-      'variables' => array('items' => array(), 'attributes' => array()),
-    ),
-    'book_export_html' => array(
-      'variables' => array('title' => NULL, 'contents' => NULL, 'depth' => NULL),
-    ),
-    'book_all_books_block' => array(
+  return [
+    'book_navigation' => [
+      'variables' => ['book_link' => NULL],
+    ],
+    'book_tree' => [
+      'variables' => ['items' => [], 'attributes' => []],
+    ],
+    'book_export_html' => [
+      'variables' => ['title' => NULL, 'contents' => NULL, 'depth' => NULL],
+    ],
+    'book_all_books_block' => [
       'render element' => 'book_menus',
-    ),
-    'book_node_export_html' => array(
-      'variables' => array('node' => NULL, 'content' => NULL, 'children' => NULL),
-    ),
-  );
+    ],
+    'book_node_export_html' => [
+      'variables' => ['node' => NULL, 'content' => NULL, 'children' => NULL],
+    ],
+  ];
 }
 
 /**
@@ -97,31 +97,31 @@ function book_node_links_alter(array &$links, NodeInterface $node, array &$conte
         $child_type = \Drupal::config('book.settings')->get('child_type');
         $access_control_handler = \Drupal::entityManager()->getAccessControlHandler('node');
         if (($account->hasPermission('add content to books') || $account->hasPermission('administer book outlines')) && $access_control_handler->createAccess($child_type) && $node->isPublished() && $node->book['depth'] < BookManager::BOOK_MAX_DEPTH) {
-          $book_links['book_add_child'] = array(
+          $book_links['book_add_child'] = [
             'title' => t('Add child page'),
             'url' => Url::fromRoute('node.add', ['node_type' => $child_type], ['query' => ['parent' => $node->id()]]),
-          );
+          ];
         }
 
         if ($account->hasPermission('access printer-friendly version')) {
-          $book_links['book_printer'] = array(
+          $book_links['book_printer'] = [
             'title' => t('Printer-friendly version'),
             'url' => Url::fromRoute('book.export', [
               'type' => 'html',
               'node' => $node->id(),
             ]),
-            'attributes' => array('title' => t('Show a printer-friendly version of this book page and its sub-pages.'))
-          );
+            'attributes' => ['title' => t('Show a printer-friendly version of this book page and its sub-pages.')]
+          ];
         }
       }
     }
 
     if (!empty($book_links)) {
-      $links['book'] = array(
+      $links['book'] = [
         '#theme' => 'links__node__book',
         '#links' => $book_links,
-        '#attributes' => array('class' => array('links', 'inline')),
-      );
+        '#attributes' => ['class' => ['links', 'inline']],
+      ];
     }
   }
 }
@@ -148,17 +148,17 @@ function book_form_node_form_alter(&$form, FormStateInterface $form_state, $form
     $collapsed = !($node->isNew() && !empty($node->book['pid']));
     $form = \Drupal::service('book.manager')->addFormElements($form, $form_state, $node, $account, $collapsed);
     // The "js-hide" class hides submit button when Javascript is enabled.
-    $form['book']['pick-book'] = array(
+    $form['book']['pick-book'] = [
       '#type' => 'submit',
       '#value' => t('Change book (update list of parents)'),
-      '#submit' => array('book_pick_book_nojs_submit'),
+      '#submit' => ['book_pick_book_nojs_submit'],
       '#weight' => 20,
-      '#attributes' => array(
-        'class' => array(
+      '#attributes' => [
+        'class' => [
           'js-hide',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     $form['#entity_builders'][] = 'book_node_builder';
   }
 }
@@ -232,7 +232,7 @@ function book_node_view(array &$build, EntityInterface $node, EntityViewDisplayI
       if (!$book_node->access()) {
         return;
       }
-      $build['book_navigation'] = array(
+      $build['book_navigation'] = [
         '#theme' => 'book_navigation',
         '#book_link' => $node->book,
         '#weight' => 100,
@@ -241,7 +241,7 @@ function book_node_view(array &$build, EntityInterface $node, EntityViewDisplayI
         '#cache' => [
           'tags' => $node->getEntityType()->getListCacheTags(),
         ],
-      );
+      ];
     }
   }
 }
@@ -295,7 +295,7 @@ function book_node_prepare_form(NodeInterface $node, $operation, FormStateInterf
   // Prepare defaults for the add/edit form.
   $account = \Drupal::currentUser();
   if (empty($node->book) && ($account->hasPermission('add content to books') || $account->hasPermission('administer book outlines'))) {
-    $node->book = array();
+    $node->book = [];
 
     $query = \Drupal::request()->query;
     if ($node->isNew() && !is_null($query->get('parent')) && is_numeric($query->get('parent'))) {
@@ -341,10 +341,10 @@ function book_form_node_confirm_form_alter(&$form, FormStateInterface $form_stat
   }
 
   if (isset($node->book) && $node->book['has_children']) {
-    $form['book_warning'] = array(
-      '#markup' => '<p>' . t('%title is part of a book outline, and has associated child pages. If you proceed with deletion, the child pages will be relocated automatically.', array('%title' => $node->label())) . '</p>',
+    $form['book_warning'] = [
+      '#markup' => '<p>' . t('%title is part of a book outline, and has associated child pages. If you proceed with deletion, the child pages will be relocated automatically.', ['%title' => $node->label()]) . '</p>',
       '#weight' => -10,
-    );
+    ];
   }
 }
 
@@ -365,13 +365,13 @@ function book_form_node_confirm_form_alter(&$form, FormStateInterface $form_stat
 function template_preprocess_book_all_books_block(&$variables) {
   // Remove all non-renderable elements.
   $elements = $variables['book_menus'];
-  $variables['book_menus'] = array();
+  $variables['book_menus'] = [];
   foreach (Element::children($elements) as $index) {
-    $variables['book_menus'][] = array(
+    $variables['book_menus'][] = [
       'id' => $index,
       'menu' => $elements[$index],
       'title' => $elements[$index]['#book_title'],
-    );
+    ];
   }
 }
 
@@ -391,7 +391,7 @@ function template_preprocess_book_navigation(&$variables) {
   // Provide extra variables for themers. Not needed by default.
   $variables['book_id'] = $book_link['bid'];
   $variables['book_title'] = $book_link['link_title'];
-  $variables['book_url'] = \Drupal::url('entity.node.canonical', array('node' => $book_link['bid']));
+  $variables['book_url'] = \Drupal::url('entity.node.canonical', ['node' => $book_link['bid']]);
   $variables['current_depth'] = $book_link['depth'];
   $variables['tree'] = '';
 
@@ -401,14 +401,14 @@ function template_preprocess_book_navigation(&$variables) {
   if ($book_link['nid']) {
     $variables['tree'] = $book_outline->childrenLinks($book_link);
 
-    $build = array();
+    $build = [];
 
     if ($prev = $book_outline->prevLink($book_link)) {
-      $prev_href = \Drupal::url('entity.node.canonical', array('node' => $prev['nid']));
-      $build['#attached']['html_head_link'][][] = array(
+      $prev_href = \Drupal::url('entity.node.canonical', ['node' => $prev['nid']]);
+      $build['#attached']['html_head_link'][][] = [
         'rel' => 'prev',
         'href' => $prev_href,
-      );
+      ];
       $variables['prev_url'] = $prev_href;
       $variables['prev_title'] = $prev['title'];
     }
@@ -416,21 +416,21 @@ function template_preprocess_book_navigation(&$variables) {
     /** @var \Drupal\book\BookManagerInterface $book_manager */
     $book_manager = \Drupal::service('book.manager');
     if ($book_link['pid'] && $parent = $book_manager->loadBookLink($book_link['pid'])) {
-      $parent_href = \Drupal::url('entity.node.canonical', array('node' => $book_link['pid']));
-      $build['#attached']['html_head_link'][][] = array(
+      $parent_href = \Drupal::url('entity.node.canonical', ['node' => $book_link['pid']]);
+      $build['#attached']['html_head_link'][][] = [
         'rel' => 'up',
         'href' => $parent_href,
-      );
+      ];
       $variables['parent_url'] = $parent_href;
       $variables['parent_title'] = $parent['title'];
     }
 
     if ($next = $book_outline->nextLink($book_link)) {
-      $next_href = \Drupal::url('entity.node.canonical', array('node' => $next['nid']));
-      $build['#attached']['html_head_link'][][] = array(
+      $next_href = \Drupal::url('entity.node.canonical', ['node' => $next['nid']]);
+      $build['#attached']['html_head_link'][][] = [
         'rel' => 'next',
         'href' => $next_href,
-      );
+      ];
       $variables['next_url'] = $next_href;
       $variables['next_title'] = $next['title'];
     }
@@ -442,7 +442,7 @@ function template_preprocess_book_navigation(&$variables) {
 
   $variables['has_links'] = FALSE;
   // Link variables to filter for values and set state of the flag variable.
-  $links = array('prev_url', 'prev_title', 'parent_url', 'parent_title', 'next_url', 'next_title');
+  $links = ['prev_url', 'prev_title', 'parent_url', 'parent_title', 'next_url', 'next_title'];
   foreach ($links as $link) {
     if (isset($variables[$link])) {
       // Flag when there is a value.
@@ -475,7 +475,7 @@ function template_preprocess_book_export_html(&$variables) {
   $variables['language_rtl'] = ($language_interface->getDirection() == LanguageInterface::DIRECTION_RTL);
 
   // HTML element attributes.
-  $attributes = array();
+  $attributes = [];
   $attributes['lang'] = $language_interface->getId();
   $attributes['dir'] = $language_interface->getDirection();
   $variables['html_attributes'] = new Attribute($attributes);
diff --git a/web/core/modules/book/book.services.yml b/web/core/modules/book/book.services.yml
index 73c948436..46fddbc43 100644
--- a/web/core/modules/book/book.services.yml
+++ b/web/core/modules/book/book.services.yml
@@ -35,5 +35,5 @@ services:
     class: Drupal\book\BookUninstallValidator
     tags:
       - { name: module_install.uninstall_validator }
-    arguments: ['@book.outline_storage', '@entity.query', '@string_translation']
+    arguments: ['@book.outline_storage', '@entity_type.manager', '@string_translation']
     lazy: true
diff --git a/web/core/modules/book/config/install/core.base_field_override.node.book.promote.yml b/web/core/modules/book/config/optional/core.base_field_override.node.book.promote.yml
similarity index 100%
rename from web/core/modules/book/config/install/core.base_field_override.node.book.promote.yml
rename to web/core/modules/book/config/optional/core.base_field_override.node.book.promote.yml
diff --git a/web/core/modules/book/config/install/core.entity_form_display.node.book.default.yml b/web/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml
similarity index 89%
rename from web/core/modules/book/config/install/core.entity_form_display.node.book.default.yml
rename to web/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml
index 1ec4eb11b..58aba45d3 100644
--- a/web/core/modules/book/config/install/core.entity_form_display.node.book.default.yml
+++ b/web/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml
@@ -14,6 +14,7 @@ content:
   body:
     type: text_textarea_with_summary
     weight: 26
+    region: content
     settings:
       rows: 9
       summary_rows: 3
@@ -22,6 +23,7 @@ content:
   created:
     type: datetime_timestamp
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
   promote:
@@ -29,16 +31,19 @@ content:
     settings:
       display_label: true
     weight: 15
+    region: content
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 16
+    region: content
     third_party_settings: {  }
   title:
     type: string_textfield
     weight: -5
+    region: content
     settings:
       size: 60
       placeholder: ''
@@ -46,6 +51,7 @@ content:
   uid:
     type: entity_reference_autocomplete
     weight: 5
+    region: content
     settings:
       match_operator: CONTAINS
       size: 60
diff --git a/web/core/modules/book/config/install/core.entity_view_display.node.book.default.yml b/web/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml
similarity index 90%
rename from web/core/modules/book/config/install/core.entity_view_display.node.book.default.yml
rename to web/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml
index 729516eb8..d6ef64df8 100644
--- a/web/core/modules/book/config/install/core.entity_view_display.node.book.default.yml
+++ b/web/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml
@@ -16,8 +16,10 @@ content:
     label: hidden
     type: text_default
     weight: 100
+    region: content
     settings: {  }
     third_party_settings: {  }
   links:
     weight: 101
+    region: content
 hidden: {  }
diff --git a/web/core/modules/book/config/install/core.entity_view_display.node.book.teaser.yml b/web/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml
similarity index 91%
rename from web/core/modules/book/config/install/core.entity_view_display.node.book.teaser.yml
rename to web/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml
index fb22db652..77a62c35a 100644
--- a/web/core/modules/book/config/install/core.entity_view_display.node.book.teaser.yml
+++ b/web/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml
@@ -17,9 +17,11 @@ content:
     label: hidden
     type: text_summary_or_trimmed
     weight: 100
+    region: content
     settings:
       trim_length: 600
     third_party_settings: {  }
   links:
     weight: 101
+    region: content
 hidden: {  }
diff --git a/web/core/modules/book/config/install/core.entity_view_mode.node.print.yml b/web/core/modules/book/config/optional/core.entity_view_mode.node.print.yml
similarity index 100%
rename from web/core/modules/book/config/install/core.entity_view_mode.node.print.yml
rename to web/core/modules/book/config/optional/core.entity_view_mode.node.print.yml
diff --git a/web/core/modules/book/config/install/field.field.node.book.body.yml b/web/core/modules/book/config/optional/field.field.node.book.body.yml
similarity index 100%
rename from web/core/modules/book/config/install/field.field.node.book.body.yml
rename to web/core/modules/book/config/optional/field.field.node.book.body.yml
diff --git a/web/core/modules/book/config/install/node.type.book.yml b/web/core/modules/book/config/optional/node.type.book.yml
similarity index 100%
rename from web/core/modules/book/config/install/node.type.book.yml
rename to web/core/modules/book/config/optional/node.type.book.yml
diff --git a/web/core/modules/book/src/BookBreadcrumbBuilder.php b/web/core/modules/book/src/BookBreadcrumbBuilder.php
index ed39a53d2..90591d8d4 100644
--- a/web/core/modules/book/src/BookBreadcrumbBuilder.php
+++ b/web/core/modules/book/src/BookBreadcrumbBuilder.php
@@ -56,10 +56,10 @@ class BookBreadcrumbBuilder implements BreadcrumbBuilderInterface {
    * {@inheritdoc}
    */
   public function build(RouteMatchInterface $route_match) {
-    $book_nids = array();
+    $book_nids = [];
     $breadcrumb = new Breadcrumb();
 
-    $links = array(Link::createFromRoute($this->t('Home'), '<front>'));
+    $links = [Link::createFromRoute($this->t('Home'), '<front>')];
     $book = $route_match->getParameter('node')->book;
     $depth = 1;
     // We skip the current node.
@@ -76,7 +76,7 @@ class BookBreadcrumbBuilder implements BreadcrumbBuilderInterface {
           $breadcrumb->addCacheableDependency($access);
           if ($access->isAllowed()) {
             $breadcrumb->addCacheableDependency($parent_book);
-            $links[] = Link::createFromRoute($parent_book->label(), 'entity.node.canonical', array('node' => $parent_book->id()));
+            $links[] = Link::createFromRoute($parent_book->label(), 'entity.node.canonical', ['node' => $parent_book->id()]);
           }
         }
         $depth++;
diff --git a/web/core/modules/book/src/BookExport.php b/web/core/modules/book/src/BookExport.php
index 8261c42ea..a32337005 100644
--- a/web/core/modules/book/src/BookExport.php
+++ b/web/core/modules/book/src/BookExport.php
@@ -73,8 +73,8 @@ class BookExport {
     }
 
     $tree = $this->bookManager->bookSubtreeData($node->book);
-    $contents = $this->exportTraverse($tree, array($this, 'bookNodeExport'));
-    return array(
+    $contents = $this->exportTraverse($tree, [$this, 'bookNodeExport']);
+    return [
       '#theme' => 'book_export_html',
       '#title' => $node->label(),
       '#contents' => $contents,
@@ -82,7 +82,7 @@ class BookExport {
       '#cache' => [
         'tags' => $node->getEntityType()->getListCacheTags(),
       ],
-    );
+    ];
   }
 
   /**
@@ -101,9 +101,9 @@ class BookExport {
    */
   protected function exportTraverse(array $tree, $callable) {
     // If there is no valid callable, use the default callback.
-    $callable = !empty($callable) ? $callable : array($this, 'bookNodeExport');
+    $callable = !empty($callable) ? $callable : [$this, 'bookNodeExport'];
 
-    $build = array();
+    $build = [];
     foreach ($tree as $data) {
       // Note- access checking is already performed when building the tree.
       if ($node = $this->nodeStorage->load($data['link']['nid'])) {
@@ -133,12 +133,12 @@ class BookExport {
     $build = $this->viewBuilder->view($node, 'print', NULL);
     unset($build['#theme']);
 
-    return array(
+    return [
       '#theme' => 'book_node_export_html',
       '#content' => $build,
       '#node' => $node,
       '#children' => $children,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/book/src/BookManager.php b/web/core/modules/book/src/BookManager.php
index 60754be7b..3e14c4007 100644
--- a/web/core/modules/book/src/BookManager.php
+++ b/web/core/modules/book/src/BookManager.php
@@ -92,7 +92,7 @@ class BookManager implements BookManagerInterface {
    * Loads Books Array.
    */
   protected function loadBooks() {
-    $this->books = array();
+    $this->books = [];
     $nids = $this->bookOutlineStorage->getBooks();
 
     if ($nids) {
@@ -117,15 +117,15 @@ class BookManager implements BookManagerInterface {
    * {@inheritdoc}
    */
   public function getLinkDefaults($nid) {
-    return array(
+    return [
       'original_bid' => 0,
       'nid' => $nid,
       'bid' => 0,
       'pid' => 0,
       'has_children' => 0,
       'weight' => 0,
-      'options' => array(),
-    );
+      'options' => [],
+    ];
   }
 
   /**
@@ -159,40 +159,40 @@ class BookManager implements BookManagerInterface {
     if ($form_state->hasValue('book')) {
       $node->book = $form_state->getValue('book');
     }
-    $form['book'] = array(
+    $form['book'] = [
       '#type' => 'details',
       '#title' => $this->t('Book outline'),
       '#weight' => 10,
       '#open' => !$collapsed,
       '#group' => 'advanced',
-      '#attributes' => array(
-        'class' => array('book-outline-form'),
-      ),
-      '#attached' => array(
-        'library' => array('book/drupal.book'),
-      ),
+      '#attributes' => [
+        'class' => ['book-outline-form'],
+      ],
+      '#attached' => [
+        'library' => ['book/drupal.book'],
+      ],
       '#tree' => TRUE,
-    );
-    foreach (array('nid', 'has_children', 'original_bid', 'parent_depth_limit') as $key) {
-      $form['book'][$key] = array(
+    ];
+    foreach (['nid', 'has_children', 'original_bid', 'parent_depth_limit'] as $key) {
+      $form['book'][$key] = [
         '#type' => 'value',
         '#value' => $node->book[$key],
-      );
+      ];
     }
 
     $form['book']['pid'] = $this->addParentSelectFormElements($node->book);
 
     // @see \Drupal\book\Form\BookAdminEditForm::bookAdminTableTree(). The
     // weight may be larger than 15.
-    $form['book']['weight'] = array(
+    $form['book']['weight'] = [
       '#type' => 'weight',
       '#title' => $this->t('Weight'),
       '#default_value' => $node->book['weight'],
       '#delta' => max(15, abs($node->book['weight'])),
       '#weight' => 5,
       '#description' => $this->t('Pages at a given level are ordered first by weight and then by title.'),
-    );
-    $options = array();
+    ];
+    $options = [];
     $nid = !$node->isNew() ? $node->id() : 'new';
     if ($node->id() && ($nid == $node->book['original_bid']) && ($node->book['parent_depth_limit'] == 0)) {
       // This is the top level node in a maximum depth book and thus cannot be
@@ -207,15 +207,15 @@ class BookManager implements BookManagerInterface {
 
     if ($account->hasPermission('create new books') && ($nid == 'new' || ($nid != $node->book['original_bid']))) {
       // The node can become a new book, if it is not one already.
-      $options = array($nid => $this->t('- Create a new book -')) + $options;
+      $options = [$nid => $this->t('- Create a new book -')] + $options;
     }
     if (!$node->book['bid']) {
       // The node is not currently in the hierarchy.
-      $options = array(0 => $this->t('- None -')) + $options;
+      $options = [0 => $this->t('- None -')] + $options;
     }
 
     // Add a drop-down to select the destination book.
-    $form['book']['bid'] = array(
+    $form['book']['bid'] = [
       '#type' => 'select',
       '#title' => $this->t('Book'),
       '#default_value' => $node->book['bid'],
@@ -223,14 +223,14 @@ class BookManager implements BookManagerInterface {
       '#access' => (bool) $options,
       '#description' => $this->t('Your page will be a part of the selected book.'),
       '#weight' => -5,
-      '#attributes' => array('class' => array('book-title-select')),
-      '#ajax' => array(
+      '#attributes' => ['class' => ['book-title-select']],
+      '#ajax' => [
         'callback' => 'book_form_update',
         'wrapper' => 'edit-book-plid-wrapper',
         'effect' => 'fade',
         'speed' => 'fast',
-      ),
-    );
+      ],
+    ];
     return $form;
   }
 
@@ -281,8 +281,8 @@ class BookManager implements BookManagerInterface {
   /**
    * {@inheritdoc}
    */
-  public function getBookParents(array $item, array $parent = array()) {
-    $book = array();
+  public function getBookParents(array $item, array $parent = []) {
+    $book = [];
     if ($item['pid'] == 0) {
       $book['p1'] = $item['nid'];
       for ($i = 2; $i <= static::BOOK_MAX_DEPTH; $i++) {
@@ -325,15 +325,15 @@ class BookManager implements BookManagerInterface {
   protected function addParentSelectFormElements(array $book_link) {
     $config = $this->configFactory->get('book.settings');
     if ($config->get('override_parent_selector')) {
-      return array();
+      return [];
     }
     // Offer a message or a drop-down to choose a different parent page.
-    $form = array(
+    $form = [
       '#type' => 'hidden',
       '#value' => -1,
       '#prefix' => '<div id="edit-book-plid-wrapper">',
       '#suffix' => '</div>',
-    );
+    ];
 
     if ($book_link['nid'] === $book_link['bid']) {
       // This is a book - at the top level.
@@ -348,16 +348,16 @@ class BookManager implements BookManagerInterface {
       $form['#prefix'] .= '<em>' . $this->t('No book selected.') . '</em>';
     }
     else {
-      $form = array(
+      $form = [
         '#type' => 'select',
         '#title' => $this->t('Parent item'),
         '#default_value' => $book_link['pid'],
-        '#description' => $this->t('The parent page in the book. The maximum depth for a book and all child pages is @maxdepth. Some pages in the selected book may not be available as parents if selecting them would exceed this limit.', array('@maxdepth' => static::BOOK_MAX_DEPTH)),
-        '#options' => $this->getTableOfContents($book_link['bid'], $book_link['parent_depth_limit'], array($book_link['nid'])),
-        '#attributes' => array('class' => array('book-title-select')),
+        '#description' => $this->t('The parent page in the book. The maximum depth for a book and all child pages is @maxdepth. Some pages in the selected book may not be available as parents if selecting them would exceed this limit.', ['@maxdepth' => static::BOOK_MAX_DEPTH]),
+        '#options' => $this->getTableOfContents($book_link['bid'], $book_link['parent_depth_limit'], [$book_link['nid']]),
+        '#attributes' => ['class' => ['book-title-select']],
         '#prefix' => '<div id="edit-book-plid-wrapper">',
         '#suffix' => '</div>',
-      );
+      ];
     }
     $this->renderer->addCacheableDependency($form, $config);
 
@@ -388,7 +388,7 @@ class BookManager implements BookManagerInterface {
    *   children).
    */
   protected function recurseTableOfContents(array $tree, $indent, array &$toc, array $exclude, $depth_limit) {
-    $nids = array();
+    $nids = [];
     foreach ($tree as $data) {
       if ($data['link']['depth'] > $depth_limit) {
         // Don't iterate through any links on this level.
@@ -417,9 +417,9 @@ class BookManager implements BookManagerInterface {
   /**
    * {@inheritdoc}
    */
-  public function getTableOfContents($bid, $depth_limit, array $exclude = array()) {
+  public function getTableOfContents($bid, $depth_limit, array $exclude = []) {
     $tree = $this->bookTreeAllData($bid);
-    $toc = array();
+    $toc = [];
     $this->recurseTableOfContents($tree, '', $toc, $exclude, $depth_limit);
 
     return $toc;
@@ -443,14 +443,14 @@ class BookManager implements BookManagerInterface {
     }
     $this->updateOriginalParent($original);
     $this->books = NULL;
-    Cache::invalidateTags(array('bid:' . $original['bid']));
+    Cache::invalidateTags(['bid:' . $original['bid']]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function bookTreeAllData($bid, $link = NULL, $max_depth = NULL) {
-    $tree = &drupal_static(__METHOD__, array());
+    $tree = &drupal_static(__METHOD__, []);
     $language_interface = \Drupal::languageManager()->getCurrentLanguage();
 
     // Use $nid as a flag for whether the data being loaded is for the whole
@@ -462,10 +462,10 @@ class BookManager implements BookManagerInterface {
 
     if (!isset($tree[$cid])) {
       // If the tree data was not in the static cache, build $tree_parameters.
-      $tree_parameters = array(
+      $tree_parameters = [
         'min_depth' => 1,
         'max_depth' => $max_depth,
-      );
+      ];
       if ($nid) {
         $active_trail = $this->getActiveTrailIds($bid, $link);
         $tree_parameters['expanded'] = $active_trail;
@@ -486,7 +486,7 @@ class BookManager implements BookManagerInterface {
   public function getActiveTrailIds($bid, $link) {
     // The tree is for a single item, so we need to match the values in its
     // p columns and 0 (the top level) with the plid values of other links.
-    $active_trail = array(0);
+    $active_trail = [0];
     for ($i = 1; $i < static::BOOK_MAX_DEPTH; $i++) {
       if (!empty($link["p$i"])) {
         $active_trail[] = $link["p$i"];
@@ -600,7 +600,7 @@ class BookManager implements BookManagerInterface {
    * @return array
    *   A fully built book tree.
    */
-  protected function bookTreeBuild($bid, array $parameters = array()) {
+  protected function bookTreeBuild($bid, array $parameters = []) {
     // Build the book tree.
     $data = $this->doBookTreeBuild($bid, $parameters);
     // Check access for the current user to each item in the tree.
@@ -639,9 +639,9 @@ class BookManager implements BookManagerInterface {
    *
    * @see \Drupal\book\BookOutlineStorageInterface::getBookMenuTree()
    */
-  protected function doBookTreeBuild($bid, array $parameters = array()) {
+  protected function doBookTreeBuild($bid, array $parameters = []) {
     // Static cache of already built menu trees.
-    $trees = &drupal_static(__METHOD__, array());
+    $trees = &drupal_static(__METHOD__, []);
     $language_interface = \Drupal::languageManager()->getCurrentLanguage();
 
     // Build the cache id; sort parents to prevent duplicate storage and remove
@@ -664,18 +664,18 @@ class BookManager implements BookManagerInterface {
       $result = $this->bookOutlineStorage->getBookMenuTree($bid, $parameters, $min_depth, static::BOOK_MAX_DEPTH);
 
       // Build an ordered array of links using the query result object.
-      $links = array();
+      $links = [];
       foreach ($result as $link) {
         $link = (array) $link;
         $links[$link['nid']] = $link;
       }
-      $active_trail = (isset($parameters['active_trail']) ? $parameters['active_trail'] : array());
+      $active_trail = (isset($parameters['active_trail']) ? $parameters['active_trail'] : []);
       $data['tree'] = $this->buildBookOutlineData($links, $active_trail, $min_depth);
-      $data['node_links'] = array();
+      $data['node_links'] = [];
       $this->bookTreeCollectNodeLinks($data['tree'], $data['node_links']);
 
       // Cache the data, if it is not already in the cache.
-      \Drupal::cache('data')->set($tree_cid, $data, Cache::PERMANENT, array('bid:' . $bid));
+      \Drupal::cache('data')->set($tree_cid, $data, Cache::PERMANENT, ['bid:' . $bid]);
       $trees[$tree_cid] = $data;
     }
 
@@ -705,7 +705,7 @@ class BookManager implements BookManagerInterface {
     if (!isset($this->bookTreeFlattened[$book_link['nid']])) {
       // Call $this->bookTreeAllData() to take advantage of caching.
       $tree = $this->bookTreeAllData($book_link['bid'], $book_link, $book_link['depth'] + 1);
-      $this->bookTreeFlattened[$book_link['nid']] = array();
+      $this->bookTreeFlattened[$book_link['nid']] = [];
       $this->flatBookTree($tree, $this->bookTreeFlattened[$book_link['nid']]);
     }
 
@@ -735,7 +735,7 @@ class BookManager implements BookManagerInterface {
    * {@inheritdoc}
    */
   public function loadBookLink($nid, $translate = TRUE) {
-    $links = $this->loadBookLinks(array($nid), $translate);
+    $links = $this->loadBookLinks([$nid], $translate);
     return isset($links[$nid]) ? $links[$nid] : FALSE;
   }
 
@@ -744,7 +744,7 @@ class BookManager implements BookManagerInterface {
    */
   public function loadBookLinks($nids, $translate = TRUE) {
     $result = $this->bookOutlineStorage->loadMultiple($nids, $translate);
-    $links = array();
+    $links = [];
     foreach ($result as $link) {
       if ($translate) {
         $this->bookLinkTranslate($link);
@@ -779,7 +779,7 @@ class BookManager implements BookManagerInterface {
         // Update the bid for this page and all children.
         if ($link['pid'] == 0) {
           $link['depth'] = 1;
-          $parent = array();
+          $parent = [];
         }
         // In case the form did not specify a proper PID we use the BID as new
         // parent.
@@ -801,11 +801,11 @@ class BookManager implements BookManagerInterface {
         $this->updateParent($link);
       }
       // Update the weight and pid.
-      $this->bookOutlineStorage->update($link['nid'], array(
+      $this->bookOutlineStorage->update($link['nid'], [
         'weight' => $link['weight'],
         'pid' => $link['pid'],
         'bid' => $link['bid'],
-      ));
+      ]);
     }
     $cache_tags = [];
     foreach ($affected_bids as $bid) {
@@ -825,16 +825,16 @@ class BookManager implements BookManagerInterface {
    */
   protected function moveChildren(array $link, array $original) {
     $p = 'p1';
-    $expressions = array();
+    $expressions = [];
     for ($i = 1; $i <= $link['depth']; $p = 'p' . ++$i) {
-      $expressions[] = array($p, ":p_$i", array(":p_$i" => $link[$p]));
+      $expressions[] = [$p, ":p_$i", [":p_$i" => $link[$p]]];
     }
     $j = $original['depth'] + 1;
     while ($i <= static::BOOK_MAX_DEPTH && $j <= static::BOOK_MAX_DEPTH) {
-      $expressions[] = array('p' . $i++, 'p' . $j++, array());
+      $expressions[] = ['p' . $i++, 'p' . $j++, []];
     }
     while ($i <= static::BOOK_MAX_DEPTH) {
-      $expressions[] = array('p' . $i++, 0, array());
+      $expressions[] = ['p' . $i++, 0, []];
     }
 
     $shift = $link['depth'] - $original['depth'];
@@ -868,7 +868,7 @@ class BookManager implements BookManagerInterface {
       // Nothing to update.
       return TRUE;
     }
-    return $this->bookOutlineStorage->update($link['pid'], array('has_children' => 1));
+    return $this->bookOutlineStorage->update($link['pid'], ['has_children' => 1]);
   }
 
   /**
@@ -897,7 +897,7 @@ class BookManager implements BookManagerInterface {
     // Update the parent. If the original link did not have children, then the
     // parent now does not have children. If the original had children, then the
     // the parent has children now (still).
-    return $this->bookOutlineStorage->update($original['pid'], array('has_children' => $parent_has_children));
+    return $this->bookOutlineStorage->update($original['pid'], ['has_children' => $parent_has_children]);
   }
 
   /**
@@ -926,7 +926,7 @@ class BookManager implements BookManagerInterface {
   /**
    * {@inheritdoc}
    */
-  public function bookTreeCheckAccess(&$tree, $node_links = array()) {
+  public function bookTreeCheckAccess(&$tree, $node_links = []) {
     if ($node_links) {
       // @todo Extract that into its own method.
       $nids = array_keys($node_links);
@@ -954,7 +954,7 @@ class BookManager implements BookManagerInterface {
    *   The book tree to operate on.
    */
   protected function doBookTreeCheckAccess(&$tree) {
-    $new_tree = array();
+    $new_tree = [];
     foreach ($tree as $key => $v) {
       $item = &$tree[$key]['link'];
       $this->bookLinkTranslate($item);
@@ -993,7 +993,7 @@ class BookManager implements BookManagerInterface {
       }
       // The node label will be the value for the current user's language.
       $link['title'] = $node->label();
-      $link['options'] = array();
+      $link['options'] = [];
     }
     return $link;
   }
@@ -1021,7 +1021,7 @@ class BookManager implements BookManagerInterface {
    *     array will be empty if the book link has no items in its sub-tree
    *     having a depth greater than or equal to $depth.
    */
-  protected function buildBookOutlineData(array $links, array $parents = array(), $depth = 1) {
+  protected function buildBookOutlineData(array $links, array $parents = [], $depth = 1) {
     // Reverse the array so we can use the more efficient array_pop() function.
     $links = array_reverse($links);
     return $this->buildBookOutlineRecursive($links, $parents, $depth);
@@ -1047,16 +1047,16 @@ class BookManager implements BookManagerInterface {
    *   Book tree.
    */
   protected function buildBookOutlineRecursive(&$links, $parents, $depth) {
-    $tree = array();
+    $tree = [];
     while ($item = array_pop($links)) {
       // We need to determine if we're on the path to root so we can later build
       // the correct active trail.
       $item['in_active_trail'] = in_array($item['nid'], $parents);
       // Add the current link to the tree.
-      $tree[$item['nid']] = array(
+      $tree[$item['nid']] = [
         'link' => $item,
-        'below' => array(),
-      );
+        'below' => [],
+      ];
       // Look ahead to the next link, but leave it on the array so it's
       // available to other recursive function calls if we return or build a
       // sub-tree.
@@ -1080,7 +1080,7 @@ class BookManager implements BookManagerInterface {
    * {@inheritdoc}
    */
   public function bookSubtreeData($link) {
-    $tree = &drupal_static(__METHOD__, array());
+    $tree = &drupal_static(__METHOD__, []);
 
     // Generate a cache ID (cid) specific for this $link.
     $cid = 'book-links:subtree-cid:' . $link['nid'];
@@ -1101,23 +1101,23 @@ class BookManager implements BookManagerInterface {
       // If the subtree data was not in the cache, $data will be NULL.
       if (!isset($data)) {
         $result = $this->bookOutlineStorage->getBookSubtree($link, static::BOOK_MAX_DEPTH);
-        $links = array();
+        $links = [];
         foreach ($result as $item) {
           $links[] = $item;
         }
-        $data['tree'] = $this->buildBookOutlineData($links, array(), $link['depth']);
-        $data['node_links'] = array();
+        $data['tree'] = $this->buildBookOutlineData($links, [], $link['depth']);
+        $data['node_links'] = [];
         $this->bookTreeCollectNodeLinks($data['tree'], $data['node_links']);
         // Compute the real cid for book subtree data.
         $tree_cid = 'book-links:subtree-data:' . hash('sha256', serialize($data));
         // Cache the data, if it is not already in the cache.
 
         if (!\Drupal::cache('data')->get($tree_cid)) {
-          \Drupal::cache('data')->set($tree_cid, $data, Cache::PERMANENT, array('bid:' . $link['bid']));
+          \Drupal::cache('data')->set($tree_cid, $data, Cache::PERMANENT, ['bid:' . $link['bid']]);
         }
         // Cache the cid of the (shared) data using the book and item-specific
         // cid.
-        \Drupal::cache('data')->set($cid, $tree_cid, Cache::PERMANENT, array('bid:' . $link['bid']));
+        \Drupal::cache('data')->set($cid, $tree_cid, Cache::PERMANENT, ['bid:' . $link['bid']]);
       }
       // Check access for the current user to each item in the tree.
       $this->bookTreeCheckAccess($data['tree'], $data['node_links']);
diff --git a/web/core/modules/book/src/BookManagerInterface.php b/web/core/modules/book/src/BookManagerInterface.php
index 70d0107c6..5402bf51d 100644
--- a/web/core/modules/book/src/BookManagerInterface.php
+++ b/web/core/modules/book/src/BookManagerInterface.php
@@ -108,7 +108,7 @@ interface BookManagerInterface {
    *   An array of (menu link ID, title) pairs for use as options for selecting
    *   a book page.
    */
-  public function getTableOfContents($bid, $depth_limit, array $exclude = array());
+  public function getTableOfContents($bid, $depth_limit, array $exclude = []);
 
   /**
    * Finds the depth limit for items in the parent select.
@@ -207,7 +207,7 @@ interface BookManagerInterface {
    */
   public function getLinkDefaults($nid);
 
-  public function getBookParents(array $item, array $parent = array());
+  public function getBookParents(array $item, array $parent = []);
 
   /**
    * Builds the common elements of the book form for the node and outline forms.
@@ -262,7 +262,7 @@ interface BookManagerInterface {
    *   A collection of node link references generated from $tree by
    *   menu_tree_collect_node_links().
    */
-  public function bookTreeCheckAccess(&$tree, $node_links = array());
+  public function bookTreeCheckAccess(&$tree, $node_links = []);
 
   /**
    * Gets the data representing a subtree of the book hierarchy.
diff --git a/web/core/modules/book/src/BookOutline.php b/web/core/modules/book/src/BookOutline.php
index bc03b7c5a..ec28d50c7 100644
--- a/web/core/modules/book/src/BookOutline.php
+++ b/web/core/modules/book/src/BookOutline.php
@@ -105,7 +105,7 @@ class BookOutline {
   public function childrenLinks(array $book_link) {
     $flat = $this->bookManager->bookTreeGetFlat($book_link);
 
-    $children = array();
+    $children = [];
 
     if ($book_link['has_children']) {
       // Walk through the array until we find the current page.
diff --git a/web/core/modules/book/src/BookOutlineStorage.php b/web/core/modules/book/src/BookOutlineStorage.php
index 92076cba3..4f61b5c00 100644
--- a/web/core/modules/book/src/BookOutlineStorage.php
+++ b/web/core/modules/book/src/BookOutlineStorage.php
@@ -43,7 +43,7 @@ class BookOutlineStorage implements BookOutlineStorageInterface {
    * {@inheritdoc}
    */
   public function loadMultiple($nids, $access = TRUE) {
-    $query = $this->connection->select('book', 'b', array('fetch' => \PDO::FETCH_ASSOC));
+    $query = $this->connection->select('book', 'b', ['fetch' => \PDO::FETCH_ASSOC]);
     $query->fields('b');
     $query->condition('b.nid', $nids, 'IN');
 
@@ -89,7 +89,7 @@ class BookOutlineStorage implements BookOutlineStorageInterface {
    */
   public function loadBookChildren($pid) {
     return $this->connection
-      ->query("SELECT * FROM {book} WHERE pid = :pid", array(':pid' => $pid))
+      ->query("SELECT * FROM {book} WHERE pid = :pid", [':pid' => $pid])
       ->fetchAllAssoc('nid', \PDO::FETCH_ASSOC);
   }
 
@@ -128,12 +128,12 @@ class BookOutlineStorage implements BookOutlineStorageInterface {
   public function insert($link, $parents) {
     return $this->connection
       ->insert('book')
-      ->fields(array(
+      ->fields([
         'nid' => $link['nid'],
         'bid' => $link['bid'],
         'pid' => $link['pid'],
         'weight' => $link['weight'],
-        ) + $parents
+        ] + $parents
       )
       ->execute();
   }
@@ -154,13 +154,13 @@ class BookOutlineStorage implements BookOutlineStorageInterface {
    */
   public function updateMovedChildren($bid, $original, $expressions, $shift) {
     $query = $this->connection->update('book');
-    $query->fields(array('bid' => $bid));
+    $query->fields(['bid' => $bid]);
 
     foreach ($expressions as $expression) {
       $query->expression($expression[0], $expression[1], $expression[2]);
     }
 
-    $query->expression('depth', 'depth + :depth', array(':depth' => $shift));
+    $query->expression('depth', 'depth + :depth', [':depth' => $shift]);
     $query->condition('bid', $original['bid']);
     $p = 'p1';
     for ($i = 1; !empty($original[$p]); $p = 'p' . ++$i) {
@@ -186,7 +186,7 @@ class BookOutlineStorage implements BookOutlineStorageInterface {
    * {@inheritdoc}
    */
   public function getBookSubtree($link, $max_depth) {
-    $query = db_select('book', 'b', array('fetch' => \PDO::FETCH_ASSOC));
+    $query = db_select('book', 'b', ['fetch' => \PDO::FETCH_ASSOC]);
     $query->fields('b');
     $query->condition('b.bid', $link['bid']);
 
diff --git a/web/core/modules/book/src/BookUninstallValidator.php b/web/core/modules/book/src/BookUninstallValidator.php
index 27add3052..181b9f2bd 100644
--- a/web/core/modules/book/src/BookUninstallValidator.php
+++ b/web/core/modules/book/src/BookUninstallValidator.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\book;
 
-use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Extension\ModuleUninstallValidatorInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
@@ -23,25 +23,25 @@ class BookUninstallValidator implements ModuleUninstallValidatorInterface {
   protected $bookOutlineStorage;
 
   /**
-   * The entity query for node.
+   * The entity type manager.
    *
-   * @var \Drupal\Core\Entity\Query\QueryInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityQuery;
+  protected $entityTypeManager;
 
   /**
    * Constructs a new BookUninstallValidator.
    *
    * @param \Drupal\book\BookOutlineStorageInterface $book_outline_storage
    *   The book outline storage.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The string translation service.
    */
-  public function __construct(BookOutlineStorageInterface $book_outline_storage, QueryFactory $query_factory, TranslationInterface $string_translation) {
+  public function __construct(BookOutlineStorageInterface $book_outline_storage, EntityTypeManagerInterface $entity_type_manager, TranslationInterface $string_translation) {
     $this->bookOutlineStorage = $book_outline_storage;
-    $this->entityQuery = $query_factory->get('node');
+    $this->entityTypeManager = $entity_type_manager;
     $this->stringTranslation = $string_translation;
   }
 
@@ -82,7 +82,7 @@ class BookUninstallValidator implements ModuleUninstallValidatorInterface {
    *   TRUE if there are book nodes, FALSE otherwise.
    */
   protected function hasBookNodes() {
-    $nodes = $this->entityQuery
+    $nodes = $this->entityTypeManager->getStorage('node')->getQuery()
       ->condition('type', 'book')
       ->accessCheck(FALSE)
       ->range(0, 1)
diff --git a/web/core/modules/book/src/Controller/BookController.php b/web/core/modules/book/src/Controller/BookController.php
index 920afeb2b..b92c3e3fc 100644
--- a/web/core/modules/book/src/Controller/BookController.php
+++ b/web/core/modules/book/src/Controller/BookController.php
@@ -73,9 +73,9 @@ class BookController extends ControllerBase {
    *   A render array representing the administrative page content.
    */
   public function adminOverview() {
-    $rows = array();
+    $rows = [];
 
-    $headers = array(t('Book'), t('Operations'));
+    $headers = [t('Book'), t('Operations')];
     // Add any recognized books to the table list.
     foreach ($this->bookManager->getAllBooks() as $book) {
       /** @var \Drupal\Core\Url $url */
@@ -83,28 +83,28 @@ class BookController extends ControllerBase {
       if (isset($book['options'])) {
         $url->setOptions($book['options']);
       }
-      $row = array(
+      $row = [
         $this->l($book['title'], $url),
-      );
-      $links = array();
-      $links['edit'] = array(
+      ];
+      $links = [];
+      $links['edit'] = [
         'title' => t('Edit order and titles'),
         'url' => Url::fromRoute('book.admin_edit', ['node' => $book['nid']]),
-      );
-      $row[] = array(
-        'data' => array(
+      ];
+      $row[] = [
+        'data' => [
           '#type' => 'operations',
           '#links' => $links,
-        ),
-      );
+        ],
+      ];
       $rows[] = $row;
     }
-    return array(
+    return [
       '#type' => 'table',
       '#header' => $headers,
       '#rows' => $rows,
       '#empty' => t('No books available.'),
-    );
+    ];
   }
 
   /**
@@ -114,17 +114,17 @@ class BookController extends ControllerBase {
    *   A render array representing the listing of all books content.
    */
   public function bookRender() {
-    $book_list = array();
+    $book_list = [];
     foreach ($this->bookManager->getAllBooks() as $book) {
       $book_list[] = $this->l($book['title'], $book['url']);
     }
-    return array(
+    return [
       '#theme' => 'item_list',
       '#items' => $book_list,
       '#cache' => [
         'tags' => \Drupal::entityManager()->getDefinition('node')->getListCacheTags(),
       ],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/book/src/Form/BookAdminEditForm.php b/web/core/modules/book/src/Form/BookAdminEditForm.php
index 175394422..e91f52ea8 100644
--- a/web/core/modules/book/src/Form/BookAdminEditForm.php
+++ b/web/core/modules/book/src/Form/BookAdminEditForm.php
@@ -70,10 +70,10 @@ class BookAdminEditForm extends FormBase {
     $form['#title'] = $node->label();
     $form['#node'] = $node;
     $this->bookAdminTable($node, $form);
-    $form['save'] = array(
+    $form['save'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save book pages'),
-    );
+    ];
 
     return $form;
   }
@@ -101,7 +101,7 @@ class BookAdminEditForm extends FormBase {
       foreach (Element::children($form['table']) as $key) {
         if ($form['table'][$key]['#item']) {
           $row = $form['table'][$key];
-          $values = $form_state->getValue(array('table', $key));
+          $values = $form_state->getValue(['table', $key]);
 
           // Update menu item if moved.
           if ($row['parent']['pid']['#default_value'] != $values['pid'] || $row['weight']['#default_value'] != $values['weight']) {
@@ -114,18 +114,18 @@ class BookAdminEditForm extends FormBase {
           // Update the title if changed.
           if ($row['title']['#default_value'] != $values['title']) {
             $node = $this->nodeStorage->load($values['nid']);
-            $node->revision_log = $this->t('Title changed from %original to %current.', array('%original' => $node->label(), '%current' => $values['title']));
+            $node->revision_log = $this->t('Title changed from %original to %current.', ['%original' => $node->label(), '%current' => $values['title']]);
             $node->title = $values['title'];
             $node->book['link_title'] = $values['title'];
             $node->setNewRevision();
             $node->save();
-            $this->logger('content')->notice('book: updated %title.', array('%title' => $node->label(), 'link' => $node->link($this->t('View'))));
+            $this->logger('content')->notice('book: updated %title.', ['%title' => $node->label(), 'link' => $node->link($this->t('View'))]);
           }
         }
       }
     }
 
-    drupal_set_message($this->t('Updated book %title.', array('%title' => $form['#node']->label())));
+    drupal_set_message($this->t('Updated book %title.', ['%title' => $form['#node']->label()]));
   }
 
   /**
@@ -139,7 +139,7 @@ class BookAdminEditForm extends FormBase {
    * @see self::buildForm()
    */
   protected function bookAdminTable(NodeInterface $node, array &$form) {
-    $form['table'] = array(
+    $form['table'] = [
       '#type' => 'table',
       '#header' => [
         $this->t('Title'),
@@ -164,7 +164,7 @@ class BookAdminEditForm extends FormBase {
           'group' => 'book-weight',
         ],
       ],
-    );
+    ];
 
     $tree = $this->bookManager->bookSubtreeData($node->book);
     // Do not include the book item itself.
@@ -173,14 +173,14 @@ class BookAdminEditForm extends FormBase {
       $hash = Crypt::hashBase64(serialize($tree['below']));
       // Store the hash value as a hidden form element so that we can detect
       // if another user changed the book hierarchy.
-      $form['tree_hash'] = array(
+      $form['tree_hash'] = [
         '#type' => 'hidden',
         '#default_value' => $hash,
-      );
-      $form['tree_current_hash'] = array(
+      ];
+      $form['tree_current_hash'] = [
         '#type' => 'value',
         '#value' => $hash,
-      );
+      ];
       $this->bookAdminTableTree($tree['below'], $form['table']);
     }
   }
diff --git a/web/core/modules/book/src/Form/BookOutlineForm.php b/web/core/modules/book/src/Form/BookOutlineForm.php
index e304a2b1d..1d63aacf0 100644
--- a/web/core/modules/book/src/Form/BookOutlineForm.php
+++ b/web/core/modules/book/src/Form/BookOutlineForm.php
@@ -3,8 +3,10 @@
 namespace Drupal\book\Form;
 
 use Drupal\book\BookManagerInterface;
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -35,9 +37,13 @@ class BookOutlineForm extends ContentEntityForm {
    *   The entity manager.
    * @param \Drupal\book\BookManagerInterface $book_manager
    *   The BookManager service.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle service.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, BookManagerInterface $book_manager) {
-    parent::__construct($entity_manager);
+  public function __construct(EntityManagerInterface $entity_manager, BookManagerInterface $book_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
+    parent::__construct($entity_manager, $entity_type_bundle_info, $time);
     $this->bookManager = $book_manager;
   }
 
@@ -47,7 +53,9 @@ class BookOutlineForm extends ContentEntityForm {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('entity.manager'),
-      $container->get('book.manager')
+      $container->get('book.manager'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time')
     );
   }
 
@@ -99,7 +107,7 @@ class BookOutlineForm extends ContentEntityForm {
   public function save(array $form, FormStateInterface $form_state) {
     $form_state->setRedirect(
       'entity.node.canonical',
-      array('node' => $this->entity->id())
+      ['node' => $this->entity->id()]
     );
     $book_link = $form_state->getValue('book');
     if (!$book_link['bid']) {
diff --git a/web/core/modules/book/src/Form/BookRemoveForm.php b/web/core/modules/book/src/Form/BookRemoveForm.php
index 4848fa294..e31c0940e 100644
--- a/web/core/modules/book/src/Form/BookRemoveForm.php
+++ b/web/core/modules/book/src/Form/BookRemoveForm.php
@@ -65,7 +65,7 @@ class BookRemoveForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getDescription() {
-    $title = array('%title' => $this->node->label());
+    $title = ['%title' => $this->node->label()];
     if ($this->node->book['has_children']) {
       return $this->t('%title has associated child pages, which will be relocated automatically to maintain their connection to the book. To recreate the hierarchy (as it was before removing this page), %title may be added again using the Outline tab, and each of its former child pages will need to be relocated manually.', $title);
     }
@@ -85,7 +85,7 @@ class BookRemoveForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to remove %title from the book hierarchy?', array('%title' => $this->node->label()));
+    return $this->t('Are you sure you want to remove %title from the book hierarchy?', ['%title' => $this->node->label()]);
   }
 
   /**
diff --git a/web/core/modules/book/src/Form/BookSettingsForm.php b/web/core/modules/book/src/Form/BookSettingsForm.php
index 058d0cd06..29590ccdb 100644
--- a/web/core/modules/book/src/Form/BookSettingsForm.php
+++ b/web/core/modules/book/src/Form/BookSettingsForm.php
@@ -30,22 +30,22 @@ class BookSettingsForm extends ConfigFormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $types = node_type_get_names();
     $config = $this->config('book.settings');
-    $form['book_allowed_types'] = array(
+    $form['book_allowed_types'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Content types allowed in book outlines'),
       '#default_value' => $config->get('allowed_types'),
       '#options' => $types,
-      '#description' => $this->t('Users with the %outline-perm permission can add all content types.', array('%outline-perm' => $this->t('Administer book outlines'))),
+      '#description' => $this->t('Users with the %outline-perm permission can add all content types.', ['%outline-perm' => $this->t('Administer book outlines')]),
       '#required' => TRUE,
-    );
-    $form['book_child_type'] = array(
+    ];
+    $form['book_child_type'] = [
       '#type' => 'radios',
       '#title' => $this->t('Content type for the <em>Add child page</em> link'),
       '#default_value' => $config->get('child_type'),
       '#options' => $types,
       '#required' => TRUE,
-    );
-    $form['array_filter'] = array('#type' => 'value', '#value' => TRUE);
+    ];
+    $form['array_filter'] = ['#type' => 'value', '#value' => TRUE];
 
     return parent::buildForm($form, $form_state);
   }
@@ -55,8 +55,8 @@ class BookSettingsForm extends ConfigFormBase {
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
     $child_type = $form_state->getValue('book_child_type');
-    if ($form_state->isValueEmpty(array('book_allowed_types', $child_type))) {
-      $form_state->setErrorByName('book_child_type', $this->t('The content type for the %add-child link must be one of those selected as an allowed book outline type.', array('%add-child' => $this->t('Add child page'))));
+    if ($form_state->isValueEmpty(['book_allowed_types', $child_type])) {
+      $form_state->setErrorByName('book_child_type', $this->t('The content type for the %add-child link must be one of those selected as an allowed book outline type.', ['%add-child' => $this->t('Add child page')]));
     }
 
     parent::validateForm($form, $form_state);
diff --git a/web/core/modules/book/src/Plugin/Block/BookNavigationBlock.php b/web/core/modules/book/src/Plugin/Block/BookNavigationBlock.php
index 6967077f3..e55fe3652 100644
--- a/web/core/modules/book/src/Plugin/Block/BookNavigationBlock.php
+++ b/web/core/modules/book/src/Plugin/Block/BookNavigationBlock.php
@@ -7,6 +7,7 @@ use Drupal\book\BookManagerInterface;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\node\NodeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -85,26 +86,26 @@ class BookNavigationBlock extends BlockBase implements ContainerFactoryPluginInt
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'block_mode' => "all pages",
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  function blockForm($form, FormStateInterface $form_state) {
-    $options = array(
+  public function blockForm($form, FormStateInterface $form_state) {
+    $options = [
       'all pages' => $this->t('Show block on all pages'),
       'book pages' => $this->t('Show block only on book pages'),
-    );
-    $form['book_block_mode'] = array(
+    ];
+    $form['book_block_mode'] = [
       '#type' => 'radios',
       '#title' => $this->t('Book navigation block display'),
       '#options' => $options,
       '#default_value' => $this->configuration['block_mode'],
       '#description' => $this->t("If <em>Show block on all pages</em> is selected, the block will contain the automatically generated menus for all of the site's books. If <em>Show block only on book pages</em> is selected, the block will contain only the one menu corresponding to the current page's book. In this case, if the current page is not in a book, no block will be displayed. The <em>Page specific visibility settings</em> or other visibility settings can be used in addition to selectively display this block."),
-      );
+      ];
 
     return $form;
   }
@@ -126,8 +127,8 @@ class BookNavigationBlock extends BlockBase implements ContainerFactoryPluginInt
       $current_bid = empty($node->book['bid']) ? 0 : $node->book['bid'];
     }
     if ($this->configuration['block_mode'] == 'all pages') {
-      $book_menus = array();
-      $pseudo_tree = array(0 => array('below' => FALSE));
+      $book_menus = [];
+      $pseudo_tree = [0 => ['below' => FALSE]];
       foreach ($this->bookManager->getAllBooks() as $book_id => $book) {
         if ($book['bid'] == $current_bid) {
           // If the current page is a node associated with a book, the menu
@@ -145,14 +146,14 @@ class BookNavigationBlock extends BlockBase implements ContainerFactoryPluginInt
           $pseudo_tree[0]['link'] = $book;
           $book_menus[$book_id] = $this->bookManager->bookTreeOutput($pseudo_tree);
         }
-        $book_menus[$book_id] += array(
+        $book_menus[$book_id] += [
           '#book_title' => $book['title'],
-        );
+        ];
       }
       if ($book_menus) {
-        return array(
+        return [
           '#theme' => 'book_all_books_block',
-        ) + $book_menus;
+        ] + $book_menus;
       }
     }
     elseif ($current_bid) {
@@ -160,7 +161,7 @@ class BookNavigationBlock extends BlockBase implements ContainerFactoryPluginInt
       // not show unpublished books.
       $nid = \Drupal::entityQuery('node')
         ->condition('nid', $node->book['bid'], '=')
-        ->condition('status', NODE_PUBLISHED)
+        ->condition('status', NodeInterface::PUBLISHED)
         ->execute();
 
       // Only show the block if the user has view access for the top-level node.
@@ -174,7 +175,7 @@ class BookNavigationBlock extends BlockBase implements ContainerFactoryPluginInt
         }
       }
     }
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/book/src/Plugin/migrate/source/d6/Book.php b/web/core/modules/book/src/Plugin/migrate/source/d6/Book.php
index 76833aa75..f41bb42df 100644
--- a/web/core/modules/book/src/Plugin/migrate/source/d6/Book.php
+++ b/web/core/modules/book/src/Plugin/migrate/source/d6/Book.php
@@ -17,9 +17,9 @@ class Book extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function query() {
-    $query = $this->select('book', 'b')->fields('b', array('nid', 'bid'));
+    $query = $this->select('book', 'b')->fields('b', ['nid', 'bid']);
     $query->join('menu_links', 'ml', 'b.mlid = ml.mlid');
-    $ml_fields = array('mlid', 'plid', 'weight', 'has_children', 'depth');
+    $ml_fields = ['mlid', 'plid', 'weight', 'has_children', 'depth'];
     for ($i = 1; $i <= 9; $i++) {
       $field = "p$i";
       $ml_fields[] = $field;
@@ -42,7 +42,7 @@ class Book extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'nid' => $this->t('Node ID'),
       'bid' => $this->t('Book ID'),
       'mlid' => $this->t('Menu link ID'),
@@ -57,7 +57,7 @@ class Book extends DrupalSqlBase {
       'p7' => $this->t('The seventh mlid in the materialized path. See p1.'),
       'p8' => $this->t('The eighth mlid in the materialized path. See p1.'),
       'p9' => $this->t('The ninth mlid in the materialized path. See p1.'),
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/book/src/Tests/Views/BookRelationshipTest.php b/web/core/modules/book/src/Tests/Views/BookRelationshipTest.php
index 2302e8b04..c1f872803 100644
--- a/web/core/modules/book/src/Tests/Views/BookRelationshipTest.php
+++ b/web/core/modules/book/src/Tests/Views/BookRelationshipTest.php
@@ -19,14 +19,14 @@ class BookRelationshipTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_book_view');
+  public static $testViews = ['test_book_view'];
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('book_test_views', 'book', 'views');
+  public static $modules = ['book_test_views', 'book', 'views'];
 
   /**
    * A book node.
@@ -50,14 +50,14 @@ class BookRelationshipTest extends ViewTestBase {
 
     // Create users.
     $this->bookAuthor = $this->drupalCreateUser(
-      array(
+      [
         'create new books',
         'create book content',
         'edit own book content',
         'add content to books',
-      )
+      ]
     );
-    ViewTestData::createTestViews(get_class($this), array('book_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['book_test_views']);
   }
 
   /**
@@ -70,7 +70,7 @@ class BookRelationshipTest extends ViewTestBase {
     $this->book = $this->createBookNode('new');
     $book = $this->book;
 
-    $nodes = array();
+    $nodes = [];
     // Node 0.
     $nodes[] = $this->createBookNode($book->id());
     // Node 1.
@@ -110,7 +110,7 @@ class BookRelationshipTest extends ViewTestBase {
     // Used to ensure that when sorted nodes stay in same order.
     static $number = 0;
 
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $number . ' - SimpleTest test node ' . $this->randomMachineName(10);
     $edit['body[0][value]'] = 'SimpleTest test body ' . $this->randomMachineName(32) . ' ' . $this->randomMachineName(32);
     $edit['book[bid]'] = $book_nid;
diff --git a/web/core/modules/book/src/Tests/BookBreadcrumbTest.php b/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
similarity index 85%
rename from web/core/modules/book/src/Tests/BookBreadcrumbTest.php
rename to web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
index 57e1b3d6c..a863ff152 100644
--- a/web/core/modules/book/src/Tests/BookBreadcrumbTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\book\Tests;
+namespace Drupal\Tests\book\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Create a book, add pages, and test book interface.
  *
  * @group book
  */
-class BookBreadcrumbTest extends WebTestBase {
+class BookBreadcrumbTest extends BrowserTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('book', 'block', 'book_breadcrumb_test');
+  public static $modules = ['book', 'block', 'book_breadcrumb_test'];
 
   /**
    * A book node.
@@ -48,8 +48,8 @@ class BookBreadcrumbTest extends WebTestBase {
     $this->drupalPlaceBlock('page_title_block');
 
     // Create users.
-    $this->bookAuthor = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books'));
-    $this->adminUser = $this->drupalCreateUser(array('create new books', 'create book content', 'edit any book content', 'delete any book content', 'add content to books', 'administer blocks', 'administer permissions', 'administer book outlines', 'administer content types', 'administer site configuration'));
+    $this->bookAuthor = $this->drupalCreateUser(['create new books', 'create book content', 'edit own book content', 'add content to books']);
+    $this->adminUser = $this->drupalCreateUser(['create new books', 'create book content', 'edit any book content', 'delete any book content', 'add content to books', 'administer blocks', 'administer permissions', 'administer book outlines', 'administer content types', 'administer site configuration']);
   }
 
   /**
@@ -76,7 +76,7 @@ class BookBreadcrumbTest extends WebTestBase {
      *      |- Node 5
      *  |- Node 6
      */
-    $nodes = array();
+    $nodes = [];
     $nodes[0] = $this->createBookNode($book->id());
     $nodes[1] = $this->createBookNode($book->id(), $nodes[0]->id());
     $nodes[2] = $this->createBookNode($book->id(), $nodes[0]->id());
@@ -107,7 +107,7 @@ class BookBreadcrumbTest extends WebTestBase {
     // that when sorted nodes stay in same order.
     static $number = 0;
 
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = str_pad($number, 2, '0', STR_PAD_LEFT) . ' - SimpleTest test node ' . $this->randomMachineName(10);
     $edit['body[0][value]'] = 'SimpleTest test body ' . $this->randomMachineName(32) . ' ' . $this->randomMachineName(32);
     $edit['book[bid]'] = $book_nid;
@@ -146,9 +146,9 @@ class BookBreadcrumbTest extends WebTestBase {
     $this->drupalGet($nodes[4]->toUrl());
     // Fetch each node title in the current breadcrumb.
     $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
-    $got_breadcrumb = array();
+    $got_breadcrumb = [];
     foreach ($links as $link) {
-      $got_breadcrumb[] = (string) $link;
+      $got_breadcrumb[] = $link->getText();
     }
     // Home link and four parent book nodes should be in the breadcrumb.
     $this->assertEqual(5, count($got_breadcrumb));
@@ -160,9 +160,9 @@ class BookBreadcrumbTest extends WebTestBase {
     $this->drupalGet($nodes[4]->toUrl());
     // Fetch each node title in the current breadcrumb.
     $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
-    $got_breadcrumb = array();
+    $got_breadcrumb = [];
     foreach ($links as $link) {
-      $got_breadcrumb[] = (string) $link;
+      $got_breadcrumb[] = $link->getText();
     }
     $this->assertEqual(5, count($got_breadcrumb));
     $this->assertEqual($edit['title[0][value]'], end($got_breadcrumb));
@@ -181,9 +181,9 @@ class BookBreadcrumbTest extends WebTestBase {
     $this->drupalPostForm($nodes[3]->toUrl('edit-form'), $edit, 'Save');
     $this->drupalGet($nodes[4]->toUrl());
     $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
-    $got_breadcrumb = array();
+    $got_breadcrumb = [];
     foreach ($links as $link) {
-      $got_breadcrumb[] = (string) $link;
+      $got_breadcrumb[] = $link->getText();
     }
     $this->assertEqual(5, count($got_breadcrumb));
     $this->assertEqual($edit['title[0][value]'], end($got_breadcrumb));
@@ -191,9 +191,9 @@ class BookBreadcrumbTest extends WebTestBase {
     $config->set('hide', TRUE)->save();
     $this->drupalGet($nodes[4]->toUrl());
     $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
-    $got_breadcrumb = array();
+    $got_breadcrumb = [];
     foreach ($links as $link) {
-      $got_breadcrumb[] = (string) $link;
+      $got_breadcrumb[] = $link->getText();
     }
     $this->assertEqual(4, count($got_breadcrumb));
     $this->assertEqual($nodes[2]->getTitle(), end($got_breadcrumb));
diff --git a/web/core/modules/book/tests/src/Functional/BookInstallTest.php b/web/core/modules/book/tests/src/Functional/BookInstallTest.php
new file mode 100644
index 000000000..b5658bdc7
--- /dev/null
+++ b/web/core/modules/book/tests/src/Functional/BookInstallTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\Tests\book\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Core\Config\PreExistingConfigException;
+
+/**
+ * Test installation of Book module.
+ *
+ * @group book
+ */
+class BookInstallTest extends BrowserTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = ['node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+  }
+
+  /**
+   * Test Book install with pre-existing content type.
+   *
+   * Tests that Book module can be installed if content type with machine name
+   * 'book' already exists.
+   */
+  public function testBookInstallWithPreexistingContentType() {
+    // Create a 'book' content type.
+    $this->drupalCreateContentType(['type' => 'book']);
+
+    // Install the Book module.
+    try {
+      $this->container->get('module_installer')->install(['book']);
+    }
+    catch (PreExistingConfigException $e) {
+      $this->fail("Expected exception thrown trying to install Book module: " . $e->getMessage());
+    }
+  }
+
+}
diff --git a/web/core/modules/book/src/Tests/BookTest.php b/web/core/modules/book/tests/src/Functional/BookTest.php
similarity index 86%
rename from web/core/modules/book/src/Tests/BookTest.php
rename to web/core/modules/book/tests/src/Functional/BookTest.php
index cdd61c60a..66edec91e 100644
--- a/web/core/modules/book/src/Tests/BookTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\book\Tests;
+namespace Drupal\Tests\book\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -13,14 +13,14 @@ use Drupal\user\RoleInterface;
  *
  * @group book
  */
-class BookTest extends WebTestBase {
+class BookTest extends BrowserTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('book', 'block', 'node_access_test', 'book_test');
+  public static $modules = ['book', 'block', 'node_access_test', 'book_test'];
 
   /**
    * A book node.
@@ -69,10 +69,10 @@ class BookTest extends WebTestBase {
     node_access_rebuild();
 
     // Create users.
-    $this->bookAuthor = $this->drupalCreateUser(array('create new books', 'create book content', 'edit own book content', 'add content to books'));
-    $this->webUser = $this->drupalCreateUser(array('access printer-friendly version', 'node test view'));
-    $this->webUserWithoutNodeAccess = $this->drupalCreateUser(array('access printer-friendly version'));
-    $this->adminUser = $this->drupalCreateUser(array('create new books', 'create book content', 'edit any book content', 'delete any book content', 'add content to books', 'administer blocks', 'administer permissions', 'administer book outlines', 'node test view', 'administer content types', 'administer site configuration'));
+    $this->bookAuthor = $this->drupalCreateUser(['create new books', 'create book content', 'edit own book content', 'add content to books']);
+    $this->webUser = $this->drupalCreateUser(['access printer-friendly version', 'node test view']);
+    $this->webUserWithoutNodeAccess = $this->drupalCreateUser(['access printer-friendly version']);
+    $this->adminUser = $this->drupalCreateUser(['create new books', 'create book content', 'edit any book content', 'delete any book content', 'add content to books', 'administer blocks', 'administer permissions', 'administer book outlines', 'node test view', 'administer content types', 'administer site configuration']);
   }
 
   /**
@@ -80,7 +80,7 @@ class BookTest extends WebTestBase {
    *
    * @return \Drupal\node\NodeInterface[]
    */
-  function createBook() {
+  public function createBook() {
     // Create new book.
     $this->drupalLogin($this->bookAuthor);
 
@@ -96,7 +96,7 @@ class BookTest extends WebTestBase {
      *  |- Node 3
      *  |- Node 4
      */
-    $nodes = array();
+    $nodes = [];
     $nodes[] = $this->createBookNode($book->id()); // Node 0.
     $nodes[] = $this->createBookNode($book->id(), $nodes[0]->book['nid']); // Node 1.
     $nodes[] = $this->createBookNode($book->id(), $nodes[0]->book['nid']); // Node 2.
@@ -151,7 +151,7 @@ class BookTest extends WebTestBase {
   /**
    * Tests saving the book outline on an empty book.
    */
-  function testEmptyBook() {
+  public function testEmptyBook() {
     // Create a new empty book.
     $this->drupalLogin($this->bookAuthor);
     $book = $this->createBookNode('new');
@@ -159,14 +159,14 @@ class BookTest extends WebTestBase {
 
     // Log in as a user with access to the book outline and save the form.
     $this->drupalLogin($this->adminUser);
-    $this->drupalPostForm('admin/structure/book/' . $book->id(), array(), t('Save book pages'));
-    $this->assertText(t('Updated book @book.', array('@book' => $book->label())));
+    $this->drupalPostForm('admin/structure/book/' . $book->id(), [], t('Save book pages'));
+    $this->assertText(t('Updated book @book.', ['@book' => $book->label()]));
   }
 
   /**
    * Tests book functionality through node interfaces.
    */
-  function testBook() {
+  public function testBook() {
     // Create new book.
     $nodes = $this->createBook();
     $book = $this->book;
@@ -175,12 +175,12 @@ class BookTest extends WebTestBase {
 
     // Check that book pages display along with the correct outlines and
     // previous/next links.
-    $this->checkBookNode($book, array($nodes[0], $nodes[3], $nodes[4]), FALSE, FALSE, $nodes[0], array());
-    $this->checkBookNode($nodes[0], array($nodes[1], $nodes[2]), $book, $book, $nodes[1], array($book));
-    $this->checkBookNode($nodes[1], NULL, $nodes[0], $nodes[0], $nodes[2], array($book, $nodes[0]));
-    $this->checkBookNode($nodes[2], NULL, $nodes[1], $nodes[0], $nodes[3], array($book, $nodes[0]));
-    $this->checkBookNode($nodes[3], NULL, $nodes[2], $book, $nodes[4], array($book));
-    $this->checkBookNode($nodes[4], NULL, $nodes[3], $book, FALSE, array($book));
+    $this->checkBookNode($book, [$nodes[0], $nodes[3], $nodes[4]], FALSE, FALSE, $nodes[0], []);
+    $this->checkBookNode($nodes[0], [$nodes[1], $nodes[2]], $book, $book, $nodes[1], [$book]);
+    $this->checkBookNode($nodes[1], NULL, $nodes[0], $nodes[0], $nodes[2], [$book, $nodes[0]]);
+    $this->checkBookNode($nodes[2], NULL, $nodes[1], $nodes[0], $nodes[3], [$book, $nodes[0]]);
+    $this->checkBookNode($nodes[3], NULL, $nodes[2], $book, $nodes[4], [$book]);
+    $this->checkBookNode($nodes[4], NULL, $nodes[3], $book, FALSE, [$book]);
 
     $this->drupalLogout();
     $this->drupalLogin($this->bookAuthor);
@@ -203,14 +203,14 @@ class BookTest extends WebTestBase {
     $this->drupalLogout();
     $this->drupalLogin($this->webUser);
     // Verify the new outline - make sure we don't get stale cached data.
-    $this->checkBookNode($nodes[3], array($nodes[5]), $nodes[2], $book, $nodes[5], array($book));
-    $this->checkBookNode($nodes[4], NULL, $nodes[5], $book, FALSE, array($book));
+    $this->checkBookNode($nodes[3], [$nodes[5]], $nodes[2], $book, $nodes[5], [$book]);
+    $this->checkBookNode($nodes[4], NULL, $nodes[5], $book, FALSE, [$book]);
     $this->drupalLogout();
     // Create a second book, and move an existing book page into it.
     $this->drupalLogin($this->bookAuthor);
     $other_book = $this->createBookNode('new');
     $node = $this->createBookNode($book->id());
-    $edit = array('book[bid]' => $other_book->id());
+    $edit = ['book[bid]' => $other_book->id()];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
 
     $this->drupalLogout();
@@ -220,8 +220,8 @@ class BookTest extends WebTestBase {
     // First we must set $this->book to the second book, so that the
     // correct regex will be generated for testing the outline.
     $this->book = $other_book;
-    $this->checkBookNode($other_book, array($node), FALSE, FALSE, $node, array());
-    $this->checkBookNode($node, NULL, $other_book, $other_book, FALSE, array($other_book));
+    $this->checkBookNode($other_book, [$node], FALSE, FALSE, $node, []);
+    $this->checkBookNode($node, NULL, $other_book, $other_book, FALSE, [$other_book]);
 
     // Test that we can save a book programatically.
     $this->drupalLogin($this->bookAuthor);
@@ -247,7 +247,7 @@ class BookTest extends WebTestBase {
    * @param array $breadcrumb
    *   The nodes that should be displayed in the breadcrumb.
    */
-  function checkBookNode(EntityInterface $node, $nodes, $previous = FALSE, $up = FALSE, $next = FALSE, array $breadcrumb) {
+  public function checkBookNode(EntityInterface $node, $nodes, $previous = FALSE, $up = FALSE, $next = FALSE, array $breadcrumb) {
     // $number does not use drupal_static as it should not be reset
     // since it uniquely identifies each call to checkBookNode().
     static $number = 0;
@@ -255,38 +255,38 @@ class BookTest extends WebTestBase {
 
     // Check outline structure.
     if ($nodes !== NULL) {
-      $this->assertPattern($this->generateOutlinePattern($nodes), format_string('Node @number outline confirmed.', array('@number' => $number)));
+      $this->assertPattern($this->generateOutlinePattern($nodes), format_string('Node @number outline confirmed.', ['@number' => $number]));
     }
     else {
-      $this->pass(format_string('Node %number does not have outline.', array('%number' => $number)));
+      $this->pass(format_string('Node %number does not have outline.', ['%number' => $number]));
     }
 
     // Check previous, up, and next links.
     if ($previous) {
       /** @var \Drupal\Core\Url $url */
       $url = $previous->urlInfo();
-      $url->setOptions(array('attributes' => array('rel' => array('prev'), 'title' => t('Go to previous page'))));
-      $text = SafeMarkup::format('<b>‹</b> @label', array('@label' => $previous->label()));
+      $url->setOptions(['attributes' => ['rel' => ['prev'], 'title' => t('Go to previous page')]]);
+      $text = SafeMarkup::format('<b>‹</b> @label', ['@label' => $previous->label()]);
       $this->assertRaw(\Drupal::l($text, $url), 'Previous page link found.');
     }
 
     if ($up) {
       /** @var \Drupal\Core\Url $url */
       $url = $up->urlInfo();
-      $url->setOptions(array('attributes' => array('title' => t('Go to parent page'))));
+      $url->setOptions(['attributes' => ['title' => t('Go to parent page')]]);
       $this->assertRaw(\Drupal::l('Up', $url), 'Up page link found.');
     }
 
     if ($next) {
       /** @var \Drupal\Core\Url $url */
       $url = $next->urlInfo();
-      $url->setOptions(array('attributes' => array('rel' => array('next'), 'title' => t('Go to next page'))));
-      $text = SafeMarkup::format('@label <b>›</b>', array('@label' => $next->label()));
+      $url->setOptions(['attributes' => ['rel' => ['next'], 'title' => t('Go to next page')]]);
+      $text = SafeMarkup::format('@label <b>›</b>', ['@label' => $next->label()]);
       $this->assertRaw(\Drupal::l($text, $url), 'Next page link found.');
     }
 
     // Compute the expected breadcrumb.
-    $expected_breadcrumb = array();
+    $expected_breadcrumb = [];
     $expected_breadcrumb[] = \Drupal::url('<front>');
     foreach ($breadcrumb as $a_node) {
       $expected_breadcrumb[] = $a_node->url();
@@ -294,9 +294,9 @@ class BookTest extends WebTestBase {
 
     // Fetch links in the current breadcrumb.
     $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
-    $got_breadcrumb = array();
+    $got_breadcrumb = [];
     foreach ($links as $link) {
-      $got_breadcrumb[] = (string) $link['href'];
+      $got_breadcrumb[] = $link->getAttribute('href');
     }
 
     // Compare expected and got breadcrumbs.
@@ -319,7 +319,7 @@ class BookTest extends WebTestBase {
    * @return string
    *   A regular expression that locates sub-nodes of the outline.
    */
-  function generateOutlinePattern($nodes) {
+  public function generateOutlinePattern($nodes) {
     $outline = '';
     foreach ($nodes as $node) {
       $outline .= '(node\/' . $node->id() . ')(.*?)(' . $node->label() . ')(.*?)';
@@ -339,12 +339,12 @@ class BookTest extends WebTestBase {
    * @return \Drupal\node\NodeInterface
    *   The created node.
    */
-  function createBookNode($book_nid, $parent = NULL) {
+  public function createBookNode($book_nid, $parent = NULL) {
     // $number does not use drupal_static as it should not be reset
     // since it uniquely identifies each call to createBookNode().
     static $number = 0; // Used to ensure that when sorted nodes stay in same order.
 
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = str_pad($number, 2, '0', STR_PAD_LEFT) . ' - SimpleTest test node ' . $this->randomMachineName(10);
     $edit['body[0][value]'] = 'SimpleTest test body ' . $this->randomMachineName(32) . ' ' . $this->randomMachineName(32);
     $edit['book[bid]'] = $book_nid;
@@ -373,7 +373,7 @@ class BookTest extends WebTestBase {
   /**
    * Tests book export ("printer-friendly version") functionality.
    */
-  function testBookExport() {
+  public function testBookExport() {
     // Create a book.
     $nodes = $this->createBook();
 
@@ -410,7 +410,7 @@ class BookTest extends WebTestBase {
     // Now grant anonymous users permission to view the printer-friendly
     // version and verify that node access restrictions still prevent them from
     // seeing it.
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access printer-friendly version'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access printer-friendly version']);
     $this->drupalGet('book/export/html/' . $this->book->id());
     $this->assertResponse('403', 'Anonymous user properly forbidden from seeing the printer-friendly version when denied by node access.');
   }
@@ -418,14 +418,14 @@ class BookTest extends WebTestBase {
   /**
    * Tests the functionality of the book navigation block.
    */
-  function testBookNavigationBlock() {
+  public function testBookNavigationBlock() {
     $this->drupalLogin($this->adminUser);
 
     // Enable the block.
     $block = $this->drupalPlaceBlock('book_navigation');
 
     // Give anonymous users the permission 'node test view'.
-    $edit = array();
+    $edit = [];
     $edit[RoleInterface::ANONYMOUS_ID . '[node test view]'] = TRUE;
     $this->drupalPostForm('admin/people/permissions/' . RoleInterface::ANONYMOUS_ID, $edit, t('Save permissions'));
     $this->assertText(t('The changes have been saved.'), "Permission 'node test view' successfully assigned to anonymous users.");
@@ -434,7 +434,7 @@ class BookTest extends WebTestBase {
     $nodes = $this->createBook();
     $this->drupalGet('<front>');
     $this->assertText($block->label(), 'Book navigation block is displayed.');
-    $this->assertText($this->book->label(), format_string('Link to book root (@title) is displayed.', array('@title' => $nodes[0]->label())));
+    $this->assertText($this->book->label(), format_string('Link to book root (@title) is displayed.', ['@title' => $nodes[0]->label()]));
     $this->assertNoText($nodes[0]->label(), 'No links to individual book pages are displayed.');
   }
 
@@ -485,8 +485,8 @@ class BookTest extends WebTestBase {
     $diff = array_diff($expected_nids, array_keys($options));
     $this->assertTrue(empty($diff), 'Found all expected option keys');
     // Exclude Node 3.
-    $options = $manager->getTableOfContents($book->id(), 3, array($nodes[3]->id()));
-    $expected_nids = array($book->id(), $nodes[0]->id(), $nodes[1]->id(), $nodes[2]->id(), $nodes[4]->id());
+    $options = $manager->getTableOfContents($book->id(), 3, [$nodes[3]->id()]);
+    $expected_nids = [$book->id(), $nodes[0]->id(), $nodes[1]->id(), $nodes[2]->id(), $nodes[4]->id()];
     $this->assertEqual(count($options), count($expected_nids));
     $diff = array_diff($expected_nids, array_keys($options));
     $this->assertTrue(empty($diff), 'Found all expected option keys after excluding Node 3');
@@ -495,12 +495,12 @@ class BookTest extends WebTestBase {
   /**
    * Tests the book navigation block when an access module is installed.
    */
-  function testNavigationBlockOnAccessModuleInstalled() {
+  public function testNavigationBlockOnAccessModuleInstalled() {
     $this->drupalLogin($this->adminUser);
-    $block = $this->drupalPlaceBlock('book_navigation', array('block_mode' => 'book pages'));
+    $block = $this->drupalPlaceBlock('book_navigation', ['block_mode' => 'book pages']);
 
     // Give anonymous users the permission 'node test view'.
-    $edit = array();
+    $edit = [];
     $edit[RoleInterface::ANONYMOUS_ID . '[node test view]'] = TRUE;
     $this->drupalPostForm('admin/people/permissions/' . RoleInterface::ANONYMOUS_ID, $edit, t('Save permissions'));
     $this->assertText(t('The changes have been saved.'), "Permission 'node test view' successfully assigned to anonymous users.");
@@ -526,17 +526,17 @@ class BookTest extends WebTestBase {
   /**
    * Tests the access for deleting top-level book nodes.
    */
-  function testBookDelete() {
+  public function testBookDelete() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $nodes = $this->createBook();
     $this->drupalLogin($this->adminUser);
-    $edit = array();
+    $edit = [];
 
     // Test access to delete top-level and child book nodes.
     $this->drupalGet('node/' . $this->book->id() . '/outline/remove');
     $this->assertResponse('403', 'Deleting top-level book node properly forbidden.');
     $this->drupalPostForm('node/' . $nodes[4]->id() . '/outline/remove', $edit, t('Remove'));
-    $node_storage->resetCache(array($nodes[4]->id()));
+    $node_storage->resetCache([$nodes[4]->id()]);
     $node4 = $node_storage->load($nodes[4]->id());
     $this->assertTrue(empty($node4->book), 'Deleting child book node properly allowed.');
 
@@ -546,7 +546,7 @@ class BookTest extends WebTestBase {
     }
     entity_delete_multiple('node', $nids);
     $this->drupalPostForm('node/' . $this->book->id() . '/outline/remove', $edit, t('Remove'));
-    $node_storage->resetCache(array($this->book->id()));
+    $node_storage->resetCache([$this->book->id()]);
     $node = $node_storage->load($this->book->id());
     $this->assertTrue(empty($node->book), 'Deleting childless top-level book node properly allowed.');
 
@@ -577,7 +577,7 @@ class BookTest extends WebTestBase {
     $this->drupalLogin($this->bookAuthor);
 
     // Create new node not yet a book.
-    $empty_book = $this->drupalCreateNode(array('type' => 'book'));
+    $empty_book = $this->drupalCreateNode(['type' => 'book']);
     $this->drupalGet('node/' . $empty_book->id() . '/outline');
     $this->assertNoLink(t('Book outline'), 'Book Author is not allowed to outline');
 
@@ -587,7 +587,7 @@ class BookTest extends WebTestBase {
     $this->assertOptionSelected('edit-book-bid', 0, 'Node does not belong to a book');
     $this->assertNoLink(t('Remove from book outline'));
 
-    $edit = array();
+    $edit = [];
     $edit['book[bid]'] = '1';
     $this->drupalPostForm('node/' . $empty_book->id() . '/outline', $edit, t('Add to book outline'));
     $node = \Drupal::entityManager()->getStorage('node')->load($empty_book->id());
@@ -606,11 +606,11 @@ class BookTest extends WebTestBase {
     $this->drupalGet('node/' . $book->id() . '/outline');
     $this->assertRaw(t('Book outline'));
     $this->clickLink(t('Remove from book outline'));
-    $this->assertRaw(t('Are you sure you want to remove %title from the book hierarchy?', array('%title' => $book->label())));
+    $this->assertRaw(t('Are you sure you want to remove %title from the book hierarchy?', ['%title' => $book->label()]));
 
     // Create a new node and set the book after the node was created.
-    $node = $this->drupalCreateNode(array('type' => 'book'));
-    $edit = array();
+    $node = $this->drupalCreateNode(['type' => 'book']);
+    $edit = [];
     $edit['book[bid]'] = $node->id();
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
     $node = \Drupal::entityManager()->getStorage('node')->load($node->id());
@@ -634,7 +634,7 @@ class BookTest extends WebTestBase {
     $book_manager = \Drupal::service('book.manager');
 
     // Mock a link for a new book.
-    $link = array('nid' => 1, 'has_children' => 0, 'original_bid' => 0, 'parent_depth_limit' => 8, 'pid' => 0, 'weight' => 0, 'bid' => 1);
+    $link = ['nid' => 1, 'has_children' => 0, 'original_bid' => 0, 'parent_depth_limit' => 8, 'pid' => 0, 'weight' => 0, 'bid' => 1];
     $new = TRUE;
 
     // Save the link.
@@ -690,7 +690,7 @@ class BookTest extends WebTestBase {
     $this->assertText($this->book->label(), 'The book title is displayed on the administrative book listing page.');
 
     $elements = $this->xpath('//table//ul[@class="dropbutton"]/li/a');
-    $this->assertEqual((string) $elements[0], 'View', 'View link is found from the list.');
+    $this->assertEqual($elements[0]->getText(), 'View', 'View link is found from the list.');
   }
 
   /**
diff --git a/web/core/modules/book/tests/src/Kernel/BookUninstallTest.php b/web/core/modules/book/tests/src/Kernel/BookUninstallTest.php
index bcd081248..9430991ff 100644
--- a/web/core/modules/book/tests/src/Kernel/BookUninstallTest.php
+++ b/web/core/modules/book/tests/src/Kernel/BookUninstallTest.php
@@ -27,11 +27,11 @@ class BookUninstallTest extends KernelTestBase {
     parent::setUp();
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');
-    $this->installSchema('book', array('book'));
-    $this->installSchema('node', array('node_access'));
-    $this->installConfig(array('node', 'book', 'field'));
+    $this->installSchema('book', ['book']);
+    $this->installSchema('node', ['node_access']);
+    $this->installConfig(['node', 'book', 'field']);
     // For uninstall to work.
-    $this->installSchema('user', array('users_data'));
+    $this->installSchema('user', ['users_data']);
   }
 
   /**
@@ -42,17 +42,17 @@ class BookUninstallTest extends KernelTestBase {
     $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
     $this->assertEqual([], $validation_reasons, 'The book module is not required.');
 
-    $content_type = NodeType::create(array(
+    $content_type = NodeType::create([
       'type' => $this->randomMachineName(),
       'name' => $this->randomString(),
-    ));
+    ]);
     $content_type->save();
     $book_config = $this->config('book.settings');
     $allowed_types = $book_config->get('allowed_types');
     $allowed_types[] = $content_type->id();
     $book_config->set('allowed_types', $allowed_types)->save();
 
-    $node = Node::create(array('title' => $this->randomString(), 'type' => $content_type->id()));
+    $node = Node::create(['title' => $this->randomString(), 'type' => $content_type->id()]);
     $node->book['bid'] = 'new';
     $node->save();
 
@@ -60,7 +60,7 @@ class BookUninstallTest extends KernelTestBase {
     $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
     $this->assertEqual(['To uninstall Book, delete all content that is part of a book'], $validation_reasons['book']);
 
-    $book_node = Node::create(array('title' => $this->randomString(), 'type' => 'book'));
+    $book_node = Node::create(['title' => $this->randomString(), 'type' => 'book']);
     $book_node->book['bid'] = FALSE;
     $book_node->save();
 
@@ -79,7 +79,7 @@ class BookUninstallTest extends KernelTestBase {
     $module_data = _system_rebuild_module_data();
     $this->assertFalse(isset($module_data['book']->info['required']), 'The book module is not required.');
 
-    $node = Node::create(array('title' => $this->randomString(), 'type' => $content_type->id()));
+    $node = Node::create(['title' => $this->randomString(), 'type' => $content_type->id()]);
     $node->save();
     // One node exists but is not part of a book therefore the book module is
     // not required.
@@ -87,7 +87,7 @@ class BookUninstallTest extends KernelTestBase {
     $this->assertEqual([], $validation_reasons, 'The book module is not required.');
 
     // Uninstall the Book module and check the node type is deleted.
-    \Drupal::service('module_installer')->uninstall(array('book'));
+    \Drupal::service('module_installer')->uninstall(['book']);
     $this->assertNull(NodeType::load('book'), "The book node type does not exist.");
   }
 
diff --git a/web/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php b/web/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php
index a372e3ae8..17a3bfff1 100644
--- a/web/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php
+++ b/web/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\book\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -34,7 +34,7 @@ class MigrateBookConfigsTest extends MigrateDrupal6TestBase {
     $config = $this->config('book.settings');
     $this->assertIdentical('book', $config->get('child_type'));
     $this->assertIdentical('all pages', $config->get('block.navigation.mode'));
-    $this->assertIdentical(array('book'), $config->get('allowed_types'));
+    $this->assertIdentical(['book'], $config->get('allowed_types'));
     $this->assertConfigSchema(\Drupal::service('config.typed'), 'book.settings', $config->get());
   }
 
diff --git a/web/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookTest.php b/web/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookTest.php
index ffcc3fec2..f6f1730e3 100644
--- a/web/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookTest.php
+++ b/web/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookTest.php
@@ -32,7 +32,7 @@ class MigrateBookTest extends MigrateDrupal6TestBase {
    * Tests the Drupal 6 book structure to Drupal 8 migration.
    */
   public function testBook() {
-    $nodes = Node::loadMultiple(array(4, 5, 6, 7, 8));
+    $nodes = Node::loadMultiple([4, 5, 6, 7, 8]);
     $this->assertIdentical('4', $nodes[4]->book['bid']);
     $this->assertIdentical('0', $nodes[4]->book['pid']);
 
@@ -53,8 +53,8 @@ class MigrateBookTest extends MigrateDrupal6TestBase {
     $this->assertIdentical('5', $tree['49990 Node 4 4']['below']['50000 Node 5 5']['link']['nid']);
     $this->assertIdentical('6', $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 6 6']['link']['nid']);
     $this->assertIdentical('7', $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 7 7']['link']['nid']);
-    $this->assertIdentical(array(), $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 6 6']['below']);
-    $this->assertIdentical(array(), $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 7 7']['below']);
+    $this->assertIdentical([], $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 6 6']['below']);
+    $this->assertIdentical([], $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 7 7']['below']);
   }
 
 }
diff --git a/web/core/modules/book/tests/src/Unit/BookManagerTest.php b/web/core/modules/book/tests/src/Unit/BookManagerTest.php
index fdecbbe58..98dbd5a72 100644
--- a/web/core/modules/book/tests/src/Unit/BookManagerTest.php
+++ b/web/core/modules/book/tests/src/Unit/BookManagerTest.php
@@ -59,7 +59,7 @@ class BookManagerTest extends UnitTestCase {
   protected function setUp() {
     $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
     $this->translation = $this->getStringTranslationStub();
-    $this->configFactory = $this->getConfigFactoryStub(array());
+    $this->configFactory = $this->getConfigFactoryStub([]);
     $this->bookOutlineStorage = $this->getMock('Drupal\book\BookOutlineStorageInterface');
     $this->renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
     $this->bookManager = new BookManager($this->entityManager, $this->translation, $this->configFactory, $this->bookOutlineStorage, $this->renderer);
@@ -81,7 +81,7 @@ class BookManagerTest extends UnitTestCase {
    *   The test data.
    */
   public function providerTestGetBookParents() {
-    $empty = array(
+    $empty = [
       'p1' => 0,
       'p2' => 0,
       'p3' => 0,
@@ -91,27 +91,27 @@ class BookManagerTest extends UnitTestCase {
       'p7' => 0,
       'p8' => 0,
       'p9' => 0,
-    );
-    return array(
+    ];
+    return [
       // Provides a book without an existing parent.
-      array(
-        array('pid' => 0, 'nid' => 12),
-        array(),
-        array('depth' => 1, 'p1' => 12) + $empty,
-      ),
+      [
+        ['pid' => 0, 'nid' => 12],
+        [],
+        ['depth' => 1, 'p1' => 12] + $empty,
+      ],
       // Provides a book with an existing parent.
-      array(
-        array('pid' => 11, 'nid' => 12),
-        array('nid' => 11, 'depth' => 1, 'p1' => 11,),
-        array('depth' => 2, 'p1' => 11, 'p2' => 12) + $empty,
-      ),
+      [
+        ['pid' => 11, 'nid' => 12],
+        ['nid' => 11, 'depth' => 1, 'p1' => 11],
+        ['depth' => 2, 'p1' => 11, 'p2' => 12] + $empty,
+      ],
       // Provides a book with two existing parents.
-      array(
-        array('pid' => 11, 'nid' => 12),
-        array('nid' => 11, 'depth' => 2, 'p1' => 10, 'p2' => 11),
-        array('depth' => 3, 'p1' => 10, 'p2' => 11, 'p3' => 12) + $empty,
-      ),
-    );
+      [
+        ['pid' => 11, 'nid' => 12],
+        ['nid' => 11, 'depth' => 2, 'p1' => 10, 'p2' => 11],
+        ['depth' => 3, 'p1' => 10, 'p2' => 11, 'p3' => 12] + $empty,
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php b/web/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php
index 927241f0b..7abbc5c0e 100644
--- a/web/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php
+++ b/web/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php
@@ -12,10 +12,10 @@ use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
 class BookLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array(
+    $this->directoryList = [
       'book' => 'core/modules/book',
       'node' => 'core/modules/node',
-    );
+    ];
     parent::setUp();
   }
 
@@ -26,19 +26,19 @@ class BookLocalTasksTest extends LocalTaskIntegrationTestBase {
    */
   public function testBookAdminLocalTasks($route) {
 
-    $this->assertLocalTasks($route, array(
-      0 => array('book.admin', 'book.settings'),
-    ));
+    $this->assertLocalTasks($route, [
+      0 => ['book.admin', 'book.settings'],
+    ]);
   }
 
   /**
    * Provides a list of routes to test.
    */
   public function getBookAdminRoutes() {
-    return array(
-      array('book.admin'),
-      array('book.settings'),
-    );
+    return [
+      ['book.admin'],
+      ['book.settings'],
+    ];
   }
 
   /**
@@ -47,19 +47,19 @@ class BookLocalTasksTest extends LocalTaskIntegrationTestBase {
    * @dataProvider getBookNodeRoutes
    */
   public function testBookNodeLocalTasks($route) {
-    $this->assertLocalTasks($route, array(
-      0 => array('entity.node.book_outline_form', 'entity.node.canonical', 'entity.node.edit_form', 'entity.node.delete_form', 'entity.node.version_history',),
-    ));
+    $this->assertLocalTasks($route, [
+      0 => ['entity.node.book_outline_form', 'entity.node.canonical', 'entity.node.edit_form', 'entity.node.delete_form', 'entity.node.version_history'],
+    ]);
   }
 
   /**
    * Provides a list of routes to test.
    */
   public function getBookNodeRoutes() {
-    return array(
-      array('entity.node.canonical'),
-      array('entity.node.book_outline_form'),
-    );
+    return [
+      ['entity.node.canonical'],
+      ['entity.node.book_outline_form'],
+    ];
   }
 
 }
diff --git a/web/core/modules/breakpoint/breakpoint.module b/web/core/modules/breakpoint/breakpoint.module
index 103edd9b0..a0fd468df 100644
--- a/web/core/modules/breakpoint/breakpoint.module
+++ b/web/core/modules/breakpoint/breakpoint.module
@@ -15,13 +15,13 @@ function breakpoint_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.breakpoint':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Breakpoint module keeps track of the height, width, and resolution breakpoints where a responsive design needs to change in order to respond to different devices being used to view the site. This module does not have a user interface. For more information, see the <a href=":docs">online documentation for the Breakpoint module</a>.', array(':docs' => 'https://www.drupal.org/documentation/modules/breakpoint')) . '</p>';
+      $output .= '<p>' . t('The Breakpoint module keeps track of the height, width, and resolution breakpoints where a responsive design needs to change in order to respond to different devices being used to view the site. This module does not have a user interface. For more information, see the <a href=":docs">online documentation for the Breakpoint module</a>.', [':docs' => 'https://www.drupal.org/documentation/modules/breakpoint']) . '</p>';
       $output .= '<h4>' . t('Terminology') . '</h4>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Breakpoint') . '</dt>';
       $output .= '<dd>' . t('A breakpoint separates the height or width of viewports (screens, printers, and other media output types) into steps. For instance, a width breakpoint of 40em creates two steps: one for widths up to 40em and one for widths above 40em. Breakpoints can be used to define when layouts should shift from one form to another, when images should be resized, and other changes that need to respond to changes in viewport height or width.') . '</dd>';
       $output .= '<dt>' . t('Media query') . '</dt>';
-      $output .= '<dd>' . t('<a href=":w3">Media  queries</a> are a formal way to encode breakpoints. For instance, a width breakpoint at 40em would be written as the media query "(min-width: 40em)". Breakpoints are really just media queries with some additional meta-data, such as a name and multiplier information.', array(':w3' => 'http://www.w3.org/TR/css3-mediaqueries/')) . '</dd>';
+      $output .= '<dd>' . t('<a href=":w3">Media  queries</a> are a formal way to encode breakpoints. For instance, a width breakpoint at 40em would be written as the media query "(min-width: 40em)". Breakpoints are really just media queries with some additional meta-data, such as a name and multiplier information.', [':w3' => 'http://www.w3.org/TR/css3-mediaqueries/']) . '</dd>';
       $output .= '<dt>' . t('Resolution multiplier') . '</dt>';
       $output .= '<dd>' . t('Resolution multipliers are a measure of the viewport\'s device resolution, defined to be the ratio between the physical pixel size of the active device and the <a href="http://en.wikipedia.org/wiki/Device_independent_pixel">device-independent pixel</a> size. The Breakpoint module defines multipliers of 1, 1.5, and 2; when defining breakpoints, modules and themes can define which multipliers apply to each breakpoint.') . '</dd>';
       $output .= '<dt>' . t('Breakpoint group') . '</dt>';
diff --git a/web/core/modules/breakpoint/src/Breakpoint.php b/web/core/modules/breakpoint/src/Breakpoint.php
index 0c51e6353..0928d5596 100644
--- a/web/core/modules/breakpoint/src/Breakpoint.php
+++ b/web/core/modules/breakpoint/src/Breakpoint.php
@@ -16,7 +16,7 @@ class Breakpoint extends PluginBase implements BreakpointInterface {
    * {@inheritdoc}
    */
   public function getLabel() {
-    return $this->t($this->pluginDefinition['label'], array(), array('context' => 'breakpoint'));
+    return $this->t($this->pluginDefinition['label'], [], ['context' => 'breakpoint']);
   }
 
   /**
diff --git a/web/core/modules/breakpoint/src/BreakpointManager.php b/web/core/modules/breakpoint/src/BreakpointManager.php
index 693ffa9b1..30caf27eb 100644
--- a/web/core/modules/breakpoint/src/BreakpointManager.php
+++ b/web/core/modules/breakpoint/src/BreakpointManager.php
@@ -50,7 +50,7 @@ class BreakpointManager extends DefaultPluginManager implements BreakpointManage
   /**
    * {@inheritdoc}
    */
-  protected $defaults = array(
+  protected $defaults = [
     // Human readable label for breakpoint.
     'label' => '',
     // The media query for the breakpoint.
@@ -58,14 +58,14 @@ class BreakpointManager extends DefaultPluginManager implements BreakpointManage
     // Weight used for ordering breakpoints.
     'weight' => 0,
     // Breakpoint multipliers.
-    'multipliers' => array(),
+    'multipliers' => [],
     // The breakpoint group.
     'group' => '',
     // Default class for breakpoint implementations.
     'class' => 'Drupal\breakpoint\Breakpoint',
     // The plugin id. Set by the plugin system based on the top-level YAML key.
     'id' => '',
-  );
+  ];
 
   /**
    * The theme handler.
@@ -86,7 +86,7 @@ class BreakpointManager extends DefaultPluginManager implements BreakpointManage
    *
    * @var array
    */
-  protected $instances = array();
+  protected $instances = [];
 
   /**
    * Constructs a new BreakpointManager instance.
@@ -106,7 +106,7 @@ class BreakpointManager extends DefaultPluginManager implements BreakpointManage
     $this->themeHandler = $theme_handler;
     $this->setStringTranslation($string_translation);
     $this->alterInfo('breakpoints');
-    $this->setCacheBackend($cache_backend, 'breakpoints', array('breakpoints'));
+    $this->setCacheBackend($cache_backend, 'breakpoints', ['breakpoints']);
   }
 
   /**
@@ -153,19 +153,19 @@ class BreakpointManager extends DefaultPluginManager implements BreakpointManage
         $this->breakpointsByGroup[$group] = $cache->data;
       }
       else {
-        $breakpoints = array();
+        $breakpoints = [];
         foreach ($this->getDefinitions() as $plugin_id => $plugin_definition) {
           if ($plugin_definition['group'] == $group) {
             $breakpoints[$plugin_id] = $plugin_definition;
           }
         }
-        uasort($breakpoints, array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
-        $this->cacheBackend->set($this->cacheKey . ':' . $group, $breakpoints, Cache::PERMANENT, array('breakpoints'));
+        uasort($breakpoints, ['Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
+        $this->cacheBackend->set($this->cacheKey . ':' . $group, $breakpoints, Cache::PERMANENT, ['breakpoints']);
         $this->breakpointsByGroup[$group] = $breakpoints;
       }
     }
 
-    $instances = array();
+    $instances = [];
     foreach ($this->breakpointsByGroup[$group] as $plugin_id => $definition) {
       if (!isset($this->instances[$plugin_id])) {
         $this->instances[$plugin_id] = $this->createInstance($plugin_id);
@@ -184,16 +184,16 @@ class BreakpointManager extends DefaultPluginManager implements BreakpointManage
       $groups = $cache->data;
     }
     else {
-      $groups = array();
+      $groups = [];
       foreach ($this->getDefinitions() as $plugin_definition) {
         if (!isset($groups[$plugin_definition['group']])) {
           $groups[$plugin_definition['group']] = $plugin_definition['group'];
         }
       }
-      $this->cacheBackend->set($this->cacheKey . '::groups', $groups, Cache::PERMANENT, array('breakpoints'));
+      $this->cacheBackend->set($this->cacheKey . '::groups', $groups, Cache::PERMANENT, ['breakpoints']);
     }
     // Get the labels. This is not cacheable due to translation.
-    $group_labels = array();
+    $group_labels = [];
     foreach ($groups as $group) {
       $group_labels[$group] = $this->getGroupLabel($group);
     }
@@ -205,7 +205,7 @@ class BreakpointManager extends DefaultPluginManager implements BreakpointManage
    * {@inheritdoc}
    */
   public function getGroupProviders($group) {
-    $providers = array();
+    $providers = [];
     $breakpoints = $this->getBreakpointsByGroup($group);
     foreach ($breakpoints as $breakpoint) {
       $provider = $breakpoint->getProvider();
@@ -229,7 +229,7 @@ class BreakpointManager extends DefaultPluginManager implements BreakpointManage
   public function clearCachedDefinitions() {
     parent::clearCachedDefinitions();
     $this->breakpointsByGroup = NULL;
-    $this->instances = array();
+    $this->instances = [];
   }
 
   /**
@@ -251,7 +251,7 @@ class BreakpointManager extends DefaultPluginManager implements BreakpointManage
     }
     else {
       // Custom group label that should be translatable.
-      $label = $this->t($group, array(), array('context' => 'breakpoint'));
+      $label = $this->t($group, [], ['context' => 'breakpoint']);
     }
     return $label;
   }
diff --git a/web/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php b/web/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php
index 7683ea1f6..dc8175787 100644
--- a/web/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php
+++ b/web/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php
@@ -16,11 +16,11 @@ class BreakpointDiscoveryTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'breakpoint', 'breakpoint_module_test');
+  public static $modules = ['system', 'breakpoint', 'breakpoint_module_test'];
 
   protected function setUp() {
     parent::setUp();
-    \Drupal::service('theme_handler')->install(array('breakpoint_theme_test'));
+    \Drupal::service('theme_handler')->install(['breakpoint_theme_test']);
   }
 
   /**
@@ -28,56 +28,56 @@ class BreakpointDiscoveryTest extends KernelTestBase {
    */
   public function testThemeBreakpoints() {
     // Verify the breakpoint group for breakpoint_theme_test was created.
-    $expected_breakpoints = array(
-      'breakpoint_theme_test.mobile' => array(
+    $expected_breakpoints = [
+      'breakpoint_theme_test.mobile' => [
         'label' => 'mobile',
         'mediaQuery' => '(min-width: 0px)',
         'weight' => 0,
-        'multipliers' => array(
+        'multipliers' => [
           '1x',
-        ),
+        ],
         'provider' => 'breakpoint_theme_test',
         'id' => 'breakpoint_theme_test.mobile',
         'group' => 'breakpoint_theme_test',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_theme_test.narrow' => array(
+      ],
+      'breakpoint_theme_test.narrow' => [
         'label' => 'narrow',
         'mediaQuery' => '(min-width: 560px)',
         'weight' => 1,
-        'multipliers' => array(
+        'multipliers' => [
           '1x',
-        ),
+        ],
         'provider' => 'breakpoint_theme_test',
         'id' => 'breakpoint_theme_test.narrow',
         'group' => 'breakpoint_theme_test',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_theme_test.wide' => array(
+      ],
+      'breakpoint_theme_test.wide' => [
         'label' => 'wide',
         'mediaQuery' => '(min-width: 851px)',
         'weight' => 2,
-        'multipliers' => array(
+        'multipliers' => [
           '1x',
-        ),
+        ],
         'provider' => 'breakpoint_theme_test',
         'id' => 'breakpoint_theme_test.wide',
         'group' => 'breakpoint_theme_test',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_theme_test.tv' => array(
+      ],
+      'breakpoint_theme_test.tv' => [
         'label' => 'tv',
         'mediaQuery' => 'only screen and (min-width: 1220px)',
         'weight' => 3,
-        'multipliers' => array(
+        'multipliers' => [
           '1x',
-        ),
+        ],
         'provider' => 'breakpoint_theme_test',
         'id' => 'breakpoint_theme_test.tv',
         'group' => 'breakpoint_theme_test',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-    );
+      ],
+    ];
 
     $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_theme_test');
     foreach ($expected_breakpoints as $id => $expected_breakpoint) {
@@ -93,46 +93,46 @@ class BreakpointDiscoveryTest extends KernelTestBase {
    */
   public function testCustomBreakpointGroups() {
     // Verify the breakpoint group for breakpoint_theme_test.group2 was created.
-    $expected_breakpoints = array(
-      'breakpoint_theme_test.group2.narrow' => array(
+    $expected_breakpoints = [
+      'breakpoint_theme_test.group2.narrow' => [
         'label' => 'narrow',
         'mediaQuery' => '(min-width: 560px)',
         'weight' => 0,
-        'multipliers' => array(
+        'multipliers' => [
           '1x',
           '2x',
-        ),
+        ],
         'provider' => 'breakpoint_theme_test',
         'id' => 'breakpoint_theme_test.group2.narrow',
         'group' => 'breakpoint_theme_test.group2',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_theme_test.group2.wide' => array(
+      ],
+      'breakpoint_theme_test.group2.wide' => [
         'label' => 'wide',
         'mediaQuery' => '(min-width: 851px)',
         'weight' => 1,
-        'multipliers' => array(
+        'multipliers' => [
           '1x',
           '2x',
-        ),
+        ],
         'provider' => 'breakpoint_theme_test',
         'id' => 'breakpoint_theme_test.group2.wide',
         'group' => 'breakpoint_theme_test.group2',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_module_test.breakpoint_theme_test.group2.tv' => array(
+      ],
+      'breakpoint_module_test.breakpoint_theme_test.group2.tv' => [
         'label' => 'tv',
         'mediaQuery' => '(min-width: 6000px)',
         'weight' => 2,
-        'multipliers' => array(
+        'multipliers' => [
           '1x',
-        ),
+        ],
         'provider' => 'breakpoint_module_test',
         'id' => 'breakpoint_module_test.breakpoint_theme_test.group2.tv',
         'group' => 'breakpoint_theme_test.group2',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-    );
+      ],
+    ];
 
     $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_theme_test.group2');
     foreach ($expected_breakpoints as $id => $expected_breakpoint) {
@@ -144,33 +144,33 @@ class BreakpointDiscoveryTest extends KernelTestBase {
    * Test the breakpoint group created for a module.
    */
   public function testModuleBreakpoints() {
-    $expected_breakpoints = array(
-      'breakpoint_module_test.mobile' => array(
+    $expected_breakpoints = [
+      'breakpoint_module_test.mobile' => [
         'label' => 'mobile',
         'mediaQuery' => '(min-width: 0px)',
         'weight' => 0,
-        'multipliers' => array(
+        'multipliers' => [
           '1x',
-        ),
+        ],
         'provider' => 'breakpoint_module_test',
         'id' => 'breakpoint_module_test.mobile',
         'group' => 'breakpoint_module_test',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_module_test.standard' => array(
+      ],
+      'breakpoint_module_test.standard' => [
         'label' => 'standard',
         'mediaQuery' => '(min-width: 560px)',
         'weight' => 1,
-        'multipliers' => array(
+        'multipliers' => [
           '1x',
           '2x',
-        ),
+        ],
         'provider' => 'breakpoint_module_test',
         'id' => 'breakpoint_module_test.standard',
         'group' => 'breakpoint_module_test',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-    );
+      ],
+    ];
 
     $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_module_test');
     $this->assertEqual(array_keys($expected_breakpoints), array_keys($breakpoints));
@@ -180,20 +180,20 @@ class BreakpointDiscoveryTest extends KernelTestBase {
    * Test the collection of breakpoint groups.
    */
   public function testBreakpointGroups() {
-    $expected = array(
+    $expected = [
       'bartik' => 'Bartik',
       'breakpoint_module_test' => 'Breakpoint test module',
       'breakpoint_theme_test' => 'Breakpoint test theme',
       'breakpoint_theme_test.group2' => 'breakpoint_theme_test.group2',
-    );
+    ];
     $breakpoint_groups = \Drupal::service('breakpoint.manager')->getGroups();
     // Ensure the order is as expected. Should be sorted by label.
     $this->assertIdentical($expected, $this->castSafeStrings($breakpoint_groups));
 
-    $expected = array(
+    $expected = [
       'breakpoint_theme_test' => 'theme',
       'breakpoint_module_test' => 'module',
-    );
+    ];
     $breakpoint_group_providers = \Drupal::service('breakpoint.manager')->getGroupProviders('breakpoint_theme_test.group2');
     $this->assertEqual($expected, $breakpoint_group_providers);
   }
diff --git a/web/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php b/web/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
index bdd5cd934..4b8fd8846 100644
--- a/web/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
+++ b/web/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
@@ -24,9 +24,9 @@ class BreakpointTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $pluginDefinition = array(
+  protected $pluginDefinition = [
     'id' => 'breakpoint',
-  );
+  ];
 
   /**
    * The breakpoint under test.
@@ -52,7 +52,7 @@ class BreakpointTest extends UnitTestCase {
    * Sets up the breakpoint defaults.
    */
   protected function setupBreakpoint() {
-    $this->breakpoint = new Breakpoint(array(), $this->pluginId, $this->pluginDefinition);
+    $this->breakpoint = new Breakpoint([], $this->pluginId, $this->pluginDefinition);
     $this->breakpoint->setStringTranslation($this->stringTranslation);
   }
 
@@ -62,7 +62,7 @@ class BreakpointTest extends UnitTestCase {
   public function testGetLabel() {
     $this->pluginDefinition['label'] = 'Test label';
     $this->setupBreakpoint();
-    $this->assertEquals(new TranslatableMarkup('Test label', array(), array('context' => 'breakpoint'), $this->stringTranslation), $this->breakpoint->getLabel());
+    $this->assertEquals(new TranslatableMarkup('Test label', [], ['context' => 'breakpoint'], $this->stringTranslation), $this->breakpoint->getLabel());
   }
 
   /**
@@ -88,9 +88,9 @@ class BreakpointTest extends UnitTestCase {
    * @covers ::getMultipliers
    */
   public function testGetMultipliers() {
-    $this->pluginDefinition['multipliers'] = array('1x', '2x');
+    $this->pluginDefinition['multipliers'] = ['1x', '2x'];
     $this->setupBreakpoint();
-    $this->assertSame(array('1x', '2x'), $this->breakpoint->getMultipliers());
+    $this->assertSame(['1x', '2x'], $this->breakpoint->getMultipliers());
   }
 
   /**
diff --git a/web/core/modules/ckeditor/ckeditor.admin.inc b/web/core/modules/ckeditor/ckeditor.admin.inc
index 14b2fd7c9..8a8f68c69 100644
--- a/web/core/modules/ckeditor/ckeditor.admin.inc
+++ b/web/core/modules/ckeditor/ckeditor.admin.inc
@@ -29,8 +29,8 @@ function template_preprocess_ckeditor_settings_toolbar(&$variables) {
   // Create lists of active and disabled buttons.
   $editor = $variables['editor'];
   $plugins = $variables['plugins'];
-  $buttons = array();
-  $multiple_buttons = array();
+  $buttons = [];
+  $multiple_buttons = [];
   foreach ($plugins as $plugin_buttons) {
     foreach ($plugin_buttons as $button_name => $button) {
       $button['name'] = $button_name;
@@ -40,11 +40,11 @@ function template_preprocess_ckeditor_settings_toolbar(&$variables) {
       $buttons[$button_name] = $button;
     }
   }
-  $button_groups = array();
-  $active_buttons = array();
+  $button_groups = [];
+  $active_buttons = [];
   $settings = $editor->getSettings();
   foreach ($settings['toolbar']['rows'] as $row_number => $row) {
-    $button_groups[$row_number] = array();
+    $button_groups[$row_number] = [];
     foreach ($row as $group) {
       foreach ($group['items'] as $button_name) {
         if (isset($buttons[$button_name])) {
@@ -75,31 +75,31 @@ function template_preprocess_ckeditor_settings_toolbar(&$variables) {
       $value = $button['image_alternative'];
     }
     elseif (isset($button['image']) || isset($button['image' . $rtl])) {
-      $value = array(
+      $value = [
         '#theme' => 'image',
         '#uri' => isset($button['image' . $rtl]) ? $button['image' . $rtl] : $button['image'],
         '#title' => $button['label'],
         '#prefix' => '<a href="#" role="button" title="' . $button['label'] . '" aria-label="' . $button['label'] . '"><span class="cke_button_icon">',
         '#suffix' => '</span></a>',
-      );
+      ];
     }
     else {
       $value = '?';
     }
 
     // Build the button attributes.
-    $attributes = array(
+    $attributes = [
       'data-drupal-ckeditor-button-name' => $button['name'],
-    );
+    ];
     if (!empty($button['attributes'])) {
       $attributes = array_merge($attributes, $button['attributes']);
     }
 
     // Build the button item.
-    $button_item = array(
+    $button_item = [
       'value' => $value,
       'attributes' => new Attribute($attributes),
-    );
+    ];
     // If this button has group information, add it to the attributes.
     if (!empty($button['group'])) {
       $button_item['group'] = $button['group'];
@@ -114,14 +114,14 @@ function template_preprocess_ckeditor_settings_toolbar(&$variables) {
   };
 
   // Assemble list of disabled buttons (which are always a single row).
-  $variables['active_buttons'] = array();
+  $variables['active_buttons'] = [];
   foreach ($active_buttons as $row_number => $button_row) {
     foreach ($button_groups[$row_number] as $group_name) {
       $group_name = (string) $group_name;
-      $variables['active_buttons'][$row_number][$group_name] = array(
+      $variables['active_buttons'][$row_number][$group_name] = [
         'group_name_class' => Html::getClass($group_name),
-        'buttons' => array(),
-      );
+        'buttons' => [],
+      ];
       $buttons = array_filter($button_row, function ($button) use ($group_name) {
         return (string) $button['group'] === $group_name;
       });
@@ -131,12 +131,12 @@ function template_preprocess_ckeditor_settings_toolbar(&$variables) {
     }
   }
   // Assemble list of disabled buttons (which are always a single row).
-  $variables['disabled_buttons'] = array();
+  $variables['disabled_buttons'] = [];
   foreach ($disabled_buttons as $button) {
     $variables['disabled_buttons'][] = $build_button_item($button, $rtl);
   }
   // Assemble list of multiple buttons that may be added multiple times.
-  $variables['multiple_buttons'] = array();
+  $variables['multiple_buttons'] = [];
   foreach ($multiple_buttons as $button) {
     $variables['multiple_buttons'][] = $build_button_item($button, $rtl);
   }
diff --git a/web/core/modules/ckeditor/ckeditor.libraries.yml b/web/core/modules/ckeditor/ckeditor.libraries.yml
index 902cb9932..601251097 100644
--- a/web/core/modules/ckeditor/ckeditor.libraries.yml
+++ b/web/core/modules/ckeditor/ckeditor.libraries.yml
@@ -44,7 +44,7 @@ drupal.ckeditor.admin:
   css:
     theme:
       css/ckeditor.admin.css: {}
-      /core/assets/vendor/ckeditor/skins/moono/editor.css: {}
+      /core/assets/vendor/ckeditor/skins/moono-lisa/editor.css: {}
   dependencies:
     - core/jquery
     - core/drupal
diff --git a/web/core/modules/ckeditor/ckeditor.module b/web/core/modules/ckeditor/ckeditor.module
index 115afe24c..790525344 100644
--- a/web/core/modules/ckeditor/ckeditor.module
+++ b/web/core/modules/ckeditor/ckeditor.module
@@ -17,21 +17,21 @@ function ckeditor_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.ckeditor':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The CKEditor module provides a highly-accessible, highly-usable visual text editor and adds a toolbar to text fields. Users can use buttons to format content and to create semantically correct and valid HTML. The CKEditor module uses the framework provided by the <a href=":text_editor">Text Editor module</a>. It requires JavaScript to be enabled in the browser. For more information, see the <a href=":doc_url">online documentation for the CKEditor module</a> and the <a href=":cke_url">CKEditor website</a>.', array( ':doc_url' => 'https://www.drupal.org/documentation/modules/ckeditor', ':cke_url' => 'http://ckeditor.com', ':text_editor' => \Drupal::url('help.page', array('name' => 'editor')))) . '</p>';
+      $output .= '<p>' . t('The CKEditor module provides a highly-accessible, highly-usable visual text editor and adds a toolbar to text fields. Users can use buttons to format content and to create semantically correct and valid HTML. The CKEditor module uses the framework provided by the <a href=":text_editor">Text Editor module</a>. It requires JavaScript to be enabled in the browser. For more information, see the <a href=":doc_url">online documentation for the CKEditor module</a> and the <a href=":cke_url">CKEditor website</a>.', [ ':doc_url' => 'https://www.drupal.org/documentation/modules/ckeditor', ':cke_url' => 'http://ckeditor.com', ':text_editor' => \Drupal::url('help.page', ['name' => 'editor'])]) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Enabling CKEditor for individual text formats') . '</dt>';
-      $output .= '<dd>' . t('CKEditor has to be enabled and configured separately for individual text formats from the <a href=":formats">Text formats and editors page</a> because the filter settings for each text format can be different. For more information, see the <a href=":text_editor">Text Editor help page</a> and <a href=":filter">Filter help page</a>.', array(':formats' => \Drupal::url('filter.admin_overview'), ':text_editor' => \Drupal::url('help.page', array('name' => 'editor')), ':filter' => \Drupal::url('help.page', array('name' => 'filter')))) . '</dd>';
+      $output .= '<dd>' . t('CKEditor has to be enabled and configured separately for individual text formats from the <a href=":formats">Text formats and editors page</a> because the filter settings for each text format can be different. For more information, see the <a href=":text_editor">Text Editor help page</a> and <a href=":filter">Filter help page</a>.', [':formats' => \Drupal::url('filter.admin_overview'), ':text_editor' => \Drupal::url('help.page', ['name' => 'editor']), ':filter' => \Drupal::url('help.page', ['name' => 'filter'])]) . '</dd>';
       $output .= '<dt>' . t('Configuring the toolbar') . '</dt>';
       $output .= '<dd>' . t('When CKEditor is chosen from the <em>Text editor</em> drop-down menu, its toolbar configuration is displayed. You can add and remove buttons from the <em>Active toolbar</em> by dragging and dropping them, and additional rows can be added to organize the buttons.') . '</dd>';
       $output .= '<dt>' . t('Formatting content') . '</dt>';
-      $output .= '<dd>' . t('CKEditor only allow users to format content in accordance with the filter configuration of the specific text format. If a text format excludes certain HTML tags, the corresponding toolbar buttons are not displayed to users when they edit a text field in this format. For more information see the <a href=":filter">Filter help page</a>.', array(':filter' => \Drupal::url('help.page', array('name' => 'filter')))) . '</dd>';
+      $output .= '<dd>' . t('CKEditor only allow users to format content in accordance with the filter configuration of the specific text format. If a text format excludes certain HTML tags, the corresponding toolbar buttons are not displayed to users when they edit a text field in this format. For more information see the <a href=":filter">Filter help page</a>.', [':filter' => \Drupal::url('help.page', ['name' => 'filter'])]) . '</dd>';
       $output .= '<dt>' . t('Toggling between formatted text and HTML source') . '</dt>';
       $output .= '<dd>' . t('If the <em>Source</em> button is available in the toolbar, users can click this button to disable the visual editor and edit the HTML source directly. After toggling back, the visual editor uses the allowed HTML tags to format the text — independent of whether buttons for these tags are available in the toolbar. If the text format is set to <em>limit the use of HTML tags</em>, then all excluded tags will be stripped out of the HTML source when the user toggles back to the text editor.') . '</dd>';
       $output .= '<dt>' . t('Check my spelling as I type') . '</dt>';
       $output .= '<dd>' . t('By default, CKEditor is configured to leverage your browser\'s spell check capability. Make sure your browser\'s spell checker is enabled in your browser\'s settings. To access suggested corrections for misspelled words, it may be necessary to hold the <em>Control</em> or <em>command</em> (Mac) key while right-clicking the misspelling.') . '</dd>';
       $output .= '<dt>' . t('Accessibility features') . '</dt>';
-      $output .= '<dd>' . t('The built in WYSIWYG editor (CKEditor) comes with a number of <a href=":features">accessibility features</a>. CKEditor comes with built in <a href=":shortcuts">keyboard shortcuts</a>, which can be beneficial for both power users and keyboard only users.', array(':features' => 'http://docs.ckeditor.com/#!/guide/dev_a11y', ':shortcuts' => 'http://docs.ckeditor.com/#!/guide/dev_shortcuts')) . '</dd>';
+      $output .= '<dd>' . t('The built in WYSIWYG editor (CKEditor) comes with a number of <a href=":features">accessibility features</a>. CKEditor comes with built in <a href=":shortcuts">keyboard shortcuts</a>, which can be beneficial for both power users and keyboard only users.', [':features' => 'http://docs.ckeditor.com/#!/guide/dev_a11y', ':shortcuts' => 'http://docs.ckeditor.com/#!/guide/dev_shortcuts']) . '</dd>';
       $output .= '<dt>' . t('Generating accessible content') . '</dt>';
       $output .= '<dd>' . t('HTML tables can be created with both table headers as well as caption/summary elements. Alt text is required by default on images added through CKEditor (note that this can be overridden). Semantic HTML5 figure/figcaption are available to add captions to images.') . '</dd>';
       $output .= '</dl>';
@@ -43,12 +43,12 @@ function ckeditor_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function ckeditor_theme() {
-  return array(
-    'ckeditor_settings_toolbar' => array(
+  return [
+    'ckeditor_settings_toolbar' => [
       'file' => 'ckeditor.admin.inc',
-      'variables' => array('editor' => NULL, 'plugins' => NULL),
-    ),
-  );
+      'variables' => ['editor' => NULL, 'plugins' => NULL],
+    ],
+  ];
 }
 
 /**
@@ -79,7 +79,7 @@ function ckeditor_ckeditor_css_alter(array &$css, Editor $editor) {
  * @endcode
  */
 function _ckeditor_theme_css($theme = NULL) {
-  $css = array();
+  $css = [];
   if (!isset($theme)) {
     $theme = \Drupal::config('system.theme')->get('default');
   }
diff --git a/web/core/modules/ckeditor/js/ckeditor.js b/web/core/modules/ckeditor/js/ckeditor.js
index ea878f0a8..2b469c803 100644
--- a/web/core/modules/ckeditor/js/ckeditor.js
+++ b/web/core/modules/ckeditor/js/ckeditor.js
@@ -3,7 +3,7 @@
  * CKEditor implementation of {@link Drupal.editors} API.
  */
 
-(function (Drupal, debounce, CKEDITOR, $) {
+(function (Drupal, debounce, CKEDITOR, $, displace, AjaxCommands) {
 
   'use strict';
 
@@ -85,6 +85,26 @@
         editor.on('change', debounce(function () {
           callback(editor.getData());
         }, 400));
+
+        // A temporary workaround to control scrollbar appearance when using
+        // autoGrow event to control editor's height.
+        // @todo Remove when http://dev.ckeditor.com/ticket/12120 is fixed.
+        editor.on('mode', function () {
+          var editable = editor.editable();
+          if (!editable.isInline()) {
+            editor.on('autoGrow', function (evt) {
+              var doc = evt.editor.document;
+              var scrollable = CKEDITOR.env.quirks ? doc.getBody() : doc.getDocumentElement();
+
+              if (scrollable.$.scrollHeight < scrollable.$.clientHeight) {
+                scrollable.setStyle('overflow-y', 'hidden');
+              }
+              else {
+                scrollable.removeStyle('overflow-y');
+              }
+            }, null, null, 10000);
+          }
+        });
       }
       return !!editor;
     },
@@ -273,6 +293,11 @@
     }
   });
 
+  // Formulate a default formula for the maximum autoGrow height.
+  $(document).on('drupalViewportOffsetChange', function () {
+    CKEDITOR.config.autoGrow_maxHeight = 0.7 * (window.innerHeight - displace.offsets.top - displace.offsets.bottom);
+  });
+
   // Redirect on hash change when the original hash has an associated CKEditor.
   function redirectTextareaFragmentToCKEditorInstance() {
     var hash = location.hash.substr(1);
@@ -287,7 +312,39 @@
   }
   $(window).on('hashchange.ckeditor', redirectTextareaFragmentToCKEditorInstance);
 
+  // Set autoGrow to make the editor grow the moment it is created.
+  CKEDITOR.config.autoGrow_onStartup = true;
+
   // Set the CKEditor cache-busting string to the same value as Drupal.
   CKEDITOR.timestamp = drupalSettings.ckeditor.timestamp;
 
-})(Drupal, Drupal.debounce, CKEDITOR, jQuery);
+  if (AjaxCommands) {
+
+    /**
+     * Command to add style sheets to a CKEditor instance.
+     *
+     * Works for both iframe and inline CKEditor instances.
+     *
+     * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
+     * @param {object} response
+     *   The response from the Ajax request.
+     * @param {string} response.editor_id
+     *   The CKEditor instance ID.
+     * @param {number} [status]
+     *   The XMLHttpRequest status.
+     *
+     * @see http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document
+     */
+    AjaxCommands.prototype.ckeditor_add_stylesheet = function (ajax, response, status) {
+      var editor = CKEDITOR.instances[response.editor_id];
+
+      if (editor) {
+        response.stylesheets.forEach(function (url) {
+          editor.document.appendStyleSheet(url);
+        });
+      }
+    };
+  }
+
+})(Drupal, Drupal.debounce, CKEDITOR, jQuery, Drupal.displace, Drupal.AjaxCommands);
diff --git a/web/core/modules/ckeditor/js/plugins/drupallink/plugin.js b/web/core/modules/ckeditor/js/plugins/drupallink/plugin.js
index ff64f880e..9bd4dce98 100644
--- a/web/core/modules/ckeditor/js/plugins/drupallink/plugin.js
+++ b/web/core/modules/ckeditor/js/plugins/drupallink/plugin.js
@@ -13,7 +13,7 @@
     var parsedAttributes = {};
 
     var domElement = element.$;
-    var attribute = null;
+    var attribute;
     var attributeName;
     for (var attrIndex = 0; attrIndex < domElement.attributes.length; attrIndex++) {
       attribute = domElement.attributes.item(attrIndex);
diff --git a/web/core/modules/ckeditor/js/views/ControllerView.js b/web/core/modules/ckeditor/js/views/ControllerView.js
index e6cbe24b8..0f48373a7 100644
--- a/web/core/modules/ckeditor/js/views/ControllerView.js
+++ b/web/core/modules/ckeditor/js/views/ControllerView.js
@@ -144,7 +144,7 @@
       };
 
       // Create hidden CKEditor with all features enabled, retrieve metadata.
-      // @see \Drupal\ckeditor\Plugin\Editor\CKEditor::settingsForm.
+      // @see \Drupal\ckeditor\Plugin\Editor\CKEditor::buildConfigurationForm().
       var hiddenCKEditorID = 'ckeditor-hidden';
       if (CKEDITOR.instances[hiddenCKEditorID]) {
         CKEDITOR.instances[hiddenCKEditorID].destroy(true);
diff --git a/web/core/modules/ckeditor/js/views/KeyboardView.js b/web/core/modules/ckeditor/js/views/KeyboardView.js
index 9f2ab5b28..f44764e3a 100644
--- a/web/core/modules/ckeditor/js/views/KeyboardView.js
+++ b/web/core/modules/ckeditor/js/views/KeyboardView.js
@@ -61,7 +61,7 @@
         var $button = $target.parent();
         var $container = $button.parent();
         var $group = $button.closest('.ckeditor-toolbar-group');
-        var $row = $button.closest('.ckeditor-row');
+        var $row;
         var containerType = $container.data('drupal-ckeditor-button-sorting');
         var $availableButtons = this.$el.find('[data-drupal-ckeditor-button-sorting="source"]');
         var $activeButtons = this.$el.find('.ckeditor-toolbar-active');
diff --git a/web/core/modules/ckeditor/src/Ajax/AddStyleSheetCommand.php b/web/core/modules/ckeditor/src/Ajax/AddStyleSheetCommand.php
new file mode 100644
index 000000000..2ae2ed9d9
--- /dev/null
+++ b/web/core/modules/ckeditor/src/Ajax/AddStyleSheetCommand.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\ckeditor\Ajax;
+
+use Drupal\Core\Ajax\CommandInterface;
+
+/**
+ * AJAX command to add style sheets to a CKEditor instance.
+ */
+class AddStyleSheetCommand implements CommandInterface {
+
+  /**
+   * The CKEditor instance ID.
+   *
+   * @var string
+   */
+  protected $editorId;
+
+  /**
+   * The style sheet URLs to add to the CKEditor instance.
+   *
+   * @var string[]
+   */
+  protected $styleSheets = [];
+
+  /**
+   * AddStyleSheetCommand constructor.
+   *
+   * @param string $editor_id
+   *   The CKEditor instance ID.
+   * @param string[] $stylesheets
+   *   The style sheet URLs to add to the CKEditor instance.
+   */
+  public function __construct($editor_id, array $stylesheets = []) {
+    $this->editorId = $editor_id;
+    $this->styleSheets = $stylesheets;
+  }
+
+  /**
+   * Adds a style sheet to the CKEditor instance.
+   *
+   * @param string $stylesheet
+   *   The style sheet URL.
+   *
+   * @return $this
+   *   The called object, for chaining.
+   */
+  public function addStyleSheet($stylesheet) {
+    $this->styleSheets[] = $stylesheet;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function render() {
+    return [
+      'command' => 'ckeditor_add_stylesheet',
+      'editor_id' => $this->editorId,
+      'stylesheets' => $this->styleSheets,
+    ];
+  }
+
+}
diff --git a/web/core/modules/ckeditor/src/CKEditorPluginBase.php b/web/core/modules/ckeditor/src/CKEditorPluginBase.php
index 2fb479834..af284fc71 100644
--- a/web/core/modules/ckeditor/src/CKEditorPluginBase.php
+++ b/web/core/modules/ckeditor/src/CKEditorPluginBase.php
@@ -33,22 +33,22 @@ abstract class CKEditorPluginBase extends PluginBase implements CKEditorPluginIn
   /**
    * {@inheritdoc}
    */
-  function isInternal() {
+  public function isInternal() {
     return FALSE;
   }
 
   /**
    * {@inheritdoc}
    */
-  function getDependencies(Editor $editor) {
-    return array();
+  public function getDependencies(Editor $editor) {
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
-  function getLibraries(Editor $editor) {
-    return array();
+  public function getLibraries(Editor $editor) {
+    return [];
   }
 
 }
diff --git a/web/core/modules/ckeditor/src/CKEditorPluginManager.php b/web/core/modules/ckeditor/src/CKEditorPluginManager.php
index dd3315a35..735cfa667 100644
--- a/web/core/modules/ckeditor/src/CKEditorPluginManager.php
+++ b/web/core/modules/ckeditor/src/CKEditorPluginManager.php
@@ -68,8 +68,8 @@ class CKEditorPluginManager extends DefaultPluginManager {
   public function getEnabledPluginFiles(Editor $editor, $include_internal_plugins = FALSE) {
     $plugins = array_keys($this->getDefinitions());
     $toolbar_buttons = $this->getEnabledButtons($editor);
-    $enabled_plugins = array();
-    $additional_plugins = array();
+    $enabled_plugins = [];
+    $additional_plugins = [];
 
     foreach ($plugins as $plugin_id) {
       $plugin = $this->createInstance($plugin_id);
@@ -139,7 +139,7 @@ class CKEditorPluginManager extends DefaultPluginManager {
    */
   public function getButtons() {
     $plugins = array_keys($this->getDefinitions());
-    $buttons_plugins = array();
+    $buttons_plugins = [];
 
     foreach ($plugins as $plugin_id) {
       $plugin = $this->createInstance($plugin_id);
@@ -167,16 +167,16 @@ class CKEditorPluginManager extends DefaultPluginManager {
     foreach (array_keys($definitions) as $plugin_id) {
       $plugin = $this->createInstance($plugin_id);
       if ($plugin instanceof CKEditorPluginConfigurableInterface) {
-        $plugin_settings_form = array();
-        $form['plugins'][$plugin_id] = array(
+        $plugin_settings_form = [];
+        $form['plugins'][$plugin_id] = [
           '#type' => 'details',
           '#title' => $definitions[$plugin_id]['label'],
           '#open' => TRUE,
           '#group' => 'editor][settings][plugin_settings',
-          '#attributes' => array(
+          '#attributes' => [
             'data-ckeditor-plugin-id' => $plugin_id,
-          ),
-        );
+          ],
+        ];
         // Provide enough metadata for the drupal.ckeditor.admin library to
         // allow it to automatically show/hide the vertical tab containing the
         // settings for this plugin. Only do this if it's a CKEditor plugin that
@@ -206,7 +206,7 @@ class CKEditorPluginManager extends DefaultPluginManager {
    */
   public function getCssFiles(Editor $editor) {
     $enabled_plugins = array_keys($this->getEnabledPluginFiles($editor, TRUE));
-    $css_files = array();
+    $css_files = [];
 
     foreach ($enabled_plugins as $plugin_id) {
       $plugin = $this->createInstance($plugin_id);
diff --git a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
index 273f1a01a..587cf85e7 100644
--- a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
+++ b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
@@ -29,31 +29,31 @@ class DrupalImage extends CKEditorPluginBase implements CKEditorPluginConfigurab
    * {@inheritdoc}
    */
   public function getLibraries(Editor $editor) {
-    return array(
+    return [
       'core/drupal.ajax',
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getConfig(Editor $editor) {
-    return array(
-      'drupalImage_dialogTitleAdd' => t('Insert Image'),
-      'drupalImage_dialogTitleEdit' => t('Edit Image'),
-    );
+    return [
+      'drupalImage_dialogTitleAdd' => $this->t('Insert Image'),
+      'drupalImage_dialogTitleEdit' => $this->t('Edit Image'),
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getButtons() {
-    return array(
-      'DrupalImage' => array(
-        'label' => t('Image'),
+    return [
+      'DrupalImage' => [
+        'label' => $this->t('Image'),
         'image' => drupal_get_path('module', 'ckeditor') . '/js/plugins/drupalimage/icons/drupalimage.png',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -66,7 +66,7 @@ class DrupalImage extends CKEditorPluginBase implements CKEditorPluginConfigurab
     $form_state->loadInclude('editor', 'admin.inc');
     $form['image_upload'] = editor_image_upload_settings_form($editor);
     $form['image_upload']['#attached']['library'][] = 'ckeditor/drupal.ckeditor.drupalimage.admin';
-    $form['image_upload']['#element_validate'][] = array($this, 'validateImageUploadSettings');
+    $form['image_upload']['#element_validate'][] = [$this, 'validateImageUploadSettings'];
     return $form;
   }
 
@@ -79,10 +79,10 @@ class DrupalImage extends CKEditorPluginBase implements CKEditorPluginConfigurab
    * @see \Drupal\editor\Form\EditorImageDialog
    * @see editor_image_upload_settings_form()
    */
-  function validateImageUploadSettings(array $element, FormStateInterface $form_state) {
-    $settings = &$form_state->getValue(array('editor', 'settings', 'plugins', 'drupalimage', 'image_upload'));
+  public function validateImageUploadSettings(array $element, FormStateInterface $form_state) {
+    $settings = &$form_state->getValue(['editor', 'settings', 'plugins', 'drupalimage', 'image_upload']);
     $form_state->get('editor')->setImageUploadSettings($settings);
-    $form_state->unsetValue(array('editor', 'settings', 'plugins', 'drupalimage'));
+    $form_state->unsetValue(['editor', 'settings', 'plugins', 'drupalimage']);
   }
 
 }
diff --git a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php
index d01748a67..64e764ebf 100644
--- a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php
+++ b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\ckeditor\Plugin\CKEditorPlugin;
 
-use Drupal\Component\Plugin\PluginBase;
+use Drupal\Core\Plugin\PluginBase;
 use Drupal\editor\Entity\Editor;
 use Drupal\ckeditor\CKEditorPluginInterface;
 use Drupal\ckeditor\CKEditorPluginContextualInterface;
@@ -30,16 +30,16 @@ class DrupalImageCaption extends PluginBase implements CKEditorPluginInterface,
    * {@inheritdoc}
    */
   public function getDependencies(Editor $editor) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getLibraries(Editor $editor) {
-    return array(
+    return [
       'ckeditor/drupal.ckeditor.plugins.drupalimagecaption',
-    );
+    ];
   }
 
   /**
@@ -54,30 +54,30 @@ class DrupalImageCaption extends PluginBase implements CKEditorPluginInterface,
    */
   public function getConfig(Editor $editor) {
     $format = $editor->getFilterFormat();
-    return array(
+    return [
       'image2_captionedClass' => 'caption caption-img',
-      'image2_alignClasses' => array('align-left', 'align-center', 'align-right'),
-      'drupalImageCaption_captionPlaceholderText' => t('Enter caption here'),
+      'image2_alignClasses' => ['align-left', 'align-center', 'align-right'],
+      'drupalImageCaption_captionPlaceholderText' => $this->t('Enter caption here'),
       // Only enable those parts of DrupalImageCaption for which the
       // corresponding Drupal text filters are enabled.
       'drupalImageCaption_captionFilterEnabled' => $format->filters('filter_caption')->status,
       'drupalImageCaption_alignFilterEnabled' => $format->filters('filter_align')->status,
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getCssFiles(Editor $editor) {
-    return array(
+    return [
       drupal_get_path('module', 'ckeditor') . '/css/plugins/drupalimagecaption/ckeditor.drupalimagecaption.css'
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  function isEnabled(Editor $editor) {
+  public function isEnabled(Editor $editor) {
     if (!$editor->hasAssociatedFilterFormat()) {
       return FALSE;
     }
diff --git a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php
index 83e52e14a..a6363f6b7 100644
--- a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php
+++ b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php
@@ -27,19 +27,19 @@ class DrupalLink extends CKEditorPluginBase {
    * {@inheritdoc}
    */
   public function getLibraries(Editor $editor) {
-    return array(
+    return [
       'core/drupal.ajax',
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getConfig(Editor $editor) {
-    return array(
-      'drupalLink_dialogTitleAdd' => t('Add Link'),
-      'drupalLink_dialogTitleEdit' => t('Edit Link'),
-    );
+    return [
+      'drupalLink_dialogTitleAdd' => $this->t('Add Link'),
+      'drupalLink_dialogTitleEdit' => $this->t('Edit Link'),
+    ];
   }
 
   /**
@@ -47,16 +47,16 @@ class DrupalLink extends CKEditorPluginBase {
    */
   public function getButtons() {
     $path = drupal_get_path('module', 'ckeditor') . '/js/plugins/drupallink';
-    return array(
-      'DrupalLink' => array(
-        'label' => t('Link'),
+    return [
+      'DrupalLink' => [
+        'label' => $this->t('Link'),
         'image' => $path . '/icons/drupallink.png',
-      ),
-      'DrupalUnlink' => array(
-        'label' => t('Unlink'),
+      ],
+      'DrupalUnlink' => [
+        'label' => $this->t('Unlink'),
         'image' => $path . '/icons/drupalunlink.png',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php
index 605dc56a7..9a04ce72a 100644
--- a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php
+++ b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php
@@ -100,14 +100,14 @@ class Internal extends CKEditorPluginBase implements ContainerFactoryPluginInter
    */
   public function getConfig(Editor $editor) {
     // Reasonable defaults that provide expected basic behavior.
-    $config = array(
+    $config = [
       'customConfig' => '', // Don't load CKEditor's config.js file.
       'pasteFromWordPromptCleanup' => TRUE,
       'resize_dir' => 'vertical',
-      'justifyClasses' => array('text-align-left', 'text-align-center', 'text-align-right', 'text-align-justify'),
+      'justifyClasses' => ['text-align-left', 'text-align-center', 'text-align-right', 'text-align-justify'],
       'entities' => FALSE,
       'disableNativeSpellChecker' => FALSE,
-    );
+    ];
 
     // Add the allowedContent setting, which ensures CKEditor only allows tags
     // and attributes that are allowed by the text format for this text editor.
@@ -144,195 +144,195 @@ class Internal extends CKEditorPluginBase implements ContainerFactoryPluginInter
       ];
     };
 
-    return array(
+    return [
       // "basicstyles" plugin.
-      'Bold' => array(
-        'label' => t('Bold'),
+      'Bold' => [
+        'label' => $this->t('Bold'),
         'image_alternative' => $button('bold'),
         'image_alternative_rtl' => $button('bold', 'rtl'),
-      ),
-      'Italic' => array(
-        'label' => t('Italic'),
+      ],
+      'Italic' => [
+        'label' => $this->t('Italic'),
         'image_alternative' => $button('italic'),
         'image_alternative_rtl' => $button('italic', 'rtl'),
-      ),
-      'Underline' => array(
-        'label' => t('Underline'),
+      ],
+      'Underline' => [
+        'label' => $this->t('Underline'),
         'image_alternative' => $button('underline'),
         'image_alternative_rtl' => $button('underline', 'rtl'),
-      ),
-      'Strike' => array(
-        'label' => t('Strike-through'),
+      ],
+      'Strike' => [
+        'label' => $this->t('Strike-through'),
         'image_alternative' => $button('strike'),
         'image_alternative_rtl' => $button('strike', 'rtl'),
-      ),
-      'Superscript' => array(
-        'label' => t('Superscript'),
+      ],
+      'Superscript' => [
+        'label' => $this->t('Superscript'),
         'image_alternative' => $button('super script'),
         'image_alternative_rtl' => $button('super script', 'rtl'),
-      ),
-      'Subscript' => array(
-        'label' => t('Subscript'),
+      ],
+      'Subscript' => [
+        'label' => $this->t('Subscript'),
         'image_alternative' => $button('sub script'),
         'image_alternative_rtl' => $button('sub script', 'rtl'),
-      ),
+      ],
       // "removeformat" plugin.
-      'RemoveFormat' => array(
-        'label' => t('Remove format'),
+      'RemoveFormat' => [
+        'label' => $this->t('Remove format'),
         'image_alternative' => $button('remove format'),
         'image_alternative_rtl' => $button('remove format', 'rtl'),
-      ),
+      ],
       // "justify" plugin.
-      'JustifyLeft' => array(
-        'label' => t('Align left'),
+      'JustifyLeft' => [
+        'label' => $this->t('Align left'),
         'image_alternative' => $button('justify left'),
         'image_alternative_rtl' => $button('justify left', 'rtl'),
-      ),
-      'JustifyCenter' => array(
-        'label' => t('Align center'),
+      ],
+      'JustifyCenter' => [
+        'label' => $this->t('Align center'),
         'image_alternative' => $button('justify center'),
         'image_alternative_rtl' => $button('justify center', 'rtl'),
-      ),
-      'JustifyRight' => array(
-        'label' => t('Align right'),
+      ],
+      'JustifyRight' => [
+        'label' => $this->t('Align right'),
         'image_alternative' => $button('justify right'),
         'image_alternative_rtl' => $button('justify right', 'rtl'),
-      ),
-      'JustifyBlock' => array(
-        'label' => t('Justify'),
+      ],
+      'JustifyBlock' => [
+        'label' => $this->t('Justify'),
         'image_alternative' => $button('justify block'),
         'image_alternative_rtl' => $button('justify block', 'rtl'),
-      ),
+      ],
       // "list" plugin.
-      'BulletedList' => array(
-        'label' => t('Bullet list'),
+      'BulletedList' => [
+        'label' => $this->t('Bullet list'),
         'image_alternative' => $button('bulleted list'),
         'image_alternative_rtl' => $button('bulleted list', 'rtl'),
-      ),
-      'NumberedList' => array(
-        'label' => t('Numbered list'),
+      ],
+      'NumberedList' => [
+        'label' => $this->t('Numbered list'),
         'image_alternative' => $button('numbered list'),
         'image_alternative_rtl' => $button('numbered list', 'rtl'),
-      ),
+      ],
       // "indent" plugin.
-      'Outdent' => array(
-        'label' => t('Outdent'),
+      'Outdent' => [
+        'label' => $this->t('Outdent'),
         'image_alternative' => $button('outdent'),
         'image_alternative_rtl' => $button('outdent', 'rtl'),
-      ),
-      'Indent' => array(
-        'label' => t('Indent'),
+      ],
+      'Indent' => [
+        'label' => $this->t('Indent'),
         'image_alternative' => $button('indent'),
         'image_alternative_rtl' => $button('indent', 'rtl'),
-      ),
+      ],
       // "undo" plugin.
-      'Undo' => array(
-        'label' => t('Undo'),
+      'Undo' => [
+        'label' => $this->t('Undo'),
         'image_alternative' => $button('undo'),
         'image_alternative_rtl' => $button('undo', 'rtl'),
-      ),
-      'Redo' => array(
-        'label' => t('Redo'),
+      ],
+      'Redo' => [
+        'label' => $this->t('Redo'),
         'image_alternative' => $button('redo'),
         'image_alternative_rtl' => $button('redo', 'rtl'),
-      ),
+      ],
       // "blockquote" plugin.
-      'Blockquote' => array(
-        'label' => t('Blockquote'),
+      'Blockquote' => [
+        'label' => $this->t('Blockquote'),
         'image_alternative' => $button('blockquote'),
         'image_alternative_rtl' => $button('blockquote', 'rtl'),
-      ),
+      ],
       // "horizontalrule" plugin
-      'HorizontalRule' => array(
-        'label' => t('Horizontal rule'),
+      'HorizontalRule' => [
+        'label' => $this->t('Horizontal rule'),
         'image_alternative' => $button('horizontal rule'),
         'image_alternative_rtl' => $button('horizontal rule', 'rtl'),
-      ),
+      ],
       // "clipboard" plugin.
-      'Cut' => array(
-        'label' => t('Cut'),
+      'Cut' => [
+        'label' => $this->t('Cut'),
         'image_alternative' => $button('cut'),
         'image_alternative_rtl' => $button('cut', 'rtl'),
-      ),
-      'Copy' => array(
-        'label' => t('Copy'),
+      ],
+      'Copy' => [
+        'label' => $this->t('Copy'),
         'image_alternative' => $button('copy'),
         'image_alternative_rtl' => $button('copy', 'rtl'),
-      ),
-      'Paste' => array(
-        'label' => t('Paste'),
+      ],
+      'Paste' => [
+        'label' => $this->t('Paste'),
         'image_alternative' => $button('paste'),
         'image_alternative_rtl' => $button('paste', 'rtl'),
-      ),
+      ],
       // "pastetext" plugin.
-      'PasteText' => array(
-        'label' => t('Paste Text'),
+      'PasteText' => [
+        'label' => $this->t('Paste Text'),
         'image_alternative' => $button('paste text'),
         'image_alternative_rtl' => $button('paste text', 'rtl'),
-      ),
+      ],
       // "pastefromword" plugin.
-      'PasteFromWord' => array(
-        'label' => t('Paste from Word'),
+      'PasteFromWord' => [
+        'label' => $this->t('Paste from Word'),
         'image_alternative' => $button('paste from word'),
         'image_alternative_rtl' => $button('paste from word', 'rtl'),
-      ),
+      ],
       // "specialchar" plugin.
-      'SpecialChar' => array(
-        'label' => t('Character map'),
+      'SpecialChar' => [
+        'label' => $this->t('Character map'),
         'image_alternative' => $button('special char'),
         'image_alternative_rtl' => $button('special char', 'rtl'),
-      ),
-      'Format' => array(
-        'label' => t('HTML block format'),
+      ],
+      'Format' => [
+        'label' => $this->t('HTML block format'),
         'image_alternative' => [
           '#type' => 'inline_template',
           '#template' => '<a href="#" role="button" aria-label="{{ format_text }}"><span class="ckeditor-button-dropdown">{{ format_text }}<span class="ckeditor-button-arrow"></span></span></a>',
           '#context' => [
-            'format_text' => t('Format'),
+            'format_text' => $this->t('Format'),
           ],
         ],
-      ),
+      ],
       // "table" plugin.
-      'Table' => array(
-        'label' => t('Table'),
+      'Table' => [
+        'label' => $this->t('Table'),
         'image_alternative' => $button('table'),
         'image_alternative_rtl' => $button('table', 'rtl'),
-      ),
+      ],
       // "showblocks" plugin.
-      'ShowBlocks' => array(
-        'label' => t('Show blocks'),
+      'ShowBlocks' => [
+        'label' => $this->t('Show blocks'),
         'image_alternative' => $button('show blocks'),
         'image_alternative_rtl' => $button('show blocks', 'rtl'),
-      ),
+      ],
       // "sourcearea" plugin.
-      'Source' => array(
-        'label' => t('Source code'),
+      'Source' => [
+        'label' => $this->t('Source code'),
         'image_alternative' => $button('source'),
         'image_alternative_rtl' => $button('source', 'rtl'),
-      ),
+      ],
       // "maximize" plugin.
-      'Maximize' => array(
-        'label' => t('Maximize'),
+      'Maximize' => [
+        'label' => $this->t('Maximize'),
         'image_alternative' => $button('maximize'),
         'image_alternative_rtl' => $button('maximize', 'rtl'),
-      ),
+      ],
       // No plugin, separator "button" for toolbar builder UI use only.
-      '-' => array(
-        'label' => t('Separator'),
+      '-' => [
+        'label' => $this->t('Separator'),
         'image_alternative' => [
           '#type' => 'inline_template',
           '#template' => '<a href="#" role="button" aria-label="{{ button_separator_text }}" class="ckeditor-separator"></a>',
           '#context' => [
-            'button_separator_text' => t('Button separator'),
+            'button_separator_text' => $this->t('Button separator'),
           ],
         ],
-        'attributes' => array(
-          'class' => array('ckeditor-button-separator'),
+        'attributes' => [
+          'class' => ['ckeditor-button-separator'],
           'data-drupal-ckeditor-type' => 'separator',
-        ),
+        ],
         'multiple' => TRUE,
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -350,7 +350,7 @@ class Internal extends CKEditorPluginBase implements ContainerFactoryPluginInter
     // When no text format is associated yet, assume no tag is allowed.
     // @see \Drupal\Editor\EditorInterface::hasAssociatedFilterFormat()
     if (!$editor->hasAssociatedFilterFormat()) {
-      return array();
+      return [];
     }
 
     $format = $editor->getFilterFormat();
@@ -416,7 +416,7 @@ class Internal extends CKEditorPluginBase implements ContainerFactoryPluginInter
 
     // When nothing is disallowed, set allowedContent to true.
     if (!in_array(FilterInterface::TYPE_HTML_RESTRICTOR, $filter_types)) {
-      return array(TRUE, FALSE);
+      return [TRUE, FALSE];
     }
     // Generate setting that accurately reflects allowed tags and attributes.
     else {
@@ -441,10 +441,10 @@ class Internal extends CKEditorPluginBase implements ContainerFactoryPluginInter
       // When all HTML is allowed, also set allowedContent to true and
       // disallowedContent to false.
       if ($html_restrictions === FALSE) {
-        return array(TRUE, FALSE);
+        return [TRUE, FALSE];
       }
-      $allowed = array();
-      $disallowed = array();
+      $allowed = [];
+      $disallowed = [];
       if (isset($html_restrictions['forbidden_tags'])) {
         foreach ($html_restrictions['forbidden_tags'] as $tag) {
           $disallowed[$tag] = TRUE;
@@ -453,11 +453,11 @@ class Internal extends CKEditorPluginBase implements ContainerFactoryPluginInter
       foreach ($html_restrictions['allowed'] as $tag => $attributes) {
         // Tell CKEditor the tag is allowed, but no attributes.
         if ($attributes === FALSE) {
-          $allowed[$tag] = array(
+          $allowed[$tag] = [
             'attributes' => FALSE,
             'styles' => FALSE,
             'classes' => FALSE,
-          );
+          ];
         }
         // Tell CKEditor the tag is allowed, as well as any attribute on it. The
         // "style" and "class" attributes are handled separately by CKEditor:
@@ -465,11 +465,11 @@ class Internal extends CKEditorPluginBase implements ContainerFactoryPluginInter
         // attributes, unless you state specific values for them that are
         // allowed. Or, in this case: any value for them is allowed.
         elseif ($attributes === TRUE) {
-          $allowed[$tag] = array(
+          $allowed[$tag] = [
             'attributes' => TRUE,
             'styles' => TRUE,
             'classes' => TRUE,
-          );
+          ];
           // We've just marked that any value for the "style" and "class"
           // attributes is allowed. However, that may not be the case: the "*"
           // tag may still apply restrictions.
@@ -518,11 +518,11 @@ class Internal extends CKEditorPluginBase implements ContainerFactoryPluginInter
         elseif (is_array($attributes)) {
           // Set defaults (these will be overridden below if more specific
           // values are present).
-          $allowed[$tag] = array(
+          $allowed[$tag] = [
             'attributes' => FALSE,
             'styles' => FALSE,
             'classes' => FALSE,
-          );
+          ];
           // Configure allowed attributes, allowed "style" attribute values and
           // allowed "class" attribute values.
           // CKEditor only allows specific values for the "class" and "style"
@@ -600,7 +600,7 @@ class Internal extends CKEditorPluginBase implements ContainerFactoryPluginInter
       ksort($allowed);
       ksort($disallowed);
 
-      return array($allowed, $disallowed);
+      return [$allowed, $disallowed];
     }
   }
 
diff --git a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php
index 980d5e909..ffae4096c 100644
--- a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php
+++ b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php
@@ -104,7 +104,7 @@ class Language extends CKEditorPluginBase implements CKEditorPluginConfigurableI
     }
 
     $predefined_languages = LanguageManager::getStandardLanguageList();
-    $form['language_list'] = array(
+    $form['language_list'] = [
       '#title' => $this->t('Language list'),
       '#title_display' => 'invisible',
       '#type' => 'select',
@@ -118,7 +118,7 @@ class Language extends CKEditorPluginBase implements CKEditorPluginConfigurableI
         '@count' => count($predefined_languages),
       ]),
       '#attached' => ['library' => ['ckeditor/drupal.ckeditor.language.admin']],
-    );
+    ];
 
     return $form;
   }
@@ -126,10 +126,10 @@ class Language extends CKEditorPluginBase implements CKEditorPluginConfigurableI
   /**
    * {@inheritdoc}
    */
-  function getCssFiles(Editor $editor) {
-    return array(
+  public function getCssFiles(Editor $editor) {
+    return [
         drupal_get_path('module', 'ckeditor') . '/css/plugins/language/ckeditor.language.css'
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
index 75b78a5a5..7b3386efe 100644
--- a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
+++ b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
@@ -36,7 +36,7 @@ class StylesCombo extends CKEditorPluginBase implements CKEditorPluginConfigurab
    * {@inheritdoc}
    */
   public function getConfig(Editor $editor) {
-    $config = array();
+    $config = [];
     $settings = $editor->getSettings();
     if (!isset($settings['plugins']['stylescombo']['styles'])) {
       return $config;
@@ -50,18 +50,18 @@ class StylesCombo extends CKEditorPluginBase implements CKEditorPluginConfigurab
    * {@inheritdoc}
    */
   public function getButtons() {
-    return array(
-      'Styles' => array(
-        'label' => t('Font style'),
+    return [
+      'Styles' => [
+        'label' => $this->t('Font style'),
         'image_alternative' => [
           '#type' => 'inline_template',
           '#template' => '<a href="#" role="button" aria-label="{{ styles_text }}"><span class="ckeditor-button-dropdown">{{ styles_text }}<span class="ckeditor-button-arrow"></span></span></a>',
           '#context' => [
-            'styles_text' => t('Styles'),
+            'styles_text' => $this->t('Styles'),
           ],
         ],
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -69,25 +69,25 @@ class StylesCombo extends CKEditorPluginBase implements CKEditorPluginConfigurab
    */
   public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
     // Defaults.
-    $config = array('styles' => '');
+    $config = ['styles' => ''];
     $settings = $editor->getSettings();
     if (isset($settings['plugins']['stylescombo'])) {
       $config = $settings['plugins']['stylescombo'];
     }
 
-    $form['styles'] = array(
-      '#title' => t('Styles'),
+    $form['styles'] = [
+      '#title' => $this->t('Styles'),
       '#title_display' => 'invisible',
       '#type' => 'textarea',
       '#default_value' => $config['styles'],
-      '#description' => t('A list of classes that will be provided in the "Styles" dropdown. Enter one or more classes on each line in the format: element.classA.classB|Label. Example: h1.title|Title. Advanced example: h1.fancy.title|Fancy title.<br />These styles should be available in your theme\'s CSS file.'),
-      '#attached' => array(
-        'library' => array('ckeditor/drupal.ckeditor.stylescombo.admin'),
-      ),
-      '#element_validate' => array(
-        array($this, 'validateStylesValue'),
-      ),
-    );
+      '#description' => $this->t('A list of classes that will be provided in the "Styles" dropdown. Enter one or more classes on each line in the format: element.classA.classB|Label. Example: h1.title|Title. Advanced example: h1.fancy.title|Fancy title.<br />These styles should be available in your theme\'s CSS file.'),
+      '#attached' => [
+        'library' => ['ckeditor/drupal.ckeditor.stylescombo.admin'],
+      ],
+      '#element_validate' => [
+        [$this, 'validateStylesValue'],
+      ],
+    ];
 
     return $form;
   }
@@ -98,12 +98,12 @@ class StylesCombo extends CKEditorPluginBase implements CKEditorPluginConfigurab
   public function validateStylesValue(array $element, FormStateInterface $form_state) {
     $styles_setting = $this->generateStylesSetSetting($element['#value']);
     if ($styles_setting === FALSE) {
-      $form_state->setError($element, t('The provided list of styles is syntactically incorrect.'));
+      $form_state->setError($element, $this->t('The provided list of styles is syntactically incorrect.'));
     }
     else {
       $style_names = array_map(function ($style) { return $style['name']; }, $styles_setting);
       if (count($style_names) !== count(array_unique($style_names))) {
-        $form_state->setError($element, t('Each style must have a unique label.'));
+        $form_state->setError($element, $this->t('Each style must have a unique label.'));
       }
     }
   }
@@ -120,7 +120,7 @@ class StylesCombo extends CKEditorPluginBase implements CKEditorPluginConfigurab
    *   syntax is invalid.
    */
   protected function generateStylesSetSetting($styles) {
-    $styles_set = array();
+    $styles_set = [];
 
     // Early-return when empty.
     $styles = trim($styles);
@@ -128,7 +128,7 @@ class StylesCombo extends CKEditorPluginBase implements CKEditorPluginConfigurab
       return $styles_set;
     }
 
-    $styles = str_replace(array("\r\n", "\r"), "\n", $styles);
+    $styles = str_replace(["\r\n", "\r"], "\n", $styles);
     foreach (explode("\n", $styles) as $style) {
       $style = trim($style);
 
@@ -149,14 +149,14 @@ class StylesCombo extends CKEditorPluginBase implements CKEditorPluginConfigurab
 
       // Build the data structure CKEditor's stylescombo plugin expects.
       // @see http://docs.cksource.com/CKEditor_3.x/Developers_Guide/Styles
-      $configured_style = array(
+      $configured_style = [
         'name' => trim($label),
         'element' => trim($element),
-      );
+      ];
       if (!empty($classes)) {
-        $configured_style['attributes'] = array(
+        $configured_style['attributes'] = [
           'class' => implode(' ', array_map('trim', $classes))
-        );
+        ];
       }
       $styles_set[] = $configured_style;
     }
diff --git a/web/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php b/web/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
index 170305d23..255691ff0 100644
--- a/web/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
+++ b/web/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
@@ -102,36 +102,36 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public function getDefaultSettings() {
-    return array(
-      'toolbar' => array(
-        'rows' => array(
+    return [
+      'toolbar' => [
+        'rows' => [
           // Button groups.
-          array(
-            array(
-              'name' => t('Formatting'),
-              'items' => array('Bold', 'Italic',),
-            ),
-            array(
-              'name' => t('Links'),
-              'items' => array('DrupalLink', 'DrupalUnlink',),
-            ),
-            array(
-              'name' => t('Lists'),
-              'items' => array('BulletedList', 'NumberedList',),
-            ),
-            array(
-              'name' => t('Media'),
-              'items' => array('Blockquote', 'DrupalImage',),
-            ),
-            array(
-              'name' => t('Tools'),
-              'items' => array('Source',),
-            ),
-          ),
-        ),
-      ),
+          [
+            [
+              'name' => $this->t('Formatting'),
+              'items' => ['Bold', 'Italic'],
+            ],
+            [
+              'name' => $this->t('Links'),
+              'items' => ['DrupalLink', 'DrupalUnlink'],
+            ],
+            [
+              'name' => $this->t('Lists'),
+              'items' => ['BulletedList', 'NumberedList'],
+            ],
+            [
+              'name' => $this->t('Media'),
+              'items' => ['Blockquote', 'DrupalImage'],
+            ],
+            [
+              'name' => $this->t('Tools'),
+              'items' => ['Source'],
+            ],
+          ],
+        ],
+      ],
       'plugins' => ['language' => ['language_list' => 'un']],
-    );
+    ];
   }
 
   /**
@@ -140,39 +140,39 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
   public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
     $settings = $editor->getSettings();
 
-    $ckeditor_settings_toolbar = array(
+    $ckeditor_settings_toolbar = [
       '#theme' => 'ckeditor_settings_toolbar',
       '#editor' => $editor,
       '#plugins' => $this->ckeditorPluginManager->getButtons(),
-    );
-    $form['toolbar'] = array(
+    ];
+    $form['toolbar'] = [
       '#type' => 'container',
-      '#attached' => array(
-        'library' => array('ckeditor/drupal.ckeditor.admin'),
+      '#attached' => [
+        'library' => ['ckeditor/drupal.ckeditor.admin'],
         'drupalSettings' => [
           'ckeditor' => [
             'toolbarAdmin' => (string) $this->renderer->renderPlain($ckeditor_settings_toolbar),
           ],
         ],
-      ),
-      '#attributes' => array('class' => array('ckeditor-toolbar-configuration')),
-    );
+      ],
+      '#attributes' => ['class' => ['ckeditor-toolbar-configuration']],
+    ];
 
-    $form['toolbar']['button_groups'] = array(
+    $form['toolbar']['button_groups'] = [
       '#type' => 'textarea',
-      '#title' => t('Toolbar buttons'),
+      '#title' => $this->t('Toolbar buttons'),
       '#default_value' => json_encode($settings['toolbar']['rows']),
-      '#attributes' => array('class' => array('ckeditor-toolbar-textarea')),
-    );
+      '#attributes' => ['class' => ['ckeditor-toolbar-textarea']],
+    ];
 
     // CKEditor plugin settings, if any.
-    $form['plugin_settings'] = array(
+    $form['plugin_settings'] = [
       '#type' => 'vertical_tabs',
-      '#title' => t('CKEditor plugin settings'),
-      '#attributes' => array(
+      '#title' => $this->t('CKEditor plugin settings'),
+      '#attributes' => [
         'id' => 'ckeditor-plugin-settings',
-      ),
-    );
+      ],
+    ];
     $this->ckeditorPluginManager->injectPluginSettingsForm($form, $form_state, $editor);
     if (count(Element::children($form['plugins'])) === 0) {
       unset($form['plugins']);
@@ -186,7 +186,7 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
     // settings to be updated accordingly.
     // Get a list of all external plugins and their corresponding files.
     $plugins = array_keys($this->ckeditorPluginManager->getDefinitions());
-    $all_external_plugins = array();
+    $all_external_plugins = [];
     foreach ($plugins as $plugin_id) {
       $plugin = $this->ckeditorPluginManager->createInstance($plugin_id);
       if (!$plugin->isInternal()) {
@@ -196,37 +196,37 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
     // Get a list of all buttons that are provided by all plugins.
     $all_buttons = array_reduce($this->ckeditorPluginManager->getButtons(), function($result, $item) {
       return array_merge($result, array_keys($item));
-    }, array());
+    }, []);
     // Build a fake Editor object, which we'll use to generate JavaScript
     // settings for this fake Editor instance.
-    $fake_editor = Editor::create(array(
+    $fake_editor = Editor::create([
       'format' => $editor->id(),
       'editor' => 'ckeditor',
-      'settings' => array(
+      'settings' => [
         // Single toolbar row, single button group, all existing buttons.
-        'toolbar' => array(
-         'rows' => array(
-           0 => array(
-             0 => array(
+        'toolbar' => [
+         'rows' => [
+           0 => [
+             0 => [
                'name' => 'All existing buttons',
                'items' => $all_buttons,
-             )
-           )
-         ),
-        ),
+             ]
+           ]
+         ],
+        ],
         'plugins' => $settings['plugins'],
-      ),
-    ));
+      ],
+    ]);
     $config = $this->getJSSettings($fake_editor);
     // Remove the ACF configuration that is generated based on filter settings,
     // because otherwise we cannot retrieve per-feature metadata.
     unset($config['allowedContent']);
-    $form['hidden_ckeditor'] = array(
+    $form['hidden_ckeditor'] = [
       '#markup' => '<div id="ckeditor-hidden" class="hidden"></div>',
-      '#attached' => array(
+      '#attached' => [
         'drupalSettings' => ['ckeditor' => ['hiddenCKEditorConfig' => $config]],
-      ),
-    );
+      ],
+    ];
 
     return $form;
   }
@@ -238,7 +238,7 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
     // Modify the toolbar settings by reference. The values in
     // $form_state->getValue(array('editor', 'settings')) will be saved directly
     // by editor_form_filter_admin_format_submit().
-    $toolbar_settings = &$form_state->getValue(array('editor', 'settings', 'toolbar'));
+    $toolbar_settings = &$form_state->getValue(['editor', 'settings', 'toolbar']);
 
     // The rows key is not built into the form structure, so decode the button
     // groups data into this new key and remove the button_groups key.
@@ -246,8 +246,8 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
     unset($toolbar_settings['button_groups']);
 
     // Remove the plugin settings' vertical tabs state; no need to save that.
-    if ($form_state->hasValue(array('editor', 'settings', 'plugins'))) {
-      $form_state->unsetValue(array('editor', 'settings', 'plugin_settings'));
+    if ($form_state->hasValue(['editor', 'settings', 'plugins'])) {
+      $form_state->unsetValue(['editor', 'settings', 'plugin_settings']);
     }
   }
 
@@ -255,7 +255,7 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public function getJSSettings(Editor $editor) {
-    $settings = array();
+    $settings = [];
 
     // Get the settings for all enabled plugins, even the internal ones.
     $enabled_plugins = array_keys($this->ckeditorPluginManager->getEnabledPluginFiles($editor, TRUE));
@@ -279,7 +279,7 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
 
     // Next, set the most fundamental CKEditor settings.
     $external_plugin_files = $this->ckeditorPluginManager->getEnabledPluginFiles($editor);
-    $settings += array(
+    $settings += [
       'toolbar' => $this->buildToolbarJSSetting($editor),
       'contentsCss' => $this->buildContentsCssJSSetting($editor),
       'extraPlugins' => implode(',', array_keys($external_plugin_files)),
@@ -290,15 +290,15 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
       // styles.js by default.
       // See http://dev.ckeditor.com/ticket/9992#comment:9.
       'stylesSet' => FALSE,
-    );
+    ];
 
     // Finally, set Drupal-specific CKEditor settings.
     $root_relative_file_url = function ($uri) {
       return file_url_transform_relative(file_create_url($uri));
     };
-    $settings += array(
+    $settings += [
       'drupalExternalPlugins' => array_map($root_relative_file_url, $external_plugin_files),
-    );
+    ];
 
     // Parse all CKEditor plugin JavaScript files for translations.
     if ($this->moduleHandler->moduleExists('locale')) {
@@ -326,7 +326,7 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
       $langcodes = $langcode_cache->data;
     }
     if (empty($langcodes)) {
-      $langcodes = array();
+      $langcodes = [];
       // Collect languages included with CKEditor based on file listing.
       $files = scandir('core/assets/vendor/ckeditor/lang');
       foreach ($files as $file) {
@@ -341,7 +341,7 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
     // Get language mapping if available to map to Drupal language codes.
     // This is configurable in the user interface and not expensive to get, so
     // we don't include it in the cached language list.
-    $language_mappings = $this->moduleHandler->moduleExists('language') ? language_get_browser_drupal_langcode_mappings() : array();
+    $language_mappings = $this->moduleHandler->moduleExists('language') ? language_get_browser_drupal_langcode_mappings() : [];
     foreach ($langcodes as $langcode) {
       // If this language code is available in a Drupal mapping, use that to
       // compute a possibility for matching from the Drupal langcode to the
@@ -363,9 +363,9 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public function getLibraries(Editor $editor) {
-    $libraries = array(
+    $libraries = [
       'ckeditor/drupal.ckeditor',
-    );
+    ];
 
     // Get the required libraries for any enabled plugins.
     $enabled_plugins = array_keys($this->ckeditorPluginManager->getEnabledPluginFiles($editor));
@@ -389,7 +389,7 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
    *   An array containing the "toolbar" configuration.
    */
   public function buildToolbarJSSetting(Editor $editor) {
-    $toolbar = array();
+    $toolbar = [];
 
     $settings = $editor->getSettings();
     foreach ($settings['toolbar']['rows'] as $row) {
@@ -412,15 +412,15 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
    *   An array containing the "contentsCss" configuration.
    */
   public function buildContentsCssJSSetting(Editor $editor) {
-    $css = array(
+    $css = [
       drupal_get_path('module', 'ckeditor') . '/css/ckeditor-iframe.css',
       drupal_get_path('module', 'system') . '/css/components/align.module.css',
-    );
+    ];
     $this->moduleHandler->alter('ckeditor_css', $css, $editor);
     // Get a list of all enabled plugins' iframe instance CSS files.
     $plugins_css = array_reduce($this->ckeditorPluginManager->getCssFiles($editor), function($result, $item) {
       return array_merge($result, array_values($item));
-    }, array());
+    }, []);
     $css = array_merge($css, $plugins_css);
     $css = array_merge($css, _ckeditor_theme_css());
     $css = array_map('file_create_url', $css);
diff --git a/web/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php b/web/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
index d10180db3..669dc5f85 100644
--- a/web/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
+++ b/web/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
@@ -20,7 +20,7 @@ class CKEditorAdminTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'editor', 'ckeditor');
+  public static $modules = ['filter', 'editor', 'ckeditor'];
 
   /**
    * A user with the 'administer filters' permission.
@@ -33,22 +33,22 @@ class CKEditorAdminTest extends WebTestBase {
     parent::setUp();
 
     // Create text format.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $filtered_html_format->save();
 
     // Create admin user.
-    $this->adminUser = $this->drupalCreateUser(array('administer filters'));
+    $this->adminUser = $this->drupalCreateUser(['administer filters']);
   }
 
   /**
    * Tests configuring a text editor for an existing text format.
    */
-  function testExistingFormat() {
+  public function testExistingFormat() {
     $ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
 
     $this->drupalLogin($this->adminUser);
@@ -70,43 +70,43 @@ class CKEditorAdminTest extends WebTestBase {
     $this->assertTrue(((string) $options[0]['selected']) === 'selected', 'Option 1 ("None") is selected.');
 
     // Select the "CKEditor" editor and click the "Save configuration" button.
-    $edit = array(
+    $edit = [
       'editor[editor]' => 'ckeditor',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $this->assertRaw(t('You must configure the selected text editor.'));
 
     // Ensure the CKEditor editor returns the expected default settings.
-    $expected_default_settings = array(
-      'toolbar' => array(
-        'rows' => array(
+    $expected_default_settings = [
+      'toolbar' => [
+        'rows' => [
           // Button groups
-          array(
-            array(
+          [
+            [
               'name' => 'Formatting',
-              'items' => array('Bold', 'Italic',),
-            ),
-            array(
+              'items' => ['Bold', 'Italic'],
+            ],
+            [
               'name' => 'Links',
-              'items' => array('DrupalLink', 'DrupalUnlink',),
-            ),
-            array(
+              'items' => ['DrupalLink', 'DrupalUnlink'],
+            ],
+            [
               'name' => 'Lists',
-              'items' => array('BulletedList', 'NumberedList',),
-            ),
-            array(
+              'items' => ['BulletedList', 'NumberedList'],
+            ],
+            [
               'name' => 'Media',
-              'items' => array('Blockquote', 'DrupalImage',),
-            ),
-            array(
+              'items' => ['Blockquote', 'DrupalImage'],
+            ],
+            [
               'name' => 'Tools',
-              'items' => array('Source',),
-            ),
-          ),
-        ),
-      ),
+              'items' => ['Source'],
+            ],
+          ],
+        ],
+      ],
       'plugins' => ['language' => ['language_list' => 'un']],
-    );
+    ];
     $this->assertIdentical($this->castSafeStrings($ckeditor->getDefaultSettings()), $expected_default_settings);
 
     // Keep the "CKEditor" editor selected and click the "Configure" button.
@@ -115,11 +115,11 @@ class CKEditorAdminTest extends WebTestBase {
     $this->assertFalse($editor, 'No Editor config entity exists yet.');
 
     // Ensure that drupalSettings is correct.
-    $ckeditor_settings_toolbar = array(
+    $ckeditor_settings_toolbar = [
       '#theme' => 'ckeditor_settings_toolbar',
       '#editor' => Editor::create(['editor' => 'ckeditor']),
       '#plugins' => $this->container->get('plugin.manager.ckeditor.plugin')->getButtons(),
-    );
+    ];
     $this->assertEqual(
       $this->drupalSettings['ckeditor']['toolbarAdmin'],
       $this->container->get('renderer')->renderPlain($ckeditor_settings_toolbar),
@@ -148,9 +148,9 @@ class CKEditorAdminTest extends WebTestBase {
 
     // Configure the Styles plugin, and ensure the updated settings are saved.
     $this->drupalGet('admin/config/content/formats/manage/filtered_html');
-    $edit = array(
+    $edit = [
       'editor[settings][plugins][stylescombo][styles]' => "h1.title|Title\np.callout|Callout\n\n",
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $expected_settings['plugins']['stylescombo']['styles'] = "h1.title|Title\np.callout|Callout\n\n";
     $editor = Editor::load('filtered_html');
@@ -161,13 +161,13 @@ class CKEditorAdminTest extends WebTestBase {
     // done via drag and drop, but here we can only emulate the end result of
     // that interaction). Test multiple toolbar rows and a divider within a row.
     $this->drupalGet('admin/config/content/formats/manage/filtered_html');
-    $expected_settings['toolbar']['rows'][0][] = array(
+    $expected_settings['toolbar']['rows'][0][] = [
       'name' => 'Action history',
-      'items' => array('Undo', '|', 'Redo', 'JustifyCenter'),
-    );
-    $edit = array(
+      'items' => ['Undo', '|', 'Redo', 'JustifyCenter'],
+    ];
+    $edit = [
       'editor[settings][toolbar][button_groups]' => json_encode($expected_settings['toolbar']['rows']),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $editor = Editor::load('filtered_html');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
@@ -191,7 +191,7 @@ class CKEditorAdminTest extends WebTestBase {
 
     // Now enable the ckeditor_test module, which provides one configurable
     // CKEditor plugin — this should not affect the Editor config entity.
-    \Drupal::service('module_installer')->install(array('ckeditor_test'));
+    \Drupal::service('module_installer')->install(['ckeditor_test']);
     $this->resetAll();
     $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
     $this->drupalGet('admin/config/content/formats/manage/filtered_html');
@@ -203,9 +203,9 @@ class CKEditorAdminTest extends WebTestBase {
 
     // Finally, check the "Ultra llama mode" checkbox.
     $this->drupalGet('admin/config/content/formats/manage/filtered_html');
-    $edit = array(
+    $edit = [
       'editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]' => '1',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $this->drupalGet('admin/config/content/formats/manage/filtered_html');
     $ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and @checked="checked"]');
@@ -222,7 +222,7 @@ class CKEditorAdminTest extends WebTestBase {
    * This test only needs to ensure that the basics of the CKEditor
    * configuration form work; details are tested in testExistingFormat().
    */
-  function testNewFormat() {
+  public function testNewFormat() {
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('admin/config/content/formats/add');
 
@@ -239,11 +239,11 @@ class CKEditorAdminTest extends WebTestBase {
 
     // Name our fancy new text format, select the "CKEditor" editor and click
     // the "Configure" button.
-    $edit = array(
+    $edit = [
       'name' => 'My amazing text format',
       'format' => 'amazing_format',
       'editor[editor]' => 'ckeditor',
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, 'editor_configure');
     $filter_format = FilterFormat::load('amazing_format');
     $this->assertFalse($filter_format, 'No FilterFormat config entity exists yet.');
diff --git a/web/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php b/web/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
index e14b6e399..438aeba28 100644
--- a/web/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
+++ b/web/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
@@ -18,7 +18,7 @@ class CKEditorLoadingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'editor', 'ckeditor', 'node');
+  public static $modules = ['filter', 'editor', 'ckeditor', 'node'];
 
   /**
    * An untrusted user with access to only the 'plain_text' format.
@@ -38,12 +38,12 @@ class CKEditorLoadingTest extends WebTestBase {
     parent::setUp();
 
     // Create text format, associate CKEditor.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $filtered_html_format->save();
     $editor = Editor::create([
       'format' => 'filtered_html',
@@ -53,28 +53,28 @@ class CKEditorLoadingTest extends WebTestBase {
 
     // Create a second format without an associated editor so a drop down select
     // list is created when selecting formats.
-    $full_html_format = FilterFormat::create(array(
+    $full_html_format = FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $full_html_format->save();
 
     // Create node type.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'article',
       'name' => 'Article',
-    ));
+    ]);
 
-    $this->untrustedUser = $this->drupalCreateUser(array('create article content', 'edit any article content'));
-    $this->normalUser = $this->drupalCreateUser(array('create article content', 'edit any article content', 'use text format filtered_html', 'use text format full_html'));
+    $this->untrustedUser = $this->drupalCreateUser(['create article content', 'edit any article content']);
+    $this->normalUser = $this->drupalCreateUser(['create article content', 'edit any article content', 'use text format filtered_html', 'use text format full_html']);
   }
 
   /**
    * Tests loading of CKEditor CSS, JS and JS settings.
    */
-  function testLoading() {
+  public function testLoading() {
     // The untrusted user:
     // - has access to 1 text format (plain_text);
     // - doesn't have access to the filtered_html text format, so: no text editor.
@@ -101,13 +101,13 @@ class CKEditorLoadingTest extends WebTestBase {
     list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck();
     $ckeditor_plugin = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
     $editor = Editor::load('filtered_html');
-    $expected = array('formats' => array('filtered_html' => array(
+    $expected = ['formats' => ['filtered_html' => [
       'format' => 'filtered_html',
       'editor' => 'ckeditor',
       'editorSettings' => $this->castSafeStrings($ckeditor_plugin->getJSSettings($editor)),
       'editorSupportsContentFiltering' => TRUE,
       'isXssSafe' => FALSE,
-    )));
+    ]]];
     $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
     $this->assertIdentical($expected, $this->castSafeStrings($settings['editor']), "Text Editor module's JavaScript settings on the page are correct.");
     $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
@@ -122,7 +122,7 @@ class CKEditorLoadingTest extends WebTestBase {
     // NOTE: the tests in CKEditorTest already ensure that changing the
     // configuration also results in modified CKEditor configuration, so we
     // don't test that here.
-    \Drupal::service('module_installer')->install(array('ckeditor_test'));
+    \Drupal::service('module_installer')->install(['ckeditor_test']);
     $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
     $editor_settings = $editor->getSettings();
     $editor_settings['toolbar']['rows'][0][0]['items'][] = 'Llama';
@@ -130,15 +130,15 @@ class CKEditorLoadingTest extends WebTestBase {
     $editor->save();
     $this->drupalGet('node/add/article');
     list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck();
-    $expected = array(
-      'formats' => array(
-        'filtered_html' => array(
+    $expected = [
+      'formats' => [
+        'filtered_html' => [
           'format' => 'filtered_html',
           'editor' => 'ckeditor',
           'editorSettings' => $this->castSafeStrings($ckeditor_plugin->getJSSettings($editor)),
           'editorSupportsContentFiltering' => TRUE,
           'isXssSafe' => FALSE,
-    )));
+    ]]];
     $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
     $this->assertIdentical($expected, $this->castSafeStrings($settings['editor']), "Text Editor module's JavaScript settings on the page are correct.");
     $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
@@ -158,7 +158,7 @@ class CKEditorLoadingTest extends WebTestBase {
   /**
    * Tests presence of essential configuration even without Internal's buttons.
    */
-  protected function testLoadingWithoutInternalButtons() {
+  public function testLoadingWithoutInternalButtons() {
     // Change the CKEditor text editor configuration to only have link buttons.
     // This means:
     // - 0 buttons are from \Drupal\ckeditor\Plugin\CKEditorPlugin\Internal
@@ -197,11 +197,11 @@ class CKEditorLoadingTest extends WebTestBase {
   /**
    * Tests loading of theme's CKEditor stylesheets defined in the .info file.
    */
-  function testExternalStylesheets() {
+  public function testExternalStylesheets() {
     $theme_handler = \Drupal::service('theme_handler');
     // Case 1: Install theme which has an absolute external CSS URL.
     $theme_handler->install(['test_ckeditor_stylesheets_external']);
-    $theme_handler->setDefault('test_ckeditor_stylesheets_external');
+    $this->config('system.theme')->set('default', 'test_ckeditor_stylesheets_external')->save();
     $expected = [
       'https://fonts.googleapis.com/css?family=Open+Sans',
     ];
@@ -209,7 +209,7 @@ class CKEditorLoadingTest extends WebTestBase {
 
     // Case 2: Install theme which has an external protocol-relative CSS URL.
     $theme_handler->install(['test_ckeditor_stylesheets_protocol_relative']);
-    $theme_handler->setDefault('test_ckeditor_stylesheets_protocol_relative');
+    $this->config('system.theme')->set('default', 'test_ckeditor_stylesheets_protocol_relative')->save();
     $expected = [
       '//fonts.googleapis.com/css?family=Open+Sans',
     ];
@@ -217,7 +217,7 @@ class CKEditorLoadingTest extends WebTestBase {
 
     // Case 3: Install theme which has a relative CSS URL.
     $theme_handler->install(['test_ckeditor_stylesheets_relative']);
-    $theme_handler->setDefault('test_ckeditor_stylesheets_relative');
+    $this->config('system.theme')->set('default', 'test_ckeditor_stylesheets_relative')->save();
     $expected = [
       'core/modules/system/tests/themes/test_ckeditor_stylesheets_relative/css/yokotsoko.css',
     ];
@@ -226,7 +226,7 @@ class CKEditorLoadingTest extends WebTestBase {
 
   protected function getThingsToCheck() {
     $settings = $this->getDrupalSettings();
-    return array(
+    return [
       // JavaScript settings.
       $settings,
       // Editor.module's JS settings present.
@@ -239,7 +239,7 @@ class CKEditorLoadingTest extends WebTestBase {
       $this->xpath('//textarea[@id="edit-body-0-value"]'),
       // Format selector.
       $this->xpath('//select[contains(@class, "filter-list")]'),
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/ckeditor/src/Tests/CKEditorStylesComboAdminTest.php b/web/core/modules/ckeditor/src/Tests/CKEditorStylesComboAdminTest.php
index d70980ef4..1a2f7679b 100644
--- a/web/core/modules/ckeditor/src/Tests/CKEditorStylesComboAdminTest.php
+++ b/web/core/modules/ckeditor/src/Tests/CKEditorStylesComboAdminTest.php
@@ -59,7 +59,7 @@ class CKEditorStylesComboAdminTest extends WebTestBase {
   /**
    * Tests StylesCombo settings for an existing text format.
    */
-  function testExistingFormat() {
+  public function testExistingFormat() {
     $ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
     $default_settings = $ckeditor->getDefaultSettings();
 
diff --git a/web/core/modules/ckeditor/tests/modules/ckeditor_test.libraries.yml b/web/core/modules/ckeditor/tests/modules/ckeditor_test.libraries.yml
new file mode 100644
index 000000000..82bd7eee4
--- /dev/null
+++ b/web/core/modules/ckeditor/tests/modules/ckeditor_test.libraries.yml
@@ -0,0 +1,5 @@
+ajax_css:
+  js:
+    js/ajax-css.js: {}
+  dependencies:
+    - ckeditor/drupal.ckeditor
diff --git a/web/core/modules/ckeditor/tests/modules/ckeditor_test.routing.yml b/web/core/modules/ckeditor/tests/modules/ckeditor_test.routing.yml
new file mode 100644
index 000000000..833edc6a3
--- /dev/null
+++ b/web/core/modules/ckeditor/tests/modules/ckeditor_test.routing.yml
@@ -0,0 +1,7 @@
+ckeditor_test.ajax_css:
+  path: '/ckeditor_test/ajax_css'
+  defaults:
+    _title: 'AJAX CSS Test'
+    _form: '\Drupal\ckeditor_test\Form\AjaxCssForm'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/ckeditor/tests/modules/css/test.css b/web/core/modules/ckeditor/tests/modules/css/test.css
new file mode 100644
index 000000000..60f1eab97
--- /dev/null
+++ b/web/core/modules/ckeditor/tests/modules/css/test.css
@@ -0,0 +1,3 @@
+body {
+  color: red;
+}
diff --git a/web/core/modules/ckeditor/tests/modules/js/ajax-css.js b/web/core/modules/ckeditor/tests/modules/js/ajax-css.js
new file mode 100644
index 000000000..142b4eea0
--- /dev/null
+++ b/web/core/modules/ckeditor/tests/modules/js/ajax-css.js
@@ -0,0 +1,24 @@
+/**
+ * @file
+ * Contains client-side code for testing CSS delivered to CKEditor via AJAX.
+ */
+
+(function (Drupal, ckeditor, editorSettings, $) {
+
+  'use strict';
+
+  Drupal.behaviors.ajaxCssForm = {
+
+    attach: function (context) {
+      // Initialize an inline CKEditor on the #edit-inline element if it
+      // isn't editable already.
+      $(context)
+        .find('#edit-inline')
+        .not('[contenteditable]')
+        .each(function () {
+          ckeditor.attachInlineEditor(this, editorSettings.formats.test_format);
+        });
+    }
+  };
+
+})(Drupal, Drupal.editors.ckeditor, drupalSettings.editor, jQuery);
diff --git a/web/core/modules/ckeditor/tests/modules/src/Form/AjaxCssForm.php b/web/core/modules/ckeditor/tests/modules/src/Form/AjaxCssForm.php
new file mode 100644
index 000000000..7b6d59253
--- /dev/null
+++ b/web/core/modules/ckeditor/tests/modules/src/Form/AjaxCssForm.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace Drupal\ckeditor_test\Form;
+
+use Drupal\ckeditor\Ajax\AddStyleSheetCommand;
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * A form for testing delivery of CSS to CKEditor via AJAX.
+ */
+class AjaxCssForm extends FormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'ckeditor_test_ajax_css_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    // Create an inline and iframe CKEditor instance so we can test against
+    // both.
+    $form['inline'] = [
+      '#type' => 'container',
+      '#attached' => [
+        'library' => [
+          'ckeditor_test/ajax_css',
+        ],
+      ],
+      '#children' => $this->t('Here be dragons.'),
+    ];
+    $form['iframe'] = [
+      '#type' => 'text_format',
+      '#default_value' => $this->t('Here be llamas.'),
+    ];
+
+    // A pair of buttons to trigger the AJAX events.
+    $form['actions'] = [
+      'css_inline' => [
+        '#type' => 'submit',
+        '#value' => $this->t('Add CSS to inline CKEditor instance'),
+        '#ajax' => [
+          'callback' => [$this, 'addCssInline'],
+        ],
+      ],
+      'css_frame' => [
+        '#type' => 'submit',
+        '#value' => $this->t('Add CSS to iframe CKEditor instance'),
+        '#ajax' => [
+          'callback' => [$this, 'addCssIframe'],
+        ],
+      ],
+      '#type' => 'actions',
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // Nothing to do here.
+  }
+
+  /**
+   * Generates an AJAX response to add CSS to a CKEditor Text Editor instance.
+   *
+   * @param string $editor_id
+   *   The Text Editor instance ID.
+   *
+   * @return \Drupal\Core\Ajax\AjaxResponse
+   *   An AJAX response.
+   */
+  protected function generateResponse($editor_id) {
+    // Build a URL to the style sheet that will be added.
+    $url = drupal_get_path('module', 'ckeditor_test') . '/css/test.css';
+    $url = file_create_url($url);
+    $url = file_url_transform_relative($url);
+
+    $response = new AjaxResponse();
+    return $response
+      ->addCommand(new AddStyleSheetCommand($editor_id, [$url]));
+  }
+
+  /**
+   * Handles the AJAX request to add CSS to the inline editor.
+   *
+   * @return \Drupal\Core\Ajax\AjaxResponse
+   *   An AJAX response.
+   */
+  public function addCssInline() {
+    return $this->generateResponse('edit-inline');
+  }
+
+  /**
+   * Handles the AJAX request to add CSS to the iframe editor.
+   *
+   * @return \Drupal\Core\Ajax\AjaxResponse
+   *   An AJAX response.
+   */
+  public function addCssIframe() {
+    return $this->generateResponse('edit-iframe-value');
+  }
+
+}
diff --git a/web/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php b/web/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php
index 92c448b69..eb02d37ad 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php
@@ -18,7 +18,7 @@ class CKEditorPluginManagerTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'filter', 'editor', 'ckeditor');
+  public static $modules = ['system', 'user', 'filter', 'editor', 'ckeditor'];
 
   /**
    * The manager for "CKEditor plugin" plugins.
@@ -33,12 +33,12 @@ class CKEditorPluginManagerTest extends KernelTestBase {
     // Install the Filter module.
 
     // Create text format, associate CKEditor.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $filtered_html_format->save();
     $editor = Editor::create([
       'format' => 'filtered_html',
@@ -50,34 +50,34 @@ class CKEditorPluginManagerTest extends KernelTestBase {
   /**
    * Tests the enabling of plugins.
    */
-  function testEnabledPlugins() {
+  public function testEnabledPlugins() {
     $this->manager = $this->container->get('plugin.manager.ckeditor.plugin');
     $editor = Editor::load('filtered_html');
 
     // Case 1: no CKEditor plugins.
     $definitions = array_keys($this->manager->getDefinitions());
     sort($definitions);
-    $this->assertIdentical(array('drupalimage', 'drupalimagecaption', 'drupallink', 'internal', 'language', 'stylescombo'), $definitions, 'No CKEditor plugins found besides the built-in ones.');
-    $enabled_plugins = array(
+    $this->assertIdentical(['drupalimage', 'drupalimagecaption', 'drupallink', 'internal', 'language', 'stylescombo'], $definitions, 'No CKEditor plugins found besides the built-in ones.');
+    $enabled_plugins = [
       'drupalimage' => drupal_get_path('module', 'ckeditor') . '/js/plugins/drupalimage/plugin.js',
       'drupallink' => drupal_get_path('module', 'ckeditor') . '/js/plugins/drupallink/plugin.js',
-    );
+    ];
     $this->assertIdentical($enabled_plugins, $this->manager->getEnabledPluginFiles($editor), 'Only built-in plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $enabled_plugins, $this->manager->getEnabledPluginFiles($editor, TRUE), 'Only the "internal" plugin is enabled.');
+    $this->assertIdentical(['internal' => NULL] + $enabled_plugins, $this->manager->getEnabledPluginFiles($editor, TRUE), 'Only the "internal" plugin is enabled.');
 
     // Enable the CKEditor Test module, which has the Llama plugin (plus four
     // variations of it, to cover all possible ways a plugin can be enabled) and
     // clear the editor manager's cache so it is picked up.
-    $this->enableModules(array('ckeditor_test'));
+    $this->enableModules(['ckeditor_test']);
     $this->manager = $this->container->get('plugin.manager.ckeditor.plugin');
     $this->manager->clearCachedDefinitions();
 
     // Case 2: CKEditor plugins are available.
     $plugin_ids = array_keys($this->manager->getDefinitions());
     sort($plugin_ids);
-    $this->assertIdentical(array('drupalimage', 'drupalimagecaption', 'drupallink', 'internal', 'language', 'llama', 'llama_button', 'llama_contextual', 'llama_contextual_and_button', 'llama_css', 'stylescombo'), $plugin_ids, 'Additional CKEditor plugins found.');
+    $this->assertIdentical(['drupalimage', 'drupalimagecaption', 'drupallink', 'internal', 'language', 'llama', 'llama_button', 'llama_contextual', 'llama_contextual_and_button', 'llama_css', 'stylescombo'], $plugin_ids, 'Additional CKEditor plugins found.');
     $this->assertIdentical($enabled_plugins, $this->manager->getEnabledPluginFiles($editor), 'Only the internal plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $enabled_plugins, $this->manager->getEnabledPluginFiles($editor, TRUE), 'Only the "internal" plugin is enabled.');
+    $this->assertIdentical(['internal' => NULL] + $enabled_plugins, $this->manager->getEnabledPluginFiles($editor, TRUE), 'Only the "internal" plugin is enabled.');
 
     // Case 3: enable each of the newly available plugins, if possible:
     // a. Llama: cannot be enabled, since it does not implement
@@ -100,48 +100,48 @@ class CKEditorPluginManagerTest extends KernelTestBase {
     $settings['toolbar']['rows'][0][0]['items'][] = 'Llama';
     $editor->setSettings($settings);
     $editor->save();
-    $file = array();
+    $file = [];
     $file['b'] = drupal_get_path('module', 'ckeditor_test') . '/js/llama_button.js';
     $file['c'] = drupal_get_path('module', 'ckeditor_test') . '/js/llama_contextual.js';
     $file['cb'] = drupal_get_path('module', 'ckeditor_test') . '/js/llama_contextual_and_button.js';
     $file['css'] = drupal_get_path('module', 'ckeditor_test') . '/js/llama_css.js';
-    $expected = $enabled_plugins + array('llama_button' => $file['b'], 'llama_contextual_and_button' => $file['cb']);
+    $expected = $enabled_plugins + ['llama_button' => $file['b'], 'llama_contextual_and_button' => $file['cb']];
     $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The LlamaButton and LlamaContextualAndButton plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LlamaButton and LlamaContextualAndButton plugins are enabled.');
+    $this->assertIdentical(['internal' => NULL] + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LlamaButton and LlamaContextualAndButton plugins are enabled.');
     $settings['toolbar'] = $original_toolbar;
     $settings['toolbar']['rows'][0][0]['items'][] = 'Strike';
     $editor->setSettings($settings);
     $editor->save();
-    $expected = $enabled_plugins + array('llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']);
+    $expected = $enabled_plugins + ['llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']];
     $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The  LLamaContextual and LlamaContextualAndButton plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LlamaContextual and LlamaContextualAndButton plugins are enabled.');
+    $this->assertIdentical(['internal' => NULL] + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LlamaContextual and LlamaContextualAndButton plugins are enabled.');
     $settings['toolbar']['rows'][0][0]['items'][] = 'Llama';
     $editor->setSettings($settings);
     $editor->save();
-    $expected = $enabled_plugins + array('llama_button' => $file['b'], 'llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']);
+    $expected = $enabled_plugins + ['llama_button' => $file['b'], 'llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']];
     $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The LlamaButton, LlamaContextual and LlamaContextualAndButton plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LLamaButton, LlamaContextual and LlamaContextualAndButton plugins are enabled.');
+    $this->assertIdentical(['internal' => NULL] + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LLamaButton, LlamaContextual and LlamaContextualAndButton plugins are enabled.');
     $settings['toolbar']['rows'][0][0]['items'][] = 'LlamaCSS';
     $editor->setSettings($settings);
     $editor->save();
-    $expected = $enabled_plugins + array('llama_button' => $file['b'], 'llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb'], 'llama_css' => $file['css']);
+    $expected = $enabled_plugins + ['llama_button' => $file['b'], 'llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb'], 'llama_css' => $file['css']];
     $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The LlamaButton, LlamaContextual, LlamaContextualAndButton and LlamaCSS plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LLamaButton, LlamaContextual, LlamaContextualAndButton and LlamaCSS plugins are enabled.');
+    $this->assertIdentical(['internal' => NULL] + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LLamaButton, LlamaContextual, LlamaContextualAndButton and LlamaCSS plugins are enabled.');
   }
 
   /**
    * Tests the iframe instance CSS files of plugins.
    */
-  function testCssFiles() {
+  public function testCssFiles() {
     $this->manager = $this->container->get('plugin.manager.ckeditor.plugin');
     $editor = Editor::load('filtered_html');
 
     // Case 1: no CKEditor iframe instance CSS file.
-    $this->assertIdentical(array(), $this->manager->getCssFiles($editor), 'No iframe instance CSS file found.');
+    $this->assertIdentical([], $this->manager->getCssFiles($editor), 'No iframe instance CSS file found.');
 
     // Enable the CKEditor Test module, which has the LlamaCss plugin and
     // clear the editor manager's cache so it is picked up.
-    $this->enableModules(array('ckeditor_test'));
+    $this->enableModules(['ckeditor_test']);
     $this->manager = $this->container->get('plugin.manager.ckeditor.plugin');
     $settings = $editor->getSettings();
     // LlamaCss: automatically enabled by adding its 'LlamaCSS' button.
@@ -150,9 +150,9 @@ class CKEditorPluginManagerTest extends KernelTestBase {
     $editor->save();
 
     // Case 2: CKEditor iframe instance CSS file.
-    $expected = array(
-      'llama_css' => array(drupal_get_path('module', 'ckeditor_test') . '/css/llama.css')
-    );
+    $expected = [
+      'llama_css' => [drupal_get_path('module', 'ckeditor_test') . '/css/llama.css']
+    ];
     $this->assertIdentical($expected, $this->manager->getCssFiles($editor), 'Iframe instance CSS file found.');
   }
 
diff --git a/web/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php b/web/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php
index 2bbd1e655..4fbead9a3 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php
@@ -19,7 +19,7 @@ class CKEditorTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'filter', 'editor', 'ckeditor', 'filter_test');
+  public static $modules = ['system', 'user', 'filter', 'editor', 'ckeditor', 'filter_test'];
 
   /**
    * An instance of the "CKEditor" text editor plugin.
@@ -41,19 +41,19 @@ class CKEditorTest extends KernelTestBase {
     // Install the Filter module.
 
     // Create text format, associate CKEditor.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
-      'filters' => array(
-        'filter_html' => array(
+      'filters' => [
+        'filter_html' => [
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<h2 id> <h3> <h4> <h5> <h6> <p> <br> <strong> <a href hreflang>',
-          )
-        ),
-      ),
-    ));
+          ]
+        ],
+      ],
+    ]);
     $filtered_html_format->save();
     $editor = Editor::create([
       'format' => 'filtered_html',
@@ -68,11 +68,11 @@ class CKEditorTest extends KernelTestBase {
   /**
    * Tests CKEditor::getJSSettings().
    */
-  function testGetJSSettings() {
+  public function testGetJSSettings() {
     $editor = Editor::load('filtered_html');
 
     // Default toolbar.
-    $expected_config = $this->getDefaultInternalConfig() + array(
+    $expected_config = $this->getDefaultInternalConfig() + [
       'drupalImage_dialogTitleAdd' => 'Insert Image',
       'drupalImage_dialogTitleEdit' => 'Edit Image',
       'drupalLink_dialogTitleAdd' => 'Add Link',
@@ -84,11 +84,11 @@ class CKEditorTest extends KernelTestBase {
       'extraPlugins' => 'drupalimage,drupallink',
       'language' => 'en',
       'stylesSet' => FALSE,
-      'drupalExternalPlugins' => array(
+      'drupalExternalPlugins' => [
         'drupalimage' => file_url_transform_relative(file_create_url('core/modules/ckeditor/js/plugins/drupalimage/plugin.js')),
         'drupallink' => file_url_transform_relative(file_create_url('core/modules/ckeditor/js/plugins/drupallink/plugin.js')),
-      ),
-    );
+      ],
+    ];
     $expected_config = $this->castSafeStrings($expected_config);
     ksort($expected_config);
     ksort($expected_config['allowedContent']);
@@ -96,7 +96,7 @@ class CKEditorTest extends KernelTestBase {
 
     // Customize the configuration: add button, have two contextually enabled
     // buttons, and configure a CKEditor plugin setting.
-    $this->enableModules(array('ckeditor_test'));
+    $this->enableModules(['ckeditor_test']);
     $this->container->get('plugin.manager.editor')->clearCachedDefinitions();
     $this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
     $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
@@ -121,16 +121,16 @@ class CKEditorTest extends KernelTestBase {
     $format->filters('filter_html')->settings['allowed_html'] .= '<pre class> <h1> <blockquote class="*"> <address class="foo bar-* *">';
     $format->save();
 
-    $expected_config['allowedContent']['pre'] = array('attributes' => 'class', 'styles' => FALSE, 'classes' => TRUE);
-    $expected_config['allowedContent']['h1'] = array('attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE);
-    $expected_config['allowedContent']['blockquote'] = array('attributes' => 'class', 'styles' => FALSE, 'classes' => TRUE);
-    $expected_config['allowedContent']['address'] = array('attributes' => 'class', 'styles' => FALSE, 'classes' => 'foo,bar-*');
+    $expected_config['allowedContent']['pre'] = ['attributes' => 'class', 'styles' => FALSE, 'classes' => TRUE];
+    $expected_config['allowedContent']['h1'] = ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE];
+    $expected_config['allowedContent']['blockquote'] = ['attributes' => 'class', 'styles' => FALSE, 'classes' => TRUE];
+    $expected_config['allowedContent']['address'] = ['attributes' => 'class', 'styles' => FALSE, 'classes' => 'foo,bar-*'];
     $expected_config['format_tags'] = 'p;h1;h2;h3;h4;h5;h6;pre';
     ksort($expected_config['allowedContent']);
     $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.');
 
     // Disable the filter_html filter: allow *all *tags.
-    $format->setFilterConfig('filter_html', array('status' => 0));
+    $format->setFilterConfig('filter_html', ['status' => 0]);
     $format->save();
 
     $expected_config['allowedContent'] = TRUE;
@@ -139,73 +139,73 @@ class CKEditorTest extends KernelTestBase {
     $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.');
 
     // Enable the filter_test_restrict_tags_and_attributes filter.
-    $format->setFilterConfig('filter_test_restrict_tags_and_attributes', array(
+    $format->setFilterConfig('filter_test_restrict_tags_and_attributes', [
       'status' => 1,
-      'settings' => array(
-        'restrictions' => array(
-          'allowed' => array(
+      'settings' => [
+        'restrictions' => [
+          'allowed' => [
             'p' => TRUE,
-            'a' => array(
+            'a' => [
               'href' => TRUE,
-              'rel' => array('nofollow' => TRUE),
-              'class' => array('external' => TRUE),
-              'target' => array('_blank' => FALSE),
-            ),
-            'span' => array(
-              'class' => array('dodo' => FALSE),
-              'property' => array('dc:*' => TRUE),
-              'rel' => array('foaf:*' => FALSE),
-              'style' => array('underline' => FALSE, 'color' => FALSE, 'font-size' => TRUE),
-            ),
-            '*' => array(
+              'rel' => ['nofollow' => TRUE],
+              'class' => ['external' => TRUE],
+              'target' => ['_blank' => FALSE],
+            ],
+            'span' => [
+              'class' => ['dodo' => FALSE],
+              'property' => ['dc:*' => TRUE],
+              'rel' => ['foaf:*' => FALSE],
+              'style' => ['underline' => FALSE, 'color' => FALSE, 'font-size' => TRUE],
+            ],
+            '*' => [
               'style' => FALSE,
               'on*' => FALSE,
-              'class' => array('is-a-hipster-llama' => TRUE, 'and-more' => TRUE),
+              'class' => ['is-a-hipster-llama' => TRUE, 'and-more' => TRUE],
               'data-*' => TRUE,
-            ),
+            ],
             'del' => FALSE,
-          ),
-        ),
-      ),
-    ));
+          ],
+        ],
+      ],
+    ]);
     $format->save();
 
-    $expected_config['allowedContent'] = array(
-      'p' => array(
+    $expected_config['allowedContent'] = [
+      'p' => [
         'attributes' => TRUE,
         'styles' => FALSE,
         'classes' => 'is-a-hipster-llama,and-more',
-      ),
-      'a' => array(
+      ],
+      'a' => [
         'attributes' => 'href,rel,class,target',
         'styles' => FALSE,
         'classes' => 'external',
-      ),
-      'span' => array(
+      ],
+      'span' => [
         'attributes' => 'class,property,rel,style',
         'styles' => 'font-size',
         'classes' => FALSE,
-      ),
-      '*' => array(
+      ],
+      '*' => [
         'attributes' => 'class,data-*',
         'styles' => FALSE,
         'classes' => 'is-a-hipster-llama,and-more',
-      ),
-      'del' => array(
+      ],
+      'del' => [
         'attributes' => FALSE,
         'styles' => FALSE,
         'classes' => FALSE,
-      ),
-    );
-    $expected_config['disallowedContent'] = array(
-      'span' => array(
+      ],
+    ];
+    $expected_config['disallowedContent'] = [
+      'span' => [
         'styles' => 'underline,color',
         'classes' => 'dodo',
-      ),
-      '*' => array(
+      ],
+      '*' => [
         'attributes' => 'on*',
-      ),
-    );
+      ],
+    ];
     $expected_config['format_tags'] = 'p';
     ksort($expected_config);
     ksort($expected_config['allowedContent']);
@@ -216,7 +216,7 @@ class CKEditorTest extends KernelTestBase {
   /**
    * Tests CKEditor::buildToolbarJSSetting().
    */
-  function testBuildToolbarJSSetting() {
+  public function testBuildToolbarJSSetting() {
     $editor = Editor::load('filtered_html');
 
     // Default toolbar.
@@ -232,7 +232,7 @@ class CKEditorTest extends KernelTestBase {
     $this->assertIdentical($expected, $this->castSafeStrings($this->ckeditor->buildToolbarJSSetting($editor)), '"toolbar" configuration part of JS settings built correctly for customized toolbar.');
 
     // Enable the editor_test module, customize further.
-    $this->enableModules(array('ckeditor_test'));
+    $this->enableModules(['ckeditor_test']);
     $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
     // Override the label of a toolbar component.
     $settings['toolbar']['rows'][0][0]['name'] = 'JunkScience';
@@ -247,7 +247,7 @@ class CKEditorTest extends KernelTestBase {
   /**
    * Tests CKEditor::buildContentsCssJSSetting().
    */
-  function testBuildContentsCssJSSetting() {
+  public function testBuildContentsCssJSSetting() {
     $editor = Editor::load('filtered_html');
 
     // Default toolbar.
@@ -255,7 +255,7 @@ class CKEditorTest extends KernelTestBase {
     $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly for default toolbar.');
 
     // Enable the editor_test module, which implements hook_ckeditor_css_alter().
-    $this->enableModules(array('ckeditor_test'));
+    $this->enableModules(['ckeditor_test']);
     $expected[] = file_url_transform_relative(file_create_url(drupal_get_path('module', 'ckeditor_test') . '/ckeditor_test.css'));
     $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a hook_ckeditor_css_alter() implementation exists.');
 
@@ -273,7 +273,7 @@ class CKEditorTest extends KernelTestBase {
 
     // Enable the Bartik theme, which specifies a CKEditor stylesheet.
     \Drupal::service('theme_handler')->install(['bartik']);
-    \Drupal::service('theme_handler')->setDefault('bartik');
+    $this->config('system.theme')->set('default', 'bartik')->save();
     $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/base/elements.css'));
     $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/captions.css'));
     $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/table.css'));
@@ -284,7 +284,7 @@ class CKEditorTest extends KernelTestBase {
   /**
    * Tests Internal::getConfig().
    */
-  function testInternalGetConfig() {
+  public function testInternalGetConfig() {
     $editor = Editor::load('filtered_html');
     $internal_plugin = $this->container->get('plugin.manager.ckeditor.plugin')->createInstance('internal');
 
@@ -305,7 +305,7 @@ class CKEditorTest extends KernelTestBase {
   /**
    * Tests StylesCombo::getConfig().
    */
-  function testStylesComboGetConfig() {
+  public function testStylesComboGetConfig() {
     $editor = Editor::load('filtered_html');
     $stylescombo_plugin = $this->container->get('plugin.manager.ckeditor.plugin')->createInstance('stylescombo');
 
@@ -315,7 +315,7 @@ class CKEditorTest extends KernelTestBase {
     $settings['plugins']['stylescombo']['styles'] = '';
     $editor->setSettings($settings);
     $editor->save();
-    $expected['stylesSet'] = array();
+    $expected['stylesSet'] = [];
     $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
 
     // Configure the optional "styles" setting in odd ways that shouldn't affect
@@ -333,10 +333,10 @@ class CKEditorTest extends KernelTestBase {
     $settings['plugins']['stylescombo']['styles'] = "h1.title|Title\np.mAgical.Callout|Callout";
     $editor->setSettings($settings);
     $editor->save();
-    $expected['stylesSet'] = array(
-      array('name' => 'Title', 'element' => 'h1', 'attributes' => array('class' => 'title')),
-      array('name' => 'Callout', 'element' => 'p', 'attributes' => array('class' => 'mAgical Callout')),
-    );
+    $expected['stylesSet'] = [
+      ['name' => 'Title', 'element' => 'h1', 'attributes' => ['class' => 'title']],
+      ['name' => 'Callout', 'element' => 'p', 'attributes' => ['class' => 'mAgical Callout']],
+    ];
     $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
 
     // Same configuration, but now interspersed with nonsense. Should yield the
@@ -350,7 +350,7 @@ class CKEditorTest extends KernelTestBase {
     $settings['plugins']['stylescombo']['styles'] = "      h1 |  Title ";
     $editor->setSettings($settings);
     $editor->save();
-    $expected['stylesSet'] = array(array('name' => 'Title', 'element' => 'h1'));
+    $expected['stylesSet'] = [['name' => 'Title', 'element' => 'h1']];
     $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
 
     // Invalid syntax should cause stylesSet to be set to FALSE.
@@ -364,10 +364,10 @@ class CKEditorTest extends KernelTestBase {
   /**
    * Tests language list availability in CKEditor.
    */
-  function testLanguages() {
+  public function testLanguages() {
     // Get CKEditor supported language codes and spot-check.
-    $this->enableModules(array('language'));
-    $this->installConfig(array('language'));
+    $this->enableModules(['language']);
+    $this->installConfig(['language']);
     $langcodes = $this->ckeditor->getLangcodes();
 
     // Language codes transformed with browser mappings.
@@ -389,15 +389,15 @@ class CKEditorTest extends KernelTestBase {
   /**
    * Tests that CKEditor plugins participate in JS translation.
    */
-  function testJSTranslation() {
-    $this->enableModules(array('language', 'locale'));
+  public function testJSTranslation() {
+    $this->enableModules(['language', 'locale']);
     $this->installSchema('locale', 'locales_source');
     $this->installSchema('locale', 'locales_location');
     $this->installSchema('locale', 'locales_target');
     $editor = Editor::load('filtered_html');
     $this->ckeditor->getJSSettings($editor);
     $localeStorage = $this->container->get('locale.storage');
-    $string = $localeStorage->findString(array('source' => 'Edit Link', 'context' => ''));
+    $string = $localeStorage->findString(['source' => 'Edit Link', 'context' => '']);
     $this->assertTrue(!empty($string), 'String from JavaScript file saved.');
 
     // With locale module, CKEditor should not adhere to the language selected.
@@ -428,14 +428,14 @@ class CKEditorTest extends KernelTestBase {
   }
 
   protected function getDefaultInternalConfig() {
-    return array(
+    return [
       'customConfig' => '',
       'pasteFromWordPromptCleanup' => TRUE,
       'resize_dir' => 'vertical',
-      'justifyClasses' => array('text-align-left', 'text-align-center', 'text-align-right', 'text-align-justify'),
+      'justifyClasses' => ['text-align-left', 'text-align-center', 'text-align-right', 'text-align-justify'],
       'entities' => FALSE,
       'disableNativeSpellChecker' => FALSE,
-    );
+    ];
   }
 
   protected function getDefaultAllowedContentConfig() {
@@ -454,42 +454,42 @@ class CKEditorTest extends KernelTestBase {
   }
 
   protected function getDefaultDisallowedContentConfig() {
-    return array(
-      '*' => array('attributes' => 'on*'),
-    );
+    return [
+      '*' => ['attributes' => 'on*'],
+    ];
   }
 
   protected function getDefaultToolbarConfig() {
-    return array(
-      array(
+    return [
+      [
         'name' => 'Formatting',
-        'items' => array('Bold', 'Italic',),
-      ),
-      array(
+        'items' => ['Bold', 'Italic'],
+      ],
+      [
         'name' => 'Links',
-        'items' => array('DrupalLink', 'DrupalUnlink',),
-      ),
-      array(
+        'items' => ['DrupalLink', 'DrupalUnlink'],
+      ],
+      [
         'name' => 'Lists',
-        'items' => array('BulletedList', 'NumberedList',),
-      ),
-      array(
+        'items' => ['BulletedList', 'NumberedList'],
+      ],
+      [
         'name' => 'Media',
-        'items' => array('Blockquote', 'DrupalImage',),
-      ),
-      array(
+        'items' => ['Blockquote', 'DrupalImage'],
+      ],
+      [
         'name' => 'Tools',
-        'items' => array('Source',),
-      ),
+        'items' => ['Source', ],
+      ],
       '/',
-    );
+    ];
   }
 
   protected function getDefaultContentsCssConfig() {
-    return array(
+    return [
       file_url_transform_relative(file_create_url('core/modules/ckeditor/css/ckeditor-iframe.css')),
       file_url_transform_relative(file_create_url('core/modules/system/css/components/align.module.css')),
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php
index 932b05ca4..3b8951cae 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php
@@ -29,28 +29,28 @@ class Llama extends PluginBase implements CKEditorPluginInterface {
   /**
    * {@inheritdoc}
    */
-  function getDependencies(Editor $editor) {
-    return array();
+  public function getDependencies(Editor $editor) {
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
-  function getLibraries(Editor $editor) {
-    return array();
+  public function getLibraries(Editor $editor) {
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
-  function isInternal() {
+  public function isInternal() {
     return FALSE;
   }
 
   /**
    * {@inheritdoc}
    */
-  function getFile() {
+  public function getFile() {
     return drupal_get_path('module', 'ckeditor_test') . '/js/llama.js';
   }
 
@@ -58,7 +58,7 @@ class Llama extends PluginBase implements CKEditorPluginInterface {
    * {@inheritdoc}
    */
   public function getConfig(Editor $editor) {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaButton.php b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaButton.php
index 7520dfd11..b357811c0 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaButton.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaButton.php
@@ -17,18 +17,18 @@ class LlamaButton extends Llama implements CKEditorPluginButtonsInterface {
   /**
    * {@inheritdoc}
    */
-  function getButtons() {
-    return array(
-      'Llama' => array(
+  public function getButtons() {
+    return [
+      'Llama' => [
         'label' => t('Insert Llama'),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  function getFile() {
+  public function getFile() {
     return drupal_get_path('module', 'ckeditor_test') . '/js/llama_button.js';
   }
 
diff --git a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextual.php b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextual.php
index 01cb99262..5ece17aca 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextual.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextual.php
@@ -18,7 +18,7 @@ class LlamaContextual extends Llama implements CKEditorPluginContextualInterface
   /**
    * {@inheritdoc}
    */
-  function isEnabled(Editor $editor) {
+  public function isEnabled(Editor $editor) {
     // Automatically enable this plugin if the Underline button is enabled.
     $settings = $editor->getSettings();
     foreach ($settings['toolbar']['rows'] as $row) {
@@ -34,7 +34,7 @@ class LlamaContextual extends Llama implements CKEditorPluginContextualInterface
   /**
    * {@inheritdoc}
    */
-  function getFile() {
+  public function getFile() {
     return drupal_get_path('module', 'ckeditor_test') . '/js/llama_contextual.js';
   }
 
diff --git a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
index 43060d904..2894fc905 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
@@ -22,7 +22,7 @@ class LlamaContextualAndButton extends Llama implements CKEditorPluginContextual
   /**
    * {@inheritdoc}
    */
-  function isEnabled(Editor $editor) {
+  public function isEnabled(Editor $editor) {
     // Automatically enable this plugin if the Strike button is enabled.
     $settings = $editor->getSettings();
     foreach ($settings['toolbar']['rows'] as $row) {
@@ -38,37 +38,37 @@ class LlamaContextualAndButton extends Llama implements CKEditorPluginContextual
   /**
    * {@inheritdoc}
    */
-  function getButtons() {
-    return array(
-      'Llama' => array(
+  public function getButtons() {
+    return [
+      'Llama' => [
         'label' => t('Insert Llama'),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  function getFile() {
+  public function getFile() {
     return drupal_get_path('module', 'ckeditor_test') . '/js/llama_contextual_and_button.js';
   }
 
   /**
    * {@inheritdoc}
    */
-  function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
+  public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
     // Defaults.
-    $config = array('ultra_llama_mode' => FALSE);
+    $config = ['ultra_llama_mode' => FALSE];
     $settings = $editor->getSettings();
     if (isset($settings['plugins']['llama_contextual_and_button'])) {
       $config = $settings['plugins']['llama_contextual_and_button'];
     }
 
-    $form['ultra_llama_mode'] = array(
+    $form['ultra_llama_mode'] = [
       '#title' => t('Ultra llama mode'),
       '#type' => 'checkbox',
       '#default_value' => $config['ultra_llama_mode'],
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php
index 294b39c92..e0901dc84 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php
@@ -19,27 +19,27 @@ class LlamaCss extends Llama implements CKEditorPluginButtonsInterface, CKEditor
   /**
    * {@inheritdoc}
    */
-  function getButtons() {
-    return array(
-      'LlamaCSS' => array(
+  public function getButtons() {
+    return [
+      'LlamaCSS' => [
         'label' => t('Insert Llama CSS'),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  function getCssFiles(Editor $editor) {
-    return array(
+  public function getCssFiles(Editor $editor) {
+    return [
       drupal_get_path('module', 'ckeditor_test') . '/css/llama.css'
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  function getFile() {
+  public function getFile() {
     return drupal_get_path('module', 'ckeditor_test') . '/js/llama_css.js';
   }
 
diff --git a/web/core/modules/ckeditor/src/Tests/CKEditorToolbarButtonTest.php b/web/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
similarity index 93%
rename from web/core/modules/ckeditor/src/Tests/CKEditorToolbarButtonTest.php
rename to web/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
index 22874b7be..e8d0e2d85 100644
--- a/web/core/modules/ckeditor/src/Tests/CKEditorToolbarButtonTest.php
+++ b/web/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\ckeditor\Tests;
+namespace Drupal\Tests\ckeditor\Functional;
 
 
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\editor\Entity\Editor;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Component\Serialization\Json;
 
 /**
@@ -13,7 +13,7 @@ use Drupal\Component\Serialization\Json;
  *
  * @group ckeditor
  */
-class CKEditorToolbarButtonTest extends WebTestBase {
+class CKEditorToolbarButtonTest extends BrowserTestBase {
 
   /**
    * Modules to enable for this test.
diff --git a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/AjaxCssTest.php b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/AjaxCssTest.php
new file mode 100644
index 000000000..f01155439
--- /dev/null
+++ b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/AjaxCssTest.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Drupal\Tests\ckeditor\FunctionalJavascript;
+
+use Drupal\editor\Entity\Editor;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+
+/**
+ * Tests delivery of CSS to CKEditor via AJAX.
+ *
+ * @group ckeditor
+ */
+class AjaxCssTest extends JavascriptTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['ckeditor', 'ckeditor_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    FilterFormat::create([
+      'format' => 'test_format',
+      'name' => $this->randomMachineName(),
+    ])->save();
+
+    Editor::create([
+      'editor' => 'ckeditor',
+      'format' => 'test_format',
+    ])->save();
+
+    user_role_grant_permissions('anonymous', ['use text format test_format']);
+  }
+
+  /**
+   * Tests adding style sheets dynamically to CKEditor.
+   */
+  public function testCkeditorAjaxAddCss() {
+    $this->drupalGet('/ckeditor_test/ajax_css');
+
+    $session = $this->getSession();
+    $page = $session->getPage();
+
+    $this->waitOnCkeditorInstance('edit-iframe-value');
+    $this->waitOnCkeditorInstance('edit-inline');
+
+    $style_color = 'rgb(255, 0, 0)';
+
+    // Add the inline CSS and assert that the style is applied to the main body,
+    // but not the iframe.
+    $page->pressButton('Add CSS to inline CKEditor instance');
+
+    $result = $page->waitFor(10, function() use ($style_color) {
+      return ($this->getEditorStyle('edit-inline', 'color') == $style_color)
+        && ($this->getEditorStyle('edit-iframe-value', 'color') != $style_color);
+    });
+    $this->assertTrue($result);
+
+    $session->reload();
+
+    $this->waitOnCkeditorInstance('edit-iframe-value');
+    $this->waitOnCkeditorInstance('edit-inline');
+
+    // Add the iframe CSS and assert that the style is applied to the iframe,
+    // but not the main body.
+    $page->pressButton('Add CSS to iframe CKEditor instance');
+
+    $result = $page->waitFor(10, function() use ($style_color) {
+      return ($this->getEditorStyle('edit-inline', 'color') != $style_color)
+        && ($this->getEditorStyle('edit-iframe-value', 'color') == $style_color);
+    });
+
+    $this->assertTrue($result);
+  }
+
+  /**
+   * Gets a computed style value for a CKEditor instance.
+   *
+   * @param string $instance_id
+   *   The CKEditor instance ID.
+   * @param string $attribute
+   *   The style attribute.
+   *
+   * @return string
+   *   The computed style value.
+   */
+  protected function getEditorStyle($instance_id, $attribute) {
+    $js = sprintf(
+      'CKEDITOR.instances["%s"].document.getBody().getComputedStyle("%s")',
+      $instance_id,
+      $attribute
+    );
+    return $this->getSession()->evaluateScript($js);
+  }
+
+  /**
+   * Wait for a CKEditor instance to finish loading and initializing.
+   *
+   * @param string $instance_id
+   *   The CKEditor instance ID.
+   * @param int $timeout
+   *   (optional) Timeout in milliseconds, defaults to 10000.
+   */
+  protected function waitOnCkeditorInstance($instance_id, $timeout = 10000) {
+    $condition = <<<JS
+      (function() {
+        return (
+          typeof CKEDITOR !== 'undefined'
+          && typeof CKEDITOR.instances["$instance_id"] !== 'undefined'
+          && CKEDITOR.instances["$instance_id"].instanceReady
+        );
+      }());
+JS;
+
+    $this->getSession()->wait($timeout, $condition);
+  }
+
+}
diff --git a/web/core/modules/color/color.install b/web/core/modules/color/color.install
index 7f6133819..3cc098caa 100644
--- a/web/core/modules/color/color.install
+++ b/web/core/modules/color/color.install
@@ -9,15 +9,15 @@
  * Implements hook_requirements().
  */
 function color_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
 
   if ($phase == 'runtime') {
     // Check for the PHP GD library.
     if (function_exists('imagegd2')) {
       $info = gd_info();
-      $requirements['color_gd'] = array(
+      $requirements['color_gd'] = [
         'value' => $info['GD Version'],
-      );
+      ];
 
       // Check for PNG support.
       if (!function_exists('imagecreatefrompng')) {
@@ -26,11 +26,11 @@ function color_requirements($phase) {
       }
     }
     else {
-      $requirements['color_gd'] = array(
+      $requirements['color_gd'] = [
         'value' => t('Not installed'),
         'severity' => REQUIREMENT_ERROR,
         'description' => t('The GD library for PHP is missing or outdated. Check the <a href="http://php.net/manual/book.image.php">PHP image documentation</a> for information on how to correct this.'),
-      );
+      ];
     }
     $requirements['color_gd']['title'] = t('GD library PNG support');
   }
diff --git a/web/core/modules/color/color.module b/web/core/modules/color/color.module
index 1dbc1da6c..20d099abc 100644
--- a/web/core/modules/color/color.module
+++ b/web/core/modules/color/color.module
@@ -23,11 +23,11 @@ function color_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.color':
       $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Color module allows users with the <em>Administer site configuration</em> permission to change the color scheme (color of links, backgrounds, text, and other theme elements) of compatible themes. For more information, see the <a href=":color_do">online documentation for the Color module</a>.', array(':color_do' => 'https://www.drupal.org/documentation/modules/color')) . '</p>';
+      $output .= '<p>' . t('The Color module allows users with the <em>Administer site configuration</em> permission to change the color scheme (color of links, backgrounds, text, and other theme elements) of compatible themes. For more information, see the <a href=":color_do">online documentation for the Color module</a>.', [':color_do' => 'https://www.drupal.org/documentation/modules/color']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Changing colors') . '</dt>';
-      $output .= '<dd><p>' . t('To change the color settings, select the <em>Settings</em> link for your theme on the <a href=":appearance">Appearance</a> page. If the color picker does not appear then the theme is not compatible with the Color module.', array(':appearance' => \Drupal::url('system.themes_page'))) . '</p>';
+      $output .= '<dd><p>' . t('To change the color settings, select the <em>Settings</em> link for your theme on the <a href=":appearance">Appearance</a> page. If the color picker does not appear then the theme is not compatible with the Color module.', [':appearance' => \Drupal::url('system.themes_page')]) . '</p>';
       $output .= '<p>' . t('The Color module saves a modified copy of the theme\'s specified stylesheets in the files directory. If you make any manual changes to your theme\'s stylesheet, <em>you must save your color settings again, even if you haven\'t changed the colors</em>. This step is required because the module stylesheets in the files directory need to be recreated to reflect your changes.') . '</p></dd>';
       $output .= '</dl>';
       return $output;
@@ -38,11 +38,11 @@ function color_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function color_theme() {
-  return array(
-    'color_scheme_form' => array(
+  return [
+    'color_scheme_form' => [
       'render element' => 'form',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -51,14 +51,14 @@ function color_theme() {
 function color_form_system_theme_settings_alter(&$form, FormStateInterface $form_state) {
   $build_info = $form_state->getBuildInfo();
   if (isset($build_info['args'][0]) && ($theme = $build_info['args'][0]) && color_get_info($theme) && function_exists('gd_info')) {
-    $form['color'] = array(
+    $form['color'] = [
       '#type' => 'details',
       '#title' => t('Color scheme'),
       '#open' => TRUE,
       '#weight' => -1,
-      '#attributes' => array('id' => 'color_scheme_form'),
+      '#attributes' => ['id' => 'color_scheme_form'],
       '#theme' => 'color_scheme_form',
-    );
+    ];
     $form['color'] += color_scheme_form($form, $form_state, $theme);
     $form['#validate'][] = 'color_scheme_form_validate';
     // Ensure color submission happens first so we can unset extra values.
@@ -137,7 +137,7 @@ function color_block_view_pre_render(array $build) {
  * Retrieves the Color module information for a particular theme.
  */
 function color_get_info($theme) {
-  static $theme_info = array();
+  static $theme_info = [];
 
   if (isset($theme_info[$theme])) {
     return $theme_info[$theme];
@@ -148,21 +148,21 @@ function color_get_info($theme) {
   if ($path && file_exists($file)) {
     include $file;
     // Add in default values.
-    $info += array(
+    $info += [
       // CSS files (excluding @import) to rewrite with new color scheme.
-      'css' => array(),
+      'css' => [],
       // Files to copy.
-      'copy' => array(),
+      'copy' => [],
       // Gradient definitions.
-      'gradients' => array(),
+      'gradients' => [],
       // Color areas to fill (x, y, width, height).
-      'fill' => array(),
+      'fill' => [],
       // Coordinates of all the theme slices (x, y, width, height) with their
       // filename as used in the stylesheet.
-      'slices' => array(),
+      'slices' => [],
       // Reference color used for blending.
       'blend_target' => '#ffffff',
-    );
+    ];
     $theme_info[$theme] = $info;
     return $info;
   }
@@ -200,9 +200,9 @@ function color_get_palette($theme, $default = FALSE) {
 function color_scheme_form($complete_form, FormStateInterface $form_state, $theme) {
   $info = color_get_info($theme);
 
-  $info['schemes'][''] = array('title' => t('Custom'), 'colors' => array());
-  $color_sets = array();
-  $schemes = array();
+  $info['schemes'][''] = ['title' => t('Custom'), 'colors' => []];
+  $color_sets = [];
+  $schemes = [];
   foreach ($info['schemes'] as $key => $scheme) {
     $color_sets[$key] = $scheme['title'];
     $schemes[$key] = $scheme['colors'];
@@ -233,16 +233,16 @@ function color_scheme_form($complete_form, FormStateInterface $form_state, $them
 
   // Add scheme selector.
   $default_palette = color_get_palette($theme, TRUE);
-  $form['scheme'] = array(
+  $form['scheme'] = [
     '#type' => 'select',
     '#title' => t('Color set'),
     '#options' => $color_sets,
     '#default_value' => $scheme_name,
-    '#attached' => array(
-      'library' => array(
+    '#attached' => [
+      'library' => [
         'color/drupal.color',
         'color/admin',
-      ),
+      ],
       // Add custom JavaScript.
       'drupalSettings' => [
         'color' => [
@@ -251,8 +251,8 @@ function color_scheme_form($complete_form, FormStateInterface $form_state, $them
         ],
         'gradients' => $info['gradients'],
       ],
-    ),
-  );
+    ],
+  ];
 
   // Add palette fields. Use the configuration if available.
   $palette = $current_scheme ?: $default_palette;
@@ -260,22 +260,22 @@ function color_scheme_form($complete_form, FormStateInterface $form_state, $them
   $form['palette']['#tree'] = TRUE;
   foreach ($palette as $name => $value) {
     if (isset($names[$name])) {
-      $form['palette'][$name] = array(
+      $form['palette'][$name] = [
         '#type' => 'textfield',
         '#title' => $names[$name],
         '#value_callback' => 'color_palette_color_value',
         '#default_value' => $value,
         '#size' => 8,
-        '#attributes' => array('dir' => LanguageInterface::DIRECTION_LTR),
-      );
+        '#attributes' => ['dir' => LanguageInterface::DIRECTION_LTR],
+      ];
     }
   }
-  $form['theme'] = array('#type' => 'value', '#value' => $theme);
+  $form['theme'] = ['#type' => 'value', '#value' => $theme];
   if (isset($info['#attached'])) {
     $form['#attached'] = $info['#attached'];
     unset($info['#attached']);
   }
-  $form['info'] = array('#type' => 'value', '#value' => $info);
+  $form['info'] = ['#type' => 'value', '#value' => $info];
 
   return $form;
 }
@@ -319,7 +319,7 @@ function template_preprocess_color_scheme_form(&$variables) {
  *   The data that will appear in the $form_state->getValues() collection for this
  *   element. Return nothing to use the default.
  */
-function color_palette_color_value($element, $input = FALSE, FormStateInterface $form_state) {
+function color_palette_color_value($element, $input, FormStateInterface $form_state) {
   // If we suspect a possible cross-site request forgery attack, only accept
   // hexadecimal CSS color strings from user input, to avoid problems when this
   // value is used in the JavaScript preview.
@@ -360,7 +360,7 @@ function color_scheme_form_validate($form, FormStateInterface $form_state) {
   // Only accept hexadecimal CSS color strings to avoid XSS upon use.
   foreach ($form_state->getValue('palette') as $key => $color) {
     if (!color_valid_hexadecimal_string($color)) {
-      $form_state->setErrorByName('palette][' . $key, t('You must enter a valid hexadecimal color value for %name.', array('%name' => $form['color']['palette'][$key]['#title'])));
+      $form_state->setErrorByName('palette][' . $key, t('You must enter a valid hexadecimal color value for %name.', ['%name' => $form['color']['palette'][$key]['#title']]));
     }
   }
 }
@@ -373,7 +373,7 @@ function color_scheme_form_validate($form, FormStateInterface $form_state) {
 function color_scheme_form_submit($form, FormStateInterface $form_state) {
 
   // Avoid color settings spilling over to theme settings.
-  $color_settings = array('theme', 'palette', 'scheme');
+  $color_settings = ['theme', 'palette', 'scheme'];
   if ($form_state->hasValue('info')) {
     $color_settings[] = 'info';
   }
@@ -414,7 +414,7 @@ function color_scheme_form_submit($form, FormStateInterface $form_state) {
     $memory_limit = ini_get('memory_limit');
     $size = Bytes::toInt($memory_limit);
     if (!Environment::checkMemoryLimit($usage + $required, $memory_limit)) {
-      drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the <a href="http://php.net/manual/ini.core.php#ini.sect.resource-limits">PHP documentation</a> for more information.', array('%size' => format_size($usage + $required - $size))), 'error');
+      drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the <a href="http://php.net/manual/ini.core.php#ini.sect.resource-limits">PHP documentation</a> for more information.', ['%size' => format_size($usage + $required - $size)]), 'error');
       return;
     }
   }
@@ -446,7 +446,7 @@ function color_scheme_form_submit($form, FormStateInterface $form_state) {
   $paths['target'] = $paths['target'] . '/';
   $paths['id'] = $id;
   $paths['source'] = drupal_get_path('theme', $theme) . '/';
-  $paths['files'] = $paths['map'] = array();
+  $paths['files'] = $paths['map'] = [];
 
   // Save palette and logo location.
   $config
@@ -469,10 +469,10 @@ function color_scheme_form_submit($form, FormStateInterface $form_state) {
   }
 
   // Rewrite theme stylesheets.
-  $css = array();
+  $css = [];
   foreach ($info['css'] as $stylesheet) {
     // Build a temporary array with CSS files.
-    $files = array();
+    $files = [];
     if (file_exists($paths['source'] . $stylesheet)) {
       $files[] = $stylesheet;
     }
@@ -489,7 +489,7 @@ function color_scheme_form_submit($form, FormStateInterface $form_state) {
       $css_optimizer->rewriteFileURIBasePath = base_path() . dirname($paths['source'] . $file) . '/';
 
       // Prefix all paths within this CSS file, ignoring absolute paths.
-      $style = preg_replace_callback('/url\([\'"]?(?![a-z]+:|\/+)([^\'")]+)[\'"]?\)/i', array($css_optimizer, 'rewriteFileURI'), $style);
+      $style = preg_replace_callback('/url\([\'"]?(?![a-z]+:|\/+)([^\'")]+)[\'"]?\)/i', [$css_optimizer, 'rewriteFileURI'], $style);
 
       // Rewrite stylesheet with new colors.
       $style = _color_rewrite_stylesheet($theme, $info, $paths, $palette, $style);
@@ -729,7 +729,7 @@ function _color_shift($given, $ref1, $ref2, $target) {
  * Converts a hex triplet into a GD color.
  */
 function _color_gd($img, $hex) {
-  $c = array_merge(array($img), _color_unpack($hex));
+  $c = array_merge([$img], _color_unpack($hex));
   return call_user_func_array('imagecolorallocate', $c);
 }
 
@@ -739,7 +739,7 @@ function _color_gd($img, $hex) {
 function _color_blend($img, $hex1, $hex2, $alpha) {
   $in1 = _color_unpack($hex1);
   $in2 = _color_unpack($hex2);
-  $out = array($img);
+  $out = [$img];
   for ($i = 0; $i < 3; ++$i) {
     $out[] = $in1[$i] + ($in2[$i] - $in1[$i]) * $alpha;
   }
@@ -784,11 +784,11 @@ function _color_hsl2rgb($hsl) {
   $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l * $s;
   $m1 = $l * 2 - $m2;
 
-  return array(
+  return [
     _color_hue2rgb($m1, $m2, $h + 0.33333),
     _color_hue2rgb($m1, $m2, $h),
     _color_hue2rgb($m1, $m2, $h - 0.33333),
-  );
+  ];
 }
 
 /**
@@ -828,5 +828,5 @@ function _color_rgb2hsl($rgb) {
     $h /= 6;
   }
 
-  return array($h, $s, $l);
+  return [$h, $s, $l];
 }
diff --git a/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc b/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc
index b88e8eae7..ee77a5a17 100644
--- a/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc
+++ b/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc
@@ -5,29 +5,29 @@
  * Lists available colors and color schemes for the Color test theme.
  */
 
-$info = array(
-  'fields' => array(
+$info = [
+  'fields' => [
     'bg' => t('Main background'),
     'text' => t('Text color'),
-  ),
-  'schemes' => array(
-    'default' => array(
+  ],
+  'schemes' => [
+    'default' => [
       'title' => t('Default'),
-      'colors' => array(
+      'colors' => [
         'bg' => '#ff0000',
         'text' => '#0000ff',
-      ),
-    ),
-    'custom' => array(
+      ],
+    ],
+    'custom' => [
       'title' => t('Custom'),
-      'colors' => array(
+      'colors' => [
         'bg' => '#ff0000',
         'text' => '#3b3b3b',
-      ),
-    ),
-  ),
-  'css' => array(
+      ],
+    ],
+  ],
+  'css' => [
     'css/colors.css',
-  ),
+  ],
   'preview_html' => 'color/preview.html',
-);
+];
diff --git a/web/core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php b/web/core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php
index 157deb8dc..f93f3587b 100644
--- a/web/core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php
+++ b/web/core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php
@@ -16,7 +16,7 @@ class ColorConfigSchemaTest extends BrowserTestBase {
    *
    * @var array
    */
-  public static $modules = array('color');
+  public static $modules = ['color'];
 
   /**
    * A user with administrative permissions.
@@ -30,17 +30,17 @@ class ColorConfigSchemaTest extends BrowserTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    \Drupal::service('theme_handler')->install(array('bartik'));
+    \Drupal::service('theme_handler')->install(['bartik']);
 
     // Create user.
-    $this->adminUser = $this->drupalCreateUser(array('administer themes'));
+    $this->adminUser = $this->drupalCreateUser(['administer themes']);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Tests whether the color config schema is valid.
    */
-  function testValidColorConfigSchema() {
+  public function testValidColorConfigSchema() {
     $settings_path = 'admin/appearance/settings/bartik';
     $edit['scheme'] = '';
     $edit['palette[bg]'] = '#123456';
diff --git a/web/core/modules/color/tests/src/Functional/ColorSafePreviewTest.php b/web/core/modules/color/tests/src/Functional/ColorSafePreviewTest.php
index e80202fd7..9f6914c99 100644
--- a/web/core/modules/color/tests/src/Functional/ColorSafePreviewTest.php
+++ b/web/core/modules/color/tests/src/Functional/ColorSafePreviewTest.php
@@ -39,7 +39,7 @@ class ColorSafePreviewTest extends BrowserTestBase {
   /**
    * Ensures color preview.html is sanitized.
    */
-  function testColorPreview() {
+  public function testColorPreview() {
     // Install the color test theme.
     \Drupal::service('theme_handler')->install(['color_test_theme']);
     $this->drupalLogin($this->bigUser);
diff --git a/web/core/modules/color/tests/src/Functional/ColorTest.php b/web/core/modules/color/tests/src/Functional/ColorTest.php
index dc4456608..11ff1e737 100644
--- a/web/core/modules/color/tests/src/Functional/ColorTest.php
+++ b/web/core/modules/color/tests/src/Functional/ColorTest.php
@@ -17,7 +17,7 @@ class ColorTest extends BrowserTestBase {
    *
    * @var array
    */
-  public static $modules = array('color', 'color_test', 'block', 'file');
+  public static $modules = ['color', 'color_test', 'block', 'file'];
 
   /**
    * A user with administrative permissions.
@@ -50,25 +50,25 @@ class ColorTest extends BrowserTestBase {
     parent::setUp();
 
     // Create user.
-    $this->bigUser = $this->drupalCreateUser(array('administer themes'));
+    $this->bigUser = $this->drupalCreateUser(['administer themes']);
 
     // This tests the color module in Bartik.
-    $this->themes = array(
-      'bartik' => array(
+    $this->themes = [
+      'bartik' => [
         'palette_input' => 'palette[bg]',
         'scheme' => 'slate',
         'scheme_color' => '#3b3b3b',
-      ),
-      'color_test_theme' => array(
+      ],
+      'color_test_theme' => [
         'palette_input' => 'palette[bg]',
         'scheme' => 'custom',
         'scheme_color' => '#3b3b3b',
-      ),
-    );
+      ],
+    ];
     \Drupal::service('theme_handler')->install(array_keys($this->themes));
 
     // Array filled with valid and not valid color values.
-    $this->colorTests = array(
+    $this->colorTests = [
       '#000' => TRUE,
       '#123456' => TRUE,
       '#abcdef' => TRUE,
@@ -78,13 +78,13 @@ class ColorTest extends BrowserTestBase {
       '#00000' => FALSE,
       '123456' => FALSE,
       '#00000g' => FALSE,
-    );
+    ];
   }
 
   /**
    * Tests the Color module functionality.
    */
-  function testColor() {
+  public function testColor() {
     foreach ($this->themes as $theme => $test_values) {
       $this->_testColor($theme, $test_values);
     }
@@ -99,7 +99,7 @@ class ColorTest extends BrowserTestBase {
    *   An associative array of test settings (i.e. 'Main background', 'Text
    *   color', 'Color set', etc) for the theme which being tested.
    */
-  function _testColor($theme, $test_values) {
+  public function _testColor($theme, $test_values) {
     $this->config('system.theme')
       ->set('default', $theme)
       ->save();
@@ -138,7 +138,7 @@ class ColorTest extends BrowserTestBase {
     $config->set('css.preprocess', 1);
     $config->save();
     $this->drupalGet('<front>');
-    $stylesheets = \Drupal::state()->get('drupal_css_cache_files') ?: array();
+    $stylesheets = \Drupal::state()->get('drupal_css_cache_files') ?: [];
     $stylesheet_content = '';
     foreach ($stylesheets as $uri) {
       $stylesheet_content .= join("\n", file(drupal_realpath($uri)));
@@ -151,7 +151,7 @@ class ColorTest extends BrowserTestBase {
   /**
    * Tests whether the provided color is valid.
    */
-  function testValidColor() {
+  public function testValidColor() {
     $this->config('system.theme')
       ->set('default', 'bartik')
       ->save();
@@ -176,12 +176,12 @@ class ColorTest extends BrowserTestBase {
   /**
    * Test whether the custom logo is used in the color preview.
    */
-  function testLogoSettingOverride() {
+  public function testLogoSettingOverride() {
     $this->drupalLogin($this->bigUser);
-    $edit = array(
+    $edit = [
       'default_logo' => FALSE,
       'logo_path' => 'core/misc/druplicon.png',
-    );
+    ];
     $this->drupalPostForm('admin/appearance/settings', $edit, t('Save configuration'));
 
     // Ensure that the overridden logo is present in Bartik, which is colorable.
@@ -192,7 +192,7 @@ class ColorTest extends BrowserTestBase {
   /**
    * Test whether the scheme can be set, viewed anonymously and reset.
    */
-  function testOverrideAndResetScheme() {
+  public function testOverrideAndResetScheme() {
     $settings_path = 'admin/appearance/settings/bartik';
     $this->config('system.theme')
       ->set('default', 'bartik')
diff --git a/web/core/modules/comment/comment.api.php b/web/core/modules/comment/comment.api.php
index 7b922cbcc..ec6b4ce8e 100644
--- a/web/core/modules/comment/comment.api.php
+++ b/web/core/modules/comment/comment.api.php
@@ -31,16 +31,16 @@ use Drupal\Core\Url;
  * @see \Drupal\comment\CommentViewBuilder::buildLinks()
  */
 function hook_comment_links_alter(array &$links, CommentInterface $entity, array &$context) {
-  $links['mymodule'] = array(
+  $links['mymodule'] = [
     '#theme' => 'links__comment__mymodule',
-    '#attributes' => array('class' => array('links', 'inline')),
-    '#links' => array(
-      'comment-report' => array(
+    '#attributes' => ['class' => ['links', 'inline']],
+    '#links' => [
+      'comment-report' => [
         'title' => t('Report'),
         'url' => Url::fromRoute('comment_test.report', ['comment' => $entity->id()], ['query' => ['token' => \Drupal::getContainer()->get('csrf_token')->get("comment/{$entity->id()}/report")]]),
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 }
 
 /**
diff --git a/web/core/modules/comment/comment.install b/web/core/modules/comment/comment.install
index b4fd6aaf2..47241c281 100644
--- a/web/core/modules/comment/comment.install
+++ b/web/core/modules/comment/comment.install
@@ -15,7 +15,7 @@ use Drupal\field\Entity\FieldStorageConfig;
  */
 function comment_uninstall() {
   // Remove the comment fields.
-  $fields = entity_load_multiple_by_properties('field_storage_config', array('type' => 'comment'));
+  $fields = entity_load_multiple_by_properties('field_storage_config', ['type' => 'comment']);
   foreach ($fields as $field) {
     $field->delete();
   }
@@ -37,87 +37,82 @@ function comment_install() {
  * Implements hook_schema().
  */
 function comment_schema() {
-  $schema['comment_entity_statistics'] = array(
+  $schema['comment_entity_statistics'] = [
     'description' => 'Maintains statistics of entity and comments posts to show "new" and "updated" flags.',
-    'fields' => array(
-      'entity_id' => array(
+    'fields' => [
+      'entity_id' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The entity_id of the entity for which the statistics are compiled.',
-      ),
-      'entity_type' => array(
+      ],
+      'entity_type' => [
         'type' => 'varchar_ascii',
         'not null' => TRUE,
         'default' => 'node',
         'length' => EntityTypeInterface::ID_MAX_LENGTH,
         'description' => 'The entity_type of the entity to which this comment is a reply.',
-      ),
-      'field_name' => array(
+      ],
+      'field_name' => [
         'type' => 'varchar_ascii',
         'not null' => TRUE,
         'default' => '',
         'length' => FieldStorageConfig::NAME_MAX_LENGTH,
         'description' => 'The field_name of the field that was used to add this comment.',
-      ),
-      'cid' => array(
+      ],
+      'cid' => [
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The {comment}.cid of the last comment.',
-      ),
-      'last_comment_timestamp' => array(
+      ],
+      'last_comment_timestamp' => [
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The Unix timestamp of the last comment that was posted within this node, from {comment}.changed.',
-      ),
-      'last_comment_name' => array(
+      ],
+      'last_comment_name' => [
         'type' => 'varchar',
         'length' => 60,
         'not null' => FALSE,
         'description' => 'The name of the latest author to post a comment on this node, from {comment}.name.',
-      ),
-      'last_comment_uid' => array(
+      ],
+      'last_comment_uid' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The user ID of the latest author to post a comment on this node, from {comment}.uid.',
-      ),
-      'comment_count' => array(
+      ],
+      'comment_count' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The total number of comments on this entity.',
-      ),
-    ),
-    'primary key' => array('entity_id', 'entity_type', 'field_name'),
-    'indexes' => array(
-      'last_comment_timestamp' => array('last_comment_timestamp'),
-      'comment_count' => array('comment_count'),
-      'last_comment_uid' => array('last_comment_uid'),
-    ),
-    'foreign keys' => array(
-      'last_comment_author' => array(
+      ],
+    ],
+    'primary key' => ['entity_id', 'entity_type', 'field_name'],
+    'indexes' => [
+      'last_comment_timestamp' => ['last_comment_timestamp'],
+      'comment_count' => ['comment_count'],
+      'last_comment_uid' => ['last_comment_uid'],
+    ],
+    'foreign keys' => [
+      'last_comment_author' => [
         'table' => 'users',
-        'columns' => array(
+        'columns' => [
           'last_comment_uid' => 'uid',
-        ),
-      ),
-    ),
-  );
+        ],
+      ],
+    ],
+  ];
 
   return $schema;
 }
 
-/**
- * @addtogroup updates-8.0.0-rc
- * @{
- */
-
 /**
  * Clear caches to fix Comment entity list builder and operations Views field.
  */
@@ -126,10 +121,6 @@ function comment_update_8001() {
   // information, so that comment operation links work.
 }
 
-/**
- * @} End of "addtogroup updates-8.0.0-rc".
- */
-
 /**
  * Clear caches to fix Comment Views context filter.
  */
@@ -137,11 +128,6 @@ function comment_update_8002() {
   // Empty update to cause a cache flush.
 }
 
-/**
- * @addtogroup updates-8.2.x
- * @{
- */
-
 /**
  * Add the 'view_mode' setting to displays having 'comment_default' formatter.
  */
@@ -177,5 +163,24 @@ function comment_update_8200() {
 }
 
 /**
- * @} End of "addtogroup updates-8.2.x".
+ * Update status field.
  */
+function comment_update_8300() {
+  $entity_definition_update_manager = \Drupal::service('entity.definition_update_manager');
+  $field_definition = $entity_definition_update_manager->getFieldStorageDefinition('status', 'comment');
+  $field_definition->setDescription(new TranslatableMarkup('A boolean indicating the published state.'))
+    ->setRevisionable(TRUE);
+  $entity_definition_update_manager->updateFieldStorageDefinition($field_definition);
+}
+
+/**
+ * Set the 'published' entity key.
+ */
+function comment_update_8301() {
+  $definition_update_manager = \Drupal::entityDefinitionUpdateManager();
+  $entity_type = $definition_update_manager->getEntityType('comment');
+  $keys = $entity_type->getKeys();
+  $keys['published'] = 'status';
+  $entity_type->set('entity_keys', $keys);
+  $definition_update_manager->updateEntityType($entity_type);
+}
diff --git a/web/core/modules/comment/comment.module b/web/core/modules/comment/comment.module
index b0f1550c7..ee2651072 100644
--- a/web/core/modules/comment/comment.module
+++ b/web/core/modules/comment/comment.module
@@ -28,16 +28,25 @@ use Drupal\user\RoleInterface;
 
 /**
  * Anonymous posters cannot enter their contact information.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\comment\CommentInterface::ANONYMOUS_MAYNOT_CONTACT instead.
  */
 const COMMENT_ANONYMOUS_MAYNOT_CONTACT = 0;
 
 /**
  * Anonymous posters may leave their contact information.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\comment\CommentInterface::ANONYMOUS_MAY_CONTACT instead.
  */
 const COMMENT_ANONYMOUS_MAY_CONTACT = 1;
 
 /**
  * Anonymous posters are required to leave their contact information.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\comment\CommentInterface::ANONYMOUS_MUST_CONTACT instead.
  */
 const COMMENT_ANONYMOUS_MUST_CONTACT = 2;
 
@@ -59,19 +68,19 @@ function comment_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.comment':
       $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Comment module allows users to comment on site content, set commenting defaults and permissions, and moderate comments. For more information, see the <a href=":comment">online documentation for the Comment module</a>.', array(':comment' => 'https://www.drupal.org/documentation/modules/comment')) . '</p>';
+      $output .= '<p>' . t('The Comment module allows users to comment on site content, set commenting defaults and permissions, and moderate comments. For more information, see the <a href=":comment">online documentation for the Comment module</a>.', [':comment' => 'https://www.drupal.org/documentation/modules/comment']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Enabling commenting') . '</dt>';
-      $output .= '<dd>' . t('Comment functionality can be enabled for any entity sub-type (for example, a <a href=":content-type">content type</a>) by adding a <em>Comments</em> field on its <em>Manage fields page</em>. Adding or removing commenting for an entity through the user interface requires the <a href=":field_ui">Field UI</a> module to be enabled, even though the commenting functionality works without it. For more information on fields and entities, see the <a href=":field">Field module help page</a>.', array(':content-type' => (\Drupal::moduleHandler()->moduleExists('node')) ? \Drupal::url('entity.node_type.collection') : '#', ':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('Comment functionality can be enabled for any entity sub-type (for example, a <a href=":content-type">content type</a>) by adding a <em>Comments</em> field on its <em>Manage fields page</em>. Adding or removing commenting for an entity through the user interface requires the <a href=":field_ui">Field UI</a> module to be enabled, even though the commenting functionality works without it. For more information on fields and entities, see the <a href=":field">Field module help page</a>.', [':content-type' => (\Drupal::moduleHandler()->moduleExists('node')) ? \Drupal::url('entity.node_type.collection') : '#', ':field' => \Drupal::url('help.page', ['name' => 'field']), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Configuring commenting settings') . '</dt>';
       $output .= '<dd>' . t('Commenting settings can be configured by editing the <em>Comments</em> field on the <em>Manage fields page</em> of an entity type if the <em>Field UI module</em> is enabled. Configuration includes the label of the comments field, the number of comments to be displayed, and whether they are shown in threaded list. Commenting can be be configured as: <em>Open</em> to allow new comments, <em>Closed</em> to view existing comments, but prevent new comments, or <em>Hidden</em> to hide existing comments and prevent new comments. Changing this configuration for an entity type will not change existing entity items.') . '</dd>';
       $output .= '<dt>' . t('Overriding default settings') . '</dt>';
       $output .= '<dd>' . t('Users with the appropriate permissions can override the default commenting settings of an entity type when they create an item of that type.') . '</dd>';
       $output .= '<dt>' . t('Adding comment types') . '</dt>';
-      $output .= '<dd>' . t('Additional <em>comment types</em> can be created per entity sub-type and added on the <a href=":field">Comment types page</a>. If there are multiple comment types available you can select the appropriate one after adding a <em>Comments field</em>.', array(':field' => \Drupal::url('entity.comment_type.collection'))) . '</dd>';
+      $output .= '<dd>' . t('Additional <em>comment types</em> can be created per entity sub-type and added on the <a href=":field">Comment types page</a>. If there are multiple comment types available you can select the appropriate one after adding a <em>Comments field</em>.', [':field' => \Drupal::url('entity.comment_type.collection')]) . '</dd>';
       $output .= '<dt>' . t('Approving and managing comments') . '</dt>';
-      $output .= '<dd>' . t('Comments from users who have the <em>Skip comment approval</em> permission are published immediately. All other comments are placed in the <a href=":comment-approval">Unapproved comments</a> queue, until a user who has permission to <em>Administer comments and comment settings</em> publishes or deletes them. Published comments can be bulk managed on the <a href=":admin-comment">Published comments</a> administration page. When a comment has no replies, it remains editable by its author, as long as the author has <em>Edit own comments</em> permission.', array(':comment-approval' => \Drupal::url('comment.admin_approval'), ':admin-comment' => \Drupal::url('comment.admin'))) . '</dd>';
+      $output .= '<dd>' . t('Comments from users who have the <em>Skip comment approval</em> permission are published immediately. All other comments are placed in the <a href=":comment-approval">Unapproved comments</a> queue, until a user who has permission to <em>Administer comments and comment settings</em> publishes or deletes them. Published comments can be bulk managed on the <a href=":admin-comment">Published comments</a> administration page. When a comment has no replies, it remains editable by its author, as long as the author has <em>Edit own comments</em> permission.', [':comment-approval' => \Drupal::url('comment.admin_approval'), ':admin-comment' => \Drupal::url('comment.admin')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -87,10 +96,10 @@ function comment_help($route_name, RouteMatchInterface $route_match) {
 function comment_uri(CommentInterface $comment) {
   return new Url(
     'entity.comment.canonical',
-    array(
+    [
       'comment' => $comment->id(),
-    ),
-    array('fragment' => 'comment-' . $comment->id())
+    ],
+    ['fragment' => 'comment-' . $comment->id()]
   );
 }
 
@@ -98,23 +107,23 @@ function comment_uri(CommentInterface $comment) {
  * Implements hook_entity_extra_field_info().
  */
 function comment_entity_extra_field_info() {
-  $return = array();
+  $return = [];
   foreach (CommentType::loadMultiple() as $comment_type) {
-    $return['comment'][$comment_type->id()] = array(
-      'form' => array(
-        'author' => array(
+    $return['comment'][$comment_type->id()] = [
+      'form' => [
+        'author' => [
           'label' => t('Author'),
           'description' => t('Author textfield'),
           'weight' => -2,
-        ),
-      ),
-    );
-    $return['comment'][$comment_type->id()]['display']['links'] = array(
+        ],
+      ],
+    ];
+    $return['comment'][$comment_type->id()]['display']['links'] = [
       'label' => t('Links'),
       'description' => t('Comment operation links'),
       'weight' => 100,
       'visible' => TRUE,
-    );
+    ];
   }
 
   return $return;
@@ -124,14 +133,14 @@ function comment_entity_extra_field_info() {
  * Implements hook_theme().
  */
 function comment_theme() {
-  return array(
-    'comment' => array(
+  return [
+    'comment' => [
       'render element' => 'elements',
-    ),
-    'field__comment' => array(
+    ],
+    'field__comment' => [
       'base hook' => 'field',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -141,15 +150,15 @@ function comment_field_config_create(FieldConfigInterface $field) {
   if ($field->getType() == 'comment' && !$field->isSyncing()) {
     // Assign default values for the field.
     $default_value = $field->getDefaultValueLiteral();
-    $default_value += array(array());
-    $default_value[0] += array(
+    $default_value += [[]];
+    $default_value[0] += [
       'status' => CommentItemInterface::OPEN,
       'cid' => 0,
       'last_comment_timestamp' => 0,
       'last_comment_name' => '',
       'last_comment_uid' => 0,
       'comment_count' => 0,
-    );
+    ];
     $field->setDefaultValue($default_value);
   }
 }
@@ -218,14 +227,14 @@ function comment_entity_view(array &$build, EntityInterface $entity, EntityViewD
       if ($entity->hasField($field_name) && $entity->get($field_name)->status != CommentItemInterface::HIDDEN) {
         // Add a comments RSS element which is a URL to the comments of this
         // entity.
-        $options = array(
+        $options = [
           'fragment' => 'comments',
           'absolute' => TRUE,
-        );
-        $entity->rss_elements[] = array(
+        ];
+        $entity->rss_elements[] = [
           'key' => 'comments',
           'value' => $entity->url('canonical', $options),
-        );
+        ];
       }
     }
   }
@@ -341,7 +350,7 @@ function comment_form_field_storage_config_edit_form_alter(&$form, FormStateInte
  */
 function comment_entity_storage_load($entities, $entity_type) {
   // Comments can only be attached to content entities, so skip others.
-  if (!\Drupal::entityManager()->getDefinition($entity_type)->isSubclassOf('Drupal\Core\Entity\FieldableEntityInterface')) {
+  if (!\Drupal::entityManager()->getDefinition($entity_type)->entityClassImplements(FieldableEntityInterface::class)) {
     return;
   }
   // @todo Investigate in https://www.drupal.org/node/2527866 why we need that.
@@ -448,7 +457,7 @@ function comment_node_update_index(EntityInterface $node) {
     }
   }
 
-  $build = array();
+  $build = [];
 
   if ($index_comments) {
     foreach (\Drupal::service('comment.manager')->getFields('node') as $field_name => $info) {
@@ -508,7 +517,7 @@ function comment_node_search_result(EntityInterface $node) {
   // Do not make a string if there are no comment fields, or no comments exist
   // or all comment fields are hidden.
   if ($comments > 0 || $open) {
-    return array('comment' => \Drupal::translation()->formatPlural($comments, '1 comment', '@count comments'));
+    return ['comment' => \Drupal::translation()->formatPlural($comments, '1 comment', '@count comments')];
   }
 }
 
@@ -518,7 +527,7 @@ function comment_node_search_result(EntityInterface $node) {
 function comment_user_cancel($edit, $account, $method) {
   switch ($method) {
     case 'user_cancel_block_unpublish':
-      $comments = entity_load_multiple_by_properties('comment', array('uid' => $account->id()));
+      $comments = entity_load_multiple_by_properties('comment', ['uid' => $account->id()]);
       foreach ($comments as $comment) {
         $comment->setPublished(CommentInterface::NOT_PUBLISHED);
         $comment->save();
@@ -527,7 +536,7 @@ function comment_user_cancel($edit, $account, $method) {
 
     case 'user_cancel_reassign':
       /** @var \Drupal\comment\CommentInterface[] $comments */
-      $comments = entity_load_multiple_by_properties('comment', array('uid' => $account->id()));
+      $comments = entity_load_multiple_by_properties('comment', ['uid' => $account->id()]);
       foreach ($comments as $comment) {
         $comment->setOwnerId(0);
         $comment->setAuthorName(\Drupal::config('user.settings')->get('anonymous'));
@@ -559,7 +568,7 @@ function comment_user_predelete($account) {
  *   An array as expected by drupal_render().
  */
 function comment_preview(CommentInterface $comment, FormStateInterface $form_state) {
-  $preview_build = array();
+  $preview_build = [];
   $entity = $comment->getCommentedEntity();
 
   if (!$form_state->getErrors()) {
@@ -571,7 +580,7 @@ function comment_preview(CommentInterface $comment, FormStateInterface $form_sta
   }
 
   if ($comment->hasParentComment()) {
-    $build = array();
+    $build = [];
     $parent = $comment->getParentComment();
     if ($parent && $parent->isPublished()) {
       $build = \Drupal::entityTypeManager()->getViewBuilder('comment')->view($parent);
@@ -627,10 +636,10 @@ function template_preprocess_comment(&$variables) {
   $variables['threaded'] = $variables['elements']['#comment_threaded'];
 
   $account = $comment->getOwner();
-  $username = array(
+  $username = [
     '#theme' => 'username',
     '#account' => $account,
-  );
+  ];
   $variables['author'] = drupal_render($username);
   $variables['author_id'] = $comment->getOwnerId();
   $variables['new_indicator_timestamp'] = $comment->getChangedTime();
@@ -649,7 +658,7 @@ function template_preprocess_comment(&$variables) {
     $variables['user_picture'] = user_view($account, 'compact');
   }
   else {
-    $variables['user_picture'] = array();
+    $variables['user_picture'] = [];
   }
 
   if (isset($comment->in_preview)) {
@@ -658,25 +667,25 @@ function template_preprocess_comment(&$variables) {
   }
   else {
     $uri = $comment->permalink();
-    $attributes = $uri->getOption('attributes') ?: array();
-    $attributes += array('class' => array('permalink'), 'rel' => 'bookmark');
+    $attributes = $uri->getOption('attributes') ?: [];
+    $attributes += ['class' => ['permalink'], 'rel' => 'bookmark'];
     $uri->setOption('attributes', $attributes);
     $variables['title'] = \Drupal::l($comment->getSubject(), $uri);
 
     $variables['permalink'] = \Drupal::l(t('Permalink'), $comment->permalink());
   }
 
-  $variables['submitted'] = t('Submitted by @username on @datetime', array('@username' => $variables['author'], '@datetime' => $variables['created']));
+  $variables['submitted'] = t('Submitted by @username on @datetime', ['@username' => $variables['author'], '@datetime' => $variables['created']]);
 
   if ($comment->hasParentComment()) {
     // Fetch and store the parent comment information for use in templates.
     $comment_parent = $comment->getParentComment();
     $account_parent = $comment_parent->getOwner();
     $variables['parent_comment'] = $comment_parent;
-    $username = array(
+    $username = [
       '#theme' => 'username',
       '#account' => $account_parent,
-    );
+    ];
     $variables['parent_author'] = drupal_render($username);
     $variables['parent_created'] = format_date($comment_parent->getCreatedTime());
     // Avoid calling format_date() twice on the same timestamp.
@@ -687,13 +696,13 @@ function template_preprocess_comment(&$variables) {
       $variables['parent_changed'] = format_date($comment_parent->getChangedTime());
     }
     $permalink_uri_parent = $comment_parent->permalink();
-    $attributes = $permalink_uri_parent->getOption('attributes') ?: array();
-    $attributes += array('class' => array('permalink'), 'rel' => 'bookmark');
+    $attributes = $permalink_uri_parent->getOption('attributes') ?: [];
+    $attributes += ['class' => ['permalink'], 'rel' => 'bookmark'];
     $permalink_uri_parent->setOption('attributes', $attributes);
     $variables['parent_title'] = \Drupal::l($comment_parent->getSubject(), $permalink_uri_parent);
     $variables['parent_permalink'] = \Drupal::l(t('Parent permalink'), $permalink_uri_parent);
     $variables['parent'] = t('In reply to @parent_title by @parent_username',
-        array('@parent_username' => $variables['parent_author'], '@parent_title' => $variables['parent_title']));
+        ['@parent_username' => $variables['parent_author'], '@parent_title' => $variables['parent_title']]);
   }
   else {
     $variables['parent_comment'] = '';
diff --git a/web/core/modules/comment/comment.services.yml b/web/core/modules/comment/comment.services.yml
index 8d03ce5f8..46398a06a 100644
--- a/web/core/modules/comment/comment.services.yml
+++ b/web/core/modules/comment/comment.services.yml
@@ -7,7 +7,7 @@ services:
 
   comment.manager:
     class: Drupal\comment\CommentManager
-    arguments: ['@entity.manager', '@entity.query', '@config.factory', '@string_translation', '@url_generator', '@module_handler', '@current_user']
+    arguments: ['@entity.manager', '@config.factory', '@string_translation', '@url_generator', '@module_handler', '@current_user']
 
   comment.statistics:
     class: Drupal\comment\CommentStatistics
diff --git a/web/core/modules/comment/comment.tokens.inc b/web/core/modules/comment/comment.tokens.inc
index 4a935c2d2..884144196 100644
--- a/web/core/modules/comment/comment.tokens.inc
+++ b/web/core/modules/comment/comment.tokens.inc
@@ -15,16 +15,16 @@ use Drupal\Core\Render\BubbleableMetadata;
  * Implements hook_token_info().
  */
 function comment_token_info() {
-  $type = array(
+  $type = [
     'name' => t('Comments'),
     'description' => t('Tokens for comments posted on the site.'),
     'needs-data' => 'comment',
-  );
+  ];
 
   $tokens = [];
   // Provide a integration for each entity type except comment.
   foreach (\Drupal::entityTypeManager()->getDefinitions() as $entity_type_id => $entity_type) {
-    if ($entity_type_id == 'comment' || !$entity_type->isSubclassOf(ContentEntityInterface::class)) {
+    if ($entity_type_id == 'comment' || !$entity_type->entityClassImplements(ContentEntityInterface::class)) {
       continue;
     }
 
@@ -45,76 +45,76 @@ function comment_token_info() {
   }
 
   // Core comment tokens
-  $comment['cid'] = array(
+  $comment['cid'] = [
     'name' => t("Comment ID"),
     'description' => t("The unique ID of the comment."),
-  );
-  $comment['hostname'] = array(
+  ];
+  $comment['hostname'] = [
     'name' => t("IP Address"),
     'description' => t("The IP address of the computer the comment was posted from."),
-  );
-  $comment['mail'] = array(
+  ];
+  $comment['mail'] = [
     'name' => t("Email address"),
     'description' => t("The email address left by the comment author."),
-  );
-  $comment['homepage'] = array(
+  ];
+  $comment['homepage'] = [
     'name' => t("Home page"),
     'description' => t("The home page URL left by the comment author."),
-  );
-  $comment['title'] = array(
+  ];
+  $comment['title'] = [
     'name' => t("Title"),
     'description' => t("The title of the comment."),
-  );
-  $comment['body'] = array(
+  ];
+  $comment['body'] = [
     'name' => t("Content"),
     'description' => t("The formatted content of the comment itself."),
-  );
-  $comment['langcode'] = array(
+  ];
+  $comment['langcode'] = [
     'name' => t('Language code'),
     'description' => t('The language code of the language the comment is written in.'),
-  );
-  $comment['url'] = array(
+  ];
+  $comment['url'] = [
     'name' => t("URL"),
     'description' => t("The URL of the comment."),
-  );
-  $comment['edit-url'] = array(
+  ];
+  $comment['edit-url'] = [
     'name' => t("Edit URL"),
     'description' => t("The URL of the comment's edit page."),
-  );
+  ];
 
   // Chained tokens for comments
-  $comment['created'] = array(
+  $comment['created'] = [
     'name' => t("Date created"),
     'description' => t("The date the comment was posted."),
     'type' => 'date',
-  );
-  $comment['changed'] = array(
+  ];
+  $comment['changed'] = [
     'name' => t("Date changed"),
     'description' => t("The date the comment was most recently updated."),
     'type' => 'date',
-  );
-  $comment['parent'] = array(
+  ];
+  $comment['parent'] = [
     'name' => t("Parent"),
     'description' => t("The comment's parent, if comment threading is active."),
     'type' => 'comment',
-  );
-  $comment['entity'] = array(
+  ];
+  $comment['entity'] = [
     'name' => t("Entity"),
     'description' => t("The entity the comment was posted to."),
     'type' => 'entity',
-  );
-  $comment['author'] = array(
+  ];
+  $comment['author'] = [
     'name' => t("Author"),
     'description' => t("The author name of the comment."),
     'type' => 'user',
-  );
+  ];
 
-  return array(
-    'types' => array('comment' => $type),
-    'tokens' => array(
+  return [
+    'types' => ['comment' => $type],
+    'tokens' => [
       'comment' => $comment,
-    ) + $tokens,
-  );
+    ] + $tokens,
+  ];
 }
 
 /**
@@ -123,7 +123,7 @@ function comment_token_info() {
 function comment_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
-  $url_options = array('absolute' => TRUE);
+  $url_options = ['absolute' => TRUE];
   if (isset($options['langcode'])) {
     $url_options['language'] = \Drupal::languageManager()->getLanguage($options['langcode']);
     $langcode = $options['langcode'];
@@ -131,7 +131,7 @@ function comment_tokens($type, $tokens, array $data, array $options, BubbleableM
   else {
     $langcode = NULL;
   }
-  $replacements = array();
+  $replacements = [];
 
   if ($type == 'comment' && !empty($data['comment'])) {
     /** @var \Drupal\comment\CommentInterface $comment */
@@ -230,23 +230,23 @@ function comment_tokens($type, $tokens, array $data, array $options, BubbleableM
     // Chained token relationships.
     if ($entity_tokens = $token_service->findwithPrefix($tokens, 'entity')) {
       $entity = $comment->getCommentedEntity();
-      $replacements += $token_service->generate($comment->getCommentedEntityTypeId(), $entity_tokens, array($comment->getCommentedEntityTypeId() => $entity), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate($comment->getCommentedEntityTypeId(), $entity_tokens, [$comment->getCommentedEntityTypeId() => $entity], $options, $bubbleable_metadata);
     }
 
     if ($date_tokens = $token_service->findwithPrefix($tokens, 'created')) {
-      $replacements += $token_service->generate('date', $date_tokens, array('date' => $comment->getCreatedTime()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('date', $date_tokens, ['date' => $comment->getCreatedTime()], $options, $bubbleable_metadata);
     }
 
     if ($date_tokens = $token_service->findwithPrefix($tokens, 'changed')) {
-      $replacements += $token_service->generate('date', $date_tokens, array('date' => $comment->getChangedTime()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('date', $date_tokens, ['date' => $comment->getChangedTime()], $options, $bubbleable_metadata);
     }
 
     if (($parent_tokens = $token_service->findwithPrefix($tokens, 'parent')) && $parent = $comment->getParentComment()) {
-      $replacements += $token_service->generate('comment', $parent_tokens, array('comment' => $parent), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('comment', $parent_tokens, ['comment' => $parent], $options, $bubbleable_metadata);
     }
 
     if (($author_tokens = $token_service->findwithPrefix($tokens, 'author')) && $account = $comment->getOwner()) {
-      $replacements += $token_service->generate('user', $author_tokens, array('user' => $account), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('user', $author_tokens, ['user' => $account], $options, $bubbleable_metadata);
     }
   }
   // Replacement tokens for any content entities that have comment field.
diff --git a/web/core/modules/comment/comment.views.inc b/web/core/modules/comment/comment.views.inc
index 5e318760d..11abede94 100644
--- a/web/core/modules/comment/comment.views.inc
+++ b/web/core/modules/comment/comment.views.inc
@@ -5,47 +5,49 @@
  * Provide views data for comment.module.
  */
 
+use Drupal\Core\Entity\ContentEntityInterface;
+
 /**
  * Implements hook_views_data_alter().
  */
 function comment_views_data_alter(&$data) {
   // New comments are only supported for node table because it requires the
   // history table.
-  $data['node']['new_comments'] = array(
+  $data['node']['new_comments'] = [
     'title' => t('New comments'),
     'help' => t('The number of new comments on the node.'),
-    'field' => array(
+    'field' => [
       'id' => 'node_new_comments',
       'no group by' => TRUE,
-    ),
-  );
+    ],
+  ];
 
   // Provide a integration for each entity type except comment.
   foreach (\Drupal::entityManager()->getDefinitions() as $entity_type_id => $entity_type) {
-    if ($entity_type_id == 'comment' || !$entity_type->isSubclassOf('\Drupal\Core\Entity\ContentEntityInterface') || !$entity_type->getBaseTable()) {
+    if ($entity_type_id == 'comment' || !$entity_type->entityClassImplements(ContentEntityInterface::class) || !$entity_type->getBaseTable()) {
       continue;
     }
     $fields = \Drupal::service('comment.manager')->getFields($entity_type_id);
     $base_table = $entity_type->getDataTable() ?: $entity_type->getBaseTable();
-    $args = array('@entity_type' => $entity_type_id);
+    $args = ['@entity_type' => $entity_type_id];
 
     if ($fields) {
-      $data[$base_table]['comments_link'] = array(
-        'field' => array(
+      $data[$base_table]['comments_link'] = [
+        'field' => [
           'title' => t('Add comment link'),
           'help' => t('Display the standard add comment link used on regular @entity_type, which will only display if the viewing user has access to add a comment.', $args),
           'id' => 'comment_entity_link',
-        ),
-      );
+        ],
+      ];
 
       // Multilingual properties are stored in data table.
       if (!($table = $entity_type->getDataTable())) {
         $table = $entity_type->getBaseTable();
       }
-      $data[$table]['uid_touch'] = array(
+      $data[$table]['uid_touch'] = [
         'title' => t('User posted or commented'),
         'help' => t('Display nodes only if a user posted the @entity_type or commented on the @entity_type.', $args),
-        'argument' => array(
+        'argument' => [
           'field' => 'uid',
           'name table' => 'users_field_data',
           'name field' => 'name',
@@ -53,40 +55,40 @@ function comment_views_data_alter(&$data) {
           'no group by' => TRUE,
           'entity_type' => $entity_type_id,
           'entity_id' => $entity_type->getKey('id'),
-        ),
-        'filter' => array(
+        ],
+        'filter' => [
           'field' => 'uid',
           'name table' => 'users_field_data',
           'name field' => 'name',
           'id' => 'comment_user_uid',
           'entity_type' => $entity_type_id,
           'entity_id' => $entity_type->getKey('id'),
-        ),
-      );
+        ],
+      ];
 
       foreach ($fields as $field_name => $field) {
-        $data[$base_table][$field_name . '_cid'] = array(
-          'title' => t('Comments of the @entity_type using field: @field_name', $args + array('@field_name' => $field_name)),
+        $data[$base_table][$field_name . '_cid'] = [
+          'title' => t('Comments of the @entity_type using field: @field_name', $args + ['@field_name' => $field_name]),
           'help' => t('Relate all comments on the @entity_type. This will create 1 duplicate record for every comment. Usually if you need this it is better to create a comment view.', $args),
-          'relationship' => array(
+          'relationship' => [
             'group' => t('Comment'),
             'label' => t('Comments'),
             'base' => 'comment_field_data',
             'base field' => 'entity_id',
             'relationship field' => $entity_type->getKey('id'),
             'id' => 'standard',
-            'extra' => array(
-              array(
+            'extra' => [
+              [
                 'field' => 'entity_type',
                 'value' => $entity_type_id,
-              ),
-              array(
+              ],
+              [
                 'field' => 'field_name',
                 'value' => $field_name,
-              ),
-            ),
-          ),
-        );
+              ],
+            ],
+          ],
+        ];
       }
     }
   }
diff --git a/web/core/modules/comment/config/optional/views.view.comments_recent.yml b/web/core/modules/comment/config/optional/views.view.comments_recent.yml
index 196f5ce08..28613e696 100644
--- a/web/core/modules/comment/config/optional/views.view.comments_recent.yml
+++ b/web/core/modules/comment/config/optional/views.view.comments_recent.yml
@@ -48,10 +48,6 @@ display:
         type: fields
         options:
           default_field_elements: true
-          inline:
-            subject: subject
-            changed: changed
-          separator: ' '
           hide_empty: false
       relationships:
         node:
diff --git a/web/core/modules/comment/src/CommentAccessControlHandler.php b/web/core/modules/comment/src/CommentAccessControlHandler.php
index fc0d4b2d6..bcb0fd7a0 100644
--- a/web/core/modules/comment/src/CommentAccessControlHandler.php
+++ b/web/core/modules/comment/src/CommentAccessControlHandler.php
@@ -36,8 +36,13 @@ class CommentAccessControlHandler extends EntityAccessControlHandler {
 
     switch ($operation) {
       case 'view':
-        return AccessResult::allowedIf($account->hasPermission('access comments') && $entity->isPublished())->cachePerPermissions()->addCacheableDependency($entity)
+        $access_result = AccessResult::allowedIf($account->hasPermission('access comments') && $entity->isPublished())->cachePerPermissions()->addCacheableDependency($entity)
           ->andIf($entity->getCommentedEntity()->access($operation, $account, TRUE));
+        if (!$access_result->isAllowed()) {
+          $access_result->setReason("The 'access comments' permission is required and the comment must be published.");
+        }
+
+        return $access_result;
 
       case 'update':
         return AccessResult::allowedIf($account->id() && $account->id() == $entity->getOwnerId() && $entity->isPublished() && $account->hasPermission('edit own comments'))->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity);
@@ -62,23 +67,23 @@ class CommentAccessControlHandler extends EntityAccessControlHandler {
     if ($operation == 'edit') {
       // Only users with the "administer comments" permission can edit
       // administrative fields.
-      $administrative_fields = array(
+      $administrative_fields = [
         'uid',
         'status',
         'created',
         'date',
-      );
+      ];
       if (in_array($field_definition->getName(), $administrative_fields, TRUE)) {
         return AccessResult::allowedIfHasPermission($account, 'administer comments');
       }
 
       // No user can change read-only fields.
-      $read_only_fields = array(
+      $read_only_fields = [
         'hostname',
         'changed',
         'cid',
         'thread',
-      );
+      ];
       // These fields can be edited during comment creation.
       $create_only_fields = [
         'comment_type',
diff --git a/web/core/modules/comment/src/CommentForm.php b/web/core/modules/comment/src/CommentForm.php
index 75191a38b..28231b8cb 100644
--- a/web/core/modules/comment/src/CommentForm.php
+++ b/web/core/modules/comment/src/CommentForm.php
@@ -3,12 +3,14 @@
 namespace Drupal\comment;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityConstraintViolationListInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -40,7 +42,9 @@ class CommentForm extends ContentEntityForm {
     return new static(
       $container->get('entity.manager'),
       $container->get('current_user'),
-      $container->get('renderer')
+      $container->get('renderer'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time')
     );
   }
 
@@ -53,9 +57,13 @@ class CommentForm extends ContentEntityForm {
    *   The current user.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle service.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, AccountInterface $current_user, RendererInterface $renderer) {
-    parent::__construct($entity_manager);
+  public function __construct(EntityManagerInterface $entity_manager, AccountInterface $current_user, RendererInterface $renderer, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
+    parent::__construct($entity_manager, $entity_type_bundle_info, $time);
     $this->currentUser = $current_user;
     $this->renderer = $renderer;
   }
@@ -83,7 +91,7 @@ class CommentForm extends ContentEntityForm {
 
     // Use #comment-form as unique jump target, regardless of entity type.
     $form['#id'] = Html::getUniqueId('comment_form');
-    $form['#theme'] = array('comment_form__' . $entity->getEntityTypeId() . '__' . $entity->bundle() . '__' . $field_name, 'comment_form');
+    $form['#theme'] = ['comment_form__' . $entity->getEntityTypeId() . '__' . $entity->bundle() . '__' . $field_name, 'comment_form'];
 
     $anonymous_contact = $field_definition->getSetting('anonymous');
     $is_admin = $comment->id() && $this->currentUser->hasPermission('administer comments');
@@ -96,7 +104,7 @@ class CommentForm extends ContentEntityForm {
     // If not replying to a comment, use our dedicated page callback for new
     // Comments on entities.
     if (!$comment->id() && !$comment->hasParentComment()) {
-      $form['#action'] = $this->url('comment.reply', array('entity_type' => $entity->getEntityTypeId(), 'entity' => $entity->id(), 'field_name' => $field_name));
+      $form['#action'] = $this->url('comment.reply', ['entity_type' => $entity->getEntityTypeId(), 'entity' => $entity->id(), 'field_name' => $field_name]);
     }
 
     $comment_preview = $form_state->get('comment_preview');
@@ -104,13 +112,13 @@ class CommentForm extends ContentEntityForm {
       $form += $comment_preview;
     }
 
-    $form['author'] = array();
+    $form['author'] = [];
     // Display author information in a details element for comment moderators.
     if ($is_admin) {
-      $form['author'] += array(
+      $form['author'] += [
         '#type' => 'details',
         '#title' => $this->t('Administration'),
-      );
+      ];
     }
 
     // Prepare default values for form elements.
@@ -121,9 +129,9 @@ class CommentForm extends ContentEntityForm {
       }
       $status = $comment->getStatus();
       if (empty($comment_preview)) {
-        $form['#title'] = $this->t('Edit comment %title', array(
+        $form['#title'] = $this->t('Edit comment %title', [
           '%title' => $comment->getSubject(),
-        ));
+        ]);
       }
     }
     else {
@@ -154,7 +162,7 @@ class CommentForm extends ContentEntityForm {
     // The name field is displayed when an anonymous user is adding a comment or
     // when a user with the permission 'administer comments' is editing an
     // existing comment from an anonymous user.
-    $form['author']['name'] = array(
+    $form['author']['name'] = [
       '#type' => 'textfield',
       '#title' => $is_admin ? $this->t('Name for @anonymous', ['@anonymous' => $config->get('anonymous')]) : $this->t('Your name'),
       '#default_value' => $author,
@@ -165,20 +173,20 @@ class CommentForm extends ContentEntityForm {
       '#attributes' => [
         'data-drupal-default-value' => $config->get('anonymous'),
       ],
-    );
+    ];
 
     if ($is_admin) {
       // When editing a comment only display the name textfield if the uid field
       // is empty.
       $form['author']['name']['#states'] = [
         'visible' => [
-          ':input[name="uid"]' => array('empty' => TRUE),
+          ':input[name="uid"]' => ['empty' => TRUE],
         ],
       ];
     }
 
     // Add author email and homepage fields depending on the current user.
-    $form['author']['mail'] = array(
+    $form['author']['mail'] = [
       '#type' => 'email',
       '#title' => $this->t('Email'),
       '#default_value' => $comment->getAuthorEmail(),
@@ -187,36 +195,36 @@ class CommentForm extends ContentEntityForm {
       '#size' => 30,
       '#description' => $this->t('The content of this field is kept private and will not be shown publicly.'),
       '#access' => ($comment->getOwner()->isAnonymous() && $is_admin) || ($this->currentUser->isAnonymous() && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT),
-    );
+    ];
 
-    $form['author']['homepage'] = array(
+    $form['author']['homepage'] = [
       '#type' => 'url',
       '#title' => $this->t('Homepage'),
       '#default_value' => $comment->getHomepage(),
       '#maxlength' => 255,
       '#size' => 30,
       '#access' => $is_admin || ($this->currentUser->isAnonymous() && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT),
-    );
+    ];
 
     // Add administrative comment publishing options.
-    $form['author']['date'] = array(
+    $form['author']['date'] = [
       '#type' => 'datetime',
       '#title' => $this->t('Authored on'),
       '#default_value' => $date,
       '#size' => 20,
       '#access' => $is_admin,
-    );
+    ];
 
-    $form['author']['status'] = array(
+    $form['author']['status'] = [
       '#type' => 'radios',
       '#title' => $this->t('Status'),
       '#default_value' => $status,
-      '#options' => array(
+      '#options' => [
         CommentInterface::PUBLISHED => $this->t('Published'),
         CommentInterface::NOT_PUBLISHED => $this->t('Not published'),
-      ),
+      ],
       '#access' => $is_admin,
-    );
+    ];
 
     return parent::form($form, $form_state, $comment);
   }
@@ -242,12 +250,12 @@ class CommentForm extends ContentEntityForm {
     // already previewing the submission.
     $element['submit']['#access'] = ($comment->id() && $this->currentUser->hasPermission('administer comments')) || $preview_mode != DRUPAL_REQUIRED || $form_state->get('comment_preview');
 
-    $element['preview'] = array(
+    $element['preview'] = [
       '#type' => 'submit',
       '#value' => $this->t('Preview'),
       '#access' => $preview_mode != DRUPAL_DISABLED,
-      '#submit' => array('::submitForm', '::preview'),
-    );
+      '#submit' => ['::submitForm', '::preview'],
+    ];
 
     return $element;
   }
@@ -350,17 +358,17 @@ class CommentForm extends ContentEntityForm {
     $entity = $comment->getCommentedEntity();
     $field_name = $comment->getFieldName();
     $uri = $entity->urlInfo();
-    $logger = $this->logger('content');
+    $logger = $this->logger('comment');
 
     if ($this->currentUser->hasPermission('post comments') && ($this->currentUser->hasPermission('administer comments') || $entity->{$field_name}->status == CommentItemInterface::OPEN)) {
       $comment->save();
       $form_state->setValue('cid', $comment->id());
 
       // Add a log entry.
-      $logger->notice('Comment posted: %subject.', array(
+      $logger->notice('Comment posted: %subject.', [
           '%subject' => $comment->getSubject(),
           'link' => $this->l(t('View'), $comment->urlInfo()->setOption('fragment', 'comment-' . $comment->id()))
-        ));
+        ]);
 
       // Explain the approval queue if necessary.
       if (!$comment->isPublished()) {
@@ -371,7 +379,7 @@ class CommentForm extends ContentEntityForm {
       else {
         drupal_set_message($this->t('Your comment has been posted.'));
       }
-      $query = array();
+      $query = [];
       // Find the current display page for this comment.
       $field_definition = $this->entityManager->getFieldDefinitions($entity->getEntityTypeId(), $entity->bundle())[$field_name];
       $page = $this->entityManager->getStorage('comment')->getDisplayOrdinal($comment, $field_definition->getSetting('default_mode'), $field_definition->getSetting('per_page'));
@@ -383,8 +391,8 @@ class CommentForm extends ContentEntityForm {
       $uri->setOption('fragment', 'comment-' . $comment->id());
     }
     else {
-      $logger->warning('Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $comment->getSubject()));
-      drupal_set_message($this->t('Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $comment->getSubject())), 'error');
+      $logger->warning('Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', ['%subject' => $comment->getSubject()]);
+      drupal_set_message($this->t('Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', ['%subject' => $comment->getSubject()]), 'error');
       // Redirect the user to the entity they are commenting on.
     }
     $form_state->setRedirectUrl($uri);
diff --git a/web/core/modules/comment/src/CommentInterface.php b/web/core/modules/comment/src/CommentInterface.php
index 28318eea1..e80e5edfd 100644
--- a/web/core/modules/comment/src/CommentInterface.php
+++ b/web/core/modules/comment/src/CommentInterface.php
@@ -3,13 +3,14 @@
 namespace Drupal\comment;
 
 use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\user\EntityOwnerInterface;
 use Drupal\Core\Entity\EntityChangedInterface;
 
 /**
  * Provides an interface defining a comment entity.
  */
-interface CommentInterface extends ContentEntityInterface, EntityChangedInterface, EntityOwnerInterface {
+interface CommentInterface extends ContentEntityInterface, EntityChangedInterface, EntityOwnerInterface, EntityPublishedInterface {
 
   /**
    * Comment is awaiting approval.
@@ -21,6 +22,21 @@ interface CommentInterface extends ContentEntityInterface, EntityChangedInterfac
    */
   const PUBLISHED = 1;
 
+  /**
+   * Anonymous posters cannot enter their contact information.
+   */
+  const ANONYMOUS_MAYNOT_CONTACT = 0;
+
+  /**
+   * Anonymous posters may leave their contact information.
+   */
+  const ANONYMOUS_MAY_CONTACT = 1;
+
+  /**
+   * Anonymous posters are required to leave their contact information.
+   */
+  const ANONYMOUS_MUST_CONTACT = 2;
+
   /**
    * Determines if this comment is a reply to another comment.
    *
@@ -191,33 +207,17 @@ interface CommentInterface extends ContentEntityInterface, EntityChangedInterfac
    */
   public function setCreatedTime($created);
 
-  /**
-   * Checks if the comment is published.
-   *
-   * @return bool
-   *   TRUE if the comment is published.
-   */
-  public function isPublished();
-
   /**
    * Returns the comment's status.
    *
    * @return int
    *   One of CommentInterface::PUBLISHED or CommentInterface::NOT_PUBLISHED
+   *
+   * @deprecated in Drupal 8.3.0, will be removed before Drupal 9.0.0. Use
+   *   \Drupal\Core\Entity\EntityPublishedInterface::isPublished() instead.
    */
   public function getStatus();
 
-  /**
-   * Sets the published status of the comment entity.
-   *
-   * @param bool $status
-   *   Set to TRUE to publish the comment, FALSE to unpublish.
-   *
-   * @return \Drupal\comment\CommentInterface
-   *   The class instance that this method is called on.
-   */
-  public function setPublished($status);
-
   /**
    * Returns the alphadecimal representation of the comment's place in a thread.
    *
diff --git a/web/core/modules/comment/src/CommentLazyBuilders.php b/web/core/modules/comment/src/CommentLazyBuilders.php
index 4eeeb59d0..730c84089 100644
--- a/web/core/modules/comment/src/CommentLazyBuilders.php
+++ b/web/core/modules/comment/src/CommentLazyBuilders.php
@@ -99,13 +99,13 @@ class CommentLazyBuilders {
    *   A renderable array containing the comment form.
    */
   public function renderForm($commented_entity_type_id, $commented_entity_id, $field_name, $comment_type_id) {
-    $values = array(
+    $values = [
       'entity_type' => $commented_entity_type_id,
       'entity_id' => $commented_entity_id,
       'field_name' => $field_name,
       'comment_type' => $comment_type_id,
       'pid' => NULL,
-    );
+    ];
     $comment = $this->entityManager->getStorage('comment')->create($values);
     return $this->entityFormBuilder->getForm($comment);
   }
@@ -126,11 +126,11 @@ class CommentLazyBuilders {
    *   A renderable array representing the comment links.
    */
   public function renderLinks($comment_entity_id, $view_mode, $langcode, $is_in_preview) {
-    $links = array(
+    $links = [
       '#theme' => 'links__comment',
-      '#pre_render' => array('drupal_pre_render_links'),
-      '#attributes' => array('class' => array('links', 'inline')),
-    );
+      '#pre_render' => ['drupal_pre_render_links'],
+      '#attributes' => ['class' => ['links', 'inline']],
+    ];
 
     if (!$is_in_preview) {
       /** @var \Drupal\comment\CommentInterface $entity */
@@ -140,11 +140,11 @@ class CommentLazyBuilders {
       $links['comment'] = $this->buildLinks($entity, $commented_entity);
 
       // Allow other modules to alter the comment links.
-      $hook_context = array(
+      $hook_context = [
         'view_mode' => $view_mode,
         'langcode' => $langcode,
         'commented_entity' => $commented_entity,
-      );
+      ];
       $this->moduleHandler->alter('comment_links', $links, $entity, $hook_context);
     }
     return $links;
@@ -162,25 +162,25 @@ class CommentLazyBuilders {
    *   An array that can be processed by drupal_pre_render_links().
    */
   protected function buildLinks(CommentInterface $entity, EntityInterface $commented_entity) {
-    $links = array();
+    $links = [];
     $status = $commented_entity->get($entity->getFieldName())->status;
 
     if ($status == CommentItemInterface::OPEN) {
       if ($entity->access('delete')) {
-        $links['comment-delete'] = array(
+        $links['comment-delete'] = [
           'title' => t('Delete'),
           'url' => $entity->urlInfo('delete-form'),
-        );
+        ];
       }
 
       if ($entity->access('update')) {
-        $links['comment-edit'] = array(
+        $links['comment-edit'] = [
           'title' => t('Edit'),
           'url' => $entity->urlInfo('edit-form'),
-        );
+        ];
       }
       if ($entity->access('create')) {
-        $links['comment-reply'] = array(
+        $links['comment-reply'] = [
           'title' => t('Reply'),
           'url' => Url::fromRoute('comment.reply', [
             'entity_type' => $entity->getCommentedEntityTypeId(),
@@ -188,13 +188,13 @@ class CommentLazyBuilders {
             'field_name' => $entity->getFieldName(),
             'pid' => $entity->id(),
           ]),
-        );
+        ];
       }
       if (!$entity->isPublished() && $entity->access('approve')) {
-        $links['comment-approve'] = array(
+        $links['comment-approve'] = [
           'title' => t('Approve'),
           'url' => Url::fromRoute('comment.approve', ['comment' => $entity->id()]),
-        );
+        ];
       }
       if (empty($links) && $this->currentUser->isAnonymous()) {
         $links['comment-forbidden']['title'] = $this->commentManager->forbiddenMessage($commented_entity, $entity->getFieldName());
@@ -203,18 +203,18 @@ class CommentLazyBuilders {
 
     // Add translations link for translation-enabled comment bundles.
     if ($this->moduleHandler->moduleExists('content_translation') && $this->access($entity)->isAllowed()) {
-      $links['comment-translations'] = array(
+      $links['comment-translations'] = [
         'title' => t('Translate'),
         'url' => $entity->urlInfo('drupal:content-translation-overview'),
-      );
+      ];
     }
 
-    return array(
+    return [
       '#theme' => 'links__comment__comment',
       // The "entity" property is specified to be present, so no need to check.
       '#links' => $links,
-      '#attributes' => array('class' => array('links', 'inline')),
-    );
+      '#attributes' => ['class' => ['links', 'inline']],
+    ];
   }
 
   /**
diff --git a/web/core/modules/comment/src/CommentLinkBuilder.php b/web/core/modules/comment/src/CommentLinkBuilder.php
index 9998e3f3d..c7cbc18d3 100644
--- a/web/core/modules/comment/src/CommentLinkBuilder.php
+++ b/web/core/modules/comment/src/CommentLinkBuilder.php
@@ -75,7 +75,7 @@ class CommentLinkBuilder implements CommentLinkBuilderInterface {
    * {@inheritdoc}
    */
   public function buildCommentedEntityLinks(FieldableEntityInterface $entity, array &$context) {
-    $entity_links = array();
+    $entity_links = [];
     $view_mode = $context['view_mode'];
     if ($view_mode == 'search_index' || $view_mode == 'search_result' || $view_mode == 'print' || $view_mode == 'rss') {
       // Do not add any links if the entity is displayed for:
@@ -83,7 +83,7 @@ class CommentLinkBuilder implements CommentLinkBuilderInterface {
       // - constructing a search result excerpt.
       // - print.
       // - rss.
-      return array();
+      return [];
     }
 
     $fields = $this->commentManager->getFields($entity->getEntityTypeId());
@@ -92,7 +92,7 @@ class CommentLinkBuilder implements CommentLinkBuilderInterface {
       if (!$entity->hasField($field_name)) {
         continue;
       }
-      $links = array();
+      $links = [];
       $commenting_status = $entity->get($field_name)->status;
       if ($commenting_status != CommentItemInterface::HIDDEN) {
         // Entity has commenting status open or closed.
@@ -103,23 +103,23 @@ class CommentLinkBuilder implements CommentLinkBuilderInterface {
           // entity is open to new comments, and there currently are none.
           if ($this->currentUser->hasPermission('access comments')) {
             if (!empty($entity->get($field_name)->comment_count)) {
-              $links['comment-comments'] = array(
+              $links['comment-comments'] = [
                 'title' => $this->formatPlural($entity->get($field_name)->comment_count, '1 comment', '@count comments'),
-                'attributes' => array('title' => $this->t('Jump to the first comment.')),
+                'attributes' => ['title' => $this->t('Jump to the first comment.')],
                 'fragment' => 'comments',
                 'url' => $entity->urlInfo(),
-              );
+              ];
               if ($this->moduleHandler->moduleExists('history')) {
-                $links['comment-new-comments'] = array(
+                $links['comment-new-comments'] = [
                   'title' => '',
                   'url' => Url::fromRoute('<current>'),
-                  'attributes' => array(
+                  'attributes' => [
                     'class' => 'hidden',
                     'title' => $this->t('Jump to the first new comment.'),
                     'data-history-node-last-comment-timestamp' => $entity->get($field_name)->last_comment_timestamp,
                     'data-history-node-field-name' => $field_name,
-                  ),
-                );
+                  ],
+                ];
               }
             }
           }
@@ -127,12 +127,12 @@ class CommentLinkBuilder implements CommentLinkBuilderInterface {
           if ($commenting_status == CommentItemInterface::OPEN) {
             $comment_form_location = $field_definition->getSetting('form_location');
             if ($this->currentUser->hasPermission('post comments')) {
-              $links['comment-add'] = array(
+              $links['comment-add'] = [
                 'title' => $this->t('Add new comment'),
                 'language' => $entity->language(),
-                'attributes' => array('title' => $this->t('Share your thoughts and opinions.')),
+                'attributes' => ['title' => $this->t('Share your thoughts and opinions.')],
                 'fragment' => 'comment-form',
-              );
+              ];
               if ($comment_form_location == CommentItemInterface::FORM_SEPARATE_PAGE) {
                 $links['comment-add']['url'] = Url::fromRoute('comment.reply', [
                   'entity_type' => $entity->getEntityTypeId(),
@@ -145,9 +145,9 @@ class CommentLinkBuilder implements CommentLinkBuilderInterface {
               }
             }
             elseif ($this->currentUser->isAnonymous()) {
-              $links['comment-forbidden'] = array(
+              $links['comment-forbidden'] = [
                 'title' => $this->commentManager->forbiddenMessage($entity, $field_name),
-              );
+              ];
             }
           }
         }
@@ -161,11 +161,11 @@ class CommentLinkBuilder implements CommentLinkBuilderInterface {
               // Show the "post comment" link if the form is on another page, or
               // if there are existing comments that the link will skip past.
               if ($comment_form_location == CommentItemInterface::FORM_SEPARATE_PAGE || (!empty($entity->get($field_name)->comment_count) && $this->currentUser->hasPermission('access comments'))) {
-                $links['comment-add'] = array(
+                $links['comment-add'] = [
                   'title' => $this->t('Add new comment'),
-                  'attributes' => array('title' => $this->t('Share your thoughts and opinions.')),
+                  'attributes' => ['title' => $this->t('Share your thoughts and opinions.')],
                   'fragment' => 'comment-form',
-                );
+                ];
                 if ($comment_form_location == CommentItemInterface::FORM_SEPARATE_PAGE) {
                   $links['comment-add']['url'] = Url::fromRoute('comment.reply', [
                     'entity_type' => $entity->getEntityTypeId(),
@@ -179,20 +179,20 @@ class CommentLinkBuilder implements CommentLinkBuilderInterface {
               }
             }
             elseif ($this->currentUser->isAnonymous()) {
-              $links['comment-forbidden'] = array(
+              $links['comment-forbidden'] = [
                 'title' => $this->commentManager->forbiddenMessage($entity, $field_name),
-              );
+              ];
             }
           }
         }
       }
 
       if (!empty($links)) {
-        $entity_links['comment__' . $field_name] = array(
+        $entity_links['comment__' . $field_name] = [
           '#theme' => 'links__entity__comment__' . $field_name,
           '#links' => $links,
-          '#attributes' => array('class' => array('links', 'inline')),
-        );
+          '#attributes' => ['class' => ['links', 'inline']],
+        ];
         if ($view_mode == 'teaser' && $this->moduleHandler->moduleExists('history') && $this->currentUser->isAuthenticated()) {
           $entity_links['comment__' . $field_name]['#cache']['contexts'][] = 'user';
           $entity_links['comment__' . $field_name]['#attached']['library'][] = 'comment/drupal.node-new-comments-link';
diff --git a/web/core/modules/comment/src/CommentManager.php b/web/core/modules/comment/src/CommentManager.php
index fcec23056..80cc427e3 100644
--- a/web/core/modules/comment/src/CommentManager.php
+++ b/web/core/modules/comment/src/CommentManager.php
@@ -6,7 +6,7 @@ use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Routing\UrlGeneratorTrait;
@@ -31,13 +31,6 @@ class CommentManager implements CommentManagerInterface {
    */
   protected $entityManager;
 
-  /**
-   * The entity query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
-
   /**
    * Whether the \Drupal\user\RoleInterface::AUTHENTICATED_ID can post comments.
    *
@@ -71,8 +64,6 @@ class CommentManager implements CommentManagerInterface {
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager service.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The config factory.
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
@@ -84,9 +75,8 @@ class CommentManager implements CommentManagerInterface {
    * @param \Drupal\Core\Session\AccountInterface $current_user
    *   The current user.
    */
-  public function __construct(EntityManagerInterface $entity_manager, QueryFactory $query_factory, ConfigFactoryInterface $config_factory, TranslationInterface $string_translation, UrlGeneratorInterface $url_generator, ModuleHandlerInterface $module_handler, AccountInterface $current_user) {
+  public function __construct(EntityManagerInterface $entity_manager, ConfigFactoryInterface $config_factory, TranslationInterface $string_translation, UrlGeneratorInterface $url_generator, ModuleHandlerInterface $module_handler, AccountInterface $current_user) {
     $this->entityManager = $entity_manager;
-    $this->queryFactory = $query_factory;
     $this->userConfig = $config_factory->get('user.settings');
     $this->stringTranslation = $string_translation;
     $this->urlGenerator = $url_generator;
@@ -99,12 +89,12 @@ class CommentManager implements CommentManagerInterface {
    */
   public function getFields($entity_type_id) {
     $entity_type = $this->entityManager->getDefinition($entity_type_id);
-    if (!$entity_type->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface')) {
-      return array();
+    if (!$entity_type->entityClassImplements(FieldableEntityInterface::class)) {
+      return [];
     }
 
     $map = $this->entityManager->getFieldMapByFieldType('comment');
-    return isset($map[$entity_type_id]) ? $map[$entity_type_id] : array();
+    return isset($map[$entity_type_id]) ? $map[$entity_type_id] : [];
   }
 
   /**
@@ -113,28 +103,28 @@ class CommentManager implements CommentManagerInterface {
   public function addBodyField($comment_type_id) {
     if (!FieldConfig::loadByName('comment', $comment_type_id, 'comment_body')) {
       // Attaches the body field by default.
-      $field = $this->entityManager->getStorage('field_config')->create(array(
+      $field = $this->entityManager->getStorage('field_config')->create([
         'label' => 'Comment',
         'bundle' => $comment_type_id,
         'required' => TRUE,
         'field_storage' => FieldStorageConfig::loadByName('comment', 'comment_body'),
-      ));
+      ]);
       $field->save();
 
       // Assign widget settings for the 'default' form mode.
       entity_get_form_display('comment', $comment_type_id, 'default')
-        ->setComponent('comment_body', array(
+        ->setComponent('comment_body', [
           'type' => 'text_textarea',
-        ))
+        ])
         ->save();
 
       // Assign display settings for the 'default' view mode.
       entity_get_display('comment', $comment_type_id, 'default')
-        ->setComponent('comment_body', array(
+        ->setComponent('comment_body', [
           'label' => 'hidden',
           'type' => 'text_default',
           'weight' => 0,
-        ))
+        ])
         ->save();
     }
   }
@@ -161,24 +151,24 @@ class CommentManager implements CommentManagerInterface {
           'entity' => $entity->id(),
           'field_name' => $field_name,
         ];
-        $destination = array('destination' => $this->url('comment.reply', $comment_reply_parameters, array('fragment' => 'comment-form')));
+        $destination = ['destination' => $this->url('comment.reply', $comment_reply_parameters, ['fragment' => 'comment-form'])];
       }
       else {
-        $destination = array('destination' => $entity->url('canonical', array('fragment' => 'comment-form')));
+        $destination = ['destination' => $entity->url('canonical', ['fragment' => 'comment-form'])];
       }
 
       if ($this->userConfig->get('register') != USER_REGISTER_ADMINISTRATORS_ONLY) {
         // Users can register themselves.
-        return $this->t('<a href=":login">Log in</a> or <a href=":register">register</a> to post comments', array(
-          ':login' => $this->urlGenerator->generateFromRoute('user.login', array(), array('query' => $destination)),
-          ':register' => $this->urlGenerator->generateFromRoute('user.register', array(), array('query' => $destination)),
-        ));
+        return $this->t('<a href=":login">Log in</a> or <a href=":register">register</a> to post comments', [
+          ':login' => $this->urlGenerator->generateFromRoute('user.login', [], ['query' => $destination]),
+          ':register' => $this->urlGenerator->generateFromRoute('user.register', [], ['query' => $destination]),
+        ]);
       }
       else {
         // Only admins can add new users, no public registration.
-        return $this->t('<a href=":login">Log in</a> to post comments', array(
-          ':login' => $this->urlGenerator->generateFromRoute('user.login', array(), array('query' => $destination)),
-        ));
+        return $this->t('<a href=":login">Log in</a> to post comments', [
+          ':login' => $this->urlGenerator->generateFromRoute('user.login', [], ['query' => $destination]),
+        ]);
       }
     }
     return '';
@@ -211,7 +201,7 @@ class CommentManager implements CommentManagerInterface {
       $timestamp = ($timestamp > HISTORY_READ_LIMIT ? $timestamp : HISTORY_READ_LIMIT);
 
       // Use the timestamp to retrieve the number of new comments.
-      $query = $this->queryFactory->get('comment')
+      $query = $this->entityManager->getStorage('comment')->getQuery()
         ->condition('entity_type', $entity->getEntityTypeId())
         ->condition('entity_id', $entity->id())
         ->condition('created', $timestamp, '>')
diff --git a/web/core/modules/comment/src/CommentStatistics.php b/web/core/modules/comment/src/CommentStatistics.php
index 74061ee61..3c6b571c2 100644
--- a/web/core/modules/comment/src/CommentStatistics.php
+++ b/web/core/modules/comment/src/CommentStatistics.php
@@ -65,14 +65,14 @@ class CommentStatistics implements CommentStatisticsInterface {
    * {@inheritdoc}
    */
   public function read($entities, $entity_type, $accurate = TRUE) {
-    $options = $accurate ? array() : array('target' => 'replica');
+    $options = $accurate ? [] : ['target' => 'replica'];
     $stats = $this->database->select('comment_entity_statistics', 'ces', $options)
       ->fields('ces')
       ->condition('ces.entity_id', array_keys($entities), 'IN')
       ->condition('ces.entity_type', $entity_type)
       ->execute();
 
-    $statistics_records = array();
+    $statistics_records = [];
     while ($entry = $stats->fetchObject()) {
       $statistics_records[] = $entry;
     }
@@ -94,7 +94,7 @@ class CommentStatistics implements CommentStatisticsInterface {
    */
   public function create(FieldableEntityInterface $entity, $fields) {
     $query = $this->database->insert('comment_entity_statistics')
-      ->fields(array(
+      ->fields([
         'entity_id',
         'entity_type',
         'field_name',
@@ -103,7 +103,7 @@ class CommentStatistics implements CommentStatisticsInterface {
         'last_comment_name',
         'last_comment_uid',
         'comment_count',
-      ));
+      ]);
     foreach ($fields as $field_name => $detail) {
       // Skip fields that entity does not have.
       if (!$entity->hasField($field_name)) {
@@ -127,7 +127,7 @@ class CommentStatistics implements CommentStatisticsInterface {
       if ($entity instanceof EntityChangedInterface) {
         $last_comment_timestamp = $entity->getChangedTimeAcrossTranslations();
       }
-      $query->values(array(
+      $query->values([
         'entity_id' => $entity->id(),
         'entity_type' => $entity->getEntityTypeId(),
         'field_name' => $field_name,
@@ -136,7 +136,7 @@ class CommentStatistics implements CommentStatisticsInterface {
         'last_comment_name' => NULL,
         'last_comment_uid' => $last_comment_uid,
         'comment_count' => 0,
-      ));
+      ]);
     }
     $query->execute();
   }
@@ -145,24 +145,24 @@ class CommentStatistics implements CommentStatisticsInterface {
    * {@inheritdoc}
    */
   public function getMaximumCount($entity_type) {
-    return $this->database->query('SELECT MAX(comment_count) FROM {comment_entity_statistics} WHERE entity_type = :entity_type', array(':entity_type' => $entity_type))->fetchField();
+    return $this->database->query('SELECT MAX(comment_count) FROM {comment_entity_statistics} WHERE entity_type = :entity_type', [':entity_type' => $entity_type])->fetchField();
   }
 
   /**
    * {@inheritdoc}
    */
   public function getRankingInfo() {
-    return array(
-      'comments' => array(
+    return [
+      'comments' => [
         'title' => t('Number of comments'),
-        'join' => array(
+        'join' => [
           'type' => 'LEFT',
           'table' => 'comment_entity_statistics',
           'alias' => 'ces',
           // Default to comment field as this is the most common use case for
           // nodes.
           'on' => "ces.entity_id = i.sid AND ces.entity_type = 'node' AND ces.field_name = 'comment'",
-        ),
+        ],
         // Inverse law that maps the highest view count on the site to 1 and 0
         // to 0. Note that the ROUND here is necessary for PostgreSQL and SQLite
         // in order to ensure that the :comment_scale argument is treated as
@@ -170,9 +170,9 @@ class CommentStatistics implements CommentStatisticsInterface {
         // values in as strings instead of numbers in complex expressions like
         // this.
         'score' => '2.0 - 2.0 / (1.0 + ces.comment_count * (ROUND(:comment_scale, 4)))',
-        'arguments' => array(':comment_scale' => \Drupal::state()->get('comment.node_comment_statistics_scale') ?: 0),
-      ),
-    );
+        'arguments' => [':comment_scale' => \Drupal::state()->get('comment.node_comment_statistics_scale') ?: 0],
+      ],
+    ];
   }
 
   /**
@@ -198,7 +198,7 @@ class CommentStatistics implements CommentStatisticsInterface {
     if ($count > 0) {
       // Comments exist.
       $last_reply = $this->database->select('comment_field_data', 'c')
-        ->fields('c', array('cid', 'name', 'changed', 'uid'))
+        ->fields('c', ['cid', 'name', 'changed', 'uid'])
         ->condition('c.entity_id', $comment->getCommentedEntityId())
         ->condition('c.entity_type', $comment->getCommentedEntityTypeId())
         ->condition('c.field_name', $comment->getFieldName())
@@ -210,18 +210,18 @@ class CommentStatistics implements CommentStatisticsInterface {
         ->fetchObject();
       // Use merge here because entity could be created before comment field.
       $this->database->merge('comment_entity_statistics')
-        ->fields(array(
+        ->fields([
           'cid' => $last_reply->cid,
           'comment_count' => $count,
           'last_comment_timestamp' => $last_reply->changed,
           'last_comment_name' => $last_reply->uid ? '' : $last_reply->name,
           'last_comment_uid' => $last_reply->uid,
-        ))
-        ->keys(array(
+        ])
+        ->keys([
           'entity_id' => $comment->getCommentedEntityId(),
           'entity_type' => $comment->getCommentedEntityTypeId(),
           'field_name' => $comment->getFieldName(),
-        ))
+        ])
         ->execute();
     }
     else {
@@ -238,7 +238,7 @@ class CommentStatistics implements CommentStatisticsInterface {
         $last_comment_uid = $this->currentUser->id();
       }
       $this->database->update('comment_entity_statistics')
-        ->fields(array(
+        ->fields([
           'cid' => 0,
           'comment_count' => 0,
           // Use the changed date of the entity if it's set, or default to
@@ -246,7 +246,7 @@ class CommentStatistics implements CommentStatisticsInterface {
           'last_comment_timestamp' => ($entity instanceof EntityChangedInterface) ? $entity->getChangedTimeAcrossTranslations() : REQUEST_TIME,
           'last_comment_name' => '',
           'last_comment_uid' => $last_comment_uid,
-        ))
+        ])
         ->condition('entity_id', $comment->getCommentedEntityId())
         ->condition('entity_type', $comment->getCommentedEntityTypeId())
         ->condition('field_name', $comment->getFieldName())
@@ -255,7 +255,7 @@ class CommentStatistics implements CommentStatisticsInterface {
 
     // Reset the cache of the commented entity so that when the entity is loaded
     // the next time, the statistics will be loaded again.
-    $this->entityManager->getStorage($comment->getCommentedEntityTypeId())->resetCache(array($comment->getCommentedEntityId()));
+    $this->entityManager->getStorage($comment->getCommentedEntityTypeId())->resetCache([$comment->getCommentedEntityId()]);
   }
 
 }
diff --git a/web/core/modules/comment/src/CommentStorage.php b/web/core/modules/comment/src/CommentStorage.php
index cc4fdcfc4..d164d8ad9 100644
--- a/web/core/modules/comment/src/CommentStorage.php
+++ b/web/core/modules/comment/src/CommentStorage.php
@@ -147,7 +147,7 @@ class CommentStorage extends SqlContentEntityStorage implements CommentStorageIn
 
       // 1. Find all the threads with a new comment.
       $unread_threads_query = $this->database->select('comment_field_data', 'comment')
-        ->fields('comment', array('thread'))
+        ->fields('comment', ['thread'])
         ->condition('entity_id', $entity->id())
         ->condition('entity_type', $entity->getEntityTypeId())
         ->condition('field_name', $field_name)
@@ -161,7 +161,7 @@ class CommentStorage extends SqlContentEntityStorage implements CommentStorageIn
       $first_thread_query = $this->database->select($unread_threads_query, 'thread');
       $first_thread_query->addExpression('SUBSTRING(thread, 1, (LENGTH(thread) - 1))', 'torder');
       $first_thread = $first_thread_query
-        ->fields('thread', array('thread'))
+        ->fields('thread', ['thread'])
         ->orderBy('torder')
         ->range(0, 1)
         ->execute()
@@ -176,13 +176,13 @@ class CommentStorage extends SqlContentEntityStorage implements CommentStorageIn
                         AND field_name = :field_name
                         AND status = :status
                         AND SUBSTRING(thread, 1, (LENGTH(thread) - 1)) < :thread
-                        AND default_langcode = 1', array(
+                        AND default_langcode = 1', [
         ':status' => CommentInterface::PUBLISHED,
         ':entity_id' => $entity->id(),
         ':field_name' => $field_name,
         ':entity_type' => $entity->getEntityTypeId(),
         ':thread' => $first_thread,
-      ))->fetchField();
+      ])->fetchField();
     }
 
     return $comments_per_page > 0 ? (int) ($count / $comments_per_page) : 0;
@@ -193,7 +193,7 @@ class CommentStorage extends SqlContentEntityStorage implements CommentStorageIn
    */
   public function getChildCids(array $comments) {
     return $this->database->select('comment_field_data', 'c')
-      ->fields('c', array('cid'))
+      ->fields('c', ['cid'])
       ->condition('pid', array_keys($comments), 'IN')
       ->condition('default_langcode', 1)
       ->execute()
@@ -312,7 +312,7 @@ class CommentStorage extends SqlContentEntityStorage implements CommentStorageIn
 
     $cids = $query->execute()->fetchCol();
 
-    $comments = array();
+    $comments = [];
     if ($cids) {
       $comments = $this->loadMultiple($cids);
     }
diff --git a/web/core/modules/comment/src/CommentStorageSchema.php b/web/core/modules/comment/src/CommentStorageSchema.php
index ee663c0d0..2106a8ec2 100644
--- a/web/core/modules/comment/src/CommentStorageSchema.php
+++ b/web/core/modules/comment/src/CommentStorageSchema.php
@@ -17,9 +17,9 @@ class CommentStorageSchema extends SqlContentEntityStorageSchema {
   protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $reset = FALSE) {
     $schema = parent::getEntitySchema($entity_type, $reset);
 
-    $schema['comment_field_data']['indexes'] += array(
-      'comment__status_pid' => array('pid', 'status'),
-      'comment__num_new' => array(
+    $schema['comment_field_data']['indexes'] += [
+      'comment__status_pid' => ['pid', 'status'],
+      'comment__num_new' => [
         'entity_id',
         'entity_type',
         'comment_type',
@@ -27,14 +27,14 @@ class CommentStorageSchema extends SqlContentEntityStorageSchema {
         'created',
         'cid',
         'thread',
-      ),
-      'comment__entity_langcode' => array(
+      ],
+      'comment__entity_langcode' => [
         'entity_id',
         'entity_type',
         'comment_type',
         'default_langcode',
-      ),
-    );
+      ],
+    ];
 
     return $schema;
   }
diff --git a/web/core/modules/comment/src/CommentTranslationHandler.php b/web/core/modules/comment/src/CommentTranslationHandler.php
index 98afe3bdb..a0abe4b71 100644
--- a/web/core/modules/comment/src/CommentTranslationHandler.php
+++ b/web/core/modules/comment/src/CommentTranslationHandler.php
@@ -30,7 +30,7 @@ class CommentTranslationHandler extends ContentTranslationHandler {
    * {@inheritdoc}
    */
   protected function entityFormTitle(EntityInterface $entity) {
-    return t('Edit comment @subject', array('@subject' => $entity->label()));
+    return t('Edit comment @subject', ['@subject' => $entity->label()]);
   }
 
   /**
diff --git a/web/core/modules/comment/src/CommentTypeForm.php b/web/core/modules/comment/src/CommentTypeForm.php
index 594726ae6..9cb147f7f 100644
--- a/web/core/modules/comment/src/CommentTypeForm.php
+++ b/web/core/modules/comment/src/CommentTypeForm.php
@@ -71,32 +71,32 @@ class CommentTypeForm extends EntityForm {
 
     $comment_type = $this->entity;
 
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => t('Label'),
       '#maxlength' => 255,
       '#default_value' => $comment_type->label(),
       '#required' => TRUE,
-    );
-    $form['id'] = array(
+    ];
+    $form['id'] = [
       '#type' => 'machine_name',
       '#default_value' => $comment_type->id(),
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => '\Drupal\comment\Entity\CommentType::load',
-      ),
+      ],
       '#maxlength' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
       '#disabled' => !$comment_type->isNew(),
-    );
+    ];
 
-    $form['description'] = array(
+    $form['description'] = [
       '#type' => 'textarea',
       '#default_value' => $comment_type->getDescription(),
       '#description' => t('Describe this comment type. The text will be displayed on the <em>Comment types</em> administration overview page.'),
       '#title' => t('Description'),
-    );
+    ];
 
     if ($comment_type->isNew()) {
-      $options = array();
+      $options = [];
       foreach ($this->entityManager->getDefinitions() as $entity_type) {
         // Only expose entities that have field UI enabled, only those can
         // get comment fields added in the UI.
@@ -104,47 +104,47 @@ class CommentTypeForm extends EntityForm {
           $options[$entity_type->id()] = $entity_type->getLabel();
         }
       }
-      $form['target_entity_type_id'] = array(
+      $form['target_entity_type_id'] = [
         '#type' => 'select',
         '#default_value' => $comment_type->getTargetEntityTypeId(),
         '#title' => t('Target entity type'),
         '#options' => $options,
         '#description' => t('The target entity type can not be changed after the comment type has been created.')
-      );
+      ];
     }
     else {
-      $form['target_entity_type_id_display'] = array(
+      $form['target_entity_type_id_display'] = [
         '#type' => 'item',
         '#markup' => $this->entityManager->getDefinition($comment_type->getTargetEntityTypeId())->getLabel(),
         '#title' => t('Target entity type'),
-      );
+      ];
     }
 
     if ($this->moduleHandler->moduleExists('content_translation')) {
-      $form['language'] = array(
+      $form['language'] = [
         '#type' => 'details',
         '#title' => t('Language settings'),
         '#group' => 'additional_settings',
-      );
+      ];
 
       $language_configuration = ContentLanguageSettings::loadByEntityTypeBundle('comment', $comment_type->id());
-      $form['language']['language_configuration'] = array(
+      $form['language']['language_configuration'] = [
         '#type' => 'language_configuration',
-        '#entity_information' => array(
+        '#entity_information' => [
           'entity_type' => 'comment',
           'bundle' => $comment_type->id(),
-        ),
+        ],
         '#default_value' => $language_configuration,
-      );
+      ];
 
       $form['#submit'][] = 'language_configuration_element_submit';
     }
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => t('Save'),
-    );
+    ];
 
     return $form;
   }
@@ -158,13 +158,13 @@ class CommentTypeForm extends EntityForm {
 
     $edit_link = $this->entity->link($this->t('Edit'));
     if ($status == SAVED_UPDATED) {
-      drupal_set_message(t('Comment type %label has been updated.', array('%label' => $comment_type->label())));
-      $this->logger->notice('Comment type %label has been updated.', array('%label' => $comment_type->label(), 'link' => $edit_link));
+      drupal_set_message(t('Comment type %label has been updated.', ['%label' => $comment_type->label()]));
+      $this->logger->notice('Comment type %label has been updated.', ['%label' => $comment_type->label(), 'link' => $edit_link]);
     }
     else {
       $this->commentManager->addBodyField($comment_type->id());
-      drupal_set_message(t('Comment type %label has been added.', array('%label' => $comment_type->label())));
-      $this->logger->notice('Comment type %label has been added.', array('%label' => $comment_type->label(), 'link' => $edit_link));
+      drupal_set_message(t('Comment type %label has been added.', ['%label' => $comment_type->label()]));
+      $this->logger->notice('Comment type %label has been added.', ['%label' => $comment_type->label(), 'link' => $edit_link]);
     }
 
     $form_state->setRedirectUrl($comment_type->urlInfo('collection'));
diff --git a/web/core/modules/comment/src/CommentViewBuilder.php b/web/core/modules/comment/src/CommentViewBuilder.php
index 5771ed506..ec6d49a5b 100644
--- a/web/core/modules/comment/src/CommentViewBuilder.php
+++ b/web/core/modules/comment/src/CommentViewBuilder.php
@@ -88,7 +88,7 @@ class CommentViewBuilder extends EntityViewBuilder {
     }
 
     // Pre-load associated users into cache to leverage multiple loading.
-    $uids = array();
+    $uids = [];
     foreach ($entities as $entity) {
       $uids[] = $entity->getOwnerId();
     }
@@ -125,7 +125,7 @@ class CommentViewBuilder extends EntityViewBuilder {
 
       $display = $displays[$entity->bundle()];
       if ($display->getComponent('links')) {
-        $build[$id]['links'] = array(
+        $build[$id]['links'] = [
           '#lazy_builder' => ['comment.lazy_builders:renderLinks', [
             $entity->id(),
             $view_mode,
@@ -133,11 +133,11 @@ class CommentViewBuilder extends EntityViewBuilder {
             !empty($entity->in_preview),
           ]],
           '#create_placeholder' => TRUE,
-        );
+        ];
       }
 
       if (!isset($build[$id]['#attached'])) {
-        $build[$id]['#attached'] = array();
+        $build[$id]['#attached'] = [];
       }
       $build[$id]['#attached']['library'][] = 'comment/drupal.comment-by-viewer';
       if ($this->moduleHandler->moduleExists('history') && $this->currentUser->isAuthenticated()) {
diff --git a/web/core/modules/comment/src/CommentViewsData.php b/web/core/modules/comment/src/CommentViewsData.php
index 2d9b021ac..52af015d5 100644
--- a/web/core/modules/comment/src/CommentViewsData.php
+++ b/web/core/modules/comment/src/CommentViewsData.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\comment;
 
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\views\EntityViewsData;
 
 /**
@@ -35,148 +36,148 @@ class CommentViewsData extends EntityViewsData {
     $data['comment_field_data']['created']['title'] = $this->t('Post date');
     $data['comment_field_data']['created']['help'] = $this->t('Date and time of when the comment was created.');
 
-    $data['comment_field_data']['created_fulldata'] = array(
+    $data['comment_field_data']['created_fulldata'] = [
       'title' => $this->t('Created date'),
       'help' => $this->t('Date in the form of CCYYMMDD.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_fulldate',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['created_year_month'] = array(
+    $data['comment_field_data']['created_year_month'] = [
       'title' => $this->t('Created year + month'),
       'help' => $this->t('Date in the form of YYYYMM.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_year_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['created_year'] = array(
+    $data['comment_field_data']['created_year'] = [
       'title' => $this->t('Created year'),
       'help' => $this->t('Date in the form of YYYY.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_year',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['created_month'] = array(
+    $data['comment_field_data']['created_month'] = [
       'title' => $this->t('Created month'),
       'help' => $this->t('Date in the form of MM (01 - 12).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['created_day'] = array(
+    $data['comment_field_data']['created_day'] = [
       'title' => $this->t('Created day'),
       'help' => $this->t('Date in the form of DD (01 - 31).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_day',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['created_week'] = array(
+    $data['comment_field_data']['created_week'] = [
       'title' => $this->t('Created week'),
       'help' => $this->t('Date in the form of WW (01 - 53).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_week',
-      ),
-    );
+      ],
+    ];
 
     $data['comment_field_data']['changed']['title'] = $this->t('Updated date');
     $data['comment_field_data']['changed']['help'] = $this->t('Date and time of when the comment was last updated.');
 
-    $data['comment_field_data']['changed_fulldata'] = array(
+    $data['comment_field_data']['changed_fulldata'] = [
       'title' => $this->t('Changed date'),
       'help' => $this->t('Date in the form of CCYYMMDD.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_fulldate',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['changed_year_month'] = array(
+    $data['comment_field_data']['changed_year_month'] = [
       'title' => $this->t('Changed year + month'),
       'help' => $this->t('Date in the form of YYYYMM.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_year_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['changed_year'] = array(
+    $data['comment_field_data']['changed_year'] = [
       'title' => $this->t('Changed year'),
       'help' => $this->t('Date in the form of YYYY.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_year',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['changed_month'] = array(
+    $data['comment_field_data']['changed_month'] = [
       'title' => $this->t('Changed month'),
       'help' => $this->t('Date in the form of MM (01 - 12).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['changed_day'] = array(
+    $data['comment_field_data']['changed_day'] = [
       'title' => $this->t('Changed day'),
       'help' => $this->t('Date in the form of DD (01 - 31).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_day',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['changed_week'] = array(
+    $data['comment_field_data']['changed_week'] = [
       'title' => $this->t('Changed week'),
       'help' => $this->t('Date in the form of WW (01 - 53).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_week',
-      ),
-    );
+      ],
+    ];
 
     $data['comment_field_data']['status']['title'] = $this->t('Approved status');
     $data['comment_field_data']['status']['help'] = $this->t('Whether the comment is approved (or still in the moderation queue).');
     $data['comment_field_data']['status']['filter']['label'] = $this->t('Approved comment status');
     $data['comment_field_data']['status']['filter']['type'] = 'yes-no';
 
-    $data['comment']['approve_comment'] = array(
-      'field' => array(
+    $data['comment']['approve_comment'] = [
+      'field' => [
         'title' => $this->t('Link to approve comment'),
         'help' => $this->t('Provide a simple link to approve the comment.'),
         'id' => 'comment_link_approve',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment']['replyto_comment'] = array(
-      'field' => array(
+    $data['comment']['replyto_comment'] = [
+      'field' => [
         'title' => $this->t('Link to reply-to comment'),
         'help' => $this->t('Provide a simple link to reply to the comment.'),
         'id' => 'comment_link_reply',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_field_data']['thread']['field'] = array(
+    $data['comment_field_data']['thread']['field'] = [
       'title' => $this->t('Depth'),
       'help' => $this->t('Display the depth of the comment if it is threaded.'),
       'id' => 'comment_depth',
-    );
-    $data['comment_field_data']['thread']['sort'] = array(
+    ];
+    $data['comment_field_data']['thread']['sort'] = [
       'title' => $this->t('Thread'),
       'help' => $this->t('Sort by the threaded order. This will keep child comments together with their parents.'),
       'id' => 'comment_thread',
-    );
+    ];
     unset($data['comment_field_data']['thread']['filter']);
     unset($data['comment_field_data']['thread']['argument']);
 
@@ -184,28 +185,28 @@ class CommentViewsData extends EntityViewsData {
 
     // Provide a relationship for each entity type except comment.
     foreach ($entities_types as $type => $entity_type) {
-      if ($type == 'comment' || !$entity_type->isSubclassOf('\Drupal\Core\Entity\ContentEntityInterface') || !$entity_type->getBaseTable()) {
+      if ($type == 'comment' || !$entity_type->entityClassImplements(ContentEntityInterface::class) || !$entity_type->getBaseTable()) {
         continue;
       }
       if ($fields = \Drupal::service('comment.manager')->getFields($type)) {
-        $data['comment_field_data'][$type] = array(
-          'relationship' => array(
+        $data['comment_field_data'][$type] = [
+          'relationship' => [
             'title' => $entity_type->getLabel(),
-            'help' => $this->t('The @entity_type to which the comment is a reply to.', array('@entity_type' => $entity_type->getLabel())),
+            'help' => $this->t('The @entity_type to which the comment is a reply to.', ['@entity_type' => $entity_type->getLabel()]),
             'base' => $entity_type->getDataTable() ?: $entity_type->getBaseTable(),
             'base field' => $entity_type->getKey('id'),
             'relationship field' => 'entity_id',
             'id' => 'standard',
             'label' => $entity_type->getLabel(),
-            'extra' => array(
-              array(
+            'extra' => [
+              [
                 'field' => 'entity_type',
                 'value' => $type,
                 'table' => 'comment_field_data'
-              ),
-            ),
-          ),
-        );
+              ],
+            ],
+          ],
+        ];
       }
     }
 
@@ -226,7 +227,7 @@ class CommentViewsData extends EntityViewsData {
 
     // Provide a relationship for each entity type except comment.
     foreach ($entities_types as $type => $entity_type) {
-      if ($type == 'comment' || !$entity_type->isSubclassOf('\Drupal\Core\Entity\ContentEntityInterface') || !$entity_type->getBaseTable()) {
+      if ($type == 'comment' || !$entity_type->entityClassImplements(ContentEntityInterface::class) || !$entity_type->getBaseTable()) {
         continue;
       }
       // This relationship does not use the 'field id' column, if the entity has
@@ -236,84 +237,84 @@ class CommentViewsData extends EntityViewsData {
       // {comment_entity_statistics} for each field as multiple joins between
       // the same two tables is not supported.
       if (\Drupal::service('comment.manager')->getFields($type)) {
-        $data['comment_entity_statistics']['table']['join'][$entity_type->getDataTable() ?: $entity_type->getBaseTable()] = array(
+        $data['comment_entity_statistics']['table']['join'][$entity_type->getDataTable() ?: $entity_type->getBaseTable()] = [
           'type' => 'INNER',
           'left_field' => $entity_type->getKey('id'),
           'field' => 'entity_id',
-          'extra' => array(
-            array(
+          'extra' => [
+            [
               'field' => 'entity_type',
               'value' => $type,
-            ),
-          ),
-        );
+            ],
+          ],
+        ];
       }
     }
 
-    $data['comment_entity_statistics']['last_comment_timestamp'] = array(
+    $data['comment_entity_statistics']['last_comment_timestamp'] = [
       'title' => $this->t('Last comment time'),
       'help' => $this->t('Date and time of when the last comment was posted.'),
-      'field' => array(
+      'field' => [
         'id' => 'comment_last_timestamp',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'date',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'date',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_entity_statistics']['last_comment_name'] = array(
+    $data['comment_entity_statistics']['last_comment_name'] = [
       'title' => $this->t("Last comment author"),
       'help' => $this->t('The name of the author of the last posted comment.'),
-      'field' => array(
+      'field' => [
         'id' => 'comment_ces_last_comment_name',
         'no group by' => TRUE,
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'comment_ces_last_comment_name',
         'no group by' => TRUE,
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_entity_statistics']['comment_count'] = array(
+    $data['comment_entity_statistics']['comment_count'] = [
       'title' => $this->t('Comment count'),
       'help' => $this->t('The number of comments an entity has.'),
-      'field' => array(
+      'field' => [
         'id' => 'numeric',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'numeric',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'standard',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_entity_statistics']['last_updated'] = array(
+    $data['comment_entity_statistics']['last_updated'] = [
       'title' => $this->t('Updated/commented date'),
       'help' => $this->t('The most recent of last comment posted or entity updated time.'),
-      'field' => array(
+      'field' => [
         'id' => 'comment_ces_last_updated',
         'no group by' => TRUE,
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'comment_ces_last_updated',
         'no group by' => TRUE,
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'comment_ces_last_updated',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_entity_statistics']['cid'] = array(
+    $data['comment_entity_statistics']['cid'] = [
       'title' => $this->t('Last comment CID'),
       'help' => $this->t('Display the last comment of an entity'),
-      'relationship' => array(
+      'relationship' => [
         'title' => $this->t('Last comment'),
         'help' => $this->t('The last comment of an entity.'),
         'group' => $this->t('Comment'),
@@ -321,62 +322,62 @@ class CommentViewsData extends EntityViewsData {
         'base field' => 'cid',
         'id' => 'standard',
         'label' => $this->t('Last Comment'),
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_entity_statistics']['last_comment_uid'] = array(
+    $data['comment_entity_statistics']['last_comment_uid'] = [
       'title' => $this->t('Last comment uid'),
       'help' => $this->t('The User ID of the author of the last comment of an entity.'),
-      'relationship' => array(
+      'relationship' => [
         'title' => $this->t('Last comment author'),
         'base' => 'users',
         'base field' => 'uid',
         'id' => 'standard',
         'label' => $this->t('Last comment author'),
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'numeric',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'numeric',
-      ),
-      'field' => array(
+      ],
+      'field' => [
         'id' => 'numeric',
-      ),
-    );
+      ],
+    ];
 
-    $data['comment_entity_statistics']['entity_type'] = array(
+    $data['comment_entity_statistics']['entity_type'] = [
       'title' => $this->t('Entity type'),
       'help' => $this->t('The entity type to which the comment is a reply to.'),
-      'field' => array(
+      'field' => [
         'id' => 'standard',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'string',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'string',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
-    $data['comment_entity_statistics']['field_name'] = array(
+      ],
+    ];
+    $data['comment_entity_statistics']['field_name'] = [
       'title' => $this->t('Comment field name'),
       'help' => $this->t('The field name from which the comment originated.'),
-      'field' => array(
+      'field' => [
         'id' => 'standard',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'string',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'string',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
+      ],
+    ];
 
     return $data;
   }
diff --git a/web/core/modules/comment/src/Controller/CommentController.php b/web/core/modules/comment/src/Controller/CommentController.php
index 5f1b504b6..c834fa67a 100644
--- a/web/core/modules/comment/src/Controller/CommentController.php
+++ b/web/core/modules/comment/src/Controller/CommentController.php
@@ -125,7 +125,7 @@ class CommentController extends ControllerBase {
       $page = $this->entityManager()->getStorage('comment')->getDisplayOrdinal($comment, $field_definition->getSetting('default_mode'), $field_definition->getSetting('per_page'));
       // @todo: Cleaner sub request handling.
       $subrequest_url = $entity->urlInfo()->setOption('query', ['page' => $page])->toString(TRUE);
-      $redirect_request = Request::create($subrequest_url->getGeneratedUrl(), 'GET', $request->query->all(), $request->cookies->all(), array(), $request->server->all());
+      $redirect_request = Request::create($subrequest_url->getGeneratedUrl(), 'GET', $request->query->all(), $request->cookies->all(), [], $request->server->all());
       // Carry over the session to the subrequest.
       if ($session = $request->getSession()) {
         $redirect_request->setSession($session);
@@ -174,11 +174,11 @@ class CommentController extends ControllerBase {
     // Legacy nodes only had a single comment field, so use the first comment
     // field on the entity.
     if (!empty($fields) && ($field_names = array_keys($fields)) && ($field_name = reset($field_names))) {
-      return $this->redirect('comment.reply', array(
+      return $this->redirect('comment.reply', [
         'entity_type' => 'node',
         'entity' => $node->id(),
         'field_name' => $field_name,
-      ));
+      ]);
     }
     throw new NotFoundHttpException();
   }
@@ -211,7 +211,7 @@ class CommentController extends ControllerBase {
    */
   public function getReplyForm(Request $request, EntityInterface $entity, $field_name, $pid = NULL) {
     $account = $this->currentUser();
-    $build = array();
+    $build = [];
 
     // The user is not just previewing a comment.
     if ($request->request->get('op') != $this->t('Preview')) {
@@ -240,12 +240,12 @@ class CommentController extends ControllerBase {
     }
 
     // Show the actual reply box.
-    $comment = $this->entityManager()->getStorage('comment')->create(array(
+    $comment = $this->entityManager()->getStorage('comment')->create([
       'entity_id' => $entity->id(),
       'pid' => $pid,
       'entity_type' => $entity->getEntityTypeId(),
       'field_name' => $field_name,
-    ));
+    ]);
     $build['comment_form'] = $this->entityFormBuilder()->getForm($comment);
 
     return $build;
@@ -324,17 +324,17 @@ class CommentController extends ControllerBase {
     // Only handle up to 100 nodes.
     $nids = array_slice($nids, 0, 100);
 
-    $links = array();
+    $links = [];
     foreach ($nids as $nid) {
       $node = $this->entityManager->getStorage('node')->load($nid);
       $new = $this->commentManager->getCountNewComments($node);
       $page_number = $this->entityManager()->getStorage('comment')
         ->getNewCommentPageNumber($node->{$field_name}->comment_count, $new, $node, $field_name);
-      $query = $page_number ? array('page' => $page_number) : NULL;
-      $links[$nid] = array(
+      $query = $page_number ? ['page' => $page_number] : NULL;
+      $links[$nid] = [
         'new_comment_count' => (int) $new,
-        'first_new_comment_link' => $this->getUrlGenerator()->generateFromRoute('entity.node.canonical', array('node' => $node->id()), array('query' => $query, 'fragment' => 'new')),
-      );
+        'first_new_comment_link' => $this->getUrlGenerator()->generateFromRoute('entity.node.canonical', ['node' => $node->id()], ['query' => $query, 'fragment' => 'new']),
+      ];
     }
 
     return new JsonResponse($links);
diff --git a/web/core/modules/comment/src/Entity/Comment.php b/web/core/modules/comment/src/Entity/Comment.php
index d626be304..a5f196646 100644
--- a/web/core/modules/comment/src/Entity/Comment.php
+++ b/web/core/modules/comment/src/Entity/Comment.php
@@ -7,6 +7,7 @@ use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\ContentEntityBase;
 use Drupal\comment\CommentInterface;
 use Drupal\Core\Entity\EntityChangedTrait;
+use Drupal\Core\Entity\EntityPublishedTrait;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -20,6 +21,12 @@ use Drupal\user\UserInterface;
  * @ContentEntityType(
  *   id = "comment",
  *   label = @Translation("Comment"),
+ *   label_singular = @Translation("comment"),
+ *   label_plural = @Translation("comments"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count comment",
+ *     plural = "@count comments",
+ *   ),
  *   bundle_label = @Translation("Comment type"),
  *   handlers = {
  *     "storage" = "Drupal\comment\CommentStorage",
@@ -43,7 +50,8 @@ use Drupal\user\UserInterface;
  *     "bundle" = "comment_type",
  *     "label" = "subject",
  *     "langcode" = "langcode",
- *     "uuid" = "uuid"
+ *     "uuid" = "uuid",
+ *     "published" = "status",
  *   },
  *   links = {
  *     "canonical" = "/comment/{comment}",
@@ -60,6 +68,7 @@ use Drupal\user\UserInterface;
 class Comment extends ContentEntityBase implements CommentInterface {
 
   use EntityChangedTrait;
+  use EntityPublishedTrait;
 
   /**
    * The thread for which a lock was acquired.
@@ -73,8 +82,12 @@ class Comment extends ContentEntityBase implements CommentInterface {
     parent::preSave($storage);
 
     if (is_null($this->get('status')->value)) {
-      $published = \Drupal::currentUser()->hasPermission('skip comment approval') ? CommentInterface::PUBLISHED : CommentInterface::NOT_PUBLISHED;
-      $this->setPublished($published);
+      if (\Drupal::currentUser()->hasPermission('skip comment approval')) {
+        $this->setPublished();
+      }
+      else {
+        $this->setUnpublished();
+      }
     }
     if ($this->isNew()) {
       // Add the comment to database. This next section builds the thread field.
@@ -138,9 +151,11 @@ class Comment extends ContentEntityBase implements CommentInterface {
       if ($this->getOwnerId() === \Drupal::currentUser()->id() && \Drupal::currentUser()->isAuthenticated()) {
         $this->setAuthorName(\Drupal::currentUser()->getUsername());
       }
-      // Add the values which aren't passed into the function.
       $this->setThread($thread);
-      $this->setHostname(\Drupal::request()->getClientIP());
+      if (!$this->getHostname()) {
+        // Ensure a client host from the current request.
+        $this->setHostname(\Drupal::request()->getClientIP());
+      }
     }
   }
 
@@ -210,6 +225,7 @@ class Comment extends ContentEntityBase implements CommentInterface {
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     /** @var \Drupal\Core\Field\BaseFieldDefinition[] $fields */
     $fields = parent::baseFieldDefinitions($entity_type);
+    $fields += static::publishedBaseFieldDefinitions($entity_type);
 
     $fields['cid']->setLabel(t('Comment ID'))
       ->setDescription(t('The comment ID.'));
@@ -235,11 +251,11 @@ class Comment extends ContentEntityBase implements CommentInterface {
       ->setLabel(t('Subject'))
       ->setTranslatable(TRUE)
       ->setSetting('max_length', 64)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         // Default comment body field has weight 20.
         'weight' => 10,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['uid'] = BaseFieldDefinition::create('entity_reference')
@@ -285,12 +301,6 @@ class Comment extends ContentEntityBase implements CommentInterface {
       ->setDescription(t('The time that the comment was last edited.'))
       ->setTranslatable(TRUE);
 
-    $fields['status'] = BaseFieldDefinition::create('boolean')
-      ->setLabel(t('Publishing status'))
-      ->setDescription(t('A boolean indicating whether the comment is published.'))
-      ->setTranslatable(TRUE)
-      ->setDefaultValue(TRUE);
-
     $fields['thread'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Thread place'))
       ->setDescription(t("The alphadecimal representation of the comment's place in a thread, consisting of a base 36 string prefixed by an integer indicating its length."))
@@ -320,7 +330,7 @@ class Comment extends ContentEntityBase implements CommentInterface {
       $fields['entity_id']->setSetting('target_type', $comment_type->getTargetEntityTypeId());
       return $fields;
     }
-    return array();
+    return [];
   }
 
   /**
@@ -467,13 +477,6 @@ class Comment extends ContentEntityBase implements CommentInterface {
     return $this;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function isPublished() {
-    return $this->get('status')->value == CommentInterface::PUBLISHED;
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -481,14 +484,6 @@ class Comment extends ContentEntityBase implements CommentInterface {
     return $this->get('status')->value;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function setPublished($status) {
-    $this->set('status', $status ? CommentInterface::PUBLISHED : CommentInterface::NOT_PUBLISHED);
-    return $this;
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/comment/src/Entity/CommentType.php b/web/core/modules/comment/src/Entity/CommentType.php
index b31dc63de..a773c5833 100644
--- a/web/core/modules/comment/src/Entity/CommentType.php
+++ b/web/core/modules/comment/src/Entity/CommentType.php
@@ -11,6 +11,12 @@ use Drupal\comment\CommentTypeInterface;
  * @ConfigEntityType(
  *   id = "comment_type",
  *   label = @Translation("Comment type"),
+ *   label_singular = @Translation("comment type"),
+ *   label_plural = @Translation("comment types"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count comment type",
+ *     plural = "@count comment types",
+ *   ),
  *   handlers = {
  *     "form" = {
  *       "default" = "Drupal\comment\CommentTypeForm",
diff --git a/web/core/modules/comment/src/Form/CommentAdminOverview.php b/web/core/modules/comment/src/Form/CommentAdminOverview.php
index 3966fca1b..24f8b0aa2 100644
--- a/web/core/modules/comment/src/Form/CommentAdminOverview.php
+++ b/web/core/modules/comment/src/Form/CommentAdminOverview.php
@@ -99,12 +99,12 @@ class CommentAdminOverview extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state, $type = 'new') {
 
     // Build an 'Update options' form.
-    $form['options'] = array(
+    $form['options'] = [
       '#type' => 'details',
       '#title' => $this->t('Update options'),
       '#open' => TRUE,
-      '#attributes' => array('class' => array('container-inline')),
-    );
+      '#attributes' => ['class' => ['container-inline']],
+    ];
 
     if ($type == 'approval') {
       $options['publish'] = $this->t('Publish the selected comments');
@@ -114,42 +114,42 @@ class CommentAdminOverview extends FormBase {
     }
     $options['delete'] = $this->t('Delete the selected comments');
 
-    $form['options']['operation'] = array(
+    $form['options']['operation'] = [
       '#type' => 'select',
       '#title' => $this->t('Action'),
       '#title_display' => 'invisible',
       '#options' => $options,
       '#default_value' => 'publish',
-    );
-    $form['options']['submit'] = array(
+    ];
+    $form['options']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Update'),
-    );
+    ];
 
     // Load the comments that need to be displayed.
     $status = ($type == 'approval') ? CommentInterface::NOT_PUBLISHED : CommentInterface::PUBLISHED;
-    $header = array(
-      'subject' => array(
+    $header = [
+      'subject' => [
         'data' => $this->t('Subject'),
         'specifier' => 'subject',
-      ),
-      'author' => array(
+      ],
+      'author' => [
         'data' => $this->t('Author'),
         'specifier' => 'name',
-        'class' => array(RESPONSIVE_PRIORITY_MEDIUM),
-      ),
-      'posted_in' => array(
+        'class' => [RESPONSIVE_PRIORITY_MEDIUM],
+      ],
+      'posted_in' => [
         'data' => $this->t('Posted in'),
-        'class' => array(RESPONSIVE_PRIORITY_LOW),
-      ),
-      'changed' => array(
+        'class' => [RESPONSIVE_PRIORITY_LOW],
+      ],
+      'changed' => [
         'data' => $this->t('Updated'),
         'specifier' => 'changed',
         'sort' => 'desc',
-        'class' => array(RESPONSIVE_PRIORITY_LOW),
-      ),
+        'class' => [RESPONSIVE_PRIORITY_LOW],
+      ],
       'operations' => $this->t('Operations'),
-    );
+    ];
     $cids = $this->commentStorage->getQuery()
       ->condition('status', $status)
       ->tableSort($header)
@@ -160,11 +160,11 @@ class CommentAdminOverview extends FormBase {
     $comments = $this->commentStorage->loadMultiple($cids);
 
     // Build a table listing the appropriate comments.
-    $options = array();
+    $options = [];
     $destination = $this->getDestinationArray();
 
-    $commented_entity_ids = array();
-    $commented_entities = array();
+    $commented_entity_ids = [];
+    $commented_entities = [];
 
     foreach ($comments as $comment) {
       $commented_entity_ids[$comment->getCommentedEntityTypeId()][] = $comment->getCommentedEntityId();
@@ -179,61 +179,61 @@ class CommentAdminOverview extends FormBase {
       $commented_entity = $commented_entities[$comment->getCommentedEntityTypeId()][$comment->getCommentedEntityId()];
       $comment_permalink = $comment->permalink();
       if ($comment->hasField('comment_body') && ($body = $comment->get('comment_body')->value)) {
-        $attributes = $comment_permalink->getOption('attributes') ?: array();
-        $attributes += array('title' => Unicode::truncate($body, 128));
+        $attributes = $comment_permalink->getOption('attributes') ?: [];
+        $attributes += ['title' => Unicode::truncate($body, 128)];
         $comment_permalink->setOption('attributes', $attributes);
       }
-      $options[$comment->id()] = array(
-        'title' => array('data' => array('#title' => $comment->getSubject() ?: $comment->id())),
-        'subject' => array(
-          'data' => array(
+      $options[$comment->id()] = [
+        'title' => ['data' => ['#title' => $comment->getSubject() ?: $comment->id()]],
+        'subject' => [
+          'data' => [
             '#type' => 'link',
             '#title' => $comment->getSubject(),
             '#url' => $comment_permalink,
-          ),
-        ),
-        'author' => array(
-          'data' => array(
+          ],
+        ],
+        'author' => [
+          'data' => [
             '#theme' => 'username',
             '#account' => $comment->getOwner(),
-          ),
-        ),
-        'posted_in' => array(
-          'data' => array(
+          ],
+        ],
+        'posted_in' => [
+          'data' => [
             '#type' => 'link',
             '#title' => $commented_entity->label(),
             '#access' => $commented_entity->access('view'),
             '#url' => $commented_entity->urlInfo(),
-          ),
-        ),
+          ],
+        ],
         'changed' => $this->dateFormatter->format($comment->getChangedTimeAcrossTranslations(), 'short'),
-      );
+      ];
       $comment_uri_options = $comment->urlInfo()->getOptions() + ['query' => $destination];
-      $links = array();
-      $links['edit'] = array(
+      $links = [];
+      $links['edit'] = [
         'title' => $this->t('Edit'),
         'url' => $comment->urlInfo('edit-form', $comment_uri_options),
-      );
-      if ($this->moduleHandler->moduleExists('content_translation') && $this->moduleHandler->invoke('content_translation', 'translate_access', array($comment))->isAllowed()) {
-        $links['translate'] = array(
+      ];
+      if ($this->moduleHandler->moduleExists('content_translation') && $this->moduleHandler->invoke('content_translation', 'translate_access', [$comment])->isAllowed()) {
+        $links['translate'] = [
           'title' => $this->t('Translate'),
           'url' => $comment->urlInfo('drupal:content-translation-overview', $comment_uri_options),
-        );
+        ];
       }
-      $options[$comment->id()]['operations']['data'] = array(
+      $options[$comment->id()]['operations']['data'] = [
         '#type' => 'operations',
         '#links' => $links,
-      );
+      ];
     }
 
-    $form['comments'] = array(
+    $form['comments'] = [
       '#type' => 'tableselect',
       '#header' => $header,
       '#options' => $options,
       '#empty' => $this->t('No comments available.'),
-    );
+    ];
 
-    $form['pager'] = array('#type' => 'pager');
+    $form['pager'] = ['#type' => 'pager'];
 
     return $form;
   }
@@ -242,7 +242,7 @@ class CommentAdminOverview extends FormBase {
    * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setValue('comments', array_diff($form_state->getValue('comments'), array(0)));
+    $form_state->setValue('comments', array_diff($form_state->getValue('comments'), [0]));
     // We can't execute any 'Update options' if no comments were selected.
     if (count($form_state->getValue('comments')) == 0) {
       $form_state->setErrorByName('', $this->t('Select one or more comments to perform the update on.'));
diff --git a/web/core/modules/comment/src/Form/CommentTypeDeleteForm.php b/web/core/modules/comment/src/Form/CommentTypeDeleteForm.php
index daadc9293..30181c1d9 100644
--- a/web/core/modules/comment/src/Form/CommentTypeDeleteForm.php
+++ b/web/core/modules/comment/src/Form/CommentTypeDeleteForm.php
@@ -5,7 +5,6 @@ namespace Drupal\comment\Form;
 use Drupal\comment\CommentManagerInterface;
 use Drupal\Core\Entity\EntityDeleteForm;
 use Drupal\Core\Entity\EntityManager;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\field\Entity\FieldStorageConfig;
 use Psr\Log\LoggerInterface;
@@ -16,13 +15,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class CommentTypeDeleteForm extends EntityDeleteForm {
 
-  /**
-   * The query factory to create entity queries.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  public $queryFactory;
-
   /**
    * The comment manager service.
    *
@@ -54,8 +46,6 @@ class CommentTypeDeleteForm extends EntityDeleteForm {
   /**
    * Constructs a query factory object.
    *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query object.
    * @param \Drupal\comment\CommentManagerInterface $comment_manager
    *   The comment manager service.
    * @param \Drupal\Core\Entity\EntityManager $entity_manager
@@ -63,8 +53,7 @@ class CommentTypeDeleteForm extends EntityDeleteForm {
    * @param \Psr\Log\LoggerInterface $logger
    *   A logger instance.
    */
-  public function __construct(QueryFactory $query_factory, CommentManagerInterface $comment_manager, EntityManager $entity_manager, LoggerInterface $logger) {
-    $this->queryFactory = $query_factory;
+  public function __construct(CommentManagerInterface $comment_manager, EntityManager $entity_manager, LoggerInterface $logger) {
     $this->commentManager = $comment_manager;
     $this->entityManager = $entity_manager;
     $this->logger = $logger;
@@ -75,7 +64,6 @@ class CommentTypeDeleteForm extends EntityDeleteForm {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.query'),
       $container->get('comment.manager'),
       $container->get('entity.manager'),
       $container->get('logger.factory')->get('comment')
@@ -86,24 +74,26 @@ class CommentTypeDeleteForm extends EntityDeleteForm {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $comments = $this->queryFactory->get('comment')->condition('comment_type', $this->entity->id())->execute();
+    $comments = $this->entityTypeManager->getStorage('comment')->getQuery()
+      ->condition('comment_type', $this->entity->id())
+      ->execute();
     $entity_type = $this->entity->getTargetEntityTypeId();
     $caption = '';
     foreach (array_keys($this->commentManager->getFields($entity_type)) as $field_name) {
       /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
       if (($field_storage = FieldStorageConfig::loadByName($entity_type, $field_name)) && $field_storage->getSetting('comment_type') == $this->entity->id() && !$field_storage->isDeleted()) {
-        $caption .= '<p>' . $this->t('%label is used by the %field field on your site. You can not remove this comment type until you have removed the field.', array(
+        $caption .= '<p>' . $this->t('%label is used by the %field field on your site. You can not remove this comment type until you have removed the field.', [
           '%label' => $this->entity->label(),
           '%field' => $field_storage->label(),
-        )) . '</p>';
+        ]) . '</p>';
       }
     }
 
     if (!empty($comments)) {
-      $caption .= '<p>' . $this->formatPlural(count($comments), '%label is used by 1 comment on your site. You can not remove this comment type until you have removed all of the %label comments.', '%label is used by @count comments on your site. You may not remove %label until you have removed all of the %label comments.', array('%label' => $this->entity->label())) . '</p>';
+      $caption .= '<p>' . $this->formatPlural(count($comments), '%label is used by 1 comment on your site. You can not remove this comment type until you have removed all of the %label comments.', '%label is used by @count comments on your site. You may not remove %label until you have removed all of the %label comments.', ['%label' => $this->entity->label()]) . '</p>';
     }
     if ($caption) {
-      $form['description'] = array('#markup' => $caption);
+      $form['description'] = ['#markup' => $caption];
       return $form;
     }
     else {
diff --git a/web/core/modules/comment/src/Form/ConfirmDeleteMultiple.php b/web/core/modules/comment/src/Form/ConfirmDeleteMultiple.php
index 662cfa4ac..590624831 100644
--- a/web/core/modules/comment/src/Form/ConfirmDeleteMultiple.php
+++ b/web/core/modules/comment/src/Form/ConfirmDeleteMultiple.php
@@ -81,25 +81,25 @@ class ConfirmDeleteMultiple extends ConfirmFormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $edit = $form_state->getUserInput();
 
-    $form['comments'] = array(
+    $form['comments'] = [
       '#prefix' => '<ul>',
       '#suffix' => '</ul>',
       '#tree' => TRUE,
-    );
+    ];
     // array_filter() returns only elements with actual values.
     $comment_counter = 0;
     $this->comments = $this->commentStorage->loadMultiple(array_keys(array_filter($edit['comments'])));
     foreach ($this->comments as $comment) {
       $cid = $comment->id();
-      $form['comments'][$cid] = array(
+      $form['comments'][$cid] = [
         '#type' => 'hidden',
         '#value' => $cid,
         '#prefix' => '<li>',
         '#suffix' => Html::escape($comment->label()) . '</li>'
-      );
+      ];
       $comment_counter++;
     }
-    $form['operation'] = array('#type' => 'hidden', '#value' => 'delete');
+    $form['operation'] = ['#type' => 'hidden', '#value' => 'delete'];
 
     if (!$comment_counter) {
       drupal_set_message($this->t('There do not appear to be any comments to delete, or your selected comment was deleted by another administrator.'));
@@ -116,7 +116,7 @@ class ConfirmDeleteMultiple extends ConfirmFormBase {
     if ($form_state->getValue('confirm')) {
       $this->commentStorage->delete($this->comments);
       $count = count($form_state->getValue('comments'));
-      $this->logger('content')->notice('Deleted @count comments.', array('@count' => $count));
+      $this->logger('comment')->notice('Deleted @count comments.', ['@count' => $count]);
       drupal_set_message($this->formatPlural($count, 'Deleted 1 comment.', 'Deleted @count comments.'));
     }
     $form_state->setRedirectUrl($this->getCancelUrl());
diff --git a/web/core/modules/comment/src/Form/DeleteForm.php b/web/core/modules/comment/src/Form/DeleteForm.php
index 6b2921e17..fa7ab9d20 100644
--- a/web/core/modules/comment/src/Form/DeleteForm.php
+++ b/web/core/modules/comment/src/Form/DeleteForm.php
@@ -42,7 +42,7 @@ class DeleteForm extends ContentEntityDeleteForm {
    * {@inheritdoc}
    */
   public function logDeletionMessage() {
-    $this->logger('content')->notice('Deleted comment @cid and its replies.', array('@cid' => $this->entity->id()));
+    $this->logger('comment')->notice('Deleted comment @cid and its replies.', ['@cid' => $this->entity->id()]);
   }
 
 }
diff --git a/web/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php b/web/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php
index cacac89f6..ec1b268d7 100644
--- a/web/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php
+++ b/web/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php
@@ -89,21 +89,21 @@ class UnpublishByKeywordComment extends ConfigurableActionBase implements Contai
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
-      'keywords' => array(),
-    );
+    return [
+      'keywords' => [],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['keywords'] = array(
+    $form['keywords'] = [
       '#title' => $this->t('Keywords'),
       '#type' => 'textarea',
       '#description' => $this->t('The comment will be unpublished if it contains any of the phrases above. Use a case-sensitive, comma-separated list of phrases. Example: funny, bungee jumping, "Company, Inc."'),
       '#default_value' => Tags::implode($this->configuration['keywords']),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/comment/src/Plugin/Field/FieldFormatter/AuthorNameFormatter.php b/web/core/modules/comment/src/Plugin/Field/FieldFormatter/AuthorNameFormatter.php
index 43542a0eb..3e22ede6e 100644
--- a/web/core/modules/comment/src/Plugin/Field/FieldFormatter/AuthorNameFormatter.php
+++ b/web/core/modules/comment/src/Plugin/Field/FieldFormatter/AuthorNameFormatter.php
@@ -24,19 +24,19 @@ class AuthorNameFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
       /** @var $comment \Drupal\comment\CommentInterface */
       $comment = $item->getEntity();
       $account = $comment->getOwner();
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#theme' => 'username',
         '#account' => $account,
-        '#cache' => array(
+        '#cache' => [
           'tags' => $account->getCacheTags() + $comment->getCacheTags(),
-        ),
-      );
+        ],
+      ];
     }
 
     return $elements;
diff --git a/web/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php b/web/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
index c7d9bba85..b03accc48 100644
--- a/web/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
+++ b/web/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
@@ -36,10 +36,10 @@ class CommentDefaultFormatter extends FormatterBase implements ContainerFactoryP
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'view_mode' => 'default',
       'pager_id' => 0,
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -141,8 +141,8 @@ class CommentDefaultFormatter extends FormatterBase implements ContainerFactoryP
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
-    $output = array();
+    $elements = [];
+    $output = [];
 
     $field_name = $this->fieldDefinition->getName();
     $entity = $items->getEntity();
@@ -153,7 +153,7 @@ class CommentDefaultFormatter extends FormatterBase implements ContainerFactoryP
       // Comments are added to the search results and search index by
       // comment_node_update_index() instead of by this formatter, so don't
       // return anything if the view mode is search_index or search_result.
-      !in_array($this->viewMode, array('search_result', 'search_index'))) {
+      !in_array($this->viewMode, ['search_result', 'search_index'])) {
       $comment_settings = $this->getFieldSettings();
 
       // Only attempt to render comments if the entity has visible comments.
@@ -203,12 +203,12 @@ class CommentDefaultFormatter extends FormatterBase implements ContainerFactoryP
         }
       }
 
-      $elements[] = $output + array(
+      $elements[] = $output + [
         '#comment_type' => $this->getFieldSetting('comment_type'),
         '#comment_display_mode' => $this->getFieldSetting('default_mode'),
-        'comments' => array(),
-        'comment_form' => array(),
-      );
+        'comments' => [],
+        'comment_form' => [],
+      ];
     }
 
     return $elements;
@@ -218,7 +218,7 @@ class CommentDefaultFormatter extends FormatterBase implements ContainerFactoryP
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element = array();
+    $element = [];
     $view_modes = $this->getViewModes();
     $element['view_mode'] = [
       '#type' => 'select',
@@ -229,13 +229,13 @@ class CommentDefaultFormatter extends FormatterBase implements ContainerFactoryP
       // Only show the select element when there are more than one options.
       '#access' => count($view_modes) > 1,
     ];
-    $element['pager_id'] = array(
+    $element['pager_id'] = [
       '#type' => 'select',
       '#title' => $this->t('Pager ID'),
       '#options' => range(0, 10),
       '#default_value' => $this->getSetting('pager_id'),
       '#description' => $this->t("Unless you're experiencing problems with pagers related to this field, you should leave this at 0. If using multiple pagers on one page you may need to set this number to a higher value so as not to conflict within the ?page= array. Large values will add a lot of commas to your URLs, so avoid if possible."),
-    );
+    ];
     return $element;
   }
 
diff --git a/web/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php b/web/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
index 888b64b25..e3fd2b060 100644
--- a/web/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
+++ b/web/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
@@ -31,22 +31,22 @@ class CommentItem extends FieldItemBase implements CommentItemInterface {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'comment_type' => '',
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    return array(
+    return [
       'default_mode' => CommentManagerInterface::COMMENT_MODE_THREADED,
       'per_page' => 50,
       'form_location' => CommentItemInterface::FORM_BELOW,
       'anonymous' => COMMENT_ANONYMOUS_MAYNOT_CONTACT,
       'preview' => DRUPAL_OPTIONAL,
-    ) + parent::defaultFieldSettings();
+    ] + parent::defaultFieldSettings();
   }
 
   /**
@@ -82,36 +82,36 @@ class CommentItem extends FieldItemBase implements CommentItemInterface {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'status' => array(
+    return [
+      'columns' => [
+        'status' => [
           'description' => 'Whether comments are allowed on this entity: 0 = no, 1 = closed (read only), 2 = open (read/write).',
           'type' => 'int',
           'default' => 0,
-        ),
-      ),
-      'indexes' => array(),
-      'foreign keys' => array(),
-    );
+        ],
+      ],
+      'indexes' => [],
+      'foreign keys' => [],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
-    $element = array();
+    $element = [];
 
     $settings = $this->getSettings();
 
     $anonymous_user = new AnonymousUserSession();
 
-    $element['default_mode'] = array(
+    $element['default_mode'] = [
       '#type' => 'checkbox',
       '#title' => t('Threading'),
       '#default_value' => $settings['default_mode'],
       '#description' => t('Show comment replies in a threaded list.'),
-    );
-    $element['per_page'] = array(
+    ];
+    $element['per_page'] = [
       '#type' => 'number',
       '#title' => t('Comments per page'),
       '#default_value' => $settings['per_page'],
@@ -119,33 +119,33 @@ class CommentItem extends FieldItemBase implements CommentItemInterface {
       '#min' => 10,
       '#max' => 1000,
       '#step' => 10,
-    );
-    $element['anonymous'] = array(
+    ];
+    $element['anonymous'] = [
       '#type' => 'select',
       '#title' => t('Anonymous commenting'),
       '#default_value' => $settings['anonymous'],
-      '#options' => array(
+      '#options' => [
         COMMENT_ANONYMOUS_MAYNOT_CONTACT => t('Anonymous posters may not enter their contact information'),
         COMMENT_ANONYMOUS_MAY_CONTACT => t('Anonymous posters may leave their contact information'),
         COMMENT_ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information'),
-      ),
+      ],
       '#access' => $anonymous_user->hasPermission('post comments'),
-    );
-    $element['form_location'] = array(
+    ];
+    $element['form_location'] = [
       '#type' => 'checkbox',
       '#title' => t('Show reply form on the same page as comments'),
       '#default_value' => $settings['form_location'],
-    );
-    $element['preview'] = array(
+    ];
+    $element['preview'] = [
       '#type' => 'radios',
       '#title' => t('Preview comment'),
       '#default_value' => $settings['preview'],
-      '#options' => array(
+      '#options' => [
         DRUPAL_DISABLED => t('Disabled'),
         DRUPAL_OPTIONAL => t('Optional'),
         DRUPAL_REQUIRED => t('Required'),
-      ),
-    );
+      ],
+    ];
 
     return $element;
   }
@@ -171,27 +171,27 @@ class CommentItem extends FieldItemBase implements CommentItemInterface {
    * {@inheritdoc}
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $element = array();
+    $element = [];
 
     // @todo Inject entity storage once typed-data supports container injection.
     //   See https://www.drupal.org/node/2053415 for more details.
     $comment_types = CommentType::loadMultiple();
-    $options = array();
+    $options = [];
     $entity_type = $this->getEntity()->getEntityTypeId();
     foreach ($comment_types as $comment_type) {
       if ($comment_type->getTargetEntityTypeId() == $entity_type) {
         $options[$comment_type->id()] = $comment_type->label();
       }
     }
-    $element['comment_type'] = array(
+    $element['comment_type'] = [
       '#type' => 'select',
       '#title' => t('Comment type'),
       '#options' => $options,
       '#required' => TRUE,
-      '#description' => $this->t('Select the Comment type to use for this comment field. Manage the comment types from the <a href=":url">administration overview page</a>.', array(':url' => $this->url('entity.comment_type.collection'))),
+      '#description' => $this->t('Select the Comment type to use for this comment field. Manage the comment types from the <a href=":url">administration overview page</a>.', [':url' => $this->url('entity.comment_type.collection')]),
       '#default_value' => $this->getSetting('comment_type'),
       '#disabled' => $has_data,
-    );
+    ];
     return $element;
   }
 
diff --git a/web/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php b/web/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php
index 818226d05..c9478f622 100644
--- a/web/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php
+++ b/web/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php
@@ -27,26 +27,26 @@ class CommentWidget extends WidgetBase {
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $entity = $items->getEntity();
 
-    $element['status'] = array(
+    $element['status'] = [
       '#type' => 'radios',
       '#title' => t('Comments'),
       '#title_display' => 'invisible',
       '#default_value' => $items->status,
-      '#options' => array(
+      '#options' => [
         CommentItemInterface::OPEN => t('Open'),
         CommentItemInterface::CLOSED => t('Closed'),
         CommentItemInterface::HIDDEN => t('Hidden'),
-      ),
-      CommentItemInterface::OPEN => array(
+      ],
+      CommentItemInterface::OPEN => [
         '#description' => t('Users with the "Post comments" permission can post comments.'),
-      ),
-      CommentItemInterface::CLOSED => array(
+      ],
+      CommentItemInterface::CLOSED => [
         '#description' => t('Users cannot post comments, but existing comments will be displayed.'),
-      ),
-      CommentItemInterface::HIDDEN => array(
+      ],
+      CommentItemInterface::HIDDEN => [
         '#description' => t('Comments are hidden from view.'),
-      ),
-    );
+      ],
+    ];
     // If the entity doesn't have any comments, the "hidden" option makes no
     // sense, so don't even bother presenting it to the user unless this is the
     // default value widget on the field settings form.
@@ -65,19 +65,19 @@ class CommentWidget extends WidgetBase {
       // Override widget title to be helpful for end users.
       $element['#title'] = $this->t('Comment settings');
 
-      $element += array(
+      $element += [
         '#type' => 'details',
         // Open the details when the selected value is different to the stored
         // default values for the field.
         '#open' => ($items->status != $field_default_values[0]['status']),
         '#group' => 'advanced',
-        '#attributes' => array(
-          'class' => array('comment-' . Html::getClass($entity->getEntityTypeId()) . '-settings-form'),
-        ),
-        '#attached' => array(
-          'library' => array('comment/drupal.comment'),
-        ),
-      );
+        '#attributes' => [
+          'class' => ['comment-' . Html::getClass($entity->getEntityTypeId()) . '-settings-form'],
+        ],
+        '#attached' => [
+          'library' => ['comment/drupal.comment'],
+        ],
+      ];
     }
 
     return $element;
@@ -90,13 +90,13 @@ class CommentWidget extends WidgetBase {
     // Add default values for statistics properties because we don't want to
     // have them in form.
     foreach ($values as &$value) {
-      $value += array(
+      $value += [
         'cid' => 0,
         'last_comment_timestamp' => 0,
         'last_comment_name' => '',
         'last_comment_uid' => 0,
         'comment_count' => 0,
-      );
+      ];
     }
     return $values;
   }
diff --git a/web/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php b/web/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php
index 5fa019365..89542d34f 100644
--- a/web/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php
+++ b/web/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php
@@ -54,7 +54,7 @@ class UnapprovedComments extends LocalTaskDefault implements ContainerFactoryPlu
    * {@inheritdoc}
    */
   public function getTitle() {
-    return $this->t('Unapproved comments (@count)', array('@count' => $this->commentStorage->getUnapprovedCount()));
+    return $this->t('Unapproved comments (@count)', ['@count' => $this->commentStorage->getUnapprovedCount()]);
   }
 
 }
diff --git a/web/core/modules/comment/src/Plugin/Validation/Constraint/CommentNameConstraintValidator.php b/web/core/modules/comment/src/Plugin/Validation/Constraint/CommentNameConstraintValidator.php
index f06dfd838..87cdaf91d 100644
--- a/web/core/modules/comment/src/Plugin/Validation/Constraint/CommentNameConstraintValidator.php
+++ b/web/core/modules/comment/src/Plugin/Validation/Constraint/CommentNameConstraintValidator.php
@@ -55,9 +55,9 @@ class CommentNameConstraintValidator extends ConstraintValidator implements Cont
     // Do not allow unauthenticated comment authors to use a name that is
     // taken by a registered user.
     if (isset($author_name) && $author_name !== '' && $owner_id === 0) {
-      $users = $this->userStorage->loadByProperties(array('name' => $author_name));
+      $users = $this->userStorage->loadByProperties(['name' => $author_name]);
       if (!empty($users)) {
-        $this->context->buildViolation($constraint->messageNameTaken, array('%name' => $author_name))
+        $this->context->buildViolation($constraint->messageNameTaken, ['%name' => $author_name])
           ->atPath('name')
           ->addViolation();
       }
diff --git a/web/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php b/web/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
index e3582c5ec..efce666a7 100644
--- a/web/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
+++ b/web/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
@@ -4,7 +4,6 @@ namespace Drupal\comment\Plugin\migrate\destination;
 
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
@@ -26,13 +25,6 @@ class EntityComment extends EntityContentBase {
    */
   protected $state;
 
-  /**
-   * The entity query object.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryInterface
-   */
-  protected $entityQuery;
-
   /**
    * An array of entity IDs for the 'commented entity' keyed by entity type.
    *
@@ -61,13 +53,10 @@ class EntityComment extends EntityContentBase {
    *   The field type plugin manager service.
    * @param \Drupal\Core\State\StateInterface $state
    *   The state storage object.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query
-   *   The query object that can query the given entity type.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_manager, StateInterface $state, QueryFactory $entity_query) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_manager, StateInterface $state) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $entity_manager, $field_type_manager);
     $this->state = $state;
-    $this->entityQuery = $entity_query;
   }
 
   /**
@@ -84,15 +73,14 @@ class EntityComment extends EntityContentBase {
       array_keys($container->get('entity.manager')->getBundleInfo($entity_type)),
       $container->get('entity.manager'),
       $container->get('plugin.manager.field.field_type'),
-      $container->get('state'),
-      $container->get('entity.query')
+      $container->get('state')
     );
   }
 
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     if ($row->isStub() && ($state = $this->state->get('comment.maintain_entity_statistics', 0))) {
       $this->state->set('comment.maintain_entity_statistics', 0);
     }
diff --git a/web/core/modules/comment/src/Plugin/migrate/destination/EntityCommentType.php b/web/core/modules/comment/src/Plugin/migrate/destination/EntityCommentType.php
index b014af3fa..9bee87a3a 100644
--- a/web/core/modules/comment/src/Plugin/migrate/destination/EntityCommentType.php
+++ b/web/core/modules/comment/src/Plugin/migrate/destination/EntityCommentType.php
@@ -15,7 +15,7 @@ class EntityCommentType extends EntityConfigBase {
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     $entity_ids = parent::import($row, $old_destination_id_values);
     \Drupal::service('comment.manager')->addBodyField(reset($entity_ids));
     return $entity_ids;
diff --git a/web/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php b/web/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
index 6081f39f9..93f77a0e3 100644
--- a/web/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
+++ b/web/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
@@ -20,11 +20,11 @@ class Comment extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('comments', 'c')
-      ->fields('c', array('cid', 'pid', 'nid', 'uid', 'subject',
+      ->fields('c', ['cid', 'pid', 'nid', 'uid', 'subject',
         'comment', 'hostname', 'timestamp', 'status', 'thread', 'name',
-        'mail', 'homepage', 'format'));
+        'mail', 'homepage', 'format']);
     $query->innerJoin('node', 'n', 'c.nid = n.nid');
-    $query->fields('n', array('type'));
+    $query->fields('n', ['type']);
     $query->orderBy('c.timestamp');
     return $query;
   }
@@ -52,7 +52,7 @@ class Comment extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'cid' => $this->t('Comment ID.'),
       'pid' => $this->t('Parent comment ID. If set to 0, this comment is not a reply to an existing comment.'),
       'nid' => $this->t('The {node}.nid to which this comment is a reply.'),
@@ -68,7 +68,7 @@ class Comment extends DrupalSqlBase {
       'mail' => $this->t("The comment author's email address from the comment form, if user is anonymous, and the 'Anonymous users may/must leave their contact information' setting is turned on."),
       'homepage' => $this->t("The comment author's home page address from the comment form, if user is anonymous, and the 'Anonymous users may/must leave their contact information' setting is turned on."),
       'type' => $this->t("The {node}.type to which this comment is a reply."),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariable.php b/web/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariable.php
index 329472138..a56fb4dc2 100644
--- a/web/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariable.php
+++ b/web/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariable.php
@@ -35,7 +35,7 @@ class CommentVariable extends DrupalSqlBase {
    */
   protected function getCommentVariables() {
     $comment_prefixes = array_keys($this->commentPrefixes());
-    $variables = array();
+    $variables = [];
     $node_types = $this->select('node_type', 'nt')
       ->fields('nt', ['type'])
       ->execute()
@@ -45,7 +45,7 @@ class CommentVariable extends DrupalSqlBase {
         $variables[] = $prefix . '_' . $node_type;
       }
     }
-    $return = array();
+    $return = [];
     $values = $this->select('variable', 'v')
       ->fields('v', ['name', 'value'])
       ->condition('name', $variables, 'IN')
@@ -74,17 +74,17 @@ class CommentVariable extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return $this->commentPrefixes() + array(
+    return $this->commentPrefixes() + [
       'node_type' => $this->t('The node type'),
       'comment_type' => $this->t('The comment type'),
-    );
+    ];
   }
 
   /**
    * Comment related data for fields.
    */
   protected function commentPrefixes() {
-    return array(
+    return [
       'comment' => $this->t('Default comment setting'),
       'comment_default_mode' => $this->t('Default display mode'),
       'comment_default_order' => $this->t('Default display order'),
@@ -94,7 +94,7 @@ class CommentVariable extends DrupalSqlBase {
       'comment_subject_field' => $this->t('Comment subject field'),
       'comment_preview' => $this->t('Preview comment'),
       'comment_form_location' => $this->t('Location of comment submission form'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariablePerCommentType.php b/web/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariablePerCommentType.php
index 5d16ed029..0eea68608 100644
--- a/web/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariablePerCommentType.php
+++ b/web/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariablePerCommentType.php
@@ -17,24 +17,24 @@ class CommentVariablePerCommentType extends CommentVariable {
   protected function getCommentVariables() {
     $node_types = parent::getCommentVariables();
     // The return key used to separate comment types with hidden subject field.
-    $return = array();
+    $return = [];
     foreach ($node_types as $node_type => $data) {
       // Only 2 comment types depending on subject field visibility.
       if (!empty($data['comment_subject_field'])) {
         // Default label and description should be set in migration.
-        $return['comment'] = array(
+        $return['comment'] = [
           'comment_type' => 'comment',
           'label' => $this->t('Default comments'),
           'description' => $this->t('Allows commenting on content')
-        );
+        ];
       }
       else {
         // Provide a special comment type with hidden subject field.
-        $return['comment_no_subject'] = array(
+        $return['comment_no_subject'] = [
           'comment_type' => 'comment_no_subject',
           'label' => $this->t('Comments without subject field'),
           'description' => $this->t('Allows commenting on content, comments without subject field')
-        );
+        ];
       }
     }
     return $return;
@@ -44,11 +44,11 @@ class CommentVariablePerCommentType extends CommentVariable {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'comment_type' => $this->t('The comment type'),
       'label' => $this->t('The comment type label'),
       'description' => $this->t('The comment type description'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/comment/src/Plugin/migrate/source/d7/Comment.php b/web/core/modules/comment/src/Plugin/migrate/source/d7/Comment.php
index 5531f1d39..e643eb178 100644
--- a/web/core/modules/comment/src/Plugin/migrate/source/d7/Comment.php
+++ b/web/core/modules/comment/src/Plugin/migrate/source/d7/Comment.php
@@ -47,7 +47,7 @@ class Comment extends FieldableEntity {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'cid' => $this->t('Comment ID.'),
       'pid' => $this->t('Parent comment ID. If set to 0, this comment is not a reply to an existing comment.'),
       'nid' => $this->t('The {node}.nid to which this comment is a reply.'),
@@ -64,7 +64,7 @@ class Comment extends FieldableEntity {
       'mail' => $this->t("The comment author's email address from the comment form, if user is anonymous, and the 'Anonymous users may/must leave their contact information' setting is turned on."),
       'homepage' => $this->t("The comment author's home page address from the comment form, if user is anonymous, and the 'Anonymous users may/must leave their contact information' setting is turned on."),
       'type' => $this->t("The {node}.type to which this comment is a reply."),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php b/web/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php
index fc194b2a6..2ac7c97a0 100644
--- a/web/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php
+++ b/web/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php
@@ -21,7 +21,7 @@ class CommentType extends DrupalSqlBase {
    *
    * @var string[]
    */
-  protected $nodeTypes = array();
+  protected $nodeTypes = [];
 
   /**
    * {@inheritdoc}
@@ -29,7 +29,7 @@ class CommentType extends DrupalSqlBase {
   public function query() {
     return $this->select('field_config_instance', 'fci')
       ->distinct()
-      ->fields('fci', array('bundle'))
+      ->fields('fci', ['bundle'])
       ->condition('fci.entity_type', 'comment');
   }
 
@@ -38,7 +38,7 @@ class CommentType extends DrupalSqlBase {
    */
   protected function initializeIterator() {
     $this->nodeTypes = $this->select('node_type', 'nt')
-      ->fields('nt', array('type', 'name'))
+      ->fields('nt', ['type', 'name'])
       ->execute()
       ->fetchAllKeyed();
 
@@ -71,7 +71,7 @@ class CommentType extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'label' => $this->t('The label of the comment type.'),
       'bundle' => $this->t('Bundle ID of the comment type.'),
       'node_type' => $this->t('The node type to which this comment type is attached.'),
@@ -81,18 +81,18 @@ class CommentType extends DrupalSqlBase {
       'form_location' => $this->t('Location of the comment form.'),
       'preview' => $this->t('Whether previews are enabled for the comment type.'),
       'subject' => $this->t('Whether a subject field is enabled for the comment type.'),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'bundle' => array(
+    return [
+      'bundle' => [
         'type' => 'string',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/comment/src/Plugin/views/argument/UserUid.php b/web/core/modules/comment/src/Plugin/views/argument/UserUid.php
index cd384d560..69621559c 100644
--- a/web/core/modules/comment/src/Plugin/views/argument/UserUid.php
+++ b/web/core/modules/comment/src/Plugin/views/argument/UserUid.php
@@ -48,12 +48,12 @@ class UserUid extends ArgumentPluginBase {
     return new static($configuration, $plugin_id, $plugin_definition, $container->get('database'));
   }
 
-  function title() {
+  public function title() {
     if (!$this->argument) {
       $title = \Drupal::config('user.settings')->get('anonymous');
     }
     else {
-      $title = $this->database->query('SELECT name FROM {users_field_data} WHERE uid = :uid AND default_langcode = 1', array(':uid' => $this->argument))->fetchField();
+      $title = $this->database->query('SELECT name FROM {users_field_data} WHERE uid = :uid AND default_langcode = 1', [':uid' => $this->argument])->fetchField();
     }
     if (empty($title)) {
       return $this->t('No user');
@@ -102,7 +102,7 @@ class UserUid extends ArgumentPluginBase {
    * {@inheritdoc}
    */
   public function getSortName() {
-    return $this->t('Numerical', array(), array('context' => 'Sort order'));
+    return $this->t('Numerical', [], ['context' => 'Sort order']);
   }
 
 }
diff --git a/web/core/modules/comment/src/Plugin/views/field/Depth.php b/web/core/modules/comment/src/Plugin/views/field/Depth.php
index 8136e2ab4..04b43c766 100644
--- a/web/core/modules/comment/src/Plugin/views/field/Depth.php
+++ b/web/core/modules/comment/src/Plugin/views/field/Depth.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\comment\Plugin\views\field;
 
-use Drupal\views\Plugin\views\field\Field;
+use Drupal\views\Plugin\views\field\EntityField;
 use Drupal\views\ResultRow;
 
 /**
@@ -12,7 +12,7 @@ use Drupal\views\ResultRow;
  *
  * @ViewsField("comment_depth")
  */
-class Depth extends Field {
+class Depth extends EntityField {
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/comment/src/Plugin/views/field/EntityLink.php b/web/core/modules/comment/src/Plugin/views/field/EntityLink.php
index dc4f8cf18..03e6f6c84 100644
--- a/web/core/modules/comment/src/Plugin/views/field/EntityLink.php
+++ b/web/core/modules/comment/src/Plugin/views/field/EntityLink.php
@@ -27,7 +27,7 @@ class EntityLink extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['teaser'] = array('default' => FALSE);
+    $options['teaser'] = ['default' => FALSE];
     return $options;
   }
 
@@ -35,12 +35,12 @@ class EntityLink extends FieldPluginBase {
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['teaser'] = array(
+    $form['teaser'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Show teaser-style link'),
       '#default_value' => $this->options['teaser'],
       '#description' => $this->t('Show the comment link in the form used on standard entity teasers, rather than the full entity form.'),
-    );
+    ];
 
     parent::buildOptionsForm($form, $form_state);
   }
@@ -55,7 +55,7 @@ class EntityLink extends FieldPluginBase {
    */
   public function preRender(&$values) {
     // Render all nodes, so you can grep the comment links.
-    $entities = array();
+    $entities = [];
     foreach ($values as $row) {
       $entity = $row->_entity;
       $entities[$entity->id()] = $entity;
diff --git a/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php b/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
index 5a9f5b3a1..c53b52ed1 100644
--- a/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
+++ b/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
@@ -68,7 +68,7 @@ class NodeNewComments extends NumericField {
 
     $this->additional_fields['entity_id'] = 'nid';
     $this->additional_fields['type'] = 'type';
-    $this->additional_fields['comment_count'] = array('table' => 'comment_entity_statistics', 'field' => 'comment_count');
+    $this->additional_fields['comment_count'] = ['table' => 'comment_entity_statistics', 'field' => 'comment_count'];
   }
 
   /**
@@ -77,7 +77,7 @@ class NodeNewComments extends NumericField {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['link_to_comment'] = array('default' => TRUE);
+    $options['link_to_comment'] = ['default' => TRUE];
 
     return $options;
   }
@@ -86,12 +86,12 @@ class NodeNewComments extends NumericField {
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['link_to_comment'] = array(
+    $form['link_to_comment'] = [
       '#title' => $this->t('Link this field to new comments'),
       '#description' => $this->t("Enable to override this field's links."),
       '#type' => 'checkbox',
       '#default_value' => $this->options['link_to_comment'],
-    );
+    ];
 
     parent::buildOptionsForm($form, $form_state);
   }
@@ -114,14 +114,14 @@ class NodeNewComments extends NumericField {
       return;
     }
 
-    $nids = array();
-    $ids = array();
+    $nids = [];
+    $ids = [];
     foreach ($values as $id => $result) {
       $nids[] = $result->{$this->aliases['nid']};
       $values[$id]->{$this->field_alias} = 0;
       // Create a reference so we can find this record in the values again.
       if (empty($ids[$result->{$this->aliases['nid']}])) {
-        $ids[$result->{$this->aliases['nid']}] = array();
+        $ids[$result->{$this->aliases['nid']}] = [];
       }
       $ids[$result->{$this->aliases['nid']}][] = $id;
     }
@@ -129,13 +129,13 @@ class NodeNewComments extends NumericField {
     if ($nids) {
       $result = $this->database->query("SELECT n.nid, COUNT(c.cid) as num_comments FROM {node} n INNER JOIN {comment_field_data} c ON n.nid = c.entity_id AND c.entity_type = 'node' AND c.default_langcode = 1
         LEFT JOIN {history} h ON h.nid = n.nid AND h.uid = :h_uid WHERE n.nid IN ( :nids[] )
-        AND c.changed > GREATEST(COALESCE(h.timestamp, :timestamp1), :timestamp2) AND c.status = :status GROUP BY n.nid", array(
+        AND c.changed > GREATEST(COALESCE(h.timestamp, :timestamp1), :timestamp2) AND c.status = :status GROUP BY n.nid", [
         ':status' => CommentInterface::PUBLISHED,
         ':h_uid' => $user->id(),
         ':nids[]' => $nids,
         ':timestamp1' => HISTORY_READ_LIMIT,
         ':timestamp2' => HISTORY_READ_LIMIT,
-      ));
+      ]);
       foreach ($result as $node) {
         foreach ($ids[$node->nid] as $id) {
           $values[$id]->{$this->field_alias} = $node->num_comments;
@@ -181,7 +181,7 @@ class NodeNewComments extends NumericField {
         ->getNewCommentPageNumber($this->getValue($values, 'comment_count'), $this->getValue($values), $node, $comment_field_name);
       $this->options['alter']['make_link'] = TRUE;
       $this->options['alter']['url'] = $node->urlInfo();
-      $this->options['alter']['query'] = $page_number ? array('page' => $page_number) : NULL;
+      $this->options['alter']['query'] = $page_number ? ['page' => $page_number] : NULL;
       $this->options['alter']['fragment'] = 'new';
     }
 
diff --git a/web/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php b/web/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
index 61a5d17ef..fa24c3ffe 100644
--- a/web/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
+++ b/web/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
@@ -23,19 +23,19 @@ class StatisticsLastCommentName extends FieldPluginBase {
     // have to join in a specially related user table.
     $this->ensureMyTable();
     // join 'users' to this table via vid
-    $definition = array(
+    $definition = [
       'table' => 'users_field_data',
       'field' => 'uid',
       'left_table' => 'comment_entity_statistics',
       'left_field' => 'last_comment_uid',
-      'extra' => array(
-        array(
+      'extra' => [
+        [
           'field' => 'uid',
           'operator' => '!=',
           'value' => '0'
-        )
-      )
-    );
+        ]
+      ]
+    ];
     $join = \Drupal::service('plugin.manager.views.join')->createInstance('standard', $definition);
 
     // nes_user alias so this can work with the sort handler, below.
@@ -53,7 +53,7 @@ class StatisticsLastCommentName extends FieldPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['link_to_user'] = array('default' => TRUE);
+    $options['link_to_user'] = ['default' => TRUE];
 
     return $options;
   }
@@ -66,10 +66,10 @@ class StatisticsLastCommentName extends FieldPluginBase {
       $account = User::create();
       $account->name = $this->getValue($values);
       $account->uid = $values->{$this->uid};
-      $username = array(
+      $username = [
         '#theme' => 'username',
         '#account' => $account,
-      );
+      ];
       return drupal_render($username);
     }
     else {
diff --git a/web/core/modules/comment/src/Plugin/views/filter/NodeComment.php b/web/core/modules/comment/src/Plugin/views/filter/NodeComment.php
index e34584f4b..238c05e86 100644
--- a/web/core/modules/comment/src/Plugin/views/filter/NodeComment.php
+++ b/web/core/modules/comment/src/Plugin/views/filter/NodeComment.php
@@ -15,11 +15,11 @@ use Drupal\views\Plugin\views\filter\InOperator;
 class NodeComment extends InOperator {
 
   public function getValueOptions() {
-    $this->valueOptions = array(
+    $this->valueOptions = [
       CommentItemInterface::HIDDEN => $this->t('Hidden'),
       CommentItemInterface::CLOSED => $this->t('Closed'),
       CommentItemInterface::OPEN => $this->t('Open'),
-    );
+    ];
     return $this->valueOptions;
   }
 
diff --git a/web/core/modules/comment/src/Plugin/views/row/Rss.php b/web/core/modules/comment/src/Plugin/views/row/Rss.php
index d52804000..cb9c1046d 100644
--- a/web/core/modules/comment/src/Plugin/views/row/Rss.php
+++ b/web/core/modules/comment/src/Plugin/views/row/Rss.php
@@ -40,7 +40,7 @@ class Rss extends RssPluginBase {
   protected $entityTypeId = 'comment';
 
   public function preRender($result) {
-    $cids = array();
+    $cids = [];
 
     foreach ($result as $row) {
       $cids[] = $row->cid;
@@ -79,23 +79,23 @@ class Rss extends RssPluginBase {
       return;
     }
 
-    $comment->link = $comment->url('canonical', array('absolute' => TRUE));
-    $comment->rss_namespaces = array();
-    $comment->rss_elements = array(
-      array(
+    $comment->link = $comment->url('canonical', ['absolute' => TRUE]);
+    $comment->rss_namespaces = [];
+    $comment->rss_elements = [
+      [
         'key' => 'pubDate',
         'value' => gmdate('r', $comment->getCreatedTime()),
-      ),
-      array(
+      ],
+      [
         'key' => 'dc:creator',
         'value' => $comment->getAuthorName(),
-      ),
-      array(
+      ],
+      [
         'key' => 'guid',
         'value' => 'comment ' . $comment->id() . ' at ' . $base_url,
-        'attributes' => array('isPermaLink' => 'false'),
-      ),
-    );
+        'attributes' => ['isPermaLink' => 'false'],
+      ],
+    ];
 
     // The comment gets built and modules add to or modify
     // $comment->rss_elements and $comment->rss_namespaces.
@@ -118,12 +118,12 @@ class Rss extends RssPluginBase {
     $item->elements = &$comment->rss_elements;
     $item->cid = $comment->id();
 
-    $build = array(
+    $build = [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#row' => $item,
-    );
+    ];
     return $build;
   }
 
diff --git a/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastCommentName.php b/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastCommentName.php
index 863b3a43b..48f556e68 100644
--- a/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastCommentName.php
+++ b/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastCommentName.php
@@ -16,12 +16,12 @@ class StatisticsLastCommentName extends SortPluginBase {
 
   public function query() {
     $this->ensureMyTable();
-    $definition = array(
+    $definition = [
       'table' => 'users_field_data',
       'field' => 'uid',
       'left_table' => 'comment_entity_statistics',
       'left_field' => 'last_comment_uid',
-    );
+    ];
     $join = \Drupal::service('plugin.manager.views.join')->createInstance('standard', $definition);
 
     // @todo this might be safer if we had an ensure_relationship rather than guessing
diff --git a/web/core/modules/comment/src/Plugin/views/wizard/Comment.php b/web/core/modules/comment/src/Plugin/views/wizard/Comment.php
index 1f0d4aa45..61d92c591 100644
--- a/web/core/modules/comment/src/Plugin/views/wizard/Comment.php
+++ b/web/core/modules/comment/src/Plugin/views/wizard/Comment.php
@@ -27,16 +27,16 @@ class Comment extends WizardPluginBase {
   /**
    * Set default values for the filters.
    */
-  protected $filters = array(
-    'status' => array(
+  protected $filters = [
+    'status' => [
       'value' => TRUE,
       'table' => 'comment_field_data',
       'field' => 'status',
       'plugin_id' => 'boolean',
       'entity_type' => 'comment',
       'entity_field' => 'status',
-    ),
-    'status_node' => array(
+    ],
+    'status_node' => [
       'value' => TRUE,
       'table' => 'node_field_data',
       'field' => 'status',
@@ -44,14 +44,14 @@ class Comment extends WizardPluginBase {
       'relationship' => 'node',
       'entity_type' => 'node',
       'entity_field' => 'status',
-    ),
-  );
+    ],
+  ];
 
   /**
    * {@inheritdoc}
    */
   protected function rowStyleOptions() {
-    $options = array();
+    $options = [];
     $options['entity:comment'] = $this->t('comments');
     $options['fields'] = $this->t('fields');
     return $options;
diff --git a/web/core/modules/comment/src/Tests/CommentActionsTest.php b/web/core/modules/comment/src/Tests/CommentActionsTest.php
index 220be20be..56d34e4a5 100644
--- a/web/core/modules/comment/src/Tests/CommentActionsTest.php
+++ b/web/core/modules/comment/src/Tests/CommentActionsTest.php
@@ -17,12 +17,12 @@ class CommentActionsTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $modules = array('dblog', 'action');
+  public static $modules = ['dblog', 'action'];
 
   /**
    * Tests comment publish and unpublish actions.
    */
-  function testCommentPublishUnpublishActions() {
+  public function testCommentPublishUnpublishActions() {
     $this->drupalLogin($this->webUser);
     $comment_text = $this->randomMachineName();
     $subject = $this->randomMachineName();
@@ -30,31 +30,31 @@ class CommentActionsTest extends CommentTestBase {
 
     // Unpublish a comment.
     $action = Action::load('comment_unpublish_action');
-    $action->execute(array($comment));
+    $action->execute([$comment]);
     $this->assertTrue($comment->isPublished() === FALSE, 'Comment was unpublished');
 
     // Publish a comment.
     $action = Action::load('comment_publish_action');
-    $action->execute(array($comment));
+    $action->execute([$comment]);
     $this->assertTrue($comment->isPublished() === TRUE, 'Comment was published');
   }
 
   /**
    * Tests the unpublish comment by keyword action.
    */
-  function testCommentUnpublishByKeyword() {
+  public function testCommentUnpublishByKeyword() {
     $this->drupalLogin($this->adminUser);
     $keyword_1 = $this->randomMachineName();
     $keyword_2 = $this->randomMachineName();
-    $action = Action::create(array(
+    $action = Action::create([
       'id' => 'comment_unpublish_by_keyword_action',
       'label' => $this->randomMachineName(),
       'type' => 'comment',
-      'configuration' => array(
-        'keywords' => array($keyword_1, $keyword_2),
-      ),
+      'configuration' => [
+        'keywords' => [$keyword_1, $keyword_2],
+      ],
       'plugin' => 'comment_unpublish_by_keyword_action',
-    ));
+    ]);
     $action->save();
 
     $comment = $this->postComment($this->node, $keyword_2, $this->randomMachineName());
@@ -64,7 +64,7 @@ class CommentActionsTest extends CommentTestBase {
 
     $this->assertTrue($comment->isPublished() === TRUE, 'The comment status was set to published.');
 
-    $action->execute(array($comment));
+    $action->execute([$comment]);
     $this->assertTrue($comment->isPublished() === FALSE, 'The comment status was set to not published.');
   }
 
diff --git a/web/core/modules/comment/src/Tests/CommentAdminTest.php b/web/core/modules/comment/src/Tests/CommentAdminTest.php
index 5ae57cb81..980ad30a2 100644
--- a/web/core/modules/comment/src/Tests/CommentAdminTest.php
+++ b/web/core/modules/comment/src/Tests/CommentAdminTest.php
@@ -21,13 +21,13 @@ class CommentAdminTest extends CommentTestBase {
   /**
    * Test comment approval functionality through admin/content/comment.
    */
-  function testApprovalAdminInterface() {
+  public function testApprovalAdminInterface() {
     // Set anonymous comments to require approval.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => TRUE,
       'post comments' => TRUE,
       'skip comment approval' => FALSE,
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
     $this->setCommentAnonymous('0'); // Ensure that doesn't require contact info.
 
@@ -46,14 +46,14 @@ class CommentAdminTest extends CommentTestBase {
     // Get unapproved comment id.
     $this->drupalLogin($this->adminUser);
     $anonymous_comment4 = $this->getUnapprovedComment($subject);
-    $anonymous_comment4 = Comment::create(array(
+    $anonymous_comment4 = Comment::create([
       'cid' => $anonymous_comment4,
       'subject' => $subject,
       'comment_body' => $body,
       'entity_id' => $this->node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment'
-    ));
+    ]);
     $this->drupalLogout();
 
     $this->assertFalse($this->commentExists($anonymous_comment4), 'Anonymous comment was not published.');
@@ -73,29 +73,29 @@ class CommentAdminTest extends CommentTestBase {
     // Publish multiple comments in one operation.
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('admin/content/comment/approval');
-    $this->assertText(t('Unapproved comments (@count)', array('@count' => 2)), 'Two unapproved comments waiting for approval.');
-    $edit = array(
+    $this->assertText(t('Unapproved comments (@count)', ['@count' => 2]), 'Two unapproved comments waiting for approval.');
+    $edit = [
       "comments[{$comments[0]->id()}]" => 1,
       "comments[{$comments[1]->id()}]" => 1,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Update'));
-    $this->assertText(t('Unapproved comments (@count)', array('@count' => 0)), 'All comments were approved.');
+    $this->assertText(t('Unapproved comments (@count)', ['@count' => 0]), 'All comments were approved.');
 
     // Delete multiple comments in one operation.
-    $edit = array(
+    $edit = [
       'operation' => 'delete',
       "comments[{$comments[0]->id()}]" => 1,
       "comments[{$comments[1]->id()}]" => 1,
       "comments[{$anonymous_comment4->id()}]" => 1,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Update'));
     $this->assertText(t('Are you sure you want to delete these comments and all their children?'), 'Confirmation required.');
     $this->drupalPostForm(NULL, $edit, t('Delete comments'));
     $this->assertText(t('No comments available.'), 'All comments were deleted.');
     // Test message when no comments selected.
-    $edit = array(
+    $edit = [
       'operation' => 'delete',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Update'));
     $this->assertText(t('Select one or more comments to perform the update on.'));
   }
@@ -103,13 +103,13 @@ class CommentAdminTest extends CommentTestBase {
   /**
    * Tests comment approval functionality through the node interface.
    */
-  function testApprovalNodeInterface() {
+  public function testApprovalNodeInterface() {
     // Set anonymous comments to require approval.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => TRUE,
       'post comments' => TRUE,
       'skip comment approval' => FALSE,
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
     $this->setCommentAnonymous('0'); // Ensure that doesn't require contact info.
     $this->drupalLogout();
@@ -123,14 +123,14 @@ class CommentAdminTest extends CommentTestBase {
     // Get unapproved comment id.
     $this->drupalLogin($this->adminUser);
     $anonymous_comment4 = $this->getUnapprovedComment($subject);
-    $anonymous_comment4 = Comment::create(array(
+    $anonymous_comment4 = Comment::create([
       'cid' => $anonymous_comment4,
       'subject' => $subject,
       'comment_body' => $body,
       'entity_id' => $this->node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment'
-    ));
+    ]);
     $this->drupalLogout();
 
     $this->assertFalse($this->commentExists($anonymous_comment4), 'Anonymous comment was not published.');
@@ -139,7 +139,7 @@ class CommentAdminTest extends CommentTestBase {
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('comment/1/approve');
     $this->assertResponse(403, 'Forged comment approval was denied.');
-    $this->drupalGet('comment/1/approve', array('query' => array('token' => 'forged')));
+    $this->drupalGet('comment/1/approve', ['query' => ['token' => 'forged']]);
     $this->assertResponse(403, 'Forged comment approval was denied.');
     $this->drupalGet('comment/1/edit');
     $this->assertFieldChecked('edit-status-0');
@@ -178,11 +178,11 @@ class CommentAdminTest extends CommentTestBase {
    */
   public function testEditComment() {
     // Enable anonymous user comments.
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments',
       'post comments',
       'skip comment approval',
-    ));
+    ]);
 
     // Log in as a web user.
     $this->drupalLogin($this->webUser);
@@ -199,7 +199,7 @@ class CommentAdminTest extends CommentTestBase {
     // Post comment with contact info (required).
     $author_name = $this->randomMachineName();
     $author_mail = $this->randomMachineName() . '@example.com';
-    $anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), array('name' => $author_name, 'mail' => $author_mail));
+    $anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), ['name' => $author_name, 'mail' => $author_mail]);
 
     // Log in as an admin user.
     $this->drupalLogin($this->adminUser);
diff --git a/web/core/modules/comment/src/Tests/CommentAnonymousTest.php b/web/core/modules/comment/src/Tests/CommentAnonymousTest.php
index 2a5feb2f1..d60c0739f 100644
--- a/web/core/modules/comment/src/Tests/CommentAnonymousTest.php
+++ b/web/core/modules/comment/src/Tests/CommentAnonymousTest.php
@@ -15,22 +15,22 @@ class CommentAnonymousTest extends CommentTestBase {
     parent::setUp();
 
     // Enable anonymous and authenticated user comments.
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments',
       'post comments',
       'skip comment approval',
-    ));
-    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array(
+    ]);
+    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, [
       'access comments',
       'post comments',
       'skip comment approval',
-    ));
+    ]);
   }
 
   /**
    * Tests anonymous comment functionality.
    */
-  function testAnonymous() {
+  public function testAnonymous() {
     $this->drupalLogin($this->adminUser);
     $this->setCommentAnonymous(COMMENT_ANONYMOUS_MAYNOT_CONTACT);
     $this->drupalLogout();
@@ -66,10 +66,10 @@ class CommentAnonymousTest extends CommentTestBase {
     $this->assertTrue($this->commentExists($anonymous_comment1), 'Anonymous comment without contact info found.');
 
     // Ensure anonymous users cannot post in the name of registered users.
-    $edit = array(
+    $edit = [
       'name' => $this->adminUser->getUsername(),
       'comment_body[0][value]' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('comment/reply/node/' . $this->node->id() . '/comment', $edit, t('Save'));
     $this->assertRaw(t('The name you used (%name) belongs to a registered user.', [
       '%name' => $this->adminUser->getUsername(),
@@ -97,12 +97,12 @@ class CommentAnonymousTest extends CommentTestBase {
     $this->assertTrue($this->commentExists($anonymous_comment2), 'Anonymous comment with contact info (optional) found.');
 
     // Ensure anonymous users cannot post in the name of registered users.
-    $edit = array(
+    $edit = [
       'name' => $this->adminUser->getUsername(),
       'mail' => $this->randomMachineName() . '@example.com',
       'subject[0][value]' => $this->randomMachineName(),
       'comment_body[0][value]' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('comment/reply/node/' . $this->node->id() . '/comment', $edit, t('Save'));
     $this->assertRaw(t('The name you used (%name) belongs to a registered user.', [
       '%name' => $this->adminUser->getUsername(),
@@ -125,7 +125,7 @@ class CommentAnonymousTest extends CommentTestBase {
     // Post comment with contact info (required).
     $author_name = $this->randomMachineName();
     $author_mail = $this->randomMachineName() . '@example.com';
-    $anonymous_comment3 = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), array('name' => $author_name, 'mail' => $author_mail));
+    $anonymous_comment3 = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), ['name' => $author_name, 'mail' => $author_mail]);
     $this->assertTrue($this->commentExists($anonymous_comment3), 'Anonymous comment with contact info (required) found.');
 
     // Make sure the user data appears correctly when editing the comment.
@@ -159,11 +159,11 @@ class CommentAnonymousTest extends CommentTestBase {
     $this->assertResponse(403);
 
     // Reset.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => FALSE,
       'post comments' => FALSE,
       'skip comment approval' => FALSE,
-    ));
+    ]);
 
     // Attempt to view comments while disallowed.
     // NOTE: if authenticated user has permission to post comments, then a
@@ -176,21 +176,21 @@ class CommentAnonymousTest extends CommentTestBase {
     $this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
     $this->assertResponse(403);
 
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => TRUE,
       'post comments' => FALSE,
       'skip comment approval' => FALSE,
-    ));
+    ]);
     $this->drupalGet('node/' . $this->node->id());
     $this->assertPattern('@<h2[^>]*>Comments</h2>@', 'Comments were displayed.');
     $this->assertLink('Log in', 1, 'Link to login was found.');
     $this->assertLink('register', 1, 'Link to register was found.');
 
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => FALSE,
       'post comments' => TRUE,
       'skip comment approval' => TRUE,
-    ));
+    ]);
     $this->drupalGet('node/' . $this->node->id());
     $this->assertNoPattern('@<h2[^>]*>Comments</h2>@', 'Comments were not displayed.');
     $this->assertFieldByName('subject[0][value]', '', 'Subject field found.');
diff --git a/web/core/modules/comment/src/Tests/CommentBlockTest.php b/web/core/modules/comment/src/Tests/CommentBlockTest.php
index de92238dd..37cc5de62 100644
--- a/web/core/modules/comment/src/Tests/CommentBlockTest.php
+++ b/web/core/modules/comment/src/Tests/CommentBlockTest.php
@@ -17,12 +17,12 @@ class CommentBlockTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'views');
+  public static $modules = ['block', 'views'];
 
   protected function setUp() {
     parent::setUp();
     // Update admin user to have the 'administer blocks' permission.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer content types',
       'administer comments',
       'skip comment approval',
@@ -30,13 +30,13 @@ class CommentBlockTest extends CommentTestBase {
       'access comments',
       'access content',
       'administer blocks',
-     ));
+     ]);
   }
 
   /**
    * Tests the recent comments block.
    */
-  function testRecentCommentBlock() {
+  public function testRecentCommentBlock() {
     $this->drupalLogin($this->adminUser);
     $block = $this->drupalPlaceBlock('views_block:comments_recent-block_1');
 
@@ -54,10 +54,10 @@ class CommentBlockTest extends CommentTestBase {
     // Test that a user without the 'access comments' permission cannot see the
     // block.
     $this->drupalLogout();
-    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, array('access comments'));
+    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access comments']);
     $this->drupalGet('');
     $this->assertNoText(t('Recent comments'));
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access comments'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access comments']);
 
     // Test that a user with the 'access comments' permission can see the
     // block.
@@ -68,11 +68,11 @@ class CommentBlockTest extends CommentTestBase {
     // Test the only the 10 latest comments are shown and in the proper order.
     $this->assertNoText($comments[10]->getSubject(), 'Comment 11 not found in block.');
     for ($i = 0; $i < 10; $i++) {
-      $this->assertText($comments[$i]->getSubject(), SafeMarkup::format('Comment @number found in block.', array('@number' => 10 - $i)));
+      $this->assertText($comments[$i]->getSubject(), SafeMarkup::format('Comment @number found in block.', ['@number' => 10 - $i]));
       if ($i > 1) {
         $previous_position = $position;
         $position = strpos($this->getRawContent(), $comments[$i]->getSubject());
-        $this->assertTrue($position > $previous_position, SafeMarkup::format('Comment @a appears after comment @b', array('@a' => 10 - $i, '@b' => 11 - $i)));
+        $this->assertTrue($position > $previous_position, SafeMarkup::format('Comment @a appears after comment @b', ['@a' => 10 - $i, '@b' => 11 - $i]));
       }
       $position = strpos($this->getRawContent(), $comments[$i]->getSubject());
     }
diff --git a/web/core/modules/comment/src/Tests/CommentBookTest.php b/web/core/modules/comment/src/Tests/CommentBookTest.php
index b23028b42..4afd07ed8 100644
--- a/web/core/modules/comment/src/Tests/CommentBookTest.php
+++ b/web/core/modules/comment/src/Tests/CommentBookTest.php
@@ -21,7 +21,7 @@ class CommentBookTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('book', 'comment');
+  public static $modules = ['book', 'comment'];
 
   protected function setUp() {
     parent::setUp();
@@ -44,17 +44,17 @@ class CommentBookTest extends WebTestBase {
 
     $comment_subject = $this->randomMachineName(8);
     $comment_body = $this->randomMachineName(8);
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'subject' => $comment_subject,
       'comment_body' => $comment_body,
       'entity_id' => $book_node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment',
       'status' => CommentInterface::PUBLISHED,
-    ));
+    ]);
     $comment->save();
 
-    $commenting_user = $this->drupalCreateUser(array('access printer-friendly version', 'access comments', 'post comments'));
+    $commenting_user = $this->drupalCreateUser(['access printer-friendly version', 'access comments', 'post comments']);
     $this->drupalLogin($commenting_user);
 
     $this->drupalGet('node/' . $book_node->id());
diff --git a/web/core/modules/comment/src/Tests/CommentCSSTest.php b/web/core/modules/comment/src/Tests/CommentCSSTest.php
index f015f3fb3..b50e9527a 100644
--- a/web/core/modules/comment/src/Tests/CommentCSSTest.php
+++ b/web/core/modules/comment/src/Tests/CommentCSSTest.php
@@ -18,32 +18,32 @@ class CommentCSSTest extends CommentTestBase {
     parent::setUp();
 
     // Allow anonymous users to see comments.
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments',
       'access content'
-    ));
+    ]);
   }
 
   /**
    * Tests CSS classes on comments.
    */
-  function testCommentClasses() {
+  public function testCommentClasses() {
     // Create all permutations for comments, users, and nodes.
-    $parameters = array(
-      'node_uid' => array(0, $this->webUser->id()),
-      'comment_uid' => array(0, $this->webUser->id(), $this->adminUser->id()),
-      'comment_status' => array(CommentInterface::PUBLISHED, CommentInterface::NOT_PUBLISHED),
-      'user' => array('anonymous', 'authenticated', 'admin'),
-    );
+    $parameters = [
+      'node_uid' => [0, $this->webUser->id()],
+      'comment_uid' => [0, $this->webUser->id(), $this->adminUser->id()],
+      'comment_status' => [CommentInterface::PUBLISHED, CommentInterface::NOT_PUBLISHED],
+      'user' => ['anonymous', 'authenticated', 'admin'],
+    ];
     $permutations = $this->generatePermutations($parameters);
 
     foreach ($permutations as $case) {
       // Create a new node.
-      $node = $this->drupalCreateNode(array('type' => 'article', 'uid' => $case['node_uid']));
+      $node = $this->drupalCreateNode(['type' => 'article', 'uid' => $case['node_uid']]);
 
       // Add a comment.
       /** @var \Drupal\comment\CommentInterface $comment */
-      $comment = Comment::create(array(
+      $comment = Comment::create([
         'entity_id' => $node->id(),
         'entity_type' => 'node',
         'field_name' => 'comment',
@@ -51,8 +51,8 @@ class CommentCSSTest extends CommentTestBase {
         'status' => $case['comment_status'],
         'subject' => $this->randomMachineName(),
         'language' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-        'comment_body' => array(LanguageInterface::LANGCODE_NOT_SPECIFIED => array($this->randomMachineName())),
-      ));
+        'comment_body' => [LanguageInterface::LANGCODE_NOT_SPECIFIED => [$this->randomMachineName()]],
+      ]);
       $comment->save();
 
       // Adjust the current/viewing user.
diff --git a/web/core/modules/comment/src/Tests/CommentCacheTagsTest.php b/web/core/modules/comment/src/Tests/CommentCacheTagsTest.php
index 3c7ab0096..12e0ef845 100644
--- a/web/core/modules/comment/src/Tests/CommentCacheTagsTest.php
+++ b/web/core/modules/comment/src/Tests/CommentCacheTagsTest.php
@@ -24,7 +24,7 @@ class CommentCacheTagsTest extends EntityWithUriCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('comment');
+  public static $modules = ['comment'];
 
   /**
    * @var \Drupal\entity_test\Entity\EntityTest
@@ -66,24 +66,24 @@ class CommentCacheTagsTest extends EntityWithUriCacheTagsTestBase {
     $field->save();
 
     // Create a "Camelids" test entity that the comment will be assigned to.
-    $this->entityTestCamelid = EntityTest::create(array(
+    $this->entityTestCamelid = EntityTest::create([
       'name' => 'Camelids',
       'type' => 'bar',
-    ));
+    ]);
     $this->entityTestCamelid->save();
 
     // Create a "Llama" comment.
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'subject' => 'Llama',
-      'comment_body' => array(
+      'comment_body' => [
         'value' => 'The name "llama" was adopted by European settlers from native Peruvians.',
         'format' => 'plain_text',
-      ),
+      ],
       'entity_id' => $this->entityTestCamelid->id(),
       'entity_type' => 'entity_test',
       'field_name' => 'comment',
       'status' => CommentInterface::PUBLISHED,
-    ));
+    ]);
     $comment->save();
 
     return $comment;
@@ -97,26 +97,26 @@ class CommentCacheTagsTest extends EntityWithUriCacheTagsTestBase {
     $this->verifyPageCache($this->entityTestCamelid->urlInfo(), 'HIT');
 
     // Create a "Hippopotamus" comment.
-    $this->entityTestHippopotamidae = EntityTest::create(array(
+    $this->entityTestHippopotamidae = EntityTest::create([
       'name' => 'Hippopotamus',
       'type' => 'bar',
-    ));
+    ]);
     $this->entityTestHippopotamidae->save();
 
     $this->verifyPageCache($this->entityTestHippopotamidae->urlInfo(), 'MISS');
     $this->verifyPageCache($this->entityTestHippopotamidae->urlInfo(), 'HIT');
 
-    $hippo_comment = Comment::create(array(
+    $hippo_comment = Comment::create([
       'subject' => 'Hippopotamus',
-      'comment_body' => array(
+      'comment_body' => [
         'value' => 'The common hippopotamus (Hippopotamus amphibius), or hippo, is a large, mostly herbivorous mammal in sub-Saharan Africa',
         'format' => 'plain_text',
-      ),
+      ],
       'entity_id' => $this->entityTestHippopotamidae->id(),
       'entity_type' => 'entity_test',
       'field_name' => 'comment',
       'status' => CommentInterface::PUBLISHED,
-    ));
+    ]);
     $hippo_comment->save();
 
     // Ensure that a new comment only invalidates the commented entity.
@@ -145,11 +145,11 @@ class CommentCacheTagsTest extends EntityWithUriCacheTagsTestBase {
    */
   protected function getAdditionalCacheTagsForEntity(EntityInterface $entity) {
     /** @var \Drupal\comment\CommentInterface $entity */
-    return array(
+    return [
       'config:filter.format.plain_text',
       'user:' . $entity->getOwnerId(),
       'user_view',
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/comment/src/Tests/CommentFieldsTest.php b/web/core/modules/comment/src/Tests/CommentFieldsTest.php
index 46de1bea4..a463314a7 100644
--- a/web/core/modules/comment/src/Tests/CommentFieldsTest.php
+++ b/web/core/modules/comment/src/Tests/CommentFieldsTest.php
@@ -19,15 +19,15 @@ class CommentFieldsTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_ui');
+  public static $modules = ['field_ui'];
 
   /**
    * Tests that the default 'comment_body' field is correctly added.
    */
-  function testCommentDefaultFields() {
+  public function testCommentDefaultFields() {
     // Do not make assumptions on default node types created by the test
     // installation profile, and create our own.
-    $this->drupalCreateContentType(array('type' => 'test_node_type'));
+    $this->drupalCreateContentType(['type' => 'test_node_type']);
     $this->addDefaultCommentField('node', 'test_node_type');
 
     // Check that the 'comment_body' field is present on the comment bundle.
@@ -43,7 +43,7 @@ class CommentFieldsTest extends CommentTestBase {
 
     // Create a new content type.
     $type_name = 'test_node_type_2';
-    $this->drupalCreateContentType(array('type' => $type_name));
+    $this->drupalCreateContentType(['type' => $type_name]);
     $this->addDefaultCommentField('node', $type_name);
 
     // Check that the 'comment_body' field exists and has an instance on the
@@ -51,7 +51,7 @@ class CommentFieldsTest extends CommentTestBase {
     $field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
     $this->assertTrue($field_storage, 'The comment_body field exists');
     $field = FieldConfig::loadByName('comment', 'comment', 'comment_body');
-    $this->assertTrue(isset($field), format_string('The comment_body field is present for comments on type @type', array('@type' => $type_name)));
+    $this->assertTrue(isset($field), format_string('The comment_body field is present for comments on type @type', ['@type' => $type_name]));
 
     // Test adding a field that defaults to CommentItemInterface::CLOSED.
     $this->addDefaultCommentField('node', 'test_node_type', 'who_likes_ponies', CommentItemInterface::CLOSED, 'who_likes_ponies');
@@ -63,7 +63,7 @@ class CommentFieldsTest extends CommentTestBase {
    * Tests that you can remove a comment field.
    */
   public function testCommentFieldDelete() {
-    $this->drupalCreateContentType(array('type' => 'test_node_type'));
+    $this->drupalCreateContentType(['type' => 'test_node_type']);
     $this->addDefaultCommentField('node', 'test_node_type');
     // We want to test the handling of removing the primary comment field, so we
     // ensure there is at least one other comment field attached to a node type
@@ -71,10 +71,10 @@ class CommentFieldsTest extends CommentTestBase {
     $this->addDefaultCommentField('node', 'test_node_type', 'comment2');
 
     // Create a sample node.
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'title' => 'Baloney',
       'type' => 'test_node_type',
-    ));
+    ]);
 
     $this->drupalLogin($this->webUser);
 
@@ -143,38 +143,38 @@ class CommentFieldsTest extends CommentTestBase {
    */
   public function testCommentFieldCreate() {
     // Create user who can administer user fields.
-    $user = $this->drupalCreateUser(array(
+    $user = $this->drupalCreateUser([
       'administer user fields',
-    ));
+    ]);
     $this->drupalLogin($user);
 
     // Create comment field in account settings.
-    $edit = array(
+    $edit = [
       'new_storage_type' => 'comment',
       'label' => 'User comment',
       'field_name' => 'user_comment',
-    );
+    ];
     $this->drupalPostForm('admin/config/people/accounts/fields/add-field', $edit, 'Save and continue');
 
     // Try to save the comment field without selecting a comment type.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('admin/config/people/accounts/fields/user.user.field_user_comment/storage', $edit, t('Save field settings'));
     // We should get an error message.
     $this->assertText(t('An illegal choice has been detected. Please contact the site administrator.'));
 
     // Create a comment type for users.
-    $bundle = CommentType::create(array(
+    $bundle = CommentType::create([
       'id' => 'user_comment_type',
       'label' => 'user_comment_type',
       'description' => '',
       'target_entity_type_id' => 'user',
-    ));
+    ]);
     $bundle->save();
 
     // Select a comment type and try to save again.
-    $edit = array(
+    $edit = [
       'settings[comment_type]' => 'user_comment_type',
-    );
+    ];
     $this->drupalPostForm('admin/config/people/accounts/fields/user.user.field_user_comment/storage', $edit, t('Save field settings'));
     // We shouldn't get an error message.
     $this->assertNoText(t('An illegal choice has been detected. Please contact the site administrator.'));
@@ -183,9 +183,9 @@ class CommentFieldsTest extends CommentTestBase {
   /**
    * Tests that comment module works when installed after a content module.
    */
-  function testCommentInstallAfterContentModule() {
+  public function testCommentInstallAfterContentModule() {
     // Create a user to do module administration.
-    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'administer modules'));
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer modules']);
     $this->drupalLogin($this->adminUser);
 
     // Drop default comment field added in CommentTestBase::setup().
@@ -199,35 +199,35 @@ class CommentFieldsTest extends CommentTestBase {
     field_purge_batch(10);
 
     // Uninstall the comment module.
-    $edit = array();
+    $edit = [];
     $edit['uninstall[comment]'] = TRUE;
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
-    $this->drupalPostForm(NULL, array(), t('Uninstall'));
+    $this->drupalPostForm(NULL, [], t('Uninstall'));
     $this->rebuildContainer();
     $this->assertFalse($this->container->get('module_handler')->moduleExists('comment'), 'Comment module uninstalled.');
 
     // Install core content type module (book).
-    $edit = array();
-    $edit['modules[Core][book][enable]'] = 'book';
+    $edit = [];
+    $edit['modules[book][enable]'] = 'book';
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Now install the comment module.
-    $edit = array();
-    $edit['modules[Core][comment][enable]'] = 'comment';
+    $edit = [];
+    $edit['modules[comment][enable]'] = 'comment';
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->rebuildContainer();
     $this->assertTrue($this->container->get('module_handler')->moduleExists('comment'), 'Comment module enabled.');
 
     // Create nodes of each type.
     $this->addDefaultCommentField('node', 'book');
-    $book_node = $this->drupalCreateNode(array('type' => 'book'));
+    $book_node = $this->drupalCreateNode(['type' => 'book']);
 
     $this->drupalLogout();
 
     // Try to post a comment on each node. A failure will be triggered if the
     // comment body is missing on one of these forms, due to postComment()
     // asserting that the body is actually posted correctly.
-    $this->webUser = $this->drupalCreateUser(array('access content', 'access comments', 'post comments', 'skip comment approval'));
+    $this->webUser = $this->drupalCreateUser(['access content', 'access comments', 'post comments', 'skip comment approval']);
     $this->drupalLogin($this->webUser);
     $this->postComment($book_node, $this->randomMachineName(), $this->randomMachineName());
   }
diff --git a/web/core/modules/comment/src/Tests/CommentInterfaceTest.php b/web/core/modules/comment/src/Tests/CommentInterfaceTest.php
index ba43224c7..6f67ca84d 100644
--- a/web/core/modules/comment/src/Tests/CommentInterfaceTest.php
+++ b/web/core/modules/comment/src/Tests/CommentInterfaceTest.php
@@ -68,7 +68,7 @@ class CommentInterfaceTest extends CommentTestBase {
 
     // Comment as anonymous with preview required.
     $this->drupalLogout();
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access content', 'access comments', 'post comments', 'skip comment approval'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access content', 'access comments', 'post comments', 'skip comment approval']);
     $anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $this->assertTrue($this->commentExists($anonymous_comment), 'Comment found.');
     $anonymous_comment->delete();
@@ -92,24 +92,24 @@ class CommentInterfaceTest extends CommentTestBase {
     $this->setCommentPreview(DRUPAL_OPTIONAL);
 
     $this->drupalGet('comment/' . $comment->id() . '/edit');
-    $this->assertTitle(t('Edit comment @title | Drupal', array(
+    $this->assertTitle(t('Edit comment @title | Drupal', [
       '@title' => $comment->getSubject(),
-    )));
+    ]));
 
     // Test changing the comment author to "Anonymous".
-    $comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), array('uid' => ''));
+    $comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), ['uid' => '']);
     $this->assertTrue($comment->getAuthorName() == t('Anonymous') && $comment->getOwnerId() == 0, 'Comment author successfully changed to anonymous.');
 
     // Test changing the comment author to an unverified user.
     $random_name = $this->randomMachineName();
     $this->drupalGet('comment/' . $comment->id() . '/edit');
-    $comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), array('name' => $random_name));
+    $comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), ['name' => $random_name]);
     $this->drupalGet('node/' . $this->node->id());
     $this->assertText($random_name . ' (' . t('not verified') . ')', 'Comment author successfully changed to an unverified user.');
 
     // Test changing the comment author to a verified user.
     $this->drupalGet('comment/' . $comment->id() . '/edit');
-    $comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), array('uid' => $this->webUser->getUsername() . ' (' . $this->webUser->id() . ')'));
+    $comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), ['uid' => $this->webUser->getUsername() . ' (' . $this->webUser->id() . ')']);
     $this->assertTrue($comment->getAuthorName() == $this->webUser->getUsername() && $comment->getOwnerId() == $this->webUser->id(), 'Comment author successfully changed to a registered user.');
 
     $this->drupalLogout();
@@ -121,7 +121,7 @@ class CommentInterfaceTest extends CommentTestBase {
     // \Drupal\comment\Controller\CommentController::redirectNode().
     $this->drupalGet('comment/' . $this->node->id() . '/reply');
     // Verify we were correctly redirected.
-    $this->assertUrl(\Drupal::url('comment.reply', array('entity_type' => 'node', 'entity' => $this->node->id(), 'field_name' => 'comment'), array('absolute' => TRUE)));
+    $this->assertUrl(\Drupal::url('comment.reply', ['entity_type' => 'node', 'entity' => $this->node->id(), 'field_name' => 'comment'], ['absolute' => TRUE]));
     $this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $comment->id());
     $this->assertText($subject_text, 'Individual comment-reply subject found.');
     $this->assertText($comment_text, 'Individual comment-reply body found.');
@@ -161,7 +161,7 @@ class CommentInterfaceTest extends CommentTestBase {
     $this->setCommentsPerPage(2);
     $comment_new_page = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $this->assertTrue($this->commentExists($comment_new_page), 'Page one exists. %s');
-    $this->drupalGet('node/' . $this->node->id(), array('query' => array('page' => 2)));
+    $this->drupalGet('node/' . $this->node->id(), ['query' => ['page' => 2]]);
     $this->assertTrue($this->commentExists($reply, TRUE), 'Page two exists. %s');
     $this->setCommentsPerPage(50);
 
@@ -172,21 +172,21 @@ class CommentInterfaceTest extends CommentTestBase {
     $this->assertResponse(403);
 
     // Attempt to post to node with comments disabled.
-    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => array(array('status' => CommentItemInterface::HIDDEN))));
+    $this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'comment' => [['status' => CommentItemInterface::HIDDEN]]]);
     $this->assertTrue($this->node, 'Article node created.');
     $this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
     $this->assertResponse(403);
     $this->assertNoField('edit-comment', 'Comment body field found.');
 
     // Attempt to post to node with read-only comments.
-    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => array(array('status' => CommentItemInterface::CLOSED))));
+    $this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'comment' => [['status' => CommentItemInterface::CLOSED]]]);
     $this->assertTrue($this->node, 'Article node created.');
     $this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
     $this->assertResponse(403);
     $this->assertNoField('edit-comment', 'Comment body field found.');
 
     // Attempt to post to node with comments enabled (check field names etc).
-    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => array(array('status' => CommentItemInterface::OPEN))));
+    $this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'comment' => [['status' => CommentItemInterface::OPEN]]]);
     $this->assertTrue($this->node, 'Article node created.');
     $this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
     $this->assertNoText('This discussion is closed', 'Posting to node with comments enabled');
@@ -254,17 +254,17 @@ class CommentInterfaceTest extends CommentTestBase {
     // can select one of them. Then create a user that can use these formats,
     // log the user in, and then GET the node page on which to test the
     // comments.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
-    ));
+    ]);
     $filtered_html_format->save();
-    $full_html_format = FilterFormat::create(array(
+    $full_html_format = FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
-    ));
+    ]);
     $full_html_format->save();
-    $html_user = $this->drupalCreateUser(array(
+    $html_user = $this->drupalCreateUser([
       'access comments',
       'post comments',
       'edit own comments',
@@ -272,25 +272,25 @@ class CommentInterfaceTest extends CommentTestBase {
       'access content',
       $filtered_html_format->getPermissionName(),
       $full_html_format->getPermissionName(),
-    ));
+    ]);
     $this->drupalLogin($html_user);
     $this->drupalGet('node/' . $this->node->id());
 
     // HTML should not be included in the character count.
     $body_text1 = '<span></span><strong> </strong><span> </span><strong></strong>Hello World<br />';
-    $edit1 = array(
+    $edit1 = [
       'comment_body[0][value]' => $body_text1,
       'comment_body[0][format]' => 'filtered_html',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit1, t('Save'));
     $this->assertEqual('Hello World', Comment::load(1)->getSubject());
 
     // If there's nothing other than HTML, the subject should be '(No subject)'.
     $body_text2 = '<span></span><strong> </strong><span> </span><strong></strong> <br />';
-    $edit2 = array(
+    $edit2 = [
       'comment_body[0][value]' => $body_text2,
       'comment_body[0][format]' => 'filtered_html',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit2, t('Save'));
     $this->assertEqual('(No subject)', Comment::load(2)->getSubject());
   }
diff --git a/web/core/modules/comment/src/Tests/CommentLanguageTest.php b/web/core/modules/comment/src/Tests/CommentLanguageTest.php
index c60f82783..eee0862ec 100644
--- a/web/core/modules/comment/src/Tests/CommentLanguageTest.php
+++ b/web/core/modules/comment/src/Tests/CommentLanguageTest.php
@@ -25,23 +25,23 @@ class CommentLanguageTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'language', 'language_test', 'comment_test');
+  public static $modules = ['node', 'language', 'language_test', 'comment_test'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
 
     // Create and log in user.
-    $admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer languages', 'access administration pages', 'administer content types', 'administer comments', 'create article content', 'access comments', 'post comments', 'skip comment approval'));
+    $admin_user = $this->drupalCreateUser(['administer site configuration', 'administer languages', 'access administration pages', 'administer content types', 'administer comments', 'create article content', 'access comments', 'post comments', 'skip comment approval']);
     $this->drupalLogin($admin_user);
 
     // Add language.
-    $edit = array('predefined_langcode' => 'fr');
+    $edit = ['predefined_langcode' => 'fr'];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Set "Article" content type to use multilingual support.
-    $edit = array('language_configuration[language_alterable]' => TRUE);
+    $edit = ['language_configuration[language_alterable]' => TRUE];
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
 
     // Enable content language negotiation UI.
@@ -51,16 +51,16 @@ class CommentLanguageTest extends WebTestBase {
     // to URL. Disable inheritance from interface language to ensure content
     // language will fall back to the default language if no URL language can be
     // detected.
-    $edit = array(
+    $edit = [
       'language_interface[enabled][language-user]' => TRUE,
       'language_content[enabled][language-url]' => TRUE,
       'language_content[enabled][language-interface]' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Change user language preference, this way interface language is always
     // French no matter what path prefix the URLs have.
-    $edit = array('preferred_langcode' => 'fr');
+    $edit = ['preferred_langcode' => 'fr'];
     $this->drupalPostForm("user/" . $admin_user->id() . "/edit", $edit, t('Save'));
 
     // Create comment field on article.
@@ -76,7 +76,7 @@ class CommentLanguageTest extends WebTestBase {
   /**
    * Test that comment language is properly set.
    */
-  function testCommentLanguage() {
+  public function testCommentLanguage() {
 
     // Create two nodes, one for english and one for french, and comment each
     // node using both english and french as content language by changing URL
@@ -87,12 +87,12 @@ class CommentLanguageTest extends WebTestBase {
     foreach ($this->container->get('language_manager')->getLanguages() as $node_langcode => $node_language) {
       // Create "Article" content.
       $title = $this->randomMachineName();
-      $edit = array(
+      $edit = [
         'title[0][value]' => $title,
         'body[0][value]' => $this->randomMachineName(),
         'langcode[0][value]' => $node_langcode,
         'comment[0][status]' => CommentItemInterface::OPEN,
-      );
+      ];
       $this->drupalPostForm("node/add/article", $edit, t('Save'));
       $node = $this->drupalGetNodeByTitle($title);
 
@@ -101,10 +101,10 @@ class CommentLanguageTest extends WebTestBase {
         // Post a comment with content language $langcode.
         $prefix = empty($prefixes[$langcode]) ? '' : $prefixes[$langcode] . '/';
         $comment_values[$node_langcode][$langcode] = $this->randomMachineName();
-        $edit = array(
+        $edit = [
           'subject[0][value]' => $this->randomMachineName(),
           'comment_body[0][value]' => $comment_values[$node_langcode][$langcode],
-        );
+        ];
         $this->drupalPostForm($prefix . 'node/' . $node->id(), $edit, t('Preview'));
         $this->drupalPostForm(NULL, $edit, t('Save'));
 
@@ -117,7 +117,7 @@ class CommentLanguageTest extends WebTestBase {
           ->range(0, 1)
           ->execute();
         $comment = Comment::load(reset($cids));
-        $args = array('%node_language' => $node_langcode, '%comment_language' => $comment->langcode->value, '%langcode' => $langcode);
+        $args = ['%node_language' => $node_langcode, '%comment_language' => $comment->langcode->value, '%langcode' => $langcode];
         $this->assertEqual($comment->langcode->value, $langcode, format_string('The comment posted with content language %langcode and belonging to the node with language %node_language has language %comment_language', $args));
         $this->assertEqual($comment->comment_body->value, $comment_values[$node_langcode][$langcode], 'Comment body correctly stored.');
       }
diff --git a/web/core/modules/comment/src/Tests/CommentLinksAlterTest.php b/web/core/modules/comment/src/Tests/CommentLinksAlterTest.php
index 22ff587c3..88e092f08 100644
--- a/web/core/modules/comment/src/Tests/CommentLinksAlterTest.php
+++ b/web/core/modules/comment/src/Tests/CommentLinksAlterTest.php
@@ -9,7 +9,7 @@ namespace Drupal\comment\Tests;
  */
 class CommentLinksAlterTest extends CommentTestBase {
 
-  public static $modules = array('comment_test');
+  public static $modules = ['comment_test'];
 
   protected function setUp() {
     parent::setUp();
diff --git a/web/core/modules/comment/src/Tests/CommentLinksTest.php b/web/core/modules/comment/src/Tests/CommentLinksTest.php
index 1115f5793..589a35566 100644
--- a/web/core/modules/comment/src/Tests/CommentLinksTest.php
+++ b/web/core/modules/comment/src/Tests/CommentLinksTest.php
@@ -27,7 +27,7 @@ class CommentLinksTest extends CommentTestBase {
    *
    * @var array
    */
-  protected $seen = array();
+  protected $seen = [];
 
   /**
    * Use the main node listing to test rendering on teasers.
@@ -36,14 +36,14 @@ class CommentLinksTest extends CommentTestBase {
    *
    * @todo Remove this dependency.
    */
-  public static $modules = array('views');
+  public static $modules = ['views'];
 
   /**
    * Tests that comment links are output and can be hidden.
    */
   public function testCommentLinks() {
     // Bartik theme alters comment links, so use a different theme.
-    \Drupal::service('theme_handler')->install(array('stark'));
+    \Drupal::service('theme_handler')->install(['stark']);
     $this->config('system.theme')
       ->set('default', 'stark')
       ->save();
@@ -51,11 +51,11 @@ class CommentLinksTest extends CommentTestBase {
     // Remove additional user permissions from $this->webUser added by setUp(),
     // since this test is limited to anonymous and authenticated roles only.
     $roles = $this->webUser->getRoles();
-    entity_delete_multiple('user_role', array(reset($roles)));
+    entity_delete_multiple('user_role', [reset($roles)]);
 
     // Create a comment via CRUD API functionality, since
     // $this->postComment() relies on actual user permissions.
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'cid' => NULL,
       'entity_id' => $this->node->id(),
       'entity_type' => 'node',
@@ -66,8 +66,8 @@ class CommentLinksTest extends CommentTestBase {
       'subject' => $this->randomMachineName(),
       'hostname' => '127.0.0.1',
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      'comment_body' => array(array('value' => $this->randomMachineName())),
-    ));
+      'comment_body' => [['value' => $this->randomMachineName()]],
+    ]);
     $comment->save();
     $this->comment = $comment;
 
@@ -78,19 +78,19 @@ class CommentLinksTest extends CommentTestBase {
     $this->node->save();
 
     // Change user permissions.
-    $perms = array(
+    $perms = [
       'access comments' => 1,
       'post comments' => 1,
       'skip comment approval' => 1,
       'edit own comments' => 1,
-    );
+    ];
     user_role_change_permissions(RoleInterface::ANONYMOUS_ID, $perms);
 
     $nid = $this->node->id();
 
     // Assert basic link is output, actual functionality is unit-tested in
     // \Drupal\comment\Tests\CommentLinkBuilderTest.
-    foreach (array('node', "node/$nid") as $path) {
+    foreach (['node', "node/$nid"] as $path) {
       $this->drupalGet($path);
 
       // In teaser view, a link containing the comment count is always
@@ -103,7 +103,7 @@ class CommentLinksTest extends CommentTestBase {
 
     // Change weight to make links go before comment body.
     entity_get_display('comment', 'comment', 'default')
-      ->setComponent('links', array('weight' => -100))
+      ->setComponent('links', ['weight' => -100])
       ->save();
     $this->drupalGet($this->node->urlInfo());
     $element = $this->cssSelect('article.js-comment > div');
@@ -113,7 +113,7 @@ class CommentLinksTest extends CommentTestBase {
 
     // Change weight to make links go after comment body.
     entity_get_display('comment', 'comment', 'default')
-      ->setComponent('links', array('weight' => 100))
+      ->setComponent('links', ['weight' => 100])
       ->save();
     $this->drupalGet($this->node->urlInfo());
     $element = $this->cssSelect('article.js-comment > div');
diff --git a/web/core/modules/comment/src/Tests/CommentNewIndicatorTest.php b/web/core/modules/comment/src/Tests/CommentNewIndicatorTest.php
index 6d89d4a64..55609e377 100644
--- a/web/core/modules/comment/src/Tests/CommentNewIndicatorTest.php
+++ b/web/core/modules/comment/src/Tests/CommentNewIndicatorTest.php
@@ -22,7 +22,7 @@ class CommentNewIndicatorTest extends CommentTestBase {
    *
    * @todo Remove this dependency.
    */
-  public static $modules = array('views');
+  public static $modules = ['views'];
 
   /**
    * Get node "x new comments" metadata from the server for the current user.
@@ -35,7 +35,7 @@ class CommentNewIndicatorTest extends CommentTestBase {
    */
   protected function renderNewCommentsNodeLinks(array $node_ids) {
     // Build POST values.
-    $post = array();
+    $post = [];
     for ($i = 0; $i < count($node_ids); $i++) {
       $post['node_ids[' . $i . ']'] = $node_ids[$i];
     }
@@ -51,15 +51,15 @@ class CommentNewIndicatorTest extends CommentTestBase {
     $post = implode('&', $post);
 
     // Perform HTTP request.
-    return $this->curlExec(array(
-      CURLOPT_URL => \Drupal::url('comment.new_comments_node_links', array(), array('absolute' => TRUE)),
+    return $this->curlExec([
+      CURLOPT_URL => \Drupal::url('comment.new_comments_node_links', [], ['absolute' => TRUE]),
       CURLOPT_POST => TRUE,
       CURLOPT_POSTFIELDS => $post,
-      CURLOPT_HTTPHEADER => array(
+      CURLOPT_HTTPHEADER => [
         'Accept: application/json',
         'Content-Type: application/x-www-form-urlencoded',
-      ),
-    ));
+      ],
+    ]);
   }
 
   /**
@@ -70,7 +70,7 @@ class CommentNewIndicatorTest extends CommentTestBase {
     // node.
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('node');
-    $this->assertNoLink(t('@count comments', array('@count' => 0)));
+    $this->assertNoLink(t('@count comments', ['@count' => 0]));
     $this->assertLink(t('Read more'));
     // Verify the data-history-node-last-comment-timestamp attribute, which is
     // used by the drupal.node-new-comments-link library to determine whether
@@ -81,7 +81,7 @@ class CommentNewIndicatorTest extends CommentTestBase {
     // Create a new comment. This helper function may be run with different
     // comment settings so use $comment->save() to avoid complex setup.
     /** @var \Drupal\comment\CommentInterface $comment */
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'cid' => NULL,
       'entity_id' => $this->node->id(),
       'entity_type' => 'node',
@@ -92,8 +92,8 @@ class CommentNewIndicatorTest extends CommentTestBase {
       'subject' => $this->randomMachineName(),
       'hostname' => '127.0.0.1',
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      'comment_body' => array(LanguageInterface::LANGCODE_NOT_SPECIFIED => array($this->randomMachineName())),
-    ));
+      'comment_body' => [LanguageInterface::LANGCODE_NOT_SPECIFIED => [$this->randomMachineName()]],
+    ]);
     $comment->save();
     $this->drupalLogout();
 
@@ -126,24 +126,24 @@ class CommentNewIndicatorTest extends CommentTestBase {
     ]);
     // Pretend the data was not present in drupalSettings, i.e. test the
     // separate request to the server.
-    $response = $this->renderNewCommentsNodeLinks(array($this->node->id()));
+    $response = $this->renderNewCommentsNodeLinks([$this->node->id()]);
     $this->assertResponse(200);
     $json = Json::decode($response);
-    $expected = array($this->node->id() => array(
+    $expected = [$this->node->id() => [
       'new_comment_count' => 1,
-      'first_new_comment_link' => $this->node->url('canonical', array('fragment' => 'new')),
-    ));
+      'first_new_comment_link' => $this->node->url('canonical', ['fragment' => 'new']),
+    ]];
     $this->assertIdentical($expected, $json);
 
     // Failing to specify node IDs for the endpoint should return a 404.
-    $this->renderNewCommentsNodeLinks(array());
+    $this->renderNewCommentsNodeLinks([]);
     $this->assertResponse(404);
 
     // Accessing the endpoint as the anonymous user should return a 403.
     $this->drupalLogout();
-    $this->renderNewCommentsNodeLinks(array($this->node->id()));
+    $this->renderNewCommentsNodeLinks([$this->node->id()]);
     $this->assertResponse(403);
-    $this->renderNewCommentsNodeLinks(array());
+    $this->renderNewCommentsNodeLinks([]);
     $this->assertResponse(403);
   }
 
diff --git a/web/core/modules/comment/src/Tests/CommentNodeAccessTest.php b/web/core/modules/comment/src/Tests/CommentNodeAccessTest.php
index e69bfdeda..ffbffa1ff 100644
--- a/web/core/modules/comment/src/Tests/CommentNodeAccessTest.php
+++ b/web/core/modules/comment/src/Tests/CommentNodeAccessTest.php
@@ -19,7 +19,7 @@ class CommentNodeAccessTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_access_test');
+  public static $modules = ['node_access_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -27,14 +27,14 @@ class CommentNodeAccessTest extends CommentTestBase {
     node_access_rebuild();
 
     // Re-create user.
-    $this->webUser = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser([
       'access comments',
       'post comments',
       'create article content',
       'edit own comments',
       'node test view',
       'skip comment approval',
-    ));
+    ]);
 
     // Set the author of the created node to the web_user uid.
     $this->node->setOwnerId($this->webUser->id())->save();
@@ -43,7 +43,7 @@ class CommentNodeAccessTest extends CommentTestBase {
   /**
    * Test that threaded comments can be viewed.
    */
-  function testThreadedCommentView() {
+  public function testThreadedCommentView() {
     // Set comments to have subject required and preview disabled.
     $this->drupalLogin($this->adminUser);
     $this->setCommentPreview(DRUPAL_DISABLED);
diff --git a/web/core/modules/comment/src/Tests/CommentNodeChangesTest.php b/web/core/modules/comment/src/Tests/CommentNodeChangesTest.php
index 9fed4df88..148198d00 100644
--- a/web/core/modules/comment/src/Tests/CommentNodeChangesTest.php
+++ b/web/core/modules/comment/src/Tests/CommentNodeChangesTest.php
@@ -16,7 +16,7 @@ class CommentNodeChangesTest extends CommentTestBase {
   /**
    * Tests that comments are deleted with the node.
    */
-  function testNodeDeletion() {
+  public function testNodeDeletion() {
     $this->drupalLogin($this->webUser);
     $comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName());
     $this->assertTrue($comment->id(), 'The comment could be loaded.');
@@ -27,7 +27,7 @@ class CommentNodeChangesTest extends CommentTestBase {
     $this->assertNotNull(FieldStorageConfig::load('node.comment'), 'Comment field storage exists');
     $this->assertNotNull(FieldConfig::load('node.article.comment'), 'Comment field exists');
     // Delete the node type.
-    entity_delete_multiple('node_type', array($this->node->bundle()));
+    entity_delete_multiple('node_type', [$this->node->bundle()]);
     $this->assertNull(FieldStorageConfig::load('node.comment'), 'Comment field storage deleted');
     $this->assertNull(FieldConfig::load('node.article.comment'), 'Comment field deleted');
   }
diff --git a/web/core/modules/comment/src/Tests/CommentNonNodeTest.php b/web/core/modules/comment/src/Tests/CommentNonNodeTest.php
index e43e0bc42..3c285d8f1 100644
--- a/web/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/web/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -24,7 +24,7 @@ class CommentNonNodeTest extends WebTestBase {
   use FieldUiTestTrait;
   use CommentTestTrait;
 
-  public static $modules = array('comment', 'user', 'field_ui', 'entity_test', 'block');
+  public static $modules = ['comment', 'user', 'field_ui', 'entity_test', 'block'];
 
   /**
    * An administrative user with permission to configure comment settings.
@@ -50,12 +50,12 @@ class CommentNonNodeTest extends WebTestBase {
 
     // Create a bundle for entity_test.
     entity_test_create_bundle('entity_test', 'Entity Test', 'entity_test');
-    CommentType::create(array(
+    CommentType::create([
       'id' => 'comment',
       'label' => 'Comment settings',
       'description' => 'Comment settings',
       'target_entity_type_id' => 'entity_test',
-    ))->save();
+    ])->save();
     // Create comment field on entity_test bundle.
     $this->addDefaultCommentField('entity_test', 'entity_test');
 
@@ -64,30 +64,30 @@ class CommentNonNodeTest extends WebTestBase {
     $this->assertEqual($bundles['comment']['label'], 'Comment settings');
 
     // Create test user.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer comments',
       'skip comment approval',
       'post comments',
       'access comments',
       'view test entity',
       'administer entity_test content',
-    ));
+    ]);
 
     // Enable anonymous and authenticated user comments.
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments',
       'post comments',
       'skip comment approval',
-    ));
-    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array(
+    ]);
+    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, [
       'access comments',
       'post comments',
       'skip comment approval',
-    ));
+    ]);
 
     // Create a test entity.
     $random_label = $this->randomMachineName();
-    $data = array('type' => 'entity_test', 'name' => $random_label);
+    $data = ['type' => 'entity_test', 'name' => $random_label];
     $this->entity = EntityTest::create($data);
     $this->entity->save();
   }
@@ -108,8 +108,8 @@ class CommentNonNodeTest extends WebTestBase {
    * @return \Drupal\comment\CommentInterface
    *   The new comment entity.
    */
-  function postComment(EntityInterface $entity, $comment, $subject = '', $contact = NULL) {
-    $edit = array();
+  public function postComment(EntityInterface $entity, $comment, $subject = '', $contact = NULL) {
+    $edit = [];
     $edit['comment_body[0][value]'] = $comment;
 
     $field = FieldConfig::loadByName('entity_test', 'entity_test', 'comment');
@@ -151,7 +151,7 @@ class CommentNonNodeTest extends WebTestBase {
         $this->drupalPostForm(NULL, $edit, t('Save'));
         break;
     }
-    $match = array();
+    $match = [];
     // Get comment ID
     preg_match('/#comment-([0-9]+)/', $this->getURL(), $match);
 
@@ -180,7 +180,7 @@ class CommentNonNodeTest extends WebTestBase {
    * @return bool
    *   Boolean indicating whether the comment was found.
    */
-  function commentExists(CommentInterface $comment = NULL, $reply = FALSE) {
+  public function commentExists(CommentInterface $comment = NULL, $reply = FALSE) {
     if ($comment) {
       $regex = '/' . ($reply ? '<div class="indented">(.*?)' : '');
       $regex .= '<a id="comment-' . $comment->id() . '"(.*?)';
@@ -201,7 +201,7 @@ class CommentNonNodeTest extends WebTestBase {
    * @return bool
    *   Contact info is available.
    */
-  function commentContactInfoAvailable() {
+  public function commentContactInfoAvailable() {
     return preg_match('/(input).*?(name="name").*?(input).*?(name="mail").*?(input).*?(name="homepage")/s', $this->getRawContent());
   }
 
@@ -215,18 +215,18 @@ class CommentNonNodeTest extends WebTestBase {
    * @param bool $approval
    *   Operation is found on approval page.
    */
-  function performCommentOperation($comment, $operation, $approval = FALSE) {
-    $edit = array();
+  public function performCommentOperation($comment, $operation, $approval = FALSE) {
+    $edit = [];
     $edit['operation'] = $operation;
     $edit['comments[' . $comment->id() . ']'] = TRUE;
     $this->drupalPostForm('admin/content/comment' . ($approval ? '/approval' : ''), $edit, t('Update'));
 
     if ($operation == 'delete') {
-      $this->drupalPostForm(NULL, array(), t('Delete comments'));
-      $this->assertRaw(\Drupal::translation()->formatPlural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation)));
+      $this->drupalPostForm(NULL, [], t('Delete comments'));
+      $this->assertRaw(\Drupal::translation()->formatPlural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', ['@operation' => $operation]));
     }
     else {
-      $this->assertText(t('The update has been performed.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation)));
+      $this->assertText(t('The update has been performed.'), format_string('Operation "@operation" was performed on comment.', ['@operation' => $operation]));
     }
   }
 
@@ -239,7 +239,7 @@ class CommentNonNodeTest extends WebTestBase {
    * @return int
    *   Comment ID.
    */
-  function getUnapprovedComment($subject) {
+  public function getUnapprovedComment($subject) {
     $this->drupalGet('admin/content/comment/approval');
     preg_match('/href="(.*?)#comment-([^"]+)"(.*?)>(' . $subject . ')/', $this->getRawContent(), $match);
 
@@ -249,10 +249,10 @@ class CommentNonNodeTest extends WebTestBase {
   /**
    * Tests anonymous comment functionality.
    */
-  function testCommentFunctionality() {
-    $limited_user = $this->drupalCreateUser(array(
+  public function testCommentFunctionality() {
+    $limited_user = $this->drupalCreateUser([
       'administer entity_test fields'
-    ));
+    ]);
     $this->drupalLogin($limited_user);
     // Test that default field exists.
     $this->drupalGet('entity_test/structure/entity_test/fields');
@@ -320,9 +320,9 @@ class CommentNonNodeTest extends WebTestBase {
 
     // Check that entity access applies to administrative page.
     $this->assertText($this->entity->label(), 'Name of commented account found.');
-    $limited_user = $this->drupalCreateUser(array(
+    $limited_user = $this->drupalCreateUser([
       'administer comments',
-    ));
+    ]);
     $this->drupalLogin($limited_user);
     $this->drupalGet('admin/content/comment');
     $this->assertNoText($this->entity->label(), 'No commented account name found.');
@@ -330,12 +330,12 @@ class CommentNonNodeTest extends WebTestBase {
     $this->drupalLogout();
 
     // Deny anonymous users access to comments.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => FALSE,
       'post comments' => FALSE,
       'skip comment approval' => FALSE,
       'view test entity' => TRUE,
-    ));
+    ]);
 
     // Attempt to view comments while disallowed.
     $this->drupalGet('entity-test/' . $this->entity->id());
@@ -348,12 +348,12 @@ class CommentNonNodeTest extends WebTestBase {
     $this->assertNoFieldByName('subject[0][value]', '', 'Subject field not found.');
     $this->assertNoFieldByName('comment_body[0][value]', '', 'Comment field not found.');
 
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => TRUE,
       'post comments' => FALSE,
       'view test entity' => TRUE,
       'skip comment approval' => FALSE,
-    ));
+    ]);
     $this->drupalGet('entity_test/' . $this->entity->id());
     $this->assertPattern('@<h2[^>]*>Comments</h2>@', 'Comments were displayed.');
     $this->assertLink('Log in', 0, 'Link to login was found.');
@@ -364,12 +364,12 @@ class CommentNonNodeTest extends WebTestBase {
     // Test the combination of anonymous users being able to post, but not view
     // comments, to ensure that access to post comments doesn't grant access to
     // view them.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => FALSE,
       'post comments' => TRUE,
       'skip comment approval' => TRUE,
       'view test entity' => TRUE,
-    ));
+    ]);
     $this->drupalGet('entity_test/' . $this->entity->id());
     $this->assertNoPattern('@<h2[^>]*>Comments</h2>@', 'Comments were not displayed.');
     $this->assertFieldByName('subject[0][value]', '', 'Subject field found.');
@@ -380,22 +380,22 @@ class CommentNonNodeTest extends WebTestBase {
     $this->assertNoText($comment1->getSubject(), 'Comment not displayed.');
 
     // Test comment field widget changes.
-    $limited_user = $this->drupalCreateUser(array(
+    $limited_user = $this->drupalCreateUser([
       'administer entity_test fields',
       'view test entity',
       'administer entity_test content',
       'administer comments',
-    ));
+    ]);
     $this->drupalLogin($limited_user);
     $this->drupalGet('entity_test/structure/entity_test/fields/entity_test.entity_test.comment');
     $this->assertNoFieldChecked('edit-default-value-input-comment-0-status-0');
     $this->assertNoFieldChecked('edit-default-value-input-comment-0-status-1');
     $this->assertFieldChecked('edit-default-value-input-comment-0-status-2');
     // Test comment option change in field settings.
-    $edit = array(
+    $edit = [
       'default_value_input[comment][0][status]' => CommentItemInterface::CLOSED,
       'settings[anonymous]' => COMMENT_ANONYMOUS_MAY_CONTACT,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
     $this->drupalGet('entity_test/structure/entity_test/fields/entity_test.entity_test.comment');
     $this->assertNoFieldChecked('edit-default-value-input-comment-0-status-0');
@@ -404,18 +404,18 @@ class CommentNonNodeTest extends WebTestBase {
     $this->assertFieldByName('settings[anonymous]', COMMENT_ANONYMOUS_MAY_CONTACT);
 
     // Add a new comment-type.
-    $bundle = CommentType::create(array(
+    $bundle = CommentType::create([
       'id' => 'foobar',
       'label' => 'Foobar',
       'description' => '',
       'target_entity_type_id' => 'entity_test',
-    ));
+    ]);
     $bundle->save();
 
     // Add a new comment field.
-    $storage_edit = array(
+    $storage_edit = [
       'settings[comment_type]' => 'foobar',
-    );
+    ];
     $this->fieldUIAddNewField('entity_test/structure/entity_test', 'foobar', 'Foobar', 'comment', $storage_edit);
 
     // Add a third comment field.
@@ -429,7 +429,7 @@ class CommentNonNodeTest extends WebTestBase {
 
     // Test the new entity commenting inherits default.
     $random_label = $this->randomMachineName();
-    $data = array('bundle' => 'entity_test', 'name' => $random_label);
+    $data = ['bundle' => 'entity_test', 'name' => $random_label];
     $new_entity = EntityTest::create($data);
     $new_entity->save();
     $this->drupalGet('entity_test/manage/' . $new_entity->id() . '/edit');
@@ -443,12 +443,12 @@ class CommentNonNodeTest extends WebTestBase {
     $this->assertNoFieldByName('comment_body[0][value]', '', 'Comment field found.');
 
     // Test removal of comment_body field.
-    $limited_user = $this->drupalCreateUser(array(
+    $limited_user = $this->drupalCreateUser([
       'administer entity_test fields',
       'post comments',
       'administer comment fields',
       'administer comment types',
-    ));
+    ]);
     $this->drupalLogin($limited_user);
 
     $this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment');
@@ -467,9 +467,9 @@ class CommentNonNodeTest extends WebTestBase {
   public function testsNonIntegerIdEntities() {
     // Create a bundle for entity_test_string_id.
     entity_test_create_bundle('entity_test', 'Entity Test', 'entity_test_string_id');
-    $limited_user = $this->drupalCreateUser(array(
+    $limited_user = $this->drupalCreateUser([
       'administer entity_test_string_id fields',
-    ));
+    ]);
     $this->drupalLogin($limited_user);
     // Visit the Field UI field add page.
     $this->drupalGet('entity_test_string_id/structure/entity_test/fields/add-field');
@@ -480,9 +480,9 @@ class CommentNonNodeTest extends WebTestBase {
 
     // Create a bundle for entity_test_no_id.
     entity_test_create_bundle('entity_test', 'Entity Test', 'entity_test_no_id');
-    $this->drupalLogin($this->drupalCreateUser(array(
+    $this->drupalLogin($this->drupalCreateUser([
       'administer entity_test_no_id fields',
-    )));
+    ]));
     // Visit the Field UI field add page.
     $this->drupalGet('entity_test_no_id/structure/entity_test/fields/add-field');
     // Ensure field isn't shown for empty IDs.
diff --git a/web/core/modules/comment/src/Tests/CommentPagerTest.php b/web/core/modules/comment/src/Tests/CommentPagerTest.php
index aa7d09997..9c4897840 100644
--- a/web/core/modules/comment/src/Tests/CommentPagerTest.php
+++ b/web/core/modules/comment/src/Tests/CommentPagerTest.php
@@ -15,7 +15,7 @@ class CommentPagerTest extends CommentTestBase {
   /**
    * Confirms comment paging works correctly with flat and threaded comments.
    */
-  function testCommentPaging() {
+  public function testCommentPaging() {
     $this->drupalLogin($this->adminUser);
 
     // Set comment variables.
@@ -24,8 +24,8 @@ class CommentPagerTest extends CommentTestBase {
     $this->setCommentPreview(DRUPAL_DISABLED);
 
     // Create a node and three comments.
-    $node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
-    $comments = array();
+    $node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1]);
+    $comments = [];
     $comments[] = $this->postComment($node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $comments[] = $this->postComment($node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $comments[] = $this->postComment($node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
@@ -45,13 +45,13 @@ class CommentPagerTest extends CommentTestBase {
     $this->assertFalse($this->commentExists($comments[2]), 'Comment 3 does not appear on page 1.');
 
     // Check the second page.
-    $this->drupalGet('node/' . $node->id(), array('query' => array('page' => 1)));
+    $this->drupalGet('node/' . $node->id(), ['query' => ['page' => 1]]);
     $this->assertTrue($this->commentExists($comments[1]), 'Comment 2 appears on page 2.');
     $this->assertFalse($this->commentExists($comments[0]), 'Comment 1 does not appear on page 2.');
     $this->assertFalse($this->commentExists($comments[2]), 'Comment 3 does not appear on page 2.');
 
     // Check the third page.
-    $this->drupalGet('node/' . $node->id(), array('query' => array('page' => 2)));
+    $this->drupalGet('node/' . $node->id(), ['query' => ['page' => 2]]);
     $this->assertTrue($this->commentExists($comments[2]), 'Comment 3 appears on page 3.');
     $this->assertFalse($this->commentExists($comments[0]), 'Comment 1 does not appear on page 3.');
     $this->assertFalse($this->commentExists($comments[1]), 'Comment 2 does not appear on page 3.');
@@ -64,27 +64,27 @@ class CommentPagerTest extends CommentTestBase {
     $this->setCommentsPerPage(2);
     // We are still in flat view - the replies should not be on the first page,
     // even though they are replies to the oldest comment.
-    $this->drupalGet('node/' . $node->id(), array('query' => array('page' => 0)));
+    $this->drupalGet('node/' . $node->id(), ['query' => ['page' => 0]]);
     $this->assertFalse($this->commentExists($reply, TRUE), 'In flat mode, reply does not appear on page 1.');
 
     // If we switch to threaded mode, the replies on the oldest comment
     // should be bumped to the first page and comment 6 should be bumped
     // to the second page.
     $this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Switched to threaded mode.');
-    $this->drupalGet('node/' . $node->id(), array('query' => array('page' => 0)));
+    $this->drupalGet('node/' . $node->id(), ['query' => ['page' => 0]]);
     $this->assertTrue($this->commentExists($reply, TRUE), 'In threaded mode, reply appears on page 1.');
     $this->assertFalse($this->commentExists($comments[1]), 'In threaded mode, comment 2 has been bumped off of page 1.');
 
     // If (# replies > # comments per page) in threaded expanded view,
     // the overage should be bumped.
     $reply2 = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName(), TRUE);
-    $this->drupalGet('node/' . $node->id(), array('query' => array('page' => 0)));
+    $this->drupalGet('node/' . $node->id(), ['query' => ['page' => 0]]);
     $this->assertFalse($this->commentExists($reply2, TRUE), 'In threaded mode where # replies > # comments per page, the newest reply does not appear on page 1.');
 
     // Test that the page build process does not somehow generate errors when
     // # comments per page is set to 0.
     $this->setCommentsPerPage(0);
-    $this->drupalGet('node/' . $node->id(), array('query' => array('page' => 0)));
+    $this->drupalGet('node/' . $node->id(), ['query' => ['page' => 0]]);
     $this->assertFalse($this->commentExists($reply2, TRUE), 'Threaded mode works correctly when comments per page is 0.');
 
     $this->drupalLogout();
@@ -93,7 +93,7 @@ class CommentPagerTest extends CommentTestBase {
   /**
    * Confirms comment paging works correctly with flat and threaded comments.
    */
-  function testCommentPermalink() {
+  public function testCommentPermalink() {
     $this->drupalLogin($this->adminUser);
 
     // Set comment variables.
@@ -102,8 +102,8 @@ class CommentPagerTest extends CommentTestBase {
     $this->setCommentPreview(DRUPAL_DISABLED);
 
     // Create a node and three comments.
-    $node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
-    $comments = array();
+    $node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1]);
+    $comments = [];
     $comments[] = $this->postComment($node, 'comment 1: ' . $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $comments[] = $this->postComment($node, 'comment 2: ' . $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $comments[] = $this->postComment($node, 'comment 3: ' . $this->randomMachineName(), $this->randomMachineName(), TRUE);
@@ -125,7 +125,7 @@ class CommentPagerTest extends CommentTestBase {
   /**
    * Tests comment ordering and threading.
    */
-  function testCommentOrderingThreading() {
+  public function testCommentOrderingThreading() {
     $this->drupalLogin($this->adminUser);
 
     // Set comment variables.
@@ -137,8 +137,8 @@ class CommentPagerTest extends CommentTestBase {
     $this->setCommentsPerPage(1000);
 
     // Create a node and three comments.
-    $node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
-    $comments = array();
+    $node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1]);
+    $comments = [];
     $comments[] = $this->postComment($node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $comments[] = $this->postComment($node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $comments[] = $this->postComment($node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
@@ -170,7 +170,7 @@ class CommentPagerTest extends CommentTestBase {
 
     $this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_FLAT, 'Comment paging changed.');
 
-    $expected_order = array(
+    $expected_order = [
       0,
       1,
       2,
@@ -178,13 +178,13 @@ class CommentPagerTest extends CommentTestBase {
       4,
       5,
       6,
-    );
+    ];
     $this->drupalGet('node/' . $node->id());
     $this->assertCommentOrder($comments, $expected_order);
 
     $this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Switched to threaded mode.');
 
-    $expected_order = array(
+    $expected_order = [
       0,
       4,
       1,
@@ -192,7 +192,7 @@ class CommentPagerTest extends CommentTestBase {
       6,
       2,
       5,
-    );
+    ];
     $this->drupalGet('node/' . $node->id());
     $this->assertCommentOrder($comments, $expected_order);
   }
@@ -205,8 +205,8 @@ class CommentPagerTest extends CommentTestBase {
    * @param array $expected_order
    *   An array of keys from $comments describing the expected order.
    */
-  function assertCommentOrder(array $comments, array $expected_order) {
-    $expected_cids = array();
+  public function assertCommentOrder(array $comments, array $expected_order) {
+    $expected_cids = [];
 
     // First, rekey the expected order by cid.
     foreach ($expected_order as $key) {
@@ -214,17 +214,17 @@ class CommentPagerTest extends CommentTestBase {
     }
 
     $comment_anchors = $this->xpath('//a[starts-with(@id,"comment-")]');
-    $result_order = array();
+    $result_order = [];
     foreach ($comment_anchors as $anchor) {
       $result_order[] = substr($anchor['id'], 8);
     }
-    return $this->assertEqual($expected_cids, $result_order, format_string('Comment order: expected @expected, returned @returned.', array('@expected' => implode(',', $expected_cids), '@returned' => implode(',', $result_order))));
+    return $this->assertEqual($expected_cids, $result_order, format_string('Comment order: expected @expected, returned @returned.', ['@expected' => implode(',', $expected_cids), '@returned' => implode(',', $result_order)]));
   }
 
   /**
    * Tests calculation of first page with new comment.
    */
-  function testCommentNewPageIndicator() {
+  public function testCommentNewPageIndicator() {
     $this->drupalLogin($this->adminUser);
 
     // Set comment variables.
@@ -237,8 +237,8 @@ class CommentPagerTest extends CommentTestBase {
     $this->setCommentsPerPage(1);
 
     // Create a node and three comments.
-    $node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
-    $comments = array();
+    $node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1]);
+    $comments = [];
     $comments[] = $this->postComment($node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $comments[] = $this->postComment($node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
     $comments[] = $this->postComment($node, $this->randomMachineName(), $this->randomMachineName(), TRUE);
@@ -265,83 +265,83 @@ class CommentPagerTest extends CommentTestBase {
 
     $this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_FLAT, 'Comment paging changed.');
 
-    $expected_pages = array(
+    $expected_pages = [
       1 => 5, // Page of comment 5
       2 => 4, // Page of comment 4
       3 => 3, // Page of comment 3
       4 => 2, // Page of comment 2
       5 => 1, // Page of comment 1
       6 => 0, // Page of comment 0
-    );
+    ];
 
     $node = Node::load($node->id());
     foreach ($expected_pages as $new_replies => $expected_page) {
       $returned_page = \Drupal::entityManager()->getStorage('comment')
         ->getNewCommentPageNumber($node->get('comment')->comment_count, $new_replies, $node, 'comment');
-      $this->assertIdentical($expected_page, $returned_page, format_string('Flat mode, @new replies: expected page @expected, returned page @returned.', array('@new' => $new_replies, '@expected' => $expected_page, '@returned' => $returned_page)));
+      $this->assertIdentical($expected_page, $returned_page, format_string('Flat mode, @new replies: expected page @expected, returned page @returned.', ['@new' => $new_replies, '@expected' => $expected_page, '@returned' => $returned_page]));
     }
 
     $this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Switched to threaded mode.');
 
-    $expected_pages = array(
+    $expected_pages = [
       1 => 5, // Page of comment 5
       2 => 1, // Page of comment 4
       3 => 1, // Page of comment 4
       4 => 1, // Page of comment 4
       5 => 1, // Page of comment 4
       6 => 0, // Page of comment 0
-    );
+    ];
 
-    \Drupal::entityManager()->getStorage('node')->resetCache(array($node->id()));
+    \Drupal::entityManager()->getStorage('node')->resetCache([$node->id()]);
     $node = Node::load($node->id());
     foreach ($expected_pages as $new_replies => $expected_page) {
       $returned_page = \Drupal::entityManager()->getStorage('comment')
         ->getNewCommentPageNumber($node->get('comment')->comment_count, $new_replies, $node, 'comment');
-      $this->assertEqual($expected_page, $returned_page, format_string('Threaded mode, @new replies: expected page @expected, returned page @returned.', array('@new' => $new_replies, '@expected' => $expected_page, '@returned' => $returned_page)));
+      $this->assertEqual($expected_page, $returned_page, format_string('Threaded mode, @new replies: expected page @expected, returned page @returned.', ['@new' => $new_replies, '@expected' => $expected_page, '@returned' => $returned_page]));
     }
   }
 
   /**
    * Confirms comment paging works correctly with two pagers.
    */
-  function testTwoPagers() {
+  public function testTwoPagers() {
     // Add another field to article content-type.
     $this->addDefaultCommentField('node', 'article', 'comment_2');
     // Set default to display comment list with unique pager id.
     entity_get_display('node', 'article', 'default')
-      ->setComponent('comment_2', array(
+      ->setComponent('comment_2', [
         'label' => 'hidden',
         'type' => 'comment_default',
         'weight' => 30,
-        'settings' => array(
+        'settings' => [
           'pager_id' => 1,
           'view_mode' => 'default',
-        )
-      ))
+        ]
+      ])
       ->save();
 
     // Make sure pager appears in formatter summary and settings form.
-    $account = $this->drupalCreateUser(array('administer node display'));
+    $account = $this->drupalCreateUser(['administer node display']);
     $this->drupalLogin($account);
     $this->drupalGet('admin/structure/types/manage/article/display');
-    $this->assertNoText(t('Pager ID: @id', array('@id' => 0)), 'No summary for standard pager');
-    $this->assertText(t('Pager ID: @id', array('@id' => 1)));
-    $this->drupalPostAjaxForm(NULL, array(), 'comment_settings_edit');
+    $this->assertNoText(t('Pager ID: @id', ['@id' => 0]), 'No summary for standard pager');
+    $this->assertText(t('Pager ID: @id', ['@id' => 1]));
+    $this->drupalPostAjaxForm(NULL, [], 'comment_settings_edit');
     // Change default pager to 2.
-    $this->drupalPostForm(NULL, array('fields[comment][settings_edit_form][settings][pager_id]' => 2), t('Save'));
-    $this->assertText(t('Pager ID: @id', array('@id' => 2)));
+    $this->drupalPostForm(NULL, ['fields[comment][settings_edit_form][settings][pager_id]' => 2], t('Save'));
+    $this->assertText(t('Pager ID: @id', ['@id' => 2]));
     // Revert the changes.
-    $this->drupalPostAjaxForm(NULL, array(), 'comment_settings_edit');
-    $this->drupalPostForm(NULL, array('fields[comment][settings_edit_form][settings][pager_id]' => 0), t('Save'));
-    $this->assertNoText(t('Pager ID: @id', array('@id' => 0)), 'No summary for standard pager');
+    $this->drupalPostAjaxForm(NULL, [], 'comment_settings_edit');
+    $this->drupalPostForm(NULL, ['fields[comment][settings_edit_form][settings][pager_id]' => 0], t('Save'));
+    $this->assertNoText(t('Pager ID: @id', ['@id' => 0]), 'No summary for standard pager');
 
     $this->drupalLogin($this->adminUser);
 
     // Add a new node with both comment fields open.
-    $node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()));
+    $node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()]);
     // Set comment options.
-    $comments = array();
-    foreach (array('comment', 'comment_2') as $field_name) {
+    $comments = [];
+    foreach (['comment', 'comment_2'] as $field_name) {
       $this->setCommentForm(TRUE, $field_name);
       $this->setCommentPreview(DRUPAL_OPTIONAL, $field_name);
       $this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_FLAT, 'Comment paging changed.', $field_name);
@@ -350,10 +350,10 @@ class CommentPagerTest extends CommentTestBase {
       // needing to insert large numbers of comments.
       $this->setCommentsPerPage(1, $field_name);
       for ($i = 0; $i < 3; $i++) {
-        $comment = t('Comment @count on field @field', array(
+        $comment = t('Comment @count on field @field', [
           '@count' => $i + 1,
           '@field' => $field_name,
-        ));
+        ]);
         $comments[] = $this->postComment($node, $comment, $comment, TRUE, $field_name);
       }
     }
@@ -365,19 +365,19 @@ class CommentPagerTest extends CommentTestBase {
     $this->assertRaw('Comment 1 on field comment');
     $this->assertRaw('Comment 1 on field comment_2');
     // Navigate to next page of field 1.
-    $this->clickLinkWithXPath('//h3/a[normalize-space(text())=:label]/ancestor::section[1]//a[@rel="next"]', array(':label' => 'Comment 1 on field comment'));
+    $this->clickLinkWithXPath('//h3/a[normalize-space(text())=:label]/ancestor::section[1]//a[@rel="next"]', [':label' => 'Comment 1 on field comment']);
     // Check only one pager updated.
     $this->assertRaw('Comment 2 on field comment');
     $this->assertRaw('Comment 1 on field comment_2');
     // Return to page 1.
     $this->drupalGet('node/' . $node->id());
     // Navigate to next page of field 2.
-    $this->clickLinkWithXPath('//h3/a[normalize-space(text())=:label]/ancestor::section[1]//a[@rel="next"]', array(':label' => 'Comment 1 on field comment_2'));
+    $this->clickLinkWithXPath('//h3/a[normalize-space(text())=:label]/ancestor::section[1]//a[@rel="next"]', [':label' => 'Comment 1 on field comment_2']);
     // Check only one pager updated.
     $this->assertRaw('Comment 1 on field comment');
     $this->assertRaw('Comment 2 on field comment_2');
     // Navigate to next page of field 1.
-    $this->clickLinkWithXPath('//h3/a[normalize-space(text())=:label]/ancestor::section[1]//a[@rel="next"]', array(':label' => 'Comment 1 on field comment'));
+    $this->clickLinkWithXPath('//h3/a[normalize-space(text())=:label]/ancestor::section[1]//a[@rel="next"]', [':label' => 'Comment 1 on field comment']);
     // Check only one pager updated.
     $this->assertRaw('Comment 2 on field comment');
     $this->assertRaw('Comment 2 on field comment_2');
@@ -405,15 +405,15 @@ class CommentPagerTest extends CommentTestBase {
    *
    * @see WebTestBase::clickLink()
    */
-  protected function clickLinkWithXPath($xpath, $arguments = array(), $index = 0) {
+  protected function clickLinkWithXPath($xpath, $arguments = [], $index = 0) {
     $url_before = $this->getUrl();
     $urls = $this->xpath($xpath, $arguments);
     if (isset($urls[$index])) {
       $url_target = $this->getAbsoluteUrl($urls[$index]['href']);
-      $this->pass(SafeMarkup::format('Clicked link %label (@url_target) from @url_before', array('%label' => $xpath, '@url_target' => $url_target, '@url_before' => $url_before)), 'Browser');
+      $this->pass(SafeMarkup::format('Clicked link %label (@url_target) from @url_before', ['%label' => $xpath, '@url_target' => $url_target, '@url_before' => $url_before]), 'Browser');
       return $this->drupalGet($url_target);
     }
-    $this->fail(SafeMarkup::format('Link %label does not exist on @url_before', array('%label' => $xpath, '@url_before' => $url_before)), 'Browser');
+    $this->fail(SafeMarkup::format('Link %label does not exist on @url_before', ['%label' => $xpath, '@url_before' => $url_before]), 'Browser');
     return FALSE;
   }
 
diff --git a/web/core/modules/comment/src/Tests/CommentPreviewTest.php b/web/core/modules/comment/src/Tests/CommentPreviewTest.php
index 837a78aa9..1b07fe600 100644
--- a/web/core/modules/comment/src/Tests/CommentPreviewTest.php
+++ b/web/core/modules/comment/src/Tests/CommentPreviewTest.php
@@ -26,7 +26,7 @@ class CommentPreviewTest extends CommentTestBase {
   /**
    * Tests comment preview.
    */
-  function testCommentPreview() {
+  public function testCommentPreview() {
     // As admin user, configure comment settings.
     $this->drupalLogin($this->adminUser);
     $this->setCommentPreview(DRUPAL_OPTIONAL);
@@ -41,7 +41,7 @@ class CommentPreviewTest extends CommentTestBase {
     // Test escaping of the username on the preview form.
     \Drupal::service('module_installer')->install(['user_hooks_test']);
     \Drupal::state()->set('user_hooks_test_user_format_name_alter', TRUE);
-    $edit = array();
+    $edit = [];
     $edit['subject[0][value]'] = $this->randomMachineName(8);
     $edit['comment_body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
@@ -90,7 +90,7 @@ class CommentPreviewTest extends CommentTestBase {
     $this->drupalLogin($this->webUser);
 
     // As the web user, fill in the comment form and preview the comment.
-    $edit = array();
+    $edit = [];
     $edit['subject[0][value]'] = $this->randomMachineName(8);
     $edit['comment_body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
@@ -123,15 +123,15 @@ class CommentPreviewTest extends CommentTestBase {
   /**
    * Tests comment edit, preview, and save.
    */
-  function testCommentEditPreviewSave() {
-    $web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'skip comment approval', 'edit own comments'));
+  public function testCommentEditPreviewSave() {
+    $web_user = $this->drupalCreateUser(['access comments', 'post comments', 'skip comment approval', 'edit own comments']);
     $this->drupalLogin($this->adminUser);
     $this->setCommentPreview(DRUPAL_OPTIONAL);
     $this->setCommentForm(TRUE);
     $this->setCommentSubject(TRUE);
     $this->setCommentSettings('default_mode', CommentManagerInterface::COMMENT_MODE_THREADED, 'Comment paging changed.');
 
-    $edit = array();
+    $edit = [];
     $date = new DrupalDateTime('2008-03-02 17:23');
     $edit['subject[0][value]'] = $this->randomMachineName(8);
     $edit['comment_body[0][value]'] = $this->randomMachineName(16);
@@ -172,7 +172,7 @@ class CommentPreviewTest extends CommentTestBase {
     $this->assertFieldByName('date[time]', $expected_form_time, 'Time field displayed.');
 
     // Submit the form using the displayed values.
-    $displayed = array();
+    $displayed = [];
     $displayed['subject[0][value]'] = (string) current($this->xpath("//input[@id='edit-subject-0-value']/@value"));
     $displayed['comment_body[0][value]'] = (string) current($this->xpath("//textarea[@id='edit-comment-body-0-value']"));
     $displayed['uid'] = (string) current($this->xpath("//input[@id='edit-uid']/@value"));
@@ -182,7 +182,7 @@ class CommentPreviewTest extends CommentTestBase {
 
     // Check that the saved comment is still correct.
     $comment_storage = \Drupal::entityManager()->getStorage('comment');
-    $comment_storage->resetCache(array($comment->id()));
+    $comment_storage->resetCache([$comment->id()]);
     /** @var \Drupal\comment\CommentInterface $comment_loaded */
     $comment_loaded = Comment::load($comment->id());
     $this->assertEqual($comment_loaded->getSubject(), $edit['subject[0][value]'], 'Subject loaded.');
@@ -193,13 +193,13 @@ class CommentPreviewTest extends CommentTestBase {
 
     // Check that the date and time of the comment are correct when edited by
     // non-admin users.
-    $user_edit = array();
+    $user_edit = [];
     $expected_created_time = $comment_loaded->getCreatedTime();
     $this->drupalLogin($web_user);
     // Web user cannot change the comment author.
     unset($edit['uid']);
     $this->drupalPostForm('comment/' . $comment->id() . '/edit', $user_edit, t('Save'));
-    $comment_storage->resetCache(array($comment->id()));
+    $comment_storage->resetCache([$comment->id()]);
     $comment_loaded = Comment::load($comment->id());
     $this->assertEqual($comment_loaded->getCreatedTime(), $expected_created_time, 'Expected date and time for comment edited.');
     $this->drupalLogout();
diff --git a/web/core/modules/comment/src/Tests/CommentRssTest.php b/web/core/modules/comment/src/Tests/CommentRssTest.php
index ec673dfb4..35cad71fa 100644
--- a/web/core/modules/comment/src/Tests/CommentRssTest.php
+++ b/web/core/modules/comment/src/Tests/CommentRssTest.php
@@ -21,7 +21,7 @@ class CommentRssTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $modules = array('views');
+  public static $modules = ['views'];
 
   /**
    * {@inheritdoc}
@@ -42,7 +42,7 @@ class CommentRssTest extends CommentTestBase {
   /**
    * Tests comments as part of an RSS feed.
    */
-  function testCommentRss() {
+  public function testCommentRss() {
     // Find comment in RSS feed.
     $this->drupalLogin($this->webUser);
     $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName());
@@ -66,7 +66,7 @@ class CommentRssTest extends CommentTestBase {
       'user:3',
     ]));
 
-    $raw = '<comments>' . $this->node->url('canonical', array('fragment' => 'comments', 'absolute' => TRUE)) . '</comments>';
+    $raw = '<comments>' . $this->node->url('canonical', ['fragment' => 'comments', 'absolute' => TRUE]) . '</comments>';
     $this->assertRaw($raw, 'Comments as part of RSS feed.');
 
     // Hide comments from RSS feed and check presence.
diff --git a/web/core/modules/comment/src/Tests/CommentStatisticsTest.php b/web/core/modules/comment/src/Tests/CommentStatisticsTest.php
index 0c370d112..0d1ec3a04 100644
--- a/web/core/modules/comment/src/Tests/CommentStatisticsTest.php
+++ b/web/core/modules/comment/src/Tests/CommentStatisticsTest.php
@@ -24,7 +24,7 @@ class CommentStatisticsTest extends CommentTestBase {
     parent::setUp();
 
     // Create a second user to post comments.
-    $this->webUser2 = $this->drupalCreateUser(array(
+    $this->webUser2 = $this->drupalCreateUser([
       'post comments',
       'create article content',
       'edit own comments',
@@ -32,13 +32,13 @@ class CommentStatisticsTest extends CommentTestBase {
       'skip comment approval',
       'access comments',
       'access content',
-    ));
+    ]);
   }
 
   /**
    * Tests the node comment statistics.
    */
-  function testCommentNodeCommentStatistics() {
+  public function testCommentNodeCommentStatistics() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     // Set comments to have subject and preview disabled.
     $this->drupalLogin($this->adminUser);
@@ -62,7 +62,7 @@ class CommentStatisticsTest extends CommentTestBase {
 
     // Checks the new values of node comment statistics with comment #1.
     // The node cache needs to be reset before reload.
-    $node_storage->resetCache(array($this->node->id()));
+    $node_storage->resetCache([$this->node->id()]);
     $node = $node_storage->load($this->node->id());
     $this->assertEqual($node->get('comment')->last_comment_name, NULL, 'The value of node last_comment_name is NULL.');
     $this->assertEqual($node->get('comment')->last_comment_uid, $this->webUser2->id(), 'The value of node last_comment_uid is the comment #1 uid.');
@@ -70,11 +70,11 @@ class CommentStatisticsTest extends CommentTestBase {
 
     // Prepare for anonymous comment submission (comment approval enabled).
     $this->drupalLogin($this->adminUser);
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => TRUE,
       'post comments' => TRUE,
       'skip comment approval' => FALSE,
-    ));
+    ]);
     // Ensure that the poster can leave some contact info.
     $this->setCommentAnonymous('1');
     $this->drupalLogout();
@@ -86,7 +86,7 @@ class CommentStatisticsTest extends CommentTestBase {
     // Checks the new values of node comment statistics with comment #2 and
     // ensure they haven't changed since the comment has not been moderated.
     // The node needs to be reloaded with the cache reset.
-    $node_storage->resetCache(array($this->node->id()));
+    $node_storage->resetCache([$this->node->id()]);
     $node = $node_storage->load($this->node->id());
     $this->assertEqual($node->get('comment')->last_comment_name, NULL, 'The value of node last_comment_name is still NULL.');
     $this->assertEqual($node->get('comment')->last_comment_uid, $this->webUser2->id(), 'The value of node last_comment_uid is still the comment #1 uid.');
@@ -94,21 +94,21 @@ class CommentStatisticsTest extends CommentTestBase {
 
     // Prepare for anonymous comment submission (no approval required).
     $this->drupalLogin($this->adminUser);
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => TRUE,
       'post comments' => TRUE,
       'skip comment approval' => TRUE,
-    ));
+    ]);
     $this->drupalLogout();
 
     // Post comment #3 as anonymous.
     $this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
-    $anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), '', array('name' => $this->randomMachineName()));
+    $anonymous_comment = $this->postComment($this->node, $this->randomMachineName(), '', ['name' => $this->randomMachineName()]);
     $comment_loaded = Comment::load($anonymous_comment->id());
 
     // Checks the new values of node comment statistics with comment #3.
     // The node needs to be reloaded with the cache reset.
-    $node_storage->resetCache(array($this->node->id()));
+    $node_storage->resetCache([$this->node->id()]);
     $node = $node_storage->load($this->node->id());
     $this->assertEqual($node->get('comment')->last_comment_name, $comment_loaded->getAuthorName(), 'The value of node last_comment_name is the name of the anonymous user.');
     $this->assertEqual($node->get('comment')->last_comment_uid, 0, 'The value of node last_comment_uid is zero.');
diff --git a/web/core/modules/comment/src/Tests/CommentTestBase.php b/web/core/modules/comment/src/Tests/CommentTestBase.php
index c99dd32fc..c42d9883c 100644
--- a/web/core/modules/comment/src/Tests/CommentTestBase.php
+++ b/web/core/modules/comment/src/Tests/CommentTestBase.php
@@ -52,11 +52,11 @@ abstract class CommentTestBase extends WebTestBase {
     // child classes may specify the standard profile.
     $types = NodeType::loadMultiple();
     if (empty($types['article'])) {
-      $this->drupalCreateContentType(array('type' => 'article', 'name' => t('Article')));
+      $this->drupalCreateContentType(['type' => 'article', 'name' => t('Article')]);
     }
 
     // Create two test users.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer content types',
       'administer comments',
       'administer comment types',
@@ -69,21 +69,21 @@ abstract class CommentTestBase extends WebTestBase {
       // permission is granted.
       'access user profiles',
       'access content',
-     ));
-    $this->webUser = $this->drupalCreateUser(array(
+     ]);
+    $this->webUser = $this->drupalCreateUser([
       'access comments',
       'post comments',
       'create article content',
       'edit own comments',
       'skip comment approval',
       'access content',
-    ));
+    ]);
 
     // Create comment field on article.
     $this->addDefaultCommentField('node', 'article');
 
     // Create a test node authored by the web user.
-    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()));
+    $this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()]);
     $this->drupalPlaceBlock('local_tasks_block');
   }
 
@@ -107,7 +107,7 @@ abstract class CommentTestBase extends WebTestBase {
    *   The posted comment or NULL when posted comment was not found.
    */
   public function postComment($entity, $comment, $subject = '', $contact = NULL, $field_name = 'comment') {
-    $edit = array();
+    $edit = [];
     $edit['comment_body[0][value]'] = $comment;
 
     if ($entity !== NULL) {
@@ -154,7 +154,7 @@ abstract class CommentTestBase extends WebTestBase {
         $this->drupalPostForm(NULL, $edit, t('Save'));
         break;
     }
-    $match = array();
+    $match = [];
     // Get comment ID
     preg_match('/#comment-([0-9]+)/', $this->getURL(), $match);
 
@@ -168,7 +168,7 @@ abstract class CommentTestBase extends WebTestBase {
     }
 
     if (isset($match[1])) {
-      \Drupal::entityManager()->getStorage('comment')->resetCache(array($match[1]));
+      \Drupal::entityManager()->getStorage('comment')->resetCache([$match[1]]);
       return Comment::load($match[1]);
     }
   }
@@ -184,7 +184,7 @@ abstract class CommentTestBase extends WebTestBase {
    * @return bool
    *   Boolean indicating whether the comment was found.
    */
-  function commentExists(CommentInterface $comment = NULL, $reply = FALSE) {
+  public function commentExists(CommentInterface $comment = NULL, $reply = FALSE) {
     if ($comment) {
       $comment_element = $this->cssSelect('.comment-wrapper ' . ($reply ? '.indented ' : '') . '#comment-' . $comment->id() . ' ~ article');
       if (empty($comment_element)) {
@@ -214,8 +214,8 @@ abstract class CommentTestBase extends WebTestBase {
    * @param \Drupal\comment\CommentInterface $comment
    *   Comment to delete.
    */
-  function deleteComment(CommentInterface $comment) {
-    $this->drupalPostForm('comment/' . $comment->id() . '/delete', array(), t('Delete'));
+  public function deleteComment(CommentInterface $comment) {
+    $this->drupalPostForm('comment/' . $comment->id() . '/delete', [], t('Delete'));
     $this->assertText(t('The comment and all its replies have been deleted.'), 'Comment deleted.');
   }
 
@@ -228,9 +228,9 @@ abstract class CommentTestBase extends WebTestBase {
   public function setCommentSubject($enabled) {
     $form_display = entity_get_form_display('comment', 'comment', 'default');
     if ($enabled) {
-      $form_display->setComponent('subject', array(
+      $form_display->setComponent('subject', [
         'type' => 'string_textfield',
-      ));
+      ]);
     }
     else {
       $form_display->removeComponent('subject');
@@ -263,7 +263,7 @@ abstract class CommentTestBase extends WebTestBase {
         $mode_text = 'required';
         break;
     }
-    $this->setCommentSettings('preview', $mode, format_string('Comment preview @mode_text.', array('@mode_text' => $mode_text)), $field_name);
+    $this->setCommentSettings('preview', $mode, format_string('Comment preview @mode_text.', ['@mode_text' => $mode_text]), $field_name);
   }
 
   /**
@@ -289,8 +289,8 @@ abstract class CommentTestBase extends WebTestBase {
    *   - 1: Contact information allowed but not required.
    *   - 2: Contact information required.
    */
-  function setCommentAnonymous($level) {
-    $this->setCommentSettings('anonymous', $level, format_string('Anonymous commenting set to level @level.', array('@level' => $level)));
+  public function setCommentAnonymous($level) {
+    $this->setCommentSettings('anonymous', $level, format_string('Anonymous commenting set to level @level.', ['@level' => $level]));
   }
 
   /**
@@ -303,7 +303,7 @@ abstract class CommentTestBase extends WebTestBase {
    *   Defaults to 'comment'.
    */
   public function setCommentsPerPage($number, $field_name = 'comment') {
-    $this->setCommentSettings('per_page', $number, format_string('Number of comments per page set to @number.', array('@number' => $number)), $field_name);
+    $this->setCommentSettings('per_page', $number, format_string('Number of comments per page set to @number.', ['@number' => $number]), $field_name);
   }
 
   /**
@@ -333,7 +333,7 @@ abstract class CommentTestBase extends WebTestBase {
    * @return bool
    *   Contact info is available.
    */
-  function commentContactInfoAvailable() {
+  public function commentContactInfoAvailable() {
     return preg_match('/(input).*?(name="name").*?(input).*?(name="mail").*?(input).*?(name="homepage")/s', $this->getRawContent());
   }
 
@@ -347,18 +347,18 @@ abstract class CommentTestBase extends WebTestBase {
    * @param bool $approval
    *   Operation is found on approval page.
    */
-  function performCommentOperation(CommentInterface $comment, $operation, $approval = FALSE) {
-    $edit = array();
+  public function performCommentOperation(CommentInterface $comment, $operation, $approval = FALSE) {
+    $edit = [];
     $edit['operation'] = $operation;
     $edit['comments[' . $comment->id() . ']'] = TRUE;
     $this->drupalPostForm('admin/content/comment' . ($approval ? '/approval' : ''), $edit, t('Update'));
 
     if ($operation == 'delete') {
-      $this->drupalPostForm(NULL, array(), t('Delete comments'));
-      $this->assertRaw(\Drupal::translation()->formatPlural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation)));
+      $this->drupalPostForm(NULL, [], t('Delete comments'));
+      $this->assertRaw(\Drupal::translation()->formatPlural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', ['@operation' => $operation]));
     }
     else {
-      $this->assertText(t('The update has been performed.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation)));
+      $this->assertText(t('The update has been performed.'), format_string('Operation "@operation" was performed on comment.', ['@operation' => $operation]));
     }
   }
 
@@ -371,7 +371,7 @@ abstract class CommentTestBase extends WebTestBase {
    * @return int
    *   Comment id.
    */
-  function getUnapprovedComment($subject) {
+  public function getUnapprovedComment($subject) {
     $this->drupalGet('admin/content/comment/approval');
     preg_match('/href="(.*?)#comment-([^"]+)"(.*?)>(' . $subject . ')/', $this->getRawContent(), $match);
 
@@ -388,12 +388,12 @@ abstract class CommentTestBase extends WebTestBase {
    *   Created comment type.
    */
   protected function createCommentType($label) {
-    $bundle = CommentType::create(array(
+    $bundle = CommentType::create([
       'id' => $label,
       'label' => $label,
       'description' => '',
       'target_entity_type_id' => 'node',
-    ));
+    ]);
     $bundle->save();
     return $bundle;
   }
diff --git a/web/core/modules/comment/src/Tests/CommentTestTrait.php b/web/core/modules/comment/src/Tests/CommentTestTrait.php
index f22d80f89..038a3df09 100644
--- a/web/core/modules/comment/src/Tests/CommentTestTrait.php
+++ b/web/core/modules/comment/src/Tests/CommentTestTrait.php
@@ -43,12 +43,12 @@ trait CommentTestTrait {
       }
     }
     else {
-      $comment_type_storage->create(array(
+      $comment_type_storage->create([
         'id' => $comment_type_id,
         'label' => Unicode::ucfirst($comment_type_id),
         'target_entity_type_id' => $entity_type,
         'description' => 'Default comment field',
-      ))->save();
+      ])->save();
     }
     // Add a body field to the comment type.
     \Drupal::service('comment.manager')->addBodyField($comment_type_id);
@@ -56,43 +56,43 @@ trait CommentTestTrait {
     // Add a comment field to the host entity type. Create the field storage if
     // needed.
     if (!array_key_exists($field_name, $entity_manager->getFieldStorageDefinitions($entity_type))) {
-      $entity_manager->getStorage('field_storage_config')->create(array(
+      $entity_manager->getStorage('field_storage_config')->create([
         'entity_type' => $entity_type,
         'field_name' => $field_name,
         'type' => 'comment',
         'translatable' => TRUE,
-        'settings' => array(
+        'settings' => [
           'comment_type' => $comment_type_id,
-        ),
-      ))->save();
+        ],
+      ])->save();
     }
     // Create the field if needed, and configure its form and view displays.
     if (!array_key_exists($field_name, $entity_manager->getFieldDefinitions($entity_type, $bundle))) {
-      $entity_manager->getStorage('field_config')->create(array(
+      $entity_manager->getStorage('field_config')->create([
         'label' => 'Comments',
         'description' => '',
         'field_name' => $field_name,
         'entity_type' => $entity_type,
         'bundle' => $bundle,
         'required' => 1,
-        'default_value' => array(
-          array(
+        'default_value' => [
+          [
             'status' => $default_value,
             'cid' => 0,
             'last_comment_name' => '',
             'last_comment_timestamp' => 0,
             'last_comment_uid' => 0,
-          ),
-        ),
-      ))->save();
+          ],
+        ],
+      ])->save();
 
       // Entity form displays: assign widget settings for the 'default' form
       // mode, and hide the field in all other form modes.
       entity_get_form_display($entity_type, $bundle, 'default')
-        ->setComponent($field_name, array(
+        ->setComponent($field_name, [
           'type' => 'comment_default',
           'weight' => 20,
-        ))
+        ])
         ->save();
       foreach ($entity_manager->getFormModes($entity_type) as $id => $form_mode) {
         $display = entity_get_form_display($entity_type, $bundle, $id);
@@ -105,12 +105,12 @@ trait CommentTestTrait {
       // Entity view displays: assign widget settings for the 'default' view
       // mode, and hide the field in all other view modes.
       entity_get_display($entity_type, $bundle, 'default')
-        ->setComponent($field_name, array(
+        ->setComponent($field_name, [
           'label' => 'above',
           'type' => 'comment_default',
           'weight' => 20,
-          'settings' => array('view_mode' => $comment_view_mode),
-        ))
+          'settings' => ['view_mode' => $comment_view_mode],
+        ])
         ->save();
       foreach ($entity_manager->getViewModes($entity_type) as $id => $view_mode) {
         $display = entity_get_display($entity_type, $bundle, $id);
diff --git a/web/core/modules/comment/src/Tests/CommentThreadingTest.php b/web/core/modules/comment/src/Tests/CommentThreadingTest.php
index c8ea93e27..8f412b22f 100644
--- a/web/core/modules/comment/src/Tests/CommentThreadingTest.php
+++ b/web/core/modules/comment/src/Tests/CommentThreadingTest.php
@@ -13,7 +13,7 @@ class CommentThreadingTest extends CommentTestBase {
   /**
    * Tests the comment threading.
    */
-  function testCommentThreading() {
+  public function testCommentThreading() {
     // Set comments to have a subject with preview disabled.
     $this->drupalLogin($this->adminUser);
     $this->setCommentPreview(DRUPAL_DISABLED);
@@ -24,7 +24,7 @@ class CommentThreadingTest extends CommentTestBase {
 
     // Create a node.
     $this->drupalLogin($this->webUser);
-    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()));
+    $this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()]);
 
     // Post comment #1.
     $this->drupalLogin($this->webUser);
@@ -139,10 +139,10 @@ class CommentThreadingTest extends CommentTestBase {
 
     $this->assertFieldByXpath($pattern, NULL, format_string(
       'Comment %cid has a link to parent %pid.',
-      array(
+      [
         '%cid' => $cid,
         '%pid' => $pid,
-      )
+      ]
     ));
   }
 
@@ -162,9 +162,9 @@ class CommentThreadingTest extends CommentTestBase {
     $pattern = "//a[@id='comment-$cid']/following-sibling::article//p[contains(@class, 'parent')]";
     $this->assertNoFieldByXpath($pattern, NULL, format_string(
       'Comment %cid does not have a link to a parent.',
-      array(
+      [
         '%cid' => $cid,
-      )
+      ]
     ));
   }
 
diff --git a/web/core/modules/comment/src/Tests/CommentTitleTest.php b/web/core/modules/comment/src/Tests/CommentTitleTest.php
index aab1cf5ec..30d39357b 100644
--- a/web/core/modules/comment/src/Tests/CommentTitleTest.php
+++ b/web/core/modules/comment/src/Tests/CommentTitleTest.php
@@ -14,7 +14,7 @@ class CommentTitleTest extends CommentTestBase {
    */
   public function testCommentEmptyTitles() {
     // Installs module that sets comments to an empty string.
-    \Drupal::service('module_installer')->install(array('comment_empty_title_test'));
+    \Drupal::service('module_installer')->install(['comment_empty_title_test']);
 
     // Set comments to have a subject with preview disabled.
     $this->setCommentPreview(DRUPAL_DISABLED);
@@ -23,7 +23,7 @@ class CommentTitleTest extends CommentTestBase {
 
     // Create a node.
     $this->drupalLogin($this->webUser);
-    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()));
+    $this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()]);
 
     // Post comment #1 and verify that h3's are not rendered.
     $subject_text = $this->randomMachineName();
@@ -49,7 +49,7 @@ class CommentTitleTest extends CommentTestBase {
 
     // Create a node.
     $this->drupalLogin($this->webUser);
-    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()));
+    $this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()]);
 
     // Post comment #1 and verify that title is rendered in h3.
     $subject_text = $this->randomMachineName();
diff --git a/web/core/modules/comment/src/Tests/CommentTokenReplaceTest.php b/web/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
index c7b72276a..6caea1789 100644
--- a/web/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
+++ b/web/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
@@ -29,13 +29,13 @@ class CommentTokenReplaceTest extends CommentTestBase {
   /**
    * Creates a comment, then tests the tokens generated from it.
    */
-  function testCommentTokenReplacement() {
+  public function testCommentTokenReplacement() {
     $token_service = \Drupal::token();
     $language_interface = \Drupal::languageManager()->getCurrentLanguage();
-    $url_options = array(
+    $url_options = [
       'absolute' => TRUE,
       'language' => $language_interface,
-    );
+    ];
 
     // Setup vocabulary.
     Vocabulary::create([
@@ -65,7 +65,7 @@ class CommentTokenReplaceTest extends CommentTestBase {
     $comment->setSubject('<blink>Blinking Comment</blink>');
 
     // Generate and test tokens.
-    $tests = array();
+    $tests = [];
     $tests['[comment:cid]'] = $comment->id();
     $tests['[comment:hostname]'] = $comment->getHostname();
     $tests['[comment:author]'] = Html::escape($comment->getAuthorName());
@@ -74,11 +74,11 @@ class CommentTokenReplaceTest extends CommentTestBase {
     $tests['[comment:title]'] = Html::escape($comment->getSubject());
     $tests['[comment:body]'] = $comment->comment_body->processed;
     $tests['[comment:langcode]'] = $comment->language()->getId();
-    $tests['[comment:url]'] = $comment->url('canonical', $url_options + array('fragment' => 'comment-' . $comment->id()));
+    $tests['[comment:url]'] = $comment->url('canonical', $url_options + ['fragment' => 'comment-' . $comment->id()]);
     $tests['[comment:edit-url]'] = $comment->url('edit-form', $url_options);
-    $tests['[comment:created]'] = \Drupal::service('date.formatter')->format($comment->getCreatedTime(), 'medium', array('langcode' => $language_interface->getId()));
-    $tests['[comment:created:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($comment->getCreatedTime(), array('langcode' => $language_interface->getId()));
-    $tests['[comment:changed:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($comment->getChangedTimeAcrossTranslations(), array('langcode' => $language_interface->getId()));
+    $tests['[comment:created]'] = \Drupal::service('date.formatter')->format($comment->getCreatedTime(), 'medium', ['langcode' => $language_interface->getId()]);
+    $tests['[comment:created:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($comment->getCreatedTime(), ['langcode' => $language_interface->getId()]);
+    $tests['[comment:changed:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($comment->getChangedTimeAcrossTranslations(), ['langcode' => $language_interface->getId()]);
     $tests['[comment:parent:cid]'] = $comment->hasParentComment() ? $comment->getParentComment()->id() : NULL;
     $tests['[comment:parent:title]'] = $parent_comment->getSubject();
     $tests['[comment:entity]'] = Html::escape($node->getTitle());
@@ -127,7 +127,7 @@ class CommentTokenReplaceTest extends CommentTestBase {
 
     foreach ($tests as $input => $expected) {
       $bubbleable_metadata = new BubbleableMetadata();
-      $output = $token_service->replace($input, array('comment' => $comment), array('langcode' => $language_interface->getId()), $bubbleable_metadata);
+      $output = $token_service->replace($input, ['comment' => $comment], ['langcode' => $language_interface->getId()], $bubbleable_metadata);
       $this->assertEqual($output, $expected, new FormattableMarkup('Comment token %token replaced.', ['%token' => $input]));
       $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
@@ -136,8 +136,8 @@ class CommentTokenReplaceTest extends CommentTestBase {
     $author_name = 'This is a random & " > string';
     $comment->setOwnerId(0)->setAuthorName($author_name);
     $input = '[comment:author]';
-    $output = $token_service->replace($input, array('comment' => $comment), array('langcode' => $language_interface->getId()));
-    $this->assertEqual($output, Html::escape($author_name), format_string('Comment author token %token replaced.', array('%token' => $input)));
+    $output = $token_service->replace($input, ['comment' => $comment], ['langcode' => $language_interface->getId()]);
+    $this->assertEqual($output, Html::escape($author_name), format_string('Comment author token %token replaced.', ['%token' => $input]));
     // Add comment field to user and term entities.
     $this->addDefaultCommentField('user', 'user', 'comment', CommentItemInterface::OPEN, 'comment_user');
     $this->addDefaultCommentField('taxonomy_term', 'tags', 'comment', CommentItemInterface::OPEN, 'comment_term');
@@ -162,7 +162,7 @@ class CommentTokenReplaceTest extends CommentTestBase {
 
     // Generate comment tokens for node (it has 2 comments, both new),
     // user and term.
-    $tests = array();
+    $tests = [];
     $tests['[entity:comment-count]'] = 2;
     $tests['[entity:comment-count-new]'] = 2;
     $tests['[node:comment-count]'] = 2;
diff --git a/web/core/modules/comment/src/Tests/CommentTranslationUITest.php b/web/core/modules/comment/src/Tests/CommentTranslationUITest.php
index e89bd3f31..4613d66ec 100644
--- a/web/core/modules/comment/src/Tests/CommentTranslationUITest.php
+++ b/web/core/modules/comment/src/Tests/CommentTranslationUITest.php
@@ -46,7 +46,7 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'content_translation', 'node', 'comment');
+  public static $modules = ['language', 'content_translation', 'node', 'comment'];
 
   protected function setUp() {
     $this->entityTypeId = 'comment';
@@ -60,13 +60,13 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
   /**
    * {@inheritdoc}
    */
-  function setupBundle() {
+  public function setupBundle() {
     parent::setupBundle();
-    $this->drupalCreateContentType(array('type' => $this->nodeBundle, 'name' => $this->nodeBundle));
+    $this->drupalCreateContentType(['type' => $this->nodeBundle, 'name' => $this->nodeBundle]);
     // Add a comment field to the article content type.
     $this->addDefaultCommentField('node', 'article', 'comment_article', CommentItemInterface::OPEN, 'comment_article');
     // Create a page content type.
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'page']);
     // Add a comment field to the page content type - this one won't be
     // translatable.
     $this->addDefaultCommentField('node', 'page', 'comment');
@@ -78,7 +78,7 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
    * {@inheritdoc}
    */
   protected function getTranslatorPermissions() {
-    return array_merge(parent::getTranslatorPermissions(), array('post comments', 'administer comments', 'access comments'));
+    return array_merge(parent::getTranslatorPermissions(), ['post comments', 'administer comments', 'access comments']);
   }
 
   /**
@@ -95,12 +95,12 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
       $node_type = 'page';
       $field_name = 'comment';
     }
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'type' => $node_type,
-      $field_name => array(
-        array('status' => CommentItemInterface::OPEN)
-      ),
-    ));
+      $field_name => [
+        ['status' => CommentItemInterface::OPEN]
+      ],
+    ]);
     $values['entity_id'] = $node->id();
     $values['entity_type'] = 'node';
     $values['field_name'] = $field_name;
@@ -113,10 +113,10 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
    */
   protected function getNewEntityValues($langcode) {
     // Comment subject is not translatable hence we use a fixed value.
-    return array(
-      'subject' => array(array('value' => $this->subject)),
-      'comment_body' => array(array('value' => $this->randomMachineName(16))),
-    ) + parent::getNewEntityValues($langcode);
+    return [
+      'subject' => [['value' => $this->subject]],
+      'comment_body' => [['value' => $this->randomMachineName(16)]],
+    ] + parent::getNewEntityValues($langcode);
   }
 
   /**
@@ -132,8 +132,8 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
     // Unpublish translations.
     foreach ($this->langcodes as $index => $langcode) {
       if ($index > 0) {
-        $edit = array('status' => 0);
-        $url = $entity->urlInfo('edit-form', array('language' => ConfigurableLanguage::load($langcode)));
+        $edit = ['status' => 0];
+        $url = $entity->urlInfo('edit-form', ['language' => ConfigurableLanguage::load($langcode)]);
         $this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $langcode));
         $storage->resetCache();
         $entity = $storage->load($this->entityId);
@@ -151,21 +151,21 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
     $storage->resetCache([$this->entityId]);
     $entity = $storage->load($this->entityId);
     $languages = $this->container->get('language_manager')->getLanguages();
-    $values = array();
+    $values = [];
 
     // Post different authoring information for each translation.
     foreach ($this->langcodes as $langcode) {
       $url = $entity->urlInfo('edit-form', ['language' => $languages[$langcode]]);
       $user = $this->drupalCreateUser();
-      $values[$langcode] = array(
+      $values[$langcode] = [
         'uid' => $user->id(),
         'created' => REQUEST_TIME - mt_rand(0, 1000),
-      );
-      $edit = array(
+      ];
+      $edit = [
         'uid' => $user->getUsername() . ' (' . $user->id() . ')',
         'date[date]' => format_date($values[$langcode]['created'], 'custom', 'Y-m-d'),
         'date[time]' => format_date($values[$langcode]['created'], 'custom', 'H:i:s'),
-      );
+      ];
       $this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $langcode));
     }
 
@@ -181,12 +181,12 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
   /**
    * Tests translate link on comment content admin page.
    */
-  function testTranslateLinkCommentAdminPage() {
-    $this->adminUser = $this->drupalCreateUser(array_merge(parent::getTranslatorPermissions(), array('access administration pages', 'administer comments', 'skip comment approval')));
+  public function testTranslateLinkCommentAdminPage() {
+    $this->adminUser = $this->drupalCreateUser(array_merge(parent::getTranslatorPermissions(), ['access administration pages', 'administer comments', 'skip comment approval']));
     $this->drupalLogin($this->adminUser);
 
-    $cid_translatable = $this->createEntity(array(), $this->langcodes[0]);
-    $cid_untranslatable = $this->createEntity(array(), $this->langcodes[0], 'comment');
+    $cid_translatable = $this->createEntity([], $this->langcodes[0]);
+    $cid_untranslatable = $this->createEntity([], $this->langcodes[0], 'comment');
 
     // Verify translation links.
     $this->drupalGet('admin/content/comment');
@@ -208,15 +208,15 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
     foreach ($this->langcodes as $langcode) {
       // We only want to test the title for non-english translations.
       if ($langcode != 'en') {
-        $options = array('language' => $languages[$langcode]);
+        $options = ['language' => $languages[$langcode]];
         $url = $entity->urlInfo('edit-form', $options);
         $this->drupalGet($url);
 
-        $title = t('Edit @type @title [%language translation]', array(
+        $title = t('Edit @type @title [%language translation]', [
           '@type' => $this->entityTypeId,
           '@title' => $entity->getTranslation($langcode)->label(),
           '%language' => $languages[$langcode]->getName(),
-        ));
+        ]);
         $this->assertRaw($title);
       }
     }
diff --git a/web/core/modules/comment/src/Tests/CommentTypeTest.php b/web/core/modules/comment/src/Tests/CommentTypeTest.php
index fb5028f71..343bb9148 100644
--- a/web/core/modules/comment/src/Tests/CommentTypeTest.php
+++ b/web/core/modules/comment/src/Tests/CommentTypeTest.php
@@ -27,11 +27,11 @@ class CommentTypeTest extends CommentTestBase {
    *
    * @var array
    */
-  protected $permissions = array(
+  protected $permissions = [
     'administer comments',
     'administer comment fields',
     'administer comment types',
-  );
+  ];
 
   /**
    * Sets the test up.
@@ -61,12 +61,12 @@ class CommentTypeTest extends CommentTestBase {
     $this->assertResponse(200, 'The new comment type can be accessed at the edit form.');
 
     // Create a comment type via the user interface.
-    $edit = array(
+    $edit = [
       'id' => 'foo',
       'label' => 'title for foo',
       'description' => '',
       'target_entity_type_id' => 'node',
-    );
+    ];
     $this->drupalPostForm('admin/structure/comment/types/add', $edit, t('Save'));
     $comment_type = CommentType::load('foo');
     $this->assertTrue($comment_type, 'The new comment type has been created.');
@@ -81,8 +81,8 @@ class CommentTypeTest extends CommentTestBase {
     $this->assertText(t('Target entity type'));
     // Save the form and ensure the entity-type value is preserved even though
     // the field isn't present.
-    $this->drupalPostForm(NULL, array(), t('Save'));
-    \Drupal::entityManager()->getStorage('comment_type')->resetCache(array('foo'));
+    $this->drupalPostForm(NULL, [], t('Save'));
+    \Drupal::entityManager()->getStorage('comment_type')->resetCache(['foo']);
     $comment_type = CommentType::load('foo');
     $this->assertEqual($comment_type->getTargetEntityTypeId(), 'node');
   }
@@ -98,9 +98,9 @@ class CommentTypeTest extends CommentTestBase {
 
     // Change the comment type name.
     $this->drupalGet('admin/structure/comment');
-    $edit = array(
+    $edit = [
       'label' => 'Bar',
-    );
+    ];
     $this->drupalPostForm('admin/structure/comment/manage/comment', $edit, t('Save'));
 
     $this->drupalGet('admin/structure/comment');
@@ -110,9 +110,9 @@ class CommentTypeTest extends CommentTestBase {
     $this->assertTrue($this->cssSelect('tr#comment-body'), 'Body field exists.');
 
     // Remove the body field.
-    $this->drupalPostForm('admin/structure/comment/manage/comment/fields/comment.comment.comment_body/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/comment/manage/comment/fields/comment.comment.comment_body/delete', [], t('Delete'));
     // Resave the settings for this type.
-    $this->drupalPostForm('admin/structure/comment/manage/comment', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/comment/manage/comment', [], t('Save'));
     // Check that the body field doesn't exist.
     $this->drupalGet('admin/structure/comment/manage/comment/fields');
     $this->assertFalse($this->cssSelect('tr#comment-body'), 'Body field does not exist.');
@@ -124,39 +124,39 @@ class CommentTypeTest extends CommentTestBase {
   public function testCommentTypeDeletion() {
     // Create a comment type programmatically.
     $type = $this->createCommentType('foo');
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     $this->addDefaultCommentField('node', 'page', 'foo', CommentItemInterface::OPEN, 'foo');
     $field_storage = FieldStorageConfig::loadByName('node', 'foo');
 
     $this->drupalLogin($this->adminUser);
 
     // Create a node.
-    $node = Node::create(array(
+    $node = Node::create([
       'type' => 'page',
       'title' => 'foo',
-    ));
+    ]);
     $node->save();
 
     // Add a new comment of this type.
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'comment_type' => 'foo',
       'entity_type' => 'node',
       'field_name' => 'foo',
       'entity_id' => $node->id(),
-    ));
+    ]);
     $comment->save();
 
     // Attempt to delete the comment type, which should not be allowed.
     $this->drupalGet('admin/structure/comment/manage/' . $type->id() . '/delete');
     $this->assertRaw(
-      t('%label is used by 1 comment on your site. You can not remove this comment type until you have removed all of the %label comments.', array('%label' => $type->label())),
+      t('%label is used by 1 comment on your site. You can not remove this comment type until you have removed all of the %label comments.', ['%label' => $type->label()]),
       'The comment type will not be deleted until all comments of that type are removed.'
     );
     $this->assertRaw(
-      t('%label is used by the %field field on your site. You can not remove this comment type until you have removed the field.', array(
+      t('%label is used by the %field field on your site. You can not remove this comment type until you have removed the field.', [
         '%label' => 'foo',
         '%field' => 'node.foo',
-      )),
+      ]),
       'The comment type will not be deleted until all fields of that type are removed.'
     );
     $this->assertNoText(t('This action cannot be undone.'), 'The comment type deletion confirmation form is not available.');
@@ -167,7 +167,7 @@ class CommentTypeTest extends CommentTestBase {
     // Attempt to delete the comment type, which should now be allowed.
     $this->drupalGet('admin/structure/comment/manage/' . $type->id() . '/delete');
     $this->assertRaw(
-      t('Are you sure you want to delete the comment type %type?', array('%type' => $type->id())),
+      t('Are you sure you want to delete the comment type %type?', ['%type' => $type->id()]),
       'The comment type is available for deletion.'
     );
     $this->assertText(t('This action cannot be undone.'), 'The comment type deletion confirmation form is available.');
@@ -182,9 +182,9 @@ class CommentTypeTest extends CommentTestBase {
     }
 
     // Delete the comment type.
-    $this->drupalPostForm('admin/structure/comment/manage/' . $type->id() . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/comment/manage/' . $type->id() . '/delete', [], t('Delete'));
     $this->assertNull(CommentType::load($type->id()), 'Comment type deleted.');
-    $this->assertRaw(t('The comment type %label has been deleted.', array('%label' => $type->label())));
+    $this->assertRaw(t('The comment type %label has been deleted.', ['%label' => $type->label()]));
   }
 
 }
diff --git a/web/core/modules/comment/src/Tests/CommentUninstallTest.php b/web/core/modules/comment/src/Tests/CommentUninstallTest.php
index 4d86df947..7873915f0 100644
--- a/web/core/modules/comment/src/Tests/CommentUninstallTest.php
+++ b/web/core/modules/comment/src/Tests/CommentUninstallTest.php
@@ -20,13 +20,13 @@ class CommentUninstallTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('comment', 'node');
+  public static $modules = ['comment', 'node'];
 
   protected function setUp() {
     parent::setup();
 
     // Create an article content type.
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => t('Article')));
+    $this->drupalCreateContentType(['type' => 'article', 'name' => t('Article')]);
     // Create comment field on article so that adds 'comment_body' field.
     $this->addDefaultCommentField('node', 'article');
   }
@@ -36,14 +36,14 @@ class CommentUninstallTest extends WebTestBase {
    *
    * @throws \Drupal\Core\Extension\ModuleUninstallValidatorException
    */
-  function testCommentUninstallWithField() {
+  public function testCommentUninstallWithField() {
     // Ensure that the field exists before uninstallation.
     $field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
     $this->assertNotNull($field_storage, 'The comment_body field exists.');
 
     // Uninstall the comment module which should trigger an exception.
     try {
-      $this->container->get('module_installer')->uninstall(array('comment'));
+      $this->container->get('module_installer')->uninstall(['comment']);
       $this->fail("Expected an exception when uninstall was attempted.");
     }
     catch (ModuleUninstallValidatorException $e) {
@@ -55,7 +55,7 @@ class CommentUninstallTest extends WebTestBase {
   /**
    * Tests if uninstallation succeeds if the field has been deleted beforehand.
    */
-  function testCommentUninstallWithoutField() {
+  public function testCommentUninstallWithoutField() {
     // Manually delete the comment_body field before module uninstallation.
     $field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
     $this->assertNotNull($field_storage, 'The comment_body field exists.');
@@ -77,7 +77,7 @@ class CommentUninstallTest extends WebTestBase {
     field_purge_batch(10);
     // Ensure that uninstallation succeeds even if the field has already been
     // deleted manually beforehand.
-    $this->container->get('module_installer')->uninstall(array('comment'));
+    $this->container->get('module_installer')->uninstall(['comment']);
   }
 
 }
diff --git a/web/core/modules/comment/src/Tests/Update/CommentUpdateTest.php b/web/core/modules/comment/src/Tests/Update/CommentUpdateTest.php
index 61d187d50..3db9c4a67 100644
--- a/web/core/modules/comment/src/Tests/Update/CommentUpdateTest.php
+++ b/web/core/modules/comment/src/Tests/Update/CommentUpdateTest.php
@@ -50,4 +50,25 @@ class CommentUpdateTest extends UpdatePathTestBase {
     $this->assertIdentical($config->get('content.comment_forum.settings.view_mode'), 'default');
   }
 
+  /**
+   * Tests that the comment entity type has a 'published' entity key.
+   *
+   * @see comment_update_8301()
+   */
+  public function testPublishedEntityKey() {
+    // Check that the 'published' entity key does not exist prior to the update.
+    $entity_type = \Drupal::entityDefinitionUpdateManager()->getEntityType('comment');
+    $this->assertFalse($entity_type->getKey('published'));
+
+    // Run updates.
+    $this->runUpdates();
+
+    // Check that the entity key exists and it has the correct value.
+    $entity_type = \Drupal::entityDefinitionUpdateManager()->getEntityType('comment');
+    $this->assertEqual('status', $entity_type->getKey('published'));
+
+    // Check that the {comment_field_data} table status index has been created.
+    $this->assertTrue(\Drupal::database()->schema()->indexExists('comment_field_data', 'comment__status_comment_type'));
+  }
+
 }
diff --git a/web/core/modules/comment/src/Tests/Views/ArgumentUserUIDTest.php b/web/core/modules/comment/src/Tests/Views/ArgumentUserUIDTest.php
index 63a008277..d3526dc28 100644
--- a/web/core/modules/comment/src/Tests/Views/ArgumentUserUIDTest.php
+++ b/web/core/modules/comment/src/Tests/Views/ArgumentUserUIDTest.php
@@ -18,9 +18,9 @@ class ArgumentUserUIDTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_comment_user_uid');
+  public static $testViews = ['test_comment_user_uid'];
 
-  function testCommentUserUIDTest() {
+  public function testCommentUserUIDTest() {
     // Add an additional comment which is not created by the user.
     $new_user = User::create(['name' => 'new user']);
     $new_user->save();
@@ -35,16 +35,16 @@ class ArgumentUserUIDTest extends CommentTestBase {
     $comment->save();
 
     $view = Views::getView('test_comment_user_uid');
-    $this->executeView($view, array($this->account->id()));
-    $result_set = array(
-      array(
+    $this->executeView($view, [$this->account->id()]);
+    $result_set = [
+      [
         'nid' => $this->nodeUserPosted->id(),
-      ),
-      array(
+      ],
+      [
         'nid' => $this->nodeUserCommented->id(),
-      ),
-    );
-    $column_map = array('nid' => 'nid');
+      ],
+    ];
+    $column_map = ['nid' => 'nid'];
     $this->assertIdenticalResultset($view, $result_set, $column_map);
   }
 
diff --git a/web/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php b/web/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php
index c0cf37476..48f7d6d25 100644
--- a/web/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php
+++ b/web/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php
@@ -15,23 +15,23 @@ class CommentFieldFilterTest extends CommentTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_field_filters');
+  public static $testViews = ['test_field_filters'];
 
   /**
    * List of comment titles by language.
    *
    * @var array
    */
-  public $commentTitles = array();
+  public $commentTitles = [];
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
     $this->drupalLogin($this->drupalCreateUser(['access comments']));
 
@@ -40,15 +40,15 @@ class CommentFieldFilterTest extends CommentTestBase {
     ConfigurableLanguage::createFromLangcode('es')->save();
 
     // Set up comment titles.
-    $this->commentTitles = array(
+    $this->commentTitles = [
       'en' => 'Food in Paris',
       'es' => 'Comida en Paris',
       'fr' => 'Nouriture en Paris',
-    );
+    ];
 
     // Create a new comment. Using the one created earlier will not work,
     // as it predates the language set-up.
-    $comment = array(
+    $comment = [
       'uid' => $this->loggedInUser->id(),
       'entity_id' => $this->nodeUserCommented->id(),
       'entity_type' => 'node',
@@ -56,7 +56,7 @@ class CommentFieldFilterTest extends CommentTestBase {
       'cid' => '',
       'pid' => '',
       'node_type' => '',
-    );
+    ];
     $this->comment = Comment::create($comment);
 
     // Add field values and translate the comment.
@@ -64,8 +64,8 @@ class CommentFieldFilterTest extends CommentTestBase {
     $this->comment->comment_body->value = $this->commentTitles['en'];
     $this->comment->langcode = 'en';
     $this->comment->save();
-    foreach (array('es', 'fr') as $langcode) {
-      $translation = $this->comment->addTranslation($langcode, array());
+    foreach (['es', 'fr'] as $langcode) {
+      $translation = $this->comment->addTranslation($langcode, []);
       $translation->comment_body->value = $this->commentTitles[$langcode];
       $translation->subject->value = $this->commentTitles[$langcode];
     }
@@ -78,19 +78,19 @@ class CommentFieldFilterTest extends CommentTestBase {
   public function testFilters() {
     // Test the title filter page, which filters for title contains 'Comida'.
     // Should show just the Spanish translation, once.
-    $this->assertPageCounts('test-title-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida title filter');
+    $this->assertPageCounts('test-title-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida title filter');
 
     // Test the body filter page, which filters for body contains 'Comida'.
     // Should show just the Spanish translation, once.
-    $this->assertPageCounts('test-body-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida body filter');
+    $this->assertPageCounts('test-body-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida body filter');
 
     // Test the title Paris filter page, which filters for title contains
     // 'Paris'. Should show each translation once.
-    $this->assertPageCounts('test-title-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris title filter');
+    $this->assertPageCounts('test-title-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris title filter');
 
     // Test the body Paris filter page, which filters for body contains
     // 'Paris'. Should show each translation once.
-    $this->assertPageCounts('test-body-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris body filter');
+    $this->assertPageCounts('test-body-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris body filter');
   }
 
   /**
diff --git a/web/core/modules/comment/src/Tests/Views/CommentRestExportTest.php b/web/core/modules/comment/src/Tests/Views/CommentRestExportTest.php
index a3d7e2dcc..ed7ce55e3 100644
--- a/web/core/modules/comment/src/Tests/Views/CommentRestExportTest.php
+++ b/web/core/modules/comment/src/Tests/Views/CommentRestExportTest.php
@@ -27,7 +27,7 @@ class CommentRestExportTest extends CommentTestBase {
   protected function setUp() {
     parent::setUp();
     // Add another anonymous comment.
-    $comment = array(
+    $comment = [
       'uid' => 0,
       'entity_id' => $this->nodeUserCommented->id(),
       'entity_type' => 'node',
@@ -38,7 +38,7 @@ class CommentRestExportTest extends CommentTestBase {
       'mail' => 'someone@example.com',
       'name' => 'bobby tables',
       'hostname' => 'public.example.com',
-    );
+    ];
     $this->comment = Comment::create($comment);
     $this->comment->save();
 
diff --git a/web/core/modules/comment/src/Tests/Views/CommentRowTest.php b/web/core/modules/comment/src/Tests/Views/CommentRowTest.php
index e96869c0b..d73811e51 100644
--- a/web/core/modules/comment/src/Tests/Views/CommentRowTest.php
+++ b/web/core/modules/comment/src/Tests/Views/CommentRowTest.php
@@ -14,7 +14,7 @@ class CommentRowTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_comment_row');
+  public static $testViews = ['test_comment_row'];
 
   /**
    * Test comment row.
diff --git a/web/core/modules/comment/src/Tests/Views/CommentTestBase.php b/web/core/modules/comment/src/Tests/Views/CommentTestBase.php
index d687488b5..d7bec0481 100644
--- a/web/core/modules/comment/src/Tests/Views/CommentTestBase.php
+++ b/web/core/modules/comment/src/Tests/Views/CommentTestBase.php
@@ -19,7 +19,7 @@ abstract class CommentTestBase extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'comment', 'comment_test_views');
+  public static $modules = ['node', 'comment', 'comment_test_views'];
 
   /**
    * A normal user with permission to post comments (without approval).
@@ -59,21 +59,21 @@ abstract class CommentTestBase extends ViewTestBase {
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('comment_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['comment_test_views']);
 
     // Add two users, create a node with the user1 as author and another node
     // with user2 as author. For the second node add a comment from user1.
-    $this->account = $this->drupalCreateUser(array('skip comment approval'));
+    $this->account = $this->drupalCreateUser(['skip comment approval']);
     $this->account2 = $this->drupalCreateUser();
     $this->drupalLogin($this->account);
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => t('Basic page')));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => t('Basic page')]);
     $this->addDefaultCommentField('node', 'page');
 
     $this->nodeUserPosted = $this->drupalCreateNode();
-    $this->nodeUserCommented = $this->drupalCreateNode(array('uid' => $this->account2->id()));
+    $this->nodeUserCommented = $this->drupalCreateNode(['uid' => $this->account2->id()]);
 
-    $comment = array(
+    $comment = [
       'uid' => $this->loggedInUser->id(),
       'entity_id' => $this->nodeUserCommented->id(),
       'entity_type' => 'node',
@@ -82,7 +82,7 @@ abstract class CommentTestBase extends ViewTestBase {
       'cid' => '',
       'pid' => '',
       'mail' => 'someone@example.com',
-    );
+    ];
     $this->comment = Comment::create($comment);
     $this->comment->save();
   }
diff --git a/web/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php b/web/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
index ff151c68b..3e5f26b0e 100644
--- a/web/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
+++ b/web/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
@@ -22,7 +22,7 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'comment', 'block');
+  public static $modules = ['node', 'comment', 'block'];
 
   /**
    * Number of results for the Master display.
@@ -50,7 +50,7 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
    *
    * @var array
    */
-  protected $commentsCreated = array();
+  protected $commentsCreated = [];
 
   /**
    * Contains the node object used for comments of this test.
@@ -66,9 +66,9 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
     $content_type = $this->drupalCreateContentType();
 
     // Add a node of the new content type.
-    $node_data = array(
+    $node_data = [
       'type' => $content_type->id(),
-    );
+    ];
 
     $this->addDefaultCommentField('node', $content_type->id());
     $this->node = $this->drupalCreateNode($node_data);
@@ -79,12 +79,12 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
     // Create some comments and attach them to the created node.
     for ($i = 0; $i < $this->masterDisplayResults; $i++) {
       /** @var \Drupal\comment\CommentInterface $comment */
-      $comment = Comment::create(array(
+      $comment = Comment::create([
         'status' => CommentInterface::PUBLISHED,
         'field_name' => 'comment',
         'entity_type' => 'node',
         'entity_id' => $this->node->id(),
-      ));
+      ]);
       $comment->setOwnerId(0);
       $comment->setSubject('Test comment ' . $i);
       $comment->comment_body->value = 'Test body ' . $i;
@@ -116,12 +116,12 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
     $view->setDisplay('block_1');
     $this->executeView($view);
 
-    $map = array(
+    $map = [
       'subject' => 'subject',
       'cid' => 'cid',
       'comment_field_data_created' => 'created'
-    );
-    $expected_result = array();
+    ];
+    $expected_result = [];
     foreach (array_values($this->commentsCreated) as $key => $comment) {
       $expected_result[$key]['subject'] = $comment->getSubject();
       $expected_result[$key]['cid'] = $comment->id();
@@ -132,7 +132,7 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
     // Check the number of results given by the display is the expected.
     $this->assertEqual(sizeof($view->result), $this->blockDisplayResults,
       format_string('There are exactly @results comments. Expected @expected',
-        array('@results' => count($view->result), '@expected' => $this->blockDisplayResults)
+        ['@results' => count($view->result), '@expected' => $this->blockDisplayResults]
       )
     );
   }
diff --git a/web/core/modules/comment/src/Tests/Views/FilterUserUIDTest.php b/web/core/modules/comment/src/Tests/Views/FilterUserUIDTest.php
index ee8281b50..442a0e762 100644
--- a/web/core/modules/comment/src/Tests/Views/FilterUserUIDTest.php
+++ b/web/core/modules/comment/src/Tests/Views/FilterUserUIDTest.php
@@ -20,9 +20,9 @@ class FilterUserUIDTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_comment_user_uid');
+  public static $testViews = ['test_comment_user_uid'];
 
-  function testCommentUserUIDTest() {
+  public function testCommentUserUIDTest() {
     $view = Views::getView('test_comment_user_uid');
     $view->setDisplay();
     $view->removeHandler('default', 'argument', 'uid_touch');
@@ -40,23 +40,23 @@ class FilterUserUIDTest extends CommentTestBase {
     ]);
     $comment->save();
 
-    $options = array(
+    $options = [
       'id' => 'uid_touch',
       'table' => 'node_field_data',
       'field' => 'uid_touch',
-      'value' => array($this->loggedInUser->id()),
-    );
+      'value' => [$this->loggedInUser->id()],
+    ];
     $view->addHandler('default', 'filter', 'node_field_data', 'uid_touch', $options);
-    $this->executeView($view, array($this->account->id()));
-    $result_set = array(
-      array(
+    $this->executeView($view, [$this->account->id()]);
+    $result_set = [
+      [
         'nid' => $this->nodeUserPosted->id(),
-      ),
-      array(
+      ],
+      [
         'nid' => $this->nodeUserCommented->id(),
-      ),
-    );
-    $column_map = array('nid' => 'nid');
+      ],
+    ];
+    $column_map = ['nid' => 'nid'];
     $this->assertIdenticalResultset($view, $result_set, $column_map);
   }
 
diff --git a/web/core/modules/comment/src/Tests/Views/RowRssTest.php b/web/core/modules/comment/src/Tests/Views/RowRssTest.php
index 85bd34fb6..343b797cf 100644
--- a/web/core/modules/comment/src/Tests/Views/RowRssTest.php
+++ b/web/core/modules/comment/src/Tests/Views/RowRssTest.php
@@ -15,7 +15,7 @@ class RowRssTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_comment_rss');
+  public static $testViews = ['test_comment_rss'];
 
   /**
    * Test comment rss output.
diff --git a/web/core/modules/comment/src/Tests/Views/WizardTest.php b/web/core/modules/comment/src/Tests/Views/WizardTest.php
index 885ce2cf4..a7f14c82e 100644
--- a/web/core/modules/comment/src/Tests/Views/WizardTest.php
+++ b/web/core/modules/comment/src/Tests/Views/WizardTest.php
@@ -21,7 +21,7 @@ class WizardTest extends WizardTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'comment');
+  public static $modules = ['node', 'comment'];
 
 
   /**
@@ -29,7 +29,7 @@ class WizardTest extends WizardTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => t('Basic page')));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => t('Basic page')]);
     // Add comment field to page node type.
     $this->addDefaultCommentField('node', 'page');
   }
@@ -38,7 +38,7 @@ class WizardTest extends WizardTestBase {
    * Tests adding a view of comments.
    */
   public function testCommentWizard() {
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = strtolower($this->randomMachineName(16));
     $view['show[wizard_key]'] = 'comment';
@@ -48,7 +48,7 @@ class WizardTest extends WizardTestBase {
     // Just triggering the saving should automatically choose a proper row
     // plugin.
     $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
-    $this->assertUrl('admin/structure/views/view/' . $view['id'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
+    $this->assertUrl('admin/structure/views/view/' . $view['id'], [], 'Make sure the view saving was successful and the browser got redirected to the edit page.');
 
     // If we update the type first we should get a selection of comment valid
     // row plugins as the select field.
@@ -59,19 +59,19 @@ class WizardTest extends WizardTestBase {
     // Check for available options of the row plugin.
     $xpath = $this->constructFieldXpath('name', 'page[style][row_plugin]');
     $fields = $this->xpath($xpath);
-    $options = array();
+    $options = [];
     foreach ($fields as $field) {
       $items = $this->getAllOptions($field);
       foreach ($items as $item) {
         $options[] = $item->attributes()->value;
       }
     }
-    $expected_options = array('entity:comment', 'fields');
+    $expected_options = ['entity:comment', 'fields'];
     $this->assertEqual($options, $expected_options);
 
     $view['id'] = strtolower($this->randomMachineName(16));
     $this->drupalPostForm(NULL, $view, t('Save and edit'));
-    $this->assertUrl('admin/structure/views/view/' . $view['id'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
+    $this->assertUrl('admin/structure/views/view/' . $view['id'], [], 'Make sure the view saving was successful and the browser got redirected to the edit page.');
 
     $user = $this->drupalCreateUser(['access comments']);
     $this->drupalLogin($user);
diff --git a/web/core/modules/comment/tests/modules/comment_test/comment_test.module b/web/core/modules/comment/tests/modules/comment_test/comment_test.module
index d54814ba1..b1cca02f2 100644
--- a/web/core/modules/comment/tests/modules/comment_test/comment_test.module
+++ b/web/core/modules/comment/tests/modules/comment_test/comment_test.module
@@ -31,14 +31,14 @@ function comment_test_comment_links_alter(array &$links, CommentInterface &$enti
     return;
   }
 
-  $links['comment_test'] = array(
+  $links['comment_test'] = [
     '#theme' => 'links__comment__comment_test',
-    '#attributes' => array('class' => array('links', 'inline')),
-    '#links' => array(
-      'comment-report' => array(
+    '#attributes' => ['class' => ['links', 'inline']],
+    '#links' => [
+      'comment-report' => [
         'title' => t('Report'),
         'url' => Url::fromRoute('comment_test.report', ['comment' => $entity->id()], ['query' => ['token' => \Drupal::getContainer()->get('csrf_token')->get("comment/{$entity->id()}/report")]]),
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 }
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php b/web/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php
index a95088e94..bdea71df1 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php
@@ -26,7 +26,7 @@ class CommentDefaultFormatterCacheTagsTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('entity_test', 'comment');
+  public static $modules = ['entity_test', 'comment'];
 
   /**
    * {@inheritdoc}
@@ -48,11 +48,11 @@ class CommentDefaultFormatterCacheTagsTest extends EntityKernelTestBase {
     // user does not have access to the 'administer comments' permission, to
     // ensure only published comments are visible to the end user.
     $current_user = $this->container->get('current_user');
-    $current_user->setAccount($this->createUser(array(), array('access comments')));
+    $current_user->setAccount($this->createUser([], ['access comments']));
 
     // Install tables and config needed to render comments.
-    $this->installSchema('comment', array('comment_entity_statistics'));
-    $this->installConfig(array('system', 'filter', 'comment'));
+    $this->installSchema('comment', ['comment_entity_statistics']);
+    $this->installConfig(['system', 'filter', 'comment']);
 
     // Comment rendering generates links, so build the router.
     $this->container->get('router.builder')->rebuild();
@@ -70,7 +70,7 @@ class CommentDefaultFormatterCacheTagsTest extends EntityKernelTestBase {
     $renderer = $this->container->get('renderer');
 
     // Create the entity that will be commented upon.
-    $commented_entity = EntityTest::create(array('name' => $this->randomMachineName()));
+    $commented_entity = EntityTest::create(['name' => $this->randomMachineName()]);
     $commented_entity->save();
 
     // Verify cache tags on the rendered entity before it has comments.
@@ -94,19 +94,19 @@ class CommentDefaultFormatterCacheTagsTest extends EntityKernelTestBase {
     // also exists in the {users} table.
     $user = $this->createUser();
     $user->save();
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'subject' => 'Llama',
-      'comment_body' => array(
+      'comment_body' => [
         'value' => 'Llamas are cool!',
         'format' => 'plain_text',
-      ),
+      ],
       'entity_id' => $commented_entity->id(),
       'entity_type' => 'entity_test',
       'field_name' => 'comment',
       'comment_type' => 'comment',
       'status' => CommentInterface::PUBLISHED,
       'uid' => $user->id(),
-    ));
+    ]);
     $comment->save();
 
     // Load commented entity so comment_count gets computed.
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php b/web/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php
index 674c7f3e3..504635330 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php
@@ -29,30 +29,30 @@ class CommentFieldAccessTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('comment', 'entity_test', 'user');
+  public static $modules = ['comment', 'entity_test', 'user'];
 
   /**
    * Fields that only users with administer comments permissions can change.
    *
    * @var array
    */
-  protected $administrativeFields = array(
+  protected $administrativeFields = [
     'uid',
     'status',
     'created',
-  );
+  ];
 
   /**
    * These fields are automatically managed and can not be changed by any user.
    *
    * @var array
    */
-  protected $readOnlyFields = array(
+  protected $readOnlyFields = [
     'changed',
     'hostname',
     'cid',
     'thread',
-  );
+  ];
 
   /**
    * These fields can be edited on create only.
@@ -73,19 +73,19 @@ class CommentFieldAccessTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  protected $contactFields = array(
+  protected $contactFields = [
     'name',
     'mail',
     'homepage',
-  );
+  ];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('user', 'comment'));
-    $this->installSchema('comment', array('comment_entity_statistics'));
+    $this->installConfig(['user', 'comment']);
+    $this->installSchema('comment', ['comment_entity_statistics']);
   }
 
   /**
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php b/web/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php
index ed56cc9ae..adbe1b08d 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php
@@ -18,21 +18,21 @@ class CommentStringIdEntitiesTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'comment',
     'user',
     'field',
     'field_ui',
     'entity_test',
     'text',
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
     $this->installEntitySchema('comment');
-    $this->installSchema('comment', array('comment_entity_statistics'));
+    $this->installSchema('comment', ['comment_entity_statistics']);
     // Create the comment body field storage.
-    $this->installConfig(array('field'));
+    $this->installConfig(['field']);
   }
 
   /**
@@ -40,21 +40,21 @@ class CommentStringIdEntitiesTest extends KernelTestBase {
    */
   public function testCommentFieldNonStringId() {
     try {
-      $bundle = CommentType::create(array(
+      $bundle = CommentType::create([
         'id' => 'foo',
         'label' => 'foo',
         'description' => '',
         'target_entity_type_id' => 'entity_test_string_id',
-      ));
+      ]);
       $bundle->save();
-      $field_storage = FieldStorageConfig::create(array(
+      $field_storage = FieldStorageConfig::create([
         'field_name' => 'foo',
         'entity_type' => 'entity_test_string_id',
-        'settings' => array(
+        'settings' => [
           'comment_type' => 'entity_test_string_id',
-        ),
+        ],
         'type' => 'comment',
-      ));
+      ]);
       $field_storage->save();
       $this->fail('Did not throw an exception as expected.');
     }
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentValidationTest.php b/web/core/modules/comment/tests/src/Kernel/CommentValidationTest.php
index eb37006ac..98b771513 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentValidationTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentValidationTest.php
@@ -19,14 +19,14 @@ class CommentValidationTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('comment', 'node');
+  public static $modules = ['comment', 'node'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('comment', array('comment_entity_statistics'));
+    $this->installSchema('comment', ['comment_entity_statistics']);
   }
 
   /**
@@ -34,54 +34,54 @@ class CommentValidationTest extends EntityKernelTestBase {
    */
   public function testValidation() {
     // Add a user.
-    $user = User::create(array('name' => 'test', 'status' => TRUE));
+    $user = User::create(['name' => 'test', 'status' => TRUE]);
     $user->save();
 
     // Add comment type.
-    $this->entityManager->getStorage('comment_type')->create(array(
+    $this->entityManager->getStorage('comment_type')->create([
       'id' => 'comment',
       'label' => 'comment',
       'target_entity_type_id' => 'node',
-    ))->save();
+    ])->save();
 
     // Add comment field to content.
-    $this->entityManager->getStorage('field_storage_config')->create(array(
+    $this->entityManager->getStorage('field_storage_config')->create([
       'entity_type' => 'node',
       'field_name' => 'comment',
       'type' => 'comment',
-      'settings' => array(
+      'settings' => [
         'comment_type' => 'comment',
-      )
-    ))->save();
+      ]
+    ])->save();
 
     // Create a page node type.
-    $this->entityManager->getStorage('node_type')->create(array(
+    $this->entityManager->getStorage('node_type')->create([
       'type' => 'page',
       'name' => 'page',
-    ))->save();
+    ])->save();
 
     // Add comment field to page content.
     /** @var \Drupal\field\FieldConfigInterface $field */
-    $field = $this->entityManager->getStorage('field_config')->create(array(
+    $field = $this->entityManager->getStorage('field_config')->create([
       'field_name' => 'comment',
       'entity_type' => 'node',
       'bundle' => 'page',
       'label' => 'Comment settings',
-    ));
+    ]);
     $field->save();
 
-    $node = $this->entityManager->getStorage('node')->create(array(
+    $node = $this->entityManager->getStorage('node')->create([
       'type' => 'page',
       'title' => 'test',
-    ));
+    ]);
     $node->save();
 
-    $comment = $this->entityManager->getStorage('comment')->create(array(
+    $comment = $this->entityManager->getStorage('comment')->create([
       'entity_id' => $node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment',
       'comment_body' => $this->randomMachineName(),
-    ));
+    ]);
 
     $violations = $comment->validate();
     $this->assertEqual(count($violations), 0, 'No violations when validating a default comment.');
@@ -101,7 +101,7 @@ class CommentValidationTest extends EntityKernelTestBase {
     $violations = $comment->validate();
     $this->assertEqual(count($violations), 1, "Violation found on author name collision");
     $this->assertEqual($violations[0]->getPropertyPath(), "name");
-    $this->assertEqual($violations[0]->getMessage(), t('The name you used (%name) belongs to a registered user.', array('%name' => 'test')));
+    $this->assertEqual($violations[0]->getMessage(), t('The name you used (%name) belongs to a registered user.', ['%name' => 'test']));
 
     // Make the name valid.
     $comment->set('name', 'valid unused name');
@@ -141,39 +141,39 @@ class CommentValidationTest extends EntityKernelTestBase {
     \Drupal::entityManager()->getStorage('node')->resetCache([$node->id()]);
     $node = Node::load($node->id());
     // Create a new comment with the new field.
-    $comment = $this->entityManager->getStorage('comment')->create(array(
+    $comment = $this->entityManager->getStorage('comment')->create([
       'entity_id' => $node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment',
       'comment_body' => $this->randomMachineName(),
       'uid' => 0,
       'name' => '',
-    ));
+    ]);
     $violations = $comment->validate();
     $this->assertEqual(count($violations), 1, 'Violation found when name is required, but empty and UID is anonymous.');
     $this->assertEqual($violations[0]->getPropertyPath(), 'name');
     $this->assertEqual($violations[0]->getMessage(), t('You have to specify a valid author.'));
 
     // Test creating a default comment with a given user id works.
-    $comment = $this->entityManager->getStorage('comment')->create(array(
+    $comment = $this->entityManager->getStorage('comment')->create([
       'entity_id' => $node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment',
       'comment_body' => $this->randomMachineName(),
       'uid' => $user->id(),
-    ));
+    ]);
     $violations = $comment->validate();
     $this->assertEqual(count($violations), 0, 'No violations when validating a default comment with an author.');
 
     // Test specifying a wrong author name does not work.
-    $comment = $this->entityManager->getStorage('comment')->create(array(
+    $comment = $this->entityManager->getStorage('comment')->create([
       'entity_id' => $node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment',
       'comment_body' => $this->randomMachineName(),
       'uid' => $user->id(),
       'name' => 'not-test',
-    ));
+    ]);
     $violations = $comment->validate();
     $this->assertEqual(count($violations), 1, 'Violation found when author name and comment author do not match.');
     $this->assertEqual($violations[0]->getPropertyPath(), 'name');
@@ -195,7 +195,7 @@ class CommentValidationTest extends EntityKernelTestBase {
     $this->assertEqual(count($violations), 1, "Violation found when $field_name is too long.");
     $this->assertEqual($violations[0]->getPropertyPath(), "$field_name.0.value");
     $field_label = $comment->get($field_name)->getFieldDefinition()->getLabel();
-    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => $field_label, '@max' => $length)));
+    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', ['%name' => $field_label, '@max' => $length]));
   }
 
 }
diff --git a/web/core/modules/comment/tests/src/Kernel/Migrate/MigrateCommentStubTest.php b/web/core/modules/comment/tests/src/Kernel/Migrate/MigrateCommentStubTest.php
index b5fc4fe34..0b256ea51 100644
--- a/web/core/modules/comment/tests/src/Kernel/Migrate/MigrateCommentStubTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Migrate/MigrateCommentStubTest.php
@@ -33,11 +33,11 @@ class MigrateCommentStubTest extends MigrateDrupalTestBase {
     $storage = \Drupal::entityManager()->getStorage('user');
     // Insert a row for the anonymous user.
     $storage
-      ->create(array(
+      ->create([
         'uid' => 0,
         'status' => 0,
         'name' => '',
-      ))
+      ])
       ->save();
     // Need at least one node type and comment type present.
     NodeType::create([
diff --git a/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php b/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php
index 5330e9416..c417c75ad 100644
--- a/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php
@@ -61,14 +61,17 @@ class MigrateCommentTest extends MigrateDrupal6TestBase {
     $this->assertIdentical('node', $comment->getCommentedEntityTypeId());
     $this->assertIdentical('en', $comment->language()->getId());
     $this->assertIdentical('comment_no_subject', $comment->getTypeId());
+    $this->assertEquals('203.0.113.1', $comment->getHostname());
 
     $comment = $comment_storage->load(2);
     $this->assertIdentical('The response to the second comment.', $comment->subject->value);
     $this->assertIdentical('3', $comment->pid->target_id);
+    $this->assertEquals('203.0.113.2', $comment->getHostname());
 
     $comment = $comment_storage->load(3);
     $this->assertIdentical('The second comment.', $comment->subject->value);
     $this->assertIdentical(NULL, $comment->pid->target_id);
+    $this->assertEquals('203.0.113.3', $comment->getHostname());
   }
 
 }
diff --git a/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php b/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
index 4d4df032e..a22bbe660 100644
--- a/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
@@ -34,11 +34,11 @@ class MigrateCommentTest extends MigrateDrupal7TestBase {
     $this->executeMigration('d7_node_type');
     // We only need the test_content_type node migration to run for real, so
     // mock all the others.
-    $this->prepareMigrations(array(
-      'd7_node' => array(
-        array(array(0), array(0)),
-      ),
-    ));
+    $this->prepareMigrations([
+      'd7_node' => [
+        [[0], [0]],
+      ],
+    ]);
     $this->executeMigrations([
       'd7_node',
       'd7_comment_type',
@@ -61,6 +61,7 @@ class MigrateCommentTest extends MigrateDrupal7TestBase {
     $this->assertIdentical('admin@local.host', $comment->getAuthorEmail());
     $this->assertIdentical('This is a comment', $comment->comment_body->value);
     $this->assertIdentical('filtered_html', $comment->comment_body->format);
+    $this->assertEquals('2001:db8:ffff:ffff:ffff:ffff:ffff:ffff', $comment->getHostname());
 
     $node = $comment->getCommentedEntity();
     $this->assertTrue($node instanceof NodeInterface);
diff --git a/web/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php b/web/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php
index dae2c480c..cad7b2b98 100644
--- a/web/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php
@@ -43,11 +43,11 @@ class CommentUserNameTest extends ViewsKernelTestBase {
     $storage = \Drupal::entityManager()->getStorage('user');
     // Insert a row for the anonymous user.
     $storage
-      ->create(array(
+      ->create([
         'uid' => 0,
         'name' => '',
         'status' => 0,
-      ))
+      ])
       ->save();
 
     $admin_role = Role::create([
diff --git a/web/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php b/web/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
index 61e93a112..18da223d9 100644
--- a/web/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
+++ b/web/core/modules/comment/tests/src/Unit/CommentLinkBuilderTest.php
@@ -75,9 +75,9 @@ class CommentLinkBuilderTest extends UnitTestCase {
     $this->commentManager->expects($this->any())
       ->method('getFields')
       ->with('node')
-      ->willReturn(array(
-        'comment' => array(),
-      ));
+      ->willReturn([
+        'comment' => [],
+      ]);
     $this->commentManager->expects($this->any())
       ->method('forbiddenMessage')
       ->willReturn("Can't let you do that Dave.");
@@ -116,10 +116,10 @@ class CommentLinkBuilderTest extends UnitTestCase {
       ->willReturn($history_exists);
     $this->currentUser->expects($this->any())
       ->method('hasPermission')
-      ->willReturnMap(array(
-        array('access comments', $has_access_comments),
-        array('post comments', $has_post_comments),
-      ));
+      ->willReturnMap([
+        ['access comments', $has_access_comments],
+        ['post comments', $has_post_comments],
+      ]);
     $this->currentUser->expects($this->any())
       ->method('isAuthenticated')
       ->willReturn(!$is_anonymous);
@@ -155,57 +155,57 @@ class CommentLinkBuilderTest extends UnitTestCase {
    * Data provider for ::testCommentLinkBuilder.
    */
   public function getLinkCombinations() {
-    $cases = array();
+    $cases = [];
     // No links should be created if the entity doesn't have the field.
-    $cases[] = array(
+    $cases[] = [
       $this->getMockNode(FALSE, CommentItemInterface::OPEN, CommentItemInterface::FORM_BELOW, 1),
-      array('view_mode' => 'teaser'),
+      ['view_mode' => 'teaser'],
       TRUE,
       TRUE,
       TRUE,
       TRUE,
-      array(),
-    );
-    foreach (array('search_result', 'search_index', 'print') as $view_mode) {
+      [],
+    ];
+    foreach (['search_result', 'search_index', 'print'] as $view_mode) {
       // Nothing should be output in these view modes.
-      $cases[] = array(
+      $cases[] = [
         $this->getMockNode(TRUE, CommentItemInterface::OPEN, CommentItemInterface::FORM_BELOW, 1),
-        array('view_mode' => $view_mode),
+        ['view_mode' => $view_mode],
         TRUE,
         TRUE,
         TRUE,
         TRUE,
-        array(),
-      );
+        [],
+      ];
     }
     // All other combinations.
-    $combinations = array(
-      'is_anonymous' => array(FALSE, TRUE),
-      'comment_count' => array(0, 1),
-      'has_access_comments' => array(0, 1),
-      'history_exists' => array(FALSE, TRUE),
-      'has_post_comments'   => array(0, 1),
-      'form_location'            => array(CommentItemInterface::FORM_BELOW, CommentItemInterface::FORM_SEPARATE_PAGE),
-      'comments'        => array(
+    $combinations = [
+      'is_anonymous' => [FALSE, TRUE],
+      'comment_count' => [0, 1],
+      'has_access_comments' => [0, 1],
+      'history_exists' => [FALSE, TRUE],
+      'has_post_comments'   => [0, 1],
+      'form_location'            => [CommentItemInterface::FORM_BELOW, CommentItemInterface::FORM_SEPARATE_PAGE],
+      'comments'        => [
         CommentItemInterface::OPEN,
         CommentItemInterface::CLOSED,
         CommentItemInterface::HIDDEN,
-      ),
-      'view_mode' => array(
+      ],
+      'view_mode' => [
         'teaser', 'rss', 'full',
-      ),
-    );
+      ],
+    ];
     $permutations = TestBase::generatePermutations($combinations);
     foreach ($permutations as $combination) {
-      $case = array(
+      $case = [
         $this->getMockNode(TRUE, $combination['comments'], $combination['form_location'], $combination['comment_count']),
-        array('view_mode' => $combination['view_mode']),
+        ['view_mode' => $combination['view_mode']],
         $combination['has_access_comments'],
         $combination['history_exists'],
         $combination['has_post_comments'],
         $combination['is_anonymous'],
-      );
-      $expected = array();
+      ];
+      $expected = [];
       // When comments are enabled in teaser mode, and comments exist, and the
       // user has access - we can output the comment count.
       if ($combination['comments'] && $combination['view_mode'] == 'teaser' && $combination['comment_count'] && $combination['has_access_comments']) {
@@ -225,7 +225,7 @@ class CommentLinkBuilderTest extends UnitTestCase {
             // comments exist or the form is on a separate page.
             if ($combination['view_mode'] == 'teaser' || ($combination['has_access_comments'] && $combination['comment_count']) || $combination['form_location'] == CommentItemInterface::FORM_SEPARATE_PAGE) {
               // There should be a add comment link.
-              $expected['comment-add'] = array('title' => 'Add new comment');
+              $expected['comment-add'] = ['title' => 'Add new comment'];
               if ($combination['form_location'] == CommentItemInterface::FORM_BELOW) {
                 // On the same page.
                 $expected['comment-add']['url'] = Url::fromRoute('node.view');
@@ -274,11 +274,11 @@ class CommentLinkBuilderTest extends UnitTestCase {
     if (empty($this->timestamp)) {
       $this->timestamp = time();
     }
-    $field_item = (object) array(
+    $field_item = (object) [
       'status' => $comment_status,
       'comment_count' => $comment_count,
       'last_comment_timestamp' => $this->timestamp,
-    );
+    ];
     $node->expects($this->any())
       ->method('get')
       ->with('comment')
@@ -312,7 +312,7 @@ class CommentLinkBuilderTest extends UnitTestCase {
       ->willReturn($url);
     $node->expects($this->any())
       ->method('url')
-      ->willReturn(array('route_name' => 'node.view'));
+      ->willReturn(['route_name' => 'node.view']);
 
     return $node;
   }
diff --git a/web/core/modules/comment/tests/src/Unit/CommentManagerTest.php b/web/core/modules/comment/tests/src/Unit/CommentManagerTest.php
index 7fe1c1632..3a6e20124 100644
--- a/web/core/modules/comment/tests/src/Unit/CommentManagerTest.php
+++ b/web/core/modules/comment/tests/src/Unit/CommentManagerTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\comment\Unit;
 
 use Drupal\comment\CommentManager;
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -23,21 +24,21 @@ class CommentManagerTest extends UnitTestCase {
       ->method('getClass')
       ->will($this->returnValue('Node'));
     $entity_type->expects($this->any())
-      ->method('isSubclassOf')
-      ->with('\Drupal\Core\Entity\FieldableEntityInterface')
+      ->method('entityClassImplements')
+      ->with(FieldableEntityInterface::class)
       ->will($this->returnValue(TRUE));
 
     $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
 
     $entity_manager->expects($this->once())
       ->method('getFieldMapByFieldType')
-      ->will($this->returnValue(array(
-        'node' => array(
-          'field_foobar' => array(
+      ->will($this->returnValue([
+        'node' => [
+          'field_foobar' => [
             'type' => 'comment',
-          ),
-        ),
-      )));
+          ],
+        ],
+      ]));
 
     $entity_manager->expects($this->any())
       ->method('getDefinition')
@@ -45,7 +46,6 @@ class CommentManagerTest extends UnitTestCase {
 
     $comment_manager = new CommentManager(
       $entity_manager,
-      $this->getMockBuilder('Drupal\Core\Entity\Query\QueryFactory')->disableOriginalConstructor()->getMock(),
       $this->getMock('Drupal\Core\Config\ConfigFactoryInterface'),
       $this->getMock('Drupal\Core\StringTranslation\TranslationInterface'),
       $this->getMock('Drupal\Core\Routing\UrlGeneratorInterface'),
diff --git a/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php b/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
index 39b4cf0a0..2a6d37930 100644
--- a/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
+++ b/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
@@ -56,7 +56,7 @@ class CommentStatisticsUnitTest extends UnitTestCase {
 
     $this->statement->expects($this->any())
       ->method('fetchObject')
-      ->will($this->returnCallback(array($this, 'fetchObjectCallback')));
+      ->will($this->returnCallback([$this, 'fetchObjectCallback']));
 
     $this->select = $this->getMockBuilder('Drupal\Core\Database\Query\Select')
       ->disableOriginalConstructor()
@@ -95,8 +95,8 @@ class CommentStatisticsUnitTest extends UnitTestCase {
    */
   public function testRead() {
     $this->calls_to_fetch = 0;
-    $results = $this->commentStatistics->read(array('1' => 'boo', '2' => 'foo'), 'snafoos');
-    $this->assertEquals($results, array('something', 'something-else'));
+    $results = $this->commentStatistics->read(['1' => 'boo', '2' => 'foo'], 'snafoos');
+    $this->assertEquals($results, ['something', 'something-else']);
   }
 
   /**
diff --git a/web/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php b/web/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php
index 97c109f0e..e724dc6b8 100644
--- a/web/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php
+++ b/web/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php
@@ -26,7 +26,7 @@ class CommentLockTest extends UnitTestCase {
     $request_stack = new RequestStack();
     $request_stack->push(Request::create('/'));
     $container->set('request_stack', $request_stack);
-    $container->setParameter('cache_bins', array('cache.test' => 'test'));
+    $container->setParameter('cache_bins', ['cache.test' => 'test']);
     $lock = $this->getMock('Drupal\Core\Lock\LockBackendInterface');
     $cid = 2;
     $lock_name = "comment:$cid:.00/";
@@ -84,7 +84,7 @@ class CommentLockTest extends UnitTestCase {
     $comment->expects($this->at(1))
       ->method('get')
       ->with('status')
-      ->will($this->returnValue((object) array('value' => NULL)));
+      ->will($this->returnValue((object) ['value' => NULL]));
     $storage = $this->getMock('Drupal\comment\CommentStorageInterface');
 
     // preSave() should acquire the lock. (This is what's really being tested.)
diff --git a/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentTestBase.php b/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentTestBase.php
index 79bae3e3a..220328be0 100644
--- a/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentTestBase.php
+++ b/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentTestBase.php
@@ -14,20 +14,20 @@ abstract class CommentTestBase extends MigrateSqlSourceTestCase {
   const PLUGIN_CLASS = 'Drupal\comment\Plugin\migrate\source\d6\Comment';
 
   // The fake Migration configuration entity.
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     // The ID of the entity, can be any string.
     'id' => 'test',
     // This needs to be the identifier of the actual key: cid for comment, nid
     // for node and so on.
-    'source' => array(
+    'source' => [
       'plugin' => 'd6_comment',
-    ),
-  );
+    ],
+  ];
 
   // We need to set up the database contents; it's easier to do that below.
 
-  protected $expectedResults = array(
-    array(
+  protected $expectedResults = [
+    [
       'cid' => 1,
       'pid' => 0,
       'nid' => 2,
@@ -43,8 +43,8 @@ abstract class CommentTestBase extends MigrateSqlSourceTestCase {
       'homepage' => '',
       'format' => 'testformat1',
       'type' => 'story',
-    ),
-    array(
+    ],
+    [
       'cid' => 2,
       'pid' => 1,
       'nid' => 3,
@@ -60,8 +60,8 @@ abstract class CommentTestBase extends MigrateSqlSourceTestCase {
       'homepage' => '',
       'format' => 'testformat2',
       'type' => 'page',
-    ),
-  );
+    ],
+  ];
 
   /**
    * {@inheritdoc}
@@ -72,8 +72,8 @@ abstract class CommentTestBase extends MigrateSqlSourceTestCase {
       $this->databaseContents['comments'][$k]['status'] = 1 - $this->databaseContents['comments'][$k]['status'];
     }
     // Add node table data.
-    $this->databaseContents['node'][] = array('nid' => 2, 'type' => 'story');
-    $this->databaseContents['node'][] = array('nid' => 3, 'type' => 'page');
+    $this->databaseContents['node'][] = ['nid' => 2, 'type' => 'story'];
+    $this->databaseContents['node'][] = ['nid' => 3, 'type' => 'page'];
     parent::setUp();
   }
 
diff --git a/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentVariablePerCommentTypeTest.php b/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentVariablePerCommentTypeTest.php
index 75d0932a9..892319a18 100644
--- a/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentVariablePerCommentTypeTest.php
+++ b/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentVariablePerCommentTypeTest.php
@@ -13,46 +13,46 @@ class CommentVariablePerCommentTypeTest extends MigrateSqlSourceTestCase {
 
   const PLUGIN_CLASS = CommentVariablePerCommentType::class;
 
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'test',
-    'source' => array(
+    'source' => [
       'plugin' => 'd6_comment_variable_per_comment_type',
-    ),
-  );
+    ],
+  ];
 
-  protected $expectedResults = array(
+  protected $expectedResults = [
     // Each result will also include a label and description, but those are
     // static values set by the source plugin and don't need to be asserted.
-    array(
+    [
       'comment_type' => 'comment',
-    ),
-    array(
+    ],
+    [
       'comment_type' => 'comment_no_subject',
-    ),
-  );
+    ],
+  ];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->databaseContents['node_type'] = array(
-      array(
+    $this->databaseContents['node_type'] = [
+      [
         'type' => 'page',
-      ),
-      array(
+      ],
+      [
         'type' => 'story',
-      ),
-    );
-    $this->databaseContents['variable'] = array(
-      array(
+      ],
+    ];
+    $this->databaseContents['variable'] = [
+      [
         'name' => 'comment_subject_field_page',
         'value' => serialize(1),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_subject_field_story',
         'value' => serialize(0),
-      ),
-    );
+      ],
+    ];
     parent::setUp();
   }
 
diff --git a/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentVariableTest.php b/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentVariableTest.php
index 6d25a2bd3..406cd11f6 100644
--- a/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentVariableTest.php
+++ b/web/core/modules/comment/tests/src/Unit/Migrate/d6/CommentVariableTest.php
@@ -13,15 +13,15 @@ class CommentVariableTest extends MigrateSqlSourceTestCase {
 
   const PLUGIN_CLASS = CommentVariable::class;
 
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'test',
-    'source' => array(
+    'source' => [
       'plugin' => 'd6_comment_variable',
-    ),
-  );
+    ],
+  ];
 
-  protected $expectedResults = array(
-    array(
+  protected $expectedResults = [
+    [
       'comment' => '1',
       'comment_default_mode' => '1',
       'comment_default_order' => '1',
@@ -33,56 +33,56 @@ class CommentVariableTest extends MigrateSqlSourceTestCase {
       'comment_form_location' => '1',
       'node_type' => 'page',
       'comment_type' => 'comment',
-    ),
-  );
+    ],
+  ];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->databaseContents['node_type'] = array(
-      array(
+    $this->databaseContents['node_type'] = [
+      [
         'type' => 'page',
-      ),
-    );
-    $this->databaseContents['variable'] = array(
-      array(
+      ],
+    ];
+    $this->databaseContents['variable'] = [
+      [
         'name' => 'comment_page',
         'value' => serialize(1),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_default_mode_page',
         'value' => serialize(1),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_default_order_page',
         'value' => serialize(1),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_default_per_page_page',
         'value' => serialize(50),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_controls_page',
         'value' => serialize(1),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_anonymous_page',
         'value' => serialize(1),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_subject_field_page',
         'value' => serialize(1),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_preview_page',
         'value' => serialize(1),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_form_location_page',
         'value' => serialize(1),
-      ),
-    );
+      ],
+    ];
     parent::setUp();
   }
 
diff --git a/web/core/modules/comment/tests/src/Unit/Migrate/d7/CommentTest.php b/web/core/modules/comment/tests/src/Unit/Migrate/d7/CommentTest.php
index 779334869..aed2f2855 100644
--- a/web/core/modules/comment/tests/src/Unit/Migrate/d7/CommentTest.php
+++ b/web/core/modules/comment/tests/src/Unit/Migrate/d7/CommentTest.php
@@ -13,15 +13,15 @@ class CommentTest extends MigrateSqlSourceTestCase {
 
   const PLUGIN_CLASS = 'Drupal\comment\Plugin\migrate\source\d7\Comment';
 
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'test',
-    'source' => array(
+    'source' => [
       'plugin' => 'd7_comment',
-    ),
-  );
+    ],
+  ];
 
-  protected $expectedResults = array(
-    array(
+  protected $expectedResults = [
+    [
       'cid' => '1',
       'pid' => '0',
       'nid' => '1',
@@ -36,14 +36,14 @@ class CommentTest extends MigrateSqlSourceTestCase {
       'mail' => '',
       'homepage' => '',
       'language' => 'und',
-      'comment_body' => array(
-        array(
+      'comment_body' => [
+        [
           'value' => 'This is a comment',
           'format' => 'filtered_html',
-        ),
-      ),
-    ),
-  );
+        ],
+      ],
+    ],
+  ];
 
   /**
    * {@inheritdoc}
@@ -52,8 +52,8 @@ class CommentTest extends MigrateSqlSourceTestCase {
     $this->databaseContents['comment'] = $this->expectedResults;
     unset($this->databaseContents['comment'][0]['comment_body']);
 
-    $this->databaseContents['node'] = array(
-      array(
+    $this->databaseContents['node'] = [
+      [
         'nid' => '1',
         'vid' => '1',
         'type' => 'test_content_type',
@@ -68,10 +68,10 @@ class CommentTest extends MigrateSqlSourceTestCase {
         'sticky' => '0',
         'tnid' => '0',
         'translate' => '0',
-      ),
-    );
-    $this->databaseContents['field_config_instance'] = array(
-      array(
+      ],
+    ];
+    $this->databaseContents['field_config_instance'] = [
+      [
         'id' => '14',
         'field_id' => '1',
         'field_name' => 'comment_body',
@@ -79,10 +79,10 @@ class CommentTest extends MigrateSqlSourceTestCase {
         'bundle' => 'comment_node_test_content_type',
         'data' => 'a:0:{}',
         'deleted' => '0',
-      ),
-    );
-    $this->databaseContents['field_data_comment_body'] = array(
-      array(
+      ],
+    ];
+    $this->databaseContents['field_data_comment_body'] = [
+      [
         'entity_type' => 'comment',
         'bundle' => 'comment_node_test_content_type',
         'deleted' => '0',
@@ -92,8 +92,8 @@ class CommentTest extends MigrateSqlSourceTestCase {
         'delta' => '0',
         'comment_body_value' => 'This is a comment',
         'comment_body_format' => 'filtered_html',
-      ),
-    );
+      ],
+    ];
     parent::setUp();
   }
 
diff --git a/web/core/modules/comment/tests/src/Unit/Migrate/d7/CommentTypeTest.php b/web/core/modules/comment/tests/src/Unit/Migrate/d7/CommentTypeTest.php
index 71c651bbe..106716d8f 100644
--- a/web/core/modules/comment/tests/src/Unit/Migrate/d7/CommentTypeTest.php
+++ b/web/core/modules/comment/tests/src/Unit/Migrate/d7/CommentTypeTest.php
@@ -13,15 +13,15 @@ class CommentTypeTest extends MigrateSqlSourceTestCase {
 
   const PLUGIN_CLASS = 'Drupal\comment\Plugin\migrate\source\d7\CommentType';
 
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'test',
-    'source' => array(
+    'source' => [
       'plugin' => 'd7_comment_type',
-    ),
-  );
+    ],
+  ];
 
-  protected $expectedResults = array(
-    array(
+  protected $expectedResults = [
+    [
       'bundle' => 'comment_node_article',
       'node_type' => 'article',
       'default_mode' => '1',
@@ -31,15 +31,15 @@ class CommentTypeTest extends MigrateSqlSourceTestCase {
       'preview' => '0',
       'subject' => '1',
       'label' => 'Article comment',
-    ),
-  );
+    ],
+  ];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->databaseContents['node_type'] = array(
-      array(
+    $this->databaseContents['node_type'] = [
+      [
         'type' => 'article',
         'name' => 'Article',
         'base' => 'node_content',
@@ -53,10 +53,10 @@ class CommentTypeTest extends MigrateSqlSourceTestCase {
         'locked' => '0',
         'disabled' => '0',
         'orig_type' => 'article',
-      ),
-    );
-    $this->databaseContents['field_config_instance'] = array(
-      array(
+      ],
+    ];
+    $this->databaseContents['field_config_instance'] = [
+      [
         'id' => '14',
         'field_id' => '1',
         'field_name' => 'comment_body',
@@ -64,34 +64,34 @@ class CommentTypeTest extends MigrateSqlSourceTestCase {
         'bundle' => 'comment_node_article',
         'data' => 'a:0:{}',
         'deleted' => '0',
-      ),
-    );
-    $this->databaseContents['variable'] = array(
-      array(
+      ],
+    ];
+    $this->databaseContents['variable'] = [
+      [
         'name' => 'comment_default_mode_article',
         'value' => serialize(1),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_per_page_article',
         'value' => serialize(50),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_anonymous_article',
         'value' => serialize(0),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_form_location_article',
         'value' => serialize(1),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_preview_article',
         'value' => serialize(0),
-      ),
-      array(
+      ],
+      [
         'name' => 'comment_subject_article',
         'value' => serialize(1),
-      ),
-    );
+      ],
+    ];
     parent::setUp();
   }
 
diff --git a/web/core/modules/config/config.module b/web/core/modules/config/config.module
index 874caac8b..b280fe84f 100644
--- a/web/core/modules/config/config.module
+++ b/web/core/modules/config/config.module
@@ -15,19 +15,19 @@ function config_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.config':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Configuration Manager module provides a user interface for importing and exporting configuration changes between installations of your website in different environments. Configuration is stored in YAML format. For more information, see the <a href=":url">online documentation for the Configuration Manager module</a>.', array(':url' => 'https://www.drupal.org/documentation/administer/config')) . '</p>';
+      $output .= '<p>' . t('The Configuration Manager module provides a user interface for importing and exporting configuration changes between installations of your website in different environments. Configuration is stored in YAML format. For more information, see the <a href=":url">online documentation for the Configuration Manager module</a>.', [':url' => 'https://www.drupal.org/documentation/administer/config']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Exporting the full configuration') . '</dt>';
-      $output .= '<dd>' . t('You can create and download an archive consisting of all your site\'s configuration exported as <em>*.yml</em> files on the <a href=":url">Export</a> page.', array(':url' => \Drupal::url('config.export_full'))) . '</dd>';
+      $output .= '<dd>' . t('You can create and download an archive consisting of all your site\'s configuration exported as <em>*.yml</em> files on the <a href=":url">Export</a> page.', [':url' => \Drupal::url('config.export_full')]) . '</dd>';
       $output .= '<dt>' . t('Importing a full configuration') . '</dt>';
-      $output .= '<dd>' . t('You can upload a full site configuration from an archive file on the <a href=":url">Import</a> page. When importing data from a different environment, the site and import files must have matching configuration values for UUID in the <em>system.site</em> configuration item. That means that your other environments should initially be set up as clones of the target site. Migrations are not supported.', array(':url' => \Drupal::url('config.import_full'))) . '</dd>';
+      $output .= '<dd>' . t('You can upload a full site configuration from an archive file on the <a href=":url">Import</a> page. When importing data from a different environment, the site and import files must have matching configuration values for UUID in the <em>system.site</em> configuration item. That means that your other environments should initially be set up as clones of the target site. Migrations are not supported.', [':url' => \Drupal::url('config.import_full')]) . '</dd>';
       $output .= '<dt>' . t('Synchronizing configuration') . '</dt>';
-      $output .= '<dd>' . t('You can review differences between the active configuration and an imported configuration archive on the <a href=":synchronize">Synchronize</a> page to ensure that the changes are as expected, before finalizing the import. The Synchronize page also shows configuration items that would be added or removed.', array(':synchronize' => \Drupal::url('config.sync'))) . '</dd>';
+      $output .= '<dd>' . t('You can review differences between the active configuration and an imported configuration archive on the <a href=":synchronize">Synchronize</a> page to ensure that the changes are as expected, before finalizing the import. The Synchronize page also shows configuration items that would be added or removed.', [':synchronize' => \Drupal::url('config.sync')]) . '</dd>';
       $output .= '<dt>' . t('Exporting a single configuration item') . '</dt>';
-      $output .= '<dd>' . t('You can export a single configuration item by selecting a <em>Configuration type</em> and <em>Configuration name</em> on the <a href=":single-export">Single export</a> page. The configuration and its corresponding <em>*.yml file name</em> are then displayed on the page for you to copy.', array(':single-export' => \Drupal::url('config.export_single'))) . '</dd>';
+      $output .= '<dd>' . t('You can export a single configuration item by selecting a <em>Configuration type</em> and <em>Configuration name</em> on the <a href=":single-export">Single export</a> page. The configuration and its corresponding <em>*.yml file name</em> are then displayed on the page for you to copy.', [':single-export' => \Drupal::url('config.export_single')]) . '</dd>';
       $output .= '<dt>' . t('Importing a single configuration item') . '</dt>';
-      $output .= '<dd>' . t('You can import a single configuration item by pasting it in YAML format into the form on the <a href=":single-import">Single import</a> page.', array(':single-import' => \Drupal::url('config.import_single'))) . '</dd>';
+      $output .= '<dd>' . t('You can import a single configuration item by pasting it in YAML format into the form on the <a href=":single-import">Single import</a> page.', [':single-import' => \Drupal::url('config.import_single')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -72,9 +72,9 @@ function config_file_download($uri) {
       $hostname = str_replace('.', '-', $request->getHttpHost());
       $filename = 'config' . '-' . $hostname . '-' . $date_string . '.tar.gz';
       $disposition = 'attachment; filename="' . $filename . '"';
-      return array(
+      return [
         'Content-disposition' => $disposition,
-      );
+      ];
     }
     return -1;
   }
diff --git a/web/core/modules/config/src/ConfigSubscriber.php b/web/core/modules/config/src/ConfigSubscriber.php
index 9b6c84211..94405a1cd 100644
--- a/web/core/modules/config/src/ConfigSubscriber.php
+++ b/web/core/modules/config/src/ConfigSubscriber.php
@@ -29,8 +29,8 @@ class ConfigSubscriber extends ConfigImportValidateEventSubscriberBase {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::IMPORT_VALIDATE][] = array('onConfigImporterValidate', 20);
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::IMPORT_VALIDATE][] = ['onConfigImporterValidate', 20];
     return $events;
   }
 
diff --git a/web/core/modules/config/src/Controller/ConfigController.php b/web/core/modules/config/src/Controller/ConfigController.php
index 8b9dc2541..bf47f72d4 100644
--- a/web/core/modules/config/src/Controller/ConfigController.php
+++ b/web/core/modules/config/src/Controller/ConfigController.php
@@ -103,7 +103,7 @@ class ConfigController implements ContainerInjectionInterface {
       }
     }
 
-    $request = new Request(array('file' => 'config.tar.gz'));
+    $request = new Request(['file' => 'config.tar.gz']);
     return $this->fileDownloadController->download($request, 'temporary');
   }
 
@@ -129,34 +129,34 @@ class ConfigController implements ContainerInjectionInterface {
     $diff = $this->configManager->diff($this->targetStorage, $this->sourceStorage, $source_name, $target_name, $collection);
     $this->diffFormatter->show_header = FALSE;
 
-    $build = array();
+    $build = [];
 
-    $build['#title'] = t('View changes of @config_file', array('@config_file' => $source_name));
+    $build['#title'] = t('View changes of @config_file', ['@config_file' => $source_name]);
     // Add the CSS for the inline diff.
     $build['#attached']['library'][] = 'system/diff';
 
-    $build['diff'] = array(
+    $build['diff'] = [
       '#type' => 'table',
-      '#attributes' => array(
-        'class' => array('diff'),
-      ),
-      '#header' => array(
-        array('data' => t('Active'), 'colspan' => '2'),
-        array('data' => t('Staged'), 'colspan' => '2'),
-      ),
+      '#attributes' => [
+        'class' => ['diff'],
+      ],
+      '#header' => [
+        ['data' => t('Active'), 'colspan' => '2'],
+        ['data' => t('Staged'), 'colspan' => '2'],
+      ],
       '#rows' => $this->diffFormatter->format($diff),
-    );
+    ];
 
-    $build['back'] = array(
+    $build['back'] = [
       '#type' => 'link',
-      '#attributes' => array(
-        'class' => array(
+      '#attributes' => [
+        'class' => [
           'dialog-cancel',
-        ),
-      ),
+        ],
+      ],
       '#title' => "Back to 'Synchronize configuration' page.",
       '#url' => Url::fromRoute('config.sync'),
-    );
+    ];
 
     return $build;
   }
diff --git a/web/core/modules/config/src/Form/ConfigExportForm.php b/web/core/modules/config/src/Form/ConfigExportForm.php
index 0da43ff31..e822f7fa4 100644
--- a/web/core/modules/config/src/Form/ConfigExportForm.php
+++ b/web/core/modules/config/src/Form/ConfigExportForm.php
@@ -21,10 +21,10 @@ class ConfigExportForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Export'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/config/src/Form/ConfigImportForm.php b/web/core/modules/config/src/Form/ConfigImportForm.php
index 1d651d8bf..0c3def861 100644
--- a/web/core/modules/config/src/Form/ConfigImportForm.php
+++ b/web/core/modules/config/src/Form/ConfigImportForm.php
@@ -55,17 +55,17 @@ class ConfigImportForm extends FormBase {
     if (!$directory_is_writable) {
       drupal_set_message($this->t('The directory %directory is not writable.', ['%directory' => $directory]), 'error');
     }
-    $form['import_tarball'] = array(
+    $form['import_tarball'] = [
       '#type' => 'file',
       '#title' => $this->t('Configuration archive'),
-      '#description' => $this->t('Allowed types: @extensions.', array('@extensions' => 'tar.gz tgz tar.bz2')),
-    );
+      '#description' => $this->t('Allowed types: @extensions.', ['@extensions' => 'tar.gz tgz tar.bz2']),
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Upload'),
       '#disabled' => !$directory_is_writable,
-    );
+    ];
     return $form;
   }
 
@@ -93,7 +93,7 @@ class ConfigImportForm extends FormBase {
       $this->configStorage->deleteAll();
       try {
         $archiver = new ArchiveTar($path, 'gz');
-        $files = array();
+        $files = [];
         foreach ($archiver->listContent() as $file) {
           $files[] = $file['filename'];
         }
@@ -102,7 +102,7 @@ class ConfigImportForm extends FormBase {
         $form_state->setRedirect('config.sync');
       }
       catch (\Exception $e) {
-        drupal_set_message($this->t('Could not extract the contents of the tar file. The error message is <em>@message</em>', array('@message' => $e->getMessage())), 'error');
+        drupal_set_message($this->t('Could not extract the contents of the tar file. The error message is <em>@message</em>', ['@message' => $e->getMessage()]), 'error');
       }
       drupal_unlink($path);
     }
diff --git a/web/core/modules/config/src/Form/ConfigSingleExportForm.php b/web/core/modules/config/src/Form/ConfigSingleExportForm.php
index 9df8069ba..8710655d7 100644
--- a/web/core/modules/config/src/Form/ConfigSingleExportForm.php
+++ b/web/core/modules/config/src/Form/ConfigSingleExportForm.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\config\Form;
 
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
@@ -36,7 +37,7 @@ class ConfigSingleExportForm extends FormBase {
    *
    * @var \Drupal\Core\Entity\EntityTypeInterface[]
    */
-  protected $definitions = array();
+  protected $definitions = [];
 
   /**
    * Constructs a new ConfigSingleImportForm.
@@ -73,7 +74,7 @@ class ConfigSingleExportForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state, $config_type = NULL, $config_name = NULL) {
     foreach ($this->entityManager->getDefinitions() as $entity_type => $definition) {
-      if ($definition->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
+      if ($definition->entityClassImplements(ConfigEntityInterface::class)) {
         $this->definitions[$entity_type] = $definition;
       }
     }
@@ -82,40 +83,40 @@ class ConfigSingleExportForm extends FormBase {
     }, $this->definitions);
     // Sort the entity types by label, then add the simple config to the top.
     uasort($entity_types, 'strnatcasecmp');
-    $config_types = array(
+    $config_types = [
       'system.simple' => $this->t('Simple configuration'),
-    ) + $entity_types;
-    $form['config_type'] = array(
+    ] + $entity_types;
+    $form['config_type'] = [
       '#title' => $this->t('Configuration type'),
       '#type' => 'select',
       '#options' => $config_types,
       '#default_value' => $config_type,
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => '::updateConfigurationType',
         'wrapper' => 'edit-config-type-wrapper',
-      ),
-    );
+      ],
+    ];
     $default_type = $form_state->getValue('config_type', $config_type);
-    $form['config_name'] = array(
+    $form['config_name'] = [
       '#title' => $this->t('Configuration name'),
       '#type' => 'select',
       '#options' => $this->findConfiguration($default_type),
       '#default_value' => $config_name,
       '#prefix' => '<div id="edit-config-type-wrapper">',
       '#suffix' => '</div>',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => '::updateExport',
         'wrapper' => 'edit-export-wrapper',
-      ),
-    );
+      ],
+    ];
 
-    $form['export'] = array(
+    $form['export'] = [
       '#title' => $this->t('Here is your configuration:'),
       '#type' => 'textarea',
       '#rows' => 24,
       '#prefix' => '<div id="edit-export-wrapper">',
       '#suffix' => '</div>',
-    );
+    ];
     if ($config_type && $config_name) {
       $fake_form_state = (new FormState())->setValues([
         'config_type' => $config_type,
@@ -149,7 +150,7 @@ class ConfigSingleExportForm extends FormBase {
     }
     // Read the raw data for this config name, encode it, and display it.
     $form['export']['#value'] = Yaml::encode($this->configStorage->read($name));
-    $form['export']['#description'] = $this->t('Filename: %name', array('%name' => $name . '.yml'));
+    $form['export']['#description'] = $this->t('Filename: %name', ['%name' => $name . '.yml']);
     return $form['export'];
   }
 
@@ -157,9 +158,9 @@ class ConfigSingleExportForm extends FormBase {
    * Handles switching the configuration type selector.
    */
   protected function findConfiguration($config_type) {
-    $names = array(
+    $names = [
       '' => $this->t('- Select -'),
-    );
+    ];
     // For a given entity type, load all entities.
     if ($config_type && $config_type !== 'system.simple') {
       $entity_storage = $this->entityManager->getStorage($config_type);
diff --git a/web/core/modules/config/src/Form/ConfigSingleImportForm.php b/web/core/modules/config/src/Form/ConfigSingleImportForm.php
index 139390635..fcb388305 100644
--- a/web/core/modules/config/src/Form/ConfigSingleImportForm.php
+++ b/web/core/modules/config/src/Form/ConfigSingleImportForm.php
@@ -7,6 +7,7 @@ use Drupal\config\StorageReplaceDataWrapper;
 use Drupal\Core\Config\ConfigImporter;
 use Drupal\Core\Config\ConfigImporterException;
 use Drupal\Core\Config\ConfigManagerInterface;
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Config\StorageComparer;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Config\TypedConfigManagerInterface;
@@ -110,7 +111,7 @@ class ConfigSingleImportForm extends ConfirmFormBase {
    *
    * @var array
    */
-  protected $data = array();
+  protected $data = [];
 
   /**
    * Constructs a new ConfigSingleImportForm.
@@ -197,10 +198,10 @@ class ConfigSingleImportForm extends ConfirmFormBase {
       $type = $definition->getLowercaseLabel();
     }
 
-    $args = array(
+    $args = [
       '%name' => $name,
       '@type' => strtolower($type),
-    );
+    ];
     if ($this->configExists) {
       $question = $this->t('Are you sure you want to update the %name @type?', $args);
     }
@@ -219,57 +220,57 @@ class ConfigSingleImportForm extends ConfirmFormBase {
       return parent::buildForm($form, $form_state);
     }
 
-    $entity_types = array();
+    $entity_types = [];
     foreach ($this->entityManager->getDefinitions() as $entity_type => $definition) {
-      if ($definition->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
+      if ($definition->entityClassImplements(ConfigEntityInterface::class)) {
         $entity_types[$entity_type] = $definition->getLabel();
       }
     }
     // Sort the entity types by label, then add the simple config to the top.
     uasort($entity_types, 'strnatcasecmp');
-    $config_types = array(
+    $config_types = [
       'system.simple' => $this->t('Simple configuration'),
-    ) + $entity_types;
-    $form['config_type'] = array(
+    ] + $entity_types;
+    $form['config_type'] = [
       '#title' => $this->t('Configuration type'),
       '#type' => 'select',
       '#options' => $config_types,
       '#required' => TRUE,
-    );
-    $form['config_name'] = array(
+    ];
+    $form['config_name'] = [
       '#title' => $this->t('Configuration name'),
       '#description' => $this->t('Enter the name of the configuration file without the <em>.yml</em> extension. (e.g. <em>system.site</em>)'),
       '#type' => 'textfield',
-      '#states' => array(
-        'required' => array(
-          ':input[name="config_type"]' => array('value' => 'system.simple'),
-        ),
-        'visible' => array(
-          ':input[name="config_type"]' => array('value' => 'system.simple'),
-        ),
-      ),
-    );
-    $form['import'] = array(
+      '#states' => [
+        'required' => [
+          ':input[name="config_type"]' => ['value' => 'system.simple'],
+        ],
+        'visible' => [
+          ':input[name="config_type"]' => ['value' => 'system.simple'],
+        ],
+      ],
+    ];
+    $form['import'] = [
       '#title' => $this->t('Paste your configuration here'),
       '#type' => 'textarea',
       '#rows' => 24,
       '#required' => TRUE,
-    );
-    $form['advanced'] = array(
+    ];
+    $form['advanced'] = [
       '#type' => 'details',
       '#title' => $this->t('Advanced'),
-    );
-    $form['advanced']['custom_entity_id'] = array(
+    ];
+    $form['advanced']['custom_entity_id'] = [
       '#title' => $this->t('Custom Entity ID'),
       '#type' => 'textfield',
       '#description' => $this->t('Specify a custom entity ID. This will override the entity ID in the configuration above.'),
-    );
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    ];
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Import'),
       '#button_type' => 'primary',
-    );
+    ];
     return $form;
   }
 
@@ -304,7 +305,7 @@ class ConfigSingleImportForm extends ConfirmFormBase {
       $entity_storage = $this->entityManager->getStorage($form_state->getValue('config_type'));
       // If an entity ID was not specified, set an error.
       if (!isset($data[$id_key])) {
-        $form_state->setErrorByName('import', $this->t('Missing ID key "@id_key" for this @entity_type import.', array('@id_key' => $id_key, '@entity_type' => $definition->getLabel())));
+        $form_state->setErrorByName('import', $this->t('Missing ID key "@id_key" for this @entity_type import.', ['@id_key' => $id_key, '@entity_type' => $definition->getLabel()]));
         return;
       }
 
@@ -322,7 +323,7 @@ class ConfigSingleImportForm extends ConfirmFormBase {
         }
       }
       // If there is no entity with a matching ID, check for a UUID match.
-      elseif (isset($data['uuid']) && $entity_storage->loadByProperties(array('uuid' => $data['uuid']))) {
+      elseif (isset($data['uuid']) && $entity_storage->loadByProperties(['uuid' => $data['uuid']])) {
         $form_state->setErrorByName('import', $this->t('An entity with this UUID already exists but the machine name does not match.'));
       }
     }
diff --git a/web/core/modules/config/src/Form/ConfigSync.php b/web/core/modules/config/src/Form/ConfigSync.php
index 51cded269..fe1b2e496 100644
--- a/web/core/modules/config/src/Form/ConfigSync.php
+++ b/web/core/modules/config/src/Form/ConfigSync.php
@@ -171,20 +171,20 @@ class ConfigSync extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Import all'),
-    );
+    ];
     $source_list = $this->syncStorage->listAll();
     $storage_comparer = new StorageComparer($this->syncStorage, $this->activeStorage, $this->configManager);
     if (empty($source_list) || !$storage_comparer->createChangelist()->hasChanges()) {
-      $form['no_changes'] = array(
+      $form['no_changes'] = [
         '#type' => 'table',
-        '#header' => array($this->t('Name'), $this->t('Operations')),
-        '#rows' => array(),
+        '#header' => [$this->t('Name'), $this->t('Operations')],
+        '#rows' => [],
         '#empty' => $this->t('There are no configuration changes to import.'),
-      );
+      ];
       $form['actions']['#access'] = FALSE;
       return $form;
     }
@@ -198,7 +198,7 @@ class ConfigSync extends FormBase {
     if ($this->snapshotStorage->exists('core.extension')) {
       $snapshot_comparer = new StorageComparer($this->activeStorage, $this->snapshotStorage, $this->configManager);
       if (!$form_state->getUserInput() && $snapshot_comparer->createChangelist()->hasChanges()) {
-        $change_list = array();
+        $change_list = [];
         foreach ($snapshot_comparer->getAllCollectionNames() as $collection) {
           foreach ($snapshot_comparer->getChangelist(NULL, $collection) as $config_names) {
             if (empty($config_names)) {
@@ -231,11 +231,11 @@ class ConfigSync extends FormBase {
 
     foreach ($storage_comparer->getAllCollectionNames() as $collection) {
       if ($collection != StorageInterface::DEFAULT_COLLECTION) {
-        $form[$collection]['collection_heading'] = array(
+        $form[$collection]['collection_heading'] = [
           '#type' => 'html_tag',
           '#tag' => 'h2',
-          '#value' => $this->t('@collection configuration collection', array('@collection' => $collection)),
-        );
+          '#value' => $this->t('@collection configuration collection', ['@collection' => $collection]),
+        ];
       }
       foreach ($storage_comparer->getChangelist(NULL, $collection) as $config_change_type => $config_names) {
         if (empty($config_names)) {
@@ -244,10 +244,10 @@ class ConfigSync extends FormBase {
 
         // @todo A table caption would be more appropriate, but does not have the
         //   visual importance of a heading.
-        $form[$collection][$config_change_type]['heading'] = array(
+        $form[$collection][$config_change_type]['heading'] = [
           '#type' => 'html_tag',
           '#tag' => 'h3',
-        );
+        ];
         switch ($config_change_type) {
           case 'create':
             $form[$collection][$config_change_type]['heading']['#value'] = $this->formatPlural(count($config_names), '@count new', '@count new');
@@ -265,19 +265,19 @@ class ConfigSync extends FormBase {
             $form[$collection][$config_change_type]['heading']['#value'] = $this->formatPlural(count($config_names), '@count renamed', '@count renamed');
             break;
         }
-        $form[$collection][$config_change_type]['list'] = array(
+        $form[$collection][$config_change_type]['list'] = [
           '#type' => 'table',
-          '#header' => array($this->t('Name'), $this->t('Operations')),
-        );
+          '#header' => [$this->t('Name'), $this->t('Operations')],
+        ];
 
         foreach ($config_names as $config_name) {
           if ($config_change_type == 'rename') {
             $names = $storage_comparer->extractRenameNames($config_name);
-            $route_options = array('source_name' => $names['old_name'], 'target_name' => $names['new_name']);
-            $config_name = $this->t('@source_name to @target_name', array('@source_name' => $names['old_name'], '@target_name' => $names['new_name']));
+            $route_options = ['source_name' => $names['old_name'], 'target_name' => $names['new_name']];
+            $config_name = $this->t('@source_name to @target_name', ['@source_name' => $names['old_name'], '@target_name' => $names['new_name']]);
           }
           else {
-            $route_options = array('source_name' => $config_name);
+            $route_options = ['source_name' => $config_name];
           }
           if ($collection != StorageInterface::DEFAULT_COLLECTION) {
             $route_name = 'config.diff_collection';
@@ -286,26 +286,26 @@ class ConfigSync extends FormBase {
           else {
             $route_name = 'config.diff';
           }
-          $links['view_diff'] = array(
+          $links['view_diff'] = [
             'title' => $this->t('View differences'),
             'url' => Url::fromRoute($route_name, $route_options),
-            'attributes' => array(
-              'class' => array('use-ajax'),
+            'attributes' => [
+              'class' => ['use-ajax'],
               'data-dialog-type' => 'modal',
-              'data-dialog-options' => json_encode(array(
+              'data-dialog-options' => json_encode([
                 'width' => 700
-              )),
-            ),
-          );
-          $form[$collection][$config_change_type]['list']['#rows'][] = array(
+              ]),
+            ],
+          ];
+          $form[$collection][$config_change_type]['list']['#rows'][] = [
             'name' => $config_name,
-            'operations' => array(
-              'data' => array(
+            'operations' => [
+              'data' => [
                 '#type' => 'operations',
                 '#links' => $links,
-              ),
-            ),
-          );
+              ],
+            ],
+          ];
         }
       }
     }
@@ -333,17 +333,17 @@ class ConfigSync extends FormBase {
     else {
       try {
         $sync_steps = $config_importer->initialize();
-        $batch = array(
-          'operations' => array(),
-          'finished' => array(get_class($this), 'finishBatch'),
+        $batch = [
+          'operations' => [],
+          'finished' => [get_class($this), 'finishBatch'],
           'title' => t('Synchronizing configuration'),
           'init_message' => t('Starting configuration synchronization.'),
           'progress_message' => t('Completed step @current of @total.'),
           'error_message' => t('Configuration synchronization has encountered an error.'),
           'file' => __DIR__ . '/../../config.admin.inc',
-        );
+        ];
         foreach ($sync_steps as $sync_step) {
-          $batch['operations'][] = array(array(get_class($this), 'processBatch'), array($config_importer, $sync_step));
+          $batch['operations'][] = [[get_class($this), 'processBatch'], [$config_importer, $sync_step]];
         }
 
         batch_set($batch);
@@ -377,7 +377,7 @@ class ConfigSync extends FormBase {
     $config_importer->doSyncStep($sync_step, $context);
     if ($errors = $config_importer->getErrors()) {
       if (!isset($context['results']['errors'])) {
-        $context['results']['errors'] = array();
+        $context['results']['errors'] = [];
       }
       $context['results']['errors'] += $errors;
     }
@@ -406,7 +406,7 @@ class ConfigSync extends FormBase {
       // An error occurred.
       // $operations contains the operations that remained unprocessed.
       $error_operation = reset($operations);
-      $message = \Drupal::translation()->translate('An error occurred while processing %error_operation with arguments: @arguments', array('%error_operation' => $error_operation[0], '@arguments' => print_r($error_operation[1], TRUE)));
+      $message = \Drupal::translation()->translate('An error occurred while processing %error_operation with arguments: @arguments', ['%error_operation' => $error_operation[0], '@arguments' => print_r($error_operation[1], TRUE)]);
       drupal_set_message($message, 'error');
     }
   }
diff --git a/web/core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php b/web/core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php
index 92693c4a9..41419b031 100644
--- a/web/core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php
+++ b/web/core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php
@@ -14,7 +14,7 @@ class ConfigEntityFormOverrideTest extends WebTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
    * Tests that overrides do not affect forms or listing screens.
@@ -29,10 +29,10 @@ class ConfigEntityFormOverrideTest extends WebTestBase {
     $config_test_storage = $this->container->get('entity.manager')->getStorage('config_test');
 
     // Set up an override.
-    $settings['config']['config_test.dynamic.dotted.default']['label'] = (object) array(
+    $settings['config']['config_test.dynamic.dotted.default']['label'] = (object) [
       'value' => $overridden_label,
       'required' => TRUE,
-    );
+    ];
     $this->writeSettings($settings);
 
     // Test that the overridden label is loaded with the entity.
@@ -50,9 +50,9 @@ class ConfigEntityFormOverrideTest extends WebTestBase {
     $this->assertNoText($overridden_label);
 
     // Change to a new label and test that the listing now has the edited label.
-    $edit = array(
+    $edit = [
       'label' => $edited_label,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->drupalGet('admin/structure/config_test');
     $this->assertNoText($overridden_label);
diff --git a/web/core/modules/config/src/Tests/ConfigEntityListTest.php b/web/core/modules/config/src/Tests/ConfigEntityListTest.php
index 9d31de05c..e9950ea42 100644
--- a/web/core/modules/config/src/Tests/ConfigEntityListTest.php
+++ b/web/core/modules/config/src/Tests/ConfigEntityListTest.php
@@ -34,7 +34,7 @@ class ConfigEntityListTest extends WebTestBase {
   /**
    * Tests entity list builder methods.
    */
-  function testList() {
+  public function testList() {
     $controller = \Drupal::entityManager()->getListBuilder('config_test');
 
     // Test getStorage() method.
@@ -50,71 +50,71 @@ class ConfigEntityListTest extends WebTestBase {
     $this->assertTrue($entity instanceof ConfigTest, '"Default" ConfigTest entity is an instance of ConfigTest.');
 
     // Test getOperations() method.
-    $expected_operations = array(
-      'edit' => array (
+    $expected_operations = [
+      'edit' => [
         'title' => t('Edit'),
         'weight' => 10,
         'url' => $entity->urlInfo(),
-      ),
-      'disable' => array(
+      ],
+      'disable' => [
         'title' => t('Disable'),
         'weight' => 40,
         'url' => $entity->urlInfo('disable'),
-      ),
-      'delete' => array (
+      ],
+      'delete' => [
         'title' => t('Delete'),
         'weight' => 100,
         'url' => $entity->urlInfo('delete-form'),
-      ),
-    );
+      ],
+    ];
 
     $actual_operations = $controller->getOperations($entity);
     // Sort the operations to normalize link order.
-    uasort($actual_operations, array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
+    uasort($actual_operations, ['Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
     $this->assertEqual($expected_operations, $actual_operations, 'The operations are identical.');
 
     // Test buildHeader() method.
-    $expected_items = array(
+    $expected_items = [
       'label' => 'Label',
       'id' => 'Machine name',
       'operations' => 'Operations',
-    );
+    ];
     $actual_items = $controller->buildHeader();
     $this->assertEqual($expected_items, $actual_items, 'Return value from buildHeader matches expected.');
 
     // Test buildRow() method.
     $build_operations = $controller->buildOperations($entity);
-    $expected_items = array(
+    $expected_items = [
       'label' => 'Default',
       'id' => 'dotted.default',
-      'operations' => array(
+      'operations' => [
         'data' => $build_operations,
-      ),
-    );
+      ],
+    ];
     $actual_items = $controller->buildRow($entity);
     $this->assertEqual($expected_items, $actual_items, 'Return value from buildRow matches expected.');
     // Test sorting.
     $storage = $controller->getStorage();
-    $entity = $storage->create(array(
+    $entity = $storage->create([
       'id' => 'alpha',
       'label' => 'Alpha',
       'weight' => 1,
-    ));
+    ]);
     $entity->save();
-    $entity = $storage->create(array(
+    $entity = $storage->create([
       'id' => 'omega',
       'label' => 'Omega',
       'weight' => 1,
-    ));
+    ]);
     $entity->save();
-    $entity = $storage->create(array(
+    $entity = $storage->create([
       'id' => 'beta',
       'label' => 'Beta',
       'weight' => 0,
-    ));
+    ]);
     $entity->save();
     $list = $controller->load();
-    $this->assertIdentical(array_keys($list), array('beta', 'dotted.default', 'alpha', 'omega'));
+    $this->assertIdentical(array_keys($list), ['beta', 'dotted.default', 'alpha', 'omega']);
 
     // Test that config entities that do not support status, do not have
     // enable/disable operations.
@@ -125,31 +125,31 @@ class ConfigEntityListTest extends WebTestBase {
     $entity = $list['default'];
 
     // Test getOperations() method.
-    $expected_operations = array(
-      'edit' => array(
+    $expected_operations = [
+      'edit' => [
         'title' => t('Edit'),
         'weight' => 10,
         'url' => $entity->urlInfo(),
-      ),
-      'delete' => array(
+      ],
+      'delete' => [
         'title' => t('Delete'),
         'weight' => 100,
         'url' => $entity->urlInfo('delete-form'),
-      ),
-    );
+      ],
+    ];
 
     $actual_operations = $controller->getOperations($entity);
     // Sort the operations to normalize link order.
-    uasort($actual_operations, array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
+    uasort($actual_operations, ['Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
     $this->assertEqual($expected_operations, $actual_operations, 'The operations are identical.');
   }
 
   /**
    * Tests the listing UI.
    */
-  function testListUI() {
+  public function testListUI() {
     // Log in as an administrative user to access the full menu trail.
-    $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer site configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer site configuration']));
 
     // Get the list callback page.
     $this->drupalGet('admin/structure/config_test');
@@ -166,7 +166,7 @@ class ConfigEntityListTest extends WebTestBase {
     $this->assertEqual(count($elements), 3, 'Correct number of table header cells found.');
 
     // Test the contents of each th cell.
-    $expected_items = array('Label', 'Machine name', 'Operations');
+    $expected_items = ['Label', 'Machine name', 'Operations'];
     foreach ($elements as $key => $element) {
       $this->assertIdentical((string) $element[0], $expected_items[$key]);
     }
@@ -186,11 +186,11 @@ class ConfigEntityListTest extends WebTestBase {
     $this->assertLink('Add test configuration');
     $this->clickLink('Add test configuration');
     $this->assertResponse(200);
-    $edit = array(
+    $edit = [
       'label' => 'Antelope',
       'id' => 'antelope',
       'weight' => 1,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Ensure that the entity's sort method was called.
@@ -207,7 +207,7 @@ class ConfigEntityListTest extends WebTestBase {
     $this->clickLink('Edit', 1);
     $this->assertResponse(200);
     $this->assertTitle('Edit Antelope | Drupal');
-    $edit = array('label' => 'Albatross', 'id' => 'albatross');
+    $edit = ['label' => 'Albatross', 'id' => 'albatross'];
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Confirm that the user is returned to the listing, and verify that the
@@ -221,7 +221,7 @@ class ConfigEntityListTest extends WebTestBase {
     $this->clickLink('Delete', 1);
     $this->assertResponse(200);
     $this->assertTitle('Are you sure you want to delete the test configuration Albatross? | Drupal');
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
 
     // Verify that the text of the label and machine name does not appear in
     // the list (though it may appear elsewhere on the page).
@@ -232,7 +232,7 @@ class ConfigEntityListTest extends WebTestBase {
     $this->clickLink('Delete');
     $this->assertResponse(200);
     $this->assertTitle('Are you sure you want to delete the test configuration Default? | Drupal');
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
 
     // Verify that the text of the label and machine name does not appear in
     // the list (though it may appear elsewhere on the page).
@@ -253,12 +253,12 @@ class ConfigEntityListTest extends WebTestBase {
 
     // Create 51 test entities.
     for ($i = 1; $i < 52; $i++) {
-      $storage->create(array(
+      $storage->create([
         'id' => str_pad($i, 2, '0', STR_PAD_LEFT),
         'label' => 'Test config entity ' . $i,
         'weight' => $i,
         'protected_property' => $i,
-      ))->save();
+      ])->save();
     }
 
     // Load the listing page.
diff --git a/web/core/modules/config/src/Tests/ConfigEntityTest.php b/web/core/modules/config/src/Tests/ConfigEntityTest.php
index a8a8f0f74..c0dc97bc7 100644
--- a/web/core/modules/config/src/Tests/ConfigEntityTest.php
+++ b/web/core/modules/config/src/Tests/ConfigEntityTest.php
@@ -27,12 +27,12 @@ class ConfigEntityTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
    * Tests CRUD operations.
    */
-  function testCRUD() {
+  public function testCRUD() {
     $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
     // Verify default properties on a newly created empty entity.
     $empty = entity_create('config_test');
@@ -76,9 +76,9 @@ class ConfigEntityTest extends WebTestBase {
     }
 
     // Verify that an entity with an empty ID string is considered empty, too.
-    $empty_id = entity_create('config_test', array(
+    $empty_id = entity_create('config_test', [
       'id' => '',
-    ));
+    ]);
     $this->assertIdentical($empty_id->isNew(), TRUE);
     try {
       $empty_id->save();
@@ -89,11 +89,11 @@ class ConfigEntityTest extends WebTestBase {
     }
 
     // Verify properties on a newly created entity.
-    $config_test = entity_create('config_test', $expected = array(
+    $config_test = entity_create('config_test', $expected = [
       'id' => $this->randomMachineName(),
       'label' => $this->randomString(),
       'style' => $this->randomMachineName(),
-    ));
+    ]);
     $this->assertTrue($config_test->uuid());
     $this->assertNotEqual($config_test->uuid(), $empty->uuid());
     $this->assertIdentical($config_test->label, $expected['label']);
@@ -141,13 +141,13 @@ class ConfigEntityTest extends WebTestBase {
     // maximum allowed length, but not longer.
 
     // Test with a short ID.
-    $id_length_config_test = entity_create('config_test', array(
+    $id_length_config_test = entity_create('config_test', [
       'id' => $this->randomMachineName(8),
-    ));
+    ]);
     try {
       $id_length_config_test->save();
-      $this->pass(SafeMarkup::format("config_test entity with ID length @length was saved.", array(
-        '@length' => strlen($id_length_config_test->id()))
+      $this->pass(SafeMarkup::format("config_test entity with ID length @length was saved.", [
+        '@length' => strlen($id_length_config_test->id())]
       ));
     }
     catch (ConfigEntityIdLengthException $e) {
@@ -155,42 +155,42 @@ class ConfigEntityTest extends WebTestBase {
     }
 
     // Test with an ID of the maximum allowed length.
-    $id_length_config_test = entity_create('config_test', array(
+    $id_length_config_test = entity_create('config_test', [
       'id' => $this->randomMachineName(static::MAX_ID_LENGTH),
-    ));
+    ]);
     try {
       $id_length_config_test->save();
-      $this->pass(SafeMarkup::format("config_test entity with ID length @length was saved.", array(
+      $this->pass(SafeMarkup::format("config_test entity with ID length @length was saved.", [
         '@length' => strlen($id_length_config_test->id()),
-      )));
+      ]));
     }
     catch (ConfigEntityIdLengthException $e) {
       $this->fail($e->getMessage());
     }
 
     // Test with an ID exceeding the maximum allowed length.
-    $id_length_config_test = entity_create('config_test', array(
+    $id_length_config_test = entity_create('config_test', [
       'id' => $this->randomMachineName(static::MAX_ID_LENGTH + 1),
-    ));
+    ]);
     try {
       $status = $id_length_config_test->save();
-      $this->fail(SafeMarkup::format("config_test entity with ID length @length exceeding the maximum allowed length of @max saved successfully", array(
+      $this->fail(SafeMarkup::format("config_test entity with ID length @length exceeding the maximum allowed length of @max saved successfully", [
         '@length' => strlen($id_length_config_test->id()),
         '@max' => static::MAX_ID_LENGTH,
-      )));
+      ]));
     }
     catch (ConfigEntityIdLengthException $e) {
-      $this->pass(SafeMarkup::format("config_test entity with ID length @length exceeding the maximum allowed length of @max failed to save", array(
+      $this->pass(SafeMarkup::format("config_test entity with ID length @length exceeding the maximum allowed length of @max failed to save", [
         '@length' => strlen($id_length_config_test->id()),
         '@max' => static::MAX_ID_LENGTH,
-      )));
+      ]));
     }
 
     // Ensure that creating an entity with the same id as an existing one is not
     // possible.
-    $same_id = entity_create('config_test', array(
+    $same_id = entity_create('config_test', [
       'id' => $config_test->id(),
-    ));
+    ]);
     $this->assertIdentical($same_id->isNew(), TRUE);
     try {
       $same_id->save();
@@ -201,7 +201,7 @@ class ConfigEntityTest extends WebTestBase {
     }
 
     // Verify that renaming the ID returns correct status and properties.
-    $ids = array($expected['id'], 'second_' . $this->randomMachineName(4), 'third_' . $this->randomMachineName(4));
+    $ids = [$expected['id'], 'second_' . $this->randomMachineName(4), 'third_' . $this->randomMachineName(4)];
     for ($i = 1; $i < 3; $i++) {
       $old_id = $ids[$i - 1];
       $new_id = $ids[$i];
@@ -223,29 +223,29 @@ class ConfigEntityTest extends WebTestBase {
 
     // Test config entity prepopulation.
     \Drupal::state()->set('config_test.prepopulate', TRUE);
-    $config_test = entity_create('config_test', array('foo' => 'bar'));
+    $config_test = entity_create('config_test', ['foo' => 'bar']);
     $this->assertEqual($config_test->get('foo'), 'baz', 'Initial value correctly populated');
   }
 
   /**
    * Tests CRUD operations through the UI.
    */
-  function testCRUDUI() {
+  public function testCRUDUI() {
     $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
 
     $id = strtolower($this->randomMachineName());
     $label1 = $this->randomMachineName();
     $label2 = $this->randomMachineName();
     $label3 = $this->randomMachineName();
-    $message_insert = format_string('%label configuration has been created.', array('%label' => $label1));
-    $message_update = format_string('%label configuration has been updated.', array('%label' => $label2));
-    $message_delete = format_string('The test configuration %label has been deleted.', array('%label' => $label2));
+    $message_insert = format_string('%label configuration has been created.', ['%label' => $label1]);
+    $message_update = format_string('%label configuration has been updated.', ['%label' => $label2]);
+    $message_delete = format_string('The test configuration %label has been deleted.', ['%label' => $label2]);
 
     // Create a configuration entity.
-    $edit = array(
+    $edit = [
       'id' => $id,
       'label' => $label1,
-    );
+    ];
     $this->drupalPostForm('admin/structure/config_test/add', $edit, 'Save');
     $this->assertUrl('admin/structure/config_test');
     $this->assertResponse(200);
@@ -254,9 +254,9 @@ class ConfigEntityTest extends WebTestBase {
     $this->assertLinkByHref("admin/structure/config_test/manage/$id");
 
     // Update the configuration entity.
-    $edit = array(
+    $edit = [
       'label' => $label2,
-    );
+    ];
     $this->drupalPostForm("admin/structure/config_test/manage/$id", $edit, 'Save');
     $this->assertUrl('admin/structure/config_test');
     $this->assertResponse(200);
@@ -269,7 +269,7 @@ class ConfigEntityTest extends WebTestBase {
     $this->drupalGet("admin/structure/config_test/manage/$id");
     $this->clickLink(t('Delete'));
     $this->assertUrl("admin/structure/config_test/manage/$id/delete");
-    $this->drupalPostForm(NULL, array(), 'Delete');
+    $this->drupalPostForm(NULL, [], 'Delete');
     $this->assertUrl('admin/structure/config_test');
     $this->assertResponse(200);
     $this->assertNoRaw($message_update);
@@ -278,10 +278,10 @@ class ConfigEntityTest extends WebTestBase {
     $this->assertNoLinkByHref("admin/structure/config_test/manage/$id");
 
     // Re-create a configuration entity.
-    $edit = array(
+    $edit = [
       'id' => $id,
       'label' => $label1,
-    );
+    ];
     $this->drupalPostForm('admin/structure/config_test/add', $edit, 'Save');
     $this->assertUrl('admin/structure/config_test');
     $this->assertResponse(200);
@@ -289,10 +289,10 @@ class ConfigEntityTest extends WebTestBase {
     $this->assertLinkByHref("admin/structure/config_test/manage/$id");
 
     // Rename the configuration entity's ID/machine name.
-    $edit = array(
+    $edit = [
       'id' => strtolower($this->randomMachineName()),
       'label' => $label3,
-    );
+    ];
     $this->drupalPostForm("admin/structure/config_test/manage/$id", $edit, 'Save');
     $this->assertUrl('admin/structure/config_test');
     $this->assertResponse(200);
@@ -304,17 +304,17 @@ class ConfigEntityTest extends WebTestBase {
     $this->assertLinkByHref("admin/structure/config_test/manage/$id");
 
     // Create a configuration entity with '0' machine name.
-    $edit = array(
+    $edit = [
       'id' => '0',
       'label' => '0',
-    );
+    ];
     $this->drupalPostForm('admin/structure/config_test/add', $edit, 'Save');
     $this->assertResponse(200);
-    $message_insert = format_string('%label configuration has been created.', array('%label' => $edit['label']));
+    $message_insert = format_string('%label configuration has been created.', ['%label' => $edit['label']]);
     $this->assertRaw($message_insert);
     $this->assertLinkByHref('admin/structure/config_test/manage/0');
     $this->assertLinkByHref('admin/structure/config_test/manage/0/delete');
-    $this->drupalPostForm('admin/structure/config_test/manage/0/delete', array(), 'Delete');
+    $this->drupalPostForm('admin/structure/config_test/manage/0/delete', [], 'Delete');
     $this->assertFalse(entity_load('config_test', '0'), 'Test entity deleted');
 
     // Create a configuration entity with a property that uses AJAX to show
diff --git a/web/core/modules/config/src/Tests/ConfigExportImportUITest.php b/web/core/modules/config/src/Tests/ConfigExportImportUITest.php
index 828d4aa07..9ba59a85c 100644
--- a/web/core/modules/config/src/Tests/ConfigExportImportUITest.php
+++ b/web/core/modules/config/src/Tests/ConfigExportImportUITest.php
@@ -67,7 +67,7 @@ class ConfigExportImportUITest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('config', 'node', 'field');
+  public static $modules = ['config', 'node', 'field'];
 
   /**
    * {@inheritdoc}
@@ -103,11 +103,11 @@ class ConfigExportImportUITest extends WebTestBase {
 
     // Create a field.
     $this->fieldName = Unicode::strtolower($this->randomMachineName());
-    $this->fieldStorage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => 'text',
-    ));
+    ]);
     $this->fieldStorage->save();
     FieldConfig::create([
       'field_storage' => $this->fieldStorage,
@@ -116,9 +116,9 @@ class ConfigExportImportUITest extends WebTestBase {
     // Update the displays so that configuration does not change unexpectedly on
     // import.
     entity_get_form_display('node', $this->contentType->id(), 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'text_textfield',
-      ))
+      ])
       ->save();
     entity_get_display('node', $this->contentType->id(), 'full')
       ->setComponent($this->fieldName)
@@ -134,7 +134,7 @@ class ConfigExportImportUITest extends WebTestBase {
     $this->assertFieldByName("{$this->fieldName}[0][value]", '', 'Widget is displayed');
 
     // Export the configuration.
-    $this->drupalPostForm('admin/config/development/configuration/full/export', array(), 'Export');
+    $this->drupalPostForm('admin/config/development/configuration/full/export', [], 'Export');
     $this->tarball = $this->getRawContent();
 
     $this->config('system.site')
@@ -161,13 +161,13 @@ class ConfigExportImportUITest extends WebTestBase {
     // Import the configuration.
     $filename = 'temporary://' . $this->randomMachineName();
     file_put_contents($filename, $this->tarball);
-    $this->drupalPostForm('admin/config/development/configuration/full/import', array('files[import_tarball]' => $filename), 'Upload');
+    $this->drupalPostForm('admin/config/development/configuration/full/import', ['files[import_tarball]' => $filename], 'Upload');
     // There is no snapshot yet because an import has never run.
     $this->assertNoText(t('Warning message'));
     $this->assertNoText(t('There are no configuration changes to import.'));
     $this->assertText($this->contentType->label());
 
-    $this->drupalPostForm(NULL, array(), 'Import all');
+    $this->drupalPostForm(NULL, [], 'Import all');
     // After importing the snapshot has been updated an there are no warnings.
     $this->assertNoText(t('Warning message'));
     $this->assertText(t('There are no configuration changes to import.'));
@@ -217,25 +217,25 @@ class ConfigExportImportUITest extends WebTestBase {
     /** @var \Drupal\Core\Config\StorageInterface $active_storage */
     $active_storage = \Drupal::service('config.storage');
     $test1_storage = $active_storage->createCollection('collection.test1');
-    $test1_storage->write('config_test.create', array('foo' => 'bar'));
-    $test1_storage->write('config_test.update', array('foo' => 'bar'));
+    $test1_storage->write('config_test.create', ['foo' => 'bar']);
+    $test1_storage->write('config_test.update', ['foo' => 'bar']);
     $test2_storage = $active_storage->createCollection('collection.test2');
-    $test2_storage->write('config_test.another_create', array('foo' => 'bar'));
-    $test2_storage->write('config_test.another_update', array('foo' => 'bar'));
+    $test2_storage->write('config_test.another_create', ['foo' => 'bar']);
+    $test2_storage->write('config_test.another_update', ['foo' => 'bar']);
 
     // Export the configuration.
-    $this->drupalPostForm('admin/config/development/configuration/full/export', array(), 'Export');
+    $this->drupalPostForm('admin/config/development/configuration/full/export', [], 'Export');
     $this->tarball = $this->getRawContent();
     $filename = file_directory_temp() . '/' . $this->randomMachineName();
     file_put_contents($filename, $this->tarball);
 
     // Set up the active storage collections to test import.
     $test1_storage->delete('config_test.create');
-    $test1_storage->write('config_test.update', array('foo' => 'baz'));
-    $test1_storage->write('config_test.delete', array('foo' => 'bar'));
+    $test1_storage->write('config_test.update', ['foo' => 'baz']);
+    $test1_storage->write('config_test.delete', ['foo' => 'bar']);
     $test2_storage->delete('config_test.another_create');
-    $test2_storage->write('config_test.another_update', array('foo' => 'baz'));
-    $test2_storage->write('config_test.another_delete', array('foo' => 'bar'));
+    $test2_storage->write('config_test.another_update', ['foo' => 'baz']);
+    $test2_storage->write('config_test.another_delete', ['foo' => 'bar']);
 
     // Create a snapshot.
     $snapshot_storage = \Drupal::service('config.storage.snapshot');
@@ -244,22 +244,22 @@ class ConfigExportImportUITest extends WebTestBase {
     // Ensure that the snapshot has the expected collection data before import.
     $test1_snapshot = $snapshot_storage->createCollection('collection.test1');
     $data = $test1_snapshot->read('config_test.delete');
-    $this->assertEqual($data, array('foo' => 'bar'), 'The config_test.delete in collection.test1 exists in the snapshot storage.');
+    $this->assertEqual($data, ['foo' => 'bar'], 'The config_test.delete in collection.test1 exists in the snapshot storage.');
     $data = $test1_snapshot->read('config_test.update');
-    $this->assertEqual($data, array('foo' => 'baz'), 'The config_test.update in collection.test1 exists in the snapshot storage.');
+    $this->assertEqual($data, ['foo' => 'baz'], 'The config_test.update in collection.test1 exists in the snapshot storage.');
     $this->assertFalse($test1_snapshot->read('config_test.create'), 'The config_test.create in collection.test1 does not exist in the snapshot storage.');
     $test2_snapshot = $snapshot_storage->createCollection('collection.test2');
     $data = $test2_snapshot->read('config_test.another_delete');
-    $this->assertEqual($data, array('foo' => 'bar'), 'The config_test.another_delete in collection.test2 exists in the snapshot storage.');
+    $this->assertEqual($data, ['foo' => 'bar'], 'The config_test.another_delete in collection.test2 exists in the snapshot storage.');
     $data = $test2_snapshot->read('config_test.another_update');
-    $this->assertEqual($data, array('foo' => 'baz'), 'The config_test.another_update in collection.test2 exists in the snapshot storage.');
+    $this->assertEqual($data, ['foo' => 'baz'], 'The config_test.another_update in collection.test2 exists in the snapshot storage.');
     $this->assertFalse($test2_snapshot->read('config_test.another_create'), 'The config_test.another_create in collection.test2 does not exist in the snapshot storage.');
 
     // Create the tar that contains the expected content for the collections.
     $tar = new ArchiveTar($filename, 'gz');
     $content_list = $tar->listContent();
     // Convert the list of files into something easy to search.
-    $files = array();
+    $files = [];
     foreach ($content_list as $file) {
       $files[] = $file['filename'];
     }
@@ -270,12 +270,12 @@ class ConfigExportImportUITest extends WebTestBase {
     $this->assertFalse(in_array('collection/test1/config_test.delete.yml', $files), 'Config export does not contain collection/test1/config_test.delete.yml.');
     $this->assertFalse(in_array('collection/test2/config_test.another_delete.yml', $files), 'Config export does not contain collection/test2/config_test.another_delete.yml.');
 
-    $this->drupalPostForm('admin/config/development/configuration/full/import', array('files[import_tarball]' => $filename), 'Upload');
+    $this->drupalPostForm('admin/config/development/configuration/full/import', ['files[import_tarball]' => $filename], 'Upload');
     // Verify that there are configuration differences to import.
     $this->drupalGet('admin/config/development/configuration');
     $this->assertNoText(t('There are no configuration changes to import.'));
-    $this->assertText(t('@collection configuration collection', array('@collection' => 'collection.test1')));
-    $this->assertText(t('@collection configuration collection', array('@collection' => 'collection.test2')));
+    $this->assertText(t('@collection configuration collection', ['@collection' => 'collection.test1']));
+    $this->assertText(t('@collection configuration collection', ['@collection' => 'collection.test2']));
     $this->assertText('config_test.create');
     $this->assertLinkByHref('admin/config/development/configuration/sync/diff_collection/collection.test1/config_test.create');
     $this->assertText('config_test.update');
@@ -289,35 +289,35 @@ class ConfigExportImportUITest extends WebTestBase {
     $this->assertText('config_test.another_delete');
     $this->assertLinkByHref('admin/config/development/configuration/sync/diff_collection/collection.test2/config_test.another_delete');
 
-    $this->drupalPostForm(NULL, array(), 'Import all');
+    $this->drupalPostForm(NULL, [], 'Import all');
     $this->assertText(t('There are no configuration changes to import.'));
 
     // Test data in collections.
     $data = $test1_storage->read('config_test.create');
-    $this->assertEqual($data, array('foo' => 'bar'), 'The config_test.create in collection.test1 has been created.');
+    $this->assertEqual($data, ['foo' => 'bar'], 'The config_test.create in collection.test1 has been created.');
     $data = $test1_storage->read('config_test.update');
-    $this->assertEqual($data, array('foo' => 'bar'), 'The config_test.update in collection.test1 has been updated.');
+    $this->assertEqual($data, ['foo' => 'bar'], 'The config_test.update in collection.test1 has been updated.');
     $this->assertFalse($test1_storage->read('config_test.delete'), 'The config_test.delete in collection.test1 has been deleted.');
 
     $data = $test2_storage->read('config_test.another_create');
-    $this->assertEqual($data, array('foo' => 'bar'), 'The config_test.another_create in collection.test2 has been created.');
+    $this->assertEqual($data, ['foo' => 'bar'], 'The config_test.another_create in collection.test2 has been created.');
     $data = $test2_storage->read('config_test.another_update');
-    $this->assertEqual($data, array('foo' => 'bar'), 'The config_test.another_update in collection.test2 has been updated.');
+    $this->assertEqual($data, ['foo' => 'bar'], 'The config_test.another_update in collection.test2 has been updated.');
     $this->assertFalse($test2_storage->read('config_test.another_delete'), 'The config_test.another_delete in collection.test2 has been deleted.');
 
     // Ensure that the snapshot has been updated with the collection data.
     $snapshot_storage = \Drupal::service('config.storage.snapshot');
     $test1_snapshot = $snapshot_storage->createCollection('collection.test1');
     $data = $test1_snapshot->read('config_test.create');
-    $this->assertEqual($data, array('foo' => 'bar'), 'The config_test.create in collection.test1 has been created in the snapshot storage.');
+    $this->assertEqual($data, ['foo' => 'bar'], 'The config_test.create in collection.test1 has been created in the snapshot storage.');
     $data = $test1_snapshot->read('config_test.update');
-    $this->assertEqual($data, array('foo' => 'bar'), 'The config_test.update in collection.test1 has been updated in the snapshot storage.');
+    $this->assertEqual($data, ['foo' => 'bar'], 'The config_test.update in collection.test1 has been updated in the snapshot storage.');
     $this->assertFalse($test1_snapshot->read('config_test.delete'), 'The config_test.delete in collection.test1 does not exist in the snapshot storage.');
     $test2_snapshot = $snapshot_storage->createCollection('collection.test2');
     $data = $test2_snapshot->read('config_test.another_create');
-    $this->assertEqual($data, array('foo' => 'bar'), 'The config_test.another_create in collection.test2 has been created in the snapshot storage.');
+    $this->assertEqual($data, ['foo' => 'bar'], 'The config_test.another_create in collection.test2 has been created in the snapshot storage.');
     $data = $test2_snapshot->read('config_test.another_update');
-    $this->assertEqual($data, array('foo' => 'bar'), 'The config_test.another_update in collection.test2 has been updated in the snapshot storage.');
+    $this->assertEqual($data, ['foo' => 'bar'], 'The config_test.another_update in collection.test2 has been updated in the snapshot storage.');
     $this->assertFalse($test2_snapshot->read('config_test.another_delete'), 'The config_test.another_delete in collection.test2 does not exist in the snapshot storage.');
   }
 
diff --git a/web/core/modules/config/src/Tests/ConfigExportUITest.php b/web/core/modules/config/src/Tests/ConfigExportUITest.php
index d3133d8df..c9f53b36f 100644
--- a/web/core/modules/config/src/Tests/ConfigExportUITest.php
+++ b/web/core/modules/config/src/Tests/ConfigExportUITest.php
@@ -18,7 +18,7 @@ class ConfigExportUITest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('config', 'config_test');
+  public static $modules = ['config', 'config_test'];
 
   /**
    * {@inheritdoc}
@@ -27,25 +27,25 @@ class ConfigExportUITest extends WebTestBase {
     parent::setUp();
 
     // Set up an override.
-    $settings['config']['system.maintenance']['message'] = (object) array(
+    $settings['config']['system.maintenance']['message'] = (object) [
       'value' => 'Foo',
       'required' => TRUE,
-    );
+    ];
     $this->writeSettings($settings);
 
-    $this->drupalLogin($this->drupalCreateUser(array('export configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['export configuration']));
   }
 
   /**
    * Tests export of configuration.
    */
-  function testExport() {
+  public function testExport() {
     // Verify the export page with export submit button is available.
     $this->drupalGet('admin/config/development/configuration/full/export');
     $this->assertFieldById('edit-submit', t('Export'));
 
     // Submit the export form and verify response.
-    $this->drupalPostForm('admin/config/development/configuration/full/export', array(), t('Export'));
+    $this->drupalPostForm('admin/config/development/configuration/full/export', [], t('Export'));
     $this->assertResponse(200, 'User can access the download callback.');
 
     // Test if header contains file name with hostname and timestamp.
@@ -70,7 +70,7 @@ class ConfigExportUITest extends WebTestBase {
     // Prepare the list of config files from active storage, see
     // \Drupal\config\Controller\ConfigController::downloadExport().
     $storage_active = $this->container->get('config.storage');
-    $config_files = array();
+    $config_files = [];
     foreach ($storage_active->listAll() as $config_name) {
       $config_files[] = $config_name . '.yml';
     }
@@ -80,7 +80,7 @@ class ConfigExportUITest extends WebTestBase {
 
     // Ensure the test configuration override is in effect but was not exported.
     $this->assertIdentical(\Drupal::config('system.maintenance')->get('message'), 'Foo');
-    $archiver->extract(file_directory_temp(), array('system.maintenance.yml'));
+    $archiver->extract(file_directory_temp(), ['system.maintenance.yml']);
     $file_contents = file_get_contents(file_directory_temp() . '/' . 'system.maintenance.yml');
     $exported = Yaml::decode($file_contents);
     $this->assertNotIdentical($exported['message'], 'Foo');
diff --git a/web/core/modules/config/src/Tests/ConfigFormOverrideTest.php b/web/core/modules/config/src/Tests/ConfigFormOverrideTest.php
index ffd442820..f721eeba7 100644
--- a/web/core/modules/config/src/Tests/ConfigFormOverrideTest.php
+++ b/web/core/modules/config/src/Tests/ConfigFormOverrideTest.php
@@ -16,15 +16,15 @@ class ConfigFormOverrideTest extends WebTestBase {
    * Tests that overrides do not affect forms.
    */
   public function testFormsWithOverrides() {
-    $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer site configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer site configuration']));
 
     $overridden_name = 'Site name global conf override';
 
     // Set up an override.
-    $settings['config']['system.site']['name'] = (object) array(
+    $settings['config']['system.site']['name'] = (object) [
       'value' => $overridden_name,
       'required' => TRUE,
-    );
+    ];
     $this->writeSettings($settings);
 
     // Test that everything on the form is the same, but that the override
@@ -35,9 +35,9 @@ class ConfigFormOverrideTest extends WebTestBase {
     $this->assertIdentical((string) $elements[0]['value'], 'Drupal');
 
     // Submit the form and ensure the site name is not changed.
-    $edit = array(
+    $edit = [
       'site_name' => 'Custom site name',
-    );
+    ];
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Save configuration'));
     $this->assertTitle('Basic site settings | ' . $overridden_name);
     $elements = $this->xpath('//input[@name="site_name"]');
diff --git a/web/core/modules/config/src/Tests/ConfigImportAllTest.php b/web/core/modules/config/src/Tests/ConfigImportAllTest.php
index baeacb966..459be7a24 100644
--- a/web/core/modules/config/src/Tests/ConfigImportAllTest.php
+++ b/web/core/modules/config/src/Tests/ConfigImportAllTest.php
@@ -36,7 +36,7 @@ class ConfigImportAllTest extends ModuleTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->webUser = $this->drupalCreateUser(array('synchronize configuration'));
+    $this->webUser = $this->drupalCreateUser(['synchronize configuration']);
     $this->drupalLogin($this->webUser);
   }
 
@@ -124,12 +124,12 @@ class ConfigImportAllTest extends ModuleTestBase {
     }
 
     // Import the configuration thereby re-installing all the modules.
-    $this->drupalPostForm('admin/config/development/configuration', array(), t('Import all'));
+    $this->drupalPostForm('admin/config/development/configuration', [], t('Import all'));
     // Modules have been installed that have services.
     $this->rebuildContainer();
 
     // Check that there are no errors.
-    $this->assertIdentical($this->configImporter()->getErrors(), array());
+    $this->assertIdentical($this->configImporter()->getErrors(), []);
 
     // Check that all modules that were uninstalled are now reinstalled.
     $this->assertModules(array_keys($modules_to_uninstall), TRUE);
diff --git a/web/core/modules/config/src/Tests/ConfigImportInstallProfileTest.php b/web/core/modules/config/src/Tests/ConfigImportInstallProfileTest.php
index 0c74c7fa1..eaece36db 100644
--- a/web/core/modules/config/src/Tests/ConfigImportInstallProfileTest.php
+++ b/web/core/modules/config/src/Tests/ConfigImportInstallProfileTest.php
@@ -23,7 +23,7 @@ class ConfigImportInstallProfileTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('config');
+  public static $modules = ['config'];
 
   /**
    * A user with the 'synchronize configuration' permission.
@@ -35,7 +35,7 @@ class ConfigImportInstallProfileTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->webUser = $this->drupalCreateUser(array('synchronize configuration'));
+    $this->webUser = $this->drupalCreateUser(['synchronize configuration']);
     $this->drupalLogin($this->webUser);
     $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
   }
@@ -54,7 +54,7 @@ class ConfigImportInstallProfileTest extends WebTestBase {
     unset($core['module']['testing_config_import']);
     $sync->write('core.extension', $core);
 
-    $this->drupalPostForm('admin/config/development/configuration', array(), t('Import all'));
+    $this->drupalPostForm('admin/config/development/configuration', [], t('Import all'));
     $this->assertText('The configuration cannot be imported because it failed validation for the following reasons:');
     $this->assertText('Unable to uninstall the Testing config import profile since it is the install profile.');
 
@@ -69,7 +69,7 @@ class ConfigImportInstallProfileTest extends WebTestBase {
     $theme = $sync->read('system.theme');
     $theme['default'] = 'classy';
     $sync->write('system.theme', $theme);
-    $this->drupalPostForm('admin/config/development/configuration', array(), t('Import all'));
+    $this->drupalPostForm('admin/config/development/configuration', [], t('Import all'));
     $this->assertText('The configuration was imported successfully.');
     $this->rebuildContainer();
     $this->assertFalse(\Drupal::moduleHandler()->moduleExists('syslog'), 'The syslog module has been uninstalled.');
diff --git a/web/core/modules/config/src/Tests/ConfigImportUITest.php b/web/core/modules/config/src/Tests/ConfigImportUITest.php
index afa9b9958..772dadadd 100644
--- a/web/core/modules/config/src/Tests/ConfigImportUITest.php
+++ b/web/core/modules/config/src/Tests/ConfigImportUITest.php
@@ -19,7 +19,7 @@ class ConfigImportUITest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('config', 'config_test', 'config_import_test', 'text', 'options');
+  public static $modules = ['config', 'config_test', 'config_import_test', 'text', 'options'];
 
   /**
    * A user with the 'synchronize configuration' permission.
@@ -31,7 +31,7 @@ class ConfigImportUITest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->webUser = $this->drupalCreateUser(array('synchronize configuration'));
+    $this->webUser = $this->drupalCreateUser(['synchronize configuration']);
     $this->drupalLogin($this->webUser);
     $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
   }
@@ -39,7 +39,7 @@ class ConfigImportUITest extends WebTestBase {
   /**
    * Tests importing configuration.
    */
-  function testImport() {
+  public function testImport() {
     $name = 'system.site';
     $dynamic_name = 'config_test.dynamic.new';
     /** @var \Drupal\Core\Config\StorageInterface $sync */
@@ -55,11 +55,11 @@ class ConfigImportUITest extends WebTestBase {
     $this->assertIdentical($sync->exists($name), TRUE, $name . ' found.');
 
     // Create new config entity.
-    $original_dynamic_data = array(
+    $original_dynamic_data = [
       'uuid' => '30df59bd-7b03-4cf7-bb35-d42fc49f0651',
       'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
       'status' => TRUE,
-      'dependencies' => array(),
+      'dependencies' => [],
       'id' => 'new',
       'label' => 'New',
       'weight' => 0,
@@ -67,7 +67,7 @@ class ConfigImportUITest extends WebTestBase {
       'size' => '',
       'size_value' => '',
       'protected_property' => '',
-    );
+    ];
     $sync->write($dynamic_name, $original_dynamic_data);
     $this->assertIdentical($sync->exists($dynamic_name), TRUE, $dynamic_name . ' found.');
 
@@ -102,11 +102,11 @@ class ConfigImportUITest extends WebTestBase {
     // handled correctly. Options depends on Text so Text should be installed
     // first. Since they were enabled during the test setup the core.extension
     // file in sync will already contain them.
-    \Drupal::service('module_installer')->uninstall(array('text', 'options'));
+    \Drupal::service('module_installer')->uninstall(['text', 'options']);
 
     // Set the state system to record installations and uninstallations.
-    \Drupal::state()->set('ConfigImportUITest.core.extension.modules_installed', array());
-    \Drupal::state()->set('ConfigImportUITest.core.extension.modules_uninstalled', array());
+    \Drupal::state()->set('ConfigImportUITest.core.extension.modules_installed', []);
+    \Drupal::state()->set('ConfigImportUITest.core.extension.modules_uninstalled', []);
 
     // Verify that both appear as ready to import.
     $this->drupalGet('admin/config/development/configuration');
@@ -118,7 +118,7 @@ class ConfigImportUITest extends WebTestBase {
     $this->assertFieldById('edit-submit', t('Import all'));
 
     // Import and verify that both do not appear anymore.
-    $this->drupalPostForm(NULL, array(), t('Import all'));
+    $this->drupalPostForm(NULL, [], t('Import all'));
     $this->assertNoRaw('<td>' . $name);
     $this->assertNoRaw('<td>' . $dynamic_name);
     $this->assertNoRaw('<td>core.extension');
@@ -150,9 +150,9 @@ class ConfigImportUITest extends WebTestBase {
     $this->assertTrue($theme_info['bartik']->status, 'Bartik theme installed during import.');
 
     // Ensure installations and uninstallation occur as expected.
-    $installed = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_installed', array());
-    $uninstalled = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_uninstalled', array());
-    $expected = array('action', 'ban', 'text', 'options');
+    $installed = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_installed', []);
+    $uninstalled = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_uninstalled', []);
+    $expected = ['action', 'ban', 'text', 'options'];
     $this->assertIdentical($expected, $installed, 'Action, Ban, Text and Options modules installed in the correct order.');
     $this->assertTrue(empty($uninstalled), 'No modules uninstalled during import');
 
@@ -161,8 +161,8 @@ class ConfigImportUITest extends WebTestBase {
     // configuration. This verifies that the module's default configuration is
     // used during configuration import and, additionally, that after installing
     // a module, that configuration is not synced twice.
-    $recursion_limit_values = \Drupal::state()->get('ConfigImportUITest.action.settings.recursion_limit', array());
-    $this->assertIdentical($recursion_limit_values, array(50));
+    $recursion_limit_values = \Drupal::state()->get('ConfigImportUITest.action.settings.recursion_limit', []);
+    $this->assertIdentical($recursion_limit_values, [50]);
 
     $core_extension = $this->config('core.extension')->get();
     unset($core_extension['module']['action']);
@@ -180,8 +180,8 @@ class ConfigImportUITest extends WebTestBase {
     $sync->write('system.theme', $system_theme);
 
     // Set the state system to record installations and uninstallations.
-    \Drupal::state()->set('ConfigImportUITest.core.extension.modules_installed', array());
-    \Drupal::state()->set('ConfigImportUITest.core.extension.modules_uninstalled', array());
+    \Drupal::state()->set('ConfigImportUITest.core.extension.modules_installed', []);
+    \Drupal::state()->set('ConfigImportUITest.core.extension.modules_uninstalled', []);
 
     // Verify that both appear as ready to import.
     $this->drupalGet('admin/config/development/configuration');
@@ -190,7 +190,7 @@ class ConfigImportUITest extends WebTestBase {
     $this->assertRaw('<td>action.settings');
 
     // Import and verify that both do not appear anymore.
-    $this->drupalPostForm(NULL, array(), t('Import all'));
+    $this->drupalPostForm(NULL, [], t('Import all'));
     $this->assertNoRaw('<td>core.extension');
     $this->assertNoRaw('<td>system.theme');
     $this->assertNoRaw('<td>action.settings');
@@ -203,9 +203,9 @@ class ConfigImportUITest extends WebTestBase {
     $this->assertFalse(\Drupal::moduleHandler()->moduleExists('text'), 'Text module uninstalled during import.');
 
     // Ensure installations and uninstallation occur as expected.
-    $installed = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_installed', array());
-    $uninstalled = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_uninstalled', array());
-    $expected = array('options', 'text', 'ban', 'action');
+    $installed = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_installed', []);
+    $uninstalled = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_uninstalled', []);
+    $expected = ['options', 'text', 'ban', 'action'];
     $this->assertIdentical($expected, $uninstalled, 'Options, Text, Ban and Action modules uninstalled in the correct order.');
     $this->assertTrue(empty($installed), 'No modules installed during import');
 
@@ -221,7 +221,7 @@ class ConfigImportUITest extends WebTestBase {
   /**
    * Tests concurrent importing of configuration.
    */
-  function testImportLock() {
+  public function testImportLock() {
     // Create updated configuration object.
     $new_site_name = 'Config import test ' . $this->randomString();
     $this->prepareSiteNameUpdate($new_site_name);
@@ -235,7 +235,7 @@ class ConfigImportUITest extends WebTestBase {
     $this->container->get('lock.persistent')->acquire($config_importer::LOCK_NAME);
 
     // Attempt to import configuration and verify that an error message appears.
-    $this->drupalPostForm(NULL, array(), t('Import all'));
+    $this->drupalPostForm(NULL, [], t('Import all'));
     $this->assertText(t('Another request may be synchronizing configuration already.'));
 
     // Release the lock, just to keep testing sane.
@@ -248,7 +248,7 @@ class ConfigImportUITest extends WebTestBase {
   /**
    * Tests verification of site UUID before importing configuration.
    */
-  function testImportSiteUuidValidation() {
+  public function testImportSiteUuidValidation() {
     $sync = \Drupal::service('config.storage.sync');
     // Create updated configuration object.
     $config_data = $this->config('system.site')->get();
@@ -265,7 +265,7 @@ class ConfigImportUITest extends WebTestBase {
   /**
    * Tests the screen that shows differences between active and sync.
    */
-  function testImportDiff() {
+  public function testImportDiff() {
     $sync = $this->container->get('config.storage.sync');
     $config_name = 'config_test.system';
     $change_key = 'foo';
@@ -273,11 +273,11 @@ class ConfigImportUITest extends WebTestBase {
     $add_key = 'biff';
     $add_data = '<em>bangpow</em>';
     $change_data = '<p><em>foobar</em></p>';
-    $original_data = array(
+    $original_data = [
       'foo' => '<p>foobar</p>',
       'baz' => '<strong>no change</strong>',
       '404' => '<em>herp</em>',
-    );
+    ];
     // Update active storage to have html in config data.
     $this->config($config_name)->setData($original_data)->save();
 
@@ -290,7 +290,8 @@ class ConfigImportUITest extends WebTestBase {
 
     // Load the diff UI and verify that the diff reflects the change.
     $this->drupalGet('admin/config/development/configuration/sync/diff/' . $config_name);
-    $this->assertTitle(format_string('View changes of @config_name | Drupal', array('@config_name' => $config_name)));
+    $this->assertNoRaw('&amp;nbsp;');
+    $this->assertTitle(format_string('View changes of @config_name | Drupal', ['@config_name' => $config_name]));
 
     // The following assertions do not use $this::assertEscaped() because
     // \Drupal\Component\Diff\DiffFormatter adds markup that signifies what has
@@ -307,7 +308,7 @@ class ConfigImportUITest extends WebTestBase {
     $this->assertText(Html::escape("404: '<em>herp</em>'"));
 
     // Verify diff colors are displayed.
-    $result = $this->xpath('//table[contains(@class, :class)]', array(':class' => 'diff'));
+    $result = $this->xpath('//table[contains(@class, :class)]', [':class' => 'diff']);
     $this->assertEqual(count($result), 1, "Diff UI is displaying colors.");
 
     // Reset data back to original, and remove a key
@@ -351,7 +352,7 @@ class ConfigImportUITest extends WebTestBase {
 
     $this->drupalGet('admin/config/development/configuration');
     $this->assertNoText(t('There are no configuration changes to import.'));
-    $this->drupalPostForm(NULL, array(), t('Import all'));
+    $this->drupalPostForm(NULL, [], t('Import all'));
 
     // Verify that the validation messages appear.
     $this->assertText('The configuration cannot be imported because it failed validation for the following reasons:');
@@ -373,11 +374,11 @@ class ConfigImportUITest extends WebTestBase {
     $this->assertText('core.extension');
 
     // Import and verify that both do not appear anymore.
-    $this->drupalPostForm(NULL, array(), t('Import all'));
+    $this->drupalPostForm(NULL, [], t('Import all'));
     $this->assertText('Can not uninstall the Configuration module as part of a configuration synchronization through the user interface.');
   }
 
-  function prepareSiteNameUpdate($new_site_name) {
+  public function prepareSiteNameUpdate($new_site_name) {
     $sync = $this->container->get('config.storage.sync');
     // Create updated configuration object.
     $config_data = $this->config('system.site')->get();
@@ -388,17 +389,17 @@ class ConfigImportUITest extends WebTestBase {
   /**
    * Tests an import that results in an error.
    */
-  function testImportErrorLog() {
+  public function testImportErrorLog() {
     $name_primary = 'config_test.dynamic.primary';
     $name_secondary = 'config_test.dynamic.secondary';
     $sync = $this->container->get('config.storage.sync');
     $uuid = $this->container->get('uuid');
 
-    $values_primary = array(
+    $values_primary = [
       'uuid' => $uuid->generate(),
       'langcode' => 'en',
       'status' => TRUE,
-      'dependencies' => array(),
+      'dependencies' => [],
       'id' => 'primary',
       'label' => 'Primary',
       'weight' => 0,
@@ -406,16 +407,16 @@ class ConfigImportUITest extends WebTestBase {
       'size' => NULL,
       'size_value' => NULL,
       'protected_property' => NULL,
-    );
+    ];
     $sync->write($name_primary, $values_primary);
-    $values_secondary = array(
+    $values_secondary = [
       'uuid' => $uuid->generate(),
       'langcode' => 'en',
       'status' => TRUE,
       // Add a dependency on primary, to ensure that is synced first.
-      'dependencies' => array(
-        'config' => array($name_primary),
-      ),
+      'dependencies' => [
+        'config' => [$name_primary],
+      ],
       'id' => 'secondary',
       'label' => 'Secondary Sync',
       'weight' => 0,
@@ -423,15 +424,15 @@ class ConfigImportUITest extends WebTestBase {
       'size' => NULL,
       'size_value' => NULL,
       'protected_property' => NULL,
-    );
+    ];
     $sync->write($name_secondary, $values_secondary);
     // Verify that there are configuration differences to import.
     $this->drupalGet('admin/config/development/configuration');
     $this->assertNoText(t('There are no configuration changes to import.'));
 
     // Attempt to import configuration and verify that an error message appears.
-    $this->drupalPostForm(NULL, array(), t('Import all'));
-    $this->assertText(SafeMarkup::format('Deleted and replaced configuration entity "@name"', array('@name' => $name_secondary)));
+    $this->drupalPostForm(NULL, [], t('Import all'));
+    $this->assertText(SafeMarkup::format('Deleted and replaced configuration entity "@name"', ['@name' => $name_secondary]));
     $this->assertText(t('The configuration was imported with errors.'));
     $this->assertNoText(t('The configuration was imported successfully.'));
     $this->assertText(t('There are no configuration changes to import.'));
@@ -443,42 +444,42 @@ class ConfigImportUITest extends WebTestBase {
    * @see \Drupal\Core\Entity\Event\BundleConfigImportValidate
    */
   public function testEntityBundleDelete() {
-    \Drupal::service('module_installer')->install(array('node'));
+    \Drupal::service('module_installer')->install(['node']);
     $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
 
     $node_type = $this->drupalCreateContentType();
-    $node = $this->drupalCreateNode(array('type' => $node_type->id()));
+    $node = $this->drupalCreateNode(['type' => $node_type->id()]);
     $this->drupalGet('admin/config/development/configuration');
     // The node type, body field and entity displays will be scheduled for
     // removal.
-    $this->assertText(format_string('node.type.@type', array('@type' => $node_type->id())));
-    $this->assertText(format_string('field.field.node.@type.body', array('@type' => $node_type->id())));
-    $this->assertText(format_string('core.entity_view_display.node.@type.teaser', array('@type' => $node_type->id())));
-    $this->assertText(format_string('core.entity_view_display.node.@type.default', array('@type' => $node_type->id())));
-    $this->assertText(format_string('core.entity_form_display.node.@type.default', array('@type' => $node_type->id())));
+    $this->assertText(format_string('node.type.@type', ['@type' => $node_type->id()]));
+    $this->assertText(format_string('field.field.node.@type.body', ['@type' => $node_type->id()]));
+    $this->assertText(format_string('core.entity_view_display.node.@type.teaser', ['@type' => $node_type->id()]));
+    $this->assertText(format_string('core.entity_view_display.node.@type.default', ['@type' => $node_type->id()]));
+    $this->assertText(format_string('core.entity_form_display.node.@type.default', ['@type' => $node_type->id()]));
 
     // Attempt to import configuration and verify that an error message appears
     // and the node type, body field and entity displays are still scheduled for
     // removal.
-    $this->drupalPostForm(NULL, array(), t('Import all'));
-    $validation_message = t('Entities exist of type %entity_type and %bundle_label %bundle. These entities need to be deleted before importing.', array('%entity_type' => $node->getEntityType()->getLabel(), '%bundle_label' => $node->getEntityType()->getBundleLabel(), '%bundle' => $node_type->label()));
+    $this->drupalPostForm(NULL, [], t('Import all'));
+    $validation_message = t('Entities exist of type %entity_type and %bundle_label %bundle. These entities need to be deleted before importing.', ['%entity_type' => $node->getEntityType()->getLabel(), '%bundle_label' => $node->getEntityType()->getBundleLabel(), '%bundle' => $node_type->label()]);
     $this->assertRaw($validation_message);
-    $this->assertText(format_string('node.type.@type', array('@type' => $node_type->id())));
-    $this->assertText(format_string('field.field.node.@type.body', array('@type' => $node_type->id())));
-    $this->assertText(format_string('core.entity_view_display.node.@type.teaser', array('@type' => $node_type->id())));
-    $this->assertText(format_string('core.entity_view_display.node.@type.default', array('@type' => $node_type->id())));
-    $this->assertText(format_string('core.entity_form_display.node.@type.default', array('@type' => $node_type->id())));
+    $this->assertText(format_string('node.type.@type', ['@type' => $node_type->id()]));
+    $this->assertText(format_string('field.field.node.@type.body', ['@type' => $node_type->id()]));
+    $this->assertText(format_string('core.entity_view_display.node.@type.teaser', ['@type' => $node_type->id()]));
+    $this->assertText(format_string('core.entity_view_display.node.@type.default', ['@type' => $node_type->id()]));
+    $this->assertText(format_string('core.entity_form_display.node.@type.default', ['@type' => $node_type->id()]));
 
     // Delete the node and try to import again.
     $node->delete();
-    $this->drupalPostForm(NULL, array(), t('Import all'));
+    $this->drupalPostForm(NULL, [], t('Import all'));
     $this->assertNoRaw($validation_message);
     $this->assertText(t('There are no configuration changes to import.'));
-    $this->assertNoText(format_string('node.type.@type', array('@type' => $node_type->id())));
-    $this->assertNoText(format_string('field.field.node.@type.body', array('@type' => $node_type->id())));
-    $this->assertNoText(format_string('core.entity_view_display.node.@type.teaser', array('@type' => $node_type->id())));
-    $this->assertNoText(format_string('core.entity_view_display.node.@type.default', array('@type' => $node_type->id())));
-    $this->assertNoText(format_string('core.entity_form_display.node.@type.default', array('@type' => $node_type->id())));
+    $this->assertNoText(format_string('node.type.@type', ['@type' => $node_type->id()]));
+    $this->assertNoText(format_string('field.field.node.@type.body', ['@type' => $node_type->id()]));
+    $this->assertNoText(format_string('core.entity_view_display.node.@type.teaser', ['@type' => $node_type->id()]));
+    $this->assertNoText(format_string('core.entity_view_display.node.@type.default', ['@type' => $node_type->id()]));
+    $this->assertNoText(format_string('core.entity_form_display.node.@type.default', ['@type' => $node_type->id()]));
   }
 
   /**
@@ -508,7 +509,7 @@ class ConfigImportUITest extends WebTestBase {
     $core['theme']['does_not_exist'] = 0;
     $sync->write('core.extension', $core);
 
-    $this->drupalPostForm('admin/config/development/configuration', array(), t('Import all'));
+    $this->drupalPostForm('admin/config/development/configuration', [], t('Import all'));
     $this->assertText('The configuration cannot be imported because it failed validation for the following reasons:');
     $this->assertText('Unable to uninstall the Text module since the Node module is installed.');
     $this->assertText('Unable to uninstall the Classy theme since the Bartik theme is installed.');
diff --git a/web/core/modules/config/src/Tests/ConfigImportUploadTest.php b/web/core/modules/config/src/Tests/ConfigImportUploadTest.php
index 9836d771d..5e2129513 100644
--- a/web/core/modules/config/src/Tests/ConfigImportUploadTest.php
+++ b/web/core/modules/config/src/Tests/ConfigImportUploadTest.php
@@ -23,26 +23,26 @@ class ConfigImportUploadTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('config');
+  public static $modules = ['config'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->webUser = $this->drupalCreateUser(array('import configuration'));
+    $this->webUser = $this->drupalCreateUser(['import configuration']);
     $this->drupalLogin($this->webUser);
   }
 
   /**
    * Tests importing configuration.
    */
-  function testImport() {
+  public function testImport() {
     // Verify access to the config upload form.
     $this->drupalGet('admin/config/development/configuration/full/import');
     $this->assertResponse(200);
 
     // Attempt to upload a non-tar file.
     $text_file = current($this->drupalGetTestFiles('text'));
-    $edit = array('files[import_tarball]' => drupal_realpath($text_file->uri));
+    $edit = ['files[import_tarball]' => drupal_realpath($text_file->uri)];
     $this->drupalPostForm('admin/config/development/configuration/full/import', $edit, t('Upload'));
     $this->assertText(t('Could not extract the contents of the tar file'));
 
diff --git a/web/core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php b/web/core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php
index 337119850..6683580ea 100644
--- a/web/core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php
+++ b/web/core/modules/config/src/Tests/ConfigInstallProfileUnmetDependenciesTest.php
@@ -90,7 +90,7 @@ class ConfigInstallProfileUnmetDependenciesTest extends InstallerTestBase {
     else {
       $this->fail('Expected Drupal\Core\Config\UnmetDependenciesException exception thrown');
     }
-    $this->assertErrorLogged('Configuration objects (system.action.user_block_user_action) provided by user have unmet dependencies in');
+    $this->assertErrorLogged('Configuration objects provided by <em class="placeholder">user</em> have unmet dependencies: <em class="placeholder">system.action.user_block_user_action (action)</em>');
   }
 
 }
diff --git a/web/core/modules/config/src/Tests/ConfigInstallWebTest.php b/web/core/modules/config/src/Tests/ConfigInstallWebTest.php
index 083b1237a..63ecb5bb6 100644
--- a/web/core/modules/config/src/Tests/ConfigInstallWebTest.php
+++ b/web/core/modules/config/src/Tests/ConfigInstallWebTest.php
@@ -26,7 +26,7 @@ class ConfigInstallWebTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer modules', 'administer themes', 'administer site configuration'));
+    $this->adminUser = $this->drupalCreateUser(['administer modules', 'administer themes', 'administer site configuration']);
 
     // Ensure the global variable being asserted by this test does not exist;
     // a previous test executed in this request/process might have set it.
@@ -36,12 +36,12 @@ class ConfigInstallWebTest extends WebTestBase {
   /**
    * Tests module re-installation.
    */
-  function testIntegrationModuleReinstallation() {
+  public function testIntegrationModuleReinstallation() {
     $default_config = 'config_integration_test.settings';
     $default_configuration_entity = 'config_test.dynamic.config_integration_test';
 
     // Install the config_test module we're integrating with.
-    \Drupal::service('module_installer')->install(array('config_test'));
+    \Drupal::service('module_installer')->install(['config_test']);
 
     // Verify the configuration does not exist prior to installation.
     $config_static = $this->config($default_config);
@@ -50,7 +50,7 @@ class ConfigInstallWebTest extends WebTestBase {
     $this->assertIdentical($config_entity->isNew(), TRUE);
 
     // Install the integration module.
-    \Drupal::service('module_installer')->install(array('config_integration_test'));
+    \Drupal::service('module_installer')->install(['config_integration_test']);
 
     // Verify that default module config exists.
     \Drupal::configFactory()->reset($default_config);
@@ -73,7 +73,7 @@ class ConfigInstallWebTest extends WebTestBase {
     $this->container->get('config.factory')->reset();
 
     // Disable and uninstall the integration module.
-    $this->container->get('module_installer')->uninstall(array('config_integration_test'));
+    $this->container->get('module_installer')->uninstall(['config_integration_test']);
 
     // Verify the integration module's config was uninstalled.
     $config_static = $this->config($default_config);
@@ -86,7 +86,7 @@ class ConfigInstallWebTest extends WebTestBase {
 
     // Reinstall the integration module.
     try {
-      \Drupal::service('module_installer')->install(array('config_integration_test'));
+      \Drupal::service('module_installer')->install(['config_integration_test']);
       $this->fail('Expected PreExistingConfigException not thrown.');
     }
     catch (PreExistingConfigException $e) {
@@ -97,7 +97,7 @@ class ConfigInstallWebTest extends WebTestBase {
 
     // Delete the configuration entity so that the install will work.
     $config_entity->delete();
-    \Drupal::service('module_installer')->install(array('config_integration_test'));
+    \Drupal::service('module_installer')->install(['config_integration_test']);
 
     // Verify the integration module's config was re-installed.
     \Drupal::configFactory()->reset($default_config);
@@ -122,19 +122,19 @@ class ConfigInstallWebTest extends WebTestBase {
     // will install the config_test module first because it is a dependency of
     // config_install_fail_test.
     // @see \Drupal\system\Form\ModulesListForm::submitForm()
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_test][enable]' => TRUE, 'modules[Testing][config_install_fail_test][enable]' => TRUE), t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[config_test][enable]' => TRUE, 'modules[config_install_fail_test][enable]' => TRUE], t('Install'));
     $this->assertRaw('Unable to install Configuration install fail test, <em class="placeholder">config_test.dynamic.dotted.default</em> already exists in active configuration.');
 
     // Uninstall the config_test module to test the confirm form.
-    $this->drupalPostForm('admin/modules/uninstall', array('uninstall[config_test]' => TRUE), t('Uninstall'));
-    $this->drupalPostForm(NULL, array(), t('Uninstall'));
+    $this->drupalPostForm('admin/modules/uninstall', ['uninstall[config_test]' => TRUE], t('Uninstall'));
+    $this->drupalPostForm(NULL, [], t('Uninstall'));
 
     // Try to install config_install_fail_test without selecting config_test.
     // The user is shown a confirm form because the config_test module is a
     // dependency.
     // @see \Drupal\system\Form\ModulesListConfirmForm::submitForm()
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_fail_test][enable]' => TRUE), t('Install'));
-    $this->drupalPostForm(NULL, array(), t('Continue'));
+    $this->drupalPostForm('admin/modules', ['modules[config_install_fail_test][enable]' => TRUE], t('Install'));
+    $this->drupalPostForm(NULL, [], t('Continue'));
     $this->assertRaw('Unable to install Configuration install fail test, <em class="placeholder">config_test.dynamic.dotted.default</em> already exists in active configuration.');
 
     // Test that collection configuration clashes during a module install are
@@ -147,7 +147,7 @@ class ConfigInstallWebTest extends WebTestBase {
       ->set('label', 'Je suis Charlie')
       ->save();
 
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_fail_test][enable]' => TRUE), t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[config_install_fail_test][enable]' => TRUE], t('Install'));
     $this->assertRaw('Unable to install Configuration install fail test, <em class="placeholder">config_test.dynamic.dotted.default, language/fr/config_test.dynamic.dotted.default</em> already exist in active configuration.');
 
     // Test installing a theme through the UI that has existing configuration.
@@ -178,12 +178,16 @@ class ConfigInstallWebTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
     // We need to install separately since config_install_dependency_test does
     // not depend on config_test and order is important.
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_test][enable]' => TRUE), t('Install'));
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_dependency_test][enable]' => TRUE), t('Install'));
-    $this->assertRaw('Unable to install Config install dependency test, <em class="placeholder">config_other_module_config_test.weird_simple_config, config_test.dynamic.other_module_test_with_dependency</em> have unmet dependencies.');
+    $this->drupalPostForm('admin/modules', ['modules[config_test][enable]' => TRUE], t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[config_install_dependency_test][enable]' => TRUE], t('Install'));
+    $this->assertRaw('Unable to install <em class="placeholder">Config install dependency test</em> due to unmet dependencies: <em class="placeholder">config_test.dynamic.other_module_test_with_dependency (config_other_module_config_test, config_test.dynamic.dotted.english)</em>');
 
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_other_module_config_test][enable]' => TRUE), t('Install'));
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_dependency_test][enable]' => TRUE), t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[config_test_language][enable]' => TRUE], t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[config_install_dependency_test][enable]' => TRUE], t('Install'));
+    $this->assertRaw('Unable to install <em class="placeholder">Config install dependency test</em> due to unmet dependencies: <em class="placeholder">config_test.dynamic.other_module_test_with_dependency (config_other_module_config_test)</em>');
+
+    $this->drupalPostForm('admin/modules', ['modules[config_other_module_config_test][enable]' => TRUE], t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[config_install_dependency_test][enable]' => TRUE], t('Install'));
     $this->rebuildContainer();
     $this->assertTrue(entity_load('config_test', 'other_module_test_with_dependency'), 'The config_test.dynamic.other_module_test_with_dependency configuration has been created during install.');
   }
@@ -193,12 +197,12 @@ class ConfigInstallWebTest extends WebTestBase {
    */
   public function testConfigModuleRequirements() {
     $this->drupalLogin($this->adminUser);
-    $this->drupalPostForm('admin/modules', array('modules[Core][config][enable]' => TRUE), t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[config][enable]' => TRUE], t('Install'));
 
     $directory = config_get_config_directory(CONFIG_SYNC_DIRECTORY);
     file_unmanaged_delete_recursive($directory);
     $this->drupalGet('/admin/reports/status');
-    $this->assertRaw(t('The directory %directory does not exist.', array('%directory' => $directory)));
+    $this->assertRaw(t('The directory %directory does not exist.', ['%directory' => $directory]));
 
     file_prepare_directory($directory, FILE_CREATE_DIRECTORY);
     \Drupal::service('file_system')->chmod($directory, 0555);
diff --git a/web/core/modules/config/src/Tests/ConfigSingleImportExportTest.php b/web/core/modules/config/src/Tests/ConfigSingleImportExportTest.php
index 53f6164cc..16cff0aa8 100644
--- a/web/core/modules/config/src/Tests/ConfigSingleImportExportTest.php
+++ b/web/core/modules/config/src/Tests/ConfigSingleImportExportTest.php
@@ -39,7 +39,7 @@ class ConfigSingleImportExportTest extends WebTestBase {
     $storage = \Drupal::entityManager()->getStorage('config_test');
     $uuid = \Drupal::service('uuid');
 
-    $this->drupalLogin($this->drupalCreateUser(array('import configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['import configuration']));
 
     // Attempt an import with invalid YAML.
     $edit = [
@@ -57,20 +57,20 @@ weight: 0
 style: ''
 status: '1'
 EOD;
-    $edit = array(
+    $edit = [
       'config_type' => 'config_test',
       'import' => $import,
-    );
+    ];
     // Attempt an import with a missing ID.
     $this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
-    $this->assertText(t('Missing ID key "@id_key" for this @entity_type import.', array('@id_key' => 'id', '@entity_type' => 'Test configuration')));
+    $this->assertText(t('Missing ID key "@id_key" for this @entity_type import.', ['@id_key' => 'id', '@entity_type' => 'Test configuration']));
 
     // Perform an import with no specified UUID and a unique ID.
     $this->assertNull($storage->load('first'));
     $edit['import'] = "id: first\n" . $edit['import'];
     $this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
-    $this->assertRaw(t('Are you sure you want to create a new %name @type?', array('%name' => 'first', '@type' => 'test configuration')));
-    $this->drupalPostForm(NULL, array(), t('Confirm'));
+    $this->assertRaw(t('Are you sure you want to create a new %name @type?', ['%name' => 'first', '@type' => 'test configuration']));
+    $this->drupalPostForm(NULL, [], t('Confirm'));
     $entity = $storage->load('first');
     $this->assertIdentical($entity->label(), 'First');
     $this->assertIdentical($entity->id(), 'first');
@@ -89,8 +89,8 @@ EOD;
     // Attempt an import with a custom ID.
     $edit['custom_entity_id'] = 'custom_id';
     $this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
-    $this->assertRaw(t('Are you sure you want to create a new %name @type?', array('%name' => 'custom_id', '@type' => 'test configuration')));
-    $this->drupalPostForm(NULL, array(), t('Confirm'));
+    $this->assertRaw(t('Are you sure you want to create a new %name @type?', ['%name' => 'custom_id', '@type' => 'test configuration']));
+    $this->drupalPostForm(NULL, [], t('Confirm'));
     $this->assertRaw(t('The configuration was imported successfully.'));
 
     // Perform an import with a unique ID and UUID.
@@ -101,15 +101,15 @@ weight: 0
 style: ''
 status: '0'
 EOD;
-    $edit = array(
+    $edit = [
       'config_type' => 'config_test',
       'import' => $import,
-    );
+    ];
     $second_uuid = $uuid->generate();
     $edit['import'] .= "\nuuid: " . $second_uuid;
     $this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
-    $this->assertRaw(t('Are you sure you want to create a new %name @type?', array('%name' => 'second', '@type' => 'test configuration')));
-    $this->drupalPostForm(NULL, array(), t('Confirm'));
+    $this->assertRaw(t('Are you sure you want to create a new %name @type?', ['%name' => 'second', '@type' => 'test configuration']));
+    $this->drupalPostForm(NULL, [], t('Confirm'));
     $entity = $storage->load('second');
     $this->assertRaw(t('The configuration was imported successfully.'));
     $this->assertIdentical($entity->label(), 'Second');
@@ -126,13 +126,13 @@ weight: 0
 style: ''
 status: '0'
 EOD;
-    $edit = array(
+    $edit = [
       'config_type' => 'config_test',
       'import' => $import,
-    );
+    ];
     $this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
-    $this->assertRaw(t('Are you sure you want to update the %name @type?', array('%name' => 'second', '@type' => 'test configuration')));
-    $this->drupalPostForm(NULL, array(), t('Confirm'));
+    $this->assertRaw(t('Are you sure you want to update the %name @type?', ['%name' => 'second', '@type' => 'test configuration']));
+    $this->drupalPostForm(NULL, [], t('Confirm'));
     $entity = $storage->load('second');
     $this->assertRaw(t('The configuration was imported successfully.'));
     $this->assertIdentical($entity->label(), 'Second updated');
@@ -149,10 +149,10 @@ dependencies:
   module:
     - does_not_exist
 EOD;
-    $edit = array(
+    $edit = [
       'config_type' => 'config_test',
       'import' => $import,
-    );
+    ];
     $this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
     $this->assertRaw(t('Configuration %name depends on the %owner module that will not be installed after import.', ['%name' => 'config_test.dynamic.second', '%owner' => 'does_not_exist']));
   }
@@ -161,20 +161,20 @@ EOD;
    * Tests importing a simple configuration file.
    */
   public function testImportSimpleConfiguration() {
-    $this->drupalLogin($this->drupalCreateUser(array('import configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['import configuration']));
     $config = $this->config('system.site')->set('name', 'Test simple import');
 
     // Place branding block with site name into header region.
     $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']);
 
-    $edit = array(
+    $edit = [
       'config_type' => 'system.simple',
       'config_name' => $config->getName(),
       'import' => Yaml::encode($config->get()),
-    );
+    ];
     $this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
-    $this->assertRaw(t('Are you sure you want to update the %name @type?', array('%name' => $config->getName(), '@type' => 'simple configuration')));
-    $this->drupalPostForm(NULL, array(), t('Confirm'));
+    $this->assertRaw(t('Are you sure you want to update the %name @type?', ['%name' => $config->getName(), '@type' => 'simple configuration']));
+    $this->drupalPostForm(NULL, [], t('Confirm'));
     $this->drupalGet('');
     $this->assertText('Test simple import');
 
@@ -183,11 +183,11 @@ EOD;
     $config_data = $this->config('core.extension')->get();
     // Simulate uninstalling the Config module.
     unset($config_data['module']['config']);
-    $edit = array(
+    $edit = [
       'config_type' => 'system.simple',
       'config_name' => 'core.extension',
       'import' => Yaml::encode($config_data),
-    );
+    ];
     $this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
     $this->assertText(t('Can not uninstall the Configuration module as part of a configuration synchronization through the user interface.'));
 
@@ -197,14 +197,14 @@ EOD;
    * Tests exporting a single configuration file.
    */
   public function testExport() {
-    $this->drupalLogin($this->drupalCreateUser(array('export configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['export configuration']));
 
     $this->drupalGet('admin/config/development/configuration/single/export/system.simple');
     $this->assertFieldByXPath('//select[@name="config_type"]//option[@selected="selected"]', t('Simple configuration'), 'The simple configuration option is selected when specified in the URL.');
     // Spot check several known simple configuration files.
     $element = $this->xpath('//select[@name="config_name"]');
     $options = $this->getAllOptions($element[0]);
-    $expected_options = array('system.site', 'user.settings');
+    $expected_options = ['system.site', 'user.settings'];
     foreach ($options as &$option) {
       $option = (string) $option;
     }
diff --git a/web/core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php b/web/core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php
index 1aa4c9a2b..ba6796065 100644
--- a/web/core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php
+++ b/web/core/modules/config/src/Tests/LanguageNegotiationFormOverrideTest.php
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
  */
 class LanguageNegotiationFormOverrideTest extends WebTestBase {
 
-  public static $modules = array('language', 'locale', 'locale_test');
+  public static $modules = ['language', 'locale', 'locale_test'];
 
   /**
    * Tests that overrides do not affect language-negotiation form values.
@@ -23,16 +23,16 @@ class LanguageNegotiationFormOverrideTest extends WebTestBase {
     $overridden_value_es = 'loquesea';
 
     // Set up an override.
-    $settings['config']['language.negotiation']['url']['prefixes'] = (object) array(
-      'value' => array('en' => $overridden_value_en, 'es' => $overridden_value_es),
+    $settings['config']['language.negotiation']['url']['prefixes'] = (object) [
+      'value' => ['en' => $overridden_value_en, 'es' => $overridden_value_es],
       'required' => TRUE,
-    );
+    ];
     $this->writeSettings($settings);
 
     // Add predefined language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'es',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Overridden string for language-negotiation should not exist in the form.
diff --git a/web/core/modules/config/src/Tests/SchemaCheckTestTrait.php b/web/core/modules/config/src/Tests/SchemaCheckTestTrait.php
index ede1e56ab..57ca3b288 100644
--- a/web/core/modules/config/src/Tests/SchemaCheckTestTrait.php
+++ b/web/core/modules/config/src/Tests/SchemaCheckTestTrait.php
@@ -2,58 +2,13 @@
 
 namespace Drupal\config\Tests;
 
-use Drupal\Core\Config\TypedConfigManagerInterface;
-use Drupal\Core\Config\Schema\SchemaCheckTrait;
-use Drupal\Component\Utility\SafeMarkup;
-
 /**
  * Provides a class for checking configuration schema.
+ *
+ * @deprecated as of 8.3.x, will be removed in before Drupal 9.0.0.
  */
 trait SchemaCheckTestTrait {
 
-  use SchemaCheckTrait;
-
-  /**
-   * Asserts the TypedConfigManager has a valid schema for the configuration.
-   *
-   * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config
-   *   The TypedConfigManager.
-   * @param string $config_name
-   *   The configuration name.
-   * @param array $config_data
-   *   The configuration data.
-   */
-  public function assertConfigSchema(TypedConfigManagerInterface $typed_config, $config_name, $config_data) {
-    $errors = $this->checkConfigSchema($typed_config, $config_name, $config_data);
-    if ($errors === FALSE) {
-      // @todo Since the use of this trait is under TestBase, it works.
-      //   Can be fixed as part of https://www.drupal.org/node/2260053.
-      $this->fail(SafeMarkup::format('No schema for @config_name', array('@config_name' => $config_name)));
-      return;
-    }
-    elseif ($errors === TRUE) {
-      // @todo Since the use of this trait is under TestBase, it works.
-      //   Can be fixed as part of https://www.drupal.org/node/2260053.
-      $this->pass(SafeMarkup::format('Schema found for @config_name and values comply with schema.', array('@config_name' => $config_name)));
-    }
-    else {
-      foreach ($errors as $key => $error) {
-        // @todo Since the use of this trait is under TestBase, it works.
-        //   Can be fixed as part of https://www.drupal.org/node/2260053.
-        $this->fail(SafeMarkup::format('Schema key @key failed with: @error', array('@key' => $key, '@error' => $error)));
-      }
-    }
-  }
-
-  /**
-   * Asserts configuration, specified by name, has a valid schema.
-   *
-   * @param string $config_name
-   *   The configuration name.
-   */
-  public function assertConfigSchemaByName($config_name) {
-    $config = $this->config($config_name);
-    $this->assertConfigSchema(\Drupal::service('config.typed'), $config->getName(), $config->get());
-  }
+  use \Drupal\Tests\SchemaCheckTestTrait;
 
 }
diff --git a/web/core/modules/config/tests/config_collection_install_test/src/EventSubscriber.php b/web/core/modules/config/tests/config_collection_install_test/src/EventSubscriber.php
index da3a9f113..ae3866128 100644
--- a/web/core/modules/config/tests/config_collection_install_test/src/EventSubscriber.php
+++ b/web/core/modules/config/tests/config_collection_install_test/src/EventSubscriber.php
@@ -33,7 +33,7 @@ class EventSubscriber implements EventSubscriberInterface {
    *   The configuration collection info event.
    */
   public function addCollections(ConfigCollectionInfo $collection_info) {
-    $collections = $this->state->get('config_collection_install_test.collection_names', array());
+    $collections = $this->state->get('config_collection_install_test.collection_names', []);
     foreach ($collections as $collection) {
       $collection_info->addCollection($collection);
     }
@@ -42,8 +42,8 @@ class EventSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::COLLECTION_INFO][] = array('addCollections');
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::COLLECTION_INFO][] = ['addCollections'];
     return $events;
   }
 
diff --git a/web/core/modules/config/tests/config_entity_static_cache_test/src/ConfigOverrider.php b/web/core/modules/config/tests/config_entity_static_cache_test/src/ConfigOverrider.php
index 2345d5517..8d21ee4e8 100644
--- a/web/core/modules/config/tests/config_entity_static_cache_test/src/ConfigOverrider.php
+++ b/web/core/modules/config/tests/config_entity_static_cache_test/src/ConfigOverrider.php
@@ -15,11 +15,11 @@ class ConfigOverrider implements ConfigFactoryOverrideInterface {
    * {@inheritdoc}
    */
   public function loadOverrides($names) {
-    return array(
-      'config_test.dynamic.test_1' => array(
+    return [
+      'config_test.dynamic.test_1' => [
         'label' => 'Overridden label',
-      )
-    );
+      ]
+    ];
   }
 
   /**
diff --git a/web/core/modules/config/tests/config_events_test/src/EventSubscriber.php b/web/core/modules/config/tests/config_events_test/src/EventSubscriber.php
index bfa70db3c..98417c02e 100644
--- a/web/core/modules/config/tests/config_events_test/src/EventSubscriber.php
+++ b/web/core/modules/config/tests/config_events_test/src/EventSubscriber.php
@@ -37,21 +37,21 @@ class EventSubscriber implements EventSubscriberInterface {
    */
   public function configEventRecorder(ConfigCrudEvent $event, $name) {
     $config = $event->getConfig();
-    $this->state->set('config_events_test.event', array(
+    $this->state->set('config_events_test.event', [
       'event_name' => $name,
       'current_config_data' => $config->get(),
       'original_config_data' => $config->getOriginal(),
       'raw_config_data' => $config->getRawData()
-    ));
+    ]);
   }
 
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = array('configEventRecorder');
-    $events[ConfigEvents::DELETE][] = array('configEventRecorder');
-    $events[ConfigEvents::RENAME][] = array('configEventRecorder');
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::SAVE][] = ['configEventRecorder'];
+    $events[ConfigEvents::DELETE][] = ['configEventRecorder'];
+    $events[ConfigEvents::RENAME][] = ['configEventRecorder'];
     return $events;
   }
 
diff --git a/web/core/modules/config/tests/config_import_test/src/EventSubscriber.php b/web/core/modules/config/tests/config_import_test/src/EventSubscriber.php
index f4ae97f96..5f8ef86c0 100644
--- a/web/core/modules/config/tests/config_import_test/src/EventSubscriber.php
+++ b/web/core/modules/config/tests/config_import_test/src/EventSubscriber.php
@@ -88,14 +88,14 @@ class EventSubscriber implements EventSubscriberInterface {
   public function onConfigSave(ConfigCrudEvent $event) {
     $config = $event->getConfig();
     if ($config->getName() == 'action.settings') {
-      $values = $this->state->get('ConfigImportUITest.action.settings.recursion_limit', array());
+      $values = $this->state->get('ConfigImportUITest.action.settings.recursion_limit', []);
       $values[] = $config->get('recursion_limit');
       $this->state->set('ConfigImportUITest.action.settings.recursion_limit', $values);
     }
 
     if ($config->getName() == 'core.extension') {
-      $installed = $this->state->get('ConfigImportUITest.core.extension.modules_installed', array());
-      $uninstalled = $this->state->get('ConfigImportUITest.core.extension.modules_uninstalled', array());
+      $installed = $this->state->get('ConfigImportUITest.core.extension.modules_installed', []);
+      $uninstalled = $this->state->get('ConfigImportUITest.core.extension.modules_uninstalled', []);
       $original = $config->getOriginal('module');
       $data = $config->get('module');
       $install = array_diff_key($data, $original);
@@ -131,11 +131,11 @@ class EventSubscriber implements EventSubscriberInterface {
    * @return array
    *   An array of event listener definitions.
    */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = array('onConfigSave', 40);
-    $events[ConfigEvents::DELETE][] = array('onConfigDelete', 40);
-    $events[ConfigEvents::IMPORT_VALIDATE] = array('onConfigImporterValidate');
-    $events[ConfigEvents::IMPORT_MISSING_CONTENT] = array(array('onConfigImporterMissingContentOne'), array('onConfigImporterMissingContentTwo', -100));
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::SAVE][] = ['onConfigSave', 40];
+    $events[ConfigEvents::DELETE][] = ['onConfigDelete', 40];
+    $events[ConfigEvents::IMPORT_VALIDATE] = ['onConfigImporterValidate'];
+    $events[ConfigEvents::IMPORT_MISSING_CONTENT] = [['onConfigImporterMissingContentOne'], ['onConfigImporterMissingContentTwo', -100]];
     return $events;
   }
 
diff --git a/web/core/modules/config/tests/config_install_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml b/web/core/modules/config/tests/config_install_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml
index 69470f818..1d6226683 100644
--- a/web/core/modules/config/tests/config_install_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml
+++ b/web/core/modules/config/tests/config_install_dependency_test/config/install/config_test.dynamic.other_module_test_with_dependency.yml
@@ -9,3 +9,5 @@ dependencies:
   enforced:
     module:
       - config_other_module_config_test
+    config:
+      - config_test.dynamic.dotted.english
diff --git a/web/core/modules/config/tests/config_override_test/config/install/system.cron.yml b/web/core/modules/config/tests/config_override_test/config/install/system.cron.yml
index e4a27dcc2..c27b41dbb 100644
--- a/web/core/modules/config/tests/config_override_test/config/install/system.cron.yml
+++ b/web/core/modules/config/tests/config_override_test/config/install/system.cron.yml
@@ -1,4 +1,4 @@
 threshold:
   requirements_warning: 172800
   requirements_error: 1209600
-
+logging: 1
diff --git a/web/core/modules/config/tests/config_override_test/src/ConfigOverrider.php b/web/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
index 895f041b5..c8ffc694b 100644
--- a/web/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
+++ b/web/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
@@ -14,13 +14,13 @@ class ConfigOverrider implements ConfigFactoryOverrideInterface {
    * {@inheritdoc}
    */
   public function loadOverrides($names) {
-    $overrides = array();
+    $overrides = [];
     if (!empty($GLOBALS['config_test_run_module_overrides'])) {
       if (in_array('system.site', $names)) {
-        $overrides = $overrides + array('system.site' => array('name' => 'ZOMG overridden site name'));
+        $overrides = $overrides + ['system.site' => ['name' => 'ZOMG overridden site name']];
       }
       if (in_array('config_override_test.new', $names)) {
-        $overrides = $overrides + array('config_override_test.new' => array('module' => 'override'));
+        $overrides = $overrides + ['config_override_test.new' => ['module' => 'override']];
       }
     }
     return $overrides;
diff --git a/web/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php b/web/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php
index 6f0b12d1e..b8109db68 100644
--- a/web/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php
+++ b/web/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php
@@ -15,17 +15,17 @@ class ConfigOverriderLowPriority implements ConfigFactoryOverrideInterface {
    * {@inheritdoc}
    */
   public function loadOverrides($names) {
-    $overrides = array();
+    $overrides = [];
     if (!empty($GLOBALS['config_test_run_module_overrides'])) {
       if (in_array('system.site', $names)) {
-        $overrides = array('system.site' =>
-          array(
+        $overrides = ['system.site' =>
+          [
             'name' => 'Should not apply because of higher priority listener',
             // This override should apply because it is not overridden by the
             // higher priority listener.
             'slogan' => 'Yay for overrides!',
-          )
-        );
+          ]
+        ];
       }
     }
     return $overrides;
diff --git a/web/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml b/web/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
index f96bb8b60..c10e2686b 100644
--- a/web/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
+++ b/web/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
@@ -270,3 +270,30 @@ test.double_brackets.turtle.horse:
 
 test.double_brackets.*:
   type: mapping
+
+wrapping.config_schema_test.other_double_brackets:
+  type: config_object
+  mapping:
+    tests:
+      type: sequence
+      sequence:
+        - type: wrapping.test.other_double_brackets.[id]
+
+wrapping.test.other_double_brackets.*:
+  type: test.double_brackets.[id]
+  mapping:
+    id:
+      type: string
+    foo:
+      type: string
+    bar:
+      type: string
+
+test.double_brackets.cat:*.*:
+  type: test.double_brackets.breed
+
+test.double_brackets.breed:
+  type: test.double_brackets
+  mapping:
+    breed:
+      type: string
diff --git a/web/core/modules/config/tests/config_test/src/ConfigTestController.php b/web/core/modules/config/tests/config_test/src/ConfigTestController.php
index d60c62e5c..d352eca16 100644
--- a/web/core/modules/config/tests/config_test/src/ConfigTestController.php
+++ b/web/core/modules/config/tests/config_test/src/ConfigTestController.php
@@ -21,7 +21,7 @@ class ConfigTestController extends ControllerBase {
    *   The title for the ConfigTest edit form.
    */
   public function editTitle(ConfigTest $config_test) {
-    return $this->t('Edit %label', array('%label' => $config_test->label()));
+    return $this->t('Edit %label', ['%label' => $config_test->label()]);
   }
 
   /**
@@ -33,9 +33,9 @@ class ConfigTestController extends ControllerBase {
    * @return \Symfony\Component\HttpFoundation\RedirectResponse
    *   A redirect response to the config_test listing page.
    */
-  function enable(ConfigTest $config_test) {
+  public function enable(ConfigTest $config_test) {
     $config_test->enable()->save();
-    return new RedirectResponse($config_test->url('collection', array('absolute' => TRUE)));
+    return new RedirectResponse($config_test->url('collection', ['absolute' => TRUE]));
   }
 
   /**
@@ -47,9 +47,9 @@ class ConfigTestController extends ControllerBase {
    * @return \Symfony\Component\HttpFoundation\RedirectResponse
    *   A redirect response to the config_test listing page.
    */
-  function disable(ConfigTest $config_test) {
+  public function disable(ConfigTest $config_test) {
     $config_test->disable()->save();
-    return new RedirectResponse($config_test->url('collection', array('absolute' => TRUE)));
+    return new RedirectResponse($config_test->url('collection', ['absolute' => TRUE]));
   }
 
 }
diff --git a/web/core/modules/config/tests/config_test/src/ConfigTestForm.php b/web/core/modules/config/tests/config_test/src/ConfigTestForm.php
index 8a375b81b..6a56c3dfb 100644
--- a/web/core/modules/config/tests/config_test/src/ConfigTestForm.php
+++ b/web/core/modules/config/tests/config_test/src/ConfigTestForm.php
@@ -3,42 +3,14 @@
 namespace Drupal\config_test;
 
 use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Form controller for the test config edit forms.
  */
 class ConfigTestForm extends EntityForm {
 
-  /**
-   * The entity query.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $entityQuery;
-
-  /**
-   * Constructs a new ConfigTestForm.
-   *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query
-   *   The entity query.
-   */
-  public function __construct(QueryFactory $entity_query) {
-    $this->entityQuery = $entity_query;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.query')
-    );
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -46,33 +18,33 @@ class ConfigTestForm extends EntityForm {
     $form = parent::form($form, $form_state);
 
     $entity = $this->entity;
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => 'Label',
       '#default_value' => $entity->label(),
       '#required' => TRUE,
-    );
-    $form['id'] = array(
+    ];
+    $form['id'] = [
       '#type' => 'machine_name',
       '#default_value' => $entity->id(),
       '#required' => TRUE,
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => [$this, 'exists'],
         'replace_pattern' => '[^a-z0-9_.]+',
-      ),
-    );
-    $form['weight'] = array(
+      ],
+    ];
+    $form['weight'] = [
       '#type' => 'weight',
       '#title' => 'Weight',
       '#default_value' => $entity->get('weight'),
-    );
-    $form['style'] = array(
+    ];
+    $form['style'] = [
       '#type' => 'select',
       '#title' => 'Image style',
-      '#options' => array(),
+      '#options' => [],
       '#default_value' => $entity->get('style'),
       '#access' => FALSE,
-    );
+    ];
     if ($this->moduleHandler->moduleExists('image')) {
       $form['style']['#access'] = TRUE;
       $form['style']['#options'] = image_style_options();
@@ -83,61 +55,61 @@ class ConfigTestForm extends EntityForm {
     // state.
     $size = $entity->get('size');
 
-    $form['size_wrapper'] = array(
+    $form['size_wrapper'] = [
       '#type' => 'container',
-      '#attributes' => array(
+      '#attributes' => [
         'id' => 'size-wrapper',
-      ),
-    );
-    $form['size_wrapper']['size'] = array(
+      ],
+    ];
+    $form['size_wrapper']['size'] = [
       '#type' => 'select',
       '#title' => 'Size',
-      '#options' => array(
+      '#options' => [
         'custom' => 'Custom',
-      ),
+      ],
       '#empty_option' => '- None -',
       '#default_value' => $size,
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => '::updateSize',
         'wrapper' => 'size-wrapper',
-      ),
-    );
-    $form['size_wrapper']['size_submit'] = array(
+      ],
+    ];
+    $form['size_wrapper']['size_submit'] = [
       '#type' => 'submit',
       '#value' => t('Change size'),
-      '#attributes' => array(
-        'class' => array('js-hide'),
-      ),
-      '#submit' => array(array(get_class($this), 'changeSize')),
-    );
-    $form['size_wrapper']['size_value'] = array(
+      '#attributes' => [
+        'class' => ['js-hide'],
+      ],
+      '#submit' => [[get_class($this), 'changeSize']],
+    ];
+    $form['size_wrapper']['size_value'] = [
       '#type' => 'select',
       '#title' => 'Custom size value',
-      '#options' => array(
+      '#options' => [
         'small' => 'Small',
         'medium' => 'Medium',
         'large' => 'Large',
-      ),
+      ],
       '#default_value' => $entity->get('size_value'),
       '#access' => !empty($size),
-    );
+    ];
 
-    $form['langcode'] = array(
+    $form['langcode'] = [
       '#type' => 'language_select',
       '#title' => t('Language'),
       '#languages' => LanguageInterface::STATE_ALL,
       '#default_value' => $entity->language()->getId(),
-    );
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => 'Save',
-    );
-    $form['actions']['delete'] = array(
+    ];
+    $form['actions']['delete'] = [
       '#type' => 'submit',
       '#value' => 'Delete',
-    );
+    ];
 
     return $form;
   }
@@ -164,10 +136,10 @@ class ConfigTestForm extends EntityForm {
     $status = $entity->save();
 
     if ($status === SAVED_UPDATED) {
-      drupal_set_message(format_string('%label configuration has been updated.', array('%label' => $entity->label())));
+      drupal_set_message(format_string('%label configuration has been updated.', ['%label' => $entity->label()]));
     }
     else {
-      drupal_set_message(format_string('%label configuration has been created.', array('%label' => $entity->label())));
+      drupal_set_message(format_string('%label configuration has been created.', ['%label' => $entity->label()]));
     }
 
     $form_state->setRedirectUrl($this->entity->urlInfo('collection'));
@@ -189,7 +161,8 @@ class ConfigTestForm extends EntityForm {
   public function exists($entity_id, array $element, FormStateInterface $form_state) {
     /** @var \Drupal\Core\Config\Entity\ConfigEntityInterface $entity */
     $entity = $form_state->getFormObject()->getEntity();
-    return (bool) $this->entityQuery->get($entity->getEntityTypeId())
+    return (bool) $this->entityTypeManager->getStorage($entity->getEntityTypeId())
+      ->getQuery()
       ->condition($entity->getEntityType()->getKey('id'), $entity_id)
       ->execute();
   }
diff --git a/web/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php b/web/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
index 10914f019..ca3b35498 100644
--- a/web/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
+++ b/web/core/modules/config/tests/config_test/src/Entity/ConfigQueryTest.php
@@ -38,6 +38,6 @@ class ConfigQueryTest extends ConfigTest {
    *
    * @var array
    */
-  public $array = array();
+  public $array = [];
 
 }
diff --git a/web/core/modules/config/tests/config_test/src/Entity/ConfigTest.php b/web/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
index f19eb65ae..1bd1d8dee 100644
--- a/web/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
+++ b/web/core/modules/config/tests/config_test/src/Entity/ConfigTest.php
@@ -88,10 +88,10 @@ class ConfigTest extends ConfigEntityBase implements ConfigTestInterface {
   public function postSave(EntityStorageInterface $storage, $update = TRUE) {
     // Used to test secondary writes during config sync.
     if ($this->id() == 'primary') {
-      $secondary = $storage->create(array(
+      $secondary = $storage->create([
         'id' => 'secondary',
         'label' => 'Secondary Default',
-      ));
+      ]);
       $secondary->save();
     }
     if ($this->id() == 'deleter') {
@@ -126,7 +126,7 @@ class ConfigTest extends ConfigEntityBase implements ConfigTestInterface {
     if (!isset($this->dependencies['enforced']['config'])) {
       return $changed;
     }
-    $fix_deps = \Drupal::state()->get('config_test.fix_dependencies', array());
+    $fix_deps = \Drupal::state()->get('config_test.fix_dependencies', []);
     foreach ($dependencies['config'] as $entity) {
       if (in_array($entity->getConfigDependencyName(), $fix_deps)) {
         $key = array_search($entity->getConfigDependencyName(), $this->dependencies['enforced']['config']);
diff --git a/web/core/modules/config/tests/config_test/src/SchemaListenerController.php b/web/core/modules/config/tests/config_test/src/SchemaListenerController.php
index 3ed236b2b..e028e1e06 100644
--- a/web/core/modules/config/tests/config_test/src/SchemaListenerController.php
+++ b/web/core/modules/config/tests/config_test/src/SchemaListenerController.php
@@ -8,7 +8,7 @@ use Drupal\Core\Controller\ControllerBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Controller for testing \Drupal\Core\Config\Testing\ConfigSchemaChecker.
+ * Controller for testing \Drupal\Core\Config\Development\ConfigSchemaChecker.
  */
 class SchemaListenerController extends ControllerBase {
 
diff --git a/web/core/modules/config/tests/config_test/src/TestInstallStorage.php b/web/core/modules/config/tests/config_test/src/TestInstallStorage.php
index 074e99ca6..e3c4918df 100644
--- a/web/core/modules/config/tests/config_test/src/TestInstallStorage.php
+++ b/web/core/modules/config/tests/config_test/src/TestInstallStorage.php
@@ -20,7 +20,7 @@ class TestInstallStorage extends InstallStorage {
     if (!isset($this->folders)) {
       $this->folders = $this->getCoreNames();
       $listing = new ExtensionDiscovery(\Drupal::root());
-      $listing->setProfileDirectories(array());
+      $listing->setProfileDirectories([]);
       $this->folders += $this->getComponentNames($listing->scan('profile'));
       $this->folders += $this->getComponentNames($listing->scan('module'));
       $this->folders += $this->getComponentNames($listing->scan('theme'));
diff --git a/web/core/modules/config/src/Tests/ConfigDependencyWebTest.php b/web/core/modules/config/tests/src/Functional/ConfigDependencyWebTest.php
similarity index 75%
rename from web/core/modules/config/src/Tests/ConfigDependencyWebTest.php
rename to web/core/modules/config/tests/src/Functional/ConfigDependencyWebTest.php
index 5eb52067b..696a36e8c 100644
--- a/web/core/modules/config/src/Tests/ConfigDependencyWebTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigDependencyWebTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Config\Entity\ConfigEntityStorage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests configuration entities.
  *
  * @group config
  */
-class ConfigDependencyWebTest extends WebTestBase {
+class ConfigDependencyWebTest extends BrowserTestBase {
 
   /**
    * The maximum length for the entity storage used in this test.
@@ -22,24 +22,24 @@ class ConfigDependencyWebTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
    * Tests ConfigDependencyDeleteFormTrait.
    *
    * @see \Drupal\Core\Config\Entity\ConfigDependencyDeleteFormTrait
    */
-  function testConfigDependencyDeleteFormTrait() {
+  public function testConfigDependencyDeleteFormTrait() {
     $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
 
     /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
     $storage = $this->container->get('entity.manager')->getStorage('config_test');
     // Entity1 will be deleted by the test.
     $entity1 = $storage->create(
-      array(
+      [
         'id' => 'entity1',
         'label' => 'Entity One',
-      )
+      ]
     );
     $entity1->save();
 
@@ -47,14 +47,14 @@ class ConfigDependencyWebTest extends WebTestBase {
     // \Drupal\config_test\Entity::onDependencyRemoval() will remove the
     // dependency before config entities are deleted.
     $entity2 = $storage->create(
-      array(
+      [
         'id' => 'entity2',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity1->getConfigDependencyName()],
+          ],
+        ],
+      ]
     );
     $entity2->save();
 
@@ -65,47 +65,47 @@ class ConfigDependencyWebTest extends WebTestBase {
     $this->assertNoText(t('Configuration updates'), 'No configuration updates found.');
     $this->assertText(t('Configuration deletions'), 'Configuration deletions found.');
     $this->assertText($entity2->id(), 'Entity2 id found');
-    $this->drupalPostForm($entity1->urlInfo('delete-form'), array(), 'Delete');
+    $this->drupalPostForm($entity1->urlInfo('delete-form'), [], 'Delete');
     $storage->resetCache();
     $this->assertFalse($storage->loadMultiple([$entity1->id(), $entity2->id()]), 'Test entities deleted');
 
     // Set a more complicated test where dependencies will be fixed.
     // Entity1 will be deleted by the test.
     $entity1 = $storage->create(
-      array(
+      [
         'id' => 'entity1',
-      )
+      ]
     );
     $entity1->save();
-    \Drupal::state()->set('config_test.fix_dependencies', array($entity1->getConfigDependencyName()));
+    \Drupal::state()->set('config_test.fix_dependencies', [$entity1->getConfigDependencyName()]);
 
     // Entity2 has a dependency on Entity1 but it can be fixed because
     // \Drupal\config_test\Entity::onDependencyRemoval() will remove the
     // dependency before config entities are deleted.
     $entity2 = $storage->create(
-      array(
+      [
         'id' => 'entity2',
         'label' => 'Entity Two',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity1->getConfigDependencyName()],
+          ],
+        ],
+      ]
     );
     $entity2->save();
 
     // Entity3 will be unchanged because it is dependent on Entity2 which can
     // be fixed.
     $entity3 = $storage->create(
-      array(
+      [
         'id' => 'entity3',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity2->getConfigDependencyName()),
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity2->getConfigDependencyName()],
+          ],
+        ],
+      ]
     );
     $entity3->save();
 
@@ -115,12 +115,12 @@ class ConfigDependencyWebTest extends WebTestBase {
     $this->assertNoText($entity2->id(), 'Entity2 id not found');
     $this->assertText($entity2->label(), 'Entity2 label not found');
     $this->assertNoText($entity3->id(), 'Entity3 id not found');
-    $this->drupalPostForm($entity1->urlInfo('delete-form'), array(), 'Delete');
+    $this->drupalPostForm($entity1->urlInfo('delete-form'), [], 'Delete');
     $storage->resetCache();
     $this->assertFalse($storage->load('entity1'), 'Test entity 1 deleted');
     $entity2 = $storage->load('entity2');
     $this->assertTrue($entity2, 'Entity 2 not deleted');
-    $this->assertEqual($entity2->calculateDependencies()->getDependencies()['config'], array(), 'Entity 2 dependencies updated to remove dependency on Entity1.');
+    $this->assertEqual($entity2->calculateDependencies()->getDependencies()['config'], [], 'Entity 2 dependencies updated to remove dependency on Entity1.');
     $entity3 = $storage->load('entity3');
     $this->assertTrue($entity3, 'Entity 3 not deleted');
     $this->assertEqual($entity3->calculateDependencies()->getDependencies()['config'], [$entity2->getConfigDependencyName()], 'Entity 3 still depends on Entity 2.');
diff --git a/web/core/modules/config/tests/src/Functional/ConfigDraggableListBuilderTest.php b/web/core/modules/config/tests/src/Functional/ConfigDraggableListBuilderTest.php
index 417e9f13c..74829359a 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigDraggableListBuilderTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigDraggableListBuilderTest.php
@@ -15,13 +15,13 @@ class ConfigDraggableListBuilderTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
    * Test draggable lists.
    */
   public function testDraggableList() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer permissions')));
+    $this->drupalLogin($this->drupalCreateUser(['administer permissions']));
 
     // Create more than 50 roles.
     for ($i = 0; $i < 51; $i++) {
diff --git a/web/core/modules/config/src/Tests/ConfigEntityListMultilingualTest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityListMultilingualTest.php
similarity index 81%
rename from web/core/modules/config/src/Tests/ConfigEntityListMultilingualTest.php
rename to web/core/modules/config/tests/src/Functional/ConfigEntityListMultilingualTest.php
index f5c12d806..7c5fa1fac 100644
--- a/web/core/modules/config/src/Tests/ConfigEntityListMultilingualTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityListMultilingualTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 
 /**
@@ -10,14 +10,14 @@ use Drupal\language\Entity\ConfigurableLanguage;
  *
  * @group config
  */
-class ConfigEntityListMultilingualTest extends WebTestBase {
+class ConfigEntityListMultilingualTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('config_test', 'language', 'block');
+  public static $modules = ['config_test', 'language', 'block'];
 
   /**
    * {@inheritdoc}
@@ -34,9 +34,9 @@ class ConfigEntityListMultilingualTest extends WebTestBase {
   /**
    * Tests the listing UI with different language scenarios.
    */
-  function testListUI() {
+  public function testListUI() {
     // Log in as an administrative user to access the full menu trail.
-    $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer site configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer site configuration']));
 
     // Get the list page.
     $this->drupalGet('admin/structure/config_test');
@@ -44,11 +44,11 @@ class ConfigEntityListMultilingualTest extends WebTestBase {
 
     // Add a new entity using the action link.
     $this->clickLink('Add test configuration');
-    $edit = array(
+    $edit = [
       'label' => 'Antilop',
       'id' => 'antilop',
       'langcode' => 'hu',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     // Ensure that operations for editing the Hungarian entity appear in English.
     $this->assertLinkByHref('admin/structure/config_test/manage/antilop');
diff --git a/web/core/modules/config/src/Tests/ConfigEntityStatusUITest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
similarity index 81%
rename from web/core/modules/config/src/Tests/ConfigEntityStatusUITest.php
rename to web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
index 95dd9dad1..af68f33bd 100644
--- a/web/core/modules/config/src/Tests/ConfigEntityStatusUITest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
@@ -1,34 +1,34 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests configuration entity status UI functionality.
  *
  * @group config
  */
-class ConfigEntityStatusUITest extends WebTestBase {
+class ConfigEntityStatusUITest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
    * Tests status operations.
    */
-  function testCRUD() {
+  public function testCRUD() {
     $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
 
     $id = strtolower($this->randomMachineName());
-    $edit = array(
+    $edit = [
       'id' => $id,
       'label' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('admin/structure/config_test/add', $edit, 'Save');
 
     $entity = entity_load('config_test', $id);
diff --git a/web/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php b/web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
similarity index 93%
rename from web/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php
rename to web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
index c2cea6d43..1f5232c93 100644
--- a/web/core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Config\InstallStorage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Config\FileStorage;
 use Drupal\system\Entity\Action;
 use Drupal\tour\Entity\Tour;
@@ -15,7 +15,7 @@ use Drupal\tour\Entity\Tour;
  *
  * @group config
  */
-class ConfigInstallProfileOverrideTest extends WebTestBase {
+class ConfigInstallProfileOverrideTest extends BrowserTestBase {
 
   /**
    * The profile to install as a basis for testing.
@@ -28,22 +28,24 @@ class ConfigInstallProfileOverrideTest extends WebTestBase {
   /**
    * Tests install profile config changes.
    */
-  function testInstallProfileConfigOverwrite() {
+  public function testInstallProfileConfigOverwrite() {
     $config_name = 'system.cron';
     // The expected configuration from the system module.
-    $expected_original_data = array(
-      'threshold' => array(
+    $expected_original_data = [
+      'threshold' => [
         'requirements_warning' => 172800,
         'requirements_error' => 1209600,
-      ),
-    );
+      ],
+      'logging' => 1,
+    ];
     // The expected active configuration altered by the install profile.
-    $expected_profile_data = array(
-      'threshold' => array(
+    $expected_profile_data = [
+      'threshold' => [
         'requirements_warning' => 259200,
         'requirements_error' => 1209600,
-      ),
-    );
+      ],
+      'logging' => 1,
+    ];
     $expected_profile_data['_core']['default_config_hash'] = Crypt::hashBase64(serialize($expected_profile_data));
 
     // Verify that the original data matches. We have to read the module config
diff --git a/web/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php b/web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
similarity index 88%
rename from web/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php
rename to web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
index f966e5f16..092ad2b37 100644
--- a/web/core/modules/config/src/Tests/ConfigLanguageOverrideWebTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests language overrides applied through the website.
  *
  * @group config
  */
-class ConfigLanguageOverrideWebTest extends WebTestBase {
+class ConfigLanguageOverrideWebTest extends BrowserTestBase {
 
   /**
    * Modules to install.
@@ -34,19 +34,19 @@ class ConfigLanguageOverrideWebTest extends WebTestBase {
   /**
    * Tests translating the site name.
    */
-  function testSiteNameTranslation() {
-    $adminUser = $this->drupalCreateUser(array('administer site configuration', 'administer languages'));
+  public function testSiteNameTranslation() {
+    $adminUser = $this->drupalCreateUser(['administer site configuration', 'administer languages']);
     $this->drupalLogin($adminUser);
 
     // Add a custom language.
     $langcode = 'xx';
     $name = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     \Drupal::languageManager()
       ->getLanguageConfigOverride($langcode, 'system.site')
diff --git a/web/core/modules/config/src/Tests/ConfigOtherModuleTest.php b/web/core/modules/config/tests/src/Functional/ConfigOtherModuleTest.php
similarity index 93%
rename from web/core/modules/config/src/Tests/ConfigOtherModuleTest.php
rename to web/core/modules/config/tests/src/Functional/ConfigOtherModuleTest.php
index 56c4b31a6..a99676072 100644
--- a/web/core/modules/config/src/Tests/ConfigOtherModuleTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigOtherModuleTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests default configuration provided by a module that does not own it.
  *
  * @group config
  */
-class ConfigOtherModuleTest extends WebTestBase {
+class ConfigOtherModuleTest extends BrowserTestBase {
 
   /**
    * Tests enabling the provider of the default configuration first.
@@ -61,6 +61,7 @@ class ConfigOtherModuleTest extends WebTestBase {
     // installed once all the dependencies are met.
     $this->assertNull(entity_load('config_test', 'other_module_test_unmet', TRUE), 'The optional configuration config_test.dynamic.other_module_test_unmet whose dependencies are not met is not created.');
     $this->assertNull(entity_load('config_test', 'other_module_test_optional_entity_unmet', TRUE), 'The optional configuration config_test.dynamic.other_module_test_optional_entity_unmet whose dependencies are not met is not created.');
+    $this->installModule('config_test_language');
     $this->installModule('config_install_dependency_test');
     $this->assertTrue(entity_load('config_test', 'other_module_test_unmet', TRUE), 'The optional configuration config_test.dynamic.other_module_test_unmet whose dependencies are met is now created.');
     // Although the following configuration entity's are now met it is not
@@ -86,14 +87,14 @@ class ConfigOtherModuleTest extends WebTestBase {
   public function testUninstall() {
     $this->installModule('views');
     $storage = $this->container->get('entity_type.manager')->getStorage('view');
-    $storage->resetCache(array('frontpage'));
+    $storage->resetCache(['frontpage']);
     $this->assertTrue($storage->load('frontpage') === NULL, 'After installing Views, frontpage view which is dependant on the Node and Views modules does not exist.');
     $this->installModule('node');
-    $storage->resetCache(array('frontpage'));
+    $storage->resetCache(['frontpage']);
     $this->assertTrue($storage->load('frontpage') !== NULL, 'After installing Node, frontpage view which is dependant on the Node and Views modules exists.');
     $this->uninstallModule('node');
     $storage = $this->container->get('entity_type.manager')->getStorage('view');
-    $storage->resetCache(array('frontpage'));
+    $storage->resetCache(['frontpage']);
     $this->assertTrue($storage->load('frontpage') === NULL, 'After uninstalling Node, frontpage view which is dependant on the Node and Views modules does not exist.');
   }
 
@@ -104,7 +105,7 @@ class ConfigOtherModuleTest extends WebTestBase {
    *   The module name.
    */
   protected function installModule($module) {
-    $this->container->get('module_installer')->install(array($module));
+    $this->container->get('module_installer')->install([$module]);
     $this->container = \Drupal::getContainer();
   }
 
@@ -115,7 +116,7 @@ class ConfigOtherModuleTest extends WebTestBase {
    *   The module name.
    */
   protected function uninstallModule($module) {
-    $this->container->get('module_installer')->uninstall(array($module));
+    $this->container->get('module_installer')->uninstall([$module]);
     $this->container = \Drupal::getContainer();
   }
 
diff --git a/web/core/modules/config/src/Tests/SchemaConfigListenerWebTest.php b/web/core/modules/config/tests/src/Functional/SchemaConfigListenerWebTest.php
similarity index 88%
rename from web/core/modules/config/src/Tests/SchemaConfigListenerWebTest.php
rename to web/core/modules/config/tests/src/Functional/SchemaConfigListenerWebTest.php
index 45aabc8d3..189d78fc6 100644
--- a/web/core/modules/config/src/Tests/SchemaConfigListenerWebTest.php
+++ b/web/core/modules/config/tests/src/Functional/SchemaConfigListenerWebTest.php
@@ -1,24 +1,24 @@
 <?php
 
-namespace Drupal\config\Tests;
+namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Config\Schema\SchemaIncompleteException;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the functionality of ConfigSchemaChecker in WebTestBase tests.
  *
  * @group config
  */
-class SchemaConfigListenerWebTest extends WebTestBase {
+class SchemaConfigListenerWebTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
-   * Tests \Drupal\Core\Config\Testing\ConfigSchemaChecker.
+   * Tests \Drupal\Core\Config\Development\ConfigSchemaChecker.
    */
   public function testConfigSchemaChecker() {
     $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
diff --git a/web/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php b/web/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php
index 7dd8d7dac..0bfb32e93 100644
--- a/web/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php
+++ b/web/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
 class ConfigLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array('config' => 'core/modules/config');
+    $this->directoryList = ['config' => 'core/modules/config'];
     parent::setUp();
   }
 
@@ -29,13 +29,13 @@ class ConfigLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function getConfigAdminRoutes() {
-    return array(
-      array('config.sync', array(array('config.sync', 'config.import', 'config.export'))),
-      array('config.import_full', array(array('config.sync', 'config.import', 'config.export'), array('config.import_full', 'config.import_single'))),
-      array('config.import_single', array(array('config.sync', 'config.import', 'config.export'), array('config.import_full', 'config.import_single'))),
-      array('config.export_full', array(array('config.sync', 'config.import', 'config.export'), array('config.export_full', 'config.export_single'))),
-      array('config.export_single', array(array('config.sync', 'config.import', 'config.export'), array('config.export_full', 'config.export_single'))),
-    );
+    return [
+      ['config.sync', [['config.sync', 'config.import', 'config.export']]],
+      ['config.import_full', [['config.sync', 'config.import', 'config.export'], ['config.import_full', 'config.import_single']]],
+      ['config.import_single', [['config.sync', 'config.import', 'config.export'], ['config.import_full', 'config.import_single']]],
+      ['config.export_full', [['config.sync', 'config.import', 'config.export'], ['config.export_full', 'config.export_single']]],
+      ['config.export_single', [['config.sync', 'config.import', 'config.export'], ['config.export_full', 'config.export_single']]],
+    ];
   }
 
 }
diff --git a/web/core/modules/config_translation/config_translation.api.php b/web/core/modules/config_translation/config_translation.api.php
index f2ee4a290..f97e25997 100644
--- a/web/core/modules/config_translation/config_translation.api.php
+++ b/web/core/modules/config_translation/config_translation.api.php
@@ -50,14 +50,14 @@ function hook_config_translation_info(&$info) {
 
       // Make sure entity type has field UI enabled and has a base route.
       if ($entity_type->get('field_ui_base_route') && !empty($base_route)) {
-        $info[$entity_type_id . '_fields'] = array(
+        $info[$entity_type_id . '_fields'] = [
           'base_route_name' => 'entity.field_config.' . $entity_type_id . '_field_edit_form',
           'entity_type' => 'field_config',
           'title' => t('Title'),
           'class' => '\Drupal\config_translation\ConfigFieldMapper',
           'base_entity_type' => $entity_type_id,
           'weight' => 10,
-        );
+        ];
       }
     }
   }
diff --git a/web/core/modules/config_translation/config_translation.module b/web/core/modules/config_translation/config_translation.module
index 9f0803d0e..344d90e27 100644
--- a/web/core/modules/config_translation/config_translation.module
+++ b/web/core/modules/config_translation/config_translation.module
@@ -5,6 +5,7 @@
  * Configuration Translation module.
  */
 
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\field\FieldConfigInterface;
@@ -17,15 +18,15 @@ function config_translation_help($route_name, RouteMatchInterface $route_match)
     case 'help.page.config_translation':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Configuration Translation module allows you to translate configuration text; for example, the site name, vocabularies, menus, or date formats. Together with the modules <a href=":language">Language</a>, <a href=":content-translation">Content Translation</a>, and <a href=":locale">Interface Translation</a>, it allows you to build multilingual websites. For more information, see the <a href=":doc_url">online documentation for the Configuration Translation module</a>.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/config_translation', ':config' => \Drupal::url('help.page', array('name' => 'config')), ':language' => \Drupal::url('help.page', array('name' => 'language')), ':locale' => \Drupal::url('help.page', array('name' => 'locale')), ':content-translation' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? \Drupal::url('help.page', array('name' => 'content_translation')) : '#')) . '</p>';
+      $output .= '<p>' . t('The Configuration Translation module allows you to translate configuration text; for example, the site name, vocabularies, menus, or date formats. Together with the modules <a href=":language">Language</a>, <a href=":content-translation">Content Translation</a>, and <a href=":locale">Interface Translation</a>, it allows you to build multilingual websites. For more information, see the <a href=":doc_url">online documentation for the Configuration Translation module</a>.', [':doc_url' => 'https://www.drupal.org/documentation/modules/config_translation', ':config' => \Drupal::url('help.page', ['name' => 'config']), ':language' => \Drupal::url('help.page', ['name' => 'language']), ':locale' => \Drupal::url('help.page', ['name' => 'locale']), ':content-translation' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? \Drupal::url('help.page', ['name' => 'content_translation']) : '#']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Enabling translation') . '</dt>';
-      $output .= '<dd>' . t('In order to translate configuration, the website must have at least two <a href=":url">languages</a>.', array(':url' => \Drupal::url('entity.configurable_language.collection'))) . '</dd>';
+      $output .= '<dd>' . t('In order to translate configuration, the website must have at least two <a href=":url">languages</a>.', [':url' => \Drupal::url('entity.configurable_language.collection')]) . '</dd>';
       $output .= '<dt>' . t('Translating configuration text') . '</dt>';
-      $output .= '<dd>' . t('Users with the <em>Translate user edited configuration</em> permission can access the configuration translation overview, and manage translations for specific languages. The <a href=":translation-page">Configuration translation</a> page shows a list of all configuration text that can be translated, either as individual items or as lists. After you click on <em>Translate</em>, you are provided with a list of all languages. You can <em>add</em> or <em>edit</em> a translation for a specific language. Users with specific configuration permissions can also <em>edit</em> the text for the site\'s default language. For some configuration text items (for example for the site information), the specific translation pages can also be accessed directly from their configuration pages.', array(':translation-page' => \Drupal::url('config_translation.mapper_list'))) . '</dd>';
+      $output .= '<dd>' . t('Users with the <em>Translate user edited configuration</em> permission can access the configuration translation overview, and manage translations for specific languages. The <a href=":translation-page">Configuration translation</a> page shows a list of all configuration text that can be translated, either as individual items or as lists. After you click on <em>Translate</em>, you are provided with a list of all languages. You can <em>add</em> or <em>edit</em> a translation for a specific language. Users with specific configuration permissions can also <em>edit</em> the text for the site\'s default language. For some configuration text items (for example for the site information), the specific translation pages can also be accessed directly from their configuration pages.', [':translation-page' => \Drupal::url('config_translation.mapper_list')]) . '</dd>';
       $output .= '<dt>' . t('Translating date formats') . '</dt>';
-      $output .= '<dd>' . t('You can choose to translate date formats on the <a href=":translation-page">Configuration translation</a> page. This allows you not only to translate the label text, but also to set a language-specific <em>PHP date format</em>.', array(':translation-page' => \Drupal::url('config_translation.mapper_list'))) . '</dd>';
+      $output .= '<dd>' . t('You can choose to translate date formats on the <a href=":translation-page">Configuration translation</a> page. This allows you not only to translate the label text, but also to set a language-specific <em>PHP date format</em>.', [':translation-page' => \Drupal::url('config_translation.mapper_list')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -39,12 +40,12 @@ function config_translation_help($route_name, RouteMatchInterface $route_match)
  * Implements hook_theme().
  */
 function config_translation_theme() {
-  return array(
-    'config_translation_manage_form_element' => array(
+  return [
+    'config_translation_manage_form_element' => [
       'render element' => 'element',
       'template' => 'config_translation_manage_form_element',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -75,7 +76,7 @@ function config_translation_themes_uninstalled() {
 function config_translation_entity_type_alter(array &$entity_types) {
   /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
   foreach ($entity_types as $entity_type_id => $entity_type) {
-    if ($entity_type->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
+    if ($entity_type->entityClassImplements(ConfigEntityInterface::class)) {
       if ($entity_type_id == 'block') {
         $class = 'Drupal\config_translation\Controller\ConfigTranslationBlockListBuilder';
       }
@@ -109,13 +110,13 @@ function config_translation_config_translation_info(&$info) {
     foreach ($entity_manager->getDefinitions() as $entity_type_id => $entity_type) {
       // Make sure entity type has field UI enabled and has a base route.
       if ($entity_type->get('field_ui_base_route')) {
-        $info[$entity_type_id . '_fields'] = array(
+        $info[$entity_type_id . '_fields'] = [
           'base_route_name' => "entity.field_config.{$entity_type_id}_field_edit_form",
           'entity_type' => 'field_config',
           'class' => '\Drupal\config_translation\ConfigFieldMapper',
           'base_entity_type' => $entity_type_id,
           'weight' => 10,
-        );
+        ];
       }
     }
   }
@@ -125,7 +126,7 @@ function config_translation_config_translation_info(&$info) {
     // Determine base path for entities automatically if provided via the
     // configuration entity.
     if (
-      !$entity_type->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface') ||
+      !$entity_type->entityClassImplements(ConfigEntityInterface::class) ||
       !$entity_type->hasLinkTemplate('edit-form')
     ) {
       // Do not record this entity mapper if the entity type does not
@@ -137,14 +138,14 @@ function config_translation_config_translation_info(&$info) {
 
     // Use the entity type as the plugin ID.
     $base_route_name = "entity.$entity_type_id.edit_form";
-    $info[$entity_type_id] = array(
+    $info[$entity_type_id] = [
       'class' => '\Drupal\config_translation\ConfigEntityMapper',
       'base_route_name' => $base_route_name,
       'title' => $entity_type->getLowercaseLabel(),
-      'names' => array(),
+      'names' => [],
       'entity_type' => $entity_type_id,
       'weight' => 10,
-    );
+    ];
   }
 }
 
@@ -152,9 +153,9 @@ function config_translation_config_translation_info(&$info) {
  * Implements hook_entity_operation().
  */
 function config_translation_entity_operation(EntityInterface $entity) {
-  $operations = array();
+  $operations = [];
   $entity_type = $entity->getEntityType();
-  if ($entity_type->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface') &&
+  if ($entity_type->entityClassImplements(ConfigEntityInterface::class) &&
     $entity->hasLinkTemplate('config-translation-overview') &&
     \Drupal::currentUser()->hasPermission('translate configuration')) {
 
@@ -163,11 +164,11 @@ function config_translation_entity_operation(EntityInterface $entity) {
       $link_template = "config-translation-overview.{$entity->getTargetEntityTypeId()}";
     }
 
-    $operations['translate'] = array(
+    $operations['translate'] = [
       'title' => t('Translate'),
       'weight' => 50,
       'url' => $entity->urlInfo($link_template),
-    );
+    ];
   }
 
   return $operations;
@@ -177,7 +178,7 @@ function config_translation_entity_operation(EntityInterface $entity) {
  * Implements hook_config_schema_info_alter().
  */
 function config_translation_config_schema_info_alter(&$definitions) {
-  $map = array(
+  $map = [
     'label' => '\Drupal\config_translation\FormElement\Textfield',
     'text' => '\Drupal\config_translation\FormElement\Textarea',
     'date_format' => '\Drupal\config_translation\FormElement\DateFormat',
@@ -185,7 +186,7 @@ function config_translation_config_schema_info_alter(&$definitions) {
     'mapping' => '\Drupal\config_translation\FormElement\ListElement',
     'sequence' => '\Drupal\config_translation\FormElement\ListElement',
     'plural_label' => '\Drupal\config_translation\FormElement\PluralVariants',
-  );
+  ];
 
   // Enhance the text and date type definitions with classes to generate proper
   // form elements in ConfigTranslationFormBase. Other translatable types will
diff --git a/web/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml b/web/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml
new file mode 100644
index 000000000..f2c6f95f3
--- /dev/null
+++ b/web/core/modules/config_translation/migration_templates/d6_i18n_user_profile_field_instance.yml
@@ -0,0 +1,29 @@
+id: d6_i18n_user_profile_field_instance
+label: User profile field instance configuration
+migration_tags:
+  - Drupal 6
+source:
+  plugin: d6_i18n_profile_field
+  constants:
+    entity_type: user
+    bundle: user
+process:
+  langcode: language
+  entity_type: 'constants/entity_type'
+  bundle: 'constants/bundle'
+  field_name: name
+  property:
+    plugin: static_map
+    source: property
+    map:
+      title: label
+      options: options
+      explanation: description
+  translation: translation
+destination:
+  plugin: entity:field_config
+  translations: true
+migration_dependencies:
+  required:
+    - user_profile_field
+    - user_profile_field_instance
diff --git a/web/core/modules/config_translation/src/ConfigEntityMapper.php b/web/core/modules/config_translation/src/ConfigEntityMapper.php
index faf899100..2ae309593 100644
--- a/web/core/modules/config_translation/src/ConfigEntityMapper.php
+++ b/web/core/modules/config_translation/src/ConfigEntityMapper.php
@@ -113,7 +113,7 @@ class ConfigEntityMapper extends ConfigNamesMapper {
   /**
    * Gets the entity instance for this mapper.
    *
-   * @return \Drupal\Core\Config\Entity\ConfigEntityInterface $entity
+   * @return \Drupal\Core\Config\Entity\ConfigEntityInterface
    *   The configuration entity.
    */
   public function getEntity() {
@@ -165,7 +165,7 @@ class ConfigEntityMapper extends ConfigNamesMapper {
    * {@inheritdoc}
    */
   public function getBaseRouteParameters() {
-    return array($this->entityType => $this->entity->id());
+    return [$this->entityType => $this->entity->id()];
   }
 
   /**
@@ -220,14 +220,14 @@ class ConfigEntityMapper extends ConfigNamesMapper {
    * {@inheritdoc}
    */
   public function getOperations() {
-    return array(
-      'list' => array(
+    return [
+      'list' => [
         'title' => $this->t('List'),
         'url' => Url::fromRoute('config_translation.entity_list', [
           'mapper_id' => $this->getPluginId(),
         ]),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -259,12 +259,12 @@ class ConfigEntityMapper extends ConfigNamesMapper {
    */
   protected function processRoute(Route $route) {
     // Add entity upcasting information.
-    $parameters = $route->getOption('parameters') ?: array();
-    $parameters += array(
-      $this->entityType => array(
+    $parameters = $route->getOption('parameters') ?: [];
+    $parameters += [
+      $this->entityType => [
         'type' => 'entity:' . $this->entityType,
-      )
-    );
+      ]
+    ];
     $route->setOption('parameters', $parameters);
   }
 
diff --git a/web/core/modules/config_translation/src/ConfigFieldMapper.php b/web/core/modules/config_translation/src/ConfigFieldMapper.php
index a9f6d7662..c0e085f11 100644
--- a/web/core/modules/config_translation/src/ConfigFieldMapper.php
+++ b/web/core/modules/config_translation/src/ConfigFieldMapper.php
@@ -44,7 +44,7 @@ class ConfigFieldMapper extends ConfigEntityMapper {
    */
   public function getTypeLabel() {
     $base_entity_info = $this->entityManager->getDefinition($this->pluginDefinition['base_entity_type']);
-    return $this->t('@label fields', array('@label' => $base_entity_info->getLabel()));
+    return $this->t('@label fields', ['@label' => $base_entity_info->getLabel()]);
   }
 
   /**
diff --git a/web/core/modules/config_translation/src/ConfigMapperManager.php b/web/core/modules/config_translation/src/ConfigMapperManager.php
index cd0b72f96..a43f08083 100644
--- a/web/core/modules/config_translation/src/ConfigMapperManager.php
+++ b/web/core/modules/config_translation/src/ConfigMapperManager.php
@@ -39,12 +39,12 @@ class ConfigMapperManager extends DefaultPluginManager implements ConfigMapperMa
   /**
    * {@inheritdoc}
    */
-  protected $defaults = array(
+  protected $defaults = [
     'title' => '',
-    'names' => array(),
+    'names' => [],
     'weight' => 20,
     'class' => '\Drupal\config_translation\ConfigNamesMapper',
-  );
+  ];
 
   /**
    * Constructs a ConfigMapperManager.
@@ -72,7 +72,7 @@ class ConfigMapperManager extends DefaultPluginManager implements ConfigMapperMa
     $this->alterInfo('config_translation_info');
     // Config translation only uses an info hook discovery, cache by language.
     $cache_key = 'config_translation_info_plugins' . ':' . $language_manager->getCurrentLanguage()->getId();
-    $this->setCacheBackend($cache_backend, $cache_key, array('config_translation_info_plugins'));
+    $this->setCacheBackend($cache_backend, $cache_key, ['config_translation_info_plugins']);
   }
 
   /**
@@ -90,7 +90,7 @@ class ConfigMapperManager extends DefaultPluginManager implements ConfigMapperMa
       //   request; when routes are being rebuilt at the end of the request,
       //   this service only happens to get instantiated with the updated list
       //   of installed themes.
-      $directories = array();
+      $directories = [];
       foreach ($this->moduleHandler->getModuleList() as $name => $module) {
         $directories[$name] = $module->getPath();
       }
@@ -111,7 +111,7 @@ class ConfigMapperManager extends DefaultPluginManager implements ConfigMapperMa
    * {@inheritdoc}
    */
   public function getMappers(RouteCollection $collection = NULL) {
-    $mappers = array();
+    $mappers = [];
     foreach ($this->getDefinitions() as $id => $definition) {
       $mappers[$id] = $this->createInstance($id);
       if ($collection) {
@@ -155,7 +155,7 @@ class ConfigMapperManager extends DefaultPluginManager implements ConfigMapperMa
     // If this plugin was provided by a module that does not exist, remove the
     // plugin definition.
     foreach ($definitions as $plugin_id => $plugin_definition) {
-      if (isset($plugin_definition['provider']) && !in_array($plugin_definition['provider'], array('core', 'component')) && (!$this->moduleHandler->moduleExists($plugin_definition['provider']) && !in_array($plugin_definition['provider'], array_keys($this->themeHandler->listInfo())))) {
+      if (isset($plugin_definition['provider']) && !in_array($plugin_definition['provider'], ['core', 'component']) && (!$this->moduleHandler->moduleExists($plugin_definition['provider']) && !in_array($plugin_definition['provider'], array_keys($this->themeHandler->listInfo())))) {
         unset($definitions[$plugin_id]);
       }
     }
diff --git a/web/core/modules/config_translation/src/ConfigNamesMapper.php b/web/core/modules/config_translation/src/ConfigNamesMapper.php
index 0784090da..03716e972 100644
--- a/web/core/modules/config_translation/src/ConfigNamesMapper.php
+++ b/web/core/modules/config_translation/src/ConfigNamesMapper.php
@@ -180,7 +180,7 @@ class ConfigNamesMapper extends PluginBase implements ConfigMapperInterface, Con
    * {@inheritdoc}
    */
   public function getBaseRouteParameters() {
-    return array();
+    return [];
   }
 
   /**
@@ -231,11 +231,11 @@ class ConfigNamesMapper extends PluginBase implements ConfigMapperInterface, Con
   public function getOverviewRoute() {
     $route = new Route(
       $this->getBaseRoute()->getPath() . '/translate',
-      array(
+      [
         '_controller' => '\Drupal\config_translation\Controller\ConfigTranslationController::itemPage',
         'plugin_id' => $this->getPluginId(),
-      ),
-      array('_config_translation_overview_access' => 'TRUE')
+      ],
+      ['_config_translation_overview_access' => 'TRUE']
     );
     $this->processRoute($route);
     return $route;
@@ -272,11 +272,11 @@ class ConfigNamesMapper extends PluginBase implements ConfigMapperInterface, Con
   public function getAddRoute() {
     $route = new Route(
       $this->getBaseRoute()->getPath() . '/translate/{langcode}/add',
-      array(
+      [
         '_form' => '\Drupal\config_translation\Form\ConfigTranslationAddForm',
         'plugin_id' => $this->getPluginId(),
-      ),
-      array('_config_translation_form_access' => 'TRUE')
+      ],
+      ['_config_translation_form_access' => 'TRUE']
     );
     $this->processRoute($route);
     return $route;
@@ -302,11 +302,11 @@ class ConfigNamesMapper extends PluginBase implements ConfigMapperInterface, Con
   public function getEditRoute() {
     $route = new Route(
       $this->getBaseRoute()->getPath() . '/translate/{langcode}/edit',
-      array(
+      [
         '_form' => '\Drupal\config_translation\Form\ConfigTranslationEditForm',
         'plugin_id' => $this->getPluginId(),
-      ),
-      array('_config_translation_form_access' => 'TRUE')
+      ],
+      ['_config_translation_form_access' => 'TRUE']
     );
     $this->processRoute($route);
     return $route;
@@ -332,11 +332,11 @@ class ConfigNamesMapper extends PluginBase implements ConfigMapperInterface, Con
   public function getDeleteRoute() {
     $route = new Route(
       $this->getBaseRoute()->getPath() . '/translate/{langcode}/delete',
-      array(
+      [
         '_form' => '\Drupal\config_translation\Form\ConfigTranslationDeleteForm',
         'plugin_id' => $this->getPluginId(),
-      ),
-      array('_config_translation_form_access' => 'TRUE')
+      ],
+      ['_config_translation_form_access' => 'TRUE']
     );
     $this->processRoute($route);
     return $route;
@@ -413,7 +413,7 @@ class ConfigNamesMapper extends PluginBase implements ConfigMapperInterface, Con
    * {@inheritdoc}
    */
   public function getConfigData() {
-    $config_data = array();
+    $config_data = [];
     foreach ($this->getConfigNames() as $name) {
       $config_data[$name] = $this->configFactory->getEditable($name)->get();
     }
@@ -467,12 +467,12 @@ class ConfigNamesMapper extends PluginBase implements ConfigMapperInterface, Con
    * {@inheritdoc}
    */
   public function getOperations() {
-    return array(
-      'translate' => array(
+    return [
+      'translate' => [
         'title' => $this->t('Translate'),
         'url' => Url::fromRoute($this->getOverviewRouteName(), $this->getOverviewRouteParameters()),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php b/web/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
index d0de3419b..c226dfbd6 100644
--- a/web/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
+++ b/web/core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
@@ -18,7 +18,7 @@ class ConfigTranslationBlockListBuilder extends ConfigTranslationEntityListBuild
    *
    * @var array
    */
-  protected $themes = array();
+  protected $themes = [];
 
   /**
    * {@inheritdoc}
@@ -58,20 +58,20 @@ class ConfigTranslationBlockListBuilder extends ConfigTranslationEntityListBuild
     $theme = $entity->getTheme();
     $plugin_definition = $entity->getPlugin()->getPluginDefinition();
 
-    $row['label'] = array(
+    $row['label'] = [
       'data' => $entity->label(),
       'class' => 'table-filter-text-source',
-    );
+    ];
 
-    $row['theme'] = array(
+    $row['theme'] = [
       'data' => $this->themes[$theme]->info['name'],
       'class' => 'table-filter-text-source',
-    );
+    ];
 
-    $row['category'] = array(
+    $row['category'] = [
       'data' => $plugin_definition['category'],
       'class' => 'table-filter-text-source',
-    );
+    ];
 
     $row['operations']['data'] = $this->buildOperations($entity);
 
@@ -93,7 +93,7 @@ class ConfigTranslationBlockListBuilder extends ConfigTranslationEntityListBuild
    * {@inheritdoc}
    */
   public function sortRows($a, $b) {
-    return $this->sortRowsMultiple($a, $b, array('theme', 'category', 'label'));
+    return $this->sortRowsMultiple($a, $b, ['theme', 'category', 'label']);
   }
 
 }
diff --git a/web/core/modules/config_translation/src/Controller/ConfigTranslationController.php b/web/core/modules/config_translation/src/Controller/ConfigTranslationController.php
index 927a1e2bf..8d9bfe7bd 100644
--- a/web/core/modules/config_translation/src/Controller/ConfigTranslationController.php
+++ b/web/core/modules/config_translation/src/Controller/ConfigTranslationController.php
@@ -134,12 +134,12 @@ class ConfigTranslationController extends ControllerBase {
     $mapper = $this->configMapperManager->createInstance($plugin_id);
     $mapper->populateFromRouteMatch($route_match);
 
-    $page = array();
-    $page['#title'] = $this->t('Translations for %label', array('%label' => $mapper->getTitle()));
+    $page = [];
+    $page['#title'] = $this->t('Translations for %label', ['%label' => $mapper->getTitle()]);
 
     $languages = $this->languageManager->getLanguages();
     if (count($languages) == 1) {
-      drupal_set_message($this->t('In order to translate configuration, the website must have at least two <a href=":url">languages</a>.', array(':url' => $this->url('entity.configurable_language.collection'))), 'warning');
+      drupal_set_message($this->t('In order to translate configuration, the website must have at least two <a href=":url">languages</a>.', [':url' => $this->url('entity.configurable_language.collection')]), 'warning');
     }
 
     try {
@@ -172,7 +172,7 @@ class ConfigTranslationController extends ControllerBase {
       // If the language is not configured on the site, create a dummy language
       // object for this listing only to ensure the user gets useful info.
       $language_name = $this->languageManager->getLanguageName($original_langcode);
-      $languages[$original_langcode] = new Language(array('id' => $original_langcode, 'name' => $language_name));
+      $languages[$original_langcode] = new Language(['id' => $original_langcode, 'name' => $language_name]);
     }
 
     // We create a fake request object to pass into
@@ -181,10 +181,10 @@ class ConfigTranslationController extends ControllerBase {
     // possible nor performant.
     $fake_request = $request->duplicate();
 
-    $page['languages'] = array(
+    $page['languages'] = [
       '#type' => 'table',
-      '#header' => array($this->t('Language'), $this->t('Operations')),
-    );
+      '#header' => [$this->t('Language'), $this->t('Operations')],
+    ];
     foreach ($languages as $language) {
       $langcode = $language->getId();
 
@@ -198,57 +198,57 @@ class ConfigTranslationController extends ControllerBase {
       // Prepare the language name and the operations depending on whether this
       // is the original language or not.
       if ($langcode == $original_langcode) {
-        $language_name = '<strong>' . $this->t('@language (original)', array('@language' => $language->getName())) . '</strong>';
+        $language_name = '<strong>' . $this->t('@language (original)', ['@language' => $language->getName()]) . '</strong>';
 
         // Check access for the path/route for editing, so we can decide to
         // include a link to edit or not.
         $edit_access = $this->accessManager->checkNamedRoute($mapper->getBaseRouteName(), $route_match->getRawParameters()->all(), $this->account);
 
         // Build list of operations.
-        $operations = array();
+        $operations = [];
         if ($edit_access) {
-          $operations['edit'] = array(
+          $operations['edit'] = [
             'title' => $this->t('Edit'),
             'url' => Url::fromRoute($mapper->getBaseRouteName(), $mapper->getBaseRouteParameters(), ['query' => ['destination' => $mapper->getOverviewPath()]]),
-          );
+          ];
         }
       }
       else {
         $language_name = $language->getName();
 
-        $operations = array();
+        $operations = [];
         // If no translation exists for this language, link to add one.
         if (!$mapper->hasTranslation($language)) {
-          $operations['add'] = array(
+          $operations['add'] = [
             'title' => $this->t('Add'),
             'url' => Url::fromRoute($mapper->getAddRouteName(), $mapper->getAddRouteParameters()),
-          );
+          ];
         }
         else {
           // Otherwise, link to edit the existing translation.
-          $operations['edit'] = array(
+          $operations['edit'] = [
             'title' => $this->t('Edit'),
             'url' => Url::fromRoute($mapper->getEditRouteName(), $mapper->getEditRouteParameters()),
-          );
+          ];
 
-          $operations['delete'] = array(
+          $operations['delete'] = [
             'title' => $this->t('Delete'),
             'url' => Url::fromRoute($mapper->getDeleteRouteName(), $mapper->getDeleteRouteParameters()),
-          );
+          ];
         }
       }
 
-      $page['languages'][$langcode]['language'] = array(
+      $page['languages'][$langcode]['language'] = [
         '#markup' => $language_name,
-      );
+      ];
 
-      $page['languages'][$langcode]['operations'] = array(
+      $page['languages'][$langcode]['operations'] = [
         '#type' => 'operations',
         '#links' => $operations,
         // Even if the mapper contains multiple language codes, the source
         // configuration can still be edited.
         '#access' => ($langcode == $original_langcode) || $operations_access,
-      );
+      ];
     }
     return $page;
   }
diff --git a/web/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php b/web/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
index e86237e3c..87cb2605c 100644
--- a/web/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
+++ b/web/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
@@ -16,10 +16,10 @@ class ConfigTranslationEntityListBuilder extends ConfigEntityListBuilder impleme
    * @return array
    */
   protected function getFilterLabels() {
-    return array(
+    return [
       'placeholder' => $this->t('Enter label'),
       'description' => $this->t('Enter a part of the label or description to filter by.'),
-    );
+    ];
   }
 
   /**
@@ -29,28 +29,28 @@ class ConfigTranslationEntityListBuilder extends ConfigEntityListBuilder impleme
     $build = parent::render();
     $filter = $this->getFilterLabels();
 
-    usort($build['table']['#rows'], array($this, 'sortRows'));
+    usort($build['table']['#rows'], [$this, 'sortRows']);
 
-    $build['filters'] = array(
+    $build['filters'] = [
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('table-filter', 'js-show'),
-      ),
+      '#attributes' => [
+        'class' => ['table-filter', 'js-show'],
+      ],
       '#weight' => -10,
-    );
+    ];
 
-    $build['filters']['text'] = array(
+    $build['filters']['text'] = [
       '#type' => 'search',
       '#title' => $this->t('Search'),
       '#size' => 30,
       '#placeholder' => $filter['placeholder'],
-      '#attributes' => array(
-        'class' => array('table-filter-text'),
+      '#attributes' => [
+        'class' => ['table-filter-text'],
         'data-table' => '.config-translation-entity-list',
         'autocomplete' => 'off',
         'title' => $filter['description'],
-      ),
-    );
+      ],
+    ];
 
     $build['table']['#attributes']['class'][] = 'config-translation-entity-list';
     $build['table']['#weight'] = 0;
@@ -95,7 +95,7 @@ class ConfigTranslationEntityListBuilder extends ConfigEntityListBuilder impleme
    * {@inheritdoc}
    */
   public function sortRows($a, $b) {
-    return $this->sortRowsMultiple($a, $b, array('label'));
+    return $this->sortRowsMultiple($a, $b, ['label']);
   }
 
   /**
diff --git a/web/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php b/web/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
index 6388c811d..566afdbb2 100644
--- a/web/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
+++ b/web/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
@@ -26,14 +26,14 @@ class ConfigTranslationFieldListBuilder extends ConfigTranslationEntityListBuild
    *
    * @var array
    */
-  protected $baseEntityInfo = array();
+  protected $baseEntityInfo = [];
 
   /**
    * The bundle info for the base entity type.
    *
    * @var array
    */
-  protected $baseEntityBundles = array();
+  protected $baseEntityBundles = [];
 
   /**
    * The entity manager.
@@ -99,8 +99,8 @@ class ConfigTranslationFieldListBuilder extends ConfigTranslationEntityListBuild
     $bundle = $this->baseEntityInfo->getBundleLabel() ?: $this->t('Bundle');
     $bundle = Unicode::strtolower($bundle);
 
-    $info['placeholder'] = $this->t('Enter field or @bundle', array('@bundle' => $bundle));
-    $info['description'] = $this->t('Enter a part of the field or @bundle to filter by.', array('@bundle' => $bundle));
+    $info['placeholder'] = $this->t('Enter field or @bundle', ['@bundle' => $bundle]);
+    $info['description'] = $this->t('Enter a part of the field or @bundle to filter by.', ['@bundle' => $bundle]);
 
     return $info;
   }
@@ -109,17 +109,17 @@ class ConfigTranslationFieldListBuilder extends ConfigTranslationEntityListBuild
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    $row['label'] = array(
+    $row['label'] = [
       'data' => $entity->label(),
       'class' => 'table-filter-text-source',
-    );
+    ];
 
     if ($this->displayBundle()) {
       $bundle = $entity->get('bundle');
-      $row['bundle'] = array(
+      $row['bundle'] = [
         'data' => $this->baseEntityBundles[$bundle]['label'],
         'class' => 'table-filter-text-source',
-      );
+      ];
     }
 
     return $row + parent::buildRow($entity);
@@ -165,7 +165,7 @@ class ConfigTranslationFieldListBuilder extends ConfigTranslationEntityListBuild
    * {@inheritdoc}
    */
   public function sortRows($a, $b) {
-    return $this->sortRowsMultiple($a, $b, array('bundle', 'label'));
+    return $this->sortRowsMultiple($a, $b, ['bundle', 'label']);
   }
 
 }
diff --git a/web/core/modules/config_translation/src/Controller/ConfigTranslationMapperList.php b/web/core/modules/config_translation/src/Controller/ConfigTranslationMapperList.php
index f47d313c2..4e510aaf3 100644
--- a/web/core/modules/config_translation/src/Controller/ConfigTranslationMapperList.php
+++ b/web/core/modules/config_translation/src/Controller/ConfigTranslationMapperList.php
@@ -46,13 +46,13 @@ class ConfigTranslationMapperList extends ControllerBase {
    *   Renderable array with config translation mappers.
    */
   public function render() {
-    $build = array(
+    $build = [
       '#type' => 'table',
       '#header' => $this->buildHeader(),
-      '#rows' => array(),
-    );
+      '#rows' => [],
+    ];
 
-    $mappers = array();
+    $mappers = [];
 
     foreach ($this->mappers as $mapper) {
       if ($row = $this->buildRow($mapper)) {
@@ -120,10 +120,10 @@ class ConfigTranslationMapperList extends ControllerBase {
     // Retrieve and sort operations.
     $operations = $mapper->getOperations();
     uasort($operations, 'Drupal\Component\Utility\SortArray::sortByWeightElement');
-    $build = array(
+    $build = [
       '#type' => 'operations',
       '#links' => $operations,
-    );
+    ];
     return $build;
   }
 
diff --git a/web/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php b/web/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php
index 3d0620218..9edcb8c60 100644
--- a/web/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php
+++ b/web/core/modules/config_translation/src/Form/ConfigTranslationAddForm.php
@@ -22,10 +22,10 @@ class ConfigTranslationAddForm extends ConfigTranslationFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state, RouteMatchInterface $route_match = NULL, $plugin_id = NULL, $langcode = NULL) {
     $form = parent::buildForm($form, $form_state, $route_match, $plugin_id, $langcode);
-    $form['#title'] = $this->t('Add @language translation for %label', array(
+    $form['#title'] = $this->t('Add @language translation for %label', [
       '%label' => $this->mapper->getTitle(),
       '@language' => $this->language->getName(),
-    ));
+    ]);
     return $form;
   }
 
@@ -34,7 +34,7 @@ class ConfigTranslationAddForm extends ConfigTranslationFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
-    drupal_set_message($this->t('Successfully saved @language translation.', array('@language' => $this->language->getName())));
+    drupal_set_message($this->t('Successfully saved @language translation.', ['@language' => $this->language->getName()]));
   }
 
 }
diff --git a/web/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php b/web/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php
index 089ae2710..ca3ad28aa 100644
--- a/web/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php
+++ b/web/core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php
@@ -84,7 +84,7 @@ class ConfigTranslationDeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete the @language translation of %label?', array('%label' => $this->mapper->getTitle(), '@language' => $this->language->getName()));
+    return $this->t('Are you sure you want to delete the @language translation of %label?', ['%label' => $this->mapper->getTitle(), '@language' => $this->language->getName()]);
   }
 
   /**
@@ -140,7 +140,7 @@ class ConfigTranslationDeleteForm extends ConfirmFormBase {
       $cache_backend->deleteAll();
     }
 
-    drupal_set_message($this->t('@language translation of %label was deleted', array('%label' => $this->mapper->getTitle(), '@language' => $this->language->getName())));
+    drupal_set_message($this->t('@language translation of %label was deleted', ['%label' => $this->mapper->getTitle(), '@language' => $this->language->getName()]));
 
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
diff --git a/web/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php b/web/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php
index 5af424434..86a8f1cac 100644
--- a/web/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php
+++ b/web/core/modules/config_translation/src/Form/ConfigTranslationEditForm.php
@@ -22,10 +22,10 @@ class ConfigTranslationEditForm extends ConfigTranslationFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state, RouteMatchInterface $route_match = NULL, $plugin_id = NULL, $langcode = NULL) {
     $form = parent::buildForm($form, $form_state, $route_match, $plugin_id, $langcode);
-    $form['#title'] = $this->t('Edit @language translation for %label', array(
+    $form['#title'] = $this->t('Edit @language translation for %label', [
       '%label' => $this->mapper->getTitle(),
       '@language' => $this->language->getName(),
-    ));
+    ]);
     return $form;
   }
 
@@ -34,7 +34,7 @@ class ConfigTranslationEditForm extends ConfigTranslationFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
-    drupal_set_message($this->t('Successfully updated @language translation.', array('@language' => $this->language->getName())));
+    drupal_set_message($this->t('Successfully updated @language translation.', ['@language' => $this->language->getName()]));
   }
 
 }
diff --git a/web/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php b/web/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php
index 12e021628..82f01d714 100644
--- a/web/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php
+++ b/web/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php
@@ -65,7 +65,7 @@ abstract class ConfigTranslationFormBase extends FormBase implements BaseFormIdI
    *
    * @var array
    */
-  protected $baseConfigData = array();
+  protected $baseConfigData = [];
 
   /**
    * Constructs a ConfigTranslationFormBase.
@@ -164,26 +164,26 @@ abstract class ConfigTranslationFormBase extends FormBase implements BaseFormIdI
     // Even though this is a nested form, we do not set #tree to TRUE because
     // the form value structure is generated by using #parents for each element.
     // @see \Drupal\config_translation\FormElement\FormElementBase::getElements()
-    $form['config_names'] = array('#type' => 'container');
+    $form['config_names'] = ['#type' => 'container'];
     foreach ($this->mapper->getConfigNames() as $name) {
-      $form['config_names'][$name] = array('#type' => 'container');
+      $form['config_names'][$name] = ['#type' => 'container'];
 
       $schema = $this->typedConfigManager->get($name);
       $source_config = $this->baseConfigData[$name];
       $translation_config = $this->configFactory()->get($name)->get();
 
       if ($form_element = $this->createFormElement($schema)) {
-        $parents = array('config_names', $name);
+        $parents = ['config_names', $name];
         $form['config_names'][$name] += $form_element->getTranslationBuild($this->sourceLanguage, $this->language, $source_config, $translation_config, $parents);
       }
     }
 
     $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save translation'),
       '#button_type' => 'primary',
-    );
+    ];
 
     // Set the configuration language back.
     $this->languageManager->setConfigOverrideLanguage($original_language);
@@ -195,7 +195,7 @@ abstract class ConfigTranslationFormBase extends FormBase implements BaseFormIdI
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $form_values = $form_state->getValue(array('translation', 'config_names'));
+    $form_values = $form_state->getValue(['translation', 'config_names']);
 
     foreach ($this->mapper->getConfigNames() as $name) {
       $schema = $this->typedConfigManager->get($name);
diff --git a/web/core/modules/config_translation/src/FormElement/DateFormat.php b/web/core/modules/config_translation/src/FormElement/DateFormat.php
index 4a4b99586..d0ae033a4 100644
--- a/web/core/modules/config_translation/src/FormElement/DateFormat.php
+++ b/web/core/modules/config_translation/src/FormElement/DateFormat.php
@@ -16,7 +16,7 @@ class DateFormat extends FormElementBase {
     /** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
     $date_formatter = \Drupal::service('date.formatter');
     $description = $this->t('A user-defined date format. See the <a href="http://php.net/manual/function.date.php">PHP manual</a> for available options.');
-    $format = $this->t('Displayed as %date_format', array('%date_format' => $date_formatter->format(REQUEST_TIME, 'custom', $translation_config)));
+    $format = $this->t('Displayed as %date_format', ['%date_format' => $date_formatter->format(REQUEST_TIME, 'custom', $translation_config)]);
 
     return [
       '#type' => 'textfield',
diff --git a/web/core/modules/config_translation/src/FormElement/FormElementBase.php b/web/core/modules/config_translation/src/FormElement/FormElementBase.php
index 2b5c8f478..3c97daf1b 100644
--- a/web/core/modules/config_translation/src/FormElement/FormElementBase.php
+++ b/web/core/modules/config_translation/src/FormElement/FormElementBase.php
@@ -64,8 +64,8 @@ abstract class FormElementBase implements ElementInterface {
     $build['source'] = $this->getSourceElement($source_language, $source_config);
     $build['translation'] = $this->getTranslationElement($translation_language, $source_config, $translation_config);
 
-    $build['source']['#parents'] = array_merge(array('source'), $parents);
-    $build['translation']['#parents'] = array_merge(array('translation'), $parents);
+    $build['source']['#parents'] = array_merge(['source'], $parents);
+    $build['translation']['#parents'] = array_merge(['translation'], $parents);
     return $build;
   }
 
@@ -93,15 +93,15 @@ abstract class FormElementBase implements ElementInterface {
       $value = $this->t('(Empty)');
     }
 
-    return array(
+    return [
       '#type' => 'item',
-      '#title' => $this->t('@label <span class="visually-hidden">(@source_language)</span>', array(
+      '#title' => $this->t('@label <span class="visually-hidden">(@source_language)</span>', [
         // Labels originate from configuration schema and are translatable.
         '@label' => $this->t($this->definition->getLabel()),
         '@source_language' => $source_language->getName(),
-      )),
+      ]),
       '#markup' => $value,
-    );
+    ];
   }
 
   /**
@@ -157,15 +157,15 @@ abstract class FormElementBase implements ElementInterface {
    */
   protected function getTranslationElement(LanguageInterface $translation_language, $source_config, $translation_config) {
     // Add basic properties that apply to all form elements.
-    return array(
-      '#title' => $this->t('@label <span class="visually-hidden">(@source_language)</span>', array(
+    return [
+      '#title' => $this->t('@label <span class="visually-hidden">(@source_language)</span>', [
         // Labels originate from configuration schema and are translatable.
         '@label' => $this->t($this->definition->getLabel()),
         '@source_language' => $translation_language->getName(),
-      )),
+      ]),
       '#default_value' => $translation_config,
-      '#attributes' => array('lang' => $translation_language->getId()),
-    );
+      '#attributes' => ['lang' => $translation_language->getId()],
+    ];
   }
 
   /**
diff --git a/web/core/modules/config_translation/src/FormElement/ListElement.php b/web/core/modules/config_translation/src/FormElement/ListElement.php
index e956536e7..1ea452362 100644
--- a/web/core/modules/config_translation/src/FormElement/ListElement.php
+++ b/web/core/modules/config_translation/src/FormElement/ListElement.php
@@ -46,14 +46,14 @@ class ListElement implements ElementInterface {
    * {@inheritdoc}
    */
   public function getTranslationBuild(LanguageInterface $source_language, LanguageInterface $translation_language, $source_config, $translation_config, array $parents, $base_key = NULL) {
-    $build = array();
+    $build = [];
     foreach ($this->element as $key => $element) {
-      $sub_build = array();
+      $sub_build = [];
       $element_key = isset($base_key) ? "$base_key.$key" : $key;
       $definition = $element->getDataDefinition();
 
       if ($form_element = ConfigTranslationFormBase::createFormElement($element)) {
-        $element_parents = array_merge($parents, array($key));
+        $element_parents = array_merge($parents, [$key]);
         $sub_build += $form_element->getTranslationBuild($source_language, $translation_language, $source_config[$key], $translation_config[$key], $element_parents, $element_key);
 
         if (empty($sub_build)) {
@@ -62,13 +62,13 @@ class ListElement implements ElementInterface {
 
         // Build the sub-structure and include it with a wrapper in the form if
         // there are any translatable elements there.
-        $build[$key] = array();
+        $build[$key] = [];
         if ($element instanceof TraversableTypedDataInterface) {
-          $build[$key] = array(
+          $build[$key] = [
             '#type' => 'details',
             '#title' => $this->getGroupTitle($definition, $sub_build),
             '#open' => empty($base_key),
-          );
+          ];
         }
         $build[$key] += $sub_build;
       }
diff --git a/web/core/modules/config_translation/src/FormElement/PluralVariants.php b/web/core/modules/config_translation/src/FormElement/PluralVariants.php
index 624ff77bc..aabca8a55 100644
--- a/web/core/modules/config_translation/src/FormElement/PluralVariants.php
+++ b/web/core/modules/config_translation/src/FormElement/PluralVariants.php
@@ -18,25 +18,25 @@ class PluralVariants extends FormElementBase {
   protected function getSourceElement(LanguageInterface $source_language, $source_config) {
     $plurals = $this->getNumberOfPlurals($source_language->getId());
     $values = explode(LOCALE_PLURAL_DELIMITER, $source_config);
-    $element = array(
+    $element = [
       '#type' => 'fieldset',
-      '#title' => SafeMarkup::format('@label <span class="visually-hidden">(@source_language)</span>', array(
+      '#title' => SafeMarkup::format('@label <span class="visually-hidden">(@source_language)</span>', [
         // Labels originate from configuration schema and are translatable.
         '@label' => $this->t($this->definition->getLabel()),
         '@source_language' => $source_language->getName(),
-      )),
+      ]),
       '#tree' => TRUE,
-    );
+    ];
     for ($i = 0; $i < $plurals; $i++) {
-      $element[$i] = array(
+      $element[$i] = [
         '#type' => 'item',
         // @todo Should use better labels https://www.drupal.org/node/2499639
         '#title' => $i == 0 ? $this->t('Singular form') : $this->formatPlural($i, 'First plural form', '@count. plural form'),
-        '#markup' => SafeMarkup::format('<span lang="@langcode">@value</span>', array(
+        '#markup' => SafeMarkup::format('<span lang="@langcode">@value</span>', [
           '@langcode' => $source_language->getId(),
           '@value' => isset($values[$i]) ? $values[$i] : $this->t('(Empty)'),
-        )),
-      );
+        ]),
+      ];
     }
     return $element;
   }
@@ -47,23 +47,23 @@ class PluralVariants extends FormElementBase {
   protected function getTranslationElement(LanguageInterface $translation_language, $source_config, $translation_config) {
     $plurals = $this->getNumberOfPlurals($translation_language->getId());
     $values = explode(LOCALE_PLURAL_DELIMITER, $translation_config);
-    $element = array(
+    $element = [
       '#type' => 'fieldset',
-      '#title' => SafeMarkup::format('@label <span class="visually-hidden">(@translation_language)</span>', array(
+      '#title' => SafeMarkup::format('@label <span class="visually-hidden">(@translation_language)</span>', [
         // Labels originate from configuration schema and are translatable.
         '@label' => $this->t($this->definition->getLabel()),
         '@translation_language' => $translation_language->getName(),
-      )),
+      ]),
       '#tree' => TRUE,
-    );
+    ];
     for ($i = 0; $i < $plurals; $i++) {
-      $element[$i] = array(
+      $element[$i] = [
         '#type' => 'textfield',
         // @todo Should use better labels https://www.drupal.org/node/2499639
         '#title' => $i == 0 ? $this->t('Singular form') : $this->formatPlural($i, 'First plural form', '@count. plural form'),
         '#default_value' => isset($values[$i]) ? $values[$i] : '',
-        '#attributes' => array('lang' => $translation_language->getId()),
-      );
+        '#attributes' => ['lang' => $translation_language->getId()],
+      ];
     }
     return $element;
   }
diff --git a/web/core/modules/config_translation/src/FormElement/TextFormat.php b/web/core/modules/config_translation/src/FormElement/TextFormat.php
index e9d56f29b..f9f6bc61b 100644
--- a/web/core/modules/config_translation/src/FormElement/TextFormat.php
+++ b/web/core/modules/config_translation/src/FormElement/TextFormat.php
@@ -16,25 +16,25 @@ class TextFormat extends FormElementBase {
     // Instead of the formatted output show a disabled textarea. This allows for
     // easier side-by-side comparison, especially with formats with text
     // editors.
-    return $this->getTranslationElement($source_language, $source_config, $source_config) + array(
+    return $this->getTranslationElement($source_language, $source_config, $source_config) + [
       '#value' => $source_config['value'],
       '#disabled' => TRUE,
       '#allow_focus' => TRUE,
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getTranslationElement(LanguageInterface $translation_language, $source_config, $translation_config) {
-    return array(
+    return [
       '#type' => 'text_format',
       // Override the #default_value property from the parent class.
       '#default_value' => $translation_config['value'],
       '#format' => $translation_config['format'],
       // @see \Drupal\config_translation\Element\FormElementBase::getTranslationElement()
-      '#allowed_formats' => array($source_config['format']),
-    ) + parent::getTranslationElement($translation_language, $source_config, $translation_config);
+      '#allowed_formats' => [$source_config['format']],
+    ] + parent::getTranslationElement($translation_language, $source_config, $translation_config);
   }
 
 }
diff --git a/web/core/modules/config_translation/src/FormElement/Textarea.php b/web/core/modules/config_translation/src/FormElement/Textarea.php
index 174a70c5c..ff9e4cde4 100644
--- a/web/core/modules/config_translation/src/FormElement/Textarea.php
+++ b/web/core/modules/config_translation/src/FormElement/Textarea.php
@@ -18,10 +18,10 @@ class Textarea extends FormElementBase {
     $rows_newlines = substr_count($translation_config, "\n" ) + 1;
     $rows = max($rows_words, $rows_newlines);
 
-    return array(
+    return [
       '#type' => 'textarea',
       '#rows' => $rows,
-    ) + parent::getTranslationElement($translation_language, $source_config, $translation_config);
+    ] + parent::getTranslationElement($translation_language, $source_config, $translation_config);
   }
 
 }
diff --git a/web/core/modules/config_translation/src/FormElement/Textfield.php b/web/core/modules/config_translation/src/FormElement/Textfield.php
index fa0c869a0..cff103718 100644
--- a/web/core/modules/config_translation/src/FormElement/Textfield.php
+++ b/web/core/modules/config_translation/src/FormElement/Textfield.php
@@ -13,9 +13,9 @@ class Textfield extends FormElementBase {
    * {@inheritdoc}
    */
   public function getTranslationElement(LanguageInterface $translation_language, $source_config, $translation_config) {
-    return array(
+    return [
       '#type' => 'textfield',
-    ) + parent::getTranslationElement($translation_language, $source_config, $translation_config);
+    ] + parent::getTranslationElement($translation_language, $source_config, $translation_config);
   }
 
 }
diff --git a/web/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php b/web/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php
index fb2bf24cc..63145a5d3 100644
--- a/web/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php
+++ b/web/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php
@@ -28,7 +28,7 @@ class ConfigTranslationContextualLink extends ContextualLinkDefault {
     // storing the title on the plugin definition for the link) because it
     // contains translated parts that we need in the runtime language.
     $type_name = Unicode::strtolower($this->mapperManager()->createInstance($this->pluginDefinition['config_translation_plugin_id'])->getTypeLabel());
-    return $this->t('Translate @type_name', array('@type_name' => $type_name));
+    return $this->t('Translate @type_name', ['@type_name' => $type_name]);
   }
 
   /**
diff --git a/web/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php b/web/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php
index 63605c66a..5a88d91d0 100644
--- a/web/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php
+++ b/web/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php
@@ -28,7 +28,7 @@ class ConfigTranslationLocalTask extends LocalTaskDefault {
     // storing the title on the plugin definition for the link) because
     // it contains translated parts that we need in the runtime language.
     $type_name = Unicode::strtolower($this->mapperManager()->createInstance($this->pluginDefinition['config_translation_plugin_id'])->getTypeLabel());
-    return $this->t('Translate @type_name', array('@type_name' => $type_name));
+    return $this->t('Translate @type_name', ['@type_name' => $type_name]);
   }
 
   /**
diff --git a/web/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php b/web/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php
new file mode 100644
index 000000000..2989f967b
--- /dev/null
+++ b/web/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\config_translation\Plugin\migrate\source\d6;
+
+use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+
+/**
+ * i18n strings profile field source from database.
+ *
+ * @MigrateSource(
+ *   id = "d6_i18n_profile_field",
+ *   source_provider = "i18n"
+ * )
+ */
+class I18nProfileField extends DrupalSqlBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    $query = $this->select('profile_fields', 'pf')
+      ->fields('pf', ['fid', 'name'])
+      ->fields('i18n', ['property'])
+      ->fields('lt', ['lid', 'translation', 'language']);
+    $query->leftJoin('i18n_strings', 'i18n', 'i18n.objectid = pf.name');
+    $query->leftJoin('locales_target', 'lt', 'lt.lid = i18n.lid');
+    return $query;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fields() {
+    return [
+      'fid' => $this->t('Profile field ID.'),
+      'lid' => $this->t('Locales target language ID.'),
+      'language' => $this->t('Language for this field.'),
+      'translation' => $this->t('Translation of either the title or explanation.'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIds() {
+    $ids['fid']['type'] = 'integer';
+    $ids['language']['type'] = 'string';
+    $ids['lid']['type'] = 'integer';
+    $ids['lid']['alias'] = 'lt';
+    return $ids;
+  }
+
+}
diff --git a/web/core/modules/config_translation/src/Routing/RouteSubscriber.php b/web/core/modules/config_translation/src/Routing/RouteSubscriber.php
index b20c13fdc..10044aa7f 100644
--- a/web/core/modules/config_translation/src/Routing/RouteSubscriber.php
+++ b/web/core/modules/config_translation/src/Routing/RouteSubscriber.php
@@ -48,7 +48,7 @@ class RouteSubscriber extends RouteSubscriberBase {
    */
   public static function getSubscribedEvents() {
     // Come after field_ui.
-    $events[RoutingEvents::ALTER] = array('onAlterRoutes', -110);
+    $events[RoutingEvents::ALTER] = ['onAlterRoutes', -110];
     return $events;
   }
 
diff --git a/web/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php b/web/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
index 648f04739..387d68646 100644
--- a/web/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
+++ b/web/core/modules/config_translation/src/Tests/ConfigTranslationFormTest.php
@@ -17,7 +17,7 @@ class ConfigTranslationFormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_translation', 'config_translation_test', 'editor');
+  public static $modules = ['config_translation', 'config_translation_test', 'editor'];
 
   /**
    * The plugin ID of the mapper to test.
@@ -40,7 +40,7 @@ class ConfigTranslationFormTest extends WebTestBase {
     $this->pluginId = key($definitions);
 
     $this->langcode = 'xx';
-    ConfigurableLanguage::create(array('id' => $this->langcode, 'label' => 'XX'))->save();
+    ConfigurableLanguage::create(['id' => $this->langcode, 'label' => 'XX'])->save();
 
     \Drupal::state()->set('config_translation_test_alter_form_alter', TRUE);
   }
diff --git a/web/core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php b/web/core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php
index 7daa305f9..2c8aabcab 100644
--- a/web/core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php
+++ b/web/core/modules/config_translation/src/Tests/ConfigTranslationInstallTest.php
@@ -63,7 +63,7 @@ ENDPO;
     $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'fr'], t('Add custom language'));
 
     $edit = [
-      'modules[Multilingual][config_translation][enable]' => TRUE,
+      'modules[config_translation][enable]' => TRUE,
     ];
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
diff --git a/web/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php b/web/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
index e7c58fd97..d593a69d3 100644
--- a/web/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
+++ b/web/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
@@ -35,7 +35,7 @@ class ConfigTranslationOverviewTest extends WebTestBase {
    *
    * @var array
    */
-  protected $langcodes = array('fr', 'ta');
+  protected $langcodes = ['fr', 'ta'];
 
   /**
    * String translation storage object.
@@ -46,7 +46,7 @@ class ConfigTranslationOverviewTest extends WebTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $permissions = array(
+    $permissions = [
       'translate configuration',
       'administer languages',
       'administer site configuration',
@@ -54,7 +54,7 @@ class ConfigTranslationOverviewTest extends WebTestBase {
       'access site-wide contact form',
       'access contextual links',
       'administer views',
-    );
+    ];
     // Create and log in user.
     $this->drupalLogin($this->drupalCreateUser($permissions));
 
@@ -83,17 +83,17 @@ class ConfigTranslationOverviewTest extends WebTestBase {
       }
     }
 
-    $labels = array(
+    $labels = [
       '&$nxd~i0',
       'some "label" with quotes',
       $this->randomString(),
-    );
+    ];
 
     foreach ($labels as $label) {
-      $test_entity = entity_create('config_test', array(
+      $test_entity = entity_create('config_test', [
         'id' => $this->randomMachineName(),
         'label' => $label,
-      ));
+      ]);
       $test_entity->save();
 
       $base_url = 'admin/structure/config_test/manage/' . $test_entity->id();
@@ -119,7 +119,7 @@ class ConfigTranslationOverviewTest extends WebTestBase {
       $this->assertRaw('<th>' . t('Language') . '</th>');
 
       $this->drupalGet($base_url);
-      $this->assertLink(t('Translate @title', array('@title' => $entity_type->getLowercaseLabel())));
+      $this->assertLink(t('Translate @title', ['@title' => $entity_type->getLowercaseLabel()]));
     }
   }
 
@@ -154,10 +154,10 @@ class ConfigTranslationOverviewTest extends WebTestBase {
     $config_test_storage = $this->container->get('entity.manager')->getStorage('config_test');
 
     // Set up an override.
-    $settings['config']['config_test.dynamic.dotted.default']['label'] = (object) array(
+    $settings['config']['config_test.dynamic.dotted.default']['label'] = (object) [
       'value' => $overridden_label,
       'required' => TRUE,
-    );
+    ];
     $this->writeSettings($settings);
 
     // Test that the overridden label is loaded with the entity.
diff --git a/web/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/web/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index 5018efa21..7ec350ba2 100644
--- a/web/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/web/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -48,7 +48,7 @@ class ConfigTranslationUiTest extends WebTestBase {
    *
    * @var array
    */
-  protected $langcodes = array('fr', 'ta');
+  protected $langcodes = ['fr', 'ta'];
 
   /**
    * Administrator user for tests.
@@ -157,13 +157,13 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->assertRaw($site_slogan);
 
     // Update site name and slogan for French.
-    $edit = array(
+    $edit = [
       'translation[config_names][system.site][name]' => $fr_site_name,
       'translation[config_names][system.site][slogan]' => $fr_site_slogan,
-    );
+    ];
 
     $this->drupalPostForm("$translation_base_url/fr/add", $edit, t('Save translation'));
-    $this->assertRaw(t('Successfully saved @language translation.', array('@language' => 'French')));
+    $this->assertRaw(t('Successfully saved @language translation.', ['@language' => 'French']));
 
     // Check for edit, delete links (and no 'add' link) for French language.
     $this->assertNoLinkByHref("$translation_base_url/fr/add");
@@ -189,18 +189,18 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->assertText($site_slogan);
 
     // Translate 'Site name' label in French.
-    $search = array(
+    $search = [
       'string' => $site_name_label,
       'langcode' => 'fr',
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
 
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $fr_site_name_label,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     // Ensure that the label is in French (and not in English).
@@ -234,10 +234,10 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->drupalGet($translation_base_url);
 
     // Case 1: Update new value for site slogan and site name.
-    $edit = array(
+    $edit = [
       'translation[config_names][system.site][name]' => 'FR ' . $site_name,
       'translation[config_names][system.site][slogan]' => 'FR ' . $site_slogan,
-    );
+    ];
     // First time, no overrides, so just Add link.
     $this->drupalPostForm("$translation_base_url/fr/add", $edit, t('Save translation'));
 
@@ -245,10 +245,10 @@ class ConfigTranslationUiTest extends WebTestBase {
     $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'system.site');
 
     // Expect both name and slogan in language specific file.
-    $expected = array(
+    $expected = [
       'name' => 'FR ' . $site_name,
       'slogan' => 'FR ' . $site_slogan,
-    );
+    ];
     $this->assertEqual($expected, $override->get());
 
     // Case 2: Update new value for site slogan and default value for site name.
@@ -257,12 +257,12 @@ class ConfigTranslationUiTest extends WebTestBase {
     // translation form into the actual site name and slogan.
     $this->assertNoText('FR ' . $site_name);
     $this->assertNoText('FR ' . $site_slogan);
-    $edit = array(
+    $edit = [
       'translation[config_names][system.site][name]' => $site_name,
       'translation[config_names][system.site][slogan]' => 'FR ' . $site_slogan,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save translation'));
-    $this->assertRaw(t('Successfully updated @language translation.', array('@language' => 'French')));
+    $this->assertRaw(t('Successfully updated @language translation.', ['@language' => 'French']));
     $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'system.site');
 
     // Expect only slogan in language specific file.
@@ -272,10 +272,10 @@ class ConfigTranslationUiTest extends WebTestBase {
     // Case 3: Keep default value for site name and slogan.
     $this->drupalGet("$translation_base_url/fr/edit");
     $this->assertNoText('FR ' . $site_slogan);
-    $edit = array(
+    $edit = [
       'translation[config_names][system.site][name]' => $site_name,
       'translation[config_names][system.site][slogan]' => $site_slogan,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save translation'));
     $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'system.site');
 
@@ -310,11 +310,11 @@ class ConfigTranslationUiTest extends WebTestBase {
 
     // Save default language configuration.
     $label = 'Send your feedback';
-    $edit = array(
+    $edit = [
       'label' => $label,
       'recipients' => 'sales@example.com,support@example.com',
       'reply' => 'Thank you for your mail',
-    );
+    ];
     $this->drupalPostForm('admin/structure/contact/manage/feedback', $edit, t('Save'));
 
     // Ensure translation link is present.
@@ -323,7 +323,7 @@ class ConfigTranslationUiTest extends WebTestBase {
 
     // Make sure translate tab is present.
     $this->drupalGet('admin/structure/contact/manage/feedback');
-    $this->assertLink(t('Translate @type', array('@type' => 'contact form')));
+    $this->assertLink(t('Translate @type', ['@type' => 'contact form']));
 
     // Visit the form to confirm the changes.
     $this->drupalGet('contact/feedback');
@@ -331,7 +331,7 @@ class ConfigTranslationUiTest extends WebTestBase {
 
     foreach ($this->langcodes as $langcode) {
       $this->drupalGet($translation_base_url);
-      $this->assertLink(t('Translate @type', array('@type' => 'contact form')));
+      $this->assertLink(t('Translate @type', ['@type' => 'contact form']));
 
       // 'Add' link should be present for $langcode translation.
       $translation_page_url = "$translation_base_url/$langcode/add";
@@ -342,20 +342,20 @@ class ConfigTranslationUiTest extends WebTestBase {
       $this->assertText($label);
 
       // Update translatable fields.
-      $edit = array(
+      $edit = [
         'translation[config_names][contact.form.feedback][label]' => 'Website feedback - ' . $langcode,
         'translation[config_names][contact.form.feedback][reply]' => 'Thank you for your mail - ' . $langcode,
-      );
+      ];
 
       // Save language specific version of form.
       $this->drupalPostForm($translation_page_url, $edit, t('Save translation'));
 
       // Expect translated values in language specific file.
       $override = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'contact.form.feedback');
-      $expected = array(
+      $expected = [
         'label' => 'Website feedback - ' . $langcode,
         'reply' => 'Thank you for your mail - ' . $langcode,
-      );
+      ];
       $this->assertEqual($expected, $override->get());
 
       // Check for edit, delete links (and no 'add' link) for $langcode.
@@ -368,10 +368,10 @@ class ConfigTranslationUiTest extends WebTestBase {
       $this->assertText('Website feedback - ' . $langcode);
 
       // Submit feedback.
-      $edit = array(
+      $edit = [
         'subject[0][value]' => 'Test subject',
         'message[0][value]' => 'Test message',
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Send message'));
     }
 
@@ -379,7 +379,7 @@ class ConfigTranslationUiTest extends WebTestBase {
     // original text all appear in any translated page on the translation
     // forms.
     foreach ($this->langcodes as $langcode) {
-      $langcode_prefixes = array_merge(array(''), $this->langcodes);
+      $langcode_prefixes = array_merge([''], $this->langcodes);
       foreach ($langcode_prefixes as $langcode_prefix) {
         $this->drupalGet(ltrim("$langcode_prefix/$translation_base_url/$langcode/edit", '/'));
         $this->assertFieldByName('translation[config_names][contact.form.feedback][label]', 'Website feedback - ' . $langcode);
@@ -400,14 +400,14 @@ class ConfigTranslationUiTest extends WebTestBase {
 
     // Test that delete links work and operations perform properly.
     foreach ($this->langcodes as $langcode) {
-      $replacements = array('%label' => t('@label @entity_type', array('@label' => $label, '@entity_type' => Unicode::strtolower(t('Contact form')))), '@language' => \Drupal::languageManager()->getLanguage($langcode)->getName());
+      $replacements = ['%label' => t('@label @entity_type', ['@label' => $label, '@entity_type' => Unicode::strtolower(t('Contact form'))]), '@language' => \Drupal::languageManager()->getLanguage($langcode)->getName()];
 
       $this->drupalGet("$translation_base_url/$langcode/delete");
       $this->assertRaw(t('Are you sure you want to delete the @language translation of %label?', $replacements));
       // Assert link back to list page to cancel delete is present.
       $this->assertLinkByHref($translation_base_url);
 
-      $this->drupalPostForm(NULL, array(), t('Delete'));
+      $this->drupalPostForm(NULL, [], t('Delete'));
       $this->assertRaw(t('@language translation of %label was deleted', $replacements));
       $this->assertLinkByHref("$translation_base_url/$langcode/add");
       $this->assertNoLinkByHref("translation_base_url/$langcode/edit");
@@ -445,18 +445,18 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->assertLinkByHref('admin/config/regional/date-time/formats/manage/medium');
 
     // Save default language configuration for a new format.
-    $edit = array(
+    $edit = [
       'label' => 'Custom medium date',
       'id' => 'custom_medium',
       'date_format_pattern' => 'Y. m. d. H:i',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
 
     // Test translating a default shipped format and our custom format.
-    $formats = array(
+    $formats = [
       'medium' => 'Default medium date',
       'custom_medium' => 'Custom medium date',
-    );
+    ];
     foreach ($formats as $id => $label) {
       $translation_base_url = 'admin/config/regional/date-time/formats/manage/' . $id . '/translate';
 
@@ -474,20 +474,20 @@ class ConfigTranslationUiTest extends WebTestBase {
       $this->assertRaw('core/modules/system/js/system.date.js');
 
       // Update translatable fields.
-      $edit = array(
+      $edit = [
         'translation[config_names][core.date_format.' . $id . '][label]' => $id . ' - FR',
         'translation[config_names][core.date_format.' . $id . '][pattern]' => 'D',
-      );
+      ];
 
       // Save language specific version of form.
       $this->drupalPostForm($translation_page_url, $edit, t('Save translation'));
 
       // Get translation and check we've got the right value.
       $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'core.date_format.' . $id);
-      $expected = array(
+      $expected = [
         'label' => $id . ' - FR',
         'pattern' => 'D',
-      );
+      ];
       $this->assertEqual($expected, $override->get());
 
       // Formatting the date 8 / 27 / 1985 @ 13:37 EST with pattern D should
@@ -508,18 +508,18 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
 
     $this->drupalGet('admin/config/people/accounts');
-    $this->assertLink(t('Translate @type', array('@type' => 'account settings')));
+    $this->assertLink(t('Translate @type', ['@type' => 'account settings']));
 
     $this->drupalGet('admin/config/people/accounts/translate');
-    $this->assertLink(t('Translate @type', array('@type' => 'account settings')));
+    $this->assertLink(t('Translate @type', ['@type' => 'account settings']));
     $this->assertLinkByHref('admin/config/people/accounts/translate/fr/add');
 
     // Update account settings fields for French.
-    $edit = array(
+    $edit = [
       'translation[config_names][user.settings][anonymous]' => 'Anonyme',
       'translation[config_names][user.mail][status_blocked][subject]' => 'Testing, your account is blocked.',
       'translation[config_names][user.mail][status_blocked][body]' => 'Testing account blocked body.',
-    );
+    ];
 
     $this->drupalPostForm('admin/config/people/accounts/translate/fr/add', $edit, t('Save translation'));
 
@@ -588,7 +588,7 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
 
     // Assert contextual link related to views.
-    $ids = array('entity.view.edit_form:view=frontpage:location=page&name=frontpage&display_id=page_1');
+    $ids = ['entity.view.edit_form:view=frontpage:location=page&name=frontpage&display_id=page_1'];
     $response = $this->renderContextualLinks($ids, 'node');
     $this->assertResponse(200);
     $json = Json::decode($response);
@@ -611,14 +611,14 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->assertRaw($human_readable_name);
 
     // Update Views Fields for French.
-    $edit = array(
+    $edit = [
       'translation[config_names][views.view.frontpage][description]' => $description . " FR",
       'translation[config_names][views.view.frontpage][label]' => $human_readable_name . " FR",
       'translation[config_names][views.view.frontpage][display][default][display_title]' => $display_settings_master . " FR",
       'translation[config_names][views.view.frontpage][display][default][display_options][title]' => $display_options_master . " FR",
-    );
+    ];
     $this->drupalPostForm("$translation_base_url/fr/add", $edit, t('Save translation'));
-    $this->assertRaw(t('Successfully saved @language translation.', array('@language' => 'French')));
+    $this->assertRaw(t('Successfully saved @language translation.', ['@language' => 'French']));
 
     // Check for edit, delete links (and no 'add' link) for French language.
     $this->assertNoLinkByHref("$translation_base_url/fr/add");
@@ -640,20 +640,20 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
 
     // Languages to test, with various number of plural forms.
-    $languages = array(
-      'vi' => array('plurals' => 1, 'expected' => array(TRUE, FALSE, FALSE, FALSE)),
-      'fr' => array('plurals' => 2, 'expected' => array(TRUE, TRUE, FALSE, FALSE)),
-      'sl' => array('plurals' => 4, 'expected' => array(TRUE, TRUE, TRUE, TRUE)),
-    );
+    $languages = [
+      'vi' => ['plurals' => 1, 'expected' => [TRUE, FALSE, FALSE, FALSE]],
+      'fr' => ['plurals' => 2, 'expected' => [TRUE, TRUE, FALSE, FALSE]],
+      'sl' => ['plurals' => 4, 'expected' => [TRUE, TRUE, TRUE, TRUE]],
+    ];
 
     foreach ($languages as $langcode => $data) {
       // Import a .po file to add a new language with a given number of plural forms
       $name = \Drupal::service('file_system')->tempnam('temporary://', $langcode . '_') . '.po';
       file_put_contents($name, $this->getPoFile($data['plurals']));
-      $this->drupalPostForm('admin/config/regional/translate/import', array(
+      $this->drupalPostForm('admin/config/regional/translate/import', [
         'langcode' => $langcode,
         'files[file]' => $name,
-      ), t('Import'));
+      ], t('Import'));
 
       // Change the config langcode of the 'files' view.
       $config = \Drupal::service('config.factory')->getEditable('views.view.files');
@@ -686,10 +686,10 @@ class ConfigTranslationUiTest extends WebTestBase {
     // This will also automatically add the 'sl' language.
     $name = \Drupal::service('file_system')->tempnam('temporary://', "sl_") . '.po';
     file_put_contents($name, $this->getPoFile(4));
-    $this->drupalPostForm('admin/config/regional/translate/import', array(
+    $this->drupalPostForm('admin/config/regional/translate/import', [
       'langcode' => 'sl',
       'files[file]' => $name,
-    ), t('Import'));
+    ], t('Import'));
 
     // Translate the files view, as this one uses numeric formatters.
     $description = 'Singular form';
@@ -817,12 +817,12 @@ class ConfigTranslationUiTest extends WebTestBase {
 
     $langcode = 'xx';
     $name = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => Language::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
 
     // Make sure there is no translation stored in locale storage before edit.
@@ -830,9 +830,9 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->assertTrue(empty($translation));
 
     // Add custom translation.
-    $edit = array(
+    $edit = [
       'translation[config_names][user.settings][anonymous]' => 'Anonyme',
-    );
+    ];
     $this->drupalPostForm('admin/config/people/accounts/translate/fr/add', $edit, t('Save translation'));
 
     // Make sure translation stored in locale storage after saved language
@@ -841,9 +841,9 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->assertEqual('Anonyme', $translation->getString());
 
     // revert custom translations to base translation.
-    $edit = array(
+    $edit = [
       'translation[config_names][user.settings][anonymous]' => 'Anonymous',
-    );
+    ];
     $this->drupalPostForm('admin/config/people/accounts/translate/fr/edit', $edit, t('Save translation'));
 
     // Make sure there is no translation stored in locale storage after revert.
@@ -858,19 +858,19 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
 
     // Delete French language
-    $this->drupalPostForm('admin/config/regional/language/delete/fr', array(), t('Delete'));
-    $this->assertRaw(t('The %language (%langcode) language has been removed.', array('%language' => 'French', '%langcode' => 'fr')));
+    $this->drupalPostForm('admin/config/regional/language/delete/fr', [], t('Delete'));
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', ['%language' => 'French', '%langcode' => 'fr']));
 
     // Change default language to Tamil.
-    $edit = array(
+    $edit = [
       'site_default_language' => 'ta',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration'));
     $this->assertRaw(t('Configuration saved.'));
 
     // Delete English language
-    $this->drupalPostForm('admin/config/regional/language/delete/en', array(), t('Delete'));
-    $this->assertRaw(t('The %language (%langcode) language has been removed.', array('%language' => 'English', '%langcode' => 'en')));
+    $this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', ['%language' => 'English', '%langcode' => 'en']));
 
     // Visit account setting translation page, this should not
     // throw any notices.
@@ -907,32 +907,32 @@ class ConfigTranslationUiTest extends WebTestBase {
     /** @var \Drupal\Core\Config\ConfigFactoryInterface $config_factory */
     $config_factory = $this->container->get('config.factory');
 
-    $expected = array(
+    $expected = [
       'kitten',
       'llama',
       'elephant'
-    );
+    ];
     $actual = $config_factory
       ->getEditable('config_translation_test.content')
       ->get('animals');
     $this->assertEqual($expected, $actual);
 
-    $edit = array(
+    $edit = [
       'translation[config_names][config_translation_test.content][content][value]' => '<p><strong>Hello World</strong> - FR</p>',
       'translation[config_names][config_translation_test.content][animals][0]' => 'kitten - FR',
       'translation[config_names][config_translation_test.content][animals][1]' => 'llama - FR',
       'translation[config_names][config_translation_test.content][animals][2]' => 'elephant - FR',
-    );
+    ];
     $this->drupalPostForm('admin/config/media/file-system/translate/fr/add', $edit, t('Save translation'));
 
     $this->container->get('language.config_factory_override')
-      ->setLanguage(new Language(array('id' => 'fr')));
+      ->setLanguage(new Language(['id' => 'fr']));
 
-    $expected = array(
+    $expected = [
       'kitten - FR',
       'llama - FR',
       'elephant - FR',
-    );
+    ];
     $actual = $config_factory
       ->get('config_translation_test.content')
       ->get('animals');
@@ -947,10 +947,10 @@ class ConfigTranslationUiTest extends WebTestBase {
     /** @var \Drupal\Core\Config\ConfigFactoryInterface $config_factory */
     $config_factory = $this->container->get('config.factory');
 
-    $expected = array(
+    $expected = [
       'value' => '<p><strong>Hello World</strong></p>',
       'format' => 'plain_text',
-    );
+    ];
     $actual = $config_factory
       ->get('config_translation_test.content')
       ->getOriginal('content', FALSE);
@@ -970,20 +970,20 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->assertNoFieldByName('translation[config_names][config_translation_test.content][content][format]');
 
     // Update translatable fields.
-    $edit = array(
+    $edit = [
       'translation[config_names][config_translation_test.content][content][value]' => '<p><strong>Hello World</strong> - FR</p>',
-    );
+    ];
 
     // Save language specific version of form.
     $this->drupalPostForm($translation_page_url, $edit, t('Save translation'));
 
     // Get translation and check we've got the right value.
-    $expected = array(
+    $expected = [
       'value' => '<p><strong>Hello World</strong> - FR</p>',
       'format' => 'plain_text',
-    );
+    ];
     $this->container->get('language.config_factory_override')
-      ->setLanguage(new Language(array('id' => 'fr')));
+      ->setLanguage(new Language(['id' => 'fr']));
     $actual = $config_factory
       ->get('config_translation_test.content')
       ->get('content');
@@ -1009,7 +1009,7 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->drupalLogin($this->translatorUser);
     $this->drupalGet($translation_page_url);
     $this->assertDisabledTextarea('edit-translation-config-names-config-translation-testcontent-content-value');
-    $this->drupalPostForm(NULL, array(), t('Save translation'));
+    $this->drupalPostForm(NULL, [], t('Save translation'));
     // Check that submitting the form did not update the text format of the
     // translation.
     $actual = $config_factory
@@ -1019,14 +1019,14 @@ class ConfigTranslationUiTest extends WebTestBase {
 
     // The administrator must explicitly change the text format.
     $this->drupalLogin($this->adminUser);
-    $edit = array(
+    $edit = [
       'translation[config_names][config_translation_test.content][content][format]' => 'full_html',
-    );
+    ];
     $this->drupalPostForm($translation_page_url, $edit, t('Save translation'));
-    $expected = array(
+    $expected = [
       'value' => '<p><strong>Hello World</strong> - FR</p>',
       'format' => 'full_html',
-    );
+    ];
     $actual = $config_factory
       ->get('config_translation_test.content')
       ->get('content');
@@ -1047,20 +1047,20 @@ class ConfigTranslationUiTest extends WebTestBase {
    *   Returns translation if exists, FALSE otherwise.
    */
   protected function getTranslation($config_name, $key, $langcode) {
-    $settings_locations = $this->localeStorage->getLocations(array('type' => 'configuration', 'name' => $config_name));
-    $this->assertTrue(!empty($settings_locations), format_string('Configuration locations found for %config_name.', array('%config_name' => $config_name)));
+    $settings_locations = $this->localeStorage->getLocations(['type' => 'configuration', 'name' => $config_name]);
+    $this->assertTrue(!empty($settings_locations), format_string('Configuration locations found for %config_name.', ['%config_name' => $config_name]));
 
     if (!empty($settings_locations)) {
       $source = $this->container->get('config.factory')->get($config_name)->get($key);
-      $source_string = $this->localeStorage->findString(array('source' => $source, 'type' => 'configuration'));
-      $this->assertTrue(!empty($source_string), format_string('Found string for %config_name.%key.', array('%config_name' => $config_name, '%key' => $key)));
+      $source_string = $this->localeStorage->findString(['source' => $source, 'type' => 'configuration']);
+      $this->assertTrue(!empty($source_string), format_string('Found string for %config_name.%key.', ['%config_name' => $config_name, '%key' => $key]));
 
       if (!empty($source_string)) {
-        $conditions = array(
+        $conditions = [
           'lid' => $source_string->lid,
           'language' => $langcode,
-        );
-        $translations = $this->localeStorage->getTranslations($conditions + array('translated' => TRUE));
+        ];
+        $translations = $this->localeStorage->getTranslations($conditions + ['translated' => TRUE]);
         return reset($translations);
       }
     }
@@ -1074,10 +1074,10 @@ class ConfigTranslationUiTest extends WebTestBase {
    * @param string $site_slogan
    */
   protected function setSiteInformation($site_name, $site_slogan) {
-    $edit = array(
+    $edit = [
       'site_name' => $site_name,
       'site_slogan' => $site_slogan,
-    );
+    ];
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Save configuration'));
     $this->assertRaw(t('The configuration options have been saved.'));
   }
@@ -1094,11 +1094,11 @@ class ConfigTranslationUiTest extends WebTestBase {
    *   The response body.
    */
   protected function renderContextualLinks($ids, $current_path) {
-    $post = array();
+    $post = [];
     for ($i = 0; $i < count($ids); $i++) {
       $post['ids[' . $i . ']'] = $ids[$i];
     }
-    return $this->drupalPostWithFormat('contextual/render', 'json', $post, array('query' => array('destination' => $current_path)));
+    return $this->drupalPostWithFormat('contextual/render', 'json', $post, ['query' => ['destination' => $current_path]]);
   }
 
   /**
@@ -1111,30 +1111,30 @@ class ConfigTranslationUiTest extends WebTestBase {
    *   TRUE if the assertion passed; FALSE otherwise.
    */
   protected function assertDisabledTextarea($id) {
-    $textarea = $this->xpath('//textarea[@id=:id and contains(@disabled, "disabled")]', array(
+    $textarea = $this->xpath('//textarea[@id=:id and contains(@disabled, "disabled")]', [
       ':id' => $id,
-    ));
+    ]);
     $textarea = reset($textarea);
-    $passed = $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Disabled field @id exists.', array(
+    $passed = $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Disabled field @id exists.', [
       '@id' => $id,
-    )));
+    ]));
     $expected = 'This field has been disabled because you do not have sufficient permissions to edit it.';
-    $passed = $passed && $this->assertEqual((string) $textarea, $expected, SafeMarkup::format('Disabled textarea @id hides text in an inaccessible text format.', array(
+    $passed = $passed && $this->assertEqual((string) $textarea, $expected, SafeMarkup::format('Disabled textarea @id hides text in an inaccessible text format.', [
       '@id' => $id,
-    )));
+    ]));
     // Make sure the text format select is not shown.
     $select_id = str_replace('value', 'format--2', $id);
-    $select = $this->xpath('//select[@id=:id]', array(':id' => $select_id));
-    return $passed && $this->assertFalse($select, SafeMarkup::format('Field @id does not exist.', array(
+    $select = $this->xpath('//select[@id=:id]', [':id' => $select_id]);
+    return $passed && $this->assertFalse($select, SafeMarkup::format('Field @id does not exist.', [
       '@id' => $id,
-    )));
+    ]));
   }
 
   /**
    * Helper function that returns a .po file with a given number of plural forms.
    */
   public function getPoFile($plurals) {
-    $po_file = array();
+    $po_file = [];
 
     $po_file[1] = <<< EOF
 msgid ""
diff --git a/web/core/modules/config_translation/src/Tests/ConfigTranslationUiThemeTest.php b/web/core/modules/config_translation/src/Tests/ConfigTranslationUiThemeTest.php
index ab51a43ef..53713a923 100644
--- a/web/core/modules/config_translation/src/Tests/ConfigTranslationUiThemeTest.php
+++ b/web/core/modules/config_translation/src/Tests/ConfigTranslationUiThemeTest.php
@@ -24,7 +24,7 @@ class ConfigTranslationUiThemeTest extends WebTestBase {
    *
    * @var array
    */
-  protected $langcodes = array('fr', 'ta');
+  protected $langcodes = ['fr', 'ta'];
 
   /**
    * Administrator user for tests.
diff --git a/web/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.module b/web/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.module
index eb41793ab..8c00b90d0 100644
--- a/web/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.module
+++ b/web/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.module
@@ -33,7 +33,7 @@ function config_translation_test_entity_type_alter(array &$entity_types) {
 function config_translation_test_config_translation_info_alter(&$info) {
   if (\Drupal::state()->get('config_translation_test_config_translation_info_alter')) {
     // Limit account settings config files to only one of them.
-    $info['entity.user.admin_form']['names'] = array('user.settings');
+    $info['entity.user.admin_form']['names'] = ['user.settings'];
 
     // Add one more config file to the site information page.
     $info['system.site_information_settings']['names'][] = 'system.rss';
diff --git a/web/core/modules/config_translation/src/Tests/ConfigTranslationDateFormatUiTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
similarity index 86%
rename from web/core/modules/config_translation/src/Tests/ConfigTranslationDateFormatUiTest.php
rename to web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
index ceb69d029..95af49eea 100644
--- a/web/core/modules/config_translation/src/Tests/ConfigTranslationDateFormatUiTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the content translation behaviours on date formats.
  *
  * @group config_translation
  */
-class ConfigTranslationDateFormatUiTest extends WebTestBase {
+class ConfigTranslationDateFormatUiTest extends BrowserTestBase {
 
-  public static $modules = array(
+  public static $modules = [
     'language',
     'config_translation',
     'system'
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
@@ -27,10 +27,10 @@ class ConfigTranslationDateFormatUiTest extends WebTestBase {
       ConfigurableLanguage::createFromLangcode($langcode)->save();
     }
 
-    $user = $this->drupalCreateUser(array(
+    $user = $this->drupalCreateUser([
       'administer site configuration',
       'translate configuration',
-    ));
+    ]);
     $this->drupalLogin($user);
   }
 
diff --git a/web/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
similarity index 94%
rename from web/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
rename to web/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
index 8bd3d71d8..586d19757 100644
--- a/web/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\shortcut\Entity\ShortcutSet;
 use Drupal\contact\Entity\ContactForm;
 use Drupal\filter\Entity\FilterFormat;
@@ -19,14 +19,14 @@ use Drupal\taxonomy\Entity\Vocabulary;
  * @group config_translation
  * @see \Drupal\config_translation\Tests\ConfigTranslationViewListUiTest
  */
-class ConfigTranslationListUiTest extends WebTestBase {
+class ConfigTranslationListUiTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'block',
     'config_translation',
     'contact',
@@ -40,7 +40,7 @@ class ConfigTranslationListUiTest extends WebTestBase {
     'image',
     'responsive_image',
     'toolbar',
-  );
+  ];
 
   /**
    * Admin user with all needed permissions.
@@ -52,7 +52,7 @@ class ConfigTranslationListUiTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $permissions = array(
+    $permissions = [
       'access site-wide contact form',
       'administer blocks',
       'administer contact forms',
@@ -70,7 +70,7 @@ class ConfigTranslationListUiTest extends WebTestBase {
       'administer image styles',
       'administer responsive images',
       'translate configuration',
-    );
+    ];
 
     // Create and log in user.
     $this->adminUser = $this->drupalCreateUser($permissions);
@@ -94,7 +94,7 @@ class ConfigTranslationListUiTest extends WebTestBase {
     // Add a test block, any block will do.
     // Set the machine name so the translate link can be built later.
     $id = Unicode::strtolower($this->randomMachineName(16));
-    $this->drupalPlaceBlock('system_powered_by_block', array('id' => $id));
+    $this->drupalPlaceBlock('system_powered_by_block', ['id' => $id]);
 
     // Get the Block listing.
     $this->drupalGet('admin/structure/block');
@@ -118,11 +118,11 @@ class ConfigTranslationListUiTest extends WebTestBase {
     // Lowercase the machine name.
     $menu_name = Unicode::strtolower($this->randomMachineName(16));
     $label = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'id' => $menu_name,
       'description' => '',
       'label' => $label,
-    );
+    ];
     // Create the menu by posting the form.
     $this->drupalPostForm('admin/structure/menu/add', $edit, t('Save'));
 
@@ -135,9 +135,9 @@ class ConfigTranslationListUiTest extends WebTestBase {
 
     // Check if the Link is not added if you are missing 'translate
     // configuration' permission.
-    $permissions = array(
+    $permissions = [
       'administer menu',
-    );
+    ];
     $this->drupalLogin($this->drupalCreateUser($permissions));
 
     // Get the Menu listing.
@@ -186,11 +186,11 @@ class ConfigTranslationListUiTest extends WebTestBase {
   public function doCustomContentTypeListTest() {
     // Create a test custom block type to decouple looking for translate
     // operations link so this does not test more than necessary.
-    $block_content_type = BlockContentType::create(array(
+    $block_content_type = BlockContentType::create([
       'id' => Unicode::strtolower($this->randomMachineName(16)),
       'label' => $this->randomMachineName(),
       'revision' => FALSE
-    ));
+    ]);
     $block_content_type->save();
 
     // Get the custom block type listing.
@@ -235,10 +235,10 @@ class ConfigTranslationListUiTest extends WebTestBase {
   public function doContentTypeListTest() {
     // Create a test content type to decouple looking for translate operations
     // link so this does not test more than necessary.
-    $content_type = $this->drupalCreateContentType(array(
+    $content_type = $this->drupalCreateContentType([
       'type' => Unicode::strtolower($this->randomMachineName(16)),
       'name' => $this->randomMachineName(),
-    ));
+    ]);
 
     // Get the content type listing.
     $this->drupalGet('admin/structure/types');
@@ -258,10 +258,10 @@ class ConfigTranslationListUiTest extends WebTestBase {
   public function doFormatsListTest() {
     // Create a test format to decouple looking for translate operations
     // link so this does not test more than necessary.
-    $filter_format = FilterFormat::create(array(
+    $filter_format = FilterFormat::create([
       'format' => Unicode::strtolower($this->randomMachineName(16)),
       'name' => $this->randomMachineName(),
-    ));
+    ]);
     $filter_format->save();
 
     // Get the format listing.
@@ -282,10 +282,10 @@ class ConfigTranslationListUiTest extends WebTestBase {
   public function doShortcutListTest() {
     // Create a test shortcut to decouple looking for translate operations
     // link so this does not test more than necessary.
-    $shortcut = ShortcutSet::create(array(
+    $shortcut = ShortcutSet::create([
       'id' => Unicode::strtolower($this->randomMachineName(16)),
       'label' => $this->randomString(),
-    ));
+    ]);
     $shortcut->save();
 
     // Get the shortcut listing.
@@ -307,7 +307,7 @@ class ConfigTranslationListUiTest extends WebTestBase {
     // Create a test role to decouple looking for translate operations
     // link so this does not test more than necessary.
     $role_id = Unicode::strtolower($this->randomMachineName(16));
-    $this->drupalCreateRole(array(), $role_id);
+    $this->drupalCreateRole([], $role_id);
 
     // Get the role listing.
     $this->drupalGet('admin/people/roles');
@@ -361,13 +361,13 @@ class ConfigTranslationListUiTest extends WebTestBase {
    * Tests the responsive image mapping listing for the translate operation.
    */
   public function doResponsiveImageListTest() {
-    $edit = array();
+    $edit = [];
     $edit['label'] = $this->randomMachineName();
     $edit['id'] = strtolower($edit['label']);
     $edit['fallback_image_style'] = 'thumbnail';
 
     $this->drupalPostForm('admin/config/media/responsive-image-style/add', $edit, t('Save'));
-    $this->assertRaw(t('Responsive image style %label saved.', array('%label' => $edit['label'])));
+    $this->assertRaw(t('Responsive image style %label saved.', ['%label' => $edit['label']]));
 
     // Get the responsive image style listing.
     $this->drupalGet('admin/config/media/responsive-image-style');
@@ -386,17 +386,17 @@ class ConfigTranslationListUiTest extends WebTestBase {
    */
   public function doFieldListTest() {
     // Create a base content type.
-    $content_type = $this->drupalCreateContentType(array(
+    $content_type = $this->drupalCreateContentType([
       'type' => Unicode::strtolower($this->randomMachineName(16)),
       'name' => $this->randomMachineName(),
-    ));
+    ]);
 
     // Create a block content type.
-    $block_content_type = BlockContentType::create(array(
+    $block_content_type = BlockContentType::create([
       'id' => 'basic',
       'label' => 'Basic',
       'revision' => FALSE
-    ));
+    ]);
     $block_content_type->save();
     $field = FieldConfig::create([
       // The field storage is guaranteed to exist because it is supplied by the
@@ -404,21 +404,21 @@ class ConfigTranslationListUiTest extends WebTestBase {
       'field_storage' => FieldStorageConfig::loadByName('block_content', 'body'),
       'bundle' => $block_content_type->id(),
       'label' => 'Body',
-      'settings' => array('display_summary' => FALSE),
+      'settings' => ['display_summary' => FALSE],
     ]);
     $field->save();
 
     // Look at a few fields on a few entity types.
-    $pages = array(
-      array(
+    $pages = [
+      [
         'list' => 'admin/structure/types/manage/' . $content_type->id() . '/fields',
         'field' => 'node.' . $content_type->id() . '.body',
-      ),
-      array(
+      ],
+      [
         'list' => 'admin/structure/block/block-content/manage/basic/fields',
         'field' => 'block_content.basic.body',
-      ),
-    );
+      ],
+    ];
 
     foreach ($pages as $values) {
       // Get fields listing.
diff --git a/web/core/modules/config_translation/src/Tests/ConfigTranslationViewListUiTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
similarity index 86%
rename from web/core/modules/config_translation/src/Tests/ConfigTranslationViewListUiTest.php
rename to web/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
index bccbd88ac..066dcd52b 100644
--- a/web/core/modules/config_translation/src/Tests/ConfigTranslationViewListUiTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\config_translation\Tests;
+namespace Drupal\Tests\config_translation\Functional;
 
 use Drupal\views_ui\Tests\UITestBase;
 
@@ -16,22 +16,22 @@ class ConfigTranslationViewListUiTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('node', 'test_view');
+  public static $testViews = ['node', 'test_view'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('config_translation', 'views_ui');
+  public static $modules = ['config_translation', 'views_ui'];
 
   protected function setUp() {
     parent::setUp();
 
-    $permissions = array(
+    $permissions = [
       'administer views',
       'translate configuration',
-    );
+    ];
 
     // Create and log in user.
     $this->drupalLogin($this->drupalCreateUser($permissions));
diff --git a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php
index b36a5473d..f48e44ff4 100644
--- a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php
+++ b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\config_translation\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
diff --git a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserProfileFieldInstanceTest.php b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserProfileFieldInstanceTest.php
new file mode 100644
index 000000000..057c14af4
--- /dev/null
+++ b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserProfileFieldInstanceTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\Tests\config_translation\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests the user profile field instance migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateI18nUserProfileFieldInstanceTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['config_translation', 'locale', 'language', 'field'];
+
+  /**
+   * Tests migration of translated user profile fields.
+   */
+  public function testUserProfileFields() {
+    $this->executeMigrations([
+      'user_profile_field',
+      'user_profile_field_instance',
+      'd6_i18n_user_profile_field_instance',
+    ]);
+    $language_manager = $this->container->get('language_manager');
+
+    $config_translation = $language_manager->getLanguageConfigOverride('fr', 'field.field.user.user.profile_love_migrations');
+    $this->assertSame("J'aime les migrations", $config_translation->get('label'));
+    $this->assertSame("Si vous cochez cette case, vous aimez les migrations.", $config_translation->get('description'));
+
+    $config_translation = $language_manager->getLanguageConfigOverride('fr', 'field.field.user.user.profile_color');
+    $this->assertSame('fr - Favorite color', $config_translation->get('label'));
+    $this->assertSame('Inscrivez votre couleur préférée', $config_translation->get('description'));
+
+    $config_translation = $language_manager->getLanguageConfigOverride('fr', 'field.field.user.user.profile_biography');
+    $this->assertSame('fr - Biography', $config_translation->get('label'));
+    $this->assertSame('fr - Tell people a little bit about yourself', $config_translation->get('description'));
+
+    $config_translation = $language_manager->getLanguageConfigOverride('fr', 'field.field.user.user.profile_sell_address');
+    $this->assertSame('fr - Sell your email address?', $config_translation->get('label'));
+    $this->assertSame("fr - If you check this box, we'll sell your address to spammers to help line the pockets of our shareholders. Thanks!", $config_translation->get('description'));
+
+    $config_translation = $language_manager->getLanguageConfigOverride('fr', 'field.field.user.user.profile_sold_to');
+    $this->assertSame('fr - Sales Category', $config_translation->get('label'));
+    $this->assertSame("fr - Select the sales categories to which this user's address was sold.", $config_translation->get('description'));
+    $this->assertSame('fr - Pill spammers Fitness spammers Back\slash Forward/slash Dot.in.the.middle', $config_translation->get('options'));
+
+    $config_translation = $language_manager->getLanguageConfigOverride('fr', 'field.field.user.user.profile_bands');
+    $this->assertSame('Mes groupes préférés', $config_translation->get('label'));
+    $this->assertSame("fr - Enter your favorite bands. When you've saved your profile, you'll be able to find other people with the same favorites.", $config_translation->get('description'));
+
+    $config_translation = $language_manager->getLanguageConfigOverride('fr', 'field.field.user.user.profile_birthdate');
+    $this->assertSame('fr - Birthdate', $config_translation->get('label'));
+    $this->assertSame('fr - Enter your birth date and we\'ll send you a coupon.', $config_translation->get('description'));
+
+    $config_translation = $language_manager->getLanguageConfigOverride('fr', 'field.field.user.user.profile_blog');
+    $this->assertSame('fr - Blog', $config_translation->get('label'));
+    $this->assertSame('fr - Paste the full URL, including http://, of your personal blog.', $config_translation->get('description'));
+  }
+
+}
diff --git a/web/core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/I18nProfileFieldTest.php b/web/core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/I18nProfileFieldTest.php
new file mode 100644
index 000000000..bd8d451d1
--- /dev/null
+++ b/web/core/modules/config_translation/tests/src/Kernel/Plugin/migrate/source/d6/I18nProfileFieldTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Drupal\Tests\config_translation\Kernel\Plugin\migrate\source\d6;
+
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+
+/**
+ * Tests the i18nProfileField source plugin.
+ *
+ * @covers \Drupal\config_translation\Plugin\migrate\source\d6\I18nProfileField
+ * @group migrate_drupal
+ */
+class I18nProfileFieldTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['config_translation', 'migrate_drupal', 'user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    $test = [];
+    $test[0]['source_data'] = [
+      'profile_fields' => [
+        [
+          'fid' => 42,
+          'title' => 'I love migrations',
+          'name' => 'profile_love_migrations',
+        ],
+      ],
+      'i18n_strings' => [
+        [
+          'lid' => 10,
+          'objectid' => 'profile_love_migrations',
+          'type' => 'field',
+          'property' => 'title',
+        ],
+        [
+          'lid' => 11,
+          'objectid' => 'profile_love_migrations',
+          'type' => 'field',
+          'property' => 'explanation'
+        ]
+      ],
+      'locales_target' => [
+        [
+          'lid' => 10,
+          'translation' => "J'aime les migrations.",
+          'language' => 'fr',
+        ],
+        [
+          'lid' => 11,
+          'translation' => 'Si vous cochez cette case, vous aimez les migrations.',
+          'language' => 'fr',
+        ],
+      ],
+    ];
+    $test[0]['expected_results'] = [
+      [
+        'property' => 'title',
+        'translation' => "J'aime les migrations.",
+        'language' => 'fr',
+        'fid' => '42',
+        'name' => 'profile_love_migrations',
+      ],
+      [
+        'property' => 'explanation',
+        'translation' => 'Si vous cochez cette case, vous aimez les migrations.',
+        'language' => 'fr',
+        'fid' => '42',
+        'name' => 'profile_love_migrations',
+      ],
+    ];
+    return $test;
+  }
+
+}
diff --git a/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php b/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
index dc56e8db9..11e72c2df 100644
--- a/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
+++ b/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
@@ -62,14 +62,14 @@ class ConfigEntityMapperTest extends UnitTestCase {
       ->with('entity.configurable_language.edit_form')
       ->will($this->returnValue(new Route('/admin/config/regional/language/edit/{configurable_language}')));
 
-    $definition = array(
+    $definition = [
       'class' => '\Drupal\config_translation\ConfigEntityMapper',
       'base_route_name' => 'entity.configurable_language.edit_form',
       'title' => '@label language',
-      'names' => array(),
+      'names' => [],
       'entity_type' => 'configurable_language',
       'route_name' => 'config_translation.item.overview.entity.configurable_language.edit_form',
-    );
+    ];
 
     $typed_config_manager = $this->getMock('Drupal\Core\Config\TypedConfigManagerInterface');
 
@@ -152,7 +152,7 @@ class ConfigEntityMapperTest extends UnitTestCase {
 
     $result = $this->configEntityMapper->getOverviewRouteParameters();
 
-    $this->assertSame(array('configurable_language' => 'entity_id'), $result);
+    $this->assertSame(['configurable_language' => 'entity_id'], $result);
   }
 
   /**
@@ -205,12 +205,12 @@ class ConfigEntityMapperTest extends UnitTestCase {
   public function testGetOperations() {
     $result = $this->configEntityMapper->getOperations();
 
-    $expected = array(
-      'list' => array(
+    $expected = [
+      'list' => [
         'title' => 'List',
         'url' => Url::fromRoute('config_translation.entity_list', ['mapper_id' => 'configurable_language']),
-      ),
-    );
+      ],
+    ];
 
     $this->assertEquals($expected, $result);
   }
diff --git a/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php b/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
index 204d84e1e..8e6d0b903 100644
--- a/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
+++ b/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
@@ -42,13 +42,13 @@ class ConfigFieldMapperTest extends UnitTestCase {
     $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
     $this->entity = $this->getMock('Drupal\field\FieldConfigInterface');
 
-    $definition = array(
+    $definition = [
       'class' => '\Drupal\config_translation\ConfigFieldMapper',
       'base_route_name' => 'entity.field_config.node_field_edit_form',
       'title' => '@label field',
-      'names' => array(),
+      'names' => [],
       'entity_type' => 'field_config',
-    );
+    ];
 
     $locale_config_manager = $this->getMockBuilder('Drupal\locale\LocaleConfigManager')
       ->disableOriginalConstructor()
diff --git a/web/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php b/web/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php
index 10bbf7da8..9f064aca2 100644
--- a/web/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php
+++ b/web/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php
@@ -31,7 +31,7 @@ class ConfigMapperManagerTest extends UnitTestCase {
   protected $typedConfigManager;
 
   protected function setUp() {
-    $language = new Language(array('id' => 'en'));
+    $language = new Language(['id' => 'en']);
     $language_manager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
     $language_manager->expects($this->once())
       ->method('getCurrentLanguage')
@@ -83,50 +83,50 @@ class ConfigMapperManagerTest extends UnitTestCase {
    *   ConfigMapperManager::hasTranslatable() as the second key.
    */
   public function providerTestHasTranslatable() {
-    return array(
-      array($this->getElement(array()), FALSE),
-      array($this->getElement(array('aaa' => 'bbb')), FALSE),
-      array($this->getElement(array('translatable' => FALSE)), FALSE),
-      array($this->getElement(array('translatable' => TRUE)), TRUE),
-      array($this->getNestedElement(array(
-        $this->getElement(array()),
-      )), FALSE),
-      array($this->getNestedElement(array(
-        $this->getElement(array('translatable' => TRUE)),
-      )), TRUE),
-      array($this->getNestedElement(array(
-        $this->getElement(array('aaa' => 'bbb')),
-        $this->getElement(array('ccc' => 'ddd')),
-        $this->getElement(array('eee' => 'fff')),
-      )), FALSE),
-      array($this->getNestedElement(array(
-        $this->getElement(array('aaa' => 'bbb')),
-        $this->getElement(array('ccc' => 'ddd')),
-        $this->getElement(array('translatable' => TRUE)),
-      )), TRUE),
-      array($this->getNestedElement(array(
-        $this->getElement(array('aaa' => 'bbb')),
-        $this->getNestedElement(array(
-          $this->getElement(array('ccc' => 'ddd')),
-          $this->getElement(array('eee' => 'fff')),
-        )),
-        $this->getNestedElement(array(
-          $this->getElement(array('ggg' => 'hhh')),
-          $this->getElement(array('iii' => 'jjj')),
-        )),
-      )), FALSE),
-      array($this->getNestedElement(array(
-        $this->getElement(array('aaa' => 'bbb')),
-        $this->getNestedElement(array(
-          $this->getElement(array('ccc' => 'ddd')),
-          $this->getElement(array('eee' => 'fff')),
-        )),
-        $this->getNestedElement(array(
-          $this->getElement(array('ggg' => 'hhh')),
-          $this->getElement(array('translatable' => TRUE)),
-        )),
-      )), TRUE),
-    );
+    return [
+      [$this->getElement([]), FALSE],
+      [$this->getElement(['aaa' => 'bbb']), FALSE],
+      [$this->getElement(['translatable' => FALSE]), FALSE],
+      [$this->getElement(['translatable' => TRUE]), TRUE],
+      [$this->getNestedElement([
+        $this->getElement([]),
+      ]), FALSE],
+      [$this->getNestedElement([
+        $this->getElement(['translatable' => TRUE]),
+      ]), TRUE],
+      [$this->getNestedElement([
+        $this->getElement(['aaa' => 'bbb']),
+        $this->getElement(['ccc' => 'ddd']),
+        $this->getElement(['eee' => 'fff']),
+      ]), FALSE],
+      [$this->getNestedElement([
+        $this->getElement(['aaa' => 'bbb']),
+        $this->getElement(['ccc' => 'ddd']),
+        $this->getElement(['translatable' => TRUE]),
+      ]), TRUE],
+      [$this->getNestedElement([
+        $this->getElement(['aaa' => 'bbb']),
+        $this->getNestedElement([
+          $this->getElement(['ccc' => 'ddd']),
+          $this->getElement(['eee' => 'fff']),
+        ]),
+        $this->getNestedElement([
+          $this->getElement(['ggg' => 'hhh']),
+          $this->getElement(['iii' => 'jjj']),
+        ]),
+      ]), FALSE],
+      [$this->getNestedElement([
+        $this->getElement(['aaa' => 'bbb']),
+        $this->getNestedElement([
+          $this->getElement(['ccc' => 'ddd']),
+          $this->getElement(['eee' => 'fff']),
+        ]),
+        $this->getNestedElement([
+          $this->getElement(['ggg' => 'hhh']),
+          $this->getElement(['translatable' => TRUE]),
+        ]),
+      ]), TRUE],
+    ];
   }
 
   /**
diff --git a/web/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/web/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
index cbf42c809..e7a06794f 100644
--- a/web/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
+++ b/web/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
@@ -91,13 +91,13 @@ class ConfigNamesMapperTest extends UnitTestCase {
   protected function setUp() {
     $this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
 
-    $this->pluginDefinition = array(
+    $this->pluginDefinition = [
       'class' => '\Drupal\config_translation\ConfigNamesMapper',
       'base_route_name' => 'system.site_information_settings',
       'title' => 'System information',
-      'names' => array('system.site'),
+      'names' => ['system.site'],
       'weight' => 42,
-    );
+    ];
 
     $this->typedConfigManager = $this->getMock('Drupal\Core\Config\TypedConfigManagerInterface');
 
@@ -156,7 +156,7 @@ class ConfigNamesMapperTest extends UnitTestCase {
    */
   public function testGetBaseRouteParameters() {
     $result = $this->configNamesMapper->getBaseRouteParameters();
-    $this->assertSame(array(), $result);
+    $this->assertSame([], $result);
   }
 
   /**
@@ -193,7 +193,7 @@ class ConfigNamesMapperTest extends UnitTestCase {
    */
   public function testGetOverviewRouteParameters() {
     $result = $this->configNamesMapper->getOverviewRouteParameters();
-    $this->assertSame(array(), $result);
+    $this->assertSame([], $result);
   }
 
   /**
@@ -201,13 +201,13 @@ class ConfigNamesMapperTest extends UnitTestCase {
    */
   public function testGetOverviewRoute() {
     $expected = new Route('/admin/config/system/site-information/translate',
-      array(
+      [
         '_controller' => '\Drupal\config_translation\Controller\ConfigTranslationController::itemPage',
         'plugin_id' => 'system.site_information_settings',
-      ),
-      array(
+      ],
+      [
         '_config_translation_overview_access' => 'TRUE',
-      )
+      ]
     );
     $result = $this->configNamesMapper->getOverviewRoute();
     $this->assertSame(serialize($expected), serialize($result));
@@ -242,7 +242,7 @@ class ConfigNamesMapperTest extends UnitTestCase {
     $route_match = new RouteMatch('example', new Route('/test/{langcode}'), ['langcode' => 'xx']);
     $this->configNamesMapper->populateFromRouteMatch($route_match);
 
-    $expected = array('langcode' => 'xx');
+    $expected = ['langcode' => 'xx'];
     $result = $this->configNamesMapper->getAddRouteParameters();
     $this->assertSame($expected, $result);
   }
@@ -252,13 +252,13 @@ class ConfigNamesMapperTest extends UnitTestCase {
    */
   public function testGetAddRoute() {
     $expected = new Route('/admin/config/system/site-information/translate/{langcode}/add',
-      array(
+      [
         '_form' => '\Drupal\config_translation\Form\ConfigTranslationAddForm',
         'plugin_id' => 'system.site_information_settings',
-      ),
-      array(
+      ],
+      [
         '_config_translation_form_access' => 'TRUE',
-      )
+      ]
     );
     $result = $this->configNamesMapper->getAddRoute();
     $this->assertSame(serialize($expected), serialize($result));
@@ -280,7 +280,7 @@ class ConfigNamesMapperTest extends UnitTestCase {
     $route_match = new RouteMatch('example', new Route('/test/{langcode}'), ['langcode' => 'xx']);
     $this->configNamesMapper->populateFromRouteMatch($route_match);
 
-    $expected = array('langcode' => 'xx');
+    $expected = ['langcode' => 'xx'];
     $result = $this->configNamesMapper->getEditRouteParameters();
     $this->assertSame($expected, $result);
   }
@@ -290,13 +290,13 @@ class ConfigNamesMapperTest extends UnitTestCase {
    */
   public function testGetEditRoute() {
     $expected = new Route('/admin/config/system/site-information/translate/{langcode}/edit',
-      array(
+      [
         '_form' => '\Drupal\config_translation\Form\ConfigTranslationEditForm',
         'plugin_id' => 'system.site_information_settings',
-      ),
-      array(
+      ],
+      [
         '_config_translation_form_access' => 'TRUE',
-      )
+      ]
     );
     $result = $this->configNamesMapper->getEditRoute();
     $this->assertSame(serialize($expected), serialize($result));
@@ -318,7 +318,7 @@ class ConfigNamesMapperTest extends UnitTestCase {
     $route_match = new RouteMatch('example', new Route('/test/{langcode}'), ['langcode' => 'xx']);
     $this->configNamesMapper->populateFromRouteMatch($route_match);
 
-    $expected = array('langcode' => 'xx');    $result = $this->configNamesMapper->getDeleteRouteParameters();
+    $expected = ['langcode' => 'xx'];    $result = $this->configNamesMapper->getDeleteRouteParameters();
     $this->assertSame($expected, $result);
   }
 
@@ -327,13 +327,13 @@ class ConfigNamesMapperTest extends UnitTestCase {
    */
   public function testGetDeleteRoute() {
     $expected = new Route('/admin/config/system/site-information/translate/{langcode}/delete',
-      array(
+      [
         '_form' => '\Drupal\config_translation\Form\ConfigTranslationDeleteForm',
         'plugin_id' => 'system.site_information_settings',
-      ),
-      array(
+      ],
+      [
         '_config_translation_form_access' => 'TRUE',
-      )
+      ]
     );
     $result = $this->configNamesMapper->getDeleteRoute();
     $this->assertSame(serialize($expected), serialize($result));
@@ -403,38 +403,38 @@ class ConfigNamesMapperTest extends UnitTestCase {
   public function testGetLangcode() {
     // Test that the getLangcode() falls back to 'en', if no explicit language
     // code is provided.
-    $config_factory = $this->getConfigFactoryStub(array(
-      'system.site' => array('key' => 'value'),
-    ));
+    $config_factory = $this->getConfigFactoryStub([
+      'system.site' => ['key' => 'value'],
+    ]);
     $this->configNamesMapper->setConfigFactory($config_factory);
     $result = $this->configNamesMapper->getLangcode();
     $this->assertSame('en', $result);
 
     // Test that getLangcode picks up the language code provided by the
     // configuration.
-    $config_factory = $this->getConfigFactoryStub(array(
-      'system.site' => array('langcode' => 'xx'),
-    ));
+    $config_factory = $this->getConfigFactoryStub([
+      'system.site' => ['langcode' => 'xx'],
+    ]);
     $this->configNamesMapper->setConfigFactory($config_factory);
     $result = $this->configNamesMapper->getLangcode();
     $this->assertSame('xx', $result);
 
     // Test that getLangcode() works for multiple configuration names.
     $this->configNamesMapper->addConfigName('system.maintenance');
-    $config_factory = $this->getConfigFactoryStub(array(
-      'system.site' => array('langcode' => 'xx'),
-      'system.maintenance' => array('langcode' => 'xx'),
-    ));
+    $config_factory = $this->getConfigFactoryStub([
+      'system.site' => ['langcode' => 'xx'],
+      'system.maintenance' => ['langcode' => 'xx'],
+    ]);
     $this->configNamesMapper->setConfigFactory($config_factory);
     $result = $this->configNamesMapper->getLangcode();
     $this->assertSame('xx', $result);
 
     // Test that getLangcode() throws an exception when different language codes
     // are given.
-    $config_factory = $this->getConfigFactoryStub(array(
-      'system.site' => array('langcode' => 'xx'),
-      'system.maintenance' => array('langcode' => 'yy'),
-    ));
+    $config_factory = $this->getConfigFactoryStub([
+      'system.site' => ['langcode' => 'xx'],
+      'system.maintenance' => ['langcode' => 'yy'],
+    ]);
     $this->configNamesMapper->setConfigFactory($config_factory);
     try {
       $this->configNamesMapper->getLangcode();
@@ -448,22 +448,22 @@ class ConfigNamesMapperTest extends UnitTestCase {
    * Tests ConfigNamesMapper::getConfigData().
    */
   public function testGetConfigData() {
-    $configs = array(
-      'system.site' => array(
+    $configs = [
+      'system.site' => [
         'name' => 'Drupal',
         'slogan' => 'Come for the software, stay for the community!',
-      ),
-      'system.maintenance' => array(
+      ],
+      'system.maintenance' => [
         'enabled' => FALSE,
         'message' => '@site is currently under maintenance.',
-      ),
-      'system.rss' => array(
-        'items' => array(
+      ],
+      'system.rss' => [
+        'items' => [
           'limit' => 10,
           'view_mode' => 'rss',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     $this->configNamesMapper->setConfigNames(array_keys($configs));
     $config_factory = $this->getConfigFactoryStub($configs);
@@ -489,9 +489,9 @@ class ConfigNamesMapperTest extends UnitTestCase {
     $config_names = range(1, count($mock_return_values));
     $this->configNamesMapper->setConfigNames($config_names);
 
-    $map = array();
+    $map = [];
     foreach ($config_names as $i => $config_name) {
-      $map[] = array($config_name, $mock_return_values[$i]);
+      $map[] = [$config_name, $mock_return_values[$i]];
     }
     $this->typedConfigManager
       ->expects($this->any())
@@ -512,12 +512,12 @@ class ConfigNamesMapperTest extends UnitTestCase {
    *   ConfigNamesMapper::hasSchema() as the second value.
    */
   public function providerTestHasSchema() {
-    return array(
-      array(array(TRUE), TRUE),
-      array(array(FALSE), FALSE),
-      array(array(TRUE, TRUE, TRUE), TRUE),
-      array(array(TRUE, FALSE, TRUE), FALSE),
-    );
+    return [
+      [[TRUE], TRUE],
+      [[FALSE], FALSE],
+      [[TRUE, TRUE, TRUE], TRUE],
+      [[TRUE, FALSE, TRUE], FALSE],
+    ];
   }
 
   /**
@@ -536,9 +536,9 @@ class ConfigNamesMapperTest extends UnitTestCase {
     $config_names = range(1, count($mock_return_values));
     $this->configNamesMapper->setConfigNames($config_names);
 
-    $map = array();
+    $map = [];
     foreach ($config_names as $i => $config_name) {
-      $map[] = isset($mock_return_values[$i]) ? array($config_name, $mock_return_values[$i]) : array();
+      $map[] = isset($mock_return_values[$i]) ? [$config_name, $mock_return_values[$i]] : [];
     }
     $this->configMapperManager
       ->expects($this->any())
@@ -559,14 +559,14 @@ class ConfigNamesMapperTest extends UnitTestCase {
    *   ConfigNamesMapper::hasTranslatable() as the second value.
    */
   public function providerTestHasTranslatable() {
-    return array(
-      array(array(), FALSE),
-      array(array(TRUE), TRUE),
-      array(array(FALSE), FALSE),
-      array(array(TRUE, TRUE, TRUE), TRUE),
-      array(array(FALSE, FALSE, FALSE), FALSE),
-      array(array(TRUE, FALSE, TRUE), TRUE),
-    );
+    return [
+      [[], FALSE],
+      [[TRUE], TRUE],
+      [[FALSE], FALSE],
+      [[TRUE, TRUE, TRUE], TRUE],
+      [[FALSE, FALSE, FALSE], FALSE],
+      [[TRUE, FALSE, TRUE], TRUE],
+    ];
   }
 
   /**
@@ -587,9 +587,9 @@ class ConfigNamesMapperTest extends UnitTestCase {
     $config_names = range(1, count($mock_return_values));
     $this->configNamesMapper->setConfigNames($config_names);
 
-    $map = array();
+    $map = [];
     foreach ($config_names as $i => $config_name) {
-      $map[] = array($config_name, $language->getId(), $mock_return_values[$i]);
+      $map[] = [$config_name, $language->getId(), $mock_return_values[$i]];
     }
     $this->localeConfigManager
       ->expects($this->any())
@@ -610,13 +610,13 @@ class ConfigNamesMapperTest extends UnitTestCase {
    *   ConfigNamesMapper::hasTranslation() as the second value.
    */
   public function providerTestHasTranslation() {
-    return array(
-      array(array(TRUE), TRUE),
-      array(array(FALSE), FALSE),
-      array(array(TRUE, TRUE, TRUE), TRUE),
-      array(array(FALSE, FALSE, TRUE), TRUE),
-      array(array(FALSE, FALSE, FALSE), FALSE),
-    );
+    return [
+      [[TRUE], TRUE],
+      [[FALSE], FALSE],
+      [[TRUE, TRUE, TRUE], TRUE],
+      [[FALSE, FALSE, TRUE], TRUE],
+      [[FALSE, FALSE, FALSE], FALSE],
+    ];
   }
 
   /**
@@ -631,12 +631,12 @@ class ConfigNamesMapperTest extends UnitTestCase {
    * Tests ConfigNamesMapper::hasTranslation().
    */
   public function testGetOperations() {
-    $expected = array(
-      'translate' => array(
+    $expected = [
+      'translate' => [
         'title' => 'Translate',
         'url' => Url::fromRoute('config_translation.item.overview.system.site_information_settings'),
-      ),
-    );
+      ],
+    ];
     $result = $this->configNamesMapper->getOperations();
     $this->assertEquals($expected, $result);
   }
diff --git a/web/core/modules/contact/contact.module b/web/core/modules/contact/contact.module
index 4306e3beb..65e7592cc 100644
--- a/web/core/modules/contact/contact.module
+++ b/web/core/modules/contact/contact.module
@@ -21,17 +21,17 @@ function contact_help($route_name, RouteMatchInterface $route_match) {
       $contact_page = \Drupal::url('entity.contact_form.collection');
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Contact module allows visitors to contact registered users on your site, using the personal contact form, and also allows you to set up site-wide contact forms. For more information, see the <a href=":contact">online documentation for the Contact module</a>.', array(':contact' => 'https://www.drupal.org/documentation/modules/contact')) . '</p>';
+      $output .= '<p>' . t('The Contact module allows visitors to contact registered users on your site, using the personal contact form, and also allows you to set up site-wide contact forms. For more information, see the <a href=":contact">online documentation for the Contact module</a>.', [':contact' => 'https://www.drupal.org/documentation/modules/contact']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Using the personal contact form') . '</dt>';
       $output .= '<dd>' . t("Site visitors can email registered users on your site by using the personal contact form, without knowing or learning the email address of the recipient. When a site visitor is viewing a user profile, the viewer will see a <em>Contact</em> tab or link, which leads to the personal contact form. The personal contact link is not shown when you are viewing your own profile, and users must have both <em>View user information</em> (to see user profiles) and <em>Use users' personal contact forms</em> permission to see the link. The user whose profile is being viewed must also have their personal contact form enabled (this is a user account setting); viewers with <em>Administer users</em> permission can bypass this setting.") . '</dd>';
       $output .= '<dt>' . t('Configuring contact forms') . '</dt>';
-      $output .= '<dd>' . t('On the <a href=":contact_admin">Contact forms page</a>, you can configure the fields and display of the personal contact form, and you can set up one or more site-wide contact forms. Each site-wide contact form has a machine name, a label, and one or more defined recipients; when a site visitor submits the form, the field values are sent to those recipients.', array(':contact_admin' => $contact_page)) . '</dd>';
+      $output .= '<dd>' . t('On the <a href=":contact_admin">Contact forms page</a>, you can configure the fields and display of the personal contact form, and you can set up one or more site-wide contact forms. Each site-wide contact form has a machine name, a label, and one or more defined recipients; when a site visitor submits the form, the field values are sent to those recipients.', [':contact_admin' => $contact_page]) . '</dd>';
       $output .= '<dt>' . t('Linking to contact forms') . '</dt>';
-      $output .= '<dd>' . t('One site-wide contact form can be designated as the default contact form. If you choose to designate a default form, the <em>Contact</em> menu link in the <em>Footer</em> menu will link to it. You can modify this link from the <a href=":menu-settings">Menus page</a> if you have the Menu UI module installed. You can also create links to other contact forms; the URL for each form you have set up has format <em>contact/machine_name_of_form</em>.', array(':menu-settings' => $menu_page)) . '</p>';
+      $output .= '<dd>' . t('One site-wide contact form can be designated as the default contact form. If you choose to designate a default form, the <em>Contact</em> menu link in the <em>Footer</em> menu will link to it. You can modify this link from the <a href=":menu-settings">Menus page</a> if you have the Menu UI module installed. You can also create links to other contact forms; the URL for each form you have set up has format <em>contact/machine_name_of_form</em>.', [':menu-settings' => $menu_page]) . '</p>';
       $output .= '<dt>' . t('Adding content to contact forms') . '</dt>';
-      $output .= '<dd>' . t('From the <a href=":contact_admin">Contact forms page</a>, you can configure the fields to be shown on contact forms, including their labels and help text. If you would like other content (such as text or images) to appear on a contact form, use a block. You can create and edit blocks on the <a href=":blocks">Block layout page</a>, if the Block module is installed.', array(':blocks' => $block_page, ':contact_admin' => $contact_page)) . '</dd>';
+      $output .= '<dd>' . t('From the <a href=":contact_admin">Contact forms page</a>, you can configure the fields to be shown on contact forms, including their labels and help text. If you would like other content (such as text or images) to appear on a contact form, use a block. You can create and edit blocks on the <a href=":blocks">Block layout page</a>, if the Block module is installed.', [':blocks' => $block_page, ':contact_admin' => $contact_page]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -50,42 +50,42 @@ function contact_entity_type_alter(array &$entity_types) {
  * Implements hook_entity_extra_field_info().
  */
 function contact_entity_extra_field_info() {
-  $fields = array();
+  $fields = [];
   foreach (array_keys(\Drupal::service('entity_type.bundle.info')->getBundleInfo('contact_message')) as $bundle) {
-    $fields['contact_message'][$bundle]['form']['name'] = array(
+    $fields['contact_message'][$bundle]['form']['name'] = [
       'label' => t('Sender name'),
       'description' => t('Text'),
       'weight' => -50,
-    );
-    $fields['contact_message'][$bundle]['form']['mail'] = array(
+    ];
+    $fields['contact_message'][$bundle]['form']['mail'] = [
       'label' => t('Sender email'),
       'description' => t('Email'),
       'weight' => -40,
-    );
+    ];
     if ($bundle == 'personal') {
-      $fields['contact_message'][$bundle]['form']['recipient'] = array(
+      $fields['contact_message'][$bundle]['form']['recipient'] = [
         'label' => t('Recipient username'),
         'description' => t('User'),
         'weight' => -30,
-      );
+      ];
     }
-    $fields['contact_message'][$bundle]['form']['preview'] = array(
+    $fields['contact_message'][$bundle]['form']['preview'] = [
       'label' => t('Preview sender message'),
       'description' => t('Preview'),
       'weight' => 40,
-    );
-    $fields['contact_message'][$bundle]['form']['copy'] = array(
+    ];
+    $fields['contact_message'][$bundle]['form']['copy'] = [
       'label' => t('Send copy to sender'),
       'description' => t('Option'),
       'weight' => 50,
-    );
+    ];
   }
 
-  $fields['user']['user']['form']['contact'] = array(
+  $fields['user']['user']['form']['contact'] = [
     'label' => t('Contact settings'),
     'description' => t('Contact module form element.'),
     'weight' => 5,
-  );
+  ];
   return $fields;
 }
 
@@ -118,21 +118,21 @@ function contact_mail($key, &$message, $params) {
   $sender = $params['sender'];
   $language = \Drupal::languageManager()->getLanguage($message['langcode']);
 
-  $variables = array(
+  $variables = [
     '@site-name' => \Drupal::config('system.site')->get('name'),
     '@subject' => $contact_message->getSubject(),
     '@form' => !empty($params['contact_form']) ? $params['contact_form']->label() : NULL,
     '@form-url' => \Drupal::url('<current>', [], ['absolute' => TRUE, 'language' => $language]),
     '@sender-name' => $sender->getDisplayName(),
-  );
+  ];
   if ($sender->isAuthenticated()) {
-    $variables['@sender-url'] = $sender->url('canonical', array('absolute' => TRUE, 'language' => $language));
+    $variables['@sender-url'] = $sender->url('canonical', ['absolute' => TRUE, 'language' => $language]);
   }
   else {
     $variables['@sender-url'] = $params['sender']->getEmail();
   }
 
-  $options = array('langcode' => $language->getId());
+  $options = ['langcode' => $language->getId()];
 
   switch ($key) {
     case 'page_mail':
@@ -150,10 +150,10 @@ function contact_mail($key, &$message, $params) {
 
     case 'user_mail':
     case 'user_copy':
-      $variables += array(
+      $variables += [
         '@recipient-name' => $params['recipient']->getDisplayName(),
-        '@recipient-edit-url' => $params['recipient']->url('edit-form', array('absolute' => TRUE, 'language' => $language)),
-      );
+        '@recipient-edit-url' => $params['recipient']->url('edit-form', ['absolute' => TRUE, 'language' => $language]),
+      ];
       $message['subject'] .= t('[@site-name] @subject', $variables, $options);
       $message['body'][] = t('Hello @recipient-name,', $variables, $options);
       $message['body'][] = t("@sender-name (@sender-url) has sent you a message via your contact form at @site-name.", $variables, $options);
@@ -172,22 +172,22 @@ function contact_mail($key, &$message, $params) {
  * @see \Drupal\user\ProfileForm::form()
  */
 function contact_form_user_form_alter(&$form, FormStateInterface $form_state) {
-  $form['contact'] = array(
+  $form['contact'] = [
     '#type' => 'details',
     '#title' => t('Contact settings'),
     '#open' => TRUE,
     '#weight' => 5,
-  );
+  ];
   $account = $form_state->getFormObject()->getEntity();
   if (!\Drupal::currentUser()->isAnonymous() && $account->id()) {
     $account_data = \Drupal::service('user.data')->get('contact', $account->id(), 'enabled');
   }
-  $form['contact']['contact'] = array(
+  $form['contact']['contact'] = [
     '#type' => 'checkbox',
     '#title' => t('Personal contact form'),
     '#default_value' => isset($account_data) ? $account_data : \Drupal::config('contact.settings')->get('user_default_enabled'),
     '#description' => t('Allow other users to contact you via a personal contact form which keeps your email address hidden. Note that some privileged users such as site administrators are still able to contact you even if you choose to disable this feature.'),
-  );
+  ];
   $form['actions']['submit']['#submit'][] = 'contact_user_profile_form_submit';
 }
 
@@ -209,18 +209,18 @@ function contact_user_profile_form_submit($form, FormStateInterface $form_state)
  * @see \Drupal\user\AccountSettingsForm
  */
 function contact_form_user_admin_settings_alter(&$form, FormStateInterface $form_state) {
-  $form['contact'] = array(
+  $form['contact'] = [
     '#type' => 'details',
     '#title' => t('Contact settings'),
     '#open' => TRUE,
     '#weight' => 0,
-  );
-  $form['contact']['contact_default_status'] = array(
+  ];
+  $form['contact']['contact_default_status'] = [
     '#type' => 'checkbox',
     '#title' => t('Enable the personal contact form by default for new users'),
     '#description' => t('Changing this setting will not affect existing users.'),
     '#default_value' => \Drupal::configFactory()->getEditable('contact.settings')->get('user_default_enabled'),
-  );
+  ];
   // Add submit handler to save contact configuration.
   $form['#submit'][] = 'contact_form_user_admin_settings_submit';
 }
diff --git a/web/core/modules/contact/contact.post_update.php b/web/core/modules/contact/contact.post_update.php
index 32469a5a5..7b3b76675 100644
--- a/web/core/modules/contact/contact.post_update.php
+++ b/web/core/modules/contact/contact.post_update.php
@@ -7,10 +7,6 @@
 
 use Drupal\contact\Entity\ContactForm;
 
-/**
- * @addtogroup updates-8.1.x-to-8.2.x
- * @{
- */
 
 /**
  * Initialize 'message' and 'redirect' field values to 'contact_form' entities.
@@ -24,7 +20,3 @@ function contact_post_update_add_message_redirect_field_to_contact_form() {
       ->save();
   }
 }
-
-/**
- * @} End of "addtogroup updates-8.1.x-to-8.2.x".
- */
diff --git a/web/core/modules/contact/contact.views.inc b/web/core/modules/contact/contact.views.inc
index 15603624d..a18c9e796 100644
--- a/web/core/modules/contact/contact.views.inc
+++ b/web/core/modules/contact/contact.views.inc
@@ -9,11 +9,11 @@
  * Implements hook_views_data_alter().
  */
 function contact_views_data_alter(&$data) {
-  $data['users']['contact'] = array(
-    'field' => array(
+  $data['users']['contact'] = [
+    'field' => [
       'title' => t('Contact link'),
       'help' => t('Provide a simple link to the user contact page.'),
       'id' => 'contact_link',
-    ),
-  );
+    ],
+  ];
 }
diff --git a/web/core/modules/contact/src/ContactFormEditForm.php b/web/core/modules/contact/src/ContactFormEditForm.php
index 01ca02510..aa94540bb 100644
--- a/web/core/modules/contact/src/ContactFormEditForm.php
+++ b/web/core/modules/contact/src/ContactFormEditForm.php
@@ -72,60 +72,60 @@ class ContactFormEditForm extends EntityForm implements ContainerInjectionInterf
     $contact_form = $this->entity;
     $default_form = $this->config('contact.settings')->get('default_form');
 
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label'),
       '#maxlength' => 255,
       '#default_value' => $contact_form->label(),
       '#description' => $this->t("Example: 'website feedback' or 'product information'."),
       '#required' => TRUE,
-    );
-    $form['id'] = array(
+    ];
+    $form['id'] = [
       '#type' => 'machine_name',
       '#default_value' => $contact_form->id(),
       '#maxlength' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => '\Drupal\contact\Entity\ContactForm::load',
-      ),
+      ],
       '#disabled' => !$contact_form->isNew(),
-    );
-    $form['recipients'] = array(
+    ];
+    $form['recipients'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Recipients'),
       '#default_value' => implode(', ', $contact_form->getRecipients()),
       '#description' => $this->t("Example: 'webmaster@example.com' or 'sales@example.com,support@example.com' . To specify multiple recipients, separate each email address with a comma."),
       '#required' => TRUE,
-    );
-    $form['message'] = array(
+    ];
+    $form['message'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Message'),
       '#default_value' => $contact_form->getMessage(),
       '#description' => $this->t('The message to display to the user after submission of this form. Leave blank for no message.'),
-    );
-    $form['redirect'] = array(
+    ];
+    $form['redirect'] = [
       '#type' => 'path',
       '#title' => $this->t('Redirect path'),
       '#convert_path' => PathElement::CONVERT_NONE,
       '#default_value' => $contact_form->getRedirectPath(),
       '#description' => $this->t('Path to redirect the user to after submission of this form. For example, type "/about" to redirect to that page. Use a relative path with a slash in front.'),
-    );
-    $form['reply'] = array(
+    ];
+    $form['reply'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Auto-reply'),
       '#default_value' => $contact_form->getReply(),
       '#description' => $this->t('Optional auto-reply. Leave empty if you do not want to send the user an auto-reply message.'),
-    );
-    $form['weight'] = array(
+    ];
+    $form['weight'] = [
       '#type' => 'weight',
       '#title' => $this->t('Weight'),
       '#default_value' => $contact_form->getWeight(),
       '#description' => $this->t('When listing forms, those with lighter (smaller) weights get listed before forms with heavier (larger) weights. Forms with equal weights are sorted alphabetically.'),
-    );
-    $form['selected'] = array(
+    ];
+    $form['selected'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Make this the default form'),
       '#default_value' => $default_form === $contact_form->id(),
-    );
+    ];
 
     return $form;
   }
@@ -142,7 +142,7 @@ class ContactFormEditForm extends EntityForm implements ContainerInjectionInterf
     foreach ($recipients as &$recipient) {
       $recipient = trim($recipient);
       if (!$this->emailValidator->isValid($recipient)) {
-        $form_state->setErrorByName('recipients', $this->t('%recipient is an invalid email address.', array('%recipient' => $recipient)));
+        $form_state->setErrorByName('recipients', $this->t('%recipient is an invalid email address.', ['%recipient' => $recipient]));
       }
     }
     $form_state->setValue('recipients', $recipients);
@@ -165,12 +165,12 @@ class ContactFormEditForm extends EntityForm implements ContainerInjectionInterf
     $edit_link = $this->entity->link($this->t('Edit'));
     $view_link = $contact_form->link($contact_form->label(), 'canonical');
     if ($status == SAVED_UPDATED) {
-      drupal_set_message($this->t('Contact form %label has been updated.', array('%label' => $view_link)));
-      $this->logger('contact')->notice('Contact form %label has been updated.', array('%label' => $contact_form->label(), 'link' => $edit_link));
+      drupal_set_message($this->t('Contact form %label has been updated.', ['%label' => $view_link]));
+      $this->logger('contact')->notice('Contact form %label has been updated.', ['%label' => $contact_form->label(), 'link' => $edit_link]);
     }
     else {
-      drupal_set_message($this->t('Contact form %label has been added.', array('%label' => $view_link)));
-      $this->logger('contact')->notice('Contact form %label has been added.', array('%label' => $contact_form->label(), 'link' => $edit_link));
+      drupal_set_message($this->t('Contact form %label has been added.', ['%label' => $view_link]));
+      $this->logger('contact')->notice('Contact form %label has been added.', ['%label' => $contact_form->label(), 'link' => $edit_link]);
     }
 
     // Update the default form.
diff --git a/web/core/modules/contact/src/Controller/ContactController.php b/web/core/modules/contact/src/Controller/ContactController.php
index 4d46f83d0..b8b69d5f1 100644
--- a/web/core/modules/contact/src/Controller/ContactController.php
+++ b/web/core/modules/contact/src/Controller/ContactController.php
@@ -64,9 +64,9 @@ class ContactController extends ControllerBase {
       // If there are no forms, do not display the form.
       if (empty($contact_form)) {
         if ($this->currentUser()->hasPermission('administer contact forms')) {
-          drupal_set_message($this->t('The contact form has not been configured. <a href=":add">Add one or more forms</a> .', array(
-            ':add' => $this->url('contact.form_add'))), 'error');
-          return array();
+          drupal_set_message($this->t('The contact form has not been configured. <a href=":add">Add one or more forms</a> .', [
+            ':add' => $this->url('contact.form_add')]), 'error');
+          return [];
         }
         else {
           throw new NotFoundHttpException();
@@ -76,9 +76,9 @@ class ContactController extends ControllerBase {
 
     $message = $this->entityManager()
       ->getStorage('contact_message')
-      ->create(array(
+      ->create([
         'contact_form' => $contact_form->id(),
-      ));
+      ]);
 
     $form = $this->entityFormBuilder()->getForm($message);
     $form['#title'] = $contact_form->label();
@@ -106,13 +106,13 @@ class ContactController extends ControllerBase {
       throw new NotFoundHttpException();
     }
 
-    $message = $this->entityManager()->getStorage('contact_message')->create(array(
+    $message = $this->entityManager()->getStorage('contact_message')->create([
       'contact_form' => 'personal',
       'recipient' => $user->id(),
-    ));
+    ]);
 
     $form = $this->entityFormBuilder()->getForm($message);
-    $form['#title'] = $this->t('Contact @username', array('@username' => $user->getDisplayName()));
+    $form['#title'] = $this->t('Contact @username', ['@username' => $user->getDisplayName()]);
     $form['#cache']['contexts'][] = 'user.permissions';
     return $form;
   }
diff --git a/web/core/modules/contact/src/Entity/ContactForm.php b/web/core/modules/contact/src/Entity/ContactForm.php
index 9c6374706..00e5416bc 100644
--- a/web/core/modules/contact/src/Entity/ContactForm.php
+++ b/web/core/modules/contact/src/Entity/ContactForm.php
@@ -73,7 +73,7 @@ class ContactForm extends ConfigEntityBundleBase implements ContactFormInterface
    *
    * @var array
    */
-  protected $recipients = array();
+  protected $recipients = [];
 
   /**
    * The path to redirect to on form submission.
diff --git a/web/core/modules/contact/src/Entity/Message.php b/web/core/modules/contact/src/Entity/Message.php
index 20f360f6a..d75496ba7 100644
--- a/web/core/modules/contact/src/Entity/Message.php
+++ b/web/core/modules/contact/src/Entity/Message.php
@@ -153,29 +153,29 @@ class Message extends ContentEntityBase implements MessageInterface {
       ->setLabel(t('Subject'))
       ->setRequired(TRUE)
       ->setSetting('max_length', 100)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -10,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     // The text of the contact message.
     $fields['message'] = BaseFieldDefinition::create('string_long')
       ->setLabel(t('Message'))
       ->setRequired(TRUE)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'string_textarea',
         'weight' => 0,
-        'settings' => array(
+        'settings' => [
           'rows' => 12,
-        ),
-      ))
+        ],
+      ])
       ->setDisplayConfigurable('form', TRUE)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'type' => 'string',
         'weight' => 0,
         'label' => 'above',
-      ))
+      ])
       ->setDisplayConfigurable('view', TRUE);
 
     $fields['copy'] = BaseFieldDefinition::create('boolean')
diff --git a/web/core/modules/contact/src/MailHandler.php b/web/core/modules/contact/src/MailHandler.php
index bb3b95e8d..b57864c05 100644
--- a/web/core/modules/contact/src/MailHandler.php
+++ b/web/core/modules/contact/src/MailHandler.php
@@ -73,7 +73,7 @@ class MailHandler implements MailHandlerInterface {
   public function sendMailMessages(MessageInterface $message, AccountInterface $sender) {
     // Clone the sender, as we make changes to mail and name properties.
     $sender_cloned = clone $this->userStorage->load($sender->id());
-    $params = array();
+    $params = [];
     $current_langcode = $this->languageManager->getCurrentLanguage()->getId();
     $recipient_langcode = $this->languageManager->getDefaultLanguage()->getId();
     $contact_form = $message->getContactForm();
@@ -86,7 +86,7 @@ class MailHandler implements MailHandlerInterface {
 
       // For the email message, clarify that the sender name is not verified; it
       // could potentially clash with a username on this site.
-      $sender_cloned->name = $this->t('@name (not verified)', array('@name' => $message->getSenderName()));
+      $sender_cloned->name = $this->t('@name (not verified)', ['@name' => $message->getSenderName()]);
     }
 
     // Build email parameters.
@@ -133,18 +133,18 @@ class MailHandler implements MailHandlerInterface {
     }
 
     if (!$message->isPersonal()) {
-      $this->logger->notice('%sender-name (@sender-from) sent an email regarding %contact_form.', array(
+      $this->logger->notice('%sender-name (@sender-from) sent an email regarding %contact_form.', [
         '%sender-name' => $sender_cloned->getUsername(),
         '@sender-from' => $sender_cloned->getEmail(),
         '%contact_form' => $contact_form->label(),
-      ));
+      ]);
     }
     else {
-      $this->logger->notice('%sender-name (@sender-from) sent %recipient-name an email.', array(
+      $this->logger->notice('%sender-name (@sender-from) sent %recipient-name an email.', [
         '%sender-name' => $sender_cloned->getUsername(),
         '@sender-from' => $sender_cloned->getEmail(),
         '%recipient-name' => $message->getPersonalRecipient()->getUsername(),
-      ));
+      ]);
     }
   }
 
diff --git a/web/core/modules/contact/src/MessageForm.php b/web/core/modules/contact/src/MessageForm.php
index 668dd0638..16d41b5ac 100644
--- a/web/core/modules/contact/src/MessageForm.php
+++ b/web/core/modules/contact/src/MessageForm.php
@@ -2,9 +2,11 @@
 
 namespace Drupal\contact;
 
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Flood\FloodInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
@@ -63,9 +65,13 @@ class MessageForm extends ContentEntityForm {
    *   The contact mail handler service.
    * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
    *   The date service.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle service.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, FloodInterface $flood, LanguageManagerInterface $language_manager, MailHandlerInterface $mail_handler, DateFormatterInterface $date_formatter) {
-    parent::__construct($entity_manager);
+  public function __construct(EntityManagerInterface $entity_manager, FloodInterface $flood, LanguageManagerInterface $language_manager, MailHandlerInterface $mail_handler, DateFormatterInterface $date_formatter, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
+    parent::__construct($entity_manager, $entity_type_bundle_info, $time);
     $this->flood = $flood;
     $this->languageManager = $language_manager;
     $this->mailHandler = $mail_handler;
@@ -81,7 +87,9 @@ class MessageForm extends ContentEntityForm {
       $container->get('flood'),
       $container->get('language_manager'),
       $container->get('contact.mail_handler'),
-      $container->get('date.formatter')
+      $container->get('date.formatter'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time')
     );
   }
 
@@ -95,24 +103,24 @@ class MessageForm extends ContentEntityForm {
     $form['#attributes']['class'][] = 'contact-form';
 
     if (!empty($message->preview)) {
-      $form['preview'] = array(
-        '#theme_wrappers' => array('container__preview'),
-        '#attributes' => array('class' => array('preview')),
-      );
+      $form['preview'] = [
+        '#theme_wrappers' => ['container__preview'],
+        '#attributes' => ['class' => ['preview']],
+      ];
       $form['preview']['message'] = $this->entityManager->getViewBuilder('contact_message')->view($message, 'full');
     }
 
-    $form['name'] = array(
+    $form['name'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Your name'),
       '#maxlength' => 255,
       '#required' => TRUE,
-    );
-    $form['mail'] = array(
+    ];
+    $form['mail'] = [
       '#type' => 'email',
       '#title' => $this->t('Your email address'),
       '#required' => TRUE,
-    );
+    ];
     if ($user->isAnonymous()) {
       $form['#attached']['library'][] = 'core/drupal.form';
       $form['#attributes']['data-user-info-from-browser'] = TRUE;
@@ -133,24 +141,24 @@ class MessageForm extends ContentEntityForm {
 
     // The user contact form has a preset recipient.
     if ($message->isPersonal()) {
-      $form['recipient'] = array(
+      $form['recipient'] = [
         '#type' => 'item',
         '#title' => $this->t('To'),
         '#value' => $message->getPersonalRecipient()->id(),
-        'name' => array(
+        'name' => [
           '#theme' => 'username',
           '#account' => $message->getPersonalRecipient(),
-        ),
-      );
+        ],
+      ];
     }
 
-    $form['copy'] = array(
+    $form['copy'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Send yourself a copy'),
       // Do not allow anonymous users to send themselves a copy, because it can
       // be abused to spam people.
       '#access' => $user->isAuthenticated(),
-    );
+    ];
     return $form;
   }
 
@@ -160,11 +168,11 @@ class MessageForm extends ContentEntityForm {
   public function actions(array $form, FormStateInterface $form_state) {
     $elements = parent::actions($form, $form_state);
     $elements['submit']['#value'] = $this->t('Send message');
-    $elements['preview'] = array(
+    $elements['preview'] = [
       '#type' => 'submit',
       '#value' => $this->t('Preview'),
-      '#submit' => array('::submitForm', '::preview'),
-    );
+      '#submit' => ['::submitForm', '::preview'],
+    ];
     return $elements;
   }
 
@@ -189,10 +197,10 @@ class MessageForm extends ContentEntityForm {
       $interval = $this->config('contact.settings')->get('flood.interval');
 
       if (!$this->flood->isAllowed('contact', $limit, $interval)) {
-        $form_state->setErrorByName('', $this->t('You cannot send more than %limit messages in @interval. Try again later.', array(
+        $form_state->setErrorByName('', $this->t('You cannot send more than %limit messages in @interval. Try again later.', [
           '%limit' => $limit,
           '@interval' => $this->dateFormatter->formatInterval($interval),
-        )));
+        ]));
       }
     }
 
@@ -205,6 +213,10 @@ class MessageForm extends ContentEntityForm {
   public function save(array $form, FormStateInterface $form_state) {
     $message = $this->entity;
     $user = $this->currentUser();
+    // Save the message. In core this is a no-op but should contrib wish to
+    // implement message storage, this will make the task of swapping in a real
+    // storage controller straight-forward.
+    $message->save();
     $this->mailHandler->sendMailMessages($message, $user);
     $contact_form = $message->getContactForm();
 
@@ -221,10 +233,6 @@ class MessageForm extends ContentEntityForm {
     else {
       $form_state->setRedirectUrl($contact_form->getRedirectUrl());
     }
-    // Save the message. In core this is a no-op but should contrib wish to
-    // implement message storage, this will make the task of swapping in a real
-    // storage controller straight-forward.
-    $message->save();
   }
 
 }
diff --git a/web/core/modules/contact/src/MessageViewBuilder.php b/web/core/modules/contact/src/MessageViewBuilder.php
index 3024f6291..5155341d8 100644
--- a/web/core/modules/contact/src/MessageViewBuilder.php
+++ b/web/core/modules/contact/src/MessageViewBuilder.php
@@ -23,25 +23,6 @@ class MessageViewBuilder extends EntityViewBuilder {
     return $build;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function buildComponents(array &$build, array $entities, array $displays, $view_mode) {
-    parent::buildComponents($build, $entities, $displays, $view_mode);
-
-    foreach ($entities as $id => $entity) {
-      // Add the message extra field, if enabled.
-      $display = $displays[$entity->bundle()];
-      if ($entity->getMessage() && $display->getComponent('message')) {
-        $build[$id]['message'] = array(
-          '#type' => 'item',
-          '#title' => t('Message'),
-          '#plain_text' => $entity->getMessage(),
-        );
-      }
-    }
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -54,7 +35,7 @@ class MessageViewBuilder extends EntityViewBuilder {
       // convert DIVs correctly.
       foreach (Element::children($build) as $key) {
         if (isset($build[$key]['#label_display']) && $build[$key]['#label_display'] == 'above') {
-          $build[$key] += array('#prefix' => '');
+          $build[$key] += ['#prefix' => ''];
           $build[$key]['#prefix'] = $build[$key]['#title'] . ":\n";
           $build[$key]['#label_display'] = 'hidden';
         }
diff --git a/web/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php b/web/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php
index 2975431ad..0b9f7b3b8 100644
--- a/web/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php
+++ b/web/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php
@@ -20,14 +20,14 @@ class ContactCategory extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('contact', 'c')
-      ->fields('c', array(
+      ->fields('c', [
         'cid',
         'category',
         'recipients',
         'reply',
         'weight',
         'selected',
-      )
+      ]
     );
     $query->orderBy('c.cid');
     return $query;
@@ -45,14 +45,14 @@ class ContactCategory extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'cid' => $this->t('Primary Key: Unique category ID.'),
       'category' => $this->t('Category name.'),
       'recipients' => $this->t('Comma-separated list of recipient email addresses.'),
       'reply' => $this->t('Text of the auto-reply message.'),
       'weight' => $this->t("The category's weight."),
       'selected' => $this->t('Flag to indicate whether or not category is selected by default. (1 = Yes, 0 = No)'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/contact/src/Plugin/views/field/ContactLink.php b/web/core/modules/contact/src/Plugin/views/field/ContactLink.php
index ecc4cea9f..a98be137d 100644
--- a/web/core/modules/contact/src/Plugin/views/field/ContactLink.php
+++ b/web/core/modules/contact/src/Plugin/views/field/ContactLink.php
@@ -42,8 +42,8 @@ class ContactLink extends LinkBase {
     $this->options['alter']['make_link'] = TRUE;
     $this->options['alter']['url'] = $this->getUrlInfo($row);
 
-    $title = $this->t('Contact %user', array('%user' => $entity->label()));
-    $this->options['alter']['attributes'] = array('title' => $title);
+    $title = $this->t('Contact %user', ['%user' => $entity->label()]);
+    $this->options['alter']['attributes'] = ['title' => $title];
 
     if (!empty($this->options['text'])) {
       return $this->options['text'];
diff --git a/web/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php b/web/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
deleted file mode 100644
index eb7c5275c..000000000
--- a/web/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\contact\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests contact form textfields are present if authenticated.
- *
- * @group contact
- */
-class ContactAuthenticatedUserTest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('contact');
-
-  /**
-   * Tests that name and email fields are not present for authenticated users.
-   */
-  function testContactSiteWideTextfieldsLoggedInTestCase() {
-    $this->drupalLogin($this->drupalCreateUser(array('access site-wide contact form')));
-    $this->drupalGet('contact');
-
-    // Ensure that there is no textfield for name.
-    $this->assertFalse($this->xpath('//input[@name=:name]', array(':name' => 'name')));
-
-    // Ensure that there is no textfield for email.
-    $this->assertFalse($this->xpath('//input[@name=:name]', array(':name' => 'mail')));
-  }
-
-}
diff --git a/web/core/modules/contact/src/Tests/Views/ContactFieldsTest.php b/web/core/modules/contact/src/Tests/Views/ContactFieldsTest.php
index cf707996f..fafe451be 100644
--- a/web/core/modules/contact/src/Tests/Views/ContactFieldsTest.php
+++ b/web/core/modules/contact/src/Tests/Views/ContactFieldsTest.php
@@ -19,7 +19,7 @@ class ContactFieldsTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('field', 'text', 'contact');
+  public static $modules = ['field', 'text', 'contact'];
 
   /**
    * Contains the field storage definition for contact used for this test.
@@ -31,11 +31,11 @@ class ContactFieldsTest extends ViewTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->fieldStorage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => strtolower($this->randomMachineName()),
       'entity_type' => 'contact_message',
       'type' => 'text'
-    ));
+    ]);
     $this->fieldStorage->save();
 
     ContactForm::create([
diff --git a/web/core/modules/contact/src/Tests/Views/ContactLinkTest.php b/web/core/modules/contact/src/Tests/Views/ContactLinkTest.php
index 738f67c1b..f6b6013b4 100644
--- a/web/core/modules/contact/src/Tests/Views/ContactLinkTest.php
+++ b/web/core/modules/contact/src/Tests/Views/ContactLinkTest.php
@@ -27,14 +27,14 @@ class ContactLinkTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('contact_test_views');
+  public static $modules = ['contact_test_views'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_contact_link');
+  public static $testViews = ['test_contact_link'];
 
   /**
    * {@inheritdoc}
@@ -42,7 +42,7 @@ class ContactLinkTest extends ViewTestBase {
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('contact_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['contact_test_views']);
 
     $this->userData = $this->container->get('user.data');
   }
@@ -51,39 +51,39 @@ class ContactLinkTest extends ViewTestBase {
    * Tests contact link.
    */
   public function testContactLink() {
-    $accounts = array();
+    $accounts = [];
     $accounts['root'] = User::load(1);
     // Create an account with access to all contact pages.
-    $admin_account = $this->drupalCreateUser(array('administer users'));
+    $admin_account = $this->drupalCreateUser(['administer users']);
     $accounts['admin'] = $admin_account;
     // Create an account with no access to contact pages.
     $no_contact_account = $this->drupalCreateUser();
     $accounts['no_contact'] = $no_contact_account;
 
     // Create an account with access to contact pages.
-    $contact_account = $this->drupalCreateUser(array('access user contact forms'));
+    $contact_account = $this->drupalCreateUser(['access user contact forms']);
     $accounts['contact'] = $contact_account;
 
     $this->drupalLogin($admin_account);
     $this->drupalGet('test-contact-link');
     // The admin user has access to all contact links beside his own.
-    $this->assertContactLinks($accounts, array('root', 'no_contact', 'contact'));
+    $this->assertContactLinks($accounts, ['root', 'no_contact', 'contact']);
 
     $this->drupalLogin($no_contact_account);
     $this->drupalGet('test-contact-link');
     // Ensure that the user without the permission doesn't see any link.
-    $this->assertContactLinks($accounts, array());
+    $this->assertContactLinks($accounts, []);
 
     $this->drupalLogin($contact_account);
     $this->drupalGet('test-contact-link');
-    $this->assertContactLinks($accounts, array('root', 'admin', 'no_contact'));
+    $this->assertContactLinks($accounts, ['root', 'admin', 'no_contact']);
 
     // Disable contact link for no_contact.
     $this->userData->set('contact', $no_contact_account->id(), 'enabled', FALSE);
     // @todo Remove cache invalidation in https://www.drupal.org/node/2477903.
     Cache::invalidateTags($no_contact_account->getCacheTagsToInvalidate());
     $this->drupalGet('test-contact-link');
-    $this->assertContactLinks($accounts, array('root', 'admin'));
+    $this->assertContactLinks($accounts, ['root', 'admin']);
   }
 
   /**
@@ -100,7 +100,7 @@ class ContactLinkTest extends ViewTestBase {
     foreach ($names as $name) {
       $account = $accounts[$name];
 
-      $result = $this->xpath('//div[contains(@class, "views-field-contact")]//a[contains(@href, :url)]', array(':url' => $account->url('contact-form')));
+      $result = $this->xpath('//div[contains(@class, "views-field-contact")]//a[contains(@href, :url)]', [':url' => $account->url('contact-form')]);
       $this->assertTrue(count($result));
     }
   }
diff --git a/web/core/modules/contact/tests/drupal-7.contact.database.php b/web/core/modules/contact/tests/drupal-7.contact.database.php
index 115f83c17..bd36384d7 100644
--- a/web/core/modules/contact/tests/drupal-7.contact.database.php
+++ b/web/core/modules/contact/tests/drupal-7.contact.database.php
@@ -11,23 +11,23 @@
 
 // Update the default category to that it is not selected.
 db_update('contact')
-  ->fields(array('selected' => '0'))
+  ->fields(['selected' => '0'])
   ->condition('cid', '1')
   ->execute();
 
 // Add a custom contact category.
-db_insert('contact')->fields(array(
+db_insert('contact')->fields([
   'category',
   'recipients',
   'reply',
   'weight',
   'selected'
-))
-  ->values(array(
+])
+  ->values([
   'category' => 'Upgrade test',
   'recipients' => 'test1@example.com,test2@example.com',
   'reply' => 'Test reply',
   'weight' => 1,
   'selected' => 1,
-))
+])
   ->execute();
diff --git a/web/core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module b/web/core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module
index e20dc436f..cef976c6f 100644
--- a/web/core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module
+++ b/web/core/modules/contact/tests/modules/contact_storage_test/contact_storage_test.module
@@ -15,7 +15,7 @@ use Drupal\Core\Form\FormStateInterface;
  */
 function contact_storage_test_entity_base_field_info(EntityTypeInterface $entity_type) {
   if ($entity_type->id() == 'contact_message') {
-    $fields = array();
+    $fields = [];
 
     $fields['id'] = BaseFieldDefinition::create('integer')
       ->setLabel(t('Message ID'))
@@ -48,12 +48,12 @@ function contact_storage_test_entity_type_alter(array &$entity_types) {
 function contact_storage_test_form_contact_form_form_alter(&$form, FormStateInterface $form_state) {
   /** @var \Drupal\contact\ContactFormInterface $contact_form */
   $contact_form = $form_state->getFormObject()->getEntity();
-  $form['send_a_pony'] = array(
+  $form['send_a_pony'] = [
     '#type' => 'checkbox',
     '#title' => t('Send submitters a voucher for a free pony.'),
     '#description' => t('Enable to send an additional email with a free pony voucher to anyone who submits the form.'),
     '#default_value' => $contact_form->getThirdPartySetting('contact_storage_test', 'send_a_pony', FALSE),
-  );
+  ];
   $form['#entity_builders'][] = 'contact_storage_test_contact_form_form_builder';
 }
 /**
diff --git a/web/core/modules/contact/tests/src/Functional/ContactAuthenticatedUserTest.php b/web/core/modules/contact/tests/src/Functional/ContactAuthenticatedUserTest.php
new file mode 100644
index 000000000..43cf3ce0f
--- /dev/null
+++ b/web/core/modules/contact/tests/src/Functional/ContactAuthenticatedUserTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\contact\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests contact form textfields are present if authenticated.
+ *
+ * @group contact
+ */
+class ContactAuthenticatedUserTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['contact'];
+
+  /**
+   * Tests that name and email fields are not present for authenticated users.
+   */
+  public function testContactSiteWideTextfieldsLoggedInTestCase() {
+    $this->drupalLogin($this->drupalCreateUser(['access site-wide contact form']));
+    $this->drupalGet('contact');
+
+    // Ensure that there is no textfield for name.
+    $this->assertFalse($this->xpath('//input[@name=:name]', [':name' => 'name']));
+
+    // Ensure that there is no textfield for email.
+    $this->assertFalse($this->xpath('//input[@name=:name]', [':name' => 'mail']));
+  }
+
+}
diff --git a/web/core/modules/contact/src/Tests/ContactLanguageTest.php b/web/core/modules/contact/tests/src/Functional/ContactLanguageTest.php
similarity index 87%
rename from web/core/modules/contact/src/Tests/ContactLanguageTest.php
rename to web/core/modules/contact/tests/src/Functional/ContactLanguageTest.php
index 4623bda08..0c3488450 100644
--- a/web/core/modules/contact/src/Tests/ContactLanguageTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactLanguageTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\contact\Tests;
+namespace Drupal\Tests\contact\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests contact messages with language module.
@@ -13,18 +13,18 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group contact
  */
-class ContactLanguageTest extends WebTestBase {
+class ContactLanguageTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'contact',
     'language',
     'contact_test',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -33,10 +33,10 @@ class ContactLanguageTest extends WebTestBase {
     parent::setUp();
 
     // Create and log in administrative user.
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'access site-wide contact form',
       'administer languages',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
   }
 
diff --git a/web/core/modules/contact/src/Tests/ContactPersonalTest.php b/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
similarity index 87%
rename from web/core/modules/contact/src/Tests/ContactPersonalTest.php
rename to web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
index 936aed589..7e6ecad7c 100644
--- a/web/core/modules/contact/src/Tests/ContactPersonalTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Drupal\contact\Tests;
+namespace Drupal\Tests\contact\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\PlainTextOutput;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Core\Test\AssertMailTrait;
+use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -13,14 +15,17 @@ use Drupal\user\RoleInterface;
  *
  * @group contact
  */
-class ContactPersonalTest extends WebTestBase {
+class ContactPersonalTest extends BrowserTestBase {
+
+  use AssertMailTrait;
+  use AssertPageCacheContextsAndTagsTrait;
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('contact', 'dblog');
+  public static $modules = ['contact', 'dblog'];
 
   /**
    * A user with some administrative permissions.
@@ -47,18 +52,18 @@ class ContactPersonalTest extends WebTestBase {
     parent::setUp();
 
     // Create an admin user.
-    $this->adminUser = $this->drupalCreateUser(array('administer contact forms', 'administer users', 'administer account settings', 'access site reports'));
+    $this->adminUser = $this->drupalCreateUser(['administer contact forms', 'administer users', 'administer account settings', 'access site reports']);
 
     // Create some normal users with their contact forms enabled by default.
     $this->config('contact.settings')->set('user_default_enabled', TRUE)->save();
-    $this->webUser = $this->drupalCreateUser(array('access user profiles', 'access user contact forms'));
+    $this->webUser = $this->drupalCreateUser(['access user profiles', 'access user contact forms']);
     $this->contactUser = $this->drupalCreateUser();
   }
 
   /**
    * Tests that mails for contact messages are correctly sent.
    */
-  function testSendPersonalContactMessage() {
+  public function testSendPersonalContactMessage() {
     // Ensure that the web user's email needs escaping.
     $mail = $this->webUser->getUsername() . '&escaped@example.com';
     $this->webUser->setEmail($mail)->save();
@@ -67,18 +72,18 @@ class ContactPersonalTest extends WebTestBase {
     $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
     $this->assertEscaped($mail);
     $message = $this->submitPersonalContact($this->contactUser);
-    $mails = $this->drupalGetMails();
+    $mails = $this->getMails();
     $this->assertEqual(1, count($mails));
     $mail = $mails[0];
     $this->assertEqual($mail['to'], $this->contactUser->getEmail());
     $this->assertEqual($mail['from'], $this->config('system.site')->get('mail'));
     $this->assertEqual($mail['reply-to'], $this->webUser->getEmail());
     $this->assertEqual($mail['key'], 'user_mail');
-    $variables = array(
+    $variables = [
       '@site-name' => $this->config('system.site')->get('name'),
       '@subject' => $message['subject[0][value]'],
       '@recipient-name' => $this->contactUser->getDisplayName(),
-    );
+    ];
     $subject = PlainTextOutput::renderFromHtml(t('[@site-name] @subject', $variables));
     $this->assertEqual($mail['subject'], $subject, 'Subject is in sent message.');
     $this->assertTrue(strpos($mail['body'], 'Hello ' . $variables['@recipient-name']) !== FALSE, 'Recipient name is in sent message.');
@@ -90,11 +95,11 @@ class ContactPersonalTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
     // Verify that the correct watchdog message has been logged.
     $this->drupalGet('/admin/reports/dblog');
-    $placeholders = array(
+    $placeholders = [
       '@sender_name' => $this->webUser->username,
       '@sender_email' => $this->webUser->getEmail(),
       '@recipient_name' => $this->contactUser->getUsername()
-    );
+    ];
     $this->assertRaw(SafeMarkup::format('@sender_name (@sender_email) sent @recipient_name an email.', $placeholders));
     // Ensure an unescaped version of the email does not exist anywhere.
     $this->assertNoRaw($this->webUser->getEmail());
@@ -103,13 +108,13 @@ class ContactPersonalTest extends WebTestBase {
   /**
    * Tests access to the personal contact form.
    */
-  function testPersonalContactAccess() {
+  public function testPersonalContactAccess() {
     // Test allowed access to admin user's contact form.
     $this->drupalLogin($this->webUser);
     $this->drupalGet('user/' . $this->adminUser->id() . '/contact');
     $this->assertResponse(200);
     // Check the page title is properly displayed.
-    $this->assertRaw(t('Contact @username', array('@username' => $this->adminUser->getDisplayName())));
+    $this->assertRaw(t('Contact @username', ['@username' => $this->adminUser->getDisplayName()]));
 
     // Test denied access to admin user's own contact form.
     $this->drupalLogout();
@@ -149,7 +154,7 @@ class ContactPersonalTest extends WebTestBase {
 
     // Test that anonymous users can access the contact form.
     $this->drupalLogout();
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access user contact forms'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access user contact forms']);
     $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
     $this->assertResponse(200);
 
@@ -159,7 +164,7 @@ class ContactPersonalTest extends WebTestBase {
     $this->assertCacheContext('user');
 
     // Revoke the personal contact permission for the anonymous user.
-    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, array('access user contact forms'));
+    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access user contact forms']);
     $this->drupalGet('user/' . $this->contactUser->id() . '/contact');
     $this->assertResponse(403);
     $this->assertCacheContext('user');
@@ -168,7 +173,7 @@ class ContactPersonalTest extends WebTestBase {
 
     // Disable the personal contact form.
     $this->drupalLogin($this->adminUser);
-    $edit = array('contact_default_status' => FALSE);
+    $edit = ['contact_default_status' => FALSE];
     $this->drupalPostForm('admin/config/people/accounts', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), 'Setting successfully saved.');
     $this->drupalLogout();
@@ -206,7 +211,7 @@ class ContactPersonalTest extends WebTestBase {
     $this->drupalGet('user/' . $this->webUser->id() . '/edit');
     $this->assertNoFieldChecked('edit-contact--2');
     $this->assertFalse(\Drupal::service('user.data')->get('contact', $this->webUser->id(), 'enabled'), 'Personal contact form disabled');
-    $this->drupalPostForm(NULL, array('contact' => TRUE), t('Save'));
+    $this->drupalPostForm(NULL, ['contact' => TRUE], t('Save'));
     $this->assertFieldChecked('edit-contact--2');
     $this->assertTrue(\Drupal::service('user.data')->get('contact', $this->webUser->id(), 'enabled'), 'Personal contact form enabled');
 
@@ -223,7 +228,7 @@ class ContactPersonalTest extends WebTestBase {
   /**
    * Tests the personal contact form flood protection.
    */
-  function testPersonalContactFlood() {
+  public function testPersonalContactFlood() {
     $flood_limit = 3;
     $this->config('contact.settings')->set('flood.limit', $flood_limit)->save();
 
@@ -237,7 +242,7 @@ class ContactPersonalTest extends WebTestBase {
 
     // Submit contact form one over limit.
     $this->submitPersonalContact($this->contactUser);
-    $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', array('%number' => $flood_limit, '@interval' => \Drupal::service('date.formatter')->formatInterval($this->config('contact.settings')->get('flood.interval')))), 'Normal user denied access to flooded contact form.');
+    $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', ['%number' => $flood_limit, '@interval' => \Drupal::service('date.formatter')->formatInterval($this->config('contact.settings')->get('flood.interval'))]), 'Normal user denied access to flooded contact form.');
 
     // Test that the admin user can still access the contact form even though
     // the flood limit was reached.
@@ -248,8 +253,8 @@ class ContactPersonalTest extends WebTestBase {
   /**
    * Tests the personal contact form based access when an admin adds users.
    */
-  function testAdminContact() {
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access user contact forms'));
+  public function testAdminContact() {
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access user contact forms']);
     $this->checkContactAccess(200);
     $this->checkContactAccess(403, FALSE);
     $config = $this->config('contact.settings');
@@ -276,13 +281,13 @@ class ContactPersonalTest extends WebTestBase {
       $this->assertNoFieldChecked('edit-contact--2');
     }
     $name = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'name' => $name,
       'mail' => $this->randomMachineName() . '@example.com',
       'pass[pass1]' => $pass = $this->randomString(),
       'pass[pass2]' => $pass,
       'notify' => FALSE,
-    );
+    ];
     if (isset($contact_value)) {
       $edit['contact'] = $contact_value;
     }
@@ -306,11 +311,11 @@ class ContactPersonalTest extends WebTestBase {
    * @return array
    *   An array with the form fields being used.
    */
-  protected function submitPersonalContact(AccountInterface $account, array $message = array()) {
-    $message += array(
+  protected function submitPersonalContact(AccountInterface $account, array $message = []) {
+    $message += [
       'subject[0][value]' => $this->randomMachineName(16),
       'message[0][value]' => $this->randomMachineName(64),
-    );
+    ];
     $this->drupalPostForm('user/' . $account->id() . '/contact', $message, t('Send message'));
     return $message;
   }
diff --git a/web/core/modules/contact/src/Tests/ContactSitewideTest.php b/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
similarity index 77%
rename from web/core/modules/contact/src/Tests/ContactSitewideTest.php
rename to web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
index ffc2e9091..5b9740536 100644
--- a/web/core/modules/contact/src/Tests/ContactSitewideTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
@@ -1,26 +1,27 @@
 <?php
 
-namespace Drupal\contact\Tests;
+namespace Drupal\Tests\contact\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\contact\Entity\ContactForm;
 use Drupal\Core\Mail\MailFormatHelper;
-use Drupal\Core\Url;
+use Drupal\Core\Test\AssertMailTrait;
 use Drupal\field_ui\Tests\FieldUiTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\user\RoleInterface;
 
 /**
  * Tests site-wide contact form functionality.
  *
- * @see \Drupal\contact\Tests\ContactStorageTest
+ * @see \Drupal\Tests\contact\Functional\ContactStorageTest
  *
  * @group contact
  */
-class ContactSitewideTest extends WebTestBase {
+class ContactSitewideTest extends BrowserTestBase {
 
   use FieldUiTestTrait;
+  use AssertMailTrait;
 
   /**
    * Modules to enable.
@@ -42,13 +43,14 @@ class ContactSitewideTest extends WebTestBase {
   /**
    * Tests configuration options and the site-wide contact form.
    */
-  function testSiteWideContact() {
+  public function testSiteWideContact() {
     // Create and log in administrative user.
     $admin_user = $this->drupalCreateUser([
       'access site-wide contact form',
       'administer contact forms',
       'administer users',
       'administer account settings',
+      'administer contact_message display',
       'administer contact_message fields',
       'administer contact_message form display',
     ]);
@@ -65,7 +67,7 @@ class ContactSitewideTest extends WebTestBase {
       ->save();
 
     // Set settings.
-    $edit = array();
+    $edit = [];
     $edit['contact_default_status'] = TRUE;
     $this->drupalPostForm('admin/config/people/accounts', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));
@@ -77,11 +79,11 @@ class ContactSitewideTest extends WebTestBase {
     // Cannot use ::assertNoLinkByHref as it does partial url matching and with
     // field_ui enabled admin/structure/contact/manage/personal/fields exists.
     // @todo: See https://www.drupal.org/node/2031223 for the above.
-    $edit_link = $this->xpath('//a[@href=:href]', array(
-      ':href' => \Drupal::url('entity.contact_form.edit_form', array('contact_form' => 'personal'))
-    ));
+    $edit_link = $this->xpath('//a[@href=:href]', [
+      ':href' => \Drupal::url('entity.contact_form.edit_form', ['contact_form' => 'personal'])
+    ]);
     $this->assertTrue(empty($edit_link), format_string('No link containing href %href found.',
-      array('%href' => 'admin/structure/contact/manage/personal')
+      ['%href' => 'admin/structure/contact/manage/personal']
     ));
     $this->assertNoLinkByHref('admin/structure/contact/manage/personal/delete');
 
@@ -95,7 +97,7 @@ class ContactSitewideTest extends WebTestBase {
     $this->assertNoLinkByHref('admin/structure/contact/manage/feedback');
 
     // Ensure that the contact form won't be shown without forms.
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access site-wide contact form'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
     $this->drupalLogout();
     $this->drupalGet('contact');
     $this->assertResponse(404);
@@ -110,10 +112,10 @@ class ContactSitewideTest extends WebTestBase {
 
     // Add forms.
     // Test invalid recipients.
-    $invalid_recipients = array('invalid', 'invalid@', 'invalid@site.', '@site.', '@site.com');
+    $invalid_recipients = ['invalid', 'invalid@', 'invalid@site.', '@site.', '@site.com'];
     foreach ($invalid_recipients as $invalid_recipient) {
       $this->addContactForm($this->randomMachineName(16), $this->randomMachineName(16), $invalid_recipient, '', FALSE);
-      $this->assertRaw(t('%recipient is an invalid email address.', array('%recipient' => $invalid_recipient)));
+      $this->assertRaw(t('%recipient is an invalid email address.', ['%recipient' => $invalid_recipient]));
     }
 
     // Test validation of empty form and recipients fields.
@@ -123,24 +125,24 @@ class ContactSitewideTest extends WebTestBase {
     $this->assertText(t('Recipients field is required.'));
 
     // Test validation of max_length machine name.
-    $recipients = array('simpletest&@example.com', 'simpletest2@example.com', 'simpletest3@example.com');
+    $recipients = ['simpletest&@example.com', 'simpletest2@example.com', 'simpletest3@example.com'];
     $max_length = EntityTypeInterface::BUNDLE_MAX_LENGTH;
     $max_length_exceeded = $max_length + 1;
-    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName($max_length_exceeded)), $label = $this->randomMachineName($max_length_exceeded), implode(',', array($recipients[0])), '', TRUE);
-    $this->assertText(format_string('Machine-readable name cannot be longer than @max characters but is currently @exceeded characters long.', array('@max' => $max_length, '@exceeded' => $max_length_exceeded)));
-    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName($max_length)), $label = $this->randomMachineName($max_length), implode(',', array($recipients[0])), '', TRUE);
-    $this->assertText(t('Contact form @label has been added.', array('@label' => $label)));
+    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName($max_length_exceeded)), $label = $this->randomMachineName($max_length_exceeded), implode(',', [$recipients[0]]), '', TRUE);
+    $this->assertText(format_string('Machine-readable name cannot be longer than @max characters but is currently @exceeded characters long.', ['@max' => $max_length, '@exceeded' => $max_length_exceeded]));
+    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName($max_length)), $label = $this->randomMachineName($max_length), implode(',', [$recipients[0]]), '', TRUE);
+    $this->assertText(t('Contact form @label has been added.', ['@label' => $label]));
 
     // Verify that the creation message contains a link to a contact form.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'contact/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'contact/']);
     $this->assert(isset($view_link), 'The message area contains a link to a contact form.');
 
     // Create first valid form.
-    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', array($recipients[0])), '', TRUE);
-    $this->assertText(t('Contact form @label has been added.', array('@label' => $label)));
+    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', [$recipients[0]]), '', TRUE);
+    $this->assertText(t('Contact form @label has been added.', ['@label' => $label]));
 
     // Verify that the creation message contains a link to a contact form.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'contact/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'contact/']);
     $this->assert(isset($view_link), 'The message area contains a link to a contact form.');
 
     // Check that the form was created in site default language.
@@ -156,13 +158,13 @@ class ContactSitewideTest extends WebTestBase {
     $this->assertEscaped($recipients[0]);
 
     // Test update contact form.
-    $this->updateContactForm($id, $label = $this->randomMachineName(16), $recipients_str = implode(',', array($recipients[0], $recipients[1])), $reply = $this->randomMachineName(30), FALSE, 'Your message has been sent.', '/user');
+    $this->updateContactForm($id, $label = $this->randomMachineName(16), $recipients_str = implode(',', [$recipients[0], $recipients[1]]), $reply = $this->randomMachineName(30), FALSE, 'Your message has been sent.', '/user');
     $config = $this->config('contact.form.' . $id)->get();
     $this->assertEqual($config['label'], $label);
-    $this->assertEqual($config['recipients'], array($recipients[0], $recipients[1]));
+    $this->assertEqual($config['recipients'], [$recipients[0], $recipients[1]]);
     $this->assertEqual($config['reply'], $reply);
     $this->assertNotEqual($id, $this->config('contact.settings')->get('default_form'));
-    $this->assertText(t('Contact form @label has been updated.', array('@label' => $label)));
+    $this->assertText(t('Contact form @label has been updated.', ['@label' => $label]));
     // Ensure the label is displayed on the contact page for this form.
     $this->drupalGet('contact/' . $id);
     $this->assertText($label);
@@ -171,7 +173,7 @@ class ContactSitewideTest extends WebTestBase {
     $this->config('contact.settings')->set('default_form', $id)->save();
 
     // Ensure that the contact form is shown without a form selection input.
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access site-wide contact form'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
     $this->drupalLogout();
     $this->drupalGet('contact');
     $this->assertText(t('Your email address'));
@@ -179,26 +181,26 @@ class ContactSitewideTest extends WebTestBase {
     $this->drupalLogin($admin_user);
 
     // Add more forms.
-    $this->addContactForm(Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', array($recipients[0], $recipients[1])), '', FALSE);
-    $this->assertText(t('Contact form @label has been added.', array('@label' => $label)));
+    $this->addContactForm(Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', [$recipients[0], $recipients[1]]), '', FALSE);
+    $this->assertText(t('Contact form @label has been added.', ['@label' => $label]));
 
-    $this->addContactForm($name = Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', array($recipients[0], $recipients[1], $recipients[2])), '', FALSE);
-    $this->assertText(t('Contact form @label has been added.', array('@label' => $label)));
+    $this->addContactForm($name = Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', [$recipients[0], $recipients[1], $recipients[2]]), '', FALSE);
+    $this->assertText(t('Contact form @label has been added.', ['@label' => $label]));
 
     // Try adding a form that already exists.
     $this->addContactForm($name, $label, '', '', FALSE);
-    $this->assertNoText(t('Contact form @label has been added.', array('@label' => $label)));
+    $this->assertNoText(t('Contact form @label has been added.', ['@label' => $label]));
     $this->assertRaw(t('The machine-readable name is already in use. It must be unique.'));
 
     $this->drupalLogout();
 
     // Check to see that anonymous user cannot see contact page without permission.
-    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, array('access site-wide contact form'));
+    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
     $this->drupalGet('contact');
     $this->assertResponse(403);
 
     // Give anonymous user permission and see that page is viewable.
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access site-wide contact form'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
     $this->drupalGet('contact');
     $this->assertResponse(200);
 
@@ -210,7 +212,7 @@ class ContactSitewideTest extends WebTestBase {
     $this->assertText(t('Your email address field is required.'));
 
     $this->submitContact($this->randomMachineName(16), $invalid_recipients[0], $this->randomMachineName(16), $id, $this->randomMachineName(64));
-    $this->assertRaw(t('The email address %mail is not valid.', array('%mail' => 'invalid')));
+    $this->assertRaw(t('The email address %mail is not valid.', ['%mail' => 'invalid']));
 
     $this->submitContact($this->randomMachineName(16), $recipients[0], '', $id, $this->randomMachineName(64));
     $this->assertText(t('Subject field is required.'));
@@ -238,7 +240,7 @@ class ContactSitewideTest extends WebTestBase {
     }
     // Submit contact form one over limit.
     $this->submitContact($this->randomMachineName(16), $recipients[0], $this->randomMachineName(16), $id, $this->randomMachineName(64));
-    $this->assertRaw(t('You cannot send more than %number messages in 10 min. Try again later.', array('%number' => $this->config('contact.settings')->get('flood.limit'))));
+    $this->assertRaw(t('You cannot send more than %number messages in 10 min. Try again later.', ['%number' => $this->config('contact.settings')->get('flood.limit')]));
 
     // Test listing controller.
     $this->drupalLogin($admin_user);
@@ -246,7 +248,7 @@ class ContactSitewideTest extends WebTestBase {
     $this->deleteContactForms();
 
     $label = $this->randomMachineName(16);
-    $recipients = implode(',', array($recipients[0], $recipients[1], $recipients[2]));
+    $recipients = implode(',', [$recipients[0], $recipients[1], $recipients[2]]);
     $contact_form = Unicode::strtolower($this->randomMachineName(16));
     $this->addContactForm($contact_form, $label, $recipients, '', FALSE);
     $this->drupalGet('admin/structure/contact');
@@ -265,15 +267,13 @@ class ContactSitewideTest extends WebTestBase {
     $this->assertTrue(!empty($view_link), 'Contact listing links to contact form.');
 
     // Find out in which row the form we want to add a field to is.
-    $i = 0;
     foreach ($this->xpath('//table/tbody/tr') as $row) {
-      if (((string) $row->td[0]->a) == $label) {
+      if ($row->findLink($label)) {
+        $row->clickLink('Manage fields');
         break;
       }
-      $i++;
     }
 
-    $this->clickLink(t('Manage fields'), $i);
     $this->assertResponse(200);
     $this->clickLink(t('Add field'));
     $this->assertResponse(200);
@@ -293,15 +293,15 @@ class ContactSitewideTest extends WebTestBase {
     $this->assertText($field_label);
 
     // Submit the contact form and verify the content.
-    $edit = array(
+    $edit = [
       'subject[0][value]' => $this->randomMachineName(),
       'message[0][value]' => $this->randomMachineName(),
       $field_name . '[0][value]' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Send message'));
-    $mails = $this->drupalGetMails();
+    $mails = $this->getMails();
     $mail = array_pop($mails);
-    $this->assertEqual($mail['subject'], t('[@label] @subject', array('@label' => $label, '@subject' => $edit['subject[0][value]'])));
+    $this->assertEqual($mail['subject'], t('[@label] @subject', ['@label' => $label, '@subject' => $edit['subject[0][value]']]));
     $this->assertTrue(strpos($mail['body'], $field_label));
     $this->assertTrue(strpos($mail['body'], $edit[$field_name . '[0][value]']));
 
@@ -315,11 +315,11 @@ class ContactSitewideTest extends WebTestBase {
     $this->drupalGet('contact/' . $contact_form);
 
     // Submit the contact form and verify the content.
-    $edit = array(
+    $edit = [
       'subject[0][value]' => $this->randomMachineName(),
       'message[0][value]' => $this->randomMachineName(),
       $field_name . '[0][value]' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Send message'));
     $this->assertText('Thanks for your submission.');
     $this->assertUrl('user/' . $admin_user->id());
@@ -335,21 +335,50 @@ class ContactSitewideTest extends WebTestBase {
     $this->drupalGet('contact/' . $contact_form);
 
     // Submit the contact form and verify the content.
-    $edit = array(
+    $edit = [
       'subject[0][value]' => $this->randomMachineName(),
       'message[0][value]' => $this->randomMachineName(),
       $field_name . '[0][value]' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Send message'));
-    $result = $this->xpath('//div[@role=:role]', array(':role' => 'contentinfo'));
+    $result = $this->xpath('//div[@role=:role]', [':role' => 'contentinfo']);
     $this->assertEqual(count($result), 0, 'Messages not found.');
     $this->assertUrl('user/' . $admin_user->id());
+
+    // Test preview and visibility of the message field and label. Submit the
+    // contact form and verify the content.
+    $edit = [
+      'subject[0][value]' => $this->randomMachineName(),
+      'message[0][value]' => $this->randomMachineName(),
+      $field_name . '[0][value]' => $this->randomMachineName(),
+    ];
+    $this->drupalPostForm($form->toUrl('canonical'), $edit, t('Preview'));
+
+    // Message is now by default displayed twice, once for the form element and
+    // once for the viewed message.
+    $page_text = $this->getSession()->getPage()->getText();
+    $this->assertGreaterThan(1, substr_count($page_text, t('Message')));
+    $this->assertSession()->responseContains('class="field field--name-message field--type-string-long field--label-above');
+    $this->assertSession()->pageTextContains($edit['message[0][value]']);
+
+    // Hide the message field label.
+    $display_edit = [
+      'fields[message][label]' => 'hidden',
+    ];
+    $this->drupalPostForm('admin/structure/contact/manage/' . $contact_form . '/display', $display_edit, t('Save'));
+
+    $this->drupalPostForm($form->toUrl('canonical'), $edit, t('Preview'));
+    // Message should only be displayed once now.
+    $page_text = $this->getSession()->getPage()->getText();
+    $this->assertEquals(1, substr_count($page_text, t('Message')));
+    $this->assertSession()->responseContains('class="field field--name-message field--type-string-long field--label-hidden field__item">');
+    $this->assertSession()->pageTextContains($edit['message[0][value]']);
   }
 
   /**
    * Tests auto-reply on the site-wide contact form.
    */
-  function testAutoReply() {
+  public function testAutoReply() {
     // Create and log in administrative user.
     $admin_user = $this->drupalCreateUser([
       'access site-wide contact form',
@@ -369,7 +398,7 @@ class ContactSitewideTest extends WebTestBase {
 
     // Log the current user out in order to test the name and email fields.
     $this->drupalLogout();
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access site-wide contact form'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
 
     // Test the auto-reply for form 'foo'.
     $email = $this->randomMachineName(32) . '@example.com';
@@ -377,7 +406,7 @@ class ContactSitewideTest extends WebTestBase {
     $this->submitContact($this->randomMachineName(16), $email, $subject, 'foo', $this->randomString(128));
 
     // We are testing the auto-reply, so there should be one email going to the sender.
-    $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email));
+    $captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
     $this->assertEqual(count($captured_emails), 1);
     $this->assertEqual(trim($captured_emails[0]['body']), trim(MailFormatHelper::htmlToText($foo_autoreply)));
 
@@ -386,14 +415,14 @@ class ContactSitewideTest extends WebTestBase {
     $this->submitContact($this->randomMachineName(16), $email, $this->randomString(64), 'bar', $this->randomString(128));
 
     // Auto-reply for form 'bar' should result in one auto-reply email to the sender.
-    $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email));
+    $captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
     $this->assertEqual(count($captured_emails), 1);
     $this->assertEqual(trim($captured_emails[0]['body']), trim(MailFormatHelper::htmlToText($bar_autoreply)));
 
     // Verify that no auto-reply is sent when the auto-reply field is left blank.
     $email = $this->randomMachineName(32) . '@example.com';
     $this->submitContact($this->randomMachineName(16), $email, $this->randomString(64), 'no_autoreply', $this->randomString(128));
-    $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email));
+    $captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
     $this->assertEqual(count($captured_emails), 0);
 
     // Verify that the current error message doesn't show, that the auto-reply
@@ -404,7 +433,7 @@ class ContactSitewideTest extends WebTestBase {
       ->save();
     $this->submitContact($this->randomMachineName(16), $email, $this->randomString(64), 'foo', $this->randomString(128));
     $this->assertNoText('Unable to send email. Contact the site administrator if the problem persists.');
-    $captured_emails = $this->drupalGetMails(['id' => 'contact_page_autoreply', 'to' => $email]);
+    $captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
     $this->assertEqual(count($captured_emails), 0);
     $this->drupalLogin($admin_user);
     $this->drupalGet('admin/reports/dblog');
@@ -431,8 +460,8 @@ class ContactSitewideTest extends WebTestBase {
    * @param array $third_party_settings
    *   Array of third party settings to be added to the posted form data.
    */
-  function addContactForm($id, $label, $recipients, $reply, $selected, $message = 'Your message has been sent.', $third_party_settings = []) {
-    $edit = array();
+  public function addContactForm($id, $label, $recipients, $reply, $selected, $message = 'Your message has been sent.', $third_party_settings = []) {
+    $edit = [];
     $edit['label'] = $label;
     $edit['id'] = $id;
     $edit['message'] = $message;
@@ -463,8 +492,8 @@ class ContactSitewideTest extends WebTestBase {
    * @param string $redirect
    *   The path where user will be redirect after this form has been submitted..
    */
-  function updateContactForm($id, $label, $recipients, $reply, $selected, $message = 'Your message has been sent.', $redirect = '/') {
-    $edit = array();
+  public function updateContactForm($id, $label, $recipients, $reply, $selected, $message = 'Your message has been sent.', $redirect = '/') {
+    $edit = [];
     $edit['label'] = $label;
     $edit['recipients'] = $recipients;
     $edit['reply'] = $reply;
@@ -488,8 +517,8 @@ class ContactSitewideTest extends WebTestBase {
    * @param string $message
    *   The message body.
    */
-  function submitContact($name, $mail, $subject, $id, $message) {
-    $edit = array();
+  public function submitContact($name, $mail, $subject, $id, $message) {
+    $edit = [];
     $edit['name'] = $name;
     $edit['mail'] = $mail;
     $edit['subject[0][value]'] = $subject;
@@ -505,7 +534,7 @@ class ContactSitewideTest extends WebTestBase {
   /**
    * Deletes all forms.
    */
-  function deleteContactForms() {
+  public function deleteContactForms() {
     $contact_forms = ContactForm::loadMultiple();;
     foreach ($contact_forms as $id => $contact_form) {
       if ($id == 'personal') {
@@ -514,9 +543,9 @@ class ContactSitewideTest extends WebTestBase {
         $this->assertResponse(403);
       }
       else {
-        $this->drupalPostForm("admin/structure/contact/manage/$id/delete", array(), t('Delete'));
-        $this->assertRaw(t('The contact form %label has been deleted.', array('%label' => $contact_form->label())));
-        $this->assertFalse(ContactForm::load($id), format_string('Form %contact_form not found', array('%contact_form' => $contact_form->label())));
+        $this->drupalPostForm("admin/structure/contact/manage/$id/delete", [], t('Delete'));
+        $this->assertRaw(t('The contact form %label has been deleted.', ['%label' => $contact_form->label()]));
+        $this->assertFalse(ContactForm::load($id), format_string('Form %contact_form not found', ['%contact_form' => $contact_form->label()]));
       }
     }
   }
diff --git a/web/core/modules/contact/src/Tests/ContactStorageTest.php b/web/core/modules/contact/tests/src/Functional/ContactStorageTest.php
similarity index 87%
rename from web/core/modules/contact/src/Tests/ContactStorageTest.php
rename to web/core/modules/contact/tests/src/Functional/ContactStorageTest.php
index ad0e8d46c..acacab418 100644
--- a/web/core/modules/contact/src/Tests/ContactStorageTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactStorageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\contact\Tests;
+namespace Drupal\Tests\contact\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\contact\Entity\Message;
@@ -37,23 +37,23 @@ class ContactStorageTest extends ContactSitewideTest {
    */
   public function testContactStorage() {
     // Create and log in administrative user.
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'access site-wide contact form',
       'administer contact forms',
       'administer users',
       'administer account settings',
       'administer contact_message fields',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
     // Create first valid contact form.
     $mail = 'simpletest@example.com';
-    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', array($mail)), '', TRUE, 'Your message has been sent.', [
+    $this->addContactForm($id = Unicode::strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', [$mail]), '', TRUE, 'Your message has been sent.', [
       'send_a_pony' => 1,
     ]);
-    $this->assertText(t('Contact form @label has been added.', array('@label' => $label)));
+    $this->assertText(t('Contact form @label has been added.', ['@label' => $label]));
 
     // Ensure that anonymous can submit site-wide contact form.
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access site-wide contact form'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
     $this->drupalLogout();
     $this->drupalGet('contact');
     $this->assertText(t('Your email address'));
diff --git a/web/core/modules/contact/tests/src/Kernel/MessageEntityTest.php b/web/core/modules/contact/tests/src/Kernel/MessageEntityTest.php
index 70ddea194..e7343b916 100644
--- a/web/core/modules/contact/tests/src/Kernel/MessageEntityTest.php
+++ b/web/core/modules/contact/tests/src/Kernel/MessageEntityTest.php
@@ -17,17 +17,17 @@ class MessageEntityTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'system',
     'contact',
     'field',
     'user',
     'contact_test',
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('contact', 'contact_test'));
+    $this->installConfig(['contact', 'contact_test']);
   }
 
   /**
@@ -35,7 +35,7 @@ class MessageEntityTest extends EntityKernelTestBase {
    */
   public function testMessageMethods() {
     $message_storage = $this->container->get('entity.manager')->getStorage('contact_message');
-    $message = $message_storage->create(array('contact_form' => 'feedback'));
+    $message = $message_storage->create(['contact_form' => 'feedback']);
 
     // Check for empty values first.
     $this->assertEqual($message->getMessage(), '');
diff --git a/web/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php b/web/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
index 291826c56..ffadad409 100644
--- a/web/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
+++ b/web/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
@@ -18,7 +18,7 @@ class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
    *
    * @var array
    */
-  public static $modules = array('contact');
+  public static $modules = ['contact'];
 
   /**
    * {@inheritdoc}
@@ -59,6 +59,26 @@ class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
     $this->assertEntity('website_feedback', 'Website feedback', ['admin@example.com'], '', 0);
     $this->assertEntity('some_other_category', 'Some other category', ['test@example.com'], 'Thanks for contacting us, we will reply ASAP!', 1);
     $this->assertEntity('a_category_much_longer_than_thir', 'A category much longer than thirty two characters', ['fortyninechars@example.com'], '', 2);
+
+    // Test there are no duplicated roles.
+    $contact_forms = [
+      'website_feedback1',
+      'some_other_category1',
+      'a_category_much_longer_than_thir1',
+    ];
+    $this->assertEmpty(ContactForm::loadMultiple($contact_forms));
+
+    /*
+     * Remove the map row for the Website feedback contact form so that it
+     * can be migrated again.
+     */
+    $id_map = $this->getMigration('contact_category')->getIdMap();
+    $id_map->delete(['cid' => '1']);
+    $this->executeMigration('contact_category');
+
+    // Test there is a duplicate Website feedback form.
+    $contact_form = ContactForm::load('website_feedback1');
+    $this->assertEntity('website_feedback1', 'Website feedback', ['admin@example.com'], '', 0);
   }
 
 }
diff --git a/web/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactCategoryTest.php b/web/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactCategoryTest.php
deleted file mode 100644
index e40f0bdd4..000000000
--- a/web/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactCategoryTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\Tests\contact\Kernel\Migrate\d6;
-
-use Drupal\contact\Entity\ContactForm;
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Migrate contact categories to contact.form.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['contact'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('contact_category');
-  }
-
-  /**
-   * The Drupal 6 contact categories to Drupal 8 migration.
-   */
-  public function testContactCategory() {
-    /** @var \Drupal\contact\Entity\ContactForm $contact_form */
-    $contact_form = ContactForm::load('website_feedback');
-    $this->assertIdentical('Website feedback', $contact_form->label());
-    $this->assertIdentical(array('admin@example.com'), $contact_form->getRecipients());
-    $this->assertIdentical('', $contact_form->getReply());
-    $this->assertIdentical(0, $contact_form->getWeight());
-
-    $contact_form = ContactForm::load('some_other_category');
-    $this->assertIdentical('Some other category', $contact_form->label());
-    $this->assertIdentical(array('test@example.com'), $contact_form->getRecipients());
-    $this->assertIdentical('Thanks for contacting us, we will reply ASAP!', $contact_form->getReply());
-    $this->assertIdentical(1, $contact_form->getWeight());
-
-    $contact_form = ContactForm::load('a_category_much_longer_than_thir');
-    $this->assertIdentical('A category much longer than thirty two characters', $contact_form->label());
-    $this->assertIdentical(array('fortyninechars@example.com'), $contact_form->getRecipients());
-    $this->assertIdentical('', $contact_form->getReply());
-    $this->assertIdentical(2, $contact_form->getWeight());
-
-    // Test there are no duplicated roles.
-    $contact_forms = [
-      'website_feedback1',
-      'some_other_category1',
-      'a_category_much_longer_than_thir1',
-    ];
-    $this->assertEmpty(ContactForm::loadMultiple($contact_forms));
-
-    /*
-     * Remove the map row for the Website feedback contact form so that it
-     * can be migrated again.
-     */
-    $id_map = $this->getMigration('contact_category')->getIdMap();
-    $id_map->delete(['cid' => '1']);
-    $this->executeMigration('contact_category');
-
-    // Test there is a duplicate Website feedback form.
-    $contact_form = ContactForm::load('website_feedback1');
-    $this->assertSame('Website feedback', $contact_form->label());
-    $this->assertSame(array('admin@example.com'), $contact_form->getRecipients());
-    $this->assertSame('', $contact_form->getReply());
-    $this->assertSame(0, $contact_form->getWeight());
-  }
-
-}
diff --git a/web/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php b/web/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php
index 9efaae93e..073a67028 100644
--- a/web/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php
+++ b/web/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\contact\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
diff --git a/web/core/modules/contact/tests/src/Unit/MailHandlerTest.php b/web/core/modules/contact/tests/src/Unit/MailHandlerTest.php
index 9e5c82c0c..898ea226c 100644
--- a/web/core/modules/contact/tests/src/Unit/MailHandlerTest.php
+++ b/web/core/modules/contact/tests/src/Unit/MailHandlerTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\contact\Unit;
 
 use Drupal\contact\MailHandler;
+use Drupal\contact\MailHandlerException;
 use Drupal\contact\MessageInterface;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Session\AccountInterface;
@@ -80,7 +81,7 @@ class MailHandlerTest extends UnitTestCase {
 
     $string_translation = $this->getStringTranslationStub();
     $this->contactMailHandler = new MailHandler($this->mailManager, $this->languageManager, $this->logger, $string_translation, $this->entityManager);
-    $language = new Language(array('id' => 'en'));
+    $language = new Language(['id' => 'en']);
 
     $this->languageManager->expects($this->any())
       ->method('getDefaultLanguage')
@@ -94,9 +95,6 @@ class MailHandlerTest extends UnitTestCase {
   /**
    * Tests the children() method with an invalid key.
    *
-   * @expectedException \Drupal\contact\MailHandlerException
-   * @expectedExceptionMessage Unable to determine message recipient
-   *
    * @covers ::sendMailMessages
    */
   public function testInvalidRecipient() {
@@ -121,6 +119,7 @@ class MailHandlerTest extends UnitTestCase {
     $sender->expects($this->once())
       ->method('isAnonymous')
       ->willReturn(FALSE);
+    $this->setExpectedException(MailHandlerException::class, 'Unable to determine message recipient');
     $this->contactMailHandler->sendMailMessages($message, $sender);
   }
 
@@ -156,76 +155,76 @@ class MailHandlerTest extends UnitTestCase {
    * Data provider for ::testSendMailMessages.
    */
   public function getSendMailMessages() {
-    $data = array();
-    $recipients = array('admin@drupal.org', 'user@drupal.org');
-    $default_result = array(
+    $data = [];
+    $recipients = ['admin@drupal.org', 'user@drupal.org'];
+    $default_result = [
       'module' => 'contact',
       'key' => '',
       'to' => implode(', ', $recipients),
       'langcode' => 'en',
-      'params' => array(),
+      'params' => [],
       'from' => 'anonymous@drupal.org',
-    );
-    $results = array();
+    ];
+    $results = [];
     $message = $this->getAnonymousMockMessage($recipients, '');
     $sender = $this->getMockSender();
-    $result = array(
+    $result = [
       'key' => 'page_mail',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'contact_form' => $message->getContactForm(),
-      ),
-    );
+      ],
+    ];
     $results[] = $result + $default_result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
-    $results = array();
+    $results = [];
     $message = $this->getAnonymousMockMessage($recipients, 'reply');
     $sender = $this->getMockSender();
-    $result = array(
+    $result = [
       'key' => 'page_mail',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'contact_form' => $message->getContactForm(),
-      ),
-    );
+      ],
+    ];
     $results[] = $result + $default_result;
     $result['key'] = 'page_autoreply';
     $result['to'] = 'anonymous@drupal.org';
     $result['from'] = NULL;
     $results[] = $result + $default_result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
-    $results = array();
+    $results = [];
     $message = $this->getAnonymousMockMessage($recipients, '', TRUE);
     $sender = $this->getMockSender();
-    $result = array(
+    $result = [
       'key' => 'page_mail',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'contact_form' => $message->getContactForm(),
-      ),
-    );
+      ],
+    ];
     $results[] = $result + $default_result;
     $result['key'] = 'page_copy';
     $result['to'] = 'anonymous@drupal.org';
     $results[] = $result + $default_result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
-    $results = array();
+    $results = [];
     $message = $this->getAnonymousMockMessage($recipients, 'reply', TRUE);
     $sender = $this->getMockSender();
-    $result = array(
+    $result = [
       'key' => 'page_mail',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'contact_form' => $message->getContactForm(),
-      ),
-    );
+      ],
+    ];
     $results[] = $result + $default_result;
     $result['key'] = 'page_copy';
     $result['to'] = 'anonymous@drupal.org';
@@ -233,48 +232,48 @@ class MailHandlerTest extends UnitTestCase {
     $result['key'] = 'page_autoreply';
     $result['from'] = NULL;
     $results[] = $result + $default_result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
     //For authenticated user.
-    $results = array();
+    $results = [];
     $message = $this->getAuthenticatedMockMessage();
     $sender = $this->getMockSender(FALSE, 'user@drupal.org');
-    $result = array(
+    $result = [
       'module' => 'contact',
       'key' => 'user_mail',
       'to' => 'user2@drupal.org',
       'langcode' => 'en',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'recipient' => $message->getPersonalRecipient(),
-      ),
+      ],
       'from' => 'user@drupal.org',
-    );
+    ];
     $results[] = $result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
-    $results = array();
+    $results = [];
     $message = $this->getAuthenticatedMockMessage(TRUE);
     $sender = $this->getMockSender(FALSE, 'user@drupal.org');
-    $result = array(
+    $result = [
       'module' => 'contact',
       'key' => 'user_mail',
       'to' => 'user2@drupal.org',
       'langcode' => 'en',
-      'params' => array(
+      'params' => [
         'contact_message' => $message,
         'sender' => $sender,
         'recipient' => $message->getPersonalRecipient(),
-      ),
+      ],
       'from' => 'user@drupal.org',
-    );
+    ];
     $results[] = $result;
 
     $result['key'] = 'user_copy';
     $result['to'] = $result['from'];
     $results[] = $result;
-    $data[] = array($message, $sender, $results);
+    $data[] = [$message, $sender, $results];
 
     return $data;
   }
diff --git a/web/core/modules/content_moderation/config/install/content_moderation.state.archived.yml b/web/core/modules/content_moderation/config/install/content_moderation.state.archived.yml
deleted file mode 100644
index 02794819c..000000000
--- a/web/core/modules/content_moderation/config/install/content_moderation.state.archived.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: archived
-label: Archived
-published: false
-default_revision: true
-weight: -8
diff --git a/web/core/modules/content_moderation/config/install/content_moderation.state.draft.yml b/web/core/modules/content_moderation/config/install/content_moderation.state.draft.yml
deleted file mode 100644
index c7eb64c6c..000000000
--- a/web/core/modules/content_moderation/config/install/content_moderation.state.draft.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: draft
-label: Draft
-published: false
-default_revision: false
-weight: -10
diff --git a/web/core/modules/content_moderation/config/install/content_moderation.state.published.yml b/web/core/modules/content_moderation/config/install/content_moderation.state.published.yml
deleted file mode 100644
index 8467e86c0..000000000
--- a/web/core/modules/content_moderation/config/install/content_moderation.state.published.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: published
-label: Published
-published: true
-default_revision: true
-weight: -9
diff --git a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.archived_draft.yml b/web/core/modules/content_moderation/config/install/content_moderation.state_transition.archived_draft.yml
deleted file mode 100644
index 8fbf9c3df..000000000
--- a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.archived_draft.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.archived
-    - content_moderation.state.draft
-id: archived_draft
-label: 'Un-archive to Draft'
-stateFrom: archived
-stateTo: draft
-weight: -5
diff --git a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.archived_published.yml b/web/core/modules/content_moderation/config/install/content_moderation.state_transition.archived_published.yml
deleted file mode 100644
index 4be7600aa..000000000
--- a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.archived_published.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.archived
-    - content_moderation.state.published
-id: archived_published
-label: 'Un-archive'
-stateFrom: archived
-stateTo: published
-weight: -4
diff --git a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_draft.yml b/web/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_draft.yml
deleted file mode 100644
index 0ba0f3470..000000000
--- a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_draft.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.draft
-id: draft_draft
-label: 'Create New Draft'
-stateFrom: draft
-stateTo: draft
-weight: -10
diff --git a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_published.yml b/web/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_published.yml
deleted file mode 100644
index cf95d3dab..000000000
--- a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.draft_published.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.draft
-    - content_moderation.state.published
-id: draft_published
-label: 'Publish'
-stateFrom: draft
-stateTo: published
-weight: -9
diff --git a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.published_archived.yml b/web/core/modules/content_moderation/config/install/content_moderation.state_transition.published_archived.yml
deleted file mode 100644
index f3a866a6a..000000000
--- a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.published_archived.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.archived
-    - content_moderation.state.published
-id: published_archived
-label: 'Archive'
-stateFrom: published
-stateTo: archived
-weight: -6
diff --git a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.published_draft.yml b/web/core/modules/content_moderation/config/install/content_moderation.state_transition.published_draft.yml
deleted file mode 100644
index bd25a31ef..000000000
--- a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.published_draft.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.draft
-    - content_moderation.state.published
-id: published_draft
-label: 'Create New Draft'
-stateFrom: published
-stateTo: draft
-weight: -8
diff --git a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.published_published.yml b/web/core/modules/content_moderation/config/install/content_moderation.state_transition.published_published.yml
deleted file mode 100644
index 3c09a85a0..000000000
--- a/web/core/modules/content_moderation/config/install/content_moderation.state_transition.published_published.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.published
-id: published_published
-label: 'Publish'
-stateFrom: published
-stateTo: published
-weight: -7
diff --git a/web/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml b/web/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
new file mode 100644
index 000000000..d8daa5135
--- /dev/null
+++ b/web/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
@@ -0,0 +1,63 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - content_moderation
+id: editorial
+label: 'Editorial workflow'
+states:
+  archived:
+    label: Archived
+    weight: 5
+  draft:
+    label: Draft
+    weight: -5
+  published:
+    label: Published
+    weight: 0
+transitions:
+  archive:
+    label: Archive
+    from:
+      - published
+    to: archived
+    weight: 2
+  archived_draft:
+    label: 'Restore to Draft'
+    from:
+      - archived
+    to: draft
+    weight: 3
+  archived_published:
+    label: Restore
+    from:
+      - archived
+    to: published
+    weight: 4
+  create_new_draft:
+    label: 'Create New Draft'
+    from:
+      - draft
+      - published
+    to: draft
+    weight: 0
+  publish:
+    label: Publish
+    from:
+      - draft
+      - published
+    to: published
+    weight: 1
+type: content_moderation
+type_settings:
+  states:
+    archived:
+      published: false
+      default_revision: true
+    draft:
+      published: false
+      default_revision: false
+    published:
+      published: true
+      default_revision: true
+  entity_types: {  }
diff --git a/web/core/modules/content_moderation/config/schema/content_moderation.schema.yml b/web/core/modules/content_moderation/config/schema/content_moderation.schema.yml
index 7f9e8fdef..b791b67b8 100644
--- a/web/core/modules/content_moderation/config/schema/content_moderation.schema.yml
+++ b/web/core/modules/content_moderation/config/schema/content_moderation.schema.yml
@@ -1,75 +1,3 @@
-content_moderation.state.*:
-  type: config_entity
-  label: 'Moderation state config'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    published:
-      type: boolean
-      label: 'Is published'
-    default_revision:
-      type: boolean
-      label: 'Is default revision'
-    weight:
-      type: integer
-      label: 'Weight'
-
-content_moderation.state_transition.*:
-  type: config_entity
-  label: 'Moderation state transition config'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    stateFrom:
-      type: string
-      label: 'From state'
-    stateTo:
-      type: string
-      label: 'To state'
-    weight:
-      type: integer
-      label: 'Weight'
-
-node.type.*.third_party.content_moderation:
-  type: mapping
-  label: 'Enable moderation states for this node type'
-  mapping:
-    enabled:
-      type: boolean
-      label: 'Moderation states enabled'
-    allowed_moderation_states:
-      type: sequence
-      sequence:
-        type: string
-        label: 'Moderation state'
-    default_moderation_state:
-      type: string
-      label: 'Moderation state for new content'
-
-block_content.type.*.third_party.content_moderation:
-  type: mapping
-  label: 'Enable moderation states for this block content type'
-  mapping:
-    enabled:
-      type: boolean
-      label: 'Moderation states enabled'
-    allowed_moderation_states:
-      type: sequence
-      sequence:
-        type: string
-        label: 'Moderation state'
-    default_moderation_state:
-      type: string
-      label: 'Moderation state for new block content'
-
 views.filter.latest_revision:
   type: views_filter
   label: 'Latest revision'
@@ -77,3 +5,29 @@ views.filter.latest_revision:
     value:
       type: string
       label: 'Value'
+
+workflow.type_settings.content_moderation:
+  type: mapping
+  mapping:
+    states:
+      type: sequence
+      label: 'Additional state configuration for content moderation'
+      sequence:
+        type: mapping
+        label: 'States'
+        mapping:
+          published:
+            type: boolean
+            label: 'Is published'
+          default_revision:
+            type: boolean
+            label: 'Is default revision'
+    entity_types:
+      type: sequence
+      label: 'Entity types'
+      sequence:
+        type: sequence
+        label: 'Bundles'
+        sequence:
+          type: string
+          label: 'Bundle ID'
diff --git a/web/core/modules/content_moderation/content_moderation.info.yml b/web/core/modules/content_moderation/content_moderation.info.yml
index 6d92b64d4..b25c7ce0f 100644
--- a/web/core/modules/content_moderation/content_moderation.info.yml
+++ b/web/core/modules/content_moderation/content_moderation.info.yml
@@ -4,4 +4,6 @@ description: 'Provides moderation states for content'
 version: VERSION
 core: 8.x
 package: Core (Experimental)
-configure: content_moderation.overview
+configure: entity.workflow.collection
+dependencies:
+  - workflows
diff --git a/web/core/modules/content_moderation/content_moderation.links.action.yml b/web/core/modules/content_moderation/content_moderation.links.action.yml
deleted file mode 100644
index cbb2d3fce..000000000
--- a/web/core/modules/content_moderation/content_moderation.links.action.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-entity.moderation_state.add_form:
-  route_name: 'entity.moderation_state.add_form'
-  title: 'Add moderation state'
-  appears_on:
-    - entity.moderation_state.collection
-
-entity.moderation_state_transition.add_form:
-  route_name: 'entity.moderation_state_transition.add_form'
-  title: 'Add moderation state transition'
-  appears_on:
-    - entity.moderation_state_transition.collection
diff --git a/web/core/modules/content_moderation/content_moderation.links.menu.yml b/web/core/modules/content_moderation/content_moderation.links.menu.yml
deleted file mode 100644
index 0fcb3ebd4..000000000
--- a/web/core/modules/content_moderation/content_moderation.links.menu.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Moderation state menu items definition
-content_moderation.overview:
-  title: 'Content moderation'
-  route_name: content_moderation.overview
-  description: 'Configure states and transitions for entities.'
-  parent: system.admin_config_workflow
-
-entity.moderation_state.collection:
-  title: 'Moderation states'
-  route_name: entity.moderation_state.collection
-  description: 'Administer moderation states.'
-  parent: content_moderation.overview
-  weight: 10
-
-# Moderation state transition menu items definition
-entity.moderation_state_transition.collection:
-  title: 'Moderation state transitions'
-  route_name: entity.moderation_state_transition.collection
-  description: 'Administer moderation states transitions.'
-  parent: content_moderation.overview
-  weight: 20
diff --git a/web/core/modules/content_moderation/content_moderation.links.task.yml b/web/core/modules/content_moderation/content_moderation.links.task.yml
index d715219a0..f92e92e1c 100644
--- a/web/core/modules/content_moderation/content_moderation.links.task.yml
+++ b/web/core/modules/content_moderation/content_moderation.links.task.yml
@@ -1,3 +1,3 @@
-moderation_state.entities:
+content_moderation.workflows:
   deriver: 'Drupal\content_moderation\Plugin\Derivative\DynamicLocalTasks'
   weight: 100
diff --git a/web/core/modules/content_moderation/content_moderation.module b/web/core/modules/content_moderation/content_moderation.module
index 582242b8f..7345e931d 100644
--- a/web/core/modules/content_moderation/content_moderation.module
+++ b/web/core/modules/content_moderation/content_moderation.module
@@ -18,9 +18,11 @@ use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\workflows\WorkflowInterface;
 use Drupal\node\NodeInterface;
 use Drupal\node\Plugin\Action\PublishNode;
 use Drupal\node\Plugin\Action\UnpublishNode;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * Implements hook_help().
@@ -31,15 +33,13 @@ function content_moderation_help($route_name, RouteMatchInterface $route_match)
     case 'help.page.content_moderation':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Content Moderation module provides basic moderation for content. This lets site admins define states for content, and then define transitions between those states. For more information, see the <a href=":content_moderation">online documentation for the Content Moderation module</a>.', [':content_moderation' => 'https://www.drupal.org/documentation/modules/content_moderation']) . '</p>';
+      $output .= '<p>' . t('The Content Moderation module provides moderation for content by applying workflows to content. For more information, see the <a href=":content_moderation">online documentation for the Content Moderation module</a>.', [':content_moderation' => 'https://www.drupal.org/documentation/modules/content_moderation']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
-      $output .= '<dt>' . t('Moderation states') . '</dt>';
-      $output .= '<dd>' . t('Moderation states provide the <em>Draft</em> and <em>Archived</em> states as additions to the basic <em>Published</em> option. You can click the blue <em>Add Moderation state</em> button and create new states.') . '</dd>';
-      $output .= '<dt>' . t('Moderation state transitions') . '</dt>';
-      $output .= '<dd>' . t('Using the "Moderation state transitions" screen, you can create the actual workflow. You decide the direction in which content moves from state to state, and which user roles are allowed to make that move.') . '</dd>';
+      $output .= '<dt>' . t('Configuring workflows') . '</dt>';
+      $output .= '<dd>' . t('Enable the Workflow UI module to create, edit and delete content moderation workflows.') . '</p>';
       $output .= '<dt>' . t('Configure Content Moderation permissions') . '</dt>';
-      $output .= '<dd>' . t('Each state is exposed as a permission. If a user has the permission for a transition, then they can move that node from the start state to the end state') . '</p>';
+      $output .= '<dd>' . t('Each transition is exposed as a permission. If a user has the permission for a transition, then they can move that node from the start state to the end state') . '</p>';
       $output .= '</dl>';
       return $output;
   }
@@ -72,15 +72,6 @@ function content_moderation_entity_operation(EntityInterface $entity) {
     ->entityOperation($entity);
 }
 
-/**
- * Sets required flag based on enabled state.
- */
-function content_moderation_entity_bundle_field_info_alter(&$fields, EntityTypeInterface $entity_type, $bundle) {
-  \Drupal::service('class_resolver')
-    ->getInstanceFromDefinition(EntityTypeInfo::class)
-    ->entityBundleFieldInfoAlter($fields, $entity_type, $bundle);
-}
-
 /**
  * Implements hook_entity_presave().
  */
@@ -182,15 +173,17 @@ function content_moderation_node_access(NodeInterface $node, $operation, Account
 
     $access_result->addCacheableDependency($node);
   }
-  elseif ($operation === 'update' && $moderation_info->isModeratedEntity($node) && $node->moderation_state && $node->moderation_state->target_id) {
+  elseif ($operation === 'update' && $moderation_info->isModeratedEntity($node) && $node->moderation_state) {
     /** @var \Drupal\content_moderation\StateTransitionValidation $transition_validation */
     $transition_validation = \Drupal::service('content_moderation.state_transition_validation');
 
-    $valid_transition_targets = $transition_validation->getValidTransitionTargets($node, $account);
+    $valid_transition_targets = $transition_validation->getValidTransitions($node, $account);
     $access_result = $valid_transition_targets ? AccessResult::neutral() : AccessResult::forbidden();
 
     $access_result->addCacheableDependency($node);
     $access_result->addCacheableDependency($account);
+    $workflow = \Drupal::service('content_moderation.moderation_information')->getWorkflowForEntity($node);
+    $access_result->addCacheableDependency($workflow);
     foreach ($valid_transition_targets as $valid_transition_target) {
       $access_result->addCacheableDependency($valid_transition_target);
     }
@@ -222,3 +215,39 @@ function content_moderation_action_info_alter(&$definitions) {
     $definitions['node_unpublish_action']['class'] = ModerationOptOutUnpublishNode::class;
   }
 }
+
+/**
+ * Implements hook_entity_bundle_info_alter().
+ */
+function content_moderation_entity_bundle_info_alter(&$bundles) {
+  /** @var \Drupal\workflows\WorkflowInterface $workflow */
+  foreach (Workflow::loadMultipleByType('content_moderation') as $workflow) {
+    /** @var \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration $plugin */
+    $plugin = $workflow->getTypePlugin();
+    foreach ($plugin->getEntityTypes() as $entity_type_id) {
+      foreach ($plugin->getBundlesForEntityType($entity_type_id) as $bundle_id) {
+        if (isset($bundles[$entity_type_id][$bundle_id])) {
+          $bundles[$entity_type_id][$bundle_id]['workflow'] = $workflow->id();
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Implements hook_ENTITY_TYPE_insert().
+ */
+function content_moderation_workflow_insert(WorkflowInterface $entity) {
+  // Clear bundle cache so workflow gets added or removed from the bundle
+  // information.
+  \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
+  // Clear field cache so extra field is added or removed.
+  \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
+}
+
+/**
+ * Implements hook_ENTITY_TYPE_update().
+ */
+function content_moderation_workflow_update(WorkflowInterface $entity) {
+  content_moderation_workflow_insert($entity);
+}
diff --git a/web/core/modules/content_moderation/content_moderation.permissions.yml b/web/core/modules/content_moderation/content_moderation.permissions.yml
index 293a77d3d..af28bbf1a 100644
--- a/web/core/modules/content_moderation/content_moderation.permissions.yml
+++ b/web/core/modules/content_moderation/content_moderation.permissions.yml
@@ -2,18 +2,13 @@ view any unpublished content:
   title: 'View any unpublished content'
   description: 'This permission is necessary for any users that may moderate content.'
 
-'view moderation states':
-  title: 'View moderation states'
-  description: 'View moderation states.'
+'view content moderation':
+  title: 'View content moderation'
+  description: 'View content moderation.'
 
-'administer moderation states':
-  title: 'Administer moderation states'
-  description: 'Create and edit moderation states.'
-  'restrict access': TRUE
-
-'administer moderation state transitions':
-  title: 'Administer content moderation state transitions'
-  description: 'Create and edit content moderation state transitions.'
+'administer content moderation':
+  title: 'Administer content moderation'
+  description: 'Administer workflows on content entities.'
   'restrict access': TRUE
 
 view latest version:
diff --git a/web/core/modules/content_moderation/content_moderation.routing.yml b/web/core/modules/content_moderation/content_moderation.routing.yml
deleted file mode 100644
index 912eed89f..000000000
--- a/web/core/modules/content_moderation/content_moderation.routing.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-content_moderation.overview:
-  path: '/admin/config/workflow/moderation'
-  defaults:
-    _controller: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage'
-    _title: 'Content moderation'
-  requirements:
-    _permission: 'access administration pages'
diff --git a/web/core/modules/content_moderation/content_moderation.services.yml b/web/core/modules/content_moderation/content_moderation.services.yml
index 75f0c645b..904bc0dc3 100644
--- a/web/core/modules/content_moderation/content_moderation.services.yml
+++ b/web/core/modules/content_moderation/content_moderation.services.yml
@@ -6,10 +6,10 @@ services:
       - { name: paramconverter, priority: 5 }
   content_moderation.state_transition_validation:
     class: \Drupal\content_moderation\StateTransitionValidation
-    arguments: ['@entity_type.manager', '@entity.query']
+    arguments: ['@content_moderation.moderation_information']
   content_moderation.moderation_information:
     class: Drupal\content_moderation\ModerationInformation
-    arguments: ['@entity_type.manager']
+    arguments: ['@entity_type.manager', '@entity_type.bundle.info']
   access_check.latest_revision:
     class: Drupal\content_moderation\Access\LatestRevisionCheck
     arguments: ['@content_moderation.moderation_information']
diff --git a/web/core/modules/content_moderation/src/ContentModerationState.php b/web/core/modules/content_moderation/src/ContentModerationState.php
new file mode 100644
index 000000000..34262eb59
--- /dev/null
+++ b/web/core/modules/content_moderation/src/ContentModerationState.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Drupal\content_moderation;
+
+use Drupal\workflows\StateInterface;
+
+/**
+ * A value object representing a workflow state for content moderation.
+ */
+class ContentModerationState implements StateInterface {
+
+  /**
+   * The vanilla state object from the Workflow module.
+   *
+   * @var \Drupal\workflows\StateInterface
+   */
+  protected $state;
+
+  /**
+   * If entities should be published if in this state.
+   *
+   * @var bool
+   */
+  protected $published;
+
+  /**
+   * If entities should be the default revision if in this state.
+   *
+   * @var bool
+   */
+  protected $defaultRevision;
+
+  /**
+   * ContentModerationState constructor.
+   *
+   * Decorates state objects to add methods to determine if an entity should be
+   * published or made the default revision.
+   *
+   * @param \Drupal\workflows\StateInterface $state
+   *   The vanilla state object from the Workflow module.
+   * @param bool $published
+   *   (optional) TRUE if entities should be published if in this state, FALSE
+   *   if not. Defaults to FALSE.
+   * @param bool $default_revision
+   *   (optional) TRUE if entities should be the default revision if in this
+   *   state, FALSE if not. Defaults to FALSE.
+   */
+  public function __construct(StateInterface $state, $published = FALSE, $default_revision = FALSE) {
+    $this->state = $state;
+    $this->published = $published;
+    $this->defaultRevision = $default_revision;
+  }
+
+  /**
+   * Determines if entities should be published if in this state.
+   *
+   * @return bool
+   */
+  public function isPublishedState() {
+    return $this->published;
+  }
+
+  /**
+   * Determines if entities should be the default revision if in this state.
+   *
+   * @return bool
+   */
+  public function isDefaultRevisionState() {
+    return $this->defaultRevision;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function id() {
+    return $this->state->id();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function label() {
+    return $this->state->label();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function weight() {
+    return $this->state->weight();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function canTransitionTo($to_state_id) {
+    return $this->state->canTransitionTo($to_state_id);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTransitionTo($to_state_id) {
+    return $this->state->getTransitionTo($to_state_id);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTransitions() {
+    return $this->state->getTransitions();
+  }
+
+}
diff --git a/web/core/modules/content_moderation/src/ContentModerationStateStorageSchema.php b/web/core/modules/content_moderation/src/ContentModerationStateStorageSchema.php
index 19ec324c1..cb87cc19a 100644
--- a/web/core/modules/content_moderation/src/ContentModerationStateStorageSchema.php
+++ b/web/core/modules/content_moderation/src/ContentModerationStateStorageSchema.php
@@ -19,9 +19,9 @@ class ContentModerationStateStorageSchema extends SqlContentEntityStorageSchema
     // Creates an index to ensure that the lookup in
     // \Drupal\content_moderation\Plugin\Field\ModerationStateFieldItemList::getModerationState()
     // is performant.
-    $schema['content_moderation_state_field_data']['indexes'] += array(
-      'content_moderation_state__lookup' => array('content_entity_type_id', 'content_entity_id', 'content_entity_revision_id'),
-    );
+    $schema['content_moderation_state_field_data']['indexes'] += [
+      'content_moderation_state__lookup' => ['content_entity_type_id', 'content_entity_id', 'content_entity_revision_id'],
+    ];
 
     return $schema;
   }
diff --git a/web/core/modules/content_moderation/src/Entity/ContentModerationState.php b/web/core/modules/content_moderation/src/Entity/ContentModerationState.php
index 978408fdd..cb1bc1fe9 100644
--- a/web/core/modules/content_moderation/src/Entity/ContentModerationState.php
+++ b/web/core/modules/content_moderation/src/Entity/ContentModerationState.php
@@ -55,14 +55,20 @@ class ContentModerationState extends ContentEntityBase implements ContentModerat
       ->setTranslatable(TRUE)
       ->setRevisionable(TRUE);
 
-    $fields['moderation_state'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Moderation state'))
-      ->setDescription(t('The moderation state of the referenced content.'))
-      ->setSetting('target_type', 'moderation_state')
+    $fields['workflow'] = BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Workflow'))
+      ->setDescription(t('The workflow the moderation state is in.'))
+      ->setSetting('target_type', 'workflow')
       ->setRequired(TRUE)
       ->setTranslatable(TRUE)
-      ->setRevisionable(TRUE)
-      ->addConstraint('ModerationState', []);
+      ->setRevisionable(TRUE);
+
+    $fields['moderation_state'] = BaseFieldDefinition::create('string')
+      ->setLabel(t('Moderation state'))
+      ->setDescription(t('The moderation state of the referenced content.'))
+      ->setRequired(TRUE)
+      ->setTranslatable(TRUE)
+      ->setRevisionable(TRUE);
 
     $fields['content_entity_type_id'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Content entity type ID'))
@@ -142,7 +148,7 @@ class ContentModerationState extends ContentEntityBase implements ContentModerat
    *   An array of default values.
    */
   public static function getCurrentUserId() {
-    return array(\Drupal::currentUser()->id());
+    return [\Drupal::currentUser()->id()];
   }
 
   /**
@@ -155,7 +161,7 @@ class ContentModerationState extends ContentEntityBase implements ContentModerat
     if ($related_entity instanceof TranslatableInterface) {
       $related_entity = $related_entity->getTranslation($this->activeLangcode);
     }
-    $related_entity->moderation_state->target_id = $this->moderation_state->target_id;
+    $related_entity->moderation_state = $this->moderation_state;
     return $related_entity->save();
   }
 
diff --git a/web/core/modules/content_moderation/src/Entity/Handler/ModerationHandler.php b/web/core/modules/content_moderation/src/Entity/Handler/ModerationHandler.php
index 9d89253ce..62e504e4c 100644
--- a/web/core/modules/content_moderation/src/Entity/Handler/ModerationHandler.php
+++ b/web/core/modules/content_moderation/src/Entity/Handler/ModerationHandler.php
@@ -2,9 +2,9 @@
 
 namespace Drupal\content_moderation\Entity\Handler;
 
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityHandlerInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -33,31 +33,11 @@ class ModerationHandler implements ModerationHandlerInterface, EntityHandlerInte
     // This is probably not necessary if configuration is setup correctly.
     $entity->setNewRevision(TRUE);
     $entity->isDefaultRevision($default_revision);
-  }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function onBundleModerationConfigurationFormSubmit(ConfigEntityInterface $bundle) {
-    // The Revisions portion of Entity API is not uniformly applied or
-    // consistent. Until that's fixed, we'll make a best-attempt to apply it to
-    // the common entity patterns so as to avoid every entity type needing to
-    // implement this method, although some will still need to do so for now.
-    // This is the API that should be universal, but isn't yet.
-    // @see \Drupal\node\Entity\NodeType
-    if (method_exists($bundle, 'setNewRevision')) {
-      $bundle->setNewRevision(TRUE);
+    // Update publishing status if it can be updated and if it needs updating.
+    if (($entity instanceof EntityPublishedInterface) && $entity->isPublished() !== $published_state) {
+      $published_state ? $entity->setPublished() : $entity->setUnpublished();
     }
-    // This is the raw property used by NodeType, and likely others.
-    elseif ($bundle->get('new_revision') !== NULL) {
-      $bundle->set('new_revision', TRUE);
-    }
-    // This is the raw property used by BlockContentType, and maybe others.
-    elseif ($bundle->get('revision') !== NULL) {
-      $bundle->set('revision', TRUE);
-    }
-
-    $bundle->save();
   }
 
   /**
diff --git a/web/core/modules/content_moderation/src/Entity/Handler/ModerationHandlerInterface.php b/web/core/modules/content_moderation/src/Entity/Handler/ModerationHandlerInterface.php
index c3d6ddd71..976fbb29d 100644
--- a/web/core/modules/content_moderation/src/Entity/Handler/ModerationHandlerInterface.php
+++ b/web/core/modules/content_moderation/src/Entity/Handler/ModerationHandlerInterface.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\content_moderation\Entity\Handler;
 
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 
@@ -27,21 +26,6 @@ interface ModerationHandlerInterface {
    */
   public function onPresave(ContentEntityInterface $entity, $default_revision, $published_state);
 
-  /**
-   * Operates on the bundle definition that has been marked as moderated.
-   *
-   * Note: The values on the EntityModerationForm itself are already saved
-   * so do not need to be saved here. If any changes are made to the bundle
-   * object here it is this method's responsibility to call save() on it.
-   *
-   * The most common use case is to force revisions on for this bundle if
-   * moderation is enabled. That, sadly, does not have a common API in core.
-   *
-   * @param \Drupal\Core\Config\Entity\ConfigEntityInterface $bundle
-   *   The bundle definition that is being saved.
-   */
-  public function onBundleModerationConfigurationFormSubmit(ConfigEntityInterface $bundle);
-
   /**
    * Alters entity forms to enforce revision handling.
    *
diff --git a/web/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php b/web/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php
index 83de1874c..53bb80afa 100644
--- a/web/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php
+++ b/web/core/modules/content_moderation/src/Entity/Handler/NodeModerationHandler.php
@@ -2,24 +2,40 @@
 
 namespace Drupal\content_moderation\Entity\Handler;
 
-use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\content_moderation\ModerationInformationInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Customizations for node entities.
  */
 class NodeModerationHandler extends ModerationHandler {
 
+  /**
+   * The moderation information service.
+   *
+   * @var \Drupal\content_moderation\ModerationInformationInterface
+   */
+  protected $moderationInfo;
+
+  /**
+   * NodeModerationHandler constructor.
+   *
+   * @param \Drupal\content_moderation\ModerationInformationInterface $moderation_info
+   *   The moderation information service.
+   */
+  public function __construct(ModerationInformationInterface $moderation_info) {
+    $this->moderationInfo = $moderation_info;
+  }
+
   /**
    * {@inheritdoc}
    */
-  public function onPresave(ContentEntityInterface $entity, $default_revision, $published_state) {
-    if ($this->shouldModerate($entity, $published_state)) {
-      parent::onPresave($entity, $default_revision, $published_state);
-      // Only nodes have a concept of published.
-      /** @var \Drupal\node\NodeInterface $entity */
-      $entity->setPublished($published_state);
-    }
+  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    return new static(
+      $container->get('content_moderation.moderation_information')
+    );
   }
 
   /**
@@ -38,29 +54,11 @@ class NodeModerationHandler extends ModerationHandler {
     /* @var \Drupal\node\Entity\NodeType $entity */
     $entity = $form_state->getFormObject()->getEntity();
 
-    if ($entity->getThirdPartySetting('content_moderation', 'enabled', FALSE)) {
+    if ($this->moderationInfo->getWorkflowForEntity($entity)) {
       // Force the revision checkbox on.
       $form['workflow']['options']['#default_value']['revision'] = 'revision';
       $form['workflow']['options']['revision']['#disabled'] = TRUE;
     }
   }
 
-  /**
-   * Check if an entity's default revision and/or state needs adjusting.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity to check.
-   * @param bool $published_state
-   *   Whether the state being transitioned to is a published state or not.
-   *
-   * @return bool
-   *   TRUE when either the default revision or the state needs to be updated.
-   */
-  protected function shouldModerate(ContentEntityInterface $entity, $published_state) {
-    // @todo clarify the first condition.
-    // First condition is needed so you can add a translation.
-    // Second condition checks to see if the published status has changed.
-    return $entity->isDefaultTranslation() || $entity->isPublished() !== $published_state;
-  }
-
 }
diff --git a/web/core/modules/content_moderation/src/Entity/ModerationState.php b/web/core/modules/content_moderation/src/Entity/ModerationState.php
deleted file mode 100644
index 379ff60d1..000000000
--- a/web/core/modules/content_moderation/src/Entity/ModerationState.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\content_moderation\ModerationStateInterface;
-
-/**
- * Defines the Moderation state entity.
- *
- * @ConfigEntityType(
- *   id = "moderation_state",
- *   label = @Translation("Moderation state"),
- *   handlers = {
- *     "access" = "Drupal\content_moderation\ModerationStateAccessControlHandler",
- *     "list_builder" = "Drupal\content_moderation\ModerationStateListBuilder",
- *     "form" = {
- *       "add" = "Drupal\content_moderation\Form\ModerationStateForm",
- *       "edit" = "Drupal\content_moderation\Form\ModerationStateForm",
- *       "delete" = "Drupal\content_moderation\Form\ModerationStateDeleteForm"
- *     },
- *     "route_provider" = {
- *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
- *     },
- *   },
- *   config_prefix = "state",
- *   admin_permission = "administer moderation states",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *     "uuid" = "uuid",
- *     "weight" = "weight",
- *   },
- *   links = {
- *     "add-form" = "/admin/config/workflow/moderation/states/add",
- *     "edit-form" = "/admin/config/workflow/moderation/states/{moderation_state}",
- *     "delete-form" = "/admin/config/workflow/moderation/states/{moderation_state}/delete",
- *     "collection" = "/admin/config/workflow/moderation/states"
- *   },
- *   config_export = {
- *     "id",
- *     "label",
- *     "published",
- *     "default_revision",
- *     "weight",
- *   },
- * )
- */
-class ModerationState extends ConfigEntityBase implements ModerationStateInterface {
-
-  /**
-   * The Moderation state ID.
-   *
-   * @var string
-   */
-  protected $id;
-
-  /**
-   * The Moderation state label.
-   *
-   * @var string
-   */
-  protected $label;
-
-  /**
-   * Whether this state represents a published node.
-   *
-   * @var bool
-   */
-  protected $published;
-
-  /**
-   * Relative weight of this state.
-   *
-   * @var int
-   */
-  protected $weight;
-
-  /**
-   * Whether this state represents a default revision of the node.
-   *
-   * If this is a published state, then this property is ignored.
-   *
-   * @var bool
-   */
-  protected $default_revision;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isPublishedState() {
-    return $this->published;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isDefaultRevisionState() {
-    return $this->published || $this->default_revision;
-  }
-
-}
diff --git a/web/core/modules/content_moderation/src/Entity/ModerationStateTransition.php b/web/core/modules/content_moderation/src/Entity/ModerationStateTransition.php
deleted file mode 100644
index 95a115b96..000000000
--- a/web/core/modules/content_moderation/src/Entity/ModerationStateTransition.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\content_moderation\ModerationStateTransitionInterface;
-
-/**
- * Defines the Moderation state transition entity.
- *
- * @ConfigEntityType(
- *   id = "moderation_state_transition",
- *   label = @Translation("Moderation state transition"),
- *   handlers = {
- *     "list_builder" = "Drupal\content_moderation\ModerationStateTransitionListBuilder",
- *     "form" = {
- *       "add" = "Drupal\content_moderation\Form\ModerationStateTransitionForm",
- *       "edit" = "Drupal\content_moderation\Form\ModerationStateTransitionForm",
- *       "delete" = "Drupal\content_moderation\Form\ModerationStateTransitionDeleteForm"
- *     },
- *     "route_provider" = {
- *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
- *     },
- *   },
- *   config_prefix = "state_transition",
- *   admin_permission = "administer moderation state transitions",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *     "uuid" = "uuid",
- *     "weight" = "weight"
- *   },
- *   links = {
- *     "add-form" = "/admin/config/workflow/moderation/transitions/add",
- *     "edit-form" = "/admin/config/workflow/moderation/transitions/{moderation_state_transition}",
- *     "delete-form" = "/admin/config/workflow/moderation/transitions/{moderation_state_transition}/delete",
- *     "collection" = "/admin/config/workflow/moderation/transitions"
- *   }
- * )
- */
-class ModerationStateTransition extends ConfigEntityBase implements ModerationStateTransitionInterface {
-
-  /**
-   * The Moderation state transition ID.
-   *
-   * @var string
-   */
-  protected $id;
-
-  /**
-   * The Moderation state transition label.
-   *
-   * @var string
-   */
-  protected $label;
-
-  /**
-   * ID of from state.
-   *
-   * @var string
-   */
-  protected $stateFrom;
-
-  /**
-   * ID of to state.
-   *
-   * @var string
-   */
-  protected $stateTo;
-
-  /**
-   * Relative weight of this transition.
-   *
-   * @var int
-   */
-  protected $weight;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    parent::calculateDependencies();
-
-    if ($this->stateFrom) {
-      $this->addDependency('config', ModerationState::load($this->stateFrom)->getConfigDependencyName());
-    }
-    if ($this->stateTo) {
-      $this->addDependency('config', ModerationState::load($this->stateTo)->getConfigDependencyName());
-    }
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFromState() {
-    return $this->stateFrom;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getToState() {
-    return $this->stateTo;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWeight() {
-    return $this->weight;
-  }
-
-}
diff --git a/web/core/modules/content_moderation/src/EntityOperations.php b/web/core/modules/content_moderation/src/EntityOperations.php
index d76a35b98..af87f6fc3 100644
--- a/web/core/modules/content_moderation/src/EntityOperations.php
+++ b/web/core/modules/content_moderation/src/EntityOperations.php
@@ -2,14 +2,16 @@
 
 namespace Drupal\content_moderation;
 
-use Drupal\content_moderation\Entity\ContentModerationState;
+use Drupal\content_moderation\Entity\ContentModerationState as ContentModerationStateEntity;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\TypedData\TranslatableInterface;
 use Drupal\content_moderation\Form\EntityModerationForm;
+use Drupal\workflows\WorkflowInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -45,6 +47,13 @@ class EntityOperations implements ContainerInjectionInterface {
    */
   protected $tracker;
 
+  /**
+   * The entity bundle information service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleInfo;
+
   /**
    * Constructs a new EntityOperations object.
    *
@@ -56,12 +65,15 @@ class EntityOperations implements ContainerInjectionInterface {
    *   The form builder.
    * @param \Drupal\content_moderation\RevisionTrackerInterface $tracker
    *   The revision tracker.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info
+   *   The entity bundle information service.
    */
-  public function __construct(ModerationInformationInterface $moderation_info, EntityTypeManagerInterface $entity_type_manager, FormBuilderInterface $form_builder, RevisionTrackerInterface $tracker) {
+  public function __construct(ModerationInformationInterface $moderation_info, EntityTypeManagerInterface $entity_type_manager, FormBuilderInterface $form_builder, RevisionTrackerInterface $tracker, EntityTypeBundleInfoInterface $bundle_info) {
     $this->moderationInfo = $moderation_info;
     $this->entityTypeManager = $entity_type_manager;
     $this->formBuilder = $form_builder;
     $this->tracker = $tracker;
+    $this->bundleInfo = $bundle_info;
   }
 
   /**
@@ -72,7 +84,8 @@ class EntityOperations implements ContainerInjectionInterface {
       $container->get('content_moderation.moderation_information'),
       $container->get('entity_type.manager'),
       $container->get('form_builder'),
-      $container->get('content_moderation.revision_tracker')
+      $container->get('content_moderation.revision_tracker'),
+      $container->get('entity_type.bundle.info')
     );
   }
 
@@ -86,20 +99,20 @@ class EntityOperations implements ContainerInjectionInterface {
     if (!$this->moderationInfo->isModeratedEntity($entity)) {
       return;
     }
-    if ($entity->moderation_state->target_id) {
-      $moderation_state = $this->entityTypeManager
-        ->getStorage('moderation_state')
-        ->load($entity->moderation_state->target_id);
-      $published_state = $moderation_state->isPublishedState();
+
+    if ($entity->moderation_state->value) {
+      $workflow = $this->moderationInfo->getWorkflowForEntity($entity);
+      /** @var \Drupal\content_moderation\ContentModerationState $current_state */
+      $current_state = $workflow->getState($entity->moderation_state->value);
 
       // This entity is default if it is new, the default revision, or the
       // default revision is not published.
       $update_default_revision = $entity->isNew()
-        || $moderation_state->isDefaultRevisionState()
-        || !$this->isDefaultRevisionPublished($entity);
+        || $current_state->isDefaultRevisionState()
+        || !$this->isDefaultRevisionPublished($entity, $workflow);
 
       // Fire per-entity-type logic for handling the save process.
-      $this->entityTypeManager->getHandler($entity->getEntityTypeId(), 'moderation')->onPresave($entity, $update_default_revision, $published_state);
+      $this->entityTypeManager->getHandler($entity->getEntityTypeId(), 'moderation')->onPresave($entity, $update_default_revision, $current_state->isPublishedState());
     }
   }
 
@@ -140,15 +153,14 @@ class EntityOperations implements ContainerInjectionInterface {
    *   The entity to update or create a moderation state for.
    */
   protected function updateOrCreateFromEntity(EntityInterface $entity) {
-    $moderation_state = $entity->moderation_state->target_id;
+    $moderation_state = $entity->moderation_state->value;
+    $workflow = $this->moderationInfo->getWorkflowForEntity($entity);
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     if (!$moderation_state) {
-      $moderation_state = $this->entityTypeManager
-        ->getStorage($entity->getEntityType()->getBundleEntityType())->load($entity->bundle())
-        ->getThirdPartySetting('content_moderation', 'default_moderation_state');
+      $moderation_state = $workflow->getInitialState()->id();
     }
 
-    // @todo what if $entity->moderation_state->target_id is null at this point?
+    // @todo what if $entity->moderation_state is null at this point?
     $entity_type_id = $entity->getEntityTypeId();
     $entity_id = $entity->id();
     $entity_revision_id = $entity->getRevisionId();
@@ -157,6 +169,7 @@ class EntityOperations implements ContainerInjectionInterface {
     $entities = $storage->loadByProperties([
       'content_entity_type_id' => $entity_type_id,
       'content_entity_id' => $entity_id,
+      'workflow' => $workflow->id(),
     ]);
 
     /** @var \Drupal\content_moderation\ContentModerationStateInterface $content_moderation_state */
@@ -166,6 +179,7 @@ class EntityOperations implements ContainerInjectionInterface {
         'content_entity_type_id' => $entity_type_id,
         'content_entity_id' => $entity_id,
       ]);
+      $content_moderation_state->workflow->target_id = $workflow->id();
     }
     else {
       // Create a new revision.
@@ -186,7 +200,7 @@ class EntityOperations implements ContainerInjectionInterface {
     // Create the ContentModerationState entity for the inserted entity.
     $content_moderation_state->set('content_entity_revision_id', $entity_revision_id);
     $content_moderation_state->set('moderation_state', $moderation_state);
-    ContentModerationState::updateOrCreateFromEntity($content_moderation_state);
+    ContentModerationStateEntity::updateOrCreateFromEntity($content_moderation_state);
   }
 
   /**
@@ -241,11 +255,13 @@ class EntityOperations implements ContainerInjectionInterface {
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity being saved.
+   * @param \Drupal\workflows\WorkflowInterface $workflow
+   *   The workflow being applied to the entity.
    *
    * @return bool
    *   TRUE if the default revision is published. FALSE otherwise.
    */
-  protected function isDefaultRevisionPublished(EntityInterface $entity) {
+  protected function isDefaultRevisionPublished(EntityInterface $entity, WorkflowInterface $workflow) {
     $storage = $this->entityTypeManager->getStorage($entity->getEntityTypeId());
     $default_revision = $storage->load($entity->id());
 
@@ -260,7 +276,7 @@ class EntityOperations implements ContainerInjectionInterface {
       $default_revision = $default_revision->getTranslation($entity->language()->getId());
     }
 
-    return $default_revision && $default_revision->moderation_state->entity->isPublishedState();
+    return $default_revision && $workflow->getState($default_revision->moderation_state->value)->isPublishedState();
   }
 
 }
diff --git a/web/core/modules/content_moderation/src/EntityTypeInfo.php b/web/core/modules/content_moderation/src/EntityTypeInfo.php
index 047bc23ca..f11e47168 100644
--- a/web/core/modules/content_moderation/src/EntityTypeInfo.php
+++ b/web/core/modules/content_moderation/src/EntityTypeInfo.php
@@ -9,6 +9,7 @@ use Drupal\Core\Entity\ContentEntityFormInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\ContentEntityTypeInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -49,6 +50,13 @@ class EntityTypeInfo implements ContainerInjectionInterface {
    */
   protected $entityTypeManager;
 
+  /**
+   * The bundle information service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleInfo;
+
   /**
    * The current user.
    *
@@ -77,11 +85,16 @@ class EntityTypeInfo implements ContainerInjectionInterface {
    *   The moderation information service.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   Entity type manager.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info
+   *   Bundle information service.
+   * @param \Drupal\Core\Session\AccountInterface $current_user
+   *   Current user.
    */
-  public function __construct(TranslationInterface $translation, ModerationInformationInterface $moderation_information, EntityTypeManagerInterface $entity_type_manager, AccountInterface $current_user) {
+  public function __construct(TranslationInterface $translation, ModerationInformationInterface $moderation_information, EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $bundle_info, AccountInterface $current_user) {
     $this->stringTranslation = $translation;
     $this->moderationInfo = $moderation_information;
     $this->entityTypeManager = $entity_type_manager;
+    $this->bundleInfo = $bundle_info;
     $this->currentUser = $current_user;
   }
 
@@ -93,6 +106,7 @@ class EntityTypeInfo implements ContainerInjectionInterface {
       $container->get('string_translation'),
       $container->get('content_moderation.moderation_information'),
       $container->get('entity_type.manager'),
+      $container->get('entity_type.bundle.info'),
       $container->get('current_user')
     );
   }
@@ -109,9 +123,16 @@ class EntityTypeInfo implements ContainerInjectionInterface {
    * @see hook_entity_type_alter()
    */
   public function entityTypeAlter(array &$entity_types) {
-    foreach ($this->filterNonRevisionableEntityTypes($entity_types) as $type_name => $type) {
-      $entity_types[$type_name] = $this->addModerationToEntityType($type);
-      $entity_types[$type->get('bundle_of')] = $this->addModerationToEntity($entity_types[$type->get('bundle_of')]);
+    foreach ($entity_types as $entity_type_id => $entity_type) {
+      // The ContentModerationState entity type should never be moderated.
+      if ($entity_type->isRevisionable() && $entity_type_id != 'content_moderation_state') {
+        $entity_types[$entity_type_id] = $this->addModerationToEntityType($entity_type);
+        // Add additional moderation support to entity types whose bundles are
+        // managed by a config entity type.
+        if ($entity_type->getBundleEntityType()) {
+          $entity_types[$entity_type->getBundleEntityType()] = $this->addModerationToBundleEntityType($entity_types[$entity_type->getBundleEntityType()]);
+        }
+      }
     }
   }
 
@@ -127,7 +148,7 @@ class EntityTypeInfo implements ContainerInjectionInterface {
    * @return \Drupal\Core\Entity\ContentEntityTypeInterface
    *   The modified content entity definition.
    */
-  protected function addModerationToEntity(ContentEntityTypeInterface $type) {
+  protected function addModerationToEntityType(ContentEntityTypeInterface $type) {
     if (!$type->hasHandlerClass('moderation')) {
       $handler_class = !empty($this->moderationHandlers[$type->id()]) ? $this->moderationHandlers[$type->id()] : ModerationHandler::class;
       $type->setHandlerClass('moderation', $handler_class);
@@ -161,7 +182,7 @@ class EntityTypeInfo implements ContainerInjectionInterface {
    * @return \Drupal\Core\Config\Entity\ConfigEntityTypeInterface
    *   The modified config entity definition.
    */
-  protected function addModerationToEntityType(ConfigEntityTypeInterface $type) {
+  protected function addModerationToBundleEntityType(ConfigEntityTypeInterface $type) {
     if ($type->hasLinkTemplate('edit-form') && !$type->hasLinkTemplate('moderation-form')) {
       $type->setLinkTemplate('moderation-form', $type->getLinkTemplate('edit-form') . '/moderation');
     }
@@ -196,7 +217,7 @@ class EntityTypeInfo implements ContainerInjectionInterface {
     $operations = [];
     $type = $entity->getEntityType();
     $bundle_of = $type->getBundleOf();
-    if ($this->currentUser->hasPermission('administer moderation states') && $bundle_of &&
+    if ($this->currentUser->hasPermission('administer content moderation') && $bundle_of &&
       $this->moderationInfo->canModerateEntitiesOfEntityType($this->entityTypeManager->getDefinition($bundle_of))
     ) {
       $operations['manage-moderation'] = [
@@ -262,16 +283,12 @@ class EntityTypeInfo implements ContainerInjectionInterface {
    *   - bundle: The machine name of a bundle, such as "page" or "article".
    */
   protected function getModeratedBundles() {
-    /** @var ConfigEntityTypeInterface $type */
-    foreach ($this->filterNonRevisionableEntityTypes($this->entityTypeManager->getDefinitions()) as $type_name => $type) {
-      $result = $this->entityTypeManager
-        ->getStorage($type_name)
-        ->getQuery()
-        ->condition('third_party_settings.content_moderation.enabled', TRUE)
-        ->execute();
-
-      foreach ($result as $bundle_name) {
-        yield ['entity' => $type->getBundleOf(), 'bundle' => $bundle_name];
+    $entity_types = array_filter($this->entityTypeManager->getDefinitions(), [$this->moderationInfo, 'canModerateEntitiesOfEntityType']);
+    foreach ($entity_types as $type_name => $type) {
+      foreach ($this->bundleInfo->getBundleInfo($type_name) as $bundle_id => $bundle) {
+        if ($this->moderationInfo->shouldModerateEntitiesOfBundle($type, $bundle_id)) {
+          yield ['entity' => $type_name, 'bundle' => $bundle_id];
+        }
       }
     }
   }
@@ -291,15 +308,15 @@ class EntityTypeInfo implements ContainerInjectionInterface {
     }
 
     $fields = [];
-    $fields['moderation_state'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel($this->t('Moderation state'))
-      ->setDescription($this->t('The moderation state of this piece of content.'))
+    $fields['moderation_state'] = BaseFieldDefinition::create('string')
+      ->setLabel(t('Moderation state'))
+      ->setDescription(t('The moderation state of this piece of content.'))
       ->setComputed(TRUE)
       ->setClass(ModerationStateFieldItemList::class)
       ->setSetting('target_type', 'moderation_state')
       ->setDisplayOptions('view', [
         'label' => 'hidden',
-        'type' => 'hidden',
+        'region' => 'hidden',
         'weight' => -5,
       ])
       ->setDisplayOptions('form', [
@@ -316,24 +333,6 @@ class EntityTypeInfo implements ContainerInjectionInterface {
     return $fields;
   }
 
-  /**
-   * Adds ModerationState constraint to bundles whose entities are moderated.
-   *
-   * @param \Drupal\Core\Field\FieldDefinitionInterface[] $fields
-   *   The array of bundle field definitions.
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param string $bundle
-   *   The bundle.
-   *
-   * @see hook_entity_bundle_field_info_alter();
-   */
-  public function entityBundleFieldInfoAlter(&$fields, EntityTypeInterface $entity_type, $bundle) {
-    if (!empty($fields['moderation_state']) && $this->moderationInfo->shouldModerateEntitiesOfBundle($entity_type, $bundle)) {
-      $fields['moderation_state']->addConstraint('ModerationState', []);
-    }
-  }
-
   /**
    * Alters bundle forms to enforce revision handling.
    *
@@ -388,21 +387,4 @@ class EntityTypeInfo implements ContainerInjectionInterface {
     }
   }
 
-  /**
-   * Filters entity type lists to return only revisionable entity types.
-   *
-   * @param EntityTypeInterface[] $entity_types
-   *   The master entity type list filter.
-   *
-   * @return \Drupal\Core\Config\Entity\ConfigEntityTypeInterface[]
-   *   An array of revisionable entity types which are configuration entities.
-   */
-  protected function filterNonRevisionableEntityTypes(array $entity_types) {
-    return array_filter($entity_types, function (EntityTypeInterface $type) use ($entity_types) {
-      return ($type instanceof ConfigEntityTypeInterface)
-      && ($bundle_of = $type->get('bundle_of'))
-      && $entity_types[$bundle_of]->isRevisionable();
-    });
-  }
-
 }
diff --git a/web/core/modules/content_moderation/src/Form/BundleModerationConfigurationForm.php b/web/core/modules/content_moderation/src/Form/BundleModerationConfigurationForm.php
index 58dd33436..917ec5ded 100644
--- a/web/core/modules/content_moderation/src/Form/BundleModerationConfigurationForm.php
+++ b/web/core/modules/content_moderation/src/Form/BundleModerationConfigurationForm.php
@@ -2,12 +2,11 @@
 
 namespace Drupal\content_moderation\Form;
 
-use Drupal\Core\Config\Entity\ThirdPartySettingsInterface;
+use Drupal\content_moderation\Plugin\WorkflowType\ContentModeration;
+use Drupal\workflows\WorkflowInterface;
 use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\content_moderation\Entity\ModerationState;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -50,146 +49,107 @@ class BundleModerationConfigurationForm extends EntityForm {
    * {@inheritdoc}
    */
   public function form(array $form, FormStateInterface $form_state) {
-    /* @var \Drupal\Core\Config\Entity\ConfigEntityTypeInterface $bundle */
-    $bundle = $form_state->getFormObject()->getEntity();
-    $form['enable_moderation_state'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Enable moderation states.'),
-      '#description' => $this->t('Content of this type must transition through moderation states in order to be published.'),
-      '#default_value' => $bundle->getThirdPartySetting('content_moderation', 'enabled', FALSE),
+    /* @var \Drupal\Core\Config\Entity\ConfigEntityInterface $bundle */
+    $bundle = $this->getEntity();
+    $bundle_of_entity_type = $this->entityTypeManager->getDefinition($bundle->getEntityType()->getBundleOf());
+    /* @var \Drupal\workflows\WorkflowInterface[] $workflows */
+    $workflows = $this->entityTypeManager->getStorage('workflow')->loadMultiple();
+
+    $options = array_map(function (WorkflowInterface $workflow) {
+      return $workflow->label();
+    }, array_filter($workflows, function (WorkflowInterface $workflow) {
+      return $workflow->status() && $workflow->getTypePlugin() instanceof ContentModeration;
+    }));
+
+    $selected_workflow = array_reduce($workflows, function ($carry, WorkflowInterface $workflow) use ($bundle_of_entity_type, $bundle) {
+      $plugin = $workflow->getTypePlugin();
+      if ($plugin instanceof ContentModeration && $plugin->appliesToEntityTypeAndBundle($bundle_of_entity_type->id(), $bundle->id())) {
+        return $workflow->id();
+      }
+      return $carry;
+    });
+    $form['workflow'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Select the workflow to apply'),
+      '#default_value' => $selected_workflow,
+      '#options' => $options,
+      '#required' => FALSE,
+      '#empty_value' => '',
+    ];
+
+    $form['original_workflow'] = [
+      '#type' => 'value',
+      '#value' => $selected_workflow,
+    ];
+
+    $form['bundle'] = [
+      '#type' => 'value',
+      '#value' => $bundle->id(),
+    ];
+
+    $form['entity_type'] = [
+      '#type' => 'value',
+      '#value' => $bundle_of_entity_type->id(),
     ];
 
     // Add a special message when moderation is being disabled.
-    if ($bundle->getThirdPartySetting('content_moderation', 'enabled', FALSE)) {
-      $form['enable_moderation_state_note'] = [
+    if ($selected_workflow) {
+      $form['enable_workflow_note'] = [
         '#type' => 'item',
         '#description' => $this->t('After disabling moderation, any existing forward drafts will be accessible via the "Revisions" tab.'),
-        '#states' => [
-          'visible' => [
-            ':input[name=enable_moderation_state]' => ['checked' => FALSE],
-          ],
-        ],
+        '#access' => !empty($selected_workflow)
       ];
     }
 
-    $states = $this->entityTypeManager->getStorage('moderation_state')->loadMultiple();
-    $label = function(ModerationState $state) {
-      return $state->label();
-    };
-
-    $options_published = array_map($label, array_filter($states, function(ModerationState $state) {
-      return $state->isPublishedState();
-    }));
-
-    $options_unpublished = array_map($label, array_filter($states, function(ModerationState $state) {
-      return !$state->isPublishedState();
-    }));
-
-    $form['allowed_moderation_states_unpublished'] = [
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Allowed moderation states (Unpublished)'),
-      '#description' => $this->t('The allowed unpublished moderation states this content-type can be assigned.'),
-      '#default_value' => $bundle->getThirdPartySetting('content_moderation', 'allowed_moderation_states', array_keys($options_unpublished)),
-      '#options' => $options_unpublished,
-      '#required' => TRUE,
-      '#states' => [
-        'visible' => [
-          ':input[name=enable_moderation_state]' => ['checked' => TRUE],
-        ],
-      ],
-    ];
-
-    $form['allowed_moderation_states_published'] = [
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Allowed moderation states (Published)'),
-      '#description' => $this->t('The allowed published moderation states this content-type can be assigned.'),
-      '#default_value' => $bundle->getThirdPartySetting('content_moderation', 'allowed_moderation_states', array_keys($options_published)),
-      '#options' => $options_published,
-      '#required' => TRUE,
-      '#states' => [
-        'visible' => [
-          ':input[name=enable_moderation_state]' => ['checked' => TRUE],
-        ],
-      ],
-    ];
-
-    // The key of the array needs to be a user-facing string so we have to fully
-    // render the translatable string to a real string, or else PHP errors on an
-    // object used as an array key.
-    $options = [
-      $this->t('Unpublished')->render() => $options_unpublished,
-      $this->t('Published')->render() => $options_published,
-    ];
-
-    $form['default_moderation_state'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Default moderation state'),
-      '#options' => $options,
-      '#description' => $this->t('Select the moderation state for new content'),
-      '#default_value' => $bundle->getThirdPartySetting('content_moderation', 'default_moderation_state', 'draft'),
-      '#states' => [
-        'visible' => [
-          ':input[name=enable_moderation_state]' => ['checked' => TRUE],
-        ],
-      ],
-    ];
-    $form['#entity_builders'][] = [$this, 'formBuilderCallback'];
-
     return parent::form($form, $form_state);
   }
 
-  /**
-   * Form builder callback.
-   *
-   * @todo This should be folded into the form method.
-   *
-   * @param string $entity_type_id
-   *   The entity type identifier.
-   * @param \Drupal\Core\Entity\EntityInterface $bundle
-   *   The bundle entity updated with the submitted values.
-   * @param array $form
-   *   The complete form array.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function formBuilderCallback($entity_type_id, EntityInterface $bundle, &$form, FormStateInterface $form_state) {
-    // @todo https://www.drupal.org/node/2779933 write a test for this.
-    if ($bundle instanceof ThirdPartySettingsInterface) {
-      $bundle->setThirdPartySetting('content_moderation', 'enabled', $form_state->getValue('enable_moderation_state'));
-      $bundle->setThirdPartySetting('content_moderation', 'allowed_moderation_states', array_keys(array_filter($form_state->getValue('allowed_moderation_states_published') + $form_state->getValue('allowed_moderation_states_unpublished'))));
-      $bundle->setThirdPartySetting('content_moderation', 'default_moderation_state', $form_state->getValue('default_moderation_state'));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    if ($form_state->getValue('enable_moderation_state')) {
-      $allowed = array_keys(array_filter($form_state->getValue('allowed_moderation_states_published') + $form_state->getValue('allowed_moderation_states_unpublished')));
-
-      if (($default = $form_state->getValue('default_moderation_state')) && !in_array($default, $allowed, TRUE)) {
-        $form_state->setErrorByName('default_moderation_state', $this->t('The default moderation state must be one of the allowed states.'));
-      }
-    }
-  }
-
   /**
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     // If moderation is enabled, revisions MUST be enabled as well. Otherwise we
     // can't have forward revisions.
-    if ($form_state->getValue('enable_moderation_state')) {
-      /* @var \Drupal\Core\Config\Entity\ConfigEntityTypeInterface $bundle */
-      $bundle = $form_state->getFormObject()->getEntity();
-
-      $this->entityTypeManager->getHandler($bundle->getEntityType()->getBundleOf(), 'moderation')->onBundleModerationConfigurationFormSubmit($bundle);
-    }
-
-    parent::submitForm($form, $form_state);
-
     drupal_set_message($this->t('Your settings have been saved.'));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $entity_type_id = $form_state->getValue('entity_type');
+    $bundle_id = $form_state->getValue('bundle');
+    $new_workflow_id = $form_state->getValue('workflow');
+    $original_workflow_id = $form_state->getValue('original_workflow');
+    if ($new_workflow_id === $original_workflow_id) {
+      // Nothing to do.
+      return;
+    }
+    if ($original_workflow_id) {
+      /* @var \Drupal\workflows\WorkflowInterface $workflow */
+      $workflow = $this->entityTypeManager->getStorage('workflow')->load($original_workflow_id);
+      $workflow->getTypePlugin()->removeEntityTypeAndBundle($entity_type_id, $bundle_id);
+      $workflow->save();
+    }
+    if ($new_workflow_id) {
+      /* @var \Drupal\workflows\WorkflowInterface $workflow */
+      $workflow = $this->entityTypeManager->getStorage('workflow')->load($new_workflow_id);
+      $workflow->getTypePlugin()->addEntityTypeAndBundle($entity_type_id, $bundle_id);
+      $workflow->save();
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function actions(array $form, FormStateInterface $form_state) {
+    $actions['submit'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Save'),
+      '#submit' => ['::submitForm', '::save'],
+    ];
+
+    return $actions;
+  }
+
 }
diff --git a/web/core/modules/content_moderation/src/Form/EntityModerationForm.php b/web/core/modules/content_moderation/src/Form/EntityModerationForm.php
index 39baec028..6e4daea0a 100644
--- a/web/core/modules/content_moderation/src/Form/EntityModerationForm.php
+++ b/web/core/modules/content_moderation/src/Form/EntityModerationForm.php
@@ -3,12 +3,11 @@
 namespace Drupal\content_moderation\Form;
 
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\content_moderation\Entity\ModerationStateTransition;
 use Drupal\content_moderation\ModerationInformationInterface;
 use Drupal\content_moderation\StateTransitionValidation;
+use Drupal\workflows\Transition;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -30,13 +29,6 @@ class EntityModerationForm extends FormBase {
    */
   protected $validation;
 
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
   /**
    * EntityModerationForm constructor.
    *
@@ -44,13 +36,10 @@ class EntityModerationForm extends FormBase {
    *   The moderation information service.
    * @param \Drupal\content_moderation\StateTransitionValidation $validation
    *   The moderation state transition validation service.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
    */
-  public function __construct(ModerationInformationInterface $moderation_info, StateTransitionValidation $validation, EntityTypeManagerInterface $entity_type_manager) {
+  public function __construct(ModerationInformationInterface $moderation_info, StateTransitionValidation $validation) {
     $this->moderationInfo = $moderation_info;
     $this->validation = $validation;
-    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
@@ -59,8 +48,7 @@ class EntityModerationForm extends FormBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('content_moderation.moderation_information'),
-      $container->get('content_moderation.state_transition_validation'),
-      $container->get('entity_type.manager')
+      $container->get('content_moderation.state_transition_validation')
     );
   }
 
@@ -75,20 +63,21 @@ class EntityModerationForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, ContentEntityInterface $entity = NULL) {
-    /** @var \Drupal\content_moderation\Entity\ModerationState $current_state */
-    $current_state = $entity->moderation_state->entity;
+    $current_state = $entity->moderation_state->value;
+    $workflow = $this->moderationInfo->getWorkflowForEntity($entity);
 
+    /** @var \Drupal\workflows\Transition[] $transitions */
     $transitions = $this->validation->getValidTransitions($entity, $this->currentUser());
 
     // Exclude self-transitions.
-    $transitions = array_filter($transitions, function(ModerationStateTransition $transition) use ($current_state) {
-      return $transition->getToState() != $current_state->id();
+    $transitions = array_filter($transitions, function(Transition $transition) use ($current_state) {
+      return $transition->to()->id() != $current_state;
     });
 
     $target_states = [];
-    /** @var ModerationStateTransition $transition */
+
     foreach ($transitions as $transition) {
-      $target_states[$transition->getToState()] = $transition->label();
+      $target_states[$transition->to()->id()] = $transition->to()->label();
     }
 
     if (!count($target_states)) {
@@ -99,7 +88,7 @@ class EntityModerationForm extends FormBase {
       $form['current'] = [
         '#type' => 'item',
         '#title' => $this->t('Status'),
-        '#markup' => $current_state->label(),
+        '#markup' => $workflow->getState($current_state)->label(),
       ];
     }
 
@@ -137,23 +126,19 @@ class EntityModerationForm extends FormBase {
 
     $new_state = $form_state->getValue('new_state');
 
-    // @todo should we just just be updating the content moderation state
-    //   entity? That would prevent setting the revision log.
-    $entity->moderation_state->target_id = $new_state;
+    $entity->set('moderation_state', $new_state);
     $entity->revision_log = $form_state->getValue('revision_log');
 
     $entity->save();
 
     drupal_set_message($this->t('The moderation state has been updated.'));
 
-    /** @var \Drupal\content_moderation\Entity\ModerationState $state */
-    $state = $this->entityTypeManager->getStorage('moderation_state')->load($new_state);
-
+    $new_state = $this->moderationInfo->getWorkflowForEntity($entity)->getState($new_state);
     // The page we're on likely won't be visible if we just set the entity to
     // the default state, as we hide that latest-revision tab if there is no
     // forward revision. Redirect to the canonical URL instead, since that will
     // still exist.
-    if ($state->isDefaultRevisionState()) {
+    if ($new_state->isDefaultRevisionState()) {
       $form_state->setRedirectUrl($entity->toUrl('canonical'));
     }
   }
diff --git a/web/core/modules/content_moderation/src/Form/ModerationStateForm.php b/web/core/modules/content_moderation/src/Form/ModerationStateForm.php
deleted file mode 100644
index 32d7a4837..000000000
--- a/web/core/modules/content_moderation/src/Form/ModerationStateForm.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation\Form;
-
-use Drupal\content_moderation\Entity\ModerationState;
-use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Class ModerationStateForm.
- */
-class ModerationStateForm extends EntityForm {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $form = parent::form($form, $form_state);
-
-    /* @var \Drupal\content_moderation\ModerationStateInterface $moderation_state */
-    $moderation_state = $this->entity;
-    $form['label'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Label'),
-      '#maxlength' => 255,
-      '#default_value' => $moderation_state->label(),
-      '#description' => $this->t('Label for the Moderation state.'),
-      '#required' => TRUE,
-    );
-
-    $form['id'] = array(
-      '#type' => 'machine_name',
-      '#default_value' => $moderation_state->id(),
-      '#machine_name' => array(
-        'exists' => [ModerationState::class, 'load'],
-      ),
-      '#disabled' => !$moderation_state->isNew(),
-    );
-
-    $form['published'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Published'),
-      '#description' => $this->t('When content reaches this state it should be published.'),
-      '#default_value' => $moderation_state->isPublishedState(),
-    ];
-
-    $form['default_revision'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Default revision'),
-      '#description' => $this->t('When content reaches this state it should be made the default revision; this is implied for published states.'),
-      '#default_value' => $moderation_state->isDefaultRevisionState(),
-      // @todo Add form #state to force "make default" on when "published" is
-      // on for a state.
-      // @see https://www.drupal.org/node/2645614
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $moderation_state = $this->entity;
-    $status = $moderation_state->save();
-
-    switch ($status) {
-      case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Moderation state.', [
-          '%label' => $moderation_state->label(),
-        ]));
-        break;
-
-      default:
-        drupal_set_message($this->t('Saved the %label Moderation state.', [
-          '%label' => $moderation_state->label(),
-        ]));
-    }
-    $form_state->setRedirectUrl($moderation_state->toUrl('collection'));
-  }
-
-}
diff --git a/web/core/modules/content_moderation/src/Form/ModerationStateTransitionDeleteForm.php b/web/core/modules/content_moderation/src/Form/ModerationStateTransitionDeleteForm.php
deleted file mode 100644
index f153f1f93..000000000
--- a/web/core/modules/content_moderation/src/Form/ModerationStateTransitionDeleteForm.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation\Form;
-
-use Drupal\Core\Entity\EntityConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Builds the form to delete Moderation state transition entities.
- */
-class ModerationStateTransitionDeleteForm extends EntityConfirmFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Are you sure you want to delete %name?', array('%name' => $this->entity->label()));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('entity.moderation_state_transition.collection');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->entity->delete();
-
-    drupal_set_message($this->t(
-      'Moderation transition %label deleted.',
-      ['%label' => $this->entity->label()]
-    ));
-
-    $form_state->setRedirectUrl($this->getCancelUrl());
-  }
-
-}
diff --git a/web/core/modules/content_moderation/src/Form/ModerationStateTransitionForm.php b/web/core/modules/content_moderation/src/Form/ModerationStateTransitionForm.php
deleted file mode 100644
index 8322c18e7..000000000
--- a/web/core/modules/content_moderation/src/Form/ModerationStateTransitionForm.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation\Form;
-
-use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Class ModerationStateTransitionForm.
- *
- * @package Drupal\content_moderation\Form
- */
-class ModerationStateTransitionForm extends EntityForm {
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * The entity query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
-
-  /**
-   * Constructs a new ModerationStateTransitionForm.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, QueryFactory $query_factory) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->queryFactory = $query_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static($container->get('entity_type.manager'), $container->get('entity.query'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $form = parent::form($form, $form_state);
-
-    /* @var \Drupal\content_moderation\ModerationStateTransitionInterface $moderation_state_transition */
-    $moderation_state_transition = $this->entity;
-    $form['label'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Label'),
-      '#maxlength' => 255,
-      '#default_value' => $moderation_state_transition->label(),
-      '#description' => $this->t('Label for the Moderation state transition.'),
-      '#required' => TRUE,
-    ];
-
-    $form['id'] = [
-      '#type' => 'machine_name',
-      '#default_value' => $moderation_state_transition->id(),
-      '#machine_name' => [
-        'exists' => '\Drupal\content_moderation\Entity\ModerationStateTransition::load',
-      ],
-      '#disabled' => !$moderation_state_transition->isNew(),
-    ];
-
-    $options = [];
-    foreach ($this->entityTypeManager->getStorage('moderation_state')
-               ->loadMultiple() as $moderation_state) {
-      $options[$moderation_state->id()] = $moderation_state->label();
-    }
-
-    $form['container'] = [
-      '#type' => 'container',
-      '#attributes' => [
-        'class' => ['container-inline'],
-      ],
-    ];
-
-    $form['container']['stateFrom'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Transition from'),
-      '#options' => $options,
-      '#required' => TRUE,
-      '#empty_option' => $this->t('-- Select --'),
-      '#default_value' => $moderation_state_transition->getFromState(),
-    ];
-
-    $form['container']['stateTo'] = [
-      '#type' => 'select',
-      '#options' => $options,
-      '#required' => TRUE,
-      '#title' => $this->t('Transition to'),
-      '#empty_option' => $this->t('-- Select --'),
-      '#default_value' => $moderation_state_transition->getToState(),
-    ];
-
-    // Make sure there's always at least a wide enough delta on weight to cover
-    // the current value or the total number of transitions. That way we
-    // never end up forcing a transition to change its weight needlessly.
-    $num_transitions = $this->queryFactory->get('moderation_state_transition')
-      ->count()
-      ->execute();
-    $delta = max(abs($moderation_state_transition->getWeight()), $num_transitions);
-
-    $form['weight'] = [
-      '#type' => 'weight',
-      '#delta' => $delta,
-      '#options' => $options,
-      '#title' => $this->t('Weight'),
-      '#default_value' => $moderation_state_transition->getWeight(),
-      '#description' => $this->t('Orders the transitions in moderation forms and the administrative listing. Heavier items will sink and the lighter items will be positioned nearer the top.'),
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $moderation_state_transition = $this->entity;
-    $status = $moderation_state_transition->save();
-
-    switch ($status) {
-      case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label Moderation state transition.', [
-          '%label' => $moderation_state_transition->label(),
-        ]));
-        break;
-
-      default:
-        drupal_set_message($this->t('Saved the %label Moderation state transition.', [
-          '%label' => $moderation_state_transition->label(),
-        ]));
-    }
-    $form_state->setRedirectUrl($moderation_state_transition->toUrl('collection'));
-  }
-
-}
diff --git a/web/core/modules/content_moderation/src/ModerationInformation.php b/web/core/modules/content_moderation/src/ModerationInformation.php
index ed33902a5..c20be5291 100644
--- a/web/core/modules/content_moderation/src/ModerationInformation.php
+++ b/web/core/modules/content_moderation/src/ModerationInformation.php
@@ -4,6 +4,7 @@ namespace Drupal\content_moderation;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 
@@ -19,16 +20,24 @@ class ModerationInformation implements ModerationInformationInterface {
    */
   protected $entityTypeManager;
 
+  /**
+   * The bundle information service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleInfo;
+
   /**
    * Creates a new ModerationInformation instance.
    *
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   The current user.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info
+   *   The bundle information service.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $bundle_info) {
     $this->entityTypeManager = $entity_type_manager;
+    $this->bundleInfo = $bundle_info;
   }
 
   /**
@@ -54,10 +63,8 @@ class ModerationInformation implements ModerationInformationInterface {
    */
   public function shouldModerateEntitiesOfBundle(EntityTypeInterface $entity_type, $bundle) {
     if ($this->canModerateEntitiesOfEntityType($entity_type)) {
-      $bundle_entity = $this->entityTypeManager->getStorage($entity_type->getBundleEntityType())->load($bundle);
-      if ($bundle_entity) {
-        return $bundle_entity->getThirdPartySetting('content_moderation', 'enabled', FALSE);
-      }
+      $bundles = $this->bundleInfo->getBundleInfo($entity_type->id());
+      return isset($bundles[$bundle]['workflow']);
     }
     return FALSE;
   }
@@ -123,10 +130,22 @@ class ModerationInformation implements ModerationInformationInterface {
    * {@inheritdoc}
    */
   public function isLiveRevision(ContentEntityInterface $entity) {
+    $workflow = $this->getWorkflowForEntity($entity);
     return $this->isLatestRevision($entity)
       && $entity->isDefaultRevision()
-      && $entity->moderation_state->entity
-      && $entity->moderation_state->entity->isPublishedState();
+      && $entity->moderation_state->value
+      && $workflow->getState($entity->moderation_state->value)->isPublishedState();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getWorkflowForEntity(ContentEntityInterface $entity) {
+    $bundles = $this->bundleInfo->getBundleInfo($entity->getEntityTypeId());
+    if (isset($bundles[$entity->bundle()]['workflow'])) {
+      return $this->entityTypeManager->getStorage('workflow')->load($bundles[$entity->bundle()]['workflow']);
+    };
+    return NULL;
   }
 
 }
diff --git a/web/core/modules/content_moderation/src/ModerationInformationInterface.php b/web/core/modules/content_moderation/src/ModerationInformationInterface.php
index 95a658e65..862987f8d 100644
--- a/web/core/modules/content_moderation/src/ModerationInformationInterface.php
+++ b/web/core/modules/content_moderation/src/ModerationInformationInterface.php
@@ -126,4 +126,15 @@ interface ModerationInformationInterface {
    */
   public function isLiveRevision(ContentEntityInterface $entity);
 
+  /**
+   * Gets the workflow for the given content entity.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   The content entity to get the workflow for.
+   *
+   * @return \Drupal\workflows\WorkflowInterface|null
+   *   The workflow entity. NULL if there is no workflow.
+   */
+  public function getWorkflowForEntity(ContentEntityInterface $entity);
+
 }
diff --git a/web/core/modules/content_moderation/src/ModerationStateAccessControlHandler.php b/web/core/modules/content_moderation/src/ModerationStateAccessControlHandler.php
deleted file mode 100644
index b2c86d7c7..000000000
--- a/web/core/modules/content_moderation/src/ModerationStateAccessControlHandler.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation;
-
-use Drupal\Core\Entity\EntityAccessControlHandler;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Access\AccessResult;
-
-/**
- * Access controller for the Moderation State entity.
- *
- * @see \Drupal\workbench_moderation\Entity\ModerationState.
- */
-class ModerationStateAccessControlHandler extends EntityAccessControlHandler {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
-    $admin_access = parent::checkAccess($entity, $operation, $account);
-
-    // Allow view with other permission.
-    if ($operation === 'view') {
-      return AccessResult::allowedIfHasPermission($account, 'view moderation states')->orIf($admin_access);
-    }
-
-    return $admin_access;
-  }
-
-}
diff --git a/web/core/modules/content_moderation/src/ModerationStateInterface.php b/web/core/modules/content_moderation/src/ModerationStateInterface.php
deleted file mode 100644
index 99f664fa9..000000000
--- a/web/core/modules/content_moderation/src/ModerationStateInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-
-/**
- * Provides an interface for defining Moderation state entities.
- */
-interface ModerationStateInterface extends ConfigEntityInterface {
-
-  /**
-   * Determines if content updated to this state should be published.
-   *
-   * @return bool
-   *   TRUE if content updated to this state should be published.
-   */
-  public function isPublishedState();
-
-  /**
-   * Determines if content updated to this state should be the default revision.
-   *
-   * @return bool
-   *   TRUE if content in this state should be the default revision.
-   */
-  public function isDefaultRevisionState();
-
-}
diff --git a/web/core/modules/content_moderation/src/ModerationStateListBuilder.php b/web/core/modules/content_moderation/src/ModerationStateListBuilder.php
deleted file mode 100644
index 05ba51307..000000000
--- a/web/core/modules/content_moderation/src/ModerationStateListBuilder.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation;
-
-use Drupal\Core\Config\Entity\DraggableListBuilder;
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Provides a listing of Moderation state entities.
- */
-class ModerationStateListBuilder extends DraggableListBuilder {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'moderation_state_admin_overview_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $header['label'] = $this->t('Moderation state');
-    $header['id'] = $this->t('Machine name');
-
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    $row['label'] = $entity->label();
-    $row['id']['#markup'] = $entity->id();
-
-    return $row + parent::buildRow($entity);
-  }
-
-}
diff --git a/web/core/modules/content_moderation/src/ModerationStateTransitionInterface.php b/web/core/modules/content_moderation/src/ModerationStateTransitionInterface.php
deleted file mode 100644
index 91b5b13ca..000000000
--- a/web/core/modules/content_moderation/src/ModerationStateTransitionInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-
-/**
- * Provides an interface for defining Moderation state transition entities.
- */
-interface ModerationStateTransitionInterface extends ConfigEntityInterface {
-
-  /**
-   * Gets the from state for the given transition.
-   *
-   * @return string
-   *   The moderation state ID for the from state.
-   */
-  public function getFromState();
-
-  /**
-   * Gets the to state for the given transition.
-   *
-   * @return string
-   *   The moderation state ID for the to state.
-   */
-  public function getToState();
-
-  /**
-   * Gets the weight for the given transition.
-   *
-   * @return int
-   *   The weight of this transition.
-   */
-  public function getWeight();
-
-}
diff --git a/web/core/modules/content_moderation/src/ModerationStateTransitionListBuilder.php b/web/core/modules/content_moderation/src/ModerationStateTransitionListBuilder.php
deleted file mode 100644
index 577283e6f..000000000
--- a/web/core/modules/content_moderation/src/ModerationStateTransitionListBuilder.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation;
-
-use Drupal\Core\Config\Entity\DraggableListBuilder;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\user\RoleStorageInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a listing of Moderation state transition entities.
- */
-class ModerationStateTransitionListBuilder extends DraggableListBuilder {
-
-  /**
-   * Moderation state entity storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $stateStorage;
-
-  /**
-   * The role storage.
-   *
-   * @var \Drupal\user\RoleStorageInterface
-   */
-  protected $roleStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
-      $container->get('entity.manager')->getStorage('moderation_state'),
-      $container->get('entity.manager')->getStorage('user_role')
-    );
-  }
-
-  /**
-   * Constructs a new ModerationStateTransitionListBuilder.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   Entity Type.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $transition_storage
-   *   Moderation state transition entity storage.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $state_storage
-   *   Moderation state entity storage.
-   * @param \Drupal\user\RoleStorageInterface $role_storage
-   *   The role storage.
-   */
-  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $transition_storage, EntityStorageInterface $state_storage, RoleStorageInterface $role_storage) {
-    parent::__construct($entity_type, $transition_storage);
-    $this->stateStorage = $state_storage;
-    $this->roleStorage = $role_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'content_moderation_transition_list';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $header['to'] = $this->t('To state');
-    $header['label'] = $this->t('Button label');
-    $header['roles'] = $this->t('Allowed roles');
-
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    $row['to']['#markup'] = $this->stateStorage->load($entity->getToState())->label();
-    $row['label'] = $entity->label();
-    $row['roles']['#markup'] = implode(', ', user_role_names(FALSE, 'use ' . $entity->id() . ' transition'));
-
-    return $row + parent::buildRow($entity);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render() {
-    $build = parent::render();
-
-    $build['item'] = [
-      '#type' => 'item',
-      '#markup' => $this->t('On this screen you can define <em>transitions</em>. Every time an entity is saved, it undergoes a transition. It is not possible to save an entity if it tries do a transition not defined here. Transitions do not necessarily mean a state change, it is possible to transition from a state to the same state but that transition needs to be defined here as well.'),
-      '#weight' => -5,
-    ];
-
-    return $build;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $this->entities = $this->load();
-
-    // Get all the moderation states and sort them by weight.
-    $states = $this->stateStorage->loadMultiple();
-    uasort($states, array($this->entityType->getClass(), 'sort'));
-
-    /** @var \Drupal\content_moderation\ModerationStateTransitionInterface $entity */
-    $groups = array_fill_keys(array_keys($states), []);
-    foreach ($this->entities as $entity) {
-      $groups[$entity->getFromState()][] = $entity;
-    }
-
-    foreach ($groups as $group_name => $entities) {
-      $form[$group_name] = [
-        '#type' => 'details',
-        '#title' => $this->t('From @state to...', ['@state' => $states[$group_name]->label()]),
-        // Make sure that the first group is always open.
-        '#open' => $group_name === array_keys($groups)[0],
-      ];
-
-      $form[$group_name][$this->entitiesKey] = array(
-        '#type' => 'table',
-        '#header' => $this->buildHeader(),
-        '#empty' => t('There is no @label yet.', array('@label' => $this->entityType->getLabel())),
-        '#tabledrag' => array(
-          array(
-            'action' => 'order',
-            'relationship' => 'sibling',
-            'group' => 'weight',
-          ),
-        ),
-      );
-
-      $delta = 10;
-      // Change the delta of the weight field if have more than 20 entities.
-      if (!empty($this->weightKey)) {
-        $count = count($this->entities);
-        if ($count > 20) {
-          $delta = ceil($count / 2);
-        }
-      }
-      foreach ($entities as $entity) {
-        $row = $this->buildRow($entity);
-        if (isset($row['label'])) {
-          $row['label'] = array('#markup' => $row['label']);
-        }
-        if (isset($row['weight'])) {
-          $row['weight']['#delta'] = $delta;
-        }
-        $form[$group_name][$this->entitiesKey][$entity->id()] = $row;
-      }
-    }
-
-    $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Save order'),
-      '#button_type' => 'primary',
-    );
-
-    return $form;
-  }
-
-}
diff --git a/web/core/modules/content_moderation/src/ParamConverter/EntityRevisionConverter.php b/web/core/modules/content_moderation/src/ParamConverter/EntityRevisionConverter.php
index 980c61ebd..94f10e9f0 100644
--- a/web/core/modules/content_moderation/src/ParamConverter/EntityRevisionConverter.php
+++ b/web/core/modules/content_moderation/src/ParamConverter/EntityRevisionConverter.php
@@ -95,7 +95,7 @@ class EntityRevisionConverter extends EntityConverter {
       // If the entity type is translatable, ensure we return the proper
       // translation object for the current context.
       if ($latest_revision instanceof EntityInterface && $entity instanceof TranslatableInterface) {
-        $latest_revision = $this->entityManager->getTranslationFromContext($latest_revision, NULL, array('operation' => 'entity_upcast'));
+        $latest_revision = $this->entityManager->getTranslationFromContext($latest_revision, NULL, ['operation' => 'entity_upcast']);
       }
 
       if ($latest_revision->isRevisionTranslationAffected()) {
diff --git a/web/core/modules/content_moderation/src/Permissions.php b/web/core/modules/content_moderation/src/Permissions.php
index 027684c2c..efa684931 100644
--- a/web/core/modules/content_moderation/src/Permissions.php
+++ b/web/core/modules/content_moderation/src/Permissions.php
@@ -3,8 +3,7 @@
 namespace Drupal\content_moderation;
 
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\content_moderation\Entity\ModerationState;
-use Drupal\content_moderation\Entity\ModerationStateTransition;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * Defines a class for dynamic permissions based on transitions.
@@ -20,24 +19,20 @@ class Permissions {
    *   The transition permissions.
    */
   public function transitionPermissions() {
-    // @todo https://www.drupal.org/node/2779933 write a test for this.
-    $perms = [];
-    /* @var \Drupal\content_moderation\ModerationStateInterface[] $states */
-    $states = ModerationState::loadMultiple();
-    /* @var \Drupal\content_moderation\ModerationStateTransitionInterface $transition */
-    foreach (ModerationStateTransition::loadMultiple() as $id => $transition) {
-      $perms['use ' . $id . ' transition'] = [
-        'title' => $this->t('Use the %transition_name transition', [
-          '%transition_name' => $transition->label(),
-        ]),
-        'description' => $this->t('Move content from %from state to %to state.', [
-          '%from' => $states[$transition->getFromState()]->label(),
-          '%to' => $states[$transition->getToState()]->label(),
-        ]),
-      ];
+    $permissions = [];
+    /** @var \Drupal\workflows\WorkflowInterface $workflow */
+    foreach (Workflow::loadMultipleByType('content_moderation') as $id => $workflow) {
+      foreach ($workflow->getTransitions() as $transition) {
+        $permissions['use ' . $workflow->id() . ' transition ' . $transition->id()] = [
+          'title' => $this->t('Use %transition transition from %workflow workflow.', [
+            '%transition' => $transition->label(),
+            '%workflow' => $workflow->label(),
+          ]),
+        ];
+      }
     }
 
-    return $perms;
+    return $permissions;
   }
 
 }
diff --git a/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php b/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php
index e3563ae44..b2d85335a 100644
--- a/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php
+++ b/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublishNode.php
@@ -53,23 +53,14 @@ class ModerationOptOutPublishNode extends PublishNode implements ContainerFactor
   /**
    * {@inheritdoc}
    */
-  public function execute($entity = NULL) {
+  public function access($entity, AccountInterface $account = NULL, $return_as_object = FALSE) {
+    /** @var \Drupal\node\NodeInterface $entity */
     if ($entity && $this->moderationInfo->isModeratedEntity($entity)) {
-      drupal_set_message($this->t('One or more entities were skipped as they are under moderation and may not be directly published or unpublished.'));
-      return;
+      drupal_set_message($this->t("@bundle @label were skipped as they are under moderation and may not be directly published.", ['@bundle' => node_get_type_label($entity), '@label' => $entity->getEntityType()->getPluralLabel()]), 'warning');
+      $result = AccessResult::forbidden();
+      return $return_as_object ? $result : $result->isAllowed();
     }
-
-    parent::execute($entity);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
-    $result = parent::access($object, $account, TRUE)
-      ->andif(AccessResult::forbiddenIf($this->moderationInfo->isModeratedEntity($object))->addCacheableDependency($object));
-
-    return $return_as_object ? $result : $result->isAllowed();
+    return parent::access($entity, $account, $return_as_object);
   }
 
 }
diff --git a/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php b/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php
index 28b968991..ee3616946 100644
--- a/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php
+++ b/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutUnpublishNode.php
@@ -53,23 +53,14 @@ class ModerationOptOutUnpublishNode extends UnpublishNode implements ContainerFa
   /**
    * {@inheritdoc}
    */
-  public function execute($entity = NULL) {
+  public function access($entity, AccountInterface $account = NULL, $return_as_object = FALSE) {
+    /** @var \Drupal\node\NodeInterface $entity */
     if ($entity && $this->moderationInfo->isModeratedEntity($entity)) {
-      drupal_set_message($this->t('One or more entities were skipped as they are under moderation and may not be directly published or unpublished.'));
-      return;
+      drupal_set_message($this->t("@bundle @label were skipped as they are under moderation and may not be directly unpublished.", ['@bundle' => node_get_type_label($entity), '@label' => $entity->getEntityType()->getPluralLabel()]), 'warning');
+      $result = AccessResult::forbidden();
+      return $return_as_object ? $result : $result->isAllowed();
     }
-
-    parent::execute($entity);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
-    $result = parent::access($object, $account, TRUE)
-      ->andif(AccessResult::forbiddenIf($this->moderationInfo->isModeratedEntity($object))->addCacheableDependency($object));
-
-    return $return_as_object ? $result : $result->isAllowed();
+    return parent::access($entity, $account, $return_as_object);
   }
 
 }
diff --git a/web/core/modules/content_moderation/src/Plugin/Field/FieldFormatter/ContentModerationStateFormatter.php b/web/core/modules/content_moderation/src/Plugin/Field/FieldFormatter/ContentModerationStateFormatter.php
new file mode 100644
index 000000000..c2dbc0ea8
--- /dev/null
+++ b/web/core/modules/content_moderation/src/Plugin/Field/FieldFormatter/ContentModerationStateFormatter.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\content_moderation\Plugin\Field\FieldFormatter;
+
+use Drupal\content_moderation\ModerationInformationInterface;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FormatterBase;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Plugin implementation of the 'content_moderation_state' formatter.
+ *
+ * @FieldFormatter(
+ *   id = "content_moderation_state",
+ *   label = @Translation("Content moderation state"),
+ *   field_types = {
+ *     "string",
+ *   }
+ * )
+ */
+class ContentModerationStateFormatter extends FormatterBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The moderation information service.
+   *
+   * @var \Drupal\content_moderation\ModerationInformationInterface
+   */
+  protected $moderationInformation;
+
+  /**
+   * Create an instance of ContentModerationStateFormatter.
+   */
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, ModerationInformationInterface $moderation_information) {
+    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
+    $this->moderationInformation = $moderation_information;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $plugin_id,
+      $plugin_definition,
+      $configuration['field_definition'],
+      $configuration['settings'],
+      $configuration['label'],
+      $configuration['view_mode'],
+      $configuration['third_party_settings'],
+      $container->get('content_moderation.moderation_information')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items, $langcode) {
+    $elements = [];
+    $workflow = $this->moderationInformation->getWorkflowForEntity($items->getEntity());
+    foreach ($items as $delta => $item) {
+      $elements[$delta] = [
+        '#markup' => $workflow->getState($item->value)->label(),
+      ];
+    }
+    return $elements;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function isApplicable(FieldDefinitionInterface $field_definition) {
+    return $field_definition->getName() === 'moderation_state' && $field_definition->getTargetEntityTypeId() !== 'content_moderation_state';
+  }
+
+}
diff --git a/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php b/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
index d6dc89dca..970ac33a5 100644
--- a/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
+++ b/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
@@ -3,9 +3,7 @@
 namespace Drupal\content_moderation\Plugin\Field\FieldWidget;
 
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\Plugin\Field\FieldWidget\OptionsSelectWidget;
@@ -23,7 +21,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  *   id = "moderation_state_default",
  *   label = @Translation("Moderation state"),
  *   field_types = {
- *     "entity_reference"
+ *     "string"
  *   }
  * )
  */
@@ -36,20 +34,6 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
    */
   protected $currentUser;
 
-  /**
-   * Moderation state transition entity query.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryInterface
-   */
-  protected $moderationStateTransitionEntityQuery;
-
-  /**
-   * Moderation state storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $moderationStateStorage;
-
   /**
    * Moderation information service.
    *
@@ -64,13 +48,6 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
    */
   protected $entityTypeManager;
 
-  /**
-   * Moderation state transition storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $moderationStateTransitionStorage;
-
   /**
    * Moderation state transition validation service.
    *
@@ -95,22 +72,13 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
    *   Current user service.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   Entity type manager.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $moderation_state_storage
-   *   Moderation state storage.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $moderation_state_transition_storage
-   *   Moderation state transition storage.
-   * @param \Drupal\Core\Entity\Query\QueryInterface $entity_query
-   *   Moderation transition entity query service.
    * @param \Drupal\content_moderation\ModerationInformation $moderation_information
    *   Moderation information service.
    * @param \Drupal\content_moderation\StateTransitionValidation $validator
    *   Moderation state transition validation service
    */
-  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings, AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, EntityStorageInterface $moderation_state_storage, EntityStorageInterface $moderation_state_transition_storage, QueryInterface $entity_query, ModerationInformation $moderation_information, StateTransitionValidation $validator) {
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, array $third_party_settings, AccountInterface $current_user, EntityTypeManagerInterface $entity_type_manager, ModerationInformation $moderation_information, StateTransitionValidation $validator) {
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $third_party_settings);
-    $this->moderationStateTransitionEntityQuery = $entity_query;
-    $this->moderationStateTransitionStorage = $moderation_state_transition_storage;
-    $this->moderationStateStorage = $moderation_state_storage;
     $this->entityTypeManager = $entity_type_manager;
     $this->currentUser = $current_user;
     $this->moderationInformation = $moderation_information;
@@ -129,9 +97,6 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
       $configuration['third_party_settings'],
       $container->get('current_user'),
       $container->get('entity_type.manager'),
-      $container->get('entity_type.manager')->getStorage('moderation_state'),
-      $container->get('entity_type.manager')->getStorage('moderation_state_transition'),
-      $container->get('entity.query')->get('moderation_state_transition', 'AND'),
       $container->get('content_moderation.moderation_information'),
       $container->get('content_moderation.state_transition_validation')
     );
@@ -151,19 +116,18 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
       return $element + ['#access' => FALSE];
     }
 
-    $default = $items->get($delta)->value ?: $bundle_entity->getThirdPartySetting('content_moderation', 'default_moderation_state', FALSE);
-    /** @var \Drupal\content_moderation\ModerationStateInterface $default_state */
-    $default_state = $this->entityTypeManager->getStorage('moderation_state')->load($default);
-    if (!$default || !$default_state) {
+    $workflow = $this->moderationInformation->getWorkflowForEntity($entity);
+    $default = $items->get($delta)->value ? $workflow->getState($items->get($delta)->value) : $workflow->getInitialState();
+    if (!$default) {
       throw new \UnexpectedValueException(sprintf('The %s bundle has an invalid moderation state configuration, moderation states are enabled but no default is set.', $bundle_entity->label()));
     }
 
+    /** @var \Drupal\workflows\Transition[] $transitions */
     $transitions = $this->validator->getValidTransitions($entity, $this->currentUser);
 
     $target_states = [];
-    /** @var \Drupal\content_moderation\Entity\ModerationStateTransition $transition */
     foreach ($transitions as $transition) {
-      $target_states[$transition->getToState()] = $transition->label();
+      $target_states[$transition->to()->id()] = $transition->label();
     }
 
     // @todo https://www.drupal.org/node/2779933 write a test for this.
@@ -171,11 +135,11 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
       '#access' => FALSE,
       '#type' => 'select',
       '#options' => $target_states,
-      '#default_value' => $default,
-      '#published' => $default ? $default_state->isPublishedState() : FALSE,
+      '#default_value' => $default->id(),
+      '#published' => $default->isPublishedState(),
       '#key_column' => $this->column,
     ];
-    $element['#element_validate'][] = array(get_class($this), 'validateElement');
+    $element['#element_validate'][] = [get_class($this), 'validateElement'];
 
     // Use the dropbutton.
     $element['#process'][] = [get_called_class(), 'processActions'];
@@ -197,7 +161,7 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
   public static function updateStatus($entity_type_id, ContentEntityInterface $entity, array $form, FormStateInterface $form_state) {
     $element = $form_state->getTriggeringElement();
     if (isset($element['#moderation_state'])) {
-      $entity->moderation_state->target_id = $element['#moderation_state'];
+      $entity->moderation_state->value = $element['#moderation_state'];
     }
   }
 
@@ -249,7 +213,7 @@ class ModerationStateWidget extends OptionsSelectWidget implements ContainerFact
    * {@inheritdoc}
    */
   public static function isApplicable(FieldDefinitionInterface $field_definition) {
-    return parent::isApplicable($field_definition) && $field_definition->getName() === 'moderation_state';
+    return $field_definition->getName() === 'moderation_state';
   }
 
 }
diff --git a/web/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php b/web/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
index c32521c44..0444644f9 100644
--- a/web/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
+++ b/web/core/modules/content_moderation/src/Plugin/Field/ModerationStateFieldItemList.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\content_moderation\Plugin\Field;
 
-use Drupal\content_moderation\Entity\ModerationState;
-use Drupal\Core\Field\EntityReferenceFieldItemList;
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Field\FieldItemList;
 
 /**
  * A computed field that provides a content entity's moderation state.
@@ -11,60 +11,75 @@ use Drupal\Core\Field\EntityReferenceFieldItemList;
  * It links content entities to a moderation state configuration entity via a
  * moderation state content entity.
  */
-class ModerationStateFieldItemList extends EntityReferenceFieldItemList {
+class ModerationStateFieldItemList extends FieldItemList {
 
   /**
-   * Gets the moderation state entity linked to a content entity revision.
+   * Gets the moderation state ID linked to a content entity revision.
    *
-   * @return \Drupal\content_moderation\ModerationStateInterface|null
-   *   The moderation state configuration entity linked to a content entity
-   *   revision.
+   * @return string|null
+   *   The moderation state ID linked to a content entity revision.
    */
-  protected function getModerationState() {
+  protected function getModerationStateId() {
     $entity = $this->getEntity();
 
-    if (!\Drupal::service('content_moderation.moderation_information')->shouldModerateEntitiesOfBundle($entity->getEntityType(), $entity->bundle())) {
+    /** @var \Drupal\content_moderation\ModerationInformationInterface $moderation_info */
+    $moderation_info = \Drupal::service('content_moderation.moderation_information');
+    if (!$moderation_info->shouldModerateEntitiesOfBundle($entity->getEntityType(), $entity->bundle())) {
       return NULL;
     }
 
-    if ($entity->id() && $entity->getRevisionId()) {
-      $revisions = \Drupal::service('entity.query')->get('content_moderation_state')
-        ->condition('content_entity_type_id', $entity->getEntityTypeId())
-        ->condition('content_entity_id', $entity->id())
-        ->condition('content_entity_revision_id', $entity->getRevisionId())
-        ->allRevisions()
-        ->sort('revision_id', 'DESC')
-        ->execute();
-
-      if ($revision_to_load = key($revisions)) {
-        /** @var \Drupal\content_moderation\ContentModerationStateInterface $content_moderation_state */
-        $content_moderation_state = \Drupal::entityTypeManager()
-          ->getStorage('content_moderation_state')
-          ->loadRevision($revision_to_load);
-
-        // Return the correct translation.
-        if ($entity->getEntityType()->hasKey('langcode')) {
-          $langcode = $entity->language()->getId();
-          if (!$content_moderation_state->hasTranslation($langcode)) {
-            $content_moderation_state->addTranslation($langcode);
-          }
-          if ($content_moderation_state->language()->getId() !== $langcode) {
-            $content_moderation_state = $content_moderation_state->getTranslation($langcode);
-          }
-        }
-
-        return $content_moderation_state->get('moderation_state')->entity;
-      }
+    // Existing entities will have a corresponding content_moderation_state
+    // entity associated with them.
+    if (!$entity->isNew() && $content_moderation_state = $this->loadContentModerationStateRevision($entity)) {
+      return $content_moderation_state->moderation_state->value;
     }
+
     // It is possible that the bundle does not exist at this point. For example,
     // the node type form creates a fake Node entity to get default values.
     // @see \Drupal\node\NodeTypeForm::form()
-    $bundle_entity = \Drupal::entityTypeManager()
-      ->getStorage($entity->getEntityType()->getBundleEntityType())
-      ->load($entity->bundle());
-    if ($bundle_entity && ($default = $bundle_entity->getThirdPartySetting('content_moderation', 'default_moderation_state'))) {
-      return ModerationState::load($default);
+    $workflow = $moderation_info->getWorkflowForEntity($entity);
+    return $workflow ? $workflow->getInitialState()->id() : NULL;
+  }
+
+  /**
+   * Load the content moderation state revision associated with an entity.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   The entity the content moderation state entity will be loaded from.
+   *
+   * @return \Drupal\content_moderation\ContentModerationStateInterface|null
+   *   The content_moderation_state revision or FALSE if none exists.
+   */
+  protected function loadContentModerationStateRevision(ContentEntityInterface $entity) {
+    $moderation_info = \Drupal::service('content_moderation.moderation_information');
+    $content_moderation_storage = \Drupal::entityTypeManager()->getStorage('content_moderation_state');
+
+    $revisions = \Drupal::service('entity.query')->get('content_moderation_state')
+      ->condition('content_entity_type_id', $entity->getEntityTypeId())
+      ->condition('content_entity_id', $entity->id())
+      // Ensure the correct revision is loaded in scenarios where a revision is
+      // being reverted.
+      ->condition('content_entity_revision_id', $entity->isNewRevision() ? $entity->getLoadedRevisionId() : $entity->getRevisionId())
+      ->condition('workflow', $moderation_info->getWorkflowForEntity($entity)->id())
+      ->allRevisions()
+      ->sort('revision_id', 'DESC')
+      ->execute();
+    if (empty($revisions)) {
+      return NULL;
     }
+
+    /** @var \Drupal\content_moderation\ContentModerationStateInterface $content_moderation_state */
+    $content_moderation_state = $content_moderation_storage->loadRevision(key($revisions));
+    if ($entity->getEntityType()->hasKey('langcode')) {
+      $langcode = $entity->language()->getId();
+      if (!$content_moderation_state->hasTranslation($langcode)) {
+        $content_moderation_state->addTranslation($langcode);
+      }
+      if ($content_moderation_state->language()->getId() !== $langcode) {
+        $content_moderation_state = $content_moderation_state->getTranslation($langcode);
+      }
+    }
+    return $content_moderation_state;
   }
 
   /**
@@ -93,10 +108,11 @@ class ModerationStateFieldItemList extends EntityReferenceFieldItemList {
     // Compute the value of the moderation state.
     $index = 0;
     if (!isset($this->list[$index]) || $this->list[$index]->isEmpty()) {
-      $moderation_state = $this->getModerationState();
+
+      $moderation_state = $this->getModerationStateId();
       // Do not store NULL values in the static cache.
       if ($moderation_state) {
-        $this->list[$index] = $this->createItem($index, ['entity' => $moderation_state]);
+        $this->list[$index] = $this->createItem($index, $moderation_state);
       }
     }
   }
diff --git a/web/core/modules/content_moderation/src/Plugin/Menu/EditTab.php b/web/core/modules/content_moderation/src/Plugin/Menu/EditTab.php
index 2980ae824..b94a45976 100644
--- a/web/core/modules/content_moderation/src/Plugin/Menu/EditTab.php
+++ b/web/core/modules/content_moderation/src/Plugin/Menu/EditTab.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\content_moderation\Plugin\Menu;
 
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Menu\LocalTaskDefault;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -25,9 +26,9 @@ class EditTab extends LocalTaskDefault implements ContainerFactoryPluginInterfac
   protected $moderationInfo;
 
   /**
-   * The entity.
+   * The entity if determinable from the route or FALSE.
    *
-   * @var \Drupal\Core\Entity\ContentEntityInterface
+   * @var \Drupal\Core\Entity\ContentEntityInterface|FALSE
    */
   protected $entity;
 
@@ -69,8 +70,8 @@ class EditTab extends LocalTaskDefault implements ContainerFactoryPluginInterfac
    * {@inheritdoc}
    */
   public function getRouteParameters(RouteMatchInterface $route_match) {
-    // Override the node here with the latest revision.
-    $this->entity = $route_match->getParameter($this->pluginDefinition['entity_type_id']);
+    $entity_parameter = $route_match->getParameter($this->pluginDefinition['entity_type_id']);
+    $this->entity = $entity_parameter instanceof ContentEntityInterface ? $route_match->getParameter($this->pluginDefinition['entity_type_id']) : FALSE;
     return parent::getRouteParameters($route_match);
   }
 
@@ -78,12 +79,11 @@ class EditTab extends LocalTaskDefault implements ContainerFactoryPluginInterfac
    * {@inheritdoc}
    */
   public function getTitle() {
-    if (!$this->moderationInfo->isModeratedEntity($this->entity)) {
-      // Moderation isn't enabled.
+    // If the entity couldn't be loaded or moderation isn't enabled.
+    if (!$this->entity || !$this->moderationInfo->isModeratedEntity($this->entity)) {
       return parent::getTitle();
     }
 
-    // @todo https://www.drupal.org/node/2779933 write a test for this.
     return $this->moderationInfo->isLiveRevision($this->entity)
       ? $this->t('New draft')
       : $this->t('Edit draft');
@@ -93,11 +93,12 @@ class EditTab extends LocalTaskDefault implements ContainerFactoryPluginInterfac
    * {@inheritdoc}
    */
   public function getCacheTags() {
-    // @todo https://www.drupal.org/node/2779933 write a test for this.
     $tags = parent::getCacheTags();
     // Tab changes if node or node-type is modified.
-    $tags = array_merge($tags, $this->entity->getCacheTags());
-    $tags[] = $this->entity->getEntityType()->getBundleEntityType() . ':' . $this->entity->bundle();
+    if ($this->entity) {
+      $tags = array_merge($tags, $this->entity->getCacheTags());
+      $tags[] = $this->entity->getEntityType()->getBundleEntityType() . ':' . $this->entity->bundle();
+    }
     return $tags;
   }
 
diff --git a/web/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraintValidator.php b/web/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraintValidator.php
index ca75604a8..d9308e8a1 100644
--- a/web/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraintValidator.php
+++ b/web/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraintValidator.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\content_moderation\Plugin\Validation\Constraint;
 
-use Drupal\content_moderation\Entity\ModerationState as ModerationStateEntity;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -93,21 +92,13 @@ class ModerationStateConstraintValidator extends ConstraintValidator implements
       $original_entity = $original_entity->getTranslation($entity->language()->getId());
     }
 
-    if ($entity->moderation_state->target_id) {
-      $new_state_id = $entity->moderation_state->target_id;
-    }
-    else {
-      $new_state_id = $default = $this->entityTypeManager
-        ->getStorage($entity->getEntityType()->getBundleEntityType())->load($entity->bundle())
-        ->getThirdPartySetting('content_moderation', 'default_moderation_state');
-    }
-    if ($new_state_id) {
-      $new_state = ModerationStateEntity::load($new_state_id);
-    }
-    // @todo - what if $new_state_id references something that does not exist or
+    $workflow = $this->moderationInformation->getWorkflowForEntity($entity);
+    $new_state = $workflow->getState($entity->moderation_state->value) ?: $workflow->getInitialState();
+    $original_state = $workflow->getState($original_entity->moderation_state->value);
+    // @todo - what if $new_state references something that does not exist or
     //   is null.
-    if (!$this->validation->isTransitionAllowed($original_entity->moderation_state->entity, $new_state)) {
-      $this->context->addViolation($constraint->message, ['%from' => $original_entity->moderation_state->entity->label(), '%to' => $new_state->label()]);
+    if (!$original_state->canTransitionTo($new_state->id())) {
+      $this->context->addViolation($constraint->message, ['%from' => $original_state->label(), '%to' => $new_state->label()]);
     }
   }
 
@@ -126,9 +117,9 @@ class ModerationStateConstraintValidator extends ConstraintValidator implements
   protected function isFirstTimeModeration(EntityInterface $entity) {
     $original_entity = $this->moderationInformation->getLatestRevision($entity->getEntityTypeId(), $entity->id());
 
-    $original_id = $original_entity->moderation_state->target_id;
+    $original_id = $original_entity->moderation_state;
 
-    return !($entity->moderation_state->target_id && $original_entity && $original_id);
+    return !($entity->moderation_state && $original_entity && $original_id);
   }
 
 }
diff --git a/web/core/modules/content_moderation/src/Plugin/WorkflowType/ContentModeration.php b/web/core/modules/content_moderation/src/Plugin/WorkflowType/ContentModeration.php
new file mode 100644
index 000000000..31f1c18c6
--- /dev/null
+++ b/web/core/modules/content_moderation/src/Plugin/WorkflowType/ContentModeration.php
@@ -0,0 +1,292 @@
+<?php
+
+namespace Drupal\content_moderation\Plugin\WorkflowType;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\content_moderation\ContentModerationState;
+use Drupal\workflows\Plugin\WorkflowTypeBase;
+use Drupal\workflows\StateInterface;
+use Drupal\workflows\WorkflowInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Attaches workflows to content entity types and their bundles.
+ *
+ * @WorkflowType(
+ *   id = "content_moderation",
+ *   label = @Translation("Content moderation"),
+ *   required_states = {
+ *     "draft",
+ *     "published",
+ *   },
+ * )
+ */
+class ContentModeration extends WorkflowTypeBase implements ContainerFactoryPluginInterface {
+
+  use StringTranslationTrait;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Creates an instance of the ContentModeration WorkflowType plugin.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function initializeWorkflow(WorkflowInterface $workflow) {
+    $workflow
+      ->addState('draft', $this->t('Draft'))
+      ->setStateWeight('draft', -5)
+      ->addState('published', $this->t('Published'))
+      ->setStateWeight('published', 0)
+      ->addTransition('create_new_draft', $this->t('Create New Draft'), ['draft', 'published'], 'draft')
+      ->addTransition('publish', $this->t('Publish'), ['draft', 'published'], 'published');
+    return $workflow;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function checkWorkflowAccess(WorkflowInterface $entity, $operation, AccountInterface $account) {
+    if ($operation === 'view') {
+      return AccessResult::allowedIfHasPermission($account, 'view content moderation');
+    }
+    return parent::checkWorkflowAccess($entity, $operation, $account);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function decorateState(StateInterface $state) {
+    if (isset($this->configuration['states'][$state->id()])) {
+      $state = new ContentModerationState($state, $this->configuration['states'][$state->id()]['published'], $this->configuration['states'][$state->id()]['default_revision']);
+    }
+    else {
+      $state = new ContentModerationState($state);
+    }
+    return $state;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildStateConfigurationForm(FormStateInterface $form_state, WorkflowInterface $workflow, StateInterface $state = NULL) {
+    /** @var \Drupal\content_moderation\ContentModerationState $state */
+    $is_required_state = isset($state) ? in_array($state->id(), $this->getRequiredStates(), TRUE) : FALSE;
+
+    $form = [];
+    $form['published'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Published'),
+      '#description' => $this->t('When content reaches this state it should be published.'),
+      '#default_value' => isset($state) ? $state->isPublishedState() : FALSE,
+      '#disabled' => $is_required_state,
+    ];
+
+    $form['default_revision'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Default revision'),
+      '#description' => $this->t('When content reaches this state it should be made the default revision; this is implied for published states.'),
+      '#default_value' => isset($state) ? $state->isDefaultRevisionState() : FALSE,
+      '#disabled' => $is_required_state,
+      // @todo Add form #state to force "make default" on when "published" is
+      // on for a state.
+      // @see https://www.drupal.org/node/2645614
+    ];
+    return $form;
+  }
+
+  /**
+   * Gets the entity types the workflow is applied to.
+   *
+   * @return string[]
+   *   The entity types the workflow is applied to.
+   */
+  public function getEntityTypes() {
+    return array_keys($this->configuration['entity_types']);
+  }
+
+  /**
+   * Gets any bundles the workflow is applied to for the given entity type.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID to get the bundles for.
+   *
+   * @return string[]
+   *   The bundles of the entity type the workflow is applied to or an empty
+   *   array if the entity type is not applied to the workflow.
+   */
+  public function getBundlesForEntityType($entity_type_id) {
+    return isset($this->configuration['entity_types'][$entity_type_id]) ? $this->configuration['entity_types'][$entity_type_id] : [];
+  }
+
+  /**
+   * Checks if the workflow applies to the supplied entity type and bundle.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID to check.
+   * @param string $bundle_id
+   *   The bundle ID to check.
+   *
+   * @return bool
+   *   TRUE if the workflow applies to the supplied entity type ID and bundle
+   *   ID. FALSE if not.
+   */
+  public function appliesToEntityTypeAndBundle($entity_type_id, $bundle_id) {
+    return in_array($bundle_id, $this->getBundlesForEntityType($entity_type_id), TRUE);
+  }
+
+  /**
+   * Removes an entity type ID / bundle ID from the workflow.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID to remove.
+   * @param string $bundle_id
+   *   The bundle ID to remove.
+   */
+  public function removeEntityTypeAndBundle($entity_type_id, $bundle_id) {
+    $key = array_search($bundle_id, $this->configuration['entity_types'][$entity_type_id], TRUE);
+    if ($key !== FALSE) {
+      unset($this->configuration['entity_types'][$entity_type_id][$key]);
+      if (empty($this->configuration['entity_types'][$entity_type_id])) {
+        unset($this->configuration['entity_types'][$entity_type_id]);
+      }
+      else {
+        $this->configuration['entity_types'][$entity_type_id] = array_values($this->configuration['entity_types'][$entity_type_id]);
+      }
+    }
+  }
+
+  /**
+   * Add an entity type ID / bundle ID to the workflow.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID to add. It is responsibility of the caller to provide
+   *   a valid entity type ID.
+   * @param string $bundle_id
+   *   The bundle ID to add. It is responsibility of the caller to provide a
+   *   valid bundle ID.
+   */
+  public function addEntityTypeAndBundle($entity_type_id, $bundle_id) {
+    if (!$this->appliesToEntityTypeAndBundle($entity_type_id, $bundle_id)) {
+      $this->configuration['entity_types'][$entity_type_id][] = $bundle_id;
+      sort($this->configuration['entity_types'][$entity_type_id]);
+      ksort($this->configuration['entity_types']);
+    }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function defaultConfiguration() {
+    // This plugin does not store anything per transition.
+    return [
+      'states' => [
+        'draft' => [
+          'published' => FALSE,
+          'default_revision' => FALSE,
+        ],
+        'published' => [
+          'published' => TRUE,
+          'default_revision' => TRUE,
+        ],
+      ],
+      'entity_types' => [],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    $dependencies = parent::calculateDependencies();
+    foreach ($this->getEntityTypes() as $entity_type_id) {
+      $entity_definition = $this->entityTypeManager->getDefinition($entity_type_id);
+      foreach ($this->getBundlesForEntityType($entity_type_id) as $bundle) {
+        $dependency = $entity_definition->getBundleConfigDependency($bundle);
+        $dependencies[$dependency['type']][] = $dependency['name'];
+      }
+    }
+    return $dependencies;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function onDependencyRemoval(array $dependencies) {
+    $changed = parent::onDependencyRemoval($dependencies);
+
+    // When bundle config entities are removed, ensure they are cleaned up from
+    // the workflow.
+    foreach ($dependencies['config'] as $removed_config) {
+      if ($entity_type_id = $removed_config->getEntityType()->getBundleOf()) {
+        $bundle_id = $removed_config->id();
+        $this->removeEntityTypeAndBundle($entity_type_id, $bundle_id);
+        $changed = TRUE;
+      }
+    }
+
+    // When modules that provide entity types are removed, ensure they are also
+    // removed from the workflow.
+    if (!empty($dependencies['module'])) {
+      // Gather all entity definitions provided by the dependent modules which
+      // are being removed.
+      $module_entity_definitions = [];
+      foreach ($this->entityTypeManager->getDefinitions() as $entity_definition) {
+        if (in_array($entity_definition->getProvider(), $dependencies['module'])) {
+          $module_entity_definitions[] = $entity_definition;
+        }
+      }
+
+      // For all entity types provided by the uninstalled modules, remove any
+      // configuration for those types.
+      foreach ($module_entity_definitions as $module_entity_definition) {
+        foreach ($this->getBundlesForEntityType($module_entity_definition->id()) as $bundle) {
+          $this->removeEntityTypeAndBundle($module_entity_definition->id(), $bundle);
+          $changed = TRUE;
+        }
+      }
+    }
+
+    return $changed;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfiguration() {
+    $configuration = parent::getConfiguration();
+    // Ensure that states and entity types are ordered consistently.
+    ksort($configuration['states']);
+    ksort($configuration['entity_types']);
+    return $configuration;
+  }
+
+}
diff --git a/web/core/modules/content_moderation/src/Routing/EntityModerationRouteProvider.php b/web/core/modules/content_moderation/src/Routing/EntityModerationRouteProvider.php
index f953d8030..6e0b2b98b 100644
--- a/web/core/modules/content_moderation/src/Routing/EntityModerationRouteProvider.php
+++ b/web/core/modules/content_moderation/src/Routing/EntityModerationRouteProvider.php
@@ -111,7 +111,7 @@ class EntityModerationRouteProvider implements EntityRouteProviderInterface, Ent
    *   type does not support fields.
    */
   protected function getEntityTypeIdKeyType(EntityTypeInterface $entity_type) {
-    if (!$entity_type->isSubclassOf(FieldableEntityInterface::class)) {
+    if (!$entity_type->entityClassImplements(FieldableEntityInterface::class)) {
       return NULL;
     }
 
diff --git a/web/core/modules/content_moderation/src/Routing/EntityTypeModerationRouteProvider.php b/web/core/modules/content_moderation/src/Routing/EntityTypeModerationRouteProvider.php
index c722a67ee..d1dcd2b11 100644
--- a/web/core/modules/content_moderation/src/Routing/EntityTypeModerationRouteProvider.php
+++ b/web/core/modules/content_moderation/src/Routing/EntityTypeModerationRouteProvider.php
@@ -47,7 +47,7 @@ class EntityTypeModerationRouteProvider implements EntityRouteProviderInterface
           '_entity_form' => "{$entity_type_id}.moderation",
           '_title' => 'Moderation',
         ])
-        ->setRequirement('_permission', 'administer moderation states')
+        ->setRequirement('_permission', 'administer content moderation')
         ->setOption('parameters', [
           $entity_type_id => ['type' => 'entity:' . $entity_type_id],
         ]);
diff --git a/web/core/modules/content_moderation/src/StateTransitionValidation.php b/web/core/modules/content_moderation/src/StateTransitionValidation.php
index 2e2a4e245..c4e26c26f 100644
--- a/web/core/modules/content_moderation/src/StateTransitionValidation.php
+++ b/web/core/modules/content_moderation/src/StateTransitionValidation.php
@@ -3,10 +3,8 @@
 namespace Drupal\content_moderation;
 
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\content_moderation\Entity\ModerationStateTransition;
+use Drupal\workflows\Transition;
 
 /**
  * Validates whether a certain state transition is allowed.
@@ -14,18 +12,11 @@ use Drupal\content_moderation\Entity\ModerationStateTransition;
 class StateTransitionValidation implements StateTransitionValidationInterface {
 
   /**
-   * Entity type manager.
+   * The moderation information service.
    *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   * @var \Drupal\content_moderation\ModerationInformationInterface
    */
-  protected $entityTypeManager;
-
-  /**
-   * Entity query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
+  protected $moderationInfo;
 
   /**
    * Stores the possible state transitions.
@@ -37,211 +28,23 @@ class StateTransitionValidation implements StateTransitionValidationInterface {
   /**
    * Constructs a new StateTransitionValidation.
    *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager service.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
+   * @param \Drupal\content_moderation\ModerationInformationInterface $moderation_info
+   *   The moderation information service.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, QueryFactory $query_factory) {
-    $this->entityTypeManager = $entity_type_manager;
-    $this->queryFactory = $query_factory;
-  }
-
-  /**
-   * Computes a mapping of possible transitions.
-   *
-   * This method is uncached and will recalculate the list on every request.
-   * In most cases you want to use getPossibleTransitions() instead.
-   *
-   * @see static::getPossibleTransitions()
-   *
-   * @return array[]
-   *   An array containing all possible transitions. Each entry is keyed by the
-   *   "from" state, and the value is an array of all legal "to" states based
-   *   on the currently defined transition objects.
-   */
-  protected function calculatePossibleTransitions() {
-    $transitions = $this->transitionStorage()->loadMultiple();
-
-    $possible_transitions = [];
-    /** @var \Drupal\content_moderation\ModerationStateTransitionInterface $transition */
-    foreach ($transitions as $transition) {
-      $possible_transitions[$transition->getFromState()][] = $transition->getToState();
-    }
-    return $possible_transitions;
-  }
-
-  /**
-   * Returns a mapping of possible transitions.
-   *
-   * @return array[]
-   *   An array containing all possible transitions. Each entry is keyed by the
-   *   "from" state, and the value is an array of all legal "to" states based
-   *   on the currently defined transition objects.
-   */
-  protected function getPossibleTransitions() {
-    if (empty($this->possibleTransitions)) {
-      $this->possibleTransitions = $this->calculatePossibleTransitions();
-    }
-    return $this->possibleTransitions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getValidTransitionTargets(ContentEntityInterface $entity, AccountInterface $user) {
-    $bundle = $this->loadBundleEntity($entity->getEntityType()->getBundleEntityType(), $entity->bundle());
-
-    $states_for_bundle = $bundle->getThirdPartySetting('content_moderation', 'allowed_moderation_states', []);
-
-    /** @var \Drupal\content_moderation\Entity\ModerationState $current_state */
-    $current_state = $entity->moderation_state->entity;
-
-    $all_transitions = $this->getPossibleTransitions();
-    $destination_ids = $all_transitions[$current_state->id()];
-
-    $destination_ids = array_intersect($states_for_bundle, $destination_ids);
-    $destinations = $this->entityTypeManager->getStorage('moderation_state')->loadMultiple($destination_ids);
-
-    return array_filter($destinations, function(ModerationStateInterface $destination_state) use ($current_state, $user) {
-      return $this->userMayTransition($current_state, $destination_state, $user);
-    });
+  public function __construct(ModerationInformationInterface $moderation_info) {
+    $this->moderationInfo = $moderation_info;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getValidTransitions(ContentEntityInterface $entity, AccountInterface $user) {
-    $bundle = $this->loadBundleEntity($entity->getEntityType()->getBundleEntityType(), $entity->bundle());
+    $workflow = $this->moderationInfo->getWorkflowForEntity($entity);
+    $current_state = $entity->moderation_state->value ? $workflow->getState($entity->moderation_state->value) : $workflow->getInitialState();
 
-    /** @var \Drupal\content_moderation\Entity\ModerationState $current_state */
-    $current_state = $entity->moderation_state->entity;
-    $current_state_id = $current_state ? $current_state->id() : $bundle->getThirdPartySetting('content_moderation', 'default_moderation_state');
-
-    // Determine the states that are legal on this bundle.
-    $legal_bundle_states = $bundle->getThirdPartySetting('content_moderation', 'allowed_moderation_states', []);
-
-    // Legal transitions include those that are possible from the current state,
-    // filtered by those whose target is legal on this bundle and that the
-    // user has access to execute.
-    $transitions = array_filter($this->getTransitionsFrom($current_state_id), function(ModerationStateTransition $transition) use ($legal_bundle_states, $user) {
-      return in_array($transition->getToState(), $legal_bundle_states, TRUE)
-        && $user->hasPermission('use ' . $transition->id() . ' transition');
+    return array_filter($current_state->getTransitions(), function(Transition $transition) use ($workflow, $user) {
+      return $user->hasPermission('use ' . $workflow->id() . ' transition ' . $transition->id());
     });
-
-    return $transitions;
-  }
-
-  /**
-   * Returns a list of possible transitions from a given state.
-   *
-   * This list is based only on those transitions that exist, not what
-   * transitions are legal in a given context.
-   *
-   * @param string $state_name
-   *   The machine name of the state from which we are transitioning.
-   *
-   * @return ModerationStateTransition[]
-   *   A list of possible transitions from a given state.
-   */
-  protected function getTransitionsFrom($state_name) {
-    $result = $this->transitionStateQuery()
-      ->condition('stateFrom', $state_name)
-      ->sort('weight')
-      ->execute();
-
-    return $this->transitionStorage()->loadMultiple($result);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function userMayTransition(ModerationStateInterface $from, ModerationStateInterface $to, AccountInterface $user) {
-    if ($transition = $this->getTransitionFromStates($from, $to)) {
-      return $user->hasPermission('use ' . $transition->id() . ' transition');
-    }
-    return FALSE;
-  }
-
-  /**
-   * Returns the transition object that transitions from one state to another.
-   *
-   * @param \Drupal\content_moderation\ModerationStateInterface $from
-   *   The origin state.
-   * @param \Drupal\content_moderation\ModerationStateInterface $to
-   *   The destination state.
-   *
-   * @return ModerationStateTransition|null
-   *   A transition object, or NULL if there is no such transition.
-   */
-  protected function getTransitionFromStates(ModerationStateInterface $from, ModerationStateInterface $to) {
-    $from = $this->transitionStateQuery()
-      ->condition('stateFrom', $from->id())
-      ->condition('stateTo', $to->id())
-      ->execute();
-
-    $transitions = $this->transitionStorage()->loadMultiple($from);
-
-    if ($transitions) {
-      return current($transitions);
-    }
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isTransitionAllowed(ModerationStateInterface $from, ModerationStateInterface $to) {
-    $allowed_transitions = $this->calculatePossibleTransitions();
-    if (isset($allowed_transitions[$from->id()])) {
-      return in_array($to->id(), $allowed_transitions[$from->id()], TRUE);
-    }
-    return FALSE;
-  }
-
-  /**
-   * Returns a transition state entity query.
-   *
-   * @return \Drupal\Core\Entity\Query\QueryInterface
-   *   A transition state entity query.
-   */
-  protected function transitionStateQuery() {
-    return $this->queryFactory->get('moderation_state_transition', 'AND');
-  }
-
-  /**
-   * Returns the transition entity storage service.
-   *
-   * @return \Drupal\Core\Entity\EntityStorageInterface
-   *   The transition state entity storage.
-   */
-  protected function transitionStorage() {
-    return $this->entityTypeManager->getStorage('moderation_state_transition');
-  }
-
-  /**
-   * Returns the state entity storage service.
-   *
-   * @return \Drupal\Core\Entity\EntityStorageInterface
-   *   The moderation state entity storage.
-   */
-  protected function stateStorage() {
-    return $this->entityTypeManager->getStorage('moderation_state');
-  }
-
-  /**
-   * Loads a specific bundle entity.
-   *
-   * @param string $bundle_entity_type_id
-   *   The bundle entity type ID.
-   * @param string $bundle_id
-   *   The bundle ID.
-   *
-   * @return \Drupal\Core\Config\Entity\ConfigEntityInterface|null
-   *   The specific bundle entity.
-   */
-  protected function loadBundleEntity($bundle_entity_type_id, $bundle_id) {
-    return $this->entityTypeManager->getStorage($bundle_entity_type_id)->load($bundle_id);
   }
 
 }
diff --git a/web/core/modules/content_moderation/src/StateTransitionValidationInterface.php b/web/core/modules/content_moderation/src/StateTransitionValidationInterface.php
index 5ef0dd17d..1acbf052f 100644
--- a/web/core/modules/content_moderation/src/StateTransitionValidationInterface.php
+++ b/web/core/modules/content_moderation/src/StateTransitionValidationInterface.php
@@ -10,20 +10,6 @@ use Drupal\Core\Session\AccountInterface;
  */
 interface StateTransitionValidationInterface {
 
-  /**
-   * Gets a list of states a user may transition an entity to.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
-   *   The entity to be transitioned.
-   * @param \Drupal\Core\Session\AccountInterface $user
-   *   The account that wants to perform a transition.
-   *
-   * @return \Drupal\content_moderation\Entity\ModerationState[]
-   *   Returns an array of States to which the specified user may transition the
-   *   entity.
-   */
-  public function getValidTransitionTargets(ContentEntityInterface $entity, AccountInterface $user);
-
   /**
    * Gets a list of transitions that are legal for this user on this entity.
    *
@@ -32,40 +18,9 @@ interface StateTransitionValidationInterface {
    * @param \Drupal\Core\Session\AccountInterface $user
    *   The account that wants to perform a transition.
    *
-   * @return \Drupal\content_moderation\Entity\ModerationStateTransition[]
+   * @return \Drupal\workflows\Transition[]
    *   The list of transitions that are legal for this user on this entity.
    */
   public function getValidTransitions(ContentEntityInterface $entity, AccountInterface $user);
 
-  /**
-   * Determines if a user is allowed to transition from one state to another.
-   *
-   * This method will also return FALSE if there is no transition between the
-   * specified states at all.
-   *
-   * @param \Drupal\content_moderation\ModerationStateInterface $from
-   *   The origin state.
-   * @param \Drupal\content_moderation\ModerationStateInterface $to
-   *   The destination state.
-   * @param \Drupal\Core\Session\AccountInterface $user
-   *   The user to validate.
-   *
-   * @return bool
-   *   TRUE if the given user may transition between those two states.
-   */
-  public function userMayTransition(ModerationStateInterface $from, ModerationStateInterface $to, AccountInterface $user);
-
-  /**
-   * Determines a transition allowed.
-   *
-   * @param \Drupal\content_moderation\ModerationStateInterface $from
-   *   The origin state.
-   * @param \Drupal\content_moderation\ModerationStateInterface $to
-   *   The destination state.
-   *
-   * @return bool
-   *   Is the transition allowed.
-   */
-  public function isTransitionAllowed(ModerationStateInterface $from, ModerationStateInterface $to);
-
 }
diff --git a/web/core/modules/content_moderation/src/Tests/ModerationFormTest.php b/web/core/modules/content_moderation/src/Tests/ModerationFormTest.php
index d6c92b96a..16da4e454 100644
--- a/web/core/modules/content_moderation/src/Tests/ModerationFormTest.php
+++ b/web/core/modules/content_moderation/src/Tests/ModerationFormTest.php
@@ -15,10 +15,7 @@ class ModerationFormTest extends ModerationStateTestBase {
   protected function setUp() {
     parent::setUp();
     $this->drupalLogin($this->adminUser);
-    $this->createContentTypeFromUi('Moderated content', 'moderated_content', TRUE, [
-      'draft',
-      'published',
-    ], 'draft');
+    $this->createContentTypeFromUi('Moderated content', 'moderated_content', TRUE);
     $this->grantUserPermissionToCreateContentOfType($this->adminUser, 'moderated_content');
   }
 
diff --git a/web/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php b/web/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php
index 03a4b0ee2..593a9f961 100644
--- a/web/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php
+++ b/web/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php
@@ -59,12 +59,7 @@ class ModerationStateBlockTest extends ModerationStateTestBase {
 
     // Enable moderation for custom blocks at
     // admin/structure/block/block-content/manage/basic/moderation.
-    $edit = [
-      'enable_moderation_state' => TRUE,
-      'allowed_moderation_states_unpublished[draft]' => TRUE,
-      'allowed_moderation_states_published[published]' => TRUE,
-      'default_moderation_state' => 'draft',
-    ];
+    $edit = ['workflow' => 'editorial'];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertText(t('Your settings have been saved.'));
 
@@ -78,11 +73,11 @@ class ModerationStateBlockTest extends ModerationStateTestBase {
     $this->assertText(t('basic Moderated block has been created.'));
 
     // Place the block in the Sidebar First region.
-    $instance = array(
+    $instance = [
       'id' => 'moderated_block',
       'settings[label]' => $edit['info[0][value]'],
       'region' => 'sidebar_first',
-    );
+    ];
     $block = BlockContent::load(1);
     $url = 'admin/structure/block/add/block_content:' . $block->uuid() . '/' . $this->config('system.theme')->get('default');
     $this->drupalPostForm($url, $instance, t('Save block'));
diff --git a/web/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php b/web/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php
index e2069b474..49eee6d52 100644
--- a/web/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php
+++ b/web/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php
@@ -18,13 +18,7 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
   protected function setUp() {
     parent::setUp();
     $this->drupalLogin($this->adminUser);
-    $this->createContentTypeFromUi(
-      'Moderated content',
-      'moderated_content',
-      TRUE,
-      ['draft', 'needs_review', 'published'],
-      'draft'
-    );
+    $this->createContentTypeFromUi('Moderated content', 'moderated_content', TRUE);
     $this->grantUserPermissionToCreateContentOfType($this->adminUser, 'moderated_content');
   }
 
@@ -35,19 +29,11 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'moderated content',
     ], t('Save and Create New Draft'));
-    $nodes = \Drupal::entityTypeManager()
-      ->getStorage('node')
-      ->loadByProperties([
-        'title' => 'moderated content',
-      ]);
-
-    if (!$nodes) {
+    $node = $this->getNodeByTitle('moderated content');
+    if (!$node) {
       $this->fail('Test node was not saved correctly.');
-      return;
     }
-
-    $node = reset($nodes);
-    $this->assertEqual('draft', $node->moderation_state->target_id);
+    $this->assertEqual('draft', $node->moderation_state->value);
 
     $path = 'node/' . $node->id() . '/edit';
     // Set up published revision.
@@ -56,39 +42,34 @@ class ModerationStateNodeTest extends ModerationStateTestBase {
     /* @var \Drupal\node\NodeInterface $node */
     $node = \Drupal::entityTypeManager()->getStorage('node')->load($node->id());
     $this->assertTrue($node->isPublished());
-    $this->assertEqual('published', $node->moderation_state->target_id);
+    $this->assertEqual('published', $node->moderation_state->value);
 
     // Verify that the state field is not shown.
     $this->assertNoText('Published');
 
     // Delete the node.
-    $this->drupalPostForm('node/' . $node->id() . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('node/' . $node->id() . '/delete', [], t('Delete'));
     $this->assertText(t('The Moderated content moderated content has been deleted.'));
 
+    // Disable content moderation.
+    $this->drupalPostForm('admin/structure/types/manage/moderated_content/moderation', ['workflow' => ''], t('Save'));
     $this->drupalGet('admin/structure/types/manage/moderated_content/moderation');
-    $this->assertFieldByName('enable_moderation_state');
-    $this->assertFieldChecked('edit-enable-moderation-state');
-    $this->drupalPostForm(NULL, ['enable_moderation_state' => FALSE], t('Save'));
-    $this->drupalGet('admin/structure/types/manage/moderated_content/moderation');
-    $this->assertFieldByName('enable_moderation_state');
-    $this->assertNoFieldChecked('edit-enable-moderation-state');
+    $this->assertOptionSelected('edit-workflow', '');
+    // Ensure the parent environment is up-to-date.
+    // @see content_moderation_workflow_insert()
+    \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
+    \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
+
+    // Create a new node.
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'non-moderated content',
     ], t('Save and publish'));
 
-    $nodes = \Drupal::entityTypeManager()
-      ->getStorage('node')
-      ->loadByProperties([
-        'title' => 'non-moderated content',
-      ]);
-
-    if (!$nodes) {
+    $node = $this->getNodeByTitle('non-moderated content');
+    if (!$node) {
       $this->fail('Non-moderated test node was not saved correctly.');
-      return;
     }
-
-    $node = reset($nodes);
-    $this->assertEqual(NULL, $node->moderation_state->target_id);
+    $this->assertEqual(NULL, $node->moderation_state->value);
   }
 
   /**
diff --git a/web/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php b/web/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php
index debb32c81..099b4dc61 100644
--- a/web/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php
+++ b/web/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php
@@ -42,12 +42,17 @@ class ModerationStateNodeTypeTest extends ModerationStateTestBase {
     ], t('Save and publish'));
     $this->assertText('Not moderated Test has been created.');
 
-    // Now enable moderation state.
-    $this->enableModerationThroughUi(
-      'not_moderated',
-      ['draft', 'needs_review', 'published'],
-      'draft'
-    );
+    // Now enable moderation state, ensuring all the expected links and tabs are
+    // present.
+    $this->drupalGet('admin/structure/types');
+    $this->assertLinkByHref('admin/structure/types/manage/not_moderated/moderation');
+    $this->drupalGet('admin/structure/types/manage/not_moderated');
+    $this->assertLinkByHref('admin/structure/types/manage/not_moderated/moderation');
+    $this->drupalGet('admin/structure/types/manage/not_moderated/moderation');
+    $this->assertOptionSelected('edit-workflow', '');
+    $this->assertNoLink('Delete');
+    $edit['workflow'] = 'editorial';
+    $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // And make sure it works.
     $nodes = \Drupal::entityTypeManager()->getStorage('node')
diff --git a/web/core/modules/content_moderation/src/Tests/ModerationStateStatesTest.php b/web/core/modules/content_moderation/src/Tests/ModerationStateStatesTest.php
deleted file mode 100644
index 3c5fd1471..000000000
--- a/web/core/modules/content_moderation/src/Tests/ModerationStateStatesTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation\Tests;
-
-/**
- * Tests moderation state config entity.
- *
- * @group content_moderation
- */
-class ModerationStateStatesTest extends ModerationStateTestBase {
-
-  /**
-   * Tests route access/permissions.
-   */
-  public function testAccess() {
-    $paths = [
-      'admin/config/workflow/moderation',
-      'admin/config/workflow/moderation/states',
-      'admin/config/workflow/moderation/states/add',
-      'admin/config/workflow/moderation/states/draft',
-      'admin/config/workflow/moderation/states/draft/delete',
-    ];
-
-    foreach ($paths as $path) {
-      $this->drupalGet($path);
-      // No access.
-      $this->assertResponse(403);
-    }
-    $this->drupalLogin($this->adminUser);
-    foreach ($paths as $path) {
-      $this->drupalGet($path);
-      // User has access.
-      $this->assertResponse(200);
-    }
-  }
-
-  /**
-   * Tests administration of moderation state entity.
-   */
-  public function testStateAdministration() {
-    $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/config/workflow/moderation');
-    $this->assertLink('Moderation states');
-    $this->assertLink('Moderation state transitions');
-    $this->clickLink('Moderation states');
-    $this->assertLink('Add moderation state');
-    $this->assertText('Draft');
-    // Edit the draft.
-    $this->clickLink('Edit', 0);
-    $this->assertFieldByName('label', 'Draft');
-    $this->assertNoFieldChecked('edit-published');
-    $this->drupalPostForm(NULL, [
-      'label' => 'Drafty',
-    ], t('Save'));
-    $this->assertText('Saved the Drafty Moderation state.');
-    $this->drupalGet('admin/config/workflow/moderation/states/draft');
-    $this->assertFieldByName('label', 'Drafty');
-    $this->drupalPostForm(NULL, [
-      'label' => 'Draft',
-    ], t('Save'));
-    $this->assertText('Saved the Draft Moderation state.');
-    $this->clickLink(t('Add moderation state'));
-    $this->drupalPostForm(NULL, [
-      'label' => 'Expired',
-      'id' => 'expired',
-    ], t('Save'));
-    $this->assertText('Created the Expired Moderation state.');
-    $this->drupalGet('admin/config/workflow/moderation/states/expired');
-    $this->clickLink('Delete');
-    $this->assertText('Are you sure you want to delete Expired?');
-    $this->drupalPostForm(NULL, [], t('Delete'));
-    $this->assertText('Moderation state Expired deleted');
-  }
-
-}
diff --git a/web/core/modules/content_moderation/src/Tests/ModerationStateTestBase.php b/web/core/modules/content_moderation/src/Tests/ModerationStateTestBase.php
index ddd275e6e..8574a9962 100644
--- a/web/core/modules/content_moderation/src/Tests/ModerationStateTestBase.php
+++ b/web/core/modules/content_moderation/src/Tests/ModerationStateTestBase.php
@@ -5,10 +5,12 @@ namespace Drupal\content_moderation\Tests;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\simpletest\WebTestBase;
 use Drupal\user\Entity\Role;
-use Drupal\content_moderation\Entity\ModerationState;
 
 /**
  * Defines a base class for moderation state tests.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\content_moderation\Functional\ModerationStateTestBase instead.
  */
 abstract class ModerationStateTestBase extends WebTestBase {
 
@@ -30,18 +32,15 @@ abstract class ModerationStateTestBase extends WebTestBase {
    * @var array
    */
   protected $permissions = [
-    'administer moderation states',
-    'administer moderation state transitions',
-    'use draft_draft transition',
-    'use draft_published transition',
-    'use published_draft transition',
-    'use published_archived transition',
+    'administer content moderation',
     'access administration pages',
     'administer content types',
     'administer nodes',
     'view latest version',
     'view any unpublished content',
     'access content overview',
+    'use editorial transition create_new_draft',
+    'use editorial transition publish',
   ];
 
   /**
@@ -67,6 +66,21 @@ abstract class ModerationStateTestBase extends WebTestBase {
     $this->drupalPlaceBlock('local_actions_block', ['id' => 'actions_block']);
   }
 
+  /**
+   * Gets the permission machine name for a transition.
+   *
+   * @param string $workflow_id
+   *   The workflow ID.
+   * @param string $transition_id
+   *   The transition ID.
+   *
+   * @return string
+   *   The permission machine name for a transition.
+   */
+  protected function getWorkflowTransitionPermission($workflow_id, $transition_id) {
+    return 'use ' . $workflow_id . ' transition ' . $transition_id;
+  }
+
   /**
    * Creates a content-type from the UI.
    *
@@ -76,12 +90,10 @@ abstract class ModerationStateTestBase extends WebTestBase {
    *   Machine name.
    * @param bool $moderated
    *   TRUE if should be moderated.
-   * @param string[] $allowed_states
-   *   Array of allowed state IDs.
-   * @param string $default_state
-   *   Default state.
+   * @param string $workflow_id
+   *   The workflow to attach to the bundle.
    */
-  protected function createContentTypeFromUi($content_type_name, $content_type_id, $moderated = FALSE, array $allowed_states = [], $default_state = NULL) {
+  protected function createContentTypeFromUi($content_type_name, $content_type_id, $moderated = FALSE, $workflow_id = 'editorial') {
     $this->drupalGet('admin/structure/types');
     $this->clickLink('Add content type');
     $edit = [
@@ -91,7 +103,7 @@ abstract class ModerationStateTestBase extends WebTestBase {
     $this->drupalPostForm(NULL, $edit, t('Save content type'));
 
     if ($moderated) {
-      $this->enableModerationThroughUi($content_type_id, $allowed_states, $default_state);
+      $this->enableModerationThroughUi($content_type_id, $workflow_id);
     }
   }
 
@@ -100,31 +112,16 @@ abstract class ModerationStateTestBase extends WebTestBase {
    *
    * @param string $content_type_id
    *   Machine name.
-   * @param string[] $allowed_states
-   *   Array of allowed state IDs.
-   * @param string $default_state
-   *   Default state.
+   * @param string $workflow_id
+   *   The workflow to attach to the bundle.
    */
-  protected function enableModerationThroughUi($content_type_id, array $allowed_states, $default_state) {
-    $this->drupalGet('admin/structure/types');
-    $this->assertLinkByHref('admin/structure/types/manage/' . $content_type_id . '/moderation');
-    $this->drupalGet('admin/structure/types/manage/' . $content_type_id);
-    $this->assertLinkByHref('admin/structure/types/manage/' . $content_type_id . '/moderation');
-    $this->drupalGet('admin/structure/types/manage/' . $content_type_id . '/moderation');
-    $this->assertFieldByName('enable_moderation_state');
-    $this->assertNoFieldChecked('edit-enable-moderation-state');
-
-    $edit['enable_moderation_state'] = 1;
-
-    /** @var ModerationState $state */
-    foreach (ModerationState::loadMultiple() as $state) {
-      $key = $state->isPublishedState() ? 'allowed_moderation_states_published[' . $state->id() . ']' : 'allowed_moderation_states_unpublished[' . $state->id() . ']';
-      $edit[$key] = in_array($state->id(), $allowed_states, TRUE) ? $state->id() : FALSE;
-    }
-
-    $edit['default_moderation_state'] = $default_state;
-
-    $this->drupalPostForm(NULL, $edit, t('Save'));
+  protected function enableModerationThroughUi($content_type_id, $workflow_id = 'editorial') {
+    $edit['workflow'] = $workflow_id;
+    $this->drupalPostForm('admin/structure/types/manage/' . $content_type_id . '/moderation', $edit, t('Save'));
+    // Ensure the parent environment is up-to-date.
+    // @see content_moderation_workflow_insert()
+    \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
+    \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
   }
 
   /**
diff --git a/web/core/modules/content_moderation/src/Tests/ModerationStateTransitionsTest.php b/web/core/modules/content_moderation/src/Tests/ModerationStateTransitionsTest.php
deleted file mode 100644
index 703561bf3..000000000
--- a/web/core/modules/content_moderation/src/Tests/ModerationStateTransitionsTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Drupal\content_moderation\Tests;
-
-/**
- * Tests moderation state transition config entity.
- *
- * @group content_moderation
- */
-class ModerationStateTransitionsTest extends ModerationStateTestBase {
-
-  /**
-   * Tests route access/permissions.
-   */
-  public function testAccess() {
-    $paths = [
-      'admin/config/workflow/moderation/transitions',
-      'admin/config/workflow/moderation/transitions/add',
-      'admin/config/workflow/moderation/transitions/draft_published',
-      'admin/config/workflow/moderation/transitions/draft_published/delete',
-    ];
-
-    foreach ($paths as $path) {
-      $this->drupalGet($path);
-      // No access.
-      $this->assertResponse(403);
-    }
-    $this->drupalLogin($this->adminUser);
-    foreach ($paths as $path) {
-      $this->drupalGet($path);
-      // User has access.
-      $this->assertResponse(200);
-    }
-  }
-
-  /**
-   * Tests administration of moderation state transition entity.
-   */
-  public function testTransitionAdministration() {
-    $this->drupalLogin($this->adminUser);
-
-    $this->drupalGet('admin/config/workflow/moderation');
-    $this->clickLink('Moderation state transitions');
-    $this->assertLink('Add moderation state transition');
-    $this->assertText('Create New Draft');
-
-    // Edit the Draft » Draft review.
-    $this->drupalGet('admin/config/workflow/moderation/transitions/draft_draft');
-    $this->assertFieldByName('label', 'Create New Draft');
-    $this->assertFieldByName('stateFrom', 'draft');
-    $this->assertFieldByName('stateTo', 'draft');
-    $this->drupalPostForm(NULL, [
-      'label' => 'Create Draft',
-    ], t('Save'));
-    $this->assertText('Saved the Create Draft Moderation state transition.');
-    $this->drupalGet('admin/config/workflow/moderation/transitions/draft_draft');
-    $this->assertFieldByName('label', 'Create Draft');
-    // Now set it back.
-    $this->drupalPostForm(NULL, [
-      'label' => 'Create New Draft',
-    ], t('Save'));
-    $this->assertText('Saved the Create New Draft Moderation state transition.');
-
-    // Add a new state.
-    $this->drupalGet('admin/config/workflow/moderation/states/add');
-    $this->drupalPostForm(NULL, [
-      'label' => 'Expired',
-      'id' => 'expired',
-    ], t('Save'));
-    $this->assertText('Created the Expired Moderation state.');
-
-    // Add a new transition.
-    $this->drupalGet('admin/config/workflow/moderation/transitions');
-    $this->clickLink(t('Add moderation state transition'));
-    $this->drupalPostForm(NULL, [
-      'label' => 'Published » Expired',
-      'id' => 'published_expired',
-      'stateFrom' => 'published',
-      'stateTo' => 'expired',
-    ], t('Save'));
-    $this->assertText('Created the Published » Expired Moderation state transition.');
-
-    // Delete the new transition.
-    $this->drupalGet('admin/config/workflow/moderation/transitions/published_expired');
-    $this->clickLink('Delete');
-    $this->assertText('Are you sure you want to delete Published » Expired?');
-    $this->drupalPostForm(NULL, [], t('Delete'));
-    $this->assertText('Moderation transition Published » Expired deleted');
-  }
-
-}
diff --git a/web/core/modules/content_moderation/src/ViewsData.php b/web/core/modules/content_moderation/src/ViewsData.php
index 19bcfa508..dbef1931f 100644
--- a/web/core/modules/content_moderation/src/ViewsData.php
+++ b/web/core/modules/content_moderation/src/ViewsData.php
@@ -193,17 +193,14 @@ class ViewsData {
           'base' => $content_moderation_state_entity_base_table,
           'base field' => 'content_entity_id',
           'relationship field' => $entity_type->getKey('id'),
-          'join_extra' => [
+          'extra' => [
             [
               'field' => 'content_entity_type_id',
               'value' => $entity_type_id,
             ],
-            [
-              'field' => 'content_entity_revision_id',
-              'left_field' => $entity_type->getKey('revision'),
-            ],
           ],
         ],
+        'field' => ['default_formatter' => 'content_moderation_state'],
       ];
 
       $revision_table = $entity_type->getRevisionDataTable() ?: $entity_type->getRevisionTable();
@@ -215,13 +212,14 @@ class ViewsData {
           'base' => $content_moderation_state_entity_revision_base_table,
           'base field' => 'content_entity_revision_id',
           'relationship field' => $entity_type->getKey('revision'),
-          'join_extra' => [
+          'extra' => [
             [
               'field' => 'content_entity_type_id',
               'value' => $entity_type_id,
             ],
           ],
         ],
+        'field' => ['default_formatter' => 'content_moderation_state'],
       ];
     }
 
diff --git a/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/content_moderation_test_local_task.info.yml b/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/content_moderation_test_local_task.info.yml
new file mode 100644
index 000000000..2ef41162d
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/content_moderation_test_local_task.info.yml
@@ -0,0 +1,9 @@
+name: 'Content moderation test local task'
+type: module
+description: 'Provides a local task for testing.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - content_moderation
+  - node
diff --git a/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/content_moderation_test_local_task.links.task.yml b/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/content_moderation_test_local_task.links.task.yml
new file mode 100644
index 000000000..18ae2d82c
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/content_moderation_test_local_task.links.task.yml
@@ -0,0 +1,4 @@
+entity.node.test_local_task_without_upcast_node:
+  route_name: entity.node.test_local_task_without_upcast_node
+  base_route: entity.node.canonical
+  title: 'Task Without Upcast Node'
diff --git a/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/content_moderation_test_local_task.routing.yml b/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/content_moderation_test_local_task.routing.yml
new file mode 100644
index 000000000..b1f18d4d9
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/content_moderation_test_local_task.routing.yml
@@ -0,0 +1,7 @@
+entity.node.test_local_task_without_upcast_node:
+  path: '/node/{node}/task-without-upcast-node'
+  defaults:
+    _title: 'Page Without Upcast Node'
+    _controller: '\Drupal\content_moderation_test_local_task\Controller\TestLocalTaskController::methodWithoutUpcastNode'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/src/Controller/TestLocalTaskController.php b/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/src/Controller/TestLocalTaskController.php
new file mode 100644
index 000000000..ade546ca7
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/modules/content_moderation_test_local_task/src/Controller/TestLocalTaskController.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Drupal\content_moderation_test_local_task\Controller;
+
+/**
+ * A test controller.
+ */
+class TestLocalTaskController {
+
+  /**
+   * A method which does not hint the node parameter to avoid upcasting.
+   */
+  public function methodWithoutUpcastNode($node) {
+    return ['#markup' => 'It works!'];
+  }
+
+}
diff --git a/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml b/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml
index 46a64ab58..62e972e7d 100644
--- a/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml
+++ b/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.latest.yml
@@ -300,9 +300,7 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
+          type: content_moderation_state
           group_column: target_id
           group_columns: {  }
           group_rows: true
diff --git a/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml b/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml
index 6f9525116..343806f90 100644
--- a/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml
+++ b/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_base_table_test.yml
@@ -193,9 +193,7 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
+          type: content_moderation_state
           group_column: target_id
           group_columns: {  }
           group_rows: true
@@ -258,9 +256,7 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
+          type: content_moderation_state
           group_column: target_id
           group_columns: {  }
           group_rows: true
@@ -323,8 +319,7 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: target_id
-          type: entity_reference_entity_id
-          settings: {  }
+          type: string
           group_column: target_id
           group_columns: {  }
           group_rows: true
diff --git a/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_latest_revision.yml b/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_latest_revision.yml
index 76733940b..4727efa28 100644
--- a/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_latest_revision.yml
+++ b/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_latest_revision.yml
@@ -306,7 +306,7 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: target_id
-          type: entity_reference_entity_id
+          type: string
           settings: {  }
           group_column: target_id
           group_columns: {  }
@@ -370,7 +370,7 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: target_id
-          type: entity_reference_entity_id
+          type: string
           settings: {  }
           group_column: target_id
           group_columns: {  }
diff --git a/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml b/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml
index 2362098d6..78fca3827 100644
--- a/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml
+++ b/web/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_revision_test.yml
@@ -191,7 +191,7 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: target_id
-          type: entity_reference_entity_id
+          type: string
           settings: {  }
           group_column: target_id
           group_columns: {  }
diff --git a/web/core/modules/content_moderation/tests/src/Functional/ContentModerationWorkflowTypeTest.php b/web/core/modules/content_moderation/tests/src/Functional/ContentModerationWorkflowTypeTest.php
new file mode 100644
index 000000000..ff37bd11a
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/src/Functional/ContentModerationWorkflowTypeTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Test the workflow type plugin in the content_moderation module.
+ *
+ * @group content_moderation
+ */
+class ContentModerationWorkflowTypeTest extends BrowserTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'content_moderation',
+    'node',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $admin = $this->drupalCreateUser([
+      'administer workflows',
+    ]);
+    $this->drupalLogin($admin);
+  }
+
+  /**
+   * Test creating a new workflow using the content moderation plugin.
+   */
+  public function testNewWorkflow() {
+    $entity_bundle_info = \Drupal::service('entity_type.bundle.info');
+
+    $this->drupalPostForm('admin/config/workflow/workflows/add', [
+      'label' => 'Test Workflow',
+      'id' => 'test_workflow',
+      'workflow_type' => 'content_moderation',
+    ], 'Save');
+
+    // Make sure the test workflow includes the default states and transitions.
+    $this->assertSession()->pageTextContains('Draft');
+    $this->assertSession()->pageTextContains('Published');
+    $this->assertSession()->pageTextContains('Create New Draft');
+    $this->assertSession()->pageTextContains('Publish');
+
+    // Ensure after a workflow is created, the bundle information can be
+    // refreshed.
+    $entity_bundle_info->clearCachedBundles();
+    $this->assertNotEmpty($entity_bundle_info->getAllBundleInfo());
+
+    $this->clickLink('Add a new state');
+    $this->submitForm([
+      'label' => 'Test State',
+      'id' => 'test_state',
+      'type_settings[content_moderation][published]' => TRUE,
+      'type_settings[content_moderation][default_revision]' => FALSE,
+    ], 'Save');
+    $this->assertSession()->pageTextContains('Created Test State state.');
+
+    // Ensure that the published settings cannot be changed.
+    $this->drupalGet('admin/config/workflow/workflows/manage/test_workflow/state/published');
+    $this->assertSession()->fieldDisabled('type_settings[content_moderation][published]');
+    $this->assertSession()->fieldDisabled('type_settings[content_moderation][default_revision]');
+
+    // Ensure that the draft settings cannot be changed.
+    $this->drupalGet('admin/config/workflow/workflows/manage/test_workflow/state/draft');
+    $this->assertSession()->fieldDisabled('type_settings[content_moderation][published]');
+    $this->assertSession()->fieldDisabled('type_settings[content_moderation][default_revision]');
+  }
+
+}
diff --git a/web/core/modules/content_moderation/tests/src/Functional/LatestRevisionViewsFilterTest.php b/web/core/modules/content_moderation/tests/src/Functional/LatestRevisionViewsFilterTest.php
index 77ae04627..cf14b2329 100644
--- a/web/core/modules/content_moderation/tests/src/Functional/LatestRevisionViewsFilterTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/LatestRevisionViewsFilterTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\content_moderation\Functional;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * Tests the "Latest Revision" views filter.
@@ -25,7 +26,7 @@ class LatestRevisionViewsFilterTest extends BrowserTestBase {
    * Tests view shows the correct node IDs.
    */
   public function testViewShowsCorrectNids() {
-    $node_type = $this->createNodeType('Test', 'test');
+    $this->createNodeType('Test', 'test');
 
     $permissions = [
       'access content',
@@ -45,8 +46,9 @@ class LatestRevisionViewsFilterTest extends BrowserTestBase {
     $node_0->save();
 
     // Now enable moderation for subsequent nodes.
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
-    $node_type->save();
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'test');
+    $workflow->save();
 
     // Make a node that is only ever in Draft.
     /** @var Node $node_1 */
@@ -55,7 +57,7 @@ class LatestRevisionViewsFilterTest extends BrowserTestBase {
       'title' => 'Node 1 - Rev 1',
       'uid' => $editor1->id(),
     ]);
-    $node_1->moderation_state->target_id = 'draft';
+    $node_1->moderation_state->value = 'draft';
     $node_1->save();
 
     // Make a node that is in Draft, then Published.
@@ -65,11 +67,11 @@ class LatestRevisionViewsFilterTest extends BrowserTestBase {
       'title' => 'Node 2 - Rev 1',
       'uid' => $editor1->id(),
     ]);
-    $node_2->moderation_state->target_id = 'draft';
+    $node_2->moderation_state->value = 'draft';
     $node_2->save();
 
     $node_2->setTitle('Node 2 - Rev 2');
-    $node_2->moderation_state->target_id = 'published';
+    $node_2->moderation_state->value = 'published';
     $node_2->save();
 
     // Make a node that is in Draft, then Published, then Draft.
@@ -79,15 +81,15 @@ class LatestRevisionViewsFilterTest extends BrowserTestBase {
       'title' => 'Node 3 - Rev 1',
       'uid' => $editor1->id(),
     ]);
-    $node_3->moderation_state->target_id = 'draft';
+    $node_3->moderation_state->value = 'draft';
     $node_3->save();
 
     $node_3->setTitle('Node 3 - Rev 2');
-    $node_3->moderation_state->target_id = 'published';
+    $node_3->moderation_state->value = 'published';
     $node_3->save();
 
     $node_3->setTitle('Node 3 - Rev 3');
-    $node_3->moderation_state->target_id = 'draft';
+    $node_3->moderation_state->value = 'draft';
     $node_3->save();
 
     // Now show the View, and confirm that only the correct titles are showing.
diff --git a/web/core/modules/content_moderation/tests/src/Functional/LocalTaskTest.php b/web/core/modules/content_moderation/tests/src/Functional/LocalTaskTest.php
new file mode 100644
index 000000000..586a91a49
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/src/Functional/LocalTaskTest.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Functional;
+
+use Drupal\simpletest\ContentTypeCreationTrait;
+use Drupal\simpletest\NodeCreationTrait;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Test the content moderation local task.
+ *
+ * @group content_moderation
+ */
+class LocalTaskTest extends BrowserTestBase {
+
+  use ContentTypeCreationTrait;
+  use NodeCreationTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'content_moderation_test_local_task',
+    'content_moderation',
+    'block',
+  ];
+
+  /**
+   * A test node.
+   *
+   * @var \Drupal\node\NodeInterface
+   */
+  protected $testNode;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->drupalPlaceBlock('local_tasks_block', ['id' => 'tabs_block']);
+    $this->drupalLogin($this->createUser(['bypass node access']));
+
+    $node_type = $this->createContentType([
+      'type' => 'test_content_type',
+    ]);
+
+    // Now enable moderation for subsequent nodes.
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', $node_type->id());
+    $workflow->save();
+
+    $this->testNode = $this->createNode([
+      'type' => $node_type->id(),
+      'moderation_state' => 'draft',
+    ]);
+  }
+
+  /**
+   * Tests local tasks behave with content_moderation enabled.
+   */
+  public function testLocalTasks() {
+    // The default state is a draft.
+    $this->drupalGet(sprintf('node/%s', $this->testNode->id()));
+    $this->assertTasks('Edit draft');
+
+    // When published as the live revision, the label changes.
+    $this->testNode->moderation_state = 'published';
+    $this->testNode->save();
+    $this->drupalGet(sprintf('node/%s', $this->testNode->id()));
+    $this->assertTasks('New draft');
+
+    $tags = $this->drupalGetHeader('X-Drupal-Cache-Tags');
+    $this->assertContains('node:1', $tags);
+    $this->assertContains('node_type:test_content_type', $tags);
+
+    // Without an upcast node, the state cannot be determined.
+    $this->clickLink('Task Without Upcast Node');
+    $this->assertTasks('Edit');
+  }
+
+  /**
+   * Assert the correct tasks appear.
+   *
+   * @param string $edit_tab_label
+   *   The edit tab label to assert.
+   */
+  protected function assertTasks($edit_tab_label) {
+    $this->assertSession()->linkExists('View');
+    $this->assertSession()->linkExists('Task Without Upcast Node');
+    $this->assertSession()->linkExists($edit_tab_label);
+    $this->assertSession()->linkExists('Delete');
+  }
+
+}
diff --git a/web/core/modules/content_moderation/tests/src/Functional/ModerationActionsTest.php b/web/core/modules/content_moderation/tests/src/Functional/ModerationActionsTest.php
new file mode 100644
index 000000000..32d10fa04
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/src/Functional/ModerationActionsTest.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Functional;
+
+use Drupal\node\Entity\Node;
+use Drupal\simpletest\ContentTypeCreationTrait;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Test the content moderation actions.
+ *
+ * @group content_moderation
+ */
+class ModerationActionsTest extends BrowserTestBase {
+
+  use ContentTypeCreationTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'content_moderation',
+    'node',
+    'views',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    $moderated_bundle = $this->createContentType(['type' => 'moderated_bundle']);
+    $moderated_bundle->save();
+    $standard_bundle = $this->createContentType(['type' => 'standard_bundle']);
+    $standard_bundle->save();
+
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'moderated_bundle');
+    $workflow->save();
+
+    $admin = $this->drupalCreateUser([
+      'access content overview',
+      'administer nodes',
+      'bypass node access',
+    ]);
+    $this->drupalLogin($admin);
+  }
+
+  /**
+   * Test the node status actions report moderation status to users correctly.
+   *
+   * @dataProvider nodeStatusActionsTestCases
+   */
+  public function testNodeStatusActions($action, $bundle, $warning_appears, $starting_status, $final_status) {
+    // Create and run an action on a node.
+    $node = Node::create([
+      'type' => $bundle,
+      'title' => $this->randomString(),
+      'status' => $starting_status,
+    ]);
+    if ($bundle == 'moderated_bundle') {
+      $node->moderation_state->value = $starting_status ? 'published' : 'draft';
+    }
+    $node->save();
+
+    $this->drupalPostForm('admin/content', [
+      'node_bulk_form[0]' => TRUE,
+      'action' => $action,
+    ], 'Apply to selected items');
+
+    if ($warning_appears) {
+      if ($action == 'node_publish_action') {
+        $this->assertSession()
+          ->elementContains('css', '.messages--warning', node_get_type_label($node) . ' content items were skipped as they are under moderation and may not be directly published.');
+      }
+      else {
+        $this->assertSession()
+          ->elementContains('css', '.messages--warning', node_get_type_label($node) . ' content items were skipped as they are under moderation and may not be directly unpublished.');
+      }
+    }
+    else {
+      $this->assertSession()->elementNotExists('css', '.messages--warning');
+    }
+
+    // Ensure after the action has run, the node matches the expected status.
+    $node = Node::load($node->id());
+    $this->assertEquals($node->isPublished(), $final_status);
+  }
+
+  /**
+   * Test cases for ::testNodeStatusActions.
+   *
+   * @return array
+   *   An array of test cases.
+   */
+  public function nodeStatusActionsTestCases() {
+    return [
+      'Moderated bundle shows warning (publish action)' => [
+        'node_publish_action',
+        'moderated_bundle',
+        TRUE,
+        // If the node starts out unpublished, the action should not work.
+        FALSE,
+        FALSE,
+      ],
+      'Moderated bundle shows warning (unpublish action)' => [
+        'node_unpublish_action',
+        'moderated_bundle',
+        TRUE,
+        // If the node starts out published, the action should not work.
+        TRUE,
+        TRUE,
+      ],
+      'Normal bundle works (publish action)' => [
+        'node_publish_action',
+        'standard_bundle',
+        FALSE,
+        // If the node starts out unpublished, the action should work.
+        FALSE,
+        TRUE,
+      ],
+      'Normal bundle works (unpublish action)' => [
+        'node_unpublish_action',
+        'standard_bundle',
+        FALSE,
+        // If the node starts out published, the action should work.
+        TRUE,
+        FALSE,
+      ],
+    ];
+  }
+
+}
diff --git a/web/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php b/web/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php
similarity index 90%
rename from web/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php
rename to web/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php
index 0d4035636..a9d95f0b9 100644
--- a/web/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/ModerationLocaleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 /**
  * Test content_moderation functionality with localization and translation.
@@ -28,13 +28,7 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->drupalLogin($this->rootUser);
 
     // Enable moderation on Article node type.
-    $this->createContentTypeFromUi(
-      'Article',
-      'article',
-      TRUE,
-      ['draft', 'published', 'archived'],
-      'draft'
-    );
+    $this->createContentTypeFromUi('Article', 'article', TRUE);
 
     // Add French language.
     $edit = [
@@ -103,9 +97,9 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $french_node = $english_node->getTranslation('fr');
     $this->assertEqual('French node', $french_node->label());
 
-    $this->assertEqual($english_node->moderation_state->target_id, 'published');
+    $this->assertEqual($english_node->moderation_state->value, 'published');
     $this->assertTrue($english_node->isPublished());
-    $this->assertEqual($french_node->moderation_state->target_id, 'draft');
+    $this->assertEqual($french_node->moderation_state->value, 'draft');
     $this->assertFalse($french_node->isPublished());
 
     // Create another article with its translation. This time we will publish
@@ -133,9 +127,9 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->assertText(t('Article Translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
-    $this->assertEqual($french_node->moderation_state->target_id, 'published');
+    $this->assertEqual($french_node->moderation_state->value, 'published');
     $this->assertTrue($french_node->isPublished());
-    $this->assertEqual($english_node->moderation_state->target_id, 'draft');
+    $this->assertEqual($english_node->moderation_state->value, 'draft');
     $this->assertFalse($english_node->isPublished());
 
     // Now check that we can create a new draft of the translation.
@@ -146,7 +140,7 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->assertText(t('Article New draft of translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
-    $this->assertEqual($french_node->moderation_state->target_id, 'published');
+    $this->assertEqual($french_node->moderation_state->value, 'published');
     $this->assertTrue($french_node->isPublished());
     $this->assertEqual($french_node->getTitle(), 'Translated node', 'The default revision of the published translation remains the same.');
 
@@ -158,7 +152,7 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->assertText(t('The moderation state has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
-    $this->assertEqual($french_node->moderation_state->target_id, 'published');
+    $this->assertEqual($french_node->moderation_state->value, 'published');
     $this->assertTrue($french_node->isPublished());
     $this->assertEqual($french_node->getTitle(), 'New draft of translated node', 'The draft has replaced the published revision.');
 
@@ -166,7 +160,7 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)'));
     $this->assertText(t('Article Another node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
-    $this->assertEqual($english_node->moderation_state->target_id, 'published');
+    $this->assertEqual($english_node->moderation_state->value, 'published');
 
     // Archive the node and its translation.
     $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Archive (this translation)'));
@@ -175,9 +169,9 @@ class ModerationLocaleTest extends ModerationStateTestBase {
     $this->assertText(t('Article New draft of translated node has been updated.'));
     $english_node = $this->drupalGetNodeByTitle('Another node', TRUE);
     $french_node = $english_node->getTranslation('fr');
-    $this->assertEqual($english_node->moderation_state->target_id, 'archived');
+    $this->assertEqual($english_node->moderation_state->value, 'archived');
     $this->assertFalse($english_node->isPublished());
-    $this->assertEqual($french_node->moderation_state->target_id, 'archived');
+    $this->assertEqual($french_node->moderation_state->value, 'archived');
     $this->assertFalse($french_node->isPublished());
 
     // Create another article with its translation. This time publishing english
diff --git a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateAccessTest.php b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateAccessTest.php
index 799d89a51..7d2f74666 100644
--- a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateAccessTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateAccessTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\content_moderation\Functional;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * Tests the view access control handler for moderation state entities.
@@ -31,7 +32,7 @@ class ModerationStateAccessTest extends BrowserTestBase {
     $permissions = [
       'access content',
       'view all revisions',
-      'view moderation states',
+      'view content moderation',
     ];
     $editor1 = $this->drupalCreateUser($permissions);
     $this->drupalLogin($editor1);
@@ -41,7 +42,7 @@ class ModerationStateAccessTest extends BrowserTestBase {
       'title' => 'Draft node',
       'uid' => $editor1->id(),
     ]);
-    $node_1->moderation_state->target_id = 'draft';
+    $node_1->moderation_state->value = 'draft';
     $node_1->save();
 
     $node_2 = Node::create([
@@ -49,26 +50,26 @@ class ModerationStateAccessTest extends BrowserTestBase {
       'title' => 'Published node',
       'uid' => $editor1->id(),
     ]);
-    $node_2->moderation_state->target_id = 'published';
+    $node_2->moderation_state->value = 'published';
     $node_2->save();
 
     // Resave the node with a new state.
     $node_2->setTitle('Archived node');
-    $node_2->moderation_state->target_id = 'archived';
+    $node_2->moderation_state->value = 'archived';
     $node_2->save();
 
     // Now show the View, and confirm that the state labels are showing.
     $this->drupalGet('/latest');
     $page = $this->getSession()->getPage();
-    $this->assertTrue($page->hasLink('Draft'));
-    $this->assertTrue($page->hasLink('Archived'));
-    $this->assertFalse($page->hasLink('Published'));
+    $this->assertTrue($page->hasContent('Draft'));
+    $this->assertTrue($page->hasContent('Archived'));
+    $this->assertFalse($page->hasContent('Published'));
 
     // Now log in as an admin and test the same thing.
     $permissions = [
       'access content',
       'view all revisions',
-      'administer moderation states',
+      'administer content moderation',
     ];
     $admin1 = $this->drupalCreateUser($permissions);
     $this->drupalLogin($admin1);
@@ -76,9 +77,9 @@ class ModerationStateAccessTest extends BrowserTestBase {
     $this->drupalGet('/latest');
     $page = $this->getSession()->getPage();
     $this->assertEquals(200, $this->getSession()->getStatusCode());
-    $this->assertTrue($page->hasLink('Draft'));
-    $this->assertTrue($page->hasLink('Archived'));
-    $this->assertFalse($page->hasLink('Published'));
+    $this->assertTrue($page->hasContent('Draft'));
+    $this->assertTrue($page->hasContent('Archived'));
+    $this->assertFalse($page->hasContent('Published'));
   }
 
   /**
@@ -98,9 +99,11 @@ class ModerationStateAccessTest extends BrowserTestBase {
       'type' => $machine_name,
       'label' => $label,
     ]);
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
     $node_type->save();
 
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', $machine_name);
+    $workflow->save();
     return $node_type;
   }
 
diff --git a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
new file mode 100644
index 000000000..1319ecae1
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateTestBase.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Functional;
+
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\user\Entity\Role;
+
+/**
+ * Defines a base class for moderation state tests.
+ */
+abstract class ModerationStateTestBase extends BrowserTestBase {
+
+  /**
+   * Profile to use.
+   */
+  protected $profile = 'testing';
+
+  /**
+   * Admin user.
+   *
+   * @var \Drupal\Core\Session\AccountInterface
+   */
+  protected $adminUser;
+
+  /**
+   * Permissions to grant admin user.
+   *
+   * @var array
+   */
+  protected $permissions = [
+    'administer content moderation',
+    'access administration pages',
+    'administer content types',
+    'administer nodes',
+    'view latest version',
+    'view any unpublished content',
+    'access content overview',
+    'use editorial transition create_new_draft',
+    'use editorial transition publish',
+  ];
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'content_moderation',
+    'block',
+    'block_content',
+    'node',
+  ];
+
+  /**
+   * Sets the test up.
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->adminUser = $this->drupalCreateUser($this->permissions);
+    $this->drupalPlaceBlock('local_tasks_block', ['id' => 'tabs_block']);
+    $this->drupalPlaceBlock('page_title_block');
+    $this->drupalPlaceBlock('local_actions_block', ['id' => 'actions_block']);
+  }
+
+  /**
+   * Gets the permission machine name for a transition.
+   *
+   * @param string $workflow_id
+   *   The workflow ID.
+   * @param string $transition_id
+   *   The transition ID.
+   *
+   * @return string
+   *   The permission machine name for a transition.
+   */
+  protected function getWorkflowTransitionPermission($workflow_id, $transition_id) {
+    return 'use ' . $workflow_id . ' transition ' . $transition_id;
+  }
+
+  /**
+   * Creates a content-type from the UI.
+   *
+   * @param string $content_type_name
+   *   Content type human name.
+   * @param string $content_type_id
+   *   Machine name.
+   * @param bool $moderated
+   *   TRUE if should be moderated.
+   * @param string $workflow_id
+   *   The workflow to attach to the bundle.
+   */
+  protected function createContentTypeFromUi($content_type_name, $content_type_id, $moderated = FALSE, $workflow_id = 'editorial') {
+    $this->drupalGet('admin/structure/types');
+    $this->clickLink('Add content type');
+    $edit = [
+      'name' => $content_type_name,
+      'type' => $content_type_id,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save content type'));
+
+    if ($moderated) {
+      $this->enableModerationThroughUi($content_type_id, $workflow_id);
+    }
+  }
+
+  /**
+   * Enable moderation for a specified content type, using the UI.
+   *
+   * @param string $content_type_id
+   *   Machine name.
+   * @param string $workflow_id
+   *   The workflow to attach to the bundle.
+   */
+  protected function enableModerationThroughUi($content_type_id, $workflow_id = 'editorial') {
+    $edit['workflow'] = $workflow_id;
+    $this->drupalPostForm('admin/structure/types/manage/' . $content_type_id . '/moderation', $edit, t('Save'));
+    // Ensure the parent environment is up-to-date.
+    // @see content_moderation_workflow_insert()
+    \Drupal::service('entity_type.bundle.info')->clearCachedBundles();
+    \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
+  }
+
+  /**
+   * Grants given user permission to create content of given type.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   User to grant permission to.
+   * @param string $content_type_id
+   *   Content type ID.
+   */
+  protected function grantUserPermissionToCreateContentOfType(AccountInterface $account, $content_type_id) {
+    $role_ids = $account->getRoles(TRUE);
+    /* @var \Drupal\user\RoleInterface $role */
+    $role_id = reset($role_ids);
+    $role = Role::load($role_id);
+    $role->grantPermission(sprintf('create %s content', $content_type_id));
+    $role->grantPermission(sprintf('edit any %s content', $content_type_id));
+    $role->grantPermission(sprintf('delete any %s content', $content_type_id));
+    $role->save();
+  }
+
+}
diff --git a/web/core/modules/content_moderation/src/Tests/NodeAccessTest.php b/web/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
similarity index 80%
rename from web/core/modules/content_moderation/src/Tests/NodeAccessTest.php
rename to web/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
index 1b054067b..2d5242142 100644
--- a/web/core/modules/content_moderation/src/Tests/NodeAccessTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_moderation\Tests;
+namespace Drupal\Tests\content_moderation\Functional;
 
 /**
  * Tests permission access control around nodes.
@@ -15,13 +15,7 @@ class NodeAccessTest extends ModerationStateTestBase {
   protected function setUp() {
     parent::setUp();
     $this->drupalLogin($this->adminUser);
-    $this->createContentTypeFromUi(
-      'Moderated content',
-      'moderated_content',
-      TRUE,
-      ['draft', 'published'],
-      'draft'
-    );
+    $this->createContentTypeFromUi('Moderated content', 'moderated_content', TRUE);
     $this->grantUserPermissionToCreateContentOfType($this->adminUser, 'moderated_content');
   }
 
@@ -35,20 +29,11 @@ class NodeAccessTest extends ModerationStateTestBase {
     $this->drupalPostForm('node/add/moderated_content', [
       'title[0][value]' => 'moderated content',
     ], t('Save and Create New Draft'));
-    $nodes = \Drupal::entityTypeManager()
-      ->getStorage('node')
-      ->loadByProperties([
-        'title' => 'moderated content',
-      ]);
-
-    if (!$nodes) {
+    $node = $this->getNodeByTitle('moderated content');
+    if (!$node) {
       $this->fail('Test node was not saved correctly.');
-      return;
     }
 
-    /** @var \Drupal\node\NodeInterface $node */
-    $node = reset($nodes);
-
     $view_path = 'node/' . $node->id();
     $edit_path = 'node/' . $node->id() . '/edit';
     $latest_path = 'node/' . $node->id() . '/latest';
@@ -75,8 +60,7 @@ class NodeAccessTest extends ModerationStateTestBase {
 
     // Now make a new user and verify that the new user's access is correct.
     $user = $this->createUser([
-      'use draft_draft transition',
-      'use published_draft transition',
+      'use editorial transition create_new_draft',
       'view latest version',
       'view any unpublished content',
     ]);
@@ -92,7 +76,7 @@ class NodeAccessTest extends ModerationStateTestBase {
 
     // Now make another user, who should not be able to see forward revisions.
     $user = $this->createUser([
-      'use published_draft transition',
+      'use editorial transition create_new_draft',
     ]);
     $this->drupalLogin($user);
 
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationPermissionsTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationPermissionsTest.php
new file mode 100644
index 000000000..3a19d22d7
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationPermissionsTest.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Kernel;
+
+use Drupal\content_moderation\Permissions;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Test to ensure content moderation permissions are generated correctly.
+ *
+ * @group content_moderation
+ */
+class ContentModerationPermissionsTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'workflows',
+    'content_moderation',
+    'workflow_type_test',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('workflow');
+  }
+
+  /**
+   * Test permissions generated by content moderation.
+   *
+   * @dataProvider permissionsTestCases
+   */
+  public function testPermissions($workflow, $permissions) {
+    Workflow::create($workflow)->save();
+    $this->assertEquals($permissions, (new Permissions())->transitionPermissions());
+  }
+
+  /**
+   * Test cases for ::testPermissions
+   *
+   * @return array
+   *   Content moderation permissions based test cases.
+   */
+  public function permissionsTestCases() {
+    return [
+      'Simple Content Moderation Workflow' => [
+        [
+          'id' => 'simple_workflow',
+          'label' => 'Simple Workflow',
+          'type' => 'content_moderation',
+          'transitions' => [
+            'publish' => [
+              'label' => 'Publish',
+              'from' => ['draft'],
+              'to' => 'published',
+              'weight' => 0,
+            ],
+            'unpublish' => [
+              'label' => 'Unpublish',
+              'from' => ['published'],
+              'to' => 'draft',
+              'weight' => 0,
+            ],
+          ],
+          'states' => [
+            'draft' => [
+              'label' => 'Draft',
+              'weight' => -5,
+            ],
+            'published' => [
+              'label' => 'Published',
+              'weight' => 0,
+            ],
+          ],
+        ],
+        [
+          'use simple_workflow transition publish' => [
+            'title' => 'Use <em class="placeholder">Publish</em> transition from <em class="placeholder">Simple Workflow</em> workflow.',
+          ],
+          'use simple_workflow transition unpublish' => [
+            'title' => 'Use <em class="placeholder">Unpublish</em> transition from <em class="placeholder">Simple Workflow</em> workflow.',
+          ],
+        ],
+      ],
+      'Non Content Moderation Workflow' => [
+        [
+          'id' => 'morning',
+          'label' => 'Morning',
+          'type' => 'workflow_type_test',
+          'transitions' => [
+            'drink_coffee' => [
+              'label' => 'Drink Coffee',
+              'from' => ['tired'],
+              'to' => 'awake',
+              'weight' => 0,
+            ],
+          ],
+          'states' => [
+            'awake' => [
+              'label' => 'Awake',
+              'weight' => -5,
+            ],
+            'tired' => [
+              'label' => 'Tired',
+              'weight' => -0,
+            ],
+          ],
+        ],
+        []
+      ],
+    ];
+  }
+
+}
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationSchemaTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationSchemaTest.php
deleted file mode 100644
index 8b382c14a..000000000
--- a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationSchemaTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace Drupal\Tests\content_moderation\Kernel;
-
-use Drupal\block_content\Entity\BlockContentType;
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\node\Entity\NodeType;
-use Drupal\content_moderation\Entity\ModerationState;
-use Drupal\content_moderation\Entity\ModerationStateTransition;
-
-/**
- * Ensures that content moderation schema is correct.
- *
- * @group content_moderation
- */
-class ContentModerationSchemaTest extends KernelTestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'content_moderation',
-    'node',
-    'user',
-    'block_content',
-    'system',
-  ];
-
-  /**
-   * Tests content moderation default schema.
-   */
-  public function testContentModerationDefaultConfig() {
-    $this->installConfig(['content_moderation']);
-    $typed_config = \Drupal::service('config.typed');
-    $moderation_states = ModerationState::loadMultiple();
-    foreach ($moderation_states as $moderation_state) {
-      $this->assertConfigSchema($typed_config, $moderation_state->getEntityType()->getConfigPrefix() . '.' . $moderation_state->id(), $moderation_state->toArray());
-    }
-    $moderation_state_transitions = ModerationStateTransition::loadMultiple();
-    foreach ($moderation_state_transitions as $moderation_state_transition) {
-      $this->assertConfigSchema($typed_config, $moderation_state_transition->getEntityType()->getConfigPrefix() . '.' . $moderation_state_transition->id(), $moderation_state_transition->toArray());
-    }
-
-  }
-
-  /**
-   * Tests content moderation third party schema for node types.
-   */
-  public function testContentModerationNodeTypeConfig() {
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('user');
-    $this->installConfig(['content_moderation']);
-    $typed_config = \Drupal::service('config.typed');
-    $moderation_states = ModerationState::loadMultiple();
-    $node_type = NodeType::create([
-      'type' => 'example',
-    ]);
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
-    $node_type->setThirdPartySetting('content_moderation', 'allowed_moderation_states', array_keys($moderation_states));
-    $node_type->setThirdPartySetting('content_moderation', 'default_moderation_state', '');
-    $node_type->save();
-    $this->assertConfigSchema($typed_config, $node_type->getEntityType()->getConfigPrefix() . '.' . $node_type->id(), $node_type->toArray());
-  }
-
-  /**
-   * Tests content moderation third party schema for block content types.
-   */
-  public function testContentModerationBlockContentTypeConfig() {
-    $this->installEntitySchema('block_content');
-    $this->installEntitySchema('user');
-    $this->installConfig(['content_moderation']);
-    $typed_config = \Drupal::service('config.typed');
-    $moderation_states = ModerationState::loadMultiple();
-    $block_content_type = BlockContentType::create([
-      'id' => 'basic',
-      'label' => 'basic',
-      'revision' => TRUE,
-    ]);
-    $block_content_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
-    $block_content_type->setThirdPartySetting('content_moderation', 'allowed_moderation_states', array_keys($moderation_states));
-    $block_content_type->setThirdPartySetting('content_moderation', 'default_moderation_state', '');
-    $block_content_type->save();
-    $this->assertConfigSchema($typed_config, $block_content_type->getEntityType()->getConfigPrefix() . '.' . $block_content_type->id(), $block_content_type->toArray());
-  }
-
-}
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
index 67a7a7498..515115565 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
@@ -3,14 +3,16 @@
 namespace Drupal\Tests\content_moderation\Kernel;
 
 use Drupal\content_moderation\Entity\ContentModerationState;
-use Drupal\content_moderation\Entity\ModerationState;
+use Drupal\Core\Entity\EntityPublishedInterface;
+use Drupal\Core\Entity\EntityStorageException;
 use Drupal\entity_test\Entity\EntityTestBundle;
 use Drupal\entity_test\Entity\EntityTestWithBundle;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\node\NodeInterface;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * Tests links between a content entity and a content_moderation_state entity.
@@ -25,14 +27,21 @@ class ContentModerationStateTest extends KernelTestBase {
   public static $modules = [
     'entity_test',
     'node',
+    'block_content',
     'content_moderation',
     'user',
     'system',
     'language',
     'content_translation',
     'text',
+    'workflows',
   ];
 
+  /**
+   * @var \Drupal\Core\Entity\EntityTypeManager
+   */
+  protected $entityTypeManager;
+
   /**
    * {@inheritdoc}
    */
@@ -43,35 +52,57 @@ class ContentModerationStateTest extends KernelTestBase {
     $this->installEntitySchema('node');
     $this->installEntitySchema('user');
     $this->installEntitySchema('entity_test_with_bundle');
+    $this->installEntitySchema('entity_test_rev');
+    $this->installEntitySchema('entity_test_mulrevpub');
+    $this->installEntitySchema('block_content');
     $this->installEntitySchema('content_moderation_state');
     $this->installConfig('content_moderation');
+
+    $this->entityTypeManager = $this->container->get('entity_type.manager');
   }
 
   /**
    * Tests basic monolingual content moderation through the API.
+   *
+   * @dataProvider basicModerationTestCases
    */
-  public function testBasicModeration() {
-    $node_type = NodeType::create([
-      'type' => 'example',
-    ]);
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
-    $node_type->setThirdPartySetting('content_moderation', 'allowed_moderation_states', ['draft', 'published']);
-    $node_type->setThirdPartySetting('content_moderation', 'default_moderation_state', 'draft');
-    $node_type->save();
-    $node = Node::create([
-      'type' => 'example',
+  public function testBasicModeration($entity_type_id) {
+    // Make the 'entity_test_with_bundle' entity type revisionable.
+    if ($entity_type_id == 'entity_test_with_bundle') {
+      $this->setEntityTestWithBundleKeys(['revision' => 'revision_id']);
+    }
+
+    $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
+    $bundle_id = $entity_type_id;
+    $bundle_entity_type_id = $this->entityTypeManager->getDefinition($entity_type_id)->getBundleEntityType();
+    if ($bundle_entity_type_id) {
+      $bundle_entity_type_definition = $this->entityTypeManager->getDefinition($bundle_entity_type_id);
+      $entity_type_storage = $this->entityTypeManager->getStorage($bundle_entity_type_id);
+
+      $entity_type = $entity_type_storage->create([
+        $bundle_entity_type_definition->getKey('id') => 'example',
+      ]);
+      $entity_type->save();
+      $bundle_id = $entity_type->id();
+    }
+
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle($entity_type_id, $bundle_id);
+    $workflow->save();
+
+    $entity = $entity_storage->create([
       'title' => 'Test title',
+      $this->entityTypeManager->getDefinition($entity_type_id)->getKey('bundle') => $bundle_id,
     ]);
-    $node->save();
-    $node = $this->reloadNode($node);
-    $this->assertEquals('draft', $node->moderation_state->entity->id());
+    $entity->save();
+    $entity = $this->reloadEntity($entity);
+    $this->assertEquals('draft', $entity->moderation_state->value);
 
-    $published = ModerationState::load('published');
-    $node->moderation_state->entity = $published;
-    $node->save();
+    $entity->moderation_state->value = 'published';
+    $entity->save();
 
-    $node = $this->reloadNode($node);
-    $this->assertEquals('published', $node->moderation_state->entity->id());
+    $entity = $this->reloadEntity($entity);
+    $this->assertEquals('published', $entity->moderation_state->value);
 
     // Change the state without saving the node.
     $content_moderation_state = ContentModerationState::load(1);
@@ -79,26 +110,76 @@ class ContentModerationStateTest extends KernelTestBase {
     $content_moderation_state->setNewRevision(TRUE);
     $content_moderation_state->save();
 
-    $node = $this->reloadNode($node, 3);
-    $this->assertEquals('draft', $node->moderation_state->entity->id());
-    $this->assertFalse($node->isPublished());
+    $entity = $this->reloadEntity($entity, 3);
+    $this->assertEquals('draft', $entity->moderation_state->value);
+    if ($entity instanceof EntityPublishedInterface) {
+      $this->assertFalse($entity->isPublished());
+    }
 
     // Get the default revision.
-    $node = $this->reloadNode($node);
-    $this->assertTrue($node->isPublished());
-    $this->assertEquals(2, $node->getRevisionId());
+    $entity = $this->reloadEntity($entity);
+    if ($entity instanceof EntityPublishedInterface) {
+      $this->assertTrue((bool) $entity->isPublished());
+    }
+    $this->assertEquals(2, $entity->getRevisionId());
 
-    $node->moderation_state->target_id = 'published';
-    $node->save();
+    $entity->moderation_state->value = 'published';
+    $entity->save();
 
-    $node = $this->reloadNode($node, 4);
-    $this->assertEquals('published', $node->moderation_state->entity->id());
+    $entity = $this->reloadEntity($entity, 4);
+    $this->assertEquals('published', $entity->moderation_state->value);
 
     // Get the default revision.
-    $node = $this->reloadNode($node);
-    $this->assertTrue($node->isPublished());
-    $this->assertEquals(4, $node->getRevisionId());
+    $entity = $this->reloadEntity($entity);
+    if ($entity instanceof EntityPublishedInterface) {
+      $this->assertTrue((bool) $entity->isPublished());
+    }
+    $this->assertEquals(4, $entity->getRevisionId());
 
+    // Update the node to archived which will then be the default revision.
+    $entity->moderation_state->value = 'archived';
+    $entity->save();
+
+    // Revert to the previous (published) revision.
+    $previous_revision = $entity_storage->loadRevision(4);
+    $previous_revision->isDefaultRevision(TRUE);
+    $previous_revision->setNewRevision(TRUE);
+    $previous_revision->save();
+
+    // Get the default revision.
+    $entity = $this->reloadEntity($entity);
+    $this->assertEquals('published', $entity->moderation_state->value);
+    if ($entity instanceof EntityPublishedInterface) {
+      $this->assertTrue($entity->isPublished());
+    }
+
+    // Set an invalid moderation state.
+    $this->setExpectedException(EntityStorageException::class);
+    $entity->moderation_state->value = 'foobar';
+    $entity->save();
+  }
+
+  /**
+   * Test cases for basic moderation test.
+   */
+  public function basicModerationTestCases() {
+    return [
+      'Nodes' => [
+        'node',
+      ],
+      'Block content' => [
+        'block_content',
+      ],
+      'Test Entity with Bundle' => [
+        'entity_test_with_bundle',
+      ],
+      'Test entity - revisions, data table, and published interface' => [
+        'entity_test_mulrevpub',
+      ],
+      'Entity Test with revisions' => [
+        'entity_test_rev',
+      ]
+    ];
   }
 
   /**
@@ -110,75 +191,77 @@ class ContentModerationStateTest extends KernelTestBase {
     $node_type = NodeType::create([
       'type' => 'example',
     ]);
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
-    $node_type->setThirdPartySetting('content_moderation', 'allowed_moderation_states', ['draft', 'published']);
-    $node_type->setThirdPartySetting('content_moderation', 'default_moderation_state', 'draft');
     $node_type->save();
+
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
+
     $english_node = Node::create([
       'type' => 'example',
       'title' => 'Test title',
     ]);
     // Revision 1 (en).
     $english_node
-      ->setPublished(FALSE)
+      ->setUnpublished()
       ->save();
-    $this->assertEquals('draft', $english_node->moderation_state->entity->id());
+    $this->assertEquals('draft', $english_node->moderation_state->value);
     $this->assertFalse($english_node->isPublished());
 
     // Create a French translation.
     $french_node = $english_node->addTranslation('fr', ['title' => 'French title']);
-    $french_node->setPublished(FALSE);
+    $french_node->setUnpublished();
     // Revision 1 (fr).
     $french_node->save();
-    $french_node = $this->reloadNode($english_node)->getTranslation('fr');
-    $this->assertEquals('draft', $french_node->moderation_state->entity->id());
+    $french_node = $this->reloadEntity($english_node)->getTranslation('fr');
+    $this->assertEquals('draft', $french_node->moderation_state->value);
     $this->assertFalse($french_node->isPublished());
 
     // Move English node to create another draft.
-    $english_node = $this->reloadNode($english_node);
-    $english_node->moderation_state->target_id = 'draft';
+    $english_node = $this->reloadEntity($english_node);
+    $english_node->moderation_state->value = 'draft';
     // Revision 2 (en, fr).
     $english_node->save();
-    $english_node = $this->reloadNode($english_node);
-    $this->assertEquals('draft', $english_node->moderation_state->entity->id());
+    $english_node = $this->reloadEntity($english_node);
+    $this->assertEquals('draft', $english_node->moderation_state->value);
 
     // French node should still be in draft.
-    $french_node = $this->reloadNode($english_node)->getTranslation('fr');
-    $this->assertEquals('draft', $french_node->moderation_state->entity->id());
+    $french_node = $this->reloadEntity($english_node)->getTranslation('fr');
+    $this->assertEquals('draft', $french_node->moderation_state->value);
 
     // Publish the French node.
-    $french_node->moderation_state->target_id = 'published';
+    $french_node->moderation_state->value = 'published';
     // Revision 3 (en, fr).
     $french_node->save();
-    $french_node = $this->reloadNode($french_node)->getTranslation('fr');
+    $french_node = $this->reloadEntity($french_node)->getTranslation('fr');
     $this->assertTrue($french_node->isPublished());
-    $this->assertEquals('published', $french_node->moderation_state->entity->id());
+    $this->assertEquals('published', $french_node->moderation_state->value);
     $this->assertTrue($french_node->isPublished());
     $english_node = $french_node->getTranslation('en');
-    $this->assertEquals('draft', $english_node->moderation_state->entity->id());
+    $this->assertEquals('draft', $english_node->moderation_state->value);
 
     // Publish the English node.
-    $english_node->moderation_state->target_id = 'published';
+    $english_node->moderation_state->value = 'published';
     // Revision 4 (en, fr).
     $english_node->save();
-    $english_node = $this->reloadNode($english_node);
+    $english_node = $this->reloadEntity($english_node);
     $this->assertTrue($english_node->isPublished());
 
     // Move the French node back to draft.
-    $french_node = $this->reloadNode($english_node)->getTranslation('fr');
+    $french_node = $this->reloadEntity($english_node)->getTranslation('fr');
     $this->assertTrue($french_node->isPublished());
-    $french_node->moderation_state->target_id = 'draft';
+    $french_node->moderation_state->value = 'draft';
     // Revision 5 (en, fr).
     $french_node->save();
-    $french_node = $this->reloadNode($english_node, 5)->getTranslation('fr');
+    $french_node = $this->reloadEntity($english_node, 5)->getTranslation('fr');
     $this->assertFalse($french_node->isPublished());
     $this->assertTrue($french_node->getTranslation('en')->isPublished());
 
     // Republish the French node.
-    $french_node->moderation_state->target_id = 'published';
+    $french_node->moderation_state->value = 'published';
     // Revision 6 (en, fr).
     $french_node->save();
-    $french_node = $this->reloadNode($english_node)->getTranslation('fr');
+    $french_node = $this->reloadEntity($english_node)->getTranslation('fr');
     $this->assertTrue($french_node->isPublished());
 
     // Change the EN state without saving the node.
@@ -187,11 +270,11 @@ class ContentModerationStateTest extends KernelTestBase {
     $content_moderation_state->setNewRevision(TRUE);
     // Revision 7 (en, fr).
     $content_moderation_state->save();
-    $english_node = $this->reloadNode($french_node, $french_node->getRevisionId() + 1);
+    $english_node = $this->reloadEntity($french_node, $french_node->getRevisionId() + 1);
 
-    $this->assertEquals('draft', $english_node->moderation_state->entity->id());
-    $french_node = $this->reloadNode($english_node)->getTranslation('fr');
-    $this->assertEquals('published', $french_node->moderation_state->entity->id());
+    $this->assertEquals('draft', $english_node->moderation_state->value);
+    $french_node = $this->reloadEntity($english_node)->getTranslation('fr');
+    $this->assertEquals('published', $french_node->moderation_state->value);
 
     // This should unpublish the French node.
     $content_moderation_state = ContentModerationState::load(1);
@@ -201,16 +284,16 @@ class ContentModerationStateTest extends KernelTestBase {
     // Revision 8 (en, fr).
     $content_moderation_state->save();
 
-    $english_node = $this->reloadNode($english_node, $english_node->getRevisionId());
-    $this->assertEquals('draft', $english_node->moderation_state->entity->id());
-    $french_node = $this->reloadNode($english_node, '8')->getTranslation('fr');
-    $this->assertEquals('draft', $french_node->moderation_state->entity->id());
+    $english_node = $this->reloadEntity($english_node, $english_node->getRevisionId());
+    $this->assertEquals('draft', $english_node->moderation_state->value);
+    $french_node = $this->reloadEntity($english_node, '8')->getTranslation('fr');
+    $this->assertEquals('draft', $french_node->moderation_state->value);
     // Switching the moderation state to an unpublished state should update the
     // entity.
     $this->assertFalse($french_node->isPublished());
 
     // Get the default english node.
-    $english_node = $this->reloadNode($english_node);
+    $english_node = $this->reloadEntity($english_node);
     $this->assertTrue($english_node->isPublished());
     $this->assertEquals(6, $english_node->getRevisionId());
   }
@@ -220,25 +303,18 @@ class ContentModerationStateTest extends KernelTestBase {
    */
   public function testNonTranslatableEntityTypeModeration() {
     // Make the 'entity_test_with_bundle' entity type revisionable.
-    $entity_type = clone \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
-    $keys = $entity_type->getKeys();
-    $keys['revision'] = 'revision_id';
-    $entity_type->set('entity_keys', $keys);
-    \Drupal::state()->set('entity_test_with_bundle.entity_type', $entity_type);
-    \Drupal::entityDefinitionUpdateManager()->applyUpdates();
+    $this->setEntityTestWithBundleKeys(['revision' => 'revision_id']);
 
     // Create a test bundle.
     $entity_test_bundle = EntityTestBundle::create([
       'id' => 'example',
     ]);
-    $entity_test_bundle->setThirdPartySetting('content_moderation', 'enabled', TRUE);
-    $entity_test_bundle->setThirdPartySetting('content_moderation', 'allowed_moderation_states', [
-      'draft',
-      'published'
-    ]);
-    $entity_test_bundle->setThirdPartySetting('content_moderation', 'default_moderation_state', 'draft');
     $entity_test_bundle->save();
 
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_with_bundle', 'example');
+    $workflow->save();
+
     // Check that the tested entity type is not translatable.
     $entity_type = \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
     $this->assertFalse($entity_type->isTranslatable(), 'The test entity type is not translatable.');
@@ -248,12 +324,12 @@ class ContentModerationStateTest extends KernelTestBase {
       'type' => 'example'
     ]);
     $entity_test_with_bundle->save();
-    $this->assertEquals('draft', $entity_test_with_bundle->moderation_state->entity->id());
+    $this->assertEquals('draft', $entity_test_with_bundle->moderation_state->value);
 
-    $entity_test_with_bundle->moderation_state->target_id = 'published';
+    $entity_test_with_bundle->moderation_state->value = 'published';
     $entity_test_with_bundle->save();
 
-    $this->assertEquals('published', EntityTestWithBundle::load($entity_test_with_bundle->id())->moderation_state->entity->id());
+    $this->assertEquals('published', EntityTestWithBundle::load($entity_test_with_bundle->id())->moderation_state->value);
   }
 
   /**
@@ -263,26 +339,18 @@ class ContentModerationStateTest extends KernelTestBase {
   public function testNonLangcodeEntityTypeModeration() {
     // Make the 'entity_test_with_bundle' entity type revisionable and unset
     // the langcode entity key.
-    $entity_type = clone \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
-    $keys = $entity_type->getKeys();
-    $keys['revision'] = 'revision_id';
-    unset($keys['langcode']);
-    $entity_type->set('entity_keys', $keys);
-    \Drupal::state()->set('entity_test_with_bundle.entity_type', $entity_type);
-    \Drupal::entityDefinitionUpdateManager()->applyUpdates();
+    $this->setEntityTestWithBundleKeys(['revision' => 'revision_id'], ['langcode']);
 
     // Create a test bundle.
     $entity_test_bundle = EntityTestBundle::create([
       'id' => 'example',
     ]);
-    $entity_test_bundle->setThirdPartySetting('content_moderation', 'enabled', TRUE);
-    $entity_test_bundle->setThirdPartySetting('content_moderation', 'allowed_moderation_states', [
-      'draft',
-      'published'
-    ]);
-    $entity_test_bundle->setThirdPartySetting('content_moderation', 'default_moderation_state', 'draft');
     $entity_test_bundle->save();
 
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_with_bundle', 'example');
+    $workflow->save();
+
     // Check that the tested entity type is not translatable.
     $entity_type = \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
     $this->assertFalse($entity_type->isTranslatable(), 'The test entity type is not translatable.');
@@ -292,33 +360,94 @@ class ContentModerationStateTest extends KernelTestBase {
       'type' => 'example'
     ]);
     $entity_test_with_bundle->save();
-    $this->assertEquals('draft', $entity_test_with_bundle->moderation_state->entity->id());
+    $this->assertEquals('draft', $entity_test_with_bundle->moderation_state->value);
 
-    $entity_test_with_bundle->moderation_state->target_id = 'published';
+    $entity_test_with_bundle->moderation_state->value = 'published';
     $entity_test_with_bundle->save();
 
-    $this->assertEquals('published', EntityTestWithBundle::load($entity_test_with_bundle->id())->moderation_state->entity->id());
+    $this->assertEquals('published', EntityTestWithBundle::load($entity_test_with_bundle->id())->moderation_state->value);
   }
 
   /**
-   * Reloads the node after clearing the static cache.
+   * Set the keys on the test entity type.
    *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node to reload.
-   * @param int|false $revision_id
+   * @param array $keys
+   *   The entity keys to override
+   * @param array $remove_keys
+   *   Keys to remove.
+   */
+  protected function setEntityTestWithBundleKeys($keys, $remove_keys = []) {
+    $entity_type = clone \Drupal::entityTypeManager()->getDefinition('entity_test_with_bundle');
+    $original_keys = $entity_type->getKeys();
+    foreach ($remove_keys as $remove_key) {
+      unset($original_keys[$remove_key]);
+    }
+    $entity_type->set('entity_keys', $keys + $original_keys);
+    \Drupal::state()->set('entity_test_with_bundle.entity_type', $entity_type);
+    \Drupal::entityDefinitionUpdateManager()->applyUpdates();
+  }
+
+  /**
+   * Tests the dependencies of the workflow when using content moderation.
+   */
+  public function testWorkflowDependencies() {
+    $node_type = NodeType::create([
+      'type' => 'example',
+    ]);
+    $node_type->save();
+
+    $workflow = Workflow::load('editorial');
+    // Test both a config and non-config based bundle and entity type.
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
+    $workflow->save();
+
+    $this->assertEquals([
+      'module' => [
+        'content_moderation',
+        'entity_test',
+      ],
+      'config' => [
+        'node.type.example',
+      ],
+    ], $workflow->getDependencies());
+
+    $entity_types = $workflow->getTypePlugin()->getEntityTypes();
+    $this->assertTrue(in_array('node', $entity_types));
+    $this->assertTrue(in_array('entity_test_rev', $entity_types));
+
+    // Delete the node type and ensure it is removed from the workflow.
+    $node_type->delete();
+    $workflow = Workflow::load('editorial');
+    $entity_types = $workflow->getTypePlugin()->getEntityTypes();
+    $this->assertFalse(in_array('node', $entity_types));
+
+    // Uninstall entity test and ensure it's removed from the workflow.
+    $this->container->get('config.manager')->uninstall('module', 'entity_test');
+    $workflow = Workflow::load('editorial');
+    $entity_types = $workflow->getTypePlugin()->getEntityTypes();
+    $this->assertFalse(in_array('entity_test_rev', $entity_types));
+  }
+
+  /**
+   * Reloads the entity after clearing the static cache.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity to reload.
+   * @param int|bool $revision_id
    *   The specific revision ID to load. Defaults FALSE and just loads the
    *   default revision.
    *
-   * @return \Drupal\node\NodeInterface
-   *   The reloaded node.
+   * @return \Drupal\Core\Entity\EntityInterface
+   *   The reloaded entity.
    */
-  protected function reloadNode(NodeInterface $node, $revision_id = FALSE) {
-    $storage = \Drupal::entityTypeManager()->getStorage('node');
-    $storage->resetCache([$node->id()]);
+  protected function reloadEntity(EntityInterface $entity, $revision_id = FALSE) {
+    $storage = \Drupal::entityTypeManager()->getStorage($entity->getEntityTypeId());
+    $storage->resetCache([$entity->id()]);
     if ($revision_id) {
       return $storage->loadRevision($revision_id);
     }
-    return $storage->load($node->id());
+    return $storage->load($entity->id());
   }
 
 }
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationWorkflowTypeApiTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationWorkflowTypeApiTest.php
new file mode 100644
index 000000000..c2ea8c576
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationWorkflowTypeApiTest.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Tests the API of the ContentModeration workflow type plugin.
+ *
+ * @group content_moderation
+ *
+ * @coversDefaultClass \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration
+ */
+class ContentModerationWorkflowTypeApiTest extends KernelTestBase {
+
+  /**
+   * A workflow for testing.
+   *
+   * @var \Drupal\workflows\Entity\Workflow;
+   */
+  protected $workflow;
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'workflows',
+    'content_moderation',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->workflow = Workflow::create(['id' => 'test', 'type' => 'content_moderation']);
+    $this->workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published');
+  }
+
+  /**
+   * @covers ::getBundlesForEntityType
+   * @covers ::addEntityTypeAndBundle
+   * @covers ::removeEntityTypeAndBundle
+   */
+  public function testGetBundlesForEntityType() {
+    /** @var \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration $workflow_plugin */
+    $workflow_plugin = $this->workflow->getTypePlugin();
+    // The content moderation plugin does not validate the existence of the
+    // entity type or bundle.
+    $this->assertEquals([], $workflow_plugin->getBundlesForEntityType('fake_node'));
+    $workflow_plugin->addEntityTypeAndBundle('fake_node', 'fake_page');
+    $this->assertEquals(['fake_page'], $workflow_plugin->getBundlesForEntityType('fake_node'));
+    $this->assertEquals([], $workflow_plugin->getBundlesForEntityType('fake_block'));
+    $workflow_plugin->removeEntityTypeAndBundle('fake_node', 'fake_page');
+    $this->assertEquals([], $workflow_plugin->getBundlesForEntityType('fake_node'));
+  }
+
+  /**
+   * @covers ::appliesToEntityTypeAndBundle
+   * @covers ::addEntityTypeAndBundle
+   * @covers ::removeEntityTypeAndBundle
+   */
+  public function testAppliesToEntityTypeAndBundle() {
+    /** @var \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration $workflow_plugin */
+    $workflow_plugin = $this->workflow->getTypePlugin();
+    // The content moderation plugin does not validate the existence of the
+    // entity type or bundle.
+    $this->assertFalse($workflow_plugin->appliesToEntityTypeAndBundle('fake_node', 'fake_page'));
+    $workflow_plugin->addEntityTypeAndBundle('fake_node', 'fake_page');
+    $this->assertTrue($workflow_plugin->appliesToEntityTypeAndBundle('fake_node', 'fake_page'));
+    $this->assertFalse($workflow_plugin->appliesToEntityTypeAndBundle('fake_block', 'fake_custom'));
+    $workflow_plugin->removeEntityTypeAndBundle('fake_node', 'fake_page');
+    $this->assertFalse($workflow_plugin->appliesToEntityTypeAndBundle('fake_node', 'fake_page'));
+  }
+
+  /**
+   * @covers ::addEntityTypeAndBundle
+   */
+  public function testAddEntityTypeAndBundle() {
+    /** @var \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration $workflow_plugin */
+    $workflow_plugin = $this->workflow->getTypePlugin();
+
+    // The bundles are intentionally added in reverse alphabetical order.
+    $workflow_plugin->addEntityTypeAndBundle('fake_node', 'fake_page');
+    $workflow_plugin->addEntityTypeAndBundle('fake_node', 'fake_article');
+
+    // Add another entity type that comes alphabetically before 'fake_node'.
+    $workflow_plugin->addEntityTypeAndBundle('fake_block', 'fake_custom');
+
+    // The entity type keys and bundle values should be sorted alphabetically.
+    // The bundle array index should not reflect the order in which they are
+    // added.
+    $this->assertSame(
+      ['fake_block' => ['fake_custom'], 'fake_node' => ['fake_article', 'fake_page']],
+      $workflow_plugin->getConfiguration()['entity_types']
+    );
+  }
+
+}
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/EntityOperationsTest.php b/web/core/modules/content_moderation/tests/src/Kernel/EntityOperationsTest.php
index 929356ec7..60e9edf64 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/EntityOperationsTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/EntityOperationsTest.php
@@ -4,9 +4,9 @@ namespace Drupal\Tests\content_moderation\Kernel;
 
 
 use Drupal\KernelTests\KernelTestBase;
-use Drupal\content_moderation\Entity\ModerationState;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * @coversDefaultClass \Drupal\content_moderation\EntityOperations
@@ -23,6 +23,7 @@ class EntityOperationsTest extends KernelTestBase {
     'node',
     'user',
     'system',
+    'workflows',
   ];
 
   /**
@@ -47,8 +48,10 @@ class EntityOperationsTest extends KernelTestBase {
       'type' => 'page',
       'label' => 'Page',
     ]);
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
     $node_type->save();
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'page');
+    $workflow->save();
   }
 
   /**
@@ -60,7 +63,7 @@ class EntityOperationsTest extends KernelTestBase {
       'type' => 'page',
       'title' => 'A',
     ]);
-    $page->moderation_state->target_id = 'draft';
+    $page->moderation_state->value = 'draft';
     $page->save();
 
     $id = $page->id();
@@ -75,7 +78,7 @@ class EntityOperationsTest extends KernelTestBase {
 
     // Moderate the entity to published.
     $page->setTitle('B');
-    $page->moderation_state->target_id = 'published';
+    $page->moderation_state->value = 'published';
     $page->save();
 
     // Verify the entity is now published and public.
@@ -86,7 +89,7 @@ class EntityOperationsTest extends KernelTestBase {
 
     // Make a new forward-revision in Draft.
     $page->setTitle('C');
-    $page->moderation_state->target_id = 'draft';
+    $page->moderation_state->value = 'draft';
     $page->save();
 
     // Verify normal loads return the still-default previous version.
@@ -105,7 +108,7 @@ class EntityOperationsTest extends KernelTestBase {
     $this->assertEquals('C', $page->getTitle());
 
     $page->setTitle('D');
-    $page->moderation_state->target_id = 'published';
+    $page->moderation_state->value = 'published';
     $page->save();
 
     // Verify normal loads return the still-default previous version.
@@ -116,7 +119,7 @@ class EntityOperationsTest extends KernelTestBase {
 
     // Now check that we can immediately add a new published revision over it.
     $page->setTitle('E');
-    $page->moderation_state->target_id = 'published';
+    $page->moderation_state->value = 'published';
     $page->save();
 
     $page = Node::load($id);
@@ -134,7 +137,7 @@ class EntityOperationsTest extends KernelTestBase {
       'type' => 'page',
       'title' => 'A',
     ]);
-    $page->moderation_state->target_id = 'published';
+    $page->moderation_state->value = 'published';
     $page->save();
 
     $id = $page->id();
@@ -151,29 +154,12 @@ class EntityOperationsTest extends KernelTestBase {
    * Verifies that an unpublished state may be made the default revision.
    */
   public function testArchive() {
-    $published_id = $this->randomMachineName();
-    $published_state = ModerationState::create([
-      'id' => $published_id,
-      'label' => $this->randomString(),
-      'published' => TRUE,
-      'default_revision' => TRUE,
-    ]);
-    $published_state->save();
-
-    $archived_id = $this->randomMachineName();
-    $archived_state = ModerationState::create([
-      'id' => $archived_id,
-      'label' => $this->randomString(),
-      'published' => FALSE,
-      'default_revision' => TRUE,
-    ]);
-    $archived_state->save();
-
     $page = Node::create([
       'type' => 'page',
       'title' => $this->randomString(),
     ]);
-    $page->moderation_state->target_id = $published_id;
+
+    $page->moderation_state->value = 'published';
     $page->save();
 
     $id = $page->id();
@@ -184,7 +170,7 @@ class EntityOperationsTest extends KernelTestBase {
 
     // When the page is moderated to the archived state, then the latest
     // revision should be the default revision, and it should be unpublished.
-    $page->moderation_state->target_id = $archived_id;
+    $page->moderation_state->value = 'archived';
     $page->save();
     $new_revision_id = $page->getRevisionId();
 
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/EntityRevisionConverterTest.php b/web/core/modules/content_moderation/tests/src/Kernel/EntityRevisionConverterTest.php
index 89c84f9c7..6f209d13a 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/EntityRevisionConverterTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/EntityRevisionConverterTest.php
@@ -6,6 +6,7 @@ use Drupal\entity_test\Entity\EntityTest;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * @coversDefaultClass \Drupal\content_moderation\ParamConverter\EntityRevisionConverter
@@ -19,6 +20,7 @@ class EntityRevisionConverterTest extends KernelTestBase {
     'system',
     'content_moderation',
     'node',
+    'workflows',
   ];
 
   /**
@@ -59,17 +61,21 @@ class EntityRevisionConverterTest extends KernelTestBase {
    * @covers ::convert
    */
   public function testConvertWithRevisionableEntityType() {
+    $this->installConfig(['content_moderation']);
     $node_type = NodeType::create([
       'type' => 'article',
     ]);
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
     $node_type->save();
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'article');
+    $workflow->save();
 
     $revision_ids = [];
     $node = Node::create([
       'title' => 'test',
       'type' => 'article',
     ]);
+    $node->moderation_state->value = 'published';
     $node->save();
 
     $revision_ids[] = $node->getRevisionId();
@@ -79,7 +85,7 @@ class EntityRevisionConverterTest extends KernelTestBase {
     $revision_ids[] = $node->getRevisionId();
 
     $node->setNewRevision(TRUE);
-    $node->isDefaultRevision(FALSE);
+    $node->moderation_state->value = 'draft';
     $node->save();
     $revision_ids[] = $node->getRevisionId();
 
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php b/web/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
index 97e61f1ed..7c4f97d39 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
@@ -6,6 +6,7 @@ use Drupal\KernelTests\KernelTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * @coversDefaultClass \Drupal\content_moderation\Plugin\Validation\Constraint\ModerationStateConstraintValidator
@@ -23,6 +24,7 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     'system',
     'language',
     'content_translation',
+    'workflows',
   ];
 
   /**
@@ -47,20 +49,23 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     $node_type = NodeType::create([
       'type' => 'example',
     ]);
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
     $node_type->save();
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
+
     $node = Node::create([
       'type' => 'example',
       'title' => 'Test title',
     ]);
-    $node->moderation_state->target_id = 'draft';
+    $node->moderation_state->value = 'draft';
     $node->save();
 
-    $node->moderation_state->target_id = 'published';
+    $node->moderation_state->value = 'published';
     $this->assertCount(0, $node->validate());
     $node->save();
 
-    $this->assertEquals('published', $node->moderation_state->entity->id());
+    $this->assertEquals('published', $node->moderation_state->value);
   }
 
   /**
@@ -72,16 +77,19 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     $node_type = NodeType::create([
       'type' => 'example',
     ]);
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
     $node_type->save();
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
+
     $node = Node::create([
       'type' => 'example',
       'title' => 'Test title',
     ]);
-    $node->moderation_state->target_id = 'draft';
+    $node->moderation_state->value = 'draft';
     $node->save();
 
-    $node->moderation_state->target_id = 'archived';
+    $node->moderation_state->value = 'archived';
     $violations = $node->validate();
     $this->assertCount(1, $violations);
 
@@ -106,12 +114,9 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     $nid = $node->id();
 
     // Enable moderation for our node type.
-    /** @var NodeType $node_type */
-    $node_type = NodeType::load('example');
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
-    $node_type->setThirdPartySetting('content_moderation', 'allowed_moderation_states', ['draft', 'published']);
-    $node_type->setThirdPartySetting('content_moderation', 'default_moderation_state', 'draft');
-    $node_type->save();
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
 
     $node = Node::load($nid);
 
@@ -155,12 +160,9 @@ class EntityStateChangeValidationTest extends KernelTestBase {
     $node_fr->save();
 
     // Enable moderation for our node type.
-    /** @var NodeType $node_type */
-    $node_type = NodeType::load('example');
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
-    $node_type->setThirdPartySetting('content_moderation', 'allowed_moderation_states', ['draft', 'published']);
-    $node_type->setThirdPartySetting('content_moderation', 'default_moderation_state', 'draft');
-    $node_type->save();
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
 
     // Reload the French version of the node.
     $node = Node::load($nid);
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateEntityTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateEntityTest.php
deleted file mode 100644
index f312cde24..000000000
--- a/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateEntityTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\Tests\content_moderation\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\content_moderation\Entity\ModerationState;
-
-/**
- * @coversDefaultClass \Drupal\content_moderation\Entity\ModerationState
- *
- * @group content_moderation
- */
-class ModerationStateEntityTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['content_moderation'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('moderation_state');
-  }
-
-  /**
-   * Verify moderation state methods based on entity properties.
-   *
-   * @covers ::isPublishedState
-   * @covers ::isDefaultRevisionState
-   *
-   * @dataProvider moderationStateProvider
-   */
-  public function testModerationStateProperties($published, $default_revision, $is_published, $is_default) {
-    $moderation_state_id = $this->randomMachineName();
-    $moderation_state = ModerationState::create([
-      'id' => $moderation_state_id,
-      'label' => $this->randomString(),
-      'published' => $published,
-      'default_revision' => $default_revision,
-    ]);
-    $moderation_state->save();
-
-    $moderation_state = ModerationState::load($moderation_state_id);
-    $this->assertEquals($is_published, $moderation_state->isPublishedState());
-    $this->assertEquals($is_default, $moderation_state->isDefaultRevisionState());
-  }
-
-  /**
-   * Data provider for ::testModerationStateProperties.
-   */
-  public function moderationStateProvider() {
-    return [
-      // Draft, Needs review; should not touch the default revision.
-      [FALSE, FALSE, FALSE, FALSE],
-      // Published; this state should update and publish the default revision.
-      [TRUE, TRUE, TRUE, TRUE],
-      // Archive; this state should update but not publish the default revision.
-      [FALSE, TRUE, FALSE, TRUE],
-      // We try to prevent creating this state via the UI, but when a moderation
-      // state is a published state, it should also become the default revision.
-      [TRUE, FALSE, TRUE, TRUE],
-    ];
-  }
-
-}
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
index c57963e07..3f984da45 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\content_moderation\Kernel;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * @coversDefaultClass \Drupal\content_moderation\Plugin\Field\ModerationStateFieldItemList
@@ -22,6 +23,7 @@ class ModerationStateFieldItemListTest extends KernelTestBase {
     'user',
     'system',
     'language',
+    'workflows',
   ];
 
   /**
@@ -44,10 +46,11 @@ class ModerationStateFieldItemListTest extends KernelTestBase {
     $node_type = NodeType::create([
       'type' => 'example',
     ]);
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
-    $node_type->setThirdPartySetting('content_moderation', 'allowed_moderation_states', ['draft']);
-    $node_type->setThirdPartySetting('content_moderation', 'default_moderation_state', 'draft');
     $node_type->save();
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'example');
+    $workflow->save();
+
     $this->testNode = Node::create([
       'type' => 'example',
       'title' => 'Test title',
@@ -61,7 +64,7 @@ class ModerationStateFieldItemListTest extends KernelTestBase {
    * Test the field item list when accessing an index.
    */
   public function testArrayIndex() {
-    $this->assertEquals('draft', $this->testNode->moderation_state[0]->entity->id());
+    $this->assertEquals('draft', $this->testNode->moderation_state[0]->value);
   }
 
   /**
@@ -70,7 +73,7 @@ class ModerationStateFieldItemListTest extends KernelTestBase {
   public function testArrayIteration() {
     $states = [];
     foreach ($this->testNode->moderation_state as $item) {
-      $states[] = $item->entity->id();
+      $states[] = $item->value;
     }
     $this->assertEquals(['draft'], $states);
   }
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/StateFormatterTest.php b/web/core/modules/content_moderation/tests/src/Kernel/StateFormatterTest.php
new file mode 100644
index 000000000..b45b34e8b
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/src/Kernel/StateFormatterTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Kernel;
+
+use Drupal\Core\Render\RenderContext;
+use Drupal\entity_test\Entity\EntityTestRev;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Test the state field formatter.
+ *
+ * @group content_moderation
+ */
+class StateFormatterTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'workflows',
+    'content_moderation',
+    'entity_test',
+    'user',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_rev');
+    $this->installEntitySchema('content_moderation_state');
+    $this->installConfig('content_moderation');
+
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_rev', 'entity_test_rev');
+    $workflow->save();
+  }
+
+  /**
+   * Test the embed field.
+   *
+   * @dataProvider formatterTestCases
+   */
+  public function testStateFieldFormatter($field_value, $formatter_settings, $expected_output) {
+    $entity = EntityTestRev::create([
+      'moderation_state' => $field_value,
+    ]);
+    $entity->save();
+
+    $field_output = $this->container->get('renderer')->executeInRenderContext(new RenderContext(), function() use ($entity, $formatter_settings) {
+      return $entity->moderation_state->view($formatter_settings);
+    });
+
+    $this->assertEquals($expected_output, $field_output[0]);
+  }
+
+  /**
+   * Test cases for ::
+   */
+  public function formatterTestCases() {
+    return [
+      'Draft State' => [
+        'draft',
+        [
+          'type' => 'content_moderation_state',
+          'settings' => [],
+        ],
+        [
+          '#markup' => 'Draft',
+        ],
+      ],
+      'Published State' => [
+        'published',
+        [
+          'type' => 'content_moderation_state',
+          'settings' => [],
+        ],
+        [
+          '#markup' => 'Published',
+        ],
+      ],
+    ];
+  }
+
+}
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
index c869619c9..d4c4aa37c 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
@@ -2,10 +2,12 @@
 
 namespace Drupal\Tests\content_moderation\Kernel;
 
+use Drupal\entity_test\Entity\EntityTestMulRevPub;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
 use Drupal\views\Views;
+use Drupal\workflows\Entity\Workflow;
 
 /**
  * Tests the views integration of content_moderation.
@@ -21,6 +23,8 @@ class ViewsDataIntegrationTest extends ViewsKernelTestBase {
     'content_moderation_test_views',
     'node',
     'content_moderation',
+    'workflows',
+    'entity_test',
   ];
 
   /**
@@ -30,6 +34,7 @@ class ViewsDataIntegrationTest extends ViewsKernelTestBase {
     parent::setUp($import_test_views);
 
     $this->installEntitySchema('node');
+    $this->installEntitySchema('entity_test_mulrevpub');
     $this->installEntitySchema('user');
     $this->installEntitySchema('content_moderation_state');
     $this->installSchema('node', 'node_access');
@@ -39,8 +44,11 @@ class ViewsDataIntegrationTest extends ViewsKernelTestBase {
     $node_type = NodeType::create([
       'type' => 'page',
     ]);
-    $node_type->setThirdPartySetting('content_moderation', 'enabled', TRUE);
     $node_type->save();
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'page');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('entity_test_mulrevpub', 'entity_test_mulrevpub');
+    $workflow->save();
   }
 
   /**
@@ -53,14 +61,23 @@ class ViewsDataIntegrationTest extends ViewsKernelTestBase {
       'type' => 'page',
       'title' => 'Test title first revision',
     ]);
-    $node->moderation_state->target_id = 'published';
+    $node->moderation_state->value = 'published';
     $node->save();
 
+    // Create a totally unrelated entity to ensure the extra join information
+    // joins by the correct entity type.
+    $unrelated_entity = EntityTestMulRevPub::create([
+      'id' => $node->id(),
+    ]);
+    $unrelated_entity->save();
+
+    $this->assertEquals($unrelated_entity->id(), $node->id());
+
     $revision = clone $node;
     $revision->setNewRevision(TRUE);
     $revision->isDefaultRevision(FALSE);
     $revision->title->value = 'Test title second revision';
-    $revision->moderation_state->target_id = 'draft';
+    $revision->moderation_state->value = 'draft';
     $revision->save();
 
     $view = Views::getView('test_content_moderation_latest_revision');
@@ -90,14 +107,14 @@ class ViewsDataIntegrationTest extends ViewsKernelTestBase {
       'type' => 'page',
       'title' => 'Test title first revision',
     ]);
-    $node->moderation_state->target_id = 'published';
+    $node->moderation_state->value = 'published';
     $node->save();
 
     $revision = clone $node;
     $revision->setNewRevision(TRUE);
     $revision->isDefaultRevision(FALSE);
     $revision->title->value = 'Test title second revision';
-    $revision->moderation_state->target_id = 'draft';
+    $revision->moderation_state->value = 'draft';
     $revision->save();
 
     $view = Views::getView('test_content_moderation_revision_test');
@@ -105,15 +122,15 @@ class ViewsDataIntegrationTest extends ViewsKernelTestBase {
 
     $expected_result = [
       [
-        'revision_id' => $node->getRevisionId(),
+        'vid' => $node->getRevisionId(),
         'moderation_state' => 'published',
       ],
       [
-        'revision_id' => $revision->getRevisionId(),
+        'vid' => $revision->getRevisionId(),
         'moderation_state' => 'draft',
       ],
     ];
-    $this->assertIdenticalResultset($view, $expected_result, ['revision_id' => 'revision_id', 'moderation_state' => 'moderation_state']);
+    $this->assertIdenticalResultset($view, $expected_result, ['vid' => 'vid', 'moderation_state' => 'moderation_state']);
   }
 
   /**
@@ -124,14 +141,14 @@ class ViewsDataIntegrationTest extends ViewsKernelTestBase {
       'type' => 'page',
       'title' => 'Test title first revision',
     ]);
-    $node->moderation_state->target_id = 'published';
+    $node->moderation_state->value = 'published';
     $node->save();
 
     $revision = clone $node;
     $revision->setNewRevision(TRUE);
     $revision->isDefaultRevision(FALSE);
     $revision->title->value = 'Test title second revision';
-    $revision->moderation_state->target_id = 'draft';
+    $revision->moderation_state->value = 'draft';
     $revision->save();
 
     $view = Views::getView('test_content_moderation_base_table_test');
diff --git a/web/core/modules/content_moderation/tests/src/Unit/ModerationInformationTest.php b/web/core/modules/content_moderation/tests/src/Unit/ModerationInformationTest.php
index ff46e4158..8d319ef31 100644
--- a/web/core/modules/content_moderation/tests/src/Unit/ModerationInformationTest.php
+++ b/web/core/modules/content_moderation/tests/src/Unit/ModerationInformationTest.php
@@ -3,13 +3,14 @@
 namespace Drupal\Tests\content_moderation\Unit;
 
 use Drupal\content_moderation\Entity\Handler\ModerationHandler;
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\ContentEntityType;
 use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\content_moderation\ModerationInformation;
+use Drupal\workflows\WorkflowInterface;
 
 /**
  * @coversDefaultClass \Drupal\content_moderation\ModerationInformation
@@ -30,43 +31,42 @@ class ModerationInformationTest extends \PHPUnit_Framework_TestCase {
   /**
    * Returns a mock Entity Type Manager.
    *
-   * @param \Drupal\Core\Entity\EntityStorageInterface $entity_bundle_storage
-   *   Entity bundle storage.
-   *
    * @return EntityTypeManagerInterface
    *   The mocked entity type manager.
    */
-  protected function getEntityTypeManager(EntityStorageInterface $entity_bundle_storage) {
+  protected function getEntityTypeManager() {
     $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
-    $entity_type_manager->getStorage('entity_test_bundle')->willReturn($entity_bundle_storage);
     return $entity_type_manager->reveal();
   }
 
   /**
    * Sets up content moderation and entity manager mocking.
    *
-   * @param bool $status
-   *   TRUE if content_moderation should be enabled, FALSE if not.
+   * @param string $bundle
+   *   The bundle ID.
+   * @param string|null $workflow
+   *   The workflow ID. If nul no workflow information is added to the bundle.
    *
    * @return \Drupal\Core\Entity\EntityTypeManagerInterface
    *   The mocked entity type manager.
    */
-  public function setupModerationEntityManager($status) {
-    $bundle = $this->prophesize(ConfigEntityInterface::class);
-    $bundle->getThirdPartySetting('content_moderation', 'enabled', FALSE)->willReturn($status);
+  public function setupModerationBundleInfo($bundle, $workflow = NULL) {
+    $bundle_info_array = [];
+    if ($workflow) {
+      $bundle_info_array['workflow'] = $workflow;
+    }
+    $bundle_info = $this->prophesize(EntityTypeBundleInfoInterface::class);
+    $bundle_info->getBundleInfo("test_entity_type")->willReturn([$bundle => $bundle_info_array]);
 
-    $entity_storage = $this->prophesize(EntityStorageInterface::class);
-    $entity_storage->load('test_bundle')->willReturn($bundle->reveal());
-
-    return $this->getEntityTypeManager($entity_storage->reveal());
+    return $bundle_info->reveal();
   }
 
   /**
-   * @dataProvider providerBoolean
+   * @dataProvider providerWorkflow
    * @covers ::isModeratedEntity
    */
-  public function testIsModeratedEntity($status) {
-    $moderation_information = new ModerationInformation($this->setupModerationEntityManager($status), $this->getUser());
+  public function testIsModeratedEntity($workflow, $expected) {
+    $moderation_information = new ModerationInformation($this->getEntityTypeManager(), $this->setupModerationBundleInfo('test_bundle', $workflow));
 
     $entity_type = new ContentEntityType([
       'id' => 'test_entity_type',
@@ -77,50 +77,55 @@ class ModerationInformationTest extends \PHPUnit_Framework_TestCase {
     $entity->getEntityType()->willReturn($entity_type);
     $entity->bundle()->willReturn('test_bundle');
 
-    $this->assertEquals($status, $moderation_information->isModeratedEntity($entity->reveal()));
+    $this->assertEquals($expected, $moderation_information->isModeratedEntity($entity->reveal()));
   }
 
   /**
-   * @covers ::isModeratedEntity
+   * @dataProvider providerWorkflow
+   * @covers ::getWorkflowForEntity
    */
-  public function testIsModeratedEntityForNonBundleEntityType() {
-    $entity_type = new ContentEntityType([
-      'id' => 'test_entity_type',
-    ]);
+  public function testGetWorkflowForEntity($workflow) {
+    $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
+    if ($workflow) {
+      $workflow_entity = $this->prophesize(WorkflowInterface::class)->reveal();
+      $workflow_storage = $this->prophesize(EntityStorageInterface::class);
+      $workflow_storage->load('workflow')->willReturn($workflow_entity)->shouldBeCalled();
+      $entity_type_manager->getStorage('workflow')->willReturn($workflow_storage->reveal());
+    }
+    else {
+      $workflow_entity = NULL;
+    }
+    $moderation_information = new ModerationInformation($entity_type_manager->reveal(), $this->setupModerationBundleInfo('test_bundle', $workflow));
     $entity = $this->prophesize(ContentEntityInterface::class);
-    $entity->getEntityType()->willReturn($entity_type);
-    $entity->bundle()->willReturn('test_entity_type');
+    $entity->getEntityTypeId()->willReturn('test_entity_type');
+    $entity->bundle()->willReturn('test_bundle');
 
-    $entity_storage = $this->prophesize(EntityStorageInterface::class);
-    $entity_type_manager = $this->getEntityTypeManager($entity_storage->reveal());
-    $moderation_information = new ModerationInformation($entity_type_manager, $this->getUser());
-
-    $this->assertEquals(FALSE, $moderation_information->isModeratedEntity($entity->reveal()));
+    $this->assertEquals($workflow_entity, $moderation_information->getWorkflowForEntity($entity->reveal()));
   }
 
   /**
-   * @dataProvider providerBoolean
+   * @dataProvider providerWorkflow
    * @covers ::shouldModerateEntitiesOfBundle
    */
-  public function testShouldModerateEntities($status) {
+  public function testShouldModerateEntities($workflow, $expected) {
     $entity_type = new ContentEntityType([
       'id' => 'test_entity_type',
       'bundle_entity_type' => 'entity_test_bundle',
       'handlers' => ['moderation' => ModerationHandler::class],
     ]);
 
-    $moderation_information = new ModerationInformation($this->setupModerationEntityManager($status), $this->getUser());
+    $moderation_information = new ModerationInformation($this->getEntityTypeManager(), $this->setupModerationBundleInfo('test_bundle', $workflow));
 
-    $this->assertEquals($status, $moderation_information->shouldModerateEntitiesOfBundle($entity_type, 'test_bundle'));
+    $this->assertEquals($expected, $moderation_information->shouldModerateEntitiesOfBundle($entity_type, 'test_bundle'));
   }
 
   /**
    * Data provider for several tests.
    */
-  public function providerBoolean() {
+  public function providerWorkflow() {
     return [
-      [FALSE],
-      [TRUE],
+      [NULL, FALSE],
+      ['workflow', TRUE],
     ];
   }
 
diff --git a/web/core/modules/content_moderation/tests/src/Unit/StateTransitionValidationTest.php b/web/core/modules/content_moderation/tests/src/Unit/StateTransitionValidationTest.php
index b05747887..2e0344778 100644
--- a/web/core/modules/content_moderation/tests/src/Unit/StateTransitionValidationTest.php
+++ b/web/core/modules/content_moderation/tests/src/Unit/StateTransitionValidationTest.php
@@ -2,13 +2,14 @@
 
 namespace Drupal\Tests\content_moderation\Unit;
 
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\content_moderation\ModerationInformationInterface;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\content_moderation\ModerationStateInterface;
-use Drupal\content_moderation\ModerationStateTransitionInterface;
 use Drupal\content_moderation\StateTransitionValidation;
+use Drupal\workflows\Entity\Workflow;
+use Drupal\workflows\WorkflowTypeInterface;
+use Drupal\workflows\WorkflowTypeManager;
 use Prophecy\Argument;
 
 /**
@@ -17,216 +18,6 @@ use Prophecy\Argument;
  */
 class StateTransitionValidationTest extends \PHPUnit_Framework_TestCase {
 
-  /**
-   * Builds a mock storage object for Transitions.
-   *
-   * @return EntityStorageInterface
-   *   The mocked storage object for Transitions.
-   */
-  protected function setupTransitionStorage() {
-    $entity_storage = $this->prophesize(EntityStorageInterface::class);
-
-    $list = $this->setupTransitionEntityList();
-    $entity_storage->loadMultiple()->willReturn($list);
-    $entity_storage->loadMultiple(Argument::type('array'))->will(function ($args) use ($list) {
-      $keys = $args[0];
-      if (empty($keys)) {
-        return $list;
-      }
-
-      $return = array_map(function($key) use ($list) {
-        return $list[$key];
-      }, $keys);
-
-      return $return;
-    });
-    return $entity_storage->reveal();
-  }
-
-  /**
-   * Builds an array of mocked Transition objects.
-   *
-   * @return ModerationStateTransitionInterface[]
-   *   An array of mocked Transition objects.
-   */
-  protected function setupTransitionEntityList() {
-    $transition = $this->prophesize(ModerationStateTransitionInterface::class);
-    $transition->id()->willReturn('draft__needs_review');
-    $transition->getFromState()->willReturn('draft');
-    $transition->getToState()->willReturn('needs_review');
-    $list[$transition->reveal()->id()] = $transition->reveal();
-
-    $transition = $this->prophesize(ModerationStateTransitionInterface::class);
-    $transition->id()->willReturn('needs_review__staging');
-    $transition->getFromState()->willReturn('needs_review');
-    $transition->getToState()->willReturn('staging');
-    $list[$transition->reveal()->id()] = $transition->reveal();
-
-    $transition = $this->prophesize(ModerationStateTransitionInterface::class);
-    $transition->id()->willReturn('staging__published');
-    $transition->getFromState()->willReturn('staging');
-    $transition->getToState()->willReturn('published');
-    $list[$transition->reveal()->id()] = $transition->reveal();
-
-    $transition = $this->prophesize(ModerationStateTransitionInterface::class);
-    $transition->id()->willReturn('needs_review__draft');
-    $transition->getFromState()->willReturn('needs_review');
-    $transition->getToState()->willReturn('draft');
-    $list[$transition->reveal()->id()] = $transition->reveal();
-
-    $transition = $this->prophesize(ModerationStateTransitionInterface::class);
-    $transition->id()->willReturn('draft__draft');
-    $transition->getFromState()->willReturn('draft');
-    $transition->getToState()->willReturn('draft');
-    $list[$transition->reveal()->id()] = $transition->reveal();
-
-    $transition = $this->prophesize(ModerationStateTransitionInterface::class);
-    $transition->id()->willReturn('needs_review__needs_review');
-    $transition->getFromState()->willReturn('needs_review');
-    $transition->getToState()->willReturn('needs_review');
-    $list[$transition->reveal()->id()] = $transition->reveal();
-
-    $transition = $this->prophesize(ModerationStateTransitionInterface::class);
-    $transition->id()->willReturn('published__published');
-    $transition->getFromState()->willReturn('published');
-    $transition->getToState()->willReturn('published');
-    $list[$transition->reveal()->id()] = $transition->reveal();
-
-    return $list;
-  }
-
-  /**
-   * Builds a mock storage object for States.
-   *
-   * @return EntityStorageInterface
-   *   The mocked storage object for States.
-   */
-  protected function setupStateStorage() {
-    $entity_storage = $this->prophesize(EntityStorageInterface::class);
-
-    $state = $this->prophesize(ModerationStateInterface::class);
-    $state->id()->willReturn('draft');
-    $state->label()->willReturn('Draft');
-    $state->isPublishedState()->willReturn(FALSE);
-    $state->isDefaultRevisionState()->willReturn(FALSE);
-    $states['draft'] = $state->reveal();
-
-    $state = $this->prophesize(ModerationStateInterface::class);
-    $state->id()->willReturn('needs_review');
-    $state->label()->willReturn('Needs Review');
-    $state->isPublishedState()->willReturn(FALSE);
-    $state->isDefaultRevisionState()->willReturn(FALSE);
-    $states['needs_review'] = $state->reveal();
-
-    $state = $this->prophesize(ModerationStateInterface::class);
-    $state->id()->willReturn('staging');
-    $state->label()->willReturn('Staging');
-    $state->isPublishedState()->willReturn(FALSE);
-    $state->isDefaultRevisionState()->willReturn(FALSE);
-    $states['staging'] = $state->reveal();
-
-    $state = $this->prophesize(ModerationStateInterface::class);
-    $state->id()->willReturn('published');
-    $state->label()->willReturn('Published');
-    $state->isPublishedState()->willReturn(TRUE);
-    $state->isDefaultRevisionState()->willReturn(TRUE);
-    $states['published'] = $state->reveal();
-
-    $state = $this->prophesize(ModerationStateInterface::class);
-    $state->id()->willReturn('archived');
-    $state->label()->willReturn('Archived');
-    $state->isPublishedState()->willReturn(TRUE);
-    $state->isDefaultRevisionState()->willReturn(TRUE);
-    $states['archived'] = $state->reveal();
-
-    $entity_storage->loadMultiple()->willReturn($states);
-
-    foreach ($states as $id => $state) {
-      $entity_storage->load($id)->willReturn($state);
-    }
-
-    return $entity_storage->reveal();
-  }
-
-  /**
-   * Builds a mocked Entity Type Manager.
-   *
-   * @return EntityTypeManagerInterface
-   *   The mocked Entity Type Manager.
-   */
-  protected function setupEntityTypeManager(EntityStorageInterface $storage) {
-    $entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class);
-    $entityTypeManager->getStorage('moderation_state')->willReturn($storage);
-    $entityTypeManager->getStorage('moderation_state_transition')->willReturn($this->setupTransitionStorage());
-
-    return $entityTypeManager->reveal();
-  }
-
-  /**
-   * Builds a mocked query factory that does nothing.
-   *
-   * @return QueryFactory
-   *   The mocked query factory that does nothing.
-   */
-  protected function setupQueryFactory() {
-    $factory = $this->prophesize(QueryFactory::class);
-
-    return $factory->reveal();
-  }
-
-  /**
-   * @covers ::isTransitionAllowed
-   * @covers ::calculatePossibleTransitions
-   *
-   * @dataProvider providerIsTransitionAllowedWithValidTransition
-   */
-  public function testIsTransitionAllowedWithValidTransition($from_id, $to_id) {
-    $storage = $this->setupStateStorage();
-    $state_transition_validation = new StateTransitionValidation($this->setupEntityTypeManager($storage), $this->setupQueryFactory());
-    $this->assertTrue($state_transition_validation->isTransitionAllowed($storage->load($from_id), $storage->load($to_id)));
-  }
-
-  /**
-   * Data provider for self::testIsTransitionAllowedWithValidTransition().
-   */
-  public function providerIsTransitionAllowedWithValidTransition() {
-    return [
-      ['draft', 'draft'],
-      ['draft', 'needs_review'],
-      ['needs_review', 'needs_review'],
-      ['needs_review', 'staging'],
-      ['staging', 'published'],
-      ['needs_review', 'draft'],
-    ];
-  }
-
-  /**
-   * @covers ::isTransitionAllowed
-   * @covers ::calculatePossibleTransitions
-   *
-   * @dataProvider providerIsTransitionAllowedWithInValidTransition
-   */
-  public function testIsTransitionAllowedWithInValidTransition($from_id, $to_id) {
-    $storage = $this->setupStateStorage();
-    $state_transition_validation = new StateTransitionValidation($this->setupEntityTypeManager($storage), $this->setupQueryFactory());
-    $this->assertFalse($state_transition_validation->isTransitionAllowed($storage->load($from_id), $storage->load($to_id)));
-  }
-
-  /**
-   * Data provider for self::testIsTransitionAllowedWithInValidTransition().
-   */
-  public function providerIsTransitionAllowedWithInValidTransition() {
-    return [
-      ['published', 'needs_review'],
-      ['published', 'staging'],
-      ['staging', 'needs_review'],
-      ['staging', 'staging'],
-      ['needs_review', 'published'],
-      ['published', 'archived'],
-      ['archived', 'published'],
-    ];
-  }
-
   /**
    * Verifies user-aware transition validation.
    *
@@ -239,7 +30,7 @@ class StateTransitionValidationTest extends \PHPUnit_Framework_TestCase {
    * @param bool $allowed
    *   Whether or not to grant a user this permission.
    * @param bool $result
-   *   Whether userMayTransition() is expected to return TRUE or FALSE.
+   *   Whether getValidTransitions() is expected to have the.
    *
    * @dataProvider userTransitionsProvider
    */
@@ -250,10 +41,45 @@ class StateTransitionValidationTest extends \PHPUnit_Framework_TestCase {
     $user->hasPermission($permission)->willReturn($allowed);
     $user->hasPermission(Argument::type('string'))->willReturn(FALSE);
 
-    $storage = $this->setupStateStorage();
-    $validator = new Validator($this->setupEntityTypeManager($storage), $this->setupQueryFactory());
+    $entity = $this->prophesize(ContentEntityInterface::class);
+    $entity = $entity->reveal();
+    $entity->moderation_state = new \stdClass();
+    $entity->moderation_state->value = $from_id;
 
-    $this->assertEquals($result, $validator->userMayTransition($storage->load($from_id), $storage->load($to_id), $user->reveal()));
+    $validator = new StateTransitionValidation($this->setUpModerationInformation($entity));
+    $has_transition = FALSE;
+    foreach ($validator->getValidTransitions($entity, $user->reveal()) as $transition) {
+      if ($transition->to()->id() === $to_id) {
+        $has_transition = TRUE;
+        break;
+      }
+    }
+    $this->assertSame($result, $has_transition);
+  }
+
+  protected function setUpModerationInformation(ContentEntityInterface $entity) {
+    // Create a container so that the plugin manager and workflow type can be
+    // mocked.
+    $container = new ContainerBuilder();
+    $workflow_type = $this->prophesize(WorkflowTypeInterface::class);
+    $workflow_type->decorateState(Argument::any())->willReturnArgument(0);
+    $workflow_type->decorateTransition(Argument::any())->willReturnArgument(0);
+    $workflow_manager = $this->prophesize(WorkflowTypeManager::class);
+    $workflow_manager->createInstance('content_moderation', Argument::any())->willReturn($workflow_type->reveal());
+    $container->set('plugin.manager.workflows.type', $workflow_manager->reveal());
+    \Drupal::setContainer($container);
+
+    $workflow = new Workflow(['id' => 'process', 'type' => 'content_moderation'], 'workflow');
+    $workflow
+      ->addState('draft', 'draft')
+      ->addState('needs_review', 'needs_review')
+      ->addState('published', 'published')
+      ->addTransition('draft', 'draft', ['draft'], 'draft')
+      ->addTransition('review', 'review', ['draft'], 'needs_review')
+      ->addTransition('publish', 'publish', ['needs_review', 'published'], 'published');
+    $moderation_info = $this->prophesize(ModerationInformationInterface::class);
+    $moderation_info->getWorkflowForEntity($entity)->willReturn($workflow);
+    return $moderation_info->reveal();
   }
 
   /**
@@ -261,37 +87,15 @@ class StateTransitionValidationTest extends \PHPUnit_Framework_TestCase {
    */
   public function userTransitionsProvider() {
     // The user has the right permission, so let it through.
-    $ret[] = ['draft', 'draft', 'use draft__draft transition', TRUE, TRUE];
+    $ret[] = ['draft', 'draft', 'use process transition draft', TRUE, TRUE];
 
     // The user doesn't have the right permission, block it.
-    $ret[] = ['draft', 'draft', 'use draft__draft transition', FALSE, FALSE];
+    $ret[] = ['draft', 'draft', 'use process transition draft', FALSE, FALSE];
 
     // The user has some other permission that doesn't matter.
-    $ret[] = ['draft', 'draft', 'use draft__needs_review transition', TRUE, FALSE];
-
-    // The user has permission, but the transition isn't allowed anyway.
-    $ret[] = ['published', 'needs_review', 'use published__needs_review transition', TRUE, FALSE];
+    $ret[] = ['draft', 'draft', 'use process transition review', TRUE, FALSE];
 
     return $ret;
   }
 
 }
-
-/**
- * Testable subclass for selected tests.
- *
- * EntityQuery is beyond untestable, so we have to subclass and override the
- * method that uses it.
- */
-class Validator extends StateTransitionValidation {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getTransitionFromStates(ModerationStateInterface $from, ModerationStateInterface $to) {
-    if ($from->id() === 'draft' && $to->id() === 'draft') {
-      return $this->transitionStorage()->loadMultiple(['draft__draft'])[0];
-    }
-  }
-
-}
diff --git a/web/core/modules/content_translation/content_translation.admin.inc b/web/core/modules/content_translation/content_translation.admin.inc
index 39e3247ca..f29a7e655 100644
--- a/web/core/modules/content_translation/content_translation.admin.inc
+++ b/web/core/modules/content_translation/content_translation.admin.inc
@@ -29,10 +29,10 @@ use Drupal\Core\Render\Element;
 function content_translation_field_sync_widget(FieldDefinitionInterface $field, $element_name = 'third_party_settings[content_translation][translation_sync]') {
   // No way to store field sync information on this field.
   if (!($field instanceof ThirdPartySettingsInterface)) {
-    return array();
+    return [];
   }
 
-  $element = array();
+  $element = [];
   $definition = \Drupal::service('plugin.manager.field.field_type')->getDefinition($field->getType());
   $column_groups = $definition['column_groups'];
   if (!empty($column_groups) && count($column_groups) > 1) {
@@ -50,12 +50,12 @@ function content_translation_field_sync_widget(FieldDefinitionInterface $field,
 
     $default = $field->getThirdPartySetting('content_translation', 'translation_sync', $default);
 
-    $element = array(
+    $element = [
       '#type' => 'checkboxes',
       '#title' => t('Translatable elements'),
       '#options' => $options,
       '#default_value' => $default,
-    );
+    ];
 
     if ($require_all_groups_for_translation) {
       // The actual checkboxes are sometimes rendered separately and the parent
@@ -96,7 +96,7 @@ function _content_translation_form_language_content_settings_form_alter(array &$
   $bundle_info_service = \Drupal::service('entity_type.bundle.info');
   foreach ($form['#labels'] as $entity_type_id => $label) {
     $entity_type = $entity_manager->getDefinition($entity_type_id);
-    $storage_definitions = $entity_type instanceof ContentEntityTypeInterface ? $entity_manager->getFieldStorageDefinitions($entity_type_id) : array();
+    $storage_definitions = $entity_type instanceof ContentEntityTypeInterface ? $entity_manager->getFieldStorageDefinitions($entity_type_id) : [];
 
     $entity_type_translatable = $content_translation_manager->isSupported($entity_type_id);
     foreach ($bundle_info_service->getBundleInfo($entity_type_id) as $bundle => $bundle_info) {
@@ -106,7 +106,7 @@ function _content_translation_form_language_content_settings_form_alter(array &$
       // about UI integration.
       $form['settings'][$entity_type_id][$bundle]['settings']['language']['#content_translation_skip_alter'] = TRUE;
       if (!$entity_type_translatable) {
-        $form['settings'][$entity_type_id]['#title'] = t('@label (Translation is not supported).', array('@label' => $entity_type->getLabel()));
+        $form['settings'][$entity_type_id]['#title'] = t('@label (Translation is not supported).', ['@label' => $entity_type->getLabel()]);
         continue;
       }
 
@@ -114,11 +114,11 @@ function _content_translation_form_language_content_settings_form_alter(array &$
       if ($fields) {
         foreach ($fields as $field_name => $definition) {
           if ($definition->isComputed() || (!empty($storage_definitions[$field_name]) && _content_translation_is_field_translatability_configurable($entity_type, $storage_definitions[$field_name]))) {
-            $form['settings'][$entity_type_id][$bundle]['fields'][$field_name] = array(
+            $form['settings'][$entity_type_id][$bundle]['fields'][$field_name] = [
               '#label' => $definition->getLabel(),
               '#type' => 'checkbox',
               '#default_value' => $definition->isTranslatable(),
-            );
+            ];
             // Display the column translatability configuration widget.
             $column_element = content_translation_field_sync_widget($definition, "settings[{$entity_type_id}][{$bundle}][columns][{$field_name}]");
             if ($column_element) {
@@ -129,10 +129,10 @@ function _content_translation_form_language_content_settings_form_alter(array &$
         if (!empty($form['settings'][$entity_type_id][$bundle]['fields'])) {
           // Only show the checkbox to enable translation if the bundles in the
           // entity might have fields and if there are fields to translate.
-          $form['settings'][$entity_type_id][$bundle]['translatable'] = array(
+          $form['settings'][$entity_type_id][$bundle]['translatable'] = [
             '#type' => 'checkbox',
             '#default_value' => $content_translation_manager->isEnabled($entity_type_id, $bundle),
-          );
+          ];
         }
       }
     }
@@ -177,102 +177,102 @@ function _content_translation_preprocess_language_content_settings_table(&$varia
   $element = $variables['element'];
   $build = &$variables['build'];
 
-  array_unshift($build['#header'], array('data' => t('Translatable'), 'class' => array('translatable')));
-  $rows = array();
+  array_unshift($build['#header'], ['data' => t('Translatable'), 'class' => ['translatable']]);
+  $rows = [];
 
   foreach (Element::children($element) as $bundle) {
-    $field_names = !empty($element[$bundle]['fields']) ? Element::children($element[$bundle]['fields']) : array();
+    $field_names = !empty($element[$bundle]['fields']) ? Element::children($element[$bundle]['fields']) : [];
     if (!empty($element[$bundle]['translatable'])) {
       $checkbox_id = $element[$bundle]['translatable']['#id'];
     }
     $rows[$bundle] = $build['#rows'][$bundle];
 
     if (!empty($element[$bundle]['translatable'])) {
-      $translatable = array(
+      $translatable = [
         'data' => $element[$bundle]['translatable'],
-        'class' => array('translatable'),
-      );
+        'class' => ['translatable'],
+      ];
       array_unshift($rows[$bundle]['data'], $translatable);
 
       $rows[$bundle]['data'][1]['data']['#prefix'] = '<label for="' . $checkbox_id . '">';
     }
     else {
-      $translatable = array(
+      $translatable = [
         'data' => t('N/A'),
-        'class' => array('untranslatable'),
-      );
+        'class' => ['untranslatable'],
+      ];
       array_unshift($rows[$bundle]['data'], $translatable);
     }
 
     foreach ($field_names as $field_name) {
       $field_element = &$element[$bundle]['fields'][$field_name];
-      $rows[] = array(
-        'data' => array(
-          array(
+      $rows[] = [
+        'data' => [
+          [
             'data' => drupal_render($field_element),
-            'class' => array('translatable'),
-          ),
-          array(
-            'data' => array(
+            'class' => ['translatable'],
+          ],
+          [
+            'data' => [
               '#prefix' => '<label for="' . $field_element['#id'] . '">',
               '#suffix' => '</label>',
-              'bundle' => array(
+              'bundle' => [
                 '#prefix' => '<span class="visually-hidden">',
                 '#suffix' => '</span> ',
                 '#plain_text' => $element[$bundle]['settings']['#label'],
-              ),
-              'field' => array(
+              ],
+              'field' => [
                 '#plain_text' => $field_element['#label'],
-              ),
-            ),
-            'class' => array('field'),
-          ),
-          array(
+              ],
+            ],
+            'class' => ['field'],
+          ],
+          [
             'data' => '',
-            'class' => array('operations'),
-          ),
-        ),
-        'class' => array('field-settings'),
-      );
+            'class' => ['operations'],
+          ],
+        ],
+        'class' => ['field-settings'],
+      ];
 
       if (!empty($element[$bundle]['columns'][$field_name])) {
         $column_element = &$element[$bundle]['columns'][$field_name];
         foreach (Element::children($column_element) as $key) {
           $column_label = $column_element[$key]['#title'];
           unset($column_element[$key]['#title']);
-          $rows[] = array(
-            'data' => array(
-              array(
+          $rows[] = [
+            'data' => [
+              [
                 'data' => drupal_render($column_element[$key]),
-                'class' => array('translatable'),
-              ),
-              array(
-                'data' => array(
+                'class' => ['translatable'],
+              ],
+              [
+                'data' => [
                   '#prefix' => '<label for="' . $column_element[$key]['#id'] . '">',
                   '#suffix' => '</label>',
-                  'bundle' => array(
+                  'bundle' => [
                     '#prefix' => '<span class="visually-hidden">',
                     '#suffix' => '</span> ',
                     '#plain_text' => $element[$bundle]['settings']['#label'],
-                  ),
-                  'field' => array(
+                  ],
+                  'field' => [
                     '#prefix' => '<span class="visually-hidden">',
                     '#suffix' => '</span> ',
                     '#plain_text' => $field_element['#label'],
-                  ),
-                  'columns' => array(
+                  ],
+                  'columns' => [
                     '#plain_text' => $column_label,
-                  ),
-                ),
-                'class' => array('column'),
-              ),
-              array(
+                  ],
+                ],
+                'class' => ['column'],
+              ],
+              [
                 'data' => '',
-                'class' => array('operations'),
-              ),
-            ),
-            'class' => array('column-settings'),
-          );
+                'class' => ['operations'],
+              ],
+            ],
+            'class' => ['column-settings'],
+          ];
         }
       }
     }
@@ -295,7 +295,7 @@ function content_translation_form_language_content_settings_validate(array $form
 
         $translatable_fields = isset($settings[$entity_type][$bundle]['fields']) ? array_filter($settings[$entity_type][$bundle]['fields']) : FALSE;
         if (empty($translatable_fields)) {
-          $t_args = array('%bundle' => $form['settings'][$entity_type][$bundle]['settings']['#label']);
+          $t_args = ['%bundle' => $form['settings'][$entity_type][$bundle]['settings']['#label']];
           $form_state->setErrorByName($name, t('At least one field needs to be translatable to enable %bundle for translation.', $t_args));
         }
 
@@ -304,7 +304,7 @@ function content_translation_form_language_content_settings_validate(array $form
           foreach (\Drupal::languageManager()->getLanguages(LanguageInterface::STATE_LOCKED) as $language) {
             $locked_languages[] = $language->getName();
           }
-          $form_state->setErrorByName($name, t('Translation is not supported if language is always one of: @locked_languages', array('@locked_languages' => implode(', ', $locked_languages))));
+          $form_state->setErrorByName($name, t('Translation is not supported if language is always one of: @locked_languages', ['@locked_languages' => implode(', ', $locked_languages)]));
         }
       }
     }
diff --git a/web/core/modules/content_translation/content_translation.install b/web/core/modules/content_translation/content_translation.install
index 0f8a18465..dc12d9f3f 100644
--- a/web/core/modules/content_translation/content_translation.install
+++ b/web/core/modules/content_translation/content_translation.install
@@ -31,11 +31,6 @@ function content_translation_install() {
   drupal_set_message($message, 'warning');
 }
 
-/**
- * @addtogroup updates-8.0.0-rc
- * @{
- */
-
 /**
  * Rebuild the routes as the content translation routes have now new names.
  */
@@ -43,22 +38,9 @@ function content_translation_update_8001() {
   \Drupal::service('router.builder')->rebuild();
 }
 
-/**
- * @} End of "addtogroup updates-8.0.0-rc".
- */
-
-/**
- * @addtogroup updates-8.0.x
- * @{
- */
-
 /**
  * Clear field type plugin caches to fix image field translatability.
  */
 function content_translation_update_8002() {
   \Drupal::service('plugin.manager.field.field_type')->clearCachedDefinitions();
 }
-
-/**
- * @} End of "addtogroup updates-8.0.x".
- */
diff --git a/web/core/modules/content_translation/content_translation.module b/web/core/modules/content_translation/content_translation.module
index 70413d99d..7c72b84cb 100644
--- a/web/core/modules/content_translation/content_translation.module
+++ b/web/core/modules/content_translation/content_translation.module
@@ -23,11 +23,11 @@ function content_translation_help($route_name, RouteMatchInterface $route_match)
     case 'help.page.content_translation':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Content Translation module allows you to translate content, comments, custom blocks, taxonomy terms, users and other <a href=":field_help" title="Field module help, with background on content entities">content entities</a>. Together with the modules <a href=":language">Language</a>, <a href=":config-trans">Configuration Translation</a>, and <a href=":locale">Interface Translation</a>, it allows you to build multilingual websites. For more information, see the <a href=":translation-entity">online documentation for the Content Translation module</a>.', array(':locale' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#', ':config-trans' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? \Drupal::url('help.page', array('name' => 'config_translation')) : '#', ':language' => \Drupal::url('help.page', array('name' => 'language')), ':translation-entity' => 'https://www.drupal.org/documentation/modules/translation', ':field_help' => \Drupal::url('help.page', array('name' => 'field')))) . '</p>';
+      $output .= '<p>' . t('The Content Translation module allows you to translate content, comments, custom blocks, taxonomy terms, users and other <a href=":field_help" title="Field module help, with background on content entities">content entities</a>. Together with the modules <a href=":language">Language</a>, <a href=":config-trans">Configuration Translation</a>, and <a href=":locale">Interface Translation</a>, it allows you to build multilingual websites. For more information, see the <a href=":translation-entity">online documentation for the Content Translation module</a>.', [':locale' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', ['name' => 'locale']) : '#', ':config-trans' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? \Drupal::url('help.page', ['name' => 'config_translation']) : '#', ':language' => \Drupal::url('help.page', ['name' => 'language']), ':translation-entity' => 'https://www.drupal.org/documentation/modules/translation', ':field_help' => \Drupal::url('help.page', ['name' => 'field'])]) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Enabling translation') . '</dt>';
-      $output .= '<dd>' . t('In order to translate content, the website must have at least two <a href=":url">languages</a>. When that is the case, you can enable translation for the desired content entities on the <a href=":translation-entity">Content language</a> page. When enabling translation you can choose the default language for content and decide whether to show the language selection field on the content editing forms.', array(':url' => \Drupal::url('entity.configurable_language.collection'), ':translation-entity' => \Drupal::url('language.content_settings_page'), ':language-help' => \Drupal::url('help.page', array('name' => 'language')))) . '</dd>';
+      $output .= '<dd>' . t('In order to translate content, the website must have at least two <a href=":url">languages</a>. When that is the case, you can enable translation for the desired content entities on the <a href=":translation-entity">Content language</a> page. When enabling translation you can choose the default language for content and decide whether to show the language selection field on the content editing forms.', [':url' => \Drupal::url('entity.configurable_language.collection'), ':translation-entity' => \Drupal::url('language.content_settings_page'), ':language-help' => \Drupal::url('help.page', ['name' => 'language'])]) . '</dd>';
       $output .= '<dt>' . t('Enabling field translation') . '</dt>';
       $output .= '<dd>' . t('You can define which fields of a content entity can be translated. For example, you might want to translate the title and body field while leaving the image field untranslated. If you exclude a field from being translated, it will still show up in the content editing form, but any changes made to that field will be applied to <em>all</em> translations of that content.') . '</dd>';
       $output .= '<dt>' . t('Translating content') . '</dt>';
@@ -42,7 +42,7 @@ function content_translation_help($route_name, RouteMatchInterface $route_match)
     case 'language.content_settings_page':
       $output = '';
       if (!\Drupal::languageManager()->isMultilingual()) {
-        $output .= '<br/>' . t('Before you can translate content, there must be at least two languages added on the <a href=":url">languages administration</a> page.', array(':url' => \Drupal::url('entity.configurable_language.collection')));
+        $output .= '<p>' . t('Before you can translate content, there must be at least two languages added on the <a href=":url">languages administration</a> page.', [':url' => \Drupal::url('entity.configurable_language.collection')]) . '</p>';
       }
       return $output;
   }
@@ -134,7 +134,7 @@ function content_translation_entity_type_alter(array &$entity_types) {
 
       $translation = $entity_type->get('translation');
       if (!$translation || !isset($translation['content_translation'])) {
-        $translation['content_translation'] = array();
+        $translation['content_translation'] = [];
       }
 
       if ($entity_type->hasLinkTemplate('canonical')) {
@@ -148,9 +148,9 @@ function content_translation_entity_type_alter(array &$entity_types) {
         }
         // @todo Remove this as soon as menu access checks rely on the
         //   controller. See https://www.drupal.org/node/2155787.
-        $translation['content_translation'] += array(
+        $translation['content_translation'] += [
           'access_callback' => 'content_translation_translate_access',
-        );
+        ];
       }
       $entity_type->set('translation', $translation);
     }
@@ -215,7 +215,7 @@ function content_translation_field_info_alter(&$info) {
   foreach ($info as $key => $settings) {
     // Supply the column_groups key if it's not there.
     if (empty($settings['column_groups'])) {
-      $info[$key]['column_groups'] = array();
+      $info[$key]['column_groups'] = [];
     }
   }
 }
@@ -224,13 +224,13 @@ function content_translation_field_info_alter(&$info) {
  * Implements hook_entity_operation().
  */
 function content_translation_entity_operation(EntityInterface $entity) {
-  $operations = array();
+  $operations = [];
   if ($entity->hasLinkTemplate('drupal:content-translation-overview') && content_translation_translate_access($entity)->isAllowed()) {
-    $operations['translate'] = array(
+    $operations['translate'] = [
       'title' => t('Translate'),
       'url' => $entity->urlInfo('drupal:content-translation-overview'),
       'weight' => 50,
-    );
+    ];
   }
   return $operations;
 }
@@ -350,16 +350,16 @@ function content_translation_language_fallback_candidates_entity_view_alter(&$ca
  * Implements hook_entity_extra_field_info().
  */
 function content_translation_entity_extra_field_info() {
-  $extra = array();
+  $extra = [];
   $bundle_info_service = \Drupal::service('entity_type.bundle.info');
   foreach (\Drupal::entityManager()->getDefinitions() as $entity_type => $info) {
     foreach ($bundle_info_service->getBundleInfo($entity_type) as $bundle => $bundle_info) {
       if (\Drupal::service('content_translation.manager')->isEnabled($entity_type, $bundle)) {
-        $extra[$entity_type][$bundle]['form']['translation'] = array(
+        $extra[$entity_type][$bundle]['form']['translation'] = [
           'label' => t('Translation'),
           'description' => t('Translation settings'),
           'weight' => 10,
-        );
+        ];
       }
     }
   }
@@ -374,23 +374,23 @@ function content_translation_form_field_config_edit_form_alter(array &$form, For
   $field = $form_state->getFormObject()->getEntity();
   $bundle_is_translatable = \Drupal::service('content_translation.manager')->isEnabled($field->getTargetEntityTypeId(), $field->getTargetBundle());
 
-  $form['translatable'] = array(
+  $form['translatable'] = [
     '#type' => 'checkbox',
     '#title' => t('Users may translate this field'),
     '#default_value' => $field->isTranslatable(),
     '#weight' => -1,
     '#disabled' => !$bundle_is_translatable,
     '#access' => $field->getFieldStorageDefinition()->isTranslatable(),
-  );
+  ];
 
   // Provide helpful pointers for administrators.
   if (\Drupal::currentUser()->hasPermission('administer content translation') &&  !$bundle_is_translatable) {
-    $toggle_url = \Drupal::url('language.content_settings_page', array(), array(
+    $toggle_url = \Drupal::url('language.content_settings_page', [], [
       'query' => \Drupal::destination()->getAsArray(),
-    ));
-    $form['translatable']['#description'] = t('To configure translation for this field, <a href=":language-settings-url">enable language support</a> for this type.', array(
+    ]);
+    $form['translatable']['#description'] = t('To configure translation for this field, <a href=":language-settings-url">enable language support</a> for this type.', [
       ':language-settings-url' => $toggle_url,
-    ));
+    ]);
   }
 
   if ($field->isTranslatable()) {
@@ -454,7 +454,7 @@ function content_translation_enable_widget($entity_type, $bundle, array &$form,
   $context = $form_state->get(['language', $key]) ?: [];
   $context += ['entity_type' => $entity_type, 'bundle' => $bundle];
   $form_state->set(['language', $key], $context);
-  $element = content_translation_language_configuration_element_process(array('#name' => $key), $form_state, $form);
+  $element = content_translation_language_configuration_element_process(['#name' => $key], $form_state, $form);
   unset($element['content_translation']['#element_validate']);
   return $element;
 }
@@ -474,14 +474,14 @@ function content_translation_language_configuration_element_process(array $eleme
     $form_state->set(['content_translation', 'key'], $key);
     $context = $form_state->get(['language', $key]);
 
-    $element['content_translation'] = array(
+    $element['content_translation'] = [
       '#type' => 'checkbox',
       '#title' => t('Enable translation'),
       // For new bundle, we don't know the bundle name yet,
       // default to no translatability.
       '#default_value' => $context['bundle'] ? \Drupal::service('content_translation.manager')->isEnabled($context['entity_type'], $context['bundle']) : FALSE,
-      '#element_validate' => array('content_translation_language_configuration_element_validate'),
-    );
+      '#element_validate' => ['content_translation_language_configuration_element_validate'],
+    ];
 
     $submit_name = isset($form['actions']['save_continue']) ? 'save_continue' : 'submit';
     // Only add the submit handler on the submit button if the #submit property
@@ -515,7 +515,7 @@ function content_translation_language_configuration_element_validate($element, F
     // @todo Set the correct form element name as soon as the element parents
     //   are correctly set. We should be using NestedArray::getValue() but for
     //   now we cannot.
-    $form_state->setErrorByName('', t('"Show language selector" is not compatible with translating content that has default language: %choice. Either do not hide the language selector or pick a specific language.', array('%choice' => $locked_languages[$values['langcode']])));
+    $form_state->setErrorByName('', t('"Show language selector" is not compatible with translating content that has default language: %choice. Either do not hide the language selector or pick a specific language.', ['%choice' => $locked_languages[$values['langcode']]]));
   }
 }
 
@@ -529,7 +529,7 @@ function content_translation_language_configuration_element_validate($element, F
 function content_translation_language_configuration_element_submit(array $form, FormStateInterface $form_state) {
   $key = $form_state->get(['content_translation', 'key']);
   $context = $form_state->get(['language', $key]);
-  $enabled = $form_state->getValue(array($key, 'content_translation'));
+  $enabled = $form_state->getValue([$key, 'content_translation']);
 
   if (\Drupal::service('content_translation.manager')->isEnabled($context['entity_type'], $context['bundle']) != $enabled) {
     \Drupal::service('content_translation.manager')->setEnabled($context['entity_type'], $context['bundle'], $enabled);
@@ -572,21 +572,21 @@ function content_translation_page_attachments(&$page) {
     }
 
     $entity = $route_match->getParameter($name);
-    if ($entity instanceof ContentEntityInterface) {
+    if ($entity instanceof ContentEntityInterface && $entity->hasLinkTemplate('canonical')) {
       // Current route represents a content entity. Build hreflang links.
       foreach ($entity->getTranslationLanguages() as $language) {
-        $url = $entity->urlInfo()
+        $url = $entity->toUrl('canonical')
           ->setOption('language', $language)
           ->setAbsolute()
           ->toString();
-        $page['#attached']['html_head_link'][] = array(
-          array(
+        $page['#attached']['html_head_link'][] = [
+          [
             'rel' => 'alternate',
             'hreflang' => $language->getId(),
             'href' => $url,
-          ),
+          ],
           TRUE,
-        );
+        ];
       }
     }
     // Since entity was found, no need to iterate further.
diff --git a/web/core/modules/content_translation/src/ContentTranslationHandler.php b/web/core/modules/content_translation/src/ContentTranslationHandler.php
index 6fd225481..c1688b9d6 100644
--- a/web/core/modules/content_translation/src/ContentTranslationHandler.php
+++ b/web/core/modules/content_translation/src/ContentTranslationHandler.php
@@ -4,6 +4,7 @@ namespace Drupal\content_translation;
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
+use Drupal\Core\Entity\EntityChangedInterface;
 use Drupal\Core\Entity\EntityHandlerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -15,6 +16,7 @@ use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\user\Entity\User;
+use Drupal\user\EntityOwnerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -108,7 +110,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
    * {@inheritdoc}
    */
   public function getFieldDefinitions() {
-    $definitions = array();
+    $definitions = [];
 
     $definitions['content_translation_source'] = BaseFieldDefinition::create('language')
       ->setLabel(t('Translation source'))
@@ -174,7 +176,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
     // EntityOwnerInterface. This helps to exclude cases, where the uid is
     // defined as field name, but is not meant to be an owner field; for
     // instance, the User entity.
-    return $this->entityType->isSubclassOf('\Drupal\user\EntityOwnerInterface') && $this->checkFieldStorageDefinitionTranslatability('uid');
+    return $this->entityType->entityClassImplements(EntityOwnerInterface::class) && $this->checkFieldStorageDefinitionTranslatability('uid');
   }
 
   /**
@@ -194,7 +196,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
    *   TRUE if metadata is natively supported, FALSE otherwise.
    */
   protected function hasChangedTime() {
-    return $this->entityType->isSubclassOf('Drupal\Core\Entity\EntityChangedInterface') && $this->checkFieldStorageDefinitionTranslatability('changed');
+    return $this->entityType->entityClassImplements(EntityChangedInterface::class) && $this->checkFieldStorageDefinitionTranslatability('changed');
   }
 
   /**
@@ -284,8 +286,8 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
     if (isset($languages[$form_langcode]) && ($has_translations || $new_translation)) {
       $title = $this->entityFormTitle($entity);
       // When editing the original values display just the entity label.
-      if ($form_langcode != $entity_langcode) {
-        $t_args = array('%language' => $languages[$form_langcode]->getName(), '%title' => $entity->label(), '@title' => $title);
+      if ($is_translation) {
+        $t_args = ['%language' => $languages[$form_langcode]->getName(), '%title' => $entity->label(), '@title' => $title];
         $title = empty($source_langcode) ? t('@title [%language translation]', $t_args) : t('Create %language translation of %title', $t_args);
       }
       $form['#title'] = $title;
@@ -294,25 +296,25 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
     // Display source language selector only if we are creating a new
     // translation and there are at least two translations available.
     if ($has_translations && $new_translation) {
-      $form['source_langcode'] = array(
+      $form['source_langcode'] = [
         '#type' => 'details',
-        '#title' => t('Source language: @language', array('@language' => $languages[$source_langcode]->getName())),
+        '#title' => t('Source language: @language', ['@language' => $languages[$source_langcode]->getName()]),
         '#tree' => TRUE,
         '#weight' => -100,
         '#multilingual' => TRUE,
-        'source' => array(
+        'source' => [
           '#title' => t('Select source language'),
           '#title_display' => 'invisible',
           '#type' => 'select',
           '#default_value' => $source_langcode,
-          '#options' => array(),
-        ),
-        'submit' => array(
+          '#options' => [],
+        ],
+        'submit' => [
           '#type' => 'submit',
           '#value' => t('Change'),
-          '#submit' => array(array($this, 'entityFormSourceChange')),
-        ),
-      );
+          '#submit' => [[$this, 'entityFormSourceChange']],
+        ],
+      ];
       foreach ($this->languageManager->getLanguages() as $language) {
         if (isset($translations[$language->getId()])) {
           $form['source_langcode']['source']['#options'][$language->getId()] = $language->getName();
@@ -333,7 +335,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
     if (isset($language_widget['widget'][0]['value']) && !$is_translation && $has_translations) {
       $language_select = &$language_widget['widget'][0]['value'];
       if ($language_select['#type'] == 'language_select') {
-        $options = array();
+        $options = [];
         foreach ($this->languageManager->getLanguages() as $language) {
           // Show the current language, and the languages for which no
           // translation already exists.
@@ -352,20 +354,20 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
       // Replace the delete button with the delete translation one.
       if (!$new_translation) {
         $weight = 100;
-        foreach (array('delete', 'submit') as $key) {
+        foreach (['delete', 'submit'] as $key) {
           if (isset($form['actions'][$key]['weight'])) {
             $weight = $form['actions'][$key]['weight'];
             break;
           }
         }
         $access = $this->getTranslationAccess($entity, 'delete')->isAllowed() || ($entity->access('delete') && $this->entityType->hasLinkTemplate('delete-form'));
-        $form['actions']['delete_translation'] = array(
+        $form['actions']['delete_translation'] = [
           '#type' => 'submit',
           '#value' => t('Delete translation'),
           '#weight' => $weight,
-          '#submit' => array(array($this, 'entityFormDeleteTranslation')),
+          '#submit' => [[$this, 'entityFormDeleteTranslation']],
           '#access' => $access,
-        );
+        ];
       }
 
       // Always remove the delete button on translation forms.
@@ -375,14 +377,24 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
     // We need to display the translation tab only when there is at least one
     // translation available or a new one is about to be created.
     if ($new_translation || $has_translations) {
-      $form['content_translation'] = array(
+      $form['content_translation'] = [
         '#type' => 'details',
         '#title' => t('Translation'),
         '#tree' => TRUE,
         '#weight' => 10,
         '#access' => $this->getTranslationAccess($entity, $source_langcode ? 'create' : 'update')->isAllowed(),
         '#multilingual' => TRUE,
-      );
+      ];
+
+      if (isset($form['advanced'])) {
+        $form['content_translation'] += [
+          '#group' => 'advanced',
+          '#weight' => 100,
+          '#attributes' => [
+            'class' => ['entity-translation-options'],
+          ],
+        ];
+      }
 
       // A new translation is enabled by default.
       $metadata = $this->manager->getTranslationMetadata($entity);
@@ -402,30 +414,30 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
         t('An unpublished translation will not be visible without translation permissions.') :
         t('Only this translation is published. You must publish at least one more translation to unpublish this one.');
 
-      $form['content_translation']['status'] = array(
+      $form['content_translation']['status'] = [
         '#type' => 'checkbox',
         '#title' => t('This translation is published'),
         '#default_value' => $status,
         '#description' => $description,
         '#disabled' => !$enabled,
-      );
+      ];
 
       $translate = !$new_translation && $metadata->isOutdated();
       if (!$translate) {
-        $form['content_translation']['retranslate'] = array(
+        $form['content_translation']['retranslate'] = [
           '#type' => 'checkbox',
           '#title' => t('Flag other translations as outdated'),
           '#default_value' => FALSE,
           '#description' => t('If you made a significant change, which means the other translations should be updated, you can flag all translations of this content as outdated. This will not change any other property of them, like whether they are published or not.'),
-        );
+        ];
       }
       else {
-        $form['content_translation']['outdated'] = array(
+        $form['content_translation']['outdated'] = [
           '#type' => 'checkbox',
           '#title' => t('This translation needs to be updated'),
           '#default_value' => $translate,
           '#description' => t('When this option is checked, this translation needs to be updated. Uncheck when the translation is up to date again.'),
-        );
+        ];
         $form['content_translation']['#open'] = TRUE;
       }
 
@@ -437,7 +449,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
       elseif (($account = $metadata->getAuthor()) && $account->id()) {
         $uid = $account->id();
       }
-      $form['content_translation']['uid'] = array(
+      $form['content_translation']['uid'] = [
         '#type' => 'entity_autocomplete',
         '#title' => t('Authored by'),
         '#target_type' => 'user',
@@ -445,34 +457,34 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
         // Validation is done by static::entityFormValidate().
         '#validate_reference' => FALSE,
         '#maxlength' => 60,
-        '#description' => t('Leave blank for %anonymous.', array('%anonymous' => \Drupal::config('user.settings')->get('anonymous'))),
-      );
+        '#description' => t('Leave blank for %anonymous.', ['%anonymous' => \Drupal::config('user.settings')->get('anonymous')]),
+      ];
 
       $date = $new_translation ? REQUEST_TIME : $metadata->getCreatedTime();
-      $form['content_translation']['created'] = array(
+      $form['content_translation']['created'] = [
         '#type' => 'textfield',
         '#title' => t('Authored on'),
         '#maxlength' => 25,
-        '#description' => t('Format: %time. The date format is YYYY-MM-DD and %timezone is the time zone offset from UTC. Leave blank to use the time of form submission.', array('%time' => format_date(REQUEST_TIME, 'custom', 'Y-m-d H:i:s O'), '%timezone' => format_date(REQUEST_TIME, 'custom', 'O'))),
+        '#description' => t('Format: %time. The date format is YYYY-MM-DD and %timezone is the time zone offset from UTC. Leave blank to use the time of form submission.', ['%time' => format_date(REQUEST_TIME, 'custom', 'Y-m-d H:i:s O'), '%timezone' => format_date(REQUEST_TIME, 'custom', 'O')]),
         '#default_value' => $new_translation || !$date ? '' : format_date($date, 'custom', 'Y-m-d H:i:s O'),
-      );
+      ];
 
       if (isset($language_widget)) {
         $language_widget['#multilingual'] = TRUE;
       }
 
-      $form['#process'][] = array($this, 'entityFormSharedElements');
+      $form['#process'][] = [$this, 'entityFormSharedElements'];
     }
 
     // Process the submitted values before they are stored.
-    $form['#entity_builders'][] = array($this, 'entityFormEntityBuild');
+    $form['#entity_builders'][] = [$this, 'entityFormEntityBuild'];
 
     // Handle entity validation.
-    $form['#validate'][] = array($this, 'entityFormValidate');
+    $form['#validate'][] = [$this, 'entityFormValidate'];
 
     // Handle entity deletion.
     if (isset($form['actions']['delete'])) {
-      $form['actions']['delete']['#submit'][] = array($this, 'entityFormDelete');
+      $form['actions']['delete']['#submit'][] = [$this, 'entityFormDelete'];
     }
 
     // Handle entity form submission before the entity has been saved.
@@ -494,7 +506,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
     // @todo Find a more reliable way to determine if a form element concerns a
     //   multilingual value.
     if (!isset($ignored_types)) {
-      $ignored_types = array_flip(array('actions', 'value', 'hidden', 'vertical_tabs', 'token', 'details'));
+      $ignored_types = array_flip(['actions', 'value', 'hidden', 'vertical_tabs', 'token', 'details']);
     }
 
     foreach (Element::children($element) as $key) {
@@ -539,7 +551,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
     // Elements which can have a #title attribute according to FAPI Reference.
     if (!isset($suffix)) {
       $suffix = ' <span class="translation-entity-all-languages">(' . t('all languages') . ')</span>';
-      $fapi_title_elements = array_flip(array('checkbox', 'checkboxes', 'date', 'details', 'fieldset', 'file', 'item', 'password', 'password_confirm', 'radio', 'radios', 'select', 'text_format', 'textarea', 'textfield', 'weight'));
+      $fapi_title_elements = array_flip(['checkbox', 'checkboxes', 'date', 'details', 'fieldset', 'file', 'item', 'password', 'password_confirm', 'radio', 'radios', 'select', 'text_format', 'textarea', 'textfield', 'weight']);
     }
 
     // Update #title attribute for all elements that are allowed to have a
@@ -575,7 +587,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
   public function entityFormEntityBuild($entity_type, EntityInterface $entity, array $form, FormStateInterface $form_state) {
     $form_object = $form_state->getFormObject();
     $form_langcode = $form_object->getFormLangcode($form_state);
-    $values = &$form_state->getValue('content_translation', array());
+    $values = &$form_state->getValue('content_translation', []);
 
     $metadata = $this->manager->getTranslationMetadata($entity);
     $metadata->setAuthor(!empty($values['uid']) ? User::load($values['uid']) : User::load(0));
@@ -598,12 +610,12 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
    *
    * Validates the submitted content translation metadata.
    */
-  function entityFormValidate($form, FormStateInterface $form_state) {
+  public function entityFormValidate($form, FormStateInterface $form_state) {
     if (!$form_state->isValueEmpty('content_translation')) {
       $translation = $form_state->getValue('content_translation');
       // Validate the "authored by" field.
       if (!empty($translation['uid']) && !($account = User::load($translation['uid']))) {
-        $form_state->setErrorByName('content_translation][uid', t('The translation authoring username %name does not exist.', array('%name' => $account->getUsername())));
+        $form_state->setErrorByName('content_translation][uid', t('The translation authoring username %name does not exist.', ['%name' => $account->getUsername()]));
       }
       // Validate the "authored on" field.
       if (!empty($translation['created']) && strtotime($translation['created']) === FALSE) {
@@ -618,7 +630,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
    * Updates metadata fields, which should be updated only after the validation
    * has run and before the entity is saved.
    */
-  function entityFormSubmit($form, FormStateInterface $form_state) {
+  public function entityFormSubmit($form, FormStateInterface $form_state) {
     /** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
     $form_object = $form_state->getFormObject();
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
@@ -644,16 +656,16 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
   public function entityFormSourceChange($form, FormStateInterface $form_state) {
     $form_object = $form_state->getFormObject();
     $entity = $form_object->getEntity();
-    $source = $form_state->getValue(array('source_langcode', 'source'));
+    $source = $form_state->getValue(['source_langcode', 'source']);
 
     $entity_type_id = $entity->getEntityTypeId();
-    $form_state->setRedirect("entity.$entity_type_id.content_translation_add", array(
+    $form_state->setRedirect("entity.$entity_type_id.content_translation_add", [
       $entity_type_id => $entity->id(),
       'source' => $source,
       'target' => $form_object->getFormLangcode($form_state),
-    ));
+    ]);
     $languages = $this->languageManager->getLanguages();
-    drupal_set_message(t('Source language set to: %language', array('%language' => $languages[$source]->getName())));
+    drupal_set_message(t('Source language set to: %language', ['%language' => $languages[$source]->getName()]));
   }
 
   /**
@@ -661,11 +673,11 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
    *
    * Takes care of entity deletion.
    */
-  function entityFormDelete($form, FormStateInterface $form_state) {
+  public function entityFormDelete($form, FormStateInterface $form_state) {
     $form_object = $form_state->getFormObject()->getEntity();
     $entity = $form_object->getEntity();
     if (count($entity->getTranslationLanguages()) > 1) {
-      drupal_set_message(t('This will delete all the translations of %label.', array('%label' => $entity->label())), 'warning');
+      drupal_set_message(t('This will delete all the translations of %label.', ['%label' => $entity->label()]), 'warning');
     }
   }
 
@@ -674,7 +686,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
    *
    * Takes care of content translation deletion.
    */
-  function entityFormDeleteTranslation($form, FormStateInterface $form_state) {
+  public function entityFormDeleteTranslation($form, FormStateInterface $form_state) {
     /** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
     $form_object = $form_state->getFormObject();
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
diff --git a/web/core/modules/content_translation/src/ContentTranslationManager.php b/web/core/modules/content_translation/src/ContentTranslationManager.php
index a1c2391e4..da8bd1c61 100644
--- a/web/core/modules/content_translation/src/ContentTranslationManager.php
+++ b/web/core/modules/content_translation/src/ContentTranslationManager.php
@@ -40,7 +40,7 @@ class ContentTranslationManager implements ContentTranslationManagerInterface {
   /**
    * {@inheritdoc}
    */
-  function getTranslationHandler($entity_type_id) {
+  public function getTranslationHandler($entity_type_id) {
     return $this->entityManager->getHandler($entity_type_id, 'translation');
   }
 
@@ -66,7 +66,7 @@ class ContentTranslationManager implements ContentTranslationManagerInterface {
    * {@inheritdoc}
    */
   public function getSupportedEntityTypes() {
-    $supported_types = array();
+    $supported_types = [];
     foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
       if ($this->isSupported($entity_type_id)) {
         $supported_types[$entity_type_id] = $entity_type;
@@ -82,7 +82,7 @@ class ContentTranslationManager implements ContentTranslationManagerInterface {
     $config = $this->loadContentLanguageSettings($entity_type_id, $bundle);
     $config->setThirdPartySetting('content_translation', 'enabled', $value)->save();
     $entity_type = $this->entityManager->getDefinition($entity_type_id);
-    $this->updatesManager->updateDefinitions(array($entity_type_id => $entity_type));
+    $this->updatesManager->updateDefinitions([$entity_type_id => $entity_type]);
   }
 
   /**
@@ -92,7 +92,7 @@ class ContentTranslationManager implements ContentTranslationManagerInterface {
     $enabled = FALSE;
 
     if ($this->isSupported($entity_type_id)) {
-      $bundles = !empty($bundle) ? array($bundle) : array_keys($this->entityManager->getBundleInfo($entity_type_id));
+      $bundles = !empty($bundle) ? [$bundle] : array_keys($this->entityManager->getBundleInfo($entity_type_id));
       foreach ($bundles as $bundle) {
         $config = $this->loadContentLanguageSettings($entity_type_id, $bundle);
         if ($config->getThirdPartySetting('content_translation', 'enabled', FALSE)) {
diff --git a/web/core/modules/content_translation/src/Controller/ContentTranslationController.php b/web/core/modules/content_translation/src/Controller/ContentTranslationController.php
index 43b59aaf1..c97f185a6 100644
--- a/web/core/modules/content_translation/src/Controller/ContentTranslationController.php
+++ b/web/core/modules/content_translation/src/Controller/ContentTranslationController.php
@@ -97,7 +97,7 @@ class ContentTranslationController extends ControllerBase {
     $translations = $entity->getTranslationLanguages();
     $field_ui = $this->moduleHandler()->moduleExists('field_ui') && $account->hasPermission('administer ' . $entity_type_id . ' fields');
 
-    $rows = array();
+    $rows = [];
     $show_source_column = FALSE;
 
     if ($this->languageManager()->isMultilingual()) {
@@ -123,41 +123,41 @@ class ContentTranslationController extends ControllerBase {
 
         $add_url = new Url(
           "entity.$entity_type_id.content_translation_add",
-          array(
+          [
             'source' => $original,
             'target' => $language->getId(),
             $entity_type_id => $entity->id(),
-          ),
-          array(
+          ],
+          [
             'language' => $language,
-          )
+          ]
         );
         $edit_url = new Url(
           "entity.$entity_type_id.content_translation_edit",
-          array(
+          [
             'language' => $language->getId(),
             $entity_type_id => $entity->id(),
-          ),
-          array(
+          ],
+          [
             'language' => $language,
-          )
+          ]
         );
         $delete_url = new Url(
           "entity.$entity_type_id.content_translation_delete",
-          array(
+          [
             'language' => $language->getId(),
             $entity_type_id => $entity->id(),
-          ),
-          array(
+          ],
+          [
             'language' => $language,
-          )
+          ]
         );
-        $operations = array(
-          'data' => array(
+        $operations = [
+          'data' => [
             '#type' => 'operations',
-            '#links' => array(),
-          ),
-        );
+            '#links' => [],
+          ],
+        ];
 
         $links = &$operations['data']['#links'];
         if (array_key_exists($langcode, $translations)) {
@@ -167,7 +167,7 @@ class ContentTranslationController extends ControllerBase {
           $source = $metadata->getSource() ?: LanguageInterface::LANGCODE_NOT_SPECIFIED;
           $is_original = $langcode == $original;
           $label = $entity->getTranslation($langcode)->label();
-          $link = isset($links->links[$langcode]['url']) ? $links->links[$langcode] : array('url' => $entity->urlInfo());
+          $link = isset($links->links[$langcode]['url']) ? $links->links[$langcode] : ['url' => $entity->urlInfo()];
           if (!empty($link['url'])) {
             $link['url']->setOption('language', $language);
             $row_title = $this->l($label, $link['url']);
@@ -196,17 +196,17 @@ class ContentTranslationController extends ControllerBase {
           if (isset($links['edit'])) {
             $links['edit']['title'] = $this->t('Edit');
           }
-          $status = array('data' => array(
+          $status = ['data' => [
             '#type' => 'inline_template',
             '#template' => '<span class="status">{% if status %}{{ "Published"|t }}{% else %}{{ "Not published"|t }}{% endif %}</span>{% if outdated %} <span class="marker">{{ "outdated"|t }}</span>{% endif %}',
-            '#context' => array(
+            '#context' => [
               'status' => $metadata->isPublished(),
               'outdated' => $metadata->isOutdated(),
-            ),
-          ));
+            ],
+          ]];
 
           if ($is_original) {
-            $language_name = $this->t('<strong>@language_name (Original language)</strong>', array('@language_name' => $language_name));
+            $language_name = $this->t('<strong>@language_name (Original language)</strong>', ['@language_name' => $language_name]);
             $source_name = $this->t('n/a');
           }
           else {
@@ -217,17 +217,17 @@ class ContentTranslationController extends ControllerBase {
               ->merge(CacheableMetadata::createFromObject($delete_access))
               ->merge(CacheableMetadata::createFromObject($translation_access));
             if ($entity->access('delete') && $entity_type->hasLinkTemplate('delete-form')) {
-              $links['delete'] = array(
+              $links['delete'] = [
                 'title' => $this->t('Delete'),
                 'url' => $entity->urlInfo('delete-form'),
                 'language' => $language,
-              );
+              ];
             }
             elseif ($translation_access->isAllowed()) {
-              $links['delete'] = array(
+              $links['delete'] = [
                 'title' => $this->t('Delete'),
                 'url' => $delete_url,
-              );
+              ];
             }
           }
         }
@@ -241,58 +241,58 @@ class ContentTranslationController extends ControllerBase {
             ->merge(CacheableMetadata::createFromObject($create_translation_access));
           if ($source != $langcode && $create_translation_access->isAllowed()) {
             if ($translatable) {
-              $links['add'] = array(
+              $links['add'] = [
                 'title' => $this->t('Add'),
                 'url' => $add_url,
-              );
+              ];
             }
             elseif ($field_ui) {
               $url = new Url('language.content_settings_page');
 
               // Link directly to the fields tab to make it easier to find the
               // setting to enable translation on fields.
-              $links['nofields'] = array(
+              $links['nofields'] = [
                 'title' => $this->t('No translatable fields'),
                 'url' => $url,
-              );
+              ];
             }
           }
 
           $status = $this->t('Not translated');
         }
         if ($show_source_column) {
-          $rows[] = array(
+          $rows[] = [
             $language_name,
             $row_title,
             $source_name,
             $status,
             $operations,
-          );
+          ];
         }
         else {
-          $rows[] = array($language_name, $row_title, $status, $operations);
+          $rows[] = [$language_name, $row_title, $status, $operations];
         }
       }
     }
     if ($show_source_column) {
-      $header = array(
+      $header = [
         $this->t('Language'),
         $this->t('Translation'),
         $this->t('Source language'),
         $this->t('Status'),
         $this->t('Operations'),
-      );
+      ];
     }
     else {
-      $header = array(
+      $header = [
         $this->t('Language'),
         $this->t('Translation'),
         $this->t('Status'),
         $this->t('Operations'),
-      );
+      ];
     }
 
-    $build['#title'] = $this->t('Translations of %label', array('%label' => $entity->label()));
+    $build['#title'] = $this->t('Translations of %label', ['%label' => $entity->label()]);
 
     // Add metadata to the build render array to let other modules know about
     // which entity this is.
@@ -301,11 +301,11 @@ class ContentTranslationController extends ControllerBase {
       ->addCacheTags($entity->getCacheTags())
       ->applyTo($build);
 
-    $build['content_translation_overview'] = array(
+    $build['content_translation_overview'] = [
       '#theme' => 'table',
       '#header' => $header,
       '#rows' => $rows,
-    );
+    ];
 
     return $build;
   }
@@ -339,7 +339,7 @@ class ContentTranslationController extends ControllerBase {
     //   See https://www.drupal.org/node/2006348.
     $operation = 'default';
 
-    $form_state_additions = array();
+    $form_state_additions = [];
     $form_state_additions['langcode'] = $target->getId();
     $form_state_additions['content_translation']['source'] = $source;
     $form_state_additions['content_translation']['target'] = $target;
@@ -370,7 +370,7 @@ class ContentTranslationController extends ControllerBase {
     //   See https://www.drupal.org/node/2006348.
     $operation = 'default';
 
-    $form_state_additions = array();
+    $form_state_additions = [];
     $form_state_additions['langcode'] = $language->getId();
     $form_state_additions['content_translation']['translation_form'] = TRUE;
 
diff --git a/web/core/modules/content_translation/src/FieldTranslationSynchronizer.php b/web/core/modules/content_translation/src/FieldTranslationSynchronizer.php
index 8f7584d8b..13b805df8 100644
--- a/web/core/modules/content_translation/src/FieldTranslationSynchronizer.php
+++ b/web/core/modules/content_translation/src/FieldTranslationSynchronizer.php
@@ -73,14 +73,14 @@ class FieldTranslationSynchronizer implements FieldTranslationSynchronizerInterf
           }
         }
         if (!empty($groups)) {
-          $columns = array();
+          $columns = [];
           foreach ($groups as $group) {
             $info = $column_groups[$group];
             // A missing 'columns' key indicates we have a single-column group.
-            $columns = array_merge($columns, isset($info['columns']) ? $info['columns'] : array($group));
+            $columns = array_merge($columns, isset($info['columns']) ? $info['columns'] : [$group]);
           }
           if (!empty($columns)) {
-            $values = array();
+            $values = [];
             foreach ($translations as $langcode => $language) {
               $values[$langcode] = $entity->getTranslation($langcode)->get($field_name)->getValue();
             }
@@ -108,18 +108,18 @@ class FieldTranslationSynchronizer implements FieldTranslationSynchronizerInterf
     $source_items = $values[$sync_langcode];
 
     // Make sure we can detect any change in the source items.
-    $change_map = array();
+    $change_map = [];
 
     // By picking the maximum size between updated and unchanged items, we make
     // sure to process also removed items.
-    $total = max(array(count($source_items), count($unchanged_items)));
+    $total = max([count($source_items), count($unchanged_items)]);
 
     // As a first step we build a map of the deltas corresponding to the column
     // values to be synchronized. Recording both the old values and the new
     // values will allow us to detect any change in the order of the new items
     // for each column.
     for ($delta = 0; $delta < $total; $delta++) {
-      foreach (array('old' => $unchanged_items, 'new' => $source_items) as $key => $items) {
+      foreach (['old' => $unchanged_items, 'new' => $source_items] as $key => $items) {
         if ($item_id = $this->itemHash($items, $delta, $columns)) {
           $change_map[$item_id][$key][] = $delta;
         }
@@ -132,7 +132,7 @@ class FieldTranslationSynchronizer implements FieldTranslationSynchronizerInterf
 
     // Reset field values so that no spurious one is stored. Source values must
     // be preserved in any case.
-    $values = array($sync_langcode => $source_items);
+    $values = [$sync_langcode => $source_items];
 
     // Update field translations.
     foreach ($translations as $langcode) {
@@ -211,7 +211,7 @@ class FieldTranslationSynchronizer implements FieldTranslationSynchronizerInterf
    *   A hash code that can be used to identify the item.
    */
   protected function itemHash(array $items, $delta, array $columns) {
-    $values = array();
+    $values = [];
 
     if (isset($items[$delta])) {
       foreach ($columns as $column) {
diff --git a/web/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationLocalTasks.php b/web/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationLocalTasks.php
index 84e126370..e364de91f 100644
--- a/web/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationLocalTasks.php
+++ b/web/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationLocalTasks.php
@@ -66,12 +66,12 @@ class ContentTranslationLocalTasks extends DeriverBase implements ContainerDeriv
       $translation_route_name = "entity.$entity_type_id.content_translation_overview";
 
       $base_route_name = "entity.$entity_type_id.canonical";
-      $this->derivatives[$translation_route_name] = array(
+      $this->derivatives[$translation_route_name] = [
         'entity_type' => $entity_type_id,
         'title' => $this->t('Translate'),
         'route_name' => $translation_route_name,
         'base_route' => $base_route_name,
-      ) + $base_plugin_definition;
+      ] + $base_plugin_definition;
     }
     return parent::getDerivativeDefinitions($base_plugin_definition);
   }
diff --git a/web/core/modules/content_translation/src/Routing/ContentTranslationRouteSubscriber.php b/web/core/modules/content_translation/src/Routing/ContentTranslationRouteSubscriber.php
index fb4b76117..6aae426ab 100644
--- a/web/core/modules/content_translation/src/Routing/ContentTranslationRouteSubscriber.php
+++ b/web/core/modules/content_translation/src/Routing/ContentTranslationRouteSubscriber.php
@@ -58,104 +58,104 @@ class ContentTranslationRouteSubscriber extends RouteSubscriberBase {
 
       $route = new Route(
         $path,
-        array(
+        [
           '_controller' => '\Drupal\content_translation\Controller\ContentTranslationController::overview',
           'entity_type_id' => $entity_type_id,
-        ),
-        array(
+        ],
+        [
           '_entity_access' => $entity_type_id . '.view',
           '_access_content_translation_overview' => $entity_type_id,
-        ),
-        array(
-          'parameters' => array(
-            $entity_type_id => array(
+        ],
+        [
+          'parameters' => [
+            $entity_type_id => [
               'type' => 'entity:' . $entity_type_id,
-            ),
-          ),
+            ],
+          ],
           '_admin_route' => $is_admin,
-        )
+        ]
       );
       $route_name = "entity.$entity_type_id.content_translation_overview";
       $collection->add($route_name, $route);
 
       $route = new Route(
         $path . '/add/{source}/{target}',
-        array(
+        [
           '_controller' => '\Drupal\content_translation\Controller\ContentTranslationController::add',
           'source' => NULL,
           'target' => NULL,
           '_title' => 'Add',
           'entity_type_id' => $entity_type_id,
 
-        ),
-        array(
+        ],
+        [
           '_entity_access' => $entity_type_id . '.view',
           '_access_content_translation_manage' => 'create',
-        ),
-        array(
-          'parameters' => array(
-            'source' => array(
+        ],
+        [
+          'parameters' => [
+            'source' => [
               'type' => 'language',
-            ),
-            'target' => array(
+            ],
+            'target' => [
               'type' => 'language',
-            ),
-            $entity_type_id => array(
+            ],
+            $entity_type_id => [
               'type' => 'entity:' . $entity_type_id,
-            ),
-          ),
+            ],
+          ],
           '_admin_route' => $is_admin,
-        )
+        ]
       );
       $collection->add("entity.$entity_type_id.content_translation_add", $route);
 
       $route = new Route(
         $path . '/edit/{language}',
-        array(
+        [
           '_controller' => '\Drupal\content_translation\Controller\ContentTranslationController::edit',
           'language' => NULL,
           '_title' => 'Edit',
           'entity_type_id' => $entity_type_id,
-        ),
-        array(
+        ],
+        [
           '_access_content_translation_manage' => 'update',
-        ),
-        array(
-          'parameters' => array(
-            'language' => array(
+        ],
+        [
+          'parameters' => [
+            'language' => [
               'type' => 'language',
-            ),
-            $entity_type_id => array(
+            ],
+            $entity_type_id => [
               'type' => 'entity:' . $entity_type_id,
-            ),
-          ),
+            ],
+          ],
           '_admin_route' => $is_admin,
-        )
+        ]
       );
       $collection->add("entity.$entity_type_id.content_translation_edit", $route);
 
       $route = new Route(
         $path . '/delete/{language}',
-        array(
+        [
           '_entity_form' => $entity_type_id . '.content_translation_deletion',
           'language' => NULL,
           '_title' => 'Delete',
           'entity_type_id' => $entity_type_id,
-        ),
-        array(
+        ],
+        [
           '_access_content_translation_manage' => 'delete',
-        ),
-        array(
-          'parameters' => array(
-            'language' => array(
+        ],
+        [
+          'parameters' => [
+            'language' => [
               'type' => 'language',
-            ),
-            $entity_type_id => array(
+            ],
+            $entity_type_id => [
               'type' => 'entity:' . $entity_type_id,
-            ),
-          ),
+            ],
+          ],
           '_admin_route' => $is_admin,
-        )
+        ]
       );
       $collection->add("entity.$entity_type_id.content_translation_delete", $route);
     }
@@ -168,7 +168,7 @@ class ContentTranslationRouteSubscriber extends RouteSubscriberBase {
     $events = parent::getSubscribedEvents();
     // Should run after AdminRouteSubscriber so the routes can inherit admin
     // status of the edit routes on entities. Therefore priority -210.
-    $events[RoutingEvents::ALTER] = array('onAlterRoutes', -210);
+    $events[RoutingEvents::ALTER] = ['onAlterRoutes', -210];
     return $events;
   }
 
diff --git a/web/core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php b/web/core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php
index e94802aa1..1688f75fd 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php
+++ b/web/core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php
@@ -19,7 +19,7 @@ class ContentTestTranslationUITest extends ContentTranslationUITestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'content_translation', 'entity_test');
+  public static $modules = ['language', 'content_translation', 'entity_test'];
 
   /**
    * {@inheritdoc}
@@ -34,7 +34,7 @@ class ContentTestTranslationUITest extends ContentTranslationUITestBase {
    * {@inheritdoc}
    */
   protected function getTranslatorPermissions() {
-    return array_merge(parent::getTranslatorPermissions(), array('administer entity_test content', 'view test entity'));
+    return array_merge(parent::getTranslatorPermissions(), ['administer entity_test content', 'view test entity']);
   }
 
 }
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php b/web/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php
index efbd3c11f..080ffb954 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php
+++ b/web/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php
@@ -48,7 +48,7 @@ class ContentTranslationContextualLinksTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('content_translation', 'contextual', 'node');
+  public static $modules = ['content_translation', 'contextual', 'node'];
 
   /**
    * The profile to install as a basis for testing.
@@ -60,20 +60,20 @@ class ContentTranslationContextualLinksTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
     // Set up an additional language.
-    $this->langcodes = array(\Drupal::languageManager()->getDefaultLanguage()->getId(), 'es');
+    $this->langcodes = [\Drupal::languageManager()->getDefaultLanguage()->getId(), 'es'];
     ConfigurableLanguage::createFromLangcode('es')->save();
 
     // Create a content type.
     $this->bundle = $this->randomMachineName();
-    $this->contentType = $this->drupalCreateContentType(array('type' => $this->bundle));
+    $this->contentType = $this->drupalCreateContentType(['type' => $this->bundle]);
 
     // Add a field to the content type. The field is not yet translatable.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_test_text',
       'entity_type' => 'node',
       'type' => 'text',
       'cardinality' => 1,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'node',
       'field_name' => 'field_test_text',
@@ -81,19 +81,19 @@ class ContentTranslationContextualLinksTest extends WebTestBase {
       'label' => 'Test text-field',
     ])->save();
     entity_get_form_display('node', $this->bundle, 'default')
-      ->setComponent('field_test_text', array(
+      ->setComponent('field_test_text', [
         'type' => 'text_textfield',
         'weight' => 0,
-      ))
+      ])
       ->save();
 
     // Create a translator user.
-    $permissions = array(
+    $permissions = [
       'access contextual links',
       'administer nodes',
       "edit any $this->bundle content",
       'translate any entity',
-    );
+    ];
     $this->translator = $this->drupalCreateUser($permissions);
   }
 
@@ -103,18 +103,18 @@ class ContentTranslationContextualLinksTest extends WebTestBase {
   public function testContentTranslationContextualLinks() {
     // Create a node.
     $title = $this->randomString();
-    $this->drupalCreateNode(array('type' => $this->bundle, 'title' => $title, 'langcode' => 'en'));
+    $this->drupalCreateNode(['type' => $this->bundle, 'title' => $title, 'langcode' => 'en']);
     $node = $this->drupalGetNodeByTitle($title);
 
     // Use a UI form submission to make the node type and field translatable.
     // This tests that caches are properly invalidated.
     $this->drupalLogin($this->rootUser);
-    $edit = array(
+    $edit = [
       'entity_types[node]' => TRUE,
       'settings[node][' . $this->bundle . '][settings][language][language_alterable]' => TRUE,
       'settings[node][' . $this->bundle . '][translatable]' => TRUE,
       'settings[node][' . $this->bundle . '][fields][field_test_text]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
     $this->drupalLogout();
 
@@ -122,7 +122,7 @@ class ContentTranslationContextualLinksTest extends WebTestBase {
     $this->drupalLogin($this->translator);
     $translate_link = 'node/' . $node->id() . '/translations';
 
-    $response = $this->renderContextualLinks(array('node:node=1:'), 'node/' . $node->id());
+    $response = $this->renderContextualLinks(['node:node=1:'], 'node/' . $node->id());
     $this->assertResponse(200);
     $json = Json::decode($response);
     $this->setRawContent($json['node:node=1:']);
@@ -130,7 +130,7 @@ class ContentTranslationContextualLinksTest extends WebTestBase {
 
     // Check that the link leads to the translate page.
     $this->drupalGet($translate_link);
-    $this->assertRaw(t('Translations of %label', array('%label' => $node->label())), 'The contextual link leads to the translate page.');
+    $this->assertRaw(t('Translations of %label', ['%label' => $node->label()]), 'The contextual link leads to the translate page.');
   }
 
   /**
@@ -148,7 +148,7 @@ class ContentTranslationContextualLinksTest extends WebTestBase {
    */
   protected function renderContextualLinks($ids, $current_path) {
     // Build POST values.
-    $post = array();
+    $post = [];
     for ($i = 0; $i < count($ids); $i++) {
       $post['ids[' . $i . ']'] = $ids[$i];
     }
@@ -163,15 +163,15 @@ class ContentTranslationContextualLinksTest extends WebTestBase {
     $post = implode('&', $post);
 
     // Perform HTTP request.
-    return $this->curlExec(array(
-      CURLOPT_URL => \Drupal::url('contextual.render', array(), array('absolute' => TRUE, 'query' => array('destination' => $current_path))),
+    return $this->curlExec([
+      CURLOPT_URL => \Drupal::url('contextual.render', [], ['absolute' => TRUE, 'query' => ['destination' => $current_path]]),
       CURLOPT_POST => TRUE,
       CURLOPT_POSTFIELDS => $post,
-      CURLOPT_HTTPHEADER => array(
+      CURLOPT_HTTPHEADER => [
         'Accept: application/json',
         'Content-Type: application/x-www-form-urlencoded',
-      ),
-    ));
+      ],
+    ]);
   }
 
 }
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationDisableSettingTest.php b/web/core/modules/content_translation/src/Tests/ContentTranslationDisableSettingTest.php
new file mode 100644
index 000000000..a274ad235
--- /dev/null
+++ b/web/core/modules/content_translation/src/Tests/ContentTranslationDisableSettingTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Drupal\content_translation\Tests;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Test disabling content translation module.
+ *
+ * @group content_translation
+ */
+class ContentTranslationDisableSettingTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'content_translation',
+    'menu_link_content',
+    'language',
+  ];
+
+  /**
+   * Tests that entity schemas are up-to-date after enabling translation.
+   */
+  public function testDisableSetting() {
+    // Define selectors.
+    $group_checkbox = 'entity_types[menu_link_content]';
+    $translatable_checkbox = 'settings[menu_link_content][menu_link_content][translatable]';
+    $language_alterable = 'settings[menu_link_content][menu_link_content][settings][language][language_alterable]';
+
+    $user = $this->drupalCreateUser([
+      'administer site configuration',
+      'administer content translation',
+      'create content translations',
+      'administer languages',
+    ]);
+    $this->drupalLogin($user);
+
+    $assert = $this->assertSession();
+
+    $this->drupalGet('admin/config/regional/content-language');
+
+    $assert->checkboxNotChecked('entity_types[menu_link_content]');
+
+    $edit = [
+      $group_checkbox => TRUE,
+      $translatable_checkbox => TRUE,
+      $language_alterable => TRUE,
+    ];
+    $this->submitForm($edit, t('Save configuration'));
+
+    $assert->pageTextContains(t('Settings successfully updated.'));
+
+    $assert->checkboxChecked($group_checkbox);
+
+    $edit = [
+      $group_checkbox => FALSE,
+      $translatable_checkbox => TRUE,
+      $language_alterable => TRUE,
+    ];
+    $this->submitForm($edit, t('Save configuration'));
+
+    $assert->pageTextContains(t('Settings successfully updated.'));
+
+    $assert->checkboxNotChecked($group_checkbox);
+  }
+
+}
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php b/web/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
index fb13642a8..11c816c1d 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
+++ b/web/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
@@ -24,8 +24,8 @@ class ContentTranslationEnableTest extends WebTestBase {
     // Enable modules and make sure the related config entity type definitions
     // are installed.
     $edit = [
-      'modules[Multilingual][content_translation][enable]' => TRUE,
-      'modules[Multilingual][language][enable]' => TRUE,
+      'modules[content_translation][enable]' => TRUE,
+      'modules[language][enable]' => TRUE,
     ];
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
@@ -35,7 +35,7 @@ class ContentTranslationEnableTest extends WebTestBase {
 
     // No pending updates should be available.
     $this->drupalGet('admin/reports/status');
-    $requirement_value = $this->cssSelect("tr.system-status-report__entry th:contains('Entity/field definitions') + td");
+    $requirement_value = $this->cssSelect("details.system-status-report__entry summary:contains('Entity/field definitions') + div");
     $this->assertEqual(t('Up to date'), trim((string) $requirement_value[0]));
 
     $this->drupalGet('admin/config/regional/content-language');
@@ -53,16 +53,16 @@ class ContentTranslationEnableTest extends WebTestBase {
 
     // No pending updates should be available.
     $this->drupalGet('admin/reports/status');
-    $requirement_value = $this->cssSelect("tr.system-status-report__entry th:contains('Entity/field definitions') + td");
+    $requirement_value = $this->cssSelect("details.system-status-report__entry summary:contains('Entity/field definitions') + div");
     $this->assertEqual(t('Up to date'), trim((string) $requirement_value[0]));
 
     // Create a node type and check the content translation settings are now
     // available for nodes.
-    $edit = array(
+    $edit = [
       'name' => 'foo',
       'title_label' => 'title for foo',
       'type' => 'foo',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/add', $edit, t('Save content type'));
     $this->drupalGet('admin/config/regional/content-language');
     $this->assertRaw('entity_types[node]');
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationLanguageChangeTest.php b/web/core/modules/content_translation/src/Tests/ContentTranslationLanguageChangeTest.php
new file mode 100644
index 000000000..bb9b2235e
--- /dev/null
+++ b/web/core/modules/content_translation/src/Tests/ContentTranslationLanguageChangeTest.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace Drupal\content_translation\Tests;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\node\Tests\NodeTestBase;
+
+/**
+ * Tests the content translation language that is set.
+ *
+ * @group content_translation
+ */
+class ContentTranslationLanguageChangeTest extends NodeTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'content_translation', 'content_translation_test', 'node', 'block', 'field_ui', 'image'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $langcodes = ['de', 'fr'];
+    foreach ($langcodes as $langcode) {
+      ConfigurableLanguage::createFromLangcode($langcode)->save();
+    }
+    $this->drupalPlaceBlock('local_tasks_block');
+    $user = $this->drupalCreateUser([
+      'administer site configuration',
+      'administer nodes',
+      'create article content',
+      'edit any article content',
+      'delete any article content',
+      'administer content translation',
+      'translate any entity',
+      'create content translations',
+      'administer languages',
+      'administer content types',
+      'administer node fields',
+    ]);
+    $this->drupalLogin($user);
+
+    // Enable translation for article.
+    $edit = [
+      'entity_types[node]' => TRUE,
+      'settings[node][article][translatable]' => TRUE,
+      'settings[node][article][settings][language][language_alterable]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
+
+    // Add an image field.
+    $this->drupalGet('admin/structure/types/manage/article/fields/add-field');
+    $edit = [
+      'new_storage_type' => 'image',
+      'field_name' => 'image_field',
+      'label' => 'image_field',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save and continue'));
+    $this->drupalPostForm(NULL, [], t('Save field settings'));
+    $this->drupalPostForm(NULL, [], t('Save settings'));
+  }
+
+  /**
+   * Test that the source language is properly set when changing.
+   */
+  public function testLanguageChange() {
+    // Create a node in English.
+    $this->drupalGet('node/add/article');
+    $edit = [
+      'title[0][value]' => 'english_title',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save and publish'));
+
+    // Create a translation in French.
+    $this->clickLink('Translate');
+    $this->clickLink('Add');
+    $this->drupalPostForm(NULL, [], t('Save and keep published (this translation)'));
+    $this->clickLink('Translate');
+
+    // Edit English translation.
+    $this->clickLink('Edit');
+    // Upload and image after changing the node language.
+    $images = $this->drupalGetTestFiles('image')[1];
+    $edit = [
+      'langcode[0][value]' => 'de',
+      'files[field_image_field_0]' => $images->uri,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Upload'));
+    $this->drupalPostForm(NULL, ['field_image_field[0][alt]' => 'alternative_text'], t('Save and keep published (this translation)'));
+
+    // Check that the translation languages are correct.
+    $node = $this->getNodeByTitle('english_title');
+    $translation_languages = array_keys($node->getTranslationLanguages());
+    $this->assertTrue(in_array('fr', $translation_languages));
+    $this->assertTrue(in_array('de', $translation_languages));
+  }
+
+  /**
+   * Test that title does not change on ajax call with new language value.
+   */
+  public function testTitleDoesNotChangesOnChangingLanguageWidgetAndTriggeringAjaxCall() {
+    // Create a node in English.
+    $this->drupalGet('node/add/article', ['query' => ['test_field_only_en_fr' => 1]]);
+    $edit = [
+      'title[0][value]' => 'english_title',
+      'test_field_only_en_fr' => 'node created',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save and publish'));
+    $this->assertEqual('node created', \Drupal::state()->get('test_field_only_en_fr'));
+
+    // Create a translation in French.
+    $this->clickLink('Translate');
+    $this->clickLink('Add');
+    $this->drupalPostForm(NULL, [], t('Save and keep published (this translation)'));
+    $this->clickLink('Translate');
+
+    // Edit English translation.
+    $node = $this->getNodeByTitle('english_title');
+    $this->drupalGet('node/' . $node->id() . '/edit');
+    // Test the expected title when loading the form.
+    $this->assertRaw('<title>Edit Article english_title | Drupal</title>');
+    // Upload and image after changing the node language.
+    $images = $this->drupalGetTestFiles('image')[1];
+    $edit = [
+      'langcode[0][value]' => 'de',
+      'files[field_image_field_0]' => $images->uri,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Upload'));
+    // Test the expected title after triggering an ajax call with a new
+    // language selected.
+    $this->assertRaw('<title>Edit Article english_title | Drupal</title>');
+    $edit = [
+      'langcode[0][value]' => 'en',
+      'field_image_field[0][alt]' => 'alternative_text'
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save and keep published (this translation)'));
+
+    // Check that the translation languages are correct.
+    $node = $this->getNodeByTitle('english_title');
+    $translation_languages = array_keys($node->getTranslationLanguages());
+    $this->assertTrue(in_array('fr', $translation_languages));
+    $this->assertTrue(!in_array('de', $translation_languages));
+  }
+
+}
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/web/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
index d7490c047..7a1c59804 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
+++ b/web/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
@@ -24,43 +24,43 @@ class ContentTranslationSettingsTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'content_translation', 'node', 'comment', 'field_ui', 'entity_test');
+  public static $modules = ['language', 'content_translation', 'node', 'comment', 'field_ui', 'entity_test'];
 
   protected function setUp() {
     parent::setUp();
 
     // Set up two content types to test fields shared between different
     // bundles.
-    $this->drupalCreateContentType(array('type' => 'article'));
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'article']);
+    $this->drupalCreateContentType(['type' => 'page']);
     $this->addDefaultCommentField('node', 'article', 'comment_article', CommentItemInterface::OPEN, 'comment_article');
     $this->addDefaultCommentField('node', 'page', 'comment_page');
 
-    $admin_user = $this->drupalCreateUser(array('access administration pages', 'administer languages', 'administer content translation', 'administer content types', 'administer node fields', 'administer comment fields', 'administer comments', 'administer comment types', 'administer account settings'));
+    $admin_user = $this->drupalCreateUser(['access administration pages', 'administer languages', 'administer content translation', 'administer content types', 'administer node fields', 'administer comment fields', 'administer comments', 'administer comment types', 'administer account settings']);
     $this->drupalLogin($admin_user);
   }
 
   /**
    * Tests that the settings UI works as expected.
    */
-  function testSettingsUI() {
+  public function testSettingsUI() {
     // Check for the content_translation_menu_links_discovered_alter() changes.
     $this->drupalGet('admin/config');
     $this->assertLink('Content language and translation');
     $this->assertText('Configure language and translation support for content.');
     // Test that the translation settings are ignored if the bundle is marked
     // translatable but the entity type is not.
-    $edit = array('settings[comment][comment_article][translatable]' => TRUE);
+    $edit = ['settings[comment][comment_article][translatable]' => TRUE];
     $this->assertSettings('comment', NULL, FALSE, $edit);
 
     // Test that the translation settings are ignored if only a field is marked
     // as translatable and not the related entity type and bundle.
-    $edit = array('settings[comment][comment_article][fields][comment_body]' => TRUE);
+    $edit = ['settings[comment][comment_article][fields][comment_body]' => TRUE];
     $this->assertSettings('comment', NULL, FALSE, $edit);
 
     // Test that the translation settings are not stored if an entity type and
     // bundle are marked as translatable but no field is.
-    $edit = array(
+    $edit = [
       'entity_types[comment]' => TRUE,
       'settings[comment][comment_article][translatable]' => TRUE,
       // Base fields are translatable by default.
@@ -73,26 +73,26 @@ class ContentTranslationSettingsTest extends WebTestBase {
       'settings[comment][comment_article][fields][status]' => FALSE,
       'settings[comment][comment_article][fields][subject]' => FALSE,
       'settings[comment][comment_article][fields][uid]' => FALSE,
-    );
+    ];
     $this->assertSettings('comment', 'comment_article', FALSE, $edit);
     $xpath_err = '//div[contains(@class, "error")]';
     $this->assertTrue($this->xpath($xpath_err), 'Enabling translation only for entity bundles generates a form error.');
 
     // Test that the translation settings are not stored if a non-configurable
     // language is set as default and the language selector is hidden.
-    $edit = array(
+    $edit = [
       'entity_types[comment]' => TRUE,
       'settings[comment][comment_article][settings][language][langcode]' => Language::LANGCODE_NOT_SPECIFIED,
       'settings[comment][comment_article][settings][language][language_alterable]' => FALSE,
       'settings[comment][comment_article][translatable]' => TRUE,
       'settings[comment][comment_article][fields][comment_body]' => TRUE,
-    );
+    ];
     $this->assertSettings('comment', 'comment_article', FALSE, $edit);
     $this->assertTrue($this->xpath($xpath_err), 'Enabling translation with a fixed non-configurable language generates a form error.');
 
     // Test that a field shared among different bundles can be enabled without
     // needing to make all the related bundles translatable.
-    $edit = array(
+    $edit = [
       'entity_types[comment]' => TRUE,
       'settings[comment][comment_article][settings][language][langcode]' => 'current_interface',
       'settings[comment][comment_article][settings][language][language_alterable]' => TRUE,
@@ -101,7 +101,7 @@ class ContentTranslationSettingsTest extends WebTestBase {
       // Override both comment subject fields to untranslatable.
       'settings[comment][comment_article][fields][subject]' => FALSE,
       'settings[comment][comment][fields][subject]' => FALSE,
-    );
+    ];
     $this->assertSettings('comment', 'comment_article', TRUE, $edit);
     $definition = $this->entityManager()->getFieldDefinitions('comment', 'comment_article')['comment_body'];
     $this->assertTrue($definition->isTranslatable(), 'Article comment body is translatable.');
@@ -114,12 +114,12 @@ class ContentTranslationSettingsTest extends WebTestBase {
     $this->assertFalse($definition->isTranslatable(), 'Page comment subject is not translatable.');
 
     // Test that translation can be enabled for base fields.
-    $edit = array(
+    $edit = [
       'entity_types[entity_test_mul]' => TRUE,
       'settings[entity_test_mul][entity_test_mul][translatable]' => TRUE,
       'settings[entity_test_mul][entity_test_mul][fields][name]' => TRUE,
       'settings[entity_test_mul][entity_test_mul][fields][user_id]' => FALSE,
-    );
+    ];
     $this->assertSettings('entity_test_mul', 'entity_test_mul', TRUE, $edit);
     $field_override = BaseFieldOverride::loadByName('entity_test_mul', 'entity_test_mul', 'name');
     $this->assertTrue($field_override->isTranslatable(), 'Base fields can be overridden with a base field bundle override entity.');
@@ -137,9 +137,9 @@ class ContentTranslationSettingsTest extends WebTestBase {
     $this->assertFieldChecked('edit-language-configuration-content-translation');
 
     // Verify that translation may be enabled for the article content type.
-    $edit = array(
+    $edit = [
       'language_configuration[content_translation]' => TRUE,
-    );
+    ];
     // Make sure the checkbox is available and not checked by default.
     $this->drupalGet('admin/structure/types/manage/article');
     $this->assertField('language_configuration[content_translation]');
@@ -149,18 +149,18 @@ class ContentTranslationSettingsTest extends WebTestBase {
     $this->assertFieldChecked('edit-language-configuration-content-translation');
 
     // Test that the title field of nodes is available in the settings form.
-    $edit = array(
+    $edit = [
       'entity_types[node]' => TRUE,
       'settings[node][article][settings][language][langcode]' => 'current_interface',
       'settings[node][article][settings][language][language_alterable]' => TRUE,
       'settings[node][article][translatable]' => TRUE,
       'settings[node][article][fields][title]' => TRUE
-    );
+    ];
     $this->assertSettings('node', NULL, TRUE, $edit);
 
-    foreach (array(TRUE, FALSE) as $translatable) {
+    foreach ([TRUE, FALSE] as $translatable) {
       // Test that configurable field translatability is correctly switched.
-      $edit = array('settings[node][article][fields][body]' => $translatable);
+      $edit = ['settings[node][article][fields][body]' => $translatable];
       $this->assertSettings('node', 'article', TRUE, $edit);
       $field = FieldConfig::loadByName('node', 'article', 'body');
       $definitions = \Drupal::entityManager()->getFieldDefinitions('node', 'article');
@@ -169,7 +169,7 @@ class ContentTranslationSettingsTest extends WebTestBase {
 
       // Test that also the Field UI form behaves correctly.
       $translatable = !$translatable;
-      $edit = array('translatable' => $translatable);
+      $edit = ['translatable' => $translatable];
       $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.body', $edit, t('Save settings'));
       \Drupal::entityManager()->clearCachedFieldDefinitions();
       $field = FieldConfig::loadByName('node', 'article', 'body');
@@ -182,14 +182,14 @@ class ContentTranslationSettingsTest extends WebTestBase {
     // lists, such as in Views UI.
     $this->drupalGet('admin/config/regional/content-language');
 
-    $expected_elements = array(
+    $expected_elements = [
       'site_default',
       'current_interface',
       'authors_default',
       'en',
       'und',
       'zxx',
-    );
+    ];
     $elements = $this->xpath('//select[@id="edit-settings-node-article-settings-language-langcode"]/option');
     // Compare values inside the option elements with expected values.
     for ($i = 0; $i < count($elements); $i++) {
@@ -200,21 +200,21 @@ class ContentTranslationSettingsTest extends WebTestBase {
   /**
    * Tests the language settings checkbox on account settings page.
    */
-  function testAccountLanguageSettingsUI() {
+  public function testAccountLanguageSettingsUI() {
     // Make sure the checkbox is available and not checked by default.
     $this->drupalGet('admin/config/people/accounts');
     $this->assertField('language[content_translation]');
     $this->assertNoFieldChecked('edit-language-content-translation');
 
-    $edit = array(
+    $edit = [
       'language[content_translation]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/config/people/accounts', $edit, t('Save configuration'));
     $this->drupalGet('admin/config/people/accounts');
     $this->assertFieldChecked('edit-language-content-translation');
 
     // Make sure account settings can be saved.
-    $this->drupalPostForm('admin/config/people/accounts', array('anonymous' => 'Save me please!'), 'Save configuration');
+    $this->drupalPostForm('admin/config/people/accounts', ['anonymous' => 'Save me please!'], 'Save configuration');
     $this->assertFieldByName('anonymous', 'Save me please!', 'Anonymous name has been changed.');
     $this->assertText('The configuration options have been saved.');
   }
@@ -236,7 +236,7 @@ class ContentTranslationSettingsTest extends WebTestBase {
    */
   protected function assertSettings($entity_type, $bundle, $enabled, $edit) {
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
-    $args = array('@entity_type' => $entity_type, '@bundle' => $bundle, '@enabled' => $enabled ? 'enabled' : 'disabled');
+    $args = ['@entity_type' => $entity_type, '@bundle' => $bundle, '@enabled' => $enabled ? 'enabled' : 'disabled'];
     $message = format_string('Translation for entity @entity_type (@bundle) is @enabled.', $args);
     \Drupal::entityManager()->clearCachedDefinitions();
     return $this->assertEqual(\Drupal::service('content_translation.manager')->isEnabled($entity_type, $bundle), $enabled, $message);
@@ -245,15 +245,15 @@ class ContentTranslationSettingsTest extends WebTestBase {
   /**
    * Tests that field setting depends on bundle translatability.
    */
-  function testFieldTranslatableSettingsUI() {
+  public function testFieldTranslatableSettingsUI() {
     // At least one field needs to be translatable to enable article for
     // translation. Create an extra field to be used for this purpose. We use
     // the UI to test our form alterations.
-    $edit = array(
+    $edit = [
       'new_storage_type' => 'text',
       'label' => 'Test',
       'field_name' => 'article_text',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/article/fields/add-field', $edit, 'Save and continue');
 
     // Tests that field doesn't have translatable setting if bundle is not
@@ -265,12 +265,12 @@ class ContentTranslationSettingsTest extends WebTestBase {
 
     // Tests that field has translatable setting if bundle is translatable.
     // Note: this field is not translatable when enable bundle translatability.
-    $edit = array(
+    $edit = [
       'entity_types[node]' => TRUE,
       'settings[node][article][settings][language][language_alterable]' => TRUE,
       'settings[node][article][translatable]' => TRUE,
       'settings[node][article][fields][field_article_text]' => TRUE,
-    );
+    ];
     $this->assertSettings('node', 'article', TRUE, $edit);
     $this->drupalGet($path);
     $this->assertFieldByXPath('//input[@id="edit-translatable" and not(@disabled) and @checked="checked"]');
@@ -280,7 +280,7 @@ class ContentTranslationSettingsTest extends WebTestBase {
   /**
    * Tests the translatable settings checkbox for untranslatable entities.
    */
-  function testNonTranslatableTranslationSettingsUI() {
+  public function testNonTranslatableTranslationSettingsUI() {
     $this->drupalGet('admin/config/regional/content-language');
     $this->assertNoField('settings[entity_test][entity_test][translatable]');
   }
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php b/web/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
index 5f881a710..30ff32de5 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
+++ b/web/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
@@ -33,7 +33,7 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'content_translation', 'entity_test', 'image', 'field_ui');
+  public static $modules = ['language', 'content_translation', 'entity_test', 'image', 'field_ui'];
 
   protected function setUp() {
     parent::setUp();
@@ -47,27 +47,27 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
     $this->fieldName = 'field_test_et_ui_image';
     $this->cardinality = 3;
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => $this->entityTypeId,
       'type' => 'image',
       'cardinality' => $this->cardinality,
-    ))->save();
+    ])->save();
 
     FieldConfig::create([
       'entity_type' => $this->entityTypeId,
       'field_name' => $this->fieldName,
       'bundle' => $this->entityTypeId,
       'label' => 'Test translatable image field',
-      'third_party_settings' => array(
-        'content_translation' => array(
-          'translation_sync' => array(
+      'third_party_settings' => [
+        'content_translation' => [
+          'translation_sync' => [
             'file' => FALSE,
             'alt' => 'alt',
             'title' => 'title',
-          ),
-        ),
-      ),
+          ],
+        ],
+      ],
     ])->save();
   }
 
@@ -76,22 +76,22 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
    */
   protected function getEditorPermissions() {
     // Every entity-type-specific test needs to define these.
-    return array('administer entity_test_mul fields', 'administer languages', 'administer content translation');
+    return ['administer entity_test_mul fields', 'administer languages', 'administer content translation'];
   }
 
   /**
    * Tests image field field synchronization.
    */
-  function testImageFieldSync() {
+  public function testImageFieldSync() {
     // Check that the alt and title fields are enabled for the image field.
     $this->drupalLogin($this->editor);
     $this->drupalGet('entity_test_mul/structure/' . $this->entityTypeId . '/fields/' . $this->entityTypeId . '.' . $this->entityTypeId . '.' . $this->fieldName);
     $this->assertFieldChecked('edit-third-party-settings-content-translation-translation-sync-alt');
     $this->assertFieldChecked('edit-third-party-settings-content-translation-translation-sync-title');
-    $edit = array(
+    $edit = [
       'third_party_settings[content_translation][translation_sync][alt]' => FALSE,
       'third_party_settings[content_translation][translation_sync][title]' => FALSE,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
 
     // Check that the content translation settings page reflects the changes
@@ -99,11 +99,11 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
     $this->drupalGet('admin/config/regional/content-language');
     $this->assertNoFieldChecked('edit-settings-entity-test-mul-entity-test-mul-columns-field-test-et-ui-image-alt');
     $this->assertNoFieldChecked('edit-settings-entity-test-mul-entity-test-mul-columns-field-test-et-ui-image-title');
-    $edit = array(
+    $edit = [
       'settings[entity_test_mul][entity_test_mul][fields][field_test_et_ui_image]' => TRUE,
       'settings[entity_test_mul][entity_test_mul][columns][field_test_et_ui_image][alt]' => TRUE,
       'settings[entity_test_mul][entity_test_mul][columns][field_test_et_ui_image][title]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
     $errors = $this->xpath('//div[contains(@class, "messages--error")]');
     $this->assertFalse($errors, 'Settings correctly stored.');
@@ -115,26 +115,26 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
     $langcode = $this->langcodes[1];
 
     // Populate the test entity with some random initial values.
-    $values = array(
+    $values = [
       'name' => $this->randomMachineName(),
       'user_id' => mt_rand(1, 128),
       'langcode' => $default_langcode,
-    );
+    ];
     $entity = entity_create($this->entityTypeId, $values);
 
     // Create some file entities from the generated test files and store them.
-    $values = array();
+    $values = [];
     for ($delta = 0; $delta < $this->cardinality; $delta++) {
       // For the default language use the same order for files and field items.
       $index = $delta;
 
       // Create the file entity for the image being processed and record its
       // identifier.
-      $field_values = array(
+      $field_values = [
         'uri' => $this->files[$index]->uri,
         'uid' => \Drupal::currentUser()->id(),
         'status' => FILE_STATUS_PERMANENT,
-      );
+      ];
       $file = File::create($field_values);
       $file->save();
       $fid = $file->id();
@@ -142,11 +142,11 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
 
       // Generate the item for the current image file entity and attach it to
       // the entity.
-      $item = array(
+      $item = [
         'target_id' => $fid,
         'alt' => $default_langcode . '_' . $fid . '_' . $this->randomMachineName(),
         'title' => $default_langcode . '_' . $fid . '_' . $this->randomMachineName(),
-      );
+      ];
       $entity->{$this->fieldName}[] = $item;
 
       // Store the generated values keying them by fid for easier lookup.
@@ -168,11 +168,11 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
       // Generate the item for the current image file entity and attach it to
       // the entity.
       $fid = $this->files[$index]->fid;
-      $item = array(
+      $item = [
         'target_id' => $fid,
         'alt' => $langcode . '_' . $fid . '_' . $this->randomMachineName(),
         'title' => $langcode . '_' . $fid . '_' . $this->randomMachineName(),
-      );
+      ];
       $translation->{$this->fieldName}[] = $item;
 
       // Again store the generated values keying them by fid for easier lookup.
@@ -191,25 +191,25 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
 
     // Check that fids have been synchronized and translatable column values
     // have been retained.
-    $fids = array();
+    $fids = [];
     foreach ($entity->{$this->fieldName} as $delta => $item) {
       $value = $values[$default_langcode][$item->target_id];
       $source_item = $translation->{$this->fieldName}->get($delta);
       $assert = $item->target_id == $source_item->target_id && $item->alt == $value['alt'] && $item->title == $value['title'];
-      $this->assertTrue($assert, format_string('Field item @fid has been successfully synchronized.', array('@fid' => $item->target_id)));
+      $this->assertTrue($assert, format_string('Field item @fid has been successfully synchronized.', ['@fid' => $item->target_id]));
       $fids[$item->target_id] = TRUE;
     }
 
     // Check that the dropped value is the right one.
     $removed_fid = $this->files[0]->fid;
-    $this->assertTrue(!isset($fids[$removed_fid]), format_string('Field item @fid has been correctly removed.', array('@fid' => $removed_fid)));
+    $this->assertTrue(!isset($fids[$removed_fid]), format_string('Field item @fid has been correctly removed.', ['@fid' => $removed_fid]));
 
     // Add back an item for the dropped value and perform synchronization again.
-    $values[$langcode][$removed_fid] = array(
+    $values[$langcode][$removed_fid] = [
       'target_id' => $removed_fid,
       'alt' => $langcode . '_' . $removed_fid . '_' . $this->randomMachineName(),
       'title' => $langcode . '_' . $removed_fid . '_' . $this->randomMachineName(),
-    );
+    ];
     $translation->{$this->fieldName}->setValue(array_values($values[$langcode]));
     $entity = $this->saveEntity($translation);
     $translation = $entity->getTranslation($langcode);
@@ -226,7 +226,7 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
       $value = $values[$fid_langcode][$item->target_id];
       $source_item = $translation->{$this->fieldName}->get($delta);
       $assert = $item->target_id == $source_item->target_id && $item->alt == $value['alt'] && $item->title == $value['title'];
-      $this->assertTrue($assert, format_string('Field item @fid has been successfully synchronized.', array('@fid' => $item->target_id)));
+      $this->assertTrue($assert, format_string('Field item @fid has been successfully synchronized.', ['@fid' => $item->target_id]));
     }
   }
 
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php b/web/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
index 5d9a8d0c5..a84bb73b8 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
+++ b/web/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
@@ -10,6 +10,9 @@ use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Base class for content translation tests.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\content_translation\Functional\ContentTranslationTestBase instead.
  */
 abstract class ContentTranslationTestBase extends WebTestBase {
 
@@ -18,7 +21,7 @@ abstract class ContentTranslationTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('text');
+  public static $modules = ['text'];
 
   /**
    * The entity type being tested.
@@ -102,7 +105,7 @@ abstract class ContentTranslationTestBase extends WebTestBase {
    * Adds additional languages.
    */
   protected function setupLanguages() {
-    $this->langcodes = array('it', 'fr');
+    $this->langcodes = ['it', 'fr'];
     foreach ($this->langcodes as $langcode) {
       ConfigurableLanguage::createFromLangcode($langcode)->save();
     }
@@ -113,7 +116,7 @@ abstract class ContentTranslationTestBase extends WebTestBase {
    * Returns an array of permissions needed for the translator.
    */
   protected function getTranslatorPermissions() {
-    return array_filter(array($this->getTranslatePermission(), 'create content translations', 'update content translations', 'delete content translations'));
+    return array_filter([$this->getTranslatePermission(), 'create content translations', 'update content translations', 'delete content translations']);
   }
 
   /**
@@ -131,14 +134,14 @@ abstract class ContentTranslationTestBase extends WebTestBase {
    */
   protected function getEditorPermissions() {
     // Every entity-type-specific test needs to define these.
-    return array();
+    return [];
   }
 
   /**
    * Returns an array of permissions needed for the administrator.
    */
   protected function getAdministratorPermissions() {
-    return array_merge($this->getEditorPermissions(), $this->getTranslatorPermissions(), array('administer content translation'));
+    return array_merge($this->getEditorPermissions(), $this->getTranslatorPermissions(), ['administer content translation']);
   }
 
   /**
@@ -180,12 +183,12 @@ abstract class ContentTranslationTestBase extends WebTestBase {
     if (empty($this->fieldName)) {
       $this->fieldName = 'field_test_et_ui_test';
     }
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'type' => 'string',
       'entity_type' => $this->entityTypeId,
       'cardinality' => 1,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => $this->entityTypeId,
       'field_name' => $this->fieldName,
@@ -193,10 +196,10 @@ abstract class ContentTranslationTestBase extends WebTestBase {
       'label' => 'Test translatable text-field',
     ])->save();
     entity_get_form_display($this->entityTypeId, $this->bundle, 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'string_textfield',
         'weight' => 0,
-      ))
+      ])
       ->save();
   }
 
@@ -225,7 +228,7 @@ abstract class ContentTranslationTestBase extends WebTestBase {
     if (!($controller instanceof SqlContentEntityStorage)) {
       foreach ($values as $property => $value) {
         if (is_array($value)) {
-          $entity_values[$property] = array($langcode => $value);
+          $entity_values[$property] = [$langcode => $value];
         }
       }
     }
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php b/web/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
index 3c50983cd..e7a7dfc9d 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
+++ b/web/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
@@ -3,6 +3,7 @@
 namespace Drupal\content_translation\Tests;
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Entity\EntityChangedInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
@@ -13,6 +14,9 @@ use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 
 /**
  * Tests the Content Translation UI.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\content_translation\Functional\ContentTranslationUITestBase instead.
  */
 abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
 
@@ -52,7 +56,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
   /**
    * Tests the basic translation UI.
    */
-  function testTranslationUI() {
+  public function testTranslationUI() {
     $this->doTestBasicTranslation();
     $this->doTestTranslationOverview();
     $this->doTestOutdatedStatus();
@@ -96,7 +100,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     foreach ($values[$default_langcode] as $property => $value) {
       $stored_value = $this->getValue($translation, $property, $default_langcode);
       $value = is_array($value) ? $value[0]['value'] : $value;
-      $message = format_string('@property correctly stored in the default language.', array('@property' => $property));
+      $message = format_string('@property correctly stored in the default language.', ['@property' => $property]);
       $this->assertEqual($stored_value, $value, $message);
     }
 
@@ -110,7 +114,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
       $entity->getEntityTypeId() => $entity->id(),
       'source' => $default_langcode,
       'target' => $langcode
-    ], array('language' => $language));
+    ], ['language' => $language]);
     $this->drupalPostForm($add_url, $this->getEditValues($values, $langcode), $this->getFormSubmitActionForNewTranslation($entity, $langcode));
 
     // Assert that HTML is escaped in "all languages" in UI after SafeMarkup
@@ -137,11 +141,11 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     $author_field_name = $entity->hasField('content_translation_uid') ? 'content_translation_uid' : 'uid';
     if ($entity->getFieldDefinition($author_field_name)->isTranslatable()) {
       $this->assertEqual($metadata_target_translation->getAuthor()->id(), $this->translator->id(),
-        SafeMarkup::format('Author of the target translation @langcode correctly stored for translatable owner field.', array('@langcode' => $langcode)));
+        SafeMarkup::format('Author of the target translation @langcode correctly stored for translatable owner field.', ['@langcode' => $langcode]));
 
       $this->assertNotEqual($metadata_target_translation->getAuthor()->id(), $metadata_source_translation->getAuthor()->id(),
         SafeMarkup::format('Author of the target translation @target different from the author of the source translation @source for translatable owner field.',
-          array('@target' => $langcode, '@source' => $default_langcode)));
+          ['@target' => $langcode, '@source' => $default_langcode]));
     }
     else {
       $this->assertEqual($metadata_target_translation->getAuthor()->id(), $this->editor->id(), 'Author of the entity remained untouched after translation for non translatable owner field.');
@@ -151,7 +155,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     if ($entity->getFieldDefinition($created_field_name)->isTranslatable()) {
       $this->assertTrue($metadata_target_translation->getCreatedTime() > $metadata_source_translation->getCreatedTime(),
         SafeMarkup::format('Translation creation timestamp of the target translation @target is newer than the creation timestamp of the source translation @source for translatable created field.',
-          array('@target' => $langcode, '@source' => $default_langcode)));
+          ['@target' => $langcode, '@source' => $default_langcode]));
     }
     else {
       $this->assertEqual($metadata_target_translation->getCreatedTime(), $metadata_source_translation->getCreatedTime(), 'Creation timestamp of the entity remained untouched after translation for non translatable created field.');
@@ -169,13 +173,13 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     $langcode = 'fr';
     $language = ConfigurableLanguage::load($langcode);
     $source_langcode = 'it';
-    $edit = array('source_langcode[source]' => $source_langcode);
+    $edit = ['source_langcode[source]' => $source_langcode];
     $entity_type_id = $entity->getEntityTypeId();
     $add_url = Url::fromRoute("entity.$entity_type_id.content_translation_add", [
       $entity->getEntityTypeId() => $entity->id(),
       'source' => $default_langcode,
       'target' => $langcode
-    ], array('language' => $language));
+    ], ['language' => $language]);
     // This does not save anything, it merely reloads the form and fills in the
     // fields with the values from the different source language.
     $this->drupalPostForm($add_url, $edit, t('Change'));
@@ -183,13 +187,13 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
 
     // Add another translation and mark the other ones as outdated.
     $values[$langcode] = $this->getNewEntityValues($langcode);
-    $edit = $this->getEditValues($values, $langcode) + array('content_translation[retranslate]' => TRUE);
+    $edit = $this->getEditValues($values, $langcode) + ['content_translation[retranslate]' => TRUE];
     $entity_type_id = $entity->getEntityTypeId();
     $add_url = Url::fromRoute("entity.$entity_type_id.content_translation_add", [
       $entity->getEntityTypeId() => $entity->id(),
       'source' => $source_langcode,
       'target' => $langcode
-    ], array('language' => $language));
+    ], ['language' => $language]);
     $this->drupalPostForm($add_url, $edit, $this->getFormSubmitActionForNewTranslation($entity, $langcode));
     $storage->resetCache([$this->entityId]);
     $entity = $storage->load($this->entityId);
@@ -202,7 +206,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
       foreach ($property_values as $property => $value) {
         $stored_value = $this->getValue($translation, $property, $langcode);
         $value = is_array($value) ? $value[0]['value'] : $value;
-        $message = format_string('%property correctly stored with language %language.', array('%property' => $property, '%language' => $langcode));
+        $message = format_string('%property correctly stored with language %language.', ['%property' => $property, '%language' => $langcode]);
         $this->assertEqual($stored_value, $value, $message);
       }
     }
@@ -222,13 +226,13 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
 
     foreach ($this->langcodes as $langcode) {
       if ($entity->hasTranslation($langcode)) {
-        $language = new Language(array('id' => $langcode));
+        $language = new Language(['id' => $langcode]);
         $view_url = $entity->url('canonical', ['language' => $language]);
         $elements = $this->xpath('//table//a[@href=:href]', [':href' => $view_url]);
-        $this->assertEqual((string) $elements[0], $entity->getTranslation($langcode)->label(), format_string('Label correctly shown for %language translation.', array('%language' => $langcode)));
-        $edit_path = $entity->url('edit-form', array('language' => $language));
-        $elements = $this->xpath('//table//ul[@class="dropbutton"]/li/a[@href=:href]', array(':href' => $edit_path));
-        $this->assertEqual((string) $elements[0], t('Edit'), format_string('Edit link correct for %language translation.', array('%language' => $langcode)));
+        $this->assertEqual((string) $elements[0], $entity->getTranslation($langcode)->label(), format_string('Label correctly shown for %language translation.', ['%language' => $langcode]));
+        $edit_path = $entity->url('edit-form', ['language' => $language]);
+        $elements = $this->xpath('//table//ul[@class="dropbutton"]/li/a[@href=:href]', [':href' => $edit_path]);
+        $this->assertEqual((string) $elements[0], t('Edit'), format_string('Edit link correct for %language translation.', ['%language' => $langcode]));
       }
     }
   }
@@ -245,8 +249,8 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     $languages = \Drupal::languageManager()->getLanguages();
 
     // Mark translations as outdated.
-    $edit = array('content_translation[retranslate]' => TRUE);
-    $edit_path = $entity->urlInfo('edit-form', array('language' => $languages[$langcode]));
+    $edit = ['content_translation[retranslate]' => TRUE];
+    $edit_path = $entity->urlInfo('edit-form', ['language' => $languages[$langcode]]);
     $this->drupalPostForm($edit_path, $edit, $this->getFormSubmitAction($entity, $langcode));
     $storage->resetCache([$this->entityId]);
     $entity = $storage->load($this->entityId);
@@ -254,7 +258,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     // Check that every translation has the correct "outdated" status, and that
     // the Translation fieldset is open if the translation is "outdated".
     foreach ($this->langcodes as $added_langcode) {
-      $url = $entity->urlInfo('edit-form', array('language' => ConfigurableLanguage::load($added_langcode)));
+      $url = $entity->urlInfo('edit-form', ['language' => ConfigurableLanguage::load($added_langcode)]);
       $this->drupalGet($url);
       if ($added_langcode == $langcode) {
         $this->assertFieldByXPath('//input[@name="content_translation[retranslate]"]', FALSE, 'The retranslate flag is not checked by default.');
@@ -263,7 +267,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
       else {
         $this->assertFieldByXPath('//input[@name="content_translation[outdated]"]', TRUE, 'The translate flag is checked by default.');
         $this->assertTrue($this->xpath('//details[@id="edit-content-translation" and @open="open"]'), 'The translation tab is correctly expanded when the translation is outdated.');
-        $edit = array('content_translation[outdated]' => FALSE);
+        $edit = ['content_translation[outdated]' => FALSE];
         $this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $added_langcode));
         $this->drupalGet($url);
         $this->assertFieldByXPath('//input[@name="content_translation[retranslate]"]', FALSE, 'The retranslate flag is now shown.');
@@ -288,8 +292,8 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     // Unpublish translations.
     foreach ($this->langcodes as $index => $langcode) {
       if ($index > 0) {
-        $url = $entity->urlInfo('edit-form', array('language' => ConfigurableLanguage::load($langcode)));
-        $edit = array('content_translation[status]' => FALSE);
+        $url = $entity->urlInfo('edit-form', ['language' => ConfigurableLanguage::load($langcode)]);
+        $edit = ['content_translation[status]' => FALSE];
         $this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $langcode));
         $storage = $this->container->get('entity_type.manager')
           ->getStorage($this->entityTypeId);
@@ -312,20 +316,20 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
       ->getStorage($this->entityTypeId);
     $storage->resetCache([$this->entityId]);
     $entity = $storage->load($this->entityId);
-    $values = array();
+    $values = [];
 
     // Post different authoring information for each translation.
     foreach ($this->langcodes as $index => $langcode) {
       $user = $this->drupalCreateUser();
-      $values[$langcode] = array(
+      $values[$langcode] = [
         'uid' => $user->id(),
         'created' => REQUEST_TIME - mt_rand(0, 1000),
-      );
-      $edit = array(
+      ];
+      $edit = [
         'content_translation[uid]' => $user->getUsername(),
         'content_translation[created]' => format_date($values[$langcode]['created'], 'custom', 'Y-m-d H:i:s O'),
-      );
-      $url = $entity->urlInfo('edit-form', array('language' => ConfigurableLanguage::load($langcode)));
+      ];
+      $url = $entity->urlInfo('edit-form', ['language' => ConfigurableLanguage::load($langcode)]);
       $this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $langcode));
     }
 
@@ -341,11 +345,11 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
 
     // Try to post non valid values and check that they are rejected.
     $langcode = 'en';
-    $edit = array(
+    $edit = [
       // User names have by default length 8.
       'content_translation[uid]' => $this->randomMachineName(12),
       'content_translation[created]' => '19/11/1978',
-    );
+    ];
     $this->drupalPostForm($entity->urlInfo('edit-form'), $edit, $this->getFormSubmitAction($entity, $langcode));
     $this->assertTrue($this->xpath('//div[contains(@class, "error")]//ul'), 'Invalid values generate a list of form errors.');
     $metadata = $this->manager->getTranslationMetadata($entity->getTranslation($langcode));
@@ -365,9 +369,9 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     $storage->resetCache([$this->entityId]);
     $entity = $storage->load($this->entityId);
     $language = ConfigurableLanguage::load($langcode);
-    $url = $entity->urlInfo('edit-form', array('language' => $language));
-    $this->drupalPostForm($url, array(), t('Delete translation'));
-    $this->drupalPostForm(NULL, array(), t('Delete @language translation', array('@language' => $language->getName())));
+    $url = $entity->urlInfo('edit-form', ['language' => $language]);
+    $this->drupalPostForm($url, [], t('Delete translation'));
+    $this->drupalPostForm(NULL, [], t('Delete @language translation', ['@language' => $language->getName()]));
     $storage->resetCache([$this->entityId]);
     $entity = $storage->load($this->entityId, TRUE);
     if ($this->assertTrue(is_object($entity), 'Entity found')) {
@@ -385,7 +389,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
    * Returns an array of entity field values to be tested.
    */
   protected function getNewEntityValues($langcode) {
-    return array($this->fieldName => array(array('value' => $this->randomMachineName(16))));
+    return [$this->fieldName => [['value' => $this->randomMachineName(16)]]];
   }
 
   /**
@@ -508,7 +512,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     foreach ($this->langcodes as $langcode) {
       // We only want to test the title for non-english translations.
       if ($langcode != 'en') {
-        $options = array('language' => $languages[$langcode]);
+        $options = ['language' => $languages[$langcode]];
         $url = $entity->urlInfo('edit-form', $options);
         $this->drupalGet($url);
 
@@ -551,10 +555,10 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
 
         $langcode = $language->getId();
 
-        $edit = array(
+        $edit = [
           $this->fieldName . '[0][value]' => $this->randomString(),
-        );
-        $edit_path = $entity->urlInfo('edit-form', array('language' => $language));
+        ];
+        $edit_path = $entity->urlInfo('edit-form', ['language' => $language]);
         $this->drupalPostForm($edit_path, $edit, $this->getFormSubmitAction($entity, $langcode));
 
         $storage = $this->container->get('entity_type.manager')
@@ -563,11 +567,11 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
         $entity = $storage->load($this->entityId);
         $this->assertEqual(
           $entity->getChangedTimeAcrossTranslations(), $entity->getTranslation($langcode)->getChangedTime(),
-          format_string('Changed time for language %language is the latest change over all languages.', array('%language' => $language->getName()))
+          format_string('Changed time for language %language is the latest change over all languages.', ['%language' => $language->getName()])
         );
       }
 
-      $timestamps = array();
+      $timestamps = [];
       foreach ($entity->getTranslationLanguages() as $language) {
         $next_timestamp = $entity->getTranslation($language->getId())->getChangedTime();
         if (!in_array($next_timestamp, $timestamps)) {
@@ -599,7 +603,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     $storage->resetCache([$this->entityId]);
     $entity = $storage->load($this->entityId);
     // Test only entities, which implement the EntityChangedInterface.
-    if ($entity->getEntityType()->isSubclassOf('Drupal\Core\Entity\EntityChangedInterface')) {
+    if ($entity instanceof EntityChangedInterface) {
       $changed_timestamp = $entity->getChangedTime();
 
       $entity->save();
@@ -614,7 +618,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
 
       // Save the entity on the regular edit form.
       $language = $entity->language();
-      $edit_path = $entity->urlInfo('edit-form', array('language' => $language));
+      $edit_path = $entity->urlInfo('edit-form', ['language' => $language]);
       $this->drupalPostForm($edit_path, [], $this->getFormSubmitAction($entity, $language->getId()));
 
       $storage->resetCache([$this->entityId]);
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php b/web/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php
index b1524eea1..66469ebb4 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php
+++ b/web/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php
@@ -26,7 +26,7 @@ class ContentTranslationWorkflowsTest extends ContentTranslationTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'content_translation', 'entity_test');
+  public static $modules = ['language', 'content_translation', 'entity_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -47,7 +47,7 @@ class ContentTranslationWorkflowsTest extends ContentTranslationTestBase {
    * {@inheritdoc}
    */
   protected function getEditorPermissions() {
-    return array('administer entity_test content');
+    return ['administer entity_test content'];
   }
 
   /**
@@ -58,11 +58,11 @@ class ContentTranslationWorkflowsTest extends ContentTranslationTestBase {
 
     // Create a test entity.
     $user = $this->drupalCreateUser();
-    $values = array(
+    $values = [
       'name' => $this->randomMachineName(),
       'user_id' => $user->id(),
-      $this->fieldName => array(array('value' => $this->randomMachineName(16))),
-    );
+      $this->fieldName => [['value' => $this->randomMachineName(16)]],
+    ];
     $id = $this->createEntity($values, $default_langcode);
     $storage = $this->container->get('entity_type.manager')
       ->getStorage($this->entityTypeId);
@@ -72,14 +72,14 @@ class ContentTranslationWorkflowsTest extends ContentTranslationTestBase {
     // Create a translation.
     $this->drupalLogin($this->translator);
     $add_translation_url = Url::fromRoute("entity.$this->entityTypeId.content_translation_add", [$this->entityTypeId => $this->entity->id(), 'source' => $default_langcode, 'target' => $this->langcodes[2]]);
-    $this->drupalPostForm($add_translation_url, array(), t('Save'));
+    $this->drupalPostForm($add_translation_url, [], t('Save'));
     $this->rebuildContainer();
   }
 
   /**
    * Test simple and editorial translation workflows.
    */
-  function testWorkflows() {
+  public function testWorkflows() {
     // Test workflows for the editor.
     $expected_status = [
       'edit' => 200,
@@ -114,10 +114,10 @@ class ContentTranslationWorkflowsTest extends ContentTranslationTestBase {
     $this->doTestWorkflows($this->administrator, $expected_status);
 
     // Check that translation permissions allow the associated operations.
-    $ops = array('create' => t('Add'), 'update' => t('Edit'), 'delete' => t('Delete'));
+    $ops = ['create' => t('Add'), 'update' => t('Edit'), 'delete' => t('Delete')];
     $translations_url = $this->entity->urlInfo('drupal:content-translation-overview');
     foreach ($ops as $current_op => $item) {
-      $user = $this->drupalCreateUser(array($this->getTranslatePermission(), "$current_op content translations", 'view test entity'));
+      $user = $this->drupalCreateUser([$this->getTranslatePermission(), "$current_op content translations", 'view test entity']);
       $this->drupalLogin($user);
       $this->drupalGet($translations_url);
 
@@ -130,10 +130,10 @@ class ContentTranslationWorkflowsTest extends ContentTranslationTestBase {
 
       foreach ($ops as $op => $label) {
         if ($op != $current_op) {
-          $this->assertNoLink($label, format_string('No %op link found.', array('%op' => $label)));
+          $this->assertNoLink($label, format_string('No %op link found.', ['%op' => $label]));
         }
         else {
-          $this->assertLink($label, 0, format_string('%op link found.', array('%op' => $label)));
+          $this->assertLink($label, 0, format_string('%op link found.', ['%op' => $label]));
         }
       }
     }
diff --git a/web/core/modules/content_translation/src/Tests/Views/ContentTranslationViewsUITest.php b/web/core/modules/content_translation/src/Tests/Views/ContentTranslationViewsUITest.php
index 36d880edf..07b5d00b0 100644
--- a/web/core/modules/content_translation/src/Tests/Views/ContentTranslationViewsUITest.php
+++ b/web/core/modules/content_translation/src/Tests/Views/ContentTranslationViewsUITest.php
@@ -16,21 +16,21 @@ class ContentTranslationViewsUITest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('content_translation');
+  public static $modules = ['content_translation'];
 
   /**
    * Tests the views UI.
    */
   public function testViewsUI() {
     $this->drupalGet('admin/structure/views/view/test_view/edit');
-    $this->assertTitle(t('@label (@table) | @site-name', array('@label' => 'Test view', '@table' => 'Views test data', '@site-name' => $this->config('system.site')->get('name'))));
+    $this->assertTitle(t('@label (@table) | @site-name', ['@label' => 'Test view', '@table' => 'Views test data', '@site-name' => $this->config('system.site')->get('name')]));
   }
 
 }
diff --git a/web/core/modules/content_translation/src/Tests/Views/TranslationLinkTest.php b/web/core/modules/content_translation/src/Tests/Views/TranslationLinkTest.php
index 4f5389568..23c74a40f 100644
--- a/web/core/modules/content_translation/src/Tests/Views/TranslationLinkTest.php
+++ b/web/core/modules/content_translation/src/Tests/Views/TranslationLinkTest.php
@@ -20,14 +20,14 @@ class TranslationLinkTest extends ContentTranslationTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_entity_translations_link');
+  public static $testViews = ['test_entity_translations_link'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('content_translation_test_views');
+  public static $modules = ['content_translation_test_views'];
 
   protected function setUp() {
     // @todo Use entity_type once it is has multilingual Views integration.
@@ -45,7 +45,7 @@ class TranslationLinkTest extends ContentTranslationTestBase {
     $user->langcode = Language::LANGCODE_NOT_SPECIFIED;
     $user->save();
 
-    ViewTestData::createTestViews(get_class($this), array('content_translation_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['content_translation_test_views']);
   }
 
   /**
diff --git a/web/core/modules/content_translation/tests/modules/content_translation_test/content_translation_test.module b/web/core/modules/content_translation/tests/modules/content_translation_test/content_translation_test.module
new file mode 100644
index 000000000..d07549da0
--- /dev/null
+++ b/web/core/modules/content_translation/tests/modules/content_translation_test/content_translation_test.module
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @file
+ * Helper module for the Content Translation tests.
+ */
+
+use \Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Implements hook_form_BASE_FORM_ID_alter().
+ *
+ * Adds a textfield to node forms based on a request parameter.
+ */
+function content_translation_test_form_node_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+  $langcode = $form_state->getFormObject()->getFormLangcode($form_state);
+  if (in_array($langcode, ['en', 'fr']) && \Drupal::request()->get('test_field_only_en_fr')) {
+    $form['test_field_only_en_fr'] = [
+      '#type' => 'textfield',
+      '#title' => 'Field only available on the english and french form',
+    ];
+
+    foreach (array_keys($form['actions']) as $action) {
+      if ($action != 'preview' && isset($form['actions'][$action]['#type']) && $form['actions'][$action]['#type'] === 'submit') {
+        $form['actions'][$action]['#submit'][] = 'content_translation_test_form_node_form_submit';
+      }
+    }
+  }
+}
+
+/**
+ * Form submission handler for custom field added based on a request parameter.
+ *
+ * @see content_translation_test_form_node_article_form_alter()
+ */
+function content_translation_test_form_node_form_submit($form, FormStateInterface $form_state) {
+  \Drupal::state()->set('test_field_only_en_fr', $form_state->getValue('test_field_only_en_fr'));
+}
diff --git a/web/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php b/web/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php
index 6a9f878f1..d84257a88 100644
--- a/web/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php
+++ b/web/core/modules/content_translation/tests/modules/content_translation_test/src/Entity/EntityTestTranslatableNoUISkip.php
@@ -10,6 +10,14 @@ use Drupal\entity_test\Entity\EntityTest;
  * @ContentEntityType(
  *   id = "entity_test_translatable_no_skip",
  *   label = @Translation("Test entity - Translatable check UI"),
+ *   handlers = {
+ *     "form" = {
+ *       "default" = "Drupal\entity_test\EntityTestForm",
+ *      },
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
+ *     },
+ *   },
  *   base_table = "entity_test_mul",
  *   data_table = "entity_test_mul_property_data",
  *   entity_keys = {
@@ -20,6 +28,10 @@ use Drupal\entity_test\Entity\EntityTest;
  *     "langcode" = "langcode",
  *   },
  *   translatable = TRUE,
+ *   admin_permission = "administer entity_test content",
+ *   links = {
+ *     "edit-form" = "/entity_test_translatable_no_skip/{entity_test_translatable_no_skip}/edit",
+ *   },
  * )
  */
 class EntityTestTranslatableNoUISkip extends EntityTest {
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
similarity index 67%
rename from web/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php
rename to web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
index 03f30a19c..163b5e8ff 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the content translation behaviours on entity bundle UI.
  *
  * @group content_translation
  */
-class ContentTranslationEntityBundleUITest extends WebTestBase {
+class ContentTranslationEntityBundleUITest extends BrowserTestBase {
 
-  public static $modules = array('language', 'content_translation', 'node', 'comment', 'field_ui');
+  public static $modules = ['language', 'content_translation', 'node', 'comment', 'field_ui'];
 
   protected function setUp() {
     parent::setUp();
-    $user = $this->drupalCreateUser(array('access administration pages', 'administer languages', 'administer content translation', 'administer content types'));
+    $user = $this->drupalCreateUser(['access administration pages', 'administer languages', 'administer content translation', 'administer content types']);
     $this->drupalLogin($user);
   }
 
@@ -24,9 +24,9 @@ class ContentTranslationEntityBundleUITest extends WebTestBase {
    */
   public function testContentTypeUI() {
     // Create first content type.
-    $this->drupalCreateContentType(array('type' => 'article'));
+    $this->drupalCreateContentType(['type' => 'article']);
     // Enable content translation.
-    $edit = array('language_configuration[content_translation]' => TRUE);
+    $edit = ['language_configuration[content_translation]' => TRUE];
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, 'Save content type');
 
     // Make sure add page does not inherit translation configuration from first
@@ -35,11 +35,11 @@ class ContentTranslationEntityBundleUITest extends WebTestBase {
     $this->assertNoFieldChecked('edit-language-configuration-content-translation');
 
     // Create second content type and set content translation.
-    $edit = array(
+    $edit = [
       'name' => 'Page',
       'type' => 'page',
       'language_configuration[content_translation]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/add', $edit, 'Save and manage fields');
 
     // Make sure the settings are saved when creating the content type.
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
new file mode 100644
index 000000000..8ea652e95
--- /dev/null
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace Drupal\Tests\content_translation\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\entity_test\Entity\EntityTestMul;
+use Drupal\content_translation_test\Entity\EntityTestTranslatableNoUISkip;
+
+/**
+ * Tests whether canonical link tags are present for content entities.
+ *
+ * @group content_translation
+ */
+class ContentTranslationLinkTagTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test', 'content_translation', 'content_translation_test', 'language'];
+
+  /**
+   * The added languages.
+   *
+   * @var string[]
+   */
+  protected $langcodes;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Set up user.
+    $user = $this->drupalCreateUser([
+      'view test entity',
+      'view test entity translations',
+      'administer entity_test content',
+    ]);
+    $this->drupalLogin($user);
+
+    // Add additional languages.
+    $this->langcodes = ['it', 'fr'];
+    foreach ($this->langcodes as $langcode) {
+      ConfigurableLanguage::createFromLangcode($langcode)->save();
+    }
+
+    // Rebuild the container so that the new languages are picked up by services
+    // that hold a list of languages.
+    $this->rebuildContainer();
+  }
+
+  /**
+   * Create a test entity with translations.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface
+   *   An entity with translations.
+   */
+  protected function createTranslatableEntity() {
+    $entity = EntityTestMul::create(['label' => $this->randomString()]);
+
+    // Create translations for non default languages.
+    foreach ($this->langcodes as $langcode) {
+      $entity->addTranslation($langcode, ['label' => $this->randomString()]);
+    }
+    $entity->save();
+
+    return $entity;
+  }
+
+  /**
+   * Tests alternate link tag found for entity types with canonical links.
+   */
+  public function testCanonicalAlternateTags() {
+    /** @var \Drupal\Core\Language\LanguageManagerInterface $languageManager */
+    $languageManager = $this->container->get('language_manager');
+    /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager */
+    $entityTypeManager = $this->container->get('entity_type.manager');
+
+    $definition = $entityTypeManager->getDefinition('entity_test_mul');
+    $this->assertTrue($definition->hasLinkTemplate('canonical'), 'Canonical link template found for entity_test.');
+
+    $entity = $this->createTranslatableEntity();
+    $url_base = $entity->toUrl('canonical')
+      ->setAbsolute();
+
+    $langcodes_all = $this->langcodes;
+    $langcodes_all[] = $languageManager
+      ->getDefaultLanguage()
+      ->getId();
+
+    /** @var \Drupal\Core\Url[] $urls */
+    $urls = array_map(
+      function ($langcode) use ($url_base, $languageManager) {
+        $url = clone $url_base;
+        return $url
+          ->setOption('language', $languageManager->getLanguage($langcode));
+      },
+      array_combine($langcodes_all, $langcodes_all)
+    );
+
+    // Ensure link tags for all languages are found on each language variation
+    // page of an entity.
+    foreach ($urls as $langcode => $url) {
+      $this->drupalGet($url);
+      foreach ($urls as $langcode_alternate => $url_alternate) {
+        $args = [':href' => $url_alternate->toString(), ':hreflang' => $langcode_alternate];
+        $links = $this->xpath('head/link[@rel = "alternate" and @href = :href and @hreflang = :hreflang]', $args);
+        $message = sprintf('The "%s" translation has the correct alternate hreflang link for "%s": %s.', $langcode, $langcode_alternate, $url->toString());
+        $this->assertTrue(isset($links[0]), $message);
+      }
+    }
+  }
+
+  /**
+   * Tests alternate link tag missing for entity types without canonical links.
+   */
+  public function testCanonicalAlternateTagsMissing() {
+    /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager */
+    $entityTypeManager = $this->container->get('entity_type.manager');
+
+    $definition = $entityTypeManager->getDefinition('entity_test_translatable_no_skip');
+    // Ensure 'canonical' link template does not exist, in case it is added in
+    // the future.
+    $this->assertFalse($definition->hasLinkTemplate('canonical'), 'Canonical link template does not exist for entity_test_translatable_no_skip entity.');
+
+    $entity = EntityTestTranslatableNoUISkip::create();
+    $entity->save();
+    $this->drupalGet($entity->toUrl('edit-form'));
+
+    $this->assertSession()->statusCodeEquals(200);
+    $result = $this->xpath('//link[@rel="alternate" and @hreflang]');
+    $this->assertFalse($result, 'No alternate link tag found.');
+  }
+
+}
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationMetadataFieldsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationMetadataFieldsTest.php
similarity index 97%
rename from web/core/modules/content_translation/src/Tests/ContentTranslationMetadataFieldsTest.php
rename to web/core/modules/content_translation/tests/src/Functional/ContentTranslationMetadataFieldsTest.php
index a45fda42d..bbad25ca9 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationMetadataFieldsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationMetadataFieldsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 /**
  * Tests the Content Translation metadata fields handling.
@@ -28,7 +28,7 @@ class ContentTranslationMetadataFieldsTest extends ContentTranslationTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'content_translation', 'node');
+  public static $modules = ['language', 'content_translation', 'node'];
 
   /**
    * The profile to install as a basis for testing.
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationOperationsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
similarity index 98%
rename from web/core/modules/content_translation/src/Tests/ContentTranslationOperationsTest.php
rename to web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
index 90449da84..611d5d988 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationOperationsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Tests\NodeTestBase;
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationStandardFieldsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationStandardFieldsTest.php
similarity index 89%
rename from web/core/modules/content_translation/src/Tests/ContentTranslationStandardFieldsTest.php
rename to web/core/modules/content_translation/tests/src/Functional/ContentTranslationStandardFieldsTest.php
index 8d2ec1368..c6a72a325 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationStandardFieldsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationStandardFieldsTest.php
@@ -1,29 +1,29 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the Content translation settings using the standard profile.
  *
  * @group content_translation
  */
-class ContentTranslationStandardFieldsTest extends WebTestBase {
+class ContentTranslationStandardFieldsTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'language',
     'content_translation',
     'node',
     'comment',
     'field_ui',
     'entity_test',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -36,7 +36,7 @@ class ContentTranslationStandardFieldsTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'access administration pages',
       'administer languages',
       'administer content translation',
@@ -45,7 +45,7 @@ class ContentTranslationStandardFieldsTest extends WebTestBase {
       'administer comment fields',
       'administer comments',
       'administer comment types',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
   }
 
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationTestBase.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationTestBase.php
new file mode 100644
index 000000000..ec7f87dd1
--- /dev/null
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationTestBase.php
@@ -0,0 +1,239 @@
+<?php
+
+namespace Drupal\Tests\content_translation\Functional;
+
+use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Base class for content translation tests.
+ */
+abstract class ContentTranslationTestBase extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['text'];
+
+  /**
+   * The entity type being tested.
+   *
+   * @var string
+   */
+  protected $entityTypeId = 'entity_test_mul';
+
+  /**
+   * The bundle being tested.
+   *
+   * @var string
+   */
+  protected $bundle;
+
+  /**
+   * The added languages.
+   *
+   * @var array
+   */
+  protected $langcodes;
+
+  /**
+   * The account to be used to test translation operations.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $translator;
+
+  /**
+   * The account to be used to test multilingual entity editing.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $editor;
+
+  /**
+   * The account to be used to test access to both workflows.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $administrator;
+
+  /**
+   * The name of the field used to test translation.
+   *
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * The translation controller for the current entity type.
+   *
+   * @var \Drupal\content_translation\ContentTranslationHandlerInterface
+   */
+  protected $controller;
+
+  /**
+   * @var \Drupal\content_translation\ContentTranslationManagerInterface
+   */
+  protected $manager;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->setupLanguages();
+    $this->setupBundle();
+    $this->enableTranslation();
+    $this->setupUsers();
+    $this->setupTestFields();
+
+    $this->manager = $this->container->get('content_translation.manager');
+    $this->controller = $this->manager->getTranslationHandler($this->entityTypeId);
+
+    // Rebuild the container so that the new languages are picked up by services
+    // that hold a list of languages.
+    $this->rebuildContainer();
+  }
+
+  /**
+   * Adds additional languages.
+   */
+  protected function setupLanguages() {
+    $this->langcodes = ['it', 'fr'];
+    foreach ($this->langcodes as $langcode) {
+      ConfigurableLanguage::createFromLangcode($langcode)->save();
+    }
+    array_unshift($this->langcodes, \Drupal::languageManager()->getDefaultLanguage()->getId());
+  }
+
+  /**
+   * Returns an array of permissions needed for the translator.
+   */
+  protected function getTranslatorPermissions() {
+    return array_filter([$this->getTranslatePermission(), 'create content translations', 'update content translations', 'delete content translations']);
+  }
+
+  /**
+   * Returns the translate permissions for the current entity and bundle.
+   */
+  protected function getTranslatePermission() {
+    $entity_type = \Drupal::entityManager()->getDefinition($this->entityTypeId);
+    if ($permission_granularity = $entity_type->getPermissionGranularity()) {
+      return $permission_granularity == 'bundle' ? "translate {$this->bundle} {$this->entityTypeId}" : "translate {$this->entityTypeId}";
+    }
+  }
+
+  /**
+   * Returns an array of permissions needed for the editor.
+   */
+  protected function getEditorPermissions() {
+    // Every entity-type-specific test needs to define these.
+    return [];
+  }
+
+  /**
+   * Returns an array of permissions needed for the administrator.
+   */
+  protected function getAdministratorPermissions() {
+    return array_merge($this->getEditorPermissions(), $this->getTranslatorPermissions(), ['administer content translation']);
+  }
+
+  /**
+   * Creates and activates translator, editor and admin users.
+   */
+  protected function setupUsers() {
+    $this->translator = $this->drupalCreateUser($this->getTranslatorPermissions(), 'translator');
+    $this->editor = $this->drupalCreateUser($this->getEditorPermissions(), 'editor');
+    $this->administrator = $this->drupalCreateUser($this->getAdministratorPermissions(), 'administrator');
+    $this->drupalLogin($this->translator);
+  }
+
+  /**
+   * Creates or initializes the bundle date if needed.
+   */
+  protected function setupBundle() {
+    if (empty($this->bundle)) {
+      $this->bundle = $this->entityTypeId;
+    }
+  }
+
+  /**
+   * Enables translation for the current entity type and bundle.
+   */
+  protected function enableTranslation() {
+    // Enable translation for the current entity type and ensure the change is
+    // picked up.
+    \Drupal::service('content_translation.manager')->setEnabled($this->entityTypeId, $this->bundle, TRUE);
+    drupal_static_reset();
+    \Drupal::entityManager()->clearCachedDefinitions();
+    \Drupal::service('router.builder')->rebuild();
+    \Drupal::service('entity.definition_update_manager')->applyUpdates();
+  }
+
+  /**
+   * Creates the test fields.
+   */
+  protected function setupTestFields() {
+    if (empty($this->fieldName)) {
+      $this->fieldName = 'field_test_et_ui_test';
+    }
+    FieldStorageConfig::create([
+      'field_name' => $this->fieldName,
+      'type' => 'string',
+      'entity_type' => $this->entityTypeId,
+      'cardinality' => 1,
+    ])->save();
+    FieldConfig::create([
+      'entity_type' => $this->entityTypeId,
+      'field_name' => $this->fieldName,
+      'bundle' => $this->bundle,
+      'label' => 'Test translatable text-field',
+    ])->save();
+    entity_get_form_display($this->entityTypeId, $this->bundle, 'default')
+      ->setComponent($this->fieldName, [
+        'type' => 'string_textfield',
+        'weight' => 0,
+      ])
+      ->save();
+  }
+
+  /**
+   * Creates the entity to be translated.
+   *
+   * @param array $values
+   *   An array of initial values for the entity.
+   * @param string $langcode
+   *   The initial language code of the entity.
+   * @param string $bundle_name
+   *   (optional) The entity bundle, if the entity uses bundles. Defaults to
+   *   NULL. If left NULL, $this->bundle will be used.
+   *
+   * @return string
+   *   The entity id.
+   */
+  protected function createEntity($values, $langcode, $bundle_name = NULL) {
+    $entity_values = $values;
+    $entity_values['langcode'] = $langcode;
+    $entity_type = \Drupal::entityManager()->getDefinition($this->entityTypeId);
+    if ($bundle_key = $entity_type->getKey('bundle')) {
+      $entity_values[$bundle_key] = $bundle_name ?: $this->bundle;
+    }
+    $controller = $this->container->get('entity.manager')->getStorage($this->entityTypeId);
+    if (!($controller instanceof SqlContentEntityStorage)) {
+      foreach ($values as $property => $value) {
+        if (is_array($value)) {
+          $entity_values[$property] = [$langcode => $value];
+        }
+      }
+    }
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId)
+      ->create($entity_values);
+    $entity->save();
+    return $entity->id();
+  }
+
+}
diff --git a/web/core/modules/content_translation/src/Tests/ContentTranslationUISkipTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUISkipTest.php
similarity index 68%
rename from web/core/modules/content_translation/src/Tests/ContentTranslationUISkipTest.php
rename to web/core/modules/content_translation/tests/src/Functional/ContentTranslationUISkipTest.php
index 2f8be234f..77c176e78 100644
--- a/web/core/modules/content_translation/src/Tests/ContentTranslationUISkipTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUISkipTest.php
@@ -1,32 +1,32 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the content translation UI check skip.
  *
  * @group content_translation
  */
-class ContentTranslationUISkipTest extends WebTestBase {
+class ContentTranslationUISkipTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('content_translation_test', 'user', 'node');
+  public static $modules = ['content_translation_test', 'user', 'node'];
 
   /**
    * Tests the content_translation_ui_skip key functionality.
    */
-  function testUICheckSkip() {
-    $admin_user = $this->drupalCreateUser(array(
+  public function testUICheckSkip() {
+    $admin_user = $this->drupalCreateUser([
       'translate any entity',
       'administer content translation',
       'administer languages'
-    ));
+    ]);
     $this->drupalLogin($admin_user);
     // Visit the content translation.
     $this->drupalGet('admin/config/regional/content-language');
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
new file mode 100644
index 000000000..370a6ed40
--- /dev/null
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
@@ -0,0 +1,627 @@
+<?php
+
+namespace Drupal\Tests\content_translation\Functional;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Entity\EntityChangedInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Language\Language;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Url;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+
+/**
+ * Tests the Content Translation UI.
+ */
+abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
+
+  use AssertPageCacheContextsAndTagsTrait;
+
+  /**
+   * The id of the entity being translated.
+   *
+   * @var mixed
+   */
+  protected $entityId;
+
+  /**
+   * Whether the behavior of the language selector should be tested.
+   *
+   * @var bool
+   */
+  protected $testLanguageSelector = TRUE;
+
+  /**
+   * Flag that tells whether the HTML escaping of all languages works or not
+   * after SafeMarkup change.
+   *
+   * @var bool
+   */
+  protected $testHTMLEscapeForAllLanguages = FALSE;
+
+  /**
+   * Default cache contexts expected on a non-translated entity.
+   *
+   * Cache contexts will not be checked if this list is empty.
+   *
+   * @var string[]
+   */
+  protected $defaultCacheContexts = ['languages:language_interface', 'theme', 'url.query_args:_wrapper_format', 'user.permissions'];
+
+  /**
+   * Tests the basic translation UI.
+   */
+  public function testTranslationUI() {
+    $this->doTestBasicTranslation();
+    $this->doTestTranslationOverview();
+    $this->doTestOutdatedStatus();
+    $this->doTestPublishedStatus();
+    $this->doTestAuthoringInfo();
+    $this->doTestTranslationEdit();
+    $this->doTestTranslationChanged();
+    $this->doTestChangedTimeAfterSaveWithoutChanges();
+    $this->doTestTranslationDeletion();
+  }
+
+  /**
+   * Tests the basic translation workflow.
+   */
+  protected function doTestBasicTranslation() {
+    // Create a new test entity with original values in the default language.
+    $default_langcode = $this->langcodes[0];
+    $values[$default_langcode] = $this->getNewEntityValues($default_langcode);
+    // Create the entity with the editor as owner, so that afterwards a new
+    // translation is created by the translator and the translation author is
+    // tested.
+    $this->drupalLogin($this->editor);
+    $this->entityId = $this->createEntity($values[$default_langcode], $default_langcode);
+    $this->drupalLogin($this->translator);
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $this->assertTrue($entity, 'Entity found in the database.');
+    $this->drupalGet($entity->urlInfo());
+    $this->assertResponse(200, 'Entity URL is valid.');
+
+    // Ensure that the content language cache context is not yet added to the
+    // page.
+    $this->assertCacheContexts($this->defaultCacheContexts);
+
+    $this->drupalGet($entity->urlInfo('drupal:content-translation-overview'));
+    $this->assertNoText('Source language', 'Source language column correctly hidden.');
+
+    $translation = $this->getTranslation($entity, $default_langcode);
+    foreach ($values[$default_langcode] as $property => $value) {
+      $stored_value = $this->getValue($translation, $property, $default_langcode);
+      $value = is_array($value) ? $value[0]['value'] : $value;
+      $message = format_string('@property correctly stored in the default language.', ['@property' => $property]);
+      $this->assertEqual($stored_value, $value, $message);
+    }
+
+    // Add a content translation.
+    $langcode = 'it';
+    $language = ConfigurableLanguage::load($langcode);
+    $values[$langcode] = $this->getNewEntityValues($langcode);
+
+    $entity_type_id = $entity->getEntityTypeId();
+    $add_url = Url::fromRoute("entity.$entity_type_id.content_translation_add", [
+      $entity->getEntityTypeId() => $entity->id(),
+      'source' => $default_langcode,
+      'target' => $langcode
+    ], ['language' => $language]);
+    $this->drupalPostForm($add_url, $this->getEditValues($values, $langcode), $this->getFormSubmitActionForNewTranslation($entity, $langcode));
+
+    // Assert that HTML is escaped in "all languages" in UI after SafeMarkup
+    // change.
+    if ($this->testHTMLEscapeForAllLanguages) {
+      $this->assertNoRaw('&lt;span class=&quot;translation-entity-all-languages&quot;&gt;(all languages)&lt;/span&gt;');
+      $this->assertRaw('<span class="translation-entity-all-languages">(all languages)</span>');
+    }
+
+    // Ensure that the content language cache context is not yet added to the
+    // page.
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $this->drupalGet($entity->urlInfo());
+    $this->assertCacheContexts(Cache::mergeContexts(['languages:language_content'], $this->defaultCacheContexts));
+
+    // Reset the cache of the entity, so that the new translation gets the
+    // updated values.
+    $metadata_source_translation = $this->manager->getTranslationMetadata($entity->getTranslation($default_langcode));
+    $metadata_target_translation = $this->manager->getTranslationMetadata($entity->getTranslation($langcode));
+
+    $author_field_name = $entity->hasField('content_translation_uid') ? 'content_translation_uid' : 'uid';
+    if ($entity->getFieldDefinition($author_field_name)->isTranslatable()) {
+      $this->assertEqual($metadata_target_translation->getAuthor()->id(), $this->translator->id(),
+        SafeMarkup::format('Author of the target translation @langcode correctly stored for translatable owner field.', ['@langcode' => $langcode]));
+
+      $this->assertNotEqual($metadata_target_translation->getAuthor()->id(), $metadata_source_translation->getAuthor()->id(),
+        SafeMarkup::format('Author of the target translation @target different from the author of the source translation @source for translatable owner field.',
+          ['@target' => $langcode, '@source' => $default_langcode]));
+    }
+    else {
+      $this->assertEqual($metadata_target_translation->getAuthor()->id(), $this->editor->id(), 'Author of the entity remained untouched after translation for non translatable owner field.');
+    }
+
+    $created_field_name = $entity->hasField('content_translation_created') ? 'content_translation_created' : 'created';
+    if ($entity->getFieldDefinition($created_field_name)->isTranslatable()) {
+      $this->assertTrue($metadata_target_translation->getCreatedTime() > $metadata_source_translation->getCreatedTime(),
+        SafeMarkup::format('Translation creation timestamp of the target translation @target is newer than the creation timestamp of the source translation @source for translatable created field.',
+          ['@target' => $langcode, '@source' => $default_langcode]));
+    }
+    else {
+      $this->assertEqual($metadata_target_translation->getCreatedTime(), $metadata_source_translation->getCreatedTime(), 'Creation timestamp of the entity remained untouched after translation for non translatable created field.');
+    }
+
+    if ($this->testLanguageSelector) {
+      $this->assertNoFieldByXPath('//select[@id="edit-langcode-0-value"]', NULL, 'Language selector correctly disabled on translations.');
+    }
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $this->drupalGet($entity->urlInfo('drupal:content-translation-overview'));
+    $this->assertNoText('Source language', 'Source language column correctly hidden.');
+
+    // Switch the source language.
+    $langcode = 'fr';
+    $language = ConfigurableLanguage::load($langcode);
+    $source_langcode = 'it';
+    $edit = ['source_langcode[source]' => $source_langcode];
+    $entity_type_id = $entity->getEntityTypeId();
+    $add_url = Url::fromRoute("entity.$entity_type_id.content_translation_add", [
+      $entity->getEntityTypeId() => $entity->id(),
+      'source' => $default_langcode,
+      'target' => $langcode
+    ], ['language' => $language]);
+    // This does not save anything, it merely reloads the form and fills in the
+    // fields with the values from the different source language.
+    $this->drupalPostForm($add_url, $edit, t('Change'));
+    $this->assertFieldByXPath("//input[@name=\"{$this->fieldName}[0][value]\"]", $values[$source_langcode][$this->fieldName][0]['value'], 'Source language correctly switched.');
+
+    // Add another translation and mark the other ones as outdated.
+    $values[$langcode] = $this->getNewEntityValues($langcode);
+    $edit = $this->getEditValues($values, $langcode) + ['content_translation[retranslate]' => TRUE];
+    $entity_type_id = $entity->getEntityTypeId();
+    $add_url = Url::fromRoute("entity.$entity_type_id.content_translation_add", [
+      $entity->getEntityTypeId() => $entity->id(),
+      'source' => $source_langcode,
+      'target' => $langcode
+    ], ['language' => $language]);
+    $this->drupalPostForm($add_url, $edit, $this->getFormSubmitActionForNewTranslation($entity, $langcode));
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $this->drupalGet($entity->urlInfo('drupal:content-translation-overview'));
+    $this->assertText('Source language', 'Source language column correctly shown.');
+
+    // Check that the entered values have been correctly stored.
+    foreach ($values as $langcode => $property_values) {
+      $translation = $this->getTranslation($entity, $langcode);
+      foreach ($property_values as $property => $value) {
+        $stored_value = $this->getValue($translation, $property, $langcode);
+        $value = is_array($value) ? $value[0]['value'] : $value;
+        $message = format_string('%property correctly stored with language %language.', ['%property' => $property, '%language' => $langcode]);
+        $this->assertEqual($stored_value, $value, $message);
+      }
+    }
+  }
+
+  /**
+   * Tests that the translation overview shows the correct values.
+   */
+  protected function doTestTranslationOverview() {
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $translate_url = $entity->urlInfo('drupal:content-translation-overview');
+    $this->drupalGet($translate_url);
+    $translate_url->setAbsolute(FALSE);
+
+    foreach ($this->langcodes as $langcode) {
+      if ($entity->hasTranslation($langcode)) {
+        $language = new Language(['id' => $langcode]);
+        $view_url = $entity->url('canonical', ['language' => $language]);
+        $elements = $this->xpath('//table//a[@href=:href]', [':href' => $view_url]);
+        $this->assertEqual((string) $elements[0], $entity->getTranslation($langcode)->label(), format_string('Label correctly shown for %language translation.', ['%language' => $langcode]));
+        $edit_path = $entity->url('edit-form', ['language' => $language]);
+        $elements = $this->xpath('//table//ul[@class="dropbutton"]/li/a[@href=:href]', [':href' => $edit_path]);
+        $this->assertEqual((string) $elements[0], t('Edit'), format_string('Edit link correct for %language translation.', ['%language' => $langcode]));
+      }
+    }
+  }
+
+  /**
+   * Tests up-to-date status tracking.
+   */
+  protected function doTestOutdatedStatus() {
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $langcode = 'fr';
+    $languages = \Drupal::languageManager()->getLanguages();
+
+    // Mark translations as outdated.
+    $edit = ['content_translation[retranslate]' => TRUE];
+    $edit_path = $entity->urlInfo('edit-form', ['language' => $languages[$langcode]]);
+    $this->drupalPostForm($edit_path, $edit, $this->getFormSubmitAction($entity, $langcode));
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+
+    // Check that every translation has the correct "outdated" status, and that
+    // the Translation fieldset is open if the translation is "outdated".
+    foreach ($this->langcodes as $added_langcode) {
+      $url = $entity->urlInfo('edit-form', ['language' => ConfigurableLanguage::load($added_langcode)]);
+      $this->drupalGet($url);
+      if ($added_langcode == $langcode) {
+        $this->assertFieldByXPath('//input[@name="content_translation[retranslate]"]', FALSE, 'The retranslate flag is not checked by default.');
+        $this->assertFalse($this->xpath('//details[@id="edit-content-translation" and @open="open"]'), 'The translation tab should be collapsed by default.');
+      }
+      else {
+        $this->assertFieldByXPath('//input[@name="content_translation[outdated]"]', TRUE, 'The translate flag is checked by default.');
+        $this->assertTrue($this->xpath('//details[@id="edit-content-translation" and @open="open"]'), 'The translation tab is correctly expanded when the translation is outdated.');
+        $edit = ['content_translation[outdated]' => FALSE];
+        $this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $added_langcode));
+        $this->drupalGet($url);
+        $this->assertFieldByXPath('//input[@name="content_translation[retranslate]"]', FALSE, 'The retranslate flag is now shown.');
+        $storage = $this->container->get('entity_type.manager')
+          ->getStorage($this->entityTypeId);
+        $storage->resetCache([$this->entityId]);
+        $entity = $storage->load($this->entityId);
+        $this->assertFalse($this->manager->getTranslationMetadata($entity->getTranslation($added_langcode))->isOutdated(), 'The "outdated" status has been correctly stored.');
+      }
+    }
+  }
+
+  /**
+   * Tests the translation publishing status.
+   */
+  protected function doTestPublishedStatus() {
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+
+    // Unpublish translations.
+    foreach ($this->langcodes as $index => $langcode) {
+      if ($index > 0) {
+        $url = $entity->urlInfo('edit-form', ['language' => ConfigurableLanguage::load($langcode)]);
+        $edit = ['content_translation[status]' => FALSE];
+        $this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $langcode));
+        $storage = $this->container->get('entity_type.manager')
+          ->getStorage($this->entityTypeId);
+        $storage->resetCache([$this->entityId]);
+        $entity = $storage->load($this->entityId);
+        $this->assertFalse($this->manager->getTranslationMetadata($entity->getTranslation($langcode))->isPublished(), 'The translation has been correctly unpublished.');
+      }
+    }
+
+    // Check that the last published translation cannot be unpublished.
+    $this->drupalGet($entity->urlInfo('edit-form'));
+    $this->assertFieldByXPath('//input[@name="content_translation[status]" and @disabled="disabled"]', TRUE, 'The last translation is published and cannot be unpublished.');
+  }
+
+  /**
+   * Tests the translation authoring information.
+   */
+  protected function doTestAuthoringInfo() {
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $values = [];
+
+    // Post different authoring information for each translation.
+    foreach ($this->langcodes as $index => $langcode) {
+      $user = $this->drupalCreateUser();
+      $values[$langcode] = [
+        'uid' => $user->id(),
+        'created' => REQUEST_TIME - mt_rand(0, 1000),
+      ];
+      $edit = [
+        'content_translation[uid]' => $user->getUsername(),
+        'content_translation[created]' => format_date($values[$langcode]['created'], 'custom', 'Y-m-d H:i:s O'),
+      ];
+      $url = $entity->urlInfo('edit-form', ['language' => ConfigurableLanguage::load($langcode)]);
+      $this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $langcode));
+    }
+
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    foreach ($this->langcodes as $langcode) {
+      $metadata = $this->manager->getTranslationMetadata($entity->getTranslation($langcode));
+      $this->assertEqual($metadata->getAuthor()->id(), $values[$langcode]['uid'], 'Translation author correctly stored.');
+      $this->assertEqual($metadata->getCreatedTime(), $values[$langcode]['created'], 'Translation date correctly stored.');
+    }
+
+    // Try to post non valid values and check that they are rejected.
+    $langcode = 'en';
+    $edit = [
+      // User names have by default length 8.
+      'content_translation[uid]' => $this->randomMachineName(12),
+      'content_translation[created]' => '19/11/1978',
+    ];
+    $this->drupalPostForm($entity->urlInfo('edit-form'), $edit, $this->getFormSubmitAction($entity, $langcode));
+    $this->assertTrue($this->xpath('//div[contains(@class, "error")]//ul'), 'Invalid values generate a list of form errors.');
+    $metadata = $this->manager->getTranslationMetadata($entity->getTranslation($langcode));
+    $this->assertEqual($metadata->getAuthor()->id(), $values[$langcode]['uid'], 'Translation author correctly kept.');
+    $this->assertEqual($metadata->getCreatedTime(), $values[$langcode]['created'], 'Translation date correctly kept.');
+  }
+
+  /**
+   * Tests translation deletion.
+   */
+  protected function doTestTranslationDeletion() {
+    // Confirm and delete a translation.
+    $this->drupalLogin($this->translator);
+    $langcode = 'fr';
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $language = ConfigurableLanguage::load($langcode);
+    $url = $entity->urlInfo('edit-form', ['language' => $language]);
+    $this->drupalPostForm($url, [], t('Delete translation'));
+    $this->drupalPostForm(NULL, [], t('Delete @language translation', ['@language' => $language->getName()]));
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId, TRUE);
+    if ($this->assertTrue(is_object($entity), 'Entity found')) {
+      $translations = $entity->getTranslationLanguages();
+      $this->assertTrue(count($translations) == 2 && empty($translations[$langcode]), 'Translation successfully deleted.');
+    }
+
+    // Check that the translator cannot delete the original translation.
+    $args = [$this->entityTypeId => $entity->id(), 'language' => 'en'];
+    $this->drupalGet(Url::fromRoute("entity.$this->entityTypeId.content_translation_delete", $args));
+    $this->assertResponse(403);
+  }
+
+  /**
+   * Returns an array of entity field values to be tested.
+   */
+  protected function getNewEntityValues($langcode) {
+    return [$this->fieldName => [['value' => $this->randomMachineName(16)]]];
+  }
+
+  /**
+   * Returns an edit array containing the values to be posted.
+   */
+  protected function getEditValues($values, $langcode, $new = FALSE) {
+    $edit = $values[$langcode];
+    $langcode = $new ? LanguageInterface::LANGCODE_NOT_SPECIFIED : $langcode;
+    foreach ($values[$langcode] as $property => $value) {
+      if (is_array($value)) {
+        $edit["{$property}[0][value]"] = $value[0]['value'];
+        unset($edit[$property]);
+      }
+    }
+    return $edit;
+  }
+
+  /**
+   * Returns the form action value when submitting a new translation.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity being tested.
+   * @param string $langcode
+   *   Language code for the form.
+   *
+   * @return string
+   *   Name of the button to hit.
+   */
+  protected function getFormSubmitActionForNewTranslation(EntityInterface $entity, $langcode) {
+    $entity->addTranslation($langcode, $entity->toArray());
+    return $this->getFormSubmitAction($entity, $langcode);
+  }
+
+  /**
+   * Returns the form action value to be used to submit the entity form.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity being tested.
+   * @param string $langcode
+   *   Language code for the form.
+   *
+   * @return string
+   *   Name of the button to hit.
+   */
+  protected function getFormSubmitAction(EntityInterface $entity, $langcode) {
+    return t('Save') . $this->getFormSubmitSuffix($entity, $langcode);
+  }
+
+  /**
+   * Returns appropriate submit button suffix based on translatability.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity being tested.
+   * @param string $langcode
+   *   Language code for the form.
+   *
+   * @return string
+   *   Submit button suffix based on translatability.
+   */
+  protected function getFormSubmitSuffix(EntityInterface $entity, $langcode) {
+    return '';
+  }
+
+  /**
+   * Returns the translation object to use to retrieve the translated values.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity being tested.
+   * @param string $langcode
+   *   The language code identifying the translation to be retrieved.
+   *
+   * @return \Drupal\Core\TypedData\TranslatableInterface
+   *   The translation object to act on.
+   */
+  protected function getTranslation(EntityInterface $entity, $langcode) {
+    return $entity->getTranslation($langcode);
+  }
+
+  /**
+   * Returns the value for the specified property in the given language.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $translation
+   *   The translation object the property value should be retrieved from.
+   * @param string $property
+   *   The property name.
+   * @param string $langcode
+   *   The property value.
+   *
+   * @return
+   *   The property value.
+   */
+  protected function getValue(EntityInterface $translation, $property, $langcode) {
+    $key = $property == 'user_id' ? 'target_id' : 'value';
+    return $translation->get($property)->{$key};
+  }
+
+  /**
+   * Returns the name of the field that implements the changed timestamp.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity being tested.
+   *
+   * @return string
+   *   The field name.
+   */
+  protected function getChangedFieldName($entity) {
+    return $entity->hasField('content_translation_changed') ? 'content_translation_changed' : 'changed';
+  }
+
+  /**
+   * Tests edit content translation.
+   */
+  protected function doTestTranslationEdit() {
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $languages = $this->container->get('language_manager')->getLanguages();
+
+    foreach ($this->langcodes as $langcode) {
+      // We only want to test the title for non-english translations.
+      if ($langcode != 'en') {
+        $options = ['language' => $languages[$langcode]];
+        $url = $entity->urlInfo('edit-form', $options);
+        $this->drupalGet($url);
+
+        $this->assertRaw($entity->getTranslation($langcode)->label());
+      }
+    }
+  }
+
+  /**
+   * Tests the basic translation workflow.
+   */
+  protected function doTestTranslationChanged() {
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    $changed_field_name = $this->getChangedFieldName($entity);
+    $definition = $entity->getFieldDefinition($changed_field_name);
+    $config = $definition->getConfig($entity->bundle());
+
+    foreach ([FALSE, TRUE] as $translatable_changed_field) {
+      if ($definition->isTranslatable()) {
+        // For entities defining a translatable changed field we want to test
+        // the correct behavior of that field even if the translatability is
+        // revoked. In that case the changed timestamp should be synchronized
+        // across all translations.
+        $config->setTranslatable($translatable_changed_field);
+        $config->save();
+      }
+      elseif ($translatable_changed_field) {
+        // For entities defining a non-translatable changed field we cannot
+        // declare the field as translatable on the fly by modifying its config
+        // because the schema doesn't support this.
+        break;
+      }
+
+      foreach ($entity->getTranslationLanguages() as $language) {
+        // Ensure different timestamps.
+        sleep(1);
+
+        $langcode = $language->getId();
+
+        $edit = [
+          $this->fieldName . '[0][value]' => $this->randomString(),
+        ];
+        $edit_path = $entity->urlInfo('edit-form', ['language' => $language]);
+        $this->drupalPostForm($edit_path, $edit, $this->getFormSubmitAction($entity, $langcode));
+
+        $storage = $this->container->get('entity_type.manager')
+          ->getStorage($this->entityTypeId);
+        $storage->resetCache([$this->entityId]);
+        $entity = $storage->load($this->entityId);
+        $this->assertEqual(
+          $entity->getChangedTimeAcrossTranslations(), $entity->getTranslation($langcode)->getChangedTime(),
+          format_string('Changed time for language %language is the latest change over all languages.', ['%language' => $language->getName()])
+        );
+      }
+
+      $timestamps = [];
+      foreach ($entity->getTranslationLanguages() as $language) {
+        $next_timestamp = $entity->getTranslation($language->getId())->getChangedTime();
+        if (!in_array($next_timestamp, $timestamps)) {
+          $timestamps[] = $next_timestamp;
+        }
+      }
+
+      if ($translatable_changed_field) {
+        $this->assertEqual(
+          count($timestamps), count($entity->getTranslationLanguages()),
+          'All timestamps from all languages are different.'
+        );
+      }
+      else {
+        $this->assertEqual(
+          count($timestamps), 1,
+          'All timestamps from all languages are identical.'
+        );
+      }
+    }
+  }
+
+  /**
+   * Test the changed time after API and FORM save without changes.
+   */
+  public function doTestChangedTimeAfterSaveWithoutChanges() {
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId);
+    $storage->resetCache([$this->entityId]);
+    $entity = $storage->load($this->entityId);
+    // Test only entities, which implement the EntityChangedInterface.
+    if ($entity instanceof EntityChangedInterface) {
+      $changed_timestamp = $entity->getChangedTime();
+
+      $entity->save();
+      $storage = $this->container->get('entity_type.manager')
+        ->getStorage($this->entityTypeId);
+      $storage->resetCache([$this->entityId]);
+      $entity = $storage->load($this->entityId);
+      $this->assertEqual($changed_timestamp, $entity->getChangedTime(), 'The entity\'s changed time wasn\'t updated after API save without changes.');
+
+      // Ensure different save timestamps.
+      sleep(1);
+
+      // Save the entity on the regular edit form.
+      $language = $entity->language();
+      $edit_path = $entity->urlInfo('edit-form', ['language' => $language]);
+      $this->drupalPostForm($edit_path, [], $this->getFormSubmitAction($entity, $language->getId()));
+
+      $storage->resetCache([$this->entityId]);
+      $entity = $storage->load($this->entityId);
+      $this->assertNotEqual($changed_timestamp, $entity->getChangedTime(), 'The entity\'s changed time was updated after form save without changes.');
+    }
+  }
+
+}
diff --git a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
index f65027008..b8776a26a 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
@@ -25,7 +25,7 @@ class ContentTranslationConfigImportTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'entity_test', 'language', 'content_translation');
+  public static $modules = ['system', 'user', 'entity_test', 'language', 'content_translation'];
 
   /**
    * {@inheritdoc}
@@ -58,7 +58,7 @@ class ContentTranslationConfigImportTest extends KernelTestBase {
   /**
    * Tests config import updates.
    */
-  function testConfigImportUpdates() {
+  public function testConfigImportUpdates() {
     $entity_type_id = 'entity_test_mul';
     $config_id = $entity_type_id . '.' . $entity_type_id;
     $config_name = 'language.content_settings.' . $config_id;
@@ -69,22 +69,22 @@ class ContentTranslationConfigImportTest extends KernelTestBase {
     $this->assertIdentical($storage->exists($config_name), FALSE, $config_name . ' not found.');
 
     // Create new config entity.
-    $data = array(
+    $data = [
       'uuid' => 'a019d89b-c4d9-4ed4-b859-894e4e2e93cf',
       'langcode' => 'en',
       'status' => TRUE,
-      'dependencies' => array(
-        'module' => array('content_translation')
-      ),
+      'dependencies' => [
+        'module' => ['content_translation']
+      ],
       'id' => $config_id,
       'target_entity_type_id' => 'entity_test_mul',
       'target_bundle' => 'entity_test_mul',
       'default_langcode' => 'site_default',
       'language_alterable' => FALSE,
-      'third_party_settings' => array(
-        'content_translation' => array('enabled' => TRUE),
-      ),
-    );
+      'third_party_settings' => [
+        'content_translation' => ['enabled' => TRUE],
+      ],
+    ];
     $sync->write($config_name, $data);
     $this->assertIdentical($sync->exists($config_name), TRUE, $config_name . ' found.');
 
diff --git a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php
index 291cdf971..3626045fb 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php
@@ -16,7 +16,7 @@ class ContentTranslationSettingsApiTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'content_translation', 'user', 'entity_test');
+  public static $modules = ['language', 'content_translation', 'user', 'entity_test'];
 
   /**
    * {@inheritdoc}
@@ -29,7 +29,7 @@ class ContentTranslationSettingsApiTest extends KernelTestBase {
   /**
    * Tests that enabling translation via the API triggers schema updates.
    */
-  function testSettingsApi() {
+  public function testSettingsApi() {
     $this->container->get('content_translation.manager')->setEnabled('entity_test_mul', 'entity_test_mul', TRUE);
     $result =
       db_field_exists('entity_test_mul_property_data', 'content_translation_source') &&
diff --git a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
index eb52e5092..30228076a 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
@@ -54,17 +54,17 @@ class ContentTranslationSyncUnitTest extends KernelTestBase {
    */
   protected $unchangedFieldValues;
 
-  public static $modules = array('language', 'content_translation');
+  public static $modules = ['language', 'content_translation'];
 
   protected function setUp() {
     parent::setUp();
 
     $this->synchronizer = new FieldTranslationSynchronizer($this->container->get('entity.manager'));
-    $this->synchronized = array('sync1', 'sync2');
-    $this->columns = array_merge($this->synchronized, array('var1', 'var2'));
-    $this->langcodes = array('en', 'it', 'fr', 'de', 'es');
+    $this->synchronized = ['sync1', 'sync2'];
+    $this->columns = array_merge($this->synchronized, ['var1', 'var2']);
+    $this->langcodes = ['en', 'it', 'fr', 'de', 'es'];
     $this->cardinality = 4;
-    $this->unchangedFieldValues = array();
+    $this->unchangedFieldValues = [];
 
     // Set up an initial set of values in the correct state, that is with
     // "synchronized" values being equal.
@@ -88,7 +88,7 @@ class ContentTranslationSyncUnitTest extends KernelTestBase {
     $sync_langcode = $this->langcodes[2];
     $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
     $field_values = $this->unchangedFieldValues;
-    $item = array();
+    $item = [];
     foreach ($this->columns as $column) {
       $item[$column] = $this->randomMachineName();
     }
@@ -140,7 +140,7 @@ class ContentTranslationSyncUnitTest extends KernelTestBase {
     $sync_langcode = $this->langcodes[3];
     $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
     $field_values = $this->unchangedFieldValues;
-    $field_values[$sync_langcode] = array();
+    $field_values[$sync_langcode] = [];
     // Scramble the items.
     foreach ($unchanged_items as $delta => $item) {
       $new_delta = ($delta + 1) % $this->cardinality;
@@ -179,7 +179,7 @@ class ContentTranslationSyncUnitTest extends KernelTestBase {
 
     // Determine whether the unchanged values should be altered depending on
     // their delta.
-    $delta_callbacks = array(
+    $delta_callbacks = [
       // Continuous field values: all values are equal.
       function($delta) { return TRUE; },
       // Alternated field values: only the even ones are equal.
@@ -188,7 +188,7 @@ class ContentTranslationSyncUnitTest extends KernelTestBase {
       function($delta) { return $delta === 1 || $delta === 2; },
       // Sparse field values: only the "extreme" ones are equal.
       function($delta) { return $delta === 0 || $delta === 3; },
-    );
+    ];
 
     foreach ($delta_callbacks as $delta_callback) {
       $field_values = $this->unchangedFieldValues;
diff --git a/web/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php b/web/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
index 7390c0e44..ad7317f3a 100644
--- a/web/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
+++ b/web/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
@@ -69,18 +69,18 @@ class ContentTranslationManageAccessCheckTest extends UnitTestCase {
     $language_manager->expects($this->at(0))
       ->method('getLanguage')
       ->with($this->equalTo($source))
-      ->will($this->returnValue(new Language(array('id' => 'en'))));
+      ->will($this->returnValue(new Language(['id' => 'en'])));
     $language_manager->expects($this->at(1))
       ->method('getLanguages')
-      ->will($this->returnValue(array('en' => array(), 'it' => array())));
+      ->will($this->returnValue(['en' => [], 'it' => []]));
     $language_manager->expects($this->at(2))
       ->method('getLanguage')
       ->with($this->equalTo($source))
-      ->will($this->returnValue(new Language(array('id' => 'en'))));
+      ->will($this->returnValue(new Language(['id' => 'en'])));
     $language_manager->expects($this->at(3))
       ->method('getLanguage')
       ->with($this->equalTo($target))
-      ->will($this->returnValue(new Language(array('id' => 'it'))));
+      ->will($this->returnValue(new Language(['id' => 'it'])));
 
     // Set the mock entity. We need to use ContentEntityBase for mocking due to
     // issues with phpunit and multiple interfaces.
@@ -92,7 +92,7 @@ class ContentTranslationManageAccessCheckTest extends UnitTestCase {
     $entity->expects($this->once())
       ->method('getTranslationLanguages')
       ->with()
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $entity->expects($this->once())
       ->method('getCacheContexts')
       ->willReturn([]);
@@ -101,10 +101,10 @@ class ContentTranslationManageAccessCheckTest extends UnitTestCase {
       ->willReturn(Cache::PERMANENT);
     $entity->expects($this->once())
       ->method('getCacheTags')
-      ->will($this->returnValue(array('node:1337')));
+      ->will($this->returnValue(['node:1337']));
     $entity->expects($this->once())
       ->method('getCacheContexts')
-      ->willReturn(array());
+      ->willReturn([]);
 
     // Set the route requirements.
     $route = new Route('test_route');
diff --git a/web/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php b/web/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
index 63dad2f6f..a72d9b7ff 100644
--- a/web/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
+++ b/web/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
@@ -12,25 +12,25 @@ use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
 class ContentTranslationLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array(
+    $this->directoryList = [
       'content_translation' => 'core/modules/content_translation',
       'node' => 'core/modules/node',
-    );
+    ];
     parent::setUp();
 
     $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
     $entity_type->expects($this->any())
       ->method('getLinkTemplate')
-      ->will($this->returnValueMap(array(
-        array('canonical', 'entity.node.canonical'),
-        array('drupal:content-translation-overview', 'entity.node.content_translation_overview'),
-      )));
+      ->will($this->returnValueMap([
+        ['canonical', 'entity.node.canonical'],
+        ['drupal:content-translation-overview', 'entity.node.content_translation_overview'],
+      ]));
     $content_translation_manager = $this->getMock('Drupal\content_translation\ContentTranslationManagerInterface');
     $content_translation_manager->expects($this->any())
       ->method('getSupportedEntityTypes')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         'node' => $entity_type,
-      )));
+      ]));
     \Drupal::getContainer()->set('content_translation.manager', $content_translation_manager);
     \Drupal::getContainer()->set('string_translation', $this->getStringTranslationStub());
   }
@@ -48,22 +48,22 @@ class ContentTranslationLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function providerTestBlockAdminDisplay() {
-    return array(
-      array('entity.node.canonical', array(array(
+    return [
+      ['entity.node.canonical', [[
         'content_translation.local_tasks:entity.node.content_translation_overview',
         'entity.node.canonical',
         'entity.node.edit_form',
         'entity.node.delete_form',
         'entity.node.version_history',
-      ))),
-      array('entity.node.content_translation_overview', array(array(
+      ]]],
+      ['entity.node.content_translation_overview', [[
         'content_translation.local_tasks:entity.node.content_translation_overview',
         'entity.node.canonical',
         'entity.node.edit_form',
         'entity.node.delete_form',
         'entity.node.version_history',
-      ))),
-    );
+      ]]],
+    ];
   }
 
 }
diff --git a/web/core/modules/contextual/contextual.module b/web/core/modules/contextual/contextual.module
index 6cb1fcffc..cf20318cb 100644
--- a/web/core/modules/contextual/contextual.module
+++ b/web/core/modules/contextual/contextual.module
@@ -27,26 +27,26 @@ function contextual_toolbar() {
     return $items;
   }
 
-  $items['contextual'] += array(
+  $items['contextual'] += [
     '#type' => 'toolbar_item',
-    'tab' => array(
+    'tab' => [
       '#type' => 'html_tag',
       '#tag' => 'button',
       '#value' => t('Edit'),
-      '#attributes' => array(
-        'class' => array('toolbar-icon', 'toolbar-icon-edit'),
+      '#attributes' => [
+        'class' => ['toolbar-icon', 'toolbar-icon-edit'],
         'aria-pressed' => 'false',
-      ),
-    ),
-    '#wrapper_attributes' => array(
-      'class' => array('hidden', 'contextual-toolbar-tab'),
-    ),
-    '#attached' => array(
-      'library' => array(
+      ],
+    ],
+    '#wrapper_attributes' => [
+      'class' => ['hidden', 'contextual-toolbar-tab'],
+    ],
+    '#attached' => [
+      'library' => [
         'contextual/drupal.contextual-toolbar',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
   return $items;
 }
@@ -75,7 +75,7 @@ function contextual_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.contextual':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Contextual links module gives users with the <em>Use contextual links</em> permission quick access to tasks associated with certain areas of pages on your site. For example, a menu displayed as a block has links to edit the menu and configure the block. For more information, see the <a href=":contextual">online documentation for the Contextual Links module</a>.', array(':contextual' => 'https://www.drupal.org/documentation/modules/contextual')) . '</p>';
+      $output .= '<p>' . t('The Contextual links module gives users with the <em>Use contextual links</em> permission quick access to tasks associated with certain areas of pages on your site. For example, a menu displayed as a block has links to edit the menu and configure the block. For more information, see the <a href=":contextual">online documentation for the Contextual Links module</a>.', [':contextual' => 'https://www.drupal.org/documentation/modules/contextual']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Displaying contextual links') . '</dt>';
@@ -88,8 +88,8 @@ function contextual_help($route_name, RouteMatchInterface $route_match) {
         '#alt' => t('contextual links button')
       ];
       $sample_picture = \Drupal::service('renderer')->render($sample_picture);
-      $output .= '<li>' . t('Hovering over the area of interest will temporarily make the contextual links button visible (which looks like a pencil in most themes, and is normally displayed in the upper right corner of the area). The icon typically looks like this: @picture', array('@picture' => $sample_picture)) . '</li>';
-      $output .= '<li>' . t('If you have the <a href=":toolbar">Toolbar module</a> enabled, clicking the contextual links button in the toolbar (which looks like a pencil) will make all contextual links buttons on the page visible. Clicking this button again will toggle them to invisible.', array(':toolbar' => (\Drupal::moduleHandler()->moduleExists('toolbar')) ? \Drupal::url('help.page', array('name' => 'toolbar')) : '#')) . '</li>';
+      $output .= '<li>' . t('Hovering over the area of interest will temporarily make the contextual links button visible (which looks like a pencil in most themes, and is normally displayed in the upper right corner of the area). The icon typically looks like this: @picture', ['@picture' => $sample_picture]) . '</li>';
+      $output .= '<li>' . t('If you have the <a href=":toolbar">Toolbar module</a> enabled, clicking the contextual links button in the toolbar (which looks like a pencil) will make all contextual links buttons on the page visible. Clicking this button again will toggle them to invisible.', [':toolbar' => (\Drupal::moduleHandler()->moduleExists('toolbar')) ? \Drupal::url('help.page', ['name' => 'toolbar']) : '#']) . '</li>';
       $output .= '</ol>';
       $output .= t('Once the contextual links button for the area of interest is visible, click the button to display the links.');
       $output .= '</dd>';
@@ -132,10 +132,10 @@ function contextual_preprocess(&$variables, $hook, $info) {
     // users, contextual_page_attachments() only adds the asset library for
     // users with the 'access contextual links' permission, thus preventing
     // unnecessary HTTP requests for users without that permission.
-    $variables['title_suffix']['contextual_links'] = array(
+    $variables['title_suffix']['contextual_links'] = [
       '#type' => 'contextual_links_placeholder',
       '#id' => _contextual_links_to_id($element['#contextual_links']),
-    );
+    ];
   }
 }
 
@@ -172,7 +172,7 @@ function contextual_contextual_links_view_alter(&$element, $items) {
  *   use in a data- attribute.
  */
 function _contextual_links_to_id($contextual_links) {
-  $ids = array();
+  $ids = [];
   $langcode = \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_URL)->getId();
   foreach ($contextual_links as $group => $args) {
     $route_parameters = UrlHelper::buildQuery($args['route_parameters']);
@@ -199,17 +199,17 @@ function _contextual_links_to_id($contextual_links) {
  *   The value for a #contextual_links property.
  */
 function _contextual_id_to_links($id) {
-  $contextual_links = array();
+  $contextual_links = [];
   $contexts = explode('|', $id);
   foreach ($contexts as $context) {
     list($group, $route_parameters_raw, $metadata_raw) = explode(':', $context);
     parse_str($route_parameters_raw, $route_parameters);
-    $metadata = array();
+    $metadata = [];
     parse_str($metadata_raw, $metadata);
-    $contextual_links[$group] = array(
+    $contextual_links[$group] = [
       'route_parameters' => $route_parameters,
       'metadata' => $metadata,
-    );
+    ];
   }
   return $contextual_links;
 }
diff --git a/web/core/modules/contextual/contextual.views.inc b/web/core/modules/contextual/contextual.views.inc
index 528b3bbed..bac5522f1 100644
--- a/web/core/modules/contextual/contextual.views.inc
+++ b/web/core/modules/contextual/contextual.views.inc
@@ -9,11 +9,11 @@
  * Implements hook_views_data_alter().
  */
 function contextual_views_data_alter(&$data) {
-  $data['views']['contextual_links'] = array(
+  $data['views']['contextual_links'] = [
     'title' => t('Contextual Links'),
     'help' => t('Display fields in a contextual links menu.'),
-    'field' => array(
+    'field' => [
       'id' => 'contextual_links',
-    ),
-  );
+    ],
+  ];
 }
diff --git a/web/core/modules/contextual/js/contextual.js b/web/core/modules/contextual/js/contextual.js
index 7f93a15f4..558ea105c 100644
--- a/web/core/modules/contextual/js/contextual.js
+++ b/web/core/modules/contextual/js/contextual.js
@@ -163,7 +163,7 @@
       // Update all contextual links placeholders whose HTML is cached.
       var uncachedIDs = _.filter(ids, function initIfCached(contextualID) {
         var html = storage.getItem('Drupal.contextual.' + contextualID);
-        if (html !== null) {
+        if (html && html.length) {
           // Initialize after the current execution cycle, to make the AJAX
           // request for retrieving the uncached contextual links as soon as
           // possible, but also to ensure that other Drupal behaviors have had
diff --git a/web/core/modules/contextual/src/ContextualController.php b/web/core/modules/contextual/src/ContextualController.php
index 0812ad13d..b1fe245c0 100644
--- a/web/core/modules/contextual/src/ContextualController.php
+++ b/web/core/modules/contextual/src/ContextualController.php
@@ -32,12 +32,12 @@ class ContextualController implements ContainerAwareInterface {
       throw new BadRequestHttpException(t('No contextual ids specified.'));
     }
 
-    $rendered = array();
+    $rendered = [];
     foreach ($ids as $id) {
-      $element = array(
+      $element = [
         '#type' => 'contextual_links',
         '#contextual_links' => _contextual_id_to_links($id),
-      );
+      ];
       $rendered[$id] = $this->container->get('renderer')->renderRoot($element);
     }
 
diff --git a/web/core/modules/contextual/src/Element/ContextualLinks.php b/web/core/modules/contextual/src/Element/ContextualLinks.php
index 8f670236f..62e8966af 100644
--- a/web/core/modules/contextual/src/Element/ContextualLinks.php
+++ b/web/core/modules/contextual/src/Element/ContextualLinks.php
@@ -18,19 +18,19 @@ class ContextualLinks extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#pre_render' => array(
-        array($class, 'preRenderLinks'),
-      ),
+    return [
+      '#pre_render' => [
+        [$class, 'preRenderLinks'],
+      ],
       '#theme' => 'links__contextual',
-      '#links' => array(),
-      '#attributes' => array('class' => array('contextual-links')),
-      '#attached' => array(
-        'library' => array(
+      '#links' => [],
+      '#attributes' => ['class' => ['contextual-links']],
+      '#attached' => [
+        'library' => [
           'contextual/drupal.contextual-links',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -60,26 +60,26 @@ class ContextualLinks extends RenderElement {
    */
   public static function preRenderLinks(array $element) {
     // Retrieve contextual menu links.
-    $items = array();
+    $items = [];
 
     $contextual_links_manager = static::contextualLinkManager();
 
     foreach ($element['#contextual_links'] as $group => $args) {
-      $args += array(
-        'route_parameters' => array(),
-        'metadata' => array(),
-      );
+      $args += [
+        'route_parameters' => [],
+        'metadata' => [],
+      ];
       $items += $contextual_links_manager->getContextualLinksArrayByGroup($group, $args['route_parameters'], $args['metadata']);
     }
 
     // Transform contextual links into parameters suitable for links.html.twig.
-    $links = array();
+    $links = [];
     foreach ($items as $class => $item) {
       $class = Html::getClass($class);
-      $links[$class] = array(
+      $links[$class] = [
         'title' => $item['title'],
         'url' => Url::fromRoute(isset($item['route_name']) ? $item['route_name'] : '', isset($item['route_parameters']) ? $item['route_parameters'] : []),
-      );
+      ];
     }
     $element['#links'] = $links;
 
diff --git a/web/core/modules/contextual/src/Element/ContextualLinksPlaceholder.php b/web/core/modules/contextual/src/Element/ContextualLinksPlaceholder.php
index 92f4b2bed..2fba8db3f 100644
--- a/web/core/modules/contextual/src/Element/ContextualLinksPlaceholder.php
+++ b/web/core/modules/contextual/src/Element/ContextualLinksPlaceholder.php
@@ -18,12 +18,12 @@ class ContextualLinksPlaceholder extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#pre_render' => array(
-        array($class, 'preRenderPlaceholder'),
-      ),
+    return [
+      '#pre_render' => [
+        [$class, 'preRenderPlaceholder'],
+      ],
       '#id' => NULL,
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php b/web/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
index 585b7f669..6bd5c01a4 100644
--- a/web/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
+++ b/web/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
@@ -35,8 +35,8 @@ class ContextualLinks extends FieldPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['fields'] = array('default' => array());
-    $options['destination'] = array('default' => 1);
+    $options['fields'] = ['default' => []];
+    $options['destination'] = ['default' => 1];
 
     return $options;
   }
@@ -48,23 +48,23 @@ class ContextualLinks extends FieldPluginBase {
     $all_fields = $this->view->display_handler->getFieldLabels();
     // Offer to include only those fields that follow this one.
     $field_options = array_slice($all_fields, 0, array_search($this->options['id'], array_keys($all_fields)));
-    $form['fields'] = array(
+    $form['fields'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Fields'),
       '#description' => $this->t('Fields to be included as contextual links.'),
       '#options' => $field_options,
       '#default_value' => $this->options['fields'],
-    );
-    $form['destination'] = array(
+    ];
+    $form['destination'] = [
       '#type' => 'select',
       '#title' => $this->t('Include destination'),
       '#description' => $this->t('Include a "destination" parameter in the link to return the user to the original view upon completing the contextual action.'),
-      '#options' => array(
+      '#options' => [
         '0' => $this->t('No'),
         '1' => $this->t('Yes'),
-      ),
+      ],
       '#default_value' => $this->options['destination'],
-    );
+    ];
   }
 
   /**
@@ -93,7 +93,7 @@ class ContextualLinks extends FieldPluginBase {
    * @see contextual_contextual_links_view_alter()
    */
   public function render(ResultRow $values) {
-    $links = array();
+    $links = [];
     foreach ($this->options['fields'] as $field) {
       $rendered_field = $this->view->style_plugin->getField($values->index, $field);
       if (empty($rendered_field)) {
@@ -109,13 +109,13 @@ class ContextualLinks extends FieldPluginBase {
       }
       if (!empty($title) && !empty($path)) {
         // Make sure that tokens are replaced for this paths as well.
-        $tokens = $this->getRenderTokens(array());
+        $tokens = $this->getRenderTokens([]);
         $path = strip_tags(Html::decodeEntities(strtr($path, $tokens)));
 
-        $links[$field] = array(
+        $links[$field] = [
           'href' => $path,
           'title' => $title,
-        );
+        ];
         if (!empty($this->options['destination'])) {
           $links[$field]['query'] = $this->getDestinationArray();
         }
@@ -124,20 +124,20 @@ class ContextualLinks extends FieldPluginBase {
 
     // Renders a contextual links placeholder.
     if (!empty($links)) {
-      $contextual_links = array(
-        'contextual' => array(
+      $contextual_links = [
+        'contextual' => [
           '',
-          array(),
-          array(
+          [],
+          [
             'contextual-views-field-links' => UrlHelper::encodePath(Json::encode($links)),
-          )
-        )
-      );
+          ]
+        ]
+      ];
 
-      $element = array(
+      $element = [
         '#type' => 'contextual_links_placeholder',
         '#id' => _contextual_links_to_id($contextual_links),
-      );
+      ];
       return drupal_render($element);
     }
     else {
diff --git a/web/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php b/web/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
index e5d2c8546..90b73d700 100644
--- a/web/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
+++ b/web/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
@@ -42,20 +42,20 @@ class ContextualDynamicContextTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('contextual', 'node', 'views', 'views_ui', 'language', 'menu_test');
+  public static $modules = ['contextual', 'node', 'views', 'views_ui', 'language', 'menu_test'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
 
     ConfigurableLanguage::createFromLangcode('it')->save();
     $this->rebuildContainer();
 
-    $this->editorUser = $this->drupalCreateUser(array('access content', 'access contextual links', 'edit any article content'));
-    $this->authenticatedUser = $this->drupalCreateUser(array('access content', 'access contextual links'));
-    $this->anonymousUser = $this->drupalCreateUser(array('access content'));
+    $this->editorUser = $this->drupalCreateUser(['access content', 'access contextual links', 'edit any article content']);
+    $this->authenticatedUser = $this->drupalCreateUser(['access content', 'access contextual links']);
+    $this->anonymousUser = $this->drupalCreateUser(['access content']);
   }
 
   /**
@@ -64,16 +64,16 @@ class ContextualDynamicContextTest extends WebTestBase {
    * Ensures that contextual link placeholders always exist, even if the user is
    * not allowed to use contextual links.
    */
-  function testDifferentPermissions() {
+  public function testDifferentPermissions() {
     $this->drupalLogin($this->editorUser);
 
     // Create three nodes in the following order:
     // - An article, which should be user-editable.
     // - A page, which should not be user-editable.
     // - A second article, which should also be user-editable.
-    $node1 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
-    $node2 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1));
-    $node3 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
+    $node1 = $this->drupalCreateNode(['type' => 'article', 'promote' => 1]);
+    $node2 = $this->drupalCreateNode(['type' => 'page', 'promote' => 1]);
+    $node3 = $this->drupalCreateNode(['type' => 'article', 'promote' => 1]);
 
     // Now, on the front page, all article nodes should have contextual links
     // placeholders, as should the view that contains them.
@@ -89,7 +89,7 @@ class ContextualDynamicContextTest extends WebTestBase {
     for ($i = 0; $i < count($ids); $i++) {
       $this->assertContextualLinkPlaceHolder($ids[$i]);
     }
-    $this->renderContextualLinks(array(), 'node');
+    $this->renderContextualLinks([], 'node');
     $this->assertResponse(400);
     $this->assertRaw('No contextual ids specified.');
     $response = $this->renderContextualLinks($ids, 'node');
@@ -112,7 +112,7 @@ class ContextualDynamicContextTest extends WebTestBase {
     for ($i = 0; $i < count($ids); $i++) {
       $this->assertContextualLinkPlaceHolder($ids[$i]);
     }
-    $this->renderContextualLinks(array(), 'node');
+    $this->renderContextualLinks([], 'node');
     $this->assertResponse(400);
     $this->assertRaw('No contextual ids specified.');
     $response = $this->renderContextualLinks($ids, 'node');
@@ -129,7 +129,7 @@ class ContextualDynamicContextTest extends WebTestBase {
     for ($i = 0; $i < count($ids); $i++) {
       $this->assertNoContextualLinkPlaceHolder($ids[$i]);
     }
-    $this->renderContextualLinks(array(), 'node');
+    $this->renderContextualLinks([], 'node');
     $this->assertResponse(403);
     $this->renderContextualLinks($ids, 'node');
     $this->assertResponse(403);
@@ -150,7 +150,7 @@ class ContextualDynamicContextTest extends WebTestBase {
    *   The result of the assertion.
    */
   protected function assertContextualLinkPlaceHolder($id) {
-    return $this->assertRaw('<div' . new Attribute(array('data-contextual-id' => $id)) . '></div>', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
+    return $this->assertRaw('<div' . new Attribute(['data-contextual-id' => $id]) . '></div>', format_string('Contextual link placeholder with id @id exists.', ['@id' => $id]));
   }
 
   /**
@@ -163,7 +163,7 @@ class ContextualDynamicContextTest extends WebTestBase {
    *   The result of the assertion.
    */
   protected function assertNoContextualLinkPlaceHolder($id) {
-    return $this->assertNoRaw('<div' . new Attribute(array('data-contextual-id' => $id)) . '></div>', format_string('Contextual link placeholder with id @id does not exist.', array('@id' => $id)));
+    return $this->assertNoRaw('<div' . new Attribute(['data-contextual-id' => $id]) . '></div>', format_string('Contextual link placeholder with id @id does not exist.', ['@id' => $id]));
   }
 
   /**
@@ -178,11 +178,11 @@ class ContextualDynamicContextTest extends WebTestBase {
    *   The response body.
    */
   protected function renderContextualLinks($ids, $current_path) {
-    $post = array();
+    $post = [];
     for ($i = 0; $i < count($ids); $i++) {
       $post['ids[' . $i . ']'] = $ids[$i];
     }
-    return $this->drupalPostWithFormat('contextual/render', 'json', $post, array('query' => array('destination' => $current_path)));
+    return $this->drupalPostWithFormat('contextual/render', 'json', $post, ['query' => ['destination' => $current_path]]);
   }
 
 }
diff --git a/web/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php b/web/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php
new file mode 100644
index 000000000..12ce10db8
--- /dev/null
+++ b/web/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Drupal\Tests\contextual\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\user\Entity\Role;
+
+/**
+ * Tests the UI for correct contextual links.
+ *
+ * @group contextual
+ */
+class ContextualLinksTest extends JavascriptTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['block', 'contextual'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->placeBlock('system_branding_block', ['id' => 'branding']);
+  }
+
+  /**
+   * Tests the visibility of contextual links.
+   */
+  public function testContextualLinksVisibility() {
+    $this->drupalLogin($this->drupalCreateUser([
+      'access contextual links'
+    ]));
+
+    $this->drupalGet('user');
+    $contextualLinks = $this->assertSession()->waitForElement('css', '.contextual button');
+    $this->assertEmpty($contextualLinks);
+
+    // Ensure visibility remains correct after cached paged load.
+    $this->drupalGet('user');
+    $contextualLinks = $this->assertSession()->waitForElement('css', '.contextual button');
+    $this->assertEmpty($contextualLinks);
+
+    // Grant permissions to use contextual links on blocks.
+    $this->grantPermissions(Role::load(Role::AUTHENTICATED_ID), [
+      'access contextual links',
+      'administer blocks',
+    ]);
+
+    $this->drupalGet('user');
+    $contextualLinks = $this->assertSession()->waitForElement('css', '.contextual button');
+    $this->assertNotEmpty($contextualLinks);
+
+    // Ensure visibility remains correct after cached paged load.
+    $this->drupalGet('user');
+    $contextualLinks = $this->assertSession()->waitForElement('css', '.contextual button');
+    $this->assertNotEmpty($contextualLinks);
+  }
+
+}
diff --git a/web/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php b/web/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php
index 680303db3..f42bf20f8 100644
--- a/web/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php
+++ b/web/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php
@@ -17,92 +17,92 @@ class ContextualUnitTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('contextual');
+  public static $modules = ['contextual'];
 
   /**
    * Provides testcases for testContextualLinksToId() and
    */
-  function _contextual_links_id_testcases() {
+  public function _contextual_links_id_testcases() {
     // Test branch conditions:
     // - one group.
     // - one dynamic path argument.
     // - no metadata.
-    $tests[] = array(
-      'links' => array(
-        'node' => array(
-          'route_parameters' => array(
+    $tests[] = [
+      'links' => [
+        'node' => [
+          'route_parameters' => [
             'node' => '14031991',
-          ),
-          'metadata' => array('langcode' => 'en'),
-        ),
-      ),
+          ],
+          'metadata' => ['langcode' => 'en'],
+        ],
+      ],
       'id' => 'node:node=14031991:langcode=en',
-    );
+    ];
 
     // Test branch conditions:
     // - one group.
     // - multiple dynamic path arguments.
     // - no metadata.
-    $tests[] = array(
-      'links' => array(
-        'foo' => array(
-          'route_parameters' => array(
+    $tests[] = [
+      'links' => [
+        'foo' => [
+          'route_parameters' => [
             'bar',
             'key' => 'baz',
             'qux',
-          ),
-          'metadata' => array('langcode' => 'en'),
-        ),
-      ),
+          ],
+          'metadata' => ['langcode' => 'en'],
+        ],
+      ],
       'id' => 'foo:0=bar&key=baz&1=qux:langcode=en',
-    );
+    ];
 
     // Test branch conditions:
     // - one group.
     // - one dynamic path argument.
     // - metadata.
-    $tests[] = array(
-      'links' => array(
-        'views_ui_edit' => array(
-          'route_parameters' => array(
+    $tests[] = [
+      'links' => [
+        'views_ui_edit' => [
+          'route_parameters' => [
             'view' => 'frontpage'
-          ),
-          'metadata' => array(
+          ],
+          'metadata' => [
             'location' => 'page',
             'display' => 'page_1',
             'langcode' => 'en',
-          ),
-        ),
-      ),
+          ],
+        ],
+      ],
       'id' => 'views_ui_edit:view=frontpage:location=page&display=page_1&langcode=en',
-    );
+    ];
 
     // Test branch conditions:
     // - multiple groups.
     // - multiple dynamic path arguments.
-    $tests[] = array(
-      'links' => array(
-        'node' => array(
-          'route_parameters' => array(
+    $tests[] = [
+      'links' => [
+        'node' => [
+          'route_parameters' => [
             'node' => '14031991',
-          ),
-          'metadata' => array('langcode' => 'en'),
-        ),
-        'foo' => array(
-          'route_parameters' => array(
+          ],
+          'metadata' => ['langcode' => 'en'],
+        ],
+        'foo' => [
+          'route_parameters' => [
             'bar',
             'key' => 'baz',
             'qux',
-          ),
-          'metadata' => array('langcode' => 'en'),
-        ),
-        'edge' => array(
-          'route_parameters' => array('20011988'),
-          'metadata' => array('langcode' => 'en'),
-        ),
-      ),
+          ],
+          'metadata' => ['langcode' => 'en'],
+        ],
+        'edge' => [
+          'route_parameters' => ['20011988'],
+          'metadata' => ['langcode' => 'en'],
+        ],
+      ],
       'id' => 'node:node=14031991:langcode=en|foo:0=bar&key=baz&1=qux:langcode=en|edge:0=20011988:langcode=en',
-    );
+    ];
 
     return $tests;
   }
@@ -110,7 +110,7 @@ class ContextualUnitTest extends KernelTestBase {
   /**
    * Tests _contextual_links_to_id().
    */
-  function testContextualLinksToId() {
+  public function testContextualLinksToId() {
     $tests = $this->_contextual_links_id_testcases();
     foreach ($tests as $test) {
       $this->assertIdentical(_contextual_links_to_id($test['links']), $test['id']);
@@ -120,7 +120,7 @@ class ContextualUnitTest extends KernelTestBase {
   /**
    * Tests _contextual_id_to_links().
    */
-  function testContextualIdToLinks() {
+  public function testContextualIdToLinks() {
     $tests = $this->_contextual_links_id_testcases();
     foreach ($tests as $test) {
       $this->assertIdentical(_contextual_id_to_links($test['id']), $test['links']);
diff --git a/web/core/modules/datetime/config/schema/datetime.schema.yml b/web/core/modules/datetime/config/schema/datetime.schema.yml
index 406a2fd6f..a00901160 100644
--- a/web/core/modules/datetime/config/schema/datetime.schema.yml
+++ b/web/core/modules/datetime/config/schema/datetime.schema.yml
@@ -47,10 +47,8 @@ field.formatter.settings.datetime_custom:
   label: 'Datetime custom display format settings'
   mapping:
     date_format:
-      type: string
+      type: date_format
       label: 'Date/time format'
-      translatable: true
-      translation context: 'PHP date format'
 
 field.formatter.settings.datetime_time_ago:
   type: mapping
diff --git a/web/core/modules/datetime/datetime.module b/web/core/modules/datetime/datetime.module
index 107854199..bb10d13a6 100644
--- a/web/core/modules/datetime/datetime.module
+++ b/web/core/modules/datetime/datetime.module
@@ -30,13 +30,13 @@ function datetime_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.datetime':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Datetime module provides a Date field that stores dates and times. It also provides the Form API elements <em>datetime</em> and <em>datelist</em> for use in programming modules. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI module help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":datetime_do">online documentation for the Datetime module</a>.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':datetime_do' => 'https://www.drupal.org/documentation/modules/datetime')) . '</p>';
+      $output .= '<p>' . t('The Datetime module provides a Date field that stores dates and times. It also provides the Form API elements <em>datetime</em> and <em>datelist</em> for use in programming modules. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI module help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":datetime_do">online documentation for the Datetime module</a>.', [':field' => \Drupal::url('help.page', ['name' => 'field']), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#', ':datetime_do' => 'https://www.drupal.org/documentation/modules/datetime']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing and displaying date fields') . '</dt>';
-      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the Date field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the Date field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', [':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Displaying dates') . '</dt>';
-      $output .= '<dd>' . t('Dates can be displayed using the <em>Plain</em> or the <em>Default</em> formatter. The <em>Plain</em> formatter displays the date in the <a href="http://en.wikipedia.org/wiki/ISO_8601">ISO 8601</a> format. If you choose the <em>Default</em> formatter, you can choose a format from a predefined list that can be managed on the <a href=":date_format_list">Date and time formats</a> page.', array(':date_format_list' => \Drupal::url('entity.date_format.collection'))) . '</dd>';
+      $output .= '<dd>' . t('Dates can be displayed using the <em>Plain</em> or the <em>Default</em> formatter. The <em>Plain</em> formatter displays the date in the <a href="http://en.wikipedia.org/wiki/ISO_8601">ISO 8601</a> format. If you choose the <em>Default</em> formatter, you can choose a format from a predefined list that can be managed on the <a href=":date_format_list">Date and time formats</a> page.', [':date_format_list' => \Drupal::url('entity.date_format.collection')]) . '</dd>';
       $output .= '</dl>';
       return $output;
   }
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php
index 678ddc833..445b7ee70 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php
@@ -23,16 +23,16 @@ class DateTimeCustomFormatter extends DateTimeFormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'date_format' => DATETIME_DATETIME_STORAGE_FORMAT,
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
       $output = '';
@@ -76,12 +76,12 @@ class DateTimeCustomFormatter extends DateTimeFormatterBase {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $form = parent::settingsForm($form, $form_state);
 
-    $form['date_format'] = array(
+    $form['date_format'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Date/time format'),
       '#description' => $this->t('See <a href="http://php.net/manual/function.date.php" target="_blank">the documentation for PHP date formats</a>.'),
       '#default_value' => $this->getSetting('date_format'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php
index 03c92aef1..7ddecec55 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php
@@ -23,16 +23,16 @@ class DateTimeDefaultFormatter extends DateTimeFormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'format_type' => 'medium',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
       $output = '';
@@ -56,7 +56,7 @@ class DateTimeDefaultFormatter extends DateTimeFormatterBase {
       }
 
       // Display the date using theme datetime.
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#cache' => [
           'contexts' => [
             'timezone',
@@ -65,10 +65,10 @@ class DateTimeDefaultFormatter extends DateTimeFormatterBase {
         '#theme' => 'time',
         '#text' => $output,
         '#html' => FALSE,
-        '#attributes' => array(
+        '#attributes' => [
           'datetime' => $iso_date,
-        ),
-      );
+        ],
+      ];
       if (!empty($item->_attributes)) {
         $elements[$delta]['#attributes'] += $item->_attributes;
         // Unset field item attributes since they have been included in the
@@ -100,17 +100,17 @@ class DateTimeDefaultFormatter extends DateTimeFormatterBase {
     $format_types = $this->dateFormatStorage->loadMultiple();
     $options = [];
     foreach ($format_types as $type => $type_info) {
-      $format = $this->dateFormatter->format($time->format('U'), $type);
+      $format = $this->dateFormatter->format($time->getTimestamp(), $type);
       $options[$type] = $type_info->label() . ' (' . $format . ')';
     }
 
-    $form['format_type'] = array(
+    $form['format_type'] = [
       '#type' => 'select',
       '#title' => t('Date format'),
       '#description' => t("Choose a format for displaying the date. Be sure to set a format appropriate for the field, i.e. omitting time for a field that only has a date."),
       '#options' => $options,
       '#default_value' => $this->getSetting('format_type'),
-    );
+    ];
 
     return $form;
   }
@@ -122,7 +122,7 @@ class DateTimeDefaultFormatter extends DateTimeFormatterBase {
     $summary = parent::settingsSummary();
 
     $date = new DrupalDateTime();
-    $summary[] = t('Format: @display', array('@display' => $this->formatDate($date, $this->getFormatSettings())));
+    $summary[] = t('Format: @display', ['@display' => $this->formatDate($date, $this->getFormatSettings())]);
 
     return $summary;
   }
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php
index be9df38fc..f4e5ff535 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php
@@ -82,9 +82,9 @@ abstract class DateTimeFormatterBase extends FormatterBase implements ContainerF
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'timezone_override' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -93,13 +93,13 @@ abstract class DateTimeFormatterBase extends FormatterBase implements ContainerF
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $form = parent::settingsForm($form, $form_state);
 
-    $form['timezone_override'] = array(
+    $form['timezone_override'] = [
       '#type' => 'select',
       '#title' => $this->t('Time zone override'),
       '#description' => $this->t('The time zone selected here will always be used'),
       '#options' => system_time_zones(TRUE),
       '#default_value' => $this->getSetting('timezone_override'),
-    );
+    ];
 
     return $form;
   }
@@ -111,7 +111,7 @@ abstract class DateTimeFormatterBase extends FormatterBase implements ContainerF
     $summary = parent::settingsSummary();
 
     if ($override = $this->getSetting('timezone_override')) {
-      $summary[] = $this->t('Time zone: @timezone', array('@timezone' => $override));
+      $summary[] = $this->t('Time zone: @timezone', ['@timezone' => $override]);
     }
 
     return $summary;
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php
index 683d75cec..d35d3801d 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php
@@ -22,7 +22,7 @@ class DateTimePlainFormatter extends DateTimeFormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
       $output = '';
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeTimeAgoFormatter.php b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeTimeAgoFormatter.php
index 859ea5da7..3fc315761 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeTimeAgoFormatter.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeTimeAgoFormatter.php
@@ -74,11 +74,11 @@ class DateTimeTimeAgoFormatter extends FormatterBase implements ContainerFactory
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    $settings = array(
+    $settings = [
       'future_format' => '@interval hence',
       'past_format' => '@interval ago',
       'granularity' => 2,
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
 
     return $settings;
   }
@@ -104,7 +104,7 @@ class DateTimeTimeAgoFormatter extends FormatterBase implements ContainerFactory
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
       $date = $item->date;
@@ -128,26 +128,26 @@ class DateTimeTimeAgoFormatter extends FormatterBase implements ContainerFactory
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $form = parent::settingsForm($form, $form_state);
 
-    $form['future_format'] = array(
+    $form['future_format'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Future format'),
       '#default_value' => $this->getSetting('future_format'),
       '#description' => $this->t('Use <em>@interval</em> where you want the formatted interval text to appear.'),
-    );
+    ];
 
-    $form['past_format'] = array(
+    $form['past_format'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Past format'),
       '#default_value' => $this->getSetting('past_format'),
       '#description' => $this->t('Use <em>@interval</em> where you want the formatted interval text to appear.'),
-    );
+    ];
 
-    $form['granularity'] = array(
+    $form['granularity'] = [
       '#type' => 'number',
       '#title' => $this->t('Granularity'),
       '#default_value' => $this->getSetting('granularity'),
       '#description' => $this->t('How many time units should be shown in the formatted output.'),
-    );
+    ];
 
     return $form;
   }
@@ -160,8 +160,8 @@ class DateTimeTimeAgoFormatter extends FormatterBase implements ContainerFactory
 
     $future_date = new DrupalDateTime('1 year 1 month 1 week 1 day 1 hour 1 minute');
     $past_date = new DrupalDateTime('-1 year -1 month -1 week -1 day -1 hour -1 minute');
-    $summary[] = t('Future date: %display', array('%display' => $this->formatDate($future_date)));
-    $summary[] = t('Past date: %display', array('%display' => $this->formatDate($past_date)));
+    $summary[] = t('Future date: %display', ['%display' => $this->formatDate($future_date)]);
+    $summary[] = t('Past date: %display', ['%display' => $this->formatDate($past_date)]);
 
     return $summary;
   }
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php b/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
index d246011ae..45a781b4b 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
@@ -30,31 +30,31 @@ class DateTimeFieldItemList extends FieldItemList {
     if (empty($this->getFieldDefinition()->getDefaultValueCallback())) {
       $default_value = $this->getFieldDefinition()->getDefaultValueLiteral();
 
-      $element = array(
-        '#parents' => array('default_value_input'),
-        'default_date_type' => array(
+      $element = [
+        '#parents' => ['default_value_input'],
+        'default_date_type' => [
           '#type' => 'select',
           '#title' => t('Default date'),
           '#description' => t('Set a default value for this date.'),
           '#default_value' => isset($default_value[0]['default_date_type']) ? $default_value[0]['default_date_type'] : '',
-          '#options' => array(
+          '#options' => [
             static::DEFAULT_VALUE_NOW => t('Current date'),
             static::DEFAULT_VALUE_CUSTOM => t('Relative date'),
-          ),
+          ],
           '#empty_value' => '',
-        ),
-        'default_date' => array(
+        ],
+        'default_date' => [
           '#type' => 'textfield',
           '#title' => t('Relative default value'),
           '#description' => t("Describe a time by reference to the current day, like '+90 days' (90 days from the day the field is created) or '+1 Saturday' (the next Saturday). See <a href=\"http://php.net/manual/function.strtotime.php\">strtotime</a> for more details."),
           '#default_value' => (isset($default_value[0]['default_date_type']) && $default_value[0]['default_date_type'] == static::DEFAULT_VALUE_CUSTOM) ? $default_value[0]['default_date'] : '',
-          '#states' => array(
-            'visible' => array(
-              ':input[id="edit-default-value-input-default-date-type"]' => array('value' => static::DEFAULT_VALUE_CUSTOM),
-            )
-          )
-        )
-      );
+          '#states' => [
+            'visible' => [
+              ':input[id="edit-default-value-input-default-date-type"]' => ['value' => static::DEFAULT_VALUE_CUSTOM],
+            ]
+          ]
+        ]
+      ];
 
       return $element;
     }
@@ -65,7 +65,7 @@ class DateTimeFieldItemList extends FieldItemList {
    */
   public function defaultValuesFormValidate(array $element, array &$form, FormStateInterface $form_state) {
     if ($form_state->getValue(['default_value_input', 'default_date_type']) == static::DEFAULT_VALUE_CUSTOM) {
-      $is_strtotime = @strtotime($form_state->getValue(array('default_value_input', 'default_date')));
+      $is_strtotime = @strtotime($form_state->getValue(['default_value_input', 'default_date']));
       if (!$is_strtotime) {
         $form_state->setErrorByName('default_value_input][default_date', t('The relative date value entered is invalid.'));
       }
@@ -76,13 +76,13 @@ class DateTimeFieldItemList extends FieldItemList {
    * {@inheritdoc}
    */
   public function defaultValuesFormSubmit(array $element, array &$form, FormStateInterface $form_state) {
-    if ($form_state->getValue(array('default_value_input', 'default_date_type'))) {
-      if ($form_state->getValue(array('default_value_input', 'default_date_type')) == static::DEFAULT_VALUE_NOW) {
+    if ($form_state->getValue(['default_value_input', 'default_date_type'])) {
+      if ($form_state->getValue(['default_value_input', 'default_date_type']) == static::DEFAULT_VALUE_NOW) {
         $form_state->setValueForElement($element['default_date'], static::DEFAULT_VALUE_NOW);
       }
-      return array($form_state->getValue('default_value_input'));
+      return [$form_state->getValue('default_value_input')];
     }
-    return array();
+    return [];
   }
 
   /**
@@ -108,12 +108,12 @@ class DateTimeFieldItemList extends FieldItemList {
       // We only provide a default value for the first item, as do all fields.
       // Otherwise, there is no way to clear out unwanted values on multiple value
       // fields.
-      $default_value = array(
-        array(
+      $default_value = [
+        [
           'value' => $value,
           'date' => $date,
-        )
-      );
+        ]
+      ];
     }
     return $default_value;
   }
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php b/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php
index f07d56409..f5c06e6e5 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php
@@ -26,9 +26,9 @@ class DateTimeItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'datetime_type' => 'datetime',
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
@@ -63,37 +63,37 @@ class DateTimeItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'description' => 'The date value.',
           'type' => 'varchar',
           'length' => 20,
-        ),
-      ),
-      'indexes' => array(
-        'value' => array('value'),
-      ),
-    );
+        ],
+      ],
+      'indexes' => [
+        'value' => ['value'],
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $element = array();
+    $element = [];
 
-    $element['datetime_type'] = array(
+    $element['datetime_type'] = [
       '#type' => 'select',
       '#title' => t('Date type'),
       '#description' => t('Choose the type of date to create.'),
       '#default_value' => $this->getSetting('datetime_type'),
-      '#options' => array(
+      '#options' => [
         static::DATETIME_TYPE_DATETIME => t('Date and time'),
         static::DATETIME_TYPE_DATE => t('Date only'),
-      ),
+      ],
       '#disabled' => $has_data,
-    );
+    ];
 
     return $element;
   }
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php b/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php
index 8cdabf139..276d92c43 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php
@@ -22,11 +22,11 @@ class DateTimeDatelistWidget extends DateTimeWidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'increment' => '15',
       'date_order' => 'YMD',
       'time_type' => '24',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -35,6 +35,9 @@ class DateTimeDatelistWidget extends DateTimeWidgetBase {
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $element = parent::formElement($items, $delta, $element, $form, $form_state);
 
+    // Wrap all of the select elements with a fieldset.
+    $element['#theme_wrappers'][] = 'fieldset';
+
     $date_order = $this->getSetting('date_order');
 
     if ($this->getFieldSetting('datetime_type') == 'datetime') {
@@ -49,35 +52,35 @@ class DateTimeDatelistWidget extends DateTimeWidgetBase {
     // Set up the date part order array.
     switch ($date_order) {
       case 'YMD':
-        $date_part_order = array('year', 'month', 'day');
+        $date_part_order = ['year', 'month', 'day'];
         break;
 
       case 'MDY':
-        $date_part_order = array('month', 'day', 'year');
+        $date_part_order = ['month', 'day', 'year'];
         break;
 
       case 'DMY':
-        $date_part_order = array('day', 'month', 'year');
+        $date_part_order = ['day', 'month', 'year'];
         break;
     }
     switch ($time_type) {
       case '24':
-        $date_part_order = array_merge($date_part_order, array('hour', 'minute'));
+        $date_part_order = array_merge($date_part_order, ['hour', 'minute']);
         break;
 
       case '12':
-        $date_part_order = array_merge($date_part_order, array('hour', 'minute', 'ampm'));
+        $date_part_order = array_merge($date_part_order, ['hour', 'minute', 'ampm']);
         break;
 
       case 'none':
         break;
     }
 
-    $element['value'] = array(
+    $element['value'] = [
       '#type' => 'datelist',
       '#date_increment' => $increment,
       '#date_part_order' => $date_part_order,
-    ) + $element['value'];
+    ] + $element['value'];
 
     return $element;
   }
@@ -85,23 +88,23 @@ class DateTimeDatelistWidget extends DateTimeWidgetBase {
   /**
    * {@inheritdoc}
    */
-  function settingsForm(array $form, FormStateInterface $form_state) {
+  public function settingsForm(array $form, FormStateInterface $form_state) {
     $element = parent::settingsForm($form, $form_state);
 
-    $element['date_order'] = array(
+    $element['date_order'] = [
       '#type' => 'select',
       '#title' => t('Date part order'),
       '#default_value' => $this->getSetting('date_order'),
-      '#options' => array('MDY' => t('Month/Day/Year'), 'DMY' => t('Day/Month/Year'), 'YMD' => t('Year/Month/Day')),
-    );
+      '#options' => ['MDY' => t('Month/Day/Year'), 'DMY' => t('Day/Month/Year'), 'YMD' => t('Year/Month/Day')],
+    ];
 
     if ($this->getFieldSetting('datetime_type') == 'datetime') {
-      $element['time_type'] = array(
+      $element['time_type'] = [
         '#type' => 'select',
         '#title' => t('Time type'),
         '#default_value' => $this->getSetting('time_type'),
-        '#options' => array('24' => t('24 hour time'), '12' => t('12 hour time')),
-      );
+        '#options' => ['24' => t('24 hour time'), '12' => t('12 hour time')],
+      ];
 
       $element['increment'] = [
         '#type' => 'select',
@@ -117,10 +120,10 @@ class DateTimeDatelistWidget extends DateTimeWidgetBase {
       ];
     }
     else {
-      $element['time_type'] = array(
+      $element['time_type'] = [
         '#type' => 'hidden',
         '#value' => 'none',
-      );
+      ];
 
       $element['increment'] = [
         '#type' => 'hidden',
@@ -135,12 +138,12 @@ class DateTimeDatelistWidget extends DateTimeWidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
-    $summary[] = t('Date part order: @order', array('@order' => $this->getSetting('date_order')));
+    $summary[] = t('Date part order: @order', ['@order' => $this->getSetting('date_order')]);
     if ($this->getFieldSetting('datetime_type') == 'datetime') {
-      $summary[] = t('Time type: @time_type', array('@time_type' => $this->getSetting('time_type')));
-      $summary[] = t('Time increments: @increment', array('@increment' => $this->getSetting('increment')));
+      $summary[] = t('Time type: @time_type', ['@time_type' => $this->getSetting('time_type')]);
+      $summary[] = t('Time increments: @increment', ['@increment' => $this->getSetting('increment')]);
     }
 
     return $summary;
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php b/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php
index 89381ab7c..2a4ffcd29 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php
@@ -59,6 +59,16 @@ class DateTimeDefaultWidget extends DateTimeWidgetBase implements ContainerFacto
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $element = parent::formElement($items, $delta, $element, $form, $form_state);
 
+    // If the field is date-only, make sure the title is displayed. Otherwise,
+    // wrap everything in a fieldset, and the title will be shown in the legend.
+    if ($this->getFieldSetting('datetime_type') === DateTimeItem::DATETIME_TYPE_DATE) {
+      $element['value']['#title'] = $this->fieldDefinition->getLabel();
+      $element['value']['#description'] = $this->fieldDefinition->getDescription();
+    }
+    else {
+      $element['#theme_wrappers'][] = 'fieldset';
+    }
+
     // Identify the type of date and time elements to use.
     switch ($this->getFieldSetting('datetime_type')) {
       case DateTimeItem::DATETIME_TYPE_DATE:
@@ -76,14 +86,14 @@ class DateTimeDefaultWidget extends DateTimeWidgetBase implements ContainerFacto
         break;
     }
 
-    $element['value'] += array(
+    $element['value'] += [
       '#date_date_format' => $date_format,
       '#date_date_element' => $date_type,
-      '#date_date_callbacks' => array(),
+      '#date_date_callbacks' => [],
       '#date_time_format' => $time_format,
       '#date_time_element' => $time_type,
-      '#date_time_callbacks' => array(),
-    );
+      '#date_time_callbacks' => [],
+    ];
 
     return $element;
   }
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php b/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
index aa6175a07..f965e2184 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
@@ -17,22 +17,13 @@ class DateTimeWidgetBase extends WidgetBase {
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    // We are nesting some sub-elements inside the parent, so we need a wrapper.
-    // We also need to add another #title attribute at the top level for ease in
-    // identifying this item in error messages. We do not want to display this
-    // title because the actual title display is handled at a higher level by
-    // the Field module.
-
-    $element['#theme_wrappers'][] = 'datetime_wrapper';
-    $element['#attributes']['class'][] = 'container-inline';
-
-    $element['value'] = array(
+    $element['value'] = [
       '#type' => 'datetime',
       '#default_value' => NULL,
       '#date_increment' => 1,
       '#date_timezone' => drupal_get_user_timezone(),
       '#required' => $element['#required'],
-    );
+    ];
 
     if ($this->getFieldSetting('datetime_type') == DateTimeItem::DATETIME_TYPE_DATE) {
       // A date-only field should have no timezone conversion performed, so
diff --git a/web/core/modules/datetime/src/Tests/DateTestBase.php b/web/core/modules/datetime/src/Tests/DateTestBase.php
index 0f1277e92..81e7550c0 100644
--- a/web/core/modules/datetime/src/Tests/DateTestBase.php
+++ b/web/core/modules/datetime/src/Tests/DateTestBase.php
@@ -5,7 +5,7 @@ namespace Drupal\datetime\Tests;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\datetime_range\Plugin\Field\FieldType\DateRangeItem;
+use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -114,12 +114,13 @@ abstract class DateTestBase extends WebTestBase {
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => $type,
-      'settings' => ['datetime_type' => DateRangeItem::DATETIME_TYPE_DATE],
+      'settings' => ['datetime_type' => DateTimeItem::DATETIME_TYPE_DATE],
     ]);
     $this->fieldStorage->save();
     $this->field = FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => 'entity_test',
+      'description' => 'Description for ' . $field_name,
       'required' => TRUE,
     ]);
     $this->field->save();
diff --git a/web/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/web/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index f7aeae819..cb487d6db 100644
--- a/web/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/web/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -35,7 +35,7 @@ class DateTimeFieldTest extends DateTestBase {
   /**
    * Tests date field functionality.
    */
-  function testDateField() {
+  public function testDateField() {
     $field_name = $this->fieldStorage->getName();
 
     // Loop through defined timezones to test that date-only fields work at the
@@ -47,8 +47,10 @@ class DateTimeFieldTest extends DateTestBase {
       // Display creation form.
       $this->drupalGet('entity_test/add');
       $this->assertFieldByName("{$field_name}[0][value][date]", '', 'Date element found.');
-      $this->assertFieldByXPath('//*[@id="edit-' . $field_name . '-wrapper"]/h4[contains(@class, "js-form-required")]', TRUE, 'Required markup found');
+      $this->assertFieldByXPath('//*[@id="edit-' . $field_name . '-wrapper"]//label[contains(@class,"js-form-required")]', TRUE, 'Required markup found');
       $this->assertNoFieldByName("{$field_name}[0][value][time]", '', 'Time element not found.');
+      $this->assertFieldByXPath('//input[@aria-describedby="edit-' . $field_name . '-0-value--description"]', NULL, 'ARIA described-by found');
+      $this->assertFieldByXPath('//div[@id="edit-' . $field_name . '-0-value--description"]', NULL, 'ARIA description found');
 
       // Build up a date in the UTC timezone. Note that using this will also
       // mimic the user in a different timezone simply entering '2012-12-31' via
@@ -60,13 +62,13 @@ class DateTimeFieldTest extends DateTestBase {
       $date_format = DateFormat::load('html_date')->getPattern();
       $time_format = DateFormat::load('html_time')->getPattern();
 
-      $edit = array(
+      $edit = [
         "{$field_name}[0][value][date]" => $date->format($date_format),
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Save'));
       preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
       $id = $match[1];
-      $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+      $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
       $this->assertRaw($date->format($date_format));
       $this->assertNoRaw($date->format($time_format));
 
@@ -84,15 +86,15 @@ class DateTimeFieldTest extends DateTestBase {
       $this->assertEqual('2012-12-31', $entity->{$field_name}->value);
 
       // Reset display options since these get changed below.
-      $this->displayOptions = array(
+      $this->displayOptions = [
         'type' => 'datetime_default',
         'label' => 'hidden',
-        'settings' => array('format_type' => 'medium') + $this->defaultSettings,
-      );
+        'settings' => ['format_type' => 'medium'] + $this->defaultSettings,
+      ];
       // Verify that the date is output according to the formatter settings.
-      $options = array(
-        'format_type' => array('short', 'medium', 'long'),
-      );
+      $options = [
+        'format_type' => ['short', 'medium', 'long'],
+      ];
       // Formats that display a time component for date-only fields will display
       // the default time, so that is applied before calculating the expected
       // value.
@@ -100,7 +102,7 @@ class DateTimeFieldTest extends DateTestBase {
       foreach ($options as $setting => $values) {
         foreach ($values as $new_value) {
           // Update the entity display settings.
-          $this->displayOptions['settings'] = array($setting => $new_value) + $this->defaultSettings;
+          $this->displayOptions['settings'] = [$setting => $new_value] + $this->defaultSettings;
           entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
             ->setComponent($field_name, $this->displayOptions)
             ->save();
@@ -113,7 +115,7 @@ class DateTimeFieldTest extends DateTestBase {
               $expected = format_date($date->getTimestamp(), $new_value, '', DATETIME_STORAGE_TIMEZONE);
               $expected_iso = format_date($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DATETIME_STORAGE_TIMEZONE);
               $this->renderTestEntity($id);
-              $this->assertFieldByXPath('//time[@datetime="' . $expected_iso . '"]', $expected, SafeMarkup::format('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', array('%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso)));
+              $this->assertFieldByXPath('//time[@datetime="' . $expected_iso . '"]', $expected, SafeMarkup::format('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso]));
               break;
           }
         }
@@ -127,17 +129,17 @@ class DateTimeFieldTest extends DateTestBase {
         ->save();
       $expected = $date->format(DATETIME_DATE_STORAGE_FORMAT);
       $this->renderTestEntity($id);
-      $this->assertText($expected, SafeMarkup::format('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected)));
+      $this->assertText($expected, SafeMarkup::format('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
 
       // Verify that the 'datetime_custom' formatter works.
       $this->displayOptions['type'] = 'datetime_custom';
-      $this->displayOptions['settings'] = array('date_format' => 'm/d/Y') + $this->defaultSettings;
+      $this->displayOptions['settings'] = ['date_format' => 'm/d/Y'] + $this->defaultSettings;
       entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
         ->setComponent($field_name, $this->displayOptions)
         ->save();
       $expected = $date->format($this->displayOptions['settings']['date_format']);
       $this->renderTestEntity($id);
-      $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_custom format displayed as %expected.', array('%expected' => $expected)));
+      $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
 
       // Verify that the 'datetime_time_ago' formatter works for intervals in the
       // past.  First update the test entity so that the date difference always
@@ -152,11 +154,11 @@ class DateTimeFieldTest extends DateTestBase {
       $entity->save();
 
       $this->displayOptions['type'] = 'datetime_time_ago';
-      $this->displayOptions['settings'] = array(
+      $this->displayOptions['settings'] = [
         'future_format' => '@interval in the future',
         'past_format' => '@interval in the past',
         'granularity' => 3,
-      );
+      ];
       entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
         ->setComponent($field_name, $this->displayOptions)
         ->save();
@@ -164,7 +166,7 @@ class DateTimeFieldTest extends DateTestBase {
         '@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
       ]);
       $this->renderTestEntity($id);
-      $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
+      $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
 
       // Verify that the 'datetime_time_ago' formatter works for intervals in the
       // future.  First update the test entity so that the date difference always
@@ -185,14 +187,14 @@ class DateTimeFieldTest extends DateTestBase {
         '@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
       ]);
       $this->renderTestEntity($id);
-      $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
+      $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
     }
   }
 
   /**
    * Tests date and time field.
    */
-  function testDatetimeField() {
+  public function testDatetimeField() {
     $field_name = $this->fieldStorage->getName();
     // Change the field to a datetime field.
     $this->fieldStorage->setSetting('datetime_type', 'datetime');
@@ -202,6 +204,9 @@ class DateTimeFieldTest extends DateTestBase {
     $this->drupalGet('entity_test/add');
     $this->assertFieldByName("{$field_name}[0][value][date]", '', 'Date element found.');
     $this->assertFieldByName("{$field_name}[0][value][time]", '', 'Time element found.');
+    $this->assertFieldByXPath('//fieldset[@id="edit-' . $field_name . '-0"]/legend//text()', $field_name, 'Fieldset and label found');
+    $this->assertFieldByXPath('//fieldset[@aria-describedby="edit-' . $field_name . '-0--description"]', NULL, 'ARIA described-by found');
+    $this->assertFieldByXPath('//div[@id="edit-' . $field_name . '-0--description"]', NULL, 'ARIA description found');
 
     // Build up a date in the UTC timezone.
     $value = '2012-12-31 00:00:00';
@@ -214,25 +219,25 @@ class DateTimeFieldTest extends DateTestBase {
     $date_format = DateFormat::load('html_date')->getPattern();
     $time_format = DateFormat::load('html_time')->getPattern();
 
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $date->format($date_format),
       "{$field_name}[0][value][time]" => $date->format($time_format),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
     $this->assertRaw($date->format($date_format));
     $this->assertRaw($date->format($time_format));
 
     // Verify that the date is output according to the formatter settings.
-    $options = array(
-      'format_type' => array('short', 'medium', 'long'),
-    );
+    $options = [
+      'format_type' => ['short', 'medium', 'long'],
+    ];
     foreach ($options as $setting => $values) {
       foreach ($values as $new_value) {
         // Update the entity display settings.
-        $this->displayOptions['settings'] = array($setting => $new_value) + $this->defaultSettings;
+        $this->displayOptions['settings'] = [$setting => $new_value] + $this->defaultSettings;
         entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
           ->setComponent($field_name, $this->displayOptions)
           ->save();
@@ -244,7 +249,7 @@ class DateTimeFieldTest extends DateTestBase {
             $expected = format_date($date->getTimestamp(), $new_value);
             $expected_iso = format_date($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
             $this->renderTestEntity($id);
-            $this->assertFieldByXPath('//time[@datetime="' . $expected_iso . '"]', $expected, SafeMarkup::format('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', array('%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso)));
+            $this->assertFieldByXPath('//time[@datetime="' . $expected_iso . '"]', $expected, SafeMarkup::format('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso]));
             break;
         }
       }
@@ -258,27 +263,27 @@ class DateTimeFieldTest extends DateTestBase {
       ->save();
     $expected = $date->format(DATETIME_DATETIME_STORAGE_FORMAT);
     $this->renderTestEntity($id);
-    $this->assertText($expected, SafeMarkup::format('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, SafeMarkup::format('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
 
     // Verify that the 'datetime_custom' formatter works.
     $this->displayOptions['type'] = 'datetime_custom';
-    $this->displayOptions['settings'] = array('date_format' => 'm/d/Y g:i:s A') + $this->defaultSettings;
+    $this->displayOptions['settings'] = ['date_format' => 'm/d/Y g:i:s A'] + $this->defaultSettings;
     entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
       ->setComponent($field_name, $this->displayOptions)
       ->save();
     $expected = $date->format($this->displayOptions['settings']['date_format']);
     $this->renderTestEntity($id);
-    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_custom format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
 
     // Verify that the 'timezone_override' setting works.
     $this->displayOptions['type'] = 'datetime_custom';
-    $this->displayOptions['settings'] = array('date_format' => 'm/d/Y g:i:s A', 'timezone_override' => 'America/New_York') + $this->defaultSettings;
+    $this->displayOptions['settings'] = ['date_format' => 'm/d/Y g:i:s A', 'timezone_override' => 'America/New_York'] + $this->defaultSettings;
     entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
       ->setComponent($field_name, $this->displayOptions)
       ->save();
-    $expected = $date->format($this->displayOptions['settings']['date_format'], array('timezone' => 'America/New_York'));
+    $expected = $date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
     $this->renderTestEntity($id);
-    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_custom format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
 
     // Verify that the 'datetime_time_ago' formatter works for intervals in the
     // past.  First update the test entity so that the date difference always
@@ -293,11 +298,11 @@ class DateTimeFieldTest extends DateTestBase {
     $entity->save();
 
     $this->displayOptions['type'] = 'datetime_time_ago';
-    $this->displayOptions['settings'] = array(
+    $this->displayOptions['settings'] = [
       'future_format' => '@interval from now',
       'past_format' => '@interval earlier',
       'granularity' => 3,
-    );
+    ];
     entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
       ->setComponent($field_name, $this->displayOptions)
       ->save();
@@ -305,7 +310,7 @@ class DateTimeFieldTest extends DateTestBase {
       '@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
     ]);
     $this->renderTestEntity($id);
-    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
 
     // Verify that the 'datetime_time_ago' formatter works for intervals in the
     // future.  First update the test entity so that the date difference always
@@ -326,13 +331,13 @@ class DateTimeFieldTest extends DateTestBase {
       '@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
     ]);
     $this->renderTestEntity($id);
-    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
   }
 
   /**
    * Tests Date List Widget functionality.
    */
-  function testDatelistWidget() {
+  public function testDatelistWidget() {
     $field_name = $this->fieldStorage->getName();
 
     // Ensure field is set to a date only field.
@@ -341,17 +346,20 @@ class DateTimeFieldTest extends DateTestBase {
 
     // Change the widget to a datelist widget.
     entity_get_form_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'datetime_datelist',
-        'settings' => array(
+        'settings' => [
           'date_order' => 'YMD',
-        ),
-      ))
+        ],
+      ])
       ->save();
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
     // Display creation form.
     $this->drupalGet('entity_test/add');
+    $this->assertFieldByXPath('//fieldset[@id="edit-' . $field_name . '-0"]/legend//text()', $field_name, 'Fieldset and label found');
+    $this->assertFieldByXPath('//fieldset[@aria-describedby="edit-' . $field_name . '-0--description"]', NULL, 'ARIA described-by found');
+    $this->assertFieldByXPath('//div[@id="edit-' . $field_name . '-0--description"]', NULL, 'ARIA description found');
 
     // Assert that Hour and Minute Elements do not appear on Date Only
     $this->assertNoFieldByXPath("//*[@id=\"edit-$field_name-0-value-hour\"]", NULL, 'Hour element not found on Date Only.');
@@ -362,7 +370,7 @@ class DateTimeFieldTest extends DateTestBase {
     $this->drupalGet($fieldEditUrl);
 
     // Click on the widget settings button to open the widget settings form.
-    $this->drupalPostAjaxForm(NULL, array(), $field_name . "_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], $field_name . "_settings_edit");
     $xpathIncr = "//select[starts-with(@id, \"edit-fields-$field_name-settings-edit-form-settings-increment\")]";
     $this->assertNoFieldByXPath($xpathIncr, NULL, 'Increment element not found for Date Only.');
 
@@ -372,14 +380,14 @@ class DateTimeFieldTest extends DateTestBase {
 
     // Change the widget to a datelist widget.
     entity_get_form_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'datetime_datelist',
-        'settings' => array(
+        'settings' => [
           'increment' => 1,
           'date_order' => 'YMD',
           'time_type' => '12',
-        ),
-      ))
+        ],
+      ])
       ->save();
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
@@ -388,7 +396,7 @@ class DateTimeFieldTest extends DateTestBase {
     $this->drupalGet($fieldEditUrl);
 
     // Click on the widget settings button to open the widget settings form.
-    $this->drupalPostAjaxForm(NULL, array(), $field_name . "_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], $field_name . "_settings_edit");
     $this->assertFieldByXPath($xpathIncr, NULL, 'Increment element found for Date and time.');
 
     // Display creation form.
@@ -415,9 +423,9 @@ class DateTimeFieldTest extends DateTestBase {
     $this->assertOptionByText("edit-$field_name-0-value-ampm", t('AM/PM'));
 
     // Submit a valid date and ensure it is accepted.
-    $date_value = array('year' => 2012, 'month' => 12, 'day' => 31, 'hour' => 5, 'minute' => 15);
+    $date_value = ['year' => 2012, 'month' => 12, 'day' => 31, 'hour' => 5, 'minute' => 15];
 
-    $edit = array();
+    $edit = [];
     // Add the ampm indicator since we are testing 12 hour time.
     $date_value['ampm'] = 'am';
     foreach ($date_value as $part => $value) {
@@ -427,7 +435,7 @@ class DateTimeFieldTest extends DateTestBase {
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
 
     $this->assertOptionSelected("edit-$field_name-0-value-year", '2012', 'Correct year selected.');
     $this->assertOptionSelected("edit-$field_name-0-value-month", '12', 'Correct month selected.');
@@ -438,14 +446,14 @@ class DateTimeFieldTest extends DateTestBase {
 
     // Test the widget using increment other than 1 and 24 hour mode.
     entity_get_form_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'datetime_datelist',
-        'settings' => array(
+        'settings' => [
           'increment' => 15,
           'date_order' => 'YMD',
           'time_type' => '24',
-        ),
-      ))
+        ],
+      ])
       ->save();
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
@@ -458,9 +466,9 @@ class DateTimeFieldTest extends DateTestBase {
     $this->assertNoFieldByXPath("//*[@id=\"edit-$field_name-0-value-ampm\"]", NULL, 'AMPM element not found.');
 
     // Submit a valid date and ensure it is accepted.
-    $date_value = array('year' => 2012, 'month' => 12, 'day' => 31, 'hour' => 17, 'minute' => 15);
+    $date_value = ['year' => 2012, 'month' => 12, 'day' => 31, 'hour' => 17, 'minute' => 15];
 
-    $edit = array();
+    $edit = [];
     foreach ($date_value as $part => $value) {
       $edit["{$field_name}[0][value][$part]"] = $value;
     }
@@ -468,7 +476,7 @@ class DateTimeFieldTest extends DateTestBase {
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
 
     $this->assertOptionSelected("edit-$field_name-0-value-year", '2012', 'Correct year selected.');
     $this->assertOptionSelected("edit-$field_name-0-value-month", '12', 'Correct month selected.');
@@ -478,14 +486,14 @@ class DateTimeFieldTest extends DateTestBase {
 
     // Test the widget for partial completion of fields.
     entity_get_form_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'datetime_datelist',
-        'settings' => array(
+        'settings' => [
           'increment' => 1,
           'date_order' => 'YMD',
           'time_type' => '24',
-        ),
-      ))
+        ],
+      ])
       ->save();
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
@@ -497,7 +505,7 @@ class DateTimeFieldTest extends DateTestBase {
       $this->drupalGet('entity_test/add');
 
       // Submit a partial date and ensure and error message is provided.
-      $edit = array();
+      $edit = [];
       foreach ($date_value as $part => $value) {
         $edit["{$field_name}[0][value][$part]"] = $value;
       }
@@ -512,8 +520,8 @@ class DateTimeFieldTest extends DateTestBase {
     // Test the widget for complete input with zeros as part of selections.
     $this->drupalGet('entity_test/add');
 
-    $date_value = array('year' => 2012, 'month' => '12', 'day' => '31', 'hour' => '0', 'minute' => '0');
-    $edit = array();
+    $date_value = ['year' => 2012, 'month' => '12', 'day' => '31', 'hour' => '0', 'minute' => '0'];
+    $edit = [];
     foreach ($date_value as $part => $value) {
       $edit["{$field_name}[0][value][$part]"] = $value;
     }
@@ -522,13 +530,13 @@ class DateTimeFieldTest extends DateTestBase {
     $this->assertResponse(200);
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
 
     // Test the widget to ensure zeros are not deselected on validation.
     $this->drupalGet('entity_test/add');
 
-    $date_value = array('year' => 2012, 'month' => '12', 'day' => '31', 'hour' => '', 'minute' => '0');
-    $edit = array();
+    $date_value = ['year' => 2012, 'month' => '12', 'day' => '31', 'hour' => '', 'minute' => '0'];
+    $edit = [];
     foreach ($date_value as $part => $value) {
       $edit["{$field_name}[0][value][$part]"] = $value;
     }
@@ -574,18 +582,18 @@ class DateTimeFieldTest extends DateTestBase {
   /**
    * Test default value functionality.
    */
-  function testDefaultValue() {
+  public function testDefaultValue() {
     // Create a test content type.
-    $this->drupalCreateContentType(array('type' => 'date_content'));
+    $this->drupalCreateContentType(['type' => 'date_content']);
 
     // Create a field storage with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => 'datetime',
-      'settings' => array('datetime_type' => 'date'),
-    ));
+      'settings' => ['datetime_type' => 'date'],
+    ]);
     $field_storage->save();
 
     $field = FieldConfig::create([
@@ -601,9 +609,9 @@ class DateTimeFieldTest extends DateTestBase {
       $this->setSiteTimezone($timezone);
 
       // Set now as default_value.
-      $field_edit = array(
+      $field_edit = [
         'default_value_input[default_date_type]' => 'now',
-      );
+      ];
       $this->drupalPostForm('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
 
       // Check that default value is selected in default value form.
@@ -614,10 +622,10 @@ class DateTimeFieldTest extends DateTestBase {
       // Check if default_date has been stored successfully.
       $config_entity = $this->config('field.field.node.date_content.' . $field_name)
         ->get();
-      $this->assertEqual($config_entity['default_value'][0], array(
+      $this->assertEqual($config_entity['default_value'][0], [
         'default_date_type' => 'now',
         'default_date' => 'now',
-      ), 'Default value has been stored successfully');
+      ], 'Default value has been stored successfully');
 
       // Clear field cache in order to avoid stale cache values.
       \Drupal::entityManager()->clearCachedFieldDefinitions();
@@ -629,19 +637,19 @@ class DateTimeFieldTest extends DateTestBase {
         ->offsetGet(0)->value, $expected_date->format(DATETIME_DATE_STORAGE_FORMAT));
 
       // Set an invalid relative default_value to test validation.
-      $field_edit = array(
+      $field_edit = [
         'default_value_input[default_date_type]' => 'relative',
         'default_value_input[default_date]' => 'invalid date',
-      );
+      ];
       $this->drupalPostForm('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
 
       $this->assertText('The relative date value entered is invalid.');
 
       // Set a relative default_value.
-      $field_edit = array(
+      $field_edit = [
         'default_value_input[default_date_type]' => 'relative',
         'default_value_input[default_date]' => '+90 days',
-      );
+      ];
       $this->drupalPostForm('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
 
       // Check that default value is selected in default value form.
@@ -652,10 +660,10 @@ class DateTimeFieldTest extends DateTestBase {
       // Check if default_date has been stored successfully.
       $config_entity = $this->config('field.field.node.date_content.' . $field_name)
         ->get();
-      $this->assertEqual($config_entity['default_value'][0], array(
+      $this->assertEqual($config_entity['default_value'][0], [
         'default_date_type' => 'relative',
         'default_date' => '+90 days',
-      ), 'Default value has been stored successfully');
+      ], 'Default value has been stored successfully');
 
       // Clear field cache in order to avoid stale cache values.
       \Drupal::entityManager()->clearCachedFieldDefinitions();
@@ -668,9 +676,9 @@ class DateTimeFieldTest extends DateTestBase {
         ->offsetGet(0)->value, $expected_date->format(DATETIME_DATE_STORAGE_FORMAT));
 
       // Remove default value.
-      $field_edit = array(
+      $field_edit = [
         'default_value_input[default_date_type]' => '',
-      );
+      ];
       $this->drupalPostForm('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
 
       // Check that default value is selected in default value form.
@@ -696,7 +704,7 @@ class DateTimeFieldTest extends DateTestBase {
   /**
    * Test that invalid values are caught and marked as invalid.
    */
-  function testInvalidField() {
+  public function testInvalidField() {
     // Change the field to a datetime field.
     $this->fieldStorage->setSetting('datetime_type', 'datetime');
     $this->fieldStorage->save();
@@ -709,72 +717,72 @@ class DateTimeFieldTest extends DateTestBase {
 
     // Submit invalid dates and ensure they is not accepted.
     $date_value = '';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $date_value,
       "{$field_name}[0][value][time]" => '12:00:00',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertText('date is invalid', 'Empty date value has been caught.');
 
     $date_value = 'aaaa-12-01';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $date_value,
       "{$field_name}[0][value][time]" => '00:00:00',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText('date is invalid', format_string('Invalid year value %date has been caught.', array('%date' => $date_value)));
+    $this->assertText('date is invalid', format_string('Invalid year value %date has been caught.', ['%date' => $date_value]));
 
     $date_value = '2012-75-01';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $date_value,
       "{$field_name}[0][value][time]" => '00:00:00',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText('date is invalid', format_string('Invalid month value %date has been caught.', array('%date' => $date_value)));
+    $this->assertText('date is invalid', format_string('Invalid month value %date has been caught.', ['%date' => $date_value]));
 
     $date_value = '2012-12-99';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $date_value,
       "{$field_name}[0][value][time]" => '00:00:00',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText('date is invalid', format_string('Invalid day value %date has been caught.', array('%date' => $date_value)));
+    $this->assertText('date is invalid', format_string('Invalid day value %date has been caught.', ['%date' => $date_value]));
 
     $date_value = '2012-12-01';
     $time_value = '';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $date_value,
       "{$field_name}[0][value][time]" => $time_value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertText('date is invalid', 'Empty time value has been caught.');
 
     $date_value = '2012-12-01';
     $time_value = '49:00:00';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $date_value,
       "{$field_name}[0][value][time]" => $time_value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText('date is invalid', format_string('Invalid hour value %time has been caught.', array('%time' => $time_value)));
+    $this->assertText('date is invalid', format_string('Invalid hour value %time has been caught.', ['%time' => $time_value]));
 
     $date_value = '2012-12-01';
     $time_value = '12:99:00';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $date_value,
       "{$field_name}[0][value][time]" => $time_value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText('date is invalid', format_string('Invalid minute value %time has been caught.', array('%time' => $time_value)));
+    $this->assertText('date is invalid', format_string('Invalid minute value %time has been caught.', ['%time' => $time_value]));
 
     $date_value = '2012-12-01';
     $time_value = '12:15:99';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $date_value,
       "{$field_name}[0][value][time]" => $time_value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText('date is invalid', format_string('Invalid second value %time has been caught.', array('%time' => $time_value)));
+    $this->assertText('date is invalid', format_string('Invalid second value %time has been caught.', ['%time' => $time_value]));
   }
 
   /**
diff --git a/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php b/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
index d26434b7f..e28667f07 100644
--- a/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
+++ b/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\datetime\Kernel;
 
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FieldItemInterface;
+use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\Tests\field\Kernel\FieldKernelTestBase;
@@ -16,44 +17,61 @@ use Drupal\field\Entity\FieldStorageConfig;
  */
 class DateTimeItemTest extends FieldKernelTestBase {
 
+  /**
+   * A field storage to use in this test class.
+   *
+   * @var \Drupal\field\Entity\FieldStorageConfig
+   */
+  protected $fieldStorage;
+
+  /**
+   * The field used in this test class.
+   *
+   * @var \Drupal\field\Entity\FieldConfig
+   */
+  protected $field;
+
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('datetime');
+  public static $modules = ['datetime'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create a field with settings to validate.
-    $field_storage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => 'field_datetime',
       'type' => 'datetime',
       'entity_type' => 'entity_test',
-      'settings' => array('datetime_type' => 'date'),
-    ));
-    $field_storage->save();
-    $field = FieldConfig::create([
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-      'settings' => array(
-        'default_value' => 'blank',
-      ),
+      'settings' => ['datetime_type' => DateTimeItem::DATETIME_TYPE_DATETIME],
     ]);
-    $field->save();
+    $this->fieldStorage->save();
+    $this->field = FieldConfig::create([
+      'field_storage' => $this->fieldStorage,
+      'bundle' => 'entity_test',
+      'settings' => [
+        'default_value' => 'blank',
+      ],
+    ]);
+    $this->field->save();
   }
 
   /**
-   * Tests using entity fields of the date field type.
+   * Tests using entity fields of the datetime field type.
    */
-  public function testDateTimeItem() {
+  public function testDateTime() {
+    $this->fieldStorage->setSetting('datetime_type', DateTimeItem::DATETIME_TYPE_DATETIME);
+    $this->fieldStorage->save();
+
     // Verify entity creation.
     $entity = EntityTest::create();
-    $value = '2014-01-01T20:00:00Z';
+    $value = '2014-01-01T20:00:00';
     $entity->field_datetime = $value;
     $entity->name->value = $this->randomMachineName();
-    $entity->save();
+    $this->entityValidateAndSave($entity);
 
     // Verify entity has been created properly.
     $id = $entity->id();
@@ -64,12 +82,50 @@ class DateTimeItemTest extends FieldKernelTestBase {
     $this->assertEqual($entity->field_datetime[0]->value, $value);
 
     // Verify changing the date value.
-    $new_value = $this->randomMachineName();
+    $new_value = '2016-11-04T00:21:00';
     $entity->field_datetime->value = $new_value;
     $this->assertEqual($entity->field_datetime->value, $new_value);
 
     // Read changed entity and assert changed values.
-    $entity->save();
+    $this->entityValidateAndSave($entity);
+    $entity = EntityTest::load($id);
+    $this->assertEqual($entity->field_datetime->value, $new_value);
+
+    // Test the generateSampleValue() method.
+    $entity = EntityTest::create();
+    $entity->field_datetime->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+  /**
+   * Tests using entity fields of the date field type.
+   */
+  public function testDateOnly() {
+    $this->fieldStorage->setSetting('datetime_type', DateTimeItem::DATETIME_TYPE_DATE);
+    $this->fieldStorage->save();
+
+    // Verify entity creation.
+    $entity = EntityTest::create();
+    $value = '2014-01-01';
+    $entity->field_datetime = $value;
+    $entity->name->value = $this->randomMachineName();
+    $this->entityValidateAndSave($entity);
+
+    // Verify entity has been created properly.
+    $id = $entity->id();
+    $entity = EntityTest::load($id);
+    $this->assertTrue($entity->field_datetime instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_datetime[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_datetime->value, $value);
+    $this->assertEqual($entity->field_datetime[0]->value, $value);
+
+    // Verify changing the date value.
+    $new_value = '2016-11-04';
+    $entity->field_datetime->value = $new_value;
+    $this->assertEqual($entity->field_datetime->value, $new_value);
+
+    // Read changed entity and assert changed values.
+    $this->entityValidateAndSave($entity);
     $entity = EntityTest::load($id);
     $this->assertEqual($entity->field_datetime->value, $new_value);
 
@@ -83,11 +139,15 @@ class DateTimeItemTest extends FieldKernelTestBase {
    * Tests DateTimeItem::setValue().
    */
   public function testSetValue() {
+    // Test a date+time field.
+    $this->fieldStorage->setSetting('datetime_type', DateTimeItem::DATETIME_TYPE_DATETIME);
+    $this->fieldStorage->save();
+
     // Test DateTimeItem::setValue() using string.
     $entity = EntityTest::create();
-    $value = '2014-01-01T20:00:00Z';
+    $value = '2014-01-01T20:00:00';
     $entity->get('field_datetime')->set(0, $value);
-    $entity->save();
+    $this->entityValidateAndSave($entity);
     // Load the entity and ensure the field was saved correctly.
     $id = $entity->id();
     $entity = EntityTest::load($id);
@@ -95,9 +155,33 @@ class DateTimeItemTest extends FieldKernelTestBase {
 
     // Test DateTimeItem::setValue() using property array.
     $entity = EntityTest::create();
-    $value = '2014-01-01T20:00:00Z';
+    $value = '2014-01-01T20:00:00';
     $entity->set('field_datetime', $value);
-    $entity->save();
+    $this->entityValidateAndSave($entity);
+    // Load the entity and ensure the field was saved correctly.
+    $id = $entity->id();
+    $entity = EntityTest::load($id);
+    $this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with array value.');
+
+    // Test a date-only field.
+    $this->fieldStorage->setSetting('datetime_type', DateTimeItem::DATETIME_TYPE_DATE);
+    $this->fieldStorage->save();
+
+    // Test DateTimeItem::setValue() using string.
+    $entity = EntityTest::create();
+    $value = '2014-01-01';
+    $entity->get('field_datetime')->set(0, $value);
+    $this->entityValidateAndSave($entity);
+    // Load the entity and ensure the field was saved correctly.
+    $id = $entity->id();
+    $entity = EntityTest::load($id);
+    $this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with string value.');
+
+    // Test DateTimeItem::setValue() using property array.
+    $entity = EntityTest::create();
+    $value = '2014-01-01';
+    $entity->set('field_datetime', $value);
+    $this->entityValidateAndSave($entity);
     // Load the entity and ensure the field was saved correctly.
     $id = $entity->id();
     $entity = EntityTest::load($id);
@@ -108,12 +192,29 @@ class DateTimeItemTest extends FieldKernelTestBase {
    * Tests setting the value of the DateTimeItem directly.
    */
   public function testSetValueProperty() {
-    // Test Date::setValue().
+    // Test Date::setValue() with a date+time field.
+    // Test a date+time field.
+    $this->fieldStorage->setSetting('datetime_type', DateTimeItem::DATETIME_TYPE_DATETIME);
+    $this->fieldStorage->save();
     $entity = EntityTest::create();
-    $value = '2014-01-01T20:00:00Z';
+    $value = '2014-01-01T20:00:00';
 
     $entity->set('field_datetime', $value);
-    $entity->save();
+    $this->entityValidateAndSave($entity);
+    // Load the entity and ensure the field was saved correctly.
+    $id = $entity->id();
+    $entity = EntityTest::load($id);
+    $this->assertEqual($entity->field_datetime[0]->value, $value, '"Value" property can be set directly.');
+
+    // Test Date::setValue() with a date-only field.
+    // Test a date+time field.
+    $this->fieldStorage->setSetting('datetime_type', DateTimeItem::DATETIME_TYPE_DATE);
+    $this->fieldStorage->save();
+    $entity = EntityTest::create();
+    $value = '2014-01-01';
+
+    $entity->set('field_datetime', $value);
+    $this->entityValidateAndSave($entity);
     // Load the entity and ensure the field was saved correctly.
     $id = $entity->id();
     $entity = EntityTest::load($id);
diff --git a/web/core/modules/datetime_range/datetime_range.module b/web/core/modules/datetime_range/datetime_range.module
index ceeb99dd8..b2b87dae7 100644
--- a/web/core/modules/datetime_range/datetime_range.module
+++ b/web/core/modules/datetime_range/datetime_range.module
@@ -15,13 +15,13 @@ function datetime_range_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.datetime_range':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Datetime Range module provides a Date field that stores start dates and times, as well as end dates and times. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI module help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":datetime_do">online documentation for the Datetime Range module</a>.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':datetime_do' => 'https://www.drupal.org/documentation/modules/datetime_range')) . '</p>';
+      $output .= '<p>' . t('The Datetime Range module provides a Date field that stores start dates and times, as well as end dates and times. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI module help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":datetime_do">online documentation for the Datetime Range module</a>.', [':field' => \Drupal::url('help.page', ['name' => 'field']), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#', ':datetime_do' => 'https://www.drupal.org/documentation/modules/datetime_range']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing and displaying date fields') . '</dt>';
-      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the Date field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the Date field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', [':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Displaying dates') . '</dt>';
-      $output .= '<dd>' . t('Dates can be displayed using the <em>Plain</em> or the <em>Default</em> formatter. The <em>Plain</em> formatter displays the date in the <a href="http://en.wikipedia.org/wiki/ISO_8601">ISO 8601</a> format. If you choose the <em>Default</em> formatter, you can choose a format from a predefined list that can be managed on the <a href=":date_format_list">Date and time formats</a> page.', array(':date_format_list' => \Drupal::url('entity.date_format.collection'))) . '</dd>';
+      $output .= '<dd>' . t('Dates can be displayed using the <em>Plain</em> or the <em>Default</em> formatter. The <em>Plain</em> formatter displays the date in the <a href="http://en.wikipedia.org/wiki/ISO_8601">ISO 8601</a> format. If you choose the <em>Default</em> formatter, you can choose a format from a predefined list that can be managed on the <a href=":date_format_list">Date and time formats</a> page.', [':date_format_list' => \Drupal::url('entity.date_format.collection')]) . '</dd>';
       $output .= '</dl>';
       return $output;
   }
diff --git a/web/core/modules/datetime_range/datetime_range.post_update.php b/web/core/modules/datetime_range/datetime_range.post_update.php
index 48a866bac..b5f3f5d31 100644
--- a/web/core/modules/datetime_range/datetime_range.post_update.php
+++ b/web/core/modules/datetime_range/datetime_range.post_update.php
@@ -5,18 +5,9 @@
  * Post-update functions for Datetime Range module.
  */
 
-/**
- * @addtogroup updates-8.2.x
- * @{
- */
-
 /**
  * Clear caches to ensure schema changes are read.
  */
 function datetime_range_post_update_translatable_separator() {
   // Empty post-update hook to cause a cache rebuild.
 }
-
-/**
- * @} End of "addtogroup updates-8.2.x".
- */
diff --git a/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeCustomFormatter.php b/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeCustomFormatter.php
index a23de5120..a26bbef9a 100644
--- a/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeCustomFormatter.php
+++ b/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeCustomFormatter.php
@@ -48,7 +48,7 @@ class DateRangeCustomFormatter extends DateTimeCustomFormatter {
         /** @var \Drupal\Core\Datetime\DrupalDateTime $end_date */
         $end_date = $item->end_date;
 
-        if ($start_date->format('U') !== $end_date->format('U')) {
+        if ($start_date->getTimestamp() !== $end_date->getTimestamp()) {
           $elements[$delta] = [
             'start_date' => $this->buildDate($start_date),
             'separator' => ['#plain_text' => ' ' . $separator . ' '],
diff --git a/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeDefaultFormatter.php b/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeDefaultFormatter.php
index c0feed2cd..f07e83432 100644
--- a/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeDefaultFormatter.php
+++ b/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeDefaultFormatter.php
@@ -49,7 +49,7 @@ class DateRangeDefaultFormatter extends DateTimeDefaultFormatter {
         /** @var \Drupal\Core\Datetime\DrupalDateTime $end_date */
         $end_date = $item->end_date;
 
-        if ($start_date->format('U') !== $end_date->format('U')) {
+        if ($start_date->getTimestamp() !== $end_date->getTimestamp()) {
           $elements[$delta] = [
             'start_date' => $this->buildDateWithIsoAttribute($start_date),
             'separator' => ['#plain_text' => ' ' . $separator . ' '],
diff --git a/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangePlainFormatter.php b/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangePlainFormatter.php
index 4842e1fd1..1fb4702cd 100644
--- a/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangePlainFormatter.php
+++ b/web/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangePlainFormatter.php
@@ -48,7 +48,7 @@ class DateRangePlainFormatter extends DateTimePlainFormatter {
         /** @var \Drupal\Core\Datetime\DrupalDateTime $end_date */
         $end_date = $item->end_date;
 
-        if ($start_date->format('U') !== $end_date->format('U')) {
+        if ($start_date->getTimestamp() !== $end_date->getTimestamp()) {
           $elements[$delta] = [
             'start_date' => $this->buildDate($start_date),
             'separator' => ['#plain_text' => ' ' . $separator . ' '],
diff --git a/web/core/modules/datetime_range/src/Plugin/Field/FieldWidget/DateRangeWidgetBase.php b/web/core/modules/datetime_range/src/Plugin/Field/FieldWidget/DateRangeWidgetBase.php
index ae9f24a32..e99374c20 100644
--- a/web/core/modules/datetime_range/src/Plugin/Field/FieldWidget/DateRangeWidgetBase.php
+++ b/web/core/modules/datetime_range/src/Plugin/Field/FieldWidget/DateRangeWidgetBase.php
@@ -19,11 +19,15 @@ class DateRangeWidgetBase extends DateTimeWidgetBase {
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $element = parent::formElement($items, $delta, $element, $form, $form_state);
+
+    // Wrap all of the select elements with a fieldset.
+    $element['#theme_wrappers'][] = 'fieldset';
+
     $element['#element_validate'][] = [$this, 'validateStartEnd'];
-    $element['value']['#title'] = $this->t('Start');
+    $element['value']['#title'] = $this->t('Start date');
 
     $element['end_value'] = [
-      '#title' => $this->t('End'),
+      '#title' => $this->t('End date'),
     ] + $element['value'];
 
     if ($items[$delta]->start_date) {
@@ -129,7 +133,7 @@ class DateRangeWidgetBase extends DateTimeWidgetBase {
     $end_date = $element['end_value']['#value']['object'];
 
     if ($start_date instanceof DrupalDateTime && $end_date instanceof DrupalDateTime) {
-      if ($start_date->format('U') !== $end_date->format('U')) {
+      if ($start_date->getTimestamp() !== $end_date->getTimestamp()) {
         $interval = $start_date->diff($end_date);
         if ($interval->invert === 1) {
           $form_state->setError($element, $this->t('The @title end date cannot be before the start date', ['@title' => $element['#title']]));
diff --git a/web/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php b/web/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
index 759352e8d..bf75fc0f1 100644
--- a/web/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
+++ b/web/core/modules/datetime_range/src/Tests/DateRangeFieldTest.php
@@ -61,9 +61,12 @@ class DateRangeFieldTest extends DateTestBase {
       $this->drupalGet('entity_test/add');
       $this->assertFieldByName("{$field_name}[0][value][date]", '', 'Start date element found.');
       $this->assertFieldByName("{$field_name}[0][end_value][date]", '', 'End date element found.');
-      $this->assertFieldByXPath('//*[@id="edit-' . $field_name . '-wrapper"]/h4[contains(@class, "js-form-required")]', TRUE, 'Required markup found');
+      $this->assertFieldByXPath('//*[@id="edit-' . $field_name . '-wrapper"]//label[contains(@class, "js-form-required")]', TRUE, 'Required markup found');
       $this->assertNoFieldByName("{$field_name}[0][value][time]", '', 'Start time element not found.');
       $this->assertNoFieldByName("{$field_name}[0][end_value][time]", '', 'End time element not found.');
+      $this->assertFieldByXPath('//fieldset[@id="edit-' . $field_name . '-0"]/legend//text()', $field_name, 'Fieldset and label found');
+      $this->assertFieldByXPath('//fieldset[@aria-describedby="edit-' . $field_name . '-0--description"]', NULL, 'ARIA described-by found');
+      $this->assertFieldByXPath('//div[@id="edit-' . $field_name . '-0--description"]', NULL, 'ARIA description found');
 
       // Build up dates in the UTC timezone.
       $value = '2012-12-31 00:00:00';
@@ -75,14 +78,14 @@ class DateRangeFieldTest extends DateTestBase {
       $date_format = DateFormat::load('html_date')->getPattern();
       $time_format = DateFormat::load('html_time')->getPattern();
 
-      $edit = array(
+      $edit = [
         "{$field_name}[0][value][date]" => $start_date->format($date_format),
         "{$field_name}[0][end_value][date]" => $end_date->format($date_format),
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Save'));
       preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
       $id = $match[1];
-      $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+      $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
       $this->assertRaw($start_date->format($date_format));
       $this->assertNoRaw($start_date->format($time_format));
       $this->assertRaw($end_date->format($date_format));
@@ -153,17 +156,17 @@ class DateRangeFieldTest extends DateTestBase {
         ->save();
       $expected = $start_date->format(DATETIME_DATE_STORAGE_FORMAT) . ' - ' . $end_date->format(DATETIME_DATE_STORAGE_FORMAT);
       $this->renderTestEntity($id);
-      $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected)));
+      $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
 
       // Verify that the custom formatter works.
       $this->displayOptions['type'] = 'daterange_custom';
-      $this->displayOptions['settings'] = array('date_format' => 'm/d/Y') + $this->defaultSettings;
+      $this->displayOptions['settings'] = ['date_format' => 'm/d/Y'] + $this->defaultSettings;
       entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
         ->setComponent($field_name, $this->displayOptions)
         ->save();
       $expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' - ' . $end_date->format($this->displayOptions['settings']['date_format']);
       $this->renderTestEntity($id);
-      $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', array('%expected' => $expected)));
+      $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
 
       // Test formatters when start date and end date are the same
       $this->drupalGet('entity_test/add');
@@ -173,15 +176,15 @@ class DateRangeFieldTest extends DateTestBase {
       $date_format = DateFormat::load('html_date')->getPattern();
       $time_format = DateFormat::load('html_time')->getPattern();
 
-      $edit = array(
+      $edit = [
         "{$field_name}[0][value][date]" => $start_date->format($date_format),
         "{$field_name}[0][end_value][date]" => $start_date->format($date_format),
-      );
+      ];
 
       $this->drupalPostForm(NULL, $edit, t('Save'));
       preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
       $id = $match[1];
-      $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+      $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
 
       datetime_date_default_time($start_date);
 
@@ -220,17 +223,17 @@ class DateRangeFieldTest extends DateTestBase {
         ->save();
       $expected = $start_date->format(DATETIME_DATE_STORAGE_FORMAT);
       $this->renderTestEntity($id);
-      $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected)));
+      $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
       $this->assertNoText(' THESEPARATOR ', 'Separator not found on page');
 
       $this->displayOptions['type'] = 'daterange_custom';
-      $this->displayOptions['settings'] = array('date_format' => 'm/d/Y') + $this->defaultSettings;
+      $this->displayOptions['settings'] = ['date_format' => 'm/d/Y'] + $this->defaultSettings;
       entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
         ->setComponent($field_name, $this->displayOptions)
         ->save();
       $expected = $start_date->format($this->displayOptions['settings']['date_format']);
       $this->renderTestEntity($id);
-      $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', array('%expected' => $expected)));
+      $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
       $this->assertNoText(' THESEPARATOR ', 'Separator not found on page');
     }
   }
@@ -251,6 +254,9 @@ class DateRangeFieldTest extends DateTestBase {
     $this->assertFieldByName("{$field_name}[0][value][time]", '', 'Start time element found.');
     $this->assertFieldByName("{$field_name}[0][end_value][date]", '', 'End date element found.');
     $this->assertFieldByName("{$field_name}[0][end_value][time]", '', 'End time element found.');
+    $this->assertFieldByXPath('//fieldset[@id="edit-' . $field_name . '-0"]/legend//text()', $field_name, 'Fieldset and label found');
+    $this->assertFieldByXPath('//fieldset[@aria-describedby="edit-' . $field_name . '-0--description"]', NULL, 'ARIA described-by found');
+    $this->assertFieldByXPath('//div[@id="edit-' . $field_name . '-0--description"]', NULL, 'ARIA description found');
 
     // Build up dates in the UTC timezone.
     $value = '2012-12-31 00:00:00';
@@ -266,16 +272,16 @@ class DateRangeFieldTest extends DateTestBase {
     $date_format = DateFormat::load('html_date')->getPattern();
     $time_format = DateFormat::load('html_time')->getPattern();
 
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $start_date->format($date_format),
       "{$field_name}[0][value][time]" => $start_date->format($time_format),
       "{$field_name}[0][end_value][date]" => $end_date->format($date_format),
       "{$field_name}[0][end_value][time]" => $end_date->format($time_format),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
     $this->assertRaw($start_date->format($date_format));
     $this->assertRaw($start_date->format($time_format));
     $this->assertRaw($end_date->format($date_format));
@@ -312,7 +318,7 @@ class DateRangeFieldTest extends DateTestBase {
       ->save();
     $expected = $start_date->format(DATETIME_DATETIME_STORAGE_FORMAT) . ' - ' . $end_date->format(DATETIME_DATETIME_STORAGE_FORMAT);
     $this->renderTestEntity($id);
-    $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
 
     // Verify that the 'datetime_custom' formatter works.
     $this->displayOptions['type'] = 'daterange_custom';
@@ -322,7 +328,7 @@ class DateRangeFieldTest extends DateTestBase {
       ->save();
     $expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' - ' . $end_date->format($this->displayOptions['settings']['date_format']);
     $this->renderTestEntity($id);
-    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
 
     // Verify that the 'timezone_override' setting works.
     $this->displayOptions['type'] = 'daterange_custom';
@@ -333,7 +339,7 @@ class DateRangeFieldTest extends DateTestBase {
     $expected = $start_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
     $expected .= ' - ' . $end_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
     $this->renderTestEntity($id);
-    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
 
     // Test formatters when start date and end date are the same
     $this->drupalGet('entity_test/add');
@@ -344,17 +350,17 @@ class DateRangeFieldTest extends DateTestBase {
     $date_format = DateFormat::load('html_date')->getPattern();
     $time_format = DateFormat::load('html_time')->getPattern();
 
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $start_date->format($date_format),
       "{$field_name}[0][value][time]" => $start_date->format($time_format),
       "{$field_name}[0][end_value][date]" => $start_date->format($date_format),
       "{$field_name}[0][end_value][time]" => $start_date->format($time_format),
-    );
+    ];
 
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
 
     $this->displayOptions = [
       'type' => 'daterange_default',
@@ -387,7 +393,7 @@ class DateRangeFieldTest extends DateTestBase {
       ->save();
     $expected = $start_date->format(DATETIME_DATETIME_STORAGE_FORMAT);
     $this->renderTestEntity($id);
-    $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
     $this->assertNoText(' THESEPARATOR ', 'Separator not found on page');
 
     $this->displayOptions['type'] = 'daterange_custom';
@@ -397,7 +403,7 @@ class DateRangeFieldTest extends DateTestBase {
       ->save();
     $expected = $start_date->format($this->displayOptions['settings']['date_format']);
     $this->renderTestEntity($id);
-    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
     $this->assertNoText(' THESEPARATOR ', 'Separator not found on page');
   }
 
@@ -415,9 +421,12 @@ class DateRangeFieldTest extends DateTestBase {
     $this->drupalGet('entity_test/add');
     $this->assertFieldByName("{$field_name}[0][value][date]", '', 'Start date element found.');
     $this->assertFieldByName("{$field_name}[0][end_value][date]", '', 'End date element found.');
-    $this->assertFieldByXPath('//*[@id="edit-' . $field_name . '-wrapper"]/h4[contains(@class, "js-form-required")]', TRUE, 'Required markup found');
+    $this->assertFieldByXPath('//*[@id="edit-' . $field_name . '-wrapper"]//label[contains(@class, "js-form-required")]', TRUE, 'Required markup found');
     $this->assertNoFieldByName("{$field_name}[0][value][time]", '', 'Start time element not found.');
     $this->assertNoFieldByName("{$field_name}[0][end_value][time]", '', 'End time element not found.');
+    $this->assertFieldByXPath('//fieldset[@id="edit-' . $field_name . '-0"]/legend//text()', $field_name, 'Fieldset and label found');
+    $this->assertFieldByXPath('//fieldset[@aria-describedby="edit-' . $field_name . '-0--description"]', NULL, 'ARIA described-by found');
+    $this->assertFieldByXPath('//div[@id="edit-' . $field_name . '-0--description"]', NULL, 'ARIA description found');
 
     // Build up dates in the proper timezone.
     $value = '2012-12-31 00:00:00';
@@ -429,14 +438,14 @@ class DateRangeFieldTest extends DateTestBase {
     $date_format = DateFormat::load('html_date')->getPattern();
     $time_format = DateFormat::load('html_time')->getPattern();
 
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $start_date->format($date_format),
       "{$field_name}[0][end_value][date]" => $end_date->format($date_format),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
     $this->assertRaw($start_date->format($date_format));
     $this->assertNoRaw($start_date->format($time_format));
     $this->assertRaw($end_date->format($date_format));
@@ -473,17 +482,17 @@ class DateRangeFieldTest extends DateTestBase {
       ->save();
     $expected = $start_date->format(DATETIME_DATETIME_STORAGE_FORMAT) . ' - ' . $end_date->format(DATETIME_DATETIME_STORAGE_FORMAT);
     $this->renderTestEntity($id);
-    $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
 
     // Verify that the custom formatter works.
     $this->displayOptions['type'] = 'daterange_custom';
-    $this->displayOptions['settings'] = array('date_format' => 'm/d/Y') + $this->defaultSettings;
+    $this->displayOptions['settings'] = ['date_format' => 'm/d/Y'] + $this->defaultSettings;
     entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
       ->setComponent($field_name, $this->displayOptions)
       ->save();
     $expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' - ' . $end_date->format($this->displayOptions['settings']['date_format']);
     $this->renderTestEntity($id);
-    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
 
     // Verify that the 'timezone_override' setting works.
     $this->displayOptions['type'] = 'daterange_custom';
@@ -494,7 +503,7 @@ class DateRangeFieldTest extends DateTestBase {
     $expected = $start_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
     $expected .= ' - ' . $end_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
     $this->renderTestEntity($id);
-    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
 
     // Test formatters when start date and end date are the same
     $this->drupalGet('entity_test/add');
@@ -507,14 +516,14 @@ class DateRangeFieldTest extends DateTestBase {
     $date_format = DateFormat::load('html_date')->getPattern();
     $time_format = DateFormat::load('html_time')->getPattern();
 
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value][date]" => $start_date->format($date_format),
       "{$field_name}[0][end_value][date]" => $start_date->format($date_format),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
 
     $this->displayOptions = [
       'type' => 'daterange_default',
@@ -549,7 +558,7 @@ class DateRangeFieldTest extends DateTestBase {
       ->save();
     $expected = $start_date->format(DATETIME_DATETIME_STORAGE_FORMAT) . ' THESEPARATOR ' . $end_date->format(DATETIME_DATETIME_STORAGE_FORMAT);
     $this->renderTestEntity($id);
-    $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
     $this->assertText(' THESEPARATOR ', 'Found proper separator');
 
     $this->displayOptions['type'] = 'daterange_custom';
@@ -559,7 +568,7 @@ class DateRangeFieldTest extends DateTestBase {
       ->save();
     $expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' THESEPARATOR ' . $end_date->format($this->displayOptions['settings']['date_format']);
     $this->renderTestEntity($id);
-    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', array('%expected' => $expected)));
+    $this->assertText($expected, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
     $this->assertText(' THESEPARATOR ', 'Found proper separator');
 
   }
@@ -587,6 +596,9 @@ class DateRangeFieldTest extends DateTestBase {
 
     // Display creation form.
     $this->drupalGet('entity_test/add');
+    $this->assertFieldByXPath('//fieldset[@id="edit-' . $field_name . '-0"]/legend//text()', $field_name, 'Fieldset and label found');
+    $this->assertFieldByXPath('//fieldset[@aria-describedby="edit-' . $field_name . '-0--description"]', NULL, 'ARIA described-by found');
+    $this->assertFieldByXPath('//div[@id="edit-' . $field_name . '-0--description"]', NULL, 'ARIA description found');
 
     // Assert that Hour and Minute Elements do not appear on Date Only.
     $this->assertNoFieldByXPath("//*[@id=\"edit-$field_name-0-value-hour\"]", NULL, 'Hour element not found on Date Only.');
diff --git a/web/core/modules/dblog/dblog.admin.inc b/web/core/modules/dblog/dblog.admin.inc
index 2b08878c5..1af89a63a 100644
--- a/web/core/modules/dblog/dblog.admin.inc
+++ b/web/core/modules/dblog/dblog.admin.inc
@@ -19,25 +19,25 @@ use Drupal\Core\Logger\RfcLogLevel;
  *   - options: Array of options for the select list for the filter.
  */
 function dblog_filters() {
-  $filters = array();
+  $filters = [];
 
   foreach (_dblog_get_message_types() as $type) {
     $types[$type] = t($type);
   }
 
   if (!empty($types)) {
-    $filters['type'] = array(
+    $filters['type'] = [
       'title' => t('Type'),
       'where' => "w.type = ?",
       'options' => $types,
-    );
+    ];
   }
 
-  $filters['severity'] = array(
+  $filters['severity'] = [
     'title' => t('Severity'),
     'where' => 'w.severity = ?',
     'options' => RfcLogLevel::getLevels(),
-  );
+  ];
 
   return $filters;
 }
diff --git a/web/core/modules/dblog/dblog.install b/web/core/modules/dblog/dblog.install
index 08270d2b4..f226ed04d 100644
--- a/web/core/modules/dblog/dblog.install
+++ b/web/core/modules/dblog/dblog.install
@@ -9,84 +9,84 @@
  * Implements hook_schema().
  */
 function dblog_schema() {
-  $schema['watchdog'] = array(
+  $schema['watchdog'] = [
     'description' => 'Table that contains logs of all system events.',
-    'fields' => array(
-      'wid' => array(
+    'fields' => [
+      'wid' => [
         'type' => 'serial',
         'not null' => TRUE,
         'description' => 'Primary Key: Unique watchdog event ID.',
-      ),
-      'uid' => array(
+      ],
+      'uid' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The {users}.uid of the user who triggered the event.',
-      ),
-      'type' => array(
+      ],
+      'type' => [
         'type' => 'varchar_ascii',
         'length' => 64,
         'not null' => TRUE,
         'default' => '',
         'description' => 'Type of log message, for example "user" or "page not found."',
-      ),
-      'message' => array(
+      ],
+      'message' => [
         'type' => 'text',
         'not null' => TRUE,
         'size' => 'big',
         'description' => 'Text of log message to be passed into the t() function.',
-      ),
-      'variables' => array(
+      ],
+      'variables' => [
         'type' => 'blob',
         'not null' => TRUE,
         'size' => 'big',
         'description' => 'Serialized array of variables that match the message string and that is passed into the t() function.',
-      ),
-      'severity' => array(
+      ],
+      'severity' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'size' => 'tiny',
         'description' => 'The severity level of the event; ranges from 0 (Emergency) to 7 (Debug)',
-      ),
-      'link' => array(
+      ],
+      'link' => [
         'type' => 'text',
         'not null' => FALSE,
         'description' => 'Link to view the result of the event.',
-      ),
-      'location'  => array(
+      ],
+      'location'  => [
         'type' => 'text',
         'not null' => TRUE,
         'description' => 'URL of the origin of the event.',
-      ),
-      'referer' => array(
+      ],
+      'referer' => [
         'type' => 'text',
         'not null' => FALSE,
         'description' => 'URL of referring page.',
-      ),
-      'hostname' => array(
+      ],
+      'hostname' => [
         'type' => 'varchar_ascii',
         'length' => 128,
         'not null' => TRUE,
         'default' => '',
         'description' => 'Hostname of the user who triggered the event.',
-      ),
-      'timestamp' => array(
+      ],
+      'timestamp' => [
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
         'description' => 'Unix timestamp of when event occurred.',
-      ),
-    ),
-    'primary key' => array('wid'),
-    'indexes' => array(
-      'type' => array('type'),
-      'uid' => array('uid'),
-      'severity' => array('severity'),
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['wid'],
+    'indexes' => [
+      'type' => ['type'],
+      'uid' => ['uid'],
+      'severity' => ['severity'],
+    ],
+  ];
 
   return $schema;
 }
diff --git a/web/core/modules/dblog/dblog.module b/web/core/modules/dblog/dblog.module
index 06fef103f..ed92d6c8f 100644
--- a/web/core/modules/dblog/dblog.module
+++ b/web/core/modules/dblog/dblog.module
@@ -21,13 +21,13 @@ function dblog_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.dblog':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Database Logging module logs system events in the Drupal database. For more information, see the <a href=":dblog">online documentation for the Database Logging module</a>.', array(':dblog' => 'https://www.drupal.org/documentation/modules/dblog')) . '</p>';
+      $output .= '<p>' . t('The Database Logging module logs system events in the Drupal database. For more information, see the <a href=":dblog">online documentation for the Database Logging module</a>.', [':dblog' => 'https://www.drupal.org/documentation/modules/dblog']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Monitoring your site') . '</dt>';
-      $output .= '<dd>' . t('The Database Logging module allows you to view an event log on the <a href=":dblog">Recent log messages</a> page. The log is a chronological list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the log on a regular basis to ensure their site is working properly.', array(':dblog' => \Drupal::url('dblog.overview'))) . '</dd>';
+      $output .= '<dd>' . t('The Database Logging module allows you to view an event log on the <a href=":dblog">Recent log messages</a> page. The log is a chronological list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the log on a regular basis to ensure their site is working properly.', [':dblog' => \Drupal::url('dblog.overview')]) . '</dd>';
       $output .= '<dt>' . t('Debugging site problems') . '</dt>';
-      $output .= '<dd>' . t('In case of errors or problems with the site, the <a href=":dblog">Recent log messages</a> page can be useful for debugging, since it shows the sequence of events. The log messages include usage information, warnings, and errors.', array(':dblog' => \Drupal::url('dblog.overview'))) . '</dd>';
+      $output .= '<dd>' . t('In case of errors or problems with the site, the <a href=":dblog">Recent log messages</a> page can be useful for debugging, since it shows the sequence of events. The log messages include usage information, warnings, and errors.', [':dblog' => \Drupal::url('dblog.overview')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -41,12 +41,12 @@ function dblog_help($route_name, RouteMatchInterface $route_match) {
  */
 function dblog_menu_links_discovered_alter(&$links) {
   if (\Drupal::moduleHandler()->moduleExists('search')) {
-    $links['dblog.search'] = array(
+    $links['dblog.search'] = [
       'title' => new TranslatableMarkup('Top search phrases'),
       'route_name' => 'dblog.search',
       'description' => new TranslatableMarkup('View most popular search phrases.'),
       'parent' => 'system.admin_reports',
-    );
+    ];
   }
 
   return $links;
@@ -66,7 +66,7 @@ function dblog_cron() {
   // e.g. auto_increment value > 1 or rows deleted directly from the table.
   if ($row_limit > 0) {
     $min_row = db_select('watchdog', 'w')
-      ->fields('w', array('wid'))
+      ->fields('w', ['wid'])
       ->orderBy('wid', 'DESC')
       ->range($row_limit - 1, 1)
       ->execute()->fetchField();
@@ -95,14 +95,14 @@ function _dblog_get_message_types() {
  * Implements hook_form_FORM_ID_alter() for system_logging_settings().
  */
 function dblog_form_system_logging_settings_alter(&$form, FormStateInterface $form_state) {
-  $row_limits = array(100, 1000, 10000, 100000, 1000000);
-  $form['dblog_row_limit'] = array(
+  $row_limits = [100, 1000, 10000, 100000, 1000000];
+  $form['dblog_row_limit'] = [
     '#type' => 'select',
     '#title' => t('Database log messages to keep'),
     '#default_value' => \Drupal::configFactory()->getEditable('dblog.settings')->get('row_limit'),
-    '#options' => array(0 => t('All')) + array_combine($row_limits, $row_limits),
-    '#description' => t('The maximum number of messages to keep in the database log. Requires a <a href=":cron">cron maintenance task</a>.', array(':cron' => \Drupal::url('system.status')))
-  );
+    '#options' => [0 => t('All')] + array_combine($row_limits, $row_limits),
+    '#description' => t('The maximum number of messages to keep in the database log. Requires a <a href=":cron">cron maintenance task</a>.', [':cron' => \Drupal::url('system.status')])
+  ];
 
   $form['#submit'][] = 'dblog_logging_settings_submit';
 }
diff --git a/web/core/modules/dblog/dblog.views.inc b/web/core/modules/dblog/dblog.views.inc
index dfc1fdec3..20ad9ceb2 100644
--- a/web/core/modules/dblog/dblog.views.inc
+++ b/web/core/modules/dblog/dblog.views.inc
@@ -9,208 +9,208 @@
  * Implements hook_views_data().
  */
 function dblog_views_data() {
-  $data = array();
+  $data = [];
 
   $data['watchdog']['table']['group'] = t('Watchdog');
   $data['watchdog']['table']['wizard_id'] = 'watchdog';
 
-  $data['watchdog']['table']['base'] = array(
+  $data['watchdog']['table']['base'] = [
     'field' => 'wid',
     'title' => t('Log entries'),
     'help' => t('Contains a list of log entries.'),
-  );
+  ];
 
-  $data['watchdog']['wid'] = array(
+  $data['watchdog']['wid'] = [
     'title' => t('WID'),
     'help' => t('Unique watchdog event ID.'),
-    'field' => array(
+    'field' => [
       'id' => 'numeric',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'numeric',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'numeric',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['watchdog']['uid'] = array(
+  $data['watchdog']['uid'] = [
     'title' => t('UID'),
     'help' => t('The user ID of the user on which the log entry was written..'),
-    'field' => array(
+    'field' => [
       'id' => 'numeric',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'numeric',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'numeric',
-    ),
-    'relationship' => array(
+    ],
+    'relationship' => [
       'title' => t('User'),
       'help' => t('The user on which the log entry as written.'),
       'base' => 'users',
       'base field' => 'uid',
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['watchdog']['type'] = array(
+  $data['watchdog']['type'] = [
     'title' => t('Type'),
     'help' => t('The type of the log entry, for example "user" or "page not found".'),
-    'field' => array(
+    'field' => [
       'id' => 'standard',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'string',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'in_operator',
       'options callback' => '_dblog_get_message_types',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['watchdog']['message'] = array(
+  $data['watchdog']['message'] = [
     'title' => t('Message'),
     'help' => t('The actual message of the log entry.'),
-    'field' => array(
+    'field' => [
       'id' => 'dblog_message',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'string',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'string',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['watchdog']['variables'] = array(
+  $data['watchdog']['variables'] = [
     'title' => t('Variables'),
     'help' => t('The variables of the log entry in a serialized format.'),
-    'field' => array(
+    'field' => [
       'id' => 'serialized',
       'click sortable' => FALSE,
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'string',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'string',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['watchdog']['severity'] = array(
+  $data['watchdog']['severity'] = [
     'title' => t('Severity level'),
     'help' => t('The severity level of the event; ranges from 0 (Emergency) to 7 (Debug).'),
-    'field' => array(
+    'field' => [
       'id' => 'machine_name',
       'options callback' => 'Drupal\dblog\Controller\DbLogController::getLogLevelClassMap',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'in_operator',
       'options callback' => 'Drupal\dblog\Controller\DbLogController::getLogLevelClassMap',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['watchdog']['link'] = array(
+  $data['watchdog']['link'] = [
     'title' => t('Operations'),
     'help' => t('Operation links for the event.'),
-    'field' => array(
+    'field' => [
       'id' => 'dblog_operations',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'string',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'string',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['watchdog']['location'] = array(
+  $data['watchdog']['location'] = [
     'title' => t('Location'),
     'help' => t('URL of the origin of the event.'),
-    'field' => array(
+    'field' => [
       'id' => 'standard',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'string',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'string',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['watchdog']['referer'] = array(
+  $data['watchdog']['referer'] = [
     'title' => t('Referer'),
     'help' => t('URL of the previous page.'),
-    'field' => array(
+    'field' => [
       'id' => 'standard',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'string',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'string',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['watchdog']['hostname'] = array(
+  $data['watchdog']['hostname'] = [
     'title' => t('Hostname'),
     'help' => t('Hostname of the user who triggered the event.'),
-    'field' => array(
+    'field' => [
       'id' => 'standard',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'string',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'string',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['watchdog']['timestamp'] = array(
+  $data['watchdog']['timestamp'] = [
     'title' => t('Timestamp'),
     'help' => t('Date when the event occurred.'),
-    'field' => array(
+    'field' => [
       'id' => 'date',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'date',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'date',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'date',
-    ),
-  );
+    ],
+  ];
 
   return $data;
 }
diff --git a/web/core/modules/dblog/src/Controller/DbLogController.php b/web/core/modules/dblog/src/Controller/DbLogController.php
index 36ee20411..10e2af8c5 100644
--- a/web/core/modules/dblog/src/Controller/DbLogController.php
+++ b/web/core/modules/dblog/src/Controller/DbLogController.php
@@ -94,7 +94,7 @@ class DbLogController extends ControllerBase {
    *   An array of log level classes.
    */
   public static function getLogLevelClassMap() {
-    return array(
+    return [
       RfcLogLevel::DEBUG => 'dblog-debug',
       RfcLogLevel::INFO => 'dblog-info',
       RfcLogLevel::NOTICE => 'dblog-notice',
@@ -103,7 +103,7 @@ class DbLogController extends ControllerBase {
       RfcLogLevel::CRITICAL => 'dblog-critical',
       RfcLogLevel::ALERT => 'dblog-alert',
       RfcLogLevel::EMERGENCY => 'dblog-emergency',
-    );
+    ];
   }
 
   /**
@@ -115,13 +115,13 @@ class DbLogController extends ControllerBase {
    * @return array
    *   A render array as expected by drupal_render().
    *
-   * @see dblog_clear_log_form()
-   * @see dblog_event()
+   * @see Drupal\dblog\Form\DblogClearLogConfirmForm
+   * @see Drupal\dblog\Controller\DbLogController::eventDetails()
    */
   public function overview() {
 
     $filter = $this->buildFilterQuery();
-    $rows = array();
+    $rows = [];
 
     $classes = static::getLogLevelClassMap();
 
@@ -129,32 +129,32 @@ class DbLogController extends ControllerBase {
 
     $build['dblog_filter_form'] = $this->formBuilder->getForm('Drupal\dblog\Form\DblogFilterForm');
 
-    $header = array(
+    $header = [
       // Icon column.
       '',
-      array(
+      [
         'data' => $this->t('Type'),
         'field' => 'w.type',
-        'class' => array(RESPONSIVE_PRIORITY_MEDIUM)),
-      array(
+        'class' => [RESPONSIVE_PRIORITY_MEDIUM]],
+      [
         'data' => $this->t('Date'),
         'field' => 'w.wid',
         'sort' => 'desc',
-        'class' => array(RESPONSIVE_PRIORITY_LOW)),
+        'class' => [RESPONSIVE_PRIORITY_LOW]],
       $this->t('Message'),
-      array(
+      [
         'data' => $this->t('User'),
         'field' => 'ufd.name',
-        'class' => array(RESPONSIVE_PRIORITY_MEDIUM)),
-      array(
+        'class' => [RESPONSIVE_PRIORITY_MEDIUM]],
+      [
         'data' => $this->t('Operations'),
-        'class' => array(RESPONSIVE_PRIORITY_LOW)),
-    );
+        'class' => [RESPONSIVE_PRIORITY_LOW]],
+    ];
 
     $query = $this->database->select('watchdog', 'w')
       ->extend('\Drupal\Core\Database\Query\PagerSelectExtender')
       ->extend('\Drupal\Core\Database\Query\TableSortExtender');
-    $query->fields('w', array(
+    $query->fields('w', [
       'wid',
       'uid',
       'severity',
@@ -163,7 +163,7 @@ class DbLogController extends ControllerBase {
       'message',
       'variables',
       'link',
-    ));
+    ]);
     $query->leftJoin('users_field_data', 'ufd', 'w.uid = ufd.uid');
 
     if (!empty($filter['where'])) {
@@ -181,45 +181,45 @@ class DbLogController extends ControllerBase {
         $log_text = Unicode::truncate($title, 56, TRUE, TRUE);
         // The link generator will escape any unsafe HTML entities in the final
         // text.
-        $message = $this->l($log_text, new Url('dblog.event', array('event_id' => $dblog->wid), array(
-          'attributes' => array(
+        $message = $this->l($log_text, new Url('dblog.event', ['event_id' => $dblog->wid], [
+          'attributes' => [
             // Provide a title for the link for useful hover hints. The
             // Attribute object will escape any unsafe HTML entities in the
             // final text.
             'title' => $title,
-          ),
-        )));
+          ],
+        ]));
       }
-      $username = array(
+      $username = [
         '#theme' => 'username',
         '#account' => $this->userStorage->load($dblog->uid),
-      );
-      $rows[] = array(
-        'data' => array(
+      ];
+      $rows[] = [
+        'data' => [
           // Cells.
-          array('class' => array('icon')),
+          ['class' => ['icon']],
           $this->t($dblog->type),
           $this->dateFormatter->format($dblog->timestamp, 'short'),
           $message,
-          array('data' => $username),
-          array('data' => array('#markup' => $dblog->link)),
-        ),
+          ['data' => $username],
+          ['data' => ['#markup' => $dblog->link]],
+        ],
         // Attributes for table row.
-        'class' => array(Html::getClass('dblog-' . $dblog->type), $classes[$dblog->severity]),
-      );
+        'class' => [Html::getClass('dblog-' . $dblog->type), $classes[$dblog->severity]],
+      ];
     }
 
-    $build['dblog_table'] = array(
+    $build['dblog_table'] = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
-      '#attributes' => array('id' => 'admin-dblog', 'class' => array('admin-dblog')),
+      '#attributes' => ['id' => 'admin-dblog', 'class' => ['admin-dblog']],
       '#empty' => $this->t('No log messages available.'),
-      '#attached' => array(
-        'library' => array('dblog/drupal.dblog'),
-      ),
-    );
-    $build['dblog_pager'] = array('#type' => 'pager');
+      '#attached' => [
+        'library' => ['dblog/drupal.dblog'],
+      ],
+    ];
+    $build['dblog_pager'] = ['#type' => 'pager'];
 
     return $build;
 
@@ -236,60 +236,60 @@ class DbLogController extends ControllerBase {
    *   format expected by drupal_render();
    */
   public function eventDetails($event_id) {
-    $build = array();
-    if ($dblog = $this->database->query('SELECT w.*, u.uid FROM {watchdog} w LEFT JOIN {users} u ON u.uid = w.uid WHERE w.wid = :id', array(':id' => $event_id))->fetchObject()) {
+    $build = [];
+    if ($dblog = $this->database->query('SELECT w.*, u.uid FROM {watchdog} w LEFT JOIN {users} u ON u.uid = w.uid WHERE w.wid = :id', [':id' => $event_id])->fetchObject()) {
       $severity = RfcLogLevel::getLevels();
       $message = $this->formatMessage($dblog);
-      $username = array(
+      $username = [
         '#theme' => 'username',
         '#account' => $dblog->uid ? $this->userStorage->load($dblog->uid) : User::getAnonymousUser(),
-      );
-      $rows = array(
-        array(
-          array('data' => $this->t('Type'), 'header' => TRUE),
+      ];
+      $rows = [
+        [
+          ['data' => $this->t('Type'), 'header' => TRUE],
           $this->t($dblog->type),
-        ),
-        array(
-          array('data' => $this->t('Date'), 'header' => TRUE),
+        ],
+        [
+          ['data' => $this->t('Date'), 'header' => TRUE],
           $this->dateFormatter->format($dblog->timestamp, 'long'),
-        ),
-        array(
-          array('data' => $this->t('User'), 'header' => TRUE),
-          array('data' => $username),
-        ),
-        array(
-          array('data' => $this->t('Location'), 'header' => TRUE),
+        ],
+        [
+          ['data' => $this->t('User'), 'header' => TRUE],
+          ['data' => $username],
+        ],
+        [
+          ['data' => $this->t('Location'), 'header' => TRUE],
           $this->l($dblog->location, $dblog->location ? Url::fromUri($dblog->location) : Url::fromRoute('<none>')),
-        ),
-        array(
-          array('data' => $this->t('Referrer'), 'header' => TRUE),
+        ],
+        [
+          ['data' => $this->t('Referrer'), 'header' => TRUE],
           $this->l($dblog->referer, $dblog->referer ? Url::fromUri($dblog->referer) : Url::fromRoute('<none>')),
-        ),
-        array(
-          array('data' => $this->t('Message'), 'header' => TRUE),
+        ],
+        [
+          ['data' => $this->t('Message'), 'header' => TRUE],
           $message,
-        ),
-        array(
-          array('data' => $this->t('Severity'), 'header' => TRUE),
+        ],
+        [
+          ['data' => $this->t('Severity'), 'header' => TRUE],
           $severity[$dblog->severity],
-        ),
-        array(
-          array('data' => $this->t('Hostname'), 'header' => TRUE),
+        ],
+        [
+          ['data' => $this->t('Hostname'), 'header' => TRUE],
           $dblog->hostname,
-        ),
-        array(
-          array('data' => $this->t('Operations'), 'header' => TRUE),
-          array('data' => array('#markup' => $dblog->link)),
-        ),
-      );
-      $build['dblog_table'] = array(
+        ],
+        [
+          ['data' => $this->t('Operations'), 'header' => TRUE],
+          ['data' => ['#markup' => $dblog->link]],
+        ],
+      ];
+      $build['dblog_table'] = [
         '#type' => 'table',
         '#rows' => $rows,
-        '#attributes' => array('class' => array('dblog-event')),
-        '#attached' => array(
-          'library' => array('dblog/drupal.dblog'),
-        ),
-      );
+        '#attributes' => ['class' => ['dblog-event']],
+        '#attached' => [
+          'library' => ['dblog/drupal.dblog'],
+        ],
+      ];
     }
 
     return $build;
@@ -311,9 +311,9 @@ class DbLogController extends ControllerBase {
     $filters = dblog_filters();
 
     // Build query.
-    $where = $args = array();
+    $where = $args = [];
     foreach ($_SESSION['dblog_overview_filter'] as $key => $filter) {
-      $filter_where = array();
+      $filter_where = [];
       foreach ($filter as $value) {
         $filter_where[] = $filters[$key]['where'];
         $args[] = $value;
@@ -324,10 +324,10 @@ class DbLogController extends ControllerBase {
     }
     $where = !empty($where) ? implode(' AND ', $where) : '';
 
-    return array(
+    return [
       'where' => $where,
       'args' => $args,
-    );
+    ];
   }
 
   /**
@@ -369,8 +369,6 @@ class DbLogController extends ControllerBase {
    * Messages are not truncated on this page because events detailed herein do
    * not have links to a detailed view.
    *
-   * Use one of the above *Report() methods.
-   *
    * @param string $type
    *   Type of database log events to display (e.g., 'search').
    *
@@ -378,10 +376,10 @@ class DbLogController extends ControllerBase {
    *   A build array in the format expected by drupal_render().
    */
   public function topLogMessages($type) {
-    $header = array(
-      array('data' => $this->t('Count'), 'field' => 'count', 'sort' => 'desc'),
-      array('data' => $this->t('Message'), 'field' => 'message'),
-    );
+    $header = [
+      ['data' => $this->t('Count'), 'field' => 'count', 'sort' => 'desc'],
+      ['data' => $this->t('Message'), 'field' => 'message'],
+    ];
 
     $count_query = $this->database->select('watchdog');
     $count_query->addExpression('COUNT(DISTINCT(message))');
@@ -392,7 +390,7 @@ class DbLogController extends ControllerBase {
       ->extend('\Drupal\Core\Database\Query\TableSortExtender');
     $query->addExpression('COUNT(wid)', 'count');
     $query = $query
-      ->fields('w', array('message', 'variables'))
+      ->fields('w', ['message', 'variables'])
       ->condition('w.type', $type)
       ->groupBy('message')
       ->groupBy('variables')
@@ -401,23 +399,23 @@ class DbLogController extends ControllerBase {
     $query->setCountQuery($count_query);
     $result = $query->execute();
 
-    $rows = array();
+    $rows = [];
     foreach ($result as $dblog) {
       if ($message = $this->formatMessage($dblog)) {
-        $rows[] = array($dblog->count, $message);
+        $rows[] = [$dblog->count, $message];
       }
     }
 
-    $build['dblog_top_table']  = array(
+    $build['dblog_top_table']  = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
       '#empty' => $this->t('No log messages available.'),
-      '#attached' => array(
-        'library' => array('dblog/drupal.dblog'),
-      ),
-    );
-    $build['dblog_top_pager'] = array('#type' => 'pager');
+      '#attached' => [
+        'library' => ['dblog/drupal.dblog'],
+      ],
+    ];
+    $build['dblog_top_pager'] = ['#type' => 'pager'];
 
     return $build;
   }
diff --git a/web/core/modules/dblog/src/Form/DblogClearLogConfirmForm.php b/web/core/modules/dblog/src/Form/DblogClearLogConfirmForm.php
index b1710df29..0f420f056 100644
--- a/web/core/modules/dblog/src/Form/DblogClearLogConfirmForm.php
+++ b/web/core/modules/dblog/src/Form/DblogClearLogConfirmForm.php
@@ -64,7 +64,7 @@ class DblogClearLogConfirmForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $_SESSION['dblog_overview_filter'] = array();
+    $_SESSION['dblog_overview_filter'] = [];
     $this->connection->truncate('watchdog')->execute();
     drupal_set_message($this->t('Database log cleared.'));
     $form_state->setRedirectUrl($this->getCancelUrl());
diff --git a/web/core/modules/dblog/src/Form/DblogFilterForm.php b/web/core/modules/dblog/src/Form/DblogFilterForm.php
index 0434f121a..c8de0fc68 100644
--- a/web/core/modules/dblog/src/Form/DblogFilterForm.php
+++ b/web/core/modules/dblog/src/Form/DblogFilterForm.php
@@ -23,39 +23,39 @@ class DblogFilterForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $filters = dblog_filters();
 
-    $form['filters'] = array(
+    $form['filters'] = [
       '#type' => 'details',
       '#title' => $this->t('Filter log messages'),
       '#open' => TRUE,
-    );
+    ];
     foreach ($filters as $key => $filter) {
-      $form['filters']['status'][$key] = array(
+      $form['filters']['status'][$key] = [
         '#title' => $filter['title'],
         '#type' => 'select',
         '#multiple' => TRUE,
         '#size' => 8,
         '#options' => $filter['options'],
-      );
+      ];
       if (!empty($_SESSION['dblog_overview_filter'][$key])) {
         $form['filters']['status'][$key]['#default_value'] = $_SESSION['dblog_overview_filter'][$key];
       }
     }
 
-    $form['filters']['actions'] = array(
+    $form['filters']['actions'] = [
       '#type' => 'actions',
-      '#attributes' => array('class' => array('container-inline')),
-    );
-    $form['filters']['actions']['submit'] = array(
+      '#attributes' => ['class' => ['container-inline']],
+    ];
+    $form['filters']['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Filter'),
-    );
+    ];
     if (!empty($_SESSION['dblog_overview_filter'])) {
-      $form['filters']['actions']['reset'] = array(
+      $form['filters']['actions']['reset'] = [
         '#type' => 'submit',
         '#value' => $this->t('Reset'),
-        '#limit_validation_errors' => array(),
-        '#submit' => array('::resetForm'),
-      );
+        '#limit_validation_errors' => [],
+        '#submit' => ['::resetForm'],
+      ];
     }
     return $form;
   }
@@ -90,7 +90,7 @@ class DblogFilterForm extends FormBase {
    *   The current state of the form.
    */
   public function resetForm(array &$form, FormStateInterface $form_state) {
-    $_SESSION['dblog_overview_filter'] = array();
+    $_SESSION['dblog_overview_filter'] = [];
   }
 
 }
diff --git a/web/core/modules/dblog/src/Logger/DbLog.php b/web/core/modules/dblog/src/Logger/DbLog.php
index af77be4d1..97b0b7b30 100644
--- a/web/core/modules/dblog/src/Logger/DbLog.php
+++ b/web/core/modules/dblog/src/Logger/DbLog.php
@@ -53,7 +53,7 @@ class DbLog implements LoggerInterface {
   /**
    * {@inheritdoc}
    */
-  public function log($level, $message, array $context = array()) {
+  public function log($level, $message, array $context = []) {
     // Remove any backtraces since they may contain an unserializable variable.
     unset($context['backtrace']);
 
@@ -64,7 +64,7 @@ class DbLog implements LoggerInterface {
     try {
       $this->connection
         ->insert('watchdog')
-        ->fields(array(
+        ->fields([
           'uid' => $context['uid'],
           'type' => Unicode::substr($context['channel'], 0, 64),
           'message' => $message,
@@ -75,7 +75,7 @@ class DbLog implements LoggerInterface {
           'referer' => $context['referer'],
           'hostname' => Unicode::substr($context['ip'], 0, 128),
           'timestamp' => $context['timestamp'],
-        ))
+        ])
         ->execute();
     }
     catch (\Exception $e) {
diff --git a/web/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php b/web/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php
index 4ac76f046..ed801fcec 100644
--- a/web/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php
+++ b/web/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php
@@ -38,13 +38,13 @@ class DBLogResource extends ResourceBase {
    */
   public function get($id = NULL) {
     if ($id) {
-      $record = db_query("SELECT * FROM {watchdog} WHERE wid = :wid", array(':wid' => $id))
+      $record = db_query("SELECT * FROM {watchdog} WHERE wid = :wid", [':wid' => $id])
         ->fetchAssoc();
       if (!empty($record)) {
         return new ResourceResponse($record);
       }
 
-      throw new NotFoundHttpException(t('Log entry with ID @id was not found', array('@id' => $id)));
+      throw new NotFoundHttpException(t('Log entry with ID @id was not found', ['@id' => $id]));
     }
 
     throw new BadRequestHttpException(t('No log entry ID was provided'));
diff --git a/web/core/modules/dblog/src/Plugin/views/field/DblogMessage.php b/web/core/modules/dblog/src/Plugin/views/field/DblogMessage.php
index e0558d897..3c6824284 100644
--- a/web/core/modules/dblog/src/Plugin/views/field/DblogMessage.php
+++ b/web/core/modules/dblog/src/Plugin/views/field/DblogMessage.php
@@ -34,7 +34,7 @@ class DblogMessage extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['replace_variables'] = array('default' => TRUE);
+    $options['replace_variables'] = ['default' => TRUE];
 
     return $options;
   }
@@ -45,11 +45,11 @@ class DblogMessage extends FieldPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['replace_variables'] = array(
+    $form['replace_variables'] = [
       '#title' => $this->t('Replace variables'),
       '#type' => 'checkbox',
       '#default_value' => $this->options['replace_variables'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/dblog/src/Tests/DbLogTest.php b/web/core/modules/dblog/src/Tests/DbLogTest.php
index 886f7681e..79cc03805 100644
--- a/web/core/modules/dblog/src/Tests/DbLogTest.php
+++ b/web/core/modules/dblog/src/Tests/DbLogTest.php
@@ -22,7 +22,7 @@ class DbLogTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('dblog', 'node', 'forum', 'help', 'block');
+  public static $modules = ['dblog', 'node', 'forum', 'help', 'block'];
 
   /**
    * A user with some relevant administrative permissions.
@@ -47,8 +47,8 @@ class DbLogTest extends WebTestBase {
     $this->drupalPlaceBlock('page_title_block');
 
     // Create users with specific permissions.
-    $this->adminUser = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'access site reports', 'administer users'));
-    $this->webUser = $this->drupalCreateUser(array());
+    $this->adminUser = $this->drupalCreateUser(['administer site configuration', 'access administration pages', 'access site reports', 'administer users']);
+    $this->webUser = $this->drupalCreateUser([]);
   }
 
   /**
@@ -58,7 +58,7 @@ class DbLogTest extends WebTestBase {
    * Database Logging module functionality through both the admin and user
    * interfaces.
    */
-  function testDbLog() {
+  public function testDbLog() {
     // Log in the admin user.
     $this->drupalLogin($this->adminUser);
 
@@ -70,8 +70,8 @@ class DbLogTest extends WebTestBase {
     $this->verifyBreadcrumbs();
     $this->verifyLinkEscaping();
     // Verify the overview table sorting.
-    $orders = array('Date', 'Type', 'User');
-    $sorts = array('asc', 'desc');
+    $orders = ['Date', 'Type', 'User'];
+    $sorts = ['asc', 'desc'];
     foreach ($orders as $order) {
       foreach ($sorts as $sort) {
         $this->verifySort($sort, $order);
@@ -124,14 +124,14 @@ class DbLogTest extends WebTestBase {
    */
   private function verifyRowLimit($row_limit) {
     // Change the database log row limit.
-    $edit = array();
+    $edit = [];
     $edit['dblog_row_limit'] = $row_limit;
     $this->drupalPostForm('admin/config/development/logging', $edit, t('Save configuration'));
     $this->assertResponse(200);
 
     // Check row limit variable.
     $current_limit = $this->config('dblog.settings')->get('row_limit');
-    $this->assertTrue($current_limit == $row_limit, format_string('[Cache] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit)));
+    $this->assertTrue($current_limit == $row_limit, format_string('[Cache] Row limit variable of @count equals row limit of @limit', ['@count' => $current_limit, '@limit' => $row_limit]));
   }
 
   /**
@@ -145,8 +145,27 @@ class DbLogTest extends WebTestBase {
     $this->generateLogEntries($row_limit + 10);
     // Verify that the database log row count exceeds the row limit.
     $count = db_query('SELECT COUNT(wid) FROM {watchdog}')->fetchField();
-    $this->assertTrue($count > $row_limit, format_string('Dblog row count of @count exceeds row limit of @limit', array('@count' => $count, '@limit' => $row_limit)));
+    $this->assertTrue($count > $row_limit, format_string('Dblog row count of @count exceeds row limit of @limit', ['@count' => $count, '@limit' => $row_limit]));
 
+    // Get the number of enabled modules. Cron adds a log entry for each module.
+    $list = \Drupal::moduleHandler()->getImplementations('cron');
+    $module_count = count($list);
+    $cron_detailed_count = $this->runCron();
+    $this->assertTrue($cron_detailed_count == $module_count + 2, format_string('Cron added @count of @expected new log entries', ['@count' => $cron_detailed_count, '@expected' => $module_count + 2]));
+
+    // Test disabling of detailed cron logging.
+    $this->config('system.cron')->set('logging', 0)->save();
+    $cron_count = $this->runCron();
+    $this->assertTrue($cron_count = 1, format_string('Cron added @count of @expected new log entries', ['@count' => $cron_count, '@expected' => 1]));
+  }
+
+  /**
+   * Runs cron and returns number of new log entries.
+   *
+   * @return int
+   *   Number of new watchdog entries.
+   */
+  private function runCron() {
     // Get last ID to compare against; log entries get deleted, so we can't
     // reliably add the number of newly created log entries to the current count
     // to measure number of log entries created by cron.
@@ -158,12 +177,7 @@ class DbLogTest extends WebTestBase {
     // Get last ID after cron was run.
     $current_id = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField();
 
-    // Get the number of enabled modules. Cron adds a log entry for each module.
-    $list = \Drupal::moduleHandler()->getImplementations('cron');
-    $module_count = count($list);
-
-    $count = $current_id - $last_id;
-    $this->assertTrue(($current_id - $last_id) == $module_count + 2, format_string('Cron added @count of @expected new log entries', array('@count' => $count, '@expected' => $module_count + 2)));
+    return $current_id - $last_id;
   }
 
   /**
@@ -189,7 +203,7 @@ class DbLogTest extends WebTestBase {
    *     entry.
    *   - 'timestamp': Int unix timestamp.
    */
-  private function generateLogEntries($count, $options = array()) {
+  private function generateLogEntries($count, $options = []) {
     global $base_root;
 
     // This long URL makes it just a little bit harder to pass the link part of
@@ -198,10 +212,10 @@ class DbLogTest extends WebTestBase {
     $link = urldecode('/content/xo%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A-lake-isabelle');
 
     // Prepare the fields to be logged
-    $log = $options + array(
+    $log = $options + [
       'channel'     => 'custom',
       'message'     => 'Dblog test log message',
-      'variables'   => array(),
+      'variables'   => [],
       'severity'    => RfcLogLevel::NOTICE,
       'link'        => $link,
       'user'        => $this->adminUser,
@@ -210,7 +224,7 @@ class DbLogTest extends WebTestBase {
       'referer'     => \Drupal::request()->server->get('HTTP_REFERER'),
       'ip'          => '127.0.0.1',
       'timestamp'   => REQUEST_TIME,
-    );
+    ];
 
     $logger = $this->container->get('logger.dblog');
     $message = $log['message'] . ' Entry #';
@@ -236,7 +250,7 @@ class DbLogTest extends WebTestBase {
    *   (optional) The log entry severity.
   */
   protected function filterLogsEntries($type = NULL, $severity = NULL) {
-    $edit = array();
+    $edit = [];
     if (!is_null($type)) {
       $edit['type[]'] = $type;
     }
@@ -307,8 +321,8 @@ class DbLogTest extends WebTestBase {
   private function verifyEvents() {
     // Invoke events.
     $this->doUser();
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => t('Article')));
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => t('Basic page')));
+    $this->drupalCreateContentType(['type' => 'article', 'name' => t('Article')]);
+    $this->drupalCreateContentType(['type' => 'page', 'name' => t('Basic page')]);
     $this->doNode('article');
     $this->doNode('page');
     $this->doNode('forum');
@@ -327,7 +341,7 @@ class DbLogTest extends WebTestBase {
    *   The order by which the table should be sorted.
    */
   public function verifySort($sort = 'asc', $order = 'Date') {
-    $this->drupalGet('admin/reports/dblog', array('query' => array('sort' => $sort, 'order' => $order)));
+    $this->drupalGet('admin/reports/dblog', ['query' => ['sort' => $sort, 'order' => $order]]);
     $this->assertResponse(200);
     $this->assertText(t('Recent log messages'), 'DBLog report was displayed correctly and sorting went fine.');
   }
@@ -337,12 +351,12 @@ class DbLogTest extends WebTestBase {
    * page.
    */
   private function verifyLinkEscaping() {
-    $link = \Drupal::l('View', Url::fromRoute('entity.node.canonical', array('node' => 1)));
+    $link = \Drupal::l('View', Url::fromRoute('entity.node.canonical', ['node' => 1]));
     $message = 'Log entry added to do the verifyLinkEscaping test.';
-    $this->generateLogEntries(1, array(
+    $this->generateLogEntries(1, [
       'message' => $message,
       'link' => $link,
-    ));
+    ]);
 
     $result = db_query_range('SELECT wid FROM {watchdog} ORDER BY wid DESC', 0, 1);
     $this->drupalGet('admin/reports/dblog/event/' . $result->fetchField());
@@ -360,7 +374,7 @@ class DbLogTest extends WebTestBase {
     $pass = user_password();
     // Add a user using the form to generate an add user event (which is not
     // triggered by drupalCreateUser).
-    $edit = array();
+    $edit = [];
     $edit['name'] = $name;
     $edit['mail'] = $name . '@example.com';
     $edit['pass[pass1]'] = $pass;
@@ -370,7 +384,7 @@ class DbLogTest extends WebTestBase {
     $this->assertResponse(200);
     // Retrieve the user object.
     $user = user_load_by_name($name);
-    $this->assertTrue($user != NULL, format_string('User @name was loaded', array('@name' => $name)));
+    $this->assertTrue($user != NULL, format_string('User @name was loaded', ['@name' => $name]));
     // pass_raw property is needed by drupalLogin.
     $user->pass_raw = $pass;
     // Log in user.
@@ -378,18 +392,18 @@ class DbLogTest extends WebTestBase {
     // Log out user.
     $this->drupalLogout();
     // Fetch the row IDs in watchdog that relate to the user.
-    $result = db_query('SELECT wid FROM {watchdog} WHERE uid = :uid', array(':uid' => $user->id()));
+    $result = db_query('SELECT wid FROM {watchdog} WHERE uid = :uid', [':uid' => $user->id()]);
     foreach ($result as $row) {
       $ids[] = $row->wid;
     }
     $count_before = (isset($ids)) ? count($ids) : 0;
-    $this->assertTrue($count_before > 0, format_string('DBLog contains @count records for @name', array('@count' => $count_before, '@name' => $user->getUsername())));
+    $this->assertTrue($count_before > 0, format_string('DBLog contains @count records for @name', ['@count' => $count_before, '@name' => $user->getUsername()]));
 
     // Log in the admin user.
     $this->drupalLogin($this->adminUser);
     // Delete the user created at the start of this test.
     // We need to POST here to invoke batch_process() in the internal browser.
-    $this->drupalPostForm('user/' . $user->id() . '/cancel', array('user_cancel_method' => 'user_cancel_reassign'), t('Cancel account'));
+    $this->drupalPostForm('user/' . $user->id() . '/cancel', ['user_cancel_method' => 'user_cancel_reassign'], t('Cancel account'));
 
     // View the database log report.
     $this->drupalGet('admin/reports/dblog');
@@ -399,13 +413,13 @@ class DbLogTest extends WebTestBase {
     // Add user.
     // Default display includes name and email address; if too long, the email
     // address is replaced by three periods.
-    $this->assertLogMessage(t('New user: %name %email.', array('%name' => $name, '%email' => '<' . $user->getEmail() . '>')), 'DBLog event was recorded: [add user]');
+    $this->assertLogMessage(t('New user: %name %email.', ['%name' => $name, '%email' => '<' . $user->getEmail() . '>']), 'DBLog event was recorded: [add user]');
     // Log in user.
-    $this->assertLogMessage(t('Session opened for %name.', array('%name' => $name)), 'DBLog event was recorded: [login user]');
+    $this->assertLogMessage(t('Session opened for %name.', ['%name' => $name]), 'DBLog event was recorded: [login user]');
     // Log out user.
-    $this->assertLogMessage(t('Session closed for %name.', array('%name' => $name)), 'DBLog event was recorded: [logout user]');
+    $this->assertLogMessage(t('Session closed for %name.', ['%name' => $name]), 'DBLog event was recorded: [logout user]');
     // Delete user.
-    $message = t('Deleted user: %name %email.', array('%name' => $name, '%email' => '<' . $user->getEmail() . '>'));
+    $message = t('Deleted user: %name %email.', ['%name' => $name, '%email' => '<' . $user->getEmail() . '>']);
     $message_text = Unicode::truncate(Html::decodeEntities(strip_tags($message)), 56, TRUE, TRUE);
     // Verify that the full message displays on the details page.
     $link = FALSE;
@@ -443,7 +457,7 @@ class DbLogTest extends WebTestBase {
    */
   private function doNode($type) {
     // Create user.
-    $perm = array('create ' . $type . ' content', 'edit own ' . $type . ' content', 'delete own ' . $type . ' content');
+    $perm = ['create ' . $type . ' content', 'edit own ' . $type . ' content', 'delete own ' . $type . ' content'];
     $user = $this->drupalCreateUser($perm);
     // Log in user.
     $this->drupalLogin($user);
@@ -456,13 +470,13 @@ class DbLogTest extends WebTestBase {
     $this->assertResponse(200);
     // Retrieve the node object.
     $node = $this->drupalGetNodeByTitle($title);
-    $this->assertTrue($node != NULL, format_string('Node @title was loaded', array('@title' => $title)));
+    $this->assertTrue($node != NULL, format_string('Node @title was loaded', ['@title' => $title]));
     // Edit the node.
     $edit = $this->getContentUpdate($type);
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
     $this->assertResponse(200);
     // Delete the node.
-    $this->drupalPostForm('node/' . $node->id() . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('node/' . $node->id() . '/delete', [], t('Delete'));
     $this->assertResponse(200);
     // View the node (to generate page not found event).
     $this->drupalGet('node/' . $node->id());
@@ -479,11 +493,11 @@ class DbLogTest extends WebTestBase {
 
     // Verify that node events were recorded.
     // Was node content added?
-    $this->assertLogMessage(t('@type: added %title.', array('@type' => $type, '%title' => $title)), 'DBLog event was recorded: [content added]');
+    $this->assertLogMessage(t('@type: added %title.', ['@type' => $type, '%title' => $title]), 'DBLog event was recorded: [content added]');
     // Was node content updated?
-    $this->assertLogMessage(t('@type: updated %title.', array('@type' => $type, '%title' => $title)), 'DBLog event was recorded: [content updated]');
+    $this->assertLogMessage(t('@type: updated %title.', ['@type' => $type, '%title' => $title]), 'DBLog event was recorded: [content updated]');
     // Was node content deleted?
-    $this->assertLogMessage(t('@type: deleted %title.', array('@type' => $type, '%title' => $title)), 'DBLog event was recorded: [content deleted]');
+    $this->assertLogMessage(t('@type: deleted %title.', ['@type' => $type, '%title' => $title]), 'DBLog event was recorded: [content deleted]');
 
     // View the database log access-denied report page.
     $this->drupalGet('admin/reports/access-denied');
@@ -510,18 +524,18 @@ class DbLogTest extends WebTestBase {
   private function getContent($type) {
     switch ($type) {
       case 'forum':
-        $content = array(
+        $content = [
           'title[0][value]' => $this->randomMachineName(8),
-          'taxonomy_forums' => array(1),
+          'taxonomy_forums' => [1],
           'body[0][value]' => $this->randomMachineName(32),
-        );
+        ];
         break;
 
       default:
-        $content = array(
+        $content = [
           'title[0][value]' => $this->randomMachineName(8),
           'body[0][value]' => $this->randomMachineName(32),
-        );
+        ];
         break;
     }
     return $content;
@@ -537,9 +551,9 @@ class DbLogTest extends WebTestBase {
    *   Random content needed by various node types.
    */
   private function getContentUpdate($type) {
-    $content = array(
+    $content = [
       'body[0][value]' => $this->randomMachineName(32),
-    );
+    ];
     return $content;
   }
 
@@ -553,10 +567,10 @@ class DbLogTest extends WebTestBase {
     global $base_root;
     // Get a count of how many watchdog entries already exist.
     $count = db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField();
-    $log = array(
+    $log = [
       'channel'     => 'system',
       'message'     => 'Log entry added to test the doClearTest clear down.',
-      'variables'   => array(),
+      'variables'   => [],
       'severity'    => RfcLogLevel::NOTICE,
       'link'        => NULL,
       'user'        => $this->adminUser,
@@ -565,20 +579,20 @@ class DbLogTest extends WebTestBase {
       'referer'     => \Drupal::request()->server->get('HTTP_REFERER'),
       'ip'          => '127.0.0.1',
       'timestamp'   => REQUEST_TIME,
-    );
+    ];
     // Add a watchdog entry.
     $this->container->get('logger.dblog')->log($log['severity'], $log['message'], $log);
     // Make sure the table count has actually been incremented.
-    $this->assertEqual($count + 1, db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), format_string('\Drupal\dblog\Logger\DbLog->log() added an entry to the dblog :count', array(':count' => $count)));
+    $this->assertEqual($count + 1, db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), format_string('\Drupal\dblog\Logger\DbLog->log() added an entry to the dblog :count', [':count' => $count]));
     // Log in the admin user.
     $this->drupalLogin($this->adminUser);
     // Post in order to clear the database table.
     $this->clearLogsEntries();
     // Confirm that the logs should be cleared.
-    $this->drupalPostForm(NULL, array(), 'Confirm');
+    $this->drupalPostForm(NULL, [], 'Confirm');
     // Count the rows in watchdog that previously related to the deleted user.
     $count = db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField();
-    $this->assertEqual($count, 0, format_string('DBLog contains :count records after a clear.', array(':count' => $count)));
+    $this->assertEqual($count, 0, format_string('DBLog contains :count records after a clear.', [':count' => $count]));
   }
 
   /**
@@ -591,21 +605,21 @@ class DbLogTest extends WebTestBase {
     db_delete('watchdog')->execute();
 
     // Generate 9 random watchdog entries.
-    $type_names = array();
-    $types = array();
+    $type_names = [];
+    $types = [];
     for ($i = 0; $i < 3; $i++) {
       $type_names[] = $type_name = $this->randomMachineName();
       $severity = RfcLogLevel::EMERGENCY;
       for ($j = 0; $j < 3; $j++) {
-        $types[] = $type = array(
+        $types[] = $type = [
           'count' => $j + 1,
           'type' => $type_name,
           'severity' => $severity++,
-        );
-        $this->generateLogEntries($type['count'], array(
+        ];
+        $this->generateLogEntries($type['count'], [
           'channel' => $type['type'],
           'severity' => $type['severity'],
-        ));
+        ]);
       }
     }
 
@@ -644,14 +658,14 @@ class DbLogTest extends WebTestBase {
       $this->assertEqual(array_sum($count), $type['count'], 'Count matched');
     }
 
-    $this->drupalGet('admin/reports/dblog', array('query' => array('order' => 'Type')));
+    $this->drupalGet('admin/reports/dblog', ['query' => ['order' => 'Type']]);
     $this->assertResponse(200);
     $this->assertText(t('Operations'), 'Operations text found');
 
     // Clear all logs and make sure the confirmation message is found.
     $this->clearLogsEntries();
     // Confirm that the logs should be cleared.
-    $this->drupalPostForm(NULL, array(), 'Confirm');
+    $this->drupalPostForm(NULL, [], 'Confirm');
     $this->assertText(t('Database log cleared.'), 'Confirmation message found');
   }
 
@@ -666,16 +680,16 @@ class DbLogTest extends WebTestBase {
    *   - user: (string) The user associated with this database log event.
    */
   protected function getLogEntries() {
-    $entries = array();
+    $entries = [];
     if ($table = $this->getLogsEntriesTable()) {
       $table = array_shift($table);
       foreach ($table->tbody->tr as $row) {
-        $entries[] = array(
+        $entries[] = [
           'severity' => $this->getSeverityConstant($row['class']),
           'type' => $this->asText($row->td[1]),
           'message' => $this->asText($row->td[3]),
           'user' => $this->asText($row->td[4]),
-        );
+        ];
       }
     }
     return $entries;
@@ -781,7 +795,7 @@ class DbLogTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
 
     // Generate a single watchdog entry.
-    $this->generateLogEntries(1, array('user' => $tempuser, 'uid' => $tempuser_uid));
+    $this->generateLogEntries(1, ['user' => $tempuser, 'uid' => $tempuser_uid]);
     $wid = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField();
 
     // Check if the full message displays on the details page.
diff --git a/web/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php b/web/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php
index 279d202a1..44dbe99dd 100644
--- a/web/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php
+++ b/web/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php
@@ -18,7 +18,7 @@ class DbLogResourceTest extends RESTTestBase {
    *
    * @var array
    */
-  public static $modules = array('hal', 'dblog');
+  public static $modules = ['hal', 'dblog'];
 
   protected function setUp() {
     parent::setUp();
@@ -33,12 +33,12 @@ class DbLogResourceTest extends RESTTestBase {
     // Write a log message to the DB.
     $this->container->get('logger.channel.rest')->notice('Test message');
     // Get the ID of the written message.
-    $id = db_query_range("SELECT wid FROM {watchdog} WHERE type = :type ORDER BY wid DESC", 0, 1, array(':type' => 'rest'))
+    $id = db_query_range("SELECT wid FROM {watchdog} WHERE type = :type ORDER BY wid DESC", 0, 1, [':type' => 'rest'])
       ->fetchField();
 
     // Create a user account that has the required permissions to read
     // the watchdog resource via the REST API.
-    $account = $this->drupalCreateUser(array('restful get dblog'));
+    $account = $this->drupalCreateUser(['restful get dblog']);
     $this->drupalLogin($account);
 
     $response = $this->httpRequest(Url::fromRoute('rest.dblog.GET.' . $this->defaultFormat, ['id' => $id, '_format' => $this->defaultFormat]), 'GET');
diff --git a/web/core/modules/dblog/src/Tests/ConnectionFailureTest.php b/web/core/modules/dblog/tests/src/Functional/ConnectionFailureTest.php
similarity index 85%
rename from web/core/modules/dblog/src/Tests/ConnectionFailureTest.php
rename to web/core/modules/dblog/tests/src/Functional/ConnectionFailureTest.php
index d8002243a..37c855ae2 100644
--- a/web/core/modules/dblog/src/Tests/ConnectionFailureTest.php
+++ b/web/core/modules/dblog/tests/src/Functional/ConnectionFailureTest.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Drupal\dblog\Tests;
+namespace Drupal\Tests\dblog\Functional;
 
 use Drupal\Core\Database\Database;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests logging of connection failures.
  *
  * @group dblog
  */
-class ConnectionFailureTest extends WebTestBase {
+class ConnectionFailureTest extends BrowserTestBase {
 
-  public static $modules = array('dblog');
+  public static $modules = ['dblog'];
 
   /**
    * Tests logging of connection failures.
    */
-  function testConnectionFailureLogging() {
+  public function testConnectionFailureLogging() {
     $logger = \Drupal::service('logger.factory');
 
     // MySQL errors like "1153 - Got a packet bigger than 'max_allowed_packet'
diff --git a/web/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php b/web/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php
index 569cdbf7d..c0d97bee3 100644
--- a/web/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php
+++ b/web/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php
@@ -31,7 +31,7 @@ class DbLogFormInjectionTest extends KernelTestBase implements FormInterface {
    *
    * @var array
    */
-  public static $modules = array('system', 'dblog', 'user');
+  public static $modules = ['system', 'dblog', 'user'];
 
   /**
    * {@inheritdoc}
@@ -82,10 +82,10 @@ class DbLogFormInjectionTest extends KernelTestBase implements FormInterface {
     $this->installSchema('system', ['key_value_expire', 'sequences']);
     $this->installEntitySchema('user');
     $this->logger = \Drupal::logger('test_logger');
-    $test_user = User::create(array(
+    $test_user = User::create([
       'name' => 'foobar',
       'mail' => 'foobar@example.com',
-    ));
+    ]);
     $test_user->save();
     \Drupal::service('current_user')->setAccount($test_user);
   }
diff --git a/web/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php b/web/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
index 321870fb3..73a6d83d2 100644
--- a/web/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
+++ b/web/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\dblog\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
diff --git a/web/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php b/web/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
index 1968a12e9..7b63394d5 100644
--- a/web/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
+++ b/web/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
@@ -22,14 +22,14 @@ class ViewsIntegrationTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_dblog');
+  public static $testViews = ['test_dblog'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('dblog', 'dblog_test_views', 'user');
+  public static $modules = ['dblog', 'dblog_test_views', 'user'];
 
   /**
    * {@inheritdoc}
@@ -40,9 +40,9 @@ class ViewsIntegrationTest extends ViewsKernelTestBase {
     // Rebuild the router, otherwise we can't generate links.
     $this->container->get('router.builder')->rebuild();
 
-    $this->installSchema('dblog', array('watchdog'));
+    $this->installSchema('dblog', ['watchdog']);
 
-    ViewTestData::createTestViews(get_class($this), array('dblog_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['dblog_test_views']);
   }
 
   /**
@@ -53,35 +53,35 @@ class ViewsIntegrationTest extends ViewsKernelTestBase {
     // Remove the watchdog entries added by the potential batch process.
     $this->container->get('database')->truncate('watchdog')->execute();
 
-    $entries = array();
+    $entries = [];
     // Setup a watchdog entry without tokens.
-    $entries[] = array(
+    $entries[] = [
       'message' => $this->randomMachineName(),
-      'variables' => array('link' => \Drupal::l('Link', new Url('<front>'))),
-    );
+      'variables' => ['link' => \Drupal::l('Link', new Url('<front>'))],
+    ];
     // Setup a watchdog entry with one token.
-    $entries[] = array(
+    $entries[] = [
       'message' => '@token1',
-      'variables' => array('@token1' => $this->randomMachineName(), 'link' => \Drupal::l('Link', new Url('<front>'))),
-    );
+      'variables' => ['@token1' => $this->randomMachineName(), 'link' => \Drupal::l('Link', new Url('<front>'))],
+    ];
     // Setup a watchdog entry with two tokens.
-    $entries[] = array(
+    $entries[] = [
       'message' => '@token1 @token2',
       // Setup a link with a tag which is filtered by
       // \Drupal\Component\Utility\Xss::filterAdmin() in order to make sure
       // that strings which are not marked as safe get filtered.
-      'variables' => array(
+      'variables' => [
         '@token1' => $this->randomMachineName(),
         '@token2' => $this->randomMachineName(),
         'link' => '<a href="' . \Drupal::url('<front>') . '"><object>Link</object></a>',
-      ),
-    );
+      ],
+    ];
     $logger_factory = $this->container->get('logger.factory');
     foreach ($entries as $entry) {
-      $entry += array(
+      $entry += [
         'type' => 'test-views',
         'severity' => RfcLogLevel::NOTICE,
-      );
+      ];
       $logger_factory->get($entry['type'])->log($entry['severity'], $entry['message'], $entry['variables']);
     }
 
diff --git a/web/core/modules/dynamic_page_cache/src/Tests/DynamicPageCacheIntegrationTest.php b/web/core/modules/dynamic_page_cache/tests/src/Functional/DynamicPageCacheIntegrationTest.php
similarity index 92%
rename from web/core/modules/dynamic_page_cache/src/Tests/DynamicPageCacheIntegrationTest.php
rename to web/core/modules/dynamic_page_cache/tests/src/Functional/DynamicPageCacheIntegrationTest.php
index 067a1047b..ffa8f4375 100644
--- a/web/core/modules/dynamic_page_cache/src/Tests/DynamicPageCacheIntegrationTest.php
+++ b/web/core/modules/dynamic_page_cache/tests/src/Functional/DynamicPageCacheIntegrationTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\dynamic_page_cache\Tests;
+namespace Drupal\Tests\dynamic_page_cache\Functional;
 
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 use Drupal\Core\Url;
 use Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Enables the Dynamic Page Cache and tests it in various scenarios.
@@ -20,7 +20,7 @@ use Drupal\simpletest\WebTestBase;
  *
  * @see \Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber
  */
-class DynamicPageCacheIntegrationTest extends WebTestBase {
+class DynamicPageCacheIntegrationTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
@@ -94,11 +94,11 @@ class DynamicPageCacheIntegrationTest extends WebTestBase {
     // Controllers returning render arrays, rendered as anything except a HTML
     // response, are ignored by Dynamic Page Cache (but only because those
     // wrapper formats' responses do not implement CacheableResponseInterface).
-    $this->drupalGet('dynamic-page-cache-test/html', array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax')));
+    $this->drupalGet('dynamic-page-cache-test/html', ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
     $this->assertFalse($this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER), 'Render array returned, rendered as AJAX response: Dynamic Page Cache is ignoring.');
-    $this->drupalGet('dynamic-page-cache-test/html', array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_dialog')));
+    $this->drupalGet('dynamic-page-cache-test/html', ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_dialog']]);
     $this->assertFalse($this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER), 'Render array returned, rendered as dialog response: Dynamic Page Cache is ignoring.');
-    $this->drupalGet('dynamic-page-cache-test/html', array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_modal')));
+    $this->drupalGet('dynamic-page-cache-test/html', ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_modal']]);
     $this->assertFalse($this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER), 'Render array returned, rendered as modal response: Dynamic Page Cache is ignoring.');
 
     // Admin routes are ignored by Dynamic Page Cache.
diff --git a/web/core/modules/editor/editor.admin.inc b/web/core/modules/editor/editor.admin.inc
index 83bc2cf37..f91db4b96 100644
--- a/web/core/modules/editor/editor.admin.inc
+++ b/web/core/modules/editor/editor.admin.inc
@@ -27,77 +27,77 @@ use Drupal\editor\Entity\Editor;
 function editor_image_upload_settings_form(Editor $editor) {
   // Defaults.
   $image_upload = $editor->getImageUploadSettings();
-  $image_upload += array(
+  $image_upload += [
     'status' => FALSE,
     'scheme' => file_default_scheme(),
     'directory' => 'inline-images',
     'max_size' => '',
-    'max_dimensions' => array('width' => '', 'height' => ''),
-  );
+    'max_dimensions' => ['width' => '', 'height' => ''],
+  ];
 
-  $form['status'] = array(
+  $form['status'] = [
     '#type' => 'checkbox',
     '#title' => t('Enable image uploads'),
     '#default_value' => $image_upload['status'],
-    '#attributes' => array(
+    '#attributes' => [
       'data-editor-image-upload' => 'status',
-    ),
-  );
-  $show_if_image_uploads_enabled = array(
-    'visible' => array(
-      ':input[data-editor-image-upload="status"]' => array('checked' => TRUE),
-    ),
-  );
+    ],
+  ];
+  $show_if_image_uploads_enabled = [
+    'visible' => [
+      ':input[data-editor-image-upload="status"]' => ['checked' => TRUE],
+    ],
+  ];
 
   // Any visible, writable wrapper can potentially be used for uploads,
   // including a remote file system that integrates with a CDN.
   $options = \Drupal::service('stream_wrapper_manager')->getDescriptions(StreamWrapperInterface::WRITE_VISIBLE);
   if (!empty($options)) {
-    $form['scheme'] = array(
+    $form['scheme'] = [
       '#type' => 'radios',
       '#title' => t('File storage'),
       '#default_value' => $image_upload['scheme'],
       '#options' => $options,
       '#states' => $show_if_image_uploads_enabled,
       '#access' => count($options) > 1,
-    );
+    ];
   }
   // Set data- attributes with human-readable names for all possible stream
   // wrappers, so that drupal.ckeditor.drupalimage.admin's summary rendering
   // can use that.
   foreach (\Drupal::service('stream_wrapper_manager')->getNames(StreamWrapperInterface::WRITE_VISIBLE) as $scheme => $name) {
-    $form['scheme'][$scheme]['#attributes']['data-label'] = t('Storage: @name', array('@name' => $name));
+    $form['scheme'][$scheme]['#attributes']['data-label'] = t('Storage: @name', ['@name' => $name]);
   }
 
-  $form['directory'] = array(
+  $form['directory'] = [
     '#type' => 'textfield',
     '#default_value' => $image_upload['directory'],
     '#title' => t('Upload directory'),
     '#description' => t("A directory relative to Drupal's files directory where uploaded images will be stored."),
     '#states' => $show_if_image_uploads_enabled,
-  );
+  ];
 
   $default_max_size = format_size(file_upload_max_size());
-  $form['max_size'] = array(
+  $form['max_size'] = [
     '#type' => 'textfield',
     '#default_value' => $image_upload['max_size'],
     '#title' => t('Maximum file size'),
-    '#description' => t('If this is left empty, then the file size will be limited by the PHP maximum upload size of @size.', array('@size' => $default_max_size)),
+    '#description' => t('If this is left empty, then the file size will be limited by the PHP maximum upload size of @size.', ['@size' => $default_max_size]),
     '#maxlength' => 20,
     '#size' => 10,
     '#placeholder' => $default_max_size,
     '#states' => $show_if_image_uploads_enabled,
-  );
+  ];
 
-  $form['max_dimensions'] = array(
+  $form['max_dimensions'] = [
     '#type' => 'item',
     '#title' => t('Maximum dimensions'),
     '#field_prefix' => '<div class="container-inline clearfix">',
     '#field_suffix' => '</div>',
     '#description' => t('Images larger than these dimensions will be scaled down.'),
     '#states' => $show_if_image_uploads_enabled,
-  );
-  $form['max_dimensions']['width'] = array(
+  ];
+  $form['max_dimensions']['width'] = [
     '#title' => t('Width'),
     '#title_display' => 'invisible',
     '#type' => 'number',
@@ -109,8 +109,8 @@ function editor_image_upload_settings_form(Editor $editor) {
     '#placeholder' => t('width'),
     '#field_suffix' => ' x ',
     '#states' => $show_if_image_uploads_enabled,
-  );
-  $form['max_dimensions']['height'] = array(
+  ];
+  $form['max_dimensions']['height'] = [
     '#title' => t('Height'),
     '#title_display' => 'invisible',
     '#type' => 'number',
@@ -122,7 +122,7 @@ function editor_image_upload_settings_form(Editor $editor) {
     '#placeholder' => t('height'),
     '#field_suffix' => t('pixels'),
     '#states' => $show_if_image_uploads_enabled,
-  );
+  ];
 
   return $form;
 }
diff --git a/web/core/modules/editor/editor.api.php b/web/core/modules/editor/editor.api.php
index 2fd9fa41b..6485a1e5f 100644
--- a/web/core/modules/editor/editor.api.php
+++ b/web/core/modules/editor/editor.api.php
@@ -36,7 +36,7 @@ function hook_editor_info_alter(array &$editors) {
 function hook_editor_js_settings_alter(array &$settings) {
   if (isset($settings['editor']['formats']['basic_html'])) {
     $settings['editor']['formats']['basic_html']['editor'] = 'MyDifferentEditor';
-    $settings['editor']['formats']['basic_html']['editorSettings']['buttons'] = array('strong', 'italic', 'underline');
+    $settings['editor']['formats']['basic_html']['editorSettings']['buttons'] = ['strong', 'italic', 'underline'];
   }
 }
 
diff --git a/web/core/modules/editor/editor.module b/web/core/modules/editor/editor.module
index f48c51b80..dccf8239b 100644
--- a/web/core/modules/editor/editor.module
+++ b/web/core/modules/editor/editor.module
@@ -25,13 +25,13 @@ function editor_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.editor':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Text Editor module provides a framework that other modules (such as <a href=":ckeditor">CKEditor module</a>) can use to provide toolbars and other functionality that allow users to format text more easily than typing HTML tags directly. For more information, see the <a href=":documentation">online documentation for the Text Editor module</a>.', array(':documentation' => 'https://www.drupal.org/documentation/modules/editor', ':ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? \Drupal::url('help.page', array('name' => 'ckeditor')) : '#')) . '</p>';
+      $output .= '<p>' . t('The Text Editor module provides a framework that other modules (such as <a href=":ckeditor">CKEditor module</a>) can use to provide toolbars and other functionality that allow users to format text more easily than typing HTML tags directly. For more information, see the <a href=":documentation">online documentation for the Text Editor module</a>.', [':documentation' => 'https://www.drupal.org/documentation/modules/editor', ':ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? \Drupal::url('help.page', ['name' => 'ckeditor']) : '#']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Installing text editors') . '</dt>';
-      $output .= '<dd>' . t('The Text Editor module provides a framework for managing editors. To use it, you also need to enable a text editor. This can either be the core <a href=":ckeditor">CKEditor module</a>, which can be enabled on the <a href=":extend">Extend page</a>, or a contributed module for any other text editor. When installing a contributed text editor module, be sure to check the installation instructions, because you will most likely need to download and install an external library as well as the Drupal module.', array(':ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? \Drupal::url('help.page', array('name' => 'ckeditor')) : '#', ':extend' => \Drupal::url('system.modules_list'))) . '</dd>';
+      $output .= '<dd>' . t('The Text Editor module provides a framework for managing editors. To use it, you also need to enable a text editor. This can either be the core <a href=":ckeditor">CKEditor module</a>, which can be enabled on the <a href=":extend">Extend page</a>, or a contributed module for any other text editor. When installing a contributed text editor module, be sure to check the installation instructions, because you will most likely need to download and install an external library as well as the Drupal module.', [':ckeditor' => (\Drupal::moduleHandler()->moduleExists('ckeditor')) ? \Drupal::url('help.page', ['name' => 'ckeditor']) : '#', ':extend' => \Drupal::url('system.modules_list')]) . '</dd>';
       $output .= '<dt>' . t('Enabling a text editor for a text format') . '</dt>';
-      $output .= '<dd>' . t('On the <a href=":formats">Text formats and editors page</a> you can see which text editor is associated with each text format. You can change this by clicking on the <em>Configure</em> link, and then choosing a text editor or <em>none</em> from the <em>Text editor</em> drop-down list. The text editor will then be displayed with any text field for which this text format is chosen.', array(':formats' => \Drupal::url('filter.admin_overview'))) . '</dd>';
+      $output .= '<dd>' . t('On the <a href=":formats">Text formats and editors page</a> you can see which text editor is associated with each text format. You can change this by clicking on the <em>Configure</em> link, and then choosing a text editor or <em>none</em> from the <em>Text editor</em> drop-down list. The text editor will then be displayed with any text field for which this text format is chosen.', [':formats' => \Drupal::url('filter.admin_overview')]) . '</dd>';
       $output .= '<dt>' . t('Configuring a text editor') . '</dt>';
       $output .= '<dd>' . t('Once a text editor is associated with a text format, you can configure it by clicking on the <em>Configure</em> link for this format. Depending on the specific text editor, you can configure it for example by adding buttons to its toolbar. Typically these buttons provide formatting or editing tools, and they often insert HTML tags into the field source. For details, see the help page of the specific text editor.') . '</dd>';
       $output .= '<dt>' . t('Using different text editors and formats') . '</dt>';
@@ -86,7 +86,7 @@ function editor_form_filter_admin_overview_alter(&$form, FormStateInterface $for
   // @todo Cleanup column injection: https://www.drupal.org/node/1876718.
   // Splice in the column for "Text editor" into the header.
   $position = array_search('name', $form['formats']['#header']) + 1;
-  $start = array_splice($form['formats']['#header'], 0, $position, array('editor' => t('Text editor')));
+  $start = array_splice($form['formats']['#header'], 0, $position, ['editor' => t('Text editor')]);
   $form['formats']['#header'] = array_merge($start, $form['formats']['#header']);
 
   // Then splice in the name of each text editor for each text format.
@@ -94,7 +94,7 @@ function editor_form_filter_admin_overview_alter(&$form, FormStateInterface $for
   foreach (Element::children($form['formats']) as $format_id) {
     $editor = editor_load($format_id);
     $editor_name = ($editor && isset($editors[$editor->getEditor()])) ? $editors[$editor->getEditor()]['label'] : '—';
-    $editor_column['editor'] = array('#markup' => $editor_name);
+    $editor_column['editor'] = ['#markup' => $editor_name];
     $position = array_search('name', array_keys($form['formats'][$format_id])) + 1;
     $start = array_splice($form['formats'][$format_id], 0, $position, $editor_column);
     $form['formats'][$format_id] = array_merge($start, $form['formats'][$format_id]);
@@ -116,37 +116,37 @@ function editor_form_filter_format_form_alter(&$form, FormStateInterface $form_s
   // Associate a text editor with this text format.
   $manager = \Drupal::service('plugin.manager.editor');
   $editor_options = $manager->listOptions();
-  $form['editor'] = array(
+  $form['editor'] = [
     // Position the editor selection before the filter settings (weight of 0),
     // but after the filter label and name (weight of -20).
     '#weight' => -9,
-  );
-  $form['editor']['editor'] = array(
+  ];
+  $form['editor']['editor'] = [
     '#type' => 'select',
     '#title' => t('Text editor'),
     '#options' => $editor_options,
     '#empty_option' => t('None'),
     '#default_value' => $editor ? $editor->getEditor() : '',
-    '#ajax' => array(
-      'trigger_as' => array('name' => 'editor_configure'),
+    '#ajax' => [
+      'trigger_as' => ['name' => 'editor_configure'],
       'callback' => 'editor_form_filter_admin_form_ajax',
       'wrapper' => 'editor-settings-wrapper',
-    ),
+    ],
     '#weight' => -10,
-  );
-  $form['editor']['configure'] = array(
+  ];
+  $form['editor']['configure'] = [
     '#type' => 'submit',
     '#name' => 'editor_configure',
     '#value' => t('Configure'),
-    '#limit_validation_errors' => array(array('editor')),
-    '#submit' => array('editor_form_filter_admin_format_editor_configure'),
-    '#ajax' => array(
+    '#limit_validation_errors' => [['editor']],
+    '#submit' => ['editor_form_filter_admin_format_editor_configure'],
+    '#ajax' => [
       'callback' => 'editor_form_filter_admin_form_ajax',
       'wrapper' => 'editor-settings-wrapper',
-    ),
+    ],
     '#weight' => -10,
-    '#attributes' => array('class' => array('js-hide')),
-  );
+    '#attributes' => ['class' => ['js-hide']],
+  ];
 
   // If there aren't any options (other than "None"), disable the select list.
   if (empty($editor_options)) {
@@ -154,26 +154,27 @@ function editor_form_filter_format_form_alter(&$form, FormStateInterface $form_s
     $form['editor']['editor']['#description'] = t('This option is disabled because no modules that provide a text editor are currently enabled.');
   }
 
-  $form['editor']['settings'] = array(
+  $form['editor']['settings'] = [
     '#tree' => TRUE,
     '#weight' => -8,
     '#type' => 'container',
     '#id' => 'editor-settings-wrapper',
-    '#attached' => array(
-      'library' => array(
+    '#attached' => [
+      'library' => [
         'editor/drupal.editor.admin',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
   // Add editor-specific validation and submit handlers.
   if ($editor) {
+    /** @var $plugin \Drupal\editor\Plugin\EditorPluginInterface */
     $plugin = $manager->createInstance($editor->getEditor());
-    $settings_form = array();
-    $settings_form['#element_validate'][] = array($plugin, 'settingsFormValidate');
-    $form['editor']['settings']['subform'] = $plugin->settingsForm($settings_form, $form_state, $editor);
-    $form['editor']['settings']['subform']['#parents'] = array('editor', 'settings');
-    $form['actions']['submit']['#submit'][] = array($plugin, 'settingsFormSubmit');
+    $settings_form = [];
+    $settings_form['#element_validate'][] = [$plugin, 'validateConfigurationForm'];
+    $form['editor']['settings']['subform'] = $plugin->buildConfigurationForm($settings_form, $form_state);
+    $form['editor']['settings']['subform']['#parents'] = ['editor', 'settings'];
+    $form['actions']['submit']['#submit'][] = [$plugin, 'submitConfigurationForm'];
   }
 
   $form['#validate'][] = 'editor_form_filter_admin_format_validate';
@@ -185,7 +186,7 @@ function editor_form_filter_format_form_alter(&$form, FormStateInterface $form_s
  */
 function editor_form_filter_admin_format_editor_configure($form, FormStateInterface $form_state) {
   $editor = $form_state->get('editor');
-  $editor_value = $form_state->getValue(array('editor', 'editor'));
+  $editor_value = $form_state->getValue(['editor', 'editor']);
   if ($editor_value !== NULL) {
     if ($editor_value === '') {
       $form_state->set('editor', FALSE);
@@ -235,7 +236,7 @@ function editor_form_filter_admin_format_submit($form, FormStateInterface $form_
   $format = $form_state->getFormObject()->getEntity();
   $format_id = $format->isNew() ? NULL : $format->id();
   $original_editor = editor_load($format_id);
-  if ($original_editor && $original_editor->getEditor() != $form_state->getValue(array('editor', 'editor'))) {
+  if ($original_editor && $original_editor->getEditor() != $form_state->getValue(['editor', 'editor'])) {
     $original_editor->delete();
   }
 
@@ -549,7 +550,7 @@ function editor_file_download($uri) {
  *   An array of file entity UUIDs.
  */
 function _editor_get_file_uuids_by_field(EntityInterface $entity) {
-  $uuids = array();
+  $uuids = [];
 
   $formatted_text_fields = _editor_get_formatted_text_fields($entity);
   foreach ($formatted_text_fields as $formatted_text_field) {
@@ -578,12 +579,12 @@ function _editor_get_file_uuids_by_field(EntityInterface $entity) {
 function _editor_get_formatted_text_fields(FieldableEntityInterface $entity) {
   $field_definitions = $entity->getFieldDefinitions();
   if (empty($field_definitions)) {
-    return array();
+    return [];
   }
 
   // Only return formatted text fields.
   return array_keys(array_filter($field_definitions, function (FieldDefinitionInterface $definition) {
-    return in_array($definition->getType(), array('text', 'text_long', 'text_with_summary'), TRUE);
+    return in_array($definition->getType(), ['text', 'text_long', 'text_with_summary'], TRUE);
   }));
 }
 
@@ -600,7 +601,7 @@ function _editor_get_formatted_text_fields(FieldableEntityInterface $entity) {
 function _editor_parse_file_uuids($text) {
   $dom = Html::load($text);
   $xpath = new \DOMXPath($dom);
-  $uuids = array();
+  $uuids = [];
   foreach ($xpath->query('//*[@data-entity-type="file" and @data-entity-uuid]') as $node) {
     $uuids[] = $node->getAttribute('data-entity-uuid');
   }
diff --git a/web/core/modules/editor/editor.post_update.php b/web/core/modules/editor/editor.post_update.php
index 3715b6dc5..848390048 100644
--- a/web/core/modules/editor/editor.post_update.php
+++ b/web/core/modules/editor/editor.post_update.php
@@ -5,17 +5,8 @@
  * Post update functions for Editor.
  */
 
-/**
- * @addtogroup updates-8.2.x
- * @{
- */
-
 /**
  * Clear the render cache to fix file references added by Editor.
  */
 function editor_post_update_clear_cache_for_file_reference_filter() {
 }
-
-/**
- * @} End of "addtogroup updates-8.2.x".
- */
diff --git a/web/core/modules/editor/src/Ajax/EditorDialogSave.php b/web/core/modules/editor/src/Ajax/EditorDialogSave.php
index b4d1c2736..48a7867ad 100644
--- a/web/core/modules/editor/src/Ajax/EditorDialogSave.php
+++ b/web/core/modules/editor/src/Ajax/EditorDialogSave.php
@@ -33,10 +33,10 @@ class EditorDialogSave implements CommandInterface {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => 'editorDialogSave',
       'values' => $this->values,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/editor/src/EditorController.php b/web/core/modules/editor/src/EditorController.php
index 2ef0b0418..995ff7c6c 100644
--- a/web/core/modules/editor/src/EditorController.php
+++ b/web/core/modules/editor/src/EditorController.php
@@ -38,7 +38,7 @@ class EditorController extends ControllerBase {
 
     // Direct text editing is only supported for single-valued fields.
     $field = $entity->getTranslation($langcode)->$field_name;
-    $editable_text = check_markup($field->value, $field->format, $langcode, array(FilterInterface::TYPE_TRANSFORM_REVERSIBLE, FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE));
+    $editable_text = check_markup($field->value, $field->format, $langcode, [FilterInterface::TYPE_TRANSFORM_REVERSIBLE, FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE]);
     $response->addCommand(new GetUntransformedTextCommand($editable_text));
 
     return $response;
diff --git a/web/core/modules/editor/src/EditorXssFilter/Standard.php b/web/core/modules/editor/src/EditorXssFilter/Standard.php
index 9a8b2b1b1..19d5c06c6 100644
--- a/web/core/modules/editor/src/EditorXssFilter/Standard.php
+++ b/web/core/modules/editor/src/EditorXssFilter/Standard.php
@@ -35,7 +35,7 @@ class Standard extends Xss implements EditorXssFilterInterface {
     //   directly.
     // <iframe> is considered safe because it only allows HTML content to be
     // embedded, hence ensuring the same origin policy always applies.
-    $dangerous_tags = array('script', 'style', 'link', 'embed', 'object');
+    $dangerous_tags = ['script', 'style', 'link', 'embed', 'object'];
 
     // Simply blacklisting these five dangerous tags would bring safety, but
     // also user frustration: what if a text format is configured to allow
@@ -130,13 +130,13 @@ class Standard extends Xss implements EditorXssFilterInterface {
    */
   protected static function getAllowedTags($restrictions) {
     if ($restrictions === FALSE || !isset($restrictions['allowed'])) {
-      return array();
+      return [];
     }
 
     $allowed_tags = array_keys($restrictions['allowed']);
     // Exclude the wildcard tag, which is used to set attribute restrictions on
     // all tags simultaneously.
-    $allowed_tags = array_diff($allowed_tags, array('*'));
+    $allowed_tags = array_diff($allowed_tags, ['*']);
 
     return $allowed_tags;
   }
@@ -154,7 +154,7 @@ class Standard extends Xss implements EditorXssFilterInterface {
    */
   protected static function getForbiddenTags($restrictions) {
     if ($restrictions === FALSE || !isset($restrictions['forbidden_tags'])) {
-      return array();
+      return [];
     }
     else {
       return $restrictions['forbidden_tags'];
diff --git a/web/core/modules/editor/src/Element.php b/web/core/modules/editor/src/Element.php
index b83e9dc7a..9f8ab9161 100644
--- a/web/core/modules/editor/src/Element.php
+++ b/web/core/modules/editor/src/Element.php
@@ -32,7 +32,7 @@ class Element {
   /**
    * Additional #pre_render callback for 'text_format' elements.
    */
-  function preRenderTextFormat(array $element) {
+  public function preRenderTextFormat(array $element) {
     // Allow modules to programmatically enforce no client-side editor by
     // setting the #editor property to FALSE.
     if (isset($element['#editor']) && !$element['#editor']) {
@@ -64,14 +64,14 @@ class Element {
     if (!$element['format']['format']['#access']) {
       // Use the first (and only) available text format.
       $format_id = $format_ids[0];
-      $element['format']['editor'] = array(
+      $element['format']['editor'] = [
         '#type' => 'hidden',
         '#name' => $element['format']['format']['#name'],
         '#value' => $format_id,
-        '#attributes' => array(
+        '#attributes' => [
           'data-editor-for' => $field_id,
-        ),
-      );
+        ],
+      ];
     }
     // Otherwise, attach to text format selector.
     else {
diff --git a/web/core/modules/editor/src/Entity/Editor.php b/web/core/modules/editor/src/Entity/Editor.php
index f504cec7c..1a417d77a 100644
--- a/web/core/modules/editor/src/Entity/Editor.php
+++ b/web/core/modules/editor/src/Entity/Editor.php
@@ -49,14 +49,14 @@ class Editor extends ConfigEntityBase implements EditorInterface {
    *
    * @var array
    */
-  protected $settings = array();
+  protected $settings = [];
 
   /**
    * The structured array of image upload settings.
    *
    * @var array
    */
-  protected $image_upload = array();
+  protected $image_upload = [];
 
   /**
    * The filter format this text editor is associated with.
diff --git a/web/core/modules/editor/src/Form/EditorImageDialog.php b/web/core/modules/editor/src/Form/EditorImageDialog.php
index 6f1854663..547032e67 100644
--- a/web/core/modules/editor/src/Form/EditorImageDialog.php
+++ b/web/core/modules/editor/src/Form/EditorImageDialog.php
@@ -94,26 +94,26 @@ class EditorImageDialog extends FormBase {
     $existing_file = isset($image_element['data-entity-uuid']) ? \Drupal::entityManager()->loadEntityByUuid('file', $image_element['data-entity-uuid']) : NULL;
     $fid = $existing_file ? $existing_file->id() : NULL;
 
-    $form['fid'] = array(
+    $form['fid'] = [
       '#title' => $this->t('Image'),
       '#type' => 'managed_file',
       '#upload_location' => $image_upload['scheme'] . '://' . $image_upload['directory'],
-      '#default_value' => $fid ? array($fid) : NULL,
-      '#upload_validators' => array(
-        'file_validate_extensions' => array('gif png jpg jpeg'),
-        'file_validate_size' => array($max_filesize),
-        'file_validate_image_resolution' => array($max_dimensions),
-      ),
+      '#default_value' => $fid ? [$fid] : NULL,
+      '#upload_validators' => [
+        'file_validate_extensions' => ['gif png jpg jpeg'],
+        'file_validate_size' => [$max_filesize],
+        'file_validate_image_resolution' => [$max_dimensions],
+      ],
       '#required' => TRUE,
-    );
+    ];
 
-    $form['attributes']['src'] = array(
+    $form['attributes']['src'] = [
       '#title' => $this->t('URL'),
       '#type' => 'textfield',
       '#default_value' => isset($image_element['src']) ? $image_element['src'] : '',
       '#maxlength' => 2048,
       '#required' => TRUE,
-    );
+    ];
 
     // If the editor has image uploads enabled, show a managed_file form item,
     // otherwise show a (file URL) text form item.
@@ -137,7 +137,7 @@ class EditorImageDialog extends FormBase {
     if ($alt === '' && !empty($image_element['src'])) {
       $alt = '""';
     }
-    $form['attributes']['alt'] = array(
+    $form['attributes']['alt'] = [
       '#title' => $this->t('Alternative text'),
       '#placeholder' => $this->t('Short description for the visually impaired'),
       '#type' => 'textfield',
@@ -145,51 +145,51 @@ class EditorImageDialog extends FormBase {
       '#required_error' => $this->t('Alternative text is required.<br />(Only in rare cases should this be left empty. To create empty alternative text, enter <code>""</code> — two double quotes without any content).'),
       '#default_value' => $alt,
       '#maxlength' => 2048,
-    );
+    ];
 
     // When Drupal core's filter_align is being used, the text editor may
     // offer the ability to change the alignment.
     if (isset($image_element['data-align']) && $editor->getFilterFormat()->filters('filter_align')->status) {
-      $form['align'] = array(
+      $form['align'] = [
         '#title' => $this->t('Align'),
         '#type' => 'radios',
-        '#options' => array(
+        '#options' => [
           'none' => $this->t('None'),
           'left' => $this->t('Left'),
           'center' => $this->t('Center'),
           'right' => $this->t('Right'),
-        ),
+        ],
         '#default_value' => $image_element['data-align'] === '' ? 'none' : $image_element['data-align'],
-        '#wrapper_attributes' => array('class' => array('container-inline')),
-        '#attributes' => array('class' => array('container-inline')),
-        '#parents' => array('attributes', 'data-align'),
-      );
+        '#wrapper_attributes' => ['class' => ['container-inline']],
+        '#attributes' => ['class' => ['container-inline']],
+        '#parents' => ['attributes', 'data-align'],
+      ];
     }
 
     // When Drupal core's filter_caption is being used, the text editor may
     // offer the ability to in-place edit the image's caption: show a toggle.
     if (isset($image_element['hasCaption']) && $editor->getFilterFormat()->filters('filter_caption')->status) {
-      $form['caption'] = array(
+      $form['caption'] = [
         '#title' => $this->t('Caption'),
         '#type' => 'checkbox',
         '#default_value' => $image_element['hasCaption'] === 'true',
-        '#parents' => array('attributes', 'hasCaption'),
-      );
+        '#parents' => ['attributes', 'hasCaption'],
+      ];
     }
 
-    $form['actions'] = array(
+    $form['actions'] = [
       '#type' => 'actions',
-    );
-    $form['actions']['save_modal'] = array(
+    ];
+    $form['actions']['save_modal'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
       // No regular submit-handler. This form only works via JavaScript.
-      '#submit' => array(),
-      '#ajax' => array(
+      '#submit' => [],
+      '#ajax' => [
         'callback' => '::submitForm',
         'event' => 'click',
-      ),
-    );
+      ],
+    ];
 
     return $form;
   }
@@ -202,22 +202,22 @@ class EditorImageDialog extends FormBase {
 
     // Convert any uploaded files from the FID values to data-entity-uuid
     // attributes and set data-entity-type to 'file'.
-    $fid = $form_state->getValue(array('fid', 0));
+    $fid = $form_state->getValue(['fid', 0]);
     if (!empty($fid)) {
       $file = $this->fileStorage->load($fid);
       $file_url = file_create_url($file->getFileUri());
       // Transform absolute image URLs to relative image URLs: prevent problems
       // on multisite set-ups and prevent mixed content errors.
       $file_url = file_url_transform_relative($file_url);
-      $form_state->setValue(array('attributes', 'src'), $file_url);
-      $form_state->setValue(array('attributes', 'data-entity-uuid'), $file->uuid());
-      $form_state->setValue(array('attributes', 'data-entity-type'), 'file');
+      $form_state->setValue(['attributes', 'src'], $file_url);
+      $form_state->setValue(['attributes', 'data-entity-uuid'], $file->uuid());
+      $form_state->setValue(['attributes', 'data-entity-type'], 'file');
     }
 
     // When the alt attribute is set to two double quotes, transform it to the
     // empty string: two double quotes signify "empty alt attribute". See above.
-    if (trim($form_state->getValue(array('attributes', 'alt'))) === '""') {
-      $form_state->setValue(array('attributes', 'alt'), '');
+    if (trim($form_state->getValue(['attributes', 'alt'])) === '""') {
+      $form_state->setValue(['attributes', 'alt'], '');
     }
 
     if ($form_state->getErrors()) {
diff --git a/web/core/modules/editor/src/Form/EditorLinkDialog.php b/web/core/modules/editor/src/Form/EditorLinkDialog.php
index 05703ba2b..724f41307 100644
--- a/web/core/modules/editor/src/Form/EditorLinkDialog.php
+++ b/web/core/modules/editor/src/Form/EditorLinkDialog.php
@@ -32,7 +32,7 @@ class EditorLinkDialog extends FormBase {
     // The default values are set directly from \Drupal::request()->request,
     // provided by the editor plugin opening the dialog.
     $user_input = $form_state->getUserInput();
-    $input = isset($user_input['editor_object']) ? $user_input['editor_object'] : array();
+    $input = isset($user_input['editor_object']) ? $user_input['editor_object'] : [];
 
     $form['#tree'] = TRUE;
     $form['#attached']['library'][] = 'editor/drupal.editor.dialog';
@@ -41,26 +41,26 @@ class EditorLinkDialog extends FormBase {
 
     // Everything under the "attributes" key is merged directly into the
     // generated link tag's attributes.
-    $form['attributes']['href'] = array(
+    $form['attributes']['href'] = [
       '#title' => $this->t('URL'),
       '#type' => 'textfield',
       '#default_value' => isset($input['href']) ? $input['href'] : '',
       '#maxlength' => 2048,
-    );
+    ];
 
-    $form['actions'] = array(
+    $form['actions'] = [
       '#type' => 'actions',
-    );
-    $form['actions']['save_modal'] = array(
+    ];
+    $form['actions']['save_modal'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
       // No regular submit-handler. This form only works via JavaScript.
-      '#submit' => array(),
-      '#ajax' => array(
+      '#submit' => [],
+      '#ajax' => [
         'callback' => '::submitForm',
         'event' => 'click',
-      ),
-    );
+      ],
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/editor/src/Plugin/EditorBase.php b/web/core/modules/editor/src/Plugin/EditorBase.php
index 6d906eae0..11cf01bde 100644
--- a/web/core/modules/editor/src/Plugin/EditorBase.php
+++ b/web/core/modules/editor/src/Plugin/EditorBase.php
@@ -26,26 +26,56 @@ abstract class EditorBase extends PluginBase implements EditorPluginInterface {
    * {@inheritdoc}
    */
   public function getDefaultSettings() {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
+   *
+   * @todo Remove in Drupal 9.0.0.
    */
   public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
+    @trigger_error('The ' . __METHOD__ . ' method is deprecated since version 8.3.x and will be removed in 9.0.0.', E_USER_DEPRECATED);
     return $form;
   }
 
   /**
    * {@inheritdoc}
+   *
+   * @todo Remove in Drupal 9.0.0.
    */
   public function settingsFormValidate(array $form, FormStateInterface $form_state) {
+    @trigger_error('The ' . __METHOD__ . ' method is deprecated since version 8.3.x and will be removed in 9.0.0.', E_USER_DEPRECATED);
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * @todo Remove in Drupal 9.0.0.
+   */
+  public function settingsFormSubmit(array $form, FormStateInterface $form_state) {
+    @trigger_error('The ' . __METHOD__ . ' method is deprecated since version 8.3.x and will be removed in 9.0.0.', E_USER_DEPRECATED);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function settingsFormSubmit(array $form, FormStateInterface $form_state) {
+  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+    return $this->settingsForm($form, $form_state, $form_state->get('editor'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
+    return $this->settingsFormValidate($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
+    return $this->settingsFormSubmit($form, $form_state);
   }
 
 }
diff --git a/web/core/modules/editor/src/Plugin/EditorManager.php b/web/core/modules/editor/src/Plugin/EditorManager.php
index 5ae5bd299..4585da7e7 100644
--- a/web/core/modules/editor/src/Plugin/EditorManager.php
+++ b/web/core/modules/editor/src/Plugin/EditorManager.php
@@ -40,7 +40,7 @@ class EditorManager extends DefaultPluginManager {
    *   An array of translated text editor labels, keyed by ID.
    */
   public function listOptions() {
-    $options = array();
+    $options = [];
     foreach ($this->getDefinitions() as $key => $definition) {
       $options[$key] = $definition['label'];
     }
@@ -59,9 +59,9 @@ class EditorManager extends DefaultPluginManager {
    * @see \Drupal\Core\Render\AttachmentsResponseProcessorInterface::processAttachments()
    */
   public function getAttachments(array $format_ids) {
-    $attachments = array('library' => array());
+    $attachments = ['library' => []];
 
-    $settings = array();
+    $settings = [];
     foreach ($format_ids as $format_id) {
       $editor = editor_load($format_id);
       if (!$editor) {
@@ -75,20 +75,20 @@ class EditorManager extends DefaultPluginManager {
       $attachments['library'] = array_merge($attachments['library'], $plugin->getLibraries($editor));
 
       // Format-specific JavaScript settings.
-      $settings['editor']['formats'][$format_id] = array(
+      $settings['editor']['formats'][$format_id] = [
         'format' => $format_id,
         'editor' => $editor->getEditor(),
         'editorSettings' => $plugin->getJSSettings($editor),
         'editorSupportsContentFiltering' => $plugin_definition['supports_content_filtering'],
         'isXssSafe' => $plugin_definition['is_xss_safe'],
-      );
+      ];
     }
 
     // Allow other modules to alter all JavaScript settings.
     $this->moduleHandler->alter('editor_js_settings', $settings);
 
     if (empty($attachments['library']) && empty($settings)) {
-      return array();
+      return [];
     }
 
     $attachments['drupalSettings'] = $settings;
diff --git a/web/core/modules/editor/src/Plugin/EditorPluginInterface.php b/web/core/modules/editor/src/Plugin/EditorPluginInterface.php
index a1a675974..fa9d2ad2b 100644
--- a/web/core/modules/editor/src/Plugin/EditorPluginInterface.php
+++ b/web/core/modules/editor/src/Plugin/EditorPluginInterface.php
@@ -3,7 +3,7 @@
 namespace Drupal\editor\Plugin;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\editor\Entity\Editor;
 
 /**
@@ -12,12 +12,17 @@ use Drupal\editor\Entity\Editor;
  * Modules implementing this interface may want to extend the EditorBase class,
  * which provides default implementations of each method where appropriate.
  *
+ * If the editor's behavior depends on extensive options and/or external data,
+ * then the implementing module can choose to provide a separate, global
+ * configuration page rather than per-text-format settings. In that case, this
+ * form should provide a link to the separate settings page.
+ *
  * @see \Drupal\editor\Annotation\Editor
  * @see \Drupal\editor\Plugin\EditorBase
  * @see \Drupal\editor\Plugin\EditorManager
  * @see plugin_api
  */
-interface EditorPluginInterface extends PluginInspectionInterface {
+interface EditorPluginInterface extends PluginInspectionInterface, PluginFormInterface {
 
   /**
    * Returns the default settings for this configurable text editor.
@@ -28,53 +33,6 @@ interface EditorPluginInterface extends PluginInspectionInterface {
    */
   public function getDefaultSettings();
 
-  /**
-   * Returns a settings form to configure this text editor.
-   *
-   * If the editor's behavior depends on extensive options and/or external data,
-   * then the implementing module can choose to provide a separate, global
-   * configuration page rather than per-text-format settings. In that case, this
-   * form should provide a link to the separate settings page.
-   *
-   * @param array $form
-   *   An empty form array to be populated with a configuration form, if any.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The state of the entire filter administration form.
-   * @param \Drupal\editor\Entity\Editor $editor
-   *   A configured text editor object.
-   *
-   * @return array
-   *   A render array for the settings form.
-   */
-  public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor);
-
-  /**
-   * Validates the settings form for an editor.
-   *
-   * The contents of the editor settings are located in
-   * $form_state->getValue(array('editor', 'settings')). Calls to $form_state->setError()
-   * should reflect this location in the settings form.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function settingsFormValidate(array $form, FormStateInterface $form_state);
-
-  /**
-   * Modifies any values in the form state to prepare them for saving.
-   *
-   * Values in $form_state->getValue(array('editor', 'settings')) are saved by
-   * Editor module in editor_form_filter_admin_format_submit().
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function settingsFormSubmit(array $form, FormStateInterface $form_state);
-
   /**
    * Returns JavaScript settings to be attached.
    *
diff --git a/web/core/modules/editor/src/Plugin/Filter/EditorFileReference.php b/web/core/modules/editor/src/Plugin/Filter/EditorFileReference.php
index 5eb76c630..cf725a713 100644
--- a/web/core/modules/editor/src/Plugin/Filter/EditorFileReference.php
+++ b/web/core/modules/editor/src/Plugin/Filter/EditorFileReference.php
@@ -68,7 +68,7 @@ class EditorFileReference extends FilterBase implements ContainerFactoryPluginIn
     if (stristr($text, 'data-entity-type="file"') !== FALSE) {
       $dom = Html::load($text);
       $xpath = new \DOMXPath($dom);
-      $processed_uuids = array();
+      $processed_uuids = [];
       foreach ($xpath->query('//*[@data-entity-type="file" and @data-entity-uuid]') as $node) {
         $uuid = $node->getAttribute('data-entity-uuid');
 
diff --git a/web/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php b/web/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php
index 5d5034293..dab14ef01 100644
--- a/web/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php
+++ b/web/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php
@@ -43,7 +43,7 @@ class Editor extends PluginBase implements InPlaceEditorInterface {
   /**
    * {@inheritdoc}
    */
-  function getMetadata(FieldItemListInterface $items) {
+  public function getMetadata(FieldItemListInterface $items) {
     $format_id = $items[0]->format;
     $metadata['format'] = $format_id;
     $metadata['formatHasTransformations'] = $this->textFormatHasTransformationFilters($format_id);
@@ -60,7 +60,7 @@ class Editor extends PluginBase implements InPlaceEditorInterface {
    */
   protected function textFormatHasTransformationFilters($format_id) {
     $format = FilterFormat::load($format_id);
-    return (bool) count(array_intersect(array(FilterInterface::TYPE_TRANSFORM_REVERSIBLE, FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE), $format->getFiltertypes()));
+    return (bool) count(array_intersect([FilterInterface::TYPE_TRANSFORM_REVERSIBLE, FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE], $format->getFiltertypes()));
   }
 
   /**
@@ -74,7 +74,7 @@ class Editor extends PluginBase implements InPlaceEditorInterface {
     $definitions = $manager->getDefinitions();
 
     // Filter the current user's formats to those that support inline editing.
-    $formats = array();
+    $formats = [];
     foreach ($user_format_ids as $format_id) {
       if ($editor = editor_load($format_id)) {
         $editor_id = $editor->getEditor();
diff --git a/web/core/modules/editor/src/Tests/EditorAdminTest.php b/web/core/modules/editor/src/Tests/EditorAdminTest.php
index 97d47b11e..4315a6dab 100644
--- a/web/core/modules/editor/src/Tests/EditorAdminTest.php
+++ b/web/core/modules/editor/src/Tests/EditorAdminTest.php
@@ -20,7 +20,7 @@ class EditorAdminTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'editor');
+  public static $modules = ['filter', 'editor'];
 
   /**
    * A user with the 'administer filters' permission.
@@ -33,16 +33,16 @@ class EditorAdminTest extends WebTestBase {
     parent::setUp();
 
     // Add text format.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $filtered_html_format->save();
 
     // Create admin user.
-    $this->adminUser = $this->drupalCreateUser(array('administer filters'));
+    $this->adminUser = $this->drupalCreateUser(['administer filters']);
   }
 
   /**
@@ -83,9 +83,9 @@ class EditorAdminTest extends WebTestBase {
     $this->verifyUnicornEditorConfiguration('filtered_html', FALSE);
 
     // Switch back to 'None' and check the Unicorn Editor's settings are gone.
-    $edit = array(
+    $edit = [
       'editor[editor]' => '',
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, 'editor_configure');
     $unicorn_setting = $this->xpath('//input[@name="editor[settings][ponies_too]" and @type="checkbox" and @checked]');
     $this->assertTrue(count($unicorn_setting) === 0, "Unicorn Editor's settings form is no longer present.");
@@ -135,7 +135,7 @@ class EditorAdminTest extends WebTestBase {
     $this->drupalLogin($account);
 
     // The node edit page header.
-    $text = t('<em>Edit @type</em> @title', array('@type' => $node_type->label(), '@title' => $node->label()));
+    $text = t('<em>Edit @type</em> @title', ['@type' => $node_type->label(), '@title' => $node->label()]);
 
     // Go to node edit form.
     $this->drupalGet('node/' . $node->id() . '/edit');
@@ -162,10 +162,10 @@ class EditorAdminTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('admin/config/content/formats/add');
     // Configure the text format name.
-    $edit = array(
+    $edit = [
       'name' => $format_name,
       'format' => $format_id,
-    );
+    ];
     $edit += $this->selectUnicornEditor();
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
   }
@@ -175,7 +175,7 @@ class EditorAdminTest extends WebTestBase {
    */
   protected function enableUnicornEditor() {
     if (!$this->container->get('module_handler')->moduleExists('editor_test')) {
-      $this->container->get('module_installer')->install(array('editor_test'));
+      $this->container->get('module_installer')->install(['editor_test']);
     }
   }
 
@@ -200,9 +200,9 @@ class EditorAdminTest extends WebTestBase {
     $this->assertNoRaw(t('This option is disabled because no modules that provide a text editor are currently enabled.'), 'Description for select absent that tells users to install a text editor module.');
 
     // Select the "Unicorn Editor" editor and click the "Configure" button.
-    $edit = array(
+    $edit = [
       'editor[editor]' => 'unicorn',
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, 'editor_configure');
     $unicorn_setting = $this->xpath('//input[@name="editor[settings][ponies_too]" and @type="checkbox" and @checked]');
     $this->assertTrue(count($unicorn_setting), "Unicorn Editor's settings form is present.");
diff --git a/web/core/modules/editor/src/Tests/EditorLoadingTest.php b/web/core/modules/editor/src/Tests/EditorLoadingTest.php
index 88055e916..419215f87 100644
--- a/web/core/modules/editor/src/Tests/EditorLoadingTest.php
+++ b/web/core/modules/editor/src/Tests/EditorLoadingTest.php
@@ -20,7 +20,7 @@ class EditorLoadingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'editor', 'editor_test', 'node');
+  public static $modules = ['filter', 'editor', 'editor_test', 'node'];
 
   /**
    * An untrusted user, with access to the 'plain_text' format.
@@ -51,57 +51,57 @@ class EditorLoadingTest extends WebTestBase {
     \Drupal::service('plugin.manager.editor')->clearCachedDefinitions();
 
     // Add text formats.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $filtered_html_format->save();
-    $full_html_format = FilterFormat::create(array(
+    $full_html_format = FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $full_html_format->save();
 
     // Create article node type.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'article',
       'name' => 'Article',
-    ));
+    ]);
 
     // Create page node type, but remove the body.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'page',
       'name' => 'Page',
-    ));
+    ]);
     $body = FieldConfig::loadByName('node', 'page', 'body');
     $body->delete();
 
     // Create a formatted text field, which uses an <input type="text">.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_text',
       'entity_type' => 'node',
       'type' => 'text',
-    ))->save();
+    ])->save();
 
-    FieldConfig::create(array(
+    FieldConfig::create([
       'field_name' => 'field_text',
       'entity_type' => 'node',
       'label' => 'Textfield',
       'bundle' => 'page',
-    ))->save();
+    ])->save();
 
     entity_get_form_display('node', 'page', 'default')
       ->setComponent('field_text')
       ->save();
 
     // Create 3 users, each with access to different text formats.
-    $this->untrustedUser = $this->drupalCreateUser(array('create article content', 'edit any article content'));
-    $this->normalUser = $this->drupalCreateUser(array('create article content', 'edit any article content', 'use text format filtered_html'));
-    $this->privilegedUser = $this->drupalCreateUser(array('create article content', 'edit any article content', 'create page content', 'edit any page content', 'use text format filtered_html', 'use text format full_html'));
+    $this->untrustedUser = $this->drupalCreateUser(['create article content', 'edit any article content']);
+    $this->normalUser = $this->drupalCreateUser(['create article content', 'edit any article content', 'use text format filtered_html']);
+    $this->privilegedUser = $this->drupalCreateUser(['create article content', 'edit any article content', 'create page content', 'edit any page content', 'use text format filtered_html', 'use text format full_html']);
   }
 
   /**
@@ -112,13 +112,13 @@ class EditorLoadingTest extends WebTestBase {
     $editor = Editor::create([
       'format' => 'full_html',
       'editor' => 'unicorn',
-      'image_upload' => array(
+      'image_upload' => [
         'status' => FALSE,
         'scheme' => file_default_scheme(),
         'directory' => 'inline-images',
         'max_size' => '',
-        'max_dimensions' => array('width' => '', 'height' => ''),
-      )
+        'max_dimensions' => ['width' => '', 'height' => ''],
+      ]
     ]);
     $editor->save();
 
@@ -140,13 +140,13 @@ class EditorLoadingTest extends WebTestBase {
     $this->drupalLogin($this->privilegedUser);
     $this->drupalGet('node/add/article');
     list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck('body');
-    $expected = array('formats' => array('full_html' => array(
+    $expected = ['formats' => ['full_html' => [
       'format' => 'full_html',
       'editor' => 'unicorn',
-      'editorSettings' => array('ponyModeEnabled' => TRUE),
+      'editorSettings' => ['ponyModeEnabled' => TRUE],
       'editorSupportsContentFiltering' => TRUE,
       'isXssSafe' => FALSE,
-    )));
+    ]]];
     $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
     $this->assertIdentical($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct.");
     $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
@@ -174,13 +174,13 @@ class EditorLoadingTest extends WebTestBase {
     $this->drupalLogin($this->untrustedUser);
     $this->drupalGet('node/add/article');
     list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck('body');
-    $expected = array('formats' => array('plain_text' => array(
+    $expected = ['formats' => ['plain_text' => [
       'format' => 'plain_text',
       'editor' => 'unicorn',
-      'editorSettings' => array('ponyModeEnabled' => TRUE),
+      'editorSettings' => ['ponyModeEnabled' => TRUE],
       'editorSupportsContentFiltering' => TRUE,
       'isXssSafe' => FALSE,
-    )));
+    ]]];
     $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
     $this->assertIdentical($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct.");
     $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
@@ -191,12 +191,12 @@ class EditorLoadingTest extends WebTestBase {
 
     // Create an "article" node that uses the full_html text format, then try
     // to let the untrusted user edit it.
-    $this->drupalCreateNode(array(
+    $this->drupalCreateNode([
       'type' => 'article',
-      'body' => array(
-        array('value' => $this->randomMachineName(32), 'format' => 'full_html')
-      ),
-    ));
+      'body' => [
+        ['value' => $this->randomMachineName(32), 'format' => 'full_html']
+      ],
+    ]);
 
     // The untrusted user tries to edit content that is written in a text format
     // that (s)he is not allowed to use. The editor is still loaded. CKEditor,
@@ -220,23 +220,23 @@ class EditorLoadingTest extends WebTestBase {
     $editor = Editor::create([
       'format' => 'full_html',
       'editor' => 'unicorn',
-      'image_upload' => array(
+      'image_upload' => [
         'status' => FALSE,
         'scheme' => file_default_scheme(),
         'directory' => 'inline-images',
         'max_size' => '',
-        'max_dimensions' => array('width' => '', 'height' => ''),
-      )
+        'max_dimensions' => ['width' => '', 'height' => ''],
+      ]
     ]);
     $editor->save();
 
     // Create an "page" node that uses the full_html text format.
-    $this->drupalCreateNode(array(
+    $this->drupalCreateNode([
       'type' => 'page',
-      'field_text' => array(
-        array('value' => $this->randomMachineName(32), 'format' => 'full_html')
-      ),
-    ));
+      'field_text' => [
+        ['value' => $this->randomMachineName(32), 'format' => 'full_html']
+      ],
+    ]);
 
     // Assert the unicorn editor works with textfields.
     $this->drupalLogin($this->privilegedUser);
@@ -268,7 +268,7 @@ class EditorLoadingTest extends WebTestBase {
 
   protected function getThingsToCheck($field_name, $type = 'textarea') {
     $settings = $this->getDrupalSettings();
-    return array(
+    return [
       // JavaScript settings.
       $settings,
       // Editor.module's JS settings present.
@@ -279,7 +279,7 @@ class EditorLoadingTest extends WebTestBase {
       $this->xpath('//' . $type . '[@id="edit-' . $field_name . '-0-value"]'),
       // Format selector.
       $this->xpath('//select[contains(@class, "filter-list")]'),
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/editor/src/Tests/EditorSecurityTest.php b/web/core/modules/editor/src/Tests/EditorSecurityTest.php
index c771439c6..d00fe0e68 100644
--- a/web/core/modules/editor/src/Tests/EditorSecurityTest.php
+++ b/web/core/modules/editor/src/Tests/EditorSecurityTest.php
@@ -40,7 +40,7 @@ class EditorSecurityTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'editor', 'editor_test', 'node');
+  public static $modules = ['filter', 'editor', 'editor_test', 'node'];
 
   /**
    * User with access to Restricted HTML text format without text editor.
@@ -83,74 +83,74 @@ class EditorSecurityTest extends WebTestBase {
     // With text formats 2, 3 and 5, we also associate a text editor that does
     // not guarantee XSS safety. "restricted" means the text format has XSS
     // filters on output, "unrestricted" means the opposite.
-    $format = FilterFormat::create(array(
+    $format = FilterFormat::create([
       'format' => 'restricted_without_editor',
       'name' => 'Restricted HTML, without text editor',
       'weight' => 0,
-      'filters' => array(
+      'filters' => [
         // A filter of the FilterInterface::TYPE_HTML_RESTRICTOR type.
-        'filter_html' => array(
+        'filter_html' => [
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<h2> <h3> <h4> <h5> <h6> <p> <br> <strong> <a>',
-          )
-        ),
-      ),
-    ));
+          ]
+        ],
+      ],
+    ]);
     $format->save();
-    $format = FilterFormat::create(array(
+    $format = FilterFormat::create([
       'format' => 'restricted_with_editor',
       'name' => 'Restricted HTML, with text editor',
       'weight' => 1,
-      'filters' => array(
+      'filters' => [
         // A filter of the FilterInterface::TYPE_HTML_RESTRICTOR type.
-        'filter_html' => array(
+        'filter_html' => [
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<h2> <h3> <h4> <h5> <h6> <p> <br> <strong> <a>',
-          )
-        ),
-      ),
-    ));
+          ]
+        ],
+      ],
+    ]);
     $format->save();
     $editor = Editor::create([
       'format' => 'restricted_with_editor',
       'editor' => 'unicorn',
     ]);
     $editor->save();
-    $format = FilterFormat::create(array(
+    $format = FilterFormat::create([
       'format' => 'restricted_plus_dangerous_tag_with_editor',
       'name' => 'Restricted HTML, dangerous tag allowed, with text editor',
       'weight' => 1,
-      'filters' => array(
+      'filters' => [
         // A filter of the FilterInterface::TYPE_HTML_RESTRICTOR type.
-        'filter_html' => array(
+        'filter_html' => [
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<h2> <h3> <h4> <h5> <h6> <p> <br> <strong> <a> <embed>',
-          )
-        ),
-      ),
-    ));
+          ]
+        ],
+      ],
+    ]);
     $format->save();
     $editor = Editor::create([
       'format' => 'restricted_plus_dangerous_tag_with_editor',
       'editor' => 'unicorn',
     ]);
     $editor->save();
-    $format = FilterFormat::create(array(
+    $format = FilterFormat::create([
       'format' => 'unrestricted_without_editor',
       'name' => 'Unrestricted HTML, without text editor',
       'weight' => 0,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $format->save();
-    $format = FilterFormat::create(array(
+    $format = FilterFormat::create([
       'format' => 'unrestricted_with_editor',
       'name' => 'Unrestricted HTML, with text editor',
       'weight' => 1,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $format->save();
     $editor = Editor::create([
       'format' => 'unrestricted_with_editor',
@@ -160,10 +160,10 @@ class EditorSecurityTest extends WebTestBase {
 
 
     // Create node type.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'article',
       'name' => 'Article',
-    ));
+    ]);
 
     // Create 4 users, each with access to different text formats/editors:
     //   - "untrusted": restricted_without_editor
@@ -172,22 +172,22 @@ class EditorSecurityTest extends WebTestBase {
     //   - "privileged": restricted_without_editor, restricted_with_editor,
     //     restricted_plus_dangerous_tag_with_editor,
     //     unrestricted_without_editor and unrestricted_with_editor
-    $this->untrustedUser = $this->drupalCreateUser(array(
+    $this->untrustedUser = $this->drupalCreateUser([
       'create article content',
       'edit any article content',
       'use text format restricted_without_editor',
-    ));
-    $this->normalUser = $this->drupalCreateUser(array(
+    ]);
+    $this->normalUser = $this->drupalCreateUser([
       'create article content',
       'edit any article content',
       'use text format restricted_with_editor',
-    ));
-    $this->trustedUser = $this->drupalCreateUser(array(
+    ]);
+    $this->trustedUser = $this->drupalCreateUser([
       'create article content',
       'edit any article content',
       'use text format restricted_plus_dangerous_tag_with_editor',
-    ));
-    $this->privilegedUser = $this->drupalCreateUser(array(
+    ]);
+    $this->privilegedUser = $this->drupalCreateUser([
       'create article content',
       'edit any article content',
       'use text format restricted_without_editor',
@@ -195,25 +195,25 @@ class EditorSecurityTest extends WebTestBase {
       'use text format restricted_plus_dangerous_tag_with_editor',
       'use text format unrestricted_without_editor',
       'use text format unrestricted_with_editor',
-    ));
+    ]);
 
     // Create an "article" node for each possible text format, with the same
     // sample content, to do our tests on.
-    $samples = array(
-      array('author' => $this->untrustedUser->id(), 'format' => 'restricted_without_editor'),
-      array('author' => $this->normalUser->id(), 'format' => 'restricted_with_editor'),
-      array('author' => $this->trustedUser->id(), 'format' => 'restricted_plus_dangerous_tag_with_editor'),
-      array('author' => $this->privilegedUser->id(), 'format' => 'unrestricted_without_editor'),
-      array('author' => $this->privilegedUser->id(), 'format' => 'unrestricted_with_editor'),
-    );
+    $samples = [
+      ['author' => $this->untrustedUser->id(), 'format' => 'restricted_without_editor'],
+      ['author' => $this->normalUser->id(), 'format' => 'restricted_with_editor'],
+      ['author' => $this->trustedUser->id(), 'format' => 'restricted_plus_dangerous_tag_with_editor'],
+      ['author' => $this->privilegedUser->id(), 'format' => 'unrestricted_without_editor'],
+      ['author' => $this->privilegedUser->id(), 'format' => 'unrestricted_with_editor'],
+    ];
     foreach ($samples as $sample) {
-      $this->drupalCreateNode(array(
+      $this->drupalCreateNode([
         'type' => 'article',
-        'body' => array(
-          array('value' => self::$sampleContent, 'format' => $sample['format'])
-        ),
+        'body' => [
+          ['value' => self::$sampleContent, 'format' => $sample['format']]
+        ],
         'uid' => $sample['author']
-      ));
+      ]);
     }
   }
 
@@ -222,65 +222,65 @@ class EditorSecurityTest extends WebTestBase {
    *
    * Tests 8 scenarios. Tests only with a text editor that is not XSS-safe.
    */
-  function testInitialSecurity() {
-    $expected = array(
-      array(
+  public function testInitialSecurity() {
+    $expected = [
+      [
         'node_id' => 1,
         'format' => 'restricted_without_editor',
         // No text editor => no XSS filtering.
         'value' => self::$sampleContent,
-        'users' => array(
+        'users' => [
           $this->untrustedUser,
           $this->privilegedUser,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'node_id' => 2,
         'format' => 'restricted_with_editor',
         // Text editor => XSS filtering.
         'value' => self::$sampleContentSecured,
-        'users' => array(
+        'users' => [
           $this->normalUser,
           $this->privilegedUser,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'node_id' => 3,
         'format' => 'restricted_plus_dangerous_tag_with_editor',
         // Text editor => XSS filtering.
         'value' => self::$sampleContentSecuredEmbedAllowed,
-        'users' => array(
+        'users' => [
           $this->trustedUser,
           $this->privilegedUser,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'node_id' => 4,
         'format' => 'unrestricted_without_editor',
         // No text editor => no XSS filtering.
         'value' => self::$sampleContent,
-        'users' => array(
+        'users' => [
           $this->privilegedUser,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'node_id' => 5,
         'format' => 'unrestricted_with_editor',
         // Text editor, no security filter => no XSS filtering.
         'value' => self::$sampleContent,
-        'users' => array(
+        'users' => [
           $this->privilegedUser,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     // Log in as each user that may edit the content, and assert the value.
     foreach ($expected as $case) {
       foreach ($case['users'] as $account) {
-        $this->pass(format_string('Scenario: sample %sample_id, %format.', array(
+        $this->pass(format_string('Scenario: sample %sample_id, %format.', [
           '%sample_id' => $case['node_id'],
           '%format' => $case['format'],
-        )));
+        ]));
         $this->drupalLogin($account);
         $this->drupalGet('node/' . $case['node_id'] . '/edit');
         $dom_node = $this->xpath('//textarea[@id="edit-body-0-value"]');
@@ -302,26 +302,26 @@ class EditorSecurityTest extends WebTestBase {
    * format and contains a <script> tag to the Full HTML text format, the
    * <script> tag would be executed. Unless we apply appropriate filtering.
    */
-  function testSwitchingSecurity() {
-    $expected = array(
-      array(
+  public function testSwitchingSecurity() {
+    $expected = [
+      [
         'node_id' => 1,
         'value' => self::$sampleContent, // No text editor => no XSS filtering.
         'format' => 'restricted_without_editor',
-        'switch_to' => array(
+        'switch_to' => [
           'restricted_with_editor' => self::$sampleContentSecured,
           // Intersection of restrictions => most strict XSS filtering.
           'restricted_plus_dangerous_tag_with_editor' => self::$sampleContentSecured,
           // No text editor => no XSS filtering.
           'unrestricted_without_editor' => FALSE,
           'unrestricted_with_editor' => self::$sampleContentSecured,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'node_id' => 2,
         'value' => self::$sampleContentSecured, // Text editor => XSS filtering.
         'format' => 'restricted_with_editor',
-        'switch_to' => array(
+        'switch_to' => [
           // No text editor => no XSS filtering.
           'restricted_without_editor' => FALSE,
           // Intersection of restrictions => most strict XSS filtering.
@@ -329,13 +329,13 @@ class EditorSecurityTest extends WebTestBase {
           // No text editor => no XSS filtering.
           'unrestricted_without_editor' => FALSE,
           'unrestricted_with_editor' => self::$sampleContentSecured,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'node_id' => 3,
         'value' => self::$sampleContentSecuredEmbedAllowed, // Text editor => XSS filtering.
         'format' => 'restricted_plus_dangerous_tag_with_editor',
-        'switch_to' => array(
+        'switch_to' => [
           // No text editor => no XSS filtering.
           'restricted_without_editor' => FALSE,
           // Intersection of restrictions => most strict XSS filtering.
@@ -344,13 +344,13 @@ class EditorSecurityTest extends WebTestBase {
           'unrestricted_without_editor' => FALSE,
           // Intersection of restrictions => most strict XSS filtering.
           'unrestricted_with_editor' => self::$sampleContentSecured,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'node_id' => 4,
         'value' => self::$sampleContent, // No text editor => no XSS filtering.
         'format' => 'unrestricted_without_editor',
-        'switch_to' => array(
+        'switch_to' => [
           // No text editor => no XSS filtering.
           'restricted_without_editor' => FALSE,
           'restricted_with_editor' => self::$sampleContentSecured,
@@ -360,13 +360,13 @@ class EditorSecurityTest extends WebTestBase {
           // filters: resulting content when viewed was already vulnerable, so
           // it must be intentional.
           'unrestricted_with_editor' => FALSE,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'node_id' => 5,
         'value' => self::$sampleContentSecured, // Text editor => XSS filtering.
         'format' => 'unrestricted_with_editor',
-        'switch_to' => array(
+        'switch_to' => [
           // From editor, no security filters to security filters, no editor: no
           // risk.
           'restricted_without_editor' => FALSE,
@@ -377,9 +377,9 @@ class EditorSecurityTest extends WebTestBase {
           // filters: resulting content when viewed was already vulnerable, so
           // it must be intentional.
           'unrestricted_without_editor' => FALSE,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     // Log in as the privileged user, and for every sample, do the following:
     //  - switch to every other text format/editor
@@ -395,15 +395,15 @@ class EditorSecurityTest extends WebTestBase {
 
       // Switch to every other text format/editor and verify the results.
       foreach ($case['switch_to'] as $format => $expected_filtered_value) {
-        $this->pass(format_string('Scenario: sample %sample_id, switch from %original_format to %format.', array(
+        $this->pass(format_string('Scenario: sample %sample_id, switch from %original_format to %format.', [
           '%sample_id' => $case['node_id'],
           '%original_format' => $case['format'],
           '%format' => $format,
-        )));
-        $post = array(
+        ]));
+        $post = [
           'value' => self::$sampleContent,
           'original_format_id' => $case['format'],
-        );
+        ];
         $response = $this->drupalPostWithFormat('editor/filter_xss/' . $format, 'json', $post);
         $this->assertResponse(200);
         $json = Json::decode($response);
@@ -415,7 +415,7 @@ class EditorSecurityTest extends WebTestBase {
   /**
    * Tests the standard text editor XSS filter being overridden.
    */
-  function testEditorXssFilterOverride() {
+  public function testEditorXssFilterOverride() {
     // First: the Standard text editor XSS filter.
     $this->drupalLogin($this->normalUser);
     $this->drupalGet('node/2/edit');
diff --git a/web/core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php b/web/core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php
index 9a41f6b4a..7141687bc 100644
--- a/web/core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php
+++ b/web/core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php
@@ -19,47 +19,47 @@ class QuickEditIntegrationLoadingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('quickedit', 'filter', 'node', 'editor');
+  public static $modules = ['quickedit', 'filter', 'node', 'editor'];
 
   /**
    * The basic permissions necessary to view content and use in-place editing.
    *
    * @var array
    */
-  protected static $basicPermissions = array('access content', 'create article content', 'use text format filtered_html', 'access contextual links');
+  protected static $basicPermissions = ['access content', 'create article content', 'use text format filtered_html', 'access contextual links'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create a text format.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
-      'filters' => array(
-        'filter_caption' => array(
+      'filters' => [
+        'filter_caption' => [
           'status' => 1,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     $filtered_html_format->save();
 
     // Create a node type.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'article',
       'name' => 'Article',
-    ));
+    ]);
 
     // Create one node of the above node type using the above text format.
-    $this->drupalCreateNode(array(
+    $this->drupalCreateNode([
       'type' => 'article',
-      'body' => array(
-        0 => array(
+      'body' => [
+        0 => [
           'value' => '<p>Do you also love Drupal?</p><img src="druplicon.png" data-caption="Druplicon" />',
           'format' => 'filtered_html',
-        )
-      )
-    ));
+        ]
+      ]
+    ]);
   }
 
   /**
@@ -70,11 +70,11 @@ class QuickEditIntegrationLoadingTest extends WebTestBase {
     // or both of the following permissions:
     // - the 'access in-place editing' permission
     // - the 'edit any article content' permission (necessary to edit node 1)
-    $users = array(
+    $users = [
       $this->drupalCreateUser(static::$basicPermissions),
-      $this->drupalCreateUser(array_merge(static::$basicPermissions, array('edit any article content'))),
-      $this->drupalCreateUser(array_merge(static::$basicPermissions, array('access in-place editing')))
-    );
+      $this->drupalCreateUser(array_merge(static::$basicPermissions, ['edit any article content'])),
+      $this->drupalCreateUser(array_merge(static::$basicPermissions, ['access in-place editing']))
+    ];
 
     // Now test with each of the 3 users with insufficient permissions.
     foreach ($users as $user) {
@@ -84,10 +84,17 @@ class QuickEditIntegrationLoadingTest extends WebTestBase {
       // Ensure the text is transformed.
       $this->assertRaw('<p>Do you also love Drupal?</p><figure role="group" class="caption caption-img"><img src="druplicon.png" /><figcaption>Druplicon</figcaption></figure>');
 
-      // Retrieving the untransformed text should result in an empty 403 response.
-      $response = $this->drupalPost('editor/' . 'node/1/body/en/full', '', array(), array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax')));
+      // Retrieving the untransformed text should result in an 403 response and
+      // return a different error message depending of the missing permission.
+      $response = $this->drupalPost('editor/' . 'node/1/body/en/full', '', [], ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
       $this->assertResponse(403);
-      $this->assertIdentical('{}', $response);
+      if (!$user->hasPermission('access in-place editing')) {
+        $message = "A fatal error occurred: The 'access in-place editing' permission is required.";
+        $this->assertIdentical(Json::encode(['message' => $message]), $response);
+      }
+      else {
+        $this->assertIdentical('{}', $response);
+      }
     }
   }
 
@@ -95,7 +102,7 @@ class QuickEditIntegrationLoadingTest extends WebTestBase {
    * Test loading of untransformed text when a user does have access to it.
    */
   public function testUserWithPermission() {
-    $user = $this->drupalCreateUser(array_merge(static::$basicPermissions, array('edit any article content', 'access in-place editing')));
+    $user = $this->drupalCreateUser(array_merge(static::$basicPermissions, ['edit any article content', 'access in-place editing']));
     $this->drupalLogin($user);
     $this->drupalGet('node/1');
 
diff --git a/web/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php b/web/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php
index e78536950..0d787a8d8 100644
--- a/web/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php
+++ b/web/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php
@@ -26,18 +26,18 @@ class TRexEditor extends EditorBase {
    * {@inheritdoc}
    */
   public function getDefaultSettings() {
-    return array('stumpy_arms' => TRUE);
+    return ['stumpy_arms' => TRUE];
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
-    $form['stumpy_arms'] = array(
+    $form['stumpy_arms'] = [
       '#title' => t('Stumpy arms'),
       '#type' => 'checkbox',
       '#default_value' => TRUE,
-    );
+    ];
     return $form;
   }
 
@@ -45,7 +45,7 @@ class TRexEditor extends EditorBase {
    * {@inheritdoc}
    */
   public function getJSSettings(Editor $editor) {
-    $js_settings = array();
+    $js_settings = [];
     $settings = $editor->getSettings();
     if ($settings['stumpy_arms']) {
       $js_settings['doMyArmsLookStumpy'] = TRUE;
@@ -57,9 +57,9 @@ class TRexEditor extends EditorBase {
    * {@inheritdoc}
    */
   public function getLibraries(Editor $editor) {
-    return array(
+    return [
       'editor_test/trex',
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php b/web/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php
index c196751ef..b7b200e28 100644
--- a/web/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php
+++ b/web/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php
@@ -26,27 +26,27 @@ class UnicornEditor extends EditorBase {
   /**
    * {@inheritdoc}
    */
-  function getDefaultSettings() {
-    return array('ponies_too' => TRUE);
+  public function getDefaultSettings() {
+    return ['ponies_too' => TRUE];
   }
 
   /**
    * {@inheritdoc}
    */
-  function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
-    $form['ponies_too'] = array(
+  public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
+    $form['ponies_too'] = [
       '#title' => t('Pony mode'),
       '#type' => 'checkbox',
       '#default_value' => TRUE,
-    );
+    ];
     return $form;
   }
 
   /**
    * {@inheritdoc}
    */
-  function getJSSettings(Editor $editor) {
-    $js_settings = array();
+  public function getJSSettings(Editor $editor) {
+    $js_settings = [];
     $settings = $editor->getSettings();
     if ($settings['ponies_too']) {
       $js_settings['ponyModeEnabled'] = TRUE;
@@ -58,9 +58,9 @@ class UnicornEditor extends EditorBase {
    * {@inheritdoc}
    */
   public function getLibraries(Editor $editor) {
-    return array(
+    return [
       'editor_test/unicorn',
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/editor/src/Tests/EditorDialogAccessTest.php b/web/core/modules/editor/tests/src/Functional/EditorDialogAccessTest.php
similarity index 98%
rename from web/core/modules/editor/src/Tests/EditorDialogAccessTest.php
rename to web/core/modules/editor/tests/src/Functional/EditorDialogAccessTest.php
index 3221f0f92..3a97b351b 100644
--- a/web/core/modules/editor/src/Tests/EditorDialogAccessTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorDialogAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\editor\Tests;
+namespace Drupal\Tests\editor\Functional;
 
 use Drupal\Core\Url;
 use Drupal\editor\Entity\Editor;
diff --git a/web/core/modules/editor/src/Tests/EditorPrivateFileReferenceFilterTest.php b/web/core/modules/editor/tests/src/Functional/EditorPrivateFileReferenceFilterTest.php
similarity index 97%
rename from web/core/modules/editor/src/Tests/EditorPrivateFileReferenceFilterTest.php
rename to web/core/modules/editor/tests/src/Functional/EditorPrivateFileReferenceFilterTest.php
index 354ceede0..816de5d6e 100644
--- a/web/core/modules/editor/src/Tests/EditorPrivateFileReferenceFilterTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorPrivateFileReferenceFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\editor\Tests;
+namespace Drupal\Tests\editor\Functional;
 
 use Drupal\file\Entity\File;
 use Drupal\Tests\BrowserTestBase;
@@ -36,7 +36,7 @@ class EditorPrivateFileReferenceFilterTest extends BrowserTestBase {
   /**
    * Tests the editor file reference filter with private files.
    */
-  function testEditorPrivateFileReferenceFilter() {
+  public function testEditorPrivateFileReferenceFilter() {
     $author = $this->drupalCreateUser();
     $this->drupalLogin($author);
 
diff --git a/web/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php b/web/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
index 51eee9731..c68ae48e6 100644
--- a/web/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
+++ b/web/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
@@ -19,7 +19,7 @@ class EditorFileReferenceFilterTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'filter', 'editor', 'field', 'file', 'user');
+  public static $modules = ['system', 'filter', 'editor', 'field', 'file', 'user'];
 
   /**
    * @var \Drupal\filter\Plugin\FilterInterface[]
@@ -31,19 +31,19 @@ class EditorFileReferenceFilterTest extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('system'));
+    $this->installConfig(['system']);
     $this->installEntitySchema('file');
-    $this->installSchema('file', array('file_usage'));
+    $this->installSchema('file', ['file_usage']);
 
     $manager = $this->container->get('plugin.manager.filter');
-    $bag = new FilterPluginCollection($manager, array());
+    $bag = new FilterPluginCollection($manager, []);
     $this->filters = $bag->getAll();
   }
 
   /**
    * Tests the editor file reference filter.
    */
-  function testEditorFileReferenceFilter() {
+  public function testEditorFileReferenceFilter() {
     $filter = $this->filters['editor_file_reference'];
 
     $test = function($input) use ($filter) {
@@ -99,7 +99,7 @@ class EditorFileReferenceFilterTest extends KernelTestBase {
     $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="invalid-' . $uuid . '" />';
     $output = $test($input);
     $this->assertIdentical($input, $output->getProcessedText());
-    $this->assertEqual(array(), $output->getCacheTags());
+    $this->assertEqual([], $output->getCacheTags());
 
     $this->pass('Two different data-entity-uuid attributes.');
     $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
diff --git a/web/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php b/web/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
index 9b7b48722..aac665d61 100644
--- a/web/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
+++ b/web/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
@@ -23,22 +23,22 @@ class EditorFileUsageTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('editor', 'editor_test', 'node', 'file');
+  public static $modules = ['editor', 'editor_test', 'node', 'file'];
 
   protected function setUp() {
     parent::setUp();
     $this->installEntitySchema('file');
-    $this->installSchema('node', array('node_access'));
-    $this->installSchema('file', array('file_usage'));
+    $this->installSchema('node', ['node_access']);
+    $this->installSchema('file', ['file_usage']);
     $this->installConfig(['node']);
 
     // Add text formats.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $filtered_html_format->save();
 
     // Set cardinality for body field.
@@ -63,13 +63,13 @@ class EditorFileUsageTest extends EntityKernelTestBase {
    * Tests the configurable text editor manager.
    */
   public function testEditorEntityHooks() {
-    $image_paths = array(
+    $image_paths = [
       0 => 'core/misc/druplicon.png',
       1 => 'core/misc/tree.png',
       2 => 'core/misc/help.png',
-    );
+    ];
 
-    $image_entities = array();
+    $image_entities = [];
     foreach ($image_paths as $key => $image_path) {
       $image = File::create();
       $image->setFileUri($image_path);
@@ -77,12 +77,12 @@ class EditorFileUsageTest extends EntityKernelTestBase {
       $image->save();
 
       $file_usage = $this->container->get('file.usage');
-      $this->assertIdentical(array(), $file_usage->listUsage($image), 'The image ' . $image_paths[$key] . ' has zero usages.');
+      $this->assertIdentical([], $file_usage->listUsage($image), 'The image ' . $image_paths[$key] . ' has zero usages.');
 
       $image_entities[] = $image;
     }
 
-    $body = array();
+    $body = [];
     foreach ($image_entities as $key => $image_entity) {
       // Don't be rude, say hello.
       $body_value = '<p>Hello, world!</p>';
@@ -95,10 +95,10 @@ class EditorFileUsageTest extends EntityKernelTestBase {
       // Test handling of a non-existing UUID.
       $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="file" data-entity-uuid="30aac704-ba2c-40fc-b609-9ed121aa90f4" />';
 
-      $body[] = array(
+      $body[] = [
         'value' => $body_value,
         'format' => 'filtered_html',
-      );
+      ];
     }
 
     // Test editor_entity_insert(): increment.
@@ -111,7 +111,7 @@ class EditorFileUsageTest extends EntityKernelTestBase {
     ]);
     $node->save();
     foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '1'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 1 usage.');
+      $this->assertIdentical(['editor' => ['node' => [1 => '1']]], $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 1 usage.');
     }
 
     // Test editor_entity_update(): increment, twice, by creating new revisions.
@@ -121,12 +121,12 @@ class EditorFileUsageTest extends EntityKernelTestBase {
     $node->setNewRevision(TRUE);
     $node->save();
     foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
+      $this->assertIdentical(['editor' => ['node' => [1 => '3']]], $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
     }
 
     // Test hook_entity_update(): decrement, by modifying the last revision:
     // remove the data-entity-type attribute from the body field.
-    $original_values = array();
+    $original_values = [];
     for ($i = 0; $i < count($image_entities); $i++) {
       $original_value = $node->body[$i]->value;
       $new_value = str_replace('data-entity-type', 'data-entity-type-modified', $original_value);
@@ -135,7 +135,7 @@ class EditorFileUsageTest extends EntityKernelTestBase {
     }
     $node->save();
     foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
+      $this->assertIdentical(['editor' => ['node' => [1 => '2']]], $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
     }
 
     // Test editor_entity_update(): increment again by creating a new revision:
@@ -146,7 +146,7 @@ class EditorFileUsageTest extends EntityKernelTestBase {
     }
     $node->save();
     foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
+      $this->assertIdentical(['editor' => ['node' => [1 => '3']]], $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
     }
 
     // Test hook_entity_update(): decrement, by modifying the last revision:
@@ -158,7 +158,7 @@ class EditorFileUsageTest extends EntityKernelTestBase {
     }
     $node->save();
     foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
+      $this->assertIdentical(['editor' => ['node' => [1 => '2']]], $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
     }
 
     // Test hook_entity_update(): increment, by modifying the last revision:
@@ -168,13 +168,13 @@ class EditorFileUsageTest extends EntityKernelTestBase {
     }
     $node->save();
     foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
+      $this->assertIdentical(['editor' => ['node' => [1 => '3']]], $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
     }
 
     // Test editor_entity_revision_delete(): decrement, by deleting a revision.
-    entity_revision_delete('node', $second_revision_id);
+    $this->container->get('entity_type.manager')->getStorage('node')->deleteRevision($second_revision_id);
     foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
+      $this->assertIdentical(['editor' => ['node' => [1 => '2']]], $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
     }
 
     // Populate both the body and summary. Because this will be the same
@@ -185,7 +185,7 @@ class EditorFileUsageTest extends EntityKernelTestBase {
     }
     $node->save();
     foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
+      $this->assertIdentical(['editor' => ['node' => [1 => '2']]], $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
     }
 
     // Empty out the body value, but keep the summary. The number of usages
@@ -196,13 +196,13 @@ class EditorFileUsageTest extends EntityKernelTestBase {
     }
     $node->save();
     foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
+      $this->assertIdentical(['editor' => ['node' => [1 => '2']]], $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
     }
 
     // Test editor_entity_delete().
     $node->delete();
     foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array(), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has zero usages again.');
+      $this->assertIdentical([], $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has zero usages again.');
     }
   }
 
diff --git a/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php b/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
index 329018b9e..6500d1ade 100644
--- a/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
+++ b/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
@@ -37,8 +37,8 @@ class EditorImageDialogTest extends EntityKernelTestBase {
     parent::setUp();
     $this->installEntitySchema('file');
     $this->installSchema('system', ['key_value_expire']);
-    $this->installSchema('node', array('node_access'));
-    $this->installSchema('file', array('file_usage'));
+    $this->installSchema('node', ['node_access']);
+    $this->installSchema('file', ['file_usage']);
     $this->installConfig(['node']);
 
     // Add text formats.
diff --git a/web/core/modules/editor/tests/src/Kernel/EditorManagerTest.php b/web/core/modules/editor/tests/src/Kernel/EditorManagerTest.php
index b6077a587..d1d6eafa1 100644
--- a/web/core/modules/editor/tests/src/Kernel/EditorManagerTest.php
+++ b/web/core/modules/editor/tests/src/Kernel/EditorManagerTest.php
@@ -18,7 +18,7 @@ class EditorManagerTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'filter', 'editor');
+  public static $modules = ['system', 'user', 'filter', 'editor'];
 
   /**
    * The manager for text editor plugins.
@@ -33,19 +33,19 @@ class EditorManagerTest extends KernelTestBase {
     // Install the Filter module.
 
     // Add text formats.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $filtered_html_format->save();
-    $full_html_format = FilterFormat::create(array(
+    $full_html_format = FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $full_html_format->save();
   }
 
@@ -59,13 +59,13 @@ class EditorManagerTest extends KernelTestBase {
     // - listOptions() should return an empty list of options
     // - getAttachments() should return an empty #attachments array (and not
     //   a JS settings structure that is empty)
-    $this->assertIdentical(array(), $this->editorManager->listOptions(), 'When no text editor is enabled, the manager works correctly.');
-    $this->assertIdentical(array(), $this->editorManager->getAttachments(array()), 'No attachments when no text editor is enabled and retrieving attachments for zero text formats.');
-    $this->assertIdentical(array(), $this->editorManager->getAttachments(array('filtered_html', 'full_html')), 'No attachments when no text editor is enabled and retrieving attachments for multiple text formats.');
+    $this->assertIdentical([], $this->editorManager->listOptions(), 'When no text editor is enabled, the manager works correctly.');
+    $this->assertIdentical([], $this->editorManager->getAttachments([]), 'No attachments when no text editor is enabled and retrieving attachments for zero text formats.');
+    $this->assertIdentical([], $this->editorManager->getAttachments(['filtered_html', 'full_html']), 'No attachments when no text editor is enabled and retrieving attachments for multiple text formats.');
 
     // Enable the Text Editor Test module, which has the Unicorn Editor and
     // clear the editor manager's cache so it is picked up.
-    $this->enableModules(array('editor_test'));
+    $this->enableModules(['editor_test']);
     $this->editorManager = $this->container->get('plugin.manager.editor');
     $this->editorManager->clearCachedDefinitions();
 
@@ -80,11 +80,11 @@ class EditorManagerTest extends KernelTestBase {
       'editor' => 'unicorn',
     ]);
     $editor->save();
-    $this->assertIdentical(array(), $this->editorManager->getAttachments(array()), 'No attachments when one text editor is enabled and retrieving attachments for zero text formats.');
-    $expected = array(
-      'library' => array(
+    $this->assertIdentical([], $this->editorManager->getAttachments([]), 'No attachments when one text editor is enabled and retrieving attachments for zero text formats.');
+    $expected = [
+      'library' => [
         0 => 'editor_test/unicorn',
-      ),
+      ],
       'drupalSettings' => [
         'editor' => [
           'formats' => [
@@ -98,14 +98,14 @@ class EditorManagerTest extends KernelTestBase {
           ],
         ],
       ],
-    );
-    $this->assertIdentical($expected, $this->editorManager->getAttachments(array('filtered_html', 'full_html')), 'Correct attachments when one text editor is enabled and retrieving attachments for multiple text formats.');
+    ];
+    $this->assertIdentical($expected, $this->editorManager->getAttachments(['filtered_html', 'full_html']), 'Correct attachments when one text editor is enabled and retrieving attachments for multiple text formats.');
 
     // Case 4: a text editor available associated, but now with its JS settings
     // being altered via hook_editor_js_settings_alter().
     \Drupal::state()->set('editor_test_js_settings_alter_enabled', TRUE);
     $expected['drupalSettings']['editor']['formats']['full_html']['editorSettings']['ponyModeEnabled'] = FALSE;
-    $this->assertIdentical($expected, $this->editorManager->getAttachments(array('filtered_html', 'full_html')), 'hook_editor_js_settings_alter() works correctly.');
+    $this->assertIdentical($expected, $this->editorManager->getAttachments(['filtered_html', 'full_html']), 'hook_editor_js_settings_alter() works correctly.');
   }
 
 }
diff --git a/web/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php b/web/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php
index d62cb681a..256d27177 100644
--- a/web/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php
+++ b/web/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php
@@ -26,7 +26,7 @@ class QuickEditIntegrationTest extends QuickEditTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('editor', 'editor_test');
+  public static $modules = ['editor', 'editor_test'];
 
   /**
    * The manager for editor plug-ins.
@@ -73,22 +73,22 @@ class QuickEditIntegrationTest extends QuickEditTestBase {
     $this->createFieldWithStorage(
       $this->fieldName, 'text', 1, 'Long text field',
       // Instance settings.
-      array(),
+      [],
       // Widget type & settings.
       'text_textarea',
-      array('size' => 42),
+      ['size' => 42],
       // 'default' formatter type & settings.
       'text_default',
-      array()
+      []
     );
 
     // Create text format.
-    $full_html_format = FilterFormat::create(array(
+    $full_html_format = FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $full_html_format->save();
 
     // Associate text editor with text format.
@@ -99,12 +99,12 @@ class QuickEditIntegrationTest extends QuickEditTestBase {
     $editor->save();
 
     // Also create a text format without an associated text editor.
-    FilterFormat::create(array(
+    FilterFormat::create([
       'format' => 'no_editor',
       'name' => 'No Text Editor',
       'weight' => 2,
-      'filters' => array(),
-    ))->save();
+      'filters' => [],
+    ])->save();
   }
 
   /**
@@ -179,15 +179,15 @@ class QuickEditIntegrationTest extends QuickEditTestBase {
     // Verify metadata.
     $items = $entity->get($this->fieldName);
     $metadata = $this->metadataGenerator->generateFieldMetadata($items, 'default');
-    $expected = array(
+    $expected = [
       'access' => TRUE,
       'label' => 'Long text field',
       'editor' => 'editor',
-      'custom' => array(
+      'custom' => [
         'format' => 'full_html',
         'formatHasTransformations' => FALSE,
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($expected, $metadata, 'The correct metadata (including custom metadata) is generated.');
   }
 
@@ -197,9 +197,9 @@ class QuickEditIntegrationTest extends QuickEditTestBase {
   public function testAttachments() {
     $this->editorSelector = $this->container->get('quickedit.editor.selector');
 
-    $editors = array('editor');
+    $editors = ['editor'];
     $attachments = $this->editorSelector->getEditorAttachments($editors);
-    $this->assertIdentical($attachments, array('library' => array('editor/quickedit.inPlaceEditor.formattedText')), "Expected attachments for Editor module's in-place editor found.");
+    $this->assertIdentical($attachments, ['library' => ['editor/quickedit.inPlaceEditor.formattedText']], "Expected attachments for Editor module's in-place editor found.");
   }
 
   /**
@@ -217,12 +217,12 @@ class QuickEditIntegrationTest extends QuickEditTestBase {
     $controller = new EditorController();
     $request = new Request();
     $response = $controller->getUntransformedText($entity, $this->fieldName, LanguageInterface::LANGCODE_DEFAULT, 'default');
-    $expected = array(
-      array(
+    $expected = [
+      [
         'command' => 'editorGetUntransformedText',
         'data' => 'Test',
-      )
-    );
+      ]
+    ];
 
     $ajax_response_attachments_processor = \Drupal::service('ajax_response.attachments_processor');
     $subscriber = new AjaxResponseSubscriber($ajax_response_attachments_processor);
diff --git a/web/core/modules/editor/tests/src/Unit/EditorBaseTest.php b/web/core/modules/editor/tests/src/Unit/EditorBaseTest.php
new file mode 100644
index 000000000..a088fb054
--- /dev/null
+++ b/web/core/modules/editor/tests/src/Unit/EditorBaseTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Drupal\Tests\editor\Unit;
+
+use Drupal\Core\Form\FormState;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\editor\Entity\Editor;
+use Drupal\editor\Plugin\EditorBase;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\editor\Plugin\EditorBase
+ * @group editor
+ */
+class EditorBaseTest extends UnitTestCase {
+
+  /**
+   * @covers ::buildConfigurationForm
+   * @covers ::validateConfigurationForm
+   * @covers ::submitConfigurationForm
+   */
+  public function testBc() {
+    $form_state = new FormState();
+    $form_state->set('editor', $this->prophesize(Editor::class)->reveal());
+    $editor_plugin = new BcEditor([], 'editor_plugin', []);
+
+    // settingsForm() is deprecated in favor of buildConfigurationForm().
+    $this->assertSame(
+      $editor_plugin->settingsForm([], clone $form_state, $this->prophesize(Editor::class)->reveal()),
+      $editor_plugin->buildConfigurationForm([], clone $form_state)
+    );
+
+    // settingsFormValidate() is deprecated in favor of
+    // validateConfigurationForm().
+    $form = [];
+    $form_state_a = clone $form_state;
+    $form_state_b = clone $form_state;
+    $editor_plugin->settingsFormValidate($form, $form_state_a, $this->prophesize(Editor::class)->reveal());
+    $editor_plugin->validateConfigurationForm($form, $form_state_b);
+    $this->assertEquals($form_state_a, $form_state_b);
+
+    // settingsFormSubmit() is deprecated in favor of submitConfigurationForm().
+    $form = [];
+    $form_state_a = clone $form_state;
+    $form_state_b = clone $form_state;
+    $editor_plugin->settingsFormSubmit($form, $form_state_a, $this->prophesize(Editor::class)->reveal());
+    $editor_plugin->submitConfigurationForm($form, $form_state_b);
+    $this->assertEquals($form_state_a, $form_state_b);
+  }
+
+}
+
+class BcEditor extends EditorBase {
+
+  public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
+    return ['foo' => 'bar'];
+  }
+
+  public function settingsFormValidate(array $form, FormStateInterface $form_state) {
+    $form_state->setValue('foo', 'bar');
+  }
+
+  public function settingsFormSubmit(array $form, FormStateInterface $form_state) {
+    $form_state->setValue('bar', 'baz');
+  }
+
+  public function getJSSettings(Editor $editor) {
+    return [];
+  }
+
+  public function getLibraries(Editor $editor) {
+    return [];
+  }
+
+}
diff --git a/web/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php b/web/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
index ebb8a8e68..4e96f4ac6 100644
--- a/web/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
+++ b/web/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
@@ -90,17 +90,17 @@ class EditorConfigEntityUnitTest extends UnitTestCase {
    */
   public function testCalculateDependencies() {
     $format_id = 'filter.format.test';
-    $values = array('editor' => $this->editorId, 'format' => $format_id);
+    $values = ['editor' => $this->editorId, 'format' => $format_id];
 
     $plugin = $this->getMockBuilder('Drupal\editor\Plugin\EditorPluginInterface')
       ->disableOriginalConstructor()
       ->getMock();
     $plugin->expects($this->once())
       ->method('getPluginDefinition')
-      ->will($this->returnValue(array('provider' => 'test_module')));
+      ->will($this->returnValue(['provider' => 'test_module']));
     $plugin->expects($this->once())
       ->method('getDefaultSettings')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $this->editorPluginManager->expects($this->any())
       ->method('createInstance')
@@ -116,14 +116,14 @@ class EditorConfigEntityUnitTest extends UnitTestCase {
 
     $storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
     $storage->expects($this->once())
-            ->method('load')
-            ->with($format_id)
-            ->will($this->returnValue($filter_format));
+      ->method('load')
+      ->with($format_id)
+      ->will($this->returnValue($filter_format));
 
     $this->entityManager->expects($this->once())
-                        ->method('getStorage')
-                        ->with('filter_format')
-                        ->will($this->returnValue($storage));
+      ->method('getStorage')
+      ->with('filter_format')
+      ->will($this->returnValue($storage));
 
     $dependencies = $entity->calculateDependencies()->getDependencies();
     $this->assertContains('test_module', $dependencies['module']);
diff --git a/web/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php b/web/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php
index d19758e5a..ce6309262 100644
--- a/web/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php
+++ b/web/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php
@@ -27,17 +27,17 @@ class StandardTest extends UnitTestCase {
       ->getMock();
     $this->format->expects($this->any())
       ->method('getFilterTypes')
-      ->will($this->returnValue(array(FilterInterface::TYPE_HTML_RESTRICTOR)));
-    $restrictions = array(
-      'allowed' => array(
+      ->will($this->returnValue([FilterInterface::TYPE_HTML_RESTRICTOR]));
+    $restrictions = [
+      'allowed' => [
         'p' => TRUE,
         'a' => TRUE,
-        '*' => array(
+        '*' => [
           'style' => FALSE,
           'on*' => FALSE,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     $this->format->expects($this->any())
       ->method('getHtmlRestrictions')
       ->will($this->returnValue($restrictions));
@@ -49,130 +49,130 @@ class StandardTest extends UnitTestCase {
    * @see \Drupal\Tests\editor\Unit\editor\EditorXssFilter\StandardTest::testFilterXss()
    */
   public function providerTestFilterXss() {
-    $data = array();
-    $data[] = array('<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown>', '<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown>');
-    $data[] = array('<p style="color:red">Hello, world!</p><unknown>Pink Fairy Armadillo</unknown>', '<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown>');
-    $data[] = array('<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown><script>alert("evil");</script>', '<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown>alert("evil");');
-    $data[] = array('<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown><a href="javascript:alert(1)">test</a>', '<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown><a href="alert(1)">test</a>');
+    $data = [];
+    $data[] = ['<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown>', '<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown>'];
+    $data[] = ['<p style="color:red">Hello, world!</p><unknown>Pink Fairy Armadillo</unknown>', '<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown>'];
+    $data[] = ['<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown><script>alert("evil");</script>', '<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown>alert("evil");'];
+    $data[] = ['<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown><a href="javascript:alert(1)">test</a>', '<p>Hello, world!</p><unknown>Pink Fairy Armadillo</unknown><a href="alert(1)">test</a>'];
 
     // All cases listed on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
 
     // No Filter Evasion.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#No_Filter_Evasion
-    $data[] = array('<SCRIPT SRC=http://ha.ckers.org/xss.js></SCRIPT>', '');
+    $data[] = ['<SCRIPT SRC=http://ha.ckers.org/xss.js></SCRIPT>', ''];
 
     // Image XSS using the JavaScript directive.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Image_XSS_using_the_JavaScript_directive
-    $data[] = array('<IMG SRC="javascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">');
+    $data[] = ['<IMG SRC="javascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">'];
 
     // No quotes and no semicolon.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#No_quotes_and_no_semicolon
-    $data[] = array('<IMG SRC=javascript:alert(\'XSS\')>', '<IMG>');
+    $data[] = ['<IMG SRC=javascript:alert(\'XSS\')>', '<IMG>'];
 
     // Case insensitive XSS attack vector.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Case_insensitive_XSS_attack_vector
-    $data[] = array('<IMG SRC=JaVaScRiPt:alert(\'XSS\')>', '<IMG>');
+    $data[] = ['<IMG SRC=JaVaScRiPt:alert(\'XSS\')>', '<IMG>'];
 
     // HTML entities.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#HTML_entities
-    $data[] = array('<IMG SRC=javascript:alert("XSS")>', '<IMG>');
+    $data[] = ['<IMG SRC=javascript:alert("XSS")>', '<IMG>'];
 
     // Grave accent obfuscation.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Grave_accent_obfuscation
-    $data[] = array('<IMG SRC=`javascript:alert("RSnake says, \'XSS\'")`>', '<IMG>');
+    $data[] = ['<IMG SRC=`javascript:alert("RSnake says, \'XSS\'")`>', '<IMG>'];
 
     // Malformed A tags.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Malformed_A_tags
-    $data[] = array('<a onmouseover="alert(document.cookie)">xxs link</a>', '<a>xxs link</a>');
-    $data[] = array('<a onmouseover=alert(document.cookie)>xxs link</a>', '<a>xxs link</a>');
+    $data[] = ['<a onmouseover="alert(document.cookie)">xxs link</a>', '<a>xxs link</a>'];
+    $data[] = ['<a onmouseover=alert(document.cookie)>xxs link</a>', '<a>xxs link</a>'];
 
     // Malformed IMG tags.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Malformed_IMG_tags
-    $data[] = array('<IMG """><SCRIPT>alert("XSS")</SCRIPT>">', '<IMG>alert("XSS")"&gt;');
+    $data[] = ['<IMG """><SCRIPT>alert("XSS")</SCRIPT>">', '<IMG>alert("XSS")"&gt;'];
 
     // fromCharCode.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#fromCharCode
-    $data[] = array('<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>', '<IMG src="alert(String.fromCharCode(88,83,83))">');
+    $data[] = ['<IMG SRC=javascript:alert(String.fromCharCode(88,83,83))>', '<IMG src="alert(String.fromCharCode(88,83,83))">'];
 
     // Default SRC tag to get past filters that check SRC domain.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Default_SRC_tag_to_get_past_filters_that_check_SRC_domain
-    $data[] = array('<IMG SRC=# onmouseover="alert(\'xxs\')">', '<IMG src="#">');
+    $data[] = ['<IMG SRC=# onmouseover="alert(\'xxs\')">', '<IMG src="#">'];
 
     // Default SRC tag by leaving it empty.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Default_SRC_tag_by_leaving_it_empty
-    $data[] = array('<IMG SRC= onmouseover="alert(\'xxs\')">', '<IMG nmouseover="alert(&#039;xxs&#039;)">');
+    $data[] = ['<IMG SRC= onmouseover="alert(\'xxs\')">', '<IMG nmouseover="alert(&#039;xxs&#039;)">'];
 
     // Default SRC tag by leaving it out entirely.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Default_SRC_tag_by_leaving_it_out_entirely
-    $data[] = array('<IMG onmouseover="alert(\'xxs\')">', '<IMG>');
+    $data[] = ['<IMG onmouseover="alert(\'xxs\')">', '<IMG>'];
 
     // Decimal HTML character references.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Decimal_HTML_character_references
-    $data[] = array('<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>', '<IMG src="alert(&#039;XSS&#039;)">');
+    $data[] = ['<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>', '<IMG src="alert(&#039;XSS&#039;)">'];
 
     // Decimal HTML character references without trailing semicolons.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Decimal_HTML_character_references_without_trailing_semicolons
-    $data[] = array('<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>', '<IMG src="&amp;#0000106&amp;#0000097&amp;#0000118&amp;#0000097&amp;#0000115&amp;#0000099&amp;#0000114&amp;#0000105&amp;#0000112&amp;#0000116&amp;#0000058&amp;#0000097&amp;#0000108&amp;#0000101&amp;#0000114&amp;#0000116&amp;#0000040&amp;#0000039&amp;#0000088&amp;#0000083&amp;#0000083&amp;#0000039&amp;#0000041">');
+    $data[] = ['<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>', '<IMG src="&amp;#0000106&amp;#0000097&amp;#0000118&amp;#0000097&amp;#0000115&amp;#0000099&amp;#0000114&amp;#0000105&amp;#0000112&amp;#0000116&amp;#0000058&amp;#0000097&amp;#0000108&amp;#0000101&amp;#0000114&amp;#0000116&amp;#0000040&amp;#0000039&amp;#0000088&amp;#0000083&amp;#0000083&amp;#0000039&amp;#0000041">'];
 
     // Hexadecimal HTML character references without trailing semicolons.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Hexadecimal_HTML_character_references_without_trailing_semicolons
-    $data[] = array('<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>', '<IMG src="&amp;#x6A&amp;#x61&amp;#x76&amp;#x61&amp;#x73&amp;#x63&amp;#x72&amp;#x69&amp;#x70&amp;#x74&amp;#x3A&amp;#x61&amp;#x6C&amp;#x65&amp;#x72&amp;#x74&amp;#x28&amp;#x27&amp;#x58&amp;#x53&amp;#x53&amp;#x27&amp;#x29">');
+    $data[] = ['<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>', '<IMG src="&amp;#x6A&amp;#x61&amp;#x76&amp;#x61&amp;#x73&amp;#x63&amp;#x72&amp;#x69&amp;#x70&amp;#x74&amp;#x3A&amp;#x61&amp;#x6C&amp;#x65&amp;#x72&amp;#x74&amp;#x28&amp;#x27&amp;#x58&amp;#x53&amp;#x53&amp;#x27&amp;#x29">'];
 
     // Embedded tab.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Embedded_tab
-    $data[] = array('<IMG SRC="jav  ascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">');
+    $data[] = ['<IMG SRC="jav  ascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">'];
 
     // Embedded Encoded tab.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Embedded_Encoded_tab
-    $data[] = array('<IMG SRC="jav&#x09;ascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">');
+    $data[] = ['<IMG SRC="jav&#x09;ascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">'];
 
     // Embedded newline to break up XSS.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Embedded_newline_to_break_up_XSS
-    $data[] = array('<IMG SRC="jav&#x0A;ascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">');
+    $data[] = ['<IMG SRC="jav&#x0A;ascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">'];
 
     // Embedded carriage return to break up XSS.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Embedded_carriage_return_to_break_up_XSS
-    $data[] = array('<IMG SRC="jav&#x0D;ascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">');
+    $data[] = ['<IMG SRC="jav&#x0D;ascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">'];
 
     // Null breaks up JavaScript directive.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Null_breaks_up_JavaScript_directive
-    $data[] = array("<IMG SRC=java\0script:alert(\"XSS\")>", '<IMG>');
+    $data[] = ["<IMG SRC=java\0script:alert(\"XSS\")>", '<IMG>'];
 
     // Spaces and meta chars before the JavaScript in images for XSS.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Spaces_and_meta_chars_before_the_JavaScript_in_images_for_XSS
     // @fixme This dataset currently fails under 5.4 because of
     //   https://www.drupal.org/node/1210798. Restore after it's fixed.
     if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-      $data[] = array('<IMG SRC=" &#14;  javascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">');
+      $data[] = ['<IMG SRC=" &#14;  javascript:alert(\'XSS\');">', '<IMG src="alert(&#039;XSS&#039;);">'];
     }
 
     // Non-alpha-non-digit XSS.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Non-alpha-non-digit_XSS
-    $data[] = array('<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '');
-    $data[] = array('<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert("XSS")>', '<BODY>');
-    $data[] = array('<SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '');
+    $data[] = ['<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>', ''];
+    $data[] = ['<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert("XSS")>', '<BODY>'];
+    $data[] = ['<SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>', ''];
 
     // Extraneous open brackets.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Extraneous_open_brackets
-    $data[] = array('<<SCRIPT>alert("XSS");//<</SCRIPT>', '&lt;alert("XSS");//&lt;');
+    $data[] = ['<<SCRIPT>alert("XSS");//<</SCRIPT>', '&lt;alert("XSS");//&lt;'];
 
     // No closing script tags.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#No_closing_script_tags
-    $data[] = array('<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >', '');
+    $data[] = ['<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >', ''];
 
     // Protocol resolution in script tags.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Protocol_resolution_in_script_tags
-    $data[] = array('<SCRIPT SRC=//ha.ckers.org/.j>', '');
+    $data[] = ['<SCRIPT SRC=//ha.ckers.org/.j>', ''];
 
     // Half open HTML/JavaScript XSS vector.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Half_open_HTML.2FJavaScript_XSS_vector
-    $data[] = array('<IMG SRC="javascript:alert(\'XSS\')"', '<IMG src="alert(&#039;XSS&#039;)">');
+    $data[] = ['<IMG SRC="javascript:alert(\'XSS\')"', '<IMG src="alert(&#039;XSS&#039;)">'];
 
     // Double open angle brackets.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Double_open_angle_brackets
     // @see http://ha.ckers.org/blog/20060611/hotbot-xss-vulnerability/ to
     //      understand why this is a vulnerability.
-    $data[] = array('<iframe src=http://ha.ckers.org/scriptlet.html <', '<iframe src="http://ha.ckers.org/scriptlet.html">');
+    $data[] = ['<iframe src=http://ha.ckers.org/scriptlet.html <', '<iframe src="http://ha.ckers.org/scriptlet.html">'];
 
     // Escaping JavaScript escapes.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Escaping_JavaScript_escapes
@@ -181,43 +181,43 @@ class StandardTest extends UnitTestCase {
 
     // End title tag.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#End_title_tag
-    $data[] = array('</TITLE><SCRIPT>alert("XSS");</SCRIPT>', '</TITLE>alert("XSS");');
+    $data[] = ['</TITLE><SCRIPT>alert("XSS");</SCRIPT>', '</TITLE>alert("XSS");'];
 
     // INPUT image.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#INPUT_image
-    $data[] = array('<INPUT TYPE="IMAGE" SRC="javascript:alert(\'XSS\');">', '<INPUT type="IMAGE" src="alert(&#039;XSS&#039;);">');
+    $data[] = ['<INPUT TYPE="IMAGE" SRC="javascript:alert(\'XSS\');">', '<INPUT type="IMAGE" src="alert(&#039;XSS&#039;);">'];
 
     // BODY image.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#BODY_image
-    $data[] = array('<BODY BACKGROUND="javascript:alert(\'XSS\')">', '<BODY background="alert(&#039;XSS&#039;)">');
+    $data[] = ['<BODY BACKGROUND="javascript:alert(\'XSS\')">', '<BODY background="alert(&#039;XSS&#039;)">'];
 
     // IMG Dynsrc.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IMG_Dynsrc
-    $data[] = array('<IMG DYNSRC="javascript:alert(\'XSS\')">', '<IMG dynsrc="alert(&#039;XSS&#039;)">');
+    $data[] = ['<IMG DYNSRC="javascript:alert(\'XSS\')">', '<IMG dynsrc="alert(&#039;XSS&#039;)">'];
 
     // IMG lowsrc.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IMG_lowsrc
-    $data[] = array('<IMG LOWSRC="javascript:alert(\'XSS\')">', '<IMG lowsrc="alert(&#039;XSS&#039;)">');
+    $data[] = ['<IMG LOWSRC="javascript:alert(\'XSS\')">', '<IMG lowsrc="alert(&#039;XSS&#039;)">'];
 
     // List-style-image.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#List-style-image
-    $data[] = array('<STYLE>li {list-style-image: url("javascript:alert(\'XSS\')");}</STYLE><UL><LI>XSS</br>', 'li {list-style-image: url("javascript:alert(\'XSS\')");}<UL><LI>XSS</br>');
+    $data[] = ['<STYLE>li {list-style-image: url("javascript:alert(\'XSS\')");}</STYLE><UL><LI>XSS</br>', 'li {list-style-image: url("javascript:alert(\'XSS\')");}<UL><LI>XSS</br>'];
 
     // VBscript in an image.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#VBscript_in_an_image
-    $data[] = array('<IMG SRC=\'vbscript:msgbox("XSS")\'>', '<IMG src=\'msgbox(&quot;XSS&quot;)\'>');
+    $data[] = ['<IMG SRC=\'vbscript:msgbox("XSS")\'>', '<IMG src=\'msgbox(&quot;XSS&quot;)\'>'];
 
     // Livescript (older versions of Netscape only).
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Livescript_.28older_versions_of_Netscape_only.29
-    $data[] = array('<IMG SRC="livescript:[code]">', '<IMG src="[code]">');
+    $data[] = ['<IMG SRC="livescript:[code]">', '<IMG src="[code]">'];
 
     // BODY tag.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#BODY_tag
-    $data[] = array('<BODY ONLOAD=alert(\'XSS\')>', '<BODY>');
+    $data[] = ['<BODY ONLOAD=alert(\'XSS\')>', '<BODY>'];
 
     // Event handlers.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Event_Handlers
-    $events = array(
+    $events = [
       'onAbort',
       'onActivate',
       'onAfterPrint',
@@ -321,71 +321,71 @@ class StandardTest extends UnitTestCase {
       'onUndo',
       'onUnload',
       'onURLFlip',
-    );
+    ];
     foreach ($events as $event) {
-      $data[] = array('<p ' . $event . '="javascript:alert(\'XSS\');">Dangerous llama!</p>', '<p>Dangerous llama!</p>');
+      $data[] = ['<p ' . $event . '="javascript:alert(\'XSS\');">Dangerous llama!</p>', '<p>Dangerous llama!</p>'];
     }
 
     // BGSOUND.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#BGSOUND
-    $data[] = array('<BGSOUND SRC="javascript:alert(\'XSS\');">', '<BGSOUND src="alert(&#039;XSS&#039;);">');
+    $data[] = ['<BGSOUND SRC="javascript:alert(\'XSS\');">', '<BGSOUND src="alert(&#039;XSS&#039;);">'];
 
     // & JavaScript includes.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#.26_JavaScript_includes
-    $data[] = array('<BR SIZE="&{alert(\'XSS\')}">', '<BR size="">');
+    $data[] = ['<BR SIZE="&{alert(\'XSS\')}">', '<BR size="">'];
 
     // STYLE sheet.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#STYLE_sheet
-    $data[] = array('<LINK REL="stylesheet" HREF="javascript:alert(\'XSS\');">', '');
+    $data[] = ['<LINK REL="stylesheet" HREF="javascript:alert(\'XSS\');">', ''];
 
     // Remote style sheet.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Remote_style_sheet
-    $data[] = array('<LINK REL="stylesheet" HREF="http://ha.ckers.org/xss.css">', '');
+    $data[] = ['<LINK REL="stylesheet" HREF="http://ha.ckers.org/xss.css">', ''];
 
     // Remote style sheet part 2.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Remote_style_sheet_part_2
-    $data[] = array('<STYLE>@import\'http://ha.ckers.org/xss.css\';</STYLE>', '@import\'http://ha.ckers.org/xss.css\';');
+    $data[] = ['<STYLE>@import\'http://ha.ckers.org/xss.css\';</STYLE>', '@import\'http://ha.ckers.org/xss.css\';'];
 
     // Remote style sheet part 3.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Remote_style_sheet_part_3
-    $data[] = array('<META HTTP-EQUIV="Link" Content="<http://ha.ckers.org/xss.css>; REL=stylesheet">', '<META http-equiv="Link">; REL=stylesheet"&gt;');
+    $data[] = ['<META HTTP-EQUIV="Link" Content="<http://ha.ckers.org/xss.css>; REL=stylesheet">', '<META http-equiv="Link">; REL=stylesheet"&gt;'];
 
     // Remote style sheet part 4.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Remote_style_sheet_part_4
-    $data[] = array('<STYLE>BODY{-moz-binding:url("http://ha.ckers.org/xssmoz.xml#xss")}</STYLE>', 'BODY{-moz-binding:url("http://ha.ckers.org/xssmoz.xml#xss")}');
+    $data[] = ['<STYLE>BODY{-moz-binding:url("http://ha.ckers.org/xssmoz.xml#xss")}</STYLE>', 'BODY{-moz-binding:url("http://ha.ckers.org/xssmoz.xml#xss")}'];
 
     // STYLE tags with broken up JavaScript for XSS.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#STYLE_tags_with_broken_up_JavaScript_for_XSS
-    $data[] = array('<STYLE>@im\port\'\ja\vasc\ript:alert("XSS")\';</STYLE>', '@im\port\'\ja\vasc\ript:alert("XSS")\';');
+    $data[] = ['<STYLE>@im\port\'\ja\vasc\ript:alert("XSS")\';</STYLE>', '@im\port\'\ja\vasc\ript:alert("XSS")\';'];
 
     // STYLE attribute using a comment to break up expression.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#STYLE_attribute_using_a_comment_to_break_up_expression
-    $data[] = array('<IMG STYLE="xss:expr/*XSS*/ession(alert(\'XSS\'))">', '<IMG>');
+    $data[] = ['<IMG STYLE="xss:expr/*XSS*/ession(alert(\'XSS\'))">', '<IMG>'];
 
     // IMG STYLE with expression.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IMG_STYLE_with_expression
-    $data[] = array('exp/*<A STYLE=\'no\xss:noxss("*//*");
-xss:ex/*XSS*//*/*/pression(alert("XSS"))\'>', 'exp/*<A>');
+    $data[] = ['exp/*<A STYLE=\'no\xss:noxss("*//*");
+xss:ex/*XSS*//*/*/pression(alert("XSS"))\'>', 'exp/*<A>'];
 
     // STYLE tag (Older versions of Netscape only).
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#STYLE_tag_.28Older_versions_of_Netscape_only.29
-    $data[] = array('<STYLE TYPE="text/javascript">alert(\'XSS\');</STYLE>', 'alert(\'XSS\');');
+    $data[] = ['<STYLE TYPE="text/javascript">alert(\'XSS\');</STYLE>', 'alert(\'XSS\');'];
 
     // STYLE tag using background-image.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#STYLE_tag_using_background-image
-    $data[] = array('<STYLE>.XSS{background-image:url("javascript:alert(\'XSS\')");}</STYLE><A CLASS=XSS></A>', '.XSS{background-image:url("javascript:alert(\'XSS\')");}<A class="XSS"></A>');
+    $data[] = ['<STYLE>.XSS{background-image:url("javascript:alert(\'XSS\')");}</STYLE><A CLASS=XSS></A>', '.XSS{background-image:url("javascript:alert(\'XSS\')");}<A class="XSS"></A>'];
 
     // STYLE tag using background.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#STYLE_tag_using_background
-    $data[] = array('<STYLE type="text/css">BODY{background:url("javascript:alert(\'XSS\')")}</STYLE>', 'BODY{background:url("javascript:alert(\'XSS\')")}');
+    $data[] = ['<STYLE type="text/css">BODY{background:url("javascript:alert(\'XSS\')")}</STYLE>', 'BODY{background:url("javascript:alert(\'XSS\')")}'];
 
     // Anonymous HTML with STYLE attribute.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Anonymous_HTML_with_STYLE_attribute
-    $data[] = array('<XSS STYLE="xss:expression(alert(\'XSS\'))">', '<XSS>');
+    $data[] = ['<XSS STYLE="xss:expression(alert(\'XSS\'))">', '<XSS>'];
 
     // Local htc file.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Local_htc_file
-    $data[] = array('<XSS STYLE="behavior: url(xss.htc);">', '<XSS>');
+    $data[] = ['<XSS STYLE="behavior: url(xss.htc);">', '<XSS>'];
 
     // US-ASCII encoding.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#US-ASCII_encoding
@@ -393,77 +393,77 @@ xss:ex/*XSS*//*/*/pression(alert("XSS"))\'>', 'exp/*<A>');
 
     // META.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#META
-    $data[] = array('<META HTTP-EQUIV="refresh" CONTENT="0;url=javascript:alert(\'XSS\');">', '<META http-equiv="refresh" content="alert(&#039;XSS&#039;);">');
+    $data[] = ['<META HTTP-EQUIV="refresh" CONTENT="0;url=javascript:alert(\'XSS\');">', '<META http-equiv="refresh" content="alert(&#039;XSS&#039;);">'];
 
     // META using data.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#META_using_data
-    $data[] = array('<META HTTP-EQUIV="refresh" CONTENT="0;url=data:text/html base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K">', '<META http-equiv="refresh" content="text/html base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K">');
+    $data[] = ['<META HTTP-EQUIV="refresh" CONTENT="0;url=data:text/html base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K">', '<META http-equiv="refresh" content="text/html base64,PHNjcmlwdD5hbGVydCgnWFNTJyk8L3NjcmlwdD4K">'];
 
     // META with additional URL parameter
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#META
-    $data[] = array('<META HTTP-EQUIV="refresh" CONTENT="0; URL=http://;URL=javascript:alert(\'XSS\');">', '<META http-equiv="refresh" content="//;URL=javascript:alert(&#039;XSS&#039;);">');
+    $data[] = ['<META HTTP-EQUIV="refresh" CONTENT="0; URL=http://;URL=javascript:alert(\'XSS\');">', '<META http-equiv="refresh" content="//;URL=javascript:alert(&#039;XSS&#039;);">'];
 
     // IFRAME.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IFRAME
-    $data[] = array('<IFRAME SRC="javascript:alert(\'XSS\');"></IFRAME>', '<IFRAME src="alert(&#039;XSS&#039;);"></IFRAME>');
+    $data[] = ['<IFRAME SRC="javascript:alert(\'XSS\');"></IFRAME>', '<IFRAME src="alert(&#039;XSS&#039;);"></IFRAME>'];
 
     // IFRAME Event based.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IFRAME_Event_based
-    $data[] = array('<IFRAME SRC=# onmouseover="alert(document.cookie)"></IFRAME>', '<IFRAME src="#"></IFRAME>');
+    $data[] = ['<IFRAME SRC=# onmouseover="alert(document.cookie)"></IFRAME>', '<IFRAME src="#"></IFRAME>'];
 
     // FRAME.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#FRAME
-    $data[] = array('<FRAMESET><FRAME SRC="javascript:alert(\'XSS\');"></FRAMESET>', '<FRAMESET><FRAME src="alert(&#039;XSS&#039;);"></FRAMESET>');
+    $data[] = ['<FRAMESET><FRAME SRC="javascript:alert(\'XSS\');"></FRAMESET>', '<FRAMESET><FRAME src="alert(&#039;XSS&#039;);"></FRAMESET>'];
 
     // TABLE.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#TABLE
-    $data[] = array('<TABLE BACKGROUND="javascript:alert(\'XSS\')">', '<TABLE background="alert(&#039;XSS&#039;)">');
+    $data[] = ['<TABLE BACKGROUND="javascript:alert(\'XSS\')">', '<TABLE background="alert(&#039;XSS&#039;)">'];
 
     // TD.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#TD
-    $data[] = array('<TABLE><TD BACKGROUND="javascript:alert(\'XSS\')">', '<TABLE><TD background="alert(&#039;XSS&#039;)">');
+    $data[] = ['<TABLE><TD BACKGROUND="javascript:alert(\'XSS\')">', '<TABLE><TD background="alert(&#039;XSS&#039;)">'];
 
     // DIV background-image.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#DIV_background-image
-    $data[] = array('<DIV STYLE="background-image: url(javascript:alert(\'XSS\'))">', '<DIV>');
+    $data[] = ['<DIV STYLE="background-image: url(javascript:alert(\'XSS\'))">', '<DIV>'];
 
     // DIV background-image with unicoded XSS exploit.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#DIV_background-image_with_unicoded_XSS_exploit
-    $data[] = array('<DIV STYLE="background-image:\0075\0072\006C\0028\'\006a\0061\0076\0061\0073\0063\0072\0069\0070\0074\003a\0061\006c\0065\0072\0074\0028.1027\0058.1053\0053\0027\0029\'\0029">', '<DIV>');
+    $data[] = ['<DIV STYLE="background-image:\0075\0072\006C\0028\'\006a\0061\0076\0061\0073\0063\0072\0069\0070\0074\003a\0061\006c\0065\0072\0074\0028.1027\0058.1053\0053\0027\0029\'\0029">', '<DIV>'];
 
     // DIV background-image plus extra characters.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#DIV_background-image_plus_extra_characters
-    $data[] = array('<DIV STYLE="background-image: url(&#1;javascript:alert(\'XSS\'))">', '<DIV>');
+    $data[] = ['<DIV STYLE="background-image: url(&#1;javascript:alert(\'XSS\'))">', '<DIV>'];
 
     // DIV expression.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#DIV_expression
-    $data[] = array('<DIV STYLE="width: expression(alert(\'XSS\'));">', '<DIV>');
+    $data[] = ['<DIV STYLE="width: expression(alert(\'XSS\'));">', '<DIV>'];
 
     // Downlevel-Hidden block.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Downlevel-Hidden_block
-    $data[] = array('<!--[if gte IE 4]>
+    $data[] = ['<!--[if gte IE 4]>
  <SCRIPT>alert(\'XSS\');</SCRIPT>
- <![endif]-->', "\n alert('XSS');\n ");
+ <![endif]-->', "\n alert('XSS');\n "];
 
     // BASE tag.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#BASE_tag
-    $data[] = array('<BASE HREF="javascript:alert(\'XSS\');//">', '<BASE href="alert(&#039;XSS&#039;);//">');
+    $data[] = ['<BASE HREF="javascript:alert(\'XSS\');//">', '<BASE href="alert(&#039;XSS&#039;);//">'];
 
     // OBJECT tag.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#OBJECT_tag
-    $data[] = array('<OBJECT TYPE="text/x-scriptlet" DATA="http://ha.ckers.org/scriptlet.html"></OBJECT>', '');
+    $data[] = ['<OBJECT TYPE="text/x-scriptlet" DATA="http://ha.ckers.org/scriptlet.html"></OBJECT>', ''];
 
     // Using an EMBED tag you can embed a Flash movie that contains XSS.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Using_an_EMBED_tag_you_can_embed_a_Flash_movie_that_contains_XSS
-    $data[] = array('<EMBED SRC="http://ha.ckers.org/xss.swf" AllowScriptAccess="always"></EMBED>', '');
+    $data[] = ['<EMBED SRC="http://ha.ckers.org/xss.swf" AllowScriptAccess="always"></EMBED>', ''];
 
     // You can EMBED SVG which can contain your XSS vector.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#You_can_EMBED_SVG_which_can_contain_your_XSS_vector
-    $data[] = array('<EMBED SRC="data:image/svg+xml;base64,PHN2ZyB4bWxuczpzdmc9Imh0dH A6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hs aW5rIiB2ZXJzaW9uPSIxLjAiIHg9IjAiIHk9IjAiIHdpZHRoPSIxOTQiIGhlaWdodD0iMjAw IiBpZD0ieHNzIj48c2NyaXB0IHR5cGU9InRleHQvZWNtYXNjcmlwdCI+YWxlcnQoIlh TUyIpOzwvc2NyaXB0Pjwvc3ZnPg==" type="image/svg+xml" AllowScriptAccess="always"></EMBED>', '');
+    $data[] = ['<EMBED SRC="data:image/svg+xml;base64,PHN2ZyB4bWxuczpzdmc9Imh0dH A6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hs aW5rIiB2ZXJzaW9uPSIxLjAiIHg9IjAiIHk9IjAiIHdpZHRoPSIxOTQiIGhlaWdodD0iMjAw IiBpZD0ieHNzIj48c2NyaXB0IHR5cGU9InRleHQvZWNtYXNjcmlwdCI+YWxlcnQoIlh TUyIpOzwvc2NyaXB0Pjwvc3ZnPg==" type="image/svg+xml" AllowScriptAccess="always"></EMBED>', ''];
 
     // XML data island with CDATA obfuscation.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#XML_data_island_with_CDATA_obfuscation
-    $data[] = array('<XML ID="xss"><I><B><IMG SRC="javas<!-- -->cript:alert(\'XSS\')"></B></I></XML><SPAN DATASRC="#xss" DATAFLD="B" DATAFORMATAS="HTML"></SPAN>', '<XML id="xss"><I><B><IMG>cript:alert(\'XSS\')"&gt;</B></I></XML><SPAN datasrc="#xss" datafld="B" dataformatas="HTML"></SPAN>');
+    $data[] = ['<XML ID="xss"><I><B><IMG SRC="javas<!-- -->cript:alert(\'XSS\')"></B></I></XML><SPAN DATASRC="#xss" DATAFLD="B" DATAFORMATAS="HTML"></SPAN>', '<XML id="xss"><I><B><IMG>cript:alert(\'XSS\')"&gt;</B></I></XML><SPAN datasrc="#xss" datafld="B" dataformatas="HTML"></SPAN>'];
 
     // Locally hosted XML with embedded JavaScript that is generated using an XML data island.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Locally_hosted_XML_with_embedded_JavaScript_that_is_generated_using_an_XML_data_island
@@ -472,11 +472,11 @@ xss:ex/*XSS*//*/*/pression(alert("XSS"))\'>', 'exp/*<A>');
 
     // HTML+TIME in XML.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#HTML.2BTIME_in_XML
-    $data[] = array('<?xml:namespace prefix="t" ns="urn:schemas-microsoft-com:time"><?import namespace="t" implementation="#default#time2"><t:set attributeName="innerHTML" to="XSS<SCRIPT DEFER>alert("XSS")</SCRIPT>">', '&lt;?xml:namespace prefix="t" ns="urn:schemas-microsoft-com:time"&gt;&lt;?import namespace="t" implementation="#default#time2"&gt;<t set attributename="innerHTML">alert("XSS")"&gt;');
+    $data[] = ['<?xml:namespace prefix="t" ns="urn:schemas-microsoft-com:time"><?import namespace="t" implementation="#default#time2"><t:set attributeName="innerHTML" to="XSS<SCRIPT DEFER>alert("XSS")</SCRIPT>">', '&lt;?xml:namespace prefix="t" ns="urn:schemas-microsoft-com:time"&gt;&lt;?import namespace="t" implementation="#default#time2"&gt;<t set attributename="innerHTML">alert("XSS")"&gt;'];
 
     // Assuming you can only fit in a few characters and it filters against ".js".
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Assuming_you_can_only_fit_in_a_few_characters_and_it_filters_against_.22.js.22
-    $data[] = array('<SCRIPT SRC="http://ha.ckers.org/xss.jpg"></SCRIPT>', '');
+    $data[] = ['<SCRIPT SRC="http://ha.ckers.org/xss.jpg"></SCRIPT>', ''];
 
     // IMG Embedded commands.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#IMG_Embedded_commands
@@ -485,7 +485,7 @@ xss:ex/*XSS*//*/*/pression(alert("XSS"))\'>', 'exp/*<A>');
 
     // Cookie manipulation.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Cookie_manipulation
-    $data[] = array('<META HTTP-EQUIV="Set-Cookie" Content="USERID=<SCRIPT>alert(\'XSS\')</SCRIPT>">', '<META http-equiv="Set-Cookie">alert(\'XSS\')"&gt;');
+    $data[] = ['<META HTTP-EQUIV="Set-Cookie" Content="USERID=<SCRIPT>alert(\'XSS\')</SCRIPT>">', '<META http-equiv="Set-Cookie">alert(\'XSS\')"&gt;'];
 
     // UTF-7 encoding.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#UTF-7_encoding
@@ -493,13 +493,13 @@ xss:ex/*XSS*//*/*/pression(alert("XSS"))\'>', 'exp/*<A>');
 
     // XSS using HTML quote encapsulation.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#XSS_using_HTML_quote_encapsulation
-    $data[] = array('<SCRIPT a=">" SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '" SRC="http://ha.ckers.org/xss.js"&gt;');
-    $data[] = array('<SCRIPT =">" SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '" SRC="http://ha.ckers.org/xss.js"&gt;');
-    $data[] = array('<SCRIPT a=">" \'\' SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '" \'\' SRC="http://ha.ckers.org/xss.js"&gt;');
-    $data[] = array('<SCRIPT "a=\'>\'" SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '\'" SRC="http://ha.ckers.org/xss.js"&gt;');
-    $data[] = array('<SCRIPT a=`>` SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '` SRC="http://ha.ckers.org/xss.js"&gt;');
-    $data[] = array('<SCRIPT a=">\'>" SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '\'&gt;" SRC="http://ha.ckers.org/xss.js"&gt;');
-    $data[] = array('<SCRIPT>document.write("<SCRI");</SCRIPT>PT SRC="http://ha.ckers.org/xss.js"></SCRIPT>', 'document.write("<SCRI>PT SRC="http://ha.ckers.org/xss.js"&gt;');
+    $data[] = ['<SCRIPT a=">" SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '" SRC="http://ha.ckers.org/xss.js"&gt;'];
+    $data[] = ['<SCRIPT =">" SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '" SRC="http://ha.ckers.org/xss.js"&gt;'];
+    $data[] = ['<SCRIPT a=">" \'\' SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '" \'\' SRC="http://ha.ckers.org/xss.js"&gt;'];
+    $data[] = ['<SCRIPT "a=\'>\'" SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '\'" SRC="http://ha.ckers.org/xss.js"&gt;'];
+    $data[] = ['<SCRIPT a=`>` SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '` SRC="http://ha.ckers.org/xss.js"&gt;'];
+    $data[] = ['<SCRIPT a=">\'>" SRC="http://ha.ckers.org/xss.js"></SCRIPT>', '\'&gt;" SRC="http://ha.ckers.org/xss.js"&gt;'];
+    $data[] = ['<SCRIPT>document.write("<SCRI");</SCRIPT>PT SRC="http://ha.ckers.org/xss.js"></SCRIPT>', 'document.write("<SCRI>PT SRC="http://ha.ckers.org/xss.js"&gt;'];
 
     // URL string evasion.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#URL_string_evasion
@@ -511,12 +511,12 @@ xss:ex/*XSS*//*/*/pression(alert("XSS"))\'>', 'exp/*<A>');
     // @see \Drupal\editor\EditorXssFilter::filterXssDataAttributes()
 
     // The following two test cases verify that XSS attack vectors are filtered.
-    $data[] = array('<img src="butterfly.jpg" data-caption="&lt;script&gt;alert();&lt;/script&gt;" />', '<img src="butterfly.jpg" data-caption="alert();" />');
-    $data[] = array('<img src="butterfly.jpg" data-caption="&lt;EMBED SRC=&quot;http://ha.ckers.org/xss.swf&quot; AllowScriptAccess=&quot;always&quot;&gt;&lt;/EMBED&gt;" />', '<img src="butterfly.jpg" data-caption="" />');
+    $data[] = ['<img src="butterfly.jpg" data-caption="&lt;script&gt;alert();&lt;/script&gt;" />', '<img src="butterfly.jpg" data-caption="alert();" />'];
+    $data[] = ['<img src="butterfly.jpg" data-caption="&lt;EMBED SRC=&quot;http://ha.ckers.org/xss.swf&quot; AllowScriptAccess=&quot;always&quot;&gt;&lt;/EMBED&gt;" />', '<img src="butterfly.jpg" data-caption="" />'];
 
     // When including HTML-tags as visible content, they are double-escaped.
     // This test case ensures that we leave that content unchanged.
-    $data[] = array('<img src="butterfly.jpg" data-caption="&amp;lt;script&amp;gt;alert();&amp;lt;/script&amp;gt;" />', '<img src="butterfly.jpg" data-caption="&amp;lt;script&amp;gt;alert();&amp;lt;/script&amp;gt;" />');
+    $data[] = ['<img src="butterfly.jpg" data-caption="&amp;lt;script&amp;gt;alert();&amp;lt;/script&amp;gt;" />', '<img src="butterfly.jpg" data-caption="&amp;lt;script&amp;gt;alert();&amp;lt;/script&amp;gt;" />'];
 
     return $data;
   }
@@ -573,27 +573,27 @@ xss:ex/*XSS*//*/*/pression(alert("XSS"))\'>', 'exp/*<A>');
    *     - (optional) The disallowed HTML tags to be passed to \Drupal\Component\Utility\Xss::filter().
    */
   public function providerTestBlackListMode() {
-    return array(
-      array(
+    return [
+      [
         '<unknown style="visibility:hidden">Pink Fairy Armadillo</unknown><video src="gerenuk.mp4"><script>alert(0)</script>',
         '<unknown>Pink Fairy Armadillo</unknown><video src="gerenuk.mp4">alert(0)',
         'Disallow only the script tag',
-        array('script')
-      ),
-      array(
+        ['script']
+      ],
+      [
         '<unknown style="visibility:hidden">Pink Fairy Armadillo</unknown><video src="gerenuk.mp4"><script>alert(0)</script>',
         '<unknown>Pink Fairy Armadillo</unknown>alert(0)',
         'Disallow both the script and video tags',
-        array('script', 'video')
-      ),
+        ['script', 'video']
+      ],
       // No real use case for this, but it is an edge case we must ensure works.
-      array(
+      [
         '<unknown style="visibility:hidden">Pink Fairy Armadillo</unknown><video src="gerenuk.mp4"><script>alert(0)</script>',
         '<unknown>Pink Fairy Armadillo</unknown><video src="gerenuk.mp4"><script>alert(0)</script>',
         'Disallow no tags',
-        array()
-      ),
-    );
+        []
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/field/field.api.php b/web/core/modules/field/field.api.php
index 8e11650f5..b0899ea02 100644
--- a/web/core/modules/field/field.api.php
+++ b/web/core/modules/field/field.api.php
@@ -85,7 +85,7 @@ function hook_field_storage_config_update_forbid(\Drupal\field\FieldStorageConfi
     $prior_allowed_values = $prior_field_storage->getSetting('allowed_values');
     $lost_keys = array_keys(array_diff_key($prior_allowed_values, $allowed_values));
     if (_options_values_in_use($field_storage->getTargetEntityTypeId(), $field_storage->getName(), $lost_keys)) {
-      throw new \Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException(t('A list field (@field_name) with existing data cannot have its keys changed.', array('@field_name' => $field_storage->getName())));
+      throw new \Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException(t('A list field (@field_name) with existing data cannot have its keys changed.', ['@field_name' => $field_storage->getName()]));
     }
   }
 }
@@ -257,7 +257,7 @@ function hook_field_formatter_info_alter(array &$info) {
  * @ingroup field_info
  */
 function hook_field_info_max_weight($entity_type, $bundle, $context, $context_mode) {
-  $weights = array();
+  $weights = [];
 
   foreach (my_module_entity_additions($entity_type, $bundle, $context, $context_mode) as $addition) {
     $weights[] = $addition['weight'];
diff --git a/web/core/modules/field/field.module b/web/core/modules/field/field.module
index 813300717..8f3877d0f 100644
--- a/web/core/modules/field/field.module
+++ b/web/core/modules/field/field.module
@@ -67,10 +67,10 @@ require_once __DIR__ . '/field.purge.inc';
 function field_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.field':
-      $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#';
+      $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#';
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Field module allows custom data fields to be defined for <em>entity</em> types (see below). The Field module takes care of storing, loading, editing, and rendering field data. Most users will not interact with the Field module directly, but will instead use the <a href=":field-ui-help">Field UI module</a> user interface. Module developers can use the Field API to make new entity types "fieldable" and thus allow fields to be attached to them. For more information, see the <a href=":field">online documentation for the Field module</a>.', array(':field-ui-help' => $field_ui_url, ':field' => 'https://www.drupal.org/documentation/modules/field')) . '</p>';
+      $output .= '<p>' . t('The Field module allows custom data fields to be defined for <em>entity</em> types (see below). The Field module takes care of storing, loading, editing, and rendering field data. Most users will not interact with the Field module directly, but will instead use the <a href=":field-ui-help">Field UI module</a> user interface. Module developers can use the Field API to make new entity types "fieldable" and thus allow fields to be attached to them. For more information, see the <a href=":field">online documentation for the Field module</a>.', [':field-ui-help' => $field_ui_url, ':field' => 'https://www.drupal.org/documentation/modules/field']) . '</p>';
       $output .= '<h3>' . t('Terminology') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Entities and entity types') . '</dt>';
@@ -87,19 +87,19 @@ function field_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Enabling field types, widgets, and formatters') . '</dt>';
-      $output .= '<dd>' . t('The Field module provides the infrastructure for fields; the field types, formatters, and widgets are provided by Drupal core or additional modules. Some of the modules are required; the optional modules can be enabled from the <a href=":modules">Extend administration page</a>. Additional fields, formatters, and widgets may be provided by contributed modules, which you can find in the <a href=":contrib">contributed module section of Drupal.org</a>.', array(':modules' => \Drupal::url('system.modules_list'), ':contrib' => 'https://www.drupal.org/project/modules')) . '</dd>';
+      $output .= '<dd>' . t('The Field module provides the infrastructure for fields; the field types, formatters, and widgets are provided by Drupal core or additional modules. Some of the modules are required; the optional modules can be enabled from the <a href=":modules">Extend administration page</a>. Additional fields, formatters, and widgets may be provided by contributed modules, which you can find in the <a href=":contrib">contributed module section of Drupal.org</a>.', [':modules' => \Drupal::url('system.modules_list'), ':contrib' => 'https://www.drupal.org/project/modules']) . '</dd>';
 
       $output .= '<h3>' . t('Field, widget, and formatter information') . '</h3>';
 
       // Make a list of all widget, formatter, and field modules currently
       // enabled, ordered by displayed module name (module names are not
       // translated).
-      $items = array();
+      $items = [];
       $modules = \Drupal::moduleHandler()->getModuleList();
       $widgets = \Drupal::service('plugin.manager.field.widget')->getDefinitions();
       $field_types = \Drupal::service('plugin.manager.field.field_type')->getUiDefinitions();
       $formatters = \Drupal::service('plugin.manager.field.formatter')->getDefinitions();
-      $providers = array();
+      $providers = [];
       foreach (array_merge($field_types, $widgets, $formatters) as $plugin) {
         $providers[] = $plugin['provider'];
       }
@@ -111,7 +111,7 @@ function field_help($route_name, RouteMatchInterface $route_match) {
         if (isset($modules[$provider])) {
           $display = \Drupal::moduleHandler()->getName($provider);
           if (\Drupal::moduleHandler()->implementsHook($provider, 'help')) {
-            $items[] = \Drupal::l($display, new Url('help.page', array('name' => $provider)));
+            $items[] = \Drupal::l($display, new Url('help.page', ['name' => $provider]));
           }
           else {
             $items[] = $display;
@@ -121,10 +121,10 @@ function field_help($route_name, RouteMatchInterface $route_match) {
       if ($items) {
         $output .= '<dt>' . t('Provided by modules') . '</dt>';
         $output .= '<dd>' . t('Here is a list of the currently enabled field, formatter, and widget modules:');
-        $item_list = array(
+        $item_list = [
           '#theme' => 'item_list',
           '#items' => $items,
-        );
+        ];
         $output .= \Drupal::service('renderer')->renderPlain($item_list);
         $output .= '</dd>';
       }
@@ -132,10 +132,10 @@ function field_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dt>' . t('Provided by Drupal core') . '</dt>';
       $output .= '<dd>' . t('As mentioned previously, some field types, widgets, and formatters are provided by Drupal core. Here are some notes on how to use some of these:');
       $output .= '<ul>';
-      $output .= '<li><p>' . t('<strong>Entity Reference</strong> fields allow you to create fields that contain links to other entities (such as content items, taxonomy terms, etc.) within the site. This allows you, for example, to include a link to a user within a content item. For more information, see <a href=":er_do">the online documentation for the Entity Reference module</a>.', array(':er_do' => 'https://drupal.org/documentation/modules/entityreference')) . '</p>';
+      $output .= '<li><p>' . t('<strong>Entity Reference</strong> fields allow you to create fields that contain links to other entities (such as content items, taxonomy terms, etc.) within the site. This allows you, for example, to include a link to a user within a content item. For more information, see <a href=":er_do">the online documentation for the Entity Reference module</a>.', [':er_do' => 'https://drupal.org/documentation/modules/entityreference']) . '</p>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing and displaying entity reference fields') . '</dt>';
-      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the entity reference field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', array(':field_ui' => $field_ui_url)) . '</dd>';
+      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the entity reference field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', [':field_ui' => $field_ui_url]) . '</dd>';
       $output .= '<dt>' . t('Selecting reference type') . '</dt>';
       $output .= '<dd>' . t('In the field settings you can select which entity type you want to create a reference to.') . '</dd>';
       $output .= '<dt>' . t('Filtering and sorting reference fields') . '</dt>';
@@ -179,7 +179,7 @@ function field_entity_field_storage_info(EntityTypeInterface $entity_type) {
       ->execute();
     // Fetch all fields and key them by field name.
     $field_storages = FieldStorageConfig::loadMultiple($ids);
-    $result = array();
+    $result = [];
     foreach ($field_storages as $field_storage) {
       $result[$field_storage->getName()] = $field_storage;
     }
@@ -200,7 +200,7 @@ function field_entity_bundle_field_info(EntityTypeInterface $entity_type, $bundl
       ->execute();
     // Fetch all fields and key them by field name.
     $field_configs = FieldConfig::loadMultiple($ids);
-    $result = array();
+    $result = [];
     foreach ($field_configs as $field_instance) {
       $result[$field_instance->getName()] = $field_instance;
     }
@@ -283,7 +283,7 @@ function field_entity_bundle_delete($entity_type_id, $bundle) {
  *   An entity, initialized with the provided IDs.
  */
 function _field_create_entity_from_ids($ids) {
-  $id_properties = array();
+  $id_properties = [];
   $entity_type = \Drupal::entityManager()->getDefinition($ids->entity_type);
   if ($id_key = $entity_type->getKey('id')) {
     $id_properties[$id_key] = $ids->entity_id;
@@ -311,7 +311,7 @@ function field_config_import_steps_alter(&$sync_steps, ConfigImporter $config_im
     // Add a step to the beginning of the configuration synchronization process
     // to purge field data where the module that provides the field is being
     // uninstalled.
-    array_unshift($sync_steps, array('\Drupal\field\ConfigImporterFieldPurger', 'process'));
+    array_unshift($sync_steps, ['\Drupal\field\ConfigImporterFieldPurger', 'process']);
   };
 }
 
@@ -341,7 +341,7 @@ function field_form_config_admin_import_form_alter(&$form, FormStateInterface $f
         count($field_storages),
         'This synchronization will delete data from the field %fields.',
         'This synchronization will delete data from the fields: %fields.',
-        array('%fields' => implode(', ', $field_labels))
+        ['%fields' => implode(', ', $field_labels)]
       ), 'warning');
     }
   }
diff --git a/web/core/modules/field/field.post_update.php b/web/core/modules/field/field.post_update.php
index 4d0c80bd8..d6a809e5f 100644
--- a/web/core/modules/field/field.post_update.php
+++ b/web/core/modules/field/field.post_update.php
@@ -9,10 +9,6 @@ use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Entity\FieldConfig;
 
-/**
- * @addtogroup updates-8.0.0-beta
- * @{
- */
 
 /**
  * Re-save all field storage config objects to add 'custom_storage' property.
@@ -42,15 +38,6 @@ function field_post_update_entity_reference_handler_setting() {
   return t('Selection handler for entity reference fields have been adjusted.');
 }
 
-/**
- * @} End of "addtogroup updates-8.0.0-beta".
- */
-
-/**
- * @addtogroup updates-8.1.0
- * @{
- */
-
 /**
  * Adds the 'size' setting for email widgets.
  */
@@ -72,7 +59,3 @@ function field_post_update_email_widget_size_setting() {
 
   return t('The new size setting for email widgets has been added.');
 }
-
-/**
- * @} End of "addtogroup updates-8.1.0".
- */
diff --git a/web/core/modules/field/field.purge.inc b/web/core/modules/field/field.purge.inc
index ae3e26694..519c6af27 100644
--- a/web/core/modules/field/field.purge.inc
+++ b/web/core/modules/field/field.purge.inc
@@ -73,10 +73,10 @@ use Drupal\field\FieldConfigInterface;
  *   (optional) Limit the purge to a specific field storage.
  */
 function field_purge_batch($batch_size, $field_storage_uuid = NULL) {
-  $properties = array(
+  $properties = [
     'deleted' => TRUE,
     'include_deleted' => TRUE,
-  );
+  ];
   if ($field_storage_uuid) {
     $properties['field_storage_uuid'] = $field_storage_uuid;
   }
@@ -106,7 +106,7 @@ function field_purge_batch($batch_size, $field_storage_uuid = NULL) {
   }
 
   // Retrieve all deleted field storages. Any that have no fields can be purged.
-  $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+  $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: [];
   foreach ($deleted_storages as $field_storage) {
     $field_storage = new FieldStorageConfig($field_storage);
     if ($field_storage_uuid && $field_storage->uuid() != $field_storage_uuid) {
@@ -121,7 +121,7 @@ function field_purge_batch($batch_size, $field_storage_uuid = NULL) {
       continue;
     }
 
-    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+    $fields = entity_load_multiple_by_properties('field_config', ['field_storage_uuid' => $field_storage->uuid(), 'include_deleted' => TRUE]);
     if (empty($fields)) {
       field_purge_field_storage($field_storage);
     }
@@ -144,7 +144,7 @@ function field_purge_field(FieldConfigInterface $field) {
   $state->set('field.field.deleted', $deleted_fields);
 
   // Invoke external hooks after the cache is cleared for API consistency.
-  \Drupal::moduleHandler()->invokeAll('field_purge_field', array($field));
+  \Drupal::moduleHandler()->invokeAll('field_purge_field', [$field]);
 }
 
 /**
@@ -159,9 +159,9 @@ function field_purge_field(FieldConfigInterface $field) {
  * @throws Drupal\field\FieldException
  */
 function field_purge_field_storage(FieldStorageConfigInterface $field_storage) {
-  $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+  $fields = entity_load_multiple_by_properties('field_config', ['field_storage_uuid' => $field_storage->uuid(), 'include_deleted' => TRUE]);
   if (count($fields) > 0) {
-    throw new FieldException(t('Attempt to purge a field storage @field_name that still has fields.', array('@field_name' => $field_storage->getName())));
+    throw new FieldException(t('Attempt to purge a field storage @field_name that still has fields.', ['@field_name' => $field_storage->getName()]));
   }
 
   $state = \Drupal::state();
@@ -173,7 +173,7 @@ function field_purge_field_storage(FieldStorageConfigInterface $field_storage) {
   \Drupal::entityManager()->getStorage($field_storage->getTargetEntityTypeId())->finalizePurge($field_storage);
 
   // Invoke external hooks after the cache is cleared for API consistency.
-  \Drupal::moduleHandler()->invokeAll('field_purge_field_storage', array($field_storage));
+  \Drupal::moduleHandler()->invokeAll('field_purge_field_storage', [$field_storage]);
 }
 
 /**
diff --git a/web/core/modules/field/migration_templates/d7_field.yml b/web/core/modules/field/migration_templates/d7_field.yml
index 069334322..15079d881 100644
--- a/web/core/modules/field/migration_templates/d7_field.yml
+++ b/web/core/modules/field/migration_templates/d7_field.yml
@@ -35,7 +35,10 @@ process:
       phone: telephone
       text_long: text_long
       text_with_summary: text_with_summary
-  translatable: translatable
+  # Translatable is not migrated and the Drupal 8 default of true is used.
+  # If translatable is false in field storage then the field can not be
+  # set to translatable via the UI.
+  #translatable: translatable
   cardinality: cardinality
   settings:
     plugin: d7_field_settings
diff --git a/web/core/modules/field/migration_templates/d7_field_instance.yml b/web/core/modules/field/migration_templates/d7_field_instance.yml
index da4ce0a45..f3518c91a 100644
--- a/web/core/modules/field/migration_templates/d7_field_instance.yml
+++ b/web/core/modules/field/migration_templates/d7_field_instance.yml
@@ -28,6 +28,7 @@ process:
     source:
       - default_value
       - widget_settings
+  translatable: translatable
 destination:
   plugin: entity:field_config
 migration_dependencies:
diff --git a/web/core/modules/field/src/ConfigImporterFieldPurger.php b/web/core/modules/field/src/ConfigImporterFieldPurger.php
index 4137294f6..3974511a6 100644
--- a/web/core/modules/field/src/ConfigImporterFieldPurger.php
+++ b/web/core/modules/field/src/ConfigImporterFieldPurger.php
@@ -47,7 +47,7 @@ class ConfigImporterFieldPurger {
     }
     else {
       $context['finished'] = $context['sandbox']['field']['current_progress'] / $context['sandbox']['field']['steps_to_delete'];
-      $context['message'] = \Drupal::translation()->translate('Purging field @field_label', array('@field_label' => $field_storage->label()));
+      $context['message'] = \Drupal::translation()->translate('Purging field @field_label', ['@field_label' => $field_storage->label()]);
     }
   }
 
@@ -111,11 +111,11 @@ class ConfigImporterFieldPurger {
   public static function getFieldStoragesToPurge(array $extensions, array $deletes) {
     $providers = array_keys($extensions['module']);
     $providers[] = 'core';
-    $storages_to_delete = array();
+    $storages_to_delete = [];
 
     // Gather fields that will be deleted during configuration synchronization
     // where the module that provides the field type is also being uninstalled.
-    $field_storage_ids = array();
+    $field_storage_ids = [];
     foreach ($deletes as $config_name) {
       $field_storage_config_prefix = \Drupal::entityManager()->getDefinition('field_storage_config')->getConfigPrefix();
       if (strpos($config_name, $field_storage_config_prefix . '.') === 0) {
@@ -134,7 +134,7 @@ class ConfigImporterFieldPurger {
 
     // Gather deleted fields from modules that are being uninstalled.
     /** @var \Drupal\field\FieldStorageConfigInterface[] $field_storages */
-    $field_storages = entity_load_multiple_by_properties('field_storage_config', array('deleted' => TRUE, 'include_deleted' => TRUE));
+    $field_storages = entity_load_multiple_by_properties('field_storage_config', ['deleted' => TRUE, 'include_deleted' => TRUE]);
     foreach ($field_storages as $field_storage) {
       if (!in_array($field_storage->getTypeProvider(), $providers)) {
         $storages_to_delete[$field_storage->id()] = $field_storage;
diff --git a/web/core/modules/field/src/Entity/FieldConfig.php b/web/core/modules/field/src/Entity/FieldConfig.php
index d7ccc3036..af2fcca73 100644
--- a/web/core/modules/field/src/Entity/FieldConfig.php
+++ b/web/core/modules/field/src/Entity/FieldConfig.php
@@ -193,7 +193,7 @@ class FieldConfig extends FieldConfigBase implements FieldConfigInterface {
     parent::preDelete($storage, $fields);
     // Keep the field definitions in the state storage so we can use them
     // later during field_purge_batch().
-    $deleted_fields = $state->get('field.field.deleted') ?: array();
+    $deleted_fields = $state->get('field.field.deleted') ?: [];
     foreach ($fields as $field) {
       if (!$field->deleted) {
         $config = $field->toArray();
@@ -228,7 +228,7 @@ class FieldConfig extends FieldConfigBase implements FieldConfigInterface {
 
     // Delete the associated field storages if they are not used anymore and are
     // not persistent.
-    $storages_to_delete = array();
+    $storages_to_delete = [];
     foreach ($fields as $field) {
       $storage_definition = $field->getFieldStorageDefinition();
       if (!$field->deleted && !$field->isUninstalling() && $storage_definition->isDeletable()) {
@@ -306,7 +306,7 @@ class FieldConfig extends FieldConfigBase implements FieldConfigInterface {
    */
   public function getDisplayOptions($display_context) {
     // Hide configurable fields by default.
-    return array('type' => 'hidden');
+    return ['region' => 'hidden'];
   }
 
   /**
diff --git a/web/core/modules/field/src/Entity/FieldStorageConfig.php b/web/core/modules/field/src/Entity/FieldStorageConfig.php
index 00883d61a..a63e54f98 100644
--- a/web/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/web/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -370,7 +370,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
 
     // See if any module forbids the update by throwing an exception. This
     // invokes hook_field_storage_config_update_forbid().
-    $module_handler->invokeAll('field_storage_config_update_forbid', array($this, $this->original));
+    $module_handler->invokeAll('field_storage_config_update_forbid', [$this, $this->original]);
 
     // Notify the entity manager. A listener can reject the definition
     // update as invalid by raising an exception, which stops execution before
@@ -407,7 +407,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
 
     // Keep the field definitions in the state storage so we can use them later
     // during field_purge_batch().
-    $deleted_storages = $state->get('field.storage.deleted') ?: array();
+    $deleted_storages = $state->get('field.storage.deleted') ?: [];
     foreach ($field_storages as $field_storage) {
       if (!$field_storage->deleted) {
         $config = $field_storage->toArray();
@@ -444,12 +444,12 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
       $class = $this->getFieldItemClass();
       $schema = $class::schema($this);
       // Fill in default values for optional entries.
-      $schema += array(
-        'columns' => array(),
-        'unique keys' => array(),
-        'indexes' => array(),
-        'foreign keys' => array(),
-      );
+      $schema += [
+        'columns' => [],
+        'unique keys' => [],
+        'indexes' => [],
+        'foreign keys' => [],
+      ];
 
       // Merge custom indexes with those specified by the field type. Custom
       // indexes prevail.
@@ -499,7 +499,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
         return $map[$this->getTargetEntityTypeId()][$this->getName()]['bundles'];
       }
     }
-    return array();
+    return [];
   }
 
   /**
@@ -719,7 +719,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
    * {@inheritdoc}
    */
   public function getConstraints() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/field/src/FieldConfigStorage.php b/web/core/modules/field/src/FieldConfigStorage.php
index 0870cd422..42d963461 100644
--- a/web/core/modules/field/src/FieldConfigStorage.php
+++ b/web/core/modules/field/src/FieldConfigStorage.php
@@ -95,12 +95,12 @@ class FieldConfigStorage extends FieldConfigStorageBase {
   /**
    * {@inheritdoc}
    */
-  public function loadByProperties(array $conditions = array()) {
+  public function loadByProperties(array $conditions = []) {
     // Include deleted fields if specified in the $conditions parameters.
     $include_deleted = isset($conditions['include_deleted']) ? $conditions['include_deleted'] : FALSE;
     unset($conditions['include_deleted']);
 
-    $fields = array();
+    $fields = [];
 
     // Get fields stored in configuration. If we are explicitly looking for
     // deleted fields only, this can be skipped, because they will be
@@ -109,7 +109,7 @@ class FieldConfigStorage extends FieldConfigStorageBase {
       if (isset($conditions['entity_type']) && isset($conditions['bundle']) && isset($conditions['field_name'])) {
         // Optimize for the most frequent case where we do have a specific ID.
         $id = $conditions['entity_type'] . '.' . $conditions['bundle'] . '.' . $conditions['field_name'];
-        $fields = $this->loadMultiple(array($id));
+        $fields = $this->loadMultiple([$id]);
       }
       else {
         // No specific ID, we need to examine all existing fields.
@@ -119,8 +119,8 @@ class FieldConfigStorage extends FieldConfigStorageBase {
 
     // Merge deleted fields (stored in state) if needed.
     if ($include_deleted || !empty($conditions['deleted'])) {
-      $deleted_fields = $this->state->get('field.field.deleted') ?: array();
-      $deleted_storages = $this->state->get('field.storage.deleted') ?: array();
+      $deleted_fields = $this->state->get('field.field.deleted') ?: [];
+      $deleted_storages = $this->state->get('field.storage.deleted') ?: [];
       foreach ($deleted_fields as $id => $config) {
         // If the field storage itself is deleted, inject it directly in the field.
         if (isset($deleted_storages[$config['field_storage_uuid']])) {
@@ -131,7 +131,7 @@ class FieldConfigStorage extends FieldConfigStorageBase {
     }
 
     // Collect matching fields.
-    $matching_fields = array();
+    $matching_fields = [];
     foreach ($fields as $field) {
       // Some conditions are checked against the field storage.
       $field_storage = $field->getFieldStorageDefinition();
diff --git a/web/core/modules/field/src/FieldStorageConfigStorage.php b/web/core/modules/field/src/FieldStorageConfigStorage.php
index cce8412c0..7a793f682 100644
--- a/web/core/modules/field/src/FieldStorageConfigStorage.php
+++ b/web/core/modules/field/src/FieldStorageConfigStorage.php
@@ -94,13 +94,13 @@ class FieldStorageConfigStorage extends ConfigEntityStorage {
   /**
    * {@inheritdoc}
    */
-  public function loadByProperties(array $conditions = array()) {
+  public function loadByProperties(array $conditions = []) {
     // Include deleted fields if specified in the $conditions parameters.
     $include_deleted = isset($conditions['include_deleted']) ? $conditions['include_deleted'] : FALSE;
     unset($conditions['include_deleted']);
 
     /** @var \Drupal\field\FieldStorageConfigInterface[] $storages */
-    $storages = array();
+    $storages = [];
 
     // Get field storages living in configuration. If we are explicitly looking
     // for deleted storages only, this can be skipped, because they will be
@@ -109,7 +109,7 @@ class FieldStorageConfigStorage extends ConfigEntityStorage {
       if (isset($conditions['entity_type']) && isset($conditions['field_name'])) {
         // Optimize for the most frequent case where we do have a specific ID.
         $id = $conditions['entity_type'] . $conditions['field_name'];
-        $storages = $this->loadMultiple(array($id));
+        $storages = $this->loadMultiple([$id]);
       }
       else {
         // No specific ID, we need to examine all existing storages.
@@ -119,14 +119,14 @@ class FieldStorageConfigStorage extends ConfigEntityStorage {
 
     // Merge deleted field storages (living in state) if needed.
     if ($include_deleted || !empty($conditions['deleted'])) {
-      $deleted_storages = $this->state->get('field.storage.deleted') ?: array();
+      $deleted_storages = $this->state->get('field.storage.deleted') ?: [];
       foreach ($deleted_storages as $id => $config) {
         $storages[$id] = $this->create($config);
       }
     }
 
     // Collect matching fields.
-    $matches = array();
+    $matches = [];
     foreach ($storages as $field) {
       foreach ($conditions as $key => $value) {
         // Extract the actual value against which the condition is checked.
diff --git a/web/core/modules/field/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php b/web/core/modules/field/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
index 034ab0b9c..9a8e86abb 100644
--- a/web/core/modules/field/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
+++ b/web/core/modules/field/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
@@ -26,7 +26,7 @@ class FieldFormatterSettingsDefaults extends ProcessPluginBase {
     if (isset($value[1])) {
       $module = $row->getSourceProperty('module');
       if ($module === 'date') {
-        $value = array('format_type' => 'fallback');
+        $value = ['format_type' => 'fallback'];
       }
       elseif ($module === 'number') {
         // We have to do the lookup here in the process plugin because for
@@ -35,7 +35,7 @@ class FieldFormatterSettingsDefaults extends ProcessPluginBase {
         return $this->numberSettings($row->getDestinationProperty('options/type'), $value[1]);
       }
       else {
-        $value = array();
+        $value = [];
       }
     }
     return $value;
diff --git a/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php b/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
index 3ff0d8cb6..748eca289 100644
--- a/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
+++ b/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
@@ -20,7 +20,7 @@ class FieldInstanceDefaults extends ProcessPluginBase {
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     list($widget_type, $widget_settings) = $value;
-    $default = array();
+    $default = [];
 
     switch ($widget_type) {
       case 'text_textfield':
@@ -58,7 +58,7 @@ class FieldInstanceDefaults extends ProcessPluginBase {
         break;
     }
     if (!empty($default)) {
-      $default = array($default);
+      $default = [$default];
     }
     return $default;
   }
diff --git a/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php b/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
index 080a4d735..82f25b5b2 100644
--- a/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
+++ b/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
@@ -20,7 +20,7 @@ class FieldInstanceSettings extends ProcessPluginBase {
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     list($widget_type, $widget_settings, $field_settings) = $value;
-    $settings = array();
+    $settings = [];
     switch ($widget_type) {
       case 'number':
         $settings['min'] = $field_settings['min'];
@@ -33,7 +33,7 @@ class FieldInstanceSettings extends ProcessPluginBase {
         // $settings['url'] = $widget_settings['default_value'][0]['url'];
         // D6 has optional, required, value and none. D8 only has disabled (0)
         // optional (1) and required (2).
-        $map = array('disabled' => 0, 'optional' => 1, 'required' => 2);
+        $map = ['disabled' => 0, 'optional' => 1, 'required' => 2];
         $settings['title'] = $map[$field_settings['title']];
         break;
 
diff --git a/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php b/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
index 1c7ede64f..62c982963 100644
--- a/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
+++ b/web/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
@@ -41,41 +41,41 @@ class FieldInstanceWidgetSettings extends ProcessPluginBase {
     $size = isset($widget_settings['size']) ? $widget_settings['size'] : 60;
     $rows = isset($widget_settings['rows']) ? $widget_settings['rows'] : 5;
 
-    $settings = array(
-      'text_textfield' => array(
+    $settings = [
+      'text_textfield' => [
         'size' => $size,
         'placeholder' => '',
-      ),
-      'text_textarea' => array(
+      ],
+      'text_textarea' => [
         'rows' => $rows,
         'placeholder' => '',
-      ),
-      'number' => array(
+      ],
+      'number' => [
         'placeholder' => '',
-      ),
-      'email_textfield' => array(
+      ],
+      'email_textfield' => [
         'placeholder' => '',
-      ),
-      'link' => array(
+      ],
+      'link' => [
         'placeholder_url' => '',
         'placeholder_title' => '',
-      ),
-      'filefield_widget' => array(
+      ],
+      'filefield_widget' => [
         'progress_indicator' => $progress,
-      ),
-      'imagefield_widget' => array(
+      ],
+      'imagefield_widget' => [
         'progress_indicator' => $progress,
         'preview_image_style' => 'thumbnail',
-      ),
-      'optionwidgets_onoff' => array(
+      ],
+      'optionwidgets_onoff' => [
         'display_label' => FALSE,
-      ),
-      'phone_textfield' => array(
+      ],
+      'phone_textfield' => [
         'placeholder' => '',
-      ),
-    );
+      ],
+    ];
 
-    return isset($settings[$widget_type]) ? $settings[$widget_type] : array();
+    return isset($settings[$widget_type]) ? $settings[$widget_type] : [];
   }
 
 }
diff --git a/web/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php b/web/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
index 018afe615..1bb5b77ae 100644
--- a/web/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
+++ b/web/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
@@ -59,26 +59,26 @@ class FieldSettings extends ProcessPluginBase {
       }
     }
 
-    $settings = array(
-      'text' => array(
+    $settings = [
+      'text' => [
         'max_length' => $max_length,
-      ),
-      'datetime' => array('datetime_type' => 'datetime'),
-      'list_string' => array(
+      ],
+      'datetime' => ['datetime_type' => 'datetime'],
+      'list_string' => [
         'allowed_values' => $allowed_values,
-      ),
-      'list_integer' => array(
+      ],
+      'list_integer' => [
         'allowed_values' => $allowed_values,
-      ),
-      'list_float' => array(
+      ],
+      'list_float' => [
         'allowed_values' => $allowed_values,
-      ),
-      'boolean' => array(
+      ],
+      'boolean' => [
         'allowed_values' => $allowed_values,
-      ),
-    );
+      ],
+    ];
 
-    return isset($settings[$field_type]) ? $settings[$field_type] : array();
+    return isset($settings[$field_type]) ? $settings[$field_type] : [];
   }
 
 }
diff --git a/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php b/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php
index 08501abb9..2a463811b 100644
--- a/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php
+++ b/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceDefaults.php
@@ -20,7 +20,7 @@ class FieldInstanceDefaults extends ProcessPluginBase {
     list($default_value, $widget_settings) = $value;
     $widget_type = $widget_settings['type'];
 
-    $default = array();
+    $default = [];
 
     foreach ($default_value as $item) {
       switch ($widget_type) {
diff --git a/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php b/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php
index d28007986..70a9498c4 100644
--- a/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php
+++ b/web/core/modules/field/src/Plugin/migrate/process/d7/FieldInstanceSettings.php
@@ -52,13 +52,13 @@ class FieldInstanceSettings extends ProcessPluginBase {
     switch ($widget_type) {
       case 'image_image':
         $settings = $instance_settings;
-        $settings['default_image'] = array(
+        $settings['default_image'] = [
           'alt' => '',
           'title' => '',
           'width' => NULL,
           'height' => NULL,
           'uuid' => '',
-        );
+        ];
         break;
 
       default:
diff --git a/web/core/modules/field/src/Plugin/migrate/process/d7/FieldSettings.php b/web/core/modules/field/src/Plugin/migrate/process/d7/FieldSettings.php
index bec448a2c..dc629a448 100644
--- a/web/core/modules/field/src/Plugin/migrate/process/d7/FieldSettings.php
+++ b/web/core/modules/field/src/Plugin/migrate/process/d7/FieldSettings.php
@@ -22,7 +22,7 @@ class FieldSettings extends ProcessPluginBase {
     switch ($row->getSourceProperty('type')) {
       case 'image':
         if (!is_array($value['default_image'])) {
-          $value['default_image'] = array('uuid' => '');
+          $value['default_image'] = ['uuid' => ''];
         }
         break;
 
diff --git a/web/core/modules/field/src/Plugin/migrate/source/d6/Field.php b/web/core/modules/field/src/Plugin/migrate/source/d6/Field.php
index cb108d700..7c9e620dd 100644
--- a/web/core/modules/field/src/Plugin/migrate/source/d6/Field.php
+++ b/web/core/modules/field/src/Plugin/migrate/source/d6/Field.php
@@ -20,7 +20,7 @@ class Field extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('content_node_field', 'cnf')
-      ->fields('cnf', array(
+      ->fields('cnf', [
         'field_name',
         'type',
         'global_settings',
@@ -31,7 +31,7 @@ class Field extends DrupalSqlBase {
         'db_columns',
         'active',
         'locked',
-      ))
+      ])
       ->distinct();
     // Only import fields which are actually being used.
     $query->innerJoin('content_node_field_instance', 'cnfi', 'cnfi.field_name = cnf.field_name');
@@ -43,7 +43,7 @@ class Field extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'field_name' => $this->t('Field name'),
       'type' => $this->t('Type (text, integer, ....)'),
       'widget_type' => $this->t('An instance-specific widget type'),
@@ -55,7 +55,7 @@ class Field extends DrupalSqlBase {
       'db_columns' => $this->t('DB Columns'),
       'active' => $this->t('Active'),
       'locked' => $this->t('Locked'),
-    );
+    ];
   }
 
   /**
@@ -96,10 +96,10 @@ class Field extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function getIds() {
-    $ids['field_name'] = array(
+    $ids['field_name'] = [
       'type' => 'string',
       'alias' => 'cnf',
-    );
+    ];
     return $ids;
   }
 
diff --git a/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php b/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
index 5436df64a..dbea7a8e7 100644
--- a/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
+++ b/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
@@ -33,7 +33,7 @@ class FieldInstance extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'field_name' => $this->t('The machine name of field.'),
       'type_name' => $this->t('Content type where this field is in use.'),
       'weight' => $this->t('Weight.'),
@@ -45,7 +45,7 @@ class FieldInstance extends DrupalSqlBase {
       'widget_module' => $this->t('Module that implements widget.'),
       'widget_active' => $this->t('Status of widget'),
       'module' => $this->t('The module that provides the field.'),
-    );
+    ];
   }
 
   /**
@@ -66,15 +66,15 @@ class FieldInstance extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function getIds() {
-    $ids = array(
-      'field_name' => array(
+    $ids = [
+      'field_name' => [
         'type' => 'string',
         'alias' => 'cnfi',
-      ),
-      'type_name' => array(
+      ],
+      'type_name' => [
         'type' => 'string',
-      ),
-    );
+      ],
+    ];
     return $ids;
   }
 
diff --git a/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php b/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
index 44bad618e..21baa9ee2 100644
--- a/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
+++ b/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
@@ -18,7 +18,7 @@ class FieldInstancePerFormDisplay extends DrupalSqlBase {
    * {@inheritdoc}
    */
   protected function initializeIterator() {
-    $rows = array();
+    $rows = [];
     $result = $this->prepareQuery()->execute();
     while ($field_row = $result->fetchAssoc()) {
       $bundle = $field_row['type_name'];
@@ -44,7 +44,7 @@ class FieldInstancePerFormDisplay extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('content_node_field_instance', 'cnfi')
-      ->fields('cnfi', array(
+      ->fields('cnfi', [
         'field_name',
         'type_name',
         'weight',
@@ -55,11 +55,11 @@ class FieldInstancePerFormDisplay extends DrupalSqlBase {
         'description',
         'widget_module',
         'widget_active',
-      ))
-      ->fields('cnf', array(
+      ])
+      ->fields('cnf', [
         'type',
         'module',
-      ));
+      ]);
     $query->join('content_node_field', 'cnf', 'cnfi.field_name = cnf.field_name');
     $query->orderBy('cnfi.weight');
 
@@ -70,7 +70,7 @@ class FieldInstancePerFormDisplay extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'field_name' => $this->t('The machine name of field.'),
       'type_name' => $this->t('Content type where this field is used.'),
       'weight' => $this->t('Weight.'),
@@ -81,7 +81,7 @@ class FieldInstancePerFormDisplay extends DrupalSqlBase {
       'description' => $this->t('A description of field.'),
       'widget_module' => $this->t('Module that implements widget.'),
       'widget_active' => $this->t('Status of widget'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php b/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
index 2e1832e1b..33852d677 100644
--- a/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
+++ b/web/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
@@ -18,7 +18,7 @@ class FieldInstancePerViewMode extends ViewModeBase {
    * {@inheritdoc}
    */
   protected function initializeIterator() {
-    $rows = array();
+    $rows = [];
     $result = $this->prepareQuery()->execute();
     while ($field_row = $result->fetchAssoc()) {
       // These are added to every view mode row.
@@ -28,7 +28,10 @@ class FieldInstancePerViewMode extends ViewModeBase {
       $field_name = $field_row['field_name'];
 
       foreach ($this->getViewModes() as $view_mode) {
-        if (isset($field_row['display_settings'][$view_mode]) && empty($field_row['display_settings'][$view_mode]['exclude'])) {
+        // Append to the return value if the row has display settings for this
+        // view mode and the view mode is neither hidden nor excluded.
+        // @see \Drupal\node\Plugin\migrate\source\d6\ViewMode::initializeIterator()
+        if (isset($field_row['display_settings'][$view_mode]) && $field_row['display_settings'][$view_mode]['format'] != 'hidden' && empty($field_row['display_settings'][$view_mode]['exclude'])) {
           $index = $view_mode . "." . $bundle . "." . $field_name;
           $rows[$index]['entity_type'] = 'node';
           $rows[$index]['view_mode'] = $view_mode;
@@ -52,18 +55,18 @@ class FieldInstancePerViewMode extends ViewModeBase {
    */
   public function query() {
     $query = $this->select('content_node_field_instance', 'cnfi')
-      ->fields('cnfi', array(
+      ->fields('cnfi', [
         'field_name',
         'type_name',
         'weight',
         'label',
         'display_settings',
         'widget_settings',
-      ))
-      ->fields('cnf', array(
+      ])
+      ->fields('cnf', [
         'type',
         'module',
-      ));
+      ]);
     $query->join('content_node_field', 'cnf', 'cnfi.field_name = cnf.field_name');
     $query->orderBy('cnfi.weight');
 
@@ -74,7 +77,7 @@ class FieldInstancePerViewMode extends ViewModeBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'field_name' => $this->t('The machine name of field.'),
       'type_name' => $this->t('Content type where this field is used.'),
       'weight' => $this->t('Weight.'),
@@ -85,7 +88,7 @@ class FieldInstancePerViewMode extends ViewModeBase {
       'description' => $this->t('A description of field.'),
       'widget_module' => $this->t('Module that implements widget.'),
       'widget_active' => $this->t('Status of widget'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/field/src/Plugin/migrate/source/d7/Field.php b/web/core/modules/field/src/Plugin/migrate/source/d7/Field.php
index 2e8f74551..d9aef9162 100644
--- a/web/core/modules/field/src/Plugin/migrate/source/d7/Field.php
+++ b/web/core/modules/field/src/Plugin/migrate/source/d7/Field.php
@@ -21,7 +21,7 @@ class Field extends DrupalSqlBase {
     $query = $this->select('field_config', 'fc')
       ->distinct()
       ->fields('fc')
-      ->fields('fci', array('entity_type'))
+      ->fields('fci', ['entity_type'])
       ->condition('fc.active', 1)
       ->condition('fc.deleted', 0)
       ->condition('fc.storage_active', 1);
@@ -34,7 +34,7 @@ class Field extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'field_name' => $this->t('The name of this field.'),
       'type' => $this->t('The type of this field.'),
       'module' => $this->t('The module that implements the field type.'),
@@ -42,7 +42,7 @@ class Field extends DrupalSqlBase {
       'locked' => $this->t('Locked'),
       'cardinality' => $this->t('Cardinality'),
       'translatable' => $this->t('Translatable'),
-    );
+    ];
   }
 
   /**
@@ -59,16 +59,16 @@ class Field extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'field_name' => array(
+    return [
+      'field_name' => [
         'type' => 'string',
         'alias' => 'fc',
-      ),
-      'entity_type' => array(
+      ],
+      'entity_type' => [
         'type' => 'string',
         'alias' => 'fci',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php b/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
index 5d3d6cc06..d06336e15 100644
--- a/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
+++ b/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
@@ -25,7 +25,7 @@ class FieldInstance extends DrupalSqlBase {
       ->condition('fc.active', 1)
       ->condition('fc.deleted', 0)
       ->condition('fc.storage_active', 1)
-      ->fields('fc', array('type'));
+      ->fields('fc', ['type']);
 
     $query->innerJoin('field_config', 'fc', 'fci.field_id = fc.id');
     $query->addField('fc', 'data', 'field_data');
@@ -46,7 +46,7 @@ class FieldInstance extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'field_name' => $this->t('The machine name of field.'),
       'entity_type' => $this->t('The entity type.'),
       'bundle' => $this->t('The entity bundle.'),
@@ -55,7 +55,7 @@ class FieldInstance extends DrupalSqlBase {
       'widget_settings' => $this->t('Widget settings.'),
       'display_settings' => $this->t('Display settings.'),
       'field_settings' => $this->t('Field settings.'),
-    );
+    ];
   }
 
   /**
@@ -68,7 +68,7 @@ class FieldInstance extends DrupalSqlBase {
     $row->setSourceProperty('description', $data['description']);
     $row->setSourceProperty('required', $data['required']);
 
-    $default_value = !empty($data['default_value']) ? $data['default_value'] : array();
+    $default_value = !empty($data['default_value']) ? $data['default_value'] : [];
     if ($data['widget']['type'] == 'email_textfield' && $default_value) {
       $default_value[0]['value'] = $default_value[0]['email'];
       unset($default_value[0]['email']);
@@ -86,6 +86,25 @@ class FieldInstance extends DrupalSqlBase {
     $field_data = unserialize($row->getSourceProperty('field_data'));
     $row->setSourceProperty('field_settings', $field_data['settings']);
 
+    $translatable = FALSE;
+    if ($row->getSourceProperty('entity_type') == 'node') {
+      // language_content_type_[bundle] may be
+      //   - 0: no language support
+      //   - 1: language assignment support
+      //   - 2: node translation support
+      //   - 4: entity translation support
+      if ($this->variableGet('language_content_type_' . $row->getSourceProperty('bundle'), 0) == 2) {
+        $translatable = TRUE;
+      }
+    }
+    else {
+      // This is not a node entity. Get the translatable value from the source
+      // field_config table.
+      $data = unserialize($row->getSourceProperty('field_data'));
+      $translatable = $data['translatable'];
+    }
+    $row->setSourceProperty('translatable', $translatable);
+
     return parent::prepareRow($row);
   }
 
@@ -93,20 +112,20 @@ class FieldInstance extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'entity_type' => array(
+    return [
+      'entity_type' => [
         'type' => 'string',
         'alias' => 'fci',
-      ),
-      'bundle' => array(
+      ],
+      'bundle' => [
         'type' => 'string',
         'alias' => 'fci',
-      ),
-      'field_name' => array(
+      ],
+      'field_name' => [
         'type' => 'string',
         'alias' => 'fci',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php b/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php
index 62de5d9d6..ac599ec0a 100644
--- a/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php
+++ b/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php
@@ -19,16 +19,16 @@ class FieldInstancePerFormDisplay extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('field_config_instance', 'fci')
-      ->fields('fci', array(
+      ->fields('fci', [
         'field_name',
         'bundle',
         'data',
         'entity_type'
-      ))
-      ->fields('fc', array(
+      ])
+      ->fields('fc', [
         'type',
         'module',
-      ));
+      ]);
     $query->join('field_config', 'fc', 'fci.field_id = fc.id');
     return $query;
   }
@@ -47,27 +47,27 @@ class FieldInstancePerFormDisplay extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'field_name' => $this->t('The machine name of field.'),
       'bundle' => $this->t('Content type where this field is used.'),
       'data' => $this->t('Field configuration data.'),
       'entity_type' => $this->t('The entity type.'),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'bundle' => array(
+    return [
+      'bundle' => [
         'type' => 'string',
-      ),
-      'field_name' => array(
+      ],
+      'field_name' => [
         'type' => 'string',
         'alias' => 'fci',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerViewMode.php b/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerViewMode.php
index 72a845bca..7339e764a 100644
--- a/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerViewMode.php
+++ b/web/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerViewMode.php
@@ -18,7 +18,7 @@ class FieldInstancePerViewMode extends DrupalSqlBase {
    * {@inheritdoc}
    */
   protected function initializeIterator() {
-    $rows = array();
+    $rows = [];
     $result = $this->prepareQuery()->execute();
     foreach ($result as $field_instance) {
       $data = unserialize($field_instance['data']);
@@ -53,7 +53,7 @@ class FieldInstancePerViewMode extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'entity_type' => $this->t('The entity type ID.'),
       'bundle' => $this->t('The bundle ID.'),
       'field_name' => $this->t('Machine name of the field.'),
@@ -64,27 +64,27 @@ class FieldInstancePerViewMode extends DrupalSqlBase {
       'settings' => $this->t('Array of formatter-specific settings.'),
       'module' => $this->t('The module providing the formatter.'),
       'weight' => $this->t('Display weight of the field.'),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'entity_type' => array(
+    return [
+      'entity_type' => [
         'type' => 'string',
-      ),
-      'bundle' => array(
+      ],
+      'bundle' => [
         'type' => 'string',
-      ),
-      'view_mode' => array(
+      ],
+      'view_mode' => [
         'type' => 'string',
-      ),
-      'field_name' => array(
+      ],
+      'field_name' => [
         'type' => 'string',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php b/web/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php
index 5fa491b20..6fc6c6dc9 100644
--- a/web/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php
+++ b/web/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php
@@ -47,54 +47,54 @@ class BooleanFieldTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalLogin($this->drupalCreateUser(array(
+    $this->drupalLogin($this->drupalCreateUser([
       'view test entity',
       'administer entity_test content',
       'administer entity_test form display',
       'administer entity_test fields',
-    )));
+    ]));
   }
 
   /**
    * Tests boolean field.
    */
-  function testBooleanField() {
+  public function testBooleanField() {
     $on = $this->randomMachineName();
     $off = $this->randomMachineName();
     $label = $this->randomMachineName();
 
     // Create a field with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $this->fieldStorage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'boolean',
-    ));
+    ]);
     $this->fieldStorage->save();
-    $this->field = FieldConfig::create(array(
+    $this->field = FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
       'label' => $label,
       'required' => TRUE,
-      'settings' => array(
+      'settings' => [
         'on_label' => $on,
         'off_label' => $off,
-      ),
-    ));
+      ],
+    ]);
     $this->field->save();
 
     // Create a form display for the default form mode.
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'boolean_checkbox',
-      ))
+      ])
       ->save();
     // Create a display for the full view mode.
     entity_get_display('entity_test', 'entity_test', 'full')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'boolean',
-      ))
+      ])
       ->save();
 
     // Display creation form.
@@ -104,13 +104,13 @@ class BooleanFieldTest extends WebTestBase {
     $this->assertNoRaw($on, 'Does not use the "On" label.');
 
     // Submit and ensure it is accepted.
-    $edit = array(
+    $edit = [
       "{$field_name}[value]" => 1,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
 
     // Verify that boolean value is displayed.
     $entity = EntityTest::load($id);
@@ -121,12 +121,12 @@ class BooleanFieldTest extends WebTestBase {
 
     // Test with "On" label option.
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'boolean_checkbox',
-        'settings' => array(
+        'settings' => [
           'display_label' => FALSE,
-        )
-      ))
+        ]
+      ])
       ->save();
 
     $this->drupalGet('entity_test/add');
@@ -136,9 +136,9 @@ class BooleanFieldTest extends WebTestBase {
 
     // Test if we can change the on label.
     $on = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'settings[on_label]' => $on,
-    );
+    ];
     $this->drupalPostForm('entity_test/structure/entity_test/fields/entity_test.entity_test.' . $field_name, $edit, t('Save settings'));
     // Check if we see the updated labels in the creation form.
     $this->drupalGet('entity_test/add');
@@ -150,7 +150,7 @@ class BooleanFieldTest extends WebTestBase {
     $this->drupalGet($fieldEditUrl);
 
     // Click on the widget settings button to open the widget settings form.
-    $this->drupalPostAjaxForm(NULL, array(), $field_name . "_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], $field_name . "_settings_edit");
 
     $this->assertText(
       'Use field label instead of the "On label" as label',
@@ -158,7 +158,7 @@ class BooleanFieldTest extends WebTestBase {
     );
 
     // Enable setting.
-    $edit = array('fields[' . $field_name . '][settings_edit_form][settings][display_label]' => 1);
+    $edit = ['fields[' . $field_name . '][settings_edit_form][settings][display_label]' => 1];
     $this->drupalPostAjaxForm(NULL, $edit, $field_name . "_plugin_settings_update");
     $this->drupalPostForm(NULL, NULL, 'Save');
 
@@ -167,7 +167,7 @@ class BooleanFieldTest extends WebTestBase {
     $this->drupalGet($fieldEditUrl);
     $this->assertText('Use field label: Yes', 'Checking the display settings checkbox updated the value.');
 
-    $this->drupalPostAjaxForm(NULL, array(), $field_name . "_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], $field_name . "_settings_edit");
     $this->assertText(
       'Use field label instead of the "On label" as label',
       t('Display setting checkbox is available')
diff --git a/web/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php b/web/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
index 0d0c475f3..92efa9817 100644
--- a/web/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
+++ b/web/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
@@ -44,10 +44,10 @@ class BooleanFormatterSettingsTest extends WebTestBase {
 
     // Create a content type. Use Node because it has Field UI pages that work.
     $type_name = Unicode::strtolower($this->randomMachineName(8)) . '_test';
-    $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name));
+    $type = $this->drupalCreateContentType(['name' => $type_name, 'type' => $type_name]);
     $this->bundle = $type->id();
 
-    $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer node display', 'bypass node access', 'administer nodes'));
+    $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node display', 'bypass node access', 'administer nodes']);
     $this->drupalLogin($admin_user);
 
     $this->fieldName = Unicode::strtolower($this->randomMachineName(8));
@@ -77,18 +77,18 @@ class BooleanFormatterSettingsTest extends WebTestBase {
   /**
    * Tests the formatter settings page for the Boolean formatter.
    */
-  function testBooleanFormatterSettings() {
+  public function testBooleanFormatterSettings() {
     // List the options we expect to see on the settings form. Omit the one
     // with the Unicode check/x characters, which does not appear to work
     // well in WebTestBase.
-    $options = array(
+    $options = [
       'Yes / No',
       'True / False',
       'On / Off',
       'Enabled / Disabled',
       '1 / 0',
       'Custom',
-    );
+    ];
 
     // Define what the "default" option should look like, depending on the
     // field settings.
@@ -96,29 +96,29 @@ class BooleanFormatterSettingsTest extends WebTestBase {
 
     // For several different values of the field settings, test that the
     // options, including default, are shown correctly.
-    $settings = array(
-      array('Yes', 'No'),
-      array('On', 'Off'),
-      array('TRUE', 'FALSE'),
-    );
+    $settings = [
+      ['Yes', 'No'],
+      ['On', 'Off'],
+      ['TRUE', 'FALSE'],
+    ];
 
     foreach ($settings as $values) {
       // Set up the field settings.
       $this->drupalGet('admin/structure/types/manage/' . $this->bundle . '/fields/node.' . $this->bundle . '.' . $this->fieldName);
-      $this->drupalPostForm(NULL, array(
+      $this->drupalPostForm(NULL, [
         'settings[on_label]' => $values[0],
         'settings[off_label]' => $values[1],
-      ), 'Save settings');
+      ], 'Save settings');
 
       // Open the Manage Display page and trigger the field settings form.
       $this->drupalGet('admin/structure/types/manage/' . $this->bundle . '/display');
-      $this->drupalPostAjaxForm(NULL, array(), $this->fieldName . '_settings_edit');
+      $this->drupalPostAjaxForm(NULL, [], $this->fieldName . '_settings_edit');
 
       // Test that the settings options are present in the correct format.
       foreach ($options as $string) {
         $this->assertText($string);
       }
-      $this->assertText(SafeMarkup::format($default, array('@on' => $values[0], '@off' => $values[1])));
+      $this->assertText(SafeMarkup::format($default, ['@on' => $values[0], '@off' => $values[1]]));
     }
 
     foreach ($settings as $values) {
diff --git a/web/core/modules/field/src/Tests/Email/EmailFieldTest.php b/web/core/modules/field/src/Tests/Email/EmailFieldTest.php
index 7c22861e8..269d91f65 100644
--- a/web/core/modules/field/src/Tests/Email/EmailFieldTest.php
+++ b/web/core/modules/field/src/Tests/Email/EmailFieldTest.php
@@ -20,7 +20,7 @@ class EmailFieldTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'entity_test', 'field_ui');
+  public static $modules = ['node', 'entity_test', 'field_ui'];
 
   /**
    * A field storage to use in this test class.
@@ -39,24 +39,24 @@ class EmailFieldTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalLogin($this->drupalCreateUser(array(
+    $this->drupalLogin($this->drupalCreateUser([
       'view test entity',
       'administer entity_test content',
       'administer content types',
-    )));
+    ]));
   }
 
   /**
    * Tests email field.
    */
-  function testEmailField() {
+  public function testEmailField() {
     // Create a field with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $this->fieldStorage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'email',
-    ));
+    ]);
     $this->fieldStorage->save();
     $this->field = FieldConfig::create([
       'field_storage' => $this->fieldStorage,
@@ -66,18 +66,18 @@ class EmailFieldTest extends WebTestBase {
 
     // Create a form display for the default form mode.
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'email_default',
-        'settings' => array(
+        'settings' => [
           'placeholder' => 'example@example.com',
-        ),
-      ))
+        ],
+      ])
       ->save();
     // Create a display for the full view mode.
     entity_get_display('entity_test', 'entity_test', 'full')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'email_mailto',
-      ))
+      ])
       ->save();
 
     // Display creation form.
@@ -87,13 +87,13 @@ class EmailFieldTest extends WebTestBase {
 
     // Submit a valid email address and ensure it is accepted.
     $value = 'test@example.com';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
     $this->assertRaw($value);
 
     // Verify that a mailto link is displayed.
diff --git a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php b/web/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php
index 0324c4a57..fa68cb615 100644
--- a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php
+++ b/web/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php
@@ -46,18 +46,18 @@ class EntityReferenceAdminTest extends WebTestBase {
 
     // Create a content type, with underscores.
     $type_name = strtolower($this->randomMachineName(8)) . '_test';
-    $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name));
+    $type = $this->drupalCreateContentType(['name' => $type_name, 'type' => $type_name]);
     $this->type = $type->id();
 
     // Create test user.
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'access content',
       'administer node fields',
       'administer node display',
       'administer views',
       'create ' . $type_name . ' content',
       'edit own ' . $type_name . ' content',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
   }
 
@@ -74,11 +74,11 @@ class EntityReferenceAdminTest extends WebTestBase {
     $this->assertOption('edit-new-storage-type', 'field_ui:entity_reference:node');
     $this->assertOption('edit-new-storage-type', 'field_ui:entity_reference:user');
 
-    $this->drupalPostForm(NULL, array(
+    $this->drupalPostForm(NULL, [
       'label' => 'Test label',
       'field_name' => 'test',
       'new_storage_type' => 'entity_reference',
-    ), t('Save and continue'));
+    ], t('Save and continue'));
 
     // Node should be selected by default.
     $this->assertFieldByName('settings[target_type]', 'node');
@@ -87,7 +87,7 @@ class EntityReferenceAdminTest extends WebTestBase {
     $this->assertFieldSelectOptions('settings[target_type]', array_keys(\Drupal::entityManager()->getDefinitions()));
 
     // Second step: 'Field settings' form.
-    $this->drupalPostForm(NULL, array(), t('Save field settings'));
+    $this->drupalPostForm(NULL, [], t('Save field settings'));
 
     // The base handler should be selected by default.
     $this->assertFieldByName('settings[handler]', 'default:node');
@@ -106,7 +106,7 @@ class EntityReferenceAdminTest extends WebTestBase {
     $this->assertFieldByName('settings[handler_settings][sort][field]', '_none');
     $this->assertNoFieldByName('settings[handler_settings][sort][direction]');
     // Option 1: sort by field.
-    $this->drupalPostAjaxForm(NULL, array('settings[handler_settings][sort][field]' => 'nid'), 'settings[handler_settings][sort][field]');
+    $this->drupalPostAjaxForm(NULL, ['settings[handler_settings][sort][field]' => 'nid'], 'settings[handler_settings][sort][field]');
     $this->assertFieldByName('settings[handler_settings][sort][direction]', 'ASC');
 
     // Test that a non-translatable base field is a sort option.
@@ -117,14 +117,14 @@ class EntityReferenceAdminTest extends WebTestBase {
     $this->assertFieldByXPath("//select[@name='settings[handler_settings][sort][field]']/option[@value='body.value']");
 
     // Set back to no sort.
-    $this->drupalPostAjaxForm(NULL, array('settings[handler_settings][sort][field]' => '_none'), 'settings[handler_settings][sort][field]');
+    $this->drupalPostAjaxForm(NULL, ['settings[handler_settings][sort][field]' => '_none'], 'settings[handler_settings][sort][field]');
     $this->assertNoFieldByName('settings[handler_settings][sort][direction]');
 
     // Third step: confirm.
-    $this->drupalPostForm(NULL, array(
+    $this->drupalPostForm(NULL, [
       'required' => '1',
       'settings[handler_settings][target_bundles][' . key($bundles) . ']' => key($bundles),
-    ), t('Save settings'));
+    ], t('Save settings'));
 
     // Check that the field appears in the overview form.
     $this->assertFieldByXPath('//table[@id="field-overview"]//tr[@id="field-test"]/td[1]', 'Test label', 'Field was created and appears in the overview page.');
@@ -133,14 +133,14 @@ class EntityReferenceAdminTest extends WebTestBase {
     // field is required.
     // The first 'Edit' link is for the Body field.
     $this->clickLink(t('Edit'), 1);
-    $this->drupalPostForm(NULL, array(), t('Save settings'));
+    $this->drupalPostForm(NULL, [], t('Save settings'));
 
     // Switch the target type to 'taxonomy_term' and check that the settings
     // specific to its selection handler are displayed.
     $field_name = 'node.' . $this->type . '.field_test';
-    $edit = array(
+    $edit = [
       'settings[target_type]' => 'taxonomy_term',
-    );
+    ];
     $this->drupalPostForm($bundle_path . '/fields/' . $field_name . '/storage', $edit, t('Save field settings'));
     $this->drupalGet($bundle_path . '/fields/' . $field_name);
     $this->assertFieldByName('settings[handler_settings][auto_create]');
@@ -148,63 +148,63 @@ class EntityReferenceAdminTest extends WebTestBase {
     // Switch the target type to 'user' and check that the settings specific to
     // its selection handler are displayed.
     $field_name = 'node.' . $this->type . '.field_test';
-    $edit = array(
+    $edit = [
       'settings[target_type]' => 'user',
-    );
+    ];
     $this->drupalPostForm($bundle_path . '/fields/' . $field_name . '/storage', $edit, t('Save field settings'));
     $this->drupalGet($bundle_path . '/fields/' . $field_name);
     $this->assertFieldByName('settings[handler_settings][filter][type]', '_none');
 
     // Switch the target type to 'node'.
     $field_name = 'node.' . $this->type . '.field_test';
-    $edit = array(
+    $edit = [
       'settings[target_type]' => 'node',
-    );
+    ];
     $this->drupalPostForm($bundle_path . '/fields/' . $field_name . '/storage', $edit, t('Save field settings'));
 
     // Try to select the views handler.
-    $edit = array(
+    $edit = [
       'settings[handler]' => 'views',
-    );
+    ];
     $this->drupalPostAjaxForm($bundle_path . '/fields/' . $field_name, $edit, 'settings[handler]');
-    $this->assertRaw(t('No eligible views were found. <a href=":create">Create a view</a> with an <em>Entity Reference</em> display, or add such a display to an <a href=":existing">existing view</a>.', array(
+    $this->assertRaw(t('No eligible views were found. <a href=":create">Create a view</a> with an <em>Entity Reference</em> display, or add such a display to an <a href=":existing">existing view</a>.', [
       ':create' => \Drupal::url('views_ui.add'),
       ':existing' => \Drupal::url('entity.view.collection'),
-    )));
+    ]));
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
     // If no eligible view is available we should see a message.
     $this->assertText('The views entity selection mode requires a view.');
 
     // Enable the entity_reference_test module which creates an eligible view.
-    $this->container->get('module_installer')->install(array('entity_reference_test'));
+    $this->container->get('module_installer')->install(['entity_reference_test']);
     $this->resetAll();
     $this->drupalGet($bundle_path . '/fields/' . $field_name);
     $this->drupalPostAjaxForm($bundle_path . '/fields/' . $field_name, $edit, 'settings[handler]');
-    $edit = array(
+    $edit = [
       'settings[handler_settings][view][view_and_display]' => 'test_entity_reference:entity_reference_1',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
     $this->assertResponse(200);
 
     // Switch the target type to 'entity_test'.
-    $edit = array(
+    $edit = [
       'settings[target_type]' => 'entity_test',
-    );
+    ];
     $this->drupalPostForm($bundle_path . '/fields/' . $field_name . '/storage', $edit, t('Save field settings'));
     $this->drupalGet($bundle_path . '/fields/' . $field_name);
-    $edit = array(
+    $edit = [
       'settings[handler]' => 'views',
-    );
+    ];
     $this->drupalPostAjaxForm($bundle_path . '/fields/' . $field_name, $edit, 'settings[handler]');
-    $edit = array(
+    $edit = [
       'required' => FALSE,
       'settings[handler_settings][view][view_and_display]' => 'test_entity_reference_entity_test:entity_reference_1',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
     $this->assertResponse(200);
 
     // Create a new view and display it as a entity reference.
-    $edit = array(
+    $edit = [
       'id' => 'node_test_view',
       'label' => 'Node Test View',
       'show[wizard_key]' => 'node',
@@ -214,13 +214,13 @@ class EntityReferenceAdminTest extends WebTestBase {
       'page[path]' => 'test/node/view',
       'page[style][style_plugin]' => 'default',
       'page[style][row_plugin]' => 'fields',
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/add', $edit, t('Save and edit'));
-    $this->drupalPostForm(NULL, array(), t('Duplicate as Entity Reference'));
+    $this->drupalPostForm(NULL, [], t('Duplicate as Entity Reference'));
     $this->clickLink(t('Settings'));
-    $edit = array(
+    $edit = [
       'style_options[search_fields][title]' => 'title',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply'));
 
     // Set sort to NID ascending.
@@ -230,33 +230,33 @@ class EntityReferenceAdminTest extends WebTestBase {
     $this->drupalPostForm('admin/structure/views/nojs/add-handler/node_test_view/entity_reference_1/sort', $edit, t('Add and configure sort criteria'));
     $this->drupalPostForm(NULL, NULL, t('Apply'));
 
-    $this->drupalPostForm('admin/structure/views/view/node_test_view/edit/entity_reference_1', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/views/view/node_test_view/edit/entity_reference_1', [], t('Save'));
     $this->clickLink(t('Settings'));
 
     // Create a test entity reference field.
     $field_name = 'test_entity_ref_field';
-    $edit = array(
+    $edit = [
       'new_storage_type' => 'field_ui:entity_reference:node',
       'label' => 'Test Entity Reference Field',
       'field_name' => $field_name,
-    );
+    ];
     $this->drupalPostForm($bundle_path . '/fields/add-field', $edit, t('Save and continue'));
 
     // Set to unlimited.
-    $edit = array(
+    $edit = [
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save field settings'));
 
     // Add the view to the test field.
-    $edit = array(
+    $edit = [
       'settings[handler]' => 'views',
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, 'settings[handler]');
-    $edit = array(
+    $edit = [
       'required' => FALSE,
       'settings[handler_settings][view][view_and_display]' => 'node_test_view:entity_reference_1',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
 
     // Create nodes.
@@ -275,34 +275,34 @@ class EntityReferenceAdminTest extends WebTestBase {
     $this->drupalGet('node/add/' . $this->type);
     $result = $this->xpath('//input[@name="field_test_entity_ref_field[0][target_id]" and contains(@data-autocomplete-path, "/entity_reference_autocomplete/node/views/")]');
     $target_url = $this->getAbsoluteUrl($result[0]['data-autocomplete-path']);
-    $this->drupalGet($target_url, array('query' => array('q' => 'Foo')));
+    $this->drupalGet($target_url, ['query' => ['q' => 'Foo']]);
     $this->assertRaw($node1->getTitle() . ' (' . $node1->id() . ')');
     $this->assertRaw($node2->getTitle() . ' (' . $node2->id() . ')');
 
     // Try to add a new node, fill the entity reference field and submit the
     // form.
     $this->drupalPostForm('node/add/' . $this->type, [], t('Add another item'));
-    $edit = array(
+    $edit = [
       'title[0][value]' => 'Example',
       'field_test_entity_ref_field[0][target_id]' => 'Foo Node (' . $node1->id() . ')',
       'field_test_entity_ref_field[1][target_id]' => 'Foo Node (' . $node2->id() . ')',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertResponse(200);
 
-    $edit = array(
+    $edit = [
       'title[0][value]' => 'Example',
       'field_test_entity_ref_field[0][target_id]' => 'Test'
-    );
+    ];
     $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
 
     // Assert that entity reference autocomplete field is validated.
     $this->assertText(t('There are no entities matching "@entity"', ['@entity' => 'Test']));
 
-    $edit = array(
+    $edit = [
       'title[0][value]' => 'Test',
       'field_test_entity_ref_field[0][target_id]' => $node1->getTitle()
-    );
+    ];
     $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
 
     // Assert the results multiple times to avoid sorting problem of nodes with
@@ -312,15 +312,15 @@ class EntityReferenceAdminTest extends WebTestBase {
     $this->assertText(t("@node2", ['@node2' => $node2->getTitle() . ' (' . $node2->id() . ')']));
     $this->assertText(t('Specify the one you want by appending the id in parentheses, like "@example".', ['@example' => $node2->getTitle() . ' (' . $node2->id() . ')']));
 
-    $edit = array(
+    $edit = [
       'title[0][value]' => 'Test',
       'field_test_entity_ref_field[0][target_id]' => $node1->getTitle() . ' (' . $node1->id() . ')'
-    );
+    ];
     $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
     $this->assertLink($node1->getTitle());
 
     // Tests adding default values to autocomplete widgets.
-    Vocabulary::create(array('vid' => 'tags', 'name' => 'tags'))->save();
+    Vocabulary::create(['vid' => 'tags', 'name' => 'tags'])->save();
     $taxonomy_term_field_name = $this->createEntityReferenceField('taxonomy_term', ['tags']);
     $field_path = 'node.' . $this->type . '.field_' . $taxonomy_term_field_name;
     $this->drupalGet($bundle_path . '/fields/' . $field_path . '/storage');
@@ -351,7 +351,7 @@ class EntityReferenceAdminTest extends WebTestBase {
    */
   public function testAvailableFormatters() {
     // Create a new vocabulary.
-    Vocabulary::create(array('vid' => 'tags', 'name' => 'tags'))->save();
+    Vocabulary::create(['vid' => 'tags', 'name' => 'tags'])->save();
 
     // Create entity reference field with taxonomy term as a target.
     $taxonomy_term_field_name = $this->createEntityReferenceField('taxonomy_term', ['tags']);
@@ -370,42 +370,38 @@ class EntityReferenceAdminTest extends WebTestBase {
 
     // Check for Taxonomy Term select box values.
     // Test if Taxonomy Term Entity Reference Field has the correct formatters.
-    $this->assertFieldSelectOptions('fields[field_' . $taxonomy_term_field_name . '][type]', array(
+    $this->assertFieldSelectOptions('fields[field_' . $taxonomy_term_field_name . '][type]', [
       'entity_reference_label',
       'entity_reference_entity_id',
       'entity_reference_rss_category',
       'entity_reference_entity_view',
-      'hidden',
-    ));
+    ]);
 
     // Test if User Reference Field has the correct formatters.
     // Author should be available for this field.
     // RSS Category should not be available for this field.
-    $this->assertFieldSelectOptions('fields[field_' . $user_field_name . '][type]', array(
+    $this->assertFieldSelectOptions('fields[field_' . $user_field_name . '][type]', [
       'author',
       'entity_reference_entity_id',
       'entity_reference_entity_view',
       'entity_reference_label',
-      'hidden',
-    ));
+    ]);
 
     // Test if Node Entity Reference Field has the correct formatters.
     // RSS Category should not be available for this field.
-    $this->assertFieldSelectOptions('fields[field_' . $node_field_name . '][type]', array(
+    $this->assertFieldSelectOptions('fields[field_' . $node_field_name . '][type]', [
       'entity_reference_label',
       'entity_reference_entity_id',
       'entity_reference_entity_view',
-      'hidden',
-    ));
+    ]);
 
     // Test if Date Format Reference Field has the correct formatters.
     // RSS Category & Entity View should not be available for this field.
     // This could be any field without a ViewBuilder.
-    $this->assertFieldSelectOptions('fields[field_' . $date_format_field_name . '][type]', array(
+    $this->assertFieldSelectOptions('fields[field_' . $date_format_field_name . '][type]', [
       'entity_reference_label',
       'entity_reference_entity_id',
-      'hidden',
-    ));
+    ]);
   }
 
   /**
@@ -487,7 +483,7 @@ class EntityReferenceAdminTest extends WebTestBase {
     // Generate a random field name, must be only lowercase characters.
     $field_name = strtolower($this->randomMachineName());
 
-    $storage_edit = $field_edit = array();
+    $storage_edit = $field_edit = [];
     $storage_edit['settings[target_type]'] = $target_type;
     foreach ($bundles as $bundle) {
       $field_edit['settings[handler_settings][target_bundles][' . $bundle . ']'] = TRUE;
@@ -511,7 +507,7 @@ class EntityReferenceAdminTest extends WebTestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertFieldSelectOptions($name, array $expected_options) {
-    $xpath = $this->buildXPathQuery('//select[@name=:name]', array(':name' => $name));
+    $xpath = $this->buildXPathQuery('//select[@name=:name]', [':name' => $name]);
     $fields = $this->xpath($xpath);
     if ($fields) {
       $field = $fields[0];
@@ -537,7 +533,7 @@ class EntityReferenceAdminTest extends WebTestBase {
    *   An array of option values as strings.
    */
   protected function getAllOptionsList(\SimpleXMLElement $element) {
-    $options = array();
+    $options = [];
     // Add all options items.
     foreach ($element->option as $option) {
       $options[] = (string) $option['value'];
diff --git a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php b/web/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php
index 6aef0f828..19575840f 100644
--- a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php
+++ b/web/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php
@@ -14,7 +14,7 @@ use Drupal\field\Entity\FieldStorageConfig;
  */
 class EntityReferenceFileUploadTest extends WebTestBase {
 
-  public static $modules = array('entity_reference', 'node', 'file');
+  public static $modules = ['entity_reference', 'node', 'file'];
 
   /**
    * The name of a content type that will reference $referencedType.
@@ -46,19 +46,19 @@ class EntityReferenceFileUploadTest extends WebTestBase {
 
     $referenced = $this->drupalCreateContentType();
     $this->referencedType = $referenced->id();
-    $this->nodeId = $this->drupalCreateNode(array('type' => $referenced->id()))->id();
+    $this->nodeId = $this->drupalCreateNode(['type' => $referenced->id()])->id();
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'test_field',
       'entity_type' => 'node',
       'translatable' => FALSE,
-      'entity_types' => array(),
-      'settings' => array(
+      'entity_types' => [],
+      'settings' => [
         'target_type' => 'node',
-      ),
+      ],
       'type' => 'entity_reference',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ))->save();
+    ])->save();
 
     FieldConfig::create([
       'label' => 'Entity reference field',
@@ -66,25 +66,25 @@ class EntityReferenceFileUploadTest extends WebTestBase {
       'entity_type' => 'node',
       'required' => TRUE,
       'bundle' => $referencing->id(),
-      'settings' => array(
+      'settings' => [
         'handler' => 'default',
-        'handler_settings' => array(
+        'handler_settings' => [
           // Reference a single vocabulary.
-          'target_bundles' => array(
+          'target_bundles' => [
             $referenced->id(),
-          ),
-        ),
-      ),
+          ],
+        ],
+      ],
     ])->save();
 
 
     // Create a file field.
     $file_field_name = 'file_field';
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $file_field_name,
       'entity_type' => 'node',
       'type' => 'file'
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'entity_type' => 'node',
@@ -98,12 +98,12 @@ class EntityReferenceFileUploadTest extends WebTestBase {
       ->setComponent($file_field_name)
       ->save();
     entity_get_form_display('node', $referencing->id(), 'default')
-      ->setComponent('test_field', array(
+      ->setComponent('test_field', [
         'type' => 'entity_reference_autocomplete',
-      ))
-      ->setComponent($file_field_name, array(
+      ])
+      ->setComponent($file_field_name, [
          'type' => 'file_generic',
-      ))
+      ])
       ->save();
   }
 
@@ -111,17 +111,17 @@ class EntityReferenceFileUploadTest extends WebTestBase {
    * Tests that the autocomplete input element does not cause ajax fatal.
    */
   public function testFileUpload() {
-    $user1 = $this->drupalCreateUser(array('access content', "create $this->referencingType content"));
+    $user1 = $this->drupalCreateUser(['access content', "create $this->referencingType content"]);
     $this->drupalLogin($user1);
 
     $test_file = current($this->drupalGetTestFiles('text'));
     $edit['files[file_field_0]'] = drupal_realpath($test_file->uri);
     $this->drupalPostForm('node/add/' . $this->referencingType, $edit, 'Upload');
     $this->assertResponse(200);
-    $edit = array(
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
       'test_field[0][target_id]' => $this->nodeId,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Save');
     $this->assertResponse(200);
   }
diff --git a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceTestTrait.php b/web/core/modules/field/src/Tests/EntityReference/EntityReferenceTestTrait.php
index 13e28da70..568cd4d5f 100644
--- a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceTestTrait.php
+++ b/web/core/modules/field/src/Tests/EntityReference/EntityReferenceTestTrait.php
@@ -34,30 +34,30 @@ trait EntityReferenceTestTrait {
    *
    * @see \Drupal\Core\Entity\Plugin\EntityReferenceSelection\SelectionBase::buildConfigurationForm()
    */
-  protected function createEntityReferenceField($entity_type, $bundle, $field_name, $field_label, $target_entity_type, $selection_handler = 'default', $selection_handler_settings = array(), $cardinality = 1) {
+  protected function createEntityReferenceField($entity_type, $bundle, $field_name, $field_label, $target_entity_type, $selection_handler = 'default', $selection_handler_settings = [], $cardinality = 1) {
     // Look for or add the specified field to the requested entity bundle.
     if (!FieldStorageConfig::loadByName($entity_type, $field_name)) {
-      FieldStorageConfig::create(array(
+      FieldStorageConfig::create([
         'field_name' => $field_name,
         'type' => 'entity_reference',
         'entity_type' => $entity_type,
         'cardinality' => $cardinality,
-        'settings' => array(
+        'settings' => [
           'target_type' => $target_entity_type,
-        ),
-      ))->save();
+        ],
+      ])->save();
     }
     if (!FieldConfig::loadByName($entity_type, $bundle, $field_name)) {
-      FieldConfig::create(array(
+      FieldConfig::create([
         'field_name' => $field_name,
         'entity_type' => $entity_type,
         'bundle' => $bundle,
         'label' => $field_label,
-        'settings' => array(
+        'settings' => [
           'handler' => $selection_handler,
           'handler_settings' => $selection_handler_settings,
-        ),
-      ))->save();
+        ],
+      ])->save();
     }
   }
 
diff --git a/web/core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php b/web/core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php
index e7f5a4c54..b6926ce7e 100644
--- a/web/core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php
+++ b/web/core/modules/field/src/Tests/FieldDefaultValueCallbackTest.php
@@ -18,7 +18,7 @@ class FieldDefaultValueCallbackTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field_test', 'field_ui');
+  public static $modules = ['node', 'field_test', 'field_ui'];
 
   /**
    * The field name.
@@ -37,10 +37,10 @@ class FieldDefaultValueCallbackTest extends WebTestBase {
 
     // Create Article node types.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array(
+      $this->drupalCreateContentType([
         'type' => 'article',
         'name' => 'Article',
-      ));
+      ]);
     }
 
   }
diff --git a/web/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php b/web/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
index e69e04f8c..e35308603 100644
--- a/web/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
+++ b/web/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
@@ -22,12 +22,12 @@ class FieldImportDeleteUninstallUiTest extends FieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('entity_test', 'telephone', 'config', 'filter', 'datetime');
+  public static $modules = ['entity_test', 'telephone', 'config', 'filter', 'datetime'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalLogin($this->drupalCreateUser(array('synchronize configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['synchronize configuration']));
   }
 
   /**
@@ -35,11 +35,11 @@ class FieldImportDeleteUninstallUiTest extends FieldTestBase {
    */
   public function testImportDeleteUninstall() {
     // Create a telephone field.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_tel',
       'entity_type' => 'entity_test',
       'type' => 'telephone',
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -47,11 +47,11 @@ class FieldImportDeleteUninstallUiTest extends FieldTestBase {
     ])->save();
 
     // Create a text field.
-    $date_field_storage = FieldStorageConfig::create(array(
+    $date_field_storage = FieldStorageConfig::create([
       'field_name' => 'field_date',
       'entity_type' => 'entity_test',
       'type' => 'datetime',
-    ));
+    ]);
     $date_field_storage->save();
     FieldConfig::create([
       'field_storage' => $date_field_storage,
@@ -104,12 +104,12 @@ class FieldImportDeleteUninstallUiTest extends FieldTestBase {
 
     // This will purge all the data, delete the field and uninstall the
     // Telephone and Text modules.
-    $this->drupalPostForm(NULL, array(), t('Import all'));
+    $this->drupalPostForm(NULL, [], t('Import all'));
     $this->assertNoText('Field data will be deleted by this synchronization.');
     $this->rebuildContainer();
     $this->assertFalse(\Drupal::moduleHandler()->moduleExists('telephone'));
     $this->assertFalse(\Drupal::entityManager()->loadEntityByUuid('field_storage_config', $field_storage->uuid()), 'The telephone field has been deleted by the configuration synchronization');
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: [];
     $this->assertFalse(isset($deleted_storages[$field_storage->uuid()]), 'Telephone field has been completed removed from the system.');
     $this->assertFalse(isset($deleted_storages[$field_storage->uuid()]), 'Text field has been completed removed from the system.');
   }
diff --git a/web/core/modules/field/src/Tests/FieldTestBase.php b/web/core/modules/field/src/Tests/FieldTestBase.php
index 4fe944f9e..57225cb34 100644
--- a/web/core/modules/field/src/Tests/FieldTestBase.php
+++ b/web/core/modules/field/src/Tests/FieldTestBase.php
@@ -8,6 +8,9 @@ use Drupal\simpletest\WebTestBase;
 
 /**
  * Parent class for Field API tests.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\field\Functional\FieldTestBase instead.
  */
 abstract class FieldTestBase extends WebTestBase {
 
@@ -19,8 +22,8 @@ abstract class FieldTestBase extends WebTestBase {
    * @return
    *   An array of random values, in the format expected for field values.
    */
-  function _generateTestFieldValues($cardinality) {
-    $values = array();
+  public function _generateTestFieldValues($cardinality) {
+    $values = [];
     for ($i = 0; $i < $cardinality; $i++) {
       // field_test fields treat 0 as 'empty value'.
       $values[$i]['value'] = mt_rand(1, 127);
@@ -45,7 +48,7 @@ abstract class FieldTestBase extends WebTestBase {
    * @param $column
    *   (Optional) The name of the column to check. Defaults to 'value'.
    */
-  function assertFieldValues(EntityInterface $entity, $field_name, $expected_values, $langcode = LanguageInterface::LANGCODE_DEFAULT, $column = 'value') {
+  public function assertFieldValues(EntityInterface $entity, $field_name, $expected_values, $langcode = LanguageInterface::LANGCODE_DEFAULT, $column = 'value') {
     // Re-load the entity to make sure we have the latest changes.
     $storage = $this->container->get('entity_type.manager')
       ->getStorage($entity->getEntityTypeId());
@@ -58,7 +61,7 @@ abstract class FieldTestBase extends WebTestBase {
     $values = $field->getValue();
     $this->assertEqual(count($values), count($expected_values), 'Expected number of values were saved.');
     foreach ($expected_values as $key => $value) {
-      $this->assertEqual($values[$key][$column], $value, format_string('Value @value was saved correctly.', array('@value' => $value)));
+      $this->assertEqual($values[$key][$column], $value, format_string('Value @value was saved correctly.', ['@value' => $value]));
     }
   }
 
diff --git a/web/core/modules/field/src/Tests/FormTest.php b/web/core/modules/field/src/Tests/FormTest.php
index 0a3f9affd..ff1b3ee67 100644
--- a/web/core/modules/field/src/Tests/FormTest.php
+++ b/web/core/modules/field/src/Tests/FormTest.php
@@ -25,7 +25,7 @@ class FormTest extends FieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field_test', 'options', 'entity_test', 'locale');
+  public static $modules = ['node', 'field_test', 'options', 'entity_test', 'locale'];
 
   /**
    * An array of values defining a field single.
@@ -58,40 +58,40 @@ class FormTest extends FieldTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $web_user = $this->drupalCreateUser(array('view test entity', 'administer entity_test content'));
+    $web_user = $this->drupalCreateUser(['view test entity', 'administer entity_test content']);
     $this->drupalLogin($web_user);
 
-    $this->fieldStorageSingle = array(
+    $this->fieldStorageSingle = [
       'field_name' => 'field_single',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
-    );
-    $this->fieldStorageMultiple = array(
+    ];
+    $this->fieldStorageMultiple = [
       'field_name' => 'field_multiple',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
       'cardinality' => 4,
-    );
-    $this->fieldStorageUnlimited = array(
+    ];
+    $this->fieldStorageUnlimited = [
       'field_name' => 'field_unlimited',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    );
+    ];
 
-    $this->field = array(
+    $this->field = [
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
       'label' => $this->randomMachineName() . '_label',
       'description' => '[site:name]_description',
       'weight' => mt_rand(0, 127),
-      'settings' => array(
+      'settings' => [
         'test_field_setting' => $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
   }
 
-  function testFieldFormSingle() {
+  public function testFieldFormSingle() {
     $field_storage = $this->fieldStorageSingle;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
@@ -115,22 +115,22 @@ class FormTest extends FieldTestBase {
     $this->assertNoText('From hook_field_widget_form_alter(): Default form is true.', 'Not default value form in hook_field_widget_form_alter().');
 
     // Submit with invalid value (field-level validation).
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => -1
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertRaw(t('%name does not accept the value -1.', array('%name' => $this->field['label'])), 'Field validation fails with invalid input.');
+    $this->assertRaw(t('%name does not accept the value -1.', ['%name' => $this->field['label']]), 'Field validation fails with invalid input.');
     // TODO : check that the correct field is flagged for error.
 
     // Create an entity
     $value = mt_rand(1, 127);
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
     $entity = EntityTest::load($id);
     $this->assertEqual($entity->{$field_name}->value, $value, 'Field value was saved');
 
@@ -141,23 +141,23 @@ class FormTest extends FieldTestBase {
 
     // Update the entity.
     $value = mt_rand(1, 127);
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText(t('entity_test @id has been updated.', array('@id' => $id)), 'Entity was updated');
-    $this->container->get('entity.manager')->getStorage('entity_test')->resetCache(array($id));
+    $this->assertText(t('entity_test @id has been updated.', ['@id' => $id]), 'Entity was updated');
+    $this->container->get('entity.manager')->getStorage('entity_test')->resetCache([$id]);
     $entity = EntityTest::load($id);
     $this->assertEqual($entity->{$field_name}->value, $value, 'Field value was updated');
 
     // Empty the field.
     $value = '';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value
-    );
+    ];
     $this->drupalPostForm('entity_test/manage/' . $id . '/edit', $edit, t('Save'));
-    $this->assertText(t('entity_test @id has been updated.', array('@id' => $id)), 'Entity was updated');
-    $this->container->get('entity.manager')->getStorage('entity_test')->resetCache(array($id));
+    $this->assertText(t('entity_test @id has been updated.', ['@id' => $id]), 'Entity was updated');
+    $this->container->get('entity.manager')->getStorage('entity_test')->resetCache([$id]);
     $entity = EntityTest::load($id);
     $this->assertTrue($entity->{$field_name}->isEmpty(), 'Field was emptied');
   }
@@ -165,12 +165,12 @@ class FormTest extends FieldTestBase {
   /**
    * Tests field widget default values on entity forms.
    */
-  function testFieldFormDefaultValue() {
+  public function testFieldFormDefaultValue() {
     $field_storage = $this->fieldStorageSingle;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
     $default = rand(1, 127);
-    $this->field['default_value'] = array(array('value' => $default));
+    $this->field['default_value'] = [['value' => $default]];
     FieldStorageConfig::create($field_storage)->save();
     FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
@@ -183,18 +183,18 @@ class FormTest extends FieldTestBase {
     $this->assertFieldByXpath("//input[@name='{$field_name}[0][value]' and @value='$default']");
 
     // Try to submit an empty value.
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => '',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created.');
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created.');
     $entity = EntityTest::load($id);
     $this->assertTrue($entity->{$field_name}->isEmpty(), 'Field is now empty.');
   }
 
-  function testFieldFormSingleRequired() {
+  public function testFieldFormSingleRequired() {
     $field_storage = $this->fieldStorageSingle;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
@@ -206,32 +206,32 @@ class FormTest extends FieldTestBase {
       ->save();
 
     // Submit with missing required value.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('entity_test/add', $edit, t('Save'));
-    $this->assertRaw(t('@name field is required.', array('@name' => $this->field['label'])), 'Required field with no value fails validation');
+    $this->assertRaw(t('@name field is required.', ['@name' => $this->field['label']]), 'Required field with no value fails validation');
 
     // Create an entity
     $value = mt_rand(1, 127);
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
     $entity = EntityTest::load($id);
     $this->assertEqual($entity->{$field_name}->value, $value, 'Field value was saved');
 
     // Edit with missing required value.
     $value = '';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value,
-    );
+    ];
     $this->drupalPostForm('entity_test/manage/' . $id . '/edit', $edit, t('Save'));
-    $this->assertRaw(t('@name field is required.', array('@name' => $this->field['label'])), 'Required field with no value fails validation');
+    $this->assertRaw(t('@name field is required.', ['@name' => $this->field['label']]), 'Required field with no value fails validation');
   }
 
-  function testFieldFormUnlimited() {
+  public function testFieldFormUnlimited() {
     $field_storage = $this->fieldStorageUnlimited;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
@@ -251,20 +251,20 @@ class FormTest extends FieldTestBase {
     $this->assertTrue(isset($elements[0]), t('aria-describedby attribute is properly placed on multiple value widgets.'));
 
     // Press 'add more' button -> 2 widgets.
-    $this->drupalPostForm(NULL, array(), t('Add another item'));
+    $this->drupalPostForm(NULL, [], t('Add another item'));
     $this->assertFieldByName("{$field_name}[0][value]", '', 'Widget 1 is displayed');
     $this->assertFieldByName("{$field_name}[1][value]", '', 'New widget is displayed');
     $this->assertNoField("{$field_name}[2][value]", 'No extraneous widget is displayed');
     // TODO : check that non-field inputs are preserved ('title'), etc.
 
     // Yet another time so that we can play with more values -> 3 widgets.
-    $this->drupalPostForm(NULL, array(), t('Add another item'));
+    $this->drupalPostForm(NULL, [], t('Add another item'));
 
     // Prepare values and weights.
     $count = 3;
     $delta_range = $count - 1;
-    $values = $weights = $pattern = $expected_values = array();
-    $edit = array();
+    $values = $weights = $pattern = $expected_values = [];
+    $edit = [];
     for ($delta = 0; $delta <= $delta_range; $delta++) {
       // Assign unique random values and weights.
       do {
@@ -299,7 +299,7 @@ class FormTest extends FieldTestBase {
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
     $entity = EntityTest::load($id);
     ksort($field_values);
     $field_values = array_values($field_values);
@@ -330,18 +330,18 @@ class FormTest extends FieldTestBase {
     // Display creation form -> 1 widget.
     $this->drupalGet('entity_test/add');
     // Check that the Required symbol is present for the multifield label.
-    $element = $this->xpath('//h4[contains(@class, "label") and contains(@class, "js-form-required") and contains(text(), :value)]', array(':value' => $this->field['label']));
+    $element = $this->xpath('//h4[contains(@class, "label") and contains(@class, "js-form-required") and contains(text(), :value)]', [':value' => $this->field['label']]);
     $this->assertTrue(isset($element[0]), 'Required symbol added field label.');
     // Check that the label of the field input is visually hidden and contains
     // the field title and an indication of the delta for a11y.
-    $element = $this->xpath('//label[@for=:for and contains(@class, "visually-hidden") and contains(text(), :value)]', array(':for' => 'edit-field-unlimited-0-value', ':value' => $this->field['label'] . ' (value 1)'));
+    $element = $this->xpath('//label[@for=:for and contains(@class, "visually-hidden") and contains(text(), :value)]', [':for' => 'edit-field-unlimited-0-value', ':value' => $this->field['label'] . ' (value 1)']);
     $this->assertTrue(isset($element[0]), 'Required symbol not added for field input.');
   }
 
   /**
    * Tests widget handling of multiple required radios.
    */
-  function testFieldFormMultivalueWithRequiredRadio() {
+  public function testFieldFormMultivalueWithRequiredRadio() {
     // Create a multivalue test field.
     $field_storage = $this->fieldStorageUnlimited;
     $field_name = $field_storage['field_name'];
@@ -353,32 +353,32 @@ class FormTest extends FieldTestBase {
       ->save();
 
     // Add a required radio field.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'required_radio_test',
       'entity_type' => 'entity_test',
       'type' => 'list_string',
-      'settings' => array(
-        'allowed_values' => array('yes' => 'yes', 'no' => 'no'),
-      ),
-    ))->save();
-    $field = array(
+      'settings' => [
+        'allowed_values' => ['yes' => 'yes', 'no' => 'no'],
+      ],
+    ])->save();
+    $field = [
       'field_name' => 'required_radio_test',
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
       'required' => TRUE,
-    );
+    ];
     FieldConfig::create($field)->save();
     entity_get_form_display($field['entity_type'], $field['bundle'], 'default')
-      ->setComponent($field['field_name'], array(
+      ->setComponent($field['field_name'], [
         'type' => 'options_buttons',
-      ))
+      ])
       ->save();
 
     // Display creation form.
     $this->drupalGet('entity_test/add');
 
     // Press the 'Add more' button.
-    $this->drupalPostForm(NULL, array(), t('Add another item'));
+    $this->drupalPostForm(NULL, [], t('Add another item'));
 
     // Verify that no error is thrown by the radio element.
     $this->assertNoFieldByXpath('//div[contains(@class, "error")]', FALSE, 'No error message is displayed.');
@@ -389,7 +389,7 @@ class FormTest extends FieldTestBase {
     $this->assertNoField("{$field_name}[2][value]", 'No extraneous widget is displayed');
   }
 
-  function testFieldFormJSAddMore() {
+  public function testFieldFormJSAddMore() {
     $field_storage = $this->fieldStorageUnlimited;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
@@ -405,13 +405,13 @@ class FormTest extends FieldTestBase {
     // Press 'add more' button a couple times -> 3 widgets.
     // drupalPostAjaxForm() will not work iteratively, so we add those through
     // non-JS submission.
-    $this->drupalPostForm(NULL, array(), t('Add another item'));
-    $this->drupalPostForm(NULL, array(), t('Add another item'));
+    $this->drupalPostForm(NULL, [], t('Add another item'));
+    $this->drupalPostForm(NULL, [], t('Add another item'));
 
     // Prepare values and weights.
     $count = 3;
     $delta_range = $count - 1;
-    $values = $weights = $pattern = $expected_values = $edit = array();
+    $values = $weights = $pattern = $expected_values = $edit = [];
     for ($delta = 0; $delta <= $delta_range; $delta++) {
       // Assign unique random values and weights.
       do {
@@ -448,7 +448,7 @@ class FormTest extends FieldTestBase {
   /**
    * Tests widgets handling multiple values.
    */
-  function testFieldFormMultipleWidget() {
+  public function testFieldFormMultipleWidget() {
     // Create a field with fixed cardinality, configure the form to use a
     // "multiple" widget.
     $field_storage = $this->fieldStorageMultiple;
@@ -457,9 +457,9 @@ class FormTest extends FieldTestBase {
     FieldStorageConfig::create($field_storage)->save();
     FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'test_field_widget_multiple',
-      ))
+      ])
       ->save();
 
     // Display creation form.
@@ -467,33 +467,33 @@ class FormTest extends FieldTestBase {
     $this->assertFieldByName($field_name, '', 'Widget is displayed.');
 
     // Create entity with three values.
-    $edit = array(
+    $edit = [
       $field_name => '1, 2, 3',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
 
     // Check that the values were saved.
     $entity_init = EntityTest::load($id);
-    $this->assertFieldValues($entity_init, $field_name, array(1, 2, 3));
+    $this->assertFieldValues($entity_init, $field_name, [1, 2, 3]);
 
     // Display the form, check that the values are correctly filled in.
     $this->drupalGet('entity_test/manage/' . $id . '/edit');
     $this->assertFieldByName($field_name, '1, 2, 3', 'Widget is displayed.');
 
     // Submit the form with more values than the field accepts.
-    $edit = array($field_name => '1, 2, 3, 4, 5');
+    $edit = [$field_name => '1, 2, 3, 4, 5'];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertRaw('this field cannot hold more than 4 values', 'Form validation failed.');
     // Check that the field values were not submitted.
-    $this->assertFieldValues($entity_init, $field_name, array(1, 2, 3));
+    $this->assertFieldValues($entity_init, $field_name, [1, 2, 3]);
   }
 
   /**
    * Tests fields with no 'edit' access.
    */
-  function testFieldFormAccess() {
+  public function testFieldFormAccess() {
     $entity_type = 'entity_test_rev';
     // Create a "regular" field.
     $field_storage = $this->fieldStorageSingle;
@@ -511,18 +511,18 @@ class FormTest extends FieldTestBase {
 
     // Create a field with no edit access. See
     // field_test_entity_field_access().
-    $field_storage_no_access = array(
+    $field_storage_no_access = [
       'field_name' => 'field_no_edit_access',
       'entity_type' => $entity_type,
       'type' => 'test_field',
-    );
+    ];
     $field_name_no_access = $field_storage_no_access['field_name'];
-    $field_no_access = array(
+    $field_no_access = [
       'field_name' => $field_name_no_access,
       'entity_type' => $entity_type,
       'bundle' => $entity_type,
-      'default_value' => array(0 => array('value' => 99)),
-    );
+      'default_value' => [0 => ['value' => 99]],
+    ];
     FieldStorageConfig::create($field_storage_no_access)->save();
     FieldConfig::create($field_no_access)->save();
     entity_get_form_display($field_no_access['entity_type'], $field_no_access['bundle'], 'default')
@@ -533,10 +533,10 @@ class FormTest extends FieldTestBase {
     // apart from #access.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('id' => 0, 'revision_id' => 0));
+      ->create(['id' => 0, 'revision_id' => 0]);
 
     $display = entity_get_form_display($entity_type, $entity_type, 'default');
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $display->buildForm($entity, $form, $form_state);
 
@@ -547,9 +547,9 @@ class FormTest extends FieldTestBase {
     $this->assertNoFieldByName("{$field_name_no_access}[0][value]", '', 'Widget is not displayed if field access is denied.');
 
     // Create entity.
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => 1,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match("|$entity_type/manage/(\d+)|", $this->url, $match);
     $id = $match[1];
@@ -562,10 +562,10 @@ class FormTest extends FieldTestBase {
     $this->assertEqual($entity->$field_name->value, 1, 'Entered value vas saved for the field with edit access.');
 
     // Create a new revision.
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => 2,
       'revision' => TRUE,
-    );
+    ];
     $this->drupalPostForm($entity_type . '/manage/' . $id . '/edit', $edit, t('Save'));
 
     // Check that the new revision has the expected values.
@@ -575,7 +575,9 @@ class FormTest extends FieldTestBase {
     $this->assertEqual($entity->$field_name->value, 2, 'New revision has the expected value for the field with edit access.');
 
     // Check that the revision is also saved in the revisions table.
-    // $entity = entity_revision_load($entity_type, $entity->getRevisionId());
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->loadRevision($entity->getRevisionId());
     $this->assertEqual($entity->$field_name_no_access->value, 99, 'New revision has the expected value for the field with no edit access.');
     $this->assertEqual($entity->$field_name->value, 2, 'New revision has the expected value for the field with edit access.');
   }
@@ -583,13 +585,13 @@ class FormTest extends FieldTestBase {
   /**
    * Tests hiding a field in a form.
    */
-  function testHiddenField() {
+  public function testHiddenField() {
     $entity_type = 'entity_test_rev';
     $field_storage = $this->fieldStorageSingle;
     $field_storage['entity_type'] = $entity_type;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
-    $this->field['default_value'] = array(0 => array('value' => 99));
+    $this->field['default_value'] = [0 => ['value' => 99]];
     $this->field['entity_type'] = $entity_type;
     $this->field['bundle'] = $entity_type;
     FieldStorageConfig::create($field_storage)->save();
@@ -604,10 +606,10 @@ class FormTest extends FieldTestBase {
     // Create an entity and test that the default value is assigned correctly to
     // the field that uses the hidden widget.
     $this->assertNoField("{$field_name}[0][value]", 'The field does not appear in the form');
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     preg_match('|' . $entity_type . '/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test_rev @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertText(t('entity_test_rev @id has been created.', ['@id' => $id]), 'Entity was created');
     $storage = $this->container->get('entity_type.manager')
       ->getStorage($entity_type);
 
@@ -616,12 +618,12 @@ class FormTest extends FieldTestBase {
 
     // Update the field to remove the default value, and switch to the default
     // widget.
-    $this->field->setDefaultValue(array());
+    $this->field->setDefaultValue([]);
     $this->field->save();
     entity_get_form_display($entity_type, $this->field->getTargetBundle(), 'default')
-      ->setComponent($this->field->getName(), array(
+      ->setComponent($this->field->getName(), [
         'type' => 'test_field_widget',
-      ))
+      ])
       ->save();
 
     // Display edit form.
@@ -630,9 +632,9 @@ class FormTest extends FieldTestBase {
 
     // Update the entity.
     $value = mt_rand(1, 127);
-    $edit = array("{$field_name}[0][value]" => $value);
+    $edit = ["{$field_name}[0][value]" => $value];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText(t('entity_test_rev @id has been updated.', array('@id' => $id)), 'Entity was updated');
+    $this->assertText(t('entity_test_rev @id has been updated.', ['@id' => $id]), 'Entity was updated');
     $storage->resetCache([$id]);
     $entity = $storage->load($id);
     $this->assertEqual($entity->{$field_name}->value, $value, 'Field value was updated');
@@ -643,11 +645,11 @@ class FormTest extends FieldTestBase {
       ->save();
 
     // Create a new revision.
-    $edit = array('revision' => TRUE);
+    $edit = ['revision' => TRUE];
     $this->drupalPostForm($entity_type . '/manage/' . $id . '/edit', $edit, t('Save'));
 
     // Check that the expected value has been carried over to the new revision.
-    $storage->resetCache(array($id));
+    $storage->resetCache([$id]);
     $entity = $storage->load($id);
     $this->assertEqual($entity->{$field_name}->value, $value, 'New revision has the expected value for the field with the Hidden widget');
   }
diff --git a/web/core/modules/field/src/Tests/NestedFormTest.php b/web/core/modules/field/src/Tests/NestedFormTest.php
index 8b3402d58..e9b5f0540 100644
--- a/web/core/modules/field/src/Tests/NestedFormTest.php
+++ b/web/core/modules/field/src/Tests/NestedFormTest.php
@@ -17,42 +17,42 @@ class NestedFormTest extends FieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_test', 'entity_test');
+  public static $modules = ['field_test', 'entity_test'];
 
   protected function setUp() {
     parent::setUp();
 
-    $web_user = $this->drupalCreateUser(array('view test entity', 'administer entity_test content'));
+    $web_user = $this->drupalCreateUser(['view test entity', 'administer entity_test content']);
     $this->drupalLogin($web_user);
 
-    $this->fieldStorageSingle = array(
+    $this->fieldStorageSingle = [
       'field_name' => 'field_single',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
-    );
-    $this->fieldStorageUnlimited = array(
+    ];
+    $this->fieldStorageUnlimited = [
       'field_name' => 'field_unlimited',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    );
+    ];
 
-    $this->field = array(
+    $this->field = [
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
       'label' => $this->randomMachineName() . '_label',
       'description' => '[site:name]_description',
       'weight' => mt_rand(0, 127),
-      'settings' => array(
+      'settings' => [
         'test_field_setting' => $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
    * Tests Field API form integration within a subform.
    */
-  function testNestedFieldForm() {
+  public function testNestedFieldForm() {
     // Add two fields on the 'entity_test'
     FieldStorageConfig::create($this->fieldStorageSingle)->save();
     FieldStorageConfig::create($this->fieldStorageUnlimited)->save();
@@ -80,7 +80,7 @@ class NestedFormTest extends FieldTestBase {
     $entity_1->field_unlimited->value = 1;
     $entity_1->save();
 
-    $entity_2 = $storage->create(array('id' => 2));
+    $entity_2 = $storage->create(['id' => 2]);
     $entity_2->enforceIsNew();
     $entity_2->field_single->value = 10;
     $entity_2->field_unlimited->value = 11;
@@ -94,75 +94,75 @@ class NestedFormTest extends FieldTestBase {
     $this->assertFieldByName('entity_2[field_unlimited][0][value]', 11, 'Entity 2: field_unlimited value 0 appears correctly is the form.');
 
     // Submit the form and check that the entities are updated accordingly.
-    $edit = array(
+    $edit = [
       'field_single[0][value]' => 1,
       'field_unlimited[0][value]' => 2,
       'field_unlimited[1][value]' => 3,
       'entity_2[field_single][0][value]' => 11,
       'entity_2[field_unlimited][0][value]' => 12,
       'entity_2[field_unlimited][1][value]' => 13,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $entity_1 = $storage->load(1);
     $entity_2 = $storage->load(2);
-    $this->assertFieldValues($entity_1, 'field_single', array(1));
-    $this->assertFieldValues($entity_1, 'field_unlimited', array(2, 3));
-    $this->assertFieldValues($entity_2, 'field_single', array(11));
-    $this->assertFieldValues($entity_2, 'field_unlimited', array(12, 13));
+    $this->assertFieldValues($entity_1, 'field_single', [1]);
+    $this->assertFieldValues($entity_1, 'field_unlimited', [2, 3]);
+    $this->assertFieldValues($entity_2, 'field_single', [11]);
+    $this->assertFieldValues($entity_2, 'field_unlimited', [12, 13]);
 
     // Submit invalid values and check that errors are reported on the
     // correct widgets.
-    $edit = array(
+    $edit = [
       'field_unlimited[1][value]' => -1,
-    );
+    ];
     $this->drupalPostForm('test-entity/nested/1/2', $edit, t('Save'));
-    $this->assertRaw(t('%label does not accept the value -1', array('%label' => 'Unlimited field')), 'Entity 1: the field validation error was reported.');
-    $error_field = $this->xpath('//input[@id=:id and contains(@class, "error")]', array(':id' => 'edit-field-unlimited-1-value'));
+    $this->assertRaw(t('%label does not accept the value -1', ['%label' => 'Unlimited field']), 'Entity 1: the field validation error was reported.');
+    $error_field = $this->xpath('//input[@id=:id and contains(@class, "error")]', [':id' => 'edit-field-unlimited-1-value']);
     $this->assertTrue($error_field, 'Entity 1: the error was flagged on the correct element.');
-    $edit = array(
+    $edit = [
       'entity_2[field_unlimited][1][value]' => -1,
-    );
+    ];
     $this->drupalPostForm('test-entity/nested/1/2', $edit, t('Save'));
-    $this->assertRaw(t('%label does not accept the value -1', array('%label' => 'Unlimited field')), 'Entity 2: the field validation error was reported.');
-    $error_field = $this->xpath('//input[@id=:id and contains(@class, "error")]', array(':id' => 'edit-entity-2-field-unlimited-1-value'));
+    $this->assertRaw(t('%label does not accept the value -1', ['%label' => 'Unlimited field']), 'Entity 2: the field validation error was reported.');
+    $error_field = $this->xpath('//input[@id=:id and contains(@class, "error")]', [':id' => 'edit-entity-2-field-unlimited-1-value']);
     $this->assertTrue($error_field, 'Entity 2: the error was flagged on the correct element.');
 
     // Test that reordering works on both entities.
-    $edit = array(
+    $edit = [
       'field_unlimited[0][_weight]' => 0,
       'field_unlimited[1][_weight]' => -1,
       'entity_2[field_unlimited][0][_weight]' => 0,
       'entity_2[field_unlimited][1][_weight]' => -1,
-    );
+    ];
     $this->drupalPostForm('test-entity/nested/1/2', $edit, t('Save'));
-    $this->assertFieldValues($entity_1, 'field_unlimited', array(3, 2));
-    $this->assertFieldValues($entity_2, 'field_unlimited', array(13, 12));
+    $this->assertFieldValues($entity_1, 'field_unlimited', [3, 2]);
+    $this->assertFieldValues($entity_2, 'field_unlimited', [13, 12]);
 
     // Test the 'add more' buttons. Only Ajax submission is tested, because
     // the two 'add more' buttons present in the form have the same #value,
     // which confuses drupalPostForm().
     // 'Add more' button in the first entity:
     $this->drupalGet('test-entity/nested/1/2');
-    $this->drupalPostAjaxForm(NULL, array(), 'field_unlimited_add_more');
+    $this->drupalPostAjaxForm(NULL, [], 'field_unlimited_add_more');
     $this->assertFieldByName('field_unlimited[0][value]', 3, 'Entity 1: field_unlimited value 0 appears correctly is the form.');
     $this->assertFieldByName('field_unlimited[1][value]', 2, 'Entity 1: field_unlimited value 1 appears correctly is the form.');
     $this->assertFieldByName('field_unlimited[2][value]', '', 'Entity 1: field_unlimited value 2 appears correctly is the form.');
     $this->assertFieldByName('field_unlimited[3][value]', '', 'Entity 1: an empty widget was added for field_unlimited value 3.');
     // 'Add more' button in the first entity (changing field values):
-    $edit = array(
+    $edit = [
       'entity_2[field_unlimited][0][value]' => 13,
       'entity_2[field_unlimited][1][value]' => 14,
       'entity_2[field_unlimited][2][value]' => 15,
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, 'entity_2_field_unlimited_add_more');
     $this->assertFieldByName('entity_2[field_unlimited][0][value]', 13, 'Entity 2: field_unlimited value 0 appears correctly is the form.');
     $this->assertFieldByName('entity_2[field_unlimited][1][value]', 14, 'Entity 2: field_unlimited value 1 appears correctly is the form.');
     $this->assertFieldByName('entity_2[field_unlimited][2][value]', 15, 'Entity 2: field_unlimited value 2 appears correctly is the form.');
     $this->assertFieldByName('entity_2[field_unlimited][3][value]', '', 'Entity 2: an empty widget was added for field_unlimited value 3.');
     // Save the form and check values are saved correctly.
-    $this->drupalPostForm(NULL, array(), t('Save'));
-    $this->assertFieldValues($entity_1, 'field_unlimited', array(3, 2));
-    $this->assertFieldValues($entity_2, 'field_unlimited', array(13, 14, 15));
+    $this->drupalPostForm(NULL, [], t('Save'));
+    $this->assertFieldValues($entity_1, 'field_unlimited', [3, 2]);
+    $this->assertFieldValues($entity_2, 'field_unlimited', [13, 14, 15]);
   }
 
   /**
diff --git a/web/core/modules/field/src/Tests/Number/NumberFieldTest.php b/web/core/modules/field/src/Tests/Number/NumberFieldTest.php
index 14777ec34..c69141050 100644
--- a/web/core/modules/field/src/Tests/Number/NumberFieldTest.php
+++ b/web/core/modules/field/src/Tests/Number/NumberFieldTest.php
@@ -20,11 +20,11 @@ class NumberFieldTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'entity_test', 'field_ui');
+  public static $modules = ['node', 'entity_test', 'field_ui'];
 
   protected function setUp() {
     parent::setUp();
-    $this->drupalLogin($this->drupalCreateUser(array(
+    $this->drupalLogin($this->drupalCreateUser([
       'view test entity',
       'administer entity_test content',
       'administer content types',
@@ -32,23 +32,23 @@ class NumberFieldTest extends WebTestBase {
       'administer node display',
       'bypass node access',
       'administer entity_test fields',
-    )));
+    ]));
   }
 
   /**
    * Test decimal field.
    */
-  function testNumberDecimalField() {
+  public function testNumberDecimalField() {
     // Create a field with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'decimal',
-      'settings' => array(
+      'settings' => [
         'precision' => 8, 'scale' => 4,
-      )
-    ))->save();
+      ]
+    ])->save();
     FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
@@ -56,17 +56,17 @@ class NumberFieldTest extends WebTestBase {
     ])->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'number',
-        'settings' => array(
+        'settings' => [
           'placeholder' => '0.00'
-        ),
-      ))
+        ],
+      ])
       ->save();
     entity_get_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'number_decimal',
-      ))
+      ])
       ->save();
 
     // Display creation form.
@@ -76,107 +76,107 @@ class NumberFieldTest extends WebTestBase {
 
     // Submit a signed decimal value within the allowed precision and scale.
     $value = '-1234.5678';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
     $this->assertRaw($value, 'Value is displayed.');
 
     // Try to create entries with more than one decimal separator; assert fail.
-    $wrong_entries = array(
+    $wrong_entries = [
       '3.14.159',
       '0..45469',
       '..4589',
       '6.459.52',
       '6.3..25',
-    );
+    ];
 
     foreach ($wrong_entries as $wrong_entry) {
       $this->drupalGet('entity_test/add');
-      $edit = array(
+      $edit = [
         "{$field_name}[0][value]" => $wrong_entry,
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Save'));
-      $this->assertRaw(t('%name must be a number.', array('%name' => $field_name)), 'Correctly failed to save decimal value with more than one decimal point.');
+      $this->assertRaw(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save decimal value with more than one decimal point.');
     }
 
     // Try to create entries with minus sign not in the first position.
-    $wrong_entries = array(
+    $wrong_entries = [
       '3-3',
       '4-',
       '1.3-',
       '1.2-4',
       '-10-10',
-    );
+    ];
 
     foreach ($wrong_entries as $wrong_entry) {
       $this->drupalGet('entity_test/add');
-      $edit = array(
+      $edit = [
         "{$field_name}[0][value]" => $wrong_entry,
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Save'));
-      $this->assertRaw(t('%name must be a number.', array('%name' => $field_name)), 'Correctly failed to save decimal value with minus sign in the wrong position.');
+      $this->assertRaw(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save decimal value with minus sign in the wrong position.');
     }
   }
 
   /**
    * Test integer field.
    */
-  function testNumberIntegerField() {
+  public function testNumberIntegerField() {
     $minimum = rand(-4000, -2000);
     $maximum = rand(2000, 4000);
 
     // Create a field with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $storage = FieldStorageConfig::create(array(
+    $storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'integer',
-    ));
+    ]);
     $storage->save();
 
     FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
-      'settings' => array(
+      'settings' => [
         'min' => $minimum, 'max' => $maximum, 'prefix' => 'ThePrefix',
-      )
+      ]
     ])->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'number',
-        'settings' => array(
+        'settings' => [
           'placeholder' => '4'
-        ),
-      ))
+        ],
+      ])
       ->save();
     entity_get_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'number_integer',
-        'settings' => array(
+        'settings' => [
           'prefix_suffix' => FALSE,
-        ),
-      ))
+        ],
+      ])
       ->save();
 
     // Check the storage schema.
-    $expected = array(
-      'columns' => array(
-        'value' => array(
+    $expected = [
+      'columns' => [
+        'value' => [
           'type' => 'int',
           'unsigned' => '',
           'size' => 'normal'
-        ),
-      ),
-      'unique keys' => array(),
-      'indexes' => array(),
-      'foreign keys' => array()
-    );
+        ],
+      ],
+      'unique keys' => [],
+      'indexes' => [],
+      'foreign keys' => []
+    ];
     $this->assertEqual($storage->getSchema(), $expected);
 
     // Display creation form.
@@ -186,84 +186,84 @@ class NumberFieldTest extends WebTestBase {
 
     // Submit a valid integer
     $value = rand($minimum, $maximum);
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
 
     // Try to set a value below the minimum value
     $this->drupalGet('entity_test/add');
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $minimum - 1,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertRaw(t('%name must be higher than or equal to %minimum.', array('%name' => $field_name, '%minimum' => $minimum)), 'Correctly failed to save integer value less than minimum allowed value.');
+    $this->assertRaw(t('%name must be higher than or equal to %minimum.', ['%name' => $field_name, '%minimum' => $minimum]), 'Correctly failed to save integer value less than minimum allowed value.');
 
     // Try to set a decimal value
     $this->drupalGet('entity_test/add');
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => 1.5,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertRaw(t('%name is not a valid number.', array('%name' => $field_name)), 'Correctly failed to save decimal value to integer field.');
+    $this->assertRaw(t('%name is not a valid number.', ['%name' => $field_name]), 'Correctly failed to save decimal value to integer field.');
 
     // Try to set a value above the maximum value
     $this->drupalGet('entity_test/add');
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $maximum + 1,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertRaw(t('%name must be lower than or equal to %maximum.', array('%name' => $field_name, '%maximum' => $maximum)), 'Correctly failed to save integer value greater than maximum allowed value.');
+    $this->assertRaw(t('%name must be lower than or equal to %maximum.', ['%name' => $field_name, '%maximum' => $maximum]), 'Correctly failed to save integer value greater than maximum allowed value.');
 
     // Try to set a wrong integer value.
     $this->drupalGet('entity_test/add');
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => '20-40',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertRaw(t('%name must be a number.', array('%name' => $field_name)), 'Correctly failed to save wrong integer value.');
+    $this->assertRaw(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save wrong integer value.');
 
     // Test with valid entries.
-    $valid_entries = array(
+    $valid_entries = [
       '-1234',
       '0',
       '1234',
-    );
+    ];
 
     foreach ($valid_entries as $valid_entry) {
       $this->drupalGet('entity_test/add');
-      $edit = array(
+      $edit = [
         "{$field_name}[0][value]" => $valid_entry,
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Save'));
       preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
       $id = $match[1];
-      $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+      $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
       $this->assertRaw($valid_entry, 'Value is displayed.');
       $this->assertNoFieldByXpath('//div[@content="' . $valid_entry . '"]', NULL, 'The "content" attribute is not present since the Prefix is not being displayed');
     }
 
     // Test for the content attribute when a Prefix is displayed. Presumably this also tests for the attribute when a Suffix is displayed.
     entity_get_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'number_integer',
-        'settings' => array(
+        'settings' => [
           'prefix_suffix' => TRUE,
-        ),
-      ))
+        ],
+      ])
       ->save();
     $integer_value = '123';
     $this->drupalGet('entity_test/add');
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $integer_value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
     $this->drupalGet('entity_test/' . $id);
     $this->assertFieldByXPath('//div[@content="' . $integer_value . '"]', 'ThePrefix' . $integer_value, 'The "content" attribute has been set to the value of the field, and the prefix is being displayed.');
   }
@@ -271,14 +271,14 @@ class NumberFieldTest extends WebTestBase {
   /**
   * Test float field.
   */
-  function testNumberFloatField() {
+  public function testNumberFloatField() {
     // Create a field with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'float',
-    ))->save();
+    ])->save();
 
     FieldConfig::create([
       'field_name' => $field_name,
@@ -287,18 +287,18 @@ class NumberFieldTest extends WebTestBase {
     ])->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'number',
-        'settings' => array(
+        'settings' => [
           'placeholder' => '0.00'
-        ),
-      ))
+        ],
+      ])
       ->save();
 
     entity_get_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'number_decimal',
-      ))
+      ])
       ->save();
 
     // Display creation form.
@@ -308,13 +308,13 @@ class NumberFieldTest extends WebTestBase {
 
     // Submit a signed decimal value within the allowed precision and scale.
     $value = '-1234.5678';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
 
     // Ensure that the 'number_decimal' formatter displays the number with the
     // expected rounding.
@@ -322,113 +322,113 @@ class NumberFieldTest extends WebTestBase {
     $this->assertRaw(round($value, 2));
 
     // Try to create entries with more than one decimal separator; assert fail.
-    $wrong_entries = array(
+    $wrong_entries = [
       '3.14.159',
       '0..45469',
       '..4589',
       '6.459.52',
       '6.3..25',
-    );
+    ];
 
     foreach ($wrong_entries as $wrong_entry) {
       $this->drupalGet('entity_test/add');
-      $edit = array(
+      $edit = [
         "{$field_name}[0][value]" => $wrong_entry,
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Save'));
-      $this->assertRaw(t('%name must be a number.', array('%name' => $field_name)), 'Correctly failed to save float value with more than one decimal point.');
+      $this->assertRaw(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save float value with more than one decimal point.');
     }
 
     // Try to create entries with minus sign not in the first position.
-    $wrong_entries = array(
+    $wrong_entries = [
       '3-3',
       '4-',
       '1.3-',
       '1.2-4',
       '-10-10',
-    );
+    ];
 
     foreach ($wrong_entries as $wrong_entry) {
       $this->drupalGet('entity_test/add');
-      $edit = array(
+      $edit = [
         "{$field_name}[0][value]" => $wrong_entry,
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Save'));
-      $this->assertRaw(t('%name must be a number.', array('%name' => $field_name)), 'Correctly failed to save float value with minus sign in the wrong position.');
+      $this->assertRaw(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save float value with minus sign in the wrong position.');
     }
   }
 
   /**
    * Test default formatter behavior
    */
-  function testNumberFormatter() {
+  public function testNumberFormatter() {
     $type = Unicode::strtolower($this->randomMachineName());
     $float_field = Unicode::strtolower($this->randomMachineName());
     $integer_field = Unicode::strtolower($this->randomMachineName());
-    $thousand_separators = array('', '.', ',', ' ', chr(8201), "'");
-    $decimal_separators = array('.', ',');
+    $thousand_separators = ['', '.', ',', ' ', chr(8201), "'"];
+    $decimal_separators = ['.', ','];
     $prefix = $this->randomMachineName();
     $suffix = $this->randomMachineName();
     $random_float = rand(0, pow(10, 6));
     $random_integer = rand(0, pow(10, 6));
 
     // Create a content type containing float and integer fields.
-    $this->drupalCreateContentType(array('type' => $type));
+    $this->drupalCreateContentType(['type' => $type]);
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $float_field,
       'entity_type' => 'node',
       'type' => 'float',
-    ))->save();
+    ])->save();
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $integer_field,
       'entity_type' => 'node',
       'type' => 'integer',
-    ))->save();
+    ])->save();
 
     FieldConfig::create([
       'field_name' => $float_field,
       'entity_type' => 'node',
       'bundle' => $type,
-      'settings' => array(
+      'settings' => [
         'prefix' => $prefix,
         'suffix' => $suffix
-      ),
+      ],
     ])->save();
 
     FieldConfig::create([
       'field_name' => $integer_field,
       'entity_type' => 'node',
       'bundle' => $type,
-      'settings' => array(
+      'settings' => [
         'prefix' => $prefix,
         'suffix' => $suffix
-      ),
+      ],
     ])->save();
 
     entity_get_form_display('node', $type, 'default')
-      ->setComponent($float_field, array(
+      ->setComponent($float_field, [
         'type' => 'number',
-        'settings' => array(
+        'settings' => [
           'placeholder' => '0.00'
-        ),
-      ))
-      ->setComponent($integer_field, array(
+        ],
+      ])
+      ->setComponent($integer_field, [
         'type' => 'number',
-        'settings' => array(
+        'settings' => [
           'placeholder' => '0.00'
-        ),
-      ))
+        ],
+      ])
       ->save();
 
     entity_get_display('node', $type, 'default')
-      ->setComponent($float_field, array(
+      ->setComponent($float_field, [
         'type' => 'number_decimal',
-      ))
-      ->setComponent($integer_field, array(
+      ])
+      ->setComponent($integer_field, [
         'type' => 'number_unformatted',
-      ))
+      ])
       ->save();
 
     // Create a node to test formatters.
@@ -448,15 +448,15 @@ class NumberFieldTest extends WebTestBase {
     $decimal_separator = $decimal_separators[array_rand($decimal_separators)];
     $scale = rand(0, 10);
 
-    $this->drupalPostAjaxForm(NULL, array(), "${float_field}_settings_edit");
-    $edit = array(
+    $this->drupalPostAjaxForm(NULL, [], "${float_field}_settings_edit");
+    $edit = [
       "fields[${float_field}][settings_edit_form][settings][prefix_suffix]" => TRUE,
       "fields[${float_field}][settings_edit_form][settings][scale]" => $scale,
       "fields[${float_field}][settings_edit_form][settings][decimal_separator]" => $decimal_separator,
       "fields[${float_field}][settings_edit_form][settings][thousand_separator]" => $thousand_separator,
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, "${float_field}_plugin_settings_update");
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     // Check number_decimal and number_unformatted formatters behavior.
     $this->drupalGet('node/' . $node->id());
@@ -466,21 +466,21 @@ class NumberFieldTest extends WebTestBase {
 
     // Configure the number_decimal formatter.
     entity_get_display('node', $type, 'default')
-      ->setComponent($integer_field, array(
+      ->setComponent($integer_field, [
         'type' => 'number_integer',
-      ))
+      ])
       ->save();
     $this->drupalGet("admin/structure/types/manage/$type/display");
 
     $thousand_separator = $thousand_separators[array_rand($thousand_separators)];
 
-    $this->drupalPostAjaxForm(NULL, array(), "${integer_field}_settings_edit");
-    $edit = array(
+    $this->drupalPostAjaxForm(NULL, [], "${integer_field}_settings_edit");
+    $edit = [
       "fields[${integer_field}][settings_edit_form][settings][prefix_suffix]" => FALSE,
       "fields[${integer_field}][settings_edit_form][settings][thousand_separator]" => $thousand_separator,
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, "${integer_field}_plugin_settings_update");
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     // Check number_integer formatter behavior.
     $this->drupalGet('node/' . $node->id());
@@ -492,14 +492,14 @@ class NumberFieldTest extends WebTestBase {
   /**
    * Tests setting the minimum value of a float field through the interface.
    */
-  function testCreateNumberFloatField() {
+  public function testCreateNumberFloatField() {
     // Create a float field.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'float',
-    ))->save();
+    ])->save();
 
     $field = FieldConfig::create([
       'field_name' => $field_name,
@@ -517,14 +517,14 @@ class NumberFieldTest extends WebTestBase {
   /**
    * Tests setting the minimum value of a decimal field through the interface.
    */
-  function testCreateNumberDecimalField() {
+  public function testCreateNumberDecimalField() {
     // Create a decimal field.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'decimal',
-    ))->save();
+    ])->save();
 
     $field = FieldConfig::create([
       'field_name' => $field_name,
@@ -542,18 +542,18 @@ class NumberFieldTest extends WebTestBase {
   /**
    * Helper function to set the minimum value of a field.
    */
-  function assertSetMinimumValue($field, $minimum_value) {
+  public function assertSetMinimumValue($field, $minimum_value) {
     $field_configuration_url = 'entity_test/structure/entity_test/fields/entity_test.entity_test.' . $field->getName();
 
     // Set the minimum value.
-    $edit = array(
+    $edit = [
       'settings[min]' => $minimum_value,
-    );
+    ];
     $this->drupalPostForm($field_configuration_url, $edit, t('Save settings'));
     // Check if an error message is shown.
-    $this->assertNoRaw(t('%name is not a valid number.', array('%name' => t('Minimum'))), 'Saved ' . gettype($minimum_value) . '  value as minimal value on a ' . $field->getType() . ' field');
+    $this->assertNoRaw(t('%name is not a valid number.', ['%name' => t('Minimum')]), 'Saved ' . gettype($minimum_value) . '  value as minimal value on a ' . $field->getType() . ' field');
     // Check if a success message is shown.
-    $this->assertRaw(t('Saved %label configuration.', array('%label' => $field->getLabel())));
+    $this->assertRaw(t('Saved %label configuration.', ['%label' => $field->getLabel()]));
     // Check if the minimum value was actually set.
     $this->drupalGet($field_configuration_url);
     $this->assertFieldById('edit-settings-min', $minimum_value, 'Minimal ' . gettype($minimum_value) . '  value was set on a ' . $field->getType() . ' field.');
diff --git a/web/core/modules/field/src/Tests/String/StringFieldTest.php b/web/core/modules/field/src/Tests/String/StringFieldTest.php
index 0ac574877..97e470e92 100644
--- a/web/core/modules/field/src/Tests/String/StringFieldTest.php
+++ b/web/core/modules/field/src/Tests/String/StringFieldTest.php
@@ -20,7 +20,7 @@ class StringFieldTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('entity_test', 'file');
+  public static $modules = ['entity_test', 'file'];
 
   /**
    * A user without any special permissions.
@@ -32,7 +32,7 @@ class StringFieldTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->webUser = $this->drupalCreateUser(array('view test entity', 'administer entity_test content'));
+    $this->webUser = $this->drupalCreateUser(['view test entity', 'administer entity_test content']);
     $this->drupalLogin($this->webUser);
   }
 
@@ -41,7 +41,7 @@ class StringFieldTest extends WebTestBase {
   /**
    * Test widgets.
    */
-  function testTextfieldWidgets() {
+  public function testTextfieldWidgets() {
     $this->_testTextfieldWidgets('string', 'string_textfield');
     $this->_testTextfieldWidgets('string_long', 'string_textarea');
   }
@@ -49,14 +49,14 @@ class StringFieldTest extends WebTestBase {
   /**
    * Helper function for testTextfieldWidgets().
    */
-  function _testTextfieldWidgets($field_type, $widget_type) {
+  public function _testTextfieldWidgets($field_type, $widget_type) {
     // Create a field.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => $field_type
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -64,12 +64,12 @@ class StringFieldTest extends WebTestBase {
       'label' => $this->randomMachineName() . '_label',
     ])->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => $widget_type,
-        'settings' => array(
+        'settings' => [
           'placeholder' => 'A placeholder on ' . $widget_type,
-        ),
-      ))
+        ],
+      ])
       ->save();
     entity_get_display('entity_test', 'entity_test', 'full')
       ->setComponent($field_name)
@@ -79,17 +79,17 @@ class StringFieldTest extends WebTestBase {
     $this->drupalGet('entity_test/add');
     $this->assertFieldByName("{$field_name}[0][value]", '', 'Widget is displayed');
     $this->assertNoFieldByName("{$field_name}[0][format]", '1', 'Format selector is not displayed');
-    $this->assertRaw(format_string('placeholder="A placeholder on @widget_type"', array('@widget_type' => $widget_type)));
+    $this->assertRaw(format_string('placeholder="A placeholder on @widget_type"', ['@widget_type' => $widget_type]));
 
     // Submit with some value.
     $value = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
 
     // Display the entity.
     $entity = EntityTest::load($id);
diff --git a/web/core/modules/field/src/Tests/Views/FieldTestBase.php b/web/core/modules/field/src/Tests/Views/FieldTestBase.php
index 0f977a82c..f04e19fb9 100644
--- a/web/core/modules/field/src/Tests/Views/FieldTestBase.php
+++ b/web/core/modules/field/src/Tests/Views/FieldTestBase.php
@@ -25,7 +25,7 @@ abstract class FieldTestBase extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field_test_views');
+  public static $modules = ['node', 'field_test_views'];
 
   /**
    * Stores the field definitions used by the test.
@@ -51,25 +51,25 @@ abstract class FieldTestBase extends ViewTestBase {
       'name' => 'page',
     ])->save();
 
-    ViewTestData::createTestViews(get_class($this), array('field_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['field_test_views']);
   }
 
-  function setUpFieldStorages($amount = 3, $type = 'string') {
+  public function setUpFieldStorages($amount = 3, $type = 'string') {
     // Create three fields.
-    $field_names = array();
+    $field_names = [];
     for ($i = 0; $i < $amount; $i++) {
       $field_names[$i] = 'field_name_' . $i;
-      $this->fieldStorages[$i] = FieldStorageConfig::create(array(
+      $this->fieldStorages[$i] = FieldStorageConfig::create([
         'field_name' => $field_names[$i],
         'entity_type' => 'node',
         'type' => $type,
-      ));
+      ]);
       $this->fieldStorages[$i]->save();
     }
     return $field_names;
   }
 
-  function setUpFields($bundle = 'page') {
+  public function setUpFields($bundle = 'page') {
     foreach ($this->fieldStorages as $key => $field_storage) {
       $this->fields[$key] = FieldConfig::create([
         'field_storage' => $field_storage,
diff --git a/web/core/modules/field/src/Tests/Views/FieldUITest.php b/web/core/modules/field/src/Tests/Views/FieldUITest.php
index c47bf1962..ce8208ba6 100644
--- a/web/core/modules/field/src/Tests/Views/FieldUITest.php
+++ b/web/core/modules/field/src/Tests/Views/FieldUITest.php
@@ -19,14 +19,14 @@ class FieldUITest extends FieldTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view_fieldapi');
+  public static $testViews = ['test_view_fieldapi'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('views_ui');
+  public static $modules = ['views_ui'];
 
   /**
    * A user with the 'administer views' permission.
@@ -41,7 +41,7 @@ class FieldUITest extends FieldTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->account = $this->drupalCreateUser(array('administer views'));
+    $this->account = $this->drupalCreateUser(['administer views']);
     $this->drupalLogin($this->account);
 
     $this->setUpFieldStorages(1, 'text');
@@ -56,26 +56,26 @@ class FieldUITest extends FieldTestBase {
     $this->drupalGet($url);
 
     // Tests the available formatter options.
-    $result = $this->xpath('//select[@id=:id]/option', array(':id' => 'edit-options-type'));
+    $result = $this->xpath('//select[@id=:id]/option', [':id' => 'edit-options-type']);
     $options = array_map(function($item) {
       return (string) $item->attributes()->value[0];
     }, $result);
     // @todo Replace this sort by assertArray once it's in.
     sort($options, SORT_STRING);
-    $this->assertEqual($options, array('text_default', 'text_trimmed'), 'The text formatters for a simple text field appear as expected.');
+    $this->assertEqual($options, ['text_default', 'text_trimmed'], 'The text formatters for a simple text field appear as expected.');
 
-    $this->drupalPostForm(NULL, array('options[type]' => 'text_trimmed'), t('Apply'));
+    $this->drupalPostForm(NULL, ['options[type]' => 'text_trimmed'], t('Apply'));
 
     $this->drupalGet($url);
     $this->assertOptionSelected('edit-options-type', 'text_trimmed');
 
     $random_number = rand(100, 400);
-    $this->drupalPostForm(NULL, array('options[settings][trim_length]' => $random_number), t('Apply'));
+    $this->drupalPostForm(NULL, ['options[settings][trim_length]' => $random_number], t('Apply'));
     $this->drupalGet($url);
     $this->assertFieldByName('options[settings][trim_length]', $random_number, 'The formatter setting got saved.');
 
     // Save the view and test whether the settings are saved.
-    $this->drupalPostForm('admin/structure/views/view/test_view_fieldapi', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/views/view/test_view_fieldapi', [], t('Save'));
     $view = Views::getView('test_view_fieldapi');
     $view->initHandlers();
     $this->assertEqual($view->field['field_name_0']->options['type'], 'text_trimmed');
@@ -101,7 +101,7 @@ class FieldUITest extends FieldTestBase {
    */
   public function testHandlerUIAggregation() {
     // Enable aggregation.
-    $edit = array('group_by' => '1');
+    $edit = ['group_by' => '1'];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_view_fieldapi/default/group_by', $edit, t('Apply'));
 
     $url = "admin/structure/views/nojs/handler/test_view_fieldapi/default/field/field_name_0";
@@ -110,13 +110,13 @@ class FieldUITest extends FieldTestBase {
 
     // Test the click sort column options.
     // Tests the available formatter options.
-    $result = $this->xpath('//select[@id=:id]/option', array(':id' => 'edit-options-click-sort-column'));
+    $result = $this->xpath('//select[@id=:id]/option', [':id' => 'edit-options-click-sort-column']);
     $options = array_map(function($item) {
       return (string) $item->attributes()->value[0];
     }, $result);
     sort($options, SORT_STRING);
 
-    $this->assertEqual($options, array('format', 'value'), 'The expected sort field options were found.');
+    $this->assertEqual($options, ['format', 'value'], 'The expected sort field options were found.');
   }
 
   /**
@@ -138,7 +138,7 @@ class FieldUITest extends FieldTestBase {
     $field->save();
 
     $url = "admin/structure/views/nojs/add-handler/test_view_fieldapi/default/filter";
-    $this->drupalPostForm($url, ['name[node__' . $field_name . '.' . $field_name . '_value]' => TRUE], t('Add and configure @handler', array('@handler' => t('filter criteria'))));
+    $this->drupalPostForm($url, ['name[node__' . $field_name . '.' . $field_name . '_value]' => TRUE], t('Add and configure @handler', ['@handler' => t('filter criteria')]));
     $this->assertResponse(200);
     // Verify that using a boolean field as a filter also results in using the
     // boolean plugin.
diff --git a/web/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php b/web/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php
index 303eb2fd7..dfbb89bd2 100644
--- a/web/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php
+++ b/web/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php
@@ -22,14 +22,14 @@ class HandlerFieldFieldTest extends FieldTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('node', 'field_test');
+  public static $modules = ['node', 'field_test'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view_fieldapi');
+  public static $testViews = ['test_view_fieldapi'];
 
   /**
    * Test nodes.
@@ -48,47 +48,47 @@ class HandlerFieldFieldTest extends FieldTestBase {
     $this->setUpFieldStorages(3);
 
     // Setup a field with cardinality > 1.
-    $this->fieldStorages[3] = FieldStorageConfig::create(array(
+    $this->fieldStorages[3] = FieldStorageConfig::create([
       'field_name' => 'field_name_3',
       'entity_type' => 'node',
       'type' => 'string',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ));
+    ]);
     $this->fieldStorages[3]->save();
     // Setup a field that will have no value.
-    $this->fieldStorages[4] = FieldStorageConfig::create(array(
+    $this->fieldStorages[4] = FieldStorageConfig::create([
       'field_name' => 'field_name_4',
       'entity_type' => 'node',
       'type' => 'string',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ));
+    ]);
     $this->fieldStorages[4]->save();
 
     // Setup a text field.
-    $this->fieldStorages[5] = FieldStorageConfig::create(array(
+    $this->fieldStorages[5] = FieldStorageConfig::create([
       'field_name' => 'field_name_5',
       'entity_type' => 'node',
       'type' => 'text',
-    ));
+    ]);
     $this->fieldStorages[5]->save();
 
     // Setup a text field with access control.
     // @see field_test_entity_field_access()
-    $this->fieldStorages[6] = FieldStorageConfig::create(array(
+    $this->fieldStorages[6] = FieldStorageConfig::create([
       'field_name' => 'field_no_view_access',
       'entity_type' => 'node',
       'type' => 'text',
-    ));
+    ]);
     $this->fieldStorages[6]->save();
 
     $this->setUpFields();
 
     // Create some nodes.
-    $this->nodes = array();
+    $this->nodes = [];
     for ($i = 0; $i < 3; $i++) {
-      $edit = array('type' => 'page');
+      $edit = ['type' => 'page'];
 
-      foreach (array(0, 1, 2, 5) as $key) {
+      foreach ([0, 1, 2, 5] as $key) {
         $field_storage = $this->fieldStorages[$key];
         $edit[$field_storage->getName()][0]['value'] = $this->randomMachineName(8);
       }
@@ -98,7 +98,7 @@ class HandlerFieldFieldTest extends FieldTestBase {
         $edit[$this->fieldStorages[3]->getName()][$j]['value'] = $this->randomMachineName(8);
       }
       // Set this field to be empty.
-      $edit[$this->fieldStorages[4]->getName()] = array(array('value' => NULL));
+      $edit[$this->fieldStorages[4]->getName()] = [['value' => NULL]];
 
       $this->nodes[$i] = $this->drupalCreateNode($edit);
     }
@@ -171,9 +171,9 @@ class HandlerFieldFieldTest extends FieldTestBase {
     $view = Views::getView('test_view_fieldapi');
     $this->prepareView($view);
     $view->displayHandlers->get('default')->options['fields'][$this->fieldStorages[5]->getName()]['type'] = 'text_trimmed';
-    $view->displayHandlers->get('default')->options['fields'][$this->fieldStorages[5]->getName()]['settings'] = array(
+    $view->displayHandlers->get('default')->options['fields'][$this->fieldStorages[5]->getName()]['settings'] = [
       'trim_length' => 3,
-    );
+    ];
     $this->executeView($view);
 
     // Make sure that the formatter works as expected.
@@ -196,7 +196,7 @@ class HandlerFieldFieldTest extends FieldTestBase {
 
     for ($i = 0; $i < 3; $i++) {
       $rendered_field = $view->style_plugin->getField($i, $field_name);
-      $items = array();
+      $items = [];
       $pure_items = $this->nodes[$i]->{$field_name}->getValue();
       $pure_items = array_splice($pure_items, 0, 3);
       foreach ($pure_items as $j => $item) {
@@ -218,7 +218,7 @@ class HandlerFieldFieldTest extends FieldTestBase {
 
     for ($i = 0; $i < 3; $i++) {
       $rendered_field = $view->style_plugin->getField($i, $field_name);
-      $items = array();
+      $items = [];
       $pure_items = $this->nodes[$i]->{$field_name}->getValue();
       $pure_items = array_splice($pure_items, 1, 3);
       foreach ($pure_items as $j => $item) {
@@ -238,7 +238,7 @@ class HandlerFieldFieldTest extends FieldTestBase {
 
     for ($i = 0; $i < 3; $i++) {
       $rendered_field = $view->style_plugin->getField($i, $field_name);
-      $items = array();
+      $items = [];
       $pure_items = $this->nodes[$i]->{$field_name}->getValue();
       array_splice($pure_items, 0, -3);
       $pure_items = array_reverse($pure_items);
@@ -259,7 +259,7 @@ class HandlerFieldFieldTest extends FieldTestBase {
 
     for ($i = 0; $i < 3; $i++) {
       $rendered_field = $view->style_plugin->getField($i, $field_name);
-      $items = array();
+      $items = [];
       $pure_items = $this->nodes[$i]->{$field_name}->getValue();
       $items[] = $pure_items[0]['value'];
       $items[] = $pure_items[4]['value'];
@@ -277,7 +277,7 @@ class HandlerFieldFieldTest extends FieldTestBase {
 
     for ($i = 0; $i < 3; $i++) {
       $rendered_field = $view->style_plugin->getField($i, $field_name);
-      $items = array();
+      $items = [];
       $pure_items = $this->nodes[$i]->{$field_name}->getValue();
       $pure_items = array_splice($pure_items, 0, 3);
       foreach ($pure_items as $j => $item) {
diff --git a/web/core/modules/field/src/Tests/reEnableModuleFieldTest.php b/web/core/modules/field/src/Tests/reEnableModuleFieldTest.php
index b718e7588..24c0effef 100644
--- a/web/core/modules/field/src/Tests/reEnableModuleFieldTest.php
+++ b/web/core/modules/field/src/Tests/reEnableModuleFieldTest.php
@@ -18,22 +18,22 @@ class reEnableModuleFieldTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'field',
     'node',
     // We use telephone module instead of test_field because test_field is
     // hidden and does not display on the admin/modules page.
     'telephone'
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'article'));
-    $this->drupalLogin($this->drupalCreateUser(array(
+    $this->drupalCreateContentType(['type' => 'article']);
+    $this->drupalLogin($this->drupalCreateUser([
       'create article content',
       'edit own article content',
-    )));
+    ]));
   }
 
   /**
@@ -41,14 +41,14 @@ class reEnableModuleFieldTest extends WebTestBase {
    *
    * @see field_system_info_alter()
    */
-  function testReEnabledField() {
+  public function testReEnabledField() {
 
     // Add a telephone field to the article content type.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_telephone',
       'entity_type' => 'node',
       'type' => 'telephone',
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -57,19 +57,19 @@ class reEnableModuleFieldTest extends WebTestBase {
     ])->save();
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent('field_telephone', array(
+      ->setComponent('field_telephone', [
         'type' => 'telephone_default',
-        'settings' => array(
+        'settings' => [
           'placeholder' => '123-456-7890',
-        ),
-      ))
+        ],
+      ])
       ->save();
 
     entity_get_display('node', 'article', 'default')
-      ->setComponent('field_telephone', array(
+      ->setComponent('field_telephone', [
         'type' => 'telephone_link',
         'weight' => 1,
-      ))
+      ])
       ->save();
 
     // Display the article node form and verify the telephone widget is present.
@@ -78,16 +78,16 @@ class reEnableModuleFieldTest extends WebTestBase {
 
     // Submit an article node with a telephone field so data exist for the
     // field.
-    $edit = array(
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
       'field_telephone[0][value]' => "123456789",
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertRaw('<a href="tel:123456789">');
 
     // Test that the module can't be uninstalled from the UI while there is data
     // for it's fields.
-    $admin_user = $this->drupalCreateUser(array('access administration pages', 'administer modules'));
+    $admin_user = $this->drupalCreateUser(['access administration pages', 'administer modules']);
     $this->drupalLogin($admin_user);
     $this->drupalGet('admin/modules/uninstall');
     $this->assertText("The Telephone number field type is used in the following field: node.field_telephone");
@@ -95,11 +95,11 @@ class reEnableModuleFieldTest extends WebTestBase {
     // Add another telephone field to a different entity type in order to test
     // the message for the case when multiple fields are blocking the
     // uninstallation of a module.
-    $field_storage2 = entity_create('field_storage_config', array(
+    $field_storage2 = entity_create('field_storage_config', [
       'field_name' => 'field_telephone_2',
       'entity_type' => 'user',
       'type' => 'telephone',
-    ));
+    ]);
     $field_storage2->save();
     FieldConfig::create([
       'field_storage' => $field_storage2,
diff --git a/web/core/modules/field/tests/modules/field_test/field_test.entity.inc b/web/core/modules/field/tests/modules/field_test/field_test.entity.inc
index d5614acd8..ee831ff2b 100644
--- a/web/core/modules/field/tests/modules/field_test/field_test.entity.inc
+++ b/web/core/modules/field/tests/modules/field_test/field_test.entity.inc
@@ -19,7 +19,7 @@ function field_test_entity_type_alter(array &$entity_types) {
  * Helper function to enable entity translations.
  */
 function field_test_entity_info_translatable($entity_type_id = NULL, $translatable = NULL) {
-  $stored_value = &drupal_static(__FUNCTION__, array());
+  $stored_value = &drupal_static(__FUNCTION__, []);
   if (isset($entity_type_id)) {
     $entity_manager = \Drupal::entityManager();
     $original = $entity_manager->getDefinition($entity_type_id);
diff --git a/web/core/modules/field/tests/modules/field_test/field_test.field.inc b/web/core/modules/field/tests/modules/field_test/field_test.field.inc
index 9798fc745..5edd25d76 100644
--- a/web/core/modules/field/tests/modules/field_test/field_test.field.inc
+++ b/web/core/modules/field/tests/modules/field_test/field_test.field.inc
@@ -34,7 +34,7 @@ function field_test_field_storage_config_update_forbid(FieldStorageConfigInterfa
  * Sample 'default value' callback.
  */
 function field_test_default_value(FieldableEntityInterface $entity, FieldDefinitionInterface $definition) {
-  return array(array('value' => 99));
+  return [['value' => 99]];
 }
 
 /**
diff --git a/web/core/modules/field/tests/modules/field_test/field_test.module b/web/core/modules/field/tests/modules/field_test/field_test.module
index 7eda28852..f81983637 100644
--- a/web/core/modules/field/tests/modules/field_test/field_test.module
+++ b/web/core/modules/field/tests/modules/field_test/field_test.module
@@ -66,7 +66,7 @@ function field_test_memorize($key = NULL, $value = NULL) {
 
   if (!isset($key)) {
     $return = $memorize;
-    $memorize = array();
+    $memorize = [];
     return $return;
   }
   if (is_array($memorize)) {
@@ -88,11 +88,11 @@ function field_test_field_storage_config_create(FieldStorageConfigInterface $fie
 function field_test_entity_display_build_alter(&$output, $context) {
   $display_options = $context['display']->getComponent('test_field');
   if (isset($display_options['settings']['alter'])) {
-    $output['test_field'][] = array('#markup' => 'field_test_entity_display_build_alter');
+    $output['test_field'][] = ['#markup' => 'field_test_entity_display_build_alter'];
   }
 
   if (isset($output['test_field'])) {
-    $output['test_field'][] = array('#markup' => 'entity language is ' . $context['entity']->language()->getId());
+    $output['test_field'][] = ['#markup' => 'entity language is ' . $context['entity']->language()->getId()];
   }
 }
 
diff --git a/web/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php b/web/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php
index d54c6836f..949ffda66 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php
@@ -54,11 +54,11 @@ class NestedEntityTestForm extends FormBase {
       ];
     }
 
-    $form['save'] = array(
+    $form['save'] = [
       '#type' => 'submit',
       '#value' => t('Save'),
       '#weight' => 100,
-    );
+    ];
 
     return $form;
   }
@@ -101,7 +101,7 @@ class NestedEntityTestForm extends FormBase {
     $entity_2 = $form_state->get('entity_2');
     $entity_2->save();
 
-    drupal_set_message($this->t('test_entities @id_1 and @id_2 have been updated.', array('@id_1' => $entity_1->id(), '@id_2' => $entity_2->id())));
+    drupal_set_message($this->t('test_entities @id_1 and @id_2 have been updated.', ['@id_1' => $entity_1->id(), '@id_2' => $entity_2->id()]));
   }
 
 }
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php
index c2916f5d6..418b4c6b2 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldApplicableFormatter.php
@@ -34,7 +34,7 @@ class TestFieldApplicableFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    return array('#markup' => 'Nothing to see here');
+    return ['#markup' => 'Nothing to see here'];
   }
 
 }
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php
index 5eb0354ae..80f860bfa 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php
@@ -26,22 +26,22 @@ class TestFieldDefaultFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'test_formatter_setting' => 'dummy test string',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['test_formatter_setting'] = array(
+    $element['test_formatter_setting'] = [
       '#title' => t('Setting'),
       '#type' => 'textfield',
       '#size' => 20,
       '#default_value' => $this->getSetting('test_formatter_setting'),
       '#required' => TRUE,
-    );
+    ];
     return $element;
   }
 
@@ -49,8 +49,8 @@ class TestFieldDefaultFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
-    $summary[] = t('@setting: @value', array('@setting' => 'test_formatter_setting', '@value' => $this->getSetting('test_formatter_setting')));
+    $summary = [];
+    $summary[] = t('@setting: @value', ['@setting' => 'test_formatter_setting', '@value' => $this->getSetting('test_formatter_setting')]);
     return $summary;
   }
 
@@ -58,10 +58,10 @@ class TestFieldDefaultFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
-      $elements[$delta] = array('#markup' => $this->getSetting('test_formatter_setting') . '|' . $item->value);
+      $elements[$delta] = ['#markup' => $this->getSetting('test_formatter_setting') . '|' . $item->value];
     }
 
     return $elements;
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php
index bbe0b3081..c8072177f 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php
@@ -23,25 +23,25 @@ class TestFieldEmptyFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'test_empty_string' => '**EMPTY FIELD**',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     if ($items->isEmpty()) {
       // For fields with no value, just add the configured "empty" value.
-      $elements[0] = array('#markup' => $this->getSetting('test_empty_string'));
+      $elements[0] = ['#markup' => $this->getSetting('test_empty_string')];
     }
     else {
       foreach ($items as $delta => $item) {
         // This formatter only needs to output raw for testing.
-        $elements[$delta] = array('#markup' => $item->value);
+        $elements[$delta] = ['#markup' => $item->value];
       }
     }
 
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php
index ca0886108..f36fea2c3 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php
@@ -24,22 +24,22 @@ class TestFieldEmptySettingFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'field_empty_setting' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['field_empty_setting'] = array(
+    $element['field_empty_setting'] = [
       '#title' => t('Setting'),
       '#type' => 'textfield',
       '#size' => 20,
       '#default_value' => $this->getSetting('field_empty_setting'),
       '#required' => TRUE,
-    );
+    ];
     return $element;
   }
 
@@ -47,7 +47,7 @@ class TestFieldEmptySettingFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
     $setting = $this->getSetting('field_empty_setting');
     if (!empty($setting)) {
       $summary[] = t('Default empty setting now has a value.');
@@ -59,11 +59,11 @@ class TestFieldEmptySettingFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     if (!empty($items)) {
       foreach ($items as $delta => $item) {
-        $elements[$delta] = array('#markup' => $this->getSetting('field_empty_setting'));
+        $elements[$delta] = ['#markup' => $this->getSetting('field_empty_setting')];
       }
     }
 
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php
index 97bb1e636..978e18fba 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php
@@ -26,23 +26,23 @@ class TestFieldMultipleFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'test_formatter_setting_multiple' => 'dummy test string',
       'alter' => FALSE,
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['test_formatter_setting_multiple'] = array(
+    $element['test_formatter_setting_multiple'] = [
       '#title' => t('Setting'),
       '#type' => 'textfield',
       '#size' => 20,
       '#default_value' => $this->getSetting('test_formatter_setting_multiple'),
       '#required' => TRUE,
-    );
+    ];
     return $element;
   }
 
@@ -50,8 +50,8 @@ class TestFieldMultipleFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
-    $summary[] = t('@setting: @value', array('@setting' => 'test_formatter_setting_multiple', '@value' => $this->getSetting('test_formatter_setting_multiple')));
+    $summary = [];
+    $summary[] = t('@setting: @value', ['@setting' => 'test_formatter_setting_multiple', '@value' => $this->getSetting('test_formatter_setting_multiple')]);
     return $summary;
   }
 
@@ -59,14 +59,14 @@ class TestFieldMultipleFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     if (!empty($items)) {
-      $array = array();
+      $array = [];
       foreach ($items as $delta => $item) {
         $array[] = $delta . ':' . $item->value;
       }
-      $elements[0] = array('#markup' => $this->getSetting('test_formatter_setting_multiple') . '|' . implode('|', $array));
+      $elements[0] = ['#markup' => $this->getSetting('test_formatter_setting_multiple') . '|' . implode('|', $array)];
     }
 
     return $elements;
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldNoSettingsFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldNoSettingsFormatter.php
index 0ab66d5dd..922207e51 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldNoSettingsFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldNoSettingsFormatter.php
@@ -23,11 +23,11 @@ class TestFieldNoSettingsFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
       // This formatter only needs to output raw for testing.
-      $elements[$delta] = array('#markup' => $item->value);
+      $elements[$delta] = ['#markup' => $item->value];
     }
 
     return $elements;
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php
index f7df0c0c2..39bff8d87 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php
@@ -25,22 +25,22 @@ class TestFieldPrepareViewFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'test_formatter_setting_additional' => 'dummy test string',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['test_formatter_setting_additional'] = array(
+    $element['test_formatter_setting_additional'] = [
       '#title' => t('Setting'),
       '#type' => 'textfield',
       '#size' => 20,
       '#default_value' => $this->getSetting('test_formatter_setting_additional'),
       '#required' => TRUE,
-    );
+    ];
     return $element;
   }
 
@@ -48,8 +48,8 @@ class TestFieldPrepareViewFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
-    $summary[] = t('@setting: @value', array('@setting' => 'test_formatter_setting_additional', '@value' => $this->getSetting('test_formatter_setting_additional')));
+    $summary = [];
+    $summary[] = t('@setting: @value', ['@setting' => 'test_formatter_setting_additional', '@value' => $this->getSetting('test_formatter_setting_additional')]);
     return $summary;
   }
 
@@ -71,10 +71,10 @@ class TestFieldPrepareViewFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
-      $elements[$delta] = array('#markup' => $this->getSetting('test_formatter_setting_additional') . '|' . $item->value . '|' . $item->additional_formatter_value);
+      $elements[$delta] = ['#markup' => $this->getSetting('test_formatter_setting_additional') . '|' . $item->value . '|' . $item->additional_formatter_value];
     }
 
     return $elements;
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
index 1b8822f60..2f678798a 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
@@ -24,22 +24,22 @@ class TestItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'test_field_storage_setting' => 'dummy test string',
       'changeable' => 'a changeable field storage setting',
       'unchangeable' => 'an unchangeable field storage setting',
       'translatable_storage_setting' => 'a translatable field storage setting',
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    return array(
+    return [
       'test_field_setting' => 'dummy test string',
       'translatable_field_setting' => 'a translatable field setting',
-    ) + parent::defaultFieldSettings();
+    ] + parent::defaultFieldSettings();
   }
 
   /**
@@ -57,30 +57,30 @@ class TestItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'int',
           'size' => 'medium',
-        ),
-      ),
-      'indexes' => array(
-        'value' => array('value'),
-      ),
-    );
+        ],
+      ],
+      'indexes' => [
+        'value' => ['value'],
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $form['test_field_storage_setting'] = array(
+    $form['test_field_storage_setting'] = [
       '#type' => 'textfield',
       '#title' => t('Field test field storage setting'),
       '#default_value' => $this->getSetting('test_field_storage_setting'),
       '#required' => FALSE,
       '#description' => t('A dummy form element to simulate field storage setting.'),
-    );
+    ];
 
     return $form;
   }
@@ -89,13 +89,13 @@ class TestItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
-    $form['test_field_setting'] = array(
+    $form['test_field_setting'] = [
       '#type' => 'textfield',
       '#title' => t('Field test field setting'),
       '#default_value' => $this->getSetting('test_field_setting'),
       '#required' => FALSE,
       '#description' => t('A dummy form element to simulate field setting.'),
-    );
+    ];
 
     return $form;
   }
@@ -105,7 +105,7 @@ class TestItem extends FieldItemBase {
    */
   public function delete() {
     // Reports that delete() method is executed for testing purposes.
-    field_test_memorize('field_test_field_delete', array($this->getEntity()));
+    field_test_memorize('field_test_field_delete', [$this->getEntity()]);
   }
 
   /**
@@ -115,14 +115,14 @@ class TestItem extends FieldItemBase {
     $constraint_manager = \Drupal::typedDataManager()->getValidationConstraintManager();
     $constraints = parent::getConstraints();
 
-    $constraints[] = $constraint_manager->create('ComplexData', array(
-      'value' => array(
-        'TestField' => array(
+    $constraints[] = $constraint_manager->create('ComplexData', [
+      'value' => [
+        'TestField' => [
           'value' => -1,
-          'message' => t('%name does not accept the value @value.', array('%name' => $this->getFieldDefinition()->getLabel(), '@value' => -1)),
-        )
-      ),
-    ));
+          'message' => t('%name does not accept the value @value.', ['%name' => $this->getFieldDefinition()->getLabel(), '@value' => -1]),
+        ]
+      ],
+    ]);
 
     return $constraints;
   }
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php
index 14a5b3ccf..9dd3387e5 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php
@@ -27,24 +27,24 @@ class TestFieldWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'test_widget_setting' => 'dummy test string',
       'role' => 'anonymous',
       'role2' => 'anonymous',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['test_widget_setting'] = array(
+    $element['test_widget_setting'] = [
       '#type' => 'textfield',
       '#title' => t('Field test field widget setting'),
       '#description' => t('A dummy form element to simulate field widget setting.'),
       '#default_value' => $this->getSetting('test_widget_setting'),
       '#required' => FALSE,
-    );
+    ];
     return $element;
   }
 
@@ -52,8 +52,8 @@ class TestFieldWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
-    $summary[] = t('@setting: @value', array('@setting' => 'test_widget_setting', '@value' => $this->getSetting('test_widget_setting')));
+    $summary = [];
+    $summary[] = t('@setting: @value', ['@setting' => 'test_widget_setting', '@value' => $this->getSetting('test_widget_setting')]);
     return $summary;
   }
 
@@ -61,11 +61,11 @@ class TestFieldWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element += array(
+    $element += [
       '#type' => 'textfield',
       '#default_value' => isset($items[$delta]->value) ? $items[$delta]->value : '',
-    );
-    return array('value' => $element);
+    ];
+    return ['value' => $element];
   }
 
   /**
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
index 02f2d24cb..32cf6e4c5 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
@@ -29,22 +29,22 @@ class TestFieldWidgetMultiple extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'test_widget_setting_multiple' => 'dummy test string',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['test_widget_setting_multiple'] = array(
+    $element['test_widget_setting_multiple'] = [
       '#type' => 'textfield',
       '#title' => t('Field test field widget setting'),
       '#description' => t('A dummy form element to simulate field widget setting.'),
       '#default_value' => $this->getSetting('test_widget_setting_multiple'),
       '#required' => FALSE,
-    );
+    ];
     return $element;
   }
 
@@ -52,8 +52,8 @@ class TestFieldWidgetMultiple extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
-    $summary[] = t('@setting: @value', array('@setting' => 'test_widget_setting_multiple', '@value' => $this->getSetting('test_widget_setting_multiple')));
+    $summary = [];
+    $summary[] = t('@setting: @value', ['@setting' => 'test_widget_setting_multiple', '@value' => $this->getSetting('test_widget_setting_multiple')]);
     return $summary;
   }
 
@@ -61,15 +61,15 @@ class TestFieldWidgetMultiple extends WidgetBase {
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $values = array();
+    $values = [];
     foreach ($items as $item) {
       $values[] = $item->value;
     }
-    $element += array(
+    $element += [
       '#type' => 'textfield',
       '#default_value' => implode(', ', $values),
-      '#element_validate' => array(array(get_class($this), 'multipleValidate')),
-    );
+      '#element_validate' => [[get_class($this), 'multipleValidate']],
+    ];
     return $element;
   }
 
@@ -85,9 +85,9 @@ class TestFieldWidgetMultiple extends WidgetBase {
    */
   public static function multipleValidate($element, FormStateInterface $form_state) {
     $values = array_map('trim', explode(',', $element['#value']));
-    $items = array();
+    $items = [];
     foreach ($values as $value) {
-      $items[] = array('value' => $value);
+      $items[] = ['value' => $value];
     }
     $form_state->setValueForElement($element, $items);
   }
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Validation/Constraint/TestFieldConstraint.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Validation/Constraint/TestFieldConstraint.php
index 8a511ed3e..8105a22be 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Validation/Constraint/TestFieldConstraint.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Validation/Constraint/TestFieldConstraint.php
@@ -19,7 +19,7 @@ class TestFieldConstraint extends NotEqualTo {
    * {@inheritdoc}
    */
   public function getRequiredOptions() {
-    return array('value');
+    return ['value'];
   }
 
   /**
diff --git a/web/core/modules/field/tests/modules/field_third_party_test/field_third_party_test.module b/web/core/modules/field/tests/modules/field_third_party_test/field_third_party_test.module
index 9dc2b1936..d59a0c036 100644
--- a/web/core/modules/field/tests/modules/field_third_party_test/field_third_party_test.module
+++ b/web/core/modules/field/tests/modules/field_third_party_test/field_third_party_test.module
@@ -14,11 +14,11 @@ use Drupal\Core\Form\FormStateInterface;
  * Implements hook_field_widget_third_party_settings_form().
  */
 function field_third_party_test_field_widget_third_party_settings_form(WidgetInterface $plugin, FieldDefinitionInterface $field_definition, $form_mode, $form, FormStateInterface $form_state) {
-  $element['field_test_widget_third_party_settings_form'] = array(
+  $element['field_test_widget_third_party_settings_form'] = [
     '#type' => 'textfield',
     '#title' => t('3rd party widget settings form'),
     '#default_value' => $plugin->getThirdPartySetting('field_third_party_test', 'field_test_widget_third_party_settings_form'),
-  );
+  ];
   return $element;
 }
 
@@ -34,11 +34,11 @@ function field_third_party_test_field_widget_settings_summary_alter(&$summary, $
  * Implements hook_field_formatter_third_party_settings_form().
  */
 function field_third_party_test_field_formatter_third_party_settings_form(FormatterInterface $plugin, FieldDefinitionInterface $field_definition, $view_mode, $form, FormStateInterface $form_state) {
-  $element['field_test_field_formatter_third_party_settings_form'] = array(
+  $element['field_test_field_formatter_third_party_settings_form'] = [
     '#type' => 'textfield',
     '#title' => t('3rd party formatter settings form'),
     '#default_value' => $plugin->getThirdPartySetting('field_third_party_test', 'field_test_field_formatter_third_party_settings_form'),
-  );
+  ];
   return $element;
 }
 
diff --git a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceAutoCreateTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php
similarity index 93%
rename from web/core/modules/field/src/Tests/EntityReference/EntityReferenceAutoCreateTest.php
rename to web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php
index 0f35fde5b..90895b186 100644
--- a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceAutoCreateTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Drupal\field\Tests\EntityReference;
+namespace Drupal\Tests\field\Functional\EntityReference;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
 use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\node\Entity\Node;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -15,7 +16,7 @@ use Drupal\field\Entity\FieldStorageConfig;
  *
  * @group entity_reference
  */
-class EntityReferenceAutoCreateTest extends WebTestBase {
+class EntityReferenceAutoCreateTest extends BrowserTestBase {
 
   use EntityReferenceTestTrait;
 
@@ -45,43 +46,43 @@ class EntityReferenceAutoCreateTest extends WebTestBase {
     $referenced = $this->drupalCreateContentType();
     $this->referencedType = $referenced->id();
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'test_field',
       'entity_type' => 'node',
       'translatable' => FALSE,
-      'entity_types' => array(),
-      'settings' => array(
+      'entity_types' => [],
+      'settings' => [
         'target_type' => 'node',
-      ),
+      ],
       'type' => 'entity_reference',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ))->save();
+    ])->save();
 
     FieldConfig::create([
       'label' => 'Entity reference field',
       'field_name' => 'test_field',
       'entity_type' => 'node',
       'bundle' => $referencing->id(),
-      'settings' => array(
+      'settings' => [
         'handler' => 'default',
-        'handler_settings' => array(
+        'handler_settings' => [
           // Reference a single vocabulary.
-          'target_bundles' => array(
+          'target_bundles' => [
             $referenced->id(),
-          ),
+          ],
           // Enable auto-create.
           'auto_create' => TRUE,
-        ),
-      ),
+        ],
+      ],
     ])->save();
 
     entity_get_display('node', $referencing->id(), 'default')
       ->setComponent('test_field')
       ->save();
     entity_get_form_display('node', $referencing->id(), 'default')
-      ->setComponent('test_field', array(
+      ->setComponent('test_field', [
         'type' => 'entity_reference_autocomplete',
-      ))
+      ])
       ->save();
 
     $account = $this->drupalCreateUser(['access content', "create $this->referencingType content"]);
@@ -108,10 +109,10 @@ class EntityReferenceAutoCreateTest extends WebTestBase {
     $result = $query->execute();
     $this->assertFalse($result, 'Referenced node does not exist yet.');
 
-    $edit = array(
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
       'test_field[0][target_id]' => $new_title,
-    );
+    ];
     $this->drupalPostForm("node/add/$this->referencingType", $edit, 'Save');
 
     // Assert referenced node was created.
diff --git a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
similarity index 77%
rename from web/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php
rename to web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
index 64339583d..4567bd07e 100644
--- a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Drupal\field\Tests\EntityReference;
+namespace Drupal\Tests\field\Functional\EntityReference;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\Node;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests entity reference field default values storage in CMI.
  *
  * @group entity_reference
  */
-class EntityReferenceFieldDefaultValueTest extends WebTestBase {
+class EntityReferenceFieldDefaultValueTest extends BrowserTestBase {
 
   use SchemaCheckTestTrait;
 
@@ -36,46 +36,46 @@ class EntityReferenceFieldDefaultValueTest extends WebTestBase {
     parent::setUp();
 
     // Create default content type.
-    $this->drupalCreateContentType(array('type' => 'reference_content'));
-    $this->drupalCreateContentType(array('type' => 'referenced_content'));
+    $this->drupalCreateContentType(['type' => 'reference_content']);
+    $this->drupalCreateContentType(['type' => 'referenced_content']);
 
     // Create admin user.
-    $this->adminUser = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer node form display', 'bypass node access'));
+    $this->adminUser = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node form display', 'bypass node access']);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Tests that default values are correctly translated to UUIDs in config.
    */
-  function testEntityReferenceDefaultValue() {
+  public function testEntityReferenceDefaultValue() {
     // Create a node to be referenced.
-    $referenced_node = $this->drupalCreateNode(array('type' => 'referenced_content'));
+    $referenced_node = $this->drupalCreateNode(['type' => 'referenced_content']);
 
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => 'entity_reference',
-      'settings' => array('target_type' => 'node'),
-    ));
+      'settings' => ['target_type' => 'node'],
+    ]);
     $field_storage->save();
     $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'reference_content',
-      'settings' => array(
+      'settings' => [
         'handler' => 'default',
-        'handler_settings' => array(
-          'target_bundles' => array('referenced_content'),
-          'sort' => array('field' => '_none'),
-        ),
-      ),
+        'handler_settings' => [
+          'target_bundles' => ['referenced_content'],
+          'sort' => ['field' => '_none'],
+        ],
+      ],
     ]);
     $field->save();
 
     // Set created node as default_value.
-    $field_edit = array(
+    $field_edit = [
       'default_value_input[' . $field_name . '][0][target_id]' => $referenced_node->getTitle() . ' (' . $referenced_node->id() . ')',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/reference_content/fields/node.reference_content.' . $field_name, $field_edit, t('Save settings'));
 
     // Check that default value is selected in default value form.
@@ -88,7 +88,7 @@ class EntityReferenceFieldDefaultValueTest extends WebTestBase {
     $this->assertEqual($config_entity['default_value'][0]['target_uuid'], $referenced_node->uuid(), 'Content uuid and config entity uuid are the same');
     // Ensure the configuration has the expected dependency on the entity that
     // is being used a default value.
-    $this->assertEqual(array($referenced_node->getConfigDependencyName()), $config_entity['dependencies']['content']);
+    $this->assertEqual([$referenced_node->getConfigDependencyName()], $config_entity['dependencies']['content']);
 
     // Clear field definitions cache in order to avoid stale cache values.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
@@ -109,37 +109,37 @@ class EntityReferenceFieldDefaultValueTest extends WebTestBase {
    *
    * @see \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem::onDependencyRemoval()
    */
-  function testEntityReferenceDefaultConfigValue() {
+  public function testEntityReferenceDefaultConfigValue() {
     // Create a node to be referenced.
-    $referenced_node_type = $this->drupalCreateContentType(array('type' => 'referenced_config_to_delete'));
-    $referenced_node_type2 = $this->drupalCreateContentType(array('type' => 'referenced_config_to_preserve'));
+    $referenced_node_type = $this->drupalCreateContentType(['type' => 'referenced_config_to_delete']);
+    $referenced_node_type2 = $this->drupalCreateContentType(['type' => 'referenced_config_to_preserve']);
 
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => 'entity_reference',
-      'settings' => array('target_type' => 'node_type'),
+      'settings' => ['target_type' => 'node_type'],
       'cardinality' => FieldStorageConfig::CARDINALITY_UNLIMITED,
-    ));
+    ]);
     $field_storage->save();
     $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'reference_content',
-      'settings' => array(
+      'settings' => [
         'handler' => 'default',
-        'handler_settings' => array(
-          'sort' => array('field' => '_none'),
-        ),
-      ),
+        'handler_settings' => [
+          'sort' => ['field' => '_none'],
+        ],
+      ],
     ]);
     $field->save();
 
     // Set created node as default_value.
-    $field_edit = array(
+    $field_edit = [
       'default_value_input[' . $field_name . '][0][target_id]' => $referenced_node_type->label() . ' (' . $referenced_node_type->id() . ')',
       'default_value_input[' . $field_name . '][1][target_id]' => $referenced_node_type2->label() . ' (' . $referenced_node_type2->id() . ')',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/reference_content/fields/node.reference_content.' . $field_name, $field_edit, t('Save settings'));
 
     // Check that the field has a dependency on the default value.
diff --git a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
similarity index 86%
rename from web/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
rename to web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
index f0856d37b..889bd1aca 100644
--- a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\field\Tests\EntityReference;
+namespace Drupal\Tests\field\Functional\EntityReference;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -13,7 +13,7 @@ use Drupal\field\Entity\FieldStorageConfig;
  *
  * @group entity_reference
  */
-class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase {
+class EntityReferenceFieldTranslatedReferenceViewTest extends BrowserTestBase {
 
   /**
    * Flag indicating whether the field is translatable.
@@ -111,11 +111,11 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'language',
     'content_translation',
     'node',
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
@@ -203,20 +203,20 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase {
    * Adds term reference field for the article content type.
    */
   protected function setUpEntityReferenceField() {
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $this->referenceFieldName,
       'entity_type' => $this->testEntityTypeName,
       'type' => 'entity_reference',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
       'translatable' => $this->translatable,
-      'settings' => array(
-        'allowed_values' => array(
-          array(
+      'settings' => [
+        'allowed_values' => [
+          [
             'target_type' => $this->testEntityTypeName,
-          ),
-        ),
-      ),
-    ))->save();
+          ],
+        ],
+      ],
+    ])->save();
 
     FieldConfig::create([
       'field_name' => $this->referenceFieldName,
@@ -225,14 +225,14 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase {
     ])
       ->save();
     entity_get_form_display($this->testEntityTypeName, $this->referrerType->id(), 'default')
-      ->setComponent($this->referenceFieldName, array(
+      ->setComponent($this->referenceFieldName, [
         'type' => 'entity_reference_autocomplete',
-      ))
+      ])
       ->save();
     entity_get_display($this->testEntityTypeName, $this->referrerType->id(), 'default')
-      ->setComponent($this->referenceFieldName, array(
+      ->setComponent($this->referenceFieldName, [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
   }
 
@@ -240,14 +240,14 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase {
    * Create content types.
    */
   protected function setUpContentTypes() {
-    $this->referrerType = $this->drupalCreateContentType(array(
+    $this->referrerType = $this->drupalCreateContentType([
         'type' => 'referrer',
         'name' => 'Referrer',
-      ));
-    $this->referencedType = $this->drupalCreateContentType(array(
+      ]);
+    $this->referencedType = $this->drupalCreateContentType([
         'type' => 'referenced_page',
         'name' => 'Referenced Page',
-      ));
+      ]);
   }
 
   /**
@@ -255,19 +255,19 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase {
    */
   protected function createReferencedEntityWithTranslation() {
     /** @var \Drupal\node\Entity\Node $node */
-    $node = entity_create($this->testEntityTypeName, array(
+    $node = entity_create($this->testEntityTypeName, [
       'title' => $this->originalLabel,
       'type' => $this->referencedType->id(),
-      'description' => array(
+      'description' => [
         'value' => $this->randomMachineName(),
         'format' => 'basic_html',
-      ),
+      ],
       'langcode' => $this->baseLangcode,
-    ));
+    ]);
     $node->save();
-    $node->addTranslation($this->translateToLangcode, array(
+    $node->addTranslation($this->translateToLangcode, [
       'title' => $this->translatedLabel,
-    ));
+    ]);
     $node->save();
 
     return $node;
@@ -279,15 +279,15 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase {
    */
   protected function createNotTranslatedReferencedEntity() {
     /** @var \Drupal\node\Entity\Node $node */
-    $node = entity_create($this->testEntityTypeName, array(
+    $node = entity_create($this->testEntityTypeName, [
       'title' => $this->labelOfNotTranslatedReference,
       'type' => $this->referencedType->id(),
-      'description' => array(
+      'description' => [
         'value' => $this->randomMachineName(),
         'format' => 'basic_html',
-      ),
+      ],
       'langcode' => $this->baseLangcode,
-    ));
+    ]);
     $node->save();
 
     return $node;
@@ -298,19 +298,19 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase {
    */
   protected function createReferrerEntity($translatable = TRUE) {
     /** @var \Drupal\node\Entity\Node $node */
-    $node = entity_create($this->testEntityTypeName, array(
+    $node = entity_create($this->testEntityTypeName, [
       'title' => $this->randomMachineName(),
       'type' => $this->referrerType->id(),
-      'description' => array(
+      'description' => [
         'value' => $this->randomMachineName(),
         'format' => 'basic_html',
-      ),
-      $this->referenceFieldName => array(
-        array('target_id' => $this->referencedEntityWithTranslation->id()),
-        array('target_id' => $this->referencedEntityWithoutTranslation->id()),
-      ),
+      ],
+      $this->referenceFieldName => [
+        ['target_id' => $this->referencedEntityWithTranslation->id()],
+        ['target_id' => $this->referencedEntityWithoutTranslation->id()],
+      ],
       'langcode' => $this->baseLangcode,
-    ));
+    ]);
     if ($translatable) {
       $node->addTranslation($this->translateToLangcode, $node->toArray());
     }
diff --git a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceIntegrationTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
similarity index 85%
rename from web/core/modules/field/src/Tests/EntityReference/EntityReferenceIntegrationTest.php
rename to web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
index 4c099febf..56484705e 100644
--- a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceIntegrationTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
@@ -1,19 +1,20 @@
 <?php
 
-namespace Drupal\field\Tests\EntityReference;
+namespace Drupal\Tests\field\Functional\EntityReference;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\config\Tests\AssertConfigEntityImportTrait;
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
 
 /**
  * Tests various Entity reference UI components.
  *
  * @group entity_reference
  */
-class EntityReferenceIntegrationTest extends WebTestBase {
+class EntityReferenceIntegrationTest extends BrowserTestBase {
 
   use AssertConfigEntityImportTrait;
   use EntityReferenceTestTrait;
@@ -53,7 +54,7 @@ class EntityReferenceIntegrationTest extends WebTestBase {
     parent::setUp();
 
     // Create a test user.
-    $web_user = $this->drupalCreateUser(array('administer entity_test content', 'administer entity_test fields', 'view test entity'));
+    $web_user = $this->drupalCreateUser(['administer entity_test content', 'administer entity_test fields', 'view test entity']);
     $this->drupalLogin($web_user);
   }
 
@@ -65,18 +66,18 @@ class EntityReferenceIntegrationTest extends WebTestBase {
       $this->fieldName = 'field_test_' . $referenced_entities[0]->getEntityTypeId();
 
       // Create an Entity reference field.
-      $this->createEntityReferenceField($this->entityType, $this->bundle, $this->fieldName, $this->fieldName, $referenced_entities[0]->getEntityTypeId(), 'default', array(), 2);
+      $this->createEntityReferenceField($this->entityType, $this->bundle, $this->fieldName, $this->fieldName, $referenced_entities[0]->getEntityTypeId(), 'default', [], 2);
 
       // Test the default 'entity_reference_autocomplete' widget.
       entity_get_form_display($this->entityType, $this->bundle, 'default')->setComponent($this->fieldName)->save();
 
       $entity_name = $this->randomMachineName();
-      $edit = array(
+      $edit = [
         'name[0][value]' => $entity_name,
         $this->fieldName . '[0][target_id]' => $referenced_entities[0]->label() . ' (' . $referenced_entities[0]->id() . ')',
         // Test an input of the entity label without a ' (entity_id)' suffix.
         $this->fieldName . '[1][target_id]' => $referenced_entities[1]->label(),
-      );
+      ];
       $this->drupalPostForm($this->entityType . '/add', $edit, t('Save'));
       $this->assertFieldValues($entity_name, $referenced_entities);
 
@@ -89,22 +90,22 @@ class EntityReferenceIntegrationTest extends WebTestBase {
       $this->assertFieldByName($this->fieldName . '[0][target_id]', $referenced_entities[0]->label() . ' (' . $referenced_entities[0]->id() . ')');
       $this->assertFieldByName($this->fieldName . '[1][target_id]', $referenced_entities[1]->label() . ' (' . $referenced_entities[1]->id() . ')');
 
-      $this->drupalPostForm(NULL, array(), t('Save'));
+      $this->drupalPostForm(NULL, [], t('Save'));
       $this->assertFieldValues($entity_name, $referenced_entities);
 
       // Test the 'entity_reference_autocomplete_tags' widget.
-      entity_get_form_display($this->entityType, $this->bundle, 'default')->setComponent($this->fieldName, array(
+      entity_get_form_display($this->entityType, $this->bundle, 'default')->setComponent($this->fieldName, [
         'type' => 'entity_reference_autocomplete_tags',
-      ))->save();
+      ])->save();
 
       $entity_name = $this->randomMachineName();
       $target_id = $referenced_entities[0]->label() . ' (' . $referenced_entities[0]->id() . ')';
       // Test an input of the entity label without a ' (entity_id)' suffix.
       $target_id .= ', ' . $referenced_entities[1]->label();
-      $edit = array(
+      $edit = [
         'name[0][value]' => $entity_name,
         $this->fieldName . '[target_id]' => $target_id,
-      );
+      ];
       $this->drupalPostForm($this->entityType . '/add', $edit, t('Save'));
       $this->assertFieldValues($entity_name, $referenced_entities);
 
@@ -114,23 +115,23 @@ class EntityReferenceIntegrationTest extends WebTestBase {
       $this->drupalGet($this->entityType . '/manage/' . $entity->id() . '/edit');
       $this->assertFieldByName($this->fieldName . '[target_id]', $target_id . ' (' . $referenced_entities[1]->id() . ')');
 
-      $this->drupalPostForm(NULL, array(), t('Save'));
+      $this->drupalPostForm(NULL, [], t('Save'));
       $this->assertFieldValues($entity_name, $referenced_entities);
 
       // Test all the other widgets supported by the entity reference field.
       // Since we don't know the form structure for these widgets, just test
       // that editing and saving an already created entity works.
-      $exclude = array('entity_reference_autocomplete', 'entity_reference_autocomplete_tags');
+      $exclude = ['entity_reference_autocomplete', 'entity_reference_autocomplete_tags'];
       $entity = current($storage->loadByProperties(['name' => $entity_name]));
       $supported_widgets = \Drupal::service('plugin.manager.field.widget')->getOptions('entity_reference');
       $supported_widget_types = array_diff(array_keys($supported_widgets), $exclude);
 
       foreach ($supported_widget_types as $widget_type) {
-        entity_get_form_display($this->entityType, $this->bundle, 'default')->setComponent($this->fieldName, array(
+        entity_get_form_display($this->entityType, $this->bundle, 'default')->setComponent($this->fieldName, [
           'type' => $widget_type,
-        ))->save();
+        ])->save();
 
-        $this->drupalPostForm($this->entityType . '/manage/' . $entity->id() . '/edit', array(), t('Save'));
+        $this->drupalPostForm($this->entityType . '/manage/' . $entity->id() . '/edit', [], t('Save'));
         $this->assertFieldValues($entity_name, $referenced_entities);
       }
 
@@ -138,9 +139,9 @@ class EntityReferenceIntegrationTest extends WebTestBase {
       entity_get_form_display($this->entityType, $this->bundle, 'default')->setComponent($this->fieldName)->save();
 
       // Set first entity as the default_value.
-      $field_edit = array(
+      $field_edit = [
         'default_value_input[' . $this->fieldName . '][0][target_id]' => $referenced_entities[0]->label() . ' (' . $referenced_entities[0]->id() . ')',
-      );
+      ];
       if ($key == 'content') {
         $field_edit['settings[handler_settings][target_bundles][' . $referenced_entities[0]->getEntityTypeId() . ']'] = TRUE;
       }
@@ -178,7 +179,7 @@ class EntityReferenceIntegrationTest extends WebTestBase {
     $entity = current($this->container->get('entity_type.manager')->getStorage(
     $this->entityType)->loadByProperties(['name' => $entity_name]));
 
-    $this->assertTrue($entity, format_string('%entity_type: Entity found in the database.', array('%entity_type' => $this->entityType)));
+    $this->assertTrue($entity, format_string('%entity_type: Entity found in the database.', ['%entity_type' => $this->entityType]));
 
     $this->assertEqual($entity->{$this->fieldName}->target_id, $referenced_entities[0]->id());
     $this->assertEqual($entity->{$this->fieldName}->entity->id(), $referenced_entities[0]->id());
@@ -196,26 +197,26 @@ class EntityReferenceIntegrationTest extends WebTestBase {
    *   An array of entity objects.
    */
   protected function getTestEntities() {
-    $config_entity_1 = entity_create('config_test', array('id' => $this->randomMachineName(), 'label' => $this->randomMachineName()));
+    $config_entity_1 = entity_create('config_test', ['id' => $this->randomMachineName(), 'label' => $this->randomMachineName()]);
     $config_entity_1->save();
-    $config_entity_2 = entity_create('config_test', array('id' => $this->randomMachineName(), 'label' => $this->randomMachineName()));
+    $config_entity_2 = entity_create('config_test', ['id' => $this->randomMachineName(), 'label' => $this->randomMachineName()]);
     $config_entity_2->save();
 
-    $content_entity_1 = EntityTest::create(array('name' => $this->randomMachineName()));
+    $content_entity_1 = EntityTest::create(['name' => $this->randomMachineName()]);
     $content_entity_1->save();
-    $content_entity_2 = EntityTest::create(array('name' => $this->randomMachineName()));
+    $content_entity_2 = EntityTest::create(['name' => $this->randomMachineName()]);
     $content_entity_2->save();
 
-    return array(
-      'config' => array(
+    return [
+      'config' => [
         $config_entity_1,
         $config_entity_2,
-      ),
-      'content' => array(
+      ],
+      'content' => [
         $content_entity_1,
         $content_entity_2,
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceXSSTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceXSSTest.php
similarity index 91%
rename from web/core/modules/field/src/Tests/EntityReference/EntityReferenceXSSTest.php
rename to web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceXSSTest.php
index f72312f4e..46986ec47 100644
--- a/web/core/modules/field/src/Tests/EntityReference/EntityReferenceXSSTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceXSSTest.php
@@ -1,17 +1,18 @@
 <?php
 
-namespace Drupal\field\Tests\EntityReference;
+namespace Drupal\Tests\field\Functional\EntityReference;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
 
 /**
  * Tests possible XSS security issues in entity references.
  *
  * @group entity_reference
  */
-class EntityReferenceXSSTest extends WebTestBase {
+class EntityReferenceXSSTest extends BrowserTestBase {
 
   use EntityReferenceTestTrait;
 
diff --git a/web/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/Views/SelectionTest.php
similarity index 82%
rename from web/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php
rename to web/core/modules/field/tests/src/Functional/EntityReference/Views/SelectionTest.php
index e677dbc4a..cfb5ecf08 100644
--- a/web/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/Views/SelectionTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\field\Tests\EntityReference\Views;
+namespace Drupal\Tests\field\Functional\EntityReference\Views;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\views\Views;
 use Drupal\field\Entity\FieldStorageConfig;
 
@@ -12,7 +12,7 @@ use Drupal\field\Entity\FieldStorageConfig;
  *
  * @group entity_reference
  */
-class SelectionTest extends WebTestBase {
+class SelectionTest extends BrowserTestBase {
 
   public static $modules = ['node', 'views', 'entity_reference_test', 'entity_test'];
 
@@ -21,7 +21,7 @@ class SelectionTest extends WebTestBase {
    *
    * @var array
    */
-  protected $nodes = array();
+  protected $nodes = [];
 
   /**
    * The entity reference field to test.
@@ -38,39 +38,39 @@ class SelectionTest extends WebTestBase {
 
     // Create nodes.
     $type = $this->drupalCreateContentType()->id();
-    $node1 = $this->drupalCreateNode(array('type' => $type));
-    $node2 = $this->drupalCreateNode(array('type' => $type));
+    $node1 = $this->drupalCreateNode(['type' => $type]);
+    $node2 = $this->drupalCreateNode(['type' => $type]);
     $node3 = $this->drupalCreateNode();
 
-    foreach (array($node1, $node2, $node3) as $node) {
+    foreach ([$node1, $node2, $node3] as $node) {
       $this->nodes[$node->getType()][$node->id()] = $node->label();
     }
 
     // Create a field.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'test_field',
       'entity_type' => 'entity_test',
       'translatable' => FALSE,
-      'settings' => array(
+      'settings' => [
         'target_type' => 'node',
-      ),
+      ],
       'type' => 'entity_reference',
       'cardinality' => '1',
-    ));
+    ]);
     $field_storage->save();
     $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'test_bundle',
-      'settings' => array(
+      'settings' => [
         'handler' => 'views',
-        'handler_settings' => array(
-          'view' => array(
+        'handler_settings' => [
+          'view' => [
             'view_name' => 'test_entity_reference',
             'display_name' => 'entity_reference_1',
-            'arguments' => array(),
-          ),
-        ),
-      ),
+            'arguments' => [],
+          ],
+        ],
+      ],
     ]);
     $field->save();
     $this->field = $field;
@@ -112,23 +112,23 @@ class SelectionTest extends WebTestBase {
     // Add a relationship to the view.
     $view = Views::getView('test_entity_reference');
     $view->setDisplay();
-    $view->displayHandlers->get('default')->setOption('relationships', array(
-      'test_relationship' => array(
+    $view->displayHandlers->get('default')->setOption('relationships', [
+      'test_relationship' => [
         'id' => 'uid',
         'table' => 'node_field_data',
         'field' => 'uid',
-      ),
-    ));
+      ],
+    ]);
 
     // Add a filter depending on the relationship to the test view.
-    $view->displayHandlers->get('default')->setOption('filters', array(
-      'uid' => array(
+    $view->displayHandlers->get('default')->setOption('filters', [
+      'uid' => [
         'id' => 'uid',
         'table' => 'users_field_data',
         'field' => 'uid',
         'relationship' => 'test_relationship',
-      )
-    ));
+      ]
+    ]);
 
     // Set view to distinct so only one row per node is returned.
     $query_options = $view->display_handler->getOption('query');
diff --git a/web/core/modules/field/src/Tests/FieldAccessTest.php b/web/core/modules/field/tests/src/Functional/FieldAccessTest.php
similarity index 82%
rename from web/core/modules/field/src/Tests/FieldAccessTest.php
rename to web/core/modules/field/tests/src/Functional/FieldAccessTest.php
index 05534060b..c7f234fd4 100644
--- a/web/core/modules/field/src/Tests/FieldAccessTest.php
+++ b/web/core/modules/field/tests/src/Functional/FieldAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -17,7 +17,7 @@ class FieldAccessTest extends FieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field_test');
+  public static $modules = ['node', 'field_test'];
 
   /**
    * Node entity to use in this test.
@@ -36,28 +36,28 @@ class FieldAccessTest extends FieldTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $web_user = $this->drupalCreateUser(array('view test_view_field content'));
+    $web_user = $this->drupalCreateUser(['view test_view_field content']);
     $this->drupalLogin($web_user);
 
     // Create content type.
     $content_type_info = $this->drupalCreateContentType();
     $content_type = $content_type_info->id();
 
-    $field_storage = array(
+    $field_storage = [
       'field_name' => 'test_view_field',
       'entity_type' => 'node',
       'type' => 'text',
-    );
+    ];
     FieldStorageConfig::create($field_storage)->save();
-    $field = array(
+    $field = [
       'field_name' => $field_storage['field_name'],
       'entity_type' => 'node',
       'bundle' => $content_type,
-    );
+    ];
     FieldConfig::create($field)->save();
 
     // Assign display properties for the 'default' and 'teaser' view modes.
-    foreach (array('default', 'teaser') as $view_mode) {
+    foreach (['default', 'teaser'] as $view_mode) {
       entity_get_display('node', $content_type, $view_mode)
         ->setComponent($field_storage['field_name'])
         ->save();
@@ -65,17 +65,17 @@ class FieldAccessTest extends FieldTestBase {
 
     // Create test node.
     $this->testViewFieldValue = 'This is some text';
-    $settings = array();
+    $settings = [];
     $settings['type'] = $content_type;
     $settings['title'] = 'Field view access test';
-    $settings['test_view_field'] = array(array('value' => $this->testViewFieldValue));
+    $settings['test_view_field'] = [['value' => $this->testViewFieldValue]];
     $this->node = $this->drupalCreateNode($settings);
   }
 
   /**
    * Test that hook_entity_field_access() is called.
    */
-  function testFieldAccess() {
+  public function testFieldAccess() {
 
     // Assert the text is visible.
     $this->drupalGet('node/' . $this->node->id());
diff --git a/web/core/modules/field/src/Tests/FieldHelpTest.php b/web/core/modules/field/tests/src/Functional/FieldHelpTest.php
similarity index 79%
rename from web/core/modules/field/src/Tests/FieldHelpTest.php
rename to web/core/modules/field/tests/src/Functional/FieldHelpTest.php
index 110332040..9a6ff6782 100644
--- a/web/core/modules/field/src/Tests/FieldHelpTest.php
+++ b/web/core/modules/field/tests/src/Functional/FieldHelpTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests help display for the Field module.
  *
  * @group field
  */
-class FieldHelpTest extends WebTestBase {
+class FieldHelpTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array.
    */
-  public static $modules = array('field', 'help');
+  public static $modules = ['field', 'help'];
 
   // Tests field help implementation without optional core modules enabled.
   protected $profile = 'minimal';
@@ -30,7 +30,7 @@ class FieldHelpTest extends WebTestBase {
     parent::setUp();
 
     // Create the admin user.
-    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'view the administration theme'));
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'view the administration theme']);
   }
 
   /**
@@ -44,7 +44,7 @@ class FieldHelpTest extends WebTestBase {
     $this->drupalGet('admin/help/field');
 
     // Enable the Options, Email and Field API Test modules.
-    \Drupal::service('module_installer')->install(array('options', 'field_test'));
+    \Drupal::service('module_installer')->install(['options', 'field_test']);
     $this->resetAll();
     \Drupal::service('plugin.manager.field.widget')->clearCachedDefinitions();
     \Drupal::service('plugin.manager.field.field_type')->clearCachedDefinitions();
diff --git a/web/core/modules/field/tests/src/Functional/FieldTestBase.php b/web/core/modules/field/tests/src/Functional/FieldTestBase.php
new file mode 100644
index 000000000..bdd60737a
--- /dev/null
+++ b/web/core/modules/field/tests/src/Functional/FieldTestBase.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\Tests\field\Functional;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Parent class for Field API tests.
+ */
+abstract class FieldTestBase extends BrowserTestBase {
+
+  /**
+   * Generate random values for a field_test field.
+   *
+   * @param $cardinality
+   *   Number of values to generate.
+   * @return
+   *   An array of random values, in the format expected for field values.
+   */
+  public function _generateTestFieldValues($cardinality) {
+    $values = [];
+    for ($i = 0; $i < $cardinality; $i++) {
+      // field_test fields treat 0 as 'empty value'.
+      $values[$i]['value'] = mt_rand(1, 127);
+    }
+    return $values;
+  }
+
+  /**
+   * Assert that a field has the expected values in an entity.
+   *
+   * This function only checks a single column in the field values.
+   *
+   * @param EntityInterface $entity
+   *   The entity to test.
+   * @param $field_name
+   *   The name of the field to test
+   * @param $expected_values
+   *   The array of expected values.
+   * @param $langcode
+   *   (Optional) The language code for the values. Defaults to
+   *   \Drupal\Core\Language\LanguageInterface::LANGCODE_DEFAULT.
+   * @param $column
+   *   (Optional) The name of the column to check. Defaults to 'value'.
+   */
+  public function assertFieldValues(EntityInterface $entity, $field_name, $expected_values, $langcode = LanguageInterface::LANGCODE_DEFAULT, $column = 'value') {
+    // Re-load the entity to make sure we have the latest changes.
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage($entity->getEntityTypeId());
+    $storage->resetCache([$entity->id()]);
+    $e = $storage->load($entity->id());
+
+    $field = $values = $e->getTranslation($langcode)->$field_name;
+    // Filter out empty values so that they don't mess with the assertions.
+    $field->filterEmptyItems();
+    $values = $field->getValue();
+    $this->assertEqual(count($values), count($expected_values), 'Expected number of values were saved.');
+    foreach ($expected_values as $key => $value) {
+      $this->assertEqual($values[$key][$column], $value, format_string('Value @value was saved correctly.', ['@value' => $value]));
+    }
+  }
+
+}
diff --git a/web/core/modules/field/src/Tests/TranslationWebTest.php b/web/core/modules/field/tests/src/Functional/TranslationWebTest.php
similarity index 84%
rename from web/core/modules/field/src/Tests/TranslationWebTest.php
rename to web/core/modules/field/tests/src/Functional/TranslationWebTest.php
index 5271fd28a..19af64d91 100644
--- a/web/core/modules/field/src/Tests/TranslationWebTest.php
+++ b/web/core/modules/field/tests/src/Functional/TranslationWebTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\field\Tests;
+namespace Drupal\Tests\field\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -19,7 +19,7 @@ class TranslationWebTest extends FieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'field_test', 'entity_test');
+  public static $modules = ['language', 'field_test', 'entity_test'];
 
   /**
    * The name of the field to use in this test.
@@ -54,19 +54,19 @@ class TranslationWebTest extends FieldTestBase {
 
     $this->fieldName = Unicode::strtolower($this->randomMachineName() . '_field_name');
 
-    $field_storage = array(
+    $field_storage = [
       'field_name' => $this->fieldName,
       'entity_type' => $this->entityTypeId,
       'type' => 'test_field',
       'cardinality' => 4,
-    );
+    ];
     FieldStorageConfig::create($field_storage)->save();
     $this->fieldStorage = FieldStorageConfig::load($this->entityTypeId . '.' . $this->fieldName);
 
-    $field = array(
+    $field = [
       'field_storage' => $this->fieldStorage,
       'bundle' => $this->entityTypeId,
-    );
+    ];
     FieldConfig::create($field)->save();
     $this->field = FieldConfig::load($this->entityTypeId . '.' . $field['bundle'] . '.' . $this->fieldName);
 
@@ -75,18 +75,18 @@ class TranslationWebTest extends FieldTestBase {
       ->save();
 
     for ($i = 0; $i < 3; ++$i) {
-      ConfigurableLanguage::create(array(
+      ConfigurableLanguage::create([
         'id' => 'l' . $i,
         'label' => $this->randomString(),
-      ))->save();
+      ])->save();
     }
   }
 
   /**
    * Tests field translations when creating a new revision.
    */
-  function testFieldFormTranslationRevisions() {
-    $web_user = $this->drupalCreateUser(array('view test entity', 'administer entity_test content'));
+  public function testFieldFormTranslationRevisions() {
+    $web_user = $this->drupalCreateUser(['view test entity', 'administer entity_test content']);
     $this->drupalLogin($web_user);
 
     // Prepare the field translations.
@@ -107,10 +107,10 @@ class TranslationWebTest extends FieldTestBase {
     $entity->save();
 
     // Create a new revision.
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $entity->{$field_name}->value,
       'revision' => TRUE,
-    );
+    ];
     $this->drupalPostForm($this->entityTypeId . '/manage/' . $entity->id() . '/edit', $edit, t('Save'));
 
     // Check translation revisions.
@@ -124,10 +124,12 @@ class TranslationWebTest extends FieldTestBase {
    */
   private function checkTranslationRevisions($id, $revision_id, $available_langcodes) {
     $field_name = $this->fieldStorage->getName();
-    $entity = entity_revision_load($this->entityTypeId, $revision_id);
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId)
+      ->loadRevision($revision_id);
     foreach ($available_langcodes as $langcode => $value) {
       $passed = $entity->getTranslation($langcode)->{$field_name}->value == $value + 1;
-      $this->assertTrue($passed, format_string('The @language translation for revision @revision was correctly stored', array('@language' => $langcode, '@revision' => $entity->getRevisionId())));
+      $this->assertTrue($passed, format_string('The @language translation for revision @revision was correctly stored', ['@language' => $langcode, '@revision' => $entity->getRevisionId()]));
     }
   }
 
diff --git a/web/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php b/web/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php
index cb8b501a0..37acab86c 100644
--- a/web/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php
@@ -23,11 +23,11 @@ class BooleanItemTest extends FieldKernelTestBase {
     parent::setUp();
 
     // Create a boolean field and storage for validation.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_boolean',
       'entity_type' => 'entity_test',
       'type' => 'boolean',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_boolean',
@@ -36,9 +36,9 @@ class BooleanItemTest extends FieldKernelTestBase {
 
     // Create a form display for the default form mode.
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent('field_boolean', array(
+      ->setComponent('field_boolean', [
         'type' => 'boolean_checkbox',
-      ))
+      ])
       ->save();
   }
 
diff --git a/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php b/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
index b01926ad8..900c154b4 100644
--- a/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
+++ b/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
@@ -58,7 +58,7 @@ class BulkDeleteTest extends FieldKernelTestBase {
    * @param $actual_hooks
    *   The array of actual hook invocations recorded by field_test_memorize().
    */
-  function checkHooksInvocations($expected_hooks, $actual_hooks) {
+  public function checkHooksInvocations($expected_hooks, $actual_hooks) {
     foreach ($expected_hooks as $hook => $invocations) {
       $actual_invocations = $actual_hooks[$hook];
 
@@ -90,31 +90,31 @@ class BulkDeleteTest extends FieldKernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->fieldStorages = array();
-    $this->entities = array();
-    $this->entitiesByBundles = array();
+    $this->fieldStorages = [];
+    $this->entities = [];
+    $this->entitiesByBundles = [];
 
     // Create two bundles.
-    $this->bundles = array('bb_1' => 'bb_1', 'bb_2' => 'bb_2');
+    $this->bundles = ['bb_1' => 'bb_1', 'bb_2' => 'bb_2'];
     foreach ($this->bundles as $name => $desc) {
       entity_test_create_bundle($name, $desc);
     }
 
     // Create two field storages.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'bf_1',
       'entity_type' => $this->entityTypeId,
       'type' => 'test_field',
       'cardinality' => 1
-    ));
+    ]);
     $field_storage->save();
     $this->fieldStorages[] = $field_storage;
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'bf_2',
       'entity_type' => $this->entityTypeId,
       'type' => 'test_field',
       'cardinality' => 4
-    ));
+    ]);
     $field_storage->save();
     $this->fieldStorages[] = $field_storage;
 
@@ -130,7 +130,7 @@ class BulkDeleteTest extends FieldKernelTestBase {
       for ($i = 0; $i < 10; $i++) {
         $entity = $this->container->get('entity_type.manager')
           ->getStorage($this->entityTypeId)
-          ->create(array('type' => $bundle));
+          ->create(['type' => $bundle]);
         foreach ($this->fieldStorages as $field_storage) {
           $entity->{$field_storage->getName()}->setValue($this->_generateTestFieldValues($field_storage->getCardinality()));
         }
@@ -158,7 +158,7 @@ class BulkDeleteTest extends FieldKernelTestBase {
    * This tests how EntityFieldQuery interacts with field deletion and could be
    * moved to FieldCrudTestCase, but depends on this class's setUp().
    */
-  function testDeleteField() {
+  public function testDeleteField() {
     $bundle = reset($this->bundles);
     $field_storage = reset($this->fieldStorages);
     $field_name = $field_storage->getName();
@@ -175,7 +175,7 @@ class BulkDeleteTest extends FieldKernelTestBase {
     $field->delete();
 
     // The field still exists, deleted.
-    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
+    $fields = entity_load_multiple_by_properties('field_config', ['field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE]);
     $this->assertEqual(count($fields), 1, 'There is one deleted field');
     $field = $fields[$field->uuid()];
     $this->assertEqual($field->getTargetBundle(), $bundle, 'The deleted field is for the correct bundle');
@@ -218,12 +218,12 @@ class BulkDeleteTest extends FieldKernelTestBase {
     $bundle = reset($this->bundles);
     // Create another field storage.
     $field_name = 'bf_3';
-    $deleted_field_storage = FieldStorageConfig::create(array(
+    $deleted_field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => $this->entityTypeId,
       'type' => 'test_field',
       'cardinality' => 1
-    ));
+    ]);
     $deleted_field_storage->save();
     // Create the field.
     FieldConfig::create([
@@ -234,7 +234,7 @@ class BulkDeleteTest extends FieldKernelTestBase {
     for ($i = 0; $i < 20; $i++) {
       $entity = $this->container->get('entity_type.manager')
         ->getStorage($this->entityTypeId)
-        ->create(array('type' => $bundle));
+        ->create(['type' => $bundle]);
       $entity->{$field_name}->setValue($this->_generateTestFieldValues(1));
       $entity->save();
     }
@@ -245,16 +245,16 @@ class BulkDeleteTest extends FieldKernelTestBase {
     $deleted_field_uuid = $deleted_field->uuid();
 
     // Reload the field storage.
-    $field_storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $deleted_field_storage->uuid(), 'include_deleted' => TRUE));
+    $field_storages = entity_load_multiple_by_properties('field_storage_config', ['uuid' => $deleted_field_storage->uuid(), 'include_deleted' => TRUE]);
     $deleted_field_storage = reset($field_storages);
 
     // Create the field again.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => $this->entityTypeId,
       'type' => 'test_field',
       'cardinality' => 1
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -262,14 +262,14 @@ class BulkDeleteTest extends FieldKernelTestBase {
     ])->save();
 
     // The field still exists, deleted, with the same field name.
-    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $deleted_field_uuid, 'include_deleted' => TRUE));
+    $fields = entity_load_multiple_by_properties('field_config', ['uuid' => $deleted_field_uuid, 'include_deleted' => TRUE]);
     $this->assertTrue(isset($fields[$deleted_field_uuid]) && $fields[$deleted_field_uuid]->isDeleted(), 'The field exists and is deleted');
     $this->assertTrue(isset($fields[$deleted_field_uuid]) && $fields[$deleted_field_uuid]->getName() == $field_name);
 
     for ($i = 0; $i < 10; $i++) {
       $entity = $this->container->get('entity_type.manager')
         ->getStorage($this->entityTypeId)
-        ->create(array('type' => $bundle));
+        ->create(['type' => $bundle]);
       $entity->{$field_name}->setValue($this->_generateTestFieldValues(1));
       $entity->save();
     }
@@ -289,13 +289,13 @@ class BulkDeleteTest extends FieldKernelTestBase {
     $this->assertFalse(\Drupal::database()->schema()->tableExists($deleted_table_name));
 
     // The field has been removed from the system.
-    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $deleted_field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
+    $fields = entity_load_multiple_by_properties('field_config', ['field_storage_uuid' => $deleted_field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE]);
     $this->assertEqual(count($fields), 0, 'The field is gone');
 
     // Verify there are still 10 entries in the main table.
     $count = \Drupal::database()
       ->select('entity_test__' . $field_name, 'f')
-      ->fields('f', array('entity_id'))
+      ->fields('f', ['entity_id'])
       ->condition('bundle', $bundle)
       ->countQuery()
       ->execute()
@@ -307,7 +307,7 @@ class BulkDeleteTest extends FieldKernelTestBase {
    * Verify that field data items and fields are purged when a field storage is
    * deleted.
    */
-  function testPurgeField() {
+  public function testPurgeField() {
     // Start recording hook invocations.
     field_test_memorize();
 
@@ -340,7 +340,7 @@ class BulkDeleteTest extends FieldKernelTestBase {
     // FieldItemInterface::delete() should have been called once for each entity in the
     // bundle.
     $actual_hooks = field_test_memorize();
-    $hooks = array();
+    $hooks = [];
     $entities = $this->entitiesByBundles[$bundle];
     foreach ($entities as $id => $entity) {
       $hooks['field_test_field_delete'][] = $entity;
@@ -348,19 +348,19 @@ class BulkDeleteTest extends FieldKernelTestBase {
     $this->checkHooksInvocations($hooks, $actual_hooks);
 
     // The field still exists, deleted.
-    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
+    $fields = entity_load_multiple_by_properties('field_config', ['field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE]);
     $this->assertEqual(count($fields), 1, 'There is one deleted field');
 
     // Purge the field.
     field_purge_batch($batch_size);
 
     // The field is gone.
-    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
+    $fields = entity_load_multiple_by_properties('field_config', ['field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE]);
     $this->assertEqual(count($fields), 0, 'The field is gone');
 
     // The field storage still exists, not deleted, because it has a second
     // field.
-    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+    $storages = entity_load_multiple_by_properties('field_storage_config', ['uuid' => $field_storage->uuid(), 'include_deleted' => TRUE]);
     $this->assertTrue(isset($storages[$field_storage->uuid()]), 'The field storage exists and is not deleted');
   }
 
@@ -368,7 +368,7 @@ class BulkDeleteTest extends FieldKernelTestBase {
    * Verify that field storages are preserved and purged correctly as multiple
    * fields are deleted and purged.
    */
-  function testPurgeFieldStorage() {
+  public function testPurgeFieldStorage() {
     // Start recording hook invocations.
     field_test_memorize();
 
@@ -391,7 +391,7 @@ class BulkDeleteTest extends FieldKernelTestBase {
     // FieldItemInterface::delete() should have been called once for each entity in the
     // bundle.
     $actual_hooks = field_test_memorize();
-    $hooks = array();
+    $hooks = [];
     $entities = $this->entitiesByBundles[$bundle];
     foreach ($entities as $id => $entity) {
       $hooks['field_test_field_delete'][] = $entity;
@@ -399,17 +399,17 @@ class BulkDeleteTest extends FieldKernelTestBase {
     $this->checkHooksInvocations($hooks, $actual_hooks);
 
     // The field still exists, deleted.
-    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
+    $fields = entity_load_multiple_by_properties('field_config', ['uuid' => $field->uuid(), 'include_deleted' => TRUE]);
     $this->assertTrue(isset($fields[$field->uuid()]) && $fields[$field->uuid()]->isDeleted(), 'The field exists and is deleted');
 
     // Purge again to purge the field.
     field_purge_batch(0);
 
     // The field is gone.
-    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
+    $fields = entity_load_multiple_by_properties('field_config', ['uuid' => $field->uuid(), 'include_deleted' => TRUE]);
     $this->assertEqual(count($fields), 0, 'The field is purged.');
     // The field storage still exists, not deleted.
-    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+    $storages = entity_load_multiple_by_properties('field_storage_config', ['uuid' => $field_storage->uuid(), 'include_deleted' => TRUE]);
     $this->assertTrue(isset($storages[$field_storage->uuid()]) && !$storages[$field_storage->uuid()]->isDeleted(), 'The field storage exists and is not deleted');
 
     // Delete the second field.
@@ -426,7 +426,7 @@ class BulkDeleteTest extends FieldKernelTestBase {
 
     // Check hooks invocations (same as above, for the 2nd bundle).
     $actual_hooks = field_test_memorize();
-    $hooks = array();
+    $hooks = [];
     $entities = $this->entitiesByBundles[$bundle];
     foreach ($entities as $id => $entity) {
       $hooks['field_test_field_delete'][] = $entity;
@@ -434,18 +434,18 @@ class BulkDeleteTest extends FieldKernelTestBase {
     $this->checkHooksInvocations($hooks, $actual_hooks);
 
     // The field and the storage still exist, deleted.
-    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
+    $fields = entity_load_multiple_by_properties('field_config', ['uuid' => $field->uuid(), 'include_deleted' => TRUE]);
     $this->assertTrue(isset($fields[$field->uuid()]) && $fields[$field->uuid()]->isDeleted(), 'The field exists and is deleted');
-    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+    $storages = entity_load_multiple_by_properties('field_storage_config', ['uuid' => $field_storage->uuid(), 'include_deleted' => TRUE]);
     $this->assertTrue(isset($storages[$field_storage->uuid()]) && $storages[$field_storage->uuid()]->isDeleted(), 'The field storage exists and is deleted');
 
     // Purge again to purge the field and the storage.
     field_purge_batch(0);
 
     // The field and the storage are gone.
-    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
+    $fields = entity_load_multiple_by_properties('field_config', ['uuid' => $field->uuid(), 'include_deleted' => TRUE]);
     $this->assertEqual(count($fields), 0, 'The field is purged.');
-    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+    $storages = entity_load_multiple_by_properties('field_storage_config', ['uuid' => $field_storage->uuid(), 'include_deleted' => TRUE]);
     $this->assertEqual(count($storages), 0, 'The field storage is purged.');
   }
 
diff --git a/web/core/modules/field/tests/src/Kernel/DisplayApiTest.php b/web/core/modules/field/tests/src/Kernel/DisplayApiTest.php
index d639e6aa2..3cbf63eb1 100644
--- a/web/core/modules/field/tests/src/Kernel/DisplayApiTest.php
+++ b/web/core/modules/field/tests/src/Kernel/DisplayApiTest.php
@@ -69,33 +69,33 @@ class DisplayApiTest extends FieldKernelTestBase {
     $this->label = $this->randomMachineName();
     $this->cardinality = 4;
 
-    $field_storage = array(
+    $field_storage = [
       'field_name' => $this->fieldName,
       'entity_type' => 'entity_test',
       'type' => 'test_field',
       'cardinality' => $this->cardinality,
-    );
-    $field = array(
+    ];
+    $field = [
       'field_name' => $this->fieldName,
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
       'label' => $this->label,
-    );
+    ];
 
-    $this->displayOptions = array(
-      'default' => array(
+    $this->displayOptions = [
+      'default' => [
         'type' => 'field_test_default',
-        'settings' => array(
+        'settings' => [
           'test_formatter_setting' => $this->randomMachineName(),
-        ),
-      ),
-      'teaser' => array(
+        ],
+      ],
+      'teaser' => [
         'type' => 'field_test_default',
-        'settings' => array(
+        'settings' => [
           'test_formatter_setting' => $this->randomMachineName(),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     FieldStorageConfig::create($field_storage)->save();
     FieldConfig::create($field)->save();
@@ -104,7 +104,7 @@ class DisplayApiTest extends FieldKernelTestBase {
       ->setComponent($this->fieldName, $this->displayOptions['default'])
       ->save();
     // Create a display for the teaser view mode.
-    EntityViewMode::create(array('id' => 'entity_test.teaser', 'targetEntityType' => 'entity_test'))->save();
+    EntityViewMode::create(['id' => 'entity_test.teaser', 'targetEntityType' => 'entity_test'])->save();
     entity_get_display($field['entity_type'], $field['bundle'], 'teaser')
       ->setComponent($this->fieldName, $this->displayOptions['teaser'])
       ->save();
@@ -119,11 +119,11 @@ class DisplayApiTest extends FieldKernelTestBase {
   /**
    * Tests the FieldItemListInterface::view() method.
    */
-  function testFieldItemListView() {
+  public function testFieldItemListView() {
     $items = $this->entity->get($this->fieldName);
 
     \Drupal::service('theme_handler')->install(['classy']);
-    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->config('system.theme')->set('default', 'classy')->save();
 
     // No display settings: check that default display settings are used.
     $build = $items->view();
@@ -132,66 +132,66 @@ class DisplayApiTest extends FieldKernelTestBase {
     $setting = $settings['test_formatter_setting'];
     $this->assertText($this->label, 'Label was displayed.');
     foreach ($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', ['@delta' => $delta]));
     }
 
     // Display settings: Check hidden field.
-    $display = array(
+    $display = [
       'label' => 'hidden',
       'type' => 'field_test_multiple',
-      'settings' => array(
+      'settings' => [
         'test_formatter_setting_multiple' => $this->randomMachineName(),
         'alter' => TRUE,
-      ),
-    );
+      ],
+    ];
     $build = $items->view($display);
     $this->render($build);
     $setting = $display['settings']['test_formatter_setting_multiple'];
     $this->assertNoText($this->label, 'Label was not displayed.');
     $this->assertText('field_test_entity_display_build_alter', 'Alter fired, display passed.');
     $this->assertText('entity language is en', 'Language is placed onto the context.');
-    $array = array();
+    $array = [];
     foreach ($this->values as $delta => $value) {
       $array[] = $delta . ':' . $value['value'];
     }
     $this->assertText($setting . '|' . implode('|', $array), 'Values were displayed with expected setting.');
 
     // Display settings: Check visually_hidden field.
-    $display = array(
+    $display = [
       'label' => 'visually_hidden',
       'type' => 'field_test_multiple',
-      'settings' => array(
+      'settings' => [
         'test_formatter_setting_multiple' => $this->randomMachineName(),
         'alter' => TRUE,
-      ),
-    );
+      ],
+    ];
     $build = $items->view($display);
     $this->render($build);
     $setting = $display['settings']['test_formatter_setting_multiple'];
     $this->assertRaw('visually-hidden', 'Label was visually hidden.');
     $this->assertText('field_test_entity_display_build_alter', 'Alter fired, display passed.');
     $this->assertText('entity language is en', 'Language is placed onto the context.');
-    $array = array();
+    $array = [];
     foreach ($this->values as $delta => $value) {
       $array[] = $delta . ':' . $value['value'];
     }
     $this->assertText($setting . '|' . implode('|', $array), 'Values were displayed with expected setting.');
 
     // Check the prepare_view steps are invoked.
-    $display = array(
+    $display = [
       'label' => 'hidden',
       'type' => 'field_test_with_prepare_view',
-      'settings' => array(
+      'settings' => [
         'test_formatter_setting_additional' => $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
     $build = $items->view($display);
     $this->render($build);
     $setting = $display['settings']['test_formatter_setting_additional'];
     $this->assertNoText($this->label, 'Label was not displayed.');
     $this->assertNoText('field_test_entity_display_build_alter', 'Alter not fired.');
     foreach ($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), format_string('Value @delta was displayed with expected setting.', ['@delta' => $delta]));
     }
 
     // View mode: check that display settings specified in the display object
@@ -201,7 +201,7 @@ class DisplayApiTest extends FieldKernelTestBase {
     $setting = $this->displayOptions['teaser']['settings']['test_formatter_setting'];
     $this->assertText($this->label, 'Label was displayed.');
     foreach ($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', ['@delta' => $delta]));
     }
 
     // Unknown view mode: check that display settings for 'default' view mode
@@ -211,14 +211,14 @@ class DisplayApiTest extends FieldKernelTestBase {
     $setting = $this->displayOptions['default']['settings']['test_formatter_setting'];
     $this->assertText($this->label, 'Label was displayed.');
     foreach ($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', ['@delta' => $delta]));
     }
   }
 
   /**
    * Tests the FieldItemInterface::view() method.
    */
-  function testFieldItemView() {
+  public function testFieldItemView() {
     // No display settings: check that default display settings are used.
     $settings = \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings('field_test_default');
     $setting = $settings['test_formatter_setting'];
@@ -226,37 +226,37 @@ class DisplayApiTest extends FieldKernelTestBase {
       $item = $this->entity->{$this->fieldName}[$delta];
       $build = $item->view();
       $this->render($build);
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', ['@delta' => $delta]));
     }
 
     // Check that explicit display settings are used.
-    $display = array(
+    $display = [
       'type' => 'field_test_multiple',
-      'settings' => array(
+      'settings' => [
         'test_formatter_setting_multiple' => $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
     $setting = $display['settings']['test_formatter_setting_multiple'];
     foreach ($this->values as $delta => $value) {
       $item = $this->entity->{$this->fieldName}[$delta];
       $build = $item->view($display);
       $this->render($build);
-      $this->assertText($setting . '|0:' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|0:' . $value['value'], format_string('Value @delta was displayed with expected setting.', ['@delta' => $delta]));
     }
 
     // Check that prepare_view steps are invoked.
-    $display = array(
+    $display = [
       'type' => 'field_test_with_prepare_view',
-      'settings' => array(
+      'settings' => [
         'test_formatter_setting_additional' => $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
     $setting = $display['settings']['test_formatter_setting_additional'];
     foreach ($this->values as $delta => $value) {
       $item = $this->entity->{$this->fieldName}[$delta];
       $build = $item->view($display);
       $this->render($build);
-      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), format_string('Value @delta was displayed with expected setting.', ['@delta' => $delta]));
     }
 
     // View mode: check that display settings specified in the field are used.
@@ -265,7 +265,7 @@ class DisplayApiTest extends FieldKernelTestBase {
       $item = $this->entity->{$this->fieldName}[$delta];
       $build = $item->view('teaser');
       $this->render($build);
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', ['@delta' => $delta]));
     }
 
     // Unknown view mode: check that display settings for 'default' view mode
@@ -275,22 +275,22 @@ class DisplayApiTest extends FieldKernelTestBase {
       $item = $this->entity->{$this->fieldName}[$delta];
       $build = $item->view('unknown_view_mode');
       $this->render($build);
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', ['@delta' => $delta]));
     }
   }
 
   /**
    * Tests that the prepareView() formatter method still fires for empty values.
    */
-  function testFieldEmpty() {
+  public function testFieldEmpty() {
     // Uses \Drupal\field_test\Plugin\Field\FieldFormatter\TestFieldEmptyFormatter.
-    $display = array(
+    $display = [
       'label' => 'hidden',
       'type' => 'field_empty_test',
-      'settings' => array(
+      'settings' => [
         'test_empty_string' => '**EMPTY FIELD**' . $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
     // $this->entity is set by the setUp() method and by default contains 4
     // numeric values.  We only want to test the display of this one field.
     $build = $this->entity->get($this->fieldName)->view($display);
@@ -300,7 +300,7 @@ class DisplayApiTest extends FieldKernelTestBase {
     $this->assertNoText($display['settings']['test_empty_string']);
 
     // Now remove the values from the test field and retest.
-    $this->entity->{$this->fieldName} = array();
+    $this->entity->{$this->fieldName} = [];
     $this->entity->save();
     $build = $this->entity->get($this->fieldName)->view($display);
     $this->render($build);
diff --git a/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php b/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
index cd8b7acdd..10b44333e 100644
--- a/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
@@ -20,11 +20,11 @@ class EmailItemTest extends FieldKernelTestBase {
     parent::setUp();
 
     // Create an email field storage and field for validation.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_email',
       'entity_type' => 'entity_test',
       'type' => 'email',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_email',
@@ -33,9 +33,9 @@ class EmailItemTest extends FieldKernelTestBase {
 
     // Create a form display for the default form mode.
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent('field_email', array(
+      ->setComponent('field_email', [
         'type' => 'email_default',
-      ))
+      ])
       ->save();
   }
 
diff --git a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
index aaee7d080..9c94aca94 100644
--- a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
+++ b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
@@ -65,10 +65,10 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
 
     // Use Classy theme for testing markup output.
     \Drupal::service('theme_handler')->install(['classy']);
-    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->config('system.theme')->set('default', 'classy')->save();
     $this->installEntitySchema('entity_test');
     // Grant the 'view test entity' permission.
-    $this->installConfig(array('user'));
+    $this->installConfig(['user']);
     Role::load(RoleInterface::ANONYMOUS_ID)
       ->grantPermission('view test entity')
       ->save();
@@ -76,16 +76,16 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
     // The label formatter rendering generates links, so build the router.
     $this->container->get('router.builder')->rebuild();
 
-    $this->createEntityReferenceField($this->entityType, $this->bundle, $this->fieldName, 'Field test', $this->entityType, 'default', array(), FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+    $this->createEntityReferenceField($this->entityType, $this->bundle, $this->fieldName, 'Field test', $this->entityType, 'default', [], FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     // Set up a field, so that the entity that'll be referenced bubbles up a
     // cache tag when rendering it entirely.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'body',
       'entity_type' => $this->entityType,
       'type' => 'text',
-      'settings' => array(),
-    ))->save();
+      'settings' => [],
+    ])->save();
     FieldConfig::create([
       'entity_type' => $this->entityType,
       'bundle' => $this->bundle,
@@ -93,35 +93,35 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
       'label' => 'Body',
     ])->save();
     entity_get_display($this->entityType, $this->bundle, 'default')
-      ->setComponent('body', array(
+      ->setComponent('body', [
         'type' => 'text_default',
-        'settings' => array(),
-      ))
+        'settings' => [],
+      ])
       ->save();
 
-    FilterFormat::create(array(
+    FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
-    ))->save();
+    ])->save();
 
     // Create the entity to be referenced.
     $this->referencedEntity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('name' => $this->randomMachineName()));
-    $this->referencedEntity->body = array(
+      ->create(['name' => $this->randomMachineName()]);
+    $this->referencedEntity->body = [
       'value' => '<p>Hello, world!</p>',
       'format' => 'full_html',
-    );
+    ];
     $this->referencedEntity->save();
 
     // Create another entity to be referenced but do not save it.
     $this->unsavedReferencedEntity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('name' => $this->randomMachineName()));
-    $this->unsavedReferencedEntity->body = array(
+      ->create(['name' => $this->randomMachineName()]);
+    $this->unsavedReferencedEntity->body = [
       'value' => '<p>Hello, unsaved world!</p>',
       'format' => 'full_html',
-    );
+    ];
   }
 
   /**
@@ -137,7 +137,7 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
 
     $referencing_entity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('name' => $this->randomMachineName()));
+      ->create(['name' => $this->randomMachineName()]);
     $referencing_entity->save();
     $referencing_entity->{$field_name}->entity = $this->referencedEntity;
 
@@ -150,16 +150,16 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
     foreach ($formatter_manager->getOptions('entity_reference') as $formatter => $name) {
       // Set formatter type for the 'full' view mode.
       entity_get_display($this->entityType, $this->bundle, 'default')
-        ->setComponent($field_name, array(
+        ->setComponent($field_name, [
           'type' => $formatter,
-        ))
+        ])
         ->save();
 
       // Invoke entity view.
       entity_view($referencing_entity, 'default');
 
       // Verify the un-accessible item still exists.
-      $this->assertEqual($referencing_entity->{$field_name}->target_id, $this->referencedEntity->id(), format_string('The un-accessible item still exists after @name formatter was executed.', array('@name' => $name)));
+      $this->assertEqual($referencing_entity->{$field_name}->target_id, $this->referencedEntity->id(), format_string('The un-accessible item still exists after @name formatter was executed.', ['@name' => $name]));
     }
   }
 
@@ -198,7 +198,7 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
     $this->assertEqual($build[0]['#markup'], 'default | ' . $this->referencedEntity->label() . $expected_rendered_name_field_1 . $expected_rendered_body_field_1, sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
     $expected_cache_tags = Cache::mergeTags(\Drupal::entityManager()->getViewBuilder($this->entityType)->getCacheTags(), $this->referencedEntity->getCacheTags());
     $expected_cache_tags = Cache::mergeTags($expected_cache_tags, FilterFormat::load('full_html')->getCacheTags());
-    $this->assertEqual($build[0]['#cache']['tags'], $expected_cache_tags, format_string('The @formatter formatter has the expected cache tags.', array('@formatter' => $formatter)));
+    $this->assertEqual($build[0]['#cache']['tags'], $expected_cache_tags, format_string('The @formatter formatter has the expected cache tags.', ['@formatter' => $formatter]));
 
     // Test the second field item.
     $expected_rendered_name_field_2 = '
@@ -338,37 +338,37 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
       'max-age' => Cache::PERMANENT,
     ];
     $this->assertEqual($build['#cache'], $expected_field_cacheability, 'The field render array contains the entity access cacheability metadata');
-    $expected_item_1 = array(
+    $expected_item_1 = [
       '#type' => 'link',
       '#title' => $this->referencedEntity->label(),
       '#url' => $this->referencedEntity->urlInfo(),
       '#options' => $this->referencedEntity->urlInfo()->getOptions(),
-      '#cache' => array(
+      '#cache' => [
         'contexts' => [
           'user.permissions',
         ],
         'tags' => $this->referencedEntity->getCacheTags(),
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($renderer->renderRoot($build[0]), $renderer->renderRoot($expected_item_1), sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
     $this->assertEqual(CacheableMetadata::createFromRenderArray($build[0]), CacheableMetadata::createFromRenderArray($expected_item_1));
 
     // The second referenced entity is "autocreated", therefore not saved and
     // lacking any URL info.
-    $expected_item_2 = array(
+    $expected_item_2 = [
       '#plain_text' => $this->unsavedReferencedEntity->label(),
-      '#cache' => array(
+      '#cache' => [
         'contexts' => [
           'user.permissions',
         ],
         'tags' => $this->unsavedReferencedEntity->getCacheTags(),
         'max-age' => Cache::PERMANENT,
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($build[1], $expected_item_2, sprintf('The render array returned by the %s formatter is correct for an item with a unsaved entity.', $formatter));
 
     // Test with the 'link' setting set to FALSE.
-    $build = $this->buildRenderArray([$this->referencedEntity, $this->unsavedReferencedEntity], $formatter, array('link' => FALSE));
+    $build = $this->buildRenderArray([$this->referencedEntity, $this->unsavedReferencedEntity], $formatter, ['link' => FALSE]);
     $this->assertEqual($build[0]['#plain_text'], $this->referencedEntity->label(), sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
     $this->assertEqual($build[1]['#plain_text'], $this->unsavedReferencedEntity->label(), sprintf('The markup returned by the %s formatter is correct for an item with a unsaved entity.', $formatter));
 
@@ -379,12 +379,12 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
     $field_storage_config->setSetting('target_type', 'entity_test_label');
     $field_storage_config->save();
 
-    $referenced_entity_with_no_link_template = EntityTestLabel::create(array(
+    $referenced_entity_with_no_link_template = EntityTestLabel::create([
       'name' => $this->randomMachineName(),
-    ));
+    ]);
     $referenced_entity_with_no_link_template->save();
 
-    $build = $this->buildRenderArray([$referenced_entity_with_no_link_template], $formatter, array('link' => TRUE));
+    $build = $this->buildRenderArray([$referenced_entity_with_no_link_template], $formatter, ['link' => TRUE]);
     $this->assertEqual($build[0]['#plain_text'], $referenced_entity_with_no_link_template->label(), sprintf('The markup returned by the %s formatter is correct for an entity type with no valid link template.', $formatter));
   }
 
@@ -403,11 +403,11 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
    * @return array
    *   A render array.
    */
-  protected function buildRenderArray(array $referenced_entities, $formatter, $formatter_options = array()) {
+  protected function buildRenderArray(array $referenced_entities, $formatter, $formatter_options = []) {
     // Create the entity that will have the entity reference field.
     $referencing_entity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('name' => $this->randomMachineName()));
+      ->create(['name' => $this->randomMachineName()]);
 
     $items = $referencing_entity->get($this->fieldName);
 
@@ -417,7 +417,7 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
     }
 
     // Build the renderable array for the field.
-    return $items->view(array('type' => $formatter, 'settings' => $formatter_options));
+    return $items->view(['type' => $formatter, 'settings' => $formatter_options]);
   }
 
 }
diff --git a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
index e00848c7d..6dce67b45 100644
--- a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
@@ -15,6 +15,7 @@ use Drupal\entity_test\Entity\EntityTestStringId;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\node\NodeInterface;
 use Drupal\Tests\field\Kernel\FieldKernelTestBase;
 use Drupal\file\Entity\File;
 use Drupal\node\Entity\Node;
@@ -174,7 +175,7 @@ class EntityReferenceItemTest extends FieldKernelTestBase {
     // Delete terms so we have nothing to reference and try again
     $term->delete();
     $term2->delete();
-    $entity = EntityTest::create(array('name' => $this->randomMachineName()));
+    $entity = EntityTest::create(['name' => $this->randomMachineName()]);
     $entity->save();
 
     // Test the generateSampleValue() method.
@@ -182,6 +183,15 @@ class EntityReferenceItemTest extends FieldKernelTestBase {
     $entity->field_test_taxonomy_term->generateSampleItems();
     $entity->field_test_taxonomy_vocabulary->generateSampleItems();
     $this->entityValidateAndSave($entity);
+
+    // Tests that setting an integer target ID together with an entity object
+    // succeeds and does not cause any exceptions. There is no assertion here,
+    // as the assignment should not throw any exceptions and if it does the
+    // test will fail.
+    // @see \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem::setValue().
+    $user = User::create(['name' => $this->randomString()]);
+    $user->save();
+    $entity = EntityTest::create(['user_id' => ['target_id' => (int) $user->id(), 'entity' => $user]]);
   }
 
   /**
@@ -243,7 +253,7 @@ class EntityReferenceItemTest extends FieldKernelTestBase {
     // Delete terms so we have nothing to reference and try again
     $this->vocabulary->delete();
     $vocabulary2->delete();
-    $entity = EntityTest::create(array('name' => $this->randomMachineName()));
+    $entity = EntityTest::create(['name' => $this->randomMachineName()]);
     $entity->save();
   }
 
@@ -252,11 +262,11 @@ class EntityReferenceItemTest extends FieldKernelTestBase {
    */
   public function testEntityAutoCreate() {
     // The term entity is unsaved here.
-    $term = Term::create(array(
+    $term = Term::create([
       'name' => $this->randomMachineName(),
       'vid' => $this->term->bundle(),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
     $entity = EntityTest::create();
     // Now assign the unsaved term to the field.
     $entity->field_test_taxonomy_term->entity = $term;
@@ -303,22 +313,22 @@ class EntityReferenceItemTest extends FieldKernelTestBase {
    */
   public function testSelectionHandlerSettings() {
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'entity_reference',
-      'settings' => array(
+      'settings' => [
         'target_type' => 'entity_test'
-      ),
-    ));
+      ],
+    ]);
     $field_storage->save();
 
     // Do not specify any value for the 'handler' setting in order to verify
     // that the default handler with the correct derivative is used.
-    $field = FieldConfig::create(array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
     $field = FieldConfig::load($field->id());
     $this->assertEqual($field->getSetting('handler'), 'default:entity_test');
@@ -349,11 +359,11 @@ class EntityReferenceItemTest extends FieldKernelTestBase {
    */
   public function testAutocreateValidation() {
     // The term entity is unsaved here.
-    $term = Term::create(array(
+    $term = Term::create([
       'name' => $this->randomMachineName(),
       'vid' => $this->term->bundle(),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
     $entity = EntityTest::create([
       'field_test_taxonomy_term' => [
         'entity' => $term,
@@ -385,7 +395,7 @@ class EntityReferenceItemTest extends FieldKernelTestBase {
     $node = Node::create([
       'title' => $title,
       'type' => 'node',
-      'status' => NODE_NOT_PUBLISHED,
+      'status' => NodeInterface::NOT_PUBLISHED,
     ]);
 
     $entity = EntityTest::create([
@@ -409,14 +419,14 @@ class EntityReferenceItemTest extends FieldKernelTestBase {
     $unsaved_unpublished_node = Node::create([
       'title' => $unsaved_unpublished_node_title,
       'type' => 'node',
-      'status' => NODE_NOT_PUBLISHED,
+      'status' => NodeInterface::NOT_PUBLISHED,
     ]);
 
     $saved_unpublished_node_title = $this->randomString();
     $saved_unpublished_node = Node::create([
       'title' => $saved_unpublished_node_title,
       'type' => 'node',
-      'status' => NODE_NOT_PUBLISHED,
+      'status' => NodeInterface::NOT_PUBLISHED,
     ]);
     $saved_unpublished_node->save();
 
@@ -424,7 +434,7 @@ class EntityReferenceItemTest extends FieldKernelTestBase {
     $saved_published_node = Node::create([
       'title' => $saved_published_node_title,
       'type' => 'node',
-      'status' => NODE_PUBLISHED,
+      'status' => NodeInterface::PUBLISHED,
     ]);
     $saved_published_node->save();
 
diff --git a/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php b/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
index 5dc096f65..31d650379 100644
--- a/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
+++ b/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\field\Kernel\EntityReference\Views;
 
 use Drupal\entity_test\Entity\EntityTestMulChanged;
+use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\entity_test\Entity\EntityTestMul;
@@ -26,13 +27,14 @@ class EntityReferenceRelationshipTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array(
+  public static $testViews = [
     'test_entity_reference_entity_test_view',
     'test_entity_reference_entity_test_view_long',
     'test_entity_reference_reverse_entity_test_view',
     'test_entity_reference_entity_test_mul_view',
     'test_entity_reference_reverse_entity_test_mul_view',
-    );
+    'test_entity_reference_group_by_empty_relationships',
+  ];
 
   /**
    * Modules to install.
@@ -46,7 +48,7 @@ class EntityReferenceRelationshipTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  protected $entities = array();
+  protected $entities = [];
 
   /**
    * {@inheritdoc}
@@ -71,7 +73,10 @@ class EntityReferenceRelationshipTest extends ViewsKernelTestBase {
     // @see \Drupal\Core\Entity\Sql\DefaultTableMapping::generateFieldTableName()
     $this->createEntityReferenceField('entity_test_mul_changed', 'entity_test_mul_changed', 'field_test_data_with_a_long_name', 'field_test_data_with_a_long_name', 'entity_test');
 
-    ViewTestData::createTestViews(get_class($this), array('entity_reference_test_views'));
+    // Create reference from entity_test_mul to entity_test cardinality: infinite.
+    $this->createEntityReferenceField('entity_test_mul', 'entity_test_mul', 'field_data_test_unlimited', 'field_data_test_unlimited', 'entity_test', 'default', [], FieldStorageConfig::CARDINALITY_UNLIMITED);
+
+    ViewTestData::createTestViews(get_class($this), ['entity_reference_test_views']);
   }
 
   /**
@@ -276,4 +281,56 @@ class EntityReferenceRelationshipTest extends ViewsKernelTestBase {
     }
   }
 
+  /**
+   * Tests group by with optional and empty relationship.
+   */
+  public function testGroupByWithEmptyRelationships() {
+    $entities = [];
+    // Create 4 entities with name1 and 3 entities with name2.
+    for ($i = 1; $i <= 4; $i++) {
+      $entity = [
+        'name' => 'name' . $i,
+      ];
+      $entity = EntityTest::create($entity);
+      $entities[] = $entity;
+      $entity->save();
+    }
+
+    $entity = EntityTestMul::create([
+      'name' => 'name1',
+    ]);
+    $entity->field_data_test_unlimited = [
+      ['target_id' => $entities[0]->id()],
+      ['target_id' => $entities[1]->id()],
+      ['target_id' => $entities[2]->id()],
+    ];
+    $entity->save();
+
+    $entity = EntityTestMul::create([
+      'name' => 'name2',
+    ]);
+    $entity->field_data_test_unlimited = [
+      ['target_id' => $entities[0]->id()],
+      ['target_id' => $entities[1]->id()],
+    ];
+    $entity->save();
+
+    $entity = EntityTestMul::create([
+      'name' => 'name3',
+    ]);
+    $entity->field_data_test_unlimited->target_id = $entities[0]->id();
+    $entity->save();
+
+    $view = Views::getView('test_entity_reference_group_by_empty_relationships');
+    $this->executeView($view);
+    $this->assertCount(4, $view->result);
+    // First three results should contain a reference from EntityTestMul.
+    $this->assertNotEmpty($view->getStyle()->getField(0, 'name_2'));
+    $this->assertNotEmpty($view->getStyle()->getField(1, 'name_2'));
+    $this->assertNotEmpty($view->getStyle()->getField(2, 'name_2'));
+    // Fourth result has no reference from EntityTestMul hence the output for
+    // should be empty.
+    $this->assertEqual('', $view->getStyle()->getField(3, 'name_2'));
+  }
+
 }
diff --git a/web/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php b/web/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
index ba96bc915..05fdfae38 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
@@ -23,7 +23,7 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
   /**
    * Test rendering fields with EntityDisplay build().
    */
-  function testEntityDisplayBuild() {
+  public function testEntityDisplayBuild() {
     $this->createFieldWithStorage('_2');
 
     $entity_type = 'entity_test';
@@ -42,23 +42,23 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
     $display = entity_get_display($entity_type, $entity->bundle(), 'full');
 
     $formatter_setting = $this->randomMachineName();
-    $display_options = array(
+    $display_options = [
       'label' => 'above',
       'type' => 'field_test_default',
-      'settings' => array(
+      'settings' => [
         'test_formatter_setting' => $formatter_setting,
-      ),
-    );
+      ],
+    ];
     $display->setComponent($this->fieldTestData->field_name, $display_options);
 
     $formatter_setting_2 = $this->randomMachineName();
-    $display_options_2 = array(
+    $display_options_2 = [
       'label' => 'above',
       'type' => 'field_test_default',
-      'settings' => array(
+      'settings' => [
         'test_formatter_setting' => $formatter_setting_2,
-      ),
-    );
+      ],
+    ];
     $display->setComponent($this->fieldTestData->field_name_2, $display_options_2);
 
     // View all fields.
@@ -94,13 +94,13 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
     // Multiple formatter.
     $entity = clone($entity_init);
     $formatter_setting = $this->randomMachineName();
-    $display->setComponent($this->fieldTestData->field_name, array(
+    $display->setComponent($this->fieldTestData->field_name, [
       'label' => 'above',
       'type' => 'field_test_multiple',
-      'settings' => array(
+      'settings' => [
         'test_formatter_setting_multiple' => $formatter_setting,
-      ),
-    ));
+      ],
+    ]);
     $content = $display->build($entity);
     $this->render($content);
     $expected_output = $formatter_setting;
@@ -112,13 +112,13 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
     // Test a formatter that uses hook_field_formatter_prepare_view().
     $entity = clone($entity_init);
     $formatter_setting = $this->randomMachineName();
-    $display->setComponent($this->fieldTestData->field_name, array(
+    $display->setComponent($this->fieldTestData->field_name, [
       'label' => 'above',
       'type' => 'field_test_with_prepare_view',
-      'settings' => array(
+      'settings' => [
         'test_formatter_setting_additional' => $formatter_setting,
-      ),
-    ));
+      ],
+    ]);
     $content = $display->build($entity);
     $this->render($content);
     foreach ($values as $delta => $value) {
@@ -133,21 +133,21 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
   /**
    * Tests rendering fields with EntityDisplay::buildMultiple().
    */
-  function testEntityDisplayViewMultiple() {
+  public function testEntityDisplayViewMultiple() {
     // Use a formatter that has a prepareView() step.
     $display = entity_get_display('entity_test', 'entity_test', 'full')
-      ->setComponent($this->fieldTestData->field_name, array(
+      ->setComponent($this->fieldTestData->field_name, [
         'type' => 'field_test_with_prepare_view',
-      ));
+      ]);
 
     // Create two entities.
-    $entity1 = EntityTest::create(array('id' => 1, 'type' => 'entity_test'));
+    $entity1 = EntityTest::create(['id' => 1, 'type' => 'entity_test']);
     $entity1->{$this->fieldTestData->field_name}->setValue($this->_generateTestFieldValues(1));
-    $entity2 = EntityTest::create(array('id' => 2, 'type' => 'entity_test'));
+    $entity2 = EntityTest::create(['id' => 2, 'type' => 'entity_test']);
     $entity2->{$this->fieldTestData->field_name}->setValue($this->_generateTestFieldValues(1));
 
     // Run buildMultiple(), and check that the entities come out as expected.
-    $display->buildMultiple(array($entity1, $entity2));
+    $display->buildMultiple([$entity1, $entity2]);
     $item1 = $entity1->{$this->fieldTestData->field_name}[0];
     $this->assertEqual($item1->additional_formatter_value, $item1->value + 1, 'Entity 1 ran through the prepareView() formatter method.');
     $item2 = $entity2->{$this->fieldTestData->field_name}[0];
@@ -160,9 +160,9 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
    * Complements unit test coverage in
    * \Drupal\Tests\Core\Entity\Sql\SqlContentEntityStorageTest.
    */
-  function testEntityCache() {
+  public function testEntityCache() {
     // Initialize random values and a test entity.
-    $entity_init = EntityTest::create(array('type' => $this->fieldTestData->field->getTargetBundle()));
+    $entity_init = EntityTest::create(['type' => $this->fieldTestData->field->getTargetBundle()]);
     $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage->getCardinality());
 
     // Non-cacheable entity type.
@@ -185,9 +185,9 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
 
     $entity_init = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         'type' => $entity_type,
-      ));
+      ]);
 
     // Check that no initial cache entry is present.
     $cid = "values:$entity_type:" . $entity->id();
@@ -243,15 +243,15 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
    * This could be much more thorough, but it does verify that the correct
    * widgets show up.
    */
-  function testEntityFormDisplayBuildForm() {
+  public function testEntityFormDisplayBuildForm() {
     $this->createFieldWithStorage('_2');
 
     $entity_type = 'entity_test';
-    $entity = entity_create($entity_type, array('id' => 1, 'revision_id' => 1, 'type' => $this->fieldTestData->field->getTargetBundle()));
+    $entity = entity_create($entity_type, ['id' => 1, 'revision_id' => 1, 'type' => $this->fieldTestData->field->getTargetBundle()]);
 
     // Test generating widgets for all fields.
     $display = entity_get_form_display($entity_type, $this->fieldTestData->field->getTargetBundle(), 'default');
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $display->buildForm($entity, $form, $form_state);
 
@@ -273,7 +273,7 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
         $display->removeComponent($name);
       }
     }
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $display->buildForm($entity, $form, $form_state);
 
@@ -288,24 +288,24 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
   /**
    * Tests \Drupal\Core\Entity\Display\EntityFormDisplayInterface::extractFormValues().
    */
-  function testEntityFormDisplayExtractFormValues() {
+  public function testEntityFormDisplayExtractFormValues() {
     $this->createFieldWithStorage('_2');
 
     $entity_type = 'entity_test';
     $entity_init = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('id' => 1, 'revision_id' => 1, 'type' => $this->fieldTestData->field->getTargetBundle()));
+      ->create(['id' => 1, 'revision_id' => 1, 'type' => $this->fieldTestData->field->getTargetBundle()]);
 
     // Build the form for all fields.
     $display = entity_get_form_display($entity_type, $this->fieldTestData->field->getTargetBundle(), 'default');
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $display->buildForm($entity_init, $form, $form_state);
 
     // Simulate incoming values.
     // First field.
-    $values = array();
-    $weights = array();
+    $values = [];
+    $weights = [];
     for ($delta = 0; $delta < $this->fieldTestData->field_storage->getCardinality(); $delta++) {
       $values[$delta]['value'] = mt_rand(1, 127);
       // Assign random weight.
@@ -318,8 +318,8 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
     // Leave an empty value. 'field_test' fields are empty if empty().
     $values[1]['value'] = 0;
     // Second field.
-    $values_2 = array();
-    $weights_2 = array();
+    $values_2 = [];
+    $weights_2 = [];
     for ($delta = 0; $delta < $this->fieldTestData->field_storage_2->getCardinality(); $delta++) {
       $values_2[$delta]['value'] = mt_rand(1, 127);
       // Assign random weight.
@@ -345,17 +345,17 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
 
     asort($weights);
     asort($weights_2);
-    $expected_values = array();
-    $expected_values_2 = array();
+    $expected_values = [];
+    $expected_values_2 = [];
     foreach ($weights as $key => $value) {
       if ($key != 1) {
-        $expected_values[] = array('value' => $values[$key]['value']);
+        $expected_values[] = ['value' => $values[$key]['value']];
       }
     }
     $this->assertIdentical($entity->{$this->fieldTestData->field_name}->getValue(), $expected_values, 'Submit filters empty values');
     foreach ($weights_2 as $key => $value) {
       if ($key != 1) {
-        $expected_values_2[] = array('value' => $values_2[$key]['value']);
+        $expected_values_2[] = ['value' => $values_2[$key]['value']];
       }
     }
     $this->assertIdentical($entity->{$this->fieldTestData->field_name_2}->getValue(), $expected_values_2, 'Submit filters empty values');
@@ -368,10 +368,10 @@ class FieldAttachOtherTest extends FieldKernelTestBase {
     }
     $entity = clone($entity_init);
     $display->extractFormValues($entity, $form, $form_state);
-    $expected_values_2 = array();
+    $expected_values_2 = [];
     foreach ($weights_2 as $key => $value) {
       if ($key != 1) {
-        $expected_values_2[] = array('value' => $values_2[$key]['value']);
+        $expected_values_2[] = ['value' => $values_2[$key]['value']];
       }
     }
     $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'The first field is empty in the entity object');
diff --git a/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php b/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
index 8237ef4d8..03ed8cda9 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
@@ -24,14 +24,14 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
    * Works independently of the underlying field storage backend. Inserts or
    * updates random field data and then loads and verifies the data.
    */
-  function testFieldAttachSaveLoad() {
+  public function testFieldAttachSaveLoad() {
     $entity_type = 'entity_test_rev';
     $this->createFieldWithStorage('', $entity_type);
     $cardinality = $this->fieldTestData->field_storage->getCardinality();
 
     // TODO : test empty values filtering and "compression" (store consecutive deltas).
     // Preparation: create three revisions and store them in $revision array.
-    $values = array();
+    $values = [];
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
       ->create();
@@ -54,17 +54,17 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
     $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), $cardinality, 'Current revision: expected number of values');
     for ($delta = 0; $delta < $cardinality; $delta++) {
       // The field value loaded matches the one inserted or updated.
-      $this->assertEqual($entity->{$this->fieldTestData->field_name}[$delta]->value, $values[$current_revision][$delta]['value'], format_string('Current revision: expected value %delta was found.', array('%delta' => $delta)));
+      $this->assertEqual($entity->{$this->fieldTestData->field_name}[$delta]->value, $values[$current_revision][$delta]['value'], format_string('Current revision: expected value %delta was found.', ['%delta' => $delta]));
     }
 
     // Confirm each revision loads the correct data.
     foreach (array_keys($values) as $revision_id) {
       $entity = $storage->loadRevision($revision_id);
       // Number of values per field loaded equals the field cardinality.
-      $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), $cardinality, format_string('Revision %revision_id: expected number of values.', array('%revision_id' => $revision_id)));
+      $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), $cardinality, format_string('Revision %revision_id: expected number of values.', ['%revision_id' => $revision_id]));
       for ($delta = 0; $delta < $cardinality; $delta++) {
         // The field value loaded matches the one inserted or updated.
-        $this->assertEqual($entity->{$this->fieldTestData->field_name}[$delta]->value, $values[$revision_id][$delta]['value'], format_string('Revision %revision_id: expected value %delta was found.', array('%revision_id' => $revision_id, '%delta' => $delta)));
+        $this->assertEqual($entity->{$this->fieldTestData->field_name}[$delta]->value, $values[$revision_id][$delta]['value'], format_string('Revision %revision_id: expected value %delta was found.', ['%revision_id' => $revision_id, '%delta' => $delta]));
       }
     }
   }
@@ -72,32 +72,32 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
   /**
    * Test the 'multiple' load feature.
    */
-  function testFieldAttachLoadMultiple() {
+  public function testFieldAttachLoadMultiple() {
     $entity_type = 'entity_test_rev';
 
     // Define 2 bundles.
-    $bundles = array(
+    $bundles = [
       1 => 'test_bundle_1',
       2 => 'test_bundle_2',
-    );
+    ];
     entity_test_create_bundle($bundles[1]);
     entity_test_create_bundle($bundles[2]);
     // Define 3 fields:
     // - field_1 is in bundle_1 and bundle_2,
     // - field_2 is in bundle_1,
     // - field_3 is in bundle_2.
-    $field_bundles_map = array(
-      1 => array(1, 2),
-      2 => array(1),
-      3 => array(2),
-    );
+    $field_bundles_map = [
+      1 => [1, 2],
+      2 => [1],
+      3 => [2],
+    ];
     for ($i = 1; $i <= 3; $i++) {
       $field_names[$i] = 'field_' . $i;
-      $field_storage = FieldStorageConfig::create(array(
+      $field_storage = FieldStorageConfig::create([
         'field_name' => $field_names[$i],
         'entity_type' => $entity_type,
         'type' => 'test_field',
-      ));
+      ]);
       $field_storage->save();
       $field_ids[$i] = $field_storage->uuid();
       foreach ($field_bundles_map[$i] as $bundle) {
@@ -113,14 +113,14 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
     foreach ($bundles as $index => $bundle) {
       $entities[$index] = $this->container->get('entity_type.manager')
         ->getStorage($entity_type)
-        ->create(array('id' => $index, 'revision_id' => $index, 'type' => $bundle));
+        ->create(['id' => $index, 'revision_id' => $index, 'type' => $bundle]);
       $entity = clone($entities[$index]);
       foreach ($field_names as $field_name) {
         if (!$entity->hasField($field_name)) {
           continue;
         }
         $values[$index][$field_name] = mt_rand(1, 127);
-        $entity->$field_name->setValue(array('value' => $values[$index][$field_name]));
+        $entity->$field_name->setValue(['value' => $values[$index][$field_name]]);
       }
       $entity->enforceIsnew();
       $entity->save();
@@ -136,7 +136,7 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
           continue;
         }
         // The field value loaded matches the one inserted.
-        $this->assertEqual($entity->{$field_name}->value, $values[$index][$field_name], format_string('Entity %index: expected value was found.', array('%index' => $index)));
+        $this->assertEqual($entity->{$field_name}->value, $values[$index][$field_name], format_string('Entity %index: expected value was found.', ['%index' => $index]));
       }
     }
   }
@@ -144,13 +144,13 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
   /**
    * Tests insert and update with empty or NULL fields.
    */
-  function testFieldAttachSaveEmptyData() {
+  public function testFieldAttachSaveEmptyData() {
     $entity_type = 'entity_test';
     $this->createFieldWithStorage('', $entity_type);
 
     $entity_init = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('id' => 1));
+      ->create(['id' => 1]);
 
     // Insert: Field is NULL.
     $entity = clone $entity_init;
@@ -184,7 +184,7 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
 
     // Update: Field is empty array. Data should be wiped.
     $entity = clone($entity_init);
-    $entity->{$this->fieldTestData->field_name} = array();
+    $entity->{$this->fieldTestData->field_name} = [];
     $entity = $this->entitySaveReload($entity);
     $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'Update: empty array removes existing values');
   }
@@ -192,7 +192,7 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
   /**
    * Test insert with empty or NULL fields, with default value.
    */
-  function testFieldAttachSaveEmptyDataDefaultValue() {
+  public function testFieldAttachSaveEmptyDataDefaultValue() {
     $entity_type = 'entity_test_rev';
     $this->createFieldWithStorage('', $entity_type);
 
@@ -203,7 +203,7 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
     // Verify that fields are populated with default values.
     $entity_init = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('id' => 1, 'revision_id' => 1));
+      ->create(['id' => 1, 'revision_id' => 1]);
     $default = field_test_default_value($entity_init, $this->fieldTestData->field);
     $this->assertEqual($entity_init->{$this->fieldTestData->field_name}->getValue(), $default, 'Default field value correctly populated.');
 
@@ -215,24 +215,24 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
     $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'Insert: NULL field results in no value saved');
 
     // Verify that prepopulated field values are not overwritten by defaults.
-    $value = array(array('value' => $default[0]['value'] - mt_rand(1, 127)));
+    $value = [['value' => $default[0]['value'] - mt_rand(1, 127)]];
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('type' => $entity_init->bundle(), $this->fieldTestData->field_name => $value));
+      ->create(['type' => $entity_init->bundle(), $this->fieldTestData->field_name => $value]);
     $this->assertEqual($entity->{$this->fieldTestData->field_name}->getValue(), $value, 'Prepopulated field value correctly maintained.');
   }
 
   /**
    * Test entity deletion.
    */
-  function testFieldAttachDelete() {
+  public function testFieldAttachDelete() {
     $entity_type = 'entity_test_rev';
     $this->createFieldWithStorage('', $entity_type);
     $cardinality = $this->fieldTestData->field_storage->getCardinality();
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('type' => $this->fieldTestData->field->getTargetBundle()));
-    $vids = array();
+      ->create(['type' => $this->fieldTestData->field->getTargetBundle()]);
+    $vids = [];
 
     // Create revision 0
     $values = $this->_generateTestFieldValues($cardinality);
@@ -261,7 +261,7 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
     // Delete revision 1, confirm the other two still load.
     $controller->deleteRevision($vids[1]);
     $controller->resetCache();
-    foreach (array(0, 2) as $key) {
+    foreach ([0, 2] as $key) {
       $vid = $vids[$key];
       $revision = $controller->loadRevision($vid);
       $this->assertEqual(count($revision->{$this->fieldTestData->field_name}), $cardinality, "The test entity revision $vid has $cardinality values.");
@@ -275,7 +275,7 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
     // Delete all field data, confirm nothing loads
     $entity->delete();
     $controller->resetCache();
-    foreach (array(0, 1, 2) as $vid) {
+    foreach ([0, 1, 2] as $vid) {
       $revision = $controller->loadRevision($vid);
       $this->assertFalse($revision);
     }
@@ -285,7 +285,7 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
   /**
    * Test entity_bundle_create().
    */
-  function testEntityCreateBundle() {
+  public function testEntityCreateBundle() {
     $entity_type = 'entity_test_rev';
     $this->createFieldWithStorage('', $entity_type);
     $cardinality = $this->fieldTestData->field_storage->getCardinality();
@@ -301,7 +301,7 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
     // Save an entity with data in the field.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('type' => $this->fieldTestData->field->getTargetBundle()));
+      ->create(['type' => $this->fieldTestData->field->getTargetBundle()]);
     $values = $this->_generateTestFieldValues($cardinality);
     $entity->{$this->fieldTestData->field_name} = $values;
 
@@ -313,7 +313,7 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
   /**
    * Test entity_bundle_delete().
    */
-  function testEntityDeleteBundle() {
+  public function testEntityDeleteBundle() {
     $entity_type = 'entity_test_rev';
     $this->createFieldWithStorage('', $entity_type);
 
@@ -327,27 +327,27 @@ class FieldAttachStorageTest extends FieldKernelTestBase {
 
     // Create a second field for the test bundle
     $field_name = Unicode::strtolower($this->randomMachineName() . '_field_name');
-    $field_storage = array(
+    $field_storage = [
       'field_name' => $field_name,
       'entity_type' => $entity_type,
       'type' => 'test_field',
       'cardinality' => 1,
-    );
+    ];
     FieldStorageConfig::create($field_storage)->save();
-    $field = array(
+    $field = [
       'field_name' => $field_name,
       'entity_type' => $entity_type,
       'bundle' => $this->fieldTestData->field->getTargetBundle(),
       'label' => $this->randomMachineName() . '_label',
       'description' => $this->randomMachineName() . '_description',
       'weight' => mt_rand(0, 127),
-    );
+    ];
     FieldConfig::create($field)->save();
 
     // Save an entity with data for both fields
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('type' => $this->fieldTestData->field->getTargetBundle()));
+      ->create(['type' => $this->fieldTestData->field->getTargetBundle()]);
     $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage->getCardinality());
     $entity->{$this->fieldTestData->field_name} = $values;
     $entity->{$field_name} = $this->_generateTestFieldValues(1);
diff --git a/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php b/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php
index a61d64565..87441dc40 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php
@@ -37,21 +37,21 @@ class FieldCrudTest extends FieldKernelTestBase {
    */
   protected $fieldDefinition;
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
 
-    $this->fieldStorageDefinition = array(
+    $this->fieldStorageDefinition = [
       'field_name' => Unicode::strtolower($this->randomMachineName()),
       'entity_type' => 'entity_test',
       'type' => 'test_field',
-    );
+    ];
     $this->fieldStorage = FieldStorageConfig::create($this->fieldStorageDefinition);
     $this->fieldStorage->save();
-    $this->fieldDefinition = array(
+    $this->fieldDefinition = [
       'field_name' => $this->fieldStorage->getName(),
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
-    );
+    ];
   }
 
   // TODO : test creation with
@@ -63,7 +63,7 @@ class FieldCrudTest extends FieldKernelTestBase {
   /**
    * Test the creation of a field.
    */
-  function testCreateField() {
+  public function testCreateField() {
     // Set a state flag so that field_test.module knows to add an in-memory
     // constraint for this field.
     \Drupal::state()->set('field_test_add_constraint', $this->fieldStorage->getName());
@@ -174,7 +174,7 @@ class FieldCrudTest extends FieldKernelTestBase {
   /**
    * Test reading back a field definition.
    */
-  function testReadField() {
+  public function testReadField() {
     FieldConfig::create($this->fieldDefinition)->save();
 
     // Read the field back.
@@ -187,7 +187,7 @@ class FieldCrudTest extends FieldKernelTestBase {
   /**
    * Test the update of a field.
    */
-  function testUpdateField() {
+  public function testUpdateField() {
     FieldConfig::create($this->fieldDefinition)->save();
 
     // Check that basic changes are saved.
@@ -209,7 +209,7 @@ class FieldCrudTest extends FieldKernelTestBase {
   /**
    * Test the deletion of a field.
    */
-  function testDeleteField() {
+  public function testDeleteField() {
     // TODO: Test deletion of the data stored in the field also.
     // Need to check that data for a 'deleted' field / storage doesn't get loaded
     // Need to check data marked deleted is cleaned on cron (not implemented yet...)
@@ -223,12 +223,12 @@ class FieldCrudTest extends FieldKernelTestBase {
     FieldConfig::create($another_field_definition)->save();
 
     // Test that the first field is not deleted, and then delete it.
-    $field = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $this->fieldDefinition['field_name'], 'bundle' => $this->fieldDefinition['bundle'], 'include_deleted' => TRUE)));
+    $field = current(entity_load_multiple_by_properties('field_config', ['entity_type' => 'entity_test', 'field_name' => $this->fieldDefinition['field_name'], 'bundle' => $this->fieldDefinition['bundle'], 'include_deleted' => TRUE]));
     $this->assertTrue(!empty($field) && empty($field->deleted), 'A new field is not marked for deletion.');
     $field->delete();
 
     // Make sure the field is marked as deleted when it is specifically loaded.
-    $field = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $this->fieldDefinition['field_name'], 'bundle' => $this->fieldDefinition['bundle'], 'include_deleted' => TRUE)));
+    $field = current(entity_load_multiple_by_properties('field_config', ['entity_type' => 'entity_test', 'field_name' => $this->fieldDefinition['field_name'], 'bundle' => $this->fieldDefinition['bundle'], 'include_deleted' => TRUE]));
     $this->assertTrue($field->isDeleted(), 'A deleted field is marked for deletion.');
 
     // Try to load the field normally and make sure it does not show up.
@@ -243,7 +243,7 @@ class FieldCrudTest extends FieldKernelTestBase {
   /**
    * Tests the cross deletion behavior between field storages and fields.
    */
-  function testDeleteFieldCrossDeletion() {
+  public function testDeleteFieldCrossDeletion() {
     $field_definition_2 = $this->fieldDefinition;
     $field_definition_2['bundle'] .= '_another_bundle';
     entity_test_create_bundle($field_definition_2['bundle']);
@@ -276,7 +276,7 @@ class FieldCrudTest extends FieldKernelTestBase {
     $field->save();
     $field_2 = FieldConfig::create($field_definition_2);
     $field_2->save();
-    $this->container->get('entity.manager')->getStorage('field_config')->delete(array($field, $field_2));
+    $this->container->get('entity.manager')->getStorage('field_config')->delete([$field, $field_2]);
     $this->assertFalse(FieldStorageConfig::loadByName('entity_test', $field_storage->getName()));
   }
 
diff --git a/web/core/modules/field/tests/src/Kernel/FieldDataCountTest.php b/web/core/modules/field/tests/src/Kernel/FieldDataCountTest.php
index e0ea68369..69b84a9c1 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldDataCountTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldDataCountTest.php
@@ -50,12 +50,12 @@ class FieldDataCountTest extends FieldKernelTestBase {
     // Create a field with a cardinality of 2 to show that we are counting
     // entities and not rows in a table.
     /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_int',
       'entity_type' => 'entity_test',
       'type' => 'integer',
       'cardinality' => 2,
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -112,7 +112,7 @@ class FieldDataCountTest extends FieldKernelTestBase {
 
     $entity_init = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('type' => $entity_type,));
+      ->create(['type' => $entity_type]);
     $cardinality = $this->fieldTestData->field_storage_2->getCardinality();
 
     $this->assertIdentical($this->fieldTestData->field_storage_2->hasData(), FALSE, 'There are no entities with field data.');
@@ -129,7 +129,7 @@ class FieldDataCountTest extends FieldKernelTestBase {
     $this->assertIdentical($this->fieldTestData->field_storage_2->hasData(), TRUE, 'There are entities with field data.');
     $this->assertIdentical($this->storageRev->countFieldData($this->fieldTestData->field_storage_2), 1, 'There is 1 entity with field data.');
 
-    $entity->{$this->fieldTestData->field_name_2} = array();
+    $entity->{$this->fieldTestData->field_name_2} = [];
     $entity->setNewRevision();
     $entity->save();
 
@@ -137,7 +137,7 @@ class FieldDataCountTest extends FieldKernelTestBase {
 
     $storage = $this->container->get('entity.manager')->getStorage($entity_type);
     $entity = $storage->loadRevision($first_revision);
-    $this->assertEqual(count($entity->{$this->fieldTestData->field_name_2}), $cardinality, format_string('Revision %revision_id: expected number of values.', array('%revision_id' => $first_revision)));
+    $this->assertEqual(count($entity->{$this->fieldTestData->field_name_2}), $cardinality, format_string('Revision %revision_id: expected number of values.', ['%revision_id' => $first_revision]));
   }
 
   /**
@@ -146,27 +146,27 @@ class FieldDataCountTest extends FieldKernelTestBase {
   public function testCountWithIndex0() {
     // Create a field that will require dedicated storage.
     /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_int',
       'entity_type' => 'user',
       'type' => 'integer',
       'cardinality' => 2,
-    ));
+    ]);
     $field_storage->save();
-    FieldConfig::create(array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'user',
-    ))->save();
+    ])->save();
 
     // Create an entry for the anonymous user, who has user ID 0.
     $user = $this->storageUser
-      ->create(array(
+      ->create([
         'uid' => 0,
         'name' => 'anonymous',
         'mail' => NULL,
         'status' => FALSE,
         'field_int' => 42,
-      ));
+      ]);
     $user->save();
 
     // Test shared table storage.
diff --git a/web/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php b/web/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php
index 8cd029188..9b8391961 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php
@@ -20,12 +20,12 @@ class FieldImportChangeTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_test_config');
+  public static $modules = ['field_test_config'];
 
   /**
    * Tests importing an updated field.
    */
-  function testImportChange() {
+  public function testImportChange() {
     $this->installConfig(['field_test_config']);
     $field_storage_id = 'field_test_import';
     $field_id = "entity_test.entity_test.$field_storage_id";
diff --git a/web/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php b/web/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php
index 3478dd3be..5e155824f 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php
@@ -16,7 +16,7 @@ class FieldImportCreateTest extends FieldKernelTestBase {
   /**
    * Tests creating field storages and fields during default config import.
    */
-  function testImportCreateDefault() {
+  public function testImportCreateDefault() {
     $field_name = 'field_test_import';
     $field_storage_id = "entity_test.$field_name";
     $field_id = "entity_test.entity_test.$field_name";
@@ -37,7 +37,7 @@ class FieldImportCreateTest extends FieldKernelTestBase {
 
     // Enable field_test_config module and check that the field and storage
     // shipped in the module's default config were created.
-    \Drupal::service('module_installer')->install(array('field_test_config'));
+    \Drupal::service('module_installer')->install(['field_test_config']);
 
     // A field storage with one single field.
     $field_storage = FieldStorageConfig::load($field_storage_id);
@@ -70,7 +70,7 @@ class FieldImportCreateTest extends FieldKernelTestBase {
   /**
    * Tests creating field storages and fields during config import.
    */
-  function testImportCreate() {
+  public function testImportCreate() {
     // A field storage with one single field.
     $field_name = 'field_test_import_sync';
     $field_storage_id = "entity_test.$field_name";
diff --git a/web/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php b/web/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php
index b536fe804..0eef13716 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php
@@ -22,7 +22,7 @@ class FieldImportDeleteTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_test_config');
+  public static $modules = ['field_test_config'];
 
   /**
    * Tests deleting field storages and fields as part of config import.
@@ -60,11 +60,11 @@ class FieldImportDeleteTest extends FieldKernelTestBase {
     $active = $this->container->get('config.storage');
     $sync = $this->container->get('config.storage.sync');
     $this->copyConfig($active, $sync);
-    $this->assertTrue($sync->delete($field_storage_config_name), SafeMarkup::format('Deleted field storage: @field_storage', array('@field_storage' => $field_storage_config_name)));
-    $this->assertTrue($sync->delete($field_storage_config_name_2), SafeMarkup::format('Deleted field storage: @field_storage', array('@field_storage' => $field_storage_config_name_2)));
-    $this->assertTrue($sync->delete($field_config_name), SafeMarkup::format('Deleted field: @field', array('@field' => $field_config_name)));
-    $this->assertTrue($sync->delete($field_config_name_2a), SafeMarkup::format('Deleted field: @field', array('@field' => $field_config_name_2a)));
-    $this->assertTrue($sync->delete($field_config_name_2b), SafeMarkup::format('Deleted field: @field', array('@field' => $field_config_name_2b)));
+    $this->assertTrue($sync->delete($field_storage_config_name), SafeMarkup::format('Deleted field storage: @field_storage', ['@field_storage' => $field_storage_config_name]));
+    $this->assertTrue($sync->delete($field_storage_config_name_2), SafeMarkup::format('Deleted field storage: @field_storage', ['@field_storage' => $field_storage_config_name_2]));
+    $this->assertTrue($sync->delete($field_config_name), SafeMarkup::format('Deleted field: @field', ['@field' => $field_config_name]));
+    $this->assertTrue($sync->delete($field_config_name_2a), SafeMarkup::format('Deleted field: @field', ['@field' => $field_config_name_2a]));
+    $this->assertTrue($sync->delete($field_config_name_2b), SafeMarkup::format('Deleted field: @field', ['@field' => $field_config_name_2b]));
 
     $deletes = $this->configImporter()->getUnprocessedConfiguration('delete');
     $this->assertEqual(count($deletes), 5, 'Importing configuration will delete 3 fields and 2 field storages.');
@@ -73,39 +73,39 @@ class FieldImportDeleteTest extends FieldKernelTestBase {
     $this->configImporter()->import();
 
     // Check that the field storages and fields are gone.
-    \Drupal::entityManager()->getStorage('field_storage_config')->resetCache(array($field_storage_id));
+    \Drupal::entityManager()->getStorage('field_storage_config')->resetCache([$field_storage_id]);
     $field_storage = FieldStorageConfig::load($field_storage_id);
     $this->assertFalse($field_storage, 'The field storage was deleted.');
-    \Drupal::entityManager()->getStorage('field_storage_config')->resetCache(array($field_storage_id_2));
+    \Drupal::entityManager()->getStorage('field_storage_config')->resetCache([$field_storage_id_2]);
     $field_storage_2 = FieldStorageConfig::load($field_storage_id_2);
     $this->assertFalse($field_storage_2, 'The second field storage was deleted.');
-    \Drupal::entityManager()->getStorage('field_config')->resetCache(array($field_id));
+    \Drupal::entityManager()->getStorage('field_config')->resetCache([$field_id]);
     $field = FieldConfig::load($field_id);
     $this->assertFalse($field, 'The field was deleted.');
-    \Drupal::entityManager()->getStorage('field_config')->resetCache(array($field_id_2a));
+    \Drupal::entityManager()->getStorage('field_config')->resetCache([$field_id_2a]);
     $field_2a = FieldConfig::load($field_id_2a);
     $this->assertFalse($field_2a, 'The second field on test bundle was deleted.');
-    \Drupal::entityManager()->getStorage('field_config')->resetCache(array($field_id_2b));
+    \Drupal::entityManager()->getStorage('field_config')->resetCache([$field_id_2b]);
     $field_2b = FieldConfig::load($field_id_2b);
     $this->assertFalse($field_2b, 'The second field on test bundle 2 was deleted.');
 
     // Check that all config files are gone.
     $active = $this->container->get('config.storage');
-    $this->assertIdentical($active->listAll($field_storage_config_name), array());
-    $this->assertIdentical($active->listAll($field_storage_config_name_2), array());
-    $this->assertIdentical($active->listAll($field_config_name), array());
-    $this->assertIdentical($active->listAll($field_config_name_2a), array());
-    $this->assertIdentical($active->listAll($field_config_name_2b), array());
+    $this->assertIdentical($active->listAll($field_storage_config_name), []);
+    $this->assertIdentical($active->listAll($field_storage_config_name_2), []);
+    $this->assertIdentical($active->listAll($field_config_name), []);
+    $this->assertIdentical($active->listAll($field_config_name_2a), []);
+    $this->assertIdentical($active->listAll($field_config_name_2b), []);
 
     // Check that the storage definition is preserved in state.
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: [];
     $this->assertTrue(isset($deleted_storages[$field_storage_uuid]));
     $this->assertTrue(isset($deleted_storages[$field_storage_uuid_2]));
 
     // Purge field data, and check that the storage definition has been
     // completely removed once the data is purged.
     field_purge_batch(10);
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: [];
     $this->assertTrue(empty($deleted_storages), 'Fields are deleted');
   }
 
diff --git a/web/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php b/web/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php
index dab6e0d53..c3a4d3c1d 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php
@@ -21,14 +21,14 @@ class FieldImportDeleteUninstallTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('telephone');
+  public static $modules = ['telephone'];
 
   protected function setUp() {
     parent::setUp();
     // Module uninstall requires users_data tables.
     // @see drupal_flush_all_caches()
     // @see user_modules_uninstalled()
-    $this->installSchema('user', array('users_data'));
+    $this->installSchema('user', ['users_data']);
   }
 
   /**
@@ -38,11 +38,11 @@ class FieldImportDeleteUninstallTest extends FieldKernelTestBase {
     // Create a field to delete to prove that
     // \Drupal\field\ConfigImporterFieldPurger does not purge fields that are
     // not related to the configuration synchronization.
-    $unrelated_field_storage = FieldStorageConfig::create(array(
+    $unrelated_field_storage = FieldStorageConfig::create([
       'field_name' => 'field_int',
       'entity_type' => 'entity_test',
       'type' => 'integer',
-    ));
+    ]);
     $unrelated_field_storage->save();
     FieldConfig::create([
       'field_storage' => $unrelated_field_storage,
@@ -50,11 +50,11 @@ class FieldImportDeleteUninstallTest extends FieldKernelTestBase {
     ])->save();
 
     // Create a telephone field for validation.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_test',
       'entity_type' => 'entity_test',
       'type' => 'telephone',
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -93,7 +93,7 @@ class FieldImportDeleteUninstallTest extends FieldKernelTestBase {
     $sync->delete('field.field.entity_test.entity_test.field_test');
 
     $steps = $this->configImporter()->initialize();
-    $this->assertIdentical($steps[0], array('\Drupal\field\ConfigImporterFieldPurger', 'process'), 'The additional process configuration synchronization step has been added.');
+    $this->assertIdentical($steps[0], ['\Drupal\field\ConfigImporterFieldPurger', 'process'], 'The additional process configuration synchronization step has been added.');
 
     // This will purge all the data, delete the field and uninstall the
     // Telephone module.
@@ -101,7 +101,7 @@ class FieldImportDeleteUninstallTest extends FieldKernelTestBase {
 
     $this->assertFalse(\Drupal::moduleHandler()->moduleExists('telephone'));
     $this->assertFalse(\Drupal::entityManager()->loadEntityByUuid('field_storage_config', $field_storage->uuid()), 'The test field has been deleted by the configuration synchronization');
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: [];
     $this->assertFalse(isset($deleted_storages[$field_storage->uuid()]), 'Telephone field has been completed removed from the system.');
     $this->assertTrue(isset($deleted_storages[$unrelated_field_storage->uuid()]), 'Unrelated field not purged by configuration synchronization.');
   }
@@ -112,11 +112,11 @@ class FieldImportDeleteUninstallTest extends FieldKernelTestBase {
    */
   public function testImportAlreadyDeletedUninstall() {
     // Create a telephone field for validation.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_test',
       'entity_type' => 'entity_test',
       'type' => 'telephone',
-    ));
+    ]);
     $field_storage->save();
     $field_storage_uuid = $field_storage->uuid();
     FieldConfig::create([
@@ -150,18 +150,18 @@ class FieldImportDeleteUninstallTest extends FieldKernelTestBase {
     unset($core_extension['module']['telephone']);
     $sync->write('core.extension', $core_extension);
 
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: [];
     $this->assertTrue(isset($deleted_storages[$field_storage_uuid]), 'Field has been deleted and needs purging before configuration synchronization.');
 
     $steps = $this->configImporter()->initialize();
-    $this->assertIdentical($steps[0], array('\Drupal\field\ConfigImporterFieldPurger', 'process'), 'The additional process configuration synchronization step has been added.');
+    $this->assertIdentical($steps[0], ['\Drupal\field\ConfigImporterFieldPurger', 'process'], 'The additional process configuration synchronization step has been added.');
 
     // This will purge all the data, delete the field and uninstall the
     // Telephone module.
     $this->configImporter()->import();
 
     $this->assertFalse(\Drupal::moduleHandler()->moduleExists('telephone'));
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: [];
     $this->assertFalse(isset($deleted_storages[$field_storage_uuid]), 'Field has been completed removed from the system.');
   }
 
diff --git a/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php b/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
index 4d6bd5111..6bc40cc3d 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
@@ -43,24 +43,24 @@ abstract class FieldKernelTestBase extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->fieldTestData = new \ArrayObject(array(), \ArrayObject::ARRAY_AS_PROPS);
+    $this->fieldTestData = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
 
     $this->installEntitySchema('entity_test');
     $this->installEntitySchema('user');
     $this->installSchema('system', ['sequences', 'key_value']);
 
     // Set default storage backend and configure the theme system.
-    $this->installConfig(array('field', 'system'));
+    $this->installConfig(['field', 'system']);
 
     // Create user 1.
     $storage = \Drupal::entityManager()->getStorage('user');
     $storage
-      ->create(array(
+      ->create([
         'uid' => 1,
         'name' => 'entity-test',
         'mail' => 'entity@localhost',
         'status' => TRUE,
-      ))
+      ])
       ->save();
   }
 
@@ -88,33 +88,33 @@ abstract class FieldKernelTestBase extends KernelTestBase {
     $field_definition = 'field_definition' . $suffix;
 
     $this->fieldTestData->$field_name = Unicode::strtolower($this->randomMachineName() . '_field_name' . $suffix);
-    $this->fieldTestData->$field_storage = FieldStorageConfig::create(array(
+    $this->fieldTestData->$field_storage = FieldStorageConfig::create([
       'field_name' => $this->fieldTestData->$field_name,
       'entity_type' => $entity_type,
       'type' => 'test_field',
       'cardinality' => 4,
-    ));
+    ]);
     $this->fieldTestData->$field_storage->save();
     $this->fieldTestData->$field_storage_uuid = $this->fieldTestData->$field_storage->uuid();
-    $this->fieldTestData->$field_definition = array(
+    $this->fieldTestData->$field_definition = [
       'field_storage' => $this->fieldTestData->$field_storage,
       'bundle' => $bundle,
       'label' => $this->randomMachineName() . '_label',
       'description' => $this->randomMachineName() . '_description',
-      'settings' => array(
+      'settings' => [
         'test_field_setting' => $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
     $this->fieldTestData->$field = FieldConfig::create($this->fieldTestData->$field_definition);
     $this->fieldTestData->$field->save();
 
     entity_get_form_display($entity_type, $bundle, 'default')
-      ->setComponent($this->fieldTestData->$field_name, array(
+      ->setComponent($this->fieldTestData->$field_name, [
         'type' => 'test_field_widget',
-        'settings' => array(
+        'settings' => [
           'test_widget_setting' => $this->randomMachineName(),
-        )
-      ))
+        ]
+      ])
       ->save();
   }
 
@@ -159,7 +159,7 @@ abstract class FieldKernelTestBase extends KernelTestBase {
    *   An array of random values, in the format expected for field values.
    */
   protected function _generateTestFieldValues($cardinality) {
-    $values = array();
+    $values = [];
     for ($i = 0; $i < $cardinality; $i++) {
       // field_test fields treat 0 as 'empty value'.
       $values[$i]['value'] = mt_rand(1, 127);
@@ -197,7 +197,7 @@ abstract class FieldKernelTestBase extends KernelTestBase {
     $values = $field->getValue();
     $this->assertEqual(count($values), count($expected_values), 'Expected number of values were saved.');
     foreach ($expected_values as $key => $value) {
-      $this->assertEqual($values[$key][$column], $value, format_string('Value @value was saved correctly.', array('@value' => $value)));
+      $this->assertEqual($values[$key][$column], $value, format_string('Value @value was saved correctly.', ['@value' => $value]));
     }
   }
 
diff --git a/web/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php b/web/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php
index da1948c14..f7993dcc7 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php
@@ -21,7 +21,7 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array();
+  public static $modules = [];
 
   // TODO : test creation with
   // - a full fledged $field structure, check that all the values are there
@@ -31,12 +31,12 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
   /**
    * Test the creation of a field storage.
    */
-  function testCreate() {
-    $field_storage_definition = array(
+  public function testCreate() {
+    $field_storage_definition = [
       'field_name' => 'field_2',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
-    );
+    ];
     field_test_memorize();
     $field_storage = FieldStorageConfig::create($field_storage_definition);
     $field_storage->save();
@@ -86,10 +86,10 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
 
     // Check that field type is required.
     try {
-      $field_storage_definition = array(
+      $field_storage_definition = [
         'field_name' => 'field_1',
         'entity_type' => 'entity_type',
-      );
+      ];
       FieldStorageConfig::create($field_storage_definition)->save();
       $this->fail(t('Cannot create a field with no type.'));
     }
@@ -99,10 +99,10 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
 
     // Check that field name is required.
     try {
-      $field_storage_definition = array(
+      $field_storage_definition = [
         'type' => 'test_field',
         'entity_type' => 'entity_test',
-      );
+      ];
       FieldStorageConfig::create($field_storage_definition)->save();
       $this->fail(t('Cannot create an unnamed field.'));
     }
@@ -111,10 +111,10 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
     }
     // Check that entity type is required.
     try {
-      $field_storage_definition = array(
+      $field_storage_definition = [
         'field_name' => 'test_field',
         'type' => 'test_field'
-      );
+      ];
       FieldStorageConfig::create($field_storage_definition)->save();
       $this->fail('Cannot create a field without an entity type.');
     }
@@ -124,11 +124,11 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
 
     // Check that field name must start with a letter or _.
     try {
-      $field_storage_definition = array(
+      $field_storage_definition = [
         'field_name' => '2field_2',
         'entity_type' => 'entity_test',
         'type' => 'test_field',
-      );
+      ];
       FieldStorageConfig::create($field_storage_definition)->save();
       $this->fail(t('Cannot create a field with a name starting with a digit.'));
     }
@@ -138,11 +138,11 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
 
     // Check that field name must only contain lowercase alphanumeric or _.
     try {
-      $field_storage_definition = array(
+      $field_storage_definition = [
         'field_name' => 'field#_3',
         'entity_type' => 'entity_test',
         'type' => 'test_field',
-      );
+      ];
       FieldStorageConfig::create($field_storage_definition)->save();
       $this->fail(t('Cannot create a field with a name containing an illegal character.'));
     }
@@ -152,11 +152,11 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
 
     // Check that field name cannot be longer than 32 characters long.
     try {
-      $field_storage_definition = array(
+      $field_storage_definition = [
         'field_name' => '_12345678901234567890123456789012',
         'entity_type' => 'entity_test',
         'type' => 'test_field',
-      );
+      ];
       FieldStorageConfig::create($field_storage_definition)->save();
       $this->fail(t('Cannot create a field with a name longer than 32 characters.'));
     }
@@ -167,11 +167,11 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
     // Check that field name can not be an entity key.
     // "id" is known as an entity key from the "entity_test" type.
     try {
-      $field_storage_definition = array(
+      $field_storage_definition = [
         'type' => 'test_field',
         'field_name' => 'id',
         'entity_type' => 'entity_test',
-      );
+      ];
       FieldStorageConfig::create($field_storage_definition)->save();
       $this->fail(t('Cannot create a field bearing the name of an entity key.'));
     }
@@ -186,145 +186,145 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
    * This behavior is needed to allow field storage creation within updates,
    * since plugin classes (and thus the field type schema) cannot be accessed.
    */
-  function testCreateWithExplicitSchema() {
-    $schema = array(
+  public function testCreateWithExplicitSchema() {
+    $schema = [
       'dummy' => 'foobar'
-    );
-    $field_storage = FieldStorageConfig::create(array(
+    ];
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_2',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
       'schema' => $schema,
-    ));
+    ]);
     $this->assertEqual($field_storage->getSchema(), $schema);
   }
 
   /**
    * Tests reading field storage definitions.
    */
-  function testRead() {
-    $field_storage_definition = array(
+  public function testRead() {
+    $field_storage_definition = [
       'field_name' => 'field_1',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
-    );
+    ];
     $field_storage = FieldStorageConfig::create($field_storage_definition);
     $field_storage->save();
     $id = $field_storage->id();
 
     // Check that 'single column' criteria works.
-    $fields = entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name']));
+    $fields = entity_load_multiple_by_properties('field_storage_config', ['field_name' => $field_storage_definition['field_name']]);
     $this->assertTrue(count($fields) == 1 && isset($fields[$id]), 'The field was properly read.');
 
     // Check that 'multi column' criteria works.
-    $fields = entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'type' => $field_storage_definition['type']));
+    $fields = entity_load_multiple_by_properties('field_storage_config', ['field_name' => $field_storage_definition['field_name'], 'type' => $field_storage_definition['type']]);
     $this->assertTrue(count($fields) == 1 && isset($fields[$id]), 'The field was properly read.');
-    $fields = entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'type' => 'foo'));
+    $fields = entity_load_multiple_by_properties('field_storage_config', ['field_name' => $field_storage_definition['field_name'], 'type' => 'foo']);
     $this->assertTrue(empty($fields), 'No field was found.');
 
     // Create a field from the field storage.
-    $field_definition = array(
+    $field_definition = [
       'field_name' => $field_storage_definition['field_name'],
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
-    );
+    ];
     FieldConfig::create($field_definition)->save();
   }
 
   /**
    * Test creation of indexes on data column.
    */
-  function testIndexes() {
+  public function testIndexes() {
     // Check that indexes specified by the field type are used by default.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_1',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
-    ));
+    ]);
     $field_storage->save();
     $field_storage = FieldStorageConfig::load($field_storage->id());
     $schema = $field_storage->getSchema();
-    $expected_indexes = array('value' => array('value'));
+    $expected_indexes = ['value' => ['value']];
     $this->assertEqual($schema['indexes'], $expected_indexes, 'Field type indexes saved by default');
 
     // Check that indexes specified by the field definition override the field
     // type indexes.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_2',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
-      'indexes' => array(
-        'value' => array(),
-      ),
-    ));
+      'indexes' => [
+        'value' => [],
+      ],
+    ]);
     $field_storage->save();
     $field_storage = FieldStorageConfig::load($field_storage->id());
     $schema = $field_storage->getSchema();
-    $expected_indexes = array('value' => array());
+    $expected_indexes = ['value' => []];
     $this->assertEqual($schema['indexes'], $expected_indexes, 'Field definition indexes override field type indexes');
 
     // Check that indexes specified by the field definition add to the field
     // type indexes.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_3',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
-      'indexes' => array(
-        'value_2' => array('value'),
-      ),
-    ));
+      'indexes' => [
+        'value_2' => ['value'],
+      ],
+    ]);
     $field_storage->save();
     $id = $field_storage->id();
     $field_storage = FieldStorageConfig::load($id);
     $schema = $field_storage->getSchema();
-    $expected_indexes = array('value' => array('value'), 'value_2' => array('value'));
+    $expected_indexes = ['value' => ['value'], 'value_2' => ['value']];
     $this->assertEqual($schema['indexes'], $expected_indexes, 'Field definition indexes are merged with field type indexes');
   }
 
   /**
    * Test the deletion of a field storage.
    */
-  function testDelete() {
+  public function testDelete() {
     // TODO: Also test deletion of the data stored in the field ?
 
     // Create two fields (so we can test that only one is deleted).
-    $field_storage_definition = array(
+    $field_storage_definition = [
       'field_name' => 'field_1',
       'type' => 'test_field',
       'entity_type' => 'entity_test',
-    );
+    ];
     FieldStorageConfig::create($field_storage_definition)->save();
-    $another_field_storage_definition = array(
+    $another_field_storage_definition = [
       'field_name' => 'field_2',
       'type' => 'test_field',
       'entity_type' => 'entity_test',
-    );
+    ];
     FieldStorageConfig::create($another_field_storage_definition)->save();
 
     // Create fields for each.
-    $field_definition = array(
+    $field_definition = [
       'field_name' => $field_storage_definition['field_name'],
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
-    );
+    ];
     FieldConfig::create($field_definition)->save();
     $another_field_definition = $field_definition;
     $another_field_definition['field_name'] = $another_field_storage_definition['field_name'];
     FieldConfig::create($another_field_definition)->save();
 
     // Test that the first field is not deleted, and then delete it.
-    $field_storage = current(entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'include_deleted' => TRUE)));
+    $field_storage = current(entity_load_multiple_by_properties('field_storage_config', ['field_name' => $field_storage_definition['field_name'], 'include_deleted' => TRUE]));
     $this->assertTrue(!empty($field_storage) && !$field_storage->isDeleted(), 'A new storage is not marked for deletion.');
     FieldStorageConfig::loadByName('entity_test', $field_storage_definition['field_name'])->delete();
 
     // Make sure that the field is marked as deleted when it is specifically
     // loaded.
-    $field_storage = current(entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'include_deleted' => TRUE)));
+    $field_storage = current(entity_load_multiple_by_properties('field_storage_config', ['field_name' => $field_storage_definition['field_name'], 'include_deleted' => TRUE]));
     $this->assertTrue($field_storage->isDeleted(), 'A deleted storage is marked for deletion.');
 
     // Make sure that this field is marked as deleted when it is
     // specifically loaded.
-    $field = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $field_definition['field_name'], 'bundle' => $field_definition['bundle'], 'include_deleted' => TRUE)));
+    $field = current(entity_load_multiple_by_properties('field_config', ['entity_type' => 'entity_test', 'field_name' => $field_definition['field_name'], 'bundle' => $field_definition['bundle'], 'include_deleted' => TRUE]));
     $this->assertTrue($field->isDeleted(), 'A field whose storage was deleted is marked for deletion.');
 
     // Try to load the storage normally and make sure it does not show up.
@@ -363,12 +363,12 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
     }
   }
 
-  function testUpdateFieldType() {
-    $field_storage = FieldStorageConfig::create(array(
+  public function testUpdateFieldType() {
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_type',
       'entity_type' => 'entity_test',
       'type' => 'decimal',
-    ));
+    ]);
     $field_storage->save();
 
     try {
@@ -384,17 +384,17 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
   /**
    * Test updating a field storage.
    */
-  function testUpdate() {
+  public function testUpdate() {
     // Create a field with a defined cardinality, so that we can ensure it's
     // respected. Since cardinality enforcement is consistent across database
     // systems, it makes a good test case.
     $cardinality = 4;
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_update',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
       'cardinality' => $cardinality,
-    ));
+    ]);
     $field_storage->save();
     $field = FieldConfig::create([
       'field_storage' => $field_storage,
@@ -426,15 +426,15 @@ class FieldStorageCrudTest extends FieldKernelTestBase {
   /**
    * Test field type modules forbidding an update.
    */
-  function testUpdateForbid() {
-    $field_storage = FieldStorageConfig::create(array(
+  public function testUpdateForbid() {
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'forbidden',
       'entity_type' => 'entity_test',
       'type' => 'test_field',
-      'settings' => array(
+      'settings' => [
         'changeable' => 0,
         'unchangeable' => 0
-    )));
+    ]]);
     $field_storage->save();
     $field_storage->setSetting('changeable', $field_storage->getSetting('changeable') + 1);
     try {
diff --git a/web/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php b/web/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php
index 6d443843a..32b296480 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php
@@ -17,12 +17,12 @@ class FieldTypePluginManagerTest extends FieldKernelTestBase {
   /**
    * Tests the default settings convenience methods.
    */
-  function testDefaultSettings() {
+  public function testDefaultSettings() {
     $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
-    foreach (array('test_field', 'shape', 'hidden_test_field') as $type) {
+    foreach (['test_field', 'shape', 'hidden_test_field'] as $type) {
       $definition = $field_type_manager->getDefinition($type);
-      $this->assertIdentical($field_type_manager->getDefaultStorageSettings($type), $definition['class']::defaultStorageSettings(), format_string("%type storage settings were returned", array('%type' => $type)));
-      $this->assertIdentical($field_type_manager->getDefaultFieldSettings($type), $definition['class']::defaultFieldSettings(), format_string(" %type field settings were returned", array('%type' => $type)));
+      $this->assertIdentical($field_type_manager->getDefaultStorageSettings($type), $definition['class']::defaultStorageSettings(), format_string("%type storage settings were returned", ['%type' => $type]));
+      $this->assertIdentical($field_type_manager->getDefaultFieldSettings($type), $definition['class']::defaultFieldSettings(), format_string(" %type field settings were returned", ['%type' => $type]));
     }
   }
 
@@ -32,7 +32,7 @@ class FieldTypePluginManagerTest extends FieldKernelTestBase {
   public function testCreateInstance() {
     /** @var \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager */
     $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
-    foreach (array('test_field', 'shape', 'hidden_test_field') as $type) {
+    foreach (['test_field', 'shape', 'hidden_test_field'] as $type) {
       $definition = $field_type_manager->getDefinition($type);
 
       $class = $definition['class'];
@@ -40,16 +40,16 @@ class FieldTypePluginManagerTest extends FieldKernelTestBase {
 
       $field_definition = BaseFieldDefinition::create($type);
 
-      $configuration = array(
+      $configuration = [
         'field_definition' => $field_definition,
         'name' => $field_name,
         'parent' => NULL,
-      );
+      ];
 
       $instance = $field_type_manager->createInstance($type, $configuration);
 
-      $this->assertTrue($instance instanceof $class, SafeMarkup::format('Created a @class instance', array('@class' => $class)));
-      $this->assertEqual($field_name, $instance->getName(), SafeMarkup::format('Instance name is @name', array('@name' => $field_name)));
+      $this->assertTrue($instance instanceof $class, SafeMarkup::format('Created a @class instance', ['@class' => $class]));
+      $this->assertEqual($field_name, $instance->getName(), SafeMarkup::format('Instance name is @name', ['@name' => $field_name]));
     }
   }
 
@@ -69,18 +69,18 @@ class FieldTypePluginManagerTest extends FieldKernelTestBase {
       ->setLabel('Jenny')
       ->setDefaultValue(8675309);
 
-    $configuration = array(
+    $configuration = [
       'field_definition' => $field_definition,
       'name' => $field_name,
       'parent' => NULL,
-    );
+    ];
 
     $entity = EntityTest::create();
 
     $instance = $field_type_manager->createInstance($type, $configuration);
 
-    $this->assertTrue($instance instanceof $class, SafeMarkup::format('Created a @class instance', array('@class' => $class)));
-    $this->assertEqual($field_name, $instance->getName(), SafeMarkup::format('Instance name is @name', array('@name' => $field_name)));
+    $this->assertTrue($instance instanceof $class, SafeMarkup::format('Created a @class instance', ['@class' => $class]));
+    $this->assertEqual($field_name, $instance->getName(), SafeMarkup::format('Instance name is @name', ['@name' => $field_name]));
     $this->assertEqual($instance->getFieldDefinition()->getLabel(), 'Jenny', 'Instance label is Jenny');
     $this->assertEqual($instance->getFieldDefinition()->getDefaultValue($entity), [['value' => 8675309]], 'Instance default_value is 8675309');
   }
diff --git a/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php b/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php
index 3715832d5..92d33972f 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php
@@ -34,20 +34,20 @@ class FieldValidationTest extends FieldKernelTestBase {
     $this->createFieldWithStorage('', $this->entityType, $this->bundle);
 
     // Create an 'entity_test' entity.
-    $this->entity = entity_create($this->entityType, array(
+    $this->entity = entity_create($this->entityType, [
       'type' => $this->bundle,
-    ));
+    ]);
   }
 
   /**
    * Tests that the number of values is validated against the field cardinality.
    */
-  function testCardinalityConstraint() {
+  public function testCardinalityConstraint() {
     $cardinality = $this->fieldTestData->field_storage->getCardinality();
     $entity = $this->entity;
 
     for ($delta = 0; $delta < $cardinality + 1; $delta++) {
-      $entity->{$this->fieldTestData->field_name}[] = array('value' => 1);
+      $entity->{$this->fieldTestData->field_name}[] = ['value' => 1];
     }
 
     // Validate the field.
@@ -56,13 +56,13 @@ class FieldValidationTest extends FieldKernelTestBase {
     // Check that the expected constraint violations are reported.
     $this->assertEqual(count($violations), 1);
     $this->assertEqual($violations[0]->getPropertyPath(), '');
-    $this->assertEqual($violations[0]->getMessage(), t('%name: this field cannot hold more than @count values.', array('%name' => $this->fieldTestData->field->getLabel(), '@count' => $cardinality)));
+    $this->assertEqual($violations[0]->getMessage(), t('%name: this field cannot hold more than @count values.', ['%name' => $this->fieldTestData->field->getLabel(), '@count' => $cardinality]));
   }
 
   /**
    * Tests that constraints defined by the field type are validated.
    */
-  function testFieldConstraints() {
+  public function testFieldConstraints() {
     $cardinality = $this->fieldTestData->field_storage->getCardinality();
     $entity = $this->entity;
 
@@ -70,7 +70,7 @@ class FieldValidationTest extends FieldKernelTestBase {
     $this->assertTrue($cardinality >= 2);
 
     // Set up values for the field.
-    $expected_violations = array();
+    $expected_violations = [];
     for ($delta = 0; $delta < $cardinality; $delta++) {
       // All deltas except '1' have incorrect values.
       if ($delta == 1) {
@@ -78,7 +78,7 @@ class FieldValidationTest extends FieldKernelTestBase {
       }
       else {
         $value = -1;
-        $expected_violations[$delta . '.value'][] = t('%name does not accept the value -1.', array('%name' => $this->fieldTestData->field->getLabel()));
+        $expected_violations[$delta . '.value'][] = t('%name does not accept the value -1.', ['%name' => $this->fieldTestData->field->getLabel()]);
       }
       $entity->{$this->fieldTestData->field_name}[] = $value;
     }
@@ -87,7 +87,7 @@ class FieldValidationTest extends FieldKernelTestBase {
     $violations = $entity->{$this->fieldTestData->field_name}->validate();
 
     // Check that the expected constraint violations are reported.
-    $violations_by_path = array();
+    $violations_by_path = [];
     foreach ($violations as $violation) {
       $violations_by_path[$violation->getPropertyPath()][] = $violation->getMessage();
     }
diff --git a/web/core/modules/field/tests/src/Kernel/FormatterPluginManagerTest.php b/web/core/modules/field/tests/src/Kernel/FormatterPluginManagerTest.php
index 4425a44eb..0b07e3ad9 100644
--- a/web/core/modules/field/tests/src/Kernel/FormatterPluginManagerTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FormatterPluginManagerTest.php
@@ -24,13 +24,13 @@ class FormatterPluginManagerTest extends FieldKernelTestBase {
       // Set a name that will make isApplicable() return TRUE.
       ->setName('field_test_field');
 
-    $formatter_options = array(
+    $formatter_options = [
       'field_definition' => $base_field_definition,
       'view_mode' => 'default',
-      'configuration' => array(
+      'configuration' => [
         'type' => 'field_test_applicable',
-      ),
-    );
+      ],
+    ];
 
     $instance = $formatter_plugin_manager->getInstance($formatter_options);
     $this->assertEqual($instance->getPluginId(), 'field_test_applicable');
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
index 4c9cbf10b..fc81c49f3 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
@@ -20,19 +20,33 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
     $this->migrateFields();
   }
 
+  /**
+   * Asserts that a particular component is NOT included in a display.
+   *
+   * @param string $display_id
+   *   The display ID.
+   * @param string $component_id
+   *   The component ID.
+   */
+  protected function assertComponentNotExists($display_id, $component_id) {
+    $component = EntityViewDisplay::load($display_id)->getComponent($component_id);
+    $this->assertNull($component);
+  }
+
   /**
    * Test that migrated entity display settings can be loaded using D8 API's.
    */
   public function testEntityDisplaySettings() {
     // Run tests.
     $field_name = "field_test";
-    $expected = array(
+    $expected = [
       'label' => 'above',
       'weight' => 1,
       'type' => 'text_trimmed',
-      'settings' => array('trim_length' => 600),
-      'third_party_settings' => array(),
-    );
+      'settings' => ['trim_length' => 600],
+      'third_party_settings' => [],
+      'region' => 'content',
+    ];
 
     // Can we load any entity display.
     $display = EntityViewDisplay::load('node.story.teaser');
@@ -50,7 +64,7 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
 
     // Test the default format with text_default which comes from a static map.
     $expected['type'] = 'text_default';
-    $expected['settings'] = array();
+    $expected['settings'] = [];
     $display = EntityViewDisplay::load('node.story.default');
     $this->assertIdentical($expected, $display->getComponent($field_name));
 
@@ -65,40 +79,40 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
     // Test the number field formatter settings are correct.
     $expected['weight'] = 1;
     $expected['type'] = 'number_integer';
-    $expected['settings'] = array(
+    $expected['settings'] = [
       'thousand_separator' => ',',
       'prefix_suffix' => TRUE,
-    );
+    ];
     $component = $display->getComponent('field_test_two');
     $this->assertIdentical($expected, $component);
     $expected['weight'] = 2;
     $expected['type'] = 'number_decimal';
-    $expected['settings'] = array(
+    $expected['settings'] = [
        'scale' => 2,
        'decimal_separator' => '.',
        'thousand_separator' => ',',
        'prefix_suffix' => TRUE,
-    );
+    ];
     $component = $display->getComponent('field_test_three');
     $this->assertIdentical($expected, $component);
 
     // Test the email field formatter settings are correct.
     $expected['weight'] = 6;
     $expected['type'] = 'email_mailto';
-    $expected['settings'] = array();
+    $expected['settings'] = [];
     $component = $display->getComponent('field_test_email');
     $this->assertIdentical($expected, $component);
 
     // Test the link field formatter settings.
     $expected['weight'] = 7;
     $expected['type'] = 'link';
-    $expected['settings'] = array(
+    $expected['settings'] = [
       'trim_length' => 80,
       'url_only' => TRUE,
       'url_plain' => TRUE,
       'rel' => '0',
       'target' => '0',
-    );
+    ];
     $component = $display->getComponent('field_test_link');
     $this->assertIdentical($expected, $component);
     $expected['settings']['url_only'] = FALSE;
@@ -110,7 +124,7 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
     // Test the file field formatter settings.
     $expected['weight'] = 8;
     $expected['type'] = 'file_default';
-    $expected['settings'] = array();
+    $expected['settings'] = [];
     $component = $display->getComponent('field_test_filefield');
     $this->assertIdentical($expected, $component);
     $display = EntityViewDisplay::load('node.story.default');
@@ -121,7 +135,7 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
     // Test the image field formatter settings.
     $expected['weight'] = 9;
     $expected['type'] = 'image';
-    $expected['settings'] = array('image_style' => '', 'image_link' => '');
+    $expected['settings'] = ['image_style' => '', 'image_link' => ''];
     $component = $display->getComponent('field_test_imagefield');
     $this->assertIdentical($expected, $component);
     $display = EntityViewDisplay::load('node.story.teaser');
@@ -132,15 +146,15 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
     // Test phone field.
     $expected['weight'] = 13;
     $expected['type'] = 'basic_string';
-    $expected['settings'] = array();
+    $expected['settings'] = [];
     $component = $display->getComponent('field_test_phone');
     $this->assertIdentical($expected, $component);
 
     // Test date field.
-    $defaults = array('format_type' => 'fallback', 'timezone_override' => '',);
+    $defaults = ['format_type' => 'fallback', 'timezone_override' => ''];
     $expected['weight'] = 10;
     $expected['type'] = 'datetime_default';
-    $expected['settings'] = array('format_type' => 'fallback') + $defaults;
+    $expected['settings'] = ['format_type' => 'fallback'] + $defaults;
     $component = $display->getComponent('field_test_date');
     $this->assertIdentical($expected, $component);
     $display = EntityViewDisplay::load('node.story.default');
@@ -154,13 +168,13 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
     $component = $display->getComponent('field_test_datestamp');
     $this->assertIdentical($expected, $component);
     $display = EntityViewDisplay::load('node.story.teaser');
-    $expected['settings'] = array('format_type' => 'medium') + $defaults;
+    $expected['settings'] = ['format_type' => 'medium'] + $defaults;
     $component = $display->getComponent('field_test_datestamp');
     $this->assertIdentical($expected, $component);
 
     // Test datetime field.
     $expected['weight'] = 12;
-    $expected['settings'] = array('format_type' => 'short') + $defaults;
+    $expected['settings'] = ['format_type' => 'short'] + $defaults;
     $component = $display->getComponent('field_test_datetime');
     $this->assertIdentical($expected, $component);
     $display = EntityViewDisplay::load('node.story.default');
@@ -175,7 +189,10 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
     $component = $display->getComponent('field_test_datetime');
     $this->assertIdentical($expected, $component);
     // Test that our Id map has the correct data.
-    $this->assertIdentical(array('node', 'story', 'teaser', 'field_test'), $this->getMigration('d6_field_formatter_settings')->getIdMap()->lookupDestinationID(array('story', 'teaser', 'node', 'field_test')));
+    $this->assertIdentical(['node', 'story', 'teaser', 'field_test'], $this->getMigration('d6_field_formatter_settings')->getIdMap()->lookupDestinationID(['story', 'teaser', 'node', 'field_test']));
+
+    // Test hidden field.
+    $this->assertComponentNotExists('node.test_planet.teaser', 'field_test_text_single_checkbox');
   }
 
 }
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
index b3fac3fc5..b1eec3562 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
@@ -32,24 +32,24 @@ class MigrateFieldInstanceTest extends MigrateDrupal6TestBase {
     // Test a number field.
     $field = FieldConfig::load('node.story.field_test_two');
     $this->assertIdentical('Integer Field', $field->label());
-    $expected = array(
+    $expected = [
       'min' => 10,
       'max' => 100,
       'prefix' => 'pref',
       'suffix' => 'suf',
       'unsigned' => FALSE,
       'size' => 'normal',
-    );
+    ];
     $this->assertIdentical($expected, $field->getSettings());
 
     $field = FieldConfig::load('node.story.field_test_four');
     $this->assertIdentical('Float Field', $field->label());
-    $expected = array(
+    $expected = [
       'min' => 100.0,
       'max' => 200.0,
       'prefix' => 'id-',
       'suffix' => '',
-    );
+    ];
     $this->assertIdentical($expected, $field->getSettings());
 
     // Test email field.
@@ -70,7 +70,7 @@ class MigrateFieldInstanceTest extends MigrateDrupal6TestBase {
     // Test a filefield.
     $field = FieldConfig::load('node.story.field_test_filefield');
     $this->assertIdentical('File Field', $field->label());
-    $expected = array(
+    $expected = [
       'file_extensions' => 'txt pdf doc',
       'file_directory' => 'images',
       'description_field' => TRUE,
@@ -80,8 +80,8 @@ class MigrateFieldInstanceTest extends MigrateDrupal6TestBase {
       'display_default' => FALSE,
       'uri_scheme' => 'public',
       'handler' => 'default:file',
-      'handler_settings' => array(),
-    );
+      'handler_settings' => [],
+    ];
     $field_settings = $field->getSettings();
     ksort($expected);
     ksort($field_settings);
@@ -91,7 +91,7 @@ class MigrateFieldInstanceTest extends MigrateDrupal6TestBase {
     // Test a link field.
     $field = FieldConfig::load('node.story.field_test_link');
     $this->assertIdentical('Link Field', $field->label());
-    $expected = array('title' => 2, 'link_type' => LinkItemInterface::LINK_GENERIC);
+    $expected = ['title' => 2, 'link_type' => LinkItemInterface::LINK_GENERIC];
     $this->assertIdentical($expected, $field->getSettings());
     $this->assertIdentical('default link title', $entity->field_test_link->title, 'Field field_test_link default title is correct.');
     $this->assertIdentical('https://www.drupal.org', $entity->field_test_link->url, 'Field field_test_link default title is correct.');
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
index ea3fec8dd..690016172 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
@@ -33,38 +33,38 @@ class MigrateFieldTest extends MigrateDrupal6TestBase {
 
     // Integer field.
     $field_storage = FieldStorageConfig::load('node.field_test_two');
-    $this->assertIdentical("integer", $field_storage->getType(), t('Field type is @fieldtype. It should be integer.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("integer", $field_storage->getType(), t('Field type is @fieldtype. It should be integer.', ['@fieldtype' => $field_storage->getType()]));
 
     // Float field.
     $field_storage = FieldStorageConfig::load('node.field_test_three');
-    $this->assertIdentical("decimal", $field_storage->getType(), t('Field type is @fieldtype. It should be decimal.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("decimal", $field_storage->getType(), t('Field type is @fieldtype. It should be decimal.', ['@fieldtype' => $field_storage->getType()]));
 
     // Link field.
     $field_storage = FieldStorageConfig::load('node.field_test_link');
-    $this->assertIdentical("link", $field_storage->getType(), t('Field type is @fieldtype. It should be link.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("link", $field_storage->getType(), t('Field type is @fieldtype. It should be link.', ['@fieldtype' => $field_storage->getType()]));
 
     // File field.
     $field_storage = FieldStorageConfig::load('node.field_test_filefield');
-    $this->assertIdentical("file", $field_storage->getType(), t('Field type is @fieldtype. It should be file.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("file", $field_storage->getType(), t('Field type is @fieldtype. It should be file.', ['@fieldtype' => $field_storage->getType()]));
 
     $field_storage = FieldStorageConfig::load('node.field_test_imagefield');
-    $this->assertIdentical("image", $field_storage->getType(), t('Field type is @fieldtype. It should be image.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("image", $field_storage->getType(), t('Field type is @fieldtype. It should be image.', ['@fieldtype' => $field_storage->getType()]));
     $settings = $field_storage->getSettings();
     $this->assertIdentical('file', $settings['target_type']);
     $this->assertIdentical('public', $settings['uri_scheme']);
-    $this->assertIdentical(array(), array_filter($settings['default_image']));
+    $this->assertIdentical([], array_filter($settings['default_image']));
 
     // Phone field.
     $field_storage = FieldStorageConfig::load('node.field_test_phone');
-    $this->assertIdentical("telephone", $field_storage->getType(), t('Field type is @fieldtype. It should be telephone.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("telephone", $field_storage->getType(), t('Field type is @fieldtype. It should be telephone.', ['@fieldtype' => $field_storage->getType()]));
 
     // Date field.
     $field_storage = FieldStorageConfig::load('node.field_test_datetime');
-    $this->assertIdentical("datetime", $field_storage->getType(), t('Field type is @fieldtype. It should be datetime.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("datetime", $field_storage->getType(), t('Field type is @fieldtype. It should be datetime.', ['@fieldtype' => $field_storage->getType()]));
 
     // Decimal field with radio buttons.
     $field_storage = FieldStorageConfig::load('node.field_test_decimal_radio_buttons');
-    $this->assertIdentical("list_float", $field_storage->getType(), t('Field type is @fieldtype. It should be list_float.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("list_float", $field_storage->getType(), t('Field type is @fieldtype. It should be list_float.', ['@fieldtype' => $field_storage->getType()]));
     $this->assertNotNull($field_storage->getSetting('allowed_values')['1.2'], t('First allowed value key is set to 1.2'));
     $this->assertNotNull($field_storage->getSetting('allowed_values')['2.1'], t('Second allowed value key is set to 2.1'));
     $this->assertIdentical('1.2', $field_storage->getSetting('allowed_values')['1.2'], t('First allowed value is set to 1.2'));
@@ -72,11 +72,11 @@ class MigrateFieldTest extends MigrateDrupal6TestBase {
 
     // Float field with a single checkbox.
     $field_storage = FieldStorageConfig::load('node.field_test_float_single_checkbox');
-    $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', ['@fieldtype' => $field_storage->getType()]));
 
     // Integer field with a select list.
     $field_storage = FieldStorageConfig::load('node.field_test_integer_selectlist');
-    $this->assertIdentical("list_integer", $field_storage->getType(), t('Field type is @fieldtype. It should be list_integer.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("list_integer", $field_storage->getType(), t('Field type is @fieldtype. It should be list_integer.', ['@fieldtype' => $field_storage->getType()]));
     $this->assertNotNull($field_storage->getSetting('allowed_values')['1234'], t('First allowed value key is set to 1234'));
     $this->assertNotNull($field_storage->getSetting('allowed_values')['2341'], t('Second allowed value key is set to 2341'));
     $this->assertNotNull($field_storage->getSetting('allowed_values')['3412'], t('Third allowed value key is set to 3412'));
@@ -88,7 +88,7 @@ class MigrateFieldTest extends MigrateDrupal6TestBase {
 
     // Text field with a single checkbox.
     $field_storage = FieldStorageConfig::load('node.field_test_text_single_checkbox');
-    $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', ['@fieldtype' => $field_storage->getType()]));
 
     // Validate that the source count and processed count match up.
     /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
index a16040fe9..2a9dd1bae 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
@@ -30,16 +30,17 @@ class MigrateFieldWidgetSettingsTest extends MigrateDrupal6TestBase {
 
     // Text field.
     $component = $form_display->getComponent('field_test');
-    $expected = array('weight' => 1, 'type' => 'text_textfield');
-    $expected['settings'] = array('size' => 60, 'placeholder' => '');
-    $expected['third_party_settings'] = array();
+    $expected = ['weight' => 1, 'type' => 'text_textfield'];
+    $expected['settings'] = ['size' => 60, 'placeholder' => ''];
+    $expected['third_party_settings'] = [];
+    $expected['region'] = 'content';
     $this->assertIdentical($expected, $component, 'Text field settings are correct.');
 
     // Integer field.
     $component = $form_display->getComponent('field_test_two');
     $expected['type'] = 'number';
     $expected['weight'] = 1;
-    $expected['settings'] = array('placeholder' => '');
+    $expected['settings'] = ['placeholder' => ''];
     $this->assertIdentical($expected, $component);
 
     // Float field.
@@ -51,7 +52,7 @@ class MigrateFieldWidgetSettingsTest extends MigrateDrupal6TestBase {
     $component = $form_display->getComponent('field_test_email');
     $expected['type'] = 'email_default';
     $expected['weight'] = 6;
-    $expected['settings'] = array('placeholder' => '', 'size' => 60);
+    $expected['settings'] = ['placeholder' => '', 'size' => 60];
     $this->assertIdentical($expected, $component);
 
     // Link field.
@@ -64,28 +65,28 @@ class MigrateFieldWidgetSettingsTest extends MigrateDrupal6TestBase {
     $component = $form_display->getComponent('field_test_filefield');
     $expected['type'] = 'file_generic';
     $expected['weight'] = 8;
-    $expected['settings'] = array('progress_indicator' => 'bar');
+    $expected['settings'] = ['progress_indicator' => 'bar'];
     $this->assertIdentical($expected, $component);
 
     // Image field.
     $component = $form_display->getComponent('field_test_imagefield');
     $expected['type'] = 'image_image';
     $expected['weight'] = 9;
-    $expected['settings'] = array('progress_indicator' => 'bar', 'preview_image_style' => 'thumbnail');
+    $expected['settings'] = ['progress_indicator' => 'bar', 'preview_image_style' => 'thumbnail'];
     $this->assertIdentical($expected, $component);
 
     // Phone field.
     $component = $form_display->getComponent('field_test_phone');
     $expected['type'] = 'telephone_default';
     $expected['weight'] = 13;
-    $expected['settings'] = array('placeholder' => '');
+    $expected['settings'] = ['placeholder' => ''];
     $this->assertIdentical($expected, $component);
 
     // Date fields.
     $component = $form_display->getComponent('field_test_date');
     $expected['type'] = 'datetime_default';
     $expected['weight'] = 10;
-    $expected['settings'] = array();
+    $expected['settings'] = [];
     $this->assertIdentical($expected, $component);
 
     $component = $form_display->getComponent('field_test_datestamp');
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
index 14f37cb41..dd38569de 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
@@ -96,40 +96,40 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
     // an "unsupported operand types" fatal).
     Database::getConnection('default', 'migrate')
       ->update('field_config_instance')
-      ->fields(array(
-        'data' => serialize(array (
+      ->fields([
+        'data' => serialize( [
           'label' => 'Body',
           'widget' =>
-            array (
+             [
               'type' => 'text_textarea_with_summary',
               'settings' =>
-                array (
+                 [
                   'rows' => 20,
                   'summary_rows' => 5,
-                ),
+                ],
               'weight' => -4,
               'module' => 'text',
-            ),
+            ],
           'settings' =>
-            array (
+             [
               'display_summary' => TRUE,
               'text_processing' => 1,
               'user_register_form' => FALSE,
-            ),
+            ],
           'display' =>
-            array (
+             [
               'default' =>
-                array (
+                 [
                   'label' => 'hidden',
                   'type' => 'text_default',
                   'settings' =>
-                    array (
-                    ),
+                     [
+                    ],
                   'module' => 'text',
                   'weight' => 0,
-                ),
+                ],
               'teaser' =>
-                array (
+                 [
                   'label' => 'hidden',
                   'type' => 'text_summary_or_trimmed',
                   // settings is always expected to be an array. Making it NULL
@@ -137,12 +137,12 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
                   'settings' => NULL,
                   'module' => 'text',
                   'weight' => 0,
-                ),
-            ),
+                ],
+            ],
           'required' => FALSE,
           'description' => '',
-        )),
-      ))
+        ]),
+      ])
       ->condition('entity_type', 'node')
       ->condition('bundle', 'article')
       ->condition('field_name', 'body')
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
index 7c2115fbe..1e3df9e4f 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
@@ -21,7 +21,7 @@ class MigrateFieldInstanceTest extends MigrateDrupal7TestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'comment',
     'datetime',
     'file',
@@ -32,7 +32,7 @@ class MigrateFieldInstanceTest extends MigrateDrupal7TestBase {
     'taxonomy',
     'telephone',
     'text',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -57,16 +57,16 @@ class MigrateFieldInstanceTest extends MigrateDrupal7TestBase {
    *   The node type ID.
    */
   protected function createType($id) {
-    NodeType::create(array(
+    NodeType::create([
       'type' => $id,
       'label' => $this->randomString(),
-    ))->save();
+    ])->save();
 
-    CommentType::create(array(
+    CommentType::create([
       'id' => 'comment_node_' . $id,
       'label' => $this->randomString(),
       'target_entity_type_id' => 'node',
-    ))->save();
+    ])->save();
   }
 
   /**
@@ -80,8 +80,10 @@ class MigrateFieldInstanceTest extends MigrateDrupal7TestBase {
    *   The expected field type.
    * @param bool $is_required
    *   Whether or not the field is required.
+   * @param bool $expected_translatable
+   *   Whether or not the field is expected to be translatable.
    */
-  protected function assertEntity($id, $expected_label, $expected_field_type, $is_required) {
+  protected function assertEntity($id, $expected_label, $expected_field_type, $is_required, $expected_translatable) {
     list ($expected_entity_type, $expected_bundle, $expected_name) = explode('.', $id);
 
     /** @var \Drupal\field\FieldConfigInterface $field */
@@ -94,6 +96,7 @@ class MigrateFieldInstanceTest extends MigrateDrupal7TestBase {
     $this->assertIdentical($expected_name, $field->getName());
     $this->assertEqual($is_required, $field->isRequired());
     $this->assertIdentical($expected_entity_type . '.' . $expected_name, $field->getFieldStorageDefinition()->id());
+    $this->assertSame($expected_translatable, $field->isTranslatable());
   }
 
   /**
@@ -113,40 +116,38 @@ class MigrateFieldInstanceTest extends MigrateDrupal7TestBase {
    * Tests migrating D7 field instances to field_config entities.
    */
   public function testFieldInstances() {
-    $this->assertEntity('comment.comment_node_page.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.page.body', 'Body', 'text_with_summary', FALSE);
-    $this->assertEntity('comment.comment_node_article.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.article.body', 'Body', 'text_with_summary', FALSE);
-    $this->assertEntity('node.article.field_tags', 'Tags', 'entity_reference', FALSE);
-    $this->assertEntity('node.article.field_image', 'Image', 'image', FALSE);
-    $this->assertEntity('comment.comment_node_blog.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.blog.body', 'Body', 'text_with_summary', FALSE);
-    $this->assertEntity('comment.comment_node_book.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.book.body', 'Body', 'text_with_summary', FALSE);
-    $this->assertEntity('node.forum.taxonomy_forums', 'Forums', 'entity_reference', TRUE);
-    $this->assertEntity('comment.comment_node_forum.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.forum.body', 'Body', 'text_with_summary', FALSE);
-    $this->assertEntity('comment.comment_node_test_content_type.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.test_content_type.field_boolean', 'Boolean', 'boolean', FALSE);
-    $this->assertEntity('node.test_content_type.field_email', 'Email', 'email', FALSE);
-    $this->assertEntity('node.test_content_type.field_phone', 'Phone', 'telephone', TRUE);
-    $this->assertEntity('node.test_content_type.field_date', 'Date', 'datetime', FALSE);
-    $this->assertEntity('node.test_content_type.field_date_with_end_time', 'Date With End Time', 'datetime', FALSE);
-    $this->assertEntity('node.test_content_type.field_file', 'File', 'file', FALSE);
-    $this->assertEntity('node.test_content_type.field_float', 'Float', 'float', FALSE);
-    $this->assertEntity('node.test_content_type.field_images', 'Images', 'image', TRUE);
-    $this->assertEntity('node.test_content_type.field_integer', 'Integer', 'integer', TRUE);
-    $this->assertEntity('node.test_content_type.field_link', 'Link', 'link', FALSE);
-    $this->assertEntity('node.test_content_type.field_text_list', 'Text List', 'list_string', FALSE);
-    $this->assertEntity('node.test_content_type.field_integer_list', 'Integer List', 'list_integer', FALSE);
-    $this->assertEntity('node.test_content_type.field_long_text', 'Long text', 'text_with_summary', FALSE);
-    $this->assertEntity('node.test_content_type.field_term_reference', 'Term Reference', 'entity_reference', FALSE);
-    $this->assertEntity('node.test_content_type.field_node_entityreference', 'Node Entity Reference', 'entity_reference', FALSE);
-    $this->assertEntity('node.test_content_type.field_user_entityreference', 'User Entity Reference', 'entity_reference', FALSE);
-    $this->assertEntity('node.test_content_type.field_term_entityreference', 'Term Entity Reference', 'entity_reference', FALSE);
-    $this->assertEntity('node.test_content_type.field_text', 'Text', 'text', FALSE);
-    $this->assertEntity('comment.comment_node_test_content_type.field_integer', 'Integer', 'integer', FALSE);
-    $this->assertEntity('user.user.field_file', 'File', 'file', FALSE);
+    $this->assertEntity('comment.comment_node_page.comment_body', 'Comment', 'text_long', TRUE, FALSE);
+    $this->assertEntity('node.page.body', 'Body', 'text_with_summary', FALSE, FALSE);
+    $this->assertEntity('comment.comment_node_article.comment_body', 'Comment', 'text_long', TRUE, FALSE);
+    $this->assertEntity('node.article.body', 'Body', 'text_with_summary', FALSE, TRUE);
+    $this->assertEntity('node.article.field_tags', 'Tags', 'entity_reference', FALSE, TRUE);
+    $this->assertEntity('node.article.field_image', 'Image', 'image', FALSE, TRUE);
+    $this->assertEntity('comment.comment_node_blog.comment_body', 'Comment', 'text_long', TRUE, FALSE);
+    $this->assertEntity('node.blog.body', 'Body', 'text_with_summary', FALSE, TRUE);
+    $this->assertEntity('comment.comment_node_book.comment_body', 'Comment', 'text_long', TRUE, FALSE);
+    $this->assertEntity('node.book.body', 'Body', 'text_with_summary', FALSE, FALSE);
+    $this->assertEntity('node.forum.taxonomy_forums', 'Forums', 'entity_reference', TRUE, FALSE);
+    $this->assertEntity('comment.comment_node_forum.comment_body', 'Comment', 'text_long', TRUE, FALSE);
+    $this->assertEntity('node.forum.body', 'Body', 'text_with_summary', FALSE, FALSE);
+    $this->assertEntity('comment.comment_node_test_content_type.comment_body', 'Comment', 'text_long', TRUE, FALSE);
+    $this->assertEntity('node.test_content_type.field_boolean', 'Boolean', 'boolean', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_email', 'Email', 'email', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_phone', 'Phone', 'telephone', TRUE, FALSE);
+    $this->assertEntity('node.test_content_type.field_date', 'Date', 'datetime', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_date_with_end_time', 'Date With End Time', 'datetime', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_file', 'File', 'file', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_float', 'Float', 'float', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_images', 'Images', 'image', TRUE, FALSE);
+    $this->assertEntity('node.test_content_type.field_integer', 'Integer', 'integer', TRUE, FALSE);
+    $this->assertEntity('node.test_content_type.field_link', 'Link', 'link', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_text_list', 'Text List', 'list_string', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_integer_list', 'Integer List', 'list_integer', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_long_text', 'Long text', 'text_with_summary', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_term_reference', 'Term Reference', 'entity_reference', FALSE, FALSE);
+    $this->assertEntity('node.test_content_type.field_text', 'Text', 'text', FALSE, FALSE);
+    $this->assertEntity('comment.comment_node_test_content_type.field_integer', 'Integer', 'integer', FALSE, FALSE);
+    $this->assertEntity('user.user.field_file', 'File', 'file', FALSE, FALSE);
+
 
     $this->assertLinkFields('node.test_content_type.field_link', DRUPAL_OPTIONAL);
     $this->assertLinkFields('node.article.field_link', DRUPAL_DISABLED);
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
index 7f2e0244f..5a47e38ef 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
@@ -18,7 +18,7 @@ class MigrateFieldInstanceWidgetSettingsTest extends MigrateDrupal7TestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'comment',
     'datetime',
     'field',
@@ -29,7 +29,7 @@ class MigrateFieldInstanceWidgetSettingsTest extends MigrateDrupal7TestBase {
     'taxonomy',
     'telephone',
     'text',
-  );
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldTest.php
index fb275c67c..ab2fe8e12 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldTest.php
@@ -18,7 +18,7 @@ class MigrateFieldTest extends MigrateDrupal7TestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'comment',
     'datetime',
     'file',
@@ -29,7 +29,7 @@ class MigrateFieldTest extends MigrateDrupal7TestBase {
     'taxonomy',
     'telephone',
     'text',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -60,8 +60,6 @@ class MigrateFieldTest extends MigrateDrupal7TestBase {
     $this->assertTrue($field instanceof FieldStorageConfigInterface);
     $this->assertIdentical($expected_name, $field->getName());
     $this->assertIdentical($expected_type, $field->getType());
-    // FieldStorageConfig::$translatable is TRUE by default, so it is useful
-    // to test for FALSE here.
     $this->assertEqual($expected_translatable, $field->isTranslatable());
     $this->assertIdentical($expected_entity_type, $field->getTargetEntityTypeId());
 
@@ -78,31 +76,31 @@ class MigrateFieldTest extends MigrateDrupal7TestBase {
    * Tests migrating D7 fields to field_storage_config entities.
    */
   public function testFields() {
-    $this->assertEntity('node.body', 'text_with_summary', FALSE, 1);
-    $this->assertEntity('node.field_long_text', 'text_with_summary', FALSE, 1);
-    $this->assertEntity('comment.comment_body', 'text_long', FALSE, 1);
-    $this->assertEntity('node.field_file', 'file', FALSE, 1);
-    $this->assertEntity('user.field_file', 'file', FALSE, 1);
-    $this->assertEntity('node.field_float', 'float', FALSE, 1);
-    $this->assertEntity('node.field_image', 'image', FALSE, 1);
-    $this->assertEntity('node.field_images', 'image', FALSE, 1);
-    $this->assertEntity('node.field_integer', 'integer', FALSE, 1);
-    $this->assertEntity('comment.field_integer', 'integer', FALSE, 1);
-    $this->assertEntity('node.field_integer_list', 'list_integer', FALSE, 1);
-    $this->assertEntity('node.field_link', 'link', FALSE, 1);
-    $this->assertEntity('node.field_tags', 'entity_reference', FALSE, -1);
-    $this->assertEntity('node.field_term_reference', 'entity_reference', FALSE, 1);
-    $this->assertEntity('node.taxonomy_forums', 'entity_reference', FALSE, 1);
-    $this->assertEntity('node.field_text', 'text', FALSE, 1);
-    $this->assertEntity('node.field_text_list', 'list_string', FALSE, 3);
-    $this->assertEntity('node.field_boolean', 'boolean', FALSE, 1);
-    $this->assertEntity('node.field_email', 'email', FALSE, -1);
-    $this->assertEntity('node.field_phone', 'telephone', FALSE, 1);
-    $this->assertEntity('node.field_date', 'datetime', FALSE, 1);
-    $this->assertEntity('node.field_date_with_end_time', 'datetime', FALSE, 1);
-    $this->assertEntity('node.field_node_entityreference', 'entity_reference', FALSE, -1);
-    $this->assertEntity('node.field_user_entityreference', 'entity_reference', FALSE, 1);
-    $this->assertEntity('node.field_term_entityreference', 'entity_reference', FALSE, -1);
+    $this->assertEntity('node.body', 'text_with_summary', TRUE, 1);
+    $this->assertEntity('node.field_long_text', 'text_with_summary', TRUE, 1);
+    $this->assertEntity('comment.comment_body', 'text_long', TRUE, 1);
+    $this->assertEntity('node.field_file', 'file', TRUE, 1);
+    $this->assertEntity('user.field_file', 'file', TRUE, 1);
+    $this->assertEntity('node.field_float', 'float', TRUE, 1);
+    $this->assertEntity('node.field_image', 'image', TRUE, 1);
+    $this->assertEntity('node.field_images', 'image', TRUE, 1);
+    $this->assertEntity('node.field_integer', 'integer', TRUE, 1);
+    $this->assertEntity('comment.field_integer', 'integer', TRUE, 1);
+    $this->assertEntity('node.field_integer_list', 'list_integer', TRUE, 1);
+    $this->assertEntity('node.field_link', 'link', TRUE, 1);
+    $this->assertEntity('node.field_tags', 'entity_reference', TRUE, -1);
+    $this->assertEntity('node.field_term_reference', 'entity_reference', TRUE, 1);
+    $this->assertEntity('node.taxonomy_forums', 'entity_reference', TRUE, 1);
+    $this->assertEntity('node.field_text', 'text', TRUE, 1);
+    $this->assertEntity('node.field_text_list', 'list_string', TRUE, 3);
+    $this->assertEntity('node.field_boolean', 'boolean', TRUE, 1);
+    $this->assertEntity('node.field_email', 'email', TRUE, -1);
+    $this->assertEntity('node.field_phone', 'telephone', TRUE, 1);
+    $this->assertEntity('node.field_date', 'datetime', TRUE, 1);
+    $this->assertEntity('node.field_date_with_end_time', 'datetime', TRUE, 1);
+    $this->assertEntity('node.field_node_entityreference', 'entity_reference', TRUE, -1);
+    $this->assertEntity('node.field_user_entityreference', 'entity_reference', TRUE, 1);
+    $this->assertEntity('node.field_term_entityreference', 'entity_reference', TRUE, -1);
 
     // Assert that the taxonomy term reference fields are referencing the
     // correct entity type.
@@ -123,7 +121,8 @@ class MigrateFieldTest extends MigrateDrupal7TestBase {
     // Validate that the source count and processed count match up.
     /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
     $migration = $this->getMigration('d7_field');
-    $this->assertIdentical($migration->getSourcePlugin()->count(), $migration->getIdMap()->processedCount());
+    $this->assertSame($migration->getSourcePlugin()
+      ->count(), $migration->getIdMap()->processedCount());
   }
 
 }
diff --git a/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php b/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
index 25b99bbe7..578eeda9c 100644
--- a/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
@@ -21,18 +21,18 @@ class NumberItemTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array();
+  public static $modules = [];
 
   protected function setUp() {
     parent::setUp();
 
     // Create number field storages and fields for validation.
-    foreach (array('integer', 'float', 'decimal') as $type) {
-      FieldStorageConfig::create(array(
+    foreach (['integer', 'float', 'decimal'] as $type) {
+      FieldStorageConfig::create([
         'entity_type' => 'entity_test',
         'field_name' => 'field_' . $type,
         'type' => $type,
-      ))->save();
+      ])->save();
       FieldConfig::create([
         'entity_type' => 'entity_test',
         'field_name' => 'field_' . $type,
diff --git a/web/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php b/web/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php
index a0b8ec1db..c9e93efd2 100644
--- a/web/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldInstanceTest.php
@@ -94,6 +94,7 @@ class FieldInstanceTest extends MigrateSqlSourceTestBase {
         ],
         'description' => '',
         'required' => FALSE,
+        'field_data' => 'a:6:{s:12:"entity_types";a:1:{i:0;s:4:"node";}s:12:"translatable";b:0;s:8:"settings";a:0:{}s:7:"storage";a:4:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";i:1;}s:12:"foreign keys";a:1:{s:6:"format";a:2:{s:5:"table";s:13:"filter_format";s:7:"columns";a:1:{s:6:"format";s:6:"format";}}}s:7:"indexes";a:1:{s:6:"format";a:1:{i:0;s:6:"format";}}}',
       ],
     ];
 
diff --git a/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php b/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php
index 644a15f14..80ab04f3a 100644
--- a/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php
@@ -20,7 +20,7 @@ class ShapeItemTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_test');
+  public static $modules = ['field_test'];
 
   /**
    * The name of the field to use in this test.
@@ -33,11 +33,11 @@ class ShapeItemTest extends FieldKernelTestBase {
     parent::setUp();
 
     // Create a 'shape' field and storage for validation.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'entity_test',
       'type' => 'shape',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => $this->fieldName,
diff --git a/web/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php b/web/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php
index 02d72d047..1000d6407 100644
--- a/web/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php
+++ b/web/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php
@@ -23,7 +23,7 @@ class RawStringFormatterTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field', 'text', 'entity_test', 'system', 'filter', 'user');
+  public static $modules = ['field', 'text', 'entity_test', 'system', 'filter', 'user'];
 
   /**
    * @var string
@@ -52,7 +52,7 @@ class RawStringFormatterTest extends KernelTestBase {
     parent::setUp();
 
     // Configure the theme system.
-    $this->installConfig(array('system', 'field'));
+    $this->installConfig(['system', 'field']);
     \Drupal::service('router.builder')->rebuild();
     $this->installEntitySchema('entity_test');
 
@@ -60,25 +60,25 @@ class RawStringFormatterTest extends KernelTestBase {
     $this->bundle = $this->entityType;
     $this->fieldName = Unicode::strtolower($this->randomMachineName());
 
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => $this->entityType,
       'type' => 'string_long',
-    ));
+    ]);
     $field_storage->save();
 
-    $instance = FieldConfig::create(array(
+    $instance = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => $this->bundle,
       'label' => $this->randomMachineName(),
-    ));
+    ]);
     $instance->save();
 
     $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'string',
-        'settings' => array(),
-      ));
+        'settings' => [],
+      ]);
     $this->display->save();
   }
 
@@ -107,7 +107,7 @@ class RawStringFormatterTest extends KernelTestBase {
     $value .= "\n\n<strong>" . $this->randomString() . '</strong>';
     $value .= "\n\n" . $this->randomString();
 
-    $entity = EntityTest::create(array());
+    $entity = EntityTest::create([]);
     $entity->{$this->fieldName}->value = $value;
 
     // Verify that all HTML is escaped and newlines are retained.
diff --git a/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php b/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
index b52a92fd2..b09eb58c0 100644
--- a/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
+++ b/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
@@ -23,7 +23,7 @@ class StringFormatterTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field', 'text', 'entity_test', 'system', 'filter', 'user');
+  public static $modules = ['field', 'text', 'entity_test', 'system', 'filter', 'user'];
 
   /**
    * @var string
@@ -52,7 +52,7 @@ class StringFormatterTest extends KernelTestBase {
     parent::setUp();
 
     // Configure the theme system.
-    $this->installConfig(array('system', 'field'));
+    $this->installConfig(['system', 'field']);
     \Drupal::service('router.builder')->rebuild();
     $this->installEntitySchema('entity_test_rev');
 
@@ -60,25 +60,25 @@ class StringFormatterTest extends KernelTestBase {
     $this->bundle = $this->entityType;
     $this->fieldName = Unicode::strtolower($this->randomMachineName());
 
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => $this->entityType,
       'type' => 'string',
-    ));
+    ]);
     $field_storage->save();
 
-    $instance = FieldConfig::create(array(
+    $instance = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => $this->bundle,
       'label' => $this->randomMachineName(),
-    ));
+    ]);
     $instance->save();
 
     $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'string',
-        'settings' => array(),
-      ));
+        'settings' => [],
+      ]);
     $this->display->save();
   }
 
@@ -107,7 +107,7 @@ class StringFormatterTest extends KernelTestBase {
     $value .= "\n\n<strong>" . $this->randomString() . '</strong>';
     $value .= "\n\n" . $this->randomString();
 
-    $entity = EntityTestRev::create(array());
+    $entity = EntityTestRev::create([]);
     $entity->{$this->fieldName}->value = $value;
 
     // Verify that all HTML is escaped and newlines are retained.
diff --git a/web/core/modules/field/tests/src/Kernel/TestItemTest.php b/web/core/modules/field/tests/src/Kernel/TestItemTest.php
index 6766b4099..73a99486b 100644
--- a/web/core/modules/field/tests/src/Kernel/TestItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/TestItemTest.php
@@ -21,7 +21,7 @@ class TestItemTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_test');
+  public static $modules = ['field_test'];
 
   /**
    * The name of the field to use in this test.
@@ -34,11 +34,11 @@ class TestItemTest extends FieldKernelTestBase {
     parent::setUp();
 
     // Create a 'test_field' field and storage for validation.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'entity_test',
       'type' => 'test_field',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => $this->fieldName,
@@ -76,19 +76,19 @@ class TestItemTest extends FieldKernelTestBase {
     $this->assertEqual($entity->{$this->fieldName}->value, $new_value);
 
     // Test the schema for this field type.
-    $expected_schema = array(
-      'columns' => array(
-        'value' => array(
+    $expected_schema = [
+      'columns' => [
+        'value' => [
           'type' => 'int',
           'size' => 'medium',
-        ),
-      ),
-      'unique keys' => array(),
-      'indexes' => array(
-        'value' => array('value'),
-      ),
-      'foreign keys' => array(),
-    );
+        ],
+      ],
+      'unique keys' => [],
+      'indexes' => [
+        'value' => ['value'],
+      ],
+      'foreign keys' => [],
+    ];
     $field_schema = BaseFieldDefinition::create('test_field')->getSchema();
     $this->assertEqual($field_schema, $expected_schema);
   }
diff --git a/web/core/modules/field/tests/src/Kernel/TestItemWithDependenciesTest.php b/web/core/modules/field/tests/src/Kernel/TestItemWithDependenciesTest.php
index 9766a067f..d1a269a6a 100644
--- a/web/core/modules/field/tests/src/Kernel/TestItemWithDependenciesTest.php
+++ b/web/core/modules/field/tests/src/Kernel/TestItemWithDependenciesTest.php
@@ -17,7 +17,7 @@ class TestItemWithDependenciesTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_test');
+  public static $modules = ['field_test'];
 
   /**
    * The name of the field to use in this test.
@@ -31,11 +31,11 @@ class TestItemWithDependenciesTest extends FieldKernelTestBase {
    */
   public function testTestItemWithDepenencies() {
     // Create a 'test_field_with_dependencies' field and storage for validation.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'entity_test',
       'type' => 'test_field_with_dependencies',
-    ))->save();
+    ])->save();
     $field = FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => $this->fieldName,
diff --git a/web/core/modules/field/tests/src/Kernel/TestObjectItemTest.php b/web/core/modules/field/tests/src/Kernel/TestObjectItemTest.php
index 8a7875581..1ac87fc3b 100644
--- a/web/core/modules/field/tests/src/Kernel/TestObjectItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/TestObjectItemTest.php
@@ -18,7 +18,7 @@ class TestObjectItemTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_test');
+  public static $modules = ['field_test'];
 
   /**
    * {@inheritdoc}
@@ -27,11 +27,11 @@ class TestObjectItemTest extends FieldKernelTestBase {
     parent::setUp();
 
     // Create a 'test_field' field and storage for validation.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_test',
       'entity_type' => 'entity_test',
       'type' => 'test_object_field',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_test',
diff --git a/web/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php b/web/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
index ee97cabbf..f71be314a 100644
--- a/web/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
@@ -140,7 +140,7 @@ class TimestampFormatterTest extends KernelTestBase {
   public function testTimestampAgoFormatter() {
     $data = [];
 
-    foreach (array(1, 2, 3, 4, 5, 6) as $granularity) {
+    foreach ([1, 2, 3, 4, 5, 6] as $granularity) {
       $data[] = [
         'future_format' => '@interval hence',
         'past_format' => '@interval ago',
diff --git a/web/core/modules/field/tests/src/Kernel/TranslationTest.php b/web/core/modules/field/tests/src/Kernel/TranslationTest.php
index 78172a382..124fd94da 100644
--- a/web/core/modules/field/tests/src/Kernel/TranslationTest.php
+++ b/web/core/modules/field/tests/src/Kernel/TranslationTest.php
@@ -23,7 +23,7 @@ class TranslationTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'node');
+  public static $modules = ['language', 'node'];
 
   /**
    * The name of the field to use in this test.
@@ -73,40 +73,40 @@ class TranslationTest extends FieldKernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installConfig(array('language'));
+    $this->installConfig(['language']);
 
     $this->fieldName = Unicode::strtolower($this->randomMachineName());
 
     $this->entityType = 'entity_test';
 
-    $this->fieldStorageDefinition = array(
+    $this->fieldStorageDefinition = [
       'field_name' => $this->fieldName,
       'entity_type' => $this->entityType,
       'type' => 'test_field',
       'cardinality' => 4,
-    );
+    ];
     $this->fieldStorage = FieldStorageConfig::create($this->fieldStorageDefinition);
     $this->fieldStorage->save();
 
-    $this->fieldDefinition = array(
+    $this->fieldDefinition = [
       'field_storage' => $this->fieldStorage,
       'bundle' => 'entity_test',
-    );
+    ];
     $this->field = FieldConfig::create($this->fieldDefinition);
     $this->field->save();
 
     for ($i = 0; $i < 3; ++$i) {
-      ConfigurableLanguage::create(array(
+      ConfigurableLanguage::create([
         'id' => 'l' . $i,
         'label' => $this->randomString(),
-      ))->save();
+      ])->save();
     }
   }
 
   /**
    * Test translatable fields storage/retrieval.
    */
-  function testTranslatableFieldSaveLoad() {
+  public function testTranslatableFieldSaveLoad() {
     // Enable field translations for nodes.
     field_test_entity_info_translatable('node', TRUE);
     $entity_type = \Drupal::entityManager()->getDefinition('node');
@@ -117,8 +117,8 @@ class TranslationTest extends FieldKernelTestBase {
     field_test_entity_info_translatable($entity_type_id, TRUE);
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type_id)
-      ->create(array('type' => $this->field->getTargetBundle()));
-    $field_translations = array();
+      ->create(['type' => $this->field->getTargetBundle()]);
+    $field_translations = [];
     $available_langcodes = array_keys($this->container->get('language_manager')->getLanguages());
     $entity->langcode->value = reset($available_langcodes);
     foreach ($available_langcodes as $langcode) {
@@ -136,7 +136,7 @@ class TranslationTest extends FieldKernelTestBase {
       foreach ($items as $delta => $item) {
         $result = $result && $item['value'] == $entity->getTranslation($langcode)->{$this->fieldName}[$delta]->value;
       }
-      $this->assertTrue($result, format_string('%language translation correctly handled.', array('%language' => $langcode)));
+      $this->assertTrue($result, format_string('%language translation correctly handled.', ['%language' => $langcode]));
     }
 
     // Test default values.
@@ -148,7 +148,7 @@ class TranslationTest extends FieldKernelTestBase {
 
     $field_definition = $this->fieldDefinition;
     $field_definition['field_storage'] = $field_storage;
-    $field_definition['default_value'] = array(array('value' => rand(1, 127)));
+    $field_definition['default_value'] = [['value' => rand(1, 127)]];
     $field = FieldConfig::create($field_definition);
     $field->save();
 
@@ -156,7 +156,7 @@ class TranslationTest extends FieldKernelTestBase {
     asort($translation_langcodes);
     $translation_langcodes = array_values($translation_langcodes);
 
-    $values = array('type' => $field->getTargetBundle(), 'langcode' => $translation_langcodes[0]);
+    $values = ['type' => $field->getTargetBundle(), 'langcode' => $translation_langcodes[0]];
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type_id)
       ->create($values);
@@ -173,11 +173,11 @@ class TranslationTest extends FieldKernelTestBase {
     // @todo Test every translation once the Entity Translation API allows for
     //   multilingual defaults.
     $langcode = $entity->language()->getId();
-    $this->assertEqual($entity->getTranslation($langcode)->{$field_name_default}->getValue(), $field->getDefaultValueLiteral(), format_string('Default value correctly populated for language %language.', array('%language' => $langcode)));
+    $this->assertEqual($entity->getTranslation($langcode)->{$field_name_default}->getValue(), $field->getDefaultValueLiteral(), format_string('Default value correctly populated for language %language.', ['%language' => $langcode]));
 
     // Check that explicit empty values are not overridden with default values.
-    foreach (array(NULL, array()) as $empty_items) {
-      $values = array('type' => $field->getTargetBundle(), 'langcode' => $translation_langcodes[0]);
+    foreach ([NULL, []] as $empty_items) {
+      $values = ['type' => $field->getTargetBundle(), 'langcode' => $translation_langcodes[0]];
       $entity = entity_create($entity_type_id, $values);
       foreach ($translation_langcodes as $langcode) {
         $values[$this->fieldName][$langcode] = $this->_generateTestFieldValues($this->fieldStorage->getCardinality());
@@ -188,7 +188,7 @@ class TranslationTest extends FieldKernelTestBase {
       }
 
       foreach ($entity->getTranslationLanguages() as $langcode => $language) {
-        $this->assertEquals([], $entity->getTranslation($langcode)->{$field_name_default}->getValue(), format_string('Empty value correctly populated for language %language.', array('%language' => $langcode)));
+        $this->assertEquals([], $entity->getTranslation($langcode)->{$field_name_default}->getValue(), format_string('Empty value correctly populated for language %language.', ['%language' => $langcode]));
       }
     }
   }
diff --git a/web/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php b/web/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
index 3eff2ca24..de6f39bd2 100644
--- a/web/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
+++ b/web/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
@@ -13,7 +13,7 @@ class WidgetPluginManagerTest extends FieldKernelTestBase {
   /**
    * Tests that the widget definitions alter hook works.
    */
-  function testWidgetDefinitionAlter() {
+  public function testWidgetDefinitionAlter() {
     $widget_definition = \Drupal::service('plugin.manager.field.widget')->getDefinition('test_field_widget_multiple');
 
     // Test if hook_field_widget_info_alter is being called.
@@ -33,13 +33,13 @@ class WidgetPluginManagerTest extends FieldKernelTestBase {
       // Set a name that will make isApplicable() return TRUE.
       ->setName('field_multiwidgetfield');
 
-    $widget_options = array(
+    $widget_options = [
       'field_definition' => $base_field_definition,
       'form_mode' => 'default',
-      'configuration' => array(
+      'configuration' => [
         'type' => 'test_field_widget_multiple',
-      ),
-    );
+      ],
+    ];
 
     $instance = $widget_plugin_manager->getInstance($widget_options);
     $this->assertEqual($instance->getPluginId(), 'test_field_widget_multiple');
diff --git a/web/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php b/web/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
index 3f687d4b9..d1824cfcc 100644
--- a/web/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
+++ b/web/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
@@ -100,14 +100,14 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
       ->will($this->returnValue('field_test'));
     $this->fieldStorage->expects($this->any())
       ->method('getSettings')
-      ->willReturn(array());
+      ->willReturn([]);
     // Place the field in the mocked entity manager's field registry.
     $this->entityManager->expects($this->any())
       ->method('getFieldStorageDefinitions')
       ->with('test_entity_type')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         $this->fieldStorage->getName() => $this->fieldStorage,
-      )));
+      ]));
   }
 
   /**
@@ -118,7 +118,7 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
     $target_entity_type = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
     $target_entity_type->expects($this->any())
       ->method('getBundleConfigDependency')
-      ->will($this->returnValue(array('type' => 'config', 'name' => 'test.test_entity_type.id')));
+      ->will($this->returnValue(['type' => 'config', 'name' => 'test.test_entity_type.id']));
 
     $this->entityManager->expects($this->at(0))
       ->method('getDefinition')
@@ -146,12 +146,12 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
       ->method('getConfigDependencyName')
       ->will($this->returnValue('field.storage.test_entity_type.test_field'));
 
-    $field = new FieldConfig(array(
+    $field = new FieldConfig([
       'field_name' => $this->fieldStorage->getName(),
       'entity_type' => 'test_entity_type',
       'bundle' => 'test_bundle',
       'field_type' => 'test_field',
-    ), $this->entityTypeId);
+    ], $this->entityTypeId);
     $dependencies = $field->calculateDependencies()->getDependencies();
     $this->assertContains('field.storage.test_entity_type.test_field', $dependencies['config']);
     $this->assertContains('test.test_entity_type.id', $dependencies['config']);
@@ -160,9 +160,6 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
 
   /**
    * Test that invalid bundles are handled.
-   *
-   * @expectedException \LogicException
-   * @expectedExceptionMessage Missing bundle entity, entity type bundle_entity_type, entity id test_bundle_not_exists.
    */
   public function testCalculateDependenciesIncorrectBundle() {
     $storage = $this->getMock('\Drupal\Core\Config\Entity\ConfigEntityStorageInterface');
@@ -176,10 +173,10 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
       ->with('bundle_entity_type')
       ->will($this->returnValue($storage));
 
-    $target_entity_type = new EntityType(array(
+    $target_entity_type = new EntityType([
       'id' => 'test_entity_type',
       'bundle_entity_type' => 'bundle_entity_type',
-    ));
+    ]);
 
     $this->entityManager->expects($this->at(0))
       ->method('getDefinition')
@@ -203,12 +200,13 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
       ->with('test_field')
       ->willReturn(['provider' => 'test_module', 'config_dependencies' => ['module' => ['test_module2']], 'class' => '\Drupal\Tests\field\Unit\DependencyFieldItem']);
 
-    $field = new FieldConfig(array(
+    $field = new FieldConfig([
       'field_name' => $this->fieldStorage->getName(),
       'entity_type' => 'test_entity_type',
       'bundle' => 'test_bundle_not_exists',
       'field_type' => 'test_field',
-    ), $this->entityTypeId);
+    ], $this->entityTypeId);
+    $this->setExpectedException(\LogicException::class, 'Missing bundle entity, entity type bundle_entity_type, entity id test_bundle_not_exists.');
     $field->calculateDependencies();
   }
 
@@ -245,14 +243,14 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
    * @covers ::toArray
    */
   public function testToArray() {
-    $field = new FieldConfig(array(
+    $field = new FieldConfig([
       'field_name' => $this->fieldStorage->getName(),
       'entity_type' => 'test_entity_type',
       'bundle' => 'test_bundle',
       'field_type' => 'test_field',
-    ), $this->entityTypeId);
+    ], $this->entityTypeId);
 
-    $expected = array(
+    $expected = [
       'id' => 'test_entity_type.test_bundle.field_test',
       'uuid' => NULL,
       'status' => TRUE,
@@ -263,12 +261,12 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
       'label' => '',
       'description' => '',
       'required' => FALSE,
-      'default_value' => array(),
+      'default_value' => [],
       'default_value_callback' => '',
-      'settings' => array(),
-      'dependencies' => array(),
+      'settings' => [],
+      'dependencies' => [],
       'field_type' => 'test_field',
-    );
+    ];
     $this->entityManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
@@ -279,7 +277,7 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
       ->will($this->returnValue('id'));
     $this->typedConfigManager->expects($this->once())
       ->method('getDefinition')
-      ->will($this->returnValue(array('mapping' => array_fill_keys(array_keys($expected), ''))));
+      ->will($this->returnValue(['mapping' => array_fill_keys(array_keys($expected), '')]));
 
     $export = $field->toArray();
     $this->assertEquals($expected, $export);
@@ -296,12 +294,12 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
     $this->fieldStorage->expects($this->never())
       ->method('getType');
 
-    $field = new FieldConfig(array(
+    $field = new FieldConfig([
       'field_name' => $this->fieldStorage->getName(),
       'entity_type' => 'test_entity_type',
       'bundle' => 'test_bundle',
       'field_type' => 'test_field',
-    ), $this->entityTypeId);
+    ], $this->entityTypeId);
 
     $this->assertEquals('test_field', $field->getType());
   }
diff --git a/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php b/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
index edeef2112..df18fec0a 100644
--- a/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
+++ b/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
@@ -36,32 +36,32 @@ class FieldSettingsTest extends UnitTestCase {
    * Provides field settings for testGetSettings().
    */
   public function getSettingsProvider() {
-    return array(
-      array(
+    return [
+      [
         'list_integer',
-        array('allowed_values' => "1|One\n2|Two\n3"),
-        array(
+        ['allowed_values' => "1|One\n2|Two\n3"],
+        [
           '1' => 'One',
           '2' => 'Two',
           '3' => '3',
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'list_string',
-        array('allowed_values' => NULL),
-        array(),
-      ),
-      array(
+        ['allowed_values' => NULL],
+        [],
+      ],
+      [
         'list_float',
-        array('allowed_values' => ""),
-        array(),
-      ),
-      array(
+        ['allowed_values' => ""],
+        [],
+      ],
+      [
         'boolean',
-        array(),
-        array(),
-      ),
-    );
+        [],
+        [],
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/field_layout/config/schema/field_layout.schema.yml b/web/core/modules/field_layout/config/schema/field_layout.schema.yml
new file mode 100644
index 000000000..185fb4ef7
--- /dev/null
+++ b/web/core/modules/field_layout/config/schema/field_layout.schema.yml
@@ -0,0 +1,16 @@
+core.entity_view_display.*.*.*.third_party.field_layout:
+  type: field_layout.third_party_settings
+
+core.entity_form_display.*.*.*.third_party.field_layout:
+  type: field_layout.third_party_settings
+
+field_layout.third_party_settings:
+  type: mapping
+  label: 'Per-view-mode field layout settings'
+  mapping:
+    id:
+      type: string
+      label: 'Layout ID'
+    settings:
+      type: layout_plugin.settings.[%parent.id]
+      label: 'Layout settings'
diff --git a/web/core/modules/field_layout/field_layout.info.yml b/web/core/modules/field_layout/field_layout.info.yml
new file mode 100644
index 000000000..237f18dcd
--- /dev/null
+++ b/web/core/modules/field_layout/field_layout.info.yml
@@ -0,0 +1,8 @@
+name: 'Field Layout'
+type: module
+description: 'Adds layout capabilities to the Field UI.'
+package: Core (Experimental)
+version: VERSION
+core: 8.x
+dependencies:
+  - layout_discovery
diff --git a/web/core/modules/field_layout/field_layout.install b/web/core/modules/field_layout/field_layout.install
new file mode 100644
index 000000000..5956bf109
--- /dev/null
+++ b/web/core/modules/field_layout/field_layout.install
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains install and update functions for Field Layout.
+ */
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\field_layout\Display\EntityDisplayWithLayoutInterface;
+
+/**
+ * Implements hook_install().
+ */
+function field_layout_install() {
+  // Ensure each entity display has a layout.
+  $entity_save = function (EntityDisplayWithLayoutInterface $entity) {
+    $entity->ensureLayout()->save();
+  };
+  array_map($entity_save, EntityViewDisplay::loadMultiple());
+  array_map($entity_save, EntityFormDisplay::loadMultiple());
+
+  // Invalidate the render cache since all content will now have a layout.
+  Cache::invalidateTags(['rendered']);
+}
+
+/**
+ * Implements hook_uninstall().
+ */
+function field_layout_uninstall() {
+  // Reset each entity display to use the one-column layout to best approximate
+  // the absence of layouts.
+  $entity_save = function (EntityDisplayWithLayoutInterface $entity) {
+    $entity->setLayoutId('layout_onecol')->save();
+  };
+  array_map($entity_save, EntityViewDisplay::loadMultiple());
+  array_map($entity_save, EntityFormDisplay::loadMultiple());
+
+  // Invalidate the render cache since all content will no longer have a layout.
+  Cache::invalidateTags(['rendered']);
+}
diff --git a/web/core/modules/field_layout/field_layout.module b/web/core/modules/field_layout/field_layout.module
new file mode 100644
index 000000000..5a5fa11a4
--- /dev/null
+++ b/web/core/modules/field_layout/field_layout.module
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * @file
+ * Provides hook implementations for Field Layout.
+ */
+
+use Drupal\Core\Entity\ContentEntityFormInterface;
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\field_layout\Display\EntityDisplayWithLayoutInterface;
+use Drupal\field_layout\Entity\FieldLayoutEntityFormDisplay;
+use Drupal\field_layout\Entity\FieldLayoutEntityViewDisplay;
+use Drupal\field_layout\FieldLayoutBuilder;
+use Drupal\field_layout\Form\FieldLayoutEntityFormDisplayEditForm;
+use Drupal\field_layout\Form\FieldLayoutEntityViewDisplayEditForm;
+
+/**
+ * Implements hook_help().
+ */
+function field_layout_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    case 'help.page.field_layout':
+      $output = '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('The Field Layout module allows you to arrange fields into regions on forms and displays of entities such as nodes and users.') . '</p>';
+      $output .= '<p>' . t('For more information, see the <a href=":field-layout-documentation">online documentation for the Field Layout module</a>.', [':field-layout-documentation' => 'https://www.drupal.org/documentation/modules/field_layout']) . '</p>';
+      return $output;
+  }
+}
+
+/**
+ * Implements hook_entity_type_alter().
+ */
+function field_layout_entity_type_alter(array &$entity_types) {
+  /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
+  $entity_types['entity_view_display']->setClass(FieldLayoutEntityViewDisplay::class);
+  $entity_types['entity_form_display']->setClass(FieldLayoutEntityFormDisplay::class);
+
+  // The form classes are only needed when Field UI is installed.
+  if (\Drupal::moduleHandler()->moduleExists('field_ui')) {
+    $entity_types['entity_view_display']->setFormClass('edit', FieldLayoutEntityViewDisplayEditForm::class);
+    $entity_types['entity_form_display']->setFormClass('edit', FieldLayoutEntityFormDisplayEditForm::class);
+  }
+}
+
+/**
+ * Implements hook_entity_view_alter().
+ */
+function field_layout_entity_view_alter(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display) {
+  if ($display instanceof EntityDisplayWithLayoutInterface) {
+    \Drupal::classResolver()->getInstanceFromDefinition(FieldLayoutBuilder::class)
+      ->buildView($build, $display);
+  }
+}
+
+/**
+ * Implements hook_form_alter().
+ */
+function field_layout_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+  $form_object = $form_state->getFormObject();
+  if ($form_object instanceof ContentEntityFormInterface && $display = $form_object->getFormDisplay($form_state)) {
+    if ($display instanceof EntityDisplayWithLayoutInterface) {
+      \Drupal::classResolver()->getInstanceFromDefinition(FieldLayoutBuilder::class)
+        ->buildForm($form, $display);
+    }
+  }
+}
diff --git a/web/core/modules/field_layout/src/Display/EntityDisplayWithLayoutInterface.php b/web/core/modules/field_layout/src/Display/EntityDisplayWithLayoutInterface.php
new file mode 100644
index 000000000..3bee65ec2
--- /dev/null
+++ b/web/core/modules/field_layout/src/Display/EntityDisplayWithLayoutInterface.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Drupal\field_layout\Display;
+
+use Drupal\Core\Entity\Display\EntityDisplayInterface;
+use Drupal\Core\Layout\LayoutInterface;
+
+/**
+ * Provides a common interface for entity displays that have layout.
+ */
+interface EntityDisplayWithLayoutInterface extends EntityDisplayInterface {
+
+  /**
+   * Gets the default region.
+   *
+   * @return string
+   *   The default region for this display.
+   */
+  public function getDefaultRegion();
+
+  /**
+   * Gets the layout plugin ID for this display.
+   *
+   * @return string
+   *   The layout plugin ID.
+   */
+  public function getLayoutId();
+
+  /**
+   * Gets the layout plugin settings for this display.
+   *
+   * @return mixed[]
+   *   The layout plugin settings.
+   */
+  public function getLayoutSettings();
+
+  /**
+   * Sets the layout plugin ID for this display.
+   *
+   * @param string|null $layout_id
+   *   Either a valid layout plugin ID, or NULL to remove the layout setting.
+   * @param array $layout_settings
+   *   (optional) An array of settings for this layout.
+   *
+   * @return $this
+   */
+  public function setLayoutId($layout_id, array $layout_settings = []);
+
+  /**
+   * Sets the layout plugin for this display.
+   *
+   * @param \Drupal\Core\Layout\LayoutInterface $layout
+   *   A layout plugin.
+   *
+   * @return $this
+   */
+  public function setLayout(LayoutInterface $layout);
+
+  /**
+   * Gets the layout plugin for this display.
+   *
+   * @return \Drupal\Core\Layout\LayoutInterface
+   *   The layout plugin.
+   */
+  public function getLayout();
+
+  /**
+   * Ensures this entity has a layout.
+   *
+   * @param string $default_layout_id
+   *   (optional) The layout ID to use as a default. Defaults to
+   *   'layout_onecol'.
+   *
+   * @return $this
+   */
+  public function ensureLayout($default_layout_id = 'layout_onecol');
+
+}
diff --git a/web/core/modules/field_layout/src/Entity/FieldLayoutEntityDisplayTrait.php b/web/core/modules/field_layout/src/Entity/FieldLayoutEntityDisplayTrait.php
new file mode 100644
index 000000000..59377bef0
--- /dev/null
+++ b/web/core/modules/field_layout/src/Entity/FieldLayoutEntityDisplayTrait.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Drupal\field_layout\Entity;
+
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Layout\LayoutInterface;
+
+/**
+ * Provides shared code for entity displays.
+ *
+ * Both EntityViewDisplay and EntityFormDisplay must maintain their parent
+ * hierarchy, while being identically enhanced by Field Layout. This trait
+ * contains the code they both share.
+ */
+trait FieldLayoutEntityDisplayTrait {
+
+  /**
+   * Gets a layout definition.
+   *
+   * @param string $layout_id
+   *   The layout ID.
+   *
+   * @return \Drupal\Core\Layout\LayoutDefinition
+   *   The layout definition.
+   */
+  protected function getLayoutDefinition($layout_id) {
+    return \Drupal::service('plugin.manager.core.layout')->getDefinition($layout_id);
+  }
+
+  /**
+   * Implements \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface::getLayoutId().
+   */
+  public function getLayoutId() {
+    return $this->getThirdPartySetting('field_layout', 'id');
+  }
+
+  /**
+   * Implements \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface::getLayoutSettings().
+   */
+  public function getLayoutSettings() {
+    return $this->getThirdPartySetting('field_layout', 'settings', []);
+  }
+
+  /**
+   * Implements \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface::setLayoutId().
+   */
+  public function setLayoutId($layout_id, array $layout_settings = []) {
+    if ($this->getLayoutId() !== $layout_id) {
+      // @todo Devise a mechanism for mapping old regions to new ones in
+      //   https://www.drupal.org/node/2796877.
+      $layout_definition = $this->getLayoutDefinition($layout_id);
+      $new_region = $layout_definition->getDefaultRegion();
+      $layout_regions = $layout_definition->getRegions();
+      foreach ($this->getComponents() as $name => $component) {
+        if (isset($component['region']) && !isset($layout_regions[$component['region']])) {
+          $component['region'] = $new_region;
+          $this->setComponent($name, $component);
+        }
+      }
+    }
+    $this->setThirdPartySetting('field_layout', 'id', $layout_id);
+    // Instantiate the plugin and consult it for the updated plugin
+    // configuration. Once layouts are no longer stored as third party settings,
+    // this will be handled by the code in
+    // \Drupal\Core\Config\Entity\ConfigEntityBase::set() that handles
+    // \Drupal\Core\Entity\EntityWithPluginCollectionInterface.
+    $layout_settings = $this->doGetLayout($layout_id, $layout_settings)->getConfiguration();
+    $this->setThirdPartySetting('field_layout', 'settings', $layout_settings);
+    return $this;
+  }
+
+  /**
+   * Implements \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface::setLayout().
+   */
+  public function setLayout(LayoutInterface $layout) {
+    $this->setLayoutId($layout->getPluginId(), $layout->getConfiguration());
+    return $this;
+  }
+
+  /**
+   * Implements \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface::getLayout().
+   */
+  public function getLayout() {
+    return $this->doGetLayout($this->getLayoutId(), $this->getLayoutSettings());
+  }
+
+  /**
+   * Gets the layout plugin.
+   *
+   * @param string $layout_id
+   *   A layout plugin ID.
+   * @param array $layout_settings
+   *   An array of settings.
+   *
+   * @return \Drupal\Core\Layout\LayoutInterface
+   *   The layout plugin.
+   */
+  protected function doGetLayout($layout_id, array $layout_settings) {
+    return \Drupal::service('plugin.manager.core.layout')->createInstance($layout_id, $layout_settings);
+  }
+
+  /**
+   * Overrides \Drupal\Core\Entity\EntityDisplayBase::init().
+   */
+  protected function init() {
+    $this->ensureLayout();
+    parent::init();
+  }
+
+  /**
+   * Overrides \Drupal\Core\Entity\EntityDisplayBase::preSave().
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    parent::preSave($storage);
+
+    // Ensure the plugin configuration is updated. Once layouts are no longer
+    // stored as third party settings, this will be handled by the code in
+    // \Drupal\Core\Config\Entity\ConfigEntityBase::preSave() that handles
+    // \Drupal\Core\Entity\EntityWithPluginCollectionInterface.
+    if ($this->getLayoutId()) {
+      $this->setLayout($this->getLayout());
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function ensureLayout($default_layout_id = 'layout_onecol') {
+    if (!$this->getLayoutId()) {
+      $this->setLayoutId($default_layout_id);
+    }
+
+    return $this;
+  }
+
+  /**
+   * Overrides \Drupal\Core\Entity\EntityDisplayBase::calculateDependencies().
+   *
+   * Ensure the plugin dependencies are included. Once layouts are no longer
+   * stored as third party settings, this will be handled by the code in
+   * \Drupal\Core\Config\Entity\ConfigEntityBase::calculateDependencies() that
+   * handles \Drupal\Core\Entity\EntityWithPluginCollectionInterface.
+   */
+  public function calculateDependencies() {
+    parent::calculateDependencies();
+
+    // This can be called during uninstallation, so check for a valid ID first.
+    if ($this->getLayoutId()) {
+      $this->calculatePluginDependencies($this->getLayout());
+    }
+  }
+
+}
diff --git a/web/core/modules/field_layout/src/Entity/FieldLayoutEntityFormDisplay.php b/web/core/modules/field_layout/src/Entity/FieldLayoutEntityFormDisplay.php
new file mode 100644
index 000000000..c58938e0a
--- /dev/null
+++ b/web/core/modules/field_layout/src/Entity/FieldLayoutEntityFormDisplay.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\field_layout\Entity;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\field_layout\Display\EntityDisplayWithLayoutInterface;
+
+/**
+ * Provides an entity form display entity that has a layout.
+ */
+class FieldLayoutEntityFormDisplay extends EntityFormDisplay implements EntityDisplayWithLayoutInterface {
+
+  use FieldLayoutEntityDisplayTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultRegion() {
+    // This cannot be provided by the trait due to
+    // https://bugs.php.net/bug.php?id=71414 which is fixed in PHP 7.0.6.
+    return $this->getLayoutDefinition($this->getLayoutId())->getDefaultRegion();
+  }
+
+}
diff --git a/web/core/modules/field_layout/src/Entity/FieldLayoutEntityViewDisplay.php b/web/core/modules/field_layout/src/Entity/FieldLayoutEntityViewDisplay.php
new file mode 100644
index 000000000..4f0c27402
--- /dev/null
+++ b/web/core/modules/field_layout/src/Entity/FieldLayoutEntityViewDisplay.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\field_layout\Entity;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\field_layout\Display\EntityDisplayWithLayoutInterface;
+
+/**
+ * Provides an entity view display entity that has a layout.
+ */
+class FieldLayoutEntityViewDisplay extends EntityViewDisplay implements EntityDisplayWithLayoutInterface {
+
+  use FieldLayoutEntityDisplayTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultRegion() {
+    // This cannot be provided by the trait due to
+    // https://bugs.php.net/bug.php?id=71414 which is fixed in PHP 7.0.6.
+    return $this->getLayoutDefinition($this->getLayoutId())->getDefaultRegion();
+  }
+
+}
diff --git a/web/core/modules/field_layout/src/FieldLayoutBuilder.php b/web/core/modules/field_layout/src/FieldLayoutBuilder.php
new file mode 100644
index 000000000..8ef5d048f
--- /dev/null
+++ b/web/core/modules/field_layout/src/FieldLayoutBuilder.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Drupal\field_layout;
+
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\field_layout\Display\EntityDisplayWithLayoutInterface;
+use Drupal\Core\Layout\LayoutPluginManagerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Builds a field layout.
+ */
+class FieldLayoutBuilder implements ContainerInjectionInterface {
+
+  /**
+   * The layout plugin manager.
+   *
+   * @var \Drupal\Core\Layout\LayoutPluginManagerInterface
+   */
+  protected $layoutPluginManager;
+
+  /**
+   * The entity field manager.
+   *
+   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
+   */
+  protected $entityFieldManager;
+
+  /**
+   * Constructs a new FieldLayoutBuilder.
+   *
+   * @param \Drupal\Core\Layout\LayoutPluginManagerInterface $layout_plugin_manager
+   *   The layout plugin manager.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   The entity field manager.
+   */
+  public function __construct(LayoutPluginManagerInterface $layout_plugin_manager, EntityFieldManagerInterface $entity_field_manager) {
+    $this->layoutPluginManager = $layout_plugin_manager;
+    $this->entityFieldManager = $entity_field_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('plugin.manager.core.layout'),
+      $container->get('entity_field.manager')
+    );
+  }
+
+  /**
+   * Applies the layout to an entity build.
+   *
+   * @param array $build
+   *   A renderable array representing the entity content or form.
+   * @param \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface $display
+   *   The entity display holding the display options configured for the entity
+   *   components.
+   */
+  public function buildView(array &$build, EntityDisplayWithLayoutInterface $display) {
+    $layout_definition = $this->layoutPluginManager->getDefinition($display->getLayoutId(), FALSE);
+    if ($layout_definition && $fields = $this->getFields($build, $display, 'view')) {
+      // Add the regions to the $build in the correct order.
+      $regions = array_fill_keys($layout_definition->getRegionNames(), []);
+
+      foreach ($fields as $name => $field) {
+        // Move the field from the top-level of $build into a region-specific
+        // section.
+        // @todo Ideally the array structure would remain unchanged, see
+        //   https://www.drupal.org/node/2846393.
+        $regions[$field['region']][$name] = $build[$name];
+        unset($build[$name]);
+      }
+      // Ensure this will not conflict with any existing array elements by
+      // prefixing with an underscore.
+      $build['_field_layout'] = $display->getLayout()->build($regions);
+    }
+  }
+
+  /**
+   * Applies the layout to an entity form.
+   *
+   * @param array $build
+   *   A renderable array representing the entity content or form.
+   * @param \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface $display
+   *   The entity display holding the display options configured for the entity
+   *   components.
+   */
+  public function buildForm(array &$build, EntityDisplayWithLayoutInterface $display) {
+    $layout_definition = $this->layoutPluginManager->getDefinition($display->getLayoutId(), FALSE);
+    if ($layout_definition && $fields = $this->getFields($build, $display, 'form')) {
+      $fill = [];
+      $fill['#process'][] = '\Drupal\Core\Render\Element\RenderElement::processGroup';
+      $fill['#pre_render'][] = '\Drupal\Core\Render\Element\RenderElement::preRenderGroup';
+      // Add the regions to the $build in the correct order.
+      $regions = array_fill_keys($layout_definition->getRegionNames(), $fill);
+
+      foreach ($fields as $name => $field) {
+        // As this is a form, #group can be used to relocate the fields. This
+        // avoids breaking hook_form_alter() implementations by not actually
+        // moving the field in the form structure. If a #group is already set,
+        // do not overwrite it.
+        if (!isset($build[$name]['#group'])) {
+          $build[$name]['#group'] = $field['region'];
+        }
+      }
+      // Ensure this will not conflict with any existing array elements by
+      // prefixing with an underscore.
+      $build['_field_layout'] = $display->getLayout()->build($regions);
+    }
+  }
+
+  /**
+   * Gets the fields that need to be processed.
+   *
+   * @param array $build
+   *   A renderable array representing the entity content or form.
+   * @param \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface $display
+   *   The entity display holding the display options configured for the entity
+   *   components.
+   * @param string $display_context
+   *   The display context, either 'form' or 'view'.
+   *
+   * @return array
+   *   An array of configurable fields present in the build.
+   */
+  protected function getFields(array $build, EntityDisplayWithLayoutInterface $display, $display_context) {
+    $components = $display->getComponents();
+
+    // Ignore any extra fields from the list of field definitions. Field
+    // definitions can have a non-configurable display, but all extra fields are
+    // always displayed.
+    $field_definitions = array_diff_key(
+      $this->entityFieldManager->getFieldDefinitions($display->getTargetEntityTypeId(), $display->getTargetBundle()),
+      $this->entityFieldManager->getExtraFields($display->getTargetEntityTypeId(), $display->getTargetBundle())
+    );
+
+    $fields_to_exclude = array_filter($field_definitions, function (FieldDefinitionInterface $field_definition) use ($display_context) {
+      // Remove fields with a non-configurable display.
+      return !$field_definition->isDisplayConfigurable($display_context);
+    });
+    $components = array_diff_key($components, $fields_to_exclude);
+
+    // Only include fields present in the build.
+    $components = array_intersect_key($components, $build);
+
+    return $components;
+  }
+
+}
diff --git a/web/core/modules/field_layout/src/Form/FieldLayoutEntityDisplayFormTrait.php b/web/core/modules/field_layout/src/Form/FieldLayoutEntityDisplayFormTrait.php
new file mode 100644
index 000000000..043e5c739
--- /dev/null
+++ b/web/core/modules/field_layout/src/Form/FieldLayoutEntityDisplayFormTrait.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace Drupal\field_layout\Form;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Form\SubformState;
+use Drupal\Core\Plugin\PluginFormInterface;
+use Drupal\field_layout\Display\EntityDisplayWithLayoutInterface;
+
+/**
+ * Provides shared code for entity display forms.
+ *
+ * Both EntityViewDisplayEditForm and EntityFormDisplayEditForm must maintain
+ * their parent hierarchy, while being identically enhanced by Field Layout.
+ * This trait contains the code they both share.
+ */
+trait FieldLayoutEntityDisplayFormTrait {
+
+  /**
+   * The field layout plugin manager.
+   *
+   * @var \Drupal\Core\Layout\LayoutPluginManagerInterface
+   */
+  protected $layoutPluginManager;
+
+  /**
+   * Overrides \Drupal\field_ui\Form\EntityDisplayFormBase::getRegions().
+   */
+  public function getRegions() {
+    $regions = [];
+
+    $layout_definition = $this->layoutPluginManager->getDefinition($this->getEntity()->getLayoutId());
+    foreach ($layout_definition->getRegions() as $name => $region) {
+      $regions[$name] = [
+        'title' => $region['label'],
+        'message' => $this->t('No field is displayed.'),
+      ];
+    }
+
+    $regions['hidden'] = [
+      'title' => $this->t('Disabled', [], ['context' => 'Plural']),
+      'message' => $this->t('No field is hidden.'),
+    ];
+
+    return $regions;
+  }
+
+  /**
+   * Overrides \Drupal\field_ui\Form\EntityDisplayFormBase::form().
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    $form['field_layouts'] = [
+      '#type' => 'details',
+      '#title' => $this->t('Layout settings'),
+    ];
+
+    $layout_plugin = $this->getLayout($this->getEntity(), $form_state);
+
+    $form['field_layouts']['field_layout'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Select a layout'),
+      '#options' => $this->layoutPluginManager->getLayoutOptions(),
+      '#default_value' => $layout_plugin->getPluginId(),
+      '#ajax' => [
+        'callback' => '::settingsAjax',
+        'wrapper' => 'field-layout-settings-wrapper',
+        'trigger_as' => ['name' => 'field_layout_change'],
+      ],
+    ];
+    $form['field_layouts']['submit'] = [
+      '#type' => 'submit',
+      '#name' => 'field_layout_change',
+      '#value' => $this->t('Change layout'),
+      '#submit' => ['::settingsAjaxSubmit'],
+      '#attributes' => ['class' => ['js-hide']],
+      '#ajax' => [
+        'callback' => '::settingsAjax',
+        'wrapper' => 'field-layout-settings-wrapper',
+      ],
+    ];
+
+    $form['field_layouts']['settings_wrapper'] = [
+      '#type' => 'container',
+      '#id' => 'field-layout-settings-wrapper',
+      '#tree' => TRUE,
+    ];
+
+    if ($layout_plugin instanceof PluginFormInterface) {
+      $form['field_layouts']['settings_wrapper']['layout_settings'] = [];
+      $subform_state = SubformState::createForSubform($form['field_layouts']['settings_wrapper']['layout_settings'], $form, $form_state);
+      $form['field_layouts']['settings_wrapper']['layout_settings'] = $layout_plugin->buildConfigurationForm($form['field_layouts']['settings_wrapper']['layout_settings'], $subform_state);
+    }
+
+    return $form;
+  }
+
+  /**
+   * Gets the layout plugin for the currently selected field layout.
+   *
+   * @param \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface $entity
+   *   The current form entity.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return \Drupal\Core\Layout\LayoutInterface
+   *   The layout plugin.
+   */
+  protected function getLayout(EntityDisplayWithLayoutInterface $entity, FormStateInterface $form_state) {
+    if (!$layout_plugin = $form_state->get('layout_plugin')) {
+      $stored_layout_id = $entity->getLayoutId();
+      // Use selected layout if it exists, falling back to the stored layout.
+      $layout_id = $form_state->getValue('field_layout', $stored_layout_id);
+      // If the current layout is the stored layout, use the stored layout
+      // settings. Otherwise leave the settings empty.
+      $layout_settings = $layout_id === $stored_layout_id ? $entity->getLayoutSettings() : [];
+
+      $layout_plugin = $this->layoutPluginManager->createInstance($layout_id, $layout_settings);
+      $form_state->set('layout_plugin', $layout_plugin);
+    }
+    return $layout_plugin;
+  }
+
+  /**
+   * Ajax callback for the field layout settings form.
+   */
+  public static function settingsAjax($form, FormStateInterface $form_state) {
+    return $form['field_layouts']['settings_wrapper'];
+  }
+
+  /**
+   * Submit handler for the non-JS case.
+   */
+  public function settingsAjaxSubmit($form, FormStateInterface $form_state) {
+    $form_state->set('layout_plugin', NULL);
+    $form_state->setRebuild();
+  }
+
+  /**
+   * Overrides \Drupal\field_ui\Form\EntityDisplayFormBase::validateForm().
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
+
+    $layout_plugin = $this->getLayout($this->getEntity(), $form_state);
+    if ($layout_plugin instanceof PluginFormInterface) {
+      $subform_state = SubformState::createForSubform($form['field_layouts']['settings_wrapper']['layout_settings'], $form, $form_state);
+      $layout_plugin->validateConfigurationForm($form['field_layouts']['settings_wrapper']['layout_settings'], $subform_state);
+    }
+  }
+
+  /**
+   * Overrides \Drupal\field_ui\Form\EntityDisplayFormBase::submitForm().
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    parent::submitForm($form, $form_state);
+
+    $entity = $this->getEntity();
+    $layout_plugin = $this->getLayout($entity, $form_state);
+    if ($layout_plugin instanceof PluginFormInterface) {
+      $subform_state = SubformState::createForSubform($form['field_layouts']['settings_wrapper']['layout_settings'], $form, $form_state);
+      $layout_plugin->submitConfigurationForm($form['field_layouts']['settings_wrapper']['layout_settings'], $subform_state);
+    }
+
+    $entity->setLayout($layout_plugin);
+  }
+
+  /**
+   * Gets the form entity.
+   *
+   * @return \Drupal\field_layout\Display\EntityDisplayWithLayoutInterface
+   *   The current form entity.
+   */
+  abstract public function getEntity();
+
+}
diff --git a/web/core/modules/field_layout/src/Form/FieldLayoutEntityFormDisplayEditForm.php b/web/core/modules/field_layout/src/Form/FieldLayoutEntityFormDisplayEditForm.php
new file mode 100644
index 000000000..c42a9d85a
--- /dev/null
+++ b/web/core/modules/field_layout/src/Form/FieldLayoutEntityFormDisplayEditForm.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Drupal\field_layout\Form;
+
+use Drupal\Component\Plugin\PluginManagerBase;
+use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\Layout\LayoutPluginManagerInterface;
+use Drupal\field_ui\Form\EntityFormDisplayEditForm;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Edit form for the EntityFormDisplay entity type.
+ */
+class FieldLayoutEntityFormDisplayEditForm extends EntityFormDisplayEditForm {
+
+  use FieldLayoutEntityDisplayFormTrait;
+
+  /**
+   * FieldLayoutEntityFormDisplayEditForm constructor.
+   *
+   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
+   *   The field type manager.
+   * @param \Drupal\Component\Plugin\PluginManagerBase $plugin_manager
+   *   The widget plugin manager.
+   * @param \Drupal\Core\Layout\LayoutPluginManagerInterface $layout_plugin_manager
+   *   The layout plugin manager.
+   */
+  public function __construct(FieldTypePluginManagerInterface $field_type_manager, PluginManagerBase $plugin_manager, LayoutPluginManagerInterface $layout_plugin_manager) {
+    parent::__construct($field_type_manager, $plugin_manager);
+    $this->layoutPluginManager = $layout_plugin_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('plugin.manager.field.widget'),
+      $container->get('plugin.manager.core.layout')
+    );
+  }
+
+}
diff --git a/web/core/modules/field_layout/src/Form/FieldLayoutEntityViewDisplayEditForm.php b/web/core/modules/field_layout/src/Form/FieldLayoutEntityViewDisplayEditForm.php
new file mode 100644
index 000000000..92bfbde02
--- /dev/null
+++ b/web/core/modules/field_layout/src/Form/FieldLayoutEntityViewDisplayEditForm.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Drupal\field_layout\Form;
+
+use Drupal\Component\Plugin\PluginManagerBase;
+use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\Layout\LayoutPluginManagerInterface;
+use Drupal\field_ui\Form\EntityViewDisplayEditForm;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Edit form for the EntityViewDisplay entity type.
+ */
+class FieldLayoutEntityViewDisplayEditForm extends EntityViewDisplayEditForm {
+
+  use FieldLayoutEntityDisplayFormTrait;
+
+  /**
+   * FieldLayoutEntityViewDisplayEditForm constructor.
+   *
+   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
+   *   The field type manager.
+   * @param \Drupal\Component\Plugin\PluginManagerBase $plugin_manager
+   *   The formatter plugin manager.
+   * @param \Drupal\Core\Layout\LayoutPluginManagerInterface $layout_plugin_manager
+   *   The field layout plugin manager.
+   */
+  public function __construct(FieldTypePluginManagerInterface $field_type_manager, PluginManagerBase $plugin_manager, LayoutPluginManagerInterface $layout_plugin_manager) {
+    parent::__construct($field_type_manager, $plugin_manager);
+    $this->layoutPluginManager = $layout_plugin_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('plugin.manager.field.formatter'),
+      $container->get('plugin.manager.core.layout')
+    );
+  }
+
+}
diff --git a/web/core/modules/field_layout/tests/modules/field_layout_test/config/schema/field_layout_test.schema.yml b/web/core/modules/field_layout/tests/modules/field_layout_test/config/schema/field_layout_test.schema.yml
new file mode 100644
index 000000000..dc95ab32f
--- /dev/null
+++ b/web/core/modules/field_layout/tests/modules/field_layout_test/config/schema/field_layout_test.schema.yml
@@ -0,0 +1,7 @@
+layout_plugin.settings.test_layout_main_and_footer:
+  type: layout_plugin.settings
+  label: 'Layout test plugin settings'
+  mapping:
+    setting_1:
+      type: string
+      label: 'Setting 1'
diff --git a/web/core/modules/field_layout/tests/modules/field_layout_test/field_layout_test.info.yml b/web/core/modules/field_layout/tests/modules/field_layout_test/field_layout_test.info.yml
new file mode 100644
index 000000000..4d699e463
--- /dev/null
+++ b/web/core/modules/field_layout/tests/modules/field_layout_test/field_layout_test.info.yml
@@ -0,0 +1,8 @@
+name: 'Field Layout test'
+type: module
+description: 'Support module for Field Layout tests.'
+core: 8.x
+package: Testing
+version: VERSION
+dependencies:
+  - entity_test
diff --git a/web/core/modules/field_layout/tests/modules/field_layout_test/field_layout_test.routing.yml b/web/core/modules/field_layout/tests/modules/field_layout_test/field_layout_test.routing.yml
new file mode 100644
index 000000000..bcea2888f
--- /dev/null
+++ b/web/core/modules/field_layout/tests/modules/field_layout_test/field_layout_test.routing.yml
@@ -0,0 +1,7 @@
+entity.entity_test.test_view_mode:
+  path: '/entity_test/{entity_test}/test'
+  defaults:
+    _entity_view: 'entity_test.test'
+    _title: 'Test test view mode'
+  requirements:
+    _entity_access: 'entity_test.view'
diff --git a/web/core/modules/field_layout/tests/modules/field_layout_test/src/Plugin/Layout/TestLayoutContentFooter.php b/web/core/modules/field_layout/tests/modules/field_layout_test/src/Plugin/Layout/TestLayoutContentFooter.php
new file mode 100644
index 000000000..c283c82d7
--- /dev/null
+++ b/web/core/modules/field_layout/tests/modules/field_layout_test/src/Plugin/Layout/TestLayoutContentFooter.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\field_layout_test\Plugin\Layout;
+
+use Drupal\Core\Layout\LayoutDefault;
+
+/**
+ * Provides an annotated layout plugin for field_layout tests.
+ *
+ * @Layout(
+ *   id = "test_layout_content_and_footer",
+ *   label = @Translation("Test plugin: Content and Footer"),
+ *   category = @Translation("Layout test"),
+ *   description = @Translation("Test layout"),
+ *   regions = {
+ *     "content" = {
+ *       "label" = @Translation("Content Region")
+ *     },
+ *     "footer" = {
+ *       "label" = @Translation("Footer Region")
+ *     }
+ *   },
+ * )
+ */
+class TestLayoutContentFooter extends LayoutDefault {
+
+}
diff --git a/web/core/modules/field_layout/tests/modules/field_layout_test/src/Plugin/Layout/TestLayoutMainFooter.php b/web/core/modules/field_layout/tests/modules/field_layout_test/src/Plugin/Layout/TestLayoutMainFooter.php
new file mode 100644
index 000000000..cfe95e137
--- /dev/null
+++ b/web/core/modules/field_layout/tests/modules/field_layout_test/src/Plugin/Layout/TestLayoutMainFooter.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Drupal\field_layout_test\Plugin\Layout;
+
+use Drupal\Core\Layout\LayoutDefault;
+
+/**
+ * Provides an annotated layout plugin for field_layout tests.
+ *
+ * @Layout(
+ *   id = "test_layout_main_and_footer",
+ *   label = @Translation("Test plugin: Main and Footer"),
+ *   category = @Translation("Layout test"),
+ *   description = @Translation("Test layout"),
+ *   regions = {
+ *     "main" = {
+ *       "label" = @Translation("Main Region")
+ *     },
+ *     "footer" = {
+ *       "label" = @Translation("Footer Region")
+ *     }
+ *   },
+ *   config_dependencies = {
+ *     "module" = {
+ *       "dependency_from_annotation",
+ *     },
+ *   },
+ * )
+ */
+class TestLayoutMainFooter extends LayoutDefault {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function defaultConfiguration() {
+    return [
+      'setting_1' => 'Default',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    $dependencies = parent::calculateDependencies();
+    $dependencies['module'][] = 'dependency_from_calculateDependencies';
+    return $dependencies;
+  }
+
+}
diff --git a/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php b/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
new file mode 100644
index 000000000..683ccd2f9
--- /dev/null
+++ b/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Drupal\Tests\field_layout\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests using field layout for entity displays.
+ *
+ * @group field_layout
+ */
+class FieldLayoutTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['field_layout', 'field_ui', 'node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->createContentType([
+      'type' => 'article',
+    ]);
+    $this->createNode([
+      'type' => 'article',
+      'title' => 'The node title',
+      'body' => [[
+        'value' => 'The node body',
+      ]],
+    ]);
+    $this->drupalLogin($this->drupalCreateUser([
+      'access administration pages',
+      'administer content types',
+      'administer nodes',
+      'administer node fields',
+      'administer node display',
+      'administer node form display',
+      'view the administration theme',
+    ]));
+  }
+
+  /**
+   * Tests an entity type that has fields shown by default.
+   */
+  public function testNodeView() {
+    // By default, the one-column layout is used.
+    $this->drupalGet('node/1');
+    $this->assertSession()->elementExists('css', '.layout--onecol');
+    $this->assertSession()->elementExists('css', '.layout-region--content .field--name-body');
+
+    $this->drupalGet('admin/structure/types/manage/article/display');
+    $this->assertEquals(['Content', 'Disabled'], $this->getRegionTitles());
+    $this->assertSession()->optionExists('fields[body][region]', 'content');
+  }
+
+  /**
+   * Gets the region titles on the page.
+   *
+   * @return string[]
+   *   An array of region titles.
+   */
+  protected function getRegionTitles() {
+    $region_titles = [];
+    $region_title_elements = $this->getSession()->getPage()->findAll('css', '.region-title td');
+    /** @var \Behat\Mink\Element\NodeElement[] $region_title_elements */
+    foreach ($region_title_elements as $region_title_element) {
+      $region_titles[] = $region_title_element->getText();
+    }
+    return $region_titles;
+  }
+
+}
diff --git a/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php b/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
new file mode 100644
index 000000000..a0fd13c0f
--- /dev/null
+++ b/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
@@ -0,0 +1,266 @@
+<?php
+
+namespace Drupal\Tests\field_layout\FunctionalJavascript;
+
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+
+/**
+ * Tests using field layout for entity displays.
+ *
+ * @group field_layout
+ */
+class FieldLayoutTest extends JavascriptTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['field_layout', 'field_ui', 'field_layout_test', 'layout_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $entity = EntityTest::create([
+      'name' => 'The name for this entity',
+      'field_test_text' => [[
+        'value' => 'The field test text value',
+      ]],
+    ]);
+    $entity->save();
+    $this->drupalLogin($this->drupalCreateUser([
+      'access administration pages',
+      'view test entity',
+      'administer entity_test content',
+      'administer entity_test fields',
+      'administer entity_test display',
+      'administer entity_test form display',
+      'view the administration theme',
+    ]));
+  }
+
+  /**
+   * Tests that layouts are unique per view mode.
+   */
+  public function testEntityViewModes() {
+    // By default, the field is not visible.
+    $this->drupalGet('entity_test/1/test');
+    $this->assertSession()->elementNotExists('css', '.layout-region--content .field--name-field-test-text');
+    $this->drupalGet('entity_test/1');
+    $this->assertSession()->elementNotExists('css', '.layout-region--content .field--name-field-test-text');
+
+    // Change the layout for the "test" view mode. See
+    // core.entity_view_mode.entity_test.test.yml.
+    $this->drupalGet('entity_test/structure/entity_test/display');
+    $this->click('#edit-modes');
+    $this->getSession()->getPage()->checkField('display_modes_custom[test]');
+    $this->submitForm([], 'Save');
+    $this->clickLink('configure them');
+    $this->getSession()->getPage()->pressButton('Show row weights');
+    $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'content');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->submitForm([], 'Save');
+
+    // Each view mode has a different layout.
+    $this->drupalGet('entity_test/1/test');
+    $this->assertSession()->elementExists('css', '.layout-region--content .field--name-field-test-text');
+    $this->drupalGet('entity_test/1');
+    $this->assertSession()->elementNotExists('css', '.layout-region--content .field--name-field-test-text');
+  }
+
+  /**
+   * Tests the use of field layout for entity form displays.
+   */
+  public function testEntityForm() {
+    // By default, the one-column layout is used.
+    $this->drupalGet('entity_test/manage/1/edit');
+    $this->assertFieldInRegion('field_test_text[0][value]', 'content');
+
+    // The one-column layout is in use.
+    $this->drupalGet('entity_test/structure/entity_test/form-display');
+    $this->assertEquals(['Content', 'Disabled'], $this->getRegionTitles());
+
+    // Switch the layout to two columns.
+    $this->click('#edit-field-layouts');
+    $this->getSession()->getPage()->selectFieldOption('field_layout', 'layout_twocol');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->submitForm([], 'Save');
+
+    // The field is moved to the default region for the new layout.
+    $this->assertSession()->pageTextContains('Your settings have been saved.');
+    $this->assertEquals(['Top', 'Left', 'Right', 'Bottom', 'Disabled'], $this->getRegionTitles());
+
+    $this->drupalGet('entity_test/manage/1/edit');
+    // No fields are visible, and the regions don't display when empty.
+    $this->assertFieldInRegion('field_test_text[0][value]', 'left');
+    $this->assertSession()->elementExists('css', '.layout-region--left .field--name-field-test-text');
+
+    // After a refresh the new regions are still there.
+    $this->drupalGet('entity_test/structure/entity_test/form-display');
+    $this->assertEquals(['Top', 'Left', 'Right', 'Bottom', 'Disabled'], $this->getRegionTitles());
+
+    // Drag the field to the right region.
+    $field_test_text_row = $this->getSession()->getPage()->find('css', '#field-test-text');
+    $right_region_row = $this->getSession()->getPage()->find('css', '.region-right-message');
+    $field_test_text_row->find('css', '.handle')->dragTo($right_region_row);
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->submitForm([], 'Save');
+    $this->assertSession()->pageTextContains('Your settings have been saved.');
+
+    // The new layout is used.
+    $this->drupalGet('entity_test/manage/1/edit');
+    $this->assertSession()->elementExists('css', '.layout-region--right .field--name-field-test-text');
+    $this->assertFieldInRegion('field_test_text[0][value]', 'right');
+
+    // Move the field to the right region without tabledrag.
+    $this->drupalGet('entity_test/structure/entity_test/form-display');
+    $this->getSession()->getPage()->pressButton('Show row weights');
+    $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'right');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->submitForm([], 'Save');
+    $this->assertSession()->pageTextContains('Your settings have been saved.');
+
+    // The updated region is used.
+    $this->drupalGet('entity_test/manage/1/edit');
+    $this->assertFieldInRegion('field_test_text[0][value]', 'right');
+
+    // The layout is still in use without Field UI.
+    $this->container->get('module_installer')->uninstall(['field_ui']);
+    $this->drupalGet('entity_test/manage/1/edit');
+    $this->assertFieldInRegion('field_test_text[0][value]', 'right');
+  }
+
+  /**
+   * Tests the use of field layout for entity view displays.
+   */
+  public function testEntityView() {
+    // The one-column layout is in use.
+    $this->drupalGet('entity_test/structure/entity_test/display');
+    $this->assertEquals(['Content', 'Disabled'], $this->getRegionTitles());
+
+    // Switch the layout to two columns.
+    $this->click('#edit-field-layouts');
+    $this->getSession()->getPage()->selectFieldOption('field_layout', 'layout_twocol');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->submitForm([], 'Save');
+
+    $this->assertSession()->pageTextContains('Your settings have been saved.');
+    $this->assertEquals(['Top', 'Left', 'Right', 'Bottom', 'Disabled'], $this->getRegionTitles());
+
+    $this->drupalGet('entity_test/1');
+    // No fields are visible, and the regions don't display when empty.
+    $this->assertSession()->elementNotExists('css', '.layout--twocol');
+    $this->assertSession()->elementNotExists('css', '.layout-region');
+    $this->assertSession()->elementNotExists('css', '.field--name-field-test-text');
+
+    // After a refresh the new regions are still there.
+    $this->drupalGet('entity_test/structure/entity_test/display');
+    $this->assertEquals(['Top', 'Left', 'Right', 'Bottom', 'Disabled'], $this->getRegionTitles());
+
+    // Drag the field to the left region.
+    $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected());
+    $field_test_text_row = $this->getSession()->getPage()->find('css', '#field-test-text');
+    $left_region_row = $this->getSession()->getPage()->find('css', '.region-left-message');
+    $field_test_text_row->find('css', '.handle')->dragTo($left_region_row);
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->assertFalse($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected());
+    $this->submitForm([], 'Save');
+    $this->assertSession()->pageTextContains('Your settings have been saved.');
+
+    // The new layout is used.
+    $this->drupalGet('entity_test/1');
+    $this->assertSession()->elementExists('css', '.layout--twocol');
+    $this->assertSession()->elementExists('css', '.layout-region--left .field--name-field-test-text');
+
+    // Move the field to the right region without tabledrag.
+    $this->drupalGet('entity_test/structure/entity_test/display');
+    $this->getSession()->getPage()->pressButton('Show row weights');
+    $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'right');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->submitForm([], 'Save');
+    $this->assertSession()->pageTextContains('Your settings have been saved.');
+
+    // The updated region is used.
+    $this->drupalGet('entity_test/1');
+    $this->assertSession()->elementExists('css', '.layout-region--right .field--name-field-test-text');
+
+    // The layout is still in use without Field UI.
+    $this->container->get('module_installer')->uninstall(['field_ui']);
+    $this->drupalGet('entity_test/1');
+    $this->assertSession()->elementExists('css', '.layout--twocol');
+    $this->assertSession()->elementExists('css', '.layout-region--right .field--name-field-test-text');
+  }
+
+  /**
+   * Tests layout plugins with forms.
+   */
+  public function testLayoutForms() {
+    $this->drupalGet('entity_test/structure/entity_test/display');
+    // Switch to a field layout with settings.
+    $this->click('#edit-field-layouts');
+
+    // Test switching between layouts with and without forms.
+    $this->getSession()->getPage()->selectFieldOption('field_layout', 'layout_test_plugin');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->assertSession()->fieldExists('settings_wrapper[layout_settings][setting_1]');
+
+    $this->getSession()->getPage()->selectFieldOption('field_layout', 'layout_test_2col');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->assertSession()->fieldNotExists('settings_wrapper[layout_settings][setting_1]');
+
+    $this->getSession()->getPage()->selectFieldOption('field_layout', 'layout_test_plugin');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->assertSession()->fieldExists('settings_wrapper[layout_settings][setting_1]');
+
+    // Move the test field to the content region.
+    $this->getSession()->getPage()->pressButton('Show row weights');
+    $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'content');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->submitForm([], 'Save');
+
+    $this->drupalGet('entity_test/1');
+    $this->assertSession()->pageTextContains('Blah: Default');
+
+    // Update the field layout settings.
+    $this->drupalGet('entity_test/structure/entity_test/display');
+    $this->click('#edit-field-layouts');
+    $this->getSession()->getPage()->fillField('settings_wrapper[layout_settings][setting_1]', 'Test text');
+    $this->submitForm([], 'Save');
+
+    $this->drupalGet('entity_test/1');
+    $this->assertSession()->pageTextContains('Blah: Test text');
+  }
+
+  /**
+   * Gets the region titles on the page.
+   *
+   * @return string[]
+   *   An array of region titles.
+   */
+  protected function getRegionTitles() {
+    $region_titles = [];
+    $region_title_elements = $this->getSession()->getPage()->findAll('css', '.region-title td');
+    /** @var \Behat\Mink\Element\NodeElement[] $region_title_elements */
+    foreach ($region_title_elements as $region_title_element) {
+      $region_titles[] = $region_title_element->getText();
+    }
+    return $region_titles;
+  }
+
+  /**
+   * Asserts that a field exists in a given region.
+   *
+   * @param string $field_selector
+   *   The field selector, one of field id|name|label|value.
+   * @param string $region_name
+   *   The machine name of the region.
+   */
+  protected function assertFieldInRegion($field_selector, $region_name) {
+    $region_element = $this->getSession()->getPage()->find('css', ".layout-region--$region_name");
+    $this->assertNotNull($region_element);
+    $this->assertSession()->fieldExists($field_selector, $region_element);
+  }
+
+}
diff --git a/web/core/modules/field_layout/tests/src/Kernel/FieldLayoutEntityDisplayTest.php b/web/core/modules/field_layout/tests/src/Kernel/FieldLayoutEntityDisplayTest.php
new file mode 100644
index 000000000..3ca5e596e
--- /dev/null
+++ b/web/core/modules/field_layout/tests/src/Kernel/FieldLayoutEntityDisplayTest.php
@@ -0,0 +1,183 @@
+<?php
+
+namespace Drupal\Tests\field_layout\Kernel;
+
+use Drupal\field_layout\Entity\FieldLayoutEntityViewDisplay;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\field_layout\Entity\FieldLayoutEntityDisplayTrait
+ * @group field_layout
+ */
+class FieldLayoutEntityDisplayTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['layout_discovery', 'field_layout', 'entity_test', 'field_layout_test', 'system'];
+
+  /**
+   * @covers ::preSave
+   * @covers ::calculateDependencies
+   */
+  public function testPreSave() {
+    // Create an entity display with one hidden and one visible field.
+    $entity_display = FieldLayoutEntityViewDisplay::create([
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+      'status' => TRUE,
+      'content' => [
+        'foo' => ['type' => 'visible'],
+        'bar' => ['type' => 'hidden'],
+        'name' => ['type' => 'hidden', 'region' => 'content'],
+      ],
+    ]);
+
+    $expected = [
+      'langcode' => 'en',
+      'status' => TRUE,
+      'dependencies' => [],
+      'third_party_settings' => [
+        'field_layout' => [
+          'id' => 'layout_onecol',
+          'settings' => [],
+        ],
+      ],
+      'id' => 'entity_test.entity_test.default',
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+      'content' => [
+        'foo' => [
+          'type' => 'visible',
+        ],
+        'bar' => [
+          'type' => 'hidden',
+        ],
+      ],
+      'hidden' => [],
+    ];
+    $this->assertEntityValues($expected, $entity_display->toArray());
+
+    // Save the display.
+    // the 'content' property and the visible field has the default region set.
+    $entity_display->save();
+
+    // The dependencies have been updated.
+    $expected['dependencies']['module'] = [
+      'entity_test',
+      'field_layout',
+      'layout_discovery',
+    ];
+    // A third party setting is added by the entity_test module.
+    $expected['third_party_settings']['entity_test'] = ['foo' => 'bar'];
+    // The visible field is assigned the default region.
+    $expected['content']['foo']['region'] = 'content';
+    // The hidden field is removed from the list of visible fields, and marked
+    // as hidden.
+    unset($expected['content']['bar']);
+    $expected['hidden'] = ['bar' => TRUE];
+
+    $this->assertEntityValues($expected, $entity_display->toArray());
+
+    // Assign a new layout that has default settings and complex dependencies,
+    // but do not save yet.
+    $entity_display->setLayoutId('test_layout_main_and_footer');
+
+    // The default settings were added.
+    $expected['third_party_settings']['field_layout'] = [
+      'id' => 'test_layout_main_and_footer',
+      'settings' => [
+        'setting_1' => 'Default',
+      ],
+    ];
+    // The field was moved to the default region.
+    $expected['content']['foo'] = [
+      'type' => 'visible',
+      'region' => 'main',
+      'weight' => -4,
+      'settings' => [],
+      'third_party_settings' => [],
+    ];
+    $this->assertEntityValues($expected, $entity_display->toArray());
+
+    // After saving, the dependencies have been updated.
+    $entity_display->save();
+    $expected['dependencies']['module'] = [
+      'dependency_from_annotation',
+      'dependency_from_calculateDependencies',
+      'entity_test',
+      'field_layout',
+      'field_layout_test',
+    ];
+    $this->assertEntityValues($expected, $entity_display->toArray());
+
+    // Assign a layout with provided settings.
+    $entity_display->setLayoutId('test_layout_main_and_footer', ['setting_1' => 'foobar']);
+    $entity_display->save();
+
+    // The setting overrides the default value.
+    $expected['third_party_settings']['field_layout']['settings']['setting_1'] = 'foobar';
+    $this->assertEntityValues($expected, $entity_display->toArray());
+
+    // Move a field to the non-default region.
+    $component = $entity_display->getComponent('foo');
+    $component['region'] = 'footer';
+    $entity_display->setComponent('foo', $component);
+    $entity_display->save();
+
+    // The field region is saved.
+    $expected['content']['foo']['region'] = 'footer';
+    $this->assertEntityValues($expected, $entity_display->toArray());
+
+    // Assign a different layout that shares the same non-default region.
+    $entity_display->setLayoutId('test_layout_content_and_footer');
+    $entity_display->save();
+
+    // The dependencies have been updated.
+    $expected['dependencies']['module'] = [
+      'entity_test',
+      'field_layout',
+      'field_layout_test',
+    ];
+    // The layout has been updated.
+    $expected['third_party_settings']['field_layout'] = [
+      'id' => 'test_layout_content_and_footer',
+      'settings' => [],
+    ];
+    // The field remains in its current region instead of moving to the default.
+    $this->assertEntityValues($expected, $entity_display->toArray());
+
+    $this->container->get('module_installer')->uninstall(['field_layout']);
+
+    $entity_storage = $this->container->get('entity_type.manager')->getStorage('entity_view_display');
+    $entity_display = $entity_storage->load('entity_test.entity_test.default');
+
+    // The dependencies have been updated.
+    $expected['dependencies']['module'] = [
+      'entity_test',
+    ];
+    // All field_layout settings were removed.
+    unset($expected['third_party_settings']['field_layout']);
+    // The field has returned to the default content region.
+    $expected['content']['foo']['region'] = 'content';
+    $this->assertEntityValues($expected, $entity_display->toArray());
+  }
+
+  /**
+   * Asserts than an entity has the correct values.
+   *
+   * @param mixed $expected
+   * @param array $values
+   * @param string $message
+   */
+  public static function assertEntityValues($expected, array $values, $message = '') {
+
+    static::assertArrayHasKey('uuid', $values);
+    unset($values['uuid']);
+
+    static::assertEquals($expected, $values, $message);
+  }
+
+}
diff --git a/web/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php b/web/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php
new file mode 100644
index 000000000..8e6bf956c
--- /dev/null
+++ b/web/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php
@@ -0,0 +1,308 @@
+<?php
+
+namespace Drupal\Tests\field_layout\Unit;
+
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\field_layout\Display\EntityDisplayWithLayoutInterface;
+use Drupal\field_layout\FieldLayoutBuilder;
+use Drupal\Core\Layout\LayoutPluginManagerInterface;
+use Drupal\Core\Layout\LayoutDefault;
+use Drupal\Core\Layout\LayoutDefinition;
+use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
+
+/**
+ * @coversDefaultClass \Drupal\field_layout\FieldLayoutBuilder
+ * @group field_layout
+ */
+class FieldLayoutBuilderTest extends UnitTestCase {
+
+  /**
+   * @var \Drupal\Core\Layout\LayoutPluginManager|\Prophecy\Prophecy\ProphecyInterface
+   */
+  protected $layoutPluginManager;
+
+  /**
+   * @var \Drupal\Core\Entity\EntityFieldManagerInterface|\Prophecy\Prophecy\ProphecyInterface
+   */
+  protected $entityFieldManager;
+
+  /**
+   * @var \Drupal\field_layout\FieldLayoutBuilder
+   */
+  protected $fieldLayoutBuilder;
+
+  /**
+   * @var \Drupal\Core\Layout\LayoutInterface
+   */
+  protected $layoutPlugin;
+
+  /**
+   * @var \Drupal\Core\Layout\LayoutDefinition
+   */
+  protected $pluginDefinition;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->pluginDefinition = new LayoutDefinition([
+      'library' => 'field_layout/drupal.layout.twocol',
+      'theme_hook' => 'layout__twocol',
+      'regions' => [
+        'left' => [
+          'label' => 'Left',
+        ],
+        'right' => [
+          'label' => 'Right',
+        ],
+      ],
+    ]);
+    $this->layoutPlugin = new LayoutDefault([], 'two_column', $this->pluginDefinition);
+
+    $this->layoutPluginManager = $this->prophesize(LayoutPluginManagerInterface::class);
+    $this->layoutPluginManager->getDefinition('unknown', FALSE)->willReturn(NULL);
+    $this->layoutPluginManager->getDefinition('two_column', FALSE)->willReturn($this->pluginDefinition);
+
+    $this->entityFieldManager = $this->prophesize(EntityFieldManagerInterface::class);
+
+    $this->fieldLayoutBuilder = new FieldLayoutBuilder($this->layoutPluginManager->reveal(), $this->entityFieldManager->reveal());
+  }
+
+  /**
+   * @covers ::buildView
+   * @covers ::getFields
+   */
+  public function testBuildView() {
+    $definitions = [];
+    $non_configurable_field_definition = $this->prophesize(FieldDefinitionInterface::class);
+    $non_configurable_field_definition->isDisplayConfigurable('view')->willReturn(FALSE);
+    $definitions['non_configurable_field'] = $non_configurable_field_definition->reveal();
+    $definitions['non_configurable_field_with_extra_field'] = $non_configurable_field_definition->reveal();
+    $this->entityFieldManager->getFieldDefinitions('the_entity_type_id', 'the_entity_type_bundle')->willReturn($definitions);
+    $extra_fields = [];
+    $extra_fields['non_configurable_field_with_extra_field'] = [
+      'label' => 'This non-configurable field is also defined in hook_entity_extra_field_info()',
+    ];
+    $this->entityFieldManager->getExtraFields('the_entity_type_id', 'the_entity_type_bundle')->willReturn($extra_fields);
+
+    $build = [
+      'test1' => [
+        '#markup' => 'Test1',
+      ],
+      'non_configurable_field' => [
+        '#markup' => 'Non-configurable',
+      ],
+      'non_configurable_field_with_extra_field' => [
+        '#markup' => 'Non-configurable with extra field',
+      ],
+    ];
+
+    $display = $this->prophesize(EntityDisplayWithLayoutInterface::class);
+    $display->getTargetEntityTypeId()->willReturn('the_entity_type_id');
+    $display->getTargetBundle()->willReturn('the_entity_type_bundle');
+    $display->getLayout()->willReturn($this->layoutPlugin);
+    $display->getLayoutId()->willReturn('two_column');
+    $display->getLayoutSettings()->willReturn([]);
+    $display->getComponents()->willReturn([
+      'test1' => [
+        'region' => 'right',
+      ],
+      'non_configurable_field' => [
+        'region' => 'left',
+      ],
+      'non_configurable_field_with_extra_field' => [
+        'region' => 'left',
+      ],
+    ]);
+
+    $expected = [
+      'non_configurable_field' => [
+        '#markup' => 'Non-configurable',
+      ],
+      '_field_layout' => [
+        'left' => [
+          'non_configurable_field_with_extra_field' => [
+            '#markup' => 'Non-configurable with extra field',
+          ],
+        ],
+        'right' => [
+          'test1' => [
+            '#markup' => 'Test1',
+          ],
+        ],
+        '#settings' => [],
+        '#layout' => $this->pluginDefinition,
+        '#theme' => 'layout__twocol',
+        '#attached' => [
+          'library' => [
+            'field_layout/drupal.layout.twocol',
+          ],
+        ],
+      ],
+    ];
+    $this->fieldLayoutBuilder->buildView($build, $display->reveal());
+    $this->assertEquals($expected, $build);
+    $this->assertSame($expected, $build);
+  }
+
+  /**
+   * @covers ::buildForm
+   * @covers ::getFields
+   */
+  public function testBuildForm() {
+    $definitions = [];
+    $non_configurable_field_definition = $this->prophesize(FieldDefinitionInterface::class);
+    $non_configurable_field_definition->isDisplayConfigurable('form')->willReturn(FALSE);
+    $definitions['non_configurable_field'] = $non_configurable_field_definition->reveal();
+    $this->entityFieldManager->getFieldDefinitions('the_entity_type_id', 'the_entity_type_bundle')->willReturn($definitions);
+    $this->entityFieldManager->getExtraFields('the_entity_type_id', 'the_entity_type_bundle')->willReturn([]);
+
+    $build = [
+      'test1' => [
+        '#markup' => 'Test1',
+      ],
+      'test2' => [
+        '#markup' => 'Test2',
+        '#group' => 'existing_group',
+      ],
+      'field_layout' => [
+        '#markup' => 'Field created through the UI happens to be named "Layout"',
+      ],
+      'non_configurable_field' => [
+        '#markup' => 'Non-configurable',
+      ],
+    ];
+
+    $display = $this->prophesize(EntityDisplayWithLayoutInterface::class);
+    $display->getTargetEntityTypeId()->willReturn('the_entity_type_id');
+    $display->getTargetBundle()->willReturn('the_entity_type_bundle');
+    $display->getLayout()->willReturn($this->layoutPlugin);
+    $display->getLayoutId()->willReturn('two_column');
+    $display->getLayoutSettings()->willReturn([]);
+    $display->getComponents()->willReturn([
+      'test1' => [
+        'region' => 'right',
+      ],
+      'test2' => [
+        'region' => 'left',
+      ],
+      'field_layout' => [
+        'region' => 'right',
+      ],
+      'non_configurable_field' => [
+        'region' => 'left',
+      ],
+    ]);
+
+    $expected = [
+      'test1' => [
+        '#markup' => 'Test1',
+        '#group' => 'right',
+      ],
+      'test2' => [
+        '#markup' => 'Test2',
+        '#group' => 'existing_group',
+      ],
+      'field_layout' => [
+        '#markup' => 'Field created through the UI happens to be named "Layout"',
+        '#group' => 'right',
+      ],
+      'non_configurable_field' => [
+        '#markup' => 'Non-configurable',
+      ],
+      '_field_layout' => [
+        'left' => [
+          '#process' => ['\Drupal\Core\Render\Element\RenderElement::processGroup'],
+          '#pre_render' => ['\Drupal\Core\Render\Element\RenderElement::preRenderGroup'],
+        ],
+        'right' => [
+          '#process' => ['\Drupal\Core\Render\Element\RenderElement::processGroup'],
+          '#pre_render' => ['\Drupal\Core\Render\Element\RenderElement::preRenderGroup'],
+        ],
+        '#settings' => [],
+        '#layout' => $this->pluginDefinition,
+        '#theme' => 'layout__twocol',
+        '#attached' => [
+          'library' => [
+            'field_layout/drupal.layout.twocol',
+          ],
+        ],
+      ],
+    ];
+    $this->fieldLayoutBuilder->buildForm($build, $display->reveal());
+    $this->assertEquals($expected, $build);
+    $this->assertSame($expected, $build);
+  }
+
+  /**
+   * @covers ::buildForm
+   */
+  public function testBuildFormEmpty() {
+    $definitions = [];
+    $non_configurable_field_definition = $this->prophesize(FieldDefinitionInterface::class);
+    $non_configurable_field_definition->isDisplayConfigurable('form')->willReturn(FALSE);
+    $definitions['non_configurable_field'] = $non_configurable_field_definition->reveal();
+    $this->entityFieldManager->getFieldDefinitions('the_entity_type_id', 'the_entity_type_bundle')->willReturn($definitions);
+    $this->entityFieldManager->getExtraFields('the_entity_type_id', 'the_entity_type_bundle')->willReturn([]);
+
+    $build = [
+      'non_configurable_field' => [
+        '#markup' => 'Non-configurable',
+      ],
+    ];
+
+    $display = $this->prophesize(EntityDisplayWithLayoutInterface::class);
+    $display->getTargetEntityTypeId()->willReturn('the_entity_type_id');
+    $display->getTargetBundle()->willReturn('the_entity_type_bundle');
+    $display->getLayout()->willReturn($this->layoutPlugin);
+    $display->getLayoutId()->willReturn('two_column');
+    $display->getLayoutSettings()->willReturn([]);
+    $display->getComponents()->willReturn([
+      'test1' => [
+        'region' => 'right',
+      ],
+      'non_configurable_field' => [
+        'region' => 'left',
+      ],
+    ]);
+
+    $expected = [
+      'non_configurable_field' => [
+        '#markup' => 'Non-configurable',
+      ],
+    ];
+    $this->fieldLayoutBuilder->buildForm($build, $display->reveal());
+    $this->assertSame($expected, $build);
+  }
+
+  /**
+   * @covers ::buildForm
+   */
+  public function testBuildFormNoLayout() {
+    $this->entityFieldManager->getFieldDefinitions(Argument::any(), Argument::any())->shouldNotBeCalled();
+
+    $build = [
+      'test1' => [
+        '#markup' => 'Test1',
+      ],
+    ];
+
+    $display = $this->prophesize(EntityDisplayWithLayoutInterface::class);
+    $display->getLayoutId()->willReturn('unknown');
+    $display->getLayoutSettings()->willReturn([]);
+    $display->getComponents()->shouldNotBeCalled();
+
+    $expected = [
+      'test1' => [
+        '#markup' => 'Test1',
+      ],
+    ];
+    $this->fieldLayoutBuilder->buildForm($build, $display->reveal());
+    $this->assertSame($expected, $build);
+  }
+
+}
diff --git a/web/core/modules/field_ui/field_ui.api.php b/web/core/modules/field_ui/field_ui.api.php
index 28cb246e6..92cbaf270 100644
--- a/web/core/modules/field_ui/field_ui.api.php
+++ b/web/core/modules/field_ui/field_ui.api.php
@@ -30,15 +30,15 @@
  * @see \Drupal\field_ui\DisplayOverView
  */
 function hook_field_formatter_third_party_settings_form(\Drupal\Core\Field\FormatterInterface $plugin, \Drupal\Core\Field\FieldDefinitionInterface $field_definition, $view_mode, $form, \Drupal\Core\Form\FormStateInterface $form_state) {
-  $element = array();
+  $element = [];
   // Add a 'my_setting' checkbox to the settings form for 'foo_formatter' field
   // formatters.
   if ($plugin->getPluginId() == 'foo_formatter') {
-    $element['my_setting'] = array(
+    $element['my_setting'] = [
       '#type' => 'checkbox',
       '#title' => t('My setting'),
       '#default_value' => $plugin->getThirdPartySetting('my_module', 'my_setting'),
-    );
+    ];
   }
   return $element;
 }
@@ -63,15 +63,15 @@ function hook_field_formatter_third_party_settings_form(\Drupal\Core\Field\Forma
  * @see \Drupal\field_ui\FormDisplayOverView
  */
 function hook_field_widget_third_party_settings_form(\Drupal\Core\Field\WidgetInterface $plugin, \Drupal\Core\Field\FieldDefinitionInterface $field_definition, $form_mode, $form, \Drupal\Core\Form\FormStateInterface $form_state) {
-  $element = array();
+  $element = [];
   // Add a 'my_setting' checkbox to the settings form for 'foo_widget' field
   // widgets.
   if ($plugin->getPluginId() == 'foo_widget') {
-    $element['my_setting'] = array(
+    $element['my_setting'] = [
       '#type' => 'checkbox',
       '#title' => t('My setting'),
       '#default_value' => $plugin->getThirdPartySetting('my_module', 'my_setting'),
-    );
+    ];
   }
   return $element;
 }
diff --git a/web/core/modules/field_ui/field_ui.js b/web/core/modules/field_ui/field_ui.js
index a53553dc4..30e983a14 100644
--- a/web/core/modules/field_ui/field_ui.js
+++ b/web/core/modules/field_ui/field_ui.js
@@ -265,11 +265,16 @@
     this.name = data.name;
     this.region = data.region;
     this.tableDrag = data.tableDrag;
+    this.defaultPlugin = data.defaultPlugin;
 
     // Attach change listener to the 'plugin type' select.
-    this.$pluginSelect = $(row).find('select.field-plugin-type');
+    this.$pluginSelect = $(row).find('.field-plugin-type');
     this.$pluginSelect.on('change', Drupal.fieldUIOverview.onChange);
 
+    // Attach change listener to the 'region' select.
+    this.$regionSelect = $(row).find('select.field-region');
+    this.$regionSelect.on('change', Drupal.fieldUIOverview.onChange);
+
     return this;
   };
 
@@ -282,7 +287,7 @@
      *   Either 'hidden' or 'content'.
      */
     getRegion: function () {
-      return (this.$pluginSelect.val() === 'hidden') ? 'hidden' : 'content';
+      return this.$regionSelect.val();
     },
 
     /**
@@ -305,24 +310,16 @@
      *   {@link Drupal.fieldUIOverview.AJAXRefreshRows}.
      */
     regionChange: function (region) {
+      // Replace dashes with underscores.
+      region = region.replace(/-/g, '_');
 
-      // When triggered by a row drag, the 'format' select needs to be adjusted
-      // to the new region.
-      var currentValue = this.$pluginSelect.val();
-      var value;
-      // @TODO Check if this couldn't just be like
-      // if (region !== 'hidden') {
-      if (region === 'content') {
-        if (currentValue === 'hidden') {
-          // Restore the formatter back to the default formatter. Pseudo-fields
-          // do not have default formatters, we just return to 'visible' for
-          // those.
-          value = (typeof this.defaultPlugin !== 'undefined') ? this.defaultPlugin : this.$pluginSelect.find('option').val();
-        }
-      }
-      else {
-        value = 'hidden';
-      }
+      // Set the region of the select list.
+      this.$regionSelect.val(region);
+
+      // Restore the formatter back to the default formatter. Pseudo-fields
+      // do not have default formatters, we just return to 'visible' for
+      // those.
+      var value = (typeof this.defaultPlugin !== 'undefined') ? this.defaultPlugin : this.$pluginSelect.find('option').val();
 
       if (typeof value !== 'undefined') {
         this.$pluginSelect.val(value);
diff --git a/web/core/modules/field_ui/field_ui.module b/web/core/modules/field_ui/field_ui.module
index 5134cad26..79b3f151a 100644
--- a/web/core/modules/field_ui/field_ui.module
+++ b/web/core/modules/field_ui/field_ui.module
@@ -22,7 +22,7 @@ function field_ui_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.field_ui':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Field UI module provides an administrative user interface (UI) for managing and displaying fields. Fields can be attached to most content entity sub-types. Different field types, widgets, and formatters are provided by the modules enabled on your site, and managed by the Field module. For background information and terminology related to fields and entities, see the <a href=":field">Field module help page</a>. For more information about the Field UI, see the <a href=":field_ui_docs">online documentation for the Field UI module</a>.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui_docs' => 'https://www.drupal.org/documentation/modules/field-ui')) . '</p>';
+      $output .= '<p>' . t('The Field UI module provides an administrative user interface (UI) for managing and displaying fields. Fields can be attached to most content entity sub-types. Different field types, widgets, and formatters are provided by the modules enabled on your site, and managed by the Field module. For background information and terminology related to fields and entities, see the <a href=":field">Field module help page</a>. For more information about the Field UI, see the <a href=":field_ui_docs">online documentation for the Field UI module</a>.', [':field' => \Drupal::url('help.page', ['name' => 'field']), ':field_ui_docs' => 'https://www.drupal.org/documentation/modules/field-ui']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Creating a field') . '</dt>';
@@ -34,9 +34,9 @@ function field_ui_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dt>' . t('Configuring field display') . '</dt>';
       $output .= '<dd>' . t('On the <em>Manage display</em> page of your entity type or sub-type, you can configure how each field is displayed by default and in each view mode. If your entity type has multiple view modes, you can toggle between the view modes at the top of the page, and you can toggle whether each view mode uses the default settings or custom settings in the <em>Custom display settings</em> section. For each field in each view mode, you can choose whether and how to display the label of the field from the <em>Label</em> drop-down list. You can also select the formatter to use for display; some formatters have configuration options, which you can edit using the Edit button (which looks like a wheel). You can also change the display order of fields. You can exclude a field from a specific view mode by choosing <em>Hidden</em> from the formatter drop-down list, or by dragging it into the <em>Disabled</em> section.') . '</dd>';
       $output .= '<dt>' . t('Configuring view and form modes') . '</dt>';
-      $output .= '<dd>' . t('You can add, edit, and delete view modes for entities on the <a href=":view_modes">View modes page</a>, and you can add, edit, and delete form modes for entities on the <a href=":form_modes">Form modes page</a>. Once you have defined a view mode or form mode for an entity type, it will be available on the Manage display or Manage form display page for each sub-type of that entity.', array(':view_modes' => \Drupal::url('entity.entity_view_mode.collection'), ':form_modes' => \Drupal::url('entity.entity_form_mode.collection'))) . '</dd>';
+      $output .= '<dd>' . t('You can add, edit, and delete view modes for entities on the <a href=":view_modes">View modes page</a>, and you can add, edit, and delete form modes for entities on the <a href=":form_modes">Form modes page</a>. Once you have defined a view mode or form mode for an entity type, it will be available on the Manage display or Manage form display page for each sub-type of that entity.', [':view_modes' => \Drupal::url('entity.entity_view_mode.collection'), ':form_modes' => \Drupal::url('entity.entity_form_mode.collection')]) . '</dd>';
       $output .= '<dt>' . t('Listing fields') . '</dt>';
-      $output .= '<dd>' . t('There are two reports available that list the fields defined on your site. The <a href=":entity-list" title="Entities field list report">Entities</a> report lists all your fields, showing the field machine names, types, and the entity types or sub-types they are used on (each sub-type links to the Manage fields page). If the <a href=":views">Views</a> and <a href=":views-ui">Views UI</a> modules are enabled, the <a href=":views-list" title="Used in views field list report">Used in views</a> report lists each field that is used in a view, with a link to edit that view.', array(':entity-list' => \Drupal::url('entity.field_storage_config.collection'), ':views-list' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('views_ui.reports_fields') : '#', ':views' => (\Drupal::moduleHandler()->moduleExists('views')) ? \Drupal::url('help.page', array('name' => 'views')) : '#', ':views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('help.page', array('name' => 'views_ui')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('There are two reports available that list the fields defined on your site. The <a href=":entity-list" title="Entities field list report">Entities</a> report lists all your fields, showing the field machine names, types, and the entity types or sub-types they are used on (each sub-type links to the Manage fields page). If the <a href=":views">Views</a> and <a href=":views-ui">Views UI</a> modules are enabled, the <a href=":views-list" title="Used in views field list report">Used in views</a> report lists each field that is used in a view, with a link to edit that view.', [':entity-list' => \Drupal::url('entity.field_storage_config.collection'), ':views-list' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('views_ui.reports_fields') : '#', ':views' => (\Drupal::moduleHandler()->moduleExists('views')) ? \Drupal::url('help.page', ['name' => 'views']) : '#', ':views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('help.page', ['name' => 'views_ui']) : '#']) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -49,21 +49,21 @@ function field_ui_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function field_ui_theme() {
-  return array(
-    'field_ui_table' => array(
-      'variables' => array(
+  return [
+    'field_ui_table' => [
+      'variables' => [
         'header' => NULL,
         'rows' => NULL,
         'footer' => NULL,
-        'attributes' => array(),
+        'attributes' => [],
         'caption' => NULL,
-        'colgroups' => array(),
+        'colgroups' => [],
         'sticky' => FALSE,
         'responsive' => TRUE,
         'empty' => '',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 }
 
 /**
@@ -138,38 +138,38 @@ function field_ui_form_node_type_form_alter(&$form, FormStateInterface $form_sta
  * Implements hook_entity_operation().
  */
 function field_ui_entity_operation(EntityInterface $entity) {
-  $operations = array();
+  $operations = [];
   $info = $entity->getEntityType();
   // Add manage fields and display links if this entity type is the bundle
   // of another and that type has field UI enabled.
   if (($bundle_of = $info->getBundleOf()) && \Drupal::entityManager()->getDefinition($bundle_of)->get('field_ui_base_route')) {
     $account = \Drupal::currentUser();
     if ($account->hasPermission('administer ' . $bundle_of . ' fields')) {
-      $operations['manage-fields'] = array(
+      $operations['manage-fields'] = [
         'title' => t('Manage fields'),
         'weight' => 15,
-        'url' => Url::fromRoute("entity.{$bundle_of}.field_ui_fields", array(
+        'url' => Url::fromRoute("entity.{$bundle_of}.field_ui_fields", [
           $entity->getEntityTypeId() => $entity->id(),
-        )),
-      );
+        ]),
+      ];
     }
     if ($account->hasPermission('administer ' . $bundle_of . ' form display')) {
-      $operations['manage-form-display'] = array(
+      $operations['manage-form-display'] = [
         'title' => t('Manage form display'),
         'weight' => 20,
-        'url' => Url::fromRoute("entity.entity_form_display.{$bundle_of}.default", array(
+        'url' => Url::fromRoute("entity.entity_form_display.{$bundle_of}.default", [
           $entity->getEntityTypeId() => $entity->id(),
-        )),
-      );
+        ]),
+      ];
     }
     if ($account->hasPermission('administer ' . $bundle_of . ' display')) {
-      $operations['manage-display'] = array(
+      $operations['manage-display'] = [
         'title' => t('Manage display'),
         'weight' => 25,
-        'url' => Url::fromRoute("entity.entity_view_display.{$bundle_of}.default", array(
+        'url' => Url::fromRoute("entity.entity_view_display.{$bundle_of}.default", [
           $entity->getEntityTypeId() => $entity->id(),
-        )),
-      );
+        ]),
+      ];
     }
   }
 
diff --git a/web/core/modules/field_ui/src/Controller/EntityDisplayModeController.php b/web/core/modules/field_ui/src/Controller/EntityDisplayModeController.php
index 545e1911a..b4a608acd 100644
--- a/web/core/modules/field_ui/src/Controller/EntityDisplayModeController.php
+++ b/web/core/modules/field_ui/src/Controller/EntityDisplayModeController.php
@@ -17,20 +17,20 @@ class EntityDisplayModeController extends ControllerBase {
    *   A list of entity types to add a view mode for.
    */
   public function viewModeTypeSelection() {
-    $entity_types = array();
+    $entity_types = [];
     foreach ($this->entityManager()->getDefinitions() as $entity_type_id => $entity_type) {
       if ($entity_type->get('field_ui_base_route') && $entity_type->hasViewBuilderClass()) {
-        $entity_types[$entity_type_id] = array(
+        $entity_types[$entity_type_id] = [
           'title' => $entity_type->getLabel(),
-          'url' => Url::fromRoute('entity.entity_view_mode.add_form', array('entity_type_id' => $entity_type_id)),
-          'localized_options' => array(),
-        );
+          'url' => Url::fromRoute('entity.entity_view_mode.add_form', ['entity_type_id' => $entity_type_id]),
+          'localized_options' => [],
+        ];
       }
     }
-    return array(
+    return [
       '#theme' => 'admin_block_content',
       '#content' => $entity_types,
-    );
+    ];
   }
 
   /**
@@ -40,20 +40,20 @@ class EntityDisplayModeController extends ControllerBase {
    *   A list of entity types to add a form mode for.
    */
   public function formModeTypeSelection() {
-    $entity_types = array();
+    $entity_types = [];
     foreach ($this->entityManager()->getDefinitions() as $entity_type_id => $entity_type) {
       if ($entity_type->get('field_ui_base_route') && $entity_type->hasFormClasses()) {
-        $entity_types[$entity_type_id] = array(
+        $entity_types[$entity_type_id] = [
           'title' => $entity_type->getLabel(),
-          'url' => Url::fromRoute('entity.entity_form_mode.add_form', array('entity_type_id' => $entity_type_id)),
-          'localized_options' => array(),
-        );
+          'url' => Url::fromRoute('entity.entity_form_mode.add_form', ['entity_type_id' => $entity_type_id]),
+          'localized_options' => [],
+        ];
       }
     }
-    return array(
+    return [
       '#theme' => 'admin_block_content',
       '#content' => $entity_types,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/field_ui/src/Element/FieldUiTable.php b/web/core/modules/field_ui/src/Element/FieldUiTable.php
index 05d5d04e5..f8f314675 100644
--- a/web/core/modules/field_ui/src/Element/FieldUiTable.php
+++ b/web/core/modules/field_ui/src/Element/FieldUiTable.php
@@ -42,7 +42,7 @@ class FieldUiTable extends Table {
    * @see \Drupal\Core\Render\Element\Table::preRenderTable()
    */
   public static function tablePreRender($elements) {
-    $js_settings = array();
+    $js_settings = [];
 
     // For each region, build the tree structure from the weight and parenting
     // data contained in the flat form structure, to determine row order and
diff --git a/web/core/modules/field_ui/src/EntityDisplayModeListBuilder.php b/web/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
index d02505536..c9d896627 100644
--- a/web/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
+++ b/web/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
@@ -71,7 +71,7 @@ class EntityDisplayModeListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function load() {
-    $entities = array();
+    $entities = [];
     foreach (parent::load() as $entity) {
       $entities[$entity->getTargetType()][] = $entity;
     }
@@ -82,7 +82,7 @@ class EntityDisplayModeListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function render() {
-    $build = array();
+    $build = [];
     foreach ($this->load() as $entity_type => $entities) {
       if (!isset($this->entityTypes[$entity_type])) {
         continue;
@@ -93,12 +93,12 @@ class EntityDisplayModeListBuilder extends ConfigEntityListBuilder {
         continue;
       }
 
-      $table = array(
+      $table = [
         '#prefix' => '<h2>' . $this->entityTypes[$entity_type]->getLabel() . '</h2>',
         '#type' => 'table',
         '#header' => $this->buildHeader(),
-        '#rows' => array(),
-      );
+        '#rows' => [],
+      ];
       foreach ($entities as $entity) {
         if ($row = $this->buildRow($entity)) {
           $table['#rows'][$entity->id()] = $row;
@@ -110,15 +110,15 @@ class EntityDisplayModeListBuilder extends ConfigEntityListBuilder {
         $table['#weight'] = -10;
       }
 
-      $short_type = str_replace(array('entity_', '_mode'), '', $this->entityTypeId);
-      $table['#rows']['_add_new'][] = array(
-        'data' => array(
+      $short_type = str_replace(['entity_', '_mode'], '', $this->entityTypeId);
+      $table['#rows']['_add_new'][] = [
+        'data' => [
           '#type' => 'link',
           '#url' => Url::fromRoute($short_type == 'view' ? 'entity.entity_view_mode.add_form' : 'entity.entity_form_mode.add_form', ['entity_type_id' => $entity_type]),
-          '#title' => $this->t('Add new %label @entity-type', array('%label' => $this->entityTypes[$entity_type]->getLabel(), '@entity-type' => $this->entityType->getLowercaseLabel())),
-        ),
+          '#title' => $this->t('Add new %label @entity-type', ['%label' => $this->entityTypes[$entity_type]->getLabel(), '@entity-type' => $this->entityType->getLowercaseLabel()]),
+        ],
         'colspan' => count($table['#header']),
-      );
+      ];
       $build[$entity_type] = $table;
     }
     return $build;
diff --git a/web/core/modules/field_ui/src/FieldConfigListBuilder.php b/web/core/modules/field_ui/src/FieldConfigListBuilder.php
index c8739daef..7a6960e40 100644
--- a/web/core/modules/field_ui/src/FieldConfigListBuilder.php
+++ b/web/core/modules/field_ui/src/FieldConfigListBuilder.php
@@ -93,7 +93,7 @@ class FieldConfigListBuilder extends ConfigEntityListBuilder {
 
     // Sort the entities using the entity class's sort() method.
     // See \Drupal\Core\Config\Entity\ConfigEntityBase::sort().
-    uasort($entities, array($this->entityType->getClass(), 'sort'));
+    uasort($entities, [$this->entityType->getClass(), 'sort']);
     return $entities;
   }
 
@@ -101,14 +101,14 @@ class FieldConfigListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header = array(
+    $header = [
       'label' => $this->t('Label'),
-      'field_name' => array(
+      'field_name' => [
         'data' => $this->t('Machine name'),
-        'class' => array(RESPONSIVE_PRIORITY_MEDIUM),
-      ),
+        'class' => [RESPONSIVE_PRIORITY_MEDIUM],
+      ],
       'field_type' => $this->t('Field type'),
-    );
+    ];
     return $header + parent::buildHeader();
   }
 
@@ -118,31 +118,31 @@ class FieldConfigListBuilder extends ConfigEntityListBuilder {
   public function buildRow(EntityInterface $field_config) {
     /** @var \Drupal\field\FieldConfigInterface $field_config */
     $field_storage = $field_config->getFieldStorageDefinition();
-    $route_parameters = array(
+    $route_parameters = [
       'field_config' => $field_config->id(),
-    ) + FieldUI::getRouteBundleParameter($this->entityManager->getDefinition($this->targetEntityTypeId), $this->targetBundle);
+    ] + FieldUI::getRouteBundleParameter($this->entityManager->getDefinition($this->targetEntityTypeId), $this->targetBundle);
 
-    $row = array(
+    $row = [
       'id' => Html::getClass($field_config->getName()),
-      'data' => array(
+      'data' => [
         'label' => $field_config->getLabel(),
         'field_name' => $field_config->getName(),
-        'field_type' => array(
-          'data' => array(
+        'field_type' => [
+          'data' => [
             '#type' => 'link',
             '#title' => $this->fieldTypeManager->getDefinitions()[$field_storage->getType()]['label'],
             '#url' => Url::fromRoute("entity.field_config.{$this->targetEntityTypeId}_storage_edit_form", $route_parameters),
-            '#options' => array('attributes' => array('title' => $this->t('Edit field settings.'))),
-          ),
-        ),
-      ),
-    );
+            '#options' => ['attributes' => ['title' => $this->t('Edit field settings.')]],
+          ],
+        ],
+      ],
+    ];
 
     // Add the operations.
     $row['data'] = $row['data'] + parent::buildRow($field_config);
 
     if ($field_storage->isLocked()) {
-      $row['data']['operations'] = array('data' => array('#markup' => $this->t('Locked')));
+      $row['data']['operations'] = ['data' => ['#markup' => $this->t('Locked')]];
       $row['class'][] = 'menu-disabled';
     }
 
@@ -157,26 +157,26 @@ class FieldConfigListBuilder extends ConfigEntityListBuilder {
     $operations = parent::getDefaultOperations($entity);
 
     if ($entity->access('update') && $entity->hasLinkTemplate("{$entity->getTargetEntityTypeId()}-field-edit-form")) {
-      $operations['edit'] = array(
+      $operations['edit'] = [
         'title' => $this->t('Edit'),
         'weight' => 10,
         'url' => $entity->urlInfo("{$entity->getTargetEntityTypeId()}-field-edit-form"),
-      );
+      ];
     }
     if ($entity->access('delete') && $entity->hasLinkTemplate("{$entity->getTargetEntityTypeId()}-field-delete-form")) {
-      $operations['delete'] = array(
+      $operations['delete'] = [
         'title' => $this->t('Delete'),
         'weight' => 100,
         'url' => $entity->urlInfo("{$entity->getTargetEntityTypeId()}-field-delete-form"),
-      );
+      ];
     }
 
-    $operations['storage-settings'] = array(
+    $operations['storage-settings'] = [
       'title' => $this->t('Storage settings'),
       'weight' => 20,
-      'attributes' => array('title' => $this->t('Edit storage settings.')),
+      'attributes' => ['title' => $this->t('Edit storage settings.')],
       'url' => $entity->urlInfo("{$entity->getTargetEntityTypeId()}-storage-edit-form"),
-    );
+    ];
     $operations['edit']['attributes']['title'] = $this->t('Edit field settings.');
     $operations['delete']['attributes']['title'] = $this->t('Delete field.');
 
diff --git a/web/core/modules/field_ui/src/FieldStorageConfigListBuilder.php b/web/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
index e39954c7b..f82bd9df1 100644
--- a/web/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
+++ b/web/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
@@ -82,10 +82,10 @@ class FieldStorageConfigListBuilder extends ConfigEntityListBuilder {
    */
   public function buildHeader() {
     $header['id'] = $this->t('Field name');
-    $header['type'] = array(
+    $header['type'] = [
       'data' => $this->t('Field type'),
-      'class' => array(RESPONSIVE_PRIORITY_MEDIUM),
-    );
+      'class' => [RESPONSIVE_PRIORITY_MEDIUM],
+    ];
     $header['usage'] = $this->t('Used in');
     return $header;
   }
@@ -95,17 +95,17 @@ class FieldStorageConfigListBuilder extends ConfigEntityListBuilder {
    */
   public function buildRow(EntityInterface $field_storage) {
     if ($field_storage->isLocked()) {
-      $row['class'] = array('menu-disabled');
-      $row['data']['id'] = $this->t('@field_name (Locked)', array('@field_name' => $field_storage->getName()));
+      $row['class'] = ['menu-disabled'];
+      $row['data']['id'] = $this->t('@field_name (Locked)', ['@field_name' => $field_storage->getName()]);
     }
     else {
       $row['data']['id'] = $field_storage->getName();
     }
 
     $field_type = $this->fieldTypes[$field_storage->getType()];
-    $row['data']['type'] = $this->t('@type (module: @module)', array('@type' => $field_type['label'], '@module' => $field_type['provider']));
+    $row['data']['type'] = $this->t('@type (module: @module)', ['@type' => $field_type['label'], '@module' => $field_type['provider']]);
 
-    $usage = array();
+    $usage = [];
     foreach ($field_storage->getBundles() as $bundle) {
       $entity_type_id = $field_storage->getTargetEntityTypeId();
       if ($route_info = FieldUI::getOverviewRouteInfo($entity_type_id, $bundle)) {
diff --git a/web/core/modules/field_ui/src/FieldUI.php b/web/core/modules/field_ui/src/FieldUI.php
index b34169477..b9351a4b7 100644
--- a/web/core/modules/field_ui/src/FieldUI.php
+++ b/web/core/modules/field_ui/src/FieldUI.php
@@ -47,9 +47,9 @@ class FieldUI {
     $next_destination = array_shift($destinations);
     if (is_array($next_destination)) {
       $next_destination['options']['query']['destinations'] = $destinations;
-      $next_destination += array(
-        'route_parameters' => array(),
-      );
+      $next_destination += [
+        'route_parameters' => [],
+      ];
       $next_destination = Url::fromRoute($next_destination['route_name'], $next_destination['route_parameters'], $next_destination['options']);
     }
     else {
@@ -77,7 +77,7 @@ class FieldUI {
    */
   public static function getRouteBundleParameter(EntityTypeInterface $entity_type, $bundle) {
     $bundle_parameter_key = $entity_type->getBundleEntityType() ?: 'bundle';
-    return array($bundle_parameter_key => $bundle);
+    return [$bundle_parameter_key => $bundle];
   }
 
 }
diff --git a/web/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/web/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index 586f1ef39..62a46b1c1 100644
--- a/web/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/web/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -90,17 +90,17 @@ abstract class EntityDisplayFormBase extends EntityForm {
    *   @endcode
    */
   public function getRegions() {
-    return array(
-      'content' => array(
+    return [
+      'content' => [
         'title' => $this->t('Content'),
         'invisible' => TRUE,
         'message' => $this->t('No field is displayed.')
-      ),
-      'hidden' => array(
-        'title' => $this->t('Disabled', array(), array('context' => 'Plural')),
+      ],
+      'hidden' => [
+        'title' => $this->t('Disabled', [], ['context' => 'Plural']),
         'message' => $this->t('No field is hidden.')
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -110,7 +110,7 @@ abstract class EntityDisplayFormBase extends EntityForm {
    *   An array containing the region options.
    */
   public function getRegionOptions() {
-    $options = array();
+    $options = [];
     foreach ($this->getRegions() as $region => $data) {
       $options[$region] = $data['title'];
     }
@@ -139,41 +139,48 @@ abstract class EntityDisplayFormBase extends EntityForm {
     $field_definitions = $this->getFieldDefinitions();
     $extra_fields = $this->getExtraFields();
 
-    $form += array(
+    $form += [
       '#entity_type' => $this->entity->getTargetEntityTypeId(),
       '#bundle' => $this->entity->getTargetBundle(),
       '#fields' => array_keys($field_definitions),
       '#extra' => array_keys($extra_fields),
-    );
+    ];
 
     if (empty($field_definitions) && empty($extra_fields) && $route_info = FieldUI::getOverviewRouteInfo($this->entity->getTargetEntityTypeId(), $this->entity->getTargetBundle())) {
-      drupal_set_message($this->t('There are no fields yet added. You can add new fields on the <a href=":link">Manage fields</a> page.', array(':link' => $route_info->toString())), 'warning');
+      drupal_set_message($this->t('There are no fields yet added. You can add new fields on the <a href=":link">Manage fields</a> page.', [':link' => $route_info->toString()]), 'warning');
       return $form;
     }
 
-    $table = array(
+    $table = [
       '#type' => 'field_ui_table',
       '#header' => $this->getTableHeader(),
       '#regions' => $this->getRegions(),
-      '#attributes' => array(
-        'class' => array('field-ui-overview'),
+      '#attributes' => [
+        'class' => ['field-ui-overview'],
         'id' => 'field-display-overview',
-      ),
-      '#tabledrag' => array(
-        array(
+      ],
+      '#tabledrag' => [
+        [
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'field-weight',
-        ),
-        array(
+        ],
+        [
           'action' => 'match',
           'relationship' => 'parent',
           'group' => 'field-parent',
           'subgroup' => 'field-parent',
           'source' => 'field-name',
-        ),
-      ),
-    );
+        ],
+        [
+          'action' => 'match',
+          'relationship' => 'parent',
+          'group' => 'field-region',
+          'subgroup' => 'field-region',
+          'source' => 'field-name',
+        ],
+      ],
+    ];
 
     // Field rows.
     foreach ($field_definitions as $field_name => $field_definition) {
@@ -194,21 +201,21 @@ abstract class EntityDisplayFormBase extends EntityForm {
       // Unset default option.
       unset($display_mode_options['default']);
       if ($display_mode_options) {
-        $form['modes'] = array(
+        $form['modes'] = [
           '#type' => 'details',
           '#title' => $this->t('Custom display settings'),
-        );
+        ];
         // Prepare default values for the 'Custom display settings' checkboxes.
-        $default = array();
+        $default = [];
         if ($enabled_displays = array_filter($this->getDisplayStatuses())) {
           $default = array_keys(array_intersect_key($display_mode_options, $enabled_displays));
         }
-        $form['modes']['display_modes_custom'] = array(
+        $form['modes']['display_modes_custom'] = [
           '#type' => 'checkboxes',
           '#title' => $this->t('Use custom display settings for the following @display_context modes', ['@display_context' => $this->displayContext]),
           '#options' => $display_mode_options,
           '#default_value' => $default,
-        );
+        ];
         // Provide link to manage display modes.
         $form['modes']['display_modes_link'] = $this->getDisplayModesLink();
       }
@@ -220,29 +227,29 @@ abstract class EntityDisplayFormBase extends EntityForm {
     // the selects, but triggered by the client-side script through a hidden
     // #ajax 'Refresh' button. A hidden 'refresh_rows' input tracks the name of
     // affected rows.
-    $form['refresh_rows'] = array('#type' => 'hidden');
-    $form['refresh'] = array(
+    $form['refresh_rows'] = ['#type' => 'hidden'];
+    $form['refresh'] = [
       '#type' => 'submit',
       '#value' => $this->t('Refresh'),
       '#op' => 'refresh_table',
-      '#submit' => array('::multistepSubmit'),
-      '#ajax' => array(
+      '#submit' => ['::multistepSubmit'],
+      '#ajax' => [
         'callback' => '::multistepAjax',
         'wrapper' => 'field-display-overview-wrapper',
         'effect' => 'fade',
         // The button stays hidden, so we hide the Ajax spinner too. Ad-hoc
         // spinners will be added manually by the client-side script.
         'progress' => 'none',
-      ),
-      '#attributes' => array('class' => array('visually-hidden'))
-    );
+      ],
+      '#attributes' => ['class' => ['visually-hidden']]
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#button_type' => 'primary',
       '#value' => $this->t('Save'),
-    );
+    ];
 
     $form['#attached']['library'][] = 'field_ui/drupal.field_ui';
 
@@ -274,74 +281,82 @@ abstract class EntityDisplayFormBase extends EntityForm {
     }
 
     $regions = array_keys($this->getRegions());
-    $field_row = array(
-      '#attributes' => array('class' => array('draggable', 'tabledrag-leaf')),
+    $field_row = [
+      '#attributes' => ['class' => ['draggable', 'tabledrag-leaf']],
       '#row_type' => 'field',
-      '#region_callback' => array($this, 'getRowRegion'),
-      '#js_settings' => array(
+      '#region_callback' => [$this, 'getRowRegion'],
+      '#js_settings' => [
         'rowHandler' => 'field',
         'defaultPlugin' => $this->getDefaultPlugin($field_definition->getType()),
-      ),
-      'human_name' => array(
+      ],
+      'human_name' => [
         '#plain_text' => $label,
-      ),
-      'weight' => array(
+      ],
+      'weight' => [
         '#type' => 'textfield',
-        '#title' => $this->t('Weight for @title', array('@title' => $label)),
+        '#title' => $this->t('Weight for @title', ['@title' => $label]),
         '#title_display' => 'invisible',
         '#default_value' => $display_options ? $display_options['weight'] : '0',
         '#size' => 3,
-        '#attributes' => array('class' => array('field-weight')),
-      ),
-      'parent_wrapper' => array(
-        'parent' => array(
+        '#attributes' => ['class' => ['field-weight']],
+      ],
+      'parent_wrapper' => [
+        'parent' => [
           '#type' => 'select',
-          '#title' => $this->t('Label display for @title', array('@title' => $label)),
+          '#title' => $this->t('Label display for @title', ['@title' => $label]),
           '#title_display' => 'invisible',
           '#options' => array_combine($regions, $regions),
           '#empty_value' => '',
-          '#attributes' => array('class' => array('js-field-parent', 'field-parent')),
-          '#parents' => array('fields', $field_name, 'parent'),
-        ),
-        'hidden_name' => array(
+          '#attributes' => ['class' => ['js-field-parent', 'field-parent']],
+          '#parents' => ['fields', $field_name, 'parent'],
+        ],
+        'hidden_name' => [
           '#type' => 'hidden',
           '#default_value' => $field_name,
-          '#attributes' => array('class' => array('field-name')),
-        ),
-      ),
-    );
-
-    $field_row['plugin'] = array(
-      'type' => array(
+          '#attributes' => ['class' => ['field-name']],
+        ],
+      ],
+      'region' => [
         '#type' => 'select',
-        '#title' => $this->t('Plugin for @title', array('@title' => $label)),
+        '#title' => $this->t('Region for @title', ['@title' => $label]),
         '#title_display' => 'invisible',
-        '#options' => $this->getPluginOptions($field_definition),
+        '#options' => $this->getRegionOptions(),
+        '#default_value' => $display_options ? $display_options['region'] : 'hidden',
+        '#attributes' => ['class' => ['field-region']],
+      ],
+    ];
+
+    $field_row['plugin'] = [
+      'type' => [
+        '#type' => 'select',
+        '#title' => $this->t('Plugin for @title', ['@title' => $label]),
+        '#title_display' => 'invisible',
+        '#options' => $this->getApplicablePluginOptions($field_definition),
         '#default_value' => $display_options ? $display_options['type'] : 'hidden',
-        '#parents' => array('fields', $field_name, 'type'),
-        '#attributes' => array('class' => array('field-plugin-type')),
-      ),
-      'settings_edit_form' => array(),
-    );
+        '#parents' => ['fields', $field_name, 'type'],
+        '#attributes' => ['class' => ['field-plugin-type']],
+      ],
+      'settings_edit_form' => [],
+    ];
 
     // Get the corresponding plugin object.
     $plugin = $this->entity->getRenderer($field_name);
 
     // Base button element for the various plugin settings actions.
-    $base_button = array(
-      '#submit' => array('::multistepSubmit'),
-      '#ajax' => array(
+    $base_button = [
+      '#submit' => ['::multistepSubmit'],
+      '#ajax' => [
         'callback' => '::multistepAjax',
         'wrapper' => 'field-display-overview-wrapper',
         'effect' => 'fade',
-      ),
+      ],
       '#field_name' => $field_name,
-    );
+    ];
 
     if ($form_state->get('plugin_settings_edit') == $field_name) {
       // We are currently editing this field's plugin settings. Display the
       // settings form and submit buttons.
-      $field_row['plugin']['settings_edit_form'] = array();
+      $field_row['plugin']['settings_edit_form'] = [];
 
       if ($plugin) {
         // Generate the settings form and allow other modules to alter it.
@@ -349,43 +364,43 @@ abstract class EntityDisplayFormBase extends EntityForm {
         $third_party_settings_form = $this->thirdPartySettingsForm($plugin, $field_definition, $form, $form_state);
 
         if ($settings_form || $third_party_settings_form) {
-          $field_row['plugin']['#cell_attributes'] = array('colspan' => 3);
-          $field_row['plugin']['settings_edit_form'] = array(
+          $field_row['plugin']['#cell_attributes'] = ['colspan' => 3];
+          $field_row['plugin']['settings_edit_form'] = [
             '#type' => 'container',
-            '#attributes' => array('class' => array('field-plugin-settings-edit-form')),
-            '#parents' => array('fields', $field_name, 'settings_edit_form'),
-            'label' => array(
+            '#attributes' => ['class' => ['field-plugin-settings-edit-form']],
+            '#parents' => ['fields', $field_name, 'settings_edit_form'],
+            'label' => [
               '#markup' => $this->t('Plugin settings'),
-            ),
+            ],
             'settings' => $settings_form,
             'third_party_settings' => $third_party_settings_form,
-            'actions' => array(
+            'actions' => [
               '#type' => 'actions',
-              'save_settings' => $base_button + array(
+              'save_settings' => $base_button + [
                 '#type' => 'submit',
                 '#button_type' => 'primary',
                 '#name' => $field_name . '_plugin_settings_update',
                 '#value' => $this->t('Update'),
                 '#op' => 'update',
-              ),
-              'cancel_settings' => $base_button + array(
+              ],
+              'cancel_settings' => $base_button + [
                 '#type' => 'submit',
                 '#name' => $field_name . '_plugin_settings_cancel',
                 '#value' => $this->t('Cancel'),
                 '#op' => 'cancel',
                 // Do not check errors for the 'Cancel' button, but make sure we
                 // get the value of the 'plugin type' select.
-                '#limit_validation_errors' => array(array('fields', $field_name, 'type')),
-              ),
-            ),
-          );
+                '#limit_validation_errors' => [['fields', $field_name, 'type']],
+              ],
+            ],
+          ];
           $field_row['#attributes']['class'][] = 'field-plugin-settings-editing';
         }
       }
     }
     else {
-      $field_row['settings_summary'] = array();
-      $field_row['settings_edit'] = array();
+      $field_row['settings_summary'] = [];
+      $field_row['settings_edit'] = [];
 
       if ($plugin) {
         // Display a summary of the current plugin settings, and (if the
@@ -396,30 +411,30 @@ abstract class EntityDisplayFormBase extends EntityForm {
         $this->alterSettingsSummary($summary, $plugin, $field_definition);
 
         if (!empty($summary)) {
-          $field_row['settings_summary'] = array(
+          $field_row['settings_summary'] = [
             '#type' => 'inline_template',
             '#template' => '<div class="field-plugin-summary">{{ summary|safe_join("<br />") }}</div>',
-            '#context' => array('summary' => $summary),
-            '#cell_attributes' => array('class' => array('field-plugin-summary-cell')),
-          );
+            '#context' => ['summary' => $summary],
+            '#cell_attributes' => ['class' => ['field-plugin-summary-cell']],
+          ];
         }
 
         // Check selected plugin settings to display edit link or not.
         $settings_form = $plugin->settingsForm($form, $form_state);
         $third_party_settings_form = $this->thirdPartySettingsForm($plugin, $field_definition, $form, $form_state);
         if (!empty($settings_form) || !empty($third_party_settings_form)) {
-          $field_row['settings_edit'] = $base_button + array(
+          $field_row['settings_edit'] = $base_button + [
             '#type' => 'image_button',
             '#name' => $field_name . '_settings_edit',
             '#src' => 'core/misc/icons/787878/cog.svg',
-            '#attributes' => array('class' => array('field-plugin-settings-edit'), 'alt' => $this->t('Edit')),
+            '#attributes' => ['class' => ['field-plugin-settings-edit'], 'alt' => $this->t('Edit')],
             '#op' => 'edit',
             // Do not check errors for the 'Edit' button, but make sure we get
             // the value of the 'plugin type' select.
-            '#limit_validation_errors' => array(array('fields', $field_name, 'type')),
+            '#limit_validation_errors' => [['fields', $field_name, 'type']],
             '#prefix' => '<div class="field-plugin-settings-edit-wrapper">',
             '#suffix' => '</div>',
-          );
+          ];
         }
       }
     }
@@ -442,52 +457,57 @@ abstract class EntityDisplayFormBase extends EntityForm {
     $display_options = $this->entity->getComponent($field_id);
 
     $regions = array_keys($this->getRegions());
-    $extra_field_row = array(
-      '#attributes' => array('class' => array('draggable', 'tabledrag-leaf')),
+    $extra_field_row = [
+      '#attributes' => ['class' => ['draggable', 'tabledrag-leaf']],
       '#row_type' => 'extra_field',
-      '#region_callback' => array($this, 'getRowRegion'),
-      '#js_settings' => array('rowHandler' => 'field'),
-      'human_name' => array(
+      '#region_callback' => [$this, 'getRowRegion'],
+      '#js_settings' => ['rowHandler' => 'field'],
+      'human_name' => [
         '#markup' => $extra_field['label'],
-      ),
-      'weight' => array(
+      ],
+      'weight' => [
         '#type' => 'textfield',
-        '#title' => $this->t('Weight for @title', array('@title' => $extra_field['label'])),
+        '#title' => $this->t('Weight for @title', ['@title' => $extra_field['label']]),
         '#title_display' => 'invisible',
         '#default_value' => $display_options ? $display_options['weight'] : 0,
         '#size' => 3,
-        '#attributes' => array('class' => array('field-weight')),
-      ),
-      'parent_wrapper' => array(
-        'parent' => array(
+        '#attributes' => ['class' => ['field-weight']],
+      ],
+      'parent_wrapper' => [
+        'parent' => [
           '#type' => 'select',
-          '#title' => $this->t('Parents for @title', array('@title' => $extra_field['label'])),
+          '#title' => $this->t('Parents for @title', ['@title' => $extra_field['label']]),
           '#title_display' => 'invisible',
           '#options' => array_combine($regions, $regions),
           '#empty_value' => '',
-          '#attributes' => array('class' => array('js-field-parent', 'field-parent')),
-          '#parents' => array('fields', $field_id, 'parent'),
-        ),
-        'hidden_name' => array(
+          '#attributes' => ['class' => ['js-field-parent', 'field-parent']],
+          '#parents' => ['fields', $field_id, 'parent'],
+        ],
+        'hidden_name' => [
           '#type' => 'hidden',
           '#default_value' => $field_id,
-          '#attributes' => array('class' => array('field-name')),
-        ),
-      ),
-      'plugin' => array(
-        'type' => array(
-          '#type' => 'select',
-          '#title' => $this->t('Visibility for @title', array('@title' => $extra_field['label'])),
-          '#title_display' => 'invisible',
-          '#options' => $this->getExtraFieldVisibilityOptions(),
-          '#default_value' => $display_options ? 'visible' : 'hidden',
-          '#parents' => array('fields', $field_id, 'type'),
-          '#attributes' => array('class' => array('field-plugin-type')),
-        ),
-      ),
-      'settings_summary' => array(),
-      'settings_edit' => array(),
-    );
+          '#attributes' => ['class' => ['field-name']],
+        ],
+      ],
+      'region' => [
+        '#type' => 'select',
+        '#title' => $this->t('Region for @title', ['@title' => $extra_field['label']]),
+        '#title_display' => 'invisible',
+        '#options' => $this->getRegionOptions(),
+        '#default_value' => $display_options ? $display_options['region'] : 'hidden',
+        '#attributes' => ['class' => ['field-region']],
+      ],
+      'plugin' => [
+        'type' => [
+          '#type' => 'hidden',
+          '#value' => $display_options ? 'visible' : 'hidden',
+          '#parents' => ['fields', $field_id, 'type'],
+          '#attributes' => ['class' => ['field-plugin-type']],
+        ],
+      ],
+      'settings_summary' => [],
+      'settings_edit' => [],
+    ];
 
     return $extra_field_row;
   }
@@ -511,7 +531,7 @@ abstract class EntityDisplayFormBase extends EntityForm {
       $display_modes = $this->getDisplayModes();
       $current_statuses = $this->getDisplayStatuses();
 
-      $statuses = array();
+      $statuses = [];
       foreach ($form_values['display_modes_custom'] as $mode => $value) {
         if (!empty($value) && empty($current_statuses[$mode])) {
           // If no display exists for the newly enabled view mode, initialize
@@ -550,7 +570,7 @@ abstract class EntityDisplayFormBase extends EntityForm {
     foreach ($form['#fields'] as $field_name) {
       $values = $form_values['fields'][$field_name];
 
-      if ($values['type'] == 'hidden') {
+      if ($values['region'] == 'hidden') {
         $entity->removeComponent($field_name);
       }
       else {
@@ -567,6 +587,7 @@ abstract class EntityDisplayFormBase extends EntityForm {
 
         $options['type'] = $values['type'];
         $options['weight'] = $values['weight'];
+        $options['region'] = $values['region'];
         // Only formatters have configurable label visibility.
         if (isset($values['label'])) {
           $options['label'] = $values['label'];
@@ -577,13 +598,14 @@ abstract class EntityDisplayFormBase extends EntityForm {
 
     // Collect data for 'extra' fields.
     foreach ($form['#extra'] as $name) {
-      if ($form_values['fields'][$name]['type'] == 'hidden') {
+      if ($form_values['fields'][$name]['region'] == 'hidden') {
         $entity->removeComponent($name);
       }
       else {
-        $entity->setComponent($name, array(
+        $entity->setComponent($name, [
           'weight' => $form_values['fields'][$name]['weight'],
-        ));
+          'region' => $form_values['fields'][$name]['region'],
+        ]);
       }
     }
   }
@@ -640,19 +662,19 @@ abstract class EntityDisplayFormBase extends EntityForm {
     // Pick the elements that need to receive the ajax-new-content effect.
     switch ($op) {
       case 'edit':
-        $updated_rows = array($trigger['#field_name']);
-        $updated_columns = array('plugin');
+        $updated_rows = [$trigger['#field_name']];
+        $updated_columns = ['plugin'];
         break;
 
       case 'update':
       case 'cancel':
-        $updated_rows = array($trigger['#field_name']);
-        $updated_columns = array('plugin', 'settings_summary', 'settings_edit');
+        $updated_rows = [$trigger['#field_name']];
+        $updated_columns = ['plugin', 'settings_summary', 'settings_edit'];
         break;
 
       case 'refresh_table':
         $updated_rows = array_values(explode(' ', $form_state->getValue('refresh_rows')));
-        $updated_columns = array('settings_summary', 'settings_edit');
+        $updated_columns = ['settings_summary', 'settings_edit'];
         break;
     }
 
@@ -712,7 +734,7 @@ abstract class EntityDisplayFormBase extends EntityForm {
   protected function getExtraFields() {
     $context = $this->displayContext == 'view' ? 'display' : $this->displayContext;
     $extra_fields = $this->entityManager->getExtraFields($this->entity->getTargetEntityTypeId(), $this->entity->getTargetBundle());
-    return isset($extra_fields[$context]) ? $extra_fields[$context] : array();
+    return isset($extra_fields[$context]) ? $extra_fields[$context] : [];
   }
 
   /**
@@ -741,7 +763,7 @@ abstract class EntityDisplayFormBase extends EntityForm {
    */
   protected function getApplicablePluginOptions(FieldDefinitionInterface $field_definition) {
     $options = $this->pluginManager->getOptions($field_definition->getType());
-    $applicable_options = array();
+    $applicable_options = [];
     foreach ($options as $option => $label) {
       $plugin_class = DefaultFactory::getPluginClass($option, $this->pluginManager->getDefinition($option));
       if ($plugin_class::isApplicable($field_definition)) {
@@ -751,20 +773,6 @@ abstract class EntityDisplayFormBase extends EntityForm {
     return $applicable_options;
   }
 
-  /**
-   * Returns an array of widget or formatter options for a field.
-   *
-   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
-   *   The field definition.
-   *
-   * @return array
-   *   An array of widget or formatter options.
-   */
-  protected function getPluginOptions(FieldDefinitionInterface $field_definition) {
-    $applicable_options = $this->getApplicablePluginOptions($field_definition);
-    return $applicable_options + array('hidden' => '- ' . $this->t('Hidden') . ' -');
-  }
-
   /**
    * Returns the ID of the default widget or formatter plugin for a field type.
    *
@@ -813,23 +821,10 @@ abstract class EntityDisplayFormBase extends EntityForm {
     switch ($row['#row_type']) {
       case 'field':
       case 'extra_field':
-        return ($row['plugin']['type']['#value'] == 'hidden' ? 'hidden' : 'content');
+        return $row['region']['#value'] ?: 'hidden';
     }
   }
 
-  /**
-   * Returns an array of visibility options for extra fields.
-   *
-   * @return array
-   *   An array of visibility options.
-   */
-  protected function getExtraFieldVisibilityOptions() {
-    return array(
-      'visible' => $this->t('Visible'),
-      'hidden' => '- ' . $this->t('Hidden') . ' -',
-    );
-  }
-
   /**
    * Returns entity (form) displays for the current entity display type.
    *
@@ -837,7 +832,7 @@ abstract class EntityDisplayFormBase extends EntityForm {
    *   An array holding entity displays or entity form displays.
    */
   protected function getDisplays() {
-    $load_ids = array();
+    $load_ids = [];
     $display_entity_type = $this->entity->getEntityTypeId();
     $entity_type = $this->entityManager->getDefinition($display_entity_type);
     $config_prefix = $entity_type->getConfigPrefix();
@@ -859,7 +854,7 @@ abstract class EntityDisplayFormBase extends EntityForm {
    *   An array of form or view mode statuses.
    */
   protected function getDisplayStatuses() {
-    $display_statuses = array();
+    $display_statuses = [];
     $displays = $this->getDisplays();
     foreach ($displays as $display) {
       $display_statuses[$display->get('mode')] = $display->status();
diff --git a/web/core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php b/web/core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php
index 141af84ff..ed1c5fe1e 100644
--- a/web/core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php
+++ b/web/core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php
@@ -26,7 +26,7 @@ class EntityDisplayModeAddForm extends EntityDisplayModeFormBase {
     // Change replace_pattern to avoid undesired dots.
     $form['id']['#machine_name']['replace_pattern'] = '[^a-z0-9_]+';
     $definition = $this->entityManager->getDefinition($this->targetEntityTypeId);
-    $form['#title'] = $this->t('Add new %label @entity-type', array('%label' => $definition->getLabel(), '@entity-type' => $this->entityType->getLowercaseLabel()));
+    $form['#title'] = $this->t('Add new %label @entity-type', ['%label' => $definition->getLabel(), '@entity-type' => $this->entityType->getLowercaseLabel()]);
     return $form;
   }
 
diff --git a/web/core/modules/field_ui/src/Form/EntityDisplayModeDeleteForm.php b/web/core/modules/field_ui/src/Form/EntityDisplayModeDeleteForm.php
index fa22a379d..f7d880461 100644
--- a/web/core/modules/field_ui/src/Form/EntityDisplayModeDeleteForm.php
+++ b/web/core/modules/field_ui/src/Form/EntityDisplayModeDeleteForm.php
@@ -14,7 +14,7 @@ class EntityDisplayModeDeleteForm extends EntityDeleteForm {
    */
   public function getDescription() {
     $entity_type = $this->entity->getEntityType();
-    return $this->t('Deleting a @entity-type will cause any output still requesting to use that @entity-type to use the default display settings.', array('@entity-type' => $entity_type->getLowercaseLabel()));
+    return $this->t('Deleting a @entity-type will cause any output still requesting to use that @entity-type to use the default display settings.', ['@entity-type' => $entity_type->getLowercaseLabel()]);
   }
 
 }
diff --git a/web/core/modules/field_ui/src/Form/EntityDisplayModeFormBase.php b/web/core/modules/field_ui/src/Form/EntityDisplayModeFormBase.php
index 9befdba17..72a8a1964 100644
--- a/web/core/modules/field_ui/src/Form/EntityDisplayModeFormBase.php
+++ b/web/core/modules/field_ui/src/Form/EntityDisplayModeFormBase.php
@@ -3,23 +3,13 @@
 namespace Drupal\field_ui\Form;
 
 use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides the generic base class for entity display mode forms.
  */
 abstract class EntityDisplayModeFormBase extends EntityForm {
 
-  /**
-   * The entity query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
-
   /**
    * The entity type definition.
    *
@@ -27,66 +17,36 @@ abstract class EntityDisplayModeFormBase extends EntityForm {
    */
   protected $entityType;
 
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Component\Plugin\PluginManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * Constructs a new EntityDisplayModeFormBase.
-   *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
-   */
-  public function __construct(QueryFactory $query_factory, EntityManagerInterface $entity_manager) {
-    $this->queryFactory = $query_factory;
-    $this->entityManager = $entity_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.query'),
-      $container->get('entity.manager')
-    );
-  }
-
   /**
    * {@inheritdoc}
    */
   protected function init(FormStateInterface $form_state) {
     parent::init($form_state);
-    $this->entityType = $this->entityManager->getDefinition($this->entity->getEntityTypeId());
+    $this->entityType = $this->entityTypeManager->getDefinition($this->entity->getEntityTypeId());
   }
 
   /**
    * {@inheritdoc}
    */
   public function form(array $form, FormStateInterface $form_state) {
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Name'),
       '#maxlength' => 100,
       '#default_value' => $this->entity->label(),
-    );
+    ];
 
-    $form['id'] = array(
+    $form['id'] = [
       '#type' => 'machine_name',
       '#description' => $this->t('A unique machine-readable name. Can only contain lowercase letters, numbers, and underscores.'),
       '#disabled' => !$this->entity->isNew(),
       '#default_value' => $this->entity->id(),
       '#field_prefix' => $this->entity->isNew() ? $this->entity->getTargetType() . '.' : '',
-      '#machine_name' => array(
-        'exists' => array($this, 'exists'),
+      '#machine_name' => [
+        'exists' => [$this, 'exists'],
         'replace_pattern' => '[^a-z0-9_.]+',
-      ),
-    );
+      ],
+    ];
 
     return $form;
   }
@@ -107,8 +67,9 @@ abstract class EntityDisplayModeFormBase extends EntityForm {
     if ($entity_id == 'default') {
       return TRUE;
     }
-    return (bool) $this->queryFactory
-      ->get($this->entity->getEntityTypeId())
+    return (bool) $this->entityTypeManager
+      ->getStorage($this->entity->getEntityTypeId())
+      ->getQuery()
       ->condition('id', $element['#field_prefix'] . $entity_id)
       ->execute();
   }
@@ -117,7 +78,7 @@ abstract class EntityDisplayModeFormBase extends EntityForm {
    * {@inheritdoc}
    */
   public function save(array $form, FormStateInterface $form_state) {
-    drupal_set_message($this->t('Saved the %label @entity-type.', array('%label' => $this->entity->label(), '@entity-type' => $this->entityType->getLowercaseLabel())));
+    drupal_set_message($this->t('Saved the %label @entity-type.', ['%label' => $this->entity->label(), '@entity-type' => $this->entityType->getLowercaseLabel()]));
     $this->entity->save();
     \Drupal::entityManager()->clearCachedFieldDefinitions();
     $form_state->setRedirectUrl($this->entity->urlInfo('collection'));
diff --git a/web/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php b/web/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php
index 741b98dae..2c3e36046 100644
--- a/web/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php
+++ b/web/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php
@@ -38,7 +38,7 @@ class EntityFormDisplayEditForm extends EntityDisplayFormBase {
     $field_name = $field_definition->getName();
 
     // Update the (invisible) title of the 'plugin' column.
-    $field_row['plugin']['#title'] = $this->t('Formatter for @title', array('@title' => $field_definition->getLabel()));
+    $field_row['plugin']['#title'] = $this->t('Formatter for @title', ['@title' => $field_definition->getLabel()]);
     if (!empty($field_row['plugin']['settings_edit_form']) && ($plugin = $this->entity->getRenderer($field_name))) {
       $plugin_type_info = $plugin->getPluginDefinition();
       $field_row['plugin']['settings_edit_form']['label']['#markup'] = $this->t('Widget settings:') . ' <span class="plugin-name">' . $plugin_type_info['label'] . '</span>';
@@ -90,12 +90,13 @@ class EntityFormDisplayEditForm extends EntityDisplayFormBase {
    * {@inheritdoc}
    */
   protected function getTableHeader() {
-    return array(
+    return [
       $this->t('Field'),
       $this->t('Weight'),
       $this->t('Parent'),
-      array('data' => $this->t('Widget'), 'colspan' => 3),
-    );
+      $this->t('Region'),
+      ['data' => $this->t('Widget'), 'colspan' => 3],
+    ];
   }
 
   /**
@@ -112,17 +113,17 @@ class EntityFormDisplayEditForm extends EntityDisplayFormBase {
    * {@inheritdoc}
    */
   protected function thirdPartySettingsForm(PluginSettingsInterface $plugin, FieldDefinitionInterface $field_definition, array $form, FormStateInterface $form_state) {
-    $settings_form = array();
+    $settings_form = [];
     // Invoke hook_field_widget_third_party_settings_form(), keying resulting
     // subforms by module name.
     foreach ($this->moduleHandler->getImplementations('field_widget_third_party_settings_form') as $module) {
-      $settings_form[$module] = $this->moduleHandler->invoke($module, 'field_widget_third_party_settings_form', array(
+      $settings_form[$module] = $this->moduleHandler->invoke($module, 'field_widget_third_party_settings_form', [
         $plugin,
         $field_definition,
         $this->entity->getMode(),
         $form,
         $form_state,
-      ));
+      ]);
     }
     return $settings_form;
   }
@@ -131,11 +132,11 @@ class EntityFormDisplayEditForm extends EntityDisplayFormBase {
    * {@inheritdoc}
    */
   protected function alterSettingsSummary(array &$summary, PluginSettingsInterface $plugin, FieldDefinitionInterface $field_definition) {
-    $context = array(
+    $context = [
       'widget' => $plugin,
       'field_definition' => $field_definition,
       'form_mode' => $this->entity->getMode(),
-    );
+    ];
     $this->moduleHandler->alter('field_widget_settings_summary', $summary, $context);
   }
 
diff --git a/web/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php b/web/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
index f273325f6..c27f3d4f5 100644
--- a/web/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
+++ b/web/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
@@ -39,21 +39,21 @@ class EntityViewDisplayEditForm extends EntityDisplayFormBase {
     $display_options = $this->entity->getComponent($field_name);
 
     // Insert the label column.
-    $label = array(
-      'label' => array(
+    $label = [
+      'label' => [
         '#type' => 'select',
-        '#title' => $this->t('Label display for @title', array('@title' => $field_definition->getLabel())),
+        '#title' => $this->t('Label display for @title', ['@title' => $field_definition->getLabel()]),
         '#title_display' => 'invisible',
         '#options' => $this->getFieldLabelOptions(),
         '#default_value' => $display_options ? $display_options['label'] : 'above',
-      ),
-    );
+      ],
+    ];
 
     $label_position = array_search('plugin', array_keys($field_row));
     $field_row = array_slice($field_row, 0, $label_position, TRUE) + $label + array_slice($field_row, $label_position, count($field_row) - 1, TRUE);
 
     // Update the (invisible) title of the 'plugin' column.
-    $field_row['plugin']['#title'] = $this->t('Formatter for @title', array('@title' => $field_definition->getLabel()));
+    $field_row['plugin']['#title'] = $this->t('Formatter for @title', ['@title' => $field_definition->getLabel()]);
     if (!empty($field_row['plugin']['settings_edit_form']) && ($plugin = $this->entity->getRenderer($field_name))) {
       $plugin_type_info = $plugin->getPluginDefinition();
       $field_row['plugin']['settings_edit_form']['label']['#markup'] = $this->t('Format settings:') . ' <span class="plugin-name">' . $plugin_type_info['label'] . '</span>';
@@ -69,11 +69,11 @@ class EntityViewDisplayEditForm extends EntityDisplayFormBase {
     $extra_field_row = parent::buildExtraFieldRow($field_id, $extra_field);
 
     // Insert an empty placeholder for the label column.
-    $label = array(
-      'empty_cell' => array(
+    $label = [
+      'empty_cell' => [
         '#markup' => '&nbsp;'
-      )
-    );
+      ]
+    ];
     $label_position = array_search('plugin', array_keys($extra_field_row));
     $extra_field_row = array_slice($extra_field_row, 0, $label_position, TRUE) + $label + array_slice($extra_field_row, $label_position, count($extra_field_row) - 1, TRUE);
 
@@ -123,13 +123,14 @@ class EntityViewDisplayEditForm extends EntityDisplayFormBase {
    * {@inheritdoc}
    */
   protected function getTableHeader() {
-    return array(
+    return [
       $this->t('Field'),
       $this->t('Weight'),
       $this->t('Parent'),
+      $this->t('Region'),
       $this->t('Label'),
-      array('data' => $this->t('Format'), 'colspan' => 3),
-    );
+      ['data' => $this->t('Format'), 'colspan' => 3],
+    ];
   }
 
   /**
@@ -149,29 +150,29 @@ class EntityViewDisplayEditForm extends EntityDisplayFormBase {
    *   An array of visibility options.
    */
   protected function getFieldLabelOptions() {
-    return array(
+    return [
       'above' => $this->t('Above'),
       'inline' => $this->t('Inline'),
       'hidden' => '- ' . $this->t('Hidden') . ' -',
       'visually_hidden' => '- ' . $this->t('Visually Hidden') . ' -',
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   protected function thirdPartySettingsForm(PluginSettingsInterface $plugin, FieldDefinitionInterface $field_definition, array $form, FormStateInterface $form_state) {
-    $settings_form = array();
+    $settings_form = [];
     // Invoke hook_field_formatter_third_party_settings_form(), keying resulting
     // subforms by module name.
     foreach ($this->moduleHandler->getImplementations('field_formatter_third_party_settings_form') as $module) {
-      $settings_form[$module] = $this->moduleHandler->invoke($module, 'field_formatter_third_party_settings_form', array(
+      $settings_form[$module] = $this->moduleHandler->invoke($module, 'field_formatter_third_party_settings_form', [
         $plugin,
         $field_definition,
         $this->entity->getMode(),
         $form,
         $form_state,
-      ));
+      ]);
     }
     return $settings_form;
   }
@@ -180,11 +181,11 @@ class EntityViewDisplayEditForm extends EntityDisplayFormBase {
    * {@inheritdoc}
    */
   protected function alterSettingsSummary(array &$summary, PluginSettingsInterface $plugin, FieldDefinitionInterface $field_definition) {
-    $context = array(
+    $context = [
       'formatter' => $plugin,
       'field_definition' => $field_definition,
       'view_mode' => $this->entity->getMode(),
-    );
+    ];
     $this->moduleHandler->alter('field_formatter_settings_summary', $summary, $context);
   }
 
diff --git a/web/core/modules/field_ui/src/Form/FieldConfigDeleteForm.php b/web/core/modules/field_ui/src/Form/FieldConfigDeleteForm.php
index f9c775561..67782311b 100644
--- a/web/core/modules/field_ui/src/Form/FieldConfigDeleteForm.php
+++ b/web/core/modules/field_ui/src/Form/FieldConfigDeleteForm.php
@@ -96,10 +96,10 @@ class FieldConfigDeleteForm extends EntityDeleteForm {
 
     if ($field_storage && !$field_storage->isLocked()) {
       $this->entity->delete();
-      drupal_set_message($this->t('The field %field has been deleted from the %type content type.', array('%field' => $this->entity->label(), '%type' => $bundle_label)));
+      drupal_set_message($this->t('The field %field has been deleted from the %type content type.', ['%field' => $this->entity->label(), '%type' => $bundle_label]));
     }
     else {
-      drupal_set_message($this->t('There was a problem removing the %field from the %type content type.', array('%field' => $this->entity->label(), '%type' => $bundle_label)), 'error');
+      drupal_set_message($this->t('There was a problem removing the %field from the %type content type.', ['%field' => $this->entity->label(), '%type' => $bundle_label]), 'error');
     }
 
     $form_state->setRedirectUrl($this->getCancelUrl());
diff --git a/web/core/modules/field_ui/src/Form/FieldConfigEditForm.php b/web/core/modules/field_ui/src/Form/FieldConfigEditForm.php
index ff6d15711..2895479b3 100644
--- a/web/core/modules/field_ui/src/Form/FieldConfigEditForm.php
+++ b/web/core/modules/field_ui/src/Form/FieldConfigEditForm.php
@@ -33,75 +33,75 @@ class FieldConfigEditForm extends EntityForm {
     $field_storage = $this->entity->getFieldStorageDefinition();
     $bundles = $this->entityManager->getBundleInfo($this->entity->getTargetEntityTypeId());
 
-    $form_title = $this->t('%field settings for %bundle', array(
+    $form_title = $this->t('%field settings for %bundle', [
       '%field' => $this->entity->getLabel(),
       '%bundle' => $bundles[$this->entity->getTargetBundle()]['label'],
-    ));
+    ]);
     $form['#title'] = $form_title;
 
     if ($field_storage->isLocked()) {
-      $form['locked'] = array(
-        '#markup' => $this->t('The field %field is locked and cannot be edited.', array('%field' => $this->entity->getLabel())),
-      );
+      $form['locked'] = [
+        '#markup' => $this->t('The field %field is locked and cannot be edited.', ['%field' => $this->entity->getLabel()]),
+      ];
       return $form;
     }
 
     // Build the configurable field values.
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label'),
       '#default_value' => $this->entity->getLabel() ?: $field_storage->getName(),
       '#required' => TRUE,
       '#weight' => -20,
-    );
+    ];
 
-    $form['description'] = array(
+    $form['description'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Help text'),
       '#default_value' => $this->entity->getDescription(),
       '#rows' => 5,
-      '#description' => $this->t('Instructions to present to the user below this field on the editing form.<br />Allowed HTML tags: @tags', array('@tags' => FieldFilteredMarkup::displayAllowedTags())) . '<br />' . $this->t('This field supports tokens.'),
+      '#description' => $this->t('Instructions to present to the user below this field on the editing form.<br />Allowed HTML tags: @tags', ['@tags' => FieldFilteredMarkup::displayAllowedTags()]) . '<br />' . $this->t('This field supports tokens.'),
       '#weight' => -10,
-    );
+    ];
 
-    $form['required'] = array(
+    $form['required'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Required field'),
       '#default_value' => $this->entity->isRequired(),
       '#weight' => -5,
-    );
+    ];
 
     // Create an arbitrary entity object (used by the 'default value' widget).
-    $ids = (object) array(
+    $ids = (object) [
       'entity_type' => $this->entity->getTargetEntityTypeId(),
       'bundle' => $this->entity->getTargetBundle(),
       'entity_id' => NULL
-    );
+    ];
     $form['#entity'] = _field_create_entity_from_ids($ids);
     $items = $form['#entity']->get($this->entity->getName());
     $item = $items->first() ?: $items->appendItem();
 
     // Add field settings for the field type and a container for third party
     // settings that modules can add to via hook_form_FORM_ID_alter().
-    $form['settings'] = array(
+    $form['settings'] = [
       '#tree' => TRUE,
       '#weight' => 10,
-    );
+    ];
     $form['settings'] += $item->fieldSettingsForm($form, $form_state);
-    $form['third_party_settings'] = array(
+    $form['third_party_settings'] = [
       '#tree' => TRUE,
       '#weight' => 11,
-    );
+    ];
 
     // Add handling for default value.
     if ($element = $items->defaultValuesForm($form, $form_state)) {
-      $element = array_merge($element, array(
+      $element = array_merge($element, [
         '#type' => 'details',
         '#title' => $this->t('Default value'),
         '#open' => TRUE,
         '#tree' => TRUE,
         '#description' => $this->t('The default value for this field, used when creating new content.'),
-      ));
+      ]);
 
       $form['default_value'] = $element;
     }
@@ -128,15 +128,15 @@ class FieldConfigEditForm extends EntityForm {
         $query['destination'] = $this->getRequest()->query->get('destination');
         $url->setOption('query', $query);
       }
-      $actions['delete'] = array(
+      $actions['delete'] = [
         '#type' => 'link',
         '#title' => $this->t('Delete'),
         '#url' => $url,
         '#access' => $this->entity->access('delete'),
-        '#attributes' => array(
-          'class' => array('button', 'button--danger'),
-        ),
-      );
+        '#attributes' => [
+          'class' => ['button', 'button--danger'],
+        ],
+      ];
     }
 
     return $actions;
@@ -161,7 +161,7 @@ class FieldConfigEditForm extends EntityForm {
     parent::submitForm($form, $form_state);
 
     // Handle the default value.
-    $default_value = array();
+    $default_value = [];
     if (isset($form['default_value'])) {
       $items = $form['#entity']->get($this->entity->getName());
       $default_value = $items->defaultValuesFormSubmit($form['default_value'], $form, $form_state);
@@ -175,7 +175,7 @@ class FieldConfigEditForm extends EntityForm {
   public function save(array $form, FormStateInterface $form_state) {
     $this->entity->save();
 
-    drupal_set_message($this->t('Saved %label configuration.', array('%label' => $this->entity->getLabel())));
+    drupal_set_message($this->t('Saved %label configuration.', ['%label' => $this->entity->getLabel()]));
 
     $request = $this->getRequest();
     if (($destinations = $request->query->get('destinations')) && $next_destination = FieldUI::getNextDestination($destinations)) {
diff --git a/web/core/modules/field_ui/src/Form/FieldStorageAddForm.php b/web/core/modules/field_ui/src/Form/FieldStorageAddForm.php
index 5b37d7853..5e5a84228 100644
--- a/web/core/modules/field_ui/src/Form/FieldStorageAddForm.php
+++ b/web/core/modules/field_ui/src/Form/FieldStorageAddForm.php
@@ -3,7 +3,6 @@
 namespace Drupal\field_ui\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\Form\FormBase;
@@ -46,13 +45,6 @@ class FieldStorageAddForm extends FormBase {
    */
   protected $fieldTypePluginManager;
 
-  /**
-   * The query factory to create entity queries.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  public $queryFactory;
-
   /**
    * The configuration factory.
    *
@@ -67,15 +59,12 @@ class FieldStorageAddForm extends FormBase {
    *   The entity manager.
    * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_plugin_manager
    *   The field type plugin manager.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The configuration factory.
    */
-  public function __construct(EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_plugin_manager, QueryFactory $query_factory, ConfigFactoryInterface $config_factory) {
+  public function __construct(EntityManagerInterface $entity_manager, FieldTypePluginManagerInterface $field_type_plugin_manager, ConfigFactoryInterface $config_factory) {
     $this->entityManager = $entity_manager;
     $this->fieldTypePluginManager = $field_type_plugin_manager;
-    $this->queryFactory = $query_factory;
     $this->configFactory = $config_factory;
   }
 
@@ -93,7 +82,6 @@ class FieldStorageAddForm extends FormBase {
     return new static(
       $container->get('entity.manager'),
       $container->get('plugin.manager.field.field_type'),
-      $container->get('entity.query'),
       $container->get('config.factory')
     );
   }
@@ -113,65 +101,65 @@ class FieldStorageAddForm extends FormBase {
     $this->bundle = $form_state->get('bundle');
 
     // Gather valid field types.
-    $field_type_options = array();
+    $field_type_options = [];
     foreach ($this->fieldTypePluginManager->getGroupedDefinitions($this->fieldTypePluginManager->getUiDefinitions()) as $category => $field_types) {
       foreach ($field_types as $name => $field_type) {
         $field_type_options[$category][$name] = $field_type['label'];
       }
     }
 
-    $form['add'] = array(
+    $form['add'] = [
       '#type' => 'container',
-      '#attributes' => array('class' => array('form--inline', 'clearfix')),
-    );
+      '#attributes' => ['class' => ['form--inline', 'clearfix']],
+    ];
 
-    $form['add']['new_storage_type'] = array(
+    $form['add']['new_storage_type'] = [
       '#type' => 'select',
       '#title' => $this->t('Add a new field'),
       '#options' => $field_type_options,
       '#empty_option' => $this->t('- Select a field type -'),
-    );
+    ];
 
     // Re-use existing field.
     if ($existing_field_storage_options = $this->getExistingFieldStorageOptions()) {
-      $form['add']['separator'] = array(
+      $form['add']['separator'] = [
         '#type' => 'item',
         '#markup' => $this->t('or'),
-      );
-      $form['add']['existing_storage_name'] = array(
+      ];
+      $form['add']['existing_storage_name'] = [
         '#type' => 'select',
         '#title' => $this->t('Re-use an existing field'),
         '#options' => $existing_field_storage_options,
         '#empty_option' => $this->t('- Select an existing field -'),
-      );
+      ];
 
       $form['#attached']['drupalSettings']['existingFieldLabels'] = $this->getExistingFieldLabels(array_keys($existing_field_storage_options));
     }
     else {
       // Provide a placeholder form element to simplify the validation code.
-      $form['add']['existing_storage_name'] = array(
+      $form['add']['existing_storage_name'] = [
         '#type' => 'value',
         '#value' => FALSE,
-      );
+      ];
     }
 
     // Field label and field_name.
-    $form['new_storage_wrapper'] = array(
+    $form['new_storage_wrapper'] = [
       '#type' => 'container',
-      '#states' => array(
-        '!visible' => array(
-          ':input[name="new_storage_type"]' => array('value' => ''),
-        ),
-      ),
-    );
-    $form['new_storage_wrapper']['label'] = array(
+      '#states' => [
+        '!visible' => [
+          ':input[name="new_storage_type"]' => ['value' => ''],
+        ],
+      ],
+    ];
+    $form['new_storage_wrapper']['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label'),
       '#size' => 15,
-    );
+    ];
 
     $field_prefix = $this->config('field_ui.settings')->get('field_prefix');
-    $form['new_storage_wrapper']['field_name'] = array(
+    $form['new_storage_wrapper']['field_name'] = [
       '#type' => 'machine_name',
       // This field should stay LTR even for RTL languages.
       '#field_prefix' => '<span dir="ltr">' . $field_prefix,
@@ -181,44 +169,44 @@ class FieldStorageAddForm extends FormBase {
       // Calculate characters depending on the length of the field prefix
       // setting. Maximum length is 32.
       '#maxlength' => FieldStorageConfig::NAME_MAX_LENGTH - strlen($field_prefix),
-      '#machine_name' => array(
-        'source' => array('new_storage_wrapper', 'label'),
-        'exists' => array($this, 'fieldNameExists'),
-      ),
+      '#machine_name' => [
+        'source' => ['new_storage_wrapper', 'label'],
+        'exists' => [$this, 'fieldNameExists'],
+      ],
       '#required' => FALSE,
-    );
+    ];
 
     // Provide a separate label element for the "Re-use existing field" case
     // and place it outside the $form['add'] wrapper because those elements
     // are displayed inline.
     if ($existing_field_storage_options) {
-      $form['existing_storage_label'] = array(
+      $form['existing_storage_label'] = [
         '#type' => 'textfield',
         '#title' => $this->t('Label'),
         '#size' => 15,
-        '#states' => array(
-          '!visible' => array(
-            ':input[name="existing_storage_name"]' => array('value' => ''),
-          ),
-        ),
-      );
+        '#states' => [
+          '!visible' => [
+            ':input[name="existing_storage_name"]' => ['value' => ''],
+          ],
+        ],
+      ];
     }
 
     // Place the 'translatable' property as an explicit value so that contrib
     // modules can form_alter() the value for newly created fields. By default
     // we create field storage as translatable so it will be possible to enable
     // translation at field level.
-    $form['translatable'] = array(
+    $form['translatable'] = [
       '#type' => 'value',
       '#value' => TRUE,
-    );
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save and continue'),
       '#button_type' => 'primary',
-    );
+    ];
 
     $form['#attached']['library'][] = 'field_ui/drupal.field_ui';
 
@@ -302,7 +290,7 @@ class FieldStorageAddForm extends FormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $error = FALSE;
     $values = $form_state->getValues();
-    $destinations = array();
+    $destinations = [];
     $entity_type = $this->entityManager->getDefinition($this->entityTypeId);
 
     // Create new field.
@@ -333,7 +321,7 @@ class FieldStorageAddForm extends FormBase {
 
         // Merge in preconfigured field storage options.
         if (isset($field_options['field_storage_config'])) {
-          foreach (array('cardinality', 'settings') as $key) {
+          foreach (['cardinality', 'settings'] as $key) {
             if (isset($field_options['field_storage_config'][$key])) {
               $field_storage_values[$key] = $field_options['field_storage_config'][$key];
             }
@@ -342,7 +330,7 @@ class FieldStorageAddForm extends FormBase {
 
         // Merge in preconfigured field options.
         if (isset($field_options['field_config'])) {
-          foreach (array('required', 'settings') as $key) {
+          foreach (['required', 'settings'] as $key) {
             if (isset($field_options['field_config'][$key])) {
               $field_values[$key] = $field_options['field_config'][$key];
             }
@@ -364,19 +352,19 @@ class FieldStorageAddForm extends FormBase {
 
         // Always show the field settings step, as the cardinality needs to be
         // configured for new fields.
-        $route_parameters = array(
+        $route_parameters = [
           'field_config' => $field->id(),
-        ) + FieldUI::getRouteBundleParameter($entity_type, $this->bundle);
-        $destinations[] = array('route_name' => "entity.field_config.{$this->entityTypeId}_storage_edit_form", 'route_parameters' => $route_parameters);
-        $destinations[] = array('route_name' => "entity.field_config.{$this->entityTypeId}_field_edit_form", 'route_parameters' => $route_parameters);
-        $destinations[] = array('route_name' => "entity.{$this->entityTypeId}.field_ui_fields", 'route_parameters' => $route_parameters);
+        ] + FieldUI::getRouteBundleParameter($entity_type, $this->bundle);
+        $destinations[] = ['route_name' => "entity.field_config.{$this->entityTypeId}_storage_edit_form", 'route_parameters' => $route_parameters];
+        $destinations[] = ['route_name' => "entity.field_config.{$this->entityTypeId}_field_edit_form", 'route_parameters' => $route_parameters];
+        $destinations[] = ['route_name' => "entity.{$this->entityTypeId}.field_ui_fields", 'route_parameters' => $route_parameters];
 
         // Store new field information for any additional submit handlers.
         $form_state->set(['fields_added', '_add_new_field'], $values['field_name']);
       }
       catch (\Exception $e) {
         $error = TRUE;
-        drupal_set_message($this->t('There was a problem creating field %label: @message', array('%label' => $values['label'], '@message' => $e->getMessage())), 'error');
+        drupal_set_message($this->t('There was a problem creating field %label: @message', ['%label' => $values['label'], '@message' => $e->getMessage()]), 'error');
       }
     }
 
@@ -385,29 +373,29 @@ class FieldStorageAddForm extends FormBase {
       $field_name = $values['existing_storage_name'];
 
       try {
-        $field = $this->entityManager->getStorage('field_config')->create(array(
+        $field = $this->entityManager->getStorage('field_config')->create([
           'field_name' => $field_name,
           'entity_type' => $this->entityTypeId,
           'bundle' => $this->bundle,
           'label' => $values['existing_storage_label'],
-        ));
+        ]);
         $field->save();
 
         $this->configureEntityFormDisplay($field_name);
         $this->configureEntityViewDisplay($field_name);
 
-        $route_parameters = array(
+        $route_parameters = [
           'field_config' => $field->id(),
-        ) + FieldUI::getRouteBundleParameter($entity_type, $this->bundle);
-        $destinations[] = array('route_name' => "entity.field_config.{$this->entityTypeId}_field_edit_form", 'route_parameters' => $route_parameters);
-        $destinations[] = array('route_name' => "entity.{$this->entityTypeId}.field_ui_fields", 'route_parameters' => $route_parameters);
+        ] + FieldUI::getRouteBundleParameter($entity_type, $this->bundle);
+        $destinations[] = ['route_name' => "entity.field_config.{$this->entityTypeId}_field_edit_form", 'route_parameters' => $route_parameters];
+        $destinations[] = ['route_name' => "entity.{$this->entityTypeId}.field_ui_fields", 'route_parameters' => $route_parameters];
 
         // Store new field information for any additional submit handlers.
         $form_state->set(['fields_added', '_add_existing_field'], $field_name);
       }
       catch (\Exception $e) {
         $error = TRUE;
-        drupal_set_message($this->t('There was a problem creating field %label: @message', array('%label' => $values['label'], '@message' => $e->getMessage())), 'error');
+        drupal_set_message($this->t('There was a problem creating field %label: @message', ['%label' => $values['label'], '@message' => $e->getMessage()]), 'error');
       }
     }
 
@@ -464,7 +452,7 @@ class FieldStorageAddForm extends FormBase {
    *   An array of existing field storages keyed by name.
    */
   protected function getExistingFieldStorageOptions() {
-    $options = array();
+    $options = [];
     // Load the field_storages and build the list of options.
     $field_types = $this->fieldTypePluginManager->getDefinitions();
     foreach ($this->entityManager->getFieldStorageDefinitions($this->entityTypeId) as $field_name => $field_storage) {
@@ -478,10 +466,10 @@ class FieldStorageAddForm extends FormBase {
         && !$field_storage->isLocked()
         && empty($field_types[$field_type]['no_ui'])
         && !in_array($this->bundle, $field_storage->getBundles(), TRUE)) {
-        $options[$field_name] = $this->t('@type: @field', array(
+        $options[$field_name] = $this->t('@type: @field', [
           '@type' => $field_types[$field_type]['label'],
           '@field' => $field_name,
-        ));
+        ]);
       }
     }
     asort($options);
@@ -505,14 +493,14 @@ class FieldStorageAddForm extends FormBase {
   protected function getExistingFieldLabels(array $field_names) {
     // Get all the fields corresponding to the given field storage names and
     // this entity type.
-    $field_ids = $this->queryFactory->get('field_config')
+    $field_ids = $this->entityManager->getStorage('field_config')->getQuery()
       ->condition('entity_type', $this->entityTypeId)
       ->condition('field_name', $field_names)
       ->execute();
     $fields = $this->entityManager->getStorage('field_config')->loadMultiple($field_ids);
 
     // Go through all the fields and use the label of the first encounter.
-    $labels = array();
+    $labels = [];
     foreach ($fields as $field) {
       if (!isset($labels[$field->getName()])) {
         $labels[$field->getName()] = $field->label();
diff --git a/web/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php b/web/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
index bbaeb6332..a0c1294d9 100644
--- a/web/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
+++ b/web/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
@@ -62,7 +62,7 @@ class FieldStorageConfigEditForm extends EntityForm {
 
     $field_label = $form_state->get('field_config')->label();
     $form['#title'] = $field_label;
-    $form['#prefix'] = '<p>' . $this->t('These settings apply to the %field field everywhere it is used. These settings impact the way that data is stored in the database and cannot be changed once data has been created.', array('%field' => $field_label)) . '</p>';
+    $form['#prefix'] = '<p>' . $this->t('These settings apply to the %field field everywhere it is used. These settings impact the way that data is stored in the database and cannot be changed once data has been created.', ['%field' => $field_label]) . '</p>';
 
     // See if data already exists for this field.
     // If so, prevent changes to the field settings.
@@ -73,17 +73,17 @@ class FieldStorageConfigEditForm extends EntityForm {
     // Add settings provided by the field module. The field module is
     // responsible for not returning settings that cannot be changed if
     // the field already has data.
-    $form['settings'] = array(
+    $form['settings'] = [
       '#weight' => -10,
       '#tree' => TRUE,
-    );
+    ];
     // Create an arbitrary entity object, so that we can have an instantiated
     // FieldItem.
-    $ids = (object) array(
+    $ids = (object) [
       'entity_type' => $form_state->get('entity_type_id'),
       'bundle' => $form_state->get('bundle'),
       'entity_id' => NULL
-    );
+    ];
     $entity = _field_create_entity_from_ids($ids);
     $items = $entity->get($this->entity->getName());
     $item = $items->first() ?: $items->appendItem();
@@ -91,43 +91,43 @@ class FieldStorageConfigEditForm extends EntityForm {
 
     // Build the configurable field values.
     $cardinality = $this->entity->getCardinality();
-    $form['cardinality_container'] = array(
+    $form['cardinality_container'] = [
       // Reset #parents so the additional container does not appear.
-      '#parents' => array(),
+      '#parents' => [],
       '#type' => 'fieldset',
       '#title' => $this->t('Allowed number of values'),
-      '#attributes' => array('class' => array(
+      '#attributes' => ['class' => [
         'container-inline',
         'fieldgroup',
         'form-composite'
-      )),
-    );
-    $form['cardinality_container']['cardinality'] = array(
+      ]],
+    ];
+    $form['cardinality_container']['cardinality'] = [
       '#type' => 'select',
       '#title' => $this->t('Allowed number of values'),
       '#title_display' => 'invisible',
-      '#options' => array(
+      '#options' => [
         'number' => $this->t('Limited'),
         FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED => $this->t('Unlimited'),
-      ),
+      ],
       '#default_value' => ($cardinality == FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED) ? FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED : 'number',
-    );
-    $form['cardinality_container']['cardinality_number'] = array(
+    ];
+    $form['cardinality_container']['cardinality_number'] = [
       '#type' => 'number',
       '#default_value' => $cardinality != FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED ? $cardinality : 1,
       '#min' => 1,
       '#title' => $this->t('Limit'),
       '#title_display' => 'invisible',
       '#size' => 2,
-      '#states' => array(
-        'visible' => array(
-         ':input[name="cardinality"]' => array('value' => 'number'),
-        ),
-        'disabled' => array(
-         ':input[name="cardinality"]' => array('value' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+         ':input[name="cardinality"]' => ['value' => 'number'],
+        ],
+        'disabled' => [
+         ':input[name="cardinality"]' => ['value' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED],
+        ],
+      ],
+    ];
 
     return $form;
   }
@@ -190,7 +190,7 @@ class FieldStorageConfigEditForm extends EntityForm {
     $field_label = $form_state->get('field_config')->label();
     try {
       $this->entity->save();
-      drupal_set_message($this->t('Updated field %label field settings.', array('%label' => $field_label)));
+      drupal_set_message($this->t('Updated field %label field settings.', ['%label' => $field_label]));
       $request = $this->getRequest();
       if (($destinations = $request->query->get('destinations')) && $next_destination = FieldUI::getNextDestination($destinations)) {
         $request->query->remove('destinations');
@@ -201,7 +201,7 @@ class FieldStorageConfigEditForm extends EntityForm {
       }
     }
     catch (\Exception $e) {
-      drupal_set_message($this->t('Attempt to update field %label failed: %message.', array('%label' => $field_label, '%message' => $e->getMessage())), 'error');
+      drupal_set_message($this->t('Attempt to update field %label failed: %message.', ['%label' => $field_label, '%message' => $e->getMessage()]), 'error');
     }
   }
 
diff --git a/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php b/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
index 4d81c8b5d..b92d70259 100644
--- a/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
+++ b/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
@@ -50,15 +50,15 @@ class FieldUiLocalAction extends DeriverBase implements ContainerDeriverInterfac
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    $this->derivatives = array();
+    $this->derivatives = [];
 
     foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
       if ($entity_type->get('field_ui_base_route')) {
-        $this->derivatives["field_storage_config_add_$entity_type_id"] = array(
+        $this->derivatives["field_storage_config_add_$entity_type_id"] = [
           'route_name' => "field_ui.field_storage_config_add_$entity_type_id",
           'title' => $this->t('Add field'),
-          'appears_on' => array("entity.$entity_type_id.field_ui_fields"),
-        );
+          'appears_on' => ["entity.$entity_type_id.field_ui_fields"],
+        ];
       }
     }
 
diff --git a/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php b/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
index 3ebf95994..6d95abdd1 100644
--- a/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
+++ b/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
@@ -61,46 +61,46 @@ class FieldUiLocalTask extends DeriverBase implements ContainerDeriverInterface
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    $this->derivatives = array();
+    $this->derivatives = [];
 
     foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
       if ($entity_type->get('field_ui_base_route')) {
-        $this->derivatives["overview_$entity_type_id"] = array(
+        $this->derivatives["overview_$entity_type_id"] = [
           'route_name' => "entity.$entity_type_id.field_ui_fields",
           'weight' => 1,
           'title' => $this->t('Manage fields'),
           'base_route' => "entity.$entity_type_id.field_ui_fields",
-        );
+        ];
 
         // 'Manage form display' tab.
-        $this->derivatives["form_display_overview_$entity_type_id"] = array(
+        $this->derivatives["form_display_overview_$entity_type_id"] = [
           'route_name' => "entity.entity_form_display.$entity_type_id.default",
           'weight' => 2,
           'title' => $this->t('Manage form display'),
           'base_route' => "entity.$entity_type_id.field_ui_fields",
-        );
+        ];
 
         // 'Manage display' tab.
-        $this->derivatives["display_overview_$entity_type_id"] = array(
+        $this->derivatives["display_overview_$entity_type_id"] = [
           'route_name' => "entity.entity_view_display.$entity_type_id.default",
           'weight' => 3,
           'title' => $this->t('Manage display'),
           'base_route' => "entity.$entity_type_id.field_ui_fields",
-        );
+        ];
 
         // Field edit tab.
-        $this->derivatives["field_edit_$entity_type_id"] = array(
+        $this->derivatives["field_edit_$entity_type_id"] = [
           'route_name' => "entity.field_config.{$entity_type_id}_field_edit_form",
           'title' => $this->t('Edit'),
           'base_route' => "entity.field_config.{$entity_type_id}_field_edit_form",
-        );
+        ];
 
         // Field settings tab.
-        $this->derivatives["field_storage_$entity_type_id"] = array(
+        $this->derivatives["field_storage_$entity_type_id"] = [
           'route_name' => "entity.field_config.{$entity_type_id}_storage_edit_form",
           'title' => $this->t('Field settings'),
           'base_route' => "entity.field_config.{$entity_type_id}_field_edit_form",
-        );
+        ];
 
         // View and form modes secondary tabs.
         // The same base $path for the menu item (with a placeholder) can be
@@ -109,47 +109,47 @@ class FieldUiLocalTask extends DeriverBase implements ContainerDeriverInterface
         // modes available for customisation. So we define menu items for all
         // view modes, and use a route requirement to determine which ones are
         // actually visible for a given bundle.
-        $this->derivatives['field_form_display_default_' . $entity_type_id] = array(
+        $this->derivatives['field_form_display_default_' . $entity_type_id] = [
           'title' => 'Default',
           'route_name' => "entity.entity_form_display.$entity_type_id.default",
           'parent_id' => "field_ui.fields:form_display_overview_$entity_type_id",
           'weight' => -1,
-        );
-        $this->derivatives['field_display_default_' . $entity_type_id] = array(
+        ];
+        $this->derivatives['field_display_default_' . $entity_type_id] = [
           'title' => 'Default',
           'route_name' => "entity.entity_view_display.$entity_type_id.default",
           'parent_id' => "field_ui.fields:display_overview_$entity_type_id",
           'weight' => -1,
-        );
+        ];
 
         // One local task for each form mode.
         $weight = 0;
         foreach ($this->entityManager->getFormModes($entity_type_id) as $form_mode => $form_mode_info) {
-          $this->derivatives['field_form_display_' . $form_mode . '_' . $entity_type_id] = array(
+          $this->derivatives['field_form_display_' . $form_mode . '_' . $entity_type_id] = [
             'title' => $form_mode_info['label'],
             'route_name' => "entity.entity_form_display.$entity_type_id.form_mode",
-            'route_parameters' => array(
+            'route_parameters' => [
               'form_mode_name' => $form_mode,
-            ),
+            ],
             'parent_id' => "field_ui.fields:form_display_overview_$entity_type_id",
             'weight' => $weight++,
             'cache_tags' => $this->entityManager->getDefinition('entity_form_display')->getListCacheTags(),
-          );
+          ];
         }
 
         // One local task for each view mode.
         $weight = 0;
         foreach ($this->entityManager->getViewModes($entity_type_id) as $view_mode => $form_mode_info) {
-          $this->derivatives['field_display_' . $view_mode . '_' . $entity_type_id] = array(
+          $this->derivatives['field_display_' . $view_mode . '_' . $entity_type_id] = [
             'title' => $form_mode_info['label'],
             'route_name' => "entity.entity_view_display.$entity_type_id.view_mode",
-            'route_parameters' => array(
+            'route_parameters' => [
               'view_mode_name' => $view_mode,
-            ),
+            ],
             'parent_id' => "field_ui.fields:display_overview_$entity_type_id",
             'weight' => $weight++,
             'cache_tags' => $this->entityManager->getDefinition('entity_view_display')->getListCacheTags(),
-          );
+          ];
         }
       }
     }
diff --git a/web/core/modules/field_ui/src/Routing/RouteSubscriber.php b/web/core/modules/field_ui/src/Routing/RouteSubscriber.php
index 696a0494f..b08e7f8fe 100644
--- a/web/core/modules/field_ui/src/Routing/RouteSubscriber.php
+++ b/web/core/modules/field_ui/src/Routing/RouteSubscriber.php
@@ -44,16 +44,16 @@ class RouteSubscriber extends RouteSubscriberBase {
 
         $options = $entity_route->getOptions();
         if ($bundle_entity_type = $entity_type->getBundleEntityType()) {
-          $options['parameters'][$bundle_entity_type] = array(
+          $options['parameters'][$bundle_entity_type] = [
             'type' => 'entity:' . $bundle_entity_type,
-          );
+          ];
         }
         // Special parameter used to easily recognize all Field UI routes.
         $options['_field_ui'] = TRUE;
 
-        $defaults = array(
+        $defaults = [
           'entity_type_id' => $entity_type_id,
-        );
+        ];
         // If the entity type has no bundles and it doesn't use {bundle} in its
         // admin path, use the entity type.
         if (strpos($path, '{bundle}') === FALSE) {
@@ -62,95 +62,95 @@ class RouteSubscriber extends RouteSubscriberBase {
 
         $route = new Route(
           "$path/fields/{field_config}",
-          array(
+          [
             '_entity_form' => 'field_config.edit',
             '_title_callback' => '\Drupal\field_ui\Form\FieldConfigEditForm::getTitle',
-          ) + $defaults,
-          array('_entity_access' => 'field_config.update'),
+          ] + $defaults,
+          ['_entity_access' => 'field_config.update'],
           $options
         );
         $collection->add("entity.field_config.{$entity_type_id}_field_edit_form", $route);
 
         $route = new Route(
           "$path/fields/{field_config}/storage",
-          array('_entity_form' => 'field_storage_config.edit') + $defaults,
-          array('_permission' => 'administer ' . $entity_type_id . ' fields'),
+          ['_entity_form' => 'field_storage_config.edit'] + $defaults,
+          ['_permission' => 'administer ' . $entity_type_id . ' fields'],
           $options
         );
         $collection->add("entity.field_config.{$entity_type_id}_storage_edit_form", $route);
 
         $route = new Route(
           "$path/fields/{field_config}/delete",
-          array('_entity_form' => 'field_config.delete') + $defaults,
-          array('_entity_access' => 'field_config.delete'),
+          ['_entity_form' => 'field_config.delete'] + $defaults,
+          ['_entity_access' => 'field_config.delete'],
           $options
         );
         $collection->add("entity.field_config.{$entity_type_id}_field_delete_form", $route);
 
         $route = new Route(
           "$path/fields",
-          array(
+          [
             '_controller' => '\Drupal\field_ui\Controller\FieldConfigListController::listing',
             '_title' => 'Manage fields',
-          ) + $defaults,
-          array('_permission' => 'administer ' . $entity_type_id . ' fields'),
+          ] + $defaults,
+          ['_permission' => 'administer ' . $entity_type_id . ' fields'],
           $options
         );
         $collection->add("entity.{$entity_type_id}.field_ui_fields", $route);
 
         $route = new Route(
           "$path/fields/add-field",
-          array(
+          [
             '_form' => '\Drupal\field_ui\Form\FieldStorageAddForm',
             '_title' => 'Add field',
-          ) + $defaults,
-          array('_permission' => 'administer ' . $entity_type_id . ' fields'),
+          ] + $defaults,
+          ['_permission' => 'administer ' . $entity_type_id . ' fields'],
           $options
         );
         $collection->add("field_ui.field_storage_config_add_$entity_type_id", $route);
 
         $route = new Route(
           "$path/form-display",
-          array(
+          [
             '_entity_form' => 'entity_form_display.edit',
             '_title' => 'Manage form display',
             'form_mode_name' => 'default',
-          ) + $defaults,
-          array('_field_ui_form_mode_access' => 'administer ' . $entity_type_id . ' form display'),
+          ] + $defaults,
+          ['_field_ui_form_mode_access' => 'administer ' . $entity_type_id . ' form display'],
           $options
         );
         $collection->add("entity.entity_form_display.{$entity_type_id}.default", $route);
 
         $route = new Route(
           "$path/form-display/{form_mode_name}",
-          array(
+          [
             '_entity_form' => 'entity_form_display.edit',
             '_title' => 'Manage form display',
-          ) + $defaults,
-          array('_field_ui_form_mode_access' => 'administer ' . $entity_type_id . ' form display'),
+          ] + $defaults,
+          ['_field_ui_form_mode_access' => 'administer ' . $entity_type_id . ' form display'],
           $options
         );
         $collection->add("entity.entity_form_display.{$entity_type_id}.form_mode", $route);
 
         $route = new Route(
           "$path/display",
-          array(
+          [
             '_entity_form' => 'entity_view_display.edit',
             '_title' => 'Manage display',
             'view_mode_name' => 'default',
-          ) + $defaults,
-          array('_field_ui_view_mode_access' => 'administer ' . $entity_type_id . ' display'),
+          ] + $defaults,
+          ['_field_ui_view_mode_access' => 'administer ' . $entity_type_id . ' display'],
           $options
         );
         $collection->add("entity.entity_view_display.{$entity_type_id}.default", $route);
 
         $route = new Route(
           "$path/display/{view_mode_name}",
-          array(
+          [
             '_entity_form' => 'entity_view_display.edit',
             '_title' => 'Manage display',
-          ) + $defaults,
-          array('_field_ui_view_mode_access' => 'administer ' . $entity_type_id . ' display'),
+          ] + $defaults,
+          ['_field_ui_view_mode_access' => 'administer ' . $entity_type_id . ' display'],
           $options
         );
         $collection->add("entity.entity_view_display.{$entity_type_id}.view_mode", $route);
@@ -163,7 +163,7 @@ class RouteSubscriber extends RouteSubscriberBase {
    */
   public static function getSubscribedEvents() {
     $events = parent::getSubscribedEvents();
-    $events[RoutingEvents::ALTER] = array('onAlterRoutes', -100);
+    $events[RoutingEvents::ALTER] = ['onAlterRoutes', -100];
     return $events;
   }
 
diff --git a/web/core/modules/field_ui/src/Tests/FieldUIDeleteTest.php b/web/core/modules/field_ui/src/Tests/FieldUIDeleteTest.php
index 59469ac9b..270415730 100644
--- a/web/core/modules/field_ui/src/Tests/FieldUIDeleteTest.php
+++ b/web/core/modules/field_ui/src/Tests/FieldUIDeleteTest.php
@@ -21,14 +21,14 @@ class FieldUIDeleteTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field_ui', 'field_test', 'block', 'field_test_views');
+  public static $modules = ['node', 'field_ui', 'field_test', 'block', 'field_test_views'];
 
   /**
    * Test views to enable
    *
    * @var string[]
    */
-  public static $testViews = array('test_view_field_delete');
+  public static $testViews = ['test_view_field_delete'];
 
   /**
    * {@inheritdoc}
@@ -41,21 +41,21 @@ class FieldUIDeleteTest extends WebTestBase {
     $this->drupalPlaceBlock('page_title_block');
 
     // Create a test user.
-    $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer users', 'administer account settings', 'administer user display', 'bypass node access'));
+    $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer users', 'administer account settings', 'administer user display', 'bypass node access']);
     $this->drupalLogin($admin_user);
   }
 
   /**
    * Tests that deletion removes field storages and fields as expected.
    */
-  function testDeleteField() {
+  public function testDeleteField() {
     $field_label = $this->randomMachineName();
     $field_name_input = 'test';
     $field_name = 'field_test';
 
     // Create an additional node type.
     $type_name1 = strtolower($this->randomMachineName(8)) . '_test';
-    $type1 = $this->drupalCreateContentType(array('name' => $type_name1, 'type' => $type_name1));
+    $type1 = $this->drupalCreateContentType(['name' => $type_name1, 'type' => $type_name1]);
     $type_name1 = $type1->id();
 
     // Create a new field.
@@ -64,7 +64,7 @@ class FieldUIDeleteTest extends WebTestBase {
 
     // Create an additional node type.
     $type_name2 = strtolower($this->randomMachineName(8)) . '_test';
-    $type2 = $this->drupalCreateContentType(array('name' => $type_name2, 'type' => $type_name2));
+    $type2 = $this->drupalCreateContentType(['name' => $type_name2, 'type' => $type_name2]);
     $type_name2 = $type2->id();
 
     // Add a field to the second node type.
@@ -72,7 +72,7 @@ class FieldUIDeleteTest extends WebTestBase {
     $this->fieldUIAddExistingField($bundle_path2, $field_name, $field_label);
 
     \Drupal::service('module_installer')->install(['views']);
-    ViewTestData::createTestViews(get_class($this), array('field_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['field_test_views']);
 
     // Check the config dependencies of the first field, the field storage must
     // not be shown as being deleted yet.
diff --git a/web/core/modules/field_ui/src/Tests/FieldUiTestTrait.php b/web/core/modules/field_ui/src/Tests/FieldUiTestTrait.php
index 9bb0ecb0d..39c41a302 100644
--- a/web/core/modules/field_ui/src/Tests/FieldUiTestTrait.php
+++ b/web/core/modules/field_ui/src/Tests/FieldUiTestTrait.php
@@ -26,13 +26,13 @@ trait FieldUiTestTrait {
    *   (optional) $edit parameter for drupalPostForm() on the third step ('Field
    *   settings' form).
    */
-  public function fieldUIAddNewField($bundle_path, $field_name, $label = NULL, $field_type = 'test_field', array $storage_edit = array(), array $field_edit = array()) {
+  public function fieldUIAddNewField($bundle_path, $field_name, $label = NULL, $field_type = 'test_field', array $storage_edit = [], array $field_edit = []) {
     $label = $label ?: $this->randomString();
-    $initial_edit = array(
+    $initial_edit = [
       'new_storage_type' => $field_type,
       'label' => $label,
       'field_name' => $field_name,
-    );
+    ];
 
     // Allow the caller to set a NULL path in case they navigated to the right
     // page before calling this method.
@@ -42,17 +42,17 @@ trait FieldUiTestTrait {
 
     // First step: 'Add field' page.
     $this->drupalPostForm($bundle_path, $initial_edit, t('Save and continue'));
-    $this->assertRaw(t('These settings apply to the %label field everywhere it is used.', array('%label' => $label)), 'Storage settings page was displayed.');
+    $this->assertRaw(t('These settings apply to the %label field everywhere it is used.', ['%label' => $label]), 'Storage settings page was displayed.');
     // Test Breadcrumbs.
     $this->assertLink($label, 0, 'Field label is correct in the breadcrumb of the storage settings page.');
 
     // Second step: 'Storage settings' form.
     $this->drupalPostForm(NULL, $storage_edit, t('Save field settings'));
-    $this->assertRaw(t('Updated field %label field settings.', array('%label' => $label)), 'Redirected to field settings page.');
+    $this->assertRaw(t('Updated field %label field settings.', ['%label' => $label]), 'Redirected to field settings page.');
 
     // Third step: 'Field settings' form.
     $this->drupalPostForm(NULL, $field_edit, t('Save settings'));
-    $this->assertRaw(t('Saved %label configuration.', array('%label' => $label)), 'Redirected to "Manage fields" page.');
+    $this->assertRaw(t('Saved %label configuration.', ['%label' => $label]), 'Redirected to "Manage fields" page.');
 
     // Check that the field appears in the overview form.
     $this->assertFieldByXPath('//table[@id="field-overview"]//tr/td[1]', $label, 'Field was created and appears in the overview page.');
@@ -72,12 +72,12 @@ trait FieldUiTestTrait {
    *   (optional) $edit parameter for drupalPostForm() on the second step
    *   ('Field settings' form).
    */
-  public function fieldUIAddExistingField($bundle_path, $existing_storage_name, $label = NULL, array $field_edit = array()) {
+  public function fieldUIAddExistingField($bundle_path, $existing_storage_name, $label = NULL, array $field_edit = []) {
     $label = $label ?: $this->randomString();
-    $initial_edit = array(
+    $initial_edit = [
       'existing_storage_name' => $existing_storage_name,
       'existing_storage_label' => $label,
-    );
+    ];
 
     // First step: 'Re-use existing field' on the 'Add field' page.
     $this->drupalPostForm("$bundle_path/fields/add-field", $initial_edit, t('Save and continue'));
@@ -90,7 +90,7 @@ trait FieldUiTestTrait {
 
     // Second step: 'Field settings' form.
     $this->drupalPostForm(NULL, $field_edit, t('Save settings'));
-    $this->assertRaw(t('Saved %label configuration.', array('%label' => $label)), 'Redirected to "Manage fields" page.');
+    $this->assertRaw(t('Saved %label configuration.', ['%label' => $label]), 'Redirected to "Manage fields" page.');
 
     // Check that the field appears in the overview form.
     $this->assertFieldByXPath('//table[@id="field-overview"]//tr/td[1]', $label, 'Field was created and appears in the overview page.');
@@ -111,14 +111,14 @@ trait FieldUiTestTrait {
   public function fieldUIDeleteField($bundle_path, $field_name, $label, $bundle_label) {
     // Display confirmation form.
     $this->drupalGet("$bundle_path/fields/$field_name/delete");
-    $this->assertRaw(t('Are you sure you want to delete the field %label', array('%label' => $label)), 'Delete confirmation was found.');
+    $this->assertRaw(t('Are you sure you want to delete the field %label', ['%label' => $label]), 'Delete confirmation was found.');
 
     // Test Breadcrumbs.
     $this->assertLink($label, 0, 'Field label is correct in the breadcrumb of the field delete page.');
 
     // Submit confirmation form.
-    $this->drupalPostForm(NULL, array(), t('Delete'));
-    $this->assertRaw(t('The field %label has been deleted from the %type content type.', array('%label' => $label, '%type' => $bundle_label)), 'Delete message was found.');
+    $this->drupalPostForm(NULL, [], t('Delete'));
+    $this->assertRaw(t('The field %label has been deleted from the %type content type.', ['%label' => $label, '%type' => $bundle_label]), 'Delete message was found.');
 
     // Check that the field does not appear in the overview form.
     $this->assertNoFieldByXPath('//table[@id="field-overview"]//span[@class="label-field"]', $label, 'Field does not appear in the overview page.');
diff --git a/web/core/modules/field_ui/src/Tests/ManageDisplayTest.php b/web/core/modules/field_ui/src/Tests/ManageDisplayTest.php
index 4cd290163..727547817 100644
--- a/web/core/modules/field_ui/src/Tests/ManageDisplayTest.php
+++ b/web/core/modules/field_ui/src/Tests/ManageDisplayTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\field_ui\Tests;
 
 use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\LanguageInterface;
@@ -24,7 +25,7 @@ class ManageDisplayTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field_ui', 'taxonomy', 'search', 'field_test', 'field_third_party_test', 'block');
+  public static $modules = ['node', 'field_ui', 'taxonomy', 'search', 'field_test', 'field_third_party_test', 'block'];
 
   /**
    * {@inheritdoc}
@@ -34,24 +35,24 @@ class ManageDisplayTest extends WebTestBase {
     $this->drupalPlaceBlock('system_breadcrumb_block');
 
     // Create a test user.
-    $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer taxonomy', 'administer taxonomy_term fields', 'administer taxonomy_term display', 'administer users', 'administer account settings', 'administer user display', 'bypass node access'));
+    $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer taxonomy', 'administer taxonomy_term fields', 'administer taxonomy_term display', 'administer users', 'administer account settings', 'administer user display', 'bypass node access']);
     $this->drupalLogin($admin_user);
 
     // Create content type, with underscores.
     $type_name = strtolower($this->randomMachineName(8)) . '_test';
-    $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name));
+    $type = $this->drupalCreateContentType(['name' => $type_name, 'type' => $type_name]);
     $this->type = $type->id();
 
     // Create a default vocabulary.
-    $vocabulary = Vocabulary::create(array(
+    $vocabulary = Vocabulary::create([
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => Unicode::strtolower($this->randomMachineName()),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'help' => '',
-      'nodes' => array('article' => 'article'),
+      'nodes' => ['article' => 'article'],
       'weight' => mt_rand(0, 10),
-    ));
+    ]);
     $vocabulary->save();
     $this->vocabulary = $vocabulary->id();
   }
@@ -59,7 +60,7 @@ class ManageDisplayTest extends WebTestBase {
   /**
    * Tests formatter settings.
    */
-  function testFormatterUI() {
+  public function testFormatterUI() {
     $manage_fields = 'admin/structure/types/manage/' . $this->type;
     $manage_display = $manage_fields . '/display';
 
@@ -82,11 +83,11 @@ class ManageDisplayTest extends WebTestBase {
     $this->assertText("$setting_name: $setting_value", 'The expected summary is displayed.');
 
     // Check whether formatter weights are respected.
-    $result = $this->xpath('//select[@id=:id]/option', array(':id' => 'edit-fields-field-test-type'));
+    $result = $this->xpath('//select[@id=:id]/option', [':id' => 'edit-fields-field-test-type']);
     $options = array_map(function($item) {
       return (string) $item->attributes()->value[0];
     }, $result);
-    $expected_options = array (
+    $expected_options = [
       'field_no_settings',
       'field_empty_test',
       'field_empty_setting',
@@ -94,13 +95,32 @@ class ManageDisplayTest extends WebTestBase {
       'field_test_multiple',
       'field_test_with_prepare_view',
       'field_test_applicable',
-      'hidden',
-    );
+    ];
     $this->assertEqual($options, $expected_options, 'The expected formatter ordering is respected.');
 
+    // Ensure that fields can be hidden directly by changing the region.
+    $this->drupalGet($manage_display);
+    $this->assertFieldByName('fields[field_test][region]', 'content');
+    $edit = ['fields[field_test][region]' => 'hidden'];
+    $this->drupalPostForm($manage_display, $edit, t('Save'));
+    $this->assertFieldByName('fields[field_test][region]', 'hidden');
+    $display = EntityViewDisplay::load("node.{$this->type}.default");
+    $this->assertNull($display->getComponent('field_test'));
+
+    // Restore the field to the content region.
+    $edit = [
+      'fields[field_test][type]' => 'field_test_default',
+      'fields[field_test][region]' => 'content',
+    ];
+    $this->drupalPostForm($manage_display, $edit, t('Save'));
+
     // Change the formatter and check that the summary is updated.
-    $edit = array('fields[field_test][type]' => 'field_test_multiple', 'refresh_rows' => 'field_test');
-    $this->drupalPostAjaxForm(NULL, $edit, array('op' => t('Refresh')));
+    $edit = [
+      'fields[field_test][type]' => 'field_test_multiple',
+      'fields[field_test][region]' => 'content',
+      'refresh_rows' => 'field_test'
+    ];
+    $this->drupalPostAjaxForm(NULL, $edit, ['op' => t('Refresh')]);
     $format = 'field_test_multiple';
     $default_settings = \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings($format);
     $setting_name = key($default_settings);
@@ -109,7 +129,7 @@ class ManageDisplayTest extends WebTestBase {
     $this->assertText("$setting_name: $setting_value", 'The expected summary is displayed.');
 
     // Submit the form and check that the display is updated.
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $display = entity_get_display('node', $this->type, 'default');
     $display_options = $display->getComponent('field_test');
     $current_format = $display_options['type'];
@@ -122,17 +142,17 @@ class ManageDisplayTest extends WebTestBase {
 
     // Click on the formatter settings button to open the formatter settings
     // form.
-    $this->drupalPostAjaxForm(NULL, array(), "field_test_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], "field_test_settings_edit");
 
     // Assert that the field added in
     // field_test_field_formatter_third_party_settings_form() is present.
     $fieldname = 'fields[field_test][settings_edit_form][third_party_settings][field_third_party_test][field_test_field_formatter_third_party_settings_form]';
     $this->assertField($fieldname, 'The field added in hook_field_formatter_third_party_settings_form() is present on the settings form.');
-    $edit = array($fieldname => 'foo');
+    $edit = [$fieldname => 'foo'];
     $this->drupalPostAjaxForm(NULL, $edit, "field_test_plugin_settings_update");
 
     // Save the form to save the third party settings.
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     \Drupal::entityManager()->clearCachedFieldDefinitions();
     $id = 'node.' . $this->type . '.default';
@@ -143,35 +163,42 @@ class ManageDisplayTest extends WebTestBase {
     $this->assertTrue(in_array('field_third_party_test', $display->calculateDependencies()->getDependencies()['module']), 'The display has a dependency on field_third_party_test module.');
 
     // Confirm that the third party settings are not updated on the settings form.
-    $this->drupalPostAjaxForm(NULL, array(), "field_test_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], "field_test_settings_edit");
     $this->assertFieldByName($fieldname, '');
 
     // Test the empty setting formatter.
-    $edit = array('fields[field_test][type]' => 'field_empty_setting');
+    $edit = [
+      'fields[field_test][type]' => 'field_empty_setting',
+      'fields[field_test][region]' => 'content',
+      ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertNoText('Default empty setting now has a value.');
     $this->assertFieldById('edit-fields-field-test-settings-edit');
-    $this->drupalPostAjaxForm(NULL, array(), "field_test_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], "field_test_settings_edit");
     $fieldname = 'fields[field_test][settings_edit_form][settings][field_empty_setting]';
-    $edit = array($fieldname => 'non empty setting');
+    $edit = [$fieldname => 'non empty setting'];
     $this->drupalPostAjaxForm(NULL, $edit, "field_test_plugin_settings_update");
     $this->assertText('Default empty setting now has a value.');
 
     // Test the settings form behavior. An edit button should be present since
     // there are third party settings to configure.
-    $edit = array('fields[field_test][type]' => 'field_no_settings', 'refresh_rows' => 'field_test');
-    $this->drupalPostAjaxForm(NULL, $edit, array('op' => t('Refresh')));
+    $edit = [
+      'fields[field_test][type]' => 'field_no_settings',
+      'fields[field_test][region]' => 'content',
+      'refresh_rows' => 'field_test',
+    ];
+    $this->drupalPostAjaxForm(NULL, $edit, ['op' => t('Refresh')]);
     $this->assertFieldByName('field_test_settings_edit');
 
     // Make sure we can save the third party settings when there are no settings available
-    $this->drupalPostAjaxForm(NULL, array(), "field_test_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], "field_test_settings_edit");
     $this->drupalPostAjaxForm(NULL, $edit, "field_test_plugin_settings_update");
 
     // When a module providing third-party settings to a formatter (or widget)
     // is uninstalled, the formatter remains enabled but the provided settings,
     // together with the corresponding form elements, are removed from the
     // display component.
-    \Drupal::service('module_installer')->uninstall(array('field_third_party_test'));
+    \Drupal::service('module_installer')->uninstall(['field_third_party_test']);
 
     // Ensure the button is still there after the module has been disabled.
     $this->drupalGet($manage_display);
@@ -179,7 +206,7 @@ class ManageDisplayTest extends WebTestBase {
     $this->assertFieldByName('field_test_settings_edit');
 
     // Ensure that third-party form elements are not present anymore.
-    $this->drupalPostAjaxForm(NULL, array(), 'field_test_settings_edit');
+    $this->drupalPostAjaxForm(NULL, [], 'field_test_settings_edit');
     $fieldname = 'fields[field_test][settings_edit_form][third_party_settings][field_third_party_test][field_test_field_formatter_third_party_settings_form]';
     $this->assertNoField($fieldname);
 
@@ -218,20 +245,23 @@ class ManageDisplayTest extends WebTestBase {
     $this->assertText("$setting_name: $setting_value", 'The expected summary is displayed.');
 
     // Check whether widget weights are respected.
-    $result = $this->xpath('//select[@id=:id]/option', array(':id' => 'edit-fields-field-test-type'));
+    $result = $this->xpath('//select[@id=:id]/option', [':id' => 'edit-fields-field-test-type']);
     $options = array_map(function($item) {
       return (string) $item->attributes()->value[0];
     }, $result);
-    $expected_options = array (
+    $expected_options = [
       'test_field_widget',
       'test_field_widget_multiple',
-      'hidden',
-    );
+    ];
     $this->assertEqual($options, $expected_options, 'The expected widget ordering is respected.');
 
     // Change the widget and check that the summary is updated.
-    $edit = array('fields[field_test][type]' => 'test_field_widget_multiple', 'refresh_rows' => 'field_test');
-    $this->drupalPostAjaxForm(NULL, $edit, array('op' => t('Refresh')));
+    $edit = [
+      'fields[field_test][type]' => 'test_field_widget_multiple',
+      'fields[field_test][region]' => 'content',
+      'refresh_rows' => 'field_test',
+    ];
+    $this->drupalPostAjaxForm(NULL, $edit, ['op' => t('Refresh')]);
     $widget_type = 'test_field_widget_multiple';
     $default_settings = \Drupal::service('plugin.manager.field.widget')->getDefaultSettings($widget_type);
     $setting_name = key($default_settings);
@@ -240,7 +270,7 @@ class ManageDisplayTest extends WebTestBase {
     $this->assertText("$setting_name: $setting_value", 'The expected summary is displayed.');
 
     // Submit the form and check that the display is updated.
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $display = entity_get_form_display('node', $this->type, 'default');
     $display_options = $display->getComponent('field_test');
     $current_widget = $display_options['type'];
@@ -252,26 +282,26 @@ class ManageDisplayTest extends WebTestBase {
     $this->assertText('field_test_field_widget_settings_summary_alter');
 
     // Click on the widget settings button to open the widget settings form.
-    $this->drupalPostAjaxForm(NULL, array(), "field_test_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], "field_test_settings_edit");
 
     // Assert that the field added in
     // field_test_field_widget_third_party_settings_form() is present.
     $fieldname = 'fields[field_test][settings_edit_form][third_party_settings][field_third_party_test][field_test_widget_third_party_settings_form]';
     $this->assertField($fieldname, 'The field added in hook_field_widget_third_party_settings_form() is present on the settings form.');
-    $edit = array($fieldname => 'foo');
+    $edit = [$fieldname => 'foo'];
     $this->drupalPostAjaxForm(NULL, $edit, "field_test_plugin_settings_update");
 
     // Save the form to save the third party settings.
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     \Drupal::entityManager()->clearCachedFieldDefinitions();
     $storage = $this->container->get('entity_type.manager')->getStorage('entity_form_display');
-    $storage->resetCache(array('node.' . $this->type . '.default'));
+    $storage->resetCache(['node.' . $this->type . '.default']);
     $display = $storage->load('node.' . $this->type . '.default');
     $this->assertEqual($display->getRenderer('field_test')->getThirdPartySetting('field_third_party_test', 'field_test_widget_third_party_settings_form'), 'foo');
     $this->assertTrue(in_array('field_third_party_test', $display->calculateDependencies()->getDependencies()['module']), 'Form display does not have a dependency on field_third_party_test module.');
 
     // Confirm that the third party settings are not updated on the settings form.
-    $this->drupalPostAjaxForm(NULL, array(), "field_test_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], "field_test_settings_edit");
     $this->assertFieldByName($fieldname, '');
 
     // Creates a new field that can not be used with the multiple formatter.
@@ -282,14 +312,22 @@ class ManageDisplayTest extends WebTestBase {
     $this->drupalGet($manage_display);
 
     // Checks if the select elements contain the specified options.
-    $this->assertFieldSelectOptions('fields[field_test][type]', array('test_field_widget', 'test_field_widget_multiple', 'hidden'));
-    $this->assertFieldSelectOptions('fields[field_onewidgetfield][type]', array('test_field_widget', 'hidden'));
+    $this->assertFieldSelectOptions('fields[field_test][type]', ['test_field_widget', 'test_field_widget_multiple']);
+    $this->assertFieldSelectOptions('fields[field_onewidgetfield][type]', ['test_field_widget']);
+
+    // Ensure that fields can be hidden directly by changing the region.
+    $this->assertFieldByName('fields[field_test][region]', 'content');
+    $edit = ['fields[field_test][region]' => 'hidden'];
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    $this->assertFieldByName('fields[field_test][region]', 'hidden');
+    $display = EntityFormDisplay::load("node.{$this->type}.default");
+    $this->assertNull($display->getComponent('field_test'));
   }
 
   /**
    * Tests switching view modes to use custom or 'default' settings'.
    */
-  function testViewModeCustom() {
+  public function testViewModeCustom() {
     // Create a field, and a node with some data for the field.
     $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->type, 'test', 'Test field');
     \Drupal::entityManager()->clearCachedFieldDefinitions();
@@ -297,20 +335,20 @@ class ManageDisplayTest extends WebTestBase {
     // to appear in a rendered node other than as part of the field being tested
     // (for example, unlikely to be part of the "Submitted by ... on ..." line).
     $value = 12345;
-    $settings = array(
+    $settings = [
       'type' => $this->type,
-      'field_test' => array(array('value' => $value)),
-    );
+      'field_test' => [['value' => $value]],
+    ];
     $node = $this->drupalCreateNode($settings);
 
     // Gather expected output values with the various formatters.
     $formatter_plugin_manager = \Drupal::service('plugin.manager.field.formatter');
     $field_test_default_settings = $formatter_plugin_manager->getDefaultSettings('field_test_default');
     $field_test_with_prepare_view_settings = $formatter_plugin_manager->getDefaultSettings('field_test_with_prepare_view');
-    $output = array(
+    $output = [
       'field_test_default' => $field_test_default_settings['test_formatter_setting'] . '|' . $value,
       'field_test_with_prepare_view' => $field_test_with_prepare_view_settings['test_formatter_setting_additional'] . '|' . $value . '|' . ($value + 1),
-    );
+    ];
 
     // Check that the field is displayed with the default formatter in 'rss'
     // mode (uses 'default'), and hidden in 'teaser' mode (uses custom settings).
@@ -319,39 +357,40 @@ class ManageDisplayTest extends WebTestBase {
 
     // Change formatter for 'default' mode, check that the field is displayed
     // accordingly in 'rss' mode.
-    $edit = array(
+    $edit = [
       'fields[field_test][type]' => 'field_test_with_prepare_view',
-    );
+      'fields[field_test][region]' => 'content',
+    ];
     $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display', $edit, t('Save'));
     $this->assertNodeViewText($node, 'rss', $output['field_test_with_prepare_view'], "The field is displayed as expected in view modes that use 'default' settings.");
 
     // Specialize the 'rss' mode, check that the field is displayed the same.
-    $edit = array(
+    $edit = [
       "display_modes_custom[rss]" => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display', $edit, t('Save'));
     $this->assertNodeViewText($node, 'rss', $output['field_test_with_prepare_view'], "The field is displayed as expected in newly specialized 'rss' mode.");
 
     // Set the field to 'hidden' in the view mode, check that the field is
     // hidden.
-    $edit = array(
-      'fields[field_test][type]' => 'hidden',
-    );
+    $edit = [
+      'fields[field_test][region]' => 'hidden',
+    ];
     $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display/rss', $edit, t('Save'));
     $this->assertNodeViewNoText($node, 'rss', $value, "The field is hidden in 'rss' mode.");
 
     // Set the view mode back to 'default', check that the field is displayed
     // accordingly.
-    $edit = array(
+    $edit = [
       "display_modes_custom[rss]" => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display', $edit, t('Save'));
     $this->assertNodeViewText($node, 'rss', $output['field_test_with_prepare_view'], "The field is displayed as expected when 'rss' mode is set back to 'default' settings.");
 
     // Specialize the view mode again.
-    $edit = array(
+    $edit = [
       "display_modes_custom[rss]" => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/' . $this->type . '/display', $edit, t('Save'));
     // Check that the previous settings for the view mode have been kept.
     $this->assertNodeViewNoText($node, 'rss', $value, "The previous settings are kept when 'rss' mode is specialized again.");
@@ -371,39 +410,39 @@ class ManageDisplayTest extends WebTestBase {
   /**
    * Tests that fields with no explicit display settings do not break.
    */
-  function testNonInitializedFields() {
+  public function testNonInitializedFields() {
     // Create a test field.
     $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->type, 'test', 'Test');
 
     // Check that the field appears as 'hidden' on the 'Manage display' page
     // for the 'teaser' mode.
     $this->drupalGet('admin/structure/types/manage/' . $this->type . '/display/teaser');
-    $this->assertFieldByName('fields[field_test][type]', 'hidden', 'The field is displayed as \'hidden \'.');
+    $this->assertFieldByName('fields[field_test][region]', 'hidden', 'The field is displayed as \'hidden \'.');
   }
 
   /**
    * Tests hiding the view modes fieldset when there's only one available.
    */
-  function testSingleViewMode() {
+  public function testSingleViewMode() {
     $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary . '/display');
     $this->assertNoText('Use custom display settings for the following view modes', 'Custom display settings fieldset found.');
 
     // This may not trigger a notice when 'view_modes_custom' isn't available.
-    $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary . '/overview/display', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary . '/overview/display', [], t('Save'));
   }
 
   /**
    * Tests that a message is shown when there are no fields.
    */
-  function testNoFieldsDisplayOverview() {
+  public function testNoFieldsDisplayOverview() {
     // Create a fresh content type without any fields.
-    NodeType::create(array(
+    NodeType::create([
       'type' => 'no_fields',
       'name' => 'No fields',
-    ))->save();
+    ])->save();
 
     $this->drupalGet('admin/structure/types/manage/no_fields/display');
-    $this->assertRaw(t('There are no fields yet added. You can add new fields on the <a href=":link">Manage fields</a> page.', array(':link' => \Drupal::url('entity.node.field_ui_fields', array('node_type' => 'no_fields')))));
+    $this->assertRaw(t('There are no fields yet added. You can add new fields on the <a href=":link">Manage fields</a> page.', [':link' => \Drupal::url('entity.node.field_ui_fields', ['node_type' => 'no_fields'])]));
   }
 
   /**
@@ -421,7 +460,7 @@ class ManageDisplayTest extends WebTestBase {
    * @return
    *   TRUE on pass, FALSE on fail.
    */
-  function assertNodeViewText(EntityInterface $node, $view_mode, $text, $message) {
+  public function assertNodeViewText(EntityInterface $node, $view_mode, $text, $message) {
     return $this->assertNodeViewTextHelper($node, $view_mode, $text, $message, FALSE);
   }
 
@@ -439,7 +478,7 @@ class ManageDisplayTest extends WebTestBase {
    * @return
    *   TRUE on pass, FALSE on fail.
    */
-  function assertNodeViewNoText(EntityInterface $node, $view_mode, $text, $message) {
+  public function assertNodeViewNoText(EntityInterface $node, $view_mode, $text, $message) {
     return $this->assertNodeViewTextHelper($node, $view_mode, $text, $message, TRUE);
   }
 
@@ -463,7 +502,7 @@ class ManageDisplayTest extends WebTestBase {
    * @return
    *   TRUE on pass, FALSE on fail.
    */
-  function assertNodeViewTextHelper(EntityInterface $node, $view_mode, $text, $message, $not_exists) {
+  public function assertNodeViewTextHelper(EntityInterface $node, $view_mode, $text, $message, $not_exists) {
     // Make sure caches on the tester side are refreshed after changes
     // submitted on the tested side.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
@@ -475,7 +514,7 @@ class ManageDisplayTest extends WebTestBase {
     $clone = clone $node;
     $element = node_view($clone, $view_mode);
     $output = \Drupal::service('renderer')->renderRoot($element);
-    $this->verbose(t('Rendered node - view mode: @view_mode', array('@view_mode' => $view_mode)) . '<hr />' . $output);
+    $this->verbose(t('Rendered node - view mode: @view_mode', ['@view_mode' => $view_mode]) . '<hr />' . $output);
 
     // Assign content so that WebTestBase functions can be used.
     $this->setRawContent($output);
@@ -500,7 +539,7 @@ class ManageDisplayTest extends WebTestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertFieldSelectOptions($name, array $expected_options) {
-    $xpath = $this->buildXPathQuery('//select[@name=:name]', array(':name' => $name));
+    $xpath = $this->buildXPathQuery('//select[@name=:name]', [':name' => $name]);
     $fields = $this->xpath($xpath);
     if ($fields) {
       $field = $fields[0];
@@ -526,7 +565,7 @@ class ManageDisplayTest extends WebTestBase {
    *   An array of option values as strings.
    */
   protected function getAllOptionsList(\SimpleXMLElement $element) {
-    $options = array();
+    $options = [];
     // Add all options items.
     foreach ($element->option as $option) {
       $options[] = (string) $option['value'];
diff --git a/web/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/web/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index cbe9f53e9..d08ab03ba 100644
--- a/web/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/web/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -26,7 +26,7 @@ class ManageFieldsTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field_ui', 'field_test', 'taxonomy', 'image', 'block');
+  public static $modules = ['node', 'field_ui', 'field_test', 'taxonomy', 'image', 'block'];
 
   /**
    * The ID of the custom content type created for testing.
@@ -68,12 +68,12 @@ class ManageFieldsTest extends WebTestBase {
     $this->drupalPlaceBlock('page_title_block');
 
     // Create a test user.
-    $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer taxonomy', 'administer taxonomy_term fields', 'administer taxonomy_term display', 'administer users', 'administer account settings', 'administer user display', 'bypass node access'));
+    $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer taxonomy', 'administer taxonomy_term fields', 'administer taxonomy_term display', 'administer users', 'administer account settings', 'administer user display', 'bypass node access']);
     $this->drupalLogin($admin_user);
 
     // Create content type, with underscores.
     $type_name = strtolower($this->randomMachineName(8)) . '_test';
-    $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name));
+    $type = $this->drupalCreateContentType(['name' => $type_name, 'type' => $type_name]);
     $this->contentType = $type->id();
 
     // Create random field name with markup to test escaping.
@@ -82,22 +82,22 @@ class ManageFieldsTest extends WebTestBase {
     $this->fieldName = 'field_' . $this->fieldNameInput;
 
     // Create Basic page and Article node types.
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
 
     // Create a vocabulary named "Tags".
-    $vocabulary = Vocabulary::create(array(
+    $vocabulary = Vocabulary::create([
       'name' => 'Tags',
       'vid' => 'tags',
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
     $vocabulary->save();
 
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $vocabulary->id() => $vocabulary->id(),
-      ),
-    );
+      ],
+    ];
     $this->createEntityReferenceField('node', 'article', 'field_' . $vocabulary->id(), 'Tags', 'taxonomy_term', 'default', $handler_settings);
 
     entity_get_form_display('node', 'article', 'default')
@@ -111,7 +111,7 @@ class ManageFieldsTest extends WebTestBase {
    * In order to act on the same fields, and not create the fields over and over
    * again the following tests create, update and delete the same fields.
    */
-  function testCRUDFields() {
+  public function testCRUDFields() {
     $this->manageFieldsPage();
     $this->createField();
     $this->updateField();
@@ -128,19 +128,19 @@ class ManageFieldsTest extends WebTestBase {
    * @param string $type
    *   (optional) The name of a content type.
    */
-  function manageFieldsPage($type = '') {
+  public function manageFieldsPage($type = '') {
     $type = empty($type) ? $this->contentType : $type;
     $this->drupalGet('admin/structure/types/manage/' . $type . '/fields');
     // Check all table columns.
-    $table_headers = array(
+    $table_headers = [
       t('Label'),
       t('Machine name'),
       t('Field type'),
       t('Operations'),
-    );
+    ];
     foreach ($table_headers as $table_header) {
       // We check that the label appear in the table headings.
-      $this->assertRaw($table_header . '</th>', format_string('%table_header table header was found.', array('%table_header' => $table_header)));
+      $this->assertRaw($table_header . '</th>', format_string('%table_header table header was found.', ['%table_header' => $table_header]));
     }
 
     // Test the "Add field" action link.
@@ -178,7 +178,7 @@ class ManageFieldsTest extends WebTestBase {
    * @todo Assert properties can bet set in the form and read back in
    * $field_storage and $fields.
    */
-  function createField() {
+  public function createField() {
     // Create a test field.
     $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->contentType, $this->fieldNameInput, $this->fieldLabel);
   }
@@ -186,7 +186,7 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests editing an existing field.
    */
-  function updateField() {
+  public function updateField() {
     $field_id = 'node.' . $this->contentType . '.' . $this->fieldName;
     // Go to the field edit page.
     $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/' . $field_id . '/storage');
@@ -194,16 +194,16 @@ class ManageFieldsTest extends WebTestBase {
 
     // Populate the field settings with new settings.
     $string = 'updated dummy test string';
-    $edit = array(
+    $edit = [
       'settings[test_field_storage_setting]' => $string,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save field settings'));
 
     // Go to the field edit page.
     $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/' . $field_id);
-    $edit = array(
+    $edit = [
       'settings[test_field_setting]' => $string,
-    );
+    ];
     $this->assertText(t('Default value'), 'Default value heading is shown');
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
 
@@ -217,7 +217,7 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests adding an existing field in another content type.
    */
-  function addExistingField() {
+  public function addExistingField() {
     // Check "Re-use existing field" appears.
     $this->drupalGet('admin/structure/types/manage/page/fields/add-field');
     $this->assertRaw(t('Re-use an existing field'), '"Re-use existing field" was found.');
@@ -226,7 +226,7 @@ class ManageFieldsTest extends WebTestBase {
     // do not show up in the "Re-use existing field" list.
     $this->assertFalse($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value="comment"]'), 'The list of options respects entity type restrictions.');
     // Validate the FALSE assertion above by also testing a valid one.
-    $this->assertTrue($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', array(':field_name' => $this->fieldName)), 'The list of options shows a valid option.');
+    $this->assertTrue($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', [':field_name' => $this->fieldName]), 'The list of options shows a valid option.');
 
     // Add a new field based on an existing field.
     $this->fieldUIAddExistingField("admin/structure/types/manage/page", $this->fieldName, $this->fieldLabel . '_2');
@@ -238,23 +238,23 @@ class ManageFieldsTest extends WebTestBase {
    * We do not test if the number can be submitted with anything else than a
    * numeric value. That is tested already in FormTest::testNumber().
    */
-  function cardinalitySettings() {
+  public function cardinalitySettings() {
     $field_edit_path = 'admin/structure/types/manage/article/fields/node.article.body/storage';
 
     // Assert the cardinality other field cannot be empty when cardinality is
     // set to 'number'.
-    $edit = array(
+    $edit = [
       'cardinality' => 'number',
       'cardinality_number' => '',
-    );
+    ];
     $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
     $this->assertText('Number of values is required.');
 
     // Submit a custom number.
-    $edit = array(
+    $edit = [
       'cardinality' => 'number',
       'cardinality_number' => 6,
-    );
+    ];
     $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
     $this->assertText('Updated field Body field settings.');
     $this->drupalGet($field_edit_path);
@@ -285,9 +285,9 @@ class ManageFieldsTest extends WebTestBase {
     $this->drupalPostForm('node/add/article', $edit, 'Save');
 
     // Set to unlimited.
-    $edit = array(
+    $edit = [
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    );
+    ];
     $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
     $this->assertText('Updated field Body field settings.');
     $this->drupalGet($field_edit_path);
@@ -340,7 +340,7 @@ class ManageFieldsTest extends WebTestBase {
       // Delete all the body field instances.
       $this->drupalGet('admin/structure/types/manage/' . $node_type . '/fields/node.' . $node_type . '.' . $this->fieldName);
       $this->clickLink(t('Delete'));
-      $this->drupalPostForm(NULL, array(), t('Delete'));
+      $this->drupalPostForm(NULL, [], t('Delete'));
     }
     // Check "Re-use existing field" appears.
     $this->drupalGet('admin/structure/types/manage/page/fields/add-field');
@@ -364,7 +364,7 @@ class ManageFieldsTest extends WebTestBase {
    * @param $entity_type
    *   The entity type for the field.
    */
-  function assertFieldSettings($bundle, $field_name, $string = 'dummy test string', $entity_type = 'node') {
+  public function assertFieldSettings($bundle, $field_name, $string = 'dummy test string', $entity_type = 'node') {
     // Assert field storage settings.
     $field_storage = FieldStorageConfig::loadByName($entity_type, $field_name);
     $this->assertTrue($field_storage->getSetting('test_field_storage_setting') == $string, 'Field storage settings were found.');
@@ -377,7 +377,7 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests that the 'field_prefix' setting works on Field UI.
    */
-  function testFieldPrefix() {
+  public function testFieldPrefix() {
     // Change default field prefix.
     $field_prefix = strtolower($this->randomMachineName(10));
     $this->config('field_ui.settings')->set('field_prefix', $field_prefix)->save();
@@ -387,35 +387,35 @@ class ManageFieldsTest extends WebTestBase {
     $field_exceed_max_length_input = $this->randomMachineName(23);
 
     // Try to create the field.
-    $edit = array(
+    $edit = [
       'label' => $field_exceed_max_length_label,
       'field_name' => $field_exceed_max_length_input,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/' . $this->contentType . '/fields/add-field', $edit, t('Save and continue'));
     $this->assertText('Machine-readable name cannot be longer than 22 characters but is currently 23 characters long.');
 
     // Create a valid field.
     $this->fieldUIAddNewField('admin/structure/types/manage/' . $this->contentType, $this->fieldNameInput, $this->fieldLabel);
     $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/node.' . $this->contentType . '.' . $field_prefix . $this->fieldNameInput);
-    $this->assertText(format_string('@label settings for @type', array('@label' => $this->fieldLabel, '@type' => $this->contentType)));
+    $this->assertText(format_string('@label settings for @type', ['@label' => $this->fieldLabel, '@type' => $this->contentType]));
   }
 
   /**
    * Tests that default value is correctly validated and saved.
    */
-  function testDefaultValue() {
+  public function testDefaultValue() {
     // Create a test field storage and field.
     $field_name = 'test';
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => 'test_field'
-    ))->save();
-    $field = FieldConfig::create(array(
+    ])->save();
+    $field = FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'bundle' => $this->contentType,
-    ));
+    ]);
     $field->save();
 
     entity_get_form_display('node', $this->contentType, 'default')
@@ -429,23 +429,23 @@ class ManageFieldsTest extends WebTestBase {
     $this->assertFieldById($element_id, '', 'The default value widget was empty.');
 
     // Check that invalid default values are rejected.
-    $edit = array($element_name => '-1');
+    $edit = [$element_name => '-1'];
     $this->drupalPostForm($admin_path, $edit, t('Save settings'));
     $this->assertText("$field_name does not accept the value -1", 'Form validation failed.');
 
     // Check that the default value is saved.
-    $edit = array($element_name => '1');
+    $edit = [$element_name => '1'];
     $this->drupalPostForm($admin_path, $edit, t('Save settings'));
     $this->assertText("Saved $field_name configuration", 'The form was successfully submitted.');
     $field = FieldConfig::loadByName('node', $this->contentType, $field_name);
-    $this->assertEqual($field->getDefaultValueLiteral(), array(array('value' => 1)), 'The default value was correctly saved.');
+    $this->assertEqual($field->getDefaultValueLiteral(), [['value' => 1]], 'The default value was correctly saved.');
 
     // Check that the default value shows up in the form
     $this->drupalGet($admin_path);
     $this->assertFieldById($element_id, '1', 'The default value widget was displayed with the correct value.');
 
     // Check that the default value can be emptied.
-    $edit = array($element_name => '');
+    $edit = [$element_name => ''];
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
     $this->assertText("Saved $field_name configuration", 'The form was successfully submitted.');
     $field = FieldConfig::loadByName('node', $this->contentType, $field_name);
@@ -458,13 +458,13 @@ class ManageFieldsTest extends WebTestBase {
     $field_storage->save();
 
     $this->drupalGet($admin_path);
-    $edit = array(
+    $edit = [
       'required' => 1,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
 
     $this->drupalGet($admin_path);
-    $this->drupalPostForm(NULL, array(), t('Save settings'));
+    $this->drupalPostForm(NULL, [], t('Save settings'));
     $this->assertText("Saved $field_name configuration", 'The form was successfully submitted.');
     $field = FieldConfig::loadByName('node', $this->contentType, $field_name);
     $this->assertEqual($field->getDefaultValueLiteral(), NULL, 'The default value was correctly saved.');
@@ -479,14 +479,14 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests that deletion removes field storages and fields as expected.
    */
-  function testDeleteField() {
+  public function testDeleteField() {
     // Create a new field.
     $bundle_path1 = 'admin/structure/types/manage/' . $this->contentType;
     $this->fieldUIAddNewField($bundle_path1, $this->fieldNameInput, $this->fieldLabel);
 
     // Create an additional node type.
     $type_name2 = strtolower($this->randomMachineName(8)) . '_test';
-    $type2 = $this->drupalCreateContentType(array('name' => $type_name2, 'type' => $type_name2));
+    $type2 = $this->drupalCreateContentType(['name' => $type_name2, 'type' => $type_name2]);
     $type_name2 = $type2->id();
 
     // Add a field to the second node type.
@@ -513,15 +513,15 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests that Field UI respects disallowed field names.
    */
-  function testDisallowedFieldNames() {
+  public function testDisallowedFieldNames() {
     // Reset the field prefix so we can test properly.
     $this->config('field_ui.settings')->set('field_prefix', '')->save();
 
     $label = 'Disallowed field';
-    $edit = array(
+    $edit = [
       'label' => $label,
       'new_storage_type' => 'test_field',
-    );
+    ];
 
     // Try with an entity key.
     $edit['field_name'] = 'title';
@@ -539,35 +539,35 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests that Field UI respects locked fields.
    */
-  function testLockedField() {
+  public function testLockedField() {
     // Create a locked field and attach it to a bundle. We need to do this
     // programmatically as there's no way to create a locked field through UI.
     $field_name = strtolower($this->randomMachineName(8));
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => 'test_field',
       'cardinality' => 1,
       'locked' => TRUE
-    ));
+    ]);
     $field_storage->save();
-    FieldConfig::create(array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => $this->contentType,
-    ))->save();
+    ])->save();
     entity_get_form_display('node', $this->contentType, 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'test_field_widget',
-      ))
+      ])
       ->save();
 
     // Check that the links for edit and delete are not present.
     $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields');
-    $locked = $this->xpath('//tr[@id=:field_name]/td[4]', array(':field_name' => $field_name));
+    $locked = $this->xpath('//tr[@id=:field_name]/td[4]', [':field_name' => $field_name]);
     $this->assertTrue(in_array('Locked', $locked), 'Field is marked as Locked in the UI');
-    $edit_link = $this->xpath('//tr[@id=:field_name]/td[4]', array(':field_name' => $field_name));
+    $edit_link = $this->xpath('//tr[@id=:field_name]/td[4]', [':field_name' => $field_name]);
     $this->assertFalse(in_array('edit', $edit_link), 'Edit option for locked field is not present the UI');
-    $delete_link = $this->xpath('//tr[@id=:field_name]/td[4]', array(':field_name' => $field_name));
+    $delete_link = $this->xpath('//tr[@id=:field_name]/td[4]', [':field_name' => $field_name]);
     $this->assertFalse(in_array('delete', $delete_link), 'Delete option for locked field is not present the UI');
     $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/node.' . $this->contentType . '.' . $field_name . '/delete');
     $this->assertResponse(403);
@@ -576,7 +576,7 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests that Field UI respects the 'no_ui' flag in the field type definition.
    */
-  function testHiddenFields() {
+  public function testHiddenFields() {
     // Check that the field type is not available in the 'add new field' row.
     $this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/add-field');
     $this->assertFalse($this->xpath('//select[@id="edit-new-storage-type"]//option[@value="hidden_test_field"]'), "The 'add new field' select respects field types 'no_ui' property.");
@@ -584,22 +584,22 @@ class ManageFieldsTest extends WebTestBase {
 
     // Create a field storage and a field programmatically.
     $field_name = 'hidden_test_field';
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => $field_name,
-    ))->save();
-    $field = array(
+    ])->save();
+    $field = [
       'field_name' => $field_name,
       'bundle' => $this->contentType,
       'entity_type' => 'node',
       'label' => t('Hidden field'),
-    );
+    ];
     FieldConfig::create($field)->save();
     entity_get_form_display('node', $this->contentType, 'default')
       ->setComponent($field_name)
       ->save();
-    $this->assertTrue(FieldConfig::load('node.' . $this->contentType . '.' . $field_name), format_string('A field of the field storage %field was created programmatically.', array('%field' => $field_name)));
+    $this->assertTrue(FieldConfig::load('node.' . $this->contentType . '.' . $field_name), format_string('A field of the field storage %field was created programmatically.', ['%field' => $field_name]));
 
     // Check that the newly added field appears on the 'Manage Fields'
     // screen.
@@ -609,17 +609,17 @@ class ManageFieldsTest extends WebTestBase {
     // Check that the field does not appear in the 're-use existing field' row
     // on other bundles.
     $this->drupalGet('admin/structure/types/manage/page/fields/add-field');
-    $this->assertFalse($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', array(':field_name' => $field_name)), "The 're-use existing field' select respects field types 'no_ui' property.");
-    $this->assertTrue($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', array(':field_name' => 'field_tags')), "The 're-use existing field' select shows a valid option.");
+    $this->assertFalse($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', [':field_name' => $field_name]), "The 're-use existing field' select respects field types 'no_ui' property.");
+    $this->assertTrue($this->xpath('//select[@id="edit-existing-storage-name"]//option[@value=:field_name]', [':field_name' => 'field_tags']), "The 're-use existing field' select shows a valid option.");
 
     // Check that non-configurable fields are not available.
     $field_types = \Drupal::service('plugin.manager.field.field_type')->getDefinitions();
     foreach ($field_types as $field_type => $definition) {
       if (empty($definition['no_ui'])) {
-        $this->assertTrue($this->xpath('//select[@id="edit-new-storage-type"]//option[@value=:field_type]', array(':field_type' => $field_type)), SafeMarkup::format('Configurable field type @field_type is available.', array('@field_type' => $field_type)));
+        $this->assertTrue($this->xpath('//select[@id="edit-new-storage-type"]//option[@value=:field_type]', [':field_type' => $field_type]), SafeMarkup::format('Configurable field type @field_type is available.', ['@field_type' => $field_type]));
       }
       else {
-        $this->assertFalse($this->xpath('//select[@id="edit-new-storage-type"]//option[@value=:field_type]', array(':field_type' => $field_type)), SafeMarkup::format('Non-configurable field type @field_type is not available.', array('@field_type' => $field_type)));
+        $this->assertFalse($this->xpath('//select[@id="edit-new-storage-type"]//option[@value=:field_type]', [':field_type' => $field_type]), SafeMarkup::format('Non-configurable field type @field_type is not available.', ['@field_type' => $field_type]));
       }
     }
   }
@@ -627,19 +627,19 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests that a duplicate field name is caught by validation.
    */
-  function testDuplicateFieldName() {
+  public function testDuplicateFieldName() {
     // field_tags already exists, so we're expecting an error when trying to
     // create a new field with the same name.
-    $edit = array(
+    $edit = [
       'field_name' => 'tags',
       'label' => $this->randomMachineName(),
       'new_storage_type' => 'entity_reference',
-    );
+    ];
     $url = 'admin/structure/types/manage/' . $this->contentType . '/fields/add-field';
     $this->drupalPostForm($url, $edit, t('Save and continue'));
 
     $this->assertText(t('The machine-readable name is already in use. It must be unique.'));
-    $this->assertUrl($url, array(), 'Stayed on the same page.');
+    $this->assertUrl($url, [], 'Stayed on the same page.');
   }
 
   /**
@@ -659,7 +659,7 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests that deletion removes field storages and fields as expected for a term.
    */
-  function testDeleteTaxonomyField() {
+  public function testDeleteTaxonomyField() {
     // Create a new field.
     $bundle_path = 'admin/structure/taxonomy/manage/tags/overview';
 
@@ -677,26 +677,26 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests that help descriptions render valid HTML.
    */
-  function testHelpDescriptions() {
+  public function testHelpDescriptions() {
     // Create an image field
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_image',
       'entity_type' => 'node',
       'type' => 'image',
-    ))->save();
+    ])->save();
 
-    FieldConfig::create(array(
+    FieldConfig::create([
       'field_name' => 'field_image',
       'entity_type' => 'node',
       'label' => 'Image',
       'bundle' => 'article',
-    ))->save();
+    ])->save();
 
     entity_get_form_display('node', 'article', 'default')->setComponent('field_image')->save();
 
-    $edit = array(
+    $edit = [
       'description' => '<strong>Test with an upload field.',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_image', $edit, t('Save settings'));
 
     // Check that hook_field_widget_form_alter() does believe this is the
@@ -704,9 +704,9 @@ class ManageFieldsTest extends WebTestBase {
     $this->drupalGet('admin/structure/types/manage/article/fields/node.article.field_tags');
     $this->assertText('From hook_field_widget_form_alter(): Default form is true.', 'Default value form in hook_field_widget_form_alter().');
 
-    $edit = array(
+    $edit = [
       'description' => '<em>Test with a non upload field.',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_tags', $edit, t('Save settings'));
 
     $this->drupalGet('node/add/article');
@@ -717,7 +717,7 @@ class ManageFieldsTest extends WebTestBase {
   /**
    * Tests that the field list administration page operates correctly.
    */
-  function fieldListAdminPage() {
+  public function fieldListAdminPage() {
     $this->drupalGet('admin/reports/fields');
     $this->assertText($this->fieldName, 'Field name is displayed in field list.');
     $this->assertTrue($this->assertLinkByHref('admin/structure/types/manage/' . $this->contentType . '/fields'), 'Link to content type using field is displayed in field list.');
diff --git a/web/core/modules/field_ui/tests/modules/field_ui_test/field_ui_test.module b/web/core/modules/field_ui/tests/modules/field_ui_test/field_ui_test.module
index 5fb232b7c..95234f1ba 100644
--- a/web/core/modules/field_ui/tests/modules/field_ui_test/field_ui_test.module
+++ b/web/core/modules/field_ui/tests/modules/field_ui_test/field_ui_test.module
@@ -15,41 +15,41 @@ function field_ui_test_form_entity_view_display_edit_form_alter(&$form, FormStat
   $table = &$form['fields'];
 
   foreach (Element::children($table) as $name) {
-    $table[$name]['parent_wrapper']['parent']['#options'] = array('indent' => 'Indent');
+    $table[$name]['parent_wrapper']['parent']['#options'] = ['indent' => 'Indent'];
     $table[$name]['parent_wrapper']['parent']['#default_value'] = 'indent';
   }
 
   $table['indent'] = [
-    '#attributes' => array('class' => array('draggable', 'field-group'), 'id' => 'indent-id'),
+    '#attributes' => ['class' => ['draggable', 'field-group'], 'id' => 'indent-id'],
     '#row_type' => 'group',
     '#region_callback' => 'field_ui_test_region_callback',
-    '#js_settings' => array('rowHandler' => 'group'),
-    'human_name' => array(
+    '#js_settings' => ['rowHandler' => 'group'],
+    'human_name' => [
       '#markup' => 'Indent',
       '#prefix' => '<span class="group-label">',
       '#suffix' => '</span>',
-    ),
-    'weight' => array(
+    ],
+    'weight' => [
       '#type' => 'textfield',
       '#default_value' => 0,
       '#size' => 3,
-      '#attributes' => array('class' => array('field-weight')),
-    ),
-    'parent_wrapper' => array(
-      'parent' => array(
+      '#attributes' => ['class' => ['field-weight']],
+    ],
+    'parent_wrapper' => [
+      'parent' => [
         '#type' => 'select',
-        '#options' => array('indent' => 'Indent'),
+        '#options' => ['indent' => 'Indent'],
         '#empty_value' => '',
         '#default_value' => '',
-        '#attributes' => array('class' => array('field-parent')),
-        '#parents' => array('fields', 'indent', 'parent'),
-      ),
-      'hidden_name' => array(
+        '#attributes' => ['class' => ['field-parent']],
+        '#parents' => ['fields', 'indent', 'parent'],
+      ],
+      'hidden_name' => [
         '#type' => 'hidden',
         '#default_value' => 'indent',
-        '#attributes' => array('class' => array('field-name')),
-      ),
-    ),
+        '#attributes' => ['class' => ['field-name']],
+      ],
+    ],
   ];
 
 }
diff --git a/web/core/modules/field_ui/src/Tests/EntityDisplayModeTest.php b/web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
similarity index 83%
rename from web/core/modules/field_ui/src/Tests/EntityDisplayModeTest.php
rename to web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
index f808a1e00..3bb0b139d 100644
--- a/web/core/modules/field_ui/src/Tests/EntityDisplayModeTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\field_ui\Tests;
+namespace Drupal\Tests\field_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the entity display modes UI.
  *
  * @group field_ui
  */
-class EntityDisplayModeTest extends WebTestBase {
+class EntityDisplayModeTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -35,7 +35,7 @@ class EntityDisplayModeTest extends WebTestBase {
     // Test the listing page.
     $this->drupalGet('admin/structure/display-modes/view');
     $this->assertResponse(403);
-    $this->drupalLogin($this->drupalCreateUser(array('administer display modes')));
+    $this->drupalLogin($this->drupalCreateUser(['administer display modes']));
     $this->drupalGet('admin/structure/display-modes/view');
     $this->assertResponse(200);
     $this->assertText(t('Add view mode'));
@@ -50,29 +50,29 @@ class EntityDisplayModeTest extends WebTestBase {
 
     // Test adding a view mode including dots in machine_name.
     $this->clickLink(t('Test entity'));
-    $edit = array(
+    $edit = [
       'id' => strtolower($this->randomMachineName()) . '.' . strtolower($this->randomMachineName()),
       'label' => $this->randomString(),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertRaw('The machine-readable name must contain only lowercase letters, numbers, and underscores.');
 
     // Test adding a view mode.
-    $edit = array(
+    $edit = [
       'id' => strtolower($this->randomMachineName()),
       'label' => $this->randomString(),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertRaw(t('Saved the %label view mode.', array('%label' => $edit['label'])));
+    $this->assertRaw(t('Saved the %label view mode.', ['%label' => $edit['label']]));
 
     // Test editing the view mode.
     $this->drupalGet('admin/structure/display-modes/view/manage/entity_test.' . $edit['id']);
 
     // Test deleting the view mode.
     $this->clickLink(t('Delete'));
-    $this->assertRaw(t('Are you sure you want to delete the view mode %label?', array('%label' => $edit['label'])));
+    $this->assertRaw(t('Are you sure you want to delete the view mode %label?', ['%label' => $edit['label']]));
     $this->drupalPostForm(NULL, NULL, t('Delete'));
-    $this->assertRaw(t('The view mode %label has been deleted.', array('%label' => $edit['label'])));
+    $this->assertRaw(t('The view mode %label has been deleted.', ['%label' => $edit['label']]));
   }
 
   /**
@@ -82,7 +82,7 @@ class EntityDisplayModeTest extends WebTestBase {
     // Test the listing page.
     $this->drupalGet('admin/structure/display-modes/form');
     $this->assertResponse(403);
-    $this->drupalLogin($this->drupalCreateUser(array('administer display modes')));
+    $this->drupalLogin($this->drupalCreateUser(['administer display modes']));
     $this->drupalGet('admin/structure/display-modes/form');
     $this->assertResponse(200);
     $this->assertText(t('Add form mode'));
@@ -96,29 +96,29 @@ class EntityDisplayModeTest extends WebTestBase {
 
     // Test adding a view mode including dots in machine_name.
     $this->clickLink(t('Test entity'));
-    $edit = array(
+    $edit = [
       'id' => strtolower($this->randomMachineName()) . '.' . strtolower($this->randomMachineName()),
       'label' => $this->randomString(),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertRaw('The machine-readable name must contain only lowercase letters, numbers, and underscores.');
 
     // Test adding a form mode.
-    $edit = array(
+    $edit = [
       'id' => strtolower($this->randomMachineName()),
       'label' => $this->randomString(),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertRaw(t('Saved the %label form mode.', array('%label' => $edit['label'])));
+    $this->assertRaw(t('Saved the %label form mode.', ['%label' => $edit['label']]));
 
     // Test editing the form mode.
     $this->drupalGet('admin/structure/display-modes/form/manage/entity_test.' . $edit['id']);
 
     // Test deleting the form mode.
     $this->clickLink(t('Delete'));
-    $this->assertRaw(t('Are you sure you want to delete the form mode %label?', array('%label' => $edit['label'])));
+    $this->assertRaw(t('Are you sure you want to delete the form mode %label?', ['%label' => $edit['label']]));
     $this->drupalPostForm(NULL, NULL, t('Delete'));
-    $this->assertRaw(t('The form mode %label has been deleted.', array('%label' => $edit['label'])));
+    $this->assertRaw(t('The form mode %label has been deleted.', ['%label' => $edit['label']]));
   }
 
 }
diff --git a/web/core/modules/field_ui/tests/src/Functional/EntityDisplayTest.php b/web/core/modules/field_ui/tests/src/Functional/EntityDisplayTest.php
new file mode 100644
index 000000000..c9cfc052a
--- /dev/null
+++ b/web/core/modules/field_ui/tests/src/Functional/EntityDisplayTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\Tests\field_ui\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the UI for entity displays.
+ *
+ * @group field_ui
+ */
+class EntityDisplayTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['field_ui', 'entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->drupalLogin($this->drupalCreateUser([
+      'administer entity_test display',
+    ]));
+  }
+
+  /**
+   * Tests the use of regions for entity view displays.
+   */
+  public function testEntityView() {
+    $this->drupalGet('entity_test/structure/entity_test/display');
+    $this->assertSession()->elementExists('css', '.region-content-message.region-empty');
+    $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected());
+
+    $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'content');
+    $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'content')->isSelected());
+
+    $this->submitForm([], 'Save');
+    $this->assertSession()->pageTextContains('Your settings have been saved.');
+    $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'content')->isSelected());
+  }
+
+}
diff --git a/web/core/modules/field_ui/src/Tests/FieldUIIndentationTest.php b/web/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
similarity index 50%
rename from web/core/modules/field_ui/src/Tests/FieldUIIndentationTest.php
rename to web/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
index 898b41723..1f66c9a77 100644
--- a/web/core/modules/field_ui/src/Tests/FieldUIIndentationTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\field_ui\Tests;
+namespace Drupal\Tests\field_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests indentation on Field UI.
  *
  * @group field_ui
  */
-class FieldUIIndentationTest extends WebTestBase {
+class FieldUIIndentationTest extends BrowserTestBase {
 
   /**
    * Modules to install.
    *
    * @var array
    */
-  public static $modules = array('node', 'field_ui', 'field_ui_test');
+  public static $modules = ['node', 'field_ui', 'field_ui_test'];
 
   /**
    * {@inheritdoc}
@@ -25,15 +25,15 @@ class FieldUIIndentationTest extends WebTestBase {
     parent::setUp();
 
     // Create a test user.
-    $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node display'));
+    $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node display']);
     $this->drupalLogin($admin_user);
 
     // Create Basic page node type.
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
   }
 
-  function testIndentation() {
+  public function testIndentation() {
     $this->drupalGet('admin/structure/types/manage/page/display');
     $this->assertRaw('js-indentation indentation');
   }
diff --git a/web/core/modules/field_ui/src/Tests/FieldUIRouteTest.php b/web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
similarity index 86%
rename from web/core/modules/field_ui/src/Tests/FieldUIRouteTest.php
rename to web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
index 6533f094e..fe7a27011 100644
--- a/web/core/modules/field_ui/src/Tests/FieldUIRouteTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\field_ui\Tests;
+namespace Drupal\Tests\field_ui\Functional;
 
 use Drupal\Core\Entity\Entity\EntityFormMode;
 use Drupal\Core\Entity\Entity\EntityViewMode;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the functionality of the Field UI route subscriber.
  *
  * @group field_ui
  */
-class FieldUIRouteTest extends WebTestBase {
+class FieldUIRouteTest extends BrowserTestBase {
 
   /**
    * Modules to install.
@@ -49,7 +49,7 @@ class FieldUIRouteTest extends WebTestBase {
     $this->assertTitle('Manage display | Drupal');
     $this->assertLocalTasks();
 
-    $edit = array('display_modes_custom[compact]' => TRUE);
+    $edit = ['display_modes_custom[compact]' => TRUE];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->drupalGet('admin/config/people/accounts/display/compact');
     $this->assertTitle('Manage display | Drupal');
@@ -63,37 +63,37 @@ class FieldUIRouteTest extends WebTestBase {
     $this->assertTitle('Manage form display | Drupal');
     $this->assertLocalTasks();
 
-    $edit = array('display_modes_custom[register]' => TRUE);
+    $edit = ['display_modes_custom[register]' => TRUE];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertResponse(200);
     $this->drupalGet('admin/config/people/accounts/form-display/register');
     $this->assertTitle('Manage form display | Drupal');
     $this->assertLocalTasks();
-    $this->assert(count($this->xpath('//ul/li[1]/a[contains(text(), :text)]', array(':text' => 'Default'))) == 1, 'Default secondary tab is in first position.');
+    $this->assert(count($this->xpath('//ul/li[1]/a[contains(text(), :text)]', [':text' => 'Default'])) == 1, 'Default secondary tab is in first position.');
 
     // Create new view mode and verify it's available on the Manage Display
     // screen after enabling it.
-    EntityViewMode::create(array(
+    EntityViewMode::create([
       'id' => 'user.test',
       'label' => 'Test',
       'targetEntityType' => 'user',
-    ))->save();
+    ])->save();
     $this->container->get('router.builder')->rebuildIfNeeded();
 
-    $edit = array('display_modes_custom[test]' => TRUE);
+    $edit = ['display_modes_custom[test]' => TRUE];
     $this->drupalPostForm('admin/config/people/accounts/display', $edit, t('Save'));
     $this->assertLink('Test');
 
     // Create new form mode and verify it's available on the Manage Form
     // Display screen after enabling it.
-    EntityFormMode::create(array(
+    EntityFormMode::create([
       'id' => 'user.test',
       'label' => 'Test',
       'targetEntityType' => 'user',
-    ))->save();
+    ])->save();
     $this->container->get('router.builder')->rebuildIfNeeded();
 
-    $edit = array('display_modes_custom[test]' => TRUE);
+    $edit = ['display_modes_custom[test]' => TRUE];
     $this->drupalPostForm('admin/config/people/accounts/form-display', $edit, t('Save'));
     $this->assertLink('Test');
   }
diff --git a/web/core/modules/field_ui/tests/src/FunctionalJavascript/EntityDisplayTest.php b/web/core/modules/field_ui/tests/src/FunctionalJavascript/EntityDisplayTest.php
new file mode 100644
index 000000000..6da3c41b1
--- /dev/null
+++ b/web/core/modules/field_ui/tests/src/FunctionalJavascript/EntityDisplayTest.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Drupal\Tests\field_ui\FunctionalJavascript;
+
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+
+/**
+ * Tests the UI for entity displays.
+ *
+ * @group field_ui
+ */
+class EntityDisplayTest extends JavascriptTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['field_ui', 'entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $entity = EntityTest::create([
+      'name' => 'The name for this entity',
+      'field_test_text' => [[
+        'value' => 'The field test text value',
+      ]],
+    ]);
+    $entity->save();
+    $this->drupalLogin($this->drupalCreateUser([
+      'access administration pages',
+      'view test entity',
+      'administer entity_test content',
+      'administer entity_test fields',
+      'administer entity_test display',
+      'administer entity_test form display',
+      'view the administration theme',
+    ]));
+  }
+
+  /**
+   * Tests the use of regions for entity form displays.
+   */
+  public function testEntityForm() {
+    $this->drupalGet('entity_test/manage/1/edit');
+    $this->assertSession()->fieldExists('field_test_text[0][value]');
+
+    $this->drupalGet('entity_test/structure/entity_test/form-display');
+    $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'content')->isSelected());
+
+    $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'hidden');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected());
+
+    $this->submitForm([], 'Save');
+    $this->assertSession()->pageTextContains('Your settings have been saved.');
+    $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected());
+
+    $this->drupalGet('entity_test/manage/1/edit');
+    $this->assertSession()->fieldNotExists('field_test_text[0][value]');
+  }
+
+  /**
+   * Tests the use of regions for entity view displays.
+   */
+  public function testEntityView() {
+    $this->drupalGet('entity_test/1');
+    $this->assertSession()->elementNotExists('css', '.field--name-field-test-text');
+
+    $this->drupalGet('entity_test/structure/entity_test/display');
+    $this->assertSession()->elementExists('css', '.region-content-message.region-empty');
+    $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'hidden')->isSelected());
+
+    $this->getSession()->getPage()->selectFieldOption('fields[field_test_text][region]', 'content');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+    $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'content')->isSelected());
+
+    $this->submitForm([], 'Save');
+    $this->assertSession()->pageTextContains('Your settings have been saved.');
+    $this->assertTrue($this->assertSession()->optionExists('fields[field_test_text][region]', 'content')->isSelected());
+
+    $this->drupalGet('entity_test/1');
+    $this->assertSession()->elementExists('css', '.field--name-field-test-text');
+  }
+
+  /**
+   * Tests extra fields.
+   */
+  public function testExtraFields() {
+    entity_test_create_bundle('bundle_with_extra_fields');
+    $this->drupalGet('entity_test/structure/bundle_with_extra_fields/display');
+
+    $extra_field_row = $this->getSession()->getPage()->find('css', '#display-extra-field');
+    $disabled_region_row = $this->getSession()->getPage()->find('css', '.region-hidden-title');
+
+    $extra_field_row->find('css', '.handle')->dragTo($disabled_region_row);
+    $this->assertSession()->assertWaitOnAjaxRequest();
+
+    $this->submitForm([], 'Save');
+    $this->assertSession()->pageTextContains('Your settings have been saved.');
+  }
+
+}
diff --git a/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php b/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
index be188db4f..4a0e533be 100644
--- a/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
@@ -29,46 +29,47 @@ class EntityDisplayTest extends KernelTestBase {
    *
    * @var string[]
    */
-  public static $modules = array('field_ui', 'field', 'entity_test', 'user', 'text', 'field_test', 'node', 'system');
+  public static $modules = ['field_ui', 'field', 'entity_test', 'user', 'text', 'field_test', 'node', 'system'];
 
   protected function setUp() {
     parent::setUp();
     $this->installEntitySchema('node');
     $this->installEntitySchema('user');
-    $this->installConfig(array('field', 'node', 'user'));
+    $this->installConfig(['field', 'node', 'user']);
   }
 
   /**
    * Tests basic CRUD operations on entity display objects.
    */
   public function testEntityDisplayCRUD() {
-    $display = EntityViewDisplay::create(array(
+    $display = EntityViewDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'default',
-    ));
+    ]);
 
-    $expected = array();
+    $expected = [];
 
     // Check that providing no 'weight' results in the highest current weight
     // being assigned. The 'name' field's formatter has weight -5, therefore
     // these follow.
-    $expected['component_1'] = array('weight' => -4, 'settings' => array(), 'third_party_settings' => array());
-    $expected['component_2'] = array('weight' => -3, 'settings' => array(), 'third_party_settings' => array());
+    $expected['component_1'] = ['weight' => -4, 'settings' => [], 'third_party_settings' => []];
+    $expected['component_2'] = ['weight' => -3, 'settings' => [], 'third_party_settings' => []];
     $display->setComponent('component_1');
     $display->setComponent('component_2');
     $this->assertEqual($display->getComponent('component_1'), $expected['component_1']);
     $this->assertEqual($display->getComponent('component_2'), $expected['component_2']);
 
     // Check that arbitrary options are correctly stored.
-    $expected['component_3'] = array('weight' => 10, 'third_party_settings' => array('field_test' => array('foo' => 'bar')), 'settings' => array());
+    $expected['component_3'] = ['weight' => 10, 'third_party_settings' => ['field_test' => ['foo' => 'bar']], 'settings' => []];
     $display->setComponent('component_3', $expected['component_3']);
     $this->assertEqual($display->getComponent('component_3'), $expected['component_3']);
 
     // Check that the display can be properly saved and read back.
     $display->save();
     $display = EntityViewDisplay::load($display->id());
-    foreach (array('component_1', 'component_2', 'component_3') as $name) {
+    foreach (['component_1', 'component_2', 'component_3'] as $name) {
+      $expected[$name]['region'] = 'content';
       $this->assertEqual($display->getComponent($name), $expected[$name]);
     }
 
@@ -78,15 +79,16 @@ class EntityDisplayTest extends KernelTestBase {
     $this->assertEqual('bar', $display->getThirdPartySetting('entity_test', 'foo'), 'Third party settings were added to the entity view display.');
 
     // Check that getComponents() returns options for all components.
-    $expected['name'] = array(
+    $expected['name'] = [
       'label' => 'hidden',
       'type' => 'string',
       'weight' => -5,
-      'settings' => array(
+      'settings' => [
         'link_to_entity' => FALSE,
-      ),
-      'third_party_settings' => array(),
-    );
+      ],
+      'third_party_settings' => [],
+      'region' => 'content'
+    ];
     $this->assertEqual($display->getComponents(), $expected);
 
     // Check that a component can be removed.
@@ -100,12 +102,12 @@ class EntityDisplayTest extends KernelTestBase {
 
     // Check that createCopy() creates a new component that can be correctly
     // saved.
-    EntityViewMode::create(array('id' => $display->getTargetEntityTypeId() . '.other_view_mode', 'targetEntityType' => $display->getTargetEntityTypeId()))->save();
+    EntityViewMode::create(['id' => $display->getTargetEntityTypeId() . '.other_view_mode', 'targetEntityType' => $display->getTargetEntityTypeId()])->save();
     $new_display = $display->createCopy('other_view_mode');
     $new_display->save();
     $new_display = EntityViewDisplay::load($new_display->id());
     $dependencies = $new_display->calculateDependencies()->getDependencies();
-    $this->assertEqual(array('config' => array('core.entity_view_mode.entity_test.other_view_mode'), 'module' => array('entity_test')), $dependencies);
+    $this->assertEqual(['config' => ['core.entity_view_mode.entity_test.other_view_mode'], 'module' => ['entity_test']], $dependencies);
     $this->assertEqual($new_display->getTargetEntityTypeId(), $display->getTargetEntityTypeId());
     $this->assertEqual($new_display->getTargetBundle(), $display->getTargetBundle());
     $this->assertEqual($new_display->getMode(), 'other_view_mode');
@@ -116,18 +118,18 @@ class EntityDisplayTest extends KernelTestBase {
    * Test sorting of components by name on basic CRUD operations
    */
   public function testEntityDisplayCRUDSort() {
-    $display = EntityViewDisplay::create(array(
+    $display = EntityViewDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'default',
-    ));
+    ]);
     $display->setComponent('component_3');
     $display->setComponent('component_1');
     $display->setComponent('component_2');
     $display->save();
     $components = array_keys($display->getComponents());
     // The name field is not configurable so will be added automatically.
-    $expected = array ( 0 => 'component_1', 1 => 'component_2', 2 => 'component_3', 'name');
+    $expected = [ 0 => 'component_1', 1 => 'component_2', 2 => 'component_3', 'name'];
     $this->assertIdentical($components, $expected);
   }
 
@@ -141,14 +143,14 @@ class EntityDisplayTest extends KernelTestBase {
     $this->assertTrue($display->isNew());
 
     // Add some components and save the display.
-    $display->setComponent('component_1', array('weight' => 10, 'settings' => array()))
+    $display->setComponent('component_1', ['weight' => 10, 'settings' => []])
       ->save();
 
     // Check that entity_get_display() returns the correct object.
     $display = entity_get_display('entity_test', 'entity_test', 'default');
     $this->assertFalse($display->isNew());
     $this->assertEqual($display->id(), 'entity_test.entity_test.default');
-    $this->assertEqual($display->getComponent('component_1'), array( 'weight' => 10, 'settings' => array(), 'third_party_settings' => array()));
+    $this->assertEqual($display->getComponent('component_1'), [ 'weight' => 10, 'settings' => [], 'third_party_settings' => [], 'region' => 'content']);
   }
 
   /**
@@ -156,22 +158,51 @@ class EntityDisplayTest extends KernelTestBase {
    */
   public function testExtraFieldComponent() {
     entity_test_create_bundle('bundle_with_extra_fields');
-    $display = EntityViewDisplay::create(array(
+    $display = EntityViewDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'bundle_with_extra_fields',
       'mode' => 'default',
-    ));
+    ]);
 
     // Check that the default visibility taken into account for extra fields
     // unknown in the display.
-    $this->assertEqual($display->getComponent('display_extra_field'), array('weight' => 5));
+    $this->assertEqual($display->getComponent('display_extra_field'), ['weight' => 5, 'region' => 'content']);
     $this->assertNull($display->getComponent('display_extra_field_hidden'));
 
     // Check that setting explicit options overrides the defaults.
     $display->removeComponent('display_extra_field');
-    $display->setComponent('display_extra_field_hidden', array('weight' => 10));
+    $display->setComponent('display_extra_field_hidden', ['weight' => 10]);
     $this->assertNull($display->getComponent('display_extra_field'));
-    $this->assertEqual($display->getComponent('display_extra_field_hidden'), array('weight' => 10, 'settings' => array(), 'third_party_settings' => array()));
+    $this->assertEqual($display->getComponent('display_extra_field_hidden'), ['weight' => 10, 'settings' => [], 'third_party_settings' => []]);
+  }
+
+  /**
+   * Tests the behavior of an extra field component with initial invalid values.
+   */
+  public function testExtraFieldComponentInitialInvalidConfig() {
+    entity_test_create_bundle('bundle_with_extra_fields');
+    $display = EntityViewDisplay::create([
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'bundle_with_extra_fields',
+      'mode' => 'default',
+      // Add the extra field to the initial config, without a 'type'.
+      'content' => [
+        'display_extra_field' => [
+          'weight' => 5,
+        ],
+      ],
+    ]);
+
+    // Check that the default visibility taken into account for extra fields
+    // unknown in the display that were included in the initial config.
+    $this->assertEqual($display->getComponent('display_extra_field'), ['weight' => 5, 'region' => 'content']);
+    $this->assertNull($display->getComponent('display_extra_field_hidden'));
+
+    // Check that setting explicit options overrides the defaults.
+    $display->removeComponent('display_extra_field');
+    $display->setComponent('display_extra_field_hidden', ['weight' => 10]);
+    $this->assertNull($display->getComponent('display_extra_field'));
+    $this->assertEqual($display->getComponent('display_extra_field_hidden'), ['weight' => 10, 'settings' => [], 'third_party_settings' => []]);
   }
 
   /**
@@ -180,36 +211,36 @@ class EntityDisplayTest extends KernelTestBase {
   public function testFieldComponent() {
     $field_name = 'test_field';
     // Create a field storage and a field.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'test_field'
-    ));
+    ]);
     $field_storage->save();
-    $field = FieldConfig::create(array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
 
-    $display = EntityViewDisplay::create(array(
+    $display = EntityViewDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'default',
-    ));
+    ]);
 
     // Check that providing no options results in default values being used.
     $display->setComponent($field_name);
     $field_type_info = \Drupal::service('plugin.manager.field.field_type')->getDefinition($field_storage->getType());
     $default_formatter = $field_type_info['default_formatter'];
     $formatter_settings = \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings($default_formatter);
-    $expected = array(
+    $expected = [
       'weight' => -4,
       'label' => 'above',
       'type' => $default_formatter,
       'settings' => $formatter_settings,
-      'third_party_settings' => array(),
-    );
+      'third_party_settings' => [],
+    ];
     $this->assertEqual($display->getComponent($field_name), $expected);
 
     // Check that the getFormatter() method returns the correct formatter plugin.
@@ -225,9 +256,9 @@ class EntityDisplayTest extends KernelTestBase {
     $this->assertEqual($formatter->randomValue, $random_value);
 
     // Check that changing the definition creates a new formatter.
-    $display->setComponent($field_name, array(
+    $display->setComponent($field_name, [
       'type' => 'field_test_multiple',
-    ));
+    ]);
     $formatter = $display->getRenderer($field_name);
     $this->assertEqual($formatter->getPluginId(), 'field_test_multiple');
     $this->assertFalse(isset($formatter->randomValue));
@@ -235,38 +266,40 @@ class EntityDisplayTest extends KernelTestBase {
     // Check that the display has dependencies on the field and the module that
     // provides the formatter.
     $dependencies = $display->calculateDependencies()->getDependencies();
-    $this->assertEqual(array('config' => array('field.field.entity_test.entity_test.test_field'), 'module' => array('entity_test', 'field_test')), $dependencies);
+    $this->assertEqual(['config' => ['field.field.entity_test.entity_test.test_field'], 'module' => ['entity_test', 'field_test']], $dependencies);
   }
 
   /**
    * Tests the behavior of a field component for a base field.
    */
   public function testBaseFieldComponent() {
-    $display = EntityViewDisplay::create(array(
+    $display = EntityViewDisplay::create([
       'targetEntityType' => 'entity_test_base_field_display',
       'bundle' => 'entity_test_base_field_display',
       'mode' => 'default',
-    ));
+    ]);
 
     // Check that default options are correctly filled in.
     $formatter_settings = \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings('text_default');
-    $expected = array(
+    $expected = [
       'test_no_display' => NULL,
-      'test_display_configurable' => array(
+      'test_display_configurable' => [
         'label' => 'above',
         'type' => 'text_default',
         'settings' => $formatter_settings,
-        'third_party_settings' => array(),
+        'third_party_settings' => [],
         'weight' => 10,
-      ),
-      'test_display_non_configurable' => array(
+        'region' => 'content',
+      ],
+      'test_display_non_configurable' => [
         'label' => 'above',
         'type' => 'text_default',
         'settings' => $formatter_settings,
-        'third_party_settings' => array(),
+        'third_party_settings' => [],
         'weight' => 11,
-      ),
-    );
+        'region' => 'content',
+      ],
+    ];
     foreach ($expected as $field_name => $options) {
       $this->assertEqual($display->getComponent($field_name), $options);
     }
@@ -304,7 +337,7 @@ class EntityDisplayTest extends KernelTestBase {
    */
   public function testDeleteBundle() {
     // Create a node bundle, display and form display object.
-    $type = NodeType::create(array('type' => 'article'));
+    $type = NodeType::create(['type' => 'article']);
     $type->save();
     node_add_body_field($type);
     entity_get_display('node', 'article', 'default')->save();
@@ -324,30 +357,30 @@ class EntityDisplayTest extends KernelTestBase {
   public function testDeleteField() {
     $field_name = 'test_field';
     // Create a field storage and a field.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'test_field'
-    ));
+    ]);
     $field_storage->save();
-    $field = FieldConfig::create(array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
 
     // Create default and teaser entity display.
-    EntityViewMode::create(array('id' => 'entity_test.teaser', 'targetEntityType' => 'entity_test'))->save();
-    EntityViewDisplay::create(array(
+    EntityViewMode::create(['id' => 'entity_test.teaser', 'targetEntityType' => 'entity_test'])->save();
+    EntityViewDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'default',
-    ))->setComponent($field_name)->save();
-    EntityViewDisplay::create(array(
+    ])->setComponent($field_name)->save();
+    EntityViewDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'teaser',
-    ))->setComponent($field_name)->save();
+    ])->setComponent($field_name)->save();
 
     // Check the component exists.
     $display = entity_get_display('entity_test', 'entity_test', 'default');
@@ -369,27 +402,27 @@ class EntityDisplayTest extends KernelTestBase {
    * Tests \Drupal\Core\Entity\EntityDisplayBase::onDependencyRemoval().
    */
   public function testOnDependencyRemoval() {
-    $this->enableModules(array('field_plugins_test'));
+    $this->enableModules(['field_plugins_test']);
 
     $field_name = 'test_field';
     // Create a field.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'text'
-    ));
+    ]);
     $field_storage->save();
-    $field = FieldConfig::create(array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
 
-    EntityViewDisplay::create(array(
+    EntityViewDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'default',
-    ))->setComponent($field_name, array('type' => 'field_plugins_test_text_formatter'))->save();
+    ])->setComponent($field_name, ['type' => 'field_plugins_test_text_formatter'])->save();
 
     // Check the component exists and is of the correct type.
     $display = entity_get_display('entity_test', 'entity_test', 'default');
@@ -427,47 +460,47 @@ class EntityDisplayTest extends KernelTestBase {
    * Test getDisplayModeOptions().
    */
   public function testGetDisplayModeOptions() {
-    NodeType::create(array('type' => 'article'))->save();
+    NodeType::create(['type' => 'article'])->save();
 
-    EntityViewDisplay::create(array(
+    EntityViewDisplay::create([
       'targetEntityType' => 'node',
       'bundle' => 'article',
       'mode' => 'default',
-    ))->setStatus(TRUE)->save();
+    ])->setStatus(TRUE)->save();
 
-    $display_teaser = EntityViewDisplay::create(array(
+    $display_teaser = EntityViewDisplay::create([
       'targetEntityType' => 'node',
       'bundle' => 'article',
       'mode' => 'teaser',
-    ));
+    ]);
     $display_teaser->save();
 
-    EntityFormDisplay::create(array(
+    EntityFormDisplay::create([
       'targetEntityType' => 'user',
       'bundle' => 'user',
       'mode' => 'default',
-    ))->setStatus(TRUE)->save();
+    ])->setStatus(TRUE)->save();
 
-    $form_display_teaser = EntityFormDisplay::create(array(
+    $form_display_teaser = EntityFormDisplay::create([
       'targetEntityType' => 'user',
       'bundle' => 'user',
       'mode' => 'register',
-    ));
+    ]);
     $form_display_teaser->save();
 
     // Test getViewModeOptionsByBundle().
     $view_modes = \Drupal::entityManager()->getViewModeOptionsByBundle('node', 'article');
-    $this->assertEqual($view_modes, array('default' => 'Default'));
+    $this->assertEqual($view_modes, ['default' => 'Default']);
     $display_teaser->setStatus(TRUE)->save();
     $view_modes = \Drupal::entityManager()->getViewModeOptionsByBundle('node', 'article');
-    $this->assertEqual($view_modes, array('default' => 'Default', 'teaser' => 'Teaser'));
+    $this->assertEqual($view_modes, ['default' => 'Default', 'teaser' => 'Teaser']);
 
     // Test getFormModeOptionsByBundle().
     $form_modes = \Drupal::entityManager()->getFormModeOptionsByBundle('user', 'user');
-    $this->assertEqual($form_modes, array('default' => 'Default'));
+    $this->assertEqual($form_modes, ['default' => 'Default']);
     $form_display_teaser->setStatus(TRUE)->save();
     $form_modes = \Drupal::entityManager()->getFormModeOptionsByBundle('user', 'user');
-    $this->assertEqual($form_modes, array('default' => 'Default', 'register' => 'Register'));
+    $this->assertEqual($form_modes, ['default' => 'Default', 'register' => 'Register']);
   }
 
   /**
diff --git a/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php b/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
index e38db7cbb..09d2a2011 100644
--- a/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
@@ -36,14 +36,14 @@ class EntityFormDisplayTest extends KernelTestBase {
     $this->assertTrue($form_display->isNew());
 
     // Add some components and save the display.
-    $form_display->setComponent('component_1', array('weight' => 10))
+    $form_display->setComponent('component_1', ['weight' => 10])
       ->save();
 
     // Check that entity_get_form_display() returns the correct object.
     $form_display = entity_get_form_display('entity_test', 'entity_test', 'default');
     $this->assertFalse($form_display->isNew());
     $this->assertEqual($form_display->id(), 'entity_test.entity_test.default');
-    $this->assertEqual($form_display->getComponent('component_1'), array('weight' => 10, 'settings' => array(), 'third_party_settings' => array()));
+    $this->assertEqual($form_display->getComponent('component_1'), ['weight' => 10, 'settings' => [], 'third_party_settings' => [], 'region' => 'content']);
   }
 
   /**
@@ -52,35 +52,35 @@ class EntityFormDisplayTest extends KernelTestBase {
   public function testFieldComponent() {
     // Create a field storage and a field.
     $field_name = 'test_field';
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'test_field'
-    ));
+    ]);
     $field_storage->save();
-    $field = FieldConfig::create(array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
 
-    $form_display = EntityFormDisplay::create(array(
+    $form_display = EntityFormDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'default',
-    ));
+    ]);
 
     // Check that providing no options results in default values being used.
     $form_display->setComponent($field_name);
     $field_type_info = \Drupal::service('plugin.manager.field.field_type')->getDefinition($field_storage->getType());
     $default_widget = $field_type_info['default_widget'];
     $widget_settings = \Drupal::service('plugin.manager.field.widget')->getDefaultSettings($default_widget);
-    $expected = array(
+    $expected = [
       'weight' => 3,
       'type' => $default_widget,
       'settings' => $widget_settings,
-      'third_party_settings' => array(),
-    );
+      'third_party_settings' => [],
+    ];
     $this->assertEqual($form_display->getComponent($field_name), $expected);
 
     // Check that the getWidget() method returns the correct widget plugin.
@@ -96,9 +96,9 @@ class EntityFormDisplayTest extends KernelTestBase {
     $this->assertEqual($widget->randomValue, $random_value);
 
     // Check that changing the definition creates a new widget.
-    $form_display->setComponent($field_name, array(
+    $form_display->setComponent($field_name, [
       'type' => 'field_test_multiple',
-    ));
+    ]);
     $widget = $form_display->getRenderer($field_name);
     $this->assertEqual($widget->getPluginId(), 'test_field_widget');
     $this->assertFalse(isset($widget->randomValue));
@@ -106,9 +106,9 @@ class EntityFormDisplayTest extends KernelTestBase {
     // Check that specifying an unknown widget (e.g. case of a disabled module)
     // gets stored as is in the display, but results in the default widget being
     // used.
-    $form_display->setComponent($field_name, array(
+    $form_display->setComponent($field_name, [
       'type' => 'unknown_widget',
-    ));
+    ]);
     $options = $form_display->getComponent($field_name);
     $this->assertEqual($options['type'], 'unknown_widget');
     $widget = $form_display->getRenderer($field_name);
@@ -119,29 +119,31 @@ class EntityFormDisplayTest extends KernelTestBase {
    * Tests the behavior of a field component for a base field.
    */
   public function testBaseFieldComponent() {
-    $display = EntityFormDisplay::create(array(
+    $display = EntityFormDisplay::create([
       'targetEntityType' => 'entity_test_base_field_display',
       'bundle' => 'entity_test_base_field_display',
       'mode' => 'default',
-    ));
+    ]);
 
     // Check that default options are correctly filled in.
     $formatter_settings = \Drupal::service('plugin.manager.field.widget')->getDefaultSettings('text_textfield');
-    $expected = array(
+    $expected = [
       'test_no_display' => NULL,
-      'test_display_configurable' => array(
+      'test_display_configurable' => [
         'type' => 'text_textfield',
         'settings' => $formatter_settings,
-        'third_party_settings' => array(),
+        'third_party_settings' => [],
         'weight' => 10,
-      ),
-      'test_display_non_configurable' => array(
+        'region' => 'content',
+      ],
+      'test_display_non_configurable' => [
         'type' => 'text_textfield',
         'settings' => $formatter_settings,
-        'third_party_settings' => array(),
+        'third_party_settings' => [],
         'weight' => 11,
-      ),
-    );
+        'region' => 'content',
+      ],
+    ];
     foreach ($expected as $field_name => $options) {
       $this->assertEqual($display->getComponent($field_name), $options);
     }
@@ -180,30 +182,30 @@ class EntityFormDisplayTest extends KernelTestBase {
   public function testDeleteField() {
     $field_name = 'test_field';
     // Create a field storage and a field.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'test_field'
-    ));
+    ]);
     $field_storage->save();
-    $field = FieldConfig::create(array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
 
     // Create default and compact entity display.
-    EntityFormMode::create(array('id' => 'entity_test.compact', 'targetEntityType' => 'entity_test'))->save();
-    EntityFormDisplay::create(array(
+    EntityFormMode::create(['id' => 'entity_test.compact', 'targetEntityType' => 'entity_test'])->save();
+    EntityFormDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'default',
-    ))->setComponent($field_name)->save();
-    EntityFormDisplay::create(array(
+    ])->setComponent($field_name)->save();
+    EntityFormDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'compact',
-    ))->setComponent($field_name)->save();
+    ])->setComponent($field_name)->save();
 
     // Check the component exists.
     $display = entity_get_form_display('entity_test', 'entity_test', 'default');
@@ -225,27 +227,27 @@ class EntityFormDisplayTest extends KernelTestBase {
    * Tests \Drupal\Core\Entity\EntityDisplayBase::onDependencyRemoval().
    */
   public function testOnDependencyRemoval() {
-    $this->enableModules(array('field_plugins_test'));
+    $this->enableModules(['field_plugins_test']);
 
     $field_name = 'test_field';
     // Create a field.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'text'
-    ));
+    ]);
     $field_storage->save();
-    $field = FieldConfig::create(array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
 
-    EntityFormDisplay::create(array(
+    EntityFormDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'default',
-    ))->setComponent($field_name, array('type' => 'field_plugins_test_text_widget'))->save();
+    ])->setComponent($field_name, ['type' => 'field_plugins_test_text_widget'])->save();
 
     // Check the component exists and is of the correct type.
     $display = entity_get_form_display('entity_test', 'entity_test', 'default');
diff --git a/web/core/modules/file/file.api.php b/web/core/modules/file/file.api.php
index c7994ff72..1fda717da 100644
--- a/web/core/modules/file/file.api.php
+++ b/web/core/modules/file/file.api.php
@@ -25,7 +25,7 @@
  * @see file_validate()
  */
 function hook_file_validate(Drupal\file\FileInterface $file) {
-  $errors = array();
+  $errors = [];
 
   if (!$file->getFilename()) {
     $errors[] = t("The file's name is empty. Please give a name to the file.");
@@ -53,7 +53,7 @@ function hook_file_copy(Drupal\file\FileInterface $file, Drupal\file\FileInterfa
     $file->setFilename($file->getOwner()->name . '_' . $file->getFilename());
     $file->save();
 
-    \Drupal::logger('file')->notice('Copied file %source has been renamed to %destination', array('%source' => $source->filename, '%destination' => $file->getFilename()));
+    \Drupal::logger('file')->notice('Copied file %source has been renamed to %destination', ['%source' => $source->filename, '%destination' => $file->getFilename()]);
   }
 }
 
@@ -73,7 +73,7 @@ function hook_file_move(Drupal\file\FileInterface $file, Drupal\file\FileInterfa
     $file->setFilename($file->getOwner()->name . '_' . $file->getFilename());
     $file->save();
 
-    \Drupal::logger('file')->notice('Moved file %source has been renamed to %destination', array('%source' => $source->filename, '%destination' => $file->getFilename()));
+    \Drupal::logger('file')->notice('Moved file %source has been renamed to %destination', ['%source' => $source->filename, '%destination' => $file->getFilename()]);
   }
 }
 
diff --git a/web/core/modules/file/file.field.inc b/web/core/modules/file/file.field.inc
index bbfc2b23e..80ffbe997 100644
--- a/web/core/modules/file/file.field.inc
+++ b/web/core/modules/file/file.field.inc
@@ -26,26 +26,26 @@ function template_preprocess_file_widget_multiple(&$variables) {
   $table_id = $element['#id'] . '-table';
 
   // Build up a table of applicable fields.
-  $headers = array();
+  $headers = [];
   $headers[] = t('File information');
   if ($element['#display_field']) {
-    $headers[] = array(
+    $headers[] = [
       'data' => t('Display'),
-      'class' => array('checkbox'),
-    );
+      'class' => ['checkbox'],
+    ];
   }
   $headers[] = t('Weight');
   $headers[] = t('Operations');
 
   // Get our list of widgets in order (needed when the form comes back after
   // preview or failed validation).
-  $widgets = array();
+  $widgets = [];
   foreach (Element::children($element) as $key) {
     $widgets[] = &$element[$key];
   }
   usort($widgets, '_field_multiple_value_form_sort_helper');
 
-  $rows = array();
+  $rows = [];
   foreach ($widgets as $key => &$widget) {
     // Save the uploading row for last.
     if (empty($widget['#files'])) {
@@ -56,7 +56,7 @@ function template_preprocess_file_widget_multiple(&$variables) {
 
     // Delay rendering of the buttons, so that they can be rendered later in the
     // "operations" column.
-    $operations_elements = array();
+    $operations_elements = [];
     foreach (Element::children($widget) as $sub_key) {
       if (isset($widget[$sub_key]['#type']) && $widget[$sub_key]['#type'] == 'submit') {
         hide($widget[$sub_key]);
@@ -72,21 +72,21 @@ function template_preprocess_file_widget_multiple(&$variables) {
     hide($widget['_weight']);
 
     // Render everything else together in a column, without the normal wrappers.
-    $widget['#theme_wrappers'] = array();
+    $widget['#theme_wrappers'] = [];
     $information = drupal_render($widget);
     $display = '';
     if ($element['#display_field']) {
       unset($widget['display']['#title']);
-      $display = array(
+      $display = [
         'data' => render($widget['display']),
-        'class' => array('checkbox'),
-      );
+        'class' => ['checkbox'],
+      ];
     }
-    $widget['_weight']['#attributes']['class'] = array($weight_class);
+    $widget['_weight']['#attributes']['class'] = [$weight_class];
     $weight = render($widget['_weight']);
 
     // Arrange the row with all of the rendered columns.
-    $row = array();
+    $row = [];
     $row[] = $information;
     if ($element['#display_field']) {
       $row[] = $display;
@@ -98,31 +98,31 @@ function template_preprocess_file_widget_multiple(&$variables) {
     foreach (Element::children($operations_elements) as $key) {
       show($operations_elements[$key]);
     }
-    $row[] = array(
+    $row[] = [
       'data' => $operations_elements,
-    );
-    $rows[] = array(
+    ];
+    $rows[] = [
       'data' => $row,
-      'class' => isset($widget['#attributes']['class']) ? array_merge($widget['#attributes']['class'], array('draggable')) : array('draggable'),
-    );
+      'class' => isset($widget['#attributes']['class']) ? array_merge($widget['#attributes']['class'], ['draggable']) : ['draggable'],
+    ];
   }
 
-  $variables['table'] = array(
+  $variables['table'] = [
     '#type' => 'table',
     '#header' => $headers,
     '#rows' => $rows,
-    '#attributes' => array(
+    '#attributes' => [
       'id' => $table_id,
-    ),
-    '#tabledrag' => array(
-      array(
+    ],
+    '#tabledrag' => [
+      [
         'action' => 'order',
         'relationship' => 'sibling',
         'group' => $weight_class,
-      ),
-    ),
+      ],
+    ],
     '#access' => !empty($rows),
-  );
+  ];
 
   $variables['element'] = $element;
 }
@@ -144,7 +144,7 @@ function template_preprocess_file_upload_help(&$variables) {
   $upload_validators = $variables['upload_validators'];
   $cardinality = $variables['cardinality'];
 
-  $descriptions = array();
+  $descriptions = [];
 
   if (!empty($description)) {
     $descriptions[] = FieldFilteredMarkup::create($description);
@@ -158,26 +158,26 @@ function template_preprocess_file_upload_help(&$variables) {
     }
   }
   if (isset($upload_validators['file_validate_size'])) {
-    $descriptions[] = t('@size limit.', array('@size' => format_size($upload_validators['file_validate_size'][0])));
+    $descriptions[] = t('@size limit.', ['@size' => format_size($upload_validators['file_validate_size'][0])]);
   }
   if (isset($upload_validators['file_validate_extensions'])) {
-    $descriptions[] = t('Allowed types: @extensions.', array('@extensions' => $upload_validators['file_validate_extensions'][0]));
+    $descriptions[] = t('Allowed types: @extensions.', ['@extensions' => $upload_validators['file_validate_extensions'][0]]);
   }
 
   if (isset($upload_validators['file_validate_image_resolution'])) {
     $max = $upload_validators['file_validate_image_resolution'][0];
     $min = $upload_validators['file_validate_image_resolution'][1];
     if ($min && $max && $min == $max) {
-      $descriptions[] = t('Images must be exactly <strong>@size</strong> pixels.', array('@size' => $max));
+      $descriptions[] = t('Images must be exactly <strong>@size</strong> pixels.', ['@size' => $max]);
     }
     elseif ($min && $max) {
-      $descriptions[] = t('Images must be larger than <strong>@min</strong> pixels. Images larger than <strong>@max</strong> pixels will be resized.', array('@min' => $min, '@max' => $max));
+      $descriptions[] = t('Images must be larger than <strong>@min</strong> pixels. Images larger than <strong>@max</strong> pixels will be resized.', ['@min' => $min, '@max' => $max]);
     }
     elseif ($min) {
-      $descriptions[] = t('Images must be larger than <strong>@min</strong> pixels.', array('@min' => $min));
+      $descriptions[] = t('Images must be larger than <strong>@min</strong> pixels.', ['@min' => $min]);
     }
     elseif ($max) {
-      $descriptions[] = t('Images larger than <strong>@max</strong> pixels will be resized.', array('@max' => $max));
+      $descriptions[] = t('Images larger than <strong>@max</strong> pixels will be resized.', ['@max' => $max]);
     }
   }
 
diff --git a/web/core/modules/file/file.install b/web/core/modules/file/file.install
index d37138466..9134a25e9 100644
--- a/web/core/modules/file/file.install
+++ b/web/core/modules/file/file.install
@@ -9,51 +9,51 @@
  * Implements hook_schema().
  */
 function file_schema() {
-  $schema['file_usage'] = array(
+  $schema['file_usage'] = [
     'description' => 'Track where a file is used.',
-    'fields' => array(
-      'fid' => array(
+    'fields' => [
+      'fid' => [
         'description' => 'File ID.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
-      ),
-      'module' => array(
+      ],
+      'module' => [
         'description' => 'The name of the module that is using the file.',
         'type' => 'varchar_ascii',
         'length' => DRUPAL_EXTENSION_NAME_MAX_LENGTH,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'type' => array(
+      ],
+      'type' => [
         'description' => 'The name of the object type in which the file is used.',
         'type' => 'varchar_ascii',
         'length' => 64,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'id' => array(
+      ],
+      'id' => [
         'description' => 'The primary key of the object using the file.',
         'type' => 'varchar_ascii',
         'length' => 64,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'count' => array(
+      ],
+      'count' => [
         'description' => 'The number of times this file is used by this object.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-    ),
-    'primary key' => array('fid', 'type', 'id', 'module'),
-    'indexes' => array(
-      'type_id' => array('type', 'id'),
-      'fid_count' => array('fid', 'count'),
-      'fid_module' => array('fid', 'module'),
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['fid', 'type', 'id', 'module'],
+    'indexes' => [
+      'type_id' => ['type', 'id'],
+      'fid_count' => ['fid', 'count'],
+      'fid_module' => ['fid', 'module'],
+    ],
+  ];
   return $schema;
 }
 
@@ -63,7 +63,7 @@ function file_schema() {
  * Display information about getting upload progress bars working.
  */
 function file_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
 
   // Check the server's ability to indicate upload progress.
   if ($phase == 'runtime') {
@@ -107,11 +107,11 @@ function file_requirements($phase) {
     elseif ($implementation == 'uploadprogress') {
       $value = t('Enabled (<a href="http://pecl.php.net/package/uploadprogress">PECL uploadprogress</a>)');
     }
-    $requirements['file_progress'] = array(
+    $requirements['file_progress'] = [
       'title' => t('Upload progress'),
       'value' => $value,
       'description' => $description,
-    );
+    ];
   }
 
   return $requirements;
diff --git a/web/core/modules/file/file.module b/web/core/modules/file/file.module
index 687a62c70..a6fc3f6eb 100644
--- a/web/core/modules/file/file.module
+++ b/web/core/modules/file/file.module
@@ -30,15 +30,15 @@ function file_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.file':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The File module allows you to create fields that contain files. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":file_documentation">online documentation for the File module</a>.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':file_documentation' => 'https://www.drupal.org/documentation/modules/file')) . '</p>';
+      $output .= '<p>' . t('The File module allows you to create fields that contain files. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":file_documentation">online documentation for the File module</a>.', [':field' => \Drupal::url('help.page', ['name' => 'field']), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#', ':file_documentation' => 'https://www.drupal.org/documentation/modules/file']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing and displaying file fields') . '</dt>';
-      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the file field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the file field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', [':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Allowing file extensions') . '</dt>';
       $output .= '<dd>' . t('In the field settings, you can define the allowed file extensions (for example <em>pdf docx psd</em>) for the files that will be uploaded with the file field.') . '</dd>';
       $output .= '<dt>' . t('Storing files') . '</dt>';
-      $output .= '<dd>' . t('Uploaded files can either be stored as <em>public</em> or <em>private</em>, depending on the <a href=":file-system">File system settings</a>. For more information, see the <a href=":system-help">System module help page</a>.', array(':file-system' => \Drupal::url('system.file_system_settings'), ':system-help' => \Drupal::url('help.page', array('name' => 'system')))) . '</dd>';
+      $output .= '<dd>' . t('Uploaded files can either be stored as <em>public</em> or <em>private</em>, depending on the <a href=":file-system">File system settings</a>. For more information, see the <a href=":system-help">System module help page</a>.', [':file-system' => \Drupal::url('system.file_system_settings'), ':system-help' => \Drupal::url('help.page', ['name' => 'system'])]) . '</dd>';
       $output .= '<dt>' . t('Restricting the maximum file size') . '</dt>';
       $output .= '<dd>' . t('The maximum file size that users can upload is limited by PHP settings of the server, but you can restrict by entering the desired value as the <em>Maximum upload size</em> setting. The maximum file size is automatically displayed to users in the help text of the file field.') . '</dd>';
       $output .= '<dt>' . t('Displaying files and descriptions') . '<dt>';
@@ -96,7 +96,7 @@ function file_load_multiple(array $fids = NULL, $reset = FALSE) {
  */
 function file_load($fid, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorage('file')->resetCache(array($fid));
+    \Drupal::entityManager()->getStorage('file')->resetCache([$fid]);
   }
   return File::load($fid);
 }
@@ -141,12 +141,12 @@ function file_load($fid, $reset = FALSE) {
 function file_copy(FileInterface $source, $destination = NULL, $replace = FILE_EXISTS_RENAME) {
   if (!file_valid_uri($destination)) {
     if (($realpath = drupal_realpath($source->getFileUri())) !== FALSE) {
-      \Drupal::logger('file')->notice('File %file (%realpath) could not be copied because the destination %destination is invalid. This is often caused by improper use of file_copy() or a missing stream wrapper.', array('%file' => $source->getFileUri(), '%realpath' => $realpath, '%destination' => $destination));
+      \Drupal::logger('file')->notice('File %file (%realpath) could not be copied because the destination %destination is invalid. This is often caused by improper use of file_copy() or a missing stream wrapper.', ['%file' => $source->getFileUri(), '%realpath' => $realpath, '%destination' => $destination]);
     }
     else {
-      \Drupal::logger('file')->notice('File %file could not be copied because the destination %destination is invalid. This is often caused by improper use of file_copy() or a missing stream wrapper.', array('%file' => $source->getFileUri(), '%destination' => $destination));
+      \Drupal::logger('file')->notice('File %file could not be copied because the destination %destination is invalid. This is often caused by improper use of file_copy() or a missing stream wrapper.', ['%file' => $source->getFileUri(), '%destination' => $destination]);
     }
-    drupal_set_message(t('The specified file %file could not be copied because the destination is invalid. More information is available in the system log.', array('%file' => $source->getFileUri())), 'error');
+    drupal_set_message(t('The specified file %file could not be copied because the destination is invalid. More information is available in the system log.', ['%file' => $source->getFileUri()]), 'error');
     return FALSE;
   }
 
@@ -158,7 +158,7 @@ function file_copy(FileInterface $source, $destination = NULL, $replace = FILE_E
     // @todo Do not create a new entity in order to update it. See
     //   https://www.drupal.org/node/2241865.
     if ($replace == FILE_EXISTS_REPLACE) {
-      $existing_files = entity_load_multiple_by_properties('file', array('uri' => $uri));
+      $existing_files = entity_load_multiple_by_properties('file', ['uri' => $uri]);
       if (count($existing_files)) {
         $existing = reset($existing_files);
         $file->fid = $existing->id();
@@ -175,7 +175,7 @@ function file_copy(FileInterface $source, $destination = NULL, $replace = FILE_E
     $file->save();
 
     // Inform modules that the file has been copied.
-    \Drupal::moduleHandler()->invokeAll('file_copy', array($file, $source));
+    \Drupal::moduleHandler()->invokeAll('file_copy', [$file, $source]);
 
     return $file;
   }
@@ -216,12 +216,12 @@ function file_copy(FileInterface $source, $destination = NULL, $replace = FILE_E
 function file_move(FileInterface $source, $destination = NULL, $replace = FILE_EXISTS_RENAME) {
   if (!file_valid_uri($destination)) {
     if (($realpath = drupal_realpath($source->getFileUri())) !== FALSE) {
-      \Drupal::logger('file')->notice('File %file (%realpath) could not be moved because the destination %destination is invalid. This may be caused by improper use of file_move() or a missing stream wrapper.', array('%file' => $source->getFileUri(), '%realpath' => $realpath, '%destination' => $destination));
+      \Drupal::logger('file')->notice('File %file (%realpath) could not be moved because the destination %destination is invalid. This may be caused by improper use of file_move() or a missing stream wrapper.', ['%file' => $source->getFileUri(), '%realpath' => $realpath, '%destination' => $destination]);
     }
     else {
-      \Drupal::logger('file')->notice('File %file could not be moved because the destination %destination is invalid. This may be caused by improper use of file_move() or a missing stream wrapper.', array('%file' => $source->getFileUri(), '%destination' => $destination));
+      \Drupal::logger('file')->notice('File %file could not be moved because the destination %destination is invalid. This may be caused by improper use of file_move() or a missing stream wrapper.', ['%file' => $source->getFileUri(), '%destination' => $destination]);
     }
-    drupal_set_message(t('The specified file %file could not be moved because the destination is invalid. More information is available in the system log.', array('%file' => $source->getFileUri())), 'error');
+    drupal_set_message(t('The specified file %file could not be moved because the destination is invalid. More information is available in the system log.', ['%file' => $source->getFileUri()]), 'error');
     return FALSE;
   }
 
@@ -232,7 +232,7 @@ function file_move(FileInterface $source, $destination = NULL, $replace = FILE_E
     $file->setFileUri($uri);
     // If we are replacing an existing file re-use its database record.
     if ($replace == FILE_EXISTS_REPLACE) {
-      $existing_files = entity_load_multiple_by_properties('file', array('uri' => $uri));
+      $existing_files = entity_load_multiple_by_properties('file', ['uri' => $uri]);
       if (count($existing_files)) {
         $existing = reset($existing_files);
         $delete_source = TRUE;
@@ -249,7 +249,7 @@ function file_move(FileInterface $source, $destination = NULL, $replace = FILE_E
     $file->save();
 
     // Inform modules that the file has been moved.
-    \Drupal::moduleHandler()->invokeAll('file_move', array($file, $source));
+    \Drupal::moduleHandler()->invokeAll('file_move', [$file, $source]);
 
     // Delete the original if it's not in use elsewhere.
     if ($delete_source && !\Drupal::service('file.usage')->listUsage($source)) {
@@ -283,9 +283,9 @@ function file_move(FileInterface $source, $destination = NULL, $replace = FILE_E
  *
  * @see hook_file_validate()
  */
-function file_validate(FileInterface $file, $validators = array()) {
+function file_validate(FileInterface $file, $validators = []) {
   // Call the validation functions specified by this function's caller.
-  $errors = array();
+  $errors = [];
   foreach ($validators as $function => $args) {
     if (function_exists($function)) {
       array_unshift($args, $file);
@@ -294,7 +294,7 @@ function file_validate(FileInterface $file, $validators = array()) {
   }
 
   // Let other modules perform validation on the new file.
-  return array_merge($errors, \Drupal::moduleHandler()->invokeAll('file_validate', array($file)));
+  return array_merge($errors, \Drupal::moduleHandler()->invokeAll('file_validate', [$file]));
 }
 
 /**
@@ -308,7 +308,7 @@ function file_validate(FileInterface $file, $validators = array()) {
  *   array containing an error message if it's not or is empty.
  */
 function file_validate_name_length(FileInterface $file) {
-  $errors = array();
+  $errors = [];
 
   if (!$file->getFilename()) {
     $errors[] = t("The file's name is empty. Please give a name to the file.");
@@ -334,11 +334,11 @@ function file_validate_name_length(FileInterface $file) {
  * @see hook_file_validate()
  */
 function file_validate_extensions(FileInterface $file, $extensions) {
-  $errors = array();
+  $errors = [];
 
   $regex = '/\.(' . preg_replace('/ +/', '|', preg_quote($extensions)) . ')$/i';
   if (!preg_match($regex, $file->getFilename())) {
-    $errors[] = t('Only files with the following extensions are allowed: %files-allowed.', array('%files-allowed' => $extensions));
+    $errors[] = t('Only files with the following extensions are allowed: %files-allowed.', ['%files-allowed' => $extensions]);
   }
   return $errors;
 }
@@ -363,15 +363,15 @@ function file_validate_extensions(FileInterface $file, $extensions) {
  */
 function file_validate_size(FileInterface $file, $file_limit = 0, $user_limit = 0) {
   $user = \Drupal::currentUser();
-  $errors = array();
+  $errors = [];
 
   if ($file_limit && $file->getSize() > $file_limit) {
-    $errors[] = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size($file->getSize()), '%maxsize' => format_size($file_limit)));
+    $errors[] = t('The file is %filesize exceeding the maximum file size of %maxsize.', ['%filesize' => format_size($file->getSize()), '%maxsize' => format_size($file_limit)]);
   }
 
   // Save a query by only calling spaceUsed() when a limit is provided.
   if ($user_limit && (\Drupal::entityManager()->getStorage('file')->spaceUsed($user->id()) + $file->getSize()) > $user_limit) {
-    $errors[] = t('The file is %filesize which would exceed your disk quota of %quota.', array('%filesize' => format_size($file->getSize()), '%quota' => format_size($user_limit)));
+    $errors[] = t('The file is %filesize which would exceed your disk quota of %quota.', ['%filesize' => format_size($file->getSize()), '%quota' => format_size($user_limit)]);
   }
 
   return $errors;
@@ -390,13 +390,13 @@ function file_validate_size(FileInterface $file, $file_limit = 0, $user_limit =
  * @see hook_file_validate()
  */
 function file_validate_is_image(FileInterface $file) {
-  $errors = array();
+  $errors = [];
 
   $image_factory = \Drupal::service('image.factory');
   $image = $image_factory->get($file->getFileUri());
   if (!$image->isValid()) {
     $supported_extensions = $image_factory->getSupportedExtensions();
-    $errors[] = t('Image type not supported. Allowed types: %types', array('%types' => implode(' ', $supported_extensions)));
+    $errors[] = t('Image type not supported. Allowed types: %types', ['%types' => implode(' ', $supported_extensions)]);
   }
 
   return $errors;
@@ -429,7 +429,7 @@ function file_validate_is_image(FileInterface $file) {
  * @see hook_file_validate()
  */
 function file_validate_image_resolution(FileInterface $file, $maximum_dimensions = 0, $minimum_dimensions = 0) {
-  $errors = array();
+  $errors = [];
 
   // Check first that the file is an image.
   $image_factory = \Drupal::service('image.factory');
@@ -443,13 +443,13 @@ function file_validate_image_resolution(FileInterface $file, $maximum_dimensions
         if ($image->scale($width, $height)) {
           $image->save();
           if (!empty($width) && !empty($height)) {
-            $message = t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', array('%dimensions' => $maximum_dimensions));
+            $message = t('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', ['%dimensions' => $maximum_dimensions]);
           }
           elseif (empty($width)) {
-            $message = t('The image was resized to fit within the maximum allowed height of %height pixels.', array('%height' => $height));
+            $message = t('The image was resized to fit within the maximum allowed height of %height pixels.', ['%height' => $height]);
           }
           elseif (empty($height)) {
-            $message = t('The image was resized to fit within the maximum allowed width of %width pixels.', array('%width' => $width));
+            $message = t('The image was resized to fit within the maximum allowed width of %width pixels.', ['%width' => $width]);
           }
           drupal_set_message($message);
         }
@@ -463,7 +463,7 @@ function file_validate_image_resolution(FileInterface $file, $maximum_dimensions
       // Check that it is larger than the given dimensions.
       list($width, $height) = explode('x', $minimum_dimensions);
       if ($image->getWidth() < $width || $image->getHeight() < $height) {
-        $errors[] = t('The image is too small; the minimum dimensions are %dimensions pixels.', array('%dimensions' => $minimum_dimensions));
+        $errors[] = t('The image is too small; the minimum dimensions are %dimensions pixels.', ['%dimensions' => $minimum_dimensions]);
       }
     }
   }
@@ -503,7 +503,7 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM
     $destination = file_default_scheme() . '://';
   }
   if (!file_valid_uri($destination)) {
-    \Drupal::logger('file')->notice('The data could not be saved because the destination %destination is invalid. This may be caused by improper use of file_save_data() or a missing stream wrapper.', array('%destination' => $destination));
+    \Drupal::logger('file')->notice('The data could not be saved because the destination %destination is invalid. This may be caused by improper use of file_save_data() or a missing stream wrapper.', ['%destination' => $destination]);
     drupal_set_message(t('The data could not be saved because the destination is invalid. More information is available in the system log.'), 'error');
     return FALSE;
   }
@@ -519,7 +519,7 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM
     // @todo Do not create a new entity in order to update it. See
     //   https://www.drupal.org/node/2241865.
     if ($replace == FILE_EXISTS_REPLACE) {
-      $existing_files = entity_load_multiple_by_properties('file', array('uri' => $uri));
+      $existing_files = entity_load_multiple_by_properties('file', ['uri' => $uri]);
       if (count($existing_files)) {
         $existing = reset($existing_files);
         $file->fid = $existing->id();
@@ -552,36 +552,36 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM
 function file_get_content_headers(FileInterface $file) {
   $type = Unicode::mimeHeaderEncode($file->getMimeType());
 
-  return array(
+  return [
     'Content-Type' => $type,
     'Content-Length' => $file->getSize(),
     'Cache-Control' => 'private',
-  );
+  ];
 }
 
 /**
  * Implements hook_theme().
  */
 function file_theme() {
-  return array(
+  return [
     // From file.module.
-    'file_link' => array(
-      'variables' => array('file' => NULL, 'description' => NULL, 'attributes' => array()),
-    ),
-    'file_managed_file' => array(
+    'file_link' => [
+      'variables' => ['file' => NULL, 'description' => NULL, 'attributes' => []],
+    ],
+    'file_managed_file' => [
       'render element' => 'element',
-    ),
+    ],
 
     // From file.field.inc.
-    'file_widget_multiple' => array(
+    'file_widget_multiple' => [
       'render element' => 'element',
       'file' => 'file.field.inc',
-    ),
-    'file_upload_help' => array(
-      'variables' => array('description' => NULL, 'upload_validators' => NULL, 'cardinality' => NULL),
+    ],
+    'file_upload_help' => [
+      'variables' => ['description' => NULL, 'upload_validators' => NULL, 'cardinality' => NULL],
       'file' => 'file.field.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -590,7 +590,7 @@ function file_theme() {
 function file_file_download($uri) {
   // Get the file record based on the URI. If not in the database just return.
   /** @var \Drupal\file\FileInterface[] $files */
-  $files = entity_load_multiple_by_properties('file', array('uri' => $uri));
+  $files = entity_load_multiple_by_properties('file', ['uri' => $uri]);
   if (count($files)) {
     foreach ($files as $item) {
       // Since some database servers sometimes use a case-insensitive comparison
@@ -663,11 +663,11 @@ function file_cron() {
           $file->delete();
         }
         else {
-          \Drupal::logger('file system')->error('Could not delete temporary file "%path" during garbage collection', array('%path' => $file->getFileUri()));
+          \Drupal::logger('file system')->error('Could not delete temporary file "%path" during garbage collection', ['%path' => $file->getFileUri()]);
         }
       }
       else {
-        \Drupal::logger('file system')->info('Did not delete temporary file "%path" during garbage collection because it is in use by the following modules: %modules.', array('%path' => $file->getFileUri(), '%modules' => implode(', ', array_keys($references))));
+        \Drupal::logger('file system')->info('Did not delete temporary file "%path" during garbage collection because it is in use by the following modules: %modules.', ['%path' => $file->getFileUri(), '%modules' => implode(', ', array_keys($references))]);
       }
     }
   }
@@ -711,11 +711,11 @@ function file_cron() {
  *   array element contains the file entity if the upload succeeded or FALSE if
  *   there was an error. Function returns NULL if no file was uploaded.
  */
-function file_save_upload($form_field_name, $validators = array(), $destination = FALSE, $delta = NULL, $replace = FILE_EXISTS_RENAME) {
+function file_save_upload($form_field_name, $validators = [], $destination = FALSE, $delta = NULL, $replace = FILE_EXISTS_RENAME) {
   $user = \Drupal::currentUser();
   static $upload_cache;
 
-  $all_files = \Drupal::request()->files->get('files', array());
+  $all_files = \Drupal::request()->files->get('files', []);
   // Make sure there's an upload to process.
   if (empty($all_files[$form_field_name])) {
     return NULL;
@@ -735,10 +735,10 @@ function file_save_upload($form_field_name, $validators = array(), $destination
   // for multiple uploads and we fix that here.
   $uploaded_files = $file_upload;
   if (!is_array($file_upload)) {
-    $uploaded_files = array($file_upload);
+    $uploaded_files = [$file_upload];
   }
 
-  $files = array();
+  $files = [];
   foreach ($uploaded_files as $i => $file_info) {
     // Check for file upload errors and return FALSE for this file if a lower
     // level system error occurred. For a complete list of errors:
@@ -746,13 +746,13 @@ function file_save_upload($form_field_name, $validators = array(), $destination
     switch ($file_info->getError()) {
       case UPLOAD_ERR_INI_SIZE:
       case UPLOAD_ERR_FORM_SIZE:
-        drupal_set_message(t('The file %file could not be saved because it exceeds %maxsize, the maximum allowed size for uploads.', array('%file' => $file_info->getFilename(), '%maxsize' => format_size(file_upload_max_size()))), 'error');
+        drupal_set_message(t('The file %file could not be saved because it exceeds %maxsize, the maximum allowed size for uploads.', ['%file' => $file_info->getFilename(), '%maxsize' => format_size(file_upload_max_size())]), 'error');
         $files[$i] = FALSE;
         continue;
 
       case UPLOAD_ERR_PARTIAL:
       case UPLOAD_ERR_NO_FILE:
-        drupal_set_message(t('The file %file could not be saved because the upload did not complete.', array('%file' => $file_info->getFilename())), 'error');
+        drupal_set_message(t('The file %file could not be saved because the upload did not complete.', ['%file' => $file_info->getFilename()]), 'error');
         $files[$i] = FALSE;
         continue;
 
@@ -765,19 +765,19 @@ function file_save_upload($form_field_name, $validators = array(), $destination
 
         // Unknown error
       default:
-        drupal_set_message(t('The file %file could not be saved. An unknown error has occurred.', array('%file' => $file_info->getFilename())), 'error');
+        drupal_set_message(t('The file %file could not be saved. An unknown error has occurred.', ['%file' => $file_info->getFilename()]), 'error');
         $files[$i] = FALSE;
         continue;
 
     }
     // Begin building file entity.
-    $values = array(
+    $values = [
       'uid' => $user->id(),
       'status' => 0,
       'filename' => $file_info->getClientOriginalName(),
       'uri' => $file_info->getRealPath(),
       'filesize' => $file_info->getSize(),
-    );
+    ];
     $values['filemime'] = \Drupal::service('file.mime_type.guesser')->guess($values['filename']);
     $file = File::create($values);
 
@@ -798,7 +798,7 @@ function file_save_upload($form_field_name, $validators = array(), $destination
       // No validator was provided, so add one using the default list.
       // Build a default non-munged safe list for file_munge_filename().
       $extensions = 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp';
-      $validators['file_validate_extensions'] = array();
+      $validators['file_validate_extensions'] = [];
       $validators['file_validate_extensions'][0] = $extensions;
     }
 
@@ -820,7 +820,7 @@ function file_save_upload($form_field_name, $validators = array(), $destination
       // to add it here or else the file upload will fail.
       if (!empty($extensions)) {
         $validators['file_validate_extensions'][0] .= ' txt';
-        drupal_set_message(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $file->getFilename())));
+        drupal_set_message(t('For security reasons, your upload has been renamed to %filename.', ['%filename' => $file->getFilename()]));
       }
     }
 
@@ -832,7 +832,7 @@ function file_save_upload($form_field_name, $validators = array(), $destination
     // Assert that the destination contains a valid stream.
     $destination_scheme = file_uri_scheme($destination);
     if (!file_stream_wrapper_valid_scheme($destination_scheme)) {
-      drupal_set_message(t('The file could not be uploaded because the destination %destination is invalid.', array('%destination' => $destination)), 'error');
+      drupal_set_message(t('The file could not be uploaded because the destination %destination is invalid.', ['%destination' => $destination]), 'error');
       $files[$i] = FALSE;
       continue;
     }
@@ -846,28 +846,28 @@ function file_save_upload($form_field_name, $validators = array(), $destination
     // If file_destination() returns FALSE then $replace === FILE_EXISTS_ERROR and
     // there's an existing file so we need to bail.
     if ($file->destination === FALSE) {
-      drupal_set_message(t('The file %source could not be uploaded because a file by that name already exists in the destination %directory.', array('%source' => $form_field_name, '%directory' => $destination)), 'error');
+      drupal_set_message(t('The file %source could not be uploaded because a file by that name already exists in the destination %directory.', ['%source' => $form_field_name, '%directory' => $destination]), 'error');
       $files[$i] = FALSE;
       continue;
     }
 
     // Add in our check of the file name length.
-    $validators['file_validate_name_length'] = array();
+    $validators['file_validate_name_length'] = [];
 
     // Call the validation functions specified by this function's caller.
     $errors = file_validate($file, $validators);
 
     // Check for errors.
     if (!empty($errors)) {
-      $message = array(
-        'error' => array(
-          '#markup' => t('The specified file %name could not be uploaded.', array('%name' => $file->getFilename())),
-        ),
-        'item_list' => array(
+      $message = [
+        'error' => [
+          '#markup' => t('The specified file %name could not be uploaded.', ['%name' => $file->getFilename()]),
+        ],
+        'item_list' => [
           '#theme' => 'item_list',
           '#items' => $errors,
-        ),
-      );
+        ],
+      ];
       // @todo Add support for render arrays in drupal_set_message()? See
       //  https://www.drupal.org/node/2505497.
       drupal_set_message(\Drupal::service('renderer')->renderPlain($message), 'error');
@@ -881,7 +881,7 @@ function file_save_upload($form_field_name, $validators = array(), $destination
     $file->setFileUri($file->destination);
     if (!drupal_move_uploaded_file($file_info->getRealPath(), $file->getFileUri())) {
       drupal_set_message(t('File upload error. Could not move uploaded file.'), 'error');
-      \Drupal::logger('file')->notice('Upload error. Could not move uploaded file %file to destination %destination.', array('%file' => $file->getFilename(), '%destination' => $file->getFileUri()));
+      \Drupal::logger('file')->notice('Upload error. Could not move uploaded file %file to destination %destination.', ['%file' => $file->getFilename(), '%destination' => $file->getFileUri()]);
       $files[$i] = FALSE;
       continue;
     }
@@ -893,7 +893,7 @@ function file_save_upload($form_field_name, $validators = array(), $destination
     // @todo Do not create a new entity in order to update it. See
     //   https://www.drupal.org/node/2241865.
     if ($replace == FILE_EXISTS_REPLACE) {
-      $existing_files = entity_load_multiple_by_properties('file', array('uri' => $file->getFileUri()));
+      $existing_files = entity_load_multiple_by_properties('file', ['uri' => $file->getFileUri()]);
       if (count($existing_files)) {
         $existing = reset($existing_files);
         $file->fid = $existing->id();
@@ -949,7 +949,7 @@ function file_file_predelete(File $file) {
 function file_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
-  $url_options = array('absolute' => TRUE);
+  $url_options = ['absolute' => TRUE];
   if (isset($options['langcode'])) {
     $url_options['language'] = \Drupal::languageManager()->getLanguage($options['langcode']);
     $langcode = $options['langcode'];
@@ -958,7 +958,7 @@ function file_tokens($type, $tokens, array $data, array $options, BubbleableMeta
     $langcode = NULL;
   }
 
-  $replacements = array();
+  $replacements = [];
 
   if ($type == 'file' && !empty($data['file'])) {
     /** @var \Drupal\file\FileInterface $file */
@@ -1020,15 +1020,15 @@ function file_tokens($type, $tokens, array $data, array $options, BubbleableMeta
     }
 
     if ($date_tokens = $token_service->findWithPrefix($tokens, 'created')) {
-      $replacements += $token_service->generate('date', $date_tokens, array('date' => $file->getCreatedTime()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('date', $date_tokens, ['date' => $file->getCreatedTime()], $options, $bubbleable_metadata);
     }
 
     if ($date_tokens = $token_service->findWithPrefix($tokens, 'changed')) {
-      $replacements += $token_service->generate('date', $date_tokens, array('date' => $file->getChangedTime()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('date', $date_tokens, ['date' => $file->getChangedTime()], $options, $bubbleable_metadata);
     }
 
     if (($owner_tokens = $token_service->findWithPrefix($tokens, 'owner')) && $file->getOwner()) {
-      $replacements += $token_service->generate('user', $owner_tokens, array('user' => $file->getOwner()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('user', $owner_tokens, ['user' => $file->getOwner()], $options, $bubbleable_metadata);
     }
   }
 
@@ -1039,59 +1039,59 @@ function file_tokens($type, $tokens, array $data, array $options, BubbleableMeta
  * Implements hook_token_info().
  */
 function file_token_info() {
-  $types['file'] = array(
+  $types['file'] = [
     'name' => t("Files"),
     'description' => t("Tokens related to uploaded files."),
     'needs-data' => 'file',
-  );
+  ];
 
   // File related tokens.
-  $file['fid'] = array(
+  $file['fid'] = [
     'name' => t("File ID"),
     'description' => t("The unique ID of the uploaded file."),
-  );
-  $file['name'] = array(
+  ];
+  $file['name'] = [
     'name' => t("File name"),
     'description' => t("The name of the file on disk."),
-  );
-  $file['path'] = array(
+  ];
+  $file['path'] = [
     'name' => t("Path"),
     'description' => t("The location of the file relative to Drupal root."),
-  );
-  $file['mime'] = array(
+  ];
+  $file['mime'] = [
     'name' => t("MIME type"),
     'description' => t("The MIME type of the file."),
-  );
-  $file['size'] = array(
+  ];
+  $file['size'] = [
     'name' => t("File size"),
     'description' => t("The size of the file."),
-  );
-  $file['url'] = array(
+  ];
+  $file['url'] = [
     'name' => t("URL"),
     'description' => t("The web-accessible URL for the file."),
-  );
-  $file['created'] = array(
+  ];
+  $file['created'] = [
     'name' => t("Created"),
     'description' => t("The date the file created."),
     'type' => 'date',
-  );
-  $file['changed'] = array(
+  ];
+  $file['changed'] = [
     'name' => t("Changed"),
     'description' => t("The date the file was most recently changed."),
     'type' => 'date',
-  );
-  $file['owner'] = array(
+  ];
+  $file['owner'] = [
     'name' => t("Owner"),
     'description' => t("The user who originally uploaded the file."),
     'type' => 'user',
-  );
+  ];
 
-  return array(
+  return [
     'types' => $types,
-    'tokens' => array(
+    'tokens' => [
       'file' => $file,
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -1115,7 +1115,7 @@ function file_managed_file_submit($form, FormStateInterface $form_state) {
     $fids = array_keys($element['#files']);
     // Get files that will be removed.
     if ($element['#multiple']) {
-      $remove_fids = array();
+      $remove_fids = [];
       foreach (Element::children($element) as $name) {
         if (strpos($name, 'file_') === 0 && $element[$name]['selected']['#value']) {
           $remove_fids[] = (int) substr($name, 5);
@@ -1128,7 +1128,7 @@ function file_managed_file_submit($form, FormStateInterface $form_state) {
       // element's value to empty array (file could not be removed from
       // element if we don't do that).
       $remove_fids = $fids;
-      $fids = array();
+      $fids = [];
     }
 
     foreach ($remove_fids as $fid) {
@@ -1175,7 +1175,7 @@ function file_managed_file_submit($form, FormStateInterface $form_state) {
  */
 function file_managed_file_save_upload($element, FormStateInterface $form_state) {
   $upload_name = implode('_', $element['#parents']);
-  $all_files = \Drupal::request()->files->get('files', array());
+  $all_files = \Drupal::request()->files->get('files', []);
   if (empty($all_files[$upload_name])) {
     return FALSE;
   }
@@ -1183,7 +1183,7 @@ function file_managed_file_save_upload($element, FormStateInterface $form_state)
 
   $destination = isset($element['#upload_location']) ? $element['#upload_location'] : NULL;
   if (isset($destination) && !file_prepare_directory($destination, FILE_CREATE_DIRECTORY)) {
-    \Drupal::logger('file')->notice('The upload directory %directory for the file field %name could not be created or is not accessible. A newly uploaded file could not be saved in this directory as a consequence, and the upload was canceled.', array('%directory' => $destination, '%name' => $element['#field_name']));
+    \Drupal::logger('file')->notice('The upload directory %directory for the file field %name could not be created or is not accessible. A newly uploaded file could not be saved in this directory as a consequence, and the upload was canceled.', ['%directory' => $destination, '%name' => $element['#field_name']]);
     $form_state->setError($element, t('The file could not be uploaded.'));
     return FALSE;
   }
@@ -1193,19 +1193,19 @@ function file_managed_file_save_upload($element, FormStateInterface $form_state)
   $files_uploaded |= !$element['#multiple'] && !empty($file_upload);
   if ($files_uploaded) {
     if (!$files = file_save_upload($upload_name, $element['#upload_validators'], $destination)) {
-      \Drupal::logger('file')->notice('The file upload failed. %upload', array('%upload' => $upload_name));
-      $form_state->setError($element, t('Files in the @name field were unable to be uploaded.', array('@name' => $element['#title'])));
-      return array();
+      \Drupal::logger('file')->notice('The file upload failed. %upload', ['%upload' => $upload_name]);
+      $form_state->setError($element, t('Files in the @name field were unable to be uploaded.', ['@name' => $element['#title']]));
+      return [];
     }
 
     // Value callback expects FIDs to be keys.
     $files = array_filter($files);
     $fids = array_map(function($file) { return $file->id(); }, $files);
 
-    return empty($files) ? array() : array_combine($fids, $files);
+    return empty($files) ? [] : array_combine($fids, $files);
   }
 
-  return array();
+  return [];
 }
 
 /**
@@ -1220,7 +1220,7 @@ function file_managed_file_save_upload($element, FormStateInterface $form_state)
 function template_preprocess_file_managed_file(&$variables) {
   $element = $variables['element'];
 
-  $variables['attributes'] = array();
+  $variables['attributes'] = [];
   if (isset($element['#id'])) {
     $variables['attributes']['id'] = $element['#id'];
   }
@@ -1244,7 +1244,7 @@ function template_preprocess_file_managed_file(&$variables) {
  */
 function template_preprocess_file_link(&$variables) {
   $file = $variables['file'];
-  $options = array();
+  $options = [];
 
   $file_entity = ($file instanceof File) ? $file : File::load($file->fid);
   // @todo Wrap in file_url_transform_relative(). This is currently
@@ -1270,13 +1270,13 @@ function template_preprocess_file_link(&$variables) {
   }
 
   // Classes to add to the file field for icons.
-  $classes = array(
+  $classes = [
     'file',
     // Add a specific class for each and every mime type.
-    'file--mime-' . strtr($mime_type, array('/' => '-', '.' => '-')),
+    'file--mime-' . strtr($mime_type, ['/' => '-', '.' => '-']),
     // Add a more general class for groups of well known MIME types.
     'file--' . file_icon_class($mime_type),
-  );
+  ];
 
   // Set file classes to the options array.
   $variables['attributes'] = new Attribute($variables['attributes']);
@@ -1302,7 +1302,7 @@ function file_icon_class($mime_type) {
   }
 
   // Use generic icons for each category that provides such icons.
-  foreach (array('audio', 'image', 'text', 'video') as $category) {
+  foreach (['audio', 'image', 'text', 'video'] as $category) {
     if (strpos($mime_type, $category) === 0) {
       return $category;
     }
@@ -1473,14 +1473,14 @@ function file_icon_map($mime_type) {
  * @ingroup file
  */
 function file_get_file_references(FileInterface $file, FieldDefinitionInterface $field = NULL, $age = EntityStorageInterface::FIELD_LOAD_REVISION, $field_type = 'file') {
-  $references = &drupal_static(__FUNCTION__, array());
-  $field_columns = &drupal_static(__FUNCTION__ . ':field_columns', array());
+  $references = &drupal_static(__FUNCTION__, []);
+  $field_columns = &drupal_static(__FUNCTION__ . ':field_columns', []);
 
   // Fill the static cache, disregard $field and $field_type for now.
   if (!isset($references[$file->id()][$age])) {
-    $references[$file->id()][$age] = array();
+    $references[$file->id()][$age] = [];
     $usage_list = \Drupal::service('file.usage')->listUsage($file);
-    $file_usage_list = isset($usage_list['file']) ? $usage_list['file'] : array();
+    $file_usage_list = isset($usage_list['file']) ? $usage_list['file'] : [];
     foreach ($file_usage_list as $entity_type_id => $entity_ids) {
       $entities = \Drupal::entityTypeManager()
         ->getStorage($entity_type_id)->loadMultiple(array_keys($entity_ids));
@@ -1488,7 +1488,7 @@ function file_get_file_references(FileInterface $file, FieldDefinitionInterface
         $bundle = $entity->bundle();
         // We need to find file fields for this entity type and bundle.
         if (!isset($file_fields[$entity_type_id][$bundle])) {
-          $file_fields[$entity_type_id][$bundle] = array();
+          $file_fields[$entity_type_id][$bundle] = [];
           // This contains the possible field names.
           foreach ($entity->getFieldDefinitions() as $field_name => $field_definition) {
             // If this is the first time this field type is seen, check
@@ -1549,10 +1549,10 @@ function file_get_file_references(FileInterface $file, FieldDefinitionInterface
  *   An array of file statuses or a specified status if $choice is set.
  */
 function _views_file_status($choice = NULL) {
-  $status = array(
+  $status = [
     0 => t('Temporary'),
     FILE_STATUS_PERMANENT => t('Permanent'),
-  );
+  ];
 
   if (isset($choice)) {
     return isset($status[$choice]) ? $status[$choice] : t('Unknown');
diff --git a/web/core/modules/file/file.views.inc b/web/core/modules/file/file.views.inc
index 7fb54b613..8e45101bd 100644
--- a/web/core/modules/file/file.views.inc
+++ b/web/core/modules/file/file.views.inc
@@ -19,13 +19,13 @@ function file_field_views_data(FieldStorageConfigInterface $field_storage) {
   $data = views_field_default_views_data($field_storage);
   foreach ($data as $table_name => $table_data) {
     // Add the relationship only on the fid field.
-    $data[$table_name][$field_storage->getName() . '_target_id']['relationship'] = array(
+    $data[$table_name][$field_storage->getName() . '_target_id']['relationship'] = [
       'id' => 'standard',
       'base' => 'file_managed',
       'entity type' => 'file',
       'base field' => 'fid',
-      'label' => t('file from @field_name', array('@field_name' => $field_storage->getName())),
-    );
+      'label' => t('file from @field_name', ['@field_name' => $field_storage->getName()]),
+    ];
   }
 
   return $data;
@@ -47,11 +47,11 @@ function file_field_views_data_views_data_alter(array &$data, FieldStorageConfig
 
   list($label) = views_entity_field_label($entity_type_id, $field_name);
 
-  $data['file_managed'][$pseudo_field_name]['relationship'] = array(
-    'title' => t('@entity using @field', array('@entity' => $entity_type->getLabel(), '@field' => $label)),
-    'label' => t('@field_name', array('@field_name' => $field_name)),
+  $data['file_managed'][$pseudo_field_name]['relationship'] = [
+    'title' => t('@entity using @field', ['@entity' => $entity_type->getLabel(), '@field' => $label]),
+    'label' => t('@field_name', ['@field_name' => $field_name]),
     'group' => $entity_type->getLabel(),
-    'help' => t('Relate each @entity with a @field set to the file.', array('@entity' => $entity_type->getLabel(), '@field' => $label)),
+    'help' => t('Relate each @entity with a @field set to the file.', ['@entity' => $entity_type->getLabel(), '@field' => $label]),
     'id' => 'entity_reverse',
     'base' => $entity_type->getDataTable() ?: $entity_type->getBaseTable(),
     'entity_type' => $entity_type_id,
@@ -59,12 +59,12 @@ function file_field_views_data_views_data_alter(array &$data, FieldStorageConfig
     'field_name' => $field_name,
     'field table' => $table_mapping->getDedicatedDataTableName($field_storage),
     'field field' => $field_name . '_target_id',
-    'join_extra' => array(
-      0 => array(
+    'join_extra' => [
+      0 => [
         'field' => 'deleted',
         'value' => 0,
         'numeric' => TRUE,
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 }
diff --git a/web/core/modules/file/migration_templates/d6_file.yml b/web/core/modules/file/migration_templates/d6_file.yml
index 6df20b522..c25f63fb6 100644
--- a/web/core/modules/file/migration_templates/d6_file.yml
+++ b/web/core/modules/file/migration_templates/d6_file.yml
@@ -14,9 +14,10 @@ source:
     source_base_path: ''
 process:
     # If you are using both this migration and d6_user_picture_file in a custom
-    # migration and executing migrations incrementally, it is recommended that
-    # you remove the fid mapping here to avoid potential ID conflicts.
-  fid: fid
+    # migration and executing migrations incrementally, it is strongly
+    # recommended that you remove the fid mapping to avoid potential ID
+    # conflicts. For that reason, this mapping is commented out by default.
+    # fid: fid
   filename: filename
   source_full_path:
     -
@@ -40,7 +41,8 @@ process:
       - '@source_full_path'
       - '@destination_full_path'
   filemime: filemime
-  filesize: filesize
+  # No need to migrate filesize, it is computed when file entities are saved.
+  # filesize: filesize
   status: status
   changed: timestamp
   uid: uid
diff --git a/web/core/modules/file/src/Controller/FileWidgetAjaxController.php b/web/core/modules/file/src/Controller/FileWidgetAjaxController.php
index d5c687452..c95875044 100644
--- a/web/core/modules/file/src/Controller/FileWidgetAjaxController.php
+++ b/web/core/modules/file/src/Controller/FileWidgetAjaxController.php
@@ -19,23 +19,23 @@ class FileWidgetAjaxController {
    *   A JsonResponse object.
    */
   public function progress($key) {
-    $progress = array(
+    $progress = [
       'message' => t('Starting upload...'),
       'percentage' => -1,
-    );
+    ];
 
     $implementation = file_progress_implementation();
     if ($implementation == 'uploadprogress') {
       $status = uploadprogress_get_info($key);
       if (isset($status['bytes_uploaded']) && !empty($status['bytes_total'])) {
-        $progress['message'] = t('Uploading... (@current of @total)', array('@current' => format_size($status['bytes_uploaded']), '@total' => format_size($status['bytes_total'])));
+        $progress['message'] = t('Uploading... (@current of @total)', ['@current' => format_size($status['bytes_uploaded']), '@total' => format_size($status['bytes_total'])]);
         $progress['percentage'] = round(100 * $status['bytes_uploaded'] / $status['bytes_total']);
       }
     }
     elseif ($implementation == 'apc') {
       $status = apcu_fetch('upload_' . $key);
       if (isset($status['current']) && !empty($status['total'])) {
-        $progress['message'] = t('Uploading... (@current of @total)', array('@current' => format_size($status['current']), '@total' => format_size($status['total'])));
+        $progress['message'] = t('Uploading... (@current of @total)', ['@current' => format_size($status['current']), '@total' => format_size($status['total'])]);
         $progress['percentage'] = round(100 * $status['current'] / $status['total']);
       }
     }
diff --git a/web/core/modules/file/src/Element/ManagedFile.php b/web/core/modules/file/src/Element/ManagedFile.php
index 426f40c03..45c8aa7ce 100644
--- a/web/core/modules/file/src/Element/ManagedFile.php
+++ b/web/core/modules/file/src/Element/ManagedFile.php
@@ -49,6 +49,7 @@ class ManagedFile extends FormElement {
       '#attached' => [
         'library' => ['file/drupal.file'],
       ],
+      '#accept' => NULL,
     ];
   }
 
@@ -107,7 +108,7 @@ class ManagedFile extends FormElement {
                 // submissions of the same form, so to allow that, check for the
                 // token added by $this->processManagedFile().
                 elseif (\Drupal::currentUser()->isAnonymous()) {
-                  $token = NestedArray::getValue($form_state->getUserInput(), array_merge($element['#parents'], array('file_' . $file->id(), 'fid_token')));
+                  $token = NestedArray::getValue($form_state->getUserInput(), array_merge($element['#parents'], ['file_' . $file->id(), 'fid_token']));
                   if ($token !== Crypt::hmacBase64('file-' . $file->id(), \Drupal::service('private_key')->get() . Settings::getHashSalt())) {
                     $force_default = TRUE;
                     break;
@@ -308,6 +309,9 @@ class ManagedFile extends FormElement {
       '#weight' => -10,
       '#error_no_message' => TRUE,
     ];
+    if (!empty($element['#accept'])) {
+      $element['upload']['#attributes'] = ['accept' => $element['#accept']];
+    }
 
     if (!empty($fids) && $element['#files']) {
       foreach ($element['#files'] as $delta => $file) {
@@ -330,10 +334,10 @@ class ManagedFile extends FormElement {
         // of the same form (for example, after an Ajax upload or form
         // validation error).
         if ($file->isTemporary() && \Drupal::currentUser()->isAnonymous()) {
-          $element['file_' . $delta]['fid_token'] = array(
+          $element['file_' . $delta]['fid_token'] = [
             '#type' => 'hidden',
             '#value' => Crypt::hmacBase64('file-' . $delta, \Drupal::service('private_key')->get() . Settings::getHashSalt()),
-          );
+          ];
         }
       }
     }
diff --git a/web/core/modules/file/src/Entity/File.php b/web/core/modules/file/src/Entity/File.php
index cd7a65897..a68b9bae9 100644
--- a/web/core/modules/file/src/Entity/File.php
+++ b/web/core/modules/file/src/Entity/File.php
@@ -70,7 +70,7 @@ class File extends ContentEntityBase implements FileInterface {
    *
    * @see file_url_transform_relative()
    */
-  public function url($rel = 'canonical', $options = array()) {
+  public function url($rel = 'canonical', $options = []) {
     return file_create_url($this->getFileUri());
   }
 
diff --git a/web/core/modules/file/src/FileStorageSchema.php b/web/core/modules/file/src/FileStorageSchema.php
index a0d080d22..64412fa42 100644
--- a/web/core/modules/file/src/FileStorageSchema.php
+++ b/web/core/modules/file/src/FileStorageSchema.php
@@ -21,9 +21,6 @@ class FileStorageSchema extends SqlContentEntityStorageSchema {
       switch ($field_name) {
         case 'status':
         case 'changed':
-          $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
-          break;
-
         case 'uri':
           $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
           break;
diff --git a/web/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php b/web/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php
index 12647b112..cfb0c447a 100644
--- a/web/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php
+++ b/web/core/modules/file/src/FileUsage/DatabaseFileUsageBackend.php
@@ -44,14 +44,14 @@ class DatabaseFileUsageBackend extends FileUsageBase {
    */
   public function add(FileInterface $file, $module, $type, $id, $count = 1) {
     $this->connection->merge($this->tableName)
-      ->keys(array(
+      ->keys([
         'fid' => $file->id(),
         'module' => $module,
         'type' => $type,
         'id' => $id,
-      ))
-      ->fields(array('count' => $count))
-      ->expression('count', 'count + :count', array(':count' => $count))
+      ])
+      ->fields(['count' => $count])
+      ->expression('count', 'count + :count', [':count' => $count])
       ->execute();
 
     parent::add($file, $module, $type, $id, $count);
@@ -85,7 +85,7 @@ class DatabaseFileUsageBackend extends FileUsageBase {
           ->condition('type', $type)
           ->condition('id', $id);
       }
-      $query->expression('count', 'count - :count', array(':count' => $count));
+      $query->expression('count', 'count - :count', [':count' => $count]);
       $query->execute();
     }
 
@@ -97,11 +97,11 @@ class DatabaseFileUsageBackend extends FileUsageBase {
    */
   public function listUsage(FileInterface $file) {
     $result = $this->connection->select($this->tableName, 'f')
-      ->fields('f', array('module', 'type', 'id', 'count'))
+      ->fields('f', ['module', 'type', 'id', 'count'])
       ->condition('fid', $file->id())
       ->condition('count', 0, '>')
       ->execute();
-    $references = array();
+    $references = [];
     foreach ($result as $usage) {
       $references[$usage->module][$usage->type][$usage->id] = $usage->count;
     }
diff --git a/web/core/modules/file/src/FileViewsData.php b/web/core/modules/file/src/FileViewsData.php
index cf2406225..459a37eba 100644
--- a/web/core/modules/file/src/FileViewsData.php
+++ b/web/core/modules/file/src/FileViewsData.php
@@ -20,13 +20,13 @@ class FileViewsData extends EntityViewsData {
     $data['file_managed']['table']['base']['defaults']['field'] = 'filename';
     $data['file_managed']['table']['wizard_id'] = 'file_managed';
 
-    $data['file_managed']['fid']['argument'] = array(
+    $data['file_managed']['fid']['argument'] = [
       'id' => 'file_fid',
       // The field to display in the summary.
       'name field' => 'filename',
       'numeric' => TRUE,
-    );
-    $data['file_managed']['fid']['relationship'] = array(
+    ];
+    $data['file_managed']['fid']['relationship'] = [
       'title' => $this->t('File usage'),
       'help' => $this->t('Relate file entities to their usage.'),
       'id' => 'standard',
@@ -34,24 +34,24 @@ class FileViewsData extends EntityViewsData {
       'base field' => 'fid',
       'field' => 'fid',
       'label' => $this->t('File usage'),
-    );
+    ];
 
     $data['file_managed']['uri']['field']['default_formatter'] = 'file_uri';
 
     $data['file_managed']['filemime']['field']['default_formatter'] = 'file_filemime';
 
-    $data['file_managed']['extension'] = array(
+    $data['file_managed']['extension'] = [
       'title' => $this->t('Extension'),
       'help' => $this->t('The extension of the file.'),
       'real field' => 'filename',
-      'field' => array(
+      'field' => [
         'entity_type' => 'file',
         'field_name' => 'filename',
         'default_formatter' => 'file_extension',
         'id' => 'field',
         'click sortable' => FALSE,
-       ),
-    );
+       ],
+    ];
 
     $data['file_managed']['filesize']['field']['default_formatter'] = 'file_size';
 
@@ -71,40 +71,40 @@ class FileViewsData extends EntityViewsData {
     // ("file_managed") so that we can create relationships from files to
     // entities, and then on each core entity type base table so that we can
     // provide general relationships between entities and files.
-    $data['file_usage']['table']['join'] = array(
-      'file_managed' => array(
+    $data['file_usage']['table']['join'] = [
+      'file_managed' => [
         'field' => 'fid',
         'left_field' => 'fid',
-      ),
+      ],
       // Link ourselves to the {node_field_data} table
       // so we can provide node->file relationships.
-      'node_field_data' => array(
+      'node_field_data' => [
         'field' => 'id',
         'left_field' => 'nid',
-        'extra' => array(array('field' => 'type', 'value' => 'node')),
-      ),
+        'extra' => [['field' => 'type', 'value' => 'node']],
+      ],
       // Link ourselves to the {users_field_data} table
       // so we can provide user->file relationships.
-      'users_field_data' => array(
+      'users_field_data' => [
         'field' => 'id',
         'left_field' => 'uid',
-        'extra' => array(array('field' => 'type', 'value' => 'user')),
-      ),
+        'extra' => [['field' => 'type', 'value' => 'user']],
+      ],
       // Link ourselves to the {comment_field_data} table
       // so we can provide comment->file relationships.
-      'comment' => array(
+      'comment' => [
         'field' => 'id',
         'left_field' => 'cid',
-        'extra' => array(array('field' => 'type', 'value' => 'comment')),
-      ),
+        'extra' => [['field' => 'type', 'value' => 'comment']],
+      ],
       // Link ourselves to the {taxonomy_term_field_data} table
       // so we can provide taxonomy_term->file relationships.
-      'taxonomy_term_data' => array(
+      'taxonomy_term_data' => [
         'field' => 'id',
         'left_field' => 'tid',
-        'extra' => array(array('field' => 'type', 'value' => 'taxonomy_term')),
-      ),
-    );
+        'extra' => [['field' => 'type', 'value' => 'taxonomy_term']],
+      ],
+    ];
 
     // Provide a relationship between the files table and each entity type,
     // and between each entity type and the files table. Entity->file
@@ -113,210 +113,210 @@ class FileViewsData extends EntityViewsData {
     // declarations below.
 
     // Describes relationships between files and nodes.
-    $data['file_usage']['file_to_node'] = array(
+    $data['file_usage']['file_to_node'] = [
       'title' => $this->t('Content'),
       'help' => $this->t('Content that is associated with this file, usually because this file is in a field on the content.'),
       // Only provide this field/relationship/etc.,
       // when the 'file_managed' base table is present.
-      'skip base' => array('node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'),
+      'skip base' => ['node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'],
       'real field' => 'id',
-      'relationship' => array(
+      'relationship' => [
         'title' => $this->t('Content'),
         'label' => $this->t('Content'),
         'base' => 'node_field_data',
         'base field' => 'nid',
         'relationship field' => 'id',
-        'extra' => array(array('table' => 'file_usage', 'field' => 'type', 'operator' => '=', 'value' => 'node')),
-      ),
-    );
-    $data['file_usage']['node_to_file'] = array(
+        'extra' => [['table' => 'file_usage', 'field' => 'type', 'operator' => '=', 'value' => 'node']],
+      ],
+    ];
+    $data['file_usage']['node_to_file'] = [
       'title' => $this->t('File'),
       'help' => $this->t('A file that is associated with this node, usually because it is in a field on the node.'),
       // Only provide this field/relationship/etc.,
       // when the 'node' base table is present.
-      'skip base' => array('file_managed', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'),
+      'skip base' => ['file_managed', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'],
       'real field' => 'fid',
-      'relationship' => array(
+      'relationship' => [
         'title' => $this->t('File'),
         'label' => $this->t('File'),
         'base' => 'file_managed',
         'base field' => 'fid',
         'relationship field' => 'fid',
-      ),
-    );
+      ],
+    ];
 
     // Describes relationships between files and users.
-    $data['file_usage']['file_to_user'] = array(
+    $data['file_usage']['file_to_user'] = [
       'title' => $this->t('User'),
       'help' => $this->t('A user that is associated with this file, usually because this file is in a field on the user.'),
       // Only provide this field/relationship/etc.,
       // when the 'file_managed' base table is present.
-      'skip base' => array('node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'),
+      'skip base' => ['node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'],
       'real field' => 'id',
-      'relationship' => array(
+      'relationship' => [
         'title' => $this->t('User'),
         'label' => $this->t('User'),
         'base' => 'users',
         'base field' => 'uid',
         'relationship field' => 'id',
-        'extra' => array(array('table' => 'file_usage', 'field' => 'type', 'operator' => '=', 'value' => 'user')),
-      ),
-    );
-    $data['file_usage']['user_to_file'] = array(
+        'extra' => [['table' => 'file_usage', 'field' => 'type', 'operator' => '=', 'value' => 'user']],
+      ],
+    ];
+    $data['file_usage']['user_to_file'] = [
       'title' => $this->t('File'),
       'help' => $this->t('A file that is associated with this user, usually because it is in a field on the user.'),
       // Only provide this field/relationship/etc.,
       // when the 'users' base table is present.
-      'skip base' => array('file_managed', 'node_field_data', 'node_field_revision', 'comment_field_data', 'taxonomy_term_field_data'),
+      'skip base' => ['file_managed', 'node_field_data', 'node_field_revision', 'comment_field_data', 'taxonomy_term_field_data'],
       'real field' => 'fid',
-      'relationship' => array(
+      'relationship' => [
         'title' => $this->t('File'),
         'label' => $this->t('File'),
         'base' => 'file_managed',
         'base field' => 'fid',
         'relationship field' => 'fid',
-      ),
-    );
+      ],
+    ];
 
     // Describes relationships between files and comments.
-    $data['file_usage']['file_to_comment'] = array(
+    $data['file_usage']['file_to_comment'] = [
       'title' => $this->t('Comment'),
       'help' => $this->t('A comment that is associated with this file, usually because this file is in a field on the comment.'),
       // Only provide this field/relationship/etc.,
       // when the 'file_managed' base table is present.
-      'skip base' => array('node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'),
+      'skip base' => ['node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'],
       'real field' => 'id',
-      'relationship' => array(
+      'relationship' => [
         'title' => $this->t('Comment'),
         'label' => $this->t('Comment'),
         'base' => 'comment_field_data',
         'base field' => 'cid',
         'relationship field' => 'id',
-        'extra' => array(array('table' => 'file_usage', 'field' => 'type', 'operator' => '=', 'value' => 'comment')),
-      ),
-    );
-    $data['file_usage']['comment_to_file'] = array(
+        'extra' => [['table' => 'file_usage', 'field' => 'type', 'operator' => '=', 'value' => 'comment']],
+      ],
+    ];
+    $data['file_usage']['comment_to_file'] = [
       'title' => $this->t('File'),
       'help' => $this->t('A file that is associated with this comment, usually because it is in a field on the comment.'),
       // Only provide this field/relationship/etc.,
       // when the 'comment' base table is present.
-      'skip base' => array('file_managed', 'node_field_data', 'node_field_revision', 'users_field_data', 'taxonomy_term_field_data'),
+      'skip base' => ['file_managed', 'node_field_data', 'node_field_revision', 'users_field_data', 'taxonomy_term_field_data'],
       'real field' => 'fid',
-      'relationship' => array(
+      'relationship' => [
         'title' => $this->t('File'),
         'label' => $this->t('File'),
         'base' => 'file_managed',
         'base field' => 'fid',
         'relationship field' => 'fid',
-      ),
-    );
+      ],
+    ];
 
     // Describes relationships between files and taxonomy_terms.
-    $data['file_usage']['file_to_taxonomy_term'] = array(
+    $data['file_usage']['file_to_taxonomy_term'] = [
       'title' => $this->t('Taxonomy Term'),
       'help' => $this->t('A taxonomy term that is associated with this file, usually because this file is in a field on the taxonomy term.'),
       // Only provide this field/relationship/etc.,
       // when the 'file_managed' base table is present.
-      'skip base' => array('node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'),
+      'skip base' => ['node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'],
       'real field' => 'id',
-      'relationship' => array(
+      'relationship' => [
         'title' => $this->t('Taxonomy Term'),
         'label' => $this->t('Taxonomy Term'),
         'base' => 'taxonomy_term_data',
         'base field' => 'tid',
         'relationship field' => 'id',
-        'extra' => array(array('table' => 'file_usage', 'field' => 'type', 'operator' => '=', 'value' => 'taxonomy_term')),
-      ),
-    );
-    $data['file_usage']['taxonomy_term_to_file'] = array(
+        'extra' => [['table' => 'file_usage', 'field' => 'type', 'operator' => '=', 'value' => 'taxonomy_term']],
+      ],
+    ];
+    $data['file_usage']['taxonomy_term_to_file'] = [
       'title' => $this->t('File'),
       'help' => $this->t('A file that is associated with this taxonomy term, usually because it is in a field on the taxonomy term.'),
       // Only provide this field/relationship/etc.,
       // when the 'taxonomy_term_data' base table is present.
-      'skip base' => array('file_managed', 'node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data'),
+      'skip base' => ['file_managed', 'node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data'],
       'real field' => 'fid',
-      'relationship' => array(
+      'relationship' => [
         'title' => $this->t('File'),
         'label' => $this->t('File'),
         'base' => 'file_managed',
         'base field' => 'fid',
         'relationship field' => 'fid',
-      ),
-    );
+      ],
+    ];
 
     // Provide basic fields from the {file_usage} table to all of the base tables
     // we've declared joins to, because there is no 'skip base' property on these
     // fields.
-    $data['file_usage']['module'] = array(
+    $data['file_usage']['module'] = [
       'title' => $this->t('Module'),
       'help' => $this->t('The module managing this file relationship.'),
-      'field' => array(
+      'field' => [
         'id' => 'standard',
-       ),
-      'filter' => array(
+       ],
+      'filter' => [
         'id' => 'string',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'string',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
-    $data['file_usage']['type'] = array(
+      ],
+    ];
+    $data['file_usage']['type'] = [
       'title' => $this->t('Entity type'),
       'help' => $this->t('The type of entity that is related to the file.'),
-      'field' => array(
+      'field' => [
         'id' => 'standard',
-       ),
-      'filter' => array(
+       ],
+      'filter' => [
         'id' => 'string',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'string',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
-    $data['file_usage']['id'] = array(
+      ],
+    ];
+    $data['file_usage']['id'] = [
       'title' => $this->t('Entity ID'),
       'help' => $this->t('The ID of the entity that is related to the file.'),
-      'field' => array(
+      'field' => [
         'id' => 'numeric',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'numeric',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'numeric',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
-    $data['file_usage']['count'] = array(
+      ],
+    ];
+    $data['file_usage']['count'] = [
       'title' => $this->t('Use count'),
       'help' => $this->t('The number of times the file is used by this entity.'),
-      'field' => array(
+      'field' => [
         'id' => 'numeric',
-       ),
-      'filter' => array(
+       ],
+      'filter' => [
         'id' => 'numeric',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
-    $data['file_usage']['entity_label'] = array(
+      ],
+    ];
+    $data['file_usage']['entity_label'] = [
       'title' => $this->t('Entity label'),
       'help' => $this->t('The label of the entity that is related to the file.'),
       'real field' => 'id',
-      'field' => array(
+      'field' => [
         'id' => 'entity_label',
         'entity type field' => 'type',
-      ),
-    );
+      ],
+    ];
 
     return $data;
   }
diff --git a/web/core/modules/file/src/Plugin/Field/FieldFormatter/FileExtensionFormatter.php b/web/core/modules/file/src/Plugin/Field/FieldFormatter/FileExtensionFormatter.php
index bb6a770ca..afe1b7efc 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldFormatter/FileExtensionFormatter.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldFormatter/FileExtensionFormatter.php
@@ -34,12 +34,12 @@ class FileExtensionFormatter extends BaseFieldFileFormatterBase {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $form = parent::settingsForm($form, $form_state);
-    $form['extension_detect_tar'] = array(
+    $form['extension_detect_tar'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Include tar in extension'),
       '#description' => $this->t("If the part of the filename just before the extension is '.tar', include this in the extension output."),
       '#default_value' => $this->getSetting('extension_detect_tar'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/file/src/Plugin/Field/FieldFormatter/FilemimeFormatter.php b/web/core/modules/file/src/Plugin/Field/FieldFormatter/FilemimeFormatter.php
index 6103239b6..631d94140 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldFormatter/FilemimeFormatter.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldFormatter/FilemimeFormatter.php
@@ -43,12 +43,12 @@ class FilemimeFormatter extends BaseFieldFileFormatterBase {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $form = parent::settingsForm($form, $form_state);
 
-    $form['filemime_image'] = array(
+    $form['filemime_image'] = [
       '#title' => $this->t('Display an icon'),
       '#description' => $this->t('The icon is representing the file type, instead of the MIME text (such as "image/jpeg")'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('filemime_image'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php b/web/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php
index a76d75a07..daeb9f42c 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldFormatter/GenericFileFormatter.php
@@ -21,21 +21,21 @@ class GenericFileFormatter extends FileFormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) {
       $item = $file->_referringItem;
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#theme' => 'file_link',
         '#file' => $file,
         '#description' => $item->description,
-        '#cache' => array(
+        '#cache' => [
           'tags' => $file->getCacheTags(),
-        ),
-      );
+        ],
+      ];
       // Pass field item attributes to the theme function.
       if (isset($item->_attributes)) {
-        $elements[$delta] += array('#attributes' => array());
+        $elements[$delta] += ['#attributes' => []];
         $elements[$delta]['#attributes'] += $item->_attributes;
         // Unset field item attributes since they have been included in the
         // formatter output and should not be rendered in the field template.
diff --git a/web/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php b/web/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php
index 46bbbde56..a433d99b1 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php
@@ -25,17 +25,17 @@ class RSSEnclosureFormatter extends FileFormatterBase {
     // Add the first file as an enclosure to the RSS item. RSS allows only one
     // enclosure per item. See: http://wikipedia.org/wiki/RSS_enclosure
     foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) {
-      $entity->rss_elements[] = array(
+      $entity->rss_elements[] = [
         'key' => 'enclosure',
-        'attributes' => array(
+        'attributes' => [
           // In RSS feeds, it is necessary to use absolute URLs. The 'url.site'
           // cache context is already associated with RSS feed responses, so it
           // does not need to be specified here.
           'url' => file_create_url($file->getFileUri()),
           'length' => $file->getSize(),
           'type' => $file->getMimeType(),
-        ),
-      );
+        ],
+      ];
     }
     return [];
   }
diff --git a/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php b/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
index 939329a59..4da9e8436 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
@@ -21,33 +21,33 @@ class TableFormatter extends FileFormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     if ($files = $this->getEntitiesToView($items, $langcode)) {
-      $header = array(t('Attachment'), t('Size'));
-      $rows = array();
+      $header = [t('Attachment'), t('Size')];
+      $rows = [];
       foreach ($files as $delta => $file) {
-        $rows[] = array(
-          array(
-            'data' => array(
+        $rows[] = [
+          [
+            'data' => [
               '#theme' => 'file_link',
               '#file' => $file,
-              '#cache' => array(
+              '#cache' => [
                 'tags' => $file->getCacheTags(),
-              ),
-            ),
-          ),
-          array('data' => format_size($file->getSize())),
-        );
+              ],
+            ],
+          ],
+          ['data' => format_size($file->getSize())],
+        ];
       }
 
-      $elements[0] = array();
+      $elements[0] = [];
       if (!empty($rows)) {
-        $elements[0] = array(
+        $elements[0] = [
           '#theme' => 'table__file_formatter_table',
           '#header' => $header,
           '#rows' => $rows,
-        );
+        ];
       }
     }
 
diff --git a/web/core/modules/file/src/Plugin/Field/FieldFormatter/UrlPlainFormatter.php b/web/core/modules/file/src/Plugin/Field/FieldFormatter/UrlPlainFormatter.php
index ccb97d5ef..d5e2a7c70 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldFormatter/UrlPlainFormatter.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldFormatter/UrlPlainFormatter.php
@@ -21,15 +21,15 @@ class UrlPlainFormatter extends FileFormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) {
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#markup' => file_url_transform_relative(file_create_url($file->getFileUri())),
-        '#cache' => array(
+        '#cache' => [
           'tags' => $file->getCacheTags(),
-        ),
-      );
+        ],
+      ];
     }
 
     return $elements;
diff --git a/web/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php b/web/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php
index 20f479750..9a4dc8339 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php
@@ -30,7 +30,7 @@ class FileFieldItemList extends EntityReferenceFieldItemList {
     else {
       // Get current target file entities and file IDs.
       $files = $this->referencedEntities();
-      $ids = array();
+      $ids = [];
 
       /** @var \Drupal\file\FileInterface $file */
       foreach ($files as $file) {
@@ -48,7 +48,7 @@ class FileFieldItemList extends EntityReferenceFieldItemList {
 
       // Get the file IDs attached to the field before this update.
       $field_name = $this->getFieldDefinition()->getName();
-      $original_ids = array();
+      $original_ids = [];
       $langcode = $this->getLangcode();
       $original = $entity->original;
       if ($original->hasTranslation($langcode)) {
diff --git a/web/core/modules/file/src/Plugin/Field/FieldType/FileItem.php b/web/core/modules/file/src/Plugin/Field/FieldType/FileItem.php
index 0a9a3b36f..7373c4397 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldType/FileItem.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldType/FileItem.php
@@ -32,59 +32,59 @@ class FileItem extends EntityReferenceItem {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'target_type' => 'file',
       'display_field' => FALSE,
       'display_default' => FALSE,
       'uri_scheme' => file_default_scheme(),
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    return array(
+    return [
       'file_extensions' => 'txt',
       'file_directory' => '[date:custom:Y]-[date:custom:m]',
       'max_filesize' => '',
       'description_field' => 0,
-    ) + parent::defaultFieldSettings();
+    ] + parent::defaultFieldSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'target_id' => array(
+    return [
+      'columns' => [
+        'target_id' => [
           'description' => 'The ID of the file entity.',
           'type' => 'int',
           'unsigned' => TRUE,
-        ),
-        'display' => array(
+        ],
+        'display' => [
           'description' => 'Flag to control whether this file should be displayed when viewing content.',
           'type' => 'int',
           'size' => 'tiny',
           'unsigned' => TRUE,
           'default' => 1,
-        ),
-        'description' => array(
+        ],
+        'description' => [
           'description' => 'A description of the file.',
           'type' => 'text',
-        ),
-      ),
-      'indexes' => array(
-        'target_id' => array('target_id'),
-      ),
-      'foreign keys' => array(
-        'target_id' => array(
+        ],
+      ],
+      'indexes' => [
+        'target_id' => ['target_id'],
+      ],
+      'foreign keys' => [
+        'target_id' => [
           'table' => 'file_managed',
-          'columns' => array('target_id' => 'fid'),
-        ),
-      ),
-    );
+          'columns' => ['target_id' => 'fid'],
+        ],
+      ],
+    ];
   }
 
   /**
@@ -107,37 +107,37 @@ class FileItem extends EntityReferenceItem {
    * {@inheritdoc}
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $element = array();
+    $element = [];
 
     $element['#attached']['library'][] = 'file/drupal.file';
 
-    $element['display_field'] = array(
+    $element['display_field'] = [
       '#type' => 'checkbox',
       '#title' => t('Enable <em>Display</em> field'),
       '#default_value' => $this->getSetting('display_field'),
       '#description' => t('The display option allows users to choose if a file should be shown when viewing the content.'),
-    );
-    $element['display_default'] = array(
+    ];
+    $element['display_default'] = [
       '#type' => 'checkbox',
       '#title' => t('Files displayed by default'),
       '#default_value' => $this->getSetting('display_default'),
       '#description' => t('This setting only has an effect if the display option is enabled.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="settings[display_field]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="settings[display_field]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
     $scheme_options = \Drupal::service('stream_wrapper_manager')->getNames(StreamWrapperInterface::WRITE_VISIBLE);
-    $element['uri_scheme'] = array(
+    $element['uri_scheme'] = [
       '#type' => 'radios',
       '#title' => t('Upload destination'),
       '#options' => $scheme_options,
       '#default_value' => $this->getSetting('uri_scheme'),
       '#description' => t('Select where the final files should be stored. Private file storage has significantly more overhead than public files, but allows restricted access to files within this field.'),
       '#disabled' => $has_data,
-    );
+    ];
 
     return $element;
   }
@@ -146,50 +146,50 @@ class FileItem extends EntityReferenceItem {
    * {@inheritdoc}
    */
   public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
-    $element = array();
+    $element = [];
     $settings = $this->getSettings();
 
-    $element['file_directory'] = array(
+    $element['file_directory'] = [
       '#type' => 'textfield',
       '#title' => t('File directory'),
       '#default_value' => $settings['file_directory'],
       '#description' => t('Optional subdirectory within the upload destination where files will be stored. Do not include preceding or trailing slashes.'),
-      '#element_validate' => array(array(get_class($this), 'validateDirectory')),
+      '#element_validate' => [[get_class($this), 'validateDirectory']],
       '#weight' => 3,
-    );
+    ];
 
     // Make the extension list a little more human-friendly by comma-separation.
     $extensions = str_replace(' ', ', ', $settings['file_extensions']);
-    $element['file_extensions'] = array(
+    $element['file_extensions'] = [
       '#type' => 'textfield',
       '#title' => t('Allowed file extensions'),
       '#default_value' => $extensions,
       '#description' => t('Separate extensions with a space or comma and do not include the leading dot.'),
-      '#element_validate' => array(array(get_class($this), 'validateExtensions')),
+      '#element_validate' => [[get_class($this), 'validateExtensions']],
       '#weight' => 1,
       '#maxlength' => 256,
       // By making this field required, we prevent a potential security issue
       // that would allow files of any type to be uploaded.
       '#required' => TRUE,
-    );
+    ];
 
-    $element['max_filesize'] = array(
+    $element['max_filesize'] = [
       '#type' => 'textfield',
       '#title' => t('Maximum upload size'),
       '#default_value' => $settings['max_filesize'],
-      '#description' => t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be limited only by PHP\'s maximum post and file upload sizes (current limit <strong>%limit</strong>).', array('%limit' => format_size(file_upload_max_size()))),
+      '#description' => t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be limited only by PHP\'s maximum post and file upload sizes (current limit <strong>%limit</strong>).', ['%limit' => format_size(file_upload_max_size())]),
       '#size' => 10,
-      '#element_validate' => array(array(get_class($this), 'validateMaxFilesize')),
+      '#element_validate' => [[get_class($this), 'validateMaxFilesize']],
       '#weight' => 5,
-    );
+    ];
 
-    $element['description_field'] = array(
+    $element['description_field'] = [
       '#type' => 'checkbox',
       '#title' => t('Enable <em>Description</em> field'),
       '#default_value' => isset($settings['description_field']) ? $settings['description_field'] : '',
       '#description' => t('The description field allows users to enter a description about the uploaded file.'),
       '#weight' => 11,
-    );
+    ];
 
     return $element;
   }
@@ -245,7 +245,7 @@ class FileItem extends EntityReferenceItem {
    */
   public static function validateMaxFilesize($element, FormStateInterface $form_state) {
     if (!empty($element['#value']) && !is_numeric(Bytes::toInt($element['#value']))) {
-      $form_state->setError($element, t('The "@name" option must contain a valid value. You may either leave the text field empty or enter a string like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes).', array('@name' => $element['title'])));
+      $form_state->setError($element, t('The "@name" option must contain a valid value. You may either leave the text field empty or enter a string like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes).', ['@name' => $element['title']]));
     }
   }
 
@@ -253,15 +253,15 @@ class FileItem extends EntityReferenceItem {
    * Determines the URI for a file field.
    *
    * @param array $data
-   *   An array of token objects to pass to token_replace().
+   *   An array of token objects to pass to Token::replace().
    *
    * @return string
    *   An unsanitized file directory URI with tokens replaced. The result of
    *   the token replacement is then converted to plain text and returned.
    *
-   * @see token_replace()
+   * @see \Drupal\Core\Utility\Token::replace()
    */
-  public function getUploadLocation($data = array()) {
+  public function getUploadLocation($data = []) {
     return static::doGetUploadLocation($this->getSettings(), $data);
   }
 
@@ -271,11 +271,13 @@ class FileItem extends EntityReferenceItem {
    * @param array $settings
    *   The array of field settings.
    * @param array $data
-   *   An array of token objects to pass to token_replace().
+   *   An array of token objects to pass to Token::replace().
    *
    * @return string
    *   An unsanitized file directory URI with tokens replaced. The result of
    *   the token replacement is then converted to plain text and returned.
+   *
+   * @see \Drupal\Core\Utility\Token::replace()
    */
   protected static function doGetUploadLocation(array $settings, $data = []) {
     $destination = trim($settings['file_directory'], '/');
@@ -294,7 +296,7 @@ class FileItem extends EntityReferenceItem {
    *   element's '#upload_validators' property.
    */
   public function getUploadValidators() {
-    $validators = array();
+    $validators = [];
     $settings = $this->getSettings();
 
     // Cap the upload size according to the PHP limit.
@@ -304,11 +306,11 @@ class FileItem extends EntityReferenceItem {
     }
 
     // There is always a file size limit due to the PHP server limit.
-    $validators['file_validate_size'] = array($max_filesize);
+    $validators['file_validate_size'] = [$max_filesize];
 
     // Add the extension check if necessary.
     if (!empty($settings['file_extensions'])) {
-      $validators['file_validate_extensions'] = array($settings['file_extensions']);
+      $validators['file_validate_extensions'] = [$settings['file_extensions']];
     }
 
     return $validators;
@@ -329,11 +331,11 @@ class FileItem extends EntityReferenceItem {
     $destination = $dirname . '/' . $random->name(10, TRUE) . '.txt';
     $data = $random->paragraphs(3);
     $file = file_save_data($data, $destination, FILE_EXISTS_ERROR);
-    $values = array(
+    $values = [
       'target_id' => $file->id(),
       'display' => (int)$settings['display_default'],
       'description' => $random->sentences(10),
-    );
+    ];
     return $values;
   }
 
diff --git a/web/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php b/web/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
index 8ada1075b..587a396fc 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
@@ -48,27 +48,27 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'progress_indicator' => 'throbber',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['progress_indicator'] = array(
+    $element['progress_indicator'] = [
       '#type' => 'radios',
       '#title' => t('Progress indicator'),
-      '#options' => array(
+      '#options' => [
         'throbber' => t('Throbber'),
         'bar' => t('Bar with progress meter'),
-      ),
+      ],
       '#default_value' => $this->getSetting('progress_indicator'),
       '#description' => t('The throbber display does not show the status of uploads but takes up less space. The progress bar is helpful for monitoring progress on large uploads.'),
       '#weight' => 16,
       '#access' => file_progress_implementation(),
-    );
+    ];
     return $element;
   }
 
@@ -76,8 +76,8 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
-    $summary[] = t('Progress indicator: @progress_indicator', array('@progress_indicator' => $this->getSetting('progress_indicator')));
+    $summary = [];
+    $summary[] = t('Progress indicator: @progress_indicator', ['@progress_indicator' => $this->getSetting('progress_indicator')]);
     return $summary;
   }
 
@@ -115,15 +115,15 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
     $title = $this->fieldDefinition->getLabel();
     $description = $this->getFilteredDescription();
 
-    $elements = array();
+    $elements = [];
 
     $delta = 0;
     // Add an element for every existing item.
     foreach ($items as $item) {
-      $element = array(
+      $element = [
         '#title' => $title,
         '#description' => $description,
-      );
+      ];
       $element = $this->formSingleElement($items, $delta, $element, $form, $form_state);
 
       if ($element) {
@@ -131,15 +131,15 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
         if ($is_multiple) {
           // We name the element '_weight' to avoid clashing with elements
           // defined by widget.
-          $element['_weight'] = array(
+          $element['_weight'] = [
             '#type' => 'weight',
-            '#title' => t('Weight for row @number', array('@number' => $delta + 1)),
+            '#title' => t('Weight for row @number', ['@number' => $delta + 1]),
             '#title_display' => 'invisible',
             // Note: this 'delta' is the FAPI #type 'weight' element's property.
             '#delta' => $max,
             '#default_value' => $item->_weight ?: $delta,
             '#weight' => 100,
-          );
+          ];
         }
 
         $elements[$delta] = $element;
@@ -155,10 +155,10 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
     if ($empty_single_allowed || $empty_multiple_allowed) {
       // Create a new empty item.
       $items->appendItem();
-      $element = array(
+      $element = [
         '#title' => $title,
         '#description' => $description,
-      );
+      ];
       $element = $this->formSingleElement($items, $delta, $element, $form, $form_state);
       if ($element) {
         $element['#required'] = ($element['#required'] && $delta == 0);
@@ -173,8 +173,8 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
       $elements['#type'] = 'details';
       $elements['#open'] = TRUE;
       $elements['#theme'] = 'file_widget_multiple';
-      $elements['#theme_wrappers'] = array('details');
-      $elements['#process'] = array(array(get_class($this), 'processMultiple'));
+      $elements['#theme_wrappers'] = ['details'];
+      $elements['#process'] = [[get_class($this), 'processMultiple']];
       $elements['#title'] = $title;
 
       $elements['#description'] = $description;
@@ -183,19 +183,19 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
       // The field settings include defaults for the field type. However, this
       // widget is a base class for other widgets (e.g., ImageWidget) that may
       // act on field types without these expected settings.
-      $field_settings = $this->getFieldSettings() + array('display_field' => NULL);
+      $field_settings = $this->getFieldSettings() + ['display_field' => NULL];
       $elements['#display_field'] = (bool) $field_settings['display_field'];
 
       // Add some properties that will eventually be added to the file upload
       // field. These are added here so that they may be referenced easily
       // through a hook_form_alter().
       $elements['#file_upload_title'] = t('Add a new file');
-      $elements['#file_upload_description'] = array(
+      $elements['#file_upload_description'] = [
         '#theme' => 'file_upload_help',
         '#description' => '',
         '#upload_validators' => $elements[0]['#upload_validators'],
         '#cardinality' => $cardinality,
-      );
+      ];
     }
 
     return $elements;
@@ -210,28 +210,28 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
     // The field settings include defaults for the field type. However, this
     // widget is a base class for other widgets (e.g., ImageWidget) that may act
     // on field types without these expected settings.
-    $field_settings += array(
+    $field_settings += [
       'display_default' => NULL,
       'display_field' => NULL,
       'description_field' => NULL,
-    );
+    ];
 
     $cardinality = $this->fieldDefinition->getFieldStorageDefinition()->getCardinality();
-    $defaults = array(
-      'fids' => array(),
+    $defaults = [
+      'fids' => [],
       'display' => (bool) $field_settings['display_default'],
       'description' => '',
-    );
+    ];
 
     // Essentially we use the managed_file type, extended with some
     // enhancements.
     $element_info = $this->elementInfo->getInfo('managed_file');
-    $element += array(
+    $element += [
       '#type' => 'managed_file',
       '#upload_location' => $items[$delta]->getUploadLocation(),
       '#upload_validators' => $items[$delta]->getUploadValidators(),
-      '#value_callback' => array(get_class($this), 'value'),
-      '#process' => array_merge($element_info['#process'], array(array(get_class($this), 'process'))),
+      '#value_callback' => [get_class($this), 'value'],
+      '#process' => array_merge($element_info['#process'], [[get_class($this), 'process']]),
       '#progress_indicator' => $this->getSetting('progress_indicator'),
       // Allows this field to return an array instead of a single value.
       '#extended' => TRUE,
@@ -242,29 +242,29 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
       '#display_default' => $field_settings['display_default'],
       '#description_field' => $field_settings['description_field'],
       '#cardinality' => $cardinality,
-    );
+    ];
 
     $element['#weight'] = $delta;
 
     // Field stores FID value in a single mode, so we need to transform it for
     // form element to recognize it correctly.
     if (!isset($items[$delta]->fids) && isset($items[$delta]->target_id)) {
-      $items[$delta]->fids = array($items[$delta]->target_id);
+      $items[$delta]->fids = [$items[$delta]->target_id];
     }
     $element['#default_value'] = $items[$delta]->getValue() + $defaults;
 
     $default_fids = $element['#extended'] ? $element['#default_value']['fids'] : $element['#default_value'];
     if (empty($default_fids)) {
-      $file_upload_help = array(
+      $file_upload_help = [
         '#theme' => 'file_upload_help',
         '#description' => $element['#description'],
         '#upload_validators' => $element['#upload_validators'],
         '#cardinality' => $cardinality,
-      );
+      ];
       $element['#description'] = \Drupal::service('renderer')->renderPlain($file_upload_help);
       $element['#multiple'] = $cardinality != 1 ? TRUE : FALSE;
       if ($cardinality != 1 && $cardinality != -1) {
-        $element['#element_validate'] = array(array(get_class($this), 'validateMultipleCount'));
+        $element['#element_validate'] = [[get_class($this), 'validateMultipleCount']];
       }
     }
 
@@ -278,7 +278,7 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
     // Since file upload widget now supports uploads of more than one file at a
     // time it always returns an array of fids. We have to translate this to a
     // single fid, as field expects single value.
-    $new_values = array();
+    $new_values = [];
     foreach ($values as &$value) {
       foreach ($value['fids'] as $fid) {
         $new_value = $value;
@@ -311,7 +311,7 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
    *
    * This method is assigned as a #value_callback in formElement() method.
    */
-  public static function value($element, $input = FALSE, FormStateInterface $form_state) {
+  public static function value($element, $input, FormStateInterface $form_state) {
     if ($input) {
       // Checkboxes lose their value when empty.
       // If the display field is present make sure its unchecked value is saved.
@@ -324,11 +324,11 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
     $return = ManagedFile::valueCallback($element, $input, $form_state);
 
     // Ensure that all the required properties are returned even if empty.
-    $return += array(
-      'fids' => array(),
+    $return += [
+      'fids' => [],
       'display' => 1,
       'description' => '',
-    );
+    ];
 
     return $return;
   }
@@ -353,7 +353,7 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
     if ($total_uploaded_count > $field_storage->getCardinality()) {
       $keep = $newly_uploaded_count - $total_uploaded_count + $field_storage->getCardinality();
       $removed_files = array_slice($values['fids'], $keep);
-      $removed_names = array();
+      $removed_names = [];
       foreach ($removed_files as $fid) {
         $file = File::load($fid);
         $removed_names[] = $file->getFilename();
@@ -385,11 +385,11 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
 
     // Add the display field if enabled.
     if ($element['#display_field']) {
-      $element['display'] = array(
+      $element['display'] = [
         '#type' => empty($item['fids']) ? 'hidden' : 'checkbox',
         '#title' => t('Include file in display'),
-        '#attributes' => array('class' => array('file-display')),
-      );
+        '#attributes' => ['class' => ['file-display']],
+      ];
       if (isset($item['display'])) {
         $element['display']['#value'] = $item['display'] ? '1' : '';
       }
@@ -398,33 +398,33 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
       }
     }
     else {
-      $element['display'] = array(
+      $element['display'] = [
         '#type' => 'hidden',
         '#value' => '1',
-      );
+      ];
     }
 
     // Add the description field if enabled.
     if ($element['#description_field'] && $item['fids']) {
       $config = \Drupal::config('file.settings');
-      $element['description'] = array(
+      $element['description'] = [
         '#type' => $config->get('description.type'),
         '#title' => t('Description'),
         '#value' => isset($item['description']) ? $item['description'] : '',
         '#maxlength' => $config->get('description.length'),
         '#description' => t('The description may be used as the label of the link to the file.'),
-      );
+      ];
     }
 
     // Adjust the Ajax settings so that on upload and remove of any individual
     // file, the entire group of file fields is updated together.
     if ($element['#cardinality'] != 1) {
       $parents = array_slice($element['#array_parents'], 0, -1);
-      $new_options = array(
-        'query' => array(
+      $new_options = [
+        'query' => [
           'element_parents' => implode('/', $parents),
-        ),
-      );
+        ],
+      ];
       $field_element = NestedArray::getValue($form, $parents);
       $new_wrapper = $field_element['#id'] . '-ajax-wrapper';
       foreach (Element::children($element) as $key) {
@@ -440,9 +440,9 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
     // functionality needed by the field widget. This submit handler, along with
     // the rebuild logic in file_field_widget_form() requires the entire field,
     // not just the individual item, to be valid.
-    foreach (array('upload_button', 'remove_button') as $key) {
-      $element[$key]['#submit'][] = array(get_called_class(), 'submit');
-      $element[$key]['#limit_validation_errors'] = array(array_slice($element['#parents'], 0, -1));
+    foreach (['upload_button', 'remove_button'] as $key) {
+      $element[$key]['#submit'][] = [get_called_class(), 'submit'];
+      $element[$key]['#limit_validation_errors'] = [array_slice($element['#parents'], 0, -1)];
     }
 
     return $element;
@@ -477,22 +477,22 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
     foreach ($element_children as $delta => $key) {
       if ($key != $element['#file_upload_delta']) {
         $description = static::getDescriptionFromElement($element[$key]);
-        $element[$key]['_weight'] = array(
+        $element[$key]['_weight'] = [
           '#type' => 'weight',
-          '#title' => $description ? t('Weight for @title', array('@title' => $description)) : t('Weight for new file'),
+          '#title' => $description ? t('Weight for @title', ['@title' => $description]) : t('Weight for new file'),
           '#title_display' => 'invisible',
           '#delta' => $count,
           '#default_value' => $delta,
-        );
+        ];
       }
       else {
         // The title needs to be assigned to the upload field so that validation
         // errors include the correct widget label.
         $element[$key]['#title'] = $element['#title'];
-        $element[$key]['_weight'] = array(
+        $element[$key]['_weight'] = [
           '#type' => 'hidden',
           '#default_value' => $delta,
-        );
+        ];
       }
     }
 
@@ -559,12 +559,12 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
 
     // If there are more files uploaded via the same widget, we have to separate
     // them, as we display each file in its own widget.
-    $new_values = array();
+    $new_values = [];
     foreach ($submitted_values as $delta => $submitted_value) {
       if (is_array($submitted_value['fids'])) {
         foreach ($submitted_value['fids'] as $fid) {
           $new_value = $submitted_value;
-          $new_value['fids'] = array($fid);
+          $new_value['fids'] = [$fid];
           $new_values[] = $new_value;
         }
       }
diff --git a/web/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php b/web/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
index 7f47caa96..ad24ae24f 100644
--- a/web/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
+++ b/web/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
@@ -17,7 +17,7 @@ class ImageField extends CckFieldPluginBase {
    * {@inheritdoc}
    */
   public function getFieldFormatterMap() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/file/src/Plugin/migrate/source/d6/File.php b/web/core/modules/file/src/Plugin/migrate/source/d6/File.php
index 13aee57bf..0564b6b78 100644
--- a/web/core/modules/file/src/Plugin/migrate/source/d6/File.php
+++ b/web/core/modules/file/src/Plugin/migrate/source/d6/File.php
@@ -75,7 +75,7 @@ class File extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'fid' => $this->t('File ID'),
       'uid' => $this->t('The {users}.uid who added the file. If set to 0, this file was added by an anonymous user.'),
       'filename' => $this->t('File name'),
@@ -85,7 +85,7 @@ class File extends DrupalSqlBase {
       'timestamp' => $this->t('The time that the file was added.'),
       'file_directory_path' => $this->t('The Drupal files path.'),
       'is_public' => $this->t('TRUE if the files directory is public otherwise FALSE.'),
-    );
+    ];
   }
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/file/src/Plugin/migrate/source/d6/Upload.php b/web/core/modules/file/src/Plugin/migrate/source/d6/Upload.php
index 5b7c3ae74..4e07a236b 100644
--- a/web/core/modules/file/src/Plugin/migrate/source/d6/Upload.php
+++ b/web/core/modules/file/src/Plugin/migrate/source/d6/Upload.php
@@ -26,7 +26,7 @@ class Upload extends DrupalSqlBase {
   public function query() {
     $query = $this->select('upload', 'u')
       ->distinct()
-      ->fields('u', array('nid', 'vid'));
+      ->fields('u', ['nid', 'vid']);
     $query->innerJoin('node', 'n', static::JOIN);
     $query->addField('n', 'type');
     return $query;
@@ -37,7 +37,7 @@ class Upload extends DrupalSqlBase {
    */
   public function prepareRow(Row $row) {
     $query = $this->select('upload', 'u')
-      ->fields('u', array('fid', 'description', 'list'))
+      ->fields('u', ['fid', 'description', 'list'])
       ->condition('u.nid', $row->getSourceProperty('nid'))
       ->orderBy('u.weight');
     $query->innerJoin('node', 'n', static::JOIN);
@@ -49,7 +49,7 @@ class Upload extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'fid' => $this->t('The file Id.'),
       'nid' => $this->t('The node Id.'),
       'vid' => $this->t('The version Id.'),
@@ -57,7 +57,7 @@ class Upload extends DrupalSqlBase {
       'description' => $this->t('The file description.'),
       'list' => $this->t('Whether the list should be visible on the node page.'),
       'weight' => $this->t('The file weight.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php b/web/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php
index ec178392e..c1b3345d7 100644
--- a/web/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php
+++ b/web/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php
@@ -30,7 +30,7 @@ class UploadInstance extends DrupalSqlBase {
     $max_filesize = $this->variableGet('upload_uploadsize_default', 1);
     $max_filesize = $max_filesize ? $max_filesize . 'MB' : '';
     $file_extensions = $this->variableGet('upload_extensions_default', 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp');
-    $return = array();
+    $return = [];
     $values = $this->select('variable', 'v')
       ->fields('v', ['name', 'value'])
       ->condition('v.name', $variables, 'IN')
@@ -38,13 +38,13 @@ class UploadInstance extends DrupalSqlBase {
       ->fetchAllKeyed();
     foreach ($node_types as $node_type) {
       $name = 'upload_' . $node_type;
-      if (isset($values[$name])) {
-        $enabled = unserialize($values[$name]);
-        if ($enabled) {
-          $return[$node_type]['node_type'] = $node_type;
-          $return[$node_type]['max_filesize'] = $max_filesize;
-          $return[$node_type]['file_extensions'] = $file_extensions;
-        }
+      // By default, file attachments in D6 are enabled unless upload_<type> is
+      // false, so include types where the upload-variable is not set.
+      $enabled = !isset($values[$name]) || unserialize($values[$name]);
+      if ($enabled) {
+        $return[$node_type]['node_type'] = $node_type;
+        $return[$node_type]['max_filesize'] = $max_filesize;
+        $return[$node_type]['file_extensions'] = $file_extensions;
       }
     }
 
@@ -55,22 +55,22 @@ class UploadInstance extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'node_type' => array(
+    return [
+      'node_type' => [
         'type' => 'string',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'node_type' => $this->t('Node type'),
       'max_filesize' => $this->t('Max filesize'),
       'file_extensions' => $this->t('File extensions'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/file/src/Plugin/migrate/source/d7/File.php b/web/core/modules/file/src/Plugin/migrate/source/d7/File.php
index 247a6cf04..e418f825b 100644
--- a/web/core/modules/file/src/Plugin/migrate/source/d7/File.php
+++ b/web/core/modules/file/src/Plugin/migrate/source/d7/File.php
@@ -46,7 +46,7 @@ class File extends DrupalSqlBase {
 
     // Filter by scheme(s), if configured.
     if (isset($this->configuration['scheme'])) {
-      $schemes = array();
+      $schemes = [];
       // Accept either a single scheme, or a list.
       foreach ((array) $this->configuration['scheme'] as $scheme) {
         $schemes[] = rtrim($scheme) . '://';
@@ -93,7 +93,7 @@ class File extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'fid' => $this->t('File ID'),
       'uid' => $this->t('The {users}.uid who added the file. If set to 0, this file was added by an anonymous user.'),
       'filename' => $this->t('File name'),
@@ -101,7 +101,7 @@ class File extends DrupalSqlBase {
       'filemime' => $this->t('File MIME Type'),
       'status' => $this->t('The published status of a file.'),
       'timestamp' => $this->t('The time that the file was added.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/file/src/Plugin/views/argument/Fid.php b/web/core/modules/file/src/Plugin/views/argument/Fid.php
index a7104fa7d..1654fcc2e 100644
--- a/web/core/modules/file/src/Plugin/views/argument/Fid.php
+++ b/web/core/modules/file/src/Plugin/views/argument/Fid.php
@@ -3,7 +3,6 @@
 namespace Drupal\file\Plugin\views\argument;
 
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\views\Plugin\views\argument\NumericArgument;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -24,13 +23,6 @@ class Fid extends NumericArgument implements ContainerFactoryPluginInterface {
    */
   protected $entityManager;
 
-  /**
-   * The entity query factory service.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $entityQuery;
-
   /**
    * Constructs a Drupal\file\Plugin\views\argument\Fid object.
    *
@@ -42,13 +34,10 @@ class Fid extends NumericArgument implements ContainerFactoryPluginInterface {
    *   The plugin implementation definition.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query
-   *   The entity query factory.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, QueryFactory $entity_query) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->entityManager = $entity_manager;
-    $this->entityQuery = $entity_query;
   }
 
   /**
@@ -59,8 +48,7 @@ class Fid extends NumericArgument implements ContainerFactoryPluginInterface {
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('entity.manager'),
-      $container->get('entity.query')
+      $container->get('entity.manager')
     );
   }
 
@@ -68,12 +56,12 @@ class Fid extends NumericArgument implements ContainerFactoryPluginInterface {
    * Override the behavior of titleQuery(). Get the filenames.
    */
   public function titleQuery() {
-    $fids = $this->entityQuery->get('file')
+    $storage = $this->entityManager->getStorage('file');
+    $fids = $storage->getQuery()
       ->condition('fid', $this->value, 'IN')
       ->execute();
-    $controller = $this->entityManager->getStorage('file');
-    $files = $controller->loadMultiple($fids);
-    $titles = array();
+    $files = $storage->loadMultiple($fids);
+    $titles = [];
     foreach ($files as $file) {
       $titles[] = $file->getFilename();
     }
diff --git a/web/core/modules/file/src/Plugin/views/field/File.php b/web/core/modules/file/src/Plugin/views/field/File.php
index 18bc1fc31..57d8c60ac 100644
--- a/web/core/modules/file/src/Plugin/views/field/File.php
+++ b/web/core/modules/file/src/Plugin/views/field/File.php
@@ -33,7 +33,7 @@ class File extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['link_to_file'] = array('default' => FALSE);
+    $options['link_to_file'] = ['default' => FALSE];
     return $options;
   }
 
@@ -41,12 +41,12 @@ class File extends FieldPluginBase {
    * Provide link to file option
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['link_to_file'] = array(
+    $form['link_to_file'] = [
       '#title' => $this->t('Link this field to download the file'),
       '#description' => $this->t("Enable to override this field's links."),
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['link_to_file']),
-    );
+    ];
     parent::buildOptionsForm($form, $form_state);
   }
 
diff --git a/web/core/modules/file/src/Tests/DownloadTest.php b/web/core/modules/file/src/Tests/DownloadTest.php
index e92cef3f2..c5189fac2 100644
--- a/web/core/modules/file/src/Tests/DownloadTest.php
+++ b/web/core/modules/file/src/Tests/DownloadTest.php
@@ -17,7 +17,7 @@ class DownloadTest extends FileManagedTestBase {
   /**
    * Test the public file transfer system.
    */
-  function testPublicFileTransfer() {
+  public function testPublicFileTransfer() {
     // Test generating a URL to a created file.
     $file = $this->createFile();
     $url = file_create_url($file->getFileUri());
@@ -63,7 +63,7 @@ class DownloadTest extends FileManagedTestBase {
     $url  = file_create_url($file->getFileUri());
 
     // Set file_test access header to allow the download.
-    file_test_set_return('download', array('x-foo' => 'Bar'));
+    file_test_set_return('download', ['x-foo' => 'Bar']);
     $this->drupalGet($url);
     $this->assertEqual($this->drupalGetHeader('x-foo'), 'Bar', 'Found header set by file_test module on private download.');
     $this->assertFalse($this->drupalGetHeader('x-drupal-cache'), 'Page cache is disabled on private file download.');
@@ -86,7 +86,7 @@ class DownloadTest extends FileManagedTestBase {
   /**
    * Test file_create_url().
    */
-  function testFileCreateUrl() {
+  public function testFileCreateUrl() {
 
     // Tilde (~) is excluded from this test because it is encoded by
     // rawurlencode() in PHP 5.2 but not in PHP 5.3, as per RFC 3986.
@@ -102,10 +102,10 @@ class DownloadTest extends FileManagedTestBase {
     // routed through Drupal, whereas private files should be served by Drupal,
     // so they need to be. The difference is most apparent when $script_path
     // is not empty (i.e., when not using clean URLs).
-    $clean_url_settings = array(
+    $clean_url_settings = [
       'clean' => '',
       'unclean' => 'index.php/',
-    );
+    ];
     $public_directory_path = \Drupal::service('stream_wrapper_manager')->getViaScheme('public')->getDirectoryPath();
     foreach ($clean_url_settings as $clean_url_setting => $script_path) {
       $clean_urls = $clean_url_setting == 'clean';
@@ -158,7 +158,7 @@ class DownloadTest extends FileManagedTestBase {
     if ($scheme == 'private') {
       // Tell the implementation of hook_file_download() in file_test.module
       // that this file may be downloaded.
-      file_test_set_return('download', array('x-foo' => 'Bar'));
+      file_test_set_return('download', ['x-foo' => 'Bar']);
     }
 
     $this->drupalGet($url);
diff --git a/web/core/modules/file/src/Tests/FileFieldAnonymousSubmissionTest.php b/web/core/modules/file/src/Tests/FileFieldAnonymousSubmissionTest.php
index 2286473c0..b59b1bafd 100644
--- a/web/core/modules/file/src/Tests/FileFieldAnonymousSubmissionTest.php
+++ b/web/core/modules/file/src/Tests/FileFieldAnonymousSubmissionTest.php
@@ -19,10 +19,10 @@ class FileFieldAnonymousSubmissionTest extends FileFieldTestBase {
   protected function setUp() {
     parent::setUp();
     // Set up permissions for anonymous attacker user.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'create article content' => TRUE,
       'access content' => TRUE,
-    ));
+    ]);
   }
 
   /**
@@ -36,17 +36,17 @@ class FileFieldAnonymousSubmissionTest extends FileFieldTestBase {
     $this->drupalLogout();
     $this->drupalGet('node/add/article');
     $this->assertResponse(200, 'Loaded the article node form.');
-    $this->assertText(strip_tags(t('Create @name', array('@name' => $bundle_label))));
+    $this->assertText(strip_tags(t('Create @name', ['@name' => $bundle_label])));
 
-    $edit = array(
+    $edit = [
       'title[0][value]' => $node_title,
       'body[0][value]' => 'Test article',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Save');
     $this->assertResponse(200);
-    $t_args = array('@type' => $bundle_label, '%title' => $node_title);
+    $t_args = ['@type' => $bundle_label, '%title' => $node_title];
     $this->assertText(strip_tags(t('@type %title has been created.', $t_args)), 'The node was created.');
-    $matches = array();
+    $matches = [];
     if (preg_match('@node/(\d+)$@', $this->getUrl(), $matches)) {
       $nid = end($matches);
       $this->assertNotEqual($nid, 0, 'The node ID was extracted from the URL.');
@@ -61,28 +61,28 @@ class FileFieldAnonymousSubmissionTest extends FileFieldTestBase {
   public function testAnonymousNodeWithFile() {
     $bundle_label = 'Article';
     $node_title = 'Test page';
-    $this->createFileField('field_image', 'node', 'article', array(), array('file_extensions' => 'txt png'));
+    $this->createFileField('field_image', 'node', 'article', [], ['file_extensions' => 'txt png']);
 
     // Load the node form.
     $this->drupalLogout();
     $this->drupalGet('node/add/article');
     $this->assertResponse(200, 'Loaded the article node form.');
-    $this->assertText(strip_tags(t('Create @name', array('@name' => $bundle_label))));
+    $this->assertText(strip_tags(t('Create @name', ['@name' => $bundle_label])));
 
     // Generate an image file.
     $image = $this->getTestFile('image');
 
     // Submit the form.
-    $edit = array(
+    $edit = [
       'title[0][value]' => $node_title,
       'body[0][value]' => 'Test article',
       'files[field_image_0]' => $this->container->get('file_system')->realpath($image->getFileUri()),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Save');
     $this->assertResponse(200);
-    $t_args = array('@type' => $bundle_label, '%title' => $node_title);
+    $t_args = ['@type' => $bundle_label, '%title' => $node_title];
     $this->assertText(strip_tags(t('@type %title has been created.', $t_args)), 'The node was created.');
-    $matches = array();
+    $matches = [];
     if (preg_match('@node/(\d+)$@', $this->getUrl(), $matches)) {
       $nid = end($matches);
       $this->assertNotEqual($nid, 0, 'The node ID was extracted from the URL.');
@@ -104,11 +104,11 @@ class FileFieldAnonymousSubmissionTest extends FileFieldTestBase {
    * Tests file submission for an authenticated user with a missing node title.
    */
   public function testAuthenticatedNodeWithFileWithoutTitle() {
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'bypass node access',
       'access content overview',
       'administer nodes',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
     $this->doTestNodeWithFileWithoutTitle();
   }
@@ -119,21 +119,21 @@ class FileFieldAnonymousSubmissionTest extends FileFieldTestBase {
   protected function doTestNodeWithFileWithoutTitle() {
     $bundle_label = 'Article';
     $node_title = 'Test page';
-    $this->createFileField('field_image', 'node', 'article', array(), array('file_extensions' => 'txt png'));
+    $this->createFileField('field_image', 'node', 'article', [], ['file_extensions' => 'txt png']);
 
     // Load the node form.
     $this->drupalGet('node/add/article');
     $this->assertResponse(200, 'Loaded the article node form.');
-    $this->assertText(strip_tags(t('Create @name', array('@name' => $bundle_label))));
+    $this->assertText(strip_tags(t('Create @name', ['@name' => $bundle_label])));
 
     // Generate an image file.
     $image = $this->getTestFile('image');
 
     // Submit the form but exclude the title field.
-    $edit = array(
+    $edit = [
       'body[0][value]' => 'Test article',
       'files[field_image_0]' => $this->container->get('file_system')->realpath($image->getFileUri()),
-    );
+    ];
     if (!$this->loggedInUser) {
       $label = 'Save';
     }
@@ -142,21 +142,21 @@ class FileFieldAnonymousSubmissionTest extends FileFieldTestBase {
     }
     $this->drupalPostForm(NULL, $edit, $label);
     $this->assertResponse(200);
-    $t_args = array('@type' => $bundle_label, '%title' => $node_title);
+    $t_args = ['@type' => $bundle_label, '%title' => $node_title];
     $this->assertNoText(strip_tags(t('@type %title has been created.', $t_args)), 'The node was created.');
     $this->assertText('Title field is required.');
 
     // Submit the form again but this time with the missing title field. This
     // should still work.
-    $edit = array(
+    $edit = [
       'title[0][value]' => $node_title,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, $label);
 
     // Confirm the final submission actually worked.
-    $t_args = array('@type' => $bundle_label, '%title' => $node_title);
+    $t_args = ['@type' => $bundle_label, '%title' => $node_title];
     $this->assertText(strip_tags(t('@type %title has been created.', $t_args)), 'The node was created.');
-    $matches = array();
+    $matches = [];
     if (preg_match('@node/(\d+)$@', $this->getUrl(), $matches)) {
       $nid = end($matches);
       $this->assertNotEqual($nid, 0, 'The node ID was extracted from the URL.');
diff --git a/web/core/modules/file/src/Tests/FileFieldDisplayTest.php b/web/core/modules/file/src/Tests/FileFieldDisplayTest.php
index 142751ad7..1b7e53421 100644
--- a/web/core/modules/file/src/Tests/FileFieldDisplayTest.php
+++ b/web/core/modules/file/src/Tests/FileFieldDisplayTest.php
@@ -15,33 +15,41 @@ class FileFieldDisplayTest extends FileFieldTestBase {
   /**
    * Tests normal formatter display on node display.
    */
-  function testNodeDisplay() {
+  public function testNodeDisplay() {
     $field_name = strtolower($this->randomMachineName());
     $type_name = 'article';
-    $field_storage_settings = array(
+    $field_storage_settings = [
       'display_field' => '1',
       'display_default' => '1',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    );
-    $field_settings = array(
+    ];
+    $field_settings = [
       'description_field' => '1',
-    );
-    $widget_settings = array();
+    ];
+    $widget_settings = [];
     $this->createFileField($field_name, 'node', $type_name, $field_storage_settings, $field_settings, $widget_settings);
 
     // Create a new node *without* the file field set, and check that the field
     // is not shown for each node display.
-    $node = $this->drupalCreateNode(array('type' => $type_name));
+    $node = $this->drupalCreateNode(['type' => $type_name]);
     // Check file_default last as the assertions below assume that this is the
     // case.
-    $file_formatters = array('file_table', 'file_url_plain', 'hidden', 'file_default');
+    $file_formatters = ['file_table', 'file_url_plain', 'hidden', 'file_default'];
     foreach ($file_formatters as $formatter) {
-      $edit = array(
-        "fields[$field_name][type]" => $formatter,
-      );
+      if ($formatter === 'hidden') {
+        $edit = [
+          "fields[$field_name][region]" => 'hidden',
+        ];
+      }
+      else {
+        $edit = [
+          "fields[$field_name][type]" => $formatter,
+          "fields[$field_name][region]" => 'content',
+        ];
+      }
       $this->drupalPostForm("admin/structure/types/manage/$type_name/display", $edit, t('Save'));
       $this->drupalGet('node/' . $node->id());
-      $this->assertNoText($field_name, format_string('Field label is hidden when no file attached for formatter %formatter', array('%formatter' => $formatter)));
+      $this->assertNoText($field_name, format_string('Field label is hidden when no file attached for formatter %formatter', ['%formatter' => $formatter]));
     }
 
     $test_file = $this->getTestFile('text');
@@ -57,28 +65,28 @@ class FileFieldDisplayTest extends FileFieldTestBase {
 
     // Check that the default formatter is displaying with the file name.
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
-    $file_link = array(
+    $file_link = [
       '#theme' => 'file_link',
       '#file' => $node_file,
-    );
+    ];
     $default_output = \Drupal::service('renderer')->renderRoot($file_link);
     $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
 
     // Turn the "display" option off and check that the file is no longer displayed.
-    $edit = array($field_name . '[0][display]' => FALSE);
+    $edit = [$field_name . '[0][display]' => FALSE];
     $this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save and keep published'));
 
     $this->assertNoRaw($default_output, 'Field is hidden when "display" option is unchecked.');
 
     // Add a description and make sure that it is displayed.
     $description = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       $field_name . '[0][description]' => $description,
       $field_name . '[0][display]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save and keep published'));
     $this->assertText($description);
 
@@ -102,18 +110,18 @@ class FileFieldDisplayTest extends FileFieldTestBase {
   /**
    * Tests default display of File Field.
    */
-  function testDefaultFileFieldDisplay() {
+  public function testDefaultFileFieldDisplay() {
     $field_name = strtolower($this->randomMachineName());
     $type_name = 'article';
-    $field_storage_settings = array(
+    $field_storage_settings = [
       'display_field' => '1',
       'display_default' => '0',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    );
-    $field_settings = array(
+    ];
+    $field_settings = [
       'description_field' => '1',
-    );
-    $widget_settings = array();
+    ];
+    $widget_settings = [];
     $this->createFileField($field_name, 'node', $type_name, $field_storage_settings, $field_settings, $widget_settings);
 
     $test_file = $this->getTestFile('text');
@@ -129,36 +137,36 @@ class FileFieldDisplayTest extends FileFieldTestBase {
   /**
    * Tests description toggle for field instance configuration.
    */
-  function testDescToggle() {
+  public function testDescToggle() {
     $type_name = 'test';
     $field_type = 'file';
     $field_name = strtolower($this->randomMachineName());
     // Use the UI to add a new content type that also contains a file field.
-    $edit = array(
+    $edit = [
       'name' => $type_name,
       'type' => $type_name,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/add', $edit, t('Save and manage fields'));
-    $edit = array(
+    $edit = [
       'new_storage_type' => $field_type,
       'field_name' => $field_name,
       'label' => $this->randomString(),
-    );
+    ];
     $this->drupalPostForm('/admin/structure/types/manage/' . $type_name . '/fields/add-field', $edit, t('Save and continue'));
-    $this->drupalPostForm(NULL, array(), t('Save field settings'));
+    $this->drupalPostForm(NULL, [], t('Save field settings'));
     // Ensure the description field is selected on the field instance settings
     // form. That's what this test is all about.
-    $edit = array(
+    $edit = [
       'settings[description_field]' => TRUE,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
     // Add a node of our new type and upload a file to it.
     $file = current($this->drupalGetTestFiles('text'));
     $title = $this->randomString();
-    $edit = array(
+    $edit = [
       'title[0][value]' => $title,
       'files[field_' . $field_name . '_0]' => drupal_realpath($file->uri),
-    );
+    ];
     $this->drupalPostForm('node/add/' . $type_name, $edit, t('Save and publish'));
     $node = $this->drupalGetNodeByTitle($title);
     $this->drupalGet('node/' . $node->id() . '/edit');
diff --git a/web/core/modules/file/src/Tests/FileFieldPathTest.php b/web/core/modules/file/src/Tests/FileFieldPathTest.php
index c9a15de81..300b92c3c 100644
--- a/web/core/modules/file/src/Tests/FileFieldPathTest.php
+++ b/web/core/modules/file/src/Tests/FileFieldPathTest.php
@@ -13,7 +13,7 @@ class FileFieldPathTest extends FileFieldTestBase {
   /**
    * Tests the normal formatter display on node display.
    */
-  function testUploadPath() {
+  public function testUploadPath() {
     /** @var \Drupal\node\NodeStorageInterface $node_storage */
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $field_name = strtolower($this->randomMachineName());
@@ -26,7 +26,7 @@ class FileFieldPathTest extends FileFieldTestBase {
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
 
     // Check that the file was uploaded to the correct location.
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     /** @var \Drupal\file\FileInterface $node_file */
     $node_file = $node->{$field_name}->entity;
@@ -36,36 +36,36 @@ class FileFieldPathTest extends FileFieldTestBase {
       $date_formatter->format(REQUEST_TIME, 'custom', 'Y') . '-' .
       $date_formatter->format(REQUEST_TIME, 'custom', 'm') . '/' .
       $test_file->getFilename();
-    $this->assertPathMatch($expected_filename, $node_file->getFileUri(), format_string('The file %file was uploaded to the correct path.', array('%file' => $node_file->getFileUri())));
+    $this->assertPathMatch($expected_filename, $node_file->getFileUri(), format_string('The file %file was uploaded to the correct path.', ['%file' => $node_file->getFileUri()]));
 
     // Change the path to contain multiple subdirectories.
-    $this->updateFileField($field_name, $type_name, array('file_directory' => 'foo/bar/baz'));
+    $this->updateFileField($field_name, $type_name, ['file_directory' => 'foo/bar/baz']);
 
     // Upload a new file into the subdirectories.
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
 
     // Check that the file was uploaded into the subdirectory.
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
-    $this->assertPathMatch('public://foo/bar/baz/' . $test_file->getFilename(), $node_file->getFileUri(), format_string('The file %file was uploaded to the correct path.', array('%file' => $node_file->getFileUri())));
+    $this->assertPathMatch('public://foo/bar/baz/' . $test_file->getFilename(), $node_file->getFileUri(), format_string('The file %file was uploaded to the correct path.', ['%file' => $node_file->getFileUri()]));
 
     // Check the path when used with tokens.
     // Change the path to contain multiple token directories.
-    $this->updateFileField($field_name, $type_name, array('file_directory' => '[current-user:uid]/[current-user:name]'));
+    $this->updateFileField($field_name, $type_name, ['file_directory' => '[current-user:uid]/[current-user:name]']);
 
     // Upload a new file into the token subdirectories.
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
 
     // Check that the file was uploaded into the subdirectory.
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
     // Do token replacement using the same user which uploaded the file, not
     // the user running the test case.
-    $data = array('user' => $this->adminUser);
+    $data = ['user' => $this->adminUser];
     $subdirectory = \Drupal::token()->replace('[user:uid]/[user:name]', $data);
-    $this->assertPathMatch('public://' . $subdirectory . '/' . $test_file->getFilename(), $node_file->getFileUri(), format_string('The file %file was uploaded to the correct path with token replacements.', array('%file' => $node_file->getFileUri())));
+    $this->assertPathMatch('public://' . $subdirectory . '/' . $test_file->getFilename(), $node_file->getFileUri(), format_string('The file %file was uploaded to the correct path with token replacements.', ['%file' => $node_file->getFileUri()]));
   }
 
   /**
@@ -79,7 +79,7 @@ class FileFieldPathTest extends FileFieldTestBase {
    * @param string $message
    *   The message to display with this assertion.
    */
-  function assertPathMatch($expected_path, $actual_path, $message) {
+  public function assertPathMatch($expected_path, $actual_path, $message) {
     // Strip off the extension of the expected path to allow for _0, _1, etc.
     // suffixes when the file hits a duplicate name.
     $pos = strrpos($expected_path, '.');
diff --git a/web/core/modules/file/src/Tests/FileFieldRSSContentTest.php b/web/core/modules/file/src/Tests/FileFieldRSSContentTest.php
index 042251494..af2b5f2b3 100644
--- a/web/core/modules/file/src/Tests/FileFieldRSSContentTest.php
+++ b/web/core/modules/file/src/Tests/FileFieldRSSContentTest.php
@@ -16,12 +16,12 @@ class FileFieldRSSContentTest extends FileFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'views');
+  public static $modules = ['node', 'views'];
 
   /**
    * Tests RSS enclosure formatter display for RSS feeds.
    */
-  function testFileFieldRSSContent() {
+  public function testFileFieldRSSContent() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $field_name = strtolower($this->randomMachineName());
     $type_name = 'article';
@@ -30,26 +30,29 @@ class FileFieldRSSContentTest extends FileFieldTestBase {
 
     // RSS display must be added manually.
     $this->drupalGet("admin/structure/types/manage/$type_name/display");
-    $edit = array(
+    $edit = [
       "display_modes_custom[rss]" => '1',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Change the format to 'RSS enclosure'.
     $this->drupalGet("admin/structure/types/manage/$type_name/display/rss");
-    $edit = array("fields[$field_name][type]" => 'file_rss_enclosure');
+    $edit = [
+      "fields[$field_name][type]" => 'file_rss_enclosure',
+      "fields[$field_name][region]" => 'content',
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Create a new node with a file field set. Promote to frontpage
     // needs to be set so this node will appear in the RSS feed.
-    $node = $this->drupalCreateNode(array('type' => $type_name, 'promote' => 1));
+    $node = $this->drupalCreateNode(['type' => $type_name, 'promote' => 1]);
     $test_file = $this->getTestFile('text');
 
     // Create a new node with the uploaded file.
     $nid = $this->uploadNodeFile($test_file, $field_name, $node->id());
 
     // Get the uploaded file from the node.
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
 
@@ -58,7 +61,7 @@ class FileFieldRSSContentTest extends FileFieldTestBase {
     $uploaded_filename = str_replace('public://', '', $node_file->getFileUri());
     $selector = sprintf(
       'enclosure[url="%s"][length="%s"][type="%s"]',
-      file_create_url("public://$uploaded_filename", array('absolute' => TRUE)),
+      file_create_url("public://$uploaded_filename", ['absolute' => TRUE]),
       $node_file->getSize(),
       $node_file->getMimeType()
     );
diff --git a/web/core/modules/file/src/Tests/FileFieldRevisionTest.php b/web/core/modules/file/src/Tests/FileFieldRevisionTest.php
index f5d00c7cb..7de496ff8 100644
--- a/web/core/modules/file/src/Tests/FileFieldRevisionTest.php
+++ b/web/core/modules/file/src/Tests/FileFieldRevisionTest.php
@@ -21,7 +21,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
    *  - When the last revision that uses a file is deleted, the original file
    *    should be deleted also.
    */
-  function testRevisions() {
+  public function testRevisions() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $type_name = 'article';
     $field_name = strtolower($this->randomMachineName());
@@ -35,7 +35,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
 
     // Check that the file exists on disk and in the database.
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file_r1 = File::load($node->{$field_name}->target_id);
     $node_vid_r1 = $node->getRevisionId();
@@ -45,7 +45,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
 
     // Upload another file to the same node in a new revision.
     $this->replaceNodeFile($test_file, $field_name, $nid);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file_r2 = File::load($node->{$field_name}->target_id);
     $node_vid_r2 = $node->getRevisionId();
@@ -63,8 +63,8 @@ class FileFieldRevisionTest extends FileFieldTestBase {
 
     // Save a new version of the node without any changes.
     // Check that the file is still the same as the previous revision.
-    $this->drupalPostForm('node/' . $nid . '/edit', array('revision' => '1'), t('Save and keep published'));
-    $node_storage->resetCache(array($nid));
+    $this->drupalPostForm('node/' . $nid . '/edit', ['revision' => '1'], t('Save and keep published'));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file_r3 = File::load($node->{$field_name}->target_id);
     $node_vid_r3 = $node->getRevisionId();
@@ -72,8 +72,8 @@ class FileFieldRevisionTest extends FileFieldTestBase {
     $this->assertFileIsPermanent($node_file_r3, 'New revision file is permanent.');
 
     // Revert to the first revision and check that the original file is active.
-    $this->drupalPostForm('node/' . $nid . '/revisions/' . $node_vid_r1 . '/revert', array(), t('Revert'));
-    $node_storage->resetCache(array($nid));
+    $this->drupalPostForm('node/' . $nid . '/revisions/' . $node_vid_r1 . '/revert', [], t('Revert'));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file_r4 = File::load($node->{$field_name}->target_id);
     $this->assertEqual($node_file_r1->id(), $node_file_r4->id(), 'Original revision file still in place after reverting to the original revision.');
@@ -81,7 +81,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
 
     // Delete the second revision and check that the file is kept (since it is
     // still being used by the third revision).
-    $this->drupalPostForm('node/' . $nid . '/revisions/' . $node_vid_r2 . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('node/' . $nid . '/revisions/' . $node_vid_r2 . '/delete', [], t('Delete'));
     $this->assertFileExists($node_file_r3, 'Second file is still available after deleting second revision, since it is being used by the third revision.');
     $this->assertFileEntryExists($node_file_r3, 'Second file entry is still available after deleting second revision, since it is being used by the third revision.');
     $this->assertFileIsPermanent($node_file_r3, 'Second file entry is still permanent after deleting second revision, since it is being used by the third revision.');
@@ -94,7 +94,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
     $this->drupalGet('user/' . $user->id() . '/edit');
 
     // Delete the third revision and check that the file is not deleted yet.
-    $this->drupalPostForm('node/' . $nid . '/revisions/' . $node_vid_r3 . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('node/' . $nid . '/revisions/' . $node_vid_r3 . '/delete', [], t('Delete'));
     $this->assertFileExists($node_file_r3, 'Second file is still available after deleting third revision, since it is being used by the user.');
     $this->assertFileEntryExists($node_file_r3, 'Second file entry is still available after deleting third revision, since it is being used by the user.');
     $this->assertFileIsPermanent($node_file_r3, 'Second file entry is still permanent after deleting third revision, since it is being used by the user.');
@@ -113,9 +113,9 @@ class FileFieldRevisionTest extends FileFieldTestBase {
     // of the file is older than the system.file.temporary_maximum_age
     // configuration value.
     db_update('file_managed')
-      ->fields(array(
+      ->fields([
         'changed' => REQUEST_TIME - ($this->config('system.file')->get('temporary_maximum_age') + 1),
-      ))
+      ])
       ->condition('fid', $node_file_r3->id())
       ->execute();
     \Drupal::service('cron')->run();
@@ -124,14 +124,14 @@ class FileFieldRevisionTest extends FileFieldTestBase {
     $this->assertFileEntryNotExists($node_file_r3, 'Second file entry is now deleted after deleting third revision, since it is no longer being used by any other nodes.');
 
     // Delete the entire node and check that the original file is deleted.
-    $this->drupalPostForm('node/' . $nid . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('node/' . $nid . '/delete', [], t('Delete'));
     // Call file_cron() to clean up the file. Make sure the changed timestamp
     // of the file is older than the system.file.temporary_maximum_age
     // configuration value.
     db_update('file_managed')
-      ->fields(array(
+      ->fields([
         'changed' => REQUEST_TIME - ($this->config('system.file')->get('temporary_maximum_age') + 1),
-      ))
+      ])
       ->condition('fid', $node_file_r1->id())
       ->execute();
     \Drupal::service('cron')->run();
diff --git a/web/core/modules/file/src/Tests/FileFieldTestBase.php b/web/core/modules/file/src/Tests/FileFieldTestBase.php
index 307eb4d15..73cc96ad5 100644
--- a/web/core/modules/file/src/Tests/FileFieldTestBase.php
+++ b/web/core/modules/file/src/Tests/FileFieldTestBase.php
@@ -10,6 +10,9 @@ use Drupal\file\Entity\File;
 
 /**
  * Provides methods specifically for testing File module's field handling.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\file\Functional\FileFieldTestBase instead.
  */
 abstract class FileFieldTestBase extends WebTestBase {
 
@@ -18,7 +21,7 @@ abstract class FileFieldTestBase extends WebTestBase {
   *
   * @var array
   */
-  public static $modules = array('node', 'file', 'file_module_test', 'field_ui');
+  public static $modules = ['node', 'file', 'file_module_test', 'field_ui'];
 
   /**
    * An user with administration permissions.
@@ -29,9 +32,9 @@ abstract class FileFieldTestBase extends WebTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $this->adminUser = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer nodes', 'bypass node access'));
+    $this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer nodes', 'bypass node access']);
     $this->drupalLogin($this->adminUser);
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
   }
 
   /**
@@ -39,7 +42,7 @@ abstract class FileFieldTestBase extends WebTestBase {
    *
    * @return \Drupal\file\FileInterface
    */
-  function getTestFile($type_name, $size = NULL) {
+  public function getTestFile($type_name, $size = NULL) {
     // Get a file to upload.
     $file = current($this->drupalGetTestFiles($type_name, $size));
 
@@ -53,7 +56,7 @@ abstract class FileFieldTestBase extends WebTestBase {
   /**
    * Retrieves the fid of the last inserted file.
    */
-  function getLastFileId() {
+  public function getLastFileId() {
     return (int) db_query('SELECT MAX(fid) FROM {file_managed}')->fetchField();
   }
 
@@ -73,14 +76,14 @@ abstract class FileFieldTestBase extends WebTestBase {
    * @param array $widget_settings
    *   A list of widget settings that will be added to the widget defaults.
    */
-  function createFileField($name, $entity_type, $bundle, $storage_settings = array(), $field_settings = array(), $widget_settings = array()) {
-    $field_storage = FieldStorageConfig::create(array(
+  public function createFileField($name, $entity_type, $bundle, $storage_settings = [], $field_settings = [], $widget_settings = []) {
+    $field_storage = FieldStorageConfig::create([
       'entity_type' => $entity_type,
       'field_name' => $name,
       'type' => 'file',
       'settings' => $storage_settings,
       'cardinality' => !empty($storage_settings['cardinality']) ? $storage_settings['cardinality'] : 1,
-    ));
+    ]);
     $field_storage->save();
 
     $this->attachFileField($name, $entity_type, $bundle, $field_settings, $widget_settings);
@@ -101,44 +104,44 @@ abstract class FileFieldTestBase extends WebTestBase {
    * @param array $widget_settings
    *   A list of widget settings that will be added to the widget defaults.
    */
-  function attachFileField($name, $entity_type, $bundle, $field_settings = array(), $widget_settings = array()) {
-    $field = array(
+  public function attachFileField($name, $entity_type, $bundle, $field_settings = [], $widget_settings = []) {
+    $field = [
       'field_name' => $name,
       'label' => $name,
       'entity_type' => $entity_type,
       'bundle' => $bundle,
       'required' => !empty($field_settings['required']),
       'settings' => $field_settings,
-    );
+    ];
     FieldConfig::create($field)->save();
 
     entity_get_form_display($entity_type, $bundle, 'default')
-      ->setComponent($name, array(
+      ->setComponent($name, [
         'type' => 'file_generic',
         'settings' => $widget_settings,
-      ))
+      ])
       ->save();
     // Assign display settings.
     entity_get_display($entity_type, $bundle, 'default')
-      ->setComponent($name, array(
+      ->setComponent($name, [
         'label' => 'hidden',
         'type' => 'file_default',
-      ))
+      ])
       ->save();
   }
 
   /**
    * Updates an existing file field with new settings.
    */
-  function updateFileField($name, $type_name, $field_settings = array(), $widget_settings = array()) {
+  public function updateFileField($name, $type_name, $field_settings = [], $widget_settings = []) {
     $field = FieldConfig::loadByName('node', $type_name, $name);
     $field->setSettings(array_merge($field->getSettings(), $field_settings));
     $field->save();
 
     entity_get_form_display('node', $type_name, 'default')
-      ->setComponent($name, array(
+      ->setComponent($name, [
         'settings' => $widget_settings,
-      ))
+      ])
       ->save();
   }
 
@@ -160,7 +163,7 @@ abstract class FileFieldTestBase extends WebTestBase {
    * @return int
    *   The node id.
    */
-  function uploadNodeFile(FileInterface $file, $field_name, $nid_or_type, $new_revision = TRUE, array $extras = array()) {
+  public function uploadNodeFile(FileInterface $file, $field_name, $nid_or_type, $new_revision = TRUE, array $extras = []) {
     return $this->uploadNodeFiles([$file], $field_name, $nid_or_type, $new_revision, $extras);
   }
 
@@ -182,16 +185,16 @@ abstract class FileFieldTestBase extends WebTestBase {
    * @return int
    *   The node id.
    */
-  function uploadNodeFiles(array $files, $field_name, $nid_or_type, $new_revision = TRUE, array $extras = array()) {
-    $edit = array(
+  public function uploadNodeFiles(array $files, $field_name, $nid_or_type, $new_revision = TRUE, array $extras = []) {
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
       'revision' => (string) (int) $new_revision,
-    );
+    ];
 
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     if (is_numeric($nid_or_type)) {
       $nid = $nid_or_type;
-      $node_storage->resetCache(array($nid));
+      $node_storage->resetCache([$nid]);
       $node = $node_storage->load($nid);
     }
     else {
@@ -202,7 +205,7 @@ abstract class FileFieldTestBase extends WebTestBase {
       // Save at least one revision to better simulate a real site.
       $node->setNewRevision();
       $node->save();
-      $node_storage->resetCache(array($nid));
+      $node_storage->resetCache([$nid]);
       $node = $node_storage->load($nid);
       $this->assertNotEqual($nid, $node->getRevisionId(), 'Node revision exists.');
     }
@@ -234,68 +237,68 @@ abstract class FileFieldTestBase extends WebTestBase {
    *
    * Note that if replacing a file, it must first be removed then added again.
    */
-  function removeNodeFile($nid, $new_revision = TRUE) {
-    $edit = array(
+  public function removeNodeFile($nid, $new_revision = TRUE) {
+    $edit = [
       'revision' => (string) (int) $new_revision,
-    );
+    ];
 
-    $this->drupalPostForm('node/' . $nid . '/edit', array(), t('Remove'));
+    $this->drupalPostForm('node/' . $nid . '/edit', [], t('Remove'));
     $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
   }
 
   /**
    * Replaces a file within a node.
    */
-  function replaceNodeFile($file, $field_name, $nid, $new_revision = TRUE) {
-    $edit = array(
+  public function replaceNodeFile($file, $field_name, $nid, $new_revision = TRUE) {
+    $edit = [
       'files[' . $field_name . '_0]' => drupal_realpath($file->getFileUri()),
       'revision' => (string) (int) $new_revision,
-    );
+    ];
 
-    $this->drupalPostForm('node/' . $nid . '/edit', array(), t('Remove'));
+    $this->drupalPostForm('node/' . $nid . '/edit', [], t('Remove'));
     $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
   }
 
   /**
    * Asserts that a file exists physically on disk.
    */
-  function assertFileExists($file, $message = NULL) {
-    $message = isset($message) ? $message : format_string('File %file exists on the disk.', array('%file' => $file->getFileUri()));
+  public function assertFileExists($file, $message = NULL) {
+    $message = isset($message) ? $message : format_string('File %file exists on the disk.', ['%file' => $file->getFileUri()]);
     $this->assertTrue(is_file($file->getFileUri()), $message);
   }
 
   /**
    * Asserts that a file exists in the database.
    */
-  function assertFileEntryExists($file, $message = NULL) {
+  public function assertFileEntryExists($file, $message = NULL) {
     $this->container->get('entity.manager')->getStorage('file')->resetCache();
     $db_file = File::load($file->id());
-    $message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', array('%file' => $file->getFileUri()));
+    $message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', ['%file' => $file->getFileUri()]);
     $this->assertEqual($db_file->getFileUri(), $file->getFileUri(), $message);
   }
 
   /**
    * Asserts that a file does not exist on disk.
    */
-  function assertFileNotExists($file, $message = NULL) {
-    $message = isset($message) ? $message : format_string('File %file exists on the disk.', array('%file' => $file->getFileUri()));
+  public function assertFileNotExists($file, $message = NULL) {
+    $message = isset($message) ? $message : format_string('File %file exists on the disk.', ['%file' => $file->getFileUri()]);
     $this->assertFalse(is_file($file->getFileUri()), $message);
   }
 
   /**
    * Asserts that a file does not exist in the database.
    */
-  function assertFileEntryNotExists($file, $message) {
+  public function assertFileEntryNotExists($file, $message) {
     $this->container->get('entity.manager')->getStorage('file')->resetCache();
-    $message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', array('%file' => $file->getFileUri()));
+    $message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', ['%file' => $file->getFileUri()]);
     $this->assertFalse(File::load($file->id()), $message);
   }
 
   /**
    * Asserts that a file's status is set to permanent in the database.
    */
-  function assertFileIsPermanent(FileInterface $file, $message = NULL) {
-    $message = isset($message) ? $message : format_string('File %file is permanent.', array('%file' => $file->getFileUri()));
+  public function assertFileIsPermanent(FileInterface $file, $message = NULL) {
+    $message = isset($message) ? $message : format_string('File %file is permanent.', ['%file' => $file->getFileUri()]);
     $this->assertTrue($file->isPermanent(), $message);
   }
 
diff --git a/web/core/modules/file/src/Tests/FileFieldValidateTest.php b/web/core/modules/file/src/Tests/FileFieldValidateTest.php
index 9d43060cc..5ddcdde3f 100644
--- a/web/core/modules/file/src/Tests/FileFieldValidateTest.php
+++ b/web/core/modules/file/src/Tests/FileFieldValidateTest.php
@@ -17,26 +17,26 @@ class FileFieldValidateTest extends FileFieldTestBase {
   /**
    * Tests the required property on file fields.
    */
-  function testRequired() {
+  public function testRequired() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $type_name = 'article';
     $field_name = strtolower($this->randomMachineName());
-    $storage = $this->createFileField($field_name, 'node', $type_name, array(), array('required' => '1'));
+    $storage = $this->createFileField($field_name, 'node', $type_name, [], ['required' => '1']);
     $field = FieldConfig::loadByName('node', $type_name, $field_name);
 
     $test_file = $this->getTestFile('text');
 
     // Try to post a new node without uploading a file.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $this->drupalPostForm('node/add/' . $type_name, $edit, t('Save and publish'));
-    $this->assertRaw(t('@title field is required.', array('@title' => $field->getLabel())), 'Node save failed when required file field was empty.');
+    $this->assertRaw(t('@title field is required.', ['@title' => $field->getLabel()]), 'Node save failed when required file field was empty.');
 
     // Create a new node with the uploaded file.
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
-    $this->assertTrue($nid !== FALSE, format_string('uploadNodeFile(@test_file, @field_name, @type_name) succeeded', array('@test_file' => $test_file->getFileUri(), '@field_name' => $field_name, '@type_name' => $type_name)));
+    $this->assertTrue($nid !== FALSE, format_string('uploadNodeFile(@test_file, @field_name, @type_name) succeeded', ['@test_file' => $test_file->getFileUri(), '@field_name' => $field_name, '@type_name' => $type_name]));
 
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
 
     $node_file = File::load($node->{$field_name}->target_id);
@@ -45,17 +45,17 @@ class FileFieldValidateTest extends FileFieldTestBase {
 
     // Try again with a multiple value field.
     $storage->delete();
-    $this->createFileField($field_name, 'node', $type_name, array('cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED), array('required' => '1'));
+    $this->createFileField($field_name, 'node', $type_name, ['cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED], ['required' => '1']);
 
     // Try to post a new node without uploading a file in the multivalue field.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $this->drupalPostForm('node/add/' . $type_name, $edit, t('Save and publish'));
-    $this->assertRaw(t('@title field is required.', array('@title' => $field->getLabel())), 'Node save failed when required multiple value file field was empty.');
+    $this->assertRaw(t('@title field is required.', ['@title' => $field->getLabel()]), 'Node save failed when required multiple value file field was empty.');
 
     // Create a new node with the uploaded file into the multivalue field.
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, 'File exists after uploading to the required multiple value field.');
@@ -65,56 +65,56 @@ class FileFieldValidateTest extends FileFieldTestBase {
   /**
    * Tests the max file size validator.
    */
-  function testFileMaxSize() {
+  public function testFileMaxSize() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $type_name = 'article';
     $field_name = strtolower($this->randomMachineName());
-    $this->createFileField($field_name, 'node', $type_name, array(), array('required' => '1'));
+    $this->createFileField($field_name, 'node', $type_name, [], ['required' => '1']);
 
     $small_file = $this->getTestFile('text', 131072); // 128KB.
     $large_file = $this->getTestFile('text', 1310720); // 1.2MB
 
     // Test uploading both a large and small file with different increments.
-    $sizes = array(
+    $sizes = [
       '1M' => 1048576,
       '1024K' => 1048576,
       '1048576' => 1048576,
-    );
+    ];
 
     foreach ($sizes as $max_filesize => $file_limit) {
       // Set the max file upload size.
-      $this->updateFileField($field_name, $type_name, array('max_filesize' => $max_filesize));
+      $this->updateFileField($field_name, $type_name, ['max_filesize' => $max_filesize]);
 
       // Create a new node with the small file, which should pass.
       $nid = $this->uploadNodeFile($small_file, $field_name, $type_name);
-      $node_storage->resetCache(array($nid));
+      $node_storage->resetCache([$nid]);
       $node = $node_storage->load($nid);
       $node_file = File::load($node->{$field_name}->target_id);
-      $this->assertFileExists($node_file, format_string('File exists after uploading a file (%filesize) under the max limit (%maxsize).', array('%filesize' => format_size($small_file->getSize()), '%maxsize' => $max_filesize)));
-      $this->assertFileEntryExists($node_file, format_string('File entry exists after uploading a file (%filesize) under the max limit (%maxsize).', array('%filesize' => format_size($small_file->getSize()), '%maxsize' => $max_filesize)));
+      $this->assertFileExists($node_file, format_string('File exists after uploading a file (%filesize) under the max limit (%maxsize).', ['%filesize' => format_size($small_file->getSize()), '%maxsize' => $max_filesize]));
+      $this->assertFileEntryExists($node_file, format_string('File entry exists after uploading a file (%filesize) under the max limit (%maxsize).', ['%filesize' => format_size($small_file->getSize()), '%maxsize' => $max_filesize]));
 
       // Check that uploading the large file fails (1M limit).
       $this->uploadNodeFile($large_file, $field_name, $type_name);
-      $error_message = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size($large_file->getSize()), '%maxsize' => format_size($file_limit)));
-      $this->assertRaw($error_message, format_string('Node save failed when file (%filesize) exceeded the max upload size (%maxsize).', array('%filesize' => format_size($large_file->getSize()), '%maxsize' => $max_filesize)));
+      $error_message = t('The file is %filesize exceeding the maximum file size of %maxsize.', ['%filesize' => format_size($large_file->getSize()), '%maxsize' => format_size($file_limit)]);
+      $this->assertRaw($error_message, format_string('Node save failed when file (%filesize) exceeded the max upload size (%maxsize).', ['%filesize' => format_size($large_file->getSize()), '%maxsize' => $max_filesize]));
     }
 
     // Turn off the max filesize.
-    $this->updateFileField($field_name, $type_name, array('max_filesize' => ''));
+    $this->updateFileField($field_name, $type_name, ['max_filesize' => '']);
 
     // Upload the big file successfully.
     $nid = $this->uploadNodeFile($large_file, $field_name, $type_name);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
-    $this->assertFileExists($node_file, format_string('File exists after uploading a file (%filesize) with no max limit.', array('%filesize' => format_size($large_file->getSize()))));
-    $this->assertFileEntryExists($node_file, format_string('File entry exists after uploading a file (%filesize) with no max limit.', array('%filesize' => format_size($large_file->getSize()))));
+    $this->assertFileExists($node_file, format_string('File exists after uploading a file (%filesize) with no max limit.', ['%filesize' => format_size($large_file->getSize())]));
+    $this->assertFileEntryExists($node_file, format_string('File entry exists after uploading a file (%filesize) with no max limit.', ['%filesize' => format_size($large_file->getSize())]));
   }
 
   /**
    * Tests file extension checking.
    */
-  function testFileExtension() {
+  public function testFileExtension() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $type_name = 'article';
     $field_name = strtolower($this->randomMachineName());
@@ -124,30 +124,30 @@ class FileFieldValidateTest extends FileFieldTestBase {
     list(, $test_file_extension) = explode('.', $test_file->getFilename());
 
     // Disable extension checking.
-    $this->updateFileField($field_name, $type_name, array('file_extensions' => ''));
+    $this->updateFileField($field_name, $type_name, ['file_extensions' => '']);
 
     // Check that the file can be uploaded with no extension checking.
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, 'File exists after uploading a file with no extension checking.');
     $this->assertFileEntryExists($node_file, 'File entry exists after uploading a file with no extension checking.');
 
     // Enable extension checking for text files.
-    $this->updateFileField($field_name, $type_name, array('file_extensions' => 'txt'));
+    $this->updateFileField($field_name, $type_name, ['file_extensions' => 'txt']);
 
     // Check that the file with the wrong extension cannot be uploaded.
     $this->uploadNodeFile($test_file, $field_name, $type_name);
-    $error_message = t('Only files with the following extensions are allowed: %files-allowed.', array('%files-allowed' => 'txt'));
+    $error_message = t('Only files with the following extensions are allowed: %files-allowed.', ['%files-allowed' => 'txt']);
     $this->assertRaw($error_message, 'Node save failed when file uploaded with the wrong extension.');
 
     // Enable extension checking for text and image files.
-    $this->updateFileField($field_name, $type_name, array('file_extensions' => "txt $test_file_extension"));
+    $this->updateFileField($field_name, $type_name, ['file_extensions' => "txt $test_file_extension"]);
 
     // Check that the file can be uploaded with extension checking.
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, 'File exists after uploading a file with extension checking.');
@@ -166,18 +166,18 @@ class FileFieldValidateTest extends FileFieldTestBase {
     $test_file = $this->getTestFile('image');
 
     // Disable extension checking.
-    $this->updateFileField($field_name, $type_name, array('file_extensions' => ''));
+    $this->updateFileField($field_name, $type_name, ['file_extensions' => '']);
 
     // Check that the file can be uploaded with no extension checking.
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, 'File exists after uploading a file with no extension checking.');
     $this->assertFileEntryExists($node_file, 'File entry exists after uploading a file with no extension checking.');
 
     // Enable extension checking for text files.
-    $this->updateFileField($field_name, $type_name, array('file_extensions' => 'txt'));
+    $this->updateFileField($field_name, $type_name, ['file_extensions' => 'txt']);
 
     // Check that the file can still be removed.
     $this->removeNodeFile($nid);
diff --git a/web/core/modules/file/src/Tests/FileFieldWidgetTest.php b/web/core/modules/file/src/Tests/FileFieldWidgetTest.php
index 414c86b55..ddfd8f4e7 100644
--- a/web/core/modules/file/src/Tests/FileFieldWidgetTest.php
+++ b/web/core/modules/file/src/Tests/FileFieldWidgetTest.php
@@ -38,7 +38,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('comment', 'block');
+  public static $modules = ['comment', 'block'];
 
   /**
    * Creates a temporary file, for a specific user.
@@ -73,7 +73,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
   /**
    * Tests upload and remove buttons for a single-valued File field.
    */
-  function testSingleValuedWidget() {
+  public function testSingleValuedWidget() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $type_name = 'article';
     $field_name = strtolower($this->randomMachineName());
@@ -81,13 +81,13 @@ class FileFieldWidgetTest extends FileFieldTestBase {
 
     $test_file = $this->getTestFile('text');
 
-    foreach (array('nojs', 'js') as $type) {
+    foreach (['nojs', 'js'] as $type) {
       // Create a new node with the uploaded file and ensure it got uploaded
       // successfully.
       // @todo This only tests a 'nojs' submission, because drupalPostAjaxForm()
       //   does not yet support file uploads.
       $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
-      $node_storage->resetCache(array($nid));
+      $node_storage->resetCache([$nid]);
       $node = $node_storage->load($nid);
       $node_file = File::load($node->{$field_name}->target_id);
       $this->assertFileExists($node_file, 'New file saved to disk on node creation.');
@@ -104,11 +104,11 @@ class FileFieldWidgetTest extends FileFieldTestBase {
       // "Click" the remove button (emulating either a nojs or js submission).
       switch ($type) {
         case 'nojs':
-          $this->drupalPostForm(NULL, array(), t('Remove'));
+          $this->drupalPostForm(NULL, [], t('Remove'));
           break;
         case 'js':
           $button = $this->xpath('//input[@type="submit" and @value="' . t('Remove') . '"]');
-          $this->drupalPostAjaxForm(NULL, array(), array((string) $button[0]['name'] => (string) $button[0]['value']));
+          $this->drupalPostAjaxForm(NULL, [], [(string) $button[0]['name'] => (string) $button[0]['value']]);
           break;
       }
 
@@ -121,8 +121,8 @@ class FileFieldWidgetTest extends FileFieldTestBase {
       $this->assertTrue(isset($label[0]), 'Label for upload found.');
 
       // Save the node and ensure it does not have the file.
-      $this->drupalPostForm(NULL, array(), t('Save and keep published'));
-      $node_storage->resetCache(array($nid));
+      $this->drupalPostForm(NULL, [], t('Save and keep published'));
+      $node_storage->resetCache([$nid]);
       $node = $node_storage->load($nid);
       $this->assertTrue(empty($node->{$field_name}->target_id), 'File was successfully removed from the node.');
     }
@@ -131,7 +131,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
   /**
    * Tests upload and remove buttons for multiple multi-valued File fields.
    */
-  function testMultiValuedWidget() {
+  public function testMultiValuedWidget() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $type_name = 'article';
     // Use explicit names instead of random names for those fields, because of a
@@ -143,12 +143,12 @@ class FileFieldWidgetTest extends FileFieldTestBase {
     $field_name = 'test_file_field_1';
     $field_name2 = 'test_file_field_2';
     $cardinality = 3;
-    $this->createFileField($field_name, 'node', $type_name, array('cardinality' => $cardinality));
-    $this->createFileField($field_name2, 'node', $type_name, array('cardinality' => $cardinality));
+    $this->createFileField($field_name, 'node', $type_name, ['cardinality' => $cardinality]);
+    $this->createFileField($field_name2, 'node', $type_name, ['cardinality' => $cardinality]);
 
     $test_file = $this->getTestFile('text');
 
-    foreach (array('nojs', 'js') as $type) {
+    foreach (['nojs', 'js'] as $type) {
       // Visit the node creation form, and upload 3 files for each field. Since
       // the field has cardinality of 3, ensure the "Upload" button is displayed
       // until after the 3rd file, and after that, isn't displayed. Because
@@ -158,9 +158,9 @@ class FileFieldWidgetTest extends FileFieldTestBase {
       //   does not yet emulate jQuery's file upload.
       //
       $this->drupalGet("node/add/$type_name");
-      foreach (array($field_name2, $field_name) as $each_field_name) {
+      foreach ([$field_name2, $field_name] as $each_field_name) {
         for ($delta = 0; $delta < 3; $delta++) {
-          $edit = array('files[' . $each_field_name . '_' . $delta . '][]' => drupal_realpath($test_file->getFileUri()));
+          $edit = ['files[' . $each_field_name . '_' . $delta . '][]' => drupal_realpath($test_file->getFileUri())];
           // If the Upload button doesn't exist, drupalPostForm() will automatically
           // fail with an assertion message.
           $this->drupalPostForm(NULL, $edit, t('Upload'));
@@ -170,7 +170,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
 
       $num_expected_remove_buttons = 6;
 
-      foreach (array($field_name, $field_name2) as $current_field_name) {
+      foreach ([$field_name, $field_name2] as $current_field_name) {
         // How many uploaded files for the current field are remaining.
         $remaining = 3;
         // Test clicking each "Remove" button. For extra robustness, test them out
@@ -179,11 +179,11 @@ class FileFieldWidgetTest extends FileFieldTestBase {
         // - First remove the 2nd file.
         // - Then remove what is then the 2nd file (was originally the 3rd file).
         // - Then remove the first file.
-        foreach (array(1, 1, 0) as $delta) {
+        foreach ([1, 1, 0] as $delta) {
           // Ensure we have the expected number of Remove buttons, and that they
           // are numbered sequentially.
           $buttons = $this->xpath('//input[@type="submit" and @value="Remove"]');
-          $this->assertTrue(is_array($buttons) && count($buttons) === $num_expected_remove_buttons, format_string('There are %n "Remove" buttons displayed (JSMode=%type).', array('%n' => $num_expected_remove_buttons, '%type' => $type)));
+          $this->assertTrue(is_array($buttons) && count($buttons) === $num_expected_remove_buttons, format_string('There are %n "Remove" buttons displayed (JSMode=%type).', ['%n' => $num_expected_remove_buttons, '%type' => $type]));
           foreach ($buttons as $i => $button) {
             $key = $i >= $remaining ? $i - $remaining : $i;
             $check_field_name = $field_name2;
@@ -210,12 +210,12 @@ class FileFieldWidgetTest extends FileFieldTestBase {
                   $button['value'] = 'DUMMY';
                 }
               }
-              $this->drupalPostForm(NULL, array(), t('Remove'));
+              $this->drupalPostForm(NULL, [], t('Remove'));
               break;
             case 'js':
               // drupalPostAjaxForm() lets us target the button precisely, so we don't
               // require the workaround used above for nojs.
-              $this->drupalPostAjaxForm(NULL, array(), array($button_name => t('Remove')));
+              $this->drupalPostAjaxForm(NULL, [], [$button_name => t('Remove')]);
               break;
           }
           $num_expected_remove_buttons--;
@@ -224,38 +224,38 @@ class FileFieldWidgetTest extends FileFieldTestBase {
           // Ensure an "Upload" button for the current field is displayed with the
           // correct name.
           $upload_button_name = $current_field_name . '_' . $remaining . '_upload_button';
-          $buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', array(':name' => $upload_button_name));
-          $this->assertTrue(is_array($buttons) && count($buttons) == 1, format_string('The upload button is displayed with the correct name (JSMode=%type).', array('%type' => $type)));
+          $buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', [':name' => $upload_button_name]);
+          $this->assertTrue(is_array($buttons) && count($buttons) == 1, format_string('The upload button is displayed with the correct name (JSMode=%type).', ['%type' => $type]));
 
           // Ensure only at most one button per field is displayed.
           $buttons = $this->xpath('//input[@type="submit" and @value="Upload"]');
           $expected = $current_field_name == $field_name ? 1 : 2;
-          $this->assertTrue(is_array($buttons) && count($buttons) == $expected, format_string('After removing a file, only one "Upload" button for each possible field is displayed (JSMode=%type).', array('%type' => $type)));
+          $this->assertTrue(is_array($buttons) && count($buttons) == $expected, format_string('After removing a file, only one "Upload" button for each possible field is displayed (JSMode=%type).', ['%type' => $type]));
         }
       }
 
       // Ensure the page now has no Remove buttons.
-      $this->assertNoFieldByXPath('//input[@type="submit"]', t('Remove'), format_string('After removing all files, there is no "Remove" button displayed (JSMode=%type).', array('%type' => $type)));
+      $this->assertNoFieldByXPath('//input[@type="submit"]', t('Remove'), format_string('After removing all files, there is no "Remove" button displayed (JSMode=%type).', ['%type' => $type]));
 
       // Save the node and ensure it does not have any files.
-      $this->drupalPostForm(NULL, array('title[0][value]' => $this->randomMachineName()), t('Save and publish'));
-      $matches = array();
+      $this->drupalPostForm(NULL, ['title[0][value]' => $this->randomMachineName()], t('Save and publish'));
+      $matches = [];
       preg_match('/node\/([0-9]+)/', $this->getUrl(), $matches);
       $nid = $matches[1];
-      $node_storage->resetCache(array($nid));
+      $node_storage->resetCache([$nid]);
       $node = $node_storage->load($nid);
       $this->assertTrue(empty($node->{$field_name}->target_id), 'Node was successfully saved without any files.');
     }
 
-    $upload_files_node_creation = array($test_file, $test_file);
+    $upload_files_node_creation = [$test_file, $test_file];
     // Try to upload multiple files, but fewer than the maximum.
     $nid = $this->uploadNodeFiles($upload_files_node_creation, $field_name, $type_name);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $this->assertEqual(count($node->{$field_name}), count($upload_files_node_creation), 'Node was successfully saved with mulitple files.');
 
     // Try to upload more files than allowed on revision.
-    $upload_files_node_revision = array($test_file, $test_file, $test_file, $test_file);
+    $upload_files_node_revision = [$test_file, $test_file, $test_file, $test_file];
     $this->uploadNodeFiles($upload_files_node_revision, $field_name, $nid, 1);
     $args = [
       '%field' => $field_name,
@@ -264,7 +264,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
       '%list' => implode(', ', array_fill(0, 3, $test_file->getFilename())),
     ];
     $this->assertRaw(t('Field %field can only hold @max values but there were @count uploaded. The following files have been omitted as a result: %list.', $args));
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $this->assertEqual(count($node->{$field_name}), $cardinality, 'More files than allowed could not be saved to node.');
 
@@ -274,14 +274,14 @@ class FileFieldWidgetTest extends FileFieldTestBase {
       'type' => $type_name
     ]);
     $this->uploadNodeFile($test_file, $field_name, $node->id(), 1);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $this->assertEqual(count($node->{$field_name}), $cardinality, 'Node was successfully revised to maximum number of files.');
 
     // Try to upload exactly the allowed number of files, new node.
     $upload_files = array_fill(0, $cardinality, $test_file);
     $nid = $this->uploadNodeFiles($upload_files, $field_name, $type_name);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $this->assertEqual(count($node->{$field_name}), $cardinality, 'Node was successfully saved with maximum number of files.');
 
@@ -301,10 +301,10 @@ class FileFieldWidgetTest extends FileFieldTestBase {
   /**
    * Tests a file field with a "Private files" upload destination setting.
    */
-  function testPrivateFileSetting() {
+  public function testPrivateFileSetting() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     // Grant the admin user required permissions.
-    user_role_grant_permissions($this->adminUser->roles[0]->target_id, array('administer node fields'));
+    user_role_grant_permissions($this->adminUser->roles[0]->target_id, ['administer node fields']);
 
     $type_name = 'article';
     $field_name = strtolower($this->randomMachineName());
@@ -315,10 +315,10 @@ class FileFieldWidgetTest extends FileFieldTestBase {
     $test_file = $this->getTestFile('text');
 
     // Change the field setting to make its files private, and upload a file.
-    $edit = array('settings[uri_scheme]' => 'private');
+    $edit = ['settings[uri_scheme]' => 'private'];
     $this->drupalPostForm("admin/structure/types/manage/$type_name/fields/$field_id/storage", $edit, t('Save field settings'));
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, 'New file saved to disk on node creation.');
@@ -341,42 +341,42 @@ class FileFieldWidgetTest extends FileFieldTestBase {
   /**
    * Tests that download restrictions on private files work on comments.
    */
-  function testPrivateFileComment() {
-    $user = $this->drupalCreateUser(array('access comments'));
+  public function testPrivateFileComment() {
+    $user = $this->drupalCreateUser(['access comments']);
 
     // Grant the admin user required comment permissions.
     $roles = $this->adminUser->getRoles();
-    user_role_grant_permissions($roles[1], array('administer comment fields', 'administer comments'));
+    user_role_grant_permissions($roles[1], ['administer comment fields', 'administer comments']);
 
     // Revoke access comments permission from anon user, grant post to
     // authenticated.
-    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, array('access comments'));
-    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('post comments', 'skip comment approval'));
+    user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access comments']);
+    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['post comments', 'skip comment approval']);
 
     // Create a new field.
     $this->addDefaultCommentField('node', 'article');
 
     $name = strtolower($this->randomMachineName());
     $label = $this->randomMachineName();
-    $storage_edit = array('settings[uri_scheme]' => 'private');
+    $storage_edit = ['settings[uri_scheme]' => 'private'];
     $this->fieldUIAddNewField('admin/structure/comment/manage/comment', $name, $label, 'file', $storage_edit);
 
     // Manually clear cache on the tester side.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
     // Create node.
-    $edit = array(
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
 
     // Add a comment with a file.
     $text_file = $this->getTestFile('text');
-    $edit = array(
+    $edit = [
       'files[field_' . $name . '_' . 0 . ']' => drupal_realpath($text_file->getFileUri()),
       'comment_body[0][value]' => $comment_body = $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('node/' . $node->id(), $edit, t('Save'));
 
     // Get the comment ID.
@@ -402,7 +402,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
 
     // Unpublishes node.
     $this->drupalLogin($this->adminUser);
-    $this->drupalPostForm('node/' . $node->id() . '/edit', array(), t('Save and unpublish'));
+    $this->drupalPostForm('node/' . $node->id() . '/edit', [], t('Save and unpublish'));
 
     // Ensures normal user can no longer download the file.
     $this->drupalLogin($user);
@@ -413,15 +413,15 @@ class FileFieldWidgetTest extends FileFieldTestBase {
   /**
    * Tests validation with the Upload button.
    */
-  function testWidgetValidation() {
+  public function testWidgetValidation() {
     $type_name = 'article';
     $field_name = strtolower($this->randomMachineName());
     $this->createFileField($field_name, 'node', $type_name);
-    $this->updateFileField($field_name, $type_name, array('file_extensions' => 'txt'));
+    $this->updateFileField($field_name, $type_name, ['file_extensions' => 'txt']);
 
-    foreach (array('nojs', 'js') as $type) {
+    foreach (['nojs', 'js'] as $type) {
       // Create node and prepare files for upload.
-      $node = $this->drupalCreateNode(array('type' => 'article'));
+      $node = $this->drupalCreateNode(['type' => 'article']);
       $nid = $node->id();
       $this->drupalGet("node/$nid/edit");
       $test_file_text = $this->getTestFile('text');
@@ -436,11 +436,11 @@ class FileFieldWidgetTest extends FileFieldTestBase {
           break;
         case 'js':
           $button = $this->xpath('//input[@type="submit" and @value="' . t('Upload') . '"]');
-          $this->drupalPostAjaxForm(NULL, $edit, array((string) $button[0]['name'] => (string) $button[0]['value']));
+          $this->drupalPostAjaxForm(NULL, $edit, [(string) $button[0]['name'] => (string) $button[0]['value']]);
           break;
       }
-      $error_message = t('Only files with the following extensions are allowed: %files-allowed.', array('%files-allowed' => 'txt'));
-      $this->assertRaw($error_message, t('Validation error when file with wrong extension uploaded (JSMode=%type).', array('%type' => $type)));
+      $error_message = t('Only files with the following extensions are allowed: %files-allowed.', ['%files-allowed' => 'txt']);
+      $this->assertRaw($error_message, t('Validation error when file with wrong extension uploaded (JSMode=%type).', ['%type' => $type]));
 
       // Upload file with correct extension, check that error message is removed.
       $edit[$name] = drupal_realpath($test_file_text->getFileUri());
@@ -450,10 +450,10 @@ class FileFieldWidgetTest extends FileFieldTestBase {
           break;
         case 'js':
           $button = $this->xpath('//input[@type="submit" and @value="' . t('Upload') . '"]');
-          $this->drupalPostAjaxForm(NULL, $edit, array((string) $button[0]['name'] => (string) $button[0]['value']));
+          $this->drupalPostAjaxForm(NULL, $edit, [(string) $button[0]['name'] => (string) $button[0]['value']]);
           break;
       }
-      $this->assertNoRaw($error_message, t('Validation error removed when file with correct extension uploaded (JSMode=%type).', array('%type' => $type)));
+      $this->assertNoRaw($error_message, t('Validation error removed when file with correct extension uploaded (JSMode=%type).', ['%type' => $type]));
     }
   }
 
@@ -498,11 +498,11 @@ class FileFieldWidgetTest extends FileFieldTestBase {
     $victim_user = $this->drupalCreateUser();
 
     // Create an attacker user.
-    $attacker_user = $this->drupalCreateUser(array(
+    $attacker_user = $this->drupalCreateUser([
       'access content',
       'create article content',
       'edit any article content',
-    ));
+    ]);
 
     // Log in as the attacker user.
     $this->drupalLogin($attacker_user);
@@ -522,11 +522,11 @@ class FileFieldWidgetTest extends FileFieldTestBase {
     $attacker_user = User::getAnonymousUser();
 
     // Set up permissions for anonymous attacker user.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access content' => TRUE,
       'create article content' => TRUE,
       'edit any article content' => TRUE,
-    ));
+    ]);
 
     // Log out so as to be the anonymous attacker user.
     $this->drupalLogout();
@@ -549,7 +549,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
     $this->createFileField($field_name, 'node', $type_name);
 
     $test_file = $this->getTestFile('text');
-    foreach (array('nojs', 'js') as $type) {
+    foreach (['nojs', 'js'] as $type) {
       // Create a temporary file owned by the victim user. This will be as if
       // they had uploaded the file, but not saved the node they were editing
       // or creating.
@@ -567,7 +567,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
 
       // Attach a file to a node.
       $edit['files[' . $field_name . '_0]'] = $this->container->get('file_system')->realpath($test_file->getFileUri());
-      $this->drupalPostForm(Url::fromRoute('node.add', array('node_type' => $type_name)), $edit, t('Save'));
+      $this->drupalPostForm(Url::fromRoute('node.add', ['node_type' => $type_name]), $edit, t('Save'));
       $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
 
       /** @var \Drupal\file\FileInterface $node_file */
diff --git a/web/core/modules/file/src/Tests/FileListingTest.php b/web/core/modules/file/src/Tests/FileListingTest.php
index 708f1385f..e348949a7 100644
--- a/web/core/modules/file/src/Tests/FileListingTest.php
+++ b/web/core/modules/file/src/Tests/FileListingTest.php
@@ -18,7 +18,7 @@ class FileListingTest extends FileFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('views', 'file', 'image', 'entity_test');
+  public static $modules = ['views', 'file', 'image', 'entity_test'];
 
   /**
    * An authenticated user.
@@ -30,9 +30,9 @@ class FileListingTest extends FileFieldTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('access files overview', 'bypass node access'));
+    $this->adminUser = $this->drupalCreateUser(['access files overview', 'bypass node access']);
     $this->baseUser = $this->drupalCreateUser();
-    $this->createFileField('file', 'node', 'article', array(), array('file_extensions' => 'txt png'));
+    $this->createFileField('file', 'node', 'article', [], ['file_extensions' => 'txt png']);
   }
 
   /**
@@ -59,7 +59,7 @@ class FileListingTest extends FileFieldTestBase {
   /**
    * Tests file overview with different user permissions.
    */
-  function testFileListingPages() {
+  public function testFileListingPages() {
     $file_usage = $this->container->get('file.usage');
     // Users without sufficient permissions should not see file listing.
     $this->drupalLogin($this->baseUser);
@@ -70,7 +70,7 @@ class FileListingTest extends FileFieldTestBase {
     $this->drupalLogin($this->adminUser);
 
     for ($i = 0; $i < 5; $i++) {
-      $nodes[] = $this->drupalCreateNode(array('type' => 'article'));
+      $nodes[] = $this->drupalCreateNode(['type' => 'article']);
     }
 
     $this->drupalGet('admin/content/files');
@@ -84,15 +84,15 @@ class FileListingTest extends FileFieldTestBase {
 
     $this->drupalGet('admin/content/files/usage/' . $file->id());
     $this->assertResponse(200);
-    $this->assertTitle(t('File usage information for @file | Drupal', array('@file' => $file->getFilename())));
+    $this->assertTitle(t('File usage information for @file | Drupal', ['@file' => $file->getFilename()]));
 
     foreach ($nodes as &$node) {
       $this->drupalGet('node/' . $node->id() . '/edit');
       $file = $this->getTestFile('image');
 
-      $edit = array(
+      $edit = [
         'files[file_0]' => drupal_realpath($file->getFileUri()),
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Save'));
       $node = Node::load($node->id());
     }
@@ -122,7 +122,7 @@ class FileListingTest extends FileFieldTestBase {
     $usage = $this->sumUsages($file_usage->listUsage($file));
     $this->assertRaw('admin/content/files/usage/' . $file->id() . '">' . $usage);
 
-    $result = $this->xpath("//td[contains(@class, 'views-field-status') and contains(text(), :value)]", array(':value' => t('Temporary')));
+    $result = $this->xpath("//td[contains(@class, 'views-field-status') and contains(text(), :value)]", [':value' => t('Temporary')]);
     $this->assertEqual(1, count($result), 'Unused file marked as temporary.');
 
     // Test file usage page.
@@ -148,14 +148,14 @@ class FileListingTest extends FileFieldTestBase {
   /**
    * Tests file listing usage page for entities with no canonical link template.
    */
-  function testFileListingUsageNoLink() {
+  public function testFileListingUsageNoLink() {
     // Login with user with right permissions and test listing.
     $this->drupalLogin($this->adminUser);
 
     // Create a bundle and attach a File field to the bundle.
     $bundle = $this->randomMachineName();
     entity_test_create_bundle($bundle, NULL, 'entity_test_constraints');
-    $this->createFileField('field_test_file', 'entity_test_constraints', $bundle, array(), array('file_extensions' => 'txt png'));
+    $this->createFileField('field_test_file', 'entity_test_constraints', $bundle, [], ['file_extensions' => 'txt png']);
 
     // Create file to attach to entity.
     $file = File::create([
@@ -169,18 +169,18 @@ class FileListingTest extends FileFieldTestBase {
 
     // Create entity and attach the created file.
     $entity_name = $this->randomMachineName();
-    $entity = EntityTestConstraints::create(array(
+    $entity = EntityTestConstraints::create([
       'uid' => 1,
       'name' => $entity_name,
       'type' => $bundle,
-      'field_test_file' => array(
+      'field_test_file' => [
         'target_id' => $file->id(),
-      ),
-    ));
+      ],
+    ]);
     $entity->save();
 
     // Create node entity and attach the created file.
-    $node = $this->drupalCreateNode(array('type' => 'article', 'file' => $file));
+    $node = $this->drupalCreateNode(['type' => 'article', 'file' => $file]);
     $node->save();
 
     // Load the file usage page for the created and attached file.
diff --git a/web/core/modules/file/src/Tests/FileManagedFileElementTest.php b/web/core/modules/file/src/Tests/FileManagedFileElementTest.php
index 07102a04d..8abff25e4 100644
--- a/web/core/modules/file/src/Tests/FileManagedFileElementTest.php
+++ b/web/core/modules/file/src/Tests/FileManagedFileElementTest.php
@@ -13,7 +13,7 @@ class FileManagedFileElementTest extends FileFieldTestBase {
   /**
    * Tests the managed_file element type.
    */
-  function testManagedFile() {
+  public function testManagedFile() {
     // Check that $element['#size'] is passed to the child upload element.
     $this->drupalGet('file/test');
     $this->assertFieldByXpath('//input[@name="files[nested_file]" and @size="13"]', NULL, 'The custom #size attribute is passed to the child upload element.');
@@ -21,16 +21,16 @@ class FileManagedFileElementTest extends FileFieldTestBase {
     // Perform the tests with all permutations of $form['#tree'],
     // $element['#extended'], and $element['#multiple'].
     $test_file = $this->getTestFile('text');
-    foreach (array(0, 1) as $tree) {
-      foreach (array(0, 1) as $extended) {
-        foreach (array(0, 1) as $multiple) {
+    foreach ([0, 1] as $tree) {
+      foreach ([0, 1] as $extended) {
+        foreach ([0, 1] as $multiple) {
           $path = 'file/test/' . $tree . '/' . $extended . '/' . $multiple;
           $input_base_name = $tree ? 'nested_file' : 'file';
           $file_field_name = $multiple ? 'files[' . $input_base_name . '][]' : 'files[' . $input_base_name . ']';
 
           // Submit without a file.
-          $this->drupalPostForm($path, array(), t('Save'));
-          $this->assertRaw(t('The file ids are %fids.', array('%fids' => implode(',', array()))), 'Submitted without a file.');
+          $this->drupalPostForm($path, [], t('Save'));
+          $this->assertRaw(t('The file ids are %fids.', ['%fids' => implode(',', [])]), 'Submitted without a file.');
 
           // Submit with a file, but with an invalid form token. Ensure the file
           // was not saved.
@@ -46,22 +46,22 @@ class FileManagedFileElementTest extends FileFieldTestBase {
 
           // Submit a new file, without using the Upload button.
           $last_fid_prior = $this->getLastFileId();
-          $edit = array($file_field_name => drupal_realpath($test_file->getFileUri()));
+          $edit = [$file_field_name => drupal_realpath($test_file->getFileUri())];
           $this->drupalPostForm($path, $edit, t('Save'));
           $last_fid = $this->getLastFileId();
           $this->assertTrue($last_fid > $last_fid_prior, 'New file got saved.');
-          $this->assertRaw(t('The file ids are %fids.', array('%fids' => implode(',', array($last_fid)))), 'Submit handler has correct file info.');
+          $this->assertRaw(t('The file ids are %fids.', ['%fids' => implode(',', [$last_fid])]), 'Submit handler has correct file info.');
 
           // Submit no new input, but with a default file.
-          $this->drupalPostForm($path . '/' . $last_fid, array(), t('Save'));
-          $this->assertRaw(t('The file ids are %fids.', array('%fids' => implode(',', array($last_fid)))), 'Empty submission did not change an existing file.');
+          $this->drupalPostForm($path . '/' . $last_fid, [], t('Save'));
+          $this->assertRaw(t('The file ids are %fids.', ['%fids' => implode(',', [$last_fid])]), 'Empty submission did not change an existing file.');
 
           // Now, test the Upload and Remove buttons, with and without Ajax.
-          foreach (array(FALSE, TRUE) as $ajax) {
+          foreach ([FALSE, TRUE] as $ajax) {
             // Upload, then Submit.
             $last_fid_prior = $this->getLastFileId();
             $this->drupalGet($path);
-            $edit = array($file_field_name => drupal_realpath($test_file->getFileUri()));
+            $edit = [$file_field_name => drupal_realpath($test_file->getFileUri())];
             if ($ajax) {
               $this->drupalPostAjaxForm(NULL, $edit, $input_base_name . '_upload_button');
             }
@@ -70,15 +70,15 @@ class FileManagedFileElementTest extends FileFieldTestBase {
             }
             $last_fid = $this->getLastFileId();
             $this->assertTrue($last_fid > $last_fid_prior, 'New file got uploaded.');
-            $this->drupalPostForm(NULL, array(), t('Save'));
-            $this->assertRaw(t('The file ids are %fids.', array('%fids' => implode(',', array($last_fid)))), 'Submit handler has correct file info.');
+            $this->drupalPostForm(NULL, [], t('Save'));
+            $this->assertRaw(t('The file ids are %fids.', ['%fids' => implode(',', [$last_fid])]), 'Submit handler has correct file info.');
 
             // Remove, then Submit.
             $remove_button_title = $multiple ? t('Remove selected') : t('Remove');
-            $remove_edit = array();
+            $remove_edit = [];
             if ($multiple) {
               $selected_checkbox = ($tree ? 'nested[file]' : 'file') . '[file_' . $last_fid . '][selected]';
-              $remove_edit = array($selected_checkbox => '1');
+              $remove_edit = [$selected_checkbox => '1'];
             }
             $this->drupalGet($path . '/' . $last_fid);
             if ($ajax) {
@@ -87,22 +87,22 @@ class FileManagedFileElementTest extends FileFieldTestBase {
             else {
               $this->drupalPostForm(NULL, $remove_edit, $remove_button_title);
             }
-            $this->drupalPostForm(NULL, array(), t('Save'));
-            $this->assertRaw(t('The file ids are %fids.', array('%fids' => '')), 'Submission after file removal was successful.');
+            $this->drupalPostForm(NULL, [], t('Save'));
+            $this->assertRaw(t('The file ids are %fids.', ['%fids' => '']), 'Submission after file removal was successful.');
 
             // Upload, then Remove, then Submit.
             $this->drupalGet($path);
-            $edit = array($file_field_name => drupal_realpath($test_file->getFileUri()));
+            $edit = [$file_field_name => drupal_realpath($test_file->getFileUri())];
             if ($ajax) {
               $this->drupalPostAjaxForm(NULL, $edit, $input_base_name . '_upload_button');
             }
             else {
               $this->drupalPostForm(NULL, $edit, t('Upload'));
             }
-            $remove_edit = array();
+            $remove_edit = [];
             if ($multiple) {
               $selected_checkbox = ($tree ? 'nested[file]' : 'file') . '[file_' . $this->getLastFileId() . '][selected]';
-              $remove_edit = array($selected_checkbox => '1');
+              $remove_edit = [$selected_checkbox => '1'];
             }
             if ($ajax) {
               $this->drupalPostAjaxForm(NULL, $remove_edit, $input_base_name . '_remove_button');
@@ -111,8 +111,8 @@ class FileManagedFileElementTest extends FileFieldTestBase {
               $this->drupalPostForm(NULL, $remove_edit, $remove_button_title);
             }
 
-            $this->drupalPostForm(NULL, array(), t('Save'));
-            $this->assertRaw(t('The file ids are %fids.', array('%fids' => '')), 'Submission after file upload and removal was successful.');
+            $this->drupalPostForm(NULL, [], t('Save'));
+            $this->assertRaw(t('The file ids are %fids.', ['%fids' => '']), 'Submission after file upload and removal was successful.');
           }
         }
       }
@@ -120,8 +120,8 @@ class FileManagedFileElementTest extends FileFieldTestBase {
 
     // The multiple file upload has additional conditions that need checking.
     $path = 'file/test/1/1/1';
-    $edit = array('files[nested_file][]' => drupal_realpath($test_file->getFileUri()));
-    $fid_list = array();
+    $edit = ['files[nested_file][]' => drupal_realpath($test_file->getFileUri())];
+    $fid_list = [];
 
     $this->drupalGet($path);
 
@@ -136,13 +136,13 @@ class FileManagedFileElementTest extends FileFieldTestBase {
     $this->assertFieldByXpath('//input[@name="nested[file][file_' . $fid_list[1] . '][selected]"]', NULL, 'Second file successfully uploaded to multiple file element.');
 
     // Save the entire form.
-    $this->drupalPostForm(NULL, array(), t('Save'));
-    $this->assertRaw(t('The file ids are %fids.', array('%fids' => implode(',', $fid_list))), 'Two files saved into a single multiple file element.');
+    $this->drupalPostForm(NULL, [], t('Save'));
+    $this->assertRaw(t('The file ids are %fids.', ['%fids' => implode(',', $fid_list)]), 'Two files saved into a single multiple file element.');
 
     // Delete only the first file.
-    $edit = array(
+    $edit = [
       'nested[file][file_' . $fid_list[0] . '][selected]' => '1',
-    );
+    ];
     $this->drupalPostForm($path . '/' . implode(',', $fid_list), $edit, t('Remove selected'));
 
     // Check that the first file has been deleted but not the second.
@@ -181,7 +181,7 @@ class FileManagedFileElementTest extends FileFieldTestBase {
 
     $edit = [$file_field_name => drupal_realpath($test_file->getFileUri())];
     $this->drupalPostForm(NULL, $edit, t('Upload'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $fid = $this->getLastFileId();
     /** @var $file \Drupal\file\FileInterface */
diff --git a/web/core/modules/file/src/Tests/FileManagedTestBase.php b/web/core/modules/file/src/Tests/FileManagedTestBase.php
index a6e94faf3..879e1c4e9 100644
--- a/web/core/modules/file/src/Tests/FileManagedTestBase.php
+++ b/web/core/modules/file/src/Tests/FileManagedTestBase.php
@@ -9,6 +9,9 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Base class for file tests that use the file_test module to test uploads and
  * hooks.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\file\Functional\FileManagedTestBase instead.
  */
 abstract class FileManagedTestBase extends WebTestBase {
 
@@ -17,7 +20,7 @@ abstract class FileManagedTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('file_test', 'file');
+  public static $modules = ['file_test', 'file'];
 
   protected function setUp() {
     parent::setUp();
@@ -33,7 +36,7 @@ abstract class FileManagedTestBase extends WebTestBase {
    *   An array of strings containing with the hook name; for example, 'load',
    *   'save', 'insert', etc.
    */
-  function assertFileHooksCalled($expected) {
+  public function assertFileHooksCalled($expected) {
     \Drupal::state()->resetCache();
 
     // Determine which hooks were called.
@@ -42,16 +45,16 @@ abstract class FileManagedTestBase extends WebTestBase {
     // Determine if there were any expected that were not called.
     $uncalled = array_diff($expected, $actual);
     if (count($uncalled)) {
-      $this->assertTrue(FALSE, format_string('Expected hooks %expected to be called but %uncalled was not called.', array('%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled))));
+      $this->assertTrue(FALSE, format_string('Expected hooks %expected to be called but %uncalled was not called.', ['%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled)]));
     }
     else {
-      $this->assertTrue(TRUE, format_string('All the expected hooks were called: %expected', array('%expected' => empty($expected) ? '(none)' : implode(', ', $expected))));
+      $this->assertTrue(TRUE, format_string('All the expected hooks were called: %expected', ['%expected' => empty($expected) ? '(none)' : implode(', ', $expected)]));
     }
 
     // Determine if there were any unexpected calls.
     $unexpected = array_diff($actual, $expected);
     if (count($unexpected)) {
-      $this->assertTrue(FALSE, format_string('Unexpected hooks were called: %unexpected.', array('%unexpected' => empty($unexpected) ? '(none)' : implode(', ', $unexpected))));
+      $this->assertTrue(FALSE, format_string('Unexpected hooks were called: %unexpected.', ['%unexpected' => empty($unexpected) ? '(none)' : implode(', ', $unexpected)]));
     }
     else {
       $this->assertTrue(TRUE, 'No unexpected hooks were called.');
@@ -68,18 +71,18 @@ abstract class FileManagedTestBase extends WebTestBase {
    * @param string|null $message
    *   Optional translated string message.
    */
-  function assertFileHookCalled($hook, $expected_count = 1, $message = NULL) {
+  public function assertFileHookCalled($hook, $expected_count = 1, $message = NULL) {
     $actual_count = count(file_test_get_calls($hook));
 
     if (!isset($message)) {
       if ($actual_count == $expected_count) {
-        $message = format_string('hook_file_@name was called correctly.', array('@name' => $hook));
+        $message = format_string('hook_file_@name was called correctly.', ['@name' => $hook]);
       }
       elseif ($expected_count == 0) {
-        $message = \Drupal::translation()->formatPlural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', array('@name' => $hook, '@count' => $actual_count));
+        $message = \Drupal::translation()->formatPlural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', ['@name' => $hook, '@count' => $actual_count]);
       }
       else {
-        $message = format_string('hook_file_@name was expected to be called %expected times but was called %actual times.', array('@name' => $hook, '%expected' => $expected_count, '%actual' => $actual_count));
+        $message = format_string('hook_file_@name was expected to be called %expected times but was called %actual times.', ['@name' => $hook, '%expected' => $expected_count, '%actual' => $actual_count]);
       }
     }
     $this->assertEqual($actual_count, $expected_count, $message);
@@ -93,14 +96,14 @@ abstract class FileManagedTestBase extends WebTestBase {
    * @param \Drupal\file\FileInterface $after
    *   File object to compare.
    */
-  function assertFileUnchanged(FileInterface $before, FileInterface $after) {
-    $this->assertEqual($before->id(), $after->id(), t('File id is the same: %file1 == %file2.', array('%file1' => $before->id(), '%file2' => $after->id())), 'File unchanged');
-    $this->assertEqual($before->getOwner()->id(), $after->getOwner()->id(), t('File owner is the same: %file1 == %file2.', array('%file1' => $before->getOwner()->id(), '%file2' => $after->getOwner()->id())), 'File unchanged');
-    $this->assertEqual($before->getFilename(), $after->getFilename(), t('File name is the same: %file1 == %file2.', array('%file1' => $before->getFilename(), '%file2' => $after->getFilename())), 'File unchanged');
-    $this->assertEqual($before->getFileUri(), $after->getFileUri(), t('File path is the same: %file1 == %file2.', array('%file1' => $before->getFileUri(), '%file2' => $after->getFileUri())), 'File unchanged');
-    $this->assertEqual($before->getMimeType(), $after->getMimeType(), t('File MIME type is the same: %file1 == %file2.', array('%file1' => $before->getMimeType(), '%file2' => $after->getMimeType())), 'File unchanged');
-    $this->assertEqual($before->getSize(), $after->getSize(), t('File size is the same: %file1 == %file2.', array('%file1' => $before->getSize(), '%file2' => $after->getSize())), 'File unchanged');
-    $this->assertEqual($before->isPermanent(), $after->isPermanent(), t('File status is the same: %file1 == %file2.', array('%file1' => $before->isPermanent(), '%file2' => $after->isPermanent())), 'File unchanged');
+  public function assertFileUnchanged(FileInterface $before, FileInterface $after) {
+    $this->assertEqual($before->id(), $after->id(), t('File id is the same: %file1 == %file2.', ['%file1' => $before->id(), '%file2' => $after->id()]), 'File unchanged');
+    $this->assertEqual($before->getOwner()->id(), $after->getOwner()->id(), t('File owner is the same: %file1 == %file2.', ['%file1' => $before->getOwner()->id(), '%file2' => $after->getOwner()->id()]), 'File unchanged');
+    $this->assertEqual($before->getFilename(), $after->getFilename(), t('File name is the same: %file1 == %file2.', ['%file1' => $before->getFilename(), '%file2' => $after->getFilename()]), 'File unchanged');
+    $this->assertEqual($before->getFileUri(), $after->getFileUri(), t('File path is the same: %file1 == %file2.', ['%file1' => $before->getFileUri(), '%file2' => $after->getFileUri()]), 'File unchanged');
+    $this->assertEqual($before->getMimeType(), $after->getMimeType(), t('File MIME type is the same: %file1 == %file2.', ['%file1' => $before->getMimeType(), '%file2' => $after->getMimeType()]), 'File unchanged');
+    $this->assertEqual($before->getSize(), $after->getSize(), t('File size is the same: %file1 == %file2.', ['%file1' => $before->getSize(), '%file2' => $after->getSize()]), 'File unchanged');
+    $this->assertEqual($before->isPermanent(), $after->isPermanent(), t('File status is the same: %file1 == %file2.', ['%file1' => $before->isPermanent(), '%file2' => $after->isPermanent()]), 'File unchanged');
   }
 
   /**
@@ -111,9 +114,9 @@ abstract class FileManagedTestBase extends WebTestBase {
    * @param \Drupal\file\FileInterface $file2
    *   File object to compare.
    */
-  function assertDifferentFile(FileInterface $file1, FileInterface $file2) {
-    $this->assertNotEqual($file1->id(), $file2->id(), t('Files have different ids: %file1 != %file2.', array('%file1' => $file1->id(), '%file2' => $file2->id())), 'Different file');
-    $this->assertNotEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have different paths: %file1 != %file2.', array('%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri())), 'Different file');
+  public function assertDifferentFile(FileInterface $file1, FileInterface $file2) {
+    $this->assertNotEqual($file1->id(), $file2->id(), t('Files have different ids: %file1 != %file2.', ['%file1' => $file1->id(), '%file2' => $file2->id()]), 'Different file');
+    $this->assertNotEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have different paths: %file1 != %file2.', ['%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri()]), 'Different file');
   }
 
   /**
@@ -124,9 +127,9 @@ abstract class FileManagedTestBase extends WebTestBase {
    * @param \Drupal\file\FileInterface $file2
    *   File object to compare.
    */
-  function assertSameFile(FileInterface $file1, FileInterface $file2) {
-    $this->assertEqual($file1->id(), $file2->id(), t('Files have the same ids: %file1 == %file2.', array('%file1' => $file1->id(), '%file2-fid' => $file2->id())), 'Same file');
-    $this->assertEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have the same path: %file1 == %file2.', array('%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri())), 'Same file');
+  public function assertSameFile(FileInterface $file1, FileInterface $file2) {
+    $this->assertEqual($file1->id(), $file2->id(), t('Files have the same ids: %file1 == %file2.', ['%file1' => $file1->id(), '%file2-fid' => $file2->id()]), 'Same file');
+    $this->assertEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have the same path: %file1 == %file2.', ['%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri()]), 'Same file');
   }
 
   /**
@@ -145,7 +148,7 @@ abstract class FileManagedTestBase extends WebTestBase {
    * @return \Drupal\file\FileInterface
    *   File entity.
    */
-  function createFile($filepath = NULL, $contents = NULL, $scheme = NULL) {
+  public function createFile($filepath = NULL, $contents = NULL, $scheme = NULL) {
     // Don't count hook invocations caused by creating the file.
     \Drupal::state()->set('file_test.count_hook_invocations', FALSE);
     $file = File::create([
@@ -177,7 +180,7 @@ abstract class FileManagedTestBase extends WebTestBase {
    * @return string
    *   File URI.
    */
-  function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
+  public function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
     if (!isset($filepath)) {
       // Prefix with non-latin characters to ensure that all file-related
       // tests work with international filenames.
diff --git a/web/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php b/web/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
index 7987bcf34..5f1e7073d 100644
--- a/web/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
+++ b/web/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
@@ -14,7 +14,7 @@ class FileOnTranslatedEntityTest extends FileFieldTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('language', 'content_translation');
+  public static $modules = ['language', 'content_translation'];
 
   /**
    * The name of the file field used in the test.
@@ -39,7 +39,7 @@ class FileOnTranslatedEntityTest extends FileFieldTestBase {
     $this->createFileField($this->fieldName, 'node', 'page');
 
     // Create and log in user.
-    $permissions = array(
+    $permissions = [
       'access administration pages',
       'administer content translation',
       'administer content types',
@@ -49,25 +49,25 @@ class FileOnTranslatedEntityTest extends FileFieldTestBase {
       'edit any page content',
       'translate any entity',
       'delete any page content',
-    );
+    ];
     $admin_user = $this->drupalCreateUser($permissions);
     $this->drupalLogin($admin_user);
 
     // Add a second and third language.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'fr';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'nl';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Enable translation for "Basic page" nodes.
-    $edit = array(
+    $edit = [
       'entity_types[node]' => 1,
       'settings[node][page][translatable]' => 1,
       "settings[node][page][fields][$this->fieldName]" => 1,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
     \Drupal::entityManager()->clearCachedDefinitions();
   }
@@ -81,20 +81,20 @@ class FileOnTranslatedEntityTest extends FileFieldTestBase {
     $this->assertTrue($definitions[$this->fieldName]->isTranslatable(), 'Node file field is translatable.');
 
     // Create a default language node.
-    $default_language_node = $this->drupalCreateNode(array('type' => 'page', 'title' => 'Lost in translation'));
+    $default_language_node = $this->drupalCreateNode(['type' => 'page', 'title' => 'Lost in translation']);
 
     // Edit the node to upload a file.
-    $edit = array();
+    $edit = [];
     $name = 'files[' . $this->fieldName . '_0]';
     $edit[$name] = drupal_realpath($this->drupalGetTestFiles('text')[0]->uri);
     $this->drupalPostForm('node/' . $default_language_node->id() . '/edit', $edit, t('Save'));
     $first_fid = $this->getLastFileId();
 
     // Translate the node into French: remove the existing file.
-    $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/fr', array(), t('Remove'));
+    $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/fr', [], t('Remove'));
 
     // Upload a different file.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = 'Bill Murray';
     $name = 'files[' . $this->fieldName . '_0]';
     $edit[$name] = drupal_realpath($this->drupalGetTestFiles('text')[1]->uri);
@@ -117,10 +117,10 @@ class FileOnTranslatedEntityTest extends FileFieldTestBase {
     $this->assertTrue($file->isPermanent());
 
     // Translate the node into dutch: remove the existing file.
-    $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/nl', array(), t('Remove'));
+    $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/nl', [], t('Remove'));
 
     // Upload a different file.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = 'Scarlett Johansson';
     $name = 'files[' . $this->fieldName . '_0]';
     $edit[$name] = drupal_realpath($this->drupalGetTestFiles('text')[2]->uri);
@@ -145,10 +145,10 @@ class FileOnTranslatedEntityTest extends FileFieldTestBase {
     $this->assertTrue($file->isPermanent());
 
     // Edit the second translation: remove the existing file.
-    $this->drupalPostForm('fr/node/' . $default_language_node->id() . '/edit', array(), t('Remove'));
+    $this->drupalPostForm('fr/node/' . $default_language_node->id() . '/edit', [], t('Remove'));
 
     // Upload a different file.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = 'David Bowie';
     $name = 'files[' . $this->fieldName . '_0]';
     $edit[$name] = drupal_realpath($this->drupalGetTestFiles('text')[3]->uri);
@@ -169,7 +169,7 @@ class FileOnTranslatedEntityTest extends FileFieldTestBase {
     $this->assertTrue($file->isPermanent());
 
     // Delete the third translation.
-    $this->drupalPostForm('nl/node/' . $default_language_node->id() . '/delete', array(), t('Delete Dutch translation'));
+    $this->drupalPostForm('nl/node/' . $default_language_node->id() . '/delete', [], t('Delete Dutch translation'));
 
     \Drupal::entityTypeManager()->getStorage('file')->resetCache();
 
@@ -185,7 +185,7 @@ class FileOnTranslatedEntityTest extends FileFieldTestBase {
     $this->assertTrue($file->isTemporary());
 
     // Delete the all translations.
-    $this->drupalPostForm('node/' . $default_language_node->id() . '/delete', array(), t('Delete all translations'));
+    $this->drupalPostForm('node/' . $default_language_node->id() . '/delete', [], t('Delete all translations'));
 
     \Drupal::entityTypeManager()->getStorage('file')->resetCache();
 
diff --git a/web/core/modules/file/src/Tests/FilePrivateTest.php b/web/core/modules/file/src/Tests/FilePrivateTest.php
index 2705ef205..3c9776fb7 100644
--- a/web/core/modules/file/src/Tests/FilePrivateTest.php
+++ b/web/core/modules/file/src/Tests/FilePrivateTest.php
@@ -19,7 +19,7 @@ class FilePrivateTest extends FileFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_access_test', 'field_test');
+  public static $modules = ['node_access_test', 'field_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -31,15 +31,15 @@ class FilePrivateTest extends FileFieldTestBase {
   /**
    * Tests file access for file uploaded to a private node.
    */
-  function testPrivateFile() {
+  public function testPrivateFile() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $type_name = 'article';
     $field_name = strtolower($this->randomMachineName());
-    $this->createFileField($field_name, 'node', $type_name, array('uri_scheme' => 'private'));
+    $this->createFileField($field_name, 'node', $type_name, ['uri_scheme' => 'private']);
 
     $test_file = $this->getTestFile('text');
-    $nid = $this->uploadNodeFile($test_file, $field_name, $type_name, TRUE, array('private' => TRUE));
-    \Drupal::entityManager()->getStorage('node')->resetCache(array($nid));
+    $nid = $this->uploadNodeFile($test_file, $field_name, $type_name, TRUE, ['private' => TRUE]);
+    \Drupal::entityManager()->getStorage('node')->resetCache([$nid]);
     /* @var \Drupal\node\NodeInterface $node */
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$field_name}->target_id);
@@ -56,11 +56,11 @@ class FilePrivateTest extends FileFieldTestBase {
     // Create a field with no view access. See
     // field_test_entity_field_access().
     $no_access_field_name = 'field_no_view_access';
-    $this->createFileField($no_access_field_name, 'node', $type_name, array('uri_scheme' => 'private'));
+    $this->createFileField($no_access_field_name, 'node', $type_name, ['uri_scheme' => 'private']);
     // Test with the field that should deny access through field access.
     $this->drupalLogin($this->adminUser);
-    $nid = $this->uploadNodeFile($test_file, $no_access_field_name, $type_name, TRUE, array('private' => TRUE));
-    \Drupal::entityManager()->getStorage('node')->resetCache(array($nid));
+    $nid = $this->uploadNodeFile($test_file, $no_access_field_name, $type_name, TRUE, ['private' => TRUE]);
+    \Drupal::entityManager()->getStorage('node')->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $node_file = File::load($node->{$no_access_field_name}->target_id);
 
@@ -70,7 +70,7 @@ class FilePrivateTest extends FileFieldTestBase {
     $this->assertResponse(403, 'Confirmed that access is denied for the file without view field access permission.');
 
     // Attempt to reuse the file when editing a node.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $this->drupalPostForm('node/add/' . $type_name, $edit, t('Save and publish'));
     $new_node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
@@ -80,17 +80,17 @@ class FilePrivateTest extends FileFieldTestBase {
     $this->assertUrl('node/' . $new_node->id() . '/edit');
     // Check that we got the expected constraint form error.
     $constraint = new ReferenceAccessConstraint();
-    $this->assertRaw(SafeMarkup::format($constraint->message, array('%type' => 'file', '%id' => $node_file->id())));
+    $this->assertRaw(SafeMarkup::format($constraint->message, ['%type' => 'file', '%id' => $node_file->id()]));
     // Attempt to reuse the existing file when creating a new node, and confirm
     // that access is still denied.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $edit[$field_name . '[0][fids]'] = $node_file->id();
     $this->drupalPostForm('node/add/' . $type_name, $edit, t('Save and publish'));
     $new_node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
     $this->assertTrue(empty($new_node), 'Node was not created.');
     $this->assertUrl('node/add/' . $type_name);
-    $this->assertRaw(SafeMarkup::format($constraint->message, array('%type' => 'file', '%id' => $node_file->id())));
+    $this->assertRaw(SafeMarkup::format($constraint->message, ['%type' => 'file', '%id' => $node_file->id()]));
 
     // Now make file_test_file_download() return everything.
     \Drupal::state()->set('file_test.allow_all', TRUE);
diff --git a/web/core/modules/file/src/Tests/FileTokenReplaceTest.php b/web/core/modules/file/src/Tests/FileTokenReplaceTest.php
index dfb9e51d4..5bfa07b9a 100644
--- a/web/core/modules/file/src/Tests/FileTokenReplaceTest.php
+++ b/web/core/modules/file/src/Tests/FileTokenReplaceTest.php
@@ -16,7 +16,7 @@ class FileTokenReplaceTest extends FileFieldTestBase {
   /**
    * Creates a file, then tests the tokens generated from it.
    */
-  function testFileTokenReplacement() {
+  public function testFileTokenReplacement() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $token_service = \Drupal::token();
     $language_interface = \Drupal::languageManager()->getCurrentLanguage();
@@ -35,12 +35,12 @@ class FileTokenReplaceTest extends FileFieldTestBase {
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
 
     // Load the node and the file.
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $file = File::load($node->{$field_name}->target_id);
 
     // Generate and test sanitized tokens.
-    $tests = array();
+    $tests = [];
     $tests['[file:fid]'] = $file->id();
     $tests['[file:name]'] = Html::escape($file->getFilename());
     $tests['[file:path]'] = Html::escape($file->getFileUri());
@@ -77,8 +77,8 @@ class FileTokenReplaceTest extends FileFieldTestBase {
 
     foreach ($tests as $input => $expected) {
       $bubbleable_metadata = new BubbleableMetadata();
-      $output = $token_service->replace($input, array('file' => $file), array('langcode' => $language_interface->getId()), $bubbleable_metadata);
-      $this->assertEqual($output, $expected, format_string('Sanitized file token %token replaced.', array('%token' => $input)));
+      $output = $token_service->replace($input, ['file' => $file], ['langcode' => $language_interface->getId()], $bubbleable_metadata);
+      $this->assertEqual($output, $expected, format_string('Sanitized file token %token replaced.', ['%token' => $input]));
       $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
 
@@ -89,8 +89,8 @@ class FileTokenReplaceTest extends FileFieldTestBase {
     $tests['[file:size]'] = format_size($file->getSize());
 
     foreach ($tests as $input => $expected) {
-      $output = $token_service->replace($input, array('file' => $file), array('langcode' => $language_interface->getId(), 'sanitize' => FALSE));
-      $this->assertEqual($output, $expected, format_string('Unsanitized file token %token replaced.', array('%token' => $input)));
+      $output = $token_service->replace($input, ['file' => $file], ['langcode' => $language_interface->getId(), 'sanitize' => FALSE]);
+      $this->assertEqual($output, $expected, format_string('Unsanitized file token %token replaced.', ['%token' => $input]));
     }
   }
 
diff --git a/web/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php b/web/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
index 15039edcb..da5abb5bd 100644
--- a/web/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
+++ b/web/core/modules/file/src/Tests/PrivateFileOnTranslatedEntityTest.php
@@ -15,7 +15,7 @@ class PrivateFileOnTranslatedEntityTest extends FileFieldTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('language', 'content_translation');
+  public static $modules = ['language', 'content_translation'];
 
   /**
    * The name of the file field used in the test.
@@ -31,14 +31,14 @@ class PrivateFileOnTranslatedEntityTest extends FileFieldTestBase {
     parent::setUp();
 
     // Create the "Basic page" node type.
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
     // Create a file field on the "Basic page" node type.
     $this->fieldName = strtolower($this->randomMachineName());
-    $this->createFileField($this->fieldName, 'node', 'page', array('uri_scheme' => 'private'));
+    $this->createFileField($this->fieldName, 'node', 'page', ['uri_scheme' => 'private']);
 
     // Create and log in user.
-    $permissions = array(
+    $permissions = [
       'access administration pages',
       'administer content translation',
       'administer content types',
@@ -47,21 +47,21 @@ class PrivateFileOnTranslatedEntityTest extends FileFieldTestBase {
       'create page content',
       'edit any page content',
       'translate any entity',
-    );
+    ];
     $admin_user = $this->drupalCreateUser($permissions);
     $this->drupalLogin($admin_user);
 
     // Add a second language.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'fr';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Enable translation for "Basic page" nodes.
-    $edit = array(
+    $edit = [
       'entity_types[node]' => 1,
       'settings[node][page][translatable]' => 1,
       "settings[node][page][fields][$this->fieldName]" => 1,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
     \Drupal::entityManager()->clearCachedDefinitions();
   }
@@ -75,10 +75,10 @@ class PrivateFileOnTranslatedEntityTest extends FileFieldTestBase {
     $this->assertTrue($definitions[$this->fieldName]->isTranslatable(), 'Node file field is translatable.');
 
     // Create a default language node.
-    $default_language_node = $this->drupalCreateNode(array('type' => 'page'));
+    $default_language_node = $this->drupalCreateNode(['type' => 'page']);
 
     // Edit the node to upload a file.
-    $edit = array();
+    $edit = [];
     $name = 'files[' . $this->fieldName . '_0]';
     $edit[$name] = drupal_realpath($this->drupalGetTestFiles('text')[0]->uri);
     $this->drupalPostForm('node/' . $default_language_node->id() . '/edit', $edit, t('Save'));
@@ -88,7 +88,7 @@ class PrivateFileOnTranslatedEntityTest extends FileFieldTestBase {
     $this->rebuildContainer();
 
     // Ensure the file can be downloaded.
-    \Drupal::entityManager()->getStorage('node')->resetCache(array($default_language_node->id()));
+    \Drupal::entityManager()->getStorage('node')->resetCache([$default_language_node->id()]);
     $node = Node::load($default_language_node->id());
     $node_file = File::load($node->{$this->fieldName}->target_id);
     $this->drupalGet(file_create_url($node_file->getFileUri()));
@@ -99,10 +99,10 @@ class PrivateFileOnTranslatedEntityTest extends FileFieldTestBase {
     $this->clickLink(t('Add'));
 
     // Remove the existing file.
-    $this->drupalPostForm(NULL, array(), t('Remove'));
+    $this->drupalPostForm(NULL, [], t('Remove'));
 
     // Upload a different file.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $name = 'files[' . $this->fieldName . '_0]';
     $edit[$name] = drupal_realpath($this->drupalGetTestFiles('text')[1]->uri);
@@ -110,7 +110,7 @@ class PrivateFileOnTranslatedEntityTest extends FileFieldTestBase {
     $last_fid = $this->getLastFileId();
 
     // Verify the translation was created.
-    \Drupal::entityManager()->getStorage('node')->resetCache(array($default_language_node->id()));
+    \Drupal::entityManager()->getStorage('node')->resetCache([$default_language_node->id()]);
     $default_language_node = Node::load($default_language_node->id());
     $this->assertTrue($default_language_node->hasTranslation('fr'), 'Node found in database.');
     $this->assertTrue($last_fid > $last_fid_prior, 'New file got saved.');
diff --git a/web/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php b/web/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
index b1ee6a65d..d468ed326 100644
--- a/web/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
+++ b/web/core/modules/file/src/Tests/RemoteFileSaveUploadTest.php
@@ -14,7 +14,7 @@ class RemoteFileSaveUploadTest extends SaveUploadTest {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   protected function setUp() {
     parent::setUp();
diff --git a/web/core/modules/file/src/Tests/SaveUploadTest.php b/web/core/modules/file/src/Tests/SaveUploadTest.php
index 3aaa5cff0..a9f69c2fb 100644
--- a/web/core/modules/file/src/Tests/SaveUploadTest.php
+++ b/web/core/modules/file/src/Tests/SaveUploadTest.php
@@ -15,7 +15,7 @@ class SaveUploadTest extends FileManagedTestBase {
    *
    * @var array
    */
-  public static $modules = array('dblog');
+  public static $modules = ['dblog'];
 
   /**
    * An image file path for uploading.
@@ -43,7 +43,7 @@ class SaveUploadTest extends FileManagedTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $account = $this->drupalCreateUser(array('access site reports'));
+    $account = $this->drupalCreateUser(['access site reports']);
     $this->drupalLogin($account);
 
     $image_files = $this->drupalGetTestFiles('image');
@@ -58,24 +58,24 @@ class SaveUploadTest extends FileManagedTestBase {
     $this->maxFidBefore = db_query('SELECT MAX(fid) AS fid FROM {file_managed}')->fetchField();
 
     // Upload with replace to guarantee there's something there.
-    $edit = array(
+    $edit = [
       'file_test_replace' => FILE_EXISTS_REPLACE,
       'files[file_test_upload]' => drupal_realpath($this->image->getFileUri()),
-    );
+    ];
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
     $this->assertRaw(t('You WIN!'), 'Found the success message.');
 
     // Check that the correct hooks were called then clean out the hook
     // counters.
-    $this->assertFileHooksCalled(array('validate', 'insert'));
+    $this->assertFileHooksCalled(['validate', 'insert']);
     file_test_reset();
   }
 
   /**
    * Test the file_save_upload() function.
    */
-  function testNormal() {
+  public function testNormal() {
     $max_fid_after = db_query('SELECT MAX(fid) AS fid FROM {file_managed}')->fetchField();
     $this->assertTrue($max_fid_after > $this->maxFidBefore, 'A new file was created.');
     $file1 = File::load($max_fid_after);
@@ -88,14 +88,14 @@ class SaveUploadTest extends FileManagedTestBase {
 
     // Upload a second file.
     $image2 = current($this->drupalGetTestFiles('image'));
-    $edit = array('files[file_test_upload]' => drupal_realpath($image2->uri));
+    $edit = ['files[file_test_upload]' => drupal_realpath($image2->uri)];
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
     $this->assertRaw(t('You WIN!'));
     $max_fid_after = db_query('SELECT MAX(fid) AS fid FROM {file_managed}')->fetchField();
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('validate', 'insert'));
+    $this->assertFileHooksCalled(['validate', 'insert']);
 
     $file2 = File::load($max_fid_after);
     $this->assertTrue($file2, 'Loaded the file');
@@ -103,7 +103,7 @@ class SaveUploadTest extends FileManagedTestBase {
     $this->assertEqual(substr($file2->getMimeType(), 0, 5), 'image', 'A MIME type was set.');
 
     // Load both files using File::loadMultiple().
-    $files = File::loadMultiple(array($file1->id(), $file2->id()));
+    $files = File::loadMultiple([$file1->id(), $file2->id()]);
     $this->assertTrue(isset($files[$file1->id()]), 'File was loaded successfully');
     $this->assertTrue(isset($files[$file2->id()]), 'File was loaded successfully');
 
@@ -111,10 +111,10 @@ class SaveUploadTest extends FileManagedTestBase {
     $image3 = current($this->drupalGetTestFiles('image'));
     $image3_realpath = drupal_realpath($image3->uri);
     $dir = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'files[file_test_upload]' => $image3_realpath,
       'file_subdir' => $dir,
-    );
+    ];
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
     $this->assertRaw(t('You WIN!'));
@@ -124,17 +124,17 @@ class SaveUploadTest extends FileManagedTestBase {
   /**
    * Test extension handling.
    */
-  function testHandleExtension() {
+  public function testHandleExtension() {
     // The file being tested is a .gif which is in the default safe list
     // of extensions to allow when the extension validator isn't used. This is
     // implicitly tested at the testNormal() test. Here we tell
     // file_save_upload() to only allow ".foo".
     $extensions = 'foo';
-    $edit = array(
+    $edit = [
       'file_test_replace' => FILE_EXISTS_REPLACE,
       'files[file_test_upload]' => drupal_realpath($this->image->getFileUri()),
       'extensions' => $extensions,
-    );
+    ];
 
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
@@ -143,18 +143,18 @@ class SaveUploadTest extends FileManagedTestBase {
     $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('validate'));
+    $this->assertFileHooksCalled(['validate']);
 
     // Reset the hook counters.
     file_test_reset();
 
     $extensions = 'foo ' . $this->imageExtension;
     // Now tell file_save_upload() to allow the extension of our test image.
-    $edit = array(
+    $edit = [
       'file_test_replace' => FILE_EXISTS_REPLACE,
       'files[file_test_upload]' => drupal_realpath($this->image->getFileUri()),
       'extensions' => $extensions,
-    );
+    ];
 
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
@@ -162,39 +162,39 @@ class SaveUploadTest extends FileManagedTestBase {
     $this->assertRaw(t('You WIN!'), 'Found the success message.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('validate', 'load', 'update'));
+    $this->assertFileHooksCalled(['validate', 'load', 'update']);
 
     // Reset the hook counters.
     file_test_reset();
 
     // Now tell file_save_upload() to allow any extension.
-    $edit = array(
+    $edit = [
       'file_test_replace' => FILE_EXISTS_REPLACE,
       'files[file_test_upload]' => drupal_realpath($this->image->getFileUri()),
       'allow_all_extensions' => TRUE,
-    );
+    ];
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
     $this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload any extension.');
     $this->assertRaw(t('You WIN!'), 'Found the success message.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('validate', 'load', 'update'));
+    $this->assertFileHooksCalled(['validate', 'load', 'update']);
   }
 
   /**
    * Test dangerous file handling.
    */
-  function testHandleDangerousFile() {
+  public function testHandleDangerousFile() {
     $config = $this->config('system.file');
     // Allow the .php extension and make sure it gets renamed to .txt for
     // safety. Also check to make sure its MIME type was changed.
-    $edit = array(
+    $edit = [
       'file_test_replace' => FILE_EXISTS_REPLACE,
       'files[file_test_upload]' => drupal_realpath($this->phpfile->uri),
       'is_image_file' => FALSE,
       'extensions' => 'php',
-    );
+    ];
 
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
@@ -204,7 +204,7 @@ class SaveUploadTest extends FileManagedTestBase {
     $this->assertRaw(t('You WIN!'), 'Found the success message.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('validate', 'insert'));
+    $this->assertFileHooksCalled(['validate', 'insert']);
 
     // Ensure dangerous files are not renamed when insecure uploads is TRUE.
     // Turn on insecure uploads.
@@ -215,11 +215,11 @@ class SaveUploadTest extends FileManagedTestBase {
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
     $this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
-    $this->assertRaw(t('File name is @filename', array('@filename' => $this->phpfile->filename)), 'Dangerous file was not renamed when insecure uploads is TRUE.');
+    $this->assertRaw(t('File name is @filename', ['@filename' => $this->phpfile->filename]), 'Dangerous file was not renamed when insecure uploads is TRUE.');
     $this->assertRaw(t('You WIN!'), 'Found the success message.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('validate', 'insert'));
+    $this->assertFileHooksCalled(['validate', 'insert']);
 
     // Turn off insecure uploads.
     $config->set('allow_insecure_uploads', 0)->save();
@@ -228,7 +228,7 @@ class SaveUploadTest extends FileManagedTestBase {
   /**
    * Test file munge handling.
    */
-  function testHandleFileMunge() {
+  public function testHandleFileMunge() {
     // Ensure insecure uploads are disabled for this test.
     $this->config('system.file')->set('allow_insecure_uploads', 0)->save();
     $this->image = file_move($this->image, $this->image->getFileUri() . '.foo.' . $this->imageExtension);
@@ -237,10 +237,10 @@ class SaveUploadTest extends FileManagedTestBase {
     file_test_reset();
 
     $extensions = $this->imageExtension;
-    $edit = array(
+    $edit = [
       'files[file_test_upload]' => drupal_realpath($this->image->getFileUri()),
       'extensions' => $extensions,
-    );
+    ];
 
     $munged_filename = $this->image->getFilename();
     $munged_filename = substr($munged_filename, 0, strrpos($munged_filename, '.'));
@@ -249,100 +249,100 @@ class SaveUploadTest extends FileManagedTestBase {
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
     $this->assertRaw(t('For security reasons, your upload has been renamed'), 'Found security message.');
-    $this->assertRaw(t('File name is @filename', array('@filename' => $munged_filename)), 'File was successfully munged.');
+    $this->assertRaw(t('File name is @filename', ['@filename' => $munged_filename]), 'File was successfully munged.');
     $this->assertRaw(t('You WIN!'), 'Found the success message.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('validate', 'insert'));
+    $this->assertFileHooksCalled(['validate', 'insert']);
 
     // Ensure we don't munge files if we're allowing any extension.
     // Reset the hook counters.
     file_test_reset();
 
-    $edit = array(
+    $edit = [
       'files[file_test_upload]' => drupal_realpath($this->image->getFileUri()),
       'allow_all_extensions' => TRUE,
-    );
+    ];
 
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
     $this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
-    $this->assertRaw(t('File name is @filename', array('@filename' => $this->image->getFilename())), 'File was not munged when allowing any extension.');
+    $this->assertRaw(t('File name is @filename', ['@filename' => $this->image->getFilename()]), 'File was not munged when allowing any extension.');
     $this->assertRaw(t('You WIN!'), 'Found the success message.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('validate', 'insert'));
+    $this->assertFileHooksCalled(['validate', 'insert']);
   }
 
   /**
    * Test renaming when uploading over a file that already exists.
    */
-  function testExistingRename() {
-    $edit = array(
+  public function testExistingRename() {
+    $edit = [
       'file_test_replace' => FILE_EXISTS_RENAME,
       'files[file_test_upload]' => drupal_realpath($this->image->getFileUri())
-    );
+    ];
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
     $this->assertRaw(t('You WIN!'), 'Found the success message.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('validate', 'insert'));
+    $this->assertFileHooksCalled(['validate', 'insert']);
   }
 
   /**
    * Test replacement when uploading over a file that already exists.
    */
-  function testExistingReplace() {
-    $edit = array(
+  public function testExistingReplace() {
+    $edit = [
       'file_test_replace' => FILE_EXISTS_REPLACE,
       'files[file_test_upload]' => drupal_realpath($this->image->getFileUri())
-    );
+    ];
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
     $this->assertRaw(t('You WIN!'), 'Found the success message.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('validate', 'load', 'update'));
+    $this->assertFileHooksCalled(['validate', 'load', 'update']);
   }
 
   /**
    * Test for failure when uploading over a file that already exists.
    */
-  function testExistingError() {
-    $edit = array(
+  public function testExistingError() {
+    $edit = [
       'file_test_replace' => FILE_EXISTS_ERROR,
       'files[file_test_upload]' => drupal_realpath($this->image->getFileUri())
-    );
+    ];
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
     $this->assertResponse(200, 'Received a 200 response for posted test file.');
     $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
 
     // Check that the no hooks were called while failing.
-    $this->assertFileHooksCalled(array());
+    $this->assertFileHooksCalled([]);
   }
 
   /**
    * Test for no failures when not uploading a file.
    */
-  function testNoUpload() {
-    $this->drupalPostForm('file-test/upload', array(), t('Submit'));
+  public function testNoUpload() {
+    $this->drupalPostForm('file-test/upload', [], t('Submit'));
     $this->assertNoRaw(t('Epic upload FAIL!'), 'Failure message not found.');
   }
 
   /**
    * Tests for log entry on failing destination.
    */
-  function testDrupalMovingUploadedFileError() {
+  public function testDrupalMovingUploadedFileError() {
     // Create a directory and make it not writable.
     $test_directory = 'test_drupal_move_uploaded_file_fail';
     drupal_mkdir('temporary://' . $test_directory, 0000);
     $this->assertTrue(is_dir('temporary://' . $test_directory));
 
-    $edit = array(
+    $edit = [
       'file_subdir' => $test_directory,
       'files[file_test_upload]' => drupal_realpath($this->image->getFileUri())
-    );
+    ];
 
     \Drupal::state()->set('file_test.disable_error_collection', TRUE);
     $this->drupalPostForm('file-test/upload', $edit, t('Submit'));
@@ -353,10 +353,10 @@ class SaveUploadTest extends FileManagedTestBase {
     // Uploading failed. Now check the log.
     $this->drupalGet('admin/reports/dblog');
     $this->assertResponse(200);
-    $this->assertRaw(t('Upload error. Could not move uploaded file @file to destination @destination.', array(
+    $this->assertRaw(t('Upload error. Could not move uploaded file @file to destination @destination.', [
       '@file' => $this->image->getFilename(),
       '@destination' => 'temporary://' . $test_directory . '/' . $this->image->getFilename()
-    )), 'Found upload error log entry.');
+    ]), 'Found upload error log entry.');
   }
 
 }
diff --git a/web/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php b/web/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php
index db49ae1e1..6a5f53b5d 100644
--- a/web/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php
+++ b/web/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php
@@ -21,25 +21,25 @@ class RelationshipUserFileDataTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('file', 'file_test_views', 'user');
+  public static $modules = ['file', 'file_test_views', 'user'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_file_user_file_data');
+  public static $testViews = ['test_file_user_file_data'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create the user profile field and instance.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'user',
       'field_name' => 'user_file',
       'type' => 'file',
       'translatable' => '0',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'label' => 'User File',
       'description' => '',
@@ -49,7 +49,7 @@ class RelationshipUserFileDataTest extends ViewTestBase {
       'required' => 0,
     ])->save();
 
-    ViewTestData::createTestViews(get_class($this), array('file_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['file_test_views']);
   }
 
   /**
@@ -84,12 +84,12 @@ class RelationshipUserFileDataTest extends ViewTestBase {
     ];
     $this->assertIdentical($expected, $view->getDependencies());
     $this->executeView($view);
-    $expected_result = array(
-      array(
+    $expected_result = [
+      [
         'file_managed_user__user_file_fid' => '2',
-      ),
-    );
-    $column_map = array('file_managed_user__user_file_fid' => 'file_managed_user__user_file_fid');
+      ],
+    ];
+    $column_map = ['file_managed_user__user_file_fid' => 'file_managed_user__user_file_fid'];
     $this->assertIdenticalResultset($view, $expected_result, $column_map);
   }
 
diff --git a/web/core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php b/web/core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php
index 760a4f4fd..9dc9d3595 100644
--- a/web/core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php
+++ b/web/core/modules/file/tests/file_module_test/src/Form/FileModuleTestForm.php
@@ -36,7 +36,7 @@ class FileModuleTestForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state, $tree = TRUE, $extended = TRUE, $multiple = FALSE, $default_fids = NULL) {
     $form['#tree'] = (bool) $tree;
 
-    $form['nested']['file'] = array(
+    $form['nested']['file'] = [
       '#type' => 'managed_file',
       '#title' => $this->t('Managed <em>@type</em>', ['@type' => 'file & butter']),
       '#upload_location' => 'public://test',
@@ -44,21 +44,21 @@ class FileModuleTestForm extends FormBase {
       '#extended' => (bool) $extended,
       '#size' => 13,
       '#multiple' => (bool) $multiple,
-    );
+    ];
     if ($default_fids) {
       $default_fids = explode(',', $default_fids);
-      $form['nested']['file']['#default_value'] = $extended ? array('fids' => $default_fids) : $default_fids;
+      $form['nested']['file']['#default_value'] = $extended ? ['fids' => $default_fids] : $default_fids;
     }
 
-    $form['textfield'] = array(
+    $form['textfield'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Type a value and ensure it stays'),
-    );
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
-    );
+    ];
 
     return $form;
   }
@@ -68,7 +68,7 @@ class FileModuleTestForm extends FormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     if ($form['#tree']) {
-      $uploads = $form_state->getValue(array('nested', 'file'));
+      $uploads = $form_state->getValue(['nested', 'file']);
     }
     else {
       $uploads = $form_state->getValue('file');
@@ -78,12 +78,12 @@ class FileModuleTestForm extends FormBase {
       $uploads = $uploads['fids'];
     }
 
-    $fids = array();
+    $fids = [];
     foreach ($uploads as $fid) {
       $fids[] = $fid;
     }
 
-    drupal_set_message($this->t('The file ids are %fids.', array('%fids' => implode(',', $fids))));
+    drupal_set_message($this->t('The file ids are %fids.', ['%fids' => implode(',', $fids)]));
   }
 
 }
diff --git a/web/core/modules/file/tests/file_test/file_test.module b/web/core/modules/file/tests/file_test/file_test.module
index 4a6fbcbdb..0baa0cbd0 100644
--- a/web/core/modules/file/tests/file_test/file_test.module
+++ b/web/core/modules/file/tests/file_test/file_test.module
@@ -21,23 +21,23 @@ const FILE_URL_TEST_CDN_2 = 'http://cdn2.example.com';
  */
 function file_test_reset() {
   // Keep track of calls to these hooks
-  $results = array(
-    'load' => array(),
-    'validate' => array(),
-    'download' => array(),
-    'insert' => array(),
-    'update' => array(),
-    'copy' => array(),
-    'move' => array(),
-    'delete' => array(),
-  );
+  $results = [
+    'load' => [],
+    'validate' => [],
+    'download' => [],
+    'insert' => [],
+    'update' => [],
+    'copy' => [],
+    'move' => [],
+    'delete' => [],
+  ];
   \Drupal::state()->set('file_test.results', $results);
 
   // These hooks will return these values, see file_test_set_return().
-  $return = array(
-    'validate' => array(),
+  $return = [
+    'validate' => [],
     'download' => NULL,
-  );
+  ];
   \Drupal::state()->set('file_test.return', $return);
 }
 
@@ -56,7 +56,7 @@ function file_test_reset() {
  * @see file_test_reset()
  */
 function file_test_get_calls($op) {
-  $results = \Drupal::state()->get('file_test.results') ?: array();
+  $results = \Drupal::state()->get('file_test.results') ?: [];
   return $results[$op];
 }
 
@@ -69,7 +69,7 @@ function file_test_get_calls($op) {
  *   passed to each call.
  */
 function file_test_get_all_calls() {
-  return \Drupal::state()->get('file_test.results') ?: array();
+  return \Drupal::state()->get('file_test.results') ?: [];
 }
 
 /**
@@ -86,7 +86,7 @@ function file_test_get_all_calls() {
  */
 function _file_test_log_call($op, $args) {
   if (\Drupal::state()->get('file_test.count_hook_invocations', TRUE)) {
-    $results = \Drupal::state()->get('file_test.results') ?: array();
+    $results = \Drupal::state()->get('file_test.results') ?: [];
     $results[$op][] = $args;
     \Drupal::state()->set('file_test.results', $results);
   }
@@ -105,7 +105,7 @@ function _file_test_log_call($op, $args) {
  * @see file_test_reset()
  */
 function _file_test_get_return($op) {
-  $return = \Drupal::state()->get('file_test.return') ?: array($op => NULL);
+  $return = \Drupal::state()->get('file_test.return') ?: [$op => NULL];
   return $return[$op];
 }
 
@@ -121,7 +121,7 @@ function _file_test_get_return($op) {
  * @see file_test_reset()
  */
 function file_test_set_return($op, $value) {
-  $return = \Drupal::state()->get('file_test.return') ?: array();
+  $return = \Drupal::state()->get('file_test.return') ?: [];
   $return[$op] = $value;
   \Drupal::state()->set('file_test.return', $return);
 }
@@ -131,7 +131,7 @@ function file_test_set_return($op, $value) {
  */
 function file_test_file_load($files) {
   foreach ($files as $file) {
-    _file_test_log_call('load', array($file->id()));
+    _file_test_log_call('load', [$file->id()]);
     // Assign a value on the object so that we can test that the $file is passed
     // by reference.
     $file->file_test['loaded'] = TRUE;
@@ -142,7 +142,7 @@ function file_test_file_load($files) {
  * Implements hook_file_validate().
  */
 function file_test_file_validate(File $file) {
-  _file_test_log_call('validate', array($file->id()));
+  _file_test_log_call('validate', [$file->id()]);
   return _file_test_get_return('validate');
 }
 
@@ -151,11 +151,11 @@ function file_test_file_validate(File $file) {
  */
 function file_test_file_download($uri) {
   if (\Drupal::state()->get('file_test.allow_all', FALSE)) {
-    $files = entity_load_multiple_by_properties('file', array('uri' => $uri));
+    $files = entity_load_multiple_by_properties('file', ['uri' => $uri]);
     $file = reset($files);
     return file_get_content_headers($file);
   }
-  _file_test_log_call('download', array($uri));
+  _file_test_log_call('download', [$uri]);
   return _file_test_get_return('download');
 }
 
@@ -163,35 +163,35 @@ function file_test_file_download($uri) {
  * Implements hook_ENTITY_TYPE_insert() for file entities.
  */
 function file_test_file_insert(File $file) {
-  _file_test_log_call('insert', array($file->id()));
+  _file_test_log_call('insert', [$file->id()]);
 }
 
 /**
  * Implements hook_ENTITY_TYPE_update() for file entities.
  */
 function file_test_file_update(File $file) {
-  _file_test_log_call('update', array($file->id()));
+  _file_test_log_call('update', [$file->id()]);
 }
 
 /**
  * Implements hook_file_copy().
  */
 function file_test_file_copy(File $file, $source) {
-  _file_test_log_call('copy', array($file->id(), $source->id()));
+  _file_test_log_call('copy', [$file->id(), $source->id()]);
 }
 
 /**
  * Implements hook_file_move().
  */
 function file_test_file_move(File $file, File $source) {
-  _file_test_log_call('move', array($file->id(), $source->id()));
+  _file_test_log_call('move', [$file->id(), $source->id()]);
 }
 
 /**
  * Implements hook_ENTITY_TYPE_predelete() for file entities.
  */
 function file_test_file_predelete(File $file) {
-  _file_test_log_call('delete', array($file->id()));
+  _file_test_log_call('delete', [$file->id()]);
 }
 
 /**
@@ -206,11 +206,11 @@ function file_test_file_url_alter(&$uri) {
   }
   // Test alteration of file URLs to use a CDN.
   elseif ($alter_mode == 'cdn') {
-    $cdn_extensions = array('css', 'js', 'gif', 'jpg', 'jpeg', 'png');
+    $cdn_extensions = ['css', 'js', 'gif', 'jpg', 'jpeg', 'png'];
 
     // Most CDNs don't support private file transfers without a lot of hassle,
     // so don't support this in the common case.
-    $schemes = array('public');
+    $schemes = ['public'];
 
     $scheme = file_uri_scheme($uri);
 
@@ -323,7 +323,7 @@ function file_test_validator(File $file, $errors) {
  *   If $filepath is NULL, an array of all previous $filepath parameters
  */
 function file_test_file_scan_callback($filepath = NULL) {
-  $files = &drupal_static(__FUNCTION__, array());
+  $files = &drupal_static(__FUNCTION__, []);
   if (isset($filepath)) {
     $files[] = $filepath;
   }
diff --git a/web/core/modules/file/tests/file_test/src/Form/FileTestForm.php b/web/core/modules/file/tests/file_test/src/Form/FileTestForm.php
index 628bb55db..f43e20a8e 100644
--- a/web/core/modules/file/tests/file_test/src/Form/FileTestForm.php
+++ b/web/core/modules/file/tests/file_test/src/Form/FileTestForm.php
@@ -21,48 +21,48 @@ class FileTestForm implements FormInterface {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['file_test_upload'] = array(
+    $form['file_test_upload'] = [
       '#type' => 'file',
       '#title' => t('Upload a file'),
-    );
-    $form['file_test_replace'] = array(
+    ];
+    $form['file_test_replace'] = [
       '#type' => 'select',
       '#title' => t('Replace existing image'),
-      '#options' => array(
+      '#options' => [
         FILE_EXISTS_RENAME => t('Appends number until name is unique'),
         FILE_EXISTS_REPLACE => t('Replace the existing file'),
         FILE_EXISTS_ERROR => t('Fail with an error'),
-      ),
+      ],
       '#default_value' => FILE_EXISTS_RENAME,
-    );
-    $form['file_subdir'] = array(
+    ];
+    $form['file_subdir'] = [
       '#type' => 'textfield',
       '#title' => t('Subdirectory for test file'),
       '#default_value' => '',
-    );
+    ];
 
-    $form['extensions'] = array(
+    $form['extensions'] = [
       '#type' => 'textfield',
       '#title' => t('Allowed extensions.'),
       '#default_value' => '',
-    );
+    ];
 
-    $form['allow_all_extensions'] = array(
+    $form['allow_all_extensions'] = [
       '#type' => 'checkbox',
       '#title' => t('Allow all extensions?'),
       '#default_value' => FALSE,
-    );
+    ];
 
-    $form['is_image_file'] = array(
+    $form['is_image_file'] = [
       '#type' => 'checkbox',
       '#title' => t('Is this an image file?'),
       '#default_value' => TRUE,
-    );
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
     return $form;
   }
 
@@ -86,16 +86,16 @@ class FileTestForm implements FormInterface {
     }
 
     // Setup validators.
-    $validators = array();
+    $validators = [];
     if ($form_state->getValue('is_image_file')) {
-      $validators['file_validate_is_image'] = array();
+      $validators['file_validate_is_image'] = [];
     }
 
     if ($form_state->getValue('allow_all_extensions')) {
-      $validators['file_validate_extensions'] = array();
+      $validators['file_validate_extensions'] = [];
     }
     elseif (!$form_state->isValueEmpty('extensions')) {
-      $validators['file_validate_extensions'] = array($form_state->getValue('extensions'));
+      $validators['file_validate_extensions'] = [$form_state->getValue('extensions')];
     }
 
     // The test for drupal_move_uploaded_file() triggering a warning is
@@ -108,9 +108,9 @@ class FileTestForm implements FormInterface {
     $file = file_save_upload('file_test_upload', $validators, $destination, 0, $form_state->getValue('file_test_replace'));
     if ($file) {
       $form_state->setValue('file_test_upload', $file);
-      drupal_set_message(t('File @filepath was uploaded.', array('@filepath' => $file->getFileUri())));
-      drupal_set_message(t('File name is @filename.', array('@filename' => $file->getFilename())));
-      drupal_set_message(t('File MIME type is @mimetype.', array('@mimetype' => $file->getMimeType())));
+      drupal_set_message(t('File @filepath was uploaded.', ['@filepath' => $file->getFileUri()]));
+      drupal_set_message(t('File name is @filename.', ['@filename' => $file->getFilename()]));
+      drupal_set_message(t('File MIME type is @mimetype.', ['@mimetype' => $file->getMimeType()]));
       drupal_set_message(t('You WIN!'));
     }
     elseif ($file === FALSE) {
diff --git a/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php b/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php
index c0a7c0517..c1c36af41 100644
--- a/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php
+++ b/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyReadOnlyStreamWrapper.php
@@ -25,7 +25,7 @@ class DummyReadOnlyStreamWrapper extends LocalReadOnlyStream {
     return t('Dummy wrapper for simpletest (readonly).');
   }
 
-  function getDirectoryPath() {
+  public function getDirectoryPath() {
     return \Drupal::service('site.path') . '/files';
   }
 
@@ -34,7 +34,7 @@ class DummyReadOnlyStreamWrapper extends LocalReadOnlyStream {
    *
    * Return a dummy path for testing.
    */
-  function getInternalUri() {
+  public function getInternalUri() {
     return '/dummy/example.txt';
   }
 
@@ -43,7 +43,7 @@ class DummyReadOnlyStreamWrapper extends LocalReadOnlyStream {
    *
    * Return the HTML URI of a public file.
    */
-  function getExternalUrl() {
+  public function getExternalUrl() {
     return '/dummy/example.txt';
   }
 
diff --git a/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php b/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php
index 12019e658..9f18d2a2d 100644
--- a/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php
+++ b/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyRemoteStreamWrapper.php
@@ -27,7 +27,7 @@ class DummyRemoteStreamWrapper extends PublicStream {
     return t('Dummy wrapper for simpletest (remote).');
   }
 
-  function realpath() {
+  public function realpath() {
     return FALSE;
   }
 
diff --git a/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyStreamWrapper.php b/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyStreamWrapper.php
index 1428300f1..6ce842470 100644
--- a/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyStreamWrapper.php
+++ b/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyStreamWrapper.php
@@ -25,7 +25,7 @@ class DummyStreamWrapper extends LocalStream {
     return t('Dummy wrapper for simpletest.');
   }
 
-  function getDirectoryPath() {
+  public function getDirectoryPath() {
     return \Drupal::service('site.path') . '/files';
   }
 
@@ -34,7 +34,7 @@ class DummyStreamWrapper extends LocalStream {
    *
    * Return a dummy path for testing.
    */
-  function getInternalUri() {
+  public function getInternalUri() {
     return '/dummy/example.txt';
   }
 
@@ -43,7 +43,7 @@ class DummyStreamWrapper extends LocalStream {
    *
    * Return the HTML URI of a public file.
    */
-  function getExternalUrl() {
+  public function getExternalUrl() {
     return '/dummy/example.txt';
   }
 
diff --git a/web/core/modules/file/tests/src/Functional/FileFieldTestBase.php b/web/core/modules/file/tests/src/Functional/FileFieldTestBase.php
new file mode 100644
index 000000000..9ed447aaf
--- /dev/null
+++ b/web/core/modules/file/tests/src/Functional/FileFieldTestBase.php
@@ -0,0 +1,320 @@
+<?php
+
+namespace Drupal\Tests\file\Functional;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\file\FileInterface;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\file\Entity\File;
+
+/**
+ * Provides methods specifically for testing File module's field handling.
+ */
+abstract class FileFieldTestBase extends BrowserTestBase {
+
+  /**
+  * Modules to enable.
+  *
+  * @var array
+  */
+  public static $modules = ['node', 'file', 'file_module_test', 'field_ui'];
+
+  /**
+   * An user with administration permissions.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  protected function setUp() {
+    parent::setUp();
+    $this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer users', 'administer permissions', 'administer content types', 'administer node fields', 'administer node display', 'administer nodes', 'bypass node access']);
+    $this->drupalLogin($this->adminUser);
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+  }
+
+  /**
+   * Retrieves a sample file of the specified type.
+   *
+   * @return \Drupal\file\FileInterface
+   */
+  public function getTestFile($type_name, $size = NULL) {
+    // Get a file to upload.
+    $file = current($this->drupalGetTestFiles($type_name, $size));
+
+    // Add a filesize property to files as would be read by
+    // \Drupal\file\Entity\File::load().
+    $file->filesize = filesize($file->uri);
+
+    return File::create((array) $file);
+  }
+
+  /**
+   * Retrieves the fid of the last inserted file.
+   */
+  public function getLastFileId() {
+    return (int) db_query('SELECT MAX(fid) FROM {file_managed}')->fetchField();
+  }
+
+  /**
+   * Creates a new file field.
+   *
+   * @param string $name
+   *   The name of the new field (all lowercase), exclude the "field_" prefix.
+   * @param string $entity_type
+   *   The entity type.
+   * @param string $bundle
+   *   The bundle that this field will be added to.
+   * @param array $storage_settings
+   *   A list of field storage settings that will be added to the defaults.
+   * @param array $field_settings
+   *   A list of instance settings that will be added to the instance defaults.
+   * @param array $widget_settings
+   *   A list of widget settings that will be added to the widget defaults.
+   */
+  public function createFileField($name, $entity_type, $bundle, $storage_settings = [], $field_settings = [], $widget_settings = []) {
+    $field_storage = FieldStorageConfig::create([
+      'entity_type' => $entity_type,
+      'field_name' => $name,
+      'type' => 'file',
+      'settings' => $storage_settings,
+      'cardinality' => !empty($storage_settings['cardinality']) ? $storage_settings['cardinality'] : 1,
+    ]);
+    $field_storage->save();
+
+    $this->attachFileField($name, $entity_type, $bundle, $field_settings, $widget_settings);
+    return $field_storage;
+  }
+
+  /**
+   * Attaches a file field to an entity.
+   *
+   * @param string $name
+   *   The name of the new field (all lowercase), exclude the "field_" prefix.
+   * @param string $entity_type
+   *   The entity type this field will be added to.
+   * @param string $bundle
+   *   The bundle this field will be added to.
+   * @param array $field_settings
+   *   A list of field settings that will be added to the defaults.
+   * @param array $widget_settings
+   *   A list of widget settings that will be added to the widget defaults.
+   */
+  public function attachFileField($name, $entity_type, $bundle, $field_settings = [], $widget_settings = []) {
+    $field = [
+      'field_name' => $name,
+      'label' => $name,
+      'entity_type' => $entity_type,
+      'bundle' => $bundle,
+      'required' => !empty($field_settings['required']),
+      'settings' => $field_settings,
+    ];
+    FieldConfig::create($field)->save();
+
+    entity_get_form_display($entity_type, $bundle, 'default')
+      ->setComponent($name, [
+        'type' => 'file_generic',
+        'settings' => $widget_settings,
+      ])
+      ->save();
+    // Assign display settings.
+    entity_get_display($entity_type, $bundle, 'default')
+      ->setComponent($name, [
+        'label' => 'hidden',
+        'type' => 'file_default',
+      ])
+      ->save();
+  }
+
+  /**
+   * Updates an existing file field with new settings.
+   */
+  public function updateFileField($name, $type_name, $field_settings = [], $widget_settings = []) {
+    $field = FieldConfig::loadByName('node', $type_name, $name);
+    $field->setSettings(array_merge($field->getSettings(), $field_settings));
+    $field->save();
+
+    entity_get_form_display('node', $type_name, 'default')
+      ->setComponent($name, [
+        'settings' => $widget_settings,
+      ])
+      ->save();
+  }
+
+  /**
+   * Uploads a file to a node.
+   *
+   * @param \Drupal\file\FileInterface $file
+   *   The File to be uploaded.
+   * @param string $field_name
+   *   The name of the field on which the files should be saved.
+   * @param $nid_or_type
+   *   A numeric node id to upload files to an existing node, or a string
+   *   indicating the desired bundle for a new node.
+   * @param bool $new_revision
+   *   The revision number.
+   * @param array $extras
+   *   Additional values when a new node is created.
+   *
+   * @return int
+   *   The node id.
+   */
+  public function uploadNodeFile(FileInterface $file, $field_name, $nid_or_type, $new_revision = TRUE, array $extras = []) {
+    return $this->uploadNodeFiles([$file], $field_name, $nid_or_type, $new_revision, $extras);
+  }
+
+  /**
+   * Uploads multiple files to a node.
+   *
+   * @param \Drupal\file\FileInterface[] $files
+   *   The files to be uploaded.
+   * @param string $field_name
+   *   The name of the field on which the files should be saved.
+   * @param $nid_or_type
+   *   A numeric node id to upload files to an existing node, or a string
+   *   indicating the desired bundle for a new node.
+   * @param bool $new_revision
+   *   The revision number.
+   * @param array $extras
+   *   Additional values when a new node is created.
+   *
+   * @return int
+   *   The node id.
+   */
+  public function uploadNodeFiles(array $files, $field_name, $nid_or_type, $new_revision = TRUE, array $extras = []) {
+    $edit = [
+      'title[0][value]' => $this->randomMachineName(),
+      'revision' => (string) (int) $new_revision,
+    ];
+
+    $node_storage = $this->container->get('entity.manager')->getStorage('node');
+    if (is_numeric($nid_or_type)) {
+      $nid = $nid_or_type;
+      $node_storage->resetCache([$nid]);
+      $node = $node_storage->load($nid);
+    }
+    else {
+      // Add a new node.
+      $extras['type'] = $nid_or_type;
+      $node = $this->drupalCreateNode($extras);
+      $nid = $node->id();
+      // Save at least one revision to better simulate a real site.
+      $node->setNewRevision();
+      $node->save();
+      $node_storage->resetCache([$nid]);
+      $node = $node_storage->load($nid);
+      $this->assertNotEqual($nid, $node->getRevisionId(), 'Node revision exists.');
+    }
+
+    // Attach files to the node.
+    $field_storage = FieldStorageConfig::loadByName('node', $field_name);
+    // File input name depends on number of files already uploaded.
+    $field_num = count($node->{$field_name});
+    $name = 'files[' . $field_name . "_$field_num]";
+    if ($field_storage->getCardinality() != 1) {
+      $name .= '[]';
+    }
+    foreach ($files as $file) {
+      $file_path = $this->container->get('file_system')->realpath($file->getFileUri());
+      if (count($files) == 1) {
+        $edit[$name] = $file_path;
+      }
+      else {
+        $edit[$name][] = $file_path;
+      }
+    }
+    $this->drupalPostForm("node/$nid/edit", $edit, t('Save and keep published'));
+
+    return $nid;
+  }
+
+  /**
+   * Removes a file from a node.
+   *
+   * Note that if replacing a file, it must first be removed then added again.
+   */
+  public function removeNodeFile($nid, $new_revision = TRUE) {
+    $edit = [
+      'revision' => (string) (int) $new_revision,
+    ];
+
+    $this->drupalPostForm('node/' . $nid . '/edit', [], t('Remove'));
+    $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
+  }
+
+  /**
+   * Replaces a file within a node.
+   */
+  public function replaceNodeFile($file, $field_name, $nid, $new_revision = TRUE) {
+    $edit = [
+      'files[' . $field_name . '_0]' => drupal_realpath($file->getFileUri()),
+      'revision' => (string) (int) $new_revision,
+    ];
+
+    $this->drupalPostForm('node/' . $nid . '/edit', [], t('Remove'));
+    $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
+  }
+
+  /**
+   * Asserts that a file exists physically on disk.
+   *
+   * Overrides PHPUnit_Framework_Assert::assertFileExists() to also work with
+   * file entities.
+   *
+   * @param \Drupal\File\FileInterface|string $file
+   *   Either the file entity or the file URI.
+   * @param string $message
+   *   (optional) A message to display with the assertion.
+   */
+  public static function assertFileExists($file, $message = NULL) {
+    $message = isset($message) ? $message : format_string('File %file exists on the disk.', ['%file' => $file->getFileUri()]);
+    $filename = $file instanceof FileInterface ? $file->getFileUri() : $file;
+    parent::assertFileExists($filename, $message);
+  }
+
+  /**
+   * Asserts that a file exists in the database.
+   */
+  public function assertFileEntryExists($file, $message = NULL) {
+    $this->container->get('entity.manager')->getStorage('file')->resetCache();
+    $db_file = File::load($file->id());
+    $message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', ['%file' => $file->getFileUri()]);
+    $this->assertEqual($db_file->getFileUri(), $file->getFileUri(), $message);
+  }
+
+  /**
+   * Asserts that a file does not exist on disk.
+   *
+   * Overrides PHPUnit_Framework_Assert::assertFileExists() to also work with
+   * file entities.
+   *
+   * @param \Drupal\File\FileInterface|string $file
+   *   Either the file entity or the file URI.
+   * @param string $message
+   *   (optional) A message to display with the assertion.
+   */
+  public static function assertFileNotExists($file, $message = NULL) {
+    $message = isset($message) ? $message : format_string('File %file exists on the disk.', ['%file' => $file->getFileUri()]);
+    $filename = $file instanceof FileInterface ? $file->getFileUri() : $file;
+    parent::assertFileNotExists($filename, $message);
+  }
+
+  /**
+   * Asserts that a file does not exist in the database.
+   */
+  public function assertFileEntryNotExists($file, $message) {
+    $this->container->get('entity.manager')->getStorage('file')->resetCache();
+    $message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', ['%file' => $file->getFileUri()]);
+    $this->assertFalse(File::load($file->id()), $message);
+  }
+
+  /**
+   * Asserts that a file's status is set to permanent in the database.
+   */
+  public function assertFileIsPermanent(FileInterface $file, $message = NULL) {
+    $message = isset($message) ? $message : format_string('File %file is permanent.', ['%file' => $file->getFileUri()]);
+    $this->assertTrue($file->isPermanent(), $message);
+  }
+
+}
diff --git a/web/core/modules/file/src/Tests/FileManagedAccessTest.php b/web/core/modules/file/tests/src/Functional/FileManagedAccessTest.php
similarity index 88%
rename from web/core/modules/file/src/Tests/FileManagedAccessTest.php
rename to web/core/modules/file/tests/src/Functional/FileManagedAccessTest.php
index 391f91a44..01419d446 100644
--- a/web/core/modules/file/src/Tests/FileManagedAccessTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileManagedAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\file\Tests;
+namespace Drupal\Tests\file\Functional;
 
 use Drupal\file\Entity\File;
 
@@ -14,22 +14,22 @@ class FileManagedAccessTest extends FileManagedTestBase {
   /**
    * Tests if public file is always accessible.
    */
-  function testFileAccess() {
+  public function testFileAccess() {
     // Create a new file entity.
-    $file = File::create(array(
+    $file = File::create([
       'uid' => 1,
       'filename' => 'drupal.txt',
       'uri' => 'public://drupal.txt',
       'filemime' => 'text/plain',
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     file_put_contents($file->getFileUri(), 'hello world');
 
     // Save it, inserting a new record.
     $file->save();
 
     // Create authenticated user to check file access.
-    $account = $this->createUser(array('access site reports'));
+    $account = $this->createUser(['access site reports']);
 
     $this->assertTrue($file->access('view', $account), 'Public file is viewable to authenticated user');
     $this->assertTrue($file->access('download', $account), 'Public file is downloadable to authenticated user');
@@ -41,20 +41,20 @@ class FileManagedAccessTest extends FileManagedTestBase {
     $this->assertTrue($file->access('download', $account), 'Public file is downloadable to anonymous user');
 
     // Create a new file entity.
-    $file = File::create(array(
+    $file = File::create([
       'uid' => 1,
       'filename' => 'drupal.txt',
       'uri' => 'private://drupal.txt',
       'filemime' => 'text/plain',
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     file_put_contents($file->getFileUri(), 'hello world');
 
     // Save it, inserting a new record.
     $file->save();
 
     // Create authenticated user to check file access.
-    $account = $this->createUser(array('access site reports'));
+    $account = $this->createUser(['access site reports']);
 
     $this->assertFalse($file->access('view', $account), 'Private file is not viewable to authenticated user');
     $this->assertFalse($file->access('download', $account), 'Private file is not downloadable to authenticated user');
diff --git a/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php b/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
new file mode 100644
index 000000000..e0da7d1a0
--- /dev/null
+++ b/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
@@ -0,0 +1,200 @@
+<?php
+
+namespace Drupal\Tests\file\Functional;
+
+use Drupal\file\Entity\File;
+use Drupal\file\FileInterface;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Base class for file tests that use the file_test module to test uploads and
+ * hooks.
+ */
+abstract class FileManagedTestBase extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['file_test', 'file'];
+
+  protected function setUp() {
+    parent::setUp();
+    // Clear out any hook calls.
+    file_test_reset();
+  }
+
+  /**
+   * Assert that all of the specified hook_file_* hooks were called once, other
+   * values result in failure.
+   *
+   * @param string[] $expected
+   *   An array of strings containing with the hook name; for example, 'load',
+   *   'save', 'insert', etc.
+   */
+  public function assertFileHooksCalled($expected) {
+    \Drupal::state()->resetCache();
+
+    // Determine which hooks were called.
+    $actual = array_keys(array_filter(file_test_get_all_calls()));
+
+    // Determine if there were any expected that were not called.
+    $uncalled = array_diff($expected, $actual);
+    if (count($uncalled)) {
+      $this->assertTrue(FALSE, format_string('Expected hooks %expected to be called but %uncalled was not called.', ['%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled)]));
+    }
+    else {
+      $this->assertTrue(TRUE, format_string('All the expected hooks were called: %expected', ['%expected' => empty($expected) ? '(none)' : implode(', ', $expected)]));
+    }
+
+    // Determine if there were any unexpected calls.
+    $unexpected = array_diff($actual, $expected);
+    if (count($unexpected)) {
+      $this->assertTrue(FALSE, format_string('Unexpected hooks were called: %unexpected.', ['%unexpected' => empty($unexpected) ? '(none)' : implode(', ', $unexpected)]));
+    }
+    else {
+      $this->assertTrue(TRUE, 'No unexpected hooks were called.');
+    }
+  }
+
+  /**
+   * Assert that a hook_file_* hook was called a certain number of times.
+   *
+   * @param string $hook
+   *   String with the hook name; for instance, 'load', 'save', 'insert', etc.
+   * @param int $expected_count
+   *   Optional integer count.
+   * @param string|null $message
+   *   Optional translated string message.
+   */
+  public function assertFileHookCalled($hook, $expected_count = 1, $message = NULL) {
+    $actual_count = count(file_test_get_calls($hook));
+
+    if (!isset($message)) {
+      if ($actual_count == $expected_count) {
+        $message = format_string('hook_file_@name was called correctly.', ['@name' => $hook]);
+      }
+      elseif ($expected_count == 0) {
+        $message = \Drupal::translation()->formatPlural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', ['@name' => $hook, '@count' => $actual_count]);
+      }
+      else {
+        $message = format_string('hook_file_@name was expected to be called %expected times but was called %actual times.', ['@name' => $hook, '%expected' => $expected_count, '%actual' => $actual_count]);
+      }
+    }
+    $this->assertEqual($actual_count, $expected_count, $message);
+  }
+
+  /**
+   * Asserts that two files have the same values (except timestamp).
+   *
+   * @param \Drupal\file\FileInterface $before
+   *   File object to compare.
+   * @param \Drupal\file\FileInterface $after
+   *   File object to compare.
+   */
+  public function assertFileUnchanged(FileInterface $before, FileInterface $after) {
+    $this->assertEqual($before->id(), $after->id(), t('File id is the same: %file1 == %file2.', ['%file1' => $before->id(), '%file2' => $after->id()]), 'File unchanged');
+    $this->assertEqual($before->getOwner()->id(), $after->getOwner()->id(), t('File owner is the same: %file1 == %file2.', ['%file1' => $before->getOwner()->id(), '%file2' => $after->getOwner()->id()]), 'File unchanged');
+    $this->assertEqual($before->getFilename(), $after->getFilename(), t('File name is the same: %file1 == %file2.', ['%file1' => $before->getFilename(), '%file2' => $after->getFilename()]), 'File unchanged');
+    $this->assertEqual($before->getFileUri(), $after->getFileUri(), t('File path is the same: %file1 == %file2.', ['%file1' => $before->getFileUri(), '%file2' => $after->getFileUri()]), 'File unchanged');
+    $this->assertEqual($before->getMimeType(), $after->getMimeType(), t('File MIME type is the same: %file1 == %file2.', ['%file1' => $before->getMimeType(), '%file2' => $after->getMimeType()]), 'File unchanged');
+    $this->assertEqual($before->getSize(), $after->getSize(), t('File size is the same: %file1 == %file2.', ['%file1' => $before->getSize(), '%file2' => $after->getSize()]), 'File unchanged');
+    $this->assertEqual($before->isPermanent(), $after->isPermanent(), t('File status is the same: %file1 == %file2.', ['%file1' => $before->isPermanent(), '%file2' => $after->isPermanent()]), 'File unchanged');
+  }
+
+  /**
+   * Asserts that two files are not the same by comparing the fid and filepath.
+   *
+   * @param \Drupal\file\FileInterface $file1
+   *   File object to compare.
+   * @param \Drupal\file\FileInterface $file2
+   *   File object to compare.
+   */
+  public function assertDifferentFile(FileInterface $file1, FileInterface $file2) {
+    $this->assertNotEqual($file1->id(), $file2->id(), t('Files have different ids: %file1 != %file2.', ['%file1' => $file1->id(), '%file2' => $file2->id()]), 'Different file');
+    $this->assertNotEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have different paths: %file1 != %file2.', ['%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri()]), 'Different file');
+  }
+
+  /**
+   * Asserts that two files are the same by comparing the fid and filepath.
+   *
+   * @param \Drupal\file\FileInterface $file1
+   *   File object to compare.
+   * @param \Drupal\file\FileInterface $file2
+   *   File object to compare.
+   */
+  public function assertSameFile(FileInterface $file1, FileInterface $file2) {
+    $this->assertEqual($file1->id(), $file2->id(), t('Files have the same ids: %file1 == %file2.', ['%file1' => $file1->id(), '%file2-fid' => $file2->id()]), 'Same file');
+    $this->assertEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have the same path: %file1 == %file2.', ['%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri()]), 'Same file');
+  }
+
+  /**
+   * Create a file and save it to the files table and assert that it occurs
+   * correctly.
+   *
+   * @param string $filepath
+   *   Optional string specifying the file path. If none is provided then a
+   *   randomly named file will be created in the site's files directory.
+   * @param string $contents
+   *   Optional contents to save into the file. If a NULL value is provided an
+   *   arbitrary string will be used.
+   * @param string $scheme
+   *   Optional string indicating the stream scheme to use. Drupal core includes
+   *   public, private, and temporary. The public wrapper is the default.
+   * @return \Drupal\file\FileInterface
+   *   File entity.
+   */
+  public function createFile($filepath = NULL, $contents = NULL, $scheme = NULL) {
+    // Don't count hook invocations caused by creating the file.
+    \Drupal::state()->set('file_test.count_hook_invocations', FALSE);
+    $file = File::create([
+      'uri' => $this->createUri($filepath, $contents, $scheme),
+      'uid' => 1,
+    ]);
+    $file->save();
+    // Write the record directly rather than using the API so we don't invoke
+    // the hooks.
+    $this->assertTrue($file->id() > 0, 'The file was added to the database.', 'Create test file');
+
+    \Drupal::state()->set('file_test.count_hook_invocations', TRUE);
+    return $file;
+  }
+
+  /**
+   * Creates a file and returns its URI.
+   *
+   * @param string $filepath
+   *   Optional string specifying the file path. If none is provided then a
+   *   randomly named file will be created in the site's files directory.
+   * @param string $contents
+   *   Optional contents to save into the file. If a NULL value is provided an
+   *   arbitrary string will be used.
+   * @param string $scheme
+   *   Optional string indicating the stream scheme to use. Drupal core includes
+   *   public, private, and temporary. The public wrapper is the default.
+   *
+   * @return string
+   *   File URI.
+   */
+  public function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
+    if (!isset($filepath)) {
+      // Prefix with non-latin characters to ensure that all file-related
+      // tests work with international filenames.
+      $filepath = 'Файл для тестирования ' . $this->randomMachineName();
+    }
+    if (!isset($scheme)) {
+      $scheme = file_default_scheme();
+    }
+    $filepath = $scheme . '://' . $filepath;
+
+    if (!isset($contents)) {
+      $contents = "file_put_contents() doesn't seem to appreciate empty strings so let's put in some data.";
+    }
+
+    file_put_contents($filepath, $contents);
+    $this->assertTrue(is_file($filepath), t('The test file exists on the disk.'), 'Create test file');
+    return $filepath;
+  }
+
+}
diff --git a/web/core/modules/file/tests/src/Kernel/AccessTest.php b/web/core/modules/file/tests/src/Kernel/AccessTest.php
index c2fa65bac..c71d7e80e 100644
--- a/web/core/modules/file/tests/src/Kernel/AccessTest.php
+++ b/web/core/modules/file/tests/src/Kernel/AccessTest.php
@@ -49,7 +49,7 @@ class AccessTest extends KernelTestBase {
 
     $this->installEntitySchema('file');
     $this->installEntitySchema('user');
-    $this->installSchema('file', array('file_usage'));
+    $this->installSchema('file', ['file_usage']);
     $this->installSchema('system', 'sequences');
 
     $this->user1 = User::create([
@@ -64,11 +64,11 @@ class AccessTest extends KernelTestBase {
     ]);
     $this->user2->save();
 
-    $this->file = File::create(array(
+    $this->file = File::create([
       'uid' => $this->user1->id(),
       'filename' => 'druplicon.txt',
       'filemime' => 'text/plain',
-    ));
+    ]);
   }
 
   /**
diff --git a/web/core/modules/file/tests/src/Kernel/CopyTest.php b/web/core/modules/file/tests/src/Kernel/CopyTest.php
index 8836bd484..3193cb661 100644
--- a/web/core/modules/file/tests/src/Kernel/CopyTest.php
+++ b/web/core/modules/file/tests/src/Kernel/CopyTest.php
@@ -13,7 +13,7 @@ class CopyTest extends FileManagedUnitTestBase {
   /**
    * Test file copying in the normal, base case.
    */
-  function testNormal() {
+  public function testNormal() {
     $contents = $this->randomMachineName(10);
     $source = $this->createFile(NULL, $contents);
     $desired_uri = 'public://' . $this->randomMachineName();
@@ -27,7 +27,7 @@ class CopyTest extends FileManagedUnitTestBase {
     $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file were copied correctly.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('copy', 'insert'));
+    $this->assertFileHooksCalled(['copy', 'insert']);
 
     $this->assertDifferentFile($source, $result);
     $this->assertEqual($result->getFileUri(), $desired_uri, 'The copied file entity has the desired filepath.');
@@ -42,7 +42,7 @@ class CopyTest extends FileManagedUnitTestBase {
   /**
    * Test renaming when copying over a file that already exists.
    */
-  function testExistingRename() {
+  public function testExistingRename() {
     // Setup a file to overwrite.
     $contents = $this->randomMachineName(10);
     $source = $this->createFile(NULL, $contents);
@@ -59,7 +59,7 @@ class CopyTest extends FileManagedUnitTestBase {
     $this->assertNotEqual($result->getFileUri(), $source->getFileUri(), 'Returned file path has changed from the original.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('copy', 'insert'));
+    $this->assertFileHooksCalled(['copy', 'insert']);
 
     // Load all the affected files to check the changes that actually made it
     // to the database.
@@ -82,7 +82,7 @@ class CopyTest extends FileManagedUnitTestBase {
   /**
    * Test replacement when copying over a file that already exists.
    */
-  function testExistingReplace() {
+  public function testExistingReplace() {
     // Setup a file to overwrite.
     $contents = $this->randomMachineName(10);
     $source = $this->createFile(NULL, $contents);
@@ -99,7 +99,7 @@ class CopyTest extends FileManagedUnitTestBase {
     $this->assertDifferentFile($source, $result);
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('load', 'copy', 'update'));
+    $this->assertFileHooksCalled(['load', 'copy', 'update']);
 
     // Load all the affected files to check the changes that actually made it
     // to the database.
@@ -121,7 +121,7 @@ class CopyTest extends FileManagedUnitTestBase {
    * Test that copying over an existing file fails when FILE_EXISTS_ERROR is
    * specified.
    */
-  function testExistingError() {
+  public function testExistingError() {
     $contents = $this->randomMachineName(10);
     $source = $this->createFile();
     $target = $this->createFile(NULL, $contents);
@@ -136,7 +136,7 @@ class CopyTest extends FileManagedUnitTestBase {
     $this->assertEqual($contents, file_get_contents($target->getFileUri()), 'Contents of file were not altered.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array());
+    $this->assertFileHooksCalled([]);
 
     $this->assertFileUnchanged($source, File::load($source->id()));
     $this->assertFileUnchanged($target, File::load($target->id()));
diff --git a/web/core/modules/file/tests/src/Kernel/DeleteTest.php b/web/core/modules/file/tests/src/Kernel/DeleteTest.php
index b88057121..3b868c0ad 100644
--- a/web/core/modules/file/tests/src/Kernel/DeleteTest.php
+++ b/web/core/modules/file/tests/src/Kernel/DeleteTest.php
@@ -13,13 +13,13 @@ class DeleteTest extends FileManagedUnitTestBase {
   /**
    * Tries deleting a normal file (as opposed to a directory, symlink, etc).
    */
-  function testUnused() {
+  public function testUnused() {
     $file = $this->createFile();
 
     // Check that deletion removes the file and database record.
     $this->assertTrue(is_file($file->getFileUri()), 'File exists.');
     $file->delete();
-    $this->assertFileHooksCalled(array('delete'));
+    $this->assertFileHooksCalled(['delete']);
     $this->assertFalse(file_exists($file->getFileUri()), 'Test file has actually been deleted.');
     $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
   }
@@ -27,7 +27,7 @@ class DeleteTest extends FileManagedUnitTestBase {
   /**
    * Tries deleting a file that is in use.
    */
-  function testInUse() {
+  public function testInUse() {
     $file = $this->createFile();
     $file_usage = $this->container->get('file.usage');
     $file_usage->add($file, 'testing', 'test', 1);
@@ -35,7 +35,7 @@ class DeleteTest extends FileManagedUnitTestBase {
 
     $file_usage->delete($file, 'testing', 'test', 1);
     $usage = $file_usage->listUsage($file);
-    $this->assertEqual($usage['testing']['test'], array(1 => 1), 'Test file is still in use.');
+    $this->assertEqual($usage['testing']['test'], [1 => 1], 'Test file is still in use.');
     $this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
     $this->assertTrue(File::load($file->id()), 'File still exists in the database.');
 
@@ -44,7 +44,7 @@ class DeleteTest extends FileManagedUnitTestBase {
 
     $file_usage->delete($file, 'testing', 'test', 1);
     $usage = $file_usage->listUsage($file);
-    $this->assertFileHooksCalled(array('load', 'update'));
+    $this->assertFileHooksCalled(['load', 'update']);
     $this->assertTrue(empty($usage), 'File usage data was removed.');
     $this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
     $file = File::load($file->id());
@@ -56,15 +56,15 @@ class DeleteTest extends FileManagedUnitTestBase {
     // of the file is older than the system.file.temporary_maximum_age
     // configuration value.
     db_update('file_managed')
-      ->fields(array(
+      ->fields([
         'changed' => REQUEST_TIME - ($this->config('system.file')->get('temporary_maximum_age') + 1),
-      ))
+      ])
       ->condition('fid', $file->id())
       ->execute();
     \Drupal::service('cron')->run();
 
     // file_cron() loads
-    $this->assertFileHooksCalled(array('delete'));
+    $this->assertFileHooksCalled(['delete']);
     $this->assertFalse(file_exists($file->getFileUri()), 'File has been deleted after its last usage was removed.');
     $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
   }
diff --git a/web/core/modules/file/tests/src/Kernel/FileItemTest.php b/web/core/modules/file/tests/src/Kernel/FileItemTest.php
index 747d5da70..8219af15d 100644
--- a/web/core/modules/file/tests/src/Kernel/FileItemTest.php
+++ b/web/core/modules/file/tests/src/Kernel/FileItemTest.php
@@ -23,7 +23,7 @@ class FileItemTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('file');
+  public static $modules = ['file'];
 
   /**
    * Created file entity.
@@ -43,20 +43,20 @@ class FileItemTest extends FieldKernelTestBase {
     parent::setUp();
 
     $this->installEntitySchema('file');
-    $this->installSchema('file', array('file_usage'));
+    $this->installSchema('file', ['file_usage']);
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'file_test',
       'entity_type' => 'entity_test',
       'type' => 'file',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ))->save();
+    ])->save();
     $this->directory = $this->getRandomGenerator()->name(8);
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'file_test',
       'bundle' => 'entity_test',
-      'settings' => array('file_directory' => $this->directory),
+      'settings' => ['file_directory' => $this->directory],
     ])->save();
     file_put_contents('public://example.txt', $this->randomMachineName());
     $this->file = File::create([
@@ -131,7 +131,7 @@ class FileItemTest extends FieldKernelTestBase {
       'weight' => 1,
     ])->save();
     $entity = EntityTest::create();
-    $entity->file_test = array('entity' => $file3);
+    $entity->file_test = ['entity' => $file3];
     $uri = $file3->getFileUri();
     $output = entity_view($entity, 'default');
     \Drupal::service('renderer')->renderRoot($output);
diff --git a/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php b/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
index 4db377ded..7c43e9bfd 100644
--- a/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
+++ b/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
@@ -18,17 +18,17 @@ abstract class FileManagedUnitTestBase extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('file_test', 'file', 'system', 'field', 'user');
+  public static $modules = ['file_test', 'file', 'system', 'field', 'user'];
 
   protected function setUp() {
     parent::setUp();
     // Clear out any hook calls.
     file_test_reset();
 
-    $this->installConfig(array('system'));
+    $this->installConfig(['system']);
     $this->installEntitySchema('file');
     $this->installEntitySchema('user');
-    $this->installSchema('file', array('file_usage'));
+    $this->installSchema('file', ['file_usage']);
 
     // Make sure that a user with uid 1 exists, self::createFile() relies on
     // it.
@@ -46,7 +46,7 @@ abstract class FileManagedUnitTestBase extends KernelTestBase {
    *   Array with string containing with the hook name, e.g. 'load', 'save',
    *   'insert', etc.
    */
-  function assertFileHooksCalled($expected) {
+  public function assertFileHooksCalled($expected) {
     \Drupal::state()->resetCache();
 
     // Determine which hooks were called.
@@ -55,16 +55,16 @@ abstract class FileManagedUnitTestBase extends KernelTestBase {
     // Determine if there were any expected that were not called.
     $uncalled = array_diff($expected, $actual);
     if (count($uncalled)) {
-      $this->assertTrue(FALSE, format_string('Expected hooks %expected to be called but %uncalled was not called.', array('%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled))));
+      $this->assertTrue(FALSE, format_string('Expected hooks %expected to be called but %uncalled was not called.', ['%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled)]));
     }
     else {
-      $this->assertTrue(TRUE, format_string('All the expected hooks were called: %expected', array('%expected' => empty($expected) ? '(none)' : implode(', ', $expected))));
+      $this->assertTrue(TRUE, format_string('All the expected hooks were called: %expected', ['%expected' => empty($expected) ? '(none)' : implode(', ', $expected)]));
     }
 
     // Determine if there were any unexpected calls.
     $unexpected = array_diff($actual, $expected);
     if (count($unexpected)) {
-      $this->assertTrue(FALSE, format_string('Unexpected hooks were called: %unexpected.', array('%unexpected' => empty($unexpected) ? '(none)' : implode(', ', $unexpected))));
+      $this->assertTrue(FALSE, format_string('Unexpected hooks were called: %unexpected.', ['%unexpected' => empty($unexpected) ? '(none)' : implode(', ', $unexpected)]));
     }
     else {
       $this->assertTrue(TRUE, 'No unexpected hooks were called.');
@@ -81,18 +81,18 @@ abstract class FileManagedUnitTestBase extends KernelTestBase {
    * @param string $message
    *   Optional translated string message.
    */
-  function assertFileHookCalled($hook, $expected_count = 1, $message = NULL) {
+  public function assertFileHookCalled($hook, $expected_count = 1, $message = NULL) {
     $actual_count = count(file_test_get_calls($hook));
 
     if (!isset($message)) {
       if ($actual_count == $expected_count) {
-        $message = format_string('hook_file_@name was called correctly.', array('@name' => $hook));
+        $message = format_string('hook_file_@name was called correctly.', ['@name' => $hook]);
       }
       elseif ($expected_count == 0) {
-        $message = \Drupal::translation()->formatPlural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', array('@name' => $hook, '@count' => $actual_count));
+        $message = \Drupal::translation()->formatPlural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', ['@name' => $hook, '@count' => $actual_count]);
       }
       else {
-        $message = format_string('hook_file_@name was expected to be called %expected times but was called %actual times.', array('@name' => $hook, '%expected' => $expected_count, '%actual' => $actual_count));
+        $message = format_string('hook_file_@name was expected to be called %expected times but was called %actual times.', ['@name' => $hook, '%expected' => $expected_count, '%actual' => $actual_count]);
       }
     }
     $this->assertEqual($actual_count, $expected_count, $message);
@@ -106,14 +106,14 @@ abstract class FileManagedUnitTestBase extends KernelTestBase {
    * @param \Drupal\file\FileInterface $after
    *   File object to compare.
    */
-  function assertFileUnchanged(FileInterface $before, FileInterface $after) {
-    $this->assertEqual($before->id(), $after->id(), t('File id is the same: %file1 == %file2.', array('%file1' => $before->id(), '%file2' => $after->id())), 'File unchanged');
-    $this->assertEqual($before->getOwner()->id(), $after->getOwner()->id(), t('File owner is the same: %file1 == %file2.', array('%file1' => $before->getOwner()->id(), '%file2' => $after->getOwner()->id())), 'File unchanged');
-    $this->assertEqual($before->getFilename(), $after->getFilename(), t('File name is the same: %file1 == %file2.', array('%file1' => $before->getFilename(), '%file2' => $after->getFilename())), 'File unchanged');
-    $this->assertEqual($before->getFileUri(), $after->getFileUri(), t('File path is the same: %file1 == %file2.', array('%file1' => $before->getFileUri(), '%file2' => $after->getFileUri())), 'File unchanged');
-    $this->assertEqual($before->getMimeType(), $after->getMimeType(), t('File MIME type is the same: %file1 == %file2.', array('%file1' => $before->getMimeType(), '%file2' => $after->getMimeType())), 'File unchanged');
-    $this->assertEqual($before->getSize(), $after->getSize(), t('File size is the same: %file1 == %file2.', array('%file1' => $before->getSize(), '%file2' => $after->getSize())), 'File unchanged');
-    $this->assertEqual($before->isPermanent(), $after->isPermanent(), t('File status is the same: %file1 == %file2.', array('%file1' => $before->isPermanent(), '%file2' => $after->isPermanent())), 'File unchanged');
+  public function assertFileUnchanged(FileInterface $before, FileInterface $after) {
+    $this->assertEqual($before->id(), $after->id(), t('File id is the same: %file1 == %file2.', ['%file1' => $before->id(), '%file2' => $after->id()]), 'File unchanged');
+    $this->assertEqual($before->getOwner()->id(), $after->getOwner()->id(), t('File owner is the same: %file1 == %file2.', ['%file1' => $before->getOwner()->id(), '%file2' => $after->getOwner()->id()]), 'File unchanged');
+    $this->assertEqual($before->getFilename(), $after->getFilename(), t('File name is the same: %file1 == %file2.', ['%file1' => $before->getFilename(), '%file2' => $after->getFilename()]), 'File unchanged');
+    $this->assertEqual($before->getFileUri(), $after->getFileUri(), t('File path is the same: %file1 == %file2.', ['%file1' => $before->getFileUri(), '%file2' => $after->getFileUri()]), 'File unchanged');
+    $this->assertEqual($before->getMimeType(), $after->getMimeType(), t('File MIME type is the same: %file1 == %file2.', ['%file1' => $before->getMimeType(), '%file2' => $after->getMimeType()]), 'File unchanged');
+    $this->assertEqual($before->getSize(), $after->getSize(), t('File size is the same: %file1 == %file2.', ['%file1' => $before->getSize(), '%file2' => $after->getSize()]), 'File unchanged');
+    $this->assertEqual($before->isPermanent(), $after->isPermanent(), t('File status is the same: %file1 == %file2.', ['%file1' => $before->isPermanent(), '%file2' => $after->isPermanent()]), 'File unchanged');
   }
 
   /**
@@ -124,9 +124,9 @@ abstract class FileManagedUnitTestBase extends KernelTestBase {
    * @param \Drupal\file\FileInterface $file2
    *   File object to compare.
    */
-  function assertDifferentFile(FileInterface $file1, FileInterface $file2) {
-    $this->assertNotEqual($file1->id(), $file2->id(), t('Files have different ids: %file1 != %file2.', array('%file1' => $file1->id(), '%file2' => $file2->id())), 'Different file');
-    $this->assertNotEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have different paths: %file1 != %file2.', array('%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri())), 'Different file');
+  public function assertDifferentFile(FileInterface $file1, FileInterface $file2) {
+    $this->assertNotEqual($file1->id(), $file2->id(), t('Files have different ids: %file1 != %file2.', ['%file1' => $file1->id(), '%file2' => $file2->id()]), 'Different file');
+    $this->assertNotEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have different paths: %file1 != %file2.', ['%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri()]), 'Different file');
   }
 
   /**
@@ -137,9 +137,9 @@ abstract class FileManagedUnitTestBase extends KernelTestBase {
    * @param \Drupal\file\FileInterface $file2
    *   File object to compare.
    */
-  function assertSameFile(FileInterface $file1, FileInterface $file2) {
-    $this->assertEqual($file1->id(), $file2->id(), t('Files have the same ids: %file1 == %file2.', array('%file1' => $file1->id(), '%file2-fid' => $file2->id())), 'Same file');
-    $this->assertEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have the same path: %file1 == %file2.', array('%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri())), 'Same file');
+  public function assertSameFile(FileInterface $file1, FileInterface $file2) {
+    $this->assertEqual($file1->id(), $file2->id(), t('Files have the same ids: %file1 == %file2.', ['%file1' => $file1->id(), '%file2-fid' => $file2->id()]), 'Same file');
+    $this->assertEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have the same path: %file1 == %file2.', ['%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri()]), 'Same file');
   }
 
   /**
@@ -158,7 +158,7 @@ abstract class FileManagedUnitTestBase extends KernelTestBase {
    * @return \Drupal\file\FileInterface
    *   File entity.
    */
-  function createFile($filepath = NULL, $contents = NULL, $scheme = NULL) {
+  public function createFile($filepath = NULL, $contents = NULL, $scheme = NULL) {
     // Don't count hook invocations caused by creating the file.
     \Drupal::state()->set('file_test.count_hook_invocations', FALSE);
     $file = File::create([
@@ -190,7 +190,7 @@ abstract class FileManagedUnitTestBase extends KernelTestBase {
    * @return string
    *   File URI.
    */
-  function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
+  public function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
     if (!isset($filepath)) {
       // Prefix with non-latin characters to ensure that all file-related
       // tests work with international filenames.
diff --git a/web/core/modules/file/tests/src/Kernel/LoadTest.php b/web/core/modules/file/tests/src/Kernel/LoadTest.php
index c523d43bf..9d715395b 100644
--- a/web/core/modules/file/tests/src/Kernel/LoadTest.php
+++ b/web/core/modules/file/tests/src/Kernel/LoadTest.php
@@ -13,33 +13,33 @@ class LoadTest extends FileManagedUnitTestBase {
   /**
    * Try to load a non-existent file by fid.
    */
-  function testLoadMissingFid() {
+  public function testLoadMissingFid() {
     $this->assertFalse(File::load(-1), 'Try to load an invalid fid fails.');
-    $this->assertFileHooksCalled(array());
+    $this->assertFileHooksCalled([]);
   }
 
   /**
    * Try to load a non-existent file by URI.
    */
-  function testLoadMissingFilepath() {
-    $files = entity_load_multiple_by_properties('file', array('uri' => 'foobar://misc/druplicon.png'));
+  public function testLoadMissingFilepath() {
+    $files = entity_load_multiple_by_properties('file', ['uri' => 'foobar://misc/druplicon.png']);
     $this->assertFalse(reset($files), "Try to load a file that doesn't exist in the database fails.");
-    $this->assertFileHooksCalled(array());
+    $this->assertFileHooksCalled([]);
   }
 
   /**
    * Try to load a non-existent file by status.
    */
-  function testLoadInvalidStatus() {
-    $files = entity_load_multiple_by_properties('file', array('status' => -99));
+  public function testLoadInvalidStatus() {
+    $files = entity_load_multiple_by_properties('file', ['status' => -99]);
     $this->assertFalse(reset($files), 'Trying to load a file with an invalid status fails.');
-    $this->assertFileHooksCalled(array());
+    $this->assertFileHooksCalled([]);
   }
 
   /**
    * Load a single file and ensure that the correct values are returned.
    */
-  function testSingleValues() {
+  public function testSingleValues() {
     // Create a new file entity from scratch so we know the values.
     $file = $this->createFile('druplicon.txt', NULL, 'public');
     $by_fid_file = File::load($file->id());
@@ -56,13 +56,13 @@ class LoadTest extends FileManagedUnitTestBase {
   /**
    * This will test loading file data from the database.
    */
-  function testMultiple() {
+  public function testMultiple() {
     // Create a new file entity.
     $file = $this->createFile('druplicon.txt', NULL, 'public');
 
     // Load by path.
     file_test_reset();
-    $by_path_files = entity_load_multiple_by_properties('file', array('uri' => $file->getFileUri()));
+    $by_path_files = entity_load_multiple_by_properties('file', ['uri' => $file->getFileUri()]);
     $this->assertFileHookCalled('load');
     $this->assertEqual(1, count($by_path_files), 'entity_load_multiple_by_properties() returned an array of the correct size.');
     $by_path_file = reset($by_path_files);
@@ -71,8 +71,8 @@ class LoadTest extends FileManagedUnitTestBase {
 
     // Load by fid.
     file_test_reset();
-    $by_fid_files = File::loadMultiple(array($file->id()));
-    $this->assertFileHooksCalled(array());
+    $by_fid_files = File::loadMultiple([$file->id()]);
+    $this->assertFileHooksCalled([]);
     $this->assertEqual(1, count($by_fid_files), '\Drupal\file\Entity\File::loadMultiple() returned an array of the correct size.');
     $by_fid_file = reset($by_fid_files);
     $this->assertTrue($by_fid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php
index c1c6bf9a4..6788d7c69 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\file\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
index 7e1cff91b..989eb1590 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
@@ -69,33 +69,77 @@ class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlter
     $this->assertEntity(1, 'Image1.png', '39325', 'public://image-1.png', 'image/png', '1');
     $this->assertEntity(2, 'Image2.jpg', '1831', 'public://image-2.jpg', 'image/jpeg', '1');
     $this->assertEntity(3, 'Image-test.gif', '183', 'public://image-test.gif', 'image/jpeg', '1');
-    $this->assertEntity(5, 'html-1.txt', '24', 'public://html-1.txt', 'text/plain', '1');
+    $this->assertEntity(4, 'html-1.txt', '24', 'public://html-1.txt', 'text/plain', '1');
+
+    $map_table = $this->getMigration('d6_file')->getIdMap()->mapTableName();
+    $map = \Drupal::database()
+      ->select($map_table, 'm')
+      ->fields('m', ['sourceid1', 'destid1'])
+      ->execute()
+      ->fetchAllKeyed();
+    $map_expected = [
+      // The 4 files from the fixture.
+      1 => '1',
+      2 => '2',
+      3 => '3',
+      5 => '4',
+      // The file updated in migrateDumpAlter().
+      6 => NULL,
+      // The file created in migrateDumpAlter().
+      7 => '4',
+    ];
+    $this->assertEquals($map_expected, $map);
 
     // Test that we can re-import and also test with file_directory_path set.
     \Drupal::database()
-      ->truncate($this->getMigration('d6_file')->getIdMap()->mapTableName())
+      ->truncate($map_table)
       ->execute();
 
     // Update the file_directory_path.
     Database::getConnection('default', 'migrate')
       ->update('variable')
-      ->fields(array('value' => serialize('files/test')))
+      ->fields(['value' => serialize('files/test')])
       ->condition('name', 'file_directory_path')
       ->execute();
     Database::getConnection('default', 'migrate')
       ->update('variable')
-      ->fields(array('value' => serialize(file_directory_temp())))
+      ->fields(['value' => serialize(file_directory_temp())])
       ->condition('name', 'file_directory_temp')
       ->execute();
 
     $this->executeMigration('d6_file');
 
-    $file = File::load(2);
+    // File 2, when migrated for the second time, is treated as a different file
+    // (due to having a different uri this time) and is given fid 6.
+    $file = File::load(6);
     $this->assertIdentical('public://core/modules/simpletest/files/image-2.jpg', $file->getFileUri());
 
-    // File 7, created in static::migrateDumpAlter(), shares a path with
-    // file 5, which means it should be skipped entirely.
-    $this->assertNull(File::load(7));
+    $map_table = $this->getMigration('d6_file')->getIdMap()->mapTableName();
+    $map = \Drupal::database()
+      ->select($map_table, 'm')
+      ->fields('m', ['sourceid1', 'destid1'])
+      ->execute()
+      ->fetchAllKeyed();
+    $map_expected = [
+      // The 4 files from the fixture.
+      1 => '5',
+      2 => '6',
+      3 => '7',
+      5 => '8',
+      // The file updated in migrateDumpAlter().
+      6 => NULL,
+      // The files created in migrateDumpAlter().
+      7 => '8',
+      8 => '8',
+    ];
+    $this->assertEquals($map_expected, $map);
+
+    // File 6, created in static::migrateDumpAlter(), shares a path with
+    // file 4, which means it should be skipped entirely. If it was migrated
+    // then it would have an fid of 9.
+    $this->assertNull(File::load(9));
+
+    $this->assertEquals(8, count(File::loadMultiple()));
   }
 
   /**
@@ -122,10 +166,10 @@ class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlter
 
     $db->update('files')
       ->condition('fid', 6)
-      ->fields(array(
+      ->fields([
         'filename' => static::$tempFilename,
         'filepath' => $file_path,
-      ))
+      ])
       ->execute();
 
     $file = (array) $db->select('files')
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
index a813b93cc..c3b71ad42 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
@@ -38,7 +38,7 @@ class MigrateUploadEntityDisplayTest extends MigrateDrupal6TestBase {
     $component = $display->getComponent('upload');
     $this->assertTrue(is_null($component));
 
-    $this->assertIdentical(array('node', 'page', 'default', 'upload'), $this->getMigration('d6_upload_entity_display')->getIdMap()->lookupDestinationID(array('page')));
+    $this->assertIdentical(['node', 'page', 'default', 'upload'], $this->getMigration('d6_upload_entity_display')->getIdMap()->lookupDestinationID(['page']));
   }
 
 }
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
index de0acbfd4..e9782aa90 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
@@ -38,7 +38,7 @@ class MigrateUploadEntityFormDisplayTest extends MigrateDrupal6TestBase {
     $component = $display->getComponent('upload');
     $this->assertTrue(is_null($component));
 
-    $this->assertIdentical(array('node', 'page', 'default', 'upload'), $this->getMigration('d6_upload_entity_form_display')->getIdMap()->lookupDestinationID(array('page')));
+    $this->assertIdentical(['node', 'page', 'default', 'upload'], $this->getMigration('d6_upload_entity_form_display')->getIdMap()->lookupDestinationID(['page']));
   }
 
 }
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadFieldTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadFieldTest.php
index 9d5c711d5..918d6f3c5 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadFieldTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadFieldTest.php
@@ -26,7 +26,7 @@ class MigrateUploadFieldTest extends MigrateDrupal6TestBase {
   public function testUpload() {
     $field_storage = FieldStorageConfig::load('node.upload');
     $this->assertIdentical('node.upload', $field_storage->id());
-    $this->assertIdentical(array('node', 'upload'), $this->getMigration('d6_upload_field')->getIdMap()->lookupDestinationID(array('')));
+    $this->assertIdentical(['node', 'upload'], $this->getMigration('d6_upload_field')->getIdMap()->lookupDestinationID(['']));
   }
 
 }
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
index a835006af..18c4a71bc 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
@@ -38,7 +38,7 @@ class MigrateUploadInstanceTest extends MigrateDrupal6TestBase {
     $field = FieldConfig::load('node.article.upload');
     $this->assertTrue(is_null($field));
 
-    $this->assertIdentical(array('node', 'page', 'upload'), $this->getMigration('d6_upload_field_instance')->getIdMap()->lookupDestinationID(array('page')));
+    $this->assertIdentical(['node', 'page', 'upload'], $this->getMigration('d6_upload_field_instance')->getIdMap()->lookupDestinationID(['page']));
   }
 
 }
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
index 463ce022d..e511a217c 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
@@ -24,10 +24,10 @@ class MigrateUploadTest extends MigrateDrupal6TestBase {
     $this->installSchema('file', ['file_usage']);
     $this->installSchema('node', ['node_access']);
 
-    $id_mappings = array('d6_file' => array());
+    $id_mappings = ['d6_file' => []];
     // Create new file entities.
     for ($i = 1; $i <= 3; $i++) {
-      $file = File::create(array(
+      $file = File::create([
         'fid' => $i,
         'uid' => 1,
         'filename' => 'druplicon.txt',
@@ -36,13 +36,13 @@ class MigrateUploadTest extends MigrateDrupal6TestBase {
         'created' => 1,
         'changed' => 1,
         'status' => FILE_STATUS_PERMANENT,
-      ));
+      ]);
       $file->enforceIsNew();
       file_put_contents($file->getFileUri(), 'hello world');
 
       // Save it, inserting a new record.
       $file->save();
-      $id_mappings['d6_file'][] = array(array($i), array($i));
+      $id_mappings['d6_file'][] = [[$i], [$i]];
     }
     $this->prepareMigrations($id_mappings);
 
@@ -57,7 +57,7 @@ class MigrateUploadTest extends MigrateDrupal6TestBase {
   /**
    * Test upload migration from Drupal 6 to Drupal 8.
    */
-  function testUpload() {
+  public function testUpload() {
     $this->container->get('entity.manager')
       ->getStorage('node')
       ->resetCache([1, 2]);
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileConfigsTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileConfigsTest.php
index 45059eca7..90fd50669 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileConfigsTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\file\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
diff --git a/web/core/modules/file/tests/src/Kernel/MoveTest.php b/web/core/modules/file/tests/src/Kernel/MoveTest.php
index a56caeaec..3183ecfe4 100644
--- a/web/core/modules/file/tests/src/Kernel/MoveTest.php
+++ b/web/core/modules/file/tests/src/Kernel/MoveTest.php
@@ -13,7 +13,7 @@ class MoveTest extends FileManagedUnitTestBase {
   /**
    * Move a normal file.
    */
-  function testNormal() {
+  public function testNormal() {
     $contents = $this->randomMachineName(10);
     $source = $this->createFile(NULL, $contents);
     $desired_filepath = 'public://' . $this->randomMachineName();
@@ -28,10 +28,10 @@ class MoveTest extends FileManagedUnitTestBase {
     $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file correctly written.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('move', 'load', 'update'));
+    $this->assertFileHooksCalled(['move', 'load', 'update']);
 
     // Make sure we got the same file back.
-    $this->assertEqual($source->id(), $result->id(), format_string("Source file id's' %fid is unchanged after move.", array('%fid' => $source->id())));
+    $this->assertEqual($source->id(), $result->id(), format_string("Source file id's' %fid is unchanged after move.", ['%fid' => $source->id()]));
 
     // Reload the file from the database and check that the changes were
     // actually saved.
@@ -43,7 +43,7 @@ class MoveTest extends FileManagedUnitTestBase {
   /**
    * Test renaming when moving onto a file that already exists.
    */
-  function testExistingRename() {
+  public function testExistingRename() {
     // Setup a file to overwrite.
     $contents = $this->randomMachineName(10);
     $source = $this->createFile(NULL, $contents);
@@ -60,7 +60,7 @@ class MoveTest extends FileManagedUnitTestBase {
     $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file correctly written.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('move', 'load', 'update'));
+    $this->assertFileHooksCalled(['move', 'load', 'update']);
 
     // Compare the returned value to what made it into the database.
     $this->assertFileUnchanged($result, File::load($result->id()));
@@ -78,7 +78,7 @@ class MoveTest extends FileManagedUnitTestBase {
   /**
    * Test replacement when moving onto a file that already exists.
    */
-  function testExistingReplace() {
+  public function testExistingReplace() {
     // Setup a file to overwrite.
     $contents = $this->randomMachineName(10);
     $source = $this->createFile(NULL, $contents);
@@ -95,7 +95,7 @@ class MoveTest extends FileManagedUnitTestBase {
     $this->assertTrue($result, 'File moved successfully.');
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('move', 'update', 'delete', 'load'));
+    $this->assertFileHooksCalled(['move', 'update', 'delete', 'load']);
 
     // Reload the file from the database and check that the changes were
     // actually saved.
@@ -110,7 +110,7 @@ class MoveTest extends FileManagedUnitTestBase {
   /**
    * Test replacement when moving onto itself.
    */
-  function testExistingReplaceSelf() {
+  public function testExistingReplaceSelf() {
     // Setup a file to overwrite.
     $contents = $this->randomMachineName(10);
     $source = $this->createFile(NULL, $contents);
@@ -122,7 +122,7 @@ class MoveTest extends FileManagedUnitTestBase {
     $this->assertEqual($contents, file_get_contents($source->getFileUri()), 'Contents of file were not altered.');
 
     // Check that no hooks were called while failing.
-    $this->assertFileHooksCalled(array());
+    $this->assertFileHooksCalled([]);
 
     // Load the file from the database and make sure it is identical to what
     // was returned.
@@ -133,7 +133,7 @@ class MoveTest extends FileManagedUnitTestBase {
    * Test that moving onto an existing file fails when FILE_EXISTS_ERROR is
    * specified.
    */
-  function testExistingError() {
+  public function testExistingError() {
     $contents = $this->randomMachineName(10);
     $source = $this->createFile();
     $target = $this->createFile(NULL, $contents);
@@ -149,7 +149,7 @@ class MoveTest extends FileManagedUnitTestBase {
     $this->assertEqual($contents, file_get_contents($target->getFileUri()), 'Contents of file were not altered.');
 
     // Check that no hooks were called while failing.
-    $this->assertFileHooksCalled(array());
+    $this->assertFileHooksCalled([]);
 
     // Load the file from the database and make sure it is identical to what
     // was returned.
diff --git a/web/core/modules/file/tests/src/Kernel/SaveDataTest.php b/web/core/modules/file/tests/src/Kernel/SaveDataTest.php
index c5637d08d..747c7b1ca 100644
--- a/web/core/modules/file/tests/src/Kernel/SaveDataTest.php
+++ b/web/core/modules/file/tests/src/Kernel/SaveDataTest.php
@@ -13,7 +13,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
   /**
    * Test the file_save_data() function when no filename is provided.
    */
-  function testWithoutFilename() {
+  public function testWithoutFilename() {
     $contents = $this->randomMachineName(8);
 
     $result = file_save_data($contents);
@@ -26,7 +26,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
     $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('insert'));
+    $this->assertFileHooksCalled(['insert']);
 
     // Verify that what was returned is what's in the database.
     $this->assertFileUnchanged($result, File::load($result->id()));
@@ -35,7 +35,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
   /**
    * Test the file_save_data() function when a filename is provided.
    */
-  function testWithFilename() {
+  public function testWithFilename() {
     $contents = $this->randomMachineName(8);
 
     // Using filename with non-latin characters.
@@ -51,7 +51,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
     $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('insert'));
+    $this->assertFileHooksCalled(['insert']);
 
     // Verify that what was returned is what's in the database.
     $this->assertFileUnchanged($result, File::load($result->id()));
@@ -60,7 +60,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
   /**
    * Test file_save_data() when renaming around an existing file.
    */
-  function testExistingRename() {
+  public function testExistingRename() {
     // Setup a file to overwrite.
     $existing = $this->createFile();
     $contents = $this->randomMachineName(8);
@@ -75,7 +75,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
     $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('insert'));
+    $this->assertFileHooksCalled(['insert']);
 
     // Ensure that the existing file wasn't overwritten.
     $this->assertDifferentFile($existing, $result);
@@ -88,7 +88,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
   /**
    * Test file_save_data() when replacing an existing file.
    */
-  function testExistingReplace() {
+  public function testExistingReplace() {
     // Setup a file to overwrite.
     $existing = $this->createFile();
     $contents = $this->randomMachineName(8);
@@ -103,7 +103,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
     $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('load', 'update'));
+    $this->assertFileHooksCalled(['load', 'update']);
 
     // Verify that the existing file was re-used.
     $this->assertSameFile($existing, $result);
@@ -115,7 +115,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
   /**
    * Test that file_save_data() fails overwriting an existing file.
    */
-  function testExistingError() {
+  public function testExistingError() {
     $contents = $this->randomMachineName(8);
     $existing = $this->createFile(NULL, $contents);
 
@@ -125,7 +125,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
     $this->assertEqual($contents, file_get_contents($existing->getFileUri()), 'Contents of existing file were unchanged.');
 
     // Check that no hooks were called while failing.
-    $this->assertFileHooksCalled(array());
+    $this->assertFileHooksCalled([]);
 
     // Ensure that the existing file wasn't overwritten.
     $this->assertFileUnchanged($existing, File::load($existing->id()));
diff --git a/web/core/modules/file/tests/src/Kernel/SaveTest.php b/web/core/modules/file/tests/src/Kernel/SaveTest.php
index 69c7f2b7a..87eb17b20 100644
--- a/web/core/modules/file/tests/src/Kernel/SaveTest.php
+++ b/web/core/modules/file/tests/src/Kernel/SaveTest.php
@@ -10,22 +10,22 @@ use Drupal\file\Entity\File;
  * @group file
  */
 class SaveTest extends FileManagedUnitTestBase {
-  function testFileSave() {
+  public function testFileSave() {
     // Create a new file entity.
-    $file = File::create(array(
+    $file = File::create([
       'uid' => 1,
       'filename' => 'druplicon.txt',
       'uri' => 'public://druplicon.txt',
       'filemime' => 'text/plain',
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     file_put_contents($file->getFileUri(), 'hello world');
 
     // Save it, inserting a new record.
     $file->save();
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('insert'));
+    $this->assertFileHooksCalled(['insert']);
 
     $this->assertTrue($file->id() > 0, 'A new file ID is set when saving a new file to the database.', 'File');
     $loaded_file = File::load($file->id());
@@ -41,7 +41,7 @@ class SaveTest extends FileManagedUnitTestBase {
     $file->save();
 
     // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('load', 'update'));
+    $this->assertFileHooksCalled(['load', 'update']);
 
     $this->assertEqual($file->id(), $file->id(), 'The file ID of an existing file is not changed when updating the database.', 'File');
     $this->assertTrue($file->getChangedTime() >= $file->getChangedTime(), "Timestamp didn't go backwards.", 'File');
@@ -52,13 +52,13 @@ class SaveTest extends FileManagedUnitTestBase {
 
     // Try to insert a second file with the same name apart from case insensitivity
     // to ensure the 'uri' index allows for filenames with different cases.
-    $uppercase_values = array(
+    $uppercase_values = [
       'uid' => 1,
       'filename' => 'DRUPLICON.txt',
       'uri' => 'public://DRUPLICON.txt',
       'filemime' => 'text/plain',
       'status' => FILE_STATUS_PERMANENT,
-    );
+    ];
     $uppercase_file = File::create($uppercase_values);
     file_put_contents($uppercase_file->getFileUri(), 'hello world');
     $violations = $uppercase_file->validate();
@@ -79,7 +79,7 @@ class SaveTest extends FileManagedUnitTestBase {
       ->execute();
 
     $this->assertEqual(1, count($fids));
-    $this->assertEqual(array($uppercase_file->id() => $uppercase_file->id()), $fids);
+    $this->assertEqual([$uppercase_file->id() => $uppercase_file->id()], $fids);
 
   }
 
diff --git a/web/core/modules/file/tests/src/Kernel/SpaceUsedTest.php b/web/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
index f8752c4f6..7dbc7fdee 100644
--- a/web/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
+++ b/web/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
@@ -52,7 +52,7 @@ class SpaceUsedTest extends FileManagedUnitTestBase {
   /**
    * Test different users with the default status.
    */
-  function testFileSpaceUsed() {
+  public function testFileSpaceUsed() {
     $file = $this->container->get('entity.manager')->getStorage('file');
     // Test different users with default status.
     $this->assertEqual($file->spaceUsed(2), 70);
diff --git a/web/core/modules/file/tests/src/Kernel/UsageTest.php b/web/core/modules/file/tests/src/Kernel/UsageTest.php
index 8e2601510..672de0fb5 100644
--- a/web/core/modules/file/tests/src/Kernel/UsageTest.php
+++ b/web/core/modules/file/tests/src/Kernel/UsageTest.php
@@ -18,25 +18,25 @@ class UsageTest extends FileManagedUnitTestBase {
   /**
    * Tests \Drupal\file\FileUsage\DatabaseFileUsageBackend::listUsage().
    */
-  function testGetUsage() {
+  public function testGetUsage() {
     $file = $this->createFile();
     db_insert('file_usage')
-      ->fields(array(
+      ->fields([
         'fid' => $file->id(),
         'module' => 'testing',
         'type' => 'foo',
         'id' => 1,
         'count' => 1
-      ))
+      ])
       ->execute();
     db_insert('file_usage')
-      ->fields(array(
+      ->fields([
         'fid' => $file->id(),
         'module' => 'testing',
         'type' => 'bar',
         'id' => 2,
         'count' => 2
-      ))
+      ])
       ->execute();
 
     $usage = $this->container->get('file.usage')->listUsage($file);
@@ -51,7 +51,7 @@ class UsageTest extends FileManagedUnitTestBase {
   /**
    * Tests \Drupal\file\FileUsage\DatabaseFileUsageBackend::add().
    */
-  function testAddUsage() {
+  public function testAddUsage() {
     $file = $this->createFile();
     $file_usage = $this->container->get('file.usage');
     $file_usage->add($file, 'testing', 'foo', 1);
@@ -77,23 +77,23 @@ class UsageTest extends FileManagedUnitTestBase {
   /**
    * Tests \Drupal\file\FileUsage\DatabaseFileUsageBackend::delete().
    */
-  function testRemoveUsage() {
+  public function testRemoveUsage() {
     $file = $this->createFile();
     $file_usage = $this->container->get('file.usage');
     db_insert('file_usage')
-      ->fields(array(
+      ->fields([
         'fid' => $file->id(),
         'module' => 'testing',
         'type' => 'bar',
         'id' => 2,
         'count' => 3,
-      ))
+      ])
       ->execute();
 
     // Normal decrement.
     $file_usage->delete($file, 'testing', 'bar', 2);
     $count = db_select('file_usage', 'f')
-      ->fields('f', array('count'))
+      ->fields('f', ['count'])
       ->condition('f.fid', $file->id())
       ->execute()
       ->fetchField();
@@ -102,7 +102,7 @@ class UsageTest extends FileManagedUnitTestBase {
     // Multiple decrement and removal.
     $file_usage->delete($file, 'testing', 'bar', 2, 2);
     $count = db_select('file_usage', 'f')
-      ->fields('f', array('count'))
+      ->fields('f', ['count'])
       ->condition('f.fid', $file->id())
       ->execute()
       ->fetchField();
@@ -111,7 +111,7 @@ class UsageTest extends FileManagedUnitTestBase {
     // Non-existent decrement.
     $file_usage->delete($file, 'testing', 'bar', 2);
     $count = db_select('file_usage', 'f')
-      ->fields('f', array('count'))
+      ->fields('f', ['count'])
       ->condition('f.fid', $file->id())
       ->execute()
       ->fetchField();
@@ -124,14 +124,14 @@ class UsageTest extends FileManagedUnitTestBase {
    * We are using UPDATE statements because using the API would set the
    * timestamp.
    */
-  function createTempFiles() {
+  public function createTempFiles() {
     // Temporary file that is old.
     $temp_old = file_save_data('');
     db_update('file_managed')
-      ->fields(array(
+      ->fields([
         'status' => 0,
         'changed' => REQUEST_TIME - $this->config('system.file')->get('temporary_maximum_age') - 1,
-      ))
+      ])
       ->condition('fid', $temp_old->id())
       ->execute();
     $this->assertTrue(file_exists($temp_old->getFileUri()), 'Old temp file was created correctly.');
@@ -139,7 +139,7 @@ class UsageTest extends FileManagedUnitTestBase {
     // Temporary file that is new.
     $temp_new = file_save_data('');
     db_update('file_managed')
-      ->fields(array('status' => 0))
+      ->fields(['status' => 0])
       ->condition('fid', $temp_new->id())
       ->execute();
     $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was created correctly.');
@@ -147,7 +147,7 @@ class UsageTest extends FileManagedUnitTestBase {
     // Permanent file that is old.
     $perm_old = file_save_data('');
     db_update('file_managed')
-      ->fields(array('changed' => REQUEST_TIME - $this->config('system.file')->get('temporary_maximum_age') - 1))
+      ->fields(['changed' => REQUEST_TIME - $this->config('system.file')->get('temporary_maximum_age') - 1])
       ->condition('fid', $temp_old->id())
       ->execute();
     $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was created correctly.');
@@ -155,13 +155,13 @@ class UsageTest extends FileManagedUnitTestBase {
     // Permanent file that is new.
     $perm_new = file_save_data('');
     $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was created correctly.');
-    return array($temp_old, $temp_new, $perm_old, $perm_new);
+    return [$temp_old, $temp_new, $perm_old, $perm_new];
   }
 
   /**
    * Ensure that temporary files are removed by default.
    */
-  function testTempFileCleanupDefault() {
+  public function testTempFileCleanupDefault() {
     list($temp_old, $temp_new, $perm_old, $perm_new) = $this->createTempFiles();
 
     // Run cron and then ensure that only the old, temp file was deleted.
@@ -175,7 +175,7 @@ class UsageTest extends FileManagedUnitTestBase {
   /**
    * Ensure that temporary files are kept as configured.
    */
-  function testTempFileNoCleanup() {
+  public function testTempFileNoCleanup() {
     list($temp_old, $temp_new, $perm_old, $perm_new) = $this->createTempFiles();
 
     // Set the max age to 0, meaning no temporary files will be deleted.
@@ -194,7 +194,7 @@ class UsageTest extends FileManagedUnitTestBase {
   /**
    * Ensure that temporary files are kept as configured.
    */
-  function testTempFileCustomCleanup() {
+  public function testTempFileCustomCleanup() {
     list($temp_old, $temp_new, $perm_old, $perm_new) = $this->createTempFiles();
 
     // Set the max age to older than default.
diff --git a/web/core/modules/file/tests/src/Kernel/ValidateTest.php b/web/core/modules/file/tests/src/Kernel/ValidateTest.php
index 0bfcfddd4..285cc86dc 100644
--- a/web/core/modules/file/tests/src/Kernel/ValidateTest.php
+++ b/web/core/modules/file/tests/src/Kernel/ValidateTest.php
@@ -12,27 +12,27 @@ class ValidateTest extends FileManagedUnitTestBase {
   /**
    * Test that the validators passed into are checked.
    */
-  function testCallerValidation() {
+  public function testCallerValidation() {
     $file = $this->createFile();
 
     // Empty validators.
-    $this->assertEqual(file_validate($file, array()), array(), 'Validating an empty array works successfully.');
-    $this->assertFileHooksCalled(array('validate'));
+    $this->assertEqual(file_validate($file, []), [], 'Validating an empty array works successfully.');
+    $this->assertFileHooksCalled(['validate']);
 
     // Use the file_test.module's test validator to ensure that passing tests
     // return correctly.
     file_test_reset();
-    file_test_set_return('validate', array());
-    $passing = array('file_test_validator' => array(array()));
-    $this->assertEqual(file_validate($file, $passing), array(), 'Validating passes.');
-    $this->assertFileHooksCalled(array('validate'));
+    file_test_set_return('validate', []);
+    $passing = ['file_test_validator' => [[]]];
+    $this->assertEqual(file_validate($file, $passing), [], 'Validating passes.');
+    $this->assertFileHooksCalled(['validate']);
 
     // Now test for failures in validators passed in and by hook_validate.
     file_test_reset();
-    file_test_set_return('validate', array('Epic fail'));
-    $failing = array('file_test_validator' => array(array('Failed', 'Badly')));
-    $this->assertEqual(file_validate($file, $failing), array('Failed', 'Badly', 'Epic fail'), 'Validating returns errors.');
-    $this->assertFileHooksCalled(array('validate'));
+    file_test_set_return('validate', ['Epic fail']);
+    $failing = ['file_test_validator' => [['Failed', 'Badly']]];
+    $this->assertEqual(file_validate($file, $failing), ['Failed', 'Badly', 'Epic fail'], 'Validating returns errors.');
+    $this->assertFileHooksCalled(['validate']);
   }
 
 }
diff --git a/web/core/modules/file/tests/src/Kernel/ValidatorTest.php b/web/core/modules/file/tests/src/Kernel/ValidatorTest.php
index 30a6fe8be..b645f3913 100644
--- a/web/core/modules/file/tests/src/Kernel/ValidatorTest.php
+++ b/web/core/modules/file/tests/src/Kernel/ValidatorTest.php
@@ -40,7 +40,7 @@ class ValidatorTest extends FileManagedUnitTestBase {
   /**
    * Test the file_validate_extensions() function.
    */
-  function testFileValidateExtensions() {
+  public function testFileValidateExtensions() {
     $file = File::create(['filename' => 'asdf.txt']);
     $errors = file_validate_extensions($file, 'asdf txt pork');
     $this->assertEqual(count($errors), 0, 'Valid extension accepted.', 'File');
@@ -53,7 +53,7 @@ class ValidatorTest extends FileManagedUnitTestBase {
   /**
    * This ensures a specific file is actually an image.
    */
-  function testFileValidateIsImage() {
+  public function testFileValidateIsImage() {
     $this->assertTrue(file_exists($this->image->getFileUri()), 'The image being tested exists.', 'File');
     $errors = file_validate_is_image($this->image);
     $this->assertEqual(count($errors), 0, 'No error reported for our image file.', 'File');
@@ -68,7 +68,7 @@ class ValidatorTest extends FileManagedUnitTestBase {
    *
    * The image will be resized if it's too large.
    */
-  function testFileValidateImageResolution() {
+  public function testFileValidateImageResolution() {
     // Non-images.
     $errors = file_validate_image_resolution($this->nonImage);
     $this->assertEqual(count($errors), 0, 'Should not get any errors for a non-image file.', 'File');
@@ -116,7 +116,7 @@ class ValidatorTest extends FileManagedUnitTestBase {
   /**
    * This will ensure the filename length is valid.
    */
-  function testFileValidateNameLength() {
+  public function testFileValidateNameLength() {
     // Create a new file entity.
     $file = File::create();
 
@@ -141,7 +141,7 @@ class ValidatorTest extends FileManagedUnitTestBase {
   /**
    * Test file_validate_size().
    */
-  function testFileValidateSize() {
+  public function testFileValidateSize() {
     // Create a file with a size of 1000 bytes, and quotas of only 1 byte.
     $file = File::create(['filesize' => 1000]);
     $errors = file_validate_size($file, 0, 0);
diff --git a/web/core/modules/file/tests/src/Kernel/Views/ExtensionViewsFieldTest.php b/web/core/modules/file/tests/src/Kernel/Views/ExtensionViewsFieldTest.php
index 221c01194..867ab7aaa 100644
--- a/web/core/modules/file/tests/src/Kernel/Views/ExtensionViewsFieldTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Views/ExtensionViewsFieldTest.php
@@ -18,21 +18,21 @@ class ExtensionViewsFieldTest extends ViewsKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('file', 'file_test_views', 'user');
+  public static $modules = ['file', 'file_test_views', 'user'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('file_extension_view');
+  public static $testViews = ['file_extension_view'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
-    ViewTestData::createTestViews(get_class($this), array('file_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['file_test_views']);
 
     $this->installEntitySchema('file');
 
diff --git a/web/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php b/web/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php
index 1ee73a83e..1cce9898e 100644
--- a/web/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php
+++ b/web/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php
@@ -25,26 +25,26 @@ class CckFileTest extends UnitTestCase {
     $migration_plugin = $this->prophesize(MigrateProcessInterface::class);
     $migration_plugin->transform(1, $executable, $row, 'foo')->willReturn(1);
 
-    $plugin = new CckFile(array(), 'd6_cck_file', array(), $migration, $migration_plugin->reveal());
+    $plugin = new CckFile([], 'd6_cck_file', [], $migration, $migration_plugin->reveal());
 
-    $options = array(
+    $options = [
       'alt' => 'Foobaz',
       'title' => 'Wambooli',
-    );
-    $value = array(
+    ];
+    $value = [
       'fid' => 1,
       'list' => TRUE,
       'data' => serialize($options),
-    );
+    ];
 
     $transformed = $plugin->transform($value, $executable, $row, 'foo');
-    $expected = array(
+    $expected = [
       'target_id' => 1,
       'display' => TRUE,
       'description' => '',
       'alt' => 'Foobaz',
       'title' => 'Wambooli',
-    );
+    ];
     $this->assertSame($expected, $transformed);
   }
 
diff --git a/web/core/modules/filter/filter.api.php b/web/core/modules/filter/filter.api.php
index 5bf973f4e..bf4c52e83 100644
--- a/web/core/modules/filter/filter.api.php
+++ b/web/core/modules/filter/filter.api.php
@@ -18,9 +18,9 @@
  */
 function hook_filter_info_alter(&$info) {
   // Alter the default settings of the URL filter provided by core.
-  $info['filter_url']['default_settings'] = array(
+  $info['filter_url']['default_settings'] = [
     'filter_url_length' => 100,
-  );
+  ];
 }
 
 /**
diff --git a/web/core/modules/filter/filter.module b/web/core/modules/filter/filter.module
index f52614a42..e3095346d 100644
--- a/web/core/modules/filter/filter.module
+++ b/web/core/modules/filter/filter.module
@@ -21,11 +21,11 @@ function filter_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.filter':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Filter module allows administrators to configure text formats. Text formats change how HTML tags and other text will be <em>processed and displayed</em> in the site. They are used to transform text, and also help to defend your web site against potentially damaging input from malicious users. Visual text editors can be associated with text formats by using the <a href=":editor_help">Text Editor module</a>. For more information, see the <a href=":filter_do">online documentation for the Filter module</a>.', array(':filter_do' => 'https://www.drupal.org/documentation/modules/filter/', ':editor_help' => (\Drupal::moduleHandler()->moduleExists('editor')) ? \Drupal::url('help.page', array('name' => 'editor')) : '#')) . '</p>';
+      $output .= '<p>' . t('The Filter module allows administrators to configure text formats. Text formats change how HTML tags and other text will be <em>processed and displayed</em> in the site. They are used to transform text, and also help to defend your web site against potentially damaging input from malicious users. Visual text editors can be associated with text formats by using the <a href=":editor_help">Text Editor module</a>. For more information, see the <a href=":filter_do">online documentation for the Filter module</a>.', [':filter_do' => 'https://www.drupal.org/documentation/modules/filter/', ':editor_help' => (\Drupal::moduleHandler()->moduleExists('editor')) ? \Drupal::url('help.page', ['name' => 'editor']) : '#']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing text formats') . '</dt>';
-      $output .= '<dd>' . t('You can create and edit text formats on the <a href=":formats">Text formats page</a> (if the Text Editor module is enabled, this page is named Text formats and editors). One text format is included by default: Plain text (which removes all HTML tags). Additional text formats may be created during installation. You can create a text format by clicking "<a href=":add_format">Add text format</a>".', array(':formats' => \Drupal::url('filter.admin_overview'), ':add_format' => \Drupal::url('filter.format_add'))) . '</dd>';
+      $output .= '<dd>' . t('You can create and edit text formats on the <a href=":formats">Text formats page</a> (if the Text Editor module is enabled, this page is named Text formats and editors). One text format is included by default: Plain text (which removes all HTML tags). Additional text formats may be created during installation. You can create a text format by clicking "<a href=":add_format">Add text format</a>".', [':formats' => \Drupal::url('filter.admin_overview'), ':add_format' => \Drupal::url('filter.format_add')]) . '</dd>';
       $output .= '<dt>' . t('Assigning roles to text formats') . '</dt>';
       $output .= '<dd>' . t('You can define which users will be able to use each text format by selecting roles. To ensure security, anonymous and untrusted users should only have access to text formats that restrict them to either plain text or a safe set of HTML tags. This is because HTML tags can allow embedding malicious links or scripts in text. More trusted registered users may be granted permission to use less restrictive text formats in order to create rich text. <strong>Improper text format configuration is a security risk.</strong>') . '</dd>';
       $output .= '<dt>' . t('Selecting filters') . '</dt>';
@@ -39,7 +39,7 @@ function filter_help($route_name, RouteMatchInterface $route_match) {
       return $output;
 
     case 'filter.admin_overview':
-      $output = '<p>' . t('Text formats define how text is filtered for output and how HTML tags and other text is displayed, replaced, or removed. <strong>Improper text format configuration is a security risk.</strong> Learn more on the <a href=":filter_help">Filter module help page</a>.', array(':filter_help' => \Drupal::url('help.page', array('name' => 'filter')))) . '</p>';
+      $output = '<p>' . t('Text formats define how text is filtered for output and how HTML tags and other text is displayed, replaced, or removed. <strong>Improper text format configuration is a security risk.</strong> Learn more on the <a href=":filter_help">Filter module help page</a>.', [':filter_help' => \Drupal::url('help.page', ['name' => 'filter'])]) . '</p>';
       $output .= '<p>' . t('Text formats are presented on content editing pages in the order defined on this page. The first format available to a user will be selected by default.') . '</p>';
       return $output;
 
@@ -53,29 +53,29 @@ function filter_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function filter_theme() {
-  return array(
-    'filter_tips' => array(
-      'variables' => array('tips' => NULL, 'long' => FALSE),
-    ),
-    'text_format_wrapper' => array(
-      'variables' => array(
+  return [
+    'filter_tips' => [
+      'variables' => ['tips' => NULL, 'long' => FALSE],
+    ],
+    'text_format_wrapper' => [
+      'variables' => [
         'children' => NULL,
         'description' => NULL,
-        'attributes' => array(),
-      ),
-    ),
-    'filter_guidelines' => array(
-      'variables' => array('format' => NULL),
-    ),
-    'filter_caption' => array(
-      'variables' => array(
+        'attributes' => [],
+      ],
+    ],
+    'filter_guidelines' => [
+      'variables' => ['format' => NULL],
+    ],
+    'filter_caption' => [
+      'variables' => [
         'node' => NULL,
         'tag' => NULL,
         'caption' => NULL,
         'classes' => NULL,
-      ),
-    )
-  );
+      ],
+    ]
+  ];
 }
 
 /**
@@ -93,7 +93,7 @@ function filter_theme() {
  * @see filter_formats_reset()
  */
 function filter_formats(AccountInterface $account = NULL) {
-  $formats = &drupal_static(__FUNCTION__, array());
+  $formats = &drupal_static(__FUNCTION__, []);
 
   // All available formats are cached for performance.
   if (!isset($formats['all'])) {
@@ -102,7 +102,7 @@ function filter_formats(AccountInterface $account = NULL) {
       $formats['all'] = $cache->data;
     }
     else {
-      $formats['all'] = \Drupal::entityManager()->getStorage('filter_format')->loadByProperties(array('status' => TRUE));
+      $formats['all'] = \Drupal::entityManager()->getStorage('filter_format')->loadByProperties(['status' => TRUE]);
       uasort($formats['all'], 'Drupal\Core\Config\Entity\ConfigEntityBase::sort');
       \Drupal::cache()->set("filter_formats:{$language_interface->getId()}", $formats['all'], Cache::PERMANENT, \Drupal::entityManager()->getDefinition('filter_format')->getListCacheTags());
     }
@@ -116,7 +116,7 @@ function filter_formats(AccountInterface $account = NULL) {
   // Build a list of user-specific formats.
   $account_id = $account->id();
   if (!isset($formats['user'][$account_id])) {
-    $formats['user'][$account_id] = array();
+    $formats['user'][$account_id] = [];
     foreach ($formats['all'] as $format) {
       if ($format->access('use', $account)) {
         $formats['user'][$account_id][$format->id()] = $format;
@@ -152,7 +152,7 @@ function filter_get_roles_by_format(FilterFormatInterface $format) {
   }
   // Do not list any roles if the permission does not exist.
   $permission = $format->getPermissionName();
-  return !empty($permission) ? user_role_names(FALSE, $permission) : array();
+  return !empty($permission) ? user_role_names(FALSE, $permission) : [];
 }
 
 /**
@@ -166,7 +166,7 @@ function filter_get_roles_by_format(FilterFormatInterface $format) {
  *   the text format ID and ordered by weight.
  */
 function filter_get_formats_by_role($rid) {
-  $formats = array();
+  $formats = [];
   foreach (filter_formats() as $format) {
     $roles = filter_get_roles_by_format($format);
     if (isset($roles[$rid])) {
@@ -291,14 +291,14 @@ function filter_fallback_format() {
  *
  * @ingroup sanitization
  */
-function check_markup($text, $format_id = NULL, $langcode = '', $filter_types_to_skip = array()) {
-  $build = array(
+function check_markup($text, $format_id = NULL, $langcode = '', $filter_types_to_skip = []) {
+  $build = [
     '#type' => 'processed_text',
     '#text' => $text,
     '#format' => $format_id,
     '#filter_types_to_skip' => $filter_types_to_skip,
     '#langcode' => $langcode,
-  );
+  ];
   return \Drupal::service('renderer')->renderPlain($build);
 }
 
@@ -337,11 +337,11 @@ function filter_form_access_denied($element) {
 function _filter_tips($format_id, $long = FALSE) {
   $formats = filter_formats(\Drupal::currentUser());
 
-  $tips = array();
+  $tips = [];
 
   // If only listing one format, extract it from the $formats array.
   if ($format_id != -1) {
-    $formats = array($formats[$format_id]);
+    $formats = [$formats[$format_id]];
   }
 
   foreach ($formats as $format) {
@@ -349,10 +349,10 @@ function _filter_tips($format_id, $long = FALSE) {
       if ($filter->status) {
         $tip = $filter->tips($long);
         if (isset($tip)) {
-          $tips[$format->label()][$name] = array(
-            'tip' => array('#markup' => $tip),
+          $tips[$format->label()][$name] = [
+            'tip' => ['#markup' => $tip],
             'id' => $name,
-          );
+          ];
         }
       }
     }
@@ -372,10 +372,10 @@ function _filter_tips($format_id, $long = FALSE) {
  */
 function template_preprocess_filter_guidelines(&$variables) {
   $format = $variables['format'];
-  $variables['tips'] = array(
+  $variables['tips'] = [
     '#theme' => 'filter_tips',
     '#tips' => _filter_tips($format->id(), FALSE),
-  );
+  ];
 }
 
 /**
@@ -431,11 +431,11 @@ function template_preprocess_filter_tips(&$variables) {
       $tiplist[$tip_key]['attributes'] = new Attribute();
     }
 
-    $variables['tips'][$name] = array(
+    $variables['tips'][$name] = [
       'attributes' => new Attribute(),
       'name' => $name,
       'list' => $tiplist,
-    );
+    ];
   }
 
   $variables['multiple'] = count($tips) > 1;
@@ -470,7 +470,7 @@ function _filter_url($text, $filter) {
   // callback function to process matches of the regexp. The callback function
   // is to return the replacement for the match. The array is used and
   // matching/replacement done below inside some loops.
-  $tasks = array();
+  $tasks = [];
 
   // Prepare protocols pattern for absolute URLs.
   // \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols() will replace
@@ -643,12 +643,12 @@ function _filter_url_parse_partial_links($match) {
  *   cached $comments are reset.
  */
 function _filter_url_escape_comments($match, $escape = NULL) {
-  static $mode, $comments = array();
+  static $mode, $comments = [];
 
   if (isset($escape)) {
     $mode = $escape;
     if ($escape) {
-      $comments = array();
+      $comments = [];
     }
     return;
   }
diff --git a/web/core/modules/filter/src/Annotation/Filter.php b/web/core/modules/filter/src/Annotation/Filter.php
index 9d7d1ccee..4d90c5842 100644
--- a/web/core/modules/filter/src/Annotation/Filter.php
+++ b/web/core/modules/filter/src/Annotation/Filter.php
@@ -73,6 +73,6 @@ class Filter extends Plugin {
    *
    * @var array (optional)
    */
-  public $settings = array();
+  public $settings = [];
 
 }
diff --git a/web/core/modules/filter/src/Controller/FilterController.php b/web/core/modules/filter/src/Controller/FilterController.php
index f5ebe7991..8052e4c8b 100644
--- a/web/core/modules/filter/src/Controller/FilterController.php
+++ b/web/core/modules/filter/src/Controller/FilterController.php
@@ -21,14 +21,14 @@ class FilterController {
    *
    * @see template_preprocess_filter_tips()
    */
-  function filterTips(FilterFormatInterface $filter_format = NULL) {
+  public function filterTips(FilterFormatInterface $filter_format = NULL) {
     $tips = $filter_format ? $filter_format->id() : -1;
 
-    $build = array(
+    $build = [
       '#theme' => 'filter_tips',
       '#long' => TRUE,
       '#tips' => _filter_tips($tips, TRUE),
-    );
+    ];
 
     return $build;
   }
diff --git a/web/core/modules/filter/src/Element/ProcessedText.php b/web/core/modules/filter/src/Element/ProcessedText.php
index 0d0987039..6e2b3ec43 100644
--- a/web/core/modules/filter/src/Element/ProcessedText.php
+++ b/web/core/modules/filter/src/Element/ProcessedText.php
@@ -21,15 +21,15 @@ class ProcessedText extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#text' => '',
       '#format' => NULL,
-      '#filter_types_to_skip' => array(),
+      '#filter_types_to_skip' => [],
       '#langcode' => '',
-      '#pre_render' => array(
-        array($class, 'preRenderText'),
-      ),
-    );
+      '#pre_render' => [
+        [$class, 'preRenderText'],
+      ],
+    ];
   }
 
   /**
@@ -77,7 +77,7 @@ class ProcessedText extends RenderElement {
     // cannot be filtered.
     if (!$format || !$format->status()) {
       $message = !$format ? 'Missing text format: %format.' : 'Disabled text format: %format.';
-      static::logger('filter')->alert($message, array('%format' => $format_id));
+      static::logger('filter')->alert($message, ['%format' => $format_id]);
       $element['#markup'] = '';
       return $element;
     }
@@ -92,7 +92,7 @@ class ProcessedText extends RenderElement {
 
     // Convert all Windows and Mac newlines to a single newline, so filters only
     // need to deal with one possibility.
-    $text = str_replace(array("\r\n", "\r"), "\n", $text);
+    $text = str_replace(["\r\n", "\r"], "\n", $text);
 
     // Get a complete list of filters, ordered properly.
     /** @var \Drupal\filter\Plugin\FilterInterface[] $filters **/
diff --git a/web/core/modules/filter/src/Element/TextFormat.php b/web/core/modules/filter/src/Element/TextFormat.php
index 0a80b314b..16b4cf520 100644
--- a/web/core/modules/filter/src/Element/TextFormat.php
+++ b/web/core/modules/filter/src/Element/TextFormat.php
@@ -40,13 +40,13 @@ class TextFormat extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#process' => array(
-        array($class, 'processFormat'),
-      ),
+    return [
+      '#process' => [
+        [$class, 'processFormat'],
+      ],
       '#base_type' => 'textarea',
-      '#theme_wrappers' => array('text_format_wrapper'),
-    );
+      '#theme_wrappers' => ['text_format_wrapper'],
+    ];
   }
 
   /**
@@ -84,7 +84,7 @@ class TextFormat extends RenderElement {
 
     // Ensure that children appear as subkeys of this element.
     $element['#tree'] = TRUE;
-    $blacklist = array(
+    $blacklist = [
       // Make \Drupal::formBuilder()->doBuildForm() regenerate child properties.
       '#parents',
       '#id',
@@ -104,7 +104,7 @@ class TextFormat extends RenderElement {
       '#attached',
       '#processed',
       '#theme_wrappers',
-    );
+    ];
     // Move this element into sub-element 'value'.
     unset($element['value']);
     foreach (Element::properties($element) as $key) {
@@ -116,16 +116,16 @@ class TextFormat extends RenderElement {
     $element['value']['#type'] = $element['#base_type'];
     $element['value'] += static::elementInfo()->getInfo($element['#base_type']);
     // Make sure the #default_value key is set, so we can use it below.
-    $element['value'] += array('#default_value' => '');
+    $element['value'] += ['#default_value' => ''];
 
     // Turn original element into a text format wrapper.
     $element['#attached']['library'][] = 'filter/drupal.filter';
 
     // Setup child container for the text format widget.
-    $element['format'] = array(
+    $element['format'] = [
       '#type' => 'container',
-      '#attributes' => array('class' => array('filter-wrapper')),
-    );
+      '#attributes' => ['class' => ['filter-wrapper']],
+    ];
 
     // Get a list of formats that the current user has access to.
     $formats = filter_formats($user);
@@ -162,30 +162,30 @@ class TextFormat extends RenderElement {
     }
 
     // Prepare text format guidelines.
-    $element['format']['guidelines'] = array(
+    $element['format']['guidelines'] = [
       '#type' => 'container',
-      '#attributes' => array('class' => array('filter-guidelines')),
+      '#attributes' => ['class' => ['filter-guidelines']],
       '#weight' => 20,
-    );
-    $options = array();
+    ];
+    $options = [];
     foreach ($formats as $format) {
       $options[$format->id()] = $format->label();
-      $element['format']['guidelines'][$format->id()] = array(
+      $element['format']['guidelines'][$format->id()] = [
         '#theme' => 'filter_guidelines',
         '#format' => $format,
-      );
+      ];
     }
 
-    $element['format']['format'] = array(
+    $element['format']['format'] = [
       '#type' => 'select',
       '#title' => t('Text format'),
       '#options' => $options,
       '#default_value' => $element['#format'],
       '#access' => count($formats) > 1,
       '#weight' => 10,
-      '#attributes' => array('class' => array('filter-list')),
-      '#parents' => array_merge($element['#parents'], array('format')),
-    );
+      '#attributes' => ['class' => ['filter-list']],
+      '#parents' => array_merge($element['#parents'], ['format']),
+    ];
 
     $element['format']['help'] = [
       '#type' => 'container',
@@ -225,7 +225,7 @@ class TextFormat extends RenderElement {
 
       // Prepend #pre_render callback to replace field value with user notice
       // prior to rendering.
-      $element['value'] += array('#pre_render' => array());
+      $element['value'] += ['#pre_render' => []];
       array_unshift($element['value']['#pre_render'], 'filter_form_access_denied');
 
       // Cosmetic adjustments.
diff --git a/web/core/modules/filter/src/Entity/FilterFormat.php b/web/core/modules/filter/src/Entity/FilterFormat.php
index 8ae4d6032..9dbaa62fd 100644
--- a/web/core/modules/filter/src/Entity/FilterFormat.php
+++ b/web/core/modules/filter/src/Entity/FilterFormat.php
@@ -112,7 +112,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
    *
    * @var array
    */
-  protected $filters = array();
+  protected $filters = [];
 
   /**
    * Holds the collection of filters that are attached to this format.
@@ -146,7 +146,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
    * {@inheritdoc}
    */
   public function getPluginCollections() {
-    return array('filters' => $this->filters());
+    return ['filters' => $this->filters()];
   }
 
   /**
@@ -182,7 +182,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
     parent::disable();
 
     // Allow modules to react on text format deletion.
-    \Drupal::moduleHandler()->invokeAll('filter_format_disable', array($this));
+    \Drupal::moduleHandler()->invokeAll('filter_format_disable', [$this]);
 
     // Clear the filter cache whenever a text format is disabled.
     filter_formats_reset();
@@ -222,7 +222,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
       if (($roles = $this->get('roles')) && $permission = $this->getPermissionName()) {
         foreach (user_roles() as $rid => $name) {
           $enabled = in_array($rid, $roles, TRUE);
-          user_role_change_permissions($rid, array($permission => $enabled));
+          user_role_change_permissions($rid, [$permission => $enabled]);
         }
       }
     }
@@ -252,7 +252,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
    * {@inheritdoc}
    */
   public function getFilterTypes() {
-    $filter_types = array();
+    $filter_types = [];
 
     $filters = $this->filters();
     foreach ($filters as $filter) {
@@ -386,7 +386,7 @@ class FilterFormat extends ConfigEntityBase implements FilterFormatInterface, En
       // whitelisting filters were used, then effectively nothing is allowed.
       if (isset($restrictions['allowed'])) {
         if (count($restrictions['allowed']) === 1 && array_key_exists('*', $restrictions['allowed']) && !isset($restrictions['forbidden_tags'])) {
-          $restrictions['allowed'] = array();
+          $restrictions['allowed'] = [];
         }
       }
 
diff --git a/web/core/modules/filter/src/FilterFormatAccessControlHandler.php b/web/core/modules/filter/src/FilterFormatAccessControlHandler.php
index 0c411a729..2dcb6dc7d 100644
--- a/web/core/modules/filter/src/FilterFormatAccessControlHandler.php
+++ b/web/core/modules/filter/src/FilterFormatAccessControlHandler.php
@@ -41,7 +41,7 @@ class FilterFormatAccessControlHandler extends EntityAccessControlHandler {
       return AccessResult::forbidden();
     }
 
-    if (in_array($operation, array('disable', 'update'))) {
+    if (in_array($operation, ['disable', 'update', 'view'])) {
       return parent::checkAccess($filter_format, $operation, $account);
     }
 
diff --git a/web/core/modules/filter/src/FilterFormatAddForm.php b/web/core/modules/filter/src/FilterFormatAddForm.php
index 1cc855f3f..cb9b59881 100644
--- a/web/core/modules/filter/src/FilterFormatAddForm.php
+++ b/web/core/modules/filter/src/FilterFormatAddForm.php
@@ -21,7 +21,7 @@ class FilterFormatAddForm extends FilterFormatFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
-    drupal_set_message($this->t('Added text format %format.', array('%format' => $this->entity->label())));
+    drupal_set_message($this->t('Added text format %format.', ['%format' => $this->entity->label()]));
     return $this->entity;
   }
 
diff --git a/web/core/modules/filter/src/FilterFormatEditForm.php b/web/core/modules/filter/src/FilterFormatEditForm.php
index ee2f7fb08..9ffd8c86c 100644
--- a/web/core/modules/filter/src/FilterFormatEditForm.php
+++ b/web/core/modules/filter/src/FilterFormatEditForm.php
@@ -29,7 +29,7 @@ class FilterFormatEditForm extends FilterFormatFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
-    drupal_set_message($this->t('The text format %format has been updated.', array('%format' => $this->entity->label())));
+    drupal_set_message($this->t('The text format %format has been updated.', ['%format' => $this->entity->label()]));
     return $this->entity;
   }
 
diff --git a/web/core/modules/filter/src/FilterFormatFormBase.php b/web/core/modules/filter/src/FilterFormatFormBase.php
index c1924edc7..cbcb63218 100644
--- a/web/core/modules/filter/src/FilterFormatFormBase.php
+++ b/web/core/modules/filter/src/FilterFormatFormBase.php
@@ -3,42 +3,14 @@
 namespace Drupal\filter;
 
 use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\filter\Plugin\Filter\FilterNull;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a base form for a filter format.
  */
 abstract class FilterFormatFormBase extends EntityForm {
 
-  /**
-   * The entity query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
-
-  /**
-   * Constructs a new FilterFormatFormBase.
-   *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
-   */
-  public function __construct(QueryFactory $query_factory) {
-    $this->queryFactory = $query_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.query')
-    );
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -49,34 +21,34 @@ abstract class FilterFormatFormBase extends EntityForm {
     $form['#tree'] = TRUE;
     $form['#attached']['library'][] = 'filter/drupal.filter.admin';
 
-    $form['name'] = array(
+    $form['name'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Name'),
       '#default_value' => $format->label(),
       '#required' => TRUE,
       '#weight' => -30,
-    );
-    $form['format'] = array(
+    ];
+    $form['format'] = [
       '#type' => 'machine_name',
       '#required' => TRUE,
       '#default_value' => $format->id(),
       '#maxlength' => 255,
-      '#machine_name' => array(
-        'exists' => array($this, 'exists'),
-        'source' => array('name'),
-      ),
+      '#machine_name' => [
+        'exists' => [$this, 'exists'],
+        'source' => ['name'],
+      ],
       '#disabled' => !$format->isNew(),
       '#weight' => -20,
-    );
+    ];
 
     // Add user role access selection.
-    $form['roles'] = array(
+    $form['roles'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Roles'),
       '#options' => array_map('\Drupal\Component\Utility\Html::escape', user_role_names()),
       '#disabled' => $is_fallback,
       '#weight' => -10,
-    );
+    ];
     if ($is_fallback) {
       $form['roles']['#description'] = $this->t('All roles for this text format must be enabled and cannot be changed.');
     }
@@ -92,13 +64,13 @@ abstract class FilterFormatFormBase extends EntityForm {
       // When a filter is missing, it is replaced by the null filter. Remove it
       // here, so that saving the form will remove the missing filter.
       if ($filter instanceof FilterNull) {
-        drupal_set_message($this->t('The %filter filter is missing, and will be removed once this format is saved.', array('%filter' => $filter_id)), 'warning');
+        drupal_set_message($this->t('The %filter filter is missing, and will be removed once this format is saved.', ['%filter' => $filter_id]), 'warning');
         $filters->removeInstanceID($filter_id);
       }
     }
 
     // Filter status.
-    $form['filters']['status'] = array(
+    $form['filters']['status'] = [
       '#type' => 'item',
       '#title' => $this->t('Enabled filters'),
       '#prefix' => '<div id="filters-status-wrapper">',
@@ -107,72 +79,72 @@ abstract class FilterFormatFormBase extends EntityForm {
       // value, since 'filters' should only contain filter definitions.
       // See https://www.drupal.org/node/1829202.
       '#input' => FALSE,
-    );
+    ];
     // Filter order (tabledrag).
-    $form['filters']['order'] = array(
+    $form['filters']['order'] = [
       '#type' => 'table',
       // For filter.admin.js
-      '#attributes' => array('id' => 'filter-order'),
+      '#attributes' => ['id' => 'filter-order'],
       '#title' => $this->t('Filter processing order'),
-      '#tabledrag' => array(
-        array(
+      '#tabledrag' => [
+        [
          'action' => 'order',
          'relationship' => 'sibling',
          'group' => 'filter-order-weight',
-        ),
-      ),
+        ],
+      ],
       '#tree' => FALSE,
       '#input' => FALSE,
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#theme_wrappers' => ['form_element'],
+    ];
     // Filter settings.
-    $form['filter_settings'] = array(
+    $form['filter_settings'] = [
       '#type' => 'vertical_tabs',
       '#title' => $this->t('Filter settings'),
-    );
+    ];
 
     foreach ($filters as $name => $filter) {
-      $form['filters']['status'][$name] = array(
+      $form['filters']['status'][$name] = [
         '#type' => 'checkbox',
         '#title' => $filter->getLabel(),
         '#default_value' => $filter->status,
-        '#parents' => array('filters', $name, 'status'),
+        '#parents' => ['filters', $name, 'status'],
         '#description' => $filter->getDescription(),
         '#weight' => $filter->weight,
-      );
+      ];
 
       $form['filters']['order'][$name]['#attributes']['class'][] = 'draggable';
       $form['filters']['order'][$name]['#weight'] = $filter->weight;
-      $form['filters']['order'][$name]['filter'] = array(
+      $form['filters']['order'][$name]['filter'] = [
         '#markup' => $filter->getLabel(),
-      );
-      $form['filters']['order'][$name]['weight'] = array(
+      ];
+      $form['filters']['order'][$name]['weight'] = [
         '#type' => 'weight',
-        '#title' => $this->t('Weight for @title', array('@title' => $filter->getLabel())),
+        '#title' => $this->t('Weight for @title', ['@title' => $filter->getLabel()]),
         '#title_display' => 'invisible',
         '#delta' => 50,
         '#default_value' => $filter->weight,
-        '#parents' => array('filters', $name, 'weight'),
-        '#attributes' => array('class' => array('filter-order-weight')),
-      );
+        '#parents' => ['filters', $name, 'weight'],
+        '#attributes' => ['class' => ['filter-order-weight']],
+      ];
 
       // Retrieve the settings form of the filter plugin. The plugin should not be
       // aware of the text format. Therefore, it only receives a set of minimal
       // base properties to allow advanced implementations to work.
-      $settings_form = array(
-        '#parents' => array('filters', $name, 'settings'),
+      $settings_form = [
+        '#parents' => ['filters', $name, 'settings'],
         '#tree' => TRUE,
-      );
+      ];
       $settings_form = $filter->settingsForm($settings_form, $form_state);
       if (!empty($settings_form)) {
-        $form['filters']['settings'][$name] = array(
+        $form['filters']['settings'][$name] = [
           '#type' => 'details',
           '#title' => $filter->getLabel(),
           '#open' => TRUE,
           '#weight' => $filter->weight,
-          '#parents' => array('filters', $name, 'settings'),
+          '#parents' => ['filters', $name, 'settings'],
           '#group' => 'filter_settings',
-        );
+        ];
         $form['filters']['settings'][$name] += $settings_form;
       }
     }
@@ -189,8 +161,9 @@ abstract class FilterFormatFormBase extends EntityForm {
    *   TRUE if the format exists, FALSE otherwise.
    */
   public function exists($format_id) {
-    return (bool) $this->queryFactory
-      ->get('filter_format')
+    return (bool) $this->entityTypeManager
+      ->getStorage('filter_format')
+      ->getQuery()
       ->condition('format', $format_id)
       ->execute();
   }
@@ -209,13 +182,14 @@ abstract class FilterFormatFormBase extends EntityForm {
     $form_state->setValueForElement($form['format'], $format_format);
     $form_state->setValueForElement($form['name'], $format_name);
 
-    $format_exists = $this->queryFactory
-      ->get('filter_format')
+    $format_exists = $this->entityTypeManager
+      ->getStorage('filter_format')
+      ->getQuery()
       ->condition('format', $format_format, '<>')
       ->condition('name', $format_name)
       ->execute();
     if ($format_exists) {
-      $form_state->setErrorByName('name', $this->t('Text format names must be unique. A format named %name already exists.', array('%name' => $format_name)));
+      $form_state->setErrorByName('name', $this->t('Text format names must be unique. A format named %name already exists.', ['%name' => $format_name]));
     }
   }
 
@@ -242,7 +216,7 @@ abstract class FilterFormatFormBase extends EntityForm {
     // Save user permissions.
     if ($permission = $format->getPermissionName()) {
       foreach ($form_state->getValue('roles') as $rid => $enabled) {
-        user_role_change_permissions($rid, array($permission => $enabled));
+        user_role_change_permissions($rid, [$permission => $enabled]);
       }
     }
 
diff --git a/web/core/modules/filter/src/FilterPluginCollection.php b/web/core/modules/filter/src/FilterPluginCollection.php
index fc6ec06c3..81ebddf47 100644
--- a/web/core/modules/filter/src/FilterPluginCollection.php
+++ b/web/core/modules/filter/src/FilterPluginCollection.php
@@ -114,7 +114,7 @@ class FilterPluginCollection extends DefaultLazyPluginCollection {
     // Because filters are disabled by default, this will never remove the
     // configuration of an enabled filter.
     foreach ($configuration as $instance_id => $instance_config) {
-      $default_config = array();
+      $default_config = [];
       $default_config['id'] = $instance_id;
       $default_config += $this->get($instance_id)->defaultConfiguration();
       if ($default_config === $instance_config) {
diff --git a/web/core/modules/filter/src/FilterPluginManager.php b/web/core/modules/filter/src/FilterPluginManager.php
index d369a6ffa..f41e016c0 100644
--- a/web/core/modules/filter/src/FilterPluginManager.php
+++ b/web/core/modules/filter/src/FilterPluginManager.php
@@ -38,7 +38,7 @@ class FilterPluginManager extends DefaultPluginManager implements FallbackPlugin
   /**
    * {@inheritdoc}
    */
-  public function getFallbackPluginId($plugin_id, array $configuration = array()) {
+  public function getFallbackPluginId($plugin_id, array $configuration = []) {
     return 'filter_null';
   }
 
diff --git a/web/core/modules/filter/src/FilterProcessResult.php b/web/core/modules/filter/src/FilterProcessResult.php
index 4b07fadd8..3fa592b62 100644
--- a/web/core/modules/filter/src/FilterProcessResult.php
+++ b/web/core/modules/filter/src/FilterProcessResult.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\filter;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Render\BubbleableMetadata;
@@ -134,7 +135,7 @@ class FilterProcessResult extends BubbleableMetadata {
     // Generate placeholder markup.
     // @see \Drupal\Core\Render\PlaceholderGenerator::createPlaceholder()
     $arguments = UrlHelper::buildQuery($args);
-    $token = hash('crc32b', serialize([$callback, $args]));
+    $token = Crypt::hashBase64(serialize([$callback, $args]));
     $placeholder_markup = '<drupal-filter-placeholder callback="' . Html::escape($callback) . '" arguments="' . Html::escape($arguments) . '" token="' . Html::escape($token) . '"></drupal-filter-placeholder>';
 
     // Add the placeholder attachment.
diff --git a/web/core/modules/filter/src/Form/FilterDisableForm.php b/web/core/modules/filter/src/Form/FilterDisableForm.php
index a4582fc3f..c6e82949f 100644
--- a/web/core/modules/filter/src/Form/FilterDisableForm.php
+++ b/web/core/modules/filter/src/Form/FilterDisableForm.php
@@ -15,7 +15,7 @@ class FilterDisableForm extends EntityConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to disable the text format %format?', array('%format' => $this->entity->label()));
+    return $this->t('Are you sure you want to disable the text format %format?', ['%format' => $this->entity->label()]);
   }
 
   /**
@@ -44,7 +44,7 @@ class FilterDisableForm extends EntityConfirmFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->entity->disable()->save();
-    drupal_set_message($this->t('Disabled text format %format.', array('%format' => $this->entity->label())));
+    drupal_set_message($this->t('Disabled text format %format.', ['%format' => $this->entity->label()]));
 
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
diff --git a/web/core/modules/filter/src/Plugin/Filter/FilterAlign.php b/web/core/modules/filter/src/Plugin/Filter/FilterAlign.php
index c0e431ae3..a3739ab82 100644
--- a/web/core/modules/filter/src/Plugin/Filter/FilterAlign.php
+++ b/web/core/modules/filter/src/Plugin/Filter/FilterAlign.php
@@ -33,9 +33,9 @@ class FilterAlign extends FilterBase {
         $node->removeAttribute('data-align');
 
         // If one of the allowed alignments, add the corresponding class.
-        if (in_array($align, array('left', 'center', 'right'))) {
+        if (in_array($align, ['left', 'center', 'right'])) {
           $classes = $node->getAttribute('class');
-          $classes = (strlen($classes) > 0) ? explode(' ', $classes) : array();
+          $classes = (strlen($classes) > 0) ? explode(' ', $classes) : [];
           $classes[] = 'align-' . $align;
           $node->setAttribute('class', implode(' ', $classes));
         }
diff --git a/web/core/modules/filter/src/Plugin/Filter/FilterCaption.php b/web/core/modules/filter/src/Plugin/Filter/FilterCaption.php
index c23f1f784..62c839503 100644
--- a/web/core/modules/filter/src/Plugin/Filter/FilterCaption.php
+++ b/web/core/modules/filter/src/Plugin/Filter/FilterCaption.php
@@ -40,7 +40,7 @@ class FilterCaption extends FilterBase {
         // Sanitize caption: decode HTML encoding, limit allowed HTML tags; only
         // allow inline tags that are allowed by default, plus <br>.
         $caption = Html::decodeEntities($caption);
-        $caption = FilteredMarkup::create(Xss::filter($caption, array('a', 'em', 'strong', 'cite', 'code', 'br')));
+        $caption = FilteredMarkup::create(Xss::filter($caption, ['a', 'em', 'strong', 'cite', 'code', 'br']));
 
         // The caption must be non-empty.
         if (Unicode::strlen($caption) === 0) {
@@ -54,7 +54,7 @@ class FilterCaption extends FilterBase {
         $classes = $node->getAttribute('class');
         $node->removeAttribute('class');
         $node = ($node->parentNode->tagName === 'a') ? $node->parentNode : $node;
-        $filter_caption = array(
+        $filter_caption = [
           '#theme' => 'filter_caption',
           // We pass the unsanitized string because this is a text format
           // filter, and after filtering, we always assume the output is safe.
@@ -63,7 +63,7 @@ class FilterCaption extends FilterBase {
           '#tag' => $tag,
           '#caption' => $caption,
           '#classes' => $classes,
-        );
+        ];
         $altered_html = drupal_render($filter_caption);
 
         // Load the altered HTML into a new DOMDocument and retrieve the element.
@@ -82,11 +82,11 @@ class FilterCaption extends FilterBase {
       }
 
       $result->setProcessedText(Html::serialize($dom))
-        ->addAttachments(array(
-          'library' => array(
+        ->addAttachments([
+          'library' => [
             'filter/caption',
-          ),
-        ));
+          ],
+        ]);
     }
 
     return $result;
diff --git a/web/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/web/core/modules/filter/src/Plugin/Filter/FilterHtml.php
index 1dc339516..882bcc0e1 100644
--- a/web/core/modules/filter/src/Plugin/Filter/FilterHtml.php
+++ b/web/core/modules/filter/src/Plugin/Filter/FilterHtml.php
@@ -40,29 +40,27 @@ class FilterHtml extends FilterBase {
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $form['allowed_html'] = array(
-      '#type' => 'textfield',
+    $form['allowed_html'] = [
+      '#type' => 'textarea',
       '#title' => $this->t('Allowed HTML tags'),
       '#default_value' => $this->settings['allowed_html'],
-      '#maxlength' => 2048,
       '#description' => $this->t('A list of HTML tags that can be used. By default only the <em>lang</em> and <em>dir</em> attributes are allowed for all HTML tags. Each HTML tag may have attributes which are treated as allowed attribute names for that HTML tag. Each attribute may allow all values, or only allow specific values. Attribute names or values may be written as a prefix and wildcard like <em>jump-*</em>. JavaScript event attributes, JavaScript URLs, and CSS are always stripped.'),
-      '#size' => 250,
-      '#attached' => array(
-        'library' => array(
+      '#attached' => [
+        'library' => [
           'filter/drupal.filter.filter_html.admin',
-        ),
-      ),
-    );
-    $form['filter_html_help'] = array(
+        ],
+      ],
+    ];
+    $form['filter_html_help'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Display basic HTML help in long filter tips'),
       '#default_value' => $this->settings['filter_html_help'],
-    );
-    $form['filter_html_nofollow'] = array(
+    ];
+    $form['filter_html_nofollow'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Add rel="nofollow" to all links'),
       '#default_value' => $this->settings['filter_html_nofollow'],
-    );
+    ];
     return $form;
   }
 
@@ -70,6 +68,12 @@ class FilterHtml extends FilterBase {
    * {@inheritdoc}
    */
   public function setConfiguration(array $configuration) {
+    if (isset($configuration['settings']['allowed_html'])) {
+      // The javascript in core/modules/filter/filter.filter_html.admin.js
+      // removes new lines and double spaces so, for consistency when javascript
+      // is disabled, remove them.
+      $configuration['settings']['allowed_html'] = preg_replace('/\s+/', ' ', $configuration['settings']['allowed_html']);
+    }
     parent::setConfiguration($configuration);
     // Force restrictions to be calculated again.
     $this->restrictions = NULL;
@@ -335,7 +339,7 @@ class FilterHtml extends FilterBase {
     if (!($allowed_html = $this->settings['allowed_html'])) {
       return;
     }
-    $output = $this->t('Allowed HTML tags: @tags', array('@tags' => $allowed_html));
+    $output = $this->t('Allowed HTML tags: @tags', ['@tags' => $allowed_html]);
     if (!$long) {
       return $output;
     }
@@ -346,117 +350,117 @@ class FilterHtml extends FilterBase {
     }
 
     $output .= '<p>' . $this->t('This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.') . '</p>';
-    $output .= '<p>' . $this->t('For more information see W3C\'s <a href=":html-specifications">HTML Specifications</a> or use your favorite search engine to find other sites that explain HTML.', array(':html-specifications' => 'http://www.w3.org/TR/html/')) . '</p>';
-    $tips = array(
-      'a' => array($this->t('Anchors are used to make links to other pages.'), '<a href="' . $base_url . '">' . Html::escape(\Drupal::config('system.site')->get('name')) . '</a>'),
-      'br' => array($this->t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), $this->t('Text with <br />line break')),
-      'p' => array($this->t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '<p>' . $this->t('Paragraph one.') . '</p> <p>' . $this->t('Paragraph two.') . '</p>'),
-      'strong' => array($this->t('Strong', array(), array('context' => 'Font weight')), '<strong>' . $this->t('Strong', array(), array('context' => 'Font weight')) . '</strong>'),
-      'em' => array($this->t('Emphasized'), '<em>' . $this->t('Emphasized') . '</em>'),
-      'cite' => array($this->t('Cited'), '<cite>' . $this->t('Cited') . '</cite>'),
-      'code' => array($this->t('Coded text used to show programming source code'), '<code>' . $this->t('Coded') . '</code>'),
-      'b' => array($this->t('Bolded'), '<b>' . $this->t('Bolded') . '</b>'),
-      'u' => array($this->t('Underlined'), '<u>' . $this->t('Underlined') . '</u>'),
-      'i' => array($this->t('Italicized'), '<i>' . $this->t('Italicized') . '</i>'),
-      'sup' => array($this->t('Superscripted'), $this->t('<sup>Super</sup>scripted')),
-      'sub' => array($this->t('Subscripted'), $this->t('<sub>Sub</sub>scripted')),
-      'pre' => array($this->t('Preformatted'), '<pre>' . $this->t('Preformatted') . '</pre>'),
-      'abbr' => array($this->t('Abbreviation'), $this->t('<abbr title="Abbreviation">Abbrev.</abbr>')),
-      'acronym' => array($this->t('Acronym'), $this->t('<acronym title="Three-Letter Acronym">TLA</acronym>')),
-      'blockquote' => array($this->t('Block quoted'), '<blockquote>' . $this->t('Block quoted') . '</blockquote>'),
-      'q' => array($this->t('Quoted inline'), '<q>' . $this->t('Quoted inline') . '</q>'),
+    $output .= '<p>' . $this->t('For more information see W3C\'s <a href=":html-specifications">HTML Specifications</a> or use your favorite search engine to find other sites that explain HTML.', [':html-specifications' => 'http://www.w3.org/TR/html/']) . '</p>';
+    $tips = [
+      'a' => [$this->t('Anchors are used to make links to other pages.'), '<a href="' . $base_url . '">' . Html::escape(\Drupal::config('system.site')->get('name')) . '</a>'],
+      'br' => [$this->t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), $this->t('Text with <br />line break')],
+      'p' => [$this->t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '<p>' . $this->t('Paragraph one.') . '</p> <p>' . $this->t('Paragraph two.') . '</p>'],
+      'strong' => [$this->t('Strong', [], ['context' => 'Font weight']), '<strong>' . $this->t('Strong', [], ['context' => 'Font weight']) . '</strong>'],
+      'em' => [$this->t('Emphasized'), '<em>' . $this->t('Emphasized') . '</em>'],
+      'cite' => [$this->t('Cited'), '<cite>' . $this->t('Cited') . '</cite>'],
+      'code' => [$this->t('Coded text used to show programming source code'), '<code>' . $this->t('Coded') . '</code>'],
+      'b' => [$this->t('Bolded'), '<b>' . $this->t('Bolded') . '</b>'],
+      'u' => [$this->t('Underlined'), '<u>' . $this->t('Underlined') . '</u>'],
+      'i' => [$this->t('Italicized'), '<i>' . $this->t('Italicized') . '</i>'],
+      'sup' => [$this->t('Superscripted'), $this->t('<sup>Super</sup>scripted')],
+      'sub' => [$this->t('Subscripted'), $this->t('<sub>Sub</sub>scripted')],
+      'pre' => [$this->t('Preformatted'), '<pre>' . $this->t('Preformatted') . '</pre>'],
+      'abbr' => [$this->t('Abbreviation'), $this->t('<abbr title="Abbreviation">Abbrev.</abbr>')],
+      'acronym' => [$this->t('Acronym'), $this->t('<acronym title="Three-Letter Acronym">TLA</acronym>')],
+      'blockquote' => [$this->t('Block quoted'), '<blockquote>' . $this->t('Block quoted') . '</blockquote>'],
+      'q' => [$this->t('Quoted inline'), '<q>' . $this->t('Quoted inline') . '</q>'],
       // Assumes and describes tr, td, th.
-      'table' => array($this->t('Table'), '<table> <tr><th>' . $this->t('Table header') . '</th></tr> <tr><td>' . $this->t('Table cell') . '</td></tr> </table>'),
+      'table' => [$this->t('Table'), '<table> <tr><th>' . $this->t('Table header') . '</th></tr> <tr><td>' . $this->t('Table cell') . '</td></tr> </table>'],
       'tr' => NULL, 'td' => NULL, 'th' => NULL,
-      'del' => array($this->t('Deleted'), '<del>' . $this->t('Deleted') . '</del>'),
-      'ins' => array($this->t('Inserted'), '<ins>' . $this->t('Inserted') . '</ins>'),
+      'del' => [$this->t('Deleted'), '<del>' . $this->t('Deleted') . '</del>'],
+      'ins' => [$this->t('Inserted'), '<ins>' . $this->t('Inserted') . '</ins>'],
        // Assumes and describes li.
-      'ol' => array($this->t('Ordered list - use the &lt;li&gt; to begin each list item'), '<ol> <li>' . $this->t('First item') . '</li> <li>' . $this->t('Second item') . '</li> </ol>'),
-      'ul' => array($this->t('Unordered list - use the &lt;li&gt; to begin each list item'), '<ul> <li>' . $this->t('First item') . '</li> <li>' . $this->t('Second item') . '</li> </ul>'),
+      'ol' => [$this->t('Ordered list - use the &lt;li&gt; to begin each list item'), '<ol> <li>' . $this->t('First item') . '</li> <li>' . $this->t('Second item') . '</li> </ol>'],
+      'ul' => [$this->t('Unordered list - use the &lt;li&gt; to begin each list item'), '<ul> <li>' . $this->t('First item') . '</li> <li>' . $this->t('Second item') . '</li> </ul>'],
       'li' => NULL,
       // Assumes and describes dt and dd.
-      'dl' => array($this->t('Definition lists are similar to other HTML lists. &lt;dl&gt; begins the definition list, &lt;dt&gt; begins the definition term and &lt;dd&gt; begins the definition description.'), '<dl> <dt>' . $this->t('First term') . '</dt> <dd>' . $this->t('First definition') . '</dd> <dt>' . $this->t('Second term') . '</dt> <dd>' . $this->t('Second definition') . '</dd> </dl>'),
+      'dl' => [$this->t('Definition lists are similar to other HTML lists. &lt;dl&gt; begins the definition list, &lt;dt&gt; begins the definition term and &lt;dd&gt; begins the definition description.'), '<dl> <dt>' . $this->t('First term') . '</dt> <dd>' . $this->t('First definition') . '</dd> <dt>' . $this->t('Second term') . '</dt> <dd>' . $this->t('Second definition') . '</dd> </dl>'],
       'dt' => NULL, 'dd' => NULL,
-      'h1' => array($this->t('Heading'), '<h1>' . $this->t('Title') . '</h1>'),
-      'h2' => array($this->t('Heading'), '<h2>' . $this->t('Subtitle') . '</h2>'),
-      'h3' => array($this->t('Heading'), '<h3>' . $this->t('Subtitle three') . '</h3>'),
-      'h4' => array($this->t('Heading'), '<h4>' . $this->t('Subtitle four') . '</h4>'),
-      'h5' => array($this->t('Heading'), '<h5>' . $this->t('Subtitle five') . '</h5>'),
-      'h6' => array($this->t('Heading'), '<h6>' . $this->t('Subtitle six') . '</h6>')
-    );
-    $header = array($this->t('Tag Description'), $this->t('You Type'), $this->t('You Get'));
+      'h1' => [$this->t('Heading'), '<h1>' . $this->t('Title') . '</h1>'],
+      'h2' => [$this->t('Heading'), '<h2>' . $this->t('Subtitle') . '</h2>'],
+      'h3' => [$this->t('Heading'), '<h3>' . $this->t('Subtitle three') . '</h3>'],
+      'h4' => [$this->t('Heading'), '<h4>' . $this->t('Subtitle four') . '</h4>'],
+      'h5' => [$this->t('Heading'), '<h5>' . $this->t('Subtitle five') . '</h5>'],
+      'h6' => [$this->t('Heading'), '<h6>' . $this->t('Subtitle six') . '</h6>']
+    ];
+    $header = [$this->t('Tag Description'), $this->t('You Type'), $this->t('You Get')];
     preg_match_all('/<([a-z0-9]+)[^a-z0-9]/i', $allowed_html, $out);
     foreach ($out[1] as $tag) {
       if (!empty($tips[$tag])) {
-        $rows[] = array(
-          array('data' => $tips[$tag][0], 'class' => array('description')),
+        $rows[] = [
+          ['data' => $tips[$tag][0], 'class' => ['description']],
           // The markup must be escaped because this is the example code for the
           // user.
-          array('data' =>
-            array(
+          ['data' =>
+            [
               '#prefix' => '<code>',
               '#plain_text' => $tips[$tag][1],
               '#suffix' => '</code>'
-            ),
-            'class' => array('type')),
+            ],
+            'class' => ['type']],
           // The markup must not be escaped because this is the example output
           // for the user.
-          array('data' =>
-            array('#markup' => $tips[$tag][1]),
-            'class' => array('get'),
-          ),
-        );
+          ['data' =>
+            ['#markup' => $tips[$tag][1]],
+            'class' => ['get'],
+          ],
+        ];
       }
       else {
-        $rows[] = array(
-          array('data' => $this->t('No help provided for tag %tag.', array('%tag' => $tag)), 'class' => array('description'), 'colspan' => 3),
-        );
+        $rows[] = [
+          ['data' => $this->t('No help provided for tag %tag.', ['%tag' => $tag]), 'class' => ['description'], 'colspan' => 3],
+        ];
       }
     }
-    $table = array(
+    $table = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
-    );
+    ];
     $output .= drupal_render($table);
 
     $output .= '<p>' . $this->t('Most unusual characters can be directly entered without any problems.') . '</p>';
-    $output .= '<p>' . $this->t('If you do encounter problems, try using HTML character entities. A common example looks like &amp;amp; for an ampersand &amp; character. For a full list of entities see HTML\'s <a href=":html-entities">entities</a> page. Some of the available characters include:', array(':html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) . '</p>';
+    $output .= '<p>' . $this->t('If you do encounter problems, try using HTML character entities. A common example looks like &amp;amp; for an ampersand &amp; character. For a full list of entities see HTML\'s <a href=":html-entities">entities</a> page. Some of the available characters include:', [':html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html']) . '</p>';
 
-    $entities = array(
-      array($this->t('Ampersand'), '&amp;'),
-      array($this->t('Greater than'), '&gt;'),
-      array($this->t('Less than'), '&lt;'),
-      array($this->t('Quotation mark'), '&quot;'),
-    );
-    $header = array($this->t('Character Description'), $this->t('You Type'), $this->t('You Get'));
+    $entities = [
+      [$this->t('Ampersand'), '&amp;'],
+      [$this->t('Greater than'), '&gt;'],
+      [$this->t('Less than'), '&lt;'],
+      [$this->t('Quotation mark'), '&quot;'],
+    ];
+    $header = [$this->t('Character Description'), $this->t('You Type'), $this->t('You Get')];
     unset($rows);
     foreach ($entities as $entity) {
-      $rows[] = array(
-        array('data' => $entity[0], 'class' => array('description')),
+      $rows[] = [
+        ['data' => $entity[0], 'class' => ['description']],
         // The markup must be escaped because this is the example code for the
         // user.
-        array(
-          'data' => array(
+        [
+          'data' => [
             '#prefix' => '<code>',
             '#plain_text' => $entity[1],
             '#suffix' => '</code>',
-          ),
-          'class' => array('type'),
-        ),
+          ],
+          'class' => ['type'],
+        ],
         // The markup must not be escaped because this is the example output
         // for the user.
-        array(
-          'data' => array('#markup' => $entity[1]),
-          'class' => array('get'),
-        ),
-      );
+        [
+          'data' => ['#markup' => $entity[1]],
+          'class' => ['get'],
+        ],
+      ];
     }
-    $table = array(
+    $table = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
-    );
+    ];
     $output .= drupal_render($table);
     return $output;
   }
diff --git a/web/core/modules/filter/src/Plugin/Filter/FilterHtmlEscape.php b/web/core/modules/filter/src/Plugin/Filter/FilterHtmlEscape.php
index 24a37417a..a99945f5c 100644
--- a/web/core/modules/filter/src/Plugin/Filter/FilterHtmlEscape.php
+++ b/web/core/modules/filter/src/Plugin/Filter/FilterHtmlEscape.php
@@ -29,7 +29,7 @@ class FilterHtmlEscape extends FilterBase {
    */
   public function getHTMLRestrictions() {
     // Nothing is allowed.
-    return array('allowed' => array());
+    return ['allowed' => []];
   }
 
   /**
diff --git a/web/core/modules/filter/src/Plugin/Filter/FilterNull.php b/web/core/modules/filter/src/Plugin/Filter/FilterNull.php
index 032a6e040..afac124bd 100644
--- a/web/core/modules/filter/src/Plugin/Filter/FilterNull.php
+++ b/web/core/modules/filter/src/Plugin/Filter/FilterNull.php
@@ -35,7 +35,7 @@ class FilterNull extends FilterBase {
     // Once per filter, log that a filter plugin was missing.
     if (!$this->logged) {
       $this->logged = TRUE;
-      \Drupal::logger('filter')->alert('Missing filter plugin: %filter.', array('%filter' => $plugin_id));
+      \Drupal::logger('filter')->alert('Missing filter plugin: %filter.', ['%filter' => $plugin_id]);
     }
     parent::__construct($configuration, $plugin_id, $plugin_definition);
   }
@@ -52,7 +52,7 @@ class FilterNull extends FilterBase {
    */
   public function getHTMLRestrictions() {
     // Nothing is allowed.
-    return array('allowed' => array());
+    return ['allowed' => []];
   }
 
   /**
diff --git a/web/core/modules/filter/src/Plugin/Filter/FilterUrl.php b/web/core/modules/filter/src/Plugin/Filter/FilterUrl.php
index 97c226a35..d3d2c96b0 100644
--- a/web/core/modules/filter/src/Plugin/Filter/FilterUrl.php
+++ b/web/core/modules/filter/src/Plugin/Filter/FilterUrl.php
@@ -24,14 +24,14 @@ class FilterUrl extends FilterBase {
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $form['filter_url_length'] = array(
+    $form['filter_url_length'] = [
       '#type' => 'number',
       '#title' => $this->t('Maximum link text length'),
       '#default_value' => $this->settings['filter_url_length'],
       '#min' => 1,
       '#field_suffix' => $this->t('characters'),
       '#description' => $this->t('URLs longer than this number of characters will be truncated to prevent long strings that break formatting. The link itself will be retained; just the text portion of the link will be truncated.'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/filter/src/Plugin/FilterBase.php b/web/core/modules/filter/src/Plugin/FilterBase.php
index 7a48629cc..11e385f27 100644
--- a/web/core/modules/filter/src/Plugin/FilterBase.php
+++ b/web/core/modules/filter/src/Plugin/FilterBase.php
@@ -15,13 +15,6 @@ use Drupal\Core\Plugin\PluginBase;
  */
 abstract class FilterBase extends PluginBase implements FilterInterface {
 
-  /**
-   * The plugin ID of this filter.
-   *
-   * @var string
-   */
-  protected $plugin_id;
-
   /**
    * The name of the provider that owns this filter.
    *
@@ -48,14 +41,7 @@ abstract class FilterBase extends PluginBase implements FilterInterface {
    *
    * @var array
    */
-  public $settings = array();
-
-  /**
-   * A collection of all filters this filter participates in.
-   *
-   * @var \Drupal\filter\FilterPluginCollection
-   */
-  protected $collection;
+  public $settings = [];
 
   /**
    * {@inheritdoc}
@@ -88,32 +74,32 @@ abstract class FilterBase extends PluginBase implements FilterInterface {
    * {@inheritdoc}
    */
   public function getConfiguration() {
-    return array(
+    return [
       'id' => $this->getPluginId(),
       'provider' => $this->pluginDefinition['provider'],
       'status' => $this->status,
       'weight' => $this->weight,
       'settings' => $this->settings,
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'provider' => $this->pluginDefinition['provider'],
       'status' => FALSE,
       'weight' => $this->pluginDefinition['weight'] ?: 0,
       'settings' => $this->pluginDefinition['settings'],
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    return array();
+    return [];
   }
 
   /**
@@ -144,7 +130,7 @@ abstract class FilterBase extends PluginBase implements FilterInterface {
     // Implementations should work with and return $form. Returning an empty
     // array here allows the text format administration form to identify whether
     // the filter plugin has any settings form elements.
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php b/web/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
index d0e6143fa..8c7a16016 100644
--- a/web/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
+++ b/web/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
@@ -45,7 +45,7 @@ class FilterFormatPermission extends ProcessPluginBase implements ContainerFacto
       $plugin_id,
       $plugin_definition,
       $migration,
-      $container->get('plugin.manager.migrate.process')->createInstance('migration', array('migration' => 'd6_filter_format'), $migration)
+      $container->get('plugin.manager.migrate.process')->createInstance('migration', ['migration' => 'd6_filter_format'], $migration)
     );
   }
 
diff --git a/web/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php b/web/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
index 093277356..54b33d48d 100644
--- a/web/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
+++ b/web/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
@@ -25,37 +25,37 @@ class FilterFormat extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'format' => $this->t('Format ID.'),
       'name' => $this->t('The name of the format.'),
       'cache' => $this->t('Whether the format is cacheable.'),
       'roles' => $this->t('The role IDs which can use the format.'),
       'filters' => $this->t('The filters configured for the format.'),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function prepareRow(Row $row) {
-    $filters = array();
+    $filters = [];
     $roles = $row->getSourceProperty('roles');
     $row->setSourceProperty('roles', array_values(array_filter(explode(',', $roles))));
     $format = $row->getSourceProperty('format');
     // Find filters for this row.
     $results = $this->select('filters', 'f')
-      ->fields('f', array('module', 'delta', 'weight'))
+      ->fields('f', ['module', 'delta', 'weight'])
       ->condition('format', $format)
       ->execute();
     foreach ($results as $raw_filter) {
       $module = $raw_filter['module'];
       $delta = $raw_filter['delta'];
-      $filter = array(
+      $filter = [
         'module' => $module,
         'delta' => $delta,
         'weight' => $raw_filter['weight'],
-        'settings' => array(),
-      );
+        'settings' => [],
+      ];
       // Load the filter settings for the filter module, modules can use
       // hook_migration_d6_filter_formats_prepare_row() to add theirs.
       if ($raw_filter['module'] == 'filter') {
diff --git a/web/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php b/web/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php
index c166dcded..55c281110 100644
--- a/web/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php
+++ b/web/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php
@@ -25,14 +25,14 @@ class FilterFormat extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'format' => $this->t('Format ID.'),
       'name' => $this->t('The name of the format.'),
       'cache' => $this->t('Whether the format is cacheable.'),
       'status' => $this->t('The status of the format'),
       'weight' => $this->t('The weight of the format'),
       'filters' => $this->t('The filters configured for the format.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/filter/src/Tests/FilterAdminTest.php b/web/core/modules/filter/src/Tests/FilterAdminTest.php
index e71b57ab4..aceeff56c 100644
--- a/web/core/modules/filter/src/Tests/FilterAdminTest.php
+++ b/web/core/modules/filter/src/Tests/FilterAdminTest.php
@@ -42,67 +42,67 @@ class FilterAdminTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
     // Set up the filter formats used by this test.
-    $basic_html_format = FilterFormat::create(array(
+    $basic_html_format = FilterFormat::create([
       'format' => 'basic_html',
       'name' => 'Basic HTML',
-      'filters' => array(
-        'filter_html' => array(
+      'filters' => [
+        'filter_html' => [
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<p> <br> <strong> <a> <em>',
-          ),
-        ),
-      ),
-    ));
+          ],
+        ],
+      ],
+    ]);
     $basic_html_format->save();
-    $restricted_html_format = FilterFormat::create(array(
+    $restricted_html_format = FilterFormat::create([
       'format' => 'restricted_html',
       'name' => 'Restricted HTML',
-      'filters' => array(
-        'filter_html' => array(
+      'filters' => [
+        'filter_html' => [
           'status' => TRUE,
           'weight' => -10,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<p> <br> <strong> <a> <em> <h4>',
-          ),
-        ),
-        'filter_autop' => array(
+          ],
+        ],
+        'filter_autop' => [
           'status' => TRUE,
           'weight' => 0,
-        ),
-        'filter_url' => array(
+        ],
+        'filter_url' => [
           'status' => TRUE,
           'weight' => 0,
-        ),
-        'filter_htmlcorrector' => array(
+        ],
+        'filter_htmlcorrector' => [
           'status' => TRUE,
           'weight' => 10,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     $restricted_html_format->save();
-    $full_html_format = FilterFormat::create(array(
+    $full_html_format = FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $full_html_format->save();
 
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer filters',
       $basic_html_format->getPermissionName(),
       $restricted_html_format->getPermissionName(),
       $full_html_format->getPermissionName(),
       'access site reports',
-    ));
+    ]);
 
-    $this->webUser = $this->drupalCreateUser(array('create page content', 'edit own page content'));
-    user_role_grant_permissions('authenticated', array($basic_html_format->getPermissionName()));
-    user_role_grant_permissions('anonymous', array($restricted_html_format->getPermissionName()));
+    $this->webUser = $this->drupalCreateUser(['create page content', 'edit own page content']);
+    user_role_grant_permissions('authenticated', [$basic_html_format->getPermissionName()]);
+    user_role_grant_permissions('anonymous', [$restricted_html_format->getPermissionName()]);
     $this->drupalLogin($this->adminUser);
     $this->drupalPlaceBlock('local_actions_block');
   }
@@ -110,16 +110,16 @@ class FilterAdminTest extends WebTestBase {
   /**
    * Tests the format administration functionality.
    */
-  function testFormatAdmin() {
+  public function testFormatAdmin() {
     // Add text format.
     $this->drupalGet('admin/config/content/formats');
     $this->clickLink('Add text format');
     $format_id = Unicode::strtolower($this->randomMachineName());
     $name = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'format' => $format_id,
       'name' => $name,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
 
     // Verify default weight of the text format.
@@ -127,9 +127,9 @@ class FilterAdminTest extends WebTestBase {
     $this->assertFieldByName("formats[$format_id][weight]", 0, 'Text format weight was saved.');
 
     // Change the weight of the text format.
-    $edit = array(
+    $edit = [
       "formats[$format_id][weight]" => 5,
-    );
+    ];
     $this->drupalPostForm('admin/config/content/formats', $edit, t('Save'));
     $this->assertFieldByName("formats[$format_id][weight]", 5, 'Text format weight was saved.');
 
@@ -139,14 +139,14 @@ class FilterAdminTest extends WebTestBase {
     // and 'admin/config/content/formats/manage/' . $format_id . '/disable'
     // exists.
     // @todo: See https://www.drupal.org/node/2031223 for the above.
-    $edit_link = $this->xpath('//a[@href=:href]', array(
+    $edit_link = $this->xpath('//a[@href=:href]', [
       ':href' => \Drupal::url('entity.filter_format.edit_form', ['filter_format' => $format_id])
-    ));
+    ]);
     $this->assertTrue($edit_link, format_string('Link href %href found.',
-      array('%href' => 'admin/config/content/formats/manage/' . $format_id)
+      ['%href' => 'admin/config/content/formats/manage/' . $format_id]
     ));
     $this->drupalGet('admin/config/content/formats/manage/' . $format_id);
-    $this->drupalPostForm(NULL, array(), t('Save configuration'));
+    $this->drupalPostForm(NULL, [], t('Save configuration'));
 
     // Verify that the custom weight of the text format has been retained.
     $this->drupalGet('admin/config/content/formats');
@@ -155,7 +155,7 @@ class FilterAdminTest extends WebTestBase {
     // Disable text format.
     $this->assertLinkByHref('admin/config/content/formats/manage/' . $format_id . '/disable');
     $this->drupalGet('admin/config/content/formats/manage/' . $format_id . '/disable');
-    $this->drupalPostForm(NULL, array(), t('Disable'));
+    $this->drupalPostForm(NULL, [], t('Disable'));
 
     // Verify that disabled text format no longer exists.
     $this->drupalGet('admin/config/content/formats/manage/' . $format_id);
@@ -163,29 +163,29 @@ class FilterAdminTest extends WebTestBase {
 
     // Attempt to create a format of the same machine name as the disabled
     // format but with a different human readable name.
-    $edit = array(
+    $edit = [
       'format' => $format_id,
       'name' => 'New format',
-    );
+    ];
     $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
     $this->assertText('The machine-readable name is already in use. It must be unique.');
 
     // Attempt to create a format of the same human readable name as the
     // disabled format but with a different machine name.
-    $edit = array(
+    $edit = [
       'format' => 'new_format',
       'name' => $name,
-    );
+    ];
     $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
-    $this->assertRaw(t('Text format names must be unique. A format named %name already exists.', array(
+    $this->assertRaw(t('Text format names must be unique. A format named %name already exists.', [
       '%name' => $name,
-    )));
+    ]));
   }
 
   /**
    * Tests filter administration functionality.
    */
-  function testFilterAdmin() {
+  public function testFilterAdmin() {
     $first_filter = 'filter_autop';
     $second_filter = 'filter_url';
 
@@ -206,22 +206,22 @@ class FilterAdminTest extends WebTestBase {
     $this->assertTrue($full_format->access('use', $this->adminUser), 'Admin user may use Full HTML.');
     $this->assertFalse($full_format->access('use', $this->webUser), 'Web user may not use Full HTML.');
 
-    // Add an additional tag.
-    $edit = array();
-    $edit['filters[filter_html][settings][allowed_html]'] = '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <quote>';
+    // Add an additional tag and extra spaces and returns.
+    $edit = [];
+    $edit['filters[filter_html][settings][allowed_html]'] = "<a>   <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>\r\n<quote>";
     $this->drupalPostForm('admin/config/content/formats/manage/' . $restricted, $edit, t('Save configuration'));
     $this->assertUrl('admin/config/content/formats');
     $this->drupalGet('admin/config/content/formats/manage/' . $restricted);
-    $this->assertFieldByName('filters[filter_html][settings][allowed_html]', $edit['filters[filter_html][settings][allowed_html]'], 'Allowed HTML tag added.');
+    $this->assertFieldByName('filters[filter_html][settings][allowed_html]', "<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <quote>", 'Allowed HTML tag added.');
 
-    $elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', array(
+    $elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', [
       ':first' => 'filters[' . $first_filter . '][weight]',
       ':second' => 'filters[' . $second_filter . '][weight]',
-    ));
+    ]);
     $this->assertTrue(!empty($elements), 'Order confirmed in admin interface.');
 
     // Reorder filters.
-    $edit = array();
+    $edit = [];
     $edit['filters[' . $second_filter . '][weight]'] = 1;
     $edit['filters[' . $first_filter . '][weight]'] = 2;
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
@@ -230,10 +230,10 @@ class FilterAdminTest extends WebTestBase {
     $this->assertFieldByName('filters[' . $second_filter . '][weight]', 1, 'Order saved successfully.');
     $this->assertFieldByName('filters[' . $first_filter . '][weight]', 2, 'Order saved successfully.');
 
-    $elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', array(
+    $elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', [
       ':first' => 'filters[' . $second_filter . '][weight]',
       ':second' => 'filters[' . $first_filter . '][weight]',
-    ));
+    ]);
     $this->assertTrue(!empty($elements), 'Reorder confirmed in admin interface.');
 
     $filter_format = FilterFormat::load($restricted);
@@ -246,7 +246,7 @@ class FilterAdminTest extends WebTestBase {
     $this->assertEqual($filter_format->filters($second_filter)->weight + 1, $filter_format->filters($first_filter)->weight, 'Order confirmed in configuration.');
 
     // Add format.
-    $edit = array();
+    $edit = [];
     $edit['format'] = Unicode::strtolower($this->randomMachineName());
     $edit['name'] = $this->randomMachineName();
     $edit['roles[' . RoleInterface::AUTHENTICATED_ID . ']'] = 1;
@@ -254,7 +254,7 @@ class FilterAdminTest extends WebTestBase {
     $edit['filters[' . $first_filter . '][status]'] = TRUE;
     $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
     $this->assertUrl('admin/config/content/formats');
-    $this->assertRaw(t('Added text format %format.', array('%format' => $edit['name'])), 'New filter created.');
+    $this->assertRaw(t('Added text format %format.', ['%format' => $edit['name']]), 'New filter created.');
 
     filter_formats_reset();
     $format = FilterFormat::load($edit['format']);
@@ -265,18 +265,18 @@ class FilterAdminTest extends WebTestBase {
     $this->assertFieldByName('filters[' . $first_filter . '][status]', '', 'URL filter found.');
 
     // Disable new filter.
-    $this->drupalPostForm('admin/config/content/formats/manage/' . $format->id() . '/disable', array(), t('Disable'));
+    $this->drupalPostForm('admin/config/content/formats/manage/' . $format->id() . '/disable', [], t('Disable'));
     $this->assertUrl('admin/config/content/formats');
-    $this->assertRaw(t('Disabled text format %format.', array('%format' => $edit['name'])), 'Format successfully disabled.');
+    $this->assertRaw(t('Disabled text format %format.', ['%format' => $edit['name']]), 'Format successfully disabled.');
 
     // Allow authenticated users on full HTML.
     $format = FilterFormat::load($full);
-    $edit = array();
+    $edit = [];
     $edit['roles[' . RoleInterface::ANONYMOUS_ID . ']'] = 0;
     $edit['roles[' . RoleInterface::AUTHENTICATED_ID . ']'] = 1;
     $this->drupalPostForm('admin/config/content/formats/manage/' . $full, $edit, t('Save configuration'));
     $this->assertUrl('admin/config/content/formats');
-    $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->label())), 'Full HTML format successfully updated.');
+    $this->assertRaw(t('The text format %format has been updated.', ['%format' => $format->label()]), 'Full HTML format successfully updated.');
 
     // Switch user.
     $this->drupalLogin($this->webUser);
@@ -289,15 +289,15 @@ class FilterAdminTest extends WebTestBase {
     $extra_text = 'text';
     $text = $body . '<random>' . $extra_text . '</random>';
 
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $edit['body[0][value]'] = $text;
     $edit['body[0][format]'] = $basic;
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
-    $this->assertText(t('Basic page @title has been created.', array('@title' => $edit['title[0][value]'])), 'Filtered node created.');
+    $this->assertText(t('Basic page @title has been created.', ['@title' => $edit['title[0][value]']]), 'Filtered node created.');
 
     // Verify that the creation message contains a link to a node.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'node/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'node/']);
     $this->assert(isset($view_link), 'The message area contains a link to a node');
 
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
@@ -312,7 +312,7 @@ class FilterAdminTest extends WebTestBase {
     $this->config('filter.settings')
       ->set('always_show_fallback_choice', TRUE)
       ->save();
-    $edit = array();
+    $edit = [];
     $edit['body[0][format]'] = $plain;
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
     $this->drupalGet('node/' . $node->id());
@@ -326,7 +326,7 @@ class FilterAdminTest extends WebTestBase {
 
     // Clean up.
     // Allowed tags.
-    $edit = array();
+    $edit = [];
     $edit['filters[filter_html][settings][allowed_html]'] = '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>';
     $this->drupalPostForm('admin/config/content/formats/manage/' . $basic, $edit, t('Save configuration'));
     $this->assertUrl('admin/config/content/formats');
@@ -334,16 +334,16 @@ class FilterAdminTest extends WebTestBase {
     $this->assertFieldByName('filters[filter_html][settings][allowed_html]', $edit['filters[filter_html][settings][allowed_html]'], 'Changes reverted.');
 
     // Full HTML.
-    $edit = array();
+    $edit = [];
     $edit['roles[' . RoleInterface::AUTHENTICATED_ID . ']'] = FALSE;
     $this->drupalPostForm('admin/config/content/formats/manage/' . $full, $edit, t('Save configuration'));
     $this->assertUrl('admin/config/content/formats');
-    $this->assertRaw(t('The text format %format has been updated.', array('%format' => $format->label())), 'Full HTML format successfully reverted.');
+    $this->assertRaw(t('The text format %format has been updated.', ['%format' => $format->label()]), 'Full HTML format successfully reverted.');
     $this->drupalGet('admin/config/content/formats/manage/' . $full);
     $this->assertFieldByName('roles[' . RoleInterface::AUTHENTICATED_ID . ']', $edit['roles[' . RoleInterface::AUTHENTICATED_ID . ']'], 'Changes reverted.');
 
     // Filter order.
-    $edit = array();
+    $edit = [];
     $edit['filters[' . $second_filter . '][weight]'] = 2;
     $edit['filters[' . $first_filter . '][weight]'] = 1;
     $this->drupalPostForm('admin/config/content/formats/manage/' . $basic, $edit, t('Save configuration'));
@@ -356,19 +356,19 @@ class FilterAdminTest extends WebTestBase {
   /**
    * Tests the URL filter settings form is properly validated.
    */
-  function testUrlFilterAdmin() {
+  public function testUrlFilterAdmin() {
     // The form does not save with an invalid filter URL length.
-    $edit = array(
+    $edit = [
       'filters[filter_url][settings][filter_url_length]' => $this->randomMachineName(4),
-    );
+    ];
     $this->drupalPostForm('admin/config/content/formats/manage/basic_html', $edit, t('Save configuration'));
-    $this->assertNoRaw(t('The text format %format has been updated.', array('%format' => 'Basic HTML')));
+    $this->assertNoRaw(t('The text format %format has been updated.', ['%format' => 'Basic HTML']));
   }
 
   /**
    * Tests whether filter tips page is not HTML escaped.
    */
-  function testFilterTipHtmlEscape() {
+  public function testFilterTipHtmlEscape() {
     $this->drupalLogin($this->adminUser);
     global $base_url;
 
diff --git a/web/core/modules/filter/src/Tests/FilterFormTest.php b/web/core/modules/filter/src/Tests/FilterFormTest.php
index 24bbc158a..9d0641e41 100644
--- a/web/core/modules/filter/src/Tests/FilterFormTest.php
+++ b/web/core/modules/filter/src/Tests/FilterFormTest.php
@@ -18,7 +18,7 @@ class FilterFormTest extends WebTestBase {
    *
    * @var array
    */
-  protected static $modules = array('filter', 'filter_test');
+  protected static $modules = ['filter', 'filter_test'];
 
   /**
    * An administrative user account that can administer text formats.
@@ -48,17 +48,17 @@ class FilterFormTest extends WebTestBase {
     $full_html_format = FilterFormat::load('full_html');
 
     // Create users.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer filters',
       $filtered_html_format->getPermissionName(),
       $full_html_format->getPermissionName(),
       $filter_test_format->getPermissionName(),
-    ));
+    ]);
 
-    $this->webUser = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser([
       $filtered_html_format->getPermissionName(),
       $filter_test_format->getPermissionName(),
-    ));
+    ]);
   }
 
   /**
@@ -83,7 +83,7 @@ class FilterFormTest extends WebTestBase {
     $this->drupalGet('filter-test/text-format');
 
     // Test a text format element with all formats.
-    $formats = array('filtered_html', 'full_html', 'filter_test');
+    $formats = ['filtered_html', 'full_html', 'filter_test'];
     $this->assertEnabledTextarea('edit-all-formats-no-default-value');
     // If no default is given, the format with the lowest weight becomes the
     // default.
@@ -98,7 +98,7 @@ class FilterFormTest extends WebTestBase {
     $this->assertRequiredSelectAndOptions('edit-all-formats-default-missing-format--2', $formats);
 
     // Test a text format element with a predefined list of formats.
-    $formats = array('full_html', 'filter_test');
+    $formats = ['full_html', 'filter_test'];
     $this->assertEnabledTextarea('edit-restricted-formats-no-default-value');
     $this->assertOptions('edit-restricted-formats-no-default-format--2', $formats, 'full_html');
     $this->assertEnabledTextarea('edit-restricted-formats-default-value');
@@ -109,7 +109,7 @@ class FilterFormTest extends WebTestBase {
     $this->assertRequiredSelectAndOptions('edit-restricted-formats-default-disallowed-format--2', $formats);
 
     // Test a text format element with a fixed format.
-    $formats = array('filter_test');
+    $formats = ['filter_test'];
     // When there is only a single option there is no point in choosing.
     $this->assertEnabledTextarea('edit-single-format-no-default-value');
     $this->assertNoSelect('edit-single-format-no-default-format--2');
@@ -132,7 +132,7 @@ class FilterFormTest extends WebTestBase {
 
     // Test a text format element with all formats. Only formats the user has
     // access to are shown.
-    $formats = array('filtered_html', 'filter_test');
+    $formats = ['filtered_html', 'filter_test'];
     $this->assertEnabledTextarea('edit-all-formats-no-default-value');
     // If no default is given, the format with the lowest weight becomes the
     // default. This happens to be 'filtered_html'.
@@ -178,10 +178,10 @@ class FilterFormTest extends WebTestBase {
    *   TRUE if the assertion passed; FALSE otherwise.
    */
   protected function assertNoSelect($id) {
-    $select = $this->xpath('//select[@id=:id]', array(':id' => $id));
-    return $this->assertFalse($select, SafeMarkup::format('Field @id does not exist.', array(
+    $select = $this->xpath('//select[@id=:id]', [':id' => $id]);
+    return $this->assertFalse($select, SafeMarkup::format('Field @id does not exist.', [
       '@id' => $id,
-    )));
+    ]));
   }
 
   /**
@@ -198,20 +198,20 @@ class FilterFormTest extends WebTestBase {
    *   TRUE if the assertion passed; FALSE otherwise.
    */
   protected function assertOptions($id, array $expected_options, $selected) {
-    $select = $this->xpath('//select[@id=:id]', array(':id' => $id));
+    $select = $this->xpath('//select[@id=:id]', [':id' => $id]);
     $select = reset($select);
-    $passed = $this->assertTrue($select instanceof \SimpleXMLElement, SafeMarkup::format('Field @id exists.', array(
+    $passed = $this->assertTrue($select instanceof \SimpleXMLElement, SafeMarkup::format('Field @id exists.', [
       '@id' => $id,
-    )));
+    ]));
 
     $found_options = $this->getAllOptions($select);
     foreach ($found_options as $found_key => $found_option) {
       $expected_key = array_search($found_option->attributes()->value, $expected_options);
       if ($expected_key !== FALSE) {
-        $this->pass(SafeMarkup::format('Option @option for field @id exists.', array(
+        $this->pass(SafeMarkup::format('Option @option for field @id exists.', [
           '@option' => $expected_options[$expected_key],
           '@id' => $id,
-        )));
+        ]));
         unset($found_options[$found_key]);
         unset($expected_options[$expected_key]);
       }
@@ -220,17 +220,17 @@ class FilterFormTest extends WebTestBase {
     // Make sure that all expected options were found and that there are no
     // unexpected options.
     foreach ($expected_options as $expected_option) {
-      $this->fail(SafeMarkup::format('Option @option for field @id exists.', array(
+      $this->fail(SafeMarkup::format('Option @option for field @id exists.', [
         '@option' => $expected_option,
         '@id' => $id,
-      )));
+      ]));
       $passed = FALSE;
     }
     foreach ($found_options as $found_option) {
-      $this->fail(SafeMarkup::format('Option @option for field @id does not exist.', array(
+      $this->fail(SafeMarkup::format('Option @option for field @id does not exist.', [
         '@option' => $found_option->attributes()->value,
         '@id' => $id,
-      )));
+      ]));
       $passed = FALSE;
     }
 
@@ -250,13 +250,13 @@ class FilterFormTest extends WebTestBase {
    *   TRUE if the assertion passed; FALSE otherwise.
    */
   protected function assertRequiredSelectAndOptions($id, array $options) {
-    $select = $this->xpath('//select[@id=:id and contains(@required, "required")]', array(
+    $select = $this->xpath('//select[@id=:id and contains(@required, "required")]', [
       ':id' => $id,
-    ));
+    ]);
     $select = reset($select);
-    $passed = $this->assertTrue($select instanceof \SimpleXMLElement, SafeMarkup::format('Required field @id exists.', array(
+    $passed = $this->assertTrue($select instanceof \SimpleXMLElement, SafeMarkup::format('Required field @id exists.', [
       '@id' => $id,
-    )));
+    ]));
     // A required select element has a "- Select -" option whose key is an empty
     // string.
     $options[] = '';
@@ -273,13 +273,13 @@ class FilterFormTest extends WebTestBase {
    *   TRUE if the assertion passed; FALSE otherwise.
    */
   protected function assertEnabledTextarea($id) {
-    $textarea = $this->xpath('//textarea[@id=:id and not(contains(@disabled, "disabled"))]', array(
+    $textarea = $this->xpath('//textarea[@id=:id and not(contains(@disabled, "disabled"))]', [
       ':id' => $id,
-    ));
+    ]);
     $textarea = reset($textarea);
-    return $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Enabled field @id exists.', array(
+    return $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Enabled field @id exists.', [
       '@id' => $id,
-    )));
+    ]));
   }
 
   /**
@@ -292,17 +292,17 @@ class FilterFormTest extends WebTestBase {
    *   TRUE if the assertion passed; FALSE otherwise.
    */
   protected function assertDisabledTextarea($id) {
-    $textarea = $this->xpath('//textarea[@id=:id and contains(@disabled, "disabled")]', array(
+    $textarea = $this->xpath('//textarea[@id=:id and contains(@disabled, "disabled")]', [
       ':id' => $id,
-    ));
+    ]);
     $textarea = reset($textarea);
-    $passed = $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Disabled field @id exists.', array(
+    $passed = $this->assertTrue($textarea instanceof \SimpleXMLElement, SafeMarkup::format('Disabled field @id exists.', [
       '@id' => $id,
-    )));
+    ]));
     $expected = 'This field has been disabled because you do not have sufficient permissions to edit it.';
-    $passed = $passed && $this->assertEqual((string) $textarea, $expected, SafeMarkup::format('Disabled textarea @id hides text in an inaccessible text format.', array(
+    $passed = $passed && $this->assertEqual((string) $textarea, $expected, SafeMarkup::format('Disabled textarea @id hides text in an inaccessible text format.', [
       '@id' => $id,
-    )));
+    ]));
     // Make sure the text format select is not shown.
     $select_id = str_replace('value', 'format--2', $id);
     return $passed && $this->assertNoSelect($select_id);
diff --git a/web/core/modules/filter/src/Tests/FilterFormatAccessTest.php b/web/core/modules/filter/src/Tests/FilterFormatAccessTest.php
index 496cfb8e0..a4c23b2d5 100644
--- a/web/core/modules/filter/src/Tests/FilterFormatAccessTest.php
+++ b/web/core/modules/filter/src/Tests/FilterFormatAccessTest.php
@@ -69,25 +69,25 @@ class FilterFormatAccessTest extends WebTestBase {
 
     $this->drupalPlaceBlock('page_title_block');
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
     // Create a user who can administer text formats, but does not have
     // specific permission to use any of them.
-    $this->filterAdminUser = $this->drupalCreateUser(array(
+    $this->filterAdminUser = $this->drupalCreateUser([
       'administer filters',
       'create page content',
       'edit any page content',
-    ));
+    ]);
 
     // Create three text formats. Two text formats are created for all users so
     // that the drop-down list appears for all tests.
     $this->drupalLogin($this->filterAdminUser);
-    $formats = array();
+    $formats = [];
     for ($i = 0; $i < 3; $i++) {
-      $edit = array(
+      $edit = [
         'format' => Unicode::strtolower($this->randomMachineName()),
         'name' => $this->randomMachineName(),
-      );
+      ];
       $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
       $this->resetFilterCaches();
       $formats[] = FilterFormat::load($edit['format']);
@@ -96,36 +96,37 @@ class FilterFormatAccessTest extends WebTestBase {
     $this->drupalLogout();
 
     // Create a regular user with access to two of the formats.
-    $this->webUser = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser([
       'create page content',
       'edit any page content',
       $this->allowedFormat->getPermissionName(),
       $this->secondAllowedFormat->getPermissionName(),
-    ));
+    ]);
 
     // Create an administrative user who has access to use all three formats.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer filters',
       'create page content',
       'edit any page content',
       $this->allowedFormat->getPermissionName(),
       $this->secondAllowedFormat->getPermissionName(),
       $this->disallowedFormat->getPermissionName(),
-    ));
+    ]);
     $this->drupalPlaceBlock('local_tasks_block');
   }
 
   /**
    * Tests the Filter format access permissions functionality.
    */
-  function testFormatPermissions() {
+  public function testFormatPermissions() {
     // Make sure that a regular user only has access to the text formats for
     // which they were granted access.
     $fallback_format = FilterFormat::load(filter_fallback_format());
+    $disallowed_format_name = $this->disallowedFormat->getPermissionName();
     $this->assertTrue($this->allowedFormat->access('use', $this->webUser), 'A regular user has access to use a text format they were granted access to.');
     $this->assertEqual(AccessResult::allowed()->addCacheContexts(['user.permissions']), $this->allowedFormat->access('use', $this->webUser, TRUE), 'A regular user has access to use a text format they were granted access to.');
     $this->assertFalse($this->disallowedFormat->access('use', $this->webUser), 'A regular user does not have access to use a text format they were not granted access to.');
-    $this->assertEqual(AccessResult::neutral()->cachePerPermissions(), $this->disallowedFormat->access('use', $this->webUser, TRUE), 'A regular user does not have access to use a text format they were not granted access to.');
+    $this->assertEqual(AccessResult::neutral("The '$disallowed_format_name' permission is required.")->cachePerPermissions(), $this->disallowedFormat->access('use', $this->webUser, TRUE), 'A regular user does not have access to use a text format they were not granted access to.');
     $this->assertTrue($fallback_format->access('use', $this->webUser), 'A regular user has access to use the fallback format.');
     $this->assertEqual(AccessResult::allowed(), $fallback_format->access('use', $this->webUser, TRUE), 'A regular user has access to use the fallback format.');
 
@@ -144,11 +145,11 @@ class FilterFormatAccessTest extends WebTestBase {
     // the disallowed format does not.
     $this->drupalLogin($this->webUser);
     $this->drupalGet('node/add/page');
-    $elements = $this->xpath('//select[@name=:name]/option', array(
+    $elements = $this->xpath('//select[@name=:name]/option', [
       ':name' => 'body[0][format]',
       ':option' => $this->allowedFormat->id(),
-    ));
-    $options = array();
+    ]);
+    $options = [];
     foreach ($elements as $element) {
       $options[(string) $element['value']] = $element;
     }
@@ -181,7 +182,7 @@ class FilterFormatAccessTest extends WebTestBase {
   /**
    * Tests if text format is available to a role.
    */
-  function testFormatRoles() {
+  public function testFormatRoles() {
     // Get the role ID assigned to the regular user.
     $roles = $this->webUser->getRoles(TRUE);
     $rid = $roles[0];
@@ -211,13 +212,13 @@ class FilterFormatAccessTest extends WebTestBase {
    * be edited by administrators only, but that the administrator is forced to
    * choose a new format before saving the page.
    */
-  function testFormatWidgetPermissions() {
+  public function testFormatWidgetPermissions() {
     $body_value_key = 'body[0][value]';
     $body_format_key = 'body[0][format]';
 
     // Create node to edit.
     $this->drupalLogin($this->adminUser);
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit[$body_value_key] = $this->randomMachineName(16);
     $edit[$body_format_key] = $this->disallowedFormat->id();
@@ -233,7 +234,7 @@ class FilterFormatAccessTest extends WebTestBase {
     $this->assertFieldByXPath("//textarea[@name='$body_value_key' and @disabled='disabled']", t('This field has been disabled because you do not have sufficient permissions to edit it.'), 'Text format access denied message found.');
 
     // Verify that title can be changed, but preview displays original body.
-    $new_edit = array();
+    $new_edit = [];
     $new_edit['title[0][value]'] = $this->randomMachineName(8);
     $this->drupalPostForm(NULL, $new_edit, t('Preview'));
     $this->assertText($edit[$body_value_key], 'Old body found in preview.');
@@ -275,10 +276,10 @@ class FilterFormatAccessTest extends WebTestBase {
     // produces an error message, and does not result in the node being saved.
     $old_title = $new_edit['title[0][value]'];
     $new_title = $this->randomMachineName(8);
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $new_title;
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->assertText(t('@name field is required.', array('@name' => t('Text format'))), 'Error message is displayed.');
+    $this->assertText(t('@name field is required.', ['@name' => t('Text format')]), 'Error message is displayed.');
     $this->drupalGet('node/' . $node->id());
     $this->assertText($old_title, 'Old title found.');
     $this->assertNoText($new_title, 'New title not found.');
@@ -293,7 +294,7 @@ class FilterFormatAccessTest extends WebTestBase {
     // Switch the text format to a new one, then disable that format and all
     // other formats on the site (leaving only the fallback format).
     $this->drupalLogin($this->adminUser);
-    $edit = array($body_format_key => $this->allowedFormat->id());
+    $edit = [$body_format_key => $this->allowedFormat->id()];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
     $this->assertUrl('node/' . $node->id());
     foreach (filter_formats() as $format) {
@@ -310,10 +311,10 @@ class FilterFormatAccessTest extends WebTestBase {
     $this->drupalLogin($this->filterAdminUser);
     $old_title = $new_title;
     $new_title = $this->randomMachineName(8);
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $new_title;
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->assertText(t('@name field is required.', array('@name' => t('Text format'))), 'Error message is displayed.');
+    $this->assertText(t('@name field is required.', ['@name' => t('Text format')]), 'Error message is displayed.');
     $this->drupalGet('node/' . $node->id());
     $this->assertText($old_title, 'Old title found.');
     $this->assertNoText($new_title, 'New title not found.');
diff --git a/web/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php b/web/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
index 5ce4e6d6b..249021a83 100644
--- a/web/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
+++ b/web/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
@@ -21,7 +21,7 @@ class FilterHtmlImageSecureTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'node', 'comment');
+  public static $modules = ['filter', 'node', 'comment'];
 
   /**
    * An authenticated user.
@@ -34,38 +34,38 @@ class FilterHtmlImageSecureTest extends WebTestBase {
     parent::setUp();
 
     // Setup Filtered HTML text format.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
-      'filters' => array(
-        'filter_html' => array(
+      'filters' => [
+        'filter_html' => [
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<img src testattribute> <a>',
-          ),
-        ),
-        'filter_autop' => array(
+          ],
+        ],
+        'filter_autop' => [
           'status' => 1,
-        ),
-        'filter_html_image_secure' => array(
+        ],
+        'filter_html_image_secure' => [
           'status' => 1,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     $filtered_html_format->save();
 
     // Setup users.
-    $this->webUser = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser([
       'access content',
       'access comments',
       'post comments',
       'skip comment approval',
       $filtered_html_format->getPermissionName(),
-    ));
+    ]);
     $this->drupalLogin($this->webUser);
 
     // Setup a node to comment and test on.
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
     // Add a comment field.
     $this->addDefaultCommentField('node', 'page');
     $this->node = $this->drupalCreateNode();
@@ -74,7 +74,7 @@ class FilterHtmlImageSecureTest extends WebTestBase {
   /**
    * Tests removal of images having a non-local source.
    */
-  function testImageSource() {
+  public function testImageSource() {
     global $base_url;
 
     $public_files_path = PublicStream::basePath();
@@ -104,7 +104,7 @@ class FilterHtmlImageSecureTest extends WebTestBase {
     // expected filter conversions.
     $host = \Drupal::request()->getHost();
     $host_pattern = '|^http\://' . $host . '(\:[0-9]{0,5})|';
-    $images = array(
+    $images = [
       $http_base_url . '/' . $druplicon => base_path() . $druplicon,
       $https_base_url . '/' . $druplicon => base_path() . $druplicon,
       // Test a url that includes a port.
@@ -123,8 +123,8 @@ class FilterHtmlImageSecureTest extends WebTestBase {
       'https://example.com/' . $druplicon => $red_x_image,
       'javascript:druplicon.png' => $red_x_image,
       $csrf_path . '/logout' => $red_x_image,
-    );
-    $comment = array();
+    ];
+    $comment = [];
     foreach ($images as $image => $converted) {
       // Output the image source as plain text for debugging.
       $comment[] = $image . ':';
@@ -132,9 +132,9 @@ class FilterHtmlImageSecureTest extends WebTestBase {
       // contain characters that confuse XPath.
       $comment[] = '<img src="' . $image . '" testattribute="' . hash('sha256', $image) . '" />';
     }
-    $edit = array(
+    $edit = [
       'comment_body[0][value]' => implode("\n", $comment),
-    );
+    ];
     $this->drupalPostForm('node/' . $this->node->id(), $edit, t('Save'));
     foreach ($images as $image => $converted) {
       $found = FALSE;
@@ -151,7 +151,7 @@ class FilterHtmlImageSecureTest extends WebTestBase {
           $this->assertEqual((string) $element['src'], $converted);
         }
       }
-      $this->assertTrue($found, format_string('@image was found.', array('@image' => $image)));
+      $this->assertTrue($found, format_string('@image was found.', ['@image' => $image]));
     }
   }
 
diff --git a/web/core/modules/filter/tests/filter_test/src/Form/FilterTestFormatForm.php b/web/core/modules/filter/tests/filter_test/src/Form/FilterTestFormatForm.php
index 7f4ad57e8..a5049a163 100644
--- a/web/core/modules/filter/tests/filter_test/src/Form/FilterTestFormatForm.php
+++ b/web/core/modules/filter/tests/filter_test/src/Form/FilterTestFormatForm.php
@@ -25,80 +25,80 @@ class FilterTestFormatForm extends FormBase {
     // form elements.
     $form['#tree'] = TRUE;
 
-    $form['all_formats'] = array(
+    $form['all_formats'] = [
       '#type' => 'details',
       '#title' => 'All text formats',
-    );
-    $form['all_formats']['no_default'] = array(
+    ];
+    $form['all_formats']['no_default'] = [
       '#type' => 'text_format',
       '#title' => 'No default value',
-    );
-    $form['all_formats']['default'] = array(
+    ];
+    $form['all_formats']['default'] = [
       '#type' => 'text_format',
       '#title' => 'Default value',
       '#format' => 'filter_test',
-    );
-    $form['all_formats']['default_missing'] = array(
+    ];
+    $form['all_formats']['default_missing'] = [
       '#type' => 'text_format',
       '#title' => 'Missing default value',
       '#format' => 'missing_format',
-    );
+    ];
 
-    $form['restricted_formats'] = array(
+    $form['restricted_formats'] = [
       '#type' => 'details',
       '#title' => 'Restricted text format list',
-    );
-    $form['restricted_formats']['no_default'] = array(
+    ];
+    $form['restricted_formats']['no_default'] = [
       '#type' => 'text_format',
       '#title' => 'No default value',
-      '#allowed_formats' => array('full_html', 'filter_test'),
-    );
-    $form['restricted_formats']['default'] = array(
+      '#allowed_formats' => ['full_html', 'filter_test'],
+    ];
+    $form['restricted_formats']['default'] = [
       '#type' => 'text_format',
       '#title' => 'Default value',
       '#format' => 'full_html',
-      '#allowed_formats' => array('full_html', 'filter_test'),
-    );
-    $form['restricted_formats']['default_missing'] = array(
+      '#allowed_formats' => ['full_html', 'filter_test'],
+    ];
+    $form['restricted_formats']['default_missing'] = [
       '#type' => 'text_format',
       '#title' => 'Missing default value',
       '#format' => 'missing_format',
-      '#allowed_formats' => array('full_html', 'filter_test'),
-    );
-    $form['restricted_formats']['default_disallowed'] = array(
+      '#allowed_formats' => ['full_html', 'filter_test'],
+    ];
+    $form['restricted_formats']['default_disallowed'] = [
       '#type' => 'text_format',
       '#title' => 'Disallowed default value',
       '#format' => 'filtered_html',
-      '#allowed_formats' => array('full_html', 'filter_test'),
-    );
+      '#allowed_formats' => ['full_html', 'filter_test'],
+    ];
 
-    $form['single_format'] = array(
+    $form['single_format'] = [
       '#type' => 'details',
       '#title' => 'Single text format',
-    );
-    $form['single_format']['no_default'] = array(
+    ];
+    $form['single_format']['no_default'] = [
       '#type' => 'text_format',
       '#title' => 'No default value',
-      '#allowed_formats' => array('filter_test'),
-    );
-    $form['single_format']['default'] = array(
+      '#allowed_formats' => ['filter_test'],
+    ];
+    $form['single_format']['default'] = [
       '#type' => 'text_format',
       '#title' => 'Default value',
       '#format' => 'filter_test',
-      '#allowed_formats' => array('filter_test'),
-    );
-    $form['single_format']['default_missing'] = array(
+      '#allowed_formats' => ['filter_test'],
+    ];
+    $form['single_format']['default_missing'] = [
       '#type' => 'text_format',
       '#title' => 'Missing default value',
       '#format' => 'missing_format',
-      '#allowed_formats' => array('filter_test'),
-    );
-    $form['single_format']['default_disallowed'] = array(
+      '#allowed_formats' => ['filter_test'],
+    ];
+    $form['single_format']['default_disallowed'] = [
       '#type' => 'text_format',
       '#title' => 'Disallowed default value',
       '#format' => 'full_html',
-      '#allowed_formats' => array('filter_test'),
-    );
+      '#allowed_formats' => ['filter_test'],
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestAssets.php b/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestAssets.php
index 700dec39a..5f63a06b0 100644
--- a/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestAssets.php
+++ b/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestAssets.php
@@ -22,11 +22,11 @@ class FilterTestAssets extends FilterBase {
    */
   public function process($text, $langcode) {
     $result = new FilterProcessResult($text);
-    $result->addAttachments(array(
-      'library' => array(
+    $result->addAttachments([
+      'library' => [
         'filter/caption',
-      ),
-    ));
+      ],
+    ]);
     return $result;
   }
 
diff --git a/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheTags.php b/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheTags.php
index fe1986c94..4b305053f 100644
--- a/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheTags.php
+++ b/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheTags.php
@@ -22,8 +22,8 @@ class FilterTestCacheTags extends FilterBase {
    */
   public function process($text, $langcode) {
     $result = new FilterProcessResult($text);
-    $result->addCacheTags(array('foo:bar'));
-    $result->addCacheTags(array('foo:baz'));
+    $result->addCacheTags(['foo:bar']);
+    $result->addCacheTags(['foo:baz']);
     return $result;
   }
 
diff --git a/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php b/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php
index 6b5e7241a..c6d03000f 100644
--- a/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php
+++ b/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php
@@ -38,7 +38,7 @@ class FilterTestPlaceholders extends FilterBase {
    */
   public static function renderDynamicThing($thing) {
     return [
-      '#markup' => format_string('This is a dynamic @thing.', array('@thing' => $thing)),
+      '#markup' => format_string('This is a dynamic @thing.', ['@thing' => $thing]),
     ];
   }
 
diff --git a/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestReplace.php b/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestReplace.php
index 0e6d85da5..c697e2508 100644
--- a/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestReplace.php
+++ b/web/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestReplace.php
@@ -21,7 +21,7 @@ class FilterTestReplace extends FilterBase {
    * {@inheritdoc}
    */
   public function process($text, $langcode) {
-    $text = array();
+    $text = [];
     $text[] = 'Filter: ' . $this->getLabel() . ' (' . $this->getPluginId() . ')';
     $text[] = 'Language: ' . $langcode;
     return new FilterProcessResult(implode("<br />\n", $text));
diff --git a/web/core/modules/filter/src/Tests/FilterCaptionTwigDebugTest.php b/web/core/modules/filter/tests/src/Functional/FilterCaptionTwigDebugTest.php
similarity index 93%
rename from web/core/modules/filter/src/Tests/FilterCaptionTwigDebugTest.php
rename to web/core/modules/filter/tests/src/Functional/FilterCaptionTwigDebugTest.php
index cd5e8e27e..f5423e7dd 100644
--- a/web/core/modules/filter/src/Tests/FilterCaptionTwigDebugTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterCaptionTwigDebugTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\Core\Render\RenderContext;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\FilterPluginCollection;
 
 /**
@@ -11,7 +11,7 @@ use Drupal\filter\FilterPluginCollection;
  *
  * @group filter
  */
-class FilterCaptionTwigDebugTest extends WebTestBase {
+class FilterCaptionTwigDebugTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -76,7 +76,7 @@ class FilterCaptionTwigDebugTest extends WebTestBase {
   /**
    * Test the caption filter with Twig debugging on.
    */
-  function testCaptionFilter() {
+  public function testCaptionFilter() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
     $filter = $this->filters['filter_caption'];
diff --git a/web/core/modules/filter/src/Tests/FilterDefaultFormatTest.php b/web/core/modules/filter/tests/src/Functional/FilterDefaultFormatTest.php
similarity index 82%
rename from web/core/modules/filter/src/Tests/FilterDefaultFormatTest.php
rename to web/core/modules/filter/tests/src/Functional/FilterDefaultFormatTest.php
index 39a629535..45c371171 100644
--- a/web/core/modules/filter/src/Tests/FilterDefaultFormatTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterDefaultFormatTest.php
@@ -1,51 +1,51 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the default text formats for different users.
  *
  * @group filter
  */
-class FilterDefaultFormatTest extends WebTestBase {
+class FilterDefaultFormatTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('filter');
+  public static $modules = ['filter'];
 
   /**
    * Tests if the default text format is accessible to users.
    */
-  function testDefaultTextFormats() {
+  public function testDefaultTextFormats() {
     // Create two text formats, and two users. The first user has access to
     // both formats, but the second user only has access to the second one.
-    $admin_user = $this->drupalCreateUser(array('administer filters'));
+    $admin_user = $this->drupalCreateUser(['administer filters']);
     $this->drupalLogin($admin_user);
-    $formats = array();
+    $formats = [];
     for ($i = 0; $i < 2; $i++) {
-      $edit = array(
+      $edit = [
         'format' => Unicode::strtolower($this->randomMachineName()),
         'name' => $this->randomMachineName(),
-      );
+      ];
       $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
       $this->resetFilterCaches();
       $formats[] = FilterFormat::load($edit['format']);
     }
     list($first_format, $second_format) = $formats;
     $second_format_permission = $second_format->getPermissionName();
-    $first_user = $this->drupalCreateUser(array($first_format->getPermissionName(), $second_format_permission));
-    $second_user = $this->drupalCreateUser(array($second_format_permission));
+    $first_user = $this->drupalCreateUser([$first_format->getPermissionName(), $second_format_permission]);
+    $second_user = $this->drupalCreateUser([$second_format_permission]);
 
     // Adjust the weights so that the first and second formats (in that order)
     // are the two lowest weighted formats available to any user.
-    $edit = array();
+    $edit = [];
     $edit['formats[' . $first_format->id() . '][weight]'] = -2;
     $edit['formats[' . $second_format->id() . '][weight]'] = -1;
     $this->drupalPostForm('admin/config/content/formats', $edit, t('Save'));
@@ -62,7 +62,7 @@ class FilterDefaultFormatTest extends WebTestBase {
 
     // Reorder the two formats, and check that both users now have the same
     // default.
-    $edit = array();
+    $edit = [];
     $edit['formats[' . $second_format->id() . '][weight]'] = -3;
     $this->drupalPostForm('admin/config/content/formats', $edit, t('Save'));
     $this->resetFilterCaches();
diff --git a/web/core/modules/filter/src/Tests/FilterHooksTest.php b/web/core/modules/filter/tests/src/Functional/FilterHooksTest.php
similarity index 68%
rename from web/core/modules/filter/src/Tests/FilterHooksTest.php
rename to web/core/modules/filter/tests/src/Functional/FilterHooksTest.php
index 5353ccb87..c79946098 100644
--- a/web/core/modules/filter/src/Tests/FilterHooksTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterHooksTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -11,14 +11,14 @@ use Drupal\user\RoleInterface;
  *
  * @group filter
  */
-class FilterHooksTest extends WebTestBase {
+class FilterHooksTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'filter_test');
+  public static $modules = ['node', 'filter_test'];
 
   /**
    * Tests hooks on format management.
@@ -26,46 +26,46 @@ class FilterHooksTest extends WebTestBase {
    * Tests that hooks run correctly on creating, editing, and deleting a text
    * format.
    */
-  function testFilterHooks() {
+  public function testFilterHooks() {
     // Create content type, with underscores.
     $type_name = 'test_' . strtolower($this->randomMachineName());
-    $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name));
+    $type = $this->drupalCreateContentType(['name' => $type_name, 'type' => $type_name]);
     $node_permission = "create $type_name content";
 
-    $admin_user = $this->drupalCreateUser(array('administer filters', 'administer nodes', $node_permission));
+    $admin_user = $this->drupalCreateUser(['administer filters', 'administer nodes', $node_permission]);
     $this->drupalLogin($admin_user);
 
     // Add a text format.
     $name = $this->randomMachineName();
-    $edit = array();
+    $edit = [];
     $edit['format'] = Unicode::strtolower($this->randomMachineName());
     $edit['name'] = $name;
     $edit['roles[' . RoleInterface::ANONYMOUS_ID . ']'] = 1;
     $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
-    $this->assertRaw(t('Added text format %format.', array('%format' => $name)));
+    $this->assertRaw(t('Added text format %format.', ['%format' => $name]));
     $this->assertText('hook_filter_format_insert invoked.');
 
     $format_id = $edit['format'];
 
     // Update text format.
-    $edit = array();
+    $edit = [];
     $edit['roles[' . RoleInterface::AUTHENTICATED_ID . ']'] = 1;
     $this->drupalPostForm('admin/config/content/formats/manage/' . $format_id, $edit, t('Save configuration'));
-    $this->assertRaw(t('The text format %format has been updated.', array('%format' => $name)));
+    $this->assertRaw(t('The text format %format has been updated.', ['%format' => $name]));
     $this->assertText('hook_filter_format_update invoked.');
 
     // Use the format created.
     $title = $this->randomMachineName(8);
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $title;
     $edit['body[0][value]'] = $this->randomMachineName(32);
     $edit['body[0][format]'] = $format_id;
     $this->drupalPostForm("node/add/{$type->id()}", $edit, t('Save and publish'));
-    $this->assertText(t('@type @title has been created.', array('@type' => $type_name, '@title' => $title)));
+    $this->assertText(t('@type @title has been created.', ['@type' => $type_name, '@title' => $title]));
 
     // Disable the text format.
-    $this->drupalPostForm('admin/config/content/formats/manage/' . $format_id . '/disable', array(), t('Disable'));
-    $this->assertRaw(t('Disabled text format %format.', array('%format' => $name)));
+    $this->drupalPostForm('admin/config/content/formats/manage/' . $format_id . '/disable', [], t('Disable'));
+    $this->assertRaw(t('Disabled text format %format.', ['%format' => $name]));
     $this->assertText('hook_filter_format_disable invoked.');
   }
 
diff --git a/web/core/modules/filter/src/Tests/FilterNoFormatTest.php b/web/core/modules/filter/tests/src/Functional/FilterNoFormatTest.php
similarity index 80%
rename from web/core/modules/filter/src/Tests/FilterNoFormatTest.php
rename to web/core/modules/filter/tests/src/Functional/FilterNoFormatTest.php
index 3dcc9f607..19c57ac00 100644
--- a/web/core/modules/filter/src/Tests/FilterNoFormatTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterNoFormatTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the behavior of check_markup() when it is called without text format.
  *
  * @group filter
  */
-class FilterNoFormatTest extends WebTestBase {
+class FilterNoFormatTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('filter');
+  public static $modules = ['filter'];
 
   /**
    * Tests text without format.
@@ -24,7 +24,7 @@ class FilterNoFormatTest extends WebTestBase {
    * Tests if text with no format is filtered the same way as text in the
    * fallback format.
    */
-  function testCheckMarkupNoFormat() {
+  public function testCheckMarkupNoFormat() {
     // Create some text. Include some HTML and line breaks, so we get a good
     // test of the filtering that is applied to it.
     $text = "<strong>" . $this->randomMachineName(32) . "</strong>\n\n<div>" . $this->randomMachineName(32) . "</div>";
diff --git a/web/core/modules/filter/src/Tests/FilterSecurityTest.php b/web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
similarity index 72%
rename from web/core/modules/filter/src/Tests/FilterSecurityTest.php
rename to web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
index 12cd97aa8..4a5b7c49d 100644
--- a/web/core/modules/filter/src/Tests/FilterSecurityTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\filter\Tests;
+namespace Drupal\Tests\filter\Functional;
 
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\filter\Plugin\FilterInterface;
 use Drupal\user\RoleInterface;
 
@@ -14,14 +14,14 @@ use Drupal\user\RoleInterface;
  *
  * @group filter
  */
-class FilterSecurityTest extends WebTestBase {
+class FilterSecurityTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'filter_test');
+  public static $modules = ['node', 'filter_test'];
 
   /**
    * A user with administrative permissions.
@@ -34,14 +34,14 @@ class FilterSecurityTest extends WebTestBase {
     parent::setUp();
 
     // Create Basic page node type.
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
     /** @var \Drupal\filter\Entity\FilterFormat $filtered_html_format */
     $filtered_html_format = FilterFormat::load('filtered_html');
     $filtered_html_permission = $filtered_html_format->getPermissionName();
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array($filtered_html_permission));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [$filtered_html_permission]);
 
-    $this->adminUser = $this->drupalCreateUser(array('administer modules', 'administer filters', 'administer site configuration'));
+    $this->adminUser = $this->drupalCreateUser(['administer modules', 'administer filters', 'administer site configuration']);
     $this->drupalLogin($this->adminUser);
   }
 
@@ -51,18 +51,18 @@ class FilterSecurityTest extends WebTestBase {
    * Tests that filtered content is emptied when an actively used filter module
    * is disabled.
    */
-  function testDisableFilterModule() {
+  public function testDisableFilterModule() {
     // Create a new node.
-    $node = $this->drupalCreateNode(array('promote' => 1));
+    $node = $this->drupalCreateNode(['promote' => 1]);
     $body_raw = $node->body->value;
     $format_id = $node->body->format;
     $this->drupalGet('node/' . $node->id());
     $this->assertText($body_raw, 'Node body found.');
 
     // Enable the filter_test_replace filter.
-    $edit = array(
+    $edit = [
       'filters[filter_test_replace][status]' => 1,
-    );
+    ];
     $this->drupalPostForm('admin/config/content/formats/manage/' . $format_id, $edit, t('Save configuration'));
 
     // Verify that filter_test_replace filter replaced the content.
@@ -71,7 +71,7 @@ class FilterSecurityTest extends WebTestBase {
     $this->assertText('Filter: Testing filter', 'Testing filter output found.');
 
     // Disable the text format entirely.
-    $this->drupalPostForm('admin/config/content/formats/manage/' . $format_id . '/disable', array(), t('Disable'));
+    $this->drupalPostForm('admin/config/content/formats/manage/' . $format_id . '/disable', [], t('Disable'));
 
     // Verify that the content is empty, because the text format does not exist.
     $this->drupalGet('node/' . $node->id());
@@ -81,11 +81,11 @@ class FilterSecurityTest extends WebTestBase {
   /**
    * Tests that security filters are enforced even when marked to be skipped.
    */
-  function testSkipSecurityFilters() {
+  public function testSkipSecurityFilters() {
     $text = "Text with some disallowed tags: <script />, <p><object>unicorn</object></p>, <i><table></i>.";
     $expected_filtered_text = "Text with some disallowed tags: , <p>unicorn</p>, .";
-    $this->assertEqual(check_markup($text, 'filtered_html', '', array()), $expected_filtered_text, 'Expected filter result.');
-    $this->assertEqual(check_markup($text, 'filtered_html', '', array(FilterInterface::TYPE_HTML_RESTRICTOR)), $expected_filtered_text, 'Expected filter result, even when trying to disable filters of the FilterInterface::TYPE_HTML_RESTRICTOR type.');
+    $this->assertEqual(check_markup($text, 'filtered_html', '', []), $expected_filtered_text, 'Expected filter result.');
+    $this->assertEqual(check_markup($text, 'filtered_html', '', [FilterInterface::TYPE_HTML_RESTRICTOR]), $expected_filtered_text, 'Expected filter result, even when trying to disable filters of the FilterInterface::TYPE_HTML_RESTRICTOR type.');
   }
 
 }
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php b/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php
index 50189a6ab..2203bbec1 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php
@@ -19,37 +19,37 @@ use Symfony\Component\Validator\ConstraintViolationListInterface;
  */
 class FilterAPITest extends EntityKernelTestBase {
 
-  public static $modules = array('system', 'filter', 'filter_test', 'user');
+  public static $modules = ['system', 'filter', 'filter_test', 'user'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->installConfig(array('system', 'filter', 'filter_test'));
+    $this->installConfig(['system', 'filter', 'filter_test']);
   }
 
   /**
    * Tests that the filter order is respected.
    */
-  function testCheckMarkupFilterOrder() {
+  public function testCheckMarkupFilterOrder() {
     // Create crazy HTML format.
-    $crazy_format = FilterFormat::create(array(
+    $crazy_format = FilterFormat::create([
       'format' => 'crazy',
       'name' => 'Crazy',
       'weight' => 1,
-      'filters' => array(
-        'filter_html_escape' => array(
+      'filters' => [
+        'filter_html_escape' => [
           'weight' => 10,
           'status' => 1,
-        ),
-        'filter_html' => array(
+        ],
+        'filter_html' => [
           'weight' => -10,
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<p>',
-          ),
-        ),
-      )
-    ));
+          ],
+        ],
+      ]
+    ]);
     $crazy_format->save();
 
     $text = "<p>Llamas are <not> awesome!</p>";
@@ -61,19 +61,19 @@ class FilterAPITest extends EntityKernelTestBase {
   /**
    * Tests the ability to apply only a subset of filters.
    */
-  function testCheckMarkupFilterSubset() {
+  public function testCheckMarkupFilterSubset() {
     $text = "Text with <marquee>evil content and</marquee> a URL: https://www.drupal.org!";
     $expected_filtered_text = "Text with evil content and a URL: <a href=\"https://www.drupal.org\">https://www.drupal.org</a>!";
     $expected_filter_text_without_html_generators = "Text with evil content and a URL: https://www.drupal.org!";
 
-    $actual_filtered_text = check_markup($text, 'filtered_html', '', array());
+    $actual_filtered_text = check_markup($text, 'filtered_html', '', []);
     $this->verbose("Actual:<pre>$actual_filtered_text</pre>Expected:<pre>$expected_filtered_text</pre>");
     $this->assertEqual(
       $actual_filtered_text,
       $expected_filtered_text,
       'Expected filter result.'
     );
-    $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', array(FilterInterface::TYPE_MARKUP_LANGUAGE));
+    $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', [FilterInterface::TYPE_MARKUP_LANGUAGE]);
     $this->verbose("Actual:<pre>$actual_filtered_text_without_html_generators</pre>Expected:<pre>$expected_filter_text_without_html_generators</pre>");
     $this->assertEqual(
       $actual_filtered_text_without_html_generators,
@@ -84,7 +84,7 @@ class FilterAPITest extends EntityKernelTestBase {
     // this check focuses on the ability to filter multiple filter types at once.
     // Drupal core only ships with these two types of filters, so this is the
     // most extensive test possible.
-    $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', array(FilterInterface::TYPE_HTML_RESTRICTOR, FilterInterface::TYPE_MARKUP_LANGUAGE));
+    $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', [FilterInterface::TYPE_HTML_RESTRICTOR, FilterInterface::TYPE_MARKUP_LANGUAGE]);
     $this->verbose("Actual:<pre>$actual_filtered_text_without_html_generators</pre>Expected:<pre>$expected_filter_text_without_html_generators</pre>");
     $this->assertEqual(
       $actual_filtered_text_without_html_generators,
@@ -98,25 +98,25 @@ class FilterAPITest extends EntityKernelTestBase {
    *   - \Drupal\filter\Entity\FilterFormatInterface::getHtmlRestrictions()
    *   - \Drupal\filter\Entity\FilterFormatInterface::getFilterTypes()
    */
-  function testFilterFormatAPI() {
+  public function testFilterFormatAPI() {
     // Test on filtered_html.
     $filtered_html_format = FilterFormat::load('filtered_html');
     $this->assertIdentical(
       $filtered_html_format->getHtmlRestrictions(),
-      array(
-        'allowed' => array(
+      [
+        'allowed' => [
           'p' => FALSE,
           'br' => FALSE,
           'strong' => FALSE,
-          'a' => array('href' => TRUE, 'hreflang' => TRUE),
-          '*' => array('style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => array('ltr' => TRUE, 'rtl' => TRUE)),
-        ),
-      ),
+          'a' => ['href' => TRUE, 'hreflang' => TRUE],
+          '*' => ['style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => ['ltr' => TRUE, 'rtl' => TRUE]],
+        ],
+      ],
       'FilterFormatInterface::getHtmlRestrictions() works as expected for the filtered_html format.'
     );
     $this->assertIdentical(
       $filtered_html_format->getFilterTypes(),
-      array(FilterInterface::TYPE_HTML_RESTRICTOR, FilterInterface::TYPE_MARKUP_LANGUAGE),
+      [FilterInterface::TYPE_HTML_RESTRICTOR, FilterInterface::TYPE_MARKUP_LANGUAGE],
       'FilterFormatInterface::getFilterTypes() works as expected for the filtered_html format.'
     );
 
@@ -129,113 +129,113 @@ class FilterAPITest extends EntityKernelTestBase {
     );
     $this->assertIdentical(
       $full_html_format->getFilterTypes(),
-      array(),
+      [],
       'FilterFormatInterface::getFilterTypes() works as expected for the full_html format.'
     );
 
     // Test on stupid_filtered_html, where nothing is allowed.
-    $stupid_filtered_html_format = FilterFormat::create(array(
+    $stupid_filtered_html_format = FilterFormat::create([
       'format' => 'stupid_filtered_html',
       'name' => 'Stupid Filtered HTML',
-      'filters' => array(
-        'filter_html' => array(
+      'filters' => [
+        'filter_html' => [
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '', // Nothing is allowed.
-          ),
-        ),
-      ),
-    ));
+          ],
+        ],
+      ],
+    ]);
     $stupid_filtered_html_format->save();
     $this->assertIdentical(
       $stupid_filtered_html_format->getHtmlRestrictions(),
-      array('allowed' => array()), // No tag is allowed.
+      ['allowed' => []], // No tag is allowed.
       'FilterFormatInterface::getHtmlRestrictions() works as expected for the stupid_filtered_html format.'
     );
     $this->assertIdentical(
       $stupid_filtered_html_format->getFilterTypes(),
-      array(FilterInterface::TYPE_HTML_RESTRICTOR),
+      [FilterInterface::TYPE_HTML_RESTRICTOR],
       'FilterFormatInterface::getFilterTypes() works as expected for the stupid_filtered_html format.'
     );
 
     // Test on very_restricted_html, where there's two different filters of the
     // FilterInterface::TYPE_HTML_RESTRICTOR type, each restricting in different ways.
-    $very_restricted_html_format = FilterFormat::create(array(
+    $very_restricted_html_format = FilterFormat::create([
       'format' => 'very_restricted_html',
       'name' => 'Very Restricted HTML',
-      'filters' => array(
-        'filter_html' => array(
+      'filters' => [
+        'filter_html' => [
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<p> <br> <a href> <strong>',
-          ),
-        ),
-        'filter_test_restrict_tags_and_attributes' => array(
+          ],
+        ],
+        'filter_test_restrict_tags_and_attributes' => [
           'status' => 1,
-          'settings' => array(
-            'restrictions' => array(
-              'allowed' => array(
+          'settings' => [
+            'restrictions' => [
+              'allowed' => [
                 'p' => TRUE,
                 'br' => FALSE,
-                'a' => array('href' => TRUE),
+                'a' => ['href' => TRUE],
                 'em' => TRUE,
-              ),
-            )
-          ),
-        ),
-      )
-    ));
+              ],
+            ]
+          ],
+        ],
+      ]
+    ]);
     $very_restricted_html_format->save();
     $this->assertIdentical(
       $very_restricted_html_format->getHtmlRestrictions(),
-      array(
-        'allowed' => array(
+      [
+        'allowed' => [
           'p' => FALSE,
           'br' => FALSE,
-          'a' => array('href' => TRUE),
-          '*' => array('style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => array('ltr' => TRUE, 'rtl' => TRUE)),
-        ),
-      ),
+          'a' => ['href' => TRUE],
+          '*' => ['style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => ['ltr' => TRUE, 'rtl' => TRUE]],
+        ],
+      ],
       'FilterFormatInterface::getHtmlRestrictions() works as expected for the very_restricted_html format.'
     );
     $this->assertIdentical(
       $very_restricted_html_format->getFilterTypes(),
-      array(FilterInterface::TYPE_HTML_RESTRICTOR),
+      [FilterInterface::TYPE_HTML_RESTRICTOR],
       'FilterFormatInterface::getFilterTypes() works as expected for the very_restricted_html format.'
     );
 
     // Test on nonsensical_restricted_html, where the allowed attribute values
     // contain asterisks, which do not have any meaning, but which we also
     // cannot prevent because configuration can be modified outside of forms.
-    $nonsensical_restricted_html = FilterFormat::create(array(
+    $nonsensical_restricted_html = FilterFormat::create([
       'format' => 'nonsensical_restricted_html',
       'name' => 'Nonsensical Restricted HTML',
-      'filters' => array(
-        'filter_html' => array(
+      'filters' => [
+        'filter_html' => [
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<a> <b class> <c class="*"> <d class="foo bar-* *">',
-          ),
-        ),
-      )
-    ));
+          ],
+        ],
+      ]
+    ]);
     $nonsensical_restricted_html->save();
     $this->assertIdentical(
       $nonsensical_restricted_html->getHtmlRestrictions(),
-      array(
-        'allowed' => array(
+      [
+        'allowed' => [
           'a' => FALSE,
-          'b' => array('class' => TRUE),
-          'c' => array('class' => TRUE),
-          'd' => array('class' => array('foo' => TRUE, 'bar-*' => TRUE)),
-          '*' => array('style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => array('ltr' => TRUE, 'rtl' => TRUE)),
-        ),
-      ),
+          'b' => ['class' => TRUE],
+          'c' => ['class' => TRUE],
+          'd' => ['class' => ['foo' => TRUE, 'bar-*' => TRUE]],
+          '*' => ['style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => ['ltr' => TRUE, 'rtl' => TRUE]],
+        ],
+      ],
       'FilterFormatInterface::getHtmlRestrictions() works as expected for the nonsensical_restricted_html format.'
     );
     $this->assertIdentical(
       $very_restricted_html_format->getFilterTypes(),
-      array(FilterInterface::TYPE_HTML_RESTRICTOR),
+      [FilterInterface::TYPE_HTML_RESTRICTOR],
       'FilterFormatInterface::getFilterTypes() works as expected for the very_restricted_html format.'
     );
   }
@@ -249,58 +249,58 @@ class FilterAPITest extends EntityKernelTestBase {
    * #lazy_builder callbacks.
    * This test focuses solely on those advanced features.
    */
-  function testProcessedTextElement() {
-    FilterFormat::create(array(
+  public function testProcessedTextElement() {
+    FilterFormat::create([
       'format' => 'element_test',
       'name' => 'processed_text element test format',
-      'filters' => array(
-        'filter_test_assets' => array(
+      'filters' => [
+        'filter_test_assets' => [
           'weight' => -1,
           'status' => TRUE,
-        ),
-        'filter_test_cache_tags' => array(
+        ],
+        'filter_test_cache_tags' => [
           'weight' => 0,
           'status' => TRUE,
-        ),
-        'filter_test_cache_contexts' => array(
+        ],
+        'filter_test_cache_contexts' => [
           'weight' => 0,
           'status' => TRUE,
-        ),
-        'filter_test_cache_merge' => array(
+        ],
+        'filter_test_cache_merge' => [
           'weight' => 0,
           'status' => TRUE,
-        ),
-        'filter_test_placeholders' => array(
+        ],
+        'filter_test_placeholders' => [
           'weight' => 1,
           'status' => TRUE,
-        ),
+        ],
         // Run the HTML corrector filter last, because it has the potential to
         // break the placeholders added by the filter_test_placeholders filter.
-        'filter_htmlcorrector' => array(
+        'filter_htmlcorrector' => [
           'weight' => 10,
           'status' => TRUE,
-        ),
-      ),
-    ))->save();
+        ],
+      ],
+    ])->save();
 
-    $build = array(
+    $build = [
       '#type' => 'processed_text',
       '#text' => '<p>Hello, world!</p>',
       '#format' => 'element_test',
-    );
+    ];
     drupal_render_root($build);
 
     // Verify the attachments and cacheability metadata.
-    $expected_attachments = array(
+    $expected_attachments = [
       // The assets attached by the filter_test_assets filter.
-      'library' => array(
+      'library' => [
         'filter/caption',
-      ),
+      ],
       // The placeholders attached that still need to be processed.
       'placeholders' => [],
-    );
+    ];
     $this->assertEqual($expected_attachments, $build['#attached'], 'Expected attachments present');
-    $expected_cache_tags = array(
+    $expected_cache_tags = [
       // The cache tag set by the processed_text element itself.
       'config:filter.format.element_test',
       // The cache tags set by the filter_test_cache_tags filter.
@@ -308,7 +308,7 @@ class FilterAPITest extends EntityKernelTestBase {
       'foo:baz',
       // The cache tags set by the filter_test_cache_merge filter.
       'merge:tag',
-    );
+    ];
     $this->assertEqual($expected_cache_tags, $build['#cache']['tags'], 'Expected cache tags present.');
     $expected_cache_contexts = [
       // The cache context set by the filter_test_cache_contexts filter.
@@ -327,26 +327,26 @@ class FilterAPITest extends EntityKernelTestBase {
   /**
    * Tests the function of the typed data type.
    */
-  function testTypedDataAPI() {
+  public function testTypedDataAPI() {
     $definition = DataDefinition::create('filter_format');
     $data = \Drupal::typedDataManager()->create($definition);
 
     $this->assertTrue($data instanceof OptionsProviderInterface, 'Typed data object implements \Drupal\Core\TypedData\OptionsProviderInterface');
 
-    $filtered_html_user = $this->createUser(array('uid' => 2), array(
+    $filtered_html_user = $this->createUser(['uid' => 2], [
       FilterFormat::load('filtered_html')->getPermissionName(),
-    ));
+    ]);
 
     // Test with anonymous user.
     $user = new AnonymousUserSession();
     \Drupal::currentUser()->setAccount($user);
 
-    $expected_available_options = array(
+    $expected_available_options = [
       'filtered_html' => 'Filtered HTML',
       'full_html' => 'Full HTML',
       'filter_test' => 'Test format',
       'plain_text' => 'Plain text',
-    );
+    ];
 
     $available_values = $data->getPossibleValues();
     $this->assertEqual($available_values, array_keys($expected_available_options));
@@ -354,9 +354,9 @@ class FilterAPITest extends EntityKernelTestBase {
     $this->assertEqual($available_options, $expected_available_options);
 
     $allowed_values = $data->getSettableValues($user);
-    $this->assertEqual($allowed_values, array('plain_text'));
+    $this->assertEqual($allowed_values, ['plain_text']);
     $allowed_options = $data->getSettableOptions($user);
-    $this->assertEqual($allowed_options, array('plain_text' => 'Plain text'));
+    $this->assertEqual($allowed_options, ['plain_text' => 'Plain text']);
 
     $data->setValue('foo');
     $violations = $data->validate();
@@ -383,12 +383,12 @@ class FilterAPITest extends EntityKernelTestBase {
     $this->assertEqual(count($violations), 0, "No validation violation for accessible format 'filtered_html' found.");
 
     $allowed_values = $data->getSettableValues($filtered_html_user);
-    $this->assertEqual($allowed_values, array('filtered_html', 'plain_text'));
+    $this->assertEqual($allowed_values, ['filtered_html', 'plain_text']);
     $allowed_options = $data->getSettableOptions($filtered_html_user);
-    $expected_allowed_options = array(
+    $expected_allowed_options = [
       'filtered_html' => 'Filtered HTML',
       'plain_text' => 'Plain text',
-    );
+    ];
     $this->assertEqual($allowed_options, $expected_allowed_options);
   }
 
@@ -397,43 +397,43 @@ class FilterAPITest extends EntityKernelTestBase {
    */
   public function testFilterFormatPreSave() {
     /** @var \Drupal\filter\FilterFormatInterface $crazy_format */
-    $crazy_format = FilterFormat::create(array(
+    $crazy_format = FilterFormat::create([
       'format' => 'crazy',
       'name' => 'Crazy',
       'weight' => 1,
-      'filters' => array(
-        'filter_html_escape' => array(
+      'filters' => [
+        'filter_html_escape' => [
           'weight' => 10,
           'status' => 1,
-        ),
-        'filter_html' => array(
+        ],
+        'filter_html' => [
           'weight' => -10,
           'status' => 1,
-          'settings' => array(
+          'settings' => [
             'allowed_html' => '<p>',
-          ),
-        ),
-      )
-    ));
+          ],
+        ],
+      ]
+    ]);
     $crazy_format->save();
     // Use config to directly load the configuration and check that only enabled
     // or customized plugins are saved to configuration.
     $filters = $this->config('filter.format.crazy')->get('filters');
-    $this->assertEqual(array('filter_html_escape', 'filter_html'), array_keys($filters));
+    $this->assertEqual(['filter_html_escape', 'filter_html'], array_keys($filters));
 
     // Disable a plugin to ensure that disabled plugins with custom settings are
     // stored in configuration.
-    $crazy_format->setFilterConfig('filter_html_escape', array('status' => FALSE));
+    $crazy_format->setFilterConfig('filter_html_escape', ['status' => FALSE]);
     $crazy_format->save();
     $filters = $this->config('filter.format.crazy')->get('filters');
-    $this->assertEqual(array('filter_html_escape', 'filter_html'), array_keys($filters));
+    $this->assertEqual(['filter_html_escape', 'filter_html'], array_keys($filters));
 
     // Set the settings as per default to ensure that disable plugins in this
     // state are not stored in configuration.
-    $crazy_format->setFilterConfig('filter_html_escape', array('weight' => -10));
+    $crazy_format->setFilterConfig('filter_html_escape', ['weight' => -10]);
     $crazy_format->save();
     $filters = $this->config('filter.format.crazy')->get('filters');
-    $this->assertEqual(array('filter_html'), array_keys($filters));
+    $this->assertEqual(['filter_html'], array_keys($filters));
   }
 
   /**
@@ -452,7 +452,7 @@ class FilterAPITest extends EntityKernelTestBase {
         break;
       }
     }
-    $this->assertTrue($filter_format_violation_found, format_string('Validation violation for invalid value "%invalid_value" found', array('%invalid_value' => $invalid_value)));
+    $this->assertTrue($filter_format_violation_found, format_string('Validation violation for invalid value "%invalid_value" found', ['%invalid_value' => $invalid_value]));
   }
 
   /**
@@ -467,7 +467,7 @@ class FilterAPITest extends EntityKernelTestBase {
    * @see filter_system_info_alter()
    */
   public function testDependencyRemoval() {
-    $this->installSchema('user', array('users_data'));
+    $this->installSchema('user', ['users_data']);
     $filter_format = FilterFormat::load('filtered_html');
 
     // Disable the filter_test_restrict_tags_and_attributes filter plugin but
@@ -493,7 +493,7 @@ class FilterAPITest extends EntityKernelTestBase {
     $this->assertEqual(['module' => ['filter_test']], $filter_format->getDependencies());
 
     // Uninstall the module.
-    \Drupal::service('module_installer')->uninstall(array('filter_test'));
+    \Drupal::service('module_installer')->uninstall(['filter_test']);
 
     // Verify the filter format still exists but the dependency and filter is
     // gone.
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterCrudTest.php b/web/core/modules/filter/tests/src/Kernel/FilterCrudTest.php
index 0a9be1832..b73b180bf 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterCrudTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterCrudTest.php
@@ -22,44 +22,44 @@ class FilterCrudTest extends KernelTestBase {
   /**
    * Tests CRUD operations for text formats and filters.
    */
-  function testTextFormatCrud() {
+  public function testTextFormatCrud() {
     // Add a text format with minimum data only.
-    $format = FilterFormat::create(array(
+    $format = FilterFormat::create([
       'format' => 'empty_format',
       'name' => 'Empty format',
-    ));
+    ]);
     $format->save();
     $this->verifyTextFormat($format);
 
     // Add another text format specifying all possible properties.
-    $format = FilterFormat::create(array(
+    $format = FilterFormat::create([
       'format' => 'custom_format',
       'name' => 'Custom format',
-    ));
-    $format->setFilterConfig('filter_url', array(
+    ]);
+    $format->setFilterConfig('filter_url', [
       'status' => 1,
-      'settings' => array(
+      'settings' => [
         'filter_url_length' => 30,
-      ),
-    ));
+      ],
+    ]);
     $format->save();
     $this->verifyTextFormat($format);
 
     // Alter some text format properties and save again.
     $format->set('name', 'Altered format');
-    $format->setFilterConfig('filter_url', array(
+    $format->setFilterConfig('filter_url', [
       'status' => 0,
-    ));
-    $format->setFilterConfig('filter_autop', array(
+    ]);
+    $format->setFilterConfig('filter_autop', [
       'status' => 1,
-    ));
+    ]);
     $format->save();
     $this->verifyTextFormat($format);
 
     // Add a filter_test_replace  filter and save again.
-    $format->setFilterConfig('filter_test_replace', array(
+    $format->setFilterConfig('filter_test_replace', [
       'status' => 1,
-    ));
+    ]);
     $format->save();
     $this->verifyTextFormat($format);
 
@@ -88,8 +88,8 @@ class FilterCrudTest extends KernelTestBase {
   /**
    * Verifies that a text format is properly stored.
    */
-  function verifyTextFormat($format) {
-    $t_args = array('%format' => $format->label());
+  public function verifyTextFormat($format) {
+    $t_args = ['%format' => $format->label()];
     $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
 
     // Verify the loaded filter has all properties.
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php b/web/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
index b4ce50cec..e16bddade 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
@@ -13,7 +13,7 @@ use Drupal\user\RoleInterface;
  */
 class FilterDefaultConfigTest extends KernelTestBase {
 
-  public static $modules = array('system', 'user', 'filter', 'filter_test');
+  public static $modules = ['system', 'user', 'filter', 'filter_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -24,13 +24,13 @@ class FilterDefaultConfigTest extends KernelTestBase {
     $this->installEntitySchema('user');
 
     // Install filter_test module, which ships with custom default format.
-    $this->installConfig(array('user', 'filter_test'));
+    $this->installConfig(['user', 'filter_test']);
   }
 
   /**
    * Tests installation of default formats.
    */
-  function testInstallation() {
+  public function testInstallation() {
     // Verify that the format was installed correctly.
     $format = FilterFormat::load('filter_test');
     $this->assertTrue((bool) $format);
@@ -44,52 +44,52 @@ class FilterDefaultConfigTest extends KernelTestBase {
     // Verify that the loaded format does not contain any roles.
     $this->assertEqual($format->get('roles'), NULL);
     // Verify that the defined roles in the default config have been processed.
-    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), array(
+    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), [
       RoleInterface::ANONYMOUS_ID,
       RoleInterface::AUTHENTICATED_ID,
-    ));
+    ]);
 
     // Verify enabled filters.
     $filters = $format->get('filters');
     $this->assertEqual($filters['filter_html_escape']['status'], 1);
     $this->assertEqual($filters['filter_html_escape']['weight'], -10);
     $this->assertEqual($filters['filter_html_escape']['provider'], 'filter');
-    $this->assertEqual($filters['filter_html_escape']['settings'], array());
+    $this->assertEqual($filters['filter_html_escape']['settings'], []);
     $this->assertEqual($filters['filter_autop']['status'], 1);
     $this->assertEqual($filters['filter_autop']['weight'], 0);
     $this->assertEqual($filters['filter_autop']['provider'], 'filter');
-    $this->assertEqual($filters['filter_autop']['settings'], array());
+    $this->assertEqual($filters['filter_autop']['settings'], []);
     $this->assertEqual($filters['filter_url']['status'], 1);
     $this->assertEqual($filters['filter_url']['weight'], 0);
     $this->assertEqual($filters['filter_url']['provider'], 'filter');
-    $this->assertEqual($filters['filter_url']['settings'], array(
+    $this->assertEqual($filters['filter_url']['settings'], [
       'filter_url_length' => 72,
-    ));
+    ]);
   }
 
   /**
    * Tests that changes to FilterFormat::$roles do not have an effect.
    */
-  function testUpdateRoles() {
+  public function testUpdateRoles() {
     // Verify role permissions declared in default config.
     $format = FilterFormat::load('filter_test');
-    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), array(
+    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), [
       RoleInterface::ANONYMOUS_ID,
       RoleInterface::AUTHENTICATED_ID,
-    ));
+    ]);
 
     // Attempt to change roles.
-    $format->set('roles', array(
+    $format->set('roles', [
       RoleInterface::AUTHENTICATED_ID,
-    ));
+    ]);
     $format->save();
 
     // Verify that roles have not been updated.
     $format = FilterFormat::load('filter_test');
-    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), array(
+    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), [
       RoleInterface::ANONYMOUS_ID,
       RoleInterface::AUTHENTICATED_ID,
-    ));
+    ]);
   }
 
 }
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php b/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
index 06c1e4b53..cf72bbee4 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
@@ -22,7 +22,7 @@ class FilterKernelTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'filter');
+  public static $modules = ['system', 'filter'];
 
   /**
    * @var \Drupal\filter\Plugin\FilterInterface[]
@@ -31,17 +31,17 @@ class FilterKernelTest extends KernelTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('system'));
+    $this->installConfig(['system']);
 
     $manager = $this->container->get('plugin.manager.filter');
-    $bag = new FilterPluginCollection($manager, array());
+    $bag = new FilterPluginCollection($manager, []);
     $this->filters = $bag->getAll();
   }
 
   /**
    * Tests the align filter.
    */
-  function testAlignFilter() {
+  public function testAlignFilter() {
     $filter = $this->filters['filter_align'];
 
     $test = function($input) use ($filter) {
@@ -96,7 +96,7 @@ class FilterKernelTest extends KernelTestBase {
   /**
    * Tests the caption filter.
    */
-  function testCaptionFilter() {
+  public function testCaptionFilter() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
     $filter = $this->filters['filter_caption'];
@@ -107,11 +107,11 @@ class FilterKernelTest extends KernelTestBase {
       });
     };
 
-    $attached_library = array(
-      'library' => array(
+    $attached_library = [
+      'library' => [
         'filter/caption',
-      ),
-    );
+      ],
+    ];
 
     // No data-caption attribute.
     $input = '<img src="llama.jpg" />';
@@ -190,13 +190,13 @@ class FilterKernelTest extends KernelTestBase {
     // want to make sure that it works well in tandem with the "Limit allowed
     // HTML tags" filter, which it is typically used with.
     $html_filter = $this->filters['filter_html'];
-    $html_filter->setConfiguration(array(
-      'settings' => array(
+    $html_filter->setConfiguration([
+      'settings' => [
         'allowed_html' => '<img src data-align data-caption>',
         'filter_html_help' => 1,
         'filter_html_nofollow' => 0,
-      )
-    ));
+      ]
+    ]);
     $test_with_html_filter = function ($input) use ($filter, $html_filter, $renderer) {
       return $renderer->executeInRenderContext(new RenderContext(), function () use ($input, $filter, $html_filter) {
         // 1. Apply HTML filter's processing step.
@@ -260,7 +260,7 @@ class FilterKernelTest extends KernelTestBase {
   /**
    * Tests the combination of the align and caption filters.
    */
-  function testAlignAndCaptionFilters() {
+  public function testAlignAndCaptionFilters() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
     $align_filter = $this->filters['filter_align'];
@@ -272,11 +272,11 @@ class FilterKernelTest extends KernelTestBase {
       });
     };
 
-    $attached_library = array(
-      'library' => array(
+    $attached_library = [
+      'library' => [
         'filter/caption',
-      ),
-    );
+      ],
+    ];
 
     // Both data-caption and data-align attributes: all 3 allowed values for the
     // data-align attribute.
@@ -315,67 +315,67 @@ class FilterKernelTest extends KernelTestBase {
   /**
    * Tests the line break filter.
    */
-  function testLineBreakFilter() {
+  public function testLineBreakFilter() {
     // Get FilterAutoP object.
     $filter = $this->filters['filter_autop'];
 
     // Since the line break filter naturally needs plenty of newlines in test
     // strings and expectations, we're using "\n" instead of regular newlines
     // here.
-    $tests = array(
+    $tests = [
       // Single line breaks should be changed to <br /> tags, while paragraphs
       // separated with double line breaks should be enclosed with <p></p> tags.
-      "aaa\nbbb\n\nccc" => array(
+      "aaa\nbbb\n\nccc" => [
         "<p>aaa<br />\nbbb</p>\n<p>ccc</p>" => TRUE,
-      ),
+      ],
       // Skip contents of certain block tags entirely.
       "<script>aaa\nbbb\n\nccc</script>
 <style>aaa\nbbb\n\nccc</style>
 <pre>aaa\nbbb\n\nccc</pre>
 <object>aaa\nbbb\n\nccc</object>
 <iframe>aaa\nbbb\n\nccc</iframe>
-" => array(
+" => [
         "<script>aaa\nbbb\n\nccc</script>" => TRUE,
         "<style>aaa\nbbb\n\nccc</style>" => TRUE,
         "<pre>aaa\nbbb\n\nccc</pre>" => TRUE,
         "<object>aaa\nbbb\n\nccc</object>" => TRUE,
         "<iframe>aaa\nbbb\n\nccc</iframe>" => TRUE,
-      ),
+      ],
       // Skip comments entirely.
-      "One. <!-- comment --> Two.\n<!--\nThree.\n-->\n" => array(
+      "One. <!-- comment --> Two.\n<!--\nThree.\n-->\n" => [
         '<!-- comment -->' => TRUE,
         "<!--\nThree.\n-->" => TRUE,
-      ),
+      ],
       // Resulting HTML should produce matching paragraph tags.
-      '<p><div>  </div></p>' => array(
+      '<p><div>  </div></p>' => [
         "<p>\n<div>  </div>\n</p>" => TRUE,
-      ),
-      '<div><p>  </p></div>' => array(
+      ],
+      '<div><p>  </p></div>' => [
         "<div>\n</div>" => TRUE,
-      ),
-      '<blockquote><pre>aaa</pre></blockquote>' => array(
+      ],
+      '<blockquote><pre>aaa</pre></blockquote>' => [
         "<blockquote><pre>aaa</pre></blockquote>" => TRUE,
-      ),
-      "<pre>aaa\nbbb\nccc</pre>\nddd\neee" => array(
+      ],
+      "<pre>aaa\nbbb\nccc</pre>\nddd\neee" => [
         "<pre>aaa\nbbb\nccc</pre>" => TRUE,
         "<p>ddd<br />\neee</p>" => TRUE,
-      ),
+      ],
       // Comments remain unchanged and subsequent lines/paragraphs are
       // transformed normally.
-      "aaa<!--comment-->\n\nbbb\n\nccc\n\nddd<!--comment\nwith linebreak-->\n\neee\n\nfff" => array(
+      "aaa<!--comment-->\n\nbbb\n\nccc\n\nddd<!--comment\nwith linebreak-->\n\neee\n\nfff" => [
         "<p>aaa</p>\n<!--comment--><p>\nbbb</p>\n<p>ccc</p>\n<p>ddd</p>" => TRUE,
         "<!--comment\nwith linebreak--><p>\neee</p>\n<p>fff</p>" => TRUE,
-      ),
+      ],
       // Check that a comment in a PRE will result that the text after
       // the comment, but still in PRE, is not transformed.
-      "<pre>aaa\nbbb<!-- comment -->\n\nccc</pre>\nddd" => array(
+      "<pre>aaa\nbbb<!-- comment -->\n\nccc</pre>\nddd" => [
         "<pre>aaa\nbbb<!-- comment -->\n\nccc</pre>" => TRUE,
-      ),
+      ],
       // Bug 810824, paragraphs were appearing around iframe tags.
-      "<iframe>aaa</iframe>\n\n" => array(
+      "<iframe>aaa</iframe>\n\n" => [
         "<p><iframe>aaa</iframe></p>" => FALSE,
-      ),
-    );
+      ],
+    ];
     $this->assertFilteredString($filter, $tests);
 
     // Very long string hitting PCRE limits.
@@ -403,16 +403,16 @@ class FilterKernelTest extends KernelTestBase {
    * @todo Class, id, name and xmlns should be added to disallowed attributes,
    *   or better a whitelist approach should be used for that too.
    */
-  function testHtmlFilter() {
+  public function testHtmlFilter() {
     // Get FilterHtml object.
     $filter = $this->filters['filter_html'];
-    $filter->setConfiguration(array(
-      'settings' => array(
+    $filter->setConfiguration([
+      'settings' => [
         'allowed_html' => '<a> <p> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <br>',
         'filter_html_help' => 1,
         'filter_html_nofollow' => 0,
-      )
-    ));
+      ]
+    ]);
 
     // HTML filter is not able to secure some tags, these should never be
     // allowed.
@@ -461,25 +461,25 @@ class FilterKernelTest extends KernelTestBase {
     $this->assertNormalized($f, '<a>link</a>', 'HTML filter should remove attributes that are not explicitly allowed.');
 
     // Now whitelist the "llama" attribute on <a>.
-    $filter->setConfiguration(array(
-      'settings' => array(
+    $filter->setConfiguration([
+      'settings' => [
         'allowed_html' => '<a href llama> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <br>',
         'filter_html_help' => 1,
         'filter_html_nofollow' => 0,
-      )
-    ));
+      ]
+    ]);
     $f = (string) $filter->process('<a kitten="cute" llama="awesome">link</a>', Language::LANGCODE_NOT_SPECIFIED);
     $this->assertNormalized($f, '<a llama="awesome">link</a>', 'HTML filter keeps explicitly allowed attributes, and removes attributes that are not explicitly allowed.');
 
     // Restrict the whitelisted "llama" attribute on <a> to only allow the value
     // "majestical", or "epic".
-    $filter->setConfiguration(array(
-      'settings' => array(
+    $filter->setConfiguration([
+      'settings' => [
         'allowed_html' => '<a href llama="majestical epic"> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <br>',
         'filter_html_help' => 1,
         'filter_html_nofollow' => 0,
-      )
-    ));
+      ]
+    ]);
     $f = (string) $filter->process('<a kitten="cute" llama="awesome">link</a>', Language::LANGCODE_NOT_SPECIFIED);
     $this->assertIdentical($f, '<a>link</a>', 'HTML filter removes allowed attributes that do not have an explicitly allowed value.');
     $f = (string) $filter->process('<a kitten="cute" llama="majestical">link</a>', Language::LANGCODE_NOT_SPECIFIED);
@@ -493,16 +493,16 @@ class FilterKernelTest extends KernelTestBase {
   /**
    * Tests the spam deterrent.
    */
-  function testNoFollowFilter() {
+  public function testNoFollowFilter() {
     // Get FilterHtml object.
     $filter = $this->filters['filter_html'];
-    $filter->setConfiguration(array(
-      'settings' => array(
+    $filter->setConfiguration([
+      'settings' => [
         'allowed_html' => '<a href>',
         'filter_html_help' => 1,
         'filter_html_nofollow' => 1,
-      )
-    ));
+      ]
+    ]);
 
     // Test if the rel="nofollow" attribute is added, even if we try to prevent
     // it.
@@ -526,31 +526,31 @@ class FilterKernelTest extends KernelTestBase {
   /**
    * Tests the HTML escaping filter.
    */
-  function testHtmlEscapeFilter() {
+  public function testHtmlEscapeFilter() {
     // Get FilterHtmlEscape object.
     $filter = $this->filters['filter_html_escape'];
 
-    $tests = array(
-      "   One. <!-- \"comment\" --> Two'.\n<p>Three.</p>\n    " => array(
+    $tests = [
+      "   One. <!-- \"comment\" --> Two'.\n<p>Three.</p>\n    " => [
         "One. &lt;!-- &quot;comment&quot; --&gt; Two&#039;.\n&lt;p&gt;Three.&lt;/p&gt;" => TRUE,
         '   One.' => FALSE,
         "</p>\n    " => FALSE,
-      ),
-    );
+      ],
+    ];
     $this->assertFilteredString($filter, $tests);
   }
 
   /**
    * Tests the URL filter.
    */
-  function testUrlFilter() {
+  public function testUrlFilter() {
     // Get FilterUrl object.
     $filter = $this->filters['filter_url'];
-    $filter->setConfiguration(array(
-      'settings' => array(
+    $filter->setConfiguration([
+      'settings' => [
         'filter_url_length' => 496,
-      )
-    ));
+      ]
+    ]);
 
     // @todo Possible categories:
     // - absolute, mail, partial
@@ -562,24 +562,24 @@ class FilterKernelTest extends KernelTestBase {
     $email_with_plus_sign = 'one+two@example.com';
 
     // Filter selection/pattern matching.
-    $tests = array(
+    $tests = [
       // HTTP URLs.
       '
 http://example.com or www.example.com
-' => array(
+' => [
         '<a href="http://example.com">http://example.com</a>' => TRUE,
         '<a href="http://www.example.com">www.example.com</a>' => TRUE,
-      ),
+      ],
       // MAILTO URLs.
       '
 person@example.com or mailto:person2@example.com or ' . $email_with_plus_sign . ' or ' . $long_email . ' but not ' . $too_long_email . '
-' => array(
+' => [
         '<a href="mailto:person@example.com">person@example.com</a>' => TRUE,
         '<a href="mailto:person2@example.com">mailto:person2@example.com</a>' => TRUE,
         '<a href="mailto:' . $long_email . '">' . $long_email . '</a>' => TRUE,
         '<a href="mailto:' . $too_long_email . '">' . $too_long_email . '</a>' => FALSE,
         '<a href="mailto:' . $email_with_plus_sign . '">' . $email_with_plus_sign . '</a>' => TRUE,
-      ),
+      ],
       // URI parts and special characters.
       '
 http://trailingslash.com/ or www.trailingslash.com/
@@ -589,7 +589,7 @@ http://example.com/@user/
 ftp://user:pass@ftp.example.com/~home/dir1
 sftp://user@nonstandardport:222/dir
 ssh://192.168.0.100/srv/git/drupal.git
-' => array(
+' => [
         '<a href="http://trailingslash.com/">http://trailingslash.com/</a>' => TRUE,
         '<a href="http://www.trailingslash.com/">www.trailingslash.com/</a>' => TRUE,
         '<a href="http://host.com/some/path?query=foo&amp;bar[baz]=beer#fragment">http://host.com/some/path?query=foo&amp;bar[baz]=beer#fragment</a>' => TRUE,
@@ -599,7 +599,7 @@ ssh://192.168.0.100/srv/git/drupal.git
         '<a href="ftp://user:pass@ftp.example.com/~home/dir1">ftp://user:pass@ftp.example.com/~home/dir1</a>' => TRUE,
         '<a href="sftp://user@nonstandardport:222/dir">sftp://user@nonstandardport:222/dir</a>' => TRUE,
         '<a href="ssh://192.168.0.100/srv/git/drupal.git">ssh://192.168.0.100/srv/git/drupal.git</a>' => TRUE,
-      ),
+      ],
       // International Unicode characters.
       '
 http://пример.испытание/
@@ -609,7 +609,7 @@ http://12345.中国/
 http://例え.テスト/
 http://dréißig-bücher.de/
 http://méxico-mañana.es/
-' => array(
+' => [
         '<a href="http://пример.испытание/">http://пример.испытание/</a>' => TRUE,
         '<a href="http://مثال.إختبار/">http://مثال.إختبار/</a>' => TRUE,
         '<a href="http://例子.測試/">http://例子.測試/</a>' => TRUE,
@@ -617,25 +617,25 @@ http://méxico-mañana.es/
         '<a href="http://例え.テスト/">http://例え.テスト/</a>' => TRUE,
         '<a href="http://dréißig-bücher.de/">http://dréißig-bücher.de/</a>' => TRUE,
         '<a href="http://méxico-mañana.es/">http://méxico-mañana.es/</a>' => TRUE,
-      ),
+      ],
       // Encoding.
       '
 http://ampersand.com/?a=1&b=2
 http://encoded.com/?a=1&amp;b=2
-' => array(
+' => [
         '<a href="http://ampersand.com/?a=1&amp;b=2">http://ampersand.com/?a=1&amp;b=2</a>' => TRUE,
         '<a href="http://encoded.com/?a=1&amp;b=2">http://encoded.com/?a=1&amp;b=2</a>' => TRUE,
-      ),
+      ],
       // Domain name length.
       '
 www.ex.ex or www.example.example or www.toolongdomainexampledomainexampledomainexampledomainexampledomain or
 me@me.tv
-' => array(
+' => [
         '<a href="http://www.ex.ex">www.ex.ex</a>' => TRUE,
         '<a href="http://www.example.example">www.example.example</a>' => TRUE,
         'http://www.toolong' => FALSE,
         '<a href="mailto:me@me.tv">me@me.tv</a>' => TRUE,
-      ),
+      ],
       // Absolute URL protocols.
       // The list to test is found in the beginning of _filter_url() at
       // $protocols = \Drupal::getContainer()->getParameter('filter_protocols').
@@ -650,7 +650,7 @@ sftp://secure.host?,
 webcal://calendar,
 rtsp://127.0.0.1,
 not foo://disallowed.com.
-' => array(
+' => [
         'href="https://example.com"' => TRUE,
         'href="ftp://ftp.example.com"' => TRUE,
         'href="news://example.net"' => TRUE,
@@ -662,12 +662,12 @@ not foo://disallowed.com.
         'href="rtsp://127.0.0.1"' => TRUE,
         'href="foo://disallowed.com"' => FALSE,
         'not foo://disallowed.com.' => TRUE,
-      ),
-    );
+      ],
+    ];
     $this->assertFilteredString($filter, $tests);
 
     // Surrounding text/punctuation.
-    $tests = array(
+    $tests = [
       '
 Partial URL with trailing period www.partial.com.
 Email with trailing comma person@example.com,
@@ -680,7 +680,7 @@ Partial URL with brackets in the URL as well as surrounded brackets (www.foo.com
 Absolute URL with square brackets in the URL as well as surrounded brackets [https://www.drupal.org/?class[]=1]
 Absolute URL with quotes "https://www.drupal.org/sample"
 
-' => array(
+' => [
         'period <a href="http://www.partial.com">www.partial.com</a>.' => TRUE,
         'comma <a href="mailto:person@example.com">person@example.com</a>,' => TRUE,
         'question <a href="http://www.absolute.com">http://www.absolute.com</a>?' => TRUE,
@@ -691,45 +691,45 @@ Absolute URL with quotes "https://www.drupal.org/sample"
         'brackets (<a href="http://www.foo.com/more_(than)_one_(parens)">www.foo.com/more_(than)_one_(parens)</a>).' => TRUE,
         'brackets [<a href="https://www.drupal.org/?class[]=1">https://www.drupal.org/?class[]=1</a>]' => TRUE,
         'quotes "<a href="https://www.drupal.org/sample">https://www.drupal.org/sample</a>"' => TRUE,
-      ),
+      ],
       '
 (www.parenthesis.com/dir?a=1&b=2#a)
-' => array(
+' => [
         '(<a href="http://www.parenthesis.com/dir?a=1&amp;b=2#a">www.parenthesis.com/dir?a=1&amp;b=2#a</a>)' => TRUE,
-      ),
-    );
+      ],
+    ];
     $this->assertFilteredString($filter, $tests);
 
     // Surrounding markup.
-    $tests = array(
+    $tests = [
       '
 <p xmlns="www.namespace.com" />
 <p xmlns="http://namespace.com">
 An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>.
 </p>
-' => array(
+' => [
         '<p xmlns="www.namespace.com" />' => TRUE,
         '<p xmlns="http://namespace.com">' => TRUE,
         'href="http://www.namespace.com"' => FALSE,
         'href="http://namespace.com"' => FALSE,
         'An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>.' => TRUE,
-      ),
+      ],
       '
 Not <a href="foo">www.relative.com</a> or <a href="http://absolute.com">www.absolute.com</a>
 but <strong>http://www.strong.net</strong> or <em>www.emphasis.info</em>
-' => array(
+' => [
         '<a href="foo">www.relative.com</a>' => TRUE,
         'href="http://www.relative.com"' => FALSE,
         '<a href="http://absolute.com">www.absolute.com</a>' => TRUE,
         '<strong><a href="http://www.strong.net">http://www.strong.net</a></strong>' => TRUE,
         '<em><a href="http://www.emphasis.info">www.emphasis.info</a></em>' => TRUE,
-      ),
+      ],
       '
 Test <code>using www.example.com the code tag</code>.
-' => array(
+' => [
         'href' => FALSE,
         'http' => FALSE,
-      ),
+      ],
       '
 Intro.
 <blockquote>
@@ -737,7 +737,7 @@ Quoted text linking to www.example.com, written by person@example.com, originati
 </blockquote>
 
 Outro.
-' => array(
+' => [
         'href="http://www.example.com"' => TRUE,
         'href="mailto:person@example.com"' => TRUE,
         'href="http://origin.example.com"' => TRUE,
@@ -745,18 +745,18 @@ Outro.
         'http://www.example.info' => FALSE,
         'Intro.' => TRUE,
         'Outro.' => TRUE,
-      ),
+      ],
       '
 Unknown tag <x>containing x and www.example.com</x>? And a tag <pooh>beginning with p and containing www.example.pooh with p?</pooh>
-' => array(
+' => [
         'href="http://www.example.com"' => TRUE,
         'href="http://www.example.pooh"' => TRUE,
-      ),
+      ],
       '
 <p>Test &lt;br/&gt;: This is a www.example17.com example <strong>with</strong> various http://www.example18.com tags. *<br/>
  It is important www.example19.com to *<br/>test different URLs and http://www.example20.com in the same paragraph. *<br>
 HTML www.example21.com soup by person@example22.com can litererally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com.
-' => array(
+' => [
         'href="http://www.example17.com"' => TRUE,
         'href="http://www.example18.com"' => TRUE,
         'href="http://www.example19.com"' => TRUE,
@@ -769,7 +769,7 @@ HTML www.example21.com soup by person@example22.com can litererally http://www.e
         'href="http://www.example26.com"' => TRUE,
         'href="mailto:person@example27.com"' => TRUE,
         'href="http://www.example28.com"' => TRUE,
-      ),
+      ],
       '
 <script>
 <!--
@@ -781,33 +781,33 @@ HTML www.example21.com soup by person@example22.com can litererally http://www.e
   var exampleurl = "http://example.net";
 //--><!]]>
 </script>
-' => array(
+' => [
         'href="http://www.example.com"' => FALSE,
         'href="http://example.net"' => FALSE,
-      ),
+      ],
       '
 <style>body {
   background: url(http://example.com/pixel.gif);
 }</style>
-' => array(
+' => [
         'href' => FALSE,
-      ),
+      ],
       '
 <!-- Skip any URLs like www.example.com in comments -->
-' => array(
+' => [
         'href' => FALSE,
-      ),
+      ],
       '
 <!-- Skip any URLs like
 www.example.com with a newline in comments -->
-' => array(
+' => [
         'href' => FALSE,
-      ),
+      ],
       '
 <!-- Skip any URLs like www.comment.com in comments. <p>Also ignore http://commented.out/markup.</p> -->
-' => array(
+' => [
         'href' => FALSE,
-      ),
+      ],
       '
 <dl>
 <dt>www.example.com</dt>
@@ -816,39 +816,39 @@ www.example.com with a newline in comments -->
 <dt>Check www.example.net</dt>
 <dd>Some text around http://www.example.info by person@example.info?</dd>
 </dl>
-' => array(
+' => [
         'href="http://www.example.com"' => TRUE,
         'href="http://example.com"' => TRUE,
         'href="mailto:person@example.com"' => TRUE,
         'href="http://www.example.net"' => TRUE,
         'href="http://www.example.info"' => TRUE,
         'href="mailto:person@example.info"' => TRUE,
-      ),
+      ],
       '
 <div>www.div.com</div>
 <ul>
 <li>http://listitem.com</li>
 <li class="odd">www.class.listitem.com</li>
 </ul>
-' => array(
+' => [
         '<div><a href="http://www.div.com">www.div.com</a></div>' => TRUE,
         '<li><a href="http://listitem.com">http://listitem.com</a></li>' => TRUE,
         '<li class="odd"><a href="http://www.class.listitem.com">www.class.listitem.com</a></li>' => TRUE,
-      ),
-    );
+      ],
+    ];
     $this->assertFilteredString($filter, $tests);
 
     // URL trimming.
-    $filter->setConfiguration(array(
-      'settings' => array(
+    $filter->setConfiguration([
+      'settings' => [
         'filter_url_length' => 20,
-      )
-    ));
-    $tests = array(
-      'www.trimmed.com/d/ff.ext?a=1&b=2#a1' => array(
+      ]
+    ]);
+    $tests = [
+      'www.trimmed.com/d/ff.ext?a=1&b=2#a1' => [
         '<a href="http://www.trimmed.com/d/ff.ext?a=1&amp;b=2#a1">www.trimmed.com/d/f…</a>' => TRUE,
-      ),
-    );
+      ],
+    ];
     $this->assertFilteredString($filter, $tests);
   }
 
@@ -871,24 +871,24 @@ www.example.com with a newline in comments -->
    *   );
    *   @endcode
    */
-  function assertFilteredString($filter, $tests) {
+  public function assertFilteredString($filter, $tests) {
     foreach ($tests as $source => $tasks) {
       $result = $filter->process($source, $filter)->getProcessedText();
       foreach ($tasks as $value => $is_expected) {
         // Not using assertIdentical, since combination with strpos() is hard to grok.
         if ($is_expected) {
-          $success = $this->assertTrue(strpos($result, $value) !== FALSE, format_string('@source: @value found. Filtered result: @result.', array(
+          $success = $this->assertTrue(strpos($result, $value) !== FALSE, format_string('@source: @value found. Filtered result: @result.', [
             '@source' => var_export($source, TRUE),
             '@value' => var_export($value, TRUE),
             '@result' => var_export($result, TRUE),
-          )));
+          ]));
         }
         else {
-          $success = $this->assertTrue(strpos($result, $value) === FALSE, format_string('@source: @value not found. Filtered result: @result.', array(
+          $success = $this->assertTrue(strpos($result, $value) === FALSE, format_string('@source: @value not found. Filtered result: @result.', [
             '@source' => var_export($source, TRUE),
             '@value' => var_export($value, TRUE),
             '@result' => var_export($result, TRUE),
-          )));
+          ]));
         }
         if (!$success) {
           $this->verbose('Source:<pre>' . Html::escape(var_export($source, TRUE)) . '</pre>'
@@ -918,14 +918,14 @@ www.example.com with a newline in comments -->
    * - Empty HTML tags (BR, IMG).
    * - Mix of absolute and partial URLs, and email addresses in one content.
    */
-  function testUrlFilterContent() {
+  public function testUrlFilterContent() {
     // Get FilterUrl object.
     $filter = $this->filters['filter_url'];
-    $filter->setConfiguration(array(
-      'settings' => array(
+    $filter->setConfiguration([
+      'settings' => [
         'filter_url_length' => 496,
-      )
-    ));
+      ]
+    ]);
     $path = __DIR__ . '/../..';
 
     $input = file_get_contents($path . '/filter.url-input.txt');
@@ -939,7 +939,7 @@ www.example.com with a newline in comments -->
    *
    * @todo This test could really use some validity checking function.
    */
-  function testHtmlCorrectorFilter() {
+  public function testHtmlCorrectorFilter() {
     // Tag closing.
     $f = Html::normalize('<p>text');
     $this->assertEqual($f, '<p>text</p>', 'HTML corrector -- tag closing at the end of input.');
@@ -1067,7 +1067,7 @@ body {color:red}
 
 /*--><!]]>*/
 </style></p>',
-      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '/*<![CDATA[*/'))
+      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', ['@pattern_name' => '/*<![CDATA[*/'])
     );
 
     $filtered_data = Html::normalize('<p><style>
@@ -1086,7 +1086,7 @@ body {color:red}
 
 /*--><!]]>*/
 </style></p>',
-      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '<!--/*--><![CDATA[/* ><!--*/'))
+      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', ['@pattern_name' => '<!--/*--><![CDATA[/* ><!--*/'])
     );
 
     $filtered_data = Html::normalize('<p><script>
@@ -1103,7 +1103,7 @@ body {color:red}
 
 //--><!]]>
 </script></p>',
-      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '<!--//--><![CDATA[// ><!--'))
+      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', ['@pattern_name' => '<!--//--><![CDATA[// ><!--'])
     );
 
     $filtered_data = Html::normalize('<p><script>
@@ -1120,7 +1120,7 @@ body {color:red}
 
 //--><!]]>
 </script></p>',
-      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '// <![CDATA['))
+      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', ['@pattern_name' => '// <![CDATA['])
     );
 
   }
@@ -1146,7 +1146,7 @@ body {color:red}
    * @return bool
    *   TRUE on pass, FALSE on fail.
    */
-  function assertNormalized($haystack, $needle, $message = '', $group = 'Other') {
+  public function assertNormalized($haystack, $needle, $message = '', $group = 'Other') {
     return $this->assertTrue(strpos(strtolower(Html::decodeEntities($haystack)), $needle) !== FALSE, $message, $group);
   }
 
@@ -1171,7 +1171,7 @@ body {color:red}
    * @return bool
    *   TRUE on pass, FALSE on fail.
    */
-  function assertNoNormalized($haystack, $needle, $message = '', $group = 'Other') {
+  public function assertNoNormalized($haystack, $needle, $message = '', $group = 'Other') {
     return $this->assertTrue(strpos(strtolower(Html::decodeEntities($haystack)), $needle) === FALSE, $message, $group);
   }
 
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php b/web/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php
index dc77eb416..f77efac85 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php
@@ -17,30 +17,30 @@ class FilterSettingsTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter');
+  public static $modules = ['filter'];
 
   /**
    * Tests explicit and implicit default settings for filters.
    */
-  function testFilterDefaults() {
+  public function testFilterDefaults() {
     $filter_info = $this->container->get('plugin.manager.filter')->getDefinitions();
 
     // Create text format using filter default settings.
-    $filter_defaults_format = FilterFormat::create(array(
+    $filter_defaults_format = FilterFormat::create([
       'format' => 'filter_defaults',
       'name' => 'Filter defaults',
-    ));
+    ]);
     $filter_defaults_format->save();
 
     // Verify that default weights defined in hook_filter_info() were applied.
-    $saved_settings = array();
+    $saved_settings = [];
     foreach ($filter_defaults_format->filters() as $name => $filter) {
       $expected_weight = $filter_info[$name]['weight'];
-      $this->assertEqual($filter->weight, $expected_weight, format_string('@name filter weight %saved equals %default', array(
+      $this->assertEqual($filter->weight, $expected_weight, format_string('@name filter weight %saved equals %default', [
         '@name' => $name,
         '%saved' => $filter->weight,
         '%default' => $expected_weight,
-      )));
+      ]));
       $saved_settings[$name]['weight'] = $expected_weight;
     }
 
@@ -51,11 +51,11 @@ class FilterSettingsTest extends KernelTestBase {
 
     // Verify that saved filter settings have not been changed.
     foreach ($filter_defaults_format->filters() as $name => $filter) {
-      $this->assertEqual($filter->weight, $saved_settings[$name]['weight'], format_string('@name filter weight %saved equals %previous', array(
+      $this->assertEqual($filter->weight, $saved_settings[$name]['weight'], format_string('@name filter weight %saved equals %previous', [
         '@name' => $name,
         '%saved' => $filter->weight,
         '%previous' => $saved_settings[$name]['weight'],
-      )));
+      ]));
     }
   }
 
diff --git a/web/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php b/web/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
index e4053ae18..0f54245c1 100644
--- a/web/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
@@ -16,7 +16,7 @@ class MigrateFilterFormatTest extends MigrateDrupal7TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('filter');
+  public static $modules = ['filter'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/filter/tests/src/Kernel/Plugin/migrate/source/d7/FilterFormatTest.php b/web/core/modules/filter/tests/src/Kernel/Plugin/migrate/source/d7/FilterFormatTest.php
index f68b93579..2dc9ce7c5 100644
--- a/web/core/modules/filter/tests/src/Kernel/Plugin/migrate/source/d7/FilterFormatTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/Plugin/migrate/source/d7/FilterFormatTest.php
@@ -48,7 +48,7 @@ class FilterFormatTest extends MigrateSqlSourceTestBase {
         'name' => 'filter_autop',
         'weight' => 0,
         'status' => 1,
-        'settings' => serialize(array()),
+        'settings' => serialize([]),
       ],
       [
         'format' => 'custom_text_format',
@@ -56,7 +56,7 @@ class FilterFormatTest extends MigrateSqlSourceTestBase {
         'name' => 'filter_html',
         'weight' => 1,
         'status' => 1,
-        'settings' => serialize(array()),
+        'settings' => serialize([]),
       ],
       [
         'format' => 'full_html',
@@ -64,7 +64,7 @@ class FilterFormatTest extends MigrateSqlSourceTestBase {
         'name' => 'filter_url',
         'weight' => 0,
         'status' => 1,
-        'settings' => serialize(array()),
+        'settings' => serialize([]),
       ],
     ];
 
diff --git a/web/core/modules/filter/tests/src/Unit/FilterHtmlTest.php b/web/core/modules/filter/tests/src/Unit/FilterHtmlTest.php
index a3cde04e9..664c2a300 100644
--- a/web/core/modules/filter/tests/src/Unit/FilterHtmlTest.php
+++ b/web/core/modules/filter/tests/src/Unit/FilterHtmlTest.php
@@ -79,4 +79,18 @@ class FilterHtmlTest extends UnitTestCase {
     ];
   }
 
+  /**
+   * @covers ::setConfiguration
+   */
+  public function testSetConfiguration() {
+    $configuration['settings'] = [
+      // New lines and spaces are replaced with a single space.
+      'allowed_html' => "<a>  <br>\r\n  <p>",
+      'filter_html_help' => 1,
+      'filter_html_nofollow' => 0,
+    ];
+    $filter = new FilterHtml($configuration, 'filter_html', ['provider' => 'test']);
+    $this->assertSame('<a> <br> <p>', $filter->getConfiguration()['settings']['allowed_html']);
+  }
+
 }
diff --git a/web/core/modules/forum/config/optional/core.entity_form_display.comment.comment_forum.default.yml b/web/core/modules/forum/config/optional/core.entity_form_display.comment.comment_forum.default.yml
index a09c30b00..4738bbb43 100644
--- a/web/core/modules/forum/config/optional/core.entity_form_display.comment.comment_forum.default.yml
+++ b/web/core/modules/forum/config/optional/core.entity_form_display.comment.comment_forum.default.yml
@@ -13,9 +13,11 @@ mode: default
 content:
   author:
     weight: -2
+    region: content
   comment_body:
     type: text_textarea
     weight: 11
+    region: content
     settings:
       rows: 5
       placeholder: ''
@@ -23,6 +25,7 @@ content:
   subject:
     type: string_textfield
     weight: 10
+    region: content
     settings:
       size: 60
       placeholder: ''
diff --git a/web/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml b/web/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml
index c66ba236d..6773d32d2 100644
--- a/web/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml
+++ b/web/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml
@@ -17,6 +17,7 @@ content:
   body:
     type: text_textarea_with_summary
     weight: 27
+    region: content
     settings:
       rows: 9
       summary_rows: 3
@@ -25,11 +26,13 @@ content:
   comment_forum:
     type: comment_default
     weight: 20
+    region: content
     settings: {  }
     third_party_settings: {  }
   created:
     type: datetime_timestamp
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
   promote:
@@ -37,21 +40,25 @@ content:
     settings:
       display_label: true
     weight: 15
+    region: content
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 16
+    region: content
     third_party_settings: {  }
   taxonomy_forums:
     type: options_select
     weight: 26
+    region: content
     settings: {  }
     third_party_settings: {  }
   title:
     type: string_textfield
     weight: -5
+    region: content
     settings:
       size: 60
       placeholder: ''
@@ -59,6 +66,7 @@ content:
   uid:
     type: entity_reference_autocomplete
     weight: 5
+    region: content
     settings:
       match_operator: CONTAINS
       size: 60
diff --git a/web/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml b/web/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml
index b18c869be..50df98ac1 100644
--- a/web/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml
+++ b/web/core/modules/forum/config/optional/core.entity_form_display.taxonomy_term.forums.default.yml
@@ -14,11 +14,13 @@ content:
   description:
     type: text_textfield
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
   name:
     type: string_textfield
     weight: -5
+    region: content
     settings:
       size: 60
       placeholder: ''
diff --git a/web/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml b/web/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml
index f4f0112f5..befeba89a 100644
--- a/web/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml
+++ b/web/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml
@@ -15,8 +15,10 @@ content:
     label: hidden
     type: text_default
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
   links:
     weight: 100
+    region: content
 hidden: {  }
diff --git a/web/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml b/web/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml
index b157c839e..f3e8c5c61 100644
--- a/web/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml
+++ b/web/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml
@@ -20,21 +20,25 @@ content:
     label: hidden
     type: text_default
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
   comment_forum:
     label: hidden
     type: comment_default
     weight: 20
+    region: content
     settings:
       view_mode: default
       pager_id: 0
     third_party_settings: {  }
   links:
     weight: 100
+    region: content
   taxonomy_forums:
     type: entity_reference_label
     weight: -1
+    region: content
     label: above
     settings:
       link: true
diff --git a/web/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml b/web/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml
index 4405e71f9..7b174f442 100644
--- a/web/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml
+++ b/web/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml
@@ -19,14 +19,17 @@ content:
     label: hidden
     type: text_summary_or_trimmed
     weight: 100
+    region: content
     settings:
       trim_length: 600
     third_party_settings: {  }
   links:
     weight: 101
+    region: content
   taxonomy_forums:
     type: entity_reference_label
     weight: 10
+    region: content
     label: above
     settings:
       link: true
diff --git a/web/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml b/web/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml
index d1242d99b..b326039a4 100644
--- a/web/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml
+++ b/web/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml
@@ -14,6 +14,7 @@ content:
   description:
     type: text_default
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
     label: above
diff --git a/web/core/modules/forum/forum.install b/web/core/modules/forum/forum.install
index 36c71e46b..4a16a8939 100644
--- a/web/core/modules/forum/forum.install
+++ b/web/core/modules/forum/forum.install
@@ -21,13 +21,13 @@ function forum_install() {
 
   if (!\Drupal::service('config.installer')->isSyncing()) {
     // Create a default forum so forum posts can be created.
-    $term = Term::create(array(
+    $term = Term::create([
       'name' => t('General discussion'),
       'description' => '',
-      'parent' => array(0),
+      'parent' => [0],
       'vid' => 'forums',
       'forum_container' => 0,
-    ));
+    ]);
     $term->save();
   }
 }
@@ -61,117 +61,117 @@ function forum_uninstall() {
  * Implements hook_schema().
  */
 function forum_schema() {
-  $schema['forum'] = array(
+  $schema['forum'] = [
     'description' => 'Stores the relationship of nodes to forum terms.',
-    'fields' => array(
-      'nid' => array(
+    'fields' => [
+      'nid' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The {node}.nid of the node.',
-      ),
-      'vid' => array(
+      ],
+      'vid' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'Primary Key: The {node}.vid of the node.',
-      ),
-      'tid' => array(
+      ],
+      'tid' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The {taxonomy_term_data}.tid of the forum term assigned to the node.',
-      ),
-    ),
-    'indexes' => array(
-      'forum_topic' => array('nid', 'tid'),
-      'tid' => array('tid'),
-    ),
-    'primary key' => array('vid'),
-    'foreign keys' => array(
-      'forum_node' => array(
+      ],
+    ],
+    'indexes' => [
+      'forum_topic' => ['nid', 'tid'],
+      'tid' => ['tid'],
+    ],
+    'primary key' => ['vid'],
+    'foreign keys' => [
+      'forum_node' => [
         'table' => 'node',
-        'columns' => array(
+        'columns' => [
           'nid' => 'nid',
           'vid' => 'vid',
-        ),
-      ),
-    ),
-  );
+        ],
+      ],
+    ],
+  ];
 
-  $schema['forum_index'] = array(
+  $schema['forum_index'] = [
     'description' => 'Maintains denormalized information about node/term relationships.',
-    'fields' => array(
-      'nid' => array(
+    'fields' => [
+      'nid' => [
         'description' => 'The {node}.nid this record tracks.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'title' => array(
+      ],
+      'title' => [
         'description' => 'The node title.',
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'tid' => array(
+      ],
+      'tid' => [
          'description' => 'The term ID.',
          'type' => 'int',
          'unsigned' => TRUE,
          'not null' => TRUE,
          'default' => 0,
-      ),
-      'sticky' => array(
+      ],
+      'sticky' => [
         'description' => 'Boolean indicating whether the node is sticky.',
         'type' => 'int',
         'not null' => FALSE,
         'default' => 0,
         'size' => 'tiny',
-      ),
-      'created' => array(
+      ],
+      'created' => [
         'description' => 'The Unix timestamp when the node was created.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'last_comment_timestamp' => array(
+      ],
+      'last_comment_timestamp' => [
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The Unix timestamp of the last comment that was posted within this node, from {comment}.timestamp.',
-      ),
-      'comment_count' => array(
+      ],
+      'comment_count' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The total number of comments on this node.',
-      ),
-    ),
-    'indexes' => array(
-      'forum_topics' => array('nid', 'tid', 'sticky', 'last_comment_timestamp'),
-      'created' => array('created'),
-      'last_comment_timestamp' => array('last_comment_timestamp'),
-    ),
-    'foreign keys' => array(
-      'tracked_node' => array(
+      ],
+    ],
+    'indexes' => [
+      'forum_topics' => ['nid', 'tid', 'sticky', 'last_comment_timestamp'],
+      'created' => ['created'],
+      'last_comment_timestamp' => ['last_comment_timestamp'],
+    ],
+    'foreign keys' => [
+      'tracked_node' => [
         'table' => 'node',
-        'columns' => array('nid' => 'nid'),
-      ),
-      'term' => array(
+        'columns' => ['nid' => 'nid'],
+      ],
+      'term' => [
         'table' => 'taxonomy_term_data',
-        'columns' => array(
+        'columns' => [
           'tid' => 'tid',
-        ),
-      ),
-    ),
-  );
+        ],
+      ],
+    ],
+  ];
 
   return $schema;
 }
diff --git a/web/core/modules/forum/forum.module b/web/core/modules/forum/forum.module
index 8d4a9f459..c2de3c9e0 100644
--- a/web/core/modules/forum/forum.module
+++ b/web/core/modules/forum/forum.module
@@ -24,7 +24,7 @@ function forum_help($route_name, RouteMatchInterface $route_match) {
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('The Forum module lets you create threaded discussion forums with functionality similar to other message board systems. In a forum, users post topics and threads in nested hierarchies, allowing discussions to be categorized and grouped.') . '</p>';
-      $output .= '<p>' . t('The Forum module adds and uses a content type called <em>Forum topic</em>. For background information on content types, see the <a href=":node_help">Node module help page</a>.', array(':node_help' => \Drupal::url('help.page', array('name' => 'node')))) . '</p>';
+      $output .= '<p>' . t('The Forum module adds and uses a content type called <em>Forum topic</em>. For background information on content types, see the <a href=":node_help">Node module help page</a>.', [':node_help' => \Drupal::url('help.page', ['name' => 'node'])]) . '</p>';
       $output .= '<p>' . t('A forum is represented by a hierarchical structure, consisting of:');
       $output .= '<ul>';
       $output .= '<li>' . t('<em>Forums</em> (for example, <em>Recipes for cooking vegetables</em>)') . '</li>';
@@ -33,15 +33,15 @@ function forum_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<li>' . t('Optional <em>containers</em>, used to group similar forums. Forums can be placed inside containers, and vice versa.') . '</li>';
       $output .= '</ul>';
       $output .= '</p>';
-      $output .= '<p>' . t('For more information, see the <a href=":forum">online documentation for the Forum module</a>.', array(':forum' => 'https://www.drupal.org/documentation/modules/forum')) . '</p>';
+      $output .= '<p>' . t('For more information, see the <a href=":forum">online documentation for the Forum module</a>.', [':forum' => 'https://www.drupal.org/documentation/modules/forum']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Setting up the forum structure') . '</dt>';
-      $output .= '<dd>' . t('Visit the <a href=":forums">Forums page</a> to set up containers and forums to hold your discussion topics.', array(':forums' => \Drupal::url('forum.overview'))) . '</dd>';
+      $output .= '<dd>' . t('Visit the <a href=":forums">Forums page</a> to set up containers and forums to hold your discussion topics.', [':forums' => \Drupal::url('forum.overview')]) . '</dd>';
       $output .= '<dt>' . t('Starting a discussion') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":create-topic">Forum topic</a> link on the <a href=":content-add">Add content</a> page creates the first post of a new threaded discussion, or thread.', array(':create-topic' => \Drupal::url('node.add', array('node_type' => 'forum')), ':content-add' => \Drupal::url('node.add_page'))) . '</dd>';
+      $output .= '<dd>' . t('The <a href=":create-topic">Forum topic</a> link on the <a href=":content-add">Add content</a> page creates the first post of a new threaded discussion, or thread.', [':create-topic' => \Drupal::url('node.add', ['node_type' => 'forum']), ':content-add' => \Drupal::url('node.add_page')]) . '</dd>';
       $output .= '<dt>' . t('Navigating in the forum') . '</dt>';
-      $output .= '<dd>' . t('Enabling the Forum module provides a default <em>Forums</em> menu item in the Tools menu that links to the <a href=":forums">Forums page</a>.', array(':forums' => \Drupal::url('forum.index'))) . '</dd>';
+      $output .= '<dd>' . t('Enabling the Forum module provides a default <em>Forums</em> menu item in the Tools menu that links to the <a href=":forums">Forums page</a>.', [':forums' => \Drupal::url('forum.index')]) . '</dd>';
       $output .= '<dt>' . t('Moving forum topics') . '</dt>';
       $output .= '<dd>' . t('A forum topic (and all of its comments) may be moved between forums by selecting a different forum while editing a forum topic. When moving a forum topic between forums, the <em>Leave shadow copy</em> option creates a link in the original forum pointing to the new location.') . '</dd>';
       $output .= '<dt>' . t('Locking and disabling comments') . '</dt>';
@@ -51,21 +51,21 @@ function forum_help($route_name, RouteMatchInterface $route_match) {
 
     case 'forum.overview':
       $output = '<p>' . t('Forums contain forum topics. Use containers to group related forums.') . '</p>';
-      $more_help_link = array(
+      $more_help_link = [
         '#type' => 'link',
         '#url' => Url::fromRoute('help.page', ['name' => 'forum']),
         '#title' => t('More help'),
-        '#attributes' => array(
-          'class' => array('icon-help'),
-        ),
-      );
-      $container = array(
+        '#attributes' => [
+          'class' => ['icon-help'],
+        ],
+      ];
+      $container = [
         '#theme' => 'container',
         '#children' => $more_help_link,
-        '#attributes' => array(
-          'class' => array('more-link'),
-        ),
-      );
+        '#attributes' => [
+          'class' => ['more-link'],
+        ],
+      ];
       $output .= \Drupal::service('renderer')->renderPlain($container);
       return $output;
 
@@ -76,7 +76,7 @@ function forum_help($route_name, RouteMatchInterface $route_match) {
       return '<p>' . t('A forum holds related forum topics.') . '</p>';
 
     case 'forum.settings':
-      return '<p>' . t('Adjust the display of your forum topics. Organize the forums on the <a href=":forum-structure">forum structure page</a>.', array(':forum-structure' => \Drupal::url('forum.overview'))) . '</p>';
+      return '<p>' . t('Adjust the display of your forum topics. Organize the forums on the <a href=":forum-structure">forum structure page</a>.', [':forum-structure' => \Drupal::url('forum.overview')]) . '</p>';
   }
 }
 
@@ -84,20 +84,20 @@ function forum_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function forum_theme() {
-  return array(
-    'forums' => array(
-      'variables' => array('forums' => array(), 'topics' => array(), 'topics_pager' => array(), 'parents' => NULL, 'term' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL, 'header' => array()),
-    ),
-    'forum_list' => array(
-      'variables' => array('forums' => NULL, 'parents' => NULL, 'tid' => NULL),
-    ),
-    'forum_icon' => array(
-      'variables' => array('new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0, 'first_new' => FALSE),
-    ),
-    'forum_submitted' => array(
-      'variables' => array('topic' => NULL),
-    ),
-  );
+  return [
+    'forums' => [
+      'variables' => ['forums' => [], 'topics' => [], 'topics_pager' => [], 'parents' => NULL, 'term' => NULL, 'sortby' => NULL, 'forum_per_page' => NULL, 'header' => []],
+    ],
+    'forum_list' => [
+      'variables' => ['forums' => NULL, 'parents' => NULL, 'tid' => NULL],
+    ],
+    'forum_icon' => [
+      'variables' => ['new_posts' => NULL, 'num_posts' => 0, 'comment_mode' => 0, 'sticky' => 0, 'first_new' => FALSE],
+    ],
+    'forum_submitted' => [
+      'variables' => ['topic' => NULL],
+    ],
+  ];
 }
 
 /**
@@ -158,7 +158,7 @@ function forum_node_presave(EntityInterface $node) {
         $old_tid = \Drupal::service('forum.index_storage')->getOriginalTermId($node);
         if ($old_tid && isset($node->forum_tid) && ($node->forum_tid != $old_tid) && !empty($node->shadow)) {
           // A shadow copy needs to be created. Retain new term and add old term.
-          $node->taxonomy_forums[count($node->taxonomy_forums)] = array('target_id' => $old_tid);
+          $node->taxonomy_forums[count($node->taxonomy_forums)] = ['target_id' => $old_tid];
         }
       }
     }
@@ -241,7 +241,7 @@ function forum_node_predelete(EntityInterface $node) {
  * Implements hook_ENTITY_TYPE_storage_load() for node entities.
  */
 function forum_node_storage_load($nodes) {
-  $node_vids = array();
+  $node_vids = [];
   foreach ($nodes as $node) {
     if (\Drupal::service('forum_manager')->checkNodeType($node)) {
       $node_vids[] = $node->getRevisionId();
@@ -289,10 +289,10 @@ function forum_form_taxonomy_vocabulary_form_alter(&$form, FormStateInterface $f
   $vid = \Drupal::config('forum.settings')->get('vocabulary');
   $vocabulary = $form_state->getFormObject()->getEntity();
   if ($vid == $vocabulary->id()) {
-    $form['help_forum_vocab'] = array(
+    $form['help_forum_vocab'] = [
       '#markup' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
       '#weight' => -1,
-    );
+    ];
     // Forum's vocabulary always has single hierarchy. Forums and containers
     // have only one parent or no parent for root items. By default this value
     // is 0.
@@ -324,13 +324,13 @@ function forum_form_node_form_alter(&$form, FormStateInterface $form_state, $for
     $forum_terms = $node->taxonomy_forums;
     // If editing, give option to leave shadows.
     $shadow = (count($forum_terms) > 1);
-    $form['shadow'] = array(
+    $form['shadow'] = [
       '#type' => 'checkbox',
       '#title' => t('Leave shadow copy'),
       '#default_value' => $shadow,
       '#description' => t('If you move this topic, you can leave a link in the old forum to the new forum.'),
-    );
-    $form['forum_tid'] = array('#type' => 'value', '#value' => $node->forum_tid);
+    ];
+    $form['forum_tid'] = ['#type' => 'value', '#value' => $node->forum_tid];
   }
 
   if (isset($form['taxonomy_forums'])) {
@@ -361,7 +361,7 @@ function forum_preprocess_block(&$variables) {
  * Implements hook_theme_suggestions_HOOK().
  */
 function forum_theme_suggestions_forums(array $variables) {
-  $suggestions = array();
+  $suggestions = [];
   $tid = $variables['term']->id();
 
   // Provide separate template suggestions based on what's being output. Topic
@@ -408,24 +408,24 @@ function template_preprocess_forums(&$variables) {
   $variables['tid'] = $variables['term']->id();
   if ($variables['forums_defined'] = count($variables['forums']) || count($variables['parents'])) {
     if (!empty($variables['forums'])) {
-      $variables['forums'] = array(
+      $variables['forums'] = [
         '#theme' => 'forum_list',
         '#forums' => $variables['forums'],
         '#parents' => $variables['parents'],
         '#tid' => $variables['tid'],
-      );
+      ];
     }
 
     if ($variables['term'] && empty($variables['term']->forum_container->value) && !empty($variables['topics'])) {
       $forum_topic_list_header = $variables['header'];
 
-      $table = array(
+      $table = [
         '#theme' => 'table__forum_topic_list',
         '#responsive' => FALSE,
-        '#attributes' => array('id' => 'forum-topic-' . $variables['tid']),
-        '#header' => array(),
-        '#rows' => array(),
-      );
+        '#attributes' => ['id' => 'forum-topic-' . $variables['tid']],
+        '#header' => [],
+        '#rows' => [],
+      ];
 
       if (!empty($forum_topic_list_header)) {
         $table['#header'] = $forum_topic_list_header;
@@ -433,14 +433,14 @@ function template_preprocess_forums(&$variables) {
 
       /** @var \Drupal\node\NodeInterface $topic */
       foreach ($variables['topics'] as $id => $topic) {
-        $variables['topics'][$id]->icon = array(
+        $variables['topics'][$id]->icon = [
           '#theme' => 'forum_icon',
           '#new_posts' => $topic->new,
           '#num_posts' => $topic->comment_count,
           '#comment_mode' => $topic->comment_mode,
           '#sticky' => $topic->isSticky(),
           '#first_new' => $topic->first_new,
-        );
+        ];
 
         // We keep the actual tid in forum table, if it's different from the
         // current tid then it means the topic appears in two forums, one of
@@ -455,16 +455,16 @@ function template_preprocess_forums(&$variables) {
           $variables['topics'][$id]->title_link = \Drupal::l($topic->getTitle(), $topic->urlInfo());
           $variables['topics'][$id]->message = '';
         }
-        $forum_submitted = array('#theme' => 'forum_submitted', '#topic' => (object) array(
+        $forum_submitted = ['#theme' => 'forum_submitted', '#topic' => (object) [
           'uid' => $topic->getOwnerId(),
           'name' => $topic->getOwner()->getDisplayName(),
           'created' => $topic->getCreatedTime(),
-        ));
+        ]];
         $variables['topics'][$id]->submitted = drupal_render($forum_submitted);
-        $forum_submitted = array(
+        $forum_submitted = [
           '#theme' => 'forum_submitted',
           '#topic' => isset($topic->last_reply) ? $topic->last_reply : NULL,
-        );
+        ];
         $variables['topics'][$id]->last_reply = drupal_render($forum_submitted);
 
         $variables['topics'][$id]->new_text = '';
@@ -473,28 +473,28 @@ function template_preprocess_forums(&$variables) {
         if ($topic->new_replies) {
           $page_number = \Drupal::entityManager()->getStorage('comment')
             ->getNewCommentPageNumber($topic->comment_count, $topic->new_replies, $topic, 'comment_forum');
-          $query = $page_number ? array('page' => $page_number) : NULL;
-          $variables['topics'][$id]->new_text = \Drupal::translation()->formatPlural($topic->new_replies, '1 new post<span class="visually-hidden"> in topic %title</span>', '@count new posts<span class="visually-hidden"> in topic %title</span>', array('%title' => $variables['topics'][$id]->label()));
+          $query = $page_number ? ['page' => $page_number] : NULL;
+          $variables['topics'][$id]->new_text = \Drupal::translation()->formatPlural($topic->new_replies, '1 new post<span class="visually-hidden"> in topic %title</span>', '@count new posts<span class="visually-hidden"> in topic %title</span>', ['%title' => $variables['topics'][$id]->label()]);
           $variables['topics'][$id]->new_url = \Drupal::url('entity.node.canonical', ['node' => $topic->id()], ['query' => $query, 'fragment' => 'new']);
         }
 
         // Build table rows from topics.
-        $row = array();
-        $row[] = array(
-          'data' => array(
+        $row = [];
+        $row[] = [
+          'data' => [
             $topic->icon,
-            array(
+            [
               '#markup' => '<div class="forum__title"><div>' . $topic->title_link . '</div><div>' . $topic->submitted . '</div></div>',
-            ),
-          ),
-          'class' => array('forum__topic'),
-        );
+            ],
+          ],
+          'class' => ['forum__topic'],
+        ];
 
         if ($topic->moved) {
-          $row[] = array(
+          $row[] = [
             'data' => $topic->message,
             'colspan' => '2',
-          );
+          ];
         }
         else {
           $new_replies = '';
@@ -502,27 +502,27 @@ function template_preprocess_forums(&$variables) {
             $new_replies = '<br /><a href="' . $topic->new_url . '">' . $topic->new_text . '</a>';
           }
 
-          $row[] = array(
+          $row[] = [
             'data' => [
               [
                 '#prefix' => $topic->comment_count,
                 '#markup' => $new_replies,
               ],
             ],
-            'class' => array('forum__replies'),
-          );
-          $row[] = array(
+            'class' => ['forum__replies'],
+          ];
+          $row[] = [
             'data' => $topic->last_reply,
-            'class' => array('forum__last-reply'),
-          );
+            'class' => ['forum__last-reply'],
+          ];
         }
         $table['#rows'][] = $row;
       }
 
       $variables['topics'] = $table;
-      $variables['topics_pager'] = array(
+      $variables['topics_pager'] = [
         '#type' => 'pager',
-      );
+      ];
     }
   }
 }
@@ -545,7 +545,7 @@ function template_preprocess_forum_list(&$variables) {
   $row = 0;
   // Sanitize each forum so that the template can safely print the data.
   foreach ($variables['forums'] as $id => $forum) {
-    $variables['forums'][$id]->description = array('#markup' => $forum->description->value);
+    $variables['forums'][$id]->description = ['#markup' => $forum->description->value];
     $variables['forums'][$id]->link = forum_uri($forum);
     $variables['forums'][$id]->name = $forum->label();
     $variables['forums'][$id]->is_container = !empty($forum->forum_container->value);
@@ -561,20 +561,20 @@ function template_preprocess_forum_list(&$variables) {
     if ($user->isAuthenticated()) {
       $variables['forums'][$id]->new_topics = \Drupal::service('forum_manager')->unreadTopics($forum->id(), $user->id());
       if ($variables['forums'][$id]->new_topics) {
-        $variables['forums'][$id]->new_text = \Drupal::translation()->formatPlural($variables['forums'][$id]->new_topics, '1 new post<span class="visually-hidden"> in forum %title</span>', '@count new posts<span class="visually-hidden"> in forum %title</span>', array('%title' => $variables['forums'][$id]->label()));
+        $variables['forums'][$id]->new_text = \Drupal::translation()->formatPlural($variables['forums'][$id]->new_topics, '1 new post<span class="visually-hidden"> in forum %title</span>', '@count new posts<span class="visually-hidden"> in forum %title</span>', ['%title' => $variables['forums'][$id]->label()]);
         $variables['forums'][$id]->new_url = \Drupal::url('forum.page', ['taxonomy_term' => $forum->id()], ['fragment' => 'new']);
         $variables['forums'][$id]->icon_class = 'new';
         $variables['forums'][$id]->icon_title = t('New posts');
       }
       $variables['forums'][$id]->old_topics = $forum->num_topics - $variables['forums'][$id]->new_topics;
     }
-    $forum_submitted = array('#theme' => 'forum_submitted', '#topic' => $forum->last_post);
+    $forum_submitted = ['#theme' => 'forum_submitted', '#topic' => $forum->last_post];
     $variables['forums'][$id]->last_reply = drupal_render($forum_submitted);
   }
 
-  $variables['pager'] = array(
+  $variables['pager'] = [
    '#type' => 'pager',
-  );
+  ];
 
   // Give meaning to $tid for themers. $tid actually stands for term ID.
   $variables['forum_id'] = $variables['tid'];
@@ -635,7 +635,7 @@ function template_preprocess_forum_icon(&$variables) {
 function template_preprocess_forum_submitted(&$variables) {
   $variables['author'] = '';
   if (isset($variables['topic']->uid)) {
-    $username = array('#theme' => 'username', '#account' => User::load($variables['topic']->uid));
+    $username = ['#theme' => 'username', '#account' => User::load($variables['topic']->uid)];
     $variables['author'] = drupal_render($username);
   }
   $variables['time'] = isset($variables['topic']->created) ? \Drupal::service('date.formatter')->formatTimeDiffSince($variables['topic']->created) : '';
diff --git a/web/core/modules/forum/forum.services.yml b/web/core/modules/forum/forum.services.yml
index 5f56f3d53..885571718 100644
--- a/web/core/modules/forum/forum.services.yml
+++ b/web/core/modules/forum/forum.services.yml
@@ -24,5 +24,5 @@ services:
     class: Drupal\forum\ForumUninstallValidator
     tags:
       - { name: module_install.uninstall_validator }
-    arguments: ['@entity.manager', '@entity.query', '@config.factory', '@string_translation']
+    arguments: ['@entity_type.manager', '@config.factory', '@string_translation']
     lazy: true
diff --git a/web/core/modules/forum/forum.views.inc b/web/core/modules/forum/forum.views.inc
index fa7174f0b..6f2425912 100644
--- a/web/core/modules/forum/forum.views.inc
+++ b/web/core/modules/forum/forum.views.inc
@@ -11,147 +11,147 @@
 function forum_views_data() {
 
   $data['forum_index']['table']['group'] = t('Forum');
-  $data['forum_index']['table']['base'] = array(
+  $data['forum_index']['table']['base'] = [
     'field' => 'nid',
     'title' => t('Forum content'),
     'access query tag' => 'node_access',
-  );
+  ];
 
-  $data['forum_index']['nid'] = array(
+  $data['forum_index']['nid'] = [
     'title' => t('Nid'),
     'help' => t('The content ID of the forum index entry.'),
-    'field' => array(
+    'field' => [
       'id' => 'numeric',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'numeric',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'numeric',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-    'relationship' => array(
+    ],
+    'relationship' => [
       'base' => 'node',
       'base field' => 'nid',
       'label' => t('Node'),
-    ),
-  );
+    ],
+  ];
 
-  $data['forum_index']['title'] = array(
+  $data['forum_index']['title'] = [
     'title' => t('Title'),
     'help' => t('The content title.'),
-    'field' => array(
+    'field' => [
       'id' => 'standard',
       'link_to_node default' => TRUE,
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'string',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'string',
-    ),
-  );
+    ],
+  ];
 
-  $data['forum_index']['tid'] = array(
+  $data['forum_index']['tid'] = [
     'title' => t('Has taxonomy term ID'),
     'help' => t('Display content if it has the selected taxonomy terms.'),
-    'argument' => array(
+    'argument' => [
       'id' => 'taxonomy_index_tid',
       'name table' => 'taxonomy_term_data',
       'name field' => 'name',
       'empty field name' => t('Uncategorized'),
       'numeric' => TRUE,
       'skip base' => 'taxonomy_term_data',
-    ),
-    'field' => array(
+    ],
+    'field' => [
       'id' => 'numeric',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'title' => t('Has taxonomy term'),
       'id' => 'taxonomy_index_tid',
       'hierarchy table' => 'taxonomy_term_hierarchy',
       'numeric' => TRUE,
       'skip base' => 'taxonomy_term_data',
       'allow empty' => TRUE,
-    ),
-    'relationship' => array(
+    ],
+    'relationship' => [
       'base' => 'taxonomy_term',
       'base field' => 'tid',
       'label' => t('Term'),
-    ),
-  );
+    ],
+  ];
 
 
-  $data['forum_index']['created'] = array(
+  $data['forum_index']['created'] = [
     'title' => t('Post date'),
     'help' => t('The date the content was posted.'),
-    'field' => array(
+    'field' => [
       'id' => 'date',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'date'
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'date',
-    ),
-  );
+    ],
+  ];
 
-  $data['forum_index']['sticky'] = array(
+  $data['forum_index']['sticky'] = [
     'title' => t('Sticky'),
     'help' => t('Whether or not the content is sticky.'),
-    'field' => array(
+    'field' => [
       'id' => 'boolean',
       'click sortable' => TRUE,
-      'output formats' => array(
-        'sticky' => array(t('Sticky'), t('Not sticky')),
-      ),
-    ),
-    'filter' => array(
+      'output formats' => [
+        'sticky' => [t('Sticky'), t('Not sticky')],
+      ],
+    ],
+    'filter' => [
       'id' => 'boolean',
       'label' => t('Sticky'),
       'type' => 'yes-no',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
       'help' => t('Whether or not the content is sticky. To list sticky content first, set this to descending.'),
-    ),
-  );
+    ],
+  ];
 
-  $data['forum_index']['last_comment_timestamp'] = array(
+  $data['forum_index']['last_comment_timestamp'] = [
     'title' => t('Last comment time'),
     'help' => t('Date and time of when the last comment was posted.'),
-    'field' => array(
+    'field' => [
       'id' => 'comment_last_timestamp',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'date',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'date',
-    ),
-  );
+    ],
+  ];
 
-  $data['forum_index']['comment_count'] = array(
+  $data['forum_index']['comment_count'] = [
     'title' => t('Comment count'),
     'help' => t('The number of comments a node has.'),
-    'field' => array(
+    'field' => [
       'id' => 'numeric',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'numeric',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
   return $data;
 }
diff --git a/web/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php b/web/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php
index 01e6c49a7..1a359010a 100644
--- a/web/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php
+++ b/web/core/modules/forum/src/Breadcrumb/ForumNodeBreadcrumbBuilder.php
@@ -32,9 +32,9 @@ class ForumNodeBreadcrumbBuilder extends ForumBreadcrumbBuilderBase {
       foreach ($parents as $parent) {
         $breadcrumb->addCacheableDependency($parent);
         $breadcrumb->addLink(Link::createFromRoute($parent->label(), 'forum.page',
-          array(
+          [
             'taxonomy_term' => $parent->id(),
-          )
+          ]
         ));
       }
     }
diff --git a/web/core/modules/forum/src/Controller/ForumController.php b/web/core/modules/forum/src/Controller/ForumController.php
index 0e3d99562..2348872b4 100644
--- a/web/core/modules/forum/src/Controller/ForumController.php
+++ b/web/core/modules/forum/src/Controller/ForumController.php
@@ -207,9 +207,9 @@ class ForumController extends ControllerBase {
    * @return array
    *   A render array.
    */
-  protected function build($forums, TermInterface $term, $topics = array(), $parents = array(), $header = array()) {
+  protected function build($forums, TermInterface $term, $topics = [], $parents = [], $header = []) {
     $config = $this->config('forum.settings');
-    $build = array(
+    $build = [
       '#theme' => 'forums',
       '#forums' => $forums,
       '#topics' => $topics,
@@ -218,9 +218,9 @@ class ForumController extends ControllerBase {
       '#term' => $term,
       '#sortby' => $config->get('topics.order'),
       '#forums_per_page' => $config->get('topics.page_limit'),
-    );
+    ];
     if (empty($term->forum_container->value)) {
-      $build['#attached']['feed'][] = array('taxonomy/term/' . $term->id() . '/feed', 'RSS - ' . $term->getName());
+      $build['#attached']['feed'][] = ['taxonomy/term/' . $term->id() . '/feed', 'RSS - ' . $term->getName()];
     }
     $this->renderer->addCacheableDependency($build, $config);
 
@@ -252,10 +252,10 @@ class ForumController extends ControllerBase {
    */
   public function addForum() {
     $vid = $this->config('forum.settings')->get('vocabulary');
-    $taxonomy_term = $this->termStorage->create(array(
+    $taxonomy_term = $this->termStorage->create([
       'vid' => $vid,
       'forum_controller' => 0,
-    ));
+    ]);
     return $this->entityFormBuilder()->getForm($taxonomy_term, 'forum');
   }
 
@@ -267,10 +267,10 @@ class ForumController extends ControllerBase {
    */
   public function addContainer() {
     $vid = $this->config('forum.settings')->get('vocabulary');
-    $taxonomy_term = $this->termStorage->create(array(
+    $taxonomy_term = $this->termStorage->create([
       'vid' => $vid,
       'forum_container' => 1,
-    ));
+    ]);
     return $this->entityFormBuilder()->getForm($taxonomy_term, 'container');
   }
 
@@ -325,10 +325,10 @@ class ForumController extends ControllerBase {
         $links['login'] = [
           '#attributes' => ['class' => ['action-links']],
           '#theme' => 'menu_local_action',
-          '#link' => array(
+          '#link' => [
             'title' => $this->t('Log in to post new content in the forum.'),
             'url' => Url::fromRoute('user.login', [], ['query' => $this->getDestinationArray()]),
-          ),
+          ],
         ];
       }
     }
diff --git a/web/core/modules/forum/src/Form/DeleteForm.php b/web/core/modules/forum/src/Form/DeleteForm.php
index 752017367..5b3666a84 100644
--- a/web/core/modules/forum/src/Form/DeleteForm.php
+++ b/web/core/modules/forum/src/Form/DeleteForm.php
@@ -30,7 +30,7 @@ class DeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete the forum %label?', array('%label' => $this->taxonomyTerm->label()));
+    return $this->t('Are you sure you want to delete the forum %label?', ['%label' => $this->taxonomyTerm->label()]);
   }
 
   /**
@@ -61,8 +61,8 @@ class DeleteForm extends ConfirmFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->taxonomyTerm->delete();
-    drupal_set_message($this->t('The forum %label and all sub-forums have been deleted.', array('%label' => $this->taxonomyTerm->label())));
-    $this->logger('forum')->notice('forum: deleted %label and all its sub-forums.', array('%label' => $this->taxonomyTerm->label()));
+    drupal_set_message($this->t('The forum %label and all sub-forums have been deleted.', ['%label' => $this->taxonomyTerm->label()]));
+    $this->logger('forum')->notice('forum: deleted %label and all its sub-forums.', ['%label' => $this->taxonomyTerm->label()]);
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
 
diff --git a/web/core/modules/forum/src/Form/ForumForm.php b/web/core/modules/forum/src/Form/ForumForm.php
index 30f0cf146..ed0a7683a 100644
--- a/web/core/modules/forum/src/Form/ForumForm.php
+++ b/web/core/modules/forum/src/Form/ForumForm.php
@@ -50,7 +50,7 @@ class ForumForm extends TermForm {
     $form['parent']['#tree'] = TRUE;
     $form['parent'][0] = $this->forumParentSelect($taxonomy_term->id(), $this->t('Parent'));
 
-    $form['#theme_wrappers'] = array('form__forum');
+    $form['#theme_wrappers'] = ['form__forum'];
     $this->forumFormType = $this->t('forum');
     return $form;
   }
@@ -62,7 +62,7 @@ class ForumForm extends TermForm {
     $term = parent::buildEntity($form, $form_state);
 
     // Assign parents from forum parent select field.
-    $term->parent = array($form_state->getValue(array('parent', 0)));
+    $term->parent = [$form_state->getValue(['parent', 0])];
 
     return $term;
   }
@@ -81,14 +81,14 @@ class ForumForm extends TermForm {
     $view_link = $term->link($term->getName());
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created new @type %term.', array('%term' => $view_link, '@type' => $this->forumFormType)));
-        $this->logger('forum')->notice('Created new @type %term.', array('%term' => $term->getName(), '@type' => $this->forumFormType, 'link' => $link));
+        drupal_set_message($this->t('Created new @type %term.', ['%term' => $view_link, '@type' => $this->forumFormType]));
+        $this->logger('forum')->notice('Created new @type %term.', ['%term' => $term->getName(), '@type' => $this->forumFormType, 'link' => $link]);
         $form_state->setValue('tid', $term->id());
         break;
 
       case SAVED_UPDATED:
-        drupal_set_message($this->t('The @type %term has been updated.', array('%term' => $term->getName(), '@type' => $this->forumFormType)));
-        $this->logger('forum')->notice('Updated @type %term.', array('%term' => $term->getName(), '@type' => $this->forumFormType, 'link' => $link));
+        drupal_set_message($this->t('The @type %term has been updated.', ['%term' => $term->getName(), '@type' => $this->forumFormType]));
+        $this->logger('forum')->notice('Updated @type %term.', ['%term' => $term->getName(), '@type' => $this->forumFormType, 'link' => $link]);
         break;
     }
 
@@ -155,14 +155,14 @@ class ForumForm extends TermForm {
 
     $description = $this->t('Forums may be placed at the top (root) level, or inside another container or forum.');
 
-    return array(
+    return [
       '#type' => 'select',
       '#title' => $title,
       '#default_value' => $parent,
       '#options' => $options,
       '#description' => $description,
       '#required' => TRUE,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/forum/src/Form/Overview.php b/web/core/modules/forum/src/Form/Overview.php
index ba9c033de..df6f94725 100644
--- a/web/core/modules/forum/src/Form/Overview.php
+++ b/web/core/modules/forum/src/Form/Overview.php
@@ -80,10 +80,10 @@ class Overview extends OverviewTerms {
     unset($form['actions']['reset_alphabetical']);
 
     // Use the existing taxonomy overview submit handler.
-    $form['terms']['#empty'] = $this->t('No containers or forums available. <a href=":container">Add container</a> or <a href=":forum">Add forum</a>.', array(
+    $form['terms']['#empty'] = $this->t('No containers or forums available. <a href=":container">Add container</a> or <a href=":forum">Add forum</a>.', [
       ':container' => $this->url('forum.add_container'),
       ':forum' => $this->url('forum.add_forum')
-    ));
+    ]);
     return $form;
   }
 
diff --git a/web/core/modules/forum/src/ForumIndexStorage.php b/web/core/modules/forum/src/ForumIndexStorage.php
index 35b2274b7..79945746c 100644
--- a/web/core/modules/forum/src/ForumIndexStorage.php
+++ b/web/core/modules/forum/src/ForumIndexStorage.php
@@ -23,7 +23,7 @@ class ForumIndexStorage implements ForumIndexStorageInterface {
    * @param \Drupal\Core\Database\Connection $database
    *   The current database connection.
    */
-  function __construct(Connection $database) {
+  public function __construct(Connection $database) {
     $this->database = $database;
   }
 
@@ -31,7 +31,7 @@ class ForumIndexStorage implements ForumIndexStorageInterface {
    * {@inheritdoc}
    */
   public function getOriginalTermId(NodeInterface $node) {
-    return $this->database->queryRange("SELECT f.tid FROM {forum} f INNER JOIN {node} n ON f.vid = n.vid WHERE n.nid = :nid ORDER BY f.vid DESC", 0, 1, array(':nid' => $node->id()))->fetchField();
+    return $this->database->queryRange("SELECT f.tid FROM {forum} f INNER JOIN {node} n ON f.vid = n.vid WHERE n.nid = :nid ORDER BY f.vid DESC", 0, 1, [':nid' => $node->id()])->fetchField();
   }
 
   /**
@@ -39,11 +39,11 @@ class ForumIndexStorage implements ForumIndexStorageInterface {
    */
   public function create(NodeInterface $node) {
     $this->database->insert('forum')
-      ->fields(array(
+      ->fields([
         'tid' => $node->forum_tid,
         'vid' => $node->getRevisionId(),
         'nid' => $node->id(),
-      ))
+      ])
       ->execute();
   }
 
@@ -52,7 +52,7 @@ class ForumIndexStorage implements ForumIndexStorageInterface {
    */
   public function read(array $vids) {
     return $this->database->select('forum', 'f')
-      ->fields('f', array('nid', 'tid'))
+      ->fields('f', ['nid', 'tid'])
       ->condition('f.vid', $vids, 'IN')
       ->execute();
   }
@@ -81,7 +81,7 @@ class ForumIndexStorage implements ForumIndexStorageInterface {
    */
   public function update(NodeInterface $node) {
     $this->database->update('forum')
-      ->fields(array('tid' => $node->forum_tid))
+      ->fields(['tid' => $node->forum_tid])
       ->condition('vid', $node->getRevisionId())
       ->execute();
   }
@@ -91,22 +91,22 @@ class ForumIndexStorage implements ForumIndexStorageInterface {
    */
   public function updateIndex(NodeInterface $node) {
     $nid = $node->id();
-    $count = $this->database->query("SELECT COUNT(cid) FROM {comment_field_data} c INNER JOIN {forum_index} i ON c.entity_id = i.nid WHERE c.entity_id = :nid AND c.field_name = 'comment_forum' AND c.entity_type = 'node' AND c.status = :status AND c.default_langcode = 1", array(
+    $count = $this->database->query("SELECT COUNT(cid) FROM {comment_field_data} c INNER JOIN {forum_index} i ON c.entity_id = i.nid WHERE c.entity_id = :nid AND c.field_name = 'comment_forum' AND c.entity_type = 'node' AND c.status = :status AND c.default_langcode = 1", [
       ':nid' => $nid,
       ':status' => CommentInterface::PUBLISHED,
-    ))->fetchField();
+    ])->fetchField();
 
     if ($count > 0) {
       // Comments exist.
-      $last_reply = $this->database->queryRange("SELECT cid, name, created, uid FROM {comment_field_data} WHERE entity_id = :nid AND field_name = 'comment_forum' AND entity_type = 'node' AND status = :status AND default_langcode = 1 ORDER BY cid DESC", 0, 1, array(
+      $last_reply = $this->database->queryRange("SELECT cid, name, created, uid FROM {comment_field_data} WHERE entity_id = :nid AND field_name = 'comment_forum' AND entity_type = 'node' AND status = :status AND default_langcode = 1 ORDER BY cid DESC", 0, 1, [
         ':nid' => $nid,
         ':status' => CommentInterface::PUBLISHED,
-      ))->fetchObject();
+      ])->fetchObject();
       $this->database->update('forum_index')
-        ->fields( array(
+        ->fields( [
           'comment_count' => $count,
           'last_comment_timestamp' => $last_reply->created,
-        ))
+        ])
         ->condition('nid', $nid)
         ->execute();
     }
@@ -114,10 +114,10 @@ class ForumIndexStorage implements ForumIndexStorageInterface {
       // Comments do not exist.
       // @todo This should be actually filtering on the desired node language
       $this->database->update('forum_index')
-        ->fields( array(
+        ->fields( [
           'comment_count' => 0,
           'last_comment_timestamp' => $node->getCreatedTime(),
-        ))
+        ])
         ->condition('nid', $nid)
         ->execute();
     }
@@ -128,11 +128,11 @@ class ForumIndexStorage implements ForumIndexStorageInterface {
    */
   public function createIndex(NodeInterface $node) {
     $query = $this->database->insert('forum_index')
-      ->fields(array('nid', 'title', 'tid', 'sticky', 'created', 'comment_count', 'last_comment_timestamp'));
+      ->fields(['nid', 'title', 'tid', 'sticky', 'created', 'comment_count', 'last_comment_timestamp']);
     foreach ($node->getTranslationLanguages() as $langcode => $language) {
       $translation = $node->getTranslation($langcode);
       foreach ($translation->taxonomy_forums as $item) {
-        $query->values(array(
+        $query->values([
           'nid' => $node->id(),
           'title' => $translation->label(),
           'tid' => $item->target_id,
@@ -140,7 +140,7 @@ class ForumIndexStorage implements ForumIndexStorageInterface {
           'created' => $node->getCreatedTime(),
           'comment_count' => 0,
           'last_comment_timestamp' => $node->getCreatedTime(),
-        ));
+        ]);
       }
     }
     $query->execute();
diff --git a/web/core/modules/forum/src/ForumManager.php b/web/core/modules/forum/src/ForumManager.php
index 9fe49a841..05cd86076 100644
--- a/web/core/modules/forum/src/ForumManager.php
+++ b/web/core/modules/forum/src/ForumManager.php
@@ -75,28 +75,28 @@ class ForumManager implements ForumManagerInterface {
    *
    * @var array
    */
-  protected $lastPostData = array();
+  protected $lastPostData = [];
 
   /**
    * Array of forum statistics keyed by forum (term) id.
    *
    * @var array
    */
-  protected $forumStatistics = array();
+  protected $forumStatistics = [];
 
   /**
    * Array of forum children keyed by parent forum (term) id.
    *
    * @var array
    */
-  protected $forumChildren = array();
+  protected $forumChildren = [];
 
   /**
    * Array of history keyed by nid.
    *
    * @var array
    */
-  protected $history = array();
+  protected $history = [];
 
   /**
    * Cached forum index.
@@ -135,11 +135,11 @@ class ForumManager implements ForumManagerInterface {
     $forum_per_page = $config->get('topics.page_limit');
     $sortby = $config->get('topics.order');
 
-    $header = array(
-      array('data' => $this->t('Topic'), 'field' => 'f.title'),
-      array('data' => $this->t('Replies'), 'field' => 'f.comment_count'),
-      array('data' => $this->t('Last reply'), 'field' => 'f.last_comment_timestamp'),
-    );
+    $header = [
+      ['data' => $this->t('Topic'), 'field' => 'f.title'],
+      ['data' => $this->t('Replies'), 'field' => 'f.comment_count'],
+      ['data' => $this->t('Last reply'), 'field' => 'f.last_comment_timestamp'],
+    ];
 
     $order = $this->getTopicOrder($sortby);
     for ($i = 0; $i < count($header); $i++) {
@@ -168,7 +168,7 @@ class ForumManager implements ForumManagerInterface {
 
     $query->setCountQuery($count_query);
     $result = $query->execute();
-    $nids = array();
+    $nids = [];
     foreach ($result as $record) {
       $nids[] = $record->nid;
     }
@@ -177,15 +177,15 @@ class ForumManager implements ForumManagerInterface {
 
       $query = $this->connection->select('node_field_data', 'n')
         ->extend('Drupal\Core\Database\Query\TableSortExtender');
-      $query->fields('n', array('nid'));
+      $query->fields('n', ['nid']);
 
       $query->join('comment_entity_statistics', 'ces', "n.nid = ces.entity_id AND ces.field_name = 'comment_forum' AND ces.entity_type = 'node'");
-      $query->fields('ces', array(
+      $query->fields('ces', [
         'cid',
         'last_comment_uid',
         'last_comment_timestamp',
         'comment_count'
-      ));
+      ]);
 
       $query->join('forum_index', 'f', 'f.nid = n.nid');
       $query->addField('f', 'tid', 'forum_tid');
@@ -205,7 +205,7 @@ class ForumManager implements ForumManagerInterface {
         //   and just fall back to the default language.
         ->condition('n.default_langcode', 1);
 
-      $result = array();
+      $result = [];
       foreach ($query->execute() as $row) {
         $topic = $nodes[$row->nid];
         $topic->comment_mode = $topic->comment_forum->status;
@@ -217,10 +217,10 @@ class ForumManager implements ForumManagerInterface {
       }
     }
     else {
-      $result = array();
+      $result = [];
     }
 
-    $topics = array();
+    $topics = [];
     $first_new_found = FALSE;
     foreach ($result as $topic) {
       if ($account->isAuthenticated()) {
@@ -258,7 +258,7 @@ class ForumManager implements ForumManagerInterface {
       $topics[$topic->id()] = $topic;
     }
 
-    return array('topics' => $topics, 'header' => $header);
+    return ['topics' => $topics, 'header' => $header];
 
   }
 
@@ -280,16 +280,16 @@ class ForumManager implements ForumManagerInterface {
   protected function getTopicOrder($sortby) {
     switch ($sortby) {
       case static::NEWEST_FIRST:
-        return array('field' => 'f.last_comment_timestamp', 'sort' => 'desc');
+        return ['field' => 'f.last_comment_timestamp', 'sort' => 'desc'];
 
       case static::OLDEST_FIRST:
-        return array('field' => 'f.last_comment_timestamp', 'sort' => 'asc');
+        return ['field' => 'f.last_comment_timestamp', 'sort' => 'asc'];
 
       case static::MOST_POPULAR_FIRST:
-        return array('field' => 'f.comment_count', 'sort' => 'desc');
+        return ['field' => 'f.comment_count', 'sort' => 'desc'];
 
       case static::LEAST_POPULAR_FIRST:
-        return array('field' => 'f.comment_count', 'sort' => 'asc');
+        return ['field' => 'f.comment_count', 'sort' => 'asc'];
 
     }
   }
@@ -309,7 +309,7 @@ class ForumManager implements ForumManagerInterface {
   protected function lastVisit($nid, AccountInterface $account) {
     if (empty($this->history[$nid])) {
       $result = $this->connection->select('history', 'h')
-        ->fields('h', array('nid', 'timestamp'))
+        ->fields('h', ['nid', 'timestamp'])
         ->condition('uid', $account->id())
         ->execute();
       foreach ($result as $t) {
@@ -334,13 +334,13 @@ class ForumManager implements ForumManagerInterface {
     }
     // Query "Last Post" information for this forum.
     $query = $this->connection->select('node_field_data', 'n');
-    $query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', array(':tid' => $tid));
+    $query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', [':tid' => $tid]);
     $query->join('comment_entity_statistics', 'ces', "n.nid = ces.entity_id AND ces.field_name = 'comment_forum' AND ces.entity_type = 'node'");
     $query->join('users_field_data', 'u', 'ces.last_comment_uid = u.uid AND u.default_langcode = 1');
     $query->addExpression('CASE ces.last_comment_uid WHEN 0 THEN ces.last_comment_name ELSE u.name END', 'last_comment_name');
 
     $topic = $query
-      ->fields('ces', array('last_comment_timestamp', 'last_comment_uid'))
+      ->fields('ces', ['last_comment_timestamp', 'last_comment_uid'])
       ->condition('n.status', 1)
       ->orderBy('last_comment_timestamp', 'DESC')
       ->range(0, 1)
@@ -378,7 +378,7 @@ class ForumManager implements ForumManagerInterface {
       $query->addExpression('COUNT(n.nid)', 'topic_count');
       $query->addExpression('SUM(ces.comment_count)', 'comment_count');
       $this->forumStatistics = $query
-        ->fields('f', array('tid'))
+        ->fields('f', ['tid'])
         ->condition('n.status', 1)
         ->condition('n.default_langcode', 1)
         ->groupBy('tid')
@@ -399,7 +399,7 @@ class ForumManager implements ForumManagerInterface {
     if (!empty($this->forumChildren[$tid])) {
       return $this->forumChildren[$tid];
     }
-    $forums = array();
+    $forums = [];
     $_forums = $this->entityManager->getStorage('taxonomy_term')->loadTree($vid, $tid, NULL, TRUE);
     foreach ($_forums as $forum) {
       // Merge in the topic and post counters.
@@ -430,13 +430,13 @@ class ForumManager implements ForumManagerInterface {
     }
 
     $vid = $this->configFactory->get('forum.settings')->get('vocabulary');
-    $index = $this->entityManager->getStorage('taxonomy_term')->create(array(
+    $index = $this->entityManager->getStorage('taxonomy_term')->create([
       'tid' => 0,
       'container' => 1,
-      'parents' => array(),
+      'parents' => [],
       'isIndex' => TRUE,
       'vid' => $vid
-    ));
+    ]);
 
     // Load the tree below.
     $index->forums = $this->getChildren($vid, 0);
@@ -451,7 +451,7 @@ class ForumManager implements ForumManagerInterface {
     // Reset the index.
     $this->index = NULL;
     // Reset history.
-    $this->history = array();
+    $this->history = [];
   }
 
   /**
@@ -475,8 +475,8 @@ class ForumManager implements ForumManagerInterface {
    */
   public function unreadTopics($term, $uid) {
     $query = $this->connection->select('node_field_data', 'n');
-    $query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', array(':tid' => $term));
-    $query->leftJoin('history', 'h', 'n.nid = h.nid AND h.uid = :uid', array(':uid' => $uid));
+    $query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', [':tid' => $term]);
+    $query->leftJoin('history', 'h', 'n.nid = h.nid AND h.uid = :uid', [':uid' => $uid]);
     $query->addExpression('COUNT(n.nid)', 'count');
     return $query
       ->condition('status', 1)
@@ -506,10 +506,10 @@ class ForumManager implements ForumManagerInterface {
   public function __wakeup() {
     $this->defaultWakeup();
     // Initialize static cache.
-    $this->history = array();
-    $this->lastPostData = array();
-    $this->forumChildren = array();
-    $this->forumStatistics = array();
+    $this->history = [];
+    $this->lastPostData = [];
+    $this->forumChildren = [];
+    $this->forumStatistics = [];
     $this->index = NULL;
   }
 
diff --git a/web/core/modules/forum/src/ForumSettingsForm.php b/web/core/modules/forum/src/ForumSettingsForm.php
index ac9b325cf..12bb551ff 100644
--- a/web/core/modules/forum/src/ForumSettingsForm.php
+++ b/web/core/modules/forum/src/ForumSettingsForm.php
@@ -30,35 +30,35 @@ class ForumSettingsForm extends ConfigFormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $config = $this->config('forum.settings');
 
-    $options = array(5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100, 150, 200, 250, 300, 350, 400, 500);
-    $form['forum_hot_topic'] = array(
+    $options = [5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100, 150, 200, 250, 300, 350, 400, 500];
+    $form['forum_hot_topic'] = [
       '#type' => 'select',
       '#title' => $this->t('Hot topic threshold'),
       '#default_value' => $config->get('topics.hot_threshold'),
       '#options' => array_combine($options, $options),
       '#description' => $this->t('The number of replies a topic must have to be considered "hot".'),
-    );
-    $options = array(10, 25, 50, 75, 100);
-    $form['forum_per_page'] = array(
+    ];
+    $options = [10, 25, 50, 75, 100];
+    $form['forum_per_page'] = [
       '#type' => 'select',
       '#title' => $this->t('Topics per page'),
       '#default_value' => $config->get('topics.page_limit'),
       '#options' => array_combine($options, $options),
       '#description' => $this->t('Default number of forum topics displayed per page.'),
-    );
-    $forder = array(
+    ];
+    $forder = [
       1 => $this->t('Date - newest first'),
       2 => $this->t('Date - oldest first'),
       3 => $this->t('Posts - most active first'),
       4 => $this->t('Posts - least active first')
-    );
-    $form['forum_order'] = array(
+    ];
+    $form['forum_order'] = [
       '#type' => 'radios',
       '#title' => $this->t('Default order'),
       '#default_value' => $config->get('topics.order'),
       '#options' => $forder,
       '#description' => $this->t('Default display order for topics.'),
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/forum/src/ForumUninstallValidator.php b/web/core/modules/forum/src/ForumUninstallValidator.php
index b2bb98b37..8ee0310fe 100644
--- a/web/core/modules/forum/src/ForumUninstallValidator.php
+++ b/web/core/modules/forum/src/ForumUninstallValidator.php
@@ -3,8 +3,7 @@
 namespace Drupal\forum;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Extension\ModuleUninstallValidatorInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
@@ -19,18 +18,11 @@ class ForumUninstallValidator implements ModuleUninstallValidatorInterface {
   use StringTranslationTrait;
 
   /**
-   * The field storage config storage.
+   * The entity type manager.
    *
-   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $vocabularyStorage;
-
-  /**
-   * The entity query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
+  protected $entityTypeManager;
 
   /**
    * The config factory.
@@ -42,18 +34,15 @@ class ForumUninstallValidator implements ModuleUninstallValidatorInterface {
   /**
    * Constructs a new ForumUninstallValidator.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The config factory.
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The string translation service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, QueryFactory $query_factory, ConfigFactoryInterface $config_factory, TranslationInterface $string_translation) {
-    $this->vocabularyStorage = $entity_manager->getStorage('taxonomy_vocabulary');
-    $this->queryFactory = $query_factory;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, ConfigFactoryInterface $config_factory, TranslationInterface $string_translation) {
+    $this->entityTypeManager = $entity_type_manager;
     $this->configFactory = $config_factory;
     $this->stringTranslation = $string_translation;
   }
@@ -94,7 +83,7 @@ class ForumUninstallValidator implements ModuleUninstallValidatorInterface {
    *   TRUE if there are forum nodes, FALSE otherwise.
    */
   protected function hasForumNodes() {
-    $nodes = $this->queryFactory->get('node')
+    $nodes = $this->entityTypeManager->getStorage('node')->getQuery()
       ->condition('type', 'forum')
       ->accessCheck(FALSE)
       ->range(0, 1)
@@ -112,7 +101,7 @@ class ForumUninstallValidator implements ModuleUninstallValidatorInterface {
    *   TRUE if there are terms for this vocabulary, FALSE otherwise.
    */
   protected function hasTermsForVocabulary(VocabularyInterface $vocabulary) {
-    $terms = $this->queryFactory->get('taxonomy_term')
+    $terms = $this->entityTypeManager->getStorage('taxonomy_term')->getQuery()
       ->condition('vid', $vocabulary->id())
       ->accessCheck(FALSE)
       ->range(0, 1)
@@ -128,7 +117,7 @@ class ForumUninstallValidator implements ModuleUninstallValidatorInterface {
    */
   protected function getForumVocabulary() {
     $vid = $this->configFactory->get('forum.settings')->get('vocabulary');
-    return $this->vocabularyStorage->load($vid);
+    return $this->entityTypeManager->getStorage('taxonomy_vocabulary')->load($vid);
   }
 
 }
diff --git a/web/core/modules/forum/src/Plugin/Block/ForumBlockBase.php b/web/core/modules/forum/src/Plugin/Block/ForumBlockBase.php
index e65f1df94..8095ceffb 100644
--- a/web/core/modules/forum/src/Plugin/Block/ForumBlockBase.php
+++ b/web/core/modules/forum/src/Plugin/Block/ForumBlockBase.php
@@ -19,14 +19,14 @@ abstract class ForumBlockBase extends BlockBase {
    */
   public function build() {
     $result = $this->buildForumQuery()->execute();
-    $elements = array();
+    $elements = [];
     if ($node_title_list = node_title_list($result)) {
       $elements['forum_list'] = $node_title_list;
-      $elements['forum_more'] = array(
+      $elements['forum_more'] = [
         '#type' => 'more_link',
         '#url' => Url::fromRoute('forum.index'),
-        '#attributes' => array('title' => $this->t('Read the latest forum topics.')),
-      );
+        '#attributes' => ['title' => $this->t('Read the latest forum topics.')],
+      ];
     }
     return $elements;
   }
@@ -43,12 +43,12 @@ abstract class ForumBlockBase extends BlockBase {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
-      'properties' => array(
+    return [
+      'properties' => [
         'administrative' => TRUE,
-      ),
+      ],
       'block_count' => 5,
-    );
+    ];
   }
 
   /**
@@ -63,12 +63,12 @@ abstract class ForumBlockBase extends BlockBase {
    */
   public function blockForm($form, FormStateInterface $form_state) {
     $range = range(2, 20);
-    $form['block_count'] = array(
+    $form['block_count'] = [
       '#type' => 'select',
       '#title' => $this->t('Number of topics'),
       '#default_value' => $this->configuration['block_count'],
       '#options' => array_combine($range, $range),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/forum/src/Plugin/Validation/Constraint/ForumLeafConstraintValidator.php b/web/core/modules/forum/src/Plugin/Validation/Constraint/ForumLeafConstraintValidator.php
index 761dc0f72..95603d844 100644
--- a/web/core/modules/forum/src/Plugin/Validation/Constraint/ForumLeafConstraintValidator.php
+++ b/web/core/modules/forum/src/Plugin/Validation/Constraint/ForumLeafConstraintValidator.php
@@ -26,7 +26,7 @@ class ForumLeafConstraintValidator extends ConstraintValidator {
 
     // The forum_container flag must not be set.
     if (!empty($item->entity->forum_container->value)) {
-      $this->context->addViolation($constraint->noLeafMessage, array('%forum' => $item->entity->getName()));
+      $this->context->addViolation($constraint->noLeafMessage, ['%forum' => $item->entity->getName()]);
     }
   }
 
diff --git a/web/core/modules/forum/src/Tests/Views/ForumIntegrationTest.php b/web/core/modules/forum/src/Tests/Views/ForumIntegrationTest.php
index 55025749a..f5677e41b 100644
--- a/web/core/modules/forum/src/Tests/Views/ForumIntegrationTest.php
+++ b/web/core/modules/forum/src/Tests/Views/ForumIntegrationTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\forum\Tests\Views;
 
+use Drupal\node\NodeInterface;
 use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
@@ -18,19 +19,19 @@ class ForumIntegrationTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('forum_test_views');
+  public static $modules = ['forum_test_views'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_forum_index');
+  public static $testViews = ['test_forum_index'];
 
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('forum_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['forum_test_views']);
   }
 
 
@@ -40,25 +41,25 @@ class ForumIntegrationTest extends ViewTestBase {
   public function testForumIntegration() {
     // Create a forum.
     $entity_manager = $this->container->get('entity.manager');
-    $term = $entity_manager->getStorage('taxonomy_term')->create(array('vid' => 'forums', 'name' => $this->randomMachineName()));
+    $term = $entity_manager->getStorage('taxonomy_term')->create(['vid' => 'forums', 'name' => $this->randomMachineName()]);
     $term->save();
 
     $comment_storage = $entity_manager->getStorage('comment');
 
     // Create some nodes which are part of this forum with some comments.
-    $nodes = array();
+    $nodes = [];
     for ($i = 0; $i < 3; $i++) {
-      $node = $this->drupalCreateNode(array('type' => 'forum', 'taxonomy_forums' => array($term->id()), 'sticky' => $i == 0 ? NODE_STICKY : NODE_NOT_STICKY));
+      $node = $this->drupalCreateNode(['type' => 'forum', 'taxonomy_forums' => [$term->id()], 'sticky' => $i == 0 ? NodeInterface::STICKY : NodeInterface::NOT_STICKY]);
       $nodes[] = $node;
     }
 
-    $account = $this->drupalCreateUser(array('skip comment approval'));
+    $account = $this->drupalCreateUser(['skip comment approval']);
     $this->drupalLogin($account);
 
-    $comments = array();
+    $comments = [];
     foreach ($nodes as $index => $node) {
       for ($i = 0; $i <= $index; $i++) {
-        $comment = $comment_storage->create(array('entity_type' => 'node', 'entity_id' => $node->id(), 'field_name' => 'comment_forum'));
+        $comment = $comment_storage->create(['entity_type' => 'node', 'entity_id' => $node->id(), 'field_name' => 'comment_forum']);
         $comment->save();
         $comments[$comment->get('entity_id')->target_id][$comment->id()] = $comment;
       }
@@ -67,27 +68,27 @@ class ForumIntegrationTest extends ViewTestBase {
     $view = Views::getView('test_forum_index');
     $this->executeView($view);
 
-    $expected_result = array();
-    $expected_result[] = array(
+    $expected_result = [];
+    $expected_result[] = [
       'nid' => $nodes[0]->id(),
-      'sticky' => NODE_STICKY,
+      'sticky' => NodeInterface::STICKY,
       'comment_count' => 1.
-    );
-    $expected_result[] = array(
+    ];
+    $expected_result[] = [
       'nid' => $nodes[1]->id(),
-      'sticky' => NODE_NOT_STICKY,
+      'sticky' => NodeInterface::NOT_STICKY,
       'comment_count' => 2.
-    );
-    $expected_result[] = array(
+    ];
+    $expected_result[] = [
       'nid' => $nodes[2]->id(),
-      'sticky' => NODE_NOT_STICKY,
+      'sticky' => NodeInterface::NOT_STICKY,
       'comment_count' => 3.
-    );
-    $column_map = array(
+    ];
+    $column_map = [
       'nid' => 'nid',
       'forum_index_sticky' => 'sticky',
       'forum_index_comment_count' => 'comment_count',
-    );
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $column_map);
   }
 
diff --git a/web/core/modules/forum/src/Tests/ForumBlockTest.php b/web/core/modules/forum/tests/src/Functional/ForumBlockTest.php
similarity index 83%
rename from web/core/modules/forum/src/Tests/ForumBlockTest.php
rename to web/core/modules/forum/tests/src/Functional/ForumBlockTest.php
index 1bcc9bc8d..6c412b71c 100644
--- a/web/core/modules/forum/src/Tests/ForumBlockTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumBlockTest.php
@@ -1,24 +1,24 @@
 <?php
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum\Functional;
 
-use Drupal\simpletest\WebTestBase;
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\comment\Entity\Comment;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the forum blocks.
  *
  * @group forum
  */
-class ForumBlockTest extends WebTestBase {
+class ForumBlockTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('forum', 'block');
+  public static $modules = ['forum', 'block'];
 
   /**
    * A user with various administrative privileges.
@@ -29,14 +29,14 @@ class ForumBlockTest extends WebTestBase {
     parent::setUp();
 
     // Create users.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'access administration pages',
       'administer blocks',
       'administer nodes',
       'create forum content',
       'post comments',
       'skip comment approval',
-    ));
+    ]);
   }
 
   /**
@@ -58,7 +58,7 @@ class ForumBlockTest extends WebTestBase {
 
     // We expect all 5 forum topics to appear in the "New forum topics" block.
     foreach ($topics as $topic) {
-      $this->assertLink($topic, 0, format_string('Forum topic @topic found in the "New forum topics" block.', array('@topic' => $topic)));
+      $this->assertLink($topic, 0, format_string('Forum topic @topic found in the "New forum topics" block.', ['@topic' => $topic]));
     }
 
     // Configure the new forum topics block to only show 2 topics.
@@ -69,11 +69,11 @@ class ForumBlockTest extends WebTestBase {
     // We expect only the 2 most recent forum topics to appear in the "New forum
     // topics" block.
     for ($index = 0; $index < 5; $index++) {
-      if (in_array($index, array(3, 4))) {
-        $this->assertLink($topics[$index], 0, format_string('Forum topic @topic found in the "New forum topics" block.', array('@topic' => $topics[$index])));
+      if (in_array($index, [3, 4])) {
+        $this->assertLink($topics[$index], 0, format_string('Forum topic @topic found in the "New forum topics" block.', ['@topic' => $topics[$index]]));
       }
       else {
-        $this->assertNoText($topics[$index], format_string('Forum topic @topic not found in the "New forum topics" block.', array('@topic' => $topics[$index])));
+        $this->assertNoText($topics[$index], format_string('Forum topic @topic not found in the "New forum topics" block.', ['@topic' => $topics[$index]]));
       }
     }
   }
@@ -93,7 +93,7 @@ class ForumBlockTest extends WebTestBase {
       // Get the node from the topic title.
       $node = $this->drupalGetNodeByTitle($topics[$index]);
       $date->modify('+1 minute');
-      $comment = Comment::create(array(
+      $comment = Comment::create([
         'entity_id' => $node->id(),
         'field_name' => 'comment_forum',
         'entity_type' => 'node',
@@ -101,7 +101,7 @@ class ForumBlockTest extends WebTestBase {
         'subject' => $this->randomString(20),
         'comment_body' => $this->randomString(256),
         'created' => $date->getTimestamp(),
-      ));
+      ]);
       $comment->save();
     }
 
@@ -116,10 +116,10 @@ class ForumBlockTest extends WebTestBase {
     $this->drupalGet('<front>');
     for ($index = 0; $index < 10; $index++) {
       if ($index < 5) {
-        $this->assertLink($topics[$index], 0, format_string('Forum topic @topic found in the "Active forum topics" block.', array('@topic' => $topics[$index])));
+        $this->assertLink($topics[$index], 0, format_string('Forum topic @topic found in the "Active forum topics" block.', ['@topic' => $topics[$index]]));
       }
       else {
-        $this->assertNoText($topics[$index], format_string('Forum topic @topic not found in the "Active forum topics" block.', array('@topic' => $topics[$index])));
+        $this->assertNoText($topics[$index], format_string('Forum topic @topic not found in the "Active forum topics" block.', ['@topic' => $topics[$index]]));
       }
     }
 
@@ -132,7 +132,7 @@ class ForumBlockTest extends WebTestBase {
     // We expect only the 2 forum topics with most recent comments to appear in
     // the "Active forum topics" block.
     for ($index = 0; $index < 10; $index++) {
-      if (in_array($index, array(3, 4))) {
+      if (in_array($index, [3, 4])) {
         $this->assertLink($topics[$index], 0, 'Forum topic found in the "Active forum topics" block.');
       }
       else {
@@ -148,7 +148,7 @@ class ForumBlockTest extends WebTestBase {
    *   The title of the newly generated topic.
    */
   protected function createForumTopics($count = 5) {
-    $topics = array();
+    $topics = [];
     $date = new DrupalDateTime();
     $date->modify('-24 hours');
 
@@ -160,17 +160,17 @@ class ForumBlockTest extends WebTestBase {
       // changing the date.
       $date->modify('+1 minute');
 
-      $edit = array(
+      $edit = [
         'title[0][value]' => $title,
         'body[0][value]' => $body,
         // Forum posts are ordered by timestamp, so force a unique timestamp by
         // adding the index.
         'created[0][value][date]' => $date->format('Y-m-d'),
         'created[0][value][time]' => $date->format('H:i:s'),
-      );
+      ];
 
       // Create the forum topic, preselecting the forum ID via a URL parameter.
-      $this->drupalPostForm('node/add/forum', $edit, t('Save and publish'), array('query' => array('forum_id' => 1)));
+      $this->drupalPostForm('node/add/forum', $edit, t('Save and publish'), ['query' => ['forum_id' => 1]]);
       $topics[] = $title;
     }
 
diff --git a/web/core/modules/forum/src/Tests/ForumIndexTest.php b/web/core/modules/forum/tests/src/Functional/ForumIndexTest.php
similarity index 80%
rename from web/core/modules/forum/src/Tests/ForumIndexTest.php
rename to web/core/modules/forum/tests/src/Functional/ForumIndexTest.php
index 8ead34f6d..53c8364db 100644
--- a/web/core/modules/forum/src/Tests/ForumIndexTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumIndexTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the forum index listing.
  *
  * @group forum
  */
-class ForumIndexTest extends WebTestBase {
+class ForumIndexTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('taxonomy', 'comment', 'forum');
+  public static $modules = ['taxonomy', 'comment', 'forum'];
 
   protected function setUp() {
     parent::setUp();
@@ -29,21 +29,21 @@ class ForumIndexTest extends WebTestBase {
   /**
    * Tests the forum index for published and unpublished nodes.
    */
-  function testForumIndexStatus() {
+  public function testForumIndexStatus() {
     // The forum ID to use.
     $tid = 1;
 
     // Create a test node.
     $title = $this->randomMachineName(20);
-    $edit = array(
+    $edit = [
       'title[0][value]' => $title,
       'body[0][value]' => $this->randomMachineName(200),
-    );
+    ];
 
     // Create the forum topic, preselecting the forum ID via a URL parameter.
     $this->drupalGet("forum/$tid");
-    $this->clickLink(t('Add new @node_type', array('@node_type' => 'Forum topic')));
-    $this->assertUrl('node/add/forum', array('query' => array('forum_id' => $tid)));
+    $this->clickLink(t('Add new @node_type', ['@node_type' => 'Forum topic']));
+    $this->assertUrl('node/add/forum', ['query' => ['forum_id' => $tid]]);
     $this->drupalPostForm(NULL, $edit, t('Save and publish'));
 
     // Check that the node exists in the database.
@@ -51,11 +51,11 @@ class ForumIndexTest extends WebTestBase {
     $this->assertTrue(!empty($node), 'New forum node found in database.');
 
     // Create a child forum.
-    $edit = array(
+    $edit = [
       'name[0][value]' => $this->randomMachineName(20),
       'description[0][value]' => $this->randomMachineName(200),
       'parent[0]' => $tid,
-    );
+    ];
     $this->drupalPostForm('admin/structure/forum/add/forum', $edit, t('Save'));
     $tid_child = $tid + 1;
 
@@ -71,7 +71,7 @@ class ForumIndexTest extends WebTestBase {
 
 
     // Unpublish the node.
-    $this->drupalPostForm('node/' . $node->id() . '/edit', array(), t('Save and unpublish'));
+    $this->drupalPostForm('node/' . $node->id() . '/edit', [], t('Save and unpublish'));
     $this->drupalGet('node/' . $node->id());
     $this->assertText(t('Access denied'), 'Unpublished node is no longer accessible.');
 
diff --git a/web/core/modules/forum/src/Tests/ForumNodeAccessTest.php b/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
similarity index 75%
rename from web/core/modules/forum/src/Tests/ForumNodeAccessTest.php
rename to web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
index 8eda2528e..fb9da660b 100644
--- a/web/core/modules/forum/src/Tests/ForumNodeAccessTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\node\Entity\NodeType;
 
 /**
@@ -10,14 +10,14 @@ use Drupal\node\Entity\NodeType;
  *
  * @group forum
  */
-class ForumNodeAccessTest extends WebTestBase {
+class ForumNodeAccessTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'comment', 'forum', 'taxonomy', 'tracker', 'node_access_test', 'block');
+  public static $modules = ['node', 'comment', 'forum', 'taxonomy', 'tracker', 'node_access_test', 'block'];
 
   protected function setUp() {
     parent::setUp();
@@ -32,32 +32,32 @@ class ForumNodeAccessTest extends WebTestBase {
    * Adds both active forum topics and new forum topics blocks to the sidebar.
    * Tests to ensure private node/public node access is respected on blocks.
    */
-  function testForumNodeAccess() {
+  public function testForumNodeAccess() {
     // Create some users.
-    $access_user = $this->drupalCreateUser(array('node test view'));
+    $access_user = $this->drupalCreateUser(['node test view']);
     $no_access_user = $this->drupalCreateUser();
-    $admin_user = $this->drupalCreateUser(array('access administration pages', 'administer modules', 'administer blocks', 'create forum content'));
+    $admin_user = $this->drupalCreateUser(['access administration pages', 'administer modules', 'administer blocks', 'create forum content']);
 
     $this->drupalLogin($admin_user);
 
     // Create a private node.
     $private_node_title = $this->randomMachineName(20);
-    $edit = array(
+    $edit = [
       'title[0][value]' => $private_node_title,
       'body[0][value]' => $this->randomMachineName(200),
       'private[0][value]' => TRUE,
-    );
-    $this->drupalPostForm('node/add/forum', $edit, t('Save'), array('query' => array('forum_id' => 1)));
+    ];
+    $this->drupalPostForm('node/add/forum', $edit, t('Save'), ['query' => ['forum_id' => 1]]);
     $private_node = $this->drupalGetNodeByTitle($private_node_title);
     $this->assertTrue(!empty($private_node), 'New private forum node found in database.');
 
     // Create a public node.
     $public_node_title = $this->randomMachineName(20);
-    $edit = array(
+    $edit = [
       'title[0][value]' => $public_node_title,
       'body[0][value]' => $this->randomMachineName(200),
-    );
-    $this->drupalPostForm('node/add/forum', $edit, t('Save'), array('query' => array('forum_id' => 1)));
+    ];
+    $this->drupalPostForm('node/add/forum', $edit, t('Save'), ['query' => ['forum_id' => 1]]);
     $public_node = $this->drupalGetNodeByTitle($public_node_title);
     $this->assertTrue(!empty($public_node), 'New public forum node found in database.');
 
diff --git a/web/core/modules/forum/src/Tests/ForumTest.php b/web/core/modules/forum/tests/src/Functional/ForumTest.php
similarity index 83%
rename from web/core/modules/forum/src/Tests/ForumTest.php
rename to web/core/modules/forum/tests/src/Functional/ForumTest.php
index df21f69e5..76823a757 100644
--- a/web/core/modules/forum/src/Tests/ForumTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum\Functional;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Link;
-use Drupal\simpletest\WebTestBase;
 use Drupal\Core\Url;
 use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for forum.module.
@@ -18,14 +18,14 @@ use Drupal\taxonomy\Entity\Vocabulary;
  *
  * @group forum
  */
-class ForumTest extends WebTestBase {
+class ForumTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('taxonomy', 'comment', 'forum', 'node', 'block', 'menu_ui', 'help');
+  public static $modules = ['taxonomy', 'comment', 'forum', 'node', 'block', 'menu_ui', 'help'];
 
   /**
    * A user with various administrative privileges.
@@ -81,7 +81,7 @@ class ForumTest extends WebTestBase {
     $this->drupalPlaceBlock('page_title_block');
 
     // Create users.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'access administration pages',
       'administer modules',
       'administer blocks',
@@ -90,34 +90,34 @@ class ForumTest extends WebTestBase {
       'administer taxonomy',
       'create forum content',
       'access comments',
-    ));
-    $this->editAnyTopicsUser = $this->drupalCreateUser(array(
+    ]);
+    $this->editAnyTopicsUser = $this->drupalCreateUser([
       'access administration pages',
       'create forum content',
       'edit any forum content',
       'delete any forum content',
-    ));
-    $this->editOwnTopicsUser = $this->drupalCreateUser(array(
+    ]);
+    $this->editOwnTopicsUser = $this->drupalCreateUser([
       'create forum content',
       'edit own forum content',
       'delete own forum content',
-    ));
+    ]);
     $this->webUser = $this->drupalCreateUser();
-    $this->postCommentUser = $this->drupalCreateUser(array(
+    $this->postCommentUser = $this->drupalCreateUser([
       'administer content types',
       'create forum content',
       'post comments',
       'skip comment approval',
       'access comments',
-    ));
-    $this->drupalPlaceBlock('help_block', array('region' => 'help'));
+    ]);
+    $this->drupalPlaceBlock('help_block', ['region' => 'help']);
     $this->drupalPlaceBlock('local_actions_block');
   }
 
   /**
    * Tests forum functionality through the admin and user interfaces.
    */
-  function testForum() {
+  public function testForum() {
     //Check that the basic forum install creates a default forum topic
     $this->drupalGet('/forum');
     // Look for the "General discussion" default forum
@@ -188,37 +188,37 @@ class ForumTest extends WebTestBase {
     $this->drupalGet('forum');
 
     // Verify row for testing forum.
-    $forum_arg = array(':forum' => 'forum-list-' . $this->forum['tid']);
+    $forum_arg = [':forum' => 'forum-list-' . $this->forum['tid']];
 
     // Topics cell contains number of topics and number of unread topics.
     $xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="forum__topics"]', $forum_arg);
     $topics = $this->xpath($xpath);
-    $topics = trim($topics[0]);
-    $this->assertEqual($topics, '6', 'Number of topics found.');
+    $topics = trim($topics[0]->getText());
+    // The extracted text contains the number of topics (6) and new posts
+    // (also 6) in this table cell.
+    $this->assertEquals('6 6 new posts in forum ' . $this->forum['name'], $topics, 'Number of topics found.');
 
     // Verify the number of unread topics.
-    $unread_topics = $this->container->get('forum_manager')->unreadTopics($this->forum['tid'], $this->editAnyTopicsUser->id());
-    $unread_topics = \Drupal::translation()->formatPlural($unread_topics, '1 new post', '@count new posts');
-    $xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="forum__topics"]//a', $forum_arg);
-    $this->assertFieldByXPath($xpath, $unread_topics, 'Number of unread topics found.');
+    $elements = $this->xpath('//tr[@id=:forum]//td[@class="forum__topics"]//a', $forum_arg);
+    $this->assertStringStartsWith('6 new posts', $elements[0]->getText(), 'Number of unread topics found.');
     // Verify that the forum name is in the unread topics text.
-    $xpath = $this->buildXPathQuery('//tr[@id=:forum]//em[@class="placeholder"]', $forum_arg);
-    $this->assertFieldByXpath($xpath, $this->forum['name'], 'Forum name found in unread topics text.');
+    $elements = $this->xpath('//tr[@id=:forum]//em[@class="placeholder"]', $forum_arg);
+    $this->assertContains($this->forum['name'], $elements[0]->getText(), 'Forum name found in unread topics text.');
 
     // Verify total number of posts in forum.
-    $xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="forum__posts"]', $forum_arg);
-    $this->assertFieldByXPath($xpath, '6', 'Number of posts found.');
+    $elements = $this->xpath('//tr[@id=:forum]//td[@class="forum__posts"]', $forum_arg);
+    $this->assertEquals('6', $elements[0]->getText(), 'Number of posts found.');
 
     // Test loading multiple forum nodes on the front page.
-    $this->drupalLogin($this->drupalCreateUser(array('administer content types', 'create forum content', 'post comments')));
-    $this->drupalPostForm('admin/structure/types/manage/forum', array('options[promote]' => 'promote'), t('Save content type'));
+    $this->drupalLogin($this->drupalCreateUser(['administer content types', 'create forum content', 'post comments']));
+    $this->drupalPostForm('admin/structure/types/manage/forum', ['options[promote]' => 'promote'], t('Save content type'));
     $this->createForumTopic($this->forum, FALSE);
     $this->createForumTopic($this->forum, FALSE);
     $this->drupalGet('node');
 
     // Test adding a comment to a forum topic.
     $node = $this->createForumTopic($this->forum, FALSE);
-    $edit = array();
+    $edit = [];
     $edit['comment_body[0][value]'] = $this->randomMachineName();
     $this->drupalPostForm('node/' . $node->id(), $edit, t('Save'));
     $this->assertResponse(200);
@@ -226,7 +226,7 @@ class ForumTest extends WebTestBase {
     // Test editing a forum topic that has a comment.
     $this->drupalLogin($this->editAnyTopicsUser);
     $this->drupalGet('forum/' . $this->forum['tid']);
-    $this->drupalPostForm('node/' . $node->id() . '/edit', array(), t('Save'));
+    $this->drupalPostForm('node/' . $node->id() . '/edit', [], t('Save'));
     $this->assertResponse(200);
 
     // Test the root forum page title change.
@@ -251,7 +251,7 @@ class ForumTest extends WebTestBase {
    * Verifies that forum nodes are not created without choosing "forum" from the
    * select list.
    */
-  function testAddOrphanTopic() {
+  public function testAddOrphanTopic() {
     // Must remove forum topics to test creating orphan topics.
     $vid = $this->config('forum.settings')->get('vocabulary');
     $tids = \Drupal::entityQuery('taxonomy_term')
@@ -260,7 +260,7 @@ class ForumTest extends WebTestBase {
     entity_delete_multiple('taxonomy_term', $tids);
 
     // Create an orphan forum item.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(10);
     $edit['body[0][value]'] = $this->randomMachineName(120);
     $this->drupalLogin($this->adminUser);
@@ -270,7 +270,7 @@ class ForumTest extends WebTestBase {
     $this->assertEqual(0, $nid_count, 'A forum node was not created when missing a forum vocabulary.');
 
     // Reset the defaults for future tests.
-    \Drupal::service('module_installer')->install(array('forum'));
+    \Drupal::service('module_installer')->install(['forum']);
   }
 
   /**
@@ -284,7 +284,7 @@ class ForumTest extends WebTestBase {
     $this->drupalLogin($user);
 
     // Add forum to the Tools menu.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('admin/structure/menu/manage/tools', $edit, t('Save'));
     $this->assertResponse(200);
 
@@ -313,7 +313,7 @@ class ForumTest extends WebTestBase {
     // Create second forum in container, destined to be deleted below.
     $delete_forum = $this->createForum('forum', $this->forumContainer['tid']);
     // Save forum overview.
-    $this->drupalPostForm('admin/structure/forum/', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/forum/', [], t('Save'));
     $this->assertRaw(t('The configuration options have been saved.'));
     // Delete this second forum.
     $this->deleteForum($delete_forum['tid']);
@@ -322,8 +322,8 @@ class ForumTest extends WebTestBase {
 
     // Test vocabulary form alterations.
     $this->drupalGet('admin/structure/taxonomy/manage/forums');
-    $this->assertFieldByName('op', t('Save'), 'Save button found.');
-    $this->assertNoFieldByName('op', t('Delete'), 'Delete button not found.');
+    $this->assertSession()->buttonExists('Save');
+    $this->assertSession()->buttonNotExists('Delete');
 
     // Test term edit form alterations.
     $this->drupalGet('taxonomy/term/' . $this->forumContainer['tid'] . '/edit');
@@ -343,7 +343,7 @@ class ForumTest extends WebTestBase {
     $vocabulary->save();
     // Test tags vocabulary form is not affected.
     $this->drupalGet('admin/structure/taxonomy/manage/tags');
-    $this->assertFieldByName('op', t('Save'), 'Save button found.');
+    $this->assertSession()->buttonExists('Save');
     $this->assertLink(t('Delete'));
     // Test tags vocabulary term form is not affected.
     $this->drupalGet('admin/structure/taxonomy/manage/tags/add');
@@ -356,21 +356,21 @@ class ForumTest extends WebTestBase {
   /**
    * Edits the forum taxonomy.
    */
-  function editForumVocabulary() {
+  public function editForumVocabulary() {
     // Backup forum taxonomy.
     $vid = $this->config('forum.settings')->get('vocabulary');
     $original_vocabulary = Vocabulary::load($vid);
 
     // Generate a random name and description.
-    $edit = array(
+    $edit = [
       'name' => $this->randomMachineName(10),
       'description' => $this->randomMachineName(100),
-    );
+    ];
 
     // Edit the vocabulary.
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $original_vocabulary->id(), $edit, t('Save'));
     $this->assertResponse(200);
-    $this->assertRaw(t('Updated vocabulary %name.', array('%name' => $edit['name'])), 'Vocabulary was edited');
+    $this->assertRaw(t('Updated vocabulary %name.', ['%name' => $edit['name']]), 'Vocabulary was edited');
 
     // Grab the newly edited vocabulary.
     $current_vocabulary = Vocabulary::load($vid);
@@ -399,17 +399,17 @@ class ForumTest extends WebTestBase {
    * @return \Drupal\Core\Database\StatementInterface
    *   The created taxonomy term data.
    */
-  function createForum($type, $parent = 0) {
+  public function createForum($type, $parent = 0) {
     // Generate a random name/description.
     $name = $this->randomMachineName(10);
     $description = $this->randomMachineName(100);
 
-    $edit = array(
+    $edit = [
       'name[0][value]' => $name,
       'description[0][value]' => $description,
       'parent[0]' => $parent,
       'weight' => '0',
-    );
+    ];
 
     // Create forum.
     $this->drupalPostForm('admin/structure/forum/add/' . $type, $edit, t('Save'));
@@ -418,22 +418,22 @@ class ForumTest extends WebTestBase {
     $this->assertText(
       t(
         'Created new @type @term.',
-        array('@term' => $name, '@type' => t($type))
+        ['@term' => $name, '@type' => t($type)]
       ),
-      format_string('@type was created', array('@type' => ucfirst($type)))
+      format_string('@type was created', ['@type' => ucfirst($type)])
     );
 
     // Verify that the creation message contains a link to a term.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'term/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'term/']);
     $this->assert(isset($view_link), 'The message area contains a link to a term');
 
     // Verify forum.
-    $term = db_query("SELECT * FROM {taxonomy_term_field_data} t WHERE t.vid = :vid AND t.name = :name AND t.description__value = :desc AND t.default_langcode = 1", array(':vid' => $this->config('forum.settings')->get('vocabulary'), ':name' => $name, ':desc' => $description))->fetchAssoc();
+    $term = db_query("SELECT * FROM {taxonomy_term_field_data} t WHERE t.vid = :vid AND t.name = :name AND t.description__value = :desc AND t.default_langcode = 1", [':vid' => $this->config('forum.settings')->get('vocabulary'), ':name' => $name, ':desc' => $description])->fetchAssoc();
     $this->assertTrue(!empty($term), 'The ' . $type . ' exists in the database');
 
     // Verify forum hierarchy.
     $tid = $term['tid'];
-    $parent_tid = db_query("SELECT t.parent FROM {taxonomy_term_hierarchy} t WHERE t.tid = :tid", array(':tid' => $tid))->fetchField();
+    $parent_tid = db_query("SELECT t.parent FROM {taxonomy_term_hierarchy} t WHERE t.tid = :tid", [':tid' => $tid])->fetchField();
     $this->assertTrue($parent == $parent_tid, 'The ' . $type . ' is linked to its container');
 
     $forum = $this->container->get('entity.manager')->getStorage('taxonomy_term')->load($tid);
@@ -447,14 +447,14 @@ class ForumTest extends WebTestBase {
    * @param int $tid
    *   The forum ID.
    */
-  function deleteForum($tid) {
+  public function deleteForum($tid) {
     // Delete the forum.
     $this->drupalGet('admin/structure/forum/edit/forum/' . $tid);
     $this->clickLink(t('Delete'));
     $this->assertText('Are you sure you want to delete the forum');
     $this->assertNoText('Add forum');
     $this->assertNoText('Add forum container');
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
 
     // Assert that the forum no longer exists.
     $this->drupalGet('forum/' . $tid);
@@ -483,7 +483,7 @@ class ForumTest extends WebTestBase {
   /**
    * Tests a forum with a new post displays properly.
    */
-  function testForumWithNewPost() {
+  public function testForumWithNewPost() {
     // Log in as the first user.
     $this->drupalLogin($this->adminUser);
     // Create a forum container.
@@ -496,7 +496,7 @@ class ForumTest extends WebTestBase {
     // Log in as a second user.
     $this->drupalLogin($this->postCommentUser);
     // Post a reply to the topic.
-    $edit = array();
+    $edit = [];
     $edit['subject[0][value]'] = $this->randomMachineName();
     $edit['comment_body[0][value]'] = $this->randomMachineName();
     $this->drupalPostForm('node/' . $node->id(), $edit, t('Save'));
@@ -528,38 +528,38 @@ class ForumTest extends WebTestBase {
    * @return object
    *   The created topic node.
    */
-  function createForumTopic($forum, $container = FALSE) {
+  public function createForumTopic($forum, $container = FALSE) {
     // Generate a random subject/body.
     $title = $this->randomMachineName(20);
     $body = $this->randomMachineName(200);
 
-    $edit = array(
+    $edit = [
       'title[0][value]' => $title,
       'body[0][value]' => $body,
-    );
+    ];
     $tid = $forum['tid'];
 
     // Create the forum topic, preselecting the forum ID via a URL parameter.
-    $this->drupalPostForm('node/add/forum', $edit, t('Save'), array('query' => array('forum_id' => $tid)));
+    $this->drupalPostForm('node/add/forum', $edit, t('Save'), ['query' => ['forum_id' => $tid]]);
 
     $type = t('Forum topic');
     if ($container) {
-      $this->assertNoText(t('@type @title has been created.', array('@type' => $type, '@title' => $title)), 'Forum topic was not created');
-      $this->assertRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), 'Error message was shown');
+      $this->assertNoText(t('@type @title has been created.', ['@type' => $type, '@title' => $title]), 'Forum topic was not created');
+      $this->assertRaw(t('The item %title is a forum container, not a forum.', ['%title' => $forum['name']]), 'Error message was shown');
       return;
     }
     else {
-      $this->assertText(t('@type @title has been created.', array('@type' => $type, '@title' => $title)), 'Forum topic was created');
-      $this->assertNoRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), 'No error message was shown');
+      $this->assertText(t('@type @title has been created.', ['@type' => $type, '@title' => $title]), 'Forum topic was created');
+      $this->assertNoRaw(t('The item %title is a forum container, not a forum.', ['%title' => $forum['name']]), 'No error message was shown');
 
       // Verify that the creation message contains a link to a term.
-      $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'term/'));
+      $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'term/']);
       $this->assert(isset($view_link), 'The message area contains a link to a term');
     }
 
     // Retrieve node object, ensure that the topic was created and in the proper forum.
     $node = $this->drupalGetNodeByTitle($title);
-    $this->assertTrue($node != NULL, format_string('Node @title was loaded', array('@title' => $title)));
+    $this->assertTrue($node != NULL, format_string('Node @title was loaded', ['@title' => $title]));
     $this->assertEqual($node->taxonomy_forums->target_id, $tid, 'Saved forum topic was in the expected forum');
 
     // View forum topic.
@@ -602,16 +602,16 @@ class ForumTest extends WebTestBase {
     $this->drupalGet('node/' . $node->id());
     $this->assertResponse(200);
     $this->assertTitle($node->label() . ' | Drupal', 'Forum node was displayed');
-    $breadcrumb_build = array(
+    $breadcrumb_build = [
       Link::createFromRoute(t('Home'), '<front>'),
       Link::createFromRoute(t('Forums'), 'forum.index'),
-      Link::createFromRoute($this->forumContainer['name'], 'forum.page', array('taxonomy_term' => $this->forumContainer['tid'])),
-      Link::createFromRoute($this->forum['name'], 'forum.page', array('taxonomy_term' => $this->forum['tid'])),
-    );
-    $breadcrumb = array(
+      Link::createFromRoute($this->forumContainer['name'], 'forum.page', ['taxonomy_term' => $this->forumContainer['tid']]),
+      Link::createFromRoute($this->forum['name'], 'forum.page', ['taxonomy_term' => $this->forum['tid']]),
+    ];
+    $breadcrumb = [
       '#theme' => 'breadcrumb',
       '#links' => $breadcrumb_build,
-    );
+    ];
     $this->assertRaw(\Drupal::service('renderer')->renderRoot($breadcrumb), 'Breadcrumbs were displayed');
 
     // View forum edit node.
@@ -623,26 +623,26 @@ class ForumTest extends WebTestBase {
 
     if ($response == 200) {
       // Edit forum node (including moving it to another forum).
-      $edit = array();
+      $edit = [];
       $edit['title[0][value]'] = 'node/' . $node->id();
       $edit['body[0][value]'] = $this->randomMachineName(256);
       // Assume the topic is initially associated with $forum.
       $edit['taxonomy_forums'] = $this->rootForum['tid'];
       $edit['shadow'] = TRUE;
       $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-      $this->assertText(t('Forum topic @title has been updated.', array('@title' => $edit['title[0][value]'])), 'Forum node was edited');
+      $this->assertText(t('Forum topic @title has been updated.', ['@title' => $edit['title[0][value]']]), 'Forum node was edited');
 
       // Verify topic was moved to a different forum.
-      $forum_tid = db_query("SELECT tid FROM {forum} WHERE nid = :nid AND vid = :vid", array(
+      $forum_tid = db_query("SELECT tid FROM {forum} WHERE nid = :nid AND vid = :vid", [
         ':nid' => $node->id(),
         ':vid' => $node->getRevisionId(),
-      ))->fetchField();
+      ])->fetchField();
       $this->assertTrue($forum_tid == $this->rootForum['tid'], 'The forum topic is linked to a different forum');
 
       // Delete forum node.
-      $this->drupalPostForm('node/' . $node->id() . '/delete', array(), t('Delete'));
+      $this->drupalPostForm('node/' . $node->id() . '/delete', [], t('Delete'));
       $this->assertResponse($response);
-      $this->assertRaw(t('Forum topic %title has been deleted.', array('%title' => $edit['title[0][value]'])), 'Forum node was deleted');
+      $this->assertRaw(t('Forum topic %title has been deleted.', ['%title' => $edit['title[0][value]']]), 'Forum node was deleted');
     }
   }
 
@@ -660,18 +660,18 @@ class ForumTest extends WebTestBase {
     $this->assertResponse(200);
     $this->assertTitle($forum['name'] . ' | Drupal');
 
-    $breadcrumb_build = array(
+    $breadcrumb_build = [
       Link::createFromRoute(t('Home'), '<front>'),
       Link::createFromRoute(t('Forums'), 'forum.index'),
-    );
+    ];
     if (isset($parent)) {
-      $breadcrumb_build[] = Link::createFromRoute($parent['name'], 'forum.page', array('taxonomy_term' => $parent['tid']));
+      $breadcrumb_build[] = Link::createFromRoute($parent['name'], 'forum.page', ['taxonomy_term' => $parent['tid']]);
     }
 
-    $breadcrumb = array(
+    $breadcrumb = [
       '#theme' => 'breadcrumb',
       '#links' => $breadcrumb_build,
-    );
+    ];
     $this->assertRaw(\Drupal::service('renderer')->renderRoot($breadcrumb), 'Breadcrumbs were displayed');
   }
 
@@ -679,7 +679,7 @@ class ForumTest extends WebTestBase {
    * Generates forum topics.
    */
   private function generateForumTopics() {
-    $this->nids = array();
+    $this->nids = [];
     for ($i = 0; $i < 5; $i++) {
       $node = $this->createForumTopic($this->forum, FALSE);
       $this->nids[] = $node->id();
diff --git a/web/core/modules/forum/src/Tests/ForumUninstallTest.php b/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
similarity index 84%
rename from web/core/modules/forum/src/Tests/ForumUninstallTest.php
rename to web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
index 1978e6b31..c2d3848ff 100644
--- a/web/core/modules/forum/src/Tests/ForumUninstallTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
@@ -1,27 +1,27 @@
 <?php
 
-namespace Drupal\forum\Tests;
+namespace Drupal\Tests\forum\Functional;
 
 use Drupal\comment\CommentInterface;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\WebTestBase;
 use Drupal\comment\Entity\Comment;
 use Drupal\taxonomy\Entity\Term;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests forum module uninstallation.
  *
  * @group forum
  */
-class ForumUninstallTest extends WebTestBase {
+class ForumUninstallTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('forum');
+  public static $modules = ['forum'];
 
   /**
    * Tests if forum module uninstallation properly deletes the field.
@@ -37,21 +37,21 @@ class ForumUninstallTest extends WebTestBase {
       'name' => t('A term'),
       'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
       'description' => '',
-      'parent' => array(0),
+      'parent' => [0],
       'vid' => 'forums',
       'forum_container' => 0,
     ]);
     $term->save();
 
     // Create a forum node.
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'title' => 'A forum post',
       'type' => 'forum',
-      'taxonomy_forums' => array(array('target_id' => $term->id())),
-    ));
+      'taxonomy_forums' => [['target_id' => $term->id()]],
+    ]);
 
     // Create at least one comment against the forum node.
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'entity_id' => $node->nid->value,
       'entity_type' => 'node',
       'field_name' => 'comment_forum',
@@ -60,22 +60,22 @@ class ForumUninstallTest extends WebTestBase {
       'status' => CommentInterface::PUBLISHED,
       'subject' => $this->randomMachineName(),
       'hostname' => '127.0.0.1',
-    ));
+    ]);
     $comment->save();
 
     // Attempt to uninstall forum.
     $this->drupalGet('admin/modules/uninstall');
     // Assert forum is required.
-    $this->assertNoFieldByName('uninstall[forum]');
+    $this->assertSession()->fieldDisabled('uninstall[forum]');
     $this->assertText('To uninstall Forum, first delete all Forum content');
 
     // Delete the node.
-    $this->drupalPostForm('node/' . $node->id() . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('node/' . $node->id() . '/delete', [], t('Delete'));
 
     // Attempt to uninstall forum.
     $this->drupalGet('admin/modules/uninstall');
     // Assert forum is still required.
-    $this->assertNoFieldByName('uninstall[forum]');
+    $this->assertSession()->fieldDisabled('uninstall[forum]');
     $this->assertText('To uninstall Forum, first delete all Forums terms');
 
     // Delete any forum terms.
@@ -93,9 +93,9 @@ class ForumUninstallTest extends WebTestBase {
     $this->drupalGet('admin/modules/uninstall');
     // Assert forum is no longer required.
     $this->assertFieldByName('uninstall[forum]');
-    $this->drupalPostForm('admin/modules/uninstall', array(
+    $this->drupalPostForm('admin/modules/uninstall', [
       'uninstall[forum]' => 1,
-    ), t('Uninstall'));
+    ], t('Uninstall'));
     $this->drupalPostForm(NULL, [], t('Uninstall'));
 
     // Check that the field is now deleted.
@@ -104,21 +104,21 @@ class ForumUninstallTest extends WebTestBase {
 
     // Check that a node type with a machine name of forum can be created after
     // uninstalling the forum module and the node type is not locked.
-    $edit = array(
+    $edit = [
       'name' => 'Forum',
       'title_label' => 'title for forum',
       'type' => 'forum',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/add', $edit, t('Save content type'));
     $this->assertTrue((bool) NodeType::load('forum'), 'Node type with machine forum created.');
     $this->drupalGet('admin/structure/types/manage/forum');
     $this->clickLink(t('Delete'));
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
     $this->assertResponse(200);
     $this->assertFalse((bool) NodeType::load('forum'), 'Node type with machine forum deleted.');
 
     // Double check everything by reinstalling the forum module again.
-    $this->drupalPostForm('admin/modules', ['modules[Core][forum][enable]' => 1], 'Install');
+    $this->drupalPostForm('admin/modules', ['modules[forum][enable]' => 1], 'Install');
     $this->assertText('Module Forum has been enabled.');
   }
 
@@ -137,14 +137,14 @@ class ForumUninstallTest extends WebTestBase {
 
     // Delete all terms in the Forums vocabulary. Uninstalling the forum module
     // will fail unless this is done.
-    $terms = entity_load_multiple_by_properties('taxonomy_term', array('vid' => 'forums'));
+    $terms = entity_load_multiple_by_properties('taxonomy_term', ['vid' => 'forums']);
     foreach ($terms as $term) {
       $term->delete();
     }
 
     // Ensure that uninstallation succeeds even if the field has already been
     // deleted manually beforehand.
-    $this->container->get('module_installer')->uninstall(array('forum'));
+    $this->container->get('module_installer')->uninstall(['forum']);
   }
 
 }
diff --git a/web/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php b/web/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php
index 34c8a5bd8..bc0a9ffe9 100644
--- a/web/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php
+++ b/web/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\forum\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -17,7 +17,7 @@ class MigrateForumConfigsTest extends MigrateDrupal6TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('comment', 'forum', 'taxonomy');
+  public static $modules = ['comment', 'forum', 'taxonomy'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
index 8001e5794..abc11227e 100644
--- a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
+++ b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
@@ -37,9 +37,9 @@ class ForumBreadcrumbBuilderBaseTest extends UnitTestCase {
     // Make some test doubles.
     $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
     $config_factory = $this->getConfigFactoryStub(
-      array(
-        'forum.settings' => array('IAmATestKey' => 'IAmATestValue'),
-      )
+      [
+        'forum.settings' => ['IAmATestKey' => 'IAmATestValue'],
+      ]
     );
     $forum_manager = $this->getMock('Drupal\forum\ForumManagerInterface');
     $translation_manager = $this->getMock('Drupal\Core\StringTranslation\TranslationInterface');
@@ -48,20 +48,20 @@ class ForumBreadcrumbBuilderBaseTest extends UnitTestCase {
     $builder = $this->getMockForAbstractClass(
       'Drupal\forum\Breadcrumb\ForumBreadcrumbBuilderBase',
       // Constructor array.
-      array(
+      [
         $entity_manager,
         $config_factory,
         $forum_manager,
         $translation_manager,
-      )
+      ]
     );
 
     // Reflect upon our properties, except for config which is a special case.
-    $property_names = array(
+    $property_names = [
       'entityManager' => $entity_manager,
       'forumManager' => $forum_manager,
       'stringTranslation' => $translation_manager,
-    );
+    ];
     foreach ($property_names as $property_name => $property_value) {
       $this->assertAttributeEquals(
         $property_value, $property_name, $builder
@@ -103,37 +103,37 @@ class ForumBreadcrumbBuilderBaseTest extends UnitTestCase {
     $vocab_storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
     $vocab_storage->expects($this->any())
       ->method('load')
-      ->will($this->returnValueMap(array(
-        array('forums', $prophecy->reveal()),
-      )));
+      ->will($this->returnValueMap([
+        ['forums', $prophecy->reveal()],
+      ]));
 
     $entity_manager = $this->getMockBuilder('Drupal\Core\Entity\EntityManagerInterface')
       ->disableOriginalConstructor()
       ->getMock();
     $entity_manager->expects($this->any())
       ->method('getStorage')
-      ->will($this->returnValueMap(array(
-        array('taxonomy_vocabulary', $vocab_storage),
-      )));
+      ->will($this->returnValueMap([
+        ['taxonomy_vocabulary', $vocab_storage],
+      ]));
 
     $config_factory = $this->getConfigFactoryStub(
-      array(
-        'forum.settings' => array(
+      [
+        'forum.settings' => [
           'vocabulary' => 'forums',
-        ),
-      )
+        ],
+      ]
     );
 
     // Build a breadcrumb builder to test.
     $breadcrumb_builder = $this->getMockForAbstractClass(
       'Drupal\forum\Breadcrumb\ForumBreadcrumbBuilderBase',
       // Constructor array.
-      array(
+      [
         $entity_manager,
         $config_factory,
         $forum_manager,
         $translation_manager,
-      )
+      ]
     );
 
     // Add a translation manager for t().
@@ -144,10 +144,10 @@ class ForumBreadcrumbBuilderBaseTest extends UnitTestCase {
     $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface');
 
     // Expected result set.
-    $expected = array(
+    $expected = [
       Link::createFromRoute('Home', '<front>'),
       Link::createFromRoute('Fora_is_the_plural_of_forum', 'forum.index'),
-    );
+    ];
 
     // And finally, the test.
     $breadcrumb = $breadcrumb_builder->build($route_match);
diff --git a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
index 4e5a6c457..45566f2af 100644
--- a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
+++ b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
@@ -41,21 +41,21 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
    * @dataProvider providerTestApplies
    * @covers ::applies
    */
-  public function testApplies($expected, $route_name = NULL, $parameter_map = array()) {
+  public function testApplies($expected, $route_name = NULL, $parameter_map = []) {
     // Make some test doubles.
     $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
-    $config_factory = $this->getConfigFactoryStub(array());
+    $config_factory = $this->getConfigFactoryStub([]);
     $forum_manager = $this->getMock('Drupal\forum\ForumManagerInterface');
     $translation_manager = $this->getMock('Drupal\Core\StringTranslation\TranslationInterface');
 
     // Make an object to test.
     $builder = $this->getMockBuilder('Drupal\forum\Breadcrumb\ForumListingBreadcrumbBuilder')
-      ->setConstructorArgs(array(
+      ->setConstructorArgs([
         $entity_manager,
         $config_factory,
         $forum_manager,
         $translation_manager,
-      ))
+      ])
       ->setMethods(NULL)
       ->getMock();
 
@@ -84,29 +84,29 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
 
-    return array(
-      array(
+    return [
+      [
         FALSE,
-      ),
-      array(
+      ],
+      [
         FALSE,
         'NOT.forum.page',
-      ),
-      array(
+      ],
+      [
         FALSE,
         'forum.page',
-      ),
-      array(
+      ],
+      [
         TRUE,
         'forum.page',
-        array(array('taxonomy_term', 'anything')),
-      ),
-      array(
+        [['taxonomy_term', 'anything']],
+      ],
+      [
         TRUE,
         'forum.page',
-        array(array('taxonomy_term', $mock_term)),
-      ),
-    );
+        [['taxonomy_term', $mock_term]],
+      ],
+    ];
   }
 
   /**
@@ -141,10 +141,10 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
     $forum_manager = $this->getMock('Drupal\forum\ForumManagerInterface');
     $forum_manager->expects($this->at(0))
       ->method('getParents')
-      ->will($this->returnValue(array($term1)));
+      ->will($this->returnValue([$term1]));
     $forum_manager->expects($this->at(1))
       ->method('getParents')
-      ->will($this->returnValue(array($term1, $term2)));
+      ->will($this->returnValue([$term1, $term2]));
 
     // The root forum.
     $prophecy = $this->prophesize('Drupal\taxonomy\VocabularyInterface');
@@ -156,35 +156,35 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
     $vocab_storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
     $vocab_storage->expects($this->any())
       ->method('load')
-      ->will($this->returnValueMap(array(
-        array('forums', $prophecy->reveal()),
-      )));
+      ->will($this->returnValueMap([
+        ['forums', $prophecy->reveal()],
+      ]));
 
     $entity_manager = $this->getMockBuilder('Drupal\Core\Entity\EntityManagerInterface')
       ->disableOriginalConstructor()
       ->getMock();
     $entity_manager->expects($this->any())
       ->method('getStorage')
-      ->will($this->returnValueMap(array(
-        array('taxonomy_vocabulary', $vocab_storage),
-      )));
+      ->will($this->returnValueMap([
+        ['taxonomy_vocabulary', $vocab_storage],
+      ]));
 
     $config_factory = $this->getConfigFactoryStub(
-      array(
-        'forum.settings' => array(
+      [
+        'forum.settings' => [
           'vocabulary' => 'forums',
-        ),
-      )
+        ],
+      ]
     );
 
     // Build a breadcrumb builder to test.
     $breadcrumb_builder = $this->getMock(
-      'Drupal\forum\Breadcrumb\ForumListingBreadcrumbBuilder', NULL, array(
+      'Drupal\forum\Breadcrumb\ForumListingBreadcrumbBuilder', NULL, [
         $entity_manager,
         $config_factory,
         $forum_manager,
         $translation_manager,
-      )
+      ]
     );
 
     // Add a translation manager for t().
@@ -208,11 +208,11 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
       ->will($this->returnValue($forum_listing));
 
     // First test.
-    $expected1 = array(
+    $expected1 = [
       Link::createFromRoute('Home', '<front>'),
       Link::createFromRoute('Fora_is_the_plural_of_forum', 'forum.index'),
-      Link::createFromRoute('Something', 'forum.page', array('taxonomy_term' => 1)),
-    );
+      Link::createFromRoute('Something', 'forum.page', ['taxonomy_term' => 1]),
+    ];
     $breadcrumb = $breadcrumb_builder->build($route_match);
     $this->assertEquals($expected1, $breadcrumb->getLinks());
     $this->assertEquals(['route'], $breadcrumb->getCacheContexts());
@@ -220,12 +220,12 @@ class ForumListingBreadcrumbBuilderTest extends UnitTestCase {
     $this->assertEquals(Cache::PERMANENT, $breadcrumb->getCacheMaxAge());
 
     // Second test.
-    $expected2 = array(
+    $expected2 = [
       Link::createFromRoute('Home', '<front>'),
       Link::createFromRoute('Fora_is_the_plural_of_forum', 'forum.index'),
-      Link::createFromRoute('Something else', 'forum.page', array('taxonomy_term' => 2)),
-      Link::createFromRoute('Something', 'forum.page', array('taxonomy_term' => 1)),
-    );
+      Link::createFromRoute('Something else', 'forum.page', ['taxonomy_term' => 2]),
+      Link::createFromRoute('Something', 'forum.page', ['taxonomy_term' => 1]),
+    ];
     $breadcrumb = $breadcrumb_builder->build($route_match);
     $this->assertEquals($expected2, $breadcrumb->getLinks());
     $this->assertEquals(['route'], $breadcrumb->getCacheContexts());
diff --git a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
index 1998ffa2a..f4d379715 100644
--- a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
+++ b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
@@ -41,10 +41,10 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
    * @dataProvider providerTestApplies
    * @covers ::applies
    */
-  public function testApplies($expected, $route_name = NULL, $parameter_map = array()) {
+  public function testApplies($expected, $route_name = NULL, $parameter_map = []) {
     // Make some test doubles.
     $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
-    $config_factory = $this->getConfigFactoryStub(array());
+    $config_factory = $this->getConfigFactoryStub([]);
 
     $forum_manager = $this->getMock('Drupal\forum\ForumManagerInterface');
     $forum_manager->expects($this->any())
@@ -56,12 +56,12 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
     // Make an object to test.
     $builder = $this->getMockBuilder('Drupal\forum\Breadcrumb\ForumNodeBreadcrumbBuilder')
       ->setConstructorArgs(
-        array(
+        [
           $entity_manager,
           $config_factory,
           $forum_manager,
           $translation_manager,
-        )
+        ]
       )
       ->setMethods(NULL)
       ->getMock();
@@ -93,29 +93,29 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
 
-    return array(
-      array(
+    return [
+      [
         FALSE,
-      ),
-      array(
+      ],
+      [
         FALSE,
         'NOT.entity.node.canonical',
-      ),
-      array(
+      ],
+      [
         FALSE,
         'entity.node.canonical',
-      ),
-      array(
+      ],
+      [
         FALSE,
         'entity.node.canonical',
-        array(array('node', NULL)),
-      ),
-      array(
+        [['node', NULL]],
+      ],
+      [
         TRUE,
         'entity.node.canonical',
-        array(array('node', $mock_node)),
-      ),
-    );
+        [['node', $mock_node]],
+      ],
+    ];
   }
 
   /**
@@ -151,10 +151,10 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
       ->getMock();
     $forum_manager->expects($this->at(0))
       ->method('getParents')
-      ->will($this->returnValue(array($term1)));
+      ->will($this->returnValue([$term1]));
     $forum_manager->expects($this->at(1))
       ->method('getParents')
-      ->will($this->returnValue(array($term1, $term2)));
+      ->will($this->returnValue([$term1, $term2]));
 
     $prophecy = $this->prophesize('Drupal\taxonomy\VocabularyInterface');
     $prophecy->label()->willReturn('Forums');
@@ -165,35 +165,35 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
     $vocab_storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
     $vocab_storage->expects($this->any())
       ->method('load')
-      ->will($this->returnValueMap(array(
-        array('forums', $prophecy->reveal()),
-      )));
+      ->will($this->returnValueMap([
+        ['forums', $prophecy->reveal()],
+      ]));
 
     $entity_manager = $this->getMockBuilder('Drupal\Core\Entity\EntityManagerInterface')
       ->disableOriginalConstructor()
       ->getMock();
     $entity_manager->expects($this->any())
       ->method('getStorage')
-      ->will($this->returnValueMap(array(
-        array('taxonomy_vocabulary', $vocab_storage),
-      )));
+      ->will($this->returnValueMap([
+        ['taxonomy_vocabulary', $vocab_storage],
+      ]));
 
     $config_factory = $this->getConfigFactoryStub(
-      array(
-        'forum.settings' => array(
+      [
+        'forum.settings' => [
           'vocabulary' => 'forums',
-        ),
-      )
+        ],
+      ]
     );
 
     // Build a breadcrumb builder to test.
     $breadcrumb_builder = $this->getMock(
-      'Drupal\forum\Breadcrumb\ForumNodeBreadcrumbBuilder', NULL, array(
+      'Drupal\forum\Breadcrumb\ForumNodeBreadcrumbBuilder', NULL, [
         $entity_manager,
         $config_factory,
         $forum_manager,
         $translation_manager,
-      )
+      ]
     );
 
     // Add a translation manager for t().
@@ -215,11 +215,11 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
       ->will($this->returnValue($forum_node));
 
     // First test.
-    $expected1 = array(
+    $expected1 = [
       Link::createFromRoute('Home', '<front>'),
       Link::createFromRoute('Forums', 'forum.index'),
-      Link::createFromRoute('Something', 'forum.page', array('taxonomy_term' => 1)),
-    );
+      Link::createFromRoute('Something', 'forum.page', ['taxonomy_term' => 1]),
+    ];
     $breadcrumb = $breadcrumb_builder->build($route_match);
     $this->assertEquals($expected1, $breadcrumb->getLinks());
     $this->assertEquals(['route'], $breadcrumb->getCacheContexts());
@@ -227,12 +227,12 @@ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase {
     $this->assertEquals(Cache::PERMANENT, $breadcrumb->getCacheMaxAge());
 
     // Second test.
-    $expected2 = array(
+    $expected2 = [
       Link::createFromRoute('Home', '<front>'),
       Link::createFromRoute('Forums', 'forum.index'),
-      Link::createFromRoute('Something else', 'forum.page', array('taxonomy_term' => 2)),
-      Link::createFromRoute('Something', 'forum.page', array('taxonomy_term' => 1)),
-    );
+      Link::createFromRoute('Something else', 'forum.page', ['taxonomy_term' => 2]),
+      Link::createFromRoute('Something', 'forum.page', ['taxonomy_term' => 1]),
+    ];
     $breadcrumb = $breadcrumb_builder->build($route_match);
     $this->assertEquals($expected2, $breadcrumb->getLinks());
     $this->assertEquals(['route'], $breadcrumb->getCacheContexts());
diff --git a/web/core/modules/forum/tests/src/Unit/ForumManagerTest.php b/web/core/modules/forum/tests/src/Unit/ForumManagerTest.php
index 587355694..ad5909213 100644
--- a/web/core/modules/forum/tests/src/Unit/ForumManagerTest.php
+++ b/web/core/modules/forum/tests/src/Unit/ForumManagerTest.php
@@ -57,17 +57,17 @@ class ForumManagerTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
 
-    $manager = $this->getMock('\Drupal\forum\ForumManager', array('getChildren'), array(
+    $manager = $this->getMock('\Drupal\forum\ForumManager', ['getChildren'], [
       $config_factory,
       $entity_manager,
       $connection,
       $translation_manager,
       $comment_manager,
-    ));
+    ]);
 
     $manager->expects($this->once())
       ->method('getChildren')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     // Get the index once.
     $index1 = $manager->getIndex();
diff --git a/web/core/modules/hal/config/install/hal.settings.yml b/web/core/modules/hal/config/install/hal.settings.yml
new file mode 100644
index 000000000..67107af00
--- /dev/null
+++ b/web/core/modules/hal/config/install/hal.settings.yml
@@ -0,0 +1,3 @@
+# Set the domain for HAL type and relation links.
+# If left blank, the site's domain will be used.
+link_domain: ~
diff --git a/web/core/modules/hal/config/schema/hal.schema.yml b/web/core/modules/hal/config/schema/hal.schema.yml
new file mode 100644
index 000000000..3192d6758
--- /dev/null
+++ b/web/core/modules/hal/config/schema/hal.schema.yml
@@ -0,0 +1,8 @@
+# Schema for the configuration files of the HAL module.
+hal.settings:
+  type: config_object
+  label: 'HAL settings'
+  mapping:
+    link_domain:
+      type: string
+      label: 'Domain of the relation'
diff --git a/web/core/modules/hal/hal.api.php b/web/core/modules/hal/hal.api.php
new file mode 100644
index 000000000..197785cbc
--- /dev/null
+++ b/web/core/modules/hal/hal.api.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * @file
+ * Describes hooks provided by the HAL module.
+ */
+
+/**
+ * @addtogroup hooks
+ * @{
+ */
+
+/**
+ * Alter the HAL type URI.
+ *
+ * Modules may wish to alter the type URI generated for a resource based on the
+ * context of the serializer/normalizer operation.
+ *
+ * @param string $uri
+ *   The URI to alter.
+ * @param array $context
+ *   The context from the serializer/normalizer operation.
+ *
+ * @see \Symfony\Component\Serializer\SerializerInterface::serialize()
+ * @see \Symfony\Component\Serializer\SerializerInterface::deserialize()
+ * @see \Symfony\Component\Serializer\NormalizerInterface::normalize()
+ * @see \Symfony\Component\Serializer\DenormalizerInterface::denormalize()
+ */
+function hook_hal_type_uri_alter(&$uri, $context = []) {
+  if ($context['mymodule'] == TRUE) {
+    $base = \Drupal::config('hal.settings')->get('link_domain');
+    $uri = str_replace($base, 'http://mymodule.domain', $uri);
+  }
+}
+
+
+/**
+ * Alter the HAL relation URI.
+ *
+ * Modules may wish to alter the relation URI generated for a resource based on
+ * the context of the serializer/normalizer operation.
+ *
+ * @param string $uri
+ *   The URI to alter.
+ * @param array $context
+ *   The context from the serializer/normalizer operation.
+ *
+ * @see \Symfony\Component\Serializer\SerializerInterface::serialize()
+ * @see \Symfony\Component\Serializer\SerializerInterface::deserialize()
+ * @see \Symfony\Component\Serializer\NormalizerInterface::normalize()
+ * @see \Symfony\Component\Serializer\DenormalizerInterface::denormalize()
+ */
+function hook_hal_relation_uri_alter(&$uri, $context = []) {
+  if ($context['mymodule'] == TRUE) {
+    $base = \Drupal::config('hal.settings')->get('link_domain');
+    $uri = str_replace($base, 'http://mymodule.domain', $uri);
+  }
+}
+
+/**
+ * @} End of "addtogroup hooks".
+ */
diff --git a/web/core/modules/hal/hal.info.yml b/web/core/modules/hal/hal.info.yml
index 4cf0c7ead..2d87eff9d 100644
--- a/web/core/modules/hal/hal.info.yml
+++ b/web/core/modules/hal/hal.info.yml
@@ -5,5 +5,4 @@ package: Web services
 version: VERSION
 core: 8.x
 dependencies:
-  - rest
   - serialization
diff --git a/web/core/modules/hal/hal.install b/web/core/modules/hal/hal.install
new file mode 100644
index 000000000..78810e37f
--- /dev/null
+++ b/web/core/modules/hal/hal.install
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @file
+ * Update functions for the HAL module.
+ */
+
+/**
+ * Move 'link_domain' from 'rest.settings' to 'hal.settings'.
+ */
+function hal_update_8301() {
+  $config_factory = \Drupal::configFactory();
+
+  // The default value for the 'link_domain' key is `~`, which is the YAML
+  // equivalent of PHP's `NULL`. If the REST module is not installed, this is
+  // the value we will store in 'hal.settings'.
+  $link_domain = NULL;
+
+  // But if the REST module was installed, we migrate its 'link_domain' setting,
+  // because we are actually moving that setting from 'rest.settings' to
+  // 'hal.settings'.
+  $rest_settings = $config_factory->getEditable('rest.settings');
+  if ($rest_settings->getRawData() !== []) {
+    $link_domain = $rest_settings->get('link_domain');
+    // Remove the 'link_domain' setting from 'rest.settings'.
+    $rest_settings->clear('link_domain')
+      ->save();
+  }
+
+  $hal_settings = $config_factory->getEditable('hal.settings');
+  $hal_settings->set('link_domain', $link_domain);
+  $hal_settings->save(TRUE);
+}
diff --git a/web/core/modules/hal/hal.module b/web/core/modules/hal/hal.module
index eaf06c104..0833e4775 100644
--- a/web/core/modules/hal/hal.module
+++ b/web/core/modules/hal/hal.module
@@ -15,9 +15,9 @@ function hal_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.hal':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('<a href=":hal_spec">Hypertext Application Language (HAL)</a> is a format that supports the linking required for hypermedia APIs.', array(':hal_spec' => 'http://stateless.co/hal_specification.html')) . '</p>';
+      $output .= '<p>' . t('<a href=":hal_spec">Hypertext Application Language (HAL)</a> is a format that supports the linking required for hypermedia APIs.', [':hal_spec' => 'http://stateless.co/hal_specification.html']) . '</p>';
       $output .= '<p>' . t('Hypermedia APIs are a style of Web API that uses URIs to identify resources and the <a href="http://wikipedia.org/wiki/Link_relation">link relations</a> between them, enabling API consumers to follow links to discover API functionality.') . '</p>';
-      $output .= '<p>' . t('This module adds support for serializing entities (such as content items, taxonomy terms, etc.) to the JSON version of HAL. For more information, see the <a href=":hal_do">online documentation for the HAL module</a>.', array(':hal_do' => 'https://www.drupal.org/documentation/modules/hal')) . '</p>';
+      $output .= '<p>' . t('This module adds support for serializing entities (such as content items, taxonomy terms, etc.) to the JSON version of HAL. For more information, see the <a href=":hal_do">online documentation for the HAL module</a>.', [':hal_do' => 'https://www.drupal.org/documentation/modules/hal']) . '</p>';
       return $output;
   }
 }
diff --git a/web/core/modules/hal/hal.services.yml b/web/core/modules/hal/hal.services.yml
index e817fbf34..97fcbfb13 100644
--- a/web/core/modules/hal/hal.services.yml
+++ b/web/core/modules/hal/hal.services.yml
@@ -1,7 +1,7 @@
 services:
   serializer.normalizer.entity_reference_item.hal:
     class: Drupal\hal\Normalizer\EntityReferenceItemNormalizer
-    arguments: ['@rest.link_manager', '@serializer.entity_resolver']
+    arguments: ['@hal.link_manager', '@serializer.entity_resolver']
     tags:
       - { name: normalizer, priority: 10 }
   serializer.normalizer.field_item.hal:
@@ -16,17 +16,24 @@ services:
     class: Drupal\hal\Normalizer\FileEntityNormalizer
     tags:
       - { name: normalizer, priority: 20 }
-    arguments: ['@entity.manager', '@http_client', '@rest.link_manager', '@module_handler']
+    arguments: ['@entity.manager', '@http_client', '@hal.link_manager', '@module_handler']
   serializer.normalizer.entity.hal:
     class: Drupal\hal\Normalizer\ContentEntityNormalizer
-    arguments: ['@rest.link_manager', '@entity.manager', '@module_handler']
+    arguments: ['@hal.link_manager', '@entity.manager', '@module_handler']
     tags:
       - { name: normalizer, priority: 10 }
   serializer.encoder.hal:
     class: Drupal\hal\Encoder\JsonEncoder
     tags:
       - { name: encoder, priority: 10, format: hal_json }
-  exception.default_json:
-    class: Drupal\hal\EventSubscriber\ExceptionHalJsonSubscriber
-    tags:
-      - { name: event_subscriber }
+
+  # Link managers.
+  hal.link_manager:
+    class: Drupal\hal\LinkManager\LinkManager
+    arguments: ['@hal.link_manager.type', '@hal.link_manager.relation']
+  hal.link_manager.type:
+    class: Drupal\hal\LinkManager\TypeLinkManager
+    arguments: ['@cache.default', '@module_handler', '@config.factory', '@request_stack', '@entity_type.bundle.info']
+  hal.link_manager.relation:
+    class: Drupal\hal\LinkManager\RelationLinkManager
+    arguments: ['@cache.default', '@entity.manager', '@module_handler', '@config.factory', '@request_stack']
diff --git a/web/core/modules/hal/src/Encoder/JsonEncoder.php b/web/core/modules/hal/src/Encoder/JsonEncoder.php
index b7226664f..bafc48794 100644
--- a/web/core/modules/hal/src/Encoder/JsonEncoder.php
+++ b/web/core/modules/hal/src/Encoder/JsonEncoder.php
@@ -2,34 +2,20 @@
 
 namespace Drupal\hal\Encoder;
 
-use Symfony\Component\Serializer\Encoder\JsonEncoder as SymfonyJsonEncoder;
+use Drupal\serialization\Encoder\JsonEncoder as SerializationJsonEncoder;
 
 /**
  * Encodes HAL data in JSON.
  *
  * Simply respond to hal_json format requests using the JSON encoder.
  */
-class JsonEncoder extends SymfonyJsonEncoder {
+class JsonEncoder extends SerializationJsonEncoder {
 
   /**
    * The formats that this Encoder supports.
    *
    * @var string
    */
-  protected $format = 'hal_json';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function supportsEncoding($format) {
-    return $format == $this->format;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function supportsDecoding($format) {
-    return $format == $this->format;
-  }
+  protected static $format = ['hal_json'];
 
 }
diff --git a/web/core/modules/hal/src/EventSubscriber/ExceptionHalJsonSubscriber.php b/web/core/modules/hal/src/EventSubscriber/ExceptionHalJsonSubscriber.php
deleted file mode 100644
index 7d64dd06b..000000000
--- a/web/core/modules/hal/src/EventSubscriber/ExceptionHalJsonSubscriber.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Drupal\hal\EventSubscriber;
-
-use Drupal\Core\EventSubscriber\ExceptionJsonSubscriber;
-
-/**
- * Handle HAL JSON exceptions the same as JSON exceptions.
- */
-class ExceptionHalJsonSubscriber extends ExceptionJsonSubscriber {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getHandledFormats() {
-    return ['hal_json'];
-  }
-
-}
diff --git a/web/core/modules/hal/src/LinkManager/ConfigurableLinkManagerInterface.php b/web/core/modules/hal/src/LinkManager/ConfigurableLinkManagerInterface.php
new file mode 100644
index 000000000..6be642472
--- /dev/null
+++ b/web/core/modules/hal/src/LinkManager/ConfigurableLinkManagerInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Drupal\hal\LinkManager;
+
+/**
+ * Defines an interface for a link manager with a configurable domain.
+ */
+interface ConfigurableLinkManagerInterface {
+
+  /**
+   * Sets the link domain used in constructing link URIs.
+   *
+   * @param string $domain
+   *   The link domain to use for constructing link URIs.
+   *
+   * @return $this
+   */
+  public function setLinkDomain($domain);
+
+}
diff --git a/web/core/modules/hal/src/LinkManager/LinkManager.php b/web/core/modules/hal/src/LinkManager/LinkManager.php
new file mode 100644
index 000000000..66e68d05f
--- /dev/null
+++ b/web/core/modules/hal/src/LinkManager/LinkManager.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Drupal\hal\LinkManager;
+
+class LinkManager implements LinkManagerInterface {
+
+  /**
+   * The type link manager.
+   *
+   * @var \Drupal\hal\LinkManager\TypeLinkManagerInterface
+   */
+  protected $typeLinkManager;
+
+  /**
+   * The relation link manager.
+   *
+   * @var \Drupal\hal\LinkManager\RelationLinkManagerInterface
+   */
+  protected $relationLinkManager;
+
+  /**
+   * Constructor.
+   *
+   * @param \Drupal\hal\LinkManager\TypeLinkManagerInterface $type_link_manager
+   *   Manager for handling bundle URIs.
+   * @param \Drupal\hal\LinkManager\RelationLinkManagerInterface $relation_link_manager
+   *   Manager for handling bundle URIs.
+   */
+  public function __construct(TypeLinkManagerInterface $type_link_manager, RelationLinkManagerInterface $relation_link_manager) {
+    $this->typeLinkManager = $type_link_manager;
+    $this->relationLinkManager = $relation_link_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTypeUri($entity_type, $bundle, $context = []) {
+    return $this->typeLinkManager->getTypeUri($entity_type, $bundle, $context);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTypeInternalIds($type_uri, $context = []) {
+    return $this->typeLinkManager->getTypeInternalIds($type_uri, $context);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRelationUri($entity_type, $bundle, $field_name, $context = []) {
+    return $this->relationLinkManager->getRelationUri($entity_type, $bundle, $field_name, $context);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRelationInternalIds($relation_uri) {
+    return $this->relationLinkManager->getRelationInternalIds($relation_uri);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setLinkDomain($domain) {
+    $this->relationLinkManager->setLinkDomain($domain);
+    $this->typeLinkManager->setLinkDomain($domain);
+    return $this;
+  }
+
+}
diff --git a/web/core/modules/hal/src/LinkManager/LinkManagerBase.php b/web/core/modules/hal/src/LinkManager/LinkManagerBase.php
new file mode 100644
index 000000000..20adc0802
--- /dev/null
+++ b/web/core/modules/hal/src/LinkManager/LinkManagerBase.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\hal\LinkManager;
+
+/**
+ * Defines an abstract base-class for HAL link manager objects.
+ */
+abstract class LinkManagerBase {
+
+  /**
+   * Link domain used for type links URIs.
+   *
+   * @var string
+   */
+  protected $linkDomain;
+
+  /**
+   * Config factory service.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setLinkDomain($domain) {
+    $this->linkDomain = rtrim($domain, '/');
+    return $this;
+  }
+
+  /**
+   * Gets the link domain.
+   *
+   * @return string
+   *   The link domain.
+   */
+  protected function getLinkDomain() {
+    if (empty($this->linkDomain)) {
+      if ($domain = $this->configFactory->get('hal.settings')->get('link_domain')) {
+        $this->linkDomain = rtrim($domain, '/');
+      }
+      else {
+        $request = $this->requestStack->getCurrentRequest();
+        $this->linkDomain = $request->getSchemeAndHttpHost() . $request->getBasePath();
+      }
+    }
+    return $this->linkDomain;
+  }
+
+}
diff --git a/web/core/modules/hal/src/LinkManager/LinkManagerInterface.php b/web/core/modules/hal/src/LinkManager/LinkManagerInterface.php
new file mode 100644
index 000000000..25498b425
--- /dev/null
+++ b/web/core/modules/hal/src/LinkManager/LinkManagerInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Drupal\hal\LinkManager;
+
+/**
+ * Interface implemented by link managers.
+ *
+ * There are no explicit methods on the manager interface. Instead link managers
+ * broker the interactions of the different components, and therefore must
+ * implement each component interface, which is enforced by this interface
+ * extending all of the component ones.
+ *
+ * While a link manager may directly implement these interface methods with
+ * custom logic, it is expected to be more common for plugin managers to proxy
+ * the method invocations to the respective components.
+ */
+interface LinkManagerInterface extends TypeLinkManagerInterface, RelationLinkManagerInterface {
+}
diff --git a/web/core/modules/hal/src/LinkManager/RelationLinkManager.php b/web/core/modules/hal/src/LinkManager/RelationLinkManager.php
new file mode 100644
index 000000000..dc6486f20
--- /dev/null
+++ b/web/core/modules/hal/src/LinkManager/RelationLinkManager.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace Drupal\hal\LinkManager;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class RelationLinkManager extends LinkManagerBase implements RelationLinkManagerInterface {
+
+  /**
+   * @var \Drupal\Core\Cache\CacheBackendInterface;
+   */
+  protected $cache;
+
+  /**
+   * Entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface
+   */
+  protected $entityManager;
+
+  /**
+   * Module handler service.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * Constructor.
+   *
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
+   *   The cache of relation URIs and their associated Typed Data IDs.
+   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   *   The entity manager.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler service.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory service.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
+   */
+  public function __construct(CacheBackendInterface $cache, EntityManagerInterface $entity_manager, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory, RequestStack $request_stack) {
+    $this->cache = $cache;
+    $this->entityManager = $entity_manager;
+    $this->configFactory = $config_factory;
+    $this->moduleHandler = $module_handler;
+    $this->requestStack = $request_stack;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRelationUri($entity_type, $bundle, $field_name, $context = []) {
+    // Per the interface documentation of this method, the returned URI may
+    // optionally also serve as the URL of a documentation page about this
+    // field. However, Drupal does not currently implement such a documentation
+    // page. Therefore, we return a URI assembled relative to the site's base
+    // URL, which is sufficient to uniquely identify the site's entity type +
+    // bundle + field for use in hypermedia formats, but we do not take into
+    // account unclean URLs, language prefixing, or anything else that would be
+    // required for Drupal to be able to respond with content at this URL. If a
+    // module is installed that adds such content, but requires this URL to be
+    // different (e.g., include a language prefix), then the module must also
+    // override the RelationLinkManager class/service to return the desired URL.
+    $uri = $this->getLinkDomain() . "/rest/relation/$entity_type/$bundle/$field_name";
+    $this->moduleHandler->alter('hal_relation_uri', $uri, $context);
+    // @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This
+    // hook is invoked to maintain backwards compatibility
+    $this->moduleHandler->alter('rest_relation_uri', $uri, $context);
+    return $uri;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRelationInternalIds($relation_uri, $context = []) {
+    $relations = $this->getRelations($context);
+    if (isset($relations[$relation_uri])) {
+      return $relations[$relation_uri];
+    }
+    return FALSE;
+  }
+
+  /**
+   * Get the array of relation links.
+   *
+   * Any field can be handled as a relation simply by changing how it is
+   * normalized. Therefore, there is no prior knowledge that can be used here
+   * to determine which fields to assign relation URIs. Instead, each field,
+   * even primitives, are given a relation URI. It is up to the caller to
+   * determine which URIs to use.
+   *
+   * @param array $context
+   *   Context from the normalizer/serializer operation.
+   *
+   * @return array
+   *   An array of typed data ids (entity_type, bundle, and field name) keyed
+   *   by corresponding relation URI.
+   */
+  protected function getRelations($context = []) {
+    $cid = 'hal:links:relations';
+    $cache = $this->cache->get($cid);
+    if (!$cache) {
+      $this->writeCache($context);
+      $cache = $this->cache->get($cid);
+    }
+    return $cache->data;
+  }
+
+  /**
+   * Writes the cache of relation links.
+   *
+   * @param array $context
+   *   Context from the normalizer/serializer operation.
+   */
+  protected function writeCache($context = []) {
+    $data = [];
+
+    foreach ($this->entityManager->getDefinitions() as $entity_type) {
+      if ($entity_type instanceof ContentEntityTypeInterface) {
+        foreach ($this->entityManager->getBundleInfo($entity_type->id()) as $bundle => $bundle_info) {
+          foreach ($this->entityManager->getFieldDefinitions($entity_type->id(), $bundle) as $field_definition) {
+            $relation_uri = $this->getRelationUri($entity_type->id(), $bundle, $field_definition->getName(), $context);
+            $data[$relation_uri] = [
+              'entity_type' => $entity_type,
+              'bundle' => $bundle,
+              'field_name' => $field_definition->getName(),
+            ];
+          }
+        }
+      }
+    }
+    // These URIs only change when field info changes, so cache it permanently
+    // and only clear it when the fields cache is cleared.
+    $this->cache->set('hal:links:relations', $data, Cache::PERMANENT, ['entity_field_info']);
+  }
+
+}
diff --git a/web/core/modules/hal/src/LinkManager/RelationLinkManagerInterface.php b/web/core/modules/hal/src/LinkManager/RelationLinkManagerInterface.php
new file mode 100644
index 000000000..9a9c83913
--- /dev/null
+++ b/web/core/modules/hal/src/LinkManager/RelationLinkManagerInterface.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\hal\LinkManager;
+
+interface RelationLinkManagerInterface extends ConfigurableLinkManagerInterface {
+
+  /**
+   * Gets the URI that corresponds to a field.
+   *
+   * When using hypermedia formats, this URI can be used to indicate which
+   * field the data represents. Documentation about this field can also be
+   * provided at this URI.
+   *
+   * @param string $entity_type
+   *   The bundle's entity type.
+   * @param string $bundle
+   *   The bundle name.
+   * @param string $field_name
+   *   The field name.
+   * @param array $context
+   *   (optional) Optional serializer/normalizer context.
+   *
+   * @return string
+   *   The corresponding URI for the field.
+   */
+  public function getRelationUri($entity_type, $bundle, $field_name, $context = []);
+
+  /**
+   * Translates a REST URI into internal IDs.
+   *
+   * @param string $relation_uri
+   *   Relation URI to transform into internal IDs
+   *
+   * @return array
+   *   Array with keys 'entity_type', 'bundle' and 'field_name'.
+   */
+  public function getRelationInternalIds($relation_uri);
+
+}
diff --git a/web/core/modules/hal/src/LinkManager/TypeLinkManager.php b/web/core/modules/hal/src/LinkManager/TypeLinkManager.php
new file mode 100644
index 000000000..c3a948ff8
--- /dev/null
+++ b/web/core/modules/hal/src/LinkManager/TypeLinkManager.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Drupal\hal\LinkManager;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class TypeLinkManager extends LinkManagerBase implements TypeLinkManagerInterface {
+
+  /**
+   * Injected cache backend.
+   *
+   * @var \Drupal\Core\Cache\CacheBackendInterface;
+   */
+  protected $cache;
+
+  /**
+   * Module handler service.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * The bundle info service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleInfoService;
+
+  /**
+   * Constructor.
+   *
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
+   *   The injected cache backend for caching type URIs.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler service.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory service.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info_service
+   *   The bundle info service.
+   */
+  public function __construct(CacheBackendInterface $cache, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory, RequestStack $request_stack, EntityTypeBundleInfoInterface $bundle_info_service) {
+    $this->cache = $cache;
+    $this->configFactory = $config_factory;
+    $this->moduleHandler = $module_handler;
+    $this->requestStack = $request_stack;
+    $this->bundleInfoService = $bundle_info_service;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTypeUri($entity_type, $bundle, $context = []) {
+    // Per the interface documentation of this method, the returned URI may
+    // optionally also serve as the URL of a documentation page about this
+    // bundle. However, Drupal does not currently implement such a documentation
+    // page. Therefore, we return a URI assembled relative to the site's base
+    // URL, which is sufficient to uniquely identify the site's entity type and
+    // bundle for use in hypermedia formats, but we do not take into account
+    // unclean URLs, language prefixing, or anything else that would be required
+    // for Drupal to be able to respond with content at this URL. If a module is
+    // installed that adds such content, but requires this URL to be different
+    // (e.g., include a language prefix), then the module must also override the
+    // TypeLinkManager class/service to return the desired URL.
+    $uri = $this->getLinkDomain() . "/rest/type/$entity_type/$bundle";
+    $this->moduleHandler->alter('hal_type_uri', $uri, $context);
+    // @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This
+    // hook is invoked to maintain backwards compatibility
+    $this->moduleHandler->alter('rest_type_uri', $uri, $context);
+    return $uri;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTypeInternalIds($type_uri, $context = []) {
+    $types = $this->getTypes($context);
+    if (isset($types[$type_uri])) {
+      return $types[$type_uri];
+    }
+    return FALSE;
+  }
+
+  /**
+   * Get the array of type links.
+   *
+   * @param array $context
+   *   Context from the normalizer/serializer operation.
+   *
+   * @return array
+   *   An array of typed data ids (entity_type and bundle) keyed by
+   *   corresponding type URI.
+   */
+  protected function getTypes($context = []) {
+    $cid = 'hal:links:types';
+    $cache = $this->cache->get($cid);
+    if (!$cache) {
+      $data = $this->writeCache($context);
+    }
+    else {
+      $data = $cache->data;
+    }
+    return $data;
+  }
+
+  /**
+   * Writes the cache of type links.
+   *
+   * @param array $context
+   *   Context from the normalizer/serializer operation.
+   *
+   * @return array
+   *   An array of typed data ids (entity_type and bundle) keyed by
+   *   corresponding type URI.
+   */
+  protected function writeCache($context = []) {
+    $data = [];
+
+    // Type URIs correspond to bundles. Iterate through the bundles to get the
+    // URI and data for them.
+    $entity_types = \Drupal::entityManager()->getDefinitions();
+    foreach ($this->bundleInfoService->getAllBundleInfo() as $entity_type_id => $bundles) {
+      // Only content entities are supported currently.
+      // @todo Consider supporting config entities.
+      if ($entity_types[$entity_type_id]->entityClassImplements(ConfigEntityInterface::class)) {
+        continue;
+      }
+      foreach ($bundles as $bundle => $bundle_info) {
+        // Get a type URI for the bundle.
+        $bundle_uri = $this->getTypeUri($entity_type_id, $bundle, $context);
+        $data[$bundle_uri] = [
+          'entity_type' => $entity_type_id,
+          'bundle' => $bundle,
+        ];
+      }
+    }
+    // These URIs only change when entity info changes, so cache it permanently
+    // and only clear it when entity_info is cleared.
+    $this->cache->set('hal:links:types', $data, Cache::PERMANENT, ['entity_types']);
+    return $data;
+  }
+
+}
diff --git a/web/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php b/web/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php
new file mode 100644
index 000000000..c3dabe419
--- /dev/null
+++ b/web/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\hal\LinkManager;
+
+interface TypeLinkManagerInterface extends ConfigurableLinkManagerInterface {
+
+  /**
+   * Gets the URI that corresponds to a bundle.
+   *
+   * When using hypermedia formats, this URI can be used to indicate which
+   * bundle the data represents. Documentation about required and optional
+   * fields can also be provided at this URI.
+   *
+   * @param $entity_type
+   *   The bundle's entity type.
+   * @param $bundle
+   *   The bundle name.
+   * @param array $context
+   *   (optional) Optional serializer/normalizer context.
+   *
+   * @return string
+   *   The corresponding URI for the bundle.
+   */
+  public function getTypeUri($entity_type, $bundle, $context = []);
+
+  /**
+   * Get a bundle's Typed Data IDs based on a URI.
+   *
+   * @param string $type_uri
+   *   The type URI.
+   * @param array $context
+   *   Context from the normalizer/serializer operation.
+   *
+   * @return array | boolean
+   *   If the URI matches a bundle, returns an array containing entity_type and
+   *   bundle. Otherwise, returns false.
+   */
+  public function getTypeInternalIds($type_uri, $context = []);
+
+}
diff --git a/web/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php b/web/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
index 70e76bea4..1fc118dc5 100644
--- a/web/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
+++ b/web/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
@@ -6,7 +6,8 @@ use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\rest\LinkManager\LinkManagerInterface;
+use Drupal\hal\LinkManager\LinkManagerInterface;
+use Drupal\serialization\Normalizer\FieldableEntityNormalizerTrait;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 
 /**
@@ -14,6 +15,8 @@ use Symfony\Component\Serializer\Exception\UnexpectedValueException;
  */
 class ContentEntityNormalizer extends NormalizerBase {
 
+  use FieldableEntityNormalizerTrait;
+
   /**
    * The interface or class that this Normalizer supports.
    *
@@ -24,17 +27,10 @@ class ContentEntityNormalizer extends NormalizerBase {
   /**
    * The hypermedia link manager.
    *
-   * @var \Drupal\rest\LinkManager\LinkManagerInterface
+   * @var \Drupal\hal\LinkManager\LinkManagerInterface
    */
   protected $linkManager;
 
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
   /**
    * The module handler.
    *
@@ -42,11 +38,10 @@ class ContentEntityNormalizer extends NormalizerBase {
    */
   protected $moduleHandler;
 
-
   /**
    * Constructs an ContentEntityNormalizer object.
    *
-   * @param \Drupal\rest\LinkManager\LinkManagerInterface $link_manager
+   * @param \Drupal\hal\LinkManager\LinkManagerInterface $link_manager
    *   The hypermedia link manager.
    */
   public function __construct(LinkManagerInterface $link_manager, EntityManagerInterface $entity_manager, ModuleHandlerInterface $module_handler) {
@@ -58,28 +53,28 @@ class ContentEntityNormalizer extends NormalizerBase {
   /**
    * {@inheritdoc}
    */
-  public function normalize($entity, $format = NULL, array $context = array()) {
-    $context += array(
+  public function normalize($entity, $format = NULL, array $context = []) {
+    $context += [
       'account' => NULL,
       'included_fields' => NULL,
-    );
+    ];
 
     // Create the array of normalized fields, starting with the URI.
     /** @var $entity \Drupal\Core\Entity\ContentEntityInterface */
-    $normalized = array(
-      '_links' => array(
-        'self' => array(
+    $normalized = [
+      '_links' => [
+        'self' => [
           'href' => $this->getEntityUri($entity),
-        ),
-        'type' => array(
+        ],
+        'type' => [
           'href' => $this->linkManager->getTypeUri($entity->getEntityTypeId(), $entity->bundle(), $context),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     // If the fields to use were specified, only output those field values.
     if (isset($context['included_fields'])) {
-      $fields = array();
+      $fields = [];
       foreach ($context['included_fields'] as $field_name) {
         $fields[] = $entity->get($field_name);
       }
@@ -120,7 +115,7 @@ class ContentEntityNormalizer extends NormalizerBase {
    *
    * @throws \Symfony\Component\Serializer\Exception\UnexpectedValueException
    */
-  public function denormalize($data, $class, $format = NULL, array $context = array()) {
+  public function denormalize($data, $class, $format = NULL, array $context = []) {
     // Get type, necessary for determining which bundle to create.
     if (!isset($data['_links']['type'])) {
       throw new UnexpectedValueException('The type link relation must be specified.');
@@ -128,10 +123,10 @@ class ContentEntityNormalizer extends NormalizerBase {
 
     // Create the entity.
     $typed_data_ids = $this->getTypedDataIds($data['_links']['type'], $context);
-    $entity_type = $this->entityManager->getDefinition($typed_data_ids['entity_type']);
+    $entity_type = $this->getEntityTypeDefinition($typed_data_ids['entity_type']);
     $default_langcode_key = $entity_type->getKey('default_langcode');
     $langcode_key = $entity_type->getKey('langcode');
-    $values = array();
+    $values = [];
 
     // Figure out the language to use.
     if (isset($data[$default_langcode_key])) {
@@ -159,7 +154,7 @@ class ContentEntityNormalizer extends NormalizerBase {
     // Remove links from data array.
     unset($data['_links']);
     // Get embedded resources and remove from data array.
-    $embedded = array();
+    $embedded = [];
     if (isset($data['_embedded'])) {
       $embedded = $data['_embedded'];
       unset($data['_embedded']);
@@ -174,23 +169,11 @@ class ContentEntityNormalizer extends NormalizerBase {
       }
     }
 
-    // Pass the names of the fields whose values can be merged.
-    $entity->_restSubmittedFields = array_keys($data);
+    $this->denormalizeFieldData($data, $entity, $format, $context);
 
-    // Iterate through remaining items in data array. These should all
-    // correspond to fields.
-    foreach ($data as $field_name => $field_data) {
-      $items = $entity->get($field_name);
-      // Remove any values that were set as a part of entity creation (e.g
-      // uuid). If the incoming field data is set to an empty array, this will
-      // also have the effect of emptying the field in REST module.
-      $items->setValue(array());
-      if ($field_data) {
-        // Denormalize the field data into the FieldItemList object.
-        $context['target_instance'] = $items;
-        $this->serializer->denormalize($field_data, get_class($items), $format, $context);
-      }
-    }
+    // Pass the names of the fields whose values can be merged.
+    // @todo https://www.drupal.org/node/2456257 remove this.
+    $entity->_restSubmittedFields = array_keys($data);
 
     return $entity;
   }
@@ -224,12 +207,12 @@ class ContentEntityNormalizer extends NormalizerBase {
    * @return array
    *   The typed data IDs.
    */
-  protected function getTypedDataIds($types, $context = array()) {
+  protected function getTypedDataIds($types, $context = []) {
     // The 'type' can potentially contain an array of type objects. By default,
     // Drupal only uses a single type in serializing, but allows for multiple
     // types when deserializing.
     if (isset($types['href'])) {
-      $types = array($types);
+      $types = [$types];
     }
 
     if (empty($types)) {
diff --git a/web/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php b/web/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
index 6c73256e1..fbcae8c75 100644
--- a/web/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
+++ b/web/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
@@ -3,7 +3,7 @@
 namespace Drupal\hal\Normalizer;
 
 use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\rest\LinkManager\LinkManagerInterface;
+use Drupal\hal\LinkManager\LinkManagerInterface;
 use Drupal\serialization\EntityResolver\EntityResolverInterface;
 use Drupal\serialization\EntityResolver\UuidReferenceInterface;
 
@@ -22,7 +22,7 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR
   /**
    * The hypermedia link manager.
    *
-   * @var \Drupal\rest\LinkManager\LinkManagerInterface
+   * @var \Drupal\hal\LinkManager\LinkManagerInterface
    */
   protected $linkManager;
 
@@ -36,7 +36,7 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR
   /**
    * Constructs an EntityReferenceItemNormalizer object.
    *
-   * @param \Drupal\rest\LinkManager\LinkManagerInterface $link_manager
+   * @param \Drupal\hal\LinkManager\LinkManagerInterface $link_manager
    *   The hypermedia link manager.
    * @param \Drupal\serialization\EntityResolver\EntityResolverInterface $entity_Resolver
    *   The entity resolver.
@@ -49,7 +49,7 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR
   /**
    * {@inheritdoc}
    */
-  public function normalize($field_item, $format = NULL, array $context = array()) {
+  public function normalize($field_item, $format = NULL, array $context = []) {
     /** @var $field_item \Drupal\Core\Field\FieldItemInterface */
     $target_entity = $field_item->get('entity')->getValue();
 
@@ -64,7 +64,7 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR
     // will include the langcode.
     $langcode = isset($context['langcode']) ? $context['langcode'] : NULL;
     unset($context['langcode']);
-    $context['included_fields'] = array('uuid');
+    $context['included_fields'] = ['uuid'];
 
     // Normalize the target entity.
     $embedded = $this->serializer->normalize($target_entity, $format, $context);
@@ -81,14 +81,14 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR
     $field_name = $field_item->getParent()->getName();
     $entity = $field_item->getEntity();
     $field_uri = $this->linkManager->getRelationUri($entity->getEntityTypeId(), $entity->bundle(), $field_name, $context);
-    return array(
-      '_links' => array(
-        $field_uri => array($link),
-      ),
-      '_embedded' => array(
-        $field_uri => array($embedded),
-      ),
-    );
+    return [
+      '_links' => [
+        $field_uri => [$link],
+      ],
+      '_embedded' => [
+        $field_uri => [$embedded],
+      ],
+    ];
   }
 
   /**
@@ -100,7 +100,7 @@ class EntityReferenceItemNormalizer extends FieldItemNormalizer implements UuidR
     $target_type = $field_definition->getSetting('target_type');
     $id = $this->entityResolver->resolve($this, $data, $target_type);
     if (isset($id)) {
-      return array('target_id' => $id);
+      return ['target_id' => $id];
     }
     return NULL;
   }
diff --git a/web/core/modules/hal/src/Normalizer/FieldItemNormalizer.php b/web/core/modules/hal/src/Normalizer/FieldItemNormalizer.php
index 376a444b6..dc5aec989 100644
--- a/web/core/modules/hal/src/Normalizer/FieldItemNormalizer.php
+++ b/web/core/modules/hal/src/Normalizer/FieldItemNormalizer.php
@@ -20,8 +20,15 @@ class FieldItemNormalizer extends NormalizerBase {
   /**
    * {@inheritdoc}
    */
-  public function normalize($field_item, $format = NULL, array $context = array()) {
-    $values = $field_item->toArray();
+  public function normalize($field_item, $format = NULL, array $context = []) {
+    $values = [];
+    // We normalize each individual property, so each can do their own casting,
+    // if needed.
+    /** @var \Drupal\Core\TypedData\TypedDataInterface $property */
+    foreach ($field_item as $property_name => $property) {
+      $values[$property_name] = $this->serializer->normalize($property, $format, $context);
+    }
+
     if (isset($context['langcode'])) {
       $values['lang'] = $context['langcode'];
     }
@@ -31,15 +38,15 @@ class FieldItemNormalizer extends NormalizerBase {
     // FieldNormalizer. This is necessary for the EntityReferenceItemNormalizer
     // to be able to place values in the '_links' array.
     $field = $field_item->getParent();
-    return array(
-      $field->getName() => array($values),
-    );
+    return [
+      $field->getName() => [$values],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function denormalize($data, $class, $format = NULL, array $context = array()) {
+  public function denormalize($data, $class, $format = NULL, array $context = []) {
     if (!isset($context['target_instance'])) {
       throw new InvalidArgumentException('$context[\'target_instance\'] must be set to denormalize with the FieldItemNormalizer');
     }
diff --git a/web/core/modules/hal/src/Normalizer/FieldNormalizer.php b/web/core/modules/hal/src/Normalizer/FieldNormalizer.php
index 71d35feca..a4e175323 100644
--- a/web/core/modules/hal/src/Normalizer/FieldNormalizer.php
+++ b/web/core/modules/hal/src/Normalizer/FieldNormalizer.php
@@ -3,25 +3,25 @@
 namespace Drupal\hal\Normalizer;
 
 use Drupal\Component\Utility\NestedArray;
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Drupal\serialization\Normalizer\FieldNormalizer as SerializationFieldNormalizer;
 
 /**
  * Converts the Drupal field structure to HAL array structure.
  */
-class FieldNormalizer extends NormalizerBase {
+class FieldNormalizer extends SerializationFieldNormalizer {
 
   /**
-   * The interface or class that this Normalizer supports.
+   * The formats that the Normalizer can handle.
    *
-   * @var string
+   * @var array
    */
-  protected $supportedInterfaceOrClass = 'Drupal\Core\Field\FieldItemListInterface';
+  protected $format = ['hal_json'];
 
   /**
    * {@inheritdoc}
    */
-  public function normalize($field, $format = NULL, array $context = array()) {
-    $normalized_field_items = array();
+  public function normalize($field, $format = NULL, array $context = []) {
+    $normalized_field_items = [];
 
     // Get the field definition.
     $entity = $field->getEntity();
@@ -51,33 +51,6 @@ class FieldNormalizer extends NormalizerBase {
     return $normalized;
   }
 
-
-  /**
-   * {@inheritdoc}
-   */
-  public function denormalize($data, $class, $format = NULL, array $context = array()) {
-    if (!isset($context['target_instance'])) {
-      throw new InvalidArgumentException('$context[\'target_instance\'] must be set to denormalize with the FieldNormalizer');
-    }
-    if ($context['target_instance']->getParent() == NULL) {
-      throw new InvalidArgumentException('The field passed in via $context[\'target_instance\'] must have a parent set.');
-    }
-
-    $items = $context['target_instance'];
-    $item_class = $items->getItemDefinition()->getClass();
-    foreach ($data as $item_data) {
-      // Create a new item and pass it as the target for the unserialization of
-      // $item_data. Note: if $item_data is about a different language than the
-      // default, FieldItemNormalizer::denormalize() will dismiss this item and
-      // create a new one for the right language.
-      $context['target_instance'] = $items->appendItem();
-      $this->serializer->denormalize($item_data, $item_class, $format, $context);
-    }
-
-    return $items;
-
-  }
-
   /**
    * Helper function to normalize field items.
    *
@@ -92,7 +65,7 @@ class FieldNormalizer extends NormalizerBase {
    *   The array of normalized field items.
    */
   protected function normalizeFieldItems($field, $format, $context) {
-    $normalized_field_items = array();
+    $normalized_field_items = [];
     if (!$field->isEmpty()) {
       foreach ($field as $field_item) {
         $normalized_field_items[] = $this->serializer->normalize($field_item, $format, $context);
diff --git a/web/core/modules/hal/src/Normalizer/FileEntityNormalizer.php b/web/core/modules/hal/src/Normalizer/FileEntityNormalizer.php
index 46c609451..ec870e9e1 100644
--- a/web/core/modules/hal/src/Normalizer/FileEntityNormalizer.php
+++ b/web/core/modules/hal/src/Normalizer/FileEntityNormalizer.php
@@ -4,7 +4,7 @@ namespace Drupal\hal\Normalizer;
 
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\rest\LinkManager\LinkManagerInterface;
+use Drupal\hal\LinkManager\LinkManagerInterface;
 use GuzzleHttp\ClientInterface;
 
 /**
@@ -33,7 +33,7 @@ class FileEntityNormalizer extends ContentEntityNormalizer {
    *   The entity manager.
    * @param \GuzzleHttp\ClientInterface $http_client
    *   The HTTP Client.
-   * @param \Drupal\rest\LinkManager\LinkManagerInterface $link_manager
+   * @param \Drupal\hal\LinkManager\LinkManagerInterface $link_manager
    *   The hypermedia link manager.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler.
@@ -47,7 +47,7 @@ class FileEntityNormalizer extends ContentEntityNormalizer {
   /**
    * {@inheritdoc}
    */
-  public function normalize($entity, $format = NULL, array $context = array()) {
+  public function normalize($entity, $format = NULL, array $context = []) {
     $data = parent::normalize($entity, $format, $context);
     // Replace the file url with a full url for the file.
     $data['uri'][0]['value'] = $this->getEntityUri($entity);
@@ -58,7 +58,7 @@ class FileEntityNormalizer extends ContentEntityNormalizer {
   /**
    * {@inheritdoc}
    */
-  public function denormalize($data, $class, $format = NULL, array $context = array()) {
+  public function denormalize($data, $class, $format = NULL, array $context = []) {
     $file_data = (string) $this->httpClient->get($data['uri'][0]['value'])->getBody();
 
     $path = 'temporary://' . drupal_basename($data['uri'][0]['value']);
diff --git a/web/core/modules/hal/src/Normalizer/NormalizerBase.php b/web/core/modules/hal/src/Normalizer/NormalizerBase.php
index a4b9af23f..43a5a0716 100644
--- a/web/core/modules/hal/src/Normalizer/NormalizerBase.php
+++ b/web/core/modules/hal/src/Normalizer/NormalizerBase.php
@@ -15,7 +15,7 @@ abstract class NormalizerBase extends SerializationNormalizerBase implements Den
    *
    * @var array
    */
-  protected $formats = array('hal_json');
+  protected $formats = ['hal_json'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/hal/tests/fixtures/update/drupal-8.hal-hal_update_8301.php b/web/core/modules/hal/tests/fixtures/update/drupal-8.hal-hal_update_8301.php
new file mode 100644
index 000000000..ba7ac8a7d
--- /dev/null
+++ b/web/core/modules/hal/tests/fixtures/update/drupal-8.hal-hal_update_8301.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains database additions to drupal-8.bare.standard.php.gz for testing the
+ * upgrade path of hal_update_8301().
+ */
+
+use Drupal\Core\Database\Database;
+
+$connection = Database::getConnection();
+
+// Set the schema version.
+$connection->insert('key_value')
+  ->fields([
+    'collection' => 'system.schema',
+    'name' => 'hal',
+    'value' => 'i:8000;',
+  ])
+  ->fields([
+    'collection' => 'system.schema',
+    'name' => 'serialization',
+    'value' => 'i:8000;',
+  ])
+  ->execute();
+
+// Update core.extension.
+$extensions = $connection->select('config')
+  ->fields('config', ['data'])
+  ->condition('collection', '')
+  ->condition('name', 'core.extension')
+  ->execute()
+  ->fetchField();
+$extensions = unserialize($extensions);
+$extensions['module']['hal'] = 0;
+$extensions['module']['serialization'] = 0;
+$connection->update('config')
+  ->fields([
+    'data' => serialize($extensions),
+  ])
+  ->condition('collection', '')
+  ->condition('name', 'core.extension')
+  ->execute();
diff --git a/web/core/modules/hal/tests/fixtures/update/drupal-8.rest-hal_update_8301.php b/web/core/modules/hal/tests/fixtures/update/drupal-8.rest-hal_update_8301.php
new file mode 100644
index 000000000..842e52afd
Binary files /dev/null and b/web/core/modules/hal/tests/fixtures/update/drupal-8.rest-hal_update_8301.php differ
diff --git a/web/core/modules/hal/tests/modules/hal_test/hal_test.info.yml b/web/core/modules/hal/tests/modules/hal_test/hal_test.info.yml
new file mode 100644
index 000000000..8f7d7ad0b
--- /dev/null
+++ b/web/core/modules/hal/tests/modules/hal_test/hal_test.info.yml
@@ -0,0 +1,6 @@
+name: HAL test module
+type: module
+description: "Support module for HAL tests."
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/web/core/modules/hal/tests/modules/hal_test/hal_test.module b/web/core/modules/hal/tests/modules/hal_test/hal_test.module
new file mode 100644
index 000000000..8788eaf41
--- /dev/null
+++ b/web/core/modules/hal/tests/modules/hal_test/hal_test.module
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains hook implementations for testing HAL module.
+ */
+
+/**
+ * Implements hook_hal_type_uri_alter().
+ */
+function hal_test_hal_type_uri_alter(&$uri, $context = []) {
+  if (!empty($context['hal_test'])) {
+    $uri = 'hal_test_type';
+  }
+}
+
+/**
+ * Implements hook_hal_relation_uri_alter().
+ */
+function hal_test_hal_relation_uri_alter(&$uri, $context = []) {
+  if (!empty($context['hal_test'])) {
+    $uri = 'hal_test_relation';
+  }
+}
+
+/**
+ * Implements hook_rest_type_uri_alter().
+ *
+ * @deprecated Kept only for BC test coverage, see \Drupal\Tests\hal\Kernel\HalLinkManagerTest::testGetTypeUri().
+ */
+function hal_test_rest_type_uri_alter(&$uri, $context = []) {
+  if (!empty($context['rest_test'])) {
+    $uri = 'rest_test_type';
+  }
+}
+
+/**
+ * Implements hook_rest_relation_uri_alter().
+ *
+ * @deprecated Kept only for BC test coverage, see \Drupal\Tests\hal\Kernel\HalLinkManagerTest::testGetRelationUri().
+ */
+function hal_test_rest_relation_uri_alter(&$uri, $context = []) {
+  if (!empty($context['rest_test'])) {
+    $uri = 'rest_test_relation';
+  }
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php
new file mode 100644
index 000000000..0eae86630
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonAnonTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\Action;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\Action\ActionResourceTestBase;
+
+/**
+ * @group hal
+ */
+class ActionHalJsonAnonTest extends ActionResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..5a43a5d9f
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonBasicAuthTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\Action;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\Action\ActionResourceTestBase;
+
+/**
+ * @group hal
+ */
+class ActionHalJsonBasicAuthTest extends ActionResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonCookieTest.php
new file mode 100644
index 000000000..21f08c580
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Action/ActionHalJsonCookieTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\Action;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\Action\ActionResourceTestBase;
+
+/**
+ * @group hal
+ */
+class ActionHalJsonCookieTest extends ActionResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
index d0758f347..d0563c0da 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonAnonTest.php
@@ -27,9 +27,4 @@ class BlockHalJsonAnonTest extends BlockResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
index 81ebf551b..53bcd3e19 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonBasicAuthTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Block;
 
-use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\Block\BlockResourceTestBase;
 
@@ -28,19 +27,9 @@ class BlockHalJsonBasicAuthTest extends BlockResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use HalJsonBasicAuthWorkaroundFor2805281Trait {
-    HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php
index 1403ebef7..494bb4fe8 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Block/BlockHalJsonCookieTest.php
@@ -27,11 +27,6 @@ class BlockHalJsonCookieTest extends BlockResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php
index 8b6e4a3f7..7e2dc57cd 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonBasicAuthTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Comment;
 
-use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
 /**
@@ -22,9 +21,4 @@ class CommentHalJsonBasicAuthTest extends CommentHalJsonTestBase {
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use HalJsonBasicAuthWorkaroundFor2805281Trait {
-    HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
index f4b03af46..fc9248aca 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Comment/CommentHalJsonTestBase.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Comment;
 
-use Drupal\Core\Cache\Cache;
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\EntityResource\Comment\CommentResourceTestBase;
@@ -27,11 +26,6 @@ abstract class CommentHalJsonTestBase extends CommentResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    *
@@ -42,9 +36,9 @@ abstract class CommentHalJsonTestBase extends CommentResourceTestBase {
    * @todo fix in https://www.drupal.org/node/2824271
    */
   protected static $patchProtectedFieldNames = [
+    'status',
     'created',
     'changed',
-    'status',
     'thread',
     'entity_type',
     'field_name',
@@ -133,12 +127,4 @@ abstract class CommentHalJsonTestBase extends CommentResourceTestBase {
     ];
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    // The 'url.site' cache context is added for '_links' in the response.
-    return Cache::mergeTags(parent::getExpectedCacheContexts(), ['url.site']);
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonAnonTest.php
new file mode 100644
index 000000000..37cf71758
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonAnonTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\CommentType;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\CommentType\CommentTypeResourceTestBase;
+
+/**
+ * @group hal
+ */
+class CommentTypeHalJsonAnonTest extends CommentTypeResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..62b48afd3
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonBasicAuthTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\CommentType;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\CommentType\CommentTypeResourceTestBase;
+
+/**
+ * @group hal
+ */
+class CommentTypeHalJsonBasicAuthTest extends CommentTypeResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonCookieTest.php
new file mode 100644
index 000000000..4a2913be3
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/CommentType/CommentTypeHalJsonCookieTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\CommentType;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\CommentType\CommentTypeResourceTestBase;
+
+/**
+ * @group hal
+ */
+class CommentTypeHalJsonCookieTest extends CommentTypeResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php
index 45cedb2a9..dbe2a3d8c 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonAnonTest.php
@@ -27,9 +27,4 @@ class ConfigTestHalJsonAnonTest extends ConfigTestResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php
index 489a3a552..99345ede7 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonBasicAuthTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\ConfigTest;
 
-use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\ConfigTest\ConfigTestResourceTestBase;
 
@@ -28,19 +27,9 @@ class ConfigTestHalJsonBasicAuthTest extends ConfigTestResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use HalJsonBasicAuthWorkaroundFor2805281Trait {
-    HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php
index 846aa9f05..d892abf5e 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigTest/ConfigTestHalJsonCookieTest.php
@@ -27,11 +27,6 @@ class ConfigTestHalJsonCookieTest extends ConfigTestResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php
new file mode 100644
index 000000000..4152a5f2a
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonAnonTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\ConfigurableLanguage;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage\ConfigurableLanguageResourceTestBase;
+
+/**
+ * @group hal
+ */
+class ConfigurableLanguageHalJsonAnonTest extends ConfigurableLanguageResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..71b41bc08
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonBasicAuthTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\ConfigurableLanguage;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage\ConfigurableLanguageResourceTestBase;
+
+/**
+ * @group hal
+ */
+class ConfigurableLanguageHalJsonBasicAuthTest extends ConfigurableLanguageResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonCookieTest.php
new file mode 100644
index 000000000..357adc026
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageHalJsonCookieTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\ConfigurableLanguage;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage\ConfigurableLanguageResourceTestBase;
+
+/**
+ * @group hal
+ */
+class ConfigurableLanguageHalJsonCookieTest extends ConfigurableLanguageResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php
index fd02f1297..ef3826bea 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonAnonTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest;
 
-use Drupal\Core\Cache\Cache;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\EntityTest\EntityTestResourceTestBase;
@@ -31,11 +30,6 @@ class EntityTestHalJsonAnonTest extends EntityTestResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
@@ -94,12 +88,4 @@ class EntityTestHalJsonAnonTest extends EntityTestResourceTestBase {
     ];
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    // The 'url.site' cache context is added for '_links' in the response.
-    return Cache::mergeTags(parent::getExpectedCacheContexts(), ['url.site']);
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php
index 5604e3b54..65ad0db63 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTest/EntityTestHalJsonBasicAuthTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\EntityTest;
 
-use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
 /**
@@ -22,9 +21,4 @@ class EntityTestHalJsonBasicAuthTest extends EntityTestHalJsonAnonTest {
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use HalJsonBasicAuthWorkaroundFor2805281Trait {
-    HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php
new file mode 100644
index 000000000..f95ea5ce0
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonAnonTest.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestLabel;
+
+use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel\EntityTestLabelResourceTestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * @group hal
+ */
+class EntityTestLabelHalJsonAnonTest extends EntityTestLabelResourceTestBase {
+
+  use HalEntityNormalizationTrait;
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    $default_normalization = parent::getExpectedNormalizedEntity();
+
+    $normalization = $this->applyHalFieldNormalization($default_normalization);
+
+    $author = User::load(0);
+    return $normalization + [
+      '_links' => [
+        'self' => [
+          'href' => '',
+        ],
+        'type' => [
+          'href' => $this->baseUrl . '/rest/type/entity_test_label/entity_test_label',
+        ],
+        $this->baseUrl . '/rest/relation/entity_test_label/entity_test_label/user_id' => [
+          [
+            'href' => $this->baseUrl . '/user/0?_format=hal_json',
+            'lang' => 'en',
+          ],
+        ],
+      ],
+      '_embedded' => [
+        $this->baseUrl . '/rest/relation/entity_test_label/entity_test_label/user_id' => [
+          [
+            '_links' => [
+              'self' => [
+                'href' => $this->baseUrl . '/user/0?_format=hal_json',
+              ],
+              'type' => [
+                'href' => $this->baseUrl . '/rest/type/user/user',
+              ],
+            ],
+            'uuid' => [
+              [
+                'value' => $author->uuid(),
+              ],
+            ],
+            'lang' => 'en',
+          ],
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    return parent::getNormalizedPostEntity() + [
+      '_links' => [
+        'type' => [
+          'href' => $this->baseUrl . '/rest/type/entity_test_label/entity_test_label',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheContexts() {
+    return [
+      'url.site',
+      'user.permissions',
+    ];
+  }
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..b3824aa57
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonBasicAuthTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestLabel;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class EntityTestLabelHalJsonBasicAuthTest extends EntityTestLabelHalJsonAnonTest {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonCookieTest.php
new file mode 100644
index 000000000..fa74cb399
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelHalJsonCookieTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\EntityTestLabel;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class EntityTestLabelHalJsonCookieTest extends EntityTestLabelHalJsonAnonTest {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php
new file mode 100644
index 000000000..b0d1a6103
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonAnonTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\FilterFormat;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\FilterFormat\FilterFormatResourceTestBase;
+
+/**
+ * @group hal
+ */
+class FilterFormatHalJsonAnonTest extends FilterFormatResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..fa409700e
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonBasicAuthTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\FilterFormat;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\FilterFormat\FilterFormatResourceTestBase;
+
+/**
+ * @group hal
+ */
+class FilterFormatHalJsonBasicAuthTest extends FilterFormatResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonCookieTest.php
new file mode 100644
index 000000000..1957793e4
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/FilterFormat/FilterFormatHalJsonCookieTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\FilterFormat;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\FilterFormat\FilterFormatResourceTestBase;
+
+/**
+ * @group hal
+ */
+class FilterFormatHalJsonCookieTest extends FilterFormatResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/HalEntityNormalizationTrait.php b/web/core/modules/hal/tests/src/Functional/EntityResource/HalEntityNormalizationTrait.php
index 836a1b471..99ab3eb0c 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/HalEntityNormalizationTrait.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/HalEntityNormalizationTrait.php
@@ -92,7 +92,7 @@ trait HalEntityNormalizationTrait {
    * {@inheritdoc}
    */
   protected function assertNormalizationEdgeCases($method, Url $url, array $request_options) {
-    // \Drupal\serialization\Normalizer\EntityNormalizer::denormalize(): entity
+    // \Drupal\hal\Normalizer\EntityNormalizer::denormalize(): entity
     // types with bundles MUST send their bundle field to be denormalizable.
     if ($this->entity->getEntityType()->hasKey('bundle')) {
       $normalization = $this->getNormalizedPostEntity();
@@ -103,11 +103,7 @@ trait HalEntityNormalizationTrait {
 
       // DX: 400 when incorrect entity type bundle is specified.
       $response = $this->request($method, $url, $request_options);
-      // @todo Uncomment, remove next 3 in https://www.drupal.org/node/2813853.
-      // $this->assertResourceErrorResponse(400, 'No entity type(s) specified', $response);
-      $this->assertSame(400, $response->getStatusCode());
-      $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-      $this->assertSame($this->serializer->encode(['error' => 'No entity type(s) specified'], static::$format), (string) $response->getBody());
+      $this->assertResourceErrorResponse(400, 'No entity type(s) specified', $response);
 
 
       unset($normalization['_links']['type']);
@@ -116,11 +112,7 @@ trait HalEntityNormalizationTrait {
 
       // DX: 400 when no entity type bundle is specified.
       $response = $this->request($method, $url, $request_options);
-      // @todo Uncomment, remove next 3 in https://www.drupal.org/node/2813853.
-      // $this->assertResourceErrorResponse(400, 'The type link relation must be specified.', $response);
-      $this->assertSame(400, $response->getStatusCode());
-      $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-      $this->assertSame($this->serializer->encode(['error' => 'The type link relation must be specified.'], static::$format), (string) $response->getBody());
+      $this->assertResourceErrorResponse(400, 'The type link relation must be specified.', $response);
     }
   }
 
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php
new file mode 100644
index 000000000..0dabde37c
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonAnonTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\ImageStyle;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\ImageStyle\ImageStyleResourceTestBase;
+
+/**
+ * @group rest
+ */
+class ImageStyleHalJsonAnonTest extends ImageStyleResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..2e4d3eb50
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonBasicAuthTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\ImageStyle;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\ImageStyle\ImageStyleResourceTestBase;
+
+/**
+ * @group rest
+ */
+class ImageStyleHalJsonBasicAuthTest extends ImageStyleResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonCookieTest.php
new file mode 100644
index 000000000..b0f57b963
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/ImageStyle/ImageStyleHalJsonCookieTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\ImageStyle;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\ImageStyle\ImageStyleResourceTestBase;
+
+/**
+ * @group rest
+ */
+class ImageStyleHalJsonCookieTest extends ImageStyleResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonAnonTest.php
new file mode 100644
index 000000000..6c3515968
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonAnonTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\Item;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class ItemHalJsonAnonTest extends ItemHalJsonTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..2c96fbc68
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\Item;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class ItemHalJsonBasicAuthTest extends ItemHalJsonTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonCookieTest.php
new file mode 100644
index 000000000..9c39918b5
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonCookieTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\Item;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class ItemHalJsonCookieTest extends ItemHalJsonTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
new file mode 100644
index 000000000..24157e597
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Item/ItemHalJsonTestBase.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\Item;
+
+use Drupal\aggregator\Entity\Feed;
+use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\Item\ItemResourceTestBase;
+
+/**
+ * ResourceTestBase for Item entity.
+ */
+abstract class ItemHalJsonTestBase extends ItemResourceTestBase {
+
+  use HalEntityNormalizationTrait;
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    $default_normalization = parent::getExpectedNormalizedEntity();
+    $normalization = $this->applyHalFieldNormalization($default_normalization);
+    $feed = Feed::load($this->entity->getFeedId());
+
+    return $normalization + [
+      '_embedded' => [
+        $this->baseUrl . '/rest/relation/aggregator_item/aggregator_item/fid' => [
+          [
+            '_links' => [
+              'self' => [
+                'href' => $this->baseUrl . '/aggregator/sources/1?_format=hal_json',
+              ],
+              'type' => [
+                'href' => $this->baseUrl . '/rest/type/aggregator_feed/aggregator_feed',
+              ],
+            ],
+            'uuid' => [
+              [
+                'value' => $feed->uuid(),
+              ],
+            ],
+          ],
+        ],
+      ],
+      '_links' => [
+        'self' => [
+          'href' => '',
+        ],
+        'type' => [
+          'href' => $this->baseUrl . '/rest/type/aggregator_item/aggregator_item',
+        ],
+        $this->baseUrl . '/rest/relation/aggregator_item/aggregator_item/fid' => [
+          [
+            'href' => $this->baseUrl . '/aggregator/sources/' . $feed->id() . '?_format=hal_json',
+          ],
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    return parent::getNormalizedPostEntity() + [
+      '_links' => [
+        'type' => [
+          'href' => $this->baseUrl . '/rest/type/aggregator_item/aggregator_item',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheContexts() {
+    return [
+      'url.site',
+      'user.permissions',
+    ];
+  }
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonAnonTest.php
new file mode 100644
index 000000000..c4c8d943f
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonAnonTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\MenuLinkContent;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent\MenuLinkContentResourceTestBase;
+
+/**
+ * @group hal
+ */
+class MenuLinkContentHalJsonAnonTest extends MenuLinkContentResourceTestBase {
+
+  use HalEntityNormalizationTrait;
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    $default_normalization = parent::getExpectedNormalizedEntity();
+
+    $normalization = $this->applyHalFieldNormalization($default_normalization);
+
+    return $normalization + [
+      '_links' => [
+        'self' => [
+          'href' => $this->baseUrl . '/admin/structure/menu/item/1/edit?_format=hal_json',
+        ],
+        'type' => [
+          'href' => $this->baseUrl . '/rest/type/menu_link_content/menu_link_content',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    return parent::getNormalizedPostEntity() + [
+      '_links' => [
+        'type' => [
+          'href' => $this->baseUrl . '/rest/type/menu_link_content/menu_link_content',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheContexts() {
+    // The 'url.site' cache context is added for '_links' in the response.
+    return Cache::mergeTags(parent::getExpectedCacheContexts(), ['url.site']);
+  }
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..3af8362e6
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonBasicAuthTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\MenuLinkContent;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class MenuLinkContentHalJsonBasicAuthTest extends MenuLinkContentHalJsonAnonTest {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonCookieTest.php
new file mode 100644
index 000000000..1bcc1f83f
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentHalJsonCookieTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\MenuLinkContent;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class MenuLinkContentHalJsonCookieTest extends MenuLinkContentHalJsonAnonTest {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
index c7f242812..e92a3d664 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Node;
 
-use Drupal\Core\Cache\Cache;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\Node\NodeResourceTestBase;
@@ -31,11 +30,6 @@ class NodeHalJsonAnonTest extends NodeResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
@@ -126,12 +120,4 @@ class NodeHalJsonAnonTest extends NodeResourceTestBase {
     ];
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    // The 'url.site' cache context is added for '_links' in the response.
-    return Cache::mergeContexts(parent::getExpectedCacheContexts(), ['url.site']);
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
index 1d7bb6234..6ae12852c 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonBasicAuthTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Node;
 
-use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
 /**
@@ -22,9 +21,4 @@ class NodeHalJsonBasicAuthTest extends NodeHalJsonAnonTest {
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use HalJsonBasicAuthWorkaroundFor2805281Trait {
-    HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonAnonTest.php
new file mode 100644
index 000000000..5a46564de
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonAnonTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\NodeType;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\NodeType\NodeTypeResourceTestBase;
+
+/**
+ * @group hal
+ */
+class NodeTypeHalJsonAnonTest extends NodeTypeResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..f1b4bca4d
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonBasicAuthTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\NodeType;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\NodeType\NodeTypeResourceTestBase;
+
+/**
+ * @group hal
+ */
+class NodeTypeHalJsonBasicAuthTest extends NodeTypeResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonCookieTest.php
new file mode 100644
index 000000000..0b2f9b268
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/NodeType/NodeTypeHalJsonCookieTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\NodeType;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\NodeType\NodeTypeResourceTestBase;
+
+/**
+ * @group hal
+ */
+class NodeTypeHalJsonCookieTest extends NodeTypeResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
index cad41042b..ca39204db 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonAnonTest.php
@@ -27,9 +27,4 @@ class RoleHalJsonAnonTest extends RoleResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
index f540bb1e6..090f1535f 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonBasicAuthTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Role;
 
-use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\Role\RoleResourceTestBase;
 
@@ -28,19 +27,9 @@ class RoleHalJsonBasicAuthTest extends RoleResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use HalJsonBasicAuthWorkaroundFor2805281Trait {
-    HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonCookieTest.php
index b52713c50..a98046a42 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonCookieTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Role/RoleHalJsonCookieTest.php
@@ -27,11 +27,6 @@ class RoleHalJsonCookieTest extends RoleResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonAnonTest.php
new file mode 100644
index 000000000..28777a413
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonAnonTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\SearchPage;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\SearchPage\SearchPageResourceTestBase;
+
+/**
+ * @group hal
+ */
+class SearchPageHalJsonAnonTest extends SearchPageResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..bb48bbe60
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonBasicAuthTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\SearchPage;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\SearchPage\SearchPageResourceTestBase;
+
+/**
+ * @group hal
+ */
+class SearchPageHalJsonBasicAuthTest extends SearchPageResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonCookieTest.php
new file mode 100644
index 000000000..772a4be05
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/SearchPage/SearchPageHalJsonCookieTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\SearchPage;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\SearchPage\SearchPageResourceTestBase;
+
+/**
+ * @group hal
+ */
+class SearchPageHalJsonCookieTest extends SearchPageResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonAnonTest.php
new file mode 100644
index 000000000..c9e8dc00c
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonAnonTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\Shortcut;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+use Drupal\Tests\rest\Functional\EntityResource\Shortcut\ShortcutResourceTestBase;
+
+/**
+ * @group hal
+ */
+class ShortcutHalJsonAnonTest extends ShortcutResourceTestBase {
+
+  use HalEntityNormalizationTrait;
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    $default_normalization = parent::getExpectedNormalizedEntity();
+
+    $normalization = $this->applyHalFieldNormalization($default_normalization);
+
+    return $normalization + [
+      '_links' => [
+        'self' => [
+          'href' => $this->baseUrl . '/admin/config/user-interface/shortcut/link/1?_format=hal_json',
+        ],
+        'type' => [
+          'href' => $this->baseUrl . '/rest/type/shortcut/default',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    return parent::getNormalizedPostEntity() + [
+      '_links' => [
+        'type' => [
+          'href' => $this->baseUrl . '/rest/type/shortcut/default',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheContexts() {
+    // The 'url.site' cache context is added for '_links' in the response.
+    return Cache::mergeContexts(parent::getExpectedCacheContexts(), ['url.site']);
+  }
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonBasicAuthTest.php
new file mode 100644
index 000000000..a5be6dbc8
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonBasicAuthTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\Shortcut;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class ShortcutHalJsonBasicAuthTest extends ShortcutHalJsonAnonTest {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonCookieTest.php
new file mode 100644
index 000000000..a48a61f9e
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Shortcut/ShortcutHalJsonCookieTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\EntityResource\Shortcut;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class ShortcutHalJsonCookieTest extends ShortcutHalJsonAnonTest {
+
+  use CookieResourceTestTrait;
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
index 9c794ae4b..ff952eabd 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Term;
 
-use Drupal\Core\Cache\Cache;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\Term\TermResourceTestBase;
@@ -30,11 +29,6 @@ class TermHalJsonAnonTest extends TermResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
@@ -68,12 +62,4 @@ class TermHalJsonAnonTest extends TermResourceTestBase {
     ];
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    // The 'url.site' cache context is added for '_links' in the response.
-    return Cache::mergeContexts(parent::getExpectedCacheContexts(), ['url.site']);
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
index 8c7b04b65..58633389f 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonBasicAuthTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Term;
 
-use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
 /**
@@ -22,9 +21,4 @@ class TermHalJsonBasicAuthTest extends TermHalJsonAnonTest {
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use HalJsonBasicAuthWorkaroundFor2805281Trait {
-    HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonAnonTest.php
index d839a722b..7398f2848 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonAnonTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonAnonTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\User;
 
-use Drupal\Core\Cache\Cache;
 use Drupal\Tests\hal\Functional\EntityResource\HalEntityNormalizationTrait;
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\User\UserResourceTestBase;
@@ -30,11 +29,6 @@ class UserHalJsonAnonTest extends UserResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
@@ -68,12 +62,4 @@ class UserHalJsonAnonTest extends UserResourceTestBase {
     ];
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    // The 'url.site' cache context is added for '_links' in the response.
-    return Cache::mergeContexts(parent::getExpectedCacheContexts(), ['url.site']);
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php
index dbf17cb54..985b24c17 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/User/UserHalJsonBasicAuthTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\User;
 
-use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
 /**
@@ -22,9 +21,4 @@ class UserHalJsonBasicAuthTest extends UserHalJsonAnonTest {
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use HalJsonBasicAuthWorkaroundFor2805281Trait {
-    HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonAnonTest.php
index 037ecc751..d4f4bcf56 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonAnonTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonAnonTest.php
@@ -27,11 +27,6 @@ class VocabularyHalJsonAnonTest extends VocabularyResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * @todo Remove this override in https://www.drupal.org/node/2805281.
    */
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php
index 4f7896e9b..d53b836ca 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonBasicAuthTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\hal\Functional\EntityResource\Vocabulary;
 
-use Drupal\Tests\hal\Functional\HalJsonBasicAuthWorkaroundFor2805281Trait;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\Vocabulary\VocabularyResourceTestBase;
 
@@ -28,19 +27,9 @@ class VocabularyHalJsonBasicAuthTest extends VocabularyResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use HalJsonBasicAuthWorkaroundFor2805281Trait {
-    HalJsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonCookieTest.php b/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonCookieTest.php
index b751cdd22..dd3753206 100644
--- a/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonCookieTest.php
+++ b/web/core/modules/hal/tests/src/Functional/EntityResource/Vocabulary/VocabularyHalJsonCookieTest.php
@@ -27,11 +27,6 @@ class VocabularyHalJsonCookieTest extends VocabularyResourceTestBase {
    */
   protected static $mimeType = 'application/hal+json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/hal/src/Tests/FileDenormalizeTest.php b/web/core/modules/hal/tests/src/Functional/FileDenormalizeTest.php
similarity index 89%
rename from web/core/modules/hal/src/Tests/FileDenormalizeTest.php
rename to web/core/modules/hal/tests/src/Functional/FileDenormalizeTest.php
index f160634eb..05ee23489 100644
--- a/web/core/modules/hal/src/Tests/FileDenormalizeTest.php
+++ b/web/core/modules/hal/tests/src/Functional/FileDenormalizeTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\hal\Tests;
+namespace Drupal\Tests\hal\Functional;
 
 use Drupal\file\Entity\File;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that file entities can be denormalized in HAL.
@@ -11,25 +11,25 @@ use Drupal\simpletest\WebTestBase;
  * @group hal
  * @see \Drupal\hal\Normalizer\FileEntityNormalizer
  */
-class FileDenormalizeTest extends WebTestBase {
+class FileDenormalizeTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('hal', 'file', 'node');
+  public static $modules = ['hal', 'file', 'node'];
 
   /**
    * Tests file entity denormalization.
    */
   public function testFileDenormalize() {
-    $file_params = array(
+    $file_params = [
       'filename' => 'test_1.txt',
       'uri' => 'public://test_1.txt',
       'filemime' => 'text/plain',
       'status' => FILE_STATUS_PERMANENT,
-    );
+    ];
     // Create a new file entity.
     $file = File::create($file_params);
     file_put_contents($file->getFileUri(), 'hello world');
@@ -56,11 +56,11 @@ class FileDenormalizeTest extends WebTestBase {
     file_put_contents($file_path, 'hello world');
     $file_uri = file_create_url($file_path);
 
-    $data = array(
-      'uri' => array(
-        array('value' => $file_uri),
-      ),
-    );
+    $data = [
+      'uri' => [
+        ['value' => $file_uri],
+      ],
+    ];
 
     $denormalized = $serializer->denormalize($data, 'Drupal\file\Entity\File', 'hal_json');
 
diff --git a/web/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php b/web/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php
deleted file mode 100644
index ef77d96ce..000000000
--- a/web/core/modules/hal/tests/src/Functional/HalJsonBasicAuthWorkaroundFor2805281Trait.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\hal\Functional;
-
-use Psr\Http\Message\ResponseInterface;
-
-trait HalJsonBasicAuthWorkaroundFor2805281Trait {
-
-  /**
-   * {@inheritdoc}
-   *
-   * Note how the response claims it contains a application/hal+json body, but
-   * in reality it contains a text/plain body! Also, the correct error MIME type
-   * is application/json.
-   *
-   * @todo Fix in https://www.drupal.org/node/2805281: remove this trait.
-   */
-  protected function assertResponseWhenMissingAuthentication(ResponseInterface $response) {
-    $this->assertSame(401, $response->getStatusCode());
-    // @todo this works fine locally, but on testbot it comes back with
-    // 'text/plain; charset=UTF-8'. WTF.
-    // $this->assertSame(['application/hal+json'], $response->getHeader('Content-Type'));
-    $this->assertSame('No authentication credentials provided.', (string) $response->getBody());
-  }
-
-}
diff --git a/web/core/modules/hal/tests/src/Functional/Update/CreateHalSettingsForLinkDomainUpdateTest.php b/web/core/modules/hal/tests/src/Functional/Update/CreateHalSettingsForLinkDomainUpdateTest.php
new file mode 100644
index 000000000..dbc999c9d
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/Update/CreateHalSettingsForLinkDomainUpdateTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\Update;
+
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+
+/**
+ * Tests that 'hal.settings' is created, to store 'link_domain'.
+ *
+ * @see https://www.drupal.org/node/2758897
+ *
+ * @group hal
+ */
+class CreateHalSettingsForLinkDomainUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.hal-hal_update_8301.php',
+    ];
+  }
+
+  /**
+   * Tests hal_update_8301().
+   */
+  public function testHalSettingsCreated() {
+    // Make sure we have the expected values before the update.
+    $hal_settings = $this->config('hal.settings');
+    $this->assertIdentical([], $hal_settings->getRawData());
+
+    $this->runUpdates();
+
+    // Make sure we have the expected values after the update.
+    $hal_settings = \Drupal::configFactory()->get('hal.settings');
+    $this->assertTrue(array_key_exists('link_domain', $hal_settings->getRawData()));
+    $this->assertIdentical(NULL, $hal_settings->getRawData()['link_domain']);
+  }
+
+}
diff --git a/web/core/modules/hal/tests/src/Functional/Update/MigrateLinkDomainSettingFromRestToHalUpdateTest.php b/web/core/modules/hal/tests/src/Functional/Update/MigrateLinkDomainSettingFromRestToHalUpdateTest.php
new file mode 100644
index 000000000..167742075
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Functional/Update/MigrateLinkDomainSettingFromRestToHalUpdateTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\Tests\hal\Functional\Update;
+
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+
+/**
+ * 'link_domain' is migrated from 'rest.settings' to 'hal.settings'.
+ *
+ * @see https://www.drupal.org/node/2758897
+ *
+ * @group hal
+ */
+class MigrateLinkDomainSettingFromRestToHalUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../fixtures/update/drupal-8.hal-hal_update_8301.php',
+      __DIR__ . '/../../../fixtures/update/drupal-8.rest-hal_update_8301.php',
+    ];
+  }
+
+  /**
+   * Tests hal_update_8301().
+   */
+  public function testLinkDomainMigratedFromRestSettingsToHalSettings() {
+    // Make sure we have the expected values before the update.
+    $hal_settings = $this->config('hal.settings');
+    $this->assertIdentical([], $hal_settings->getRawData());
+    $rest_settings = $this->config('rest.settings');
+    $this->assertTrue(array_key_exists('link_domain', $rest_settings->getRawData()));
+    $this->assertIdentical('http://example.com', $rest_settings->getRawData()['link_domain']);
+
+    $this->runUpdates();
+
+    // Make sure we have the expected values after the update.
+    $hal_settings = \Drupal::configFactory()->get('hal.settings');
+    $this->assertTrue(array_key_exists('link_domain', $hal_settings->getRawData()));
+    $this->assertIdentical('http://example.com', $hal_settings->getRawData()['link_domain']);
+    $rest_settings = $this->config('rest.settings');
+    $this->assertFalse(array_key_exists('link_domain', $rest_settings->getRawData()));
+  }
+
+}
diff --git a/web/core/modules/hal/tests/src/Kernel/DenormalizeTest.php b/web/core/modules/hal/tests/src/Kernel/DenormalizeTest.php
index 3f9388bce..d3662cb59 100644
--- a/web/core/modules/hal/tests/src/Kernel/DenormalizeTest.php
+++ b/web/core/modules/hal/tests/src/Kernel/DenormalizeTest.php
@@ -18,40 +18,40 @@ class DenormalizeTest extends NormalizerTestBase {
    */
   public function testTypeHandling() {
     // Valid type.
-    $data_with_valid_type = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-    );
+    $data_with_valid_type = [
+      '_links' => [
+        'type' => [
+          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', ['absolute' => TRUE])->toString(),
+        ],
+      ],
+    ];
     $denormalized = $this->serializer->denormalize($data_with_valid_type, $this->entityClass, $this->format);
     $this->assertEqual(get_class($denormalized), $this->entityClass, 'Request with valid type results in creation of correct bundle.');
 
     // Multiple types.
-    $data_with_multiple_types = array(
-      '_links' => array(
-        'type' => array(
-          array(
-            'href' => Url::fromUri('base:rest/types/foo', array('absolute' => TRUE))->toString(),
-          ),
-          array(
-            'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
-          ),
-        ),
-      ),
-    );
+    $data_with_multiple_types = [
+      '_links' => [
+        'type' => [
+          [
+            'href' => Url::fromUri('base:rest/types/foo', ['absolute' => TRUE])->toString(),
+          ],
+          [
+            'href' => Url::fromUri('base:rest/type/entity_test/entity_test', ['absolute' => TRUE])->toString(),
+          ],
+        ],
+      ],
+    ];
     $denormalized = $this->serializer->denormalize($data_with_multiple_types, $this->entityClass, $this->format);
     $this->assertEqual(get_class($denormalized), $this->entityClass, 'Request with multiple types results in creation of correct bundle.');
 
     // Invalid type.
-    $data_with_invalid_type = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/types/foo', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-    );
+    $data_with_invalid_type = [
+      '_links' => [
+        'type' => [
+          'href' => Url::fromUri('base:rest/types/foo', ['absolute' => TRUE])->toString(),
+        ],
+      ],
+    ];
     try {
       $this->serializer->denormalize($data_with_invalid_type, $this->entityClass, $this->format);
       $this->fail('Exception should be thrown when type is invalid.');
@@ -61,10 +61,10 @@ class DenormalizeTest extends NormalizerTestBase {
     }
 
     // No type.
-    $data_with_no_type = array(
-      '_links' => array(
-      ),
-    );
+    $data_with_no_type = [
+      '_links' => [
+      ],
+    ];
     try {
       $this->serializer->denormalize($data_with_no_type, $this->entityClass, $this->format);
       $this->fail('Exception should be thrown when no type is provided.');
@@ -78,13 +78,13 @@ class DenormalizeTest extends NormalizerTestBase {
    * Tests link relation handling with an invalid type.
    */
   public function testTypeHandlingWithInvalidType() {
-    $data_with_invalid_type = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/type/entity_test/entity_test_invalid', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-    );
+    $data_with_invalid_type = [
+      '_links' => [
+        'type' => [
+          'href' => Url::fromUri('base:rest/type/entity_test/entity_test_invalid', ['absolute' => TRUE])->toString(),
+        ],
+      ],
+    ];
 
     $this->setExpectedException(UnexpectedValueException::class);
     $this->serializer->denormalize($data_with_invalid_type, $this->entityClass, $this->format);
@@ -94,11 +94,11 @@ class DenormalizeTest extends NormalizerTestBase {
    * Tests link relation handling with no types.
    */
   public function testTypeHandlingWithNoTypes() {
-    $data_with_no_types = array(
-      '_links' => array(
-        'type' => array(),
-      ),
-    );
+    $data_with_no_types = [
+      '_links' => [
+        'type' => [],
+      ],
+    ];
 
     $this->setExpectedException(UnexpectedValueException::class);
     $this->serializer->denormalize($data_with_no_types, $this->entityClass, $this->format);
@@ -110,32 +110,32 @@ class DenormalizeTest extends NormalizerTestBase {
   public function testMarkFieldForDeletion() {
     // Add a default value for a field.
     $field = FieldConfig::loadByName('entity_test', 'entity_test', 'field_test_text');
-    $field->setDefaultValue(array(array('value' => 'Llama')));
+    $field->setDefaultValue([['value' => 'Llama']]);
     $field->save();
 
     // Denormalize data that contains no entry for the field, and check that
     // the default value is present in the resulting entity.
-    $data = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-    );
+    $data = [
+      '_links' => [
+        'type' => [
+          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', ['absolute' => TRUE])->toString(),
+        ],
+      ],
+    ];
     $entity = $this->serializer->denormalize($data, $this->entityClass, $this->format);
     $this->assertEqual($entity->field_test_text->count(), 1);
     $this->assertEqual($entity->field_test_text->value, 'Llama');
 
     // Denormalize data that contains an empty entry for the field, and check
     // that the field is empty in the resulting entity.
-    $data = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-      'field_test_text' => array(),
-    );
+    $data = [
+      '_links' => [
+        'type' => [
+          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', ['absolute' => TRUE])->toString(),
+        ],
+      ],
+      'field_test_text' => [],
+    ];
     $entity = $this->serializer->denormalize($data, get_class($entity), $this->format, [ 'target_instance' => $entity ]);
     $this->assertEqual($entity->field_test_text->count(), 0);
   }
diff --git a/web/core/modules/hal/tests/src/Kernel/EntityTranslationNormalizeTest.php b/web/core/modules/hal/tests/src/Kernel/EntityTranslationNormalizeTest.php
index 35e038f84..5b752f7bb 100644
--- a/web/core/modules/hal/tests/src/Kernel/EntityTranslationNormalizeTest.php
+++ b/web/core/modules/hal/tests/src/Kernel/EntityTranslationNormalizeTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\hal\Kernel;
 
 use Drupal\node\Entity\Node;
+use Drupal\node\NodeInterface;
 use Drupal\user\Entity\User;
 use Drupal\node\Entity\NodeType;
 
@@ -18,14 +19,14 @@ class EntityTranslationNormalizeTest extends NormalizerTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'content_translation');
+  public static $modules = ['node', 'content_translation'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('system', array('sequences'));
+    $this->installSchema('system', ['sequences']);
     $this->installConfig(['node', 'content_translation']);
   }
 
@@ -44,7 +45,7 @@ class EntityTranslationNormalizeTest extends NormalizerTestBase {
       'title' => $this->randomMachineName(),
       'uid' => $user->id(),
       'type' => $node_type->id(),
-      'status' => NODE_PUBLISHED,
+      'status' => NodeInterface::PUBLISHED,
       'langcode' => 'en',
       'promote' => 1,
       'sticky' => 0,
diff --git a/web/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php b/web/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php
index 395358ccd..8f535c52c 100644
--- a/web/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php
+++ b/web/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php
@@ -2,16 +2,7 @@
 
 namespace Drupal\Tests\hal\Kernel;
 
-use Drupal\Core\Cache\MemoryBackend;
 use Drupal\file\Entity\File;
-use Drupal\hal\Encoder\JsonEncoder;
-use Drupal\hal\Normalizer\FieldItemNormalizer;
-use Drupal\hal\Normalizer\FileEntityNormalizer;
-use Drupal\rest\LinkManager\LinkManager;
-use Drupal\rest\LinkManager\RelationLinkManager;
-use Drupal\rest\LinkManager\TypeLinkManager;
-use Symfony\Component\Serializer\Serializer;
-
 
 /**
  * Tests that file entities can be normalized in HAL.
@@ -25,7 +16,7 @@ class FileNormalizeTest extends NormalizerTestBase {
    *
    * @var array
    */
-  public static $modules = array('file');
+  public static $modules = ['file'];
 
   /**
    * {@inheritdoc}
@@ -33,20 +24,6 @@ class FileNormalizeTest extends NormalizerTestBase {
   protected function setUp() {
     parent::setUp();
     $this->installEntitySchema('file');
-
-    $entity_manager = \Drupal::entityManager();
-    $link_manager = new LinkManager(new TypeLinkManager(new MemoryBackend('default'), \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack'), \Drupal::service('entity_type.bundle.info')), new RelationLinkManager(new MemoryBackend('default'), $entity_manager, \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack')));
-
-    // Set up the mock serializer.
-    $normalizers = array(
-      new FieldItemNormalizer(),
-      new FileEntityNormalizer($entity_manager, \Drupal::httpClient(), $link_manager, \Drupal::moduleHandler()),
-    );
-
-    $encoders = array(
-      new JsonEncoder(),
-    );
-    $this->serializer = new Serializer($normalizers, $encoders);
   }
 
 
@@ -54,23 +31,23 @@ class FileNormalizeTest extends NormalizerTestBase {
    * Tests the normalize function.
    */
   public function testNormalize() {
-    $file_params = array(
+    $file_params = [
       'filename' => 'test_1.txt',
       'uri' => 'public://test_1.txt',
       'filemime' => 'text/plain',
       'status' => FILE_STATUS_PERMANENT,
-    );
+    ];
     // Create a new file entity.
     $file = File::create($file_params);
     file_put_contents($file->getFileUri(), 'hello world');
     $file->save();
 
-    $expected_array = array(
-      'uri' => array(
-        array(
-          'value' => file_create_url($file->getFileUri())),
-      ),
-    );
+    $expected_array = [
+      'uri' => [
+        [
+          'value' => file_create_url($file->getFileUri())],
+      ],
+    ];
 
     $normalized = $this->serializer->normalize($file, $this->format);
     $this->assertEqual($normalized['uri'], $expected_array['uri'], 'URI is normalized.');
diff --git a/web/core/modules/hal/tests/src/Kernel/HalLinkManagerTest.php b/web/core/modules/hal/tests/src/Kernel/HalLinkManagerTest.php
new file mode 100644
index 000000000..b675059ab
--- /dev/null
+++ b/web/core/modules/hal/tests/src/Kernel/HalLinkManagerTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Drupal\Tests\hal\Kernel;
+
+use Drupal\Core\Url;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\hal\LinkManager\LinkManager
+ * @group hal
+ */
+class HalLinkManagerTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'hal_test', 'serialization', 'system'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    \Drupal::service('router.builder')->rebuild();
+  }
+
+  /**
+   * @covers ::getTypeUri
+   */
+  public function testGetTypeUri() {
+    /* @var \Drupal\rest\LinkManager\TypeLinkManagerInterface $type_manager */
+    $type_manager = \Drupal::service('hal.link_manager.type');
+    $base = Url::fromRoute('<front>', [], ['absolute' => TRUE])->toString();
+    $link = $type_manager->getTypeUri('node', 'page');
+    $this->assertSame($link, $base . 'rest/type/node/page');
+    // Now with optional context.
+    $link = $type_manager->getTypeUri('node', 'page', ['hal_test' => TRUE]);
+    $this->assertSame($link, 'hal_test_type');
+    // Test BC: hook_rest_type_uri_alter().
+    $link = $type_manager->getTypeUri('node', 'page', ['rest_test' => TRUE]);
+    $this->assertSame($link, 'rest_test_type');
+  }
+
+  /**
+   * @covers ::getRelationUri
+   */
+  public function testGetRelationUri() {
+    /* @var \Drupal\rest\LinkManager\RelationLinkManagerInterface $relation_manager */
+    $relation_manager = \Drupal::service('hal.link_manager.relation');
+    $base = Url::fromRoute('<front>', [], ['absolute' => TRUE])->toString();
+    $link = $relation_manager->getRelationUri('node', 'page', 'field_ref');
+    $this->assertSame($link, $base . 'rest/relation/node/page/field_ref');
+    // Now with optional context.
+    $link = $relation_manager->getRelationUri('node', 'page', 'foobar', ['hal_test' => TRUE]);
+    $this->assertSame($link, 'hal_test_relation');
+    // Test BC: hook_rest_relation_uri_alter().
+    $link = $relation_manager->getRelationUri('node', 'page', 'foobar', ['rest_test' => TRUE]);
+    $this->assertSame($link, 'rest_test_relation');
+  }
+
+  /**
+   * @covers ::setLinkDomain
+   */
+  public function testHalLinkManagersSetLinkDomain() {
+    /* @var \Drupal\rest\LinkManager\LinkManager $link_manager */
+    $link_manager = \Drupal::service('hal.link_manager');
+    $link_manager->setLinkDomain('http://example.com/');
+    $link = $link_manager->getTypeUri('node', 'page');
+    $this->assertEqual($link, 'http://example.com/rest/type/node/page');
+    $link = $link_manager->getRelationUri('node', 'page', 'field_ref');
+    $this->assertEqual($link, 'http://example.com/rest/relation/node/page/field_ref');
+  }
+
+}
diff --git a/web/core/modules/hal/tests/src/Kernel/NormalizeTest.php b/web/core/modules/hal/tests/src/Kernel/NormalizeTest.php
index cfffb4a86..d837b79a0 100644
--- a/web/core/modules/hal/tests/src/Kernel/NormalizeTest.php
+++ b/web/core/modules/hal/tests/src/Kernel/NormalizeTest.php
@@ -26,135 +26,135 @@ class NormalizeTest extends NormalizerTestBase {
    * Tests the normalize function.
    */
   public function testNormalize() {
-    $target_entity_de = EntityTest::create((array('langcode' => 'de', 'field_test_entity_reference' => NULL)));
+    $target_entity_de = EntityTest::create((['langcode' => 'de', 'field_test_entity_reference' => NULL]));
     $target_entity_de->save();
-    $target_entity_en = EntityTest::create((array('langcode' => 'en', 'field_test_entity_reference' => NULL)));
+    $target_entity_en = EntityTest::create((['langcode' => 'en', 'field_test_entity_reference' => NULL]));
     $target_entity_en->save();
 
     // Create a German entity.
-    $values = array(
+    $values = [
       'langcode' => 'de',
       'name' => $this->randomMachineName(),
-      'field_test_text' => array(
+      'field_test_text' => [
         'value' => $this->randomMachineName(),
         'format' => 'full_html',
-      ),
-      'field_test_entity_reference' => array(
+      ],
+      'field_test_entity_reference' => [
         'target_id' => $target_entity_de->id(),
-      ),
-    );
+      ],
+    ];
     // Array of translated values.
-    $translation_values = array(
+    $translation_values = [
       'name' => $this->randomMachineName(),
-      'field_test_entity_reference' => array(
+      'field_test_entity_reference' => [
         'target_id' => $target_entity_en->id(),
-      )
-    );
+      ]
+    ];
 
     $entity = EntityTest::create($values);
     $entity->save();
     // Add an English value for name and entity reference properties.
-    $entity->addTranslation('en')->set('name', array(0 => array('value' => $translation_values['name'])));
-    $entity->getTranslation('en')->set('field_test_entity_reference', array(0 => $translation_values['field_test_entity_reference']));
+    $entity->addTranslation('en')->set('name', [0 => ['value' => $translation_values['name']]]);
+    $entity->getTranslation('en')->set('field_test_entity_reference', [0 => $translation_values['field_test_entity_reference']]);
     $entity->save();
 
-    $type_uri = Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString();
-    $relation_uri = Url::fromUri('base:rest/relation/entity_test/entity_test/field_test_entity_reference', array('absolute' => TRUE))->toString();
+    $type_uri = Url::fromUri('base:rest/type/entity_test/entity_test', ['absolute' => TRUE])->toString();
+    $relation_uri = Url::fromUri('base:rest/relation/entity_test/entity_test/field_test_entity_reference', ['absolute' => TRUE])->toString();
 
-    $expected_array = array(
-      '_links' => array(
-        'curies' => array(
-          array(
+    $expected_array = [
+      '_links' => [
+        'curies' => [
+          [
             'href' => '/relations',
             'name' => 'site',
             'templated' => TRUE,
-          ),
-        ),
-        'self' => array(
+          ],
+        ],
+        'self' => [
           'href' => $this->getEntityUri($entity),
-        ),
-        'type' => array(
+        ],
+        'type' => [
           'href' => $type_uri,
-        ),
-        $relation_uri => array(
-          array(
+        ],
+        $relation_uri => [
+          [
             'href' => $this->getEntityUri($target_entity_de),
             'lang' => 'de',
-          ),
-          array(
+          ],
+          [
             'href' => $this->getEntityUri($target_entity_en),
             'lang' => 'en',
-          ),
-        ),
-      ),
-      '_embedded' => array(
-        $relation_uri => array(
-          array(
-            '_links' => array(
-              'self' => array(
+          ],
+        ],
+      ],
+      '_embedded' => [
+        $relation_uri => [
+          [
+            '_links' => [
+              'self' => [
                 'href' => $this->getEntityUri($target_entity_de),
-              ),
-              'type' => array(
+              ],
+              'type' => [
                 'href' => $type_uri,
-              ),
-            ),
-            'uuid' => array(
-              array(
+              ],
+            ],
+            'uuid' => [
+              [
                 'value' => $target_entity_de->uuid(),
-              ),
-            ),
+              ],
+            ],
             'lang' => 'de',
-          ),
-          array(
-            '_links' => array(
-              'self' => array(
+          ],
+          [
+            '_links' => [
+              'self' => [
                 'href' => $this->getEntityUri($target_entity_en),
-              ),
-              'type' => array(
+              ],
+              'type' => [
                 'href' => $type_uri,
-              ),
-            ),
-            'uuid' => array(
-              array(
+              ],
+            ],
+            'uuid' => [
+              [
                 'value' => $target_entity_en->uuid(),
-              ),
-            ),
+              ],
+            ],
             'lang' => 'en',
-          ),
-        ),
-      ),
-      'id' => array(
-        array(
+          ],
+        ],
+      ],
+      'id' => [
+        [
           'value' => $entity->id(),
-        ),
-      ),
-      'uuid' => array(
-        array(
+        ],
+      ],
+      'uuid' => [
+        [
           'value' => $entity->uuid(),
-        ),
-      ),
-      'langcode' => array(
-        array(
+        ],
+      ],
+      'langcode' => [
+        [
           'value' => 'de',
-        ),
-      ),
-      'name' => array(
-        array(
+        ],
+      ],
+      'name' => [
+        [
           'value' => $values['name'],
           'lang' => 'de',
-        ),
-        array(
+        ],
+        [
           'value' => $translation_values['name'],
           'lang' => 'en',
-        ),
-      ),
-      'field_test_text' => array(
-        array(
+        ],
+      ],
+      'field_test_text' => [
+        [
           'value' => $values['field_test_text']['value'],
           'format' => $values['field_test_text']['format'],
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     $normalized = $this->serializer->normalize($entity, $this->format);
     $this->assertEqual($normalized['_links']['self'], $expected_array['_links']['self'], 'self link placed correctly.');
diff --git a/web/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php b/web/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php
index 4fb771228..ef51a077c 100644
--- a/web/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php
+++ b/web/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php
@@ -2,22 +2,9 @@
 
 namespace Drupal\Tests\hal\Kernel;
 
-use Drupal\Core\Cache\MemoryBackend;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\hal\Encoder\JsonEncoder;
-use Drupal\hal\Normalizer\ContentEntityNormalizer;
-use Drupal\hal\Normalizer\EntityReferenceItemNormalizer;
-use Drupal\hal\Normalizer\FieldItemNormalizer;
-use Drupal\hal\Normalizer\FieldNormalizer;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\rest\LinkManager\LinkManager;
-use Drupal\rest\LinkManager\RelationLinkManager;
-use Drupal\rest\LinkManager\TypeLinkManager;
-use Drupal\serialization\EntityResolver\ChainEntityResolver;
-use Drupal\serialization\EntityResolver\TargetIdResolver;
-use Drupal\serialization\EntityResolver\UuidResolver;
 use Drupal\KernelTests\KernelTestBase;
-use Symfony\Component\Serializer\Serializer;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -30,7 +17,7 @@ abstract class NormalizerTestBase extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = ['entity_test', 'field', 'hal', 'language', 'rest', 'serialization', 'system', 'text', 'user', 'filter'];
+  public static $modules = ['entity_test', 'field', 'hal', 'language', 'serialization', 'system', 'text', 'user', 'filter'];
 
   /**
    * The mock serializer.
@@ -71,29 +58,29 @@ abstract class NormalizerTestBase extends KernelTestBase {
         // Only check the modules, if the $modules property was not inherited.
         $rp = new \ReflectionProperty($class, 'modules');
         if ($rp->class == $class) {
-          foreach (array_intersect(array('node', 'comment'), $class::$modules) as $module) {
+          foreach (array_intersect(['node', 'comment'], $class::$modules) as $module) {
             $this->installEntitySchema($module);
           }
         }
       }
       $class = get_parent_class($class);
     }
-    $this->installConfig(array('field', 'language'));
+    $this->installConfig(['field', 'language']);
     \Drupal::service('router.builder')->rebuild();
 
     // Add German as a language.
-    ConfigurableLanguage::create(array(
+    ConfigurableLanguage::create([
       'id' => 'de',
       'label' => 'Deutsch',
       'weight' => -1,
-    ))->save();
+    ])->save();
 
     // Create the test text field.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_test_text',
       'entity_type' => 'entity_test',
       'type' => 'text',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_test_text',
@@ -102,11 +89,11 @@ abstract class NormalizerTestBase extends KernelTestBase {
     ])->save();
 
     // Create the test translatable field.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_test_translatable_text',
       'entity_type' => 'entity_test',
       'type' => 'text',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_test_translatable_text',
@@ -115,14 +102,14 @@ abstract class NormalizerTestBase extends KernelTestBase {
     ])->save();
 
     // Create the test entity reference field.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_test_entity_reference',
       'entity_type' => 'entity_test',
       'type' => 'entity_reference',
-      'settings' => array(
+      'settings' => [
         'target_type' => 'entity_test',
-      ),
-    ))->save();
+      ],
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_test_entity_reference',
@@ -130,23 +117,7 @@ abstract class NormalizerTestBase extends KernelTestBase {
       'translatable' => TRUE,
     ])->save();
 
-    $entity_manager = \Drupal::entityManager();
-    $link_manager = new LinkManager(new TypeLinkManager(new MemoryBackend('default'), \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack'), \Drupal::service('entity_type.bundle.info')), new RelationLinkManager(new MemoryBackend('default'), $entity_manager, \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack')));
-
-    $chain_resolver = new ChainEntityResolver(array(new UuidResolver($entity_manager), new TargetIdResolver()));
-
-    // Set up the mock serializer.
-    $normalizers = array(
-      new ContentEntityNormalizer($link_manager, $entity_manager, \Drupal::moduleHandler()),
-      new EntityReferenceItemNormalizer($link_manager, $chain_resolver),
-      new FieldItemNormalizer(),
-      new FieldNormalizer(),
-    );
-
-    $encoders = array(
-      new JsonEncoder(),
-    );
-    $this->serializer = new Serializer($normalizers, $encoders);
+    $this->serializer = $this->container->get('serializer');
   }
 
 }
diff --git a/web/core/modules/hal/tests/src/Unit/FieldItemNormalizerDenormalizeExceptionsUnitTest.php b/web/core/modules/hal/tests/src/Unit/FieldItemNormalizerDenormalizeExceptionsUnitTest.php
index 550c185b4..4af4a3cc6 100644
--- a/web/core/modules/hal/tests/src/Unit/FieldItemNormalizerDenormalizeExceptionsUnitTest.php
+++ b/web/core/modules/hal/tests/src/Unit/FieldItemNormalizerDenormalizeExceptionsUnitTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\hal\Unit;
 
 use Drupal\hal\Normalizer\FieldItemNormalizer;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 
 /**
  * @coversDefaultClass \Drupal\hal\Normalizer\FieldItemNormalizer
@@ -17,12 +18,12 @@ class FieldItemNormalizerDenormalizeExceptionsUnitTest extends NormalizerDenorma
    *   Context for FieldItemNormalizer::denormalize().
    *
    * @dataProvider providerNormalizerDenormalizeExceptions
-   * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
    */
   public function testFieldItemNormalizerDenormalizeExceptions($context) {
     $field_item_normalizer = new FieldItemNormalizer();
-    $data = array();
-    $class = array();
+    $data = [];
+    $class = [];
+    $this->setExpectedException(InvalidArgumentException::class);
     $field_item_normalizer->denormalize($data, $class, NULL, $context);
   }
 
diff --git a/web/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsUnitTest.php b/web/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsUnitTest.php
index a257209e6..792e6333a 100644
--- a/web/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsUnitTest.php
+++ b/web/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsUnitTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\hal\Unit;
 
 use Drupal\hal\Normalizer\FieldNormalizer;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 
 /**
  * @coversDefaultClass \Drupal\hal\Normalizer\FieldNormalizer
@@ -17,12 +18,12 @@ class FieldNormalizerDenormalizeExceptionsUnitTest extends NormalizerDenormalize
    *   Context for FieldNormalizer::denormalize().
    *
    * @dataProvider providerNormalizerDenormalizeExceptions
-   * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
    */
   public function testFieldNormalizerDenormalizeExceptions($context) {
     $field_item_normalizer = new FieldNormalizer();
-    $data = array();
-    $class = array();
+    $data = [];
+    $class = [];
+    $this->setExpectedException(InvalidArgumentException::class);
     $field_item_normalizer->denormalize($data, $class, NULL, $context);
   }
 
diff --git a/web/core/modules/hal/tests/src/Unit/NormalizerDenormalizeExceptionsUnitTestBase.php b/web/core/modules/hal/tests/src/Unit/NormalizerDenormalizeExceptionsUnitTestBase.php
index 52ba805b2..d1a3b9b1d 100644
--- a/web/core/modules/hal/tests/src/Unit/NormalizerDenormalizeExceptionsUnitTestBase.php
+++ b/web/core/modules/hal/tests/src/Unit/NormalizerDenormalizeExceptionsUnitTestBase.php
@@ -18,14 +18,14 @@ abstract class NormalizerDenormalizeExceptionsUnitTestBase extends UnitTestCase
    * @return array Test data.
    */
   public function providerNormalizerDenormalizeExceptions() {
-    $mock = $this->getMock('\Drupal\Core\Field\Plugin\DataType\FieldItem', array('getParent'));
+    $mock = $this->getMock('\Drupal\Core\Field\Plugin\DataType\FieldItem', ['getParent']);
     $mock->expects($this->any())
       ->method('getParent')
       ->will($this->returnValue(NULL));
-    return array(
-      array(array()),
-      array(array('target_instance' => $mock)),
-    );
+    return [
+      [[]],
+      [['target_instance' => $mock]],
+    ];
   }
 
 }
diff --git a/web/core/modules/help/help.api.php b/web/core/modules/help/help.api.php
index aff491c7e..8b4b1cca2 100644
--- a/web/core/modules/help/help.api.php
+++ b/web/core/modules/help/help.api.php
@@ -48,7 +48,7 @@ function hook_help($route_name, \Drupal\Core\Routing\RouteMatchInterface $route_
   switch ($route_name) {
     // Main module help for the block module.
     case 'help.page.block':
-      return '<p>' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Bartik, for example, implements the regions "Sidebar first", "Sidebar second", "Featured", "Content", "Header", "Footer", etc., and a block may appear in any one of these areas. The <a href=":blocks">blocks administration page</a> provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array(':blocks' => \Drupal::url('block.admin_display'))) . '</p>';
+      return '<p>' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Bartik, for example, implements the regions "Sidebar first", "Sidebar second", "Featured", "Content", "Header", "Footer", etc., and a block may appear in any one of these areas. The <a href=":blocks">blocks administration page</a> provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', [':blocks' => \Drupal::url('block.admin_display')]) . '</p>';
 
     // Help for another path in the block module.
     case 'block.admin_display':
diff --git a/web/core/modules/help/help.module b/web/core/modules/help/help.module
index c41cd9841..ca49bee8d 100644
--- a/web/core/modules/help/help.module
+++ b/web/core/modules/help/help.module
@@ -17,27 +17,27 @@ function help_help($route_name, RouteMatchInterface $route_match) {
       $output = '<h2>' . t('Getting Started') . '</h2>';
       $output .= '<p>' . t('Follow these steps to set up and start using your website:') . '</p>';
       $output .= '<ol>';
-      $output .= '<li>' . t('<strong>Configure your website</strong> Once logged in, visit the <a href=":admin">Administration page</a>, where you may <a href=":config">customize and configure</a> all aspects of your website.', array(':admin' => \Drupal::url('system.admin'), ':config' => \Drupal::url('system.admin_config'))) . '</li>';
-      $output .= '<li>' . t('<strong>Enable additional functionality</strong> Next, visit the <a href=":modules">Extend page</a> and enable modules that suit your specific needs. You can find additional modules at the <a href=":download_modules">Drupal.org modules page</a>.', array(':modules' => \Drupal::url('system.modules_list'), ':download_modules' => 'https://www.drupal.org/project/modules')) . '</li>';
-      $output .= '<li>' . t('<strong>Customize your website design</strong> To change the "look and feel" of your website, visit the <a href=":themes">Appearance page</a>. You may choose from one of the included themes or download additional themes from the <a href=":download_themes">Drupal.org themes page</a>.', array(':themes' => \Drupal::url('system.themes_page'), ':download_themes' => 'https://www.drupal.org/project/themes')) . '</li>';
+      $output .= '<li>' . t('<strong>Configure your website</strong> Once logged in, visit the <a href=":admin">Administration page</a>, where you may <a href=":config">customize and configure</a> all aspects of your website.', [':admin' => \Drupal::url('system.admin'), ':config' => \Drupal::url('system.admin_config')]) . '</li>';
+      $output .= '<li>' . t('<strong>Enable additional functionality</strong> Next, visit the <a href=":modules">Extend page</a> and enable modules that suit your specific needs. You can find additional modules at the <a href=":download_modules">Drupal.org modules page</a>.', [':modules' => \Drupal::url('system.modules_list'), ':download_modules' => 'https://www.drupal.org/project/modules']) . '</li>';
+      $output .= '<li>' . t('<strong>Customize your website design</strong> To change the "look and feel" of your website, visit the <a href=":themes">Appearance page</a>. You may choose from one of the included themes or download additional themes from the <a href=":download_themes">Drupal.org themes page</a>.', [':themes' => \Drupal::url('system.themes_page'), ':download_themes' => 'https://www.drupal.org/project/themes']) . '</li>';
       // Display a link to the create content page if Node module is enabled.
       if (\Drupal::moduleHandler()->moduleExists('node')) {
-        $output .= '<li>' . t('<strong>Start posting content</strong> Finally, you may <a href=":content">add new content</a> to your website.', array(':content' => \Drupal::url('node.add_page'))) . '</li>';
+        $output .= '<li>' . t('<strong>Start posting content</strong> Finally, you may <a href=":content">add new content</a> to your website.', [':content' => \Drupal::url('node.add_page')]) . '</li>';
       }
       $output .= '</ol>';
-      $output .= '<p>' . t('For more information, refer to the help listed on this page or to the <a href=":docs">online documentation</a> and <a href=":support">support</a> pages at <a href=":drupal">drupal.org</a>.', array(':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org')) . '</p>';
+      $output .= '<p>' . t('For more information, refer to the help listed on this page or to the <a href=":docs">online documentation</a> and <a href=":support">support</a> pages at <a href=":drupal">drupal.org</a>.', [':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org']) . '</p>';
       return ['#markup' => $output];
 
     case 'help.page.help':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Help module generates <a href=":help-page">Help reference pages</a> to guide you through the use and configuration of modules, and provides a Help block with page-level help. The reference pages are a starting point for <a href=":handbook">Drupal.org online documentation</a> pages that contain more extensive and up-to-date information, are annotated with user-contributed comments, and serve as the definitive reference point for all Drupal documentation. For more information, see the <a href=":help">online documentation for the Help module</a>.', array(':help' => 'https://www.drupal.org/documentation/modules/help/', ':handbook' => 'https://www.drupal.org/documentation', ':help-page' => \Drupal::url('help.main'))) . '</p>';
+      $output .= '<p>' . t('The Help module generates <a href=":help-page">Help reference pages</a> to guide you through the use and configuration of modules, and provides a Help block with page-level help. The reference pages are a starting point for <a href=":handbook">Drupal.org online documentation</a> pages that contain more extensive and up-to-date information, are annotated with user-contributed comments, and serve as the definitive reference point for all Drupal documentation. For more information, see the <a href=":help">online documentation for the Help module</a>.', [':help' => 'https://www.drupal.org/documentation/modules/help/', ':handbook' => 'https://www.drupal.org/documentation', ':help-page' => \Drupal::url('help.main')]) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Providing a help reference') . '</dt>';
-      $output .= '<dd>' . t('The Help module displays explanations for using each module listed on the main <a href=":help">Help reference page</a>.', array(':help' => \Drupal::url('help.main'))) . '</dd>';
+      $output .= '<dd>' . t('The Help module displays explanations for using each module listed on the main <a href=":help">Help reference page</a>.', [':help' => \Drupal::url('help.main')]) . '</dd>';
       $output .= '<dt>' . t('Providing page-specific help') . '</dt>';
-      $output .= '<dd>' . t('Page-specific help text provided by modules is displayed in the Help block. This block can be placed and configured on the <a href=":blocks">Block layout page</a>.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '</dd>';
+      $output .= '<dd>' . t('Page-specific help text provided by modules is displayed in the Help block. This block can be placed and configured on the <a href=":blocks">Block layout page</a>.', [':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#']) . '</dd>';
       $output .= '</dl>';
       return ['#markup' => $output];
   }
diff --git a/web/core/modules/help/src/Controller/HelpController.php b/web/core/modules/help/src/Controller/HelpController.php
index 6c3f06142..74d46ecb0 100644
--- a/web/core/modules/help/src/Controller/HelpController.php
+++ b/web/core/modules/help/src/Controller/HelpController.php
@@ -112,7 +112,7 @@ class HelpController extends ControllerBase {
    * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
    */
   public function helpPage($name) {
-    $build = array();
+    $build = [];
     if ($this->moduleHandler()->implementsHook($name, 'help')) {
       $module_name = $this->moduleHandler()->getName($name);
       $build['#title'] = $module_name;
@@ -122,9 +122,9 @@ class HelpController extends ControllerBase {
         drupal_set_message($this->t('This module is experimental. <a href=":url">Experimental modules</a> are provided for testing purposes only. Use at your own risk.', [':url' => 'https://www.drupal.org/core/experimental']), 'warning');
       }
 
-      $temp = $this->moduleHandler()->invoke($name, 'help', array("help.page.$name", $this->routeMatch));
+      $temp = $this->moduleHandler()->invoke($name, 'help', ["help.page.$name", $this->routeMatch]);
       if (empty($temp)) {
-        $build['top'] = ['#markup' => $this->t('No help is available for module %module.', array('%module' => $module_name))];
+        $build['top'] = ['#markup' => $this->t('No help is available for module %module.', ['%module' => $module_name])];
       }
       else {
         if (!is_array($temp)) {
@@ -137,20 +137,20 @@ class HelpController extends ControllerBase {
       // any such pages associated with it.
       $admin_tasks = system_get_module_admin_tasks($name, system_get_info('module', $name));
       if (!empty($admin_tasks)) {
-        $links = array();
+        $links = [];
         foreach ($admin_tasks as $task) {
           $link['url'] = $task['url'];
           $link['title'] = $task['title'];
           $links[] = $link;
         }
-        $build['links'] = array(
+        $build['links'] = [
           '#theme' => 'links__help',
-          '#heading' => array(
+          '#heading' => [
             'level' => 'h3',
-            'text' => $this->t('@module administration pages', array('@module' => $module_name)),
-          ),
+            'text' => $this->t('@module administration pages', ['@module' => $module_name]),
+          ],
           '#links' => $links,
-        );
+        ];
       }
       return $build;
     }
diff --git a/web/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php b/web/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php
index a2d5e27db..9cdaa4185 100644
--- a/web/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php
+++ b/web/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php
@@ -27,21 +27,21 @@ class SupernovaGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH) {
+  public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH) {
     throw new \Exception();
   }
 
   /**
    * {@inheritdoc}
    */
-  public function getPathFromRoute($name, $parameters = array()) {
+  public function getPathFromRoute($name, $parameters = []) {
     throw new \Exception();
   }
 
   /**
    * {@inheritdoc}
    */
-  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE) {
+  public function generateFromRoute($name, $parameters = [], $options = [], $collect_bubbleable_metadata = FALSE) {
     throw new \Exception();
   }
 
@@ -55,7 +55,7 @@ class SupernovaGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function getRouteDebugMessage($name, array $parameters = array()) {
+  public function getRouteDebugMessage($name, array $parameters = []) {
     throw new \Exception();
   }
 
diff --git a/web/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php b/web/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
index 9d1a74eec..0eabbda56 100644
--- a/web/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
+++ b/web/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
@@ -19,7 +19,7 @@ class ExperimentalHelpTest extends BrowserTestBase {
    *
    * @var array
    */
-  public static $modules = array('help', 'experimental_module_test', 'help_page_test');
+  public static $modules = ['help', 'experimental_module_test', 'help_page_test'];
 
   /**
    * The admin user.
diff --git a/web/core/modules/help/tests/src/Functional/HelpTest.php b/web/core/modules/help/tests/src/Functional/HelpTest.php
index 2e8249939..e70eeb766 100644
--- a/web/core/modules/help/tests/src/Functional/HelpTest.php
+++ b/web/core/modules/help/tests/src/Functional/HelpTest.php
@@ -20,7 +20,7 @@ class HelpTest extends BrowserTestBase {
    *
    * @var array.
    */
-  public static $modules = array('help_test', 'help_page_test');
+  public static $modules = ['help_test', 'help_page_test'];
 
   /**
    * Use the Standard profile to test help implementations of many core modules.
@@ -41,8 +41,8 @@ class HelpTest extends BrowserTestBase {
     parent::setUp();
 
     // Create users.
-    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'view the administration theme', 'administer permissions'));
-    $this->anyUser = $this->drupalCreateUser(array());
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'view the administration theme', 'administer permissions']);
+    $this->anyUser = $this->drupalCreateUser([]);
   }
 
   /**
@@ -61,7 +61,7 @@ class HelpTest extends BrowserTestBase {
     // Verify that introductory help text exists, goes for 100% module coverage.
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('admin/help');
-    $this->assertRaw(t('For more information, refer to the help listed on this page or to the <a href=":docs">online documentation</a> and <a href=":support">support</a> pages at <a href=":drupal">drupal.org</a>.', array(':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org')));
+    $this->assertRaw(t('For more information, refer to the help listed on this page or to the <a href=":docs">online documentation</a> and <a href=":support">support</a> pages at <a href=":drupal">drupal.org</a>.', [':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org']));
 
     // Verify that hook_help() section title and description appear.
     $this->assertRaw('<h2>' . t('Module overviews') . '</h2>');
@@ -74,13 +74,13 @@ class HelpTest extends BrowserTestBase {
 
     // Make sure links are properly added for modules implementing hook_help().
     foreach ($this->getModuleList() as $module => $name) {
-      $this->assertLink($name, 0, format_string('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name)));
+      $this->assertLink($name, 0, format_string('Link properly added to @name (admin/help/@module)', ['@module' => $module, '@name' => $name]));
     }
 
     // Ensure that module which does not provide an module overview page is
     // handled correctly.
     $this->clickLink(\Drupal::moduleHandler()->getName('help_test'));
-    $this->assertRaw(t('No help is available for module %module.', array('%module' => \Drupal::moduleHandler()->getName('help_test'))));
+    $this->assertRaw(t('No help is available for module %module.', ['%module' => \Drupal::moduleHandler()->getName('help_test')]));
 
     // Verify that the order of topics is alphabetical by displayed module
     // name, by checking the order of some modules, including some that would
@@ -119,11 +119,11 @@ class HelpTest extends BrowserTestBase {
       $this->drupalGet('admin/help/' . $module);
       $this->assertResponse($response);
       if ($response == 200) {
-        $this->assertTitle($name . ' | Drupal', format_string('%module title was displayed', array('%module' => $module)));
+        $this->assertTitle($name . ' | Drupal', format_string('%module title was displayed', ['%module' => $module]));
         $this->assertEquals($name, $this->cssSelect('h1.page-title')[0]->getText(), "$module heading was displayed");
         $admin_tasks = system_get_module_admin_tasks($module, system_get_info('module', $module));
         if (!empty($admin_tasks)) {
-          $this->assertText(t('@module administration pages', array('@module' => $name)));
+          $this->assertText(t('@module administration pages', ['@module' => $name]));
         }
         foreach ($admin_tasks as $task) {
           $this->assertLink($task['title']);
@@ -149,7 +149,7 @@ class HelpTest extends BrowserTestBase {
    *   A list of enabled modules.
    */
   protected function getModuleList() {
-    $modules = array();
+    $modules = [];
     $module_data = system_rebuild_module_data();
     foreach (\Drupal::moduleHandler()->getImplementations('help') as $module) {
       $modules[$module] = $module_data[$module]->info['name'];
diff --git a/web/core/modules/help/tests/src/Functional/NoHelpTest.php b/web/core/modules/help/tests/src/Functional/NoHelpTest.php
index 49c768d7b..acb2563ae 100644
--- a/web/core/modules/help/tests/src/Functional/NoHelpTest.php
+++ b/web/core/modules/help/tests/src/Functional/NoHelpTest.php
@@ -18,7 +18,7 @@ class NoHelpTest extends BrowserTestBase {
    *
    * @var array.
    */
-  public static $modules = array('help', 'menu_test');
+  public static $modules = ['help', 'menu_test'];
 
   /**
    * The user who will be created.
@@ -27,7 +27,7 @@ class NoHelpTest extends BrowserTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $this->adminUser = $this->drupalCreateUser(array('access administration pages'));
+    $this->adminUser = $this->drupalCreateUser(['access administration pages']);
   }
 
   /**
diff --git a/web/core/modules/history/history.install b/web/core/modules/history/history.install
index ede5255bc..85e2fdabb 100644
--- a/web/core/modules/history/history.install
+++ b/web/core/modules/history/history.install
@@ -11,44 +11,38 @@ use Drupal\Core\Database\Database;
  * Implements hook_schema().
  */
 function history_schema() {
-  $schema['history'] = array(
+  $schema['history'] = [
     'description' => 'A record of which {users} have read which {node}s.',
-    'fields' => array(
-      'uid' => array(
+    'fields' => [
+      'uid' => [
         'description' => 'The {users}.uid that read the {node} nid.',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'nid' => array(
+      ],
+      'nid' => [
         'description' => 'The {node}.nid that was read.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'timestamp' => array(
+      ],
+      'timestamp' => [
         'description' => 'The Unix timestamp at which the read occurred.',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
-      ),
-    ),
-    'primary key' => array('uid', 'nid'),
-    'indexes' => array(
-      'nid' => array('nid'),
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['uid', 'nid'],
+    'indexes' => [
+      'nid' => ['nid'],
+    ],
+  ];
 
   return $schema;
 }
 
-/**
- * @defgroup updates-8.0.x-to-8.1.x Updates from 8.0.x to 8.1.x
- * @{
- * Update functions from 8.0.x to 8.1.x.
- */
-
 /**
  * Change {history}.nid to an unsigned int in order to match {node}.nid.
  */
@@ -56,45 +50,41 @@ function history_update_8101() {
   $schema = Database::getConnection()->schema();
   $schema->dropPrimaryKey('history');
   $schema->dropIndex('history', 'nid');
-  $schema->changeField('history', 'nid', 'nid', array(
+  $schema->changeField('history', 'nid', 'nid', [
     'description' => 'The {node}.nid that was read.',
     'type' => 'int',
     'unsigned' => TRUE,
     'not null' => TRUE,
     'default' => 0,
-  ));
-  $schema->addPrimaryKey('history', array('uid', 'nid'));
-  $spec = array(
+  ]);
+  $schema->addPrimaryKey('history', ['uid', 'nid']);
+  $spec = [
     'description' => 'A record of which {users} have read which {node}s.',
-    'fields' => array(
-      'uid' => array(
+    'fields' => [
+      'uid' => [
         'description' => 'The {users}.uid that read the {node} nid.',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'nid' => array(
+      ],
+      'nid' => [
         'description' => 'The {node}.nid that was read.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'timestamp' => array(
+      ],
+      'timestamp' => [
         'description' => 'The Unix timestamp at which the read occurred.',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
-      ),
-    ),
-    'primary key' => array('uid', 'nid'),
-    'indexes' => array(
-      'nid' => array('nid'),
-    ),
-  );
-  $schema->addIndex('history', 'nid', array('nid'), $spec);
+      ],
+    ],
+    'primary key' => ['uid', 'nid'],
+    'indexes' => [
+      'nid' => ['nid'],
+    ],
+  ];
+  $schema->addIndex('history', 'nid', ['nid'], $spec);
 }
-
-/**
- * @} End of "defgroup updates-8.0.x-to-8.1.x".
- */
diff --git a/web/core/modules/history/history.module b/web/core/modules/history/history.module
index 779259132..f36121ef5 100644
--- a/web/core/modules/history/history.module
+++ b/web/core/modules/history/history.module
@@ -28,7 +28,7 @@ function history_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.history':
       $output  = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The History module keeps track of which content a user has read. It marks content as <em>new</em> or <em>updated</em> depending on the last time the user viewed it. History records that are older than one month are removed during cron, which means that content older than one month is always considered <em>read</em>. The History module does not have a user interface but it provides a filter to <a href=":views-help">Views</a> to show new or updated content. For more information, see the <a href=":url">online documentation for the History module</a>.', array(':views-help' => (\Drupal::moduleHandler()->moduleExists('views')) ? \Drupal::url('help.page', array ('name' => 'views')) : '#', ':url' => 'https://www.drupal.org/documentation/modules/history')) . '</p>';
+      $output .= '<p>' . t('The History module keeps track of which content a user has read. It marks content as <em>new</em> or <em>updated</em> depending on the last time the user viewed it. History records that are older than one month are removed during cron, which means that content older than one month is always considered <em>read</em>. The History module does not have a user interface but it provides a filter to <a href=":views-help">Views</a> to show new or updated content. For more information, see the <a href=":url">online documentation for the History module</a>.', [':views-help' => (\Drupal::moduleHandler()->moduleExists('views')) ? \Drupal::url('help.page', ['name' => 'views']) : '#', ':url' => 'https://www.drupal.org/documentation/modules/history']) . '</p>';
       return $output;
   }
 }
@@ -44,7 +44,7 @@ function history_help($route_name, RouteMatchInterface $route_match) {
  *   of when the last view occurred; otherwise, zero.
  */
 function history_read($nid) {
-  $history = history_read_multiple(array($nid));
+  $history = history_read_multiple([$nid]);
   return $history[$nid];
 }
 
@@ -60,11 +60,11 @@ function history_read($nid) {
  *   otherwise, zero.
  */
 function history_read_multiple($nids) {
-  $history = &drupal_static(__FUNCTION__, array());
+  $history = &drupal_static(__FUNCTION__, []);
 
-  $return = array();
+  $return = [];
 
-  $nodes_to_read = array();
+  $nodes_to_read = [];
   foreach ($nids as $nid) {
     if (isset($history[$nid])) {
       $return[$nid] = $history[$nid];
@@ -79,10 +79,10 @@ function history_read_multiple($nids) {
     return $return;
   }
 
-  $result = db_query('SELECT nid, timestamp FROM {history} WHERE uid = :uid AND nid IN ( :nids[] )', array(
+  $result = db_query('SELECT nid, timestamp FROM {history} WHERE uid = :uid AND nid IN ( :nids[] )', [
     ':uid' => \Drupal::currentUser()->id(),
     ':nids[]' => array_keys($nodes_to_read),
-  ));
+  ]);
   foreach ($result as $row) {
     $nodes_to_read[$row->nid] = (int) $row->timestamp;
   }
@@ -108,14 +108,14 @@ function history_write($nid, $account = NULL) {
 
   if ($account->isAuthenticated()) {
     db_merge('history')
-      ->keys(array(
+      ->keys([
         'uid' => $account->id(),
         'nid' => $nid,
-      ))
-      ->fields(array('timestamp' => REQUEST_TIME))
+      ])
+      ->fields(['timestamp' => REQUEST_TIME])
       ->execute();
     // Update static cache.
-    $history = &drupal_static('history_read_multiple', array());
+    $history = &drupal_static('history_read_multiple', []);
     $history[$nid] = REQUEST_TIME;
   }
 }
@@ -184,7 +184,7 @@ function history_user_delete($account) {
  * @param int $node_id
  *   The node ID for which to attach the last read timestamp.
  *
- * @return array $element
+ * @return array
  *   A renderable array containing the last read timestamp.
  */
 function history_attach_timestamp($node_id) {
diff --git a/web/core/modules/history/history.views.inc b/web/core/modules/history/history.views.inc
index 4b9813645..a4dcd9927 100644
--- a/web/core/modules/history/history.views.inc
+++ b/web/core/modules/history/history.views.inc
@@ -17,29 +17,29 @@ function history_views_data() {
   $data['history']['table']['group']  = t('Content');
 
   // Explain how this table joins to others.
-  $data['history']['table']['join'] = array(
+  $data['history']['table']['join'] = [
      // Directly links to node table.
-    'node_field_data' => array(
+    'node_field_data' => [
       'table' => 'history',
       'left_field' => 'nid',
       'field' => 'nid',
-      'extra' => array(
-        array('field' => 'uid', 'value' => '***CURRENT_USER***', 'numeric' => TRUE),
-      ),
-    ),
-  );
+      'extra' => [
+        ['field' => 'uid', 'value' => '***CURRENT_USER***', 'numeric' => TRUE],
+      ],
+    ],
+  ];
 
-  $data['history']['timestamp'] = array(
+  $data['history']['timestamp'] = [
     'title' => t('Has new content'),
-    'field' => array(
+    'field' => [
       'id' => 'history_user_timestamp',
       'help' => t('Show a marker if the content is new or updated.'),
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'help' => t('Show only content that is new or updated.'),
       'id' => 'history_user_timestamp',
-    ),
-  );
+    ],
+  ];
 
   return $data;
 }
diff --git a/web/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php b/web/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php
index e6b0548f0..f33dab25a 100644
--- a/web/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php
+++ b/web/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php
@@ -34,10 +34,10 @@ class HistoryUserTimestamp extends Node {
     parent::init($view, $display, $options);
 
     if (\Drupal::currentUser()->isAuthenticated()) {
-      $this->additional_fields['created'] = array('table' => 'node_field_data', 'field' => 'created');
-      $this->additional_fields['changed'] = array('table' => 'node_field_data', 'field' => 'changed');
+      $this->additional_fields['created'] = ['table' => 'node_field_data', 'field' => 'created'];
+      $this->additional_fields['changed'] = ['table' => 'node_field_data', 'field' => 'changed'];
       if (\Drupal::moduleHandler()->moduleExists('comment') && !empty($this->options['comments'])) {
-        $this->additional_fields['last_comment'] = array('table' => 'comment_entity_statistics', 'field' => 'last_comment_timestamp');
+        $this->additional_fields['last_comment'] = ['table' => 'comment_entity_statistics', 'field' => 'last_comment_timestamp'];
       }
     }
   }
@@ -45,7 +45,7 @@ class HistoryUserTimestamp extends Node {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['comments'] = array('default' => FALSE);
+    $options['comments'] = ['default' => FALSE];
 
     return $options;
   }
@@ -53,11 +53,11 @@ class HistoryUserTimestamp extends Node {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
     if (\Drupal::moduleHandler()->moduleExists('comment')) {
-      $form['comments'] = array(
+      $form['comments'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Check for new comments as well'),
         '#default_value' => !empty($this->options['comments']),
-      );
+      ];
     }
   }
 
@@ -92,10 +92,10 @@ class HistoryUserTimestamp extends Node {
       elseif ($last_comment > $last_read && $last_comment > HISTORY_READ_LIMIT) {
         $mark = MARK_UPDATED;
       }
-      $build = array(
+      $build = [
         '#theme' => 'mark',
         '#status' => $mark,
-      );
+      ];
       return $this->renderLink(drupal_render($build), $values);
     }
   }
diff --git a/web/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php b/web/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php
index 80d78bd6e..92a57991c 100644
--- a/web/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/web/core/modules/history/src/Plugin/views/filter/HistoryUserTimestamp.php
@@ -49,11 +49,11 @@ class HistoryUserTimestamp extends FilterPluginBase {
       else {
         $label = $this->t('Has new content');
       }
-      $form['value'] = array(
+      $form['value'] = [
         '#type' => 'checkbox',
         '#title' => $label,
         '#default_value' => $this->value,
-      );
+      ];
     }
   }
 
diff --git a/web/core/modules/history/src/Tests/HistoryTest.php b/web/core/modules/history/src/Tests/HistoryTest.php
deleted file mode 100644
index 17bba3406..000000000
--- a/web/core/modules/history/src/Tests/HistoryTest.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-namespace Drupal\history\Tests;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests the History endpoints.
- *
- * @group history
- */
-class HistoryTest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'history');
-
-  /**
-   * The main user for testing.
-   *
-   * @var object
-   */
-  protected $user;
-
-  /**
-   * A page node for which to check content statistics.
-   *
-   * @var object
-   */
-  protected $testNode;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-
-    $this->user = $this->drupalCreateUser(array('create page content', 'access content'));
-    $this->drupalLogin($this->user);
-    $this->testNode = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->user->id()));
-  }
-
-  /**
-   * Get node read timestamps from the server for the current user.
-   *
-   * @param array $node_ids
-   *   An array of node IDs.
-   *
-   * @return string
-   *   The response body.
-   */
-  protected function getNodeReadTimestamps(array $node_ids) {
-    // Build POST values.
-    $post = array();
-    for ($i = 0; $i < count($node_ids); $i++) {
-      $post['node_ids[' . $i . ']'] = $node_ids[$i];
-    }
-
-    // Serialize POST values.
-    foreach ($post as $key => $value) {
-      // Encode according to application/x-www-form-urlencoded
-      // Both names and values needs to be urlencoded, according to
-      // http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1
-      $post[$key] = urlencode($key) . '=' . urlencode($value);
-    }
-    $post = implode('&', $post);
-
-    // Perform HTTP request.
-    return $this->curlExec(array(
-      CURLOPT_URL => \Drupal::url('history.get_last_node_view', array(), array('absolute' => TRUE)),
-      CURLOPT_POST => TRUE,
-      CURLOPT_POSTFIELDS => $post,
-      CURLOPT_HTTPHEADER => array(
-        'Accept: application/json',
-        'Content-Type: application/x-www-form-urlencoded',
-      ),
-    ));
-  }
-
-  /**
-   * Mark a node as read for the current user.
-   *
-   * @param int $node_id
-   *   A node ID.
-   *
-   * @return string
-   *   The response body.
-   */
-  protected function markNodeAsRead($node_id) {
-    return $this->curlExec(array(
-      CURLOPT_URL => \Drupal::url('history.read_node', array('node' => $node_id), array('absolute' => TRUE)),
-      CURLOPT_HTTPHEADER => array(
-        'Accept: application/json',
-      ),
-    ));
-  }
-
-  /**
-   * Verifies that the history endpoints work.
-   */
-  function testHistory() {
-    $nid = $this->testNode->id();
-
-    // Retrieve "last read" timestamp for test node, for the current user.
-    $response = $this->getNodeReadTimestamps(array($nid));
-    $this->assertResponse(200);
-    $json = Json::decode($response);
-    $this->assertIdentical(array(1 => 0), $json, 'The node has not yet been read.');
-
-    // View the node.
-    $this->drupalGet('node/' . $nid);
-    $this->assertCacheContext('user.roles:authenticated');
-    // JavaScript present to record the node read.
-    $settings = $this->getDrupalSettings();
-    $libraries = explode(',', $settings['ajaxPageState']['libraries']);
-    $this->assertTrue(in_array('history/mark-as-read', $libraries), 'history/mark-as-read library is present.');
-    $this->assertEqual([$nid => TRUE], $settings['history']['nodesToMarkAsRead'], 'drupalSettings to mark node as read are present.');
-
-    // Simulate JavaScript: perform HTTP request to mark node as read.
-    $response = $this->markNodeAsRead($nid);
-    $this->assertResponse(200);
-    $timestamp = Json::decode($response);
-    $this->assertTrue(is_numeric($timestamp), 'Node has been marked as read. Timestamp received.');
-
-    // Retrieve "last read" timestamp for test node, for the current user.
-    $response = $this->getNodeReadTimestamps(array($nid));
-    $this->assertResponse(200);
-    $json = Json::decode($response);
-    $this->assertIdentical(array(1 => $timestamp), $json, 'The node has been read.');
-
-    // Failing to specify node IDs for the first endpoint should return a 404.
-    $this->getNodeReadTimestamps(array());
-    $this->assertResponse(404);
-
-    // Accessing either endpoint as the anonymous user should return a 403.
-    $this->drupalLogout();
-    $this->getNodeReadTimestamps(array($nid));
-    $this->assertResponse(403);
-    $this->getNodeReadTimestamps(array());
-    $this->assertResponse(403);
-    $this->markNodeAsRead($nid);
-    $this->assertResponse(403);
-  }
-
-}
diff --git a/web/core/modules/history/src/Tests/Views/HistoryTimestampTest.php b/web/core/modules/history/src/Tests/Views/HistoryTimestampTest.php
index 0f484014b..476653839 100644
--- a/web/core/modules/history/src/Tests/Views/HistoryTimestampTest.php
+++ b/web/core/modules/history/src/Tests/Views/HistoryTimestampTest.php
@@ -19,20 +19,20 @@ class HistoryTimestampTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('history', 'node');
+  public static $modules = ['history', 'node'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_history');
+  public static $testViews = ['test_history'];
 
   /**
    * Tests the handlers.
    */
   public function testHandlers() {
-    $nodes = array();
+    $nodes = [];
     $nodes[] = $this->drupalCreateNode();
     $nodes[] = $this->drupalCreateNode();
 
@@ -41,23 +41,23 @@ class HistoryTimestampTest extends ViewTestBase {
     \Drupal::currentUser()->setAccount($account);
 
     db_insert('history')
-      ->fields(array(
+      ->fields([
         'uid' => $account->id(),
         'nid' => $nodes[0]->id(),
         'timestamp' => REQUEST_TIME - 100,
-      ))->execute();
+      ])->execute();
 
     db_insert('history')
-      ->fields(array(
+      ->fields([
         'uid' => $account->id(),
         'nid' => $nodes[1]->id(),
         'timestamp' => REQUEST_TIME + 100,
-      ))->execute();
+      ])->execute();
 
 
-    $column_map = array(
+    $column_map = [
       'nid' => 'nid',
-    );
+    ];
 
     // Test the history field.
     $view = Views::getView('test_history');
@@ -66,7 +66,7 @@ class HistoryTimestampTest extends ViewTestBase {
     $this->assertEqual(count($view->result), 2);
     $output = $view->preview();
     $this->setRawContent(\Drupal::service('renderer')->renderRoot($output));
-    $result = $this->xpath('//span[@class=:class]', array(':class' => 'marker'));
+    $result = $this->xpath('//span[@class=:class]', [':class' => 'marker']);
     $this->assertEqual(count($result), 1, 'Just one node is marked as new');
 
     // Test the history filter.
@@ -74,7 +74,7 @@ class HistoryTimestampTest extends ViewTestBase {
     $view->setDisplay('page_2');
     $this->executeView($view);
     $this->assertEqual(count($view->result), 1);
-    $this->assertIdenticalResultset($view, array(array('nid' => $nodes[0]->id())), $column_map);
+    $this->assertIdenticalResultset($view, [['nid' => $nodes[0]->id()]], $column_map);
 
     // Install Comment module and make sure that content types without comment
     // field will not break the view.
diff --git a/web/core/modules/history/tests/src/Functional/HistoryTest.php b/web/core/modules/history/tests/src/Functional/HistoryTest.php
new file mode 100644
index 000000000..6b4708b89
--- /dev/null
+++ b/web/core/modules/history/tests/src/Functional/HistoryTest.php
@@ -0,0 +1,174 @@
+<?php
+
+namespace Drupal\Tests\history\Functional;
+
+use Drupal\Component\Serialization\Json;
+use Drupal\Core\Url;
+use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+use Drupal\Tests\BrowserTestBase;
+use GuzzleHttp\Cookie\CookieJar;
+
+/**
+ * Tests the History endpoints.
+ *
+ * @group history
+ */
+class HistoryTest extends BrowserTestBase {
+
+  use AssertPageCacheContextsAndTagsTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'history'];
+
+  /**
+   * The main user for testing.
+   *
+   * @var object
+   */
+  protected $user;
+
+  /**
+   * A page node for which to check content statistics.
+   *
+   * @var object
+   */
+  protected $testNode;
+
+  /**
+   * The cookie jar holding the testing session cookies for Guzzle requests.
+   *
+   * @var \GuzzleHttp\Client;
+   */
+  protected $client;
+
+  /**
+   * The Guzzle HTTP client.
+   *
+   * @var \GuzzleHttp\Cookie\CookieJar;
+   */
+  protected $cookies;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+
+    $this->user = $this->drupalCreateUser(['create page content', 'access content']);
+    $this->drupalLogin($this->user);
+    $this->testNode = $this->drupalCreateNode(['type' => 'page', 'uid' => $this->user->id()]);
+
+    $this->client = $this->getHttpClient();
+  }
+
+  /**
+   * Get node read timestamps from the server for the current user.
+   *
+   * @param array $node_ids
+   *   An array of node IDs.
+   *
+   * @return \Psr\Http\Message\ResponseInterface
+   *   The response object.
+   */
+  protected function getNodeReadTimestamps(array $node_ids) {
+    // Perform HTTP request.
+    $url = Url::fromRoute('history.get_last_node_view')
+      ->setAbsolute()
+      ->toString();
+    return $this->client->post($url, [
+      'body' => http_build_query(['node_ids' => $node_ids]),
+      'cookies' => $this->cookies,
+      'headers' => [
+        'Accept' => 'application/json',
+        'Content-Type' => 'application/x-www-form-urlencoded',
+      ],
+      'http_errors' => FALSE,
+    ]);
+  }
+
+  /**
+   * Mark a node as read for the current user.
+   *
+   * @param int $node_id
+   *   A node ID.
+   *
+   * @return \Psr\Http\Message\ResponseInterface
+   *   The response body.
+   */
+  protected function markNodeAsRead($node_id) {
+    $url = Url::fromRoute('history.read_node', ['node' => $node_id], ['absolute' => TRUE])->toString();
+    return $this->client->post($url, [
+      'cookies' => $this->cookies,
+      'headers' => [
+        'Accept' => 'application/json',
+      ],
+      'http_errors' => FALSE,
+    ]);
+  }
+
+  /**
+   * Verifies that the history endpoints work.
+   */
+  public function testHistory() {
+    $nid = $this->testNode->id();
+
+    // Retrieve "last read" timestamp for test node, for the current user.
+    $response = $this->getNodeReadTimestamps([$nid]);
+    $this->assertEquals(200, $response->getStatusCode());
+    $json = Json::decode($response->getBody());
+    $this->assertIdentical([1 => 0], $json, 'The node has not yet been read.');
+
+    // View the node.
+    $this->drupalGet('node/' . $nid);
+    $this->assertCacheContext('user.roles:authenticated');
+    // JavaScript present to record the node read.
+    $settings = $this->getDrupalSettings();
+    $libraries = explode(',', $settings['ajaxPageState']['libraries']);
+    $this->assertTrue(in_array('history/mark-as-read', $libraries), 'history/mark-as-read library is present.');
+    $this->assertEqual([$nid => TRUE], $settings['history']['nodesToMarkAsRead'], 'drupalSettings to mark node as read are present.');
+
+    // Simulate JavaScript: perform HTTP request to mark node as read.
+    $response = $this->markNodeAsRead($nid);
+    $this->assertEquals(200, $response->getStatusCode());
+    $timestamp = Json::decode($response->getBody());
+    $this->assertTrue(is_numeric($timestamp), 'Node has been marked as read. Timestamp received.');
+
+    // Retrieve "last read" timestamp for test node, for the current user.
+    $response = $this->getNodeReadTimestamps([$nid]);
+    $this->assertEquals(200, $response->getStatusCode());
+    $json = Json::decode($response->getBody());
+    $this->assertIdentical([1 => $timestamp], $json, 'The node has been read.');
+
+    // Failing to specify node IDs for the first endpoint should return a 404.
+    $response = $this->getNodeReadTimestamps([]);
+    $this->assertEquals(404, $response->getStatusCode());
+
+    // Accessing either endpoint as the anonymous user should return a 403.
+    $this->drupalLogout();
+    $response = $this->getNodeReadTimestamps([$nid]);
+    $this->assertEquals(403, $response->getStatusCode());
+    $response = $this->getNodeReadTimestamps([]);
+    $this->assertEquals(403, $response->getStatusCode());
+    $response = $this->markNodeAsRead($nid);
+    $this->assertEquals(403, $response->getStatusCode());
+  }
+
+  /**
+   * Obtain the HTTP client and set the cookies.
+   *
+   * @return \GuzzleHttp\Client
+   *   The client with BrowserTestBase configuration.
+   */
+  protected function getHttpClient() {
+    // Similar code is also employed to test CSRF tokens.
+    // @see \Drupal\Tests\system\Functional\CsrfRequestHeaderTest::testRouteAccess()
+    $domain = parse_url($this->getUrl(), PHP_URL_HOST);
+    $session_id = $this->getSession()->getCookie($this->getSessionName());
+    $this->cookies = CookieJar::fromArray([$this->getSessionName() => $session_id], $domain);
+    return $this->getSession()->getDriver()->getClient()->getClient();
+  }
+
+}
diff --git a/web/core/modules/image/config/schema/image.schema.yml b/web/core/modules/image/config/schema/image.schema.yml
index 323220bcf..0006ad794 100644
--- a/web/core/modules/image/config/schema/image.schema.yml
+++ b/web/core/modules/image/config/schema/image.schema.yml
@@ -139,6 +139,14 @@ field.formatter.settings.image:
       type: string
       label: 'Image style'
 
+field.formatter.settings.image_url:
+  type: mapping
+  label: 'Image URL formatter settings'
+  mapping:
+    image_style:
+      type: string
+      label: 'Image style'
+
 field.widget.settings.image_image:
   type: mapping
   label: 'Image field display format settings'
diff --git a/web/core/modules/image/css/editors/image.css b/web/core/modules/image/css/editors/image.css
new file mode 100644
index 000000000..08bb6792e
--- /dev/null
+++ b/web/core/modules/image/css/editors/image.css
@@ -0,0 +1,52 @@
+/**
+ * @file
+ * Functional styles for the Image module's in-place editor.
+ */
+
+/**
+ * A minimum width/height is required so that users can drag and drop files
+ * onto small images.
+ */
+.quickedit-image-element {
+  min-width: 200px;
+  min-height: 200px;
+}
+
+.quickedit-image-dropzone {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.quickedit-image-icon {
+  display: block;
+  width: 50px;
+  height: 50px;
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+
+.quickedit-image-field-info {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+.quickedit-image-text {
+  display: block;
+}
+
+/**
+ * If we do not prevent pointer-events for child elements, our drag+drop events
+ * will not fire properly. This can lead to unintentional redirects if a file
+ * is dropped on a child element when a user intended to upload it.
+ */
+.quickedit-image-dropzone * {
+  pointer-events: none;
+}
diff --git a/web/core/modules/image/css/editors/image.theme.css b/web/core/modules/image/css/editors/image.theme.css
new file mode 100644
index 000000000..cb0c7f9c8
--- /dev/null
+++ b/web/core/modules/image/css/editors/image.theme.css
@@ -0,0 +1,100 @@
+/**
+ * @file
+ * Theme styles for the Image module's in-place editor.
+ */
+
+.quickedit-image-dropzone {
+  background: rgba(116, 183, 255, 0.8);
+  transition: background .2s;
+}
+
+.quickedit-image-icon {
+  margin: 0 0 10px 0;
+  transition: margin .5s;
+}
+
+.quickedit-image-dropzone.hover {
+  background: rgba(116, 183, 255, 0.9);
+}
+
+.quickedit-image-dropzone.error {
+  background: rgba(255, 52, 27, 0.81);
+}
+
+.quickedit-image-dropzone.upload .quickedit-image-icon {
+  background-image: url('../../images/upload.svg');
+}
+
+.quickedit-image-dropzone.error .quickedit-image-icon {
+  background-image: url('../../images/error.svg');
+}
+
+.quickedit-image-dropzone.loading .quickedit-image-icon {
+  margin: -10px 0 20px 0;
+}
+
+.quickedit-image-dropzone.loading .quickedit-image-icon::after {
+  display: block;
+  content: "";
+  margin-left: -10px;
+  margin-top: -5px;
+  animation-duration: 2s;
+  animation-name: quickedit-image-spin;
+  animation-iteration-count: infinite;
+  animation-timing-function: linear;
+  width: 60px;
+  height: 60px;
+  border-style: solid;
+  border-radius: 35px;
+  border-width: 5px;
+  border-color: white transparent transparent transparent;
+}
+
+@keyframes quickedit-image-spin {
+  0% {transform: rotate(0deg);}
+  50% {transform: rotate(180deg);}
+  100% {transform: rotate(360deg);}
+}
+
+.quickedit-image-text {
+  text-align: center;
+  color: white;
+  font-family: "Droid sans", "Lucida Grande", sans-serif;
+  font-size: 16px;
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+}
+
+.quickedit-image-field-info {
+  background: rgba(0, 0, 0, 0.05);
+  border-top: 1px solid #c5c5c5;
+  padding: 5px;
+}
+
+.quickedit-image-field-info div {
+  margin-right: 10px; /* LTR */
+}
+
+.quickedit-image-field-info div:last-child {
+  margin-right: 0; /* LTR */
+}
+
+[dir="rtl"] .quickedit-image-field-info div {
+  margin-left: 10px;
+  margin-right: 0;
+}
+
+[dir="rtl"] .quickedit-image-field-info div:last-child {
+  margin-left: 0;
+}
+
+.quickedit-image-errors .messages__wrapper {
+  margin: 0;
+  padding: 0;
+}
+
+.quickedit-image-errors .messages--error {
+  box-shadow: none;
+}
diff --git a/web/core/modules/image/image.admin.inc b/web/core/modules/image/image.admin.inc
index 777e43855..e43bd4876 100644
--- a/web/core/modules/image/image.admin.inc
+++ b/web/core/modules/image/image.admin.inc
@@ -33,11 +33,11 @@ function template_preprocess_image_style_preview(&$variables) {
   // Set up original file information.
   $original_path = \Drupal::config('image.settings')->get('preview_image');
   $original_image = $image_factory->get($original_path);
-  $variables['original'] = array(
+  $variables['original'] = [
     'url' => file_url_transform_relative(file_create_url($original_path)),
     'width' => $original_image->getWidth(),
     'height' => $original_image->getHeight(),
-  );
+  ];
   if ($variables['original']['width'] > $variables['original']['height']) {
     $variables['preview']['original']['width'] = min($variables['original']['width'], $sample_width);
     $variables['preview']['original']['height'] = round($variables['preview']['original']['width'] / $variables['original']['width'] * $variables['original']['height']);
@@ -54,11 +54,11 @@ function template_preprocess_image_style_preview(&$variables) {
     $style->createDerivative($original_path, $preview_file);
   }
   $preview_image = $image_factory->get($preview_file);
-  $variables['derivative'] = array(
+  $variables['derivative'] = [
     'url' => file_url_transform_relative(file_create_url($preview_file)),
     'width' => $preview_image->getWidth(),
     'height' => $preview_image->getHeight(),
-  );
+  ];
   if ($variables['derivative']['width'] > $variables['derivative']['height']) {
     $variables['preview']['derivative']['width'] = min($variables['derivative']['width'], $sample_width);
     $variables['preview']['derivative']['height'] = round($variables['preview']['derivative']['width'] / $variables['derivative']['width'] * $variables['derivative']['height']);
@@ -69,31 +69,31 @@ function template_preprocess_image_style_preview(&$variables) {
   }
 
   // Build the preview of the original image.
-  $variables['original']['rendered'] = array(
+  $variables['original']['rendered'] = [
     '#theme' => 'image',
     '#uri' => $original_path,
     '#alt' => t('Sample original image'),
     '#title' => '',
-    '#attributes' => array(
+    '#attributes' => [
       'width' => $variables['original']['width'],
       'height' => $variables['original']['height'],
       'style' => 'width: ' . $variables['preview']['original']['width'] . 'px; height: ' . $variables['preview']['original']['height'] . 'px;',
-    ),
-  );
+    ],
+  ];
 
   // Build the preview of the image style derivative. Timestamps are added
   // to prevent caching of images on the client side.
-  $variables['derivative']['rendered'] = array(
+  $variables['derivative']['rendered'] = [
     '#theme' => 'image',
     '#uri' => $variables['derivative']['url'] . '?cache_bypass=' . $variables['cache_bypass'],
     '#alt' => t('Sample modified image'),
     '#title' => '',
-    '#attributes' => array(
+    '#attributes' => [
       'width' => $variables['derivative']['width'],
       'height' => $variables['derivative']['height'],
       'style' => 'width: ' . $variables['preview']['derivative']['width'] . 'px; height: ' . $variables['preview']['derivative']['height'] . 'px;',
-    ),
-  );
+    ],
+  ];
 
 }
 
@@ -109,26 +109,26 @@ function template_preprocess_image_style_preview(&$variables) {
 function template_preprocess_image_anchor(&$variables) {
   $element = $variables['element'];
 
-  $rows = array();
-  $row = array();
+  $rows = [];
+  $row = [];
   foreach (Element::children($element) as $n => $key) {
     $element[$key]['#attributes']['title'] = $element[$key]['#title'];
     unset($element[$key]['#title']);
-    $row[] = array(
+    $row[] = [
       'data' => $element[$key],
-    );
+    ];
     if ($n % 3 == 3 - 1) {
       $rows[] = $row;
-      $row = array();
+      $row = [];
     }
   }
 
-  $variables['table'] = array(
+  $variables['table'] = [
     '#type' => 'table',
-    '#header' => array(),
+    '#header' => [],
     '#rows' => $rows,
-    '#attributes' => array(
-      'class' => array('image-anchor'),
-    ),
-  );
+    '#attributes' => [
+      'class' => ['image-anchor'],
+    ],
+  ];
 }
diff --git a/web/core/modules/image/image.field.inc b/web/core/modules/image/image.field.inc
index 1bf4369e7..9fcdf6911 100644
--- a/web/core/modules/image/image.field.inc
+++ b/web/core/modules/image/image.field.inc
@@ -20,14 +20,14 @@ use Drupal\Core\Render\Element;
 function template_preprocess_image_widget(&$variables) {
   $element = $variables['element'];
 
-  $variables['attributes'] = array('class' => array('image-widget', 'js-form-managed-file', 'form-managed-file', 'clearfix'));
+  $variables['attributes'] = ['class' => ['image-widget', 'js-form-managed-file', 'form-managed-file', 'clearfix']];
 
   if (!empty($element['fids']['#value'])) {
     $file = reset($element['#files']);
     $element['file_' . $file->id()]['filename']['#suffix'] = ' <span class="file-size">(' . format_size($file->getSize()) . ')</span> ';
   }
 
-  $variables['data'] = array();
+  $variables['data'] = [];
   foreach (Element::children($element) as $child) {
     $variables['data'][$child] = $element[$child];
   }
@@ -49,15 +49,15 @@ function template_preprocess_image_widget(&$variables) {
  */
 function template_preprocess_image_formatter(&$variables) {
   if ($variables['image_style']) {
-    $variables['image'] = array(
+    $variables['image'] = [
       '#theme' => 'image_style',
       '#style_name' => $variables['image_style'],
-    );
+    ];
   }
   else {
-    $variables['image'] = array(
+    $variables['image'] = [
       '#theme' => 'image',
-    );
+    ];
   }
   $variables['image']['#attributes'] = $variables['item_attributes'];
 
@@ -75,7 +75,7 @@ function template_preprocess_image_formatter(&$variables) {
     $variables['image']['#uri'] = $item->uri;
   }
 
-  foreach (array('width', 'height', 'alt') as $key) {
+  foreach (['width', 'height', 'alt'] as $key) {
     $variables['image']["#$key"] = $item->$key;
   }
 }
diff --git a/web/core/modules/image/image.install b/web/core/modules/image/image.install
index fd14d038d..d7a2ce7dc 100644
--- a/web/core/modules/image/image.install
+++ b/web/core/modules/image/image.install
@@ -29,19 +29,19 @@ function image_uninstall() {
  */
 function image_requirements($phase) {
   if ($phase != 'runtime') {
-    return array();
+    return [];
   }
 
   $toolkit = \Drupal::service('image.toolkit.manager')->getDefaultToolkit();
   if ($toolkit) {
     $plugin_definition = $toolkit->getPluginDefinition();
-    $requirements = array(
-      'image.toolkit' => array(
+    $requirements = [
+      'image.toolkit' => [
         'title' => t('Image toolkit'),
         'value' => $toolkit->getPluginId(),
         'description' => $plugin_definition['title'],
-      ),
-    );
+      ],
+    ];
 
     foreach ($toolkit->getRequirements() as $key => $requirement) {
       $namespaced_key = 'image.toolkit.' . $toolkit->getPluginId() . '.' . $key;
@@ -49,15 +49,22 @@ function image_requirements($phase) {
     }
   }
   else {
-    $requirements = array(
-      'image.toolkit' => array(
+    $requirements = [
+      'image.toolkit' => [
         'title' => t('Image toolkit'),
         'value' => t('None'),
         'description' => t("No image toolkit is configured on the site. Check PHP installed extensions or add a contributed toolkit that doesn't require a PHP extension. Make sure that at least one valid image toolkit is enabled."),
         'severity' => REQUIREMENT_ERROR,
-      ),
-    );
+      ],
+    ];
   }
 
   return $requirements;
 }
+
+/**
+ * Flush caches as we changed field formatter metadata.
+ */
+function image_update_8201() {
+  // Empty update to trigger a cache flush.
+}
diff --git a/web/core/modules/image/image.libraries.yml b/web/core/modules/image/image.libraries.yml
index e9061a42e..a47a2b518 100644
--- a/web/core/modules/image/image.libraries.yml
+++ b/web/core/modules/image/image.libraries.yml
@@ -3,3 +3,19 @@ admin:
   css:
     theme:
       css/image.admin.css: {}
+
+quickedit.inPlaceEditor.image:
+  version: VERSION
+  js:
+    js/editors/image.js: {}
+    js/theme.js: {}
+  css:
+    component:
+      css/editors/image.css: {}
+    theme:
+      css/editors/image.theme.css: {}
+  dependencies:
+    - core/jquery
+    - core/drupal
+    - core/underscore
+    - quickedit/quickedit
diff --git a/web/core/modules/image/image.module b/web/core/modules/image/image.module
index 7f8314a6d..6107ecd90 100644
--- a/web/core/modules/image/image.module
+++ b/web/core/modules/image/image.module
@@ -52,29 +52,26 @@ define('IMAGE_STORAGE_MODULE', IMAGE_STORAGE_OVERRIDE | IMAGE_STORAGE_DEFAULT);
  */
 define('IMAGE_DERIVATIVE_TOKEN', 'itok');
 
-// Load all Field module hooks for Image.
-require_once __DIR__ . '/image.field.inc';
-
 /**
  * Implements hook_help().
  */
 function image_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.image':
-      $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#';
+      $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#';
 
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Image module allows you to create fields that contain image files and to configure <a href=":image_styles">Image styles</a> that can be used to manipulate the display of images. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for terminology and general information on entities, fields, and how to create and manage fields. For more information, see the <a href=":image_documentation">online documentation for the Image module</a>.', array(':image_styles' => \Drupal::url('entity.image_style.collection'), ':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => $field_ui_url, ':image_documentation' => 'https://www.drupal.org/documentation/modules/image')) . '</p>';
+      $output .= '<p>' . t('The Image module allows you to create fields that contain image files and to configure <a href=":image_styles">Image styles</a> that can be used to manipulate the display of images. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for terminology and general information on entities, fields, and how to create and manage fields. For more information, see the <a href=":image_documentation">online documentation for the Image module</a>.', [':image_styles' => \Drupal::url('entity.image_style.collection'), ':field' => \Drupal::url('help.page', ['name' => 'field']), ':field_ui' => $field_ui_url, ':image_documentation' => 'https://www.drupal.org/documentation/modules/image']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dt>' . t('Defining image styles') . '</dt>';
-      $output .= '<dd>' . t('The concept of image styles is that you can upload a single image but display it in several ways; each display variation, or <em>image style</em>, is the result of applying one or more <em>effects</em> to the original image. As an example, you might upload a high-resolution image with a 4:3 aspect ratio, and display it scaled down, square cropped, or black-and-white (or any combination of these effects). The Image module provides a way to do this efficiently: you configure an image style with the desired effects on the <a href=":image">Image styles page</a>, and the first time a particular image is requested in that style, the effects are applied. The resulting image is saved, and the next time that same style is requested, the saved image is retrieved without the need to recalculate the effects. Drupal core provides several effects that you can use to define styles; others may be provided by contributed modules.', array(':image' => \Drupal::url('entity.image_style.collection')));
+      $output .= '<dd>' . t('The concept of image styles is that you can upload a single image but display it in several ways; each display variation, or <em>image style</em>, is the result of applying one or more <em>effects</em> to the original image. As an example, you might upload a high-resolution image with a 4:3 aspect ratio, and display it scaled down, square cropped, or black-and-white (or any combination of these effects). The Image module provides a way to do this efficiently: you configure an image style with the desired effects on the <a href=":image">Image styles page</a>, and the first time a particular image is requested in that style, the effects are applied. The resulting image is saved, and the next time that same style is requested, the saved image is retrieved without the need to recalculate the effects. Drupal core provides several effects that you can use to define styles; others may be provided by contributed modules.', [':image' => \Drupal::url('entity.image_style.collection')]);
       $output .= '<dt>' . t('Naming image styles') . '</dt>';
       $output .= '<dd>' . t('When you define an image style, you will need to choose a displayed name and a machine name. The displayed name is shown in administrative pages, and the machine name is used to generate the URL for accessing an image processed in that style. There are two common approaches to naming image styles: either based on the effects being applied (for example, <em>Square 85x85</em>), or based on where you plan to use it (for example, <em>Profile picture</em>).') . '</dd>';
       $output .= '<dt>' . t('Configuring image fields') . '</dt>';
       $output .= '<dd>' . t('A few of the settings for image fields are defined once when you create the field and cannot be changed later; these include the choice of public or private file storage and the number of images that can be stored in the field. The rest of the settings can be edited later; these settings include the field label, help text, allowed file extensions, image resolution restrictions, and the subdirectory in the public or private file storage where the images will be stored. The editable settings can also have different values for different entity sub-types; for instance, if your image field is used on both Page and Article content types, you can store the files in a different subdirectory for the two content types.') . '</dd>';
       $output .= '<dd>' . t('For accessibility and search engine optimization, all images that convey meaning on web sites should have alternate text. Drupal also allows entry of title text for images, but it can lead to confusion for screen reader users and its use is not recommended. Image fields can be configured so that alternate and title text fields are enabled or disabled; if enabled, the fields can be set to be required. The recommended setting is to enable and require alternate text and disable title text.') . '</dd>';
-      $output .= '<dd>' . t('When you create an image field, you will need to choose whether the uploaded images will be stored in the public or private file directory defined in your settings.php file and shown on the <a href=":file-system">File system page</a>. This choice cannot be changed later. You can also configure your field to store files in a subdirectory of the public or private directory; this setting can be changed later and can be different for each entity sub-type using the field. For more information on file storage, see the <a href=":system-help">System module help page</a>.', array(':file-system' => \Drupal::url('system.file_system_settings'), ':system-help' => \Drupal::url('help.page', array('name' => 'system')))) . '</dd>';
+      $output .= '<dd>' . t('When you create an image field, you will need to choose whether the uploaded images will be stored in the public or private file directory defined in your settings.php file and shown on the <a href=":file-system">File system page</a>. This choice cannot be changed later. You can also configure your field to store files in a subdirectory of the public or private directory; this setting can be changed later and can be different for each entity sub-type using the field. For more information on file storage, see the <a href=":system-help">System module help page</a>.', [':file-system' => \Drupal::url('system.file_system_settings'), ':system-help' => \Drupal::url('help.page', ['name' => 'system'])]) . '</dd>';
       $output .= '<dd>' . t('The maximum file size that can be uploaded is limited by PHP settings of the server, but you can restrict it further by configuring a <em>Maximum upload size</em> in the field settings (this setting can be changed later). The maximum file size, either from PHP server settings or field configuration, is automatically displayed to users in the help text of the image field.') . '</dd>';
       $output .= '<dd>' . t('You can also configure a minimum and/or maximum resolution for uploaded images. Images that are too small will be rejected. Images that are to large will be resized. During the resizing the <a href="http://wikipedia.org/wiki/Exchangeable_image_file_format">EXIF data</a> in the image will be lost.') . '</dd>';
       $output .= '<dd>' . t('You can also configure a default image that will be used if no image is uploaded in an image field. This default can be defined for all instances of the field in the field storage settings when you create a field, and the setting can be overridden for each entity sub-type that uses the field.') . '</dd>';
@@ -101,9 +98,9 @@ function image_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function image_theme() {
-  return array(
+  return [
     // Theme functions in image.module.
-    'image_style' => array(
+    'image_style' => [
       // HTML 4 and XHTML 1.0 always require an alt attribute. The HTML 5 draft
       // allows the alt attribute to be omitted in some cases. Therefore,
       // default the alt attribute to an empty string, but allow code using
@@ -116,49 +113,49 @@ function image_theme() {
       // - http://dev.w3.org/html5/spec/Overview.html#alt
       // The title attribute is optional in all cases, so it is omitted by
       // default.
-      'variables' => array(
+      'variables' => [
         'style_name' => NULL,
         'uri' => NULL,
         'width' => NULL,
         'height' => NULL,
         'alt' => '',
         'title' => NULL,
-        'attributes' => array(),
-      ),
-    ),
+        'attributes' => [],
+      ],
+    ],
 
     // Theme functions in image.admin.inc.
-    'image_style_preview' => array(
-      'variables' => array('style' => NULL),
+    'image_style_preview' => [
+      'variables' => ['style' => NULL],
       'file' => 'image.admin.inc',
-    ),
-    'image_anchor' => array(
+    ],
+    'image_anchor' => [
       'render element' => 'element',
       'file' => 'image.admin.inc',
-    ),
-    'image_resize_summary' => array(
-      'variables' => array('data' => NULL, 'effect' => array()),
-    ),
-    'image_scale_summary' => array(
-      'variables' => array('data' => NULL, 'effect' => array()),
-    ),
-    'image_crop_summary' => array(
-      'variables' => array('data' => NULL, 'effect' => array()),
-    ),
-    'image_rotate_summary' => array(
-      'variables' => array('data' => NULL, 'effect' => array()),
-    ),
+    ],
+    'image_resize_summary' => [
+      'variables' => ['data' => NULL, 'effect' => []],
+    ],
+    'image_scale_summary' => [
+      'variables' => ['data' => NULL, 'effect' => []],
+    ],
+    'image_crop_summary' => [
+      'variables' => ['data' => NULL, 'effect' => []],
+    ],
+    'image_rotate_summary' => [
+      'variables' => ['data' => NULL, 'effect' => []],
+    ],
 
     // Theme functions in image.field.inc.
-    'image_widget' => array(
+    'image_widget' => [
       'render element' => 'element',
       'file' => 'image.field.inc',
-    ),
-    'image_formatter' => array(
-      'variables' => array('item' => NULL, 'item_attributes' => NULL, 'url' => NULL, 'image_style' => NULL),
+    ],
+    'image_formatter' => [
+      'variables' => ['item' => NULL, 'item_attributes' => NULL, 'url' => NULL, 'image_style' => NULL],
       'file' => 'image.field.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -183,17 +180,17 @@ function image_file_download($uri) {
     $image = \Drupal::service('image.factory')->get($uri);
     if ($image->isValid()) {
       // Check the permissions of the original to grant access to this image.
-      $headers = \Drupal::moduleHandler()->invokeAll('file_download', array($original_uri));
+      $headers = \Drupal::moduleHandler()->invokeAll('file_download', [$original_uri]);
       // Confirm there's at least one module granting access and none denying access.
       if (!empty($headers) && !in_array(-1, $headers)) {
-        return array(
+        return [
           // Send headers describing the image's size, and MIME-type.
           'Content-Type' => $image->getMimeType(),
           'Content-Length' => $image->getFileSize(),
           // By not explicitly setting them here, this uses normal Drupal
           // Expires, Cache-Control and ETag headers to prevent proxy or
           // browser caching of private images.
-        );
+        ];
       }
     }
     return -1;
@@ -239,7 +236,7 @@ function image_path_flush($path) {
  */
 function image_style_options($include_empty = TRUE) {
   $styles = ImageStyle::loadMultiple();
-  $options = array();
+  $options = [];
   if ($include_empty && !empty($styles)) {
     $options[''] = t('- None -');
   }
@@ -283,21 +280,21 @@ function template_preprocess_image_style(&$variables) {
   $style = ImageStyle::load($variables['style_name']);
 
   // Determine the dimensions of the styled image.
-  $dimensions = array(
+  $dimensions = [
     'width' => $variables['width'],
     'height' => $variables['height'],
-  );
+  ];
 
   $style->transformDimensions($dimensions, $variables['uri']);
 
-  $variables['image'] = array(
+  $variables['image'] = [
     '#theme' => 'image',
     '#width' => $dimensions['width'],
     '#height' => $dimensions['height'],
     '#attributes' => $variables['attributes'],
     '#uri' => $style->buildUrl($variables['uri']),
     '#style_name' => $variables['style_name'],
-  );
+  ];
 
   if (isset($variables['alt']) || array_key_exists('alt', $variables)) {
     $variables['image']['#alt'] = $variables['alt'];
diff --git a/web/core/modules/image/image.routing.yml b/web/core/modules/image/image.routing.yml
index ffeed861a..4a0cb88a8 100644
--- a/web/core/modules/image/image.routing.yml
+++ b/web/core/modules/image/image.routing.yml
@@ -71,3 +71,29 @@ image.effect_edit_form:
 
 route_callbacks:
   - '\Drupal\image\Routing\ImageStyleRoutes::routes'
+
+image.upload:
+  path: '/quickedit/image/upload/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
+  defaults:
+    _controller: '\Drupal\image\Controller\QuickEditImageController::upload'
+  options:
+    parameters:
+      entity:
+        type: entity:{entity_type}
+  requirements:
+    _permission: 'access in-place editing'
+    _access_quickedit_entity_field: 'TRUE'
+    _method: 'POST'
+
+image.info:
+  path: '/quickedit/image/info/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
+  defaults:
+    _controller: '\Drupal\image\Controller\QuickEditImageController::getInfo'
+  options:
+    parameters:
+      entity:
+        type: entity:{entity_type}
+  requirements:
+    _permission: 'access in-place editing'
+    _access_quickedit_entity_field: 'TRUE'
+    _method: 'GET'
diff --git a/web/core/modules/image/image.views.inc b/web/core/modules/image/image.views.inc
index 29e6b6a6b..cca0e3d90 100644
--- a/web/core/modules/image/image.views.inc
+++ b/web/core/modules/image/image.views.inc
@@ -19,13 +19,13 @@ function image_field_views_data(FieldStorageConfigInterface $field_storage) {
   $data = views_field_default_views_data($field_storage);
   foreach ($data as $table_name => $table_data) {
     // Add the relationship only on the target_id field.
-    $data[$table_name][$field_storage->getName() . '_target_id']['relationship'] = array(
+    $data[$table_name][$field_storage->getName() . '_target_id']['relationship'] = [
       'id' => 'standard',
       'base' => 'file_managed',
       'entity type' => 'file',
       'base field' => 'fid',
-      'label' => t('image from @field_name', array('@field_name' => $field_storage->getName())),
-    );
+      'label' => t('image from @field_name', ['@field_name' => $field_storage->getName()]),
+    ];
   }
 
   return $data;
@@ -47,10 +47,10 @@ function image_field_views_data_views_data_alter(array &$data, FieldStorageConfi
 
   list($label) = views_entity_field_label($entity_type_id, $field_name);
 
-  $data['file_managed'][$pseudo_field_name]['relationship'] = array(
-    'title' => t('@entity using @field', array('@entity' => $entity_type->getLabel(), '@field' => $label)),
-    'label' => t('@field_name', array('@field_name' => $field_name)),
-    'help' => t('Relate each @entity with a @field set to the image.', array('@entity' => $entity_type->getLabel(), '@field' => $label)),
+  $data['file_managed'][$pseudo_field_name]['relationship'] = [
+    'title' => t('@entity using @field', ['@entity' => $entity_type->getLabel(), '@field' => $label]),
+    'label' => t('@field_name', ['@field_name' => $field_name]),
+    'help' => t('Relate each @entity with a @field set to the image.', ['@entity' => $entity_type->getLabel(), '@field' => $label]),
     'group' => $entity_type->getLabel(),
     'id' => 'entity_reverse',
     'base' => $entity_type->getDataTable() ?: $entity_type->getBaseTable(),
@@ -59,12 +59,12 @@ function image_field_views_data_views_data_alter(array &$data, FieldStorageConfi
     'field_name' => $field_name,
     'field table' => $table_mapping->getDedicatedDataTableName($field_storage),
     'field field' => $field_name . '_target_id',
-    'join_extra' => array(
-      0 => array(
+    'join_extra' => [
+      0 => [
         'field' => 'deleted',
         'value' => 0,
         'numeric' => TRUE,
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 }
diff --git a/web/core/modules/image/images/error.svg b/web/core/modules/image/images/error.svg
new file mode 100644
index 000000000..1932ea402
--- /dev/null
+++ b/web/core/modules/image/images/error.svg
@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"/>
+</svg>
diff --git a/web/core/modules/image/images/upload.svg b/web/core/modules/image/images/upload.svg
new file mode 100644
index 000000000..168bc43e6
--- /dev/null
+++ b/web/core/modules/image/images/upload.svg
@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M9 16h6v-6h4l-7-7-7 7h4zm-4 2h14v2H5z"/>
+</svg>
diff --git a/web/core/modules/image/js/editors/image.js b/web/core/modules/image/js/editors/image.js
new file mode 100644
index 000000000..dea08df59
--- /dev/null
+++ b/web/core/modules/image/js/editors/image.js
@@ -0,0 +1,342 @@
+/**
+ * @file
+ * Drag+drop based in-place editor for images.
+ */
+
+(function ($, _, Drupal) {
+
+  'use strict';
+
+  Drupal.quickedit.editors.image = Drupal.quickedit.EditorView.extend(/** @lends Drupal.quickedit.editors.image# */{
+
+    /**
+     * @constructs
+     *
+     * @augments Drupal.quickedit.EditorView
+     *
+     * @param {object} options
+     *   Options for the image editor.
+     */
+    initialize: function (options) {
+      Drupal.quickedit.EditorView.prototype.initialize.call(this, options);
+      // Set our original value to our current HTML (for reverting).
+      this.model.set('originalValue', this.$el.html().trim());
+      // $.val() callback function for copying input from our custom form to
+      // the Quick Edit Field Form.
+      this.model.set('currentValue', function (index, value) {
+        var matches = $(this).attr('name').match(/(alt|title)]$/);
+        if (matches) {
+          var name = matches[1];
+          var $toolgroup = $('#' + options.fieldModel.toolbarView.getMainWysiwygToolgroupId());
+          var $input = $toolgroup.find('.quickedit-image-field-info input[name="' + name + '"]');
+          if ($input.length) {
+            return $input.val();
+          }
+        }
+      });
+    },
+
+    /**
+     * @inheritdoc
+     *
+     * @param {Drupal.quickedit.FieldModel} fieldModel
+     *   The field model that holds the state.
+     * @param {string} state
+     *   The state to change to.
+     * @param {object} options
+     *   State options, if needed by the state change.
+     */
+    stateChange: function (fieldModel, state, options) {
+      var from = fieldModel.previous('state');
+      switch (state) {
+        case 'inactive':
+          break;
+
+        case 'candidate':
+          if (from !== 'inactive') {
+            this.$el.find('.quickedit-image-dropzone').remove();
+            this.$el.removeClass('quickedit-image-element');
+          }
+          if (from === 'invalid') {
+            this.removeValidationErrors();
+          }
+          break;
+
+        case 'highlighted':
+          break;
+
+        case 'activating':
+          // Defer updating the field model until the current state change has
+          // propagated, to not trigger a nested state change event.
+          _.defer(function () {
+            fieldModel.set('state', 'active');
+          });
+          break;
+
+        case 'active':
+          var self = this;
+
+          // Indicate that this element is being edited by Quick Edit Image.
+          this.$el.addClass('quickedit-image-element');
+
+          // Render our initial dropzone element. Once the user reverts changes
+          // or saves a new image, this element is removed.
+          var $dropzone = this.renderDropzone('upload', Drupal.t('Drop file here or click to upload'));
+
+          $dropzone.on('dragenter', function (e) {
+            $(this).addClass('hover');
+          });
+          $dropzone.on('dragleave', function (e) {
+            $(this).removeClass('hover');
+          });
+
+          $dropzone.on('drop', function (e) {
+            // Only respond when a file is dropped (could be another element).
+            if (e.originalEvent.dataTransfer && e.originalEvent.dataTransfer.files.length) {
+              $(this).removeClass('hover');
+              self.uploadImage(e.originalEvent.dataTransfer.files[0]);
+            }
+          });
+
+          $dropzone.on('click', function (e) {
+            // Create an <input> element without appending it to the DOM, and
+            // trigger a click event. This is the easiest way to arbitrarily
+            // open the browser's upload dialog.
+            $('<input type="file">')
+              .trigger('click')
+              .on('change', function () {
+                if (this.files.length) {
+                  self.uploadImage(this.files[0]);
+                }
+              });
+          });
+
+          // Prevent the browser's default behavior when dragging files onto
+          // the document (usually opens them in the same tab).
+          $dropzone.on('dragover dragenter dragleave drop click', function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+          });
+
+          this.renderToolbar(fieldModel);
+          break;
+
+        case 'changed':
+          break;
+
+        case 'saving':
+          if (from === 'invalid') {
+            this.removeValidationErrors();
+          }
+
+          this.save(options);
+          break;
+
+        case 'saved':
+          break;
+
+        case 'invalid':
+          this.showValidationErrors();
+          break;
+      }
+    },
+
+    /**
+     * Validates/uploads a given file.
+     *
+     * @param {File} file
+     *   The file to upload.
+     */
+    uploadImage: function (file) {
+      // Indicate loading by adding a special class to our icon.
+      this.renderDropzone('upload loading', Drupal.t('Uploading <i>@file</i>…', {'@file': file.name}));
+
+      // Build a valid URL for our endpoint.
+      var fieldID = this.fieldModel.get('fieldID');
+      var url = Drupal.quickedit.util.buildUrl(fieldID, Drupal.url('quickedit/image/upload/!entity_type/!id/!field_name/!langcode/!view_mode'));
+
+      // Construct form data that our endpoint can consume.
+      var data = new FormData();
+      data.append('files[image]', file);
+
+      // Construct a POST request to our endpoint.
+      var self = this;
+      this.ajax({
+        type: 'POST',
+        url: url,
+        data: data,
+        success: function (response) {
+          var $el = $(self.fieldModel.get('el'));
+          // Indicate that the field has changed - this enables the
+          // "Save" button.
+          self.fieldModel.set('state', 'changed');
+          self.fieldModel.get('entity').set('inTempStore', true);
+          self.removeValidationErrors();
+
+          // Replace our html with the new image. If we replaced our entire
+          // element with data.html, we would have to implement complicated logic
+          // like what's in Drupal.quickedit.AppView.renderUpdatedField.
+          var $content = $(response.html).closest('[data-quickedit-field-id]').children();
+          $el.empty().append($content);
+        }
+      });
+    },
+
+    /**
+     * Utility function to make an AJAX request to the server.
+     *
+     * In addition to formatting the correct request, this also handles error
+     * codes and messages by displaying them visually inline with the image.
+     *
+     * Drupal.ajax is not called here as the Form API is unused by this
+     * in-place editor, and our JSON requests/responses try to be
+     * editor-agnostic. Ideally similar logic and routes could be used by
+     * modules like CKEditor for drag+drop file uploads as well.
+     *
+     * @param {object} options
+     *   Ajax options.
+     * @param {string} options.type
+     *   The type of request (i.e. GET, POST, PUT, DELETE, etc.)
+     * @param {string} options.url
+     *   The URL for the request.
+     * @param {*} options.data
+     *   The data to send to the server.
+     * @param {function} options.success
+     *   A callback function used when a request is successful, without errors.
+     */
+    ajax: function (options) {
+      var defaultOptions = {
+        context: this,
+        dataType: 'json',
+        cache: false,
+        contentType: false,
+        processData: false,
+        error: function () {
+          this.renderDropzone('error', Drupal.t('A server error has occurred.'));
+        }
+      };
+
+      var ajaxOptions = $.extend(defaultOptions, options);
+      var successCallback = ajaxOptions.success;
+
+      // Handle the success callback.
+      ajaxOptions.success = function (response) {
+        if (response.main_error) {
+          this.renderDropzone('error', response.main_error);
+          if (response.errors.length) {
+            this.model.set('validationErrors', response.errors);
+          }
+          this.showValidationErrors();
+        }
+        else {
+          successCallback(response);
+        }
+      };
+
+      $.ajax(ajaxOptions);
+    },
+
+    /**
+     * Renders our toolbar form for editing metadata.
+     *
+     * @param {Drupal.quickedit.FieldModel} fieldModel
+     *   The current Field Model.
+     */
+    renderToolbar: function (fieldModel) {
+      var $toolgroup = $('#' + fieldModel.toolbarView.getMainWysiwygToolgroupId());
+      var $toolbar = $toolgroup.find('.quickedit-image-field-info');
+      if ($toolbar.length === 0) {
+        // Perform an AJAX request for extra image info (alt/title).
+        var fieldID = fieldModel.get('fieldID');
+        var url = Drupal.quickedit.util.buildUrl(fieldID, Drupal.url('quickedit/image/info/!entity_type/!id/!field_name/!langcode/!view_mode'));
+        var self = this;
+        self.ajax({
+          type: 'GET',
+          url: url,
+          success: function (response) {
+            $toolbar = $(Drupal.theme.quickeditImageToolbar(response));
+            $toolgroup.append($toolbar);
+            $toolbar.on('keyup paste', function () {
+              fieldModel.set('state', 'changed');
+            });
+            // Re-position the toolbar, which could have changed size.
+            fieldModel.get('entity').toolbarView.position();
+          }
+        });
+      }
+    },
+
+    /**
+     * Renders our dropzone element.
+     *
+     * @param {string} state
+     *   The current state of our editor. Only used for visual styling.
+     * @param {string} text
+     *   The text to display in the dropzone area.
+     *
+     * @return {jQuery}
+     *   The rendered dropzone.
+     */
+    renderDropzone: function (state, text) {
+      var $dropzone = this.$el.find('.quickedit-image-dropzone');
+      // If the element already exists, modify its contents.
+      if ($dropzone.length) {
+        $dropzone
+          .removeClass('upload error hover loading')
+          .addClass('.quickedit-image-dropzone ' + state)
+          .children('.quickedit-image-text')
+            .html(text);
+      }
+      else {
+        $dropzone = $(Drupal.theme('quickeditImageDropzone', {
+          state: state,
+          text: text
+        }));
+        this.$el.append($dropzone);
+      }
+
+      return $dropzone;
+    },
+
+    /**
+     * @inheritdoc
+     */
+    revert: function () {
+      this.$el.html(this.model.get('originalValue'));
+    },
+
+    /**
+     * @inheritdoc
+     */
+    getQuickEditUISettings: function () {
+      return {padding: false, unifiedToolbar: true, fullWidthToolbar: true, popup: false};
+    },
+
+    /**
+     * @inheritdoc
+     */
+    showValidationErrors: function () {
+      var errors = Drupal.theme('quickeditImageErrors', {
+        errors: this.model.get('validationErrors')
+      });
+      $('#' + this.fieldModel.toolbarView.getMainWysiwygToolgroupId())
+        .append(errors);
+      this.getEditedElement()
+        .addClass('quickedit-validation-error');
+      // Re-position the toolbar, which could have changed size.
+      this.fieldModel.get('entity').toolbarView.position();
+    },
+
+    /**
+     * @inheritdoc
+     */
+    removeValidationErrors: function () {
+      $('#' + this.fieldModel.toolbarView.getMainWysiwygToolgroupId())
+        .find('.quickedit-image-errors').remove();
+      this.getEditedElement()
+        .removeClass('quickedit-validation-error');
+    }
+
+  });
+
+})(jQuery, _, Drupal);
diff --git a/web/core/modules/image/js/theme.js b/web/core/modules/image/js/theme.js
new file mode 100644
index 000000000..cba8f7bbc
--- /dev/null
+++ b/web/core/modules/image/js/theme.js
@@ -0,0 +1,86 @@
+/**
+ * @file
+ * Provides theme functions for image Quick Edit's client-side HTML.
+ */
+
+(function (Drupal) {
+
+  'use strict';
+
+  /**
+   * Theme function for validation errors of the Image in-place editor.
+   *
+   * @param {object} settings
+   *   Settings object used to construct the markup.
+   * @param {string} settings.errors
+   *   Already escaped HTML representing error messages.
+   *
+   * @return {string}
+   *   The corresponding HTML.
+   */
+  Drupal.theme.quickeditImageErrors = function (settings) {
+    return '<div class="quickedit-image-errors">' + settings.errors + '</div>';
+  };
+
+  /**
+   * Theme function for the dropzone element of the Image module's in-place
+   * editor.
+   *
+   * @param {object} settings
+   *   Settings object used to construct the markup.
+   * @param {string} settings.state
+   *   State of the upload.
+   * @param {string} settings.text
+   *   Text to display inline with the dropzone element.
+   *
+   * @return {string}
+   *   The corresponding HTML.
+   */
+  Drupal.theme.quickeditImageDropzone = function (settings) {
+    return '<div class="quickedit-image-dropzone ' + settings.state + '">' +
+      '  <i class="quickedit-image-icon"></i>' +
+      '  <span class="quickedit-image-text">' + settings.text + '</span>' +
+      '</div>';
+  };
+
+  /**
+   * Theme function for the toolbar of the Image module's in-place editor.
+   *
+   * @param {object} settings
+   *   Settings object used to construct the markup.
+   * @param {bool} settings.alt_field
+   *   Whether or not the "Alt" field is enabled for this field.
+   * @param {bool} settings.alt_field_required
+   *   Whether or not the "Alt" field is required for this field.
+   * @param {string} settings.alt
+   *   The current value for the "Alt" field.
+   * @param {bool} settings.title_field
+   *   Whether or not the "Title" field is enabled for this field.
+   * @param {bool} settings.title_field_required
+   *   Whether or not the "Title" field is required for this field.
+   * @param {string} settings.title
+   *   The current value for the "Title" field.
+   *
+   * @return {string}
+   *   The corresponding HTML.
+   */
+  Drupal.theme.quickeditImageToolbar = function (settings) {
+    var html = '<form class="quickedit-image-field-info">';
+    if (settings.alt_field) {
+      html += '  <div>' +
+        '    <label for="alt" class="' + (settings.alt_field_required ? 'required' : '') + '">' + Drupal.t('Alternative text') + '</label>' +
+        '    <input type="text" placeholder="' + settings.alt + '" value="' + settings.alt + '" name="alt" ' + (settings.alt_field_required ? 'required' : '') + '/>' +
+        '  </div>';
+    }
+    if (settings.title_field) {
+      html += '  <div>' +
+        '    <label for="title" class="' + (settings.title_field_required ? 'form-required' : '') + '">' + Drupal.t('Title') + '</label>' +
+        '    <input type="text" placeholder="' + settings.title + '" value="' + settings.title + '" name="title" ' + (settings.title_field_required ? 'required' : '') + '/>' +
+        '  </div>';
+    }
+    html += '</form>';
+
+    return html;
+  };
+
+})(Drupal);
diff --git a/web/core/modules/image/src/Controller/ImageStyleDownloadController.php b/web/core/modules/image/src/Controller/ImageStyleDownloadController.php
index 8859bdd16..afc1edf75 100644
--- a/web/core/modules/image/src/Controller/ImageStyleDownloadController.php
+++ b/web/core/modules/image/src/Controller/ImageStyleDownloadController.php
@@ -108,12 +108,12 @@ class ImageStyleDownloadController extends FileDownloadController {
     }
 
     $derivative_uri = $image_style->buildUri($image_uri);
-    $headers = array();
+    $headers = [];
 
     // If using the private scheme, let other modules provide headers and
     // control access to the file.
     if ($scheme == 'private') {
-      $headers = $this->moduleHandler()->invokeAll('file_download', array($image_uri));
+      $headers = $this->moduleHandler()->invokeAll('file_download', [$image_uri]);
       if (in_array(-1, $headers) || empty($headers)) {
         throw new AccessDeniedHttpException();
       }
@@ -128,7 +128,7 @@ class ImageStyleDownloadController extends FileDownloadController {
       $path_info = pathinfo($image_uri);
       $converted_image_uri = $path_info['dirname'] . DIRECTORY_SEPARATOR . $path_info['filename'];
       if (!file_exists($converted_image_uri)) {
-        $this->logger->notice('Source image at %source_image_path not found while trying to generate derivative image at %derivative_path.', array('%source_image_path' => $image_uri, '%derivative_path' => $derivative_uri));
+        $this->logger->notice('Source image at %source_image_path not found while trying to generate derivative image at %derivative_path.', ['%source_image_path' => $image_uri, '%derivative_path' => $derivative_uri]);
         return new Response($this->t('Error generating image, missing source file.'), 404);
       }
       else {
@@ -160,10 +160,10 @@ class ImageStyleDownloadController extends FileDownloadController {
     if ($success) {
       $image = $this->imageFactory->get($derivative_uri);
       $uri = $image->getSource();
-      $headers += array(
+      $headers += [
         'Content-Type' => $image->getMimeType(),
         'Content-Length' => $image->getFileSize(),
-      );
+      ];
       // \Drupal\Core\EventSubscriber\FinishResponseSubscriber::onRespond()
       // sets response as not cacheable if the Cache-Control header is not
       // already modified. We pass in FALSE for non-private schemes for the
@@ -171,7 +171,7 @@ class ImageStyleDownloadController extends FileDownloadController {
       return new BinaryFileResponse($uri, 200, $headers, $scheme !== 'private');
     }
     else {
-      $this->logger->notice('Unable to generate the derived image located at %path.', array('%path' => $derivative_uri));
+      $this->logger->notice('Unable to generate the derived image located at %path.', ['%path' => $derivative_uri]);
       return new Response($this->t('Error generating image.'), 500);
     }
   }
diff --git a/web/core/modules/image/src/Controller/QuickEditImageController.php b/web/core/modules/image/src/Controller/QuickEditImageController.php
new file mode 100644
index 000000000..aa49bc7d3
--- /dev/null
+++ b/web/core/modules/image/src/Controller/QuickEditImageController.php
@@ -0,0 +1,225 @@
+<?php
+
+namespace Drupal\image\Controller;
+
+use Drupal\Core\Cache\CacheableJsonResponse;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Image\ImageFactory;
+use Drupal\Core\Render\Element\StatusMessages;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\image\Plugin\Field\FieldType\ImageItem;
+use Drupal\user\PrivateTempStoreFactory;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+/**
+ * Returns responses for our image routes.
+ */
+class QuickEditImageController extends ControllerBase {
+
+  /**
+   * Stores The Quick Edit tempstore.
+   *
+   * @var \Drupal\user\PrivateTempStore
+   */
+  protected $tempStore;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * The image factory.
+   *
+   * @var \Drupal\Core\Image\ImageFactory
+   */
+  protected $imageFactory;
+
+  /**
+   * Constructs a new QuickEditImageController.
+   *
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   * @param \Drupal\Core\Image\ImageFactory $image_factory
+   *   The image factory.
+   * @param \Drupal\user\PrivateTempStoreFactory $temp_store_factory
+   *   The tempstore factory.
+   */
+  public function __construct(RendererInterface $renderer, ImageFactory $image_factory, PrivateTempStoreFactory $temp_store_factory) {
+    $this->renderer = $renderer;
+    $this->imageFactory = $image_factory;
+    $this->tempStore = $temp_store_factory->get('quickedit');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('renderer'),
+      $container->get('image.factory'),
+      $container->get('user.private_tempstore')
+    );
+  }
+
+  /**
+   * Returns JSON representing the new file upload, or validation errors.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity of which an image field is being rendered.
+   * @param string $field_name
+   *   The name of the (image) field that is being rendered
+   * @param string $langcode
+   *   The language code of the field that is being rendered.
+   * @param string $view_mode_id
+   *   The view mode of the field that is being rendered.
+   *
+   * @return \Symfony\Component\HttpFoundation\JsonResponse
+   *   The JSON response.
+   */
+  public function upload(EntityInterface $entity, $field_name, $langcode, $view_mode_id) {
+    $field = $this->getField($entity, $field_name, $langcode);
+    $field_validators = $field->getUploadValidators();
+    $field_settings = $field->getFieldDefinition()->getSettings();
+    $destination = $field->getUploadLocation();
+
+    // Add upload resolution validation.
+    if ($field_settings['max_resolution'] || $field_settings['min_resolution']) {
+      $field_validators['file_validate_image_resolution'] = [$field_settings['max_resolution'], $field_settings['min_resolution']];
+    }
+
+    // Create the destination directory if it does not already exist.
+    if (isset($destination) && !file_prepare_directory($destination, FILE_CREATE_DIRECTORY)) {
+      return new JsonResponse(['main_error' => $this->t('The destination directory could not be created.'), 'errors' => '']);
+    }
+
+    // Attempt to save the image given the field's constraints.
+    $result = file_save_upload('image', $field_validators, $destination);
+    if (is_array($result) && $result[0]) {
+      /** @var \Drupal\file\Entity\File $file */
+      $file = $result[0];
+      $image = $this->imageFactory->get($file->getFileUri());
+
+      // Set the value in the Entity to the new file.
+      /** @var \Drupal\file\Plugin\Field\FieldType\FileFieldItemList $field_list */
+      $value = $entity->$field_name->getValue();
+      $value[0]['target_id'] = $file->id();
+      $value[0]['width'] = $image->getWidth();
+      $value[0]['height'] = $image->getHeight();
+      $entity->$field_name->setValue($value);
+
+      // Render the new image using the correct formatter settings.
+      $entity_view_mode_ids = array_keys($this->entityManager()->getViewModes($entity->getEntityTypeId()));
+      if (in_array($view_mode_id, $entity_view_mode_ids, TRUE)) {
+        $output = $entity->$field_name->view($view_mode_id);
+      }
+      else {
+        // Each part of a custom (non-Entity Display) view mode ID is separated
+        // by a dash; the first part must be the module name.
+        $mode_id_parts = explode('-', $view_mode_id, 2);
+        $module = reset($mode_id_parts);
+        $args = [$entity, $field_name, $view_mode_id, $langcode];
+        $output = $this->moduleHandler()->invoke($module, 'quickedit_render_field', $args);
+      }
+
+      // Save the Entity to tempstore.
+      $this->tempStore->set($entity->uuid(), $entity);
+
+      $data = [
+        'fid' => $file->id(),
+        'html' => $this->renderer->renderRoot($output),
+      ];
+      return new JsonResponse($data);
+    }
+    else {
+      // Return a JSON object containing the errors from Drupal and our
+      // "main_error", which is displayed inside the dropzone area.
+      $messages = StatusMessages::renderMessages('error');
+      return new JsonResponse(['errors' => $this->renderer->render($messages), 'main_error' => $this->t('The image failed validation.')]);
+    }
+  }
+
+  /**
+   * Returns JSON representing an image field's metadata.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity of which an image field is being rendered.
+   * @param string $field_name
+   *   The name of the (image) field that is being rendered
+   * @param string $langcode
+   *   The language code of the field that is being rendered.
+   * @param string $view_mode_id
+   *   The view mode of the field that is being rendered.
+   *
+   * @return \Drupal\Core\Cache\CacheableJsonResponse
+   *   The JSON response.
+   */
+  public function getInfo(EntityInterface $entity, $field_name, $langcode, $view_mode_id) {
+    $field = $this->getField($entity, $field_name, $langcode);
+    $settings = $field->getFieldDefinition()->getSettings();
+    $info = [
+      'alt' => $field->alt,
+      'title' => $field->title,
+      'alt_field' => $settings['alt_field'],
+      'title_field' => $settings['title_field'],
+      'alt_field_required' => $settings['alt_field_required'],
+      'title_field_required' => $settings['title_field_required'],
+    ];
+    $response = new CacheableJsonResponse($info);
+    $response->addCacheableDependency($entity);
+    return $response;
+  }
+
+  /**
+   * Returns JSON representing the current state of the field.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity of which an image field is being rendered.
+   * @param string $field_name
+   *   The name of the (image) field that is being rendered
+   * @param string $langcode
+   *   The language code of the field that is being rendered.
+   *
+   * @return \Drupal\image\Plugin\Field\FieldType\ImageItem
+   *   The field for this request.
+   *
+   * @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
+   *   Throws an exception if the request is invalid.
+   */
+  protected function getField(EntityInterface $entity, $field_name, $langcode) {
+    // Ensure that this is a valid Entity.
+    if (!($entity instanceof ContentEntityInterface)) {
+      throw new BadRequestHttpException('Requested Entity is not a Content Entity.');
+    }
+
+    // Check that this field exists.
+    /** @var \Drupal\Core\Field\FieldItemListInterface $field_list */
+    $field_list = $entity->getTranslation($langcode)->get($field_name);
+    if (!$field_list) {
+      throw new BadRequestHttpException('Requested Field does not exist.');
+    }
+
+    // If the list is empty, append an empty item to use.
+    if ($field_list->isEmpty()) {
+      $field = $field_list->appendItem();
+    }
+    // Otherwise, use the first item.
+    else {
+      $field = $entity->getTranslation($langcode)->get($field_name)->first();
+    }
+
+    // Ensure that the field is the type we expect.
+    if (!($field instanceof ImageItem)) {
+      throw new BadRequestHttpException('Requested Field is not of type "image".');
+    }
+
+    return $field;
+  }
+
+}
diff --git a/web/core/modules/image/src/Entity/ImageStyle.php b/web/core/modules/image/src/Entity/ImageStyle.php
index e72258da6..fb096a7fd 100644
--- a/web/core/modules/image/src/Entity/ImageStyle.php
+++ b/web/core/modules/image/src/Entity/ImageStyle.php
@@ -73,7 +73,7 @@ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, Entity
    *
    * @var array
    */
-  protected $effects = array();
+  protected $effects = [];
 
   /**
    * Holds the collection of image effects that are used by this image style.
@@ -200,11 +200,11 @@ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, Entity
     // that (if both are set, the security token will neither be emitted in the
     // image derivative URL nor checked for in
     // \Drupal\image\ImageStyleInterface::deliver()).
-    $token_query = array();
+    $token_query = [];
     if (!\Drupal::config('image.settings')->get('suppress_itok_output')) {
       // The passed $path variable can be either a relative path or a full URI.
       $original_uri = file_uri_scheme($path) ? file_stream_wrapper_uri_normalize($path) : file_build_uri($path);
-      $token_query = array(IMAGE_DERIVATIVE_TOKEN => $this->getPathToken($original_uri));
+      $token_query = [IMAGE_DERIVATIVE_TOKEN => $this->getPathToken($original_uri)];
     }
 
     if ($clean_urls === NULL) {
@@ -225,7 +225,7 @@ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, Entity
     // built.
     if ($clean_urls === FALSE && file_uri_scheme($uri) == 'public' && !file_exists($uri)) {
       $directory_path = $this->getStreamWrapperManager()->getViaUri($uri)->getDirectoryPath();
-      return Url::fromUri('base:' . $directory_path . '/' . file_uri_target($uri), array('absolute' => TRUE, 'query' => $token_query))->toString();
+      return Url::fromUri('base:' . $directory_path . '/' . file_uri_target($uri), ['absolute' => TRUE, 'query' => $token_query])->toString();
     }
 
     $file_url = file_create_url($uri);
@@ -260,7 +260,7 @@ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, Entity
 
     // Let other modules update as necessary on flush.
     $module_handler = \Drupal::moduleHandler();
-    $module_handler->invokeAll('image_style_flush', array($this));
+    $module_handler->invokeAll('image_style_flush', [$this]);
 
     // Clear caches so that formatters may be added for this style.
     drupal_theme_rebuild();
@@ -286,7 +286,7 @@ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, Entity
 
     // Build the destination folder tree if it doesn't already exist.
     if (!file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS)) {
-      \Drupal::logger('image')->error('Failed to create style directory: %directory', array('%directory' => $directory));
+      \Drupal::logger('image')->error('Failed to create style directory: %directory', ['%directory' => $directory]);
       return FALSE;
     }
 
@@ -296,7 +296,7 @@ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, Entity
 
     if (!$image->save($derivative_uri)) {
       if (file_exists($derivative_uri)) {
-        \Drupal::logger('image')->error('Cached image file %destination already exists. There may be an issue with your rewrite configuration.', array('%destination' => $derivative_uri));
+        \Drupal::logger('image')->error('Cached image file %destination already exists. There may be an issue with your rewrite configuration.', ['%destination' => $derivative_uri]);
       }
       return FALSE;
     }
@@ -362,7 +362,7 @@ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, Entity
    * {@inheritdoc}
    */
   public function getPluginCollections() {
-    return array('effects' => $this->getEffects());
+    return ['effects' => $this->getEffects()];
   }
 
   /**
diff --git a/web/core/modules/image/src/Form/ImageEffectAddForm.php b/web/core/modules/image/src/Form/ImageEffectAddForm.php
index 5bf04b40f..ce304511b 100644
--- a/web/core/modules/image/src/Form/ImageEffectAddForm.php
+++ b/web/core/modules/image/src/Form/ImageEffectAddForm.php
@@ -44,7 +44,7 @@ class ImageEffectAddForm extends ImageEffectFormBase {
   public function buildForm(array $form, FormStateInterface $form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) {
     $form = parent::buildForm($form, $form_state, $image_style, $image_effect);
 
-    $form['#title'] = $this->t('Add %label effect', array('%label' => $this->imageEffect->label()));
+    $form['#title'] = $this->t('Add %label effect', ['%label' => $this->imageEffect->label()]);
     $form['actions']['submit']['#value'] = $this->t('Add effect');
 
     return $form;
diff --git a/web/core/modules/image/src/Form/ImageEffectDeleteForm.php b/web/core/modules/image/src/Form/ImageEffectDeleteForm.php
index e8c51625b..52cde33c6 100644
--- a/web/core/modules/image/src/Form/ImageEffectDeleteForm.php
+++ b/web/core/modules/image/src/Form/ImageEffectDeleteForm.php
@@ -29,7 +29,7 @@ class ImageEffectDeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete the @effect effect from the %style style?', array('%style' => $this->imageStyle->label(), '@effect' => $this->imageEffect->label()));
+    return $this->t('Are you sure you want to delete the @effect effect from the %style style?', ['%style' => $this->imageStyle->label(), '@effect' => $this->imageEffect->label()]);
   }
 
   /**
@@ -68,7 +68,7 @@ class ImageEffectDeleteForm extends ConfirmFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->imageStyle->deleteImageEffect($this->imageEffect);
-    drupal_set_message($this->t('The image effect %name has been deleted.', array('%name' => $this->imageEffect->label())));
+    drupal_set_message($this->t('The image effect %name has been deleted.', ['%name' => $this->imageEffect->label()]));
     $form_state->setRedirectUrl($this->imageStyle->urlInfo('edit-form'));
   }
 
diff --git a/web/core/modules/image/src/Form/ImageEffectEditForm.php b/web/core/modules/image/src/Form/ImageEffectEditForm.php
index 7b54c529a..390e4dc7b 100644
--- a/web/core/modules/image/src/Form/ImageEffectEditForm.php
+++ b/web/core/modules/image/src/Form/ImageEffectEditForm.php
@@ -16,7 +16,7 @@ class ImageEffectEditForm extends ImageEffectFormBase {
   public function buildForm(array $form, FormStateInterface $form_state, ImageStyleInterface $image_style = NULL, $image_effect = NULL) {
     $form = parent::buildForm($form, $form_state, $image_style, $image_effect);
 
-    $form['#title'] = $this->t('Edit %label effect', array('%label' => $this->imageEffect->label()));
+    $form['#title'] = $this->t('Edit %label effect', ['%label' => $this->imageEffect->label()]);
     $form['actions']['submit']['#value'] = $this->t('Update effect');
 
     return $form;
diff --git a/web/core/modules/image/src/Form/ImageEffectFormBase.php b/web/core/modules/image/src/Form/ImageEffectFormBase.php
index 9a69e05b3..74368d608 100644
--- a/web/core/modules/image/src/Form/ImageEffectFormBase.php
+++ b/web/core/modules/image/src/Form/ImageEffectFormBase.php
@@ -64,14 +64,14 @@ abstract class ImageEffectFormBase extends FormBase {
     }
 
     $form['#attached']['library'][] = 'image/admin';
-    $form['uuid'] = array(
+    $form['uuid'] = [
       '#type' => 'value',
       '#value' => $this->imageEffect->getUuid(),
-    );
-    $form['id'] = array(
+    ];
+    $form['id'] = [
       '#type' => 'value',
       '#value' => $this->imageEffect->getPluginId(),
-    );
+    ];
 
     $form['data'] = [];
     $subform_state = SubformState::createForSubform($form['data'], $form, $form_state);
@@ -79,22 +79,22 @@ abstract class ImageEffectFormBase extends FormBase {
     $form['data']['#tree'] = TRUE;
 
     // Check the URL for a weight, then the image effect, otherwise use default.
-    $form['weight'] = array(
+    $form['weight'] = [
       '#type' => 'hidden',
       '#value' => $request->query->has('weight') ? (int) $request->query->get('weight') : $this->imageEffect->getWeight(),
-    );
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#button_type' => 'primary',
-    );
-    $form['actions']['cancel'] = array(
+    ];
+    $form['actions']['cancel'] = [
       '#type' => 'link',
       '#title' => $this->t('Cancel'),
       '#url' => $this->imageStyle->urlInfo('edit-form'),
       '#attributes' => ['class' => ['button']],
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/image/src/Form/ImageStyleAddForm.php b/web/core/modules/image/src/Form/ImageStyleAddForm.php
index eb6be7dbf..41261cac3 100644
--- a/web/core/modules/image/src/Form/ImageStyleAddForm.php
+++ b/web/core/modules/image/src/Form/ImageStyleAddForm.php
@@ -14,7 +14,7 @@ class ImageStyleAddForm extends ImageStyleFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
-    drupal_set_message($this->t('Style %name was created.', array('%name' => $this->entity->label())));
+    drupal_set_message($this->t('Style %name was created.', ['%name' => $this->entity->label()]));
   }
 
   /**
diff --git a/web/core/modules/image/src/Form/ImageStyleDeleteForm.php b/web/core/modules/image/src/Form/ImageStyleDeleteForm.php
index 2d6801beb..c02c803f6 100644
--- a/web/core/modules/image/src/Form/ImageStyleDeleteForm.php
+++ b/web/core/modules/image/src/Form/ImageStyleDeleteForm.php
@@ -21,7 +21,7 @@ class ImageStyleDeleteForm extends EntityDeleteForm {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Optionally select a style before deleting %style', array('%style' => $this->entity->label()));
+    return $this->t('Optionally select a style before deleting %style', ['%style' => $this->entity->label()]);
   }
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/image/src/Form/ImageStyleEditForm.php b/web/core/modules/image/src/Form/ImageStyleEditForm.php
index ecfcf6f3b..574d9145a 100644
--- a/web/core/modules/image/src/Form/ImageStyleEditForm.php
+++ b/web/core/modules/image/src/Form/ImageStyleEditForm.php
@@ -49,54 +49,54 @@ class ImageStyleEditForm extends ImageStyleFormBase {
    */
   public function form(array $form, FormStateInterface $form_state) {
     $user_input = $form_state->getUserInput();
-    $form['#title'] = $this->t('Edit style %name', array('%name' => $this->entity->label()));
+    $form['#title'] = $this->t('Edit style %name', ['%name' => $this->entity->label()]);
     $form['#tree'] = TRUE;
     $form['#attached']['library'][] = 'image/admin';
 
     // Show the thumbnail preview.
-    $preview_arguments = array('#theme' => 'image_style_preview', '#style' => $this->entity);
-    $form['preview'] = array(
+    $preview_arguments = ['#theme' => 'image_style_preview', '#style' => $this->entity];
+    $form['preview'] = [
       '#type' => 'item',
       '#title' => $this->t('Preview'),
       '#markup' => drupal_render($preview_arguments),
       // Render preview above parent elements.
       '#weight' => -5,
-    );
+    ];
 
     // Build the list of existing image effects for this image style.
-    $form['effects'] = array(
+    $form['effects'] = [
       '#type' => 'table',
-      '#header' => array(
+      '#header' => [
         $this->t('Effect'),
         $this->t('Weight'),
         $this->t('Operations'),
-      ),
-      '#tabledrag' => array(
-        array(
+      ],
+      '#tabledrag' => [
+        [
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'image-effect-order-weight',
-        ),
-      ),
-      '#attributes' => array(
+        ],
+      ],
+      '#attributes' => [
         'id' => 'image-style-effects',
-      ),
+      ],
       '#empty' => t('There are currently no effects in this style. Add one by selecting an option below.'),
       // Render effects below parent elements.
       '#weight' => 5,
-    );
+    ];
     foreach ($this->entity->getEffects() as $effect) {
       $key = $effect->getUuid();
       $form['effects'][$key]['#attributes']['class'][] = 'draggable';
       $form['effects'][$key]['#weight'] = isset($user_input['effects']) ? $user_input['effects'][$key]['weight'] : NULL;
-      $form['effects'][$key]['effect'] = array(
+      $form['effects'][$key]['effect'] = [
         '#tree' => FALSE,
-        'data' => array(
-          'label' => array(
+        'data' => [
+          'label' => [
             '#plain_text' => $effect->label(),
-          ),
-        ),
-      );
+          ],
+        ],
+      ];
 
       $summary = $effect->getSummary();
 
@@ -105,42 +105,42 @@ class ImageStyleEditForm extends ImageStyleFormBase {
         $form['effects'][$key]['effect']['data']['summary'] = $summary;
       }
 
-      $form['effects'][$key]['weight'] = array(
+      $form['effects'][$key]['weight'] = [
         '#type' => 'weight',
-        '#title' => $this->t('Weight for @title', array('@title' => $effect->label())),
+        '#title' => $this->t('Weight for @title', ['@title' => $effect->label()]),
         '#title_display' => 'invisible',
         '#default_value' => $effect->getWeight(),
-        '#attributes' => array(
-          'class' => array('image-effect-order-weight'),
-        ),
-      );
+        '#attributes' => [
+          'class' => ['image-effect-order-weight'],
+        ],
+      ];
 
-      $links = array();
+      $links = [];
       $is_configurable = $effect instanceof ConfigurableImageEffectInterface;
       if ($is_configurable) {
-        $links['edit'] = array(
+        $links['edit'] = [
           'title' => $this->t('Edit'),
           'url' => Url::fromRoute('image.effect_edit_form', [
             'image_style' => $this->entity->id(),
             'image_effect' => $key,
           ]),
-        );
+        ];
       }
-      $links['delete'] = array(
+      $links['delete'] = [
         'title' => $this->t('Delete'),
         'url' => Url::fromRoute('image.effect_delete', [
           'image_style' => $this->entity->id(),
           'image_effect' => $key,
         ]),
-      );
-      $form['effects'][$key]['operations'] = array(
+      ];
+      $form['effects'][$key]['operations'] = [
         '#type' => 'operations',
         '#links' => $links,
-      );
+      ];
     }
 
     // Build the new image effect addition form and add it to the effect list.
-    $new_effect_options = array();
+    $new_effect_options = [];
     $effects = $this->imageEffectManager->getDefinitions();
     uasort($effects, function ($a, $b) {
       return strcasecmp($a['id'], $b['id']);
@@ -148,43 +148,43 @@ class ImageStyleEditForm extends ImageStyleFormBase {
     foreach ($effects as $effect => $definition) {
       $new_effect_options[$effect] = $definition['label'];
     }
-    $form['effects']['new'] = array(
+    $form['effects']['new'] = [
       '#tree' => FALSE,
       '#weight' => isset($user_input['weight']) ? $user_input['weight'] : NULL,
-      '#attributes' => array('class' => array('draggable')),
-    );
-    $form['effects']['new']['effect'] = array(
-      'data' => array(
-        'new' => array(
+      '#attributes' => ['class' => ['draggable']],
+    ];
+    $form['effects']['new']['effect'] = [
+      'data' => [
+        'new' => [
           '#type' => 'select',
           '#title' => $this->t('Effect'),
           '#title_display' => 'invisible',
           '#options' => $new_effect_options,
           '#empty_option' => $this->t('Select a new effect'),
-        ),
-        array(
-          'add' => array(
+        ],
+        [
+          'add' => [
             '#type' => 'submit',
             '#value' => $this->t('Add'),
-            '#validate' => array('::effectValidate'),
-            '#submit' => array('::submitForm', '::effectSave'),
-          ),
-        ),
-      ),
+            '#validate' => ['::effectValidate'],
+            '#submit' => ['::submitForm', '::effectSave'],
+          ],
+        ],
+      ],
       '#prefix' => '<div class="image-style-new">',
       '#suffix' => '</div>',
-    );
+    ];
 
-    $form['effects']['new']['weight'] = array(
+    $form['effects']['new']['weight'] = [
       '#type' => 'weight',
       '#title' => $this->t('Weight for new effect'),
       '#title_display' => 'invisible',
       '#default_value' => count($this->entity->getEffects()) + 1,
-      '#attributes' => array('class' => array('image-effect-order-weight')),
-    );
-    $form['effects']['new']['operations'] = array(
-      'data' => array(),
-    );
+      '#attributes' => ['class' => ['image-effect-order-weight']],
+    ];
+    $form['effects']['new']['operations'] = [
+      'data' => [],
+    ];
 
     return parent::form($form, $form_state);
   }
@@ -211,20 +211,20 @@ class ImageStyleEditForm extends ImageStyleFormBase {
     if (is_subclass_of($effect['class'], '\Drupal\image\ConfigurableImageEffectInterface')) {
       $form_state->setRedirect(
         'image.effect_add_form',
-        array(
+        [
           'image_style' => $this->entity->id(),
           'image_effect' => $form_state->getValue('new'),
-        ),
-        array('query' => array('weight' => $form_state->getValue('weight')))
+        ],
+        ['query' => ['weight' => $form_state->getValue('weight')]]
       );
     }
     // If there's no form, immediately add the image effect.
     else {
-      $effect = array(
+      $effect = [
         'id' => $effect['id'],
-        'data' => array(),
+        'data' => [],
         'weight' => $form_state->getValue('weight'),
-      );
+      ];
       $effect_id = $this->entity->addImageEffect($effect);
       $this->entity->save();
       if (!empty($effect_id)) {
diff --git a/web/core/modules/image/src/Form/ImageStyleFlushForm.php b/web/core/modules/image/src/Form/ImageStyleFlushForm.php
index 5d4b2dc29..1326f888f 100644
--- a/web/core/modules/image/src/Form/ImageStyleFlushForm.php
+++ b/web/core/modules/image/src/Form/ImageStyleFlushForm.php
@@ -14,7 +14,7 @@ class ImageStyleFlushForm extends EntityConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to apply the updated %name image effect to all images?', array('%name' => $this->entity->label()));
+    return $this->t('Are you sure you want to apply the updated %name image effect to all images?', ['%name' => $this->entity->label()]);
   }
 
   /**
@@ -43,7 +43,7 @@ class ImageStyleFlushForm extends EntityConfirmFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->entity->flush();
-    drupal_set_message($this->t('The image style %name has been flushed.', array('%name' => $this->entity->label())));
+    drupal_set_message($this->t('The image style %name has been flushed.', ['%name' => $this->entity->label()]));
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
 
diff --git a/web/core/modules/image/src/Form/ImageStyleFormBase.php b/web/core/modules/image/src/Form/ImageStyleFormBase.php
index dfdcca4b9..bf3210a1d 100644
--- a/web/core/modules/image/src/Form/ImageStyleFormBase.php
+++ b/web/core/modules/image/src/Form/ImageStyleFormBase.php
@@ -50,20 +50,20 @@ abstract class ImageStyleFormBase extends EntityForm {
    */
   public function form(array $form, FormStateInterface $form_state) {
 
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Image style name'),
       '#default_value' => $this->entity->label(),
       '#required' => TRUE,
-    );
-    $form['name'] = array(
+    ];
+    $form['name'] = [
       '#type' => 'machine_name',
-      '#machine_name' => array(
-        'exists' => array($this->imageStyleStorage, 'load'),
-      ),
+      '#machine_name' => [
+        'exists' => [$this->imageStyleStorage, 'load'],
+      ],
       '#default_value' => $this->entity->id(),
       '#required' => TRUE,
-    );
+    ];
 
     return parent::form($form, $form_state);
   }
diff --git a/web/core/modules/image/src/ImageEffectBase.php b/web/core/modules/image/src/ImageEffectBase.php
index 8e0d9c281..58be370c1 100644
--- a/web/core/modules/image/src/ImageEffectBase.php
+++ b/web/core/modules/image/src/ImageEffectBase.php
@@ -85,14 +85,14 @@ abstract class ImageEffectBase extends PluginBase implements ImageEffectInterfac
    * {@inheritdoc}
    */
   public function getSummary() {
-    return array(
+    return [
       '#markup' => '',
-      '#effect' => array(
+      '#effect' => [
         'id' => $this->pluginDefinition['id'],
         'label' => $this->label(),
         'description' => $this->pluginDefinition['description'],
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -128,23 +128,23 @@ abstract class ImageEffectBase extends PluginBase implements ImageEffectInterfac
    * {@inheritdoc}
    */
   public function getConfiguration() {
-    return array(
+    return [
       'uuid' => $this->getUuid(),
       'id' => $this->getPluginId(),
       'weight' => $this->getWeight(),
       'data' => $this->configuration,
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function setConfiguration(array $configuration) {
-    $configuration += array(
-      'data' => array(),
+    $configuration += [
+      'data' => [],
       'uuid' => '',
       'weight' => '',
-    );
+    ];
     $this->configuration = $configuration['data'] + $this->defaultConfiguration();
     $this->uuid = $configuration['uuid'];
     $this->weight = $configuration['weight'];
@@ -155,14 +155,14 @@ abstract class ImageEffectBase extends PluginBase implements ImageEffectInterfac
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/image/src/ImageStyleListBuilder.php b/web/core/modules/image/src/ImageStyleListBuilder.php
index 140ed46b8..62651cd2f 100644
--- a/web/core/modules/image/src/ImageStyleListBuilder.php
+++ b/web/core/modules/image/src/ImageStyleListBuilder.php
@@ -33,15 +33,15 @@ class ImageStyleListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function getDefaultOperations(EntityInterface $entity) {
-    $flush = array(
+    $flush = [
       'title' => t('Flush'),
       'weight' => 200,
       'url' => $entity->urlInfo('flush-form'),
-    );
+    ];
 
-    return parent::getDefaultOperations($entity) + array(
+    return parent::getDefaultOperations($entity) + [
       'flush' => $flush,
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php b/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
index 4c3a27db4..a00d9e27f 100644
--- a/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
+++ b/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
@@ -22,6 +22,9 @@ use Drupal\Core\Cache\Cache;
  *   label = @Translation("Image"),
  *   field_types = {
  *     "image"
+ *   },
+ *   quickedit = {
+ *     "editor" = "image"
  *   }
  * )
  */
@@ -60,6 +63,8 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
    *   Any third party settings settings.
    * @param \Drupal\Core\Session\AccountInterface $current_user
    *   The current user.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $image_style_storage
+   *   The image style storage.
    */
   public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, EntityStorageInterface $image_style_storage) {
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
@@ -88,10 +93,10 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'image_style' => '',
       'image_link' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -113,17 +118,17 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
         '#access' => $this->currentUser->hasPermission('administer image styles')
       ],
     ];
-    $link_types = array(
+    $link_types = [
       'content' => t('Content'),
       'file' => t('File'),
-    );
-    $element['image_link'] = array(
+    ];
+    $element['image_link'] = [
       '#title' => t('Link image to'),
       '#type' => 'select',
       '#default_value' => $this->getSetting('image_link'),
       '#empty_option' => t('Nothing'),
       '#options' => $link_types,
-    );
+    ];
 
     return $element;
   }
@@ -132,7 +137,7 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $image_styles = image_style_options(FALSE);
     // Unset possible 'No defined styles' option.
@@ -141,16 +146,16 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
     // their styles in code.
     $image_style_setting = $this->getSetting('image_style');
     if (isset($image_styles[$image_style_setting])) {
-      $summary[] = t('Image style: @style', array('@style' => $image_styles[$image_style_setting]));
+      $summary[] = t('Image style: @style', ['@style' => $image_styles[$image_style_setting]]);
     }
     else {
       $summary[] = t('Original image');
     }
 
-    $link_types = array(
+    $link_types = [
       'content' => t('Linked to content'),
       'file' => t('Linked to file'),
-    );
+    ];
     // Display this setting only if image is linked.
     $image_link_setting = $this->getSetting('image_link');
     if (isset($link_types[$image_link_setting])) {
@@ -164,7 +169,7 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
     $files = $this->getEntitiesToView($items, $langcode);
 
     // Early opt-out if the field is empty.
@@ -214,17 +219,17 @@ class ImageFormatter extends ImageFormatterBase implements ContainerFactoryPlugi
       $item_attributes = $item->_attributes;
       unset($item->_attributes);
 
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#theme' => 'image_formatter',
         '#item' => $item,
         '#item_attributes' => $item_attributes,
         '#image_style' => $image_style_setting,
         '#url' => $url,
-        '#cache' => array(
+        '#cache' => [
           'tags' => $cache_tags,
           'contexts' => $cache_contexts,
-        ),
-      );
+        ],
+      ];
     }
 
     return $elements;
diff --git a/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php b/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
index 19b89b13d..335868ab6 100644
--- a/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
+++ b/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
@@ -28,7 +28,7 @@ abstract class ImageFormatterBase extends FileFormatterBase {
         // so that the fallback image can be rendered without affecting the
         // field values in the entity being rendered.
         $items = clone $items;
-        $items->setValue(array(
+        $items->setValue([
           'target_id' => $file->id(),
           'alt' => $default_image['alt'],
           'title' => $default_image['title'],
@@ -37,7 +37,7 @@ abstract class ImageFormatterBase extends FileFormatterBase {
           'entity' => $file,
           '_loaded' => TRUE,
           '_is_default' => TRUE,
-        ));
+        ]);
         $file->_referringItem = $items[0];
       }
     }
diff --git a/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php b/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php
new file mode 100644
index 000000000..1dea1f89d
--- /dev/null
+++ b/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Drupal\image\Plugin\Field\FieldFormatter;
+
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Plugin implementation of the 'image_url' formatter.
+ *
+ * @FieldFormatter(
+ *   id = "image_url",
+ *   label = @Translation("URL to image"),
+ *   field_types = {
+ *     "image"
+ *   }
+ * )
+ */
+class ImageUrlFormatter extends ImageFormatter {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultSettings() {
+    return [
+      'image_style' => '',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    $element = parent::settingsForm($form, $form_state);
+
+    unset($element['image_link']);;
+
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsSummary() {
+    $summary = parent::settingsSummary();
+    return [$summary[0]];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items, $langcode) {
+    $elements = [];
+
+    /** @var \Drupal\Core\Field\EntityReferenceFieldItemListInterface $items */
+    if (empty($images = $this->getEntitiesToView($items, $langcode))) {
+      // Early opt-out if the field is empty.
+      return $elements;
+    }
+
+    /** @var \Drupal\image\ImageStyleInterface $image_style */
+    $image_style = $this->imageStyleStorage->load($this->getSetting('image_style'));
+    /** @var \Drupal\file\FileInterface[] $images */
+    foreach ($images as $delta => $image) {
+      $image_uri = $image->getFileUri();
+      $url = $image_style ? $image_style->buildUrl($image_uri) : file_create_url($image_uri);
+      $url = file_url_transform_relative($url);
+
+      // Add cacheability metadata from the image and image style.
+      $cacheability = CacheableMetadata::createFromObject($image);
+      if ($image_style) {
+        $cacheability->addCacheableDependency(CacheableMetadata::createFromObject($image_style));
+      }
+
+      $elements[$delta] = ['#markup' => $url];
+      $cacheability->applyTo($elements[$delta]);
+    }
+    return $elements;
+  }
+
+}
diff --git a/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index c83e143aa..7b8b27521 100644
--- a/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -55,22 +55,22 @@ class ImageItem extends FileItem {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
-      'default_image' => array(
+    return [
+      'default_image' => [
         'uuid' => NULL,
         'alt' => '',
         'title' => '',
         'width' => NULL,
         'height' => NULL,
-      ),
-    ) + parent::defaultStorageSettings();
+      ],
+    ] + parent::defaultStorageSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    $settings = array(
+    $settings = [
       'file_extensions' => 'png gif jpg jpeg',
       'alt_field' => 1,
       'alt_field_required' => 1,
@@ -78,14 +78,14 @@ class ImageItem extends FileItem {
       'title_field_required' => 0,
       'max_resolution' => '',
       'min_resolution' => '',
-      'default_image' => array(
+      'default_image' => [
         'uuid' => NULL,
         'alt' => '',
         'title' => '',
         'width' => NULL,
         'height' => NULL,
-      ),
-    ) + parent::defaultFieldSettings();
+      ],
+    ] + parent::defaultFieldSettings();
 
     unset($settings['description_field']);
     return $settings;
@@ -95,44 +95,44 @@ class ImageItem extends FileItem {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'target_id' => array(
+    return [
+      'columns' => [
+        'target_id' => [
           'description' => 'The ID of the file entity.',
           'type' => 'int',
           'unsigned' => TRUE,
-        ),
-        'alt' => array(
+        ],
+        'alt' => [
           'description' => "Alternative image text, for the image's 'alt' attribute.",
           'type' => 'varchar',
           'length' => 512,
-        ),
-        'title' => array(
+        ],
+        'title' => [
           'description' => "Image title text, for the image's 'title' attribute.",
           'type' => 'varchar',
           'length' => 1024,
-        ),
-        'width' => array(
+        ],
+        'width' => [
           'description' => 'The width of the image in pixels.',
           'type' => 'int',
           'unsigned' => TRUE,
-        ),
-        'height' => array(
+        ],
+        'height' => [
           'description' => 'The height of the image in pixels.',
           'type' => 'int',
           'unsigned' => TRUE,
-        ),
-      ),
-      'indexes' => array(
-        'target_id' => array('target_id'),
-      ),
-      'foreign keys' => array(
-        'target_id' => array(
+        ],
+      ],
+      'indexes' => [
+        'target_id' => ['target_id'],
+      ],
+      'foreign keys' => [
+        'target_id' => [
           'table' => 'file_managed',
-          'columns' => array('target_id' => 'fid'),
-        ),
-      ),
-    );
+          'columns' => ['target_id' => 'fid'],
+        ],
+      ],
+    ];
   }
 
   /**
@@ -167,7 +167,7 @@ class ImageItem extends FileItem {
    * {@inheritdoc}
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $element = array();
+    $element = [];
 
     // We need the field-level 'default_image' setting, and $this->getSettings()
     // will only provide the instance-level one, so we need to explicitly fetch
@@ -175,13 +175,13 @@ class ImageItem extends FileItem {
     $settings = $this->getFieldDefinition()->getFieldStorageDefinition()->getSettings();
 
     $scheme_options = \Drupal::service('stream_wrapper_manager')->getNames(StreamWrapperInterface::WRITE_VISIBLE);
-    $element['uri_scheme'] = array(
+    $element['uri_scheme'] = [
       '#type' => 'radios',
       '#title' => t('Upload destination'),
       '#options' => $scheme_options,
       '#default_value' => $settings['uri_scheme'],
       '#description' => t('Select where the final files should be stored. Private file storage has significantly more overhead than public files, but allows restricted access to files within this field.'),
-    );
+    ];
 
     // Add default_image element.
     static::defaultImageForm($element, $settings);
@@ -200,101 +200,101 @@ class ImageItem extends FileItem {
     $settings = $this->getSettings();
 
     // Add maximum and minimum resolution settings.
-    $max_resolution = explode('x', $settings['max_resolution']) + array('', '');
-    $element['max_resolution'] = array(
+    $max_resolution = explode('x', $settings['max_resolution']) + ['', ''];
+    $element['max_resolution'] = [
       '#type' => 'item',
       '#title' => t('Maximum image resolution'),
-      '#element_validate' => array(array(get_class($this), 'validateResolution')),
+      '#element_validate' => [[get_class($this), 'validateResolution']],
       '#weight' => 4.1,
       '#field_prefix' => '<div class="container-inline">',
       '#field_suffix' => '</div>',
       '#description' => t('The maximum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of <a href="http://wikipedia.org/wiki/Exchangeable_image_file_format">EXIF data</a> in the image.'),
-    );
-    $element['max_resolution']['x'] = array(
+    ];
+    $element['max_resolution']['x'] = [
       '#type' => 'number',
       '#title' => t('Maximum width'),
       '#title_display' => 'invisible',
       '#default_value' => $max_resolution[0],
       '#min' => 1,
       '#field_suffix' => ' × ',
-    );
-    $element['max_resolution']['y'] = array(
+    ];
+    $element['max_resolution']['y'] = [
       '#type' => 'number',
       '#title' => t('Maximum height'),
       '#title_display' => 'invisible',
       '#default_value' => $max_resolution[1],
       '#min' => 1,
       '#field_suffix' => ' ' . t('pixels'),
-    );
+    ];
 
-    $min_resolution = explode('x', $settings['min_resolution']) + array('', '');
-    $element['min_resolution'] = array(
+    $min_resolution = explode('x', $settings['min_resolution']) + ['', ''];
+    $element['min_resolution'] = [
       '#type' => 'item',
       '#title' => t('Minimum image resolution'),
-      '#element_validate' => array(array(get_class($this), 'validateResolution')),
+      '#element_validate' => [[get_class($this), 'validateResolution']],
       '#weight' => 4.2,
       '#field_prefix' => '<div class="container-inline">',
       '#field_suffix' => '</div>',
       '#description' => t('The minimum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a smaller image is uploaded, it will be rejected.'),
-    );
-    $element['min_resolution']['x'] = array(
+    ];
+    $element['min_resolution']['x'] = [
       '#type' => 'number',
       '#title' => t('Minimum width'),
       '#title_display' => 'invisible',
       '#default_value' => $min_resolution[0],
       '#min' => 1,
       '#field_suffix' => ' × ',
-    );
-    $element['min_resolution']['y'] = array(
+    ];
+    $element['min_resolution']['y'] = [
       '#type' => 'number',
       '#title' => t('Minimum height'),
       '#title_display' => 'invisible',
       '#default_value' => $min_resolution[1],
       '#min' => 1,
       '#field_suffix' => ' ' . t('pixels'),
-    );
+    ];
 
     // Remove the description option.
     unset($element['description_field']);
 
     // Add title and alt configuration options.
-    $element['alt_field'] = array(
+    $element['alt_field'] = [
       '#type' => 'checkbox',
       '#title' => t('Enable <em>Alt</em> field'),
       '#default_value' => $settings['alt_field'],
       '#description' => t('The alt attribute may be used by search engines, screen readers, and when the image cannot be loaded. Enabling this field is recommended.'),
       '#weight' => 9,
-    );
-    $element['alt_field_required'] = array(
+    ];
+    $element['alt_field_required'] = [
       '#type' => 'checkbox',
       '#title' => t('<em>Alt</em> field required'),
       '#default_value' => $settings['alt_field_required'],
       '#description' => t('Making this field required is recommended.'),
       '#weight' => 10,
-      '#states' => array(
-        'visible' => array(
-          ':input[name="settings[alt_field]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
-    $element['title_field'] = array(
+      '#states' => [
+        'visible' => [
+          ':input[name="settings[alt_field]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
+    $element['title_field'] = [
       '#type' => 'checkbox',
       '#title' => t('Enable <em>Title</em> field'),
       '#default_value' => $settings['title_field'],
       '#description' => t('The title attribute is used as a tooltip when the mouse hovers over the image. Enabling this field is not recommended as it can cause problems with screen readers.'),
       '#weight' => 11,
-    );
-    $element['title_field_required'] = array(
+    ];
+    $element['title_field_required'] = [
       '#type' => 'checkbox',
       '#title' => t('<em>Title</em> field required'),
       '#default_value' => $settings['title_field_required'],
       '#weight' => 12,
-      '#states' => array(
-        'visible' => array(
-          ':input[name="settings[title_field]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="settings[title_field]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
     // Add default_image element.
     static::defaultImageForm($element, $settings);
@@ -328,11 +328,11 @@ class ImageItem extends FileItem {
   public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
     $random = new Random();
     $settings = $field_definition->getSettings();
-    static $images = array();
+    static $images = [];
 
     $min_resolution = empty($settings['min_resolution']) ? '100x100' : $settings['min_resolution'];
     $max_resolution = empty($settings['max_resolution']) ? '600x600' : $settings['max_resolution'];
-    $extensions = array_intersect(explode(' ', $settings['file_extensions']), array('png', 'gif', 'jpg', 'jpeg'));
+    $extensions = array_intersect(explode(' ', $settings['file_extensions']), ['png', 'gif', 'jpg', 'jpeg']);
     $extension = array_rand(array_combine($extensions, $extensions));
     // Generate a max of 5 different images.
     if (!isset($images[$extension][$min_resolution][$max_resolution]) || count($images[$extension][$min_resolution][$max_resolution]) <= 5) {
@@ -352,7 +352,7 @@ class ImageItem extends FileItem {
         $images[$extension][$min_resolution][$max_resolution][$file->id()] = $file;
       }
       else {
-        return array();
+        return [];
       }
     }
     else {
@@ -362,13 +362,13 @@ class ImageItem extends FileItem {
     }
 
     list($width, $height) = getimagesize($file->getFileUri());
-    $values = array(
+    $values = [
       'target_id' => $file->id(),
       'alt' => $random->sentences(4),
       'title' => $random->sentences(4),
       'width' => $width,
       'height' => $height,
-    );
+    ];
     return $values;
   }
 
@@ -377,11 +377,11 @@ class ImageItem extends FileItem {
    */
   public static function validateResolution($element, FormStateInterface $form_state) {
     if (!empty($element['x']['#value']) || !empty($element['y']['#value'])) {
-      foreach (array('x', 'y') as $dimension) {
+      foreach (['x', 'y'] as $dimension) {
         if (!$element[$dimension]['#value']) {
           // We expect the field name placeholder value to be wrapped in t()
           // here, so it won't be escaped again as it's already marked safe.
-          $form_state->setError($element[$dimension], t('Both a height and width value must be specified in the @name field.', array('@name' => $element['#title'])));
+          $form_state->setError($element[$dimension], t('Both a height and width value must be specified in the @name field.', ['@name' => $element['#title']]));
           return;
         }
       }
@@ -401,51 +401,51 @@ class ImageItem extends FileItem {
    *   The field settings array.
    */
   protected function defaultImageForm(array &$element, array $settings) {
-    $element['default_image'] = array(
+    $element['default_image'] = [
       '#type' => 'details',
       '#title' => t('Default image'),
       '#open' => TRUE,
-    );
+    ];
     // Convert the stored UUID to a FID.
     $fids = [];
     $uuid = $settings['default_image']['uuid'];
     if ($uuid && ($file = $this->getEntityManager()->loadEntityByUuid('file', $uuid))) {
       $fids[0] = $file->id();
     }
-    $element['default_image']['uuid'] = array(
+    $element['default_image']['uuid'] = [
       '#type' => 'managed_file',
       '#title' => t('Image'),
       '#description' => t('Image to be shown if no image is uploaded.'),
       '#default_value' => $fids,
       '#upload_location' => $settings['uri_scheme'] . '://default_images/',
-      '#element_validate' => array(
+      '#element_validate' => [
         '\Drupal\file\Element\ManagedFile::validateManagedFile',
-        array(get_class($this), 'validateDefaultImageForm'),
-      ),
+        [get_class($this), 'validateDefaultImageForm'],
+      ],
       '#upload_validators' => $this->getUploadValidators(),
-    );
-    $element['default_image']['alt'] = array(
+    ];
+    $element['default_image']['alt'] = [
       '#type' => 'textfield',
       '#title' => t('Alternative text'),
       '#description' => t('This text will be used by screen readers, search engines, and when the image cannot be loaded.'),
       '#default_value' => $settings['default_image']['alt'],
       '#maxlength' => 512,
-    );
-    $element['default_image']['title'] = array(
+    ];
+    $element['default_image']['title'] = [
       '#type' => 'textfield',
       '#title' => t('Title'),
       '#description' => t('The title attribute is used as a tooltip when the mouse hovers over the image.'),
       '#default_value' => $settings['default_image']['title'],
       '#maxlength' => 1024,
-    );
-    $element['default_image']['width'] = array(
+    ];
+    $element['default_image']['width'] = [
       '#type' => 'value',
       '#value' => $settings['default_image']['width'],
-    );
-    $element['default_image']['height'] = array(
+    ];
+    $element['default_image']['height'] = [
       '#type' => 'value',
       '#value' => $settings['default_image']['height'],
-    );
+    ];
   }
 
   /**
@@ -487,7 +487,7 @@ class ImageItem extends FileItem {
   /**
    * Gets the entity manager.
    *
-   * @return \Drupal\Core\Entity\EntityManagerInterface.
+   * @return \Drupal\Core\Entity\EntityManagerInterface
    */
   protected function getEntityManager() {
     if (!isset($this->entityManager)) {
diff --git a/web/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php b/web/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
index 2fe584119..735cfceeb 100644
--- a/web/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
+++ b/web/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
@@ -26,10 +26,10 @@ class ImageWidget extends FileWidget {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'progress_indicator' => 'throbber',
       'preview_image_style' => 'thumbnail',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -38,7 +38,7 @@ class ImageWidget extends FileWidget {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element = parent::settingsForm($form, $form_state);
 
-    $element['preview_image_style'] = array(
+    $element['preview_image_style'] = [
       '#title' => t('Preview image style'),
       '#type' => 'select',
       '#options' => image_style_options(FALSE),
@@ -46,7 +46,7 @@ class ImageWidget extends FileWidget {
       '#default_value' => $this->getSetting('preview_image_style'),
       '#description' => t('The preview image will be shown while editing the content.'),
       '#weight' => 15,
-    );
+    ];
 
     return $element;
   }
@@ -64,7 +64,7 @@ class ImageWidget extends FileWidget {
     // their styles in code.
     $image_style_setting = $this->getSetting('preview_image_style');
     if (isset($image_styles[$image_style_setting])) {
-      $preview_image_style = t('Preview image style: @style', array('@style' => $image_styles[$image_style_setting]));
+      $preview_image_style = t('Preview image style: @style', ['@style' => $image_styles[$image_style_setting]]);
     }
     else {
       $preview_image_style = t('No preview');
@@ -84,12 +84,12 @@ class ImageWidget extends FileWidget {
     $elements = parent::formMultipleElements($items, $form, $form_state);
 
     $cardinality = $this->fieldDefinition->getFieldStorageDefinition()->getCardinality();
-    $file_upload_help = array(
+    $file_upload_help = [
       '#theme' => 'file_upload_help',
       '#description' => '',
       '#upload_validators' => $elements[0]['#upload_validators'],
       '#cardinality' => $cardinality,
-    );
+    ];
     if ($cardinality == 1) {
       // If there's only one field, return it as delta 0.
       if (empty($elements[0]['#default_value']['fids'])) {
@@ -114,15 +114,18 @@ class ImageWidget extends FileWidget {
 
     // Add upload resolution validation.
     if ($field_settings['max_resolution'] || $field_settings['min_resolution']) {
-      $element['#upload_validators']['file_validate_image_resolution'] = array($field_settings['max_resolution'], $field_settings['min_resolution']);
+      $element['#upload_validators']['file_validate_image_resolution'] = [$field_settings['max_resolution'], $field_settings['min_resolution']];
     }
 
     // If not using custom extension validation, ensure this is an image.
-    $supported_extensions = array('png', 'gif', 'jpg', 'jpeg');
+    $supported_extensions = ['png', 'gif', 'jpg', 'jpeg'];
     $extensions = isset($element['#upload_validators']['file_validate_extensions'][0]) ? $element['#upload_validators']['file_validate_extensions'][0] : implode(' ', $supported_extensions);
     $extensions = array_intersect(explode(' ', $extensions), $supported_extensions);
     $element['#upload_validators']['file_validate_extensions'][0] = implode(' ', $extensions);
 
+    // Add mobile device image capture acceptance.
+    $element['#accept'] = 'image/*';
+
     // Add properties needed by process() method.
     $element['#preview_image_style'] = $this->getSetting('preview_image_style');
     $element['#title_field'] = $field_settings['title_field'];
@@ -139,7 +142,7 @@ class ImageWidget extends FileWidget {
     if (!empty($default_image['uuid']) && $entity = \Drupal::entityManager()->loadEntityByUuid('file', $default_image['uuid'])) {
       $default_image['fid'] = $entity->id();
     }
-    $element['#default_image'] = !empty($default_image['fid']) ? $default_image : array();
+    $element['#default_image'] = !empty($default_image['fid']) ? $default_image : [];
 
     return $element;
   }
@@ -160,10 +163,10 @@ class ImageWidget extends FileWidget {
     // Add the image preview.
     if (!empty($element['#files']) && $element['#preview_image_style']) {
       $file = reset($element['#files']);
-      $variables = array(
+      $variables = [
         'style_name' => $element['#preview_image_style'],
         'uri' => $file->getFileUri(),
-      );
+      ];
 
       // Determine image dimensions.
       if (isset($element['#value']['width']) && isset($element['#value']['height'])) {
@@ -181,43 +184,43 @@ class ImageWidget extends FileWidget {
         }
       }
 
-      $element['preview'] = array(
+      $element['preview'] = [
         '#weight' => -10,
         '#theme' => 'image_style',
         '#width' => $variables['width'],
         '#height' => $variables['height'],
         '#style_name' => $variables['style_name'],
         '#uri' => $variables['uri'],
-      );
+      ];
 
       // Store the dimensions in the form so the file doesn't have to be
       // accessed again. This is important for remote files.
-      $element['width'] = array(
+      $element['width'] = [
         '#type' => 'hidden',
         '#value' => $variables['width'],
-      );
-      $element['height'] = array(
+      ];
+      $element['height'] = [
         '#type' => 'hidden',
         '#value' => $variables['height'],
-      );
+      ];
     }
     elseif (!empty($element['#default_image'])) {
       $default_image = $element['#default_image'];
       $file = File::load($default_image['fid']);
       if (!empty($file)) {
-        $element['preview'] = array(
+        $element['preview'] = [
           '#weight' => -10,
           '#theme' => 'image_style',
           '#width' => $default_image['width'],
           '#height' => $default_image['height'],
           '#style_name' => $element['#preview_image_style'],
           '#uri' => $file->getFileUri(),
-        );
+        ];
       }
     }
 
     // Add the additional alt and title fields.
-    $element['alt'] = array(
+    $element['alt'] = [
       '#title' => t('Alternative text'),
       '#type' => 'textfield',
       '#default_value' => isset($item['alt']) ? $item['alt'] : '',
@@ -227,9 +230,9 @@ class ImageWidget extends FileWidget {
       '#weight' => -12,
       '#access' => (bool) $item['fids'] && $element['#alt_field'],
       '#required' => $element['#alt_field_required'],
-      '#element_validate' => $element['#alt_field_required'] == 1 ? array(array(get_called_class(), 'validateRequiredFields')) : array(),
-    );
-    $element['title'] = array(
+      '#element_validate' => $element['#alt_field_required'] == 1 ? [[get_called_class(), 'validateRequiredFields']] : [],
+    ];
+    $element['title'] = [
       '#type' => 'textfield',
       '#title' => t('Title'),
       '#default_value' => isset($item['title']) ? $item['title'] : '',
@@ -238,8 +241,8 @@ class ImageWidget extends FileWidget {
       '#weight' => -11,
       '#access' => (bool) $item['fids'] && $element['#title_field'],
       '#required' => $element['#title_field_required'],
-      '#element_validate' => $element['#title_field_required'] == 1 ? array(array(get_called_class(), 'validateRequiredFields')) : array(),
-    );
+      '#element_validate' => $element['#title_field_required'] == 1 ? [[get_called_class(), 'validateRequiredFields']] : [],
+    ];
 
     return parent::process($element, $form_state, $form);
   }
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/ConvertImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/ConvertImageEffect.php
index a462b6705..28d51792c 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/ConvertImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/ConvertImageEffect.php
@@ -23,7 +23,7 @@ class ConvertImageEffect extends ConfigurableImageEffectBase {
    */
   public function applyEffect(ImageInterface $image) {
     if (!$image->convert($this->configuration['extension'])) {
-      $this->logger->error('Image convert failed using the %toolkit toolkit on %path (%mimetype)', array('%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType()));
+      $this->logger->error('Image convert failed using the %toolkit toolkit on %path (%mimetype)', ['%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType()]);
       return FALSE;
     }
     return TRUE;
@@ -40,9 +40,9 @@ class ConvertImageEffect extends ConfigurableImageEffectBase {
    * {@inheritdoc}
    */
   public function getSummary() {
-    $summary = array(
+    $summary = [
       '#markup' => Unicode::strtoupper($this->configuration['extension']),
-    );
+    ];
     $summary += parent::getSummary();
 
     return $summary;
@@ -52,9 +52,9 @@ class ConvertImageEffect extends ConfigurableImageEffectBase {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'extension' => NULL,
-    );
+    ];
   }
 
   /**
@@ -64,15 +64,15 @@ class ConvertImageEffect extends ConfigurableImageEffectBase {
     $extensions = \Drupal::service('image.toolkit.manager')->getDefaultToolkit()->getSupportedExtensions();
     $options = array_combine(
       $extensions,
-      array_map(array('\Drupal\Component\Utility\Unicode', 'strtoupper'), $extensions)
+      array_map(['\Drupal\Component\Utility\Unicode', 'strtoupper'], $extensions)
     );
-    $form['extension'] = array(
+    $form['extension'] = [
       '#type' => 'select',
       '#title' => t('Extension'),
       '#default_value' => $this->configuration['extension'],
       '#required' => TRUE,
       '#options' => $options,
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php
index 3f15a0e84..87536e643 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php
@@ -24,7 +24,7 @@ class CropImageEffect extends ResizeImageEffect {
     $x = image_filter_keyword($x, $image->getWidth(), $this->configuration['width']);
     $y = image_filter_keyword($y, $image->getHeight(), $this->configuration['height']);
     if (!$image->crop($x, $y, $this->configuration['width'], $this->configuration['height'])) {
-      $this->logger->error('Image crop failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()));
+      $this->logger->error('Image crop failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', ['%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()]);
       return FALSE;
     }
     return TRUE;
@@ -34,10 +34,10 @@ class CropImageEffect extends ResizeImageEffect {
    * {@inheritdoc}
    */
   public function getSummary() {
-    $summary = array(
+    $summary = [
       '#theme' => 'image_crop_summary',
       '#data' => $this->configuration,
-    );
+    ];
     $summary += parent::getSummary();
 
     return $summary;
@@ -47,9 +47,9 @@ class CropImageEffect extends ResizeImageEffect {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return parent::defaultConfiguration() + array(
+    return parent::defaultConfiguration() + [
       'anchor' => 'center-center',
-    );
+    ];
   }
 
   /**
@@ -57,10 +57,10 @@ class CropImageEffect extends ResizeImageEffect {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form = parent::buildConfigurationForm($form, $form_state);
-    $form['anchor'] = array(
+    $form['anchor'] = [
       '#type' => 'radios',
       '#title' => t('Anchor'),
-      '#options' => array(
+      '#options' => [
         'left-top' => t('Top left'),
         'center-top' => t('Top center'),
         'right-top' => t('Top right'),
@@ -70,11 +70,11 @@ class CropImageEffect extends ResizeImageEffect {
         'left-bottom' => t('Bottom left'),
         'center-bottom' => t('Bottom center'),
         'right-bottom' => t('Bottom right'),
-      ),
+      ],
       '#theme' => 'image_anchor',
       '#default_value' => $this->configuration['anchor'],
       '#description' => t('The part of the image that will be retained during the crop.'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/DesaturateImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/DesaturateImageEffect.php
index 26afce369..d34161ecc 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/DesaturateImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/DesaturateImageEffect.php
@@ -21,7 +21,7 @@ class DesaturateImageEffect extends ImageEffectBase {
    */
   public function applyEffect(ImageInterface $image) {
     if (!$image->desaturate()) {
-      $this->logger->error('Image desaturate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()));
+      $this->logger->error('Image desaturate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', ['%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()]);
       return FALSE;
     }
     return TRUE;
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php
index 04a59d6be..dba34298d 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php
@@ -22,7 +22,7 @@ class ResizeImageEffect extends ConfigurableImageEffectBase {
    */
   public function applyEffect(ImageInterface $image) {
     if (!$image->resize($this->configuration['width'], $this->configuration['height'])) {
-      $this->logger->error('Image resize failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()));
+      $this->logger->error('Image resize failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', ['%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()]);
       return FALSE;
     }
     return TRUE;
@@ -41,10 +41,10 @@ class ResizeImageEffect extends ConfigurableImageEffectBase {
    * {@inheritdoc}
    */
   public function getSummary() {
-    $summary = array(
+    $summary = [
       '#theme' => 'image_resize_summary',
       '#data' => $this->configuration,
-    );
+    ];
     $summary += parent::getSummary();
 
     return $summary;
@@ -54,32 +54,32 @@ class ResizeImageEffect extends ConfigurableImageEffectBase {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'width' => NULL,
       'height' => NULL,
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['width'] = array(
+    $form['width'] = [
       '#type' => 'number',
       '#title' => t('Width'),
       '#default_value' => $this->configuration['width'],
       '#field_suffix' => ' ' . t('pixels'),
       '#required' => TRUE,
       '#min' => 1,
-    );
-    $form['height'] = array(
+    ];
+    $form['height'] = [
       '#type' => 'number',
       '#title' => t('Height'),
       '#default_value' => $this->configuration['height'],
       '#field_suffix' => ' ' . t('pixels'),
       '#required' => TRUE,
       '#min' => 1,
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
index df2da77c9..7e394a3cc 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
@@ -29,7 +29,7 @@ class RotateImageEffect extends ConfigurableImageEffectBase {
     }
 
     if (!$image->rotate($this->configuration['degrees'], $this->configuration['bgcolor'])) {
-      $this->logger->error('Image rotate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()));
+      $this->logger->error('Image rotate failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', ['%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()]);
       return FALSE;
     }
     return TRUE;
@@ -56,10 +56,10 @@ class RotateImageEffect extends ConfigurableImageEffectBase {
    * {@inheritdoc}
    */
   public function getSummary() {
-    $summary = array(
+    $summary = [
       '#theme' => 'image_rotate_summary',
       '#data' => $this->configuration,
-    );
+    ];
     $summary += parent::getSummary();
 
     return $summary;
@@ -69,39 +69,39 @@ class RotateImageEffect extends ConfigurableImageEffectBase {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'degrees' => 0,
       'bgcolor' => NULL,
       'random' => FALSE,
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['degrees'] = array(
+    $form['degrees'] = [
       '#type' => 'number',
       '#default_value' => $this->configuration['degrees'],
       '#title' => t('Rotation angle'),
       '#description' => t('The number of degrees the image should be rotated. Positive numbers are clockwise, negative are counter-clockwise.'),
       '#field_suffix' => '°',
       '#required' => TRUE,
-    );
-    $form['bgcolor'] = array(
+    ];
+    $form['bgcolor'] = [
       '#type' => 'textfield',
       '#default_value' => $this->configuration['bgcolor'],
       '#title' => t('Background color'),
       '#description' => t('The background color to use for exposed areas of the image. Use web-style hex colors (#FFFFFF for white, #000000 for black). Leave blank for transparency on image types that support it.'),
       '#size' => 7,
       '#maxlength' => 7,
-    );
-    $form['random'] = array(
+    ];
+    $form['random'] = [
       '#type' => 'checkbox',
       '#default_value' => $this->configuration['random'],
       '#title' => t('Randomize'),
       '#description' => t('Randomize the rotation angle for each image. The angle specified above is used as a maximum.'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/ScaleAndCropImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/ScaleAndCropImageEffect.php
index f2ab32329..57ea0b2c8 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/ScaleAndCropImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/ScaleAndCropImageEffect.php
@@ -20,7 +20,7 @@ class ScaleAndCropImageEffect extends ResizeImageEffect {
    */
   public function applyEffect(ImageInterface $image) {
     if (!$image->scaleAndCrop($this->configuration['width'], $this->configuration['height'])) {
-      $this->logger->error('Image scale and crop failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()));
+      $this->logger->error('Image scale and crop failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', ['%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()]);
       return FALSE;
     }
     return TRUE;
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php
index a035df687..bfb6d942f 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php
@@ -22,7 +22,7 @@ class ScaleImageEffect extends ResizeImageEffect {
    */
   public function applyEffect(ImageInterface $image) {
     if (!$image->scale($this->configuration['width'], $this->configuration['height'], $this->configuration['upscale'])) {
-      $this->logger->error('Image scale failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()));
+      $this->logger->error('Image scale failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', ['%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()]);
       return FALSE;
     }
     return TRUE;
@@ -41,10 +41,10 @@ class ScaleImageEffect extends ResizeImageEffect {
    * {@inheritdoc}
    */
   public function getSummary() {
-    $summary = array(
+    $summary = [
       '#theme' => 'image_scale_summary',
       '#data' => $this->configuration,
-    );
+    ];
     $summary += parent::getSummary();
 
     return $summary;
@@ -54,9 +54,9 @@ class ScaleImageEffect extends ResizeImageEffect {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return parent::defaultConfiguration() + array(
+    return parent::defaultConfiguration() + [
       'upscale' => FALSE,
-    );
+    ];
   }
 
   /**
@@ -66,12 +66,12 @@ class ScaleImageEffect extends ResizeImageEffect {
     $form = parent::buildConfigurationForm($form, $form_state);
     $form['width']['#required'] = FALSE;
     $form['height']['#required'] = FALSE;
-    $form['upscale'] = array(
+    $form['upscale'] = [
       '#type' => 'checkbox',
       '#default_value' => $this->configuration['upscale'],
       '#title' => t('Allow Upscaling'),
       '#description' => t('Let scale make images larger than their original size.'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/image/src/Plugin/InPlaceEditor/Image.php b/web/core/modules/image/src/Plugin/InPlaceEditor/Image.php
new file mode 100644
index 000000000..9cf9cd248
--- /dev/null
+++ b/web/core/modules/image/src/Plugin/InPlaceEditor/Image.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\image\Plugin\InPlaceEditor;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\quickedit\Plugin\InPlaceEditorBase;
+
+/**
+ * Defines the image text in-place editor.
+ *
+ * @InPlaceEditor(
+ *   id = "image"
+ * )
+ */
+class Image extends InPlaceEditorBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isCompatible(FieldItemListInterface $items) {
+    $field_definition = $items->getFieldDefinition();
+
+    // This editor is only compatible with single-value image fields.
+    return $field_definition->getFieldStorageDefinition()->getCardinality() === 1
+      && $field_definition->getType() === 'image';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getAttachments() {
+    return [
+      'library' => [
+        'image/quickedit.inPlaceEditor.image',
+      ],
+    ];
+  }
+
+}
diff --git a/web/core/modules/image/src/Plugin/migrate/destination/EntityImageStyle.php b/web/core/modules/image/src/Plugin/migrate/destination/EntityImageStyle.php
index 20dabe7a9..3fc1e7f4e 100644
--- a/web/core/modules/image/src/Plugin/migrate/destination/EntityImageStyle.php
+++ b/web/core/modules/image/src/Plugin/migrate/destination/EntityImageStyle.php
@@ -46,7 +46,7 @@ class EntityImageStyle extends EntityConfigBase {
 
     $style->save();
 
-    return array($style->id());
+    return [$style->id()];
   }
 
 }
diff --git a/web/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php b/web/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php
index 4266ff179..aade9abdb 100644
--- a/web/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php
+++ b/web/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php
@@ -47,7 +47,7 @@ class ImageCachePreset extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function prepareRow(Row $row) {
-    $actions = array();
+    $actions = [];
 
     $results = $this->select('imagecache_action', 'ica')
       ->fields('ica')
diff --git a/web/core/modules/image/src/Plugin/migrate/source/d7/ImageStyles.php b/web/core/modules/image/src/Plugin/migrate/source/d7/ImageStyles.php
index d680c789e..dab62f3a9 100644
--- a/web/core/modules/image/src/Plugin/migrate/source/d7/ImageStyles.php
+++ b/web/core/modules/image/src/Plugin/migrate/source/d7/ImageStyles.php
@@ -47,7 +47,7 @@ class ImageStyles extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function prepareRow(Row $row) {
-    $effects = array();
+    $effects = [];
 
     $results = $this->select('image_effects', 'ie')
       ->fields('ie')
diff --git a/web/core/modules/image/src/Routing/ImageStyleRoutes.php b/web/core/modules/image/src/Routing/ImageStyleRoutes.php
index 66f6bfa19..71960fec0 100644
--- a/web/core/modules/image/src/Routing/ImageStyleRoutes.php
+++ b/web/core/modules/image/src/Routing/ImageStyleRoutes.php
@@ -45,7 +45,7 @@ class ImageStyleRoutes implements ContainerInjectionInterface {
    *   An array of route objects.
    */
   public function routes() {
-    $routes = array();
+    $routes = [];
     // Generate image derivatives of publicly available files. If clean URLs are
     // disabled image derivatives will always be served through the menu system.
     // If clean URLs are enabled and the image derivative already exists, PHP
@@ -54,12 +54,12 @@ class ImageStyleRoutes implements ContainerInjectionInterface {
 
     $routes['image.style_public'] = new Route(
       '/' . $directory_path . '/styles/{image_style}/{scheme}',
-      array(
+      [
         '_controller' => 'Drupal\image\Controller\ImageStyleDownloadController::deliver',
-      ),
-      array(
+      ],
+      [
         '_access' => 'TRUE',
-      )
+      ]
     );
     return $routes;
   }
diff --git a/web/core/modules/image/src/Tests/FileMoveTest.php b/web/core/modules/image/src/Tests/FileMoveTest.php
index 195799446..d9ce27f75 100644
--- a/web/core/modules/image/src/Tests/FileMoveTest.php
+++ b/web/core/modules/image/src/Tests/FileMoveTest.php
@@ -18,12 +18,12 @@ class FileMoveTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('image');
+  public static $modules = ['image'];
 
   /**
    * Tests moving a randomly generated image.
    */
-  function testNormal() {
+  public function testNormal() {
     // Pick a file for testing.
     $file = File::create((array) current($this->drupalGetTestFiles('image')));
 
diff --git a/web/core/modules/image/src/Tests/ImageAdminStylesTest.php b/web/core/modules/image/src/Tests/ImageAdminStylesTest.php
index 4b7ff43e9..5313b7fdb 100644
--- a/web/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/web/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -19,7 +19,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
   /**
    * Given an image style, generate an image.
    */
-  function createSampleImage(ImageStyleInterface $style) {
+  public function createSampleImage(ImageStyleInterface $style) {
     static $file_path;
 
     // First, we need to make sure we have an image in our testing
@@ -36,7 +36,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
   /**
    * Count the number of images currently create for a style.
    */
-  function getImageCount(ImageStyleInterface $style) {
+  public function getImageCount(ImageStyleInterface $style) {
     return count(file_scan_directory('public://styles/' . $style->id(), '/.*/'));
   }
 
@@ -44,66 +44,66 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
    * Test creating an image style with a numeric name and ensuring it can be
    * applied to an image.
    */
-  function testNumericStyleName() {
+  public function testNumericStyleName() {
     $style_name = rand();
     $style_label = $this->randomString();
-    $edit = array(
+    $edit = [
       'name' => $style_name,
       'label' => $style_label,
-    );
+    ];
     $this->drupalPostForm('admin/config/media/image-styles/add', $edit, t('Create new style'));
-    $this->assertRaw(t('Style %name was created.', array('%name' => $style_label)));
+    $this->assertRaw(t('Style %name was created.', ['%name' => $style_label]));
     $options = image_style_options();
-    $this->assertTrue(array_key_exists($style_name, $options), format_string('Array key %key exists.', array('%key' => $style_name)));
+    $this->assertTrue(array_key_exists($style_name, $options), format_string('Array key %key exists.', ['%key' => $style_name]));
   }
 
   /**
    * General test to add a style, add/remove/edit effects to it, then delete it.
    */
-  function testStyle() {
+  public function testStyle() {
     $admin_path = 'admin/config/media/image-styles';
 
     // Setup a style to be created and effects to add to it.
     $style_name = strtolower($this->randomMachineName(10));
     $style_label = $this->randomString();
     $style_path = $admin_path . '/manage/' . $style_name;
-    $effect_edits = array(
-      'image_resize' => array(
+    $effect_edits = [
+      'image_resize' => [
         'width' => 100,
         'height' => 101,
-      ),
-      'image_scale' => array(
+      ],
+      'image_scale' => [
         'width' => 110,
         'height' => 111,
         'upscale' => 1,
-      ),
-      'image_scale_and_crop' => array(
+      ],
+      'image_scale_and_crop' => [
         'width' => 120,
         'height' => 121,
-      ),
-      'image_crop' => array(
+      ],
+      'image_crop' => [
         'width' => 130,
         'height' => 131,
         'anchor' => 'left-top',
-      ),
-      'image_desaturate' => array(
+      ],
+      'image_desaturate' => [
         // No options for desaturate.
-      ),
-      'image_rotate' => array(
+      ],
+      'image_rotate' => [
         'degrees' => 5,
         'random' => 1,
         'bgcolor' => '#FFFF00',
-      ),
-    );
+      ],
+    ];
 
     // Add style form.
 
-    $edit = array(
+    $edit = [
       'name' => $style_name,
       'label' => $style_label,
-    );
+    ];
     $this->drupalPostForm($admin_path . '/add', $edit, t('Create new style'));
-    $this->assertRaw(t('Style %name was created.', array('%name' => $style_label)));
+    $this->assertRaw(t('Style %name was created.', ['%name' => $style_label]));
 
     // Ensure that the expected entity operations are there.
     $this->drupalGet($admin_path);
@@ -115,12 +115,12 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Add each sample effect to the style.
     foreach ($effect_edits as $effect => $edit) {
-      $edit_data = array();
+      $edit_data = [];
       foreach ($edit as $field => $value) {
         $edit_data['data[' . $field . ']'] = $value;
       }
       // Add the effect.
-      $this->drupalPostForm($style_path, array('new' => $effect), t('Add'));
+      $this->drupalPostForm($style_path, ['new' => $effect], t('Add'));
       if (!empty($edit)) {
         $this->drupalPostForm(NULL, $edit_data, t('Add effect'));
       }
@@ -140,13 +140,13 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Confirm that all effects on the image style have settings that match
     // what was saved.
-    $uuids = array();
+    $uuids = [];
     foreach ($style->getEffects() as $uuid => $effect) {
       // Store the uuid for later use.
       $uuids[$effect->getPluginId()] = $uuid;
       $effect_configuration = $effect->getConfiguration();
       foreach ($effect_edits[$effect->getPluginId()] as $field => $value) {
-        $this->assertEqual($value, $effect_configuration['data'][$field], SafeMarkup::format('The %field field in the %effect effect has the correct value of %value.', array('%field' => $field, '%effect' => $effect->getPluginId(), '%value' => $value)));
+        $this->assertEqual($value, $effect_configuration['data'][$field], SafeMarkup::format('The %field field in the %effect effect has the correct value of %value.', ['%field' => $field, '%effect' => $effect->getPluginId(), '%value' => $value]));
       }
     }
 
@@ -154,10 +154,10 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
     foreach (array_keys($effect_edits) as $effect_name) {
       $this->assertTrue(isset($uuids[$effect_name]), format_string(
         'A %effect_name effect was saved with ID %uuid',
-        array(
+        [
           '%effect_name' => $effect_name,
           '%uuid' => $uuids[$effect_name],
-        )));
+        ]));
     }
 
     // Image style overview form (ordering and renaming).
@@ -180,10 +180,10 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
     $style_name = strtolower($this->randomMachineName(10));
     $style_label = $this->randomMachineName();
     $weight = count($effect_edits);
-    $edit = array(
+    $edit = [
       'name' => $style_name,
       'label' => $style_label,
-    );
+    ];
     foreach ($style->getEffects() as $uuid => $effect) {
       $edit['effects[' . $uuid . '][weight]'] = $weight;
       $weight--;
@@ -191,7 +191,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Create an image to make sure it gets flushed after saving.
     $image_path = $this->createSampleImage($style);
-    $this->assertEqual($this->getImageCount($style), 1, format_string('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
+    $this->assertEqual($this->getImageCount($style), 1, format_string('Image style %style image %file successfully generated.', ['%style' => $style->label(), '%file' => $image_path]));
 
     $this->drupalPostForm($style_path, $edit, t('Update style'));
 
@@ -200,13 +200,13 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Check that the URL was updated.
     $this->drupalGet($style_path);
-    $this->assertTitle(t('Edit style @name | Drupal', array('@name' => $style_label)));
-    $this->assertResponse(200, format_string('Image style %original renamed to %new', array('%original' => $style->id(), '%new' => $style_name)));
+    $this->assertTitle(t('Edit style @name | Drupal', ['@name' => $style_label]));
+    $this->assertResponse(200, format_string('Image style %original renamed to %new', ['%original' => $style->id(), '%new' => $style_name]));
 
     // Check that the image was flushed after updating the style.
     // This is especially important when renaming the style. Make sure that
     // the old image directory has been deleted.
-    $this->assertEqual($this->getImageCount($style), 0, format_string('Image style %style was flushed after renaming the style and updating the order of effects.', array('%style' => $style->label())));
+    $this->assertEqual($this->getImageCount($style), 0, format_string('Image style %style was flushed after renaming the style and updating the order of effects.', ['%style' => $style->label()]));
 
     // Load the style by the new name with the new weights.
     $style = ImageStyle::load($style_name);
@@ -227,14 +227,14 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Create an image to make sure it gets flushed after deleting an effect.
     $image_path = $this->createSampleImage($style);
-    $this->assertEqual($this->getImageCount($style), 1, format_string('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
+    $this->assertEqual($this->getImageCount($style), 1, format_string('Image style %style image %file successfully generated.', ['%style' => $style->label(), '%file' => $image_path]));
 
     // Delete the 'image_crop' effect from the style.
-    $this->drupalPostForm($style_path . '/effects/' . $uuids['image_crop'] . '/delete', array(), t('Delete'));
+    $this->drupalPostForm($style_path . '/effects/' . $uuids['image_crop'] . '/delete', [], t('Delete'));
     // Confirm that the form submission was successful.
     $this->assertResponse(200);
     $image_crop_effect = $style->getEffect($uuids['image_crop']);
-    $this->assertRaw(t('The image effect %name has been deleted.', array('%name' => $image_crop_effect->label())));
+    $this->assertRaw(t('The image effect %name has been deleted.', ['%name' => $image_crop_effect->label()]));
     // Confirm that there is no longer a link to the effect.
     $this->assertNoLinkByHref($style_path . '/effects/' . $uuids['image_crop'] . '/delete');
     // Refresh the image style information and verify that the effect was
@@ -243,18 +243,18 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
     $style = $entity_type_manager->getStorage('image_style')->loadUnchanged($style->id());
     $this->assertFalse($style->getEffects()->has($uuids['image_crop']), format_string(
       'Effect with ID %uuid no longer found on image style %style',
-      array(
+      [
         '%uuid' => $uuids['image_crop'],
         '%style' => $style->label(),
-      )));
+      ]));
 
     // Additional test on Rotate effect, for transparent background.
-    $edit = array(
+    $edit = [
       'data[degrees]' => 5,
       'data[random]' => 0,
       'data[bgcolor]' => '',
-    );
-    $this->drupalPostForm($style_path, array('new' => 'image_rotate'), t('Add'));
+    ];
+    $this->drupalPostForm($style_path, ['new' => 'image_rotate'], t('Add'));
     $this->drupalPostForm(NULL, $edit, t('Add effect'));
     $entity_type_manager = $this->container->get('entity_type.manager');
     $style = $entity_type_manager->getStorage('image_style')->loadUnchanged($style_name);
@@ -263,13 +263,13 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
     // Style deletion form.
 
     // Delete the style.
-    $this->drupalPostForm($style_path . '/delete', array(), t('Delete'));
+    $this->drupalPostForm($style_path . '/delete', [], t('Delete'));
 
     // Confirm the style directory has been removed.
     $directory = file_default_scheme() . '://styles/' . $style_name;
-    $this->assertFalse(is_dir($directory), format_string('Image style %style directory removed on style deletion.', array('%style' => $style->label())));
+    $this->assertFalse(is_dir($directory), format_string('Image style %style directory removed on style deletion.', ['%style' => $style->label()]));
 
-    $this->assertFalse(ImageStyle::load($style_name), format_string('Image style %style successfully deleted.', array('%style' => $style->label())));
+    $this->assertFalse(ImageStyle::load($style_name), format_string('Image style %style successfully deleted.', ['%style' => $style->label()]));
 
     // Test empty text when there are no image styles.
 
@@ -330,11 +330,11 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
   /**
    * Test deleting a style and choosing a replacement style.
    */
-  function testStyleReplacement() {
+  public function testStyleReplacement() {
     // Create a new style.
     $style_name = strtolower($this->randomMachineName(10));
     $style_label = $this->randomString();
-    $style = ImageStyle::create(array('name' => $style_name, 'label' => $style_label));
+    $style = ImageStyle::create(['name' => $style_name, 'label' => $style_label]);
     $style->save();
     $style_path = 'admin/config/media/image-styles/manage/';
 
@@ -342,10 +342,10 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
     $field_name = strtolower($this->randomMachineName(10));
     $this->createImageField($field_name, 'article');
     entity_get_display('node', 'article', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'image',
-        'settings' => array('image_style' => $style_name),
-      ))
+        'settings' => ['image_style' => $style_name],
+      ])
       ->save();
 
     // Create a new node with an image attached.
@@ -359,17 +359,17 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Test that image is displayed using newly created style.
     $this->drupalGet('node/' . $nid);
-    $this->assertRaw(file_url_transform_relative($style->buildUrl($original_uri)), format_string('Image displayed using style @style.', array('@style' => $style_name)));
+    $this->assertRaw(file_url_transform_relative($style->buildUrl($original_uri)), format_string('Image displayed using style @style.', ['@style' => $style_name]));
 
     // Rename the style and make sure the image field is updated.
     $new_style_name = strtolower($this->randomMachineName(10));
     $new_style_label = $this->randomString();
-    $edit = array(
+    $edit = [
       'name' => $new_style_name,
       'label' => $new_style_label,
-    );
+    ];
     $this->drupalPostForm($style_path . $style_name, $edit, t('Update style'));
-    $this->assertText(t('Changes to the style have been saved.'), format_string('Style %name was renamed to %new_name.', array('%name' => $style_name, '%new_name' => $new_style_name)));
+    $this->assertText(t('Changes to the style have been saved.'), format_string('Style %name was renamed to %new_name.', ['%name' => $style_name, '%new_name' => $new_style_name]));
     $this->drupalGet('node/' . $nid);
 
     // Reload the image style using the new name.
@@ -377,11 +377,11 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
     $this->assertRaw(file_url_transform_relative($style->buildUrl($original_uri)), 'Image displayed using style replacement style.');
 
     // Delete the style and choose a replacement style.
-    $edit = array(
+    $edit = [
       'replacement' => 'thumbnail',
-    );
+    ];
     $this->drupalPostForm($style_path . $new_style_name . '/delete', $edit, t('Delete'));
-    $message = t('The image style %name has been deleted.', array('%name' => $new_style_label));
+    $message = t('The image style %name has been deleted.', ['%name' => $new_style_label]);
     $this->assertRaw($message);
 
     $replacement_style = ImageStyle::load('thumbnail');
@@ -392,18 +392,18 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
   /**
    * Verifies that editing an image effect does not cause it to be duplicated.
    */
-  function testEditEffect() {
+  public function testEditEffect() {
     // Add a scale effect.
     $style_name = 'test_style_effect_edit';
     $this->drupalGet('admin/config/media/image-styles/add');
-    $this->drupalPostForm(NULL, array('label' => 'Test style effect edit', 'name' => $style_name), t('Create new style'));
-    $this->drupalPostForm(NULL, array('new' => 'image_scale_and_crop'), t('Add'));
-    $this->drupalPostForm(NULL, array('data[width]' => '300', 'data[height]' => '200'), t('Add effect'));
+    $this->drupalPostForm(NULL, ['label' => 'Test style effect edit', 'name' => $style_name], t('Create new style'));
+    $this->drupalPostForm(NULL, ['new' => 'image_scale_and_crop'], t('Add'));
+    $this->drupalPostForm(NULL, ['data[width]' => '300', 'data[height]' => '200'], t('Add effect'));
     $this->assertText(t('Scale and crop 300×200'));
 
     // There should normally be only one edit link on this page initially.
     $this->clickLink(t('Edit'));
-    $this->drupalPostForm(NULL, array('data[width]' => '360', 'data[height]' => '240'), t('Update effect'));
+    $this->drupalPostForm(NULL, ['data[width]' => '360', 'data[height]' => '240'], t('Update effect'));
     $this->assertText(t('Scale and crop 360×240'));
 
     // Check that the previous effect is replaced.
@@ -411,17 +411,17 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Add another scale effect.
     $this->drupalGet('admin/config/media/image-styles/add');
-    $this->drupalPostForm(NULL, array('label' => 'Test style scale edit scale', 'name' => 'test_style_scale_edit_scale'), t('Create new style'));
-    $this->drupalPostForm(NULL, array('new' => 'image_scale'), t('Add'));
-    $this->drupalPostForm(NULL, array('data[width]' => '12', 'data[height]' => '19'), t('Add effect'));
+    $this->drupalPostForm(NULL, ['label' => 'Test style scale edit scale', 'name' => 'test_style_scale_edit_scale'], t('Create new style'));
+    $this->drupalPostForm(NULL, ['new' => 'image_scale'], t('Add'));
+    $this->drupalPostForm(NULL, ['data[width]' => '12', 'data[height]' => '19'], t('Add effect'));
 
     // Edit the scale effect that was just added.
     $this->clickLink(t('Edit'));
-    $this->drupalPostForm(NULL, array('data[width]' => '24', 'data[height]' => '19'), t('Update effect'));
-    $this->drupalPostForm(NULL, array('new' => 'image_scale'), t('Add'));
+    $this->drupalPostForm(NULL, ['data[width]' => '24', 'data[height]' => '19'], t('Update effect'));
+    $this->drupalPostForm(NULL, ['new' => 'image_scale'], t('Add'));
 
     // Add another scale effect and make sure both exist.
-    $this->drupalPostForm(NULL, array('data[width]' => '12', 'data[height]' => '19'), t('Add effect'));
+    $this->drupalPostForm(NULL, ['data[width]' => '12', 'data[height]' => '19'], t('Add effect'));
     $this->assertText(t('Scale 24×19'));
     $this->assertText(t('Scale 12×19'));
 
@@ -439,7 +439,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Create a new style.
     $style_name = strtolower($this->randomMachineName(10));
-    $style = ImageStyle::create(array('name' => $style_name, 'label' => $this->randomString()));
+    $style = ImageStyle::create(['name' => $style_name, 'label' => $this->randomString()]);
     $style->save();
 
     // Create an image to make sure it gets flushed.
@@ -456,7 +456,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
     $this->assertLinkByHref($flush_path);
 
     // Flush the image style derivatives using the user interface.
-    $this->drupalPostForm($flush_path, array(), t('Flush'));
+    $this->drupalPostForm($flush_path, [], t('Flush'));
 
     // The derivative image file should have been deleted.
     $this->assertEqual($this->getImageCount($style), 0);
@@ -465,21 +465,21 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
   /**
    * Tests image style configuration import that does a delete.
    */
-  function testConfigImport() {
+  public function testConfigImport() {
     // Create a new style.
     $style_name = strtolower($this->randomMachineName(10));
     $style_label = $this->randomString();
-    $style = ImageStyle::create(array('name' => $style_name, 'label' => $style_label));
+    $style = ImageStyle::create(['name' => $style_name, 'label' => $style_label]);
     $style->save();
 
     // Create an image field that uses the new style.
     $field_name = strtolower($this->randomMachineName(10));
     $this->createImageField($field_name, 'article');
     entity_get_display('node', 'article', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'image',
-        'settings' => array('image_style' => $style_name),
-      ))
+        'settings' => ['image_style' => $style_name],
+      ])
       ->save();
 
     // Create a new node with an image attached.
@@ -493,7 +493,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Test that image is displayed using newly created style.
     $this->drupalGet('node/' . $nid);
-    $this->assertRaw(file_url_transform_relative($style->buildUrl($original_uri)), format_string('Image displayed using style @style.', array('@style' => $style_name)));
+    $this->assertRaw(file_url_transform_relative($style->buildUrl($original_uri)), format_string('Image displayed using style @style.', ['@style' => $style_name]));
 
     // Copy config to sync, and delete the image style.
     $sync = $this->container->get('config.storage.sync');
@@ -515,7 +515,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
    * Tests access for the image style listing.
    */
   public function testImageStyleAccess() {
-    $style = ImageStyle::create(array('name' => 'style_foo', 'label' => $this->randomString()));
+    $style = ImageStyle::create(['name' => 'style_foo', 'label' => $this->randomString()]);
     $style->save();
 
     $this->drupalGet('admin/config/media/image-styles');
diff --git a/web/core/modules/image/src/Tests/ImageDimensionsTest.php b/web/core/modules/image/src/Tests/ImageDimensionsTest.php
index 6f73042cc..b3e100dd9 100644
--- a/web/core/modules/image/src/Tests/ImageDimensionsTest.php
+++ b/web/core/modules/image/src/Tests/ImageDimensionsTest.php
@@ -17,14 +17,14 @@ class ImageDimensionsTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('image', 'image_module_test');
+  public static $modules = ['image', 'image_module_test'];
 
   protected $profile = 'testing';
 
   /**
    * Test styled image dimensions cumulatively.
    */
-  function testImageDimensions() {
+  public function testImageDimensions() {
     $image_factory = $this->container->get('image.factory');
     // Create a working copy of the file.
     $files = $this->drupalGetTestFiles('image');
@@ -33,33 +33,33 @@ class ImageDimensionsTest extends WebTestBase {
 
     // Create a style.
     /** @var $style \Drupal\image\ImageStyleInterface */
-    $style = ImageStyle::create(array('name' => 'test', 'label' => 'Test'));
+    $style = ImageStyle::create(['name' => 'test', 'label' => 'Test']);
     $style->save();
     $generated_uri = 'public://styles/test/public/' . \Drupal::service('file_system')->basename($original_uri);
     $url = file_url_transform_relative($style->buildUrl($original_uri));
 
-    $variables = array(
+    $variables = [
       '#theme' => 'image_style',
       '#style_name' => 'test',
       '#uri' => $original_uri,
       '#width' => 40,
       '#height' => 20,
-    );
+    ];
     // Verify that the original image matches the hard-coded values.
     $image_file = $image_factory->get($original_uri);
     $this->assertEqual($image_file->getWidth(), $variables['#width']);
     $this->assertEqual($image_file->getHeight(), $variables['#height']);
 
     // Scale an image that is wider than it is high.
-    $effect = array(
+    $effect = [
       'id' => 'image_scale',
-      'data' => array(
+      'data' => [
         'width' => 120,
         'height' => 90,
         'upscale' => TRUE,
-      ),
+      ],
       'weight' => 0,
-    );
+    ];
 
     $style->addImageEffect($effect);
     $style->save();
@@ -73,14 +73,14 @@ class ImageDimensionsTest extends WebTestBase {
     $this->assertEqual($image_file->getHeight(), 60);
 
     // Rotate 90 degrees anticlockwise.
-    $effect = array(
+    $effect = [
       'id' => 'image_rotate',
-      'data' => array(
+      'data' => [
         'degrees' => -90,
         'random' => FALSE,
-      ),
+      ],
       'weight' => 1,
-    );
+    ];
 
     $style->addImageEffect($effect);
     $style->save();
@@ -94,15 +94,15 @@ class ImageDimensionsTest extends WebTestBase {
     $this->assertEqual($image_file->getHeight(), 120);
 
     // Scale an image that is higher than it is wide (rotated by previous effect).
-    $effect = array(
+    $effect = [
       'id' => 'image_scale',
-      'data' => array(
+      'data' => [
         'width' => 120,
         'height' => 90,
         'upscale' => TRUE,
-      ),
+      ],
       'weight' => 2,
-    );
+    ];
 
     $style->addImageEffect($effect);
     $style->save();
@@ -116,15 +116,15 @@ class ImageDimensionsTest extends WebTestBase {
     $this->assertEqual($image_file->getHeight(), 90);
 
     // Test upscale disabled.
-    $effect = array(
+    $effect = [
       'id' => 'image_scale',
-      'data' => array(
+      'data' => [
         'width' => 400,
         'height' => 200,
         'upscale' => FALSE,
-      ),
+      ],
       'weight' => 3,
-    );
+    ];
 
     $style->addImageEffect($effect);
     $style->save();
@@ -138,11 +138,11 @@ class ImageDimensionsTest extends WebTestBase {
     $this->assertEqual($image_file->getHeight(), 90);
 
     // Add a desaturate effect.
-    $effect = array(
+    $effect = [
       'id' => 'image_desaturate',
-      'data' => array(),
+      'data' => [],
       'weight' => 4,
-    );
+    ];
 
     $style->addImageEffect($effect);
     $style->save();
@@ -156,14 +156,14 @@ class ImageDimensionsTest extends WebTestBase {
     $this->assertEqual($image_file->getHeight(), 90);
 
     // Add a random rotate effect.
-    $effect = array(
+    $effect = [
       'id' => 'image_rotate',
-      'data' => array(
+      'data' => [
         'degrees' => 180,
         'random' => TRUE,
-      ),
+      ],
       'weight' => 5,
-    );
+    ];
 
     $style->addImageEffect($effect);
     $style->save();
@@ -175,15 +175,15 @@ class ImageDimensionsTest extends WebTestBase {
 
 
     // Add a crop effect.
-    $effect = array(
+    $effect = [
       'id' => 'image_crop',
-      'data' => array(
+      'data' => [
         'width' => 30,
         'height' => 30,
         'anchor' => 'center-center',
-      ),
+      ],
       'weight' => 6,
-    );
+    ];
 
     $style->addImageEffect($effect);
     $style->save();
@@ -197,14 +197,14 @@ class ImageDimensionsTest extends WebTestBase {
     $this->assertEqual($image_file->getHeight(), 30);
 
     // Rotate to a non-multiple of 90 degrees.
-    $effect = array(
+    $effect = [
       'id' => 'image_rotate',
-      'data' => array(
+      'data' => [
         'degrees' => 57,
         'random' => FALSE,
-      ),
+      ],
       'weight' => 7,
-    );
+    ];
 
     $effect_id = $style->addImageEffect($effect);
     $style->save();
@@ -221,11 +221,11 @@ class ImageDimensionsTest extends WebTestBase {
     $style->deleteImageEffect($effect_plugin);
 
     // Ensure that an effect can unset dimensions.
-    $effect = array(
+    $effect = [
       'id' => 'image_module_test_null',
-      'data' => array(),
+      'data' => [],
       'weight' => 8,
-    );
+    ];
 
     $style->addImageEffect($effect);
     $style->save();
diff --git a/web/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/web/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
index a0f027497..d04a1c4d7 100644
--- a/web/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
+++ b/web/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
@@ -19,7 +19,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_ui');
+  public static $modules = ['field_ui'];
 
   /**
    * Tests CRUD for fields and fields fields with default images.
@@ -36,8 +36,8 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $file = File::create(['uri' => $desired_filepath, 'filename' => $filename, 'name' => $filename]);
       $file->save();
     }
-    $default_images = array();
-    foreach (array('field', 'field', 'field2', 'field_new', 'field_new') as $image_target) {
+    $default_images = [];
+    foreach (['field', 'field', 'field2', 'field_new', 'field_new'] as $image_target) {
       $file = File::create((array) array_pop($files));
       $file->save();
       $default_images[$image_target] = $file;
@@ -45,23 +45,23 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
 
     // Create an image field and add an field to the article content type.
     $field_name = strtolower($this->randomMachineName());
-    $storage_settings['default_image'] = array(
+    $storage_settings['default_image'] = [
       'uuid' => $default_images['field']->uuid(),
       'alt' => '',
       'title' => '',
       'width' => 0,
       'height' => 0,
-    );
-    $field_settings['default_image'] = array(
+    ];
+    $field_settings['default_image'] = [
       'uuid' => $default_images['field']->uuid(),
       'alt' => '',
       'title' => '',
       'width' => 0,
       'height' => 0,
-    );
-    $widget_settings = array(
+    ];
+    $widget_settings = [
       'preview_image_style' => 'medium',
-    );
+    ];
     $field = $this->createImageField($field_name, 'article', $storage_settings, $field_settings, $widget_settings);
 
     // The field default image id should be 2.
@@ -84,15 +84,15 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       'bundle' => 'page',
       'label' => $field->label(),
       'required' => $field->isRequired(),
-      'settings' => array(
-        'default_image' => array(
+      'settings' => [
+        'default_image' => [
           'uuid' => $default_images['field2']->uuid(),
           'alt' => '',
           'title' => '',
           'width' => 0,
           'height' => 0,
-        ),
-      ),
+        ],
+      ],
     ]);
     $field2->save();
 
@@ -112,7 +112,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field']->id(),
       format_string(
         'Article image field default equals expected file ID of @fid.',
-        array('@fid' => $default_images['field']->id())
+        ['@fid' => $default_images['field']->id()]
       )
     );
     // Confirm the defaults are present on the article field edit form.
@@ -122,7 +122,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field']->id(),
       format_string(
         'Article image field field default equals expected file ID of @fid.',
-        array('@fid' => $default_images['field']->id())
+        ['@fid' => $default_images['field']->id()]
       )
     );
 
@@ -133,7 +133,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field']->id(),
       format_string(
         'Page image field default equals expected file ID of @fid.',
-        array('@fid' => $default_images['field']->id())
+        ['@fid' => $default_images['field']->id()]
       )
     );
     // Confirm the defaults are present on the page field edit form.
@@ -144,38 +144,38 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field2']->id(),
       format_string(
         'Page image field field default equals expected file ID of @fid.',
-        array('@fid' => $default_images['field2']->id())
+        ['@fid' => $default_images['field2']->id()]
       )
     );
 
     // Confirm that the image default is shown for a new article node.
-    $article = $this->drupalCreateNode(array('type' => 'article'));
+    $article = $this->drupalCreateNode(['type' => 'article']);
     $article_built = $this->drupalBuildEntityView($article);
     $this->assertEqual(
       $article_built[$field_name][0]['#item']->target_id,
       $default_images['field']->id(),
       format_string(
         'A new article node without an image has the expected default image file ID of @fid.',
-        array('@fid' => $default_images['field']->id())
+        ['@fid' => $default_images['field']->id()]
       )
     );
 
     // Also check that the field renders without warnings when the label is
     // hidden.
     EntityViewDisplay::load('node.article.default')
-      ->setComponent($field_name, array('label' => 'hidden', 'type' => 'image'))
+      ->setComponent($field_name, ['label' => 'hidden', 'type' => 'image'])
       ->save();
     $this->drupalGet('node/' . $article->id());
 
     // Confirm that the image default is shown for a new page node.
-    $page = $this->drupalCreateNode(array('type' => 'page'));
+    $page = $this->drupalCreateNode(['type' => 'page']);
     $page_built = $this->drupalBuildEntityView($page);
     $this->assertEqual(
       $page_built[$field_name][0]['#item']->target_id,
       $default_images['field2']->id(),
       format_string(
         'A new page node without an image has the expected default image file ID of @fid.',
-        array('@fid' => $default_images['field2']->id())
+        ['@fid' => $default_images['field2']->id()]
       )
     );
 
@@ -192,12 +192,12 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field_new']->id(),
       format_string(
         'Updated image field default equals expected file ID of @fid.',
-        array('@fid' => $default_images['field_new']->id())
+        ['@fid' => $default_images['field_new']->id()]
       )
     );
 
     // Reload the nodes and confirm the field field defaults are used.
-    $node_storage->resetCache(array($article->id(), $page->id()));
+    $node_storage->resetCache([$article->id(), $page->id()]);
     $article_built = $this->drupalBuildEntityView($article = $node_storage->load($article->id()));
     $page_built = $this->drupalBuildEntityView($page = $node_storage->load($page->id()));
     $this->assertEqual(
@@ -205,7 +205,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field']->id(),
       format_string(
         'An existing article node without an image has the expected default image file ID of @fid.',
-        array('@fid' => $default_images['field']->id())
+        ['@fid' => $default_images['field']->id()]
       )
     );
     $this->assertEqual(
@@ -213,7 +213,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field2']->id(),
       format_string(
         'An existing page node without an image has the expected default image file ID of @fid.',
-        array('@fid' => $default_images['field2']->id())
+        ['@fid' => $default_images['field2']->id()]
       )
     );
 
@@ -231,12 +231,12 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field_new']->id(),
       format_string(
         'Updated article image field field default equals expected file ID of @fid.',
-        array('@fid' => $default_images['field_new']->id())
+        ['@fid' => $default_images['field_new']->id()]
       )
     );
 
     // Reload the nodes.
-    $node_storage->resetCache(array($article->id(), $page->id()));
+    $node_storage->resetCache([$article->id(), $page->id()]);
     $article_built = $this->drupalBuildEntityView($article = $node_storage->load($article->id()));
     $page_built = $this->drupalBuildEntityView($page = $node_storage->load($page->id()));
 
@@ -246,7 +246,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field_new']->id(),
       format_string(
         'An existing article node without an image has the expected default image file ID of @fid.',
-        array('@fid' => $default_images['field_new']->id())
+        ['@fid' => $default_images['field_new']->id()]
       )
     );
     // Confirm the page remains unchanged.
@@ -255,7 +255,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field2']->id(),
       format_string(
         'An existing page node without an image has the expected default image file ID of @fid.',
-        array('@fid' => $default_images['field2']->id())
+        ['@fid' => $default_images['field2']->id()]
       )
     );
 
@@ -279,7 +279,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
     );
 
     // Reload the nodes.
-    $node_storage->resetCache(array($article->id(), $page->id()));
+    $node_storage->resetCache([$article->id(), $page->id()]);
     $article_built = $this->drupalBuildEntityView($article = $node_storage->load($article->id()));
     $page_built = $this->drupalBuildEntityView($page = $node_storage->load($page->id()));
     // Confirm the article uses the new field (not field) default.
@@ -288,7 +288,7 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field_new']->id(),
       format_string(
         'An existing article node without an image has the expected default image file ID of @fid.',
-        array('@fid' => $default_images['field_new']->id())
+        ['@fid' => $default_images['field_new']->id()]
       )
     );
     // Confirm the page remains unchanged.
@@ -297,12 +297,12 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       $default_images['field2']->id(),
       format_string(
         'An existing page node without an image has the expected default image file ID of @fid.',
-        array('@fid' => $default_images['field2']->id())
+        ['@fid' => $default_images['field2']->id()]
       )
     );
 
     $non_image = $this->drupalGetTestFiles('text');
-    $this->drupalPostForm(NULL, array('files[settings_default_image_uuid]' => drupal_realpath($non_image[0]->uri)), t("Upload"));
+    $this->drupalPostForm(NULL, ['files[settings_default_image_uuid]' => drupal_realpath($non_image[0]->uri)], t("Upload"));
     $this->assertText('The specified file text-0.txt could not be uploaded.');
     $this->assertText('Only files with the following extensions are allowed: png gif jpg jpeg.');
 
@@ -316,16 +316,16 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
    * Tests image field and field having an invalid default image.
    */
   public function testInvalidDefaultImage() {
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => Unicode::strtolower($this->randomMachineName()),
       'entity_type' => 'node',
       'type' => 'image',
-      'settings' => array(
-        'default_image' => array(
+      'settings' => [
+        'default_image' => [
           'uuid' => 100000,
-        )
-      ),
-    ));
+        ]
+      ],
+    ]);
     $field_storage->save();
     $settings = $field_storage->getSettings();
     // The non-existent default image should not be saved.
@@ -335,11 +335,11 @@ class ImageFieldDefaultImagesTest extends ImageFieldTestBase {
       'field_storage' => $field_storage,
       'bundle' => 'page',
       'label' => $this->randomMachineName(),
-      'settings' => array(
-        'default_image' => array(
+      'settings' => [
+        'default_image' => [
           'uuid' => 100000,
-        )
-      ),
+        ]
+      ],
     ]);
     $field->save();
     $settings = $field->getSettings();
diff --git a/web/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/web/core/modules/image/src/Tests/ImageFieldDisplayTest.php
index 666a791b4..9c105c143 100644
--- a/web/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/web/core/modules/image/src/Tests/ImageFieldDisplayTest.php
@@ -21,55 +21,55 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_ui');
+  public static $modules = ['field_ui'];
 
   /**
    * Test image formatters on node display for public files.
    */
-  function testImageFieldFormattersPublic() {
+  public function testImageFieldFormattersPublic() {
     $this->_testImageFieldFormatters('public');
   }
 
   /**
    * Test image formatters on node display for private files.
    */
-  function testImageFieldFormattersPrivate() {
+  public function testImageFieldFormattersPrivate() {
     // Remove access content permission from anonymous users.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array('access content' => FALSE));
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, ['access content' => FALSE]);
     $this->_testImageFieldFormatters('private');
   }
 
   /**
    * Test image formatters on node display.
    */
-  function _testImageFieldFormatters($scheme) {
+  public function _testImageFieldFormatters($scheme) {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $field_name = strtolower($this->randomMachineName());
-    $field_settings = array('alt_field_required' => 0);
-    $instance = $this->createImageField($field_name, 'article', array('uri_scheme' => $scheme), $field_settings);
+    $field_settings = ['alt_field_required' => 0];
+    $instance = $this->createImageField($field_name, 'article', ['uri_scheme' => $scheme], $field_settings);
 
     // Go to manage display page.
     $this->drupalGet("admin/structure/types/manage/article/display");
 
     // Test for existence of link to image styles configuration.
-    $this->drupalPostAjaxForm(NULL, array(), "{$field_name}_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], "{$field_name}_settings_edit");
     $this->assertLinkByHref(\Drupal::url('entity.image_style.collection'), 0, 'Link to image styles configuration is found');
 
     // Remove 'administer image styles' permission from testing admin user.
     $admin_user_roles = $this->adminUser->getRoles(TRUE);
-    user_role_change_permissions(reset($admin_user_roles), array('administer image styles' => FALSE));
+    user_role_change_permissions(reset($admin_user_roles), ['administer image styles' => FALSE]);
 
     // Go to manage display page again.
     $this->drupalGet("admin/structure/types/manage/article/display");
 
     // Test for absence of link to image styles configuration.
-    $this->drupalPostAjaxForm(NULL, array(), "{$field_name}_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], "{$field_name}_settings_edit");
     $this->assertNoLinkByHref(\Drupal::url('entity.image_style.collection'), 'Link to image styles configuration is absent when permissions are insufficient');
 
     // Restore 'administer image styles' permission to testing admin user
-    user_role_change_permissions(reset($admin_user_roles), array('administer image styles' => TRUE));
+    user_role_change_permissions(reset($admin_user_roles), ['administer image styles' => TRUE]);
 
     // Create a new node with an image attached.
     $test_image = current($this->drupalGetTestFiles('image'));
@@ -87,38 +87,38 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
 
     // Save node.
     $nid = $this->uploadNodeImage($test_image, $field_name, 'article', $alt);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
 
     // Test that the default formatter is being used.
     $file = $node->{$field_name}->entity;
     $image_uri = $file->getFileUri();
-    $image = array(
+    $image = [
       '#theme' => 'image',
       '#uri' => $image_uri,
       '#width' => 40,
       '#height' => 20,
       '#alt' => $alt,
-    );
+    ];
     $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
     $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
 
     // Test the image linked to file formatter.
-    $display_options = array(
+    $display_options = [
       'type' => 'image',
-      'settings' => array('image_link' => 'file'),
-    );
+      'settings' => ['image_link' => 'file'],
+    ];
     $display = entity_get_display('node', $node->getType(), 'default');
     $display->setComponent($field_name, $display_options)
       ->save();
 
-    $image = array(
+    $image = [
       '#theme' => 'image',
       '#uri' => $image_uri,
       '#width' => 40,
       '#height' => 20,
       '#alt' => $alt,
-    );
+    ];
     $default_output = '<a href="' . file_create_url($image_uri) . '">' . $renderer->renderRoot($image) . '</a>';
     $this->drupalGet('node/' . $nid);
     $this->assertCacheTag($file->getCacheTags()[0]);
@@ -148,25 +148,25 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
     $display_options['settings']['image_link'] = 'content';
     $display->setComponent($field_name, $display_options)
       ->save();
-    $image = array(
+    $image = [
       '#theme' => 'image',
       '#uri' => $image_uri,
       '#width' => 40,
       '#height' => 20,
-    );
+    ];
     $this->drupalGet('node/' . $nid);
     $this->assertCacheTag($file->getCacheTags()[0]);
     $cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
     $this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
     $elements = $this->xpath(
       '//a[@href=:path]/img[@src=:url and @alt=:alt and @width=:width and @height=:height]',
-      array(
+      [
         ':path' => $node->url(),
         ':url' => file_url_transform_relative(file_create_url($image['#uri'])),
         ':width' => $image['#width'],
         ':height' => $image['#height'],
         ':alt' => $alt,
-      )
+      ]
     );
     $this->assertEqual(count($elements), 1, 'Image linked to content formatter displaying correctly on full node view.');
 
@@ -179,14 +179,14 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
     // Ensure the derivative image is generated so we do not have to deal with
     // image style callback paths.
     $this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri));
-    $image_style = array(
+    $image_style = [
       '#theme' => 'image_style',
       '#uri' => $image_uri,
       '#width' => 40,
       '#height' => 20,
       '#style_name' => 'thumbnail',
       '#alt' => $alt,
-    );
+    ];
     $default_output = $renderer->renderRoot($image_style);
     $this->drupalGet('node/' . $nid);
     $image_style = ImageStyle::load('thumbnail');
@@ -199,30 +199,43 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
       $this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri));
       $this->assertResponse('403', 'Access denied to image style thumbnail as anonymous user.');
     }
+
+    // Test the image URL formatter without an image style.
+    $display_options = [
+      'type' => 'image_url',
+      'settings' => ['image_style' => ''],
+    ];
+    $expected_url = file_url_transform_relative(file_create_url($image_uri));
+    $this->assertEqual($expected_url, $node->{$field_name}->view($display_options)[0]['#markup']);
+
+    // Test the image URL formatter with an image style.
+    $display_options['settings']['image_style'] = 'thumbnail';
+    $expected_url = file_url_transform_relative(ImageStyle::load('thumbnail')->buildUrl($image_uri));
+    $this->assertEqual($expected_url, $node->{$field_name}->view($display_options)[0]['#markup']);
   }
 
   /**
    * Tests for image field settings.
    */
-  function testImageFieldSettings() {
+  public function testImageFieldSettings() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $test_image = current($this->drupalGetTestFiles('image'));
     list(, $test_image_extension) = explode('.', $test_image->filename);
     $field_name = strtolower($this->randomMachineName());
-    $field_settings = array(
+    $field_settings = [
       'alt_field' => 1,
       'file_extensions' => $test_image_extension,
       'max_filesize' => '50 KB',
       'max_resolution' => '100x100',
       'min_resolution' => '10x10',
       'title_field' => 1,
-    );
-    $widget_settings = array(
+    ];
+    $widget_settings = [
       'preview_image_style' => 'medium',
-    );
-    $field = $this->createImageField($field_name, 'article', array(), $field_settings, $widget_settings);
+    ];
+    $field = $this->createImageField($field_name, 'article', [], $field_settings, $widget_settings);
 
     // Verify that the min/max resolution set on the field are properly
     // extracted, and displayed, on the image field's configuration form.
@@ -234,7 +247,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
 
     $this->drupalGet('node/add/article');
     $this->assertText(t('50 KB limit.'), 'Image widget max file size is displayed on article form.');
-    $this->assertText(t('Allowed types: @extensions.', array('@extensions' => $test_image_extension)), 'Image widget allowed file types displayed on article form.');
+    $this->assertText(t('Allowed types: @extensions.', ['@extensions' => $test_image_extension]), 'Image widget allowed file types displayed on article form.');
     $this->assertText(t('Images must be larger than 10x10 pixels. Images larger than 100x100 pixels will be resized.'), 'Image widget allowed resolution displayed on article form.');
 
     // We have to create the article first and then edit it because the alt
@@ -249,7 +262,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
     $this->assertFieldByName($field_name . '[0][title]', '', 'Title field displayed on article form.');
     // Verify that the attached image is being previewed using the 'medium'
     // style.
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $file = $node->{$field_name}->entity;
 
@@ -257,38 +270,38 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
     $this->assertTrue($this->cssSelect('img[width=40][height=20][class=image-style-medium][src="' . $url . '"]'));
 
     // Add alt/title fields to the image and verify that they are displayed.
-    $image = array(
+    $image = [
       '#theme' => 'image',
       '#uri' => $file->getFileUri(),
       '#alt' => $alt,
       '#title' => $this->randomMachineName(),
       '#width' => 40,
       '#height' => 20,
-    );
-    $edit = array(
+    ];
+    $edit = [
       $field_name . '[0][alt]' => $image['#alt'],
       $field_name . '[0][title]' => $image['#title'],
-    );
+    ];
     $this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save and keep published'));
     $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
     $this->assertRaw($default_output, 'Image displayed using user supplied alt and title attributes.');
 
     // Verify that alt/title longer than allowed results in a validation error.
     $test_size = 2000;
-    $edit = array(
+    $edit = [
       $field_name . '[0][alt]' => $this->randomMachineName($test_size),
       $field_name . '[0][title]' => $this->randomMachineName($test_size),
-    );
+    ];
     $this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save and keep published'));
     $schema = $field->getFieldStorageDefinition()->getSchema();
-    $this->assertRaw(t('Alternative text cannot be longer than %max characters but is currently %length characters long.', array(
+    $this->assertRaw(t('Alternative text cannot be longer than %max characters but is currently %length characters long.', [
       '%max' => $schema['columns']['alt']['length'],
       '%length' => $test_size,
-    )));
-    $this->assertRaw(t('Title cannot be longer than %max characters but is currently %length characters long.', array(
+    ]));
+    $this->assertRaw(t('Title cannot be longer than %max characters but is currently %length characters long.', [
       '%max' => $schema['columns']['title']['length'],
       '%length' => $test_size,
-    )));
+    ]));
 
     // Set cardinality to unlimited and add upload a second image.
     // The image widget is extending on the file widget, but the image field
@@ -297,20 +310,20 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
     // 1, so we need to make sure the file widget prevents these notices by
     // providing all settings, even if they are not used.
     // @see FileWidget::formMultipleElements().
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $field_name . '/storage', array('cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED), t('Save field settings'));
-    $edit = array(
+    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $field_name . '/storage', ['cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED], t('Save field settings'));
+    $edit = [
       'files[' . $field_name . '_1][]' => drupal_realpath($test_image->uri),
-    );
+    ];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     // Add the required alt text.
     $this->drupalPostForm(NULL, [$field_name . '[1][alt]' => $alt], t('Save and keep published'));
-    $this->assertText(format_string('Article @title has been updated.', array('@title' => $node->getTitle())));
+    $this->assertText(format_string('Article @title has been updated.', ['@title' => $node->getTitle()]));
 
     // Assert ImageWidget::process() calls FieldWidget::process().
     $this->drupalGet('node/' . $node->id() . '/edit');
-    $edit = array(
+    $edit = [
       'files[' . $field_name . '_2][]' => drupal_realpath($test_image->uri),
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, $field_name . '_2_upload_button');
     $this->assertNoRaw('<input multiple type="file" id="edit-' . strtr($field_name, '_', '-') . '-2-upload" name="files[' . $field_name . '_2][]" size="22" class="js-form-file form-file">');
     $this->assertRaw('<input multiple type="file" id="edit-' . strtr($field_name, '_', '-') . '-3-upload" name="files[' . $field_name . '_3][]" size="22" class="js-form-file form-file">');
@@ -319,7 +332,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
   /**
    * Test use of a default image with an image field.
    */
-  function testImageFieldDefaultImage() {
+  public function testImageFieldDefaultImage() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
 
@@ -330,7 +343,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
 
     // Create a new node, with no images and verify that no images are
     // displayed.
-    $node = $this->drupalCreateNode(array('type' => 'article'));
+    $node = $this->drupalCreateNode(['type' => 'article']);
     $this->drupalGet('node/' . $node->id());
     // Verify that no image is displayed on the page by checking for the class
     // that would be used on the image field.
@@ -342,12 +355,12 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
     $images = $this->drupalGetTestFiles('image');
     $alt = $this->randomString(512);
     $title = $this->randomString(1024);
-    $edit = array(
+    $edit = [
       // Get the path of the 'image-test.png' file.
       'files[settings_default_image_uuid]' => drupal_realpath($images[0]->uri),
       'settings[default_image][alt]' => $alt,
       'settings[default_image][title]' => $title,
-    );
+    ];
     $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings'));
     // Clear field definition cache so the new default image is detected.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
@@ -355,14 +368,14 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
     $default_image = $field_storage->getSetting('default_image');
     $file = \Drupal::entityManager()->loadEntityByUuid('file', $default_image['uuid']);
     $this->assertTrue($file->isPermanent(), 'The default image status is permanent.');
-    $image = array(
+    $image = [
       '#theme' => 'image',
       '#uri' => $file->getFileUri(),
       '#alt' => $alt,
       '#title' => $title,
       '#width' => 40,
       '#height' => 20,
-    );
+    ];
     $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
     $this->drupalGet('node/' . $node->id());
     $this->assertCacheTag($file->getCacheTags()[0]);
@@ -378,16 +391,16 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
 
     // Upload the 'image-test.gif' file.
     $nid = $this->uploadNodeImage($images[2], $field_name, 'article', $alt);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
     $file = $node->{$field_name}->entity;
-    $image = array(
+    $image = [
       '#theme' => 'image',
       '#uri' => $file->getFileUri(),
       '#width' => 40,
       '#height' => 20,
       '#alt' => $alt,
-    );
+    ];
     $image_output = str_replace("\n", NULL, $renderer->renderRoot($image));
     $this->drupalGet('node/' . $nid);
     $this->assertCacheTag($file->getCacheTags()[0]);
@@ -397,9 +410,9 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
     $this->assertRaw($image_output, 'User supplied image is displayed.');
 
     // Remove default image from the field and make sure it is no longer used.
-    $edit = array(
+    $edit = [
       'settings[default_image][uuid][fids]' => 0,
-    );
+    ];
     $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings'));
     // Clear field definition cache so the new default image is detected.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
@@ -409,14 +422,14 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
     // Create an image field that uses the private:// scheme and test that the
     // default image works as expected.
     $private_field_name = strtolower($this->randomMachineName());
-    $this->createImageField($private_field_name, 'article', array('uri_scheme' => 'private'));
+    $this->createImageField($private_field_name, 'article', ['uri_scheme' => 'private']);
     // Add a default image to the new field.
-    $edit = array(
+    $edit = [
       // Get the path of the 'image-test.gif' file.
       'files[settings_default_image_uuid]' => drupal_realpath($images[2]->uri),
       'settings[default_image][alt]' => $alt,
       'settings[default_image][title]' => $title,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $private_field_name . '/storage', $edit, t('Save field settings'));
     // Clear field definition cache so the new default image is detected.
     \Drupal::entityManager()->clearCachedFieldDefinitions();
@@ -428,15 +441,15 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
     $this->assertTrue($file->isPermanent(), 'The default image status is permanent.');
     // Create a new node with no image attached and ensure that default private
     // image is displayed.
-    $node = $this->drupalCreateNode(array('type' => 'article'));
-    $image = array(
+    $node = $this->drupalCreateNode(['type' => 'article']);
+    $image = [
       '#theme' => 'image',
       '#uri' => $file->getFileUri(),
       '#alt' => $alt,
       '#title' => $title,
       '#width' => 40,
       '#height' => 20,
-    );
+    ];
     $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
     $this->drupalGet('node/' . $node->id());
     $this->assertCacheTag($file->getCacheTags()[0]);
diff --git a/web/core/modules/image/src/Tests/ImageFieldTestBase.php b/web/core/modules/image/src/Tests/ImageFieldTestBase.php
index bb976f9b7..eec7f7bba 100644
--- a/web/core/modules/image/src/Tests/ImageFieldTestBase.php
+++ b/web/core/modules/image/src/Tests/ImageFieldTestBase.php
@@ -20,6 +20,9 @@ use Drupal\simpletest\WebTestBase;
 
 /**
  * This class provides methods specifically for testing Image's field handling.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\image\Functional\ImageFieldTestBase instead.
  */
 abstract class ImageFieldTestBase extends WebTestBase {
 
@@ -30,7 +33,7 @@ abstract class ImageFieldTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'image', 'field_ui', 'image_module_test');
+  public static $modules = ['node', 'image', 'field_ui', 'image_module_test'];
 
   /**
    * An user with permissions to administer content types and image styles.
@@ -44,11 +47,11 @@ abstract class ImageFieldTestBase extends WebTestBase {
 
     // Create Basic page and Article node types.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-      $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
     }
 
-    $this->adminUser = $this->drupalCreateUser(array('access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer node fields', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content', 'administer image styles', 'administer node display'));
+    $this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer node fields', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content', 'administer image styles', 'administer node display']);
     $this->drupalLogin($this->adminUser);
   }
 
@@ -62,10 +65,10 @@ abstract class ImageFieldTestBase extends WebTestBase {
    * @param string $type
    *   The type of node to create.
    */
-  function previewNodeImage($image, $field_name, $type) {
-    $edit = array(
+  public function previewNodeImage($image, $field_name, $type) {
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
-    );
+    ];
     $edit['files[' . $field_name . '_0]'] = drupal_realpath($image->uri);
     $this->drupalPostForm('node/add/' . $type, $edit, t('Preview'));
   }
@@ -82,10 +85,10 @@ abstract class ImageFieldTestBase extends WebTestBase {
    * @param $alt
    *   The alt text for the image. Use if the field settings require alt text.
    */
-  function uploadNodeImage($image, $field_name, $type, $alt = '') {
-    $edit = array(
+  public function uploadNodeImage($image, $field_name, $type, $alt = '') {
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
-    );
+    ];
     $edit['files[' . $field_name . '_0]'] = drupal_realpath($image->uri);
     $this->drupalPostForm('node/add/' . $type, $edit, t('Save and publish'));
     if ($alt) {
@@ -94,7 +97,7 @@ abstract class ImageFieldTestBase extends WebTestBase {
     }
 
     // Retrieve ID of the newly created node from the current URL.
-    $matches = array();
+    $matches = [];
     preg_match('/node\/([0-9]+)/', $this->getUrl(), $matches);
     return isset($matches[1]) ? $matches[1] : FALSE;
   }
diff --git a/web/core/modules/image/src/Tests/ImageFieldValidateTest.php b/web/core/modules/image/src/Tests/ImageFieldValidateTest.php
index 5f0bf213f..7e5ee9bae 100644
--- a/web/core/modules/image/src/Tests/ImageFieldValidateTest.php
+++ b/web/core/modules/image/src/Tests/ImageFieldValidateTest.php
@@ -11,7 +11,7 @@ class ImageFieldValidateTest extends ImageFieldTestBase {
   /**
    * Test min/max resolution settings.
    */
-  function testResolution() {
+  public function testResolution() {
     $field_names = [
       0 => strtolower($this->randomMachineName()),
       1 => strtolower($this->randomMachineName()),
@@ -85,16 +85,16 @@ class ImageFieldValidateTest extends ImageFieldTestBase {
   /**
    * Test that required alt/title fields gets validated right.
    */
-  function testRequiredAttributes() {
+  public function testRequiredAttributes() {
     $field_name = strtolower($this->randomMachineName());
-    $field_settings = array(
+    $field_settings = [
       'alt_field' => 1,
       'alt_field_required' => 1,
       'title_field' => 1,
       'title_field_required' => 1,
       'required' => 1,
-    );
-    $instance = $this->createImageField($field_name, 'article', array(), $field_settings);
+    ];
+    $instance = $this->createImageField($field_name, 'article', [], $field_settings);
     $images = $this->drupalGetTestFiles('image');
     // Let's just use the first image.
     $image = $images[0];
@@ -116,9 +116,9 @@ class ImageFieldValidateTest extends ImageFieldTestBase {
     $instance->setSetting('title_field_required', 0);
     $instance->save();
 
-    $edit = array(
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
 
     $this->assertNoText(t('Alternative text field is required.'));
@@ -129,9 +129,9 @@ class ImageFieldValidateTest extends ImageFieldTestBase {
     $instance->setSetting('title_field_required', 1);
     $instance->save();
 
-    $edit = array(
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
 
     $this->assertNoText(t('Alternative text field is required.'));
diff --git a/web/core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php b/web/core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
index a8985ce4c..e1f70d78a 100644
--- a/web/core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
+++ b/web/core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
@@ -14,7 +14,7 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('language', 'content_translation', 'field_ui');
+  public static $modules = ['language', 'content_translation', 'field_ui'];
 
   /**
    * The name of the image field used in the test.
@@ -39,7 +39,7 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
     $this->createImageField($this->fieldName, 'basicpage', [], ['title_field' => 1]);
 
     // Create and log in user.
-    $permissions = array(
+    $permissions = [
       'access administration pages',
       'administer content translation',
       'administer content types',
@@ -50,16 +50,16 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
       'edit any basicpage content',
       'translate any entity',
       'delete any basicpage content',
-    );
+    ];
     $admin_user = $this->drupalCreateUser($permissions);
     $this->drupalLogin($admin_user);
 
     // Add a second and third language.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'fr';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'nl';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
   }
@@ -69,7 +69,7 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
    */
   public function testSyncedImages() {
     // Enable translation for "Basic page" nodes.
-    $edit = array(
+    $edit = [
       'entity_types[node]' => 1,
       'settings[node][basicpage][translatable]' => 1,
       "settings[node][basicpage][fields][$this->fieldName]" => 1,
@@ -78,7 +78,7 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
       // checkboxes on the form.
       "settings[node][basicpage][columns][$this->fieldName][alt]" => FALSE,
       "settings[node][basicpage][columns][$this->fieldName][title]" => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/content-language', $edit, 'Save configuration');
 
     // Verify that the image field on the "Basic basic" node type is
@@ -87,10 +87,10 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
     $this->assertTrue($definitions[$this->fieldName]->isTranslatable(), 'Node image field is translatable.');
 
     // Create a default language node.
-    $default_language_node = $this->drupalCreateNode(array('type' => 'basicpage', 'title' => 'Lost in translation'));
+    $default_language_node = $this->drupalCreateNode(['type' => 'basicpage', 'title' => 'Lost in translation']);
 
     // Edit the node to upload a file.
-    $edit = array();
+    $edit = [];
     $name = 'files[' . $this->fieldName . '_0]';
     $edit[$name] = drupal_realpath($this->drupalGetTestFiles('image')[0]->uri);
     $this->drupalPostForm('node/' . $default_language_node->id() . '/edit', $edit, t('Save'));
@@ -99,10 +99,10 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
     $first_fid = $this->getLastFileId();
 
     // Translate the node into French: remove the existing file.
-    $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/fr', array(), t('Remove'));
+    $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/fr', [], t('Remove'));
 
     // Upload a different file.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = 'Scarlett Johansson';
     $name = 'files[' . $this->fieldName . '_0]';
     $edit[$name] = drupal_realpath($this->drupalGetTestFiles('image')[1]->uri);
@@ -131,10 +131,10 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
     $this->assertTrue($file->isPermanent());
 
     // Translate the node into dutch: remove the existing file.
-    $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/nl', array(), t('Remove'));
+    $this->drupalPostForm('node/' . $default_language_node->id() . '/translations/add/en/nl', [], t('Remove'));
 
     // Upload a different file.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = 'Akiko Takeshita';
     $name = 'files[' . $this->fieldName . '_0]';
     $edit[$name] = drupal_realpath($this->drupalGetTestFiles('image')[2]->uri);
@@ -166,10 +166,10 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
     $this->assertTrue($file->isPermanent());
 
     // Edit the second translation: remove the existing file.
-    $this->drupalPostForm('fr/node/' . $default_language_node->id() . '/edit', array(), t('Remove'));
+    $this->drupalPostForm('fr/node/' . $default_language_node->id() . '/edit', [], t('Remove'));
 
     // Upload a different file.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = 'Giovanni Ribisi';
     $name = 'files[' . $this->fieldName . '_0]';
     $edit[$name] = drupal_realpath($this->drupalGetTestFiles('image')[3]->uri);
@@ -194,7 +194,7 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
     $this->assertTrue($file->isPermanent());
 
     // Delete the third translation.
-    $this->drupalPostForm('nl/node/' . $default_language_node->id() . '/delete', array(), t('Delete Dutch translation'));
+    $this->drupalPostForm('nl/node/' . $default_language_node->id() . '/delete', [], t('Delete Dutch translation'));
 
     \Drupal::entityTypeManager()->getStorage('file')->resetCache();
 
@@ -210,7 +210,7 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
     $this->assertTrue($file->isTemporary());
 
     // Delete the all translations.
-    $this->drupalPostForm('node/' . $default_language_node->id() . '/delete', array(), t('Delete all translations'));
+    $this->drupalPostForm('node/' . $default_language_node->id() . '/delete', [], t('Delete all translations'));
 
     \Drupal::entityTypeManager()->getStorage('file')->resetCache();
 
diff --git a/web/core/modules/image/src/Tests/ImageStyleFlushTest.php b/web/core/modules/image/src/Tests/ImageStyleFlushTest.php
index 63c0d8093..4e8cd2c77 100644
--- a/web/core/modules/image/src/Tests/ImageStyleFlushTest.php
+++ b/web/core/modules/image/src/Tests/ImageStyleFlushTest.php
@@ -14,7 +14,7 @@ class ImageStyleFlushTest extends ImageFieldTestBase {
   /**
    * Given an image style and a wrapper, generate an image.
    */
-  function createSampleImage($style, $wrapper) {
+  public function createSampleImage($style, $wrapper) {
     static $file;
 
     if (!isset($file)) {
@@ -34,42 +34,42 @@ class ImageStyleFlushTest extends ImageFieldTestBase {
   /**
    * Count the number of images currently created for a style in a wrapper.
    */
-  function getImageCount($style, $wrapper) {
+  public function getImageCount($style, $wrapper) {
     return count(file_scan_directory($wrapper . '://styles/' . $style->id(), '/.*/'));
   }
 
   /**
    * General test to flush a style.
    */
-  function testFlush() {
+  public function testFlush() {
 
     // Setup a style to be created and effects to add to it.
     $style_name = strtolower($this->randomMachineName(10));
     $style_label = $this->randomString();
     $style_path = 'admin/config/media/image-styles/manage/' . $style_name;
-    $effect_edits = array(
-      'image_resize' => array(
+    $effect_edits = [
+      'image_resize' => [
         'data[width]' => 100,
         'data[height]' => 101,
-      ),
-      'image_scale' => array(
+      ],
+      'image_scale' => [
         'data[width]' => 110,
         'data[height]' => 111,
         'data[upscale]' => 1,
-      ),
-    );
+      ],
+    ];
 
     // Add style form.
-    $edit = array(
+    $edit = [
       'name' => $style_name,
       'label' => $style_label,
-    );
+    ];
     $this->drupalPostForm('admin/config/media/image-styles/add', $edit, t('Create new style'));
 
     // Add each sample effect to the style.
     foreach ($effect_edits as $effect => $edit) {
       // Add the effect.
-      $this->drupalPostForm($style_path, array('new' => $effect), t('Add'));
+      $this->drupalPostForm($style_path, ['new' => $effect], t('Add'));
       if (!empty($edit)) {
         $this->drupalPostForm(NULL, $edit, t('Add effect'));
       }
@@ -82,29 +82,29 @@ class ImageStyleFlushTest extends ImageFieldTestBase {
     $image_path = $this->createSampleImage($style, 'public');
     // Expecting to find 2 images, one is the sample.png image shown in
     // image style preview.
-    $this->assertEqual($this->getImageCount($style, 'public'), 2, format_string('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
+    $this->assertEqual($this->getImageCount($style, 'public'), 2, format_string('Image style %style image %file successfully generated.', ['%style' => $style->label(), '%file' => $image_path]));
 
     // Create an image for the 'private' wrapper.
     $image_path = $this->createSampleImage($style, 'private');
-    $this->assertEqual($this->getImageCount($style, 'private'), 1, format_string('Image style %style image %file successfully generated.', array('%style' => $style->label(), '%file' => $image_path)));
+    $this->assertEqual($this->getImageCount($style, 'private'), 1, format_string('Image style %style image %file successfully generated.', ['%style' => $style->label(), '%file' => $image_path]));
 
     // Remove the 'image_scale' effect and updates the style, which in turn
     // forces an image style flush.
     $style_path = 'admin/config/media/image-styles/manage/' . $style->id();
-    $uuids = array();
+    $uuids = [];
     foreach ($style->getEffects() as $uuid => $effect) {
       $uuids[$effect->getPluginId()] = $uuid;
     }
-    $this->drupalPostForm($style_path . '/effects/' . $uuids['image_scale'] . '/delete', array(), t('Delete'));
+    $this->drupalPostForm($style_path . '/effects/' . $uuids['image_scale'] . '/delete', [], t('Delete'));
     $this->assertResponse(200);
-    $this->drupalPostForm($style_path, array(), t('Update style'));
+    $this->drupalPostForm($style_path, [], t('Update style'));
     $this->assertResponse(200);
 
     // Post flush, expected 1 image in the 'public' wrapper (sample.png).
-    $this->assertEqual($this->getImageCount($style, 'public'), 1, format_string('Image style %style flushed correctly for %wrapper wrapper.', array('%style' => $style->label(), '%wrapper' => 'public')));
+    $this->assertEqual($this->getImageCount($style, 'public'), 1, format_string('Image style %style flushed correctly for %wrapper wrapper.', ['%style' => $style->label(), '%wrapper' => 'public']));
 
     // Post flush, expected no image in the 'private' wrapper.
-    $this->assertEqual($this->getImageCount($style, 'private'), 0, format_string('Image style %style flushed correctly for %wrapper wrapper.', array('%style' => $style->label(), '%wrapper' => 'private')));
+    $this->assertEqual($this->getImageCount($style, 'private'), 0, format_string('Image style %style flushed correctly for %wrapper wrapper.', ['%style' => $style->label(), '%wrapper' => 'private']));
   }
 
 }
diff --git a/web/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php b/web/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
index d03bc3bc9..44254c614 100644
--- a/web/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
+++ b/web/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
@@ -17,7 +17,7 @@ class ImageStylesPathAndUrlTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('image', 'image_module_test');
+  public static $modules = ['image', 'image_module_test'];
 
   /**
    * @var \Drupal\image\ImageStyleInterface
@@ -27,14 +27,14 @@ class ImageStylesPathAndUrlTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->style = ImageStyle::create(array('name' => 'style_foo', 'label' => $this->randomString()));
+    $this->style = ImageStyle::create(['name' => 'style_foo', 'label' => $this->randomString()]);
     $this->style->save();
   }
 
   /**
    * Tests \Drupal\image\ImageStyleInterface::buildUri().
    */
-  function testImageStylePath() {
+  public function testImageStylePath() {
     $scheme = 'public';
     $actual = $this->style->buildUri("$scheme://foo/bar.gif");
     $expected = "$scheme://styles/" . $this->style->id() . "/$scheme/foo/bar.gif";
@@ -48,42 +48,42 @@ class ImageStylesPathAndUrlTest extends WebTestBase {
   /**
    * Tests an image style URL using the "public://" scheme.
    */
-  function testImageStyleUrlAndPathPublic() {
+  public function testImageStyleUrlAndPathPublic() {
     $this->doImageStyleUrlAndPathTests('public');
   }
 
   /**
    * Tests an image style URL using the "private://" scheme.
    */
-  function testImageStyleUrlAndPathPrivate() {
+  public function testImageStyleUrlAndPathPrivate() {
     $this->doImageStyleUrlAndPathTests('private');
   }
 
   /**
    * Tests an image style URL with the "public://" scheme and unclean URLs.
    */
-  function testImageStyleUrlAndPathPublicUnclean() {
+  public function testImageStyleUrlAndPathPublicUnclean() {
     $this->doImageStyleUrlAndPathTests('public', FALSE);
   }
 
   /**
    * Tests an image style URL with the "private://" schema and unclean URLs.
    */
-  function testImageStyleUrlAndPathPrivateUnclean() {
+  public function testImageStyleUrlAndPathPrivateUnclean() {
     $this->doImageStyleUrlAndPathTests('private', FALSE);
   }
 
   /**
    * Tests an image style URL with a file URL that has an extra slash in it.
    */
-  function testImageStyleUrlExtraSlash() {
+  public function testImageStyleUrlExtraSlash() {
     $this->doImageStyleUrlAndPathTests('public', TRUE, TRUE);
   }
 
   /**
    * Tests that an invalid source image returns a 404.
    */
-  function testImageStyleUrlForMissingSourceImage() {
+  public function testImageStyleUrlForMissingSourceImage() {
     $non_existent_uri = 'public://foo.png';
     $generated_url = $this->style->buildUrl($non_existent_uri);
     $this->drupalGet($generated_url);
@@ -93,7 +93,7 @@ class ImageStylesPathAndUrlTest extends WebTestBase {
   /**
    * Tests building an image style URL.
    */
-  function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_slash = FALSE) {
+  public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_slash = FALSE) {
     $this->prepareRequestForGenerator($clean_url);
 
     // Make the default scheme neither "public" nor "private" to verify the
diff --git a/web/core/modules/image/src/Tests/ImageThemeFunctionTest.php b/web/core/modules/image/src/Tests/ImageThemeFunctionTest.php
index 52cf6c6e5..54c5c64a1 100644
--- a/web/core/modules/image/src/Tests/ImageThemeFunctionTest.php
+++ b/web/core/modules/image/src/Tests/ImageThemeFunctionTest.php
@@ -23,7 +23,7 @@ class ImageThemeFunctionTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('image', 'entity_test');
+  public static $modules = ['image', 'entity_test'];
 
   /**
    * Created file entity.
@@ -40,12 +40,12 @@ class ImageThemeFunctionTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'image_test',
       'type' => 'image',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'image_test',
@@ -62,7 +62,7 @@ class ImageThemeFunctionTest extends WebTestBase {
   /**
    * Tests usage of the image field formatters.
    */
-  function testImageFormatterTheme() {
+  public function testImageFormatterTheme() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
 
@@ -72,7 +72,7 @@ class ImageThemeFunctionTest extends WebTestBase {
     $original_uri = file_unmanaged_copy($file->uri, 'public://', FILE_EXISTS_RENAME);
 
     // Create a style.
-    $style = ImageStyle::create(array('name' => 'test', 'label' => 'Test'));
+    $style = ImageStyle::create(['name' => 'test', 'label' => 'Test']);
     $style->save();
     $url = file_url_transform_relative($style->buildUrl($original_uri));
 
@@ -86,17 +86,17 @@ class ImageThemeFunctionTest extends WebTestBase {
 
     // Create the base element that we'll use in the tests below.
     $path = $this->randomMachineName();
-    $base_element = array(
+    $base_element = [
       '#theme' => 'image_formatter',
       '#image_style' => 'test',
       '#item' => $entity->image_test,
       '#url' => Url::fromUri('base:' . $path),
-    );
+    ];
 
     // Test using theme_image_formatter() with a NULL value for the alt option.
     $element = $base_element;
     $this->setRawContent($renderer->renderRoot($element));
-    $elements = $this->xpath('//a[@href=:path]/img[@class="image-style-test" and @src=:url and @width=:width and @height=:height]', array(':path' => base_path() . $path, ':url' => $url, ':width' => $image->getWidth(), ':height' => $image->getHeight()));
+    $elements = $this->xpath('//a[@href=:path]/img[@class="image-style-test" and @src=:url and @width=:width and @height=:height]', [':path' => base_path() . $path, ':url' => $url, ':width' => $image->getWidth(), ':height' => $image->getHeight()]);
     $this->assertEqual(count($elements), 1, 'theme_image_formatter() correctly renders with a NULL value for the alt option.');
 
     // Test using theme_image_formatter() without an image title, alt text, or
@@ -104,7 +104,7 @@ class ImageThemeFunctionTest extends WebTestBase {
     $element = $base_element;
     $element['#item']->alt = '';
     $this->setRawContent($renderer->renderRoot($element));
-    $elements = $this->xpath('//a[@href=:path]/img[@class="image-style-test" and @src=:url and @width=:width and @height=:height and @alt=""]', array(':path' => base_path() . $path, ':url' => $url, ':width' => $image->getWidth(), ':height' => $image->getHeight()));
+    $elements = $this->xpath('//a[@href=:path]/img[@class="image-style-test" and @src=:url and @width=:width and @height=:height and @alt=""]', [':path' => base_path() . $path, ':url' => $url, ':width' => $image->getWidth(), ':height' => $image->getHeight()]);
     $this->assertEqual(count($elements), 1, 'theme_image_formatter() correctly renders without title, alt, or path options.');
 
     // Link the image to a fragment on the page, and not a full URL.
@@ -112,19 +112,19 @@ class ImageThemeFunctionTest extends WebTestBase {
     $element = $base_element;
     $element['#url'] = Url::fromRoute('<none>', [], ['fragment' => $fragment]);
     $this->setRawContent($renderer->renderRoot($element));
-    $elements = $this->xpath('//a[@href=:fragment]/img[@class="image-style-test" and @src=:url and @width=:width and @height=:height and @alt=""]', array(
+    $elements = $this->xpath('//a[@href=:fragment]/img[@class="image-style-test" and @src=:url and @width=:width and @height=:height and @alt=""]', [
       ':fragment' => '#' . $fragment,
       ':url' => $url,
       ':width' => $image->getWidth(),
       ':height' => $image->getHeight()
-    ));
+    ]);
     $this->assertEqual(count($elements), 1, 'theme_image_formatter() correctly renders a link fragment.');
   }
 
   /**
    * Tests usage of the image style theme function.
    */
-  function testImageStyleTheme() {
+  public function testImageStyleTheme() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
 
@@ -134,87 +134,87 @@ class ImageThemeFunctionTest extends WebTestBase {
     $original_uri = file_unmanaged_copy($file->uri, 'public://', FILE_EXISTS_RENAME);
 
     // Create a style.
-    $style = ImageStyle::create(array('name' => 'image_test', 'label' => 'Test'));
+    $style = ImageStyle::create(['name' => 'image_test', 'label' => 'Test']);
     $style->save();
     $url = file_url_transform_relative($style->buildUrl($original_uri));
 
     // Create the base element that we'll use in the tests below.
-    $base_element = array(
+    $base_element = [
       '#theme' => 'image_style',
       '#style_name' => 'image_test',
       '#uri' => $original_uri,
-    );
+    ];
 
     $element = $base_element;
     $this->setRawContent($renderer->renderRoot($element));
-    $elements = $this->xpath('//img[@class="image-style-image-test" and @src=:url and @alt=""]', array(':url' => $url));
+    $elements = $this->xpath('//img[@class="image-style-image-test" and @src=:url and @alt=""]', [':url' => $url]);
     $this->assertEqual(count($elements), 1, 'theme_image_style() renders an image correctly.');
 
     // Test using theme_image_style() with a NULL value for the alt option.
     $element = $base_element;
     $element['#alt'] = NULL;
     $this->setRawContent($renderer->renderRoot($element));
-    $elements = $this->xpath('//img[@class="image-style-image-test" and @src=:url]', array(':url' => $url));
+    $elements = $this->xpath('//img[@class="image-style-image-test" and @src=:url]', [':url' => $url]);
     $this->assertEqual(count($elements), 1, 'theme_image_style() renders an image correctly with a NULL value for the alt option.');
   }
 
   /**
    * Tests image alt attribute functionality.
    */
-  function testImageAltFunctionality() {
+  public function testImageAltFunctionality() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
 
     // Test using alt directly with alt attribute.
-    $image_with_alt_property = array(
+    $image_with_alt_property = [
       '#theme' => 'image',
       '#uri' => '/core/themes/bartik/logo.svg',
       '#alt' => 'Regular alt',
       '#title' => 'Test title',
       '#width' => '50%',
       '#height' => '50%',
-      '#attributes' => array('class' => 'image-with-regular-alt', 'id' => 'my-img'),
-    );
+      '#attributes' => ['class' => 'image-with-regular-alt', 'id' => 'my-img'],
+    ];
 
     $this->setRawContent($renderer->renderRoot($image_with_alt_property));
-    $elements = $this->xpath('//img[contains(@class, class) and contains(@alt, :alt)]', array(":class" => "image-with-regular-alt", ":alt" => "Regular alt"));
+    $elements = $this->xpath('//img[contains(@class, class) and contains(@alt, :alt)]', [":class" => "image-with-regular-alt", ":alt" => "Regular alt"]);
     $this->assertEqual(count($elements), 1, 'Regular alt displays correctly');
 
     // Test using alt attribute inside attributes.
-    $image_with_alt_attribute_alt_attribute = array(
+    $image_with_alt_attribute_alt_attribute = [
       '#theme' => 'image',
       '#uri' => '/core/themes/bartik/logo.svg',
       '#width' => '50%',
       '#height' => '50%',
-      '#attributes' => array(
+      '#attributes' => [
         'class' => 'image-with-attribute-alt',
         'id' => 'my-img',
         'title' => 'New test title',
         'alt' => 'Attribute alt',
-      ),
-    );
+      ],
+    ];
 
     $this->setRawContent($renderer->renderRoot($image_with_alt_attribute_alt_attribute));
-    $elements = $this->xpath('//img[contains(@class, class) and contains(@alt, :alt)]', array(":class" => "image-with-attribute-alt", ":alt" => "Attribute alt"));
+    $elements = $this->xpath('//img[contains(@class, class) and contains(@alt, :alt)]', [":class" => "image-with-attribute-alt", ":alt" => "Attribute alt"]);
     $this->assertEqual(count($elements), 1, 'Attribute alt displays correctly');
 
     // Test using alt attribute as property and inside attributes.
-    $image_with_alt_attribute_both = array(
+    $image_with_alt_attribute_both = [
       '#theme' => 'image',
       '#uri' => '/core/themes/bartik/logo.svg',
       '#width' => '50%',
       '#height' => '50%',
       '#alt' => 'Kitten sustainable',
-      '#attributes' => array(
+      '#attributes' => [
         'class' => 'image-with-attribute-alt',
         'id' => 'my-img',
         'title' => 'New test title',
         'alt' => 'Attribute alt',
-      ),
-    );
+      ],
+    ];
 
     $this->setRawContent($renderer->renderRoot($image_with_alt_attribute_both));
-    $elements = $this->xpath('//img[contains(@class, class) and contains(@alt, :alt)]', array(":class" => "image-with-attribute-alt", ":alt" => "Attribute alt"));
+    $elements = $this->xpath('//img[contains(@class, class) and contains(@alt, :alt)]', [":class" => "image-with-attribute-alt", ":alt" => "Attribute alt"]);
     $this->assertEqual(count($elements), 1, 'Attribute alt overrides alt property if both set.');
   }
 
diff --git a/web/core/modules/image/src/Tests/QuickEditImageControllerTest.php b/web/core/modules/image/src/Tests/QuickEditImageControllerTest.php
new file mode 100644
index 000000000..870c1bb5d
--- /dev/null
+++ b/web/core/modules/image/src/Tests/QuickEditImageControllerTest.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace Drupal\image\Tests;
+
+use Drupal\Tests\image\Kernel\ImageFieldCreationTrait;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the endpoints used by the "image" in-place editor.
+ *
+ * @group image
+ */
+class QuickEditImageControllerTest extends WebTestBase {
+
+  use ImageFieldCreationTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'image', 'quickedit'];
+
+  /**
+   * The machine name of our image field.
+   *
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * A user with permissions to edit articles and use Quick Edit.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $contentAuthorUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create the Article node type.
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+
+    // Log in as a content author who can use Quick Edit and edit Articles.
+    $this->contentAuthorUser = $this->drupalCreateUser([
+      'access contextual links',
+      'access in-place editing',
+      'access content',
+      'create article content',
+      'edit any article content',
+      'delete any article content',
+    ]);
+    $this->drupalLogin($this->contentAuthorUser);
+
+    // Create a field with basic resolution validators.
+    $this->fieldName = strtolower($this->randomMachineName());
+    $field_settings = [
+      'max_resolution' => '100x',
+      'min_resolution' => '50x',
+    ];
+    $this->createImageField($this->fieldName, 'article', [], $field_settings);
+  }
+
+  /**
+   * Tests that routes restrict access for un-privileged users.
+   */
+  public function testAccess() {
+    // Create an anonymous user.
+    $user = $this->createUser();
+    $this->drupalLogin($user);
+
+    // Create a test Node.
+    $node = $this->drupalCreateNode([
+      'type' => 'article',
+      'title' => t('Test Node'),
+    ]);
+    $this->drupalGet('quickedit/image/info/node/' . $node->id() . '/' . $this->fieldName . '/' . $node->language()->getId() . '/default');
+    $this->assertResponse('403');
+    $this->drupalPost('quickedit/image/upload/node/' . $node->id() . '/' . $this->fieldName . '/' . $node->language()->getId() . '/default', 'application/json', []);
+    $this->assertResponse('403');
+  }
+
+  /**
+   * Tests that the field info route returns expected data.
+   */
+  public function testFieldInfo() {
+    // Create a test Node.
+    $node = $this->drupalCreateNode([
+      'type' => 'article',
+      'title' => t('Test Node'),
+    ]);
+    $info = $this->drupalGetJSON('quickedit/image/info/node/' . $node->id() . '/' . $this->fieldName . '/' . $node->language()->getId() . '/default');
+    // Assert that the default settings for our field are respected by our JSON
+    // endpoint.
+    $this->assertTrue($info['alt_field']);
+    $this->assertFalse($info['title_field']);
+  }
+
+  /**
+   * Tests that uploading a valid image works.
+   */
+  public function testValidImageUpload() {
+    // Create a test Node.
+    $node = $this->drupalCreateNode([
+      'type' => 'article',
+      'title' => t('Test Node'),
+    ]);
+
+    // We want a test image that is a valid size.
+    $valid_image = FALSE;
+    $image_factory = $this->container->get('image.factory');
+    foreach ($this->drupalGetTestFiles('image') as $image) {
+      $image_file = $image_factory->get($image->uri);
+      if ($image_file->getWidth() > 50 && $image_file->getWidth() < 100) {
+        $valid_image = $image;
+        break;
+      }
+    }
+    $this->assertTrue($valid_image);
+    $this->uploadImage($valid_image, $node->id(), $this->fieldName, $node->language()->getId());
+    $this->assertText('fid', t('Valid upload completed successfully.'));
+  }
+
+  /**
+   * Tests that uploading a invalid image does not work.
+   */
+  public function testInvalidUpload() {
+    // Create a test Node.
+    $node = $this->drupalCreateNode([
+      'type' => 'article',
+      'title' => t('Test Node'),
+    ]);
+
+    // We want a test image that will fail validation.
+    $invalid_image = FALSE;
+    /** @var \Drupal\Core\Image\ImageFactory $image_factory */
+    $image_factory = $this->container->get('image.factory');
+    foreach ($this->drupalGetTestFiles('image') as $image) {
+      /** @var \Drupal\Core\Image\ImageInterface $image_file */
+      $image_file = $image_factory->get($image->uri);
+      if ($image_file->getWidth() < 50 || $image_file->getWidth() > 100 ) {
+        $invalid_image = $image;
+        break;
+      }
+    }
+    $this->assertTrue($invalid_image);
+    $this->uploadImage($invalid_image, $node->id(), $this->fieldName, $node->language()->getId());
+    $this->assertText('main_error', t('Invalid upload returned errors.'));
+  }
+
+  /**
+   * Uploads an image using the image module's Quick Edit route.
+   *
+   * @param object $image
+   *   The image to upload.
+   * @param int $nid
+   *   The target node ID.
+   * @param string $field_name
+   *   The target field machine name.
+   * @param string $langcode
+   *   The langcode to use when setting the field's value.
+   *
+   * @return mixed
+   *   The content returned from the call to $this->curlExec().
+   */
+  public function uploadImage($image, $nid, $field_name, $langcode) {
+    $filepath = $this->container->get('file_system')->realpath($image->uri);
+    $data = [
+      'files[image]' => curl_file_create($filepath),
+    ];
+    $path = 'quickedit/image/upload/node/' . $nid . '/' . $field_name . '/' . $langcode . '/default';
+    // We assemble the curl request ourselves as drupalPost cannot process file
+    // uploads, and drupalPostForm only works with typical Drupal forms.
+    return $this->curlExec([
+      CURLOPT_URL => $this->buildUrl($path, []),
+      CURLOPT_POST => TRUE,
+      CURLOPT_POSTFIELDS => $data,
+      CURLOPT_HTTPHEADER => [
+        'Accept: application/json',
+        'Content-Type: multipart/form-data',
+      ],
+    ]);
+  }
+
+}
diff --git a/web/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php b/web/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php
index f9381d403..55cecc0fc 100644
--- a/web/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php
+++ b/web/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php
@@ -21,25 +21,25 @@ class RelationshipUserImageDataTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('image', 'image_test_views', 'user');
+  public static $modules = ['image', 'image_test_views', 'user'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_image_user_image_data');
+  public static $testViews = ['test_image_user_image_data'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create the user profile field and instance.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'user',
       'field_name' => 'user_picture',
       'type' => 'image',
       'translatable' => '0',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'label' => 'User Picture',
       'description' => '',
@@ -49,7 +49,7 @@ class RelationshipUserImageDataTest extends ViewTestBase {
       'required' => 0,
     ])->save();
 
-    ViewTestData::createTestViews(get_class($this), array('image_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['image_test_views']);
   }
 
   /**
@@ -84,12 +84,12 @@ class RelationshipUserImageDataTest extends ViewTestBase {
     ];
     $this->assertIdentical($expected, $view->getDependencies());
     $this->executeView($view);
-    $expected_result = array(
-      array(
+    $expected_result = [
+      [
         'file_managed_user__user_picture_fid' => '2',
-      ),
-    );
-    $column_map = array('file_managed_user__user_picture_fid' => 'file_managed_user__user_picture_fid');
+      ],
+    ];
+    $column_map = ['file_managed_user__user_picture_fid' => 'file_managed_user__user_picture_fid'];
     $this->assertIdenticalResultset($view, $expected_result, $column_map);
   }
 
diff --git a/web/core/modules/image/tests/modules/image_module_test/image_module_test.module b/web/core/modules/image/tests/modules/image_module_test/image_module_test.module
index df7137535..20c515e9d 100644
--- a/web/core/modules/image/tests/modules/image_module_test/image_module_test.module
+++ b/web/core/modules/image/tests/modules/image_module_test/image_module_test.module
@@ -10,7 +10,7 @@ use Drupal\image\ImageStyleInterface;
 function image_module_test_file_download($uri) {
   $default_uri = \Drupal::state()->get('image.test_file_download') ?: FALSE;
   if ($default_uri == $uri) {
-    return array('X-Image-Owned-By' => 'image_module_test');
+    return ['X-Image-Owned-By' => 'image_module_test'];
   }
 }
 
diff --git a/web/core/modules/image/src/Tests/ImageEffectsTest.php b/web/core/modules/image/tests/src/Functional/ImageEffectsTest.php
similarity index 80%
rename from web/core/modules/image/src/Tests/ImageEffectsTest.php
rename to web/core/modules/image/tests/src/Functional/ImageEffectsTest.php
index 895457f10..e9cb157ab 100644
--- a/web/core/modules/image/src/Tests/ImageEffectsTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageEffectsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\image\Entity\ImageStyle;
 use Drupal\system\Tests\Image\ToolkitTestBase;
@@ -17,7 +17,7 @@ class ImageEffectsTest extends ToolkitTestBase {
    *
    * @var array
    */
-  public static $modules = array('image', 'image_test', 'image_module_test');
+  public static $modules = ['image', 'image_test', 'image_module_test'];
 
   /**
    * The image effect manager.
@@ -34,12 +34,12 @@ class ImageEffectsTest extends ToolkitTestBase {
   /**
    * Test the image_resize_effect() function.
    */
-  function testResizeEffect() {
-    $this->assertImageEffect('image_resize', array(
+  public function testResizeEffect() {
+    $this->assertImageEffect('image_resize', [
       'width' => 1,
       'height' => 2,
-    ));
-    $this->assertToolkitOperationsCalled(array('resize'));
+    ]);
+    $this->assertToolkitOperationsCalled(['resize']);
 
     // Check the parameters.
     $calls = $this->imageTestGetAllCalls();
@@ -50,13 +50,13 @@ class ImageEffectsTest extends ToolkitTestBase {
   /**
    * Test the image_scale_effect() function.
    */
-  function testScaleEffect() {
+  public function testScaleEffect() {
     // @todo: need to test upscaling.
-    $this->assertImageEffect('image_scale', array(
+    $this->assertImageEffect('image_scale', [
       'width' => 10,
       'height' => 10,
-    ));
-    $this->assertToolkitOperationsCalled(array('scale'));
+    ]);
+    $this->assertToolkitOperationsCalled(['scale']);
 
     // Check the parameters.
     $calls = $this->imageTestGetAllCalls();
@@ -67,14 +67,14 @@ class ImageEffectsTest extends ToolkitTestBase {
   /**
    * Test the image_crop_effect() function.
    */
-  function testCropEffect() {
+  public function testCropEffect() {
     // @todo should test the keyword offsets.
-    $this->assertImageEffect('image_crop', array(
+    $this->assertImageEffect('image_crop', [
       'anchor' => 'top-1',
       'width' => 3,
       'height' => 4,
-    ));
-    $this->assertToolkitOperationsCalled(array('crop'));
+    ]);
+    $this->assertToolkitOperationsCalled(['crop']);
 
     // Check the parameters.
     $calls = $this->imageTestGetAllCalls();
@@ -87,12 +87,12 @@ class ImageEffectsTest extends ToolkitTestBase {
   /**
    * Tests the ConvertImageEffect plugin.
    */
-  function testConvertEffect() {
+  public function testConvertEffect() {
     // Test jpeg.
-    $this->assertImageEffect('image_convert', array(
+    $this->assertImageEffect('image_convert', [
       'extension' => 'jpeg',
-    ));
-    $this->assertToolkitOperationsCalled(array('convert'));
+    ]);
+    $this->assertToolkitOperationsCalled(['convert']);
 
     // Check the parameters.
     $calls = $this->imageTestGetAllCalls();
@@ -102,12 +102,12 @@ class ImageEffectsTest extends ToolkitTestBase {
   /**
    * Test the image_scale_and_crop_effect() function.
    */
-  function testScaleAndCropEffect() {
-    $this->assertImageEffect('image_scale_and_crop', array(
+  public function testScaleAndCropEffect() {
+    $this->assertImageEffect('image_scale_and_crop', [
       'width' => 5,
       'height' => 10,
-    ));
-    $this->assertToolkitOperationsCalled(array('scale_and_crop'));
+    ]);
+    $this->assertToolkitOperationsCalled(['scale_and_crop']);
 
     // Check the parameters.
     $calls = $this->imageTestGetAllCalls();
@@ -118,9 +118,9 @@ class ImageEffectsTest extends ToolkitTestBase {
   /**
    * Test the image_desaturate_effect() function.
    */
-  function testDesaturateEffect() {
-    $this->assertImageEffect('image_desaturate', array());
-    $this->assertToolkitOperationsCalled(array('desaturate'));
+  public function testDesaturateEffect() {
+    $this->assertImageEffect('image_desaturate', []);
+    $this->assertToolkitOperationsCalled(['desaturate']);
 
     // Check the parameters.
     $calls = $this->imageTestGetAllCalls();
@@ -130,13 +130,13 @@ class ImageEffectsTest extends ToolkitTestBase {
   /**
    * Test the image_rotate_effect() function.
    */
-  function testRotateEffect() {
+  public function testRotateEffect() {
     // @todo: need to test with 'random' => TRUE
-    $this->assertImageEffect('image_rotate', array(
+    $this->assertImageEffect('image_rotate', [
       'degrees' => 90,
       'bgcolor' => '#fff',
-    ));
-    $this->assertToolkitOperationsCalled(array('rotate'));
+    ]);
+    $this->assertToolkitOperationsCalled(['rotate']);
 
     // Check the parameters.
     $calls = $this->imageTestGetAllCalls();
@@ -147,7 +147,7 @@ class ImageEffectsTest extends ToolkitTestBase {
   /**
    * Test image effect caching.
    */
-  function testImageEffectsCaching() {
+  public function testImageEffectsCaching() {
     $image_effect_definitions_called = &drupal_static('image_module_test_image_effect_info_alter');
 
     // First call should grab a fresh copy of the data.
@@ -195,7 +195,7 @@ class ImageEffectsTest extends ToolkitTestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertImageEffect($effect_name, array $data) {
-    $effect = $this->manager->createInstance($effect_name, array('data' => $data));
+    $effect = $this->manager->createInstance($effect_name, ['data' => $data]);
     return $this->assertTrue($effect->applyEffect($this->image), 'Function returned the expected value.');
   }
 
diff --git a/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php b/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php
new file mode 100644
index 000000000..5fa061404
--- /dev/null
+++ b/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Drupal\Tests\image\Functional;
+
+use Drupal\Tests\image\Kernel\ImageFieldCreationTrait;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * TODO: Test the following functions.
+ *
+ * image.effects.inc:
+ *   image_style_generate()
+ *   \Drupal\image\ImageStyleInterface::createDerivative()
+ *
+ * image.module:
+ *   image_style_options()
+ *   \Drupal\image\ImageStyleInterface::flush()
+ *   image_filter_keyword()
+ */
+
+/**
+ * This class provides methods specifically for testing Image's field handling.
+ */
+abstract class ImageFieldTestBase extends BrowserTestBase {
+
+  use ImageFieldCreationTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'image', 'field_ui', 'image_module_test'];
+
+  /**
+   * An user with permissions to administer content types and image styles.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create Basic page and Article node types.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+    }
+
+    $this->adminUser = $this->drupalCreateUser(['access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer node fields', 'administer nodes', 'create article content', 'edit any article content', 'delete any article content', 'administer image styles', 'administer node display']);
+    $this->drupalLogin($this->adminUser);
+  }
+
+  /**
+   * Preview an image in a node.
+   *
+   * @param \Drupal\Core\Image\ImageInterface $image
+   *   A file object representing the image to upload.
+   * @param string $field_name
+   *   Name of the image field the image should be attached to.
+   * @param string $type
+   *   The type of node to create.
+   */
+  public function previewNodeImage($image, $field_name, $type) {
+    $edit = [
+      'title[0][value]' => $this->randomMachineName(),
+    ];
+    $edit['files[' . $field_name . '_0]'] = drupal_realpath($image->uri);
+    $this->drupalPostForm('node/add/' . $type, $edit, t('Preview'));
+  }
+
+  /**
+   * Upload an image to a node.
+   *
+   * @param $image
+   *   A file object representing the image to upload.
+   * @param $field_name
+   *   Name of the image field the image should be attached to.
+   * @param $type
+   *   The type of node to create.
+   * @param $alt
+   *   The alt text for the image. Use if the field settings require alt text.
+   */
+  public function uploadNodeImage($image, $field_name, $type, $alt = '') {
+    $edit = [
+      'title[0][value]' => $this->randomMachineName(),
+    ];
+    $edit['files[' . $field_name . '_0]'] = drupal_realpath($image->uri);
+    $this->drupalPostForm('node/add/' . $type, $edit, t('Save and publish'));
+    if ($alt) {
+      // Add alt text.
+      $this->drupalPostForm(NULL, [$field_name . '[0][alt]' => $alt], t('Save and publish'));
+    }
+
+    // Retrieve ID of the newly created node from the current URL.
+    $matches = [];
+    preg_match('/node\/([0-9]+)/', $this->getUrl(), $matches);
+    return isset($matches[1]) ? $matches[1] : FALSE;
+  }
+
+  /**
+   * Retrieves the fid of the last inserted file.
+   */
+  protected function getLastFileId() {
+    return (int) db_query('SELECT MAX(fid) FROM {file_managed}')->fetchField();
+  }
+
+}
diff --git a/web/core/modules/image/src/Tests/ImageFieldWidgetTest.php b/web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
similarity index 70%
rename from web/core/modules/image/src/Tests/ImageFieldWidgetTest.php
rename to web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
index 52d9e4d5c..7c3b94d49 100644
--- a/web/core/modules/image/src/Tests/ImageFieldWidgetTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 /**
  * Tests the image field widget.
@@ -17,14 +17,15 @@ class ImageFieldWidgetTest extends ImageFieldTestBase {
     $field_name = strtolower($this->randomMachineName());
     $min_resolution = 50;
     $max_resolution = 100;
-    $field_settings = array(
+    $field_settings = [
       'max_resolution' => $max_resolution . 'x' . $max_resolution,
       'min_resolution' => $min_resolution . 'x' . $min_resolution,
       'alt_field' => 0,
-    );
-    $this->createImageField($field_name, 'article', array(), $field_settings, array(), array(), 'Image test on [site:name]');
+    ];
+    $this->createImageField($field_name, 'article', [], $field_settings, [], [], 'Image test on [site:name]');
     $this->drupalGet('node/add/article');
     $this->assertNotEqual(0, count($this->xpath('//div[contains(@class, "field--widget-image-image")]')), 'Image field widget found on add/node page', 'Browser');
+    $this->assertNotEqual(0, count($this->xpath('//input[contains(@accept, "image/*")]')), 'Image field widget limits accepted files.', 'Browser');
     $this->assertNoText('Image test on [site:name]');
   }
 
diff --git a/web/core/modules/image/src/Tests/ImageStyleDeleteTest.php b/web/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
similarity index 99%
rename from web/core/modules/image/src/Tests/ImageStyleDeleteTest.php
rename to web/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
index feb06cedd..fff27601c 100644
--- a/web/core/modules/image/src/Tests/ImageStyleDeleteTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\image\Tests;
+namespace Drupal\Tests\image\Functional;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
diff --git a/web/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php b/web/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php
new file mode 100644
index 000000000..12e43e758
--- /dev/null
+++ b/web/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace Drupal\Tests\image\FunctionalJavascript;
+
+use Drupal\file\Entity\File;
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\Tests\image\Kernel\ImageFieldCreationTrait;
+use Drupal\Tests\TestFileCreationTrait;
+
+/**
+ * Tests the JavaScript functionality of the "image" in-place editor.
+ *
+ * @group image
+ */
+class QuickEditImageTest extends JavascriptTestBase {
+
+  use ImageFieldCreationTrait;
+  use TestFileCreationTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'image', 'field_ui', 'contextual', 'quickedit', 'toolbar'];
+
+  /**
+   * A user with permissions to edit Articles and use Quick Edit.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $contentAuthorUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create the Article node type.
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+
+    // Log in as a content author who can use Quick Edit and edit Articles.
+    $this->contentAuthorUser = $this->drupalCreateUser([
+      'access contextual links',
+      'access toolbar',
+      'access in-place editing',
+      'access content',
+      'create article content',
+      'edit any article content',
+      'delete any article content',
+    ]);
+    $this->drupalLogin($this->contentAuthorUser);
+  }
+
+  /**
+   * Tests if an image can be uploaded inline with Quick Edit.
+   */
+  public function testUpload() {
+    // Create a field with a basic filetype restriction.
+    $field_name = strtolower($this->randomMachineName());
+    $field_settings = [
+      'file_extensions' => 'png',
+    ];
+    $formatter_settings = [
+      'image_style' => 'large',
+      'image_link' => '',
+    ];
+    $this->createImageField($field_name, 'article', [], $field_settings, [], $formatter_settings);
+
+    // Find images that match our field settings.
+    $valid_images = [];
+    foreach ($this->getTestFiles('image') as $image) {
+      // This regex is taken from file_validate_extensions().
+      $regex = '/\.(' . preg_replace('/ +/', '|', preg_quote($field_settings['file_extensions'])) . ')$/i';
+      if (preg_match($regex, $image->filename)) {
+        $valid_images[] = $image;
+      }
+    }
+
+    // Ensure we have at least two valid images.
+    $this->assertGreaterThanOrEqual(2, count($valid_images));
+
+    // Create a File entity for the initial image.
+    $file = File::create([
+      'uri' => $valid_images[0]->uri,
+      'uid' => $this->contentAuthorUser->id(),
+      'status' => FILE_STATUS_PERMANENT,
+    ]);
+    $file->save();
+
+    // Use the first valid image to create a new Node.
+    $image_factory = $this->container->get('image.factory');
+    $image = $image_factory->get($valid_images[0]->uri);
+    $node = $this->drupalCreateNode([
+      'type' => 'article',
+      'title' => t('Test Node'),
+      $field_name => [
+        'target_id' => $file->id(),
+        'alt' => 'Hello world',
+        'title' => '',
+        'width' => $image->getWidth(),
+        'height' => $image->getHeight(),
+      ],
+    ]);
+
+    // Visit the new Node.
+    $this->drupalGet('node/' . $node->id());
+
+    // Assemble common CSS selectors.
+    $entity_selector = '[data-quickedit-entity-id="node/' . $node->id() . '"]';
+    $field_selector = '[data-quickedit-field-id="node/' . $node->id() . '/' . $field_name . '/' . $node->language()->getId() . '/full"]';
+    $original_image_selector = 'img[src*="' . $valid_images[0]->filename . '"][alt="Hello world"]';
+    $new_image_selector = 'img[src*="' . $valid_images[1]->filename . '"][alt="New text"]';
+
+    // Assert that the initial image is present.
+    $this->assertSession()->elementExists('css', $entity_selector . ' ' . $field_selector . ' ' . $original_image_selector);
+
+    // Wait until Quick Edit loads.
+    $condition = "jQuery('" . $entity_selector . " .quickedit').length > 0";
+    $this->assertJsCondition($condition, 10000);
+
+    // Initiate Quick Editing.
+    $this->click('.contextual-toolbar-tab button');
+    $this->click($entity_selector . ' [data-contextual-id] > button');
+    $this->click($entity_selector . ' [data-contextual-id] .quickedit > a');
+    $this->click($field_selector);
+
+    // Wait for the field info to load and set new alt text.
+    $condition = "jQuery('.quickedit-image-field-info').length > 0";
+    $this->assertJsCondition($condition, 10000);
+    $input = $this->assertSession()->elementExists('css', '.quickedit-image-field-info input[name="alt"]');
+    $input->setValue('New text');
+
+    // Check that our Dropzone element exists.
+    $this->assertSession()->elementExists('css', $field_selector . ' .quickedit-image-dropzone');
+
+    // Our headless browser can't drag+drop files, but we can mock the event.
+    // Append a hidden upload element to the DOM.
+    $script = 'jQuery("<input id=\"quickedit-image-test-input\" type=\"file\" />").appendTo("body")';
+    $this->getSession()->executeScript($script);
+
+    // Find the element, and set its value to our new image.
+    $input = $this->assertSession()->elementExists('css', '#quickedit-image-test-input');
+    $filepath = $this->container->get('file_system')->realpath($valid_images[1]->uri);
+    $input->attachFile($filepath);
+
+    // Trigger the upload logic with a mock "drop" event.
+    $script = 'var e = jQuery.Event("drop");'
+      . 'e.originalEvent = {dataTransfer: {files: jQuery("#quickedit-image-test-input").get(0).files}};'
+      . 'e.preventDefault = e.stopPropagation = function () {};'
+      . 'jQuery(".quickedit-image-dropzone").trigger(e);';
+    $this->getSession()->executeScript($script);
+
+    // Wait for the dropzone element to be removed (i.e. loading is done).
+    $condition = "jQuery('" . $field_selector . " .quickedit-image-dropzone').length == 0";
+    $this->assertJsCondition($condition, 20000);
+
+    // To prevent 403s on save, we re-set our request (cookie) state.
+    $this->prepareRequest();
+
+    // Save the change.
+    $this->click('.quickedit-button.action-save');
+    $this->assertSession()->assertWaitOnAjaxRequest();
+
+    // Re-visit the page to make sure the edit worked.
+    $this->drupalGet('node/' . $node->id());
+
+    // Check that the new image appears as expected.
+    $this->assertSession()->elementNotExists('css', $entity_selector . ' ' . $field_selector . ' ' . $original_image_selector);
+    $this->assertSession()->elementExists('css', $entity_selector . ' ' . $field_selector . ' ' . $new_image_selector);
+  }
+
+}
diff --git a/web/core/modules/image/tests/src/Kernel/ImageFieldCreationTrait.php b/web/core/modules/image/tests/src/Kernel/ImageFieldCreationTrait.php
index a8fe5895f..851b424bf 100644
--- a/web/core/modules/image/tests/src/Kernel/ImageFieldCreationTrait.php
+++ b/web/core/modules/image/tests/src/Kernel/ImageFieldCreationTrait.php
@@ -30,14 +30,14 @@ trait ImageFieldCreationTrait {
    * @param string $description
    *   (optional) A description for the field. Defaults to ''.
    */
-  protected function createImageField($name, $type_name, $storage_settings = array(), $field_settings = array(), $widget_settings = array(), $formatter_settings = array(), $description = '') {
-    FieldStorageConfig::create(array(
+  protected function createImageField($name, $type_name, $storage_settings = [], $field_settings = [], $widget_settings = [], $formatter_settings = [], $description = '') {
+    FieldStorageConfig::create([
       'field_name' => $name,
       'entity_type' => 'node',
       'type' => 'image',
       'settings' => $storage_settings,
       'cardinality' => !empty($storage_settings['cardinality']) ? $storage_settings['cardinality'] : 1,
-    ))->save();
+    ])->save();
 
     $field_config = FieldConfig::create([
       'field_name' => $name,
@@ -51,17 +51,17 @@ trait ImageFieldCreationTrait {
     $field_config->save();
 
     entity_get_form_display('node', $type_name, 'default')
-      ->setComponent($name, array(
+      ->setComponent($name, [
         'type' => 'image_image',
         'settings' => $widget_settings,
-      ))
+      ])
       ->save();
 
     entity_get_display('node', $type_name, 'default')
-      ->setComponent($name, array(
+      ->setComponent($name, [
         'type' => 'image',
         'settings' => $formatter_settings,
-      ))
+      ])
       ->save();
 
     return $field_config;
diff --git a/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php b/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
index d1b132ecc..f00174350 100644
--- a/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
+++ b/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
@@ -21,7 +21,7 @@ class ImageFormatterTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('file', 'image');
+  public static $modules = ['file', 'image'];
 
   /**
    * @var string
@@ -52,18 +52,18 @@ class ImageFormatterTest extends FieldKernelTestBase {
     $this->installConfig(['field']);
     $this->installEntitySchema('entity_test');
     $this->installEntitySchema('file');
-    $this->installSchema('file', array('file_usage'));
+    $this->installSchema('file', ['file_usage']);
 
     $this->entityType = 'entity_test';
     $this->bundle = $this->entityType;
     $this->fieldName = Unicode::strtolower($this->randomMachineName());
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => $this->entityType,
       'field_name' => $this->fieldName,
       'type' => 'image',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => $this->entityType,
       'field_name' => $this->fieldName,
@@ -84,7 +84,7 @@ class ImageFormatterTest extends FieldKernelTestBase {
   /**
    * Tests the cache tags from image formatters.
    */
-  function testImageFormatterCacheTags() {
+  public function testImageFormatterCacheTags() {
     // Create a test entity with the image field set.
     $entity = EntityTest::create([
       'name' => $this->randomMachineName(),
diff --git a/web/core/modules/image/tests/src/Kernel/ImageItemTest.php b/web/core/modules/image/tests/src/Kernel/ImageItemTest.php
index dea453469..f7a130545 100644
--- a/web/core/modules/image/tests/src/Kernel/ImageItemTest.php
+++ b/web/core/modules/image/tests/src/Kernel/ImageItemTest.php
@@ -23,7 +23,7 @@ class ImageItemTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('file', 'image');
+  public static $modules = ['file', 'image'];
 
   /**
    * Created file entity.
@@ -41,14 +41,14 @@ class ImageItemTest extends FieldKernelTestBase {
     parent::setUp();
 
     $this->installEntitySchema('file');
-    $this->installSchema('file', array('file_usage'));
+    $this->installSchema('file', ['file_usage']);
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'image_test',
       'type' => 'image',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'image_test',
@@ -114,11 +114,11 @@ class ImageItemTest extends FieldKernelTestBase {
 
     // Delete the image and try to save the entity again.
     $this->image->delete();
-    $entity = EntityTest::create(array('mame' => $this->randomMachineName()));
+    $entity = EntityTest::create(['mame' => $this->randomMachineName()]);
     $entity->save();
 
     // Test image item properties.
-    $expected = array('target_id', 'entity', 'alt', 'title', 'width', 'height');
+    $expected = ['target_id', 'entity', 'alt', 'title', 'width', 'height'];
     $properties = $entity->getFieldDefinition('image_test')->getFieldStorageDefinition()->getPropertyDefinitions();
     $this->assertEqual(array_keys($properties), $expected);
 
diff --git a/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php b/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
index 98db7b18c..d9381407d 100644
--- a/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
+++ b/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
@@ -28,9 +28,9 @@ class MigrateImageCacheTest extends MigrateDrupal6TestBase {
    */
   public function testMissingTable() {
     $this->sourceDatabase->update('system')
-      ->fields(array(
+      ->fields([
         'status' => 0,
-      ))
+      ])
       ->condition('name', 'imagecache')
       ->condition('type', 'module')
       ->execute();
@@ -88,14 +88,14 @@ class MigrateImageCacheTest extends MigrateDrupal6TestBase {
    */
   public function testMissingEffectPlugin() {
     Database::getConnection('default', 'migrate')->insert("imagecache_action")
-       ->fields([
+      ->fields([
        'presetid',
        'weight',
        'module',
        'action',
        'data',
      ])
-       ->values([
+      ->values([
        'presetid' => '1',
        'weight' => '0',
        'module' => 'imagecache',
@@ -121,14 +121,14 @@ class MigrateImageCacheTest extends MigrateDrupal6TestBase {
    */
   public function testInvalidCropValues() {
     Database::getConnection('default', 'migrate')->insert("imagecache_action")
-       ->fields([
+      ->fields([
        'presetid',
        'weight',
        'module',
        'action',
        'data',
      ])
-       ->values([
+      ->values([
        'presetid' => '1',
        'weight' => '0',
        'module' => 'imagecache',
diff --git a/web/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php b/web/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
index 0903218e0..534a4120c 100644
--- a/web/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
+++ b/web/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
@@ -17,7 +17,7 @@ class MigrateImageStylesTest extends MigrateDrupal7TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('image');
+  public static $modules = ['image'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/image/tests/src/Kernel/Plugin/migrate/source/d7/ImageStylesTest.php b/web/core/modules/image/tests/src/Kernel/Plugin/migrate/source/d7/ImageStylesTest.php
index bb91de8a9..55251d1fb 100644
--- a/web/core/modules/image/tests/src/Kernel/Plugin/migrate/source/d7/ImageStylesTest.php
+++ b/web/core/modules/image/tests/src/Kernel/Plugin/migrate/source/d7/ImageStylesTest.php
@@ -38,7 +38,7 @@ class ImageStylesTest extends MigrateSqlSourceTestBase {
         'isid' => 1,
         'weight' => 1,
         'name' => 'image_desaturate',
-        'data' => serialize(array()),
+        'data' => serialize([]),
       ],
     ];
 
diff --git a/web/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php b/web/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php
index c2f8fd8e7..a324d5ead 100644
--- a/web/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php
+++ b/web/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php
@@ -19,7 +19,7 @@ class ImageViewsDataTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('image', 'file', 'views', 'entity_test', 'user', 'field');
+  public static $modules = ['image', 'file', 'views', 'entity_test', 'user', 'field'];
 
   /**
    * Tests views data generated for image field relationship.
@@ -29,16 +29,16 @@ class ImageViewsDataTest extends ViewsKernelTestBase {
    */
   public function testRelationshipViewsData() {
     // Create image field to entity_test.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_base_image',
       'type' => 'image',
-    ))->save();
-    FieldConfig::create(array(
+    ])->save();
+    FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_base_image',
       'bundle' => 'entity_test',
-    ))->save();
+    ])->save();
     // Check the generated views data.
     $views_data = Views::viewsData()->get('entity_test__field_base_image');
     $relationship = $views_data['field_base_image_target_id']['relationship'];
@@ -59,16 +59,16 @@ class ImageViewsDataTest extends ViewsKernelTestBase {
     $this->assertEqual($relationship['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
 
     // Create image field to entity_test_mul.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'entity_test_mul',
       'field_name' => 'field_data_image',
       'type' => 'image',
-    ))->save();
-    FieldConfig::create(array(
+    ])->save();
+    FieldConfig::create([
       'entity_type' => 'entity_test_mul',
       'field_name' => 'field_data_image',
       'bundle' => 'entity_test_mul',
-    ))->save();
+    ])->save();
     // Check the generated views data.
     $views_data = Views::viewsData()->get('entity_test_mul__field_data_image');
     $relationship = $views_data['field_data_image_target_id']['relationship'];
diff --git a/web/core/modules/image/tests/src/Unit/ImageStyleTest.php b/web/core/modules/image/tests/src/Unit/ImageStyleTest.php
index 96c50c442..bc954b3cc 100644
--- a/web/core/modules/image/tests/src/Unit/ImageStyleTest.php
+++ b/web/core/modules/image/tests/src/Unit/ImageStyleTest.php
@@ -44,7 +44,7 @@ class ImageStyleTest extends UnitTestCase {
    * @return \Drupal\image\ImageStyleInterface
    *   The mocked image style.
    */
-  protected function getImageStyleMock($image_effect_id, $image_effect, $stubs = array()) {
+  protected function getImageStyleMock($image_effect_id, $image_effect, $stubs = []) {
     $effectManager = $this->getMockBuilder('\Drupal\image\ImageEffectManager')
       ->disableOriginalConstructor()
       ->getMock();
@@ -52,17 +52,17 @@ class ImageStyleTest extends UnitTestCase {
       ->method('createInstance')
       ->with($image_effect_id)
       ->will($this->returnValue($image_effect));
-    $default_stubs = array(
+    $default_stubs = [
       'getImageEffectPluginManager',
       'fileUriScheme',
       'fileUriTarget',
       'fileDefaultScheme',
-    );
+    ];
     $image_style = $this->getMockBuilder('\Drupal\image\Entity\ImageStyle')
-      ->setConstructorArgs(array(
-        array('effects' => array($image_effect_id => array('id' => $image_effect_id))),
+      ->setConstructorArgs([
+        ['effects' => [$image_effect_id => ['id' => $image_effect_id]]],
         $this->entityTypeId,
-      ))
+      ])
       ->setMethods(array_merge($default_stubs, $stubs))
       ->getMock();
 
@@ -71,13 +71,13 @@ class ImageStyleTest extends UnitTestCase {
       ->will($this->returnValue($effectManager));
     $image_style->expects($this->any())
       ->method('fileUriScheme')
-      ->will($this->returnCallback(array($this, 'fileUriScheme')));
+      ->will($this->returnCallback([$this, 'fileUriScheme']));
     $image_style->expects($this->any())
       ->method('fileUriTarget')
-      ->will($this->returnCallback(array($this, 'fileUriTarget')));
+      ->will($this->returnCallback([$this, 'fileUriTarget']));
     $image_style->expects($this->any())
       ->method('fileDefaultScheme')
-      ->will($this->returnCallback(array($this, 'fileDefaultScheme')));
+      ->will($this->returnCallback([$this, 'fileDefaultScheme']));
 
     return $image_style;
   }
@@ -106,7 +106,7 @@ class ImageStyleTest extends UnitTestCase {
     $image_effect_id = $this->randomMachineName();
     $logger = $this->getMockBuilder('\Psr\Log\LoggerInterface')->getMock();
     $image_effect = $this->getMockBuilder('\Drupal\image\ImageEffectBase')
-      ->setConstructorArgs(array(array(), $image_effect_id, array(), $logger))
+      ->setConstructorArgs([[], $image_effect_id, [], $logger])
       ->getMock();
     $image_effect->expects($this->any())
       ->method('getDerivativeExtension')
@@ -114,7 +114,7 @@ class ImageStyleTest extends UnitTestCase {
 
     $image_style = $this->getImageStyleMock($image_effect_id, $image_effect);
 
-    $extensions = array('jpeg', 'gif', 'png');
+    $extensions = ['jpeg', 'gif', 'png'];
     foreach ($extensions as $extension) {
       $extensionReturned = $image_style->getDerivativeExtension($extension);
       $this->assertEquals($extensionReturned, 'png');
@@ -129,7 +129,7 @@ class ImageStyleTest extends UnitTestCase {
     $image_effect_id = $this->randomMachineName();
     $logger = $this->getMockBuilder('\Psr\Log\LoggerInterface')->getMock();
     $image_effect = $this->getMockBuilder('\Drupal\image\ImageEffectBase')
-      ->setConstructorArgs(array(array(), $image_effect_id, array(), $logger))
+      ->setConstructorArgs([[], $image_effect_id, [], $logger])
       ->getMock();
     $image_effect->expects($this->any())
       ->method('getDerivativeExtension')
@@ -141,7 +141,7 @@ class ImageStyleTest extends UnitTestCase {
     // Image style that doesn't change the extension.
     $image_effect_id = $this->randomMachineName();
     $image_effect = $this->getMockBuilder('\Drupal\image\ImageEffectBase')
-      ->setConstructorArgs(array(array(), $image_effect_id, array(), $logger))
+      ->setConstructorArgs([[], $image_effect_id, [], $logger])
       ->getMock();
     $image_effect->expects($this->any())
       ->method('getDerivativeExtension')
@@ -162,19 +162,19 @@ class ImageStyleTest extends UnitTestCase {
     // Image style that changes the extension.
     $image_effect_id = $this->randomMachineName();
     $image_effect = $this->getMockBuilder('\Drupal\image\ImageEffectBase')
-      ->setConstructorArgs(array(array(), $image_effect_id, array(), $logger))
+      ->setConstructorArgs([[], $image_effect_id, [], $logger])
       ->getMock();
     $image_effect->expects($this->any())
       ->method('getDerivativeExtension')
       ->will($this->returnValue('png'));
 
-    $image_style = $this->getImageStyleMock($image_effect_id, $image_effect, array('getPrivateKey', 'getHashSalt'));
+    $image_style = $this->getImageStyleMock($image_effect_id, $image_effect, ['getPrivateKey', 'getHashSalt']);
     $image_style->expects($this->any())
-        ->method('getPrivateKey')
-        ->will($this->returnValue($private_key));
+      ->method('getPrivateKey')
+      ->will($this->returnValue($private_key));
     $image_style->expects($this->any())
-        ->method('getHashSalt')
-        ->will($this->returnValue($hash_salt));
+      ->method('getHashSalt')
+      ->will($this->returnValue($hash_salt));
 
     // Assert the extension has been added to the URI before creating the token.
     $this->assertEquals($image_style->getPathToken('public://test.jpeg.png'), $image_style->getPathToken('public://test.jpeg'));
@@ -184,19 +184,19 @@ class ImageStyleTest extends UnitTestCase {
     // Image style that doesn't change the extension.
     $image_effect_id = $this->randomMachineName();
     $image_effect = $this->getMockBuilder('\Drupal\image\ImageEffectBase')
-      ->setConstructorArgs(array(array(), $image_effect_id, array(), $logger))
+      ->setConstructorArgs([[], $image_effect_id, [], $logger])
       ->getMock();
     $image_effect->expects($this->any())
       ->method('getDerivativeExtension')
       ->will($this->returnArgument(0));
 
-    $image_style = $this->getImageStyleMock($image_effect_id, $image_effect, array('getPrivateKey', 'getHashSalt'));
+    $image_style = $this->getImageStyleMock($image_effect_id, $image_effect, ['getPrivateKey', 'getHashSalt']);
     $image_style->expects($this->any())
-        ->method('getPrivateKey')
-        ->will($this->returnValue($private_key));
+      ->method('getPrivateKey')
+      ->will($this->returnValue($private_key));
     $image_style->expects($this->any())
-        ->method('getHashSalt')
-        ->will($this->returnValue($hash_salt));
+      ->method('getHashSalt')
+      ->will($this->returnValue($hash_salt));
     // Assert no extension has been added to the uri before creating the token.
     $this->assertNotEquals($image_style->getPathToken('public://test.jpeg.png'), $image_style->getPathToken('public://test.jpeg'));
     $this->assertNotEquals(substr(Crypt::hmacBase64($image_style->id() . ':' . 'public://test.jpeg.png', $private_key . $hash_salt), 0, 8), $image_style->getPathToken('public://test.jpeg'));
diff --git a/web/core/modules/inline_form_errors/src/FormErrorHandler.php b/web/core/modules/inline_form_errors/src/FormErrorHandler.php
index 8e0f1b820..2b892e99d 100644
--- a/web/core/modules/inline_form_errors/src/FormErrorHandler.php
+++ b/web/core/modules/inline_form_errors/src/FormErrorHandler.php
@@ -53,6 +53,13 @@ class FormErrorHandler extends CoreFormErrorHandler {
    *   The current state of the form.
    */
   protected function displayErrorMessages(array $form, FormStateInterface $form_state) {
+    // Use the original error display for Quick Edit forms, because in this case
+    // the errors are already near the form element.
+    if ($form['#form_id'] === 'quickedit_field_form') {
+      parent::displayErrorMessages($form, $form_state);
+      return;
+    }
+
     $error_links = [];
     $errors = $form_state->getErrors();
     // Loop through all form errors and check if we need to display a link.
diff --git a/web/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerQuickEditTest.php b/web/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerQuickEditTest.php
new file mode 100644
index 000000000..b956cccbd
--- /dev/null
+++ b/web/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerQuickEditTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Drupal\Tests\inline_form_errors\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\node\Entity\NodeType;
+
+/**
+ * Tests Inline Form Errors compatibility with Quick Edit.
+ *
+ * @group inline_form_errors
+ */
+class FormErrorHandlerQuickEditTest extends JavascriptTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'quickedit',
+    'node',
+    'inline_form_errors',
+  ];
+
+  /**
+   * An editor user with permissions to access the in-place editor.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $editorUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a page node type for testing.
+    NodeType::create(['type' => 'page', 'name' => 'page'])->save();
+
+    // Create a user with the permission to use in-place editing.
+    $permissions = [
+      'access content',
+      'create page content',
+      'edit any page content',
+      'access contextual links',
+      'access in-place editing',
+    ];
+    $this->editorUser = $this->drupalCreateUser($permissions);
+    $this->drupalLogin($this->editorUser);
+  }
+
+  /**
+   * Tests that the inline form errors are not visible for Quick Edit forms.
+   */
+  public function testDisabledInlineFormErrors() {
+    $session = $this->getSession();
+    $web_assert = $this->assertSession();
+
+    // Create a page node.
+    $node = $this->drupalCreateNode();
+
+    // Visit the node page.
+    $this->drupalGet('node/' . $node->id());
+
+    // Wait until the quick edit link is available.
+    $web_assert->waitForElement('css', '.quickedit > a');
+
+    // Activate the quick editing mode.
+    $session->executeScript("jQuery('article.node').find('.quickedit > a').click()");
+
+    $web_assert->waitForElement('css', '.quickedit-toolbar');
+
+    // Clear the title field. Trigger a 'keyup' to be able to save the changes.
+    $session->executeScript("jQuery('.field--name-title').text('').trigger('keyup')");
+
+    // Try to save the changes.
+    $save_button = $web_assert->waitForElement('css', '.action-save.quickedit-button');
+    $save_button->click();
+
+    // Wait until the form submission is complete.
+    $web_assert->assertWaitOnAjaxRequest();
+
+    // Assert that no error summary from Inline Form Errors is shown.
+    $web_assert->elementTextNotContains('css', '.quickedit-validation-errors', '1 error has been found');
+
+    // Assert that the required title error is shown.
+    $web_assert->elementTextContains('css', '.quickedit-validation-errors', 'Title field is required.');
+  }
+
+}
diff --git a/web/core/modules/inline_form_errors/tests/src/Unit/FormErrorHandlerTest.php b/web/core/modules/inline_form_errors/tests/src/Unit/FormErrorHandlerTest.php
index 773b77829..acd255ba2 100644
--- a/web/core/modules/inline_form_errors/tests/src/Unit/FormErrorHandlerTest.php
+++ b/web/core/modules/inline_form_errors/tests/src/Unit/FormErrorHandlerTest.php
@@ -50,25 +50,31 @@ class FormErrorHandlerTest extends UnitTestCase {
 
     $form = [
       '#parents' => [],
+      '#form_id' => 'test_form',
+      '#array_parents' => [],
     ];
     $form['test1'] = [
       '#type' => 'textfield',
       '#title' => 'Test 1',
       '#parents' => ['test1'],
+      '#array_parents' => ['test1'],
       '#id' => 'edit-test1',
     ];
     $form['test2'] = [
       '#type' => 'textfield',
       '#title' => 'Test 2 & a half',
       '#parents' => ['test2'],
+      '#array_parents' => ['test2'],
       '#id' => 'edit-test2',
     ];
     $form['fieldset'] = [
       '#parents' => ['fieldset'],
+      '#array_parents' => ['fieldset'],
       'test3' => [
         '#type' => 'textfield',
         '#title' => 'Test 3',
         '#parents' => ['fieldset', 'test3'],
+        '#array_parents' => ['fieldset', 'test3'],
         '#id' => 'edit-test3',
       ],
     ];
@@ -76,18 +82,21 @@ class FormErrorHandlerTest extends UnitTestCase {
       '#type' => 'textfield',
       '#title' => 'Test 4',
       '#parents' => ['test4'],
+      '#array_parents' => ['test4'],
       '#id' => 'edit-test4',
       '#error_no_message' => TRUE,
     ];
     $form['test5'] = [
       '#type' => 'textfield',
       '#parents' => ['test5'],
+      '#array_parents' => ['test5'],
       '#id' => 'edit-test5',
     ];
     $form['test6'] = [
       '#type' => 'value',
       '#title' => 'Test 6',
       '#parents' => ['test6'],
+      '#array_parents' => ['test6'],
       '#id' => 'edit-test6',
     ];
     $form_state = new FormState();
@@ -114,11 +123,14 @@ class FormErrorHandlerTest extends UnitTestCase {
 
     $form = [
       '#parents' => [],
+      '#form_id' => 'test_form',
+      '#array_parents' => [],
     ];
     $form['test'] = [
       '#type' => 'textfield',
       '#title' => 'Test',
       '#parents' => ['test'],
+      '#array_parents' => ['test'],
       '#id' => 'edit-test',
     ];
     $form_state = new FormState();
@@ -127,4 +139,37 @@ class FormErrorHandlerTest extends UnitTestCase {
     $this->assertSame('invalid', $form['test']['#errors']);
   }
 
+  /**
+   * Test that Quick Edit forms show non-inline errors.
+   *
+   * @covers ::handleFormErrors
+   * @covers ::displayErrorMessages
+   */
+  public function testDisplayErrorMessagesNotInlineQuickEdit() {
+    $form_error_handler = $this->getMockBuilder(FormErrorHandler::class)
+      ->setConstructorArgs([$this->getStringTranslationStub(), $this->getMock(LinkGeneratorInterface::class), $this->getMock(RendererInterface::class)])
+      ->setMethods(['drupalSetMessage'])
+      ->getMock();
+
+    $form_error_handler->expects($this->at(0))
+      ->method('drupalSetMessage')
+      ->with('invalid', 'error');
+
+    $form = [
+      '#parents' => [],
+      '#form_id' => 'quickedit_field_form',
+      '#array_parents' => [],
+    ];
+    $form['test'] = [
+      '#type' => 'textfield',
+      '#title' => 'Test',
+      '#parents' => ['test'],
+      '#id' => 'edit-test',
+      '#array_parents' => ['test']
+    ];
+    $form_state = new FormState();
+    $form_state->setErrorByName('test', 'invalid');
+    $form_error_handler->handleFormErrors($form, $form_state);
+  }
+
 }
diff --git a/web/core/modules/language/language.admin.inc b/web/core/modules/language/language.admin.inc
index b5a8ec6fc..a55e65a23 100644
--- a/web/core/modules/language/language.admin.inc
+++ b/web/core/modules/language/language.admin.inc
@@ -19,33 +19,33 @@ use Drupal\Core\Template\Attribute;
  */
 function template_preprocess_language_negotiation_configure_form(&$variables) {
   $form =& $variables['form'];
-  $variables['language_types'] = array();
+  $variables['language_types'] = [];
 
   foreach ($form['#language_types'] as $type) {
-    $header = array(
+    $header = [
       t('Detection method'),
       t('Description'),
       t('Enabled'),
       t('Weight'),
-    );
+    ];
 
     // If there is at least one operation enabled show the operation column.
     if ($form[$type]['#show_operations']) {
       $header[] = t('Operations');
     }
 
-    $table = array(
+    $table = [
       '#type' => 'table',
       '#header' => $header,
-      '#attributes' => array('id' => 'language-negotiation-methods-' . $type),
-      '#tabledrag' => array(
-        array(
+      '#attributes' => ['id' => 'language-negotiation-methods-' . $type],
+      '#tabledrag' => [
+        [
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'language-method-weight-' . $type,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     foreach ($form[$type]['title'] as $id => $element) {
       // Do not take form control structures.
@@ -53,11 +53,11 @@ function template_preprocess_language_negotiation_configure_form(&$variables) {
         $table[$id]['#attributes']['class'][] = 'draggable';
         $table[$id]['#weight'] = $element['#weight'];
 
-        $table[$id]['title'] = array(
+        $table[$id]['title'] = [
           '#prefix' => '<strong>',
           $form[$type]['title'][$id],
           '#suffix' => '</strong>',
-        );
+        ];
         $table[$id]['description'] = $form[$type]['description'][$id];
         $table[$id]['enabled'] = $form[$type]['enabled'][$id];
         $table[$id]['weight'] = $form[$type]['weight'][$id];
@@ -77,7 +77,7 @@ function template_preprocess_language_negotiation_configure_form(&$variables) {
     $configurable = isset($form[$type]['configurable']) ? $form[$type]['configurable'] : NULL;
     unset($form[$type]['configurable']);
 
-    $variables['language_types'][] = array(
+    $variables['language_types'][] = [
       'type' => $type,
       'title' => $form[$type]['#title'],
       'description' => $form[$type]['#description'],
@@ -85,7 +85,7 @@ function template_preprocess_language_negotiation_configure_form(&$variables) {
       'table' => $table,
       'children' => $form[$type],
       'attributes' => new Attribute(),
-    );
+    ];
     // Prevent the type from rendering with the remaining form child elements.
     unset($form[$type]);
   }
@@ -107,42 +107,42 @@ function template_preprocess_language_content_settings_table(&$variables) {
   // Add a render element representing the bundle language settings table.
   $element = $variables['element'];
 
-  $header = array(
-    array(
+  $header = [
+    [
       'data' => $element['#bundle_label'],
-      'class' => array('bundle'),
-    ),
-    array(
+      'class' => ['bundle'],
+    ],
+    [
       'data' => t('Configuration'),
-      'class' => array('operations'),
-    ),
-  );
+      'class' => ['operations'],
+    ],
+  ];
 
-  $rows = array();
+  $rows = [];
   foreach (Element::children($element) as $bundle) {
-    $rows[$bundle] = array(
-      'data' => array(
-        array(
-          'data' => array(
+    $rows[$bundle] = [
+      'data' => [
+        [
+          'data' => [
             '#prefix' => '<label>',
             '#suffix' => '</label>',
             '#plain_text' => $element[$bundle]['settings']['#label'],
-          ),
-          'class' => array('bundle'),
-        ),
-        array(
+          ],
+          'class' => ['bundle'],
+        ],
+        [
           'data' => $element[$bundle]['settings'],
-          'class' => array('operations'),
-        ),
-      ),
-      'class' => array('bundle-settings'),
-    );
+          'class' => ['operations'],
+        ],
+      ],
+      'class' => ['bundle-settings'],
+    ];
   }
 
   $variables['title'] = $element['#title'];
-  $variables['build'] = array(
+  $variables['build'] = [
     '#header' => $header,
     '#rows' => $rows,
     '#type' => 'table',
-  );
+  ];
 }
diff --git a/web/core/modules/language/language.api.php b/web/core/modules/language/language.api.php
index aaaa5a3dd..ff04a8e71 100644
--- a/web/core/modules/language/language.api.php
+++ b/web/core/modules/language/language.api.php
@@ -35,17 +35,17 @@
  * @ingroup language_negotiation
  */
 function hook_language_types_info() {
-  return array(
-    'custom_language_type' => array(
+  return [
+    'custom_language_type' => [
       'name' => t('Custom language'),
       'description' => t('A custom language type.'),
       'locked' => FALSE,
-    ),
-    'fixed_custom_language_type' => array(
+    ],
+    'fixed_custom_language_type' => [
       'locked' => TRUE,
-      'fixed' => array('custom_language_negotiation_method'),
-    ),
-  );
+      'fixed' => ['custom_language_negotiation_method'],
+    ],
+  ];
 }
 
 /**
diff --git a/web/core/modules/language/language.module b/web/core/modules/language/language.module
index b4612f4a2..8066aa919 100644
--- a/web/core/modules/language/language.module
+++ b/web/core/modules/language/language.module
@@ -29,42 +29,42 @@ function language_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.language':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Language module allows you to configure the languages used on your site, and provides information for the <a href=":content">Content Translation</a>, <a href=":interface">Interface Translation</a>, and <a href=":configuration">Configuration Translation</a> modules, if they are enabled. For more information, see the <a href=":doc_url">online documentation for the Language module</a>.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/language', ':content' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? \Drupal::url('help.page', array('name' => 'content_translation')) : '#', ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#', ':configuration' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? \Drupal::url('help.page', array('name' => 'config_translation')) : '#')) . '</p>';
+      $output .= '<p>' . t('The Language module allows you to configure the languages used on your site, and provides information for the <a href=":content">Content Translation</a>, <a href=":interface">Interface Translation</a>, and <a href=":configuration">Configuration Translation</a> modules, if they are enabled. For more information, see the <a href=":doc_url">online documentation for the Language module</a>.', [':doc_url' => 'https://www.drupal.org/documentation/modules/language', ':content' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? \Drupal::url('help.page', ['name' => 'content_translation']) : '#', ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', ['name' => 'locale']) : '#', ':configuration' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? \Drupal::url('help.page', ['name' => 'config_translation']) : '#']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Adding languages') . '</dt>';
-      $output .= '<dd>' . t('You can add languages on the <a href=":language_list">Languages</a> page by selecting <em>Add language</em> and choosing a language from the drop-down menu. This language is then displayed in the languages list, where it can be configured further. If the <a href=":interface">Interface translation module</a> is enabled, and the <em>translation server</em> is set as a translation source, then the interface translation for this language is automatically downloaded as well.', array(':language_list' => \Drupal::url('entity.configurable_language.collection'), ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('You can add languages on the <a href=":language_list">Languages</a> page by selecting <em>Add language</em> and choosing a language from the drop-down menu. This language is then displayed in the languages list, where it can be configured further. If the <a href=":interface">Interface translation module</a> is enabled, and the <em>translation server</em> is set as a translation source, then the interface translation for this language is automatically downloaded as well.', [':language_list' => \Drupal::url('entity.configurable_language.collection'), ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', ['name' => 'locale']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Adding custom languages') . '</dt>';
       $output .= '<dd>' . t('You can add a language that is not provided in the drop-down list by choosing <em>Custom language</em> at the end of the list. You then have to configure its language code, name, and direction in the form provided.') . '</dd>';
       $output .= '<dt>' . t('Configuring content languages') . '</dt>';
-      $output .= '<dd>' . t('By default, content is created in the site\'s default language and no language selector is displayed on content creation pages. On the <a href=":content_language">Content language</a> page you can customize the language configuration for any supported content entity on your site (for example for content types or menu links). After choosing an entity, you are provided with a drop-down menu to set the default language and a check-box to display language selectors.', array(':content_language' => \Drupal::url('language.content_settings_page'))) . '</dd>';
+      $output .= '<dd>' . t('By default, content is created in the site\'s default language and no language selector is displayed on content creation pages. On the <a href=":content_language">Content language</a> page you can customize the language configuration for any supported content entity on your site (for example for content types or menu links). After choosing an entity, you are provided with a drop-down menu to set the default language and a check-box to display language selectors.', [':content_language' => \Drupal::url('language.content_settings_page')]) . '</dd>';
       $output .= '<dt>' . t('Adding a language switcher block') . '</dt>';
-      $output .= '<dd>' . t('If the Block module is enabled, then you can add a language switcher block on the <a href=":blocks">Block layout</a> page to allow users to switch between languages.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '</dd>';
+      $output .= '<dd>' . t('If the Block module is enabled, then you can add a language switcher block on the <a href=":blocks">Block layout</a> page to allow users to switch between languages.', [':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#']) . '</dd>';
       $output .= '<dt>' . t('Making a block visible per language') . '</dt>';
-      $output .= '<dd>' . t('If the Block module is enabled, then the Language module allows you to set the visibility of a block based on selected languages on the <a href=":blocks">Block layout</a> page.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '</dd>';
+      $output .= '<dd>' . t('If the Block module is enabled, then the Language module allows you to set the visibility of a block based on selected languages on the <a href=":blocks">Block layout</a> page.', [':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#']) . '</dd>';
       $output .= '<dt>' . t('Choosing user languages') . '</dt>';
       $output .= '<dd>' . t('Users can choose a <em>Site language</em> on their profile page. This language is used for email messages, and can be used by modules to determine a user\'s language. It can also be used for interface text, if the <em>User</em> method is enabled as a <em>Detection and selection</em> method (see below). Administrative users can choose a separate <em>Administration pages language</em> for the interface text on administration pages. This configuration is only available on the user\'s profile page if the <em>Account administration pages</em> method is enabled (see below).') . '</dd>';
       $output .= '<dt>' . t('Language detection and selection') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":detection">Detection and selection</a> page provides several methods for deciding which language is used for displaying interface text. When a method detects and selects an interface language, then the following methods in the list are not applied. You can order them by importance, with your preferred method at the top of the list, followed by one or several fall-back methods.', array(':detection' => \Drupal::url('language.negotiation')));
+      $output .= '<dd>' . t('The <a href=":detection">Detection and selection</a> page provides several methods for deciding which language is used for displaying interface text. When a method detects and selects an interface language, then the following methods in the list are not applied. You can order them by importance, with your preferred method at the top of the list, followed by one or several fall-back methods.', [':detection' => \Drupal::url('language.negotiation')]);
       $output .= '<ul><li>' . t('<em>URL</em> sets the interface language based on a path prefix or domain (for example specifying <em>de</em> for German would result in URLs like <em>example.com/de/contact</em>). The default language does not require a path prefix, but can have one assigned as well. If the language detection is done by domain name, a domain needs to be specified for each language.') . '</li>';
       $output .= '<li>' . t('<em>Session</em> determines the interface language from a request or session parameter (for example <em>example.com?language=de</em> would set the interface language to German based on the use of <em>de</em> as the <em>language</em> parameter).') . '</li>';
       $output .= '<li>' . t('<em>User</em> follows the language configuration set on the user\'s profile page.') . '</li>';
-      $output .= '<li>' . t('<em>Browser</em> sets the interface language based on the browser\'s language settings. Since browsers use different language codes to refer to the same languages, you can add and edit languages codes to map the browser language codes to the <a href=":language_list">language codes</a> used on your site.', array(':language_list' => \Drupal::url('entity.configurable_language.collection'))) . '</li>';
+      $output .= '<li>' . t('<em>Browser</em> sets the interface language based on the browser\'s language settings. Since browsers use different language codes to refer to the same languages, you can add and edit languages codes to map the browser language codes to the <a href=":language_list">language codes</a> used on your site.', [':language_list' => \Drupal::url('entity.configurable_language.collection')]) . '</li>';
       $output .= '<li>' . t('<em>Account administration pages</em> follows the configuration set as <em>Administration pages language</em> on the profile page of an administrative user. This method is similar to the <em>User</em> method, but only sets the interface text language on administration pages, independent of the interface text language on other pages.') . '</li>';
       $output .= '<li>' . t('<em>Selected language</em> allows you to specify the site\'s default language or a specific language as the fall-back language. This method should be listed last.') . '</li></ul></dd>';
       $output .= '</dl>';
       return $output;
 
     case 'entity.configurable_language.collection':
-      $output = '<p>' . t('Reorder the configured languages to set their order in the language switcher block and, when editing content, in the list of selectable languages. This ordering does not impact <a href=":detection">detection and selection</a>.', array(':detection' => \Drupal::url('language.negotiation'))) . '</p>';
-      $output .= '<p>' . t('The site default language can also be set. It is not recommended to change the default language on a working site. <a href=":language-detection">Configure the Selected language</a> setting on the detection and selection page to change the fallback language for language selection.', array(':language-detection' => \Drupal::url('language.negotiation'))) . '</p>';
+      $output = '<p>' . t('Reorder the configured languages to set their order in the language switcher block and, when editing content, in the list of selectable languages. This ordering does not impact <a href=":detection">detection and selection</a>.', [':detection' => \Drupal::url('language.negotiation')]) . '</p>';
+      $output .= '<p>' . t('The site default language can also be set. It is not recommended to change the default language on a working site. <a href=":language-detection">Configure the Selected language</a> setting on the detection and selection page to change the fallback language for language selection.', [':language-detection' => \Drupal::url('language.negotiation')]) . '</p>';
       return $output;
 
     case 'language.add':
       return '<p>' . t('Add a language to be supported by your site. If your desired language is not available, pick <em>Custom language...</em> at the end and provide a language code and other details manually.') . '</p>';
 
     case 'language.negotiation':
-      $output = '<p>' . t('Define how to decide which language is used to display page elements (primarily text provided by modules, such as field labels and help text). This decision is made by evaluating a series of detection methods for languages; the first detection method that gets a result will determine which language is used for that type of text. Be aware that some language detection methods are unreliable under certain conditions, such as browser detection when page-caching is enabled and a user is not currently logged in. Define the order of evaluation of language detection methods on this page. The default language can be changed in the <a href=":admin-change-language">list of languages</a>.', array(':admin-change-language' => \Drupal::url('entity.configurable_language.collection'))) . '</p>';
+      $output = '<p>' . t('Define how to decide which language is used to display page elements (primarily text provided by modules, such as field labels and help text). This decision is made by evaluating a series of detection methods for languages; the first detection method that gets a result will determine which language is used for that type of text. Be aware that some language detection methods are unreliable under certain conditions, such as browser detection when page-caching is enabled and a user is not currently logged in. Define the order of evaluation of language detection methods on this page. The default language can be changed in the <a href=":admin-change-language">list of languages</a>.', [':admin-change-language' => \Drupal::url('entity.configurable_language.collection')]) . '</p>';
       return $output;
 
     case 'language.negotiation_session':
@@ -72,11 +72,11 @@ function language_help($route_name, RouteMatchInterface $route_match) {
       return $output;
 
     case 'language.negotiation_browser':
-      $output = '<p>' . t('Browsers use different language codes to refer to the same languages. Internally, a best effort is made to determine the correct language based on the code that the browser sends. You can add and edit additional mappings from browser language codes to <a href=":configure-languages">site languages</a>.', array(':configure-languages' => \Drupal::url('entity.configurable_language.collection'))) . '</p>';
+      $output = '<p>' . t('Browsers use different language codes to refer to the same languages. Internally, a best effort is made to determine the correct language based on the code that the browser sends. You can add and edit additional mappings from browser language codes to <a href=":configure-languages">site languages</a>.', [':configure-languages' => \Drupal::url('entity.configurable_language.collection')]) . '</p>';
       return $output;
 
     case 'language.negotiation_selected':
-      $output = '<p>' . t('Changing the selected language here (and leaving this option as the last among the detection and selection options) is the easiest way to change the fallback language for the website, if you need to change how your site works by default (e.g., when using an empty path prefix or using the default domain). <a href=":admin-change-language">Changing the site\'s default language</a> itself might have other undesired side effects.', array(':admin-change-language' => \Drupal::url('entity.configurable_language.collection'))) . '</p>';
+      $output = '<p>' . t('Changing the selected language here (and leaving this option as the last among the detection and selection options) is the easiest way to change the fallback language for the website, if you need to change how your site works by default (e.g., when using an empty path prefix or using the default domain). <a href=":admin-change-language">Changing the site\'s default language</a> itself might have other undesired side effects.', [':admin-change-language' => \Drupal::url('entity.configurable_language.collection')]) . '</p>';
       return $output;
 
     case 'entity.block.edit_form':
@@ -92,7 +92,7 @@ function language_help($route_name, RouteMatchInterface $route_match) {
       break;
 
     case 'language.content_settings_page':
-      return t('Change language settings for <em>content types</em>, <em>taxonomy vocabularies</em>, <em>user profiles</em>, or any other supported element on your site. By default, language settings hide the language selector and the language is the site\'s default language.');
+      return '<p>' . t("Change language settings for <em>content types</em>, <em>taxonomy vocabularies</em>, <em>user profiles</em>, or any other supported element on your site. By default, language settings hide the language selector and the language is the site's default language.") . '</p>';
   }
 }
 
@@ -100,16 +100,16 @@ function language_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function language_theme() {
-  return array(
-    'language_negotiation_configure_form' => array(
+  return [
+    'language_negotiation_configure_form' => [
       'render element' => 'form',
       'file' => 'language.admin.inc',
-    ),
-    'language_content_settings_table' => array(
+    ],
+    'language_content_settings_table' => [
       'render element' => 'element',
       'file' => 'language.admin.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -123,18 +123,18 @@ function language_element_info_alter(&$type) {
   // field.
   if (isset($type['language_select'])) {
     if (!isset($type['language_select']['#process'])) {
-      $type['language_select']['#process'] = array();
+      $type['language_select']['#process'] = [];
     }
     if (!isset($type['language_select']['#theme_wrappers'])) {
-      $type['language_select']['#theme_wrappers'] = array();
+      $type['language_select']['#theme_wrappers'] = [];
     }
-    $type['language_select']['#process'] = array_merge($type['language_select']['#process'], array(
+    $type['language_select']['#process'] = array_merge($type['language_select']['#process'], [
       'language_process_language_select',
-      array('Drupal\Core\Render\Element\Select', 'processSelect'),
-      array('Drupal\Core\Render\Element\RenderElement', 'processAjaxForm'),
-    ));
+      ['Drupal\Core\Render\Element\Select', 'processSelect'],
+      ['Drupal\Core\Render\Element\RenderElement', 'processAjaxForm'],
+    ]);
     $type['language_select']['#theme'] = 'select';
-    $type['language_select']['#theme_wrappers'] = array_merge($type['language_select']['#theme_wrappers'], array('form_element'));
+    $type['language_select']['#theme_wrappers'] = array_merge($type['language_select']['#theme_wrappers'], ['form_element']);
     $type['language_select']['#languages'] = LanguageInterface::STATE_CONFIGURABLE;
     $type['language_select']['#multiple'] = FALSE;
   }
@@ -146,16 +146,16 @@ function language_element_info_alter(&$type) {
  * @param array $element
  *   The form element to process.
  *
- * @return array $element
+ * @return array
  *   The processed form element.
  */
 function language_process_language_select($element) {
   // Don't set the options if another module (translation for example) already
   // set the options.
   if (!isset($element['#options'])) {
-    $element['#options'] = array();
+    $element['#options'] = [];
     foreach (\Drupal::languageManager()->getLanguages($element['#languages']) as $langcode => $language) {
-      $element['#options'][$langcode] = $language->isLocked() ? t('- @name -', array('@name' => $language->getName())) : $language->getName();
+      $element['#options'][$langcode] = $language->isLocked() ? t('- @name -', ['@name' => $language->getName()]) : $language->getName();
     }
   }
   return $element;
@@ -168,7 +168,7 @@ function language_entity_base_field_info_alter(&$fields) {
   foreach ($fields as $definition) {
     // Set configurable form display for language fields with display options.
     if ($definition->getType() == 'language') {
-      foreach (array('form', 'view') as $type) {
+      foreach (['form', 'view'] as $type) {
         if ($definition->getDisplayOptions($type)) {
           // The related configurations will be purged manually on Language
           // module uninstallation. @see language_modules_uninstalled().
@@ -201,8 +201,8 @@ function language_configuration_element_submit(&$form, FormStateInterface $form_
         }
       }
       $config = ContentLanguageSettings::loadByEntityTypeBundle($entity_type_id, $bundle);
-      $config->setDefaultLangcode($form_state->getValue(array($element_name, 'langcode')));
-      $config->setLanguageAlterable($form_state->getValue(array($element_name, 'language_alterable')));
+      $config->setDefaultLangcode($form_state->getValue([$element_name, 'langcode']));
+      $config->setLanguageAlterable($form_state->getValue([$element_name, 'language_alterable']));
       $config->save();
 
       // Set the form_state languaged with the updated bundle.
@@ -325,7 +325,7 @@ function language_modules_installed($modules) {
     // display definitions to make language fields display configurable. Since
     // this is not a hard dependency, and thus is not detected by the config
     // system, we have to clean up the related values manually.
-    foreach (array('entity_view_display', 'entity_form_display') as $key) {
+    foreach (['entity_view_display', 'entity_form_display'] as $key) {
       $displays = \Drupal::entityManager()->getStorage($key)->loadMultiple();
       /** @var \Drupal\Core\Entity\Display\EntityDisplayInterface $display */
       foreach ($displays as $display) {
@@ -393,7 +393,7 @@ function language_preprocess_block(&$variables) {
 function language_get_browser_drupal_langcode_mappings() {
   $config = \Drupal::config('language.mappings');
   if ($config->isNew()) {
-    return array();
+    return [];
   }
   return $config->get('map');
 }
@@ -462,7 +462,7 @@ function language_tour_tips_alter(array &$tour_tips, EntityInterface $entity) {
     }
     elseif ($tour_tip->get('id') == 'language-continue') {
       $additional_continue = '';
-      $additional_modules = array();
+      $additional_modules = [];
       if (!Drupal::service('module_handler')->moduleExists('locale')) {
         $additional_modules[] = Drupal::service('module_handler')->getName('locale');
       }
diff --git a/web/core/modules/language/language.services.yml b/web/core/modules/language/language.services.yml
index 19d0f21a9..4fda6484c 100644
--- a/web/core/modules/language/language.services.yml
+++ b/web/core/modules/language/language.services.yml
@@ -14,7 +14,7 @@ services:
       - { name: event_subscriber }
   language.config_factory_override:
     class: Drupal\language\Config\LanguageConfigFactoryOverride
-    arguments: ['@config.storage', '@event_dispatcher', '@config.typed']
+    arguments: ['@config.storage', '@event_dispatcher', '@config.typed', '@language.default']
     tags:
       - { name: config.factory.override, priority: -254 }
       - { name: event_subscriber }
diff --git a/web/core/modules/language/src/Config/LanguageConfigFactoryOverride.php b/web/core/modules/language/src/Config/LanguageConfigFactoryOverride.php
index cb4196953..4c60a72a2 100644
--- a/web/core/modules/language/src/Config/LanguageConfigFactoryOverride.php
+++ b/web/core/modules/language/src/Config/LanguageConfigFactoryOverride.php
@@ -68,11 +68,16 @@ class LanguageConfigFactoryOverride extends ConfigFactoryOverrideBase implements
    *   An event dispatcher instance to use for configuration events.
    * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config
    *   The typed configuration manager.
+   * @param \Drupal\Core\Language\LanguageDefault $default_language
+   *   The default language.
    */
-  public function __construct(StorageInterface $storage, EventDispatcherInterface $event_dispatcher, TypedConfigManagerInterface $typed_config) {
+  public function __construct(StorageInterface $storage, EventDispatcherInterface $event_dispatcher, TypedConfigManagerInterface $typed_config, LanguageDefault $default_language) {
     $this->baseStorage = $storage;
     $this->eventDispatcher = $event_dispatcher;
     $this->typedConfigManager = $typed_config;
+    // Prior to negiotiation the override language should be the default
+    // language.
+    $this->language = $default_language->get();
   }
 
   /**
@@ -83,7 +88,7 @@ class LanguageConfigFactoryOverride extends ConfigFactoryOverrideBase implements
       $storage = $this->getStorage($this->language->getId());
       return $storage->readMultiple($names);
     }
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/language/src/Config/LanguageConfigFactoryOverrideInterface.php b/web/core/modules/language/src/Config/LanguageConfigFactoryOverrideInterface.php
index e79e90b06..56dfc4796 100644
--- a/web/core/modules/language/src/Config/LanguageConfigFactoryOverrideInterface.php
+++ b/web/core/modules/language/src/Config/LanguageConfigFactoryOverrideInterface.php
@@ -36,6 +36,10 @@ interface LanguageConfigFactoryOverrideInterface extends ConfigFactoryOverrideIn
    *   The default language.
    *
    * @return $this
+   *
+   * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This
+   *   method has been replaced by injecting the default language into the
+   *   constructor.
    */
   public function setLanguageFromDefault(LanguageDefault $language_default = NULL);
 
diff --git a/web/core/modules/language/src/Config/LanguageConfigOverride.php b/web/core/modules/language/src/Config/LanguageConfigOverride.php
index 15e4fa60c..6effe238f 100644
--- a/web/core/modules/language/src/Config/LanguageConfigOverride.php
+++ b/web/core/modules/language/src/Config/LanguageConfigOverride.php
@@ -71,7 +71,7 @@ class LanguageConfigOverride extends StorableConfigBase {
    * {@inheritdoc}
    */
   public function delete() {
-    $this->data = array();
+    $this->data = [];
     $this->storage->delete($this->name);
     Cache::invalidateTags($this->getCacheTags());
     $this->isNew = TRUE;
diff --git a/web/core/modules/language/src/ConfigurableLanguageManager.php b/web/core/modules/language/src/ConfigurableLanguageManager.php
index 238bd830c..de64c4423 100644
--- a/web/core/modules/language/src/ConfigurableLanguageManager.php
+++ b/web/core/modules/language/src/ConfigurableLanguageManager.php
@@ -168,7 +168,7 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
    */
   protected function loadLanguageTypesConfiguration() {
     if (!$this->languageTypes) {
-      $this->languageTypes = $this->configFactory->get('language.types')->get() ?: array('configurable' => array(), 'all' => parent::getLanguageTypes());
+      $this->languageTypes = $this->configFactory->get('language.types')->get() ?: ['configurable' => [], 'all' => parent::getLanguageTypes()];
     }
     return $this->languageTypes;
   }
@@ -227,7 +227,7 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
         // afterwards. This can happen for instance while parsing negotiation
         // method definitions.
         elseif ($type == LanguageInterface::TYPE_INTERFACE) {
-          return new Language(array('id' => LanguageInterface::LANGCODE_SYSTEM));
+          return new Language(['id' => LanguageInterface::LANGCODE_SYSTEM]);
         }
       }
     }
@@ -241,11 +241,11 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
   public function reset($type = NULL) {
     if (!isset($type)) {
       $this->initialized = FALSE;
-      $this->negotiatedLanguages = array();
-      $this->negotiatedMethods = array();
+      $this->negotiatedLanguages = [];
+      $this->negotiatedMethods = [];
       $this->languageTypes = NULL;
       $this->languageTypesInfo = NULL;
-      $this->languages = array();
+      $this->languages = [];
       if ($this->negotiator) {
         $this->negotiator->reset();
       }
@@ -270,7 +270,7 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
   public function setNegotiator(LanguageNegotiatorInterface $negotiator) {
     $this->negotiator = $negotiator;
     $this->initialized = FALSE;
-    $this->negotiatedLanguages = array();
+    $this->negotiatedLanguages = [];
   }
 
   /**
@@ -292,7 +292,7 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
       // and the configuration entities for languages are not yet fully
       // imported.
       $default = $this->getDefaultLanguage();
-      $languages = array($default->getId() => $default);
+      $languages = [$default->getId() => $default];
       $languages += $this->getDefaultLockedLanguages($default->getWeight());
 
       // Load configurable languages on top of the defaults. Ideally this could
@@ -325,7 +325,7 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
    */
   public function getNativeLanguages() {
     $languages = $this->getLanguages(LanguageInterface::STATE_CONFIGURABLE);
-    $natives = array();
+    $natives = [];
 
     $original_language = $this->getConfigOverrideLanguage();
 
@@ -363,9 +363,9 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
   /**
    * {@inheritdoc}
    */
-  public function getFallbackCandidates(array $context = array()) {
+  public function getFallbackCandidates(array $context = []) {
     if ($this->isMultilingual()) {
-      $candidates = array();
+      $candidates = [];
       if (empty($context['operation']) || $context['operation'] != 'locale_lookup') {
         // If the fallback context is not locale_lookup, initialize the
         // candidates with languages ordered by weight and add
@@ -379,13 +379,13 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
         // The first candidate should always be the desired language if
         // specified.
         if (!empty($context['langcode'])) {
-          $candidates = array($context['langcode'] => $context['langcode']) + $candidates;
+          $candidates = [$context['langcode'] => $context['langcode']] + $candidates;
         }
       }
 
       // Let other modules hook in and add/change candidates.
       $type = 'language_fallback_candidates';
-      $types = array();
+      $types = [];
       if (!empty($context['operation'])) {
         $types[] = $type . '_' . $context['operation'];
       }
@@ -414,8 +414,8 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
 
           if (!empty($result)) {
             // Allow modules to provide translations for specific links.
-            $this->moduleHandler->alter('language_switch_links', $result, $type, $path);
-            $links = (object) array('links' => $result, 'method_id' => $method_id);
+            $this->moduleHandler->alter('language_switch_links', $result, $type, $url);
+            $links = (object) ['links' => $result, 'method_id' => $method_id];
             break;
           }
         }
diff --git a/web/core/modules/language/src/ConfigurableLanguageManagerInterface.php b/web/core/modules/language/src/ConfigurableLanguageManagerInterface.php
index 084ace437..9a864e693 100644
--- a/web/core/modules/language/src/ConfigurableLanguageManagerInterface.php
+++ b/web/core/modules/language/src/ConfigurableLanguageManagerInterface.php
@@ -77,7 +77,7 @@ interface ConfigurableLanguageManagerInterface extends LanguageManagerInterface
    * @param string $langcode
    *   The language code for the override.
    *
-   * @return \Drupal\Core\Config\StorageInterface $storage
+   * @return \Drupal\Core\Config\StorageInterface
    *   A storage object to use for reading and writing the
    *   configuration override.
    */
diff --git a/web/core/modules/language/src/DefaultLanguageItem.php b/web/core/modules/language/src/DefaultLanguageItem.php
index 0e3889050..83deee0da 100644
--- a/web/core/modules/language/src/DefaultLanguageItem.php
+++ b/web/core/modules/language/src/DefaultLanguageItem.php
@@ -29,7 +29,7 @@ class DefaultLanguageItem extends LanguageItem {
       $langcode = $this->getDefaultLangcode($entity);
     }
     // Always notify otherwise default langcode will not be set correctly.
-    $this->setValue(array('value' => $langcode), TRUE);
+    $this->setValue(['value' => $langcode], TRUE);
     return $this;
   }
 
diff --git a/web/core/modules/language/src/Element/LanguageConfiguration.php b/web/core/modules/language/src/Element/LanguageConfiguration.php
index 07796934e..6920b0df0 100644
--- a/web/core/modules/language/src/Element/LanguageConfiguration.php
+++ b/web/core/modules/language/src/Element/LanguageConfiguration.php
@@ -7,7 +7,7 @@ use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Render\Element\FormElement;
 
 /**
- * Provides language element configuration.
+ * Defines an element for language configuration for a single field.
  *
  * @FormElement("language_configuration")
  */
@@ -18,50 +18,50 @@ class LanguageConfiguration extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#tree' => TRUE,
-      '#process' => array(
-        array($class, 'processLanguageConfiguration'),
-      ),
-    );
+      '#process' => [
+        [$class, 'processLanguageConfiguration'],
+      ],
+    ];
   }
 
   /**
    * Process handler for the language_configuration form element.
    */
   public static function processLanguageConfiguration(&$element, FormStateInterface $form_state, &$form) {
-    $options = isset($element['#options']) ? $element['#options'] : array();
+    $options = isset($element['#options']) ? $element['#options'] : [];
     // Avoid validation failure since we are moving the '#options' key in the
     // nested 'language' select element.
     unset($element['#options']);
     /** @var \Drupal\language\Entity\ContentLanguageSettings $default_config */
     $default_config = $element['#default_value'];
-    $element['langcode'] = array(
+    $element['langcode'] = [
       '#type' => 'select',
       '#title' => t('Default language'),
       '#options' => $options + static::getDefaultOptions(),
-      '#description' => t('Explanation of the language options is found on the <a href=":languages_list_page">languages list page</a>.', array(':languages_list_page' => \Drupal::url('entity.configurable_language.collection'))),
+      '#description' => t('Explanation of the language options is found on the <a href=":languages_list_page">languages list page</a>.', [':languages_list_page' => \Drupal::url('entity.configurable_language.collection')]),
       '#default_value' => ($default_config != NULL) ? $default_config->getDefaultLangcode() : LanguageInterface::LANGCODE_SITE_DEFAULT,
-    );
+    ];
 
-    $element['language_alterable'] = array(
+    $element['language_alterable'] = [
       '#type' => 'checkbox',
       '#title' => t('Show language selector on create and edit pages'),
       '#default_value' => ($default_config != NULL) ? $default_config->isLanguageAlterable() : FALSE,
-    );
+    ];
 
     // Add the entity type and bundle information to the form if they are set.
     // They will be used, in the submit handler, to generate the names of the
     // configuration entities that will store the settings and are a way to uniquely
     // identify the entity.
     $language = $form_state->get('language') ?: [];
-    $language += array(
-      $element['#name'] => array(
+    $language += [
+      $element['#name'] => [
         'entity_type' => $element['#entity_information']['entity_type'],
         'bundle' => $element['#entity_information']['bundle'],
-      ),
-    );
+      ],
+    ];
     $form_state->set('language', $language);
 
     // Do not add the submit callback for the language content settings page,
@@ -89,15 +89,15 @@ class LanguageConfiguration extends FormElement {
    *   An array containing the default options.
    */
   protected static function getDefaultOptions() {
-    $language_options = array(
-      LanguageInterface::LANGCODE_SITE_DEFAULT => t("Site's default language (@language)", array('@language' => static::languageManager()->getDefaultLanguage()->getName())),
+    $language_options = [
+      LanguageInterface::LANGCODE_SITE_DEFAULT => t("Site's default language (@language)", ['@language' => static::languageManager()->getDefaultLanguage()->getName()]),
       'current_interface' => t('Interface text language selected for page'),
       'authors_default' => t("Author's preferred language"),
-    );
+    ];
 
     $languages = static::languageManager()->getLanguages(LanguageInterface::STATE_ALL);
     foreach ($languages as $langcode => $language) {
-      $language_options[$langcode] = $language->isLocked() ? t('- @name -', array('@name' => $language->getName())) : $language->getName();
+      $language_options[$langcode] = $language->isLocked() ? t('- @name -', ['@name' => $language->getName()]) : $language->getName();
     }
 
     return $language_options;
diff --git a/web/core/modules/language/src/Entity/ConfigurableLanguage.php b/web/core/modules/language/src/Entity/ConfigurableLanguage.php
index b19c328c8..c277a85bd 100644
--- a/web/core/modules/language/src/Entity/ConfigurableLanguage.php
+++ b/web/core/modules/language/src/Entity/ConfigurableLanguage.php
@@ -246,18 +246,18 @@ class ConfigurableLanguage extends ConfigEntityBase implements ConfigurableLangu
     if (!isset($standard_languages[$langcode])) {
       // Drupal does not know about this language, so we set its values with the
       // best guess. The user will be able to edit afterwards.
-      return static::create(array(
+      return static::create([
         'id' => $langcode,
         'label' => $langcode,
-      ));
+      ]);
     }
     else {
       // A known predefined language, details will be filled in properly.
-      return static::create(array(
+      return static::create([
         'id' => $langcode,
         'label' => $standard_languages[$langcode][0],
         'direction' => isset($standard_languages[$langcode][2]) ? $standard_languages[$langcode][2] : static::DIRECTION_LTR,
-      ));
+      ]);
     }
   }
 
diff --git a/web/core/modules/language/src/EventSubscriber/ConfigSubscriber.php b/web/core/modules/language/src/EventSubscriber/ConfigSubscriber.php
index 4159c377b..e071406d2 100644
--- a/web/core/modules/language/src/EventSubscriber/ConfigSubscriber.php
+++ b/web/core/modules/language/src/EventSubscriber/ConfigSubscriber.php
@@ -140,8 +140,8 @@ class ConfigSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = array('onConfigSave', 0);
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::SAVE][] = ['onConfigSave', 0];
     return $events;
   }
 
diff --git a/web/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php b/web/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
index c805b0fba..37a6048a6 100644
--- a/web/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
+++ b/web/core/modules/language/src/EventSubscriber/LanguageRequestSubscriber.php
@@ -64,16 +64,14 @@ class LanguageRequestSubscriber implements EventSubscriberInterface {
   }
 
   /**
-   * Sets the request on the language manager.
+   * Sets the default language and initializes configuration overrides.
    *
    * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
    *   The Event to process.
    */
   public function onKernelRequestLanguage(GetResponseEvent $event) {
     if ($event->getRequestType() == HttpKernelInterface::MASTER_REQUEST) {
-      $request = $event->getRequest();
       $this->negotiator->setCurrentUser($this->currentUser);
-      $this->negotiator->reset();
       if ($this->languageManager instanceof ConfigurableLanguageManagerInterface) {
         $this->languageManager->setNegotiator($this->negotiator);
         $this->languageManager->setConfigOverrideLanguage($this->languageManager->getCurrentLanguage());
@@ -91,8 +89,8 @@ class LanguageRequestSubscriber implements EventSubscriberInterface {
    * @return array
    *   An array of event listener definitions.
    */
-  static function getSubscribedEvents() {
-    $events[KernelEvents::REQUEST][] = array('onKernelRequestLanguage', 255);
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::REQUEST][] = ['onKernelRequestLanguage', 255];
 
     return $events;
   }
diff --git a/web/core/modules/language/src/Form/ContentLanguageSettingsForm.php b/web/core/modules/language/src/Form/ContentLanguageSettingsForm.php
index b86f7bc5d..38aaffabd 100644
--- a/web/core/modules/language/src/Form/ContentLanguageSettingsForm.php
+++ b/web/core/modules/language/src/Form/ContentLanguageSettingsForm.php
@@ -52,11 +52,11 @@ class ContentLanguageSettingsForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $entity_types = $this->entityManager->getDefinitions();
-    $labels = array();
-    $default = array();
+    $labels = [];
+    $default = [];
 
     $bundles = $this->entityManager->getAllBundleInfo();
-    $language_configuration = array();
+    $language_configuration = [];
     foreach ($entity_types as $entity_type_id => $entity_type) {
       if (!$entity_type instanceof ContentEntityTypeInterface || !$entity_type->hasKey('langcode') || !isset($bundles[$entity_type_id])) {
         continue;
@@ -76,65 +76,65 @@ class ContentLanguageSettingsForm extends FormBase {
 
     asort($labels);
 
-    $form = array(
+    $form = [
       '#labels' => $labels,
-      '#attached' => array(
-        'library' => array(
+      '#attached' => [
+        'library' => [
           'language/drupal.language.admin',
-        ),
-      ),
-      '#attributes' => array(
+        ],
+      ],
+      '#attributes' => [
         'class' => 'language-content-settings-form',
-      ),
-    );
+      ],
+    ];
 
-    $form['entity_types'] = array(
+    $form['entity_types'] = [
       '#title' => $this->t('Custom language settings'),
       '#type' => 'checkboxes',
       '#options' => $labels,
       '#default_value' => $default,
-    );
+    ];
 
-    $form['settings'] = array('#tree' => TRUE);
+    $form['settings'] = ['#tree' => TRUE];
 
     foreach ($labels as $entity_type_id => $label) {
       $entity_type = $entity_types[$entity_type_id];
 
-      $form['settings'][$entity_type_id] = array(
+      $form['settings'][$entity_type_id] = [
         '#title' => $label,
         '#type' => 'container',
         '#entity_type' => $entity_type_id,
         '#theme' => 'language_content_settings_table',
         '#bundle_label' => $entity_type->getBundleLabel() ?: $label,
-        '#states' => array(
-          'visible' => array(
-            ':input[name="entity_types[' . $entity_type_id . ']"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="entity_types[' . $entity_type_id . ']"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
 
       foreach ($bundles[$entity_type_id] as $bundle => $bundle_info) {
-        $form['settings'][$entity_type_id][$bundle]['settings'] = array(
+        $form['settings'][$entity_type_id][$bundle]['settings'] = [
           '#type' => 'item',
           '#label' => $bundle_info['label'],
-          'language' => array(
+          'language' => [
             '#type' => 'language_configuration',
-            '#entity_information' => array(
+            '#entity_information' => [
               'entity_type' => $entity_type_id,
               'bundle' => $bundle,
-            ),
+            ],
             '#default_value' => $language_configuration[$entity_type_id][$bundle],
-          ),
-        );
+          ],
+        ];
       }
     }
 
     $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save configuration'),
       '#button_type' => 'primary',
-    );
+    ];
 
     return $form;
   }
@@ -143,9 +143,13 @@ class ContentLanguageSettingsForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
+    $entity_types = $form_state->getValue('entity_types');
     foreach ($form_state->getValue('settings') as $entity_type => $entity_settings) {
       foreach ($entity_settings as $bundle => $bundle_settings) {
         $config = ContentLanguageSettings::loadByEntityTypeBundle($entity_type, $bundle);
+        if (empty($entity_types[$entity_type])) {
+          $bundle_settings['settings']['language']['language_alterable'] = FALSE;
+        }
         $config->setDefaultLangcode($bundle_settings['settings']['language']['langcode'])
           ->setLanguageAlterable($bundle_settings['settings']['language']['language_alterable'])
           ->save();
diff --git a/web/core/modules/language/src/Form/LanguageAddForm.php b/web/core/modules/language/src/Form/LanguageAddForm.php
index ad5ed61aa..5b9f15c2e 100644
--- a/web/core/modules/language/src/Form/LanguageAddForm.php
+++ b/web/core/modules/language/src/Form/LanguageAddForm.php
@@ -30,50 +30,50 @@ class LanguageAddForm extends LanguageFormBase {
 
     $predefined_languages['custom'] = $this->t('Custom language...');
     $predefined_default = $form_state->getValue('predefined_langcode', key($predefined_languages));
-    $form['predefined_langcode'] = array(
+    $form['predefined_langcode'] = [
       '#type' => 'select',
       '#title' => $this->t('Language name'),
       '#default_value' => $predefined_default,
       '#options' => $predefined_languages,
-    );
-    $form['predefined_submit'] = array(
+    ];
+    $form['predefined_submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Add language'),
       '#name' => 'add_language',
-      '#limit_validation_errors' => array(array('predefined_langcode'), array('predefined_submit')),
-      '#states' => array(
-        'invisible' => array(
-          'select#edit-predefined-langcode' => array('value' => 'custom'),
-        ),
-      ),
-      '#validate' => array('::validatePredefined'),
-      '#submit' => array('::submitForm', '::save'),
+      '#limit_validation_errors' => [['predefined_langcode'], ['predefined_submit']],
+      '#states' => [
+        'invisible' => [
+          'select#edit-predefined-langcode' => ['value' => 'custom'],
+        ],
+      ],
+      '#validate' => ['::validatePredefined'],
+      '#submit' => ['::submitForm', '::save'],
       '#button_type' => 'primary',
-    );
+    ];
 
-    $custom_language_states_conditions = array(
-      'select#edit-predefined-langcode' => array('value' => 'custom'),
-    );
-    $form['custom_language'] = array(
+    $custom_language_states_conditions = [
+      'select#edit-predefined-langcode' => ['value' => 'custom'],
+    ];
+    $form['custom_language'] = [
       '#type' => 'container',
-      '#states' => array(
+      '#states' => [
         'visible' => $custom_language_states_conditions,
-      ),
-    );
+      ],
+    ];
     $this->commonForm($form['custom_language']);
-    $form['custom_language']['langcode']['#states'] = array(
+    $form['custom_language']['langcode']['#states'] = [
       'required' => $custom_language_states_conditions,
-    );
-    $form['custom_language']['label']['#states'] = array(
+    ];
+    $form['custom_language']['label']['#states'] = [
       'required' => $custom_language_states_conditions,
-    );
-    $form['custom_language']['submit'] = array(
+    ];
+    $form['custom_language']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Add custom language'),
       '#name' => 'add_custom_language',
-      '#validate' => array('::validateCustom'),
-      '#submit' => array('::submitForm', '::save'),
-    );
+      '#validate' => ['::validateCustom'],
+      '#submit' => ['::submitForm', '::save'],
+    ];
 
     return $form;
   }
@@ -84,14 +84,14 @@ class LanguageAddForm extends LanguageFormBase {
   public function save(array $form, FormStateInterface $form_state) {
     parent::save($form, $form_state);
 
-    $t_args = array('%language' => $this->entity->label(), '%langcode' => $this->entity->id());
+    $t_args = ['%language' => $this->entity->label(), '%langcode' => $this->entity->id()];
     $this->logger('language')->notice('The %language (%langcode) language has been created.', $t_args);
     drupal_set_message($this->t('The language %language has been created and can now be used.', $t_args));
 
     if ($this->moduleHandler->moduleExists('block')) {
       // Tell the user they have the option to add a language switcher block
       // to their theme so they can switch between the languages.
-      drupal_set_message($this->t('Use one of the language switcher blocks to allow site visitors to switch between languages. You can enable these blocks on the <a href=":block-admin">block administration page</a>.', array(':block-admin' => $this->url('block.admin_display'))));
+      drupal_set_message($this->t('Use one of the language switcher blocks to allow site visitors to switch between languages. You can enable these blocks on the <a href=":block-admin">block administration page</a>.', [':block-admin' => $this->url('block.admin_display')]));
     }
     $form_state->setRedirectUrl($this->entity->urlInfo('collection'));
   }
@@ -101,7 +101,7 @@ class LanguageAddForm extends LanguageFormBase {
    */
   public function actions(array $form, FormStateInterface $form_state) {
     // No actions needed.
-    return array();
+    return [];
   }
 
   /**
@@ -114,7 +114,7 @@ class LanguageAddForm extends LanguageFormBase {
       $this->validateCommon($form['custom_language'], $form_state);
 
       if ($language = $this->languageManager->getLanguage($langcode)) {
-        $form_state->setErrorByName('langcode', $this->t('The language %language (%langcode) already exists.', array('%language' => $language->getName(), '%langcode' => $langcode)));
+        $form_state->setErrorByName('langcode', $this->t('The language %language (%langcode) already exists.', ['%language' => $language->getName(), '%langcode' => $langcode]));
       }
     }
     else {
@@ -132,7 +132,7 @@ class LanguageAddForm extends LanguageFormBase {
     }
     else {
       if ($language = $this->languageManager->getLanguage($langcode)) {
-        $form_state->setErrorByName('predefined_langcode', $this->t('The language %language (%langcode) already exists.', array('%language' => $language->getName(), '%langcode' => $langcode)));
+        $form_state->setErrorByName('predefined_langcode', $this->t('The language %language (%langcode) already exists.', ['%language' => $language->getName(), '%langcode' => $langcode]));
       }
     }
   }
diff --git a/web/core/modules/language/src/Form/LanguageDeleteForm.php b/web/core/modules/language/src/Form/LanguageDeleteForm.php
index d2226e8e1..6113c1fe6 100644
--- a/web/core/modules/language/src/Form/LanguageDeleteForm.php
+++ b/web/core/modules/language/src/Form/LanguageDeleteForm.php
@@ -27,14 +27,14 @@ class LanguageDeleteForm extends EntityDeleteForm {
    * {@inheritdoc}
    */
   protected function getDeletionMessage() {
-    return $this->t('The %language (%langcode) language has been removed.', array('%language' => $this->entity->label(), '%langcode' => $this->entity->id()));
+    return $this->t('The %language (%langcode) language has been removed.', ['%language' => $this->entity->label(), '%langcode' => $this->entity->id()]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function logDeletionMessage() {
-    $this->logger('language')->notice('The %language (%langcode) language has been removed.', array('%language' => $this->entity->label(), '%langcode' => $this->entity->id()));
+    $this->logger('language')->notice('The %language (%langcode) language has been removed.', ['%language' => $this->entity->label(), '%langcode' => $this->entity->id()]);
   }
 
 }
diff --git a/web/core/modules/language/src/Form/LanguageEditForm.php b/web/core/modules/language/src/Form/LanguageEditForm.php
index bb0b7d76d..234994dbb 100644
--- a/web/core/modules/language/src/Form/LanguageEditForm.php
+++ b/web/core/modules/language/src/Form/LanguageEditForm.php
@@ -29,12 +29,12 @@ class LanguageEditForm extends LanguageFormBase {
    * {@inheritdoc}
    */
   public function actions(array $form, FormStateInterface $form_state) {
-    $actions['submit'] = array(
+    $actions['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save language'),
-      '#validate' => array('::validateCommon'),
-      '#submit' => array('::submitForm', '::save'),
-    );
+      '#validate' => ['::validateCommon'],
+      '#submit' => ['::submitForm', '::save'],
+    ];
     return $actions;
   }
 
@@ -44,7 +44,7 @@ class LanguageEditForm extends LanguageFormBase {
   public function save(array $form, FormStateInterface $form_state) {
     parent::save($form, $form_state);
     $form_state->setRedirectUrl($this->entity->urlInfo('collection'));
-    $this->logger('language')->notice('The %language (%langcode) language has been updated.', array('%language' => $this->entity->label(), '%langcode' => $this->entity->id()));
+    $this->logger('language')->notice('The %language (%langcode) language has been updated.', ['%language' => $this->entity->label(), '%langcode' => $this->entity->id()]);
   }
 
 }
diff --git a/web/core/modules/language/src/Form/LanguageFormBase.php b/web/core/modules/language/src/Form/LanguageFormBase.php
index 00771621b..8c8f5fac6 100644
--- a/web/core/modules/language/src/Form/LanguageFormBase.php
+++ b/web/core/modules/language/src/Form/LanguageFormBase.php
@@ -47,45 +47,45 @@ abstract class LanguageFormBase extends EntityForm {
     /* @var $language \Drupal\language\ConfigurableLanguageInterface */
     $language = $this->entity;
     if ($language->getId()) {
-      $form['langcode_view'] = array(
+      $form['langcode_view'] = [
         '#type' => 'item',
         '#title' => $this->t('Language code'),
         '#markup' => $language->id()
-      );
-      $form['langcode'] = array(
+      ];
+      $form['langcode'] = [
         '#type' => 'value',
         '#value' => $language->id()
-      );
+      ];
     }
     else {
-      $form['langcode'] = array(
+      $form['langcode'] = [
         '#type' => 'textfield',
         '#title' => $this->t('Language code'),
         '#maxlength' => 12,
         '#required' => TRUE,
         '#default_value' => '',
         '#disabled' => FALSE,
-        '#description' => $this->t('Use language codes as <a href=":w3ctags">defined by the W3C</a> for interoperability. <em>Examples: "en", "en-gb" and "zh-hant".</em>', array(':w3ctags' => 'http://www.w3.org/International/articles/language-tags/')),
-      );
+        '#description' => $this->t('Use language codes as <a href=":w3ctags">defined by the W3C</a> for interoperability. <em>Examples: "en", "en-gb" and "zh-hant".</em>', [':w3ctags' => 'http://www.w3.org/International/articles/language-tags/']),
+      ];
     }
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Language name'),
       '#maxlength' => 64,
       '#default_value' => $language->label(),
       '#required' => TRUE,
-    );
-    $form['direction'] = array(
+    ];
+    $form['direction'] = [
       '#type' => 'radios',
       '#title' => $this->t('Direction'),
       '#required' => TRUE,
       '#description' => $this->t('Direction that text in this language is presented.'),
       '#default_value' => $language->getDirection(),
-      '#options' => array(
+      '#options' => [
         LanguageInterface::DIRECTION_LTR => $this->t('Left to right'),
         LanguageInterface::DIRECTION_RTL => $this->t('Right to left'),
-      ),
-    );
+      ],
+    ];
 
     return $form;
   }
@@ -96,13 +96,13 @@ abstract class LanguageFormBase extends EntityForm {
   public function validateCommon(array $form, FormStateInterface $form_state) {
     // Ensure sane field values for langcode and name.
     if (!isset($form['langcode_view']) && !preg_match('@^[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*$@', $form_state->getValue('langcode'))) {
-      $form_state->setErrorByName('langcode', $this->t('%field must be a valid language tag as <a href=":url">defined by the W3C</a>.', array(
+      $form_state->setErrorByName('langcode', $this->t('%field must be a valid language tag as <a href=":url">defined by the W3C</a>.', [
         '%field' => $form['langcode']['#title'],
         ':url' => 'http://www.w3.org/International/articles/language-tags/',
-      )));
+      ]));
     }
     if ($form_state->getValue('label') != Html::escape($form_state->getValue('label'))) {
-      $form_state->setErrorByName('label', $this->t('%field cannot contain any markup.', array('%field' => $form['label']['#title'])));
+      $form_state->setErrorByName('label', $this->t('%field cannot contain any markup.', ['%field' => $form['label']['#title']]));
     }
   }
 
diff --git a/web/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php b/web/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
index df5052c08..1a409462f 100644
--- a/web/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
+++ b/web/core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
@@ -32,7 +32,7 @@ class NegotiationBrowserDeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete %browser_langcode?', array('%browser_langcode' => $this->browserLangcode));
+    return $this->t('Are you sure you want to delete %browser_langcode?', ['%browser_langcode' => $this->browserLangcode]);
   }
 
   /**
@@ -68,9 +68,9 @@ class NegotiationBrowserDeleteForm extends ConfirmFormBase {
       ->clear('map.' . $this->browserLangcode)
       ->save();
 
-    $args = array(
+    $args = [
       '%browser' => $this->browserLangcode,
-    );
+    ];
 
     $this->logger('language')->notice('The browser language detection mapping for the %browser browser language code has been deleted.', $args);
 
diff --git a/web/core/modules/language/src/Form/NegotiationBrowserForm.php b/web/core/modules/language/src/Form/NegotiationBrowserForm.php
index dfbdabbeb..5535fe07d 100644
--- a/web/core/modules/language/src/Form/NegotiationBrowserForm.php
+++ b/web/core/modules/language/src/Form/NegotiationBrowserForm.php
@@ -60,12 +60,12 @@ class NegotiationBrowserForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form = array();
+    $form = [];
 
     // Initialize a language list to the ones available, including English.
     $languages = $this->languageManager->getLanguages();
 
-    $existing_languages = array();
+    $existing_languages = [];
     foreach ($languages as $langcode => $language) {
       $existing_languages[$langcode] = $language->getName();
     }
@@ -77,10 +77,10 @@ class NegotiationBrowserForm extends ConfigFormBase {
       $language_options = $this->languageManager->getStandardLanguageListWithoutConfigured();
     }
     else {
-      $language_options = array(
+      $language_options = [
         (string) $this->t('Existing languages') => $existing_languages,
         (string) $this->t('Languages not yet added') => $this->languageManager->getStandardLanguageListWithoutConfigured(),
-      );
+      ];
     }
 
     $form['mappings'] = [
@@ -96,24 +96,24 @@ class NegotiationBrowserForm extends ConfigFormBase {
 
     $mappings = $this->language_get_browser_drupal_langcode_mappings();
     foreach ($mappings as $browser_langcode => $drupal_langcode) {
-      $form['mappings'][$browser_langcode] = array(
-        'browser_langcode' => array(
+      $form['mappings'][$browser_langcode] = [
+        'browser_langcode' => [
           '#title' => $this->t('Browser language code'),
           '#title_display' => 'invisible',
           '#type' => 'textfield',
           '#default_value' => $browser_langcode,
           '#size' => 20,
           '#required' => TRUE,
-        ),
-        'drupal_langcode' => array(
+        ],
+        'drupal_langcode' => [
           '#title' => $this->t('Site language'),
           '#title_display' => 'invisible',
           '#type' => 'select',
           '#options' => $language_options,
           '#default_value' => $drupal_langcode,
           '#required' => TRUE,
-        ),
-      );
+        ],
+      ];
       // Operations column.
       $form['mappings'][$browser_langcode]['operations'] = [
         '#type' => 'operations',
@@ -126,22 +126,22 @@ class NegotiationBrowserForm extends ConfigFormBase {
     }
 
     // Add empty row.
-    $form['new_mapping'] = array(
+    $form['new_mapping'] = [
       '#type' => 'details',
       '#title' => $this->t('Add a new mapping'),
       '#tree' => TRUE,
-    );
-    $form['new_mapping']['browser_langcode'] = array(
+    ];
+    $form['new_mapping']['browser_langcode'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Browser language code'),
-      '#description' => $this->t('Use language codes as <a href=":w3ctags">defined by the W3C</a> for interoperability. <em>Examples: "en", "en-gb" and "zh-hant".</em>', array(':w3ctags' => 'http://www.w3.org/International/articles/language-tags/')),
+      '#description' => $this->t('Use language codes as <a href=":w3ctags">defined by the W3C</a> for interoperability. <em>Examples: "en", "en-gb" and "zh-hant".</em>', [':w3ctags' => 'http://www.w3.org/International/articles/language-tags/']),
       '#size' => 20,
-    );
-    $form['new_mapping']['drupal_langcode'] = array(
+    ];
+    $form['new_mapping']['drupal_langcode'] = [
       '#type' => 'select',
       '#title' => $this->t('Site language'),
       '#options' => $language_options,
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
@@ -151,7 +151,7 @@ class NegotiationBrowserForm extends ConfigFormBase {
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
     // Array to check if all browser language codes are unique.
-    $unique_values = array();
+    $unique_values = [];
 
     // Check all mappings.
     if ($form_state->hasValue('mappings')) {
@@ -207,7 +207,7 @@ class NegotiationBrowserForm extends ConfigFormBase {
   protected function language_get_browser_drupal_langcode_mappings() {
     $config = $this->config('language.mappings');
     if ($config->isNew()) {
-      return array();
+      return [];
     }
     return $config->get('map');
   }
diff --git a/web/core/modules/language/src/Form/NegotiationConfigureForm.php b/web/core/modules/language/src/Form/NegotiationConfigureForm.php
index 41f57a32f..c1333e6a2 100644
--- a/web/core/modules/language/src/Form/NegotiationConfigureForm.php
+++ b/web/core/modules/language/src/Form/NegotiationConfigureForm.php
@@ -124,12 +124,12 @@ class NegotiationConfigureForm extends ConfigFormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $configurable = $this->languageTypes->get('configurable');
 
-    $form = array(
+    $form = [
       '#theme' => 'language_negotiation_configure_form',
       '#language_types_info' => $this->languageManager->getDefinedLanguageTypesInfo(),
       '#language_negotiation_info' => $this->negotiator->getNegotiationMethods(),
-    );
-    $form['#language_types'] = array();
+    ];
+    $form['#language_types'] = [];
 
     foreach ($form['#language_types_info'] as $type => $info) {
       // Show locked language types only if they are configurable.
@@ -142,12 +142,12 @@ class NegotiationConfigureForm extends ConfigFormBase {
       $this->configureFormTable($form, $type);
     }
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#button_type' => 'primary',
       '#value' => $this->t('Save settings'),
-    );
+    ];
 
     return $form;
   }
@@ -159,17 +159,17 @@ class NegotiationConfigureForm extends ConfigFormBase {
     $configurable_types = $form['#language_types'];
 
     $stored_values = $this->languageTypes->get('configurable');
-    $customized = array();
-    $method_weights_type = array();
+    $customized = [];
+    $method_weights_type = [];
 
     foreach ($configurable_types as $type) {
       $customized[$type] = in_array($type, $stored_values);
-      $method_weights = array();
-      $enabled_methods = $form_state->getValue(array($type, 'enabled'));
+      $method_weights = [];
+      $enabled_methods = $form_state->getValue([$type, 'enabled']);
       $enabled_methods[LanguageNegotiationSelected::METHOD_ID] = TRUE;
-      $method_weights_input = $form_state->getValue(array($type, 'weight'));
-      if ($form_state->hasValue(array($type, 'configurable'))) {
-        $customized[$type] = !$form_state->isValueEmpty(array($type, 'configurable'));
+      $method_weights_input = $form_state->getValue([$type, 'weight']);
+      if ($form_state->hasValue([$type, 'configurable'])) {
+        $customized[$type] = !$form_state->isValueEmpty([$type, 'configurable']);
       }
 
       foreach ($method_weights_input as $method_id => $weight) {
@@ -216,33 +216,33 @@ class NegotiationConfigureForm extends ConfigFormBase {
   protected function configureFormTable(array &$form, $type)  {
     $info = $form['#language_types_info'][$type];
 
-    $table_form = array(
-      '#title' => $this->t('@type language detection', array('@type' => $info['name'])),
+    $table_form = [
+      '#title' => $this->t('@type language detection', ['@type' => $info['name']]),
       '#tree' => TRUE,
       '#description' => $info['description'],
-      '#language_negotiation_info' => array(),
+      '#language_negotiation_info' => [],
       '#show_operations' => FALSE,
-      'weight' => array('#tree' => TRUE),
-    );
+      'weight' => ['#tree' => TRUE],
+    ];
     // Only show configurability checkbox for the unlocked language types.
     if (empty($info['locked'])) {
       $configurable = $this->languageTypes->get('configurable');
-      $table_form['configurable'] = array(
+      $table_form['configurable'] = [
         '#type' => 'checkbox',
-        '#title' => $this->t('Customize %language_name language detection to differ from Interface text language detection settings', array('%language_name' => $info['name'])),
+        '#title' => $this->t('Customize %language_name language detection to differ from Interface text language detection settings', ['%language_name' => $info['name']]),
         '#default_value' => in_array($type, $configurable),
-        '#attributes' => array('class' => array('language-customization-checkbox')),
-        '#attached' => array(
-          'library' => array(
+        '#attributes' => ['class' => ['language-customization-checkbox']],
+        '#attached' => [
+          'library' => [
             'language/drupal.language.admin'
-          ),
-        ),
-      );
+          ],
+        ],
+      ];
     }
 
     $negotiation_info = $form['#language_negotiation_info'];
-    $enabled_methods = $this->languageTypes->get('negotiation.' . $type . '.enabled') ?: array();
-    $methods_weight = $this->languageTypes->get('negotiation.' . $type . '.method_weights') ?: array();
+    $enabled_methods = $this->languageTypes->get('negotiation.' . $type . '.enabled') ?: [];
+    $methods_weight = $this->languageTypes->get('negotiation.' . $type . '.method_weights') ?: [];
 
     // Add missing data to the methods lists.
     foreach ($negotiation_info as $method_id => $method) {
@@ -272,44 +272,44 @@ class NegotiationConfigureForm extends ConfigFormBase {
         $table_form['#language_negotiation_info'][$method_id] = $method;
         $method_name = $method['name'];
 
-        $table_form['weight'][$method_id] = array(
+        $table_form['weight'][$method_id] = [
           '#type' => 'weight',
-          '#title' => $this->t('Weight for @title language detection method', array('@title' => Unicode::strtolower($method_name))),
+          '#title' => $this->t('Weight for @title language detection method', ['@title' => Unicode::strtolower($method_name)]),
           '#title_display' => 'invisible',
           '#default_value' => $weight,
-          '#attributes' => array('class' => array("language-method-weight-$type")),
+          '#attributes' => ['class' => ["language-method-weight-$type"]],
           '#delta' => 20,
-        );
+        ];
 
-        $table_form['title'][$method_id] = array('#plain_text' => $method_name);
+        $table_form['title'][$method_id] = ['#plain_text' => $method_name];
 
-        $table_form['enabled'][$method_id] = array(
+        $table_form['enabled'][$method_id] = [
           '#type' => 'checkbox',
-          '#title' => $this->t('Enable @title language detection method', array('@title' => Unicode::strtolower($method_name))),
+          '#title' => $this->t('Enable @title language detection method', ['@title' => Unicode::strtolower($method_name)]),
           '#title_display' => 'invisible',
           '#default_value' => $enabled,
-        );
+        ];
         if ($method_id === LanguageNegotiationSelected::METHOD_ID) {
           $table_form['enabled'][$method_id]['#default_value'] = TRUE;
-          $table_form['enabled'][$method_id]['#attributes'] = array('disabled' => 'disabled');
+          $table_form['enabled'][$method_id]['#attributes'] = ['disabled' => 'disabled'];
         }
 
-        $table_form['description'][$method_id] = array('#markup' => $method['description']);
+        $table_form['description'][$method_id] = ['#markup' => $method['description']];
 
-        $config_op = array();
+        $config_op = [];
         if (isset($method['config_route_name'])) {
-          $config_op['configure'] = array(
+          $config_op['configure'] = [
             'title' => $this->t('Configure'),
             'url' => Url::fromRoute($method['config_route_name']),
-          );
+          ];
           // If there is at least one operation enabled show the operation
           // column.
           $table_form['#show_operations'] = TRUE;
         }
-        $table_form['operation'][$method_id] = array(
+        $table_form['operation'][$method_id] = [
          '#type' => 'operations',
          '#links' => $config_op,
-        );
+        ];
       }
     }
     $form[$type] = $table_form;
@@ -324,7 +324,7 @@ class NegotiationConfigureForm extends ConfigFormBase {
    */
   protected function disableLanguageSwitcher(array $language_types) {
     $theme = $this->themeHandler->getDefault();
-    $blocks = $this->blockStorage->loadByProperties(array('theme' => $theme));
+    $blocks = $this->blockStorage->loadByProperties(['theme' => $theme]);
     foreach ($language_types as $language_type) {
       foreach ($blocks as $block) {
         if ($block->getPluginId() == 'language_block:' . $language_type) {
diff --git a/web/core/modules/language/src/Form/NegotiationSelectedForm.php b/web/core/modules/language/src/Form/NegotiationSelectedForm.php
index bba40ee87..d4f119186 100644
--- a/web/core/modules/language/src/Form/NegotiationSelectedForm.php
+++ b/web/core/modules/language/src/Form/NegotiationSelectedForm.php
@@ -30,12 +30,12 @@ class NegotiationSelectedForm extends ConfigFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $config = $this->config('language.negotiation');
-    $form['selected_langcode'] = array(
+    $form['selected_langcode'] = [
       '#type' => 'language_select',
       '#title' => $this->t('Language'),
       '#languages' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_SITE_DEFAULT,
       '#default_value' => $config->get('selected_langcode'),
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/language/src/Form/NegotiationSessionForm.php b/web/core/modules/language/src/Form/NegotiationSessionForm.php
index 2e9447271..b7ec4508f 100644
--- a/web/core/modules/language/src/Form/NegotiationSessionForm.php
+++ b/web/core/modules/language/src/Form/NegotiationSessionForm.php
@@ -29,12 +29,12 @@ class NegotiationSessionForm extends ConfigFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $config = $this->config('language.negotiation');
-    $form['language_negotiation_session_param'] = array(
+    $form['language_negotiation_session_param'] = [
       '#title' => $this->t('Request/session parameter'),
       '#type' => 'textfield',
       '#default_value' => $config->get('session.parameter'),
       '#description' => $this->t('Name of the request/session parameter used to determine the desired language.'),
-    );
+    ];
 
     $form_state->setRedirect('language.negotiation');
 
diff --git a/web/core/modules/language/src/Form/NegotiationUrlForm.php b/web/core/modules/language/src/Form/NegotiationUrlForm.php
index d5ad8639e..6f44f6020 100644
--- a/web/core/modules/language/src/Form/NegotiationUrlForm.php
+++ b/web/core/modules/language/src/Form/NegotiationUrlForm.php
@@ -66,63 +66,63 @@ class NegotiationUrlForm extends ConfigFormBase {
     global $base_url;
     $config = $this->config('language.negotiation');
 
-    $form['language_negotiation_url_part'] = array(
+    $form['language_negotiation_url_part'] = [
       '#title' => $this->t('Part of the URL that determines language'),
       '#type' => 'radios',
-      '#options' => array(
+      '#options' => [
         LanguageNegotiationUrl::CONFIG_PATH_PREFIX => $this->t('Path prefix'),
         LanguageNegotiationUrl::CONFIG_DOMAIN => $this->t('Domain'),
-      ),
+      ],
       '#default_value' => $config->get('url.source'),
-    );
+    ];
 
-    $form['prefix'] = array(
+    $form['prefix'] = [
       '#type' => 'details',
       '#tree' => TRUE,
       '#title' => $this->t('Path prefix configuration'),
       '#open' => TRUE,
       '#description' => $this->t('Language codes or other custom text to use as a path prefix for URL language detection. For the selected fallback language, this value may be left blank. <strong>Modifying this value may break existing URLs. Use with caution in a production environment.</strong> Example: Specifying "deutsch" as the path prefix code for German results in URLs like "example.com/deutsch/contact".'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="language_negotiation_url_part"]' => array(
+      '#states' => [
+        'visible' => [
+          ':input[name="language_negotiation_url_part"]' => [
             'value' => (string) LanguageNegotiationUrl::CONFIG_PATH_PREFIX,
-          ),
-        ),
-      ),
-    );
-    $form['domain'] = array(
+          ],
+        ],
+      ],
+    ];
+    $form['domain'] = [
       '#type' => 'details',
       '#tree' => TRUE,
       '#title' => $this->t('Domain configuration'),
       '#open' => TRUE,
       '#description' => $this->t('The domain names to use for these languages. <strong>Modifying this value may break existing URLs. Use with caution in a production environment.</strong> Example: Specifying "de.example.com" as language domain for German will result in a URL like "http://de.example.com/contact".'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="language_negotiation_url_part"]' => array(
+      '#states' => [
+        'visible' => [
+          ':input[name="language_negotiation_url_part"]' => [
             'value' => (string) LanguageNegotiationUrl::CONFIG_DOMAIN,
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
 
     $languages = $this->languageManager->getLanguages();
     $prefixes = $config->get('url.prefixes');
     $domains = $config->get('url.domains');
     foreach ($languages as $langcode => $language) {
-      $t_args = array('%language' => $language->getName(), '%langcode' => $language->getId());
-      $form['prefix'][$langcode] = array(
+      $t_args = ['%language' => $language->getName(), '%langcode' => $language->getId()];
+      $form['prefix'][$langcode] = [
         '#type' => 'textfield',
         '#title' => $language->isDefault() ? $this->t('%language (%langcode) path prefix (Default language)', $t_args) : $this->t('%language (%langcode) path prefix', $t_args),
         '#maxlength' => 64,
         '#default_value' => isset($prefixes[$langcode]) ? $prefixes[$langcode] : '',
         '#field_prefix' => $base_url . '/',
-      );
-      $form['domain'][$langcode] = array(
+      ];
+      $form['domain'][$langcode] = [
         '#type' => 'textfield',
-        '#title' => $this->t('%language (%langcode) domain', array('%language' => $language->getName(), '%langcode' => $language->getId())),
+        '#title' => $this->t('%language (%langcode) domain', ['%language' => $language->getName(), '%langcode' => $language->getId()]),
         '#maxlength' => 128,
         '#default_value' => isset($domains[$langcode]) ? $domains[$langcode] : '',
-      );
+      ];
     }
 
     $form_state->setRedirect('language.negotiation');
@@ -143,7 +143,7 @@ class NegotiationUrlForm extends ConfigFormBase {
       $default_langcode = $this->languageManager->getDefaultLanguage()->getId();
     }
     foreach ($languages as $langcode => $language) {
-      $value = $form_state->getValue(array('prefix', $langcode));
+      $value = $form_state->getValue(['prefix', $langcode]);
       if ($value === '') {
         if (!($default_langcode == $langcode) && $form_state->getValue('language_negotiation_url_part') == LanguageNegotiationUrl::CONFIG_PATH_PREFIX) {
           // Throw a form error if the prefix is blank for a non-default language,
@@ -161,35 +161,35 @@ class NegotiationUrlForm extends ConfigFormBase {
       elseif (isset($count[$value]) && $count[$value] > 1) {
         // Throw a form error if there are two languages with the same
         // domain/prefix.
-        $form_state->setErrorByName("prefix][$langcode", $this->t('The prefix for %language, %value, is not unique.', array('%language' => $language->getName(), '%value' => $value)));
+        $form_state->setErrorByName("prefix][$langcode", $this->t('The prefix for %language, %value, is not unique.', ['%language' => $language->getName(), '%value' => $value]));
       }
     }
 
     // Count repeated values for uniqueness check.
     $count = array_count_values($form_state->getValue('domain'));
     foreach ($languages as $langcode => $language) {
-      $value = $form_state->getValue(array('domain', $langcode));
+      $value = $form_state->getValue(['domain', $langcode]);
 
       if ($value === '') {
         if ($form_state->getValue('language_negotiation_url_part') == LanguageNegotiationUrl::CONFIG_DOMAIN) {
           // Throw a form error if the domain is blank for a non-default language,
           // although it is required for selected negotiation type.
-          $form_state->setErrorByName("domain][$langcode", $this->t('The domain may not be left blank for %language.', array('%language' => $language->getName())));
+          $form_state->setErrorByName("domain][$langcode", $this->t('The domain may not be left blank for %language.', ['%language' => $language->getName()]));
         }
       }
       elseif (isset($count[$value]) && $count[$value] > 1) {
         // Throw a form error if there are two languages with the same
         // domain/domain.
-        $form_state->setErrorByName("domain][$langcode", $this->t('The domain for %language, %value, is not unique.', array('%language' => $language->getName(), '%value' => $value)));
+        $form_state->setErrorByName("domain][$langcode", $this->t('The domain for %language, %value, is not unique.', ['%language' => $language->getName(), '%value' => $value]));
       }
     }
 
     // Domain names should not contain protocol and/or ports.
     foreach ($languages as $langcode => $language) {
-      $value = $form_state->getValue(array('domain', $langcode));
+      $value = $form_state->getValue(['domain', $langcode]);
       if (!empty($value)) {
         // Ensure we have exactly one protocol when checking the hostname.
-        $host = 'http://' . str_replace(array('http://', 'https://'), '', $value);
+        $host = 'http://' . str_replace(['http://', 'https://'], '', $value);
         if (parse_url($host, PHP_URL_HOST) != $value) {
           $form_state->setErrorByName("domain][$langcode", $this->t('The domain for %language may only contain the domain name, not a trailing slash, protocol and/or port.', ['%language' => $language->getName()]));
         }
diff --git a/web/core/modules/language/src/HttpKernel/PathProcessorLanguage.php b/web/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
index 2e91305e9..c4af20c71 100644
--- a/web/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
+++ b/web/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
@@ -102,7 +102,7 @@ class PathProcessorLanguage implements InboundPathProcessorInterface, OutboundPa
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     if (!isset($this->multilingual)) {
       $this->multilingual = $this->languageManager->isMultilingual();
     }
@@ -131,7 +131,7 @@ class PathProcessorLanguage implements InboundPathProcessorInterface, OutboundPa
    */
   protected function initProcessors($scope) {
     $interface = '\Drupal\Core\PathProcessor\\' . Unicode::ucfirst($scope) . 'PathProcessorInterface';
-    $this->processors[$scope] = array();
+    $this->processors[$scope] = [];
     $weights = [];
     foreach ($this->languageManager->getLanguageTypes() as $type) {
       foreach ($this->negotiator->getNegotiationMethods($type) as $method_id => $method) {
@@ -174,7 +174,7 @@ class PathProcessorLanguage implements InboundPathProcessorInterface, OutboundPa
    * Resets the collected processors instances.
    */
   public function reset() {
-    $this->processors = array();
+    $this->processors = [];
   }
 
 }
diff --git a/web/core/modules/language/src/LanguageAccessControlHandler.php b/web/core/modules/language/src/LanguageAccessControlHandler.php
index 5fd1f728c..0a4fb9892 100644
--- a/web/core/modules/language/src/LanguageAccessControlHandler.php
+++ b/web/core/modules/language/src/LanguageAccessControlHandler.php
@@ -19,6 +19,9 @@ class LanguageAccessControlHandler extends EntityAccessControlHandler {
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     switch ($operation) {
+      case 'view':
+        return parent::checkAccess($entity, $operation, $account);
+
       case 'update':
         /* @var \Drupal\Core\Language\LanguageInterface $entity */
         return AccessResult::allowedIf(!$entity->isLocked())->addCacheableDependency($entity)
diff --git a/web/core/modules/language/src/LanguageListBuilder.php b/web/core/modules/language/src/LanguageListBuilder.php
index 5d69f1ff9..8d1515220 100644
--- a/web/core/modules/language/src/LanguageListBuilder.php
+++ b/web/core/modules/language/src/LanguageListBuilder.php
@@ -71,11 +71,11 @@ class LanguageListBuilder extends DraggableListBuilder {
    * {@inheritdoc}
    */
   public function load() {
-    $entities = $this->storage->loadByProperties(array('locked' => FALSE));
+    $entities = $this->storage->loadByProperties(['locked' => FALSE]);
 
     // Sort the entities using the entity class's sort() method.
     // See \Drupal\Core\Config\Entity\ConfigEntityBase::sort().
-    uasort($entities, array($this->entityType->getClass(), 'sort'));
+    uasort($entities, [$this->entityType->getClass(), 'sort']);
     return $entities;
   }
 
@@ -90,10 +90,10 @@ class LanguageListBuilder extends DraggableListBuilder {
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header = array(
+    $header = [
         'label' => t('Name'),
         'default' => t('Default'),
-      ) + parent::buildHeader();
+      ] + parent::buildHeader();
     return $header;
   }
 
@@ -102,14 +102,14 @@ class LanguageListBuilder extends DraggableListBuilder {
    */
   public function buildRow(EntityInterface $entity) {
     $row['label'] = $entity->label();
-    $row['default'] = array(
+    $row['default'] = [
       '#type' => 'radio',
-      '#parents' => array('site_default_language'),
-      '#title' => t('Set @title as default', array('@title' => $entity->label())),
+      '#parents' => ['site_default_language'],
+      '#title' => t('Set @title as default', ['@title' => $entity->label()]),
       '#title_display' => 'invisible',
       '#return_value' => $entity->id(),
       '#id' => 'edit-site-default-language-' . $entity->id(),
-    );
+    ];
     // Mark the right language as default in the form.
     if ($entity->id() == $this->languageManager->getDefaultLanguage()->getId()) {
       $row['default']['#default_value'] = $entity->id();
@@ -157,7 +157,7 @@ class LanguageListBuilder extends DraggableListBuilder {
     drupal_set_message(t('Configuration saved.'));
     // Force the redirection to the page with the language we have just
     // selected as default.
-    $form_state->setRedirectUrl($this->entities[$new_id]->urlInfo('collection', array('language' => $this->entities[$new_id])));
+    $form_state->setRedirectUrl($this->entities[$new_id]->urlInfo('collection', ['language' => $this->entities[$new_id]]));
   }
 
 }
diff --git a/web/core/modules/language/src/LanguageNegotiator.php b/web/core/modules/language/src/LanguageNegotiator.php
index 2ae903297..db558992a 100644
--- a/web/core/modules/language/src/LanguageNegotiator.php
+++ b/web/core/modules/language/src/LanguageNegotiator.php
@@ -68,7 +68,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
    *
    * @var \Drupal\Core\Language\LanguageInterface[]
    */
-  protected $negotiatedLanguages = array();
+  protected $negotiatedLanguages = [];
 
   /**
    * Constructs a new LanguageNegotiator object.
@@ -105,8 +105,8 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
    * {@inheritdoc}
    */
   public function reset() {
-    $this->negotiatedLanguages = array();
-    $this->methods = array();
+    $this->negotiatedLanguages = [];
+    $this->methods = [];
   }
 
   /**
@@ -150,7 +150,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
       $method_id = static::METHOD_ID;
     }
 
-    return array($method_id => $language);
+    return [$method_id => $language];
   }
 
   /**
@@ -163,7 +163,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
    *   An array of enabled detection methods for the provided language type.
    */
   protected function getEnabledNegotiators($type) {
-    return $this->configFactory->get('language.types')->get('negotiation.' . $type . '.enabled') ?: array();
+    return $this->configFactory->get('language.types')->get('negotiation.' . $type . '.enabled') ?: [];
   }
 
   /**
@@ -207,7 +207,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
    */
   public function getNegotiationMethodInstance($method_id) {
     if (!isset($this->methods[$method_id])) {
-      $instance = $this->negotiatorManager->createInstance($method_id, array());
+      $instance = $this->negotiatorManager->createInstance($method_id, []);
       $instance->setLanguageManager($this->languageManager);
       $instance->setConfig($this->configFactory);
       $instance->setCurrentUser($this->currentUser);
@@ -229,7 +229,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
    */
   public function isNegotiationMethodEnabled($method_id, $type = NULL) {
     $enabled = FALSE;
-    $language_types = !empty($type) ? array($type) : $this->languageManager->getLanguageTypes();
+    $language_types = !empty($type) ? [$type] : $this->languageManager->getLanguageTypes();
 
     foreach ($language_types as $type) {
       $enabled_methods = $this->getEnabledNegotiators($type);
@@ -245,7 +245,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
   /**
    * {@inheritdoc}
    */
-  function saveConfiguration($type, $enabled_methods) {
+  public function saveConfiguration($type, $enabled_methods) {
     // As configurable language types might have changed, we reset the cache.
     $this->languageManager->reset();
     $definitions = $this->getNegotiationMethods();
@@ -274,7 +274,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
   /**
    * {@inheritdoc}
    */
-  function purgeConfiguration() {
+  public function purgeConfiguration() {
     // Ensure that we are getting the defined language negotiation information.
     // An invocation of \Drupal\Core\Extension\ModuleInstaller::install() or
     // \Drupal\Core\Extension\ModuleInstaller::uninstall() could invalidate the
@@ -289,7 +289,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
   /**
    * {@inheritdoc}
    */
-  function updateConfiguration(array $types) {
+  public function updateConfiguration(array $types) {
     // Ensure that we are getting the defined language negotiation information.
     // An invocation of \Drupal\Core\Extension\ModuleInstaller::install() or
     // \Drupal\Core\Extension\ModuleInstaller::uninstall() could invalidate the
@@ -297,7 +297,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
     $this->negotiatorManager->clearCachedDefinitions();
     $this->languageManager->reset();
 
-    $language_types = array();
+    $language_types = [];
     $language_types_info = $this->languageManager->getDefinedLanguageTypesInfo();
     $method_definitions = $this->getNegotiationMethods();
 
@@ -316,7 +316,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
           // default language negotiation settings, we use the values
           // negotiated for the interface language which, should always be
           // available.
-          $method_weights = array(LanguageNegotiationUI::METHOD_ID);
+          $method_weights = [LanguageNegotiationUI::METHOD_ID];
           $method_weights = array_flip($method_weights);
           $this->saveConfiguration($type, $method_weights);
         }
@@ -330,7 +330,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
         // If the language type is locked we can just store its default language
         // negotiation settings if it has some, since it is not configurable.
         if ($has_default_settings) {
-          $method_weights = array();
+          $method_weights = [];
           // Default settings are in $info['fixed'].
 
           foreach ($info['fixed'] as $weight => $method_id) {
@@ -351,10 +351,10 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
     }
 
     // Store the language type configuration.
-    $config = array(
+    $config = [
       'configurable' => array_keys(array_filter($language_types)),
       'all' => array_keys($language_types),
-    );
+    ];
     $this->languageManager->saveLanguageTypesConfiguration($config);
   }
 
diff --git a/web/core/modules/language/src/LanguageNegotiatorInterface.php b/web/core/modules/language/src/LanguageNegotiatorInterface.php
index 27921696c..71f44b51b 100644
--- a/web/core/modules/language/src/LanguageNegotiatorInterface.php
+++ b/web/core/modules/language/src/LanguageNegotiatorInterface.php
@@ -187,12 +187,12 @@ interface LanguageNegotiatorInterface {
    * @param int[] $enabled_methods
    *   An array of language negotiation method weights keyed by method ID.
    */
-  function saveConfiguration($type, $enabled_methods);
+  public function saveConfiguration($type, $enabled_methods);
 
   /**
    * Resave the configuration to purge missing negotiation methods.
    */
-  function purgeConfiguration();
+  public function purgeConfiguration();
 
   /**
    * Updates the configuration based on the given language types.
@@ -204,6 +204,6 @@ interface LanguageNegotiatorInterface {
    * @param string[] $types
    *   An array of configurable language types.
    */
-  function updateConfiguration(array $types);
+  public function updateConfiguration(array $types);
 
 }
diff --git a/web/core/modules/language/src/LanguageServiceProvider.php b/web/core/modules/language/src/LanguageServiceProvider.php
index cb4ad8823..4060f75d3 100644
--- a/web/core/modules/language/src/LanguageServiceProvider.php
+++ b/web/core/modules/language/src/LanguageServiceProvider.php
@@ -29,8 +29,8 @@ class LanguageServiceProvider extends ServiceProviderBase {
         ->addArgument(new Reference('current_user'));
 
       $container->register('path_processor_language', 'Drupal\language\HttpKernel\PathProcessorLanguage')
-        ->addTag('path_processor_inbound', array('priority' => 300))
-        ->addTag('path_processor_outbound', array('priority' => 100))
+        ->addTag('path_processor_inbound', ['priority' => 300])
+        ->addTag('path_processor_outbound', ['priority' => 100])
         ->addArgument(new Reference('config.factory'))
         ->addArgument(new Reference('language_manager'))
         ->addArgument(new Reference('language_negotiator'))
@@ -54,13 +54,6 @@ class LanguageServiceProvider extends ServiceProviderBase {
       $container->setParameter('language.default_values', $default_language_values);
     }
 
-    // For monolingual sites, we explicitly set the default language for the
-    // language config override service as there is no language negotiation.
-    if (!$this->isMultilingual()) {
-      $container->getDefinition('language.config_factory_override')
-        ->addMethodCall('setLanguageFromDefault', array(new Reference('language.default')));
-    }
-
   }
 
   /**
diff --git a/web/core/modules/language/src/Plugin/Block/LanguageBlock.php b/web/core/modules/language/src/Plugin/Block/LanguageBlock.php
index 5c58ac00a..8e7ee918d 100644
--- a/web/core/modules/language/src/Plugin/Block/LanguageBlock.php
+++ b/web/core/modules/language/src/Plugin/Block/LanguageBlock.php
@@ -84,22 +84,22 @@ class LanguageBlock extends BlockBase implements ContainerFactoryPluginInterface
    * {@inheritdoc}
    */
   public function build() {
-    $build = array();
+    $build = [];
     $route_name = $this->pathMatcher->isFrontPage() ? '<front>' : '<current>';
     $type = $this->getDerivativeId();
     $links = $this->languageManager->getLanguageSwitchLinks($type, Url::fromRoute($route_name));
 
     if (isset($links->links)) {
-      $build = array(
+      $build = [
         '#theme' => 'links__language_block',
         '#links' => $links->links,
-        '#attributes' => array(
-          'class' => array(
+        '#attributes' => [
+          'class' => [
             "language-switcher-{$links->method_id}",
-          ),
-        ),
+          ],
+        ],
         '#set_active_class' => TRUE,
-      );
+      ];
     }
     return $build;
   }
diff --git a/web/core/modules/language/src/Plugin/Condition/Language.php b/web/core/modules/language/src/Plugin/Condition/Language.php
index d1f3c95ce..a5b3d41e8 100644
--- a/web/core/modules/language/src/Plugin/Condition/Language.php
+++ b/web/core/modules/language/src/Plugin/Condition/Language.php
@@ -68,23 +68,23 @@ class Language extends ConditionPluginBase implements ContainerFactoryPluginInte
     if ($this->languageManager->isMultilingual()) {
       // Fetch languages.
       $languages = $this->languageManager->getLanguages();
-      $langcodes_options = array();
+      $langcodes_options = [];
       foreach ($languages as $language) {
         $langcodes_options[$language->getId()] = $language->getName();
       }
-      $form['langcodes'] = array(
+      $form['langcodes'] = [
         '#type' => 'checkboxes',
         '#title' => $this->t('Language selection'),
         '#default_value' => $this->configuration['langcodes'],
         '#options' => $langcodes_options,
         '#description' => $this->t('Select languages to enforce. If none are selected, all languages will be allowed.'),
-      );
+      ];
     }
     else {
-      $form['langcodes'] = array(
+      $form['langcodes'] = [
         '#type' => 'value',
         '#default_value' => $this->configuration['langcodes'],
-      );
+      ];
     }
     return parent::buildConfigurationForm($form, $form_state);
   }
@@ -111,7 +111,7 @@ class Language extends ConditionPluginBase implements ContainerFactoryPluginInte
         $result[$item->getId()] = $item->getName();
       }
       return $result;
-    }, array());
+    }, []);
 
     // If we have more than one language selected, separate them by commas.
     if (count($this->configuration['langcodes']) > 1) {
@@ -122,9 +122,9 @@ class Language extends ConditionPluginBase implements ContainerFactoryPluginInte
       $languages = array_pop($language_names);
     }
     if (!empty($this->configuration['negate'])) {
-      return t('The language is not @languages.', array('@languages' => $languages));
+      return t('The language is not @languages.', ['@languages' => $languages]);
     }
-    return t('The language is @languages.', array('@languages' => $languages));
+    return t('The language is @languages.', ['@languages' => $languages]);
   }
 
   /**
@@ -144,7 +144,7 @@ class Language extends ConditionPluginBase implements ContainerFactoryPluginInte
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array('langcodes' => array()) + parent::defaultConfiguration();
+    return ['langcodes' => []] + parent::defaultConfiguration();
   }
 
 }
diff --git a/web/core/modules/language/src/Plugin/Derivative/LanguageBlock.php b/web/core/modules/language/src/Plugin/Derivative/LanguageBlock.php
index 3c108695d..93cc5b1c9 100644
--- a/web/core/modules/language/src/Plugin/Derivative/LanguageBlock.php
+++ b/web/core/modules/language/src/Plugin/Derivative/LanguageBlock.php
@@ -21,7 +21,7 @@ class LanguageBlock extends DeriverBase {
       $configurable_types = $language_manager->getLanguageTypes();
       foreach ($configurable_types as $type) {
         $this->derivatives[$type] = $base_plugin_definition;
-        $this->derivatives[$type]['admin_label'] = t('Language switcher (@type)', array('@type' => $info[$type]['name']));
+        $this->derivatives[$type]['admin_label'] = t('Language switcher (@type)', ['@type' => $info[$type]['name']]);
       }
       // If there is just one configurable type then change the title of the
       // block.
diff --git a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
index 78edb8964..9218899b1 100644
--- a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
+++ b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\language\Plugin\LanguageNegotiation;
 
-use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
@@ -118,20 +117,8 @@ class LanguageNegotiationContentEntity extends LanguageNegotiationMethodBase imp
         unset($options['language']);
       }
 
-      if (isset($options['query']) && is_string($options['query'])) {
-        $query = [];
-        parse_str($options['query'], $query);
-        $options['query'] = $query;
-      }
-      else {
-        $options['query'] = [];
-      }
-
       if (!isset($options['query'][static::QUERY_PARAMETER])) {
-        $query_addon = [static::QUERY_PARAMETER => $langcode];
-        $options['query'] += $query_addon;
-        // @todo Remove this once https://www.drupal.org/node/2507005 lands.
-        $path .= (strpos($path, '?') !== FALSE ? '&' : '?') . UrlHelper::buildQuery($query_addon);
+        $options['query'][static::QUERY_PARAMETER] = $langcode;
       }
 
       if ($bubbleable_metadata) {
@@ -276,7 +263,7 @@ class LanguageNegotiationContentEntity extends LanguageNegotiationMethodBase imp
       $this->contentEntityPaths = [];
       $entity_types = $this->entityManager->getDefinitions();
       foreach ($entity_types as $entity_type_id => $entity_type) {
-        if ($entity_type->isSubclassOf(ContentEntityInterface::class)) {
+        if ($entity_type->entityClassImplements(ContentEntityInterface::class)) {
           $entity_paths = array_fill_keys($entity_type->getLinkTemplates(), $entity_type_id);
           $this->contentEntityPaths = array_merge($this->contentEntityPaths, $entity_paths);
         }
diff --git a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationSession.php b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationSession.php
index 5463b5a6b..971e907aa 100644
--- a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationSession.php
+++ b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationSession.php
@@ -81,7 +81,7 @@ class LanguageNegotiationSession extends LanguageNegotiationMethodBase implement
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     if ($request) {
       // The following values are not supposed to change during a single page
       // request processing.
@@ -102,11 +102,6 @@ class LanguageNegotiationSession extends LanguageNegotiationMethodBase implement
       // enabled, and the corresponding option has been set, we must preserve
       // any explicit user language preference even with cookies disabled.
       if ($this->queryRewrite) {
-        if (isset($options['query']) && is_string($options['query'])) {
-          $query = array();
-          parse_str($options['query'], $query);
-          $options['query'] = $query;
-        }
         if (!isset($options['query'][$this->queryParam])) {
           $options['query'][$this->queryParam] = $this->queryValue;
         }
@@ -129,24 +124,24 @@ class LanguageNegotiationSession extends LanguageNegotiationMethodBase implement
    * {@inheritdoc}
    */
   public function getLanguageSwitchLinks(Request $request, $type, Url $url) {
-    $links = array();
+    $links = [];
     $config = $this->config->get('language.negotiation')->get('session');
     $param = $config['parameter'];
     $language_query = isset($_SESSION[$param]) ? $_SESSION[$param] : $this->languageManager->getCurrentLanguage($type)->getId();
-    $query = array();
+    $query = [];
     parse_str($request->getQueryString(), $query);
 
     foreach ($this->languageManager->getNativeLanguages() as $language) {
       $langcode = $language->getId();
-      $links[$langcode] = array(
+      $links[$langcode] = [
         // We need to clone the $url object to avoid using the same one for all
         // links. When the links are rendered, options are set on the $url
         // object, so if we use the same one, they would be set for all links.
         'url' => clone $url,
         'title' => $language->getName(),
-        'attributes' => array('class' => array('language-link')),
+        'attributes' => ['class' => ['language-link']],
         'query' => $query,
-      );
+      ];
       if ($language_query != $langcode) {
         $links[$langcode]['query'][$param] = $langcode;
       }
diff --git a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
index 25b5484a9..7436a3f3a 100644
--- a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
+++ b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
@@ -80,7 +80,7 @@ class LanguageNegotiationUrl extends LanguageNegotiationMethodBase implements In
             if (!empty($config['domains'][$language->getId()])) {
               // Ensure that there is exactly one protocol in the URL when
               // checking the hostname.
-              $host = 'http://' . str_replace(array('http://', 'https://'), '', $config['domains'][$language->getId()]);
+              $host = 'http://' . str_replace(['http://', 'https://'], '', $config['domains'][$language->getId()]);
               $host = parse_url($host, PHP_URL_HOST);
               if ($http_host == $host) {
                 $langcode = $language->getId();
@@ -100,15 +100,18 @@ class LanguageNegotiationUrl extends LanguageNegotiationMethodBase implements In
    */
   public function processInbound($path, Request $request) {
     $config = $this->config->get('language.negotiation')->get('url');
-    $parts = explode('/', trim($path, '/'));
-    $prefix = array_shift($parts);
 
-    // Search prefix within added languages.
-    foreach ($this->languageManager->getLanguages() as $language) {
-      if (isset($config['prefixes'][$language->getId()]) && $config['prefixes'][$language->getId()] == $prefix) {
-        // Rebuild $path with the language removed.
-        $path = '/' . implode('/', $parts);
-        break;
+    if ($config['source'] == LanguageNegotiationUrl::CONFIG_PATH_PREFIX) {
+      $parts = explode('/', trim($path, '/'));
+      $prefix = array_shift($parts);
+
+      // Search prefix within added languages.
+      foreach ($this->languageManager->getLanguages() as $language) {
+        if (isset($config['prefixes'][$language->getId()]) && $config['prefixes'][$language->getId()] == $prefix) {
+          // Rebuild $path with the language removed.
+          $path = '/' . implode('/', $parts);
+          break;
+        }
       }
     }
 
@@ -118,7 +121,7 @@ class LanguageNegotiationUrl extends LanguageNegotiationMethodBase implements In
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     $url_scheme = 'http';
     $port = 80;
     if ($request) {
@@ -151,7 +154,7 @@ class LanguageNegotiationUrl extends LanguageNegotiationMethodBase implements In
         // retain it below.
         if (!empty($options['base_url'])) {
           // The colon in the URL scheme messes up the port checking below.
-          $normalized_base_url = str_replace(array('https://', 'http://'), '', $options['base_url']);
+          $normalized_base_url = str_replace(['https://', 'http://'], '', $options['base_url']);
         }
 
         // Ask for an absolute URL with our modified base URL.
@@ -191,20 +194,20 @@ class LanguageNegotiationUrl extends LanguageNegotiationMethodBase implements In
    * {@inheritdoc}
    */
   public function getLanguageSwitchLinks(Request $request, $type, Url $url) {
-    $links = array();
+    $links = [];
     $query = $request->query->all();
 
     foreach ($this->languageManager->getNativeLanguages() as $language) {
-      $links[$language->getId()] = array(
+      $links[$language->getId()] = [
         // We need to clone the $url object to avoid using the same one for all
         // links. When the links are rendered, options are set on the $url
         // object, so if we use the same one, they would be set for all links.
         'url' => clone $url,
         'title' => $language->getName(),
         'language' => $language,
-        'attributes' => array('class' => array('language-link')),
+        'attributes' => ['class' => ['language-link']],
         'query' => $query,
-      );
+      ];
     }
 
     return $links;
diff --git a/web/core/modules/language/src/Plugin/migrate/destination/DefaultLangcode.php b/web/core/modules/language/src/Plugin/migrate/destination/DefaultLangcode.php
index a5a50a911..4d13e9adb 100644
--- a/web/core/modules/language/src/Plugin/migrate/destination/DefaultLangcode.php
+++ b/web/core/modules/language/src/Plugin/migrate/destination/DefaultLangcode.php
@@ -19,7 +19,7 @@ class DefaultLangcode extends Config {
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     $destination = $row->getDestination();
     $langcode = $destination['default_langcode'];
 
diff --git a/web/core/modules/language/src/Plugin/migrate/source/Language.php b/web/core/modules/language/src/Plugin/migrate/source/Language.php
index dc2e0ce38..fa6a19960 100644
--- a/web/core/modules/language/src/Plugin/migrate/source/Language.php
+++ b/web/core/modules/language/src/Plugin/migrate/source/Language.php
@@ -17,7 +17,7 @@ class Language extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'language' => $this->t('The language code.'),
       'name' => $this->t('The English name of the language.'),
       'native' => $this->t('The native name of the language.'),
@@ -29,18 +29,18 @@ class Language extends DrupalSqlBase {
       'prefix' => $this->t('Path prefix used for this language.'),
       'weight' => $this->t('The language weight when listed.'),
       'javascript' => $this->t('Location of the JavaScript translation file.'),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'language' => array(
+    return [
+      'language' => [
         'type' => 'string',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php b/web/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php
index c41b635c3..ab9ba8381 100644
--- a/web/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php
+++ b/web/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php
@@ -19,20 +19,20 @@ class LanguageContentSettings extends DrupalSqlBase {
    */
   public function query() {
     return $this->select('node_type', 't')
-      ->fields('t', array(
+      ->fields('t', [
         'type',
-      ));
+      ]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function fields() {
-    $fields = array(
+    $fields = [
       'type' => $this->t('Type'),
       'language_content_type' => $this->t('Multilingual support.'),
       'i18n_lock_node' => $this->t('Lock language.'),
-    );
+    ];
     return $fields;
   }
 
diff --git a/web/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php b/web/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php
index 91ed020a3..cb748aec2 100644
--- a/web/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php
+++ b/web/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php
@@ -19,20 +19,20 @@ class LanguageContentSettings extends DrupalSqlBase {
    */
   public function query() {
     return $this->select('node_type', 't')
-      ->fields('t', array(
+      ->fields('t', [
         'type',
-      ));
+      ]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function fields() {
-    $fields = array(
+    $fields = [
       'type' => $this->t('Type'),
       'language_content_type' => $this->t('Multilingual support.'),
       'i18n_lock_node' => $this->t('Lock language.'),
-    );
+    ];
     return $fields;
   }
 
diff --git a/web/core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php b/web/core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php
index 20a3532ec..97ccf2fd8 100644
--- a/web/core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php
+++ b/web/core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php
@@ -19,10 +19,10 @@ class EntityTypeWithoutLanguageFormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'language',
     'language_test',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -31,9 +31,9 @@ class EntityTypeWithoutLanguageFormTest extends WebTestBase {
     parent::setUp();
 
     // Create and log in administrative user.
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'administer languages',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
   }
 
diff --git a/web/core/modules/language/src/Tests/LanguageConfigurationElementTest.php b/web/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
index 93b821d18..dc3eb260b 100644
--- a/web/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
+++ b/web/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
@@ -20,11 +20,11 @@ class LanguageConfigurationElementTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy', 'node', 'language', 'language_elements_test', 'field_ui');
+  public static $modules = ['taxonomy', 'node', 'language', 'language_elements_test', 'field_ui'];
 
   protected function setUp() {
     parent::setUp();
-    $user = $this->drupalCreateUser(array('access administration pages', 'administer languages', 'administer content types'));
+    $user = $this->drupalCreateUser(['access administration pages', 'administer languages', 'administer content types']);
     $this->drupalLogin($user);
   }
 
@@ -60,12 +60,12 @@ class LanguageConfigurationElementTest extends WebTestBase {
     $this->assertFieldChecked('edit-lang-configuration-language-alterable');
 
     // Test if content type settings have been saved.
-    $edit = array(
+    $edit = [
       'name' => 'Page',
       'type' => 'page',
       'language_configuration[langcode]' => 'authors_default',
       'language_configuration[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/add', $edit, 'Save and manage fields');
 
     // Make sure the settings are saved when creating the content type.
@@ -80,11 +80,11 @@ class LanguageConfigurationElementTest extends WebTestBase {
    */
   public function testDefaultLangcode() {
     // Add some custom languages.
-    foreach (array('aa', 'bb', 'cc') as $language_code) {
-      ConfigurableLanguage::create(array(
+    foreach (['aa', 'bb', 'cc'] as $language_code) {
+      ConfigurableLanguage::create([
         'id' => $language_code,
         'label' => $this->randomMachineName(),
-      ))->save();
+      ])->save();
     }
 
     // Fixed language.
@@ -154,14 +154,14 @@ class LanguageConfigurationElementTest extends WebTestBase {
     // Create the article content type first if the profile used is not the
     // standard one.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
     }
-    $admin_user = $this->drupalCreateUser(array('administer content types'));
+    $admin_user = $this->drupalCreateUser(['administer content types']);
     $this->drupalLogin($admin_user);
-    $edit = array(
+    $edit = [
       'language_configuration[langcode]' => 'current_interface',
       'language_configuration[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
     // Check the language default configuration for the articles.
     $configuration = ContentLanguageSettings::loadByEntityTypeBundle('node', 'article');
@@ -169,9 +169,9 @@ class LanguageConfigurationElementTest extends WebTestBase {
     $this->assertEqual($configuration->getDefaultLangcode(), 'current_interface', 'The default language configuration has been saved on the Article content type.');
     $this->assertTrue($configuration->isLanguageAlterable(), 'The alterable language configuration has been saved on the Article content type.');
     // Update the article content type by changing the title label.
-    $edit = array(
+    $edit = [
       'title_label' => 'Name'
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
     // Check that we still have the settings for the updated node type.
     $configuration = ContentLanguageSettings::loadByEntityTypeBundle('node', 'article');
@@ -187,19 +187,19 @@ class LanguageConfigurationElementTest extends WebTestBase {
     // Create the article content type first if the profile used is not the
     // standard one.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array(
+      $this->drupalCreateContentType([
         'type' => 'article',
         'name' => 'Article'
-      ));
+      ]);
     }
-    $admin_user = $this->drupalCreateUser(array('administer content types'));
+    $admin_user = $this->drupalCreateUser(['administer content types']);
     $this->drupalLogin($admin_user);
 
     // Create language configuration for the articles.
-    $edit = array(
+    $edit = [
       'language_configuration[langcode]' => 'authors_default',
       'language_configuration[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
 
     // Check the language default configuration for articles is present.
@@ -207,7 +207,7 @@ class LanguageConfigurationElementTest extends WebTestBase {
     $this->assertTrue($configuration, 'The language configuration is present.');
 
     // Delete 'article' bundle.
-    $this->drupalPostForm('admin/structure/types/manage/article/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/types/manage/article/delete', [], t('Delete'));
 
     // Check that the language configuration has been deleted.
     \Drupal::entityManager()->getStorage('language_content_settings')->resetCache();
@@ -225,12 +225,12 @@ class LanguageConfigurationElementTest extends WebTestBase {
     ]);
     $vocabulary->save();
 
-    $admin_user = $this->drupalCreateUser(array('administer taxonomy'));
+    $admin_user = $this->drupalCreateUser(['administer taxonomy']);
     $this->drupalLogin($admin_user);
-    $edit = array(
+    $edit = [
       'default_language[langcode]' => 'current_interface',
       'default_language[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/taxonomy/manage/country', $edit, t('Save'));
 
     // Check the language default configuration.
@@ -239,9 +239,9 @@ class LanguageConfigurationElementTest extends WebTestBase {
     $this->assertEqual($configuration->getDefaultLangcode(), 'current_interface', 'The default language configuration has been saved on the Country vocabulary.');
     $this->assertTrue($configuration->isLanguageAlterable(), 'The alterable language configuration has been saved on the Country vocabulary.');
     // Update the vocabulary.
-    $edit = array(
+    $edit = [
       'name' => 'Nation'
-    );
+    ];
     $this->drupalPostForm('admin/structure/taxonomy/manage/country', $edit, t('Save'));
     // Check that we still have the settings for the updated vocabulary.
     $configuration = ContentLanguageSettings::loadByEntityTypeBundle('taxonomy_term', 'country');
diff --git a/web/core/modules/language/src/Tests/LanguageConfigurationTest.php b/web/core/modules/language/src/Tests/LanguageConfigurationTest.php
index cf049f1ea..46d5ed74d 100644
--- a/web/core/modules/language/src/Tests/LanguageConfigurationTest.php
+++ b/web/core/modules/language/src/Tests/LanguageConfigurationTest.php
@@ -18,18 +18,18 @@ class LanguageConfigurationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Functional tests for adding, editing and deleting languages.
    */
-  function testLanguageConfiguration() {
+  public function testLanguageConfiguration() {
     // Ensure the after installing the language module the weight of the English
     // language is still 0.
     $this->assertEqual(ConfigurableLanguage::load('en')->getWeight(), 0, 'The English language has a weight of 0.');
 
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     $this->drupalLogin($admin_user);
 
     // Check if the Default English language has no path prefix.
@@ -41,9 +41,9 @@ class LanguageConfigurationTest extends WebTestBase {
     $this->assertFieldByXPath('//input[contains(@class, "button--primary")]', 'Add language', 'Add language is a primary button');
 
     // Add predefined language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Add language');
     $this->assertText('French');
     $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
@@ -63,9 +63,9 @@ class LanguageConfigurationTest extends WebTestBase {
     $this->assertFieldChecked('edit-site-default-language-en', 'English is the default language.');
 
     // Change the default language.
-    $edit = array(
+    $edit = [
       'site_default_language' => 'fr',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $this->rebuildContainer();
     $this->assertFieldChecked('edit-site-default-language-fr', 'Default language updated.');
@@ -80,16 +80,16 @@ class LanguageConfigurationTest extends WebTestBase {
     $this->assertFieldByXPath('//input[@name="prefix[fr]"]', 'fr', 'French still has a path prefix.');
 
     // Check that prefix can be changed.
-    $edit = array(
+    $edit = [
       'prefix[fr]' => 'french',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $this->assertFieldByXPath('//input[@name="prefix[fr]"]', 'french', 'French path prefix has changed.');
 
     // Check that the prefix can be removed.
-    $edit = array(
+    $edit = [
       'prefix[fr]' => '',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $this->assertNoText(t('The prefix may only be left blank for the selected detection fallback language.'), 'The path prefix can be removed for the default language');
 
@@ -97,24 +97,24 @@ class LanguageConfigurationTest extends WebTestBase {
     $this->config('language.negotiation')->set('selected_langcode', 'fr')->save();
     // Check that the prefix of a language that is not the negotiation one
     // cannot be changed to empty string.
-    $edit = array(
+    $edit = [
       'prefix[en]' => '',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $this->assertText(t('The prefix may only be left blank for the selected detection fallback language.'));
 
     //  Check that prefix cannot be changed to contain a slash.
-    $edit = array(
+    $edit = [
       'prefix[en]' => 'foo/bar',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $this->assertText(t('The prefix may not contain a slash.'), 'English prefix cannot be changed to contain a slash.');
 
     // Remove English language and add a new Language to check if langcode of
     // Language entity is 'en'.
-    $this->drupalPostForm('admin/config/regional/language/delete/en', array(), t('Delete'));
+    $this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
     $this->rebuildContainer();
-    $this->assertRaw(t('The %language (%langcode) language has been removed.', array('%language' => 'English', '%langcode' => 'en')));
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', ['%language' => 'English', '%langcode' => 'en']));
 
     // Ensure that French language has a weight of 1 after being created through
     // the UI.
@@ -132,9 +132,9 @@ class LanguageConfigurationTest extends WebTestBase {
     $arabic->setWeight(4)->save();
     $this->assertEqual($arabic->getWeight(), 4, 'The Arabic language has a weight of 0.');
 
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'de',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, 'Add language');
     $language = $this->config('language.entity.de')->get();
     $this->assertEqual($language['langcode'], 'fr');
@@ -148,30 +148,30 @@ class LanguageConfigurationTest extends WebTestBase {
   /**
    * Functional tests for setting system language weight on adding, editing and deleting languages.
    */
-  function testLanguageConfigurationWeight() {
+  public function testLanguageConfigurationWeight() {
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     $this->drupalLogin($admin_user);
     $this->checkConfigurableLanguageWeight();
 
     // Add predefined language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, 'Add language');
     $this->checkConfigurableLanguageWeight('after adding new language');
 
     // Re-ordering languages.
-    $edit = array(
+    $edit = [
       'languages[en][weight]' => $this->getHighestConfigurableLanguageWeight() + 1,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language', $edit, 'Save configuration');
     $this->checkConfigurableLanguageWeight('after re-ordering');
 
     // Remove predefined language.
-    $edit = array(
+    $edit = [
       'confirm' => 1,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/delete/fr', $edit, 'Delete');
     $this->checkConfigurableLanguageWeight('after deleting a language');
   }
@@ -188,7 +188,7 @@ class LanguageConfigurationTest extends WebTestBase {
     // Reset language list.
     \Drupal::languageManager()->reset();
     $max_configurable_language_weight = $this->getHighestConfigurableLanguageWeight();
-    $replacements = array('@event' => $state);
+    $replacements = ['@event' => $state];
     foreach (\Drupal::languageManager()->getLanguages(LanguageInterface::STATE_LOCKED) as $locked_language) {
       $replacements['%language'] = $locked_language->getName();
       $this->assertTrue($locked_language->getWeight() > $max_configurable_language_weight, format_string('System language %language has higher weight than configurable languages @event', $replacements));
diff --git a/web/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php b/web/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php
index dbd35cdf3..2eb02df19 100644
--- a/web/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php
+++ b/web/core/modules/language/src/Tests/LanguageCustomLanguageConfigurationTest.php
@@ -18,7 +18,7 @@ class LanguageCustomLanguageConfigurationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Functional tests for adding, editing and deleting languages.
@@ -26,76 +26,76 @@ class LanguageCustomLanguageConfigurationTest extends WebTestBase {
   public function testLanguageConfiguration() {
 
     // Create user with permissions to add and remove languages.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     $this->drupalLogin($admin_user);
 
     // Add custom language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     // Test validation on missing values.
-    $this->assertText(t('@name field is required.', array('@name' => t('Language code'))));
-    $this->assertText(t('@name field is required.', array('@name' => t('Language name'))));
+    $this->assertText(t('@name field is required.', ['@name' => t('Language code')]));
+    $this->assertText(t('@name field is required.', ['@name' => t('Language name')]));
     $empty_language = new Language();
     $this->assertFieldChecked('edit-direction-' . $empty_language->getDirection(), 'Consistent usage of language direction.');
-    $this->assertUrl(\Drupal::url('language.add', array(), array('absolute' => TRUE)), [], 'Correct page redirection.');
+    $this->assertUrl(\Drupal::url('language.add', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
 
     // Test validation of invalid values.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => 'white space',
       'label' => '<strong>evil markup</strong>',
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
 
-    $this->assertRaw(t('%field must be a valid language tag as <a href=":url">defined by the W3C</a>.', array(
+    $this->assertRaw(t('%field must be a valid language tag as <a href=":url">defined by the W3C</a>.', [
       '%field' => t('Language code'),
       ':url' => 'http://www.w3.org/International/articles/language-tags/',
-    )));
+    ]));
 
-    $this->assertRaw(t('%field cannot contain any markup.', array('%field' => t('Language name'))));
-    $this->assertUrl(\Drupal::url('language.add', array(), array('absolute' => TRUE)), [], 'Correct page redirection.');
+    $this->assertRaw(t('%field cannot contain any markup.', ['%field' => t('Language name')]));
+    $this->assertUrl(\Drupal::url('language.add', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
 
     // Test adding a custom language with a numeric region code.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => 'es-419',
       'label' => 'Latin American Spanish',
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
 
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     $this->assertRaw(t(
       'The language %language has been created and can now be used.',
-      array('%language' => $edit['label'])
+      ['%language' => $edit['label']]
     ));
-    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', array(), array('absolute' => TRUE)), [], 'Correct page redirection.');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
 
     // Test validation of existing language values.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => 'de',
       'label' => 'German',
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
 
     // Add the language the first time.
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     $this->assertRaw(t(
       'The language %language has been created and can now be used.',
-      array('%language' => $edit['label'])
+      ['%language' => $edit['label']]
     ));
-    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', array(), array('absolute' => TRUE)), [], 'Correct page redirection.');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
 
     // Add the language a second time and confirm that this is not allowed.
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     $this->assertRaw(t(
       'The language %language (%langcode) already exists.',
-      array('%language' => $edit['label'], '%langcode' => $edit['langcode'])
+      ['%language' => $edit['label'], '%langcode' => $edit['langcode']]
     ));
-    $this->assertUrl(\Drupal::url('language.add', array(), array('absolute' => TRUE)), [], 'Correct page redirection.');
+    $this->assertUrl(\Drupal::url('language.add', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
   }
 
 }
diff --git a/web/core/modules/language/src/Tests/LanguageListTest.php b/web/core/modules/language/src/Tests/LanguageListTest.php
index d40753060..641ddc41e 100644
--- a/web/core/modules/language/src/Tests/LanguageListTest.php
+++ b/web/core/modules/language/src/Tests/LanguageListTest.php
@@ -19,15 +19,15 @@ class LanguageListTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Functional tests for adding, editing and deleting languages.
    */
-  function testLanguageList() {
+  public function testLanguageList() {
 
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     $this->drupalLogin($admin_user);
 
     // Get the weight of the last language.
@@ -35,9 +35,9 @@ class LanguageListTest extends WebTestBase {
     $last_language_weight = end($languages)->getWeight();
 
     // Add predefined language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
     $this->assertText('French', 'Language added successfully.');
     $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]));
@@ -53,12 +53,12 @@ class LanguageListTest extends WebTestBase {
     // Add custom language.
     $langcode = 'xx';
     $name = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => Language::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]));
     $this->assertRaw('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
@@ -72,9 +72,9 @@ class LanguageListTest extends WebTestBase {
     $this->drupalGet($path);
     $this->assertFieldChecked('edit-site-default-language-en', 'English is the default language.');
     // Change the default language.
-    $edit = array(
+    $edit = [
       'site_default_language' => $langcode,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $this->rebuildContainer();
     $this->assertNoFieldChecked('edit-site-default-language-en', 'Default language updated.');
@@ -90,17 +90,17 @@ class LanguageListTest extends WebTestBase {
     $this->assertTitle(t('Edit language | Drupal'), 'Page title is "Edit language".');
     // Edit a language.
     $name = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'label' => $name,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/edit/' . $langcode, $edit, t('Save language'));
     $this->assertRaw($name, 'The language has been updated.');
     $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language]));
 
     // Change back the default language.
-    $edit = array(
+    $edit = [
       'site_default_language' => 'en',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save configuration'));
     $this->rebuildContainer();
     // Ensure 'delete' link works.
@@ -115,9 +115,9 @@ class LanguageListTest extends WebTestBase {
     $this->assertRaw($name, 'The language was not deleted.');
     // Delete the language for real. This a confirm form, we do not need any
     // fields changed.
-    $this->drupalPostForm('admin/config/regional/language/delete/' . $langcode, array(), t('Delete'));
+    $this->drupalPostForm('admin/config/regional/language/delete/' . $langcode, [], t('Delete'));
     // We need raw here because %language and %langcode will add HTML.
-    $t_args = array('%language' => $name, '%langcode' => $langcode);
+    $t_args = ['%language' => $name, '%langcode' => $langcode];
     $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The test language has been removed.');
     $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $english]));
     // Verify that language is no longer found.
@@ -125,11 +125,11 @@ class LanguageListTest extends WebTestBase {
     $this->assertResponse(404, 'Language no longer found.');
 
     // Delete French.
-    $this->drupalPostForm('admin/config/regional/language/delete/fr', array(), t('Delete'));
+    $this->drupalPostForm('admin/config/regional/language/delete/fr', [], t('Delete'));
     // Make sure the "language_count" state has been updated correctly.
     $this->rebuildContainer();
     // We need raw here because %language and %langcode will add HTML.
-    $t_args = array('%language' => 'French', '%langcode' => 'fr');
+    $t_args = ['%language' => 'French', '%langcode' => 'fr'];
     $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The French language has been removed.');
     $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]));
     // Verify that language is no longer found.
@@ -142,12 +142,12 @@ class LanguageListTest extends WebTestBase {
     // deleting English.
     $langcode = 'xx';
     $name = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => Language::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]));
     $this->assertText($name, 'Name found.');
@@ -157,17 +157,17 @@ class LanguageListTest extends WebTestBase {
     $this->drupalGet($path);
     $this->assertFieldChecked('edit-site-default-language-en', 'English is the default language.');
     // Change the default language.
-    $edit = array(
+    $edit = [
       'site_default_language' => $langcode,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $this->rebuildContainer();
     $this->assertNoFieldChecked('edit-site-default-language-en', 'Default language updated.');
     $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language]));
 
-    $this->drupalPostForm('admin/config/regional/language/delete/en', array(), t('Delete'));
+    $this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
     // We need raw here because %language and %langcode will add HTML.
-    $t_args = array('%language' => 'English', '%langcode' => 'en');
+    $t_args = ['%language' => 'English', '%langcode' => 'en'];
     $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The English language has been removed.');
     $this->rebuildContainer();
 
@@ -178,7 +178,7 @@ class LanguageListTest extends WebTestBase {
     // Ensure that NL cannot be set default when it's not available.
     $this->drupalGet('admin/config/regional/language');
     $extra_values = '&site_default_language=nl';
-    $this->drupalPostForm(NULL, array(), t('Save configuration'), array(), array(), NULL, $extra_values);
+    $this->drupalPostForm(NULL, [], t('Save configuration'), [], [], NULL, $extra_values);
     $this->assertText(t('Selected default language no longer exists.'));
     $this->assertNoFieldChecked('edit-site-default-language-xx', 'The previous default language got deselected.');
   }
@@ -186,24 +186,24 @@ class LanguageListTest extends WebTestBase {
   /**
    * Functional tests for the language states (locked or configurable).
    */
-  function testLanguageStates() {
+  public function testLanguageStates() {
     // Add some languages, and also lock some of them.
-    ConfigurableLanguage::create(array('label' => $this->randomMachineName(), 'id' => 'l1'))->save();
-    ConfigurableLanguage::create(array('label' => $this->randomMachineName(), 'id' => 'l2', 'locked' => TRUE))->save();
-    ConfigurableLanguage::create(array('label' => $this->randomMachineName(), 'id' => 'l3'))->save();
-    ConfigurableLanguage::create(array('label' => $this->randomMachineName(), 'id' => 'l4', 'locked' => TRUE))->save();
-    $expected_locked_languages = array('l4' => 'l4', 'l2' => 'l2', 'und' => 'und', 'zxx' => 'zxx');
-    $expected_all_languages = array('l4' => 'l4', 'l3' => 'l3', 'l2' => 'l2', 'l1' => 'l1', 'en' => 'en', 'und' => 'und', 'zxx' => 'zxx');
-    $expected_conf_languages = array('l3' => 'l3', 'l1' => 'l1', 'en' => 'en');
+    ConfigurableLanguage::create(['label' => $this->randomMachineName(), 'id' => 'l1'])->save();
+    ConfigurableLanguage::create(['label' => $this->randomMachineName(), 'id' => 'l2', 'locked' => TRUE])->save();
+    ConfigurableLanguage::create(['label' => $this->randomMachineName(), 'id' => 'l3'])->save();
+    ConfigurableLanguage::create(['label' => $this->randomMachineName(), 'id' => 'l4', 'locked' => TRUE])->save();
+    $expected_locked_languages = ['l4' => 'l4', 'l2' => 'l2', 'und' => 'und', 'zxx' => 'zxx'];
+    $expected_all_languages = ['l4' => 'l4', 'l3' => 'l3', 'l2' => 'l2', 'l1' => 'l1', 'en' => 'en', 'und' => 'und', 'zxx' => 'zxx'];
+    $expected_conf_languages = ['l3' => 'l3', 'l1' => 'l1', 'en' => 'en'];
 
     $locked_languages = $this->container->get('language_manager')->getLanguages(LanguageInterface::STATE_LOCKED);
-    $this->assertEqual(array_diff_key($expected_locked_languages, $locked_languages), array(), 'Locked languages loaded correctly.');
+    $this->assertEqual(array_diff_key($expected_locked_languages, $locked_languages), [], 'Locked languages loaded correctly.');
 
     $all_languages = $this->container->get('language_manager')->getLanguages(LanguageInterface::STATE_ALL);
-    $this->assertEqual(array_diff_key($expected_all_languages, $all_languages), array(), 'All languages loaded correctly.');
+    $this->assertEqual(array_diff_key($expected_all_languages, $all_languages), [], 'All languages loaded correctly.');
 
     $conf_languages = $this->container->get('language_manager')->getLanguages();
-    $this->assertEqual(array_diff_key($expected_conf_languages, $conf_languages), array(), 'Configurable languages loaded correctly.');
+    $this->assertEqual(array_diff_key($expected_conf_languages, $conf_languages), [], 'Configurable languages loaded correctly.');
   }
 
 }
diff --git a/web/core/modules/language/src/Tests/LanguageLocaleListTest.php b/web/core/modules/language/src/Tests/LanguageLocaleListTest.php
index dd3e02a1f..5f96d89e5 100644
--- a/web/core/modules/language/src/Tests/LanguageLocaleListTest.php
+++ b/web/core/modules/language/src/Tests/LanguageLocaleListTest.php
@@ -16,7 +16,7 @@ class LanguageLocaleListTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'locale');
+  public static $modules = ['language', 'locale'];
 
   /**
    * {@inheritdoc}
@@ -30,30 +30,30 @@ class LanguageLocaleListTest extends WebTestBase {
   /**
    * Tests adding, editing, and deleting languages.
    */
-  function testLanguageLocaleList() {
+  public function testLanguageLocaleList() {
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     $this->drupalLogin($admin_user);
 
     // Add predefined language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
     $this->assertText('The language French has been created and can now be used');
     $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]));
     $this->rebuildContainer();
 
     // Translate Spanish language to French (Espagnol).
-    $source = $this->storage->createString(array(
+    $source = $this->storage->createString([
       'source' => 'Spanish',
       'context' => '',
-    ))->save();
-    $this->storage->createTranslation(array(
+    ])->save();
+    $this->storage->createTranslation([
       'lid' => $source->lid,
       'language' => 'fr',
       'translation' => 'Espagnol',
-    ))->save();
+    ])->save();
 
     // Get language list displayed in select list.
     $this->drupalGet('fr/admin/config/regional/language/add');
diff --git a/web/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php b/web/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php
index 84d677911..d13626cc4 100644
--- a/web/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php
+++ b/web/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php
@@ -16,7 +16,7 @@ class LanguageSelectorTranslatableTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'language',
     'content_translation',
     'node',
@@ -24,7 +24,7 @@ class LanguageSelectorTranslatableTest extends WebTestBase {
     'field_ui',
     'entity_test',
     'locale',
-  );
+  ];
 
   /**
    * The user with administrator privileges.
@@ -49,13 +49,13 @@ class LanguageSelectorTranslatableTest extends WebTestBase {
    */
   protected function getAdministratorPermissions() {
     return array_filter(
-      array('translate interface',
+      ['translate interface',
         'administer content translation',
         'create content translations',
         'update content translations',
         'delete content translations',
         'administer languages',
-      )
+      ]
     );
   }
 
@@ -64,7 +64,7 @@ class LanguageSelectorTranslatableTest extends WebTestBase {
    */
   public function testLanguageStringSelector() {
     // Add another language.
-    $edit = array('predefined_langcode' => 'es');
+    $edit = ['predefined_langcode' => 'es'];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Translate the string English in Spanish (Inglés). Override config entity.
@@ -79,7 +79,7 @@ class LanguageSelectorTranslatableTest extends WebTestBase {
     $this->drupalGet($path);
 
     // Get en language from selector.
-    $elements = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => 'edit-settings-user-user-settings-language-langcode', ':option' => 'en'));
+    $elements = $this->xpath('//select[@id=:id]//option[@value=:option]', [':id' => 'edit-settings-user-user-settings-language-langcode', ':option' => 'en']);
 
     // Check that the language text is translated.
     $this->assertEqual((string) $elements[0], $name_translation, 'Checking the option string English is translated to Spanish.');
diff --git a/web/core/modules/language/src/Tests/LanguageSwitchingTest.php b/web/core/modules/language/src/Tests/LanguageSwitchingTest.php
index 5d4469d3a..40015210e 100644
--- a/web/core/modules/language/src/Tests/LanguageSwitchingTest.php
+++ b/web/core/modules/language/src/Tests/LanguageSwitchingTest.php
@@ -20,39 +20,39 @@ class LanguageSwitchingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale', 'locale_test', 'language', 'block', 'language_test', 'menu_ui');
+  public static $modules = ['locale', 'locale_test', 'language', 'block', 'language_test', 'menu_ui'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create and log in user.
-    $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer blocks', 'administer languages', 'access administration pages']);
     $this->drupalLogin($admin_user);
   }
 
   /**
    * Functional tests for the language switcher block.
    */
-  function testLanguageBlock() {
+  public function testLanguageBlock() {
     // Add language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Set the native language name.
     $this->saveNativeLanguageName('fr', 'français');
 
     // Enable URL language detection and selection.
-    $edit = array('language_interface[enabled][language-url]' => '1');
+    $edit = ['language_interface[enabled][language-url]' => '1'];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Enable the language switching block.
-    $block = $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, array(
+    $block = $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, [
       'id' => 'test_language_block',
       // Ensure a 2-byte UTF-8 sequence is in the tested output.
       'label' => $this->randomMachineName(8) . '×',
-    ));
+    ]);
 
     $this->doTestLanguageBlockAuthenticated($block->label());
     $this->doTestLanguageBlockAnonymous($block->label());
@@ -73,38 +73,38 @@ class LanguageSwitchingTest extends WebTestBase {
 
     // Assert that each list item and anchor element has the appropriate data-
     // attributes.
-    list($language_switcher) = $this->xpath('//div[@id=:id]', array(':id' => 'block-test-language-block'));
-    $list_items = array();
-    $anchors = array();
-    $labels = array();
+    list($language_switcher) = $this->xpath('//div[@id=:id]', [':id' => 'block-test-language-block']);
+    $list_items = [];
+    $anchors = [];
+    $labels = [];
     foreach ($language_switcher->ul->li as $list_item) {
       $classes = explode(" ", (string) $list_item['class']);
-      list($langcode) = array_intersect($classes, array('en', 'fr'));
-      $list_items[] = array(
+      list($langcode) = array_intersect($classes, ['en', 'fr']);
+      $list_items[] = [
         'langcode_class' => $langcode,
         'data-drupal-link-system-path' => (string) $list_item['data-drupal-link-system-path'],
-      );
-      $anchors[] = array(
+      ];
+      $anchors[] = [
         'hreflang' => (string) $list_item->a['hreflang'],
         'data-drupal-link-system-path' => (string) $list_item->a['data-drupal-link-system-path'],
-      );
+      ];
       $labels[] = (string) $list_item->a;
     }
-    $expected_list_items = array(
-      0 => array('langcode_class' => 'en', 'data-drupal-link-system-path' => 'user/2'),
-      1 => array('langcode_class' => 'fr', 'data-drupal-link-system-path' => 'user/2'),
-    );
+    $expected_list_items = [
+      0 => ['langcode_class' => 'en', 'data-drupal-link-system-path' => 'user/2'],
+      1 => ['langcode_class' => 'fr', 'data-drupal-link-system-path' => 'user/2'],
+    ];
     $this->assertIdentical($list_items, $expected_list_items, 'The list items have the correct attributes that will allow the drupal.active-link library to mark them as active.');
-    $expected_anchors = array(
-      0 => array('hreflang' => 'en', 'data-drupal-link-system-path' => 'user/2'),
-      1 => array('hreflang' => 'fr', 'data-drupal-link-system-path' => 'user/2'),
-    );
+    $expected_anchors = [
+      0 => ['hreflang' => 'en', 'data-drupal-link-system-path' => 'user/2'],
+      1 => ['hreflang' => 'fr', 'data-drupal-link-system-path' => 'user/2'],
+    ];
     $this->assertIdentical($anchors, $expected_anchors, 'The anchors have the correct attributes that will allow the drupal.active-link library to mark them as active.');
     $settings = $this->getDrupalSettings();
     $this->assertIdentical($settings['path']['currentPath'], 'user/2', 'drupalSettings.path.currentPath is set correctly to allow drupal.active-link to mark the correct links as active.');
     $this->assertIdentical($settings['path']['isFront'], FALSE, 'drupalSettings.path.isFront is set correctly to allow drupal.active-link to mark the correct links as active.');
     $this->assertIdentical($settings['path']['currentLanguage'], 'en', 'drupalSettings.path.currentLanguage is set correctly to allow drupal.active-link to mark the correct links as active.');
-    $this->assertIdentical($labels, array('English', 'français'), 'The language links labels are in their own language on the language switcher block.');
+    $this->assertIdentical($labels, ['English', 'français'], 'The language links labels are in their own language on the language switcher block.');
   }
 
   /**
@@ -124,19 +124,19 @@ class LanguageSwitchingTest extends WebTestBase {
     $this->assertText($block_label, 'Language switcher block found.');
 
     // Assert that only the current language is marked as active.
-    list($language_switcher) = $this->xpath('//div[@id=:id]', array(':id' => 'block-test-language-block'));
-    $links = array(
-      'active' => array(),
-      'inactive' => array(),
-    );
-    $anchors = array(
-      'active' => array(),
-      'inactive' => array(),
-    );
-    $labels = array();
+    list($language_switcher) = $this->xpath('//div[@id=:id]', [':id' => 'block-test-language-block']);
+    $links = [
+      'active' => [],
+      'inactive' => [],
+    ];
+    $anchors = [
+      'active' => [],
+      'inactive' => [],
+    ];
+    $labels = [];
     foreach ($language_switcher->ul->li as $link) {
       $classes = explode(" ", (string) $link['class']);
-      list($langcode) = array_intersect($classes, array('en', 'fr'));
+      list($langcode) = array_intersect($classes, ['en', 'fr']);
       if (in_array('is-active', $classes)) {
         $links['active'][] = $langcode;
       }
@@ -152,15 +152,15 @@ class LanguageSwitchingTest extends WebTestBase {
       }
       $labels[] = (string) $link->a;
     }
-    $this->assertIdentical($links, array('active' => array('en'), 'inactive' => array('fr')), 'Only the current language list item is marked as active on the language switcher block.');
-    $this->assertIdentical($anchors, array('active' => array('en'), 'inactive' => array('fr')), 'Only the current language anchor is marked as active on the language switcher block.');
-    $this->assertIdentical($labels, array('English', 'français'), 'The language links labels are in their own language on the language switcher block.');
+    $this->assertIdentical($links, ['active' => ['en'], 'inactive' => ['fr']], 'Only the current language list item is marked as active on the language switcher block.');
+    $this->assertIdentical($anchors, ['active' => ['en'], 'inactive' => ['fr']], 'Only the current language anchor is marked as active on the language switcher block.');
+    $this->assertIdentical($labels, ['English', 'français'], 'The language links labels are in their own language on the language switcher block.');
   }
 
   /**
    * Test language switcher links for domain based negotiation.
    */
-  function testLanguageBlockWithDomain() {
+  public function testLanguageBlockWithDomain() {
     // Add the Italian language.
     ConfigurableLanguage::createFromLangcode('it')->save();
 
@@ -171,31 +171,31 @@ class LanguageSwitchingTest extends WebTestBase {
     $languages = $this->container->get('language_manager')->getLanguages();
 
     // Enable browser and URL language detection.
-    $edit = array(
+    $edit = [
       'language_interface[enabled][language-url]' => TRUE,
       'language_interface[weight][language-url]' => -10,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Do not allow blank domain.
-    $edit = array(
+    $edit = [
       'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
       'domain[en]' => '',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
     $this->assertText(t('The domain may not be left blank for English'), 'The form does not allow blank domains.');
 
     // Change the domain for the Italian language.
-    $edit = array(
+    $edit = [
       'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
       'domain[en]' => \Drupal::request()->getHost(),
       'domain[it]' => 'it.example.com',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved'), 'Domain configuration is saved.');
 
     // Enable the language switcher block.
-    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, array('id' => 'test_language_block'));
+    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, ['id' => 'test_language_block']);
 
     $this->drupalGet('');
 
@@ -203,34 +203,34 @@ class LanguageSwitchingTest extends WebTestBase {
     $generator = $this->container->get('url_generator');
 
     // Verify the English URL is correct
-    list($english_link) = $this->xpath('//div[@id=:id]/ul/li/a[@hreflang=:hreflang]', array(
+    list($english_link) = $this->xpath('//div[@id=:id]/ul/li/a[@hreflang=:hreflang]', [
       ':id' => 'block-test-language-block',
       ':hreflang' => 'en',
-    ));
-    $english_url = $generator->generateFromRoute('entity.user.canonical', array('user' => 2), array('language' => $languages['en']));
+    ]);
+    $english_url = $generator->generateFromRoute('entity.user.canonical', ['user' => 2], ['language' => $languages['en']]);
     $this->assertEqual($english_url, (string) $english_link['href']);
 
     // Verify the Italian URL is correct
-    list($italian_link) = $this->xpath('//div[@id=:id]/ul/li/a[@hreflang=:hreflang]', array(
+    list($italian_link) = $this->xpath('//div[@id=:id]/ul/li/a[@hreflang=:hreflang]', [
       ':id' => 'block-test-language-block',
       ':hreflang' => 'it',
-    ));
-    $italian_url = $generator->generateFromRoute('entity.user.canonical', array('user' => 2), array('language' => $languages['it']));
+    ]);
+    $italian_url = $generator->generateFromRoute('entity.user.canonical', ['user' => 2], ['language' => $languages['it']]);
     $this->assertEqual($italian_url, (string) $italian_link['href']);
   }
 
   /**
    * Test active class on links when switching languages.
    */
-  function testLanguageLinkActiveClass() {
+  public function testLanguageLinkActiveClass() {
     // Add language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Enable URL language detection and selection.
-    $edit = array('language_interface[enabled][language-url]' => '1');
+    $edit = ['language_interface[enabled][language-url]' => '1'];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     $this->doTestLanguageLinkActiveClassAuthenticated();
@@ -240,27 +240,27 @@ class LanguageSwitchingTest extends WebTestBase {
   /**
    * Check the path-admin class, as same as on default language.
    */
-  function testLanguageBodyClass() {
+  public function testLanguageBodyClass() {
     $searched_class = 'path-admin';
 
     // Add language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Enable URL language detection and selection.
-    $edit = array('language_interface[enabled][language-url]' => '1');
+    $edit = ['language_interface[enabled][language-url]' => '1'];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Check if the default (English) admin/config page has the right class.
     $this->drupalGet('admin/config');
-    $class = $this->xpath('//body[contains(@class, :class)]', array(':class' => $searched_class));
+    $class = $this->xpath('//body[contains(@class, :class)]', [':class' => $searched_class]);
     $this->assertTrue(isset($class[0]), t('The path-admin class appears on default language.'));
 
     // Check if the French admin/config page has the right class.
     $this->drupalGet('fr/admin/config');
-    $class = $this->xpath('//body[contains(@class, :class)]', array(':class' => $searched_class));
+    $class = $this->xpath('//body[contains(@class, :class)]', [':class' => $searched_class]);
     $this->assertTrue(isset($class[0]), t('The path-admin class same as on default language.'));
 
     // The testing profile sets the user/login page as the frontpage. That
@@ -270,12 +270,12 @@ class LanguageSwitchingTest extends WebTestBase {
 
     // Check if the default (English) frontpage has the right class.
     $this->drupalGet('<front>');
-    $class = $this->xpath('//body[contains(@class, :class)]', array(':class' => 'path-frontpage'));
+    $class = $this->xpath('//body[contains(@class, :class)]', [':class' => 'path-frontpage']);
     $this->assertTrue(isset($class[0]), 'path-frontpage class found on the body tag');
 
     // Check if the French frontpage has the right class.
     $this->drupalGet('fr');
-    $class = $this->xpath('//body[contains(@class, :class)]', array(':class' => 'path-frontpage'));
+    $class = $this->xpath('//body[contains(@class, :class)]', [':class' => 'path-frontpage']);
     $this->assertTrue(isset($class[0]), 'path-frontpage class found on the body tag with french as the active language');
 
   }
@@ -295,18 +295,18 @@ class LanguageSwitchingTest extends WebTestBase {
 
     // Language code 'none' link should be active.
     $langcode = 'none';
-    $links = $this->xpath('//a[@id = :id and @data-drupal-link-system-path = :path]', array(':id' => 'no_lang_link', ':path' => $path));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and @data-drupal-link-system-path = :path]', [':id' => 'no_lang_link', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Language code 'en' link should be active.
     $langcode = 'en';
-    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', array(':id' => 'en_link', ':lang' => 'en', ':path' => $path));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', [':id' => 'en_link', ':lang' => 'en', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Language code 'fr' link should not be active.
     $langcode = 'fr';
-    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', array(':id' => 'fr_link', ':lang' => 'fr', ':path' => $path));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to NOT mark it as active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', [':id' => 'fr_link', ':lang' => 'fr', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to NOT mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Verify that drupalSettings contains the correct values.
     $settings = $this->getDrupalSettings();
@@ -320,18 +320,18 @@ class LanguageSwitchingTest extends WebTestBase {
 
     // Language code 'none' link should be active.
     $langcode = 'none';
-    $links = $this->xpath('//a[@id = :id and @data-drupal-link-system-path = :path]', array(':id' => 'no_lang_link', ':path' => $path));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and @data-drupal-link-system-path = :path]', [':id' => 'no_lang_link', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Language code 'en' link should not be active.
     $langcode = 'en';
-    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', array(':id' => 'en_link', ':lang' => 'en', ':path' => $path));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to NOT mark it as active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', [':id' => 'en_link', ':lang' => 'en', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to NOT mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Language code 'fr' link should be active.
     $langcode = 'fr';
-    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', array(':id' => 'fr_link', ':lang' => 'fr', ':path' => $path));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', [':id' => 'fr_link', ':lang' => 'fr', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Verify that drupalSettings contains the correct values.
     $settings = $this->getDrupalSettings();
@@ -356,18 +356,18 @@ class LanguageSwitchingTest extends WebTestBase {
 
     // Language code 'none' link should be active.
     $langcode = 'none';
-    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'no_lang_link', ':class' => 'is-active'));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', [':id' => 'no_lang_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Language code 'en' link should be active.
     $langcode = 'en';
-    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'en_link', ':class' => 'is-active'));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', [':id' => 'en_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Language code 'fr' link should not be active.
     $langcode = 'fr';
-    $links = $this->xpath('//a[@id = :id and not(contains(@class, :class))]', array(':id' => 'fr_link', ':class' => 'is-active'));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is NOT marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and not(contains(@class, :class))]', [':id' => 'fr_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is NOT marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Test links generated by the link generator on a French page.
     $current_language = 'French';
@@ -375,18 +375,18 @@ class LanguageSwitchingTest extends WebTestBase {
 
     // Language code 'none' link should be active.
     $langcode = 'none';
-    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'no_lang_link', ':class' => 'is-active'));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', [':id' => 'no_lang_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Language code 'en' link should not be active.
     $langcode = 'en';
-    $links = $this->xpath('//a[@id = :id and not(contains(@class, :class))]', array(':id' => 'en_link', ':class' => 'is-active'));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is NOT marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and not(contains(@class, :class))]', [':id' => 'en_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is NOT marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
 
     // Language code 'fr' link should be active.
     $langcode = 'fr';
-    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', array(':id' => 'fr_link', ':class' => 'is-active'));
-    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', array(':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode)));
+    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', [':id' => 'fr_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
   }
 
   /**
@@ -394,27 +394,27 @@ class LanguageSwitchingTest extends WebTestBase {
    */
   public function testLanguageSessionSwitchLinks() {
     // Add language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Enable session language detection and selection.
-    $edit = array(
+    $edit = [
       'language_interface[enabled][language-url]' => FALSE,
       'language_interface[enabled][language-session]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Enable the language switching block.
-    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, array(
+    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, [
       'id' => 'test_language_block',
-    ));
+    ]);
 
     // Enable the main menu block.
-    $this->drupalPlaceBlock('system_menu_block:main', array(
+    $this->drupalPlaceBlock('system_menu_block:main', [
       'id' => 'test_menu',
-    ));
+    ]);
 
     // Add a link to the homepage.
     $link = MenuLinkContent::create([
diff --git a/web/core/modules/language/src/Tests/LanguageTourTest.php b/web/core/modules/language/src/Tests/LanguageTourTest.php
index 777836738..b11006ec3 100644
--- a/web/core/modules/language/src/Tests/LanguageTourTest.php
+++ b/web/core/modules/language/src/Tests/LanguageTourTest.php
@@ -30,7 +30,7 @@ class LanguageTourTest extends TourTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->adminUser = $this->drupalCreateUser(array('administer languages', 'access tour'));
+    $this->adminUser = $this->drupalCreateUser(['administer languages', 'access tour']);
     $this->drupalLogin($this->adminUser);
     $this->drupalPlaceBlock('local_actions_block');
   }
diff --git a/web/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/web/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
index ef2abee3c..3f54cf9bf 100644
--- a/web/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
+++ b/web/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php
@@ -48,19 +48,19 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale', 'language_test', 'block', 'user', 'content_translation');
+  public static $modules = ['locale', 'language_test', 'block', 'user', 'content_translation'];
 
   protected function setUp() {
     parent::setUp();
 
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages', 'administer blocks'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages', 'administer blocks']);
     $this->drupalLogin($admin_user);
   }
 
   /**
    * Tests for language switching by URL path.
    */
-  function testUILanguageNegotiation() {
+  public function testUILanguageNegotiation() {
     // A few languages to switch to.
     // This one is unknown, should get the default lang version.
     $langcode_unknown = 'blah-blah';
@@ -69,9 +69,9 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
     // For testing path prefix.
     $langcode = 'zh-hans';
     // For setting browser language preference to 'vi'.
-    $http_header_browser_fallback = array("Accept-Language: $langcode_browser_fallback;q=1");
+    $http_header_browser_fallback = ["Accept-Language: $langcode_browser_fallback;q=1"];
     // For setting browser language preference to some unknown.
-    $http_header_blah = array("Accept-Language: blah;q=1");
+    $http_header_blah = ["Accept-Language: blah;q=1"];
 
     // Setup the site languages by installing two languages.
     // Set the default language in order for the translated string to be registered
@@ -101,117 +101,117 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
     $language_browser_fallback_string = "In $langcode_browser_fallback In $langcode_browser_fallback In $langcode_browser_fallback";
     $language_string = "In $langcode In $langcode In $langcode";
     // Do a translate search of our target string.
-    $search = array(
+    $search = [
       'string' => $default_string,
       'langcode' => $langcode_browser_fallback,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $language_browser_fallback_string,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
-    $search = array(
+    $search = [
       'string' => $default_string,
       'langcode' => $langcode,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $language_string,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     // Configure selected language negotiation to use zh-hans.
-    $edit = array('selected_langcode' => $langcode);
+    $edit = ['selected_langcode' => $langcode];
     $this->drupalPostForm('admin/config/regional/language/detection/selected', $edit, t('Save configuration'));
-    $test = array(
-      'language_negotiation' => array(LanguageNegotiationSelected::METHOD_ID),
+    $test = [
+      'language_negotiation' => [LanguageNegotiationSelected::METHOD_ID],
       'path' => 'admin/config',
       'expect' => $language_string,
       'expected_method_id' => LanguageNegotiationSelected::METHOD_ID,
       'http_header' => $http_header_browser_fallback,
       'message' => 'SELECTED: UI language is switched based on selected language.',
-    );
-    $this->runTest($test);
+    ];
+    $this->doRunTest($test);
 
     // An invalid language is selected.
     $this->config('language.negotiation')->set('selected_langcode', NULL)->save();
-    $test = array(
-      'language_negotiation' => array(LanguageNegotiationSelected::METHOD_ID),
+    $test = [
+      'language_negotiation' => [LanguageNegotiationSelected::METHOD_ID],
       'path' => 'admin/config',
       'expect' => $default_string,
       'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
       'http_header' => $http_header_browser_fallback,
       'message' => 'SELECTED > DEFAULT: UI language is switched based on selected language.',
-    );
-    $this->runTest($test);
+    ];
+    $this->doRunTest($test);
 
     // No selected language is available.
     $this->config('language.negotiation')->set('selected_langcode', $langcode_unknown)->save();
-    $test = array(
-      'language_negotiation' => array(LanguageNegotiationSelected::METHOD_ID),
+    $test = [
+      'language_negotiation' => [LanguageNegotiationSelected::METHOD_ID],
       'path' => 'admin/config',
       'expect' => $default_string,
       'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
       'http_header' => $http_header_browser_fallback,
       'message' => 'SELECTED > DEFAULT: UI language is switched based on selected language.',
-    );
-    $this->runTest($test);
+    ];
+    $this->doRunTest($test);
 
-    $tests = array(
+    $tests = [
       // Default, browser preference should have no influence.
-      array(
-        'language_negotiation' => array(LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationSelected::METHOD_ID),
+      [
+        'language_negotiation' => [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
         'path' => 'admin/config',
         'expect' => $default_string,
         'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
         'http_header' => $http_header_browser_fallback,
         'message' => 'URL (PATH) > DEFAULT: no language prefix, UI language is default and the browser language preference setting is not used.',
-      ),
+      ],
       // Language prefix.
-      array(
-        'language_negotiation' => array(LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationSelected::METHOD_ID),
+      [
+        'language_negotiation' => [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
         'path' => "$langcode/admin/config",
         'expect' => $language_string,
         'expected_method_id' => LanguageNegotiationUrl::METHOD_ID,
         'http_header' => $http_header_browser_fallback,
         'message' => 'URL (PATH) > DEFAULT: with language prefix, UI language is switched based on path prefix',
-      ),
+      ],
       // Default, go by browser preference.
-      array(
-        'language_negotiation' => array(LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationBrowser::METHOD_ID),
+      [
+        'language_negotiation' => [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationBrowser::METHOD_ID],
         'path' => 'admin/config',
         'expect' => $language_browser_fallback_string,
         'expected_method_id' => LanguageNegotiationBrowser::METHOD_ID,
         'http_header' => $http_header_browser_fallback,
         'message' => 'URL (PATH) > BROWSER: no language prefix, UI language is determined by browser language preference',
-      ),
+      ],
       // Prefix, switch to the language.
-      array(
-        'language_negotiation' => array(LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationBrowser::METHOD_ID),
+      [
+        'language_negotiation' => [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationBrowser::METHOD_ID],
         'path' => "$langcode/admin/config",
         'expect' => $language_string,
         'expected_method_id' => LanguageNegotiationUrl::METHOD_ID,
         'http_header' => $http_header_browser_fallback,
         'message' => 'URL (PATH) > BROWSER: with language prefix, UI language is based on path prefix',
-      ),
+      ],
       // Default, browser language preference is not one of site's lang.
-      array(
-        'language_negotiation' => array(LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationBrowser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID),
+      [
+        'language_negotiation' => [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationBrowser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
         'path' => 'admin/config',
         'expect' => $default_string,
         'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
         'http_header' => $http_header_blah,
         'message' => 'URL (PATH) > BROWSER > DEFAULT: no language prefix and browser language preference set to unknown language should use default language',
-      ),
-    );
+      ],
+    ];
 
     foreach ($tests as $test) {
-      $this->runTest($test);
+      $this->doRunTest($test);
     }
 
     // Unknown language prefix should return 404.
@@ -224,7 +224,7 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
     $this->config('language.types')
       ->set('negotiation.' . LanguageInterface::TYPE_INTERFACE . '.enabled', array_flip(array_keys($language_interface_method_definitions)))
       ->save();
-    $this->drupalGet("$langcode_unknown/admin/config", array(), $http_header_browser_fallback);
+    $this->drupalGet("$langcode_unknown/admin/config", [], $http_header_browser_fallback);
     $this->assertResponse(404, "Unknown language path prefix should return 404");
 
     // Set preferred langcode for user to NULL.
@@ -232,117 +232,117 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
     $account->preferred_langcode = NULL;
     $account->save();
 
-    $test = array(
-      'language_negotiation' => array(LanguageNegotiationUser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID),
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
       'path' => 'admin/config',
       'expect' => $default_string,
       'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
-      'http_header' => array(),
+      'http_header' => [],
       'message' => 'USER > DEFAULT: no preferred user language setting, the UI language is default',
-    );
-    $this->runTest($test);
+    ];
+    $this->doRunTest($test);
 
     // Set preferred langcode for user to unknown language.
     $account = $this->loggedInUser;
     $account->preferred_langcode = $langcode_unknown;
     $account->save();
 
-    $test = array(
-      'language_negotiation' => array(LanguageNegotiationUser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID),
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
       'path' => 'admin/config',
       'expect' => $default_string,
       'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
-      'http_header' => array(),
+      'http_header' => [],
       'message' => 'USER > DEFAULT: invalid preferred user language setting, the UI language is default',
-    );
-    $this->runTest($test);
+    ];
+    $this->doRunTest($test);
 
     // Set preferred langcode for user to non default.
     $account->preferred_langcode = $langcode;
     $account->save();
 
-    $test = array(
-      'language_negotiation' => array(LanguageNegotiationUser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID),
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
       'path' => 'admin/config',
       'expect' => $language_string,
       'expected_method_id' => LanguageNegotiationUser::METHOD_ID,
-      'http_header' => array(),
+      'http_header' => [],
       'message' => 'USER > DEFAULT: defined preferred user language setting, the UI language is based on user setting',
-    );
-    $this->runTest($test);
+    ];
+    $this->doRunTest($test);
 
     // Set preferred admin langcode for user to NULL.
     $account->preferred_admin_langcode = NULL;
     $account->save();
 
-    $test = array(
-      'language_negotiation' => array(LanguageNegotiationUserAdmin::METHOD_ID, LanguageNegotiationSelected::METHOD_ID),
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUserAdmin::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
       'path' => 'admin/config',
       'expect' => $default_string,
       'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
-      'http_header' => array(),
+      'http_header' => [],
       'message' => 'USER ADMIN > DEFAULT: no preferred user admin language setting, the UI language is default',
-    );
-    $this->runTest($test);
+    ];
+    $this->doRunTest($test);
 
     // Set preferred admin langcode for user to unknown language.
     $account->preferred_admin_langcode = $langcode_unknown;
     $account->save();
 
-    $test = array(
-      'language_negotiation' => array(LanguageNegotiationUserAdmin::METHOD_ID, LanguageNegotiationSelected::METHOD_ID),
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUserAdmin::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
       'path' => 'admin/config',
       'expect' => $default_string,
       'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
-      'http_header' => array(),
+      'http_header' => [],
       'message' => 'USER ADMIN > DEFAULT: invalid preferred user admin language setting, the UI language is default',
-    );
-    $this->runTest($test);
+    ];
+    $this->doRunTest($test);
 
     // Set preferred admin langcode for user to non default.
     $account->preferred_admin_langcode = $langcode;
     $account->save();
 
-    $test = array(
-      'language_negotiation' => array(LanguageNegotiationUserAdmin::METHOD_ID, LanguageNegotiationSelected::METHOD_ID),
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUserAdmin::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
       'path' => 'admin/config',
       'expect' => $language_string,
       'expected_method_id' => LanguageNegotiationUserAdmin::METHOD_ID,
-      'http_header' => array(),
+      'http_header' => [],
       'message' => 'USER ADMIN > DEFAULT: defined preferred user admin language setting, the UI language is based on user setting',
-    );
-    $this->runTest($test);
+    ];
+    $this->doRunTest($test);
 
     // Go by session preference.
     $language_negotiation_session_param = $this->randomMachineName();
-    $edit = array('language_negotiation_session_param' => $language_negotiation_session_param);
+    $edit = ['language_negotiation_session_param' => $language_negotiation_session_param];
     $this->drupalPostForm('admin/config/regional/language/detection/session', $edit, t('Save configuration'));
-    $tests = array(
-      array(
-        'language_negotiation' => array(LanguageNegotiationSession::METHOD_ID),
+    $tests = [
+      [
+        'language_negotiation' => [LanguageNegotiationSession::METHOD_ID],
         'path' => "admin/config",
         'expect' => $default_string,
         'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
         'http_header' => $http_header_browser_fallback,
         'message' => 'SESSION > DEFAULT: no language given, the UI language is default',
-      ),
-      array(
-        'language_negotiation' => array(LanguageNegotiationSession::METHOD_ID),
+      ],
+      [
+        'language_negotiation' => [LanguageNegotiationSession::METHOD_ID],
         'path' => 'admin/config',
         'path_options' => ['query' => [$language_negotiation_session_param => $langcode]],
         'expect' => $language_string,
         'expected_method_id' => LanguageNegotiationSession::METHOD_ID,
         'http_header' => $http_header_browser_fallback,
         'message' => 'SESSION > DEFAULT: language given, UI language is determined by session language preference',
-      ),
-    );
+      ],
+    ];
     foreach ($tests as $test) {
-      $this->runTest($test);
+      $this->doRunTest($test);
     }
   }
 
-  protected function runTest($test) {
-    $test += array('path_options' => []);
+  protected function doRunTest($test) {
+    $test += ['path_options' => []];
     if (!empty($test['language_negotiation'])) {
       $method_weights = array_flip($test['language_negotiation']);
       $this->container->get('language_negotiator')->saveConfiguration(LanguageInterface::TYPE_INTERFACE, $method_weights);
@@ -358,13 +358,13 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
     $this->container->get('language_manager')->reset();
     $this->drupalGet($test['path'], $test['path_options'], $test['http_header']);
     $this->assertText($test['expect'], $test['message']);
-    $this->assertText(t('Language negotiation method: @name', array('@name' => $test['expected_method_id'])));
+    $this->assertText(t('Language negotiation method: @name', ['@name' => $test['expected_method_id']]));
   }
 
   /**
    * Test URL language detection when the requested URL has no language.
    */
-  function testUrlLanguageFallback() {
+  public function testUrlLanguageFallback() {
     // Add the Italian language.
     $langcode_browser_fallback = 'it';
     ConfigurableLanguage::createFromLangcode($langcode_browser_fallback)->save();
@@ -372,21 +372,21 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
 
     // Enable the path prefix for the default language: this way any unprefixed
     // URL must have a valid fallback value.
-    $edit = array('prefix[en]' => 'en');
+    $edit = ['prefix[en]' => 'en'];
     $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
 
     // Enable browser and URL language detection.
-    $edit = array(
+    $edit = [
       'language_interface[enabled][language-browser]' => TRUE,
       'language_interface[enabled][language-url]' => TRUE,
       'language_interface[weight][language-browser]' => -8,
       'language_interface[weight][language-url]' => -10,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
     $this->drupalGet('admin/config/regional/language/detection');
 
     // Enable the language switcher block.
-    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, array('id' => 'test_language_block'));
+    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, ['id' => 'test_language_block']);
 
     // Log out, because for anonymous users, the "active" class is set by PHP
     // (which means we can easily test it here), whereas for authenticated users
@@ -398,13 +398,13 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
 
     // Access the front page without specifying any valid URL language prefix
     // and having as browser language preference a non-default language.
-    $http_header = array("Accept-Language: $langcode_browser_fallback;q=1");
-    $language = new Language(array('id' => ''));
-    $this->drupalGet('', array('language' => $language), $http_header);
+    $http_header = ["Accept-Language: $langcode_browser_fallback;q=1"];
+    $language = new Language(['id' => '']);
+    $this->drupalGet('', ['language' => $language], $http_header);
 
     // Check that the language switcher active link matches the given browser
     // language.
-    $args = array(':id' => 'block-test-language-block', ':url' => \Drupal::url('<front>') . $langcode_browser_fallback);
+    $args = [':id' => 'block-test-language-block', ':url' => \Drupal::url('<front>') . $langcode_browser_fallback];
     $fields = $this->xpath('//div[@id=:id]//a[@class="language-link is-active" and starts-with(@href, :url)]', $args);
     $this->assertTrue($fields[0] == $languages[$langcode_browser_fallback]->getName(), 'The browser language is the URL active language');
 
@@ -416,7 +416,7 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
   /**
    * Tests URL handling when separate domains are used for multiple languages.
    */
-  function testLanguageDomain() {
+  public function testLanguageDomain() {
     global $base_url;
 
     // Get the current host URI we're running on.
@@ -428,27 +428,27 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
     $languages = $this->container->get('language_manager')->getLanguages();
 
     // Enable browser and URL language detection.
-    $edit = array(
+    $edit = [
       'language_interface[enabled][language-url]' => TRUE,
       'language_interface[weight][language-url]' => -10,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Do not allow blank domain.
-    $edit = array(
+    $edit = [
       'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
       'domain[en]' => '',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
     $this->assertText('The domain may not be left blank for English', 'The form does not allow blank domains.');
     $this->rebuildContainer();
 
     // Change the domain for the Italian language.
-    $edit = array(
+    $edit = [
       'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
       'domain[en]' => $base_url_host,
       'domain[it]' => 'it.example.com',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
     $this->assertText('The configuration options have been saved', 'Domain configuration is saved.');
     $this->rebuildContainer();
@@ -471,19 +471,19 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
     $italian_url = Url::fromRoute('system.admin', [], ['language' => $languages['it']])->toString();
     $url_scheme = \Drupal::request()->isSecure() ? 'https://' : 'http://';
     $correct_link = $url_scheme . $link;
-    $this->assertEqual($italian_url, $correct_link, format_string('The right URL (@url) in accordance with the chosen language', array('@url' => $italian_url)));
+    $this->assertEqual($italian_url, $correct_link, format_string('The right URL (@url) in accordance with the chosen language', ['@url' => $italian_url]));
 
     // Test HTTPS via options.
     $italian_url = Url::fromRoute('system.admin', [], ['https' => TRUE, 'language' => $languages['it']])->toString();
     $correct_link = 'https://' . $link;
-    $this->assertTrue($italian_url == $correct_link, format_string('The right HTTPS URL (via options) (@url) in accordance with the chosen language', array('@url' => $italian_url)));
+    $this->assertTrue($italian_url == $correct_link, format_string('The right HTTPS URL (via options) (@url) in accordance with the chosen language', ['@url' => $italian_url]));
 
     // Test HTTPS via current URL scheme.
-    $request = Request::create('', 'GET', array(), array(), array(), array('HTTPS' => 'on'));
+    $request = Request::create('', 'GET', [], [], [], ['HTTPS' => 'on']);
     $this->container->get('request_stack')->push($request);
     $italian_url = Url::fromRoute('system.admin', [], ['language' => $languages['it']])->toString();
     $correct_link = 'https://' . $link;
-    $this->assertTrue($italian_url == $correct_link, format_string('The right URL (via current URL scheme) (@url) in accordance with the chosen language', array('@url' => $italian_url)));
+    $this->assertTrue($italian_url == $correct_link, format_string('The right URL (via current URL scheme) (@url) in accordance with the chosen language', ['@url' => $italian_url]));
   }
 
   /**
@@ -491,11 +491,11 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
    */
   public function testContentCustomization() {
     // Customize content language settings from their defaults.
-    $edit = array(
+    $edit = [
       'language_content[configurable]' => TRUE,
       'language_content[enabled][language-url]' => FALSE,
       'language_content[enabled][language-session]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Check if configurability persisted.
@@ -515,16 +515,16 @@ class LanguageUILanguageNegotiationTest extends WebTestBase {
     $block_id = 'test_language_block';
 
     // Enable the language switcher block.
-    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_CONTENT, array('id' => $block_id));
+    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_CONTENT, ['id' => $block_id]);
 
     // Check if the language switcher block has been created.
     $block = Block::load($block_id);
     $this->assertTrue($block, 'Language switcher block was created.');
 
     // Make sure language_content is not configurable.
-    $edit = array(
+    $edit = [
       'language_content[configurable]' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
     $this->assertResponse(200);
 
diff --git a/web/core/modules/language/src/Tests/LanguageUrlRewritingTest.php b/web/core/modules/language/src/Tests/LanguageUrlRewritingTest.php
index 5cd80dc4a..65ae64c37 100644
--- a/web/core/modules/language/src/Tests/LanguageUrlRewritingTest.php
+++ b/web/core/modules/language/src/Tests/LanguageUrlRewritingTest.php
@@ -21,7 +21,7 @@ class LanguageUrlRewritingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'language_test');
+  public static $modules = ['language', 'language_test'];
 
   /**
    * An user with permissions to administer languages.
@@ -34,16 +34,16 @@ class LanguageUrlRewritingTest extends WebTestBase {
     parent::setUp();
 
     // Create and log in user.
-    $this->webUser = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $this->webUser = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     $this->drupalLogin($this->webUser);
 
     // Install French language.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'fr';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Enable URL language detection and selection.
-    $edit = array('language_interface[enabled][language-url]' => 1);
+    $edit = ['language_interface[enabled][language-url]' => 1];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Check that drupalSettings contains path prefix.
@@ -54,9 +54,9 @@ class LanguageUrlRewritingTest extends WebTestBase {
   /**
    * Check that non-installed languages are not considered.
    */
-  function testUrlRewritingEdgeCases() {
+  public function testUrlRewritingEdgeCases() {
     // Check URL rewriting with a non-installed language.
-    $non_existing = new Language(array('id' => $this->randomMachineName()));
+    $non_existing = new Language(['id' => $this->randomMachineName()]);
     $this->checkUrl($non_existing, 'Path language is ignored if language is not installed.', 'URL language negotiation does not work with non-installed languages');
 
     // Check that URL rewriting is not applied to subrequests.
@@ -79,9 +79,9 @@ class LanguageUrlRewritingTest extends WebTestBase {
    *   The message to display confirming prefixed URL is not working.
    */
   private function checkUrl(LanguageInterface $language, $message1, $message2) {
-    $options = array('language' => $language, 'script' => '');
+    $options = ['language' => $language, 'script' => ''];
     $base_path = trim(base_path(), '/');
-    $rewritten_path = trim(str_replace($base_path, '', \Drupal::url('<front>', array(), $options)), '/');
+    $rewritten_path = trim(str_replace($base_path, '', \Drupal::url('<front>', [], $options)), '/');
     $segments = explode('/', $rewritten_path, 2);
     $prefix = $segments[0];
     $path = isset($segments[1]) ? $segments[1] : $prefix;
@@ -101,16 +101,16 @@ class LanguageUrlRewritingTest extends WebTestBase {
   /**
    * Check URL rewriting when using a domain name and a non-standard port.
    */
-  function testDomainNameNegotiationPort() {
+  public function testDomainNameNegotiationPort() {
     global $base_url;
     $language_domain = 'example.fr';
     // Get the current host URI we're running on.
     $base_url_host = parse_url($base_url, PHP_URL_HOST);
-    $edit = array(
+    $edit = [
       'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
       'domain[en]' => $base_url_host,
       'domain[fr]' => $language_domain
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
     // Rebuild the container so that the new language gets picked up by services
     // that hold the list of languages.
@@ -126,11 +126,11 @@ class LanguageUrlRewritingTest extends WebTestBase {
 
     // In case index.php is part of the URLs, we need to adapt the asserted
     // URLs as well.
-    $index_php = strpos(\Drupal::url('<front>', array(), array('absolute' => TRUE)), 'index.php') !== FALSE;
+    $index_php = strpos(\Drupal::url('<front>', [], ['absolute' => TRUE]), 'index.php') !== FALSE;
 
     $request = Request::createFromGlobals();
     $server = $request->server->all();
-    $request = $this->prepareRequestForGenerator(TRUE, array('HTTP_HOST' => $server['HTTP_HOST'] . ':88'));
+    $request = $this->prepareRequestForGenerator(TRUE, ['HTTP_HOST' => $server['HTTP_HOST'] . ':88']);
 
     // Create an absolute French link.
     $language = \Drupal::languageManager()->getLanguage('fr');
diff --git a/web/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php b/web/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php
index 99b2fff27..402166705 100644
--- a/web/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php
+++ b/web/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php
@@ -24,19 +24,19 @@ class LanguageConfigurationElement extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $conf = ContentLanguageSettings::loadByEntityTypeBundle('entity_test', 'some_bundle');
 
-    $form['lang_configuration'] = array(
+    $form['lang_configuration'] = [
       '#type' => 'language_configuration',
-      '#entity_information' => array(
+      '#entity_information' => [
         'entity_type' => 'entity_test',
         'bundle' => 'some_bundle',
-      ),
+      ],
       '#default_value' => $conf,
-    );
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Save',
-    );
+    ];
     $form['#submit'][] = 'language_configuration_element_submit';
     return $form;
   }
diff --git a/web/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php b/web/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php
index 0aa6c4975..f0fe8c51e 100644
--- a/web/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php
+++ b/web/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php
@@ -21,11 +21,11 @@ class LanguageConfigurationElementTest extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['langcode'] = array(
+    $form['langcode'] = [
       '#title' => t('Language select'),
       '#type' => 'language_select',
       '#default_value' => language_get_default_langcode('entity_test', 'some_bundle'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/language/tests/language_test/language_test.module b/web/core/modules/language/tests/language_test/language_test.module
index 2ca1ff5ea..5ea9c360b 100644
--- a/web/core/modules/language/tests/language_test/language_test.module
+++ b/web/core/modules/language/tests/language_test/language_test.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Url;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI;
 
 /**
@@ -14,7 +15,7 @@ use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI;
 function language_test_page_top() {
   if (\Drupal::moduleHandler()->moduleExists('language')) {
     language_test_store_language_negotiation();
-    drupal_set_message(t('Language negotiation method: @name', array('@name' => \Drupal::languageManager()->getNegotiatedLanguageMethod())));
+    drupal_set_message(t('Language negotiation method: @name', ['@name' => \Drupal::languageManager()->getNegotiatedLanguageMethod()]));
   }
 }
 
@@ -23,16 +24,16 @@ function language_test_page_top() {
  */
 function language_test_language_types_info() {
   if (\Drupal::state()->get('language_test.language_types')) {
-    return array(
-      'test_language_type' => array(
+    return [
+      'test_language_type' => [
         'name' => t('Test'),
         'description' => t('A test language type.'),
-      ),
-      'fixed_test_language_type' => array(
-        'fixed' => array('test_language_negotiation_method'),
+      ],
+      'fixed_test_language_type' => [
+        'fixed' => ['test_language_negotiation_method'],
         'locked' => TRUE,
-      ),
-    );
+      ],
+    ];
   }
 }
 
@@ -67,7 +68,7 @@ function language_test_language_negotiation_info_alter(array &$negotiation_info)
  * Store the last negotiated languages.
  */
 function language_test_store_language_negotiation() {
-  $last = array();
+  $last = [];
   foreach (\Drupal::languageManager()->getDefinedLanguageTypes() as $type) {
     $last[$type] = \Drupal::languageManager()->getCurrentLanguage($type)->getId();
   }
@@ -99,3 +100,10 @@ function language_test_language_fallback_candidates_test_alter(array &$candidate
 function language_test_module_preinstall() {
   \Drupal::state()->set('language_test.language_count_preinstall', count(\Drupal::languageManager()->getLanguages()));
 }
+
+/**
+ * Implements hook_language_switch_links_alter().
+ */
+function language_test_language_switch_links_alter(array &$links, $type, Url $url) {
+  // I'll just sit here and wait to be called with the right arguments.
+}
diff --git a/web/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php b/web/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
index 136d8eba6..441b2eb87 100644
--- a/web/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
+++ b/web/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php
@@ -60,7 +60,7 @@ class LanguageTestController implements ContainerInjectionInterface {
    *   Testing feedback based on (translated) entity title.
    */
   public function testEntity(ConfigurableLanguageInterface $configurable_language) {
-    return array('#markup' => $this->t('Loaded %label.', array('%label' => $configurable_language->label())));
+    return ['#markup' => $this->t('Loaded %label.', ['%label' => $configurable_language->label()])];
   }
 
   /**
@@ -72,43 +72,43 @@ class LanguageTestController implements ContainerInjectionInterface {
   public function typeLinkActiveClass() {
     // We assume that 'en' and 'fr' have been configured.
     $languages = $this->languageManager->getLanguages();
-    return array(
-      'no_language' => array(
+    return [
+      'no_language' => [
         '#type' => 'link',
         '#title' => t('Link to the current path with no langcode provided.'),
         '#url' => Url::fromRoute('<current>'),
-        '#options' => array(
-          'attributes' => array(
+        '#options' => [
+          'attributes' => [
             'id' => 'no_lang_link',
-          ),
+          ],
           'set_active_class' => TRUE,
-        ),
-      ),
-      'fr' => array(
+        ],
+      ],
+      'fr' => [
         '#type' => 'link',
         '#title' => t('Link to a French version of the current path.'),
         '#url' => Url::fromRoute('<current>'),
-        '#options' => array(
+        '#options' => [
           'language' => $languages['fr'],
-          'attributes' => array(
+          'attributes' => [
             'id' => 'fr_link',
-          ),
+          ],
           'set_active_class' => TRUE,
-        ),
-      ),
-      'en' => array(
+        ],
+      ],
+      'en' => [
         '#type' => 'link',
         '#title' => t('Link to an English version of the current path.'),
         '#url' => Url::fromRoute('<current>'),
-        '#options' => array(
+        '#options' => [
           'language' => $languages['en'],
-          'attributes' => array(
+          'attributes' => [
             'id' => 'en_link',
-          ),
+          ],
           'set_active_class' => TRUE,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -130,7 +130,7 @@ class LanguageTestController implements ContainerInjectionInterface {
     else {
       $base_path = $request->getBasePath();
     }
-    $sub_request = Request::create($base_path . '/user', 'GET', $request->query->all(), $request->cookies->all(), array(), $server);
+    $sub_request = Request::create($base_path . '/user', 'GET', $request->query->all(), $request->cookies->all(), [], $server);
     return $this->httpKernel->handle($sub_request, HttpKernelInterface::SUB_REQUEST);
   }
 
diff --git a/web/core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php b/web/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
similarity index 62%
rename from web/core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php
rename to web/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
index 3cc00f962..f689a9233 100644
--- a/web/core/modules/language/src/Tests/AdminPathEntityConverterLanguageTest.php
+++ b/web/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
@@ -1,25 +1,25 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test administration path based conversion of entities.
  *
  * @group language
  */
-class AdminPathEntityConverterLanguageTest extends WebTestBase {
+class AdminPathEntityConverterLanguageTest extends BrowserTestBase {
 
-  public static $modules = array('language', 'language_test');
+  public static $modules = ['language', 'language_test'];
 
   protected function setUp() {
     parent::setUp();
-    $permissions = array(
+    $permissions = [
       'access administration pages',
       'administer site configuration',
-    );
+    ];
     $this->drupalLogin($this->drupalCreateUser($permissions));
     ConfigurableLanguage::createFromLangcode('es')->save();
   }
@@ -34,12 +34,12 @@ class AdminPathEntityConverterLanguageTest extends WebTestBase {
       ->save();
 
     $this->drupalGet('es/admin/language_test/entity_using_current_language/es');
-    $this->assertNoRaw(t('Loaded %label.', array('%label' => 'Spanish')));
-    $this->assertRaw(t('Loaded %label.', array('%label' => 'Español')));
+    $this->assertNoRaw(t('Loaded %label.', ['%label' => 'Spanish']));
+    $this->assertRaw(t('Loaded %label.', ['%label' => 'Español']));
 
     $this->drupalGet('es/admin/language_test/entity_using_original_language/es');
-    $this->assertRaw(t('Loaded %label.', array('%label' => 'Spanish')));
-    $this->assertNoRaw(t('Loaded %label.', array('%label' => 'Español')));
+    $this->assertRaw(t('Loaded %label.', ['%label' => 'Spanish']));
+    $this->assertNoRaw(t('Loaded %label.', ['%label' => 'Español']));
   }
 
 }
diff --git a/web/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php b/web/core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php
similarity index 74%
rename from web/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php
rename to web/core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php
index ee6912e37..003c5a63f 100644
--- a/web/core/modules/language/src/Tests/LanguageBlockSettingsVisibilityTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that the language settings on block config appears correctly.
  *
  * @group language
  */
-class LanguageBlockSettingsVisibilityTest extends WebTestBase {
+class LanguageBlockSettingsVisibilityTest extends BrowserTestBase {
 
-  public static $modules = array('block', 'language');
+  public static $modules = ['block', 'language'];
 
   public function testUnnecessaryLanguageSettingsVisibility() {
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'administer blocks'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'administer blocks']);
     $this->drupalLogin($admin_user);
-    $this->drupalPostForm('admin/config/regional/language/add', array('predefined_langcode' => 'hu'), t('Add language'));
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'hu'], t('Add language'));
     $this->drupalGet('admin/structure/block/add/system_menu_block:admin/stark');
     $this->assertNoFieldByXPath('//input[@id="edit-visibility-language-langcodes-und"]', NULL, '\'Not specified\' option does not appear at block config, language settings section.');
     $this->assertNoFieldByXpath('//input[@id="edit-visibility-language-langcodes-zxx"]', NULL, '\'Not applicable\' option does not appear at block config, language settings section.');
diff --git a/web/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php b/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
similarity index 88%
rename from web/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php
rename to web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
index 3991b2a0a..a63ff451f 100644
--- a/web/core/modules/language/src/Tests/LanguageBrowserDetectionTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
@@ -1,25 +1,25 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests browser language detection.
  *
  * @group language
  */
-class LanguageBrowserDetectionTest extends WebTestBase {
+class LanguageBrowserDetectionTest extends BrowserTestBase {
 
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Tests for adding, editing and deleting mappings between browser language
    * codes and Drupal language codes.
    */
-  function testUIBrowserLanguageMappings() {
+  public function testUIBrowserLanguageMappings() {
     // User to manage languages.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     $this->drupalLogin($admin_user);
 
     // Check that the configure link exists.
@@ -34,19 +34,19 @@ class LanguageBrowserDetectionTest extends WebTestBase {
     // Delete zh-cn language code.
     $browser_langcode = 'zh-cn';
     $this->drupalGet('admin/config/regional/language/detection/browser/delete/' . $browser_langcode);
-    $message = t('Are you sure you want to delete @browser_langcode?', array(
+    $message = t('Are you sure you want to delete @browser_langcode?', [
       '@browser_langcode' => $browser_langcode,
-    ));
+    ]);
     $this->assertRaw($message);
 
     // Confirm the delete.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('admin/config/regional/language/detection/browser/delete/' . $browser_langcode, $edit, t('Confirm'));
 
     // We need raw here because %browser will add HTML.
-    $t_args = array(
+    $t_args = [
       '%browser' => $browser_langcode,
-    );
+    ];
     $this->assertRaw(t('The mapping for the %browser browser language code has been deleted.', $t_args), 'The test browser language code has been deleted.');
 
     // Check we went back to the browser negotiation mapping overview.
@@ -55,10 +55,10 @@ class LanguageBrowserDetectionTest extends WebTestBase {
     $this->assertNoField('edit-mappings-zh-cn-browser-langcode', 'Chinese browser language code no longer exists.');
 
     // Add a new custom mapping.
-    $edit = array(
+    $edit = [
       'new_mapping[browser_langcode]' => 'xx',
       'new_mapping[drupal_langcode]' => 'en',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration'));
     $this->assertUrl(\Drupal::url('language.negotiation_browser', [], ['absolute' => TRUE]));
     $this->assertField('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.');
@@ -69,18 +69,18 @@ class LanguageBrowserDetectionTest extends WebTestBase {
     $this->assertText('Browser language codes must be unique.');
 
     // Change browser language code of our custom mapping to zh-sg.
-    $edit = array(
+    $edit = [
       'mappings[xx][browser_langcode]' => 'zh-sg',
       'mappings[xx][drupal_langcode]' => 'en',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration'));
     $this->assertText(t('Browser language codes must be unique.'));
 
     // Change Drupal language code of our custom mapping to zh-hans.
-    $edit = array(
+    $edit = [
       'mappings[xx][browser_langcode]' => 'xx',
       'mappings[xx][drupal_langcode]' => 'zh-hans',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration'));
     $this->assertUrl(\Drupal::url('language.negotiation_browser', [], ['absolute' => TRUE]));
     $this->assertField('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.');
diff --git a/web/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php b/web/core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php
similarity index 80%
rename from web/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php
rename to web/core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php
index 182c3fef7..2ddd4963e 100644
--- a/web/core/modules/language/src/Tests/LanguageConfigOverrideImportTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Ensures the language config overrides can be synchronized.
  *
  * @group language
  */
-class LanguageConfigOverrideImportTest extends WebTestBase {
+class LanguageConfigOverrideImportTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('language', 'config', 'locale', 'config_translation');
+  public static $modules = ['language', 'config', 'locale', 'config_translation'];
 
   /**
    * Tests that language can be enabled and overrides are created during a sync.
@@ -31,7 +31,7 @@ class LanguageConfigOverrideImportTest extends WebTestBase {
     // Uninstall the language module and its dependencies so we can test
     // enabling the language module and creating overrides at the same time
     // during a configuration synchronization.
-    \Drupal::service('module_installer')->uninstall(array('language'));
+    \Drupal::service('module_installer')->uninstall(['language']);
     // Ensure that the current site has no overrides registered to the
     // ConfigFactory.
     $this->rebuildContainer();
@@ -39,8 +39,8 @@ class LanguageConfigOverrideImportTest extends WebTestBase {
     /* @var \Drupal\Core\Config\StorageInterface $override_sync */
     $override_sync = $sync->createCollection('language.fr');
     // Create some overrides in sync.
-    $override_sync->write('system.site', array('name' => 'FR default site name'));
-    $override_sync->write('system.maintenance', array('message' => 'FR message: @site is currently under maintenance. We should be back shortly. Thank you for your patience'));
+    $override_sync->write('system.site', ['name' => 'FR default site name']);
+    $override_sync->write('system.maintenance', ['message' => 'FR message: @site is currently under maintenance. We should be back shortly. Thank you for your patience']);
 
     $this->configImporter()->import();
     $this->rebuildContainer();
@@ -61,7 +61,7 @@ class LanguageConfigOverrideImportTest extends WebTestBase {
    */
   public function testConfigOverrideImportEvents() {
     // Enable the config_events_test module so we can record events occurring.
-    \Drupal::service('module_installer')->install(array('config_events_test'));
+    \Drupal::service('module_installer')->install(['config_events_test']);
     $this->rebuildContainer();
 
     ConfigurableLanguage::createFromLangcode('fr')->save();
@@ -73,7 +73,7 @@ class LanguageConfigOverrideImportTest extends WebTestBase {
     /* @var \Drupal\Core\Config\StorageInterface $override_sync */
     $override_sync = $sync->createCollection('language.fr');
     // Create some overrides in sync.
-    $override_sync->write('system.site', array('name' => 'FR default site name'));
+    $override_sync->write('system.site', ['name' => 'FR default site name']);
     \Drupal::state()->set('config_events_test.event', FALSE);
 
     $this->configImporter()->import();
diff --git a/web/core/modules/language/src/Tests/LanguageConfigSchemaTest.php b/web/core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php
similarity index 81%
rename from web/core/modules/language/src/Tests/LanguageConfigSchemaTest.php
rename to web/core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php
index 97cbbb747..e19fe53da 100644
--- a/web/core/modules/language/src/Tests/LanguageConfigSchemaTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Ensures the language config schema is correct.
  *
  * @group language
  */
-class LanguageConfigSchemaTest extends WebTestBase {
+class LanguageConfigSchemaTest extends BrowserTestBase {
 
   use SchemaCheckTestTrait;
 
@@ -19,7 +19,7 @@ class LanguageConfigSchemaTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'menu_link_content');
+  public static $modules = ['language', 'menu_link_content'];
 
   /**
    * A user with administrative permissions.
@@ -35,14 +35,14 @@ class LanguageConfigSchemaTest extends WebTestBase {
     parent::setUp();
 
     // Create user.
-    $this->adminUser = $this->drupalCreateUser(array('administer languages'));
+    $this->adminUser = $this->drupalCreateUser(['administer languages']);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Tests whether the language config schema is valid.
    */
-  function testValidLanguageConfigSchema() {
+  public function testValidLanguageConfigSchema() {
     // Make sure no language configuration available by default.
     $config_data = $this->config('language.settings')->get();
     $this->assertTrue(empty($config_data));
diff --git a/web/core/modules/language/src/Tests/LanguageListModuleInstallTest.php b/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
similarity index 67%
rename from web/core/modules/language/src/Tests/LanguageListModuleInstallTest.php
rename to web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
index 3df9bdc0b..013d00d8d 100644
--- a/web/core/modules/language/src/Tests/LanguageListModuleInstallTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests enabling Language if a module exists that calls
@@ -10,25 +10,25 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group language
  */
-class LanguageListModuleInstallTest extends WebTestBase {
+class LanguageListModuleInstallTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('language_test');
+  public static $modules = ['language_test'];
 
   /**
    * Tests enabling Language.
    */
-  function testModuleInstallLanguageList() {
+  public function testModuleInstallLanguageList() {
     // Since LanguageManager::getLanguages() uses static caches we need to do
     // this by enabling the module using the UI.
-    $admin_user = $this->drupalCreateUser(array('access administration pages', 'administer modules'));
+    $admin_user = $this->drupalCreateUser(['access administration pages', 'administer modules']);
     $this->drupalLogin($admin_user);
-    $edit = array();
-    $edit['modules[Multilingual][language][enable]'] = 'language';
+    $edit = [];
+    $edit['modules[language][enable]'] = 'language';
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     $this->assertEqual(\Drupal::state()->get('language_test.language_count_preinstall', 0), 1, 'Using LanguageManager::getLanguages() returns 1 language during Language installation.');
diff --git a/web/core/modules/language/src/Tests/LanguageNegotiationContentEntityTest.php b/web/core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php
similarity index 96%
rename from web/core/modules/language/src/Tests/LanguageNegotiationContentEntityTest.php
rename to web/core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php
index ba0a4db43..27785c095 100644
--- a/web/core/modules/language/src/Tests/LanguageNegotiationContentEntityTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Language\LanguageInterface;
@@ -8,7 +8,7 @@ use Drupal\entity_test\Entity\EntityTest;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
@@ -18,14 +18,14 @@ use Symfony\Component\Routing\Route;
  *
  * @group language
  */
-class LanguageNegotiationContentEntityTest extends WebTestBase {
+class LanguageNegotiationContentEntityTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('language', 'language_test', 'entity_test', 'system');
+  public static $modules = ['language', 'language_test', 'entity_test', 'system'];
 
   /**
    * The entity being used for testing.
@@ -49,7 +49,7 @@ class LanguageNegotiationContentEntityTest extends WebTestBase {
 
     $this->createTranslatableEntity();
 
-    $user = $this->drupalCreateUser(array('view test entity'));
+    $user = $this->drupalCreateUser(['view test entity']);
     $this->drupalLogin($user);
   }
 
diff --git a/web/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php b/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
similarity index 90%
rename from web/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php
rename to web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
index ee4c6d4ce..9133a125a 100644
--- a/web/core/modules/language/src/Tests/LanguageNegotiationInfoTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests alterations to language types/negotiation info.
  *
  * @group language
  */
-class LanguageNegotiationInfoTest extends WebTestBase {
+class LanguageNegotiationInfoTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -27,7 +27,7 @@ class LanguageNegotiationInfoTest extends WebTestBase {
     parent::setUp();
     $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'view the administration theme', 'administer modules']);
     $this->drupalLogin($admin_user);
-    $this->drupalPostForm('admin/config/regional/language/add', array('predefined_langcode' => 'it'), t('Add language'));
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'it'], t('Add language'));
   }
 
   /**
@@ -61,16 +61,16 @@ class LanguageNegotiationInfoTest extends WebTestBase {
   /**
    * Tests alterations to language types/negotiation info.
    */
-  function testInfoAlterations() {
-    $this->stateSet(array(
+  public function testInfoAlterations() {
+    $this->stateSet([
       // Enable language_test type info.
       'language_test.language_types' => TRUE,
       // Enable language_test negotiation info (not altered yet).
       'language_test.language_negotiation_info' => TRUE,
       // Alter LanguageInterface::TYPE_CONTENT to be configurable.
       'language_test.content_language_type' => TRUE,
-    ));
-    $this->container->get('module_installer')->install(array('language_test'));
+    ]);
+    $this->container->get('module_installer')->install(['language_test']);
     $this->resetAll();
 
     // Check that fixed language types are properly configured without the need
@@ -87,19 +87,19 @@ class LanguageNegotiationInfoTest extends WebTestBase {
     $interface_method_id = LanguageNegotiationUI::METHOD_ID;
     $test_method_id = 'test_language_negotiation_method';
     $form_field = $type . '[enabled][' . $interface_method_id . ']';
-    $edit = array(
+    $edit = [
       $form_field => TRUE,
       $type . '[enabled][' . $test_method_id . ']' => TRUE,
       $test_type . '[enabled][' . $test_method_id . ']' => TRUE,
       $test_type . '[configurable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Alter language negotiation info to remove interface language negotiation
     // method.
-    $this->stateSet(array(
+    $this->stateSet([
       'language_test.language_negotiation_info_alter' => TRUE,
-    ));
+    ]);
 
     $negotiation = $this->config('language.types')->get('negotiation.' . $type . '.enabled');
     $this->assertFalse(isset($negotiation[$interface_method_id]), 'Interface language negotiation method removed from the stored settings.');
@@ -112,10 +112,10 @@ class LanguageNegotiationInfoTest extends WebTestBase {
     foreach ($this->languageManager()->getLanguageTypes() as $type) {
       $form_field = $type . '[enabled][test_language_negotiation_method_ts]';
       if ($type == $test_type) {
-        $this->assertFieldByName($form_field, NULL, format_string('Type-specific test language negotiation method available for %type.', array('%type' => $type)));
+        $this->assertFieldByName($form_field, NULL, format_string('Type-specific test language negotiation method available for %type.', ['%type' => $type]));
       }
       else {
-        $this->assertNoFieldByName($form_field, NULL, format_string('Type-specific test language negotiation method unavailable for %type.', array('%type' => $type)));
+        $this->assertNoFieldByName($form_field, NULL, format_string('Type-specific test language negotiation method unavailable for %type.', ['%type' => $type]));
       }
     }
 
@@ -125,17 +125,17 @@ class LanguageNegotiationInfoTest extends WebTestBase {
     foreach ($this->languageManager()->getDefinedLanguageTypes() as $type) {
       $langcode = $last[$type];
       $value = $type == LanguageInterface::TYPE_CONTENT || strpos($type, 'test') !== FALSE ? 'it' : 'en';
-      $this->assertEqual($langcode, $value, format_string('The negotiated language for %type is %language', array('%type' => $type, '%language' => $value)));
+      $this->assertEqual($langcode, $value, format_string('The negotiated language for %type is %language', ['%type' => $type, '%language' => $value]));
     }
 
     // Uninstall language_test and check that everything is set back to the
     // original status.
-    $this->container->get('module_installer')->uninstall(array('language_test'));
+    $this->container->get('module_installer')->uninstall(['language_test']);
     $this->rebuildContainer();
 
     // Check that only the core language types are available.
     foreach ($this->languageManager()->getDefinedLanguageTypes() as $type) {
-      $this->assertTrue(strpos($type, 'test') === FALSE, format_string('The %type language is still available', array('%type' => $type)));
+      $this->assertTrue(strpos($type, 'test') === FALSE, format_string('The %type language is still available', ['%type' => $type]));
     }
 
     // Check that fixed language types are properly configured, even those
@@ -165,7 +165,7 @@ class LanguageNegotiationInfoTest extends WebTestBase {
           list(, $info_id) = each($info['fixed']);
           $equal = $info_id == $id;
         }
-        $this->assertTrue($equal, format_string('language negotiation for %type is properly set up', array('%type' => $type)));
+        $this->assertTrue($equal, format_string('language negotiation for %type is properly set up', ['%type' => $type]));
       }
     }
   }
@@ -184,7 +184,7 @@ class LanguageNegotiationInfoTest extends WebTestBase {
     $this->assertTrue($this->isLanguageTypeConfigurable($test_type), 'Language type is now configurable.');
 
     // After installing another module, the config should be the same.
-    $this->drupalPostForm('admin/modules', ['modules[Testing][test_module][enable]' => 1], t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[test_module][enable]' => 1], t('Install'));
     $this->assertTrue($this->isLanguageTypeConfigurable($test_type), 'Language type is still configurable.');
 
     // After uninstalling the other module, the config should be the same.
diff --git a/web/core/modules/language/tests/src/Functional/LanguageNegotiationUrlTest.php b/web/core/modules/language/tests/src/Functional/LanguageNegotiationUrlTest.php
new file mode 100644
index 000000000..8472ff77f
--- /dev/null
+++ b/web/core/modules/language/tests/src/Functional/LanguageNegotiationUrlTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl
+ * @group language
+ */
+class LanguageNegotiationUrlTest extends BrowserTestBase {
+
+  use StringTranslationTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'language',
+    'node',
+    'path',
+  ];
+
+  /**
+   * @var \Drupal\user\Entity\User
+   */
+  protected $user;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create an Article node type.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType(['type' => 'article']);
+    }
+
+    $this->user = $this->drupalCreateUser([
+      'administer languages',
+      'access administration pages',
+      'view the administration theme',
+      'administer nodes',
+      'create article content',
+      'create url aliases',
+    ]);
+    $this->drupalLogin($this->user);
+
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'de'], $this->t('Add language'));
+  }
+
+  /**
+   * @covers ::processInbound
+   */
+  public function testDomain() {
+    // Check if paths that contain language prefixes can be reached when
+    // language is taken from the domain.
+    $edit = [
+      'language_negotiation_url_part' => 'domain',
+      'prefix[en]' => 'eng',
+      'prefix[de]' => 'de',
+      'domain[en]' => $_SERVER['HTTP_HOST'],
+      'domain[de]' => "de.$_SERVER[HTTP_HOST]",
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, $this->t('Save configuration'));
+
+    $nodeValues = [
+      'title[0][value]' => 'Test',
+      'path[0][alias]' => '/eng/test',
+    ];
+    $this->drupalPostForm('node/add/article', $nodeValues, $this->t('Save and publish'));
+    $this->assertSession()->statusCodeEquals(200);
+  }
+
+}
diff --git a/web/core/modules/language/src/Tests/LanguagePathMonolingualTest.php b/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
similarity index 82%
rename from web/core/modules/language/src/Tests/LanguagePathMonolingualTest.php
rename to web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
index 510d80542..17ff3f936 100644
--- a/web/core/modules/language/src/Tests/LanguagePathMonolingualTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\language\Tests;
+namespace Drupal\Tests\language\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Confirm that paths are not changed on monolingual non-English sites.
  *
  * @group language
  */
-class LanguagePathMonolingualTest extends WebTestBase {
+class LanguagePathMonolingualTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -22,22 +22,22 @@ class LanguagePathMonolingualTest extends WebTestBase {
     parent::setUp();
 
     // Create and log in user.
-    $web_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'administer site configuration'));
+    $web_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'administer site configuration']);
     $this->drupalLogin($web_user);
 
     // Enable French language.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'fr';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Make French the default language.
-    $edit = array(
+    $edit = [
       'site_default_language' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration'));
 
     // Delete English.
-    $this->drupalPostForm('admin/config/regional/language/delete/en', array(), t('Delete'));
+    $this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
 
     // Changing the default language causes a container rebuild. Therefore need
     // to rebuild the container in the test environment.
@@ -49,7 +49,7 @@ class LanguagePathMonolingualTest extends WebTestBase {
     $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), 'fr', 'French is the default language');
 
     // Set language detection to URL.
-    $edit = array('language_interface[enabled][language-url]' => TRUE);
+    $edit = ['language_interface[enabled][language-url]' => TRUE];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
     $this->drupalPlaceBlock('local_actions_block');
   }
@@ -57,7 +57,7 @@ class LanguagePathMonolingualTest extends WebTestBase {
   /**
    * Verifies that links do not have language prefixes in them.
    */
-  function testPageLinks() {
+  public function testPageLinks() {
     // Navigate to 'admin/config' path.
     $this->drupalGet('admin/config');
 
diff --git a/web/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php b/web/core/modules/language/tests/src/Functional/Migrate/MigrateLanguageTest.php
similarity index 96%
rename from web/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php
rename to web/core/modules/language/tests/src/Functional/Migrate/MigrateLanguageTest.php
index 6bdd1f29a..9a2702da2 100644
--- a/web/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php
+++ b/web/core/modules/language/tests/src/Functional/Migrate/MigrateLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\language\Tests\Migrate;
+namespace Drupal\Tests\language\Functional\Migrate;
 
 use Drupal\language\ConfigurableLanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
diff --git a/web/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php b/web/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php
index 92b2a04f2..af7eed4b7 100644
--- a/web/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php
@@ -32,12 +32,12 @@ class LanguageConditionTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'language');
+  public static $modules = ['system', 'language'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->installConfig(array('language'));
+    $this->installConfig(['language']);
     // Setup Italian.
     ConfigurableLanguage::createFromLangcode('it')->save();
 
@@ -52,14 +52,14 @@ class LanguageConditionTest extends KernelTestBase {
     // language.
     $language = \Drupal::languageManager()->getLanguage('en');
     $condition = $this->manager->createInstance('language')
-      ->setConfig('langcodes', array('en' => 'en', 'it' => 'it'))
+      ->setConfig('langcodes', ['en' => 'en', 'it' => 'it'])
       ->setContextValue('language', $language);
     $this->assertTrue($condition->execute(), 'Language condition passes as expected.');
     // Check for the proper summary.
     $this->assertEqual($condition->summary(), 'The language is English, Italian.');
 
     // Change to Italian only.
-    $condition->setConfig('langcodes', array('it' => 'it'));
+    $condition->setConfig('langcodes', ['it' => 'it']);
     $this->assertFalse($condition->execute(), 'Language condition fails as expected.');
     // Check for the proper summary.
     $this->assertEqual($condition->summary(), 'The language is Italian.');
@@ -74,7 +74,7 @@ class LanguageConditionTest extends KernelTestBase {
     $language = \Drupal::languageManager()->getLanguage('it');
 
     $condition = $this->manager->createInstance('language')
-      ->setConfig('langcodes', array('en' => 'en', 'it' => 'it'))
+      ->setConfig('langcodes', ['en' => 'en', 'it' => 'it'])
       ->setContextValue('language', $language);
 
     $this->assertTrue($condition->execute(), 'Language condition passes as expected.');
@@ -82,7 +82,7 @@ class LanguageConditionTest extends KernelTestBase {
     $this->assertEqual($condition->summary(), 'The language is English, Italian.');
 
     // Change to Italian only.
-    $condition->setConfig('langcodes', array('it' => 'it'));
+    $condition->setConfig('langcodes', ['it' => 'it']);
     $this->assertTrue($condition->execute(), 'Language condition passes as expected.');
     // Check for the proper summary.
     $this->assertEqual($condition->summary(), 'The language is Italian.');
diff --git a/web/core/modules/language/tests/src/Kernel/ConfigurableLanguageManagerTest.php b/web/core/modules/language/tests/src/Kernel/ConfigurableLanguageManagerTest.php
new file mode 100644
index 000000000..92ab889ce
--- /dev/null
+++ b/web/core/modules/language/tests/src/Kernel/ConfigurableLanguageManagerTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Url;
+
+/**
+ * Tests the ConfigurableLanguage entity.
+ *
+ * @group language
+ * @coversDefaultClass \Drupal\language\ConfigurableLanguageManager
+ */
+class ConfigurableLanguageManagerTest extends LanguageTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['user'];
+
+  /**
+   * The language negotiator.
+   *
+   * @var \Drupal\language\LanguageNegotiatorInterface
+   */
+  protected $languageNegotiator;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\language\ConfigurableLanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installSchema('system', ['sequence']);
+    $this->installEntitySchema('user');
+
+    $this->languageNegotiator = $this->container->get('language_negotiator');
+    $this->languageManager = $this->container->get('language_manager');
+  }
+
+  /**
+   * @covers ::getLanguageSwitchLinks
+   */
+  public function testLanguageSwitchLinks() {
+    $this->languageNegotiator->setCurrentUser($this->prophesize('Drupal\Core\Session\AccountInterface')->reveal());
+    $this->languageManager->getLanguageSwitchLinks(LanguageInterface::TYPE_INTERFACE, new Url('<current>'));
+  }
+
+}
diff --git a/web/core/modules/language/tests/src/Kernel/ConfigurableLanguageTest.php b/web/core/modules/language/tests/src/Kernel/ConfigurableLanguageTest.php
index a87a6e3f9..00af14cbd 100644
--- a/web/core/modules/language/tests/src/Kernel/ConfigurableLanguageTest.php
+++ b/web/core/modules/language/tests/src/Kernel/ConfigurableLanguageTest.php
@@ -18,7 +18,7 @@ class ConfigurableLanguageTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Tests configurable language name methods.
@@ -26,7 +26,7 @@ class ConfigurableLanguageTest extends KernelTestBase {
   public function testName() {
     $name = $this->randomMachineName();
     $language_code = $this->randomMachineName(2);
-    $configurableLanguage = new ConfigurableLanguage(array('label' => $name, 'id' => $language_code), 'configurable_language');
+    $configurableLanguage = new ConfigurableLanguage(['label' => $name, 'id' => $language_code], 'configurable_language');
     $this->assertEqual($configurableLanguage->getName(), $name);
     $this->assertEqual($configurableLanguage->setName('Test language')->getName(), 'Test language');
   }
diff --git a/web/core/modules/language/tests/src/Kernel/EntityDefaultLanguageTest.php b/web/core/modules/language/tests/src/Kernel/EntityDefaultLanguageTest.php
index 84368b70f..88abdd900 100644
--- a/web/core/modules/language/tests/src/Kernel/EntityDefaultLanguageTest.php
+++ b/web/core/modules/language/tests/src/Kernel/EntityDefaultLanguageTest.php
@@ -18,7 +18,7 @@ class EntityDefaultLanguageTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'node', 'field', 'text', 'user', 'system');
+  public static $modules = ['language', 'node', 'field', 'text', 'user', 'system'];
 
   /**
    * {@inheritdoc}
@@ -29,9 +29,9 @@ class EntityDefaultLanguageTest extends KernelTestBase {
     $this->installEntitySchema('user');
 
     // Activate Spanish language, so there are two languages activated.
-    $language = $this->container->get('entity.manager')->getStorage('configurable_language')->create(array(
+    $language = $this->container->get('entity.manager')->getStorage('configurable_language')->create([
       'id' => 'es',
-    ));
+    ]);
     $language->save();
 
     // Create a new content type which has Undefined language by default.
@@ -67,7 +67,7 @@ class EntityDefaultLanguageTest extends KernelTestBase {
     $this->assertEqual($node->langcode->value, 'en');
 
     // Disable language module.
-    $this->disableModules(array('language'));
+    $this->disableModules(['language']);
 
     // With language module disabled, and a content type that is configured to
     // have no language specified by default, a new node of this content type
@@ -101,12 +101,12 @@ class EntityDefaultLanguageTest extends KernelTestBase {
    *   Default language code of the nodes of this type.
    */
   protected function createContentType($name, $langcode) {
-    $content_type = $this->container->get('entity.manager')->getStorage('node_type')->create(array(
+    $content_type = $this->container->get('entity.manager')->getStorage('node_type')->create([
       'name' => 'Test ' . $name,
       'title_label' => 'Title',
       'type' => $name,
       'create_body' => FALSE,
-    ));
+    ]);
     $content_type->save();
     ContentLanguageSettings::loadByEntityTypeBundle('node', $name)
       ->setLanguageAlterable(FALSE)
@@ -127,10 +127,10 @@ class EntityDefaultLanguageTest extends KernelTestBase {
    *   The node created.
    */
   protected function createNode($type, $langcode = NULL) {
-    $values = array(
+    $values = [
       'type' => $type,
       'title' => $this->randomString(),
-    );
+    ];
     if (!empty($langcode)) {
       $values['langcode'] = $langcode;
     }
diff --git a/web/core/modules/language/tests/src/Kernel/LanguageConfigFactoryOverrideTest.php b/web/core/modules/language/tests/src/Kernel/LanguageConfigFactoryOverrideTest.php
new file mode 100644
index 000000000..3082697b0
--- /dev/null
+++ b/web/core/modules/language/tests/src/Kernel/LanguageConfigFactoryOverrideTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests \Drupal\language\Config\LanguageConfigFactoryOverride.
+ *
+ * @group language
+ */
+class LanguageConfigFactoryOverrideTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system', 'language'];
+
+  /**
+   * Tests language.config_factory_override service has the default language.
+   */
+  public function testLanguageConfigFactoryOverride() {
+    $this->installConfig('system');
+    $this->installConfig('language');
+
+    /** @var \Drupal\language\Config\LanguageConfigFactoryOverride $config_factory_override */
+    $config_factory_override = \Drupal::service('language.config_factory_override');
+    $this->assertEquals('en', $config_factory_override->getLanguage()->getId());
+
+    ConfigurableLanguage::createFromLangcode('de')->save();
+
+    // Invalidate the container.
+    $this->config('system.site')->set('default_langcode', 'de')->save();
+    drupal_flush_all_caches();
+
+    $config_factory_override = \Drupal::service('language.config_factory_override');
+    $this->assertEquals('de', $config_factory_override->getLanguage()->getId());
+  }
+
+}
diff --git a/web/core/modules/language/tests/src/Kernel/LanguageConfigOverrideInstallTest.php b/web/core/modules/language/tests/src/Kernel/LanguageConfigOverrideInstallTest.php
index c01187c9e..7d505baf7 100644
--- a/web/core/modules/language/tests/src/Kernel/LanguageConfigOverrideInstallTest.php
+++ b/web/core/modules/language/tests/src/Kernel/LanguageConfigOverrideInstallTest.php
@@ -17,7 +17,7 @@ class LanguageConfigOverrideInstallTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'config_events_test');
+  public static $modules = ['language', 'config_events_test'];
 
   /**
    * Tests the configuration events are not fired during install of overrides.
@@ -26,9 +26,9 @@ class LanguageConfigOverrideInstallTest extends KernelTestBase {
     ConfigurableLanguage::createFromLangcode('de')->save();
     // Need to enable test module after creating the language otherwise saving
     // the language will install the configuration.
-    $this->enableModules(array('language_config_override_test'));
+    $this->enableModules(['language_config_override_test']);
     \Drupal::state()->set('config_events_test.event', FALSE);
-    $this->installConfig(array('language_config_override_test'));
+    $this->installConfig(['language_config_override_test']);
     $event_recorder = \Drupal::state()->get('config_events_test.event', FALSE);
     $this->assertFalse($event_recorder);
     $config = \Drupal::service('language.config_factory_override')->getOverride('de', 'language_config_override_test.settings');
diff --git a/web/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php b/web/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php
index 74b167f3c..287ab9528 100644
--- a/web/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php
+++ b/web/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php
@@ -18,11 +18,11 @@ class LanguageDependencyInjectionTest extends LanguageTestBase {
    *
    * @see \Drupal\Core\Language\LanguageInterface
    */
-  function testDependencyInjectedNewLanguage() {
+  public function testDependencyInjectedNewLanguage() {
     $expected = $this->languageManager->getDefaultLanguage();
     $result = $this->languageManager->getCurrentLanguage();
     foreach ($expected as $property => $value) {
-      $this->assertEqual($expected->$property, $result->$property, format_string('The dependency injected language object %prop property equals the new Language object %prop property.', array('%prop' => $property)));
+      $this->assertEqual($expected->$property, $result->$property, format_string('The dependency injected language object %prop property equals the new Language object %prop property.', ['%prop' => $property]));
     }
   }
 
@@ -32,7 +32,7 @@ class LanguageDependencyInjectionTest extends LanguageTestBase {
    *
    * @see \Drupal\Core\Language\Language
    */
-  function testDependencyInjectedNewDefaultLanguage() {
+  public function testDependencyInjectedNewDefaultLanguage() {
     $default_language = ConfigurableLanguage::load(\Drupal::languageManager()->getDefaultLanguage()->getId());
     // Change the language default object to different values.
     ConfigurableLanguage::createFromLangcode('fr')->save();
@@ -45,7 +45,7 @@ class LanguageDependencyInjectionTest extends LanguageTestBase {
 
     // Delete the language to check that we fallback to the default.
     try {
-      entity_delete_multiple('configurable_language', array('fr'));
+      entity_delete_multiple('configurable_language', ['fr']);
       $this->fail('Expected DeleteDefaultLanguageException thrown.');
     }
     catch (DeleteDefaultLanguageException $e) {
@@ -55,7 +55,7 @@ class LanguageDependencyInjectionTest extends LanguageTestBase {
     // Re-save the previous default language and the delete should work.
     $this->config('system.site')->set('default_langcode', $default_language->getId())->save();
 
-    entity_delete_multiple('configurable_language', array('fr'));
+    entity_delete_multiple('configurable_language', ['fr']);
     $result = \Drupal::languageManager()->getCurrentLanguage();
     $this->assertIdentical($result->getId(), $default_language->getId());
   }
diff --git a/web/core/modules/language/tests/src/Kernel/LanguageFallbackTest.php b/web/core/modules/language/tests/src/Kernel/LanguageFallbackTest.php
index ab293bd5b..17f4ca396 100644
--- a/web/core/modules/language/tests/src/Kernel/LanguageFallbackTest.php
+++ b/web/core/modules/language/tests/src/Kernel/LanguageFallbackTest.php
@@ -19,7 +19,7 @@ class LanguageFallbackTest extends LanguageTestBase {
     parent::setUp();
 
     $i = 0;
-    foreach (array('af', 'am', 'ar') as $langcode) {
+    foreach (['af', 'am', 'ar'] as $langcode) {
       $language = ConfigurableLanguage::createFromLangcode($langcode);
       $language->set('weight', $i--);
       $language->save();
@@ -31,7 +31,7 @@ class LanguageFallbackTest extends LanguageTestBase {
    */
   public function testCandidates() {
     $language_list = $this->languageManager->getLanguages();
-    $expected = array_keys($language_list + array(LanguageInterface::LANGCODE_NOT_SPECIFIED => NULL));
+    $expected = array_keys($language_list + [LanguageInterface::LANGCODE_NOT_SPECIFIED => NULL]);
 
     // Check that language fallback candidates by default are all the available
     // languages sorted by weight.
@@ -49,11 +49,11 @@ class LanguageFallbackTest extends LanguageTestBase {
     $this->state->set('language_test.fallback_operation_alter.candidates', TRUE);
     $expected[] = LanguageInterface::LANGCODE_NOT_SPECIFIED;
     $expected[] = LanguageInterface::LANGCODE_NOT_APPLICABLE;
-    $candidates = $this->languageManager->getFallbackCandidates(array('operation' => 'test'));
+    $candidates = $this->languageManager->getFallbackCandidates(['operation' => 'test']);
     $this->assertEqual(array_values($candidates), $expected, 'Language fallback candidates are alterable for specific operations.');
 
     // Check that when the site is monolingual no language fallback is applied.
-    $langcodes_to_delete = array();
+    $langcodes_to_delete = [];
     foreach ($language_list as $langcode => $language) {
       if (!$language->isDefault()) {
         $langcodes_to_delete[] = $langcode;
@@ -61,7 +61,7 @@ class LanguageFallbackTest extends LanguageTestBase {
     }
     entity_delete_multiple('configurable_language', $langcodes_to_delete);
     $candidates = $this->languageManager->getFallbackCandidates();
-    $this->assertEqual(array_values($candidates), array(LanguageInterface::LANGCODE_DEFAULT), 'Language fallback is not applied when the Language module is not enabled.');
+    $this->assertEqual(array_values($candidates), [LanguageInterface::LANGCODE_DEFAULT], 'Language fallback is not applied when the Language module is not enabled.');
   }
 
 }
diff --git a/web/core/modules/language/tests/src/Kernel/LanguageTestBase.php b/web/core/modules/language/tests/src/Kernel/LanguageTestBase.php
index eb4f0ef00..f4dcbd2f9 100644
--- a/web/core/modules/language/tests/src/Kernel/LanguageTestBase.php
+++ b/web/core/modules/language/tests/src/Kernel/LanguageTestBase.php
@@ -9,7 +9,7 @@ use Drupal\KernelTests\KernelTestBase;
  */
 abstract class LanguageTestBase extends KernelTestBase {
 
-  public static $modules = array('system', 'language', 'language_test');
+  public static $modules = ['system', 'language', 'language_test'];
   /**
    * The language manager.
    *
@@ -30,7 +30,7 @@ abstract class LanguageTestBase extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installConfig(array('language'));
+    $this->installConfig(['language']);
 
     $this->state = $this->container->get('state');
 
diff --git a/web/core/modules/language/tests/src/Kernel/Migrate/MigrateDefaultLanguageTrait.php b/web/core/modules/language/tests/src/Kernel/Migrate/MigrateDefaultLanguageTrait.php
index 94bb02d33..dd2e67ecf 100644
--- a/web/core/modules/language/tests/src/Kernel/Migrate/MigrateDefaultLanguageTrait.php
+++ b/web/core/modules/language/tests/src/Kernel/Migrate/MigrateDefaultLanguageTrait.php
@@ -24,9 +24,9 @@ trait MigrateDefaultLanguageTrait {
     // default language is migrated.
     $value = 'O:8:"stdClass":11:{s:8:"language";s:2:"' . $langcode . '";s:4:"name";s:6:"French";s:6:"native";s:6:"French";s:9:"direction";s:1:"0";s:7:"enabled";i:1;s:7:"plurals";s:1:"0";s:7:"formula";s:0:"";s:6:"domain";s:0:"";s:6:"prefix";s:0:"";s:6:"weight";s:1:"0";s:10:"javascript";s:0:"";}';
     $this->sourceDatabase->update('variable')
-      ->fields(array(
+      ->fields([
         'value' => $value
-      ))
+      ])
       ->condition('name', 'language_default' )
       ->execute();
 
diff --git a/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageNegotiationSettingsTest.php b/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageNegotiationSettingsTest.php
index 0e74f494a..4a8842740 100644
--- a/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageNegotiationSettingsTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageNegotiationSettingsTest.php
@@ -56,7 +56,7 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal6TestBase {
    */
   public function testLanguageNegotiationWithNoNegotiation() {
     $this->sourceDatabase->update('variable')
-      ->fields(array('value' => serialize(0)))
+      ->fields(['value' => serialize(0)])
       ->condition('name', 'language_negotiation')
       ->execute();
 
@@ -88,7 +88,7 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal6TestBase {
    */
   public function testLanguageNegotiationWithPathPrefix() {
     $this->sourceDatabase->update('variable')
-      ->fields(array('value' => serialize(2)))
+      ->fields(['value' => serialize(2)])
       ->condition('name', 'language_negotiation')
       ->execute();
 
@@ -129,7 +129,7 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal6TestBase {
    */
   public function testLanguageNegotiationWithDomain() {
     $this->sourceDatabase->update('variable')
-      ->fields(array('value' => serialize(3)))
+      ->fields(['value' => serialize(3)])
       ->condition('name', 'language_negotiation')
       ->execute();
 
diff --git a/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php b/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
index 269bac697..09681dee6 100644
--- a/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
@@ -75,7 +75,7 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
    */
   public function testLanguageNegotiationWithDomain() {
     $this->sourceDatabase->update('variable')
-      ->fields(array('value' => serialize(1)))
+      ->fields(['value' => serialize(1)])
       ->condition('name', 'locale_language_negotiation_url_part')
       ->execute();
 
diff --git a/web/core/modules/language/tests/src/Kernel/Plugin/migrate/source/LanguageTest.php b/web/core/modules/language/tests/src/Kernel/Plugin/migrate/source/LanguageTest.php
new file mode 100644
index 000000000..6aa318eb4
--- /dev/null
+++ b/web/core/modules/language/tests/src/Kernel/Plugin/migrate/source/LanguageTest.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Plugin\migrate\source;
+
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+
+/**
+ * Tests the language source plugin.
+ *
+ * @covers \Drupal\language\Plugin\migrate\source\Language
+ * @group language
+ */
+class LanguageTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language', 'migrate_drupal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    $tests = [];
+
+    // The source data.
+    $tests[0]['source_data']['languages'] = [
+      [
+        'language' => 'en',
+        'name' => 'English',
+        'native' => 'English',
+        'direction' => '0',
+        'enabled' => '1',
+        'plurals' => '0',
+        'formula' => '',
+        'domain' => '',
+        'prefix' => '',
+        'weight' => '0',
+        'javascript' => '',
+      ],
+      [
+        'language' => 'fr',
+        'name' => 'French',
+        'native' => 'Français',
+        'direction' => '0',
+        'enabled' => '0',
+        'plurals' => '2',
+        'formula' => '($n>1)',
+        'domain' => '',
+        'prefix' => 'fr',
+        'weight' => '0',
+        'javascript' => '',
+      ],
+    ];
+
+    // The expected results.
+    $tests[0]['expected_data'] = [
+      [
+        'language' => 'en',
+        'name' => 'English',
+        'native' => 'English',
+        'direction' => '0',
+        'enabled' => '1',
+        'plurals' => '0',
+        'formula' => '',
+        'domain' => '',
+        'prefix' => '',
+        'weight' => '0',
+        'javascript' => '',
+      ],
+      [
+        'language' => 'fr',
+        'name' => 'French',
+        'native' => 'Français',
+        'direction' => '0',
+        'enabled' => '0',
+        'plurals' => '2',
+        'formula' => '($n>1)',
+        'domain' => '',
+        'prefix' => 'fr',
+        'weight' => '0',
+        'javascript' => '',
+      ],
+    ];
+
+    return $tests;
+  }
+
+}
diff --git a/web/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php b/web/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php
index 3a4e9cf75..27c7410b9 100644
--- a/web/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php
@@ -17,28 +17,28 @@ class ArgumentLanguageTest extends LanguageTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests the language argument.
    */
   public function testArgument() {
     $view = Views::getView('test_view');
-    foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
+    foreach (['en' => 'John', 'xx-lolspeak' => 'George'] as $langcode => $name) {
       $view->setDisplay();
-      $view->displayHandlers->get('default')->overrideOption('arguments', array(
-        'langcode' => array(
+      $view->displayHandlers->get('default')->overrideOption('arguments', [
+        'langcode' => [
           'id' => 'langcode',
           'table' => 'views_test_data',
           'field' => 'langcode',
-        ),
-      ));
-      $this->executeView($view, array($langcode));
+        ],
+      ]);
+      $this->executeView($view, [$langcode]);
 
-      $expected = array(array(
+      $expected = [[
         'name' => $name,
-      ));
-      $this->assertIdenticalResultset($view, $expected, array('views_test_data_name' => 'name'));
+      ]];
+      $this->assertIdenticalResultset($view, $expected, ['views_test_data_name' => 'name']);
       $view->destroy();
     }
   }
diff --git a/web/core/modules/language/tests/src/Kernel/Views/FieldLanguageTest.php b/web/core/modules/language/tests/src/Kernel/Views/FieldLanguageTest.php
index 3dbbfe424..5dc712404 100644
--- a/web/core/modules/language/tests/src/Kernel/Views/FieldLanguageTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Views/FieldLanguageTest.php
@@ -17,7 +17,7 @@ class FieldLanguageTest extends LanguageTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests the language field.
@@ -25,13 +25,13 @@ class FieldLanguageTest extends LanguageTestBase {
   public function testField() {
     $view = Views::getView('test_view');
     $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'langcode' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'langcode' => [
         'id' => 'langcode',
         'table' => 'views_test_data',
         'field' => 'langcode',
-      ),
-    ));
+      ],
+    ]);
     $this->executeView($view);
 
     $this->assertEqual($view->field['langcode']->advancedRender($view->result[0]), 'English');
diff --git a/web/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php b/web/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php
index 0c6241a4e..c9dc98cbf 100644
--- a/web/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php
@@ -17,29 +17,29 @@ class FilterLanguageTest extends LanguageTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests the language filter.
    */
   public function testFilter() {
     $view = Views::getView('test_view');
-    foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
+    foreach (['en' => 'John', 'xx-lolspeak' => 'George'] as $langcode => $name) {
       $view->setDisplay();
-      $view->displayHandlers->get('default')->overrideOption('filters', array(
-        'langcode' => array(
+      $view->displayHandlers->get('default')->overrideOption('filters', [
+        'langcode' => [
           'id' => 'langcode',
           'table' => 'views_test_data',
           'field' => 'langcode',
-          'value' => array($langcode),
-        ),
-      ));
+          'value' => [$langcode],
+        ],
+      ]);
       $this->executeView($view);
 
-      $expected = array(array(
+      $expected = [[
         'name' => $name,
-      ));
-      $this->assertIdenticalResultset($view, $expected, array('views_test_data_name' => 'name'));
+      ]];
+      $this->assertIdenticalResultset($view, $expected, ['views_test_data_name' => 'name']);
 
       $expected = [
         '***LANGUAGE_site_default***',
diff --git a/web/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php b/web/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php
index cb5d4739d..cab6fc84e 100644
--- a/web/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php
+++ b/web/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php
@@ -15,14 +15,14 @@ abstract class LanguageTestBase extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'language');
+  public static $modules = ['system', 'language'];
 
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
-    $this->installConfig(array('language'));
+    $this->installConfig(['language']);
 
     // Create another language beside English.
-    ConfigurableLanguage::create(array('id' => 'xx-lolspeak', 'label' => 'Lolspeak'))->save();
+    ConfigurableLanguage::create(['id' => 'xx-lolspeak', 'label' => 'Lolspeak'])->save();
   }
 
   /**
@@ -30,12 +30,12 @@ abstract class LanguageTestBase extends ViewsKernelTestBase {
    */
   protected function schemaDefinition() {
     $schema = parent::schemaDefinition();
-    $schema['views_test_data']['fields']['langcode'] = array(
+    $schema['views_test_data']['fields']['langcode'] = [
       'description' => 'The {language}.langcode of this beatle.',
       'type' => 'varchar',
       'length' => 12,
       'default' => '',
-    );
+    ];
 
     return $schema;
   }
@@ -45,19 +45,19 @@ abstract class LanguageTestBase extends ViewsKernelTestBase {
    */
   protected function viewsData() {
     $data = parent::viewsData();
-    $data['views_test_data']['langcode'] = array(
+    $data['views_test_data']['langcode'] = [
       'title' => t('Langcode'),
       'help' => t('Langcode'),
-      'field' => array(
+      'field' => [
         'id' => 'language',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'language',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'language',
-      ),
-    );
+      ],
+    ];
 
     return $data;
   }
diff --git a/web/core/modules/language/tests/src/Unit/ConfigurableLanguageUnitTest.php b/web/core/modules/language/tests/src/Unit/ConfigurableLanguageUnitTest.php
index d5de7a63f..58670f025 100644
--- a/web/core/modules/language/tests/src/Unit/ConfigurableLanguageUnitTest.php
+++ b/web/core/modules/language/tests/src/Unit/ConfigurableLanguageUnitTest.php
@@ -21,11 +21,11 @@ class ConfigurableLanguageUnitTest extends UnitTestCase {
     // Direction of language writing, an integer. Usually either
     // ConfigurableLanguage::DIRECTION_LTR or
     // ConfigurableLanguage::DIRECTION_RTL.
-    $configurableLanguage = new ConfigurableLanguage(array('direction' => ConfigurableLanguage::DIRECTION_LTR), 'configurable_language');
+    $configurableLanguage = new ConfigurableLanguage(['direction' => ConfigurableLanguage::DIRECTION_LTR], 'configurable_language');
     $this->assertEquals(ConfigurableLanguage::DIRECTION_LTR, $configurableLanguage->getDirection());
 
     // Test direction again, setting direction to RTL.
-    $configurableLanguage = new ConfigurableLanguage(array('direction' => ConfigurableLanguage::DIRECTION_RTL), 'configurable_language');
+    $configurableLanguage = new ConfigurableLanguage(['direction' => ConfigurableLanguage::DIRECTION_RTL], 'configurable_language');
     $this->assertEquals(ConfigurableLanguage::DIRECTION_RTL, $configurableLanguage->getDirection());
   }
 
@@ -36,7 +36,7 @@ class ConfigurableLanguageUnitTest extends UnitTestCase {
   public function testWeight() {
     // The weight, an integer. Used to order languages with larger positive
     // weights sinking items toward the bottom of lists.
-    $configurableLanguage = new ConfigurableLanguage(array('weight' => -5), 'configurable_language');
+    $configurableLanguage = new ConfigurableLanguage(['weight' => -5], 'configurable_language');
     $this->assertEquals($configurableLanguage->getWeight(), -5);
     $this->assertEquals($configurableLanguage->setWeight(13)->getWeight(), 13);
   }
diff --git a/web/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php b/web/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php
index b1a148719..06820d063 100644
--- a/web/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php
+++ b/web/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php
@@ -86,17 +86,17 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
     $target_entity_type = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
     $target_entity_type->expects($this->any())
       ->method('getBundleConfigDependency')
-      ->will($this->returnValue(array('type' => 'config', 'name' => 'test.test_entity_type.id')));
+      ->will($this->returnValue(['type' => 'config', 'name' => 'test.test_entity_type.id']));
 
     $this->entityManager->expects($this->any())
       ->method('getDefinition')
       ->with('test_entity_type')
       ->will($this->returnValue($target_entity_type));
 
-    $config = new ContentLanguageSettings(array(
+    $config = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $dependencies = $config->calculateDependencies()->getDependencies();
     $this->assertContains('test.test_entity_type.id', $dependencies['config']);
   }
@@ -105,10 +105,10 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
    * @covers ::id
    */
   public function testId() {
-    $config = new ContentLanguageSettings(array(
+    $config = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $this->assertSame('test_entity_type.test_bundle', $config->id());
   }
 
@@ -116,10 +116,10 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
    * @covers ::getTargetEntityTypeId
    */
   public function testTargetEntityTypeId() {
-    $config = new ContentLanguageSettings(array(
+    $config = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $this->assertSame('test_entity_type', $config->getTargetEntityTypeId());
   }
 
@@ -127,10 +127,10 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
    * @covers ::getTargetBundle
    */
   public function testTargetBundle() {
-    $config = new ContentLanguageSettings(array(
+    $config = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $this->assertSame('test_bundle', $config->getTargetBundle());
   }
 
@@ -146,16 +146,16 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
 
   public function providerDefaultLangcode() {
     $langcode = $this->randomMachineName();
-    $config = new ContentLanguageSettings(array(
+    $config = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $config->setDefaultLangcode($langcode);
 
-    $defaultConfig = new ContentLanguageSettings(array(
+    $defaultConfig = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_default_language_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
 
     return [
       [$config, $langcode],
@@ -174,22 +174,22 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
   }
 
   public function providerLanguageAlterable() {
-    $alterableConfig = new ContentLanguageSettings(array(
+    $alterableConfig = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $alterableConfig->setLanguageAlterable(TRUE);
 
-    $nonAlterableConfig = new ContentLanguageSettings(array(
+    $nonAlterableConfig = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_fixed_language_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $nonAlterableConfig->setLanguageAlterable(FALSE);
 
-    $defaultConfig = new ContentLanguageSettings(array(
+    $defaultConfig = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_default_language_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
 
     return [
       [$alterableConfig, TRUE],
@@ -208,22 +208,22 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
   }
 
   public function providerIsDefaultConfiguration() {
-    $alteredLanguage = new ContentLanguageSettings(array(
+    $alteredLanguage = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $alteredLanguage->setLanguageAlterable(TRUE);
 
-    $alteredDefaultLangcode = new ContentLanguageSettings(array(
+    $alteredDefaultLangcode = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_fixed_language_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $alteredDefaultLangcode->setDefaultLangcode($this->randomMachineName());
 
-    $defaultConfig = new ContentLanguageSettings(array(
+    $defaultConfig = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_default_language_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
 
     return [
       [$alteredLanguage, FALSE],
@@ -240,10 +240,10 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
   public function testLoadByEntityTypeBundle($config_id, ContentLanguageSettings $existing_config = NULL, $expected_langcode, $expected_language_alterable) {
     list($type, $bundle) = explode('.', $config_id);
 
-    $nullConfig = new ContentLanguageSettings(array(
+    $nullConfig = new ContentLanguageSettings([
       'target_entity_type_id' => $type,
       'target_bundle' => $bundle,
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $this->configEntityStorageInterface
       ->expects($this->any())
       ->method('load')
@@ -271,23 +271,23 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
   }
 
   public function providerLoadByEntityTypeBundle() {
-    $alteredLanguage = new ContentLanguageSettings(array(
+    $alteredLanguage = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $alteredLanguage->setLanguageAlterable(TRUE);
 
     $langcode = $this->randomMachineName();
-    $alteredDefaultLangcode = new ContentLanguageSettings(array(
+    $alteredDefaultLangcode = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_fixed_language_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
     $alteredDefaultLangcode->setDefaultLangcode($langcode);
 
-    $defaultConfig = new ContentLanguageSettings(array(
+    $defaultConfig = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
       'target_bundle' => 'test_default_language_bundle',
-    ), 'language_content_settings');
+    ], 'language_content_settings');
 
     return [
       ['test_entity_type.test_bundle', $alteredLanguage, LanguageInterface::LANGCODE_SITE_DEFAULT, TRUE],
diff --git a/web/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php b/web/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
index 735abd67b..825ca7d86 100644
--- a/web/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
+++ b/web/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
@@ -33,10 +33,10 @@ class LanguageNegotiationUrlTest extends UnitTestCase {
     $language_en->expects($this->any())
       ->method('getId')
       ->will($this->returnValue('en'));
-    $languages = array(
+    $languages = [
       'de' => $language_de,
       'en' => $language_en,
-    );
+    ];
     $this->languages = $languages;
 
     // Create a language manager stub.
@@ -126,7 +126,7 @@ class LanguageNegotiationUrlTest extends UnitTestCase {
     // No configuration.
     $path_prefix_configuration[] = [
       'prefix' => 'de',
-      'prefixes' => array(),
+      'prefixes' => [],
       'expected_langcode' => FALSE,
     ];
     // Non-matching prefix.
@@ -168,7 +168,7 @@ class LanguageNegotiationUrlTest extends UnitTestCase {
       ],
     ]);
 
-    $request = Request::create('', 'GET', array(), array(), array(), array('HTTP_HOST' => $http_host));
+    $request = Request::create('', 'GET', [], [], [], ['HTTP_HOST' => $http_host]);
     $method = new LanguageNegotiationUrl();
     $method->setLanguageManager($this->languageManager);
     $method->setConfig($config);
@@ -193,60 +193,60 @@ class LanguageNegotiationUrlTest extends UnitTestCase {
    */
   public function providerTestDomain() {
 
-    $domain_configuration[] = array(
+    $domain_configuration[] = [
       'http_host' => 'example.de',
-      'domains' => array(
+      'domains' => [
         'de' => 'http://example.de',
-      ),
+      ],
       'expected_langcode' => 'de',
-    );
+    ];
     // No configuration.
-    $domain_configuration[] = array(
+    $domain_configuration[] = [
       'http_host' => 'example.de',
-      'domains' => array(),
+      'domains' => [],
       'expected_langcode' => FALSE,
-    );
+    ];
     // HTTP host with a port.
-    $domain_configuration[] = array(
+    $domain_configuration[] = [
       'http_host' => 'example.de:8080',
-      'domains' => array(
+      'domains' => [
         'de' => 'http://example.de',
-      ),
+      ],
       'expected_langcode' => 'de',
-    );
+    ];
     // Domain configuration with https://.
-    $domain_configuration[] = array(
+    $domain_configuration[] = [
       'http_host' => 'example.de',
-      'domains' => array(
+      'domains' => [
         'de' => 'https://example.de',
-      ),
+      ],
       'expected_langcode' => 'de',
-    );
+    ];
     // Non-matching HTTP host.
-    $domain_configuration[] = array(
+    $domain_configuration[] = [
       'http_host' => 'example.com',
-      'domains' => array(
+      'domains' => [
         'de' => 'http://example.com',
-      ),
+      ],
       'expected_langcode' => 'de',
-    );
+    ];
     // Testing a non-existing language.
-    $domain_configuration[] = array(
+    $domain_configuration[] = [
       'http_host' => 'example.com',
-      'domains' => array(
+      'domains' => [
         'it' => 'http://example.it',
-      ),
+      ],
       'expected_langcode' => FALSE,
-    );
+    ];
     // Multiple domain configurations.
-    $domain_configuration[] = array(
+    $domain_configuration[] = [
       'http_host' => 'example.com',
-      'domains' => array(
+      'domains' => [
         'de' => 'http://example.de',
         'en' => 'http://example.com',
-      ),
+      ],
       'expected_langcode' => 'en',
-    );
+    ];
     return $domain_configuration;
   }
 
diff --git a/web/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php b/web/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php
index 1f711ae78..a231e198b 100644
--- a/web/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php
+++ b/web/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php
@@ -12,9 +12,9 @@ use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
 class LanguageLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array(
+    $this->directoryList = [
       'language' => 'core/modules/language',
-    );
+    ];
     parent::setUp();
   }
 
@@ -31,19 +31,19 @@ class LanguageLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function getLanguageAdminOverviewRoutes() {
-    return array(
-      array('entity.configurable_language.collection', array(array('entity.configurable_language.collection', 'language.negotiation'))),
-      array('language.negotiation', array(array('entity.configurable_language.collection', 'language.negotiation'))),
-    );
+    return [
+      ['entity.configurable_language.collection', [['entity.configurable_language.collection', 'language.negotiation']]],
+      ['language.negotiation', [['entity.configurable_language.collection', 'language.negotiation']]],
+    ];
   }
 
   /**
    * Tests language edit local tasks existence.
    */
   public function testLanguageEditLocalTasks() {
-    $this->assertLocalTasks('entity.configurable_language.edit_form', array(
-      0 => array('entity.configurable_language.edit_form'),
-    ));
+    $this->assertLocalTasks('entity.configurable_language.edit_form', [
+      0 => ['entity.configurable_language.edit_form'],
+    ]);
   }
 
 }
diff --git a/web/core/modules/language/tests/src/Unit/Migrate/LanguageTest.php b/web/core/modules/language/tests/src/Unit/Migrate/LanguageTest.php
deleted file mode 100644
index d836a801d..000000000
--- a/web/core/modules/language/tests/src/Unit/Migrate/LanguageTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Drupal\Tests\language\Unit\Migrate;
-
-use Drupal\language\Plugin\migrate\source\Language;
-use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
-
-/**
- * @coversDefaultClass \Drupal\language\Plugin\migrate\source\Language
- * @group language
- */
-class LanguageTest extends MigrateSqlSourceTestCase {
-
-  const PLUGIN_CLASS = Language::class;
-
-  protected $migrationConfiguration = array(
-    'id' => 'test',
-    'source' => array(
-      'plugin' => 'language',
-    ),
-  );
-
-  protected $databaseContents = array(
-    'languages' => array(
-      array(
-        'language' => 'en',
-        'name' => 'English',
-        'native' => 'English',
-        'direction' => '0',
-        'enabled' => '1',
-        'plurals' => '0',
-        'formula' => '',
-        'domain' => '',
-        'prefix' => '',
-        'weight' => '0',
-        'javascript' => '',
-      ),
-      array(
-        'language' => 'fr',
-        'name' => 'French',
-        'native' => 'Français',
-        'direction' => '0',
-        'enabled' => '0',
-        'plurals' => '2',
-        'formula' => '($n>1)',
-        'domain' => '',
-        'prefix' => 'fr',
-        'weight' => '0',
-        'javascript' => '',
-      ),
-    ),
-  );
-
-  protected $expectedResults = array(
-    array(
-      'language' => 'en',
-      'name' => 'English',
-      'native' => 'English',
-      'direction' => '0',
-      'enabled' => '1',
-      'plurals' => '0',
-      'formula' => '',
-      'domain' => '',
-      'prefix' => '',
-      'weight' => '0',
-      'javascript' => '',
-    ),
-    array(
-      'language' => 'fr',
-      'name' => 'French',
-      'native' => 'Français',
-      'direction' => '0',
-      'enabled' => '0',
-      'plurals' => '2',
-      'formula' => '($n>1)',
-      'domain' => '',
-      'prefix' => 'fr',
-      'weight' => '0',
-      'javascript' => '',
-    ),
-  );
-
-}
diff --git a/web/core/modules/language/tests/src/Unit/process/LanguageNegotiationTest.php b/web/core/modules/language/tests/src/Unit/process/LanguageNegotiationTest.php
index c6e62fbc4..695c91f19 100644
--- a/web/core/modules/language/tests/src/Unit/process/LanguageNegotiationTest.php
+++ b/web/core/modules/language/tests/src/Unit/process/LanguageNegotiationTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\language\Unit\process;
 
 use Drupal\language\Plugin\migrate\process\LanguageNegotiation;
 use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase;
+use Drupal\migrate\MigrateException;
 
 /**
  * @coversDefaultClass \Drupal\language\Plugin\migrate\process\LanguageNegotiation
@@ -75,12 +76,10 @@ class LanguageNegotiationTest extends MigrateProcessTestCase {
 
   /**
    * Tests string input.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   * @expectedExceptionMessage The input should be an array
    */
   public function testStringInput() {
     $this->plugin = new LanguageNegotiation([], 'map', []);
+    $this->setExpectedException(MigrateException::class, 'The input should be an array');
     $this->plugin->transform('foo', $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
diff --git a/web/core/modules/language/tests/src/Unit/process/LanguageTypesTest.php b/web/core/modules/language/tests/src/Unit/process/LanguageTypesTest.php
index 17cf412a3..606572ecd 100644
--- a/web/core/modules/language/tests/src/Unit/process/LanguageTypesTest.php
+++ b/web/core/modules/language/tests/src/Unit/process/LanguageTypesTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\language\Unit\process;
 
 use Drupal\language\Plugin\migrate\process\LanguageTypes;
 use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase;
+use Drupal\migrate\MigrateException;
 
 /**
  * @coversDefaultClass \Drupal\language\Plugin\migrate\process\LanguageTypes
@@ -49,12 +50,10 @@ class LanguageTypesTest extends MigrateProcessTestCase {
 
   /**
    * Tests string input.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   * @expectedExceptionMessage The input should be an array
    */
   public function testStringInput() {
     $this->plugin = new LanguageTypes([], 'map', []);
+    $this->setExpectedException(MigrateException::class, 'The input should be an array');
     $this->plugin->transform('foo', $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
diff --git a/web/core/modules/layout_discovery/layout_discovery.info.yml b/web/core/modules/layout_discovery/layout_discovery.info.yml
new file mode 100644
index 000000000..a9a4139ba
--- /dev/null
+++ b/web/core/modules/layout_discovery/layout_discovery.info.yml
@@ -0,0 +1,6 @@
+name: 'Layout Discovery'
+type: module
+description: 'Provides a way for modules or themes to register layouts.'
+package: Core (Experimental)
+version: VERSION
+core: 8.x
diff --git a/web/core/modules/layout_discovery/layout_discovery.install b/web/core/modules/layout_discovery/layout_discovery.install
new file mode 100644
index 000000000..e6c99e089
--- /dev/null
+++ b/web/core/modules/layout_discovery/layout_discovery.install
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Install, update, and uninstall functions for the Layout Discovery module.
+ */
+
+/**
+ * Implements hook_requirements().
+ */
+function layout_discovery_requirements($phase) {
+  $requirements = [];
+  if ($phase === 'install') {
+    if (\Drupal::moduleHandler()->moduleExists('layout_plugin')) {
+      $requirements['layout_discovery'] = [
+        'description' => t('Layout Discovery cannot be installed because the Layout Plugin module is installed and incompatible.'),
+        'severity' => REQUIREMENT_ERROR,
+      ];
+    }
+  }
+  return $requirements;
+}
diff --git a/web/core/modules/layout_discovery/layout_discovery.layouts.yml b/web/core/modules/layout_discovery/layout_discovery.layouts.yml
new file mode 100644
index 000000000..98b1ed612
--- /dev/null
+++ b/web/core/modules/layout_discovery/layout_discovery.layouts.yml
@@ -0,0 +1,88 @@
+layout_onecol:
+  label: 'One column'
+  path: layouts/onecol
+  template: layout--onecol
+  library: layout_discovery/onecol
+  category: 'Columns: 1'
+  default_region: content
+  regions:
+    content:
+      label: Content
+
+layout_twocol:
+  label: 'Two column'
+  path: layouts/twocol
+  template: layout--twocol
+  library: layout_discovery/twocol
+  category: 'Columns: 2'
+  default_region: left
+  regions:
+    top:
+      label: Top
+    left:
+      label: Left
+    right:
+      label: Right
+    bottom:
+      label: Bottom
+
+layout_twocol_bricks:
+  label: 'Two column bricks'
+  path: layouts/twocol_bricks
+  template: layout--twocol-bricks
+  library: layout_discovery/twocol_bricks
+  category: 'Columns: 2'
+  default_region: middle
+  regions:
+    top:
+      label: Top
+    left_above:
+      label: 'Left above'
+    right_above:
+      label: 'Right above'
+    middle:
+      label: Middle
+    left_below:
+      label: 'Left below'
+    right_below:
+      label: 'Right below'
+    bottom:
+      label: Bottom
+
+layout_threecol_25_50_25:
+  label: 'Three column 25/50/25'
+  path: layouts/threecol_25_50_25
+  template: layout--threecol-25-50-25
+  library: layout_discovery/threecol_25_50_25
+  category: 'Columns: 3'
+  default_region: left
+  regions:
+    top:
+      label: Top
+    left:
+      label: Left
+    middle:
+      label: Middle
+    right:
+      label: Right
+    bottom:
+      label: Bottom
+
+layout_threecol_33_34_33:
+  label: 'Three column 33/34/33'
+  path: layouts/threecol_33_34_33
+  template: layout--threecol-33-34-33
+  library: layout_discovery/threecol_33_34_33
+  category: 'Columns: 3'
+  default_region: left
+  regions:
+    top:
+      label: Top
+    left:
+      label: Left
+    middle:
+      label: Middle
+    right:
+      label: Right
+    bottom:
+      label: Bottom
diff --git a/web/core/modules/layout_discovery/layout_discovery.libraries.yml b/web/core/modules/layout_discovery/layout_discovery.libraries.yml
new file mode 100644
index 000000000..aff70e0e8
--- /dev/null
+++ b/web/core/modules/layout_discovery/layout_discovery.libraries.yml
@@ -0,0 +1,25 @@
+onecol:
+  version: VERSION
+  css:
+    theme:
+      layouts/onecol/onecol.css: {}
+twocol_bricks:
+  version: VERSION
+  css:
+    theme:
+      layouts/twocol_bricks/twocol_bricks.css: {}
+twocol:
+  version: VERSION
+  css:
+    theme:
+      layouts/twocol/twocol.css: {}
+threecol_25_50_25:
+  version: VERSION
+  css:
+    theme:
+      layouts/threecol_25_50_25/threecol_25_50_25.css: {}
+threecol_33_34_33:
+  version: VERSION
+  css:
+    theme:
+      layouts/threecol_33_34_33/threecol_33_34_33.css: {}
diff --git a/web/core/modules/layout_discovery/layout_discovery.module b/web/core/modules/layout_discovery/layout_discovery.module
new file mode 100644
index 000000000..3cffee92c
--- /dev/null
+++ b/web/core/modules/layout_discovery/layout_discovery.module
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @file
+ * Provides hook implementations for Layout Discovery.
+ */
+
+/**
+ * Implements hook_help().
+ */
+function layout_discovery_help($route_name) {
+  switch ($route_name) {
+    case 'help.page.layout_discovery':
+      $output = '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('Layout Discovery allows modules or themes to register layouts, and for other modules to list the available layouts and render them.') . '</p>';
+      $output .= '<p>' . t('For more information, see the <a href=":layout-discovery-documentation">online documentation for the Layout Discovery module</a>.', [':layout-discovery-documentation' => 'https://www.drupal.org/node/2619128']) . '</p>';
+      return $output;
+  }
+}
+
+/**
+ * Implements hook_theme().
+ */
+function layout_discovery_theme() {
+  return \Drupal::service('plugin.manager.core.layout')->getThemeImplementations();
+}
+
+/**
+ * Prepares variables for layout templates.
+ *
+ * @param array &$variables
+ *   An associative array containing:
+ *   - content: An associative array containing the properties of the element.
+ *     Properties used: #settings, #layout.
+ */
+function template_preprocess_layout(&$variables) {
+  $variables['settings'] = isset($variables['content']['#settings']) ? $variables['content']['#settings'] : [];
+  $variables['layout'] = isset($variables['content']['#layout']) ? $variables['content']['#layout'] : [];
+}
diff --git a/web/core/modules/layout_discovery/layout_discovery.services.yml b/web/core/modules/layout_discovery/layout_discovery.services.yml
new file mode 100644
index 000000000..1e24db4d6
--- /dev/null
+++ b/web/core/modules/layout_discovery/layout_discovery.services.yml
@@ -0,0 +1,4 @@
+services:
+  plugin.manager.core.layout:
+    class: Drupal\Core\Layout\LayoutPluginManager
+    arguments: ['@container.namespaces', '@cache.discovery', '@module_handler', '@theme_handler']
diff --git a/web/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig b/web/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig
new file mode 100644
index 000000000..eb553cdf8
--- /dev/null
+++ b/web/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig
@@ -0,0 +1,24 @@
+{#
+/**
+ * @file
+ * Default theme implementation to display a one-column layout.
+ *
+ * Available variables:
+ * - content: The content for this layout.
+ * - attributes: HTML attributes for the layout <div>.
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+set classes = [
+'layout--onecol',
+]
+%}
+{% if content %}
+<div{{ attributes.addClass(classes) }}>
+  <div class="layout-region layout-region--content">
+    {{ content.content }}
+  </div>
+</div>
+{% endif %}
diff --git a/web/core/modules/layout_discovery/layouts/onecol/onecol.css b/web/core/modules/layout_discovery/layouts/onecol/onecol.css
new file mode 100644
index 000000000..040b7f10c
--- /dev/null
+++ b/web/core/modules/layout_discovery/layouts/onecol/onecol.css
@@ -0,0 +1,3 @@
+.layout--onecol .layout-region {
+  width: 100%;
+}
diff --git a/web/core/modules/layout_discovery/layouts/threecol_25_50_25/layout--threecol-25-50-25.html.twig b/web/core/modules/layout_discovery/layouts/threecol_25_50_25/layout--threecol-25-50-25.html.twig
new file mode 100644
index 000000000..78db2b4b3
--- /dev/null
+++ b/web/core/modules/layout_discovery/layouts/threecol_25_50_25/layout--threecol-25-50-25.html.twig
@@ -0,0 +1,47 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a three column layout.
+ *
+ * This template provides a three column 25%-50%-25% display layout, with
+ * additional areas for the top and the bottom.
+ *
+ * Available variables:
+ * - content: The content for this layout.
+ * - attributes: HTML attributes for the layout <div>.
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+set classes = [
+'layout--threecol',
+]
+%}
+{% if content %}
+<div{{ attributes.addClass(classes) }}>
+  {% if content.top %}
+    <div class="layout-region layout-region--fullwidth">
+      {{ content.top }}
+    </div>
+  {% endif %}
+
+  <div class="layout-region layout-region--side">
+    {{ content.left }}
+  </div>
+
+  <div class="layout-region layout-region--middle">
+    {{ content.middle }}
+  </div>
+
+  <div class="layout-region layout-region--side">
+    {{ content.right }}
+  </div>
+
+  {% if content.bottom %}
+    <div class="layout-region layout-region--fullwidth">
+      {{ content.bottom }}
+    </div>
+  {% endif %}
+</div>
+{% endif %}
diff --git a/web/core/modules/layout_discovery/layouts/threecol_25_50_25/threecol_25_50_25.css b/web/core/modules/layout_discovery/layouts/threecol_25_50_25/threecol_25_50_25.css
new file mode 100644
index 000000000..7472d55d6
--- /dev/null
+++ b/web/core/modules/layout_discovery/layouts/threecol_25_50_25/threecol_25_50_25.css
@@ -0,0 +1,17 @@
+.layout--threecol {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+
+.layout--threecol > .layout-region {
+  flex: 0 1 25%;
+}
+
+.layout--threecol > .layout-region--fullwidth {
+  flex: 0 1 100%;
+}
+
+.layout--threecol > .layout-region--middle {
+  flex: 0 1 50%;
+}
diff --git a/web/core/modules/layout_discovery/layouts/threecol_33_34_33/layout--threecol-33-34-33.html.twig b/web/core/modules/layout_discovery/layouts/threecol_33_34_33/layout--threecol-33-34-33.html.twig
new file mode 100644
index 000000000..59461f42c
--- /dev/null
+++ b/web/core/modules/layout_discovery/layouts/threecol_33_34_33/layout--threecol-33-34-33.html.twig
@@ -0,0 +1,47 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a three column layout.
+ *
+ * This template provides a three column 33%-34%-33% display layout, with
+ * additional areas for the top and the bottom.
+ *
+ * Available variables:
+ * - content: The content for this layout.
+ * - attributes: HTML attributes for the layout <div>.
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+set classes = [
+'layout--threecol-33',
+]
+%}
+{% if content %}
+<div{{ attributes.addClass(classes) }}>
+  {% if content.top %}
+  <div class="layout-region layout-region--fullwidth">
+    {{ content.top }}
+  </div>
+  {% endif %}
+
+  <div class="layout-region">
+    {{ content.left }}
+  </div>
+
+  <div class="layout-region">
+    {{ content.middle }}
+  </div>
+
+  <div class="layout-region">
+    {{ content.right }}
+  </div>
+
+  {% if content.bottom %}
+  <div class="layout-region layout-region--fullwidth">
+    {{ content.bottom }}
+  </div>
+  {% endif %}
+</div>
+{% endif %}
diff --git a/web/core/modules/layout_discovery/layouts/threecol_33_34_33/threecol_33_34_33.css b/web/core/modules/layout_discovery/layouts/threecol_33_34_33/threecol_33_34_33.css
new file mode 100644
index 000000000..7091416fd
--- /dev/null
+++ b/web/core/modules/layout_discovery/layouts/threecol_33_34_33/threecol_33_34_33.css
@@ -0,0 +1,13 @@
+.layout--threecol-33 {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+
+.layout--threecol-33 > .layout-region {
+  flex: 0 1 33%;
+}
+
+.layout--threecol-33 > .layout-region--fullwidth {
+  flex: 0 1 100%;
+}
diff --git a/web/core/modules/layout_discovery/layouts/twocol/layout--twocol.html.twig b/web/core/modules/layout_discovery/layouts/twocol/layout--twocol.html.twig
new file mode 100644
index 000000000..efebf0f95
--- /dev/null
+++ b/web/core/modules/layout_discovery/layouts/twocol/layout--twocol.html.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * @file
+ * Default theme implementation to display a two-column layout.
+ *
+ * Available variables:
+ * - content: The content for this layout.
+ * - attributes: HTML attributes for the layout <div>.
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+set classes = [
+'layout--twocol',
+]
+%}
+{% if content %}
+  <div{{ attributes.addClass(classes) }}>
+    <div class="layout-region layout-region--fullwidth">
+      {{ content.top }}
+    </div>
+
+    <div class="layout-region layout-region--left">
+      {{ content.left }}
+    </div>
+
+    <div class="layout-region layout-region--right">
+      {{ content.right }}
+    </div>
+
+    <div class="layout-region layout-region--fullwidth">
+      {{ content.bottom }}
+    </div>
+  </div>
+{% endif %}
diff --git a/web/core/modules/layout_discovery/layouts/twocol/twocol.css b/web/core/modules/layout_discovery/layouts/twocol/twocol.css
new file mode 100644
index 000000000..41e8883dd
--- /dev/null
+++ b/web/core/modules/layout_discovery/layouts/twocol/twocol.css
@@ -0,0 +1,13 @@
+.layout--twocol {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+
+.layout--twocol > .layout-region {
+  flex: 0 1 50%;
+}
+
+.layout--twocol > .layout-region--fullwidth {
+  flex: 0 1 100%;
+}
diff --git a/web/core/modules/layout_discovery/layouts/twocol_bricks/layout--twocol-bricks.html.twig b/web/core/modules/layout_discovery/layouts/twocol_bricks/layout--twocol-bricks.html.twig
new file mode 100644
index 000000000..9c6231b8b
--- /dev/null
+++ b/web/core/modules/layout_discovery/layouts/twocol_bricks/layout--twocol-bricks.html.twig
@@ -0,0 +1,51 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a two column layout.
+ *
+ * This template provides a two column display layout with full width areas at
+ * the top, bottom and in the middle.
+ *
+ * Available variables:
+ * - content: The content for this layout.
+ * - attributes: HTML attributes for the layout <div>.
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+set classes = [
+'layout--twocol-bricks',
+]
+%}
+{% if content %}
+<div{{ attributes.addClass(classes) }}>
+  <div class="layout-region layout-region--fullwidth">
+    {{ content.top }}
+  </div>
+
+  <div class="layout-region layout-region--left_above">
+    {{ content.left_above }}
+  </div>
+
+  <div class="layout-region layout-region--right_above">
+    {{ content.right_above }}
+  </div>
+
+  <div class="layout-region layout-region--middle">
+    {{ content.middle }}
+  </div>
+
+  <div class="layout-region layout-region--left_below">
+    {{ content.left_below }}
+  </div>
+
+  <div class="layout-region layout-region--right_below">
+    {{ content.right_below }}
+  </div>
+
+  <div class="layout-region layout-region--fullwidth">
+    {{ content.bottom }}
+  </div>
+</div>
+{% endif %}
diff --git a/web/core/modules/layout_discovery/layouts/twocol_bricks/twocol_bricks.css b/web/core/modules/layout_discovery/layouts/twocol_bricks/twocol_bricks.css
new file mode 100644
index 000000000..aef887a4a
--- /dev/null
+++ b/web/core/modules/layout_discovery/layouts/twocol_bricks/twocol_bricks.css
@@ -0,0 +1,13 @@
+.layout--twocol-bricks {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+
+.layout--twocol-bricks > .layout-region {
+  flex: 0 1 50%;
+}
+
+.layout--twocol-bricks > .layout-region--fullwidth {
+  flex: 0 1 100%;
+}
diff --git a/web/core/modules/layout_discovery/templates/layout.html.twig b/web/core/modules/layout_discovery/templates/layout.html.twig
new file mode 100644
index 000000000..88ea7457d
--- /dev/null
+++ b/web/core/modules/layout_discovery/templates/layout.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Template for a generic layout.
+ */
+#}
+{% set classes = [
+  'layout--' ~ layout.id|clean_class,
+] %}
+{% if content %}
+<div{{ attributes.addClass(classes) }}>
+{% for region in layout.getRegionNames %}
+  <div class="{{ 'region--' ~ region|clean_class }}">
+    {{ content[region] }}
+  </div>
+{% endfor %}
+</div>
+{% endif %}
diff --git a/web/core/modules/layout_discovery/tests/src/Kernel/LayoutTest.php b/web/core/modules/layout_discovery/tests/src/Kernel/LayoutTest.php
new file mode 100644
index 000000000..9d4c446d3
--- /dev/null
+++ b/web/core/modules/layout_discovery/tests/src/Kernel/LayoutTest.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace Drupal\Tests\layout_discovery\Kernel;
+
+use Drupal\Core\Form\FormState;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests Layout functionality.
+ *
+ * @group Layout
+ */
+class LayoutTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'layout_discovery', 'layout_test'];
+
+  /**
+   * The layout plugin manager.
+   *
+   * @var \Drupal\Core\Layout\LayoutPluginManagerInterface
+   */
+  protected $layoutPluginManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->layoutPluginManager = $this->container->get('plugin.manager.core.layout');
+  }
+
+  /**
+   * Test rendering a layout.
+   *
+   * @dataProvider renderLayoutData
+   */
+  public function testRenderLayout($layout_id, $config, $regions, $html) {
+    $layout = $this->layoutPluginManager->createInstance($layout_id, $config);
+    $built['layout'] = $layout->build($regions);
+    $built['layout']['#prefix'] = 'Test prefix';
+    $built['layout']['#suffix'] = 'Test suffix';
+    $html = 'Test prefix' . $html . "\n" . 'Test suffix';
+
+    // Assume each layout is contained by a form, in order to ensure the
+    // building of the layout does not interfere with form processing.
+    $form_state = new FormState();
+    $form_builder = $this->container->get('form_builder');
+    $form_builder->prepareForm('the_form_id', $built, $form_state);
+    $form_builder->processForm('the_form_id', $built, $form_state);
+
+    $this->render($built);
+    $this->assertRaw($html);
+    $this->assertRaw('<input data-drupal-selector="edit-the-form-id" type="hidden" name="form_id" value="the_form_id" />');
+  }
+
+  /**
+   * Data provider for testRenderLayout().
+   */
+  public function renderLayoutData() {
+    $data['layout_onecol'] = [
+      'layout_onecol',
+      [],
+      [
+        'content' => [
+          '#markup' => 'This is the content',
+        ],
+      ],
+    ];
+    $data['layout_test_1col_with_form'] = [
+      'layout_test_1col',
+      [],
+      [
+        'top' => [
+          '#process' => [[static::class, 'processCallback']],
+        ],
+        'bottom' => [
+          '#markup' => 'This is the bottom',
+        ],
+      ],
+    ];
+
+    $data['layout_test_1col'] = [
+      'layout_test_1col',
+      [],
+      [
+        'top' => [
+          '#markup' => 'This is the top',
+        ],
+        'bottom' => [
+          '#markup' => 'This is the bottom',
+        ],
+      ],
+    ];
+
+    $data['layout_test_1col_no_template'] = [
+      'layout_test_1col_no_template',
+      [],
+      [
+        'top' => [
+          '#markup' => 'This is the top',
+        ],
+        'bottom' => [
+          '#markup' => 'This is the bottom',
+        ],
+      ],
+    ];
+
+    $data['layout_test_2col'] = [
+      'layout_test_2col',
+      [],
+      [
+        'left' => [
+          '#markup' => 'This is the left',
+        ],
+        'right' => [
+          '#markup' => 'This is the right',
+        ],
+      ],
+    ];
+
+    $data['layout_test_plugin'] = [
+      'layout_test_plugin',
+      [
+        'setting_1' => 'Config value',
+      ],
+      [
+        'main' => [
+          '#markup' => 'Main region',
+        ],
+      ],
+    ];
+
+    $data['layout_onecol'][] = <<<'EOD'
+<div data-drupal-selector="edit-layout" class="layout--onecol">
+  <div class="layout-region layout-region--content">
+    This is the content
+  </div>
+</div>
+EOD;
+
+    $data['layout_test_1col_with_form'][] = <<<'EOD'
+<div class="layout-example-1col clearfix">
+  <div class="region-top">
+    This string added by #process.
+  </div>
+  <div class="region-bottom">
+    This is the bottom
+  </div>
+</div>
+EOD;
+
+    $data['layout_test_1col'][] = <<<'EOD'
+<div class="layout-example-1col clearfix">
+  <div class="region-top">
+    This is the top
+  </div>
+  <div class="region-bottom">
+    This is the bottom
+  </div>
+</div>
+EOD;
+
+    $data['layout_test_1col_no_template'][] = <<<'EOD'
+<div data-drupal-selector="edit-layout" class="layout--layout-test-1col-no-template">
+  <div class="region--top">
+    This is the top
+  </div>
+  <div class="region--bottom">
+    This is the bottom
+  </div>
+</div>
+EOD;
+
+    $data['layout_test_2col'][] = <<<'EOD'
+<div class="layout-example-2col clearfix">
+  <div class="region-left">
+    This is the left
+  </div>
+  <div class="region-right">
+    This is the right
+  </div>
+</div>
+EOD;
+
+    $data['layout_test_plugin'][] = <<<'EOD'
+<div class="layout-test-plugin clearfix">
+  <div>
+    <span class="setting-1-label">Blah: </span>
+    Config value
+  </div>
+  <div class="region-main">
+    Main region
+  </div>
+</div>
+EOD;
+
+    return $data;
+  }
+
+  /**
+   * Provides a test #process callback.
+   */
+  public static function processCallback($element) {
+    $element['#markup'] = 'This string added by #process.';
+    return $element;
+  }
+
+}
diff --git a/web/core/modules/link/link.module b/web/core/modules/link/link.module
index 46aeeba21..5a3527fc4 100644
--- a/web/core/modules/link/link.module
+++ b/web/core/modules/link/link.module
@@ -15,11 +15,11 @@ function link_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.link':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Link module allows you to create fields that contain internal or external URLs and optional link text. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":link_documentation">online documentation for the Link module</a>.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':link_documentation' => 'https://www.drupal.org/documentation/modules/link')) . '</p>';
+      $output .= '<p>' . t('The Link module allows you to create fields that contain internal or external URLs and optional link text. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":link_documentation">online documentation for the Link module</a>.', [':field' => \Drupal::url('help.page', ['name' => 'field']), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#', ':link_documentation' => 'https://www.drupal.org/documentation/modules/link']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing and displaying link fields') . '</dt>';
-      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the link field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the link field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', [':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Setting the allowed link type') . '</dt>';
       $output .= '<dd>' . t('In the field settings you can define the allowed link type to be <em>internal links only</em>, <em>external links only</em>, or <em>both internal and external links</em>. <em>Internal links only</em> and <em>both internal and external links</em> options enable an autocomplete widget for internal links, so a user does not have to copy or remember a URL.') . '</dd>';
       $output .= '<dt>' . t('Adding link text') . '</dt>';
@@ -39,11 +39,11 @@ function link_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function link_theme() {
-  return array(
-    'link_formatter_link_separate' => array(
-      'variables' => array('title' => NULL, 'url_title' => NULL, 'url' => NULL),
-    ),
-  );
+  return [
+    'link_formatter_link_separate' => [
+      'variables' => ['title' => NULL, 'url_title' => NULL, 'url' => NULL],
+    ],
+  ];
 }
 
 /**
diff --git a/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
index 7d2d0eeab..b0928b0db 100644
--- a/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
+++ b/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
@@ -78,13 +78,13 @@ class LinkFormatter extends FormatterBase implements ContainerFactoryPluginInter
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'trim_length' => '80',
       'url_only' => '',
       'url_plain' => '',
       'rel' => '',
       'target' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -93,43 +93,43 @@ class LinkFormatter extends FormatterBase implements ContainerFactoryPluginInter
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $elements = parent::settingsForm($form, $form_state);
 
-    $elements['trim_length'] = array(
+    $elements['trim_length'] = [
       '#type' => 'number',
       '#title' => t('Trim link text length'),
       '#field_suffix' => t('characters'),
       '#default_value' => $this->getSetting('trim_length'),
       '#min' => 1,
       '#description' => t('Leave blank to allow unlimited link text lengths.'),
-    );
-    $elements['url_only'] = array(
+    ];
+    $elements['url_only'] = [
       '#type' => 'checkbox',
       '#title' => t('URL only'),
       '#default_value' => $this->getSetting('url_only'),
       '#access' => $this->getPluginId() == 'link',
-    );
-    $elements['url_plain'] = array(
+    ];
+    $elements['url_plain'] = [
       '#type' => 'checkbox',
       '#title' => t('Show URL as plain text'),
       '#default_value' => $this->getSetting('url_plain'),
       '#access' => $this->getPluginId() == 'link',
-      '#states' => array(
-        'visible' => array(
-          ':input[name*="url_only"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
-    $elements['rel'] = array(
+      '#states' => [
+        'visible' => [
+          ':input[name*="url_only"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
+    $elements['rel'] = [
       '#type' => 'checkbox',
       '#title' => t('Add rel="nofollow" to links'),
       '#return_value' => 'nofollow',
       '#default_value' => $this->getSetting('rel'),
-    );
-    $elements['target'] = array(
+    ];
+    $elements['target'] = [
       '#type' => 'checkbox',
       '#title' => t('Open link in new window'),
       '#return_value' => '_blank',
       '#default_value' => $this->getSetting('target'),
-    );
+    ];
 
     return $elements;
   }
@@ -138,12 +138,12 @@ class LinkFormatter extends FormatterBase implements ContainerFactoryPluginInter
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $settings = $this->getSettings();
 
     if (!empty($settings['trim_length'])) {
-      $summary[] = t('Link text trimmed to @limit characters', array('@limit' => $settings['trim_length']));
+      $summary[] = t('Link text trimmed to @limit characters', ['@limit' => $settings['trim_length']]);
     }
     else {
       $summary[] = t('Link text not trimmed');
@@ -157,7 +157,7 @@ class LinkFormatter extends FormatterBase implements ContainerFactoryPluginInter
       }
     }
     if (!empty($settings['rel'])) {
-      $summary[] = t('Add rel="@rel"', array('@rel' => $settings['rel']));
+      $summary[] = t('Add rel="@rel"', ['@rel' => $settings['rel']]);
     }
     if (!empty($settings['target'])) {
       $summary[] = t('Open link in new window');
@@ -170,7 +170,7 @@ class LinkFormatter extends FormatterBase implements ContainerFactoryPluginInter
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $element = array();
+    $element = [];
     $entity = $items->getEntity();
     $settings = $this->getSettings();
 
@@ -193,9 +193,9 @@ class LinkFormatter extends FormatterBase implements ContainerFactoryPluginInter
       }
 
       if (!empty($settings['url_only']) && !empty($settings['url_plain'])) {
-        $element[$delta] = array(
+        $element[$delta] = [
           '#plain_text' => $link_title,
-        );
+        ];
 
         if (!empty($item->_attributes)) {
           // Piggyback on the metadata attributes, which will be placed in the
@@ -204,19 +204,19 @@ class LinkFormatter extends FormatterBase implements ContainerFactoryPluginInter
           // @todo Does RDF need a URL rather than an internal URI here?
           // @see \Drupal\Tests\rdf\Kernel\Field\LinkFieldRdfaTest.
           $content = str_replace('internal:/', '', $item->uri);
-          $item->_attributes += array('content' => $content);
+          $item->_attributes += ['content' => $content];
         }
       }
       else {
-        $element[$delta] = array(
+        $element[$delta] = [
           '#type' => 'link',
           '#title' => $link_title,
           '#options' => $url->getOptions(),
-        );
+        ];
         $element[$delta]['#url'] = $url;
 
         if (!empty($item->_attributes)) {
-          $element[$delta]['#options'] += array ('attributes' => array());
+          $element[$delta]['#options'] += ['attributes' => []];
           $element[$delta]['#options']['attributes'] += $item->_attributes;
           // Unset field item attributes since they have been included in the
           // formatter output and should not be rendered in the field template.
diff --git a/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php b/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
index f7370378e..2598b55b6 100644
--- a/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
+++ b/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php
@@ -26,18 +26,18 @@ class LinkSeparateFormatter extends LinkFormatter {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'trim_length' => 80,
       'rel' => '',
       'target' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $element = array();
+    $element = [];
     $entity = $items->getEntity();
     $settings = $this->getSettings();
 
@@ -67,12 +67,12 @@ class LinkSeparateFormatter extends LinkFormatter {
         $url_title = Unicode::truncate($url_title, $settings['trim_length'], FALSE, TRUE);
       }
 
-      $element[$delta] = array(
+      $element[$delta] = [
         '#theme' => 'link_formatter_link_separate',
         '#title' => $link_title,
         '#url_title' => $url_title,
         '#url' => $url,
-      );
+      ];
 
       if (!empty($item->_attributes)) {
         // Set our RDFa attributes on the <a> element that is being built.
diff --git a/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php b/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
index 6e98ae225..e354f0087 100644
--- a/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
+++ b/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
@@ -30,10 +30,10 @@ class LinkItem extends FieldItemBase implements LinkItemInterface {
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    return array(
+    return [
       'title' => DRUPAL_OPTIONAL,
       'link_type' => LinkItemInterface::LINK_GENERIC
-    ) + parent::defaultFieldSettings();
+    ] + parent::defaultFieldSettings();
   }
 
   /**
@@ -56,58 +56,58 @@ class LinkItem extends FieldItemBase implements LinkItemInterface {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'uri' => array(
+    return [
+      'columns' => [
+        'uri' => [
           'description' => 'The URI of the link.',
           'type' => 'varchar',
           'length' => 2048,
-        ),
-        'title' => array(
+        ],
+        'title' => [
           'description' => 'The link text.',
           'type' => 'varchar',
           'length' => 255,
-        ),
-        'options' => array(
+        ],
+        'options' => [
           'description' => 'Serialized array of options for the link.',
           'type' => 'blob',
           'size' => 'big',
           'serialize' => TRUE,
-        ),
-      ),
-      'indexes' => array(
-        'uri' => array(array('uri', 30)),
-      ),
-    );
+        ],
+      ],
+      'indexes' => [
+        'uri' => [['uri', 30]],
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
-    $element = array();
+    $element = [];
 
-    $element['link_type'] = array(
+    $element['link_type'] = [
       '#type' => 'radios',
       '#title' => t('Allowed link type'),
       '#default_value' => $this->getSetting('link_type'),
-      '#options' => array(
+      '#options' => [
         static::LINK_INTERNAL => t('Internal links only'),
         static::LINK_EXTERNAL => t('External links only'),
         static::LINK_GENERIC => t('Both internal and external links'),
-      ),
-    );
+      ],
+    ];
 
-    $element['title'] = array(
+    $element['title'] = [
       '#type' => 'radios',
       '#title' => t('Allow link text'),
       '#default_value' => $this->getSetting('title'),
-      '#options' => array(
+      '#options' => [
         DRUPAL_DISABLED => t('Disabled'),
         DRUPAL_OPTIONAL => t('Optional'),
         DRUPAL_REQUIRED => t('Required'),
-      ),
-    );
+      ],
+    ];
 
     return $element;
   }
@@ -119,7 +119,7 @@ class LinkItem extends FieldItemBase implements LinkItemInterface {
     $random = new Random();
     if ($field_definition->getItemDefinition()->getSetting('link_type') & LinkItemInterface::LINK_EXTERNAL) {
       // Set of possible top-level domains.
-      $tlds = array('com', 'net', 'gov', 'org', 'edu', 'biz', 'info');
+      $tlds = ['com', 'net', 'gov', 'org', 'edu', 'biz', 'info'];
       // Set random length for the domain name.
       $domain_length = mt_rand(7, 15);
 
diff --git a/web/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php b/web/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
index fd670fd9e..e1b1c2a8f 100644
--- a/web/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
+++ b/web/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
@@ -27,10 +27,10 @@ class LinkWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'placeholder_url' => '',
       'placeholder_title' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -74,7 +74,7 @@ class LinkWidget extends WidgetBase {
       // Show the 'entity:' URI as the entity autocomplete would.
       $entity_manager = \Drupal::entityManager();
       if ($entity_manager->getDefinition($entity_type, FALSE) && $entity = \Drupal::entityManager()->getStorage($entity_type)->load($entity_id)) {
-        $displayable_string = EntityAutocomplete::getEntityLabels(array($entity));
+        $displayable_string = EntityAutocomplete::getEntityLabels([$entity]);
       }
     }
 
@@ -153,7 +153,7 @@ class LinkWidget extends WidgetBase {
       $element['title']['#required'] = TRUE;
       // We expect the field name placeholder value to be wrapped in t() here,
       // so it won't be escaped again as it's already marked safe.
-      $form_state->setError($element['title'], t('@name field is required.', array('@name' => $element['title']['#title'])));
+      $form_state->setError($element['title'], t('@name field is required.', ['@name' => $element['title']['#title']]));
     }
   }
 
@@ -164,7 +164,7 @@ class LinkWidget extends WidgetBase {
     /** @var \Drupal\link\LinkItemInterface $item */
     $item = $items[$delta];
 
-    $element['uri'] = array(
+    $element['uri'] = [
       '#type' => 'url',
       '#title' => $this->t('URL'),
       '#placeholder' => $this->getSetting('placeholder_url'),
@@ -172,10 +172,10 @@ class LinkWidget extends WidgetBase {
       // However, if it is inaccessible to the current user, do not display it
       // to them.
       '#default_value' => (!$item->isEmpty() && (\Drupal::currentUser()->hasPermission('link to any page') || $item->getUrl()->access())) ? static::getUriAsDisplayableString($item->uri) : NULL,
-      '#element_validate' => array(array(get_called_class(), 'validateUriElement')),
+      '#element_validate' => [[get_called_class(), 'validateUriElement']],
       '#maxlength' => 2048,
       '#required' => $element['#required'],
-    );
+    ];
 
     // If the field is configured to support internal links, it cannot use the
     // 'url' form element and we have to do the validation ourselves.
@@ -193,44 +193,45 @@ class LinkWidget extends WidgetBase {
     }
 
     // If the field is configured to allow only internal links, add a useful
-    // element prefix.
+    // element prefix and description.
     if (!$this->supportsExternalLinks()) {
-      $element['uri']['#field_prefix'] = rtrim(\Drupal::url('<front>', array(), array('absolute' => TRUE)), '/');
+      $element['uri']['#field_prefix'] = rtrim(\Drupal::url('<front>', [], ['absolute' => TRUE]), '/');
+      $element['uri']['#description'] = $this->t('This must be an internal path such as %add-node. You can also start typing the title of a piece of content to select it. Enter %front to link to the front page.', ['%add-node' => '/node/add', '%front' => '<front>']);
     }
     // If the field is configured to allow both internal and external links,
     // show a useful description.
     elseif ($this->supportsExternalLinks() && $this->supportsInternalLinks()) {
-      $element['uri']['#description'] = $this->t('Start typing the title of a piece of content to select it. You can also enter an internal path such as %add-node or an external URL such as %url. Enter %front to link to the front page.', array('%front' => '<front>', '%add-node' => '/node/add', '%url' => 'http://example.com'));
+      $element['uri']['#description'] = $this->t('Start typing the title of a piece of content to select it. You can also enter an internal path such as %add-node or an external URL such as %url. Enter %front to link to the front page.', ['%front' => '<front>', '%add-node' => '/node/add', '%url' => 'http://example.com']);
     }
     // If the field is configured to allow only external links, show a useful
     // description.
     elseif ($this->supportsExternalLinks() && !$this->supportsInternalLinks()) {
-      $element['uri']['#description'] = $this->t('This must be an external URL such as %url.', array('%url' => 'http://example.com'));
+      $element['uri']['#description'] = $this->t('This must be an external URL such as %url.', ['%url' => 'http://example.com']);
     }
 
-    $element['title'] = array(
+    $element['title'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Link text'),
       '#placeholder' => $this->getSetting('placeholder_title'),
       '#default_value' => isset($items[$delta]->title) ? $items[$delta]->title : NULL,
       '#maxlength' => 255,
       '#access' => $this->getFieldSetting('title') != DRUPAL_DISABLED,
-    );
+    ];
     // Post-process the title field to make it conditionally required if URL is
     // non-empty. Omit the validation on the field edit form, since the field
     // settings cannot be saved otherwise.
     if (!$this->isDefaultValueWidget($form_state) && $this->getFieldSetting('title') == DRUPAL_REQUIRED) {
-      $element['#element_validate'][] = array(get_called_class(), 'validateTitleElement');
+      $element['#element_validate'][] = [get_called_class(), 'validateTitleElement'];
     }
 
     // Exposing the attributes array in the widget is left for alternate and more
     // advanced field widgets.
-    $element['attributes'] = array(
+    $element['attributes'] = [
       '#type' => 'value',
       '#tree' => TRUE,
-      '#value' => !empty($items[$delta]->options['attributes']) ? $items[$delta]->options['attributes'] : array(),
-      '#attributes' => array('class' => array('link-field-widget-attributes')),
-    );
+      '#value' => !empty($items[$delta]->options['attributes']) ? $items[$delta]->options['attributes'] : [],
+      '#attributes' => ['class' => ['link-field-widget-attributes']],
+    ];
 
     // If cardinality is 1, ensure a proper label is output for the field.
     if ($this->fieldDefinition->getFieldStorageDefinition()->getCardinality() == 1) {
@@ -241,9 +242,9 @@ class LinkWidget extends WidgetBase {
       }
       // Otherwise wrap everything in a details element.
       else {
-        $element += array(
+        $element += [
           '#type' => 'fieldset',
-        );
+        ];
       }
     }
 
@@ -280,23 +281,23 @@ class LinkWidget extends WidgetBase {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $elements = parent::settingsForm($form, $form_state);
 
-    $elements['placeholder_url'] = array(
+    $elements['placeholder_url'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Placeholder for URL'),
       '#default_value' => $this->getSetting('placeholder_url'),
       '#description' => $this->t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
-    );
-    $elements['placeholder_title'] = array(
+    ];
+    $elements['placeholder_title'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Placeholder for link text'),
       '#default_value' => $this->getSetting('placeholder_title'),
       '#description' => $this->t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
-      '#states' => array(
-        'invisible' => array(
-          ':input[name="instance[settings][title]"]' => array('value' => DRUPAL_DISABLED),
-        ),
-      ),
-    );
+      '#states' => [
+        'invisible' => [
+          ':input[name="instance[settings][title]"]' => ['value' => DRUPAL_DISABLED],
+        ],
+      ],
+    ];
 
     return $elements;
   }
@@ -305,7 +306,7 @@ class LinkWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $placeholder_title = $this->getSetting('placeholder_title');
     $placeholder_url = $this->getSetting('placeholder_url');
@@ -314,10 +315,10 @@ class LinkWidget extends WidgetBase {
     }
     else {
       if (!empty($placeholder_title)) {
-        $summary[] = $this->t('Title placeholder: @placeholder_title', array('@placeholder_title' => $placeholder_title));
+        $summary[] = $this->t('Title placeholder: @placeholder_title', ['@placeholder_title' => $placeholder_title]);
       }
       if (!empty($placeholder_url)) {
-        $summary[] = $this->t('URL placeholder: @placeholder_url', array('@placeholder_url' => $placeholder_url));
+        $summary[] = $this->t('URL placeholder: @placeholder_url', ['@placeholder_url' => $placeholder_url]);
       }
     }
 
diff --git a/web/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php b/web/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
index f2a5f839d..16ccae0fc 100644
--- a/web/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
+++ b/web/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
@@ -6,20 +6,12 @@ use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidatorInterface;
-use Symfony\Component\Validator\ExecutionContextInterface;
+use Symfony\Component\Validator\ConstraintValidator;
 
 /**
  * Validates the LinkAccess constraint.
  */
-class LinkAccessConstraintValidator implements ConstraintValidatorInterface, ContainerInjectionInterface {
-
-  /**
-   * Stores the validator's state during validation.
-   *
-   * @var \Symfony\Component\Validator\ExecutionContextInterface
-   */
-  protected $context;
+class LinkAccessConstraintValidator extends ConstraintValidator implements ContainerInjectionInterface {
 
   /**
    * Proxy for the current user account.
@@ -47,13 +39,6 @@ class LinkAccessConstraintValidator implements ConstraintValidatorInterface, Con
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function initialize(ExecutionContextInterface $context) {
-    $this->context = $context;
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -70,7 +55,7 @@ class LinkAccessConstraintValidator implements ConstraintValidatorInterface, Con
       // permission nor can access this URI.
       $allowed = $this->current_user->hasPermission('link to any page') || $url->access();
       if (!$allowed) {
-        $this->context->addViolation($constraint->message, array('@uri' => $value->uri));
+        $this->context->addViolation($constraint->message, ['@uri' => $value->uri]);
       }
     }
   }
diff --git a/web/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php b/web/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
index e85de58db..948417391 100644
--- a/web/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
+++ b/web/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
@@ -4,27 +4,12 @@ namespace Drupal\link\Plugin\Validation\Constraint;
 
 use Drupal\Component\Utility\UrlHelper;
 use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidatorInterface;
-use Symfony\Component\Validator\ExecutionContextInterface;
+use Symfony\Component\Validator\ConstraintValidator;
 
 /**
  * Validates the LinkExternalProtocols constraint.
  */
-class LinkExternalProtocolsConstraintValidator implements ConstraintValidatorInterface {
-
-  /**
-   * Stores the validator's state during validation.
-   *
-   * @var \Symfony\Component\Validator\ExecutionContextInterface
-   */
-  protected $context;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function initialize(ExecutionContextInterface $context) {
-    $this->context = $context;
-  }
+class LinkExternalProtocolsConstraintValidator extends ConstraintValidator {
 
   /**
    * {@inheritdoc}
@@ -41,7 +26,7 @@ class LinkExternalProtocolsConstraintValidator implements ConstraintValidatorInt
       }
       // Disallow external URLs using untrusted protocols.
       if ($url->isExternal() && !in_array(parse_url($url->getUri(), PHP_URL_SCHEME), UrlHelper::getAllowedProtocols())) {
-        $this->context->addViolation($constraint->message, array('@uri' => $value->uri));
+        $this->context->addViolation($constraint->message, ['@uri' => $value->uri]);
       }
     }
   }
diff --git a/web/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php b/web/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php
index 86c38666e..6e2f0cff6 100644
--- a/web/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php
+++ b/web/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php
@@ -6,27 +6,12 @@ use Symfony\Component\Routing\Exception\InvalidParameterException;
 use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidatorInterface;
-use Symfony\Component\Validator\ExecutionContextInterface;
+use Symfony\Component\Validator\ConstraintValidator;
 
 /**
  * Validates the LinkNotExistingInternal constraint.
  */
-class LinkNotExistingInternalConstraintValidator implements ConstraintValidatorInterface {
-
-  /**
-   * Stores the validator's state during validation.
-   *
-   * @var \Symfony\Component\Validator\ExecutionContextInterface
-   */
-  protected $context;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function initialize(ExecutionContextInterface $context) {
-    $this->context = $context;
-  }
+class LinkNotExistingInternalConstraintValidator extends ConstraintValidator {
 
   /**
    * {@inheritdoc}
@@ -59,7 +44,7 @@ class LinkNotExistingInternalConstraintValidator implements ConstraintValidatorI
           $allowed = FALSE;
         }
         if (!$allowed) {
-          $this->context->addViolation($constraint->message, array('@uri' => $value->uri));
+          $this->context->addViolation($constraint->message, ['@uri' => $value->uri]);
         }
       }
     }
diff --git a/web/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php b/web/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php
index 4f706f6a0..52171d68d 100644
--- a/web/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php
+++ b/web/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php
@@ -2,10 +2,7 @@
 
 namespace Drupal\link\Plugin\Validation\Constraint;
 
-use Drupal\link\LinkItemInterface;
 use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidatorInterface;
-use Symfony\Component\Validator\ExecutionContextInterface;
 
 /**
  * Validation constraint for links receiving data allowed by its settings.
@@ -15,64 +12,8 @@ use Symfony\Component\Validator\ExecutionContextInterface;
  *   label = @Translation("Link data valid for link type.", context = "Validation"),
  * )
  */
-class LinkTypeConstraint extends Constraint implements ConstraintValidatorInterface {
+class LinkTypeConstraint extends Constraint {
 
   public $message = "The path '@uri' is invalid.";
 
-  /**
-   * @var \Symfony\Component\Validator\ExecutionContextInterface
-   */
-  protected $context;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function initialize(ExecutionContextInterface $context) {
-    $this->context = $context;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validatedBy() {
-    return get_class($this);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validate($value, Constraint $constraint) {
-    if (isset($value)) {
-      $uri_is_valid = TRUE;
-
-      /** @var $link_item \Drupal\link\LinkItemInterface */
-      $link_item = $value;
-      $link_type = $link_item->getFieldDefinition()->getSetting('link_type');
-
-      // Try to resolve the given URI to a URL. It may fail if it's schemeless.
-      try {
-        $url = $link_item->getUrl();
-      }
-      catch (\InvalidArgumentException $e) {
-        $uri_is_valid = FALSE;
-      }
-
-      // If the link field doesn't support both internal and external links,
-      // check whether the URL (a resolved URI) is in fact violating either
-      // restriction.
-      if ($uri_is_valid && $link_type !== LinkItemInterface::LINK_GENERIC) {
-        if (!($link_type & LinkItemInterface::LINK_EXTERNAL) && $url->isExternal()) {
-          $uri_is_valid = FALSE;
-        }
-        if (!($link_type & LinkItemInterface::LINK_INTERNAL) && !$url->isExternal()) {
-          $uri_is_valid = FALSE;
-        }
-      }
-
-      if (!$uri_is_valid) {
-        $this->context->addViolation($this->message, array('@uri' => $link_item->uri));
-      }
-    }
-  }
-
 }
diff --git a/web/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraintValidator.php b/web/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraintValidator.php
new file mode 100644
index 000000000..817e934b0
--- /dev/null
+++ b/web/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraintValidator.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\link\Plugin\Validation\Constraint;
+
+use Drupal\link\LinkItemInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+/**
+ * Constraint validator for links receiving data allowed by its settings.
+ */
+class LinkTypeConstraintValidator extends ConstraintValidator {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validate($value, Constraint $constraint) {
+    if (isset($value)) {
+      $uri_is_valid = TRUE;
+
+      /** @var $link_item \Drupal\link\LinkItemInterface */
+      $link_item = $value;
+      $link_type = $link_item->getFieldDefinition()->getSetting('link_type');
+
+      // Try to resolve the given URI to a URL. It may fail if it's schemeless.
+      try {
+        $url = $link_item->getUrl();
+      }
+      catch (\InvalidArgumentException $e) {
+        $uri_is_valid = FALSE;
+      }
+
+      // If the link field doesn't support both internal and external links,
+      // check whether the URL (a resolved URI) is in fact violating either
+      // restriction.
+      if ($uri_is_valid && $link_type !== LinkItemInterface::LINK_GENERIC) {
+        if (!($link_type & LinkItemInterface::LINK_EXTERNAL) && $url->isExternal()) {
+          $uri_is_valid = FALSE;
+        }
+        if (!($link_type & LinkItemInterface::LINK_INTERNAL) && !$url->isExternal()) {
+          $uri_is_valid = FALSE;
+        }
+      }
+
+      if (!$uri_is_valid) {
+        $this->context->addViolation($constraint->message, ['@uri' => $link_item->uri]);
+      }
+    }
+  }
+
+}
diff --git a/web/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php b/web/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php
index ec06ca614..80913ece8 100644
--- a/web/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php
+++ b/web/core/modules/link/src/Tests/Views/LinkViewsTokensTest.php
@@ -40,27 +40,27 @@ class LinkViewsTokensTest extends ViewTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    ViewTestData::createTestViews(get_class($this), array('link_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['link_test_views']);
 
     // Create Basic page node type.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'page',
       'name' => 'Basic page'
-    ));
+    ]);
 
     // Create a field.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'type' => 'link',
       'entity_type' => 'node',
       'cardinality' => 1,
-    ))->save();
-    FieldConfig::create(array(
+    ])->save();
+    FieldConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'bundle' => 'page',
       'label' => 'link field',
-    ))->save();
+    ])->save();
 
   }
 
@@ -72,7 +72,7 @@ class LinkViewsTokensTest extends ViewTestBase {
 
     // Add nodes with the URI's and titles.
     foreach ($uris as $uri => $title) {
-      $values = array('type' => 'page');
+      $values = ['type' => 'page'];
       $values[$this->fieldName][] = ['uri' => $uri, 'title' => $title, 'options' => ['attributes' => ['class' => 'test-link-class']]];
       $this->drupalCreateNode($values);
     }
diff --git a/web/core/modules/link/src/Tests/LinkFieldTest.php b/web/core/modules/link/tests/src/Functional/LinkFieldTest.php
similarity index 72%
rename from web/core/modules/link/src/Tests/LinkFieldTest.php
rename to web/core/modules/link/tests/src/Functional/LinkFieldTest.php
index e85ad5318..f4ffdee13 100644
--- a/web/core/modules/link/src/Tests/LinkFieldTest.php
+++ b/web/core/modules/link/tests/src/Functional/LinkFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\link\Tests;
+namespace Drupal\Tests\link\Functional;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
@@ -8,7 +8,7 @@ use Drupal\Core\Url;
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\link\LinkItemInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -16,7 +16,7 @@ use Drupal\field\Entity\FieldStorageConfig;
  *
  * @group link
  */
-class LinkFieldTest extends WebTestBase {
+class LinkFieldTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -52,36 +52,36 @@ class LinkFieldTest extends WebTestBase {
   /**
    * Tests link field URL validation.
    */
-  function testURLValidation() {
+  public function testURLValidation() {
     $field_name = Unicode::strtolower($this->randomMachineName());
     // Create a field with settings to validate.
-    $this->fieldStorage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'link',
-    ));
+    ]);
     $this->fieldStorage->save();
     $this->field = FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => 'entity_test',
-      'settings' => array(
+      'settings' => [
         'title' => DRUPAL_DISABLED,
         'link_type' => LinkItemInterface::LINK_GENERIC,
-      ),
+      ],
     ]);
     $this->field->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'link_default',
-        'settings' => array(
+        'settings' => [
           'placeholder_url' => 'http://example.com',
-        ),
-      ))
+        ],
+      ])
       ->save();
     entity_get_display('entity_test', 'entity_test', 'full')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'link',
-      ))
+      ])
       ->save();
 
     // Display creation form.
@@ -103,14 +103,14 @@ class LinkFieldTest extends WebTestBase {
 
     // Define some valid URLs (keys are the entered values, values are the
     // strings displayed to the user).
-    $valid_external_entries = array(
+    $valid_external_entries = [
       'http://www.example.com/' => 'http://www.example.com/',
       // Strings within parenthesis without leading space char.
       'http://www.example.com/strings_(string_within_parenthesis)' => 'http://www.example.com/strings_(string_within_parenthesis)',
       // Numbers within parenthesis without leading space char.
       'http://www.example.com/numbers_(9999)' => 'http://www.example.com/numbers_(9999)',
-    );
-    $valid_internal_entries = array(
+    ];
+    $valid_internal_entries = [
       '/entity_test/add' => '/entity_test/add',
       '/a/path/alias' => '/a/path/alias',
 
@@ -137,24 +137,24 @@ class LinkFieldTest extends WebTestBase {
       'entity:entity_test/' . $entity_test_no_label_access->id() => '- Restricted access - (' . $entity_test_no_label_access->id() . ')',
       // URI for an entity that doesn't exist, but with a valid ID.
       'entity:user/999999' => 'entity:user/999999',
-    );
+    ];
 
     // Define some invalid URLs.
     $validation_error_1 = "The path '@link_path' is invalid.";
     $validation_error_2 = 'Manually entered paths should start with /, ? or #.';
     $validation_error_3 = "The path '@link_path' is inaccessible.";
-    $invalid_external_entries = array(
+    $invalid_external_entries = [
       // Invalid protocol
       'invalid://not-a-valid-protocol' => $validation_error_1,
       // Missing host name
       'http://' => $validation_error_1,
-    );
-    $invalid_internal_entries = array(
+    ];
+    $invalid_internal_entries = [
       'no-leading-slash' => $validation_error_2,
       'entity:non_existing_entity_type/yar' => $validation_error_1,
       // URI for an entity that doesn't exist, with an invalid ID.
       'entity:user/invalid-parameter' => $validation_error_1,
-    );
+    ];
 
     // Test external and internal URLs for 'link_type' = LinkItemInterface::LINK_GENERIC.
     $this->assertValidEntries($field_name, $valid_external_entries + $valid_internal_entries);
@@ -191,13 +191,13 @@ class LinkFieldTest extends WebTestBase {
    */
   protected function assertValidEntries($field_name, array $valid_entries) {
     foreach ($valid_entries as $uri => $string) {
-      $edit = array(
+      $edit = [
         "{$field_name}[0][uri]" => $uri,
-      );
+      ];
       $this->drupalPostForm('entity_test/add', $edit, t('Save'));
-      preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+      preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
       $id = $match[1];
-      $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+      $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
       $this->assertRaw($string);
     }
   }
@@ -212,54 +212,54 @@ class LinkFieldTest extends WebTestBase {
    */
   protected function assertInvalidEntries($field_name, array $invalid_entries) {
     foreach ($invalid_entries as $invalid_value => $error_message) {
-      $edit = array(
+      $edit = [
         "{$field_name}[0][uri]" => $invalid_value,
-      );
+      ];
       $this->drupalPostForm('entity_test/add', $edit, t('Save'));
-      $this->assertText(t($error_message, array('@link_path' => $invalid_value)));
+      $this->assertText(t($error_message, ['@link_path' => $invalid_value]));
     }
   }
 
   /**
    * Tests the link title settings of a link field.
    */
-  function testLinkTitle() {
+  public function testLinkTitle() {
     $field_name = Unicode::strtolower($this->randomMachineName());
     // Create a field with settings to validate.
-    $this->fieldStorage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'link',
-    ));
+    ]);
     $this->fieldStorage->save();
     $this->field = FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => 'entity_test',
       'label' => 'Read more about this entity',
-      'settings' => array(
+      'settings' => [
         'title' => DRUPAL_OPTIONAL,
         'link_type' => LinkItemInterface::LINK_GENERIC,
-      ),
+      ],
     ]);
     $this->field->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'link_default',
-        'settings' => array(
+        'settings' => [
           'placeholder_url' => 'http://example.com',
           'placeholder_title' => 'Enter the text for this link',
-        ),
-      ))
+        ],
+      ])
       ->save();
     entity_get_display('entity_test', 'entity_test', 'full')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'link',
         'label' => 'hidden',
-      ))
+      ])
       ->save();
 
     // Verify that the link text field works according to the field setting.
-    foreach (array(DRUPAL_DISABLED, DRUPAL_REQUIRED, DRUPAL_OPTIONAL) as $title_setting) {
+    foreach ([DRUPAL_DISABLED, DRUPAL_REQUIRED, DRUPAL_OPTIONAL] as $title_setting) {
       // Update the link title field setting.
       $this->field->setSetting('title', $title_setting);
       $this->field->save();
@@ -281,90 +281,90 @@ class LinkFieldTest extends WebTestBase {
         $this->assertFieldByName("{$field_name}[0][title]", '', 'Link text field found.');
         if ($title_setting === DRUPAL_REQUIRED) {
           // Verify that the link text is required, if the URL is non-empty.
-          $edit = array(
+          $edit = [
             "{$field_name}[0][uri]" => 'http://www.example.com',
-          );
+          ];
           $this->drupalPostForm(NULL, $edit, t('Save'));
-          $this->assertText(t('@name field is required.', array('@name' => t('Link text'))));
+          $this->assertText(t('@name field is required.', ['@name' => t('Link text')]));
 
           // Verify that the link text is not required, if the URL is empty.
-          $edit = array(
+          $edit = [
             "{$field_name}[0][uri]" => '',
-          );
+          ];
           $this->drupalPostForm(NULL, $edit, t('Save'));
-          $this->assertNoText(t('@name field is required.', array('@name' => t('Link text'))));
+          $this->assertNoText(t('@name field is required.', ['@name' => t('Link text')]));
 
           // Verify that a URL and link text meets requirements.
           $this->drupalGet('entity_test/add');
-          $edit = array(
+          $edit = [
             "{$field_name}[0][uri]" => 'http://www.example.com',
             "{$field_name}[0][title]" => 'Example',
-          );
+          ];
           $this->drupalPostForm(NULL, $edit, t('Save'));
-          $this->assertNoText(t('@name field is required.', array('@name' => t('Link text'))));
+          $this->assertNoText(t('@name field is required.', ['@name' => t('Link text')]));
         }
       }
     }
 
     // Verify that a link without link text is rendered using the URL as text.
     $value = 'http://www.example.com/';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][uri]" => $value,
       "{$field_name}[0][title]" => '',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+    preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
 
-    $this->renderTestEntity($id);
-    $expected_link = \Drupal::l($value, Url::fromUri($value));
-    $this->assertRaw($expected_link);
+    $output = $this->renderTestEntity($id);
+    $expected_link = (string) \Drupal::l($value, Url::fromUri($value));
+    $this->assertContains($expected_link, $output);
 
     // Verify that a link with text is rendered using the link text.
     $title = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       "{$field_name}[0][title]" => $title,
-    );
+    ];
     $this->drupalPostForm("entity_test/manage/$id/edit", $edit, t('Save'));
-    $this->assertText(t('entity_test @id has been updated.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been updated.', ['@id' => $id]));
 
-    $this->renderTestEntity($id);
-    $expected_link = \Drupal::l($title, Url::fromUri($value));
-    $this->assertRaw($expected_link);
+    $output = $this->renderTestEntity($id);
+    $expected_link = (string) \Drupal::l($title, Url::fromUri($value));
+    $this->assertContains($expected_link, $output);
   }
 
   /**
    * Tests the default 'link' formatter.
    */
-  function testLinkFormatter() {
+  public function testLinkFormatter() {
     $field_name = Unicode::strtolower($this->randomMachineName());
     // Create a field with settings to validate.
-    $this->fieldStorage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'link',
       'cardinality' => 3,
-    ));
+    ]);
     $this->fieldStorage->save();
     FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'label' => 'Read more about this entity',
       'bundle' => 'entity_test',
-      'settings' => array(
+      'settings' => [
         'title' => DRUPAL_OPTIONAL,
         'link_type' => LinkItemInterface::LINK_GENERIC,
-      ),
+      ],
     ])->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'link_default',
-      ))
+      ])
       ->save();
-    $display_options = array(
+    $display_options = [
       'type' => 'link',
       'label' => 'hidden',
-    );
+    ];
     entity_get_display('entity_test', 'entity_test', 'full')
       ->setComponent($field_name, $display_options)
       ->save();
@@ -383,7 +383,7 @@ class LinkFieldTest extends WebTestBase {
     // Intentionally contains an ampersand that needs sanitization on output.
     $title2 = 'A very long & strange example title that could break the nice layout of the site';
     $title3 = 'Fragment only';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][uri]" => $url1,
       // Note that $title1 is not submitted.
       "{$field_name}[0][title]" => '',
@@ -391,35 +391,35 @@ class LinkFieldTest extends WebTestBase {
       "{$field_name}[1][title]" => $title2,
       "{$field_name}[2][uri]" => $url3,
       "{$field_name}[2][title]" => $title3,
-    );
+    ];
     // Assert label is shown.
     $this->assertText('Read more about this entity');
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+    preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
 
     // Verify that the link is output according to the formatter settings.
     // Not using generatePermutations(), since that leads to 32 cases, which
     // would not test actual link field formatter functionality but rather
     // the link generator and options/attributes. Only 'url_plain' has a
     // dependency on 'url_only', so we have a total of ~10 cases.
-    $options = array(
-      'trim_length' => array(NULL, 6),
-      'rel' => array(NULL, 'nofollow'),
-      'target' => array(NULL, '_blank'),
-      'url_only' => array(
-        array('url_only' => FALSE),
-        array('url_only' => FALSE, 'url_plain' => TRUE),
-        array('url_only' => TRUE),
-        array('url_only' => TRUE, 'url_plain' => TRUE),
-      ),
-    );
+    $options = [
+      'trim_length' => [NULL, 6],
+      'rel' => [NULL, 'nofollow'],
+      'target' => [NULL, '_blank'],
+      'url_only' => [
+        ['url_only' => FALSE],
+        ['url_only' => FALSE, 'url_plain' => TRUE],
+        ['url_only' => TRUE],
+        ['url_only' => TRUE, 'url_plain' => TRUE],
+      ],
+    ];
     foreach ($options as $setting => $values) {
       foreach ($values as $new_value) {
         // Update the field formatter settings.
         if (!is_array($new_value)) {
-          $display_options['settings'] = array($setting => $new_value);
+          $display_options['settings'] = [$setting => $new_value];
         }
         else {
           $display_options['settings'] = $new_value;
@@ -428,56 +428,56 @@ class LinkFieldTest extends WebTestBase {
           ->setComponent($field_name, $display_options)
           ->save();
 
-        $this->renderTestEntity($id);
+        $output = $this->renderTestEntity($id);
         switch ($setting) {
           case 'trim_length':
             $url = $url1;
             $title = isset($new_value) ? Unicode::truncate($title1, $new_value, FALSE, TRUE) : $title1;
-            $this->assertRaw('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>');
+            $this->assertContains('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
 
             $url = $url2;
             $title = isset($new_value) ? Unicode::truncate($title2, $new_value, FALSE, TRUE) : $title2;
-            $this->assertRaw('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>');
+            $this->assertContains('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
 
             $url = $url3;
             $title = isset($new_value) ? Unicode::truncate($title3, $new_value, FALSE, TRUE) : $title3;
-            $this->assertRaw('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>');
+            $this->assertContains('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
             break;
 
           case 'rel':
             $rel = isset($new_value) ? ' rel="' . $new_value . '"' : '';
-            $this->assertRaw('<a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($title1) . '</a>');
-            $this->assertRaw('<a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($title2) . '</a>');
-            $this->assertRaw('<a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($title3) . '</a>');
+            $this->assertContains('<a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($title1) . '</a>', $output);
+            $this->assertContains('<a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($title2) . '</a>', $output);
+            $this->assertContains('<a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($title3) . '</a>', $output);
             break;
 
           case 'target':
             $target = isset($new_value) ? ' target="' . $new_value . '"' : '';
-            $this->assertRaw('<a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($title1) . '</a>');
-            $this->assertRaw('<a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($title2) . '</a>');
-            $this->assertRaw('<a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($title3) . '</a>');
+            $this->assertContains('<a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($title1) . '</a>', $output);
+            $this->assertContains('<a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($title2) . '</a>', $output);
+            $this->assertContains('<a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($title3) . '</a>', $output);
             break;
 
           case 'url_only':
             // In this case, $new_value is an array.
             if (!$new_value['url_only']) {
-              $this->assertRaw('<a href="' . Html::escape($url1) . '">' . Html::escape($title1) . '</a>');
-              $this->assertRaw('<a href="' . Html::escape($url2) . '">' . Html::escape($title2) . '</a>');
-              $this->assertRaw('<a href="' . Html::escape($url3) . '">' . Html::escape($title3) . '</a>');
+              $this->assertContains('<a href="' . Html::escape($url1) . '">' . Html::escape($title1) . '</a>', $output);
+              $this->assertContains('<a href="' . Html::escape($url2) . '">' . Html::escape($title2) . '</a>', $output);
+              $this->assertContains('<a href="' . Html::escape($url3) . '">' . Html::escape($title3) . '</a>', $output);
             }
             else {
               if (empty($new_value['url_plain'])) {
-                $this->assertRaw('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>');
-                $this->assertRaw('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>');
-                $this->assertRaw('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>');
+                $this->assertContains('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>', $output);
+                $this->assertContains('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>', $output);
+                $this->assertContains('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>', $output);
               }
               else {
-                $this->assertNoRaw('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>');
-                $this->assertNoRaw('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>');
-                $this->assertNoRaw('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>');
-                $this->assertEscaped($url1);
-                $this->assertEscaped($url2);
-                $this->assertEscaped($url3);
+                $this->assertNotContains('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>', $output);
+                $this->assertNotContains('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>', $output);
+                $this->assertNotContains('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>', $output);
+                $this->assertContains(Html::escape($url1), $output);
+                $this->assertContains(Html::escape($url2), $output);
+                $this->assertContains(Html::escape($url3), $output);
               }
             }
             break;
@@ -492,32 +492,32 @@ class LinkFieldTest extends WebTestBase {
    * This test is mostly the same as testLinkFormatter(), but they cannot be
    * merged, since they involve different configuration and output.
    */
-  function testLinkSeparateFormatter() {
+  public function testLinkSeparateFormatter() {
     $field_name = Unicode::strtolower($this->randomMachineName());
     // Create a field with settings to validate.
-    $this->fieldStorage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'link',
       'cardinality' => 3,
-    ));
+    ]);
     $this->fieldStorage->save();
     FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => 'entity_test',
-      'settings' => array(
+      'settings' => [
         'title' => DRUPAL_OPTIONAL,
         'link_type' => LinkItemInterface::LINK_GENERIC,
-      ),
+      ],
     ])->save();
-    $display_options = array(
+    $display_options = [
       'type' => 'link_separate',
       'label' => 'hidden',
-    );
+    ];
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'link_default',
-      ))
+      ])
       ->save();
     entity_get_display('entity_test', 'entity_test', 'full')
       ->setComponent($field_name, $display_options)
@@ -536,33 +536,33 @@ class LinkFieldTest extends WebTestBase {
     // Intentionally contains an ampersand that needs sanitization on output.
     $title2 = 'A very long & strange example title that could break the nice layout of the site';
     $title3 = 'Fragment only';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][uri]" => $url1,
       "{$field_name}[1][uri]" => $url2,
       "{$field_name}[1][title]" => $title2,
       "{$field_name}[2][uri]" => $url3,
       "{$field_name}[2][title]" => $title3,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+    preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
 
     // Verify that the link is output according to the formatter settings.
-    $options = array(
-      'trim_length' => array(NULL, 6),
-      'rel' => array(NULL, 'nofollow'),
-      'target' => array(NULL, '_blank'),
-    );
+    $options = [
+      'trim_length' => [NULL, 6],
+      'rel' => [NULL, 'nofollow'],
+      'target' => [NULL, '_blank'],
+    ];
     foreach ($options as $setting => $values) {
       foreach ($values as $new_value) {
         // Update the field formatter settings.
-        $display_options['settings'] = array($setting => $new_value);
+        $display_options['settings'] = [$setting => $new_value];
         entity_get_display('entity_test', 'entity_test', 'full')
           ->setComponent($field_name, $display_options)
           ->save();
 
-        $this->renderTestEntity($id);
+        $output = $this->renderTestEntity($id);
         switch ($setting) {
           case 'trim_length':
             $url = $url1;
@@ -570,7 +570,7 @@ class LinkFieldTest extends WebTestBase {
             $expected = '<div class="link-item">';
             $expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';
             $expected .= '</div>';
-            $this->assertRaw($expected);
+            $this->assertContains($expected, $output);
 
             $url = $url2;
             $url_title = isset($new_value) ? Unicode::truncate($url, $new_value, FALSE, TRUE) : $url;
@@ -579,7 +579,7 @@ class LinkFieldTest extends WebTestBase {
             $expected .= '<div class="link-title">' . Html::escape($title) . '</div>';
             $expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';
             $expected .= '</div>';
-            $this->assertRaw($expected);
+            $this->assertContains($expected, $output);
 
             $url = $url3;
             $url_title = isset($new_value) ? Unicode::truncate($url, $new_value, FALSE, TRUE) : $url;
@@ -588,21 +588,21 @@ class LinkFieldTest extends WebTestBase {
             $expected .= '<div class="link-title">' . Html::escape($title) . '</div>';
             $expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';
             $expected .= '</div>';
-            $this->assertRaw($expected);
+            $this->assertContains($expected, $output);
             break;
 
           case 'rel':
             $rel = isset($new_value) ? ' rel="' . $new_value . '"' : '';
-            $this->assertRaw('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($url1) . '</a></div>');
-            $this->assertRaw('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($url2) . '</a></div>');
-            $this->assertRaw('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($url3) . '</a></div>');
+            $this->assertContains('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($url1) . '</a></div>', $output);
+            $this->assertContains('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($url2) . '</a></div>', $output);
+            $this->assertContains('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($url3) . '</a></div>', $output);
             break;
 
           case 'target':
             $target = isset($new_value) ? ' target="' . $new_value . '"' : '';
-            $this->assertRaw('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($url1) . '</a></div>');
-            $this->assertRaw('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($url2) . '</a></div>');
-            $this->assertRaw('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($url3) . '</a></div>');
+            $this->assertContains('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($url1) . '</a></div>', $output);
+            $this->assertContains('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($url2) . '</a></div>', $output);
+            $this->assertContains('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($url3) . '</a></div>', $output);
             break;
         }
       }
@@ -610,7 +610,7 @@ class LinkFieldTest extends WebTestBase {
   }
 
   /**
-   * Renders a test_entity and sets the output in the internal browser.
+   * Renders a test_entity and returns the output.
    *
    * @param int $id
    *   The test_entity ID to render.
@@ -619,17 +619,21 @@ class LinkFieldTest extends WebTestBase {
    * @param bool $reset
    *   (optional) Whether to reset the entity_test storage cache. Defaults to
    *   TRUE to simplify testing.
+   *
+   * @return string
+   *   The rendered HTML output.
    */
   protected function renderTestEntity($id, $view_mode = 'full', $reset = TRUE) {
     if ($reset) {
-      $this->container->get('entity.manager')->getStorage('entity_test')->resetCache(array($id));
+      $this->container->get('entity.manager')->getStorage('entity_test')->resetCache([$id]);
     }
     $entity = EntityTest::load($id);
     $display = entity_get_display($entity->getEntityTypeId(), $entity->bundle(), $view_mode);
     $content = $display->build($entity);
     $output = \Drupal::service('renderer')->renderRoot($content);
-    $this->setRawContent($output);
+    $output = (string) $output;
     $this->verbose($output);
+    return $output;
   }
 
 }
diff --git a/web/core/modules/link/src/Tests/LinkFieldUITest.php b/web/core/modules/link/tests/src/Functional/LinkFieldUITest.php
similarity index 93%
rename from web/core/modules/link/src/Tests/LinkFieldUITest.php
rename to web/core/modules/link/tests/src/Functional/LinkFieldUITest.php
index 855c10b53..0da393834 100644
--- a/web/core/modules/link/src/Tests/LinkFieldUITest.php
+++ b/web/core/modules/link/tests/src/Functional/LinkFieldUITest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\link\Tests;
+namespace Drupal\Tests\link\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\field_ui\Tests\FieldUiTestTrait;
 use Drupal\link\LinkItemInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests link field UI functionality.
  *
  * @group link
  */
-class LinkFieldUITest extends WebTestBase {
+class LinkFieldUITest extends BrowserTestBase {
 
   use FieldUiTestTrait;
 
@@ -44,7 +44,7 @@ class LinkFieldUITest extends WebTestBase {
   /**
    * Tests the link field UI.
    */
-  function testFieldUI() {
+  public function testFieldUI() {
     // Add a content type.
     $type = $this->drupalCreateContentType();
     $type_path = 'admin/structure/types/manage/' . $type->id();
@@ -60,7 +60,7 @@ class LinkFieldUITest extends WebTestBase {
     // generate warnings.
     // @todo Mess with the formatter settings a bit here.
     $this->drupalGet("$type_path/display");
-    $this->assertText(t('Link text trimmed to @limit characters', array('@limit' => 80)));
+    $this->assertText(t('Link text trimmed to @limit characters', ['@limit' => 80]));
 
     // Test the help text displays when the link field allows both internal and
     // external links.
@@ -81,7 +81,7 @@ class LinkFieldUITest extends WebTestBase {
     $label = $this->randomMachineName();
     $field_name = Unicode::strtolower($label);
     $field_edit = ['settings[link_type]' => LinkItemInterface::LINK_EXTERNAL];
-    $this->fieldUIAddNewField($type_path, $field_name, $label, 'link', array(), $field_edit);
+    $this->fieldUIAddNewField($type_path, $field_name, $label, 'link', [], $field_edit);
 
     // Test the help text displays when link allows only external links.
     $this->drupalLogin($this->drupalCreateUser(['create ' . $type->id() . ' content']));
diff --git a/web/core/modules/link/tests/src/Kernel/LinkItemTest.php b/web/core/modules/link/tests/src/Kernel/LinkItemTest.php
index 5e2c45dbb..ff4f84056 100644
--- a/web/core/modules/link/tests/src/Kernel/LinkItemTest.php
+++ b/web/core/modules/link/tests/src/Kernel/LinkItemTest.php
@@ -24,7 +24,7 @@ class LinkItemTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('link');
+  public static $modules = ['link'];
 
   protected function setUp() {
     parent::setUp();
@@ -78,7 +78,7 @@ class LinkItemTest extends FieldKernelTestBase {
     $entity->field_test->uri = $parsed_url['path'];
     $entity->field_test->title = $title;
     $entity->field_test->first()->get('options')->set('query', $parsed_url['query']);
-    $entity->field_test->first()->get('options')->set('attributes', array('class' => $class));
+    $entity->field_test->first()->get('options')->set('attributes', ['class' => $class]);
     $this->assertEquals([
       'query' => $parsed_url['query'],
       'attributes' => [
@@ -118,7 +118,7 @@ class LinkItemTest extends FieldKernelTestBase {
     $entity->field_test->uri = $new_url;
     $entity->field_test->title = $new_title;
     $entity->field_test->first()->get('options')->set('query', NULL);
-    $entity->field_test->first()->get('options')->set('attributes', array('class' => $new_class));
+    $entity->field_test->first()->get('options')->set('attributes', ['class' => $new_class]);
     $this->assertEqual($entity->field_test->uri, $new_url);
     $this->assertEqual($entity->field_test->title, $new_title);
     $this->assertEqual($entity->field_test->options['attributes']['class'], $new_class);
diff --git a/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php b/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php
index 9e4623eed..c2290bc4d 100644
--- a/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php
+++ b/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\link\Unit\Plugin\Validation\Constraint;
 use Drupal\link\Plugin\Validation\Constraint\LinkAccessConstraint;
 use Drupal\link\Plugin\Validation\Constraint\LinkAccessConstraintValidator;
 use Drupal\Tests\UnitTestCase;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * Tests the LinkAccessConstraintValidator validator.
@@ -29,7 +30,7 @@ class LinkAccessConstraintValidatorTest extends UnitTestCase {
    * @dataProvider providerValidate
    */
   public function testValidate($value, $user, $valid) {
-    $context = $this->getMock('Symfony\Component\Validator\ExecutionContextInterface');
+    $context = $this->getMock(ExecutionContextInterface::class);
 
     if ($valid) {
       $context->expects($this->never())
diff --git a/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidatorTest.php b/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidatorTest.php
index 771b307f6..0de416f01 100644
--- a/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidatorTest.php
+++ b/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidatorTest.php
@@ -7,6 +7,7 @@ use Drupal\Core\Url;
 use Drupal\link\Plugin\Validation\Constraint\LinkExternalProtocolsConstraint;
 use Drupal\link\Plugin\Validation\Constraint\LinkExternalProtocolsConstraintValidator;
 use Drupal\Tests\UnitTestCase;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @coversDefaultClass \Drupal\link\Plugin\Validation\Constraint\LinkExternalProtocolsConstraintValidator
@@ -19,7 +20,7 @@ class LinkExternalProtocolsConstraintValidatorTest extends UnitTestCase {
    * @dataProvider providerValidate
    */
   public function testValidate($value, $valid) {
-    $context = $this->getMock('Symfony\Component\Validator\ExecutionContextInterface');
+    $context = $this->getMock(ExecutionContextInterface::class);
 
     if ($valid) {
       $context->expects($this->never())
@@ -77,7 +78,7 @@ class LinkExternalProtocolsConstraintValidatorTest extends UnitTestCase {
       ->method('getUrl')
       ->willThrowException(new \InvalidArgumentException());
 
-    $context = $this->getMock('Symfony\Component\Validator\ExecutionContextInterface');
+    $context = $this->getMock(ExecutionContextInterface::class);
     $context->expects($this->never())
       ->method('addViolation');
 
@@ -97,7 +98,7 @@ class LinkExternalProtocolsConstraintValidatorTest extends UnitTestCase {
       ->method('getUrl')
       ->willReturn(Url::fromRoute('example.test'));
 
-    $context = $this->getMock('Symfony\Component\Validator\ExecutionContextInterface');
+    $context = $this->getMock(ExecutionContextInterface::class);
     $context->expects($this->never())
       ->method('addViolation');
 
diff --git a/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php b/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php
index 69776fd5a..41ecd4a87 100644
--- a/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php
+++ b/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidatorTest.php
@@ -7,6 +7,7 @@ use Drupal\link\Plugin\Validation\Constraint\LinkNotExistingInternalConstraint;
 use Drupal\link\Plugin\Validation\Constraint\LinkNotExistingInternalConstraintValidator;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @coversDefaultClass \Drupal\link\Plugin\Validation\Constraint\LinkNotExistingInternalConstraintValidator
@@ -19,7 +20,7 @@ class LinkNotExistingInternalConstraintValidatorTest extends UnitTestCase {
    * @dataProvider providerValidate
    */
   public function testValidate($value, $valid) {
-    $context = $this->getMock('Symfony\Component\Validator\ExecutionContextInterface');
+    $context = $this->getMock(ExecutionContextInterface::class);
 
     if ($valid) {
       $context->expects($this->never())
@@ -94,7 +95,7 @@ class LinkNotExistingInternalConstraintValidatorTest extends UnitTestCase {
       ->method('getUrl')
       ->willThrowException(new \InvalidArgumentException());
 
-    $context = $this->getMock('Symfony\Component\Validator\ExecutionContextInterface');
+    $context = $this->getMock(ExecutionContextInterface::class);
     $context->expects($this->never())
       ->method('addViolation');
 
diff --git a/web/core/modules/locale/locale.api.php b/web/core/modules/locale/locale.api.php
index 56210e54f..3cf1e12ea 100644
--- a/web/core/modules/locale/locale.api.php
+++ b/web/core/modules/locale/locale.api.php
@@ -116,11 +116,11 @@
  */
 function hook_locale_translation_projects_alter(&$projects) {
   // The translations are located at a custom translation sever.
-  $projects['existing_project'] = array(
-    'info' => array(
+  $projects['existing_project'] = [
+    'info' => [
       'interface translation server pattern' => 'http://example.com/files/translations/%core/%project/%project-%version.%language.po',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
diff --git a/web/core/modules/locale/locale.batch.inc b/web/core/modules/locale/locale.batch.inc
index 81ca96667..7edc85d67 100644
--- a/web/core/modules/locale/locale.batch.inc
+++ b/web/core/modules/locale/locale.batch.inc
@@ -33,16 +33,16 @@ require_once __DIR__ . '/locale.translation.inc';
  *     batch is finished. Optional, defaults to TRUE.
  *   - 'use_remote': Whether or not to check the remote translation file.
  *     Optional, defaults to TRUE.
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   The batch context.
  */
 function locale_translation_batch_status_check($project, $langcode, array $options, &$context) {
   $failure = $checked = FALSE;
-  $options += array(
+  $options += [
     'finish_feedback' => TRUE,
     'use_remote' => TRUE,
-  );
-  $source = locale_translation_get_status(array($project), array($langcode));
+  ];
+  $source = locale_translation_get_status([$project], [$langcode]);
   $source = $source[$project][$langcode];
 
   // Check the status of local translation files.
@@ -82,7 +82,7 @@ function locale_translation_batch_status_check($project, $langcode, array $optio
   if ($failure && !$checked) {
     $context['results']['failed_files'][] = $source->name;
   }
-  $context['message'] = t('Checked translation for %project.', array('%project' => $source->project));
+  $context['message'] = t('Checked translation for %project.', ['%project' => $source->project]);
 }
 
 /**
@@ -99,7 +99,7 @@ function locale_translation_batch_status_finished($success, $results) {
   if ($success) {
     if (isset($results['failed_files'])) {
       if (\Drupal::moduleHandler()->moduleExists('dblog') && \Drupal::currentUser()->hasPermission('access site reports')) {
-        $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be checked. <a href=":url">See the log</a> for details.', '@count translation files could not be checked. <a href=":url">See the log</a> for details.', array(':url' => \Drupal::url('dblog.overview')));
+        $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be checked. <a href=":url">See the log</a> for details.', '@count translation files could not be checked. <a href=":url">See the log</a> for details.', [':url' => \Drupal::url('dblog.overview')]);
       }
       else {
         $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation files could not be checked. See the log for details.', '@count translation files could not be checked. See the log for details.');
@@ -139,12 +139,12 @@ function locale_translation_batch_status_finished($success, $results) {
  * @see locale_translation_batch_fetch_import()
  */
 function locale_translation_batch_fetch_download($project, $langcode, &$context) {
-  $sources = locale_translation_get_status(array($project), array($langcode));
+  $sources = locale_translation_get_status([$project], [$langcode]);
   if (isset($sources[$project][$langcode])) {
     $source = $sources[$project][$langcode];
     if (isset($source->type) && $source->type == LOCALE_TRANSLATION_REMOTE) {
       if ($file = locale_translation_download_source($source->files[LOCALE_TRANSLATION_REMOTE], 'translations://')) {
-        $context['message'] = t('Downloaded translation for %project.', array('%project' => $source->project));
+        $context['message'] = t('Downloaded translation for %project.', ['%project' => $source->project]);
         locale_translation_status_save($source->name, $source->langcode, LOCALE_TRANSLATION_LOCAL, $file);
       }
       else {
@@ -173,16 +173,16 @@ function locale_translation_batch_fetch_download($project, $langcode, &$context)
  * @see locale_translation_batch_fetch_download()
  */
 function locale_translation_batch_fetch_import($project, $langcode, $options, &$context) {
-  $sources = locale_translation_get_status(array($project), array($langcode));
+  $sources = locale_translation_get_status([$project], [$langcode]);
   if (isset($sources[$project][$langcode])) {
     $source = $sources[$project][$langcode];
     if (isset($source->type)) {
       if ($source->type == LOCALE_TRANSLATION_REMOTE || $source->type == LOCALE_TRANSLATION_LOCAL) {
         $file = $source->files[LOCALE_TRANSLATION_LOCAL];
         module_load_include('bulk.inc', 'locale');
-        $options += array(
-          'message' => t('Importing translation for %project.', array('%project' => $source->project)),
-        );
+        $options += [
+          'message' => t('Importing translation for %project.', ['%project' => $source->project]),
+        ];
         // Import the translation file. For large files the batch operations is
         // progressive and will be called repeatedly until finished.
         locale_translate_batch_import($file, $options, $context);
@@ -191,7 +191,7 @@ function locale_translation_batch_fetch_import($project, $langcode, $options, &$
         if (isset($context['finished']) && $context['finished'] == 1) {
           // The import is successful.
           if (isset($context['results']['files'][$file->uri])) {
-            $context['message'] = t('Imported translation for %project.', array('%project' => $source->project));
+            $context['message'] = t('Imported translation for %project.', ['%project' => $source->project]);
 
             // Save the data of imported source into the {locale_file} table and
             // update the current translation status.
@@ -243,7 +243,7 @@ function locale_translation_http_check($uri) {
         $actual_uri = (string) $request_uri;
       }
     ]])->head($uri);
-    $result = array();
+    $result = [];
 
     // Return the effective URL if it differs from the requested.
     if ($actual_uri && $actual_uri !== $uri) {
@@ -262,10 +262,10 @@ function locale_translation_http_check($uri) {
         // theme does not define the location of a translation file. By default
         // the file is checked at the translation server, but it will not be
         // found there.
-        $logger->notice('Translation file not found: @uri.', array('@uri' => $uri));
+        $logger->notice('Translation file not found: @uri.', ['@uri' => $uri]);
         return TRUE;
       }
-      $logger->notice('HTTP request to @url failed with error: @error.', array('@url' => $uri, '@error' => $response->getStatusCode() . ' ' . $response->getReasonPhrase()));
+      $logger->notice('HTTP request to @url failed with error: @error.', ['@url' => $uri, '@error' => $response->getStatusCode() . ' ' . $response->getReasonPhrase()]);
     }
   }
 
@@ -298,6 +298,6 @@ function locale_translation_download_source($source_file, $directory = 'temporar
     $file->timestamp = filemtime($uri);
     return $file;
   }
-  \Drupal::logger('locale')->error('Unable to download translation file @uri.', array('@uri' => $source_file->uri));
+  \Drupal::logger('locale')->error('Unable to download translation file @uri.', ['@uri' => $source_file->uri]);
   return FALSE;
 }
diff --git a/web/core/modules/locale/locale.bulk.inc b/web/core/modules/locale/locale.bulk.inc
index 1181b50f2..3e256c28f 100644
--- a/web/core/modules/locale/locale.bulk.inc
+++ b/web/core/modules/locale/locale.bulk.inc
@@ -37,14 +37,14 @@ use Drupal\locale\Locale;
  *   See https://www.drupal.org/node/1191488.
  */
 function locale_translate_batch_import_files(array $options, $force = FALSE) {
-  $options += array(
-    'overwrite_options' => array(),
+  $options += [
+    'overwrite_options' => [],
     'customized' => LOCALE_NOT_CUSTOMIZED,
     'finish_feedback' => TRUE,
-  );
+  ];
 
   if (!empty($options['langcode'])) {
-    $langcodes = array($options['langcode']);
+    $langcodes = [$options['langcode']];
   }
   else {
     // If langcode was not provided, make sure to only import files for the
@@ -52,11 +52,11 @@ function locale_translate_batch_import_files(array $options, $force = FALSE) {
     $langcodes = array_keys(\Drupal::languageManager()->getLanguages());
   }
 
-  $files = locale_translate_get_interface_translation_files(array(), $langcodes);
+  $files = locale_translate_get_interface_translation_files([], $langcodes);
 
   if (!$force) {
     $result = db_select('locale_file', 'lf')
-      ->fields('lf', array('langcode', 'uri', 'timestamp'))
+      ->fields('lf', ['langcode', 'uri', 'timestamp'])
       ->condition('langcode', $langcodes)
       ->execute()
       ->fetchAllAssoc('uri');
@@ -84,9 +84,9 @@ function locale_translate_batch_import_files(array $options, $force = FALSE) {
  * @return array
  *   An array of interface translation files keyed by their URI.
  */
-function locale_translate_get_interface_translation_files(array $projects = array(), array $langcodes = array()) {
+function locale_translate_get_interface_translation_files(array $projects = [], array $langcodes = []) {
   module_load_include('compare.inc', 'locale');
-  $files = array();
+  $files = [];
   $projects = $projects ? $projects : array_keys(locale_translation_get_projects());
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
 
@@ -95,7 +95,7 @@ function locale_translate_get_interface_translation_files(array $projects = arra
   // {project}-{version}.{langcode}.po.
   // Only files of known projects and languages will be returned.
   $directory = \Drupal::config('locale.settings')->get('translation.path');
-  $result = file_scan_directory($directory, '![a-z_]+(\-[0-9a-z\.\-\+]+|)\.[^\./]+\.po$!', array('recurse' => FALSE));
+  $result = file_scan_directory($directory, '![a-z_]+(\-[0-9a-z\.\-\+]+|)\.[^\./]+\.po$!', ['recurse' => FALSE]);
 
   foreach ($result as $file) {
     // Update the file object with project name and version from the file name.
@@ -132,30 +132,30 @@ function locale_translate_get_interface_translation_files(array $projects = arra
  *   A batch structure or FALSE if $files was empty.
  */
 function locale_translate_batch_build(array $files, array $options) {
-  $options += array(
-    'overwrite_options' => array(),
+  $options += [
+    'overwrite_options' => [],
     'customized' => LOCALE_NOT_CUSTOMIZED,
     'finish_feedback' => TRUE,
-  );
+  ];
   if (count($files)) {
-    $operations = array();
+    $operations = [];
     foreach ($files as $file) {
       // We call locale_translate_batch_import for every batch operation.
-      $operations[] = array('locale_translate_batch_import', array($file, $options));
+      $operations[] = ['locale_translate_batch_import', [$file, $options]];
     }
     // Save the translation status of all files.
-    $operations[] = array('locale_translate_batch_import_save', array());
+    $operations[] = ['locale_translate_batch_import_save', []];
 
     // Add a final step to refresh JavaScript and configuration strings.
-    $operations[] = array('locale_translate_batch_refresh', array());
+    $operations[] = ['locale_translate_batch_refresh', []];
 
-    $batch = array(
+    $batch = [
       'operations'    => $operations,
       'title'         => t('Importing interface translations'),
       'progress_message' => '',
       'error_message' => t('Error importing interface translations'),
       'file'          => drupal_get_path('module', 'locale') . '/locale.bulk.inc',
-    );
+    ];
     if ($options['finish_feedback']) {
       $batch['finished'] = 'locale_translate_batch_finished';
     }
@@ -185,25 +185,25 @@ function locale_translate_batch_build(array $files, array $options) {
  *     LOCALE_NOT_CUSTOMIZED.
  *   - 'message': Alternative message to display during import. Note, this must
  *     be sanitized text.
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   Contains a list of files imported.
  */
 function locale_translate_batch_import($file, array $options, &$context) {
   // Merge the default values in the $options array.
-  $options += array(
-    'overwrite_options' => array(),
+  $options += [
+    'overwrite_options' => [],
     'customized' => LOCALE_NOT_CUSTOMIZED,
-  );
+  ];
 
   if (isset($file->langcode) && $file->langcode != LanguageInterface::LANGCODE_NOT_SPECIFIED) {
 
     try {
       if (empty($context['sandbox'])) {
-        $context['sandbox']['parse_state'] = array(
+        $context['sandbox']['parse_state'] = [
           'filesize' => filesize(drupal_realpath($file->uri)),
           'chunk_size' => 200,
           'seek' => 0,
-        );
+        ];
       }
       // Update the seek and the number of items in the $options array().
       $options['seek'] = $context['sandbox']['parse_state']['seek'];
@@ -220,10 +220,10 @@ function locale_translate_batch_import($file, array $options, &$context) {
         // https://www.drupal.org/node/1089472.
         $context['finished'] = min(0.95, $report['seek'] / filesize($file->uri));
         if (isset($options['message'])) {
-          $context['message'] = t('@message (@percent%).', array('@message' => $options['message'], '@percent' => (int) ($context['finished'] * 100)));
+          $context['message'] = t('@message (@percent%).', ['@message' => $options['message'], '@percent' => (int) ($context['finished'] * 100)]);
         }
         else {
-          $context['message'] = t('Importing translation file: %filename (@percent%).', array('%filename' => $file->filename, '@percent' => (int) ($context['finished'] * 100)));
+          $context['message'] = t('Importing translation file: %filename (@percent%).', ['%filename' => $file->filename, '@percent' => (int) ($context['finished'] * 100)]);
         }
       }
       else {
@@ -240,7 +240,7 @@ function locale_translate_batch_import($file, array $options, &$context) {
       // Each import iteration reports statistics in an array. The results of
       // each iteration are added and merged here and stored per file.
       if (!isset($context['results']['stats']) || !isset($context['results']['stats'][$file->uri])) {
-        $context['results']['stats'][$file->uri] = array();
+        $context['results']['stats'][$file->uri] = [];
       }
       foreach ($report as $key => $value) {
         if (is_numeric($report[$key])) {
@@ -250,7 +250,7 @@ function locale_translate_batch_import($file, array $options, &$context) {
           $context['results']['stats'][$file->uri][$key] += $report[$key];
         }
         elseif (is_array($value)) {
-          $context['results']['stats'][$file->uri] += array($key => array());
+          $context['results']['stats'][$file->uri] += [$key => []];
           $context['results']['stats'][$file->uri][$key] = array_merge($context['results']['stats'][$file->uri][$key], $value);
         }
       }
@@ -258,7 +258,7 @@ function locale_translate_batch_import($file, array $options, &$context) {
     catch (Exception $exception) {
       // Import failed. Store the data of the failing file.
       $context['results']['failed_files'][] = $file;
-      \Drupal::logger('locale')->notice('Unable to import translations file: @file', array('@file' => $file->uri));
+      \Drupal::logger('locale')->notice('Unable to import translations file: @file', ['@file' => $file->uri]);
     }
   }
 }
@@ -268,7 +268,7 @@ function locale_translate_batch_import($file, array $options, &$context) {
  *
  * Save data of imported files.
  *
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   Contains a list of imported files.
  */
 function locale_translate_batch_import_save($context) {
@@ -293,12 +293,12 @@ function locale_translate_batch_import_save($context) {
  *
  * Refreshes translations after importing strings.
  *
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   Contains a list of strings updated and information about the progress.
  */
 function locale_translate_batch_refresh(&$context) {
   if (!isset($context['sandbox']['refresh'])) {
-    $strings = $langcodes = array();
+    $strings = $langcodes = [];
     if (isset($context['results']['stats'])) {
       // Get list of unique string identifiers and language codes updated.
       $langcodes = array_unique(array_values($context['results']['languages']));
@@ -311,7 +311,7 @@ function locale_translate_batch_refresh(&$context) {
       $context['message'] = t('Updating translations for JavaScript and default configuration.');
       $context['sandbox']['refresh']['strings'] = array_unique($strings);
       $context['sandbox']['refresh']['languages'] = $langcodes;
-      $context['sandbox']['refresh']['names'] = array();
+      $context['sandbox']['refresh']['names'] = [];
       $context['results']['stats']['config'] = 0;
       $context['sandbox']['refresh']['count'] = count($strings);
 
@@ -324,12 +324,12 @@ function locale_translate_batch_refresh(&$context) {
   }
   elseif ($name = array_shift($context['sandbox']['refresh']['names'])) {
     // Refresh all languages for one object at a time.
-    $count = Locale::config()->updateConfigTranslations(array($name), $context['sandbox']['refresh']['languages']);
+    $count = Locale::config()->updateConfigTranslations([$name], $context['sandbox']['refresh']['languages']);
     $context['results']['stats']['config'] += $count;
     // Inherit finished information from the "parent" string lookup step so
     // visual display of status will make sense.
     $context['finished'] = $context['sandbox']['refresh']['names_finished'];
-    $context['message'] = t('Updating default configuration (@percent%).', array('@percent' => (int) ($context['finished'] * 100)));
+    $context['message'] = t('Updating default configuration (@percent%).', ['@percent' => (int) ($context['finished'] * 100)]);
   }
   elseif (!empty($context['sandbox']['refresh']['strings'])) {
     // Not perfect but will give some indication of progress.
@@ -367,7 +367,7 @@ function locale_translate_batch_finished($success, array $results) {
     $additions = $updates = $deletes = $skips = $config = 0;
     if (isset($results['failed_files'])) {
       if (\Drupal::moduleHandler()->moduleExists('dblog') && \Drupal::currentUser()->hasPermission('access site reports')) {
-        $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be imported. <a href=":url">See the log</a> for details.', '@count translation files could not be imported. <a href=":url">See the log</a> for details.', array(':url' => \Drupal::url('dblog.overview')));
+        $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be imported. <a href=":url">See the log</a> for details.', '@count translation files could not be imported. <a href=":url">See the log</a> for details.', [':url' => \Drupal::url('dblog.overview')]);
       }
       else {
         $message = \Drupal::translation()->formatPlural(count($results['failed_files']), 'One translation file could not be imported. See the log for details.', '@count translation files could not be imported. See the log for details.');
@@ -375,7 +375,7 @@ function locale_translate_batch_finished($success, array $results) {
       drupal_set_message($message, 'error');
     }
     if (isset($results['files'])) {
-      $skipped_files = array();
+      $skipped_files = [];
       // If there are no results and/or no stats (eg. coping with an empty .po
       // file), simply do nothing.
       if ($results && isset($results['stats'])) {
@@ -392,19 +392,19 @@ function locale_translate_batch_finished($success, array $results) {
       drupal_set_message(\Drupal::translation()->formatPlural(count($results['files']),
         'One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
         '@count translation files imported. %number translations were added, %update translations were updated and %delete translations were removed.',
-        array('%number' => $additions, '%update' => $updates, '%delete' => $deletes)
+        ['%number' => $additions, '%update' => $updates, '%delete' => $deletes]
       ));
-      $logger->notice('Translations imported: %number added, %update updated, %delete removed.', array('%number' => $additions, '%update' => $updates, '%delete' => $deletes));
+      $logger->notice('Translations imported: %number added, %update updated, %delete removed.', ['%number' => $additions, '%update' => $updates, '%delete' => $deletes]);
 
       if ($skips) {
         if (\Drupal::moduleHandler()->moduleExists('dblog') && \Drupal::currentUser()->hasPermission('access site reports')) {
-          $message = \Drupal::translation()->formatPlural($skips, 'One translation string was skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', '@count translation strings were skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', array(':url' => \Drupal::url('dblog.overview')));
+          $message = \Drupal::translation()->formatPlural($skips, 'One translation string was skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', '@count translation strings were skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', [':url' => \Drupal::url('dblog.overview')]);
         }
         else {
           $message = \Drupal::translation()->formatPlural($skips, 'One translation string was skipped because of disallowed or malformed HTML. See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.');
         }
         drupal_set_message($message, 'warning');
-        $logger->warning('@count disallowed HTML string(s) in files: @files.', array('@count' => $skips, '@files' => implode(',', $skipped_files)));
+        $logger->warning('@count disallowed HTML string(s) in files: @files.', ['@count' => $skips, '@files' => implode(',', $skipped_files)]);
       }
     }
   }
@@ -448,13 +448,13 @@ function locale_translate_file_create($filepath) {
  * @return object
  *   Modified file object.
  */
-function locale_translate_file_attach_properties($file, array $options = array()) {
+function locale_translate_file_attach_properties($file, array $options = []) {
   // If $file is a file entity, convert it to a stdClass.
   if ($file instanceof FileInterface) {
-    $file = (object) array(
+    $file = (object) [
       'filename' => $file->getFilename(),
       'uri' => $file->getFileUri(),
-    );
+    ];
   }
 
   // Extract project, version and language code from the file name. Supported:
@@ -499,7 +499,7 @@ function locale_translate_file_attach_properties($file, array $options = array()
  *   TRUE if files are removed successfully. FALSE if one or more files could
  *   not be deleted.
  */
-function locale_translate_delete_translation_files(array $projects = array(), array $langcodes = array()) {
+function locale_translate_delete_translation_files(array $projects = [], array $langcodes = []) {
   $fail = FALSE;
   locale_translation_file_history_delete($projects, $langcodes);
 
@@ -531,7 +531,7 @@ function locale_translate_delete_translation_files(array $projects = array(), ar
  * @return array
  *   The batch definition.
  */
-function locale_config_batch_update_components(array $options, array $langcodes = array(), array $components = array()) {
+function locale_config_batch_update_components(array $options, array $langcodes = [], array $components = []) {
   $langcodes = $langcodes ? $langcodes : array_keys(\Drupal::languageManager()->getLanguages());
   if ($langcodes && $names = Locale::config()->getComponentNames($components)) {
     return locale_config_batch_build($names, $langcodes, $options);
@@ -555,11 +555,11 @@ function locale_config_batch_update_components(array $options, array $langcodes
  *
  * @see locale_config_batch_refresh_name()
  */
-function locale_config_batch_build(array $names, array $langcodes, array $options = array()) {
-  $options += array('finish_feedback' => TRUE);
+function locale_config_batch_build(array $names, array $langcodes, array $options = []) {
+  $options += ['finish_feedback' => TRUE];
   $i = 0;
-  $batch_names = array();
-  $operations = array();
+  $batch_names = [];
+  $operations = [];
   foreach ($names as $name) {
     $batch_names[] = $name;
     $i++;
@@ -568,20 +568,20 @@ function locale_config_batch_build(array $names, array $langcodes, array $option
     // request. We batch a small number of configuration object upgrades
     // together to improve the overall performance of the process.
     if ($i % 20 == 0) {
-      $operations[] = array('locale_config_batch_refresh_name', array($batch_names, $langcodes));
-      $batch_names = array();
+      $operations[] = ['locale_config_batch_refresh_name', [$batch_names, $langcodes]];
+      $batch_names = [];
     }
   }
   if (!empty($batch_names)) {
-    $operations[] = array('locale_config_batch_refresh_name', array($batch_names, $langcodes));
+    $operations[] = ['locale_config_batch_refresh_name', [$batch_names, $langcodes]];
   }
-  $batch = array(
+  $batch = [
     'operations'    => $operations,
     'title'         => t('Updating configuration translations'),
     'init_message'  => t('Starting configuration update'),
     'error_message' => t('Error updating configuration translations'),
     'file'          => drupal_get_path('module', 'locale') . '/locale.bulk.inc',
-  );
+  ];
   if (!empty($options['finish_feedback'])) {
     $batch['completed'] = 'locale_config_batch_finished';
   }
@@ -597,7 +597,7 @@ function locale_config_batch_build(array $names, array $langcodes, array $option
  *   An array of names of configuration objects to update.
  * @param array $langcodes
  *   (optional) Array of language codes to update. Defaults to all languages.
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   Contains a list of files imported.
  *
  * @see locale_config_batch_build()
@@ -630,8 +630,8 @@ function locale_config_batch_finished($success, array $results) {
   if ($success) {
     $configuration = isset($results['stats']['config']) ? $results['stats']['config'] : 0;
     if ($configuration) {
-      drupal_set_message(t('The configuration was successfully updated. There are %number configuration objects updated.', array('%number' => $configuration)));
-      \Drupal::logger('locale')->notice('The configuration was successfully updated. %number configuration objects updated.', array('%number' => $configuration));
+      drupal_set_message(t('The configuration was successfully updated. There are %number configuration objects updated.', ['%number' => $configuration]));
+      \Drupal::logger('locale')->notice('The configuration was successfully updated. %number configuration objects updated.', ['%number' => $configuration]);
     }
     else {
       drupal_set_message(t('No configuration objects have been updated.'));
diff --git a/web/core/modules/locale/locale.compare.inc b/web/core/modules/locale/locale.compare.inc
index e24490c30..3821284bd 100644
--- a/web/core/modules/locale/locale.compare.inc
+++ b/web/core/modules/locale/locale.compare.inc
@@ -66,7 +66,7 @@ function locale_translation_build_projects() {
     }
 
     // For every project store information.
-    $data += array(
+    $data += [
       'name' => $name,
       'version' => isset($data['info']['version']) ? $data['info']['version'] : '',
       'core' => isset($data['info']['core']) ? $data['info']['core'] : \Drupal::CORE_COMPATIBILITY,
@@ -74,7 +74,7 @@ function locale_translation_build_projects() {
       // gettext file. Use the default if not.
       'server_pattern' => isset($data['info']['interface translation server pattern']) && $data['info']['interface translation server pattern'] ? $data['info']['interface translation server pattern'] : $default_server['pattern'],
       'status' => !empty($data['project_status']) ? 1 : 0,
-    );
+    ];
 
     $project = (object) $data;
     $projects[$name] = $project;
@@ -95,14 +95,14 @@ function locale_translation_build_projects() {
  *   Array of project data including .info.yml file data.
  */
 function locale_translation_project_list() {
-  $projects = &drupal_static(__FUNCTION__, array());
+  $projects = &drupal_static(__FUNCTION__, []);
   if (empty($projects)) {
-    $projects = array();
+    $projects = [];
 
-    $additional_whitelist = array(
+    $additional_whitelist = [
       'interface translation project',
       'interface translation server pattern',
-    );
+    ];
     $module_data = _locale_translation_prepare_project_list(system_rebuild_module_data(), 'module');
     $theme_data = _locale_translation_prepare_project_list(\Drupal::service('theme_handler')->rebuildThemeData(), 'theme');
     $project_info = new ProjectInfo();
@@ -163,9 +163,9 @@ function locale_translation_default_translation_server() {
   // fallback.
   $pattern  = $pattern ? $pattern : LOCALE_TRANSLATION_DEFAULT_SERVER_PATTERN;
 
-  return array(
+  return [
     'pattern' => $pattern,
-  );
+  ];
 }
 
 /**
@@ -181,7 +181,7 @@ function locale_translation_default_translation_server() {
  *
  * @todo Return batch or NULL.
  */
-function locale_translation_check_projects($projects = array(), $langcodes = array()) {
+function locale_translation_check_projects($projects = [], $langcodes = []) {
   if (locale_translation_use_remote_source()) {
     // Retrieve the status of both remote and local translation sources by
     // using a batch process.
@@ -207,7 +207,7 @@ function locale_translation_check_projects($projects = array(), $langcodes = arr
  * @param string $langcodes
  *   Array of language codes. Defaults to all translatable languages.
  */
-function locale_translation_check_projects_batch($projects = array(), $langcodes = array()) {
+function locale_translation_check_projects_batch($projects = [], $langcodes = []) {
   // Build and set the batch process.
   $batch = locale_translation_batch_status_build($projects, $langcodes);
   batch_set($batch);
@@ -231,21 +231,21 @@ function locale_translation_check_projects_batch($projects = array(), $langcodes
  * @return array
  *   Batch definition array.
  */
-function locale_translation_batch_status_build($projects = array(), $langcodes = array()) {
+function locale_translation_batch_status_build($projects = [], $langcodes = []) {
   $projects = $projects ? $projects : array_keys(locale_translation_get_projects());
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
   $options = _locale_translation_default_update_options();
 
   $operations = _locale_translation_batch_status_operations($projects, $langcodes, $options);
 
-  $batch = array(
+  $batch = [
     'operations' => $operations,
     'title' => t('Checking translations'),
     'progress_message' => '',
     'finished' => 'locale_translation_batch_status_finished',
     'error_message' => t('Error checking translation updates.'),
     'file' => drupal_get_path('module', 'locale') . '/locale.batch.inc',
-  );
+  ];
   return $batch;
 }
 
@@ -263,13 +263,13 @@ function locale_translation_batch_status_build($projects = array(), $langcodes =
  * @return array
  *   Array of batch operations.
  */
-function _locale_translation_batch_status_operations($projects, $langcodes, $options = array()) {
-  $operations = array();
+function _locale_translation_batch_status_operations($projects, $langcodes, $options = []) {
+  $operations = [];
 
   foreach ($projects as $project) {
     foreach ($langcodes as $langcode) {
       // Check status of local and remote translation sources.
-      $operations[] = array('locale_translation_batch_status_check', array($project, $langcode, $options));
+      $operations[] = ['locale_translation_batch_status_check', [$project, $langcode, $options]];
     }
   }
 
@@ -295,7 +295,7 @@ function _locale_translation_batch_status_operations($projects, $langcodes, $opt
  * @param array $langcodes
  *   Array of language codes. Defaults to all translatable languages.
  */
-function locale_translation_check_projects_local($projects = array(), $langcodes = array()) {
+function locale_translation_check_projects_local($projects = [], $langcodes = []) {
   $projects = locale_translation_get_projects($projects);
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
 
diff --git a/web/core/modules/locale/locale.fetch.inc b/web/core/modules/locale/locale.fetch.inc
index 32796a2bf..1de693447 100644
--- a/web/core/modules/locale/locale.fetch.inc
+++ b/web/core/modules/locale/locale.fetch.inc
@@ -26,7 +26,7 @@ require_once __DIR__ . '/locale.translation.inc';
  * @return array
  *   Batch definition array.
  */
-function locale_translation_batch_update_build($projects = array(), $langcodes = array(), $options = array()) {
+function locale_translation_batch_update_build($projects = [], $langcodes = [], $options = []) {
   module_load_include('compare.inc', 'locale');
   $projects = $projects ? $projects : array_keys(locale_translation_get_projects());
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
@@ -38,14 +38,14 @@ function locale_translation_batch_update_build($projects = array(), $langcodes =
   // Download and import translations.
   $operations = array_merge($operations, _locale_translation_fetch_operations($projects, $langcodes, $options));
 
-  $batch = array(
+  $batch = [
     'operations' => $operations,
     'title' => t('Updating translations'),
     'progress_message' => '',
     'error_message' => t('Error importing translation files'),
     'finished' => 'locale_translation_batch_fetch_finished',
     'file' => drupal_get_path('module', 'locale') . '/locale.batch.inc',
-  );
+  ];
   return $batch;
 }
 
@@ -63,18 +63,18 @@ function locale_translation_batch_update_build($projects = array(), $langcodes =
  * @return array
  *   Batch definition array.
  */
-function locale_translation_batch_fetch_build($projects = array(), $langcodes = array(), $options = array()) {
+function locale_translation_batch_fetch_build($projects = [], $langcodes = [], $options = []) {
   $projects = $projects ? $projects : array_keys(locale_translation_get_projects());
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
 
-  $batch = array(
+  $batch = [
     'operations' => _locale_translation_fetch_operations($projects, $langcodes, $options),
     'title' => t('Updating translations.'),
     'progress_message' => '',
     'error_message' => t('Error importing translation files'),
     'finished' => 'locale_translation_batch_fetch_finished',
     'file' => drupal_get_path('module', 'locale') . '/locale.batch.inc',
-  );
+  ];
   return $batch;
 }
 
@@ -93,14 +93,14 @@ function locale_translation_batch_fetch_build($projects = array(), $langcodes =
  *   Array of batch operations.
  */
 function _locale_translation_fetch_operations($projects, $langcodes, $options) {
-  $operations = array();
+  $operations = [];
 
   foreach ($projects as $project) {
     foreach ($langcodes as $langcode) {
       if (locale_translation_use_remote_source()) {
-        $operations[] = array('locale_translation_batch_fetch_download', array($project, $langcode));
+        $operations[] = ['locale_translation_batch_fetch_download', [$project, $langcode]];
       }
-      $operations[] = array('locale_translation_batch_fetch_import', array($project, $langcode, $options));
+      $operations[] = ['locale_translation_batch_fetch_import', [$project, $langcode, $options]];
     }
   }
 
diff --git a/web/core/modules/locale/locale.install b/web/core/modules/locale/locale.install
index 075510441..225e952a7 100644
--- a/web/core/modules/locale/locale.install
+++ b/web/core/modules/locale/locale.install
@@ -29,7 +29,7 @@ function locale_uninstall() {
   $locale_js_directory = 'public://' . $config->get('javascript.directory');
 
   if (is_dir($locale_js_directory)) {
-    $locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: array();
+    $locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: [];
     foreach ($locale_javascripts as $langcode => $file_suffix) {
       if (!empty($file_suffix)) {
         file_unmanaged_delete($locale_js_directory . '/' . $langcode . '_' . $file_suffix . '.js');
@@ -51,183 +51,183 @@ function locale_uninstall() {
  * Implements hook_schema().
  */
 function locale_schema() {
-  $schema['locales_source'] = array(
+  $schema['locales_source'] = [
     'description' => 'List of English source strings.',
-    'fields' => array(
-      'lid' => array(
+    'fields' => [
+      'lid' => [
         'type' => 'serial',
         'not null' => TRUE,
         'description' => 'Unique identifier of this string.',
-      ),
-      'source' => array(
+      ],
+      'source' => [
         'type' => 'text',
         'mysql_type' => 'blob',
         'not null' => TRUE,
         'description' => 'The original string in English.',
-      ),
-      'context' => array(
+      ],
+      'context' => [
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
         'description' => 'The context this string applies to.',
-      ),
-      'version' => array(
+      ],
+      'version' => [
         'type' => 'varchar_ascii',
         'length' => 20,
         'not null' => TRUE,
         'default' => 'none',
         'description' => 'Version of Drupal where the string was last used (for locales optimization).',
-      ),
-    ),
-    'primary key' => array('lid'),
-    'indexes' => array(
-      'source_context' => array(array('source', 30), 'context'),
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['lid'],
+    'indexes' => [
+      'source_context' => [['source', 30], 'context'],
+    ],
+  ];
 
-  $schema['locales_target'] = array(
+  $schema['locales_target'] = [
     'description' => 'Stores translated versions of strings.',
-    'fields' => array(
-      'lid' => array(
+    'fields' => [
+      'lid' => [
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
         'description' => 'Source string ID. References {locales_source}.lid.',
-      ),
-      'translation' => array(
+      ],
+      'translation' => [
         'type' => 'text',
         'mysql_type' => 'blob',
         'not null' => TRUE,
         'description' => 'Translation string value in this language.',
-      ),
-      'language' => array(
+      ],
+      'language' => [
         'type' => 'varchar_ascii',
         'length' => 12,
         'not null' => TRUE,
         'default' => '',
         'description' => 'Language code. References {language}.langcode.',
-      ),
-      'customized' => array(
+      ],
+      'customized' => [
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0, // LOCALE_NOT_CUSTOMIZED
         'description' => 'Boolean indicating whether the translation is custom to this site.',
-      ),
-    ),
-    'primary key' => array('language', 'lid'),
-    'foreign keys' => array(
-      'locales_source' => array(
+      ],
+    ],
+    'primary key' => ['language', 'lid'],
+    'foreign keys' => [
+      'locales_source' => [
         'table' => 'locales_source',
-        'columns' => array('lid' => 'lid'),
-      ),
-    ),
-    'indexes' => array(
-      'lid' => array('lid'),
-    ),
-  );
+        'columns' => ['lid' => 'lid'],
+      ],
+    ],
+    'indexes' => [
+      'lid' => ['lid'],
+    ],
+  ];
 
-  $schema['locales_location'] = array(
+  $schema['locales_location'] = [
     'description' => 'Location information for source strings.',
-    'fields' => array(
-      'lid' => array(
+    'fields' => [
+      'lid' => [
         'type' => 'serial',
         'not null' => TRUE,
         'description' => 'Unique identifier of this location.',
-      ),
-      'sid' => array(
+      ],
+      'sid' => [
         'type' => 'int',
         'not null' => TRUE,
         'description' => 'Unique identifier of this string.',
-      ),
-      'type' => array(
+      ],
+      'type' => [
         'type' => 'varchar_ascii',
         'length' => 50,
         'not null' => TRUE,
         'default' => '',
         'description' => 'The location type (file, config, path, etc).',
-      ),
-      'name' => array(
+      ],
+      'name' => [
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
         'description' => 'Type dependent location information (file name, path, etc).',
-      ),
-      'version' => array(
+      ],
+      'version' => [
         'type' => 'varchar_ascii',
         'length' => 20,
         'not null' => TRUE,
         'default' => 'none',
         'description' => 'Version of Drupal where the location was found.',
-      ),
-    ),
-    'primary key' => array('lid'),
-    'foreign keys' => array(
-      'locales_source' => array(
+      ],
+    ],
+    'primary key' => ['lid'],
+    'foreign keys' => [
+      'locales_source' => [
         'table' => 'locales_source',
-        'columns' => array('sid' => 'lid'),
-      ),
-    ),
-    'indexes' => array(
-      'string_id' => array('sid'),
-      'string_type' => array('sid', 'type'),
-    ),
-  );
+        'columns' => ['sid' => 'lid'],
+      ],
+    ],
+    'indexes' => [
+      'string_id' => ['sid'],
+      'string_type' => ['sid', 'type'],
+    ],
+  ];
 
-  $schema['locale_file'] = array(
+  $schema['locale_file'] = [
     'description' => 'File import status information for interface translation files.',
-    'fields' => array(
-      'project' => array(
+    'fields' => [
+      'project' => [
         'type' => 'varchar_ascii',
         'length' => '255',
         'not null' => TRUE,
         'default' => '',
         'description' => 'A unique short name to identify the project the file belongs to.',
-      ),
-      'langcode' => array(
+      ],
+      'langcode' => [
         'type' => 'varchar_ascii',
         'length' => '12',
         'not null' => TRUE,
         'default' => '',
         'description' => 'Language code of this translation. References {language}.langcode.',
-      ),
-      'filename' => array(
+      ],
+      'filename' => [
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
         'description' => 'Filename of the imported file.',
-      ),
-      'version' => array(
+      ],
+      'version' => [
         'type' => 'varchar',
         'length' => '128',
         'not null' => TRUE,
         'default' => '',
         'description' => 'Version tag of the imported file.',
-      ),
-      'uri' => array(
+      ],
+      'uri' => [
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
         'description' => 'URI of the remote file, the resulting local file or the locally imported file.',
-      ),
-      'timestamp' => array(
+      ],
+      'timestamp' => [
         'type' => 'int',
         'not null' => FALSE,
         'default' => 0,
         'description' => 'Unix timestamp of the imported file.',
-      ),
-      'last_checked' => array(
+      ],
+      'last_checked' => [
         'type' => 'int',
         'not null' => FALSE,
         'default' => 0,
         'description' => 'Unix timestamp of the last time this translation was confirmed to be the most recent release available.',
-      ),
-    ),
-    'primary key' => array('project', 'langcode'),
-  );
+      ],
+    ],
+    'primary key' => ['project', 'langcode'],
+  ];
   return $schema;
 }
 
@@ -235,10 +235,10 @@ function locale_schema() {
  * Implements hook_requirements().
  */
 function locale_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
   if ($phase == 'runtime') {
-    $available_updates = array();
-    $untranslated = array();
+    $available_updates = [];
+    $untranslated = [];
     $languages = locale_translatable_language_list();
 
     if ($languages) {
@@ -258,39 +258,48 @@ function locale_requirements($phase) {
 
         if ($available_updates || $untranslated) {
           if ($available_updates) {
-            $requirements['locale_translation'] = array(
+            $requirements['locale_translation'] = [
               'title' => 'Translation update status',
               'value' => \Drupal::l(t('Updates available'), new Url('locale.translate_status')),
               'severity' => REQUIREMENT_WARNING,
-              'description' => t('Updates available for: @languages. See the <a href=":updates">Available translation updates</a> page for more information.', array('@languages' => implode(', ', $available_updates), ':updates' => \Drupal::url('locale.translate_status'))),
-            );
+              'description' => t('Updates available for: @languages. See the <a href=":updates">Available translation updates</a> page for more information.', ['@languages' => implode(', ', $available_updates), ':updates' => \Drupal::url('locale.translate_status')]),
+            ];
           }
           else {
-            $requirements['locale_translation'] = array(
+            $requirements['locale_translation'] = [
               'title' => 'Translation update status',
               'value' => t('Missing translations'),
               'severity' => REQUIREMENT_INFO,
-              'description' => t('Missing translations for: @languages. See the <a href=":updates">Available translation updates</a> page for more information.', array('@languages' => implode(', ', $untranslated), ':updates' => \Drupal::url('locale.translate_status'))),
-            );
+              'description' => t('Missing translations for: @languages. See the <a href=":updates">Available translation updates</a> page for more information.', ['@languages' => implode(', ', $untranslated), ':updates' => \Drupal::url('locale.translate_status')]),
+            ];
           }
         }
         else {
-          $requirements['locale_translation'] = array(
+          $requirements['locale_translation'] = [
             'title' => 'Translation update status',
             'value' => t('Up to date'),
             'severity' => REQUIREMENT_OK,
-          );
+          ];
         }
       }
       else {
-        $requirements['locale_translation'] = array(
+        $requirements['locale_translation'] = [
           'title' => 'Translation update status',
           'value' => \Drupal::l(t('Can not determine status'), new Url('locale.translate_status')),
           'severity' => REQUIREMENT_WARNING,
-          'description' => t('No translation status is available. See the <a href=":updates">Available translation updates</a> page for more information.', array(':updates' => \Drupal::url('locale.translate_status'))),
-        );
+          'description' => t('No translation status is available. See the <a href=":updates">Available translation updates</a> page for more information.', [':updates' => \Drupal::url('locale.translate_status')]),
+        ];
       }
     }
   }
   return $requirements;
 }
+
+/**
+ * Delete translation status data in state.
+ */
+function locale_update_8300() {
+  // Delete the old translation status data, it will be rebuilt and stored in
+  // the new key value collection.
+  \Drupal::state()->delete('locale.translation_status');
+}
diff --git a/web/core/modules/locale/locale.module b/web/core/modules/locale/locale.module
index aecad6c45..b1298e4b6 100644
--- a/web/core/modules/locale/locale.module
+++ b/web/core/modules/locale/locale.module
@@ -146,30 +146,30 @@ function locale_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.locale':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Interface Translation module allows you to translate interface text (<em>strings</em>) into different languages, and to switch between them for the display of interface text. It uses the functionality provided by the <a href=":language">Language module</a>. For more information, see the <a href=":doc-url">online documentation for the Interface Translation module</a>.', array(':doc-url' => 'https://www.drupal.org/documentation/modules/locale/', ':language' => \Drupal::url('help.page', array('name' => 'language')))) . '</p>';
+      $output .= '<p>' . t('The Interface Translation module allows you to translate interface text (<em>strings</em>) into different languages, and to switch between them for the display of interface text. It uses the functionality provided by the <a href=":language">Language module</a>. For more information, see the <a href=":doc-url">online documentation for the Interface Translation module</a>.', [':doc-url' => 'https://www.drupal.org/documentation/modules/locale/', ':language' => \Drupal::url('help.page', ['name' => 'language'])]) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Importing translation files') . '</dt>';
-      $output .= '<dd>' . t('Translation files with translated interface text are imported automatically when languages are added on the <a href=":languages">Languages</a> page, or when modules or themes are enabled. On the <a href=":locale-settings">Interface translation settings</a> page, the <em>Translation source</em> can be restricted to local files only, or to include the <a href=":server">Drupal translation server</a>. Although modules and themes may not be fully translated in all languages, new translations become available frequently. You can specify whether and how often to check for translation file updates and whether to overwrite existing translations on the <a href=":locale-settings">Interface translation settings</a> page. You can also manually import a translation file on the <a href=":import">Interface translation import</a> page.', array(':import' => \Drupal::url('locale.translate_import'), ':locale-settings' => \Drupal::url('locale.settings'), ':languages' => \Drupal::url('entity.configurable_language.collection'), ':server' => 'https://localize.drupal.org')) . '</dd>';
+      $output .= '<dd>' . t('Translation files with translated interface text are imported automatically when languages are added on the <a href=":languages">Languages</a> page, or when modules or themes are enabled. On the <a href=":locale-settings">Interface translation settings</a> page, the <em>Translation source</em> can be restricted to local files only, or to include the <a href=":server">Drupal translation server</a>. Although modules and themes may not be fully translated in all languages, new translations become available frequently. You can specify whether and how often to check for translation file updates and whether to overwrite existing translations on the <a href=":locale-settings">Interface translation settings</a> page. You can also manually import a translation file on the <a href=":import">Interface translation import</a> page.', [':import' => \Drupal::url('locale.translate_import'), ':locale-settings' => \Drupal::url('locale.settings'), ':languages' => \Drupal::url('entity.configurable_language.collection'), ':server' => 'https://localize.drupal.org']) . '</dd>';
       $output .= '<dt>' . t('Checking the translation status') . '</dt>';
-      $output .= '<dd>' . t('You can check how much of the interface on your site is translated into which language on the <a href=":languages">Languages</a> page. On the <a href=":translation-updates">Available translation updates</a> page, you can check whether interface translation updates are available on the <a href=":server">Drupal translation server</a>.', array(':languages' => \Drupal::url('entity.configurable_language.collection'), ':translation-updates' => \Drupal::url('locale.translate_status'), ':server' => 'https://localize.drupal.org')) . '<dd>';
+      $output .= '<dd>' . t('You can check how much of the interface on your site is translated into which language on the <a href=":languages">Languages</a> page. On the <a href=":translation-updates">Available translation updates</a> page, you can check whether interface translation updates are available on the <a href=":server">Drupal translation server</a>.', [':languages' => \Drupal::url('entity.configurable_language.collection'), ':translation-updates' => \Drupal::url('locale.translate_status'), ':server' => 'https://localize.drupal.org']) . '<dd>';
       $output .= '<dt>' . t('Translating individual strings') . '</dt>';
-      $output .= '<dd>' . t('You can translate individual strings directly on the <a href=":translate">User interface translation</a> page, or download the currently-used translation file for a specific language on the <a href=":export">Interface translation export</a> page. Once you have edited the translation file, you can then import it again on the <a href=":import">Interface translation import</a> page.', array(':translate' => \Drupal::url('locale.translate_page'), ':export' => \Drupal::url('locale.translate_export'), ':import' => \Drupal::url('locale.translate_import'))) . '</dd>';
+      $output .= '<dd>' . t('You can translate individual strings directly on the <a href=":translate">User interface translation</a> page, or download the currently-used translation file for a specific language on the <a href=":export">Interface translation export</a> page. Once you have edited the translation file, you can then import it again on the <a href=":import">Interface translation import</a> page.', [':translate' => \Drupal::url('locale.translate_page'), ':export' => \Drupal::url('locale.translate_export'), ':import' => \Drupal::url('locale.translate_import')]) . '</dd>';
       $output .= '<dt>' . t('Overriding default English strings') . '</dt>';
-      $output .= '<dd>' . t('If translation is enabled for English, you can <em>override</em> the default English interface text strings in your site with other English text strings on the <a href=":translate">User interface translation</a> page. Translation is off by default for English, but you can turn it on by visiting the <em>Edit language</em> page for <em>English</em> from the <a href=":languages">Languages</a> page.', array(':translate' => \Drupal::url('locale.translate_page'), ':languages' => \Drupal::url('entity.configurable_language.collection'))) . '</dd>';
+      $output .= '<dd>' . t('If translation is enabled for English, you can <em>override</em> the default English interface text strings in your site with other English text strings on the <a href=":translate">User interface translation</a> page. Translation is off by default for English, but you can turn it on by visiting the <em>Edit language</em> page for <em>English</em> from the <a href=":languages">Languages</a> page.', [':translate' => \Drupal::url('locale.translate_page'), ':languages' => \Drupal::url('entity.configurable_language.collection')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
     case 'entity.configurable_language.collection':
-      return '<p>' . t('Interface translations are automatically imported when a language is added, or when new modules or themes are enabled. The report <a href=":update">Available translation updates</a> shows the status. Interface text can be customized in the <a href=":translate">user interface translation</a> page.', array(':update' => \Drupal::url('locale.translate_status'), ':translate' => \Drupal::url('locale.translate_page'))) . '</p>';
+      return '<p>' . t('Interface translations are automatically imported when a language is added, or when new modules or themes are enabled. The report <a href=":update">Available translation updates</a> shows the status. Interface text can be customized in the <a href=":translate">user interface translation</a> page.', [':update' => \Drupal::url('locale.translate_status'), ':translate' => \Drupal::url('locale.translate_page')]) . '</p>';
 
     case 'locale.translate_page':
-      $output = '<p>' . t('This page allows a translator to search for specific translated and untranslated strings, and is used when creating or editing translations. (Note: Because translation tasks involve many strings, it may be more convenient to <a title="User interface translation export" href=":export">export</a> strings for offline editing in a desktop Gettext translation editor.) Searches may be limited to strings in a specific language.', array(':export' => \Drupal::url('locale.translate_export'))) . '</p>';
+      $output = '<p>' . t('This page allows a translator to search for specific translated and untranslated strings, and is used when creating or editing translations. (Note: Because translation tasks involve many strings, it may be more convenient to <a title="User interface translation export" href=":export">export</a> strings for offline editing in a desktop Gettext translation editor.) Searches may be limited to strings in a specific language.', [':export' => \Drupal::url('locale.translate_export')]) . '</p>';
       return $output;
 
     case 'locale.translate_import':
-      $output = '<p>' . t('Translation files are automatically downloaded and imported when <a title="Languages" href=":language">languages</a> are added, or when modules or themes are enabled.', array(':language' => \Drupal::url('entity.configurable_language.collection'))) . '</p>';
-      $output .= '<p>' . t('This page allows translators to manually import translated strings contained in a Gettext Portable Object (.po) file. Manual import may be used for customized translations or for the translation of custom modules and themes. To customize translations you can download a translation file from the <a href=":url">Drupal translation server</a> or <a title="User interface translation export" href=":export">export</a> translations from the site, customize the translations using a Gettext translation editor, and import the result using this page.', array(':url' => 'https://localize.drupal.org', ':export' => \Drupal::url('locale.translate_export'))) . '</p>';
+      $output = '<p>' . t('Translation files are automatically downloaded and imported when <a title="Languages" href=":language">languages</a> are added, or when modules or themes are enabled.', [':language' => \Drupal::url('entity.configurable_language.collection')]) . '</p>';
+      $output .= '<p>' . t('This page allows translators to manually import translated strings contained in a Gettext Portable Object (.po) file. Manual import may be used for customized translations or for the translation of custom modules and themes. To customize translations you can download a translation file from the <a href=":url">Drupal translation server</a> or <a title="User interface translation export" href=":export">export</a> translations from the site, customize the translations using a Gettext translation editor, and import the result using this page.', [':url' => 'https://localize.drupal.org', ':export' => \Drupal::url('locale.translate_export')]) . '</p>';
       $output .= '<p>' . t('Note that importing large .po files may take several minutes.') . '</p>';
       return $output;
 
@@ -182,16 +182,16 @@ function locale_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function locale_theme() {
-  return array(
-    'locale_translation_last_check' => array(
-      'variables' => array('last' => NULL),
+  return [
+    'locale_translation_last_check' => [
+      'variables' => ['last' => NULL],
       'file' => 'locale.pages.inc',
-    ),
-    'locale_translation_update_info' => array(
-      'variables' => array('updates' => array(), 'not_found' => array()),
+    ],
+    'locale_translation_update_info' => [
+      'variables' => ['updates' => [], 'not_found' => []],
       'file' => 'locale.pages.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -223,11 +223,11 @@ function locale_configurable_language_update(ConfigurableLanguageInterface $lang
  */
 function locale_configurable_language_delete(ConfigurableLanguageInterface $language) {
   // Remove translations.
-  \Drupal::service('locale.storage')->deleteTranslations(array('language' => $language->id()));
+  \Drupal::service('locale.storage')->deleteTranslations(['language' => $language->id()]);
 
   // Remove interface translation files.
   module_load_include('inc', 'locale', 'locale.bulk');
-  locale_translate_delete_translation_files(array(), array($language->id()));
+  locale_translate_delete_translation_files([], [$language->id()]);
 
   // Remove translated configuration objects.
   Locale::config()->deleteLanguageTranslations($language->id());
@@ -237,7 +237,7 @@ function locale_configurable_language_delete(ConfigurableLanguageInterface $lang
   \Drupal::cache('render')->deleteAll();
 
   // Clear locale translation caches.
-  locale_translation_status_delete_languages(array($language->id()));
+  locale_translation_status_delete_languages([$language->id()]);
   \Drupal::cache()->delete('locale:' . $language->id());
 }
 
@@ -277,7 +277,7 @@ function locale_get_plural($count, $langcode = NULL) {
 
   // Used to store precomputed plural indexes corresponding to numbers
   // individually for each language.
-  $plural_indexes = &drupal_static(__FUNCTION__ . ':plurals', array());
+  $plural_indexes = &drupal_static(__FUNCTION__ . ':plurals', []);
 
   $langcode = $langcode ? $langcode : $language_interface->getId();
 
@@ -323,7 +323,7 @@ function locale_modules_installed($modules) {
  * Implements hook_module_preuninstall().
  */
 function locale_module_preuninstall($module) {
-  $components['module'] = array($module);
+  $components['module'] = [$module];
   locale_system_remove($components);
 }
 
@@ -399,7 +399,7 @@ function locale_system_set_config_langcodes() {
  *   translations for, indexed by type.
  */
 function locale_system_update(array $components) {
-  $components += array('module' => array(), 'theme' => array());
+  $components += ['module' => [], 'theme' => []];
   $list = array_merge($components['module'], $components['theme']);
 
   // Skip running the translation imports if in the installer,
@@ -446,7 +446,7 @@ function locale_system_update(array $components) {
  *   translations for, indexed by type.
  */
 function locale_system_remove($components) {
-  $components += array('module' => array(), 'theme' => array());
+  $components += ['module' => [], 'theme' => []];
   $list = array_merge($components['module'], $components['theme']);
   if ($language_list = locale_translatable_language_list()) {
     module_load_include('compare.inc', 'locale');
@@ -460,7 +460,7 @@ function locale_system_remove($components) {
       locale_translation_file_history_delete($list);
 
       // Remove translation files.
-      locale_translate_delete_translation_files($list, array());
+      locale_translate_delete_translation_files($list, []);
 
       // Remove translatable projects.
       // Follow-up issue https://www.drupal.org/node/1842362 to replace the
@@ -486,7 +486,7 @@ function locale_cache_flush() {
  */
 function locale_js_alter(&$javascript, AttachedAssetsInterface $assets) {
   // @todo Remove this in https://www.drupal.org/node/2421323.
-  $files = array();
+  $files = [];
   foreach ($javascript as $item) {
     if (isset($item['type']) && $item['type'] == 'file') {
       // Ignore the JS translation placeholder file.
@@ -529,11 +529,11 @@ function locale_js_alter(&$javascript, AttachedAssetsInterface $assets) {
  *   The filepath to the translation file or NULL if no translation is
  *   applicable.
  */
-function locale_js_translate(array $files = array()) {
+function locale_js_translate(array $files = []) {
   $language_interface = \Drupal::languageManager()->getCurrentLanguage();
 
   $dir = 'public://' . \Drupal::config('locale.settings')->get('javascript.directory');
-  $parsed = \Drupal::state()->get('system.javascript_parsed') ?: array();
+  $parsed = \Drupal::state()->get('system.javascript_parsed') ?: [];
   $new_files = FALSE;
 
   foreach ($files as $filepath) {
@@ -571,7 +571,7 @@ function locale_js_translate(array $files = array()) {
   }
 
   // Add the translation JavaScript file to the page.
-  $locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: array();
+  $locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: [];
   $translation_file = NULL;
   if (!empty($files) && !empty($locale_javascripts[$language_interface->getId()])) {
     // Add the translation JavaScript file to the page.
@@ -624,7 +624,7 @@ function locale_form_language_admin_overview_form_alter(&$form, FormStateInterfa
   $languages = $form['languages']['#languages'];
 
   $total_strings = \Drupal::service('locale.storage')->countStrings();
-  $stats = array_fill_keys(array_keys($languages), array());
+  $stats = array_fill_keys(array_keys($languages), []);
 
   // If we have source strings, count translations and calculate progress.
   if (!empty($total_strings)) {
@@ -640,26 +640,26 @@ function locale_form_language_admin_overview_form_alter(&$form, FormStateInterfa
   array_splice($form['languages']['#header'], -1, 0, ['translation-interface' => t('Interface translation')]);
 
   foreach ($languages as $langcode => $language) {
-    $stats[$langcode] += array(
+    $stats[$langcode] += [
       'translated' => 0,
       'ratio' => 0,
-    );
+    ];
     if (!$language->isLocked() && locale_is_translatable($langcode)) {
-      $form['languages'][$langcode]['locale_statistics'] = array(
+      $form['languages'][$langcode]['locale_statistics'] = [
         '#markup' => \Drupal::l(
-          t('@translated/@total (@ratio%)', array(
+          t('@translated/@total (@ratio%)', [
             '@translated' => $stats[$langcode]['translated'],
             '@total' => $total_strings,
             '@ratio' => $stats[$langcode]['ratio'],
-          )),
-          new Url('locale.translate_page', array(), array('query' => array('langcode' => $langcode)))
+          ]),
+          new Url('locale.translate_page', [], ['query' => ['langcode' => $langcode]])
         ),
-      );
+      ];
     }
     else {
-      $form['languages'][$langcode]['locale_statistics'] = array(
+      $form['languages'][$langcode]['locale_statistics'] = [
         '#markup' => t('not applicable'),
-      );
+      ];
     }
     // #type = link doesn't work with #weight on table.
     // reset and set it back after locale_statistics to get it at the right end.
@@ -695,7 +695,7 @@ function locale_form_language_admin_add_form_alter_submit($form, FormStateInterf
 
   if (\Drupal::config('locale.settings')->get('translation.import_enabled')) {
     // Download and import translations for the newly added language.
-    $batch = locale_translation_batch_update_build(array(), array($langcode), $options);
+    $batch = locale_translation_batch_update_build([], [$langcode], $options);
     batch_set($batch);
   }
 
@@ -704,7 +704,7 @@ function locale_form_language_admin_add_form_alter_submit($form, FormStateInterf
   // because then we extract English sources from shipped configuration.
   if (\Drupal::config('locale.settings')->get('translation.import_enabled') || $langcode == 'en') {
     \Drupal::moduleHandler()->loadInclude('locale', 'bulk.inc');
-    if ($batch = locale_config_batch_update_components($options, array($langcode))) {
+    if ($batch = locale_config_batch_update_components($options, [$langcode])) {
       batch_set($batch);
     }
   }
@@ -715,11 +715,11 @@ function locale_form_language_admin_add_form_alter_submit($form, FormStateInterf
  */
 function locale_form_language_admin_edit_form_alter(&$form, FormStateInterface $form_state) {
   if ($form['langcode']['#type'] == 'value' && $form['langcode']['#value'] == 'en') {
-    $form['locale_translate_english'] = array(
+    $form['locale_translate_english'] = [
       '#title' => t('Enable interface translation to English'),
       '#type' => 'checkbox',
       '#default_value' => \Drupal::configFactory()->getEditable('locale.settings')->get('translate_english'),
-    );
+    ];
     $form['actions']['submit']['#submit'][] = 'locale_form_language_admin_edit_form_alter_submit';
   }
 }
@@ -750,16 +750,16 @@ function locale_is_translatable($langcode) {
  * Add interface translation directory setting to directories configuration.
  */
 function locale_form_system_file_system_settings_alter(&$form, FormStateInterface $form_state) {
-  $form['translation_path'] = array(
+  $form['translation_path'] = [
     '#type' => 'textfield',
     '#title' => t('Interface translations directory'),
     '#default_value' => \Drupal::configFactory()->getEditable('locale.settings')->get('translation.path'),
     '#maxlength' => 255,
     '#description' => t('A local file system path where interface translation files will be stored.'),
     '#required' => TRUE,
-    '#after_build' => array('system_check_directory'),
+    '#after_build' => ['system_check_directory'],
     '#weight' => 10,
-  );
+  ];
   if ($form['file_default_scheme']) {
     $form['file_default_scheme']['#weight'] = 20;
   }
@@ -814,7 +814,7 @@ function locale_preprocess_node(&$variables) {
  *   Array of translation file objects.
  */
 function locale_translation_get_file_history() {
-  $history = &drupal_static(__FUNCTION__, array());
+  $history = &drupal_static(__FUNCTION__, []);
 
   if (empty($history)) {
     // Get file history from the database.
@@ -838,15 +838,15 @@ function locale_translation_get_file_history() {
  */
 function locale_translation_update_file_history($file) {
   $status = db_merge('locale_file')
-    ->key(array(
+    ->key([
       'project' => $file->project,
       'langcode' => $file->langcode,
-    ))
-    ->fields(array(
+    ])
+    ->fields([
       'version' => $file->version,
       'timestamp' => $file->timestamp,
       'last_checked' => $file->last_checked,
-    ))
+    ])
     ->execute();
   // The file history has changed, flush the static cache now.
   // @todo Can we make this more fine grained?
@@ -863,7 +863,7 @@ function locale_translation_update_file_history($file) {
  * @param array $langcodes
  *   Language code(s) to be deleted from the file history.
  */
-function locale_translation_file_history_delete($projects = array(), $langcodes = array()) {
+function locale_translation_file_history_delete($projects = [], $langcodes = []) {
   $query = db_delete('locale_file');
   if (!empty($projects)) {
     $query->condition('project', $projects, 'IN');
@@ -880,8 +880,8 @@ function locale_translation_file_history_delete($projects = array(), $langcodes
  * @todo What is 'translation status'?
  */
 function locale_translation_get_status($projects = NULL, $langcodes = NULL) {
-  $result = array();
-  $status = \Drupal::state()->get('locale.translation_status');
+  $result = [];
+  $status = \Drupal::keyValue('locale.translation_status')->getAll();
   module_load_include('translation.inc', 'locale');
   $projects = $projects ? $projects : array_keys(locale_translation_get_projects());
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
@@ -894,7 +894,7 @@ function locale_translation_get_status($projects = NULL, $langcodes = NULL) {
         $result[$project][$langcode] = $status[$project][$langcode];
       }
       else {
-        $sources = locale_translation_build_sources(array($project), array($langcode));
+        $sources = locale_translation_build_sources([$project], [$langcode]);
         if (isset($sources[$project][$langcode])) {
           $result[$project][$langcode] = $sources[$project][$langcode];
         }
@@ -913,19 +913,15 @@ function locale_translation_get_status($projects = NULL, $langcodes = NULL) {
  *   Language code.
  * @param string $type
  *   Type of data to be stored.
- * @param array $data
+ * @param object $data
  *   File object also containing timestamp when the translation is last updated.
  */
 function locale_translation_status_save($project, $langcode, $type, $data) {
-  // Follow-up issue: https://www.drupal.org/node/1842362.
-  // Split status storage per module/language and expire individually. This will
-  // improve performance for large sites.
-
   // Load the translation status or build it if not already available.
   module_load_include('translation.inc', 'locale');
   $status = locale_translation_get_status();
   if (empty($status)) {
-    $projects = locale_translation_get_projects(array($project));
+    $projects = locale_translation_get_projects([$project]);
     if (isset($projects[$project])) {
       $status[$project][$langcode] = locale_translation_source_build($projects[$project], $langcode);
     }
@@ -959,7 +955,7 @@ function locale_translation_status_save($project, $langcode, $type, $data) {
         break;
     }
 
-    \Drupal::state()->set('locale.translation_status', $status);
+    \Drupal::keyValue('locale.translation_status')->set($project, $status[$project]);
     \Drupal::state()->set('locale.translation_last_checked', REQUEST_TIME);
   }
 }
@@ -978,8 +974,8 @@ function locale_translation_status_delete_languages($langcodes) {
           unset($status[$project][$langcode]);
         }
       }
+      \Drupal::keyValue('locale.translation_status')->set($project, $status[$project]);
     }
-    \Drupal::state()->set('locale.translation_status', $status);
   }
 }
 
@@ -990,21 +986,14 @@ function locale_translation_status_delete_languages($langcodes) {
  *   Project name(s) to be deleted from the cache.
  */
 function locale_translation_status_delete_projects($projects) {
-  $status = locale_translation_get_status();
-
-  foreach ($status as $project => $languages) {
-    if (in_array($project, $projects)) {
-      unset($status[$project]);
-    }
-  }
-  \Drupal::state()->set('locale.translation_status', $status);
+  \Drupal::keyValue('locale.translation_status')->deleteMultiple($projects);
 }
 
 /**
  * Clear the translation status cache.
  */
 function locale_translation_clear_status() {
-  \Drupal::state()->delete('locale.translation_status');
+  \Drupal::keyValue('locale.translation_status')->deleteAll();
   \Drupal::state()->delete('locale.translation_last_checked');
 }
 
@@ -1060,7 +1049,7 @@ function locale_string_is_safe($string) {
   //   string. https://www.drupal.org/node/2372127
   $string = preg_replace('/\[[a-z0-9_-]+(:[a-z0-9_-]+)+\]/i', '', $string);
 
-  return Html::decodeEntities($string) == Html::decodeEntities(Xss::filter($string, array('a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'br', 'caption', 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dl', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'ins', 'kbd', 'li', 'ol', 'p', 'pre', 'q', 'samp', 'small', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'ul', 'var')));
+  return Html::decodeEntities($string) == Html::decodeEntities(Xss::filter($string, ['a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'br', 'caption', 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dl', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'ins', 'kbd', 'li', 'ol', 'p', 'pre', 'q', 'samp', 'small', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'ul', 'var']));
 }
 
 /**
@@ -1077,11 +1066,11 @@ function locale_string_is_safe($string) {
  *   (optional) List of string identifiers that have been updated / created.
  *   If not provided, all caches for the affected languages are cleared.
  */
-function _locale_refresh_translations($langcodes, $lids = array()) {
+function _locale_refresh_translations($langcodes, $lids = []) {
   if (!empty($langcodes)) {
     // Update javascript translations if any of the strings has a javascript
     // location, or if no string ids were provided, update all languages.
-    if (empty($lids) || ($strings = \Drupal::service('locale.storage')->getStrings(array('lid' => $lids, 'type' => 'javascript')))) {
+    if (empty($lids) || ($strings = \Drupal::service('locale.storage')->getStrings(['lid' => $lids, 'type' => 'javascript']))) {
       array_map('_locale_invalidate_js', $langcodes);
     }
   }
@@ -1186,22 +1175,22 @@ function _locale_parse_js_file($filepath) {
     [,\)]
     ~sx', $file, $plural_matches);
 
-  $matches = array();
+  $matches = [];
 
   // Add strings from Drupal.t().
   foreach ($t_matches[1] as $key => $string) {
-    $matches[] = array(
+    $matches[] = [
       'source'  => _locale_strip_quotes($string),
       'context' => _locale_strip_quotes($t_matches[2][$key]),
-    );
+    ];
   }
 
   // Add string from Drupal.formatPlural().
   foreach ($plural_matches[1] as $key => $string) {
-    $matches[] = array(
+    $matches[] = [
       'source'  => _locale_strip_quotes($string) . LOCALE_PLURAL_DELIMITER . _locale_strip_quotes($plural_matches[2][$key]),
       'context' => _locale_strip_quotes($plural_matches[3][$key]),
-    );
+    ];
   }
 
   // Loop through all matches and process them.
@@ -1235,7 +1224,7 @@ function _locale_parse_js_file($filepath) {
  *   New content of the 'system.javascript_parsed' variable.
  */
 function _locale_invalidate_js($langcode = NULL) {
-  $parsed = \Drupal::state()->get('system.javascript_parsed') ?: array();
+  $parsed = \Drupal::state()->get('system.javascript_parsed') ?: [];
 
   if (empty($langcode)) {
     // Invalidate all languages.
@@ -1275,12 +1264,12 @@ function _locale_rebuild_js($langcode = NULL) {
 
   // Construct the array for JavaScript translations.
   // Only add strings with a translation to the translations array.
-  $conditions = array(
+  $conditions = [
     'type' => 'javascript',
     'language' => $language->getId(),
     'translated' => TRUE,
-  );
-  $translations = array();
+  ];
+  $translations = [];
   foreach (\Drupal::service('locale.storage')->getTranslations($conditions) as $data) {
     $translations[$data->context][$data->source] = $data->translation;
   }
@@ -1289,9 +1278,9 @@ function _locale_rebuild_js($langcode = NULL) {
   $data_hash = NULL;
   $data = $status = '';
   if (!empty($translations)) {
-    $data = array(
+    $data = [
       'strings' => $translations,
-    );
+    ];
 
     $locale_plurals = \Drupal::service('locale.plural.formula')->getFormula($language->getId());
     if ($locale_plurals) {
@@ -1308,7 +1297,7 @@ function _locale_rebuild_js($langcode = NULL) {
 
   // Delete old file, if we have no translations anymore, or a different file to
   // be saved.
-  $locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: array();
+  $locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: [];
   $changed_hash = !isset($locale_javascripts[$language->getId()]) || ($locale_javascripts[$language->getId()] != $data_hash);
   if (!empty($locale_javascripts[$language->getId()]) && (!$data || $changed_hash)) {
     file_unmanaged_delete($dir . '/' . $language->getId() . '_' . $locale_javascripts[$language->getId()] . '.js');
@@ -1359,24 +1348,24 @@ function _locale_rebuild_js($langcode = NULL) {
   $logger = \Drupal::logger('locale');
   switch ($status) {
     case 'updated':
-      $logger->notice('Updated JavaScript translation file for the language %language.', array('%language' => $language->getName()));
+      $logger->notice('Updated JavaScript translation file for the language %language.', ['%language' => $language->getName()]);
       return TRUE;
 
     case 'rebuilt':
-      $logger->warning('JavaScript translation file %file.js was lost.', array('%file' => $locale_javascripts[$language->getId()]));
+      $logger->warning('JavaScript translation file %file.js was lost.', ['%file' => $locale_javascripts[$language->getId()]]);
       // Proceed to the 'created' case as the JavaScript translation file has
       // been created again.
 
     case 'created':
-      $logger->notice('Created JavaScript translation file for the language %language.', array('%language' => $language->getName()));
+      $logger->notice('Created JavaScript translation file for the language %language.', ['%language' => $language->getName()]);
       return TRUE;
 
     case 'deleted':
-      $logger->notice('Removed JavaScript translation file for the language %language because no translations currently exist for that language.', array('%language' => $language->getName()));
+      $logger->notice('Removed JavaScript translation file for the language %language because no translations currently exist for that language.', ['%language' => $language->getName()]);
       return TRUE;
 
     case 'error':
-      $logger->error('An error occurred during creation of the JavaScript translation file for the language %language.', array('%language' => $language->getName()));
+      $logger->error('An error occurred during creation of the JavaScript translation file for the language %language.', ['%language' => $language->getName()]);
       return FALSE;
 
     default:
@@ -1394,7 +1383,7 @@ function locale_translation_language_table($form_element) {
   // Remove checkboxes of languages without updates.
   if ($form_element['#not_found']) {
     foreach ($form_element['#not_found'] as $langcode) {
-      $form_element[$langcode] = array();
+      $form_element[$langcode] = [];
     }
   }
   return $form_element;
diff --git a/web/core/modules/locale/locale.pages.inc b/web/core/modules/locale/locale.pages.inc
index 9b2be235f..d8d7659bf 100644
--- a/web/core/modules/locale/locale.pages.inc
+++ b/web/core/modules/locale/locale.pages.inc
@@ -29,7 +29,7 @@ function locale_translation_manual_status() {
   if (batch_get()) {
     return batch_process('admin/reports/translations');
   }
-  return new RedirectResponse(\Drupal::url('locale.translate_status', array(), array('absolute' => TRUE)));
+  return new RedirectResponse(\Drupal::url('locale.translate_status', [], ['absolute' => TRUE]));
 }
 
 /**
@@ -72,5 +72,5 @@ function template_preprocess_locale_translation_last_check(array &$variables) {
   $last = $variables['last'];
   $variables['last_checked'] = ($last != NULL);
   $variables['time'] = \Drupal::service('date.formatter')->formatTimeDiffSince($last);
-  $variables['link'] = \Drupal::l(t('Check manually'), new Url('locale.check_translation', array(), array('query' => \Drupal::destination()->getAsArray())));
+  $variables['link'] = \Drupal::l(t('Check manually'), new Url('locale.check_translation', [], ['query' => \Drupal::destination()->getAsArray()]));
 }
diff --git a/web/core/modules/locale/locale.services.yml b/web/core/modules/locale/locale.services.yml
index e37cb48d1..b9f8fb807 100644
--- a/web/core/modules/locale/locale.services.yml
+++ b/web/core/modules/locale/locale.services.yml
@@ -1,7 +1,7 @@
 services:
   locale.default.config.storage:
     class: Drupal\locale\LocaleDefaultConfigStorage
-    arguments: ['@config.storage', '@language_manager']
+    arguments: ['@config.storage', '@language_manager', '%install_profile%']
     public: false
   locale.config_manager:
     class: Drupal\locale\LocaleConfigManager
diff --git a/web/core/modules/locale/locale.translation.inc b/web/core/modules/locale/locale.translation.inc
index 0383aafd2..571f7d224 100644
--- a/web/core/modules/locale/locale.translation.inc
+++ b/web/core/modules/locale/locale.translation.inc
@@ -52,8 +52,8 @@ const LOCALE_TRANSLATION_SOURCE_COMPARE_GT = 1;
  *
  * @see locale_translation_build_projects()
  */
-function locale_translation_get_projects(array $project_names = array()) {
-  $projects = &drupal_static(__FUNCTION__, array());
+function locale_translation_get_projects(array $project_names = []) {
+  $projects = &drupal_static(__FUNCTION__, []);
 
   if (empty($projects)) {
     // Get project data from the database.
@@ -100,7 +100,7 @@ function locale_translation_clear_cache_projects() {
  * @see locale_translation_source_build()
  */
 function locale_translation_load_sources(array $projects = NULL, array $langcodes = NULL) {
-  $sources = array();
+  $sources = [];
   $projects = $projects ? $projects : array_keys(locale_translation_get_projects());
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
 
@@ -129,8 +129,8 @@ function locale_translation_load_sources(array $projects = NULL, array $langcode
  *
  * @see locale_translation_source_build()
  */
-function locale_translation_build_sources(array $projects = array(), array $langcodes = array()) {
-  $sources = array();
+function locale_translation_build_sources(array $projects = [], array $langcodes = []) {
+  $sources = [];
   $projects = locale_translation_get_projects($projects);
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
 
@@ -173,7 +173,7 @@ function locale_translation_source_check_file($source) {
     $directory = $source_file->directory;
     $filename = '/' . preg_quote($source_file->filename) . '$/';
 
-    if ($files = file_scan_directory($directory, $filename, array('key' => 'name', 'recurse' => FALSE))) {
+    if ($files = file_scan_directory($directory, $filename, ['key' => 'name', 'recurse' => FALSE])) {
       $file = current($files);
       $source_file->uri = $file->uri;
       $source_file->timestamp = filemtime($file->uri);
@@ -244,35 +244,35 @@ function locale_translation_source_build($project, $langcode, $filename = NULL)
   // remote file. The local version of this file will only be checked if a
   // translations directory has been defined. If the server_pattern is a local
   // file path we will only check for a file in the local file system.
-  $files = array();
+  $files = [];
   if (_locale_translation_file_is_remote($source->server_pattern)) {
-    $files[LOCALE_TRANSLATION_REMOTE] = (object) array(
+    $files[LOCALE_TRANSLATION_REMOTE] = (object) [
       'project' => $project->name,
       'langcode' => $langcode,
       'version' => $project->version,
       'type' => LOCALE_TRANSLATION_REMOTE,
       'filename' => locale_translation_build_server_pattern($source, basename($source->server_pattern)),
       'uri' => locale_translation_build_server_pattern($source, $source->server_pattern),
-    );
-    $files[LOCALE_TRANSLATION_LOCAL] = (object) array(
+    ];
+    $files[LOCALE_TRANSLATION_LOCAL] = (object) [
       'project' => $project->name,
       'langcode' => $langcode,
       'version' => $project->version,
       'type' => LOCALE_TRANSLATION_LOCAL,
       'filename' => locale_translation_build_server_pattern($source, $filename),
       'directory' => 'translations://',
-    );
+    ];
     $files[LOCALE_TRANSLATION_LOCAL]->uri = $files[LOCALE_TRANSLATION_LOCAL]->directory . $files[LOCALE_TRANSLATION_LOCAL]->filename;
   }
   else {
-    $files[LOCALE_TRANSLATION_LOCAL] = (object) array(
+    $files[LOCALE_TRANSLATION_LOCAL] = (object) [
       'project' => $project->name,
       'langcode' => $langcode,
       'version' => $project->version,
       'type' => LOCALE_TRANSLATION_LOCAL,
       'filename' => locale_translation_build_server_pattern($source, basename($source->server_pattern)),
       'directory' => locale_translation_build_server_pattern($source, drupal_dirname($source->server_pattern)),
-    );
+    ];
     $files[LOCALE_TRANSLATION_LOCAL]->uri = $files[LOCALE_TRANSLATION_LOCAL]->directory . '/' . $files[LOCALE_TRANSLATION_LOCAL]->filename;
   }
   $source->files = $files;
@@ -310,12 +310,12 @@ function locale_translation_source_build($project, $langcode, $filename = NULL)
  *   String with replaced placeholders.
  */
 function locale_translation_build_server_pattern($project, $template) {
-  $variables = array(
+  $variables = [
     '%project' => $project->name,
     '%version' => $project->version,
     '%core' => $project->core,
     '%language' => isset($project->langcode) ? $project->langcode : '%language',
-  );
+  ];
   return strtr($template, $variables);
 }
 
@@ -323,7 +323,7 @@ function locale_translation_build_server_pattern($project, $template) {
  * Populate a queue with project to check for translation updates.
  */
 function locale_cron_fill_queue() {
-  $updates = array();
+  $updates = [];
   $config = \Drupal::config('locale.settings');
 
   // Determine which project+language should be updated.
@@ -335,7 +335,7 @@ function locale_cron_fill_queue() {
   $files = db_select('locale_file', 'f')
     ->condition('f.project', array_keys($projects), 'IN')
     ->condition('f.last_checked', $last, '<')
-    ->fields('f', array('project', 'langcode'))
+    ->fields('f', ['project', 'langcode'])
     ->execute()->fetchAll();
   foreach ($files as $file) {
     $updates[$file->project][] = $file->langcode;
@@ -343,7 +343,7 @@ function locale_cron_fill_queue() {
     // Update the last_checked timestamp of the project+language that will
     // be checked for updates.
     db_update('locale_file')
-      ->fields(array('last_checked' => REQUEST_TIME))
+      ->fields(['last_checked' => REQUEST_TIME])
       ->condition('project', $file->project)
       ->condition('langcode', $file->langcode)
       ->execute();
@@ -357,7 +357,7 @@ function locale_cron_fill_queue() {
     $queue = \Drupal::queue('locale_translation', TRUE);
 
     foreach ($updates as $project => $languages) {
-      $batch = locale_translation_batch_update_build(array($project), $languages, $options);
+      $batch = locale_translation_batch_update_build([$project], $languages, $options);
       foreach ($batch['operations'] as $item) {
         $queue->createItem($item);
       }
@@ -429,13 +429,13 @@ function _locale_translation_source_compare($source1, $source2) {
  */
 function _locale_translation_default_update_options() {
   $config = \Drupal::config('locale.settings');
-  return array(
+  return [
     'customized' => LOCALE_NOT_CUSTOMIZED,
-    'overwrite_options' => array(
+    'overwrite_options' => [
       'not_customized' => $config->get('translation.overwrite_not_customized'),
       'customized' => $config->get('translation.overwrite_customized'),
-    ),
+    ],
     'finish_feedback' => TRUE,
     'use_remote' => locale_translation_use_remote_source(),
-  );
+  ];
 }
diff --git a/web/core/modules/locale/src/Controller/LocaleController.php b/web/core/modules/locale/src/Controller/LocaleController.php
index 88cc6bd56..2617c61cf 100644
--- a/web/core/modules/locale/src/Controller/LocaleController.php
+++ b/web/core/modules/locale/src/Controller/LocaleController.php
@@ -42,10 +42,10 @@ class LocaleController extends ControllerBase {
    *   The render array for the string search screen.
    */
   public function translatePage() {
-    return array(
+    return [
       'filter' => $this->formBuilder()->getForm('Drupal\locale\Form\TranslateFilterForm'),
       'form' => $this->formBuilder()->getForm('Drupal\locale\Form\TranslateEditForm'),
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/locale/src/Form/ExportForm.php b/web/core/modules/locale/src/Form/ExportForm.php
index 30b6a1fe8..7c6f9321d 100644
--- a/web/core/modules/locale/src/Form/ExportForm.php
+++ b/web/core/modules/locale/src/Form/ExportForm.php
@@ -66,7 +66,7 @@ class ExportForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $languages = $this->languageManager->getLanguages();
-    $language_options = array();
+    $language_options = [];
     foreach ($languages as $langcode => $language) {
       if (locale_is_translatable($langcode)) {
         $language_options[$langcode] = $language->getName();
@@ -75,60 +75,59 @@ class ExportForm extends FormBase {
     $language_default = $this->languageManager->getDefaultLanguage();
 
     if (empty($language_options)) {
-      $form['langcode'] = array(
+      $form['langcode'] = [
         '#type' => 'value',
         '#value' => LanguageInterface::LANGCODE_SYSTEM,
-      );
-      $form['langcode_text'] = array(
+      ];
+      $form['langcode_text'] = [
         '#type' => 'item',
         '#title' => $this->t('Language'),
         '#markup' => $this->t('No language available. The export will only contain source strings.'),
-      );
+      ];
     }
     else {
-      $form['langcode'] = array(
+      $form['langcode'] = [
         '#type' => 'select',
         '#title' => $this->t('Language'),
         '#options' => $language_options,
         '#default_value' => $language_default->getId(),
         '#empty_option' => $this->t('Source text only, no translations'),
         '#empty_value' => LanguageInterface::LANGCODE_SYSTEM,
-      );
-      $form['content_options'] = array(
+      ];
+      $form['content_options'] = [
         '#type' => 'details',
         '#title' => $this->t('Export options'),
-        '#collapsed' => TRUE,
         '#tree' => TRUE,
-        '#states' => array(
-          'invisible' => array(
-            ':input[name="langcode"]' => array('value' => LanguageInterface::LANGCODE_SYSTEM),
-          ),
-        ),
-      );
-      $form['content_options']['not_customized'] = array(
+        '#states' => [
+          'invisible' => [
+            ':input[name="langcode"]' => ['value' => LanguageInterface::LANGCODE_SYSTEM],
+          ],
+        ],
+      ];
+      $form['content_options']['not_customized'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Include non-customized translations'),
         '#default_value' => TRUE,
-      );
-      $form['content_options']['customized'] = array(
+      ];
+      $form['content_options']['customized'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Include customized translations'),
         '#default_value' => TRUE,
-      );
-      $form['content_options']['not_translated'] = array(
+      ];
+      $form['content_options']['not_translated'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Include untranslated text'),
         '#default_value' => TRUE,
-      );
+      ];
     }
 
-    $form['actions'] = array(
+    $form['actions'] = [
       '#type' => 'actions',
-    );
-    $form['actions']['submit'] = array(
+    ];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Export'),
-    );
+    ];
     return $form;
   }
 
@@ -143,7 +142,7 @@ class ExportForm extends FormBase {
     else {
       $language = NULL;
     }
-    $content_options = $form_state->getValue('content_options', array());
+    $content_options = $form_state->getValue('content_options', []);
     $reader = new PoDatabaseReader();
     $language_name = '';
     if ($language != NULL) {
diff --git a/web/core/modules/locale/src/Form/ImportForm.php b/web/core/modules/locale/src/Form/ImportForm.php
index 0ea71809b..f2bd45b84 100644
--- a/web/core/modules/locale/src/Form/ImportForm.php
+++ b/web/core/modules/locale/src/Form/ImportForm.php
@@ -72,7 +72,7 @@ class ImportForm extends FormBase {
 
     // Initialize a language list to the ones available, including English if we
     // are to translate Drupal to English as well.
-    $existing_languages = array();
+    $existing_languages = [];
     foreach ($languages as $langcode => $language) {
       if (locale_is_translatable($langcode)) {
         $existing_languages[$langcode] = $language->getName();
@@ -88,65 +88,65 @@ class ImportForm extends FormBase {
     }
     else {
       $default = key($existing_languages);
-      $language_options = array(
+      $language_options = [
         (string) $this->t('Existing languages') => $existing_languages,
         (string) $this->t('Languages not yet added') => $this->languageManager->getStandardLanguageListWithoutConfigured(),
-      );
+      ];
     }
 
-    $validators = array(
-      'file_validate_extensions' => array('po'),
-      'file_validate_size' => array(file_upload_max_size()),
-    );
-    $form['file'] = array(
+    $validators = [
+      'file_validate_extensions' => ['po'],
+      'file_validate_size' => [file_upload_max_size()],
+    ];
+    $form['file'] = [
       '#type' => 'file',
       '#title' => $this->t('Translation file'),
-      '#description' => array(
+      '#description' => [
         '#theme' => 'file_upload_help',
         '#description' => $this->t('A Gettext Portable Object file.'),
         '#upload_validators' => $validators,
-      ),
+      ],
       '#size' => 50,
       '#upload_validators' => $validators,
-      '#attributes' => array('class' => array('file-import-input')),
-    );
-    $form['langcode'] = array(
+      '#attributes' => ['class' => ['file-import-input']],
+    ];
+    $form['langcode'] = [
       '#type' => 'select',
       '#title' => $this->t('Language'),
       '#options' => $language_options,
       '#default_value' => $default,
-      '#attributes' => array('class' => array('langcode-input')),
-    );
+      '#attributes' => ['class' => ['langcode-input']],
+    ];
 
-    $form['customized'] = array(
+    $form['customized'] = [
       '#title' => $this->t('Treat imported strings as custom translations'),
       '#type' => 'checkbox',
-    );
-    $form['overwrite_options'] = array(
+    ];
+    $form['overwrite_options'] = [
       '#type' => 'container',
       '#tree' => TRUE,
-    );
-    $form['overwrite_options']['not_customized'] = array(
+    ];
+    $form['overwrite_options']['not_customized'] = [
       '#title' => $this->t('Overwrite non-customized translations'),
       '#type' => 'checkbox',
-      '#states' => array(
-        'checked' => array(
-          ':input[name="customized"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
-    $form['overwrite_options']['customized'] = array(
+      '#states' => [
+        'checked' => [
+          ':input[name="customized"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
+    $form['overwrite_options']['customized'] = [
       '#title' => $this->t('Overwrite existing customized translations'),
       '#type' => 'checkbox',
-    );
+    ];
 
-    $form['actions'] = array(
+    $form['actions'] = [
       '#type' => 'actions',
-    );
-    $form['actions']['submit'] = array(
+    ];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Import'),
-    );
+    ];
     return $form;
   }
 
@@ -172,21 +172,21 @@ class ImportForm extends FormBase {
     if (empty($language)) {
       $language = ConfigurableLanguage::createFromLangcode($form_state->getValue('langcode'));
       $language->save();
-      drupal_set_message($this->t('The language %language has been created.', array('%language' => $this->t($language->label()))));
+      drupal_set_message($this->t('The language %language has been created.', ['%language' => $this->t($language->label())]));
     }
-    $options = array_merge(_locale_translation_default_update_options(), array(
+    $options = array_merge(_locale_translation_default_update_options(), [
       'langcode' => $form_state->getValue('langcode'),
       'overwrite_options' => $form_state->getValue('overwrite_options'),
       'customized' => $form_state->getValue('customized') ? LOCALE_CUSTOMIZED : LOCALE_NOT_CUSTOMIZED,
-    ));
+    ]);
     $this->moduleHandler->loadInclude('locale', 'bulk.inc');
     $file = locale_translate_file_attach_properties($this->file, $options);
-    $batch = locale_translate_batch_build(array($file->uri => $file), $options);
+    $batch = locale_translate_batch_build([$file->uri => $file], $options);
     batch_set($batch);
 
     // Create or update all configuration translations for this language.
     \Drupal::moduleHandler()->loadInclude('locale', 'bulk.inc');
-    if ($batch = locale_config_batch_update_components($options, array($form_state->getValue('langcode')))) {
+    if ($batch = locale_config_batch_update_components($options, [$form_state->getValue('langcode')])) {
       batch_set($batch);
     }
 
diff --git a/web/core/modules/locale/src/Form/LocaleSettingsForm.php b/web/core/modules/locale/src/Form/LocaleSettingsForm.php
index 93662244b..e722cfb2b 100644
--- a/web/core/modules/locale/src/Form/LocaleSettingsForm.php
+++ b/web/core/modules/locale/src/Form/LocaleSettingsForm.php
@@ -30,35 +30,35 @@ class LocaleSettingsForm extends ConfigFormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $config = $this->config('locale.settings');
 
-    $form['update_interval_days'] = array(
+    $form['update_interval_days'] = [
       '#type' => 'radios',
       '#title' => $this->t('Check for updates'),
       '#default_value' => $config->get('translation.update_interval_days'),
-      '#options' => array(
+      '#options' => [
         '0' => $this->t('Never (manually)'),
         '7' => $this->t('Weekly'),
         '30' => $this->t('Monthly'),
-      ),
-      '#description' => $this->t('Select how frequently you want to check for new interface translations for your currently installed modules and themes. <a href=":url">Check updates now</a>.', array(':url' => $this->url('locale.check_translation'))),
-    );
+      ],
+      '#description' => $this->t('Select how frequently you want to check for new interface translations for your currently installed modules and themes. <a href=":url">Check updates now</a>.', [':url' => $this->url('locale.check_translation')]),
+    ];
 
     if ($directory = $config->get('translation.path')) {
-      $description = $this->t('Translation files are stored locally in the  %path directory. You can change this directory on the <a href=":url">File system</a> configuration page.', array('%path' => $directory, ':url' => $this->url('system.file_system_settings')));
+      $description = $this->t('Translation files are stored locally in the  %path directory. You can change this directory on the <a href=":url">File system</a> configuration page.', ['%path' => $directory, ':url' => $this->url('system.file_system_settings')]);
     }
     else {
-      $description = $this->t('Translation files will not be stored locally. Change the Interface translation directory on the <a href=":url">File system configuration</a> page.', array(':url' => $this->url('system.file_system_settings')));
+      $description = $this->t('Translation files will not be stored locally. Change the Interface translation directory on the <a href=":url">File system configuration</a> page.', [':url' => $this->url('system.file_system_settings')]);
     }
     $form['#translation_directory'] = $directory;
-    $form['use_source'] = array(
+    $form['use_source'] = [
       '#type' => 'radios',
       '#title' => $this->t('Translation source'),
       '#default_value' => $config->get('translation.use_source'),
-      '#options' => array(
+      '#options' => [
         LOCALE_TRANSLATION_USE_SOURCE_REMOTE_AND_LOCAL => $this->t('Drupal translation server and local files'),
         LOCALE_TRANSLATION_USE_SOURCE_LOCAL => $this->t('Local files only'),
-      ),
+      ],
       '#description' => $this->t('The source of translation files for automatic interface translation.') . ' ' . $description,
-    );
+    ];
 
     if ($config->get('translation.overwrite_not_customized') == FALSE) {
       $default = LOCALE_TRANSLATION_OVERWRITE_NONE;
@@ -69,17 +69,17 @@ class LocaleSettingsForm extends ConfigFormBase {
     else {
       $default = LOCALE_TRANSLATION_OVERWRITE_NON_CUSTOMIZED;
     }
-    $form['overwrite'] = array(
+    $form['overwrite'] = [
       '#type' => 'radios',
       '#title' => $this->t('Import behavior'),
       '#default_value' => $default,
-      '#options' => array(
+      '#options' => [
         LOCALE_TRANSLATION_OVERWRITE_NONE => $this->t("Don't overwrite existing translations."),
         LOCALE_TRANSLATION_OVERWRITE_NON_CUSTOMIZED => $this->t('Only overwrite imported translations, customized translations are kept.'),
         LOCALE_TRANSLATION_OVERWRITE_ALL => $this->t('Overwrite existing translations.'),
-      ),
+      ],
       '#description' => $this->t('How to treat existing translations when automatically updating the interface translations.'),
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
@@ -91,7 +91,7 @@ class LocaleSettingsForm extends ConfigFormBase {
     parent::validateForm($form, $form_state);
 
     if (empty($form['#translation_directory']) && $form_state->getValue('use_source') == LOCALE_TRANSLATION_USE_SOURCE_LOCAL) {
-      $form_state->setErrorByName('use_source', $this->t('You have selected local translation source, but no <a href=":url">Interface translation directory</a> was configured.', array(':url' => $this->url('system.file_system_settings'))));
+      $form_state->setErrorByName('use_source', $this->t('You have selected local translation source, but no <a href=":url">Interface translation directory</a> was configured.', [':url' => $this->url('system.file_system_settings')]));
     }
   }
 
diff --git a/web/core/modules/locale/src/Form/TranslateEditForm.php b/web/core/modules/locale/src/Form/TranslateEditForm.php
index c559f8005..d629009cf 100644
--- a/web/core/modules/locale/src/Form/TranslateEditForm.php
+++ b/web/core/modules/locale/src/Form/TranslateEditForm.php
@@ -32,12 +32,12 @@ class TranslateEditForm extends TranslateFormBase {
 
     $form['#attached']['library'][] = 'locale/drupal.locale.admin';
 
-    $form['langcode'] = array(
+    $form['langcode'] = [
       '#type' => 'value',
       '#value' => $filter_values['langcode'],
-    );
+    ];
 
-    $form['strings'] = array(
+    $form['strings'] = [
       '#type' => 'table',
       '#tree' => TRUE,
       '#language' => $langname,
@@ -47,7 +47,7 @@ class TranslateEditForm extends TranslateFormBase {
       ],
       '#empty' => $this->t('No strings available.'),
       '#attributes' => ['class' => ['locale-translate-edit-table']],
-    );
+    ];
 
     if (isset($langcode)) {
       $strings = $this->translateFilterLoadStrings();
@@ -63,14 +63,14 @@ class TranslateEditForm extends TranslateFormBase {
         if (count($source_array) == 1) {
           // Add original string value and mark as non-plural.
           $plural = FALSE;
-          $form['strings'][$string->lid]['original'] = array(
+          $form['strings'][$string->lid]['original'] = [
             '#type' => 'item',
-            '#title' => $this->t('Source string (@language)', array('@language' => $this->t('Built-in English'))),
+            '#title' => $this->t('Source string (@language)', ['@language' => $this->t('Built-in English')]),
             '#title_display' => 'invisible',
             '#plain_text' => $source_array[0],
             '#preffix' => '<span lang="en">',
             '#suffix' => '</span>',
-          );
+          ];
         }
         else {
           // Add original string value and mark as plural.
@@ -79,7 +79,7 @@ class TranslateEditForm extends TranslateFormBase {
             '#type' => 'item',
             '#title' => $this->t('Singular form'),
             '#plain_text' => $source_array[0],
-            '#prefix' => '<span class="visually-hidden">' . $this->t('Source string (@language)', array('@language' => $this->t('Built-in English'))) . '</span><span lang="en">',
+            '#prefix' => '<span class="visually-hidden">' . $this->t('Source string (@language)', ['@language' => $this->t('Built-in English')]) . '</span><span lang="en">',
             '#suffix' => '</span>',
           ];
           $original_plural = [
@@ -108,27 +108,27 @@ class TranslateEditForm extends TranslateFormBase {
         // Approximate the number of rows to use in the default textarea.
         $rows = min(ceil(str_word_count($source_array[0]) / 12), 10);
         if (!$plural) {
-          $form['strings'][$string->lid]['translations'][0] = array(
+          $form['strings'][$string->lid]['translations'][0] = [
             '#type' => 'textarea',
-            '#title' => $this->t('Translated string (@language)', array('@language' => $langname)),
+            '#title' => $this->t('Translated string (@language)', ['@language' => $langname]),
             '#title_display' => 'invisible',
             '#rows' => $rows,
             '#default_value' => $translation_array[0],
-            '#attributes' => array('lang' => $langcode),
-          );
+            '#attributes' => ['lang' => $langcode],
+          ];
         }
         else {
           // Add a textarea for each plural variant.
           for ($i = 0; $i < $plurals; $i++) {
-            $form['strings'][$string->lid]['translations'][$i] = array(
+            $form['strings'][$string->lid]['translations'][$i] = [
               '#type' => 'textarea',
               // @todo Should use better labels https://www.drupal.org/node/2499639
               '#title' => ($i == 0 ? $this->t('Singular form') : $this->formatPlural($i, 'First plural form', '@count. plural form')),
               '#rows' => $rows,
               '#default_value' => isset($translation_array[$i]) ? $translation_array[$i] : '',
-              '#attributes' => array('lang' => $langcode),
-              '#prefix' => $i == 0 ? ('<span class="visually-hidden">' . $this->t('Translated string (@language)', array('@language' => $langname)) . '</span>') : '',
-            );
+              '#attributes' => ['lang' => $langcode],
+              '#prefix' => $i == 0 ? ('<span class="visually-hidden">' . $this->t('Translated string (@language)', ['@language' => $langname]) . '</span>') : '',
+            ];
           }
           if ($plurals == 2) {
             // Simplify interface text for the most common case.
@@ -137,11 +137,11 @@ class TranslateEditForm extends TranslateFormBase {
         }
       }
       if (count(Element::children($form['strings']))) {
-        $form['actions'] = array('#type' => 'actions');
-        $form['actions']['submit'] = array(
+        $form['actions'] = ['#type' => 'actions'];
+        $form['actions']['submit'] = [
           '#type' => 'submit',
           '#value' => $this->t('Save translations'),
-        );
+        ];
       }
     }
     $form['pager']['#type'] = 'pager';
@@ -156,9 +156,9 @@ class TranslateEditForm extends TranslateFormBase {
     foreach ($form_state->getValue('strings') as $lid => $translations) {
       foreach ($translations['translations'] as $key => $value) {
         if (!locale_string_is_safe($value)) {
-          $form_state->setErrorByName("strings][$lid][translations][$key", $this->t('The submitted string contains disallowed HTML: %string', array('%string' => $value)));
-          $form_state->setErrorByName("translations][$langcode][$key", $this->t('The submitted string contains disallowed HTML: %string', array('%string' => $value)));
-          $this->logger('locale')->warning('Attempted submission of a translation string with disallowed HTML: %string', array('%string' => $value));
+          $form_state->setErrorByName("strings][$lid][translations][$key", $this->t('The submitted string contains disallowed HTML: %string', ['%string' => $value]));
+          $form_state->setErrorByName("translations][$langcode][$key", $this->t('The submitted string contains disallowed HTML: %string', ['%string' => $value]));
+          $this->logger('locale')->warning('Attempted submission of a translation string with disallowed HTML: %string', ['%string' => $value]);
         }
       }
     }
@@ -169,12 +169,12 @@ class TranslateEditForm extends TranslateFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $langcode = $form_state->getValue('langcode');
-    $updated = array();
+    $updated = [];
 
     // Preload all translations for strings in the form.
     $lids = array_keys($form_state->getValue('strings'));
-    $existing_translation_objects = array();
-    foreach ($this->localeStorage->getTranslations(array('lid' => $lids, 'language' => $langcode, 'translated' => TRUE)) as $existing_translation_object) {
+    $existing_translation_objects = [];
+    foreach ($this->localeStorage->getTranslations(['lid' => $lids, 'language' => $langcode, 'translated' => TRUE]) as $existing_translation_object) {
       $existing_translation_objects[$existing_translation_object->lid] = $existing_translation_object;
     }
 
@@ -204,7 +204,7 @@ class TranslateEditForm extends TranslateFormBase {
 
       if ($is_changed) {
         // Only update or insert if we have a value to use.
-        $target = isset($existing_translation_objects[$lid]) ? $existing_translation_objects[$lid] : $this->localeStorage->createTranslation(array('lid' => $lid, 'language' => $langcode));
+        $target = isset($existing_translation_objects[$lid]) ? $existing_translation_objects[$lid] : $this->localeStorage->createTranslation(['lid' => $lid, 'language' => $langcode]);
         $target->setPlurals($new_translation['translations'])
           ->setCustomized()
           ->save();
@@ -224,15 +224,15 @@ class TranslateEditForm extends TranslateFormBase {
     if (isset($page)) {
       $form_state->setRedirect(
         'locale.translate_page',
-        array(),
-        array('page' => $page)
+        [],
+        ['page' => $page]
       );
     }
 
     if ($updated) {
       // Clear cache and force refresh of JavaScript translations.
-      _locale_refresh_translations(array($langcode), $updated);
-      _locale_refresh_configuration(array($langcode), $updated);
+      _locale_refresh_translations([$langcode], $updated);
+      _locale_refresh_configuration([$langcode], $updated);
     }
   }
 
diff --git a/web/core/modules/locale/src/Form/TranslateFilterForm.php b/web/core/modules/locale/src/Form/TranslateFilterForm.php
index b3975b81c..aeef26f8f 100644
--- a/web/core/modules/locale/src/Form/TranslateFilterForm.php
+++ b/web/core/modules/locale/src/Form/TranslateFilterForm.php
@@ -25,24 +25,24 @@ class TranslateFilterForm extends TranslateFormBase {
 
     $form['#attached']['library'][] = 'locale/drupal.locale.admin';
 
-    $form['filters'] = array(
+    $form['filters'] = [
       '#type' => 'details',
       '#title' => $this->t('Filter translatable strings'),
       '#open' => TRUE,
-    );
+    ];
     foreach ($filters as $key => $filter) {
       // Special case for 'string' filter.
       if ($key == 'string') {
-        $form['filters']['status']['string'] = array(
+        $form['filters']['status']['string'] = [
           '#type' => 'search',
           '#title' => $filter['title'],
           '#description' => $filter['description'],
           '#default_value' => $filter_values[$key],
-        );
+        ];
       }
       else {
         $empty_option = isset($filter['options'][$filter['default']]) ? $filter['options'][$filter['default']] : '- None -';
-        $form['filters']['status'][$key] = array(
+        $form['filters']['status'][$key] = [
           '#title' => $filter['title'],
           '#type' => 'select',
           '#empty_value' => $filter['default'],
@@ -50,27 +50,27 @@ class TranslateFilterForm extends TranslateFormBase {
           '#size' => 0,
           '#options' => $filter['options'],
           '#default_value' => $filter_values[$key],
-        );
+        ];
         if (isset($filter['states'])) {
           $form['filters']['status'][$key]['#states'] = $filter['states'];
         }
       }
     }
 
-    $form['filters']['actions'] = array(
+    $form['filters']['actions'] = [
       '#type' => 'actions',
-      '#attributes' => array('class' => array('container-inline')),
-    );
-    $form['filters']['actions']['submit'] = array(
+      '#attributes' => ['class' => ['container-inline']],
+    ];
+    $form['filters']['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Filter'),
-    );
+    ];
     if (!empty($_SESSION['locale_translate_filter'])) {
-      $form['filters']['actions']['reset'] = array(
+      $form['filters']['actions']['reset'] = [
         '#type' => 'submit',
         '#value' => $this->t('Reset'),
-        '#submit' => array('::resetForm'),
-      );
+        '#submit' => ['::resetForm'],
+      ];
     }
 
     return $form;
@@ -93,7 +93,7 @@ class TranslateFilterForm extends TranslateFormBase {
    * Provides a submit handler for the reset button.
    */
   public function resetForm(array &$form, FormStateInterface $form_state) {
-    $_SESSION['locale_translate_filter'] = array();
+    $_SESSION['locale_translate_filter'] = [];
     $form_state->setRedirect('locale.translate_page');
   }
 
diff --git a/web/core/modules/locale/src/Form/TranslateFormBase.php b/web/core/modules/locale/src/Form/TranslateFormBase.php
index ba5f7c316..9a7ad8bab 100644
--- a/web/core/modules/locale/src/Form/TranslateFormBase.php
+++ b/web/core/modules/locale/src/Form/TranslateFormBase.php
@@ -81,8 +81,8 @@ abstract class TranslateFormBase extends FormBase {
 
     // Language is sanitized to be one of the possible options in
     // translateFilterValues().
-    $conditions = array('language' => $filter_values['langcode']);
-    $options = array('pager limit' => 30, 'translated' => TRUE, 'untranslated' => TRUE);
+    $conditions = ['language' => $filter_values['langcode']];
+    $options = ['pager limit' => 30, 'translated' => TRUE, 'untranslated' => TRUE];
 
     // Add translation status conditions and options.
     switch ($filter_values['translation']) {
@@ -123,7 +123,7 @@ abstract class TranslateFormBase extends FormBase {
       return static::$filterValues;
     }
 
-    $filter_values = array();
+    $filter_values = [];
     $filters = $this->translateFilters();
     foreach ($filters as $key => $filter) {
       $filter_values[$key] = $filter['default'];
@@ -152,12 +152,12 @@ abstract class TranslateFormBase extends FormBase {
    * Lists locale translation filters that can be applied.
    */
   protected function translateFilters() {
-    $filters = array();
+    $filters = [];
 
     // Get all languages, except English.
     $this->languageManager->reset();
     $languages = $this->languageManager->getLanguages();
-    $language_options = array();
+    $language_options = [];
     foreach ($languages as $langcode => $language) {
       if (locale_is_translatable($langcode)) {
         $language_options[$langcode] = $language->getName();
@@ -171,42 +171,42 @@ abstract class TranslateFormBase extends FormBase {
       $default_langcode = array_shift($available_langcodes);
     }
 
-    $filters['string'] = array(
+    $filters['string'] = [
       'title' => $this->t('String contains'),
       'description' => $this->t('Leave blank to show all strings. The search is case sensitive.'),
       'default' => '',
-    );
+    ];
 
-    $filters['langcode'] = array(
+    $filters['langcode'] = [
       'title' => $this->t('Translation language'),
       'options' => $language_options,
       'default' => $default_langcode,
-    );
+    ];
 
-    $filters['translation'] = array(
+    $filters['translation'] = [
       'title' => $this->t('Search in'),
-      'options' => array(
+      'options' => [
         'all' => $this->t('Both translated and untranslated strings'),
         'translated' => $this->t('Only translated strings'),
         'untranslated' => $this->t('Only untranslated strings'),
-      ),
+      ],
       'default' => 'all',
-    );
+    ];
 
-    $filters['customized'] = array(
+    $filters['customized'] = [
       'title' => $this->t('Translation type'),
-      'options' => array(
+      'options' => [
         'all' => $this->t('All'),
         LOCALE_NOT_CUSTOMIZED => $this->t('Non-customized translation'),
         LOCALE_CUSTOMIZED => $this->t('Customized translation'),
-      ),
-      'states' => array(
-        'visible' => array(
-          ':input[name=translation]' => array('value' => 'translated'),
-        ),
-      ),
+      ],
+      'states' => [
+        'visible' => [
+          ':input[name=translation]' => ['value' => 'translated'],
+        ],
+      ],
       'default' => 'all',
-    );
+    ];
 
     return $filters;
   }
diff --git a/web/core/modules/locale/src/Form/TranslationStatusForm.php b/web/core/modules/locale/src/Form/TranslationStatusForm.php
index 31f8bb958..cbf4d4a55 100644
--- a/web/core/modules/locale/src/Form/TranslationStatusForm.php
+++ b/web/core/modules/locale/src/Form/TranslationStatusForm.php
@@ -65,10 +65,10 @@ class TranslationStatusForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $languages = locale_translatable_language_list();
     $status = locale_translation_get_status();
-    $options = array();
-    $languages_update = array();
-    $languages_not_found = array();
-    $projects_update = array();
+    $options = [];
+    $languages_update = [];
+    $languages_not_found = [];
+    $projects_update = [];
     // Prepare information about projects which have available translation
     // updates.
     if ($languages && $status) {
@@ -77,24 +77,24 @@ class TranslationStatusForm extends FormBase {
       // Build data options for the select table.
       foreach ($updates as $langcode => $update) {
         $title = $languages[$langcode]->getName();
-        $locale_translation_update_info = array('#theme' => 'locale_translation_update_info');
-        foreach (array('updates', 'not_found') as $update_status) {
+        $locale_translation_update_info = ['#theme' => 'locale_translation_update_info'];
+        foreach (['updates', 'not_found'] as $update_status) {
           if (isset($update[$update_status])) {
             $locale_translation_update_info['#' . $update_status] = $update[$update_status];
           }
         }
-        $options[$langcode] = array(
-          'title' => array(
-            'data' => array(
+        $options[$langcode] = [
+          'title' => [
+            'data' => [
               '#title' => $title,
               '#plain_text' => $title,
-            ),
-          ),
-          'status' => array(
-            'class' => array('description', 'priority-low'),
+            ],
+          ],
+          'status' => [
+            'class' => ['description', 'priority-low'],
             'data' => $locale_translation_update_info,
-          ),
-        );
+          ],
+        ];
         if (!empty($update['not_found'])) {
           $languages_not_found[$langcode] = $langcode;
         }
@@ -110,43 +110,43 @@ class TranslationStatusForm extends FormBase {
     }
 
     $last_checked = $this->state->get('locale.translation_last_checked');
-    $form['last_checked'] = array(
+    $form['last_checked'] = [
       '#theme' => 'locale_translation_last_check',
       '#last' => $last_checked,
-    );
+    ];
 
-    $header = array(
-      'title' => array(
+    $header = [
+      'title' => [
         'data' => $this->t('Language'),
-        'class' => array('title'),
-      ),
-      'status' => array(
+        'class' => ['title'],
+      ],
+      'status' => [
         'data' => $this->t('Status'),
-        'class' => array('status', 'priority-low'),
-      ),
-    );
+        'class' => ['status', 'priority-low'],
+      ],
+    ];
 
     if (!$languages) {
-      $empty = $this->t('No translatable languages available. <a href=":add_language">Add a language</a> first.', array(
+      $empty = $this->t('No translatable languages available. <a href=":add_language">Add a language</a> first.', [
         ':add_language' => $this->url('entity.configurable_language.collection'),
-      ));
+      ]);
     }
     elseif ($status) {
       $empty = $this->t('All translations up to date.');
     }
     else {
-      $empty = $this->t('No translation status available. <a href=":check">Check manually</a>.', array(
+      $empty = $this->t('No translation status available. <a href=":check">Check manually</a>.', [
         ':check' => $this->url('locale.check_translation'),
-      ));
+      ]);
     }
 
     // The projects which require an update. Used by the _submit callback.
-    $form['projects_update'] = array(
+    $form['projects_update'] = [
       '#type' => 'value',
       '#value' => $projects_update,
-    );
+    ];
 
-    $form['langcodes'] = array(
+    $form['langcodes'] = [
       '#type' => 'tableselect',
       '#header' => $header,
       '#options' => $options,
@@ -156,17 +156,17 @@ class TranslationStatusForm extends FormBase {
       '#multiple' => TRUE,
       '#required' => TRUE,
       '#not_found' => $languages_not_found,
-      '#after_build' => array('locale_translation_language_table'),
-    );
+      '#after_build' => ['locale_translation_language_table'],
+    ];
 
     $form['#attached']['library'][] = 'locale/drupal.locale.admin';
 
-    $form['actions'] = array('#type' => 'actions');
+    $form['actions'] = ['#type' => 'actions'];
     if ($languages_update) {
-      $form['actions']['submit'] = array(
+      $form['actions']['submit'] = [
         '#type' => 'submit',
         '#value' => $this->t('Update translations'),
-      );
+      ];
     }
 
     return $form;
@@ -183,7 +183,7 @@ class TranslationStatusForm extends FormBase {
    *   translation update status.
    */
   protected function prepareUpdateData(array $status) {
-    $updates = array();
+    $updates = [];
 
     // @todo Calling locale_translation_build_projects() is an expensive way to
     //   get a module name. In follow-up issue
@@ -196,22 +196,22 @@ class TranslationStatusForm extends FormBase {
       foreach ($project as $langcode => $project_info) {
         // No translation file found for this project-language combination.
         if (empty($project_info->type)) {
-          $updates[$langcode]['not_found'][] = array(
+          $updates[$langcode]['not_found'][] = [
             'name' => $project_info->name == 'drupal' ? $this->t('Drupal core') : $project_data[$project_info->name]->info['name'],
             'version' => $project_info->version,
             'info' => $this->createInfoString($project_info),
-          );
+          ];
         }
         // Translation update found for this project-language combination.
         elseif ($project_info->type == LOCALE_TRANSLATION_LOCAL || $project_info->type == LOCALE_TRANSLATION_REMOTE) {
           $local = isset($project_info->files[LOCALE_TRANSLATION_LOCAL]) ? $project_info->files[LOCALE_TRANSLATION_LOCAL] : NULL;
           $remote = isset($project_info->files[LOCALE_TRANSLATION_REMOTE]) ? $project_info->files[LOCALE_TRANSLATION_REMOTE] : NULL;
           $recent = _locale_translation_source_compare($local, $remote) == LOCALE_TRANSLATION_SOURCE_COMPARE_LT ? $remote : $local;
-          $updates[$langcode]['updates'][] = array(
+          $updates[$langcode]['updates'][] = [
             'name' => $project_info->name == 'drupal' ? $this->t('Drupal core') : $project_data[$project_info->name]->info['name'],
             'version' => $project_info->version,
             'timestamp' => $recent->timestamp,
-          );
+          ];
         }
       }
     }
@@ -238,13 +238,13 @@ class TranslationStatusForm extends FormBase {
     $local_path = isset($project_info->files['local']->uri) ? $project_info->files['local']->uri : FALSE;
 
     if (locale_translation_use_remote_source() && $remote_path && $local_path) {
-      return $this->t('File not found at %remote_path nor at %local_path', array(
+      return $this->t('File not found at %remote_path nor at %local_path', [
         '%remote_path' => $remote_path,
         '%local_path' => $local_path,
-      ));
+      ]);
     }
     elseif ($local_path) {
-      return $this->t('File not found at %local_path', array('%local_path' => $local_path));
+      return $this->t('File not found at %local_path', ['%local_path' => $local_path]);
     }
     return $this->t('Translation file location could not be determined.');
   }
@@ -279,7 +279,7 @@ class TranslationStatusForm extends FormBase {
     $last_checked = $this->state->get('locale.translation_last_checked');
     if ($last_checked < REQUEST_TIME - LOCALE_TRANSLATION_STATUS_TTL) {
       locale_translation_clear_status();
-      $batch = locale_translation_batch_update_build(array(), $langcodes, $options);
+      $batch = locale_translation_batch_update_build([], $langcodes, $options);
       batch_set($batch);
     }
     else {
diff --git a/web/core/modules/locale/src/Gettext.php b/web/core/modules/locale/src/Gettext.php
index 5573f43d6..44677aa28 100644
--- a/web/core/modules/locale/src/Gettext.php
+++ b/web/core/modules/locale/src/Gettext.php
@@ -41,12 +41,12 @@ class Gettext {
    */
   public static function fileToDatabase($file, $options) {
     // Add the default values to the options array.
-    $options += array(
-      'overwrite_options' => array(),
+    $options += [
+      'overwrite_options' => [],
       'customized' => LOCALE_NOT_CUSTOMIZED,
       'items' => -1,
       'seek' => 0,
-    );
+    ];
     // Instantiate and initialize the stream reader for this file.
     $reader = new PoStreamReader();
     $reader->setLangcode($file->langcode);
@@ -67,10 +67,10 @@ class Gettext {
     // Initialize the database writer.
     $writer = new PoDatabaseWriter();
     $writer->setLangcode($file->langcode);
-    $writer_options = array(
+    $writer_options = [
       'overwrite_options' => $options['overwrite_options'],
       'customized' => $options['customized'],
-    );
+    ];
     $writer->setOptions($writer_options);
     $writer->setHeader($header);
 
diff --git a/web/core/modules/locale/src/LocaleConfigManager.php b/web/core/modules/locale/src/LocaleConfigManager.php
index bc598e21d..e67f3bc4a 100644
--- a/web/core/modules/locale/src/LocaleConfigManager.php
+++ b/web/core/modules/locale/src/LocaleConfigManager.php
@@ -147,7 +147,7 @@ class LocaleConfigManager {
         return $this->getTranslatableData($typed_config);
       }
     }
-    return array();
+    return [];
   }
 
   /**
@@ -163,7 +163,7 @@ class LocaleConfigManager {
    *   TranslatableMarkup.
    */
   protected function getTranslatableData(TypedDataInterface $element) {
-    $translatable = array();
+    $translatable = [];
     if ($element instanceof TraversableTypedDataInterface) {
       foreach ($element as $key => $property) {
         $value = $this->getTranslatableData($property);
@@ -178,11 +178,11 @@ class LocaleConfigManager {
       $value = $element->getValue();
       $definition = $element->getDataDefinition();
       if (!empty($definition['translatable']) && $value !== '' && $value !== NULL) {
-        $options = array();
+        $options = [];
         if (isset($definition['translation context'])) {
           $options['context'] = $definition['translation context'];
         }
-        return new TranslatableMarkup($value, array(), $options);
+        return new TranslatableMarkup($value, [], $options);
       }
     }
     return $translatable;
@@ -215,7 +215,7 @@ class LocaleConfigManager {
    * @see self::getTranslatableData()
    */
   protected function processTranslatableData($name, array $active, array $translatable, $langcode) {
-    $translated = array();
+    $translated = [];
     foreach ($translatable as $key => $item) {
       if (!isset($active[$key])) {
         continue;
@@ -296,10 +296,10 @@ class LocaleConfigManager {
    * @return array
    *   Array of configuration object names.
    */
-  public function getComponentNames(array $components = array()) {
+  public function getComponentNames(array $components = []) {
     $components = array_filter($components);
     if ($components) {
-      $names = array();
+      $names = [];
       foreach ($components as $type => $list) {
         // InstallStorage::getComponentNames returns a list of folders keyed by
         // config name.
@@ -322,8 +322,8 @@ class LocaleConfigManager {
    *   Array of configuration object names.
    */
   public function getStringNames(array $lids) {
-    $names = array();
-    $locations = $this->localeStorage->getLocations(array('sid' => $lids, 'type' => 'configuration'));
+    $names = [];
+    $locations = $this->localeStorage->getLocations(['sid' => $lids, 'type' => 'configuration']);
     foreach ($locations as $location) {
       $names[$location->name] = $location->name;
     }
@@ -370,15 +370,15 @@ class LocaleConfigManager {
       // If translations for a language have not been loaded yet.
       if (!isset($this->translations[$name][$langcode])) {
         // Preload all translations for this configuration name and language.
-        $this->translations[$name][$langcode] = array();
-        foreach ($this->localeStorage->getTranslations(array('language' => $langcode, 'type' => 'configuration', 'name' => $name)) as $string) {
+        $this->translations[$name][$langcode] = [];
+        foreach ($this->localeStorage->getTranslations(['language' => $langcode, 'type' => 'configuration', 'name' => $name]) as $string) {
           $this->translations[$name][$langcode][$string->context][$string->source] = $string;
         }
       }
       if (!isset($this->translations[$name][$langcode][$context][$source])) {
         // There is no translation of the source string in this config location
         // to this language for this context.
-        if ($translation = $this->localeStorage->findTranslation(array('source' => $source, 'context' => $context, 'language' => $langcode))) {
+        if ($translation = $this->localeStorage->findTranslation(['source' => $source, 'context' => $context, 'language' => $langcode])) {
           // Look for a translation of the string. It might have one, but not
           // be saved in this configuration location yet.
           // If the string has a translation for this context to this language,
@@ -393,7 +393,7 @@ class LocaleConfigManager {
           // location so it can be translated, and the string is faster to look
           // for next time.
           $translation = $this->localeStorage
-            ->createString(array('source' => $source, 'context' => $context))
+            ->createString(['source' => $source, 'context' => $context])
             ->addLocation('configuration', $name)
             ->save();
         }
@@ -418,7 +418,7 @@ class LocaleConfigManager {
    * @return $this
    */
   public function reset() {
-    $this->translations = array();
+    $this->translations = [];
     return $this;
   }
 
@@ -442,7 +442,7 @@ class LocaleConfigManager {
       $this->translateString($name, $langcode, $source, $context);
       if ($string = $this->translations[$name][$langcode][$context][$source]) {
         if (!$string->isTranslation()) {
-          $conditions = array('lid' => $string->lid, 'language' => $langcode);
+          $conditions = ['lid' => $string->lid, 'language' => $langcode];
           $translation = $this->localeStorage->createTranslation($conditions);
           $this->translations[$name][$langcode][$context][$source] = $translation;
           return $translation;
@@ -564,7 +564,7 @@ class LocaleConfigManager {
    *   Total number of configuration override and active configuration objects
    *   updated (saved or removed).
    */
-  public function updateConfigTranslations(array $names, array $langcodes = array()) {
+  public function updateConfigTranslations(array $names, array $langcodes = []) {
     $langcodes = $langcodes ? $langcodes : array_keys($this->languageManager->getLanguages());
     $count = 0;
     foreach ($names as $name) {
@@ -589,7 +589,7 @@ class LocaleConfigManager {
           $data = $this->filterOverride($override->get(), $translatable);
           if (!empty($processed)) {
             // Merge in the Locale managed translations with existing data.
-            $data = NestedArray::mergeDeepArray(array($data, $processed), TRUE);
+            $data = NestedArray::mergeDeepArray([$data, $processed], TRUE);
           }
           if (empty($data) && !$override->isNew()) {
             // The configuration override contains Locale overrides that no
@@ -607,7 +607,7 @@ class LocaleConfigManager {
           // If the language code is the active storage language, we should
           // update. If it is English, we should only update if English is also
           // translatable.
-          $active = NestedArray::mergeDeepArray(array($active, $processed), TRUE);
+          $active = NestedArray::mergeDeepArray([$active, $processed], TRUE);
           $this->saveTranslationActive($name, $active);
           $count++;
         }
@@ -629,7 +629,7 @@ class LocaleConfigManager {
    *   also in $translatable.
    */
   protected function filterOverride(array $override_data, array $translatable) {
-    $filtered_data = array();
+    $filtered_data = [];
     foreach ($override_data as $key => $value) {
       if (isset($translatable[$key])) {
         // If the translatable default configuration has this key, look further
diff --git a/web/core/modules/locale/src/LocaleConfigSubscriber.php b/web/core/modules/locale/src/LocaleConfigSubscriber.php
index 3542a06c6..d06cb34de 100644
--- a/web/core/modules/locale/src/LocaleConfigSubscriber.php
+++ b/web/core/modules/locale/src/LocaleConfigSubscriber.php
@@ -114,7 +114,7 @@ class LocaleConfigSubscriber implements EventSubscriberInterface {
    *   override. This allows us to update locale keys for data not in the
    *   override but still in the active configuration.
    */
-  protected function updateLocaleStorage(StorableConfigBase $config, $langcode, array $reference_config = array()) {
+  protected function updateLocaleStorage(StorableConfigBase $config, $langcode, array $reference_config = []) {
     $name = $config->getName();
     if ($this->localeConfigManager->isSupported($name) && locale_is_translatable($langcode)) {
       $translatables = $this->localeConfigManager->getTranslatableDefaultConfig($name);
@@ -139,7 +139,7 @@ class LocaleConfigSubscriber implements EventSubscriberInterface {
    *   override. This allows us to update locale keys for data not in the
    *   override but still in the active configuration.
    */
-  protected function processTranslatableData($name, array $config, array $translatable, $langcode, array $reference_config = array()) {
+  protected function processTranslatableData($name, array $config, array $translatable, $langcode, array $reference_config = []) {
     foreach ($translatable as $key => $item) {
       if (!isset($config[$key])) {
         if (isset($reference_config[$key])) {
@@ -148,7 +148,7 @@ class LocaleConfigSubscriber implements EventSubscriberInterface {
         continue;
       }
       if (is_array($item)) {
-        $reference_config = isset($reference_config[$key]) ? $reference_config[$key] : array();
+        $reference_config = isset($reference_config[$key]) ? $reference_config[$key] : [];
         $this->processTranslatableData($name, $config[$key], $item, $langcode, $reference_config);
       }
       else {
diff --git a/web/core/modules/locale/src/LocaleDefaultConfigStorage.php b/web/core/modules/locale/src/LocaleDefaultConfigStorage.php
index 29697a107..fb4e35206 100644
--- a/web/core/modules/locale/src/LocaleDefaultConfigStorage.php
+++ b/web/core/modules/locale/src/LocaleDefaultConfigStorage.php
@@ -57,12 +57,12 @@ class LocaleDefaultConfigStorage {
    * @param \Drupal\language\ConfigurableLanguageManagerInterface $language_manager
    *   The language manager.
    */
-  public function __construct(StorageInterface $config_storage, ConfigurableLanguageManagerInterface $language_manager) {
+  public function __construct(StorageInterface $config_storage, ConfigurableLanguageManagerInterface $language_manager, $install_profile) {
     $this->configStorage = $config_storage;
     $this->languageManager = $language_manager;
 
-    $this->requiredInstallStorage = new ExtensionInstallStorage($this->configStorage);
-    $this->optionalInstallStorage = new ExtensionInstallStorage($this->configStorage, ExtensionInstallStorage::CONFIG_OPTIONAL_DIRECTORY);
+    $this->requiredInstallStorage = new ExtensionInstallStorage($this->configStorage, ExtensionInstallStorage::CONFIG_INSTALL_DIRECTORY, ExtensionInstallStorage::DEFAULT_COLLECTION, TRUE, $install_profile);
+    $this->optionalInstallStorage = new ExtensionInstallStorage($this->configStorage, ExtensionInstallStorage::CONFIG_OPTIONAL_DIRECTORY, ExtensionInstallStorage::DEFAULT_COLLECTION, TRUE, $install_profile);
   }
 
   /**
diff --git a/web/core/modules/locale/src/LocaleEvent.php b/web/core/modules/locale/src/LocaleEvent.php
index 2a2247749..6e919a642 100644
--- a/web/core/modules/locale/src/LocaleEvent.php
+++ b/web/core/modules/locale/src/LocaleEvent.php
@@ -31,7 +31,7 @@ class LocaleEvent extends Event {
    * @param array $lids
    *   (optional) List of string identifiers that have been updated / created.
    */
-  public function __construct(array $lang_codes, array $lids = array()) {
+  public function __construct(array $lang_codes, array $lids = []) {
     $this->langCodes = $lang_codes;
     $this->lids = $lids;
   }
diff --git a/web/core/modules/locale/src/LocaleLookup.php b/web/core/modules/locale/src/LocaleLookup.php
index 6bcb88c22..9290efc30 100644
--- a/web/core/modules/locale/src/LocaleLookup.php
+++ b/web/core/modules/locale/src/LocaleLookup.php
@@ -99,7 +99,7 @@ class LocaleLookup extends CacheCollector {
 
     $this->cache = $cache;
     $this->lock = $lock;
-    $this->tags = array('locale');
+    $this->tags = ['locale'];
     $this->requestStack = $request_stack;
   }
 
@@ -123,7 +123,7 @@ class LocaleLookup extends CacheCollector {
       // cache misses that need to be written into the cache. Prevent that by
       // resetting that list. All that happens in such a case are a few uncached
       // translation lookups.
-      $this->keysToPersist = array();
+      $this->keysToPersist = [];
     }
     return $this->cid;
   }
@@ -132,11 +132,11 @@ class LocaleLookup extends CacheCollector {
    * {@inheritdoc}
    */
   protected function resolveCacheMiss($offset) {
-    $translation = $this->stringStorage->findTranslation(array(
+    $translation = $this->stringStorage->findTranslation([
       'language' => $this->langcode,
       'source' => $offset,
       'context' => $this->context,
-    ));
+    ]);
 
     if ($translation) {
       $value = !empty($translation->translation) ? $translation->translation : TRUE;
@@ -144,25 +144,25 @@ class LocaleLookup extends CacheCollector {
     else {
       // We don't have the source string, update the {locales_source} table to
       // indicate the string is not translated.
-      $this->stringStorage->createString(array(
+      $this->stringStorage->createString([
         'source' => $offset,
         'context' => $this->context,
         'version' => \Drupal::VERSION,
-      ))->addLocation('path', $this->requestStack->getCurrentRequest()->getRequestUri())->save();
+      ])->addLocation('path', $this->requestStack->getCurrentRequest()->getRequestUri())->save();
       $value = TRUE;
     }
 
     // If there is no translation available for the current language then use
     // language fallback to try other translations.
     if ($value === TRUE) {
-      $fallbacks = $this->languageManager->getFallbackCandidates(array('langcode' => $this->langcode, 'operation' => 'locale_lookup', 'data' => $offset));
+      $fallbacks = $this->languageManager->getFallbackCandidates(['langcode' => $this->langcode, 'operation' => 'locale_lookup', 'data' => $offset]);
       if (!empty($fallbacks)) {
         foreach ($fallbacks as $langcode) {
-          $translation = $this->stringStorage->findTranslation(array(
+          $translation = $this->stringStorage->findTranslation([
             'language' => $langcode,
             'source' => $offset,
             'context' => $this->context,
-          ));
+          ]);
 
           if ($translation && !empty($translation->translation)) {
             $value = $translation->translation;
diff --git a/web/core/modules/locale/src/LocaleProjectStorage.php b/web/core/modules/locale/src/LocaleProjectStorage.php
index 907bd6cd7..05faa17db 100644
--- a/web/core/modules/locale/src/LocaleProjectStorage.php
+++ b/web/core/modules/locale/src/LocaleProjectStorage.php
@@ -21,7 +21,7 @@ class LocaleProjectStorage implements LocaleProjectStorageInterface {
    *
    * @var array
    */
-  protected $cache = array();
+  protected $cache = [];
 
   /**
    * Cache status flag.
@@ -36,7 +36,7 @@ class LocaleProjectStorage implements LocaleProjectStorageInterface {
    * @param \Drupal\Core\KeyValueStore\KeyValueFactoryInterface $key_value_factory
    *   The key value store to use.
    */
-  function __construct(KeyValueFactoryInterface $key_value_factory) {
+  public function __construct(KeyValueFactoryInterface $key_value_factory) {
     $this->keyValueStore = $key_value_factory->get('locale.project');
   }
 
@@ -44,7 +44,7 @@ class LocaleProjectStorage implements LocaleProjectStorageInterface {
    * {@inheritdoc}
    */
   public function get($key, $default = NULL) {
-    $values = $this->getMultiple(array($key));
+    $values = $this->getMultiple([$key]);
     return isset($values[$key]) ? $values[$key] : $default;
   }
 
@@ -52,8 +52,8 @@ class LocaleProjectStorage implements LocaleProjectStorageInterface {
    * {@inheritdoc}
    */
   public function getMultiple(array $keys) {
-    $values = array();
-    $load = array();
+    $values = [];
+    $load = [];
     foreach ($keys as $key) {
       // Check if we have a value in the cache.
       if (isset($this->cache[$key])) {
@@ -87,7 +87,7 @@ class LocaleProjectStorage implements LocaleProjectStorageInterface {
    * {@inheritdoc}
    */
   public function set($key, $value) {
-    $this->setMultiple(array($key => $value));
+    $this->setMultiple([$key => $value]);
   }
 
   /**
@@ -104,7 +104,7 @@ class LocaleProjectStorage implements LocaleProjectStorageInterface {
    * {@inheritdoc}
    */
   public function delete($key) {
-    $this->deleteMultiple(array($key));
+    $this->deleteMultiple([$key]);
   }
 
   /**
@@ -121,7 +121,7 @@ class LocaleProjectStorage implements LocaleProjectStorageInterface {
    * {@inheritdoc}
    */
   public function resetCache() {
-    $this->cache = array();
+    $this->cache = [];
     static::$all = FALSE;
   }
 
diff --git a/web/core/modules/locale/src/LocaleTranslation.php b/web/core/modules/locale/src/LocaleTranslation.php
index 04f3d62ec..94125e91d 100644
--- a/web/core/modules/locale/src/LocaleTranslation.php
+++ b/web/core/modules/locale/src/LocaleTranslation.php
@@ -40,7 +40,7 @@ class LocaleTranslation implements TranslatorInterface, DestructableInterface {
    *   Array of \Drupal\locale\LocaleLookup objects indexed by language code
    *   and context.
    */
-  protected $translations = array();
+  protected $translations = [];
 
   /**
    * The cache backend that should be used.
@@ -137,7 +137,7 @@ class LocaleTranslation implements TranslatorInterface, DestructableInterface {
    */
   public function reset() {
     unset($this->translateEnglish);
-    $this->translations = array();
+    $this->translations = [];
   }
 
   /**
diff --git a/web/core/modules/locale/src/PluralFormula.php b/web/core/modules/locale/src/PluralFormula.php
index 827cc8870..638d60fac 100644
--- a/web/core/modules/locale/src/PluralFormula.php
+++ b/web/core/modules/locale/src/PluralFormula.php
@@ -92,7 +92,7 @@ class PluralFormula implements PluralFormulaInterface {
   /**
    * Loads the formulae and stores them on the PluralFormula object if not set.
    *
-   * @return []
+   * @return array
    */
   protected function loadFormulae() {
     if (!isset($this->formulae)) {
diff --git a/web/core/modules/locale/src/PoDatabaseReader.php b/web/core/modules/locale/src/PoDatabaseReader.php
index d5c3cd72f..55c2b690a 100644
--- a/web/core/modules/locale/src/PoDatabaseReader.php
+++ b/web/core/modules/locale/src/PoDatabaseReader.php
@@ -45,7 +45,7 @@ class PoDatabaseReader implements PoReaderInterface {
    * Constructor, initializes with default options.
    */
   public function __construct() {
-    $this->setOptions(array());
+    $this->setOptions([]);
   }
 
   /**
@@ -73,11 +73,11 @@ class PoDatabaseReader implements PoReaderInterface {
    * Set the options for the current reader.
    */
   public function setOptions(array $options) {
-    $options += array(
+    $options += [
       'customized' => FALSE,
       'not_customized' => FALSE,
       'not_translated' => FALSE,
-    );
+    ];
     $this->options = $options;
   }
 
@@ -104,7 +104,7 @@ class PoDatabaseReader implements PoReaderInterface {
   private function loadStrings() {
     $langcode = $this->langcode;
     $options = $this->options;
-    $conditions = array();
+    $conditions = [];
 
     if (array_sum($options) == 0) {
       // If user asked to not include anything in the translation files,
diff --git a/web/core/modules/locale/src/PoDatabaseWriter.php b/web/core/modules/locale/src/PoDatabaseWriter.php
index f0be23a56..988f7f3be 100644
--- a/web/core/modules/locale/src/PoDatabaseWriter.php
+++ b/web/core/modules/locale/src/PoDatabaseWriter.php
@@ -89,14 +89,14 @@ class PoDatabaseWriter implements PoWriterInterface {
    * @param array $report
    *   Associative array with result information.
    */
-  public function setReport($report = array()) {
-    $report += array(
+  public function setReport($report = []) {
+    $report += [
       'additions' => 0,
       'updates' => 0,
       'deletes' => 0,
       'skips' => 0,
-      'strings' => array(),
-    );
+      'strings' => [],
+    ];
     $this->report = $report;
   }
 
@@ -112,15 +112,15 @@ class PoDatabaseWriter implements PoWriterInterface {
    */
   public function setOptions(array $options) {
     if (!isset($options['overwrite_options'])) {
-      $options['overwrite_options'] = array();
+      $options['overwrite_options'] = [];
     }
-    $options['overwrite_options'] += array(
+    $options['overwrite_options'] += [
       'not_customized' => FALSE,
       'customized' => FALSE,
-    );
-    $options += array(
+    ];
+    $options += [
       'customized' => LOCALE_NOT_CUSTOMIZED,
-    );
+    ];
     $this->options = $options;
   }
 
@@ -148,7 +148,7 @@ class PoDatabaseWriter implements PoWriterInterface {
    */
   public function setHeader(PoHeader $header) {
     $this->header = $header;
-    $locale_plurals = \Drupal::state()->get('locale.translation.plurals') ?: array();
+    $locale_plurals = \Drupal::state()->get('locale.translation.plurals') ?: [];
 
     // Check for options.
     $options = $this->getOptions();
@@ -205,10 +205,10 @@ class PoDatabaseWriter implements PoWriterInterface {
    */
   private function importString(PoItem $item) {
     // Initialize overwrite options if not set.
-    $this->options['overwrite_options'] += array(
+    $this->options['overwrite_options'] += [
       'not_customized' => FALSE,
       'customized' => FALSE,
-    );
+    ];
     $overwrite_options = $this->options['overwrite_options'];
     $customized = $this->options['customized'];
 
@@ -217,17 +217,17 @@ class PoDatabaseWriter implements PoWriterInterface {
     $translation = $item->getTranslation();
 
     // Look up the source string and any existing translation.
-    $strings = \Drupal::service('locale.storage')->getTranslations(array(
+    $strings = \Drupal::service('locale.storage')->getTranslations([
       'language' => $this->langcode,
       'source' => $source,
       'context' => $context,
-    ));
+    ]);
     $string = reset($strings);
 
     if (!empty($translation)) {
       // Skip this string unless it passes a check for dangerous code.
       if (!locale_string_is_safe($translation)) {
-        \Drupal::logger('locale')->error('Import of string "%string" was skipped because of disallowed or malformed HTML.', array('%string' => $translation));
+        \Drupal::logger('locale')->error('Import of string "%string" was skipped because of disallowed or malformed HTML.', ['%string' => $translation]);
         $this->report['skips']++;
         return 0;
       }
@@ -235,10 +235,10 @@ class PoDatabaseWriter implements PoWriterInterface {
         $string->setString($translation);
         if ($string->isNew()) {
           // No translation in this language.
-          $string->setValues(array(
+          $string->setValues([
             'language' => $this->langcode,
             'customized' => $customized,
-          ));
+          ]);
           $string->save();
           $this->report['additions']++;
         }
@@ -253,14 +253,14 @@ class PoDatabaseWriter implements PoWriterInterface {
       }
       else {
         // No such source string in the database yet.
-        $string = \Drupal::service('locale.storage')->createString(array('source' => $source, 'context' => $context))
+        $string = \Drupal::service('locale.storage')->createString(['source' => $source, 'context' => $context])
           ->save();
-        \Drupal::service('locale.storage')->createTranslation(array(
+        \Drupal::service('locale.storage')->createTranslation([
           'lid' => $string->getId(),
           'language' => $this->langcode,
           'translation' => $translation,
           'customized' => $customized,
-        ))->save();
+        ])->save();
 
         $this->report['additions']++;
         $this->report['strings'][] = $string->getId();
diff --git a/web/core/modules/locale/src/StreamWrapper/TranslationsStream.php b/web/core/modules/locale/src/StreamWrapper/TranslationsStream.php
index 8a1c1c9fb..e7cb2788e 100644
--- a/web/core/modules/locale/src/StreamWrapper/TranslationsStream.php
+++ b/web/core/modules/locale/src/StreamWrapper/TranslationsStream.php
@@ -36,7 +36,7 @@ class TranslationsStream extends LocalStream {
   /**
    * {@inheritdoc}
    */
-  function getDirectoryPath() {
+  public function getDirectoryPath() {
     return \Drupal::config('locale.settings')->get('translation.path');
   }
 
@@ -45,7 +45,7 @@ class TranslationsStream extends LocalStream {
    * @throws \LogicException
    *   PO files URL should not be public.
    */
-  function getExternalUrl() {
+  public function getExternalUrl() {
     throw new \LogicException('PO files URL should not be public.');
   }
 
diff --git a/web/core/modules/locale/src/StringBase.php b/web/core/modules/locale/src/StringBase.php
index 2569289c2..63cd781a5 100644
--- a/web/core/modules/locale/src/StringBase.php
+++ b/web/core/modules/locale/src/StringBase.php
@@ -57,7 +57,7 @@ abstract class StringBase implements StringInterface {
    * @param object|array $values
    *   Object or array with initial values.
    */
-  public function __construct($values = array()) {
+  public function __construct($values = []) {
     $this->setValues((array) $values);
   }
 
@@ -137,7 +137,7 @@ abstract class StringBase implements StringInterface {
    * {@inheritdoc}
    */
   public function getValues(array $fields) {
-    $values = array();
+    $values = [];
     foreach ($fields as $field) {
       if (isset($this->$field)) {
         $values[$field] = $this->$field;
@@ -151,12 +151,12 @@ abstract class StringBase implements StringInterface {
    */
   public function getLocations($check_only = FALSE) {
     if (!isset($this->locations) && !$check_only) {
-      $this->locations = array();
-      foreach ($this->getStorage()->getLocations(array('sid' => $this->getId())) as $location) {
+      $this->locations = [];
+      foreach ($this->getStorage()->getLocations(['sid' => $this->getId()]) as $location) {
         $this->locations[$location->type][$location->name] = $location->lid;
       }
     }
-    return isset($this->locations) ? $this->locations : array();
+    return isset($this->locations) ? $this->locations : [];
   }
 
   /**
diff --git a/web/core/modules/locale/src/StringDatabaseStorage.php b/web/core/modules/locale/src/StringDatabaseStorage.php
index 058c68960..57358dc32 100644
--- a/web/core/modules/locale/src/StringDatabaseStorage.php
+++ b/web/core/modules/locale/src/StringDatabaseStorage.php
@@ -21,7 +21,7 @@ class StringDatabaseStorage implements StringStorageInterface {
    *
    * @var array
    */
-  protected $options = array();
+  protected $options = [];
 
   /**
    * Constructs a new StringDatabaseStorage class.
@@ -31,7 +31,7 @@ class StringDatabaseStorage implements StringStorageInterface {
    * @param array $options
    *   (optional) Any additional database connection options to use in queries.
    */
-  public function __construct(Connection $connection, array $options = array()) {
+  public function __construct(Connection $connection, array $options = []) {
     $this->connection = $connection;
     $this->options = $options;
   }
@@ -39,15 +39,15 @@ class StringDatabaseStorage implements StringStorageInterface {
   /**
    * {@inheritdoc}
    */
-  public function getStrings(array $conditions = array(), array $options = array()) {
+  public function getStrings(array $conditions = [], array $options = []) {
     return $this->dbStringLoad($conditions, $options, 'Drupal\locale\SourceString');
   }
 
   /**
    * {@inheritdoc}
    */
-  public function getTranslations(array $conditions = array(), array $options = array()) {
-    return $this->dbStringLoad($conditions, array('translation' => TRUE) + $options, 'Drupal\locale\TranslationString');
+  public function getTranslations(array $conditions = [], array $options = []) {
+    return $this->dbStringLoad($conditions, ['translation' => TRUE] + $options, 'Drupal\locale\TranslationString');
   }
 
   /**
@@ -69,7 +69,7 @@ class StringDatabaseStorage implements StringStorageInterface {
    * {@inheritdoc}
    */
   public function findTranslation(array $conditions) {
-    $values = $this->dbStringSelect($conditions, array('translation' => TRUE))
+    $values = $this->dbStringSelect($conditions, ['translation' => TRUE])
       ->execute()
       ->fetchAssoc();
 
@@ -84,7 +84,7 @@ class StringDatabaseStorage implements StringStorageInterface {
   /**
    * {@inheritdoc}
    */
-  public function getLocations(array $conditions = array()) {
+  public function getLocations(array $conditions = []) {
     $query = $this->connection->select('locales_location', 'l', $this->options)
       ->fields('l');
     foreach ($conditions as $field => $value) {
@@ -142,14 +142,14 @@ class StringDatabaseStorage implements StringStorageInterface {
           // Make sure that the name isn't longer than 255 characters.
           $name = substr($name, 0, 255);
           if (!$lid) {
-            $this->dbDelete('locales_location', array('sid' => $string->getId(), 'type' => $type, 'name' => $name))
+            $this->dbDelete('locales_location', ['sid' => $string->getId(), 'type' => $type, 'name' => $name])
               ->execute();
           }
           elseif ($lid === TRUE) {
             // This is a new location to add, take care not to duplicate.
             $this->connection->merge('locales_location', $this->options)
-              ->keys(array('sid' => $string->getId(), 'type' => $type, 'name' => $name))
-              ->fields(array('version' => \Drupal::VERSION))
+              ->keys(['sid' => $string->getId(), 'type' => $type, 'name' => $name])
+              ->fields(['version' => \Drupal::VERSION])
               ->execute();
             $created = TRUE;
           }
@@ -176,7 +176,7 @@ class StringDatabaseStorage implements StringStorageInterface {
       $string->setVersion($version);
       $this->connection->update('locales_source', $this->options)
         ->condition('lid', $string->getId())
-        ->fields(array('version' => $version))
+        ->fields(['version' => $version])
         ->execute();
     }
   }
@@ -203,11 +203,11 @@ class StringDatabaseStorage implements StringStorageInterface {
    * {@inheritdoc}
    */
   public function deleteStrings($conditions) {
-    $lids = $this->dbStringSelect($conditions, array('fields' => array('lid')))->execute()->fetchCol();
+    $lids = $this->dbStringSelect($conditions, ['fields' => ['lid']])->execute()->fetchCol();
     if ($lids) {
-      $this->dbDelete('locales_target', array('lid' => $lids))->execute();
-      $this->dbDelete('locales_source', array('lid' => $lids))->execute();
-      $this->dbDelete('locales_location', array('sid' => $lids))->execute();
+      $this->dbDelete('locales_target', ['lid' => $lids])->execute();
+      $this->dbDelete('locales_source', ['lid' => $lids])->execute();
+      $this->dbDelete('locales_location', ['sid' => $lids])->execute();
     }
   }
 
@@ -221,18 +221,18 @@ class StringDatabaseStorage implements StringStorageInterface {
   /**
    * {@inheritdoc}
    */
-  public function createString($values = array()) {
-    return new SourceString($values + array('storage' => $this));
+  public function createString($values = []) {
+    return new SourceString($values + ['storage' => $this]);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function createTranslation($values = array()) {
-    return new TranslationString($values + array(
+  public function createTranslation($values = []) {
+    return new TranslationString($values + [
       'storage' => $this,
       'is_new' => TRUE,
-    ));
+    ]);
   }
 
   /**
@@ -250,10 +250,10 @@ class StringDatabaseStorage implements StringStorageInterface {
    *     table fields)
    */
   protected function dbFieldTable($field) {
-    if (in_array($field, array('language', 'translation', 'customized'))) {
+    if (in_array($field, ['language', 'translation', 'customized'])) {
       return 't';
     }
-    elseif (in_array($field, array('type', 'name'))) {
+    elseif (in_array($field, ['type', 'name'])) {
       return 'l';
     }
     else {
@@ -290,16 +290,16 @@ class StringDatabaseStorage implements StringStorageInterface {
    */
   protected function dbStringKeys($string) {
     if ($string->isSource()) {
-      $keys = array('lid');
+      $keys = ['lid'];
     }
     elseif ($string->isTranslation()) {
-      $keys = array('lid', 'language');
+      $keys = ['lid', 'language'];
     }
     if (!empty($keys) && ($values = $string->getValues($keys)) && count($keys) == count($values)) {
       return $values;
     }
     else {
-      return array();
+      return [];
     }
   }
 
@@ -317,7 +317,7 @@ class StringDatabaseStorage implements StringStorageInterface {
    *   Array of objects of the class requested.
    */
   protected function dbStringLoad(array $conditions, array $options, $class) {
-    $strings = array();
+    $strings = [];
     $result = $this->dbStringSelect($conditions, $options)->execute();
     foreach ($result as $item) {
       /** @var \Drupal\locale\StringInterface $string */
@@ -349,7 +349,7 @@ class StringDatabaseStorage implements StringStorageInterface {
    * @return \Drupal\Core\Database\Query\Select
    *   Query object with all the tables, fields and conditions.
    */
-  protected function dbStringSelect(array $conditions, array $options = array()) {
+  protected function dbStringSelect(array $conditions, array $options = []) {
     // Start building the query with source table and check whether we need to
     // join the target table too.
     $query = $this->connection->select('locales_source', 's', $this->options)
@@ -376,9 +376,9 @@ class StringDatabaseStorage implements StringStorageInterface {
     if ($join) {
       if (isset($conditions['language'])) {
         // If we've got a language condition, we use it for the join.
-        $query->$join('locales_target', 't', "t.lid = s.lid AND t.language = :langcode", array(
+        $query->$join('locales_target', 't', "t.lid = s.lid AND t.language = :langcode", [
           ':langcode' => $conditions['language'],
-        ));
+        ]);
         unset($conditions['language']);
       }
       else {
@@ -387,7 +387,7 @@ class StringDatabaseStorage implements StringStorageInterface {
       }
       if (!empty($options['translation'])) {
         // We cannot just add all fields because 'lid' may get null values.
-        $query->fields('t', array('language', 'translation', 'customized'));
+        $query->fields('t', ['language', 'translation', 'customized']);
       }
     }
 
@@ -396,8 +396,8 @@ class StringDatabaseStorage implements StringStorageInterface {
     // array so we can consistently use IN conditions.
     if (isset($conditions['type']) || isset($conditions['name'])) {
       $subquery = $this->connection->select('locales_location', 'l', $this->options)
-        ->fields('l', array('sid'));
-      foreach (array('type', 'name') as $field) {
+        ->fields('l', ['sid']);
+      foreach (['type', 'name'] as $field) {
         if (isset($conditions[$field])) {
           $subquery->condition('l.' . $field, (array) $conditions[$field], 'IN');
           unset($conditions[$field]);
@@ -417,8 +417,8 @@ class StringDatabaseStorage implements StringStorageInterface {
         // Conditions for target fields when doing an outer join only make
         // sense if we add also OR field IS NULL.
         $query->condition(db_or()
-            ->condition($field_alias, (array) $value, 'IN')
-            ->isNull($field_alias)
+          ->condition($field_alias, (array) $value, 'IN')
+          ->isNull($field_alias)
         );
       }
       else {
@@ -463,12 +463,12 @@ class StringDatabaseStorage implements StringStorageInterface {
    */
   protected function dbStringInsert($string) {
     if ($string->isSource()) {
-      $string->setValues(array('context' => '', 'version' => 'none'), FALSE);
-      $fields = $string->getValues(array('source', 'context', 'version'));
+      $string->setValues(['context' => '', 'version' => 'none'], FALSE);
+      $fields = $string->getValues(['source', 'context', 'version']);
     }
     elseif ($string->isTranslation()) {
-      $string->setValues(array('customized' => 0), FALSE);
-      $fields = $string->getValues(array('lid', 'language', 'translation', 'customized'));
+      $string->setValues(['customized' => 0], FALSE);
+      $fields = $string->getValues(['lid', 'language', 'translation', 'customized']);
     }
     if (!empty($fields)) {
       return $this->connection->insert($this->dbStringTable($string), $this->options)
@@ -495,10 +495,10 @@ class StringDatabaseStorage implements StringStorageInterface {
    */
   protected function dbStringUpdate($string) {
     if ($string->isSource()) {
-      $values = $string->getValues(array('source', 'context', 'version'));
+      $values = $string->getValues(['source', 'context', 'version']);
     }
     elseif ($string->isTranslation()) {
-      $values = $string->getValues(array('translation', 'customized'));
+      $values = $string->getValues(['translation', 'customized']);
     }
     if (!empty($values) && $keys = $this->dbStringKeys($string)) {
       return $this->connection->merge($this->dbStringTable($string), $this->options)
@@ -533,7 +533,7 @@ class StringDatabaseStorage implements StringStorageInterface {
   /**
    * Executes an arbitrary SELECT query string with the injected options.
    */
-  protected function dbExecute($query, array $args = array()) {
+  protected function dbExecute($query, array $args = []) {
     return $this->connection->query($query, $args, $this->options);
   }
 
diff --git a/web/core/modules/locale/src/StringStorageInterface.php b/web/core/modules/locale/src/StringStorageInterface.php
index da1c8fb1f..18c5edc2b 100644
--- a/web/core/modules/locale/src/StringStorageInterface.php
+++ b/web/core/modules/locale/src/StringStorageInterface.php
@@ -27,7 +27,7 @@ interface StringStorageInterface {
    * @return array
    *   Array of \Drupal\locale\StringInterface objects matching the conditions.
    */
-  public function getStrings(array $conditions = array(), array $options = array());
+  public function getStrings(array $conditions = [], array $options = []);
 
   /**
    * Loads multiple string translation objects.
@@ -44,7 +44,7 @@ interface StringStorageInterface {
    *
    * @see \Drupal\locale\StringStorageInterface::getStrings()
    */
-  public function getTranslations(array $conditions = array(), array $options = array());
+  public function getTranslations(array $conditions = [], array $options = []);
 
   /**
    * Loads string location information.
@@ -61,7 +61,7 @@ interface StringStorageInterface {
    *
    * @see \Drupal\locale\StringStorageInterface::getStrings()
    */
-  public function getLocations(array $conditions = array());
+  public function getLocations(array $conditions = []);
 
   /**
    * Loads a string source object, fast query.
@@ -164,7 +164,7 @@ interface StringStorageInterface {
    * @return \Drupal\locale\SourceString
    *   New source string object.
    */
-  public function createString($values = array());
+  public function createString($values = []);
 
   /**
    * Creates a string translation object bound to this storage but not saved.
@@ -175,6 +175,6 @@ interface StringStorageInterface {
    * @return \Drupal\locale\TranslationString
    *   New string translation object.
    */
-  public function createTranslation($values = array());
+  public function createTranslation($values = []);
 
 }
diff --git a/web/core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php b/web/core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php
index 67faa8192..479a60046 100644
--- a/web/core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleConfigTranslationImportTest.php
@@ -18,13 +18,13 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'locale_test_translate');
+  public static $modules = ['language', 'locale_test_translate'];
 
   /**
    * Test update changes configuration translations if enabled after language.
    */
   public function testConfigTranslationImport() {
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions'));
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions']);
     $this->drupalLogin($admin_user);
 
     // Add a language. The Afrikaans translation file of locale_test_translate
@@ -32,7 +32,7 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
     ConfigurableLanguage::createFromLangcode('af')->save();
 
     // Enable locale module.
-    $this->container->get('module_installer')->install(array('locale'));
+    $this->container->get('module_installer')->install(['locale']);
     $this->resetAll();
 
     // Enable import of translations. By default this is disabled for automated
@@ -42,9 +42,9 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
       ->save();
 
     // Add translation permissions now that the locale module has been enabled.
-    $edit = array(
+    $edit = [
       'authenticated[translate interface]' => 'translate interface',
-    );
+    ];
     $this->drupalPostForm('admin/people/permissions', $edit, t('Save permissions'));
 
     // Check and update the translation status. This will import the Afrikaans
@@ -57,7 +57,7 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
     $status['drupal']['af']->type = 'current';
     \Drupal::state()->set('locale.translation_status', $status);
 
-    $this->drupalPostForm('admin/reports/translations', array(), t('Update translations'));
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
 
     // Check if configuration translations have been imported.
     $override = \Drupal::languageManager()->getLanguageConfigOverride('af', 'system.maintenance');
@@ -77,7 +77,7 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
     // import. Test that this override is in place.
     $this->assertFalse($this->config('locale.settings')->get('translation.import_enabled'), 'Translations imports are disabled by default in the Testing profile.');
 
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate configuration'));
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate configuration']);
     $this->drupalLogin($admin_user);
 
     // Enable import of translations. By default this is disabled for automated
@@ -90,7 +90,7 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
     $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'af'], t('Add language'));
 
     // Add the system branding block to the page.
-    $this->drupalPlaceBlock('system_branding_block', array('region' => 'header', 'id' => 'site-branding'));
+    $this->drupalPlaceBlock('system_branding_block', ['region' => 'header', 'id' => 'site-branding']);
     $this->drupalPostForm('admin/config/system/site-information', ['site_slogan' => 'Test site slogan'], 'Save configuration');
     $this->drupalPostForm('admin/config/system/site-information/translate/af/edit', ['translation[config_names][system.site][slogan]' => 'Test site slogan in Afrikaans'], 'Save translation');
 
@@ -109,7 +109,7 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
       ->save();
 
     // Install any module.
-    $this->drupalPostForm('admin/modules', ['modules[Core][dblog][enable]' => 'dblog'], t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[dblog][enable]' => 'dblog'], t('Install'));
     $this->assertText('Module Database Logging has been enabled.');
 
     // Get the front page and ensure that the translated configuration still
@@ -130,12 +130,12 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
   /**
    * Test removing a string from Locale deletes configuration translations.
    */
-  function testLocaleRemovalAndConfigOverrideDelete() {
+  public function testLocaleRemovalAndConfigOverrideDelete() {
     // Enable the locale module.
     $this->container->get('module_installer')->install(['locale']);
     $this->resetAll();
 
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate interface'));
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate interface']);
     $this->drupalLogin($admin_user);
 
     // Enable import of translations. By default this is disabled for automated
@@ -153,7 +153,7 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
     // Remove the string from translation to simulate a Locale removal. Note
     // that is no current way of doing this in the UI.
     $locale_storage = \Drupal::service('locale.storage');
-    $string = $locale_storage->findString(array('source' => 'Locale can translate'));
+    $string = $locale_storage->findString(['source' => 'Locale can translate']);
     \Drupal::service('locale.storage')->delete($string);
     // Force a rebuild of config translations.
     $count = Locale::config()->updateConfigTranslations(['locale_test_translate.settings'], ['af']);
@@ -167,12 +167,12 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
   /**
    * Test removing a string from Locale changes configuration translations.
    */
-  function testLocaleRemovalAndConfigOverridePreserve() {
+  public function testLocaleRemovalAndConfigOverridePreserve() {
     // Enable the locale module.
     $this->container->get('module_installer')->install(['locale']);
     $this->resetAll();
 
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate interface'));
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'administer permissions', 'translate interface']);
     $this->drupalLogin($admin_user);
 
     // Enable import of translations. By default this is disabled for automated
@@ -198,18 +198,18 @@ class LocaleConfigTranslationImportTest extends WebTestBase {
     $this->assertEqual($expected, $override->get());
 
     // Set the translated string to empty.
-    $search = array(
+    $search = [
       'string' => 'Locale can translate',
       'langcode' => 'af',
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $textareas = $this->xpath('//textarea');
     $textarea = current($textareas);
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => '',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     $override = \Drupal::languageManager()->getLanguageConfigOverride('af', 'locale_test_translate.settings');
diff --git a/web/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php b/web/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
index 3ee988a8d..a90dce0c5 100644
--- a/web/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
@@ -24,7 +24,7 @@ class LocaleConfigTranslationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale', 'contact', 'contact_test');
+  public static $modules = ['locale', 'contact', 'contact_test'];
 
   /**
    * {@inheritdoc}
@@ -42,15 +42,15 @@ class LocaleConfigTranslationTest extends WebTestBase {
 
     // Add custom language.
     $this->langcode = 'xx';
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'translate interface', 'administer modules', 'access site-wide contact form', 'administer contact forms', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'translate interface', 'administer modules', 'access site-wide contact form', 'administer contact forms', 'administer site configuration']);
     $this->drupalLogin($admin_user);
     $name = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $this->langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     // Set path prefix.
     $edit = ["prefix[$this->langcode]" => $this->langcode];
@@ -63,23 +63,23 @@ class LocaleConfigTranslationTest extends WebTestBase {
   public function testConfigTranslation() {
     // Check that the maintenance message exists and create translation for it.
     $source = '@site is currently under maintenance. We should be back shortly. Thank you for your patience.';
-    $string = $this->storage->findString(array('source' => $source, 'context' => '', 'type' => 'configuration'));
+    $string = $this->storage->findString(['source' => $source, 'context' => '', 'type' => 'configuration']);
     $this->assertTrue($string, 'Configuration strings have been created upon installation.');
 
     // Translate using the UI so configuration is refreshed.
     $message = $this->randomMachineName(20);
-    $search = array(
+    $search = [
       'string' => $string->source,
       'langcode' => $this->langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $textareas = $this->xpath('//textarea');
     $textarea = current($textareas);
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $message,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     // Get translation and check we've only got the message.
@@ -88,22 +88,22 @@ class LocaleConfigTranslationTest extends WebTestBase {
     $this->assertEqual($translation['message'], $message);
 
     // Check default medium date format exists and create a translation for it.
-    $string = $this->storage->findString(array('source' => 'D, m/d/Y - H:i', 'context' => 'PHP date format', 'type' => 'configuration'));
+    $string = $this->storage->findString(['source' => 'D, m/d/Y - H:i', 'context' => 'PHP date format', 'type' => 'configuration']);
     $this->assertTrue($string, 'Configuration date formats have been created upon installation.');
 
     // Translate using the UI so configuration is refreshed.
-    $search = array(
+    $search = [
       'string' => $string->source,
       'langcode' => $this->langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $textareas = $this->xpath('//textarea');
     $textarea = current($textareas);
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => 'D',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     $translation = \Drupal::languageManager()->getLanguageConfigOverride($this->langcode, 'core.date_format.medium')->get();
@@ -115,14 +115,14 @@ class LocaleConfigTranslationTest extends WebTestBase {
     $this->assertEqual($formatted_date, 'Tue', 'Got the right formatted date using the date format translation pattern.');
 
     // Assert strings from image module config are not available.
-    $string = $this->storage->findString(array('source' => 'Medium (220×220)', 'context' => '', 'type' => 'configuration'));
+    $string = $this->storage->findString(['source' => 'Medium (220×220)', 'context' => '', 'type' => 'configuration']);
     $this->assertFalse($string, 'Configuration strings have been created upon installation.');
 
     // Enable the image module.
-    $this->drupalPostForm('admin/modules', array('modules[Field types][image][enable]' => "1"), t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[image][enable]' => "1"], t('Install'));
     $this->rebuildContainer();
 
-    $string = $this->storage->findString(array('source' => 'Medium (220×220)', 'context' => '', 'type' => 'configuration'));
+    $string = $this->storage->findString(['source' => 'Medium (220×220)', 'context' => '', 'type' => 'configuration']);
     $this->assertTrue($string, 'Configuration strings have been created upon installation.');
     $locations = $string->getLocations();
     $this->assertTrue(isset($locations['configuration']) && isset($locations['configuration']['image.style.medium']), 'Configuration string has been created with the right location');
@@ -136,17 +136,17 @@ class LocaleConfigTranslationTest extends WebTestBase {
 
     // Translate using the UI so configuration is refreshed.
     $image_style_label = $this->randomMachineName(20);
-    $search = array(
+    $search = [
       'string' => $string->source,
       'langcode' => $this->langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $image_style_label,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     // Check the right single translation has been created.
@@ -159,8 +159,8 @@ class LocaleConfigTranslationTest extends WebTestBase {
     $this->assertEqual($translation['label'], $image_style_label, 'Got the right translation for image style name after translation');
 
     // Uninstall the module.
-    $this->drupalPostForm('admin/modules/uninstall', array('uninstall[image]' => "image"), t('Uninstall'));
-    $this->drupalPostForm(NULL, array(), t('Uninstall'));
+    $this->drupalPostForm('admin/modules/uninstall', ['uninstall[image]' => "image"], t('Uninstall'));
+    $this->drupalPostForm(NULL, [], t('Uninstall'));
 
     // Ensure that the translated configuration has been removed.
     $override = \Drupal::languageManager()->getLanguageConfigOverride('xx', 'image.style.medium');
@@ -168,17 +168,17 @@ class LocaleConfigTranslationTest extends WebTestBase {
 
     // Translate default category using the UI so configuration is refreshed.
     $category_label = $this->randomMachineName(20);
-    $search = array(
+    $search = [
       'string' => 'Website feedback',
       'langcode' => $this->langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $category_label,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     // Check if this category displayed in this language will use the
@@ -198,12 +198,12 @@ class LocaleConfigTranslationTest extends WebTestBase {
   public function testOptionalConfiguration() {
     $this->assertNodeConfig(FALSE, FALSE);
     // Enable the node module.
-    $this->drupalPostForm('admin/modules', ['modules[Core][node][enable]' => "1"], t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[node][enable]' => "1"], t('Install'));
     $this->drupalPostForm(NULL, [], t('Continue'));
     $this->rebuildContainer();
     $this->assertNodeConfig(TRUE, FALSE);
     // Enable the views module (which node provides some optional config for).
-    $this->drupalPostForm('admin/modules', ['modules[Core][views][enable]' => "1"], t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[views][enable]' => "1"], t('Install'));
     $this->rebuildContainer();
     $this->assertNodeConfig(TRUE, TRUE);
   }
diff --git a/web/core/modules/locale/src/Tests/LocaleExportTest.php b/web/core/modules/locale/src/Tests/LocaleExportTest.php
index f9cd2ea7c..54d36e2bc 100644
--- a/web/core/modules/locale/src/Tests/LocaleExportTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleExportTest.php
@@ -16,7 +16,7 @@ class LocaleExportTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale');
+  public static $modules = ['locale'];
 
   /**
    * A user able to create languages and export translations.
@@ -29,7 +29,7 @@ class LocaleExportTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages'));
+    $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages']);
     $this->drupalLogin($this->adminUser);
 
     // Copy test po files to the translations directory.
@@ -45,16 +45,16 @@ class LocaleExportTest extends WebTestBase {
     // This will also automatically add the 'fr' language.
     $name = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
     file_put_contents($name, $this->getPoFile());
-    $this->drupalPostForm('admin/config/regional/translate/import', array(
+    $this->drupalPostForm('admin/config/regional/translate/import', [
       'langcode' => 'fr',
       'files[file]' => $name,
-    ), t('Import'));
+    ], t('Import'));
     drupal_unlink($name);
 
     // Get the French translations.
-    $this->drupalPostForm('admin/config/regional/translate/export', array(
+    $this->drupalPostForm('admin/config/regional/translate/export', [
       'langcode' => 'fr',
-    ), t('Export'));
+    ], t('Export'));
 
     // Ensure we have a translation file.
     $this->assertRaw('# French translation of Drupal', 'Exported French translation file.');
@@ -64,11 +64,11 @@ class LocaleExportTest extends WebTestBase {
     // Import some more French translations which will be marked as customized.
     $name = \Drupal::service('file_system')->tempnam('temporary://', "po2_") . '.po';
     file_put_contents($name, $this->getCustomPoFile());
-    $this->drupalPostForm('admin/config/regional/translate/import', array(
+    $this->drupalPostForm('admin/config/regional/translate/import', [
       'langcode' => 'fr',
       'files[file]' => $name,
       'customized' => 1,
-    ), t('Import'));
+    ], t('Import'));
     drupal_unlink($name);
 
     // Create string without translation in the locales_source table.
@@ -79,12 +79,12 @@ class LocaleExportTest extends WebTestBase {
       ->save();
 
     // Export only customized French translations.
-    $this->drupalPostForm('admin/config/regional/translate/export', array(
+    $this->drupalPostForm('admin/config/regional/translate/export', [
       'langcode' => 'fr',
       'content_options[not_customized]' => FALSE,
       'content_options[customized]' => TRUE,
       'content_options[not_translated]' => FALSE,
-    ), t('Export'));
+    ], t('Export'));
 
     // Ensure we have a translation file.
     $this->assertRaw('# French translation of Drupal', 'Exported French translation file with only customized strings.');
@@ -94,12 +94,12 @@ class LocaleExportTest extends WebTestBase {
     $this->assertNoRaw('msgid "February"', 'Untranslated string not present in exported file.');
 
     // Export only untranslated French translations.
-    $this->drupalPostForm('admin/config/regional/translate/export', array(
+    $this->drupalPostForm('admin/config/regional/translate/export', [
       'langcode' => 'fr',
       'content_options[not_customized]' => FALSE,
       'content_options[customized]' => FALSE,
       'content_options[not_translated]' => TRUE,
-    ), t('Export'));
+    ], t('Export'));
 
     // Ensure we have a translation file.
     $this->assertRaw('# French translation of Drupal', 'Exported French translation file with only untranslated strings.');
@@ -118,7 +118,7 @@ class LocaleExportTest extends WebTestBase {
     // the locales_source table gets populated with something.
     $this->drupalGet('admin/config/regional/language');
     // Get the translation template file.
-    $this->drupalPostForm('admin/config/regional/translate/export', array(), t('Export'));
+    $this->drupalPostForm('admin/config/regional/translate/export', [], t('Export'));
     // Ensure we have a translation file.
     $this->assertRaw('# LANGUAGE translation of PROJECT', 'Exported translation template file.');
   }
diff --git a/web/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php b/web/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
index 1e417552e..3ac296abe 100644
--- a/web/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
@@ -16,21 +16,21 @@ class LocaleFileSystemFormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp(){
     parent::setUp();
-    $account = $this->drupalCreateUser(array('administer site configuration'));
+    $account = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($account);
   }
 
   /**
    * Tests translation directory settings on the file settings form.
    */
-  function testFileConfigurationPage() {
+  public function testFileConfigurationPage() {
     // By default there should be no setting for the translation directory.
     $this->drupalGet('admin/config/media/file-system');
     $this->assertNoFieldByName('translation_path');
@@ -44,9 +44,9 @@ class LocaleFileSystemFormTest extends WebTestBase {
 
     // The setting should persist.
     $translation_path = $this->publicFilesDirectory . '/translations_changed';
-    $fields = array(
+    $fields = [
       'translation_path' => $translation_path
-    );
+    ];
     $this->drupalPostForm(NULL, $fields, t('Save configuration'));
     $this->drupalGet('admin/config/media/file-system');
     $this->assertFieldByName('translation_path', $translation_path);
diff --git a/web/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php b/web/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
index 7fb93d930..c1d9a612a 100644
--- a/web/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
@@ -17,7 +17,7 @@ class LocaleImportFunctionalTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale', 'dblog');
+  public static $modules = ['locale', 'dblog'];
 
   /**
    * A user able to create languages and import translations.
@@ -44,8 +44,8 @@ class LocaleImportFunctionalTest extends WebTestBase {
     file_unmanaged_copy(__DIR__ . '/../../tests/test.de.po', 'translations://', FILE_EXISTS_REPLACE);
     file_unmanaged_copy(__DIR__ . '/../../tests/test.xx.po', 'translations://', FILE_EXISTS_REPLACE);
 
-    $this->adminUser = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages'));
-    $this->adminUserAccessSiteReports = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages', 'access site reports'));
+    $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages']);
+    $this->adminUserAccessSiteReports = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages', 'access site reports']);
     $this->drupalLogin($this->adminUser);
 
     // Enable import of translations. By default this is disabled for automated
@@ -60,15 +60,15 @@ class LocaleImportFunctionalTest extends WebTestBase {
    */
   public function testStandalonePoFile() {
     // Try importing a .po file.
-    $this->importPoFile($this->getPoFile(), array(
+    $this->importPoFile($this->getPoFile(), [
       'langcode' => 'fr',
-    ));
+    ]);
     $this->config('locale.settings');
     // The import should automatically create the corresponding language.
-    $this->assertRaw(t('The language %language has been created.', array('%language' => 'French')), 'The language has been automatically created.');
+    $this->assertRaw(t('The language %language has been created.', ['%language' => 'French']), 'The language has been automatically created.');
 
     // The import should have created 8 strings.
-    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 8, '%update' => 0, '%delete' => 0)), 'The translation file was successfully imported.');
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 8, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
 
     // This import should have saved plural forms to have 2 variants.
     $locale_plurals = \Drupal::service('locale.plural.formula')->getNumberOfPlurals('fr');
@@ -78,14 +78,14 @@ class LocaleImportFunctionalTest extends WebTestBase {
     $this->assertUrl(\Drupal::url('locale.translate_page', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
 
     // Try importing a .po file with invalid tags.
-    $this->importPoFile($this->getBadPoFile(), array(
+    $this->importPoFile($this->getBadPoFile(), [
       'langcode' => 'fr',
-    ));
+    ]);
 
     // The import should have created 1 string and rejected 2.
-    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 1, '%update' => 0, '%delete' => 0)), 'The translation file was successfully imported.');
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
 
-    $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', array(':url' => \Drupal::url('dblog.overview')));
+    $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', [':url' => \Drupal::url('dblog.overview')]);
     $this->assertRaw($skip_message, 'Unsafe strings were skipped.');
 
     // Repeat the process with a user that can access site reports, and this
@@ -93,19 +93,19 @@ class LocaleImportFunctionalTest extends WebTestBase {
     $this->drupalLogin($this->adminUserAccessSiteReports);
 
     // Try importing a .po file with invalid tags.
-    $this->importPoFile($this->getBadPoFile(), array(
+    $this->importPoFile($this->getBadPoFile(), [
       'langcode' => 'fr',
-    ));
+    ]);
 
-    $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', '@count translation strings were skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', array(':url' => \Drupal::url('dblog.overview')));
+    $skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', '@count translation strings were skipped because of disallowed or malformed HTML. <a href=":url">See the log</a> for details.', [':url' => \Drupal::url('dblog.overview')]);
     $this->assertRaw($skip_message, 'Unsafe strings were skipped.');
 
     // Check empty files import with a user that cannot access site reports..
     $this->drupalLogin($this->adminUser);
     // Try importing a zero byte sized .po file.
-    $this->importPoFile($this->getEmptyPoFile(), array(
+    $this->importPoFile($this->getEmptyPoFile(), [
       'langcode' => 'fr',
-    ));
+    ]);
     // The import should have created 0 string and rejected 0.
     $this->assertRaw(t('One translation file could not be imported. See the log for details.'), 'The empty translation file import reported no translations imported.');
 
@@ -113,35 +113,35 @@ class LocaleImportFunctionalTest extends WebTestBase {
     // time the different warnings must contain links to the log.
     $this->drupalLogin($this->adminUserAccessSiteReports);
     // Try importing a zero byte sized .po file.
-    $this->importPoFile($this->getEmptyPoFile(), array(
+    $this->importPoFile($this->getEmptyPoFile(), [
       'langcode' => 'fr',
-    ));
+    ]);
     // The import should have created 0 string and rejected 0.
-    $this->assertRaw(t('One translation file could not be imported. <a href=":url">See the log</a> for details.', array(':url' => \Drupal::url('dblog.overview'))), 'The empty translation file import reported no translations imported.');
+    $this->assertRaw(t('One translation file could not be imported. <a href=":url">See the log</a> for details.', [':url' => \Drupal::url('dblog.overview')]), 'The empty translation file import reported no translations imported.');
 
     // Try importing a .po file which doesn't exist.
     $name = $this->randomMachineName(16);
-    $this->drupalPostForm('admin/config/regional/translate/import', array(
+    $this->drupalPostForm('admin/config/regional/translate/import', [
       'langcode' => 'fr',
       'files[file]' => $name,
-    ), t('Import'));
+    ], t('Import'));
     $this->assertUrl(\Drupal::url('locale.translate_import', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
     $this->assertText(t('File to import not found.'), 'File to import not found message.');
 
     // Try importing a .po file with overriding strings, and ensure existing
     // strings are kept.
-    $this->importPoFile($this->getOverwritePoFile(), array(
+    $this->importPoFile($this->getOverwritePoFile(), [
       'langcode' => 'fr',
-    ));
+    ]);
 
     // The import should have created 1 string.
-    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 1, '%update' => 0, '%delete' => 0)), 'The translation file was successfully imported.');
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
     // Ensure string wasn't overwritten.
-    $search = array(
+    $search = [
       'string' => 'Montag',
       'langcode' => 'fr',
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText(t('No strings available.'), 'String not overwritten by imported string.');
 
@@ -151,19 +151,19 @@ class LocaleImportFunctionalTest extends WebTestBase {
 
     // Try importing a .po file with overriding strings, and ensure existing
     // strings are overwritten.
-    $this->importPoFile($this->getOverwritePoFile(), array(
+    $this->importPoFile($this->getOverwritePoFile(), [
       'langcode' => 'fr',
       'overwrite_options[not_customized]' => TRUE,
-    ));
+    ]);
 
     // The import should have updated 2 strings.
-    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 0, '%update' => 2, '%delete' => 0)), 'The translation file was successfully imported.');
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 2, '%delete' => 0]), 'The translation file was successfully imported.');
     // Ensure string was overwritten.
-    $search = array(
+    $search = [
       'string' => 'Montag',
       'langcode' => 'fr',
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertNoText(t('No strings available.'), 'String overwritten by imported string.');
     // This import should have changed number of plural forms.
@@ -171,54 +171,54 @@ class LocaleImportFunctionalTest extends WebTestBase {
     $this->assertEqual(3, $locale_plurals, 'Plural numbers changed.');
 
     // Importing a .po file and mark its strings as customized strings.
-    $this->importPoFile($this->getCustomPoFile(), array(
+    $this->importPoFile($this->getCustomPoFile(), [
       'langcode' => 'fr',
       'customized' => TRUE,
-    ));
+    ]);
 
     // The import should have created 6 strings.
-    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 6, '%update' => 0, '%delete' => 0)), 'The customized translation file was successfully imported.');
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 6, '%update' => 0, '%delete' => 0]), 'The customized translation file was successfully imported.');
 
     // The database should now contain 6 customized strings (two imported
     // strings are not translated).
-    $count = db_query('SELECT COUNT(*) FROM {locales_target} WHERE customized = :custom', array(':custom' => 1))->fetchField();
+    $count = db_query('SELECT COUNT(*) FROM {locales_target} WHERE customized = :custom', [':custom' => 1])->fetchField();
     $this->assertEqual($count, 6, 'Customized translations successfully imported.');
 
     // Try importing a .po file with overriding strings, and ensure existing
     // customized strings are kept.
-    $this->importPoFile($this->getCustomOverwritePoFile(), array(
+    $this->importPoFile($this->getCustomOverwritePoFile(), [
       'langcode' => 'fr',
       'overwrite_options[not_customized]' => TRUE,
       'overwrite_options[customized]' => FALSE,
-    ));
+    ]);
 
     // The import should have created 1 string.
-    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 1, '%update' => 0, '%delete' => 0)), 'The customized translation file was successfully imported.');
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The customized translation file was successfully imported.');
     // Ensure string wasn't overwritten.
-    $search = array(
+    $search = [
       'string' => 'januari',
       'langcode' => 'fr',
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText(t('No strings available.'), 'Customized string not overwritten by imported string.');
 
     // Try importing a .po file with overriding strings, and ensure existing
     // customized strings are overwritten.
-    $this->importPoFile($this->getCustomOverwritePoFile(), array(
+    $this->importPoFile($this->getCustomOverwritePoFile(), [
       'langcode' => 'fr',
       'overwrite_options[not_customized]' => FALSE,
       'overwrite_options[customized]' => TRUE,
-    ));
+    ]);
 
     // The import should have updated 2 strings.
-    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 0, '%update' => 2, '%delete' => 0)), 'The customized translation file was successfully imported.');
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 2, '%delete' => 0]), 'The customized translation file was successfully imported.');
     // Ensure string was overwritten.
-    $search = array(
+    $search = [
       'string' => 'januari',
       'langcode' => 'fr',
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertNoText(t('No strings available.'), 'Customized string overwritten by imported string.');
 
@@ -229,14 +229,14 @@ class LocaleImportFunctionalTest extends WebTestBase {
    */
   public function testLanguageContext() {
     // Try importing a .po file.
-    $this->importPoFile($this->getPoFileWithContext(), array(
+    $this->importPoFile($this->getPoFileWithContext(), [
       'langcode' => 'hr',
-    ));
+    ]);
 
     // We cast the return value of t() to string so as to retrieve the
     // translated value, rendered as a string.
-    $this->assertIdentical((string) t('May', array(), array('langcode' => 'hr', 'context' => 'Long month name')), 'Svibanj', 'Long month name context is working.');
-    $this->assertIdentical((string) t('May', array(), array('langcode' => 'hr')), 'Svi.', 'Default context is working.');
+    $this->assertIdentical((string) t('May', [], ['langcode' => 'hr', 'context' => 'Long month name']), 'Svibanj', 'Long month name context is working.');
+    $this->assertIdentical((string) t('May', [], ['langcode' => 'hr']), 'Svi.', 'Default context is working.');
   }
 
   /**
@@ -246,26 +246,26 @@ class LocaleImportFunctionalTest extends WebTestBase {
     $langcode = 'hu';
 
     // Try importing a .po file.
-    $this->importPoFile($this->getPoFileWithMsgstr(), array(
+    $this->importPoFile($this->getPoFileWithMsgstr(), [
       'langcode' => $langcode,
-    ));
+    ]);
 
-    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 1, '%update' => 0, '%delete' => 0)), 'The translation file was successfully imported.');
-    $this->assertIdentical((string) t('Operations', array(), array('langcode' => $langcode)), 'Műveletek', 'String imported and translated.');
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
+    $this->assertIdentical((string) t('Operations', [], ['langcode' => $langcode]), 'Műveletek', 'String imported and translated.');
 
     // Try importing a .po file.
-    $this->importPoFile($this->getPoFileWithEmptyMsgstr(), array(
+    $this->importPoFile($this->getPoFileWithEmptyMsgstr(), [
       'langcode' => $langcode,
       'overwrite_options[not_customized]' => TRUE,
-    ));
-    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', array('%number' => 0, '%update' => 0, '%delete' => 1)), 'The translation file was successfully imported.');
+    ]);
+    $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 0, '%delete' => 1]), 'The translation file was successfully imported.');
 
     $str = "Operations";
-    $search = array(
+    $search = [
       'string' => $str,
       'langcode' => $langcode,
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText($str, 'Search found the string as untranslated.');
   }
@@ -276,27 +276,27 @@ class LocaleImportFunctionalTest extends WebTestBase {
   public function testConfigPoFile() {
     // Values for translations to assert. Config key, original string,
     // translation and config property name.
-    $config_strings = array(
-      'system.maintenance' => array(
+    $config_strings = [
+      'system.maintenance' => [
         '@site is currently under maintenance. We should be back shortly. Thank you for your patience.',
         '@site karbantartás alatt áll. Rövidesen visszatérünk. Köszönjük a türelmet.',
         'message',
-      ),
-      'user.role.anonymous' => array(
+      ],
+      'user.role.anonymous' => [
         'Anonymous user',
         'Névtelen felhasználó',
         'label',
-      ),
-    );
+      ],
+    ];
 
     // Add custom language for testing.
     $langcode = 'xx';
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $this->randomMachineName(16),
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
 
     // Check for the source strings we are going to translate. Adding the
@@ -304,24 +304,24 @@ class LocaleImportFunctionalTest extends WebTestBase {
     // strings to interface translation executed.
     $locale_storage = $this->container->get('locale.storage');
     foreach ($config_strings as $config_string) {
-      $string = $locale_storage->findString(array('source' => $config_string[0], 'context' => '', 'type' => 'configuration'));
+      $string = $locale_storage->findString(['source' => $config_string[0], 'context' => '', 'type' => 'configuration']);
       $this->assertTrue($string, 'Configuration strings have been created upon installation.');
     }
 
     // Import a .po file to translate.
-    $this->importPoFile($this->getPoFileWithConfig(), array(
+    $this->importPoFile($this->getPoFileWithConfig(), [
       'langcode' => $langcode,
-    ));
+    ]);
 
     // Translations got recorded in the interface translation system.
     foreach ($config_strings as $config_string) {
-      $search = array(
+      $search = [
         'string' => $config_string[0],
         'langcode' => $langcode,
         'translation' => 'all',
-      );
+      ];
       $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
-      $this->assertText($config_string[1], format_string('Translation of @string found.', array('@string' => $config_string[0])));
+      $this->assertText($config_string[1], format_string('Translation of @string found.', ['@string' => $config_string[0]]));
     }
 
     // Test that translations got recorded in the config system.
@@ -340,8 +340,8 @@ class LocaleImportFunctionalTest extends WebTestBase {
     $langcode = 'de';
 
     // Import a .po file to translate.
-    $this->importPoFile($this->getPoFileWithConfigDe(), array(
-      'langcode' => $langcode));
+    $this->importPoFile($this->getPoFileWithConfigDe(), [
+      'langcode' => $langcode]);
 
     // Check that the 'Anonymous' string is translated.
     $config = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'user.settings');
@@ -353,7 +353,7 @@ class LocaleImportFunctionalTest extends WebTestBase {
    */
   public function testCreatedLanguageTranslation() {
     // Import a .po file to add de language.
-    $this->importPoFile($this->getPoFileWithConfigDe(), array('langcode' => 'de'));
+    $this->importPoFile($this->getPoFileWithConfigDe(), ['langcode' => 'de']);
 
     // Get the language.entity.de label and check it's been translated.
     $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'language.entity.de');
@@ -368,7 +368,7 @@ class LocaleImportFunctionalTest extends WebTestBase {
    * @param array $options
    *   (optional) Additional options to pass to the translation import form.
    */
-  public function importPoFile($contents, array $options = array()) {
+  public function importPoFile($contents, array $options = []) {
     $name = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
     file_put_contents($name, $contents);
     $options['files[file]'] = $name;
diff --git a/web/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php b/web/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
index b16ba1889..fe99ce2f3 100644
--- a/web/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
@@ -18,7 +18,7 @@ class LocaleJavascriptTranslationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale', 'locale_test');
+  public static $modules = ['locale', 'locale_test'];
 
   public function testFileParsing() {
     $filename = __DIR__ . '/../../tests/locale_test.js';
@@ -29,19 +29,19 @@ class LocaleJavascriptTranslationTest extends WebTestBase {
     // Get all of the source strings that were found.
     $strings = $this->container
       ->get('locale.storage')
-      ->getStrings(array(
+      ->getStrings([
         'type' => 'javascript',
         'name' => $filename,
-      ));
+      ]);
 
-    $source_strings = array();
+    $source_strings = [];
     foreach ($strings as $string) {
       $source_strings[$string->source] = $string->context;
     }
 
     $etx = LOCALE_PLURAL_DELIMITER;
     // List of all strings that should be in the file.
-    $test_strings = array(
+    $test_strings = [
       'Standard Call t' => '',
       'Whitespace Call t' => '',
 
@@ -73,11 +73,11 @@ class LocaleJavascriptTranslationTest extends WebTestBase {
       "Context Unquoted plural{$etx}Context Unquoted @count plural" => 'Context string unquoted',
       "Context Single Quoted plural{$etx}Context Single Quoted @count plural" => 'Context string single quoted',
       "Context Double Quoted plural{$etx}Context Double Quoted @count plural" => 'Context string double quoted',
-    );
+    ];
 
     // Assert that all strings were found properly.
     foreach ($test_strings as $str => $context) {
-      $args = array('%source' => $str, '%context' => $context);
+      $args = ['%source' => $str, '%context' => $context];
 
       // Make sure that the string was found in the file.
       $this->assertTrue(isset($source_strings[$str]), SafeMarkup::format('Found source string: %source', $args));
@@ -95,7 +95,7 @@ class LocaleJavascriptTranslationTest extends WebTestBase {
    */
   public function testLocaleTranslationJsDependencies() {
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'translate interface'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'translate interface']);
 
     // Add custom language.
     $this->drupalLogin($admin_user);
@@ -105,16 +105,16 @@ class LocaleJavascriptTranslationTest extends WebTestBase {
     $name = $this->randomMachineName(16);
     // The domain prefix.
     $prefix = $langcode;
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
 
     // Set path prefix.
-    $edit = array("prefix[$langcode]" => $prefix);
+    $edit = ["prefix[$langcode]" => $prefix];
     $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
 
     // This forces locale.admin.js string sources to be imported, which contains
@@ -123,11 +123,11 @@ class LocaleJavascriptTranslationTest extends WebTestBase {
 
     // Translate a string in locale.admin.js to our new language.
     $strings = \Drupal::service('locale.storage')
-      ->getStrings(array(
+      ->getStrings([
         'source' => 'Show description',
         'type' => 'javascript',
         'name' => 'core/modules/locale/locale.admin.js',
-      ));
+      ]);
     $string = $strings[0];
 
     $this->drupalPostForm(NULL, ['string' => 'Show description'], t('Filter'));
diff --git a/web/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php b/web/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php
index e84e3dd48..68996f44a 100644
--- a/web/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleLibraryAlterTest.php
@@ -19,7 +19,7 @@ class LocaleLibraryAlterTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale');
+  public static $modules = ['locale'];
 
   /**
    * Verifies that the datepicker can be localized.
diff --git a/web/core/modules/locale/src/Tests/LocalePluralFormatTest.php b/web/core/modules/locale/src/Tests/LocalePluralFormatTest.php
index c0e9041f0..2315dbd22 100644
--- a/web/core/modules/locale/src/Tests/LocalePluralFormatTest.php
+++ b/web/core/modules/locale/src/Tests/LocalePluralFormatTest.php
@@ -24,7 +24,7 @@ class LocalePluralFormatTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale');
+  public static $modules = ['locale'];
 
   /**
    * {@inheritdoc}
@@ -32,7 +32,7 @@ class LocalePluralFormatTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages'));
+    $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages']);
     $this->drupalLogin($this->adminUser);
   }
 
@@ -43,23 +43,23 @@ class LocalePluralFormatTest extends WebTestBase {
   public function testGetPluralFormat() {
     // Import some .po files with formulas to set up the environment.
     // These will also add the languages to the system.
-    $this->importPoFile($this->getPoFileWithSimplePlural(), array(
+    $this->importPoFile($this->getPoFileWithSimplePlural(), [
       'langcode' => 'fr',
-    ));
-    $this->importPoFile($this->getPoFileWithComplexPlural(), array(
+    ]);
+    $this->importPoFile($this->getPoFileWithComplexPlural(), [
       'langcode' => 'hr',
-    ));
+    ]);
 
     // Attempt to import some broken .po files as well to prove that these
     // will not overwrite the proper plural formula imported above.
-    $this->importPoFile($this->getPoFileWithMissingPlural(), array(
+    $this->importPoFile($this->getPoFileWithMissingPlural(), [
       'langcode' => 'fr',
       'overwrite_options[not_customized]' => TRUE,
-    ));
-    $this->importPoFile($this->getPoFileWithBrokenPlural(), array(
+    ]);
+    $this->importPoFile($this->getPoFileWithBrokenPlural(), [
       'langcode' => 'hr',
       'overwrite_options[not_customized]' => TRUE,
-    ));
+    ]);
 
     // Reset static caches from locale_get_plural() to ensure we get fresh data.
     drupal_static_reset('locale_get_plural');
@@ -67,49 +67,49 @@ class LocalePluralFormatTest extends WebTestBase {
     drupal_static_reset('locale');
 
     // Expected plural translation strings for each plural index.
-    $plural_strings = array(
+    $plural_strings = [
       // English is not imported in this case, so we assume built-in text
       // and formulas.
-      'en' => array(
+      'en' => [
         0 => '1 hour',
         1 => '@count hours',
-      ),
-      'fr' => array(
+      ],
+      'fr' => [
         0 => '@count heure',
         1 => '@count heures',
-      ),
-      'hr' => array(
+      ],
+      'hr' => [
         0 => '@count sat',
         1 => '@count sata',
         2 => '@count sati',
-      ),
+      ],
       // Hungarian is not imported, so it should assume the same text as
       // English, but it will always pick the plural form as per the built-in
       // logic, so only index -1 is relevant with the plural value.
-      'hu' => array(
+      'hu' => [
         0 => '1 hour',
         -1 => '@count hours',
-      ),
-    );
+      ],
+    ];
 
     // Expected plural indexes precomputed base on the plural formulas with
     // given $count value.
-    $plural_tests = array(
-      'en' => array(
+    $plural_tests = [
+      'en' => [
         1 => 0,
         0 => 1,
         5 => 1,
         123 => 1,
         235 => 1,
-      ),
-      'fr' => array(
+      ],
+      'fr' => [
         1 => 0,
         0 => 0,
         5 => 1,
         123 => 1,
         235 => 1,
-      ),
-      'hr' => array(
+      ],
+      'hr' => [
         1 => 0,
         21 => 0,
         0 => 2,
@@ -117,13 +117,13 @@ class LocalePluralFormatTest extends WebTestBase {
         8 => 2,
         123 => 1,
         235 => 2,
-      ),
-      'hu' => array(
+      ],
+      'hu' => [
         1 => -1,
         21 => -1,
         0 => -1,
-      ),
-    );
+      ],
+    ];
 
     foreach ($plural_tests as $langcode => $tests) {
       foreach ($tests as $count => $expected_plural_index) {
@@ -133,14 +133,14 @@ class LocalePluralFormatTest extends WebTestBase {
         // expected index as per the logic for translation lookups.
         $expected_plural_index = ($count == 1) ? 0 : $expected_plural_index;
         $expected_plural_string = str_replace('@count', $count, $plural_strings[$langcode][$expected_plural_index]);
-        $this->assertIdentical(\Drupal::translation()->formatPlural($count, '1 hour', '@count hours', array(), array('langcode' => $langcode))->render(), $expected_plural_string, 'Plural translation of 1 hours / @count hours for count ' . $count . ' in ' . $langcode . ' is ' . $expected_plural_string);
+        $this->assertIdentical(\Drupal::translation()->formatPlural($count, '1 hour', '@count hours', [], ['langcode' => $langcode])->render(), $expected_plural_string, 'Plural translation of 1 hours / @count hours for count ' . $count . ' in ' . $langcode . ' is ' . $expected_plural_string);
         // DO NOT use translation to pass translated strings into
         // PluralTranslatableMarkup::createFromTranslatedString() this way. It
         // is designed to be used with *already* translated text like settings
         // from configuration. We use PHP translation here just because we have
         // the expected result data in that format.
-        $translated_string = \Drupal::translation()->translate('1 hour' . PluralTranslatableMarkup::DELIMITER . '@count hours', array(), array('langcode' => $langcode));
-        $plural = PluralTranslatableMarkup::createFromTranslatedString($count, $translated_string, array(), array('langcode' => $langcode));
+        $translated_string = \Drupal::translation()->translate('1 hour' . PluralTranslatableMarkup::DELIMITER . '@count hours', [], ['langcode' => $langcode]);
+        $plural = PluralTranslatableMarkup::createFromTranslatedString($count, $translated_string, [], ['langcode' => $langcode]);
         $this->assertIdentical($plural->render(), $expected_plural_string);
       }
     }
@@ -153,9 +153,9 @@ class LocalePluralFormatTest extends WebTestBase {
 
     // Import some .po files with formulas to set up the environment.
     // These will also add the languages to the system.
-    $this->importPoFile($this->getPoFileWithSimplePlural(), array(
+    $this->importPoFile($this->getPoFileWithSimplePlural(), [
       'langcode' => 'fr',
-    ));
+    ]);
 
     // Set French as the site default language.
     $this->config('system.site')->set('default_langcode', 'fr')->save();
@@ -170,12 +170,12 @@ class LocalePluralFormatTest extends WebTestBase {
     $this->assertText("seconde", "'Member for' text is translated.");
 
     $path = 'admin/config/regional/translate/';
-    $search = array(
+    $search = [
       'langcode' => 'fr',
       // Limit to only translated strings to ensure that database ordering does
       // not break the test.
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm($path, $search, t('Filter'));
     // Plural values for the langcode fr.
     $this->assertText('@count seconde');
@@ -185,20 +185,20 @@ class LocalePluralFormatTest extends WebTestBase {
     // langcode here because the language will be English by default and will
     // not save our source string for performance optimization if we do not ask
     // specifically for a language.
-    \Drupal::translation()->formatPlural(1, '1 second', '@count seconds', array(), array('langcode' => 'fr'))->render();
-    $lid = db_query("SELECT lid FROM {locales_source} WHERE source = :source AND context = ''", array(':source' => "1 second" . LOCALE_PLURAL_DELIMITER . "@count seconds"))->fetchField();
+    \Drupal::translation()->formatPlural(1, '1 second', '@count seconds', [], ['langcode' => 'fr'])->render();
+    $lid = db_query("SELECT lid FROM {locales_source} WHERE source = :source AND context = ''", [':source' => "1 second" . LOCALE_PLURAL_DELIMITER . "@count seconds"])->fetchField();
     // Look up editing page for this plural string and check fields.
-    $search = array(
+    $search = [
       'string' => '1 second',
       'langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
 
     // Save complete translations for the string in langcode fr.
-    $edit = array(
+    $edit = [
       "strings[$lid][translations][0]" => '1 seconde updated',
       "strings[$lid][translations][1]" => '@count secondes updated',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save translations'));
 
     // User interface input for translating seconds should not be duplicated
@@ -218,17 +218,17 @@ class LocalePluralFormatTest extends WebTestBase {
   public function testPluralEditExport() {
     // Import some .po files with formulas to set up the environment.
     // These will also add the languages to the system.
-    $this->importPoFile($this->getPoFileWithSimplePlural(), array(
+    $this->importPoFile($this->getPoFileWithSimplePlural(), [
       'langcode' => 'fr',
-    ));
-    $this->importPoFile($this->getPoFileWithComplexPlural(), array(
+    ]);
+    $this->importPoFile($this->getPoFileWithComplexPlural(), [
       'langcode' => 'hr',
-    ));
+    ]);
 
     // Get the French translations.
-    $this->drupalPostForm('admin/config/regional/translate/export', array(
+    $this->drupalPostForm('admin/config/regional/translate/export', [
       'langcode' => 'fr',
-    ), t('Export'));
+    ], t('Export'));
     // Ensure we have a translation file.
     $this->assertRaw('# French translation of Drupal', 'Exported French translation file.');
     // Ensure our imported translations exist in the file.
@@ -237,9 +237,9 @@ class LocalePluralFormatTest extends WebTestBase {
     $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count heure\"\nmsgstr[1] \"@count heures\"", 'Plural translations exported properly.');
 
     // Get the Croatian translations.
-    $this->drupalPostForm('admin/config/regional/translate/export', array(
+    $this->drupalPostForm('admin/config/regional/translate/export', [
       'langcode' => 'hr',
-    ), t('Export'));
+    ], t('Export'));
     // Ensure we have a translation file.
     $this->assertRaw('# Croatian translation of Drupal', 'Exported Croatian translation file.');
     // Ensure our imported translations exist in the file.
@@ -254,9 +254,9 @@ class LocalePluralFormatTest extends WebTestBase {
 
     // Look up editing page for this plural string and check fields.
     $path = 'admin/config/regional/translate/';
-    $search = array(
+    $search = [
       'langcode' => 'hr',
-    );
+    ];
     $this->drupalPostForm($path, $search, t('Filter'));
     // Labels for plural editing elements.
     $this->assertText('Singular form');
@@ -270,15 +270,15 @@ class LocalePluralFormatTest extends WebTestBase {
     $this->assertText('@count sati');
 
     // Edit langcode hr translations and see if that took effect.
-    $lid = db_query("SELECT lid FROM {locales_source} WHERE source = :source AND context = ''", array(':source' => "1 hour" . LOCALE_PLURAL_DELIMITER . "@count hours"))->fetchField();
-    $edit = array(
+    $lid = db_query("SELECT lid FROM {locales_source} WHERE source = :source AND context = ''", [':source' => "1 hour" . LOCALE_PLURAL_DELIMITER . "@count hours"])->fetchField();
+    $edit = [
       "strings[$lid][translations][1]" => '@count sata edited',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save translations'));
 
-    $search = array(
+    $search = [
       'langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     // Plural values for the langcode fr.
     $this->assertText('@count heure');
@@ -286,57 +286,57 @@ class LocalePluralFormatTest extends WebTestBase {
     $this->assertNoText('2. plural form');
 
     // Edit langcode fr translations and see if that took effect.
-    $edit = array(
+    $edit = [
       "strings[$lid][translations][0]" => '@count heure edited',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save translations'));
 
     // Inject a plural source string to the database. We need to use a specific
     // langcode here because the language will be English by default and will
     // not save our source string for performance optimization if we do not ask
     // specifically for a language.
-    \Drupal::translation()->formatPlural(1, '1 day', '@count days', array(), array('langcode' => 'fr'))->render();
-    $lid = db_query("SELECT lid FROM {locales_source} WHERE source = :source AND context = ''", array(':source' => "1 day" . LOCALE_PLURAL_DELIMITER . "@count days"))->fetchField();
+    \Drupal::translation()->formatPlural(1, '1 day', '@count days', [], ['langcode' => 'fr'])->render();
+    $lid = db_query("SELECT lid FROM {locales_source} WHERE source = :source AND context = ''", [':source' => "1 day" . LOCALE_PLURAL_DELIMITER . "@count days"])->fetchField();
     // Look up editing page for this plural string and check fields.
-    $search = array(
+    $search = [
       'string' => '1 day',
       'langcode' => 'fr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
 
     // Save complete translations for the string in langcode fr.
-    $edit = array(
+    $edit = [
       "strings[$lid][translations][0]" => '1 jour',
       "strings[$lid][translations][1]" => '@count jours',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save translations'));
 
     // Save complete translations for the string in langcode hr.
-    $search = array(
+    $search = [
       'string' => '1 day',
       'langcode' => 'hr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
 
-    $edit = array(
+    $edit = [
       "strings[$lid][translations][0]" => '@count dan',
       "strings[$lid][translations][1]" => '@count dana',
       "strings[$lid][translations][2]" => '@count dana',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save translations'));
 
     // Get the French translations.
-    $this->drupalPostForm('admin/config/regional/translate/export', array(
+    $this->drupalPostForm('admin/config/regional/translate/export', [
       'langcode' => 'fr',
-    ), t('Export'));
+    ], t('Export'));
     // Check for plural export specifically.
     $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count heure edited\"\nmsgstr[1] \"@count heures\"", 'Edited French plural translations for hours exported properly.');
     $this->assertRaw("msgid \"1 day\"\nmsgid_plural \"@count days\"\nmsgstr[0] \"1 jour\"\nmsgstr[1] \"@count jours\"", 'Added French plural translations for days exported properly.');
 
     // Get the Croatian translations.
-    $this->drupalPostForm('admin/config/regional/translate/export', array(
+    $this->drupalPostForm('admin/config/regional/translate/export', [
       'langcode' => 'hr',
-    ), t('Export'));
+    ], t('Export'));
     // Check for plural export specifically.
     $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count sat\"\nmsgstr[1] \"@count sata edited\"\nmsgstr[2] \"@count sati\"", 'Edited Croatian plural translations exported properly.');
     $this->assertRaw("msgid \"1 day\"\nmsgid_plural \"@count days\"\nmsgstr[0] \"@count dan\"\nmsgstr[1] \"@count dana\"\nmsgstr[2] \"@count dana\"", 'Added Croatian plural translations exported properly.');
@@ -350,7 +350,7 @@ class LocalePluralFormatTest extends WebTestBase {
    * @param array $options
    *   Additional options to pass to the translation import form.
    */
-  public function importPoFile($contents, array $options = array()) {
+  public function importPoFile($contents, array $options = []) {
     $name = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
     file_put_contents($name, $contents);
     $options['files[file]'] = $name;
diff --git a/web/core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php b/web/core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php
index 5c642f2c2..a4b165665 100644
--- a/web/core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleTranslateStringTourTest.php
@@ -23,14 +23,14 @@ class LocaleTranslateStringTourTest extends TourTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale', 'tour');
+  public static $modules = ['locale', 'tour'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->adminUser = $this->drupalCreateUser(array('translate interface', 'access tour', 'administer languages'));
+    $this->adminUser = $this->drupalCreateUser(['translate interface', 'access tour', 'administer languages']);
     $this->drupalLogin($this->adminUser);
   }
 
@@ -39,7 +39,7 @@ class LocaleTranslateStringTourTest extends TourTestBase {
    */
   public function testTranslateStringTourTips() {
     // Add another language so there are no missing form items.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'es';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
diff --git a/web/core/modules/locale/src/Tests/LocaleTranslationUiTest.php b/web/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
index aad0119fa..53f77c19f 100644
--- a/web/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleTranslationUiTest.php
@@ -20,16 +20,16 @@ class LocaleTranslationUiTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale');
+  public static $modules = ['locale'];
 
   /**
    * Enable interface translation to English.
    */
   public function testEnglishTranslation() {
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     $this->drupalLogin($admin_user);
 
-    $this->drupalPostForm('admin/config/regional/language/edit/en', array('locale_translate_english' => TRUE), t('Save language'));
+    $this->drupalPostForm('admin/config/regional/language/edit/en', ['locale_translate_english' => TRUE], t('Save language'));
     $this->assertLinkByHref('/admin/config/regional/translate?langcode=en', 0, 'Enabled interface translation to English.');
   }
 
@@ -38,9 +38,9 @@ class LocaleTranslationUiTest extends WebTestBase {
    */
   public function testStringTranslation() {
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     // User to translate and delete string.
-    $translate_user = $this->drupalCreateUser(array('translate interface', 'access administration pages'));
+    $translate_user = $this->drupalCreateUser(['translate interface', 'access administration pages']);
     // Code for the language.
     $langcode = 'xx';
     // The English name for the language. This will be translated.
@@ -51,15 +51,15 @@ class LocaleTranslationUiTest extends WebTestBase {
 
     // Add custom language.
     $this->drupalLogin($admin_user);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     // Add string.
-    t($name, array(), array('langcode' => $langcode))->render();
+    t($name, [], ['langcode' => $langcode])->render();
     // Reset locale cache.
     $this->container->get('string_translation')->reset();
     $this->assertRaw('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
@@ -68,11 +68,11 @@ class LocaleTranslationUiTest extends WebTestBase {
 
     // Search for the name and translate it.
     $this->drupalLogin($translate_user);
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => $langcode,
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText($name, 'Search found the string as untranslated.');
 
@@ -81,7 +81,7 @@ class LocaleTranslationUiTest extends WebTestBase {
     $this->assertNoOption('edit-langcode', 'en', 'No way to translate the string to English.');
     $this->drupalLogout();
     $this->drupalLogin($admin_user);
-    $this->drupalPostForm('admin/config/regional/language/edit/en', array('locale_translate_english' => TRUE), t('Save language'));
+    $this->drupalPostForm('admin/config/regional/language/edit/en', ['locale_translate_english' => TRUE], t('Save language'));
     $this->drupalLogout();
     $this->drupalLogin($translate_user);
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
@@ -90,55 +90,55 @@ class LocaleTranslationUiTest extends WebTestBase {
     // Assume this is the only result, given the random name.
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $translation,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
     $this->assertText(t('The strings have been saved.'), 'The strings have been saved.');
     $url_bits = explode('?', $this->getUrl());
-    $this->assertEqual($url_bits[0], \Drupal::url('locale.translate_page', array(), array('absolute' => TRUE)), 'Correct page redirection.');
-    $search = array(
+    $this->assertEqual($url_bits[0], \Drupal::url('locale.translate_page', [], ['absolute' => TRUE]), 'Correct page redirection.');
+    $search = [
       'string' => $name,
       'langcode' => $langcode,
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertRaw($translation, 'Non-English translation properly saved.');
 
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => 'en',
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $translation_to_en,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => 'en',
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertRaw($translation_to_en, 'English translation properly saved.');
 
-    $this->assertTrue($name != $translation && t($name, array(), array('langcode' => $langcode)) == $translation, 't() works for non-English.');
+    $this->assertTrue($name != $translation && t($name, [], ['langcode' => $langcode]) == $translation, 't() works for non-English.');
     // Refresh the locale() cache to get fresh data from t() below. We are in
     // the same HTTP request and therefore t() is not refreshed by saving the
     // translation above.
     $this->container->get('string_translation')->reset();
     // Now we should get the proper fresh translation from t().
-    $this->assertTrue($name != $translation_to_en && t($name, array(), array('langcode' => 'en')) == $translation_to_en, 't() works for English.');
-    $this->assertTrue(t($name, array(), array('langcode' => LanguageInterface::LANGCODE_SYSTEM)) == $name, 't() works for LanguageInterface::LANGCODE_SYSTEM.');
+    $this->assertTrue($name != $translation_to_en && t($name, [], ['langcode' => 'en']) == $translation_to_en, 't() works for English.');
+    $this->assertTrue(t($name, [], ['langcode' => LanguageInterface::LANGCODE_SYSTEM]) == $name, 't() works for LanguageInterface::LANGCODE_SYSTEM.');
 
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => 'en',
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText(t('No strings available.'), 'String is translated.');
 
@@ -148,17 +148,17 @@ class LocaleTranslationUiTest extends WebTestBase {
     $this->assertText('Enter the password that accompanies your username.');
 
     $this->drupalLogin($translate_user);
-    $search = array(
+    $search = [
       'string' => 'accompanies your username',
       'langcode' => $langcode,
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => 'Please enter your Llama username.',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     $this->drupalLogout();
@@ -169,9 +169,9 @@ class LocaleTranslationUiTest extends WebTestBase {
     $this->drupalLogin($admin_user);
     $path = 'admin/config/regional/language/delete/' . $langcode;
     // This a confirm form, we do not need any fields changed.
-    $this->drupalPostForm($path, array(), t('Delete'));
+    $this->drupalPostForm($path, [], t('Delete'));
     // We need raw here because %language and %langcode will add HTML.
-    $t_args = array('%language' => $name, '%langcode' => $langcode);
+    $t_args = ['%language' => $name, '%langcode' => $langcode];
     $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The test language has been removed.');
     // Reload to remove $name.
     $this->drupalGet($path);
@@ -181,26 +181,26 @@ class LocaleTranslationUiTest extends WebTestBase {
 
     // Delete the string.
     $this->drupalLogin($translate_user);
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => 'en',
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     // Assume this is the only result, given the random name.
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => '',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
     $this->assertRaw($name, 'The strings have been saved.');
     $this->drupalLogin($translate_user);
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => 'en',
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertNoText(t('No strings available.'), 'The translation has been removed');
   }
@@ -210,7 +210,7 @@ class LocaleTranslationUiTest extends WebTestBase {
    * properly created and rebuilt on deletion.
    */
   public function testJavaScriptTranslation() {
-    $user = $this->drupalCreateUser(array('translate interface', 'administer languages', 'access administration pages'));
+    $user = $this->drupalCreateUser(['translate interface', 'administer languages', 'access administration pages']);
     $this->drupalLogin($user);
     $config = $this->config('locale.settings');
 
@@ -219,12 +219,12 @@ class LocaleTranslationUiTest extends WebTestBase {
     $name = $this->randomMachineName(16);
 
     // Add custom language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     $this->container->get('language_manager')->reset();
 
@@ -234,38 +234,38 @@ class LocaleTranslationUiTest extends WebTestBase {
     // {locales_source} table and translate it.
     $query = db_select('locales_source', 's');
     $query->addJoin('INNER', 'locales_location', 'l', 's.lid = l.lid');
-    $source = $query->fields('s', array('source'))
+    $source = $query->fields('s', ['source'])
       ->condition('l.type', 'javascript')
       ->range(0, 1)
       ->execute()
       ->fetchField();
 
-    $search = array(
+    $search = [
       'string' => $source,
       'langcode' => $langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
 
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     // Trigger JavaScript translation parsing and building.
     _locale_rebuild_js($langcode);
 
-    $locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: array();
+    $locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: [];
     $js_file = 'public://' . $config->get('javascript.directory') . '/' . $langcode . '_' . $locale_javascripts[$langcode] . '.js';
-    $this->assertTrue($result = file_exists($js_file), SafeMarkup::format('JavaScript file created: %file', array('%file' => $result ? $js_file : 'not found')));
+    $this->assertTrue($result = file_exists($js_file), SafeMarkup::format('JavaScript file created: %file', ['%file' => $result ? $js_file : 'not found']));
 
     // Test JavaScript translation rebuilding.
     file_unmanaged_delete($js_file);
-    $this->assertTrue($result = !file_exists($js_file), SafeMarkup::format('JavaScript file deleted: %file', array('%file' => $result ? $js_file : 'found')));
+    $this->assertTrue($result = !file_exists($js_file), SafeMarkup::format('JavaScript file deleted: %file', ['%file' => $result ? $js_file : 'found']));
     _locale_rebuild_js($langcode);
-    $this->assertTrue($result = file_exists($js_file), SafeMarkup::format('JavaScript file rebuilt: %file', array('%file' => $result ? $js_file : 'not found')));
+    $this->assertTrue($result = file_exists($js_file), SafeMarkup::format('JavaScript file rebuilt: %file', ['%file' => $result ? $js_file : 'not found']));
   }
 
   /**
@@ -273,7 +273,7 @@ class LocaleTranslationUiTest extends WebTestBase {
    */
   public function testStringValidation() {
     // User to add language and strings.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'translate interface'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'translate interface']);
     $this->drupalLogin($admin_user);
     $langcode = 'xx';
     // The English name for the language. This will be translated.
@@ -290,30 +290,30 @@ class LocaleTranslationUiTest extends WebTestBase {
     $bad_translations[$key] = "<BODY ONLOAD=alert('xss')>" . $key;
 
     // Add custom language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     // Add string.
-    t($name, array(), array('langcode' => $langcode))->render();
+    t($name, [], ['langcode' => $langcode])->render();
     // Reset locale cache.
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => $langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     // Find the edit path.
 
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
     foreach ($bad_translations as $translation) {
-      $edit = array(
+      $edit = [
         $lid => $translation,
-      );
+      ];
       $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
       // Check for a form error on the textarea.
       $form_class = $this->xpath('//form[@id="locale-translate-edit-form"]//textarea/@class');
@@ -327,9 +327,9 @@ class LocaleTranslationUiTest extends WebTestBase {
    */
   public function testStringSearch() {
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     // User to translate and delete string.
-    $translate_user = $this->drupalCreateUser(array('translate interface', 'access administration pages'));
+    $translate_user = $this->drupalCreateUser(['translate interface', 'access administration pages']);
 
     // Code for the language.
     $langcode = 'xx';
@@ -340,35 +340,35 @@ class LocaleTranslationUiTest extends WebTestBase {
 
     // Add custom language.
     $this->drupalLogin($admin_user);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
 
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => 'yy',
       'label' => $this->randomMachineName(16),
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
 
     // Add string.
-    t($name, array(), array('langcode' => $langcode))->render();
+    t($name, [], ['langcode' => $langcode])->render();
     // Reset locale cache.
     $this->container->get('string_translation')->reset();
     $this->drupalLogout();
 
     // Search for the name.
     $this->drupalLogin($translate_user);
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => $langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     // assertText() seems to remove the input field where $name always could be
     // found, so this is not a false assert. See how assertNoText succeeds
@@ -377,21 +377,21 @@ class LocaleTranslationUiTest extends WebTestBase {
 
     // Ensure untranslated string doesn't appear if searching on 'only
     // translated strings'.
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => $langcode,
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText(t('No strings available.'), "Search didn't find the string.");
 
     // Ensure untranslated string appears if searching on 'only untranslated
     // strings'.
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => $langcode,
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertNoText(t('No strings available.'), 'Search found the string.');
 
@@ -400,66 +400,66 @@ class LocaleTranslationUiTest extends WebTestBase {
     // We save the lid from the path.
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $translation,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     // Ensure translated string does appear if searching on 'only
     // translated strings'.
-    $search = array(
+    $search = [
       'string' => $translation,
       'langcode' => $langcode,
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertNoText(t('No strings available.'), 'Search found the translation.');
 
     // Ensure translated source string doesn't appear if searching on 'only
     // untranslated strings'.
-    $search = array(
+    $search = [
       'string' => $name,
       'langcode' => $langcode,
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText(t('No strings available.'), "Search didn't find the source string.");
 
     // Ensure translated string doesn't appear if searching on 'only
     // untranslated strings'.
-    $search = array(
+    $search = [
       'string' => $translation,
       'langcode' => $langcode,
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText(t('No strings available.'), "Search didn't find the translation.");
 
     // Ensure translated string does appear if searching on the custom language.
-    $search = array(
+    $search = [
       'string' => $translation,
       'langcode' => $langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertNoText(t('No strings available.'), 'Search found the translation.');
 
     // Ensure translated string doesn't appear if searching in System (English).
-    $search = array(
+    $search = [
       'string' => $translation,
       'langcode' => 'yy',
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText(t('No strings available.'), "Search didn't find the translation.");
 
     // Search for a string that isn't in the system.
     $unavailable_string = $this->randomMachineName(16);
-    $search = array(
+    $search = [
       'string' => $unavailable_string,
       'langcode' => $langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText(t('No strings available.'), "Search didn't find the invalid string.");
   }
@@ -468,35 +468,35 @@ class LocaleTranslationUiTest extends WebTestBase {
    * Tests that only changed strings are saved customized when edited.
    */
   public function testUICustomizedStrings() {
-    $user = $this->drupalCreateUser(array('translate interface', 'administer languages', 'access administration pages'));
+    $user = $this->drupalCreateUser(['translate interface', 'administer languages', 'access administration pages']);
     $this->drupalLogin($user);
     ConfigurableLanguage::createFromLangcode('de')->save();
 
     // Create test source string.
-    $string = $this->container->get('locale.storage')->createString(array(
+    $string = $this->container->get('locale.storage')->createString([
       'source' => $this->randomMachineName(100),
       'context' => $this->randomMachineName(20),
-    ))->save();
+    ])->save();
 
     // Create translation for new string and save it as non-customized.
-    $translation = $this->container->get('locale.storage')->createTranslation(array(
+    $translation = $this->container->get('locale.storage')->createTranslation([
       'lid' => $string->lid,
       'language' => 'de',
       'translation' => $this->randomMachineName(100),
       'customized' => 0,
-    ))->save();
+    ])->save();
 
     // Reset locale cache.
     $this->container->get('string_translation')->reset();
 
     // Ensure non-customized translation string does appear if searching
     // non-customized translation.
-    $search = array(
+    $search = [
       'string' => $string->getString(),
       'langcode' => 'de',
       'translation' => 'translated',
       'customized' => '0',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
 
     $this->assertText($translation->getString(), 'Translation is found in search result.');
@@ -504,38 +504,38 @@ class LocaleTranslationUiTest extends WebTestBase {
     // Submit the translations without changing the translation.
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $translation->getString(),
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     // Ensure unchanged translation string does appear if searching
     // non-customized translation.
-    $search = array(
+    $search = [
       'string' => $string->getString(),
       'langcode' => 'de',
       'translation' => 'translated',
       'customized' => '0',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText($string->getString(), 'Translation is not marked as customized.');
 
     // Submit the translations with a new translation.
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $this->randomMachineName(100),
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     // Ensure changed translation string does appear if searching customized
     // translation.
-    $search = array(
+    $search = [
       'string' => $string->getString(),
       'langcode' => 'de',
       'translation' => 'translated',
       'customized' => '1',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText($string->getString(), "Translation is marked as customized.");
   }
diff --git a/web/core/modules/locale/src/Tests/LocaleUpdateBase.php b/web/core/modules/locale/src/Tests/LocaleUpdateBase.php
index 85196ad7c..b228a962d 100644
--- a/web/core/modules/locale/src/Tests/LocaleUpdateBase.php
+++ b/web/core/modules/locale/src/Tests/LocaleUpdateBase.php
@@ -45,7 +45,7 @@ abstract class LocaleUpdateBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale', 'locale_test');
+  public static $modules = ['locale', 'locale_test'];
 
   /**
    * {@inheritdoc}
@@ -85,10 +85,10 @@ abstract class LocaleUpdateBase extends WebTestBase {
    *   The language code of the language to add.
    */
   protected function addLanguage($langcode) {
-    $edit = array('predefined_langcode' => $langcode);
+    $edit = ['predefined_langcode' => $langcode];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
     $this->container->get('language_manager')->reset();
-    $this->assertTrue(\Drupal::languageManager()->getLanguage($langcode), SafeMarkup::format('Language %langcode added.', array('%langcode' => $langcode)));
+    $this->assertTrue(\Drupal::languageManager()->getLanguage($langcode), SafeMarkup::format('Language %langcode added.', ['%langcode' => $langcode]));
   }
 
   /**
@@ -105,7 +105,7 @@ abstract class LocaleUpdateBase extends WebTestBase {
    *   singular strings are supported, no plurals. No double quotes are allowed
    *   in source and translations strings.
    */
-  protected function makePoFile($path, $filename, $timestamp = NULL, array $translations = array()) {
+  protected function makePoFile($path, $filename, $timestamp = NULL, array $translations = []) {
     $timestamp = $timestamp ? $timestamp : REQUEST_TIME;
     $path = 'public://' . $path;
     $text = '';
@@ -184,9 +184,9 @@ EOF;
     $config->set('translation.default_filename', '%project-%version.%language._po')->save();
 
     // Setting up sets of translations for the translation files.
-    $translations_one = array('January' => 'Januar_1', 'February' => 'Februar_1', 'March' => 'Marz_1');
-    $translations_two = array('February' => 'Februar_2', 'March' => 'Marz_2', 'April' => 'April_2');
-    $translations_three = array('April' => 'April_3', 'May' => 'Mai_3', 'June' => 'Juni_3');
+    $translations_one = ['January' => 'Januar_1', 'February' => 'Februar_1', 'March' => 'Marz_1'];
+    $translations_two = ['February' => 'Februar_2', 'March' => 'Marz_2', 'April' => 'April_2'];
+    $translations_three = ['April' => 'April_3', 'May' => 'Mai_3', 'June' => 'Juni_3'];
 
     // Add a number of files to the local file system to serve as remote
     // translation server and match the project definitions set in
@@ -212,71 +212,71 @@ EOF;
     // Add non customized translations to the database.
     $langcode = 'de';
     $context = '';
-    $non_customized_translations = array(
+    $non_customized_translations = [
       'March' => 'Marz',
       'June' => 'Juni',
-    );
+    ];
     foreach ($non_customized_translations as $source => $translation) {
-      $string = $this->container->get('locale.storage')->createString(array(
+      $string = $this->container->get('locale.storage')->createString([
         'source' => $source,
         'context' => $context,
-      ))
+      ])
         ->save();
-      $this->container->get('locale.storage')->createTranslation(array(
+      $this->container->get('locale.storage')->createTranslation([
         'lid' => $string->getId(),
         'language' => $langcode,
         'translation' => $translation,
         'customized' => LOCALE_NOT_CUSTOMIZED,
-      ))->save();
+      ])->save();
     }
 
     // Add customized translations to the database.
-    $customized_translations = array(
+    $customized_translations = [
       'January' => 'Januar_customized',
       'February' => 'Februar_customized',
       'May' => 'Mai_customized',
-    );
+    ];
     foreach ($customized_translations as $source => $translation) {
-      $string = $this->container->get('locale.storage')->createString(array(
+      $string = $this->container->get('locale.storage')->createString([
         'source' => $source,
         'context' => $context,
-      ))
+      ])
         ->save();
-      $this->container->get('locale.storage')->createTranslation(array(
+      $this->container->get('locale.storage')->createTranslation([
         'lid' => $string->getId(),
         'language' => $langcode,
         'translation' => $translation,
         'customized' => LOCALE_CUSTOMIZED,
-      ))->save();
+      ])->save();
     }
 
     // Add a state of current translations in locale_files.
-    $default = array(
+    $default = [
       'langcode' => $langcode,
       'uri' => '',
       'timestamp' => $this->timestampMedium,
       'last_checked' => $this->timestampMedium,
-    );
-    $data[] = array(
+    ];
+    $data[] = [
       'project' => 'contrib_module_one',
       'filename' => 'contrib_module_one-8.x-1.1.de._po',
       'version' => '8.x-1.1',
-    );
-    $data[] = array(
+    ];
+    $data[] = [
       'project' => 'contrib_module_two',
       'filename' => 'contrib_module_two-8.x-2.0-beta4.de._po',
       'version' => '8.x-2.0-beta4',
-    );
-    $data[] = array(
+    ];
+    $data[] = [
       'project' => 'contrib_module_three',
       'filename' => 'contrib_module_three-8.x-1.0.de._po',
       'version' => '8.x-1.0',
-    );
-    $data[] = array(
+    ];
+    $data[] = [
       'project' => 'custom_module_one',
       'filename' => 'custom_module_one.de.po',
       'version' => '',
-    );
+    ];
     foreach ($data as $file) {
       $file = array_merge($default, $file);
       db_insert('locale_file')->fields($file)->execute();
@@ -297,9 +297,9 @@ EOF;
    *   (optional) A message to display with the assertion.
    */
   protected function assertTranslation($source, $translation, $langcode, $message = '') {
-    $db_translation = db_query('SELECT translation FROM {locales_target} lt INNER JOIN {locales_source} ls ON ls.lid = lt.lid WHERE ls.source = :source AND lt.language = :langcode', array(':source' => $source, ':langcode' => $langcode))->fetchField();
+    $db_translation = db_query('SELECT translation FROM {locales_target} lt INNER JOIN {locales_source} ls ON ls.lid = lt.lid WHERE ls.source = :source AND lt.language = :langcode', [':source' => $source, ':langcode' => $langcode])->fetchField();
     $db_translation = $db_translation == FALSE ? '' : $db_translation;
-    $this->assertEqual($translation, $db_translation, $message ? $message : format_string('Correct translation of %source (%language)', array('%source' => $source, '%language' => $langcode)));
+    $this->assertEqual($translation, $db_translation, $message ? $message : format_string('Correct translation of %source (%language)', ['%source' => $source, '%language' => $langcode]));
   }
 
 }
diff --git a/web/core/modules/locale/src/Tests/LocaleUpdateCronTest.php b/web/core/modules/locale/src/Tests/LocaleUpdateCronTest.php
index 569b818bd..78a14ecac 100644
--- a/web/core/modules/locale/src/Tests/LocaleUpdateCronTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleUpdateCronTest.php
@@ -9,14 +9,14 @@ namespace Drupal\locale\Tests;
  */
 class LocaleUpdateCronTest extends LocaleUpdateBase {
 
-  protected $batchOutput = array();
+  protected $batchOutput = [];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface'));
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface']);
     $this->drupalLogin($admin_user);
     $this->addLanguage('de');
   }
@@ -35,7 +35,7 @@ class LocaleUpdateCronTest extends LocaleUpdateBase {
 
     // Update translations using batch to ensure a clean test starting point.
     $this->drupalGet('admin/reports/translations/check');
-    $this->drupalPostForm('admin/reports/translations', array(), t('Update translations'));
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
 
     // Store translation status for comparison.
     $initial_history = locale_translation_get_file_history();
@@ -48,16 +48,16 @@ class LocaleUpdateCronTest extends LocaleUpdateBase {
     // Prepare for test: Simulate that the file has not been checked for a long
     // time. Set the last_check timestamp to zero.
     $query = db_update('locale_file');
-    $query->fields(array('last_checked' => 0));
+    $query->fields(['last_checked' => 0]);
     $query->condition('project', 'contrib_module_two');
     $query->condition('langcode', 'de');
     $query->execute();
 
     // Test: Disable cron update and verify that no tasks are added to the
     // queue.
-    $edit = array(
+    $edit = [
       'update_interval_days' => 0,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
 
     // Execute locale cron tasks to add tasks to the queue.
@@ -70,9 +70,9 @@ class LocaleUpdateCronTest extends LocaleUpdateBase {
     // Test: Enable cron update and check if update tasks are added to the
     // queue.
     // Set cron update to Weekly.
-    $edit = array(
+    $edit = [
       'update_interval_days' => 7,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
 
     // Execute locale cron tasks to add tasks to the queue.
diff --git a/web/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php b/web/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php
index cfd2446fc..3d7970bb9 100644
--- a/web/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php
@@ -11,14 +11,14 @@ use Drupal\simpletest\WebTestBase;
  */
 class LocaleUpdateDevelopmentReleaseTest extends WebTestBase {
 
-  public static $modules = array('locale', 'locale_test_development_release');
+  public static $modules = ['locale', 'locale_test_development_release'];
 
   protected function setUp() {
     parent::setUp();
     module_load_include('compare.inc', 'locale');
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer languages', 'access administration pages', 'translate interface'));
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer languages', 'access administration pages', 'translate interface']);
     $this->drupalLogin($admin_user);
-    $this->drupalPostForm('admin/config/regional/language/add', array('predefined_langcode' => 'hu'), t('Add language'));
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'hu'], t('Add language'));
   }
 
   public function testLocaleUpdateDevelopmentRelease() {
diff --git a/web/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php b/web/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
index 6337b324f..32928b1d8 100644
--- a/web/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleUpdateInterfaceTest.php
@@ -17,14 +17,14 @@ class LocaleUpdateInterfaceTest extends LocaleUpdateBase {
    *
    * @var array
    */
-  public static $modules = array('locale_test_translate');
+  public static $modules = ['locale_test_translate'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface'));
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface']);
     $this->drupalLogin($admin_user);
   }
 
@@ -41,7 +41,7 @@ class LocaleUpdateInterfaceTest extends LocaleUpdateBase {
     $this->assertNoText(t('Translation update status'), 'No status message');
 
     $this->drupalGet('admin/reports/translations');
-    $this->assertRaw(t('No translatable languages available. <a href=":add_language">Add a language</a> first.', array(':add_language' => \Drupal::url('entity.configurable_language.collection'))), 'Language message');
+    $this->assertRaw(t('No translatable languages available. <a href=":add_language">Add a language</a> first.', [':add_language' => \Drupal::url('entity.configurable_language.collection')]), 'Language message');
 
     // Add German language.
     $this->addLanguage('de');
@@ -49,7 +49,7 @@ class LocaleUpdateInterfaceTest extends LocaleUpdateBase {
     // Override Drupal core translation status as 'up-to-date'.
     $status = locale_translation_get_status();
     $status['drupal']['de']->type = 'current';
-    \Drupal::state()->set('locale.translation_status', $status);
+    \Drupal::keyValue('locale.translation_status')->set('drupal', $status['drupal']);
 
     // One language added, all translations up to date.
     $this->drupalGet('admin/reports/status');
@@ -61,32 +61,32 @@ class LocaleUpdateInterfaceTest extends LocaleUpdateBase {
     // Set locale_test_translate module to have a local translation available.
     $status = locale_translation_get_status();
     $status['locale_test_translate']['de']->type = 'local';
-    \Drupal::state()->set('locale.translation_status', $status);
+    \Drupal::keyValue('locale.translation_status')->set('locale_test_translate', $status['locale_test_translate']);
 
     // Check if updates are available for German.
     $this->drupalGet('admin/reports/status');
     $this->assertText(t('Translation update status'), 'Status message');
-    $this->assertRaw(t('Updates available for: @languages. See the <a href=":updates">Available translation updates</a> page for more information.', array('@languages' => t('German'), ':updates' => \Drupal::url('locale.translate_status'))), 'Updates available message');
+    $this->assertRaw(t('Updates available for: @languages. See the <a href=":updates">Available translation updates</a> page for more information.', ['@languages' => t('German'), ':updates' => \Drupal::url('locale.translate_status')]), 'Updates available message');
     $this->drupalGet('admin/reports/translations');
-    $this->assertText(t('Updates for: @modules', array('@modules' => 'Locale test translate')), 'Translations available');
+    $this->assertText(t('Updates for: @modules', ['@modules' => 'Locale test translate']), 'Translations available');
 
     // Set locale_test_translate module to have a dev release and no
     // translation found.
     $status = locale_translation_get_status();
     $status['locale_test_translate']['de']->version = '1.3-dev';
     $status['locale_test_translate']['de']->type = '';
-    \Drupal::state()->set('locale.translation_status', $status);
+    \Drupal::keyValue('locale.translation_status')->set('locale_test_translate', $status['locale_test_translate']);
 
     // Check if no updates were found.
     $this->drupalGet('admin/reports/status');
     $this->assertText(t('Translation update status'), 'Status message');
-    $this->assertRaw(t('Missing translations for: @languages. See the <a href=":updates">Available translation updates</a> page for more information.', array('@languages' => t('German'), ':updates' => \Drupal::url('locale.translate_status'))), 'Missing translations message');
+    $this->assertRaw(t('Missing translations for: @languages. See the <a href=":updates">Available translation updates</a> page for more information.', ['@languages' => t('German'), ':updates' => \Drupal::url('locale.translate_status')]), 'Missing translations message');
     $this->drupalGet('admin/reports/translations');
     $this->assertText(t('Missing translations for one project'), 'No translations found');
     $release_details = new FormattableMarkup('@module (@version). @info', [
       '@module' => 'Locale test translate',
       '@version' => '1.3-dev',
-      '@info' => t('File not found at %local_path', array('%local_path' => 'core/modules/locale/tests/test.de.po'))
+      '@info' => t('File not found at %local_path', ['%local_path' => 'core/modules/locale/tests/test.de.po'])
     ]);
     $this->assertRaw($release_details->__toString(), 'Release details');
 
@@ -95,24 +95,24 @@ class LocaleUpdateInterfaceTest extends LocaleUpdateBase {
     $status['drupal']['de']->type = '';
     $status['drupal']['de']->timestamp = 0;
     $status['drupal']['de']->version = '8.1.1';
-    \Drupal::state()->set('locale.translation_status', $status);
+    \Drupal::keyValue('locale.translation_status')->set('drupal', $status['drupal']);
 
     // Check if Drupal core is not translated.
     $this->drupalGet('admin/reports/translations');
     $this->assertText(t('Missing translations for 2 projects'), 'No translations found');
-    $this->assertText(t('@module (@version).', array('@module' => t('Drupal core'), '@version' => '8.1.1')), 'Release details');
+    $this->assertText(t('@module (@version).', ['@module' => t('Drupal core'), '@version' => '8.1.1']), 'Release details');
 
     // Override Drupal core translation status as 'translations available'.
     $status = locale_translation_get_status();
     $status['drupal']['de']->type = 'local';
     $status['drupal']['de']->files['local']->timestamp = REQUEST_TIME;
     $status['drupal']['de']->files['local']->info['version'] = '8.1.1';
-    \Drupal::state()->set('locale.translation_status', $status);
+    \Drupal::keyValue('locale.translation_status')->set('drupal', $status['drupal']);
 
     // Check if translations are available for Drupal core.
     $this->drupalGet('admin/reports/translations');
-    $this->assertText(t('Updates for: @project', array('@project' => t('Drupal core'))), 'Translations found');
-    $this->assertText(SafeMarkup::format('@module (@date)', array('@module' => t('Drupal core'), '@date' => format_date(REQUEST_TIME, 'html_date'))), 'Core translation update');
+    $this->assertText(t('Updates for: @project', ['@project' => t('Drupal core')]), 'Translations found');
+    $this->assertText(SafeMarkup::format('@module (@date)', ['@module' => t('Drupal core'), '@date' => format_date(REQUEST_TIME, 'html_date')]), 'Core translation update');
     $update_button = $this->xpath('//input[@type="submit"][@value="' . t('Update translations') . '"]');
     $this->assertTrue($update_button, 'Update translations button');
   }
diff --git a/web/core/modules/locale/src/Tests/LocaleUpdateTest.php b/web/core/modules/locale/src/Tests/LocaleUpdateTest.php
index 05cda3619..957419b72 100644
--- a/web/core/modules/locale/src/Tests/LocaleUpdateTest.php
+++ b/web/core/modules/locale/src/Tests/LocaleUpdateTest.php
@@ -18,7 +18,7 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     parent::setUp();
     module_load_include('compare.inc', 'locale');
     module_load_include('fetch.inc', 'locale');
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface'));
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface']);
     $this->drupalLogin($admin_user);
     // We use German as test language. This language must match the translation
     // file that come with the locale_test module (test.de.po) and can therefore
@@ -42,7 +42,7 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $projects = locale_translation_project_list();
     $this->assertFalse(isset($projects['locale_test_translate']), 'Hidden module not found');
     $this->assertEqual($projects['locale_test']['info']['interface translation server pattern'], 'core/modules/locale/test/test.%language.po', 'Interface translation parameter found in project info.');
-    $this->assertEqual($projects['locale_test']['name'], 'locale_test', format_string('%key found in project info.', array('%key' => 'interface translation project')));
+    $this->assertEqual($projects['locale_test']['name'], 'locale_test', format_string('%key found in project info.', ['%key' => 'interface translation project']));
   }
 
   /**
@@ -74,9 +74,9 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $config->set('translation.default_filename', '%project-%version.%language._po')->save();
 
     // Set the test conditions.
-    $edit = array(
+    $edit = [
       'use_source' => LOCALE_TRANSLATION_USE_SOURCE_LOCAL,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
 
     // Get status of translation sources at local file system.
@@ -90,9 +90,9 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $this->assertEqual($result['custom_module_one']['de']->type, LOCALE_TRANSLATION_LOCAL, 'Translation of custom_module_one found');
 
     // Set the test conditions.
-    $edit = array(
+    $edit = [
       'use_source' => LOCALE_TRANSLATION_USE_SOURCE_REMOTE_AND_LOCAL,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
 
     // Get status of translation sources at both local and remote locations.
@@ -124,10 +124,10 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $config->set('translation.default_filename', '%project-%version.%language._po');
 
     // Set the update conditions for this test.
-    $edit = array(
+    $edit = [
       'use_source' => LOCALE_TRANSLATION_USE_SOURCE_REMOTE_AND_LOCAL,
       'overwrite' => LOCALE_TRANSLATION_OVERWRITE_ALL,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
 
     // Get the translation status.
@@ -140,7 +140,7 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $this->assertText('Contributed module two (' . format_date($this->timestampNew, 'html_date') . ')', 'Updates for Contrib module two');
 
     // Execute the translation update.
-    $this->drupalPostForm('admin/reports/translations', array(), t('Update translations'));
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
 
     // Check if the translation has been updated, using the status cache.
     $status = locale_translation_get_status();
@@ -161,13 +161,13 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $this->assertEqual($history['contrib_module_three']['de']->last_checked, $this->timestampMedium, 'Translation of contrib_module_three is not updated');
 
     // Check whether existing translations have (not) been overwritten.
-    $this->assertEqual(t('January', array(), array('langcode' => 'de')), 'Januar_1', 'Translation of January');
-    $this->assertEqual(t('February', array(), array('langcode' => 'de')), 'Februar_2', 'Translation of February');
-    $this->assertEqual(t('March', array(), array('langcode' => 'de')), 'Marz_2', 'Translation of March');
-    $this->assertEqual(t('April', array(), array('langcode' => 'de')), 'April_2', 'Translation of April');
-    $this->assertEqual(t('May', array(), array('langcode' => 'de')), 'Mai_customized', 'Translation of May');
-    $this->assertEqual(t('June', array(), array('langcode' => 'de')), 'Juni', 'Translation of June');
-    $this->assertEqual(t('Monday', array(), array('langcode' => 'de')), 'Montag', 'Translation of Monday');
+    $this->assertEqual(t('January', [], ['langcode' => 'de']), 'Januar_1', 'Translation of January');
+    $this->assertEqual(t('February', [], ['langcode' => 'de']), 'Februar_2', 'Translation of February');
+    $this->assertEqual(t('March', [], ['langcode' => 'de']), 'Marz_2', 'Translation of March');
+    $this->assertEqual(t('April', [], ['langcode' => 'de']), 'April_2', 'Translation of April');
+    $this->assertEqual(t('May', [], ['langcode' => 'de']), 'Mai_customized', 'Translation of May');
+    $this->assertEqual(t('June', [], ['langcode' => 'de']), 'Juni', 'Translation of June');
+    $this->assertEqual(t('Monday', [], ['langcode' => 'de']), 'Montag', 'Translation of Monday');
   }
 
   /**
@@ -186,15 +186,15 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $config->set('translation.default_filename', '%project-%version.%language._po');
 
     // Set the update conditions for this test.
-    $edit = array(
+    $edit = [
       'use_source' => LOCALE_TRANSLATION_USE_SOURCE_LOCAL,
       'overwrite' => LOCALE_TRANSLATION_OVERWRITE_ALL,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
 
     // Execute the translation update.
     $this->drupalGet('admin/reports/translations/check');
-    $this->drupalPostForm('admin/reports/translations', array(), t('Update translations'));
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
 
     // Check if the translation has been updated, using the status cache.
     $status = locale_translation_get_status();
@@ -215,13 +215,13 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $this->assertEqual($history['contrib_module_three']['de']->last_checked, $this->timestampMedium, 'Translation of contrib_module_three is not updated');
 
     // Check whether existing translations have (not) been overwritten.
-    $this->assertEqual(t('January', array(), array('langcode' => 'de')), 'Januar_customized', 'Translation of January');
-    $this->assertEqual(t('February', array(), array('langcode' => 'de')), 'Februar_2', 'Translation of February');
-    $this->assertEqual(t('March', array(), array('langcode' => 'de')), 'Marz_2', 'Translation of March');
-    $this->assertEqual(t('April', array(), array('langcode' => 'de')), 'April_2', 'Translation of April');
-    $this->assertEqual(t('May', array(), array('langcode' => 'de')), 'Mai_customized', 'Translation of May');
-    $this->assertEqual(t('June', array(), array('langcode' => 'de')), 'Juni', 'Translation of June');
-    $this->assertEqual(t('Monday', array(), array('langcode' => 'de')), 'Montag', 'Translation of Monday');
+    $this->assertEqual(t('January', [], ['langcode' => 'de']), 'Januar_customized', 'Translation of January');
+    $this->assertEqual(t('February', [], ['langcode' => 'de']), 'Februar_2', 'Translation of February');
+    $this->assertEqual(t('March', [], ['langcode' => 'de']), 'Marz_2', 'Translation of March');
+    $this->assertEqual(t('April', [], ['langcode' => 'de']), 'April_2', 'Translation of April');
+    $this->assertEqual(t('May', [], ['langcode' => 'de']), 'Mai_customized', 'Translation of May');
+    $this->assertEqual(t('June', [], ['langcode' => 'de']), 'Juni', 'Translation of June');
+    $this->assertEqual(t('Monday', [], ['langcode' => 'de']), 'Montag', 'Translation of Monday');
   }
 
   /**
@@ -240,24 +240,24 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $config->set('translation.default_filename', '%project-%version.%language._po');
 
     // Set the test conditions.
-    $edit = array(
+    $edit = [
       'use_source' => LOCALE_TRANSLATION_USE_SOURCE_REMOTE_AND_LOCAL,
       'overwrite' => LOCALE_TRANSLATION_OVERWRITE_NON_CUSTOMIZED,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
 
     // Execute translation update.
     $this->drupalGet('admin/reports/translations/check');
-    $this->drupalPostForm('admin/reports/translations', array(), t('Update translations'));
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
 
     // Check whether existing translations have (not) been overwritten.
-    $this->assertEqual(t('January', array(), array('langcode' => 'de')), 'Januar_customized', 'Translation of January');
-    $this->assertEqual(t('February', array(), array('langcode' => 'de')), 'Februar_customized', 'Translation of February');
-    $this->assertEqual(t('March', array(), array('langcode' => 'de')), 'Marz_2', 'Translation of March');
-    $this->assertEqual(t('April', array(), array('langcode' => 'de')), 'April_2', 'Translation of April');
-    $this->assertEqual(t('May', array(), array('langcode' => 'de')), 'Mai_customized', 'Translation of May');
-    $this->assertEqual(t('June', array(), array('langcode' => 'de')), 'Juni', 'Translation of June');
-    $this->assertEqual(t('Monday', array(), array('langcode' => 'de')), 'Montag', 'Translation of Monday');
+    $this->assertEqual(t('January', [], ['langcode' => 'de']), 'Januar_customized', 'Translation of January');
+    $this->assertEqual(t('February', [], ['langcode' => 'de']), 'Februar_customized', 'Translation of February');
+    $this->assertEqual(t('March', [], ['langcode' => 'de']), 'Marz_2', 'Translation of March');
+    $this->assertEqual(t('April', [], ['langcode' => 'de']), 'April_2', 'Translation of April');
+    $this->assertEqual(t('May', [], ['langcode' => 'de']), 'Mai_customized', 'Translation of May');
+    $this->assertEqual(t('June', [], ['langcode' => 'de']), 'Juni', 'Translation of June');
+    $this->assertEqual(t('Monday', [], ['langcode' => 'de']), 'Montag', 'Translation of Monday');
   }
 
   /**
@@ -276,15 +276,15 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $config->set('translation.default_filename', '%project-%version.%language._po');
 
     // Set the test conditions.
-    $edit = array(
+    $edit = [
       'use_source' => LOCALE_TRANSLATION_USE_SOURCE_REMOTE_AND_LOCAL,
       'overwrite' => LOCALE_TRANSLATION_OVERWRITE_NONE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate/settings', $edit, t('Save configuration'));
 
     // Execute translation update.
     $this->drupalGet('admin/reports/translations/check');
-    $this->drupalPostForm('admin/reports/translations', array(), t('Update translations'));
+    $this->drupalPostForm('admin/reports/translations', [], t('Update translations'));
 
     // Check whether existing translations have (not) been overwritten.
     $this->assertTranslation('January', 'Januar_customized', 'de');
@@ -307,21 +307,21 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $this->assertTranslation('Tuesday', '', 'de');
 
     // Enable a module.
-    $edit = array(
-      'modules[Testing][locale_test_translate][enable]' => 'locale_test_translate',
-    );
+    $edit = [
+      'modules[locale_test_translate][enable]' => 'locale_test_translate',
+    ];
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Check if translations have been imported.
     $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
-      array('%number' => 7, '%update' => 0, '%delete' => 0)), 'One translation file imported.');
+      ['%number' => 7, '%update' => 0, '%delete' => 0]), 'One translation file imported.');
     $this->assertTranslation('Tuesday', 'Dienstag', 'de');
 
-    $edit = array(
+    $edit = [
       'uninstall[locale_test_translate]' => 1,
-    );
+    ];
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
-    $this->drupalPostForm(NULL, array(), t('Uninstall'));
+    $this->drupalPostForm(NULL, [], t('Uninstall'));
 
     // Check if the file data is removed from the database.
     $history = locale_translation_get_file_history();
@@ -342,9 +342,9 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     \Drupal::state()->set('locale.test_system_info_alter', TRUE);
 
     // Enable a module.
-    $edit = array(
-      'modules[Testing][locale_test_translate][enable]' => 'locale_test_translate',
-    );
+    $edit = [
+      'modules[locale_test_translate][enable]' => 'locale_test_translate',
+    ];
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Check if there is no Dutch translation yet.
@@ -352,14 +352,14 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $this->assertTranslation('Tuesday', 'Dienstag', 'de');
 
     // Add a language.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'nl',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Check if the right number of translations are added.
     $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
-      array('%number' => 8, '%update' => 0, '%delete' => 0)), 'One language added.');
+      ['%number' => 8, '%update' => 0, '%delete' => 0]), 'One language added.');
     $this->assertTranslation('Extraday', 'extra dag', 'nl');
 
     // Check if the language data is added to the database.
@@ -367,7 +367,7 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $this->assertTrue($result, 'Files added to file history');
 
     // Remove a language.
-    $this->drupalPostForm('admin/config/regional/language/delete/nl', array(), t('Delete'));
+    $this->drupalPostForm('admin/config/regional/language/delete/nl', [], t('Delete'));
 
     // Check if the language data is removed from the database.
     $result = db_query("SELECT project FROM {locale_file} WHERE langcode='nl'")->fetchField();
@@ -386,21 +386,21 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     \Drupal::state()->set('locale.test_system_info_alter', TRUE);
 
     // Enable a module.
-    $edit = array(
-      'modules[Testing][locale_test_translate][enable]' => 'locale_test_translate',
-    );
+    $edit = [
+      'modules[locale_test_translate][enable]' => 'locale_test_translate',
+    ];
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Create a custom language with language code 'xx' and a random
     // name.
     $langcode = 'xx';
     $name = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
 
     // Ensure the translation file is automatically imported when the language
@@ -409,31 +409,31 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $this->assertText(t('One translation string was skipped because of disallowed or malformed HTML'), 'Language file automatically imported.');
 
     // Ensure the strings were successfully imported.
-    $search = array(
+    $search = [
       'string' => 'lundi',
       'langcode' => $langcode,
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertNoText(t('No strings available.'), 'String successfully imported.');
 
     // Ensure the multiline string was imported.
-    $search = array(
+    $search = [
       'string' => 'Source string for multiline translation',
       'langcode' => $langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText('Multiline translation string to make sure that import works with it.', 'String successfully imported.');
 
     // Ensure 'Allowed HTML source string' was imported but the translation for
     // 'Another allowed HTML source string' was not because it contains invalid
     // HTML.
-    $search = array(
+    $search = [
       'string' => 'HTML source string',
       'langcode' => $langcode,
       'translation' => 'all',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertText('Allowed HTML source string', 'String successfully imported.');
     $this->assertNoText('Another allowed HTML source string', 'String with disallowed translation not imported.');
diff --git a/web/core/modules/locale/src/TranslationString.php b/web/core/modules/locale/src/TranslationString.php
index 917e87433..63f4543cb 100644
--- a/web/core/modules/locale/src/TranslationString.php
+++ b/web/core/modules/locale/src/TranslationString.php
@@ -42,7 +42,7 @@ class TranslationString extends StringBase {
   /**
    * {@inheritdoc}
    */
-  public function __construct($values = array()) {
+  public function __construct($values = []) {
     parent::__construct($values);
     if (!isset($this->isNew)) {
       // We mark the string as not new if it is a complete translation.
diff --git a/web/core/modules/locale/tests/modules/locale_test/locale_test.module b/web/core/modules/locale/tests/modules/locale_test/locale_test.module
index b59dfee8b..89ba2bae9 100644
--- a/web/core/modules/locale/tests/modules/locale_test/locale_test.module
+++ b/web/core/modules/locale/tests/modules/locale_test/locale_test.module
@@ -57,10 +57,10 @@ function locale_test_locale_translation_projects_alter(&$projects) {
     $remote_url = $url . PublicStream::basePath() . '/remote/';
 
     // Completely replace the project data with a set of test projects.
-    $projects = array(
-      'contrib_module_one' => array(
+    $projects = [
+      'contrib_module_one' => [
         'name' => 'contrib_module_one',
-        'info' => array(
+        'info' => [
           'name' => 'Contributed module one',
           'interface translation server pattern' => $remote_url . '%core/%project/%project-%version.%language._po',
           'package' => 'Other',
@@ -68,14 +68,14 @@ function locale_test_locale_translation_projects_alter(&$projects) {
           'project' => 'contrib_module_one',
           'datestamp' => '1344471537',
           '_info_file_ctime' => 1348767306,
-        ),
+        ],
         'datestamp' => '1344471537',
         'project_type' => 'module',
         'project_status' => TRUE,
-      ),
-      'contrib_module_two' => array(
+      ],
+      'contrib_module_two' => [
         'name' => 'contrib_module_two',
-        'info' => array(
+        'info' => [
           'name' => 'Contributed module two',
           'interface translation server pattern' => $remote_url . '%core/%project/%project-%version.%language._po',
           'package' => 'Other',
@@ -83,14 +83,14 @@ function locale_test_locale_translation_projects_alter(&$projects) {
           'project' => 'contrib_module_two',
           'datestamp' => '1344471537',
           '_info_file_ctime' => 1348767306,
-        ),
+        ],
         'datestamp' => '1344471537',
         'project_type' => 'module',
         'project_status' => TRUE,
-      ),
-      'contrib_module_three' => array(
+      ],
+      'contrib_module_three' => [
         'name' => 'contrib_module_three',
-        'info' => array(
+        'info' => [
           'name' => 'Contributed module three',
           'interface translation server pattern' => $remote_url . '%core/%project/%project-%version.%language._po',
           'package' => 'Other',
@@ -98,14 +98,14 @@ function locale_test_locale_translation_projects_alter(&$projects) {
           'project' => 'contrib_module_three',
           'datestamp' => '1344471537',
           '_info_file_ctime' => 1348767306,
-        ),
+        ],
         'datestamp' => '1344471537',
         'project_type' => 'module',
         'project_status' => TRUE,
-      ),
-      'locale_test' => array(
+      ],
+      'locale_test' => [
         'name' => 'locale_test',
-        'info' => array(
+        'info' => [
           'name' => 'Locale test',
           'interface translation project' => 'locale_test',
           'interface translation server pattern' => 'core/modules/locale/tests/test.%language.po',
@@ -114,14 +114,14 @@ function locale_test_locale_translation_projects_alter(&$projects) {
           'project' => 'locale_test',
           '_info_file_ctime' => 1348767306,
           'datestamp' => 0,
-        ),
+        ],
         'datestamp' => 0,
         'project_type' => 'module',
         'project_status' => TRUE,
-      ),
-      'custom_module_one' => array(
+      ],
+      'custom_module_one' => [
         'name' => 'custom_module_one',
-        'info' => array(
+        'info' => [
           'name' => 'Custom module one',
           'interface translation project' => 'custom_module_one',
           'interface translation server pattern' => 'translations://custom_module_one.%language.po',
@@ -130,12 +130,12 @@ function locale_test_locale_translation_projects_alter(&$projects) {
           'project' => 'custom_module_one',
           '_info_file_ctime' => 1348767306,
           'datestamp' => 0,
-        ),
+        ],
         'datestamp' => 0,
         'project_type' => 'module',
         'project_status' => TRUE,
-      ),
-    );
+      ],
+    ];
   }
 }
 
diff --git a/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.module b/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.module
index deedf075b..248d9e472 100644
--- a/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.module
+++ b/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.module
@@ -27,14 +27,14 @@ function locale_test_development_release_system_info_alter(&$info, Extension $fi
 function locale_test_development_release_locale_translation_projects_alter(&$projects) {
   $projects['contrib'] = [
     'name' => 'contrib',
-    'info' => array(
+    'info' => [
       'name' => 'Contributed module',
       'package' => 'Other',
       'version' => '12.x-10.4-unstable11+14-dev',
       'project' => 'contrib_module',
       'datestamp' => '0',
       '_info_file_ctime' => 1442933959,
-    ),
+    ],
     'datestamp' => '0',
     'project_type' => 'module',
     'project_status' => TRUE,
diff --git a/web/core/modules/locale/src/Tests/LocaleContentTest.php b/web/core/modules/locale/tests/src/Functional/LocaleContentTest.php
similarity index 81%
rename from web/core/modules/locale/src/Tests/LocaleContentTest.php
rename to web/core/modules/locale/tests/src/Functional/LocaleContentTest.php
index 188b57433..e7955503a 100644
--- a/web/core/modules/locale/src/Tests/LocaleContentTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleContentTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\node\NodeInterface;
 
 /**
  * Tests you can enable multilingual support on content types and configure a
@@ -11,21 +12,21 @@ use Drupal\Core\Language\LanguageInterface;
  *
  * @group locale
  */
-class LocaleContentTest extends WebTestBase {
+class LocaleContentTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'locale');
+  public static $modules = ['node', 'locale'];
 
   /**
    * Verifies that machine name fields are always LTR.
    */
   public function testMachineNameLTR() {
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content types', 'access administration pages', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages', 'administer site configuration']);
 
     // Log in as admin.
     $this->drupalLogin($admin_user);
@@ -35,13 +36,13 @@ class LocaleContentTest extends WebTestBase {
     $this->assertFieldByXpath('//input[@name="type" and @dir="ltr"]', NULL, 'The machine name field is LTR when no additional language is configured.');
 
     // Install the Arabic language (which is RTL) and configure as the default.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'ar';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
-    $edit = array(
+    $edit = [
       'site_default_language' => 'ar',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration'));
 
     // Verify that the machine name field is still LTR for a new content type.
@@ -57,9 +58,9 @@ class LocaleContentTest extends WebTestBase {
     $type2 = $this->drupalCreateContentType();
 
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content types', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages']);
     // User to create a node.
-    $web_user = $this->drupalCreateUser(array("create {$type1->id()} content", "create {$type2->id()} content", "edit any {$type2->id()} content"));
+    $web_user = $this->drupalCreateUser(["create {$type1->id()} content", "create {$type2->id()} content", "edit any {$type2->id()} content"]);
 
     // Add custom language.
     $this->drupalLogin($admin_user);
@@ -67,22 +68,22 @@ class LocaleContentTest extends WebTestBase {
     $langcode = 'xx';
     // The English name for the language.
     $name = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
 
     // Set the content type to use multilingual support.
     $this->drupalGet("admin/structure/types/manage/{$type2->id()}");
     $this->assertText(t('Language settings'), 'Multilingual support widget present on content type configuration form.');
-    $edit = array(
+    $edit = [
       'language_configuration[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm("admin/structure/types/manage/{$type2->id()}", $edit, t('Save content type'));
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => $type2->label())));
+    $this->assertRaw(t('The content type %type has been updated.', ['%type' => $type2->label()]));
     $this->drupalLogout();
     \Drupal::languageManager()->reset();
 
@@ -102,26 +103,26 @@ class LocaleContentTest extends WebTestBase {
     // Create a node.
     $node_title = $this->randomMachineName();
     $node_body = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'type' => $type2->id(),
       'title' => $node_title,
-      'body' => array(array('value' => $node_body)),
+      'body' => [['value' => $node_body]],
       'langcode' => $langcode,
-    );
+    ];
     $node = $this->drupalCreateNode($edit);
     // Edit the content and ensure correct language is selected.
     $path = 'node/' . $node->id() . '/edit';
     $this->drupalGet($path);
     $this->assertRaw('<option value="' . $langcode . '" selected="selected">' . $name . '</option>', 'Correct language selected.');
     // Ensure we can change the node language.
-    $edit = array(
+    $edit = [
       'langcode[0][value]' => 'en',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save'));
-    $this->assertText(t('@title has been updated.', array('@title' => $node_title)));
+    $this->assertText(t('@title has been updated.', ['@title' => $node_title]));
 
     // Verify that the creation message contains a link to a node.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'node/' . $node->id()));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'node/' . $node->id()]);
     $this->assert(isset($view_link), 'The message area contains the link to the edited node');
 
     $this->drupalLogout();
@@ -134,44 +135,44 @@ class LocaleContentTest extends WebTestBase {
     $type = $this->drupalCreateContentType();
 
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content types', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages']);
     // User to create a node.
-    $web_user = $this->drupalCreateUser(array("create {$type->id()} content", "edit own {$type->id()} content"));
+    $web_user = $this->drupalCreateUser(["create {$type->id()} content", "edit own {$type->id()} content"]);
 
     // Log in as admin.
     $this->drupalLogin($admin_user);
 
     // Install Arabic language.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'ar';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Install Spanish language.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'es';
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
     \Drupal::languageManager()->reset();
 
     // Set the content type to use multilingual support.
     $this->drupalGet("admin/structure/types/manage/{$type->id()}");
-    $edit = array(
+    $edit = [
       'language_configuration[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm("admin/structure/types/manage/{$type->id()}", $edit, t('Save content type'));
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => $type->label())));
+    $this->assertRaw(t('The content type %type has been updated.', ['%type' => $type->label()]));
     $this->drupalLogout();
 
     // Log in as web user to add new node.
     $this->drupalLogin($web_user);
 
     // Create three nodes: English, Arabic and Spanish.
-    $nodes = array();
-    foreach (array('en', 'es', 'ar') as $langcode) {
-      $nodes[$langcode] = $this->drupalCreateNode(array(
+    $nodes = [];
+    foreach (['en', 'es', 'ar'] as $langcode) {
+      $nodes[$langcode] = $this->drupalCreateNode([
         'langcode' => $langcode,
         'type' => $type->id(),
-        'promote' => NODE_PROMOTED,
-      ));
+        'promote' => NodeInterface::PROMOTED,
+      ]);
     }
 
     // Check if English node does not have lang tag.
diff --git a/web/core/modules/locale/src/Tests/LocaleLocaleLookupTest.php b/web/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php
similarity index 78%
rename from web/core/modules/locale/src/Tests/LocaleLocaleLookupTest.php
rename to web/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php
index ea4f93705..5f3e5f7e8 100644
--- a/web/core/modules/locale/src/Tests/LocaleLocaleLookupTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests LocaleLookup.
  *
  * @group locale
  */
-class LocaleLocaleLookupTest extends WebTestBase {
+class LocaleLocaleLookupTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('locale', 'locale_test');
+  public static $modules = ['locale', 'locale_test'];
 
   /**
    * {@inheritdoc}
@@ -37,7 +37,7 @@ class LocaleLocaleLookupTest extends WebTestBase {
    */
   public function testCircularDependency() {
     // Ensure that we can enable early_translation_test on a non-english site.
-    $this->drupalPostForm('admin/modules', array('modules[Testing][early_translation_test][enable]' => TRUE), t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[early_translation_test][enable]' => TRUE], t('Install'));
     $this->assertResponse(200);
   }
 
@@ -48,7 +48,7 @@ class LocaleLocaleLookupTest extends WebTestBase {
     $this->drupalGet('');
     // Ensure state of fallback languages persisted by
     // locale_test_language_fallback_candidates_locale_lookup_alter() is empty.
-    $this->assertEqual(\Drupal::state()->get('locale.test_language_fallback_candidates_locale_lookup_alter_candidates'), array());
+    $this->assertEqual(\Drupal::state()->get('locale.test_language_fallback_candidates_locale_lookup_alter_candidates'), []);
     // Make sure there is enough information provided for alter hooks.
     $context = \Drupal::state()->get('locale.test_language_fallback_candidates_locale_lookup_alter_context');
     $this->assertEqual($context['langcode'], 'fr');
diff --git a/web/core/modules/locale/src/Tests/LocalePathTest.php b/web/core/modules/locale/tests/src/Functional/LocalePathTest.php
similarity index 80%
rename from web/core/modules/locale/src/Tests/LocalePathTest.php
rename to web/core/modules/locale/tests/src/Functional/LocalePathTest.php
index cc4f31a93..16cc26865 100644
--- a/web/core/modules/locale/src/Tests/LocalePathTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocalePathTest.php
@@ -1,24 +1,24 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests you can configure a language for individual URL aliases.
  *
  * @group locale
  */
-class LocalePathTest extends WebTestBase {
+class LocalePathTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'locale', 'path', 'views');
+  public static $modules = ['node', 'locale', 'path', 'views'];
 
   /**
    * {@inheritdoc}
@@ -26,7 +26,7 @@ class LocalePathTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
     $this->config('system.site')->set('page.front', '/node')->save();
   }
 
@@ -35,7 +35,7 @@ class LocalePathTest extends WebTestBase {
    */
   public function testPathLanguageConfiguration() {
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'create page content', 'administer url aliases', 'create url aliases', 'access administration pages', 'access content overview'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'create page content', 'administer url aliases', 'create url aliases', 'access administration pages', 'access content overview']);
 
     // Add custom language.
     $this->drupalLogin($admin_user);
@@ -45,16 +45,16 @@ class LocalePathTest extends WebTestBase {
     $name = $this->randomMachineName(16);
     // The domain prefix.
     $prefix = $langcode;
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
 
     // Set path prefix.
-    $edit = array("prefix[$langcode]" => $prefix);
+    $edit = ["prefix[$langcode]" => $prefix];
     $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
 
     // Check that the "xx" front page is readily available because path prefix
@@ -63,25 +63,25 @@ class LocalePathTest extends WebTestBase {
     $this->assertText(t('Welcome to Drupal'), 'The "xx" front page is readibly available.');
 
     // Create a node.
-    $node = $this->drupalCreateNode(array('type' => 'page'));
+    $node = $this->drupalCreateNode(['type' => 'page']);
 
     // Create a path alias in default language (English).
     $path = 'admin/config/search/path/add';
     $english_path = $this->randomMachineName(8);
-    $edit = array(
+    $edit = [
       'source'   => '/node/' . $node->id(),
       'alias'    => '/' . $english_path,
       'langcode' => 'en',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save'));
 
     // Create a path alias in new custom language.
     $custom_language_path = $this->randomMachineName(8);
-    $edit = array(
+    $edit = [
       'source'   => '/node/' . $node->id(),
       'alias'    => '/' . $custom_language_path,
       'langcode' => $langcode,
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save'));
 
     // Confirm English language path alias works.
@@ -96,11 +96,11 @@ class LocalePathTest extends WebTestBase {
     $custom_path = $this->randomMachineName(8);
 
     // Check priority of language for alias by source path.
-    $edit = array(
+    $edit = [
       'source'   => '/node/' . $node->id(),
       'alias'    => '/' . $custom_path,
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    );
+    ];
     $this->container->get('path.alias_storage')->save($edit['source'], $edit['alias'], $edit['langcode']);
     $lookup_path = $this->container->get('path.alias_manager')->getAliasByPath('/node/' . $node->id(), 'en');
     $this->assertEqual('/' . $english_path, $lookup_path, 'English language alias has priority.');
@@ -110,32 +110,32 @@ class LocalePathTest extends WebTestBase {
     $this->container->get('path.alias_storage')->delete($edit);
 
     // Create language nodes to check priority of aliases.
-    $first_node = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1, 'langcode' => 'en'));
-    $second_node = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1, 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED));
+    $first_node = $this->drupalCreateNode(['type' => 'page', 'promote' => 1, 'langcode' => 'en']);
+    $second_node = $this->drupalCreateNode(['type' => 'page', 'promote' => 1, 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED]);
 
     // Assign a custom path alias to the first node with the English language.
-    $edit = array(
+    $edit = [
       'source'   => '/node/' . $first_node->id(),
       'alias'    => '/' . $custom_path,
       'langcode' => $first_node->language()->getId(),
-    );
+    ];
     $this->container->get('path.alias_storage')->save($edit['source'], $edit['alias'], $edit['langcode']);
 
     // Assign a custom path alias to second node with
     // LanguageInterface::LANGCODE_NOT_SPECIFIED.
-    $edit = array(
+    $edit = [
       'source'   => '/node/' . $second_node->id(),
       'alias'    => '/' . $custom_path,
       'langcode' => $second_node->language()->getId(),
-    );
+    ];
     $this->container->get('path.alias_storage')->save($edit['source'], $edit['alias'], $edit['langcode']);
 
     // Test that both node titles link to our path alias.
     $this->drupalGet('admin/content');
     $custom_path_url = Url::fromUserInput('/' . $custom_path)->toString();
-    $elements = $this->xpath('//a[@href=:href and normalize-space(text())=:title]', array(':href' => $custom_path_url, ':title' => $first_node->label()));
+    $elements = $this->xpath('//a[@href=:href and normalize-space(text())=:title]', [':href' => $custom_path_url, ':title' => $first_node->label()]);
     $this->assertTrue(!empty($elements), 'First node links to the path alias.');
-    $elements = $this->xpath('//a[@href=:href and normalize-space(text())=:title]', array(':href' => $custom_path_url, ':title' => $second_node->label()));
+    $elements = $this->xpath('//a[@href=:href and normalize-space(text())=:title]', [':href' => $custom_path_url, ':title' => $second_node->label()]);
     $this->assertTrue(!empty($elements), 'Second node links to the path alias.');
 
     // Confirm that the custom path leads to the first node.
diff --git a/web/core/modules/locale/src/Tests/LocaleStringTest.php b/web/core/modules/locale/tests/src/Functional/LocaleStringTest.php
similarity index 68%
rename from web/core/modules/locale/src/Tests/LocaleStringTest.php
rename to web/core/modules/locale/tests/src/Functional/LocaleStringTest.php
index 2f467e74d..601b7388e 100644
--- a/web/core/modules/locale/src/Tests/LocaleStringTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleStringTest.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the locale string storage, string objects and data API.
  *
  * @group locale
  */
-class LocaleStringTest extends WebTestBase {
+class LocaleStringTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('locale');
+  public static $modules = ['locale'];
 
   /**
    * The locale storage.
@@ -34,7 +34,7 @@ class LocaleStringTest extends WebTestBase {
     // Add a default locale storage for all these tests.
     $this->storage = $this->container->get('locale.storage');
     // Create two languages: Spanish and German.
-    foreach (array('es', 'de') as $langcode) {
+    foreach (['es', 'de'] as $langcode) {
       ConfigurableLanguage::createFromLangcode($langcode)->save();
     }
   }
@@ -46,51 +46,51 @@ class LocaleStringTest extends WebTestBase {
     // Create source string.
     $source = $this->buildSourceString();
     $source->save();
-    $this->assertTrue($source->lid, format_string('Successfully created string %string', array('%string' => $source->source)));
+    $this->assertTrue($source->lid, format_string('Successfully created string %string', ['%string' => $source->source]));
 
     // Load strings by lid and source.
-    $string1 = $this->storage->findString(array('lid' => $source->lid));
+    $string1 = $this->storage->findString(['lid' => $source->lid]);
     $this->assertEqual($source, $string1, 'Successfully retrieved string by identifier.');
-    $string2 = $this->storage->findString(array('source' => $source->source, 'context' => $source->context));
+    $string2 = $this->storage->findString(['source' => $source->source, 'context' => $source->context]);
     $this->assertEqual($source, $string2, 'Successfully retrieved string by source and context.');
-    $string3 = $this->storage->findString(array('source' => $source->source, 'context' => ''));
+    $string3 = $this->storage->findString(['source' => $source->source, 'context' => '']);
     $this->assertFalse($string3, 'Cannot retrieve string with wrong context.');
 
     // Check version handling and updating.
     $this->assertEqual($source->version, 'none', 'String originally created without version.');
-    $string = $this->storage->findTranslation(array('lid' => $source->lid));
+    $string = $this->storage->findTranslation(['lid' => $source->lid]);
     $this->assertEqual($string->version, \Drupal::VERSION, 'Checked and updated string version to Drupal version.');
 
     // Create translation and find it by lid and source.
     $langcode = 'es';
     $translation = $this->createTranslation($source, $langcode);
     $this->assertEqual($translation->customized, LOCALE_NOT_CUSTOMIZED, 'Translation created as not customized by default.');
-    $string1 = $this->storage->findTranslation(array('language' => $langcode, 'lid' => $source->lid));
+    $string1 = $this->storage->findTranslation(['language' => $langcode, 'lid' => $source->lid]);
     $this->assertEqual($string1->translation, $translation->translation, 'Successfully loaded translation by string identifier.');
-    $string2 = $this->storage->findTranslation(array('language' => $langcode, 'source' => $source->source, 'context' => $source->context));
+    $string2 = $this->storage->findTranslation(['language' => $langcode, 'source' => $source->source, 'context' => $source->context]);
     $this->assertEqual($string2->translation, $translation->translation, 'Successfully loaded translation by source and context.');
     $translation
       ->setCustomized()
       ->save();
-    $translation = $this->storage->findTranslation(array('language' => $langcode, 'lid' => $source->lid));
+    $translation = $this->storage->findTranslation(['language' => $langcode, 'lid' => $source->lid]);
     $this->assertEqual($translation->customized, LOCALE_CUSTOMIZED, 'Translation successfully marked as customized.');
 
     // Delete translation.
     $translation->delete();
-    $deleted = $this->storage->findTranslation(array('language' => $langcode, 'lid' => $source->lid));
+    $deleted = $this->storage->findTranslation(['language' => $langcode, 'lid' => $source->lid]);
     $this->assertFalse(isset($deleted->translation), 'Successfully deleted translation string.');
 
     // Create some translations and then delete string and all of its
     // translations.
     $lid = $source->lid;
     $this->createAllTranslations($source);
-    $search = $this->storage->getTranslations(array('lid' => $source->lid));
+    $search = $this->storage->getTranslations(['lid' => $source->lid]);
     $this->assertEqual(count($search), 3, 'Created and retrieved all translations for our source string.');
 
     $source->delete();
-    $string = $this->storage->findString(array('lid' => $lid));
+    $string = $this->storage->findString(['lid' => $lid]);
     $this->assertFalse($string, 'Successfully deleted source string.');
-    $deleted = $search = $this->storage->getTranslations(array('lid' => $lid));
+    $deleted = $search = $this->storage->getTranslations(['lid' => $lid]);
     $this->assertFalse($deleted, 'Successfully deleted all translation strings.');
 
     // Tests that locations of different types and arbitrary lengths can be
@@ -102,7 +102,7 @@ class LocaleStringTest extends WebTestBase {
     $source_string->addLocation('path', $location = $this->randomString(300));
     $source_string->save();
 
-    $rows = db_query('SELECT * FROM {locales_location} WHERE sid = :sid', array(':sid' => $source_string->lid))->fetchAllAssoc('type');
+    $rows = db_query('SELECT * FROM {locales_location} WHERE sid = :sid', [':sid' => $source_string->lid])->fetchAllAssoc('type');
     $this->assertEqual(count($rows), 4, '4 source locations have been persisted.');
     $this->assertEqual($rows['path']->name, substr($location, 0, 255), 'Too long location has been limited to 255 characters.');
   }
@@ -117,50 +117,50 @@ class LocaleStringTest extends WebTestBase {
     // Source 2 will have all translations, customized.
     // Source 3 will have no translations.
     $prefix = $this->randomMachineName(100);
-    $source1 = $this->buildSourceString(array('source' => $prefix . $this->randomMachineName(100)))->save();
-    $source2 = $this->buildSourceString(array('source' => $prefix . $this->randomMachineName(100)))->save();
+    $source1 = $this->buildSourceString(['source' => $prefix . $this->randomMachineName(100)])->save();
+    $source2 = $this->buildSourceString(['source' => $prefix . $this->randomMachineName(100)])->save();
     $source3 = $this->buildSourceString()->save();
     // Load all source strings.
-    $strings = $this->storage->getStrings(array());
+    $strings = $this->storage->getStrings([]);
     $this->assertEqual(count($strings), 3, 'Found 3 source strings in the database.');
     // Load all source strings matching a given string.
-    $filter_options['filters'] = array('source' => $prefix);
-    $strings = $this->storage->getStrings(array(), $filter_options);
+    $filter_options['filters'] = ['source' => $prefix];
+    $strings = $this->storage->getStrings([], $filter_options);
     $this->assertEqual(count($strings), 2, 'Found 2 strings using some string filter.');
 
     // Not customized translations.
     $translate1 = $this->createAllTranslations($source1);
     // Customized translations.
-    $this->createAllTranslations($source2, array('customized' => LOCALE_CUSTOMIZED));
+    $this->createAllTranslations($source2, ['customized' => LOCALE_CUSTOMIZED]);
     // Try quick search function with different field combinations.
     $langcode = 'es';
-    $found = $this->storage->findTranslation(array('language' => $langcode, 'source' => $source1->source, 'context' => $source1->context));
+    $found = $this->storage->findTranslation(['language' => $langcode, 'source' => $source1->source, 'context' => $source1->context]);
     $this->assertTrue($found && isset($found->language) && isset($found->translation) && !$found->isNew(), 'Translation found searching by source and context.');
     $this->assertEqual($found->translation, $translate1[$langcode]->translation, 'Found the right translation.');
     // Now try a translation not found.
-    $found = $this->storage->findTranslation(array('language' => $langcode, 'source' => $source3->source, 'context' => $source3->context));
+    $found = $this->storage->findTranslation(['language' => $langcode, 'source' => $source3->source, 'context' => $source3->context]);
     $this->assertTrue($found && $found->lid == $source3->lid && !isset($found->translation) && $found->isNew(), 'Translation not found but source string found.');
 
     // Load all translations. For next queries we'll be loading only translated
     // strings.
-    $translations = $this->storage->getTranslations(array('translated' => TRUE));
+    $translations = $this->storage->getTranslations(['translated' => TRUE]);
     $this->assertEqual(count($translations), 2 * $language_count, 'Created and retrieved all translations for source strings.');
 
     // Load all customized translations.
-    $translations = $this->storage->getTranslations(array('customized' => LOCALE_CUSTOMIZED, 'translated' => TRUE));
+    $translations = $this->storage->getTranslations(['customized' => LOCALE_CUSTOMIZED, 'translated' => TRUE]);
     $this->assertEqual(count($translations), $language_count, 'Retrieved all customized translations for source strings.');
 
     // Load all Spanish customized translations.
-    $translations = $this->storage->getTranslations(array('language' => 'es', 'customized' => LOCALE_CUSTOMIZED, 'translated' => TRUE));
+    $translations = $this->storage->getTranslations(['language' => 'es', 'customized' => LOCALE_CUSTOMIZED, 'translated' => TRUE]);
     $this->assertEqual(count($translations), 1, 'Found only Spanish and customized translations.');
 
     // Load all source strings without translation (1).
-    $translations = $this->storage->getStrings(array('translated' => FALSE));
+    $translations = $this->storage->getStrings(['translated' => FALSE]);
     $this->assertEqual(count($translations), 1, 'Found 1 source string without translations.');
 
     // Load Spanish translations using string filter.
-    $filter_options['filters'] = array('source' => $prefix);
-    $translations = $this->storage->getTranslations(array('language' => 'es'), $filter_options);
+    $filter_options['filters'] = ['source' => $prefix];
+    $translations = $this->storage->getTranslations(['language' => 'es'], $filter_options);
     $this->assertEqual(count($translations), 2, 'Found 2 translations using some string filter.');
 
   }
@@ -171,18 +171,18 @@ class LocaleStringTest extends WebTestBase {
    * @return \Drupal\locale\StringInterface
    *   A locale string.
    */
-  public function buildSourceString($values = array()) {
-    return $this->storage->createString($values += array(
+  public function buildSourceString($values = []) {
+    return $this->storage->createString($values += [
       'source' => $this->randomMachineName(100),
       'context' => $this->randomMachineName(20),
-    ));
+    ]);
   }
 
   /**
    * Creates translations for source string and all languages.
    */
-  public function createAllTranslations($source, $values = array()) {
-    $list = array();
+  public function createAllTranslations($source, $values = []) {
+    $list = [];
     /* @var $language_manager \Drupal\Core\Language\LanguageManagerInterface */
     $language_manager = $this->container->get('language_manager');
     foreach ($language_manager->getLanguages() as $language) {
@@ -194,12 +194,12 @@ class LocaleStringTest extends WebTestBase {
   /**
    * Creates single translation for source string.
    */
-  public function createTranslation($source, $langcode, $values = array()) {
-    return $this->storage->createTranslation($values + array(
+  public function createTranslation($source, $langcode, $values = []) {
+    return $this->storage->createTranslation($values + [
       'lid' => $source->lid,
       'language' => $langcode,
       'translation' => $this->randomMachineName(100),
-    ))->save();
+    ])->save();
   }
 
 }
diff --git a/web/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php b/web/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
similarity index 77%
rename from web/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php
rename to web/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
index b117e2c8e..39d7c3d53 100644
--- a/web/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Drupal\locale\Tests;
+namespace Drupal\Tests\locale\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Adds and configures languages to check field schema definition.
  *
  * @group locale
  */
-class LocaleTranslatedSchemaDefinitionTest extends WebTestBase {
+class LocaleTranslatedSchemaDefinitionTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('language', 'locale', 'node');
+  public static $modules = ['language', 'locale', 'node'];
 
   /**
    * {@inheritdoc}
@@ -36,19 +36,19 @@ class LocaleTranslatedSchemaDefinitionTest extends WebTestBase {
   /**
    * Tests that translated field descriptions do not affect the update system.
    */
-  function testTranslatedSchemaDefinition() {
+  public function testTranslatedSchemaDefinition() {
     /** @var \Drupal\locale\StringDatabaseStorage $stringStorage */
     $stringStorage = \Drupal::service('locale.storage');
 
-    $source = $stringStorage->createString(array(
+    $source = $stringStorage->createString([
       'source' => 'Revision ID',
-    ))->save();
+    ])->save();
 
-    $stringStorage->createTranslation(array(
+    $stringStorage->createTranslation([
       'lid' => $source->lid,
       'language' => 'fr',
       'translation' => 'Translated Revision ID',
-    ))->save();
+    ])->save();
 
     // Ensure that the field is translated when access through the API.
     $this->assertEqual('Translated Revision ID', \Drupal::entityManager()->getBaseFieldDefinitions('node')['vid']->getLabel());
@@ -60,12 +60,12 @@ class LocaleTranslatedSchemaDefinitionTest extends WebTestBase {
   /**
    * Tests that translations do not affect the update system.
    */
-  function testTranslatedUpdate() {
+  public function testTranslatedUpdate() {
     // Visit the update page to collect any strings that may be translatable.
-    $user = $this->drupalCreateUser(array('administer software updates'));
+    $user = $this->drupalCreateUser(['administer software updates']);
     $this->drupalLogin($user);
     $update_url = $GLOBALS['base_url'] . '/update.php';
-    $this->drupalGet($update_url, array('external' => TRUE));
+    $this->drupalGet($update_url, ['external' => TRUE]);
 
     /** @var \Drupal\locale\StringDatabaseStorage $stringStorage */
     $stringStorage = \Drupal::service('locale.storage');
@@ -73,17 +73,17 @@ class LocaleTranslatedSchemaDefinitionTest extends WebTestBase {
 
     // Translate all source strings found.
     foreach ($sources as $source) {
-      $stringStorage->createTranslation(array(
+      $stringStorage->createTranslation([
         'lid' => $source->lid,
         'language' => 'fr',
         'translation' => $this->randomMachineName(100),
-      ))->save();
+      ])->save();
     }
 
     // Ensure that there are no updates just due to translations. Check for
     // markup and a link instead of specific text because text may be
     // translated.
-    $this->drupalGet($update_url . '/selection', array('external' => TRUE));
+    $this->drupalGet($update_url . '/selection', ['external' => TRUE]);
     $this->assertRaw('messages--status', 'No pending updates.');
     $this->assertNoLinkByHref('fr/update.php/run', 'No link to run updates.');
   }
diff --git a/web/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php b/web/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php
index c1ce1b780..8389b6e97 100644
--- a/web/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php
+++ b/web/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php
@@ -18,7 +18,7 @@ class LocaleConfigManagerTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'language', 'locale', 'locale_test', 'block');
+  public static $modules = ['system', 'language', 'locale', 'locale_test', 'block'];
 
   /**
    * This test creates simple config on the fly breaking schema checking.
@@ -31,8 +31,8 @@ class LocaleConfigManagerTest extends KernelTestBase {
    * Tests hasTranslation().
    */
   public function testHasTranslation() {
-    $this->installSchema('locale', array('locales_location', 'locales_source', 'locales_target'));
-    $this->installConfig(array('locale_test'));
+    $this->installSchema('locale', ['locales_location', 'locales_source', 'locales_target']);
+    $this->installConfig(['locale_test']);
     $locale_config_manager = \Drupal::service('locale.config_manager');
 
     $language = ConfigurableLanguage::createFromLangcode('de');
@@ -48,8 +48,8 @@ class LocaleConfigManagerTest extends KernelTestBase {
    * Tests getStringTranslation().
    */
   public function testGetStringTranslation() {
-    $this->installSchema('locale', array('locales_location', 'locales_source', 'locales_target'));
-    $this->installConfig(array('locale_test'));
+    $this->installSchema('locale', ['locales_location', 'locales_source', 'locales_target']);
+    $this->installConfig(['locale_test']);
 
     $locale_config_manager = \Drupal::service('locale.config_manager');
 
@@ -80,7 +80,7 @@ class LocaleConfigManagerTest extends KernelTestBase {
     $simple_config->set('foo', 'bar')->save();
     $this->assertNull(\Drupal::service('locale.config_manager')->getDefaultConfigLangcode($simple_config->getName()), 'Simple config created through the API is not treated as shipped configuration.');
 
-    $block = Block::create(array(
+    $block = Block::create([
       'id' => 'test_default_config',
       'theme' => 'classy',
       'status' => TRUE,
@@ -94,7 +94,7 @@ class LocaleConfigManagerTest extends KernelTestBase {
         'primary' => TRUE,
         'secondary' => TRUE,
       ],
-    ));
+    ]);
     $block->save();
 
     // Install the theme after creating the block as installing the theme will
diff --git a/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberForeignTest.php b/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberForeignTest.php
index a53c3cf81..e7a13fc71 100644
--- a/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberForeignTest.php
+++ b/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberForeignTest.php
@@ -124,7 +124,7 @@ class LocaleConfigSubscriberForeignTest extends LocaleConfigSubscriberTest {
     $config_name = 'locale_test.translation';
     ConfigurableLanguage::createFromLangcode('en')->save();
     // Adding a language on the UI would normally call updateConfigTranslations.
-    $this->localeConfigManager->updateConfigTranslations(array($config_name), array('en'));
+    $this->localeConfigManager->updateConfigTranslations([$config_name], ['en']);
     $this->assertConfigOverride($config_name, 'test', 'English test', 'en');
 
     $this->configFactory->getEditable('locale.settings')->set('translate_english', TRUE)->save();
diff --git a/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php b/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
index 013a9ea21..3a12efdf2 100644
--- a/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
+++ b/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
@@ -182,7 +182,7 @@ class LocaleConfigSubscriberTest extends KernelTestBase {
    *   The language code.
    */
   protected function setUpNoTranslation($config_name, $key, $source, $langcode) {
-    $this->localeConfigManager->updateConfigTranslations(array($config_name), array($langcode));
+    $this->localeConfigManager->updateConfigTranslations([$config_name], [$langcode]);
     $this->assertNoConfigOverride($config_name, $key, $source, $langcode);
     $this->assertNoTranslation($config_name, $langcode);
   }
@@ -222,7 +222,7 @@ class LocaleConfigSubscriberTest extends KernelTestBase {
       ->save();
     $this->configFactory->reset($config_name);
     $this->localeConfigManager->reset();
-    $this->localeConfigManager->updateConfigTranslations(array($config_name), array($langcode));
+    $this->localeConfigManager->updateConfigTranslations([$config_name], [$langcode]);
 
     if ($is_active) {
       $this->assertActiveConfig($config_name, $key, $translation, $langcode);
@@ -291,7 +291,7 @@ class LocaleConfigSubscriberTest extends KernelTestBase {
       ->setString($translation)
       ->save();
     $this->localeConfigManager->reset();
-    $this->localeConfigManager->updateConfigTranslations(array($config_name), array($langcode));
+    $this->localeConfigManager->updateConfigTranslations([$config_name], [$langcode]);
     $this->configFactory->reset($config_name);
 
     if ($is_active) {
@@ -356,7 +356,7 @@ class LocaleConfigSubscriberTest extends KernelTestBase {
       ->getStringTranslation($config_name, $langcode, $source_value, '')
       ->delete();
     $this->localeConfigManager->reset();
-    $this->localeConfigManager->updateConfigTranslations(array($config_name), array($langcode));
+    $this->localeConfigManager->updateConfigTranslations([$config_name], [$langcode]);
     $this->configFactory->reset($config_name);
 
     $this->assertNoConfigOverride($config_name, $key, $source_value, $langcode);
diff --git a/web/core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php b/web/core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php
index df477693e..b4449184a 100644
--- a/web/core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php
+++ b/web/core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\locale\Kernel\Migrate;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -17,7 +17,7 @@ class MigrateLocaleConfigsTest extends MigrateDrupal6TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('locale', 'language');
+  public static $modules = ['locale', 'language'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php b/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
index 284874623..cbdd6deab 100644
--- a/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
+++ b/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
@@ -76,9 +76,9 @@ class LocaleLookupTest extends UnitTestCase {
     $this->user = $this->getMock('Drupal\Core\Session\AccountInterface');
     $this->user->expects($this->any())
       ->method('getRoles')
-      ->will($this->returnValue(array('anonymous')));
+      ->will($this->returnValue(['anonymous']));
 
-    $this->configFactory = $this->getConfigFactoryStub(array('locale.settings' => array('cache_strings' => FALSE)));
+    $this->configFactory = $this->getConfigFactoryStub(['locale.settings' => ['cache_strings' => FALSE]]);
 
     $this->languageManager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
     $this->requestStack = new RequestStack();
@@ -94,15 +94,15 @@ class LocaleLookupTest extends UnitTestCase {
    * @covers ::resolveCacheMiss
    */
   public function testResolveCacheMissWithoutFallback() {
-    $args = array(
+    $args = [
       'language' => 'en',
       'source' => 'test',
       'context' => 'irrelevant',
-    );
+    ];
 
-    $result = (object) array(
+    $result = (object) [
       'translation' => 'test',
-    );
+    ];
 
     $this->cache->expects($this->once())
       ->method('get')
@@ -114,8 +114,8 @@ class LocaleLookupTest extends UnitTestCase {
       ->will($this->returnValue($result));
 
     $locale_lookup = $this->getMockBuilder('Drupal\locale\LocaleLookup')
-      ->setConstructorArgs(array('en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack))
-      ->setMethods(array('persist'))
+      ->setConstructorArgs(['en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack])
+      ->setMethods(['persist'])
       ->getMock();
     $locale_lookup->expects($this->never())
       ->method('persist');
@@ -133,46 +133,46 @@ class LocaleLookupTest extends UnitTestCase {
    */
   public function testResolveCacheMissWithFallback($langcode, $string, $context, $expected) {
     // These are fake words!
-    $translations = array(
-      'en' => array(
+    $translations = [
+      'en' => [
         'test' => 'test',
         'fake' => 'fake',
         'missing pl' => 'missing pl',
         'missing cs' => 'missing cs',
         'missing both' => 'missing both',
-      ),
-      'pl' => array(
+      ],
+      'pl' => [
         'test' => 'test po polsku',
         'fake' => 'ściema',
         'missing cs' => 'zaginiony czech',
-      ),
-      'cs' => array(
+      ],
+      'cs' => [
         'test' => 'test v české',
         'fake' => 'falešný',
         'missing pl' => 'chybějící pl',
-      ),
-    );
+      ],
+    ];
     $this->storage->expects($this->any())
       ->method('findTranslation')
       ->will($this->returnCallback(function ($argument) use ($translations) {
         if (isset($translations[$argument['language']][$argument['source']])) {
-          return (object) array('translation' => $translations[$argument['language']][$argument['source']]);
+          return (object) ['translation' => $translations[$argument['language']][$argument['source']]];
         }
         return TRUE;
       }));
 
     $this->languageManager->expects($this->any())
       ->method('getFallbackCandidates')
-      ->will($this->returnCallback(function (array $context = array()) {
+      ->will($this->returnCallback(function (array $context = []) {
         switch ($context['langcode']) {
           case 'pl':
-            return array('cs', 'en');
+            return ['cs', 'en'];
 
           case 'cs':
-            return array('en');
+            return ['en'];
 
           default:
-            return array();
+            return [];
         }
       }));
 
@@ -188,20 +188,20 @@ class LocaleLookupTest extends UnitTestCase {
    * Provides test data for testResolveCacheMissWithFallback().
    */
   public function resolveCacheMissWithFallbackProvider() {
-    return array(
-      array('cs', 'test', 'irrelevant', 'test v české'),
-      array('cs', 'fake', 'irrelevant', 'falešný'),
-      array('cs', 'missing pl', 'irrelevant', 'chybějící pl'),
-      array('cs', 'missing cs', 'irrelevant', 'missing cs'),
-      array('cs', 'missing both', 'irrelevant', 'missing both'),
+    return [
+      ['cs', 'test', 'irrelevant', 'test v české'],
+      ['cs', 'fake', 'irrelevant', 'falešný'],
+      ['cs', 'missing pl', 'irrelevant', 'chybějící pl'],
+      ['cs', 'missing cs', 'irrelevant', 'missing cs'],
+      ['cs', 'missing both', 'irrelevant', 'missing both'],
 
       // Testing PL with fallback to cs, en.
-      array('pl', 'test', 'irrelevant', 'test po polsku'),
-      array('pl', 'fake', 'irrelevant', 'ściema'),
-      array('pl', 'missing pl', 'irrelevant', 'chybějící pl'),
-      array('pl', 'missing cs', 'irrelevant', 'zaginiony czech'),
-      array('pl', 'missing both', 'irrelevant', 'missing both'),
-    );
+      ['pl', 'test', 'irrelevant', 'test po polsku'],
+      ['pl', 'fake', 'irrelevant', 'ściema'],
+      ['pl', 'missing pl', 'irrelevant', 'chybějící pl'],
+      ['pl', 'missing cs', 'irrelevant', 'zaginiony czech'],
+      ['pl', 'missing both', 'irrelevant', 'missing both'],
+    ];
   }
 
   /**
@@ -210,25 +210,25 @@ class LocaleLookupTest extends UnitTestCase {
    * @covers ::resolveCacheMiss
    */
   public function testResolveCacheMissWithPersist() {
-    $args = array(
+    $args = [
       'language' => 'en',
       'source' => 'test',
       'context' => 'irrelevant',
-    );
+    ];
 
-    $result = (object) array(
+    $result = (object) [
       'translation' => 'test',
-    );
+    ];
 
     $this->storage->expects($this->once())
       ->method('findTranslation')
       ->with($this->equalTo($args))
       ->will($this->returnValue($result));
 
-    $this->configFactory = $this->getConfigFactoryStub(array('locale.settings' => array('cache_strings' => TRUE)));
+    $this->configFactory = $this->getConfigFactoryStub(['locale.settings' => ['cache_strings' => TRUE]]);
     $locale_lookup = $this->getMockBuilder('Drupal\locale\LocaleLookup')
-      ->setConstructorArgs(array('en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack))
-      ->setMethods(array('persist'))
+      ->setConstructorArgs(['en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack])
+      ->setMethods(['persist'])
       ->getMock();
     $locale_lookup->expects($this->once())
       ->method('persist');
@@ -257,8 +257,8 @@ class LocaleLookupTest extends UnitTestCase {
     $this->requestStack->push($request);
 
     $locale_lookup = $this->getMockBuilder('Drupal\locale\LocaleLookup')
-      ->setConstructorArgs(array('en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack))
-      ->setMethods(array('persist'))
+      ->setConstructorArgs(['en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack])
+      ->setMethods(['persist'])
       ->getMock();
     $locale_lookup->expects($this->never())
       ->method('persist');
diff --git a/web/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php b/web/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php
index b6e4b5974..fced5cd66 100644
--- a/web/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php
+++ b/web/core/modules/locale/tests/src/Unit/Menu/LocaleLocalTasksTest.php
@@ -15,9 +15,9 @@ class LocaleLocalTasksTest extends LocalTaskIntegrationTestBase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->directoryList = array(
+    $this->directoryList = [
       'locale' => 'core/modules/locale',
-    );
+    ];
     parent::setUp();
   }
 
@@ -27,9 +27,9 @@ class LocaleLocalTasksTest extends LocalTaskIntegrationTestBase {
    * @dataProvider getLocalePageRoutes
    */
   public function testLocalePageLocalTasks($route) {
-    $tasks = array(
-      0 => array('locale.translate_page', 'locale.translate_import', 'locale.translate_export', 'locale.settings'),
-    );
+    $tasks = [
+      0 => ['locale.translate_page', 'locale.translate_import', 'locale.translate_export', 'locale.settings'],
+    ];
     $this->assertLocalTasks($route, $tasks);
   }
 
@@ -37,12 +37,12 @@ class LocaleLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function getLocalePageRoutes() {
-    return array(
-      array('locale.translate_page'),
-      array('locale.translate_import'),
-      array('locale.translate_export'),
-      array('locale.settings'),
-    );
+    return [
+      ['locale.translate_page'],
+      ['locale.translate_import'],
+      ['locale.translate_export'],
+      ['locale.settings'],
+    ];
   }
 
 }
diff --git a/web/core/modules/locale/tests/src/Unit/StringBaseTest.php b/web/core/modules/locale/tests/src/Unit/StringBaseTest.php
index 58ea0ff11..96bb41bc2 100644
--- a/web/core/modules/locale/tests/src/Unit/StringBaseTest.php
+++ b/web/core/modules/locale/tests/src/Unit/StringBaseTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\locale\Unit;
 
 use Drupal\locale\SourceString;
+use Drupal\locale\StringStorageException;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -13,22 +14,20 @@ class StringBaseTest extends UnitTestCase {
 
   /**
    * @covers ::save
-   * @expectedException \Drupal\locale\StringStorageException
-   * @expectedExceptionMessage The string cannot be saved because its not bound to a storage: test
    */
   public function testSaveWithoutStorage() {
     $string = new SourceString(['source' => 'test']);
+    $this->setExpectedException(StringStorageException::class, 'The string cannot be saved because its not bound to a storage: test');
     $string->save();
   }
 
 
   /**
    * @covers ::delete
-   * @expectedException \Drupal\locale\StringStorageException
-   * @expectedExceptionMessage The string cannot be deleted because its not bound to a storage: test
    */
   public function testDeleteWithoutStorage() {
     $string = new SourceString(['lid' => 1, 'source' => 'test']);
+    $this->setExpectedException(StringStorageException::class, 'The string cannot be deleted because its not bound to a storage: test');
     $string->delete();
   }
 
diff --git a/web/core/modules/menu_link_content/menu_link_content.module b/web/core/modules/menu_link_content/menu_link_content.module
index 98357c6cd..0e02ba948 100644
--- a/web/core/modules/menu_link_content/menu_link_content.module
+++ b/web/core/modules/menu_link_content/menu_link_content.module
@@ -18,10 +18,10 @@ function menu_link_content_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('The Custom Menu Links module allows users to create menu links. These links can be translated if multiple languages are used for the site.');
       if (\Drupal::moduleHandler()->moduleExists('menu_ui')) {
-        $output .= ' ' . t('It is required by the Menu UI module, which provides an interface for managing menus and menu links. For more information, see the <a href=":menu-help">Menu UI module help page</a> and the <a href=":drupal-org-help">online documentation for the Custom Menu Links module</a>.', array(':menu-help' => \Drupal::url('help.page', array('name' => 'menu_ui')), ':drupal-org-help' => 'https://www.drupal.org/documentation/modules/menu_link'));
+        $output .= ' ' . t('It is required by the Menu UI module, which provides an interface for managing menus and menu links. For more information, see the <a href=":menu-help">Menu UI module help page</a> and the <a href=":drupal-org-help">online documentation for the Custom Menu Links module</a>.', [':menu-help' => \Drupal::url('help.page', ['name' => 'menu_ui']), ':drupal-org-help' => 'https://www.drupal.org/documentation/modules/menu_link']);
       }
       else {
-        $output .= ' ' . t('For more information, see the <a href=":drupal-org-help">online documentation for the Custom Menu Links module</a>. If you enable the Menu UI module, it provides an interface for managing menus and menu links.', array(':drupal-org-help' => 'https://www.drupal.org/documentation/modules/menu_link'));
+        $output .= ' ' . t('For more information, see the <a href=":drupal-org-help">online documentation for the Custom Menu Links module</a>. If you enable the Menu UI module, it provides an interface for managing menus and menu links.', [':drupal-org-help' => 'https://www.drupal.org/documentation/modules/menu_link']);
       }
       $output .= '</p>';
       return $output;
@@ -33,7 +33,7 @@ function menu_link_content_help($route_name, RouteMatchInterface $route_match) {
  */
 function menu_link_content_menu_delete(MenuInterface $menu) {
   $storage = \Drupal::entityManager()->getStorage('menu_link_content');
-  $menu_links = $storage->loadByProperties(array('menu_name' => $menu->id()));
+  $menu_links = $storage->loadByProperties(['menu_name' => $menu->id()]);
   $storage->delete($menu_links);
 }
 
diff --git a/web/core/modules/menu_link_content/src/Controller/MenuController.php b/web/core/modules/menu_link_content/src/Controller/MenuController.php
index 6aaae646c..be7879f98 100644
--- a/web/core/modules/menu_link_content/src/Controller/MenuController.php
+++ b/web/core/modules/menu_link_content/src/Controller/MenuController.php
@@ -20,12 +20,12 @@ class MenuController extends ControllerBase {
    *   Returns the menu link creation form.
    */
   public function addLink(MenuInterface $menu) {
-    $menu_link = $this->entityManager()->getStorage('menu_link_content')->create(array(
+    $menu_link = $this->entityManager()->getStorage('menu_link_content')->create([
       'id' => '',
       'parent' => '',
       'menu_name' => $menu->id(),
       'bundle' => 'menu_link_content',
-    ));
+    ]);
     return $this->entityFormBuilder()->getForm($menu_link);
   }
 
diff --git a/web/core/modules/menu_link_content/src/Entity/MenuLinkContent.php b/web/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
index d23f876be..d53ba4926 100644
--- a/web/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
+++ b/web/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
@@ -133,7 +133,7 @@ class MenuLinkContent extends ContentEntityBase implements MenuLinkContentInterf
    * {@inheritdoc}
    */
   public function getPluginDefinition() {
-    $definition = array();
+    $definition = [];
     $definition['class'] = 'Drupal\menu_link_content\Plugin\Menu\MenuLinkContent';
     $definition['menu_name'] = $this->getMenuName();
 
@@ -155,7 +155,7 @@ class MenuLinkContent extends ContentEntityBase implements MenuLinkContentInterf
     $definition['description'] = $this->getDescription();
     $definition['weight'] = $this->getWeight();
     $definition['id'] = $this->getPluginId();
-    $definition['metadata'] = array('entity_id' => $this->id());
+    $definition['metadata'] = ['entity_id' => $this->id()];
     $definition['form_class'] = '\Drupal\menu_link_content\Form\MenuLinkContentForm';
     $definition['enabled'] = $this->isEnabled() ? 1 : 0;
     $definition['expanded'] = $this->isExpanded() ? 1 : 0;
@@ -256,15 +256,15 @@ class MenuLinkContent extends ContentEntityBase implements MenuLinkContentInterf
       ->setRequired(TRUE)
       ->setTranslatable(TRUE)
       ->setSetting('max_length', 255)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'string',
         'weight' => -5,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -5,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['description'] = BaseFieldDefinition::create('string')
@@ -272,15 +272,15 @@ class MenuLinkContent extends ContentEntityBase implements MenuLinkContentInterf
       ->setDescription(t('Shown when hovering over the menu link.'))
       ->setTranslatable(TRUE)
       ->setSetting('max_length', 255)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'string',
         'weight' => 0,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => 0,
-      ));
+      ]);
 
     $fields['menu_name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Menu name'))
@@ -292,14 +292,14 @@ class MenuLinkContent extends ContentEntityBase implements MenuLinkContentInterf
       ->setLabel(t('Link'))
       ->setDescription(t('The location this menu link points to.'))
       ->setRequired(TRUE)
-      ->setSettings(array(
+      ->setSettings([
         'link_type' => LinkItemInterface::LINK_GENERIC,
         'title' => DRUPAL_DISABLED,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'link_default',
         'weight' => -2,
-      ));
+      ]);
 
     $fields['external'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('External'))
@@ -314,43 +314,43 @@ class MenuLinkContent extends ContentEntityBase implements MenuLinkContentInterf
       ->setLabel(t('Weight'))
       ->setDescription(t('Link weight among links in the same menu at the same depth. In the menu, the links with high weight will sink and links with a low weight will be positioned nearer the top.'))
       ->setDefaultValue(0)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'integer',
         'weight' => 0,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'number',
         'weight' => 20,
-      ));
+      ]);
 
     $fields['expanded'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Show as expanded'))
       ->setDescription(t('If selected and this menu link has children, the menu will always appear expanded.'))
       ->setDefaultValue(FALSE)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'boolean',
         'weight' => 0,
-      ))
-      ->setDisplayOptions('form', array(
-        'settings' => array('display_label' => TRUE),
+      ])
+      ->setDisplayOptions('form', [
+        'settings' => ['display_label' => TRUE],
         'weight' => 0,
-      ));
+      ]);
 
     $fields['enabled'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Enabled'))
       ->setDescription(t('A flag for whether the link should be enabled in menus or hidden.'))
       ->setDefaultValue(TRUE)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'boolean',
         'weight' => 0,
-      ))
-      ->setDisplayOptions('form', array(
-        'settings' => array('display_label' => TRUE),
+      ])
+      ->setDisplayOptions('form', [
+        'settings' => ['display_label' => TRUE],
         'weight' => -1,
-      ));
+      ]);
 
     $fields['parent'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Parent plugin ID'))
diff --git a/web/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php b/web/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php
index b4caaff46..2b780c9e0 100644
--- a/web/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php
+++ b/web/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php
@@ -15,7 +15,7 @@ class MenuLinkContentDeleteForm extends ContentEntityDeleteForm {
    */
   public function getCancelUrl() {
     if ($this->moduleHandler->moduleExists('menu_ui')) {
-      return new Url('entity.menu.edit_form', array('menu' => $this->entity->getMenuName()));
+      return new Url('entity.menu.edit_form', ['menu' => $this->entity->getMenuName()]);
     }
     return $this->entity->urlInfo();
   }
@@ -31,7 +31,7 @@ class MenuLinkContentDeleteForm extends ContentEntityDeleteForm {
    * {@inheritdoc}
    */
   protected function getDeletionMessage() {
-    return $this->t('The menu link %title has been deleted.', array('%title' => $this->entity->label()));
+    return $this->t('The menu link %title has been deleted.', ['%title' => $this->entity->label()]);
   }
 
 }
diff --git a/web/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php b/web/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php
index ed372a926..4bdd6b9cf 100644
--- a/web/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php
+++ b/web/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php
@@ -2,8 +2,10 @@
 
 namespace Drupal\menu_link_content\Form;
 
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Menu\MenuParentFormSelectorInterface;
@@ -47,9 +49,13 @@ class MenuLinkContentForm extends ContentEntityForm {
    *   The language manager.
    * @param \Drupal\Core\Path\PathValidatorInterface $path_validator
    *   The path validator.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle service.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, MenuParentFormSelectorInterface $menu_parent_selector, LanguageManagerInterface $language_manager, PathValidatorInterface $path_validator) {
-    parent::__construct($entity_manager, $language_manager);
+  public function __construct(EntityManagerInterface $entity_manager, MenuParentFormSelectorInterface $menu_parent_selector, LanguageManagerInterface $language_manager, PathValidatorInterface $path_validator, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
+    parent::__construct($entity_manager, $entity_type_bundle_info, $time);
     $this->menuParentSelector = $menu_parent_selector;
     $this->pathValidator = $path_validator;
   }
@@ -62,7 +68,9 @@ class MenuLinkContentForm extends ContentEntityForm {
       $container->get('entity.manager'),
       $container->get('menu.parent_form_selector'),
       $container->get('language_manager'),
-      $container->get('path.validator')
+      $container->get('path.validator'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time')
     );
   }
 
@@ -105,8 +113,8 @@ class MenuLinkContentForm extends ContentEntityForm {
 
     $entity->parent->value = $parent;
     $entity->menu_name->value = $menu_name;
-    $entity->enabled->value = (!$form_state->isValueEmpty(array('enabled', 'value')));
-    $entity->expanded->value = (!$form_state->isValueEmpty(array('expanded', 'value')));
+    $entity->enabled->value = (!$form_state->isValueEmpty(['enabled', 'value']));
+    $entity->expanded->value = (!$form_state->isValueEmpty(['expanded', 'value']));
 
     return $entity;
   }
@@ -123,7 +131,7 @@ class MenuLinkContentForm extends ContentEntityForm {
       drupal_set_message($this->t('The menu link has been saved.'));
       $form_state->setRedirect(
         'entity.menu_link_content.canonical',
-        array('menu_link_content' => $menu_link->id())
+        ['menu_link_content' => $menu_link->id()]
       );
     }
     else {
diff --git a/web/core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php b/web/core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php
index c9771d418..eadf04532 100644
--- a/web/core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php
+++ b/web/core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php
@@ -56,14 +56,15 @@ class MenuLinkContentAccessControlHandler extends EntityAccessControlHandler imp
 
       case 'update':
         if (!$account->hasPermission('administer menu')) {
-          return AccessResult::neutral()->cachePerPermissions();
+          return AccessResult::neutral("The 'administer menu' permission is required.")->cachePerPermissions();
         }
         else {
-          // If there is a URL, this is an external link so always accessible.
+          // Assume that access is allowed.
           $access = AccessResult::allowed()->cachePerPermissions()->addCacheableDependency($entity);
           /** @var \Drupal\menu_link_content\MenuLinkContentInterface $entity */
-          // We allow access, but only if the link is accessible as well.
-          if (($url_object = $entity->getUrlObject()) && $url_object->isRouted()) {
+          // If the link is routed determine whether the user has access unless
+          // they have the 'link to any page' permission.
+          if (!$account->hasPermission('link to any page') && ($url_object = $entity->getUrlObject()) && $url_object->isRouted()) {
             $link_access = $this->accessManager->checkNamedRoute($url_object->getRouteName(), $url_object->getRouteParameters(), $account, TRUE);
             $access = $access->andIf($link_access);
           }
diff --git a/web/core/modules/menu_link_content/src/Plugin/Deriver/MenuLinkContentDeriver.php b/web/core/modules/menu_link_content/src/Plugin/Deriver/MenuLinkContentDeriver.php
index e05fa2158..c53f1327c 100644
--- a/web/core/modules/menu_link_content/src/Plugin/Deriver/MenuLinkContentDeriver.php
+++ b/web/core/modules/menu_link_content/src/Plugin/Deriver/MenuLinkContentDeriver.php
@@ -4,7 +4,6 @@ namespace Drupal\menu_link_content\Plugin\Deriver;
 
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Menu\MenuLinkManagerInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -17,13 +16,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class MenuLinkContentDeriver extends DeriverBase implements ContainerDeriverInterface {
 
-  /**
-   * The query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
-
   /**
    * The entity manager.
    *
@@ -41,15 +33,12 @@ class MenuLinkContentDeriver extends DeriverBase implements ContainerDeriverInte
   /**
    * Constructs a MenuLinkContentDeriver instance.
    *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The query factory.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
    * @param \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager
    *   The menu link manager.
    */
-  public function __construct(QueryFactory $query_factory, EntityManagerInterface $entity_manager, MenuLinkManagerInterface $menu_link_manager) {
-    $this->queryFactory = $query_factory;
+  public function __construct(EntityManagerInterface $entity_manager, MenuLinkManagerInterface $menu_link_manager) {
     $this->entityManager = $entity_manager;
     $this->menuLinkManager = $menu_link_manager;
   }
@@ -59,7 +48,6 @@ class MenuLinkContentDeriver extends DeriverBase implements ContainerDeriverInte
    */
   public static function create(ContainerInterface $container, $base_plugin_id) {
     return new static(
-      $container->get('entity.query'),
       $container->get('entity.manager'),
       $container->get('plugin.manager.menu.link')
     );
@@ -70,7 +58,7 @@ class MenuLinkContentDeriver extends DeriverBase implements ContainerDeriverInte
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
     // Get all custom menu links which should be rediscovered.
-    $entity_ids = $this->queryFactory->get('menu_link_content')
+    $entity_ids = $this->entityManager->getStorage('menu_link_content')->getQuery()
       ->condition('rediscover', TRUE)
       ->execute();
     $plugin_definitions = [];
diff --git a/web/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php b/web/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
index fea021121..98e8cdfcb 100644
--- a/web/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
+++ b/web/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
@@ -21,12 +21,12 @@ class MenuLinkContent extends MenuLinkBase implements ContainerFactoryPluginInte
    *
    * @var array
    */
-  protected static $entityIdsToLoad = array();
+  protected static $entityIdsToLoad = [];
 
   /**
    * {@inheritdoc}
    */
-  protected $overrideAllowed = array(
+  protected $overrideAllowed = [
     'menu_name' => 1,
     'parent' => 1,
     'weight' => 1,
@@ -38,7 +38,7 @@ class MenuLinkContent extends MenuLinkBase implements ContainerFactoryPluginInte
     'route_parameters' => 1,
     'url' => 1,
     'options' => 1,
-  );
+  ];
 
   /**
    * The menu link content entity connected to this plugin instance.
@@ -123,12 +123,12 @@ class MenuLinkContent extends MenuLinkBase implements ContainerFactoryPluginInte
         static::$entityIdsToLoad[$entity_id] = $entity_id;
         $entities = $storage->loadMultiple(array_values(static::$entityIdsToLoad));
         $entity = isset($entities[$entity_id]) ? $entities[$entity_id] : NULL;
-        static::$entityIdsToLoad = array();
+        static::$entityIdsToLoad = [];
       }
       if (!$entity) {
         // Fallback to the loading by the UUID.
         $uuid = $this->getUuid();
-        $loaded_entities = $storage->loadByProperties(array('uuid' => $uuid));
+        $loaded_entities = $storage->loadByProperties(['uuid' => $uuid]);
         $entity = reset($loaded_entities);
       }
       if (!$entity) {
diff --git a/web/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php b/web/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php
index 067b13313..338d3ecef 100644
--- a/web/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php
+++ b/web/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php
@@ -39,7 +39,7 @@ class MenuLink extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'menu_name' => t("The menu name. All links with the same menu name (such as 'navigation') are part of the same menu."),
       'mlid' => t('The menu link ID (mlid) is the integer primary key.'),
       'plid' => t('The parent link ID (plid) is the mlid of the link above in the hierarchy, or zero if the link is at the top level in its menu.'),
@@ -65,7 +65,7 @@ class MenuLink extends DrupalSqlBase {
       'p8' => t('The eighth mlid in the materialized path. See p1.'),
       'p9' => t('The ninth mlid in the materialized path. See p1.'),
       'updated' => t('Flag that indicates that this link was generated during the update from Drupal 5.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php b/web/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
index 1bdc927f7..1e726fc2f 100644
--- a/web/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
+++ b/web/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\menu_link_content\Tests;
 
+use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -16,17 +17,57 @@ class MenuLinkContentFormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'menu_link_content',
-  );
+  ];
+
+  /**
+   * User with 'administer menu' and 'link to any page' permission.
+   *
+   * @var \Drupal\user\Entity\User
+   */
+
+  protected $adminUser;
+
+  /**
+   * User with only 'administer menu' permission.
+   *
+   * @var \Drupal\user\Entity\User
+   */
+
+  protected $basicUser;
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $web_user = $this->drupalCreateUser(array('administer menu'));
-    $this->drupalLogin($web_user);
+    $this->adminUser = $this->drupalCreateUser(['administer menu', 'link to any page']);
+    $this->basicUser = $this->drupalCreateUser(['administer menu']);
+    $this->drupalLogin($this->adminUser);
+  }
+
+  /**
+   * Tests the 'link to any page' permission for a restricted page.
+   */
+  public function testMenuLinkContentFormLinkToAnyPage() {
+    $menu_link = MenuLinkContent::create([
+      'title' => 'Menu link test',
+      'provider' => 'menu_link_content',
+      'menu_name' => 'admin',
+      'link' => ['uri' => 'internal:/user/login'],
+    ]);
+    $menu_link->save();
+
+    // The user should be able to edit a menu link to the page, even though
+    // the user cannot access the page itself.
+    $this->drupalGet('/admin/structure/menu/item/' . $menu_link->id() . '/edit');
+    $this->assertResponse(200);
+
+    $this->drupalLogin($this->basicUser);
+
+    $this->drupalGet('/admin/structure/menu/item/' . $menu_link->id() . '/edit');
+    $this->assertResponse(403);
   }
 
   /**
@@ -34,16 +75,16 @@ class MenuLinkContentFormTest extends WebTestBase {
    */
   public function testMenuLinkContentForm() {
     $this->drupalGet('admin/structure/menu/manage/admin/add');
-    $element = $this->xpath('//select[@id = :id]/option[@selected]', array(':id' => 'edit-menu-parent'));
+    $element = $this->xpath('//select[@id = :id]/option[@selected]', [':id' => 'edit-menu-parent']);
     $this->assertTrue($element, 'A default menu parent was found.');
     $this->assertEqual('admin:', $element[0]['value'], '<Administration> menu is the parent.');
 
     $this->drupalPostForm(
       NULL,
-      array(
+      [
         'title[0][value]' => t('Front page'),
         'link[0][uri]' => '<front>',
-      ),
+      ],
       t('Save')
     );
     $this->assertText(t('The menu link has been saved.'));
@@ -56,10 +97,10 @@ class MenuLinkContentFormTest extends WebTestBase {
     $this->drupalGet('admin/structure/menu/manage/admin/add');
     $this->drupalPostForm(
       NULL,
-      array(
+      [
         'title[0][value]' => t('Test page'),
         'link[0][uri]' => '<test>',
-      ),
+      ],
       t('Save')
     );
     $this->assertText(t('Manually entered paths should start with /, ? or #.'));
diff --git a/web/core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php b/web/core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php
index cf802b706..b0419563b 100644
--- a/web/core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php
+++ b/web/core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php
@@ -22,12 +22,12 @@ class MenuLinkContentTranslationUITest extends ContentTranslationUITestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'language',
     'content_translation',
     'menu_link_content',
     'menu_ui',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -42,14 +42,14 @@ class MenuLinkContentTranslationUITest extends ContentTranslationUITestBase {
    * {@inheritdoc}
    */
   protected function getTranslatorPermissions() {
-    return array_merge(parent::getTranslatorPermissions(), array('administer menu'));
+    return array_merge(parent::getTranslatorPermissions(), ['administer menu']);
   }
 
   /**
    * {@inheritdoc}
    */
   protected function getAdministratorPermissions() {
-    return array_merge(parent::getAdministratorPermissions(), array('administer themes', 'view the administration theme'));
+    return array_merge(parent::getAdministratorPermissions(), ['administer themes', 'view the administration theme']);
   }
 
   /**
@@ -79,13 +79,13 @@ class MenuLinkContentTranslationUITest extends ContentTranslationUITestBase {
   /**
    * Tests that translation page inherits admin status of edit page.
    */
-  function testTranslationLinkTheme() {
+  public function testTranslationLinkTheme() {
     $this->drupalLogin($this->administrator);
-    $entityId = $this->createEntity(array(), 'en');
+    $entityId = $this->createEntity([], 'en');
 
     // Set up Seven as the admin theme to test.
-    $this->container->get('theme_handler')->install(array('seven'));
-    $edit = array();
+    $this->container->get('theme_handler')->install(['seven']);
+    $edit = [];
     $edit['admin_theme'] = 'seven';
     $this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
     $this->drupalGet('admin/structure/menu/item/' . $entityId . '/edit');
@@ -107,14 +107,14 @@ class MenuLinkContentTranslationUITest extends ContentTranslationUITestBase {
     foreach ($this->langcodes as $langcode) {
       // We only want to test the title for non-english translations.
       if ($langcode != 'en') {
-        $options = array('language' => $languages[$langcode]);
+        $options = ['language' => $languages[$langcode]];
         $url = $entity->urlInfo('edit-form', $options);
         $this->drupalGet($url);
 
-        $title = t('@title [%language translation]', array(
+        $title = t('@title [%language translation]', [
           '@title' => $entity->getTranslation($langcode)->label(),
           '%language' => $languages[$langcode]->getName(),
-        ));
+        ]);
         $this->assertRaw($title);
       }
     }
diff --git a/web/core/modules/menu_link_content/src/Tests/LinksTest.php b/web/core/modules/menu_link_content/tests/src/Functional/LinksTest.php
similarity index 83%
rename from web/core/modules/menu_link_content/src/Tests/LinksTest.php
rename to web/core/modules/menu_link_content/tests/src/Functional/LinksTest.php
index 84fecde13..5a7121af7 100644
--- a/web/core/modules/menu_link_content/src/Tests/LinksTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Functional/LinksTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\menu_link_content\Tests;
+namespace Drupal\Tests\menu_link_content\Functional;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Entity\Menu;
 
 /**
@@ -12,14 +12,14 @@ use Drupal\system\Entity\Menu;
  *
  * @group Menu
  */
-class LinksTest extends WebTestBase {
+class LinksTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('router_test', 'menu_link_content');
+  public static $modules = ['router_test', 'menu_link_content'];
 
   /**
    * The menu link plugin manager.
@@ -36,17 +36,17 @@ class LinksTest extends WebTestBase {
 
     $this->menuLinkManager = \Drupal::service('plugin.manager.menu.link');
 
-    Menu::create(array(
+    Menu::create([
       'id' => 'menu_test',
       'label' => 'Test menu',
       'description' => 'Description text',
-    ))->save();
+    ])->save();
   }
 
   /**
    * Create a simple hierarchy of links.
    */
-  function createLinkHierarchy($module = 'menu_test') {
+  public function createLinkHierarchy($module = 'menu_test') {
     // First remove all the menu links in the menu.
     $this->menuLinkManager->deleteLinksInMenu('menu_test');
 
@@ -56,47 +56,47 @@ class LinksTest extends WebTestBase {
     //      - child-1-1
     //      - child-1-2
     //   - child-2
-    $base_options = array(
+    $base_options = [
       'title' => 'Menu link test',
       'provider' => $module,
       'menu_name' => 'menu_test',
-    );
+    ];
 
-    $parent = $base_options + array(
+    $parent = $base_options + [
       'link' => ['uri' => 'internal:/menu-test/hierarchy/parent'],
-    );
+    ];
     $link = MenuLinkContent::create($parent);
     $link->save();
     $links['parent'] = $link->getPluginId();
 
-    $child_1 = $base_options + array(
+    $child_1 = $base_options + [
       'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child'],
       'parent' => $links['parent'],
-    );
+    ];
     $link = MenuLinkContent::create($child_1);
     $link->save();
     $links['child-1'] = $link->getPluginId();
 
-    $child_1_1 = $base_options + array(
+    $child_1_1 = $base_options + [
       'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child2/child'],
       'parent' => $links['child-1'],
-    );
+    ];
     $link = MenuLinkContent::create($child_1_1);
     $link->save();
     $links['child-1-1'] = $link->getPluginId();
 
-    $child_1_2 = $base_options + array(
+    $child_1_2 = $base_options + [
       'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child2/child'],
       'parent' => $links['child-1'],
-    );
+    ];
     $link = MenuLinkContent::create($child_1_2);
     $link->save();
     $links['child-1-2'] = $link->getPluginId();
 
-    $child_2 = $base_options + array(
+    $child_2 = $base_options + [
       'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child'],
       'parent' => $links['parent'],
-    );
+    ];
     $link = MenuLinkContent::create($child_2);
     $link->save();
     $links['child-2'] = $link->getPluginId();
@@ -107,13 +107,13 @@ class LinksTest extends WebTestBase {
   /**
    * Assert that at set of links is properly parented.
    */
-  function assertMenuLinkParents($links, $expected_hierarchy) {
+  public function assertMenuLinkParents($links, $expected_hierarchy) {
     foreach ($expected_hierarchy as $id => $parent) {
       /* @var \Drupal\Core\Menu\MenuLinkInterface $menu_link_plugin  */
       $menu_link_plugin = $this->menuLinkManager->createInstance($links[$id]);
       $expected_parent = isset($links[$parent]) ? $links[$parent] : '';
 
-      $this->assertEqual($menu_link_plugin->getParent(), $expected_parent, SafeMarkup::format('Menu link %id has parent of %parent, expected %expected_parent.', array('%id' => $id, '%parent' => $menu_link_plugin->getParent(), '%expected_parent' => $expected_parent)));
+      $this->assertEqual($menu_link_plugin->getParent(), $expected_parent, SafeMarkup::format('Menu link %id has parent of %parent, expected %expected_parent.', ['%id' => $id, '%parent' => $menu_link_plugin->getParent(), '%expected_parent' => $expected_parent]));
     }
   }
 
@@ -121,18 +121,18 @@ class LinksTest extends WebTestBase {
    * Assert that a link entity's created timestamp is set.
    */
   public function testCreateLink() {
-    $options = array(
+    $options = [
       'menu_name' => 'menu_test',
       'bundle' => 'menu_link_content',
       'link' => [['uri' => 'internal:/']],
-    );
+    ];
     $link = MenuLinkContent::create($options);
     $link->save();
     // Make sure the changed timestamp is set.
     $this->assertEqual($link->getChangedTime(), REQUEST_TIME, 'Creating a menu link sets the "changed" timestamp.');
-    $options = array(
+    $options = [
       'title' => 'Test Link',
-    );
+    ];
     $link->link->options = $options;
     $link->changed->value = 0;
     $link->save();
@@ -143,36 +143,36 @@ class LinksTest extends WebTestBase {
   /**
    * Test automatic reparenting of menu links.
    */
-  function testMenuLinkReparenting($module = 'menu_test') {
+  public function testMenuLinkReparenting($module = 'menu_test') {
     // Check the initial hierarchy.
     $links = $this->createLinkHierarchy($module);
 
-    $expected_hierarchy = array(
+    $expected_hierarchy = [
       'parent' => '',
       'child-1' => 'parent',
       'child-1-1' => 'child-1',
       'child-1-2' => 'child-1',
       'child-2' => 'parent',
-    );
+    ];
     $this->assertMenuLinkParents($links, $expected_hierarchy);
 
     // Start over, and move child-1 under child-2, and check that all the
     // children of child-1 have been moved too.
     $links = $this->createLinkHierarchy($module);
     /* @var \Drupal\Core\Menu\MenuLinkInterface $menu_link_plugin  */
-    $this->menuLinkManager->updateDefinition($links['child-1'], array('parent' => $links['child-2']));
+    $this->menuLinkManager->updateDefinition($links['child-1'], ['parent' => $links['child-2']]);
     // Verify that the entity was updated too.
     $menu_link_plugin = $this->menuLinkManager->createInstance($links['child-1']);
     $entity = \Drupal::entityManager()->loadEntityByUuid('menu_link_content', $menu_link_plugin->getDerivativeId());
     $this->assertEqual($entity->getParentId(), $links['child-2']);
 
-    $expected_hierarchy = array(
+    $expected_hierarchy = [
       'parent' => '',
       'child-1' => 'child-2',
       'child-1-1' => 'child-1',
       'child-1-2' => 'child-1',
       'child-2' => 'parent',
-    );
+    ];
     $this->assertMenuLinkParents($links, $expected_hierarchy);
 
     // Start over, and delete child-1, and check that the children of child-1
@@ -180,12 +180,12 @@ class LinksTest extends WebTestBase {
     $links = $this->createLinkHierarchy($module);
     $this->menuLinkManager->removeDefinition($links['child-1']);
 
-    $expected_hierarchy = array(
+    $expected_hierarchy = [
       'parent' => FALSE,
       'child-1-1' => 'parent',
       'child-1-2' => 'parent',
       'child-2' => 'parent',
-    );
+    ];
     $this->assertMenuLinkParents($links, $expected_hierarchy);
 
     // Try changing the parent at the entity level.
@@ -194,12 +194,12 @@ class LinksTest extends WebTestBase {
     $entity->parent->value = '';
     $entity->save();
 
-    $expected_hierarchy = array(
+    $expected_hierarchy = [
       'parent' => '',
       'child-1-1' => 'parent',
       'child-1-2' => '',
       'child-2' => 'parent',
-    );
+    ];
     $this->assertMenuLinkParents($links, $expected_hierarchy);
 
     // @todo Figure out what makes sense to test in terms of automatic
@@ -210,7 +210,7 @@ class LinksTest extends WebTestBase {
    * Tests uninstalling a module providing default links.
    */
   public function testModuleUninstalledMenuLinks() {
-    \Drupal::service('module_installer')->install(array('menu_test'));
+    \Drupal::service('module_installer')->install(['menu_test']);
     \Drupal::service('router.builder')->rebuild();
     \Drupal::service('plugin.manager.menu.link')->rebuild();
     $menu_links = $this->menuLinkManager->loadLinksByRoute('menu_test.menu_test');
@@ -219,7 +219,7 @@ class LinksTest extends WebTestBase {
     $this->assertEqual($menu_link->getPluginId(), 'menu_test');
 
     // Uninstall the module and ensure the menu link got removed.
-    \Drupal::service('module_installer')->uninstall(array('menu_test'));
+    \Drupal::service('module_installer')->uninstall(['menu_test']);
     \Drupal::service('plugin.manager.menu.link')->rebuild();
     $menu_links = $this->menuLinkManager->loadLinksByRoute('menu_test.menu_test');
     $this->assertEqual(count($menu_links), 0);
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
index eea87dbab..f1368ed43 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
@@ -15,7 +15,7 @@ class MigrateMenuLinkTest extends MigrateDrupal6TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('menu_ui', 'menu_link_content');
+  public static $modules = ['menu_ui', 'menu_link_content'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
index 1d757a513..dc17ce3b3 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
@@ -19,7 +19,7 @@ class MigrateMenuLinkTest extends MigrateDrupal7TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('link', 'menu_ui', 'menu_link_content', 'node');
+  public static $modules = ['link', 'menu_ui', 'menu_link_content', 'node'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/source/MenuLinkTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/source/MenuLinkTest.php
index db6c5472c..7fb3a918f 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/source/MenuLinkTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/source/MenuLinkTest.php
@@ -35,7 +35,7 @@ class MenuLinkTest extends MigrateSqlSourceTestBase {
         'link_path' => 'admin/config/system/cron',
         'router_path' => 'admin/config/system/cron',
         'link_title' => 'Cron',
-        'options' => array(),
+        'options' => [],
         'module' => 'system',
         'hidden' => 0,
         'external' => 0,
@@ -64,7 +64,7 @@ class MenuLinkTest extends MigrateSqlSourceTestBase {
         'link_path' => 'node/141',
         'router_path' => 'node/%',
         'link_title' => 'Node 141',
-        'options' => array(),
+        'options' => [],
         'module' => 'menu',
         'hidden' => 0,
         'external' => 0,
@@ -93,7 +93,7 @@ class MenuLinkTest extends MigrateSqlSourceTestBase {
         'link_path' => 'node/142',
         'router_path' => 'node/%',
         'link_title' => 'Node 142',
-        'options' => array(),
+        'options' => [],
         'module' => 'menu',
         'hidden' => 0,
         'external' => 0,
@@ -121,7 +121,7 @@ class MenuLinkTest extends MigrateSqlSourceTestBase {
         'link_path' => 'admin',
         'router_path' => 'admin',
         'link_title' => 'Test 1',
-        'options' => array('attributes' => array('title' => 'Test menu link 1')),
+        'options' => ['attributes' => ['title' => 'Test menu link 1']],
         'module' => 'menu',
         'hidden' => 0,
         'external' => 0,
@@ -149,7 +149,7 @@ class MenuLinkTest extends MigrateSqlSourceTestBase {
         'link_path' => 'admin/modules',
         'router_path' => 'admin/modules',
         'link_title' => 'Test 2',
-        'options' => array('attributes' => array('title' => 'Test menu link 2')),
+        'options' => ['attributes' => ['title' => 'Test menu link 2']],
         'module' => 'menu',
         'hidden' => 0,
         'external' => 0,
@@ -177,7 +177,7 @@ class MenuLinkTest extends MigrateSqlSourceTestBase {
         'link_path' => 'admin/build/menu-customize/navigation',
         'router_path' => 'admin/build/menu-customize/%',
         'link_title' => 'Navigation',
-        'options' => array(),
+        'options' => [],
         'module' => 'menu',
         'hidden' => 0,
         'external' => 0,
diff --git a/web/core/modules/menu_ui/menu_ui.module b/web/core/modules/menu_ui/menu_ui.module
index 92254c2d3..cffccde76 100644
--- a/web/core/modules/menu_ui/menu_ui.module
+++ b/web/core/modules/menu_ui/menu_ui.module
@@ -22,8 +22,11 @@ use Drupal\system\Entity\Menu;
 use Drupal\node\NodeInterface;
 
 /**
- * Maximum length of menu name as entered by the user. Database length is 32
- * and we add a menu- prefix.
+ * Maximum length of menu name as entered by the user.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ *   \Drupal\Core\Config\Entity\ConfigEntityStorage::MAX_ID_LENGTH because the
+ *   menu name is a configuration entity ID.
  */
 const MENU_MAX_MENU_NAME_LENGTH_UI = 27;
 
@@ -35,21 +38,21 @@ function menu_ui_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.menu_ui':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Menu UI module provides an interface for managing menus. A menu is a hierarchical collection of links, which can be within or external to the site, generally used for navigation. For more information, see the <a href=":menu">online documentation for the Menu UI module</a>.', array(':menu' => 'https://www.drupal.org/documentation/modules/menu/')) . '</p>';
+      $output .= '<p>' . t('The Menu UI module provides an interface for managing menus. A menu is a hierarchical collection of links, which can be within or external to the site, generally used for navigation. For more information, see the <a href=":menu">online documentation for the Menu UI module</a>.', [':menu' => 'https://www.drupal.org/documentation/modules/menu/']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing menus') . '</dt>';
-      $output .= '<dd>' . t('Users with the <em>Administer menus and menu items</em> permission can add, edit, and delete custom menus on the <a href=":menu">Menus page</a>. Custom menus can be special site menus, menus of external links, or any combination of internal and external links. You may create an unlimited number of additional menus, each of which will automatically have an associated block (if you have the <a href=":block_help">Block module</a> installed). By selecting <em>Edit menu</em>, you can add, edit, or delete links for a given menu. The links listing page provides a drag-and-drop interface for controlling the order of links, and creating a hierarchy within the menu.', array(':block_help' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('help.page', array('name' => 'block')) : '#', ':menu' => \Drupal::url('entity.menu.collection'))) . '</dd>';
+      $output .= '<dd>' . t('Users with the <em>Administer menus and menu items</em> permission can add, edit, and delete custom menus on the <a href=":menu">Menus page</a>. Custom menus can be special site menus, menus of external links, or any combination of internal and external links. You may create an unlimited number of additional menus, each of which will automatically have an associated block (if you have the <a href=":block_help">Block module</a> installed). By selecting <em>Edit menu</em>, you can add, edit, or delete links for a given menu. The links listing page provides a drag-and-drop interface for controlling the order of links, and creating a hierarchy within the menu.', [':block_help' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('help.page', ['name' => 'block']) : '#', ':menu' => \Drupal::url('entity.menu.collection')]) . '</dd>';
       $output .= '<dt>' . t('Displaying menus') . '</dt>';
-      $output .= '<dd>' . t('If you have the Block module enabled, then each menu that you create is rendered in a block that you enable and position on the <a href=":blocks">Block layout page</a>. In some <a href=":themes">themes</a>, the main menu and possibly the secondary menu will be output automatically; you may be able to disable this behavior on the <a href=":themes">theme\'s settings page</a>.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', ':themes' => \Drupal::url('system.themes_page'), ':theme_settings' => \Drupal::url('system.theme_settings'))) . '</dd>';
+      $output .= '<dd>' . t('If you have the Block module enabled, then each menu that you create is rendered in a block that you enable and position on the <a href=":blocks">Block layout page</a>. In some <a href=":themes">themes</a>, the main menu and possibly the secondary menu will be output automatically; you may be able to disable this behavior on the <a href=":themes">theme\'s settings page</a>.', [':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', ':themes' => \Drupal::url('system.themes_page'), ':theme_settings' => \Drupal::url('system.theme_settings')]) . '</dd>';
       $output .= '</dl>';
       return $output;
   }
   if ($route_name == 'entity.menu.add_form' && \Drupal::moduleHandler()->moduleExists('block') && \Drupal::currentUser()->hasPermission('administer blocks')) {
-    return '<p>' . t('You can enable the newly-created block for this menu on the <a href=":blocks">Block layout page</a>.', array(':blocks' => \Drupal::url('block.admin_display'))) . '</p>';
+    return '<p>' . t('You can enable the newly-created block for this menu on the <a href=":blocks">Block layout page</a>.', [':blocks' => \Drupal::url('block.admin_display')]) . '</p>';
   }
   elseif ($route_name == 'entity.menu.collection' && \Drupal::moduleHandler()->moduleExists('block') && \Drupal::currentUser()->hasPermission('administer blocks')) {
-    return '<p>' . t('Each menu has a corresponding block that is managed on the <a href=":blocks">Block layout page</a>.', array(':blocks' => \Drupal::url('block.admin_display'))) . '</p>';
+    return '<p>' . t('Each menu has a corresponding block that is managed on the <a href=":blocks">Block layout page</a>.', [':blocks' => \Drupal::url('block.admin_display')]) . '</p>';
   }
 }
 
@@ -120,9 +123,9 @@ function menu_ui_menu_delete(Menu $menu) {
 function menu_ui_block_view_system_menu_block_alter(array &$build, BlockPluginInterface $block) {
   if ($block->getBaseId() == 'system_menu_block') {
     $menu_name = $block->getDerivativeId();
-    $build['#contextual_links']['menu'] = array(
-      'route_parameters' => array('menu' => $menu_name),
-    );
+    $build['#contextual_links']['menu'] = [
+      'route_parameters' => ['menu' => $menu_name],
+    ];
   }
 }
 
@@ -149,10 +152,10 @@ function _menu_ui_node_save(NodeInterface $node, array $values) {
   }
   else {
     // Create a new menu_link_content entity.
-    $entity = MenuLinkContent::create(array(
+    $entity = MenuLinkContent::create([
       'link' => ['uri' => 'entity:node/' . $node->id()],
       'langcode' => $node->language()->getId(),
-    ));
+    ]);
     $entity->enabled->value = 1;
   }
   $entity->title->value = trim($values['title']);
@@ -170,7 +173,7 @@ function menu_ui_node_predelete(EntityInterface $node) {
   // Delete all MenuLinkContent links that point to this node.
   /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
   $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-  $result = $menu_link_manager->loadLinksByRoute('entity.node.canonical', array('node' => $node->id()));
+  $result = $menu_link_manager->loadLinksByRoute('entity.node.canonical', ['node' => $node->id()]);
 
   if (!empty($result)) {
     foreach ($result as $id => $instance) {
@@ -199,7 +202,7 @@ function menu_ui_get_menu_link_defaults(NodeInterface $node) {
   if ($node->id()) {
     $id = FALSE;
     // Give priority to the default menu
-    $type_menus = $node_type->getThirdPartySetting('menu_ui', 'available_menus', array('main'));
+    $type_menus = $node_type->getThirdPartySetting('menu_ui', 'available_menus', ['main']);
     if (in_array($menu_name, $type_menus)) {
       $query = \Drupal::entityQuery('menu_link_content')
         ->condition('link.uri', 'node/' . $node->id())
@@ -224,7 +227,7 @@ function menu_ui_get_menu_link_defaults(NodeInterface $node) {
     if ($id) {
       $menu_link = MenuLinkContent::load($id);
       $menu_link = \Drupal::service('entity.repository')->getTranslationFromContext($menu_link);
-      $defaults = array(
+      $defaults = [
         'entity_id' => $menu_link->id(),
         'id' => $menu_link->getPluginId(),
         'title' => $menu_link->getTitle(),
@@ -233,7 +236,7 @@ function menu_ui_get_menu_link_defaults(NodeInterface $node) {
         'menu_name' => $menu_link->getMenuName(),
         'parent' => $menu_link->getParentId(),
         'weight' => $menu_link->getWeight(),
-      );
+      ];
     }
   }
 
@@ -242,7 +245,7 @@ function menu_ui_get_menu_link_defaults(NodeInterface $node) {
     // definition.
     $field_definitions = \Drupal::entityManager()->getBaseFieldDefinitions('menu_link_content');
     $max_length = $field_definitions['title']->getSetting('max_length');
-    $defaults = array(
+    $defaults = [
       'entity_id' => 0,
       'id' => '',
       'title' => '',
@@ -251,7 +254,7 @@ function menu_ui_get_menu_link_defaults(NodeInterface $node) {
       'menu_name' => $menu_name,
       'parent' => '',
       'weight' => 0,
-    );
+    ];
   }
   return $defaults;
 }
@@ -273,8 +276,8 @@ function menu_ui_form_node_form_alter(&$form, FormStateInterface $form_state) {
   /** @var \Drupal\Core\Menu\MenuParentFormSelectorInterface $menu_parent_selector */
   $menu_parent_selector = \Drupal::service('menu.parent_form_selector');
   $menu_names = menu_ui_get_menus();
-  $type_menus = $node_type->getThirdPartySetting('menu_ui', 'available_menus', array('main'));
-  $available_menus = array();
+  $type_menus = $node_type->getThirdPartySetting('menu_ui', 'available_menus', ['main']);
+  $available_menus = [];
   foreach ($type_menus as $menu) {
     $available_menus[$menu] = $menu_names[$menu];
   }
@@ -290,64 +293,64 @@ function menu_ui_form_node_form_alter(&$form, FormStateInterface $form_state) {
     return;
   }
 
-  $form['menu'] = array(
+  $form['menu'] = [
     '#type' => 'details',
     '#title' => t('Menu settings'),
     '#access' => \Drupal::currentUser()->hasPermission('administer menu'),
     '#open' => (bool) $defaults['id'],
     '#group' => 'advanced',
-    '#attached' => array(
-      'library' => array('menu_ui/drupal.menu_ui'),
-    ),
+    '#attached' => [
+      'library' => ['menu_ui/drupal.menu_ui'],
+    ],
     '#tree' => TRUE,
     '#weight' => -2,
-    '#attributes' => array('class' => array('menu-link-form')),
-  );
-  $form['menu']['enabled'] = array(
+    '#attributes' => ['class' => ['menu-link-form']],
+  ];
+  $form['menu']['enabled'] = [
     '#type' => 'checkbox',
     '#title' => t('Provide a menu link'),
     '#default_value' => (int) (bool) $defaults['id'],
-  );
-  $form['menu']['link'] = array(
+  ];
+  $form['menu']['link'] = [
     '#type' => 'container',
-    '#parents' => array('menu'),
-    '#states' => array(
-      'invisible' => array(
-        'input[name="menu[enabled]"]' => array('checked' => FALSE),
-      ),
-    ),
-  );
+    '#parents' => ['menu'],
+    '#states' => [
+      'invisible' => [
+        'input[name="menu[enabled]"]' => ['checked' => FALSE],
+      ],
+    ],
+  ];
 
   // Populate the element with the link data.
-  foreach (array('id', 'entity_id') as $key) {
-    $form['menu']['link'][$key] = array('#type' => 'value', '#value' => $defaults[$key]);
+  foreach (['id', 'entity_id'] as $key) {
+    $form['menu']['link'][$key] = ['#type' => 'value', '#value' => $defaults[$key]];
   }
 
-  $form['menu']['link']['title'] = array(
+  $form['menu']['link']['title'] = [
     '#type' => 'textfield',
     '#title' => t('Menu link title'),
     '#default_value' => $defaults['title'],
     '#maxlength' => $defaults['title_max_length'],
-  );
+  ];
 
-  $form['menu']['link']['description'] = array(
+  $form['menu']['link']['description'] = [
     '#type' => 'textarea',
     '#title' => t('Description'),
     '#default_value' => $defaults['description'],
     '#rows' => 1,
     '#description' => t('Shown when hovering over the menu link.'),
-  );
+  ];
 
   $form['menu']['link']['menu_parent'] = $parent_element;
   $form['menu']['link']['menu_parent']['#title'] = t('Parent item');
   $form['menu']['link']['menu_parent']['#attributes']['class'][] = 'menu-parent-select';
 
-  $form['menu']['link']['weight'] = array(
+  $form['menu']['link']['weight'] = [
     '#type' => 'number',
     '#title' => t('Weight'),
     '#default_value' => $defaults['weight'],
     '#description' => t('Menu links with lower weights are displayed before links with higher weights.'),
-  );
+  ];
 
   foreach (array_keys($form['actions']) as $action) {
     if ($action != 'preview' && isset($form['actions'][$action]['#type']) && $form['actions'][$action]['#type'] === 'submit') {
@@ -398,21 +401,21 @@ function menu_ui_form_node_type_form_alter(&$form, FormStateInterface $form_stat
   $menu_options = menu_ui_get_menus();
   /** @var \Drupal\node\NodeTypeInterface $type */
   $type = $form_state->getFormObject()->getEntity();
-  $form['menu'] = array(
+  $form['menu'] = [
     '#type' => 'details',
     '#title' => t('Menu settings'),
-    '#attached' => array(
-      'library' => array('menu_ui/drupal.menu_ui.admin'),
-    ),
+    '#attached' => [
+      'library' => ['menu_ui/drupal.menu_ui.admin'],
+    ],
     '#group' => 'additional_settings',
-  );
-  $form['menu']['menu_options'] = array(
+  ];
+  $form['menu']['menu_options'] = [
     '#type' => 'checkboxes',
     '#title' => t('Available menus'),
-    '#default_value' => $type->getThirdPartySetting('menu_ui', 'available_menus', array('main')),
+    '#default_value' => $type->getThirdPartySetting('menu_ui', 'available_menus', ['main']),
     '#options' => $menu_options,
     '#description' => t('The menus available to place links in for this content type.'),
-  );
+  ];
   // @todo See if we can avoid pre-loading all options by changing the form or
   //   using a #process callback. https://www.drupal.org/node/2310319
   //   To avoid an 'illegal option' error after saving the form we have to load
@@ -420,14 +423,14 @@ function menu_ui_form_node_type_form_alter(&$form, FormStateInterface $form_stat
   //   add options to the list using ajax.
   $options_cacheability = new CacheableMetadata();
   $options = $menu_parent_selector->getParentSelectOptions('', NULL, $options_cacheability);
-  $form['menu']['menu_parent'] = array(
+  $form['menu']['menu_parent'] = [
     '#type' => 'select',
     '#title' => t('Default parent item'),
     '#default_value' => $type->getThirdPartySetting('menu_ui', 'parent', 'main:'),
     '#options' => $options,
     '#description' => t('Choose the menu item to be the default parent for a new link in the content authoring form.'),
-    '#attributes' => array('class' => array('menu-title-select')),
-  );
+    '#attributes' => ['class' => ['menu-title-select']],
+  ];
   $options_cacheability->applyTo($form['menu']['menu_parent']);
 
   $form['#validate'][] = 'menu_ui_form_node_type_form_validate';
diff --git a/web/core/modules/menu_ui/src/Controller/MenuController.php b/web/core/modules/menu_ui/src/Controller/MenuController.php
index 39b0a32a9..7958c101a 100644
--- a/web/core/modules/menu_ui/src/Controller/MenuController.php
+++ b/web/core/modules/menu_ui/src/Controller/MenuController.php
@@ -49,7 +49,7 @@ class MenuController extends ControllerBase {
    *   The available menu and menu items.
    */
   public function getParentOptions(Request $request) {
-    $available_menus = array();
+    $available_menus = [];
     if ($menus = $request->request->get('menus')) {
       foreach ($menus as $menu) {
         $available_menus[$menu] = $menu;
diff --git a/web/core/modules/menu_ui/src/Form/MenuDeleteForm.php b/web/core/modules/menu_ui/src/Form/MenuDeleteForm.php
index 22bfb0ac3..1cebd9091 100644
--- a/web/core/modules/menu_ui/src/Form/MenuDeleteForm.php
+++ b/web/core/modules/menu_ui/src/Form/MenuDeleteForm.php
@@ -57,7 +57,7 @@ class MenuDeleteForm extends EntityDeleteForm {
     $caption = '';
     $num_links = $this->menuLinkManager->countMenuLinks($this->entity->id());
     if ($num_links) {
-      $caption .= '<p>' . $this->formatPlural($num_links, '<strong>Warning:</strong> There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', '<strong>Warning:</strong> There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $this->entity->label())) . '</p>';
+      $caption .= '<p>' . $this->formatPlural($num_links, '<strong>Warning:</strong> There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', '<strong>Warning:</strong> There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', ['%title' => $this->entity->label()]) . '</p>';
     }
     $caption .= '<p>' . t('This action cannot be undone.') . '</p>';
     return $caption;
@@ -67,7 +67,7 @@ class MenuDeleteForm extends EntityDeleteForm {
    * {@inheritdoc}
    */
   protected function logDeletionMessage() {
-    $this->logger('menu')->notice('Deleted custom menu %title and all its menu links.', array('%title' => $this->entity->label()));
+    $this->logger('menu')->notice('Deleted custom menu %title and all its menu links.', ['%title' => $this->entity->label()]);
   }
 
   /**
@@ -85,7 +85,7 @@ class MenuDeleteForm extends EntityDeleteForm {
     //   parameter that is being removed. Also, consider moving this to
     //   menu_ui.module as part of a generic response to entity deletion.
     //   https://www.drupal.org/node/2310329
-    $menu_links = $this->menuLinkManager->loadLinksByRoute('entity.menu.edit_form', array('menu' => $this->entity->id()), TRUE);
+    $menu_links = $this->menuLinkManager->loadLinksByRoute('entity.menu.edit_form', ['menu' => $this->entity->id()], TRUE);
     foreach ($menu_links as $id => $link) {
       $this->menuLinkManager->removeDefinition($id);
     }
diff --git a/web/core/modules/menu_ui/src/Form/MenuLinkEditForm.php b/web/core/modules/menu_ui/src/Form/MenuLinkEditForm.php
index cf133cd53..2dbd6a5e8 100644
--- a/web/core/modules/menu_ui/src/Form/MenuLinkEditForm.php
+++ b/web/core/modules/menu_ui/src/Form/MenuLinkEditForm.php
@@ -57,22 +57,22 @@ class MenuLinkEditForm extends FormBase {
    *   The plugin instance to use for this form.
    */
   public function buildForm(array $form, FormStateInterface $form_state, MenuLinkInterface $menu_link_plugin = NULL) {
-    $form['menu_link_id'] = array(
+    $form['menu_link_id'] = [
       '#type' => 'value',
       '#value' => $menu_link_plugin->getPluginId(),
-    );
+    ];
     $class_name = $menu_link_plugin->getFormClass();
     $form['#plugin_form'] = $this->classResolver->getInstanceFromDefinition($class_name);
     $form['#plugin_form']->setMenuLinkInstance($menu_link_plugin);
 
     $form += $form['#plugin_form']->buildConfigurationForm($form, $form_state);
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
       '#button_type' => 'primary',
-    );
+    ];
     return $form;
   }
 
@@ -92,7 +92,7 @@ class MenuLinkEditForm extends FormBase {
     drupal_set_message($this->t('The menu link has been saved.'));
     $form_state->setRedirect(
       'entity.menu.edit_form',
-      array('menu' => $link->getMenuName())
+      ['menu' => $link->getMenuName()]
     );
   }
 
diff --git a/web/core/modules/menu_ui/src/Form/MenuLinkResetForm.php b/web/core/modules/menu_ui/src/Form/MenuLinkResetForm.php
index 6fbf6228d..e37b16b07 100644
--- a/web/core/modules/menu_ui/src/Form/MenuLinkResetForm.php
+++ b/web/core/modules/menu_ui/src/Form/MenuLinkResetForm.php
@@ -59,16 +59,16 @@ class MenuLinkResetForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to reset the link %item to its default values?', array('%item' => $this->link->getTitle()));
+    return $this->t('Are you sure you want to reset the link %item to its default values?', ['%item' => $this->link->getTitle()]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('entity.menu.edit_form', array(
+    return new Url('entity.menu.edit_form', [
       'menu' => $this->link->getMenuName(),
-    ));
+    ]);
   }
 
   /**
diff --git a/web/core/modules/menu_ui/src/MenuForm.php b/web/core/modules/menu_ui/src/MenuForm.php
index 7e09fbf65..0bee99675 100644
--- a/web/core/modules/menu_ui/src/MenuForm.php
+++ b/web/core/modules/menu_ui/src/MenuForm.php
@@ -5,7 +5,6 @@ namespace Drupal\menu_ui;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Link;
@@ -23,13 +22,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class MenuForm extends EntityForm {
 
-  /**
-   * The factory for entity queries.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $entityQueryFactory;
-
   /**
    * The menu link manager.
    *
@@ -56,13 +48,11 @@ class MenuForm extends EntityForm {
    *
    * @var array
    */
-  protected $overviewTreeForm = array('#tree' => TRUE);
+  protected $overviewTreeForm = ['#tree' => TRUE];
 
   /**
    * Constructs a MenuForm object.
    *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory
-   *   The factory for entity queries.
    * @param \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager
    *   The menu link manager.
    * @param \Drupal\Core\Menu\MenuLinkTreeInterface $menu_tree
@@ -70,8 +60,7 @@ class MenuForm extends EntityForm {
    * @param \Drupal\Core\Utility\LinkGeneratorInterface $link_generator
    *   The link generator.
    */
-  public function __construct(QueryFactory $entity_query_factory, MenuLinkManagerInterface $menu_link_manager, MenuLinkTreeInterface $menu_tree, LinkGeneratorInterface $link_generator) {
-    $this->entityQueryFactory = $entity_query_factory;
+  public function __construct(MenuLinkManagerInterface $menu_link_manager, MenuLinkTreeInterface $menu_tree, LinkGeneratorInterface $link_generator) {
     $this->menuLinkManager = $menu_link_manager;
     $this->menuTree = $menu_tree;
     $this->linkGenerator = $link_generator;
@@ -82,7 +71,6 @@ class MenuForm extends EntityForm {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.query'),
       $container->get('plugin.manager.menu.link'),
       $container->get('menu.link_tree'),
       $container->get('link_generator')
@@ -96,43 +84,43 @@ class MenuForm extends EntityForm {
     $menu = $this->entity;
 
     if ($this->operation == 'edit') {
-      $form['#title'] = $this->t('Edit menu %label', array('%label' => $menu->label()));
+      $form['#title'] = $this->t('Edit menu %label', ['%label' => $menu->label()]);
     }
 
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Title'),
       '#default_value' => $menu->label(),
       '#required' => TRUE,
-    );
-    $form['id'] = array(
+    ];
+    $form['id'] = [
       '#type' => 'machine_name',
       '#title' => $this->t('Menu name'),
       '#default_value' => $menu->id(),
       '#maxlength' => MENU_MAX_MENU_NAME_LENGTH_UI,
       '#description' => $this->t('A unique name to construct the URL for the menu. It must only contain lowercase letters, numbers and hyphens.'),
-      '#machine_name' => array(
-        'exists' => array($this, 'menuNameExists'),
-        'source' => array('label'),
+      '#machine_name' => [
+        'exists' => [$this, 'menuNameExists'],
+        'source' => ['label'],
         'replace_pattern' => '[^a-z0-9-]+',
         'replace' => '-',
-      ),
+      ],
       // A menu's machine name cannot be changed.
       '#disabled' => !$menu->isNew() || $menu->isLocked(),
-    );
-    $form['description'] = array(
+    ];
+    $form['description'] = [
       '#type' => 'textfield',
       '#title' => t('Administrative summary'),
       '#maxlength' => 512,
       '#default_value' => $menu->getDescription(),
-    );
+    ];
 
-    $form['langcode'] = array(
+    $form['langcode'] = [
       '#type' => 'language_select',
       '#title' => t('Menu language'),
       '#languages' => LanguageInterface::STATE_ALL,
       '#default_value' => $menu->language()->getId(),
-    );
+    ];
 
     // Add menu links administration form for existing menus.
     if (!$menu->isNew() || $menu->isLocked()) {
@@ -142,7 +130,7 @@ class MenuForm extends EntityForm {
       // the parents of the form section.
       // @see self::submitOverviewForm()
       $form_state->set('menu_overview_form_parents', ['links']);
-      $form['links'] = array();
+      $form['links'] = [];
       $form['links'] = $this->buildOverviewForm($form['links'], $form_state);
     }
 
@@ -160,7 +148,7 @@ class MenuForm extends EntityForm {
    */
   public function menuNameExists($value) {
     // Check first to see if a menu with this ID exists.
-    if ($this->entityQueryFactory->get('menu')->condition('id', $value)->range(0, 1)->count()->execute()) {
+    if ($this->entityTypeManager->getStorage('menu')->getQuery()->condition('id', $value)->range(0, 1)->count()->execute()) {
       return TRUE;
     }
 
@@ -176,12 +164,12 @@ class MenuForm extends EntityForm {
     $status = $menu->save();
     $edit_link = $this->entity->link($this->t('Edit'));
     if ($status == SAVED_UPDATED) {
-      drupal_set_message($this->t('Menu %label has been updated.', array('%label' => $menu->label())));
-      $this->logger('menu')->notice('Menu %label has been updated.', array('%label' => $menu->label(), 'link' => $edit_link));
+      drupal_set_message($this->t('Menu %label has been updated.', ['%label' => $menu->label()]));
+      $this->logger('menu')->notice('Menu %label has been updated.', ['%label' => $menu->label(), 'link' => $edit_link]);
     }
     else {
-      drupal_set_message($this->t('Menu %label has been added.', array('%label' => $menu->label())));
-      $this->logger('menu')->notice('Menu %label has been added.', array('%label' => $menu->label(), 'link' => $edit_link));
+      drupal_set_message($this->t('Menu %label has been added.', ['%label' => $menu->label()]));
+      $this->logger('menu')->notice('Menu %label has been added.', ['%label' => $menu->label(), 'link' => $edit_link]);
     }
 
     $form_state->setRedirectUrl($this->entity->urlInfo('edit-form'));
@@ -225,10 +213,10 @@ class MenuForm extends EntityForm {
 
     // We indicate that a menu administrator is running the menu access check.
     $this->getRequest()->attributes->set('_menu_admin', TRUE);
-    $manipulators = array(
-      array('callable' => 'menu.default_tree_manipulators:checkAccess'),
-      array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
-    );
+    $manipulators = [
+      ['callable' => 'menu.default_tree_manipulators:checkAccess'],
+      ['callable' => 'menu.default_tree_manipulators:generateIndexAndSort'],
+    ];
     $tree = $this->menuTree->transform($tree, $manipulators);
     $this->getRequest()->attributes->set('_menu_admin', FALSE);
 
@@ -241,26 +229,26 @@ class MenuForm extends EntityForm {
     };
     $delta = max($count($tree), 50);
 
-    $form['links'] = array(
+    $form['links'] = [
       '#type' => 'table',
       '#theme' => 'table__menu_overview',
-      '#header' => array(
+      '#header' => [
         $this->t('Menu link'),
-        array(
+        [
           'data' => $this->t('Enabled'),
-          'class' => array('checkbox'),
-        ),
+          'class' => ['checkbox'],
+        ],
         $this->t('Weight'),
-        array(
+        [
           'data' => $this->t('Operations'),
           'colspan' => 3,
-        ),
-      ),
-      '#attributes' => array(
+        ],
+      ],
+      '#attributes' => [
         'id' => 'menu-overview',
-      ),
-      '#tabledrag' => array(
-        array(
+      ],
+      '#tabledrag' => [
+        [
           'action' => 'match',
           'relationship' => 'parent',
           'group' => 'menu-parent',
@@ -268,14 +256,14 @@ class MenuForm extends EntityForm {
           'source' => 'menu-id',
           'hidden' => TRUE,
           'limit' => \Drupal::menuTree()->maxDepth() - 1,
-        ),
-        array(
+        ],
+        [
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'menu-weight',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     $form['links']['#empty'] = $this->t('There are no menu links yet. <a href=":url">Add link</a>.', [
       ':url' => $this->url('entity.menu.add_link_form', ['menu' => $this->entity->id()], [
@@ -297,19 +285,19 @@ class MenuForm extends EntityForm {
         $form['links'][$id]['#weight'] = $element['#item']->link->getWeight();
 
         // Add special classes to be used for tabledrag.js.
-        $element['parent']['#attributes']['class'] = array('menu-parent');
-        $element['weight']['#attributes']['class'] = array('menu-weight');
-        $element['id']['#attributes']['class'] = array('menu-id');
+        $element['parent']['#attributes']['class'] = ['menu-parent'];
+        $element['weight']['#attributes']['class'] = ['menu-weight'];
+        $element['id']['#attributes']['class'] = ['menu-id'];
 
-        $form['links'][$id]['title'] = array(
-          array(
+        $form['links'][$id]['title'] = [
+          [
             '#theme' => 'indentation',
             '#size' => $element['#item']->depth - 1,
-          ),
+          ],
           $element['title'],
-        );
+        ];
         $form['links'][$id]['enabled'] = $element['enabled'];
-        $form['links'][$id]['enabled']['#wrapper_attributes']['class'] = array('checkbox', 'menu-enabled');
+        $form['links'][$id]['enabled']['#wrapper_attributes']['class'] = ['checkbox', 'menu-enabled'];
 
         $form['links'][$id]['weight'] = $element['weight'];
 
@@ -351,7 +339,7 @@ class MenuForm extends EntityForm {
       if ($link) {
         $id = 'menu_plugin_id:' . $link->getPluginId();
         $form[$id]['#item'] = $element;
-        $form[$id]['#attributes'] = $link->isEnabled() ? array('class' => array('menu-enabled')) : array('class' => array('menu-disabled'));
+        $form[$id]['#attributes'] = $link->isEnabled() ? ['class' => ['menu-enabled']] : ['class' => ['menu-disabled']];
         $form[$id]['title'] = Link::fromTextAndUrl($link->getTitle(), $link->getUrlObject())->toRenderable();
         if (!$link->isEnabled()) {
           $form[$id]['title']['#suffix'] = ' (' . $this->t('disabled') . ')';
@@ -365,32 +353,32 @@ class MenuForm extends EntityForm {
           $form[$id]['title']['#suffix'] = ' (' . $this->t('logged in users only') . ')';
         }
 
-        $form[$id]['enabled'] = array(
+        $form[$id]['enabled'] = [
           '#type' => 'checkbox',
-          '#title' => $this->t('Enable @title menu link', array('@title' => $link->getTitle())),
+          '#title' => $this->t('Enable @title menu link', ['@title' => $link->getTitle()]),
           '#title_display' => 'invisible',
           '#default_value' => $link->isEnabled(),
-        );
-        $form[$id]['weight'] = array(
+        ];
+        $form[$id]['weight'] = [
           '#type' => 'weight',
           '#delta' => $delta,
           '#default_value' => $link->getWeight(),
-          '#title' => $this->t('Weight for @title', array('@title' => $link->getTitle())),
+          '#title' => $this->t('Weight for @title', ['@title' => $link->getTitle()]),
           '#title_display' => 'invisible',
-        );
-        $form[$id]['id'] = array(
+        ];
+        $form[$id]['id'] = [
           '#type' => 'hidden',
           '#value' => $link->getPluginId(),
-        );
-        $form[$id]['parent'] = array(
+        ];
+        $form[$id]['parent'] = [
           '#type' => 'hidden',
           '#default_value' => $link->getParent(),
-        );
+        ];
         // Build a list of operations.
-        $operations = array();
-        $operations['edit'] = array(
+        $operations = [];
+        $operations['edit'] = [
           'title' => $this->t('Edit'),
-        );
+        ];
         // Allow for a custom edit link per plugin.
         $edit_route = $link->getEditRoute();
         if ($edit_route) {
@@ -400,16 +388,16 @@ class MenuForm extends EntityForm {
         }
         else {
           // Fall back to the standard edit link.
-          $operations['edit'] += array(
+          $operations['edit'] += [
             'url' => Url::fromRoute('menu_ui.link_edit', ['menu_link_plugin' => $link->getPluginId()]),
-          );
+          ];
         }
         // Links can either be reset or deleted, not both.
         if ($link->isResettable()) {
-          $operations['reset'] = array(
+          $operations['reset'] = [
             'title' => $this->t('Reset'),
             'url' => Url::fromRoute('menu_ui.link_reset', ['menu_link_plugin' => $link->getPluginId()]),
-          );
+          ];
         }
         elseif ($delete_link = $link->getDeleteRoute()) {
           $operations['delete']['url'] = $delete_link;
@@ -417,15 +405,15 @@ class MenuForm extends EntityForm {
           $operations['delete']['title'] = $this->t('Delete');
         }
         if ($link->isTranslatable()) {
-          $operations['translate'] = array(
+          $operations['translate'] = [
             'title' => $this->t('Translate'),
             'url' => $link->getTranslateRoute(),
-          );
+          ];
         }
-        $form[$id]['operations'] = array(
+        $form[$id]['operations'] = [
           '#type' => 'operations',
           '#links' => $operations,
-        );
+        ];
       }
 
       if ($element->subtree) {
@@ -461,16 +449,16 @@ class MenuForm extends EntityForm {
     // parent. To prevent this, save items in the form in the same order they
     // are sent, ensuring parents are saved first, then their children.
     // See https://www.drupal.org/node/181126#comment-632270.
-    $order = is_array($input) ? array_flip(array_keys($input)) : array();
+    $order = is_array($input) ? array_flip(array_keys($input)) : [];
     // Update our original form with the new order.
     $form = array_intersect_key(array_merge($order, $form), $form);
 
-    $fields = array('weight', 'parent', 'enabled');
+    $fields = ['weight', 'parent', 'enabled'];
     $form_links = $form['links'];
     foreach (Element::children($form_links) as $id) {
       if (isset($form_links[$id]['#item'])) {
         $element = $form_links[$id];
-        $updated_values = array();
+        $updated_values = [];
         // Update any fields that have changed in this menu item.
         foreach ($fields as $field) {
           if ($element[$field]['#value'] != $element[$field]['#default_value']) {
diff --git a/web/core/modules/menu_ui/src/MenuListBuilder.php b/web/core/modules/menu_ui/src/MenuListBuilder.php
index 153427277..b694c8b93 100644
--- a/web/core/modules/menu_ui/src/MenuListBuilder.php
+++ b/web/core/modules/menu_ui/src/MenuListBuilder.php
@@ -18,10 +18,10 @@ class MenuListBuilder extends ConfigEntityListBuilder {
    */
   public function buildHeader() {
     $header['title'] = t('Title');
-    $header['description'] = array(
+    $header['description'] = [
       'data' => t('Description'),
-      'class' => array(RESPONSIVE_PRIORITY_MEDIUM),
-    );
+      'class' => [RESPONSIVE_PRIORITY_MEDIUM],
+    ];
     return $header + parent::buildHeader();
   }
 
@@ -29,10 +29,10 @@ class MenuListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    $row['title'] = array(
+    $row['title'] = [
       'data' => $entity->label(),
-      'class' => array('menu-label'),
-    );
+      'class' => ['menu-label'],
+    ];
     $row['description']['data'] = ['#markup' => $entity->getDescription()];
     return $row + parent::buildRow($entity);
   }
@@ -45,11 +45,11 @@ class MenuListBuilder extends ConfigEntityListBuilder {
 
     if (isset($operations['edit'])) {
       $operations['edit']['title'] = t('Edit menu');
-      $operations['add'] = array(
+      $operations['add'] = [
         'title' => t('Add link'),
         'weight' => 20,
         'url' => $entity->urlInfo('add-link-form'),
-      );
+      ];
     }
     if (isset($operations['delete'])) {
       $operations['delete']['title'] = t('Delete menu');
diff --git a/web/core/modules/menu_ui/src/Tests/MenuLanguageTest.php b/web/core/modules/menu_ui/src/Tests/MenuLanguageTest.php
index 72865ea01..4c48f05da 100644
--- a/web/core/modules/menu_ui/src/Tests/MenuLanguageTest.php
+++ b/web/core/modules/menu_ui/src/Tests/MenuLanguageTest.php
@@ -21,36 +21,36 @@ class MenuLanguageTest extends MenuWebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer menu')));
+    $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer menu']));
 
     // Add some custom languages.
-    foreach (array('aa', 'bb', 'cc', 'cs') as $language_code) {
-      ConfigurableLanguage::create(array(
+    foreach (['aa', 'bb', 'cc', 'cs'] as $language_code) {
+      ConfigurableLanguage::create([
         'id' => $language_code,
         'label' => $this->randomMachineName(),
-      ))->save();
+      ])->save();
     }
   }
 
   /**
    * Tests menu language settings and the defaults for menu link items.
    */
-  function testMenuLanguage() {
+  public function testMenuLanguage() {
     // Create a test menu to test the various language-related settings.
     // Machine name has to be lowercase.
     $menu_name = Unicode::strtolower($this->randomMachineName(16));
     $label = $this->randomString();
-    $edit = array(
+    $edit = [
       'id' => $menu_name,
       'description' => '',
       'label' => $label,
       'langcode' => 'aa',
-    );
+    ];
     $this->drupalPostForm('admin/structure/menu/add', $edit, t('Save'));
     ContentLanguageSettings::loadByEntityTypeBundle('menu_link_content', 'menu_link_content')
       ->setDefaultLangcode('bb')
@@ -65,19 +65,19 @@ class MenuLanguageTest extends MenuWebTestBase {
 
     // Add a menu link.
     $link_title = $this->randomString();
-    $edit = array(
+    $edit = [
       'title[0][value]' => $link_title,
       'link[0][uri]' => $link_path,
-    );
+    ];
     $this->drupalPostForm("admin/structure/menu/manage/$menu_name/add", $edit, t('Save'));
     // Check the link was added with the correct menu link default language.
-    $menu_links = entity_load_multiple_by_properties('menu_link_content', array('title' => $link_title));
+    $menu_links = entity_load_multiple_by_properties('menu_link_content', ['title' => $link_title]);
     $menu_link = reset($menu_links);
-    $this->assertMenuLink($menu_link->getPluginId(), array(
+    $this->assertMenuLink($menu_link->getPluginId(), [
       'menu_name' => $menu_name,
       'route_name' => '<front>',
       'langcode' => 'bb',
-    ));
+    ]);
 
     // Edit menu link default, changing it to cc.
     ContentLanguageSettings::loadByEntityTypeBundle('menu_link_content', 'menu_link_content')
@@ -87,30 +87,30 @@ class MenuLanguageTest extends MenuWebTestBase {
 
     // Add a menu link.
     $link_title = $this->randomString();
-    $edit = array(
+    $edit = [
       'title[0][value]' => $link_title,
       'link[0][uri]' => $link_path,
-    );
+    ];
     $this->drupalPostForm("admin/structure/menu/manage/$menu_name/add", $edit, t('Save'));
     // Check the link was added with the correct new menu link default language.
-    $menu_links = entity_load_multiple_by_properties('menu_link_content', array('title' => $link_title));
+    $menu_links = entity_load_multiple_by_properties('menu_link_content', ['title' => $link_title]);
     $menu_link = reset($menu_links);
-    $this->assertMenuLink($menu_link->getPluginId(), array(
+    $this->assertMenuLink($menu_link->getPluginId(), [
       'menu_name' => $menu_name,
       'route_name' => '<front>',
       'langcode' => 'cc',
-    ));
+    ]);
 
     // Now change the language of the new link to 'bb'.
-    $edit = array(
+    $edit = [
       'langcode[0][value]' => 'bb',
-    );
+    ];
     $this->drupalPostForm('admin/structure/menu/item/' . $menu_link->id() . '/edit', $edit, t('Save'));
-    $this->assertMenuLink($menu_link->getPluginId(), array(
+    $this->assertMenuLink($menu_link->getPluginId(), [
       'menu_name' => $menu_name,
       'route_name' => '<front>',
       'langcode' => 'bb',
-    ));
+    ]);
 
     // Saving menu link items ends up on the edit menu page. To check the menu
     // link has the correct language default on edit, go to the menu link edit
diff --git a/web/core/modules/menu_ui/src/Tests/MenuNodeTest.php b/web/core/modules/menu_ui/src/Tests/MenuNodeTest.php
index 3fc8423fe..3f1bba06e 100644
--- a/web/core/modules/menu_ui/src/Tests/MenuNodeTest.php
+++ b/web/core/modules/menu_ui/src/Tests/MenuNodeTest.php
@@ -26,7 +26,7 @@ class MenuNodeTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('menu_ui', 'test_page_test', 'node', 'block', 'locale', 'language', 'content_translation');
+  public static $modules = ['menu_ui', 'test_page_test', 'node', 'block', 'locale', 'language', 'content_translation'];
 
   protected function setUp() {
     parent::setUp();
@@ -34,9 +34,9 @@ class MenuNodeTest extends WebTestBase {
     $this->drupalPlaceBlock('system_menu_block:main');
     $this->drupalPlaceBlock('page_title_block');
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
-    $this->editor = $this->drupalCreateUser(array(
+    $this->editor = $this->drupalCreateUser([
       'access administration pages',
       'administer content types',
       'administer menu',
@@ -47,14 +47,14 @@ class MenuNodeTest extends WebTestBase {
       'update content translations',
       'delete content translations',
       'translate any entity',
-    ));
+    ]);
     $this->drupalLogin($this->editor);
   }
 
   /**
    * Test creating, editing, deleting menu links via node form widget.
    */
-  function testMenuNodeFormWidget() {
+  public function testMenuNodeFormWidget() {
     // Verify that cacheability metadata is bubbled from the menu link tree
     // access checking that is performed when determining the "default parent
     // item" options in menu_ui_form_node_type_form_alter(). The "log out" link
@@ -68,9 +68,9 @@ class MenuNodeTest extends WebTestBase {
     $this->assertPattern('/<input .* id="edit-menu-title" .* maxlength="' . $max_length . '" .* \/>/', 'Menu link title field has correct maxlength in node add form.');
 
     // Disable the default main menu, so that no menus are enabled.
-    $edit = array(
+    $edit = [
       'menu_options[main]' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
 
     // Verify that no menu settings are displayed and nodes can be created.
@@ -78,47 +78,47 @@ class MenuNodeTest extends WebTestBase {
     $this->assertText(t('Create Basic page'));
     $this->assertNoText(t('Menu settings'));
     $node_title = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'title[0][value]' => $node_title,
       'body[0][value]' => $this->randomString(),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $node = $this->drupalGetNodeByTitle($node_title);
     $this->assertEqual($node->getTitle(), $edit['title[0][value]']);
 
     // Test that we cannot set a menu item from a menu that is not set as
     // available.
-    $edit = array(
+    $edit = [
       'menu_options[tools]' => 1,
       'menu_parent' => 'main:',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
     $this->assertText(t('The selected menu item is not under one of the selected menus.'));
-    $this->assertNoRaw(t('The content type %name has been updated.', array('%name' => 'Basic page')));
+    $this->assertNoRaw(t('The content type %name has been updated.', ['%name' => 'Basic page']));
 
     // Enable Tools menu as available menu.
-    $edit = array(
+    $edit = [
       'menu_options[main]' => 1,
       'menu_options[tools]' => 1,
       'menu_parent' => 'main:',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
-    $this->assertRaw(t('The content type %name has been updated.', array('%name' => 'Basic page')));
+    $this->assertRaw(t('The content type %name has been updated.', ['%name' => 'Basic page']));
 
     // Test that we can preview a node that will create a menu item.
-    $edit = array(
+    $edit = [
       'title[0][value]' => $node_title,
       'menu[enabled]' => 1,
       'menu[title]' => 'Test preview',
-    );
+    ];
     $this->drupalPostForm('node/add/page', $edit, t('Preview'));
 
     // Create a node.
     $node_title = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'title[0][value]' => $node_title,
       'body[0][value]' => $this->randomString(),
-    );
+    ];
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
     $node = $this->drupalGetNodeByTitle($node_title);
     // Assert that there is no link for the node.
@@ -126,9 +126,9 @@ class MenuNodeTest extends WebTestBase {
     $this->assertNoLink($node_title);
 
     // Edit the node, enable the menu link setting, but skip the link title.
-    $edit = array(
+    $edit = [
       'menu[enabled]' => 1,
-    );
+    ];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
     // Assert that there is no link for the node.
     $this->drupalGet('test-page');
@@ -165,11 +165,11 @@ class MenuNodeTest extends WebTestBase {
     // Log back in as normal user.
     $this->drupalLogin($this->editor);
     // Edit the node and create a menu link.
-    $edit = array(
+    $edit = [
       'menu[enabled]' => 1,
       'menu[title]' => $node_title,
       'menu[weight]' => 17,
-    );
+    ];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
     // Assert that the link exists.
     $this->drupalGet('test-page');
@@ -190,20 +190,20 @@ class MenuNodeTest extends WebTestBase {
     $this->assertFalse($link->isEnabled(), 'Saving a node with a disabled menu link keeps the menu link disabled.');
 
     // Edit the node and remove the menu link.
-    $edit = array(
+    $edit = [
       'menu[enabled]' => FALSE,
-    );
+    ];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
     // Assert that there is no link for the node.
     $this->drupalGet('test-page');
     $this->assertNoLink($node_title);
 
     // Add a menu link to the Administration menu.
-    $item = MenuLinkContent::create(array(
+    $item = MenuLinkContent::create([
       'link' => [['uri' => 'entity:node/' . $node->id()]],
       'title' => $this->randomMachineName(16),
       'menu_name' => 'admin',
-    ));
+    ]);
     $item->save();
 
     // Assert that disabled Administration menu is not shown on the
@@ -219,14 +219,14 @@ class MenuNodeTest extends WebTestBase {
     $item->menu_name->value = 'tools';
     $item->save();
     // Create a second node.
-    $child_node = $this->drupalCreateNode(array('type' => 'article'));
+    $child_node = $this->drupalCreateNode(['type' => 'article']);
     // Assign a menu link to the second node, being a child of the first one.
-    $child_item = MenuLinkContent::create(array(
+    $child_item = MenuLinkContent::create([
       'link' => [['uri' => 'entity:node/' . $child_node->id()]],
       'title' => $this->randomMachineName(16),
       'parent' => $item->getPluginId(),
       'menu_name' => $item->getMenuName(),
-    ));
+    ]);
     $child_item->save();
     // Edit the first node.
     $this->drupalGet('node/' . $node->id() . '/edit');
@@ -240,9 +240,9 @@ class MenuNodeTest extends WebTestBase {
   /**
    * Testing correct loading and saving of menu links via node form widget in a multilingual environment.
    */
-  function testMultilingualMenuNodeFormWidget() {
+  public function testMultilingualMenuNodeFormWidget() {
     // Setup languages.
-    $langcodes = array('de');
+    $langcodes = ['de'];
     foreach ($langcodes as $langcode) {
       ConfigurableLanguage::createFromLangcode($langcode)->save();
     }
@@ -257,7 +257,7 @@ class MenuNodeTest extends WebTestBase {
 
     $this->rebuildContainer();
 
-    $languages = array();
+    $languages = [];
     foreach ($langcodes as $langcode) {
       $languages[$langcode] = ConfigurableLanguage::load($langcode);
     }
@@ -265,14 +265,14 @@ class MenuNodeTest extends WebTestBase {
     // Use a UI form submission to make the node type and menu link content entity translatable.
     $this->drupalLogout();
     $this->drupalLogin($this->rootUser);
-    $edit = array(
+    $edit = [
       'entity_types[node]' => TRUE,
       'entity_types[menu_link_content]' => TRUE,
       'settings[node][page][settings][language][language_alterable]' => TRUE,
       'settings[node][page][translatable]' => TRUE,
       'settings[node][page][fields][title]' => TRUE,
       'settings[menu_link_content][menu_link_content][translatable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
 
     // Log out and back in as normal user.
@@ -297,42 +297,42 @@ class MenuNodeTest extends WebTestBase {
     $node->save();
 
     // Edit the node and create a menu link.
-    $edit = array(
+    $edit = [
       'menu[enabled]' => 1,
       'menu[title]' => $node_title,
       'menu[weight]' => 17,
-    );
-    $options = array('language' => $languages[$langcodes[0]]);
+    ];
+    $options = ['language' => $languages[$langcodes[0]]];
     $url = $node->toUrl('edit-form', $options);
     $this->drupalPostForm($url, $edit, t('Save') . ' ' . t('(this translation)'));
 
     // Edit the node in a different language and translate the menu link.
-    $edit = array(
+    $edit = [
       'menu[enabled]' => 1,
       'menu[title]' => $translated_node_title,
       'menu[weight]' => 17,
-    );
-    $options = array('language' => $languages[$langcodes[1]]);
+    ];
+    $options = ['language' => $languages[$langcodes[1]]];
     $url = $node->toUrl('edit-form', $options);
     $this->drupalPostForm($url, $edit, t('Save') . ' ' . t('(this translation)'));
 
     // Assert that the original link exists in the frontend.
-    $this->drupalGet('node/' . $node->id(), array('language' => $languages[$langcodes[0]]));
+    $this->drupalGet('node/' . $node->id(), ['language' => $languages[$langcodes[0]]]);
     $this->assertLink($node_title);
 
     // Assert that the translated link exists in the frontend.
-    $this->drupalGet('node/' . $node->id(), array('language' => $languages[$langcodes[1]]));
+    $this->drupalGet('node/' . $node->id(), ['language' => $languages[$langcodes[1]]]);
     $this->assertLink($translated_node_title);
 
     // Revisit the edit page in original language, check the loaded menu item title and save.
-    $options = array('language' => $languages[$langcodes[0]]);
+    $options = ['language' => $languages[$langcodes[0]]];
     $url = $node->toUrl('edit-form', $options);
     $this->drupalGet($url);
     $this->assertFieldById('edit-menu-title', $node_title);
     $this->drupalPostForm(NULL, [], t('Save') . ' ' . t('(this translation)'));
 
     // Revisit the edit page of the translation and check the loaded menu item title.
-    $options = array('language' => $languages[$langcodes[1]]);
+    $options = ['language' => $languages[$langcodes[1]]];
     $url = $node->toUrl('edit-form', $options);
     $this->drupalGet($url);
     $this->assertFieldById('edit-menu-title', $translated_node_title);
diff --git a/web/core/modules/menu_ui/src/Tests/MenuTest.php b/web/core/modules/menu_ui/src/Tests/MenuTest.php
index e9464ab23..dde95027b 100644
--- a/web/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/web/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -10,6 +10,7 @@ use Drupal\Core\Url;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\system\Entity\Menu;
 use Drupal\node\Entity\Node;
+use Drupal\node\NodeInterface;
 
 /**
  * Add a custom menu, add menu links to the custom menu and Tools menu, check
@@ -24,7 +25,7 @@ class MenuTest extends MenuWebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'block', 'contextual', 'help', 'path', 'test_page_test');
+  public static $modules = ['node', 'block', 'contextual', 'help', 'path', 'test_page_test'];
 
   /**
    * A user with administration rights.
@@ -66,20 +67,20 @@ class MenuTest extends MenuWebTestBase {
 
     $this->drupalPlaceBlock('page_title_block');
 
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
 
     // Create users.
-    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content'));
-    $this->authenticatedUser = $this->drupalCreateUser(array());
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer blocks', 'administer menu', 'create article content']);
+    $this->authenticatedUser = $this->drupalCreateUser([]);
   }
 
   /**
    * Tests menu functionality using the admin and user interfaces.
    */
-  function testMenu() {
+  public function testMenu() {
     // Log in the user.
     $this->drupalLogin($this->adminUser);
-    $this->items = array();
+    $this->items = [];
 
     $this->menu = $this->addCustomMenu();
     $this->doMenuTests();
@@ -131,7 +132,7 @@ class MenuTest extends MenuWebTestBase {
     $instance = $this->getStandardMenuLink();
     $old_weight = $instance->getWeight();
     // Edit the static menu link.
-    $edit = array();
+    $edit = [];
     $edit['weight'] = 10;
     $id = $instance->getPluginId();
     $this->drupalPostForm("admin/structure/menu/link/$id/edit", $edit, t('Save'));
@@ -147,16 +148,16 @@ class MenuTest extends MenuWebTestBase {
   /**
    * Adds a custom menu using CRUD functions.
    */
-  function addCustomMenuCRUD() {
+  public function addCustomMenuCRUD() {
     // Add a new custom menu.
     $menu_name = substr(hash('sha256', $this->randomMachineName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI);
     $label = $this->randomMachineName(16);
 
-    $menu = Menu::create(array(
+    $menu = Menu::create([
       'id' => $menu_name,
       'label' => $label,
       'description' => 'Description text',
-    ));
+    ]);
     $menu->save();
 
     // Assert the new menu.
@@ -177,25 +178,25 @@ class MenuTest extends MenuWebTestBase {
    * @return \Drupal\system\Entity\Menu
    *   The custom menu that has been created.
    */
-  function addCustomMenu() {
+  public function addCustomMenu() {
     // Try adding a menu using a menu_name that is too long.
     $this->drupalGet('admin/structure/menu/add');
     $menu_name = substr(hash('sha256', $this->randomMachineName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI + 1);
     $label = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'id' => $menu_name,
       'description' => '',
       'label' => $label,
-    );
+    ];
     $this->drupalPostForm('admin/structure/menu/add', $edit, t('Save'));
 
     // Verify that using a menu_name that is too long results in a validation
     // message.
-    $this->assertRaw(t('@name cannot be longer than %max characters but is currently %length characters long.', array(
+    $this->assertRaw(t('@name cannot be longer than %max characters but is currently %length characters long.', [
       '@name' => t('Menu name'),
       '%max' => MENU_MAX_MENU_NAME_LENGTH_UI,
       '%length' => Unicode::strlen($menu_name),
-    )));
+    ]));
 
     // Change the menu_name so it no longer exceeds the maximum length.
     $menu_name = substr(hash('sha256', $this->randomMachineName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI);
@@ -203,13 +204,13 @@ class MenuTest extends MenuWebTestBase {
     $this->drupalPostForm('admin/structure/menu/add', $edit, t('Save'));
 
     // Verify that no validation error is given for menu_name length.
-    $this->assertNoRaw(t('@name cannot be longer than %max characters but is currently %length characters long.', array(
+    $this->assertNoRaw(t('@name cannot be longer than %max characters but is currently %length characters long.', [
       '@name' => t('Menu name'),
       '%max' => MENU_MAX_MENU_NAME_LENGTH_UI,
       '%length' => Unicode::strlen($menu_name),
-    )));
+    ]));
     // Verify that the confirmation message is displayed.
-    $this->assertRaw(t('Menu %label has been added.', array('%label' => $label)));
+    $this->assertRaw(t('Menu %label has been added.', ['%label' => $label]));
     $this->drupalGet('admin/structure/menu');
     $this->assertText($label, 'Menu created');
 
@@ -230,18 +231,18 @@ class MenuTest extends MenuWebTestBase {
    * This deletes the custom menu that is stored in $this->menu and performs
    * tests on the menu delete user interface.
    */
-  function deleteCustomMenu() {
+  public function deleteCustomMenu() {
     $menu_name = $this->menu->id();
     $label = $this->menu->label();
 
     // Delete custom menu.
-    $this->drupalPostForm("admin/structure/menu/manage/$menu_name/delete", array(), t('Delete'));
+    $this->drupalPostForm("admin/structure/menu/manage/$menu_name/delete", [], t('Delete'));
     $this->assertResponse(200);
-    $this->assertRaw(t('The menu %title has been deleted.', array('%title' => $label)), 'Custom menu was deleted');
+    $this->assertRaw(t('The menu %title has been deleted.', ['%title' => $label]), 'Custom menu was deleted');
     $this->assertNull(Menu::load($menu_name), 'Custom menu was deleted');
     // Test if all menu links associated with the menu were removed from
     // database.
-    $result = entity_load_multiple_by_properties('menu_link_content', array('menu_name' => $menu_name));
+    $result = entity_load_multiple_by_properties('menu_link_content', ['menu_name' => $menu_name]);
     $this->assertFalse($result, 'All menu links associated with the custom menu were deleted.');
 
     // Make sure there's no delete button on system menus.
@@ -256,7 +257,7 @@ class MenuTest extends MenuWebTestBase {
   /**
    * Tests menu functionality.
    */
-  function doMenuTests() {
+  public function doMenuTests() {
     $menu_name = $this->menu->id();
 
     // Test the 'Add link' local action.
@@ -264,32 +265,32 @@ class MenuTest extends MenuWebTestBase {
 
     $this->clickLink(t('Add link'));
     $link_title = $this->randomString();
-    $this->drupalPostForm(NULL, array('link[0][uri]' => '/', 'title[0][value]' => $link_title), t('Save'));
+    $this->drupalPostForm(NULL, ['link[0][uri]' => '/', 'title[0][value]' => $link_title], t('Save'));
     $this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name]));
     // Test the 'Edit' operation.
     $this->clickLink(t('Edit'));
     $this->assertFieldByName('title[0][value]', $link_title);
     $link_title = $this->randomString();
-    $this->drupalPostForm(NULL, array('title[0][value]' => $link_title), t('Save'));
+    $this->drupalPostForm(NULL, ['title[0][value]' => $link_title], t('Save'));
     $this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name]));
     // Test the 'Delete' operation.
     $this->clickLink(t('Delete'));
-    $this->assertRaw(t('Are you sure you want to delete the custom menu link %item?', array('%item' => $link_title)));
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->assertRaw(t('Are you sure you want to delete the custom menu link %item?', ['%item' => $link_title]));
+    $this->drupalPostForm(NULL, [], t('Delete'));
     $this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name]));
 
     // Add nodes to use as links for menu links.
-    $node1 = $this->drupalCreateNode(array('type' => 'article'));
-    $node2 = $this->drupalCreateNode(array('type' => 'article'));
-    $node3 = $this->drupalCreateNode(array('type' => 'article'));
-    $node4 = $this->drupalCreateNode(array('type' => 'article'));
+    $node1 = $this->drupalCreateNode(['type' => 'article']);
+    $node2 = $this->drupalCreateNode(['type' => 'article']);
+    $node3 = $this->drupalCreateNode(['type' => 'article']);
+    $node4 = $this->drupalCreateNode(['type' => 'article']);
     // Create a node with an alias.
-    $node5 = $this->drupalCreateNode(array(
+    $node5 = $this->drupalCreateNode([
       'type' => 'article',
-      'path' => array(
+      'path' => [
         'alias' => '/node5',
-      ),
-    ));
+      ],
+    ]);
 
     // Verify add link button.
     $this->drupalGet('admin/structure/menu');
@@ -309,25 +310,25 @@ class MenuTest extends MenuWebTestBase {
     // -- item2
     // --- item3
 
-    $this->assertMenuLink($item1->getPluginId(), array(
-      'children' => array($item2->getPluginId(), $item3->getPluginId()),
-      'parents' => array($item1->getPluginId()),
+    $this->assertMenuLink($item1->getPluginId(), [
+      'children' => [$item2->getPluginId(), $item3->getPluginId()],
+      'parents' => [$item1->getPluginId()],
       // We assert the language code here to make sure that the language
       // selection element degrades gracefully without the Language module.
       'langcode' => 'en',
-    ));
-    $this->assertMenuLink($item2->getPluginId(), array(
-      'children' => array($item3->getPluginId()),
-      'parents' => array($item2->getPluginId(), $item1->getPluginId()),
+    ]);
+    $this->assertMenuLink($item2->getPluginId(), [
+      'children' => [$item3->getPluginId()],
+      'parents' => [$item2->getPluginId(), $item1->getPluginId()],
       // See above.
       'langcode' => 'en',
-    ));
-    $this->assertMenuLink($item3->getPluginId(), array(
-      'children' => array(),
-      'parents' => array($item3->getPluginId(), $item2->getPluginId(), $item1->getPluginId()),
+    ]);
+    $this->assertMenuLink($item3->getPluginId(), [
+      'children' => [],
+      'parents' => [$item3->getPluginId(), $item2->getPluginId(), $item1->getPluginId()],
       // See above.
       'langcode' => 'en',
-    ));
+    ]);
 
     // Verify menu links.
     $this->verifyMenuLink($item1, $node1);
@@ -349,26 +350,26 @@ class MenuTest extends MenuWebTestBase {
     // -- item5
     // -- item6
 
-    $this->assertMenuLink($item4->getPluginId(), array(
-      'children' => array($item5->getPluginId(), $item6->getPluginId()),
-      'parents' => array($item4->getPluginId()),
+    $this->assertMenuLink($item4->getPluginId(), [
+      'children' => [$item5->getPluginId(), $item6->getPluginId()],
+      'parents' => [$item4->getPluginId()],
       // See above.
       'langcode' => 'en',
-    ));
-    $this->assertMenuLink($item5->getPluginId(), array(
-      'children' => array(),
-      'parents' => array($item5->getPluginId(), $item4->getPluginId()),
+    ]);
+    $this->assertMenuLink($item5->getPluginId(), [
+      'children' => [],
+      'parents' => [$item5->getPluginId(), $item4->getPluginId()],
       'langcode' => 'en',
-    ));
-    $this->assertMenuLink($item6->getPluginId(), array(
-      'children' => array(),
-      'parents' => array($item6->getPluginId(), $item4->getPluginId()),
+    ]);
+    $this->assertMenuLink($item6->getPluginId(), [
+      'children' => [],
+      'parents' => [$item6->getPluginId(), $item4->getPluginId()],
       'route_name' => 'entity.node.canonical',
-      'route_parameters' => array('node' => $node5->id()),
+      'route_parameters' => ['node' => $node5->id()],
       'url' => '',
       // See above.
       'langcode' => 'en',
-    ));
+    ]);
 
     // Modify menu links.
     $this->modifyMenuLink($item1);
@@ -389,49 +390,49 @@ class MenuTest extends MenuWebTestBase {
     // ---- item3
     // -- item6
 
-    $this->assertMenuLink($item1->getPluginId(), array(
-      'children' => array(),
-      'parents' => array($item1->getPluginId()),
+    $this->assertMenuLink($item1->getPluginId(), [
+      'children' => [],
+      'parents' => [$item1->getPluginId()],
       // See above.
       'langcode' => 'en',
-    ));
-    $this->assertMenuLink($item4->getPluginId(), array(
-      'children' => array($item5->getPluginId(), $item6->getPluginId(), $item2->getPluginId(), $item3->getPluginId()),
-      'parents' => array($item4->getPluginId()),
+    ]);
+    $this->assertMenuLink($item4->getPluginId(), [
+      'children' => [$item5->getPluginId(), $item6->getPluginId(), $item2->getPluginId(), $item3->getPluginId()],
+      'parents' => [$item4->getPluginId()],
       // See above.
       'langcode' => 'en',
-    ));
+    ]);
 
-    $this->assertMenuLink($item5->getPluginId(), array(
-      'children' => array($item2->getPluginId(), $item3->getPluginId()),
-      'parents' => array($item5->getPluginId(), $item4->getPluginId()),
+    $this->assertMenuLink($item5->getPluginId(), [
+      'children' => [$item2->getPluginId(), $item3->getPluginId()],
+      'parents' => [$item5->getPluginId(), $item4->getPluginId()],
       // See above.
       'langcode' => 'en',
-    ));
-    $this->assertMenuLink($item2->getPluginId(), array(
-      'children' => array($item3->getPluginId()),
-      'parents' => array($item2->getPluginId(), $item5->getPluginId(), $item4->getPluginId()),
+    ]);
+    $this->assertMenuLink($item2->getPluginId(), [
+      'children' => [$item3->getPluginId()],
+      'parents' => [$item2->getPluginId(), $item5->getPluginId(), $item4->getPluginId()],
       // See above.
       'langcode' => 'en',
-    ));
-    $this->assertMenuLink($item3->getPluginId(), array(
-      'children' => array(),
-      'parents' => array($item3->getPluginId(), $item2->getPluginId(), $item5->getPluginId(), $item4->getPluginId()),
+    ]);
+    $this->assertMenuLink($item3->getPluginId(), [
+      'children' => [],
+      'parents' => [$item3->getPluginId(), $item2->getPluginId(), $item5->getPluginId(), $item4->getPluginId()],
       // See above.
       'langcode' => 'en',
-    ));
+    ]);
 
     // Add 102 menu links with increasing weights, then make sure the last-added
     // item's weight doesn't get changed because of the old hardcoded delta=50.
-    $items = array();
+    $items = [];
     for ($i = -50; $i <= 51; $i++) {
       $items[$i] = $this->addMenuLink('', '/node/' . $node1->id(), $menu_name, TRUE, strval($i));
     }
-    $this->assertMenuLink($items[51]->getPluginId(), array('weight' => '51'));
+    $this->assertMenuLink($items[51]->getPluginId(), ['weight' => '51']);
 
     // Disable a link and then re-enable the link via the overview form.
     $this->disableMenuLink($item1);
-    $edit = array();
+    $edit = [];
     $edit['links[menu_plugin_id:' . $item1->getPluginId() . '][enabled]'] = TRUE;
     $this->drupalPostForm('admin/structure/menu/manage/' . $item1->getMenuName(), $edit, t('Save'));
 
@@ -445,15 +446,15 @@ class MenuTest extends MenuWebTestBase {
     $item5->save();
 
     // Verify in the database.
-    $this->assertMenuLink($item1->getPluginId(), array('enabled' => 1));
+    $this->assertMenuLink($item1->getPluginId(), ['enabled' => 1]);
 
     // Add an external link.
     $item7 = $this->addMenuLink('', 'https://www.drupal.org', $menu_name);
-    $this->assertMenuLink($item7->getPluginId(), array('url' => 'https://www.drupal.org'));
+    $this->assertMenuLink($item7->getPluginId(), ['url' => 'https://www.drupal.org']);
 
     // Add <front> menu item.
     $item8 = $this->addMenuLink('', '/', $menu_name);
-    $this->assertMenuLink($item8->getPluginId(), array('route_name' => '<front>'));
+    $this->assertMenuLink($item8->getPluginId(), ['route_name' => '<front>']);
     $this->drupalGet('');
     $this->assertResponse(200);
     // Make sure we get routed correctly.
@@ -488,7 +489,7 @@ class MenuTest extends MenuWebTestBase {
   /**
    * Adds and removes a menu link with a query string and fragment.
    */
-  function testMenuQueryAndFragment() {
+  public function testMenuQueryAndFragment() {
     $this->drupalLogin($this->adminUser);
 
     // Make a path with query and fragment on.
@@ -500,7 +501,7 @@ class MenuTest extends MenuWebTestBase {
 
     // Now change the path to something without query and fragment.
     $path = '/test-page';
-    $this->drupalPostForm('admin/structure/menu/item/' . $item->id() . '/edit', array('link[0][uri]' => $path), t('Save'));
+    $this->drupalPostForm('admin/structure/menu/item/' . $item->id() . '/edit', ['link[0][uri]' => $path], t('Save'));
     $this->drupalGet('admin/structure/menu/item/' . $item->id() . '/edit');
     $this->assertFieldByName('link[0][uri]', $path, 'Path no longer has query or fragment.');
 
@@ -511,7 +512,7 @@ class MenuTest extends MenuWebTestBase {
     $this->drupalGet('admin/structure/menu/item/' . $item->id() . '/edit');
     $this->assertFieldByName('link[0][uri]', $path, 'Path is found with both query and fragment.');
 
-    $this->drupalPostForm('admin/structure/menu/item/' . $item->id() . '/edit', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/menu/item/' . $item->id() . '/edit', [], t('Save'));
 
     $this->drupalGet('admin/structure/menu/item/' . $item->id() . '/edit');
     $this->assertFieldByName('link[0][uri]', $path, 'Path is found with both query and fragment.');
@@ -520,11 +521,11 @@ class MenuTest extends MenuWebTestBase {
   /**
    * Tests renaming the built-in menu.
    */
-  function testSystemMenuRename() {
+  public function testSystemMenuRename() {
     $this->drupalLogin($this->adminUser);
-    $edit = array(
+    $edit = [
       'label' => $this->randomMachineName(16),
-    );
+    ];
     $this->drupalPostForm('admin/structure/menu/manage/main', $edit, t('Save'));
 
     // Make sure menu shows up with new name in block addition.
@@ -537,13 +538,13 @@ class MenuTest extends MenuWebTestBase {
   /**
    * Tests that menu items pointing to unpublished nodes are editable.
    */
-  function testUnpublishedNodeMenuItem() {
-    $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content', 'bypass node access')));
+  public function testUnpublishedNodeMenuItem() {
+    $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer blocks', 'administer menu', 'create article content', 'bypass node access']));
     // Create an unpublished node.
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'type' => 'article',
-      'status' => NODE_NOT_PUBLISHED,
-    ));
+      'status' => NodeInterface::NOT_PUBLISHED,
+    ]);
 
     $item = $this->addMenuLink('', '/node/' . $node->id());
     $this->modifyMenuLink($item);
@@ -563,20 +564,20 @@ class MenuTest extends MenuWebTestBase {
    * Tests the contextual links on a menu block.
    */
   public function testBlockContextualLinks() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer menu', 'access contextual links', 'administer blocks')));
+    $this->drupalLogin($this->drupalCreateUser(['administer menu', 'access contextual links', 'administer blocks']));
     $custom_menu = $this->addCustomMenu();
     $this->addMenuLink('', '/', $custom_menu->id());
-    $block = $this->drupalPlaceBlock('system_menu_block:' . $custom_menu->id(), array('label' => 'Custom menu', 'provider' => 'system'));
+    $block = $this->drupalPlaceBlock('system_menu_block:' . $custom_menu->id(), ['label' => 'Custom menu', 'provider' => 'system']);
     $this->drupalGet('test-page');
 
     $id = 'block:block=' . $block->id() . ':langcode=en|menu:menu=' . $custom_menu->id() . ':langcode=en';
     // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder()
-    $this->assertRaw('<div data-contextual-id="' . $id . '"></div>', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
+    $this->assertRaw('<div data-contextual-id="' . $id . '"></div>', format_string('Contextual link placeholder with id @id exists.', ['@id' => $id]));
 
     // Get server-rendered contextual links.
     // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:renderContextualLinks()
-    $post = array('ids[0]' => $id);
-    $response = $this->drupalPost('contextual/render', 'application/json', $post, array('query' => array('destination' => 'test-page')));
+    $post = ['ids[0]' => $id];
+    $response = $this->drupalPost('contextual/render', 'application/json', $post, ['query' => ['destination' => 'test-page']]);
     $this->assertResponse(200);
     $json = Json::decode($response);
     $this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="block-configure"><a href="' . base_path() . 'admin/structure/block/manage/' . $block->id() . '">Configure block</a></li><li class="entitymenuedit-form"><a href="' . base_path() . 'admin/structure/menu/manage/' . $custom_menu->id() . '">Edit menu</a></li></ul>');
@@ -601,13 +602,13 @@ class MenuTest extends MenuWebTestBase {
    * @return \Drupal\menu_link_content\Entity\MenuLinkContent
    *   A menu link entity.
    */
-  function addMenuLink($parent = '', $path = '/', $menu_name = 'tools', $expanded = FALSE, $weight = '0') {
+  public function addMenuLink($parent = '', $path = '/', $menu_name = 'tools', $expanded = FALSE, $weight = '0') {
     // View add menu link page.
     $this->drupalGet("admin/structure/menu/manage/$menu_name/add");
     $this->assertResponse(200);
 
     $title = '!link_' . $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'link[0][uri]' => $path,
       'title[0][value]' => $title,
       'description[0][value]' => '',
@@ -615,18 +616,18 @@ class MenuTest extends MenuWebTestBase {
       'expanded[value]' => $expanded,
       'menu_parent' => $menu_name . ':' . $parent,
       'weight[0][value]' => $weight,
-    );
+    ];
 
     // Add menu link.
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertResponse(200);
     $this->assertText('The menu link has been saved.');
 
-    $menu_links = entity_load_multiple_by_properties('menu_link_content', array('title' => $title));
+    $menu_links = entity_load_multiple_by_properties('menu_link_content', ['title' => $title]);
 
     $menu_link = reset($menu_links);
     $this->assertTrue($menu_link, 'Menu link was found in database.');
-    $this->assertMenuLink($menu_link->getPluginId(), array('menu_name' => $menu_name, 'children' => array(), 'parent' => $parent));
+    $this->assertMenuLink($menu_link->getPluginId(), ['menu_name' => $menu_name, 'children' => [], 'parent' => $parent]);
 
     return $menu_link;
   }
@@ -634,23 +635,23 @@ class MenuTest extends MenuWebTestBase {
   /**
    * Attempts to add menu link with invalid path or no access permission.
    */
-  function addInvalidMenuLink() {
-    foreach (array('access' => '/admin/people/permissions') as $type => $link_path) {
-      $edit = array(
+  public function addInvalidMenuLink() {
+    foreach (['access' => '/admin/people/permissions'] as $type => $link_path) {
+      $edit = [
         'link[0][uri]' => $link_path,
         'title[0][value]' => 'title',
-      );
+      ];
       $this->drupalPostForm("admin/structure/menu/manage/{$this->menu->id()}/add", $edit, t('Save'));
-      $this->assertRaw(t("The path '@link_path' is inaccessible.", array('@link_path' => $link_path)), 'Menu link was not created');
+      $this->assertRaw(t("The path '@link_path' is inaccessible.", ['@link_path' => $link_path]), 'Menu link was not created');
     }
   }
 
   /**
    * Tests that parent options are limited by depth when adding menu links.
    */
-  function checkInvalidParentMenuLinks() {
+  public function checkInvalidParentMenuLinks() {
     $last_link = NULL;
-    $created_links = array();
+    $created_links = [];
 
     // Get the max depth of the tree.
     $menu_link_tree = \Drupal::service('menu.link_tree');
@@ -660,7 +661,7 @@ class MenuTest extends MenuWebTestBase {
     for ($i = 0; $i <= $max_depth - 1; $i++) {
       $parent = $last_link ? 'tools:' . $last_link->getPluginId() : 'tools:';
       $title = 'title' . $i;
-      $edit = array(
+      $edit = [
         'link[0][uri]' => '/',
         'title[0][value]' => $title,
         'menu_parent' => $parent,
@@ -668,9 +669,9 @@ class MenuTest extends MenuWebTestBase {
         'enabled[value]' => 1,
         'expanded[value]' => FALSE,
         'weight[0][value]' => '0',
-      );
+      ];
       $this->drupalPostForm("admin/structure/menu/manage/{$this->menu->id()}/add", $edit, t('Save'));
-      $menu_links = entity_load_multiple_by_properties('menu_link_content', array('title' => $title));
+      $menu_links = entity_load_multiple_by_properties('menu_link_content', ['title' => $title]);
       $last_link = reset($menu_links);
       $created_links[]  = 'tools:' . $last_link->getPluginId();
     }
@@ -699,7 +700,7 @@ class MenuTest extends MenuWebTestBase {
    * @param object $parent_node
    *   Parent menu link content node.
    */
-  function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkContent $parent = NULL, $parent_node = NULL) {
+  public function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkContent $parent = NULL, $parent_node = NULL) {
     // View home page.
     $this->drupalGet('');
     $this->assertResponse(200);
@@ -713,7 +714,7 @@ class MenuTest extends MenuWebTestBase {
       // Verify menu link link.
       $this->clickLink($title);
       $title = $parent_node->label();
-      $this->assertTitle(t("@title | Drupal", array('@title' => $title)), 'Parent menu link link target was correct');
+      $this->assertTitle(t("@title | Drupal", ['@title' => $title]), 'Parent menu link link target was correct');
     }
 
     // Verify menu link.
@@ -723,7 +724,7 @@ class MenuTest extends MenuWebTestBase {
     // Verify menu link link.
     $this->clickLink($title);
     $title = $item_node->label();
-    $this->assertTitle(t("@title | Drupal", array('@title' => $title)), 'Menu link link target was correct');
+    $this->assertTitle(t("@title | Drupal", ['@title' => $title]), 'Menu link link target was correct');
   }
 
   /**
@@ -736,12 +737,12 @@ class MenuTest extends MenuWebTestBase {
    * @param string $menu_name
    *   The menu the menu link will be moved to.
    */
-  function moveMenuLink(MenuLinkContent $item, $parent, $menu_name) {
+  public function moveMenuLink(MenuLinkContent $item, $parent, $menu_name) {
     $mlid = $item->id();
 
-    $edit = array(
+    $edit = [
       'menu_parent' => $menu_name . ':' . $parent,
-    );
+    ];
     $this->drupalPostForm("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
     $this->assertResponse(200);
   }
@@ -752,14 +753,14 @@ class MenuTest extends MenuWebTestBase {
    * @param \Drupal\menu_link_content\Entity\MenuLinkContent $item
    *   Menu link entity.
    */
-  function modifyMenuLink(MenuLinkContent $item) {
+  public function modifyMenuLink(MenuLinkContent $item) {
     $item->title->value = $this->randomMachineName(16);
 
     $mlid = $item->id();
     $title = $item->getTitle();
 
     // Edit menu link.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $title;
     $this->drupalPostForm("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
     $this->assertResponse(200);
@@ -777,9 +778,9 @@ class MenuTest extends MenuWebTestBase {
    * @param int $old_weight
    *   Original title for menu link.
    */
-  function resetMenuLink(MenuLinkInterface $menu_link, $old_weight) {
+  public function resetMenuLink(MenuLinkInterface $menu_link, $old_weight) {
     // Reset menu link.
-    $this->drupalPostForm("admin/structure/menu/link/{$menu_link->getPluginId()}/reset", array(), t('Reset'));
+    $this->drupalPostForm("admin/structure/menu/link/{$menu_link->getPluginId()}/reset", [], t('Reset'));
     $this->assertResponse(200);
     $this->assertRaw(t('The menu link was reset to its default settings.'), 'Menu link was reset');
 
@@ -794,14 +795,14 @@ class MenuTest extends MenuWebTestBase {
    * @param \Drupal\menu_link_content\Entity\MenuLinkContent $item
    *   Menu link.
    */
-  function deleteMenuLink(MenuLinkContent $item) {
+  public function deleteMenuLink(MenuLinkContent $item) {
     $mlid = $item->id();
     $title = $item->getTitle();
 
     // Delete menu link.
-    $this->drupalPostForm("admin/structure/menu/item/$mlid/delete", array(), t('Delete'));
+    $this->drupalPostForm("admin/structure/menu/item/$mlid/delete", [], t('Delete'));
     $this->assertResponse(200);
-    $this->assertRaw(t('The menu link %title has been deleted.', array('%title' => $title)), 'Menu link was deleted');
+    $this->assertRaw(t('The menu link %title has been deleted.', ['%title' => $title]), 'Menu link was deleted');
 
     // Verify deletion.
     $this->drupalGet('');
@@ -814,7 +815,7 @@ class MenuTest extends MenuWebTestBase {
    * @param \Drupal\menu_link_content\Entity\MenuLinkContent $item
    *   Menu link.
    */
-  function toggleMenuLink(MenuLinkContent $item) {
+  public function toggleMenuLink(MenuLinkContent $item) {
     $this->disableMenuLink($item);
 
     // Verify menu link is absent.
@@ -833,14 +834,14 @@ class MenuTest extends MenuWebTestBase {
    * @param \Drupal\menu_link_content\Entity\MenuLinkContent $item
    *   Menu link.
    */
-  function disableMenuLink(MenuLinkContent $item) {
+  public function disableMenuLink(MenuLinkContent $item) {
     $mlid = $item->id();
     $edit['enabled[value]'] = FALSE;
     $this->drupalPostForm("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
 
     // Unlike most other modules, there is no confirmation message displayed.
     // Verify in the database.
-    $this->assertMenuLink($item->getPluginId(), array('enabled' => 0));
+    $this->assertMenuLink($item->getPluginId(), ['enabled' => 0]);
   }
 
   /**
@@ -849,13 +850,13 @@ class MenuTest extends MenuWebTestBase {
    * @param \Drupal\menu_link_content\Entity\MenuLinkContent $item
    *   Menu link.
    */
-  function enableMenuLink(MenuLinkContent $item) {
+  public function enableMenuLink(MenuLinkContent $item) {
     $mlid = $item->id();
     $edit['enabled[value]'] = TRUE;
     $this->drupalPostForm("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
 
     // Verify in the database.
-    $this->assertMenuLink($item->getPluginId(), array('enabled' => 1));
+    $this->assertMenuLink($item->getPluginId(), ['enabled' => 1]);
   }
 
   /**
@@ -863,7 +864,7 @@ class MenuTest extends MenuWebTestBase {
    * AJAX callback.
    */
   public function testMenuParentsJsAccess() {
-    $admin = $this->drupalCreateUser(array('administer menu'));
+    $admin = $this->drupalCreateUser(['administer menu']);
     $this->drupalLogin($admin);
     // Just check access to the callback overall, the POST data is irrelevant.
     $this->drupalGetAjax('admin/structure/menu/parents');
diff --git a/web/core/modules/menu_ui/src/Tests/MenuWebTestBase.php b/web/core/modules/menu_ui/src/Tests/MenuWebTestBase.php
index c08fc1421..e0ee98fbf 100644
--- a/web/core/modules/menu_ui/src/Tests/MenuWebTestBase.php
+++ b/web/core/modules/menu_ui/src/Tests/MenuWebTestBase.php
@@ -14,7 +14,7 @@ abstract class MenuWebTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('menu_ui', 'menu_link_content');
+  public static $modules = ['menu_ui', 'menu_link_content'];
 
   /**
    * Fetches the menu item from the database and compares it to expected item.
@@ -24,7 +24,7 @@ abstract class MenuWebTestBase extends WebTestBase {
    * @param array $expected_item
    *   Array containing properties to verify.
    */
-  function assertMenuLink($menu_plugin_id, array $expected_item) {
+  public function assertMenuLink($menu_plugin_id, array $expected_item) {
     // Retrieve menu link.
     /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
     $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
diff --git a/web/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuCacheTagsTest.php
similarity index 87%
rename from web/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
rename to web/core/modules/menu_ui/tests/src/Functional/MenuCacheTagsTest.php
index 3ad4ad1d4..f7bf7f88d 100644
--- a/web/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\menu_ui\Tests;
+namespace Drupal\Tests\menu_ui\Functional;
 
 use Drupal\Core\Url;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
@@ -17,7 +17,7 @@ class MenuCacheTagsTest extends PageCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('menu_ui', 'block', 'test_page_test');
+  public static $modules = ['menu_ui', 'block', 'test_page_test'];
 
   /**
    * Tests cache tags presence and invalidation of the Menu entity.
@@ -29,23 +29,24 @@ class MenuCacheTagsTest extends PageCacheTagsTestBase {
     $url = Url::fromRoute('test_page_test.test_page');
 
     // Create a Llama menu, add a link to it and place the corresponding block.
-    $menu = Menu::create(array(
+    $menu = Menu::create([
       'id' => 'llama',
       'label' => 'Llama',
       'description' => 'Description text',
-    ));
+    ]);
     $menu->save();
     /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
     $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
     // Move a link into the new menu.
-    $menu_link = $menu_link_manager->updateDefinition('test_page_test.test_page', array('menu_name' => 'llama', 'parent' => ''));
-    $block = $this->drupalPlaceBlock('system_menu_block:llama', array('label' => 'Llama', 'provider' => 'system', 'region' => 'footer'));
+    $menu_link = $menu_link_manager->updateDefinition('test_page_test.test_page', ['menu_name' => 'llama', 'parent' => '']);
+    $block = $this->drupalPlaceBlock('system_menu_block:llama', ['label' => 'Llama', 'provider' => 'system', 'region' => 'footer']);
 
     // Prime the page cache.
     $this->verifyPageCache($url, 'MISS');
 
     // Verify a cache hit, but also the presence of the correct cache tags.
-    $expected_tags = array(
+    $expected_tags = [
+      'http_response',
       'rendered',
       'block_view',
       'config:block_list',
@@ -54,7 +55,7 @@ class MenuCacheTagsTest extends PageCacheTagsTestBase {
       // The cache contexts associated with the (in)accessible menu links are
       // bubbled.
       'config:user.role.anonymous',
-    );
+    ];
     $this->verifyPageCache($url, 'HIT', $expected_tags);
 
     // Verify that after modifying the menu, there is a cache miss.
@@ -67,7 +68,7 @@ class MenuCacheTagsTest extends PageCacheTagsTestBase {
     $this->verifyPageCache($url, 'HIT');
 
     // Verify that after modifying the menu link weight, there is a cache miss.
-    $menu_link_manager->updateDefinition('test_page_test.test_page', array('weight' => -10));
+    $menu_link_manager->updateDefinition('test_page_test.test_page', ['weight' => -10]);
     $this->pass('Test modification of menu link.', 'Debug');
     $this->verifyPageCache($url, 'MISS');
 
@@ -76,7 +77,7 @@ class MenuCacheTagsTest extends PageCacheTagsTestBase {
 
     // Verify that after adding a menu link, there is a cache miss.
     $this->pass('Test addition of menu link.', 'Debug');
-    $menu_link_2 = MenuLinkContent::create(array(
+    $menu_link_2 = MenuLinkContent::create([
       'id' => '',
       'parent' => '',
       'title' => 'Alpaca',
@@ -85,7 +86,7 @@ class MenuCacheTagsTest extends PageCacheTagsTestBase {
         'uri' => 'internal:/',
       ]],
       'bundle' => 'menu_name',
-    ));
+    ]);
     $menu_link_2->save();
     $this->verifyPageCache($url, 'MISS');
 
@@ -107,7 +108,7 @@ class MenuCacheTagsTest extends PageCacheTagsTestBase {
     $this->verifyPageCache($url, 'MISS');
 
     // Verify a cache hit.
-    $this->verifyPageCache($url, 'HIT', ['config:block_list', 'config:user.role.anonymous', 'rendered']);
+    $this->verifyPageCache($url, 'HIT', ['config:block_list', 'config:user.role.anonymous', 'http_response', 'rendered']);
   }
 
 }
diff --git a/web/core/modules/menu_ui/src/Tests/MenuLinkReorderTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuLinkReorderTest.php
similarity index 79%
rename from web/core/modules/menu_ui/src/Tests/MenuLinkReorderTest.php
rename to web/core/modules/menu_ui/tests/src/Functional/MenuLinkReorderTest.php
index 0396f173e..4d2bba60d 100644
--- a/web/core/modules/menu_ui/src/Tests/MenuLinkReorderTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuLinkReorderTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\menu_ui\Tests;
+namespace Drupal\Tests\menu_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Reorder menu items.
  *
  * @group menu_ui
  */
-class MenuLinkReorderTest extends WebTestBase {
+class MenuLinkReorderTest extends BrowserTestBase {
 
   /**
    * An administrator user.
@@ -23,12 +23,12 @@ class MenuLinkReorderTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('menu_ui', 'test_page_test', 'node', 'block');
+  public static $modules = ['menu_ui', 'test_page_test', 'node', 'block'];
 
   /**
    * Test creating, editing, deleting menu links via node form widget.
    */
-  function testDefaultMenuLinkReorder() {
+  public function testDefaultMenuLinkReorder() {
 
     // Add the main menu block.
     $this->drupalPlaceBlock('system_menu_block:main');
@@ -38,17 +38,17 @@ class MenuLinkReorderTest extends WebTestBase {
     $this->assertLink('Home');
 
     // The administrator user that can re-order menu links.
-    $this->administrator = $this->drupalCreateUser(array(
+    $this->administrator = $this->drupalCreateUser([
       'administer site configuration',
       'access administration pages',
       'administer menu',
-    ));
+    ]);
     $this->drupalLogin($this->administrator);
 
     // Change the weight of the link to a non default value.
-    $edit = array(
+    $edit = [
       'links[menu_plugin_id:test_page_test.front_page][weight]' => -10,
-    );
+    ];
     $this->drupalPostForm('admin/structure/menu/manage/main', $edit, t('Save'));
 
     // The link is still there.
diff --git a/web/core/modules/menu_ui/src/Tests/MenuUninstallTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuUninstallTest.php
similarity index 56%
rename from web/core/modules/menu_ui/src/Tests/MenuUninstallTest.php
rename to web/core/modules/menu_ui/tests/src/Functional/MenuUninstallTest.php
index b1ea03c45..a0320f44b 100644
--- a/web/core/modules/menu_ui/src/Tests/MenuUninstallTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuUninstallTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\menu_ui\Tests;
+namespace Drupal\Tests\menu_ui\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Entity\Menu;
 
 /**
@@ -10,22 +10,22 @@ use Drupal\system\Entity\Menu;
  *
  * @group menu_ui
  */
-class MenuUninstallTest extends WebTestBase {
+class MenuUninstallTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('menu_ui');
+  public static $modules = ['menu_ui'];
 
   /**
    * Tests Menu uninstall.
    */
   public function testMenuUninstall() {
-    \Drupal::service('module_installer')->uninstall(array('menu_ui'));
+    \Drupal::service('module_installer')->uninstall(['menu_ui']);
 
-    \Drupal::entityManager()->getStorage('menu')->resetCache(array('admin'));
+    \Drupal::entityManager()->getStorage('menu')->resetCache(['admin']);
 
     $this->assertTrue(Menu::load('admin'), 'The \'admin\' menu still exists after uninstalling Menu UI module.');
   }
diff --git a/web/core/modules/migrate/migrate.api.php b/web/core/modules/migrate/migrate.api.php
index aea0d77c4..eefda3c38 100644
--- a/web/core/modules/migrate/migrate.api.php
+++ b/web/core/modules/migrate/migrate.api.php
@@ -103,7 +103,7 @@ use Drupal\migrate\Row;
  */
 function hook_migrate_prepare_row(Row $row, MigrateSourceInterface $source, MigrationInterface $migration) {
   if ($migration->id() == 'd6_filter_formats') {
-    $value = $source->getDatabase()->query('SELECT value FROM {variable} WHERE name = :name', array(':name' => 'mymodule_filter_foo_' . $row->getSourceProperty('format')))->fetchField();
+    $value = $source->getDatabase()->query('SELECT value FROM {variable} WHERE name = :name', [':name' => 'mymodule_filter_foo_' . $row->getSourceProperty('format')])->fetchField();
     if ($value) {
       $row->setSourceProperty('settings:mymodule:foo', unserialize($value));
     }
diff --git a/web/core/modules/migrate/migrate.install b/web/core/modules/migrate/migrate.install
index 5044726a4..064b95adc 100644
--- a/web/core/modules/migrate/migrate.install
+++ b/web/core/modules/migrate/migrate.install
@@ -5,11 +5,6 @@
  * Contains install and update functions for Migrate.
  */
 
-/**
- * @addtogroup updates-8.0.0-beta
- * @{
- */
-
 /**
  * Remove load plugin references from existing migrations.
  */
@@ -21,7 +16,3 @@ function migrate_update_8001() {
     $migration->save(TRUE);
   }
 }
-
-/**
- * @} End of "addtogroup updates-8.0.0-beta".
- */
diff --git a/web/core/modules/migrate/migrate.module b/web/core/modules/migrate/migrate.module
index 9cec273cd..3b9246392 100644
--- a/web/core/modules/migrate/migrate.module
+++ b/web/core/modules/migrate/migrate.module
@@ -15,7 +15,7 @@ function migrate_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.migrate':
       $output = '<h3>' . t('About') . '</h3>';
       $output .= '<p>';
-      $output .= t('The Migrate module provides a framework for migrating data, usually from an external source into your site. It does not provide a user interface. For more information, see the <a href=":migrate">online documentation for the Migrate module</a>.', array(':migrate' => 'https://www.drupal.org/documentation/modules/migrate'));
+      $output .= t('The Migrate module provides a framework for migrating data, usually from an external source into your site. It does not provide a user interface. For more information, see the <a href=":migrate">online documentation for the Migrate module</a>.', [':migrate' => 'https://www.drupal.org/documentation/modules/migrate']);
       $output .= '</p>';
       return $output;
   }
diff --git a/web/core/modules/migrate/migrate.services.yml b/web/core/modules/migrate/migrate.services.yml
index 9273ac32f..1a4f64d29 100644
--- a/web/core/modules/migrate/migrate.services.yml
+++ b/web/core/modules/migrate/migrate.services.yml
@@ -21,6 +21,12 @@ services:
   plugin.manager.migrate.id_map:
     class: Drupal\migrate\Plugin\MigratePluginManager
     arguments: [id_map, '@container.namespaces', '@cache.discovery', '@module_handler']
+  cache.discovery_migration:
+    class: Drupal\Core\Cache\CacheBackendInterface
+    tags:
+      - { name: cache.bin }
+    factory: cache_factory:get
+    arguments: [discovery_migration]
   plugin.manager.migration:
     class: Drupal\migrate\Plugin\MigrationPluginManager
-    arguments: ['@module_handler', '@cache.discovery', '@language_manager']
+    arguments: ['@module_handler', '@cache.discovery_migration', '@language_manager']
diff --git a/web/core/modules/migrate/src/Exception/RequirementsException.php b/web/core/modules/migrate/src/Exception/RequirementsException.php
index 4c17dd617..93da7ee4b 100644
--- a/web/core/modules/migrate/src/Exception/RequirementsException.php
+++ b/web/core/modules/migrate/src/Exception/RequirementsException.php
@@ -56,7 +56,7 @@ class RequirementsException extends \RuntimeException {
     $output = '';
     foreach ($this->requirements as $requirement_type => $requirements) {
       if (!is_array($requirements)) {
-        $requirements = array($requirements);
+        $requirements = [$requirements];
       }
 
       foreach ($requirements as $value) {
diff --git a/web/core/modules/migrate/src/MigrateExecutable.php b/web/core/modules/migrate/src/MigrateExecutable.php
index ff05dfecf..e8316e412 100644
--- a/web/core/modules/migrate/src/MigrateExecutable.php
+++ b/web/core/modules/migrate/src/MigrateExecutable.php
@@ -65,7 +65,7 @@ class MigrateExecutable implements MigrateExecutableInterface {
    *
    * @var array
    */
-  protected $counts = array();
+  protected $counts = [];
 
   /**
    * The source.
@@ -151,10 +151,10 @@ class MigrateExecutable implements MigrateExecutableInterface {
     // Only begin the import operation if the migration is currently idle.
     if ($this->migration->getStatus() !== MigrationInterface::STATUS_IDLE) {
       $this->message->display($this->t('Migration @id is busy with another operation: @status',
-        array(
+        [
           '@id' => $this->migration->id(),
           '@status' => $this->t($this->migration->getStatusLabel()),
-        )), 'error');
+        ]), 'error');
       return MigrationInterface::RESULT_FAILED;
     }
     $this->getEventDispatcher()->dispatch(MigrateEvents::PRE_IMPORT, new MigrateImportEvent($this->migration, $this->message));
@@ -167,11 +167,11 @@ class MigrateExecutable implements MigrateExecutableInterface {
       $this->message->display(
         $this->t(
           'Migration @id did not meet the requirements. @message @requirements',
-          array(
+          [
             '@id' => $this->migration->id(),
             '@message' => $e->getMessage(),
             '@requirements' => $e->getRequirementsString(),
-          )
+          ]
         ),
         'error'
       );
@@ -189,7 +189,7 @@ class MigrateExecutable implements MigrateExecutableInterface {
     }
     catch (\Exception $e) {
       $this->message->display(
-        $this->t('Migration failed with source plugin exception: @e', array('@e' => $e->getMessage())), 'error');
+        $this->t('Migration failed with source plugin exception: @e', ['@e' => $e->getMessage()]), 'error');
       $this->migration->setStatus(MigrationInterface::STATUS_IDLE);
       return MigrationInterface::RESULT_FAILED;
     }
@@ -204,7 +204,7 @@ class MigrateExecutable implements MigrateExecutableInterface {
         $save = TRUE;
       }
       catch (MigrateException $e) {
-        $this->migration->getIdMap()->saveIdMapping($row, array(), $e->getStatus());
+        $this->migration->getIdMap()->saveIdMapping($row, [], $e->getStatus());
         $this->saveMessage($e->getMessage(), $e->getLevel());
         $save = FALSE;
       }
@@ -230,7 +230,7 @@ class MigrateExecutable implements MigrateExecutableInterface {
             }
           }
           else {
-            $id_map->saveIdMapping($row, array(), MigrateIdMapInterface::STATUS_FAILED);
+            $id_map->saveIdMapping($row, [], MigrateIdMapInterface::STATUS_FAILED);
             if (!$id_map->messageCount()) {
               $message = $this->t('New object was not saved, no error provided');
               $this->saveMessage($message);
@@ -239,11 +239,11 @@ class MigrateExecutable implements MigrateExecutableInterface {
           }
         }
         catch (MigrateException $e) {
-          $this->migration->getIdMap()->saveIdMapping($row, array(), $e->getStatus());
+          $this->migration->getIdMap()->saveIdMapping($row, [], $e->getStatus());
           $this->saveMessage($e->getMessage(), $e->getLevel());
         }
         catch (\Exception $e) {
-          $this->migration->getIdMap()->saveIdMapping($row, array(), MigrateIdMapInterface::STATUS_FAILED);
+          $this->migration->getIdMap()->saveIdMapping($row, [], MigrateIdMapInterface::STATUS_FAILED);
           $this->handleException($e);
         }
       }
@@ -268,7 +268,7 @@ class MigrateExecutable implements MigrateExecutableInterface {
       catch (\Exception $e) {
         $this->message->display(
           $this->t('Migration failed with source plugin exception: @e',
-            array('@e' => $e->getMessage())), 'error');
+            ['@e' => $e->getMessage()]), 'error');
         $this->migration->setStatus(MigrationInterface::STATUS_IDLE);
         return MigrationInterface::RESULT_FAILED;
       }
@@ -356,9 +356,9 @@ class MigrateExecutable implements MigrateExecutableInterface {
         // plugin) and in this case the current value needs to be iterated
         // and each scalar separately transformed.
         if ($multiple && !$definition['handle_multiples']) {
-          $new_value = array();
+          $new_value = [];
           if (!is_array($value)) {
-            throw new MigrateException(sprintf('Pipeline failed for destination %s: %s got instead of an array,', $destination, $value));
+            throw new MigrateException(sprintf('Pipeline failed at %s plugin for destination %s: %s received instead of an array,', $plugin->getPluginId(), $destination, $value));
           }
           $break = FALSE;
           foreach ($value as $scalar_value) {
@@ -460,11 +460,11 @@ class MigrateExecutable implements MigrateExecutableInterface {
       $this->message->display(
         $this->t(
           'Memory usage is @usage (@pct% of limit @limit), reclaiming memory.',
-          array(
+          [
             '@pct' => round($pct_memory * 100),
             '@usage' => $this->formatSize($usage),
             '@limit' => $this->formatSize($this->memoryLimit),
-          )
+          ]
         ),
         'warning'
       );
@@ -476,11 +476,11 @@ class MigrateExecutable implements MigrateExecutableInterface {
         $this->message->display(
           $this->t(
             'Memory usage is now @usage (@pct% of limit @limit), not enough reclaimed, starting new batch',
-            array(
+            [
               '@pct' => round($pct_memory * 100),
               '@usage' => $this->formatSize($usage),
               '@limit' => $this->formatSize($this->memoryLimit),
-            )
+            ]
           ),
           'warning'
         );
@@ -490,11 +490,11 @@ class MigrateExecutable implements MigrateExecutableInterface {
         $this->message->display(
           $this->t(
             'Memory usage is now @usage (@pct% of limit @limit), reclaimed enough, continuing',
-            array(
+            [
               '@pct' => round($pct_memory * 100),
               '@usage' => $this->formatSize($usage),
               '@limit' => $this->formatSize($this->memoryLimit),
-            )
+            ]
           ),
           'warning');
         return FALSE;
diff --git a/web/core/modules/migrate/src/MigrateMessage.php b/web/core/modules/migrate/src/MigrateMessage.php
index b3c7634b7..4cc166c81 100644
--- a/web/core/modules/migrate/src/MigrateMessage.php
+++ b/web/core/modules/migrate/src/MigrateMessage.php
@@ -14,10 +14,10 @@ class MigrateMessage implements MigrateMessageInterface {
    *
    * @var array
    */
-  protected $map = array(
+  protected $map = [
     'status' => RfcLogLevel::INFO,
     'error' => RfcLogLevel::ERROR,
-  );
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntity.php b/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntity.php
index ef7c0b63e..0babe2fc7 100644
--- a/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntity.php
+++ b/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntity.php
@@ -12,7 +12,7 @@ class MigrateEntity implements ContainerDeriverInterface {
    *
    * @var array
    */
-  protected $derivatives = array();
+  protected $derivatives = [];
 
   /**
    * The entity definitions
@@ -59,12 +59,12 @@ class MigrateEntity implements ContainerDeriverInterface {
       $class = is_subclass_of($entity_info->getClass(), 'Drupal\Core\Config\Entity\ConfigEntityInterface') ?
         'Drupal\migrate\Plugin\migrate\destination\EntityConfigBase' :
         'Drupal\migrate\Plugin\migrate\destination\EntityContentBase';
-      $this->derivatives[$entity_type] = array(
+      $this->derivatives[$entity_type] = [
         'id' => "entity:$entity_type",
         'class' => $class,
         'requirements_met' => 1,
         'provider' => $entity_info->getProvider(),
-      );
+      ];
     }
     return $this->derivatives;
   }
diff --git a/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php b/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php
index 2925bd429..cee3b3985 100644
--- a/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php
+++ b/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntityRevision.php
@@ -12,7 +12,7 @@ class MigrateEntityRevision implements ContainerDeriverInterface {
    *
    * @var array
    */
-  protected $derivatives = array();
+  protected $derivatives = [];
 
   /**
    * The entity definitions
@@ -57,12 +57,12 @@ class MigrateEntityRevision implements ContainerDeriverInterface {
   public function getDerivativeDefinitions($base_plugin_definition) {
     foreach ($this->entityDefinitions as $entity_type => $entity_info) {
       if ($entity_info->getKey('revision')) {
-        $this->derivatives[$entity_type] = array(
+        $this->derivatives[$entity_type] = [
           'id' => "entity_revision:$entity_type",
           'class' => 'Drupal\migrate\Plugin\migrate\destination\EntityRevision',
           'requirements_met' => 1,
           'provider' => $entity_info->getProvider(),
-        );
+        ];
       }
     }
     return $this->derivatives;
diff --git a/web/core/modules/migrate/src/Plugin/Discovery/AnnotatedClassDiscoveryAutomatedProviders.php b/web/core/modules/migrate/src/Plugin/Discovery/AnnotatedClassDiscoveryAutomatedProviders.php
index c102bb890..180be0a3a 100644
--- a/web/core/modules/migrate/src/Plugin/Discovery/AnnotatedClassDiscoveryAutomatedProviders.php
+++ b/web/core/modules/migrate/src/Plugin/Discovery/AnnotatedClassDiscoveryAutomatedProviders.php
@@ -73,7 +73,7 @@ class AnnotatedClassDiscoveryAutomatedProviders extends AnnotatedClassDiscovery
    * {@inheritdoc}
    */
   public function getDefinitions() {
-    $definitions = array();
+    $definitions = [];
 
     $reader = $this->getAnnotationReader();
 
diff --git a/web/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php b/web/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php
index 8a2dfb894..2f657119e 100644
--- a/web/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php
+++ b/web/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php
@@ -55,7 +55,7 @@ class ProviderFilterDecorator implements DiscoveryInterface {
    *   A callable, gets passed a provider name, should return TRUE if the
    *   provider exists and FALSE if not.
    *
-   * @return array|\mixed[] $definitions
+   * @return array|\mixed[]
    *   An array of plugin definitions. If a definition is an array and has a
    *   provider key that provider is guaranteed to exist.
    */
diff --git a/web/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php b/web/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
index 9c83baf29..866e80cbe 100644
--- a/web/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
+++ b/web/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
@@ -106,7 +106,7 @@ interface MigrateDestinationInterface extends PluginInspectionInterface {
    * @return mixed
    *   The entity ID or an indication of success.
    */
-  public function import(Row $row, array $old_destination_id_values = array());
+  public function import(Row $row, array $old_destination_id_values = []);
 
   /**
    * Delete the specified destination object from the target Drupal.
diff --git a/web/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php b/web/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php
index 74100cf4f..090efd042 100644
--- a/web/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php
+++ b/web/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php
@@ -54,7 +54,7 @@ class MigrateDestinationPluginManager extends MigratePluginManager {
    *
    * A specific createInstance method is necessary to pass the migration on.
    */
-  public function createInstance($plugin_id, array $configuration = array(), MigrationInterface $migration = NULL) {
+  public function createInstance($plugin_id, array $configuration = [], MigrationInterface $migration = NULL) {
     if (substr($plugin_id, 0, 7) == 'entity:' && !$this->entityManager->getDefinition(substr($plugin_id, 7), FALSE)) {
       $plugin_id = 'null';
     }
diff --git a/web/core/modules/migrate/src/Plugin/MigratePluginManager.php b/web/core/modules/migrate/src/Plugin/MigratePluginManager.php
index 94c59859e..b3645dbdd 100644
--- a/web/core/modules/migrate/src/Plugin/MigratePluginManager.php
+++ b/web/core/modules/migrate/src/Plugin/MigratePluginManager.php
@@ -49,7 +49,7 @@ class MigratePluginManager extends DefaultPluginManager implements MigratePlugin
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array(), MigrationInterface $migration = NULL) {
+  public function createInstance($plugin_id, array $configuration = [], MigrationInterface $migration = NULL) {
     $plugin_definition = $this->getDefinition($plugin_id);
     $plugin_class = DefaultFactory::getPluginClass($plugin_id, $plugin_definition);
     // If the plugin provides a factory method, pass the container to it.
diff --git a/web/core/modules/migrate/src/Plugin/Migration.php b/web/core/modules/migrate/src/Plugin/Migration.php
index be79d0df3..13092e777 100644
--- a/web/core/modules/migrate/src/Plugin/Migration.php
+++ b/web/core/modules/migrate/src/Plugin/Migration.php
@@ -346,9 +346,9 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
     }
     $index = serialize($process);
     if (!isset($this->processPlugins[$index])) {
-      $this->processPlugins[$index] = array();
+      $this->processPlugins[$index] = [];
       foreach ($this->getProcessNormalized($process) as $property => $configurations) {
-        $this->processPlugins[$index][$property] = array();
+        $this->processPlugins[$index][$property] = [];
         foreach ($configurations as $configuration) {
           if (isset($configuration['source'])) {
             $this->processPlugins[$index][$property][] = $this->processPluginManager->createInstance('get', $configuration, $this);
@@ -376,16 +376,16 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
    *   The normalized process configuration.
    */
   protected function getProcessNormalized(array $process) {
-    $normalized_configurations = array();
+    $normalized_configurations = [];
     foreach ($process as $destination => $configuration) {
       if (is_string($configuration)) {
-        $configuration = array(
+        $configuration = [
           'plugin' => 'get',
           'source' => $configuration,
-        );
+        ];
       }
       if (isset($configuration['plugin'])) {
-        $configuration = array($configuration);
+        $configuration = [$configuration];
       }
       $normalized_configurations[$destination] = $configuration;
     }
diff --git a/web/core/modules/migrate/src/Plugin/MigrationPluginManager.php b/web/core/modules/migrate/src/Plugin/MigrationPluginManager.php
index 3ea5727d0..f3b75bc89 100644
--- a/web/core/modules/migrate/src/Plugin/MigrationPluginManager.php
+++ b/web/core/modules/migrate/src/Plugin/MigrationPluginManager.php
@@ -24,9 +24,9 @@ class MigrationPluginManager extends DefaultPluginManager implements MigrationPl
    *
    * @var array
    */
-  protected $defaults = array(
+  protected $defaults = [
     'class' => '\Drupal\migrate\Plugin\Migration',
-  );
+  ];
 
   /**
    * The interface the plugins should implement.
@@ -55,7 +55,7 @@ class MigrationPluginManager extends DefaultPluginManager implements MigrationPl
   public function __construct(ModuleHandlerInterface $module_handler, CacheBackendInterface $cache_backend, LanguageManagerInterface $language_manager) {
     $this->factory = new ContainerFactory($this, $this->pluginInterface);
     $this->alterInfo('migration_plugins');
-    $this->setCacheBackend($cache_backend, 'migration_plugins', array('migration_plugins'));
+    $this->setCacheBackend($cache_backend, 'migration_plugins', ['migration_plugins']);
     $this->moduleHandler = $module_handler;
   }
 
@@ -85,7 +85,7 @@ class MigrationPluginManager extends DefaultPluginManager implements MigrationPl
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     $instances = $this->createInstances([$plugin_id], [$plugin_id => $configuration]);
     return reset($instances);
   }
@@ -93,7 +93,7 @@ class MigrationPluginManager extends DefaultPluginManager implements MigrationPl
   /**
    * {@inheritdoc}
    */
-  public function createInstances($migration_id, array $configuration = array()) {
+  public function createInstances($migration_id, array $configuration = []) {
     if (empty($migration_id)) {
       $migration_id = array_keys($this->getDefinitions());
     }
@@ -222,9 +222,9 @@ class MigrationPluginManager extends DefaultPluginManager implements MigrationPl
    *   The dynamic ID mapping.
    */
   protected function addDependency(array &$graph, $id, $dependency, $dynamic_ids) {
-    $dependencies = isset($dynamic_ids[$dependency]) ? $dynamic_ids[$dependency] : array($dependency);
+    $dependencies = isset($dynamic_ids[$dependency]) ? $dynamic_ids[$dependency] : [$dependency];
     if (!isset($graph[$id]['edges'])) {
-      $graph[$id]['edges'] = array();
+      $graph[$id]['edges'] = [];
     }
     $graph[$id]['edges'] += array_combine($dependencies, $dependencies);
   }
diff --git a/web/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php b/web/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
index 0f9776822..a0f648862 100644
--- a/web/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
+++ b/web/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
@@ -26,7 +26,7 @@ interface MigrationPluginManagerInterface extends PluginManagerInterface {
    * @throws \Drupal\Component\Plugin\Exception\PluginException
    *   If an instance cannot be created, such as if the ID is invalid.
    */
-  public function createInstances($id, array $configuration = array());
+  public function createInstances($id, array $configuration = []);
 
   /**
    * Creates a stub migration plugin from a definition array.
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php b/web/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php
index a3b174a9d..660248494 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php
@@ -15,8 +15,8 @@ abstract class ComponentEntityDisplayBase extends DestinationBase {
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
-    $values = array();
+  public function import(Row $row, array $old_destination_id_values = []) {
+    $values = [];
     // array_intersect_key() won't work because the order is important because
     // this is also the return value.
     foreach (array_keys($this->getIds()) as $id) {
@@ -24,7 +24,7 @@ abstract class ComponentEntityDisplayBase extends DestinationBase {
     }
     $entity = $this->getEntity($values['entity_type'], $values['bundle'], $values[static::MODE_NAME]);
     if (!$row->getDestinationProperty('hidden')) {
-      $entity->setComponent($values['field_name'], $row->getDestinationProperty('options') ?: array());
+      $entity->setComponent($values['field_name'], $row->getDestinationProperty('options') ?: []);
     }
     else {
       $entity->removeComponent($values['field_name']);
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/Config.php b/web/core/modules/migrate/src/Plugin/migrate/destination/Config.php
index 422037be5..cb1c1c057 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/Config.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/Config.php
@@ -83,7 +83,7 @@ class Config extends DestinationBase implements ContainerFactoryPluginInterface,
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     if ($this->isTranslationDestination()) {
       $this->config = $this->language_manager->getLanguageConfigOverride($row->getDestinationProperty('langcode'), $this->config->getName());
     }
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
index 0cc00d604..2829032cb 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityConfigBase.php
@@ -3,10 +3,16 @@
 namespace Drupal\migrate\Plugin\migrate\destination;
 
 use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\language\ConfigurableLanguageManager;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Row;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Class for importing configuration entities.
@@ -20,10 +26,67 @@ use Drupal\migrate\Row;
  */
 class EntityConfigBase extends Entity {
 
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * The configuration factory.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface;
+   */
+  protected $configFactory;
+
+  /**
+   * Construct a new entity.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
+   *   The migration.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
+   *   The storage for this entity type.
+   * @param array $bundles
+   *   The list of bundles this entity type has.
+   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   *   The language manager.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The configuration factory.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, LanguageManagerInterface $language_manager, ConfigFactoryInterface $config_factory) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles);
+    $this->languageManager = $language_manager;
+    $this->configFactory = $config_factory;
+  }
+
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+    $entity_type_id = static::getEntityTypeId($plugin_id);
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $migration,
+      $container->get('entity.manager')->getStorage($entity_type_id),
+      array_keys($container->get('entity.manager')->getBundleInfo($entity_type_id)),
+      $container->get('language_manager'),
+      $container->get('config.factory')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function import(Row $row, array $old_destination_id_values = []) {
     if ($row->isStub()) {
       throw new MigrateException('Config entities can not be stubbed.');
     }
@@ -39,17 +102,37 @@ class EntityConfigBase extends Entity {
       }
     }
     $entity = $this->getEntity($row, $old_destination_id_values);
-    $entity->save();
+    // Translations are already saved in updateEntity by configuration override.
+    if (!$this->isTranslationDestination()) {
+      $entity->save();
+    }
     if (count($ids) > 1) {
       // This can only be a config entity, content entities have their ID key
       // and that's it.
-      $return = array();
+      $return = [];
       foreach ($id_keys as $id_key) {
-        $return[] = $entity->get($id_key);
+        if (($this->isTranslationDestination()) && ($id_key == 'langcode')) {
+          // Config entities do not have a language property, get the language
+          // code from the destination.
+          $return[] = $row->getDestinationProperty($id_key);
+        }
+        else {
+          $return[] = $entity->get($id_key);
+        }
       }
       return $return;
     }
-    return array($entity->id());
+    return [$entity->id()];
+  }
+
+  /**
+   * Get whether this destination is for translations.
+   *
+   * @return bool
+   *   Whether this destination is for translations.
+   */
+  protected function isTranslationDestination() {
+    return !empty($this->configuration['translations']);
   }
 
   /**
@@ -58,6 +141,9 @@ class EntityConfigBase extends Entity {
   public function getIds() {
     $id_key = $this->getKey('id');
     $ids[$id_key]['type'] = 'string';
+    if ($this->isTranslationDestination()) {
+      $ids['langcode']['type'] = 'string';
+    }
     return $ids;
   }
 
@@ -70,11 +156,28 @@ class EntityConfigBase extends Entity {
    *   The row object to update from.
    */
   protected function updateEntity(EntityInterface $entity, Row $row) {
-    foreach ($row->getRawDestination() as $property => $value) {
-      $this->updateEntityProperty($entity, explode(Row::PROPERTY_SEPARATOR, $property), $value);
+    // This is a translation if the language in the active config does not
+    // match the language of this row.
+    $translation = FALSE;
+    if ($row->hasDestinationProperty('langcode') && $this->languageManager instanceof ConfigurableLanguageManager) {
+      $config = $entity->getConfigDependencyName();
+      $langcode = $this->configFactory->get('langcode');
+      if ($langcode != $row->getDestinationProperty('langcode')) {
+        $translation = TRUE;
+      }
     }
 
-    $this->setRollbackAction($row->getIdMap());
+    if ($translation) {
+      $config_override = $this->languageManager->getLanguageConfigOverride($row->getDestinationProperty('langcode'), $config);
+      $config_override->set(str_replace(Row::PROPERTY_SEPARATOR, '.', $row->getDestinationProperty('property')), $row->getDestinationProperty('translation'));
+      $config_override->save();
+    }
+    else {
+      foreach ($row->getRawDestination() as $property => $value) {
+        $this->updateEntityProperty($entity, explode(Row::PROPERTY_SEPARATOR, $property), $value);
+      }
+      $this->setRollbackAction($row->getIdMap());
+    }
   }
 
   /**
@@ -111,11 +214,41 @@ class EntityConfigBase extends Entity {
    *   The generated entity ID.
    */
   protected function generateId(Row $row, array $ids) {
-    $id_values = array();
+    $id_values = [];
     foreach ($ids as $id) {
+      if ($this->isTranslationDestination() && $id == 'langcode') {
+        continue;
+      }
       $id_values[] = $row->getDestinationProperty($id);
     }
     return implode('.', $id_values);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function rollback(array $destination_identifier) {
+    if ($this->isTranslationDestination()) {
+      // The entity id does not include the langcode.
+      $id_values = [];
+      foreach ($destination_identifier as $key => $value) {
+        if ($this->isTranslationDestination() && $key == 'langcode') {
+          continue;
+        }
+        $id_values[] = $value;
+      }
+      $entity_id = implode('.', $id_values);
+      $language = $destination_identifier['langcode'];
+
+      $config = $this->storage->load($entity_id)->getConfigDependencyName();
+      $config_override = $this->languageManager->getLanguageConfigOverride($language, $config);
+      // Rollback the translation.
+      $config_override->delete();
+    }
+    else {
+      $destination_identifier = implode('.', $destination_identifier);
+      parent::rollback([$destination_identifier]);
+    }
+  }
+
 }
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
index 9da3de6f9..d4f9bd72e 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
@@ -80,7 +80,7 @@ class EntityContentBase extends Entity {
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     $this->rollbackAction = MigrateIdMapInterface::ROLLBACK_DELETE;
     $entity = $this->getEntity($row, $old_destination_id_values);
     if (!$entity) {
@@ -105,9 +105,9 @@ class EntityContentBase extends Entity {
    * @return array
    *   An array containing the entity ID.
    */
-  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = array()) {
+  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
     $entity->save();
-    return array($entity->id());
+    return [$entity->id()];
   }
 
   /**
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldInstance.php b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldInstance.php
index 966cb3708..a431c4972 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldInstance.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldInstance.php
@@ -18,15 +18,10 @@ class EntityFieldInstance extends EntityConfigBase {
     $ids['entity_type']['type'] = 'string';
     $ids['bundle']['type'] = 'string';
     $ids['field_name']['type'] = 'string';
+    if ($this->isTranslationDestination()) {
+      $ids['langcode']['type'] = 'string';
+    }
     return $ids;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function rollback(array $destination_identifier) {
-    $destination_identifier = implode('.', $destination_identifier);
-    parent::rollback(array($destination_identifier));
-  }
-
 }
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldStorageConfig.php b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
index 7ad01045a..9b781a3f9 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
@@ -25,7 +25,7 @@ class EntityFieldStorageConfig extends EntityConfigBase {
    */
   public function rollback(array $destination_identifier) {
     $destination_identifier = implode('.', $destination_identifier);
-    parent::rollback(array($destination_identifier));
+    parent::rollback([$destination_identifier]);
   }
 
 }
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php
index 381974291..b0db47698 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php
@@ -63,9 +63,9 @@ class EntityRevision extends EntityContentBase {
   /**
    * {@inheritdoc}
    */
-  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = array()) {
+  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
     $entity->save();
-    return array($entity->getRevisionId());
+    return [$entity->getRevisionId()];
   }
 
   /**
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php
index fad171b59..d7c2e80e1 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityViewMode.php
@@ -25,7 +25,7 @@ class EntityViewMode extends EntityConfigBase {
    */
   public function rollback(array $destination_identifier) {
     $destination_identifier = implode('.', $destination_identifier);
-    parent::rollback(array($destination_identifier));
+    parent::rollback([$destination_identifier]);
   }
 
 }
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php b/web/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
index 878a1838b..cfe47eada 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
@@ -19,20 +19,20 @@ class NullDestination extends DestinationBase {
    * {@inheritdoc}
    */
   public function getIds() {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function fields(MigrationInterface $migration = NULL) {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
   }
 
 }
diff --git a/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
index 962e05b23..14a0a7abe 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -115,14 +115,14 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    *
    * @var array
    */
-  protected $sourceIds = array();
+  protected $sourceIds = [];
 
   /**
    * The destination identifiers.
    *
    * @var array
    */
-  protected $destinationIds = array();
+  protected $destinationIds = [];
 
   /**
    * The current row.
@@ -136,7 +136,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    *
    * @var array
    */
-  protected $currentKey = array();
+  protected $currentKey = [];
 
   /**
    * Constructs an SQL object.
@@ -208,7 +208,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
   protected function sourceIdFields() {
     if (!isset($this->sourceIdFields)) {
       // Build the source and destination identifier maps.
-      $this->sourceIdFields = array();
+      $this->sourceIdFields = [];
       $count = 1;
       foreach ($this->migration->getSourcePlugin()->getIds() as $field => $schema) {
         $this->sourceIdFields[$field] = 'sourceid' . $count++;
@@ -225,7 +225,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    */
   protected function destinationIdFields() {
     if (!isset($this->destinationIdFields)) {
-      $this->destinationIdFields = array();
+      $this->destinationIdFields = [];
       $count = 1;
       foreach ($this->migration->getDestinationPlugin()->getIds() as $field => $schema) {
         $this->destinationIdFields[$field] = 'destid' . $count++;
@@ -312,19 +312,21 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
       // Generate appropriate schema info for the map and message tables,
       // and map from the source field names to the map/msg field names.
       $count = 1;
-      $source_id_schema = array();
+      $source_id_schema = [];
+      $indexes = [];
       foreach ($this->migration->getSourcePlugin()->getIds() as $id_definition) {
         $mapkey = 'sourceid' . $count++;
+        $indexes['source'][] = $mapkey;
         $source_id_schema[$mapkey] = $this->getFieldSchema($id_definition);
         $source_id_schema[$mapkey]['not null'] = TRUE;
       }
 
-      $source_ids_hash[static::SOURCE_IDS_HASH] = array(
+      $source_ids_hash[static::SOURCE_IDS_HASH] = [
         'type' => 'varchar',
         'length' => '64',
         'not null' => TRUE,
         'description' => 'Hash of source ids. Used as primary key',
-      );
+      ];
       $fields = $source_ids_hash + $source_id_schema;
 
       // Add destination identifiers to map table.
@@ -336,68 +338,69 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
         $fields[$mapkey] = $this->getFieldSchema($id_definition);
         $fields[$mapkey]['not null'] = FALSE;
       }
-      $fields['source_row_status'] = array(
+      $fields['source_row_status'] = [
         'type' => 'int',
         'size' => 'tiny',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => MigrateIdMapInterface::STATUS_IMPORTED,
         'description' => 'Indicates current status of the source row',
-      );
-      $fields['rollback_action'] = array(
+      ];
+      $fields['rollback_action'] = [
         'type' => 'int',
         'size' => 'tiny',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => MigrateIdMapInterface::ROLLBACK_DELETE,
         'description' => 'Flag indicating what to do for this item on rollback',
-      );
-      $fields['last_imported'] = array(
+      ];
+      $fields['last_imported'] = [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'UNIX timestamp of the last time this row was imported',
-      );
-      $fields['hash'] = array(
+      ];
+      $fields['hash'] = [
         'type' => 'varchar',
         'length' => '64',
         'not null' => FALSE,
         'description' => 'Hash of source row data, for detecting changes',
-      );
-      $schema = array(
+      ];
+      $schema = [
         'description' => 'Mappings from source identifier value(s) to destination identifier value(s).',
         'fields' => $fields,
-        'primary key' => array(static::SOURCE_IDS_HASH),
-      );
+        'primary key' => [static::SOURCE_IDS_HASH],
+        'indexes' => $indexes,
+      ];
       $this->getDatabase()->schema()->createTable($this->mapTableName, $schema);
 
       // Now do the message table.
       if (!$this->getDatabase()->schema()->tableExists($this->messageTableName())) {
-        $fields = array();
-        $fields['msgid'] = array(
+        $fields = [];
+        $fields['msgid'] = [
           'type' => 'serial',
           'unsigned' => TRUE,
           'not null' => TRUE,
-        );
+        ];
         $fields += $source_ids_hash;
 
-        $fields['level'] = array(
+        $fields['level'] = [
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 1,
-        );
-        $fields['message'] = array(
+        ];
+        $fields['message'] = [
           'type' => 'text',
           'size' => 'medium',
           'not null' => TRUE,
-        );
-        $schema = array(
+        ];
+        $schema = [
           'description' => 'Messages generated during a migration process',
           'fields' => $fields,
-          'primary key' => array('msgid'),
-        );
+          'primary key' => ['msgid'],
+        ];
         $this->getDatabase()->schema()->createTable($this->messageTableName(), $schema);
       }
     }
@@ -406,33 +409,33 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
       if (!$this->getDatabase()->schema()->fieldExists($this->mapTableName,
                                                     'rollback_action')) {
         $this->getDatabase()->schema()->addField($this->mapTableName, 'rollback_action',
-          array(
+          [
             'type' => 'int',
             'size' => 'tiny',
             'unsigned' => TRUE,
             'not null' => TRUE,
             'default' => 0,
             'description' => 'Flag indicating what to do for this item on rollback',
-          )
+          ]
         );
       }
       if (!$this->getDatabase()->schema()->fieldExists($this->mapTableName, 'hash')) {
         $this->getDatabase()->schema()->addField($this->mapTableName, 'hash',
-          array(
+          [
             'type' => 'varchar',
             'length' => '64',
             'not null' => FALSE,
             'description' => 'Hash of source row data, for detecting changes',
-          )
+          ]
         );
       }
       if (!$this->getDatabase()->schema()->fieldExists($this->mapTableName, static::SOURCE_IDS_HASH)) {
-        $this->getDatabase()->schema()->addField($this->mapTableName, static::SOURCE_IDS_HASH, array(
+        $this->getDatabase()->schema()->addField($this->mapTableName, static::SOURCE_IDS_HASH, [
           'type' => 'varchar',
           'length' => '64',
           'not null' => TRUE,
           'description' => 'Hash of source ids. Used as primary key',
-        ));
+        ]);
       }
     }
   }
@@ -482,7 +485,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    */
   public function getRowBySource(array $source_id_values) {
     $query = $this->getDatabase()->select($this->mapTableName(), 'map')
-              ->fields('map');
+      ->fields('map');
     $query->condition(static::SOURCE_IDS_HASH, $this->getSourceIDsHash($source_id_values));
     $result = $query->execute();
     return $result->fetchAssoc();
@@ -493,7 +496,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    */
   public function getRowByDestination(array $destination_id_values) {
     $query = $this->getDatabase()->select($this->mapTableName(), 'map')
-              ->fields('map');
+      ->fields('map');
     foreach ($this->destinationIdFields() as $field_name => $destination_id) {
       $query->condition("map.$destination_id", $destination_id_values[$field_name], '=');
     }
@@ -505,12 +508,12 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    * {@inheritdoc}
    */
   public function getRowsNeedingUpdate($count) {
-    $rows = array();
+    $rows = [];
     $result = $this->getDatabase()->select($this->mapTableName(), 'map')
-                      ->fields('map')
-                      ->condition('source_row_status', MigrateIdMapInterface::STATUS_NEEDS_UPDATE)
-                      ->range(0, $count)
-                      ->execute();
+      ->fields('map')
+      ->condition('source_row_status', MigrateIdMapInterface::STATUS_NEEDS_UPDATE)
+      ->range(0, $count)
+      ->execute();
     foreach ($result as $row) {
       $rows[] = $row;
     }
@@ -538,7 +541,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    */
   public function lookupDestinationId(array $source_id_values) {
     $results = $this->lookupDestinationIds($source_id_values);
-    return $results ? reset($results) : array();
+    return $results ? reset($results) : [];
   }
 
   /**
@@ -546,7 +549,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    */
   public function lookupDestinationIds(array $source_id_values) {
     if (empty($source_id_values)) {
-      return array();
+      return [];
     }
 
     // Canonicalize the keys into a hash of DB-field => value.
@@ -602,7 +605,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
       if (!isset($source_id_values[$field_name])) {
         $this->message->display($this->t(
           'Did not save to map table due to NULL value for key field @field',
-          array('@field' => $field_name)), 'error');
+          ['@field' => $field_name]), 'error');
         return;
       }
       $fields[$key_name] = $source_id_values[$field_name];
@@ -612,11 +615,11 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
       return;
     }
 
-    $fields += array(
+    $fields += [
       'source_row_status' => (int) $source_row_status,
       'rollback_action' => (int) $rollback_action,
       'hash' => $row->getHash(),
-    );
+    ];
     $count = 0;
     foreach ($destination_id_values as $dest_id) {
       $fields['destid' . ++$count] = $dest_id;
@@ -680,7 +683,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    */
   public function prepareUpdate() {
     $this->getDatabase()->update($this->mapTableName())
-      ->fields(array('source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE))
+      ->fields(['source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE])
       ->execute();
   }
 
@@ -699,7 +702,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    */
   public function importedCount() {
     return $this->getDatabase()->select($this->mapTableName())
-      ->condition('source_row_status', array(MigrateIdMapInterface::STATUS_IMPORTED, MigrateIdMapInterface::STATUS_NEEDS_UPDATE), 'IN')
+      ->condition('source_row_status', [MigrateIdMapInterface::STATUS_IMPORTED, MigrateIdMapInterface::STATUS_NEEDS_UPDATE], 'IN')
       ->countQuery()
       ->execute()
       ->fetchField();
@@ -794,7 +797,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
     }
     $query = $this->getDatabase()
       ->update($this->mapTableName())
-      ->fields(array('source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE));
+      ->fields(['source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE]);
 
     foreach ($this->sourceIdFields() as $field_name => $source_id) {
       $query->condition($source_id, $source_id_values[$field_name]);
@@ -818,13 +821,13 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
   }
 
   /**
-   * Implementation of Iterator::rewind().
+   * Implementation of \Iterator::rewind().
    *
    * This is called before beginning a foreach loop.
    */
   public function rewind() {
     $this->currentRow = NULL;
-    $fields = array();
+    $fields = [];
     foreach ($this->sourceIdFields() as $field) {
       $fields[] = $field;
     }
@@ -839,7 +842,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
   }
 
   /**
-   * Implementation of Iterator::current().
+   * Implementation of \Iterator::current().
    *
    * This is called when entering a loop iteration, returning the current row.
    */
@@ -848,7 +851,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
   }
 
   /**
-   * Implementation of Iterator::key().
+   * Implementation of \Iterator::key().
    *
    * This is called when entering a loop iteration, returning the key of the
    * current row. It must be a scalar - we will serialize to fulfill the
@@ -863,7 +866,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    */
   public function currentDestination() {
     if ($this->valid()) {
-      $result = array();
+      $result = [];
       foreach ($this->destinationIdFields() as $destination_field_name => $idmap_field_name) {
         if (!is_null($this->currentRow[$idmap_field_name])) {
           $result[$destination_field_name] = $this->currentRow[$idmap_field_name];
@@ -881,7 +884,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    */
   public function currentSource() {
     if ($this->valid()) {
-      $result = array();
+      $result = [];
       foreach ($this->sourceIdFields() as $field_name => $source_id) {
         $result[$field_name] = $this->currentKey[$source_id];
       }
@@ -893,14 +896,14 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
   }
 
   /**
-   * Implementation of Iterator::next().
+   * Implementation of \Iterator::next().
    *
    * This is called at the bottom of the loop implicitly, as well as explicitly
    * from rewind().
    */
   public function next() {
     $this->currentRow = $this->result->fetchAssoc();
-    $this->currentKey = array();
+    $this->currentKey = [];
     if ($this->currentRow) {
       foreach ($this->sourceIdFields() as $map_field) {
         $this->currentKey[$map_field] = $this->currentRow[$map_field];
@@ -911,7 +914,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
   }
 
   /**
-   * Implementation of Iterator::valid().
+   * Implementation of \Iterator::valid().
    *
    * This is called at the top of the loop, returning TRUE to process the loop
    * and FALSE to terminate it.
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Callback.php b/web/core/modules/migrate/src/Plugin/migrate/process/Callback.php
index 618e05d4b..8721899f4 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Callback.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Callback.php
@@ -7,15 +7,38 @@ use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
 /**
- * This plugin allows source value to be passed to a callback.
+ * Passes the source value to a callback.
  *
- * The current value is passed to a callable that returns the processed value.
- * This plugin allows simple processing of the value, such as strtolower(). The
- * callable takes the value as the single mandatory argument. No additional
- * arguments can be passed to the callback as this would make the migration YAML
- * file too complex.
+ * The callback process plugin allows simple processing of the value, such as
+ * strtolower(). The callable takes the source value as the single mandatory
+ * argument. No additional arguments can be passed to the callback.
  *
- * @link https://www.drupal.org/node/2181783 Online handbook documentation for callback process plugin @endlink
+ * Available configuration keys:
+ * - callable: The name of the callable method.
+ *
+ * Examples:
+ *
+ * @code
+ * process:
+ *   destination_field:
+ *     plugin: callback
+ *     callable: strtolower
+ *     source: source_field
+ * @endcode
+ *
+ * An example where the callable is a static method in a class:
+ *
+ * @code
+ * process:
+ *   destination_field:
+ *     plugin: callback
+ *     callable:
+ *       - '\Drupal\Component\Utility\Unicode'
+ *       - strtolower
+ *     source: source_field
+ * @endcode
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "callback"
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Concat.php b/web/core/modules/migrate/src/Plugin/migrate/process/Concat.php
index c013bdc78..e3323b4b0 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Concat.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Concat.php
@@ -8,9 +8,48 @@ use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
 /**
- * Concatenates the strings in the current value.
+ * Concatenates a set of strings.
  *
- * @link https://www.drupal.org/node/2345927 Online handbook documentation for concat process plugin @endlink
+ * The concat plugin is used to concatenate strings. For example, imploding a
+ * set of strings into a single string.
+ *
+ * Available configuration keys:
+ * - delimiter: (optional) A delimiter, or glue string, to insert between the
+ *   strings.
+ *
+ * Examples:
+ *
+ * @code
+ * process:
+ *   new_text_field:
+ *     plugin: concat
+ *     source:
+ *       - foo
+ *       - bar
+ * @endcode
+ *
+ * This will set new_text_field to the concatenation of the 'foo' and 'bar'
+ * source values. For example, if the 'foo' property is "wambooli" and the 'bar'
+ * property is "pastafazoul", new_text_field will be "wamboolipastafazoul".
+ *
+ * You can also specify a delimiter.
+ *
+ * @code
+ * process:
+ *   new_text_field:
+ *     plugin: concat
+ *     source:
+ *       - foo
+ *       - bar
+ *     delimiter: /
+ * @endcode
+ *
+ * This will set new_text_field to the concatenation of the 'foo' source value,
+ * the delimiter and the 'bar' source value. For example, using the values above
+ * and "/" as the delimiter, if the 'foo' property is "wambooli" and the 'bar'
+ * property is "pastafazoul", new_text_field will be "wambooli/pastafazoul".
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "concat",
@@ -21,8 +60,6 @@ class Concat extends ProcessPluginBase {
 
   /**
    * {@inheritdoc}
-   *
-   * Concatenates the strings in the current value.
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     if (is_array($value)) {
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php b/web/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
index a616c86c3..31c3eca47 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\migrate\Plugin\migrate\process;
 
-use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -22,11 +22,11 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 class DedupeEntity extends DedupeBase implements ContainerFactoryPluginInterface {
 
   /**
-   * The entity query factory.
+   * The entity storage.
    *
-   * @var \Drupal\Core\Entity\Query\QueryFactoryInterface
+   * @var \Drupal\Core\Entity\EntityStorageInterface
    */
-  protected $entityQueryFactory;
+  protected $entityStorage;
 
   /**
    * The current migration.
@@ -38,10 +38,10 @@ class DedupeEntity extends DedupeBase implements ContainerFactoryPluginInterface
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, QueryFactory $entity_query_factory) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityTypeManagerInterface $entity_type_manager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->migration = $migration;
-    $this->entityQueryFactory = $entity_query_factory;
+    $this->entityStorage = $entity_type_manager->getStorage($this->configuration['entity_type']);
   }
 
   /**
@@ -53,7 +53,7 @@ class DedupeEntity extends DedupeBase implements ContainerFactoryPluginInterface
       $plugin_id,
       $plugin_definition,
       $migration,
-      $container->get('entity.query')
+      $container->get('entity_type.manager')
     );
   }
 
@@ -63,8 +63,7 @@ class DedupeEntity extends DedupeBase implements ContainerFactoryPluginInterface
   protected function exists($value) {
     // Plugins are cached so for every run we need a new query object.
     $query = $this
-      ->entityQueryFactory
-      ->get($this->configuration['entity_type'], 'AND')
+      ->entityStorage->getQuery()
       ->condition($this->configuration['field'], $value);
     if (!empty($this->configuration['migrated'])) {
       // Check if each entity is in the ID map.
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/DefaultValue.php b/web/core/modules/migrate/src/Plugin/migrate/process/DefaultValue.php
index db216f6f0..5829f7473 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/DefaultValue.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/DefaultValue.php
@@ -7,9 +7,38 @@ use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 
 /**
- * This plugin sets missing values on the destination.
+ * Returns a given default value if the input is empty.
  *
- * @link https://www.drupal.org/node/2135313 Online handbook documentation for default_value process plugin @endlink
+ * The default_value process plugin provides the ability to set a fixed default
+ * value. The plugin returns a default value if the input value is considered
+ * empty (NULL, FALSE, 0, '0', an empty string, or an empty array). The strict
+ * configuration key can be used to set the default only when the incoming
+ * value is NULL.
+ *
+ * Available configuration keys:
+ * - default_value: The fixed default value to apply.
+ * - strict: (optional) Use strict value checking. Defaults to false.
+ *   - FALSE: Apply default when input value is empty().
+ *   - TRUE: Apply default when input value is NULL.
+ *
+ * Example:
+ *
+ * @code
+ * process:
+ *   uid:
+ *     -
+ *       plugin: migration
+ *       migration: users
+ *       source: author
+ *     -
+ *       plugin: default_value
+ *       default_value: 44
+ * @endcode
+ *
+ * This will look up the source value of author in the users migration and if
+ * not found, set the destination property uid to 44.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "default_value"
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Download.php b/web/core/modules/migrate/src/Plugin/migrate/process/Download.php
index 2014085e0..cfcba8115 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Download.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Download.php
@@ -12,7 +12,42 @@ use GuzzleHttp\Client;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Downloads a file from a remote location into the local file system.
+ * Downloads a file from a HTTP(S) remote location into the local file system.
+ *
+ * The source value is an array of two values:
+ * - source URL, e.g. 'http://www.example.com/img/foo.img'
+ * - destination URI, e.g. 'public://images/foo.img'
+ *
+ * Available configuration keys:
+ * - rename: (optional) If set, a unique destination URI is generated. If not
+ *   set, the destination URI will be overwritten if it exists.
+ * - guzzle_options: (optional)
+ *   @link http://docs.guzzlephp.org/en/latest/request-options.html Array of request options for Guzzle. @endlink
+ *
+ * Examples:
+ *
+ * @code
+ * process:
+ *   plugin: download
+ *   source:
+ *     - source_url
+ *     - destination_uri
+ * @endcode
+ *
+ * This will download source_url to destination_uri.
+ *
+ * @code
+ * process:
+ *   plugin: download
+ *   source:
+ *     - source_url
+ *     - destination_uri
+ *   rename: true
+ * @endcode
+ *
+ * This will download source_url to destination_uri and ensure that the
+ * destination URI is unique. If a file with the same name exists at the
+ * destination, a numbered suffix like '_0' will be appended to make it unique.
  *
  * @MigrateProcessPlugin(
  *   id = "download"
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Explode.php b/web/core/modules/migrate/src/Plugin/migrate/process/Explode.php
index fd3cc9cfb..536a9e1b0 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Explode.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Explode.php
@@ -8,9 +8,84 @@ use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 
 /**
- * This plugin explodes a delimited string into an array of values.
+ * Splits the source string into an array of strings, using a delimiter.
  *
- * @link https://www.drupal.org/node/2674504 Online handbook documentation for explode process plugin @endlink
+ * This plugin creates an array of strings by splitting the source parameter on
+ * boundaries formed by the delimiter.
+ *
+ * Available configuration keys:
+ * - source: The source string.
+ * - limit: (optional)
+ *   - If limit is set and positive, the returned array will contain a maximum
+ *     of limit elements with the last element containing the rest of string.
+ *   - If limit is set and negative, all components except the last -limit are
+ *     returned.
+ *   - If the limit parameter is zero, then this is treated as 1.
+ * - delimiter: The boundary string.
+ * - strict: (optional) When this boolean is TRUE, the source should be strictly
+ *   a string. If FALSE is passed, the source value is casted to a string before
+ *   being split. Also, in this case, the values casting to empty strings are
+ *   converted to empty arrays, instead of an array with a single empty string
+ *   item ['']. Defaults to TRUE.
+ *
+ * Example:
+ *
+ * @code
+ * process:
+ *   bar:
+ *     plugin: explode
+ *     source: foo
+ *     delimiter: /
+ * @endcode
+ *
+ * If foo is "node/1", then bar will be ['node', '1']. The PHP equivalent of
+ * this would be:
+ *
+ * @code
+ *   $bar = explode('/', $foo);
+ * @endcode
+ *
+ * @code
+ * process:
+ *   bar:
+ *     plugin: explode
+ *     source: foo
+ *     limit: 1
+ *     delimiter: /
+ * @endcode
+ *
+ * If foo is "node/1/edit", then bar will be ['node', '1/edit']. The PHP
+ * equivalent of this would be:
+ *
+ * @code
+ *   $bar = explode('/', $foo, 1);
+ * @endcode
+ *
+ * If the 'strict' configuration is set to FALSE, the input value is casted to a
+ * string before being spilt:
+ *
+ * @code
+ * process:
+ *   bar:
+ *     plugin: explode
+ *     source: foo
+ *     delimiter: /
+ *     strict: false
+ * @endcode
+ *
+ * If foo is 123 (as integer), then bar will be ['123']. If foo is TRUE, then
+ * bar will be ['1']. The PHP equivalent of this would be:
+ *
+ * @code
+ *   $bar = explode('/', (string) 123);
+ *   $bar = explode('/', (string) TRUE);
+ * @endcode
+ *
+ * If the 'strict' configuration is set to FALSE, the source value casting to
+ * an empty string are converted to an empty array. For example, with the last
+ * configuration, if foo is '', NULL or FALSE, then bar will be [].
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "explode"
@@ -22,18 +97,29 @@ class Explode extends ProcessPluginBase {
    * {@inheritdoc}
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    if (is_string($value)) {
-      if (!empty($this->configuration['delimiter'])) {
-        $limit = isset($this->configuration['limit']) ? $this->configuration['limit'] : PHP_INT_MAX;
-        return explode($this->configuration['delimiter'], $value, $limit);
-      }
-      else {
-        throw new MigrateException('delimiter is empty');
-      }
+    if (empty($this->configuration['delimiter'])) {
+      throw new MigrateException('delimiter is empty');
     }
-    else {
+
+    $strict = array_key_exists('strict', $this->configuration) ? $this->configuration['strict'] : TRUE;
+    if ($strict && !is_string($value)) {
       throw new MigrateException(sprintf('%s is not a string', var_export($value, TRUE)));
     }
+    elseif (!$strict) {
+      // Check if the incoming value can cast to a string.
+      $original = $value;
+      if (!is_string($original) && ($original != ($value = @strval($value)))) {
+        throw new MigrateException(sprintf('%s cannot be casted to a string', var_export($original, TRUE)));
+      }
+      // Empty strings should be exploded to empty arrays.
+      if ($value === '') {
+        return [];
+      }
+    }
+
+    $limit = isset($this->configuration['limit']) ? $this->configuration['limit'] : PHP_INT_MAX;
+
+    return explode($this->configuration['delimiter'], $value, $limit);
   }
 
   /**
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Extract.php b/web/core/modules/migrate/src/Plugin/migrate/process/Extract.php
index 1ac88ca5b..544c306c5 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Extract.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Extract.php
@@ -9,9 +9,52 @@ use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 
 /**
- * This plugin extracts a value from an array.
+ * Extracts a value from an array.
  *
- * @link https://www.drupal.org/node/2152731 Online handbook documentation for extract process plugin @endlink
+ * The extract process plugin is used to pull data from an input array, which
+ * may have multiple levels. One use case is extracting data from field arrays
+ * in previous versions of Drupal. For instance, in Drupal 7, a field array
+ * would be indexed first by language, then by delta, then finally a key such as
+ * 'value'.
+ *
+ * Available configuration keys:
+ * - source: The input value - must be an array.
+ * - index: The array of keys to access the value.
+ * - default: (optional) A default value to assign to the destination if the
+ *   key does not exist.
+ *
+ * Examples:
+ *
+ * @code
+ * process:
+ *   new_text_field:
+ *     plugin: extract
+ *     source: some_text_field
+ *     index:
+ *       - und
+ *       - 0
+ *       - value
+ * @endcode
+ *
+ * The PHP equivalent of this would be:
+ * @code
+ * $destination['new_text_field'] = $source['some_text_field']['und'][0]['value'];
+ * @endcode
+ * If a default value is specified, it will be returned if the index does not
+ * exist in the input array.
+ *
+ * @code
+ * plugin: extract
+ * source: some_text_field
+ * default: 'Default title'
+ * index:
+ *   - title
+ * @endcode
+ *
+ * If $source['some_text_field']['title'] doesn't exist, then the plugin will
+ * return "Default title".
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "extract",
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/FileCopy.php b/web/core/modules/migrate/src/Plugin/migrate/process/FileCopy.php
index 9aa59006b..f24131244 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/FileCopy.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/FileCopy.php
@@ -14,7 +14,36 @@ use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Copy a file from one place into another.
+ * Copies or moves a local file from one place into another.
+ *
+ * The file can be moved, reused, or set to be automatically renamed if a
+ * duplicate exists.
+ *
+ * The source value is an array of two values:
+ * - source: The source path or URI, e.g. '/path/to/foo.txt' or
+ *   'public://bar.txt'.
+ * - destination: The destination path or URI, e.g. '/path/to/bar.txt' or
+ *   'public://foo.txt'.
+ *
+ * Available configuration keys:
+ * - move: (optional) Boolean, if TRUE, move the file, otherwise copy the file.
+ *   Defaults to FALSE.
+ * - rename: (optional) Boolean, if TRUE, rename the file by appending a number
+ *   until the name is unique. Defaults to FALSE.
+ * - reuse: (optional) Boolean, if TRUE, reuse the current file in its existing
+ *   location rather than move/copy/rename the file. Defaults to FALSE.
+ *
+ * Examples:
+ *
+ * @code
+ * process:
+ *   path_to_file:
+ *     plugin: file_copy
+ *     source: /path/to/file.png
+ *     destination: /new/path/to/file.png
+ * @endcode
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "file_copy"
@@ -60,11 +89,11 @@ class FileCopy extends ProcessPluginBase implements ContainerFactoryPluginInterf
    *   An instance of the download plugin for handling remote URIs.
    */
   public function __construct(array $configuration, $plugin_id, array $plugin_definition, StreamWrapperManagerInterface $stream_wrappers, FileSystemInterface $file_system, MigrateProcessInterface $download_plugin) {
-    $configuration += array(
+    $configuration += [
       'move' => FALSE,
       'rename' => FALSE,
       'reuse' => FALSE,
-    );
+    ];
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->streamWrapperManager = $stream_wrappers;
     $this->fileSystem = $file_system;
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Flatten.php b/web/core/modules/migrate/src/Plugin/migrate/process/Flatten.php
index f663e4d95..ceb7ea73a 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Flatten.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Flatten.php
@@ -6,13 +6,34 @@ use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
 /**
- * This plugin flattens the current value.
+ * Flattens the source value.
  *
- * During some types of processing (e.g. user permission splitting), what was
- * once a single value gets transformed into multiple values. This plugin will
- * flatten them back down to single values again.
+ * The flatten process plugin converts a nested array into a flat array. For
+ * example [[1, 2, [3, 4]], [5], 6] becomes [1, 2, 3, 4, 5, 6]. During some
+ * types of processing (e.g. user permission splitting), what was once a
+ * one-dimensional array gets transformed into a multidimensional array. This
+ * plugin will flatten them back down to one-dimensional arrays again.
  *
- * @link https://www.drupal.org/node/2154215 Online handbook documentation for flatten process plugin @endlink
+ * Example:
+ *
+ * @code
+ * process:
+ *   tags:
+ *      -
+ *        plugin: default_value
+ *        source: foo
+ *        default_value: [bar, [qux, quux]]
+ *      -
+ *        plugin: flatten
+ * @endcode
+ *
+ * In this example, the default_value process returns [bar, [qux, quux]] (given
+ * a NULL value of foo). At this point, Migrate would try to import two
+ * items: bar and [qux, quux]. The latter is not a valid one and won't be
+ * imported. We need to pass the values through the flatten processor to obtain
+ * a three items array [bar, qux, quux], suitable for import.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "flatten",
@@ -24,7 +45,7 @@ class Flatten extends ProcessPluginBase {
   /**
    * Flatten nested array values to single array values.
    *
-   * For example, array(array(1, 2, array(3, 4))) becomes array(1, 2, 3, 4).
+   * For example, [[1, 2, [3, 4]]] becomes [1, 2, 3, 4].
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     return iterator_to_array(new \RecursiveIteratorIterator(new \RecursiveArrayIterator($value)), FALSE);
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Get.php b/web/core/modules/migrate/src/Plugin/migrate/process/Get.php
index f6b3c34e8..2322edb55 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Get.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Get.php
@@ -7,9 +7,87 @@ use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 
 /**
- * This plugin copies from the source to the destination.
+ * Gets the source value.
  *
- * @link https://www.drupal.org/node/2135307 Online handbook documentation for get process plugin @endlink
+ * Available configuration keys:
+ * - source: Source property.
+ *
+ * The get plugin returns the value of the property given by the "source"
+ * configuration key.
+ *
+ * Examples:
+ *
+ * @code
+ * process:
+ *   bar:
+ *     plugin: get
+ *     source: foo
+ * @endcode
+ *
+ * This copies the source value of foo to the destination property "bar".
+ *
+ * Since get is the default process plugin, it can be shorthanded like this:
+ *
+ * @code
+ * process:
+ *   bar: foo
+ * @endcode
+ *
+ * get also supports a list of source properties.
+ *
+ * Example:
+ *
+ * @code
+ * process:
+ *   bar:
+ *     plugin: get
+ *     source:
+ *       - foo1
+ *       - foo2
+ * @endcode
+ *
+ * This copies the array of source values [foo1, foo2] to the destination
+ * property "bar".
+ *
+ * If the list of source properties contains an empty element then the current
+ * value will be used. This makes it impossible to reach a source property with
+ * an empty string as its name.
+ *
+ * get also supports copying destination values. These are indicated by a
+ * starting @ sign. Values using @ must be wrapped in quotes.
+ *
+ * @code
+ * process:
+ *   foo:
+ *     plugin: machine_name
+ *     source: baz
+ *   bar:
+ *     plugin: get
+ *     source: '@foo'
+ * @endcode
+ *
+ * This will simply copy the destination value of foo to the destination
+ * property bar. foo configuration is included for illustration purposes.
+ *
+ * Because of this, if your source or destination property actually starts with
+ * a @ you need to double those starting characters up. This means that if a
+ * destination property happens to start with a @ and you want to refer it,
+ * you'll need to start with three @ characters -- one to indicate the
+ * destination and two for escaping the real @.
+ *
+ * @code
+ * process:
+ * @foo:
+ *   plugin: machine_name
+ *   source: baz
+ * bar:
+ *   plugin: get
+ *   source: '@@@foo'
+ * @endcode
+ *
+ * This should occur extremely rarely.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "get"
@@ -29,8 +107,8 @@ class Get extends ProcessPluginBase {
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     $source = $this->configuration['source'];
-    $properties = is_string($source) ? array($source) : $source;
-    $return = array();
+    $properties = is_string($source) ? [$source] : $source;
+    $return = [];
     foreach ($properties as $property) {
       if ($property || (string) $property === '0') {
         $is_source = TRUE;
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Iterator.php b/web/core/modules/migrate/src/Plugin/migrate/process/Iterator.php
index 2a41c4a9a..d85abfdb3 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Iterator.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Iterator.php
@@ -51,7 +51,7 @@ class Iterator extends ProcessPluginBase {
    *   The transformed key.
    */
   protected function transformKey($key, MigrateExecutableInterface $migrate_executable, Row $row) {
-    $process = array('key' => $this->configuration['key']);
+    $process = ['key' => $this->configuration['key']];
     $migrate_executable->processRow($row, $process, $key);
     return $row->getDestinationProperty('key');
   }
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/MachineName.php b/web/core/modules/migrate/src/Plugin/migrate/process/MachineName.php
index 15ed35677..5a4b4d506 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/MachineName.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/MachineName.php
@@ -11,13 +11,28 @@ use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * This plugin creates a machine name.
+ * Creates a machine name.
  *
- * The current value gets transliterated, non-alphanumeric characters removed
- * and replaced by an underscore and multiple underscores are collapsed into
- * one.
+ * The machine_name process plugin takes the source value and runs it through
+ * the transliteration service. This makes the source value lowercase,
+ * replaces anything that is not a number or a letter with an underscore,
+ * and removes duplicate underscores.
  *
- * @link https://www.drupal.org/node/2135323 Online handbook documentation for machine_name process plugin @endlink
+ * Letters will have language decorations and accents removed.
+ *
+ * Example:
+ *
+ * @code
+ * process:
+ *   bar:
+ *     plugin: machine_name
+ *     source: foo
+ * @endcode
+ *
+ * If the value of foo in the source is 'áéí!' then the destination value of bar
+ * will be 'aei_'.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "machine_name"
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Migration.php b/web/core/modules/migrate/src/Plugin/migrate/process/Migration.php
index 8520a5ec3..e07505ff5 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Migration.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Migration.php
@@ -75,23 +75,23 @@ class Migration extends ProcessPluginBase implements ContainerFactoryPluginInter
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     $migration_ids = $this->configuration['migration'];
     if (!is_array($migration_ids)) {
-      $migration_ids = array($migration_ids);
+      $migration_ids = [$migration_ids];
     }
     if (!is_array($value)) {
-      $value = array($value);
+      $value = [$value];
     }
     $this->skipOnEmpty($value);
     $self = FALSE;
     /** @var \Drupal\migrate\Plugin\MigrationInterface[] $migrations */
     $destination_ids = NULL;
-    $source_id_values = array();
+    $source_id_values = [];
     $migrations = $this->migrationPluginManager->createInstances($migration_ids);
     foreach ($migrations as $migration_id => $migration) {
       if ($migration_id == $this->migration->id()) {
         $self = TRUE;
       }
       if (isset($this->configuration['source_ids'][$migration_id])) {
-        $configuration = array('source' => $this->configuration['source_ids'][$migration_id]);
+        $configuration = ['source' => $this->configuration['source_ids'][$migration_id]];
         $source_id_values[$migration_id] = $this->processPluginManager
           ->createInstance('get', $configuration, $this->migration)
           ->transform(NULL, $migrate_executable, $row, $destination_property);
@@ -128,7 +128,7 @@ class Migration extends ProcessPluginBase implements ContainerFactoryPluginInter
       // We already have the source ID values but need to key them for the Row
       // constructor.
       $source_ids = $migration->getSourcePlugin()->getIds();
-      $values = array();
+      $values = [];
       foreach (array_keys($source_ids) as $index => $source_id) {
         $values[$source_id] = $source_id_values[$migration->id()][$index];
       }
@@ -137,7 +137,7 @@ class Migration extends ProcessPluginBase implements ContainerFactoryPluginInter
 
       // Do a normal migration with the stub row.
       $migrate_executable->processRow($stub_row, $process);
-      $destination_ids = array();
+      $destination_ids = [];
       try {
         $destination_ids = $destination_plugin->import($stub_row);
       }
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Route.php b/web/core/modules/migrate/src/Plugin/migrate/process/Route.php
index 7ff472048..ebb9a4d6f 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Route.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Route.php
@@ -11,10 +11,47 @@ use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
 /**
+ * Sets the destination route information based on the source link_path.
  *
- * @link https://www.drupal.org/node/2750777 Online handbook documentation for route process plugin @endlink
+ * The source value is an array of two values:
+ * - link_path: The path or URL of the route.
+ * - options: An array of URL options, e.g. query string, attributes, etc.
  *
- * * @MigrateProcessPlugin(
+ * Example:
+ *
+ * @code
+ * process:
+ *   new_route_field:
+ *     plugin: route
+ *     source:
+ *       - 'https://www.drupal.org'
+ *       -
+ *         attributes:
+ *           title: Drupal
+ * @endcode
+ *
+ * This will set new_route_field to be a route with the URL
+ * "https://www.drupal.org" and title attribute "Drupal".
+ *
+ * Example:
+ *
+ * @code
+ * process:
+ *   another_route_field:
+ *     plugin: route
+ *     source:
+ *       - 'user/login'
+ *       -
+ *         query:
+ *           destination: 'node/1'
+ * @endcode
+ *
+ * This will set another_route_field to be a route to the user login page
+ * (user/login) with a query string of "destination=node/1".
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
+ *
+ * @MigrateProcessPlugin(
  *   id = "route"
  * )
  */
@@ -64,12 +101,12 @@ class Route extends ProcessPluginBase implements ContainerFactoryPluginInterface
     }
 
     $extracted = $this->pathValidator->getUrlIfValidWithoutAccessCheck($link_path);
-    $route = array();
+    $route = [];
 
     if ($extracted) {
       if ($extracted->isExternal()) {
         $route['route_name'] = NULL;
-        $route['route_parameters'] = array();
+        $route['route_parameters'] = [];
         $route['options'] = $options;
         $route['url'] = $extracted->getUri();
       }
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/SkipOnEmpty.php b/web/core/modules/migrate/src/Plugin/migrate/process/SkipOnEmpty.php
index 28b6df0d7..45626bed8 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/SkipOnEmpty.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/SkipOnEmpty.php
@@ -9,9 +9,47 @@ use Drupal\migrate\Row;
 use Drupal\migrate\MigrateSkipRowException;
 
 /**
- * If the source evaluates to empty, we skip processing or the whole row.
+ * Skips processing the current row when the input value is empty.
  *
- * @link https://www.drupal.org/node/2228793 Online handbook documentation for skip_on_empty process plugin @endlink
+ * The skip_on_empty process plugin checks to see if the current input value
+ * is empty (empty string, NULL, FALSE, 0, '0', or an empty array). If so, the
+ * further processing of the property or the entire row (depending on the chosen
+ * method) is skipped and will not be migrated.
+ *
+ * Available configuration keys:
+ * - method: (optional) What to do if the input value is empty. Possible values:
+ *   - row: Skips the entire row when an empty value is encountered.
+ *   - process: Prevents further processing of the input property when the value
+ *     is empty.
+ *
+ * Examples:
+ *
+ * @code
+ * process:
+ *   field_type_exists:
+ *     plugin: skip_on_empty
+ *     method: row
+ *     source: field_name
+ * @endcode
+ *
+ * If field_name is empty, skips the entire row.
+ *
+ * @code
+ * process:
+ *   parent:
+ *     -
+ *       plugin: skip_on_empty
+ *       method: process
+ *       source: parent
+ *     -
+ *       plugin: migration
+ *       migration: d6_taxonomy_term
+ * @endcode
+ *
+ * If parent is empty, any further processing of the property is skipped - thus,
+ * the next plugin (migration) will not be run.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "skip_on_empty"
@@ -20,7 +58,24 @@ use Drupal\migrate\MigrateSkipRowException;
 class SkipOnEmpty extends ProcessPluginBase {
 
   /**
-   * {@inheritdoc}
+   * Skips the current row when value is not set.
+   *
+   * @param mixed $value
+   *   The input value.
+   * @param \Drupal\migrate\MigrateExecutableInterface $migrate_executable
+   *   The migration in which this process is being executed.
+   * @param \Drupal\migrate\Row $row
+   *   The row from the source to process.
+   * @param string $destination_property
+   *   The destination property currently worked on. This is only used together
+   *   with the $row above.
+   *
+   * @return mixed
+   *   The input value, $value, if it is not empty.
+   *
+   * @throws \Drupal\migrate\MigrateSkipRowException
+   *   Thrown if the source property is not set and the row should be skipped,
+   *   records with STATUS_IGNORED status in the map.
    */
   public function row($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     if (!$value) {
@@ -30,7 +85,24 @@ class SkipOnEmpty extends ProcessPluginBase {
   }
 
   /**
-   * {@inheritdoc}
+   * Stops processing the current property when value is not set.
+   *
+   * @param mixed $value
+   *   The input value.
+   * @param \Drupal\migrate\MigrateExecutableInterface $migrate_executable
+   *   The migration in which this process is being executed.
+   * @param \Drupal\migrate\Row $row
+   *   The row from the source to process.
+   * @param string $destination_property
+   *   The destination property currently worked on. This is only used together
+   *   with the $row above.
+   *
+   * @return mixed
+   *   The input value, $value, if it is not empty.
+   *
+   * @throws \Drupal\migrate\MigrateSkipProcessException
+   *   Thrown if the source property is not set and rest of the process should
+   *   be skipped.
    */
   public function process($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     if (!$value) {
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/SkipRowIfNotSet.php b/web/core/modules/migrate/src/Plugin/migrate/process/SkipRowIfNotSet.php
index a6cffceb4..ab7552e6c 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/SkipRowIfNotSet.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/SkipRowIfNotSet.php
@@ -8,9 +8,30 @@ use Drupal\migrate\Row;
 use Drupal\migrate\MigrateSkipRowException;
 
 /**
- * If the source evaluates to empty, we skip the current row.
+ * Skips processing the current row when a source value is not set.
  *
- * @link https://www.drupal.org/node/2345935 Online handbook documentation for skip_row_if_not_set process plugin @endlink
+ * The skip_row_if_not_set process plugin checks whether a value is set. If the
+ * value is set, it is returned. Otherwise, a MigrateSkipRowException
+ * is thrown.
+ *
+ * Available configuration keys:
+ * - index: The source property to check for.
+ *
+ * Example:
+ *
+ * @code
+ *  process:
+ *    settings:
+ *      # Check if the "contact" key exists in the "data" array.
+ *      plugin: skip_row_if_not_set
+ *      index: contact
+ *      source: data
+ * @endcode
+ *
+ * This will return $data['contact'] if it exists. Otherwise, the row will be
+ * skipped.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "skip_row_if_not_set",
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/StaticMap.php b/web/core/modules/migrate/src/Plugin/migrate/process/StaticMap.php
index 769da3b7e..d3c93ed59 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/StaticMap.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/StaticMap.php
@@ -31,7 +31,7 @@ class StaticMap extends ProcessPluginBase {
       }
     }
     else {
-      $new_value = array($value);
+      $new_value = [$value];
     }
     $new_value = NestedArray::getValue($this->configuration['map'], $new_value, $key_exists);
     if (!$key_exists) {
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Substr.php b/web/core/modules/migrate/src/Plugin/migrate/process/Substr.php
index 8ebc98c6d..1f852a923 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Substr.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Substr.php
@@ -9,9 +9,44 @@ use Drupal\migrate\MigrateException;
 use Drupal\Component\Utility\Unicode;
 
 /**
- * This plugin returns a substring of the current value.
+ * Returns a substring of the input value.
  *
- * @link https://www.drupal.org/node/2771965 Online handbook documentation for substr process plugin @endlink
+ * The substr process plugin returns the portion of the input value specified by
+ * the start and length parameters. This is a wrapper around the PHP substr()
+ * function.
+ *
+ * Available configuration keys:
+ * - start: (optional) The returned string will start this many characters after
+ *   the beginning of the string. Defaults to NULL.
+ * - length: (optional) The maximum number of characters in the returned
+ *   string. Defaults to NULL.
+ *
+ * If start is NULL and length is an integer, the start position is the
+ * beginning of the string. If start is an integer and length is NULL, the
+ * substring starting from the start position until the end of the string will
+ * be returned. If both start and length are NULL the entire string is returned.
+ *
+ * Example:
+ *
+ * @code
+ * process:
+ *   new_text_field:
+ *     plugin: substr
+ *     source: some_text_field
+ *       start: 6
+ *       length: 10
+ * @endcode
+ *
+ * If some_text_field was 'Marie Skłodowska Curie' then
+ * $destination['new_text_field'] would be 'Skłodowska'.
+ *
+ * The PHP equivalent of this is:
+ *
+ * @code
+ * $destination['new_text_field'] = substr($source['some_text_field'], 6, 10);
+ * @endcode
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "substr"
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/UrlEncode.php b/web/core/modules/migrate/src/Plugin/migrate/process/UrlEncode.php
index b2c0d08e8..4e385602f 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/UrlEncode.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/UrlEncode.php
@@ -9,10 +9,21 @@ use Drupal\migrate\Row;
 use GuzzleHttp\Psr7\Uri;
 
 /**
- * Apply urlencoding to a URI.
+ * URL-encodes the input value.
  *
- * This is needed when the URI is to be opened by a later migration stage, and
- * the source URI value is not already encoded.
+ * Example:
+ *
+ * @code
+ * process:
+ *   new_url:
+ *     plugin: urlencode
+ *     source: 'http://example.com/a url with spaces.html'
+ * @endcode
+ *
+ * This will convert the source URL 'http://example.com/a url with spaces.html'
+ * into 'http://example.com/a%20url%20with%20spaces.html'.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
  *
  * @MigrateProcessPlugin(
  *   id = "urlencode"
@@ -33,7 +44,7 @@ class UrlEncode extends ProcessPluginBase {
         throw new MigrateException("Value '$value' is not a valid URL");
       }
       // Iterate over specific pieces of the URL rawurlencoding each one.
-      $url_parts_to_encode = array('path', 'query', 'fragment');
+      $url_parts_to_encode = ['path', 'query', 'fragment'];
       foreach ($parsed_url as $parsed_url_key => $parsed_url_value) {
         if (in_array($parsed_url_key, $url_parts_to_encode)) {
           // urlencode() would convert spaces to + signs.
diff --git a/web/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php b/web/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php
index 64b3201bb..2391b0a25 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php
@@ -17,16 +17,16 @@ class EmptySource extends SourcePluginBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'id' => t('ID'),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function initializeIterator() {
-    return new \ArrayIterator(array(array('id' => '')));
+    return new \ArrayIterator([['id' => '']]);
   }
 
   /**
diff --git a/web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
index 5ce5fd39a..e35585034 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
@@ -198,8 +198,8 @@ abstract class SourcePluginBase extends PluginBase implements MigrateSourceInter
   public function prepareRow(Row $row) {
     $result = TRUE;
     try {
-      $result_hook = $this->getModuleHandler()->invokeAll('migrate_prepare_row', array($row, $this, $this->migration));
-      $result_named_hook = $this->getModuleHandler()->invokeAll('migrate_' . $this->migration->id() . '_prepare_row', array($row, $this, $this->migration));
+      $result_hook = $this->getModuleHandler()->invokeAll('migrate_prepare_row', [$row, $this, $this->migration]);
+      $result_named_hook = $this->getModuleHandler()->invokeAll('migrate_' . $this->migration->id() . '_prepare_row', [$row, $this, $this->migration]);
       // We will skip if any hook returned FALSE.
       $skip = ($result_hook && in_array(FALSE, $result_hook)) || ($result_named_hook && in_array(FALSE, $result_named_hook));
       $save_to_map = TRUE;
@@ -217,7 +217,7 @@ abstract class SourcePluginBase extends PluginBase implements MigrateSourceInter
       // Make sure we replace any previous messages for this item with any
       // new ones.
       if ($save_to_map) {
-        $this->idMap->saveIdMapping($row, array(), MigrateIdMapInterface::STATUS_IGNORED);
+        $this->idMap->saveIdMapping($row, [], MigrateIdMapInterface::STATUS_IGNORED);
         $this->currentRow = NULL;
         $this->currentSourceIds = NULL;
       }
@@ -256,7 +256,7 @@ abstract class SourcePluginBase extends PluginBase implements MigrateSourceInter
   /**
    * Gets the iterator key.
    *
-   * Implementation of Iterator::key - called when entering a loop iteration,
+   * Implementation of \Iterator::key() - called when entering a loop iteration,
    * returning the key of the current row. It must be a scalar - we will
    * serialize to fulfill the requirement, but using getCurrentIds() is
    * preferable.
@@ -268,7 +268,7 @@ abstract class SourcePluginBase extends PluginBase implements MigrateSourceInter
   /**
    * Checks whether the iterator is currently valid.
    *
-   * Implementation of Iterator::valid() - called at the top of the loop,
+   * Implementation of \Iterator::valid() - called at the top of the loop,
    * returning TRUE to process the loop and FALSE to terminate it.
    */
   public function valid() {
@@ -278,9 +278,9 @@ abstract class SourcePluginBase extends PluginBase implements MigrateSourceInter
   /**
    * Rewinds the iterator.
    *
-   * Implementation of Iterator::rewind() - subclasses of MigrateSource should
-   * implement performRewind() to do any class-specific setup for iterating
-   * source records.
+   * Implementation of \Iterator::rewind() - subclasses of SourcePluginBase
+   * should implement initializeIterator() to do any class-specific setup for
+   * iterating source records.
    */
   public function rewind() {
     $this->getIterator()->rewind();
diff --git a/web/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php b/web/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
index ee434514b..a8c66b2eb 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
@@ -2,13 +2,16 @@
 
 namespace Drupal\migrate\Plugin\migrate\source;
 
+use Drupal\Core\Database\ConnectionNotDefinedException;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\State\StateInterface;
+use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\id_map\Sql;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Plugin\RequirementsInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -20,7 +23,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  * is present, it is used as a database connection information array to define
  * the connection.
  */
-abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPluginInterface {
+abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPluginInterface, RequirementsInterface {
 
   /**
    * The query string.
@@ -127,12 +130,17 @@ abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPlugi
    *
    * @return \Drupal\Core\Database\Connection
    *   The connection to use for this plugin's queries.
+   *
+   * @throws \Drupal\migrate\Exception\RequirementsException
+   *   Thrown if no source database connection is configured.
    */
   protected function setUpDatabase(array $database_info) {
     if (isset($database_info['key'])) {
       $key = $database_info['key'];
     }
     else {
+      // If there is no explicit database configuration at all, fall back to a
+      // connection named 'migrate'.
       $key = 'migrate';
     }
     if (isset($database_info['target'])) {
@@ -144,13 +152,35 @@ abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPlugi
     if (isset($database_info['database'])) {
       Database::addConnectionInfo($key, $target, $database_info['database']);
     }
-    return Database::getConnection($target, $key);
+    try {
+      $connection = Database::getConnection($target, $key);
+    }
+    catch (ConnectionNotDefinedException $e) {
+      // If we fell back to the magic 'migrate' connection and it doesn't exist,
+      // treat the lack of the connection as a RequirementsException.
+      if ($key == 'migrate') {
+        throw new RequirementsException("No database connection configured for source plugin " . $this->pluginId, [], 0, $e);
+      }
+      else {
+        throw $e;
+      }
+    }
+    return $connection;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function checkRequirements() {
+    if ($this->pluginDefinition['requirements_met'] === TRUE) {
+      $this->getDatabase();
+    }
   }
 
   /**
    * Wrapper for database select.
    */
-  protected function select($table, $alias = NULL, array $options = array()) {
+  protected function select($table, $alias = NULL, array $options = []) {
     $options['fetch'] = \PDO::FETCH_ASSOC;
     return $this->getDatabase()->select($table, $alias, $options);
   }
@@ -171,10 +201,7 @@ abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPlugi
   }
 
   /**
-   * Implementation of MigrateSource::performRewind().
-   *
-   * We could simply execute the query and be functionally correct, but
-   * we will take advantage of the PDO-based API to optimize the query up-front.
+   * {@inheritdoc}
    */
   protected function initializeIterator() {
     // Initialize the batch size.
@@ -193,7 +220,7 @@ abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPlugi
       $this->prepareQuery();
 
       // Get the key values, for potential use in joining to the map table.
-      $keys = array();
+      $keys = [];
 
       // The rules for determining what conditions to add to the query are as
       // follows (applying first applicable rule):
@@ -247,6 +274,7 @@ abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPlugi
         $high_water_field = $this->getHighWaterField();
         $conditions->condition($high_water_field, $high_water, '>');
         $this->query->orderBy($high_water_field);
+        $condition_added = TRUE;
       }
       if ($condition_added) {
         $this->query->condition($conditions);
@@ -329,7 +357,7 @@ abstract class SqlBase extends SourcePluginBase implements ContainerFactoryPlugi
       return FALSE;
     }
 
-    foreach (array('username', 'password', 'host', 'port', 'namespace', 'driver') as $key) {
+    foreach (['username', 'password', 'host', 'port', 'namespace', 'driver'] as $key) {
       if (isset($source_database_options[$key])) {
         if ($id_map_database_options[$key] != $source_database_options[$key]) {
           return FALSE;
diff --git a/web/core/modules/migrate/src/Row.php b/web/core/modules/migrate/src/Row.php
index ea70acdf0..2824dd92b 100644
--- a/web/core/modules/migrate/src/Row.php
+++ b/web/core/modules/migrate/src/Row.php
@@ -15,21 +15,21 @@ class Row {
    *
    * @var array
    */
-  protected $source = array();
+  protected $source = [];
 
   /**
    * The source identifiers.
    *
    * @var array
    */
-  protected $sourceIds = array();
+  protected $sourceIds = [];
 
   /**
    * The destination values.
    *
    * @var array
    */
-  protected $destination = array();
+  protected $destination = [];
 
   /**
    * Level separator of destination and source properties.
@@ -41,11 +41,11 @@ class Row {
    *
    * @var array
    */
-  protected $idMap = array(
+  protected $idMap = [
     'original_hash' => '',
     'hash' => '',
     'source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE,
-  );
+  ];
 
   /**
    * Whether the source has been frozen already.
diff --git a/web/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php b/web/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php
index 45420d3d8..415d000b9 100644
--- a/web/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php
+++ b/web/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php
@@ -32,7 +32,7 @@ class DummyDestination extends DestinationBase {
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     return ['value' => $row->getDestinationProperty('value')];
   }
 
diff --git a/web/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php b/web/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php
new file mode 100644
index 000000000..d0bc1554c
--- /dev/null
+++ b/web/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Drupal\Tests\migrate\Kernel;
+
+/**
+ * Tests the high water handling.
+ *
+ * @covers \Drupal\migrate_sql_test\Plugin\migrate\source\HighWaterTest
+ * @group migrate
+ */
+class HighWaterNotJoinableTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['migrate', 'migrate_drupal', 'migrate_sql_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+
+    $tests = [];
+
+    // The source data.
+    $tests[0]['source_data']['high_water_node'] = [
+      [
+        'id' => 1,
+        'title' => 'Item 1',
+        'changed' => 1,
+      ],
+      [
+        'id' => 2,
+        'title' => 'Item 2',
+        'changed' => 2,
+      ],
+      [
+        'id' => 3,
+        'title' => 'Item 3',
+        'changed' => 3,
+      ],
+    ];
+
+    // The expected results.
+    $tests[0]['expected_data'] = [
+      [
+        'id' => 2,
+        'title' => 'Item 2',
+        'changed' => 2,
+      ],
+      [
+        'id' => 3,
+        'title' => 'Item 3',
+        'changed' => 3,
+      ],
+    ];
+
+    $tests[0]['expected_count'] = NULL;
+    $tests[0]['configuration'] = [
+      'high_water_property' => [
+        'name' => 'changed',
+      ],
+    ];
+    $tests[0]['high_water'] = $tests[0]['source_data']['high_water_node'][0]['changed'];
+    return $tests;
+  }
+
+}
diff --git a/web/core/modules/migrate/tests/src/Kernel/HighWaterTest.php b/web/core/modules/migrate/tests/src/Kernel/HighWaterTest.php
index 0b6d36884..952acd82e 100644
--- a/web/core/modules/migrate/tests/src/Kernel/HighWaterTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/HighWaterTest.php
@@ -136,6 +136,64 @@ class HighWaterTest extends MigrateTestBase {
     $this->assertNodeDoesNotExist('Item 3');
   }
 
+  /**
+   * Tests high water property of SqlBase when rows marked for update.
+   */
+  public function testHighWaterUpdate() {
+    // Assert all of the nodes have been imported.
+    $this->assertNodeExists('Item 1');
+    $this->assertNodeExists('Item 2');
+    $this->assertNodeExists('Item 3');
+
+    // Update Item 1 setting its high_water_property to value that is below
+    // current high water mark.
+    $this->sourceDatabase->update('high_water_node')
+      ->fields([
+        'title' => 'Item 1 updated',
+        'changed' => 2,
+      ])
+      ->condition('title', 'Item 1')
+      ->execute();
+
+    // Update Item 2 setting its high_water_property to value equal to
+    // current high water mark.
+    $this->sourceDatabase->update('high_water_node')
+      ->fields([
+        'title' => 'Item 2 updated',
+        'changed' => 3,
+      ])
+      ->condition('title', 'Item 2')
+      ->execute();
+
+    // Update Item 3 setting its high_water_property to value that is above
+    // current high water mark.
+    $this->sourceDatabase->update('high_water_node')
+      ->fields([
+        'title' => 'Item 3 updated',
+        'changed' => 4,
+      ])
+      ->condition('title', 'Item 3')
+      ->execute();
+
+    // Set all rows as needing an update.
+    $id_map = $this->getMigration('high_water_test')->getIdMap();
+    $id_map->prepareUpdate();
+
+    $this->executeMigration('high_water_test');
+
+    // Item with lower highwater should be updated.
+    $this->assertNodeExists('Item 1 updated');
+    $this->assertNodeDoesNotExist('Item 1');
+
+    // Item with equal highwater should be updated.
+    $this->assertNodeExists('Item 2 updated');
+    $this->assertNodeDoesNotExist('Item 2');
+
+    // Item with greater highwater should be updated.
+    $this->assertNodeExists('Item 3 updated');
+    $this->assertNodeDoesNotExist('Item 3');
+  }
+
   /**
    * Assert that node with given title exists.
    *
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateEventsTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateEventsTest.php
index b332cbdbf..4de21fde0 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateEventsTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateEventsTest.php
@@ -40,17 +40,17 @@ class MigrateEventsTest extends KernelTestBase {
     parent::setUp();
     $this->state = \Drupal::state();
     \Drupal::service('event_dispatcher')->addListener(MigrateEvents::MAP_SAVE,
-      array($this, 'mapSaveEventRecorder'));
+      [$this, 'mapSaveEventRecorder']);
     \Drupal::service('event_dispatcher')->addListener(MigrateEvents::MAP_DELETE,
-      array($this, 'mapDeleteEventRecorder'));
+      [$this, 'mapDeleteEventRecorder']);
     \Drupal::service('event_dispatcher')->addListener(MigrateEvents::PRE_IMPORT,
-      array($this, 'preImportEventRecorder'));
+      [$this, 'preImportEventRecorder']);
     \Drupal::service('event_dispatcher')->addListener(MigrateEvents::POST_IMPORT,
-      array($this, 'postImportEventRecorder'));
+      [$this, 'postImportEventRecorder']);
     \Drupal::service('event_dispatcher')->addListener(MigrateEvents::PRE_ROW_SAVE,
-      array($this, 'preRowSaveEventRecorder'));
+      [$this, 'preRowSaveEventRecorder']);
     \Drupal::service('event_dispatcher')->addListener(MigrateEvents::POST_ROW_SAVE,
-      array($this, 'postRowSaveEventRecorder'));
+      [$this, 'postRowSaveEventRecorder']);
   }
 
   /**
@@ -129,11 +129,11 @@ class MigrateEventsTest extends KernelTestBase {
    *   The event name.
    */
   public function mapSaveEventRecorder(MigrateMapSaveEvent $event, $name) {
-    $this->state->set('migrate_events_test.map_save_event', array(
+    $this->state->set('migrate_events_test.map_save_event', [
       'event_name' => $name,
       'map' => $event->getMap(),
       'fields' => $event->getFields(),
-    ));
+    ]);
   }
 
   /**
@@ -145,11 +145,11 @@ class MigrateEventsTest extends KernelTestBase {
    *   The event name.
    */
   public function mapDeleteEventRecorder(MigrateMapDeleteEvent $event, $name) {
-    $this->state->set('migrate_events_test.map_delete_event', array(
+    $this->state->set('migrate_events_test.map_delete_event', [
       'event_name' => $name,
       'map' => $event->getMap(),
       'source_id' => $event->getSourceId(),
-    ));
+    ]);
   }
 
   /**
@@ -161,10 +161,10 @@ class MigrateEventsTest extends KernelTestBase {
    *   The event name.
    */
   public function preImportEventRecorder(MigrateImportEvent $event, $name) {
-    $this->state->set('migrate_events_test.pre_import_event', array(
+    $this->state->set('migrate_events_test.pre_import_event', [
       'event_name' => $name,
       'migration' => $event->getMigration(),
-    ));
+    ]);
   }
 
   /**
@@ -176,10 +176,10 @@ class MigrateEventsTest extends KernelTestBase {
    *   The event name.
    */
   public function postImportEventRecorder(MigrateImportEvent $event, $name) {
-    $this->state->set('migrate_events_test.post_import_event', array(
+    $this->state->set('migrate_events_test.post_import_event', [
       'event_name' => $name,
       'migration' => $event->getMigration(),
-    ));
+    ]);
   }
 
   /**
@@ -191,11 +191,11 @@ class MigrateEventsTest extends KernelTestBase {
    *   The event name.
    */
   public function preRowSaveEventRecorder(MigratePreRowSaveEvent $event, $name) {
-    $this->state->set('migrate_events_test.pre_row_save_event', array(
+    $this->state->set('migrate_events_test.pre_row_save_event', [
       'event_name' => $name,
       'migration' => $event->getMigration(),
       'row' => $event->getRow(),
-    ));
+    ]);
   }
 
   /**
@@ -207,12 +207,12 @@ class MigrateEventsTest extends KernelTestBase {
    *   The event name.
    */
   public function postRowSaveEventRecorder(MigratePostRowSaveEvent $event, $name) {
-    $this->state->set('migrate_events_test.post_row_save_event', array(
+    $this->state->set('migrate_events_test.post_row_save_event', [
       'event_name' => $name,
       'migration' => $event->getMigration(),
       'row' => $event->getRow(),
       'destination_id_values' => $event->getDestinationIdValues(),
-    ));
+    ]);
   }
 
 }
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php
index ce9c01360..d9728f587 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php
@@ -18,11 +18,8 @@ class MigrateExternalTranslatedTest extends MigrateTestBase {
 
   /**
    * {@inheritdoc}
-   *
-   * @todo: Remove migrate_drupal when https://www.drupal.org/node/2560795 is
-   * fixed.
    */
-  public static $modules = ['system', 'user', 'language', 'node', 'field', 'migrate_drupal', 'migrate_external_translated_test'];
+  public static $modules = ['system', 'user', 'language', 'node', 'field', 'migrate_external_translated_test'];
 
   /**
    * {@inheritdoc}
@@ -30,7 +27,7 @@ class MigrateExternalTranslatedTest extends MigrateTestBase {
   public function setUp() {
     parent::setUp();
     $this->installSchema('system', ['sequences']);
-    $this->installSchema('node', array('node_access'));
+    $this->installSchema('node', ['node_access']);
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');
 
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateInterruptionTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateInterruptionTest.php
index 9ff76f6a4..d99329e18 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateInterruptionTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateInterruptionTest.php
@@ -29,7 +29,7 @@ class MigrateInterruptionTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
     \Drupal::service('event_dispatcher')->addListener(MigrateEvents::POST_ROW_SAVE,
-      array($this, 'postRowSaveEventRecorder'));
+      [$this, 'postRowSaveEventRecorder']);
   }
 
   /**
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
index 4f4af7dac..33013367e 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
@@ -89,7 +89,7 @@ class MigrateMessageTest extends KernelTestBase implements MigrateMessageInterfa
   public function testMessagesTeed() {
     // Ask to receive any messages sent to the idmap.
     \Drupal::service('event_dispatcher')->addListener(MigrateEvents::IDMAP_MESSAGE,
-      array($this, 'mapMessageRecorder'));
+      [$this, 'mapMessageRecorder']);
     $executable = new MigrateExecutable($this->migration, $this);
     $executable->import();
     $this->assertIdentical(count($this->messages), 1);
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateRollbackEntityConfigTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateRollbackEntityConfigTest.php
new file mode 100644
index 000000000..76945a745
--- /dev/null
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateRollbackEntityConfigTest.php
@@ -0,0 +1,168 @@
+<?php
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\migrate\MigrateExecutable;
+use Drupal\taxonomy\Entity\Vocabulary;
+
+/**
+ * Tests rolling back of imports.
+ *
+ * @group migrate
+ */
+class MigrateRollbackEntityConfigTest extends MigrateTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['field', 'taxonomy', 'text', 'language', 'config_translation'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('taxonomy_vocabulary');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installConfig(['taxonomy']);
+  }
+
+  /**
+   * Tests rolling back configuration entity translations.
+   */
+  public function testConfigEntityRollback() {
+    // We use vocabularies to demonstrate importing and rolling back
+    // configuration entities with translations. First, import vocabularies.
+    $vocabulary_data_rows = [
+      ['id' => '1', 'name' => 'categories', 'weight' => '2'],
+      ['id' => '2', 'name' => 'tags', 'weight' => '1'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'vocabularies',
+      'migration_tags' => ['Import and rollback test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $vocabulary_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'vid' => 'id',
+        'name' => 'name',
+        'weight' => 'weight',
+      ],
+      'destination' => ['plugin' => 'entity:taxonomy_vocabulary'],
+    ];
+
+    /** @var \Drupal\migrate\Plugin\Migration $vocabulary_migration */
+    $vocabulary_migration = \Drupal::service('plugin.manager.migration')
+      ->createStubMigration($definition);
+    $vocabulary_id_map = $vocabulary_migration->getIdMap();
+
+    $this->assertTrue($vocabulary_migration->getDestinationPlugin()
+      ->supportsRollback());
+
+    // Import and validate vocabulary config entities were created.
+    $vocabulary_executable = new MigrateExecutable($vocabulary_migration, $this);
+    $vocabulary_executable->import();
+    foreach ($vocabulary_data_rows as $row) {
+      /** @var \Drupal\taxonomy\Entity\Vocabulary $vocabulary */
+      $vocabulary = Vocabulary::load($row['id']);
+      $this->assertTrue($vocabulary);
+      $map_row = $vocabulary_id_map->getRowBySource(['id' => $row['id']]);
+      $this->assertNotNull($map_row['destid1']);
+    }
+
+    // Second, import translations of the vocabulary name property.
+    $vocabulary_i18n_data_rows = [
+      [
+        'id' => '1',
+        'name' => '1',
+        'language' => 'fr',
+        'property' => 'name',
+        'translation' => 'fr - categories'
+      ],
+      [
+        'id' => '2',
+        'name' => '2',
+        'language' => 'fr',
+        'property' => 'name',
+        'translation' => 'fr - tags'
+      ],
+    ];
+    $ids = [
+      'id' => ['type' => 'integer'],
+      'language' => ['type' => 'string'],
+    ];
+    $definition = [
+      'id' => 'i18n_vocabularies',
+      'migration_tags' => ['Import and rollback test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $vocabulary_i18n_data_rows,
+        'ids' => $ids,
+        'constants' => [
+          'name' => 'name',
+        ]
+      ],
+      'process' => [
+        'vid' => 'id',
+        'langcode' => 'language',
+        'property' => 'constants/name',
+        'translation' => 'translation',
+      ],
+      'destination' => [
+        'plugin' => 'entity:taxonomy_vocabulary',
+        'translations' => 'true',
+      ],
+    ];
+
+    $vocabulary_i18n__migration = \Drupal::service('plugin.manager.migration')
+      ->createStubMigration($definition);
+    $vocabulary_i18n_id_map = $vocabulary_i18n__migration->getIdMap();
+
+    $this->assertTrue($vocabulary_i18n__migration->getDestinationPlugin()
+      ->supportsRollback());
+
+    // Import and validate vocabulary config entities were created.
+    $vocabulary_i18n_executable = new MigrateExecutable($vocabulary_i18n__migration, $this);
+    $vocabulary_i18n_executable->import();
+
+    $language_manager = \Drupal::service('language_manager');
+    foreach ($vocabulary_i18n_data_rows as $row) {
+      $langcode = $row['language'];
+      $id = 'taxonomy.vocabulary.' . $row['id'];
+      /** @var \Drupal\language\Config\LanguageConfigOverride $config_translation */
+      $config_translation = $language_manager->getLanguageConfigOverride($langcode, $id);
+      $this->assertSame($row['translation'], $config_translation->get('name'));
+      $map_row = $vocabulary_i18n_id_map->getRowBySource(['id' => $row['id'], 'language' => $row['language']]);
+      $this->assertNotNull($map_row['destid1']);
+    }
+
+    // Perform the rollback and confirm the translation was deleted and the map
+    // table row removed.
+    $vocabulary_i18n_executable->rollback();
+    foreach ($vocabulary_i18n_data_rows as $row) {
+      $langcode = $row['language'];
+      $id = 'taxonomy.vocabulary.' . $row['id'];
+      /** @var \Drupal\language\Config\LanguageConfigOverride $config_translation */
+      $config_translation = $language_manager->getLanguageConfigOverride($langcode, $id);
+      $this->assertNull($config_translation->get('name'));
+      $map_row = $vocabulary_i18n_id_map->getRowBySource(['id' => $row['id'], 'language' => $row['language']]);
+      $this->assertFalse($map_row);
+    }
+
+    // Confirm the original vocabulary still exists.
+    foreach ($vocabulary_data_rows as $row) {
+      /** @var \Drupal\taxonomy\Entity\Vocabulary $vocabulary */
+      $vocabulary = Vocabulary::load($row['id']);
+      $this->assertTrue($vocabulary);
+      $map_row = $vocabulary_id_map->getRowBySource(['id' => $row['id']]);
+      $this->assertNotNull($map_row['destid1']);
+    }
+
+  }
+
+}
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateSourceTestBase.php b/web/core/modules/migrate/tests/src/Kernel/MigrateSourceTestBase.php
index e3b2f8c24..8a99cad16 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateSourceTestBase.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateSourceTestBase.php
@@ -135,23 +135,33 @@ abstract class MigrateSourceTestBase extends KernelTestBase {
    *   value (like FALSE or 'nope'), the source plugin will not be counted.
    * @param array $configuration
    *   (optional) Configuration for the source plugin.
+   * @param mixed $high_water
+   *   (optional) The value of the high water field.
    *
    * @dataProvider providerSource
    */
-  public function testSource(array $source_data, array $expected_data, $expected_count = NULL, array $configuration = []) {
+  public function testSource(array $source_data, array $expected_data, $expected_count = NULL, array $configuration = [], $high_water = NULL) {
     $plugin = $this->getPlugin($configuration);
 
     // All source plugins must define IDs.
     $this->assertNotEmpty($plugin->getIds());
 
+    // If there is a high water mark, set it in the high water storage.
+    if (isset($high_water)) {
+      $this->container
+        ->get('keyvalue')
+        ->get('migrate:high_water')
+        ->set($this->migration->reveal()->id(), $high_water);
+    }
+
     if (is_null($expected_count)) {
       $expected_count = count($expected_data);
     }
     // If an expected count was given, assert it only if the plugin is
     // countable.
     if (is_numeric($expected_count)) {
-      $this->assertInstanceOf('\Countable', $plugin);
-      $this->assertCount($expected_count, $plugin);
+      $this->assertInstanceOf('\Iterator', $plugin);
+      $this->assertSame($expected_count, iterator_count($plugin));
     }
 
     $i = 0;
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php b/web/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
index f04183f33..90187c92f 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
@@ -63,12 +63,14 @@ abstract class MigrateSqlSourceTestBase extends MigrateSourceTestBase {
    *   (optional) How many rows the source plugin is expected to return.
    * @param array $configuration
    *   (optional) Configuration for the source plugin.
+   * @param mixed $high_water
+   *   (optional) The value of the high water field.
    *
    * @dataProvider providerSource
    *
    * @requires extension pdo_sqlite
    */
-  public function testSource(array $source_data, array $expected_data, $expected_count = NULL, array $configuration = []) {
+  public function testSource(array $source_data, array $expected_data, $expected_count = NULL, array $configuration = [], $high_water = NULL) {
     $plugin = $this->getPlugin($configuration);
 
     // Since we don't yet inject the database connection, we need to use a
@@ -78,7 +80,7 @@ abstract class MigrateSqlSourceTestBase extends MigrateSourceTestBase {
     $property->setAccessible(TRUE);
     $property->setValue($plugin, $this->getDatabase($source_data));
 
-    parent::testSource($source_data, $expected_data, $expected_count, $configuration);
+    parent::testSource($source_data, $expected_data, $expected_count, $configuration, $high_water);
   }
 
 }
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateStatusTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateStatusTest.php
index b31a67ee8..7dc0b5b9b 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateStatusTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateStatusTest.php
@@ -33,13 +33,13 @@ class MigrateStatusTest extends MigrateTestBase {
     $this->assertIdentical($status, MigrationInterface::STATUS_IDLE);
 
     // Test setting and retrieving all known status values.
-    $status_list = array(
+    $status_list = [
       MigrationInterface::STATUS_IDLE,
       MigrationInterface::STATUS_IMPORTING,
       MigrationInterface::STATUS_ROLLING_BACK,
       MigrationInterface::STATUS_STOPPING,
       MigrationInterface::STATUS_DISABLED,
-    );
+    ];
     foreach ($status_list as $status) {
       $migration->setStatus($status);
       $this->assertIdentical($migration->getStatus(), $status);
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php b/web/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php
index 8494dc6a4..b0fc0b8aa 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php
@@ -47,7 +47,7 @@ abstract class MigrateTestBase extends KernelTestBase implements MigrateMessageI
    */
   protected $sourceDatabase;
 
-  public static $modules = array('migrate');
+  public static $modules = ['migrate'];
 
   /**
    * {@inheritdoc}
@@ -201,7 +201,7 @@ abstract class MigrateTestBase extends KernelTestBase implements MigrateMessageI
    */
   public function startCollectingMessages() {
     $this->collectMessages = TRUE;
-    $this->migrateMessages = array();
+    $this->migrateMessages = [];
   }
 
   /**
diff --git a/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php b/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
index f732d9f94..d532848cc 100644
--- a/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
@@ -4,6 +4,9 @@ namespace Drupal\Tests\migrate\Kernel\Plugin;
 
 use Drupal\Core\Database\Database;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\migrate\source\SqlBase;
+use Drupal\migrate\Plugin\RequirementsInterface;
 
 /**
  * Tests the migration plugin manager.
@@ -79,6 +82,31 @@ class MigrationPluginListTest extends KernelTestBase {
 
     // Enable migrate_drupal to test that the plugins can now be discovered.
     $this->enableModules(['migrate_drupal']);
+
+    // Make sure retrieving these migration plugins in the absence of a database
+    // connection does not throw any errors.
+    $migration_plugins = $this->container->get('plugin.manager.migration')->createInstances([]);
+    // Any database-based source plugins should fail a requirements test in the
+    // absence of a source database connection (e.g., a connection with the
+    // 'migrate' key).
+    $source_plugins = array_map(function ($migration_plugin) { return $migration_plugin->getSourcePlugin(); }, $migration_plugins);
+    foreach ($source_plugins as $id => $source_plugin) {
+      if ($source_plugin instanceof RequirementsInterface) {
+        try {
+          $source_plugin->checkRequirements();
+        }
+        catch (RequirementsException $e) {
+          unset($source_plugins[$id]);
+        }
+      }
+    }
+
+    // Without a connection defined, no database-based plugins should be
+    // returned.
+    foreach ($source_plugins as $id => $source_plugin) {
+      $this->assertNotInstanceOf(SqlBase::class, $source_plugin);
+    }
+
     // Set up a migrate database connection so that plugin discovery works.
     // Clone the current connection and replace the current prefix.
     $connection_info = Database::getConnectionInfo('migrate');
diff --git a/web/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php b/web/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
index a7b0dac10..ef15bd575 100644
--- a/web/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
@@ -30,7 +30,7 @@ class SqlBaseTest extends MigrateTestBase {
 
     $target = 'test_db_target';
     $key = 'test_migrate_connection';
-    $config = array('target' => $target, 'key' => $key);
+    $config = ['target' => $target, 'key' => $key];
     $sql_base->setConfiguration($config);
     Database::addConnectionInfo($key, $target, Database::getConnectionInfo('default')['default']);
 
@@ -44,7 +44,7 @@ class SqlBaseTest extends MigrateTestBase {
     $target = 'test_db_target2';
     $key = 'test_migrate_connection2';
     $database = Database::getConnectionInfo('default')['default'];
-    $config = array('target' => $target, 'key' => $key, 'database' => $database);
+    $config = ['target' => $target, 'key' => $key, 'database' => $database];
     $sql_base->setConfiguration($config);
 
     // Call getDatabase() to get the connection defined.
diff --git a/web/core/modules/migrate/tests/src/Kernel/process/CopyFileTest.php b/web/core/modules/migrate/tests/src/Kernel/process/CopyFileTest.php
deleted file mode 100644
index ecd1bb14d..000000000
--- a/web/core/modules/migrate/tests/src/Kernel/process/CopyFileTest.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-namespace Drupal\Tests\migrate\Kernel\process;
-
-use Drupal\Core\StreamWrapper\StreamWrapperInterface;
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\migrate\MigrateExecutableInterface;
-use Drupal\migrate\Plugin\migrate\process\FileCopy;
-use Drupal\migrate\Row;
-
-/**
- * Tests the copy_file process plugin.
- *
- * @group migrate
- */
-class CopyFileTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['migrate', 'system'];
-
-  /**
-   * The file system service.
-   *
-   * @var \Drupal\Core\File\FileSystemInterface
-   */
-  protected $fileSystem;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->fileSystem = $this->container->get('file_system');
-    $this->container->get('stream_wrapper_manager')->registerWrapper('temporary', 'Drupal\Core\StreamWrapper\TemporaryStream', StreamWrapperInterface::LOCAL_NORMAL);
-  }
-
-  /**
-   * Test successful imports/copies.
-   */
-  public function testSuccessfulCopies() {
-    $file = $this->createUri(NULL, NULL, 'temporary');
-    $file_absolute = $this->fileSystem->realpath($file);
-    $data_sets = [
-      // Test a local to local copy.
-      [
-        $this->root . '/core/modules/simpletest/files/image-test.jpg',
-        'public://file1.jpg'
-      ],
-      // Test a temporary file using an absolute path.
-      [
-        $file_absolute,
-        'temporary://test.jpg'
-      ],
-      // Test a temporary file using a relative path.
-      [
-        $file_absolute,
-        'temporary://core/modules/simpletest/files/test.jpg'
-      ],
-    ];
-    foreach ($data_sets as $data) {
-      list($source_path, $destination_path) = $data;
-      $actual_destination = $this->doImport($source_path, $destination_path);
-      $message = sprintf('File %s exists', $destination_path);
-      $this->assertFileExists($destination_path, $message);
-      // Make sure we didn't accidentally do a move.
-      $this->assertFileExists($source_path, $message);
-      $this->assertSame($actual_destination, $destination_path, 'The import returned the copied filename.');
-    }
-  }
-
-  /**
-   * Test successful file reuse.
-   */
-  public function testSuccessfulReuse() {
-    $source_path = $this->root . '/core/modules/simpletest/files/image-test.jpg';
-    $destination_path = 'public://file1.jpg';
-    $file_reuse = file_unmanaged_copy($source_path, $destination_path);
-    $timestamp = (new \SplFileInfo($file_reuse))->getMTime();
-    $this->assertInternalType('int', $timestamp);
-
-    // We need to make sure the modified timestamp on the file is sooner than
-    // the attempted migration.
-    sleep(1);
-    $configuration = ['reuse' => TRUE];
-    $this->doImport($source_path, $destination_path, $configuration);
-    clearstatcache(TRUE, $destination_path);
-    $modified_timestamp = (new \SplFileInfo($destination_path))->getMTime();
-    $this->assertEquals($timestamp, $modified_timestamp);
-
-    $configuration = ['reuse' => FALSE];
-    $this->doImport($source_path, $destination_path, $configuration);
-    clearstatcache(TRUE, $destination_path);
-    $modified_timestamp = (new \SplFileInfo($destination_path))->getMTime();
-    $this->assertGreaterThan($timestamp, $modified_timestamp);
-  }
-
-  /**
-   * Test successful moves.
-   */
-  public function testSuccessfulMoves() {
-    $file_1 = $this->createUri(NULL, NULL, 'temporary');
-    $file_1_absolute = $this->fileSystem->realpath($file_1);
-    $file_2 = $this->createUri(NULL, NULL, 'temporary');
-    $file_2_absolute = $this->fileSystem->realpath($file_2);
-    $local_file = $this->createUri(NULL, NULL, 'public');
-    $data_sets = [
-      // Test a local to local copy.
-      [
-        $local_file,
-        'public://file1.jpg'
-      ],
-      // Test a temporary file using an absolute path.
-      [
-        $file_1_absolute,
-        'temporary://test.jpg'
-      ],
-      // Test a temporary file using a relative path.
-      [
-        $file_2_absolute,
-        'temporary://core/modules/simpletest/files/test.jpg'
-      ],
-    ];
-    foreach ($data_sets as $data) {
-      list($source_path, $destination_path) = $data;
-      $actual_destination = $this->doImport($source_path, $destination_path, ['move' => TRUE]);
-      $message = sprintf('File %s exists', $destination_path);
-      $this->assertFileExists($destination_path, $message);
-      $message = sprintf('File %s does not exist', $source_path);
-      $this->assertFileNotExists($source_path, $message);
-      $this->assertSame($actual_destination, $destination_path, 'The importer returned the moved filename.');
-    }
-  }
-
-  /**
-   * Test that non-existent files throw an exception.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   *
-   * @expectedExceptionMessage File '/non/existent/file' does not exist
-   */
-  public function testNonExistentSourceFile() {
-    $source = '/non/existent/file';
-    $this->doImport($source, 'public://wontmatter.jpg');
-  }
-
-  /**
-   * Test the 'rename' overwrite mode.
-   */
-  public function testRenameFile() {
-    $source = $this->createUri(NULL, NULL, 'temporary');
-    $destination = $this->createUri('foo.txt', NULL, 'public');
-    $expected_destination = 'public://foo_0.txt';
-    $actual_destination = $this->doImport($source, $destination, ['rename' => TRUE]);
-    $this->assertFileExists($expected_destination, 'File was renamed on import');
-    $this->assertSame($actual_destination, $expected_destination, 'The importer returned the renamed filename.');
-  }
-
-  /**
-   * Do an import using the destination.
-   *
-   * @param string $source_path
-   *   Source path to copy from.
-   * @param string $destination_path
-   *   The destination path to copy to.
-   * @param array $configuration
-   *   Process plugin configuration settings.
-   *
-   * @throws \Drupal\migrate\MigrateException
-   */
-  protected function doImport($source_path, $destination_path, $configuration = []) {
-    $plugin = FileCopy::create($this->container, $configuration, 'file_copy', []);
-    $executable = $this->prophesize(MigrateExecutableInterface::class)->reveal();
-    $row = new Row();
-
-    $result = $plugin->transform([$source_path, $destination_path], $executable, $row, 'foobaz');
-
-    // Return the imported file Uri.
-    return $result;
-  }
-
-  /**
-   * Create a file and return the URI of it.
-   *
-   * @param $filepath
-   *   Optional string specifying the file path. If none is provided then a
-   *   randomly named file will be created in the site's files directory.
-   * @param $contents
-   *   Optional contents to save into the file. If a NULL value is provided an
-   *   arbitrary string will be used.
-   * @param $scheme
-   *   Optional string indicating the stream scheme to use. Drupal core includes
-   *   public, private, and temporary. The public wrapper is the default.
-   * @return
-   *   File URI.
-   */
-  protected function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
-    if (!isset($filepath)) {
-      // Prefix with non-latin characters to ensure that all file-related
-      // tests work with international filenames.
-      $filepath = 'Файл для тестирования ' . $this->randomMachineName();
-    }
-    if (empty($scheme)) {
-      $scheme = file_default_scheme();
-    }
-    $filepath = $scheme . '://' . $filepath;
-
-    if (empty($contents)) {
-      $contents = "file_put_contents() doesn't seem to appreciate empty strings so let's put in some data.";
-    }
-
-    file_put_contents($filepath, $contents);
-    $this->assertFileExists($filepath, t('The test file exists on the disk.'));
-    return $filepath;
-  }
-
-}
diff --git a/web/core/modules/migrate/tests/src/Kernel/process/FileCopyTest.php b/web/core/modules/migrate/tests/src/Kernel/process/FileCopyTest.php
index 451d832c3..644371e5f 100644
--- a/web/core/modules/migrate/tests/src/Kernel/process/FileCopyTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/process/FileCopyTest.php
@@ -74,6 +74,32 @@ class FileCopyTest extends FileTestBase {
     }
   }
 
+  /**
+   * Test successful file reuse.
+   */
+  public function testSuccessfulReuse() {
+    $source_path = $this->root . '/core/modules/simpletest/files/image-test.jpg';
+    $destination_path = 'public://file1.jpg';
+    $file_reuse = file_unmanaged_copy($source_path, $destination_path);
+    $timestamp = (new \SplFileInfo($file_reuse))->getMTime();
+    $this->assertInternalType('int', $timestamp);
+
+    // We need to make sure the modified timestamp on the file is sooner than
+    // the attempted migration.
+    sleep(1);
+    $configuration = ['reuse' => TRUE];
+    $this->doTransform($source_path, $destination_path, $configuration);
+    clearstatcache(TRUE, $destination_path);
+    $modified_timestamp = (new \SplFileInfo($destination_path))->getMTime();
+    $this->assertEquals($timestamp, $modified_timestamp);
+
+    $configuration = ['reuse' => FALSE];
+    $this->doTransform($source_path, $destination_path, $configuration);
+    clearstatcache(TRUE, $destination_path);
+    $modified_timestamp = (new \SplFileInfo($destination_path))->getMTime();
+    $this->assertGreaterThan($timestamp, $modified_timestamp);
+  }
+
   /**
    * Test successful moves.
    */
@@ -113,13 +139,10 @@ class FileCopyTest extends FileTestBase {
 
   /**
    * Test that non-existent files throw an exception.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   *
-   * @expectedExceptionMessage File '/non/existent/file' does not exist
    */
   public function testNonExistentSourceFile() {
     $source = '/non/existent/file';
+    $this->setExpectedException(MigrateException::class, "File '/non/existent/file' does not exist");
     $this->doTransform($source, 'public://wontmatter.jpg');
   }
 
diff --git a/web/core/modules/migrate/tests/src/Kernel/process/RouteTest.php b/web/core/modules/migrate/tests/src/Kernel/process/RouteTest.php
index 3de8d2d6a..3f212356d 100644
--- a/web/core/modules/migrate/tests/src/Kernel/process/RouteTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/process/RouteTest.php
@@ -259,7 +259,7 @@ class RouteTest extends KernelTestBase {
    * @param array|string $value
    *   Source link path information.
    *
-   * @return array $actual
+   * @return array
    *   The route information based on the source link_path.
    */
   protected function doTransform($value) {
diff --git a/web/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php b/web/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php
index 72d37ed73..b3fafc8ec 100644
--- a/web/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/Exception/RequirementsExceptionTest.php
@@ -34,18 +34,18 @@ class RequirementsExceptionTest extends UnitTestCase {
    * Provides a list of requirements to test.
    */
   public function getRequirementsProvider() {
-    return array(
-      array(
+    return [
+      [
         'requirements: random_jackson_pivot.',
         'Single Requirement',
-        array('requirements' => $this->missingRequirements[0]),
-      ),
-      array(
+        ['requirements' => $this->missingRequirements[0]],
+      ],
+      [
         'requirements: random_jackson_pivot. requirements: 51_Eridani_b.',
         'Multiple Requirements',
-        array('requirements' => $this->missingRequirements),
-      ),
-    );
+        ['requirements' => $this->missingRequirements],
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php
index 42d500d81..d14e54a42 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php
@@ -35,9 +35,9 @@ class MigrateExecutableMemoryExceededTest extends MigrateTestCase {
    *
    * @var array
    */
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'test',
-  );
+  ];
 
   /**
    * The php.ini memory_limit value.
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
index 60809a90d..5e7cbaca4 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\migrate\Unit;
 
 use Drupal\Component\Utility\Html;
+use Drupal\migrate\Plugin\MigrateProcessInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\MigrateException;
@@ -40,9 +41,9 @@ class MigrateExecutableTest extends MigrateTestCase {
    *
    * @var array
    */
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'test',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -91,12 +92,12 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $row->expects($this->once())
       ->method('getSourceIdValues')
-      ->will($this->returnValue(array('id' => 'test')));
+      ->will($this->returnValue(['id' => 'test']));
 
     $this->idMap->expects($this->once())
       ->method('lookupDestinationId')
-      ->with(array('id' => 'test'))
-      ->will($this->returnValue(array('test')));
+      ->with(['id' => 'test'])
+      ->will($this->returnValue(['test']));
 
     $source->expects($this->once())
       ->method('current')
@@ -106,13 +107,13 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $destination = $this->getMock('Drupal\migrate\Plugin\MigrateDestinationInterface');
     $destination->expects($this->once())
       ->method('import')
-      ->with($row, array('test'))
-      ->will($this->returnValue(array('id' => 'test')));
+      ->with($row, ['test'])
+      ->will($this->returnValue(['id' => 'test']));
 
     $this->migration
       ->method('getDestinationPlugin')
@@ -133,12 +134,12 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $row->expects($this->once())
       ->method('getSourceIdValues')
-      ->will($this->returnValue(array('id' => 'test')));
+      ->will($this->returnValue(['id' => 'test']));
 
     $this->idMap->expects($this->once())
       ->method('lookupDestinationId')
-      ->with(array('id' => 'test'))
-      ->will($this->returnValue(array('test')));
+      ->with(['id' => 'test'])
+      ->will($this->returnValue(['test']));
 
     $source->expects($this->once())
       ->method('current')
@@ -148,12 +149,12 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $destination = $this->getMock('Drupal\migrate\Plugin\MigrateDestinationInterface');
     $destination->expects($this->once())
       ->method('import')
-      ->with($row, array('test'))
+      ->with($row, ['test'])
       ->will($this->returnValue(TRUE));
 
     $this->migration
@@ -178,7 +179,7 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $row->expects($this->once())
       ->method('getSourceIdValues')
-      ->will($this->returnValue(array('id' => 'test')));
+      ->will($this->returnValue(['id' => 'test']));
 
     $source->expects($this->once())
       ->method('current')
@@ -188,13 +189,13 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $destination = $this->getMock('Drupal\migrate\Plugin\MigrateDestinationInterface');
     $destination->expects($this->once())
       ->method('import')
-      ->with($row, array('test'))
-      ->will($this->returnValue(array()));
+      ->with($row, ['test'])
+      ->will($this->returnValue([]));
 
     $this->migration
       ->method('getDestinationPlugin')
@@ -202,7 +203,7 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $this->idMap->expects($this->once())
       ->method('saveIdMapping')
-      ->with($row, array(), MigrateIdMapInterface::STATUS_FAILED, NULL);
+      ->with($row, [], MigrateIdMapInterface::STATUS_FAILED, NULL);
 
     $this->idMap->expects($this->once())
       ->method('messageCount')
@@ -213,8 +214,8 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $this->idMap->expects($this->once())
       ->method('lookupDestinationId')
-      ->with(array('id' => 'test'))
-      ->will($this->returnValue(array('test')));
+      ->with(['id' => 'test'])
+      ->will($this->returnValue(['test']));
 
     $this->message->expects($this->once())
       ->method('display')
@@ -238,7 +239,7 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $row->expects($this->once())
       ->method('getSourceIdValues')
-      ->will($this->returnValue(array('id' => 'test')));
+      ->will($this->returnValue(['id' => 'test']));
 
     $source->expects($this->once())
       ->method('current')
@@ -248,12 +249,12 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $destination = $this->getMock('Drupal\migrate\Plugin\MigrateDestinationInterface');
     $destination->expects($this->once())
       ->method('import')
-      ->with($row, array('test'))
+      ->with($row, ['test'])
       ->will($this->throwException(new MigrateException($exception_message)));
 
     $this->migration
@@ -262,15 +263,15 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $this->idMap->expects($this->once())
       ->method('saveIdMapping')
-      ->with($row, array(), MigrateIdMapInterface::STATUS_FAILED, NULL);
+      ->with($row, [], MigrateIdMapInterface::STATUS_FAILED, NULL);
 
     $this->idMap->expects($this->once())
       ->method('saveMessage');
 
     $this->idMap->expects($this->once())
       ->method('lookupDestinationId')
-      ->with(array('id' => 'test'))
-      ->will($this->returnValue(array('test')));
+      ->with(['id' => 'test'])
+      ->will($this->returnValue(['test']));
 
     $this->assertSame(MigrationInterface::RESULT_COMPLETED, $this->executable->import());
   }
@@ -290,7 +291,7 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $row->expects($this->once())
       ->method('getSourceIdValues')
-      ->willReturn(array('id' => 'test'));
+      ->willReturn(['id' => 'test']);
 
     $source->expects($this->once())
       ->method('current')
@@ -312,7 +313,7 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $this->idMap->expects($this->once())
       ->method('saveIdMapping')
-      ->with($row, array(), MigrateIdMapInterface::STATUS_FAILED, NULL);
+      ->with($row, [], MigrateIdMapInterface::STATUS_FAILED, NULL);
 
     $this->idMap->expects($this->once())
       ->method('saveMessage');
@@ -336,7 +337,7 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $row->expects($this->once())
       ->method('getSourceIdValues')
-      ->will($this->returnValue(array('id' => 'test')));
+      ->will($this->returnValue(['id' => 'test']));
 
     $source->expects($this->once())
       ->method('current')
@@ -346,12 +347,12 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $destination = $this->getMock('Drupal\migrate\Plugin\MigrateDestinationInterface');
     $destination->expects($this->once())
       ->method('import')
-      ->with($row, array('test'))
+      ->with($row, ['test'])
       ->will($this->throwException(new \Exception($exception_message)));
 
     $this->migration
@@ -360,15 +361,15 @@ class MigrateExecutableTest extends MigrateTestCase {
 
     $this->idMap->expects($this->once())
       ->method('saveIdMapping')
-      ->with($row, array(), MigrateIdMapInterface::STATUS_FAILED, NULL);
+      ->with($row, [], MigrateIdMapInterface::STATUS_FAILED, NULL);
 
     $this->idMap->expects($this->once())
       ->method('saveMessage');
 
     $this->idMap->expects($this->once())
       ->method('lookupDestinationId')
-      ->with(array('id' => 'test'))
-      ->will($this->returnValue(array('test')));
+      ->with(['id' => 'test'])
+      ->will($this->returnValue(['test']));
 
     $this->message->expects($this->once())
       ->method('display')
@@ -381,15 +382,15 @@ class MigrateExecutableTest extends MigrateTestCase {
    * Tests the processRow method.
    */
   public function testProcessRow() {
-    $expected = array(
+    $expected = [
       'test' => 'test destination',
       'test1' => 'test1 destination'
-    );
+    ];
     foreach ($expected as $key => $value) {
       $plugins[$key][0] = $this->getMock('Drupal\migrate\Plugin\MigrateProcessInterface');
       $plugins[$key][0]->expects($this->once())
         ->method('getPluginDefinition')
-        ->will($this->returnValue(array()));
+        ->will($this->returnValue([]));
       $plugins[$key][0]->expects($this->once())
         ->method('transform')
         ->will($this->returnValue($value));
@@ -413,10 +414,29 @@ class MigrateExecutableTest extends MigrateTestCase {
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
       ->with(NULL)
-      ->will($this->returnValue(array('test' => array())));
+      ->will($this->returnValue(['test' => []]));
     $row = new Row();
     $this->executable->processRow($row);
-    $this->assertSame($row->getDestination(), array());
+    $this->assertSame($row->getDestination(), []);
+  }
+
+  /**
+   * Tests the processRow pipeline exception.
+   */
+  public function testProcessRowPipelineException() {
+    $row = new Row();
+    $plugin = $this->prophesize(MigrateProcessInterface::class);
+    $plugin->getPluginDefinition()->willReturn(['handle_multiples' => FALSE]);
+    $plugin->transform(NULL, $this->executable, $row, 'destination_id')
+      ->willReturn('transform_return_string');
+    $plugin->multiple()->willReturn(TRUE);
+    $plugin->getPluginId()->willReturn('plugin_id');
+    $plugin = $plugin->reveal();
+    $plugins['destination_id'] = [$plugin, $plugin];
+    $this->migration->method('getProcessPlugins')->willReturn($plugins);
+
+    $this->setExpectedException(MigrateException::class, 'Pipeline failed at plugin_id plugin for destination destination_id: transform_return_string received instead of an array,');
+    $this->executable->processRow($row);
   }
 
   /**
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
index 4a462e985..7f3d2937d 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
@@ -12,6 +12,7 @@ use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
 use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\migrate\source\SourcePluginBase;
@@ -149,10 +150,10 @@ class MigrateSourceTest extends MigrateTestCase {
 
   /**
    * @covers ::__construct
-   * @expectedException \Drupal\migrate\MigrateException
    */
   public function testHighwaterTrackChangesIncompatible() {
     $source_config = ['track_changes' => TRUE, 'high_water_property' => ['name' => 'something']];
+    $this->setExpectedException(MigrateException::class);
     $this->getSource($source_config);
   }
 
@@ -166,7 +167,7 @@ class MigrateSourceTest extends MigrateTestCase {
     $container = new ContainerBuilder();
     $cache = $this->getMock(CacheBackendInterface::class);
     $cache->expects($this->any())->method('set')
-        ->with($this->isType('string'), $this->isType('int'), $this->isType('int'));
+      ->with($this->isType('string'), $this->isType('int'), $this->isType('int'));
     $container->set('cache.migrate', $cache);
     \Drupal::setContainer($container);
 
@@ -204,7 +205,7 @@ class MigrateSourceTest extends MigrateTestCase {
     $container = new ContainerBuilder();
     $cache = $this->getMock(CacheBackendInterface::class);
     $cache->expects($this->any())->method('set')
-        ->with('test_key', $this->isType('int'), $this->isType('int'));
+      ->with('test_key', $this->isType('int'), $this->isType('int'));
     $container->set('cache.migrate', $cache);
     \Drupal::setContainer($container);
 
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php
index a898a6c8e..3c3cba885 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php
@@ -16,63 +16,70 @@ class MigrateSqlIdMapEnsureTablesTest extends MigrateTestCase {
    *
    * @var array
    */
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'sql_idmap_test',
-  );
+  ];
 
   /**
    * Tests the ensureTables method when the tables do not exist.
    */
   public function testEnsureTablesNotExist() {
-    $fields['source_ids_hash'] = Array(
+    $fields['source_ids_hash'] = [
       'type' => 'varchar',
       'length' => 64,
       'not null' => 1,
       'description' => 'Hash of source ids. Used as primary key'
-    );
-    $fields['sourceid1'] = array(
+    ];
+    $fields['sourceid1'] = [
       'type' => 'int',
       'not null' => TRUE,
-    );
-    $fields['destid1'] = array(
+    ];
+    $fields['sourceid2'] = [
+      'type' => 'int',
+      'not null' => TRUE,
+    ];
+    $fields['destid1'] = [
       'type' => 'varchar',
       'length' => 255,
       'not null' => FALSE,
-    );
-    $fields['source_row_status'] = array(
+    ];
+    $fields['source_row_status'] = [
       'type' => 'int',
       'size' => 'tiny',
       'unsigned' => TRUE,
       'not null' => TRUE,
       'default' => MigrateIdMapInterface::STATUS_IMPORTED,
       'description' => 'Indicates current status of the source row',
-    );
-    $fields['rollback_action'] = array(
+    ];
+    $fields['rollback_action'] = [
       'type' => 'int',
       'size' => 'tiny',
       'unsigned' => TRUE,
       'not null' => TRUE,
       'default' => MigrateIdMapInterface::ROLLBACK_DELETE,
       'description' => 'Flag indicating what to do for this item on rollback',
-    );
-    $fields['last_imported'] = array(
+    ];
+    $fields['last_imported'] = [
       'type' => 'int',
       'unsigned' => TRUE,
       'not null' => TRUE,
       'default' => 0,
       'description' => 'UNIX timestamp of the last time this row was imported',
-    );
-    $fields['hash'] = array(
+    ];
+    $fields['hash'] = [
       'type' => 'varchar',
       'length' => '64',
       'not null' => FALSE,
       'description' => 'Hash of source row data, for detecting changes',
-    );
-    $map_table_schema = array(
+    ];
+    $map_table_schema = [
       'description' => 'Mappings from source identifier value(s) to destination identifier value(s).',
       'fields' => $fields,
-      'primary key' => array('source_ids_hash'),
-    );
+      'primary key' => ['source_ids_hash'],
+      'indexes' => [
+        'source' => ['sourceid1', 'sourceid2'],
+      ],
+    ];
     $schema = $this->getMockBuilder('Drupal\Core\Database\Schema')
       ->disableOriginalConstructor()
       ->getMock();
@@ -84,34 +91,34 @@ class MigrateSqlIdMapEnsureTablesTest extends MigrateTestCase {
       ->method('createTable')
       ->with('migrate_map_sql_idmap_test', $map_table_schema);
     // Now do the message table.
-    $fields = array();
-    $fields['msgid'] = array(
+    $fields = [];
+    $fields['msgid'] = [
       'type' => 'serial',
       'unsigned' => TRUE,
       'not null' => TRUE,
-    );
-    $fields['source_ids_hash'] = Array(
+    ];
+    $fields['source_ids_hash'] = [
       'type' => 'varchar',
       'length' => 64,
       'not null' => 1,
       'description' => 'Hash of source ids. Used as primary key'
-    );
-    $fields['level'] = array(
+    ];
+    $fields['level'] = [
       'type' => 'int',
       'unsigned' => TRUE,
       'not null' => TRUE,
       'default' => 1,
-    );
-    $fields['message'] = array(
+    ];
+    $fields['message'] = [
       'type' => 'text',
       'size' => 'medium',
       'not null' => TRUE,
-    );
-    $table_schema = array(
+    ];
+    $table_schema = [
       'description' => 'Messages generated during a migration process',
       'fields' => $fields,
-      'primary key' => array('msgid'),
-    );
+      'primary key' => ['msgid'],
+    ];
 
     $schema->expects($this->at(2))
       ->method('tableExists')
@@ -140,14 +147,14 @@ class MigrateSqlIdMapEnsureTablesTest extends MigrateTestCase {
       ->method('fieldExists')
       ->with('migrate_map_sql_idmap_test', 'rollback_action')
       ->will($this->returnValue(FALSE));
-    $field_schema = array(
+    $field_schema = [
       'type' => 'int',
       'size' => 'tiny',
       'unsigned' => TRUE,
       'not null' => TRUE,
       'default' => 0,
       'description' => 'Flag indicating what to do for this item on rollback',
-    );
+    ];
     $schema->expects($this->at(2))
       ->method('addField')
       ->with('migrate_map_sql_idmap_test', 'rollback_action', $field_schema);
@@ -155,12 +162,12 @@ class MigrateSqlIdMapEnsureTablesTest extends MigrateTestCase {
       ->method('fieldExists')
       ->with('migrate_map_sql_idmap_test', 'hash')
       ->will($this->returnValue(FALSE));
-    $field_schema = array(
+    $field_schema = [
       'type' => 'varchar',
       'length' => '64',
       'not null' => FALSE,
       'description' => 'Hash of source row data, for detecting changes',
-    );
+    ];
     $schema->expects($this->at(4))
       ->method('addField')
       ->with('migrate_map_sql_idmap_test', 'hash', $field_schema);
@@ -168,12 +175,12 @@ class MigrateSqlIdMapEnsureTablesTest extends MigrateTestCase {
       ->method('fieldExists')
       ->with('migrate_map_sql_idmap_test', 'source_ids_hash')
       ->will($this->returnValue(FALSE));
-    $field_schema = array(
+    $field_schema = [
       'type' => 'varchar',
       'length' => '64',
       'not null' => TRUE,
       'description' => 'Hash of source ids. Used as primary key',
-    );
+    ];
     $schema->expects($this->at(6))
       ->method('addField')
       ->with('migrate_map_sql_idmap_test', 'source_ids_hash', $field_schema);
@@ -201,28 +208,31 @@ class MigrateSqlIdMapEnsureTablesTest extends MigrateTestCase {
     $plugin = $this->getMock('Drupal\migrate\Plugin\MigrateSourceInterface');
     $plugin->expects($this->any())
       ->method('getIds')
-      ->willReturn(array(
-      'source_id_property' => array(
+      ->willReturn([
+      'source_id_property' => [
         'type' => 'integer',
-      ),
-    ));
+      ],
+      'source_id_property_2' => [
+        'type' => 'integer',
+      ],
+    ]);
     $migration->expects($this->any())
       ->method('getSourcePlugin')
       ->willReturn($plugin);
     $plugin = $this->getMock('Drupal\migrate\Plugin\MigrateSourceInterface');
     $plugin->expects($this->any())
       ->method('getIds')
-      ->willReturn(array(
-      'destination_id_property' => array(
+      ->willReturn([
+      'destination_id_property' => [
         'type' => 'string',
-      ),
-    ));
+      ],
+    ]);
     $migration->expects($this->any())
       ->method('getDestinationPlugin')
       ->willReturn($plugin);
     /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher */
     $event_dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
-    $map = new TestSqlIdMap($database, array(), 'sql', array(), $migration, $event_dispatcher);
+    $map = new TestSqlIdMap($database, [], 'sql', [], $migration, $event_dispatcher);
     $map->getDatabase();
   }
 
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
index e38e971be..2ad2b3dc5 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
@@ -130,11 +130,11 @@ class MigrateSqlIdMapTest extends MigrateTestCase {
    *   - hash
    */
   protected function idMapDefaults() {
-    $defaults = array(
+    $defaults = [
       'source_row_status' => MigrateIdMapInterface::STATUS_IMPORTED,
       'rollback_action' => MigrateIdMapInterface::ROLLBACK_DELETE,
       'hash' => '',
-    );
+    ];
     // By default, the PDO SQLite driver strongly prefers to return strings
     // from SELECT queries. Even for columns that don't store strings. Even
     // if the connection's STRINGIFY_FETCHES attribute is FALSE. This can cause
@@ -157,9 +157,9 @@ class MigrateSqlIdMapTest extends MigrateTestCase {
    * - updating work.
    */
   public function testSaveIdMapping() {
-    $source = array(
+    $source = [
       'source_id_property' => 'source_value',
-    );
+    ];
     $row = new Row($source, ['source_id_property' => []]);
     $id_map = $this->getIdMap();
     $id_map->saveIdMapping($row, ['destination_id_property' => 2]);
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php b/web/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
index 962a75dca..5f0d550cf 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
@@ -33,7 +33,7 @@ abstract class MigrateSqlSourceTestCase extends MigrateTestCase {
    *
    * @var array
    */
-  protected $databaseContents = array();
+  protected $databaseContents = [];
 
   /**
    * The plugin class under test.
@@ -60,7 +60,7 @@ abstract class MigrateSqlSourceTestCase extends MigrateTestCase {
    *
    * @var array
    */
-  protected $expectedResults = array();
+  protected $expectedResults = [];
 
   /**
    * Expected count of source rows.
@@ -106,13 +106,16 @@ abstract class MigrateSqlSourceTestCase extends MigrateTestCase {
     \Drupal::setContainer($container);
 
     $migration = $this->getMigration();
-    $migration->expects($this->any())
-      ->method('getHighWater')
-      ->will($this->returnValue(static::ORIGINAL_HIGH_WATER));
+
+    // Set the high water value.
+    \Drupal::keyValue('migrate:high_water')
+      ->expects($this->any())
+      ->method('get')
+      ->willReturn(static::ORIGINAL_HIGH_WATER);
 
     // Setup the plugin.
     $plugin_class = static::PLUGIN_CLASS;
-    $plugin = new $plugin_class($this->migrationConfiguration['source'], $this->migrationConfiguration['source']['plugin'], array(), $migration, $state, $entity_manager);
+    $plugin = new $plugin_class($this->migrationConfiguration['source'], $this->migrationConfiguration['source']['plugin'], [], $migration, $state, $entity_manager);
 
     // Do some reflection to set the database and moduleHandler.
     $plugin_reflection = new \ReflectionClass($plugin);
@@ -122,7 +125,7 @@ abstract class MigrateSqlSourceTestCase extends MigrateTestCase {
     $module_handler_property->setAccessible(TRUE);
 
     // Set the database and the module handler onto our plugin.
-    $database_property->setValue($plugin, $this->getDatabase($this->databaseContents + array('test_map' => array())));
+    $database_property->setValue($plugin, $this->getDatabase($this->databaseContents + ['test_map' => []]));
     $module_handler_property->setValue($plugin, $module_handler);
 
     $plugin->setStringTranslation($this->getStringTranslationStub());
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrationTest.php b/web/core/modules/migrate/tests/src/Unit/MigrationTest.php
index 57ff64c9f..649104b39 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrationTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrationTest.php
@@ -27,9 +27,6 @@ class MigrationTest extends UnitTestCase {
    * Tests checking requirements for source plugins.
    *
    * @covers ::checkRequirements
-   *
-   * @expectedException \Drupal\migrate\Exception\RequirementsException
-   * @expectedExceptionMessage Missing source requirement
    */
   public function testRequirementsForSourcePlugin() {
     $migration = new TestMigration();
@@ -43,6 +40,7 @@ class MigrationTest extends UnitTestCase {
     $migration->setSourcePlugin($source_plugin);
     $migration->setDestinationPlugin($destination_plugin);
 
+    $this->setExpectedException(RequirementsException::class, 'Missing source requirement');
     $migration->checkRequirements();
   }
 
@@ -50,9 +48,6 @@ class MigrationTest extends UnitTestCase {
    * Tests checking requirements for destination plugins.
    *
    * @covers ::checkRequirements
-   *
-   * @expectedException \Drupal\migrate\Exception\RequirementsException
-   * @expectedExceptionMessage Missing destination requirement
    */
   public function testRequirementsForDestinationPlugin() {
     $migration = new TestMigration();
@@ -66,6 +61,7 @@ class MigrationTest extends UnitTestCase {
     $migration->setSourcePlugin($source_plugin);
     $migration->setDestinationPlugin($destination_plugin);
 
+    $this->setExpectedException(RequirementsException::class, 'Missing destination requirement');
     $migration->checkRequirements();
   }
 
@@ -73,9 +69,6 @@ class MigrationTest extends UnitTestCase {
    * Tests checking requirements for destination plugins.
    *
    * @covers ::checkRequirements
-   *
-   * @expectedException \Drupal\migrate\Exception\RequirementsException
-   * @expectedExceptionMessage Missing migrations test_a, test_c
    */
   public function testRequirementsForMigrations() {
     $migration = new TestMigration();
@@ -112,6 +105,7 @@ class MigrationTest extends UnitTestCase {
       ->with(['test_a', 'test_b', 'test_c', 'test_d'])
       ->willReturn(['test_b' => $migration_b, 'test_c' => $migration_c, 'test_d' => $migration_d]);
 
+    $this->setExpectedException(RequirementsException::class, 'Missing migrations test_a, test_c');
     $migration->checkRequirements();
   }
 
diff --git a/web/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php b/web/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
index e5d63c476..e6bb37b05 100644
--- a/web/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
@@ -13,6 +13,7 @@ use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
@@ -84,8 +85,6 @@ class EntityContentBaseTest extends UnitTestCase {
    * Test row skipping when we can't get an entity to save.
    *
    * @covers ::import
-   * @expectedException \Drupal\migrate\MigrateException
-   * @expectedExceptionMessage Unable to get entity
    */
   public function testImportEntityLoadFailure() {
     $bundles = [];
@@ -96,14 +95,12 @@ class EntityContentBaseTest extends UnitTestCase {
       $this->entityManager->reveal(),
       $this->prophesize(FieldTypePluginManagerInterface::class)->reveal());
     $destination->setEntity(FALSE);
+    $this->setExpectedException(MigrateException::class, 'Unable to get entity');
     $destination->import(new Row());
   }
 
   /**
    * Test that translation destination fails for untranslatable entities.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   * @expectedExceptionMessage This entity type does not support translation
    */
   public function testUntranslatable() {
     // An entity type without a language.
@@ -125,6 +122,7 @@ class EntityContentBaseTest extends UnitTestCase {
       $this->entityManager->reveal(),
       $this->prophesize(FieldTypePluginManagerInterface::class)->reveal()
     );
+    $this->setExpectedException(MigrateException::class, 'This entity type does not support translation');
     $destination->getIds();
   }
 
diff --git a/web/core/modules/migrate/tests/src/Unit/RowTest.php b/web/core/modules/migrate/tests/src/Unit/RowTest.php
index ec04f826b..10d7d7d66 100644
--- a/web/core/modules/migrate/tests/src/Unit/RowTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/RowTest.php
@@ -17,19 +17,19 @@ class RowTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $testSourceIds = array(
+  protected $testSourceIds = [
     'nid' => 'Node ID',
-  );
+  ];
 
   /**
    * The test values.
    *
    * @var array
    */
-  protected $testValues = array(
+  protected $testValues = [
     'nid' => 1,
     'title' => 'node 1',
-  );
+  ];
 
   /**
    * The test hash.
@@ -50,7 +50,7 @@ class RowTest extends UnitTestCase {
    */
   public function testRowWithoutData() {
     $row = new Row();
-    $this->assertSame(array(), $row->getSource(), 'Empty row');
+    $this->assertSame([], $row->getSource(), 'Empty row');
   }
 
   /**
@@ -65,28 +65,25 @@ class RowTest extends UnitTestCase {
    * Tests object creation: multiple source IDs.
    */
   public function testRowWithMultipleSourceIds() {
-    $multi_source_ids = $this->testSourceIds + array('vid' => 'Node revision');
-    $multi_source_ids_values = $this->testValues + array('vid' => 1);
+    $multi_source_ids = $this->testSourceIds + ['vid' => 'Node revision'];
+    $multi_source_ids_values = $this->testValues + ['vid' => 1];
     $row = new Row($multi_source_ids_values, $multi_source_ids);
     $this->assertSame($multi_source_ids_values, $row->getSource(), 'Row with data, multifield id.');
   }
 
   /**
    * Tests object creation: invalid values.
-   *
-   * @expectedException \Exception
    */
   public function testRowWithInvalidData() {
-    $invalid_values = array(
+    $invalid_values = [
       'title' => 'node X',
-    );
+    ];
+    $this->setExpectedException(\Exception::class);
     $row = new Row($invalid_values, $this->testSourceIds);
   }
 
   /**
    * Tests source immutability after freeze.
-   *
-   * @expectedException \Exception
    */
   public function testSourceFreeze() {
     $row = new Row($this->testValues, $this->testSourceIds);
@@ -96,18 +93,17 @@ class RowTest extends UnitTestCase {
     $row->rehash();
     $this->assertSame($this->testHashMod, $row->getHash(), 'Hash changed correctly.');
     $row->freezeSource();
+    $this->setExpectedException(\Exception::class);
     $row->setSourceProperty('title', 'new title');
   }
 
   /**
    * Tests setting on a frozen row.
-   *
-   * @expectedException \Exception
-   * @expectedExceptionMessage The source is frozen and can't be changed any more
    */
   public function testSetFrozenRow() {
     $row = new Row($this->testValues, $this->testSourceIds);
     $row->freezeSource();
+    $this->setExpectedException(\Exception::class, "The source is frozen and can't be changed any more");
     $row->setSourceProperty('title', 'new title');
   }
 
@@ -123,11 +119,11 @@ class RowTest extends UnitTestCase {
     $this->assertSame($this->testHash, $row->getHash(), 'Correct hash even doing it twice.');
 
     // Set the map to needs update.
-    $test_id_map = array(
+    $test_id_map = [
       'original_hash' => '',
       'hash' => '',
       'source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE,
-    );
+    ];
     $row->setIdMap($test_id_map);
     $this->assertTrue($row->needsUpdate());
 
@@ -143,30 +139,30 @@ class RowTest extends UnitTestCase {
     $this->assertSame(64, strlen($row->getHash()));
 
     // Set the map to successfully imported.
-    $test_id_map = array(
+    $test_id_map = [
       'original_hash' => '',
       'hash' => '',
       'source_row_status' => MigrateIdMapInterface::STATUS_IMPORTED,
-    );
+    ];
     $row->setIdMap($test_id_map);
     $this->assertFalse($row->needsUpdate());
 
     // Set the same hash value and ensure it was not changed.
     $random = $this->randomMachineName();
-    $test_id_map = array(
+    $test_id_map = [
       'original_hash' => $random,
       'hash' => $random,
       'source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE,
-    );
+    ];
     $row->setIdMap($test_id_map);
     $this->assertFalse($row->changed());
 
     // Set different has values to ensure it is marked as changed.
-    $test_id_map = array(
+    $test_id_map = [
       'original_hash' => $this->randomMachineName(),
       'hash' => $this->randomMachineName(),
       'source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE,
-    );
+    ];
     $row->setIdMap($test_id_map);
     $this->assertTrue($row->changed());
   }
@@ -179,11 +175,11 @@ class RowTest extends UnitTestCase {
    */
   public function testGetSetIdMap() {
     $row = new Row($this->testValues, $this->testSourceIds);
-    $test_id_map = array(
+    $test_id_map = [
       'original_hash' => '',
       'hash' => '',
       'source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE,
-    );
+    ];
     $row->setIdMap($test_id_map);
     $this->assertEquals($test_id_map, $row->getIdMap());
   }
@@ -193,7 +189,7 @@ class RowTest extends UnitTestCase {
    */
   public function testSourceIdValues() {
     $row = new Row($this->testValues, $this->testSourceIds);
-    $this->assertSame(array('nid' => $this->testValues['nid']), $row->getSourceIdValues());
+    $this->assertSame(['nid' => $this->testValues['nid']], $row->getSourceIdValues());
   }
 
   /**
@@ -219,7 +215,7 @@ class RowTest extends UnitTestCase {
     // Set a destination.
     $row->setDestinationProperty('nid', 2);
     $this->assertTrue($row->hasDestinationProperty('nid'));
-    $this->assertEquals(array('nid' => 2), $row->getDestination());
+    $this->assertEquals(['nid' => 2], $row->getDestination());
   }
 
   /**
diff --git a/web/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php b/web/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
index b64ca9b1c..6d3333848 100644
--- a/web/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
+++ b/web/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
@@ -55,21 +55,21 @@ class TestSqlIdMap extends Sql implements \Iterator {
    */
   protected function getFieldSchema(array $id_definition) {
     if (!isset($id_definition['type'])) {
-      return array();
+      return [];
     }
     switch ($id_definition['type']) {
       case 'integer':
-        return array(
+        return [
           'type' => 'int',
           'not null' => TRUE,
-        );
+        ];
 
       case 'string':
-        return array(
+        return [
           'type' => 'varchar',
           'length' => 255,
           'not null' => FALSE,
-        );
+        ];
 
       default:
         throw new MigrateException($id_definition['type'] . ' not supported');
diff --git a/web/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php b/web/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
index 25eeebb18..b57cffea4 100644
--- a/web/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
@@ -16,9 +16,9 @@ class ConfigTest extends UnitTestCase {
    * Test the import method.
    */
   public function testImport() {
-    $source = array(
+    $source = [
       'test' => 'x',
-    );
+    ];
     $migration = $this->getMockBuilder('Drupal\migrate\Plugin\Migration')
       ->disableOriginalConstructor()
       ->getMock();
@@ -54,7 +54,7 @@ class ConfigTest extends UnitTestCase {
       ->method('getLanguageConfigOverride')
       ->with('fr', 'd8_config')
       ->will($this->returnValue($config));
-    $destination = new Config(array('config_name' => 'd8_config'), 'd8_config', array('pluginId' => 'd8_config'), $migration, $config_factory, $language_manager);
+    $destination = new Config(['config_name' => 'd8_config'], 'd8_config', ['pluginId' => 'd8_config'], $migration, $config_factory, $language_manager);
     $destination_id = $destination->import($row);
     $this->assertEquals($destination_id, ['d8_config']);
   }
@@ -63,9 +63,9 @@ class ConfigTest extends UnitTestCase {
    * Test the import method.
    */
   public function testLanguageImport() {
-    $source = array(
+    $source = [
       'langcode' => 'mi',
-    );
+    ];
     $migration = $this->getMockBuilder(MigrationInterface::class)
       ->disableOriginalConstructor()
       ->getMock();
@@ -104,7 +104,7 @@ class ConfigTest extends UnitTestCase {
       ->method('getLanguageConfigOverride')
       ->with('mi', 'd8_config')
       ->will($this->returnValue($config));
-    $destination = new Config(array('config_name' => 'd8_config', 'translations' => 'true'), 'd8_config', array('pluginId' => 'd8_config'), $migration, $config_factory, $language_manager);
+    $destination = new Config(['config_name' => 'd8_config', 'translations' => 'true'], 'd8_config', ['pluginId' => 'd8_config'], $migration, $config_factory, $language_manager);
     $destination_id = $destination->import($row);
     $this->assertEquals($destination_id, ['d8_config', 'mi']);
   }
diff --git a/web/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php b/web/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
index 1886914b5..f68c2bea1 100644
--- a/web/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
@@ -212,7 +212,7 @@ class EntityRevision extends RealEntityRevision {
   /**
    * Allow public access for testing.
    */
-  public function save(ContentEntityInterface $entity, array $old_destination_id_values = array()) {
+  public function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
     return parent::save($entity, $old_destination_id_values);
   }
 
diff --git a/web/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php b/web/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php
index 4782dc0f4..6deaec882 100644
--- a/web/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityDisplayTest.php
@@ -22,13 +22,13 @@ class PerComponentEntityDisplayTest extends MigrateTestCase {
    * Tests the entity display import method.
    */
   public function testImport() {
-    $values = array(
+    $values = [
       'entity_type' => 'entity_type_test',
       'bundle' => 'bundle_test',
       'view_mode' => 'view_mode_test',
       'field_name' => 'field_name_test',
-      'options' => array('test setting'),
-    );
+      'options' => ['test setting'],
+    ];
     $row = new Row();
     foreach ($values as $key => $value) {
       $row->setDestinationProperty($key, $value);
@@ -38,14 +38,14 @@ class PerComponentEntityDisplayTest extends MigrateTestCase {
       ->getMock();
     $entity->expects($this->once())
       ->method('setComponent')
-      ->with('field_name_test', array('test setting'))
+      ->with('field_name_test', ['test setting'])
       ->will($this->returnSelf());
     $entity->expects($this->once())
       ->method('save')
       ->with();
     $plugin = new TestPerComponentEntityDisplay($entity);
-    $this->assertSame($plugin->import($row), array('entity_type_test', 'bundle_test', 'view_mode_test', 'field_name_test'));
-    $this->assertSame($plugin->getTestValues(), array('entity_type_test', 'bundle_test', 'view_mode_test'));
+    $this->assertSame($plugin->import($row), ['entity_type_test', 'bundle_test', 'view_mode_test', 'field_name_test']);
+    $this->assertSame($plugin->getTestValues(), ['entity_type_test', 'bundle_test', 'view_mode_test']);
   }
 
 }
diff --git a/web/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php b/web/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php
index 50cdbf6dc..0424cebf0 100644
--- a/web/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/destination/PerComponentEntityFormDisplayTest.php
@@ -22,13 +22,13 @@ class PerComponentEntityFormDisplayTest extends MigrateTestCase {
    * Tests the entity display import method.
    */
   public function testImport() {
-    $values = array(
+    $values = [
       'entity_type' => 'entity_type_test',
       'bundle' => 'bundle_test',
       'form_mode' => 'form_mode_test',
       'field_name' => 'field_name_test',
-      'options' => array('test setting'),
-    );
+      'options' => ['test setting'],
+    ];
     $row = new Row();
     foreach ($values as $key => $value) {
       $row->setDestinationProperty($key, $value);
@@ -38,14 +38,14 @@ class PerComponentEntityFormDisplayTest extends MigrateTestCase {
       ->getMock();
     $entity->expects($this->once())
       ->method('setComponent')
-      ->with('field_name_test', array('test setting'))
+      ->with('field_name_test', ['test setting'])
       ->will($this->returnSelf());
     $entity->expects($this->once())
       ->method('save')
       ->with();
     $plugin = new TestPerComponentEntityFormDisplay($entity);
-    $this->assertSame($plugin->import($row), array('entity_type_test', 'bundle_test', 'form_mode_test', 'field_name_test'));
-    $this->assertSame($plugin->getTestValues(), array('entity_type_test', 'bundle_test', 'form_mode_test'));
+    $this->assertSame($plugin->import($row), ['entity_type_test', 'bundle_test', 'form_mode_test', 'field_name_test']);
+    $this->assertSame($plugin->getTestValues(), ['entity_type_test', 'bundle_test', 'form_mode_test']);
   }
 
 }
diff --git a/web/core/modules/migrate/tests/src/Unit/process/CallbackTest.php b/web/core/modules/migrate/tests/src/Unit/process/CallbackTest.php
index 92d1f7c34..e3b8f2770 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/CallbackTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/CallbackTest.php
@@ -37,7 +37,7 @@ class CallbackTest extends MigrateProcessTestCase {
    * Test callback with a class method as callable.
    */
   public function testCallbackWithClassMethod() {
-    $this->plugin->setCallable(array('\Drupal\Component\Utility\Unicode', 'strtolower'));
+    $this->plugin->setCallable(['\Drupal\Component\Utility\Unicode', 'strtolower']);
     $value = $this->plugin->transform('FooBar', $this->migrateExecutable, $this->row, 'destinationproperty');
     $this->assertSame($value, 'foobar');
   }
diff --git a/web/core/modules/migrate/tests/src/Unit/process/ConcatTest.php b/web/core/modules/migrate/tests/src/Unit/process/ConcatTest.php
index 1d0d4c377..ea93e4643 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/ConcatTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/ConcatTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Tests\migrate\Unit\process;
 
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\migrate\process\Concat;
 
 /**
@@ -28,16 +29,15 @@ class ConcatTest extends MigrateProcessTestCase {
    * Test concat works without a delimiter.
    */
   public function testConcatWithoutDelimiter() {
-    $value = $this->plugin->transform(array('foo', 'bar'), $this->migrateExecutable, $this->row, 'destinationproperty');
+    $value = $this->plugin->transform(['foo', 'bar'], $this->migrateExecutable, $this->row, 'destinationproperty');
     $this->assertSame($value, 'foobar');
   }
 
   /**
    * Test concat fails properly on non-arrays.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
    */
   public function testConcatWithNonArray() {
+    $this->setExpectedException(MigrateException::class);
     $this->plugin->transform('foo', $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
@@ -46,7 +46,7 @@ class ConcatTest extends MigrateProcessTestCase {
    */
   public function testConcatWithDelimiter() {
     $this->plugin->setDelimiter('_');
-    $value = $this->plugin->transform(array('foo', 'bar'), $this->migrateExecutable, $this->row, 'destinationproperty');
+    $value = $this->plugin->transform(['foo', 'bar'], $this->migrateExecutable, $this->row, 'destinationproperty');
     $this->assertSame($value, 'foo_bar');
   }
 
diff --git a/web/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php b/web/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php
index 4fe8db3bc..8f412fd05 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/DedupeEntityTest.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\migrate\Unit\process;
 
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\migrate\Plugin\migrate\process\DedupeEntity;
 use Drupal\Component\Utility\Unicode;
@@ -21,20 +23,20 @@ class DedupeEntityTest extends MigrateProcessTestCase {
   protected $entityQuery;
 
   /**
-   * The mock entity query factory.
+   * The mocked entity type manager.
    *
-   * @var \Drupal\Core\Entity\Query\QueryFactory|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface|\PHPUnit_Framework_MockObject_MockObject
    */
-  protected $entityQueryFactory;
+  protected $entityTypeManager;
 
   /**
    * The migration configuration, initialized to set the ID to test.
    *
    * @var array
    */
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'test',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -43,12 +45,16 @@ class DedupeEntityTest extends MigrateProcessTestCase {
     $this->entityQuery = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryInterface')
       ->disableOriginalConstructor()
       ->getMock();
-    $this->entityQueryFactory = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryFactory')
-      ->disableOriginalConstructor()
-      ->getMock();
-    $this->entityQueryFactory->expects($this->any())
-      ->method('get')
-      ->will($this->returnValue($this->entityQuery));
+    $this->entityTypeManager = $this->getMock(EntityTypeManagerInterface::class);
+
+    $storage = $this->getMock(EntityStorageInterface::class);
+    $storage->expects($this->any())
+      ->method('getQuery')
+      ->willReturn($this->entityQuery);
+    $this->entityTypeManager->expects($this->any())
+      ->method('getStorage')
+      ->with('test_entity_type')
+      ->willReturn($storage);
     parent::setUp();
   }
 
@@ -58,16 +64,16 @@ class DedupeEntityTest extends MigrateProcessTestCase {
    * @dataProvider providerTestDedupe
    */
   public function testDedupe($count, $postfix = '', $start = NULL, $length = NULL) {
-    $configuration = array(
+    $configuration = [
       'entity_type' => 'test_entity_type',
       'field' => 'test_field',
-    );
+    ];
     if ($postfix) {
       $configuration['postfix'] = $postfix;
     }
     $configuration['start'] = isset($start) ? $start : NULL;
     $configuration['length'] = isset($length) ? $length : NULL;
-    $plugin = new DedupeEntity($configuration, 'dedupe_entity', array(), $this->getMigration(), $this->entityQueryFactory);
+    $plugin = new DedupeEntity($configuration, 'dedupe_entity', [], $this->getMigration(), $this->entityTypeManager);
     $this->entityQueryExpects($count);
     $value = $this->randomMachineName(32);
     $actual = $plugin->transform($value, $this->migrateExecutable, $this->row, 'testproperty');
@@ -80,12 +86,12 @@ class DedupeEntityTest extends MigrateProcessTestCase {
    * Tests that invalid start position throws an exception.
    */
   public function testDedupeEntityInvalidStart() {
-    $configuration = array(
+    $configuration = [
       'entity_type' => 'test_entity_type',
       'field' => 'test_field',
       'start' => 'foobar',
-    );
-    $plugin = new DedupeEntity($configuration, 'dedupe_entity', array(), $this->getMigration(), $this->entityQueryFactory);
+    ];
+    $plugin = new DedupeEntity($configuration, 'dedupe_entity', [], $this->getMigration(), $this->entityTypeManager);
     $this->setExpectedException('Drupal\migrate\MigrateException', 'The start position configuration key should be an integer. Omit this key to capture from the beginning of the string.');
     $plugin->transform('test_start', $this->migrateExecutable, $this->row, 'testproperty');
   }
@@ -94,12 +100,12 @@ class DedupeEntityTest extends MigrateProcessTestCase {
    * Tests that invalid length option throws an exception.
    */
   public function testDedupeEntityInvalidLength() {
-    $configuration = array(
+    $configuration = [
       'entity_type' => 'test_entity_type',
       'field' => 'test_field',
       'length' => 'foobar',
-    );
-    $plugin = new DedupeEntity($configuration, 'dedupe_entity', array(), $this->getMigration(), $this->entityQueryFactory);
+    ];
+    $plugin = new DedupeEntity($configuration, 'dedupe_entity', [], $this->getMigration(), $this->entityTypeManager);
     $this->setExpectedException('Drupal\migrate\MigrateException', 'The character length configuration key should be an integer. Omit this key to capture the entire string.');
     $plugin->transform('test_length', $this->migrateExecutable, $this->row, 'testproperty');
   }
@@ -108,40 +114,40 @@ class DedupeEntityTest extends MigrateProcessTestCase {
    * Data provider for testDedupe().
    */
   public function providerTestDedupe() {
-    return array(
+    return [
       // Tests no duplication.
-      array(0),
+      [0],
       // Tests no duplication and start position.
-      array(0, NULL, 10),
+      [0, NULL, 10],
       // Tests no duplication, start position, and length.
-      array(0, NULL, 5, 10),
+      [0, NULL, 5, 10],
       // Tests no duplication and length.
-      array(0, NULL, NULL, 10),
+      [0, NULL, NULL, 10],
       // Tests duplication.
-      array(3),
+      [3],
       // Tests duplication and start position.
-      array(3, NULL, 10),
+      [3, NULL, 10],
       // Tests duplication, start position, and length.
-      array(3, NULL, 5, 10),
+      [3, NULL, 5, 10],
       // Tests duplication and length.
-      array(3, NULL, NULL, 10),
+      [3, NULL, NULL, 10],
       // Tests no duplication and postfix.
-      array(0, '_'),
+      [0, '_'],
       // Tests no duplication, postfix, and start position.
-      array(0, '_', 5),
+      [0, '_', 5],
       // Tests no duplication, postfix, start position, and length.
-      array(0, '_', 5, 10),
+      [0, '_', 5, 10],
       // Tests no duplication, postfix, and length.
-      array(0, '_', NULL, 10),
+      [0, '_', NULL, 10],
       // Tests duplication and postfix.
-      array(2, '_'),
+      [2, '_'],
       // Tests duplication, postfix, and start position.
-      array(2, '_', 5),
+      [2, '_', 5],
       // Tests duplication, postfix, start position, and length.
-      array(2, '_', 5, 10),
+      [2, '_', 5, 10],
       // Tests duplication, postfix, and length.
-      array(2, '_', NULL, 10),
-    );
+      [2, '_', NULL, 10],
+    ];
   }
 
   /**
@@ -166,12 +172,12 @@ class DedupeEntityTest extends MigrateProcessTestCase {
    * Test deduplicating only migrated entities.
    */
   public function testDedupeMigrated() {
-    $configuration = array(
+    $configuration = [
       'entity_type' => 'test_entity_type',
       'field' => 'test_field',
       'migrated' => TRUE,
-    );
-    $plugin = new DedupeEntity($configuration, 'dedupe_entity', array(), $this->getMigration(), $this->entityQueryFactory);
+    ];
+    $plugin = new DedupeEntity($configuration, 'dedupe_entity', [], $this->getMigration(), $this->entityTypeManager);
 
     // Setup the entityQuery used in DedupeEntity::exists. The map, $map, is
     // an array consisting of the four input parameters to the query condition
diff --git a/web/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php b/web/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php
index 3245e60d9..20bf3a031 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\migrate\Unit\process;
 
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\migrate\process\Explode;
 use Drupal\migrate\Plugin\migrate\process\Concat;
 
@@ -53,23 +54,65 @@ class ExplodeTest extends MigrateProcessTestCase {
 
   /**
    * Test explode fails properly on non-strings.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   *
-   * @expectedExceptionMessage is not a string
    */
   public function testExplodeWithNonString() {
+    $this->setExpectedException(MigrateException::class, 'is not a string');
     $this->plugin->transform(['foo'], $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
+  /**
+   * Tests that explode works on non-strings but with strict set to FALSE.
+   *
+   * @dataProvider providerExplodeWithNonStrictAndEmptySource
+   */
+  public function testExplodeWithNonStrictAndEmptySource($value, $expected) {
+    $plugin = new Explode(['delimiter' => '|', 'strict' => FALSE], 'map', []);
+
+    $processed = $plugin->transform($value, $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->assertSame($expected, $processed);
+  }
+
+  /**
+   * Data provider for ::testExplodeWithNonStrictAndEmptySource().
+   */
+  public function providerExplodeWithNonStrictAndEmptySource() {
+    return [
+      'normal_string' => ['a|b|c', ['a', 'b', 'c']],
+      'integer_cast_to_string' => [123, ['123']],
+      'zero_integer_cast_to_string' => [0, ['0']],
+      'true_cast_to_string' => [TRUE, ['1']],
+      'null_empty_array' => [NULL, []],
+      'false_empty_array' => [FALSE, []],
+      'empty_string_empty_array' => ['', []],
+    ];
+  }
+
+  /**
+   * Tests that explode raises an exception when the value cannot be casted to
+   * string.
+   */
+  public function testExplodeWithNonStrictAndNonCastable() {
+    $plugin = new Explode(['delimiter' => '|', 'strict' => FALSE], 'map', []);
+    $this->setExpectedException(MigrateException::class, 'cannot be casted to a string');
+    $processed = $plugin->transform(['foo'], $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->assertSame(['foo'], $processed);
+  }
+
+  /**
+   * Tests that explode with an empty string and strict check returns a
+   * non-empty array.
+   */
+  public function testExplodeWithStrictAndEmptyString() {
+    $plugin = new Explode(['delimiter' => '|'], 'map', []);
+    $processed = $plugin->transform('', $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->assertSame([''], $processed);
+  }
+
   /**
    * Test explode fails with empty delimiter.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   *
-   * @expectedExceptionMessage delimiter is empty
    */
   public function testExplodeWithEmptyDelimiter() {
+    $this->setExpectedException(MigrateException::class, 'delimiter is empty');
     $plugin = new Explode(['delimiter' => ''], 'map', []);
     $plugin->transform('foo,bar', $this->migrateExecutable, $this->row, 'destinationproperty');
   }
diff --git a/web/core/modules/migrate/tests/src/Unit/process/ExtractTest.php b/web/core/modules/migrate/tests/src/Unit/process/ExtractTest.php
index 26c2cfe25..14f3f9afa 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/ExtractTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/ExtractTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\migrate\Unit\process;
 
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\migrate\process\Extract;
 
 /**
@@ -14,8 +15,8 @@ class ExtractTest extends MigrateProcessTestCase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $configuration['index'] = array('foo');
-    $this->plugin = new Extract($configuration, 'map', array());
+    $configuration['index'] = ['foo'];
+    $this->plugin = new Extract($configuration, 'map', []);
     parent::setUp();
   }
 
@@ -23,28 +24,24 @@ class ExtractTest extends MigrateProcessTestCase {
    * Tests successful extraction.
    */
   public function testExtract() {
-    $value = $this->plugin->transform(array('foo' => 'bar'), $this->migrateExecutable, $this->row, 'destinationproperty');
+    $value = $this->plugin->transform(['foo' => 'bar'], $this->migrateExecutable, $this->row, 'destinationproperty');
     $this->assertSame($value, 'bar');
   }
 
   /**
    * Tests invalid input.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   * @expectedExceptionMessage Input should be an array.
    */
   public function testExtractFromString() {
+    $this->setExpectedException(MigrateException::class, 'Input should be an array.');
     $this->plugin->transform('bar', $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
   /**
    * Tests unsuccessful extraction.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   * @expectedExceptionMessage Array index missing, extraction failed.
    */
   public function testExtractFail() {
-    $this->plugin->transform(array('bar' => 'foo'), $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->setExpectedException(MigrateException::class, 'Array index missing, extraction failed.');
+    $this->plugin->transform(['bar' => 'foo'], $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
   /**
diff --git a/web/core/modules/migrate/tests/src/Unit/process/FlattenTest.php b/web/core/modules/migrate/tests/src/Unit/process/FlattenTest.php
index 52c19be29..484cfc78d 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/FlattenTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/FlattenTest.php
@@ -15,9 +15,9 @@ class FlattenTest extends MigrateProcessTestCase {
    * Test that various array flatten operations work properly.
    */
   public function testFlatten() {
-    $plugin = new Flatten(array(), 'flatten', array());
-    $flattened = $plugin->transform(array(1, 2, array(3, 4, array(5)), array(), array(7, 8)), $this->migrateExecutable, $this->row, 'destinationproperty');
-    $this->assertSame($flattened, array(1, 2, 3, 4, 5, 7, 8));
+    $plugin = new Flatten([], 'flatten', []);
+    $flattened = $plugin->transform([1, 2, [3, 4, [5]], [], [7, 8]], $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->assertSame($flattened, [1, 2, 3, 4, 5, 7, 8]);
   }
 
 }
diff --git a/web/core/modules/migrate/tests/src/Unit/process/GetTest.php b/web/core/modules/migrate/tests/src/Unit/process/GetTest.php
index ae24d98c7..01ab2da74 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/GetTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/GetTest.php
@@ -41,16 +41,16 @@ class GetTest extends MigrateProcessTestCase {
    * Tests the Get plugin when source is an array.
    */
   public function testTransformSourceArray() {
-    $map = array(
+    $map = [
       'test1' => 'source_value1',
       'test2' => 'source_value2',
-    );
-    $this->plugin->setSource(array('test1', 'test2'));
+    ];
+    $this->plugin->setSource(['test1', 'test2']);
     $this->row->expects($this->exactly(2))
       ->method('getSourceProperty')
       ->will($this->returnCallback(function ($argument)  use ($map) { return $map[$argument]; } ));
     $value = $this->plugin->transform(NULL, $this->migrateExecutable, $this->row, 'destinationproperty');
-    $this->assertSame($value, array('source_value1', 'source_value2'));
+    $this->assertSame($value, ['source_value1', 'source_value2']);
   }
 
   /**
@@ -70,18 +70,18 @@ class GetTest extends MigrateProcessTestCase {
    * Tests the Get plugin when source is an array pointing to destination.
    */
   public function testTransformSourceArrayAt() {
-    $map = array(
+    $map = [
       'test1' => 'source_value1',
       '@test2' => 'source_value2',
       '@test3' => 'source_value3',
       'test4' => 'source_value4',
-    );
-    $this->plugin->setSource(array('test1', '@@test2', '@@test3', 'test4'));
+    ];
+    $this->plugin->setSource(['test1', '@@test2', '@@test3', 'test4']);
     $this->row->expects($this->exactly(4))
       ->method('getSourceProperty')
       ->will($this->returnCallback(function ($argument)  use ($map) { return $map[$argument]; } ));
     $value = $this->plugin->transform(NULL, $this->migrateExecutable, $this->row, 'destinationproperty');
-    $this->assertSame($value, array('source_value1', 'source_value2', 'source_value3', 'source_value4'));
+    $this->assertSame($value, ['source_value1', 'source_value2', 'source_value3', 'source_value4']);
   }
 
   /**
diff --git a/web/core/modules/migrate/tests/src/Unit/process/IteratorTest.php b/web/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
index cdffac07a..993fb9284 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
@@ -25,9 +25,9 @@ class IteratorTest extends MigrateTestCase {
   /**
    * @var array
    */
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'test',
-  );
+  ];
 
   /**
    * Tests the iterator process plugin.
@@ -35,24 +35,24 @@ class IteratorTest extends MigrateTestCase {
   public function testIterator() {
     $migration = $this->getMigration();
     // Set up the properties for the iterator.
-    $configuration = array(
-      'process' => array(
+    $configuration = [
+      'process' => [
         'foo' => 'source_foo',
         'id' => 'source_id',
-      ),
+      ],
       'key' => '@id',
-    );
-    $plugin = new Iterator($configuration, 'iterator', array());
+    ];
+    $plugin = new Iterator($configuration, 'iterator', []);
     // Manually create the plugins. Migration::getProcessPlugins does this
     // normally but the plugin system is not available.
     foreach ($configuration['process'] as $destination => $source) {
-      $iterator_plugins[$destination][] = new Get(array('source' => $source), 'get', array());
+      $iterator_plugins[$destination][] = new Get(['source' => $source], 'get', []);
     }
     $migration->expects($this->at(1))
       ->method('getProcessPlugins')
       ->will($this->returnValue($iterator_plugins));
     // Set up the key plugins.
-    $key_plugin['key'][] = new Get(array('source' => '@id'), 'get', array());
+    $key_plugin['key'][] = new Get(['source' => '@id'], 'get', []);
     $migration->expects($this->at(2))
       ->method('getProcessPlugins')
       ->will($this->returnValue($key_plugin));
@@ -60,12 +60,12 @@ class IteratorTest extends MigrateTestCase {
     $migrate_executable = new MigrateExecutable($migration, $this->getMock('Drupal\migrate\MigrateMessageInterface'), $event_dispatcher);
 
     // The current value of the pipeline.
-    $current_value = array(
-      array(
+    $current_value = [
+      [
         'source_foo' => 'test',
         'source_id' => 42,
-      ),
-    );
+      ],
+    ];
     // This is not used but the interface requires it, so create an empty row.
     $row = new Row();
 
diff --git a/web/core/modules/migrate/tests/src/Unit/process/MachineNameTest.php b/web/core/modules/migrate/tests/src/Unit/process/MachineNameTest.php
index 7f44157f3..5bc91587b 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/MachineNameTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/MachineNameTest.php
@@ -53,7 +53,7 @@ class MachineNameTest extends MigrateProcessTestCase {
       ->with($human_name)
       ->will($this->returnValue($human_name_ascii . 'aeo'));
 
-    $plugin = new MachineName(array(), 'machine_name', array(), $this->transliteration);
+    $plugin = new MachineName([], 'machine_name', [], $this->transliteration);
     $value = $plugin->transform($human_name, $this->migrateExecutable, $this->row, 'destinationproperty');
     $this->assertEquals($expected_result, $value);
   }
diff --git a/web/core/modules/migrate/tests/src/Unit/process/MigrationTest.php b/web/core/modules/migrate/tests/src/Unit/process/MigrationTest.php
index b62c1f934..dfac1c991 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/MigrationTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/MigrationTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\migrate\Unit\process;
 
 use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\migrate\MigrateSkipProcessException;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\process\Migration;
 use Drupal\migrate\Plugin\MigrateDestinationInterface;
@@ -89,8 +90,6 @@ class MigrationTest extends MigrateProcessTestCase {
 
   /**
    * Tests that processing is skipped when the input value is empty.
-   *
-   * @expectedException \Drupal\migrate\MigrateSkipProcessException
    */
   public function testSkipOnEmpty() {
     $migration_plugin = $this->prophesize(MigrationInterface::class);
@@ -102,6 +101,7 @@ class MigrationTest extends MigrateProcessTestCase {
     ];
     $migration_plugin->id()->willReturn(uniqid());
     $migration = new Migration($configuration, 'migration', [], $migration_plugin->reveal(), $migration_plugin_manager->reveal(), $process_plugin_manager->reveal());
+    $this->setExpectedException(MigrateSkipProcessException::class);
     $migration->transform(0, $this->migrateExecutable, $this->row, 'foo');
   }
 
diff --git a/web/core/modules/migrate/tests/src/Unit/process/SkipOnEmptyTest.php b/web/core/modules/migrate/tests/src/Unit/process/SkipOnEmptyTest.php
index bf40dac7a..66b27cc34 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/SkipOnEmptyTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/SkipOnEmptyTest.php
@@ -1,6 +1,8 @@
 <?php
 
 namespace Drupal\Tests\migrate\Unit\process;
+use Drupal\migrate\MigrateSkipProcessException;
+use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\migrate\process\SkipOnEmpty;
 
 /**
@@ -13,10 +15,10 @@ class SkipOnEmptyTest extends MigrateProcessTestCase {
 
   /**
    * @covers ::process
-   * @expectedException \Drupal\migrate\MigrateSkipProcessException
    */
   public function testProcessSkipsOnEmpty() {
     $configuration['method'] = 'process';
+    $this->setExpectedException(MigrateSkipProcessException::class);
     (new SkipOnEmpty($configuration, 'skip_on_empty', []))
       ->transform('', $this->migrateExecutable, $this->row, 'destinationproperty');
   }
@@ -33,10 +35,10 @@ class SkipOnEmptyTest extends MigrateProcessTestCase {
 
   /**
    * @covers ::row
-   * @expectedException \Drupal\migrate\MigrateSkipRowException
    */
   public function testRowSkipsOnEmpty() {
     $configuration['method'] = 'row';
+    $this->setExpectedException(MigrateSkipRowException::class);
     (new SkipOnEmpty($configuration, 'skip_on_empty', []))
       ->transform('', $this->migrateExecutable, $this->row, 'destinationproperty');
   }
diff --git a/web/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php b/web/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php
index 59db2e578..714d5f7c1 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\migrate\Unit\process;
 
+use Drupal\migrate\MigrateException;
+use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\migrate\process\StaticMap;
 
 /**
@@ -16,7 +18,7 @@ class StaticMapTest extends MigrateProcessTestCase {
    */
   protected function setUp() {
     $configuration['map']['foo']['bar'] = 'baz';
-    $this->plugin = new StaticMap($configuration, 'map', array());
+    $this->plugin = new StaticMap($configuration, 'map', []);
     parent::setUp();
   }
 
@@ -25,33 +27,31 @@ class StaticMapTest extends MigrateProcessTestCase {
    */
   public function testMapWithSourceString() {
     $value = $this->plugin->transform('foo', $this->migrateExecutable, $this->row, 'destinationproperty');
-    $this->assertSame($value, array('bar' => 'baz'));
+    $this->assertSame($value, ['bar' => 'baz']);
   }
 
   /**
    * Tests map when the source is a list.
    */
   public function testMapWithSourceList() {
-    $value = $this->plugin->transform(array('foo', 'bar'), $this->migrateExecutable, $this->row, 'destinationproperty');
+    $value = $this->plugin->transform(['foo', 'bar'], $this->migrateExecutable, $this->row, 'destinationproperty');
     $this->assertSame($value, 'baz');
   }
 
   /**
    * Tests when the source is empty.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
    */
   public function testMapwithEmptySource() {
-    $this->plugin->transform(array(), $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->setExpectedException(MigrateException::class);
+    $this->plugin->transform([], $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
   /**
    * Tests when the source is invalid.
-   *
-   * @expectedException \Drupal\migrate\MigrateSkipRowException
    */
   public function testMapwithInvalidSource() {
-    $this->plugin->transform(array('bar'), $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->setExpectedException(MigrateSkipRowException::class);
+    $this->plugin->transform(['bar'], $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
   /**
@@ -60,8 +60,8 @@ class StaticMapTest extends MigrateProcessTestCase {
   public function testMapWithInvalidSourceWithADefaultValue() {
     $configuration['map']['foo']['bar'] = 'baz';
     $configuration['default_value'] = 'test';
-    $this->plugin = new StaticMap($configuration, 'map', array());
-    $value = $this->plugin->transform(array('bar'), $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->plugin = new StaticMap($configuration, 'map', []);
+    $value = $this->plugin->transform(['bar'], $this->migrateExecutable, $this->row, 'destinationproperty');
     $this->assertSame($value, 'test');
   }
 
@@ -72,22 +72,20 @@ class StaticMapTest extends MigrateProcessTestCase {
     $configuration['map']['foo']['bar'] = 'baz';
     $configuration['default_value'] = NULL;
     $this->plugin = new StaticMap($configuration, 'map', []);
-    $value = $this->plugin->transform(array('bar'), $this->migrateExecutable, $this->row, 'destinationproperty');
+    $value = $this->plugin->transform(['bar'], $this->migrateExecutable, $this->row, 'destinationproperty');
     $this->assertNull($value);
   }
 
   /**
    * Tests when the source is invalid and bypass is enabled.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   * @expectedExceptionMessage Setting both default_value and bypass is invalid.
    */
   public function testMapWithInvalidSourceAndBypass() {
     $configuration['map']['foo']['bar'] = 'baz';
     $configuration['default_value'] = 'test';
     $configuration['bypass'] = TRUE;
-    $this->plugin = new StaticMap($configuration, 'map', array());
-    $this->plugin->transform(array('bar'), $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->plugin = new StaticMap($configuration, 'map', []);
+    $this->setExpectedException(MigrateException::class, 'Setting both default_value and bypass is invalid.');
+    $this->plugin->transform(['bar'], $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
 }
diff --git a/web/core/modules/migrate/tests/src/Unit/process/SubstrTest.php b/web/core/modules/migrate/tests/src/Unit/process/SubstrTest.php
index fb84509bd..6a73905d1 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/SubstrTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/SubstrTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\migrate\Unit\process;
 
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\migrate\process\Substr;
 
 /**
@@ -55,37 +56,31 @@ class SubstrTest extends MigrateProcessTestCase {
 
   /**
    * Tests invalid input type.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   * @expectedExceptionMessage The input value must be a string.
    */
   public function testSubstrFail() {
     $configuration = [];
     $this->plugin = new Substr($configuration, 'map', []);
+    $this->setExpectedException(MigrateException::class, 'The input value must be a string.');
     $this->plugin->transform(['Captain Janeway'], $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
   /**
    * Tests that the start parameter is an integer.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   * @expectedExceptionMessage The start position configuration value should be an integer. Omit this key to capture from the beginning of the string.
    */
   public function testStartIsString() {
     $configuration['start'] = '2';
     $this->plugin = new Substr($configuration, 'map', []);
+    $this->setExpectedException(MigrateException::class, 'The start position configuration value should be an integer. Omit this key to capture from the beginning of the string.');
     $this->plugin->transform(['foo'], $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
   /**
    * Tests that the length parameter is an integer.
-   *
-   * @expectedException \Drupal\migrate\MigrateException
-   * @expectedExceptionMessage The character length configuration value should be an integer. Omit this key to capture from the start position to the end of the string.
    */
   public function testLengthIsString() {
     $configuration['length'] = '1';
     $this->plugin = new Substr($configuration, 'map', []);
+    $this->setExpectedException(MigrateException::class, 'The character length configuration value should be an integer. Omit this key to capture from the start position to the end of the string.');
     $this->plugin->transform(['foo'], $this->migrateExecutable, $this->row, 'destinationproperty');
   }
 
diff --git a/web/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php b/web/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
index 78d89a16e..1f7d94ae0 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
@@ -28,14 +28,14 @@ class UrlEncodeTest extends MigrateTestCase {
    *   An array of URLs to test.
    */
   public function urlDataProvider() {
-    return array(
-      'A URL with no characters requiring encoding' => array('http://example.com/normal_url.html', 'http://example.com/normal_url.html'),
-      'The definitive use case - encoding spaces in URLs' => array('http://example.com/url with spaces.html', 'http://example.com/url%20with%20spaces.html'),
-      'Definitive use case 2 - spaces in directories' => array('http://example.com/dir with spaces/foo.html', 'http://example.com/dir%20with%20spaces/foo.html'),
-      'Local filespecs without spaces should not be transformed' => array('/tmp/normal.txt', '/tmp/normal.txt'),
-      'Local filespecs with spaces should not be transformed' => array('/tmp/with spaces.txt', '/tmp/with spaces.txt'),
-      'Make sure URL characters (:, ?, &) are not encoded but others are.' => array('https://example.com/?a=b@c&d=e+f%', 'https://example.com/?a%3Db%40c&d%3De%2Bf%25'),
-    );
+    return [
+      'A URL with no characters requiring encoding' => ['http://example.com/normal_url.html', 'http://example.com/normal_url.html'],
+      'The definitive use case - encoding spaces in URLs' => ['http://example.com/url with spaces.html', 'http://example.com/url%20with%20spaces.html'],
+      'Definitive use case 2 - spaces in directories' => ['http://example.com/dir with spaces/foo.html', 'http://example.com/dir%20with%20spaces/foo.html'],
+      'Local filespecs without spaces should not be transformed' => ['/tmp/normal.txt', '/tmp/normal.txt'],
+      'Local filespecs with spaces should not be transformed' => ['/tmp/with spaces.txt', '/tmp/with spaces.txt'],
+      'Make sure URL characters (:, ?, &) are not encoded but others are.' => ['https://example.com/?a=b@c&d=e+f%', 'https://example.com/?a%3Db%40c&d%3De%2Bf%25'],
+    ];
   }
 
   /**
diff --git a/web/core/modules/migrate_drupal/migrate_drupal.module b/web/core/modules/migrate_drupal/migrate_drupal.module
index dc3ab4ee7..9b00e07eb 100644
--- a/web/core/modules/migrate_drupal/migrate_drupal.module
+++ b/web/core/modules/migrate_drupal/migrate_drupal.module
@@ -20,7 +20,7 @@ function migrate_drupal_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.migrate_drupal':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Migrate Drupal module provides a framework based on the <a href=":migrate">Migrate module</a> to facilitate migration from a Drupal (6, 7, or 8) site to your website. It does not provide a user interface. For more information, see the <a href=":migrate_drupal">online documentation for the Migrate Drupal module</a>.', array(':migrate' => \Drupal::url('help.page', array('name' => 'migrate')), ':migrate_drupal' => 'https://www.drupal.org/documentation/modules/migrate_drupal')) . '</p>';
+      $output .= '<p>' . t('The Migrate Drupal module provides a framework based on the <a href=":migrate">Migrate module</a> to facilitate migration from a Drupal (6, 7, or 8) site to your website. It does not provide a user interface. For more information, see the <a href=":migrate_drupal">online documentation for the Migrate Drupal module</a>.', [':migrate' => \Drupal::url('help.page', ['name' => 'migrate']), ':migrate_drupal' => 'https://www.drupal.org/documentation/modules/migrate_drupal']) . '</p>';
       return $output;
   }
 }
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
index 169390a6a..43df17057 100644
--- a/web/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
@@ -2,8 +2,10 @@
 
 namespace Drupal\migrate_drupal\Plugin\migrate\destination;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\EntityFieldStorageConfig as BaseEntityFieldStorageConfig;
@@ -45,11 +47,17 @@ class EntityFieldStorageConfig extends BaseEntityFieldStorageConfig {
    *   The storage for this entity type.
    * @param array $bundles
    *   The list of bundles this entity type has.
+   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   *   The language manager.
    * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_plugin_manager
    *   The field type plugin manager.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The configuration factory.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, FieldTypePluginManagerInterface $field_type_plugin_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles);
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, LanguageManagerInterface $language_manager, ConfigFactoryInterface $config_factory, FieldTypePluginManagerInterface $field_type_plugin_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $language_manager, $config_factory, $field_type_plugin_manager);
+    $this->languageManager = $language_manager;
+    $this->configFactory = $config_factory;
     $this->fieldTypePluginManager = $field_type_plugin_manager;
   }
 
@@ -65,6 +73,8 @@ class EntityFieldStorageConfig extends BaseEntityFieldStorageConfig {
       $migration,
       $container->get('entity.manager')->getStorage($entity_type_id),
       array_keys($container->get('entity.manager')->getBundleInfo($entity_type_id)),
+      $container->get('language_manager'),
+      $container->get('config.factory'),
       $container->get('plugin.manager.field.field_type')
     );
   }
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
index 3af971cc2..ffff6269c 100644
--- a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -10,7 +10,6 @@ use Drupal\Core\State\StateInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
-use Drupal\migrate\Plugin\RequirementsInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -19,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  * Mainly to let children retrieve information from the origin system in an
  * easier way.
  */
-abstract class DrupalSqlBase extends SqlBase implements ContainerFactoryPluginInterface, RequirementsInterface, DependentPluginInterface {
+abstract class DrupalSqlBase extends SqlBase implements ContainerFactoryPluginInterface, DependentPluginInterface {
 
   use DependencyTrait;
 
@@ -60,7 +59,7 @@ abstract class DrupalSqlBase extends SqlBase implements ContainerFactoryPluginIn
    */
   public function getSystemData() {
     if (!isset($this->systemData)) {
-      $this->systemData = array();
+      $this->systemData = [];
       try {
         $results = $this->select('system', 's')
           ->fields('s')
@@ -106,6 +105,7 @@ abstract class DrupalSqlBase extends SqlBase implements ContainerFactoryPluginIn
         }
       }
     }
+    parent::checkRequirements();
   }
 
   /**
@@ -149,7 +149,7 @@ abstract class DrupalSqlBase extends SqlBase implements ContainerFactoryPluginIn
   protected function variableGet($name, $default) {
     try {
       $result = $this->select('variable', 'v')
-        ->fields('v', array('value'))
+        ->fields('v', ['value'])
         ->condition('name', $name)
         ->execute()
         ->fetchField();
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
index 2d8c3ccd8..410acec22 100644
--- a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
@@ -37,7 +37,7 @@ class Variable extends DrupalSqlBase {
    * {@inheritdoc}
    */
   protected function initializeIterator() {
-    return new \ArrayIterator(array($this->values()));
+    return new \ArrayIterator([$this->values()]);
   }
 
   /**
@@ -75,7 +75,7 @@ class Variable extends DrupalSqlBase {
   public function query() {
     return $this->getDatabase()
       ->select('variable', 'v')
-      ->fields('v', array('name', 'value'))
+      ->fields('v', ['name', 'value'])
       ->condition('name', $this->variables, 'IN');
   }
 
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/VariableMultiRow.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/VariableMultiRow.php
index 2ecea8d22..61da5eb30 100644
--- a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/VariableMultiRow.php
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/VariableMultiRow.php
@@ -21,7 +21,7 @@ class VariableMultiRow extends DrupalSqlBase {
    */
   public function query() {
     return $this->select('variable', 'v')
-      ->fields('v', array('name', 'value'))
+      ->fields('v', ['name', 'value'])
       // Cast scalars to array so we can consistently use an IN condition.
       ->condition('name', (array) $this->configuration['variables'], 'IN');
   }
@@ -30,10 +30,10 @@ class VariableMultiRow extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'name' => $this->t('Name'),
       'value' => $this->t('Value'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/d8/Config.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/d8/Config.php
index df3311f5f..8d8338776 100644
--- a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/d8/Config.php
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/d8/Config.php
@@ -19,7 +19,7 @@ class Config extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('config', 'c')
-      ->fields('c', array('collection', 'name', 'data'));
+      ->fields('c', ['collection', 'name', 'data']);
     if (!empty($this->configuration['collections'])) {
       $query->condition('collection', (array) $this->configuration['collections'], 'IN');
     }
diff --git a/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php
index f20fa0c03..71bccd4cb 100644
--- a/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php
+++ b/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php
@@ -1772,7 +1772,7 @@ $connection->insert('comments')
   'uid' => '0',
   'subject' => 'The first comment.',
   'comment' => 'The first comment body.',
-  'hostname' => '127.0.0.1',
+  'hostname' => '203.0.113.1',
   'timestamp' => '1390264918',
   'status' => '0',
   'format' => '1',
@@ -1788,7 +1788,7 @@ $connection->insert('comments')
   'uid' => '0',
   'subject' => 'The response to the second comment.',
   'comment' => 'The second comment response body.',
-  'hostname' => '127.0.0.1',
+  'hostname' => '203.0.113.2',
   'timestamp' => '1390264938',
   'status' => '0',
   'format' => '1',
@@ -1804,7 +1804,7 @@ $connection->insert('comments')
   'uid' => '0',
   'subject' => 'The second comment.',
   'comment' => 'The second comment body.',
-  'hostname' => '127.0.0.1',
+  'hostname' => '203.0.113.3',
   'timestamp' => '1390264948',
   'status' => '1',
   'format' => '1',
@@ -3018,7 +3018,7 @@ $connection->insert('content_node_field_instance')
   'label' => 'Text Single Checkbox Field',
   'widget_type' => 'text_textfield',
   'widget_settings' => 'a:4:{s:13:"default_value";a:1:{i:0;a:2:{s:5:"value";s:1:"0";s:14:"_error_element";s:63:"default_value_widget][field_test_text_single_checkbox][0][value";}}s:17:"default_value_php";N;s:4:"rows";i:5;s:4:"size";s:3:"255";}',
-  'display_settings' => 'a:7:{s:6:"weight";s:2:"17";s:6:"parent";s:0:"";i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}}',
+  'display_settings' => 'a:7:{s:6:"weight";s:2:"32";s:6:"parent";s:0:"";s:5:"label";a:1:{s:6:"format";s:5:"above";}s:6:"teaser";a:2:{s:6:"format";s:6:"hidden";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}}',
   'description' => 'An example text field using a single on/off checkbox.',
   'widget_module' => 'text',
   'widget_active' => '1',
@@ -45954,8 +45954,32 @@ $connection->insert('variable')
   'value' => 's:1:"1";',
 ))
 ->values(array(
-  'name' => 'upload_page',
-  'value' => 'b:1;',
+  'name' => 'upload_employee',
+  'value' => 'b:0;',
+))
+->values(array(
+  'name' => 'upload_event',
+  'value' => 'b:0;',
+))
+->values(array(
+  'name' => 'upload_sponsor',
+  'value' => 'b:0;',
+))
+->values(array(
+  'name' => 'upload_test_page',
+  'value' => 'b:0;',
+))
+->values(array(
+  'name' => 'upload_test_event',
+  'value' => 'b:0;',
+))
+->values(array(
+  'name' => 'upload_test_planet',
+  'value' => 'b:0;',
+))
+->values(array(
+  'name' => 'upload_test_story',
+  'value' => 'b:0;',
 ))
 ->values(array(
   'name' => 'upload_story',
diff --git a/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index a388f8e5a..8c96dae60 100644
--- a/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -2512,7 +2512,7 @@ $connection->insert('comment')
   'nid' => '1',
   'uid' => '1',
   'subject' => 'A comment',
-  'hostname' => '::1',
+  'hostname' => '2001:db8:ffff:ffff:ffff:ffff:ffff:ffff',
   'created' => '1421727536',
   'changed' => '1421727536',
   'status' => '1',
@@ -6141,6 +6141,30 @@ $connection->insert('field_revision_body')
   'body_summary' => '',
   'body_format' => 'filtered_html',
 ))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '4',
+  'revision_id' => '4',
+  'language' => 'und',
+  'delta' => '0',
+  'body_value' => 'is - Is that is it awesome.',
+  'body_summary' => '',
+  'body_format' => 'filtered_html',
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'article',
+  'deleted' => '0',
+  'entity_id' => '5',
+  'revision_id' => '5',
+  'language' => 'und',
+  'delta' => '0',
+  'body_value' => 'en - Is that is it awesome.',
+  'body_summary' => '',
+  'body_format' => 'filtered_html',
+))
 ->execute();
 
 $connection->schema()->createTable('field_revision_comment_body', array(
@@ -30945,6 +30969,38 @@ $connection->insert('node')
   'tnid' => '2',
   'translate' => '0',
 ))
+->values(array(
+  'nid' => '4',
+  'vid' => '4',
+  'type' => 'article',
+  'language' => 'is',
+  'title' => 'is - The thing about Firefly',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1478755274',
+  'changed' => '1478755274',
+  'comment' => '2',
+  'promote' => '1',
+  'sticky' => '0',
+  'tnid' => '4',
+  'translate' => '0',
+))
+->values(array(
+  'nid' => '5',
+  'vid' => '5',
+  'type' => 'article',
+  'language' => 'en',
+  'title' => 'en - The thing about Firefly',
+  'uid' => '1',
+  'status' => '1',
+  'created' => '1478755314',
+  'changed' => '1478755314',
+  'comment' => '2',
+  'promote' => '1',
+  'sticky' => '0',
+  'tnid' => '4',
+  'translate' => '0',
+))
 ->execute();
 
 $connection->schema()->createTable('node_access', array(
@@ -31089,6 +31145,22 @@ $connection->insert('node_comment_statistics')
   'last_comment_uid' => '1',
   'comment_count' => '0',
 ))
+->values(array(
+  'nid' => '4',
+  'cid' => '0',
+  'last_comment_timestamp' => '1478755274',
+  'last_comment_name' => NULL,
+  'last_comment_uid' => '1',
+  'comment_count' => '0',
+))
+->values(array(
+  'nid' => '5',
+  'cid' => '0',
+  'last_comment_timestamp' => '1478755314',
+  'last_comment_name' => NULL,
+  'last_comment_uid' => '1',
+  'comment_count' => '0',
+))
 ->execute();
 
 $connection->schema()->createTable('node_counter', array(
@@ -31143,15 +31215,27 @@ $connection->insert('node_counter')
 ->values(array(
   'nid' => '2',
   'totalcount' => '1',
-  'daycount' => '1',
+  'daycount' => '0',
   'timestamp' => '1471428059',
 ))
 ->values(array(
   'nid' => '3',
   'totalcount' => '1',
-  'daycount' => '1',
+  'daycount' => '0',
   'timestamp' => '1471428153',
 ))
+->values(array(
+  'nid' => '4',
+  'totalcount' => '1',
+  'daycount' => '1',
+  'timestamp' => '1478755275',
+))
+->values(array(
+  'nid' => '5',
+  'totalcount' => '1',
+  'daycount' => '1',
+  'timestamp' => '1478755314',
+))
 ->execute();
 
 $connection->schema()->createTable('node_revision', array(
@@ -31272,6 +31356,30 @@ $connection->insert('node_revision')
   'promote' => '1',
   'sticky' => '0',
 ))
+->values(array(
+  'nid' => '4',
+  'vid' => '4',
+  'uid' => '1',
+  'title' => 'is - The thing about Firefly',
+  'log' => '',
+  'timestamp' => '1478755274',
+  'status' => '1',
+  'comment' => '2',
+  'promote' => '1',
+  'sticky' => '0',
+))
+->values(array(
+  'nid' => '5',
+  'vid' => '5',
+  'uid' => '1',
+  'title' => 'en - The thing about Firefly',
+  'log' => '',
+  'timestamp' => '1478755314',
+  'status' => '1',
+  'comment' => '2',
+  'promote' => '1',
+  'sticky' => '0',
+))
 ->execute();
 
 $connection->schema()->createTable('node_type', array(
@@ -43027,6 +43135,30 @@ $connection->insert('url_alias')
   'alias' => 'term33',
   'language' => 'und',
 ))
+->values(array(
+  'pid' => '2',
+  'source' => 'node/2',
+  'alias' => 'deep-space-9',
+  'language' => 'en',
+))
+->values(array(
+  'pid' => '3',
+  'source' => 'node/3',
+  'alias' => 'deep-space-9-is',
+  'language' => 'is',
+))
+->values(array(
+  'pid' => '4',
+  'source' => 'node/4',
+  'alias' => 'firefly-is',
+  'language' => 'is',
+))
+->values(array(
+  'pid' => '5',
+  'source' => 'node/5',
+  'alias' => 'firefly',
+  'language' => 'en',
+))
 ->execute();
 
 $connection->schema()->createTable('users', array(
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php
index 1754cfef5..9e30795be 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php
@@ -14,7 +14,7 @@ class MigrateCckFieldPluginManagerTest extends MigrateDrupalTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('system', 'user', 'field', 'migrate_drupal', 'options', 'file', 'text', 'migrate_cckfield_plugin_manager_test');
+  public static $modules = ['system', 'user', 'field', 'migrate_drupal', 'options', 'file', 'text', 'migrate_cckfield_plugin_manager_test'];
 
   /**
    * Tests that the correct MigrateCckField plugins are used.
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php b/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
index 2cf4eb14a..063c99cb3 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
@@ -15,7 +15,7 @@ abstract class MigrateDrupalTestBase extends MigrateTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'field', 'migrate_drupal', 'options', 'file');
+  public static $modules = ['system', 'user', 'field', 'migrate_drupal', 'options', 'file'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
index 5074473ce..9c5ee58f2 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
@@ -44,12 +44,12 @@ class EntityContentBaseTest extends MigrateDrupal6TestBase {
       'uid' => 2,
       'name' => 'Ford Prefect',
       'mail' => 'ford.prefect@localhost',
-      'signature' => array(
-        array(
+      'signature' => [
+        [
           'value' => 'Bring a towel.',
           'format' => 'filtered_html',
-        ),
-      ),
+        ],
+      ],
       'init' => 'proto@zo.an',
     ])->save();
 
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/dependencies/MigrateDependenciesTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/dependencies/MigrateDependenciesTest.php
index 1b5736d92..ba0dc5a47 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/dependencies/MigrateDependenciesTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/dependencies/MigrateDependenciesTest.php
@@ -22,11 +22,11 @@ class MigrateDependenciesTest extends MigrateDrupal6TestBase {
    * Tests that the order is correct when loading several migrations.
    */
   public function testMigrateDependenciesOrder() {
-    $migration_items = array('d6_comment', 'd6_filter_format', 'd6_node:page');
+    $migration_items = ['d6_comment', 'd6_filter_format', 'd6_node:page'];
     $migrations = $this->container->get('plugin.manager.migration')->createInstances($migration_items);
-    $expected_order = array('d6_filter_format', 'd6_node:page', 'd6_comment');
+    $expected_order = ['d6_filter_format', 'd6_node:page', 'd6_comment'];
     $this->assertIdentical(array_keys($migrations), $expected_order);
-    $expected_requirements = array(
+    $expected_requirements = [
       // d6_comment depends on d6_node:*, which the deriver expands into every
       // variant of d6_node.
       'd6_node:article',
@@ -47,7 +47,7 @@ class MigrateDependenciesTest extends MigrateDrupal6TestBase {
       'd6_comment_type',
       'd6_comment_entity_display',
       'd6_comment_entity_form_display',
-    );
+    ];
     // Migration dependencies for comment include dependencies for node
     // migration as well.
     $actual_requirements = $migrations['d6_comment']->get('requirements');
@@ -66,7 +66,7 @@ class MigrateDependenciesTest extends MigrateDrupal6TestBase {
     $executable = new MigrateExecutable($migration, $this);
     $this->startCollectingMessages();
     $executable->import();
-    $this->assertEqual($this->migrateMessages['error'], array(SafeMarkup::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id()))));
+    $this->assertEqual($this->migrateMessages['error'], [SafeMarkup::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', ['@id' => $migration->id()])]);
     $this->collectMessages = FALSE;
   }
 
diff --git a/web/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php b/web/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php
index f2254dc4a..6dd592574 100644
--- a/web/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php
@@ -14,9 +14,9 @@ class DrupalSqlBaseTest extends MigrateTestCase {
   /**
    * Define bare minimum migration configuration.
    */
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'DrupalSqlBase',
-  );
+  ];
 
   /**
    * @var \Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase
@@ -26,17 +26,17 @@ class DrupalSqlBaseTest extends MigrateTestCase {
   /**
    * Minimum database contents needed to test DrupalSqlBase.
    */
-  protected $databaseContents = array(
-    'system' => array(
-      array(
+  protected $databaseContents = [
+    'system' => [
+      [
         'filename' => 'sites/all/modules/module1',
         'name' => 'module1',
         'type' => 'module',
         'status' => 0,
         'schema_version' => -1,
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
   /**
    * @covers ::checkRequirements
diff --git a/web/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowTestBase.php b/web/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowTestBase.php
index c9af613c9..571043622 100644
--- a/web/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowTestBase.php
+++ b/web/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowTestBase.php
@@ -14,27 +14,27 @@ abstract class VariableMultiRowTestBase extends MigrateSqlSourceTestCase {
   const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\VariableMultiRow';
 
   // The fake Migration configuration entity.
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'test',
-    'source' => array(
+    'source' => [
       'plugin' => 'd6_variable_multirow',
-      'variables' => array(
+      'variables' => [
         'foo',
         'bar',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
-  protected $expectedResults = array(
-    array('name' => 'foo', 'value' => 1),
-    array('name' => 'bar', 'value' => FALSE),
-  );
+  protected $expectedResults = [
+    ['name' => 'foo', 'value' => 1],
+    ['name' => 'bar', 'value' => FALSE],
+  ];
 
-  protected $databaseContents = array(
-    'variable' => array(
-      array('name' => 'foo', 'value' => 'i:1;'),
-      array('name' => 'bar', 'value' => 'b:0;'),
-    ),
-  );
+  protected $databaseContents = [
+    'variable' => [
+      ['name' => 'foo', 'value' => 'i:1;'],
+      ['name' => 'bar', 'value' => 'b:0;'],
+    ],
+  ];
 
 }
diff --git a/web/core/modules/migrate_drupal/tests/src/Unit/source/VariableTest.php b/web/core/modules/migrate_drupal/tests/src/Unit/source/VariableTest.php
index 18a30333e..1b5abc36b 100644
--- a/web/core/modules/migrate_drupal/tests/src/Unit/source/VariableTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Unit/source/VariableTest.php
@@ -13,31 +13,31 @@ class VariableTest extends MigrateSqlSourceTestCase {
 
   const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\Variable';
 
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'test',
-    'highWaterProperty' => array('field' => 'test'),
-    'source' => array(
+    'highWaterProperty' => ['field' => 'test'],
+    'source' => [
       'plugin' => 'd6_variable',
-      'variables' => array(
+      'variables' => [
         'foo',
         'bar',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
-  protected $expectedResults = array(
-    array(
+  protected $expectedResults = [
+    [
       'id' => 'foo',
       'foo' => 1,
       'bar' => FALSE,
-    ),
-  );
+    ],
+  ];
 
-  protected $databaseContents = array(
-    'variable' => array(
-      array('name' => 'foo', 'value' => 'i:1;'),
-      array('name' => 'bar', 'value' => 'b:0;'),
-    ),
-  );
+  protected $databaseContents = [
+    'variable' => [
+      ['name' => 'foo', 'value' => 'i:1;'],
+      ['name' => 'bar', 'value' => 'b:0;'],
+    ],
+  ];
 
 }
diff --git a/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php b/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
index 845ce7863..55d128227 100644
--- a/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
@@ -19,9 +19,9 @@ class Drupal6SqlBaseTest extends MigrateTestCase {
   /**
    * Define bare minimum migration configuration.
    */
-  protected $migrationConfiguration = array(
+  protected $migrationConfiguration = [
     'id' => 'Drupal6SqlBase',
-  );
+  ];
 
   /**
    * @var \Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase
@@ -31,37 +31,37 @@ class Drupal6SqlBaseTest extends MigrateTestCase {
   /**
    * Minimum database contents needed to test Drupal6SqlBase.
    */
-  protected $databaseContents = array(
-    'system' => array(
-      array(
+  protected $databaseContents = [
+    'system' => [
+      [
         'filename' => 'sites/all/modules/module1',
         'name' => 'module1',
         'type' => 'module',
         'status' => 1,
         'schema_version' => -1,
-      ),
-      array(
+      ],
+      [
         'filename' => 'sites/all/modules/module2',
         'name' => 'module2',
         'type' => 'module',
         'status' => 0,
         'schema_version' => 7201,
-      ),
-      array(
+      ],
+      [
         'filename' => 'sites/all/modules/test2',
         'name' => 'test2',
         'type' => 'theme',
         'status' => 1,
         'schema_version' => -1,
-      ),
-    ),
-    'variable' => array(
-      array(
+      ],
+    ],
+    'variable' => [
+      [
         'name' => 'my_variable',
         'value' => 'b:1;',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
   /**
    * {@inheritdoc}
@@ -72,7 +72,7 @@ class Drupal6SqlBaseTest extends MigrateTestCase {
     $state = $this->getMock('Drupal\Core\State\StateInterface');
     /** @var \Drupal\Core\Entity\EntityManagerInterface $entity_manager */
     $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
-    $this->base = new TestDrupal6SqlBase($this->migrationConfiguration, $plugin, array(), $this->getMigration(), $state, $entity_manager);
+    $this->base = new TestDrupal6SqlBase($this->migrationConfiguration, $plugin, [], $this->getMigration(), $state, $entity_manager);
     $this->base->setDatabase($this->getDatabase($this->databaseContents));
   }
 
@@ -143,7 +143,7 @@ class TestDrupal6SqlBase extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'filename' => t('The path of the primary file for this item.'),
       'name' => t('The name of the item; e.g. node.'),
       'type' => t('The type of the item, either module, theme, or theme_engine.'),
@@ -154,7 +154,7 @@ class TestDrupal6SqlBase extends DrupalSqlBase {
       'schema_version' => t('The module\'s database schema version number.'),
       'weight' => t('The order in which this module\'s hooks should be invoked.'),
       'info' => t('A serialized array containing information from the module\'s .info file.'),
-    );
+    ];
   }
 
   /**
@@ -163,7 +163,7 @@ class TestDrupal6SqlBase extends DrupalSqlBase {
   public function query() {
     $query = $this->database
       ->select('system', 's')
-      ->fields('s', array('filename', 'name', 'schema_version'));
+      ->fields('s', ['filename', 'name', 'schema_version']);
     return $query;
   }
 
@@ -216,7 +216,7 @@ class TestDrupal6SqlBase extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function getIds() {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php b/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php
index bcfb6c202..06059cfd5 100644
--- a/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/i18nVariableTest.php
@@ -20,7 +20,7 @@ class i18nVariableTest extends MigrateSqlSourceTestCase {
    */
   protected $migrationConfiguration = [
     'id' => 'test',
-    'highWaterProperty' => array('field' => 'test'),
+    'highWaterProperty' => ['field' => 'test'],
     'source' => [
       'plugin' => 'i18n_variable',
       'variables' => [
@@ -51,10 +51,10 @@ class i18nVariableTest extends MigrateSqlSourceTestCase {
    */
   protected $databaseContents = [
     'i18n_variable' => [
-      array('name' => 'site_slogan', 'language' => 'fr', 'value' => 's:19:"Migrate est génial";'),
-      array('name' => 'site_name', 'language' => 'fr', 'value' => 's:11:"nom de site";'),
-      array('name' => 'site_slogan', 'language' => 'mi', 'value' => 's:19:"Ko whakamataku heke";'),
-      array('name' => 'site_name', 'language' => 'mi', 'value' => 's:9:"ingoa_pae";'),
+      ['name' => 'site_slogan', 'language' => 'fr', 'value' => 's:19:"Migrate est génial";'],
+      ['name' => 'site_name', 'language' => 'fr', 'value' => 's:11:"nom de site";'],
+      ['name' => 'site_slogan', 'language' => 'mi', 'value' => 's:19:"Ko whakamataku heke";'],
+      ['name' => 'site_name', 'language' => 'mi', 'value' => 's:9:"ingoa_pae";'],
     ],
   ];
 
diff --git a/web/core/modules/migrate_drupal_ui/migrate_drupal_ui.module b/web/core/modules/migrate_drupal_ui/migrate_drupal_ui.module
index b8d978171..5f06cdcc8 100644
--- a/web/core/modules/migrate_drupal_ui/migrate_drupal_ui.module
+++ b/web/core/modules/migrate_drupal_ui/migrate_drupal_ui.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
 
 /**
  * Implements hook_help().
@@ -13,7 +14,28 @@ use Drupal\Core\Routing\RouteMatchInterface;
 function migrate_drupal_ui_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.migrate_drupal_ui':
-      $output = '<p>' . t('The Migrate Drupal UI module provides a one-click upgrade from an earlier version of Drupal. For details, see the <a href=":migrate">online documentation for the Migrate Drupal UI module</a> in the handbook on upgrading from previous versions.', [':migrate' => 'https://www.drupal.org/upgrade/migrate']) . '</p>';
+      $output = '';
+      $output .= '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('The Migrate Drupal UI module provides a simple user interface to perform an upgrade from an earlier version of Drupal. For more information, see the <a href=":migrate">online documentation for the Migrate Drupal UI module</a>.',
+          [':migrate' => 'https://www.drupal.org/upgrade/migrate']) . '</p>';
+      $output .= '<h3>' . t('Uses') . '</h3>';
+      $output .= '<dl>';
+      $output .= '<dt>' . t('Preparing the site') . '</dt>';
+      $output .= '<dd>' . t('You need to enable all modules on this site that are enabled on the previous site. For example, if you have used the Book module on the previous site then you must enable the Book module on this site for that data to be available on this site.') . '</dd>';
+      $output .= '<dt>' . t('Performing the upgrade') . '</dt>';
+      $output .= '<dd>' . t('On the <a href=":upgrade">Upgrade</a> page, you are guided through performing the upgrade in several steps.',
+          [':upgrade' => \Drupal::url('migrate_drupal_ui.upgrade')]) . '</dd>';
+      $output .= '<dd><ol><li>' . t('You need to enter the database credentials of the Drupal site that you want to upgrade. You can also include its files directory in the upgrade.') . '</li>';
+      $output .= '<li>' . t('The next page then provides an overview of which upgrade paths are available or missing, before you proceed to perform the upgrade.') . '</li>';
+      $output .= '<li>' . t('Lastly, a message is displayed about the number of upgrade tasks that were successful or failed.') . '</li></ol></dd>';
+      $output .= '<dt>' . t('Reviewing the upgrade log') . '</dt>';
+      $output .= '<dd>' . t('You can review a <a href=":log">log of upgrade messages</a> by clicking the link in the message provided after the upgrade or by filtering the messages for the type <em>migrate_drupal_ui</em> on the <a href=":messages">Recent log messages</a> page.',
+          [':log' => \Drupal::url('migrate_drupal_ui.log'), ':messages' => \Drupal::url('dblog.overview')]) . '</dd>';
+      $output .= '<dt>' . t('Incremental upgrades') . '</dt>';
+      $output .= '<dd>' . t('Incremental upgrades are not yet supported through the user interface.') . '</dd>';
+      $output .= '<dt>' . t('Rolling back an upgrade') . '</dt>';
+      $output .= '<dd>' . t('Rolling back an upgrade is not yet supported through the user interface.') . '</dd>';
+      $output .= '</dl>';
       return $output;
   }
 }
diff --git a/web/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/web/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 90b0b61dd..6b1fc1b39 100644
--- a/web/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/web/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -374,6 +374,10 @@ class MigrateUpgradeForm extends ConfirmFormBase {
       'source_module' => 'node',
       'destination_module' => 'node',
     ],
+    'd7_node_translation' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
     'd7_node_title_label' => [
       'source_module' => 'node',
       'destination_module' => 'node',
@@ -650,6 +654,10 @@ class MigrateUpgradeForm extends ConfirmFormBase {
       'source_module' => 'profile',
       'destination_module' => 'user',
     ],
+    'd6_i18n_user_profile_field_instance' => [
+      'source_module' => 'i18n',
+      'destination_module' => 'user',
+    ],
   ];
 
   /**
@@ -1050,7 +1058,7 @@ class MigrateUpgradeForm extends ConfirmFormBase {
     $form['missing_module_list_title'] = [
       '#type' => 'item',
       '#title' => $this->t('Missing upgrade paths'),
-      '#description' => $this->t('The following items will not be upgraded. For more information see <a href=":migrate">Upgrading from Drupal 6 or 7 to Drupal 8</a>.', array(':migrate' => 'https://www.drupal.org/upgrade/migrate')),
+      '#description' => $this->t('The following items will not be upgraded. For more information see <a href=":migrate">Upgrading from Drupal 6 or 7 to Drupal 8</a>.', [':migrate' => 'https://www.drupal.org/upgrade/migrate']),
     ];
     $form['missing_module_list'] = [
       '#type' => 'table',
diff --git a/web/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php b/web/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php
index 2401d86b3..04f2048ea 100644
--- a/web/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php
+++ b/web/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php
@@ -21,7 +21,7 @@ class MigrateAccessTest extends WebTestBase {
   /**
    * Tests that only user 1 can access the migrate UI.
    */
-  protected function testAccess() {
+  public function testAccess() {
     $this->drupalLogin($this->rootUser);
     $this->drupalGet('upgrade');
     $this->assertResponse(200);
diff --git a/web/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php b/web/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
index c139291ef..85a9e79ab 100644
--- a/web/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
+++ b/web/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
@@ -101,7 +101,7 @@ abstract class MigrateUpgradeTestBase extends WebTestBase {
   /**
    * Executes all steps of migrations upgrade.
    */
-  protected function testMigrateUpgrade() {
+  public function testMigrateUpgrade() {
     $connection_options = $this->sourceDatabase->getConnectionOptions();
     $this->drupalGet('/upgrade');
     $this->assertText('Upgrade a site by importing it into a clean and empty new install of Drupal 8. You will lose any existing configuration once you import your site into it. See the online documentation for Drupal site upgrades for more detailed information.');
@@ -162,7 +162,7 @@ abstract class MigrateUpgradeTestBase extends WebTestBase {
         $source_id_values = array_values(unserialize($source_id));
         $row = $id_map->getRowBySource($source_id_values);
         $destination = serialize($id_map->currentDestination());
-        $message = "Successful migration of $source_id to $destination as part of the {$migration->id()} migration. The source row status is " . $row['source_row_status'];
+        $message = "Migration of $source_id to $destination as part of the {$migration->id()} migration. The source row status is " . $row['source_row_status'];
         // A completed migration should have maps with
         // MigrateIdMapInterface::STATUS_IGNORED or
         // MigrateIdMapInterface::STATUS_IMPORTED.
@@ -175,6 +175,7 @@ abstract class MigrateUpgradeTestBase extends WebTestBase {
       }
     }
     \Drupal::service('module_installer')->install(['forum']);
+    \Drupal::service('module_installer')->install(['book']);
   }
 
   /**
diff --git a/web/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php b/web/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php
index 50829f026..404f21bf7 100644
--- a/web/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php
+++ b/web/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php
@@ -76,7 +76,7 @@ class MigrateUpgrade6Test extends MigrateUpgradeTestBase {
   /**
    * Executes all steps of migrations upgrade.
    */
-  protected function testMigrateUpgrade() {
+  public function testMigrateUpgrade() {
     parent::testMigrateUpgrade();
 
     // Ensure migrated users can log in.
diff --git a/web/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php b/web/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
index 77bc2ab86..86f1ca908 100644
--- a/web/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
+++ b/web/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
@@ -77,7 +77,7 @@ class MigrateUpgrade7Test extends MigrateUpgradeTestBase {
   /**
    * Executes all steps of migrations upgrade.
    */
-  protected function testMigrateUpgrade() {
+  public function testMigrateUpgrade() {
     parent::testMigrateUpgrade();
 
     // Ensure migrated users can log in.
diff --git a/web/core/modules/node/config/optional/views.view.content.yml b/web/core/modules/node/config/optional/views.view.content.yml
index eff173c1f..cef43c7ea 100644
--- a/web/core/modules/node/config/optional/views.view.content.yml
+++ b/web/core/modules/node/config/optional/views.view.content.yml
@@ -353,15 +353,87 @@ display:
           destination: true
           plugin_id: entity_operations
       filters:
-        status_extra:
-          id: status_extra
+        title:
+          id: title
           table: node_field_data
-          field: status_extra
-          operator: '='
-          value: false
-          plugin_id: node_status
+          field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
           group: 1
+          exposed: true
+          expose:
+            operator_id: title_op
+            label: Title
+            description: ''
+            use_operator: false
+            operator: title_op
+            identifier: title
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: string
           entity_type: node
+          entity_field: title
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: 'Content type'
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: bundle
+          entity_type: node
+          entity_field: type
         status:
           id: status
           table: node_field_data
@@ -408,87 +480,6 @@ display:
           plugin_id: boolean
           entity_type: node
           entity_field: status
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: type_op
-            label: 'Content type'
-            description: ''
-            use_operator: false
-            operator: type_op
-            identifier: type
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          plugin_id: bundle
-          entity_type: node
-          entity_field: type
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: title_op
-            label: Title
-            description: ''
-            use_operator: false
-            operator: title_op
-            identifier: title
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          plugin_id: string
-          entity_type: node
-          entity_field: title
         langcode:
           id: langcode
           table: node_field_data
@@ -530,6 +521,15 @@ display:
           plugin_id: language
           entity_type: node
           entity_field: langcode
+        status_extra:
+          id: status_extra
+          table: node_field_data
+          field: status_extra
+          operator: '='
+          value: false
+          plugin_id: node_status
+          group: 1
+          entity_type: node
       sorts: {  }
       title: Content
       empty:
diff --git a/web/core/modules/node/migration_templates/d7_node.yml b/web/core/modules/node/migration_templates/d7_node.yml
index 381f7ce70..5de305588 100644
--- a/web/core/modules/node/migration_templates/d7_node.yml
+++ b/web/core/modules/node/migration_templates/d7_node.yml
@@ -8,7 +8,10 @@ source:
 process:
   # If you are using this file to build a custom migration consider removing
   # the nid and vid fields to allow incremental migrations.
-  nid: nid
+  # In D7, nodes always have a tnid, but it's zero for untranslated nodes.
+  # We normalize it to equal the nid in that case.
+  # @see \Drupal\node\Plugin\migrate\source\d7\Node::prepareRow().
+  nid: tnid
   vid: vid
   langcode:
     plugin: default_value
diff --git a/web/core/modules/node/migration_templates/d7_node_translation.yml b/web/core/modules/node/migration_templates/d7_node_translation.yml
new file mode 100644
index 000000000..11dfbb792
--- /dev/null
+++ b/web/core/modules/node/migration_templates/d7_node_translation.yml
@@ -0,0 +1,42 @@
+id: d7_node_translation
+label: Node translations
+migration_tags:
+  - Drupal 7
+  - translation
+deriver: Drupal\node\Plugin\migrate\D7NodeDeriver
+source:
+  plugin: d7_node
+  translations: true
+process:
+  # If you are using this file to build a custom migration consider removing
+  # the nid field to allow incremental migrations.
+  nid: tnid
+  type: type
+  langcode:
+    plugin: default_value
+    source: language
+    default_value: "und"
+  title: title
+  uid: node_uid
+  status: status
+  created: created
+  changed: changed
+  promote: promote
+  sticky: sticky
+  revision_uid: revision_uid
+  revision_log: log
+  revision_timestamp: timestamp
+  content_translation_source: source_langcode
+destination:
+  plugin: entity:node
+  translations: true
+  content_translation_update_definitions:
+    - node
+migration_dependencies:
+  required:
+    - d7_user
+    - d7_node_type
+    - language
+  optional:
+    - d7_field_instance
+provider: migrate_drupal
diff --git a/web/core/modules/node/node.admin.inc b/web/core/modules/node/node.admin.inc
index d6ffd104d..6c3bb5fd3 100644
--- a/web/core/modules/node/node.admin.inc
+++ b/web/core/modules/node/node.admin.inc
@@ -6,7 +6,6 @@
  */
 
 use Drupal\node\NodeInterface;
-use Drupal\node\Entity\Node;
 
 /**
  * Updates all nodes in the passed-in array with the passed-in field values.
@@ -34,10 +33,10 @@ function node_mass_update(array $nodes, array $updates, $langcode = NULL, $load
   // We use batch processing to prevent timeout when updating a large number
   // of nodes.
   if (count($nodes) > 10) {
-    $batch = array(
-      'operations' => array(
-        array('_node_mass_update_batch_process', array($nodes, $updates, $langcode, $load, $revisions))
-      ),
+    $batch = [
+      'operations' => [
+        ['_node_mass_update_batch_process', [$nodes, $updates, $langcode, $load, $revisions]]
+      ],
       'finished' => '_node_mass_update_batch_finished',
       'title' => t('Processing'),
       // We use a single multi-pass operation, so the default
@@ -47,16 +46,17 @@ function node_mass_update(array $nodes, array $updates, $langcode = NULL, $load
       // The operations do not live in the .module file, so we need to
       // tell the batch engine which file to load before calling them.
       'file' => drupal_get_path('module', 'node') . '/node.admin.inc',
-    );
+    ];
     batch_set($batch);
   }
   else {
+    $storage = \Drupal::entityTypeManager()->getStorage('node');
     if ($load && !$revisions) {
-      $nodes = Node::loadMultiple($nodes);
+      $nodes = $storage->loadMultiple($nodes);
     }
     foreach ($nodes as $node) {
       if ($load && $revisions) {
-        $node = entity_revision_load('node', $node);
+        $node = $storage->loadRevision($node);
       }
       _node_mass_update_helper($node, $updates, $langcode);
     }
@@ -81,7 +81,7 @@ function node_mass_update(array $nodes, array $updates, $langcode = NULL, $load
  * @see node_mass_update()
  */
 function _node_mass_update_helper(NodeInterface $node, array $updates, $langcode = NULL) {
-  $langcodes = isset($langcode) ? array($langcode) : array_keys($node->getTranslationLanguages());
+  $langcodes = isset($langcode) ? [$langcode] : array_keys($node->getTranslationLanguages());
   // For efficiency manually save the original node before applying any changes.
   $node->original = clone $node;
   foreach ($langcodes as $langcode) {
@@ -111,7 +111,7 @@ function _node_mass_update_helper(NodeInterface $node, array $updates, $langcode
  * @param bool $revisions
  *   (optional) TRUE if $nodes contains an array of revision IDs instead of
  *   node IDs. Defaults to FALSE; will be ignored if $load is FALSE.
- * @param array|\ArrayAccess $context.
+ * @param array|\ArrayAccess $context
  *   An array of contextual key/values.
  */
 function _node_mass_update_batch_process(array $nodes, array $updates, $langcode, $load, $revisions, &$context) {
@@ -122,13 +122,14 @@ function _node_mass_update_batch_process(array $nodes, array $updates, $langcode
   }
 
   // Process nodes by groups of 5.
+  $storage = \Drupal::entityTypeManager()->getStorage('node');
   $count = min(5, count($context['sandbox']['nodes']));
   for ($i = 1; $i <= $count; $i++) {
     // For each nid, load the node, reset the values, and save it.
     $node = array_shift($context['sandbox']['nodes']);
     if ($load) {
       $node = $revisions ?
-        entity_revision_load('node', $node) : Node::load($node);
+        $storage->loadRevision($node) : $storage->load($node);
     }
     $node = _node_mass_update_helper($node, $updates, $langcode);
 
@@ -168,10 +169,10 @@ function _node_mass_update_batch_finished($success, $results, $operations) {
   else {
     drupal_set_message(t('An error occurred and processing did not complete.'), 'error');
     $message = \Drupal::translation()->formatPlural(count($results), '1 item successfully processed:', '@count items successfully processed:');
-    $item_list = array(
+    $item_list = [
       '#theme' => 'item_list',
       '#items' => $results,
-    );
+    ];
     $message .= drupal_render($item_list);
     drupal_set_message($message);
   }
diff --git a/web/core/modules/node/node.api.php b/web/core/modules/node/node.api.php
index a4937f742..604187406 100644
--- a/web/core/modules/node/node.api.php
+++ b/web/core/modules/node/node.api.php
@@ -81,10 +81,10 @@ use Drupal\Core\Access\AccessResult;
  */
 function hook_node_grants(\Drupal\Core\Session\AccountInterface $account, $op) {
   if ($account->hasPermission('access private content')) {
-    $grants['example'] = array(1);
+    $grants['example'] = [1];
   }
   if ($account->id()) {
-    $grants['example_author'] = array($account->id());
+    $grants['example_author'] = [$account->id()];
   }
   return $grants;
 }
@@ -158,33 +158,33 @@ function hook_node_access_records(\Drupal\node\NodeInterface $node) {
   // We only care about the node if it has been marked private. If not, it is
   // treated just like any other node and we completely ignore it.
   if ($node->private->value) {
-    $grants = array();
+    $grants = [];
     // Only published Catalan translations of private nodes should be viewable
     // to all users. If we fail to check $node->isPublished(), all users would be able
     // to view an unpublished node.
     if ($node->isPublished()) {
-      $grants[] = array(
+      $grants[] = [
         'realm' => 'example',
         'gid' => 1,
         'grant_view' => 1,
         'grant_update' => 0,
         'grant_delete' => 0,
         'langcode' => 'ca'
-      );
+      ];
     }
     // For the example_author array, the GID is equivalent to a UID, which
     // means there are many groups of just 1 user.
     // Note that an author can always view his or her nodes, even if they
     // have status unpublished.
     if ($node->getOwnerId()) {
-      $grants[] = array(
+      $grants[] = [
         'realm' => 'example_author',
         'gid' => $node->getOwnerId(),
         'grant_view' => 1,
         'grant_update' => 1,
         'grant_delete' => 1,
         'langcode' => 'ca'
-      );
+      ];
     }
 
     return $grants;
@@ -231,7 +231,7 @@ function hook_node_access_records_alter(&$grants, Drupal\node\NodeInterface $nod
     // Our module grants are set in $grants['example'].
     $temp = $grants['example'];
     // Now remove all module grants but our own.
-    $grants = array('example' => $temp);
+    $grants = ['example' => $temp];
   }
 }
 
@@ -280,7 +280,7 @@ function hook_node_grants_alter(&$grants, \Drupal\Core\Session\AccountInterface
     // Now check the roles for this account against the restrictions.
     foreach ($account->getRoles() as $rid) {
       if (in_array($rid, $restricted)) {
-        $grants = array();
+        $grants = [];
       }
     }
   }
@@ -374,8 +374,8 @@ function hook_node_access(\Drupal\node\NodeInterface $node, $op, \Drupal\Core\Se
  * @ingroup entity_crud
  */
 function hook_node_search_result(\Drupal\node\NodeInterface $node) {
-  $rating = db_query('SELECT SUM(points) FROM {my_rating} WHERE nid = :nid', array('nid' => $node->id()))->fetchField();
-  return array('rating' => \Drupal::translation()->formatPlural($rating, '1 point', '@count points'));
+  $rating = db_query('SELECT SUM(points) FROM {my_rating} WHERE nid = :nid', ['nid' => $node->id()])->fetchField();
+  return ['rating' => \Drupal::translation()->formatPlural($rating, '1 point', '@count points')];
 }
 
 /**
@@ -394,7 +394,7 @@ function hook_node_search_result(\Drupal\node\NodeInterface $node) {
  */
 function hook_node_update_index(\Drupal\node\NodeInterface $node) {
   $text = '';
-  $ratings = db_query('SELECT title, description FROM {my_ratings} WHERE nid = :nid', array(':nid' => $node->id()));
+  $ratings = db_query('SELECT title, description FROM {my_ratings} WHERE nid = :nid', [':nid' => $node->id()]);
   foreach ($ratings as $rating) {
     $text .= '<h2>' . Html::escape($rating->title) . '</h2>' . Xss::filter($rating->description);
   }
@@ -447,24 +447,24 @@ function hook_node_update_index(\Drupal\node\NodeInterface $node) {
 function hook_ranking() {
   // If voting is disabled, we can avoid returning the array, no hard feelings.
   if (\Drupal::config('vote.settings')->get('node_enabled')) {
-    return array(
-      'vote_average' => array(
+    return [
+      'vote_average' => [
         'title' => t('Average vote'),
         // Note that we use i.sid, the search index's search item id, rather than
         // n.nid.
-        'join' => array(
+        'join' => [
           'type' => 'LEFT',
           'table' => 'vote_node_data',
           'alias' => 'vote_node_data',
           'on' => 'vote_node_data.nid = i.sid',
-        ),
+        ],
         // The highest possible score should be 1, and the lowest possible score,
         // always 0, should be 0.
         'score' => 'vote_node_data.average / CAST(%f AS DECIMAL)',
         // Pass in the highest possible voting score as a decimal argument.
-        'arguments' => array(\Drupal::config('vote.settings')->get('score_max')),
-      ),
-    );
+        'arguments' => [\Drupal::config('vote.settings')->get('score_max')],
+      ],
+    ];
   }
 }
 
@@ -486,16 +486,16 @@ function hook_ranking() {
  * @see entity_crud
  */
 function hook_node_links_alter(array &$links, NodeInterface $entity, array &$context) {
-  $links['mymodule'] = array(
+  $links['mymodule'] = [
     '#theme' => 'links__node__mymodule',
-    '#attributes' => array('class' => array('links', 'inline')),
-    '#links' => array(
-      'node-report' => array(
+    '#attributes' => ['class' => ['links', 'inline']],
+    '#links' => [
+      'node-report' => [
         'title' => t('Report'),
         'url' => Url::fromRoute('node_test.report', ['node' => $entity->id()], ['query' => ['token' => \Drupal::getContainer()->get('csrf_token')->get("node/{$entity->id()}/report")]]),
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 }
 
 /**
diff --git a/web/core/modules/node/node.install b/web/core/modules/node/node.install
index c754880f0..4e2c24098 100644
--- a/web/core/modules/node/node.install
+++ b/web/core/modules/node/node.install
@@ -5,6 +5,7 @@
  * Install, update and uninstall functions for the node module.
  */
 
+use Drupal\Core\Database\Database;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\user\RoleInterface;
 
@@ -12,26 +13,26 @@ use Drupal\user\RoleInterface;
  * Implements hook_requirements().
  */
 function node_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
   if ($phase === 'runtime') {
     // Only show rebuild button if there are either 0, or 2 or more, rows
     // in the {node_access} table, or if there are modules that
     // implement hook_node_grants().
     $grant_count = \Drupal::entityManager()->getAccessControlHandler('node')->countGrants();
     if ($grant_count != 1 || count(\Drupal::moduleHandler()->getImplementations('node_grants')) > 0) {
-      $value = \Drupal::translation()->formatPlural($grant_count, 'One permission in use', '@count permissions in use', array('@count' => $grant_count));
+      $value = \Drupal::translation()->formatPlural($grant_count, 'One permission in use', '@count permissions in use', ['@count' => $grant_count]);
     }
     else {
       $value = t('Disabled');
     }
 
-    $requirements['node_access'] = array(
+    $requirements['node_access'] = [
       'title' => t('Node Access Permissions'),
       'value' => $value,
-      'description' => t('If the site is experiencing problems with permissions to content, you may have to rebuild the permissions cache. Rebuilding will remove all privileges to content and replace them with permissions based on the current modules and settings. Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed, content will automatically use the new permissions. <a href=":rebuild">Rebuild permissions</a>', array(
+      'description' => t('If the site is experiencing problems with permissions to content, you may have to rebuild the permissions cache. Rebuilding will remove all privileges to content and replace them with permissions based on the current modules and settings. Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed, content will automatically use the new permissions. <a href=":rebuild">Rebuild permissions</a>', [
         ':rebuild' => \Drupal::url('node.configure_rebuild_confirm'),
-      )),
-    );
+      ]),
+    ];
   }
   return $requirements;
 }
@@ -40,77 +41,78 @@ function node_requirements($phase) {
  * Implements hook_schema().
  */
 function node_schema() {
-  $schema['node_access'] = array(
+  $schema['node_access'] = [
     'description' => 'Identifies which realm/grant pairs a user must possess in order to view, update, or delete specific nodes.',
-    'fields' => array(
-      'nid' => array(
+    'fields' => [
+      'nid' => [
         'description' => 'The {node}.nid this record affects.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'langcode' => array(
+      ],
+      'langcode' => [
         'description' => 'The {language}.langcode of this node.',
         'type' => 'varchar_ascii',
         'length' => 12,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'fallback' => array(
+      ],
+      'fallback' => [
         'description' => 'Boolean indicating whether this record should be used as a fallback if a language condition is not provided.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 1,
-      ),
-      'gid' => array(
+        'size' => 'tiny',
+      ],
+      'gid' => [
         'description' => "The grant ID a user must possess in the specified realm to gain this row's privileges on the node.",
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'realm' => array(
+      ],
+      'realm' => [
         'description' => 'The realm in which the user must possess the grant ID. Each node access node can define one or more realms.',
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'grant_view' => array(
+      ],
+      'grant_view' => [
         'description' => 'Boolean indicating whether a user with the realm/grant pair can view this node.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'size' => 'tiny',
-      ),
-      'grant_update' => array(
+      ],
+      'grant_update' => [
         'description' => 'Boolean indicating whether a user with the realm/grant pair can edit this node.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'size' => 'tiny',
-      ),
-      'grant_delete' => array(
+      ],
+      'grant_delete' => [
         'description' => 'Boolean indicating whether a user with the realm/grant pair can delete this node.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'size' => 'tiny',
-      ),
-    ),
-    'primary key' => array('nid', 'gid', 'realm', 'langcode'),
-    'foreign keys' => array(
-      'affected_node' => array(
+      ],
+    ],
+    'primary key' => ['nid', 'gid', 'realm', 'langcode'],
+    'foreign keys' => [
+      'affected_node' => [
         'table' => 'node',
-        'columns' => array('nid' => 'nid'),
-      ),
-    ),
-  );
+        'columns' => ['nid' => 'nid'],
+      ],
+    ],
+  ];
 
   return $schema;
 }
@@ -127,20 +129,20 @@ function node_install() {
   // these permissions. Doing so also allows tests to continue to operate as
   // expected without first having to manually grant these default permissions.
   if (\Drupal::moduleHandler()->moduleExists('user')) {
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access content'));
-    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('access content'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access content']);
+    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['access content']);
   }
 
   // Populate the node access table.
   db_insert('node_access')
-    ->fields(array(
+    ->fields([
       'nid' => 0,
       'gid' => 0,
       'realm' => 'all',
       'grant_view' => 1,
       'grant_update' => 0,
       'grant_delete' => 0,
-    ))
+    ])
     ->execute();
 }
 
@@ -164,11 +166,11 @@ function node_update_8001() {
   // \Drupal::entityDefinitionUpdateManager()->updateFieldStorageDefinition()
   // with the new definition.
   $storage_definition = BaseFieldDefinition::create('boolean')
-      ->setLabel(t('Revision translation affected'))
-      ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.'))
-      ->setReadOnly(TRUE)
-      ->setRevisionable(TRUE)
-      ->setTranslatable(TRUE);
+    ->setLabel(t('Revision translation affected'))
+    ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.'))
+    ->setReadOnly(TRUE)
+    ->setRevisionable(TRUE)
+    ->setTranslatable(TRUE);
 
   \Drupal::entityDefinitionUpdateManager()
     ->installFieldStorageDefinition('revision_translation_affected', 'node', 'node', $storage_definition);
@@ -214,7 +216,33 @@ function node_update_8003() {
   //   changes. SqlContentEntityStorageSchema::onEntityTypeUpdate() should be
   //   fixed to automatically handle this.
   //   See https://www.drupal.org/node/2554245.
-  foreach (array('status', 'uid') as $field_name) {
+  foreach (['status', 'uid'] as $field_name) {
     $manager->updateFieldStorageDefinition($manager->getFieldStorageDefinition($field_name, 'node'));
   }
 }
+
+/**
+ * Change {node_access}.fallback from an int to a tinyint as it is a boolean.
+ */
+function node_update_8300() {
+  Database::getConnection()->schema()->changeField('node_access', 'fallback', 'fallback', [
+    'description' => 'Boolean indicating whether this record should be used as a fallback if a language condition is not provided.',
+    'type' => 'int',
+    'unsigned' => TRUE,
+    'not null' => TRUE,
+    'default' => 1,
+    'size' => 'tiny',
+  ]);
+}
+
+/**
+ * Set the 'published' entity key.
+ */
+function node_update_8301() {
+  $definition_update_manager = \Drupal::entityDefinitionUpdateManager();
+  $entity_type = $definition_update_manager->getEntityType('node');
+  $keys = $entity_type->getKeys();
+  $keys['published'] = 'status';
+  $entity_type->set('entity_keys', $keys);
+  $definition_update_manager->updateEntityType($entity_type);
+}
diff --git a/web/core/modules/node/node.js b/web/core/modules/node/node.js
index 98af6fdc1..086263d2a 100644
--- a/web/core/modules/node/node.js
+++ b/web/core/modules/node/node.js
@@ -18,21 +18,6 @@
   Drupal.behaviors.nodeDetailsSummaries = {
     attach: function (context) {
       var $context = $(context);
-      $context.find('.node-form-revision-information').drupalSetSummary(function (context) {
-        var $revisionContext = $(context);
-        var revisionCheckbox = $revisionContext.find('.js-form-item-revision input');
-
-          // Return 'New revision' if the 'Create new revision' checkbox is
-          // checked, or if the checkbox doesn't exist, but the revision log does.
-          // For users without the "Administer content" permission the checkbox
-          // won't appear, but the revision log will if the content type is set to
-          // auto-revision.
-        if (revisionCheckbox.is(':checked') || (!revisionCheckbox.length && $revisionContext.find('.js-form-item-revision-log textarea').length)) {
-          return Drupal.t('New revision');
-        }
-
-        return Drupal.t('No revision');
-      });
 
       $context.find('.node-form-author').drupalSetSummary(function (context) {
         var $authorContext = $(context);
@@ -64,22 +49,6 @@
           return Drupal.t('Not promoted');
         }
       });
-
-      $context.find('fieldset.node-translation-options').drupalSetSummary(function (context) {
-        var $translationContext = $(context);
-        var translate;
-        var $checkbox = $translationContext.find('.js-form-item-translation-translate input');
-
-        if ($checkbox.size()) {
-          translate = $checkbox.is(':checked') ? Drupal.t('Needs to be updated') : Drupal.t('Does not need to be updated');
-        }
-        else {
-          $checkbox = $translationContext.find('.js-form-item-translation-retranslate input');
-          translate = $checkbox.is(':checked') ? Drupal.t('Flag other translations as outdated') : Drupal.t('Do not flag other translations as outdated');
-        }
-
-        return translate;
-      });
     }
   };
 
diff --git a/web/core/modules/node/node.libraries.yml b/web/core/modules/node/node.libraries.yml
index 22c93ac7f..59947a237 100644
--- a/web/core/modules/node/node.libraries.yml
+++ b/web/core/modules/node/node.libraries.yml
@@ -6,10 +6,8 @@ drupal.node:
   js:
     node.js: {}
   dependencies:
-    - core/jquery
-    - core/drupal
+    - core/drupal.entity-form
     - core/drupalSettings
-    - core/drupal.form
 
 drupal.node.preview:
   version: VERSION
diff --git a/web/core/modules/node/node.module b/web/core/modules/node/node.module
index 470ddfcb0..40e5b4e29 100644
--- a/web/core/modules/node/node.module
+++ b/web/core/modules/node/node.module
@@ -31,31 +31,49 @@ use Drupal\node\NodeTypeInterface;
 
 /**
  * Denotes that the node is not published.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.x.
+ *   Use \Drupal\node\NodeInterface::NOT_PUBLISHED instead.
  */
 const NODE_NOT_PUBLISHED = 0;
 
 /**
  * Denotes that the node is published.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.x.
+ *   Use \Drupal\node\NodeInterface::PUBLISHED instead.
  */
 const NODE_PUBLISHED = 1;
 
 /**
  * Denotes that the node is not promoted to the front page.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.x.
+ *   Use \Drupal\node\NodeInterface::NOT_PROMOTED instead.
  */
 const NODE_NOT_PROMOTED = 0;
 
 /**
  * Denotes that the node is promoted to the front page.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.x.
+ *   Use \Drupal\node\NodeInterface::PROMOTED instead.
  */
 const NODE_PROMOTED = 1;
 
 /**
  * Denotes that the node is not sticky at the top of the page.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.x.
+ *   Use \Drupal\node\NodeInterface::NOT_STICKY instead.
  */
 const NODE_NOT_STICKY = 0;
 
 /**
  * Denotes that the node is sticky at the top of the page.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.x.
+ *   Use \Drupal\node\NodeInterface::STICKY instead.
  */
 const NODE_STICKY = 1;
 
@@ -72,7 +90,7 @@ function node_help($route_name, RouteMatchInterface $route_match) {
       $message = t('The content access permissions need to be rebuilt.');
     }
     else {
-      $message = t('The content access permissions need to be rebuilt. <a href=":node_access_rebuild">Rebuild permissions</a>.', array(':node_access_rebuild' => \Drupal::url('node.configure_rebuild_confirm')));
+      $message = t('The content access permissions need to be rebuilt. <a href=":node_access_rebuild">Rebuild permissions</a>.', [':node_access_rebuild' => \Drupal::url('node.configure_rebuild_confirm')]);
     }
     drupal_set_message($message, 'error');
   }
@@ -81,19 +99,19 @@ function node_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.node':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Node module manages the creation, editing, deletion, settings, and display of the main site content. Content items managed by the Node module are typically displayed as pages on your site, and include a title, some meta-data (author, creation time, content type, etc.), and optional fields containing text or other data (fields are managed by the <a href=":field">Field module</a>). For more information, see the <a href=":node">online documentation for the Node module</a>.', array(':node' => 'https://www.drupal.org/documentation/modules/node', ':field' => \Drupal::url('help.page', array('name' => 'field')))) . '</p>';
+      $output .= '<p>' . t('The Node module manages the creation, editing, deletion, settings, and display of the main site content. Content items managed by the Node module are typically displayed as pages on your site, and include a title, some meta-data (author, creation time, content type, etc.), and optional fields containing text or other data (fields are managed by the <a href=":field">Field module</a>). For more information, see the <a href=":node">online documentation for the Node module</a>.', [':node' => 'https://www.drupal.org/documentation/modules/node', ':field' => \Drupal::url('help.page', ['name' => 'field'])]) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Creating content') . '</dt>';
-      $output .= '<dd>' . t('When new content is created, the Node module records basic information about the content, including the author, date of creation, and the <a href=":content-type">Content type</a>. It also manages the <em>publishing options</em>, which define whether or not the content is published, promoted to the front page of the site, and/or sticky at the top of content lists. Default settings can be configured for each <a href=":content-type">type of content</a> on your site.', array(':content-type' => \Drupal::url('entity.node_type.collection'))) . '</dd>';
+      $output .= '<dd>' . t('When new content is created, the Node module records basic information about the content, including the author, date of creation, and the <a href=":content-type">Content type</a>. It also manages the <em>publishing options</em>, which define whether or not the content is published, promoted to the front page of the site, and/or sticky at the top of content lists. Default settings can be configured for each <a href=":content-type">type of content</a> on your site.', [':content-type' => \Drupal::url('entity.node_type.collection')]) . '</dd>';
       $output .= '<dt>' . t('Creating custom content types') . '</dt>';
-      $output .= '<dd>' . t('The Node module gives users with the <em>Administer content types</em> permission the ability to <a href=":content-new">create new content types</a> in addition to the default ones already configured. Creating custom content types gives you the flexibility to add <a href=":field">fields</a> and configure default settings that suit the differing needs of various site content.', array(':content-new' => \Drupal::url('node.type_add'), ':field' => \Drupal::url('help.page', array('name' => 'field')))) . '</dd>';
+      $output .= '<dd>' . t('The Node module gives users with the <em>Administer content types</em> permission the ability to <a href=":content-new">create new content types</a> in addition to the default ones already configured. Creating custom content types gives you the flexibility to add <a href=":field">fields</a> and configure default settings that suit the differing needs of various site content.', [':content-new' => \Drupal::url('node.type_add'), ':field' => \Drupal::url('help.page', ['name' => 'field'])]) . '</dd>';
       $output .= '<dt>' . t('Administering content') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":content">Content</a> page lists your content, allowing you add new content, filter, edit or delete existing content, or perform bulk operations on existing content.', array(':content' => \Drupal::url('system.admin_content'))) . '</dd>';
+      $output .= '<dd>' . t('The <a href=":content">Content</a> page lists your content, allowing you add new content, filter, edit or delete existing content, or perform bulk operations on existing content.', [':content' => \Drupal::url('system.admin_content')]) . '</dd>';
       $output .= '<dt>' . t('Creating revisions') . '</dt>';
       $output .= '<dd>' . t('The Node module also enables you to create multiple versions of any content, and revert to older versions using the <em>Revision information</em> settings.') . '</dd>';
       $output .= '<dt>' . t('User permissions') . '</dt>';
-      $output .= '<dd>' . t('The Node module makes a number of permissions available for each content type, which can be set by role on the <a href=":permissions">permissions page</a>.', array(':permissions' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-node')))) . '</dd>';
+      $output .= '<dd>' . t('The Node module makes a number of permissions available for each content type, which can be set by role on the <a href=":permissions">permissions page</a>.', [':permissions' => \Drupal::url('user.admin_permissions', [], ['fragment' => 'module-node'])]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -103,13 +121,13 @@ function node_help($route_name, RouteMatchInterface $route_match) {
     case 'entity.entity_form_display.node.default':
     case 'entity.entity_form_display.node.form_mode':
       $type = $route_match->getParameter('node_type');
-      return '<p>' . t('Content items can be edited using different form modes. Here, you can define which fields are shown and hidden when %type content is edited in each form mode, and define how the field form widgets are displayed in each form mode.', array('%type' => $type->label())) . '</p>' ;
+      return '<p>' . t('Content items can be edited using different form modes. Here, you can define which fields are shown and hidden when %type content is edited in each form mode, and define how the field form widgets are displayed in each form mode.', ['%type' => $type->label()]) . '</p>' ;
 
     case 'entity.entity_view_display.node.default':
     case 'entity.entity_view_display.node.view_mode':
       $type = $route_match->getParameter('node_type');
       return '<p>' . t('Content items can be displayed using different view modes: Teaser, Full content, Print, RSS, etc. <em>Teaser</em> is a short format that is typically used in lists of multiple content items. <em>Full content</em> is typically used when the content is displayed on its own page.') . '</p>' .
-        '<p>' . t('Here, you can define which fields are shown and hidden when %type content is displayed in each view mode, and define how the fields are displayed in each view mode.', array('%type' => $type->label())) . '</p>';
+        '<p>' . t('Here, you can define which fields are shown and hidden when %type content is displayed in each view mode, and define how the fields are displayed in each view mode.', ['%type' => $type->label()]) . '</p>';
 
     case 'entity.node.version_history':
       return '<p>' . t('Revisions allow you to track differences between multiple versions of your content, and revert to older versions.') . '</p>';
@@ -131,26 +149,26 @@ function node_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function node_theme() {
-  return array(
-    'node' => array(
+  return [
+    'node' => [
       'render element' => 'elements',
-    ),
-    'node_add_list' => array(
-      'variables' => array('content' => NULL),
-    ),
-    'node_edit_form' => array(
+    ],
+    'node_add_list' => [
+      'variables' => ['content' => NULL],
+    ],
+    'node_edit_form' => [
       'render element' => 'form',
-    ),
-    'field__node__title' => array(
+    ],
+    'field__node__title' => [
       'base hook' => 'field',
-    ),
-    'field__node__uid' => array(
+    ],
+    'field__node__uid' => [
       'base hook' => 'field',
-    ),
-    'field__node__created' => array(
+    ],
+    'field__node__created' => [
       'base hook' => 'field',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -186,19 +204,19 @@ function node_entity_view_display_alter(EntityViewDisplayInterface $display, $co
  *   $result, or FALSE if there are no rows in $result.
  */
 function node_title_list(StatementInterface $result, $title = NULL) {
-  $items = array();
+  $items = [];
   $num_rows = FALSE;
   $nids = [];
   foreach ($result as $row) {
     // Do not use $node->label() or $node->urlInfo() here, because we only have
     // database rows, not actual nodes.
     $nids[] = $row->nid;
-    $options = !empty($row->comment_count) ? array('attributes' => array('title' => \Drupal::translation()->formatPlural($row->comment_count, '1 comment', '@count comments'))) : array();
+    $options = !empty($row->comment_count) ? ['attributes' => ['title' => \Drupal::translation()->formatPlural($row->comment_count, '1 comment', '@count comments')]] : [];
     $items[] = \Drupal::l($row->title, new Url('entity.node.canonical', ['node' => $row->nid], $options));
     $num_rows = TRUE;
   }
 
-  return $num_rows ? array('#theme' => 'item_list__node', '#items' => $items, '#title' => $title, '#cache' => ['tags' => Cache::mergeTags(['node_list'], Cache::buildTags('node', $nids))]) : FALSE;
+  return $num_rows ? ['#theme' => 'item_list__node', '#items' => $items, '#title' => $title, '#cache' => ['tags' => Cache::mergeTags(['node_list'], Cache::buildTags('node', $nids))]] : FALSE;
 }
 
 /**
@@ -214,7 +232,7 @@ function node_title_list(StatementInterface $result, $title = NULL) {
  */
 function node_mark($nid, $timestamp) {
 
-  $cache = &drupal_static(__FUNCTION__, array());
+  $cache = &drupal_static(__FUNCTION__, []);
 
   if (\Drupal::currentUser()->isAnonymous() || !\Drupal::moduleHandler()->moduleExists('history')) {
     return MARK_READ;
@@ -328,23 +346,23 @@ function node_add_body_field(NodeTypeInterface $type, $label = 'Body') {
       'field_storage' => $field_storage,
       'bundle' => $type->id(),
       'label' => $label,
-      'settings' => array('display_summary' => TRUE),
+      'settings' => ['display_summary' => TRUE],
     ]);
     $field->save();
 
     // Assign widget settings for the 'default' form mode.
     entity_get_form_display('node', $type->id(), 'default')
-      ->setComponent('body', array(
+      ->setComponent('body', [
         'type' => 'text_textarea_with_summary',
-      ))
+      ])
       ->save();
 
     // Assign display settings for the 'default' and 'teaser' view modes.
     entity_get_display('node', $type->id(), 'default')
-      ->setComponent('body', array(
+      ->setComponent('body', [
         'label' => 'hidden',
         'type' => 'text_default',
-      ))
+      ])
       ->save();
 
     // The teaser view mode is created by the Standard profile and therefore
@@ -352,10 +370,10 @@ function node_add_body_field(NodeTypeInterface $type, $label = 'Body') {
     $view_modes = \Drupal::entityManager()->getViewModes('node');
     if (isset($view_modes['teaser'])) {
       entity_get_display('node', $type->id(), 'teaser')
-        ->setComponent('body', array(
+        ->setComponent('body', [
           'label' => 'hidden',
           'type' => 'text_summary_or_trimmed',
-        ))
+        ])
         ->save();
     }
   }
@@ -367,15 +385,15 @@ function node_add_body_field(NodeTypeInterface $type, $label = 'Body') {
  * Implements hook_entity_extra_field_info().
  */
 function node_entity_extra_field_info() {
-  $extra = array();
+  $extra = [];
   $description = t('Node module element');
   foreach (NodeType::loadMultiple() as $bundle) {
-    $extra['node'][$bundle->id()]['display']['links'] = array(
+    $extra['node'][$bundle->id()]['display']['links'] = [
       'label' => t('Links'),
       'description' => $description,
       'weight' => 100,
       'visible' => TRUE,
-    );
+    ];
   }
 
   return $extra;
@@ -442,7 +460,7 @@ function node_load_multiple(array $nids = NULL, $reset = FALSE) {
  */
 function node_load($nid = NULL, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorage('node')->resetCache(array($nid));
+    \Drupal::entityManager()->getStorage('node')->resetCache([$nid]);
   }
   return Node::load($nid);
 }
@@ -457,7 +475,7 @@ function node_load($nid = NULL, $reset = FALSE) {
  *   A fully-populated node entity, or NULL if the node is not found.
  */
 function node_revision_load($vid = NULL) {
-  return entity_revision_load('node', $vid);
+  return \Drupal::entityTypeManager()->getStorage('node')->loadRevision($vid);
 }
 
 /**
@@ -499,16 +517,16 @@ function node_is_page(NodeInterface $node) {
  * @see node_add_page()
  */
 function template_preprocess_node_add_list(&$variables) {
-  $variables['types'] = array();
+  $variables['types'] = [];
   if (!empty($variables['content'])) {
     foreach ($variables['content'] as $type) {
-      $variables['types'][$type->id()] = array(
+      $variables['types'][$type->id()] = [
         'type' => $type->id(),
-        'add_link' => \Drupal::l($type->label(), new Url('node.add', array('node_type' => $type->id()))),
-        'description' => array(
+        'add_link' => \Drupal::l($type->label(), new Url('node.add', ['node_type' => $type->id()])),
+        'description' => [
           '#markup' => $type->getDescription(),
-        ),
-      );
+        ],
+      ];
     }
   }
 }
@@ -540,7 +558,7 @@ function node_preprocess_block(&$variables) {
  * Implements hook_theme_suggestions_HOOK().
  */
 function node_theme_suggestions_node(array $variables) {
-  $suggestions = array();
+  $suggestions = [];
   $node = $variables['elements']['#node'];
   $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
 
@@ -580,18 +598,18 @@ function template_preprocess_node(&$variables) {
   $variables['author_name'] = drupal_render($variables['elements']['uid']);
   unset($variables['elements']['uid']);
 
-  $variables['url'] = $node->url('canonical', array(
+  $variables['url'] = $node->url('canonical', [
     'language' => $node->language(),
-  ));
+  ]);
   $variables['label'] = $variables['elements']['title'];
   unset($variables['elements']['title']);
   // The 'page' variable is set to TRUE in two occasions:
   //   - The view mode is 'full' and we are on the 'node.view' route.
   //   - The node is in preview and view mode is either 'full' or 'default'.
-  $variables['page'] = ($variables['view_mode'] == 'full' && (node_is_page($node)) || (isset($node->in_preview) && in_array($node->preview_view_mode, array('full', 'default'))));
+  $variables['page'] = ($variables['view_mode'] == 'full' && (node_is_page($node)) || (isset($node->in_preview) && in_array($node->preview_view_mode, ['full', 'default'])));
 
   // Helpful $content variable for templates.
-  $variables += array('content' => array());
+  $variables += ['content' => []];
   foreach (Element::children($variables['elements']) as $key) {
     $variables['content'][$key] = $variables['elements'][$key];
   }
@@ -630,10 +648,10 @@ function node_cron() {
       ->execute();
     if (isset($result[0])) {
       // Make an array with definite keys and store it in the state system.
-      $array = array(
+      $array = [
         'min_created' => $result[0][$min_alias],
         'max_created' => $result[0][$max_alias],
-      );
+      ];
       \Drupal::state()->set('node.min_max_update_time', $array);
     }
   }
@@ -644,35 +662,35 @@ function node_cron() {
  */
 function node_ranking() {
   // Create the ranking array and add the basic ranking options.
-  $ranking = array(
-    'relevance' => array(
+  $ranking = [
+    'relevance' => [
       'title' => t('Keyword relevance'),
       // Average relevance values hover around 0.15
       'score' => 'i.relevance',
-    ),
-    'sticky' => array(
+    ],
+    'sticky' => [
       'title' => t('Content is sticky at top of lists'),
       // The sticky flag is either 0 or 1, which is automatically normalized.
       'score' => 'n.sticky',
-    ),
-    'promote' => array(
+    ],
+    'promote' => [
       'title' => t('Content is promoted to the front page'),
       // The promote flag is either 0 or 1, which is automatically normalized.
       'score' => 'n.promote',
-    ),
-  );
+    ],
+  ];
   // Add relevance based on updated date, but only if it the scale values have
   // been calculated in node_cron().
   if ($node_min_max = \Drupal::state()->get('node.min_max_update_time')) {
-    $ranking['recent'] = array(
+    $ranking['recent'] = [
       'title' => t('Recently created'),
       // Exponential decay with half life of 14% of the age range of nodes.
       'score' => 'EXP(-5 * (1 - (n.created - :node_oldest) / :node_range))',
-      'arguments' => array(
+      'arguments' => [
         ':node_oldest' => $node_min_max['min_created'],
         ':node_range' => max($node_min_max['max_created'] - $node_min_max['min_created'], 1),
-      ),
-    );
+      ],
+    ];
   }
   return $ranking;
 }
@@ -688,17 +706,17 @@ function node_user_cancel($edit, $account, $method) {
         ->condition('uid', $account->id())
         ->execute();
       module_load_include('inc', 'node', 'node.admin');
-      node_mass_update($nids, array('status' => 0), NULL, TRUE);
+      node_mass_update($nids, ['status' => 0], NULL, TRUE);
       break;
 
     case 'user_cancel_reassign':
       // Anonymize all of the nodes for this old account.
       module_load_include('inc', 'node', 'node.admin');
       $vids = \Drupal::entityManager()->getStorage('node')->userRevisionIds($account);
-      node_mass_update($vids, array(
+      node_mass_update($vids, [
         'uid' => 0,
         'revision_uid' => 0,
-      ), NULL, TRUE, TRUE);
+      ], NULL, TRUE, TRUE);
       break;
   }
 }
@@ -711,6 +729,7 @@ function node_user_predelete($account) {
   // @todo Introduce node_mass_delete() or make node_mass_update() more flexible.
   $nids = \Drupal::entityQuery('node')
     ->condition('uid', $account->id())
+    ->accessCheck(FALSE)
     ->execute();
   entity_delete_multiple('node', $nids);
   // Delete old revisions.
@@ -741,15 +760,15 @@ function node_get_recent($number = 10) {
     // have some unpublished nodes to view before adding the condition.
     $access_query = \Drupal::entityQuery('node')
       ->condition('uid', $account->id())
-      ->condition('status', NODE_NOT_PUBLISHED);
+      ->condition('status', NodeInterface::NOT_PUBLISHED);
     if ($account->hasPermission('view own unpublished content') && ($own_unpublished = $access_query->execute())) {
       $query->orConditionGroup()
-        ->condition('status', NODE_PUBLISHED)
+        ->condition('status', NodeInterface::PUBLISHED)
         ->condition('nid', $own_unpublished, 'IN');
     }
     else {
       // If not, restrict the query to published nodes.
-      $query->condition('status', NODE_PUBLISHED);
+      $query->condition('status', NodeInterface::PUBLISHED);
     }
   }
   $nids = $query
@@ -760,7 +779,7 @@ function node_get_recent($number = 10) {
 
   $nodes = Node::loadMultiple($nids);
 
-  return $nodes ? $nodes : array();
+  return $nodes ? $nodes : [];
 }
 
 /**
@@ -806,12 +825,12 @@ function node_page_top(array &$page) {
   // Add 'Back to content editing' link on preview page.
   $route_match = \Drupal::routeMatch();
   if ($route_match->getRouteName() == 'entity.node.preview') {
-    $page['page_top']['node_preview'] = array(
+    $page['page_top']['node_preview'] = [
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('node-preview-container', 'container-inline')
-      ),
-    );
+      '#attributes' => [
+        'class' => ['node-preview-container', 'container-inline']
+      ],
+    ];
 
     $form = \Drupal::formBuilder()->getForm('\Drupal\node\Form\NodePreviewForm', $route_match->getParameter('node_preview'));
     $page['page_top']['node_preview']['view_mode'] = $form;
@@ -826,12 +845,12 @@ function node_page_top(array &$page) {
  * @see node_form_system_themes_admin_form_submit()
  */
 function node_form_system_themes_admin_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  $form['admin_theme']['use_admin_theme'] = array(
+  $form['admin_theme']['use_admin_theme'] = [
     '#type' => 'checkbox',
     '#title' => t('Use the administration theme when editing or creating content'),
-    '#description' => t('Control which roles can "View the administration theme" on the <a href=":permissions">Permissions page</a>.', array(':permissions' => Url::fromRoute('user.admin_permissions')->toString())),
+    '#description' => t('Control which roles can "View the administration theme" on the <a href=":permissions">Permissions page</a>.', [':permissions' => Url::fromRoute('user.admin_permissions')->toString()]),
     '#default_value' => \Drupal::configFactory()->getEditable('node.settings')->get('use_admin_theme'),
-  );
+  ];
   $form['#submit'][] = 'node_form_system_themes_admin_form_submit';
 }
 
@@ -951,11 +970,11 @@ function node_node_access(NodeInterface $node, $op, $account) {
  */
 function node_access_grants($op, AccountInterface $account) {
   // Fetch node access grants from other modules.
-  $grants = \Drupal::moduleHandler()->invokeAll('node_grants', array($account, $op));
+  $grants = \Drupal::moduleHandler()->invokeAll('node_grants', [$account, $op]);
   // Allow modules to alter the assigned grants.
   \Drupal::moduleHandler()->alter('node_grants', $grants, $account, $op);
 
-  return array_merge(array('all' => array(0)), $grants);
+  return array_merge(['all' => [0]], $grants);
 }
 
 /**
@@ -1149,13 +1168,13 @@ function node_access_rebuild($batch_mode = FALSE) {
   // Only recalculate if the site is using a node_access module.
   if (count(\Drupal::moduleHandler()->getImplementations('node_grants'))) {
     if ($batch_mode) {
-      $batch = array(
+      $batch = [
         'title' => t('Rebuilding content access permissions'),
-        'operations' => array(
-          array('_node_access_rebuild_batch_operation', array()),
-        ),
+        'operations' => [
+          ['_node_access_rebuild_batch_operation', []],
+        ],
         'finished' => '_node_access_rebuild_batch_finished'
-      );
+      ];
       batch_set($batch);
     }
     else {
@@ -1173,7 +1192,7 @@ function node_access_rebuild($batch_mode = FALSE) {
       $entity_query->accessCheck(FALSE);
       $nids = $entity_query->execute();
       foreach ($nids as $nid) {
-        $node_storage->resetCache(array($nid));
+        $node_storage->resetCache([$nid]);
         $node = Node::load($nid);
         // To preserve database integrity, only write grants if the node
         // loads successfully.
diff --git a/web/core/modules/node/node.tokens.inc b/web/core/modules/node/node.tokens.inc
index 81fa3f088..2fcf0ddfa 100644
--- a/web/core/modules/node/node.tokens.inc
+++ b/web/core/modules/node/node.tokens.inc
@@ -14,71 +14,71 @@ use Drupal\user\Entity\User;
  * Implements hook_token_info().
  */
 function node_token_info() {
-  $type = array(
+  $type = [
     'name' => t('Nodes'),
     'description' => t('Tokens related to individual content items, or "nodes".'),
     'needs-data' => 'node',
-  );
+  ];
 
   // Core tokens for nodes.
-  $node['nid'] = array(
+  $node['nid'] = [
     'name' => t("Content ID"),
     'description' => t('The unique ID of the content item, or "node".'),
-  );
-  $node['vid'] = array(
+  ];
+  $node['vid'] = [
     'name' => t("Revision ID"),
     'description' => t("The unique ID of the node's latest revision."),
-  );
-  $node['type'] = array(
+  ];
+  $node['type'] = [
     'name' => t("Content type"),
-  );
-  $node['type-name'] = array(
+  ];
+  $node['type-name'] = [
     'name' => t("Content type name"),
     'description' => t("The human-readable name of the node type."),
-  );
-  $node['title'] = array(
+  ];
+  $node['title'] = [
     'name' => t("Title"),
-  );
-  $node['body'] = array(
+  ];
+  $node['body'] = [
     'name' => t("Body"),
     'description' => t("The main body text of the node."),
-  );
-  $node['summary'] = array(
+  ];
+  $node['summary'] = [
     'name' => t("Summary"),
     'description' => t("The summary of the node's main body text."),
-  );
-  $node['langcode'] = array(
+  ];
+  $node['langcode'] = [
     'name' => t('Language code'),
     'description' => t('The language code of the language the node is written in.'),
-  );
-  $node['url'] = array(
+  ];
+  $node['url'] = [
     'name' => t("URL"),
     'description' => t("The URL of the node."),
-  );
-  $node['edit-url'] = array(
+  ];
+  $node['edit-url'] = [
     'name' => t("Edit URL"),
     'description' => t("The URL of the node's edit page."),
-  );
+  ];
 
   // Chained tokens for nodes.
-  $node['created'] = array(
+  $node['created'] = [
     'name' => t("Date created"),
     'type' => 'date',
-  );
-  $node['changed'] = array(
+  ];
+  $node['changed'] = [
     'name' => t("Date changed"),
     'description' => t("The date the node was most recently updated."),
     'type' => 'date',
-  );
-  $node['author'] = array(
+  ];
+  $node['author'] = [
     'name' => t("Author"),
     'type' => 'user',
-  );
+  ];
 
-  return array(
-    'types' => array('node' => $type),
-    'tokens' => array('node' => $node),
-  );
+  return [
+    'types' => ['node' => $type],
+    'tokens' => ['node' => $node],
+  ];
 }
 
 /**
@@ -87,7 +87,7 @@ function node_token_info() {
 function node_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
-  $url_options = array('absolute' => TRUE);
+  $url_options = ['absolute' => TRUE];
   if (isset($options['langcode'])) {
     $url_options['language'] = \Drupal::languageManager()->getLanguage($options['langcode']);
     $langcode = $options['langcode'];
@@ -95,7 +95,7 @@ function node_tokens($type, $tokens, array $data, array $options, BubbleableMeta
   else {
     $langcode = LanguageInterface::LANGCODE_DEFAULT;
   }
-  $replacements = array();
+  $replacements = [];
 
   if ($type == 'node' && !empty($data['node'])) {
     /** @var \Drupal\node\NodeInterface $node */
@@ -127,7 +127,7 @@ function node_tokens($type, $tokens, array $data, array $options, BubbleableMeta
 
         case 'body':
         case 'summary':
-          $translation = \Drupal::entityManager()->getTranslationFromContext($node, $langcode, array('operation' => 'node_tokens'));
+          $translation = \Drupal::entityManager()->getTranslationFromContext($node, $langcode, ['operation' => 'node_tokens']);
           if ($translation->hasField('body') && ($items = $translation->get('body')) && !$items->isEmpty()) {
             $item = $items[0];
             // If the summary was requested and is not empty, use it.
@@ -195,15 +195,15 @@ function node_tokens($type, $tokens, array $data, array $options, BubbleableMeta
     }
 
     if ($author_tokens = $token_service->findWithPrefix($tokens, 'author')) {
-      $replacements += $token_service->generate('user', $author_tokens, array('user' => $node->getOwner()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('user', $author_tokens, ['user' => $node->getOwner()], $options, $bubbleable_metadata);
     }
 
     if ($created_tokens = $token_service->findWithPrefix($tokens, 'created')) {
-      $replacements += $token_service->generate('date', $created_tokens, array('date' => $node->getCreatedTime()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('date', $created_tokens, ['date' => $node->getCreatedTime()], $options, $bubbleable_metadata);
     }
 
     if ($changed_tokens = $token_service->findWithPrefix($tokens, 'changed')) {
-      $replacements += $token_service->generate('date', $changed_tokens, array('date' => $node->getChangedTime()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('date', $changed_tokens, ['date' => $node->getChangedTime()], $options, $bubbleable_metadata);
     }
   }
 
diff --git a/web/core/modules/node/node.views_execution.inc b/web/core/modules/node/node.views_execution.inc
index 193e47994..4d834a11e 100644
--- a/web/core/modules/node/node.views_execution.inc
+++ b/web/core/modules/node/node.views_execution.inc
@@ -14,18 +14,18 @@ use Drupal\user\Entity\Role;
  */
 function node_views_query_substitutions(ViewExecutable $view) {
   $account = \Drupal::currentUser();
-  return array(
+  return [
     '***ADMINISTER_NODES***' => intval($account->hasPermission('administer nodes')),
     '***VIEW_OWN_UNPUBLISHED_NODES***' => intval($account->hasPermission('view own unpublished content')),
     '***BYPASS_NODE_ACCESS***' => intval($account->hasPermission('bypass node access')),
-  );
+  ];
 }
 
 /**
  * Implements hook_views_analyze().
  */
 function node_views_analyze(ViewExecutable $view) {
-  $ret = array();
+  $ret = [];
   // Check for something other than the default display:
   if ($view->storage->get('base_table') == 'node') {
     foreach ($view->displayHandlers as $display) {
@@ -38,7 +38,7 @@ function node_views_analyze(ViewExecutable $view) {
           $authenticated_role = Role::load(RoleInterface::AUTHENTICATED_ID);
           $authenticated_has_access = $authenticated_role && $authenticated_role->hasPermission('access content');
           if (!$anonymous_has_access || !$authenticated_has_access) {
-            $ret[] = Analyzer::formatMessage(t('Some roles lack permission to access content, but display %display has no access control.', array('%display' => $display->display['display_title'])), 'warning');
+            $ret[] = Analyzer::formatMessage(t('Some roles lack permission to access content, but display %display has no access control.', ['%display' => $display->display['display_title']]), 'warning');
           }
           $filters = $display->getOption('filters');
           foreach ($filters as $filter) {
@@ -46,7 +46,7 @@ function node_views_analyze(ViewExecutable $view) {
               continue 2;
             }
           }
-          $ret[] = Analyzer::formatMessage(t('Display %display has no access control but does not contain a filter for published nodes.', array('%display' => $display->display['display_title'])), 'warning');
+          $ret[] = Analyzer::formatMessage(t('Display %display has no access control but does not contain a filter for published nodes.', ['%display' => $display->display['display_title']]), 'warning');
         }
       }
     }
@@ -54,7 +54,7 @@ function node_views_analyze(ViewExecutable $view) {
   foreach ($view->displayHandlers as $display) {
     if ($display->getPluginId() == 'page') {
       if ($display->getOption('path') == 'node/%') {
-        $ret[] = Analyzer::formatMessage(t('Display %display has set node/% as path. This will not produce what you want. If you want to have multiple versions of the node view, use panels.', array('%display' => $display->display['display_title'])), 'warning');
+        $ret[] = Analyzer::formatMessage(t('Display %display has set node/% as path. This will not produce what you want. If you want to have multiple versions of the node view, use panels.', ['%display' => $display->display['display_title']]), 'warning');
       }
     }
   }
diff --git a/web/core/modules/node/src/Access/NodeRevisionAccessCheck.php b/web/core/modules/node/src/Access/NodeRevisionAccessCheck.php
index 2005ec7e7..b85d783a1 100644
--- a/web/core/modules/node/src/Access/NodeRevisionAccessCheck.php
+++ b/web/core/modules/node/src/Access/NodeRevisionAccessCheck.php
@@ -35,7 +35,7 @@ class NodeRevisionAccessCheck implements AccessInterface {
    *
    * @var array
    */
-  protected $access = array();
+  protected $access = [];
 
   /**
    * Constructs a new NodeRevisionAccessCheck.
@@ -90,17 +90,17 @@ class NodeRevisionAccessCheck implements AccessInterface {
    *   TRUE if the operation may be performed, FALSE otherwise.
    */
   public function checkAccess(NodeInterface $node, AccountInterface $account, $op = 'view') {
-    $map = array(
+    $map = [
       'view' => 'view all revisions',
       'update' => 'revert all revisions',
       'delete' => 'delete all revisions',
-    );
+    ];
     $bundle = $node->bundle();
-    $type_map = array(
+    $type_map = [
       'view' => "view $bundle revisions",
       'update' => "revert $bundle revisions",
       'delete' => "delete $bundle revisions",
-    );
+    ];
 
     if (!$node || !isset($map[$op]) || !isset($type_map[$op])) {
       // If there was no node to check against, or the $op was not one of the
diff --git a/web/core/modules/node/src/ContextProvider/NodeRouteContext.php b/web/core/modules/node/src/ContextProvider/NodeRouteContext.php
index 2b745e9e6..2e10a8a64 100644
--- a/web/core/modules/node/src/ContextProvider/NodeRouteContext.php
+++ b/web/core/modules/node/src/ContextProvider/NodeRouteContext.php
@@ -48,7 +48,7 @@ class NodeRouteContext implements ContextProviderInterface {
     }
     elseif ($this->routeMatch->getRouteName() == 'node.add') {
       $node_type = $this->routeMatch->getParameter('node_type');
-      $value = Node::create(array('type' => $node_type->id()));
+      $value = Node::create(['type' => $node_type->id()]);
     }
 
     $cacheability = new CacheableMetadata();
diff --git a/web/core/modules/node/src/Controller/NodeController.php b/web/core/modules/node/src/Controller/NodeController.php
index 048b949c4..48401475f 100644
--- a/web/core/modules/node/src/Controller/NodeController.php
+++ b/web/core/modules/node/src/Controller/NodeController.php
@@ -74,7 +74,7 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
       ],
     ];
 
-    $content = array();
+    $content = [];
 
     // Only use node types the user has access to.
     foreach ($this->entityManager()->getStorage('node_type')->loadMultiple() as $type) {
@@ -88,7 +88,7 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
     // Bypass the node/add listing if only one content type is available.
     if (count($content) == 1) {
       $type = array_shift($content);
-      return $this->redirect('node.add', array('node_type' => $type->id()));
+      return $this->redirect('node.add', ['node_type' => $type->id()]);
     }
 
     $build['#content'] = $content;
@@ -106,9 +106,9 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
    *   A node submission form.
    */
   public function add(NodeTypeInterface $node_type) {
-    $node = $this->entityManager()->getStorage('node')->create(array(
+    $node = $this->entityManager()->getStorage('node')->create([
       'type' => $node_type->id(),
-    ));
+    ]);
 
     $form = $this->entityFormBuilder()->getForm($node);
 
@@ -144,7 +144,7 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
    */
   public function revisionPageTitle($node_revision) {
     $node = $this->entityManager()->getStorage('node')->loadRevision($node_revision);
-    return $this->t('Revision of %title from %date', array('%title' => $node->label(), '%date' => format_date($node->getRevisionCreationTime())));
+    return $this->t('Revision of %title from %date', ['%title' => $node->label(), '%date' => format_date($node->getRevisionCreationTime())]);
   }
 
   /**
@@ -166,12 +166,12 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
     $type = $node->getType();
 
     $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', ['@langname' => $langname, '%title' => $node->label()]) : $this->t('Revisions for %title', ['%title' => $node->label()]);
-    $header = array($this->t('Revision'), $this->t('Operations'));
+    $header = [$this->t('Revision'), $this->t('Operations')];
 
     $revert_permission = (($account->hasPermission("revert $type revisions") || $account->hasPermission('revert all revisions') || $account->hasPermission('administer nodes')) && $node->access('update'));
     $delete_permission = (($account->hasPermission("delete $type revisions") || $account->hasPermission('delete all revisions') || $account->hasPermission('administer nodes')) && $node->access('delete'));
 
-    $rows = array();
+    $rows = [];
     $default_revision = $node->getRevisionId();
 
     foreach ($this->getRevisionIds($node, $node_storage) as $vid) {
@@ -254,17 +254,17 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
       }
     }
 
-    $build['node_revisions_table'] = array(
+    $build['node_revisions_table'] = [
       '#theme' => 'table',
       '#rows' => $rows,
       '#header' => $header,
-      '#attached' => array(
-        'library' => array('node/drupal.node.admin'),
-      ),
+      '#attached' => [
+        'library' => ['node/drupal.node.admin'],
+      ],
       '#attributes' => ['class' => 'node-revision-table'],
-    );
+    ];
 
-    $build['pager'] = array('#type' => 'pager');
+    $build['pager'] = ['#type' => 'pager'];
 
     return $build;
   }
@@ -279,7 +279,7 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
    *   The page title.
    */
   public function addPageTitle(NodeTypeInterface $node_type) {
-    return $this->t('Create @name', array('@name' => $node_type->label()));
+    return $this->t('Create @name', ['@name' => $node_type->label()]);
   }
 
   /**
diff --git a/web/core/modules/node/src/Controller/NodeViewController.php b/web/core/modules/node/src/Controller/NodeViewController.php
index fce50e144..b8aa1e5a9 100644
--- a/web/core/modules/node/src/Controller/NodeViewController.php
+++ b/web/core/modules/node/src/Controller/NodeViewController.php
@@ -68,24 +68,24 @@ class NodeViewController extends EntityViewController {
       // metadata if we have to check access.
       if ($this->currentUser->isAuthenticated() || $url->access($this->currentUser)) {
         // Set the node path as the canonical URL to prevent duplicate content.
-        $build['#attached']['html_head_link'][] = array(
-          array(
+        $build['#attached']['html_head_link'][] = [
+          [
             'rel' => $rel,
             'href' => $url->toString(),
-          ),
+          ],
           TRUE,
-        );
+        ];
       }
 
       if ($rel == 'canonical') {
         // Set the non-aliased canonical path as a default shortlink.
-        $build['#attached']['html_head_link'][] = array(
-          array(
+        $build['#attached']['html_head_link'][] = [
+          [
             'rel' => 'shortlink',
             'href' => $url->setOption('alias', TRUE)->toString(),
-          ),
+          ],
           TRUE,
-        );
+        ];
       }
     }
 
diff --git a/web/core/modules/node/src/Entity/Node.php b/web/core/modules/node/src/Entity/Node.php
index bdb80500f..4f8efe3c5 100644
--- a/web/core/modules/node/src/Entity/Node.php
+++ b/web/core/modules/node/src/Entity/Node.php
@@ -4,6 +4,7 @@ namespace Drupal\node\Entity;
 
 use Drupal\Core\Entity\ContentEntityBase;
 use Drupal\Core\Entity\EntityChangedTrait;
+use Drupal\Core\Entity\EntityPublishedTrait;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -17,6 +18,7 @@ use Drupal\user\UserInterface;
  * @ContentEntityType(
  *   id = "node",
  *   label = @Translation("Content"),
+ *   label_collection = @Translation("Content"),
  *   label_singular = @Translation("content item"),
  *   label_plural = @Translation("content items"),
  *   label_count = @PluralTranslation(
@@ -45,6 +47,7 @@ use Drupal\user\UserInterface;
  *   data_table = "node_field_data",
  *   revision_table = "node_revision",
  *   revision_data_table = "node_field_revision",
+ *   show_revision_ui = TRUE,
  *   translatable = TRUE,
  *   list_cache_contexts = { "user.node_grants:view" },
  *   entity_keys = {
@@ -55,6 +58,7 @@ use Drupal\user\UserInterface;
  *     "langcode" = "langcode",
  *     "uuid" = "uuid",
  *     "status" = "status",
+ *     "published" = "status",
  *     "uid" = "uid",
  *   },
  *   bundle_entity_type = "node_type",
@@ -73,6 +77,7 @@ use Drupal\user\UserInterface;
 class Node extends ContentEntityBase implements NodeInterface {
 
   use EntityChangedTrait;
+  use EntityPublishedTrait;
 
   /**
    * Whether the node is being previewed or not.
@@ -224,7 +229,7 @@ class Node extends ContentEntityBase implements NodeInterface {
    * {@inheritdoc}
    */
   public function setPromoted($promoted) {
-    $this->set('promote', $promoted ? NODE_PROMOTED : NODE_NOT_PROMOTED);
+    $this->set('promote', $promoted ? NodeInterface::PROMOTED : NodeInterface::NOT_PROMOTED);
     return $this;
   }
 
@@ -239,21 +244,7 @@ class Node extends ContentEntityBase implements NodeInterface {
    * {@inheritdoc}
    */
   public function setSticky($sticky) {
-    $this->set('sticky', $sticky ? NODE_STICKY : NODE_NOT_STICKY);
-    return $this;
-  }
-  /**
-   * {@inheritdoc}
-   */
-  public function isPublished() {
-    return (bool) $this->getEntityKey('status');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setPublished($published) {
-    $this->set('status', $published ? NODE_PUBLISHED : NODE_NOT_PUBLISHED);
+    $this->set('sticky', $sticky ? NodeInterface::STICKY : NodeInterface::NOT_STICKY);
     return $this;
   }
 
@@ -367,6 +358,7 @@ class Node extends ContentEntityBase implements NodeInterface {
    */
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
+    $fields += static::publishedBaseFieldDefinitions($entity_type);
 
     $fields['title'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Title'))
@@ -374,15 +366,15 @@ class Node extends ContentEntityBase implements NodeInterface {
       ->setTranslatable(TRUE)
       ->setRevisionable(TRUE)
       ->setSetting('max_length', 255)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'string',
         'weight' => -5,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -5,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['uid'] = BaseFieldDefinition::create('entity_reference')
@@ -392,43 +384,36 @@ class Node extends ContentEntityBase implements NodeInterface {
       ->setSetting('target_type', 'user')
       ->setDefaultValueCallback('Drupal\node\Entity\Node::getCurrentUserId')
       ->setTranslatable(TRUE)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'author',
         'weight' => 0,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'entity_reference_autocomplete',
         'weight' => 5,
-        'settings' => array(
+        'settings' => [
           'match_operator' => 'CONTAINS',
           'size' => '60',
           'placeholder' => '',
-        ),
-      ))
+        ],
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
-    $fields['status'] = BaseFieldDefinition::create('boolean')
-      ->setLabel(t('Publishing status'))
-      ->setDescription(t('A boolean indicating whether the node is published.'))
-      ->setRevisionable(TRUE)
-      ->setTranslatable(TRUE)
-      ->setDefaultValue(TRUE);
-
     $fields['created'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Authored on'))
       ->setDescription(t('The time that the node was created.'))
       ->setRevisionable(TRUE)
       ->setTranslatable(TRUE)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'timestamp',
         'weight' => 0,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'datetime_timestamp',
         'weight' => 10,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['changed'] = BaseFieldDefinition::create('changed')
@@ -442,13 +427,13 @@ class Node extends ContentEntityBase implements NodeInterface {
       ->setRevisionable(TRUE)
       ->setTranslatable(TRUE)
       ->setDefaultValue(TRUE)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'boolean_checkbox',
-        'settings' => array(
+        'settings' => [
           'display_label' => TRUE,
-        ),
+        ],
         'weight' => 15,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['sticky'] = BaseFieldDefinition::create('boolean')
@@ -456,13 +441,13 @@ class Node extends ContentEntityBase implements NodeInterface {
       ->setRevisionable(TRUE)
       ->setTranslatable(TRUE)
       ->setDefaultValue(FALSE)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'boolean_checkbox',
-        'settings' => array(
+        'settings' => [
           'display_label' => TRUE,
-        ),
+        ],
         'weight' => 16,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['revision_timestamp'] = BaseFieldDefinition::create('created')
@@ -483,13 +468,13 @@ class Node extends ContentEntityBase implements NodeInterface {
       ->setDescription(t('Briefly describe the changes you have made.'))
       ->setRevisionable(TRUE)
       ->setDefaultValue('')
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'string_textarea',
         'weight' => 25,
-        'settings' => array(
+        'settings' => [
           'rows' => 4,
-        ),
-      ));
+        ],
+      ]);
 
     $fields['revision_translation_affected'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Revision translation affected'))
@@ -510,7 +495,7 @@ class Node extends ContentEntityBase implements NodeInterface {
    *   An array of default values.
    */
   public static function getCurrentUserId() {
-    return array(\Drupal::currentUser()->id());
+    return [\Drupal::currentUser()->id()];
   }
 
 }
diff --git a/web/core/modules/node/src/Entity/NodeType.php b/web/core/modules/node/src/Entity/NodeType.php
index 91d8a9095..e4a4c3b6c 100644
--- a/web/core/modules/node/src/Entity/NodeType.php
+++ b/web/core/modules/node/src/Entity/NodeType.php
@@ -182,10 +182,10 @@ class NodeType extends ConfigEntityBundleBase implements NodeTypeInterface {
         drupal_set_message(\Drupal::translation()->formatPlural($update_count,
           'Changed the content type of 1 post from %old-type to %type.',
           'Changed the content type of @count posts from %old-type to %type.',
-          array(
+          [
             '%old-type' => $this->getOriginalId(),
             '%type' => $this->id(),
-          )));
+          ]));
       }
     }
     if ($update) {
@@ -205,4 +205,11 @@ class NodeType extends ConfigEntityBundleBase implements NodeTypeInterface {
     $storage->resetCache(array_keys($entities));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function shouldCreateNewRevision() {
+    return $this->isNewRevision();
+  }
+
 }
diff --git a/web/core/modules/node/src/Form/DeleteMultiple.php b/web/core/modules/node/src/Form/DeleteMultiple.php
index 7066b94c3..91d8ad4a9 100644
--- a/web/core/modules/node/src/Form/DeleteMultiple.php
+++ b/web/core/modules/node/src/Form/DeleteMultiple.php
@@ -20,7 +20,7 @@ class DeleteMultiple extends ConfirmFormBase {
    *
    * @var string[][]
    */
-  protected $nodeInfo = array();
+  protected $nodeInfo = [];
 
   /**
    * The tempstore factory.
@@ -130,10 +130,10 @@ class DeleteMultiple extends ConfirmFormBase {
       }
     }
 
-    $form['nodes'] = array(
+    $form['nodes'] = [
       '#theme' => 'item_list',
       '#items' => $items,
-    );
+    ];
     $form = parent::buildForm($form, $form_state);
 
     return $form;
@@ -167,7 +167,7 @@ class DeleteMultiple extends ConfirmFormBase {
 
       if ($delete_nodes) {
         $this->storage->delete($delete_nodes);
-        $this->logger('content')->notice('Deleted @count posts.', array('@count' => count($delete_nodes)));
+        $this->logger('content')->notice('Deleted @count posts.', ['@count' => count($delete_nodes)]);
       }
 
       if ($delete_translations) {
@@ -182,7 +182,7 @@ class DeleteMultiple extends ConfirmFormBase {
         }
         if ($count) {
           $total_count += $count;
-          $this->logger('content')->notice('Deleted @count content translations.', array('@count' => $count));
+          $this->logger('content')->notice('Deleted @count content translations.', ['@count' => $count]);
         }
       }
 
diff --git a/web/core/modules/node/src/Form/NodeDeleteForm.php b/web/core/modules/node/src/Form/NodeDeleteForm.php
index 7afac867f..da8c2025c 100644
--- a/web/core/modules/node/src/Form/NodeDeleteForm.php
+++ b/web/core/modules/node/src/Form/NodeDeleteForm.php
@@ -27,10 +27,10 @@ class NodeDeleteForm extends ContentEntityDeleteForm {
       ]);
     }
 
-    return $this->t('The @type %title has been deleted.', array(
+    return $this->t('The @type %title has been deleted.', [
       '@type' => $node_type,
       '%title' => $this->getEntity()->label(),
-    ));
+    ]);
   }
 
   /**
diff --git a/web/core/modules/node/src/Form/NodePreviewForm.php b/web/core/modules/node/src/Form/NodePreviewForm.php
index 829fee100..8b6125b87 100644
--- a/web/core/modules/node/src/Form/NodePreviewForm.php
+++ b/web/core/modules/node/src/Form/NodePreviewForm.php
@@ -72,18 +72,18 @@ class NodePreviewForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $node = NULL) {
     $view_mode = $node->preview_view_mode;
 
-    $query_options = array('query' => array('uuid' => $node->uuid()));
+    $query_options = ['query' => ['uuid' => $node->uuid()]];
     $query = $this->getRequest()->query;
     if ($query->has('destination')) {
       $query_options['query']['destination'] = $query->get('destination');
     }
 
-    $form['backlink'] = array(
+    $form['backlink'] = [
       '#type' => 'link',
       '#title' => $this->t('Back to content editing'),
       '#url' => $node->isNew() ? Url::fromRoute('node.add', ['node_type' => $node->bundle()]) : $node->urlInfo('edit-form'),
-      '#options' => array('attributes' => array('class' => array('node-preview-backlink'))) + $query_options,
-    );
+      '#options' => ['attributes' => ['class' => ['node-preview-backlink']]] + $query_options,
+    ];
 
     // Always show full as an option, even if the display is not enabled.
     $view_mode_options = ['full' => $this->t('Full')] + $this->entityManager->getViewModeOptionsByBundle('node', $node->bundle());
@@ -93,28 +93,28 @@ class NodePreviewForm extends FormBase {
     unset($view_mode_options['rss']);
     unset($view_mode_options['search_index']);
 
-    $form['uuid'] = array(
+    $form['uuid'] = [
       '#type' => 'value',
       '#value' => $node->uuid(),
-    );
+    ];
 
-    $form['view_mode'] = array(
+    $form['view_mode'] = [
       '#type' => 'select',
       '#title' => $this->t('View mode'),
       '#options' => $view_mode_options,
       '#default_value' => $view_mode,
-      '#attributes' => array(
+      '#attributes' => [
         'data-drupal-autosubmit' => TRUE,
-      )
-    );
+      ]
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Switch'),
-      '#attributes' => array(
-        'class' => array('js-hide'),
-      ),
-    );
+      '#attributes' => [
+        'class' => ['js-hide'],
+      ],
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/node/src/Form/NodeRevisionDeleteForm.php b/web/core/modules/node/src/Form/NodeRevisionDeleteForm.php
index 27eec48e5..86e5b59c1 100644
--- a/web/core/modules/node/src/Form/NodeRevisionDeleteForm.php
+++ b/web/core/modules/node/src/Form/NodeRevisionDeleteForm.php
@@ -81,14 +81,14 @@ class NodeRevisionDeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return t('Are you sure you want to delete the revision from %revision-date?', array('%revision-date' => format_date($this->revision->getRevisionCreationTime())));
+    return t('Are you sure you want to delete the revision from %revision-date?', ['%revision-date' => format_date($this->revision->getRevisionCreationTime())]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('entity.node.version_history', array('node' => $this->revision->id()));
+    return new Url('entity.node.version_history', ['node' => $this->revision->id()]);
   }
 
   /**
@@ -114,17 +114,17 @@ class NodeRevisionDeleteForm extends ConfirmFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->nodeStorage->deleteRevision($this->revision->getRevisionId());
 
-    $this->logger('content')->notice('@type: deleted %title revision %revision.', array('@type' => $this->revision->bundle(), '%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()));
+    $this->logger('content')->notice('@type: deleted %title revision %revision.', ['@type' => $this->revision->bundle(), '%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
     $node_type = $this->nodeTypeStorage->load($this->revision->bundle())->label();
-    drupal_set_message(t('Revision from %revision-date of @type %title has been deleted.', array('%revision-date' => format_date($this->revision->getRevisionCreationTime()), '@type' => $node_type, '%title' => $this->revision->label())));
+    drupal_set_message(t('Revision from %revision-date of @type %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '@type' => $node_type, '%title' => $this->revision->label()]));
     $form_state->setRedirect(
       'entity.node.canonical',
-      array('node' => $this->revision->id())
+      ['node' => $this->revision->id()]
     );
-    if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {node_field_revision} WHERE nid = :nid', array(':nid' => $this->revision->id()))->fetchField() > 1) {
+    if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {node_field_revision} WHERE nid = :nid', [':nid' => $this->revision->id()])->fetchField() > 1) {
       $form_state->setRedirect(
         'entity.node.version_history',
-        array('node' => $this->revision->id())
+        ['node' => $this->revision->id()]
       );
     }
   }
diff --git a/web/core/modules/node/src/Form/NodeRevisionRevertForm.php b/web/core/modules/node/src/Form/NodeRevisionRevertForm.php
index 275d55ba2..09aab6f54 100644
--- a/web/core/modules/node/src/Form/NodeRevisionRevertForm.php
+++ b/web/core/modules/node/src/Form/NodeRevisionRevertForm.php
@@ -77,7 +77,7 @@ class NodeRevisionRevertForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('entity.node.version_history', array('node' => $this->revision->id()));
+    return new Url('entity.node.version_history', ['node' => $this->revision->id()]);
   }
 
   /**
@@ -120,7 +120,7 @@ class NodeRevisionRevertForm extends ConfirmFormBase {
     drupal_set_message(t('@type %title has been reverted to the revision from %revision-date.', ['@type' => node_get_type_label($this->revision), '%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
     $form_state->setRedirect(
       'entity.node.version_history',
-      array('node' => $this->revision->id())
+      ['node' => $this->revision->id()]
     );
   }
 
diff --git a/web/core/modules/node/src/Form/NodeRevisionRevertTranslationForm.php b/web/core/modules/node/src/Form/NodeRevisionRevertTranslationForm.php
index 05a4f6c41..fd20dadce 100644
--- a/web/core/modules/node/src/Form/NodeRevisionRevertTranslationForm.php
+++ b/web/core/modules/node/src/Form/NodeRevisionRevertTranslationForm.php
@@ -82,11 +82,11 @@ class NodeRevisionRevertTranslationForm extends NodeRevisionRevertForm {
     $this->langcode = $langcode;
     $form = parent::buildForm($form, $form_state, $node_revision);
 
-    $form['revert_untranslated_fields'] = array(
+    $form['revert_untranslated_fields'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Revert content shared among translations'),
       '#default_value' => FALSE,
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/node/src/Form/NodeTypeDeleteConfirm.php b/web/core/modules/node/src/Form/NodeTypeDeleteConfirm.php
index ada9fd558..e4bea83fc 100644
--- a/web/core/modules/node/src/Form/NodeTypeDeleteConfirm.php
+++ b/web/core/modules/node/src/Form/NodeTypeDeleteConfirm.php
@@ -2,54 +2,26 @@
 
 namespace Drupal\node\Form;
 
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Entity\EntityDeleteForm;
 use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a form for content type deletion.
  */
 class NodeTypeDeleteConfirm extends EntityDeleteForm {
 
-  /**
-   * The query factory to create entity queries.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
-
-  /**
-   * Constructs a new NodeTypeDeleteConfirm object.
-   *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query object.
-   */
-  public function __construct(QueryFactory $query_factory) {
-    $this->queryFactory = $query_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.query')
-    );
-  }
-
   /**
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $num_nodes = $this->queryFactory->get('node')
+    $num_nodes = $this->entityTypeManager->getStorage('node')->getQuery()
       ->condition('type', $this->entity->id())
       ->count()
       ->execute();
     if ($num_nodes) {
-      $caption = '<p>' . $this->formatPlural($num_nodes, '%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', '%type is used by @count pieces of content on your site. You may not remove %type until you have removed all of the %type content.', array('%type' => $this->entity->label())) . '</p>';
+      $caption = '<p>' . $this->formatPlural($num_nodes, '%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', '%type is used by @count pieces of content on your site. You may not remove %type until you have removed all of the %type content.', ['%type' => $this->entity->label()]) . '</p>';
       $form['#title'] = $this->getQuestion();
-      $form['description'] = array('#markup' => $caption);
+      $form['description'] = ['#markup' => $caption];
       return $form;
     }
 
diff --git a/web/core/modules/node/src/NodeAccessControlHandler.php b/web/core/modules/node/src/NodeAccessControlHandler.php
index 988de9e3e..a8a0bc624 100644
--- a/web/core/modules/node/src/NodeAccessControlHandler.php
+++ b/web/core/modules/node/src/NodeAccessControlHandler.php
@@ -62,17 +62,18 @@ class NodeAccessControlHandler extends EntityAccessControlHandler implements Nod
       return $return_as_object ? $result : $result->isAllowed();
     }
     if (!$account->hasPermission('access content')) {
-      $result = AccessResult::forbidden()->cachePerPermissions();
+      $result = AccessResult::forbidden("The 'access content' permission is required.")->cachePerPermissions();
       return $return_as_object ? $result : $result->isAllowed();
     }
     $result = parent::access($entity, $operation, $account, TRUE)->cachePerPermissions();
+
     return $return_as_object ? $result : $result->isAllowed();
   }
 
   /**
    * {@inheritdoc}
    */
-  public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = array(), $return_as_object = FALSE) {
+  public function createAccess($entity_bundle = NULL, AccountInterface $account = NULL, array $context = [], $return_as_object = FALSE) {
     $account = $this->prepareUser($account);
 
     if ($account->hasPermission('bypass node access')) {
@@ -120,13 +121,13 @@ class NodeAccessControlHandler extends EntityAccessControlHandler implements Nod
   protected function checkFieldAccess($operation, FieldDefinitionInterface $field_definition, AccountInterface $account, FieldItemListInterface $items = NULL) {
     // Only users with the administer nodes permission can edit administrative
     // fields.
-    $administrative_fields = array('uid', 'status', 'created', 'promote', 'sticky');
+    $administrative_fields = ['uid', 'status', 'created', 'promote', 'sticky'];
     if ($operation == 'edit' && in_array($field_definition->getName(), $administrative_fields, TRUE)) {
       return AccessResult::allowedIfHasPermission($account, 'administer nodes');
     }
 
     // No user can change read only fields.
-    $read_only_fields = array('revision_timestamp', 'revision_uid');
+    $read_only_fields = ['revision_timestamp', 'revision_uid'];
     if ($operation == 'edit' && in_array($field_definition->getName(), $read_only_fields, TRUE)) {
       return AccessResult::forbidden();
     }
@@ -146,12 +147,12 @@ class NodeAccessControlHandler extends EntityAccessControlHandler implements Nod
    * {@inheritdoc}
    */
   public function acquireGrants(NodeInterface $node) {
-    $grants = $this->moduleHandler->invokeAll('node_access_records', array($node));
+    $grants = $this->moduleHandler->invokeAll('node_access_records', [$node]);
     // Let modules alter the grants.
     $this->moduleHandler->alter('node_access_records', $grants, $node);
     // If no grants are set and the node is published, then use the default grant.
     if (empty($grants) && $node->isPublished()) {
-      $grants[] = array('realm' => 'all', 'gid' => 0, 'grant_view' => 1, 'grant_update' => 0, 'grant_delete' => 0);
+      $grants[] = ['realm' => 'all', 'gid' => 0, 'grant_view' => 1, 'grant_update' => 0, 'grant_delete' => 0];
     }
     return $grants;
   }
diff --git a/web/core/modules/node/src/NodeAccessControlHandlerInterface.php b/web/core/modules/node/src/NodeAccessControlHandlerInterface.php
index 47205f0d7..7d407c1f1 100644
--- a/web/core/modules/node/src/NodeAccessControlHandlerInterface.php
+++ b/web/core/modules/node/src/NodeAccessControlHandlerInterface.php
@@ -23,7 +23,7 @@ interface NodeAccessControlHandlerInterface {
    * @param \Drupal\node\NodeInterface $node
    *   The $node to acquire grants for.
    *
-   * @return array $grants
+   * @return array
    *   The access rules for the node.
    */
   public function acquireGrants(NodeInterface $node);
@@ -74,7 +74,7 @@ interface NodeAccessControlHandlerInterface {
    *   A user object representing the user for whom the operation is to be
    *   performed.
    *
-   * @return int.
+   * @return int
    *   Status of the access check.
    */
   public function checkAllGrants(AccountInterface $account);
diff --git a/web/core/modules/node/src/NodeForm.php b/web/core/modules/node/src/NodeForm.php
index 3dd8a959c..203c2e633 100644
--- a/web/core/modules/node/src/NodeForm.php
+++ b/web/core/modules/node/src/NodeForm.php
@@ -2,8 +2,10 @@
 
 namespace Drupal\node;
 
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\user\PrivateTempStoreFactory;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -21,23 +23,19 @@ class NodeForm extends ContentEntityForm {
   protected $tempStoreFactory;
 
   /**
-   * Whether this node has been previewed or not.
-   *
-   * @deprecated Scheduled for removal in Drupal 8.3.x. Use the form state
-   *   property 'has_been_previewed' instead.
-   */
-  protected $hasBeenPreviewed = FALSE;
-
-  /**
-   * Constructs a ContentEntityForm object.
+   * Constructs a NodeForm object.
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
    * @param \Drupal\user\PrivateTempStoreFactory $temp_store_factory
    *   The factory for the temp store object.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle service.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, PrivateTempStoreFactory $temp_store_factory) {
-    parent::__construct($entity_manager);
+  public function __construct(EntityManagerInterface $entity_manager, PrivateTempStoreFactory $temp_store_factory, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
+    parent::__construct($entity_manager, $entity_type_bundle_info, $time);
     $this->tempStoreFactory = $temp_store_factory;
   }
 
@@ -47,29 +45,16 @@ class NodeForm extends ContentEntityForm {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('entity.manager'),
-      $container->get('user.private_tempstore')
+      $container->get('user.private_tempstore'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time')
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function prepareEntity() {
-    /** @var \Drupal\node\NodeInterface $node */
-    $node = $this->entity;
-
-    if (!$node->isNew()) {
-      // Remove the revision log message from the original node entity.
-      $node->revision_log = NULL;
-    }
-  }
-
   /**
    * {@inheritdoc}
    */
   public function form(array $form, FormStateInterface $form_state) {
-    $this->hasBeenPreviewed = $form_state->get('has_been_previewed') ?: FALSE;
-
     // Try to restore from temp store, this must be done before calling
     // parent::form().
     $store = $this->tempStoreFactory->get('node_preview');
@@ -95,80 +80,39 @@ class NodeForm extends ContentEntityForm {
       $this->entity->in_preview = NULL;
 
       $form_state->set('has_been_previewed', TRUE);
-      $this->hasBeenPreviewed = TRUE;
     }
 
     /** @var \Drupal\node\NodeInterface $node */
     $node = $this->entity;
 
     if ($this->operation == 'edit') {
-      $form['#title'] = $this->t('<em>Edit @type</em> @title', array('@type' => node_get_type_label($node), '@title' => $node->label()));
+      $form['#title'] = $this->t('<em>Edit @type</em> @title', ['@type' => node_get_type_label($node), '@title' => $node->label()]);
     }
 
-    $current_user = $this->currentUser();
-
     // Changed must be sent to the client, for later overwrite error checking.
-    $form['changed'] = array(
+    $form['changed'] = [
       '#type' => 'hidden',
       '#default_value' => $node->getChangedTime(),
-    );
+    ];
 
-    $form['advanced'] = array(
-      '#type' => 'vertical_tabs',
-      '#attributes' => array('class' => array('entity-meta')),
-      '#weight' => 99,
-    );
     $form = parent::form($form, $form_state);
 
-    // Add a revision_log field if the "Create new revision" option is checked,
-    // or if the current user has the ability to check that option.
-    $form['revision_information'] = array(
-      '#type' => 'details',
-      '#group' => 'advanced',
-      '#title' => t('Revision information'),
-      // Open by default when "Create new revision" is checked.
-      '#open' => $node->isNewRevision(),
-      '#attributes' => array(
-        'class' => array('node-form-revision-information'),
-      ),
-      '#attached' => array(
-        'library' => array('node/drupal.node'),
-      ),
-      '#weight' => 20,
-      '#optional' => TRUE,
-    );
-
-    $form['revision'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Create new revision'),
-      '#default_value' => $node->type->entity->isNewRevision(),
-      '#access' => $current_user->hasPermission('administer nodes'),
-      '#group' => 'revision_information',
-    );
-
-    $form['revision_log'] += array(
-      '#states' => array(
-        'visible' => array(
-          ':input[name="revision"]' => array('checked' => TRUE),
-        ),
-      ),
-      '#group' => 'revision_information',
-    );
+    $form['advanced']['#attributes']['class'][] = 'entity-meta';
 
     // Node author information for administrators.
-    $form['author'] = array(
+    $form['author'] = [
       '#type' => 'details',
       '#title' => t('Authoring information'),
       '#group' => 'advanced',
-      '#attributes' => array(
-        'class' => array('node-form-author'),
-      ),
-      '#attached' => array(
-        'library' => array('node/drupal.node'),
-      ),
+      '#attributes' => [
+        'class' => ['node-form-author'],
+      ],
+      '#attached' => [
+        'library' => ['node/drupal.node'],
+      ],
       '#weight' => 90,
       '#optional' => TRUE,
-    );
+    ];
 
     if (isset($form['uid'])) {
       $form['uid']['#group'] = 'author';
@@ -179,19 +123,19 @@ class NodeForm extends ContentEntityForm {
     }
 
     // Node options for administrators.
-    $form['options'] = array(
+    $form['options'] = [
       '#type' => 'details',
       '#title' => t('Promotion options'),
       '#group' => 'advanced',
-      '#attributes' => array(
-        'class' => array('node-form-options'),
-      ),
-      '#attached' => array(
-        'library' => array('node/drupal.node'),
-      ),
+      '#attributes' => [
+        'class' => ['node-form-options'],
+      ],
+      '#attached' => [
+        'library' => ['node/drupal.node'],
+      ],
       '#weight' => 95,
       '#optional' => TRUE,
-    );
+    ];
 
     if (isset($form['promote'])) {
       $form['promote']['#group'] = 'options';
@@ -203,7 +147,7 @@ class NodeForm extends ContentEntityForm {
 
     $form['#attached']['library'][] = 'node/form';
 
-    $form['#entity_builders']['update_status'] = [$this, 'updateStatus'];
+    $form['#entity_builders']['update_status'] = '::updateStatus';
 
     return $form;
   }
@@ -222,7 +166,7 @@ class NodeForm extends ContentEntityForm {
    *
    * @see \Drupal\node\NodeForm::form()
    */
-  function updateStatus($entity_type_id, NodeInterface $node, array $form, FormStateInterface $form_state) {
+  public function updateStatus($entity_type_id, NodeInterface $node, array $form, FormStateInterface $form_state) {
     $element = $form_state->getTriggeringElement();
     if (isset($element['#published_status'])) {
       $node->setPublished($element['#published_status']);
@@ -292,13 +236,13 @@ class NodeForm extends ContentEntityForm {
       $element['submit']['#access'] = FALSE;
     }
 
-    $element['preview'] = array(
+    $element['preview'] = [
       '#type' => 'submit',
       '#access' => $preview_mode != DRUPAL_DISABLED && ($node->access('create') || $node->access('update')),
       '#value' => t('Preview'),
       '#weight' => 20,
-      '#submit' => array('::submitForm', '::preview'),
-    );
+      '#submit' => ['::submitForm', '::preview'],
+    ];
 
     $element['delete']['#access'] = $node->access('delete');
     $element['delete']['#weight'] = 100;
@@ -306,32 +250,6 @@ class NodeForm extends ContentEntityForm {
     return $element;
   }
 
-  /**
-   * {@inheritdoc}
-   *
-   * Updates the node object by processing the submitted values.
-   *
-   * This function can be called by a "Next" button of a wizard to update the
-   * form state's entity with the current step's values before proceeding to the
-   * next step.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Build the node object from the submitted values.
-    parent::submitForm($form, $form_state);
-    $node = $this->entity;
-
-    // Save as a new revision if requested to do so.
-    if (!$form_state->isValueEmpty('revision') && $form_state->getValue('revision') != FALSE) {
-      $node->setNewRevision();
-      // If a new revision is created, save the current user as revision author.
-      $node->setRevisionCreationTime(REQUEST_TIME);
-      $node->setRevisionUserId(\Drupal::currentUser()->id());
-    }
-    else {
-      $node->setNewRevision(FALSE);
-    }
-  }
-
   /**
    * Form submission handler for the 'preview' action.
    *
@@ -367,8 +285,8 @@ class NodeForm extends ContentEntityForm {
     $insert = $node->isNew();
     $node->save();
     $node_link = $node->link($this->t('View'));
-    $context = array('@type' => $node->getType(), '%title' => $node->label(), 'link' => $node_link);
-    $t_args = array('@type' => node_get_type_label($node), '%title' => $node->link($node->label()));
+    $context = ['@type' => $node->getType(), '%title' => $node->label(), 'link' => $node_link];
+    $t_args = ['@type' => node_get_type_label($node), '%title' => $node->link($node->label())];
 
     if ($insert) {
       $this->logger('content')->notice('@type: added %title.', $context);
@@ -385,7 +303,7 @@ class NodeForm extends ContentEntityForm {
       if ($node->access('view')) {
         $form_state->setRedirect(
           'entity.node.canonical',
-          array('node' => $node->id())
+          ['node' => $node->id()]
         );
       }
       else {
diff --git a/web/core/modules/node/src/NodeGrantDatabaseStorage.php b/web/core/modules/node/src/NodeGrantDatabaseStorage.php
index a0a13371a..993d0950d 100644
--- a/web/core/modules/node/src/NodeGrantDatabaseStorage.php
+++ b/web/core/modules/node/src/NodeGrantDatabaseStorage.php
@@ -161,7 +161,7 @@ class NodeGrantDatabaseStorage implements NodeGrantDatabaseStorageInterface {
       if (!($table instanceof SelectInterface) && $table == $base_table) {
         // Set the subquery.
         $subquery = $this->database->select('node_access', 'na')
-          ->fields('na', array('nid'));
+          ->fields('na', ['nid']);
 
         // If any grant exists for the specified user, then user has access to the
         // node for the specified operation.
@@ -202,13 +202,13 @@ class NodeGrantDatabaseStorage implements NodeGrantDatabaseStorageInterface {
     if ($delete) {
       $query = $this->database->delete('node_access')->condition('nid', $node->id());
       if ($realm) {
-        $query->condition('realm', array($realm, 'all'), 'IN');
+        $query->condition('realm', [$realm, 'all'], 'IN');
       }
       $query->execute();
     }
     // Only perform work when node_access modules are active.
     if (!empty($grants) && count($this->moduleHandler->getImplementations('node_grants'))) {
-      $query = $this->database->insert('node_access')->fields(array('nid', 'langcode', 'fallback', 'realm', 'gid', 'grant_view', 'grant_update', 'grant_delete'));
+      $query = $this->database->insert('node_access')->fields(['nid', 'langcode', 'fallback', 'realm', 'gid', 'grant_view', 'grant_update', 'grant_delete']);
       // If we have defined a granted langcode, use it. But if not, add a grant
       // for every language this node is translated to.
       foreach ($grants as $grant) {
@@ -216,7 +216,7 @@ class NodeGrantDatabaseStorage implements NodeGrantDatabaseStorageInterface {
           continue;
         }
         if (isset($grant['langcode'])) {
-          $grant_languages = array($grant['langcode'] => $this->languageManager->getLanguage($grant['langcode']));
+          $grant_languages = [$grant['langcode'] => $this->languageManager->getLanguage($grant['langcode'])];
         }
         else {
           $grant_languages = $node->getTranslationLanguages(TRUE);
@@ -253,14 +253,14 @@ class NodeGrantDatabaseStorage implements NodeGrantDatabaseStorageInterface {
    */
   public function writeDefault() {
     $this->database->insert('node_access')
-      ->fields(array(
+      ->fields([
           'nid' => 0,
           'realm' => 'all',
           'gid' => 0,
           'grant_view' => 1,
           'grant_update' => 0,
           'grant_delete' => 0,
-        ))
+        ])
       ->execute();
   }
 
diff --git a/web/core/modules/node/src/NodeGrantDatabaseStorageInterface.php b/web/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
index 659ce1010..235fbc06b 100644
--- a/web/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
+++ b/web/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
@@ -18,7 +18,7 @@ interface NodeGrantDatabaseStorageInterface {
    *   A user object representing the user for whom the operation is to be
    *   performed.
    *
-   * @return int.
+   * @return int
    *   Status of the access check.
    */
   public function checkAll(AccountInterface $account);
diff --git a/web/core/modules/node/src/NodeInterface.php b/web/core/modules/node/src/NodeInterface.php
index 980dacd06..87b68927c 100644
--- a/web/core/modules/node/src/NodeInterface.php
+++ b/web/core/modules/node/src/NodeInterface.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\node;
 
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Entity\RevisionLogInterface;
 use Drupal\user\EntityOwnerInterface;
 use Drupal\Core\Entity\EntityChangedInterface;
@@ -10,7 +11,37 @@ use Drupal\Core\Entity\ContentEntityInterface;
 /**
  * Provides an interface defining a node entity.
  */
-interface NodeInterface extends ContentEntityInterface, EntityChangedInterface, EntityOwnerInterface, RevisionLogInterface {
+interface NodeInterface extends ContentEntityInterface, EntityChangedInterface, EntityOwnerInterface, RevisionLogInterface, EntityPublishedInterface {
+
+  /**
+   * Denotes that the node is not published.
+   */
+  const NOT_PUBLISHED = 0;
+
+  /**
+   * Denotes that the node is published.
+   */
+  const PUBLISHED = 1;
+
+  /**
+   * Denotes that the node is not promoted to the front page.
+   */
+  const NOT_PROMOTED = 0;
+
+  /**
+   * Denotes that the node is promoted to the front page.
+   */
+  const PROMOTED = 1;
+
+  /**
+   * Denotes that the node is not sticky at the top of the page.
+   */
+  const NOT_STICKY = 0;
+
+  /**
+   * Denotes that the node is sticky at the top of the page.
+   */
+  const STICKY = 1;
 
   /**
    * Gets the node type.
@@ -96,27 +127,6 @@ interface NodeInterface extends ContentEntityInterface, EntityChangedInterface,
    */
   public function setSticky($sticky);
 
-  /**
-   * Returns the node published status indicator.
-   *
-   * Unpublished nodes are only visible to their authors and to administrators.
-   *
-   * @return bool
-   *   TRUE if the node is published.
-   */
-  public function isPublished();
-
-  /**
-   * Sets the published status of a node..
-   *
-   * @param bool $published
-   *   TRUE to set this node to published, FALSE to set it to unpublished.
-   *
-   * @return \Drupal\node\NodeInterface
-   *   The called node entity.
-   */
-  public function setPublished($published);
-
   /**
    * Gets the node revision creation timestamp.
    *
diff --git a/web/core/modules/node/src/NodeListBuilder.php b/web/core/modules/node/src/NodeListBuilder.php
index 921ac9f37..62666497e 100644
--- a/web/core/modules/node/src/NodeListBuilder.php
+++ b/web/core/modules/node/src/NodeListBuilder.php
@@ -68,27 +68,27 @@ class NodeListBuilder extends EntityListBuilder {
    */
   public function buildHeader() {
     // Enable language column and filter if multiple languages are added.
-    $header = array(
+    $header = [
       'title' => $this->t('Title'),
-      'type' => array(
+      'type' => [
         'data' => $this->t('Content type'),
-        'class' => array(RESPONSIVE_PRIORITY_MEDIUM),
-      ),
-      'author' => array(
+        'class' => [RESPONSIVE_PRIORITY_MEDIUM],
+      ],
+      'author' => [
         'data' => $this->t('Author'),
-        'class' => array(RESPONSIVE_PRIORITY_LOW),
-      ),
+        'class' => [RESPONSIVE_PRIORITY_LOW],
+      ],
       'status' => $this->t('Status'),
-      'changed' => array(
+      'changed' => [
         'data' => $this->t('Updated'),
-        'class' => array(RESPONSIVE_PRIORITY_LOW),
-      ),
-    );
+        'class' => [RESPONSIVE_PRIORITY_LOW],
+      ],
+    ];
     if (\Drupal::languageManager()->isMultilingual()) {
-      $header['language_name'] = array(
+      $header['language_name'] = [
         'data' => $this->t('Language'),
-        'class' => array(RESPONSIVE_PRIORITY_LOW),
-      );
+        'class' => [RESPONSIVE_PRIORITY_LOW],
+      ];
     }
     return $header + parent::buildHeader();
   }
@@ -98,26 +98,26 @@ class NodeListBuilder extends EntityListBuilder {
    */
   public function buildRow(EntityInterface $entity) {
     /** @var \Drupal\node\NodeInterface $entity */
-    $mark = array(
+    $mark = [
       '#theme' => 'mark',
       '#mark_type' => node_mark($entity->id(), $entity->getChangedTime()),
-    );
+    ];
     $langcode = $entity->language()->getId();
     $uri = $entity->urlInfo();
     $options = $uri->getOptions();
-    $options += ($langcode != LanguageInterface::LANGCODE_NOT_SPECIFIED && isset($languages[$langcode]) ? array('language' => $languages[$langcode]) : array());
+    $options += ($langcode != LanguageInterface::LANGCODE_NOT_SPECIFIED && isset($languages[$langcode]) ? ['language' => $languages[$langcode]] : []);
     $uri->setOptions($options);
-    $row['title']['data'] = array(
+    $row['title']['data'] = [
       '#type' => 'link',
       '#title' => $entity->label(),
       '#suffix' => ' ' . drupal_render($mark),
       '#url' => $uri,
-    );
+    ];
     $row['type'] = node_get_type_label($entity);
-    $row['author']['data'] = array(
+    $row['author']['data'] = [
       '#theme' => 'username',
       '#account' => $entity->getOwner(),
-    );
+    ];
     $row['status'] = $entity->isPublished() ? $this->t('published') : $this->t('not published');
     $row['changed'] = $this->dateFormatter->format($entity->getChangedTime(), 'short');
     $language_manager = \Drupal::languageManager();
diff --git a/web/core/modules/node/src/NodePermissions.php b/web/core/modules/node/src/NodePermissions.php
index 94b2d935f..5754d71ea 100644
--- a/web/core/modules/node/src/NodePermissions.php
+++ b/web/core/modules/node/src/NodePermissions.php
@@ -22,7 +22,7 @@ class NodePermissions {
    *   @see \Drupal\user\PermissionHandlerInterface::getPermissions()
    */
   public function nodeTypePermissions() {
-    $perms = array();
+    $perms = [];
     // Generate node permissions for all node types.
     foreach (NodeType::loadMultiple() as $type) {
       $perms += $this->buildPermissions($type);
@@ -42,36 +42,36 @@ class NodePermissions {
    */
   protected function buildPermissions(NodeType $type) {
     $type_id = $type->id();
-    $type_params = array('%type_name' => $type->label());
+    $type_params = ['%type_name' => $type->label()];
 
-    return array(
-      "create $type_id content" => array(
+    return [
+      "create $type_id content" => [
         'title' => $this->t('%type_name: Create new content', $type_params),
-      ),
-      "edit own $type_id content" => array(
+      ],
+      "edit own $type_id content" => [
         'title' => $this->t('%type_name: Edit own content', $type_params),
-      ),
-      "edit any $type_id content" => array(
+      ],
+      "edit any $type_id content" => [
         'title' => $this->t('%type_name: Edit any content', $type_params),
-      ),
-      "delete own $type_id content" => array(
+      ],
+      "delete own $type_id content" => [
         'title' => $this->t('%type_name: Delete own content', $type_params),
-      ),
-      "delete any $type_id content" => array(
+      ],
+      "delete any $type_id content" => [
         'title' => $this->t('%type_name: Delete any content', $type_params),
-      ),
-      "view $type_id revisions" => array(
+      ],
+      "view $type_id revisions" => [
         'title' => $this->t('%type_name: View revisions', $type_params),
-      ),
-      "revert $type_id revisions" => array(
+      ],
+      "revert $type_id revisions" => [
         'title' => $this->t('%type_name: Revert revisions', $type_params),
         'description' => t('Role requires permission <em>view revisions</em> and <em>edit rights</em> for nodes in question, or <em>administer nodes</em>.'),
-      ),
-      "delete $type_id revisions" => array(
+      ],
+      "delete $type_id revisions" => [
         'title' => $this->t('%type_name: Delete revisions', $type_params),
         'description' => $this->t('Role requires permission to <em>view revisions</em> and <em>delete rights</em> for nodes in question, or <em>administer nodes</em>.'),
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/node/src/NodeStorage.php b/web/core/modules/node/src/NodeStorage.php
index 3c7209307..af85a067d 100644
--- a/web/core/modules/node/src/NodeStorage.php
+++ b/web/core/modules/node/src/NodeStorage.php
@@ -20,7 +20,7 @@ class NodeStorage extends SqlContentEntityStorage implements NodeStorageInterfac
   public function revisionIds(NodeInterface $node) {
     return $this->database->query(
       'SELECT vid FROM {node_revision} WHERE nid=:nid ORDER BY vid',
-      array(':nid' => $node->id())
+      [':nid' => $node->id()]
     )->fetchCol();
   }
 
@@ -30,7 +30,7 @@ class NodeStorage extends SqlContentEntityStorage implements NodeStorageInterfac
   public function userRevisionIds(AccountInterface $account) {
     return $this->database->query(
       'SELECT vid FROM {node_field_revision} WHERE uid = :uid ORDER BY vid',
-      array(':uid' => $account->id())
+      [':uid' => $account->id()]
     )->fetchCol();
   }
 
@@ -38,7 +38,7 @@ class NodeStorage extends SqlContentEntityStorage implements NodeStorageInterfac
    * {@inheritdoc}
    */
   public function countDefaultLanguageRevisions(NodeInterface $node) {
-    return $this->database->query('SELECT COUNT(*) FROM {node_field_revision} WHERE nid = :nid AND default_langcode = 1', array(':nid' => $node->id()))->fetchField();
+    return $this->database->query('SELECT COUNT(*) FROM {node_field_revision} WHERE nid = :nid AND default_langcode = 1', [':nid' => $node->id()])->fetchField();
   }
 
   /**
@@ -46,7 +46,7 @@ class NodeStorage extends SqlContentEntityStorage implements NodeStorageInterfac
    */
   public function updateType($old_type, $new_type) {
     return $this->database->update('node')
-      ->fields(array('type' => $new_type))
+      ->fields(['type' => $new_type])
       ->condition('type', $old_type)
       ->execute();
   }
@@ -56,7 +56,7 @@ class NodeStorage extends SqlContentEntityStorage implements NodeStorageInterfac
    */
   public function clearRevisionsLanguage(LanguageInterface $language) {
     return $this->database->update('node_revision')
-      ->fields(array('langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED))
+      ->fields(['langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED])
       ->condition('langcode', $language->getId())
       ->execute();
   }
diff --git a/web/core/modules/node/src/NodeStorageSchema.php b/web/core/modules/node/src/NodeStorageSchema.php
index 43bd465df..ac45bb5d1 100644
--- a/web/core/modules/node/src/NodeStorageSchema.php
+++ b/web/core/modules/node/src/NodeStorageSchema.php
@@ -17,11 +17,10 @@ class NodeStorageSchema extends SqlContentEntityStorageSchema {
   protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $reset = FALSE) {
     $schema = parent::getEntitySchema($entity_type, $reset);
 
-    $schema['node_field_data']['indexes'] += array(
-      'node__frontpage' => array('promote', 'status', 'sticky', 'created'),
-      'node__status_type' => array('status', 'type', 'nid'),
-      'node__title_type' => array('title', array('type', 4)),
-    );
+    $schema['node_field_data']['indexes'] += [
+      'node__frontpage' => ['promote', 'status', 'sticky', 'created'],
+      'node__title_type' => ['title', ['type', 4]],
+    ];
 
     return $schema;
   }
diff --git a/web/core/modules/node/src/NodeTranslationHandler.php b/web/core/modules/node/src/NodeTranslationHandler.php
index 9c9741e1c..ead0d5d5f 100644
--- a/web/core/modules/node/src/NodeTranslationHandler.php
+++ b/web/core/modules/node/src/NodeTranslationHandler.php
@@ -17,17 +17,7 @@ class NodeTranslationHandler extends ContentTranslationHandler {
   public function entityFormAlter(array &$form, FormStateInterface $form_state, EntityInterface $entity) {
     parent::entityFormAlter($form, $form_state, $entity);
 
-    // Move the translation fieldset to a vertical tab.
     if (isset($form['content_translation'])) {
-      $form['content_translation'] += array(
-        '#group' => 'advanced',
-        '#attributes' => array(
-          'class' => array('node-translation-options'),
-        ),
-      );
-
-      $form['content_translation']['#weight'] = 100;
-
       // We do not need to show these values on node forms: they inherit the
       // basic node property values.
       $form['content_translation']['status']['#access'] = FALSE;
@@ -49,7 +39,7 @@ class NodeTranslationHandler extends ContentTranslationHandler {
         }
       }
       if (isset($status_translatable)) {
-        foreach (array('publish', 'unpublish', 'submit') as $button) {
+        foreach (['publish', 'unpublish', 'submit'] as $button) {
           if (isset($form['actions'][$button])) {
             $form['actions'][$button]['#value'] .= ' ' . ($status_translatable ? t('(this translation)') : t('(all translations)'));
           }
@@ -63,7 +53,7 @@ class NodeTranslationHandler extends ContentTranslationHandler {
    */
   protected function entityFormTitle(EntityInterface $entity) {
     $type_name = node_get_type_label($entity);
-    return t('<em>Edit @type</em> @title', array('@type' => $type_name, '@title' => $entity->label()));
+    return t('<em>Edit @type</em> @title', ['@type' => $type_name, '@title' => $entity->label()]);
   }
 
   /**
diff --git a/web/core/modules/node/src/NodeTypeForm.php b/web/core/modules/node/src/NodeTypeForm.php
index d5fb99822..abef502e1 100644
--- a/web/core/modules/node/src/NodeTypeForm.php
+++ b/web/core/modules/node/src/NodeTypeForm.php
@@ -54,134 +54,134 @@ class NodeTypeForm extends BundleEntityFormBase {
       // get the default values for workflow settings.
       // @todo Make it possible to get default values without an entity.
       //   https://www.drupal.org/node/2318187
-      $node = $this->entityManager->getStorage('node')->create(array('type' => $type->uuid()));
+      $node = $this->entityManager->getStorage('node')->create(['type' => $type->uuid()]);
     }
     else {
-      $form['#title'] = $this->t('Edit %label content type', array('%label' => $type->label()));
+      $form['#title'] = $this->t('Edit %label content type', ['%label' => $type->label()]);
       $fields = $this->entityManager->getFieldDefinitions('node', $type->id());
       // Create a node to get the current values for workflow settings fields.
-      $node = $this->entityManager->getStorage('node')->create(array('type' => $type->id()));
+      $node = $this->entityManager->getStorage('node')->create(['type' => $type->id()]);
     }
 
-    $form['name'] = array(
+    $form['name'] = [
       '#title' => t('Name'),
       '#type' => 'textfield',
       '#default_value' => $type->label(),
       '#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the <em>Add content</em> page. This name must be unique.'),
       '#required' => TRUE,
       '#size' => 30,
-    );
+    ];
 
-    $form['type'] = array(
+    $form['type'] = [
       '#type' => 'machine_name',
       '#default_value' => $type->id(),
       '#maxlength' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
       '#disabled' => $type->isLocked(),
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => ['Drupal\node\Entity\NodeType', 'load'],
-        'source' => array('name'),
-      ),
-      '#description' => t('A unique machine-readable name for this content type. It must only contain lowercase letters, numbers, and underscores. This name will be used for constructing the URL of the %node-add page, in which underscores will be converted into hyphens.', array(
+        'source' => ['name'],
+      ],
+      '#description' => t('A unique machine-readable name for this content type. It must only contain lowercase letters, numbers, and underscores. This name will be used for constructing the URL of the %node-add page, in which underscores will be converted into hyphens.', [
         '%node-add' => t('Add content'),
-      )),
-    );
+      ]),
+    ];
 
-    $form['description'] = array(
+    $form['description'] = [
       '#title' => t('Description'),
       '#type' => 'textarea',
       '#default_value' => $type->getDescription(),
       '#description' => t('This text will be displayed on the <em>Add new content</em> page.'),
-    );
+    ];
 
-    $form['additional_settings'] = array(
+    $form['additional_settings'] = [
       '#type' => 'vertical_tabs',
-      '#attached' => array(
-        'library' => array('node/drupal.content_types'),
-      ),
-    );
+      '#attached' => [
+        'library' => ['node/drupal.content_types'],
+      ],
+    ];
 
-    $form['submission'] = array(
+    $form['submission'] = [
       '#type' => 'details',
       '#title' => t('Submission form settings'),
       '#group' => 'additional_settings',
       '#open' => TRUE,
-    );
-    $form['submission']['title_label'] = array(
+    ];
+    $form['submission']['title_label'] = [
       '#title' => t('Title field label'),
       '#type' => 'textfield',
       '#default_value' => $fields['title']->getLabel(),
       '#required' => TRUE,
-    );
-    $form['submission']['preview_mode'] = array(
+    ];
+    $form['submission']['preview_mode'] = [
       '#type' => 'radios',
       '#title' => t('Preview before submitting'),
       '#default_value' => $type->getPreviewMode(),
-      '#options' => array(
+      '#options' => [
         DRUPAL_DISABLED => t('Disabled'),
         DRUPAL_OPTIONAL => t('Optional'),
         DRUPAL_REQUIRED => t('Required'),
-      ),
-    );
-    $form['submission']['help']  = array(
+      ],
+    ];
+    $form['submission']['help']  = [
       '#type' => 'textarea',
       '#title' => t('Explanation or submission guidelines'),
       '#default_value' => $type->getHelp(),
       '#description' => t('This text will be displayed at the top of the page when creating or editing content of this type.'),
-    );
-    $form['workflow'] = array(
+    ];
+    $form['workflow'] = [
       '#type' => 'details',
       '#title' => t('Publishing options'),
       '#group' => 'additional_settings',
-    );
-    $workflow_options = array(
+    ];
+    $workflow_options = [
       'status' => $node->status->value,
       'promote' => $node->promote->value,
       'sticky' => $node->sticky->value,
       'revision' => $type->isNewRevision(),
-    );
+    ];
     // Prepare workflow options to be used for 'checkboxes' form element.
     $keys = array_keys(array_filter($workflow_options));
     $workflow_options = array_combine($keys, $keys);
-    $form['workflow']['options'] = array(
+    $form['workflow']['options'] = [
       '#type' => 'checkboxes',
       '#title' => t('Default options'),
       '#default_value' => $workflow_options,
-      '#options' => array(
+      '#options' => [
         'status' => t('Published'),
         'promote' => t('Promoted to front page'),
         'sticky' => t('Sticky at top of lists'),
         'revision' => t('Create new revision'),
-      ),
+      ],
       '#description' => t('Users with the <em>Administer content</em> permission will be able to override these options.'),
-    );
+    ];
     if ($this->moduleHandler->moduleExists('language')) {
-      $form['language'] = array(
+      $form['language'] = [
         '#type' => 'details',
         '#title' => t('Language settings'),
         '#group' => 'additional_settings',
-      );
+      ];
 
       $language_configuration = ContentLanguageSettings::loadByEntityTypeBundle('node', $type->id());
-      $form['language']['language_configuration'] = array(
+      $form['language']['language_configuration'] = [
         '#type' => 'language_configuration',
-        '#entity_information' => array(
+        '#entity_information' => [
           'entity_type' => 'node',
           'bundle' => $type->id(),
-        ),
+        ],
         '#default_value' => $language_configuration,
-      );
+      ];
     }
-    $form['display'] = array(
+    $form['display'] = [
       '#type' => 'details',
       '#title' => t('Display settings'),
       '#group' => 'additional_settings',
-    );
-    $form['display']['display_submitted'] = array(
+    ];
+    $form['display']['display_submitted'] = [
       '#type' => 'checkbox',
       '#title' => t('Display author and date information'),
       '#default_value' => $type->displaySubmitted(),
       '#description' => t('Author username and publish date will be displayed.'),
-    );
+    ];
 
     return $this->protectBundleIdElement($form);
   }
@@ -205,7 +205,7 @@ class NodeTypeForm extends BundleEntityFormBase {
     $id = trim($form_state->getValue('type'));
     // '0' is invalid, since elsewhere we check it using empty().
     if ($id == '0') {
-      $form_state->setErrorByName('type', $this->t("Invalid machine-readable name. Enter a name other than %invalid.", array('%invalid' => $id)));
+      $form_state->setErrorByName('type', $this->t("Invalid machine-readable name. Enter a name other than %invalid.", ['%invalid' => $id]));
     }
   }
 
@@ -214,13 +214,13 @@ class NodeTypeForm extends BundleEntityFormBase {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $type = $this->entity;
-    $type->setNewRevision($form_state->getValue(array('options', 'revision')));
+    $type->setNewRevision($form_state->getValue(['options', 'revision']));
     $type->set('type', trim($type->id()));
     $type->set('name', trim($type->label()));
 
     $status = $type->save();
 
-    $t_args = array('%name' => $type->label());
+    $t_args = ['%name' => $type->label()];
 
     if ($status == SAVED_UPDATED) {
       drupal_set_message(t('The content type %name has been updated.', $t_args));
@@ -228,7 +228,7 @@ class NodeTypeForm extends BundleEntityFormBase {
     elseif ($status == SAVED_NEW) {
       node_add_body_field($type);
       drupal_set_message(t('The content type %name has been added.', $t_args));
-      $context = array_merge($t_args, array('link' => $type->link($this->t('View'), 'collection')));
+      $context = array_merge($t_args, ['link' => $type->link($this->t('View'), 'collection')]);
       $this->logger('node')->notice('Added content type %name.', $context);
     }
 
@@ -242,8 +242,8 @@ class NodeTypeForm extends BundleEntityFormBase {
     // Update workflow options.
     // @todo Make it possible to get default values without an entity.
     //   https://www.drupal.org/node/2318187
-    $node = $this->entityManager->getStorage('node')->create(array('type' => $type->id()));
-    foreach (array('status', 'promote', 'sticky') as $field_name) {
+    $node = $this->entityManager->getStorage('node')->create(['type' => $type->id()]);
+    foreach (['status', 'promote', 'sticky'] as $field_name) {
       $value = (bool) $form_state->getValue(['options', $field_name]);
       if ($node->$field_name->value != $value) {
         $fields[$field_name]->getConfig($type->id())->setDefaultValue($value)->save();
diff --git a/web/core/modules/node/src/NodeTypeInterface.php b/web/core/modules/node/src/NodeTypeInterface.php
index c034ffbee..df4831e56 100644
--- a/web/core/modules/node/src/NodeTypeInterface.php
+++ b/web/core/modules/node/src/NodeTypeInterface.php
@@ -3,11 +3,12 @@
 namespace Drupal\node;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
+use Drupal\Core\Entity\RevisionableEntityBundleInterface;
 
 /**
  * Provides an interface defining a node type entity.
  */
-interface NodeTypeInterface extends ConfigEntityInterface {
+interface NodeTypeInterface extends ConfigEntityInterface, RevisionableEntityBundleInterface {
 
   /**
    * Determines whether the node type is locked.
@@ -22,13 +23,17 @@ interface NodeTypeInterface extends ConfigEntityInterface {
    *
    * @return bool
    *   TRUE if a new revision should be created by default.
+   *
+   * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. Use
+   *   Drupal\Core\Entity\RevisionableEntityBundleInterface::shouldCreateNewRevision()
+   *   instead.
    */
   public function isNewRevision();
 
   /**
    * Sets whether a new revision should be created by default.
    *
-   * @param bool $new_revision_
+   * @param bool $new_revision
    *   TRUE if a new revision should be created by default.
    */
   public function setNewRevision($new_revision);
diff --git a/web/core/modules/node/src/NodeTypeListBuilder.php b/web/core/modules/node/src/NodeTypeListBuilder.php
index bdd08745b..be6e5f638 100644
--- a/web/core/modules/node/src/NodeTypeListBuilder.php
+++ b/web/core/modules/node/src/NodeTypeListBuilder.php
@@ -18,10 +18,10 @@ class NodeTypeListBuilder extends ConfigEntityListBuilder {
    */
   public function buildHeader() {
     $header['title'] = t('Name');
-    $header['description'] = array(
+    $header['description'] = [
       'data' => t('Description'),
-      'class' => array(RESPONSIVE_PRIORITY_MEDIUM),
-    );
+      'class' => [RESPONSIVE_PRIORITY_MEDIUM],
+    ];
     return $header + parent::buildHeader();
   }
 
@@ -29,10 +29,10 @@ class NodeTypeListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    $row['title'] = array(
+    $row['title'] = [
       'data' => $entity->label(),
-      'class' => array('menu-label'),
-    );
+      'class' => ['menu-label'],
+    ];
     $row['description']['data'] = ['#markup' => $entity->getDescription()];
     return $row + parent::buildRow($entity);
   }
diff --git a/web/core/modules/node/src/NodeViewBuilder.php b/web/core/modules/node/src/NodeViewBuilder.php
index c65250ee9..f96302bef 100644
--- a/web/core/modules/node/src/NodeViewBuilder.php
+++ b/web/core/modules/node/src/NodeViewBuilder.php
@@ -28,25 +28,25 @@ class NodeViewBuilder extends EntityViewBuilder {
       $display = $displays[$bundle];
 
       if ($display->getComponent('links')) {
-        $build[$id]['links'] = array(
+        $build[$id]['links'] = [
           '#lazy_builder' => [get_called_class() . '::renderLinks', [
             $entity->id(),
             $view_mode,
             $entity->language()->getId(),
             !empty($entity->in_preview),
           ]],
-        );
+        ];
       }
 
       // Add Language field text element to node render array.
       if ($display->getComponent('langcode')) {
-        $build[$id]['langcode'] = array(
+        $build[$id]['langcode'] = [
           '#type' => 'item',
           '#title' => t('Language'),
           '#markup' => $entity->language()->getName(),
           '#prefix' => '<div id="field-language-display">',
           '#suffix' => '</div>'
-        );
+        ];
       }
     }
   }
@@ -81,21 +81,21 @@ class NodeViewBuilder extends EntityViewBuilder {
    *   A renderable array representing the node links.
    */
   public static function renderLinks($node_entity_id, $view_mode, $langcode, $is_in_preview) {
-    $links = array(
+    $links = [
       '#theme' => 'links__node',
-      '#pre_render' => array('drupal_pre_render_links'),
-      '#attributes' => array('class' => array('links', 'inline')),
-    );
+      '#pre_render' => ['drupal_pre_render_links'],
+      '#attributes' => ['class' => ['links', 'inline']],
+    ];
 
     if (!$is_in_preview) {
       $entity = Node::load($node_entity_id)->getTranslation($langcode);
       $links['node'] = static::buildLinks($entity, $view_mode);
 
       // Allow other modules to alter the node links.
-      $hook_context = array(
+      $hook_context = [
         'view_mode' => $view_mode,
         'langcode' => $langcode,
-      );
+      ];
       \Drupal::moduleHandler()->alter('node_links', $links, $entity, $hook_context);
     }
     return $links;
@@ -113,30 +113,30 @@ class NodeViewBuilder extends EntityViewBuilder {
    *   An array that can be processed by drupal_pre_render_links().
    */
   protected static function buildLinks(NodeInterface $entity, $view_mode) {
-    $links = array();
+    $links = [];
 
     // Always display a read more link on teasers because we have no way
     // to know when a teaser view is different than a full view.
     if ($view_mode == 'teaser') {
       $node_title_stripped = strip_tags($entity->label());
-      $links['node-readmore'] = array(
-        'title' => t('Read more<span class="visually-hidden"> about @title</span>', array(
+      $links['node-readmore'] = [
+        'title' => t('Read more<span class="visually-hidden"> about @title</span>', [
           '@title' => $node_title_stripped,
-        )),
+        ]),
         'url' => $entity->urlInfo(),
         'language' => $entity->language(),
-        'attributes' => array(
+        'attributes' => [
           'rel' => 'tag',
           'title' => $node_title_stripped,
-        ),
-      );
+        ],
+      ];
     }
 
-    return array(
+    return [
       '#theme' => 'links__node__node',
       '#links' => $links,
-      '#attributes' => array('class' => array('links', 'inline')),
-    );
+      '#attributes' => ['class' => ['links', 'inline']],
+    ];
   }
 
   /**
diff --git a/web/core/modules/node/src/NodeViewsData.php b/web/core/modules/node/src/NodeViewsData.php
index 21e1e44b2..b5aebf48f 100644
--- a/web/core/modules/node/src/NodeViewsData.php
+++ b/web/core/modules/node/src/NodeViewsData.php
@@ -39,15 +39,15 @@ class NodeViewsData extends EntityViewsData {
     // Use status = 1 instead of status <> 0 in WHERE statement.
     $data['node_field_data']['status']['filter']['use_equal'] = TRUE;
 
-    $data['node_field_data']['status_extra'] = array(
+    $data['node_field_data']['status_extra'] = [
       'title' => $this->t('Published status or admin user'),
       'help' => $this->t('Filters out unpublished content if the current user cannot view it.'),
-      'filter' => array(
+      'filter' => [
         'field' => 'status',
         'id' => 'node_status',
         'label' => $this->t('Published status or admin user'),
-      ),
-    );
+      ],
+    ];
 
     $data['node_field_data']['promote']['help'] = $this->t('A boolean indicating whether the node is visible on the front page.');
     $data['node_field_data']['promote']['filter']['label'] = $this->t('Promoted to front page status');
@@ -58,133 +58,133 @@ class NodeViewsData extends EntityViewsData {
     $data['node_field_data']['sticky']['filter']['type'] = 'yes-no';
     $data['node_field_data']['sticky']['sort']['help'] = $this->t('Whether or not the content is sticky. To list sticky content first, set this to descending.');
 
-    $data['node']['path'] = array(
-      'field' => array(
+    $data['node']['path'] = [
+      'field' => [
         'title' => $this->t('Path'),
         'help' => $this->t('The aliased path to this content.'),
         'id' => 'node_path',
-      ),
-    );
+      ],
+    ];
 
-    $data['node']['node_bulk_form'] = array(
+    $data['node']['node_bulk_form'] = [
       'title' => $this->t('Node operations bulk form'),
       'help' => $this->t('Add a form element that lets you run operations on multiple nodes.'),
-      'field' => array(
+      'field' => [
         'id' => 'node_bulk_form',
-      ),
-    );
+      ],
+    ];
 
     // Bogus fields for aliasing purposes.
 
     // @todo Add similar support to any date field
     // @see https://www.drupal.org/node/2337507
-    $data['node_field_data']['created_fulldate'] = array(
+    $data['node_field_data']['created_fulldate'] = [
       'title' => $this->t('Created date'),
       'help' => $this->t('Date in the form of CCYYMMDD.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_fulldate',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['created_year_month'] = array(
+    $data['node_field_data']['created_year_month'] = [
       'title' => $this->t('Created year + month'),
       'help' => $this->t('Date in the form of YYYYMM.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_year_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['created_year'] = array(
+    $data['node_field_data']['created_year'] = [
       'title' => $this->t('Created year'),
       'help' => $this->t('Date in the form of YYYY.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_year',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['created_month'] = array(
+    $data['node_field_data']['created_month'] = [
       'title' => $this->t('Created month'),
       'help' => $this->t('Date in the form of MM (01 - 12).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['created_day'] = array(
+    $data['node_field_data']['created_day'] = [
       'title' => $this->t('Created day'),
       'help' => $this->t('Date in the form of DD (01 - 31).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_day',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['created_week'] = array(
+    $data['node_field_data']['created_week'] = [
       'title' => $this->t('Created week'),
       'help' => $this->t('Date in the form of WW (01 - 53).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_week',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['changed_fulldate'] = array(
+    $data['node_field_data']['changed_fulldate'] = [
       'title' => $this->t('Updated date'),
       'help' => $this->t('Date in the form of CCYYMMDD.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_fulldate',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['changed_year_month'] = array(
+    $data['node_field_data']['changed_year_month'] = [
       'title' => $this->t('Updated year + month'),
       'help' => $this->t('Date in the form of YYYYMM.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_year_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['changed_year'] = array(
+    $data['node_field_data']['changed_year'] = [
       'title' => $this->t('Updated year'),
       'help' => $this->t('Date in the form of YYYY.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_year',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['changed_month'] = array(
+    $data['node_field_data']['changed_month'] = [
       'title' => $this->t('Updated month'),
       'help' => $this->t('Date in the form of MM (01 - 12).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['changed_day'] = array(
+    $data['node_field_data']['changed_day'] = [
       'title' => $this->t('Updated day'),
       'help' => $this->t('Date in the form of DD (01 - 31).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_day',
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_data']['changed_week'] = array(
+    $data['node_field_data']['changed_week'] = [
       'title' => $this->t('Updated week'),
       'help' => $this->t('Date in the form of WW (01 - 53).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_week',
-      ),
-    );
+      ],
+    ];
 
     $data['node_field_data']['uid']['help'] = $this->t('The user authoring the content. If you need more fields than the uid add the content: author relationship');
     $data['node_field_data']['uid']['filter']['id'] = 'user_name';
@@ -192,13 +192,13 @@ class NodeViewsData extends EntityViewsData {
     $data['node_field_data']['uid']['relationship']['help'] = $this->t('Relate content to the user who created it.');
     $data['node_field_data']['uid']['relationship']['label'] = $this->t('author');
 
-    $data['node']['node_listing_empty'] = array(
+    $data['node']['node_listing_empty'] = [
       'title' => $this->t('Empty Node Frontpage behavior'),
       'help' => $this->t('Provides a link to the node add overview page.'),
-      'area' => array(
+      'area' => [
         'id' => 'node_listing_empty',
-      ),
-    );
+      ],
+    ];
 
     $data['node_field_data']['uid_revision']['title'] = $this->t('User has a revision');
     $data['node_field_data']['uid_revision']['help'] = $this->t('All nodes where a certain user has a revision');
@@ -225,19 +225,19 @@ class NodeViewsData extends EntityViewsData {
     $data['node_field_revision']['nid']['relationship']['title'] = $this->t('Content');
     $data['node_field_revision']['nid']['relationship']['label'] = $this->t('Get the actual content from a content revision.');
 
-    $data['node_field_revision']['vid'] = array(
-      'argument' => array(
+    $data['node_field_revision']['vid'] = [
+      'argument' => [
         'id' => 'node_vid',
         'numeric' => TRUE,
-      ),
-      'relationship' => array(
+      ],
+      'relationship' => [
         'id' => 'standard',
         'base' => 'node_field_data',
         'base field' => 'vid',
         'title' => $this->t('Content'),
         'label' => $this->t('Get the actual content from a content revision.'),
-      ),
-    ) + $data['node_field_revision']['vid'];
+      ],
+    ] + $data['node_field_revision']['vid'];
 
     $data['node_field_revision']['langcode']['help'] = $this->t('The language the original content is in.');
 
@@ -259,52 +259,52 @@ class NodeViewsData extends EntityViewsData {
 
     $data['node_field_revision']['langcode']['help'] = $this->t('The language of the content or translation.');
 
-    $data['node_field_revision']['link_to_revision'] = array(
-      'field' => array(
+    $data['node_field_revision']['link_to_revision'] = [
+      'field' => [
         'title' => $this->t('Link to revision'),
         'help' => $this->t('Provide a simple link to the revision.'),
         'id' => 'node_revision_link',
         'click sortable' => FALSE,
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_revision']['revert_revision'] = array(
-      'field' => array(
+    $data['node_field_revision']['revert_revision'] = [
+      'field' => [
         'title' => $this->t('Link to revert revision'),
         'help' => $this->t('Provide a simple link to revert to the revision.'),
         'id' => 'node_revision_link_revert',
         'click sortable' => FALSE,
-      ),
-    );
+      ],
+    ];
 
-    $data['node_field_revision']['delete_revision'] = array(
-      'field' => array(
+    $data['node_field_revision']['delete_revision'] = [
+      'field' => [
         'title' => $this->t('Link to delete revision'),
         'help' => $this->t('Provide a simple link to delete the content revision.'),
         'id' => 'node_revision_link_delete',
         'click sortable' => FALSE,
-      ),
-    );
+      ],
+    ];
 
     // Define the base group of this table. Fields that don't have a group defined
     // will go into this field by default.
     $data['node_access']['table']['group']  = $this->t('Content access');
 
     // For other base tables, explain how we join.
-    $data['node_access']['table']['join'] = array(
-      'node_field_data' => array(
+    $data['node_access']['table']['join'] = [
+      'node_field_data' => [
         'left_field' => 'nid',
         'field' => 'nid',
-      ),
-    );
-    $data['node_access']['nid'] = array(
+      ],
+    ];
+    $data['node_access']['nid'] = [
       'title' => $this->t('Access'),
       'help' => $this->t('Filter by access.'),
-      'filter' => array(
+      'filter' => [
         'id' => 'node_access',
         'help' => $this->t('Filter for content by view access. <strong>Not necessary if you are using node as your base table.</strong>'),
-      ),
-    );
+      ],
+    ];
 
     // Add search table, fields, filters, etc., but only if a page using the
     // node_search plugin is enabled.
@@ -324,61 +324,61 @@ class NodeViewsData extends EntityViewsData {
         // Automatically join to the node table (or actually, node_field_data).
         // Use a Views table alias to allow other modules to use this table too,
         // if they use the search index.
-        $data['node_search_index']['table']['join'] = array(
-          'node_field_data' => array(
+        $data['node_search_index']['table']['join'] = [
+          'node_field_data' => [
             'left_field' => 'nid',
             'field' => 'sid',
             'table' => 'search_index',
             'extra' => "node_search_index.type = 'node_search' AND node_search_index.langcode = node_field_data.langcode",
-          )
-        );
+          ]
+        ];
 
-        $data['node_search_total']['table']['join'] = array(
-          'node_search_index' => array(
+        $data['node_search_total']['table']['join'] = [
+          'node_search_index' => [
             'left_field' => 'word',
             'field' => 'word',
-          ),
-        );
+          ],
+        ];
 
-        $data['node_search_dataset']['table']['join'] = array(
-          'node_field_data' => array(
+        $data['node_search_dataset']['table']['join'] = [
+          'node_field_data' => [
             'left_field' => 'sid',
             'left_table' => 'node_search_index',
             'field' => 'sid',
             'table' => 'search_dataset',
             'extra' => 'node_search_index.type = node_search_dataset.type AND node_search_index.langcode = node_search_dataset.langcode',
             'type' => 'INNER',
-          ),
-        );
+          ],
+        ];
 
-        $data['node_search_index']['score'] = array(
+        $data['node_search_index']['score'] = [
           'title' => $this->t('Score'),
           'help' => $this->t('The score of the search item. This will not be used if the search filter is not also present.'),
-          'field' => array(
+          'field' => [
             'id' => 'search_score',
             'float' => TRUE,
             'no group by' => TRUE,
-          ),
-          'sort' => array(
+          ],
+          'sort' => [
             'id' => 'search_score',
             'no group by' => TRUE,
-          ),
-        );
+          ],
+        ];
 
-        $data['node_search_index']['keys'] = array(
+        $data['node_search_index']['keys'] = [
           'title' => $this->t('Search Keywords'),
           'help' => $this->t('The keywords to search for.'),
-          'filter' => array(
+          'filter' => [
             'id' => 'search_keywords',
             'no group by' => TRUE,
             'search_type' => 'node_search',
-          ),
-          'argument' => array(
+          ],
+          'argument' => [
             'id' => 'search',
             'no group by' => TRUE,
             'search_type' => 'node_search',
-          ),
-        );
+          ],
+        ];
 
       }
     }
diff --git a/web/core/modules/node/src/Plugin/Action/AssignOwnerNode.php b/web/core/modules/node/src/Plugin/Action/AssignOwnerNode.php
index 7c4412d0c..d9a9a4355 100644
--- a/web/core/modules/node/src/Plugin/Action/AssignOwnerNode.php
+++ b/web/core/modules/node/src/Plugin/Action/AssignOwnerNode.php
@@ -67,9 +67,9 @@ class AssignOwnerNode extends ConfigurableActionBase implements ContainerFactory
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'owner_uid' => '',
-    );
+    ];
   }
 
   /**
@@ -81,34 +81,34 @@ class AssignOwnerNode extends ConfigurableActionBase implements ContainerFactory
 
     // Use dropdown for fewer than 200 users; textbox for more than that.
     if (intval($count) < 200) {
-      $options = array();
+      $options = [];
       $result = $this->connection->query("SELECT uid, name FROM {users_field_data} WHERE uid > 0 AND default_langcode = 1 ORDER BY name");
       foreach ($result as $data) {
         $options[$data->uid] = $data->name;
       }
-      $form['owner_uid'] = array(
+      $form['owner_uid'] = [
         '#type' => 'select',
         '#title' => t('Username'),
         '#default_value' => $this->configuration['owner_uid'],
         '#options' => $options,
         '#description' => $description,
-      );
+      ];
     }
     else {
-      $form['owner_uid'] = array(
+      $form['owner_uid'] = [
         '#type' => 'entity_autocomplete',
         '#title' => t('Username'),
         '#target_type' => 'user',
-        '#selection_setttings' => array(
+        '#selection_setttings' => [
           'include_anonymous' => FALSE,
-        ),
+        ],
         '#default_value' => User::load($this->configuration['owner_uid']),
         // Validation is done in static::validateConfigurationForm().
         '#validate_reference' => FALSE,
         '#size' => '6',
         '#maxlength' => '60',
         '#description' => $description,
-      );
+      ];
     }
     return $form;
   }
@@ -117,7 +117,7 @@ class AssignOwnerNode extends ConfigurableActionBase implements ContainerFactory
    * {@inheritdoc}
    */
   public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $exists = (bool) $this->connection->queryRange('SELECT 1 FROM {users_field_data} WHERE uid = :uid AND default_langcode = 1', 0, 1, array(':uid' => $form_state->getValue('owner_uid')))->fetchField();
+    $exists = (bool) $this->connection->queryRange('SELECT 1 FROM {users_field_data} WHERE uid = :uid AND default_langcode = 1', 0, 1, [':uid' => $form_state->getValue('owner_uid')])->fetchField();
     if (!$exists) {
       $form_state->setErrorByName('owner_uid', t('Enter a valid username.'));
     }
diff --git a/web/core/modules/node/src/Plugin/Action/DeleteNode.php b/web/core/modules/node/src/Plugin/Action/DeleteNode.php
index 83124f116..5bf5d9ec3 100644
--- a/web/core/modules/node/src/Plugin/Action/DeleteNode.php
+++ b/web/core/modules/node/src/Plugin/Action/DeleteNode.php
@@ -85,7 +85,7 @@ class DeleteNode extends ActionBase implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public function execute($object = NULL) {
-    $this->executeMultiple(array($object));
+    $this->executeMultiple([$object]);
   }
 
   /**
diff --git a/web/core/modules/node/src/Plugin/Action/PublishNode.php b/web/core/modules/node/src/Plugin/Action/PublishNode.php
index 83a435419..c8d3b5bfa 100644
--- a/web/core/modules/node/src/Plugin/Action/PublishNode.php
+++ b/web/core/modules/node/src/Plugin/Action/PublishNode.php
@@ -20,8 +20,7 @@ class PublishNode extends ActionBase {
    * {@inheritdoc}
    */
   public function execute($entity = NULL) {
-    $entity->status = NODE_PUBLISHED;
-    $entity->save();
+    $entity->setPublished()->save();
   }
 
   /**
diff --git a/web/core/modules/node/src/Plugin/Action/StickyNode.php b/web/core/modules/node/src/Plugin/Action/StickyNode.php
index 406851424..7aff92bbc 100644
--- a/web/core/modules/node/src/Plugin/Action/StickyNode.php
+++ b/web/core/modules/node/src/Plugin/Action/StickyNode.php
@@ -20,8 +20,7 @@ class StickyNode extends ActionBase {
    * {@inheritdoc}
    */
   public function execute($entity = NULL) {
-    $entity->sticky = NODE_STICKY;
-    $entity->save();
+    $entity->setSticky(TRUE)->save();
   }
 
   /**
diff --git a/web/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php b/web/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php
index 6ec835eb4..c0081882c 100644
--- a/web/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php
+++ b/web/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php
@@ -36,21 +36,21 @@ class UnpublishByKeywordNode extends ConfigurableActionBase {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
-      'keywords' => array(),
-    );
+    return [
+      'keywords' => [],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['keywords'] = array(
+    $form['keywords'] = [
       '#title' => t('Keywords'),
       '#type' => 'textarea',
       '#description' => t('The content will be unpublished if it contains any of the phrases above. Use a case-sensitive, comma-separated list of phrases. Example: funny, bungee jumping, "Company, Inc."'),
       '#default_value' => Tags::implode($this->configuration['keywords']),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/node/src/Plugin/Action/UnpublishNode.php b/web/core/modules/node/src/Plugin/Action/UnpublishNode.php
index 403a55e6e..ec6209d9b 100644
--- a/web/core/modules/node/src/Plugin/Action/UnpublishNode.php
+++ b/web/core/modules/node/src/Plugin/Action/UnpublishNode.php
@@ -20,8 +20,7 @@ class UnpublishNode extends ActionBase {
    * {@inheritdoc}
    */
   public function execute($entity = NULL) {
-    $entity->status = NODE_NOT_PUBLISHED;
-    $entity->save();
+    $entity->setUnpublished()->save();
   }
 
   /**
diff --git a/web/core/modules/node/src/Plugin/Action/UnstickyNode.php b/web/core/modules/node/src/Plugin/Action/UnstickyNode.php
index 6c3e9478d..92ccfe2c0 100644
--- a/web/core/modules/node/src/Plugin/Action/UnstickyNode.php
+++ b/web/core/modules/node/src/Plugin/Action/UnstickyNode.php
@@ -20,8 +20,7 @@ class UnstickyNode extends ActionBase {
    * {@inheritdoc}
    */
   public function execute($entity = NULL) {
-    $entity->sticky = NODE_NOT_STICKY;
-    $entity->save();
+    $entity->setSticky(FALSE)->save();
   }
 
   /**
diff --git a/web/core/modules/node/src/Plugin/Block/SyndicateBlock.php b/web/core/modules/node/src/Plugin/Block/SyndicateBlock.php
index 07b969b50..bcc98d04b 100644
--- a/web/core/modules/node/src/Plugin/Block/SyndicateBlock.php
+++ b/web/core/modules/node/src/Plugin/Block/SyndicateBlock.php
@@ -21,9 +21,9 @@ class SyndicateBlock extends BlockBase {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'block_count' => 10,
-    );
+    ];
   }
 
   /**
@@ -37,10 +37,10 @@ class SyndicateBlock extends BlockBase {
    * {@inheritdoc}
    */
   public function build() {
-    return array(
+    return [
       '#theme' => 'feed_icon',
       '#url' => 'rss.xml',
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/node/src/Plugin/Condition/NodeType.php b/web/core/modules/node/src/Plugin/Condition/NodeType.php
index ace42e620..dcd2dc7d3 100644
--- a/web/core/modules/node/src/Plugin/Condition/NodeType.php
+++ b/web/core/modules/node/src/Plugin/Condition/NodeType.php
@@ -64,17 +64,17 @@ class NodeType extends ConditionPluginBase implements ContainerFactoryPluginInte
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $options = array();
+    $options = [];
     $node_types = $this->entityStorage->loadMultiple();
     foreach ($node_types as $type) {
       $options[$type->id()] = $type->label();
     }
-    $form['bundles'] = array(
+    $form['bundles'] = [
       '#title' => $this->t('Node types'),
       '#type' => 'checkboxes',
       '#options' => $options,
       '#default_value' => $this->configuration['bundles'],
-    );
+    ];
     return parent::buildConfigurationForm($form, $form_state);
   }
 
@@ -94,10 +94,10 @@ class NodeType extends ConditionPluginBase implements ContainerFactoryPluginInte
       $bundles = $this->configuration['bundles'];
       $last = array_pop($bundles);
       $bundles = implode(', ', $bundles);
-      return $this->t('The node bundle is @bundles or @last', array('@bundles' => $bundles, '@last' => $last));
+      return $this->t('The node bundle is @bundles or @last', ['@bundles' => $bundles, '@last' => $last]);
     }
     $bundle = reset($this->configuration['bundles']);
-    return $this->t('The node bundle is @bundle', array('@bundle' => $bundle));
+    return $this->t('The node bundle is @bundle', ['@bundle' => $bundle]);
   }
 
   /**
@@ -115,7 +115,7 @@ class NodeType extends ConditionPluginBase implements ContainerFactoryPluginInte
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array('bundles' => array()) + parent::defaultConfiguration();
+    return ['bundles' => []] + parent::defaultConfiguration();
   }
 
 }
diff --git a/web/core/modules/node/src/Plugin/EntityReferenceSelection/NodeSelection.php b/web/core/modules/node/src/Plugin/EntityReferenceSelection/NodeSelection.php
index 7943624b5..906f15f3b 100644
--- a/web/core/modules/node/src/Plugin/EntityReferenceSelection/NodeSelection.php
+++ b/web/core/modules/node/src/Plugin/EntityReferenceSelection/NodeSelection.php
@@ -4,6 +4,7 @@ namespace Drupal\node\Plugin\EntityReferenceSelection;
 
 use Drupal\Core\Entity\Plugin\EntityReferenceSelection\DefaultSelection;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\node\NodeInterface;
 
 /**
  * Provides specific access control for the node entity type.
@@ -38,7 +39,7 @@ class NodeSelection extends DefaultSelection {
     // modules in use on the site. As long as one access control module is there,
     // it is supposed to handle this check.
     if (!$this->currentUser->hasPermission('bypass node access') && !count($this->moduleHandler->getImplementations('node_grants'))) {
-      $query->condition('status', NODE_PUBLISHED);
+      $query->condition('status', NodeInterface::PUBLISHED);
     }
     return $query;
   }
diff --git a/web/core/modules/node/src/Plugin/Search/NodeSearch.php b/web/core/modules/node/src/Plugin/Search/NodeSearch.php
index d161a0a0d..6d7c8eb7d 100644
--- a/web/core/modules/node/src/Plugin/Search/NodeSearch.php
+++ b/web/core/modules/node/src/Plugin/Search/NodeSearch.php
@@ -102,12 +102,12 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
    *
    * @var array
    */
-  protected $advanced = array(
-    'type' => array('column' => 'n.type'),
-    'language' => array('column' => 'i.langcode'),
-    'author' => array('column' => 'n.uid'),
-    'term' => array('column' => 'ti.tid', 'join' => array('table' => 'taxonomy_index', 'alias' => 'ti', 'condition' => 'n.nid = ti.nid')),
-  );
+  protected $advanced = [
+    'type' => ['column' => 'n.type'],
+    'language' => ['column' => 'i.langcode'],
+    'author' => ['column' => 'n.uid'],
+    'term' => ['column' => 'ti.tid', 'join' => ['table' => 'taxonomy_index', 'alias' => 'ti', 'condition' => 'n.nid = ti.nid']],
+  ];
 
   /**
    * A constant for setting and checking the query string.
@@ -207,7 +207,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
       }
     }
 
-    return array();
+    return [];
   }
 
   /**
@@ -225,7 +225,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
 
     // Build matching conditions.
     $query = $this->database
-      ->select('search_index', 'i', array('target' => 'replica'))
+      ->select('search_index', 'i', ['target' => 'replica'])
       ->extend('Drupal\search\SearchQuery')
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender');
     $query->join('node_field_data', 'n', 'n.nid = i.sid AND n.langcode = i.langcode');
@@ -242,7 +242,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     // the keywords string, and some of which are separate conditions.
     $parameters = $this->getParameters();
     if (!empty($parameters['f']) && is_array($parameters['f'])) {
-      $filters = array();
+      $filters = [];
       // Match any query value that is an expected option and a value
       // separated by ':' like 'term:27'.
       $pattern = '/^(' . implode('|', array_keys($this->advanced)) . '):([^ ]*)/i';
@@ -277,7 +277,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     $find = $query
       // Add the language code of the indexed item to the result of the query,
       // since the node will be rendered using the respective language.
-      ->fields('i', array('langcode'))
+      ->fields('i', ['langcode'])
       // And since SearchQuery makes these into GROUP BY queries, if we add
       // a field, for PostgreSQL we also need to make it an aggregate or a
       // GROUP BY. In this case, we want GROUP BY.
@@ -289,7 +289,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     $status = $query->getStatus();
 
     if ($status & SearchQuery::EXPRESSIONS_IGNORED) {
-      drupal_set_message($this->t('Your search used too many AND/OR expressions. Only the first @count terms were included in this search.', array('@count' => $this->searchSettings->get('and_or_limit'))), 'warning');
+      drupal_set_message($this->t('Your search used too many AND/OR expressions. Only the first @count terms were included in this search.', ['@count' => $this->searchSettings->get('and_or_limit')]), 'warning');
     }
 
     if ($status & SearchQuery::LOWER_CASE_OR) {
@@ -313,7 +313,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
    *   Array of search result item render arrays (empty array if no results).
    */
   protected function prepareResults(StatementInterface $found) {
-    $results = array();
+    $results = [];
 
     $node_storage = $this->entityManager->getStorage('node');
     $node_render = $this->entityManager->getViewBuilder('node');
@@ -329,7 +329,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
       $type = $this->entityManager->getStorage('node_type')->load($node->bundle());
 
       unset($build['#theme']);
-      $build['#pre_render'][] = array($this, 'removeSubmittedInfo');
+      $build['#pre_render'][] = [$this, 'removeSubmittedInfo'];
 
       // Fetch comments for snippet.
       $rendered = $this->renderer->renderPlain($build);
@@ -339,13 +339,13 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
       $extra = $this->moduleHandler->invokeAll('node_search_result', [$node]);
 
       $language = $this->languageManager->getLanguage($item->langcode);
-      $username = array(
+      $username = [
         '#theme' => 'username',
         '#account' => $node->getOwner(),
-      );
+      ];
 
-      $result = array(
-        'link' => $node->url('canonical', array('absolute' => TRUE, 'language' => $language)),
+      $result = [
+        'link' => $node->url('canonical', ['absolute' => TRUE, 'language' => $language]),
         'type' => $type->label(),
         'title' => $node->label(),
         'node' => $node,
@@ -353,7 +353,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
         'score' => $item->calculated_score,
         'snippet' => search_excerpt($keys, $rendered, $item->langcode),
         'langcode' => $node->language()->getId(),
-      );
+      ];
 
       $this->addCacheableDependency($node);
 
@@ -364,10 +364,10 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
       $this->addCacheableDependency($node->getOwner());
 
       if ($type->displaySubmitted()) {
-        $result += array(
+        $result += [
           'user' => $this->renderer->renderPlain($username),
           'date' => $node->getChangedTime(),
-        );
+        ];
       }
 
       $results[] = $result;
@@ -411,7 +411,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
           if (isset($values['join']) && !isset($tables[$values['join']['alias']])) {
             $query->addJoin($values['join']['type'], $values['join']['table'], $values['join']['alias'], $values['join']['on']);
           }
-          $arguments = isset($values['arguments']) ? $values['arguments'] : array();
+          $arguments = isset($values['arguments']) ? $values['arguments'] : [];
           $query->addScore($values['score'], $arguments, $node_rank);
         }
       }
@@ -426,15 +426,15 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     // per cron run.
     $limit = (int) $this->searchSettings->get('index.cron_limit');
 
-    $query = db_select('node', 'n', array('target' => 'replica'));
+    $query = db_select('node', 'n', ['target' => 'replica']);
     $query->addField('n', 'nid');
-    $query->leftJoin('search_dataset', 'sd', 'sd.sid = n.nid AND sd.type = :type', array(':type' => $this->getPluginId()));
+    $query->leftJoin('search_dataset', 'sd', 'sd.sid = n.nid AND sd.type = :type', [':type' => $this->getPluginId()]);
     $query->addExpression('CASE MAX(sd.reindex) WHEN NULL THEN 0 ELSE 1 END', 'ex');
     $query->addExpression('MAX(sd.reindex)', 'ex2');
     $query->condition(
         $query->orConditionGroup()
-        ->where('sd.sid IS NULL')
-        ->condition('sd.reindex', 0, '<>')
+          ->where('sd.sid IS NULL')
+          ->condition('sd.reindex', 0, '<>')
       );
     $query->orderBy('ex', 'DESC')
       ->orderBy('ex2')
@@ -513,9 +513,9 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
    */
   public function indexStatus() {
     $total = $this->database->query('SELECT COUNT(*) FROM {node}')->fetchField();
-    $remaining = $this->database->query("SELECT COUNT(DISTINCT n.nid) FROM {node} n LEFT JOIN {search_dataset} sd ON sd.sid = n.nid AND sd.type = :type WHERE sd.sid IS NULL OR sd.reindex <> 0", array(':type' => $this->getPluginId()))->fetchField();
+    $remaining = $this->database->query("SELECT COUNT(DISTINCT n.nid) FROM {node} n LEFT JOIN {search_dataset} sd ON sd.sid = n.nid AND sd.type = :type WHERE sd.sid IS NULL OR sd.reindex <> 0", [':type' => $this->getPluginId()])->fetchField();
 
-    return array('remaining' => $remaining, 'total' => $total);
+    return ['remaining' => $remaining, 'total' => $total];
   }
 
   /**
@@ -526,100 +526,100 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     $keys = $this->getKeywords();
     $used_advanced = !empty($parameters[self::ADVANCED_FORM]);
     if ($used_advanced) {
-      $f = isset($parameters['f']) ? (array) $parameters['f'] : array();
+      $f = isset($parameters['f']) ? (array) $parameters['f'] : [];
       $defaults = $this->parseAdvancedDefaults($f, $keys);
     }
     else {
-      $defaults = array('keys' => $keys);
+      $defaults = ['keys' => $keys];
     }
 
     $form['basic']['keys']['#default_value'] = $defaults['keys'];
 
     // Add advanced search keyword-related boxes.
-    $form['advanced'] = array(
+    $form['advanced'] = [
       '#type' => 'details',
       '#title' => t('Advanced search'),
-      '#attributes' => array('class' => array('search-advanced')),
+      '#attributes' => ['class' => ['search-advanced']],
       '#access' => $this->account && $this->account->hasPermission('use advanced search'),
       '#open' => $used_advanced,
-    );
-    $form['advanced']['keywords-fieldset'] = array(
+    ];
+    $form['advanced']['keywords-fieldset'] = [
       '#type' => 'fieldset',
       '#title' => t('Keywords'),
-    );
+    ];
 
-    $form['advanced']['keywords'] = array(
+    $form['advanced']['keywords'] = [
       '#prefix' => '<div class="criterion">',
       '#suffix' => '</div>',
-    );
+    ];
 
-    $form['advanced']['keywords-fieldset']['keywords']['or'] = array(
+    $form['advanced']['keywords-fieldset']['keywords']['or'] = [
       '#type' => 'textfield',
       '#title' => t('Containing any of the words'),
       '#size' => 30,
       '#maxlength' => 255,
       '#default_value' => isset($defaults['or']) ? $defaults['or'] : '',
-    );
+    ];
 
-    $form['advanced']['keywords-fieldset']['keywords']['phrase'] = array(
+    $form['advanced']['keywords-fieldset']['keywords']['phrase'] = [
       '#type' => 'textfield',
       '#title' => t('Containing the phrase'),
       '#size' => 30,
       '#maxlength' => 255,
       '#default_value' => isset($defaults['phrase']) ? $defaults['phrase'] : '',
-    );
+    ];
 
-    $form['advanced']['keywords-fieldset']['keywords']['negative'] = array(
+    $form['advanced']['keywords-fieldset']['keywords']['negative'] = [
       '#type' => 'textfield',
       '#title' => t('Containing none of the words'),
       '#size' => 30,
       '#maxlength' => 255,
       '#default_value' => isset($defaults['negative']) ? $defaults['negative'] : '',
-    );
+    ];
 
     // Add node types.
-    $types = array_map(array('\Drupal\Component\Utility\Html', 'escape'), node_type_get_names());
-    $form['advanced']['types-fieldset'] = array(
+    $types = array_map(['\Drupal\Component\Utility\Html', 'escape'], node_type_get_names());
+    $form['advanced']['types-fieldset'] = [
       '#type' => 'fieldset',
       '#title' => t('Types'),
-    );
-    $form['advanced']['types-fieldset']['type'] = array(
+    ];
+    $form['advanced']['types-fieldset']['type'] = [
       '#type' => 'checkboxes',
       '#title' => t('Only of the type(s)'),
       '#prefix' => '<div class="criterion">',
       '#suffix' => '</div>',
       '#options' => $types,
-      '#default_value' => isset($defaults['type']) ? $defaults['type'] : array(),
-    );
+      '#default_value' => isset($defaults['type']) ? $defaults['type'] : [],
+    ];
 
-    $form['advanced']['submit'] = array(
+    $form['advanced']['submit'] = [
       '#type' => 'submit',
       '#value' => t('Advanced search'),
       '#prefix' => '<div class="action">',
       '#suffix' => '</div>',
       '#weight' => 100,
-    );
+    ];
 
     // Add languages.
-    $language_options = array();
+    $language_options = [];
     $language_list = $this->languageManager->getLanguages(LanguageInterface::STATE_ALL);
     foreach ($language_list as $langcode => $language) {
       // Make locked languages appear special in the list.
-      $language_options[$langcode] = $language->isLocked() ? t('- @name -', array('@name' => $language->getName())) : $language->getName();
+      $language_options[$langcode] = $language->isLocked() ? t('- @name -', ['@name' => $language->getName()]) : $language->getName();
     }
     if (count($language_options) > 1) {
-      $form['advanced']['lang-fieldset'] = array(
+      $form['advanced']['lang-fieldset'] = [
         '#type' => 'fieldset',
         '#title' => t('Languages'),
-      );
-      $form['advanced']['lang-fieldset']['language'] = array(
+      ];
+      $form['advanced']['lang-fieldset']['language'] = [
         '#type' => 'checkboxes',
         '#title' => t('Languages'),
         '#prefix' => '<div class="criterion">',
         '#suffix' => '</div>',
         '#options' => $language_options,
-        '#default_value' => isset($defaults['language']) ? $defaults['language'] : array(),
-      );
+        '#default_value' => isset($defaults['language']) ? $defaults['language'] : [],
+      ];
     }
   }
 
@@ -633,7 +633,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     $advanced = FALSE;
 
     // Collect extra filters.
-    $filters = array();
+    $filters = [];
     if ($form_state->hasValue('type') && is_array($form_state->getValue('type'))) {
       // Retrieve selected types - Form API sets the value of unselected
       // checkboxes to 0.
@@ -680,7 +680,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     // Put the keywords and advanced parameters into GET parameters. Make sure
     // to put keywords into the query even if it is empty, because the page
     // controller uses that to decide it's time to check for search results.
-    $query = array('keys' => $keys);
+    $query = ['keys' => $keys];
     if ($filters) {
       $query['f'] = $filters;
     }
@@ -707,13 +707,13 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
    *   a modified 'keys' element for the bare search keywords.
    */
   protected function parseAdvancedDefaults($f, $keys) {
-    $defaults = array();
+    $defaults = [];
 
     // Split out the advanced search parameters.
     foreach ($f as $advanced) {
       list($key, $value) = explode(':', $advanced, 2);
       if (!isset($defaults[$key])) {
-        $defaults[$key] = array();
+        $defaults[$key] = [];
       }
       $defaults[$key][] = $value;
     }
@@ -721,7 +721,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     // Split out the negative, phrase, and OR parts of keywords.
 
     // For phrases, the form only supports one phrase.
-    $matches = array();
+    $matches = [];
     $keys = ' ' . $keys . ' ';
     if (preg_match('/ "([^"]+)" /', $keys, $matches)) {
       $keys = str_replace($matches[0], ' ', $keys);
@@ -764,9 +764,9 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    $configuration = array(
-      'rankings' => array(),
-    );
+    $configuration = [
+      'rankings' => [],
+    ];
     return $configuration;
   }
 
@@ -775,34 +775,34 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     // Output form for defining rank factor weights.
-    $form['content_ranking'] = array(
+    $form['content_ranking'] = [
       '#type' => 'details',
       '#title' => t('Content ranking'),
       '#open' => TRUE,
-    );
-    $form['content_ranking']['info'] = array(
+    ];
+    $form['content_ranking']['info'] = [
       '#markup' => '<p><em>' . $this->t('Influence is a numeric multiplier used in ordering search results. A higher number means the corresponding factor has more influence on search results; zero means the factor is ignored. Changing these numbers does not require the search index to be rebuilt. Changes take effect immediately.') . '</em></p>'
-    );
+    ];
     // Prepare table.
     $header = [$this->t('Factor'), $this->t('Influence')];
-    $form['content_ranking']['rankings'] = array(
+    $form['content_ranking']['rankings'] = [
       '#type' => 'table',
       '#header' => $header,
-    );
+    ];
 
     // Note: reversed to reflect that higher number = higher ranking.
     $range = range(0, 10);
     $options = array_combine($range, $range);
     foreach ($this->getRankings() as $var => $values) {
-      $form['content_ranking']['rankings'][$var]['name'] = array(
+      $form['content_ranking']['rankings'][$var]['name'] = [
         '#markup' => $values['title'],
-      );
-      $form['content_ranking']['rankings'][$var]['value'] = array(
+      ];
+      $form['content_ranking']['rankings'][$var]['value'] = [
         '#type' => 'select',
         '#options' => $options,
         '#attributes' => ['aria-label' => $this->t("Influence of '@title'", ['@title' => $values['title']])],
         '#default_value' => isset($this->configuration['rankings'][$var]) ? $this->configuration['rankings'][$var] : 0,
-      );
+      ];
     }
     return $form;
   }
diff --git a/web/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php b/web/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
index 3fba70ac4..6d9b67af1 100644
--- a/web/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
+++ b/web/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
@@ -90,8 +90,18 @@ class D6NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
       return $this->derivatives;
     }
 
+    $node_types = static::getSourcePlugin('d6_node_type');
+    try {
+      $node_types->checkRequirements();
+    }
+    catch (RequirementsException $e) {
+      // If the d6_node_type requirements failed, that means we do not have a
+      // Drupal source database configured - there is nothing to generate.
+      return $this->derivatives;
+    }
+
     // Read all CCK field instance definitions in the source database.
-    $fields = array();
+    $fields = [];
     try {
       $source_plugin = static::getSourcePlugin('d6_field_instance');
       $source_plugin->checkRequirements();
@@ -107,7 +117,7 @@ class D6NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
     }
 
     try {
-      foreach (static::getSourcePlugin('d6_node_type') as $row) {
+      foreach ($node_types as $row) {
         $node_type = $row->getSourceProperty('type');
         $values = $base_plugin_definition;
 
diff --git a/web/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php b/web/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
index bd3d8b9fc..a35c3763a 100644
--- a/web/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
+++ b/web/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
@@ -38,6 +38,13 @@ class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
    */
   protected $cckPluginManager;
 
+  /**
+   * Whether or not to include translations.
+   *
+   * @var bool
+   */
+  protected $includeTranslations;
+
   /**
    * D7NodeDeriver constructor.
    *
@@ -45,19 +52,24 @@ class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
    *   The base plugin ID for the plugin ID.
    * @param \Drupal\migrate_drupal\Plugin\MigrateCckFieldPluginManagerInterface $cck_manager
    *   The CCK plugin manager.
+   * @param bool $translations
+   *   Whether or not to include translations.
    */
-  public function __construct($base_plugin_id, MigrateCckFieldPluginManagerInterface $cck_manager) {
+  public function __construct($base_plugin_id, MigrateCckFieldPluginManagerInterface $cck_manager, $translations) {
     $this->basePluginId = $base_plugin_id;
     $this->cckPluginManager = $cck_manager;
+    $this->includeTranslations = $translations;
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, $base_plugin_id) {
+    // Translations don't make sense unless we have content_translation.
     return new static(
       $base_plugin_id,
-      $container->get('plugin.manager.migrate.cckfield')
+      $container->get('plugin.manager.migrate.cckfield'),
+      $container->get('module_handler')->moduleExists('content_translation')
     );
   }
 
@@ -65,6 +77,21 @@ class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
+    if (in_array('translation', $base_plugin_definition['migration_tags']) && !$this->includeTranslations) {
+      // Refuse to generate anything.
+      return $this->derivatives;
+    }
+
+    $node_types = static::getSourcePlugin('d7_node_type');
+    try {
+      $node_types->checkRequirements();
+    }
+    catch (RequirementsException $e) {
+      // If the d7_node_type requirements failed, that means we do not have a
+      // Drupal source database configured - there is nothing to generate.
+      return $this->derivatives;
+    }
+
     $fields = [];
     try {
       $source_plugin = static::getSourcePlugin('d7_field_instance');
@@ -84,7 +111,7 @@ class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
     }
 
     try {
-      foreach (static::getSourcePlugin('d7_node_type') as $row) {
+      foreach ($node_types as $row) {
         $node_type = $row->getSourceProperty('type');
         $values = $base_plugin_definition;
 
@@ -95,6 +122,13 @@ class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
         $values['source']['node_type'] = $node_type;
         $values['destination']['default_bundle'] = $node_type;
 
+        // If this migration is based on the d7_node_revision migration or
+        // is for translations of nodes, it should explicitly depend on the
+        // corresponding d7_node variant.
+        if ($base_plugin_definition['id'] == ['d7_node_revision'] || in_array('translation', $base_plugin_definition['migration_tags'])) {
+          $values['migration_dependencies']['required'][] = 'd7_node:' . $node_type;
+        }
+
         $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($values);
         if (isset($fields[$node_type])) {
           foreach ($fields[$node_type] as $field_name => $info) {
@@ -121,7 +155,6 @@ class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
       // MigrationPluginManager gathers up the migration definitions but we do
       // not actually have a Drupal 7 source database.
     }
-
     return $this->derivatives;
   }
 
diff --git a/web/core/modules/node/src/Plugin/migrate/destination/EntityNodeType.php b/web/core/modules/node/src/Plugin/migrate/destination/EntityNodeType.php
index 820364c6a..c26f3b9f1 100644
--- a/web/core/modules/node/src/Plugin/migrate/destination/EntityNodeType.php
+++ b/web/core/modules/node/src/Plugin/migrate/destination/EntityNodeType.php
@@ -15,7 +15,7 @@ class EntityNodeType extends EntityConfigBase {
   /**
      * {@inheritdoc}
      */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     $entity_ids = parent::import($row, $old_destination_id_values);
     if ($row->getDestinationProperty('create_body')) {
       $node_type = $this->storage->load(reset($entity_ids));
diff --git a/web/core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php b/web/core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php
index cf0b4adef..f6da2eb5d 100644
--- a/web/core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php
+++ b/web/core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php
@@ -22,7 +22,7 @@ class NodeUpdate7008 extends ProcessPluginBase {
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     if ($value === 'administer nodes') {
-      return array($value, 'access content overview');
+      return [$value, 'access content overview'];
     }
     return $value;
   }
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d6/Node.php b/web/core/modules/node/src/Plugin/migrate/source/d6/Node.php
index 2e4d1a605..ffa26595f 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d6/Node.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d6/Node.php
@@ -77,7 +77,7 @@ class Node extends DrupalSqlBase {
     $query->innerJoin('node', 'n', static::JOIN);
     $this->handleTranslations($query);
 
-    $query->fields('n', array(
+    $query->fields('n', [
         'nid',
         'type',
         'language',
@@ -90,8 +90,8 @@ class Node extends DrupalSqlBase {
         'sticky',
         'tnid',
         'translate',
-      ))
-      ->fields('nr', array(
+      ])
+      ->fields('nr', [
         'title',
         'body',
         'teaser',
@@ -99,7 +99,7 @@ class Node extends DrupalSqlBase {
         'timestamp',
         'format',
         'vid',
-      ));
+      ]);
     $query->addField('n', 'uid', 'node_uid');
     $query->addField('nr', 'uid', 'revision_uid');
 
@@ -129,7 +129,7 @@ class Node extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    $fields = array(
+    $fields = [
       'nid' => $this->t('Node ID'),
       'type' => $this->t('Type'),
       'title' => $this->t('Title'),
@@ -147,7 +147,7 @@ class Node extends DrupalSqlBase {
       'language' => $this->t('Language (fr, en, ...)'),
       'tnid' => $this->t('The translation set id for this node'),
       'timestamp' => $this->t('The timestamp the latest revision of this node was created.'),
-    );
+    ];
     return $fields;
   }
 
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php b/web/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
index 3f9a5808f..f3296c234 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
@@ -22,11 +22,11 @@ class NodeRevision extends Node {
    */
   public function fields() {
     // Use all the node fields plus the vid that identifies the version.
-    return parent::fields() + array(
+    return parent::fields() + [
       'vid' => t('The primary identifier for this version.'),
       'log' => $this->t('Revision Log message'),
       'timestamp' => $this->t('Revision timestamp'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php b/web/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php
index 0653d59c5..6a6a32b3e 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php
@@ -40,7 +40,7 @@ class NodeType extends DrupalSqlBase {
    */
   public function query() {
     return $this->select('node_type', 't')
-      ->fields('t', array(
+      ->fields('t', [
         'type',
         'name',
         'module',
@@ -54,7 +54,7 @@ class NodeType extends DrupalSqlBase {
         'modified',
         'locked',
         'orig_type',
-      ))
+      ])
       ->orderBy('t.type');
   }
 
@@ -62,7 +62,7 @@ class NodeType extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'type' => $this->t('Machine name of the node type.'),
       'name' => $this->t('Human name of the node type.'),
       'module' => $this->t('The module providing the node type.'),
@@ -77,7 +77,7 @@ class NodeType extends DrupalSqlBase {
       'locked' => $this->t('Flag.'),
       'orig_type' => $this->t('The original type.'),
       'teaser_length' => $this->t('Teaser length'),
-    );
+    ];
   }
 
   /**
@@ -86,7 +86,7 @@ class NodeType extends DrupalSqlBase {
   protected function initializeIterator() {
     $this->teaserLength = $this->variableGet('teaser_length', 600);
     $this->nodePreview = $this->variableGet('node_preview', 0);
-    $this->themeSettings = $this->variableGet('theme_settings', array());
+    $this->themeSettings = $this->variableGet('theme_settings', []);
     return parent::initializeIterator();
   }
 
@@ -98,9 +98,9 @@ class NodeType extends DrupalSqlBase {
     $row->setSourceProperty('node_preview', $this->nodePreview);
 
     $type = $row->getSourceProperty('type');
-    $source_options = $this->variableGet('node_options_' . $type, array('promote', 'sticky'));
-    $options = array();
-    foreach (array('promote', 'sticky', 'status', 'revision') as $item) {
+    $source_options = $this->variableGet('node_options_' . $type, ['promote', 'sticky']);
+    $options = [];
+    foreach (['promote', 'sticky', 'status', 'revision'] as $item) {
       $options[$item] = in_array($item, $source_options);
     }
     $row->setSourceProperty('options', $options);
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php b/web/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php
index a45039840..b5a6d4d98 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php
@@ -16,12 +16,15 @@ class ViewMode extends ViewModeBase {
    * {@inheritdoc}
    */
   protected function initializeIterator() {
-    $rows = array();
+    $rows = [];
     $result = $this->prepareQuery()->execute();
     while ($field_row = $result->fetchAssoc()) {
       $field_row['display_settings'] = unserialize($field_row['display_settings']);
       foreach ($this->getViewModes() as $view_mode) {
-        if (isset($field_row['display_settings'][$view_mode]) && empty($field_row['display_settings'][$view_mode]['exclude'])) {
+        // Append to the return value if the row has display settings for this
+        // view mode and the view mode is neither hidden nor excluded.
+        // @see \Drupal\field\Plugin\migrate\source\d6\FieldInstancePerViewMode::initializeIterator()
+        if (isset($field_row['display_settings'][$view_mode]) && $field_row['display_settings'][$view_mode]['format'] != 'hidden' && empty($field_row['display_settings'][$view_mode]['exclude'])) {
           if (!isset($rows[$view_mode])) {
             $rows[$view_mode]['entity_type'] = 'node';
             $rows[$view_mode]['view_mode'] = $view_mode;
@@ -38,9 +41,9 @@ class ViewMode extends ViewModeBase {
    */
   public function query() {
     $query = $this->select('content_node_field_instance', 'cnfi')
-      ->fields('cnfi', array(
+      ->fields('cnfi', [
         'display_settings',
-      ));
+      ]);
 
     return $query;
   }
@@ -49,9 +52,9 @@ class ViewMode extends ViewModeBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'display_settings' => $this->t('Serialize data with display settings.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php b/web/core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php
index 54abcb0f4..315f069a6 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php
@@ -33,7 +33,7 @@ abstract class ViewModeBase extends DrupalSqlBase {
    *   The view mode names.
    */
   public function getViewModes() {
-    return array(
+    return [
       0,
       1,
       2,
@@ -42,7 +42,7 @@ abstract class ViewModeBase extends DrupalSqlBase {
       5,
       'teaser',
       'full',
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d7/Node.php b/web/core/modules/node/src/Plugin/migrate/source/d7/Node.php
index 6286d5fa4..451905cd9 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d7/Node.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d7/Node.php
@@ -2,8 +2,15 @@
 
 namespace Drupal\node\Plugin\migrate\source\d7;
 
+use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\d7\FieldableEntity;
+use Drupal\Core\Database\Query\SelectInterface;
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Extension\ModuleHandler;
+use Drupal\Core\State\StateInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Drupal 7 node source from database.
@@ -14,6 +21,35 @@ use Drupal\migrate_drupal\Plugin\migrate\source\d7\FieldableEntity;
  * )
  */
 class Node extends FieldableEntity {
+  /**
+   * The module handler.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, StateInterface $state, EntityManagerInterface $entity_manager, ModuleHandlerInterface $module_handler) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $state, $entity_manager);
+    $this->moduleHandler = $module_handler;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $migration,
+      $container->get('state'),
+      $container->get('entity.manager'),
+      $container->get('module_handler')
+    );
+  }
 
   /**
    * The join options between the node and the node_revisions table.
@@ -26,7 +62,7 @@ class Node extends FieldableEntity {
   public function query() {
     // Select node in its last revision.
     $query = $this->select('node_revision', 'nr')
-      ->fields('n', array(
+      ->fields('n', [
         'nid',
         'type',
         'language',
@@ -38,17 +74,25 @@ class Node extends FieldableEntity {
         'sticky',
         'tnid',
         'translate',
-      ))
-      ->fields('nr', array(
+      ])
+      ->fields('nr', [
         'vid',
         'title',
         'log',
         'timestamp',
-      ));
+      ]);
     $query->addField('n', 'uid', 'node_uid');
     $query->addField('nr', 'uid', 'revision_uid');
     $query->innerJoin('node', 'n', static::JOIN);
 
+    // If the content_translation module is enabled, get the source langcode
+    // to fill the content_translation_source field.
+    if ($this->moduleHandler->moduleExists('content_translation')) {
+      $query->leftJoin('node', 'nt', 'n.tnid = nt.nid');
+      $query->addField('nt', 'language', 'source_langcode');
+    }
+    $this->handleTranslations($query);
+
     if (isset($this->configuration['node_type'])) {
       $query->condition('n.type', $this->configuration['node_type']);
     }
@@ -66,6 +110,11 @@ class Node extends FieldableEntity {
       $vid = $row->getSourceProperty('vid');
       $row->setSourceProperty($field, $this->getFieldValues('node', $field, $nid, $vid));
     }
+
+    // Make sure we always have a translation set.
+    if ($row->getSourceProperty('tnid') == 0) {
+      $row->setSourceProperty('tnid', $row->getSourceProperty('nid'));
+    }
     return parent::prepareRow($row);
   }
 
@@ -73,7 +122,7 @@ class Node extends FieldableEntity {
    * {@inheritdoc}
    */
   public function fields() {
-    $fields = array(
+    $fields = [
       'nid' => $this->t('Node ID'),
       'type' => $this->t('Type'),
       'title' => $this->t('Title'),
@@ -88,7 +137,7 @@ class Node extends FieldableEntity {
       'language' => $this->t('Language (fr, en, ...)'),
       'tnid' => $this->t('The translation set id for this node'),
       'timestamp' => $this->t('The timestamp the latest revision of this node was created.'),
-    );
+    ];
     return $fields;
   }
 
@@ -101,4 +150,22 @@ class Node extends FieldableEntity {
     return $ids;
   }
 
+  /**
+   * Adapt our query for translations.
+   *
+   * @param \Drupal\Core\Database\Query\SelectInterface $query
+   *   The generated query.
+   */
+  protected function handleTranslations(SelectInterface $query) {
+    // Check whether or not we want translations.
+    if (empty($this->configuration['translations'])) {
+      // No translations: Yield untranslated nodes, or default translations.
+      $query->where('n.tnid = 0 OR n.tnid = n.nid');
+    }
+    else {
+      // Translations: Yield only non-default translations.
+      $query->where('n.tnid <> 0 AND n.tnid <> n.nid');
+    }
+  }
+
 }
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php b/web/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php
index b88359abe..89c1bcca5 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php
@@ -22,11 +22,11 @@ class NodeRevision extends Node {
    */
   public function fields() {
     // Use all the node fields plus the vid that identifies the version.
-    return parent::fields() + array(
+    return parent::fields() + [
       'vid' => t('The primary identifier for this version.'),
       'log' => $this->t('Revision Log message'),
       'timestamp' => $this->t('Revision timestamp'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d7/NodeType.php b/web/core/modules/node/src/Plugin/migrate/source/d7/NodeType.php
index b8a8519ac..85c0d3258 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d7/NodeType.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d7/NodeType.php
@@ -40,7 +40,7 @@ class NodeType extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'type' => $this->t('Machine name of the node type.'),
       'name' => $this->t('Human name of the node type.'),
       'description' => $this->t('Description of the node type.'),
@@ -53,7 +53,7 @@ class NodeType extends DrupalSqlBase {
       'locked' => $this->t('Flag.'),
       'orig_type' => $this->t('The original type.'),
       'teaser_length' => $this->t('Teaser length'),
-    );
+    ];
   }
 
   /**
@@ -73,9 +73,9 @@ class NodeType extends DrupalSqlBase {
     $row->setSourceProperty('node_preview', $this->nodePreview);
 
     $type = $row->getSourceProperty('type');
-    $source_options = $this->variableGet('node_options_' . $type, array('promote', 'sticky'));
-    $options = array();
-    foreach (array('promote', 'sticky', 'status', 'revision') as $item) {
+    $source_options = $this->variableGet('node_options_' . $type, ['promote', 'sticky']);
+    $options = [];
+    foreach (['promote', 'sticky', 'status', 'revision'] as $item) {
       $options[$item] = in_array($item, $source_options);
     }
     $row->setSourceProperty('options', $options);
@@ -86,7 +86,7 @@ class NodeType extends DrupalSqlBase {
     if ($this->moduleExists('field')) {
       // Find body field for this node type.
       $body = $this->select('field_config_instance', 'fci')
-        ->fields('fci', array('data'))
+        ->fields('fci', ['data'])
         ->condition('entity_type', 'node')
         ->condition('bundle', $row->getSourceProperty('type'))
         ->condition('field_name', 'body')
diff --git a/web/core/modules/node/src/Plugin/views/area/ListingEmpty.php b/web/core/modules/node/src/Plugin/views/area/ListingEmpty.php
index e52ca1bf6..08e1d2722 100644
--- a/web/core/modules/node/src/Plugin/views/area/ListingEmpty.php
+++ b/web/core/modules/node/src/Plugin/views/area/ListingEmpty.php
@@ -59,19 +59,19 @@ class ListingEmpty extends AreaPluginBase {
   public function render($empty = FALSE) {
     $account = \Drupal::currentUser();
     if (!$empty || !empty($this->options['empty'])) {
-      $element = array(
+      $element = [
         '#theme' => 'links',
-        '#links' => array(
-          array(
+        '#links' => [
+          [
             'url' => Url::fromRoute('node.add_page'),
             'title' => $this->t('Add content'),
-          ),
-        ),
-        '#access' => $this->accessManager->checkNamedRoute('node.add_page', array(), $account),
-      );
+          ],
+        ],
+        '#access' => $this->accessManager->checkNamedRoute('node.add_page', [], $account),
+      ];
       return $element;
     }
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/node/src/Plugin/views/argument/Nid.php b/web/core/modules/node/src/Plugin/views/argument/Nid.php
index 8f846bc6a..3b0f8df95 100644
--- a/web/core/modules/node/src/Plugin/views/argument/Nid.php
+++ b/web/core/modules/node/src/Plugin/views/argument/Nid.php
@@ -52,7 +52,7 @@ class Nid extends NumericArgument {
    * Override the behavior of title(). Get the title of the node.
    */
   public function titleQuery() {
-    $titles = array();
+    $titles = [];
 
     $nodes = $this->nodeStorage->loadMultiple($this->value);
     foreach ($nodes as $node) {
diff --git a/web/core/modules/node/src/Plugin/views/argument/Type.php b/web/core/modules/node/src/Plugin/views/argument/Type.php
index 641b16344..760397ab3 100644
--- a/web/core/modules/node/src/Plugin/views/argument/Type.php
+++ b/web/core/modules/node/src/Plugin/views/argument/Type.php
@@ -63,11 +63,11 @@ class Type extends StringArgument {
    * Override the behavior of title(). Get the user friendly version of the
    * node type.
    */
-  function title() {
+  public function title() {
     return $this->node_type($this->argument);
   }
 
-  function node_type($type_name) {
+  public function node_type($type_name) {
     $type = $this->nodeTypeStorage->load($type_name);
     $output = $type ? $type->label() : $this->t('Unknown content type');
     return $output;
diff --git a/web/core/modules/node/src/Plugin/views/argument/UidRevision.php b/web/core/modules/node/src/Plugin/views/argument/UidRevision.php
index 9a19fe36f..9e2fb810c 100644
--- a/web/core/modules/node/src/Plugin/views/argument/UidRevision.php
+++ b/web/core/modules/node/src/Plugin/views/argument/UidRevision.php
@@ -15,7 +15,7 @@ class UidRevision extends Uid {
   public function query($group_by = FALSE) {
     $this->ensureMyTable();
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression(0, "$this->tableAlias.revision_uid = $placeholder OR ((SELECT COUNT(DISTINCT vid) FROM {node_revision} nr WHERE nfr.revision_uid = $placeholder AND nr.nid = $this->tableAlias.nid) > 0)", array($placeholder => $this->argument));
+    $this->query->addWhereExpression(0, "$this->tableAlias.revision_uid = $placeholder OR ((SELECT COUNT(DISTINCT vid) FROM {node_revision} nr WHERE nfr.revision_uid = $placeholder AND nr.nid = $this->tableAlias.nid) > 0)", [$placeholder => $this->argument]);
   }
 
 }
diff --git a/web/core/modules/node/src/Plugin/views/argument/Vid.php b/web/core/modules/node/src/Plugin/views/argument/Vid.php
index 8788b67a3..1cad35c71 100644
--- a/web/core/modules/node/src/Plugin/views/argument/Vid.php
+++ b/web/core/modules/node/src/Plugin/views/argument/Vid.php
@@ -66,10 +66,10 @@ class Vid extends NumericArgument {
    * Override the behavior of title(). Get the title of the revision.
    */
   public function titleQuery() {
-    $titles = array();
+    $titles = [];
 
-    $results = $this->database->query('SELECT nr.vid, nr.nid, npr.title FROM {node_revision} nr WHERE nr.vid IN ( :vids[] )', array(':vids[]' => $this->value))->fetchAllAssoc('vid', PDO::FETCH_ASSOC);
-    $nids = array();
+    $results = $this->database->query('SELECT nr.vid, nr.nid, npr.title FROM {node_revision} nr WHERE nr.vid IN ( :vids[] )', [':vids[]' => $this->value])->fetchAllAssoc('vid', PDO::FETCH_ASSOC);
+    $nids = [];
     foreach ($results as $result) {
       $nids[] = $result['nid'];
     }
diff --git a/web/core/modules/node/src/Plugin/views/field/Node.php b/web/core/modules/node/src/Plugin/views/field/Node.php
index d721414f1..e5cd9d702 100644
--- a/web/core/modules/node/src/Plugin/views/field/Node.php
+++ b/web/core/modules/node/src/Plugin/views/field/Node.php
@@ -28,7 +28,7 @@ class Node extends FieldPluginBase {
 
     // Don't add the additional fields to groupby
     if (!empty($this->options['link_to_node'])) {
-      $this->additional_fields['nid'] = array('table' => 'node_field_data', 'field' => 'nid');
+      $this->additional_fields['nid'] = ['table' => 'node_field_data', 'field' => 'nid'];
     }
   }
 
@@ -37,7 +37,7 @@ class Node extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['link_to_node'] = array('default' => isset($this->definition['link_to_node default']) ? $this->definition['link_to_node default'] : FALSE);
+    $options['link_to_node'] = ['default' => isset($this->definition['link_to_node default']) ? $this->definition['link_to_node default'] : FALSE];
     return $options;
   }
 
@@ -45,12 +45,12 @@ class Node extends FieldPluginBase {
    * Provide link to node option
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['link_to_node'] = array(
+    $form['link_to_node'] = [
       '#title' => $this->t('Link this field to the original piece of content'),
       '#description' => $this->t("Enable to override this field's links."),
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['link_to_node']),
-    );
+    ];
 
     parent::buildOptionsForm($form, $form_state);
   }
diff --git a/web/core/modules/node/src/Plugin/views/field/Path.php b/web/core/modules/node/src/Plugin/views/field/Path.php
index 5fb07cd77..c1c74ab65 100644
--- a/web/core/modules/node/src/Plugin/views/field/Path.php
+++ b/web/core/modules/node/src/Plugin/views/field/Path.php
@@ -31,7 +31,7 @@ class Path extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['absolute'] = array('default' => FALSE);
+    $options['absolute'] = ['default' => FALSE];
 
     return $options;
   }
@@ -41,13 +41,13 @@ class Path extends FieldPluginBase {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['absolute'] = array(
+    $form['absolute'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Use absolute link (begins with "http://")'),
       '#default_value' => $this->options['absolute'],
       '#description' => $this->t('Enable this option to output an absolute link. Required if you want to use the path as a link destination (as in "output this field as a link" above).'),
       '#fieldset' => 'alter',
-    );
+    ];
   }
 
   /**
@@ -63,9 +63,9 @@ class Path extends FieldPluginBase {
    */
   public function render(ResultRow $values) {
     $nid = $this->getValue($values, 'nid');
-    return array(
+    return [
       '#markup' => \Drupal::url('entity.node.canonical', ['node' => $nid], ['absolute' => $this->options['absolute']]),
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/node/src/Plugin/views/filter/UidRevision.php b/web/core/modules/node/src/Plugin/views/filter/UidRevision.php
index ce588b7b9..0968480f2 100644
--- a/web/core/modules/node/src/Plugin/views/filter/UidRevision.php
+++ b/web/core/modules/node/src/Plugin/views/filter/UidRevision.php
@@ -21,7 +21,7 @@ class UidRevision extends Name {
     $args = array_values($this->value);
 
     $this->query->addWhereExpression($this->options['group'], "$this->tableAlias.uid IN($placeholder) OR
-      ((SELECT COUNT(DISTINCT vid) FROM {node_revision} nr WHERE nr.revision_uid IN ($placeholder) AND nr.nid = $this->tableAlias.nid) > 0)", array($placeholder => $args),
+      ((SELECT COUNT(DISTINCT vid) FROM {node_revision} nr WHERE nr.revision_uid IN ($placeholder) AND nr.nid = $this->tableAlias.nid) > 0)", [$placeholder => $args],
       $args);
   }
 
diff --git a/web/core/modules/node/src/Plugin/views/row/Rss.php b/web/core/modules/node/src/Plugin/views/row/Rss.php
index 097655a20..96838796a 100644
--- a/web/core/modules/node/src/Plugin/views/row/Rss.php
+++ b/web/core/modules/node/src/Plugin/views/row/Rss.php
@@ -27,7 +27,7 @@ class Rss extends RssPluginBase {
   public $base_field = 'nid';
 
   // Stores the nodes loaded with preRender.
-  public $nodes = array();
+  public $nodes = [];
 
   /**
    * {@inheritdoc}
@@ -74,7 +74,7 @@ class Rss extends RssPluginBase {
   }
 
   public function preRender($values) {
-    $nids = array();
+    $nids = [];
     foreach ($values as $row) {
       $nids[] = $row->{$this->field_alias};
     }
@@ -103,23 +103,23 @@ class Rss extends RssPluginBase {
       return;
     }
 
-    $node->link = $node->url('canonical', array('absolute' => TRUE));
-    $node->rss_namespaces = array();
-    $node->rss_elements = array(
-      array(
+    $node->link = $node->url('canonical', ['absolute' => TRUE]);
+    $node->rss_namespaces = [];
+    $node->rss_elements = [
+      [
         'key' => 'pubDate',
         'value' => gmdate('r', $node->getCreatedTime()),
-      ),
-      array(
+      ],
+      [
         'key' => 'dc:creator',
         'value' => $node->getOwner()->getDisplayName(),
-      ),
-      array(
+      ],
+      [
         'key' => 'guid',
         'value' => $node->id() . ' at ' . $base_url,
-        'attributes' => array('isPermaLink' => 'false'),
-      ),
-    );
+        'attributes' => ['isPermaLink' => 'false'],
+      ],
+    ];
 
     // The node gets built and modules add to or modify $node->rss_elements
     // and $node->rss_namespaces.
@@ -135,7 +135,7 @@ class Rss extends RssPluginBase {
     elseif (function_exists('rdf_get_namespaces')) {
       // Merge RDF namespaces in the XML namespaces in case they are used
       // further in the RSS content.
-      $xml_rdf_namespaces = array();
+      $xml_rdf_namespaces = [];
       foreach (rdf_get_namespaces() as $prefix => $uri) {
         $xml_rdf_namespaces['xmlns:' . $prefix] = $uri;
       }
@@ -153,12 +153,12 @@ class Rss extends RssPluginBase {
     // template_preprocess_views_view_row_rss() can still access it.
     $item->elements = &$node->rss_elements;
     $item->nid = $node->id();
-    $build = array(
+    $build = [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#row' => $item,
-    );
+    ];
 
     return $build;
   }
diff --git a/web/core/modules/node/src/Plugin/views/wizard/Node.php b/web/core/modules/node/src/Plugin/views/wizard/Node.php
index ce267e662..34d4bcf6c 100644
--- a/web/core/modules/node/src/Plugin/views/wizard/Node.php
+++ b/web/core/modules/node/src/Plugin/views/wizard/Node.php
@@ -28,16 +28,16 @@ class Node extends WizardPluginBase {
   /**
    * Set default values for the filters.
    */
-  protected $filters = array(
-    'status' => array(
+  protected $filters = [
+    'status' => [
       'value' => TRUE,
       'table' => 'node_field_data',
       'field' => 'status',
       'plugin_id' => 'boolean',
       'entity_type' => 'node',
       'entity_field' => 'status',
-    )
-  );
+    ]
+  ];
 
   /**
    * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::getAvailableSorts().
@@ -48,16 +48,16 @@ class Node extends WizardPluginBase {
    */
   public function getAvailableSorts() {
     // You can't execute functions in properties, so override the method
-    return array(
+    return [
       'node_field_data-title:ASC' => $this->t('Title')
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   protected function rowStyleOptions() {
-    $options = array();
+    $options = [];
     $options['teasers'] = $this->t('teasers');
     $options['full_posts'] = $this->t('full posts');
     $options['titles'] = $this->t('titles');
@@ -110,22 +110,22 @@ class Node extends WizardPluginBase {
   protected function defaultDisplayFiltersUser(array $form, FormStateInterface $form_state) {
     $filters = parent::defaultDisplayFiltersUser($form, $form_state);
 
-    $tids = array();
-    if ($values = $form_state->getValue(array('show', 'tagged_with'))) {
+    $tids = [];
+    if ($values = $form_state->getValue(['show', 'tagged_with'])) {
       foreach ($values as $value) {
         $tids[] = $value['target_id'];
       }
     }
     if (!empty($tids)) {
       $vid = reset($form['displays']['show']['tagged_with']['#selection_settings']['target_bundles']);
-      $filters['tid'] = array(
+      $filters['tid'] = [
         'id' => 'tid',
         'table' => 'taxonomy_index',
         'field' => 'tid',
         'value' => $tids,
         'vid' => $vid,
         'plugin_id' => 'taxonomy_index_tid',
-      );
+      ];
       // If the user entered more than one valid term in the autocomplete
       // field, they probably intended both of them to be applied.
       if (count($tids) > 1) {
@@ -144,8 +144,8 @@ class Node extends WizardPluginBase {
    */
   protected function pageDisplayOptions(array $form, FormStateInterface $form_state) {
     $display_options = parent::pageDisplayOptions($form, $form_state);
-    $row_plugin = $form_state->getValue(array('page', 'style', 'row_plugin'));
-    $row_options = $form_state->getValue(array('page', 'style', 'row_options'), array());
+    $row_plugin = $form_state->getValue(['page', 'style', 'row_plugin']);
+    $row_options = $form_state->getValue(['page', 'style', 'row_options'], []);
     $this->display_options_row($display_options, $row_plugin, $row_options);
     return $display_options;
   }
@@ -155,8 +155,8 @@ class Node extends WizardPluginBase {
    */
   protected function blockDisplayOptions(array $form, FormStateInterface $form_state) {
     $display_options = parent::blockDisplayOptions($form, $form_state);
-    $row_plugin = $form_state->getValue(array('block', 'style', 'row_plugin'));
-    $row_options = $form_state->getValue(array('block', 'style', 'row_options'), array());
+    $row_plugin = $form_state->getValue(['block', 'style', 'row_plugin']);
+    $row_options = $form_state->getValue(['block', 'style', 'row_options'], []);
     $this->display_options_row($display_options, $row_plugin, $row_options);
     return $display_options;
   }
@@ -195,7 +195,7 @@ class Node extends WizardPluginBase {
     parent::buildFilters($form, $form_state);
 
     if (isset($form['displays']['show']['type'])) {
-      $selected_bundle = static::getSelected($form_state, array('show', 'type'), 'all', $form['displays']['show']['type']);
+      $selected_bundle = static::getSelected($form_state, ['show', 'type'], 'all', $form['displays']['show']['type']);
     }
 
     // Add the "tagged with" filter to the view.
@@ -221,9 +221,9 @@ class Node extends WizardPluginBase {
     // Double check that this is a real bundle before using it (since above
     // we added a dummy option 'all' to the bundle list on the form).
     if (isset($selected_bundle) && in_array($selected_bundle, $bundles)) {
-      $bundles = array($selected_bundle);
+      $bundles = [$selected_bundle];
     }
-    $tag_fields = array();
+    $tag_fields = [];
     foreach ($bundles as $bundle) {
       $display = entity_get_form_display($this->entityTypeId, $bundle, 'default');
       $taxonomy_fields = array_filter(\Drupal::entityManager()->getFieldDefinitions($this->entityTypeId, $bundle), function ($field_definition) {
@@ -253,7 +253,7 @@ class Node extends WizardPluginBase {
       }
       // Add the autocomplete textfield to the wizard.
       $target_bundles = $tag_fields[$tag_field_name]->getSetting('handler_settings')['target_bundles'];
-      $form['displays']['show']['tagged_with'] = array(
+      $form['displays']['show']['tagged_with'] = [
         '#type' => 'entity_autocomplete',
         '#title' => $this->t('tagged with'),
         '#target_type' => 'taxonomy_term',
@@ -261,7 +261,7 @@ class Node extends WizardPluginBase {
         '#tags' => TRUE,
         '#size' => 30,
         '#maxlength' => 1024,
-      );
+      ];
     }
   }
 
diff --git a/web/core/modules/node/src/Plugin/views/wizard/NodeRevision.php b/web/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
index 64bc7beda..9c3465d2b 100644
--- a/web/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
+++ b/web/core/modules/node/src/Plugin/views/wizard/NodeRevision.php
@@ -27,16 +27,16 @@ class NodeRevision extends WizardPluginBase {
   /**
    * Set default values for the filters.
    */
-  protected $filters = array(
-    'status' => array(
+  protected $filters = [
+    'status' => [
       'value' => TRUE,
       'table' => 'node_field_revision',
       'field' => 'status',
       'plugin_id' => 'boolean',
       'entity_type' => 'node',
       'entity_field' => 'status',
-    )
-  );
+    ]
+  ];
 
   /**
    * Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::rowStyleOptions().
diff --git a/web/core/modules/node/src/Routing/RouteSubscriber.php b/web/core/modules/node/src/Routing/RouteSubscriber.php
index 23bd0f8f4..66d83c123 100644
--- a/web/core/modules/node/src/Routing/RouteSubscriber.php
+++ b/web/core/modules/node/src/Routing/RouteSubscriber.php
@@ -19,13 +19,13 @@ class RouteSubscriber extends RouteSubscriberBase {
     // a node listing instead of the path's child links.
     $route = $collection->get('system.admin_content');
     if ($route) {
-      $route->setDefaults(array(
+      $route->setDefaults([
         '_title' => 'Content',
         '_entity_list' => 'node',
-      ));
-      $route->setRequirements(array(
+      ]);
+      $route->setRequirements([
         '_permission' => 'access content overview',
-      ));
+      ]);
     }
   }
 
diff --git a/web/core/modules/node/src/Tests/NodeAccessBaseTableTest.php b/web/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
index 74e2340ca..8eb9c9e66 100644
--- a/web/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
+++ b/web/core/modules/node/src/Tests/NodeAccessBaseTableTest.php
@@ -16,7 +16,7 @@ class NodeAccessBaseTableTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_access_test', 'views');
+  public static $modules = ['node_access_test', 'views'];
 
   /**
    * The installation profile to use with this test.
@@ -83,25 +83,25 @@ class NodeAccessBaseTableTest extends NodeTestBase {
    * - Test that user 4 can view all content created above.
    * - Test that user 4 can view all content on taxonomy listing.
    */
-  function testNodeAccessBasic() {
+  public function testNodeAccessBasic() {
     $num_simple_users = 2;
-    $simple_users = array();
+    $simple_users = [];
 
     // Nodes keyed by uid and nid: $nodes[$uid][$nid] = $is_private;
-    $this->nodesByUser = array();
+    $this->nodesByUser = [];
     // Titles keyed by nid.
     $titles = [];
     // Array of nids marked private.
     $private_nodes = [];
     for ($i = 0; $i < $num_simple_users; $i++) {
-      $simple_users[$i] = $this->drupalCreateUser(array('access content', 'create article content'));
+      $simple_users[$i] = $this->drupalCreateUser(['access content', 'create article content']);
     }
     foreach ($simple_users as $this->webUser) {
       $this->drupalLogin($this->webUser);
-      foreach (array(0 => 'Public', 1 => 'Private') as $is_private => $type) {
-        $edit = array(
-          'title[0][value]' => t('@private_public Article created by @user', array('@private_public' => $type, '@user' => $this->webUser->getUsername())),
-        );
+      foreach ([0 => 'Public', 1 => 'Private'] as $is_private => $type) {
+        $edit = [
+          'title[0][value]' => t('@private_public Article created by @user', ['@private_public' => $type, '@user' => $this->webUser->getUsername()]),
+        ];
         if ($is_private) {
           $edit['private[0][value]'] = TRUE;
           $edit['body[0][value]'] = 'private node';
@@ -122,8 +122,8 @@ class NodeAccessBaseTableTest extends NodeTestBase {
         $this->nodesByUser[$this->webUser->id()][$node->id()] = $is_private;
       }
     }
-    $this->publicTid = db_query('SELECT tid FROM {taxonomy_term_field_data} WHERE name = :name AND default_langcode = 1', array(':name' => 'public'))->fetchField();
-    $this->privateTid = db_query('SELECT tid FROM {taxonomy_term_field_data} WHERE name = :name AND default_langcode = 1', array(':name' => 'private'))->fetchField();
+    $this->publicTid = db_query('SELECT tid FROM {taxonomy_term_field_data} WHERE name = :name AND default_langcode = 1', [':name' => 'public'])->fetchField();
+    $this->privateTid = db_query('SELECT tid FROM {taxonomy_term_field_data} WHERE name = :name AND default_langcode = 1', [':name' => 'private'])->fetchField();
     $this->assertTrue($this->publicTid, 'Public tid was found');
     $this->assertTrue($this->privateTid, 'Private tid was found');
     foreach ($simple_users as $this->webUser) {
@@ -138,12 +138,12 @@ class NodeAccessBaseTableTest extends NodeTestBase {
           else {
             $should_be_visible = TRUE;
           }
-          $this->assertResponse($should_be_visible ? 200 : 403, strtr('A %private node by user %uid is %visible for user %current_uid.', array(
+          $this->assertResponse($should_be_visible ? 200 : 403, strtr('A %private node by user %uid is %visible for user %current_uid.', [
             '%private' => $is_private ? 'private' : 'public',
             '%uid' => $uid,
             '%visible' => $should_be_visible ? 'visible' : 'not visible',
             '%current_uid' => $this->webUser->id(),
-          )));
+          ]));
         }
       }
 
@@ -153,7 +153,7 @@ class NodeAccessBaseTableTest extends NodeTestBase {
     }
 
     // Now test that a user with 'node test view' permissions can view content.
-    $access_user = $this->drupalCreateUser(array('access content', 'create article content', 'node test view', 'search content'));
+    $access_user = $this->drupalCreateUser(['access content', 'create article content', 'node test view', 'search content']);
     $this->drupalLogin($access_user);
 
     foreach ($this->nodesByUser as $private_status) {
@@ -193,7 +193,7 @@ class NodeAccessBaseTableTest extends NodeTestBase {
    *   user's own private nodes should be listed.
    */
   protected function assertTaxonomyPage($is_admin) {
-    foreach (array($this->publicTid, $this->privateTid) as $tid_is_private => $tid) {
+    foreach ([$this->publicTid, $this->privateTid] as $tid_is_private => $tid) {
       $this->drupalGet("taxonomy/term/$tid");
       $this->nidsVisible = [];
       foreach ($this->xpath("//a[text()='Read more']") as $link) {
@@ -211,13 +211,13 @@ class NodeAccessBaseTableTest extends NodeTestBase {
           if (!$is_admin && $tid_is_private) {
             $should_be_visible = $should_be_visible && $uid == $this->webUser->id();
           }
-          $this->assertIdentical(isset($this->nidsVisible[$nid]), $should_be_visible, strtr('A %private node by user %uid is %visible for user %current_uid on the %tid_is_private page.', array(
+          $this->assertIdentical(isset($this->nidsVisible[$nid]), $should_be_visible, strtr('A %private node by user %uid is %visible for user %current_uid on the %tid_is_private page.', [
             '%private' => $is_private ? 'private' : 'public',
             '%uid' => $uid,
             '%visible' => isset($this->nidsVisible[$nid]) ? 'visible' : 'not visible',
             '%current_uid' => $this->webUser->id(),
             '%tid_is_private' => $tid_is_private ? 'private' : 'public',
-          )));
+          ]));
         }
       }
     }
diff --git a/web/core/modules/node/src/Tests/NodeAccessPagerTest.php b/web/core/modules/node/src/Tests/NodeAccessPagerTest.php
index 7db264cd9..b4fe8302e 100644
--- a/web/core/modules/node/src/Tests/NodeAccessPagerTest.php
+++ b/web/core/modules/node/src/Tests/NodeAccessPagerTest.php
@@ -21,15 +21,15 @@ class NodeAccessPagerTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_access_test', 'comment', 'forum');
+  public static $modules = ['node_access_test', 'comment', 'forum'];
 
   protected function setUp() {
     parent::setUp();
 
     node_access_rebuild();
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => t('Basic page')));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => t('Basic page')]);
     $this->addDefaultCommentField('node', 'page');
-    $this->webUser = $this->drupalCreateUser(array('access content', 'access comments', 'node test view'));
+    $this->webUser = $this->drupalCreateUser(['access content', 'access comments', 'node test view']);
   }
 
   /**
@@ -41,16 +41,16 @@ class NodeAccessPagerTest extends WebTestBase {
 
     // Create 60 comments.
     for ($i = 0; $i < 60; $i++) {
-      $comment = Comment::create(array(
+      $comment = Comment::create([
         'entity_id' => $node->id(),
         'entity_type' => 'node',
         'field_name' => 'comment',
         'subject' => $this->randomMachineName(),
-        'comment_body' => array(
-          array('value' => $this->randomMachineName()),
-        ),
+        'comment_body' => [
+          ['value' => $this->randomMachineName()],
+        ],
         'status' => CommentInterface::PUBLISHED,
-      ));
+      ]);
       $comment->save();
     }
 
@@ -80,13 +80,13 @@ class NodeAccessPagerTest extends WebTestBase {
 
     // Create 30 nodes.
     for ($i = 0; $i < 30; $i++) {
-      $this->drupalCreateNode(array(
+      $this->drupalCreateNode([
         'nid' => NULL,
         'type' => 'forum',
-        'taxonomy_forums' => array(
-          array('target_id' => $tid),
-        ),
-      ));
+        'taxonomy_forums' => [
+          ['target_id' => $tid],
+        ],
+      ]);
     }
 
     // View the general discussion forum page. With the default 25 nodes per
diff --git a/web/core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php b/web/core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php
index d151aadc3..251aa8826 100644
--- a/web/core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php
+++ b/web/core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php
@@ -32,7 +32,7 @@ class NodeAccessRebuildNodeGrantsTest extends NodeTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'access site reports'));
+    $this->adminUser = $this->drupalCreateUser(['administer site configuration', 'access administration pages', 'access site reports']);
     $this->drupalLogin($this->adminUser);
 
     $this->webUser = $this->drupalCreateUser();
@@ -50,10 +50,10 @@ class NodeAccessRebuildNodeGrantsTest extends NodeTestBase {
     // Create 30 nodes so that _node_access_rebuild_batch_operation() has to run
     // more than once.
     for ($i = 0; $i < 30; $i++) {
-      $nodes[] = $this->drupalCreateNode(array(
+      $nodes[] = $this->drupalCreateNode([
         'uid' => $this->webUser->id(),
         'private' => [['value' => 1]]
-      ));
+      ]);
     }
 
     /** @var \Drupal\node\NodeGrantDatabaseStorageInterface $grant_storage */
@@ -71,7 +71,7 @@ class NodeAccessRebuildNodeGrantsTest extends NodeTestBase {
     // Rebuild permissions.
     $this->drupalGet('admin/reports/status');
     $this->clickLink(t('Rebuild permissions'));
-    $this->drupalPostForm(NULL, array(), t('Rebuild permissions'));
+    $this->drupalPostForm(NULL, [], t('Rebuild permissions'));
     $this->assertText(t('The content access permissions have been rebuilt.'));
 
     // Test if the rebuild by user that cannot bypass node access and does not
@@ -107,7 +107,7 @@ class NodeAccessRebuildNodeGrantsTest extends NodeTestBase {
     // Rebuild permissions.
     $this->drupalGet('admin/reports/status');
     $this->clickLink(t('Rebuild permissions'));
-    $this->drupalPostForm(NULL, array(), t('Rebuild permissions'));
+    $this->drupalPostForm(NULL, [], t('Rebuild permissions'));
     $this->assertText(t('Content permissions have been rebuilt.'));
     $this->assertNull(\Drupal::state()->get('node.node_access_needs_rebuild'), 'Node access permissions have been rebuilt');
 
diff --git a/web/core/modules/node/src/Tests/NodeAdminTest.php b/web/core/modules/node/src/Tests/NodeAdminTest.php
index 1717bb19c..8bf54cc29 100644
--- a/web/core/modules/node/src/Tests/NodeAdminTest.php
+++ b/web/core/modules/node/src/Tests/NodeAdminTest.php
@@ -43,7 +43,7 @@ class NodeAdminTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('views');
+  public static $modules = ['views'];
 
   protected function setUp() {
     parent::setUp();
@@ -51,9 +51,9 @@ class NodeAdminTest extends NodeTestBase {
     // Remove the "view own unpublished content" permission which is set
     // by default for authenticated users so we can test this permission
     // correctly.
-    user_role_revoke_permissions(RoleInterface::AUTHENTICATED_ID, array('view own unpublished content'));
+    user_role_revoke_permissions(RoleInterface::AUTHENTICATED_ID, ['view own unpublished content']);
 
-    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'access content overview', 'administer nodes', 'bypass node access'));
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'access content overview', 'administer nodes', 'bypass node access']);
     $this->baseUser1 = $this->drupalCreateUser(['access content overview']);
     $this->baseUser2 = $this->drupalCreateUser(['access content overview', 'view own unpublished content']);
     $this->baseUser3 = $this->drupalCreateUser(['access content overview', 'bypass node access']);
@@ -62,43 +62,43 @@ class NodeAdminTest extends NodeTestBase {
   /**
    * Tests that the table sorting works on the content admin pages.
    */
-  function testContentAdminSort() {
+  public function testContentAdminSort() {
     $this->drupalLogin($this->adminUser);
 
     $changed = REQUEST_TIME;
-    foreach (array('dd', 'aa', 'DD', 'bb', 'cc', 'CC', 'AA', 'BB') as $prefix) {
+    foreach (['dd', 'aa', 'DD', 'bb', 'cc', 'CC', 'AA', 'BB'] as $prefix) {
       $changed += 1000;
-      $node = $this->drupalCreateNode(array('title' => $prefix . $this->randomMachineName(6)));
+      $node = $this->drupalCreateNode(['title' => $prefix . $this->randomMachineName(6)]);
       db_update('node_field_data')
-        ->fields(array('changed' => $changed))
+        ->fields(['changed' => $changed])
         ->condition('nid', $node->id())
         ->execute();
     }
 
     // Test that the default sort by node.changed DESC actually fires properly.
     $nodes_query = db_select('node_field_data', 'n')
-      ->fields('n', array('title'))
+      ->fields('n', ['title'])
       ->orderBy('changed', 'DESC')
       ->execute()
       ->fetchCol();
 
     $this->drupalGet('admin/content');
     foreach ($nodes_query as $delta => $string) {
-      $elements = $this->xpath('//table[contains(@class, :class)]/tbody/tr[' . ($delta + 1) . ']/td[2]/a[normalize-space(text())=:label]', array(':class' => 'views-table', ':label' => $string));
+      $elements = $this->xpath('//table[contains(@class, :class)]/tbody/tr[' . ($delta + 1) . ']/td[2]/a[normalize-space(text())=:label]', [':class' => 'views-table', ':label' => $string]);
       $this->assertTrue(!empty($elements), 'The node was found in the correct order.');
     }
 
     // Compare the rendered HTML node list to a query for the nodes ordered by
     // title to account for possible database-dependent sort order.
     $nodes_query = db_select('node_field_data', 'n')
-      ->fields('n', array('title'))
+      ->fields('n', ['title'])
       ->orderBy('title')
       ->execute()
       ->fetchCol();
 
-    $this->drupalGet('admin/content', array('query' => array('sort' => 'asc', 'order' => 'title')));
+    $this->drupalGet('admin/content', ['query' => ['sort' => 'asc', 'order' => 'title']]);
     foreach ($nodes_query as $delta => $string) {
-      $elements = $this->xpath('//table[contains(@class, :class)]/tbody/tr[' . ($delta + 1) . ']/td[2]/a[normalize-space(text())=:label]', array(':class' => 'views-table', ':label' => $string));
+      $elements = $this->xpath('//table[contains(@class, :class)]/tbody/tr[' . ($delta + 1) . ']/td[2]/a[normalize-space(text())=:label]', [':class' => 'views-table', ':label' => $string]);
       $this->assertTrue(!empty($elements), 'The node was found in the correct order.');
     }
   }
@@ -110,7 +110,7 @@ class NodeAdminTest extends NodeTestBase {
    *
    * @see TaxonomyNodeFilterTestCase
    */
-  function testContentAdminPages() {
+  public function testContentAdminPages() {
     $this->drupalLogin($this->adminUser);
 
     // Use an explicit changed time to ensure the expected order in the content
@@ -118,10 +118,10 @@ class NodeAdminTest extends NodeTestBase {
     // they appear in the following code, and the 'content' View has a table
     // style configuration with a default sort on the 'changed' field DESC.
     $time = time();
-    $nodes['published_page'] = $this->drupalCreateNode(array('type' => 'page', 'changed' => $time--));
-    $nodes['published_article'] = $this->drupalCreateNode(array('type' => 'article', 'changed' => $time--));
-    $nodes['unpublished_page_1'] = $this->drupalCreateNode(array('type' => 'page', 'changed' => $time--, 'uid' => $this->baseUser1->id(), 'status' => 0));
-    $nodes['unpublished_page_2'] = $this->drupalCreateNode(array('type' => 'page', 'changed' => $time, 'uid' => $this->baseUser2->id(), 'status' => 0));
+    $nodes['published_page'] = $this->drupalCreateNode(['type' => 'page', 'changed' => $time--]);
+    $nodes['published_article'] = $this->drupalCreateNode(['type' => 'article', 'changed' => $time--]);
+    $nodes['unpublished_page_1'] = $this->drupalCreateNode(['type' => 'page', 'changed' => $time--, 'uid' => $this->baseUser1->id(), 'status' => 0]);
+    $nodes['unpublished_page_2'] = $this->drupalCreateNode(['type' => 'page', 'changed' => $time, 'uid' => $this->baseUser2->id(), 'status' => 0]);
 
     // Verify view, edit, and delete links for any content.
     $this->drupalGet('admin/content');
@@ -139,14 +139,14 @@ class NodeAdminTest extends NodeTestBase {
     }
 
     // Verify filtering by publishing status.
-    $this->drupalGet('admin/content', array('query' => array('status' => TRUE)));
+    $this->drupalGet('admin/content', ['query' => ['status' => TRUE]]);
 
     $this->assertLinkByHref('node/' . $nodes['published_page']->id() . '/edit');
     $this->assertLinkByHref('node/' . $nodes['published_article']->id() . '/edit');
     $this->assertNoLinkByHref('node/' . $nodes['unpublished_page_1']->id() . '/edit');
 
     // Verify filtering by status and content type.
-    $this->drupalGet('admin/content', array('query' => array('status' => TRUE, 'type' => 'page')));
+    $this->drupalGet('admin/content', ['query' => ['status' => TRUE, 'type' => 'page']]);
 
     $this->assertLinkByHref('node/' . $nodes['published_page']->id() . '/edit');
     $this->assertNoLinkByHref('node/' . $nodes['published_article']->id() . '/edit');
diff --git a/web/core/modules/node/src/Tests/NodeBlockFunctionalTest.php b/web/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
index 9579045a6..5a2e40a30 100644
--- a/web/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
+++ b/web/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
@@ -35,14 +35,14 @@ class NodeBlockFunctionalTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'views');
+  public static $modules = ['block', 'views'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create users and test node.
-    $this->adminUser = $this->drupalCreateUser(array('administer content types', 'administer nodes', 'administer blocks', 'access content overview'));
-    $this->webUser = $this->drupalCreateUser(array('access content', 'create article content'));
+    $this->adminUser = $this->drupalCreateUser(['administer content types', 'administer nodes', 'administer blocks', 'access content overview']);
+    $this->webUser = $this->drupalCreateUser(['access content', 'create article content']);
   }
 
   /**
@@ -52,34 +52,34 @@ class NodeBlockFunctionalTest extends NodeTestBase {
     $this->drupalLogin($this->adminUser);
 
     // Disallow anonymous users to view content.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access content' => FALSE,
-    ));
+    ]);
 
     // Enable the recent content block with two items.
-    $block = $this->drupalPlaceBlock('views_block:content_recent-block_1', array('id' => 'test_block', 'items_per_page' => 2));
+    $block = $this->drupalPlaceBlock('views_block:content_recent-block_1', ['id' => 'test_block', 'items_per_page' => 2]);
 
     // Test that block is not visible without nodes.
     $this->drupalGet('');
     $this->assertText(t('No content available.'), 'Block with "No content available." found.');
 
     // Add some test nodes.
-    $default_settings = array('uid' => $this->webUser->id(), 'type' => 'article');
+    $default_settings = ['uid' => $this->webUser->id(), 'type' => 'article'];
     $node1 = $this->drupalCreateNode($default_settings);
     $node2 = $this->drupalCreateNode($default_settings);
     $node3 = $this->drupalCreateNode($default_settings);
 
     // Change the changed time for node so that we can test ordering.
     db_update('node_field_data')
-      ->fields(array(
+      ->fields([
         'changed' => $node1->getChangedTime() + 100,
-      ))
+      ])
       ->condition('nid', $node2->id())
       ->execute();
     db_update('node_field_data')
-      ->fields(array(
+      ->fields([
         'changed' => $node1->getChangedTime() + 200,
-      ))
+      ])
       ->condition('nid', $node3->id())
       ->execute();
 
@@ -131,7 +131,7 @@ class NodeBlockFunctionalTest extends NodeTestBase {
     $this->assertTrue(isset($visibility['node_type']['bundles']['article']), 'Visibility settings were saved to configuration');
 
     // Create a page node.
-    $node5 = $this->drupalCreateNode(array('uid' => $this->adminUser->id(), 'type' => 'page'));
+    $node5 = $this->drupalCreateNode(['uid' => $this->adminUser->id(), 'type' => 'page']);
 
     $this->drupalLogout();
     $this->drupalLogin($this->webUser);
diff --git a/web/core/modules/node/src/Tests/NodeEditFormTest.php b/web/core/modules/node/src/Tests/NodeEditFormTest.php
index b154ca0bb..ed8b34a47 100644
--- a/web/core/modules/node/src/Tests/NodeEditFormTest.php
+++ b/web/core/modules/node/src/Tests/NodeEditFormTest.php
@@ -43,8 +43,8 @@ class NodeEditFormTest extends NodeTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->webUser = $this->drupalCreateUser(array('edit own page content', 'create page content'));
-    $this->adminUser = $this->drupalCreateUser(array('bypass node access', 'administer nodes'));
+    $this->webUser = $this->drupalCreateUser(['edit own page content', 'create page content']);
+    $this->adminUser = $this->drupalCreateUser(['bypass node access', 'administer nodes']);
     $this->drupalPlaceBlock('local_tasks_block');
 
     $this->nodeStorage = $this->container->get('entity.manager')->getStorage('node');
@@ -59,7 +59,7 @@ class NodeEditFormTest extends NodeTestBase {
     $title_key = 'title[0][value]';
     $body_key = 'body[0][value]';
     // Create node to edit.
-    $edit = array();
+    $edit = [];
     $edit[$title_key] = $this->randomMachineName(8);
     $edit[$body_key] = $this->randomMachineName(16);
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
@@ -79,7 +79,7 @@ class NodeEditFormTest extends NodeTestBase {
     $this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
 
     // Edit the content of the node.
-    $edit = array();
+    $edit = [];
     $edit[$title_key] = $this->randomMachineName(8);
     $edit[$body_key] = $this->randomMachineName(16);
     // Stay on the current page, without reloading.
@@ -90,11 +90,11 @@ class NodeEditFormTest extends NodeTestBase {
     $this->assertText($edit[$body_key], 'Body displayed.');
 
     // Log in as a second administrator user.
-    $second_web_user = $this->drupalCreateUser(array('administer nodes', 'edit any page content'));
+    $second_web_user = $this->drupalCreateUser(['administer nodes', 'edit any page content']);
     $this->drupalLogin($second_web_user);
     // Edit the same node, creating a new revision.
     $this->drupalGet("node/" . $node->id() . "/edit");
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit[$body_key] = $this->randomMachineName(16);
     $edit['revision'] = TRUE;
@@ -111,6 +111,25 @@ class NodeEditFormTest extends NodeTestBase {
     $first_node_version = node_revision_load($node->getRevisionId());
     $second_node_version = node_revision_load($revised_node->getRevisionId());
     $this->assertNotIdentical($first_node_version->getRevisionUser()->id(), $second_node_version->getRevisionUser()->id(), 'Each revision has a distinct user.');
+
+    // Check if the node revision checkbox is rendered on node edit form.
+    $this->drupalGet('node/' . $node->id() . '/edit');
+    $this->assertFieldById('edit-revision', NULL, 'The revision field is present.');
+
+    // Check that details form element opens when there are errors on child
+    // elements.
+    $this->drupalGet('node/' . $node->id() . '/edit');
+    $edit = [];
+    // This invalid date will trigger an error.
+    $edit['created[0][value][date]'] = $this->randomMachineName(8);
+    // Get the current amount of open details elements.
+    $open_details_elements = count($this->cssSelect('details[open="open"]'));
+    $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
+    // The node author details must be open.
+    $this->assertRaw('<details class="node-form-author js-form-wrapper form-wrapper" data-drupal-selector="edit-author" id="edit-author" open="open">');
+    // Only one extra details element should now be open.
+    $open_details_elements++;
+    $this->assertEqual(count($this->cssSelect('details[open="open"]')), $open_details_elements, 'Exactly one extra open &lt;details&gt; element found.');
   }
 
   /**
@@ -121,7 +140,7 @@ class NodeEditFormTest extends NodeTestBase {
 
     // Create node to edit.
     $body_key = 'body[0][value]';
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit[$body_key] = $this->randomMachineName(16);
     $this->drupalPostForm('node/add/page', $edit, t('Save and publish'));
@@ -154,7 +173,7 @@ class NodeEditFormTest extends NodeTestBase {
 
     // Save the node without making any changes.
     $this->drupalPostForm('node/' . $node->id() . '/edit', [], t('Save and keep published'));
-    $this->nodeStorage->resetCache(array($node->id()));
+    $this->nodeStorage->resetCache([$node->id()]);
     $node = $this->nodeStorage->load($node->id());
     $this->assertIdentical($this->webUser->id(), $node->getOwner()->id());
 
@@ -166,7 +185,7 @@ class NodeEditFormTest extends NodeTestBase {
     // Check that saving the node without making any changes keeps the proper
     // author ID.
     $this->drupalPostForm('node/' . $node->id() . '/edit', [], t('Save and keep published'));
-    $this->nodeStorage->resetCache(array($node->id()));
+    $this->nodeStorage->resetCache([$node->id()]);
     $node = $this->nodeStorage->load($node->id());
     $this->assertIdentical($this->webUser->id(), $node->getOwner()->id());
   }
@@ -181,17 +200,17 @@ class NodeEditFormTest extends NodeTestBase {
    */
   protected function checkVariousAuthoredByValues(NodeInterface $node, $form_element_name) {
     // Try to change the 'authored by' field to an invalid user name.
-    $edit = array(
+    $edit = [
       $form_element_name => 'invalid-name',
-    );
+    ];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-    $this->assertRaw(t('There are no entities matching "%name".', array('%name' => 'invalid-name')));
+    $this->assertRaw(t('There are no entities matching "%name".', ['%name' => 'invalid-name']));
 
     // Change the authored by field to an empty string, which should assign
     // authorship to the anonymous user (uid 0).
     $edit[$form_element_name] = '';
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
-    $this->nodeStorage->resetCache(array($node->id()));
+    $this->nodeStorage->resetCache([$node->id()]);
     $node = $this->nodeStorage->load($node->id());
     $uid = $node->getOwnerId();
     // Most SQL database drivers stringify fetches but entities are not
@@ -210,7 +229,7 @@ class NodeEditFormTest extends NodeTestBase {
     // logged in).
     $edit[$form_element_name] = $this->webUser->getUsername();
     $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
-    $this->nodeStorage->resetCache(array($node->id()));
+    $this->nodeStorage->resetCache([$node->id()]);
     $node = $this->nodeStorage->load($node->id());
     $this->assertIdentical($node->getOwnerId(), $this->webUser->id(), 'Node authored by normal user.');
   }
diff --git a/web/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php b/web/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
index 25ae6b68b..901887b86 100644
--- a/web/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
+++ b/web/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
@@ -14,17 +14,17 @@ class NodeEntityViewModeAlterTest extends NodeTestBase {
   /**
    * Enable dummy module that implements hook_ENTITY_TYPE_view() for nodes.
    */
-  public static $modules = array('node_test');
+  public static $modules = ['node_test'];
 
   /**
    * Create a "Basic page" node and verify its consistency in the database.
    */
-  function testNodeViewModeChange() {
-    $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content'));
+  public function testNodeViewModeChange() {
+    $web_user = $this->drupalCreateUser(['create page content', 'edit own page content']);
     $this->drupalLogin($web_user);
 
     // Create a node.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit['body[0][value]'] = t('Data that should appear only in the body for the node.');
     $edit['body[0][summary]'] = t('Extra data that should appear only in the teaser for the node.');
diff --git a/web/core/modules/node/src/Tests/NodeFieldMultilingualTest.php b/web/core/modules/node/src/Tests/NodeFieldMultilingualTest.php
index 3bd1a51ef..edd01b2d0 100644
--- a/web/core/modules/node/src/Tests/NodeFieldMultilingualTest.php
+++ b/web/core/modules/node/src/Tests/NodeFieldMultilingualTest.php
@@ -20,31 +20,31 @@ class NodeFieldMultilingualTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'language');
+  public static $modules = ['node', 'language'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create Basic page node type.
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
     // Setup users.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'administer content types', 'access administration pages', 'create page content', 'edit own page content'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'administer content types', 'access administration pages', 'create page content', 'edit own page content']);
     $this->drupalLogin($admin_user);
 
     // Add a new language.
     ConfigurableLanguage::createFromLangcode('it')->save();
 
     // Enable URL language detection and selection.
-    $edit = array('language_interface[enabled][language-url]' => '1');
+    $edit = ['language_interface[enabled][language-url]' => '1'];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Set "Basic page" content type to use multilingual support.
-    $edit = array(
+    $edit = [
       'language_configuration[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), 'Basic page content type has been updated.');
+    $this->assertRaw(t('The content type %type has been updated.', ['%type' => 'Basic page']), 'Basic page content type has been updated.');
 
     // Make node body translatable.
     $field_storage = FieldStorageConfig::loadByName('node', 'body');
@@ -55,7 +55,7 @@ class NodeFieldMultilingualTest extends WebTestBase {
   /**
    * Tests whether field languages are correctly set through the node form.
    */
-  function testMultilingualNodeForm() {
+  public function testMultilingualNodeForm() {
     // Create "Basic page" content.
     $langcode = language_get_default_langcode('node', 'page');
     $title_key = 'title[0][value]';
@@ -64,7 +64,7 @@ class NodeFieldMultilingualTest extends WebTestBase {
     $body_value = $this->randomMachineName(16);
 
     // Create node to edit.
-    $edit = array();
+    $edit = [];
     $edit[$title_key] = $title_value;
     $edit[$body_key] = $body_value;
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
@@ -77,17 +77,17 @@ class NodeFieldMultilingualTest extends WebTestBase {
     // Change node language.
     $langcode = 'it';
     $this->drupalGet("node/{$node->id()}/edit");
-    $edit = array(
+    $edit = [
       $title_key => $this->randomMachineName(8),
       'langcode[0][value]' => $langcode,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $node = $this->drupalGetNodeByTitle($edit[$title_key], TRUE);
     $this->assertTrue($node, 'Node found in database.');
     $this->assertTrue($node->language()->getId() == $langcode && $node->body->value == $body_value, 'Field language correctly changed.');
 
     // Enable content language URL detection.
-    $this->container->get('language_negotiator')->saveConfiguration(LanguageInterface::TYPE_CONTENT, array(LanguageNegotiationUrl::METHOD_ID => 0));
+    $this->container->get('language_negotiator')->saveConfiguration(LanguageInterface::TYPE_CONTENT, [LanguageNegotiationUrl::METHOD_ID => 0]);
 
     // Test multilingual field language fallback logic.
     $this->drupalGet("it/node/{$node->id()}");
@@ -100,7 +100,7 @@ class NodeFieldMultilingualTest extends WebTestBase {
   /**
    * Tests multilingual field display settings.
    */
-  function testMultilingualDisplaySettings() {
+  public function testMultilingualDisplaySettings() {
     // Create "Basic page" content.
     $title_key = 'title[0][value]';
     $title_value = $this->randomMachineName(8);
@@ -108,7 +108,7 @@ class NodeFieldMultilingualTest extends WebTestBase {
     $body_value = $this->randomMachineName(16);
 
     // Create node to edit.
-    $edit = array();
+    $edit = [];
     $edit[$title_key] = $title_value;
     $edit[$body_key] = $body_value;
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
@@ -119,10 +119,10 @@ class NodeFieldMultilingualTest extends WebTestBase {
 
     // Check if node body is showed.
     $this->drupalGet('node/' . $node->id());
-    $body = $this->xpath('//article[contains(concat(" ", normalize-space(@class), " "), :node-class)]//div[contains(concat(" ", normalize-space(@class), " "), :content-class)]/descendant::p', array(
+    $body = $this->xpath('//article[contains(concat(" ", normalize-space(@class), " "), :node-class)]//div[contains(concat(" ", normalize-space(@class), " "), :content-class)]/descendant::p', [
       ':node-class' => ' node ',
       ':content-class' => 'node__content',
-    ));
+    ]);
     $this->assertEqual(current($body), $node->body->value, 'Node body found.');
   }
 
diff --git a/web/core/modules/node/src/Tests/NodeFormButtonsTest.php b/web/core/modules/node/src/Tests/NodeFormButtonsTest.php
index 9f6732bfc..ed2bb8f7a 100644
--- a/web/core/modules/node/src/Tests/NodeFormButtonsTest.php
+++ b/web/core/modules/node/src/Tests/NodeFormButtonsTest.php
@@ -29,26 +29,26 @@ class NodeFormButtonsTest extends NodeTestBase {
     parent::setUp();
 
     // Create a user that has no access to change the state of the node.
-    $this->webUser = $this->drupalCreateUser(array('create article content', 'edit own article content'));
+    $this->webUser = $this->drupalCreateUser(['create article content', 'edit own article content']);
     // Create a user that has access to change the state of the node.
-    $this->adminUser = $this->drupalCreateUser(array('administer nodes', 'bypass node access'));
+    $this->adminUser = $this->drupalCreateUser(['administer nodes', 'bypass node access']);
   }
 
   /**
    * Tests that the right buttons are displayed for saving nodes.
    */
-  function testNodeFormButtons() {
+  public function testNodeFormButtons() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     // Log in as administrative user.
     $this->drupalLogin($this->adminUser);
 
     // Verify the buttons on a node add form.
     $this->drupalGet('node/add/article');
-    $this->assertButtons(array(t('Save and publish'), t('Save as unpublished')));
+    $this->assertButtons([t('Save and publish'), t('Save as unpublished')]);
 
     // Save the node and assert it's published after clicking
     // 'Save and publish'.
-    $edit = array('title[0][value]' => $this->randomString());
+    $edit = ['title[0][value]' => $this->randomString()];
     $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
 
     // Get the node.
@@ -57,25 +57,25 @@ class NodeFormButtonsTest extends NodeTestBase {
 
     // Verify the buttons on a node edit form.
     $this->drupalGet('node/' . $node_1->id() . '/edit');
-    $this->assertButtons(array(t('Save and keep published'), t('Save and unpublish')));
+    $this->assertButtons([t('Save and keep published'), t('Save and unpublish')]);
 
     // Save the node and verify it's still published after clicking
     // 'Save and keep published'.
     $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
-    $node_storage->resetCache(array(1));
+    $node_storage->resetCache([1]);
     $node_1 = $node_storage->load(1);
     $this->assertTrue($node_1->isPublished(), 'Node is published');
 
     // Save the node and verify it's unpublished after clicking
     // 'Save and unpublish'.
     $this->drupalPostForm('node/' . $node_1->id() . '/edit', $edit, t('Save and unpublish'));
-    $node_storage->resetCache(array(1));
+    $node_storage->resetCache([1]);
     $node_1 = $node_storage->load(1);
     $this->assertFalse($node_1->isPublished(), 'Node is unpublished');
 
     // Verify the buttons on an unpublished node edit screen.
     $this->drupalGet('node/' . $node_1->id() . '/edit');
-    $this->assertButtons(array(t('Save and keep unpublished'), t('Save and publish')));
+    $this->assertButtons([t('Save and keep unpublished'), t('Save and publish')]);
 
     // Create a node as a normal user.
     $this->drupalLogout();
@@ -83,10 +83,10 @@ class NodeFormButtonsTest extends NodeTestBase {
 
     // Verify the buttons for a normal user.
     $this->drupalGet('node/add/article');
-    $this->assertButtons(array(t('Save')), FALSE);
+    $this->assertButtons([t('Save')], FALSE);
 
     // Create the node.
-    $edit = array('title[0][value]' => $this->randomString());
+    $edit = ['title[0][value]' => $this->randomString()];
     $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $node_2 = $node_storage->load(2);
     $this->assertTrue($node_2->isPublished(), 'Node is published');
@@ -95,8 +95,8 @@ class NodeFormButtonsTest extends NodeTestBase {
     // was created by the normal user.
     $this->drupalLogout();
     $this->drupalLogin($this->adminUser);
-    $this->drupalPostForm('node/' . $node_2->id() . '/edit', array(), t('Save and unpublish'));
-    $node_storage->resetCache(array(2));
+    $this->drupalPostForm('node/' . $node_2->id() . '/edit', [], t('Save and unpublish'));
+    $node_storage->resetCache([2]);
     $node_2 = $node_storage->load(2);
     $this->assertFalse($node_2->isPublished(), 'Node is unpublished');
 
@@ -104,8 +104,8 @@ class NodeFormButtonsTest extends NodeTestBase {
     // it's still unpublished.
     $this->drupalLogout();
     $this->drupalLogin($this->webUser);
-    $this->drupalPostForm('node/' . $node_2->id() . '/edit', array(), t('Save'));
-    $node_storage->resetCache(array(2));
+    $this->drupalPostForm('node/' . $node_2->id() . '/edit', [], t('Save'));
+    $node_storage->resetCache([2]);
     $node_2 = $node_storage->load(2);
     $this->assertFalse($node_2->isPublished(), 'Node is still unpublished');
     $this->drupalLogout();
@@ -121,12 +121,12 @@ class NodeFormButtonsTest extends NodeTestBase {
     // Verify the buttons on a node add form for an administrator.
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('node/add/article');
-    $this->assertButtons(array(t('Save as unpublished'), t('Save and publish')));
+    $this->assertButtons([t('Save as unpublished'), t('Save and publish')]);
 
     // Verify the node is unpublished by default for a normal user.
     $this->drupalLogout();
     $this->drupalLogin($this->webUser);
-    $edit = array('title[0][value]' => $this->randomString());
+    $edit = ['title[0][value]' => $this->randomString()];
     $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $node_3 = $node_storage->load(3);
     $this->assertFalse($node_3->isPublished(), 'Node is unpublished');
diff --git a/web/core/modules/node/src/Tests/NodeQueryAlterTest.php b/web/core/modules/node/src/Tests/NodeQueryAlterTest.php
index 022625bdc..c502d6c9e 100644
--- a/web/core/modules/node/src/Tests/NodeQueryAlterTest.php
+++ b/web/core/modules/node/src/Tests/NodeQueryAlterTest.php
@@ -14,7 +14,7 @@ class NodeQueryAlterTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_access_test');
+  public static $modules = ['node_access_test'];
 
   /**
    * User with permission to view content.
@@ -39,9 +39,9 @@ class NodeQueryAlterTest extends NodeTestBase {
 
     // Create user with simple node access permission. The 'node test view'
     // permission is implemented and granted by the node_access_test module.
-    $this->accessUser = $this->drupalCreateUser(array('access content overview', 'access content', 'node test view'));
-    $this->noAccessUser = $this->drupalCreateUser(array('access content overview', 'access content'));
-    $this->noAccessUser2 = $this->drupalCreateUser(array('access content overview', 'access content'));
+    $this->accessUser = $this->drupalCreateUser(['access content overview', 'access content', 'node test view']);
+    $this->noAccessUser = $this->drupalCreateUser(['access content overview', 'access content']);
+    $this->noAccessUser2 = $this->drupalCreateUser(['access content overview', 'access content']);
   }
 
   /**
@@ -50,7 +50,7 @@ class NodeQueryAlterTest extends NodeTestBase {
    * Verifies that a non-standard table alias can be used, and that a user with
    * node access can view the nodes.
    */
-  function testNodeQueryAlterLowLevelWithAccess() {
+  public function testNodeQueryAlterLowLevelWithAccess() {
     // User with access should be able to view 4 nodes.
     try {
       $query = db_select('node', 'mytab')
@@ -91,7 +91,7 @@ class NodeQueryAlterTest extends NodeTestBase {
    * Verifies that a non-standard table alias can be used, and that a user
    * without node access cannot view the nodes.
    */
-  function testNodeQueryAlterLowLevelNoAccess() {
+  public function testNodeQueryAlterLowLevelNoAccess() {
     // User without access should be able to view 0 nodes.
     try {
       $query = db_select('node', 'mytab')
@@ -114,7 +114,7 @@ class NodeQueryAlterTest extends NodeTestBase {
    * Verifies that a non-standard table alias can be used, and that a user with
    * view-only node access cannot edit the nodes.
    */
-  function testNodeQueryAlterLowLevelEditAccess() {
+  public function testNodeQueryAlterLowLevelEditAccess() {
     // User with view-only access should not be able to edit nodes.
     try {
       $query = db_select('node', 'mytab')
@@ -142,15 +142,15 @@ class NodeQueryAlterTest extends NodeTestBase {
    * add a record to {node_access} paired with a corresponding privilege in
    * hook_node_grants().
    */
-  function testNodeQueryAlterOverride() {
-    $record = array(
+  public function testNodeQueryAlterOverride() {
+    $record = [
       'nid' => 0,
       'gid' => 0,
       'realm' => 'node_access_all',
       'grant_view' => 1,
       'grant_update' => 0,
       'grant_delete' => 0,
-    );
+    ];
     db_insert('node_access')->fields($record)->execute();
 
     // Test that the noAccessUser still doesn't have the 'view'
diff --git a/web/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php b/web/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
index e000fb808..93f21fee5 100644
--- a/web/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
+++ b/web/core/modules/node/src/Tests/NodeRevisionPermissionsTest.php
@@ -21,30 +21,30 @@ class NodeRevisionPermissionsTest extends NodeTestBase {
    *
    * @var array
    */
-  protected $accounts = array();
+  protected $accounts = [];
 
   // Map revision permission names to node revision access ops.
-  protected $map = array(
+  protected $map = [
     'view' => 'view all revisions',
     'update' => 'revert all revisions',
     'delete' => 'delete all revisions',
-  );
+  ];
 
   // Map revision permission names to node type revision access ops.
-  protected $typeMap = array(
+  protected $typeMap = [
     'view' => 'view page revisions',
     'update' => 'revert page revisions',
     'delete' => 'delete page revisions',
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
 
-    $types = array('page', 'article');
+    $types = ['page', 'article'];
 
     foreach ($types as $type) {
       // Create a node with several revisions.
-      $nodes[$type] = $this->drupalCreateNode(array('type' => $type));
+      $nodes[$type] = $this->drupalCreateNode(['type' => $type]);
       $this->nodeRevisions[$type][] = $nodes[$type];
 
       for ($i = 0; $i < 3; $i++) {
@@ -61,24 +61,24 @@ class NodeRevisionPermissionsTest extends NodeTestBase {
   /**
    * Tests general revision access permissions.
    */
-  function testNodeRevisionAccessAnyType() {
+  public function testNodeRevisionAccessAnyType() {
     // Create three users, one with each revision permission.
     foreach ($this->map as $op => $permission) {
       // Create the user.
       $account = $this->drupalCreateUser(
-        array(
+        [
           'access content',
           'edit any page content',
           'delete any page content',
           $permission,
-        )
+        ]
       );
       $account->op = $op;
       $this->accounts[] = $account;
     }
 
     // Create an admin account (returns TRUE for all revision permissions).
-    $admin_account = $this->drupalCreateUser(array('access content', 'administer nodes'));
+    $admin_account = $this->drupalCreateUser(['access content', 'administer nodes']);
     $admin_account->is_admin = TRUE;
     $this->accounts['admin'] = $admin_account;
     $accounts['admin'] = $admin_account;
@@ -90,17 +90,17 @@ class NodeRevisionPermissionsTest extends NodeTestBase {
     $accounts[] = $normal_account;
     $revision = $this->nodeRevisions['page'][1];
 
-    $parameters = array(
+    $parameters = [
       'op' => array_keys($this->map),
       'account' => $this->accounts,
-    );
+    ];
 
     $permutations = $this->generatePermutations($parameters);
 
     $node_revision_access = \Drupal::service('access_check.node.revision');
     foreach ($permutations as $case) {
       // Skip this test if there are no revisions for the node.
-      if (!($revision->isDefaultRevision() && (db_query('SELECT COUNT(vid) FROM {node_field_revision} WHERE nid = :nid', array(':nid' => $revision->id()))->fetchField() == 1 || $case['op'] == 'update' || $case['op'] == 'delete'))) {
+      if (!($revision->isDefaultRevision() && (db_query('SELECT COUNT(vid) FROM {node_field_revision} WHERE nid = :nid', [':nid' => $revision->id()])->fetchField() == 1 || $case['op'] == 'update' || $case['op'] == 'delete'))) {
         if (!empty($case['account']->is_admin) || $case['account']->hasPermission($this->map[$case['op']])) {
           $this->assertTrue($node_revision_access->checkAccess($revision, $case['account'], $case['op']), "{$this->map[$case['op']]} granted.");
         }
@@ -119,26 +119,26 @@ class NodeRevisionPermissionsTest extends NodeTestBase {
   /**
    * Tests revision access permissions for a specific content type.
    */
-  function testNodeRevisionAccessPerType() {
+  public function testNodeRevisionAccessPerType() {
     // Create three users, one with each revision permission.
     foreach ($this->typeMap as $op => $permission) {
       // Create the user.
       $account = $this->drupalCreateUser(
-        array(
+        [
           'access content',
           'edit any page content',
           'delete any page content',
           $permission,
-        )
+        ]
       );
       $account->op = $op;
       $accounts[] = $account;
     }
 
-    $parameters = array(
+    $parameters = [
       'op' => array_keys($this->typeMap),
       'account' => $accounts,
-    );
+    ];
 
     // Test that the accounts have access to the corresponding page revision
     // permissions.
@@ -148,7 +148,7 @@ class NodeRevisionPermissionsTest extends NodeTestBase {
     $node_revision_access = \Drupal::service('access_check.node.revision');
     foreach ($permutations as $case) {
       // Skip this test if there are no revisions for the node.
-      if (!($revision->isDefaultRevision() && (db_query('SELECT COUNT(vid) FROM {node_field_revision} WHERE nid = :nid', array(':nid' => $revision->id()))->fetchField() == 1 || $case['op'] == 'update' || $case['op'] == 'delete'))) {
+      if (!($revision->isDefaultRevision() && (db_query('SELECT COUNT(vid) FROM {node_field_revision} WHERE nid = :nid', [':nid' => $revision->id()])->fetchField() == 1 || $case['op'] == 'update' || $case['op'] == 'delete'))) {
         if (!empty($case['account']->is_admin) || $case['account']->hasPermission($this->typeMap[$case['op']], $case['account'])) {
           $this->assertTrue($node_revision_access->checkAccess($revision, $case['account'], $case['op']), "{$this->typeMap[$case['op']]} granted.");
         }
diff --git a/web/core/modules/node/src/Tests/NodeRevisionsTest.php b/web/core/modules/node/src/Tests/NodeRevisionsTest.php
index bfdd213f4..c50110d69 100644
--- a/web/core/modules/node/src/Tests/NodeRevisionsTest.php
+++ b/web/core/modules/node/src/Tests/NodeRevisionsTest.php
@@ -47,26 +47,26 @@ class NodeRevisionsTest extends NodeTestBase {
     ConfigurableLanguage::createFromLangcode('de')->save();
     ConfigurableLanguage::createFromLangcode('it')->save();
 
-    $field_storage_definition = array(
+    $field_storage_definition = [
       'field_name' => 'untranslatable_string_field',
       'entity_type' => 'node',
       'type' => 'string',
       'cardinality' => 1,
       'translatable' => FALSE,
-    );
+    ];
     $field_storage = FieldStorageConfig::create($field_storage_definition);
     $field_storage->save();
 
-    $field_definition = array(
+    $field_definition = [
       'field_storage' => $field_storage,
       'bundle' => 'page',
-    );
+    ];
     $field = FieldConfig::create($field_definition);
     $field->save();
 
     // Create and log in user.
     $web_user = $this->drupalCreateUser(
-      array(
+      [
         'view page revisions',
         'revert page revisions',
         'delete page revisions',
@@ -75,7 +75,7 @@ class NodeRevisionsTest extends NodeTestBase {
         'access contextual links',
         'translate any entity',
         'administer content types',
-      )
+      ]
     );
 
     $this->drupalLogin($web_user);
@@ -86,8 +86,8 @@ class NodeRevisionsTest extends NodeTestBase {
     $settings['revision'] = 1;
     $settings['isDefaultRevision'] = TRUE;
 
-    $nodes = array();
-    $logs = array();
+    $nodes = [];
+    $logs = [];
 
     // Get original node.
     $nodes[] = clone $node;
@@ -99,10 +99,10 @@ class NodeRevisionsTest extends NodeTestBase {
 
       // Create revision with a random title and body and update variables.
       $node->title = $this->randomMachineName();
-      $node->body = array(
+      $node->body = [
         'value' => $this->randomMachineName(32),
         'format' => filter_default_format(),
-      );
+      ];
       $node->untranslatable_string_field->value = $this->randomString();
       $node->setNewRevision();
 
@@ -128,7 +128,7 @@ class NodeRevisionsTest extends NodeTestBase {
   /**
    * Checks node revision related operations.
    */
-  function testRevisions() {
+  public function testRevisions() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $nodes = $this->nodes;
     $logs = $this->revisionLogs;
@@ -167,11 +167,11 @@ class NodeRevisionsTest extends NodeTestBase {
 
 
     // Confirm that revisions revert properly.
-    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionid() . "/revert", array(), t('Revert'));
+    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionid() . "/revert", [], t('Revert'));
     $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.',
-                        array('@type' => 'Basic page', '%title' => $nodes[1]->label(),
-                              '%revision-date' => format_date($nodes[1]->getRevisionCreationTime()))), 'Revision reverted.');
-    $node_storage->resetCache(array($node->id()));
+                        ['@type' => 'Basic page', '%title' => $nodes[1]->label(),
+                              '%revision-date' => format_date($nodes[1]->getRevisionCreationTime())]), 'Revision reverted.');
+    $node_storage->resetCache([$node->id()]);
     $reverted_node = $node_storage->load($node->id());
     $this->assertTrue(($nodes[1]->body->value == $reverted_node->body->value), 'Node reverted correctly.');
 
@@ -190,27 +190,27 @@ class NodeRevisionsTest extends NodeTestBase {
 
 
     // Confirm revisions delete properly.
-    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/delete", array(), t('Delete'));
+    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/delete", [], t('Delete'));
     $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.',
-                        array('%revision-date' => format_date($nodes[1]->getRevisionCreationTime()),
-                              '@type' => 'Basic page', '%title' => $nodes[1]->label())), 'Revision deleted.');
-    $this->assertTrue(db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid and vid = :vid', array(':nid' => $node->id(), ':vid' => $nodes[1]->getRevisionId()))->fetchField() == 0, 'Revision not found.');
+                        ['%revision-date' => format_date($nodes[1]->getRevisionCreationTime()),
+                              '@type' => 'Basic page', '%title' => $nodes[1]->label()]), 'Revision deleted.');
+    $this->assertTrue(db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid and vid = :vid', [':nid' => $node->id(), ':vid' => $nodes[1]->getRevisionId()])->fetchField() == 0, 'Revision not found.');
 
     // Set the revision timestamp to an older date to make sure that the
     // confirmation message correctly displays the stored revision date.
     $old_revision_date = REQUEST_TIME - 86400;
     db_update('node_revision')
       ->condition('vid', $nodes[2]->getRevisionId())
-      ->fields(array(
+      ->fields([
         'revision_timestamp' => $old_revision_date,
-      ))
+      ])
       ->execute();
-    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[2]->getRevisionId() . "/revert", array(), t('Revert'));
-    $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.', array(
+    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[2]->getRevisionId() . "/revert", [], t('Revert'));
+    $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.', [
       '@type' => 'Basic page',
       '%title' => $nodes[2]->label(),
       '%revision-date' => format_date($old_revision_date),
-    )));
+    ]));
 
     // Make a new revision and set it to not be default.
     // This will create a new revision that is not "front facing".
@@ -232,7 +232,7 @@ class NodeRevisionsTest extends NodeTestBase {
     // Verify that the non-default revision vid is greater than the default
     // revision vid.
     $default_revision = db_select('node', 'n')
-      ->fields('n', array('vid'))
+      ->fields('n', ['vid'])
       ->condition('nid', $node->id())
       ->execute()
       ->fetchCol();
@@ -297,11 +297,11 @@ class NodeRevisionsTest extends NodeTestBase {
   /**
    * Checks that revisions are correctly saved without log messages.
    */
-  function testNodeRevisionWithoutLogMessage() {
+  public function testNodeRevisionWithoutLogMessage() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     // Create a node with an initial log message.
     $revision_log = $this->randomMachineName(10);
-    $node = $this->drupalCreateNode(array('revision_log' => $revision_log));
+    $node = $this->drupalCreateNode(['revision_log' => $revision_log]);
 
     // Save over the same revision and explicitly provide an empty log message
     // (for example, to mimic the case of a node form submitted with no text in
@@ -317,12 +317,12 @@ class NodeRevisionsTest extends NodeTestBase {
     $node->save();
     $this->drupalGet('node/' . $node->id());
     $this->assertText($new_title, 'New node title appears on the page.');
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $node_revision = $node_storage->load($node->id());
     $this->assertEqual($node_revision->revision_log->value, $revision_log, 'After an existing node revision is re-saved without a log message, the original log message is preserved.');
 
     // Create another node with an initial revision log message.
-    $node = $this->drupalCreateNode(array('revision_log' => $revision_log));
+    $node = $this->drupalCreateNode(['revision_log' => $revision_log]);
 
     // Save a new node revision without providing a log message, and check that
     // this revision has an empty log message.
@@ -336,7 +336,7 @@ class NodeRevisionsTest extends NodeTestBase {
     $node->save();
     $this->drupalGet('node/' . $node->id());
     $this->assertText($new_title, 'New node title appears on the page.');
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $node_revision = $node_storage->load($node->id());
     $this->assertTrue(empty($node_revision->revision_log->value), 'After a new node revision is saved with an empty log message, the log message for the node is empty.');
   }
@@ -353,7 +353,7 @@ class NodeRevisionsTest extends NodeTestBase {
    *   The decoded JSON response body.
    */
   protected function renderContextualLinks(array $ids, $current_path) {
-    $post = array();
+    $post = [];
     for ($i = 0; $i < count($ids); $i++) {
       $post['ids[' . $i . ']'] = $ids[$i];
     }
diff --git a/web/core/modules/node/src/Tests/NodeSyndicateBlockTest.php b/web/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
index 31b216f56..23c3d881a 100644
--- a/web/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
+++ b/web/core/modules/node/src/Tests/NodeSyndicateBlockTest.php
@@ -14,13 +14,13 @@ class NodeSyndicateBlockTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('block');
+  public static $modules = ['block'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create a user and log in.
-    $admin_user = $this->drupalCreateUser(array('administer blocks'));
+    $admin_user = $this->drupalCreateUser(['administer blocks']);
     $this->drupalLogin($admin_user);
   }
 
@@ -29,7 +29,7 @@ class NodeSyndicateBlockTest extends NodeTestBase {
    */
   public function testSyndicateBlock() {
     // Place the "Syndicate" block and confirm that it is rendered.
-    $this->drupalPlaceBlock('node_syndicate_block', array('id' => 'test_syndicate_block'));
+    $this->drupalPlaceBlock('node_syndicate_block', ['id' => 'test_syndicate_block']);
     $this->drupalGet('');
     $this->assertFieldByXPath('//div[@id="block-test-syndicate-block"]/*', NULL, 'Syndicate block found.');
   }
diff --git a/web/core/modules/node/src/Tests/NodeTestBase.php b/web/core/modules/node/src/Tests/NodeTestBase.php
index d4799d4a0..2dcaba5b3 100644
--- a/web/core/modules/node/src/Tests/NodeTestBase.php
+++ b/web/core/modules/node/src/Tests/NodeTestBase.php
@@ -8,6 +8,9 @@ use Drupal\simpletest\WebTestBase;
 
 /**
  * Sets up page and article content types.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\node\Functional\NodeTestBase instead.
  */
 abstract class NodeTestBase extends WebTestBase {
 
@@ -16,7 +19,7 @@ abstract class NodeTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'datetime');
+  public static $modules = ['node', 'datetime'];
 
   /**
    * The node access control handler.
@@ -33,12 +36,12 @@ abstract class NodeTestBase extends WebTestBase {
 
     // Create Basic page and Article node types.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array(
+      $this->drupalCreateContentType([
         'type' => 'page',
         'name' => 'Basic page',
         'display_submitted' => FALSE,
-      ));
-      $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+      ]);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
     }
     $this->accessHandler = \Drupal::entityManager()->getAccessControlHandler('node');
   }
@@ -56,7 +59,7 @@ abstract class NodeTestBase extends WebTestBase {
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The user account for which to check access.
    */
-  function assertNodeAccess(array $ops, NodeInterface $node, AccountInterface $account) {
+  public function assertNodeAccess(array $ops, NodeInterface $node, AccountInterface $account) {
     foreach ($ops as $op => $result) {
       $this->assertEqual($result, $this->accessHandler->access($node, $op, $account), $this->nodeAccessAssertMessage($op, $result, $node->language()->getId()));
     }
@@ -75,10 +78,10 @@ abstract class NodeTestBase extends WebTestBase {
    *   (optional) The language code indicating which translation of the node
    *   to check. If NULL, the untranslated (fallback) access is checked.
    */
-  function assertNodeCreateAccess($bundle, $result, AccountInterface $account, $langcode = NULL) {
-    $this->assertEqual($result, $this->accessHandler->createAccess($bundle, $account, array(
+  public function assertNodeCreateAccess($bundle, $result, AccountInterface $account, $langcode = NULL) {
+    $this->assertEqual($result, $this->accessHandler->createAccess($bundle, $account, [
       'langcode' => $langcode,
-    )), $this->nodeAccessAssertMessage('create', $result, $langcode));
+    ]), $this->nodeAccessAssertMessage('create', $result, $langcode));
   }
 
   /**
@@ -96,14 +99,14 @@ abstract class NodeTestBase extends WebTestBase {
    *   An assert message string which contains information in plain English
    *   about the node access permission test that was performed.
    */
-  function nodeAccessAssertMessage($operation, $result, $langcode = NULL) {
+  public function nodeAccessAssertMessage($operation, $result, $langcode = NULL) {
     return format_string(
       'Node access returns @result with operation %op, language code %langcode.',
-      array(
+      [
         '@result' => $result ? 'true' : 'false',
         '%op' => $operation,
         '%langcode' => !empty($langcode) ? $langcode : 'empty'
-      )
+      ]
     );
   }
 
diff --git a/web/core/modules/node/src/Tests/NodeTitleTest.php b/web/core/modules/node/src/Tests/NodeTitleTest.php
index 59ee02149..f9e74bcdc 100644
--- a/web/core/modules/node/src/Tests/NodeTitleTest.php
+++ b/web/core/modules/node/src/Tests/NodeTitleTest.php
@@ -19,7 +19,7 @@ class NodeTitleTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('comment', 'views', 'block');
+  public static $modules = ['comment', 'views', 'block'];
 
   /**
    * A user with permission to bypass access content.
@@ -35,7 +35,7 @@ class NodeTitleTest extends NodeTestBase {
     parent::setUp();
     $this->drupalPlaceBlock('system_breadcrumb_block');
 
-    $this->adminUser = $this->drupalCreateUser(array('administer nodes', 'create article content', 'create page content', 'post comments'));
+    $this->adminUser = $this->drupalCreateUser(['administer nodes', 'create article content', 'create page content', 'post comments']);
     $this->drupalLogin($this->adminUser);
     $this->addDefaultCommentField('node', 'page');
   }
@@ -43,14 +43,14 @@ class NodeTitleTest extends NodeTestBase {
   /**
    * Creates one node and tests if the node title has the correct value.
    */
-  function testNodeTitle() {
+  public function testNodeTitle() {
     // Create "Basic page" content with title.
     // Add the node to the frontpage so we can test if teaser links are
     // clickable.
-    $settings = array(
+    $settings = [
       'title' => $this->randomMachineName(8),
       'promote' => 1,
-    );
+    ];
     $node = $this->drupalCreateNode($settings);
 
     // Test <title> tag.
@@ -64,16 +64,16 @@ class NodeTitleTest extends NodeTestBase {
     $this->assertEqual(current($this->xpath($xpath)), $node->label(), 'Node breadcrumb is equal to node title.', 'Node');
 
     // Test node title in comment preview.
-    $this->assertEqual(current($this->xpath('//article[contains(concat(" ", normalize-space(@class), " "), :node-class)]/h2/a/span', array(':node-class' => ' node--type-' . $node->bundle() . ' '))), $node->label(), 'Node preview title is equal to node title.', 'Node');
+    $this->assertEqual(current($this->xpath('//article[contains(concat(" ", normalize-space(@class), " "), :node-class)]/h2/a/span', [':node-class' => ' node--type-' . $node->bundle() . ' '])), $node->label(), 'Node preview title is equal to node title.', 'Node');
 
     // Test node title is clickable on teaser list (/node).
     $this->drupalGet('node');
     $this->clickLink($node->label());
 
     // Test edge case where node title is set to 0.
-    $settings = array(
+    $settings = [
       'title' => 0,
-    );
+    ];
     $node = $this->drupalCreateNode($settings);
     // Test that 0 appears as <title>.
     $this->drupalGet('node/' . $node->id());
@@ -84,9 +84,9 @@ class NodeTitleTest extends NodeTestBase {
 
     // Test edge case where node title contains special characters.
     $edge_case_title = 'article\'s "title".';
-    $settings = array(
+    $settings = [
       'title' => $edge_case_title,
-    );
+    ];
     $node = $this->drupalCreateNode($settings);
     // Test that the title appears as <title>. The title will be escaped on the
     // the page.
diff --git a/web/core/modules/node/src/Tests/NodeTitleXSSTest.php b/web/core/modules/node/src/Tests/NodeTitleXSSTest.php
index c41027514..c5bbe95d6 100644
--- a/web/core/modules/node/src/Tests/NodeTitleXSSTest.php
+++ b/web/core/modules/node/src/Tests/NodeTitleXSSTest.php
@@ -14,20 +14,20 @@ class NodeTitleXSSTest extends NodeTestBase {
   /**
    * Tests XSS functionality with a node entity.
    */
-  function testNodeTitleXSS() {
+  public function testNodeTitleXSS() {
     // Prepare a user to do the stuff.
-    $web_user = $this->drupalCreateUser(array('create page content', 'edit any page content'));
+    $web_user = $this->drupalCreateUser(['create page content', 'edit any page content']);
     $this->drupalLogin($web_user);
 
     $xss = '<script>alert("xss")</script>';
     $title = $xss . $this->randomMachineName();
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $title;
 
     $this->drupalPostForm('node/add/page', $edit, t('Preview'));
     $this->assertNoRaw($xss, 'Harmful tags are escaped when previewing a node.');
 
-    $settings = array('title' => $title);
+    $settings = ['title' => $title];
     $node = $this->drupalCreateNode($settings);
 
     $this->drupalGet('node/' . $node->id());
diff --git a/web/core/modules/node/src/Tests/NodeTranslationUITest.php b/web/core/modules/node/src/Tests/NodeTranslationUITest.php
index 063469d38..a01c4d5c3 100644
--- a/web/core/modules/node/src/Tests/NodeTranslationUITest.php
+++ b/web/core/modules/node/src/Tests/NodeTranslationUITest.php
@@ -35,7 +35,7 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'language', 'content_translation', 'node', 'datetime', 'field_ui', 'help');
+  public static $modules = ['block', 'language', 'content_translation', 'node', 'datetime', 'field_ui', 'help'];
 
   /**
    * The profile to install as a basis for testing.
@@ -50,11 +50,11 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     parent::setUp();
 
     // Ensure the help message is shown even with prefixed paths.
-    $this->drupalPlaceBlock('help_block', array('region' => 'content'));
+    $this->drupalPlaceBlock('help_block', ['region' => 'content']);
 
     // Display the language selector.
     $this->drupalLogin($this->administrator);
-    $edit = array('language_configuration[language_alterable]' => TRUE);
+    $edit = ['language_configuration[language_alterable]' => TRUE];
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->drupalLogin($this->translator);
   }
@@ -75,13 +75,13 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     $this->drupalLogin($this->administrator);
     // Delete all fields.
     $this->drupalGet('admin/structure/types/manage/article/fields');
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $this->fieldName . '/delete', array(), t('Delete'));
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_tags/delete', array(), t('Delete'));
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_image/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $this->fieldName . '/delete', [], t('Delete'));
+    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_tags/delete', [], t('Delete'));
+    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_image/delete', [], t('Delete'));
 
     // Add a node.
     $default_langcode = $this->langcodes[0];
-    $values[$default_langcode] = array('title' => array(array('value' => $this->randomMachineName())));
+    $values[$default_langcode] = ['title' => [['value' => $this->randomMachineName()]]];
     $entity_id = $this->createEntity($values[$default_langcode], $default_langcode);
     $storage = $this->container->get('entity_type.manager')
       ->getStorage($this->entityTypeId);
@@ -91,14 +91,14 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     // Add a content translation.
     $langcode = 'fr';
     $language = ConfigurableLanguage::load($langcode);
-    $values[$langcode] = array('title' => array(array('value' => $this->randomMachineName())));
+    $values[$langcode] = ['title' => [['value' => $this->randomMachineName()]]];
 
     $entity_type_id = $entity->getEntityTypeId();
     $add_url = Url::fromRoute("entity.$entity_type_id.content_translation_add", [
       $entity->getEntityTypeId() => $entity->id(),
       'source' => $default_langcode,
       'target' => $langcode
-    ], array('language' => $language));
+    ], ['language' => $language]);
     $this->drupalPostForm($add_url, $this->getEditValues($values, $langcode), t('Save and unpublish (this translation)'));
 
     $storage->resetCache([$this->entityId]);
@@ -112,28 +112,28 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
    * {@inheritdoc}
    */
   protected function getTranslatorPermissions() {
-    return array_merge(parent::getTranslatorPermissions(), array('administer nodes', "edit any $this->bundle content"));
+    return array_merge(parent::getTranslatorPermissions(), ['administer nodes', "edit any $this->bundle content"]);
   }
 
   /**
    * {@inheritdoc}
    */
   protected function getEditorPermissions() {
-    return array('administer nodes', 'create article content');
+    return ['administer nodes', 'create article content'];
   }
 
   /**
    * {@inheritdoc}
    */
   protected function getAdministratorPermissions() {
-    return array_merge(parent::getAdministratorPermissions(), array('access administration pages', 'administer content types', 'administer node fields', 'access content overview', 'bypass node access', 'administer languages', 'administer themes', 'view the administration theme'));
+    return array_merge(parent::getAdministratorPermissions(), ['access administration pages', 'administer content types', 'administer node fields', 'access content overview', 'bypass node access', 'administer languages', 'administer themes', 'view the administration theme']);
   }
 
   /**
    * {@inheritdoc}
    */
   protected function getNewEntityValues($langcode) {
-    return array('title' => array(array('value' => $this->randomMachineName()))) + parent::getNewEntityValues($langcode);
+    return ['title' => [['value' => $this->randomMachineName()]]] + parent::getNewEntityValues($langcode);
   }
 
   /**
@@ -158,18 +158,18 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     $entity = $storage->load($this->entityId);
     $languages = $this->container->get('language_manager')->getLanguages();
 
-    $actions = array(
+    $actions = [
       t('Save and keep published'),
       t('Save and unpublish'),
-    );
+    ];
 
     foreach ($actions as $index => $action) {
       // (Un)publish the node translations and check that the translation
       // statuses are (un)published accordingly.
       foreach ($this->langcodes as $langcode) {
-        $options = array('language' => $languages[$langcode]);
+        $options = ['language' => $languages[$langcode]];
         $url = $entity->urlInfo('edit-form', $options);
-        $this->drupalPostForm($url, array(), $action . $this->getFormSubmitSuffix($entity, $langcode), $options);
+        $this->drupalPostForm($url, [], $action . $this->getFormSubmitSuffix($entity, $langcode), $options);
       }
       $storage->resetCache([$this->entityId]);
       $entity = $storage->load($this->entityId);
@@ -192,25 +192,25 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     $storage->resetCache([$this->entityId]);
     $entity = $storage->load($this->entityId);
     $languages = $this->container->get('language_manager')->getLanguages();
-    $values = array();
+    $values = [];
 
     // Post different base field information for each translation.
     foreach ($this->langcodes as $langcode) {
       $user = $this->drupalCreateUser();
-      $values[$langcode] = array(
+      $values[$langcode] = [
         'uid' => $user->id(),
         'created' => REQUEST_TIME - mt_rand(0, 1000),
         'sticky' => (bool) mt_rand(0, 1),
         'promote' => (bool) mt_rand(0, 1),
-      );
-      $edit = array(
+      ];
+      $edit = [
         'uid[0][target_id]' => $user->getUsername(),
         'created[0][value][date]' => format_date($values[$langcode]['created'], 'custom', 'Y-m-d'),
         'created[0][value][time]' => format_date($values[$langcode]['created'], 'custom', 'H:i:s'),
         'sticky[value]' => $values[$langcode]['sticky'],
         'promote[value]' => $values[$langcode]['promote'],
-      );
-      $options = array('language' => $languages[$langcode]);
+      ];
+      $options = ['language' => $languages[$langcode]];
       $url = $entity->urlInfo('edit-form', $options);
       $this->drupalPostForm($url, $edit, $this->getFormSubmitAction($entity, $langcode), $options);
     }
@@ -232,11 +232,11 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
    */
   public function testTranslationLinkTheme() {
     $this->drupalLogin($this->administrator);
-    $article = $this->drupalCreateNode(array('type' => 'article', 'langcode' => $this->langcodes[0]));
+    $article = $this->drupalCreateNode(['type' => 'article', 'langcode' => $this->langcodes[0]]);
 
     // Set up Seven as the admin theme and use it for node editing.
-    $this->container->get('theme_handler')->install(array('seven'));
-    $edit = array();
+    $this->container->get('theme_handler')->install(['seven']);
+    $edit = [];
     $edit['admin_theme'] = 'seven';
     $edit['use_admin_theme'] = TRUE;
     $this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
@@ -259,16 +259,16 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
   public function testDisabledBundle() {
     // Create a bundle that does not have translation enabled.
     $disabledBundle = $this->randomMachineName();
-    $this->drupalCreateContentType(array('type' => $disabledBundle, 'name' => $disabledBundle));
+    $this->drupalCreateContentType(['type' => $disabledBundle, 'name' => $disabledBundle]);
 
     // Create a node for each bundle.
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'type' => $this->bundle,
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
 
     // Make sure that nothing was inserted into the {content_translation} table.
-    $rows = db_query('SELECT nid, count(nid) AS count FROM {node_field_data} WHERE type <> :type GROUP BY nid HAVING count(nid) >= 2', array(':type' => $this->bundle))->fetchAll();
+    $rows = db_query('SELECT nid, count(nid) AS count FROM {node_field_data} WHERE type <> :type GROUP BY nid HAVING count(nid) >= 2', [':type' => $this->bundle])->fetchAll();
     $this->assertEqual(0, count($rows));
 
     // Ensure the translation tab is not accessible.
@@ -287,7 +287,7 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     $node->setPromoted(TRUE);
 
     // Create translations.
-    foreach (array_diff($this->langcodes, array($default_langcode)) as $langcode) {
+    foreach (array_diff($this->langcodes, [$default_langcode]) as $langcode) {
       $values[$langcode] = $this->getNewEntityValues($langcode);
       $translation = $node->addTranslation($langcode, $values[$langcode]);
       // Publish and promote the translation to frontpage.
@@ -297,7 +297,7 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     $node->save();
 
     // Test that the frontpage view displays the correct translations.
-    \Drupal::service('module_installer')->install(array('views'), TRUE);
+    \Drupal::service('module_installer')->install(['views'], TRUE);
     $this->rebuildContainer();
     $this->doTestTranslations('node', $values);
 
@@ -316,7 +316,7 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     // See also assertTaxonomyPage() in NodeAccessBaseTableTest.
     $node_href = 'node/' . $node->id();
     foreach ($this->langcodes as $langcode) {
-      $this->drupalGet('node', array('language' => \Drupal::languageManager()->getLanguage($langcode)));
+      $this->drupalGet('node', ['language' => \Drupal::languageManager()->getLanguage($langcode)]);
       $num_match_found = 0;
       if ($langcode == 'en') {
         // Site default language does not have langcode prefix in the URL.
@@ -338,7 +338,7 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     // language.
     $comment_form_href = 'node/' . $node->id() . '#comment-form';
     foreach ($this->langcodes as $langcode) {
-      $this->drupalGet('node', array('language' => \Drupal::languageManager()->getLanguage($langcode)));
+      $this->drupalGet('node', ['language' => \Drupal::languageManager()->getLanguage($langcode)]);
       $num_match_found = 0;
       if ($langcode == 'en') {
         // Site default language does not have langcode prefix in the URL.
@@ -374,8 +374,8 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
   protected function doTestTranslations($path, array $values) {
     $languages = $this->container->get('language_manager')->getLanguages();
     foreach ($this->langcodes as $langcode) {
-      $this->drupalGet($path, array('language' => $languages[$langcode]));
-      $this->assertText($values[$langcode]['title'][0]['value'], format_string('The %langcode node translation is correctly displayed.', array('%langcode' => $langcode)));
+      $this->drupalGet($path, ['language' => $languages[$langcode]]);
+      $this->assertText($values[$langcode]['title'][0]['value'], format_string('The %langcode node translation is correctly displayed.', ['%langcode' => $langcode]));
     }
   }
 
@@ -398,8 +398,8 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
       foreach ($urls as $alternate_langcode => $language_url) {
         // Retrieve desired link elements from the HTML head.
         $links = $this->xpath('head/link[@rel = "alternate" and @href = :href and @hreflang = :hreflang]',
-          array(':href' => $language_url->toString(), ':hreflang' => $alternate_langcode));
-        $this->assert(isset($links[0]), format_string('The %langcode node translation has the correct alternate hreflang link for %alternate_langcode: %link.', array('%langcode' => $langcode, '%alternate_langcode' => $alternate_langcode, '%link' => $url->toString())));
+          [':href' => $language_url->toString(), ':hreflang' => $alternate_langcode]);
+        $this->assert(isset($links[0]), format_string('The %langcode node translation has the correct alternate hreflang link for %alternate_langcode: %link.', ['%langcode' => $langcode, '%alternate_langcode' => $alternate_langcode, '%link' => $url->toString()]));
       }
     }
   }
@@ -446,15 +446,15 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     foreach ($this->langcodes as $langcode) {
       // We only want to test the title for non-english translations.
       if ($langcode != 'en') {
-        $options = array('language' => $languages[$langcode]);
+        $options = ['language' => $languages[$langcode]];
         $url = $entity->urlInfo('edit-form', $options);
         $this->drupalGet($url);
 
-        $title = t('<em>Edit @type</em> @title [%language translation]', array(
+        $title = t('<em>Edit @type</em> @title [%language translation]', [
           '@type' => $type_name,
           '@title' => $entity->getTranslation($langcode)->label(),
           '%language' => $languages[$langcode]->getName(),
-        ));
+        ]);
         $this->assertRaw($title);
       }
     }
diff --git a/web/core/modules/node/src/Tests/NodeTypeTest.php b/web/core/modules/node/src/Tests/NodeTypeTest.php
index 0d2d8deab..d7ebf2bc7 100644
--- a/web/core/modules/node/src/Tests/NodeTypeTest.php
+++ b/web/core/modules/node/src/Tests/NodeTypeTest.php
@@ -25,7 +25,7 @@ class NodeTypeTest extends NodeTestBase {
    *
    * Load available node types and validate the returned data.
    */
-  function testNodeTypeGetFunctions() {
+  public function testNodeTypeGetFunctions() {
     $node_types = NodeType::loadMultiple();
     $node_names = node_type_get_names();
 
@@ -42,7 +42,7 @@ class NodeTypeTest extends NodeTestBase {
   /**
    * Tests creating a content type programmatically and via a form.
    */
-  function testNodeTypeCreation() {
+  public function testNodeTypeCreation() {
     // Create a content type programmatically.
     $type = $this->drupalCreateContentType();
 
@@ -50,14 +50,14 @@ class NodeTypeTest extends NodeTestBase {
     $this->assertTrue($type_exists, 'The new content type has been created in the database.');
 
     // Log in a test user.
-    $web_user = $this->drupalCreateUser(array('create ' . $type->label() . ' content'));
+    $web_user = $this->drupalCreateUser(['create ' . $type->label() . ' content']);
     $this->drupalLogin($web_user);
 
     $this->drupalGet('node/add/' . $type->id());
     $this->assertResponse(200, 'The new content type can be accessed at node/add.');
 
     // Create a content type via the user interface.
-    $web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types'));
+    $web_user = $this->drupalCreateUser(['bypass node access', 'administer content types']);
     $this->drupalLogin($web_user);
 
     $this->drupalGet('node/add');
@@ -66,11 +66,11 @@ class NodeTypeTest extends NodeTestBase {
     $elements = $this->cssSelect('dl.node-type-list dt');
     $this->assertEqual(3, count($elements));
 
-    $edit = array(
+    $edit = [
       'name' => 'foo',
       'title_label' => 'title for foo',
       'type' => 'foo',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/add', $edit, t('Save and manage fields'));
     $type_exists = (bool) NodeType::load('foo');
     $this->assertTrue($type_exists, 'The new content type has been created in the database.');
@@ -83,8 +83,8 @@ class NodeTypeTest extends NodeTestBase {
   /**
    * Tests editing a node type using the UI.
    */
-  function testNodeTypeEditing() {
-    $web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types', 'administer node fields'));
+  public function testNodeTypeEditing() {
+    $web_user = $this->drupalCreateUser(['bypass node access', 'administer content types', 'administer node fields']);
     $this->drupalLogin($web_user);
 
     $field = FieldConfig::loadByName('node', 'page', 'body');
@@ -96,9 +96,9 @@ class NodeTypeTest extends NodeTestBase {
     $this->assertRaw('Body', 'Body field was found.');
 
     // Rename the title field.
-    $edit = array(
+    $edit = [
       'title_label' => 'Foo',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
 
     $this->drupalGet('node/add/page');
@@ -106,10 +106,10 @@ class NodeTypeTest extends NodeTestBase {
     $this->assertNoRaw('Title', 'Old title label was not displayed.');
 
     // Change the name and the description.
-    $edit = array(
+    $edit = [
       'name' => 'Bar',
       'description' => 'Lorem ipsum.',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
 
     $this->drupalGet('node/add');
@@ -131,9 +131,9 @@ class NodeTypeTest extends NodeTestBase {
     $this->assertEqual($node_bundles['page']['label'], 'NewBar', 'Node type bundle cache is updated');
 
     // Remove the body field.
-    $this->drupalPostForm('admin/structure/types/manage/page/fields/node.page.body/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/types/manage/page/fields/node.page.body/delete', [], t('Delete'));
     // Resave the settings for this type.
-    $this->drupalPostForm('admin/structure/types/manage/page', array(), t('Save content type'));
+    $this->drupalPostForm('admin/structure/types/manage/page', [], t('Save content type'));
     // Check that the body field doesn't exist.
     $this->drupalGet('node/add/page');
     $this->assertNoRaw('Body', 'Body field was not found.');
@@ -142,23 +142,23 @@ class NodeTypeTest extends NodeTestBase {
   /**
    * Tests deleting a content type that still has content.
    */
-  function testNodeTypeDeletion() {
+  public function testNodeTypeDeletion() {
     // Create a content type programmatically.
     $type = $this->drupalCreateContentType();
 
     // Log in a test user.
-    $web_user = $this->drupalCreateUser(array(
+    $web_user = $this->drupalCreateUser([
       'bypass node access',
       'administer content types',
-    ));
+    ]);
     $this->drupalLogin($web_user);
 
     // Add a new node of this type.
-    $node = $this->drupalCreateNode(array('type' => $type->id()));
+    $node = $this->drupalCreateNode(['type' => $type->id()]);
     // Attempt to delete the content type, which should not be allowed.
     $this->drupalGet('admin/structure/types/manage/' . $type->label() . '/delete');
     $this->assertRaw(
-      t('%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', array('%type' => $type->label())),
+      t('%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', ['%type' => $type->label()]),
       'The content type will not be deleted until all nodes of that type are removed.'
     );
     $this->assertNoText(t('This action cannot be undone.'), 'The node type deletion confirmation form is not available.');
@@ -168,13 +168,13 @@ class NodeTypeTest extends NodeTestBase {
     // Attempt to delete the content type, which should now be allowed.
     $this->drupalGet('admin/structure/types/manage/' . $type->label() . '/delete');
     $this->assertRaw(
-      t('Are you sure you want to delete the content type %type?', array('%type' => $type->label())),
+      t('Are you sure you want to delete the content type %type?', ['%type' => $type->label()]),
       'The content type is available for deletion.'
     );
     $this->assertText(t('This action cannot be undone.'), 'The node type deletion confirmation form is available.');
 
     // Test that a locked node type could not be deleted.
-    $this->container->get('module_installer')->install(array('node_test_config'));
+    $this->container->get('module_installer')->install(['node_test_config']);
     // Lock the default node type.
     $locked = \Drupal::state()->get('node.type.locked');
     $locked['default'] = 'default';
@@ -186,14 +186,14 @@ class NodeTypeTest extends NodeTestBase {
     $this->assertNoLink(t('Delete'));
     $this->drupalGet('admin/structure/types/manage/default/delete');
     $this->assertResponse(403);
-    $this->container->get('module_installer')->uninstall(array('node_test_config'));
+    $this->container->get('module_installer')->uninstall(['node_test_config']);
     $this->container = \Drupal::getContainer();
     unset($locked['default']);
     \Drupal::state()->set('node.type.locked', $locked);
     $this->drupalGet('admin/structure/types/manage/default');
     $this->clickLink(t('Delete'));
     $this->assertResponse(200);
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
     $this->assertFalse((bool) NodeType::load('default'), 'Node type with machine default deleted.');
   }
 
@@ -202,7 +202,7 @@ class NodeTypeTest extends NodeTestBase {
    */
   public function testNodeTypeFieldUiPermissions() {
     // Create an admin user who can only manage node fields.
-    $admin_user_1 = $this->drupalCreateUser(array('administer content types', 'administer node fields'));
+    $admin_user_1 = $this->drupalCreateUser(['administer content types', 'administer node fields']);
     $this->drupalLogin($admin_user_1);
 
     // Test that the user only sees the actions available to him.
@@ -211,7 +211,7 @@ class NodeTypeTest extends NodeTestBase {
     $this->assertNoLinkByHref('admin/structure/types/manage/article/display');
 
     // Create another admin user who can manage node fields display.
-    $admin_user_2 = $this->drupalCreateUser(array('administer content types', 'administer node display'));
+    $admin_user_2 = $this->drupalCreateUser(['administer content types', 'administer node display']);
     $this->drupalLogin($admin_user_2);
 
     // Test that the user only sees the actions available to him.
diff --git a/web/core/modules/node/src/Tests/NodeViewTest.php b/web/core/modules/node/src/Tests/NodeViewTest.php
index 3a27ade0d..a01cb25a5 100644
--- a/web/core/modules/node/src/Tests/NodeViewTest.php
+++ b/web/core/modules/node/src/Tests/NodeViewTest.php
@@ -89,7 +89,7 @@ class NodeViewTest extends NodeTestBase {
   public function testMultiByteUtf8() {
     $title = '🐝';
     $this->assertTrue(mb_strlen($title, 'utf-8') < strlen($title), 'Title has multi-byte characters.');
-    $node = $this->drupalCreateNode(array('title' => $title));
+    $node = $this->drupalCreateNode(['title' => $title]);
     $this->drupalGet($node->urlInfo());
     $result = $this->xpath('//span[contains(@class, "field--name-title")]');
     $this->assertEqual((string) $result[0], $title, 'The passed title was returned.');
diff --git a/web/core/modules/node/src/Tests/PagePreviewTest.php b/web/core/modules/node/src/Tests/PagePreviewTest.php
index 086ae8270..37b00d3b4 100644
--- a/web/core/modules/node/src/Tests/PagePreviewTest.php
+++ b/web/core/modules/node/src/Tests/PagePreviewTest.php
@@ -29,7 +29,7 @@ class PagePreviewTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'taxonomy', 'comment', 'image', 'file', 'text', 'node_test', 'menu_ui');
+  public static $modules = ['node', 'taxonomy', 'comment', 'image', 'file', 'text', 'node_test', 'menu_ui'];
 
   /**
    * The name of the created field.
@@ -42,7 +42,7 @@ class PagePreviewTest extends NodeTestBase {
     parent::setUp();
     $this->addDefaultCommentField('node', 'page');
 
-    $web_user = $this->drupalCreateUser(array('edit own page content', 'create page content', 'administer menu'));
+    $web_user = $this->drupalCreateUser(['edit own page content', 'create page content', 'administer menu']);
     $this->drupalLogin($web_user);
 
     // Add a vocabulary so we can test different view modes.
@@ -89,37 +89,37 @@ class PagePreviewTest extends NodeTestBase {
 
     // Create a field.
     $this->fieldName = Unicode::strtolower($this->randomMachineName());
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'page', $this->fieldName, 'Tags', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', 'page', 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'entity_reference_autocomplete_tags',
-      ))
+      ])
       ->save();
 
     // Show on default display and teaser.
     entity_get_display('node', 'page', 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
     entity_get_display('node', 'page', 'teaser')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
 
     entity_get_form_display('node', 'page', 'default')
-      ->setComponent('field_image', array(
+      ->setComponent('field_image', [
         'type' => 'image_image',
         'settings' => [],
-      ))
+      ])
       ->save();
 
     entity_get_display('node', 'page', 'default')
@@ -143,28 +143,28 @@ class PagePreviewTest extends NodeTestBase {
     ])->save();
 
     entity_get_form_display('node', 'page', 'default')
-      ->setComponent('field_test_multi', array(
+      ->setComponent('field_test_multi', [
         'type' => 'text_textfield',
-      ))
+      ])
       ->save();
 
     entity_get_display('node', 'page', 'default')
-      ->setComponent('field_test_multi', array(
+      ->setComponent('field_test_multi', [
         'type' => 'string',
-      ))
+      ])
       ->save();
   }
 
   /**
    * Checks the node preview functionality.
    */
-  function testPagePreview() {
+  public function testPagePreview() {
     $title_key = 'title[0][value]';
     $body_key = 'body[0][value]';
     $term_key = $this->fieldName . '[target_id]';
 
     // Fill in node creation form and preview node.
-    $edit = array();
+    $edit = [];
     $edit[$title_key] = '<em>' . $this->randomMachineName(8) . '</em>';
     $edit[$body_key] = $this->randomMachineName(16);
     $edit[$term_key] = $this->term->getName();
@@ -178,7 +178,7 @@ class PagePreviewTest extends NodeTestBase {
     $this->drupalPostForm(NULL, ['field_image[0][alt]' => 'Picture of llamas'], t('Preview'));
 
     // Check that the preview is displaying the title, body and term.
-    $this->assertTitle(t('@title | Drupal', array('@title' => $edit[$title_key])), 'Basic page title is preview.');
+    $this->assertTitle(t('@title | Drupal', ['@title' => $edit[$title_key]]), 'Basic page title is preview.');
     $this->assertEscaped($edit[$title_key], 'Title displayed and escaped.');
     $this->assertText($edit[$body_key], 'Body displayed.');
     $this->assertText($edit[$term_key], 'Term displayed.');
@@ -195,7 +195,7 @@ class PagePreviewTest extends NodeTestBase {
       ->removeComponent('body')
       ->save();
 
-    $view_mode_edit = array('view_mode' => 'teaser');
+    $view_mode_edit = ['view_mode' => 'teaser'];
     $this->drupalPostForm('node/preview/' . $uuid . '/full', $view_mode_edit, t('Switch'));
     $this->assertRaw('view-mode-teaser', 'View mode teaser class found.');
     $this->assertNoText($edit[$body_key], 'Body not displayed.');
@@ -207,20 +207,20 @@ class PagePreviewTest extends NodeTestBase {
     $this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
     $this->assertFieldByName($term_key, $edit[$term_key], 'Term field displayed.');
     $this->assertFieldByName('field_image[0][alt]', 'Picture of llamas');
-    $this->drupalPostAjaxForm(NULL, array(), array('field_test_multi_add_more' => t('Add another item')), NULL, array(), array(), 'node-page-form');
+    $this->drupalPostAjaxForm(NULL, [], ['field_test_multi_add_more' => t('Add another item')], NULL, [], [], 'node-page-form');
     $this->assertFieldByName('field_test_multi[0][value]');
     $this->assertFieldByName('field_test_multi[1][value]');
 
     // Return to page preview to check everything is as expected.
-    $this->drupalPostForm(NULL, array(), t('Preview'));
-    $this->assertTitle(t('@title | Drupal', array('@title' => $edit[$title_key])), 'Basic page title is preview.');
+    $this->drupalPostForm(NULL, [], t('Preview'));
+    $this->assertTitle(t('@title | Drupal', ['@title' => $edit[$title_key]]), 'Basic page title is preview.');
     $this->assertEscaped($edit[$title_key], 'Title displayed and escaped.');
     $this->assertText($edit[$body_key], 'Body displayed.');
     $this->assertText($edit[$term_key], 'Term displayed.');
     $this->assertLink(t('Back to content editing'));
 
     // Assert the content is kept when reloading the page.
-    $this->drupalGet('node/add/page', array('query' => array('uuid' => $uuid)));
+    $this->drupalGet('node/add/page', ['query' => ['uuid' => $uuid]]);
     $this->assertFieldByName($title_key, $edit[$title_key], 'Title field displayed.');
     $this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
     $this->assertFieldByName($term_key, $edit[$term_key], 'Term field displayed.');
@@ -240,7 +240,7 @@ class PagePreviewTest extends NodeTestBase {
 
     // Check with two new terms on the edit form, additionally to the existing
     // one.
-    $edit = array();
+    $edit = [];
     $newterm1 = $this->randomMachineName(8);
     $newterm2 = $this->randomMachineName(8);
     $edit[$term_key] = $this->term->getName() . ', ' . $newterm1 . ', ' . $newterm2;
@@ -256,7 +256,7 @@ class PagePreviewTest extends NodeTestBase {
 
     // Check with one more new term, keeping old terms, removing the existing
     // one.
-    $edit = array();
+    $edit = [];
     $newterm3 = $this->randomMachineName(8);
     $edit[$term_key] = $newterm1 . ', ' . $newterm3 . ', ' . $newterm2;
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Preview'));
@@ -270,9 +270,9 @@ class PagePreviewTest extends NodeTestBase {
 
     // Check that editing an existing node after it has been previewed and not
     // saved doesn't remember the previous changes.
-    $edit = array(
+    $edit = [
       $title_key => $this->randomMachineName(8),
-    );
+    ];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Preview'));
     $this->assertText($edit[$title_key], 'New title displayed.');
     $this->clickLink(t('Back to content editing'));
@@ -289,7 +289,7 @@ class PagePreviewTest extends NodeTestBase {
     $node_type->save();
     $this->drupalGet('node/add/page');
     $this->assertNoRaw('edit-submit');
-    $this->drupalPostForm('node/add/page', array($title_key => 'Preview'), t('Preview'));
+    $this->drupalPostForm('node/add/page', [$title_key => 'Preview'], t('Preview'));
     $this->clickLink(t('Back to content editing'));
     $this->assertRaw('edit-submit');
 
@@ -348,8 +348,8 @@ class PagePreviewTest extends NodeTestBase {
     $this->assertText('Basic page ' . $title . ' has been created.');
     $node = $this->drupalGetNodeByTitle($title);
     $this->drupalGet('node/' . $node->id() . '/edit');
-    $this->drupalPostAjaxForm(NULL, [], array('field_test_multi_add_more' => t('Add another item')));
-    $this->drupalPostAjaxForm(NULL, [], array('field_test_multi_add_more' => t('Add another item')));
+    $this->drupalPostAjaxForm(NULL, [], ['field_test_multi_add_more' => t('Add another item')]);
+    $this->drupalPostAjaxForm(NULL, [], ['field_test_multi_add_more' => t('Add another item')]);
     $edit = [
       'field_test_multi[1][value]' => $example_text_2,
       'field_test_multi[2][value]' => $example_text_3,
@@ -394,7 +394,7 @@ class PagePreviewTest extends NodeTestBase {
   /**
    * Checks the node preview functionality, when using revisions.
    */
-  function testPagePreviewWithRevisions() {
+  public function testPagePreviewWithRevisions() {
     $title_key = 'title[0][value]';
     $body_key = 'body[0][value]';
     $term_key = $this->fieldName . '[target_id]';
@@ -404,7 +404,7 @@ class PagePreviewTest extends NodeTestBase {
     $node_type->save();
 
     // Fill in node creation form and preview node.
-    $edit = array();
+    $edit = [];
     $edit[$title_key] = $this->randomMachineName(8);
     $edit[$body_key] = $this->randomMachineName(16);
     $edit[$term_key] = $this->term->id();
@@ -412,7 +412,7 @@ class PagePreviewTest extends NodeTestBase {
     $this->drupalPostForm('node/add/page', $edit, t('Preview'));
 
     // Check that the preview is displaying the title, body and term.
-    $this->assertTitle(t('@title | Drupal', array('@title' => $edit[$title_key])), 'Basic page title is preview.');
+    $this->assertTitle(t('@title | Drupal', ['@title' => $edit[$title_key]]), 'Basic page title is preview.');
     $this->assertText($edit[$title_key], 'Title displayed.');
     $this->assertText($edit[$body_key], 'Body displayed.');
     $this->assertText($edit[$term_key], 'Term displayed.');
@@ -450,18 +450,18 @@ class PagePreviewTest extends NodeTestBase {
    */
   public function testSimultaneousPreview() {
     $title_key = 'title[0][value]';
-    $node = $this->drupalCreateNode(array());
+    $node = $this->drupalCreateNode([]);
 
-    $edit = array($title_key => 'New page title');
+    $edit = [$title_key => 'New page title'];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Preview'));
     $this->assertText($edit[$title_key]);
 
-    $user2 = $this->drupalCreateUser(array('edit any page content'));
+    $user2 = $this->drupalCreateUser(['edit any page content']);
     $this->drupalLogin($user2);
     $this->drupalGet('node/' . $node->id() . '/edit');
     $this->assertFieldByName($title_key, $node->label(), 'No title leaked from previous user.');
 
-    $edit2 = array($title_key => 'Another page title');
+    $edit2 = [$title_key => 'Another page title'];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit2, t('Preview'));
     $this->assertUrl(\Drupal::url('entity.node.preview', ['node_preview' => $node->uuid(), 'view_mode_id' => 'full'], ['absolute' => TRUE]));
     $this->assertText($edit2[$title_key]);
diff --git a/web/core/modules/node/src/Tests/SummaryLengthTest.php b/web/core/modules/node/src/Tests/SummaryLengthTest.php
index 35eb0ddd4..e953882e4 100644
--- a/web/core/modules/node/src/Tests/SummaryLengthTest.php
+++ b/web/core/modules/node/src/Tests/SummaryLengthTest.php
@@ -18,10 +18,10 @@ class SummaryLengthTest extends NodeTestBase {
     $renderer = $this->container->get('renderer');
 
     // Create a node to view.
-    $settings = array(
-      'body' => array(array('value' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam vitae arcu at leo cursus laoreet. Curabitur dui tortor, adipiscing malesuada tempor in, bibendum ac diam. Cras non tellus a libero pellentesque condimentum. What is a Drupalism? Suspendisse ac lacus libero. Ut non est vel nisl faucibus interdum nec sed leo. Pellentesque sem risus, vulputate eu semper eget, auctor in libero. Ut fermentum est vitae metus convallis scelerisque. Phasellus pellentesque rhoncus tellus, eu dignissim purus posuere id. Quisque eu fringilla ligula. Morbi ullamcorper, lorem et mattis egestas, tortor neque pretium velit, eget eleifend odio turpis eu purus. Donec vitae metus quis leo pretium tincidunt a pulvinar sem. Morbi adipiscing laoreet mauris vel placerat. Nullam elementum, nisl sit amet scelerisque malesuada, dolor nunc hendrerit quam, eu ultrices erat est in orci. Curabitur feugiat egestas nisl sed accumsan.')),
+    $settings = [
+      'body' => [['value' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam vitae arcu at leo cursus laoreet. Curabitur dui tortor, adipiscing malesuada tempor in, bibendum ac diam. Cras non tellus a libero pellentesque condimentum. What is a Drupalism? Suspendisse ac lacus libero. Ut non est vel nisl faucibus interdum nec sed leo. Pellentesque sem risus, vulputate eu semper eget, auctor in libero. Ut fermentum est vitae metus convallis scelerisque. Phasellus pellentesque rhoncus tellus, eu dignissim purus posuere id. Quisque eu fringilla ligula. Morbi ullamcorper, lorem et mattis egestas, tortor neque pretium velit, eget eleifend odio turpis eu purus. Donec vitae metus quis leo pretium tincidunt a pulvinar sem. Morbi adipiscing laoreet mauris vel placerat. Nullam elementum, nisl sit amet scelerisque malesuada, dolor nunc hendrerit quam, eu ultrices erat est in orci. Curabitur feugiat egestas nisl sed accumsan.']],
       'promote' => 1,
-    );
+    ];
     $node = $this->drupalCreateNode($settings);
     $this->assertTrue(Node::load($node->id()), 'Node created.');
 
diff --git a/web/core/modules/node/src/Tests/Update/NodeUpdateTest.php b/web/core/modules/node/src/Tests/Update/NodeUpdateTest.php
new file mode 100644
index 000000000..b8b30be4f
--- /dev/null
+++ b/web/core/modules/node/src/Tests/Update/NodeUpdateTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Drupal\node\Tests\Update;
+
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+
+/**
+ * Tests that node settings are properly updated during database updates.
+ *
+ * @group node
+ */
+class NodeUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
+    ];
+  }
+
+  /**
+   * Tests that the node entity type has a 'published' entity key.
+   *
+   * @see node_update_8301()
+   */
+  public function testPublishedEntityKey() {
+    // Check that the 'published' entity key does not exist prior to the update.
+    $entity_type = \Drupal::entityDefinitionUpdateManager()->getEntityType('node');
+    $this->assertFalse($entity_type->getKey('published'));
+
+    // Run updates.
+    $this->runUpdates();
+
+    // Check that the entity key exists and it has the correct value.
+    $entity_type = \Drupal::entityDefinitionUpdateManager()->getEntityType('node');
+    $this->assertEqual('status', $entity_type->getKey('published'));
+  }
+
+}
diff --git a/web/core/modules/node/src/Tests/Views/BulkFormAccessTest.php b/web/core/modules/node/src/Tests/Views/BulkFormAccessTest.php
index 6dada72cf..938e456ce 100644
--- a/web/core/modules/node/src/Tests/Views/BulkFormAccessTest.php
+++ b/web/core/modules/node/src/Tests/Views/BulkFormAccessTest.php
@@ -22,14 +22,14 @@ class BulkFormAccessTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_test_views', 'node_access_test');
+  public static $modules = ['node_test_views', 'node_access_test'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_node_bulk_form');
+  public static $testViews = ['test_node_bulk_form'];
 
   /**
    * The node access control handler.
@@ -45,7 +45,7 @@ class BulkFormAccessTest extends NodeTestBase {
     parent::setUp();
 
     // Create Article node type.
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
 
     $this->accessHandler = \Drupal::entityManager()->getAccessControlHandler('node');
 
@@ -65,15 +65,15 @@ class BulkFormAccessTest extends NodeTestBase {
     // Create an account who will be the author of a private node.
     $author = $this->drupalCreateUser();
     // Create a private node (author may view, edit and delete, others may not).
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'type' => 'article',
-      'private' => array(array(
+      'private' => [[
         'value' => TRUE,
-      )),
+      ]],
       'uid' => $author->id(),
-    ));
+    ]);
     // Create an account that may view the private node, but not edit it.
-    $account = $this->drupalCreateUser(array('node test view'));
+    $account = $this->drupalCreateUser(['node test view']);
     $this->drupalLogin($account);
 
     // Ensure the node is published.
@@ -83,10 +83,10 @@ class BulkFormAccessTest extends NodeTestBase {
     $this->assertEqual(FALSE, $this->accessHandler->access($node, 'update', $account), 'The node may not be edited.');
 
     // Test editing the node using the bulk form.
-    $edit = array(
+    $edit = [
       'node_bulk_form[0]' => TRUE,
       'action' => 'node_unpublish_action',
-    );
+    ];
     $this->drupalPostForm('test-node-bulk-form', $edit, t('Apply to selected items'));
     $this->assertRaw(SafeMarkup::format('No access to execute %action on the @entity_type_label %entity_label.', [
       '%action' => 'Unpublish content',
@@ -100,7 +100,7 @@ class BulkFormAccessTest extends NodeTestBase {
 
     // Create an account that may view the private node, but can update the
     // status.
-    $account = $this->drupalCreateUser(array('administer nodes', 'node test view'));
+    $account = $this->drupalCreateUser(['administer nodes', 'node test view']);
     $this->drupalLogin($account);
 
     // Ensure the node is published.
@@ -111,10 +111,10 @@ class BulkFormAccessTest extends NodeTestBase {
     $this->assertEqual(TRUE, $node->status->access('edit', $account), 'The node status can be edited.');
 
     // Test editing the node using the bulk form.
-    $edit = array(
+    $edit = [
       'node_bulk_form[0]' => TRUE,
       'action' => 'node_unpublish_action',
-    );
+    ];
     $this->drupalPostForm('test-node-bulk-form', $edit, t('Apply to selected items'));
     // Test that the action message isn't shown.
     $this->assertNoRaw(SafeMarkup::format('%action was applied to 1 item.', [
@@ -132,25 +132,25 @@ class BulkFormAccessTest extends NodeTestBase {
     // Create an account who will be the author of a private node.
     $author = $this->drupalCreateUser();
     // Create a private node (author may view, edit and delete, others may not).
-    $private_node = $this->drupalCreateNode(array(
+    $private_node = $this->drupalCreateNode([
       'type' => 'article',
-      'private' => array(array(
+      'private' => [[
         'value' => TRUE,
-      )),
+      ]],
       'uid' => $author->id(),
-    ));
+    ]);
     // Create an account that may view the private node, but not delete it.
-    $account = $this->drupalCreateUser(array('access content', 'administer nodes', 'delete own article content', 'node test view'));
+    $account = $this->drupalCreateUser(['access content', 'administer nodes', 'delete own article content', 'node test view']);
     // Create a node that may be deleted too, to ensure the delete confirmation
     // page is shown later. In node_access_test.module, nodes may only be
     // deleted by the author.
-    $own_node = $this->drupalCreateNode(array(
+    $own_node = $this->drupalCreateNode([
       'type' => 'article',
-      'private' => array(array(
+      'private' => [[
         'value' => TRUE,
-      )),
+      ]],
       'uid' => $account->id(),
-    ));
+    ]);
     $this->drupalLogin($account);
 
     // Ensure that the private node can not be deleted.
@@ -159,13 +159,13 @@ class BulkFormAccessTest extends NodeTestBase {
     $this->assertEqual(TRUE, $this->accessHandler->access($own_node, 'delete', $account), 'The own node may be deleted.');
 
     // Try to delete the node using the bulk form.
-    $edit = array(
+    $edit = [
       'node_bulk_form[0]' => TRUE,
       'node_bulk_form[1]' => TRUE,
       'action' => 'node_delete_action',
-    );
+    ];
     $this->drupalPostForm('test-node-bulk-form', $edit, t('Apply to selected items'));
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
     // Ensure the private node still exists.
     $private_node = Node::load($private_node->id());
     $this->assertNotNull($private_node, 'The private node has not been deleted.');
diff --git a/web/core/modules/node/src/Tests/Views/BulkFormTest.php b/web/core/modules/node/src/Tests/Views/BulkFormTest.php
index 677c9d83a..2e7b6ff42 100644
--- a/web/core/modules/node/src/Tests/Views/BulkFormTest.php
+++ b/web/core/modules/node/src/Tests/Views/BulkFormTest.php
@@ -19,14 +19,14 @@ class BulkFormTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_test_views', 'language');
+  public static $modules = ['node_test_views', 'language'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_node_bulk_form');
+  public static $testViews = ['test_node_bulk_form'];
 
   /**
    * The test nodes.
@@ -86,7 +86,7 @@ class BulkFormTest extends NodeTestBase {
     $this->assertEqual(count($view->result), 10, 'All created translations are selected.');
 
     // Check the operations are accessible to the logged in user.
-    $this->drupalLogin($this->drupalCreateUser(array('administer nodes', 'access content overview', 'bypass node access')));
+    $this->drupalLogin($this->drupalCreateUser(['administer nodes', 'access content overview', 'bypass node access']));
     $this->drupalGet('test-node-bulk-form');
     $elements = $this->xpath('//select[@id="edit-action"]//option');
     $this->assertIdentical(count($elements), 8, 'All node operations are found.');
@@ -101,10 +101,10 @@ class BulkFormTest extends NodeTestBase {
     $this->assertTrue($node->isPublished(), 'Node is initially published');
     $this->assertTrue($node->getTranslation('en-gb')->isPublished(), 'Node translation is published');
     $this->assertTrue($node->getTranslation('it')->isPublished(), 'Node translation is published');
-    $edit = array(
+    $edit = [
       'node_bulk_form[0]' => TRUE,
       'action' => 'node_unpublish_action',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     $node = $this->loadNode($node->id());
     $this->assertFalse($node->isPublished(), 'Node has been unpublished');
@@ -112,10 +112,10 @@ class BulkFormTest extends NodeTestBase {
     $this->assertTrue($node->getTranslation('it')->isPublished(), 'Node translation has not been unpublished');
 
     // Publish action.
-    $edit = array(
+    $edit = [
       'node_bulk_form[0]' => TRUE,
       'action' => 'node_publish_action',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     $node = $this->loadNode($node->id());
     $this->assertTrue($node->isPublished(), 'Node has been published again');
@@ -124,10 +124,10 @@ class BulkFormTest extends NodeTestBase {
     $this->assertFalse($node->isSticky(), 'Node is not sticky');
     $this->assertFalse($node->getTranslation('en-gb')->isSticky(), 'Node translation is not sticky');
     $this->assertFalse($node->getTranslation('it')->isSticky(), 'Node translation is not sticky');
-    $edit = array(
+    $edit = [
       'node_bulk_form[0]' => TRUE,
       'action' => 'node_make_sticky_action',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     $node = $this->loadNode($node->id());
     $this->assertTrue($node->isSticky(), 'Node has been made sticky');
@@ -135,10 +135,10 @@ class BulkFormTest extends NodeTestBase {
     $this->assertFalse($node->getTranslation('it')->isSticky(), 'Node translation has not been made sticky');
 
     // Make unsticky action.
-    $edit = array(
+    $edit = [
       'node_bulk_form[0]' => TRUE,
       'action' => 'node_make_unsticky_action',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     $node = $this->loadNode($node->id());
     $this->assertFalse($node->isSticky(), 'Node is not sticky anymore');
@@ -147,10 +147,10 @@ class BulkFormTest extends NodeTestBase {
     $this->assertFalse($node->isPromoted(), 'Node is not promoted to the front page');
     $this->assertFalse($node->getTranslation('en-gb')->isPromoted(), 'Node translation is not promoted to the front page');
     $this->assertFalse($node->getTranslation('it')->isPromoted(), 'Node translation is not promoted to the front page');
-    $edit = array(
+    $edit = [
       'node_bulk_form[0]' => TRUE,
       'action' => 'node_promote_action',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     $node = $this->loadNode($node->id());
     $this->assertTrue($node->isPromoted(), 'Node has been promoted to the front page');
@@ -158,17 +158,17 @@ class BulkFormTest extends NodeTestBase {
     $this->assertFalse($node->getTranslation('it')->isPromoted(), 'Node translation has not been promoted to the front page');
 
     // Demote from front page.
-    $edit = array(
+    $edit = [
       'node_bulk_form[0]' => TRUE,
       'action' => 'node_unpromote_action',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     $node = $this->loadNode($node->id());
     $this->assertFalse($node->isPromoted(), 'Node has been demoted');
 
     // Select a bunch of translated and untranslated nodes and check that
     // operations are always applied to individual translations.
-    $edit = array(
+    $edit = [
       // Original and all translations.
       'node_bulk_form[0]' => TRUE, // Node 1, English, original.
       'node_bulk_form[1]' => TRUE, // Node 1, British English.
@@ -184,7 +184,7 @@ class BulkFormTest extends NodeTestBase {
       'node_bulk_form[8]' => TRUE, // Node 4, English, untranslated.
       'node_bulk_form[9]' => FALSE, // Node 5, British English, untranslated.
       'action' => 'node_unpublish_action',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     $node = $this->loadNode(1);
     $this->assertFalse($node->getTranslation('en')->isPublished(), '1: English translation has been unpublished');
@@ -209,7 +209,7 @@ class BulkFormTest extends NodeTestBase {
   public function testBulkDeletion() {
     // Select a bunch of translated and untranslated nodes and check that
     // nodes and individual translations are properly deleted.
-    $edit = array(
+    $edit = [
       // Original and all translations.
       'node_bulk_form[0]' => TRUE, // Node 1, English, original.
       'node_bulk_form[1]' => TRUE, // Node 1, British English.
@@ -225,7 +225,7 @@ class BulkFormTest extends NodeTestBase {
       'node_bulk_form[8]' => TRUE, // Node 4, English, untranslated.
       'node_bulk_form[9]' => FALSE, // Node 5, British English, untranslated.
       'action' => 'node_delete_action',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
 
     $label = $this->loadNode(1)->label();
@@ -239,7 +239,7 @@ class BulkFormTest extends NodeTestBase {
     $this->assertText($label);
     $this->assertNoText("$label (Original translation) - The following content translations will be deleted:");
 
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
 
     $node = $this->loadNode(1);
     $this->assertNull($node, '1: Node has been deleted');
diff --git a/web/core/modules/node/src/Tests/Views/FilterUidRevisionTest.php b/web/core/modules/node/src/Tests/Views/FilterUidRevisionTest.php
index 017d5eb39..18273003a 100644
--- a/web/core/modules/node/src/Tests/Views/FilterUidRevisionTest.php
+++ b/web/core/modules/node/src/Tests/Views/FilterUidRevisionTest.php
@@ -16,7 +16,7 @@ class FilterUidRevisionTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_filter_node_uid_revision');
+  public static $testViews = ['test_filter_node_uid_revision'];
 
   /**
    * Tests the node_uid_revision filter.
@@ -25,14 +25,14 @@ class FilterUidRevisionTest extends NodeTestBase {
     $author = $this->drupalCreateUser();
     $no_author = $this->drupalCreateUser();
 
-    $expected_result = array();
+    $expected_result = [];
     // Create one node, with the author as the node author.
-    $node = $this->drupalCreateNode(array('uid' => $author->id()));
-    $expected_result[] = array('nid' => $node->id());
+    $node = $this->drupalCreateNode(['uid' => $author->id()]);
+    $expected_result[] = ['nid' => $node->id()];
     // Create one node of which an additional revision author will be the
     // author.
-    $node = $this->drupalCreateNode(array('revision_uid' => $no_author->id()));
-    $expected_result[] = array('nid' => $node->id());
+    $node = $this->drupalCreateNode(['revision_uid' => $no_author->id()]);
+    $expected_result[] = ['nid' => $node->id()];
     $revision = clone $node;
     // Force to add a new revision.
     $revision->set('vid', NULL);
@@ -41,14 +41,14 @@ class FilterUidRevisionTest extends NodeTestBase {
 
     // Create one  node on which the author has neither authorship of revisions
     // or the main node.
-    $this->drupalCreateNode(array('uid' => $no_author->id()));
+    $this->drupalCreateNode(['uid' => $no_author->id()]);
 
     $view = Views::getView('test_filter_node_uid_revision');
     $view->initHandlers();
-    $view->filter['uid_revision']->value = array($author->id());
+    $view->filter['uid_revision']->value = [$author->id()];
 
     $this->executeView($view);
-    $this->assertIdenticalResultset($view, $expected_result, array('nid' => 'nid'), 'Make sure that the view only returns nodes which match either the node or the revision author.');
+    $this->assertIdenticalResultset($view, $expected_result, ['nid' => 'nid'], 'Make sure that the view only returns nodes which match either the node or the revision author.');
   }
 
 }
diff --git a/web/core/modules/node/src/Tests/Views/FrontPageTest.php b/web/core/modules/node/src/Tests/Views/FrontPageTest.php
index b27c416cb..1c6003a74 100644
--- a/web/core/modules/node/src/Tests/Views/FrontPageTest.php
+++ b/web/core/modules/node/src/Tests/Views/FrontPageTest.php
@@ -37,7 +37,7 @@ class FrontPageTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'contextual');
+  public static $modules = ['node', 'contextual'];
 
   protected function setUp() {
     parent::setUp();
@@ -74,14 +74,14 @@ class FrontPageTest extends ViewTestBase {
     $this->executeView($view);
     $view->preview();
 
-    $this->assertEqual($view->getTitle(), format_string('Welcome to @site_name', array('@site_name' => $site_name)), 'The welcome title is used for the empty view.');
+    $this->assertEqual($view->getTitle(), format_string('Welcome to @site_name', ['@site_name' => $site_name]), 'The welcome title is used for the empty view.');
     $view->destroy();
 
     // Create some nodes on the frontpage view. Add more than 10 nodes in order
     // to enable paging.
-    $expected = array();
+    $expected = [];
     for ($i = 0; $i < 20; $i++) {
-      $values = array();
+      $values = [];
       $values['type'] = 'article';
       $values['title'] = $this->randomMachineName();
       $values['promote'] = TRUE;
@@ -94,21 +94,21 @@ class FrontPageTest extends ViewTestBase {
         $node = $this->nodeStorage->create($values);
         $node->save();
         // Put the sticky on at the front.
-        array_unshift($expected, array('nid' => $node->id()));
+        array_unshift($expected, ['nid' => $node->id()]);
       }
       else {
         $values['sticky'] = FALSE;
         $node = $this->nodeStorage->create($values);
         $node->save();
-        array_push($expected, array('nid' => $node->id()));
+        array_push($expected, ['nid' => $node->id()]);
       }
     }
 
     // Create some nodes which aren't on the frontpage, either because they
     // aren't promoted or because they aren't published.
-    $not_expected_nids = array();
+    $not_expected_nids = [];
 
-    $values = array();
+    $values = [];
     $values['type'] = 'article';
     $values['title'] = $this->randomMachineName();
     $values['status'] = TRUE;
@@ -132,7 +132,7 @@ class FrontPageTest extends ViewTestBase {
     $node->save();
     $not_expected_nids[] = $node->id();
 
-    $column_map = array('nid' => 'nid');
+    $column_map = ['nid' => 'nid'];
 
     $view->setDisplay('page_1');
     $this->executeView($view);
@@ -171,7 +171,7 @@ class FrontPageTest extends ViewTestBase {
   public function testAdminFrontPage() {
     // When a user with sufficient permissions is logged in, views_ui adds
     // contextual links to the homepage view. This verifies there are no errors.
-    \Drupal::service('module_installer')->install(array('views_ui'));
+    \Drupal::service('module_installer')->install(['views_ui']);
     // Log in root user with sufficient permissions.
     $this->drupalLogin($this->rootUser);
     // Test frontpage view.
@@ -265,7 +265,7 @@ class FrontPageTest extends ViewTestBase {
       $render_cache_tags
     );
     $expected_tags = Cache::mergeTags($empty_node_listing_cache_tags, $cache_context_tags);
-    $expected_tags = Cache::mergeTags($expected_tags, ['rendered', 'config:user.role.anonymous', 'config:system.site']);
+    $expected_tags = Cache::mergeTags($expected_tags, ['http_response', 'rendered', 'config:user.role.anonymous', 'config:system.site']);
     $this->assertPageCacheContextsAndTags(
       Url::fromRoute('view.frontpage.page_1'),
       $cache_contexts,
@@ -331,7 +331,7 @@ class FrontPageTest extends ViewTestBase {
     $this->assertPageCacheContextsAndTags(
       Url::fromRoute('view.frontpage.page_1'),
       $cache_contexts,
-      Cache::mergeTags($first_page_output_cache_tags, ['rendered', 'config:user.role.anonymous'])
+      Cache::mergeTags($first_page_output_cache_tags, ['http_response', 'rendered', 'config:user.role.anonymous'])
     );
 
     // Second page.
@@ -350,6 +350,7 @@ class FrontPageTest extends ViewTestBase {
       'node_view',
       'user_view',
       'user:0',
+      'http_response',
       'rendered',
       // FinishResponseSubscriber adds this cache tag to responses that have the
       // 'user.permissions' cache context for anonymous users.
diff --git a/web/core/modules/node/src/Tests/Views/NodeContextualLinksTest.php b/web/core/modules/node/src/Tests/Views/NodeContextualLinksTest.php
index acd7d7b91..dc23d0ce5 100644
--- a/web/core/modules/node/src/Tests/Views/NodeContextualLinksTest.php
+++ b/web/core/modules/node/src/Tests/Views/NodeContextualLinksTest.php
@@ -17,27 +17,27 @@ class NodeContextualLinksTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('contextual');
+  public static $modules = ['contextual'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_contextual_links');
+  public static $testViews = ['test_contextual_links'];
 
   /**
    * Tests contextual links.
    */
   public function testNodeContextualLinks() {
-    $this->drupalCreateContentType(array('type' => 'page'));
-    $this->drupalCreateNode(array('promote' => 1));
+    $this->drupalCreateContentType(['type' => 'page']);
+    $this->drupalCreateNode(['promote' => 1]);
     $this->drupalGet('node');
 
-    $user = $this->drupalCreateUser(array('administer nodes', 'access contextual links'));
+    $user = $this->drupalCreateUser(['administer nodes', 'access contextual links']);
     $this->drupalLogin($user);
 
-    $response = $this->renderContextualLinks(array('node:node=1:'), 'node');
+    $response = $this->renderContextualLinks(['node:node=1:'], 'node');
     $this->assertResponse(200);
     $json = Json::decode($response);
     $this->setRawContent($json['node:node=1:']);
@@ -63,7 +63,7 @@ class NodeContextualLinksTest extends NodeTestBase {
    */
   protected function renderContextualLinks($ids, $current_path) {
     // Build POST values.
-    $post = array();
+    $post = [];
     for ($i = 0; $i < count($ids); $i++) {
       $post['ids[' . $i . ']'] = $ids[$i];
     }
@@ -78,15 +78,15 @@ class NodeContextualLinksTest extends NodeTestBase {
     $post = implode('&', $post);
 
     // Perform HTTP request.
-    return $this->curlExec(array(
-      CURLOPT_URL => \Drupal::url('contextual.render', [], ['absolute' => TRUE, 'query' => array('destination' => $current_path)]),
+    return $this->curlExec([
+      CURLOPT_URL => \Drupal::url('contextual.render', [], ['absolute' => TRUE, 'query' => ['destination' => $current_path]]),
       CURLOPT_POST => TRUE,
       CURLOPT_POSTFIELDS => $post,
-      CURLOPT_HTTPHEADER => array(
+      CURLOPT_HTTPHEADER => [
         'Accept: application/json',
         'Content-Type: application/x-www-form-urlencoded',
-      ),
-    ));
+      ],
+    ]);
   }
 
   /**
@@ -108,8 +108,8 @@ class NodeContextualLinksTest extends NodeTestBase {
     $admin_user->pass_raw = 'new_password';
     $admin_user->save();
 
-    $this->drupalCreateContentType(array('type' => 'page'));
-    $this->drupalCreateNode(array('promote' => 1));
+    $this->drupalCreateContentType(['type' => 'page']);
+    $this->drupalCreateNode(['promote' => 1]);
 
     $this->drupalLogin($admin_user);
     $this->drupalGet('node');
diff --git a/web/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php b/web/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php
index 6b6d5e246..86ff676c5 100644
--- a/web/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php
+++ b/web/core/modules/node/src/Tests/Views/NodeFieldFilterTest.php
@@ -14,14 +14,14 @@ class NodeFieldFilterTest extends NodeTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_field_filters');
+  public static $testViews = ['test_field_filters'];
 
   /**
    * List of node titles by language.
@@ -30,12 +30,12 @@ class NodeFieldFilterTest extends NodeTestBase {
    */
   public $nodeTitles = [];
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
 
     // Create Page content type.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
     }
 
     // Add two new languages.
@@ -43,15 +43,15 @@ class NodeFieldFilterTest extends NodeTestBase {
     ConfigurableLanguage::createFromLangcode('es')->save();
 
     // Set up node titles.
-    $this->nodeTitles = array(
+    $this->nodeTitles = [
       'en' => 'Food in Paris',
       'es' => 'Comida en Paris',
       'fr' => 'Nouriture en Paris',
-    );
+    ];
 
     // Create node with translations.
     $node = $this->drupalCreateNode(['title' => $this->nodeTitles['en'], 'langcode' => 'en', 'type' => 'page', 'body' => [['value' => $this->nodeTitles['en']]]]);
-    foreach (array('es', 'fr') as $langcode) {
+    foreach (['es', 'fr'] as $langcode) {
       $translation = $node->addTranslation($langcode, ['title' => $this->nodeTitles[$langcode]]);
       $translation->body->value = $this->nodeTitles[$langcode];
     }
@@ -64,19 +64,19 @@ class NodeFieldFilterTest extends NodeTestBase {
   public function testFilters() {
     // Test the title filter page, which filters for title contains 'Comida'.
     // Should show just the Spanish translation, once.
-    $this->assertPageCounts('test-title-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida title filter');
+    $this->assertPageCounts('test-title-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida title filter');
 
     // Test the body filter page, which filters for body contains 'Comida'.
     // Should show just the Spanish translation, once.
-    $this->assertPageCounts('test-body-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida body filter');
+    $this->assertPageCounts('test-body-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida body filter');
 
     // Test the title Paris filter page, which filters for title contains
     // 'Paris'. Should show each translation once.
-    $this->assertPageCounts('test-title-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris title filter');
+    $this->assertPageCounts('test-title-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris title filter');
 
     // Test the body Paris filter page, which filters for body contains
     // 'Paris'. Should show each translation once.
-    $this->assertPageCounts('test-body-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris body filter');
+    $this->assertPageCounts('test-body-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris body filter');
   }
 
   /**
diff --git a/web/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php b/web/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
index 9c124467a..a5b191013 100644
--- a/web/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
+++ b/web/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
@@ -17,7 +17,7 @@ class NodeFieldTokensTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_node_tokens');
+  public static $testViews = ['test_node_tokens'];
 
   /**
    * Tests token replacement for Views tokens supplied by the Node module.
diff --git a/web/core/modules/node/src/Tests/Views/NodeIntegrationTest.php b/web/core/modules/node/src/Tests/Views/NodeIntegrationTest.php
index 26909af84..c67913819 100644
--- a/web/core/modules/node/src/Tests/Views/NodeIntegrationTest.php
+++ b/web/core/modules/node/src/Tests/Views/NodeIntegrationTest.php
@@ -14,22 +14,22 @@ class NodeIntegrationTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_node_view');
+  public static $testViews = ['test_node_view'];
 
   /**
    * Tests basic node view with a node type argument.
    */
   public function testNodeViewTypeArgument() {
     // Create two content types with three nodes each.
-    $types = array();
-    $all_nids = array();
+    $types = [];
+    $all_nids = [];
     for ($i = 0; $i < 2; $i++) {
       $type = $this->drupalCreateContentType(['name' => '<em>' . $this->randomMachineName() . '</em>']);
       $types[] = $type;
 
       for ($j = 0; $j < 5; $j++) {
         // Ensure the right order of the nodes.
-        $node = $this->drupalCreateNode(array('type' => $type->id(), 'created' => REQUEST_TIME - ($i * 5 + $j)));
+        $node = $this->drupalCreateNode(['type' => $type->id(), 'created' => REQUEST_TIME - ($i * 5 + $j)]);
         $nodes[$type->id()][$node->id()] = $node;
         $all_nids[] = $node->id();
       }
@@ -55,9 +55,9 @@ class NodeIntegrationTest extends NodeTestBase {
    * @param array $expected_nids
    *   An array of node IDs.
    */
-  protected function assertNids(array $expected_nids = array()) {
+  protected function assertNids(array $expected_nids = []) {
     $result = $this->xpath('//span[@class="field-content"]');
-    $nids = array();
+    $nids = [];
     foreach ($result as $element) {
       $nids[] = (int) $element;
     }
diff --git a/web/core/modules/node/src/Tests/Views/NodeLanguageTest.php b/web/core/modules/node/src/Tests/Views/NodeLanguageTest.php
index 4561508e5..bdd26c0ca 100644
--- a/web/core/modules/node/src/Tests/Views/NodeLanguageTest.php
+++ b/web/core/modules/node/src/Tests/Views/NodeLanguageTest.php
@@ -19,14 +19,14 @@ class NodeLanguageTest extends NodeTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('language', 'node_test_views');
+  public static $modules = ['language', 'node_test_views'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_language');
+  public static $testViews = ['test_language'];
 
   /**
    * List of node titles by language.
@@ -43,8 +43,8 @@ class NodeLanguageTest extends NodeTestBase {
 
     // Create Page content type.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-      ViewTestData::createTestViews(get_class($this), array('node_test_views'));
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+      ViewTestData::createTestViews(get_class($this), ['node_test_views']);
     }
 
     // Add two new languages.
@@ -60,30 +60,30 @@ class NodeLanguageTest extends NodeTestBase {
     // Set up node titles. They should not include the words "French",
     // "English", or "Spanish", as there is a language field in the view
     // that prints out those words.
-    $this->nodeTitles = array(
-      LanguageInterface::LANGCODE_NOT_SPECIFIED => array(
+    $this->nodeTitles = [
+      LanguageInterface::LANGCODE_NOT_SPECIFIED => [
         'First node und',
-      ),
-      'es' => array(
+      ],
+      'es' => [
         'Primero nodo es',
         'Segundo nodo es',
         'Tercera nodo es',
-      ),
-      'en' => array(
+      ],
+      'en' => [
         'First node en',
         'Second node en',
-      ),
-      'fr' => array(
+      ],
+      'fr' => [
         'Premier nœud fr',
-      )
-    );
+      ]
+    ];
 
     // Create nodes with translations.
     foreach ($this->nodeTitles['es'] as $index => $title) {
-      $node = $this->drupalCreateNode(array('title' => $title, 'langcode' => 'es', 'type' => 'page', 'promote' => 1));
-      foreach (array('en', 'fr') as $langcode) {
+      $node = $this->drupalCreateNode(['title' => $title, 'langcode' => 'es', 'type' => 'page', 'promote' => 1]);
+      foreach (['en', 'fr'] as $langcode) {
         if (isset($this->nodeTitles[$langcode][$index])) {
-          $translation = $node->addTranslation($langcode, array('title' => $this->nodeTitles[$langcode][$index]));
+          $translation = $node->addTranslation($langcode, ['title' => $this->nodeTitles[$langcode][$index]]);
           $translation->body->value = $this->randomMachineName(32);
         }
       }
@@ -91,14 +91,14 @@ class NodeLanguageTest extends NodeTestBase {
     }
     // Create non-translatable nodes.
     foreach ($this->nodeTitles[LanguageInterface::LANGCODE_NOT_SPECIFIED] as $index => $title) {
-      $node = $this->drupalCreateNode(array('title' => $title, 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED, 'type' => 'page', 'promote' => 1));
+      $node = $this->drupalCreateNode(['title' => $title, 'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED, 'type' => 'page', 'promote' => 1]);
       $node->body->value = $this->randomMachineName(32);
       $node->save();
     }
 
     $this->container->get('router.builder')->rebuild();
 
-    $user = $this->drupalCreateUser(array('access content overview', 'access content'));
+    $user = $this->drupalCreateUser(['access content overview', 'access content']);
     $this->drupalLogin($user);
   }
 
@@ -178,7 +178,7 @@ class NodeLanguageTest extends NodeTestBase {
     }
     // When filtered, only the specific languages should show.
     foreach ($this->nodeTitles as $langcode => $titles) {
-      $this->drupalGet('admin/content', array('query' => array('langcode' => $langcode)));
+      $this->drupalGet('admin/content', ['query' => ['langcode' => $langcode]]);
       foreach ($titles as $title) {
         $this->assertText($title);
       }
@@ -195,7 +195,7 @@ class NodeLanguageTest extends NodeTestBase {
     // filter is set to the site default language instead. This should just
     // show the English nodes, no matter what the content language is.
     $config = $this->config('views.view.frontpage');
-    $config->set('display.default.display_options.filters.langcode.value', array(PluginBase::VIEWS_QUERY_LANGUAGE_SITE_DEFAULT => PluginBase::VIEWS_QUERY_LANGUAGE_SITE_DEFAULT));
+    $config->set('display.default.display_options.filters.langcode.value', [PluginBase::VIEWS_QUERY_LANGUAGE_SITE_DEFAULT => PluginBase::VIEWS_QUERY_LANGUAGE_SITE_DEFAULT]);
     $config->save();
     foreach ($this->nodeTitles as $langcode => $titles) {
       if ($langcode == LanguageInterface::LANGCODE_NOT_SPECIFIED) {
@@ -219,10 +219,10 @@ class NodeLanguageTest extends NodeTestBase {
     //
     // IMPORTANT: Make sure this part of the test is last -- it is changing
     // language configuration!
-    $config->set('display.default.display_options.filters.langcode.value', array('***LANGUAGE_language_interface***' => '***LANGUAGE_language_interface***'));
+    $config->set('display.default.display_options.filters.langcode.value', ['***LANGUAGE_language_interface***' => '***LANGUAGE_language_interface***']);
     $config->save();
     $language_config = $this->config('language.types');
-    $language_config->set('negotiation.language_interface.enabled', array('language-selected' => 1));
+    $language_config->set('negotiation.language_interface.enabled', ['language-selected' => 1]);
     $language_config->save();
     $language_config = $this->config('language.negotiation');
     $language_config->set('selected_langcode', 'es');
diff --git a/web/core/modules/node/src/Tests/Views/NodeRevisionWizardTest.php b/web/core/modules/node/src/Tests/Views/NodeRevisionWizardTest.php
index 109cdc4dd..6a774f33f 100644
--- a/web/core/modules/node/src/Tests/Views/NodeRevisionWizardTest.php
+++ b/web/core/modules/node/src/Tests/Views/NodeRevisionWizardTest.php
@@ -17,11 +17,11 @@ class NodeRevisionWizardTest extends WizardTestBase {
    * Tests creating a node revision view.
    */
   public function testViewAdd() {
-    $this->drupalCreateContentType(array('type' => 'article'));
+    $this->drupalCreateContentType(['type' => 'article']);
     // Create two nodes with two revision.
     $node_storage = \Drupal::entityManager()->getStorage('node');
     /** @var \Drupal\node\NodeInterface $node */
-    $node = $node_storage->create(array('title' => $this->randomString(), 'type' => 'article', 'created' => REQUEST_TIME + 40));
+    $node = $node_storage->create(['title' => $this->randomString(), 'type' => 'article', 'created' => REQUEST_TIME + 40]);
     $node->save();
 
     $node = $node->createDuplicate();
@@ -29,7 +29,7 @@ class NodeRevisionWizardTest extends WizardTestBase {
     $node->created->value = REQUEST_TIME + 20;
     $node->save();
 
-    $node = $node_storage->create(array('title' => $this->randomString(), 'type' => 'article', 'created' => REQUEST_TIME + 30));
+    $node = $node_storage->create(['title' => $this->randomString(), 'type' => 'article', 'created' => REQUEST_TIME + 30]);
     $node->save();
 
     $node = $node->createDuplicate();
@@ -37,7 +37,7 @@ class NodeRevisionWizardTest extends WizardTestBase {
     $node->created->value = REQUEST_TIME + 10;
     $node->save();
 
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = strtolower($this->randomMachineName(16));
     $view['description'] = $this->randomMachineName(16);
@@ -54,8 +54,8 @@ class NodeRevisionWizardTest extends WizardTestBase {
     $executable = Views::executableFactory()->get($view);
     $this->executeView($executable);
 
-    $this->assertIdenticalResultset($executable, array(array('vid' => 1), array('vid' => 3), array('vid' => 2), array('vid' => 4)),
-      array('vid' => 'vid'));
+    $this->assertIdenticalResultset($executable, [['vid' => 1], ['vid' => 3], ['vid' => 2], ['vid' => 4]],
+      ['vid' => 'vid']);
   }
 
 }
diff --git a/web/core/modules/node/src/Tests/Views/NodeTestBase.php b/web/core/modules/node/src/Tests/Views/NodeTestBase.php
index 6701b417d..661ad91ba 100644
--- a/web/core/modules/node/src/Tests/Views/NodeTestBase.php
+++ b/web/core/modules/node/src/Tests/Views/NodeTestBase.php
@@ -15,13 +15,13 @@ abstract class NodeTestBase extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_test_views');
+  public static $modules = ['node_test_views'];
 
   protected function setUp($import_test_views = TRUE) {
     parent::setUp($import_test_views);
 
     if ($import_test_views) {
-      ViewTestData::createTestViews(get_class($this), array('node_test_views'));
+      ViewTestData::createTestViews(get_class($this), ['node_test_views']);
     }
   }
 
diff --git a/web/core/modules/node/src/Tests/Views/PathPluginTest.php b/web/core/modules/node/src/Tests/Views/PathPluginTest.php
index 1ee6272d3..6558f00da 100644
--- a/web/core/modules/node/src/Tests/Views/PathPluginTest.php
+++ b/web/core/modules/node/src/Tests/Views/PathPluginTest.php
@@ -16,14 +16,14 @@ class PathPluginTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_node_path_plugin');
+  public static $testViews = ['test_node_path_plugin'];
 
   /**
    * Contains all nodes used by this test.
@@ -35,21 +35,21 @@ class PathPluginTest extends NodeTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'article'));
+    $this->drupalCreateContentType(['type' => 'article']);
 
     // Create two nodes.
     for ($i = 0; $i < 2; $i++) {
       $this->nodes[] = $this->drupalCreateNode(
-        array(
+        [
           'type' => 'article',
-          'body' => array(
-            array(
+          'body' => [
+            [
               'value' => $this->randomMachineName(42),
               'format' => filter_default_format(),
               'summary' => $this->randomMachineName(),
-            ),
-          ),
-        )
+            ],
+          ],
+        ]
       );
     }
   }
diff --git a/web/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php b/web/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php
index f4b34f169..51e200c02 100644
--- a/web/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php
+++ b/web/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php
@@ -18,12 +18,12 @@ class RevisionRelationshipsTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node' , 'node_test_views');
+  public static $modules = ['node' , 'node_test_views'];
 
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('node_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['node_test_views']);
   }
 
   /**
@@ -31,7 +31,7 @@ class RevisionRelationshipsTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_node_revision_nid', 'test_node_revision_vid');
+  public static $testViews = ['test_node_revision_nid', 'test_node_revision_vid'];
 
   /**
    * Create a node with revision and rest result count for both views.
@@ -42,40 +42,40 @@ class RevisionRelationshipsTest extends ViewTestBase {
     $node_revision = clone $node;
     $node_revision->setNewRevision();
     $node_revision->save();
-    $column_map = array(
+    $column_map = [
       'vid' => 'vid',
       'node_field_data_node_field_revision_nid' => 'node_node_revision_nid',
       'nid_1' => 'nid_1',
-    );
+    ];
 
     // Here should be two rows.
     $view_nid = Views::getView('test_node_revision_nid');
-    $this->executeView($view_nid, array($node->id()));
-    $resultset_nid = array(
-      array(
+    $this->executeView($view_nid, [$node->id()]);
+    $resultset_nid = [
+      [
         'vid' => '1',
         'node_node_revision_nid' => '1',
         'nid_1' => '1',
-      ),
-      array(
+      ],
+      [
         'vid' => '2',
         'node_revision_nid' => '1',
         'node_node_revision_nid' => '1',
         'nid_1' => '1',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view_nid, $resultset_nid, $column_map);
 
     // There should be only one row with active revision 2.
     $view_vid = Views::getView('test_node_revision_vid');
-    $this->executeView($view_vid, array($node->id()));
-    $resultset_vid = array(
-      array(
+    $this->executeView($view_vid, [$node->id()]);
+    $resultset_vid = [
+      [
         'vid' => '2',
         'node_node_revision_nid' => '1',
         'nid_1' => '1',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view_vid, $resultset_vid, $column_map);
   }
 
diff --git a/web/core/modules/node/src/Tests/Views/RowPluginTest.php b/web/core/modules/node/src/Tests/Views/RowPluginTest.php
index d13e526ee..160640fd2 100644
--- a/web/core/modules/node/src/Tests/Views/RowPluginTest.php
+++ b/web/core/modules/node/src/Tests/Views/RowPluginTest.php
@@ -17,14 +17,14 @@ class RowPluginTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_node_row_plugin');
+  public static $testViews = ['test_node_row_plugin'];
 
   /**
    * Contains all nodes used by this test.
@@ -36,21 +36,21 @@ class RowPluginTest extends NodeTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'article'));
+    $this->drupalCreateContentType(['type' => 'article']);
 
     // Create two nodes.
     for ($i = 0; $i < 2; $i++) {
       $this->nodes[] = $this->drupalCreateNode(
-        array(
+        [
           'type' => 'article',
-          'body' => array(
-            array(
+          'body' => [
+            [
               'value' => $this->randomMachineName(42),
               'format' => filter_default_format(),
               'summary' => $this->randomMachineName(),
-            ),
-          ),
-        )
+            ],
+          ],
+        ]
       );
     }
   }
diff --git a/web/core/modules/node/src/Tests/Views/StatusExtraTest.php b/web/core/modules/node/src/Tests/Views/StatusExtraTest.php
index 6d8b7ee84..9e41f5bec 100644
--- a/web/core/modules/node/src/Tests/Views/StatusExtraTest.php
+++ b/web/core/modules/node/src/Tests/Views/StatusExtraTest.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\node\Tests\Views;
 
+use Drupal\node\NodeInterface;
+
 /**
  * Tests the node.status_extra field handler.
  *
@@ -15,27 +17,27 @@ class StatusExtraTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_status_extra');
+  public static $testViews = ['test_status_extra'];
 
   /**
    * Tests the status extra filter.
    */
   public function testStatusExtra() {
-    $node_author = $this->drupalCreateUser(array('view own unpublished content'));
+    $node_author = $this->drupalCreateUser(['view own unpublished content']);
     $node_author_not_unpublished = $this->drupalCreateUser();
     $normal_user = $this->drupalCreateUser();
-    $admin_user = $this->drupalCreateUser(array('bypass node access'));
+    $admin_user = $this->drupalCreateUser(['bypass node access']);
 
     // Create one published and one unpublished node by the admin.
-    $node_published = $this->drupalCreateNode(array('uid' => $admin_user->id()));
-    $node_unpublished = $this->drupalCreateNode(array('uid' => $admin_user->id(), 'status' => NODE_NOT_PUBLISHED));
+    $node_published = $this->drupalCreateNode(['uid' => $admin_user->id()]);
+    $node_unpublished = $this->drupalCreateNode(['uid' => $admin_user->id(), 'status' => NodeInterface::NOT_PUBLISHED]);
 
     // Create one unpublished node by a certain author user.
-    $node_unpublished2 = $this->drupalCreateNode(array('uid' => $node_author->id(), 'status' => NODE_NOT_PUBLISHED));
+    $node_unpublished2 = $this->drupalCreateNode(['uid' => $node_author->id(), 'status' => NodeInterface::NOT_PUBLISHED]);
 
     // Create one unpublished node by a user who does not have the `view own
     // unpublished content` permission.
-    $node_unpublished3 = $this->drupalCreateNode(array('uid' => $node_author_not_unpublished->id(), 'status' => NODE_NOT_PUBLISHED));
+    $node_unpublished3 = $this->drupalCreateNode(['uid' => $node_author_not_unpublished->id(), 'status' => NodeInterface::NOT_PUBLISHED]);
 
     // The administrator should simply see all nodes.
     $this->drupalLogin($admin_user);
diff --git a/web/core/modules/node/tests/modules/node_access_test/node_access_test.module b/web/core/modules/node/tests/modules/node_access_test/node_access_test.module
index 56b53a92b..40baeb53e 100644
--- a/web/core/modules/node/tests/modules/node_access_test/node_access_test.module
+++ b/web/core/modules/node/tests/modules/node_access_test/node_access_test.module
@@ -50,15 +50,15 @@ use Drupal\node\NodeInterface;
  * @see node_access_test_node_access_records()
  */
 function node_access_test_node_grants($account, $op) {
-  $grants = array();
-  $grants['node_access_test_author'] = array($account->id());
+  $grants = [];
+  $grants['node_access_test_author'] = [$account->id()];
   if ($op == 'view' && $account->hasPermission('node test view', $account)) {
-    $grants['node_access_test'] = array(8888, 8889);
+    $grants['node_access_test'] = [8888, 8889];
   }
 
   $no_access_uid = \Drupal::state()->get('node_access_test.no_access_uid') ?: 0;
   if ($op == 'view' && $account->id() == $no_access_uid) {
-    $grants['node_access_all'] = array(0);
+    $grants['node_access_all'] = [0];
   }
   return $grants;
 }
@@ -77,37 +77,37 @@ function node_access_test_node_grants($account, $op) {
  * @see node_access_test.permissions.yml
  */
 function node_access_test_node_access_records(NodeInterface $node) {
-  $grants = array();
+  $grants = [];
   // For NodeAccessBaseTableTestCase, only set records for private nodes.
   if (!\Drupal::state()->get('node_access_test.private') || $node->private->value) {
     // Groups 8888 and 8889 for the node_access_test realm both receive a view
     // grant for all controlled nodes. See node_access_test_node_grants().
-    $grants[] = array(
+    $grants[] = [
       'realm' => 'node_access_test',
       'gid' => 8888,
       'grant_view' => 1,
       'grant_update' => 0,
       'grant_delete' => 0,
       'priority' => 0,
-    );
-    $grants[] = array(
+    ];
+    $grants[] = [
       'realm' => 'node_access_test',
       'gid' => 8889,
       'grant_view' => 1,
       'grant_update' => 0,
       'grant_delete' => 0,
       'priority' => 0,
-    );
+    ];
     // For the author realm, the group ID is equivalent to a user ID, which
     // means there are many many groups of just 1 user.
-    $grants[] = array(
+    $grants[] = [
       'realm' => 'node_access_test_author',
       'gid' => $node->getOwnerId(),
       'grant_view' => 1,
       'grant_update' => 1,
       'grant_delete' => 1,
       'priority' => 0,
-    );
+    ];
   }
 
   return $grants;
@@ -120,25 +120,25 @@ function node_access_test_node_access_records(NodeInterface $node) {
  *   A node type entity.
  */
 function node_access_test_add_field(NodeTypeInterface $type) {
-  $field_storage = FieldStorageConfig::create(array(
+  $field_storage = FieldStorageConfig::create([
     'field_name' => 'private',
     'entity_type' => 'node',
     'type' => 'integer',
-  ));
+  ]);
   $field_storage->save();
-  $field = FieldConfig::create(array(
+  $field = FieldConfig::create([
     'field_name' => 'private',
     'entity_type' => 'node',
     'bundle' => $type->id(),
     'label' => 'Private',
-  ));
+  ]);
   $field->save();
 
   // Assign widget settings for the 'default' form mode.
   entity_get_form_display('node', $type->id(), 'default')
-    ->setComponent('private', array(
+    ->setComponent('private', [
       'type' => 'number',
-    ))
+    ])
     ->save();
 }
 
diff --git a/web/core/modules/node/tests/modules/node_access_test_empty/node_access_test_empty.module b/web/core/modules/node/tests/modules/node_access_test_empty/node_access_test_empty.module
index 67558e613..d67365a40 100644
--- a/web/core/modules/node/tests/modules/node_access_test_empty/node_access_test_empty.module
+++ b/web/core/modules/node/tests/modules/node_access_test_empty/node_access_test_empty.module
@@ -11,12 +11,12 @@ use Drupal\node\NodeInterface;
  * Implements hook_node_grants().
  */
 function node_access_test_empty_node_grants($account, $op) {
-  return array();
+  return [];
 }
 
 /**
  * Implements hook_node_access_records().
  */
 function node_access_test_empty_node_access_records(NodeInterface $node) {
-  return array();
+  return [];
 }
diff --git a/web/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.module b/web/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.module
index ece18d824..565c100e7 100644
--- a/web/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.module
+++ b/web/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.module
@@ -16,7 +16,7 @@ use Drupal\node\NodeInterface;
  * This module defines a single grant realm. All users belong to this group.
  */
 function node_access_test_language_node_grants($account, $op) {
-  $grants['node_access_language_test'] = array(7888);
+  $grants['node_access_language_test'] = [7888];
   return $grants;
 }
 
@@ -24,13 +24,13 @@ function node_access_test_language_node_grants($account, $op) {
  * Implements hook_node_access_records().
  */
 function node_access_test_language_node_access_records(NodeInterface $node) {
-  $grants = array();
+  $grants = [];
 
   // Create grants for each translation of the node.
   foreach ($node->getTranslationLanguages() as $langcode => $language) {
     // If the translation is not marked as private, grant access.
     $translation = $node->getTranslation($langcode);
-    $grants[] = array(
+    $grants[] = [
       'realm' => 'node_access_language_test',
       'gid' => 7888,
       'grant_view' => empty($translation->field_private->value) ? 1 : 0,
@@ -38,7 +38,7 @@ function node_access_test_language_node_access_records(NodeInterface $node) {
       'grant_delete' => 0,
       'priority' => 0,
       'langcode' => $langcode,
-    );
+    ];
   }
   return $grants;
 }
diff --git a/web/core/modules/node/tests/modules/node_test/node_test.module b/web/core/modules/node/tests/modules/node_test/node_test.module
index 866be199c..c852b4411 100644
--- a/web/core/modules/node/tests/modules/node_test/node_test.module
+++ b/web/core/modules/node/tests/modules/node_test/node_test.module
@@ -21,23 +21,23 @@ use Drupal\node\NodeInterface;
 function node_test_node_view(array &$build, NodeInterface $node, EntityViewDisplayInterface $display, $view_mode) {
   if ($view_mode == 'rss') {
     // Add RSS elements and namespaces when building the RSS feed.
-    $node->rss_elements[] = array(
+    $node->rss_elements[] = [
       'key' => 'testElement',
-      'value' => t('Value of testElement RSS element for node @nid.', array('@nid' => $node->id())),
-    );
+      'value' => t('Value of testElement RSS element for node @nid.', ['@nid' => $node->id()]),
+    ];
 
     // Add content that should be displayed only in the RSS feed.
-    $build['extra_feed_content'] = array(
-      '#markup' => '<p>' . t('Extra data that should appear only in the RSS feed for node @nid.', array('@nid' => $node->id())) . '</p>',
+    $build['extra_feed_content'] = [
+      '#markup' => '<p>' . t('Extra data that should appear only in the RSS feed for node @nid.', ['@nid' => $node->id()]) . '</p>',
       '#weight' => 10,
-    );
+    ];
   }
 
   if ($view_mode != 'rss') {
     // Add content that should NOT be displayed in the RSS feed.
-    $build['extra_non_feed_content'] = array(
-      '#markup' => '<p>' . t('Extra data that should appear everywhere except the RSS feed for node @nid.', array('@nid' => $node->id())) . '</p>',
-    );
+    $build['extra_non_feed_content'] = [
+      '#markup' => '<p>' . t('Extra data that should appear everywhere except the RSS feed for node @nid.', ['@nid' => $node->id()]) . '</p>',
+    ];
   }
 }
 
@@ -57,11 +57,11 @@ function node_test_node_grants(AccountInterface $account, $op) {
   // Give everyone full grants so we don't break other node tests.
   // Our node access tests asserts three realms of access.
   // See testGrantAlter().
-  return array(
-    'test_article_realm' => array(1),
-    'test_page_realm' => array(1),
-    'test_alter_realm' => array(2),
-  );
+  return [
+    'test_article_realm' => [1],
+    'test_page_realm' => [1],
+    'test_alter_realm' => [2],
+  ];
 }
 
 /**
@@ -72,28 +72,28 @@ function node_test_node_access_records(NodeInterface $node) {
   if (!empty($node->disable_node_access)) {
     return;
   }
-  $grants = array();
+  $grants = [];
   if ($node->getType() == 'article') {
     // Create grant in arbitrary article_realm for article nodes.
-    $grants[] = array(
+    $grants[] = [
       'realm' => 'test_article_realm',
       'gid' => 1,
       'grant_view' => 1,
       'grant_update' => 0,
       'grant_delete' => 0,
       'priority' => 0,
-    );
+    ];
   }
   elseif ($node->getType() == 'page') {
     // Create grant in arbitrary page_realm for page nodes.
-    $grants[] = array(
+    $grants[] = [
       'realm' => 'test_page_realm',
       'gid' => 1,
       'grant_view' => 1,
       'grant_update' => 0,
       'grant_delete' => 0,
       'priority' => 0,
-    );
+    ];
   }
   return $grants;
 }
@@ -118,7 +118,7 @@ function node_test_node_access_records_alter(&$grants, NodeInterface $node) {
  */
 function node_test_node_grants_alter(&$grants, AccountInterface $account, $op) {
   // Return an empty array of grants to prove that we can alter by reference.
-  $grants = array();
+  $grants = [];
 }
 
 /**
diff --git a/web/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php b/web/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
index 19eaf8f73..46f4a5e10 100644
--- a/web/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
+++ b/web/core/modules/node/tests/node_access_test_auto_bubbling/src/Controller/NodeAccessTestAutoBubblingController.php
@@ -4,40 +4,13 @@ namespace Drupal\node_access_test_auto_bubbling\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\node\NodeInterface;
 
 /**
  * Returns a node ID listing.
  */
 class NodeAccessTestAutoBubblingController extends ControllerBase implements ContainerInjectionInterface {
 
-  /**
-   * The entity query factory service.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $entityQuery;
-
-  /**
-   * Constructs a new NodeAccessTestAutoBubblingController.
-   *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query
-   *   The entity query factory.
-   */
-  public function __construct(QueryFactory $entity_query) {
-    $this->entityQuery = $entity_query;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.query')
-    );
-  }
-
   /**
    * Lists the three latest published node IDs.
    *
@@ -45,8 +18,8 @@ class NodeAccessTestAutoBubblingController extends ControllerBase implements Con
    *   A render array.
    */
   public function latest() {
-    $nids = $this->entityQuery->get('node')
-      ->condition('status', NODE_PUBLISHED)
+    $nids = $this->entityTypeManager()->getStorage('node')->getQuery()
+      ->condition('status', NodeInterface::PUBLISHED)
       ->sort('created', 'DESC')
       ->range(0, 3)
       ->execute();
diff --git a/web/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php b/web/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php
similarity index 97%
rename from web/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
rename to web/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php
index a02ef3f18..8c9ef6378 100644
--- a/web/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
+++ b/web/core/modules/node/tests/src/Functional/Migrate/d6/MigrateNodeRevisionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests\Migrate\d6;
+namespace Drupal\Tests\node\Functional\Migrate\d6;
 use Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeTestBase;
 
 /**
diff --git a/web/core/modules/node/src/Tests/Migrate/d7/NodeMigrateDeriverTest.php b/web/core/modules/node/tests/src/Functional/Migrate/d7/NodeMigrateDeriverTest.php
similarity index 96%
rename from web/core/modules/node/src/Tests/Migrate/d7/NodeMigrateDeriverTest.php
rename to web/core/modules/node/tests/src/Functional/Migrate/d7/NodeMigrateDeriverTest.php
index e57dcbd3b..621cdb6d4 100644
--- a/web/core/modules/node/src/Tests/Migrate/d7/NodeMigrateDeriverTest.php
+++ b/web/core/modules/node/tests/src/Functional/Migrate/d7/NodeMigrateDeriverTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests\Migrate\d7;
+namespace Drupal\Tests\node\Functional\Migrate\d7;
 
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
diff --git a/web/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php b/web/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
similarity index 83%
rename from web/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
rename to web/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
index c23986ae2..46b803ec6 100644
--- a/web/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
+++ b/web/core/modules/node/tests/src/Functional/MultiStepNodeFormBasicOptionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -22,19 +22,19 @@ class MultiStepNodeFormBasicOptionsTest extends NodeTestBase {
   /**
    * Tests changing the default values of basic options to ensure they persist.
    */
-  function testMultiStepNodeFormBasicOptions() {
+  public function testMultiStepNodeFormBasicOptions() {
     // Prepare a user to create the node.
-    $web_user = $this->drupalCreateUser(array('administer nodes', 'create page content'));
+    $web_user = $this->drupalCreateUser(['administer nodes', 'create page content']);
     $this->drupalLogin($web_user);
 
     // Create an unlimited cardinality field.
     $this->fieldName = Unicode::strtolower($this->randomMachineName());
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => 'text',
       'cardinality' => -1,
-    ))->save();
+    ])->save();
 
     // Attach an instance of the field to the page content type.
     FieldConfig::create([
@@ -44,17 +44,17 @@ class MultiStepNodeFormBasicOptionsTest extends NodeTestBase {
       'label' => $this->randomMachineName() . '_label',
     ])->save();
     entity_get_form_display('node', 'page', 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'text_textfield',
-      ))
+      ])
       ->save();
 
-    $edit = array(
+    $edit = [
       'title[0][value]' => 'a',
       'promote[value]' => FALSE,
       'sticky[value]' => 1,
       "{$this->fieldName}[0][value]" => $this->randomString(32),
-    );
+    ];
     $this->drupalPostForm('node/add/page', $edit, t('Add another item'));
     $this->assertNoFieldChecked('edit-promote-value', 'Promote stayed unchecked');
     $this->assertFieldChecked('edit-sticky-value', 'Sticky stayed checked');
diff --git a/web/core/modules/node/src/Tests/NodeAccessFieldTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
similarity index 84%
rename from web/core/modules/node/src/Tests/NodeAccessFieldTest.php
rename to web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
index dcfa43d9b..082f288c6 100644
--- a/web/core/modules/node/src/Tests/NodeAccessFieldTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -17,7 +17,7 @@ class NodeAccessFieldTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_access_test', 'field_ui');
+  public static $modules = ['node_access_test', 'field_ui'];
 
   /**
    * A user with permission to bypass access content.
@@ -46,16 +46,16 @@ class NodeAccessFieldTest extends NodeTestBase {
     node_access_rebuild();
 
     // Create some users.
-    $this->adminUser = $this->drupalCreateUser(array('access content', 'bypass node access'));
-    $this->contentAdminUser = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields'));
+    $this->adminUser = $this->drupalCreateUser(['access content', 'bypass node access']);
+    $this->contentAdminUser = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields']);
 
     // Add a custom field to the page content type.
     $this->fieldName = Unicode::strtolower($this->randomMachineName() . '_field_name');
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => 'text'
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
@@ -72,11 +72,11 @@ class NodeAccessFieldTest extends NodeTestBase {
   /**
    * Tests administering fields when node access is restricted.
    */
-  function testNodeAccessAdministerField() {
+  public function testNodeAccessAdministerField() {
     // Create a page node.
-    $fieldData = array();
+    $fieldData = [];
     $value = $fieldData[0]['value'] = $this->randomMachineName();
-    $node = $this->drupalCreateNode(array($this->fieldName => $fieldData));
+    $node = $this->drupalCreateNode([$this->fieldName => $fieldData]);
 
     // Log in as the administrator and confirm that the field value is present.
     $this->drupalLogin($this->adminUser);
@@ -89,7 +89,7 @@ class NodeAccessFieldTest extends NodeTestBase {
     $this->assertText('Access denied', 'Access is denied for the content admin.');
 
     // Modify the field default as the content admin.
-    $edit = array();
+    $edit = [];
     $default = 'Sometimes words have two meanings';
     $edit["default_value_input[{$this->fieldName}][0][value]"] = $default;
     $this->drupalPostForm(
diff --git a/web/core/modules/node/src/Tests/NodeAccessGrantsCacheContextTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
similarity index 89%
rename from web/core/modules/node/src/Tests/NodeAccessGrantsCacheContextTest.php
rename to web/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
index 593210864..fa2116ab8 100644
--- a/web/core/modules/node/src/Tests/NodeAccessGrantsCacheContextTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessGrantsCacheContextTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests the node access grants cache context service.
@@ -15,7 +15,7 @@ class NodeAccessGrantsCacheContextTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_access_test');
+  public static $modules = ['node_access_test'];
 
   /**
    * User with permission to view content.
@@ -43,9 +43,9 @@ class NodeAccessGrantsCacheContextTest extends NodeTestBase {
 
     // Create user with simple node access permission. The 'node test view'
     // permission is implemented and granted by the node_access_test module.
-    $this->accessUser = $this->drupalCreateUser(array('access content overview', 'access content', 'node test view'));
-    $this->noAccessUser = $this->drupalCreateUser(array('access content overview', 'access content'));
-    $this->noAccessUser2 = $this->drupalCreateUser(array('access content overview', 'access content'));
+    $this->accessUser = $this->drupalCreateUser(['access content overview', 'access content', 'node test view']);
+    $this->noAccessUser = $this->drupalCreateUser(['access content overview', 'access content']);
+    $this->noAccessUser2 = $this->drupalCreateUser(['access content overview', 'access content']);
 
     $this->userMapping = [
       1 => $this->rootUser,
@@ -84,14 +84,14 @@ class NodeAccessGrantsCacheContextTest extends NodeTestBase {
 
     // Grant view to all nodes (because nid = 0) for users in the
     // 'node_access_all' realm.
-    $record = array(
+    $record = [
       'nid' => 0,
       'gid' => 0,
       'realm' => 'node_access_all',
       'grant_view' => 1,
       'grant_update' => 0,
       'grant_delete' => 0,
-    );
+    ];
     db_insert('node_access')->fields($record)->execute();
 
     // Put user accessUser (uid 0) in the realm.
diff --git a/web/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareCombinationTest.php
similarity index 88%
rename from web/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
rename to web/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareCombinationTest.php
index 1ee5bc27a..e388afcbc 100644
--- a/web/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareCombinationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\field\Entity\FieldConfig;
@@ -22,14 +22,14 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'node_access_test_language', 'node_access_test');
+  public static $modules = ['language', 'node_access_test_language', 'node_access_test'];
 
   /**
    * A set of nodes to use in testing.
    *
    * @var \Drupal\node\NodeInterface[]
    */
-  protected $nodes = array();
+  protected $nodes = [];
 
   /**
    * A normal authenticated user.
@@ -52,24 +52,24 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
 
     // Create the 'private' field, which allows the node to be marked as private
     // (restricted access) in a given translation.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_private',
       'entity_type' => 'node',
       'type' => 'boolean',
       'cardinality' => 1,
-    ));
+    ]);
     $field_storage->save();
 
     FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'page',
-      'widget' => array(
+      'widget' => [
         'type' => 'options_buttons',
-      ),
-      'settings' => array(
+      ],
+      'settings' => [
         'on_label' => 'Private',
         'off_label' => 'Not private',
-      ),
+      ],
     ])->save();
 
     // After enabling a node access module, the access table has to be rebuild.
@@ -80,7 +80,7 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
     ConfigurableLanguage::createFromLangcode('ca')->save();
 
     // Create a normal authenticated user.
-    $this->webUser = $this->drupalCreateUser(array('access content'));
+    $this->webUser = $this->drupalCreateUser(['access content']);
 
     // Load the user 1 user for later use as an admin user with permission to
     // see everything.
@@ -101,101 +101,101 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
     // 4. One public with only the Catalan translation private.
     // 5. One public with both the Hungarian and Catalan translations private.
     // 6. One private with both the Hungarian and Catalan translations private.
-    $this->nodes['public_both_public'] = $node = $this->drupalCreateNode(array(
-      'body' => array(array()),
+    $this->nodes['public_both_public'] = $node = $this->drupalCreateNode([
+      'body' => [[]],
       'langcode' => 'hu',
-      'field_private' => array(array('value' => 0)),
+      'field_private' => [['value' => 0]],
       'private' => FALSE,
-    ));
+    ]);
     $translation = $node->addTranslation('ca');
     $translation->title->value = $this->randomString();
     $translation->field_private->value = 0;
     $node->save();
 
-    $this->nodes['private_both_public'] = $node = $this->drupalCreateNode(array(
-      'body' => array(array()),
+    $this->nodes['private_both_public'] = $node = $this->drupalCreateNode([
+      'body' => [[]],
       'langcode' => 'hu',
-      'field_private' => array(array('value' => 0)),
+      'field_private' => [['value' => 0]],
       'private' => TRUE,
-    ));
+    ]);
     $translation = $node->addTranslation('ca');
     $translation->title->value = $this->randomString();
     $translation->field_private->value = 0;
     $node->save();
 
-    $this->nodes['public_hu_private'] = $node = $this->drupalCreateNode(array(
-      'body' => array(array()),
+    $this->nodes['public_hu_private'] = $node = $this->drupalCreateNode([
+      'body' => [[]],
       'langcode' => 'hu',
-      'field_private' => array(array('value' => 1)),
+      'field_private' => [['value' => 1]],
       'private' => FALSE,
-    ));
+    ]);
     $translation = $node->addTranslation('ca');
     $translation->title->value = $this->randomString();
     $translation->field_private->value = 0;
     $node->save();
 
-    $this->nodes['public_ca_private'] = $node = $this->drupalCreateNode(array(
-      'body' => array(array()),
+    $this->nodes['public_ca_private'] = $node = $this->drupalCreateNode([
+      'body' => [[]],
       'langcode' => 'hu',
-      'field_private' => array(array('value' => 0)),
+      'field_private' => [['value' => 0]],
       'private' => FALSE,
-    ));
+    ]);
     $translation = $node->addTranslation('ca');
     $translation->title->value = $this->randomString();
     $translation->field_private->value = 1;
     $node->save();
 
-    $this->nodes['public_both_private'] = $node = $this->drupalCreateNode(array(
-      'body' => array(array()),
+    $this->nodes['public_both_private'] = $node = $this->drupalCreateNode([
+      'body' => [[]],
       'langcode' => 'hu',
-      'field_private' => array(array('value' => 1)),
+      'field_private' => [['value' => 1]],
       'private' => FALSE,
-    ));
+    ]);
     $translation = $node->addTranslation('ca');
     $translation->title->value = $this->randomString();
     $translation->field_private->value = 1;
     $node->save();
 
-    $this->nodes['private_both_private'] = $node = $this->drupalCreateNode(array(
-      'body' => array(array()),
+    $this->nodes['private_both_private'] = $node = $this->drupalCreateNode([
+      'body' => [[]],
       'langcode' => 'hu',
-      'field_private' => array(array('value' => 1)),
+      'field_private' => [['value' => 1]],
       'private' => TRUE,
-    ));
+    ]);
     $translation = $node->addTranslation('ca');
     $translation->title->value = $this->randomString();
     $translation->field_private->value = 1;
     $node->save();
 
-    $this->nodes['public_no_language_private'] = $this->drupalCreateNode(array(
-      'field_private' => array(array('value' => 1)),
+    $this->nodes['public_no_language_private'] = $this->drupalCreateNode([
+      'field_private' => [['value' => 1]],
       'private' => FALSE,
         'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $this->nodes['public_no_language_public'] = $this->drupalCreateNode(array(
-      'field_private' => array(array('value' => 0)),
+    ]);
+    $this->nodes['public_no_language_public'] = $this->drupalCreateNode([
+      'field_private' => [['value' => 0]],
       'private' => FALSE,
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $this->nodes['private_no_language_private'] = $this->drupalCreateNode(array(
-      'field_private' => array(array('value' => 1)),
+    ]);
+    $this->nodes['private_no_language_private'] = $this->drupalCreateNode([
+      'field_private' => [['value' => 1]],
       'private' => TRUE,
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $this->nodes['private_no_language_public'] = $this->drupalCreateNode(array(
-      'field_private' => array(array('value' => 1)),
+    ]);
+    $this->nodes['private_no_language_public'] = $this->drupalCreateNode([
+      'field_private' => [['value' => 1]],
       'private' => TRUE,
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
   }
 
   /**
    * Tests node access and node access queries with multiple node languages.
    */
-  function testNodeAccessLanguageAwareCombination() {
+  public function testNodeAccessLanguageAwareCombination() {
 
-    $expected_node_access = array('view' => TRUE, 'update' => FALSE, 'delete' => FALSE);
-    $expected_node_access_no_access = array('view' => FALSE, 'update' => FALSE, 'delete' => FALSE);
+    $expected_node_access = ['view' => TRUE, 'update' => FALSE, 'delete' => FALSE];
+    $expected_node_access_no_access = ['view' => FALSE, 'update' => FALSE, 'delete' => FALSE];
 
     // When the node and both translations are public, access should always be
     // granted.
@@ -254,7 +254,7 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
 
     // Query with no language specified. The fallback (hu or und) will be used.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->webUser)
       ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -269,7 +269,7 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
 
     // Query with Hungarian (hu) specified.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->webUser)
       ->addMetaData('langcode', 'hu')
       ->addTag('node_access');
@@ -283,7 +283,7 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
 
     // Query with Catalan (ca) specified.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->webUser)
       ->addMetaData('langcode', 'ca')
       ->addTag('node_access');
@@ -297,7 +297,7 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
 
     // Query with German (de) specified.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->webUser)
       ->addMetaData('langcode', 'de')
       ->addTag('node_access');
@@ -309,7 +309,7 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
     // Query the nodes table as admin user (full access) with the node access
     // tag and no specific langcode.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->adminUser)
       ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -320,7 +320,7 @@ class NodeAccessLanguageAwareCombinationTest extends NodeTestBase {
     // Query the nodes table as admin user (full access) with the node access
     // tag and langcode de.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->adminUser)
       ->addMetaData('langcode', 'de')
       ->addTag('node_access');
diff --git a/web/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareTest.php
similarity index 88%
rename from web/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
rename to web/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareTest.php
index 0609b7ba9..48f9dfac3 100644
--- a/web/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessLanguageAwareTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\field\Entity\FieldConfig;
@@ -21,14 +21,14 @@ class NodeAccessLanguageAwareTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'node_access_test_language');
+  public static $modules = ['language', 'node_access_test_language'];
 
   /**
    * A set of nodes to use in testing.
    *
    * @var \Drupal\node\NodeInterface[]
    */
-  protected $nodes = array();
+  protected $nodes = [];
 
   /**
    * A user with permission to bypass access content.
@@ -49,31 +49,31 @@ class NodeAccessLanguageAwareTest extends NodeTestBase {
 
     // Create the 'private' field, which allows the node to be marked as private
     // (restricted access) in a given translation.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_private',
       'entity_type' => 'node',
       'type' => 'boolean',
       'cardinality' => 1,
-    ));
+    ]);
     $field_storage->save();
 
     FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'page',
-      'widget' => array(
+      'widget' => [
         'type' => 'options_buttons',
-      ),
-      'settings' => array(
+      ],
+      'settings' => [
         'on_label' => 'Private',
         'off_label' => 'Not private',
-      ),
+      ],
     ])->save();
 
     // After enabling a node access module, the access table has to be rebuild.
     node_access_rebuild();
 
     // Create a normal authenticated user.
-    $this->webUser = $this->drupalCreateUser(array('access content'));
+    $this->webUser = $this->drupalCreateUser(['access content']);
 
     // Load the user 1 user for later use as an admin user with permission to
     // see everything.
@@ -95,63 +95,63 @@ class NodeAccessLanguageAwareTest extends NodeTestBase {
     // 2. Two nodes with no language specified.
     //   - One public.
     //   - One private.
-    $this->nodes['both_public'] = $node = $this->drupalCreateNode(array(
-      'body' => array(array()),
+    $this->nodes['both_public'] = $node = $this->drupalCreateNode([
+      'body' => [[]],
       'langcode' => 'hu',
-      'field_private' => array(array('value' => 0)),
-    ));
+      'field_private' => [['value' => 0]],
+    ]);
     $translation = $node->addTranslation('ca');
     $translation->title->value = $this->randomString();
     $translation->field_private->value = 0;
     $node->save();
 
-    $this->nodes['ca_private'] = $node = $this->drupalCreateNode(array(
-      'body' => array(array()),
+    $this->nodes['ca_private'] = $node = $this->drupalCreateNode([
+      'body' => [[]],
       'langcode' => 'hu',
-      'field_private' => array(array('value' => 0)),
-    ));
+      'field_private' => [['value' => 0]],
+    ]);
     $translation = $node->addTranslation('ca');
     $translation->title->value = $this->randomString();
     $translation->field_private->value = 1;
     $node->save();
 
-    $this->nodes['hu_private'] = $node = $this->drupalCreateNode(array(
-      'body' => array(array()),
+    $this->nodes['hu_private'] = $node = $this->drupalCreateNode([
+      'body' => [[]],
       'langcode' => 'hu',
-      'field_private' => array(array('value' => 1)),
-    ));
+      'field_private' => [['value' => 1]],
+    ]);
     $translation = $node->addTranslation('ca');
     $translation->title->value = $this->randomString();
     $translation->field_private->value = 0;
     $node->save();
 
-    $this->nodes['both_private'] = $node = $this->drupalCreateNode(array(
-      'body' => array(array()),
+    $this->nodes['both_private'] = $node = $this->drupalCreateNode([
+      'body' => [[]],
       'langcode' => 'hu',
-      'field_private' => array(array('value' => 1)),
-    ));
+      'field_private' => [['value' => 1]],
+    ]);
     $translation = $node->addTranslation('ca');
     $translation->title->value = $this->randomString();
     $translation->field_private->value = 1;
     $node->save();
 
-    $this->nodes['no_language_public'] = $this->drupalCreateNode(array(
-      'field_private' => array(array('value' => 0)),
+    $this->nodes['no_language_public'] = $this->drupalCreateNode([
+      'field_private' => [['value' => 0]],
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $this->nodes['no_language_private'] = $this->drupalCreateNode(array(
-      'field_private' => array(array('value' => 1)),
+    ]);
+    $this->nodes['no_language_private'] = $this->drupalCreateNode([
+      'field_private' => [['value' => 1]],
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
   }
 
   /**
    * Tests node access and node access queries with multiple node languages.
    */
-  function testNodeAccessLanguageAware() {
+  public function testNodeAccessLanguageAware() {
     // The node_access_test_language module only grants view access.
-    $expected_node_access = array('view' => TRUE, 'update' => FALSE, 'delete' => FALSE);
-    $expected_node_access_no_access = array('view' => FALSE, 'update' => FALSE, 'delete' => FALSE);
+    $expected_node_access = ['view' => TRUE, 'update' => FALSE, 'delete' => FALSE];
+    $expected_node_access_no_access = ['view' => FALSE, 'update' => FALSE, 'delete' => FALSE];
 
     // When both Hungarian and Catalan are marked as public, access to the
     // Hungarian translation should be granted with the default entity object or
@@ -195,7 +195,7 @@ class NodeAccessLanguageAwareTest extends NodeTestBase {
 
     // Query with no language specified. The fallback (hu) will be used.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->webUser)
       ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -211,7 +211,7 @@ class NodeAccessLanguageAwareTest extends NodeTestBase {
 
     // Query with Hungarian (hu) specified.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->webUser)
       ->addMetaData('langcode', 'hu')
       ->addTag('node_access');
@@ -225,7 +225,7 @@ class NodeAccessLanguageAwareTest extends NodeTestBase {
 
     // Query with Catalan (ca) specified.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->webUser)
       ->addMetaData('langcode', 'ca')
       ->addTag('node_access');
@@ -239,7 +239,7 @@ class NodeAccessLanguageAwareTest extends NodeTestBase {
 
     // Query with German (de) specified.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->webUser)
       ->addMetaData('langcode', 'de')
       ->addTag('node_access');
@@ -251,7 +251,7 @@ class NodeAccessLanguageAwareTest extends NodeTestBase {
     // Query the nodes table as admin user (full access) with the node access
     // tag and no specific langcode.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->adminUser)
       ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -262,7 +262,7 @@ class NodeAccessLanguageAwareTest extends NodeTestBase {
     // Query the nodes table as admin user (full access) with the node access
     // tag and langcode de.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $this->adminUser)
       ->addMetaData('langcode', 'de')
       ->addTag('node_access');
diff --git a/web/core/modules/node/src/Tests/NodeAccessLanguageTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessLanguageTest.php
similarity index 84%
rename from web/core/modules/node/src/Tests/NodeAccessLanguageTest.php
rename to web/core/modules/node/tests/src/Functional/NodeAccessLanguageTest.php
index e0393a0a1..1af5660fe 100644
--- a/web/core/modules/node/src/Tests/NodeAccessLanguageTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -20,7 +20,7 @@ class NodeAccessLanguageTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'node_access_test');
+  public static $modules = ['language', 'node_access_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -42,15 +42,15 @@ class NodeAccessLanguageTest extends NodeTestBase {
   /**
    * Tests node access with multiple node languages and no private nodes.
    */
-  function testNodeAccess() {
-    $web_user = $this->drupalCreateUser(array('access content'));
+  public function testNodeAccess() {
+    $web_user = $this->drupalCreateUser(['access content']);
 
-    $expected_node_access = array('view' => TRUE, 'update' => FALSE, 'delete' => FALSE);
-    $expected_node_access_no_access = array('view' => FALSE, 'update' => FALSE, 'delete' => FALSE);
+    $expected_node_access = ['view' => TRUE, 'update' => FALSE, 'delete' => FALSE];
+    $expected_node_access_no_access = ['view' => FALSE, 'update' => FALSE, 'delete' => FALSE];
 
     // Creating a public node with langcode Hungarian, will be saved as the
     // fallback in node access table.
-    $node_public_hu = $this->drupalCreateNode(array('body' => array(array()), 'langcode' => 'hu', 'private' => FALSE));
+    $node_public_hu = $this->drupalCreateNode(['body' => [[]], 'langcode' => 'hu', 'private' => FALSE]);
     $this->assertTrue($node_public_hu->language()->getId() == 'hu', 'Node created as Hungarian.');
 
     // Tests the default access is provided for the public Hungarian node.
@@ -61,10 +61,10 @@ class NodeAccessLanguageTest extends NodeTestBase {
 
     // Creating a public node with no special langcode, like when no language
     // module enabled.
-    $node_public_no_language = $this->drupalCreateNode(array(
+    $node_public_no_language = $this->drupalCreateNode([
       'private' => FALSE,
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
     $this->assertTrue($node_public_no_language->language()->getId() == LanguageInterface::LANGCODE_NOT_SPECIFIED, 'Node created with not specified language.');
 
     // Tests that access is granted if requested with no language.
@@ -73,7 +73,7 @@ class NodeAccessLanguageTest extends NodeTestBase {
     // Reset the node access cache and turn on our test node access code.
     \Drupal::entityManager()->getAccessControlHandler('node')->resetCache();
     \Drupal::state()->set('node_access_test_secret_catalan', 1);
-    $node_public_ca = $this->drupalCreateNode(array('body' => array(array()), 'langcode' => 'ca', 'private' => FALSE));
+    $node_public_ca = $this->drupalCreateNode(['body' => [[]], 'langcode' => 'ca', 'private' => FALSE]);
     $this->assertTrue($node_public_ca->language()->getId() == 'ca', 'Node created as Catalan.');
 
     // Tests that access is granted if requested with no language.
@@ -112,14 +112,14 @@ class NodeAccessLanguageTest extends NodeTestBase {
   /**
    * Tests node access with multiple node languages and private nodes.
    */
-  function testNodeAccessPrivate() {
-    $web_user = $this->drupalCreateUser(array('access content'));
-    $expected_node_access = array('view' => TRUE, 'update' => FALSE, 'delete' => FALSE);
-    $expected_node_access_no_access = array('view' => FALSE, 'update' => FALSE, 'delete' => FALSE);
+  public function testNodeAccessPrivate() {
+    $web_user = $this->drupalCreateUser(['access content']);
+    $expected_node_access = ['view' => TRUE, 'update' => FALSE, 'delete' => FALSE];
+    $expected_node_access_no_access = ['view' => FALSE, 'update' => FALSE, 'delete' => FALSE];
 
     // Creating a private node with langcode Hungarian, will be saved as the
     // fallback in node access table.
-    $node_private_hu = $this->drupalCreateNode(array('body' => array(array()), 'langcode' => 'hu', 'private' => TRUE));
+    $node_private_hu = $this->drupalCreateNode(['body' => [[]], 'langcode' => 'hu', 'private' => TRUE]);
     $this->assertTrue($node_private_hu->language()->getId() == 'hu', 'Node created as Hungarian.');
 
     // Tests the default access is not provided for the private Hungarian node.
@@ -130,10 +130,10 @@ class NodeAccessLanguageTest extends NodeTestBase {
 
     // Creating a private node with no special langcode, like when no language
     // module enabled.
-    $node_private_no_language = $this->drupalCreateNode(array(
+    $node_private_no_language = $this->drupalCreateNode([
       'private' => TRUE,
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
     $this->assertTrue($node_private_no_language->language()->getId() == LanguageInterface::LANGCODE_NOT_SPECIFIED, 'Node created with not specified language.');
 
     // Tests that access is not granted if requested with no language.
@@ -148,8 +148,8 @@ class NodeAccessLanguageTest extends NodeTestBase {
 
     // Creating a private node with langcode Catalan to test that the
     // node_access_test_secret_catalan flag works.
-    $private_ca_user = $this->drupalCreateUser(array('access content', 'node test view'));
-    $node_private_ca = $this->drupalCreateNode(array('body' => array(array()), 'langcode' => 'ca', 'private' => TRUE));
+    $private_ca_user = $this->drupalCreateUser(['access content', 'node test view']);
+    $node_private_ca = $this->drupalCreateNode(['body' => [[]], 'langcode' => 'ca', 'private' => TRUE]);
     $this->assertTrue($node_private_ca->language()->getId() == 'ca', 'Node created as Catalan.');
 
     // Tests that Catalan is still not accessible to either user.
@@ -175,9 +175,9 @@ class NodeAccessLanguageTest extends NodeTestBase {
   /**
    * Tests db_select() with a 'node_access' tag and langcode metadata.
    */
-  function testNodeAccessQueryTag() {
+  public function testNodeAccessQueryTag() {
     // Create a normal authenticated user.
-    $web_user = $this->drupalCreateUser(array('access content'));
+    $web_user = $this->drupalCreateUser(['access content']);
 
     // Load the user 1 user for later use as an admin user with permission to
     // see everything.
@@ -185,26 +185,26 @@ class NodeAccessLanguageTest extends NodeTestBase {
 
     // Creating a private node with langcode Hungarian, will be saved as
     // the fallback in node access table.
-    $node_private = $this->drupalCreateNode(array('body' => array(array()), 'langcode' => 'hu', 'private' => TRUE));
+    $node_private = $this->drupalCreateNode(['body' => [[]], 'langcode' => 'hu', 'private' => TRUE]);
     $this->assertTrue($node_private->language()->getId() == 'hu', 'Node created as Hungarian.');
 
     // Creating a public node with langcode Hungarian, will be saved as
     // the fallback in node access table.
-    $node_public = $this->drupalCreateNode(array('body' => array(array()), 'langcode' => 'hu', 'private' => FALSE));
+    $node_public = $this->drupalCreateNode(['body' => [[]], 'langcode' => 'hu', 'private' => FALSE]);
     $this->assertTrue($node_public->language()->getId() == 'hu', 'Node created as Hungarian.');
 
     // Creating a public node with no special langcode, like when no language
     // module enabled.
-    $node_no_language = $this->drupalCreateNode(array(
+    $node_no_language = $this->drupalCreateNode([
       'private' => FALSE,
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
     $this->assertTrue($node_no_language->language()->getId() == LanguageInterface::LANGCODE_NOT_SPECIFIED, 'Node created with not specified language.');
 
     // Query the nodes table as the web user with the node access tag and no
     // specific langcode.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $web_user)
       ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -218,7 +218,7 @@ class NodeAccessLanguageTest extends NodeTestBase {
     // Query the nodes table as the web user with the node access tag and
     // langcode de.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $web_user)
       ->addMetaData('langcode', 'de')
       ->addTag('node_access');
@@ -230,7 +230,7 @@ class NodeAccessLanguageTest extends NodeTestBase {
     // Query the nodes table as admin user (full access) with the node access
     // tag and no specific langcode.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $admin_user)
       ->addTag('node_access');
     $nids = $select->execute()->fetchAllAssoc('nid');
@@ -241,7 +241,7 @@ class NodeAccessLanguageTest extends NodeTestBase {
     // Query the nodes table as admin user (full access) with the node access
     // tag and langcode de.
     $select = db_select('node', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->addMetaData('account', $admin_user)
       ->addMetaData('langcode', 'de')
       ->addTag('node_access');
diff --git a/web/core/modules/node/src/Tests/NodeAccessMenuLinkTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
similarity index 84%
rename from web/core/modules/node/src/Tests/NodeAccessMenuLinkTest.php
rename to web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
index c1bc0eb43..6c5bcd4ed 100644
--- a/web/core/modules/node/src/Tests/NodeAccessMenuLinkTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\user\RoleInterface;
 
@@ -16,7 +16,7 @@ class NodeAccessMenuLinkTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('menu_ui', 'block');
+  public static $modules = ['menu_ui', 'block'];
 
   /**
    * A user with permission to manage menu links and create nodes.
@@ -30,19 +30,19 @@ class NodeAccessMenuLinkTest extends NodeTestBase {
 
     $this->drupalPlaceBlock('system_menu_block:main');
 
-    $this->contentAdminUser = $this->drupalCreateUser(array(
+    $this->contentAdminUser = $this->drupalCreateUser([
       'access content',
       'administer content types',
       'administer menu'
-    ));
+    ]);
 
-    $this->config('user.role.' . RoleInterface::ANONYMOUS_ID)->set('permissions', array())->save();
+    $this->config('user.role.' . RoleInterface::ANONYMOUS_ID)->set('permissions', [])->save();
   }
 
   /**
    * SA-CORE-2015-003: Tests menu links to nodes when node access is restricted.
    */
-  function testNodeAccessMenuLink() {
+  public function testNodeAccessMenuLink() {
 
     $menu_link_title = $this->randomString();
 
@@ -64,7 +64,7 @@ class NodeAccessMenuLinkTest extends NodeTestBase {
 
     // Ensure anonymous users with "access content" permission see this menu
     // link.
-    $this->config('user.role.' . RoleInterface::ANONYMOUS_ID)->set('permissions', array('access content'))->save();
+    $this->config('user.role.' . RoleInterface::ANONYMOUS_ID)->set('permissions', ['access content'])->save();
     $this->drupalGet('');
     $this->assertLink($menu_link_title);
   }
diff --git a/web/core/modules/node/src/Tests/NodeAccessRecordsTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessRecordsTest.php
similarity index 77%
rename from web/core/modules/node/src/Tests/NodeAccessRecordsTest.php
rename to web/core/modules/node/tests/src/Functional/NodeAccessRecordsTest.php
index 412653905..259ed83ef 100644
--- a/web/core/modules/node/src/Tests/NodeAccessRecordsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessRecordsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\Node;
 
@@ -16,68 +16,68 @@ class NodeAccessRecordsTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_test');
+  public static $modules = ['node_test'];
 
   /**
    * Creates a node and tests the creation of node access rules.
    */
-  function testNodeAccessRecords() {
+  public function testNodeAccessRecords() {
     // Create an article node.
-    $node1 = $this->drupalCreateNode(array('type' => 'article'));
+    $node1 = $this->drupalCreateNode(['type' => 'article']);
     $this->assertTrue(Node::load($node1->id()), 'Article node created.');
 
     // Check to see if grants added by node_test_node_access_records made it in.
-    $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node1->id()))->fetchAll();
+    $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', [':nid' => $node1->id()])->fetchAll();
     $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
     $this->assertEqual($records[0]->realm, 'test_article_realm', 'Grant with article_realm acquired for node without alteration.');
     $this->assertEqual($records[0]->gid, 1, 'Grant with gid = 1 acquired for node without alteration.');
 
     // Create an unpromoted "Basic page" node.
-    $node2 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 0));
+    $node2 = $this->drupalCreateNode(['type' => 'page', 'promote' => 0]);
     $this->assertTrue(Node::load($node2->id()), 'Unpromoted basic page node created.');
 
     // Check to see if grants added by node_test_node_access_records made it in.
-    $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node2->id()))->fetchAll();
+    $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', [':nid' => $node2->id()])->fetchAll();
     $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
     $this->assertEqual($records[0]->realm, 'test_page_realm', 'Grant with page_realm acquired for node without alteration.');
     $this->assertEqual($records[0]->gid, 1, 'Grant with gid = 1 acquired for node without alteration.');
 
     // Create an unpromoted, unpublished "Basic page" node.
-    $node3 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 0, 'status' => 0));
+    $node3 = $this->drupalCreateNode(['type' => 'page', 'promote' => 0, 'status' => 0]);
     $this->assertTrue(Node::load($node3->id()), 'Unpromoted, unpublished basic page node created.');
 
     // Check to see if grants added by node_test_node_access_records made it in.
-    $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node3->id()))->fetchAll();
+    $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', [':nid' => $node3->id()])->fetchAll();
     $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
     $this->assertEqual($records[0]->realm, 'test_page_realm', 'Grant with page_realm acquired for node without alteration.');
     $this->assertEqual($records[0]->gid, 1, 'Grant with gid = 1 acquired for node without alteration.');
 
     // Create a promoted "Basic page" node.
-    $node4 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1));
+    $node4 = $this->drupalCreateNode(['type' => 'page', 'promote' => 1]);
     $this->assertTrue(Node::load($node4->id()), 'Promoted basic page node created.');
 
     // Check to see if grant added by node_test_node_access_records was altered
     // by node_test_node_access_records_alter.
-    $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node4->id()))->fetchAll();
+    $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', [':nid' => $node4->id()])->fetchAll();
     $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
     $this->assertEqual($records[0]->realm, 'test_alter_realm', 'Altered grant with alter_realm acquired for node.');
     $this->assertEqual($records[0]->gid, 2, 'Altered grant with gid = 2 acquired for node.');
 
     // Check to see if we can alter grants with hook_node_grants_alter().
-    $operations = array('view', 'update', 'delete');
+    $operations = ['view', 'update', 'delete'];
     // Create a user that is allowed to access content.
-    $web_user = $this->drupalCreateUser(array('access content'));
+    $web_user = $this->drupalCreateUser(['access content']);
     foreach ($operations as $op) {
       $grants = node_test_node_grants($web_user, $op);
       $altered_grants = $grants;
       \Drupal::moduleHandler()->alter('node_grants', $altered_grants, $web_user, $op);
-      $this->assertNotEqual($grants, $altered_grants, format_string('Altered the %op grant for a user.', array('%op' => $op)));
+      $this->assertNotEqual($grants, $altered_grants, format_string('Altered the %op grant for a user.', ['%op' => $op]));
     }
 
     // Check that core does not grant access to an unpublished node when an
     // empty $grants array is returned.
-    $node6 = $this->drupalCreateNode(array('status' => 0, 'disable_node_access' => TRUE));
-    $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node6->id()))->fetchAll();
+    $node6 = $this->drupalCreateNode(['status' => 0, 'disable_node_access' => TRUE]);
+    $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', [':nid' => $node6->id()])->fetchAll();
     $this->assertEqual(count($records), 0, 'Returned no records for unpublished node.');
   }
 
diff --git a/web/core/modules/node/src/Tests/NodeActionsConfigurationTest.php b/web/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
similarity index 96%
rename from web/core/modules/node/src/Tests/NodeActionsConfigurationTest.php
rename to web/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
index 7a732c6c5..fbfda8f16 100644
--- a/web/core/modules/node/src/Tests/NodeActionsConfigurationTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Component\Utility\Crypt;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Entity\Action;
 
 /**
@@ -11,7 +11,7 @@ use Drupal\system\Entity\Action;
  *
  * @group node
  */
-class NodeActionsConfigurationTest extends WebTestBase {
+class NodeActionsConfigurationTest extends BrowserTestBase {
 
   /**
    * Modules to install.
diff --git a/web/core/modules/node/src/Tests/NodeCacheTagsTest.php b/web/core/modules/node/tests/src/Functional/NodeCacheTagsTest.php
similarity index 91%
rename from web/core/modules/node/src/Tests/NodeCacheTagsTest.php
rename to web/core/modules/node/tests/src/Functional/NodeCacheTagsTest.php
index 66932cce0..ca5a0a991 100644
--- a/web/core/modules/node/src/Tests/NodeCacheTagsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\node\Entity\Node;
@@ -17,7 +17,7 @@ class NodeCacheTagsTest extends EntityWithUriCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * {@inheritdoc}
@@ -61,7 +61,7 @@ class NodeCacheTagsTest extends EntityWithUriCacheTagsTestBase {
    * Each node must have an author.
    */
   protected function getAdditionalCacheTagsForEntity(EntityInterface $node) {
-    return array('user:' . $node->getOwnerId(), 'user_view');
+    return ['user:' . $node->getOwnerId(), 'user_view'];
   }
 
   /**
diff --git a/web/core/modules/node/src/Tests/NodeCreationTest.php b/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
similarity index 83%
rename from web/core/modules/node/src/Tests/NodeCreationTest.php
rename to web/core/modules/node/tests/src/Functional/NodeCreationTest.php
index bf3ce864c..4d24901e5 100644
--- a/web/core/modules/node/src/Tests/NodeCreationTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Database\Database;
 use Drupal\Core\Language\LanguageInterface;
@@ -21,19 +21,19 @@ class NodeCreationTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_test_exception', 'dblog', 'test_page_test');
+  public static $modules = ['node_test_exception', 'dblog', 'test_page_test'];
 
   protected function setUp() {
     parent::setUp();
 
-    $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content'));
+    $web_user = $this->drupalCreateUser(['create page content', 'edit own page content']);
     $this->drupalLogin($web_user);
   }
 
   /**
    * Creates a "Basic page" node and verifies its consistency in the database.
    */
-  function testNodeCreation() {
+  public function testNodeCreation() {
     $node_type_storage = \Drupal::entityManager()->getStorage('node_type');
 
     // Test /node/add page with only one content type.
@@ -42,16 +42,16 @@ class NodeCreationTest extends NodeTestBase {
     $this->assertResponse(200);
     $this->assertUrl('node/add/page');
     // Create a node.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
 
     // Check that the Basic page has been created.
-    $this->assertText(t('@post @title has been created.', array('@post' => 'Basic page', '@title' => $edit['title[0][value]'])), 'Basic page created.');
+    $this->assertText(t('@post @title has been created.', ['@post' => 'Basic page', '@title' => $edit['title[0][value]']]), 'Basic page created.');
 
     // Verify that the creation message contains a link to a node.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'node/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'node/']);
     $this->assert(isset($view_link), 'The message area contains a link to a node');
 
     // Check that the node exists in the database.
@@ -72,20 +72,26 @@ class NodeCreationTest extends NodeTestBase {
     $this->drupalGet('node/' . $node->id());
     $this->assertText($node->getOwner()->getUsername());
     $this->assertText(format_date($node->getCreatedTime()));
+
+    // Check if the node revision checkbox is not rendered on node creation form.
+    $admin_user = $this->drupalCreateUser(['administer nodes', 'create page content']);
+    $this->drupalLogin($admin_user);
+    $this->drupalGet('node/add/page');
+    $this->assertNoFieldById('edit-revision', NULL, 'The revision checkbox is not present.');
   }
 
   /**
    * Verifies that a transaction rolls back the failed creation.
    */
-  function testFailedPageCreation() {
+  public function testFailedPageCreation() {
     // Create a node.
-    $edit = array(
+    $edit = [
       'uid'      => $this->loggedInUser->id(),
       'name'     => $this->loggedInUser->name,
       'type'     => 'page',
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'title'    => 'testing_transaction_exception',
-    );
+    ];
 
     try {
       // An exception is generated by node_test_exception_node_insert() if the
@@ -120,7 +126,7 @@ class NodeCreationTest extends NodeTestBase {
   /**
    * Creates an unpublished node and confirms correct redirect behavior.
    */
-  function testUnpublishedNodeCreation() {
+  public function testUnpublishedNodeCreation() {
     // Set the front page to the test page.
     $this->config('system.site')->set('page.front', '/test-page')->save();
 
@@ -131,7 +137,7 @@ class NodeCreationTest extends NodeTestBase {
       ->save();
 
     // Create a node.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
@@ -141,10 +147,10 @@ class NodeCreationTest extends NodeTestBase {
     $this->assertText(t('Test page text'));
 
     // Confirm that the node was created.
-    $this->assertText(t('@post @title has been created.', array('@post' => 'Basic page', '@title' => $edit['title[0][value]'])));
+    $this->assertText(t('@post @title has been created.', ['@post' => 'Basic page', '@title' => $edit['title[0][value]']]));
 
     // Verify that the creation message contains a link to a node.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'node/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'node/']);
     $this->assert(isset($view_link), 'The message area contains a link to a node');
   }
 
@@ -152,7 +158,7 @@ class NodeCreationTest extends NodeTestBase {
    * Tests the author autocompletion textfield.
    */
   public function testAuthorAutocomplete() {
-    $admin_user = $this->drupalCreateUser(array('administer nodes', 'create page content'));
+    $admin_user = $this->drupalCreateUser(['administer nodes', 'create page content']);
     $this->drupalLogin($admin_user);
 
     $this->drupalGet('node/add/page');
@@ -160,7 +166,7 @@ class NodeCreationTest extends NodeTestBase {
     $result = $this->xpath('//input[@id="edit-uid-0-value" and contains(@data-autocomplete-path, "user/autocomplete")]');
     $this->assertEqual(count($result), 0, 'No autocompletion without access user profiles.');
 
-    $admin_user = $this->drupalCreateUser(array('administer nodes', 'create page content', 'access user profiles'));
+    $admin_user = $this->drupalCreateUser(['administer nodes', 'create page content', 'access user profiles']);
     $this->drupalLogin($admin_user);
 
     $this->drupalGet('node/add/page');
@@ -172,7 +178,7 @@ class NodeCreationTest extends NodeTestBase {
   /**
    * Check node/add when no node types exist.
    */
-  function testNodeAddWithoutContentTypes() {
+  public function testNodeAddWithoutContentTypes() {
     $this->drupalGet('node/add');
     $this->assertResponse(200);
     $this->assertNoLinkByHref('/admin/structure/types/add');
@@ -185,7 +191,7 @@ class NodeCreationTest extends NodeTestBase {
     $this->drupalGet('node/add');
     $this->assertResponse(403);
 
-    $admin_content_types = $this->drupalCreateUser(array('administer content types'));
+    $admin_content_types = $this->drupalCreateUser(['administer content types']);
     $this->drupalLogin($admin_content_types);
 
     $this->drupalGet('node/add');
@@ -203,7 +209,7 @@ class NodeCreationTest extends NodeTestBase {
   protected static function getWatchdogIdsForTestExceptionRollback() {
     // PostgreSQL doesn't support bytea LIKE queries, so we need to unserialize
     // first to check for the rollback exception message.
-    $matches = array();
+    $matches = [];
     $query = db_query("SELECT wid, variables FROM {watchdog}");
     foreach ($query as $row) {
       $variables = (array) unserialize($row->variables);
diff --git a/web/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php b/web/core/modules/node/tests/src/Functional/NodeFormSaveChangedTimeTest.php
similarity index 83%
rename from web/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php
rename to web/core/modules/node/tests/src/Functional/NodeFormSaveChangedTimeTest.php
index 36c1ccce0..607e68cf0 100644
--- a/web/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeFormSaveChangedTimeTest.php
@@ -1,24 +1,24 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests updating the changed time after API and FORM entity save.
  *
  * @group node
  */
-class NodeFormSaveChangedTimeTest extends WebTestBase {
+class NodeFormSaveChangedTimeTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'node',
-  );
+  ];
 
   /**
    * An user with permissions to create and edit articles.
@@ -34,18 +34,18 @@ class NodeFormSaveChangedTimeTest extends WebTestBase {
     parent::setUp();
 
     // Create a node type.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'article',
       'name' => 'Article',
-    ));
+    ]);
 
     $this->authorUser = $this->drupalCreateUser(['access content', 'create article content', 'edit any article content'], 'author');
     $this->drupalLogin($this->authorUser);
 
     // Create one node of the above node type .
-    $this->drupalCreateNode(array(
+    $this->drupalCreateNode([
       'type' => 'article',
-    ));
+    ]);
   }
 
   /**
@@ -65,7 +65,7 @@ class NodeFormSaveChangedTimeTest extends WebTestBase {
     sleep(1);
 
     // Save the node on the regular node edit form.
-    $this->drupalPostForm('node/1/edit', array(), t('Save'));
+    $this->drupalPostForm('node/1/edit', [], t('Save'));
 
     $storage->resetCache([1]);
     $node = $storage->load(1);
diff --git a/web/core/modules/node/src/Tests/NodeHelpTest.php b/web/core/modules/node/tests/src/Functional/NodeHelpTest.php
similarity index 78%
rename from web/core/modules/node/src/Tests/NodeHelpTest.php
rename to web/core/modules/node/tests/src/Functional/NodeHelpTest.php
index 29460111c..c4b713921 100644
--- a/web/core/modules/node/src/Tests/NodeHelpTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeHelpTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests help functionality for nodes.
  *
  * @group node
  */
-class NodeHelpTest extends WebTestBase {
+class NodeHelpTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array.
    */
-  public static $modules = array('block', 'node', 'help');
+  public static $modules = ['block', 'node', 'help'];
 
   /**
    * The name of the test node type to create.
@@ -39,11 +39,11 @@ class NodeHelpTest extends WebTestBase {
     parent::setUp();
 
     // Create user.
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'administer content types',
       'administer nodes',
       'bypass node access',
-    ));
+    ]);
 
     $this->drupalLogin($admin_user);
     $this->drupalPlaceBlock('help_block');
@@ -52,10 +52,10 @@ class NodeHelpTest extends WebTestBase {
     $this->testText = t('Help text to find on node forms.');
 
     // Create content type.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => $this->testType,
       'help' => $this->testText,
-    ));
+    ]);
   }
 
   /**
@@ -68,7 +68,7 @@ class NodeHelpTest extends WebTestBase {
     $this->assertText($this->testText);
 
     // Create node and check the node edit form.
-    $node = $this->drupalCreateNode(array('type' => $this->testType));
+    $node = $this->drupalCreateNode(['type' => $this->testType]);
     $this->drupalGet('node/' . $node->id() . '/edit');
     $this->assertResponse(200);
     $this->assertText($this->testText);
diff --git a/web/core/modules/node/src/Tests/NodeLinksTest.php b/web/core/modules/node/tests/src/Functional/NodeLinksTest.php
similarity index 78%
rename from web/core/modules/node/src/Tests/NodeLinksTest.php
rename to web/core/modules/node/tests/src/Functional/NodeLinksTest.php
index 72990c0e9..7bd725b46 100644
--- a/web/core/modules/node/src/Tests/NodeLinksTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeLinksTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
+
+use Drupal\node\NodeInterface;
 
 /**
  * Tests the output of node links (read more, add new comment, etc).
@@ -14,16 +16,16 @@ class NodeLinksTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('views');
+  public static $modules = ['views'];
 
   /**
    * Tests that the links can be hidden in the view display settings.
    */
   public function testHideLinks() {
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'type' => 'article',
-      'promote' => NODE_PROMOTED,
-    ));
+      'promote' => NodeInterface::PROMOTED,
+    ]);
 
     // Links are displayed by default.
     $this->drupalGet('node');
diff --git a/web/core/modules/node/src/Tests/NodeLoadMultipleTest.php b/web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
similarity index 72%
rename from web/core/modules/node/src/Tests/NodeLoadMultipleTest.php
rename to web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
index 4add3bd1e..2da5d1bbe 100644
--- a/web/core/modules/node/src/Tests/NodeLoadMultipleTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\Node;
 
@@ -16,22 +16,22 @@ class NodeLoadMultipleTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('views');
+  public static $modules = ['views'];
 
   protected function setUp() {
     parent::setUp();
-    $web_user = $this->drupalCreateUser(array('create article content', 'create page content'));
+    $web_user = $this->drupalCreateUser(['create article content', 'create page content']);
     $this->drupalLogin($web_user);
   }
 
   /**
    * Creates four nodes and ensures that they are loaded correctly.
    */
-  function testNodeMultipleLoad() {
-    $node1 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
-    $node2 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
-    $node3 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 0));
-    $node4 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 0));
+  public function testNodeMultipleLoad() {
+    $node1 = $this->drupalCreateNode(['type' => 'article', 'promote' => 1]);
+    $node2 = $this->drupalCreateNode(['type' => 'article', 'promote' => 1]);
+    $node3 = $this->drupalCreateNode(['type' => 'article', 'promote' => 0]);
+    $node4 = $this->drupalCreateNode(['type' => 'page', 'promote' => 0]);
 
     // Confirm that promoted nodes appear in the default node listing.
     $this->drupalGet('node');
@@ -41,16 +41,16 @@ class NodeLoadMultipleTest extends NodeTestBase {
     $this->assertNoText($node4->label(), 'Node title does not appear in the default listing.');
     // Load nodes with only a condition. Nodes 3 and 4 will be loaded.
     $nodes = $this->container->get('entity_type.manager')->getStorage('node')
-      ->loadByProperties(array('promote' => 0));
+      ->loadByProperties(['promote' => 0]);
     $this->assertEqual($node3->label(), $nodes[$node3->id()]->label(), 'Node was loaded.');
     $this->assertEqual($node4->label(), $nodes[$node4->id()]->label(), 'Node was loaded.');
     $count = count($nodes);
-    $this->assertTrue($count == 2, format_string('@count nodes loaded.', array('@count' => $count)));
+    $this->assertTrue($count == 2, format_string('@count nodes loaded.', ['@count' => $count]));
 
     // Load nodes by nid. Nodes 1, 2 and 4 will be loaded.
-    $nodes = Node::loadMultiple(array(1, 2, 4));
+    $nodes = Node::loadMultiple([1, 2, 4]);
     $count = count($nodes);
-    $this->assertTrue(count($nodes) == 3, format_string('@count nodes loaded', array('@count' => $count)));
+    $this->assertTrue(count($nodes) == 3, format_string('@count nodes loaded', ['@count' => $count]));
     $this->assertTrue(isset($nodes[$node1->id()]), 'Node is correctly keyed in the array');
     $this->assertTrue(isset($nodes[$node2->id()]), 'Node is correctly keyed in the array');
     $this->assertTrue(isset($nodes[$node4->id()]), 'Node is correctly keyed in the array');
diff --git a/web/core/modules/node/src/Tests/NodePostSettingsTest.php b/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
similarity index 82%
rename from web/core/modules/node/src/Tests/NodePostSettingsTest.php
rename to web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
index bc3dd9943..4716b3006 100644
--- a/web/core/modules/node/src/Tests/NodePostSettingsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests that the post information (submitted by Username on date) text displays
@@ -13,45 +13,45 @@ class NodePostSettingsTest extends NodeTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $web_user = $this->drupalCreateUser(array('create page content', 'administer content types', 'access user profiles'));
+    $web_user = $this->drupalCreateUser(['create page content', 'administer content types', 'access user profiles']);
     $this->drupalLogin($web_user);
   }
 
   /**
    * Confirms "Basic page" content type and post information is on a new node.
    */
-  function testPagePostInfo() {
+  public function testPagePostInfo() {
 
     // Set "Basic page" content type to display post information.
-    $edit = array();
+    $edit = [];
     $edit['display_submitted'] = TRUE;
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
 
     // Create a node.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
 
     // Check that the post information is displayed.
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-    $elements = $this->xpath('//div[contains(@class, :class)]', array(':class' => 'node__submitted'));
+    $elements = $this->xpath('//div[contains(@class, :class)]', [':class' => 'node__submitted']);
     $this->assertEqual(count($elements), 1, 'Post information is displayed.');
     $node->delete();
 
     // Set "Basic page" content type to display post information.
-    $edit = array();
+    $edit = [];
     $edit['display_submitted'] = FALSE;
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
 
     // Create a node.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
 
     // Check that the post information is displayed.
-    $elements = $this->xpath('//div[contains(@class, :class)]', array(':class' => 'node__submitted'));
+    $elements = $this->xpath('//div[contains(@class, :class)]', [':class' => 'node__submitted']);
     $this->assertEqual(count($elements), 0, 'Post information is not displayed.');
   }
 
diff --git a/web/core/modules/node/src/Tests/NodeRSSContentTest.php b/web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
similarity index 87%
rename from web/core/modules/node/src/Tests/NodeRSSContentTest.php
rename to web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
index d1ce24067..0efa336ad 100644
--- a/web/core/modules/node/src/Tests/NodeRSSContentTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\filter\Entity\FilterFormat;
 
@@ -20,7 +20,7 @@ class NodeRSSContentTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_test', 'views');
+  public static $modules = ['node_test', 'views'];
 
   protected function setUp() {
     parent::setUp();
@@ -28,30 +28,30 @@ class NodeRSSContentTest extends NodeTestBase {
     // Use bypass node access permission here, because the test class uses
     // hook_grants_alter() to deny access to everyone on node_access
     // queries.
-    $user = $this->drupalCreateUser(array('bypass node access', 'access content', 'create article content'));
+    $user = $this->drupalCreateUser(['bypass node access', 'access content', 'create article content']);
     $this->drupalLogin($user);
   }
 
   /**
    * Ensures that a new node includes the custom data when added to an RSS feed.
    */
-  function testNodeRSSContent() {
+  public function testNodeRSSContent() {
     // Create a node.
-    $node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
+    $node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1]);
 
     $this->drupalGet('rss.xml');
 
     // Check that content added in 'rss' view mode appear in RSS feed.
-    $rss_only_content = t('Extra data that should appear only in the RSS feed for node @nid.', array('@nid' => $node->id()));
+    $rss_only_content = t('Extra data that should appear only in the RSS feed for node @nid.', ['@nid' => $node->id()]);
     $this->assertText($rss_only_content, 'Node content designated for RSS appear in RSS feed.');
 
     // Check that content added in view modes other than 'rss' doesn't
     // appear in RSS feed.
-    $non_rss_content = t('Extra data that should appear everywhere except the RSS feed for node @nid.', array('@nid' => $node->id()));
+    $non_rss_content = t('Extra data that should appear everywhere except the RSS feed for node @nid.', ['@nid' => $node->id()]);
     $this->assertNoText($non_rss_content, 'Node content not designed for RSS does not appear in RSS feed.');
 
     // Check that extra RSS elements and namespaces are added to RSS feed.
-    $test_element = '<testElement>' . t('Value of testElement RSS element for node @nid.', array('@nid' => $node->id())) . '</testElement>';
+    $test_element = '<testElement>' . t('Value of testElement RSS element for node @nid.', ['@nid' => $node->id()]) . '</testElement>';
     $test_ns = 'xmlns:drupaltest="http://example.com/test-namespace"';
     $this->assertRaw($test_element, 'Extra RSS elements appear in RSS feed.');
     $this->assertRaw($test_ns, 'Extra namespaces appear in RSS feed.');
diff --git a/web/core/modules/node/src/Tests/NodeRevisionsAllTest.php b/web/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
similarity index 89%
rename from web/core/modules/node/src/Tests/NodeRevisionsAllTest.php
rename to web/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
index 7963aa039..d826a49b4 100644
--- a/web/core/modules/node/src/Tests/NodeRevisionsAllTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\NodeInterface;
 
@@ -20,13 +20,13 @@ class NodeRevisionsAllTest extends NodeTestBase {
 
     // Create and log in user.
     $web_user = $this->drupalCreateUser(
-      array(
+      [
         'view page revisions',
         'revert page revisions',
         'delete page revisions',
         'edit any page content',
         'delete any page content'
-      )
+      ]
     );
     $this->drupalLogin($web_user);
 
@@ -36,8 +36,8 @@ class NodeRevisionsAllTest extends NodeTestBase {
     $settings = get_object_vars($node);
     $settings['revision'] = 1;
 
-    $nodes = array();
-    $logs = array();
+    $nodes = [];
+    $logs = [];
 
     // Get the original node.
     $nodes[] = clone $node;
@@ -67,10 +67,10 @@ class NodeRevisionsAllTest extends NodeTestBase {
   protected function createNodeRevision(NodeInterface $node) {
     // Create revision with a random title and body and update variables.
     $node->title = $this->randomMachineName();
-    $node->body = array(
+    $node->body = [
       'value' => $this->randomMachineName(32),
       'format' => filter_default_format(),
-    );
+    ];
     $node->setNewRevision();
     $node->save();
 
@@ -80,7 +80,7 @@ class NodeRevisionsAllTest extends NodeTestBase {
   /**
    * Checks node revision operations.
    */
-  function testRevisions() {
+  public function testRevisions() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $nodes = $this->nodes;
     $logs = $this->revisionLogs;
@@ -90,13 +90,13 @@ class NodeRevisionsAllTest extends NodeTestBase {
 
     // Create and log in user.
     $content_admin = $this->drupalCreateUser(
-      array(
+      [
         'view all revisions',
         'revert all revisions',
         'delete all revisions',
         'edit any page content',
         'delete any page content'
-      )
+      ]
     );
     $this->drupalLogin($content_admin);
 
@@ -115,15 +115,15 @@ class NodeRevisionsAllTest extends NodeTestBase {
     $this->assertTrue($node->isDefaultRevision(), 'Third node revision is the current one.');
 
     // Confirm that revisions revert properly.
-    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/revert", array(), t('Revert'));
+    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/revert", [], t('Revert'));
     $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.',
-      array(
+      [
         '@type' => 'Basic page',
         '%title' => $nodes[1]->getTitle(),
         '%revision-date' => format_date($nodes[1]->getRevisionCreationTime())
-      )),
+      ]),
       'Revision reverted.');
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $reverted_node = $node_storage->load($node->id());
     $this->assertTrue(($nodes[1]->body->value == $reverted_node->body->value), 'Node reverted correctly.');
 
@@ -132,16 +132,16 @@ class NodeRevisionsAllTest extends NodeTestBase {
     $this->assertFalse($node->isDefaultRevision(), 'Third node revision is not the current one.');
 
     // Confirm revisions delete properly.
-    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/delete", array(), t('Delete'));
+    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/delete", [], t('Delete'));
     $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.',
-      array(
+      [
         '%revision-date' => format_date($nodes[1]->getRevisionCreationTime()),
         '@type' => 'Basic page',
         '%title' => $nodes[1]->getTitle(),
-      )),
+      ]),
       'Revision deleted.');
     $this->assertTrue(db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid and vid = :vid',
-      array(':nid' => $node->id(), ':vid' => $nodes[1]->getRevisionId()))->fetchField() == 0,
+      [':nid' => $node->id(), ':vid' => $nodes[1]->getRevisionId()])->fetchField() == 0,
       'Revision not found.');
 
     // Set the revision timestamp to an older date to make sure that the
@@ -149,16 +149,16 @@ class NodeRevisionsAllTest extends NodeTestBase {
     $old_revision_date = REQUEST_TIME - 86400;
     db_update('node_revision')
       ->condition('vid', $nodes[2]->getRevisionId())
-      ->fields(array(
+      ->fields([
         'revision_timestamp' => $old_revision_date,
-      ))
+      ])
       ->execute();
-    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[2]->getRevisionId() . "/revert", array(), t('Revert'));
-    $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.', array(
+    $this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[2]->getRevisionId() . "/revert", [], t('Revert'));
+    $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.', [
       '@type' => 'Basic page',
       '%title' => $nodes[2]->getTitle(),
       '%revision-date' => format_date($old_revision_date),
-    )));
+    ]));
 
     // Create 50 more revisions in order to trigger paging on the revisions
     // overview screen.
diff --git a/web/core/modules/node/src/Tests/NodeRevisionsUiBypassAccessTest.php b/web/core/modules/node/tests/src/Functional/NodeRevisionsUiBypassAccessTest.php
similarity index 94%
rename from web/core/modules/node/src/Tests/NodeRevisionsUiBypassAccessTest.php
rename to web/core/modules/node/tests/src/Functional/NodeRevisionsUiBypassAccessTest.php
index a6ffb3b98..a3a575d77 100644
--- a/web/core/modules/node/src/Tests/NodeRevisionsUiBypassAccessTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRevisionsUiBypassAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\NodeType;
 
@@ -46,7 +46,7 @@ class NodeRevisionsUiBypassAccessTest extends NodeTestBase {
   /**
    * Checks that the Revision tab is displayed correctly.
    */
-  function testDisplayRevisionTab() {
+  public function testDisplayRevisionTab() {
     $this->drupalPlaceBlock('local_tasks_block');
 
     $this->drupalLogin($this->editor);
@@ -66,7 +66,7 @@ class NodeRevisionsUiBypassAccessTest extends NodeTestBase {
     $this->assertFieldChecked('edit-revision', "'Create new revision' checkbox is checked");
 
     // Uncheck the create new revision checkbox and save the node.
-    $edit = array('revision' => FALSE);
+    $edit = ['revision' => FALSE];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
 
     $this->assertUrl($node->toUrl());
@@ -77,7 +77,7 @@ class NodeRevisionsUiBypassAccessTest extends NodeTestBase {
     $this->assertFieldChecked('edit-revision', "'Create new revision' checkbox is checked");
 
     // Submit the form without changing the checkbox.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
 
     $this->assertUrl($node->toUrl());
diff --git a/web/core/modules/node/src/Tests/NodeRevisionsUiTest.php b/web/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
similarity index 82%
rename from web/core/modules/node/src/Tests/NodeRevisionsUiTest.php
rename to web/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
index cf609b8a9..cc364cda2 100644
--- a/web/core/modules/node/src/Tests/NodeRevisionsUiTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Url;
 use Drupal\node\Entity\Node;
@@ -36,7 +36,7 @@ class NodeRevisionsUiTest extends NodeTestBase {
   /**
    * Checks that unchecking 'Create new revision' works when editing a node.
    */
-  function testNodeFormSaveWithoutRevision() {
+  public function testNodeFormSaveWithoutRevision() {
     $this->drupalLogin($this->editor);
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
 
@@ -54,11 +54,11 @@ class NodeRevisionsUiTest extends NodeTestBase {
     $this->assertFieldChecked('edit-revision', "'Create new revision' checkbox is checked");
 
     // Uncheck the create new revision checkbox and save the node.
-    $edit = array('revision' => FALSE);
+    $edit = ['revision' => FALSE];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Load the node again and check the revision is the same as before.
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $node_revision = $node_storage->load($node->id(), TRUE);
     $this->assertEqual($node_revision->getRevisionId(), $node->getRevisionId(), "After an existing node is saved with 'Create new revision' unchecked, a new revision is not created.");
 
@@ -67,11 +67,11 @@ class NodeRevisionsUiTest extends NodeTestBase {
     $this->assertFieldChecked('edit-revision', "'Create new revision' checkbox is checked");
 
     // Submit the form without changing the checkbox.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Load the node again and check the revision is different from before.
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $node_revision = $node_storage->load($node->id());
     $this->assertNotEqual($node_revision->getRevisionId(), $node->getRevisionId(), "After an existing node is saved with 'Create new revision' checked, a new revision is created.");
   }
@@ -129,14 +129,29 @@ class NodeRevisionsUiTest extends NodeTestBase {
 
     // Create the node.
     $node = $this->drupalCreateNode();
+    $storage = \Drupal::entityTypeManager()->getStorage($node->getEntityTypeId());
 
+    // Create a new revision based on the default revision.
+    // Revision 2.
+    $node = $storage->load($node->id());
     $node->setNewRevision(TRUE);
     $node->save();
+
+    // Revision 3.
+    $node = $storage->load($node->id());
     $node->setNewRevision(TRUE);
     $node->save();
+
+    // Revision 4.
+    // Trigger translation changes in order to show the revision.
+    $node = $storage->load($node->id());
+    $node->setTitle($this->randomString());
     $node->isDefaultRevision(FALSE);
     $node->setNewRevision(TRUE);
     $node->save();
+
+    // Revision 5.
+    $node = $storage->load($node->id());
     $node->isDefaultRevision(FALSE);
     $node->setNewRevision(TRUE);
     $node->save();
@@ -147,17 +162,15 @@ class NodeRevisionsUiTest extends NodeTestBase {
 
     // Verify that the default revision can be an older revision than the latest
     // one.
-    $this->assertLinkByHref('/node/' . $node_id . '/revisions/5/revert');
-    $this->assertLinkByHref('/node/' . $node_id . '/revisions/4/revert');
-    $this->assertNoLinkByHref('/node/' . $node_id . '/revisions/3/revert');
-    $current_revision_row = $this->xpath("//table[contains(@class, :table_class)]//tbody//tr[3 and contains(@class, :class) and contains(., :text)]", [
-      ':table_class' => 'node-revision-table',
-      ':class' => 'revision-current',
-      ':text' => 'Current revision',
-    ]);
-    $this->assertEqual(count($current_revision_row), 1, 'The default revision can be a revision other than the latest one.');
-    $this->assertLinkByHref('/node/' . $node_id . '/revisions/2/revert');
+    // Assert that the revisions with translations changes are shown: 1 and 4.
     $this->assertLinkByHref('/node/' . $node_id . '/revisions/1/revert');
+    $this->assertLinkByHref('/node/' . $node_id . '/revisions/4/revert');
+
+    // Assert that the revisions without translations changes are filtered out:
+    // 2, 3 and 5.
+    $this->assertNoLinkByHref('/node/' . $node_id . '/revisions/2/revert');
+    $this->assertNoLinkByHref('/node/' . $node_id . '/revisions/3/revert');
+    $this->assertNoLinkByHref('/node/' . $node_id . '/revisions/5/revert');
   }
 
 }
diff --git a/web/core/modules/node/src/Tests/NodeSaveTest.php b/web/core/modules/node/tests/src/Functional/NodeSaveTest.php
similarity index 92%
rename from web/core/modules/node/src/Tests/NodeSaveTest.php
rename to web/core/modules/node/tests/src/Functional/NodeSaveTest.php
index f01724bbc..ced995714 100644
--- a/web/core/modules/node/src/Tests/NodeSaveTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeSaveTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\Node;
 
@@ -23,13 +23,13 @@ class NodeSaveTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node_test');
+  public static $modules = ['node_test'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create a user that is allowed to post; we'll use this to test the submission.
-    $web_user = $this->drupalCreateUser(array('create article content'));
+    $web_user = $this->drupalCreateUser(['create article content']);
     $this->drupalLogin($web_user);
     $this->webUser = $web_user;
   }
@@ -42,7 +42,7 @@ class NodeSaveTest extends NodeTestBase {
    *  - save the content
    *  - check if node exists
    */
-  function testImport() {
+  public function testImport() {
     // Node ID must be a number that is not in the database.
     $nids = \Drupal::entityManager()->getStorage('node')->getQuery()
       ->sort('nid', 'DESC')
@@ -51,13 +51,13 @@ class NodeSaveTest extends NodeTestBase {
     $max_nid = reset($nids);
     $test_nid = $max_nid + mt_rand(1000, 1000000);
     $title = $this->randomMachineName(8);
-    $node = array(
+    $node = [
       'title' => $title,
-      'body' => array(array('value' => $this->randomMachineName(32))),
+      'body' => [['value' => $this->randomMachineName(32)]],
       'uid' => $this->webUser->id(),
       'type' => 'article',
       'nid' => $test_nid,
-    );
+    ];
     /** @var \Drupal\node\NodeInterface $node */
     $node = Node::create($node);
     $node->enforceIsNew();
@@ -76,13 +76,13 @@ class NodeSaveTest extends NodeTestBase {
   /**
    * Verifies accuracy of the "created" and "changed" timestamp functionality.
    */
-  function testTimestamps() {
+  public function testTimestamps() {
     // Use the default timestamps.
-    $edit = array(
+    $edit = [
       'uid' => $this->webUser->id(),
       'type' => 'article',
       'title' => $this->randomMachineName(8),
-    );
+    ];
 
     Node::create($edit)->save();
     $node = $this->drupalGetNodeByTitle($edit['title']);
@@ -105,13 +105,13 @@ class NodeSaveTest extends NodeTestBase {
     $this->assertEqual($node->getChangedTime(), 979534800, 'Saving a node uses "changed" timestamp set in presave hook.');
 
     // Programmatically set the timestamps on the node.
-    $edit = array(
+    $edit = [
       'uid' => $this->webUser->id(),
       'type' => 'article',
       'title' => $this->randomMachineName(8),
       'created' => 280299600, // Sun, 19 Nov 1978 05:00:00 GMT
       'changed' => 979534800, // Drupal 1.0 release.
-    );
+    ];
 
     Node::create($edit)->save();
     $node = $this->drupalGetNodeByTitle($edit['title']);
@@ -137,7 +137,7 @@ class NodeSaveTest extends NodeTestBase {
    * This test determines changes in hook_ENTITY_TYPE_presave() and verifies
    * that the static node load cache is cleared upon save.
    */
-  function testDeterminingChanges() {
+  public function testDeterminingChanges() {
     // Initial creation.
     $node = Node::create([
       'uid' => $this->webUser->id(),
@@ -172,10 +172,10 @@ class NodeSaveTest extends NodeTestBase {
    *
    * @see node_test_node_insert()
    */
-  function testNodeSaveOnInsert() {
+  public function testNodeSaveOnInsert() {
     // node_test_node_insert() triggers a save on insert if the title equals
     // 'new'.
-    $node = $this->drupalCreateNode(array('title' => 'new'));
+    $node = $this->drupalCreateNode(['title' => 'new']);
     $this->assertEqual($node->getTitle(), 'Node ' . $node->id(), 'Node saved on node insert.');
   }
 
diff --git a/web/core/modules/node/src/Tests/NodeTemplateSuggestionsTest.php b/web/core/modules/node/tests/src/Functional/NodeTemplateSuggestionsTest.php
similarity index 58%
rename from web/core/modules/node/src/Tests/NodeTemplateSuggestionsTest.php
rename to web/core/modules/node/tests/src/Functional/NodeTemplateSuggestionsTest.php
index ec768e680..dcadf934d 100644
--- a/web/core/modules/node/src/Tests/NodeTemplateSuggestionsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTemplateSuggestionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 /**
  * Tests node template suggestions.
@@ -12,7 +12,7 @@ class NodeTemplateSuggestionsTest extends NodeTestBase {
   /**
    * Tests if template_preprocess_node() generates the correct suggestions.
    */
-  function testNodeThemeHookSuggestions() {
+  public function testNodeThemeHookSuggestions() {
     // Create node to be rendered.
     $node = $this->drupalCreateNode();
     $view_mode = 'full';
@@ -21,18 +21,18 @@ class NodeTemplateSuggestionsTest extends NodeTestBase {
     $build = \Drupal::entityManager()->getViewBuilder('node')->view($node, $view_mode);
 
     $variables['elements'] = $build;
-    $suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_node', array($variables));
+    $suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_node', [$variables]);
 
-    $this->assertEqual($suggestions, array('node__full', 'node__page', 'node__page__full', 'node__' . $node->id(), 'node__' . $node->id() . '__full'), 'Found expected node suggestions.');
+    $this->assertEqual($suggestions, ['node__full', 'node__page', 'node__page__full', 'node__' . $node->id(), 'node__' . $node->id() . '__full'], 'Found expected node suggestions.');
 
     // Change the view mode.
     $view_mode = 'node.my_custom_view_mode';
     $build = \Drupal::entityManager()->getViewBuilder('node')->view($node, $view_mode);
 
     $variables['elements'] = $build;
-    $suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_node', array($variables));
+    $suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_node', [$variables]);
 
-    $this->assertEqual($suggestions, array('node__node_my_custom_view_mode', 'node__page', 'node__page__node_my_custom_view_mode', 'node__' . $node->id(), 'node__' . $node->id() . '__node_my_custom_view_mode'), 'Found expected node suggestions.');
+    $this->assertEqual($suggestions, ['node__node_my_custom_view_mode', 'node__page', 'node__page__node_my_custom_view_mode', 'node__' . $node->id(), 'node__' . $node->id() . '__node_my_custom_view_mode'], 'Found expected node suggestions.');
   }
 
 }
diff --git a/web/core/modules/node/tests/src/Functional/NodeTestBase.php b/web/core/modules/node/tests/src/Functional/NodeTestBase.php
new file mode 100644
index 000000000..2ef0d73c5
--- /dev/null
+++ b/web/core/modules/node/tests/src/Functional/NodeTestBase.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Drupal\Tests\node\Functional;
+
+use Drupal\Core\Session\AccountInterface;
+use Drupal\node\NodeInterface;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Sets up page and article content types.
+ */
+abstract class NodeTestBase extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'datetime'];
+
+  /**
+   * The node access control handler.
+   *
+   * @var \Drupal\Core\Entity\EntityAccessControlHandlerInterface
+   */
+  protected $accessHandler;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create Basic page and Article node types.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType([
+        'type' => 'page',
+        'name' => 'Basic page',
+        'display_submitted' => FALSE,
+      ]);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+    }
+    $this->accessHandler = \Drupal::entityManager()->getAccessControlHandler('node');
+  }
+
+  /**
+   * Asserts that node access correctly grants or denies access.
+   *
+   * @param array $ops
+   *   An associative array of the expected node access grants for the node
+   *   and account, with each key as the name of an operation (e.g. 'view',
+   *   'delete') and each value a Boolean indicating whether access to that
+   *   operation should be granted.
+   * @param \Drupal\node\NodeInterface $node
+   *   The node object to check.
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user account for which to check access.
+   */
+  public function assertNodeAccess(array $ops, NodeInterface $node, AccountInterface $account) {
+    foreach ($ops as $op => $result) {
+      $this->assertEqual($result, $this->accessHandler->access($node, $op, $account), $this->nodeAccessAssertMessage($op, $result, $node->language()->getId()));
+    }
+  }
+
+  /**
+   * Asserts that node create access correctly grants or denies access.
+   *
+   * @param string $bundle
+   *   The node bundle to check access to.
+   * @param bool $result
+   *   Whether access should be granted or not.
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user account for which to check access.
+   * @param string|null $langcode
+   *   (optional) The language code indicating which translation of the node
+   *   to check. If NULL, the untranslated (fallback) access is checked.
+   */
+  public function assertNodeCreateAccess($bundle, $result, AccountInterface $account, $langcode = NULL) {
+    $this->assertEqual($result, $this->accessHandler->createAccess($bundle, $account, [
+      'langcode' => $langcode,
+    ]), $this->nodeAccessAssertMessage('create', $result, $langcode));
+  }
+
+  /**
+   * Constructs an assert message to display which node access was tested.
+   *
+   * @param string $operation
+   *   The operation to check access for.
+   * @param bool $result
+   *   Whether access should be granted or not.
+   * @param string|null $langcode
+   *   (optional) The language code indicating which translation of the node
+   *   to check. If NULL, the untranslated (fallback) access is checked.
+   *
+   * @return string
+   *   An assert message string which contains information in plain English
+   *   about the node access permission test that was performed.
+   */
+  public function nodeAccessAssertMessage($operation, $result, $langcode = NULL) {
+    return format_string(
+      'Node access returns @result with operation %op, language code %langcode.',
+      [
+        '@result' => $result ? 'true' : 'false',
+        '%op' => $operation,
+        '%langcode' => !empty($langcode) ? $langcode : 'empty'
+      ]
+    );
+  }
+
+}
diff --git a/web/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php b/web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
similarity index 84%
rename from web/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
rename to web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
index 73bfdb344..9c442fd5d 100644
--- a/web/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 
@@ -16,12 +16,12 @@ class NodeTypeInitialLanguageTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'field_ui');
+  public static $modules = ['language', 'field_ui'];
 
   protected function setUp() {
     parent::setUp();
 
-    $web_user = $this->drupalCreateUser(array('bypass node access', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer languages'));
+    $web_user = $this->drupalCreateUser(['bypass node access', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'administer languages']);
     $this->drupalLogin($web_user);
   }
 
@@ -31,7 +31,7 @@ class NodeTypeInitialLanguageTest extends NodeTestBase {
    * The default initial language must be the site's default, and the language
    * locked option must be on.
    */
-  function testNodeTypeInitialLanguageDefaults() {
+  public function testNodeTypeInitialLanguageDefaults() {
     $this->drupalGet('admin/structure/types/manage/article');
     $this->assertOptionSelected('edit-language-configuration-langcode', LanguageInterface::LANGCODE_SITE_DEFAULT, 'The default initial language is the site default.');
     $this->assertNoFieldChecked('edit-language-configuration-language-alterable', 'Language selector is hidden by default.');
@@ -45,20 +45,20 @@ class NodeTypeInitialLanguageTest extends NodeTestBase {
     $this->assertNoField('langcode', 'Language is not selectable on node add/edit page by default.');
 
     // Adds a new language and set it as default.
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'hu',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
-    $edit = array(
+    $edit = [
       'site_default_language' => 'hu',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration'));
 
     // Tests the initial language after changing the site default language.
     // First unhide the language selector.
-    $edit = array(
+    $edit = [
       'language_configuration[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->drupalGet('node/add/article');
     $this->assertField('langcode[0][value]', 'Language is selectable on node add/edit page when language not hidden.');
@@ -75,12 +75,12 @@ class NodeTypeInitialLanguageTest extends NodeTestBase {
     $language_display = $this->xpath('//*[@id="langcode"]');
     $this->assert(!empty($language_display), 'Language field is visible on manage display tab.');
     // Tests if the language field is hidden by default.
-    $this->assertOptionSelected('edit-fields-langcode-type', 'hidden', 'Language is hidden by default on manage display tab.');
+    $this->assertOptionSelected('edit-fields-langcode-region', 'hidden', 'Language is hidden by default on manage display tab.');
 
     // Changes the initial language settings.
-    $edit = array(
+    $edit = [
       'language_configuration[langcode]' => 'en',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->drupalGet('node/add/article');
     $this->assertOptionSelected('edit-langcode-0-value', 'en', 'The initial language is the defined language.');
@@ -89,36 +89,37 @@ class NodeTypeInitialLanguageTest extends NodeTestBase {
   /**
    * Tests language field visibility features.
    */
-  function testLanguageFieldVisibility() {
+  public function testLanguageFieldVisibility() {
     // Creates a node to test Language field visibility feature.
-    $edit = array(
+    $edit = [
       'title[0][value]' => $this->randomMachineName(8),
       'body[0][value]' => $this->randomMachineName(16),
-    );
+    ];
     $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
     $this->assertTrue($node, 'Node found in database.');
 
     // Loads node page and check if Language field is hidden by default.
     $this->drupalGet('node/' . $node->id());
-    $language_field = $this->xpath('//div[@id=:id]/div', array(
+    $language_field = $this->xpath('//div[@id=:id]/div', [
       ':id' => 'field-language-display',
-    ));
+    ]);
     $this->assertTrue(empty($language_field), 'Language field value is not shown by default on node page.');
 
     // Configures Language field formatter and check if it is saved.
-    $edit = array(
+    $edit = [
       'fields[langcode][type]' => 'language',
-    );
+      'fields[langcode][region]' => 'content',
+    ];
     $this->drupalPostForm('admin/structure/types/manage/article/display', $edit, t('Save'));
     $this->drupalGet('admin/structure/types/manage/article/display');
     $this->assertOptionSelected('edit-fields-langcode-type', 'language', 'Language field has been set to visible.');
 
     // Loads node page and check if Language field is shown.
     $this->drupalGet('node/' . $node->id());
-    $language_field = $this->xpath('//div[@id=:id]/div', array(
+    $language_field = $this->xpath('//div[@id=:id]/div', [
       ':id' => 'field-language-display',
-    ));
+    ]);
     $this->assertFalse(empty($language_field), 'Language field value is shown on node page.');
   }
 
diff --git a/web/core/modules/node/src/Tests/NodeTypeTranslationTest.php b/web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
similarity index 73%
rename from web/core/modules/node/src/Tests/NodeTypeTranslationTest.php
rename to web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
index 1c3a768cd..07e61a036 100644
--- a/web/core/modules/node/src/Tests/NodeTypeTranslationTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Ensures that node types translation work correctly.
@@ -15,19 +15,19 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group node
  */
-class NodeTypeTranslationTest extends WebTestBase {
+class NodeTypeTranslationTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'block',
     'config_translation',
     'field_ui',
     'node',
-  );
+  ];
 
   /**
    * The default language code to use in this test.
@@ -53,14 +53,14 @@ class NodeTypeTranslationTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $admin_permissions = array(
+    $admin_permissions = [
       'administer content types',
       'administer node fields',
       'administer languages',
       'administer site configuration',
       'administer themes',
       'translate configuration',
-    );
+    ];
 
     // Create and log in user.
     $this->adminUser = $this->drupalCreateUser($admin_permissions);
@@ -93,31 +93,31 @@ class NodeTypeTranslationTest extends WebTestBase {
     $type = Unicode::strtolower($this->randomMachineName(16));
     $name = $this->randomString();
     $this->drupalLogin($this->adminUser);
-    $this->drupalCreateContentType(array('type' => $type, 'name' => $name));
+    $this->drupalCreateContentType(['type' => $type, 'name' => $name]);
 
     // Translate the node type name.
     $langcode = $this->additionalLangcodes[0];
     $translated_name = $langcode . '-' . $name;
-    $edit = array(
+    $edit = [
       "translation[config_names][node.type.$type][name]" => $translated_name,
-    );
+    ];
 
     // Edit the title label to avoid having an exception when we save the translation.
     $this->drupalPostForm("admin/structure/types/manage/$type/translate/$langcode/add", $edit, t('Save translation'));
 
     // Check the name is translated without admin theme for editing.
-    $this->drupalPostForm('admin/appearance', array('use_admin_theme' => '0'), t('Save configuration'));
+    $this->drupalPostForm('admin/appearance', ['use_admin_theme' => '0'], t('Save configuration'));
     $this->drupalGet("$langcode/node/add/$type");
     // This is a Spanish page, so ensure the text asserted is translated in
     // Spanish and not French by adding the langcode option.
-    $this->assertRaw(t('Create @name', array('@name' => $translated_name), array('langcode' => $langcode)));
+    $this->assertRaw(t('Create @name', ['@name' => $translated_name], ['langcode' => $langcode]));
 
     // Check the name is translated with admin theme for editing.
-    $this->drupalPostForm('admin/appearance', array('use_admin_theme' => '1'), t('Save configuration'));
+    $this->drupalPostForm('admin/appearance', ['use_admin_theme' => '1'], t('Save configuration'));
     $this->drupalGet("$langcode/node/add/$type");
     // This is a Spanish page, so ensure the text asserted is translated in
     // Spanish and not French by adding the langcode option.
-    $this->assertRaw(t('Create @name', array('@name' => $translated_name), array('langcode' => $langcode)));
+    $this->assertRaw(t('Create @name', ['@name' => $translated_name], ['langcode' => $langcode]));
   }
 
   /**
@@ -127,18 +127,18 @@ class NodeTypeTranslationTest extends WebTestBase {
     $type = Unicode::strtolower($this->randomMachineName(16));
     $name = $this->randomString();
     $this->drupalLogin($this->adminUser);
-    $this->drupalCreateContentType(array('type' => $type, 'name' => $name));
+    $this->drupalCreateContentType(['type' => $type, 'name' => $name]);
     $langcode = $this->additionalLangcodes[0];
 
     // Edit the title label for it to be displayed on the translation form.
-    $this->drupalPostForm("admin/structure/types/manage/$type", array('title_label' => 'Edited title'), t('Save content type'));
+    $this->drupalPostForm("admin/structure/types/manage/$type", ['title_label' => 'Edited title'], t('Save content type'));
 
     // Assert that the title label is displayed on the translation form with the right value.
     $this->drupalGet("admin/structure/types/manage/$type/translate/$langcode/add");
     $this->assertText('Edited title');
 
     // Translate the title label.
-    $this->drupalPostForm(NULL, array("translation[config_names][core.base_field_override.node.$type.title][label]" => 'Translated title'), t('Save translation'));
+    $this->drupalPostForm(NULL, ["translation[config_names][core.base_field_override.node.$type.title][label]" => 'Translated title'], t('Save translation'));
 
     // Assert that the right title label is displayed on the node add form. The
     // translations are created in this test; therefore, the assertions do not
@@ -150,23 +150,23 @@ class NodeTypeTranslationTest extends WebTestBase {
     $this->assertText('Translated title');
 
     // Add an e-mail field.
-    $this->drupalPostForm("admin/structure/types/manage/$type/fields/add-field", array('new_storage_type' => 'email', 'label' => 'Email', 'field_name' => 'email'), 'Save and continue');
-    $this->drupalPostForm(NULL, array(), 'Save field settings');
-    $this->drupalPostForm(NULL, array(), 'Save settings');
+    $this->drupalPostForm("admin/structure/types/manage/$type/fields/add-field", ['new_storage_type' => 'email', 'label' => 'Email', 'field_name' => 'email'], 'Save and continue');
+    $this->drupalPostForm(NULL, [], 'Save field settings');
+    $this->drupalPostForm(NULL, [], 'Save settings');
 
     $type = Unicode::strtolower($this->randomMachineName(16));
     $name = $this->randomString();
-    $this->drupalCreateContentType(array('type' => $type, 'name' => $name));
+    $this->drupalCreateContentType(['type' => $type, 'name' => $name]);
 
     // Set tabs.
-    $this->drupalPlaceBlock('local_tasks_block', array('primary' => TRUE));
+    $this->drupalPlaceBlock('local_tasks_block', ['primary' => TRUE]);
 
     // Change default language.
-    $this->drupalPostForm('admin/config/regional/language', array('site_default_language' => 'es'), 'Save configuration');
+    $this->drupalPostForm('admin/config/regional/language', ['site_default_language' => 'es'], 'Save configuration');
 
     // Try re-using the email field.
     $this->drupalGet("es/admin/structure/types/manage/$type/fields/add-field");
-    $this->drupalPostForm(NULL, array('existing_storage_name' => 'field_email', 'existing_storage_label' => 'Email'), 'Save and continue');
+    $this->drupalPostForm(NULL, ['existing_storage_name' => 'field_email', 'existing_storage_label' => 'Email'], 'Save and continue');
     $this->assertResponse(200);
     $this->drupalGet("es/admin/structure/types/manage/$type/fields/node.$type.field_email/translate");
     $this->assertResponse(200);
diff --git a/web/core/modules/node/src/Tests/NodeViewLanguageTest.php b/web/core/modules/node/tests/src/Functional/NodeViewLanguageTest.php
similarity index 81%
rename from web/core/modules/node/src/Tests/NodeViewLanguageTest.php
rename to web/core/modules/node/tests/src/Functional/NodeViewLanguageTest.php
index 71fe4d15f..473042756 100644
--- a/web/core/modules/node/src/Tests/NodeViewLanguageTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeViewLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 
@@ -16,7 +16,7 @@ class NodeViewLanguageTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'datetime', 'language');
+  public static $modules = ['node', 'datetime', 'language'];
 
   /**
    * Tests the language extra field display.
@@ -31,7 +31,7 @@ class NodeViewLanguageTest extends NodeTestBase {
       ->save();
 
     // Create a node in Spanish.
-    $node = $this->drupalCreateNode(array('langcode' => 'es'));
+    $node = $this->drupalCreateNode(['langcode' => 'es']);
 
     $this->drupalGet($node->urlInfo());
     $this->assertText('Spanish', 'The language field is displayed properly.');
diff --git a/web/core/modules/node/src/Tests/PageViewTest.php b/web/core/modules/node/tests/src/Functional/PageViewTest.php
similarity index 82%
rename from web/core/modules/node/src/Tests/PageViewTest.php
rename to web/core/modules/node/tests/src/Functional/PageViewTest.php
index 086b3e17c..9f7e41402 100644
--- a/web/core/modules/node/src/Tests/PageViewTest.php
+++ b/web/core/modules/node/tests/src/Functional/PageViewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\node\Tests;
+namespace Drupal\Tests\node\Functional;
 
 use Drupal\node\Entity\Node;
 
@@ -13,7 +13,7 @@ class PageViewTest extends NodeTestBase {
   /**
    * Tests an anonymous and unpermissioned user attempting to edit the node.
    */
-  function testPageView() {
+  public function testPageView() {
     // Create a node to view.
     $node = $this->drupalCreateNode();
     $this->assertTrue(Node::load($node->id()), 'Node created.');
@@ -23,7 +23,7 @@ class PageViewTest extends NodeTestBase {
     $this->assertResponse(403);
 
     // Create a user without permission to edit node.
-    $web_user = $this->drupalCreateUser(array('access content'));
+    $web_user = $this->drupalCreateUser(['access content']);
     $this->drupalLogin($web_user);
 
     // Attempt to access edit page.
@@ -31,7 +31,7 @@ class PageViewTest extends NodeTestBase {
     $this->assertResponse(403);
 
     // Create user with permission to edit node.
-    $web_user = $this->drupalCreateUser(array('bypass node access'));
+    $web_user = $this->drupalCreateUser(['bypass node access']);
     $this->drupalLogin($web_user);
 
     // Attempt to access edit page.
diff --git a/web/core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php b/web/core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php
index edb9ae08d..e1b17f2c1 100644
--- a/web/core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php
@@ -26,7 +26,7 @@ class NodeImportChangeTest extends KernelTestBase {
     parent::setUp();
 
     // Set default storage backend.
-    $this->installConfig(array('field', 'node_test_config'));
+    $this->installConfig(['field', 'node_test_config']);
   }
 
   /**
diff --git a/web/core/modules/node/tests/src/Kernel/Config/NodeImportCreateTest.php b/web/core/modules/node/tests/src/Kernel/Config/NodeImportCreateTest.php
index f4fd1e198..cb985173a 100644
--- a/web/core/modules/node/tests/src/Kernel/Config/NodeImportCreateTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Config/NodeImportCreateTest.php
@@ -18,7 +18,7 @@ class NodeImportCreateTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field', 'text', 'system', 'user');
+  public static $modules = ['node', 'field', 'text', 'system', 'user'];
 
   /**
    * Set the default field storage backend for fields created during tests.
@@ -28,7 +28,7 @@ class NodeImportCreateTest extends KernelTestBase {
     $this->installEntitySchema('user');
 
     // Set default storage backend.
-    $this->installConfig(array('field'));
+    $this->installConfig(['field']);
   }
 
   /**
@@ -42,7 +42,7 @@ class NodeImportCreateTest extends KernelTestBase {
 
     // Enable node_test_config module and check that the content type
     // shipped in the module's default config is created.
-    $this->container->get('module_installer')->install(array('node_test_config'));
+    $this->container->get('module_installer')->install(['node_test_config']);
     $node_type = NodeType::load($node_type_id);
     $this->assertTrue($node_type, 'The default content type was created.');
   }
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php
index 660b35856..8743284dc 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\node\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
index 7a0a272a1..a0365e0b6 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
@@ -57,6 +57,8 @@ class MigrateNodeTest extends MigrateNodeTestBase {
     $node_revision = \Drupal::entityManager()->getStorage('node')->loadRevision(1);
     $this->assertIdentical('Test title', $node_revision->getTitle());
     $this->assertIdentical('1', $node_revision->getRevisionUser()->id(), 'Node revision has the correct user');
+    $this->assertSame('1', $node_revision->id(), 'Node 1 loaded.');
+    $this->assertSame('1', $node_revision->getRevisionId(), 'Node 1 revision 1 loaded.');
     // This is empty on the first revision.
     $this->assertIdentical(NULL, $node_revision->revision_log->value);
     $this->assertIdentical('This is a shared text field', $node->field_test->value);
@@ -77,7 +79,7 @@ class MigrateNodeTest extends MigrateNodeTestBase {
 
     // Test the file field meta.
     $this->assertIdentical('desc', $node->field_test_filefield->description);
-    $this->assertIdentical('5', $node->field_test_filefield->target_id);
+    $this->assertIdentical('4', $node->field_test_filefield->target_id);
 
     $node = Node::load(2);
     $this->assertIdentical('Test title rev 3', $node->getTitle());
@@ -89,6 +91,20 @@ class MigrateNodeTest extends MigrateNodeTestBase {
     $this->assertIdentical('Drupal Groups', $node->field_test_link->title);
     $this->assertIdentical([], $node->field_test_link->options['attributes']);
 
+    $node = Node::load(3);
+    // Test multivalue field.
+    $value_1 = $node->field_multivalue->value;
+    $value_2 = $node->field_multivalue[1]->value;
+
+    // SQLite does not support scales for float data types so we need to convert
+    // the value manually.
+    if ($this->container->get('database')->driver() == 'sqlite') {
+      $value_1 = sprintf('%01.2f', $value_1);
+      $value_2 = sprintf('%01.2f', $value_2);
+    }
+    $this->assertSame('33.00', $value_1);
+    $this->assertSame('44.00', $value_2);
+
     // Test that a link field with an internal link is migrated.
     $node = Node::load(9);
     $this->assertSame('internal:/node/10', $node->field_test_link->uri);
@@ -156,11 +172,11 @@ class MigrateNodeTest extends MigrateNodeTestBase {
     $this->assertIdentical('full_html', $node->body->format);
 
     // Now insert a row indicating a failure and set to update later.
-    $title = $this->rerunMigration(array(
+    $title = $this->rerunMigration([
       'sourceid1' => 2,
       'destid1' => NULL,
       'source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE,
-    ));
+    ]);
     $node = Node::load(2);
     $this->assertIdentical($title, $node->getTitle());
   }
@@ -178,10 +194,10 @@ class MigrateNodeTest extends MigrateNodeTestBase {
     $title = $this->randomString();
     $source_connection = Database::getConnection('default', 'migrate');
     $source_connection->update('node_revisions')
-      ->fields(array(
+      ->fields([
         'title' => $title,
         'format' => 2,
-      ))
+      ])
       ->condition('vid', 3)
       ->execute();
     $migration = $this->getMigration('d6_node:story');
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php
index b9845625c..c9cb341aa 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php
@@ -33,7 +33,7 @@ class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
     $this->assertIdentical(TRUE, $node_type_page->displaySubmitted());
     $this->assertIdentical(FALSE, $node_type_page->isNewRevision());
     $this->assertIdentical(DRUPAL_OPTIONAL, $node_type_page->getPreviewMode());
-    $this->assertIdentical($id_map->lookupDestinationID(array('test_page')), array('test_page'));
+    $this->assertIdentical($id_map->lookupDestinationID(['test_page']), ['test_page']);
 
     // Test we have a body field.
     $field = FieldConfig::loadByName('node', 'test_page', 'body');
@@ -46,7 +46,7 @@ class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
     $this->assertIdentical(TRUE, $node_type_story->displaySubmitted());
     $this->assertIdentical(FALSE, $node_type_story->isNewRevision());
     $this->assertIdentical(DRUPAL_OPTIONAL, $node_type_story->getPreviewMode());
-    $this->assertIdentical($id_map->lookupDestinationID(array('test_story')), array('test_story'));
+    $this->assertIdentical($id_map->lookupDestinationID(['test_story']), ['test_story']);
 
     // Test we don't have a body field.
     $field = FieldConfig::loadByName('node', 'test_story', 'body');
@@ -59,7 +59,7 @@ class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
     $this->assertIdentical(TRUE, $node_type_event->displaySubmitted());
     $this->assertIdentical(TRUE, $node_type_event->isNewRevision());
     $this->assertIdentical(DRUPAL_OPTIONAL, $node_type_event->getPreviewMode());
-    $this->assertIdentical($id_map->lookupDestinationID(array('test_event')), array('test_event'));
+    $this->assertIdentical($id_map->lookupDestinationID(['test_event']), ['test_event']);
 
     // Test we have a body field.
     $field = FieldConfig::loadByName('node', 'test_event', 'body');
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
index 5e8eb0a67..f47559275 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
@@ -29,7 +29,7 @@ class MigrateViewModesTest extends MigrateDrupal6TestBase {
     $this->assertIdentical(FALSE, is_null($view_mode), 'Preview view mode loaded.');
     $this->assertIdentical('Preview', $view_mode->label(), 'View mode has correct label.');
     // Test the ID map.
-    $this->assertIdentical(array('node', 'preview'), $this->getMigration('d6_view_modes')->getIdMap()->lookupDestinationID(array(1)));
+    $this->assertIdentical(['node', 'preview'], $this->getMigration('d6_view_modes')->getIdMap()->lookupDestinationID([1]));
   }
 
 }
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeDeriverTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeDeriverTest.php
new file mode 100644
index 000000000..569582dd8
--- /dev/null
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeDeriverTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\Tests\node\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Test D7NodeDeriver.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateNodeDeriverTest extends MigrateDrupal7TestBase {
+
+  /**
+   * The migration plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigrationPluginManagerInterface
+   */
+  protected $pluginManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+    $this->pluginManager = $this->container->get('plugin.manager.migration');
+  }
+
+  /**
+   * Test node translation migrations with translation disabled.
+   */
+  public function testNoTranslations() {
+    // Without content_translation, there should be no translation migrations.
+    $migrations = $this->pluginManager->createInstances('d7_node_translation');
+    $this->assertSame([], $migrations,
+      "No node translation migrations without content_translation");
+  }
+
+  /**
+   * Test node translation migrations with translation enabled.
+   */
+  public function testTranslations() {
+    // With content_translation, there should be translation migrations for
+    // each content type.
+    $this->enableModules(['language', 'content_translation', 'node', 'filter']);
+    $migrations = $this->pluginManager->createInstances('d7_node_translation');
+    $this->assertArrayHasKey('d7_node_translation:article', $migrations,
+      "Node translation migrations exist after content_translation installed");
+  }
+
+}
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php
index d2924f8a0..dcae81b8c 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\node\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
index f7b98bd7f..f7855e877 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
@@ -13,17 +13,22 @@ use Drupal\node\NodeInterface;
  */
 class MigrateNodeTest extends MigrateDrupal7TestBase {
 
-  public static $modules = array(
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'content_translation',
     'comment',
     'datetime',
     'filter',
     'image',
+    'language',
     'link',
     'node',
     'taxonomy',
     'telephone',
     'text',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -40,15 +45,17 @@ class MigrateNodeTest extends MigrateDrupal7TestBase {
     $this->installSchema('system', ['sequences']);
 
     $this->executeMigrations([
+      'language',
       'd7_user_role',
       'd7_user',
       'd7_node_type',
+      'd7_language_content_settings',
       'd7_comment_type',
       'd7_taxonomy_vocabulary',
       'd7_field',
       'd7_field_instance',
       'd7_node',
-      'd7_node:article',
+      'd7_node_translation',
     ]);
   }
 
@@ -144,9 +151,31 @@ class MigrateNodeTest extends MigrateDrupal7TestBase {
     $this->assertIdentical('Click Here', $node->field_link->title);
 
     $node = Node::load(2);
+    $this->assertSame('en', $node->langcode->value);
     $this->assertIdentical("...is that it's the absolute best show ever. Trust me, I would know.", $node->body->value);
+    $this->assertSame('The thing about Deep Space 9', $node->label());
     $this->assertIdentical('internal:/', $node->field_link->uri);
     $this->assertIdentical('Home', $node->field_link->title);
+    $this->assertTrue($node->hasTranslation('is'), "Node 2 has an Icelandic translation");
+
+    $translation = $node->getTranslation('is');
+    $this->assertSame('is', $translation->langcode->value);
+    $this->assertSame("is - ...is that it's the absolute best show ever. Trust me, I would know.", $translation->body->value);
+    $this->assertSame('is - The thing about Deep Space 9', $translation->label());
+    $this->assertSame('internal:/', $translation->field_link->uri);
+    $this->assertSame('Home', $translation->field_link->title);
+
+    // Test that content_translation_source is set.
+    $manager = $this->container->get('content_translation.manager');
+    $this->assertSame('en', $manager->getTranslationMetadata($node->getTranslation('is'))->getSource());
+
+    // Node 3 is a translation of node 2, and should not be imported separately.
+    $this->assertNull(Node::load(3), "Node 3 doesn't exist in D8, it was a translation");
+
+    // Test that content_translation_source for a source other than English.
+    $node = Node::load(4);
+    $this->assertSame('is', $manager->getTranslationMetadata($node->getTranslation('en'))->getSource());
+
   }
 
 }
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
index 8b98ec304..549021f0e 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
@@ -20,14 +20,14 @@ class MigrateNodeTypeTest extends MigrateDrupal7TestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'text', 'filter');
+  public static $modules = ['node', 'text', 'filter'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('node'));
+    $this->installConfig(['node']);
     $this->executeMigration('d7_node_type');
   }
 
diff --git a/web/core/modules/node/tests/src/Kernel/NodeAccessTest.php b/web/core/modules/node/tests/src/Kernel/NodeAccessTest.php
index b8e2251e6..539edcb09 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeAccessTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeAccessTest.php
@@ -73,11 +73,11 @@ class NodeAccessTest extends KernelTestBase {
     $this->drupalCreateUser();
 
     // Create a node type.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'page',
       'name' => 'Basic page',
       'display_submitted' => FALSE,
-    ));
+    ]);
   }
 
   /**
diff --git a/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php b/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php
index 6c1faf370..3dd13496d 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php
@@ -28,7 +28,7 @@ class NodeBodyFieldStorageTest extends KernelTestBase {
     $this->installSchema('user', 'users_data');
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');
-    $this->installConfig(array('field', 'node'));
+    $this->installConfig(['field', 'node']);
   }
 
   /**
@@ -46,7 +46,7 @@ class NodeBodyFieldStorageTest extends KernelTestBase {
     $field->delete();
     $field_storage = FieldStorageConfig::loadByName('node', 'body');
     $this->assertTrue(count($field_storage->getBundles()) == 0, 'Node body field storage exists after deleting the only instance of a field.');
-    \Drupal::service('module_installer')->uninstall(array('node'));
+    \Drupal::service('module_installer')->uninstall(['node']);
     $field_storage = FieldStorageConfig::loadByName('node', 'body');
     $this->assertFalse($field_storage, 'Node body field storage does not exist after uninstalling the Node module.');
   }
diff --git a/web/core/modules/node/tests/src/Kernel/NodeConditionTest.php b/web/core/modules/node/tests/src/Kernel/NodeConditionTest.php
index 7636d5298..a30867cb8 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeConditionTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeConditionTest.php
@@ -13,7 +13,7 @@ use Drupal\node\Entity\NodeType;
  */
 class NodeConditionTest extends EntityKernelTestBase {
 
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   protected function setUp() {
     parent::setUp();
@@ -30,7 +30,7 @@ class NodeConditionTest extends EntityKernelTestBase {
   /**
    * Tests conditions.
    */
-  function testConditions() {
+  public function testConditions() {
     $manager = $this->container->get('plugin.manager.condition', $this->container->get('container.namespaces'));
     $this->createUser();
 
@@ -45,20 +45,20 @@ class NodeConditionTest extends EntityKernelTestBase {
     // Grab the node type condition and configure it to check against node type
     // of 'article' and set the context to the page type node.
     $condition = $manager->createInstance('node_type')
-      ->setConfig('bundles', array('article' => 'article'))
+      ->setConfig('bundles', ['article' => 'article'])
       ->setContextValue('node', $page);
     $this->assertFalse($condition->execute(), 'Page type nodes fail node type checks for articles.');
     // Check for the proper summary.
     $this->assertEqual('The node bundle is article', $condition->summary());
 
     // Set the node type check to page.
-    $condition->setConfig('bundles', array('page' => 'page'));
+    $condition->setConfig('bundles', ['page' => 'page']);
     $this->assertTrue($condition->execute(), 'Page type nodes pass node type checks for pages');
     // Check for the proper summary.
     $this->assertEqual('The node bundle is page', $condition->summary());
 
     // Set the node type check to page or article.
-    $condition->setConfig('bundles', array('page' => 'page', 'article' => 'article'));
+    $condition->setConfig('bundles', ['page' => 'page', 'article' => 'article']);
     $this->assertTrue($condition->execute(), 'Page type nodes pass node type checks for pages or articles');
     // Check for the proper summary.
     $this->assertEqual('The node bundle is page or article', $condition->summary());
@@ -72,11 +72,11 @@ class NodeConditionTest extends EntityKernelTestBase {
     $this->assertFalse($condition->execute(), 'Test type nodes pass node type checks for pages or articles');
 
     // Check a greater than 2 bundles summary scenario.
-    $condition->setConfig('bundles', array('page' => 'page', 'article' => 'article', 'test' => 'test'));
+    $condition->setConfig('bundles', ['page' => 'page', 'article' => 'article', 'test' => 'test']);
     $this->assertEqual('The node bundle is page, article or test', $condition->summary());
 
     // Test Constructor injection.
-    $condition = $manager->createInstance('node_type', array('bundles' => array('article' => 'article'), 'context' => array('node' => $article)));
+    $condition = $manager->createInstance('node_type', ['bundles' => ['article' => 'article'], 'context' => ['node' => $article]]);
     $this->assertTrue($condition->execute(), 'Constructor injection of context and configuration working as anticipated.');
   }
 
diff --git a/web/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php b/web/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
index f88e45e4a..ae66dca02 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
@@ -19,32 +19,32 @@ class NodeFieldAccessTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * Fields that only users with administer nodes permissions can change.
    *
    * @var array
    */
-  protected $administrativeFields = array(
+  protected $administrativeFields = [
     'status',
     'promote',
     'sticky',
     'created',
     'uid',
-  );
+  ];
 
   /**
    * These fields are automatically managed and can not be changed by any user.
    *
    * @var array
    */
-  protected $readOnlyFields = array('changed', 'revision_uid', 'revision_timestamp');
+  protected $readOnlyFields = ['changed', 'revision_uid', 'revision_timestamp'];
 
   /**
    * Test permissions on nodes status field.
    */
-  function testAccessToAdministrativeFields() {
+  public function testAccessToAdministrativeFields() {
 
     // Create the page node type with revisions disabled.
     $page = NodeType::create([
@@ -62,74 +62,74 @@ class NodeFieldAccessTest extends EntityKernelTestBase {
 
     // An administrator user. No user exists yet, ensure that the first user
     // does not have UID 1.
-    $content_admin_user = $this->createUser(array('uid' => 2), array('administer nodes'));
+    $content_admin_user = $this->createUser(['uid' => 2], ['administer nodes']);
 
     // Two different editor users.
-    $page_creator_user = $this->createUser(array(), array('create page content', 'edit own page content', 'delete own page content'));
-    $page_manager_user = $this->createUser(array(), array('create page content', 'edit any page content', 'delete any page content'));
+    $page_creator_user = $this->createUser([], ['create page content', 'edit own page content', 'delete own page content']);
+    $page_manager_user = $this->createUser([], ['create page content', 'edit any page content', 'delete any page content']);
 
     // An unprivileged user.
-    $page_unrelated_user = $this->createUser(array(), array('access content'));
+    $page_unrelated_user = $this->createUser([], ['access content']);
 
     // List of all users
-    $test_users = array(
+    $test_users = [
       $content_admin_user,
       $page_creator_user,
       $page_manager_user,
       $page_unrelated_user,
-    );
+    ];
 
     // Create three "Basic pages". One is owned by our test-user
     // "page_creator", one by "page_manager", and one by someone else.
-    $node1 = Node::create(array(
+    $node1 = Node::create([
       'title' => $this->randomMachineName(8),
       'uid' => $page_creator_user->id(),
       'type' => 'page',
-    ));
-    $node2 = Node::create(array(
+    ]);
+    $node2 = Node::create([
       'title' => $this->randomMachineName(8),
       'uid' => $page_manager_user->id(),
       'type' => 'article',
-    ));
-    $node3 = Node::create(array(
+    ]);
+    $node3 = Node::create([
       'title' => $this->randomMachineName(8),
       'type' => 'page',
-    ));
+    ]);
 
     foreach ($this->administrativeFields as $field) {
 
       // Checks on view operations.
       foreach ($test_users as $account) {
         $may_view = $node1->{$field}->access('view', $account);
-        $this->assertTrue($may_view, SafeMarkup::format('Any user may view the field @name.', array('@name' => $field)));
+        $this->assertTrue($may_view, SafeMarkup::format('Any user may view the field @name.', ['@name' => $field]));
       }
 
       // Checks on edit operations.
       $may_update = $node1->{$field}->access('edit', $page_creator_user);
-      $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit own page content" is not allowed to the field @name.', array('@name' => $field)));
+      $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit own page content" is not allowed to the field @name.', ['@name' => $field]));
       $may_update = $node2->{$field}->access('edit', $page_creator_user);
-      $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit own page content" is not allowed to the field @name.', array('@name' => $field)));
+      $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit own page content" is not allowed to the field @name.', ['@name' => $field]));
       $may_update = $node2->{$field}->access('edit', $page_manager_user);
-      $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
+      $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit any page content" is not allowed to the field @name.', ['@name' => $field]));
       $may_update = $node1->{$field}->access('edit', $page_manager_user);
-      $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
+      $this->assertFalse($may_update, SafeMarkup::format('Users with permission "edit any page content" is not allowed to the field @name.', ['@name' => $field]));
       $may_update = $node2->{$field}->access('edit', $page_unrelated_user);
-      $this->assertFalse($may_update, SafeMarkup::format('Users not having permission "edit any page content" is not allowed to the field @name.', array('@name' => $field)));
+      $this->assertFalse($may_update, SafeMarkup::format('Users not having permission "edit any page content" is not allowed to the field @name.', ['@name' => $field]));
       $may_update = $node1->{$field}->access('edit', $content_admin_user) && $node3->status->access('edit', $content_admin_user);
-      $this->assertTrue($may_update, SafeMarkup::format('Users with permission "administer nodes" may edit @name fields on all nodes.', array('@name' => $field)));
+      $this->assertTrue($may_update, SafeMarkup::format('Users with permission "administer nodes" may edit @name fields on all nodes.', ['@name' => $field]));
     }
 
     foreach ($this->readOnlyFields as $field) {
       // Check view operation.
       foreach ($test_users as $account) {
         $may_view = $node1->{$field}->access('view', $account);
-        $this->assertTrue($may_view, SafeMarkup::format('Any user may view the field @name.', array('@name' => $field)));
+        $this->assertTrue($may_view, SafeMarkup::format('Any user may view the field @name.', ['@name' => $field]));
       }
 
       // Check edit operation.
       foreach ($test_users as $account) {
         $may_view = $node1->{$field}->access('edit', $account);
-        $this->assertFalse($may_view, SafeMarkup::format('No user is not allowed to edit the field @name.', array('@name' => $field)));
+        $this->assertFalse($may_view, SafeMarkup::format('No user is not allowed to edit the field @name.', ['@name' => $field]));
       }
     }
 
diff --git a/web/core/modules/node/tests/src/Kernel/NodeFieldOverridesTest.php b/web/core/modules/node/tests/src/Kernel/NodeFieldOverridesTest.php
index aee02728e..7c7bc0334 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeFieldOverridesTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeFieldOverridesTest.php
@@ -27,14 +27,14 @@ class NodeFieldOverridesTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('user', 'system', 'field', 'node');
+  public static $modules = ['user', 'system', 'field', 'node'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('user'));
+    $this->installConfig(['user']);
     $this->user = $this->createUser();
     \Drupal::service('current_user')->setAccount($this->user);
   }
diff --git a/web/core/modules/node/tests/src/Kernel/NodeOwnerTest.php b/web/core/modules/node/tests/src/Kernel/NodeOwnerTest.php
index d21d5ad04..c12f3115c 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeOwnerTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeOwnerTest.php
@@ -19,16 +19,16 @@ class NodeOwnerTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'language');
+  public static $modules = ['node', 'language'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create the node bundles required for testing.
-    $type = NodeType::create(array(
+    $type = NodeType::create([
       'type' => 'page',
       'name' => 'page',
-    ));
+    ]);
     $type->save();
 
     // Enable two additional languages.
@@ -48,11 +48,11 @@ class NodeOwnerTest extends EntityKernelTestBase {
     $container->get('current_user')->setAccount($user);
 
     // Create a test node.
-    $english = Node::create(array(
+    $english = Node::create([
       'type' => 'page',
       'title' => $this->randomMachineName(),
       'language' => 'en',
-    ));
+    ]);
     $english->save();
 
     $this->assertEqual($user->id(), $english->getOwnerId());
diff --git a/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php b/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php
index c496c83b2..dd39b6d26 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php
@@ -22,14 +22,14 @@ class NodeTokenReplaceTest extends TokenReplaceKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'filter');
+  public static $modules = ['node', 'filter'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('filter', 'node'));
+    $this->installConfig(['filter', 'node']);
 
     $node_type = NodeType::create(['type' => 'article', 'name' => 'Article']);
     $node_type->save();
@@ -39,11 +39,11 @@ class NodeTokenReplaceTest extends TokenReplaceKernelTestBase {
   /**
    * Creates a node, then tests the tokens generated from it.
    */
-  function testNodeTokenReplacement() {
-    $url_options = array(
+  public function testNodeTokenReplacement() {
+    $url_options = [
       'absolute' => TRUE,
       'language' => $this->interfaceLanguage,
-    );
+    ];
 
     // Create a user and a node.
     $account = $this->createUser();
@@ -58,7 +58,7 @@ class NodeTokenReplaceTest extends TokenReplaceKernelTestBase {
     $node->save();
 
     // Generate and test tokens.
-    $tests = array();
+    $tests = [];
     $tests['[node:nid]'] = $node->id();
     $tests['[node:vid]'] = $node->getRevisionId();
     $tests['[node:type]'] = 'article';
@@ -72,8 +72,8 @@ class NodeTokenReplaceTest extends TokenReplaceKernelTestBase {
     $tests['[node:author]'] = $account->getUsername();
     $tests['[node:author:uid]'] = $node->getOwnerId();
     $tests['[node:author:name]'] = $account->getUsername();
-    $tests['[node:created:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($node->getCreatedTime(), array('langcode' => $this->interfaceLanguage->getId()));
-    $tests['[node:changed:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($node->getChangedTime(), array('langcode' => $this->interfaceLanguage->getId()));
+    $tests['[node:created:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($node->getCreatedTime(), ['langcode' => $this->interfaceLanguage->getId()]);
+    $tests['[node:changed:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($node->getChangedTime(), ['langcode' => $this->interfaceLanguage->getId()]);
 
     $base_bubbleable_metadata = BubbleableMetadata::createFromObject($node);
 
@@ -101,7 +101,7 @@ class NodeTokenReplaceTest extends TokenReplaceKernelTestBase {
 
     foreach ($tests as $input => $expected) {
       $bubbleable_metadata = new BubbleableMetadata();
-      $output = $this->tokenService->replace($input, array('node' => $node), array('langcode' => $this->interfaceLanguage->getId()), $bubbleable_metadata);
+      $output = $this->tokenService->replace($input, ['node' => $node], ['langcode' => $this->interfaceLanguage->getId()], $bubbleable_metadata);
       $this->assertEqual($output, $expected, format_string('Node token %token replaced.', ['%token' => $input]));
       $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
@@ -116,14 +116,14 @@ class NodeTokenReplaceTest extends TokenReplaceKernelTestBase {
     $node->save();
 
     // Generate and test token - use full body as expected value.
-    $tests = array();
+    $tests = [];
     $tests['[node:summary]'] = $node->body->processed;
 
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated for node without a summary.');
 
     foreach ($tests as $input => $expected) {
-      $output = $this->tokenService->replace($input, array('node' => $node), array('language' => $this->interfaceLanguage));
+      $output = $this->tokenService->replace($input, ['node' => $node], ['language' => $this->interfaceLanguage]);
       $this->assertEqual($output, $expected, new FormattableMarkup('Node token %token replaced for node without a summary.', ['%token' => $input]));
     }
   }
diff --git a/web/core/modules/node/tests/src/Kernel/NodeValidationTest.php b/web/core/modules/node/tests/src/Kernel/NodeValidationTest.php
index 9fd646e61..e111faeae 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeValidationTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeValidationTest.php
@@ -18,7 +18,7 @@ class NodeValidationTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * Set the default field storage backend for fields created during tests.
diff --git a/web/core/modules/node/tests/src/Kernel/Plugin/migrate/source/d7/NodeTest.php b/web/core/modules/node/tests/src/Kernel/Plugin/migrate/source/d7/NodeTest.php
index 6b19b9580..da4f57efe 100644
--- a/web/core/modules/node/tests/src/Kernel/Plugin/migrate/source/d7/NodeTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Plugin/migrate/source/d7/NodeTest.php
@@ -27,7 +27,6 @@ class NodeTest extends MigrateSqlSourceTestBase {
     // The source data.
     $tests[0]['source_data']['node'] = [
       [
-        // Node fields.
         'nid' => 1,
         'vid' => 1,
         'type' => 'page',
@@ -44,7 +43,6 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'translate' => 0,
       ],
       [
-        // Node fields.
         'nid' => 2,
         'vid' => 2,
         'type' => 'page',
@@ -61,7 +59,6 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'translate' => 0,
       ],
       [
-        // Node fields.
         'nid' => 5,
         'vid' => 5,
         'type' => 'article',
@@ -77,11 +74,41 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'tnid' => 0,
         'translate' => 0,
       ],
-
+      [
+        'nid' => 6,
+        'vid' => 6,
+        'type' => 'article',
+        'language' => 'en',
+        'title' => 'node title 5',
+        'uid' => 1,
+        'status' => 1,
+        'created' => 1279291908,
+        'changed' => 1279309993,
+        'comment' => 0,
+        'promote' => 1,
+        'sticky' => 0,
+        'tnid' => 6,
+        'translate' => 0,
+      ],
+      [
+        'nid' => 7,
+        'vid' => 7,
+        'type' => 'article',
+        'language' => 'fr',
+        'title' => 'fr - node title 5',
+        'uid' => 1,
+        'status' => 1,
+        'created' => 1279292908,
+        'changed' => 1279310993,
+        'comment' => 0,
+        'promote' => 1,
+        'sticky' => 0,
+        'tnid' => 6,
+        'translate' => 0,
+      ],
     ];
     $tests[0]['source_data']['node_revision'] = [
       [
-        // Node fields.
         'nid' => 1,
         'vid' => 1,
         'uid' => 2,
@@ -94,7 +121,6 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'sticky' => 0,
       ],
       [
-        // Node fields.
         'nid' => 2,
         'vid' => 2,
         'uid' => 2,
@@ -107,7 +133,6 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'sticky' => 0,
       ],
       [
-        // Node fields.
         'nid' => 5,
         'vid' => 5,
         'uid' => 2,
@@ -119,6 +144,31 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'promote' => 1,
         'sticky' => 0,
       ],
+      [
+        'nid' => 6,
+        'vid' => 6,
+        'uid' => 1,
+        'title' => 'node title 5',
+        'log' => '',
+        'timestamp' => 1279309993,
+        'status' => 1,
+        'comment' => 0,
+        'promote' => 1,
+        'sticky' => 0,
+
+      ],
+      [
+        'nid' => 7,
+        'vid' => 7,
+        'uid' => 1,
+        'title' => 'fr - node title 5',
+        'log' => '',
+        'timestamp' => 1279310993,
+        'status' => 1,
+        'comment' => 0,
+        'promote' => 1,
+        'sticky' => 0,
+      ],
     ];
     $tests[0]['source_data']['field_config_instance'] = [
       [
@@ -131,7 +181,7 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'deleted' => '0',
       ],
       [
-        'id' => '2',
+        'id' => '3',
         'field_id' => '2',
         'field_name' => 'body',
         'entity_type' => 'node',
@@ -153,12 +203,59 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'body_summary' => '',
         'body_format' => 'filtered_html',
       ],
+      [
+        'entity_type' => 'node',
+        'bundle' => 'page',
+        'deleted' => '0',
+        'entity_id' => '2',
+        'revision_id' => '2',
+        'language' => 'en',
+        'delta' => '0',
+        'body_value' => 'body 2',
+        'body_summary' => '',
+        'body_format' => 'filtered_html',
+      ],
+      [
+        'entity_type' => 'node',
+        'bundle' => 'page',
+        'deleted' => '0',
+        'entity_id' => '5',
+        'revision_id' => '5',
+        'language' => 'en',
+        'delta' => '0',
+        'body_value' => 'body 5',
+        'body_summary' => '',
+        'body_format' => 'filtered_html',
+      ],
+      [
+        'entity_type' => 'node',
+        'bundle' => 'page',
+        'deleted' => '0',
+        'entity_id' => '6',
+        'revision_id' => '6',
+        'language' => 'en',
+        'delta' => '0',
+        'body_value' => 'body 6',
+        'body_summary' => '',
+        'body_format' => 'filtered_html',
+      ],
+      [
+        'entity_type' => 'node',
+        'bundle' => 'page',
+        'deleted' => '0',
+        'entity_id' => '7',
+        'revision_id' => '7',
+        'language' => 'fr',
+        'delta' => '0',
+        'body_value' => 'fr - body 6',
+        'body_summary' => '',
+        'body_format' => 'filtered_html',
+      ],
     ];
 
     // The expected results.
     $tests[0]['expected_data'] = [
       [
-        // Node fields.
         'nid' => 1,
         'vid' => 1,
         'type' => 'page',
@@ -172,7 +269,7 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'comment' => 2,
         'promote' => 1,
         'sticky' => 0,
-        'tnid' => 0,
+        'tnid' => 1,
         'translate' => 0,
         'log' => '',
         'timestamp' => 1279051598,
@@ -185,7 +282,6 @@ class NodeTest extends MigrateSqlSourceTestBase {
         ],
       ],
       [
-        // Node fields.
         'nid' => 2,
         'vid' => 2,
         'type' => 'page',
@@ -199,13 +295,19 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'comment' => 0,
         'promote' => 1,
         'sticky' => 0,
-        'tnid' => 0,
+        'tnid' => 2,
         'translate' => 0,
         'log' => '',
         'timestamp' => 1279308993,
+        'body' => [
+          [
+            'value' => 'body 2',
+            'summary' => '',
+            'format' => 'filtered_html',
+          ],
+        ],
       ],
       [
-        // Node fields.
         'nid' => 5,
         'vid' => 5,
         'type' => 'article',
@@ -219,10 +321,43 @@ class NodeTest extends MigrateSqlSourceTestBase {
         'comment' => 0,
         'promote' => 1,
         'sticky' => 0,
-        'tnid' => 0,
+        'tnid' => 5,
         'translate' => 0,
         'log' => '',
         'timestamp' => 1279308993,
+        'body' => [
+          [
+            'value' => 'body 5',
+            'summary' => '',
+            'format' => 'filtered_html',
+          ],
+        ],
+      ],
+      [
+        'nid' => 6,
+        'vid' => 6,
+        'type' => 'article',
+        'language' => 'en',
+        'title' => 'node title 5',
+        'node_uid' => 1,
+        'revision_uid' => 1,
+        'status' => 1,
+        'created' => 1279291908,
+        'changed' => 1279309993,
+        'comment' => 0,
+        'promote' => 1,
+        'sticky' => 0,
+        'tnid' => 6,
+        'translate' => 0,
+        'log' => '',
+        'timestamp' => 1279309993,
+        'body' => [
+          [
+            'value' => 'body 6',
+            'summary' => '',
+            'format' => 'filtered_html',
+          ],
+        ],
       ],
     ];
 
diff --git a/web/core/modules/node/tests/src/Kernel/Plugin/migrate/source/d7/NodeTranslationTest.php b/web/core/modules/node/tests/src/Kernel/Plugin/migrate/source/d7/NodeTranslationTest.php
new file mode 100644
index 000000000..e46bd35a3
--- /dev/null
+++ b/web/core/modules/node/tests/src/Kernel/Plugin/migrate/source/d7/NodeTranslationTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Drupal\Tests\node\Kernel\Plugin\migrate\source\d7;
+
+/**
+ * Tests D7 node translation source plugin.
+ *
+ * @covers \Drupal\node\Plugin\migrate\source\d7\Node
+ *
+ * @group node
+ */
+class NodeTranslationTest extends NodeTest {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'user', 'migrate_drupal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    // Get the source data from parent.
+    $tests = parent::providerSource();
+
+    // The expected results.
+    $tests[0]['expected_data'] = [
+      [
+        // Node fields.
+        'nid' => 7,
+        'vid' => 7,
+        'type' => 'article',
+        'language' => 'fr',
+        'title' => 'fr - node title 5',
+        'node_uid' => 1,
+        'revision_uid' => 1,
+        'status' => 1,
+        'created' => 1279292908,
+        'changed' => 1279310993,
+        'comment' => 0,
+        'promote' => 1,
+        'sticky' => 0,
+        'tnid' => 6,
+        'translate' => 0,
+        // Node revision fields.
+        'log' => '',
+        'timestamp' => 1279310993,
+        'body' => [
+          [
+            'value' => 'fr - body 6',
+            'summary' => '',
+            'format' => 'filtered_html',
+          ],
+        ],
+      ],
+    ];
+
+    // Do an automatic count.
+    $tests[0]['expected_count'] = NULL;
+
+    // Set up source plugin configuration.
+    $tests[0]['configuration'] = [
+      'translations' => TRUE,
+    ];
+
+    return $tests;
+  }
+
+}
diff --git a/web/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php b/web/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php
index 6b28409e9..eb92f8cb0 100644
--- a/web/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php
+++ b/web/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php
@@ -25,7 +25,7 @@ class NodeBulkFormTest extends UnitTestCase {
    * Tests the constructor assignment of actions.
    */
   public function testConstructor() {
-    $actions = array();
+    $actions = [];
 
     for ($i = 1; $i <= 2; $i++) {
       $action = $this->getMock('\Drupal\system\ActionConfigEntityInterface');
@@ -60,7 +60,7 @@ class NodeBulkFormTest extends UnitTestCase {
     $views_data->expects($this->any())
       ->method('get')
       ->with('node')
-      ->will($this->returnValue(array('table' => array('entity type' => 'node'))));
+      ->will($this->returnValue(['table' => ['entity type' => 'node']]));
     $container = new ContainerBuilder();
     $container->set('views.views_data', $views_data);
     $container->set('string_translation', $this->getStringTranslationStub());
@@ -82,9 +82,9 @@ class NodeBulkFormTest extends UnitTestCase {
       ->getMock();
 
     $definition['title'] = '';
-    $options = array();
+    $options = [];
 
-    $node_bulk_form = new NodeBulkForm(array(), 'node_bulk_form', $definition, $entity_manager, $language_manager);
+    $node_bulk_form = new NodeBulkForm([], 'node_bulk_form', $definition, $entity_manager, $language_manager);
     $node_bulk_form->init($executable, $display, $options);
 
     $this->assertAttributeEquals(array_slice($actions, 0, -1, TRUE), 'actions', $node_bulk_form);
diff --git a/web/core/modules/options/options.api.php b/web/core/modules/options/options.api.php
index 28ac77114..0f52b2bef 100644
--- a/web/core/modules/options/options.api.php
+++ b/web/core/modules/options/options.api.php
@@ -81,21 +81,21 @@ function hook_options_list_alter(array &$options, array $context) {
  */
 function callback_allowed_values_function(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL, &$cacheable = TRUE) {
   if (isset($entity) && ($entity->bundle() == 'not_a_programmer')) {
-    $values = array(
+    $values = [
       1 => 'One',
       2 => 'Two',
-    );
+    ];
   }
   else {
-    $values = array(
-      'Group 1' => array(
+    $values = [
+      'Group 1' => [
         0 => 'Zero',
         1 => 'One',
-      ),
-      'Group 2' => array(
+      ],
+      'Group 2' => [
         2 => 'Two',
-      ),
-    );
+      ],
+    ];
   }
 
   return $values;
diff --git a/web/core/modules/options/options.module b/web/core/modules/options/options.module
index 204160765..7cf363552 100644
--- a/web/core/modules/options/options.module
+++ b/web/core/modules/options/options.module
@@ -19,11 +19,11 @@ function options_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.options':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Options module allows you to create fields where data values are selected from a fixed list of options. Usually these items are entered through a select list, checkboxes, or radio buttons. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":options_do">online documentation for the Options module</a>.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':options_do' => 'https://www.drupal.org/documentation/modules/options')) . '</p>';
+      $output .= '<p>' . t('The Options module allows you to create fields where data values are selected from a fixed list of options. Usually these items are entered through a select list, checkboxes, or radio buttons. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":options_do">online documentation for the Options module</a>.', [':field' => \Drupal::url('help.page', ['name' => 'field']), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#', ':options_do' => 'https://www.drupal.org/documentation/modules/options']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing and displaying list fields') . '</dt>';
-      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the list fields can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the list fields can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', [':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Defining option keys and labels') . '</dt>';
       $output .= '<dd>' . t('When you define the list options you can define a key and a label for each option in the list. The label will be shown to the users while the key gets stored in the database.') . '</dd>';
       $output .= '<dt>' . t('Choosing list field type') . '</dt>';
@@ -70,9 +70,9 @@ function options_field_storage_config_delete(FieldStorageConfigInterface $field_
  * @see callback_allowed_values_function()
  */
 function options_allowed_values(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL) {
-  $allowed_values = &drupal_static(__FUNCTION__, array());
+  $allowed_values = &drupal_static(__FUNCTION__, []);
 
-  $cache_keys = array($definition->getTargetEntityTypeId(), $definition->getName());
+  $cache_keys = [$definition->getTargetEntityTypeId(), $definition->getName()];
   if ($entity) {
     $cache_keys[] = 'entity';
   }
@@ -112,7 +112,7 @@ function options_field_storage_config_update_forbid(FieldStorageConfigInterface
     $prior_allowed_values = $prior_field_storage->getSetting('allowed_values');
     $lost_keys = array_keys(array_diff_key($prior_allowed_values, $allowed_values));
     if (_options_values_in_use($field_storage->getTargetEntityTypeId(), $field_storage->getName(), $lost_keys)) {
-      throw new FieldStorageDefinitionUpdateForbiddenException(t('A list field (@field_name) with existing data cannot have its keys changed.', array('@field_name' => $field_storage->getName())));
+      throw new FieldStorageDefinitionUpdateForbiddenException(t('A list field (@field_name) with existing data cannot have its keys changed.', ['@field_name' => $field_storage->getName()]));
     }
   }
 }
diff --git a/web/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php b/web/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php
index bc1dba19c..ba1ba9c2b 100644
--- a/web/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php
+++ b/web/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsDefaultFormatter.php
@@ -29,7 +29,7 @@ class OptionsDefaultFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     // Only collect allowed options if there are actually items to display.
     if ($items->count()) {
@@ -44,10 +44,10 @@ class OptionsDefaultFormatter extends FormatterBase {
         // If the stored value is in the current set of allowed values, display
         // the associated label, otherwise just display the raw value.
         $output = isset($options[$value]) ? $options[$value] : $value;
-        $elements[$delta] = array(
+        $elements[$delta] = [
           '#markup' => $output,
           '#allowed_tags' => FieldFilteredMarkup::allowedTags(),
-        );
+        ];
       }
     }
 
diff --git a/web/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php b/web/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php
index 2b83b1506..64f22e9b4 100644
--- a/web/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php
+++ b/web/core/modules/options/src/Plugin/Field/FieldFormatter/OptionsKeyFormatter.php
@@ -28,13 +28,13 @@ class OptionsKeyFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($items as $delta => $item) {
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#markup' => $item->value,
         '#allowed_tags' => FieldFilteredMarkup::allowedTags(),
-      );
+      ];
     }
 
     return $elements;
diff --git a/web/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php b/web/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
index 254207d5e..416f7dc2e 100644
--- a/web/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
+++ b/web/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
@@ -34,16 +34,16 @@ class ListFloatItem extends ListItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'float',
-        ),
-      ),
-      'indexes' => array(
-        'value' => array('value'),
-      ),
-    );
+        ],
+      ],
+      'indexes' => [
+        'value' => ['value'],
+      ],
+    ];
   }
 
   /**
@@ -55,7 +55,7 @@ class ListFloatItem extends ListItemBase {
     $description .= '<br/>' . t('The label is optional: if a line contains a single number, it will be used as key and label.');
     $description .= '<br/>' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
     $description .= '</p>';
-    $description .= '<p>' . t('Allowed HTML tags in labels: @tags', array('@tags' => $this->displayAllowedTags())) . '</p>';
+    $description .= '<p>' . t('Allowed HTML tags in labels: @tags', ['@tags' => $this->displayAllowedTags()]) . '</p>';
     return $description;
   }
 
@@ -90,7 +90,7 @@ class ListFloatItem extends ListItemBase {
    * {@inheritdoc}
    */
   public static function simplifyAllowedValues(array $structured_values) {
-    $values = array();
+    $values = [];
     foreach ($structured_values as $item) {
       // Nested elements are embedded in the label.
       if (is_array($item['label'])) {
diff --git a/web/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php b/web/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
index 719ae4871..b8a420480 100644
--- a/web/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
+++ b/web/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
@@ -34,16 +34,16 @@ class ListIntegerItem extends ListItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'int',
-        ),
-      ),
-      'indexes' => array(
-        'value' => array('value'),
-      ),
-    );
+        ],
+      ],
+      'indexes' => [
+        'value' => ['value'],
+      ],
+    ];
   }
 
   /**
@@ -55,7 +55,7 @@ class ListIntegerItem extends ListItemBase {
     $description .= '<br/>' . t('The label is optional: if a line contains a single number, it will be used as key and label.');
     $description .= '<br/>' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
     $description .= '</p>';
-    $description .= '<p>' . t('Allowed HTML tags in labels: @tags', array('@tags' => $this->displayAllowedTags())) . '</p>';
+    $description .= '<p>' . t('Allowed HTML tags in labels: @tags', ['@tags' => $this->displayAllowedTags()]) . '</p>';
     return $description;
   }
 
diff --git a/web/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php b/web/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
index 4527ca361..c7c2b16e9 100644
--- a/web/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
+++ b/web/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
@@ -21,10 +21,10 @@ abstract class ListItemBase extends FieldItemBase implements OptionsProviderInte
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
-      'allowed_values' => array(),
+    return [
+      'allowed_values' => [],
       'allowed_values_function' => '',
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
@@ -85,28 +85,28 @@ abstract class ListItemBase extends FieldItemBase implements OptionsProviderInte
     $allowed_values = $this->getSetting('allowed_values');
     $allowed_values_function = $this->getSetting('allowed_values_function');
 
-    $element['allowed_values'] = array(
+    $element['allowed_values'] = [
       '#type' => 'textarea',
       '#title' => t('Allowed values list'),
       '#default_value' => $this->allowedValuesString($allowed_values),
       '#rows' => 10,
       '#access' => empty($allowed_values_function),
-      '#element_validate' => array(array(get_class($this), 'validateAllowedValues')),
+      '#element_validate' => [[get_class($this), 'validateAllowedValues']],
       '#field_has_data' => $has_data,
       '#field_name' => $this->getFieldDefinition()->getName(),
       '#entity_type' => $this->getEntity()->getEntityTypeId(),
       '#allowed_values' => $allowed_values,
-    );
+    ];
 
     $element['allowed_values']['#description'] = $this->allowedValuesDescription();
 
-    $element['allowed_values_function'] = array(
+    $element['allowed_values_function'] = [
       '#type' => 'item',
       '#title' => t('Allowed values list'),
-      '#markup' => t('The value of this field is being determined by the %function function and may not be changed.', array('%function' => $allowed_values_function)),
+      '#markup' => t('The value of this field is being determined by the %function function and may not be changed.', ['%function' => $allowed_values_function]),
       '#access' => !empty($allowed_values_function),
       '#value' => $allowed_values_function,
-    );
+    ];
 
     return $element;
   }
@@ -171,7 +171,7 @@ abstract class ListItemBase extends FieldItemBase implements OptionsProviderInte
    * @see \Drupal\options\Plugin\Field\FieldType\ListItemBase::allowedValuesString()
    */
   protected static function extractAllowedValues($string, $has_data) {
-    $values = array();
+    $values = [];
 
     $list = explode("\n", $string);
     $list = array_map('trim', $list);
@@ -180,7 +180,7 @@ abstract class ListItemBase extends FieldItemBase implements OptionsProviderInte
     $generated_keys = $explicit_keys = FALSE;
     foreach ($list as $position => $text) {
       // Check for an explicit key.
-      $matches = array();
+      $matches = [];
       if (preg_match('/(.*)\|(.*)/', $text, $matches)) {
         // Trim key and value to avoid unwanted spaces issues.
         $key = trim($matches[1]);
@@ -239,7 +239,7 @@ abstract class ListItemBase extends FieldItemBase implements OptionsProviderInte
    *    - Each value is in the format "value|label" or "value".
    */
   protected function allowedValuesString($values) {
-    $lines = array();
+    $lines = [];
     foreach ($values as $key => $value) {
       $lines[] = "$key|$value";
     }
@@ -280,7 +280,7 @@ abstract class ListItemBase extends FieldItemBase implements OptionsProviderInte
    * @see \Drupal\options\Plugin\Field\FieldType\ListItemBase::structureAllowedValues()
    */
   protected static function simplifyAllowedValues(array $structured_values) {
-    $values = array();
+    $values = [];
     foreach ($structured_values as $item) {
       if (is_array($item['label'])) {
         // Nested elements are embedded in the label.
@@ -305,15 +305,15 @@ abstract class ListItemBase extends FieldItemBase implements OptionsProviderInte
    * @see \Drupal\options\Plugin\Field\FieldType\ListItemBase::simplifyAllowedValues()
    */
   protected static function structureAllowedValues(array $values) {
-    $structured_values = array();
+    $structured_values = [];
     foreach ($values as $value => $label) {
       if (is_array($label)) {
         $label = static::structureAllowedValues($label);
       }
-      $structured_values[] = array(
+      $structured_values[] = [
         'value' => static::castAllowedValue($value),
         'label' => $label,
-      );
+      ];
     }
     return $structured_values;
   }
diff --git a/web/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php b/web/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
index f5440ab31..1f8caeaf3 100644
--- a/web/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
+++ b/web/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
@@ -26,7 +26,7 @@ class ListStringItem extends ListItemBase {
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('string')
       ->setLabel(t('Text value'))
-      ->addConstraint('Length', array('max' => 255))
+      ->addConstraint('Length', ['max' => 255])
       ->setRequired(TRUE);
 
     return $properties;
@@ -36,17 +36,17 @@ class ListStringItem extends ListItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
           'length' => 255,
-        ),
-      ),
-      'indexes' => array(
-        'value' => array('value'),
-      ),
-    );
+        ],
+      ],
+      'indexes' => [
+        'value' => ['value'],
+      ],
+    ];
   }
 
   /**
@@ -57,7 +57,7 @@ class ListStringItem extends ListItemBase {
     $description .= '<br/>' . t('The key is the stored value. The label will be used in displayed values and edit forms.');
     $description .= '<br/>' . t('The label is optional: if a line contains a single string, it will be used as key and label.');
     $description .= '</p>';
-    $description .= '<p>' . t('Allowed HTML tags in labels: @tags', array('@tags' => $this->displayAllowedTags())) . '</p>';
+    $description .= '<p>' . t('Allowed HTML tags in labels: @tags', ['@tags' => $this->displayAllowedTags()]) . '</p>';
     return $description;
   }
 
diff --git a/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml b/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml
index 19a2ef707..ff5f0ec27 100644
--- a/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml
+++ b/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml
@@ -14,6 +14,7 @@ content:
   title:
     type: string_textfield
     weight: -5
+    region: content
     settings:
       size: 60
       placeholder: ''
@@ -21,6 +22,7 @@ content:
   uid:
     type: entity_reference_autocomplete
     weight: 5
+    region: content
     settings:
       match_operator: CONTAINS
       size: 60
@@ -29,6 +31,7 @@ content:
   created:
     type: datetime_timestamp
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
   promote:
@@ -36,16 +39,19 @@ content:
     settings:
       display_label: true
     weight: 15
+    region: content
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 16
+    region: content
     third_party_settings: {  }
   body:
     type: text_textarea_with_summary
     weight: 26
+    region: content
     settings:
       rows: 9
       summary_rows: 3
diff --git a/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml b/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
index c107b1017..aaea1cb90 100644
--- a/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
+++ b/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.default.yml
@@ -14,10 +14,12 @@ mode: default
 content:
   links:
     weight: 100
+    region: content
   body:
     label: hidden
     type: text_default
     weight: 101
+    region: content
     settings: {  }
     third_party_settings: {  }
 hidden:
diff --git a/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml b/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
index 3b472a7dc..6e79af94e 100644
--- a/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
+++ b/web/core/modules/options/tests/options_config_install_test/config/install/core.entity_view_display.node.options_install_test.teaser.yml
@@ -15,10 +15,12 @@ mode: teaser
 content:
   links:
     weight: 100
+    region: content
   body:
     label: hidden
     type: text_summary_or_trimmed
     weight: 101
+    region: content
     settings:
       trim_length: 600
     third_party_settings: {  }
diff --git a/web/core/modules/options/tests/options_test/options_test.module b/web/core/modules/options/tests/options_test/options_test.module
index d20401af6..dbb474b49 100644
--- a/web/core/modules/options/tests/options_test/options_test.module
+++ b/web/core/modules/options/tests/options_test/options_test.module
@@ -14,18 +14,18 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface;
  * @see options_allowed_values()
  */
 function options_test_allowed_values_callback(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL) {
-  $values = array(
-    'Group 1' => array(
+  $values = [
+    'Group 1' => [
       0 => 'Zero',
-    ),
+    ],
     1 => 'One',
-    'Group 2' => array(
+    'Group 2' => [
       2 => 'Some <script>dangerous</script> & unescaped <strong>markup</strong>',
-    ),
-    'More <script>dangerous</script> markup' => array(
+    ],
+    'More <script>dangerous</script> markup' => [
       3 => 'Three',
-    ),
-  );
+    ],
+  ];
 
   return $values;
 }
@@ -41,15 +41,15 @@ function options_test_allowed_values_callback(FieldStorageDefinitionInterface $d
  * @see options_allowed_values()
  */
 function options_test_dynamic_values_callback(FieldStorageDefinitionInterface $definition, FieldableEntityInterface $entity = NULL, &$cacheable = NULL) {
-  $values = array();
+  $values = [];
   if (isset($entity)) {
     $cacheable = FALSE;
-    $values = array(
+    $values = [
       $entity->label(),
       $entity->url(),
       $entity->uuid(),
       $entity->bundle(),
-    );
+    ];
   }
   // We need the values of the entity as keys.
   return array_combine($values, $values);
diff --git a/web/core/modules/options/src/Tests/OptionsDynamicValuesApiTest.php b/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesApiTest.php
similarity index 91%
rename from web/core/modules/options/src/Tests/OptionsDynamicValuesApiTest.php
rename to web/core/modules/options/tests/src/Functional/OptionsDynamicValuesApiTest.php
index 081696a69..a96fd7a04 100644
--- a/web/core/modules/options/src/Tests/OptionsDynamicValuesApiTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesApiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 /**
 * Tests the options allowed values api.
@@ -21,12 +21,12 @@ class OptionsDynamicValuesApiTest extends OptionsDynamicValuesTestBase {
 
     $values = options_allowed_values($this->fieldStorage, $this->entity);
 
-    $expected_values = array(
+    $expected_values = [
       $this->entity->label(),
       $this->entity->url(),
       $this->entity->uuid(),
       $this->entity->bundle(),
-    );
+    ];
     $expected_values = array_combine($expected_values, $expected_values);
     $this->assertEqual($expected_values, $values);
   }
diff --git a/web/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php b/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
similarity index 97%
rename from web/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php
rename to web/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
index 2d3f0fbed..64e90104c 100644
--- a/web/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Tests\FieldTestBase;
diff --git a/web/core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php b/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesValidationTest.php
similarity index 90%
rename from web/core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php
rename to web/core/modules/options/tests/src/Functional/OptionsDynamicValuesValidationTest.php
index 0ad479b8f..9205011ed 100644
--- a/web/core/modules/options/src/Tests/OptionsDynamicValuesValidationTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesValidationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 /**
  * Tests the Options field allowed values function.
@@ -11,7 +11,7 @@ class OptionsDynamicValuesValidationTest extends OptionsDynamicValuesTestBase {
   /**
    * Test that allowed values function gets the entity.
    */
-  function testDynamicAllowedValues() {
+  public function testDynamicAllowedValues() {
     // Verify that validation passes against every value we had.
     foreach ($this->test as $key => $value) {
       $this->entity->test_options->value = $value;
diff --git a/web/core/modules/options/src/Tests/OptionsFieldUITest.php b/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
similarity index 82%
rename from web/core/modules/options/src/Tests/OptionsFieldUITest.php
rename to web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
index d2c11f012..836740dc4 100644
--- a/web/core/modules/options/src/Tests/OptionsFieldUITest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -18,7 +18,7 @@ class OptionsFieldUITest extends FieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'options', 'field_test', 'taxonomy', 'field_ui');
+  public static $modules = ['node', 'options', 'field_test', 'taxonomy', 'field_ui'];
 
   /**
    * The name of the created content type.
@@ -64,21 +64,21 @@ class OptionsFieldUITest extends FieldTestBase {
   /**
    * Options (integer) : test 'allowed values' input.
    */
-  function testOptionsAllowedValuesInteger() {
+  public function testOptionsAllowedValuesInteger() {
     $this->fieldName = 'field_options_integer';
     $this->createOptionsField('list_integer');
 
     // Flat list of textual values.
     $string = "Zero\nOne";
-    $array = array('0' => 'Zero', '1' => 'One');
+    $array = ['0' => 'Zero', '1' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Unkeyed lists are accepted.');
     // Explicit integer keys.
     $string = "0|Zero\n2|Two";
-    $array = array('0' => 'Zero', '2' => 'Two');
+    $array = ['0' => 'Zero', '2' => 'Two'];
     $this->assertAllowedValuesInput($string, $array, 'Integer keys are accepted.');
     // Check that values can be added and removed.
     $string = "0|Zero\n1|One";
-    $array = array('0' => 'Zero', '1' => 'One');
+    $array = ['0' => 'Zero', '1' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Values can be added and removed.');
     // Non-integer keys.
     $this->assertAllowedValuesInput("1.1|One", 'keys must be integers', 'Non integer keys are rejected.');
@@ -87,10 +87,10 @@ class OptionsFieldUITest extends FieldTestBase {
     $this->assertAllowedValuesInput("Zero\n1|One", 'invalid input', 'Mixed lists are rejected.');
 
     // Create a node with actual data for the field.
-    $settings = array(
+    $settings = [
       'type' => $this->type,
-      $this->fieldName => array(array('value' => 1)),
-    );
+      $this->fieldName => [['value' => 1]],
+    ];
     $node = $this->drupalCreateNode($settings);
 
     // Check that a flat list of values is rejected once the field has data.
@@ -98,43 +98,43 @@ class OptionsFieldUITest extends FieldTestBase {
 
     // Check that values can be added but values in use cannot be removed.
     $string = "0|Zero\n1|One\n2|Two";
-    $array = array('0' => 'Zero', '1' => 'One', '2' => 'Two');
+    $array = ['0' => 'Zero', '1' => 'One', '2' => 'Two'];
     $this->assertAllowedValuesInput($string, $array, 'Values can be added.');
     $string = "0|Zero\n1|One";
-    $array = array('0' => 'Zero', '1' => 'One');
+    $array = ['0' => 'Zero', '1' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.');
     $this->assertAllowedValuesInput("0|Zero", 'some values are being removed while currently in use', 'Values in use cannot be removed.');
 
     // Delete the node, remove the value.
     $node->delete();
     $string = "0|Zero";
-    $array = array('0' => 'Zero');
+    $array = ['0' => 'Zero'];
     $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.');
 
     // Check that the same key can only be used once.
     $string = "0|Zero\n0|One";
-    $array = array('0' => 'One');
+    $array = ['0' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Same value cannot be used multiple times.');
   }
 
   /**
    * Options (float) : test 'allowed values' input.
    */
-  function testOptionsAllowedValuesFloat() {
+  public function testOptionsAllowedValuesFloat() {
     $this->fieldName = 'field_options_float';
     $this->createOptionsField('list_float');
 
     // Flat list of textual values.
     $string = "Zero\nOne";
-    $array = array('0' => 'Zero', '1' => 'One');
+    $array = ['0' => 'Zero', '1' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Unkeyed lists are accepted.');
     // Explicit numeric keys.
     $string = "0|Zero\n.5|Point five";
-    $array = array('0' => 'Zero', '0.5' => 'Point five');
+    $array = ['0' => 'Zero', '0.5' => 'Point five'];
     $this->assertAllowedValuesInput($string, $array, 'Integer keys are accepted.');
     // Check that values can be added and removed.
     $string = "0|Zero\n.5|Point five\n1.0|One";
-    $array = array('0' => 'Zero', '0.5' => 'Point five', '1' => 'One');
+    $array = ['0' => 'Zero', '0.5' => 'Point five', '1' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Values can be added and removed.');
     // Non-numeric keys.
     $this->assertAllowedValuesInput("abc|abc\n", 'each key must be a valid integer or decimal', 'Non numeric keys are rejected.');
@@ -142,10 +142,10 @@ class OptionsFieldUITest extends FieldTestBase {
     $this->assertAllowedValuesInput("Zero\n1|One\n", 'invalid input', 'Mixed lists are rejected.');
 
     // Create a node with actual data for the field.
-    $settings = array(
+    $settings = [
       'type' => $this->type,
-      $this->fieldName => array(array('value' => .5)),
-    );
+      $this->fieldName => [['value' => .5]],
+    ];
     $node = $this->drupalCreateNode($settings);
 
     // Check that a flat list of values is rejected once the field has data.
@@ -153,105 +153,105 @@ class OptionsFieldUITest extends FieldTestBase {
 
     // Check that values can be added but values in use cannot be removed.
     $string = "0|Zero\n.5|Point five\n2|Two";
-    $array = array('0' => 'Zero', '0.5' => 'Point five', '2' => 'Two');
+    $array = ['0' => 'Zero', '0.5' => 'Point five', '2' => 'Two'];
     $this->assertAllowedValuesInput($string, $array, 'Values can be added.');
     $string = "0|Zero\n.5|Point five";
-    $array = array('0' => 'Zero', '0.5' => 'Point five');
+    $array = ['0' => 'Zero', '0.5' => 'Point five'];
     $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.');
     $this->assertAllowedValuesInput("0|Zero", 'some values are being removed while currently in use', 'Values in use cannot be removed.');
 
     // Delete the node, remove the value.
     $node->delete();
     $string = "0|Zero";
-    $array = array('0' => 'Zero');
+    $array = ['0' => 'Zero'];
     $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.');
 
     // Check that the same key can only be used once.
     $string = "0.5|Point five\n0.5|Half";
-    $array = array('0.5' => 'Half');
+    $array = ['0.5' => 'Half'];
     $this->assertAllowedValuesInput($string, $array, 'Same value cannot be used multiple times.');
 
     // Check that different forms of the same float value cannot be used.
     $string = "0|Zero\n.5|Point five\n0.5|Half";
-    $array = array('0' => 'Zero', '0.5' => 'Half');
+    $array = ['0' => 'Zero', '0.5' => 'Half'];
     $this->assertAllowedValuesInput($string, $array, 'Different forms of the same value cannot be used.');
   }
 
   /**
    * Options (text) : test 'allowed values' input.
    */
-  function testOptionsAllowedValuesText() {
+  public function testOptionsAllowedValuesText() {
     $this->fieldName = 'field_options_text';
     $this->createOptionsField('list_string');
 
     // Flat list of textual values.
     $string = "Zero\nOne";
-    $array = array('Zero' => 'Zero', 'One' => 'One');
+    $array = ['Zero' => 'Zero', 'One' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Unkeyed lists are accepted.');
     // Explicit keys.
     $string = "zero|Zero\none|One";
-    $array = array('zero' => 'Zero', 'one' => 'One');
+    $array = ['zero' => 'Zero', 'one' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Explicit keys are accepted.');
     // Check that values can be added and removed.
     $string = "zero|Zero\ntwo|Two";
-    $array = array('zero' => 'Zero', 'two' => 'Two');
+    $array = ['zero' => 'Zero', 'two' => 'Two'];
     $this->assertAllowedValuesInput($string, $array, 'Values can be added and removed.');
     // Mixed list of keyed and unkeyed values.
     $string = "zero|Zero\nOne\n";
-    $array = array('zero' => 'Zero', 'One' => 'One');
+    $array = ['zero' => 'Zero', 'One' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Mixed lists are accepted.');
     // Overly long keys.
     $this->assertAllowedValuesInput("zero|Zero\n" . $this->randomMachineName(256) . "|One", 'each key must be a string at most 255 characters long', 'Overly long keys are rejected.');
 
     // Create a node with actual data for the field.
-    $settings = array(
+    $settings = [
       'type' => $this->type,
-      $this->fieldName => array(array('value' => 'One')),
-    );
+      $this->fieldName => [['value' => 'One']],
+    ];
     $node = $this->drupalCreateNode($settings);
 
     // Check that flat lists of values are still accepted once the field has
     // data.
     $string = "Zero\nOne";
-    $array = array('Zero' => 'Zero', 'One' => 'One');
+    $array = ['Zero' => 'Zero', 'One' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Unkeyed lists are still accepted once the field has data.');
 
     // Check that values can be added but values in use cannot be removed.
     $string = "Zero\nOne\nTwo";
-    $array = array('Zero' => 'Zero', 'One' => 'One', 'Two' => 'Two');
+    $array = ['Zero' => 'Zero', 'One' => 'One', 'Two' => 'Two'];
     $this->assertAllowedValuesInput($string, $array, 'Values can be added.');
     $string = "Zero\nOne";
-    $array = array('Zero' => 'Zero', 'One' => 'One');
+    $array = ['Zero' => 'Zero', 'One' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.');
     $this->assertAllowedValuesInput("Zero", 'some values are being removed while currently in use', 'Values in use cannot be removed.');
 
     // Delete the node, remove the value.
     $node->delete();
     $string = "Zero";
-    $array = array('Zero' => 'Zero');
+    $array = ['Zero' => 'Zero'];
     $this->assertAllowedValuesInput($string, $array, 'Values not in use can be removed.');
 
     // Check that string values with dots can be used.
     $string = "Zero\nexample.com|Example";
-    $array = array('Zero' => 'Zero', 'example.com' => 'Example');
+    $array = ['Zero' => 'Zero', 'example.com' => 'Example'];
     $this->assertAllowedValuesInput($string, $array, 'String value with dot is supported.');
 
     // Check that the same key can only be used once.
     $string = "zero|Zero\nzero|One";
-    $array = array('zero' => 'One');
+    $array = ['zero' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Same value cannot be used multiple times.');
   }
 
   /**
    * Options (text) : test 'trimmed values' input.
    */
-  function testOptionsTrimmedValuesText() {
+  public function testOptionsTrimmedValuesText() {
     $this->fieldName = 'field_options_trimmed_text';
     $this->createOptionsField('list_string');
 
     // Explicit keys.
     $string = "zero |Zero\none | One";
-    $array = array('zero' => 'Zero', 'one' => 'One');
+    $array = ['zero' => 'Zero', 'one' => 'One'];
     $this->assertAllowedValuesInput($string, $array, 'Explicit keys are accepted and trimmed.');
   }
 
@@ -263,11 +263,11 @@ class OptionsFieldUITest extends FieldTestBase {
    */
   protected function createOptionsField($type) {
     // Create a field.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => $type,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
@@ -291,8 +291,8 @@ class OptionsFieldUITest extends FieldTestBase {
    * @param $message
    *   Message to display.
    */
-  function assertAllowedValuesInput($input_string, $result, $message) {
-    $edit = array('settings[allowed_values]' => $input_string);
+  public function assertAllowedValuesInput($input_string, $result, $message) {
+    $edit = ['settings[allowed_values]' => $input_string];
     $this->drupalPostForm($this->adminPath, $edit, t('Save field settings'));
     $this->assertNoRaw('&amp;lt;', 'The page does not have double escaped HTML tags.');
 
@@ -308,34 +308,35 @@ class OptionsFieldUITest extends FieldTestBase {
   /**
    * Tests normal and key formatter display on node display.
    */
-  function testNodeDisplay() {
+  public function testNodeDisplay() {
     $this->fieldName = strtolower($this->randomMachineName());
     $this->createOptionsField('list_integer');
-    $node = $this->drupalCreateNode(array('type' => $this->type));
+    $node = $this->drupalCreateNode(['type' => $this->type]);
 
     $on = $this->randomMachineName();
     $off = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'settings[allowed_values]' =>
         "1|$on
         0|$off",
-    );
+    ];
 
     $this->drupalPostForm($this->adminPath, $edit, t('Save field settings'));
-    $this->assertText(format_string('Updated field @field_name field settings.', array('@field_name' => $this->fieldName)), "The 'On' and 'Off' form fields work for boolean fields.");
+    $this->assertText(format_string('Updated field @field_name field settings.', ['@field_name' => $this->fieldName]), "The 'On' and 'Off' form fields work for boolean fields.");
 
     // Select a default value.
-    $edit = array(
+    $edit = [
       $this->fieldName => '1',
-    );
+    ];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check the node page and see if the values are correct.
-    $file_formatters = array('list_default', 'list_key');
+    $file_formatters = ['list_default', 'list_key'];
     foreach ($file_formatters as $formatter) {
-      $edit = array(
+      $edit = [
         "fields[$this->fieldName][type]" => $formatter,
-      );
+        "fields[$this->fieldName][region]" => 'content',
+      ];
       $this->drupalPostForm('admin/structure/types/manage/' . $this->typeName . '/display', $edit, t('Save'));
       $this->drupalGet('node/' . $node->id());
 
diff --git a/web/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php b/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
similarity index 72%
rename from web/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php
rename to web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
index 7b642e8f1..befd48e42 100644
--- a/web/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -18,13 +18,13 @@ class OptionsFloatFieldImportTest extends FieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'options', 'field_ui', 'config', 'options_config_install_test');
+  public static $modules = ['node', 'options', 'field_ui', 'config', 'options_config_install_test'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create test user.
-    $admin_user = $this->drupalCreateUser(array('synchronize configuration', 'access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'bypass node access', 'administer node fields', 'administer node display'));
+    $admin_user = $this->drupalCreateUser(['synchronize configuration', 'access content', 'access administration pages', 'administer site configuration', 'administer content types', 'administer nodes', 'bypass node access', 'administer node fields', 'administer node display']);
     $this->drupalLogin($admin_user);
   }
 
@@ -39,7 +39,7 @@ class OptionsFloatFieldImportTest extends FieldTestBase {
     // necessary configuration for this test is created by installing that
     // module.
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
-    $this->assertIdentical($field_storage->getSetting('allowed_values'), $array = array('0' => 'Zero', '0.5' => 'Point five'));
+    $this->assertIdentical($field_storage->getSetting('allowed_values'), $array = ['0' => 'Zero', '0.5' => 'Point five']);
 
     $admin_path = 'admin/structure/types/manage/' . $type . '/fields/node.' . $type . '.' . $field_name . '/storage';
 
@@ -47,26 +47,26 @@ class OptionsFloatFieldImportTest extends FieldTestBase {
     $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
 
     // Set the active to not use dots in the allowed values key names.
-    $edit = array('settings[allowed_values]' => "0|Zero\n1|One");
+    $edit = ['settings[allowed_values]' => "0|Zero\n1|One"];
     $this->drupalPostForm($admin_path, $edit, t('Save field settings'));
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
-    $this->assertIdentical($field_storage->getSetting('allowed_values'), $array = array('0' => 'Zero', '1' => 'One'));
+    $this->assertIdentical($field_storage->getSetting('allowed_values'), $array = ['0' => 'Zero', '1' => 'One']);
 
     // Import configuration with dots in the allowed values key names. This
     // tests \Drupal\Core\Config\Entity\ConfigEntityStorage::importUpdate().
     $this->drupalGet('admin/config/development/configuration');
-    $this->drupalPostForm(NULL, array(), t('Import all'));
+    $this->drupalPostForm(NULL, [], t('Import all'));
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
-    $this->assertIdentical($field_storage->getSetting('allowed_values'), $array = array('0' => 'Zero', '0.5' => 'Point five'));
+    $this->assertIdentical($field_storage->getSetting('allowed_values'), $array = ['0' => 'Zero', '0.5' => 'Point five']);
 
     // Delete field to test creation. This tests
     // \Drupal\Core\Config\Entity\ConfigEntityStorage::importCreate().
     FieldConfig::loadByName('node', $type, $field_name)->delete();
 
     $this->drupalGet('admin/config/development/configuration');
-    $this->drupalPostForm(NULL, array(), t('Import all'));
+    $this->drupalPostForm(NULL, [], t('Import all'));
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
-    $this->assertIdentical($field_storage->getSetting('allowed_values'), $array = array('0' => 'Zero', '0.5' => 'Point five'));
+    $this->assertIdentical($field_storage->getSetting('allowed_values'), $array = ['0' => 'Zero', '0.5' => 'Point five']);
   }
 
 }
diff --git a/web/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php b/web/core/modules/options/tests/src/Functional/OptionsSelectDynamicValuesTest.php
similarity index 81%
rename from web/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php
rename to web/core/modules/options/tests/src/Functional/OptionsSelectDynamicValuesTest.php
index df3365ca0..b661c0d53 100644
--- a/web/core/modules/options/src/Tests/OptionsSelectDynamicValuesTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsSelectDynamicValuesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 /**
  * Tests an options select with a dynamic allowed values function.
@@ -11,12 +11,12 @@ class OptionsSelectDynamicValuesTest extends OptionsDynamicValuesTestBase {
   /**
    * Tests the 'options_select' widget (single select).
    */
-  function testSelectListDynamic() {
+  public function testSelectListDynamic() {
     // Create an entity.
     $this->entity->save();
 
     // Create a web user.
-    $web_user = $this->drupalCreateUser(array('view test entity', 'administer entity_test content'));
+    $web_user = $this->drupalCreateUser(['view test entity', 'administer entity_test content']);
     $this->drupalLogin($web_user);
 
     // Display form.
diff --git a/web/core/modules/options/src/Tests/OptionsWidgetsTest.php b/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
similarity index 81%
rename from web/core/modules/options/src/Tests/OptionsWidgetsTest.php
rename to web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
index 23f0f0da2..a2157f1f9 100644
--- a/web/core/modules/options/src/Tests/OptionsWidgetsTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\options\Tests;
+namespace Drupal\Tests\options\Functional;
 
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
@@ -84,7 +84,7 @@ class OptionsWidgetsTest extends FieldTestBase {
   /**
    * Tests the 'options_buttons' widget (single select).
    */
-  function testRadioButtons() {
+  public function testRadioButtons() {
     // Create an instance of the 'single value' field.
     $field = FieldConfig::create([
       'field_storage' => $this->card1,
@@ -114,9 +114,9 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertRaw('Some HTML encoded markup with &lt; &amp; &gt;');
 
     // Select first option.
-    $edit = array('card_1' => 0);
+    $edit = ['card_1' => 0];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_1', array(0));
+    $this->assertFieldValues($entity_init, 'card_1', [0]);
 
     // Check that the selected button is checked.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
@@ -125,9 +125,9 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertNoFieldChecked('edit-card-1-2');
 
     // Unselect option.
-    $edit = array('card_1' => '_none');
+    $edit = ['card_1' => '_none'];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_1', array());
+    $this->assertFieldValues($entity_init, 'card_1', []);
 
     // Check that required radios with one option is auto-selected.
     $this->card1->setSetting('allowed_values', [99 => 'Only allowed value']);
@@ -141,7 +141,7 @@ class OptionsWidgetsTest extends FieldTestBase {
   /**
    * Tests the 'options_buttons' widget (multiple select).
    */
-  function testCheckBoxes() {
+  public function testCheckBoxes() {
     // Create an instance of the 'multiple values' field.
     $field = FieldConfig::create([
       'field_storage' => $this->card2,
@@ -149,16 +149,16 @@ class OptionsWidgetsTest extends FieldTestBase {
     ]);
     $field->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($this->card2->getName(), array(
+      ->setComponent($this->card2->getName(), [
         'type' => 'options_buttons',
-      ))
+      ])
       ->save();
 
     // Create an entity.
-    $entity = EntityTest::create(array(
+    $entity = EntityTest::create([
       'user_id' => 1,
       'name' => $this->randomMachineName(),
-    ));
+    ]);
     $entity->save();
     $entity_init = clone $entity;
 
@@ -170,13 +170,13 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertRaw('Some dangerous &amp; unescaped <strong>markup</strong>', 'Option text was properly filtered.');
 
     // Submit form: select first and third options.
-    $edit = array(
+    $edit = [
       'card_2[0]' => TRUE,
       'card_2[1]' => FALSE,
       'card_2[2]' => TRUE,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_2', array(0, 2));
+    $this->assertFieldValues($entity_init, 'card_2', [0, 2]);
 
     // Display form: check that the right options are selected.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
@@ -185,13 +185,13 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertFieldChecked('edit-card-2-2');
 
     // Submit form: select only first option.
-    $edit = array(
+    $edit = [
       'card_2[0]' => TRUE,
       'card_2[1]' => FALSE,
       'card_2[2]' => FALSE,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_2', array(0));
+    $this->assertFieldValues($entity_init, 'card_2', [0]);
 
     // Display form: check that the right options are selected.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
@@ -200,23 +200,23 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertNoFieldChecked('edit-card-2-2');
 
     // Submit form: select the three options while the field accepts only 2.
-    $edit = array(
+    $edit = [
       'card_2[0]' => TRUE,
       'card_2[1]' => TRUE,
       'card_2[2]' => TRUE,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertText('this field cannot hold more than 2 values', 'Validation error was displayed.');
 
     // Submit form: uncheck all options.
-    $edit = array(
+    $edit = [
       'card_2[0]' => FALSE,
       'card_2[1]' => FALSE,
       'card_2[2]' => FALSE,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     // Check that the value was saved.
-    $this->assertFieldValues($entity_init, 'card_2', array());
+    $this->assertFieldValues($entity_init, 'card_2', []);
 
     // Required checkbox with one option is auto-selected.
     $this->card2->setSetting('allowed_values', [99 => 'Only allowed value']);
@@ -230,7 +230,7 @@ class OptionsWidgetsTest extends FieldTestBase {
   /**
    * Tests the 'options_select' widget (single select).
    */
-  function testSelectListSingle() {
+  public function testSelectListSingle() {
     // Create an instance of the 'single value' field.
     $field = FieldConfig::create([
       'field_storage' => $this->card1,
@@ -239,23 +239,23 @@ class OptionsWidgetsTest extends FieldTestBase {
     ]);
     $field->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($this->card1->getName(), array(
+      ->setComponent($this->card1->getName(), [
         'type' => 'options_select',
-      ))
+      ])
       ->save();
 
     // Create an entity.
-    $entity = EntityTest::create(array(
+    $entity = EntityTest::create([
       'user_id' => 1,
       'name' => $this->randomMachineName(),
-    ));
+    ]);
     $entity->save();
     $entity_init = clone $entity;
 
     // Display form.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
     // A required field without any value has a "none" option.
-    $this->assertTrue($this->xpath('//select[@id=:id]//option[@value="_none" and text()=:label]', array(':id' => 'edit-card-1', ':label' => t('- Select a value -'))), 'A required select list has a "Select a value" choice.');
+    $this->assertTrue($this->xpath('//select[@id=:id]//option[@value="_none" and text()=:label]', [':id' => 'edit-card-1', ':label' => t('- Select a value -')]), 'A required select list has a "Select a value" choice.');
 
     // With no field data, nothing is selected.
     $this->assertNoOptionSelected('edit-card-1', '_none');
@@ -265,19 +265,19 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertRaw('Some dangerous &amp; unescaped markup', 'Option text was properly filtered.');
 
     // Submit form: select invalid 'none' option.
-    $edit = array('card_1' => '_none');
+    $edit = ['card_1' => '_none'];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertRaw(t('@title field is required.', array('@title' => $field->getName())), 'Cannot save a required field when selecting "none" from the select list.');
+    $this->assertRaw(t('@title field is required.', ['@title' => $field->getName()]), 'Cannot save a required field when selecting "none" from the select list.');
 
     // Submit form: select first option.
-    $edit = array('card_1' => 0);
+    $edit = ['card_1' => 0];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_1', array(0));
+    $this->assertFieldValues($entity_init, 'card_1', [0]);
 
     // Display form: check that the right options are selected.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
     // A required field with a value has no 'none' option.
-    $this->assertFalse($this->xpath('//select[@id=:id]//option[@value="_none"]', array(':id' => 'edit-card-1')), 'A required select list with an actual value has no "none" choice.');
+    $this->assertFalse($this->xpath('//select[@id=:id]//option[@value="_none"]', [':id' => 'edit-card-1']), 'A required select list with an actual value has no "none" choice.');
     $this->assertOptionSelected('edit-card-1', 0);
     $this->assertNoOptionSelected('edit-card-1', 1);
     $this->assertNoOptionSelected('edit-card-1', 2);
@@ -289,11 +289,11 @@ class OptionsWidgetsTest extends FieldTestBase {
     // Display form.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
     // A non-required field has a 'none' option.
-    $this->assertTrue($this->xpath('//select[@id=:id]//option[@value="_none" and text()=:label]', array(':id' => 'edit-card-1', ':label' => t('- None -'))), 'A non-required select list has a "None" choice.');
+    $this->assertTrue($this->xpath('//select[@id=:id]//option[@value="_none" and text()=:label]', [':id' => 'edit-card-1', ':label' => t('- None -')]), 'A non-required select list has a "None" choice.');
     // Submit form: Unselect the option.
-    $edit = array('card_1' => '_none');
+    $edit = ['card_1' => '_none'];
     $this->drupalPostForm('entity_test/manage/' . $entity->id() . '/edit', $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_1', array());
+    $this->assertFieldValues($entity_init, 'card_1', []);
 
     // Test optgroups.
 
@@ -311,9 +311,9 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertRaw('Group 1', 'Option groups are displayed.');
 
     // Submit form: select first option.
-    $edit = array('card_1' => 0);
+    $edit = ['card_1' => 0];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_1', array(0));
+    $this->assertFieldValues($entity_init, 'card_1', [0]);
 
     // Display form: check that the right options are selected.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
@@ -322,15 +322,15 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertNoOptionSelected('edit-card-1', 2);
 
     // Submit form: Unselect the option.
-    $edit = array('card_1' => '_none');
+    $edit = ['card_1' => '_none'];
     $this->drupalPostForm('entity_test/manage/' . $entity->id() . '/edit', $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_1', array());
+    $this->assertFieldValues($entity_init, 'card_1', []);
   }
 
   /**
    * Tests the 'options_select' widget (multiple select).
    */
-  function testSelectListMultiple() {
+  public function testSelectListMultiple() {
     // Create an instance of the 'multiple values' field.
     $field = FieldConfig::create([
       'field_storage' => $this->card2,
@@ -338,16 +338,16 @@ class OptionsWidgetsTest extends FieldTestBase {
     ]);
     $field->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($this->card2->getName(), array(
+      ->setComponent($this->card2->getName(), [
         'type' => 'options_select',
-      ))
+      ])
       ->save();
 
     // Create an entity.
-    $entity = EntityTest::create(array(
+    $entity = EntityTest::create([
       'user_id' => 1,
       'name' => $this->randomMachineName(),
-    ));
+    ]);
     $entity->save();
     $entity_init = clone $entity;
 
@@ -360,9 +360,9 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertRaw('Some dangerous &amp; unescaped markup', 'Option text was properly filtered.');
 
     // Submit form: select first and third options.
-    $edit = array('card_2[]' => array(0 => 0, 2 => 2));
+    $edit = ['card_2[]' => [0 => 0, 2 => 2]];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_2', array(0, 2));
+    $this->assertFieldValues($entity_init, 'card_2', [0, 2]);
 
     // Display form: check that the right options are selected.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
@@ -371,9 +371,9 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertOptionSelected('edit-card-2', 2);
 
     // Submit form: select only first option.
-    $edit = array('card_2[]' => array(0 => 0));
+    $edit = ['card_2[]' => [0 => 0]];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_2', array(0));
+    $this->assertFieldValues($entity_init, 'card_2', [0]);
 
     // Display form: check that the right options are selected.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
@@ -382,33 +382,33 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertNoOptionSelected('edit-card-2', 2);
 
     // Submit form: select the three options while the field accepts only 2.
-    $edit = array('card_2[]' => array(0 => 0, 1 => 1, 2 => 2));
+    $edit = ['card_2[]' => [0 => 0, 1 => 1, 2 => 2]];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertText('this field cannot hold more than 2 values', 'Validation error was displayed.');
 
     // Submit form: uncheck all options.
-    $edit = array('card_2[]' => array());
+    $edit = ['card_2[]' => []];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_2', array());
+    $this->assertFieldValues($entity_init, 'card_2', []);
 
     // Test the 'None' option.
 
     // Check that the 'none' option has no effect if actual options are selected
     // as well.
-    $edit = array('card_2[]' => array('_none' => '_none', 0 => 0));
+    $edit = ['card_2[]' => ['_none' => '_none', 0 => 0]];
     $this->drupalPostForm('entity_test/manage/' . $entity->id() . '/edit', $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_2', array(0));
+    $this->assertFieldValues($entity_init, 'card_2', [0]);
 
     // Check that selecting the 'none' option empties the field.
-    $edit = array('card_2[]' => array('_none' => '_none'));
+    $edit = ['card_2[]' => ['_none' => '_none']];
     $this->drupalPostForm('entity_test/manage/' . $entity->id() . '/edit', $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_2', array());
+    $this->assertFieldValues($entity_init, 'card_2', []);
 
     // A required select list does not have an empty key.
     $field->setRequired(TRUE);
     $field->save();
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
-    $this->assertFalse($this->xpath('//select[@id=:id]//option[@value=""]', array(':id' => 'edit-card-2')), 'A required select list does not have an empty key.');
+    $this->assertFalse($this->xpath('//select[@id=:id]//option[@value=""]', [':id' => 'edit-card-2']), 'A required select list does not have an empty key.');
 
     // We do not have to test that a required select list with one option is
     // auto-selected because the browser does it for us.
@@ -432,9 +432,9 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertRaw('Group 1', 'Option groups are displayed.');
 
     // Submit form: select first option.
-    $edit = array('card_2[]' => array(0 => 0));
+    $edit = ['card_2[]' => [0 => 0]];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_2', array(0));
+    $this->assertFieldValues($entity_init, 'card_2', [0]);
 
     // Display form: check that the right options are selected.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
@@ -443,15 +443,15 @@ class OptionsWidgetsTest extends FieldTestBase {
     $this->assertNoOptionSelected('edit-card-2', 2);
 
     // Submit form: Unselect the option.
-    $edit = array('card_2[]' => array('_none' => '_none'));
+    $edit = ['card_2[]' => ['_none' => '_none']];
     $this->drupalPostForm('entity_test/manage/' . $entity->id() . '/edit', $edit, t('Save'));
-    $this->assertFieldValues($entity_init, 'card_2', array());
+    $this->assertFieldValues($entity_init, 'card_2', []);
   }
 
   /**
    * Tests the 'options_select' and 'options_button' widget for empty value.
    */
-  function testEmptyValue() {
+  public function testEmptyValue() {
     // Create an instance of the 'single value' field.
     $field = FieldConfig::create([
       'field_storage' => $this->card1,
@@ -475,20 +475,20 @@ class OptionsWidgetsTest extends FieldTestBase {
 
     // Display form: check that _none options are present and has label.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
-    $this->assertTrue($this->xpath('//div[@id=:id]//input[@value=:value]', array(':id' => 'edit-card-1', ':value' => '_none')), 'A test radio button has a "None" choice.');
-    $this->assertTrue($this->xpath('//div[@id=:id]//label[@for=:for and text()=:label]', array(':id' => 'edit-card-1', ':for' => 'edit-card-1-none', ':label' => 'N/A')), 'A test radio button has a "N/A" choice.');
+    $this->assertTrue($this->xpath('//div[@id=:id]//input[@value=:value]', [':id' => 'edit-card-1', ':value' => '_none']), 'A test radio button has a "None" choice.');
+    $this->assertTrue($this->xpath('//div[@id=:id]//label[@for=:for and text()=:label]', [':id' => 'edit-card-1', ':for' => 'edit-card-1-none', ':label' => 'N/A']), 'A test radio button has a "N/A" choice.');
 
     // Change it to the select widget.
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($this->card1->getName(), array(
+      ->setComponent($this->card1->getName(), [
         'type' => 'options_select',
-      ))
+      ])
       ->save();
 
     // Display form: check that _none options are present and has label.
     $this->drupalGet('entity_test/manage/' . $entity->id() . '/edit');
     // A required field without any value has a "none" option.
-    $this->assertTrue($this->xpath('//select[@id=:id]//option[@value="_none" and text()=:label]', array(':id' => 'edit-card-1', ':label' => t('- None -'))), 'A test select has a "None" choice.');
+    $this->assertTrue($this->xpath('//select[@id=:id]//option[@value="_none" and text()=:label]', [':id' => 'edit-card-1', ':label' => t('- None -')]), 'A test select has a "None" choice.');
   }
 
 }
diff --git a/web/core/modules/options/tests/src/Kernel/OptionsFieldTest.php b/web/core/modules/options/tests/src/Kernel/OptionsFieldTest.php
index 89ac12716..401d6bc1d 100644
--- a/web/core/modules/options/tests/src/Kernel/OptionsFieldTest.php
+++ b/web/core/modules/options/tests/src/Kernel/OptionsFieldTest.php
@@ -19,12 +19,12 @@ class OptionsFieldTest extends OptionsFieldUnitTestBase {
    *
    * @var array
    */
-  public static $modules = array('options');
+  public static $modules = ['options'];
 
   /**
    * Test that allowed values can be updated.
    */
-  function testUpdateAllowedValues() {
+  public function testUpdateAllowedValues() {
     // All three options appear.
     $entity = EntityTest::create();
     $form = \Drupal::service('entity.form_builder')->getForm($entity);
@@ -81,9 +81,9 @@ class OptionsFieldTest extends OptionsFieldUnitTestBase {
       'required' => TRUE,
     ])->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'options_buttons',
-      ))
+      ])
       ->save();
     $entity = EntityTest::create();
     $form = \Drupal::service('entity.form_builder')->getForm($entity);
diff --git a/web/core/modules/options/tests/src/Kernel/OptionsFieldUnitTestBase.php b/web/core/modules/options/tests/src/Kernel/OptionsFieldUnitTestBase.php
index 7dd7cbeec..9098b818b 100644
--- a/web/core/modules/options/tests/src/Kernel/OptionsFieldUnitTestBase.php
+++ b/web/core/modules/options/tests/src/Kernel/OptionsFieldUnitTestBase.php
@@ -16,7 +16,7 @@ abstract class OptionsFieldUnitTestBase extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('options');
+  public static $modules = ['options'];
 
   /**
    * The field name used in the test.
@@ -53,15 +53,15 @@ abstract class OptionsFieldUnitTestBase extends FieldKernelTestBase {
     parent::setUp();
     $this->container->get('router.builder')->rebuild();
 
-    $this->fieldStorageDefinition = array(
+    $this->fieldStorageDefinition = [
       'field_name' => $this->fieldName,
       'entity_type' => 'entity_test',
       'type' => 'list_integer',
       'cardinality' => 1,
-      'settings' => array(
-        'allowed_values' => array(1 => 'One', 2 => 'Two', 3 => 'Three'),
-      ),
-    );
+      'settings' => [
+        'allowed_values' => [1 => 'One', 2 => 'Two', 3 => 'Three'],
+      ],
+    ];
     $this->fieldStorage = FieldStorageConfig::create($this->fieldStorageDefinition);
     $this->fieldStorage->save();
 
@@ -72,9 +72,9 @@ abstract class OptionsFieldUnitTestBase extends FieldKernelTestBase {
     $this->field->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'options_buttons',
-      ))
+      ])
       ->save();
   }
 
diff --git a/web/core/modules/options/tests/src/Kernel/OptionsFormattersTest.php b/web/core/modules/options/tests/src/Kernel/OptionsFormattersTest.php
index 632900e99..93607f6f9 100644
--- a/web/core/modules/options/tests/src/Kernel/OptionsFormattersTest.php
+++ b/web/core/modules/options/tests/src/Kernel/OptionsFormattersTest.php
@@ -33,7 +33,7 @@ class OptionsFormattersTest extends OptionsFieldUnitTestBase {
     $this->assertEqual($build['#formatter'], 'list_default', 'Ensure to fall back to the default formatter.');
     $this->assertEqual($build[0]['#markup'], 'One');
 
-    $build = $items->view(array('type' => 'list_key'));
+    $build = $items->view(['type' => 'list_key']);
     $this->assertEqual($build['#formatter'], 'list_key', 'The chosen formatter is used.');
     $this->assertEqual((string) $build[0]['#markup'], 1);
   }
diff --git a/web/core/modules/options/tests/src/Kernel/Views/FileViewsDataTest.php b/web/core/modules/options/tests/src/Kernel/Views/FileViewsDataTest.php
index 060c05ec8..c5f2902d0 100644
--- a/web/core/modules/options/tests/src/Kernel/Views/FileViewsDataTest.php
+++ b/web/core/modules/options/tests/src/Kernel/Views/FileViewsDataTest.php
@@ -19,7 +19,7 @@ class FileViewsDataTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('file', 'views', 'entity_test', 'user', 'field');
+  public static $modules = ['file', 'views', 'entity_test', 'user', 'field'];
 
   /**
    * Tests views data generated for file field relationship.
@@ -29,16 +29,16 @@ class FileViewsDataTest extends ViewsKernelTestBase {
    */
   public function testRelationshipViewsData() {
     // Create file field to entity_test.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_base_file',
       'type' => 'file',
-    ))->save();
-    FieldConfig::create(array(
+    ])->save();
+    FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_base_file',
       'bundle' => 'entity_test',
-    ))->save();
+    ])->save();
     // Check the generated views data.
     $views_data = Views::viewsData()->get('entity_test__field_base_file');
     $relationship = $views_data['field_base_file_target_id']['relationship'];
@@ -59,16 +59,16 @@ class FileViewsDataTest extends ViewsKernelTestBase {
     $this->assertEqual($relationship['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
 
     // Create file field to entity_test_mul.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'entity_test_mul',
       'field_name' => 'field_data_file',
       'type' => 'file',
-    ))->save();
-    FieldConfig::create(array(
+    ])->save();
+    FieldConfig::create([
       'entity_type' => 'entity_test_mul',
       'field_name' => 'field_data_file',
       'bundle' => 'entity_test_mul',
-    ))->save();
+    ])->save();
     // Check the generated views data.
     $views_data = Views::viewsData()->get('entity_test_mul__field_data_file');
     $relationship = $views_data['field_data_file_target_id']['relationship'];
diff --git a/web/core/modules/options/tests/src/Kernel/Views/OptionsListFilterTest.php b/web/core/modules/options/tests/src/Kernel/Views/OptionsListFilterTest.php
index c62b27549..bc377b094 100644
--- a/web/core/modules/options/tests/src/Kernel/Views/OptionsListFilterTest.php
+++ b/web/core/modules/options/tests/src/Kernel/Views/OptionsListFilterTest.php
@@ -35,4 +35,78 @@ class OptionsListFilterTest extends OptionsTestBase {
     $this->assertIdenticalResultset($view, $resultset, $column_map);
   }
 
+  /**
+   * Tests options list field filter when grouped.
+   */
+  public function testViewsTestOptionsListGroupedFilter() {
+    $view = Views::getView('test_options_list_filter');
+
+    $filters = [
+      'field_test_list_string_value' => [
+        'id' => 'field_test_list_string_value',
+        'table' => 'field_data_field_test_list_string',
+        'field' => 'field_test_list_string_value',
+        'relationship' => 'none',
+        'group_type' => 'group',
+        'admin_label' => '',
+        'operator' => 'or',
+        'value' => [
+          'man' => 'man',
+          'woman' => 'woman',
+        ],
+        'group' => '1',
+        'exposed' => TRUE,
+        'expose' => [
+          'operator_id' => 'field_test_list_string_value_op',
+          'label' => 'list-text',
+          'description' => '',
+          'identifier' => 'field_test_list_string_value',
+        ],
+        'is_grouped' => TRUE,
+        'group_info' => [
+          'label' => 'list-text (field_list_text)',
+          'description' => '',
+          'identifier' => 'field_test_list_string_value',
+          'optional' => TRUE,
+          'widget' => 'radios',
+          'multiple' => TRUE,
+          'remember' => FALSE,
+          'default_group' => '1',
+          'group_items' => [
+            1 => [
+              'title' => 'First',
+              'operator' => 'or',
+              'value' => [
+                $this->fieldValues[0] => $this->fieldValues[0],
+              ]
+            ],
+            2 => [
+              'title' => 'Second',
+              'operator' => 'or',
+              'value' => [
+                $this->fieldValues[1] => $this->fieldValues[1],
+              ]
+            ],
+          ],
+        ],
+        'reduce_duplicates' => '',
+        'plugin_id' => 'list_field',
+      ]
+    ];
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
+
+    $view->storage->save();
+
+    $this->executeView($view);
+
+    $resultset = [
+      ['nid' => $this->nodes[0]->nid->value],
+      ['nid' => $this->nodes[1]->nid->value],
+    ];
+
+    $column_map = ['nid' => 'nid'];
+    $this->assertIdenticalResultset($view, $resultset, $column_map);
+  }
+
 }
diff --git a/web/core/modules/outside_in/js/offcanvas.js b/web/core/modules/outside_in/js/offcanvas.js
index 8cda69d50..74cd32c96 100644
--- a/web/core/modules/outside_in/js/offcanvas.js
+++ b/web/core/modules/outside_in/js/offcanvas.js
@@ -100,48 +100,61 @@
     }
   }
 
-  $(window).on({
-    'dialog:aftercreate': function (event, dialog, $element, settings) {
-      if ($element.is('#drupal-offcanvas')) {
-        var eventData = {settings: settings, $element: $element};
-        $('.ui-dialog-offcanvas, .ui-dialog-offcanvas .ui-dialog-titlebar').toggleClass('ui-dialog-empty-title', !settings.title);
+  /**
+   * Attaches off-canvas dialog behaviors.
+   *
+   * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches event listeners for off-canvas dialogs.
+   */
+  Drupal.behaviors.offCanvasEvents = {
+    attach: function () {
+      $(window).once('off-canvas').on({
+        'dialog:aftercreate': function (event, dialog, $element, settings) {
+          if ($element.is('#drupal-offcanvas')) {
+            var eventData = {settings: settings, $element: $element};
+            $('.ui-dialog-offcanvas, .ui-dialog-offcanvas .ui-dialog-titlebar').toggleClass('ui-dialog-empty-title', !settings.title);
 
-        $element
-          .on('dialogresize.offcanvas', eventData, debounce(bodyPadding, 100))
-          .on('dialogContentResize.offcanvas', eventData, handleDialogResize)
-          .on('dialogContentResize.offcanvas', eventData, debounce(bodyPadding, 100))
-          .trigger('dialogresize.offcanvas');
+            $element
+              .on('dialogresize.offcanvas', eventData, debounce(bodyPadding, 100))
+              .on('dialogContentResize.offcanvas', eventData, handleDialogResize)
+              .on('dialogContentResize.offcanvas', eventData, debounce(bodyPadding, 100))
+              .trigger('dialogresize.offcanvas');
 
-        $element.dialog('widget').attr('data-offset-' + edge, '');
+            $element.dialog('widget').attr('data-offset-' + edge, '');
 
-        $(window)
-          .on('resize.offcanvas scroll.offcanvas', eventData, debounce(resetSize, 100))
-          .trigger('resize.offcanvas');
-      }
-    },
-    'dialog:beforecreate': function (event, dialog, $element, settings) {
-      if ($element.is('#drupal-offcanvas')) {
-        $('body').addClass('js-tray-open');
-        // @see http://api.jqueryui.com/position/
-        settings.position = {
-          my: 'left top',
-          at: edge + ' top',
-          of: window
-        };
-        settings.dialogClass += ' ui-dialog-offcanvas';
-        // Applies initial height to dialog based on window height.
-        // See http://api.jqueryui.com/dialog for all dialog options.
-        settings.height = $(window).height();
-      }
-    },
-    'dialog:beforeclose': function (event, dialog, $element) {
-      if ($element.is('#drupal-offcanvas')) {
-        $('body').removeClass('js-tray-open');
-        $(document).off('.offcanvas');
-        $(window).off('.offcanvas');
-        $mainCanvasWrapper.css('padding-' + edge, 0);
-      }
+            $(window)
+              .on('resize.offcanvas scroll.offcanvas', eventData, debounce(resetSize, 100))
+              .trigger('resize.offcanvas');
+          }
+        },
+        'dialog:beforecreate': function (event, dialog, $element, settings) {
+          if ($element.is('#drupal-offcanvas')) {
+            $('body').addClass('js-tray-open');
+            // @see http://api.jqueryui.com/position/
+            settings.position = {
+              my: 'left top',
+              at: edge + ' top',
+              of: window
+            };
+            settings.dialogClass += ' ui-dialog-offcanvas';
+            // Applies initial height to dialog based on window height.
+            // See http://api.jqueryui.com/dialog for all dialog options.
+            settings.height = $(window).height();
+          }
+        },
+        'dialog:beforeclose': function (event, dialog, $element) {
+          if ($element.is('#drupal-offcanvas')) {
+            $('body').removeClass('js-tray-open');
+            // Remove all *.offcanvas events
+            $(document).off('.offcanvas');
+            $(window).off('.offcanvas');
+            $mainCanvasWrapper.css('padding-' + edge, 0);
+          }
+        }
+      });
     }
-  });
+  };
 
 })(jQuery, Drupal, Drupal.debounce, Drupal.displace);
diff --git a/web/core/modules/outside_in/js/outside_in.js b/web/core/modules/outside_in/js/outside_in.js
index 0b8bc880e..c038cd21d 100644
--- a/web/core/modules/outside_in/js/outside_in.js
+++ b/web/core/modules/outside_in/js/outside_in.js
@@ -35,7 +35,7 @@
     data.$el.find(blockConfigureSelector)
       .on('click.outsidein', function () {
         if (!isInEditMode()) {
-          $(toggleEditSelector).trigger('click.outsidein');
+          $(toggleEditSelector).trigger('click').trigger('click.outside_in');
         }
         // Always disable QuickEdit regardless of whether "EditMode" was just enabled.
         disableQuickEdit();
diff --git a/web/core/modules/outside_in/src/Form/SystemMenuOffCanvasForm.php b/web/core/modules/outside_in/src/Form/SystemMenuOffCanvasForm.php
index b1dd9ac53..d8ba9f4fc 100644
--- a/web/core/modules/outside_in/src/Form/SystemMenuOffCanvasForm.php
+++ b/web/core/modules/outside_in/src/Form/SystemMenuOffCanvasForm.php
@@ -81,7 +81,7 @@ class SystemMenuOffCanvasForm extends PluginFormBase implements ContainerInjecti
 
     $form['entity_form'] = [
       '#type' => 'details',
-      '#title' => $this->t('Edit menu %label', array('%label' => $this->entity->label())),
+      '#title' => $this->t('Edit menu %label', ['%label' => $this->entity->label()]),
       '#open' => TRUE,
     ];
     $form['entity_form'] += $this->getEntityForm($this->entity)->buildForm([], $form_state);
diff --git a/web/core/modules/outside_in/tests/modules/offcanvas_test/src/Plugin/Block/TestBlock.php b/web/core/modules/outside_in/tests/modules/offcanvas_test/src/Plugin/Block/TestBlock.php
deleted file mode 100644
index efb38e01b..000000000
--- a/web/core/modules/outside_in/tests/modules/offcanvas_test/src/Plugin/Block/TestBlock.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Drupal\offcanvas_test\Plugin\Block;
-
-use Drupal\Core\Block\BlockBase;
-use Drupal\Core\Url;
-
-/**
- * Provides an 'Off-canvas test block' block.
- *
- * @Block(
- *   id = "offcanvas_links_block",
- *   admin_label = @Translation("Off-canvas test block")
- * )
- */
-class TestBlock extends BlockBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function build() {
-    return [
-      'offcanvas_link_1' => [
-        '#title' => $this->t('Click Me 1!'),
-        '#type' => 'link',
-        '#url' => Url::fromRoute('offcanvas_test.thing1'),
-        '#attributes' => [
-          'class' => ['use-ajax'],
-          'data-dialog-type' => 'offcanvas',
-        ],
-      ],
-      'offcanvas_link_2' => [
-        '#title' => $this->t('Click Me 2!'),
-        '#type' => 'link',
-        '#url' => Url::fromRoute('offcanvas_test.thing2'),
-        '#attributes' => [
-          'class' => ['use-ajax'],
-          'data-dialog-type' => 'offcanvas',
-        ],
-      ],
-      '#attached' => [
-        'library' => [
-          'outside_in/drupal.off_canvas',
-        ],
-      ],
-    ];
-  }
-
-}
diff --git a/web/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php b/web/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
index c39f2f8eb..c62436ca1 100644
--- a/web/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
+++ b/web/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
@@ -11,6 +11,8 @@ use Drupal\user\Entity\Role;
  */
 class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
 
+  const TOOLBAR_EDIT_LINK_SELECTOR = '#toolbar-bar div.contextual-toolbar-tab button';
+
   /**
    * {@inheritdoc}
    */
@@ -71,9 +73,9 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
         $this->waitForNoElement("#toolbar-administration a.is-active");
       }
       $page->find('css', $toolbar_item)->click();
-      $this->waitForElement("{$toolbar_item}.is-active");
+      $web_assert->waitForElementVisible('css', "{$toolbar_item}.is-active");
     }
-    $this->toggleEditingMode();
+    $this->enableEditMode();
     if (isset($toolbar_item)) {
       $this->waitForNoElement("{$toolbar_item}.is-active");
     }
@@ -104,12 +106,11 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
 
     $this->openBlockForm($block_selector);
 
-    $this->toggleEditingMode();
+    $this->disableEditMode();
     // Canvas should close when editing module is closed.
     $this->waitForOffCanvasToClose();
 
-    // Go into Edit mode again.
-    $this->toggleEditingMode();
+    $this->enableEditMode();
 
     $element_selector = "$block_selector {$element_selector}";
     // Open block form by clicking a element inside the block.
@@ -124,6 +125,7 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
     $this->getSession()->executeScript('jQuery("body").trigger(jQuery.Event("keyup", { keyCode: 27 }));');
     $this->waitForOffCanvasToClose();
     $this->getSession()->wait(100);
+    $this->assertEditModeDisabled();
     $web_assert->elementTextContains('css', '#drupal-live-announce', 'Exited edit mode.');
     $web_assert->elementTextNotContains('css', '.contextual-toolbar-tab button', 'Editing');
     $web_assert->elementAttributeNotContains('css', '.dialog-offcanvas__main-canvas', 'class', 'js-outside-in-edit-mode');
@@ -163,18 +165,19 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
   }
 
   /**
-   * Enables Editing mode by pressing "Edit" button in the toolbar.
+   * Enables edit mode by pressing edit button in the toolbar.
    */
-  protected function toggleEditingMode() {
-    $this->waitForElement('div[data-contextual-id="block:block=powered:langcode=en|outside_in::langcode=en"] .contextual-links a', 10000);
-    // Waiting for QuickEdit icon animation.
-    $this->assertSession()->assertWaitOnAjaxRequest();
+  protected function enableEditMode() {
+    $this->pressToolbarEditButton();
+    $this->assertEditModeEnabled();
+  }
 
-    $edit_button = $this->getSession()->getPage()->find('css', '#toolbar-bar div.contextual-toolbar-tab button');
-
-    $edit_button->press();
-    // Waiting for Toolbar animation.
-    $this->assertSession()->assertWaitOnAjaxRequest();
+  /**
+   * Disables edit mode by pressing edit button in the toolbar.
+   */
+  protected function disableEditMode() {
+    $this->pressToolbarEditButton();
+    $this->assertEditModeDisabled();
   }
 
   /**
@@ -235,29 +238,28 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
       $this->drupalGet('node/' . $node->id());
       // Waiting for Toolbar module.
       // @todo Remove the hack after https://www.drupal.org/node/2542050.
-      $this->waitForElement('.toolbar-fixed');
+      $web_assert->waitForElementVisible('css', '.toolbar-fixed');
       // Waiting for Toolbar animation.
       $web_assert->assertWaitOnAjaxRequest();
       // The 2nd page load we should already be in edit mode.
       if ($page_load_times == 1) {
-        $this->toggleEditingMode();
+        $this->enableEditMode();
       }
       // In Edit mode clicking field should open QuickEdit toolbar.
       $page->find('css', $body_selector)->click();
-      $this->waitForElement($quick_edit_selector);
-      // Exit Edit mode.
-      $this->toggleEditingMode();
+      $web_assert->waitForElementVisible('css', $quick_edit_selector);
+
+      $this->disableEditMode();
       // Exiting Edit mode should close QuickEdit toolbar.
       $web_assert->elementNotExists('css', $quick_edit_selector);
       // When not in Edit mode QuickEdit toolbar should not open.
       $page->find('css', $body_selector)->click();
       $web_assert->elementNotExists('css', $quick_edit_selector);
 
-      // Enter Edit mode.
-      $this->toggleEditingMode();
+      $this->enableEditMode();
       $this->openBlockForm($block_selector);
       $page->find('css', $body_selector)->click();
-      $this->waitForElement($quick_edit_selector);
+      $web_assert->waitForElementVisible('css', $quick_edit_selector);
       // Offcanvas should be closed when opening QuickEdit toolbar.
       $this->waitForOffCanvasToClose();
 
@@ -269,10 +271,10 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
     // Check using contextual links to invoke QuickEdit and open the tray.
     $this->drupalGet('node/' . $node->id());
     $web_assert->assertWaitOnAjaxRequest();
-    $this->toggleEditingMode();
+    $this->disableEditMode();
     // Open QuickEdit toolbar before going into Edit mode.
     $this->clickContextualLink('.node', "Quick edit");
-    $this->waitForElement($quick_edit_selector);
+    $web_assert->waitForElementVisible('css', $quick_edit_selector);
     // Open off-canvas and enter Edit mode via contextual link.
     $this->clickContextualLink($block_selector, "Quick edit");
     $this->waitForOffCanvasToOpen();
@@ -281,7 +283,85 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
     // Open QuickEdit toolbar via contextual link while in Edit mode.
     $this->clickContextualLink('.node', "Quick edit", FALSE);
     $this->waitForOffCanvasToClose();
-    $this->waitForElement($quick_edit_selector);
+    $web_assert->waitForElementVisible('css', $quick_edit_selector);
+  }
+
+  /**
+   * Tests enabling and disabling Edit Mode.
+   */
+  public function testEditModeEnableDisable() {
+    foreach (['contextual_link', 'toolbar_link'] as $enable_option) {
+      $this->drupalGet('user');
+      $this->assertEditModeDisabled();
+      switch ($enable_option) {
+        // Enable Edit mode.
+        case 'contextual_link':
+          $this->clickContextualLink('#block-powered', "Quick edit");
+          $this->waitForOffCanvasToOpen();
+          $this->assertEditModeEnabled();
+          break;
+
+        case 'toolbar_link':
+          $this->enableEditMode();
+          break;
+      }
+      $this->disableEditMode();
+
+      // Make another page request to ensure Edit mode is still disabled.
+      $this->drupalGet('user');
+      $this->assertEditModeDisabled();
+      // Make sure on this page request it also re-enables and disables
+      // correctly.
+      $this->enableEditMode();
+      $this->disableEditMode();
+    }
+  }
+
+  /**
+   * Assert that edit mode has been properly enabled.
+   */
+  protected function assertEditModeEnabled() {
+    $web_assert = $this->assertSession();
+    // No contextual triggers should be hidden.
+    $web_assert->elementNotExists('css', '.contextual .trigger.visually-hidden');
+    // The toolbar edit button should read "Editing".
+    $web_assert->elementContains('css', static::TOOLBAR_EDIT_LINK_SELECTOR, 'Editing');
+    // The main canvas element should have the "js-outside-in-edit-mode" class.
+    $web_assert->elementExists('css', '.dialog-offcanvas__main-canvas.js-outside-in-edit-mode');
+  }
+
+  /**
+   * Assert that edit mode has been properly disabled.
+   */
+  protected function assertEditModeDisabled() {
+    $web_assert = $this->assertSession();
+    // Contextual triggers should be hidden.
+    $web_assert->elementExists('css', '.contextual .trigger.visually-hidden');
+    // No contextual triggers should be not hidden.
+    $web_assert->elementNotExists('css', '.contextual .trigger:not(.visually-hidden)');
+    // The toolbar edit button should read "Edit".
+    $web_assert->elementContains('css', static::TOOLBAR_EDIT_LINK_SELECTOR, 'Edit');
+    // The main canvas element should NOT have the "js-outside-in-edit-mode"
+    // class.
+    $web_assert->elementNotExists('css', '.dialog-offcanvas__main-canvas.js-outside-in-edit-mode');
+  }
+
+  /**
+   * Press the toolbar Edit button provided by the contextual module.
+   */
+  protected function pressToolbarEditButton() {
+    $this->assertSession()
+      ->waitForElementVisible('css', 'div[data-contextual-id="block:block=powered:langcode=en|outside_in::langcode=en"] .contextual-links a', 10000);
+    // Waiting for QuickEdit icon animation.
+    $this->assertSession()->assertWaitOnAjaxRequest();
+
+    $edit_button = $this->getSession()
+      ->getPage()
+      ->find('css', static::TOOLBAR_EDIT_LINK_SELECTOR);
+
+    $edit_button->press();
+    // Waiting for Toolbar animation.
+    $this->assertSession()->assertWaitOnAjaxRequest();
   }
 
 }
diff --git a/web/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php b/web/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php
index 48ba8993e..325aec7ff 100644
--- a/web/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php
+++ b/web/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php
@@ -12,7 +12,7 @@ abstract class OutsideInJavascriptTestBase extends JavascriptTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function drupalGet($path, array $options = array(), array $headers = array()) {
+  protected function drupalGet($path, array $options = [], array $headers = []) {
     $return = parent::drupalGet($path, $options, $headers);
 
     // After the page loaded we need to additionally wait until the settings
@@ -42,7 +42,7 @@ abstract class OutsideInJavascriptTestBase extends JavascriptTestBase {
   protected function waitForOffCanvasToOpen() {
     $web_assert = $this->assertSession();
     $web_assert->assertWaitOnAjaxRequest();
-    $this->waitForElement('#drupal-offcanvas');
+    $web_assert->waitForElementVisible('css', '#drupal-offcanvas');
   }
 
   /**
@@ -52,19 +52,6 @@ abstract class OutsideInJavascriptTestBase extends JavascriptTestBase {
     $this->waitForNoElement('#drupal-offcanvas');
   }
 
-  /**
-   * Waits for an element to appear on the page.
-   *
-   * @param string $selector
-   *   CSS selector.
-   * @param int $timeout
-   *   (optional) Timeout in milliseconds, defaults to 10000.
-   */
-  protected function waitForElement($selector, $timeout = 10000) {
-    $condition = "(jQuery('$selector').length > 0)";
-    $this->assertJsCondition($condition, $timeout);
-  }
-
   /**
    * Gets the Off-Canvas tray element.
    *
diff --git a/web/core/modules/page_cache/page_cache.module b/web/core/modules/page_cache/page_cache.module
index 3b8baf4ca..ff7286199 100644
--- a/web/core/modules/page_cache/page_cache.module
+++ b/web/core/modules/page_cache/page_cache.module
@@ -15,7 +15,7 @@ function page_cache_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.page_cache':
       $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Internal Page Cache module caches pages for anonymous users in the database. For more information, see the <a href=":pagecache-documentation">online documentation for the Internal Page Cache module</a>.', array(':pagecache-documentation' => 'https://www.drupal.org/documentation/modules/internal_page_cache')) . '</p>';
+      $output .= '<p>' . t('The Internal Page Cache module caches pages for anonymous users in the database. For more information, see the <a href=":pagecache-documentation">online documentation for the Internal Page Cache module</a>.', [':pagecache-documentation' => 'https://www.drupal.org/documentation/modules/internal_page_cache']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Speeding up your site') . '</dt>';
@@ -23,7 +23,7 @@ function page_cache_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dd>' . t('Pages are usually identical for all anonymous users, while they can be personalized for each authenticated user. This is why entire pages can be cached for anonymous users, whereas they will have to be rebuilt for every authenticated user.') . '</dd>';
       $output .= '<dd>' . t('To speed up your site for authenticated users, see the <a href=":dynamic_page_cache-help">Dynamic Page Cache module</a>.', [':dynamic_page_cache-help' => (\Drupal::moduleHandler()->moduleExists('dynamic_page_cache')) ? Url::fromRoute('help.page', ['name' => 'dynamic_page_cache'])->toString() : '#']) . '</p>';
       $output .= '<dt>' . t('Configuring the internal page cache') . '</dt>';
-      $output .= '<dd>' . t('On the <a href=":cache-settings">Performance page</a>, you can configure how long browsers and proxies may cache pages; that setting is also respected by the Internal Page Cache module. There is no other configuration.', array(':cache-settings' => \Drupal::url('system.performance_settings'))) . '</dd>';
+      $output .= '<dd>' . t('On the <a href=":cache-settings">Performance page</a>, you can configure how long browsers and proxies may cache pages; that setting is also respected by the Internal Page Cache module. There is no other configuration.', [':cache-settings' => \Drupal::url('system.performance_settings')]) . '</dd>';
       $output .= '</dl>';
 
       return $output;
diff --git a/web/core/modules/page_cache/src/StackMiddleware/PageCache.php b/web/core/modules/page_cache/src/StackMiddleware/PageCache.php
index a4d9053bc..97d53c602 100644
--- a/web/core/modules/page_cache/src/StackMiddleware/PageCache.php
+++ b/web/core/modules/page_cache/src/StackMiddleware/PageCache.php
@@ -168,7 +168,7 @@ class PageCache implements HttpKernelInterface {
         // In the case of a 304 response, certain headers must be sent, and the
         // remaining may not (see RFC 2616, section 10.3.5).
         foreach (array_keys($response->headers->all()) as $name) {
-          if (!in_array($name, array('content-location', 'expires', 'cache-control', 'vary'))) {
+          if (!in_array($name, ['content-location', 'expires', 'cache-control', 'vary'])) {
             $response->headers->remove($name);
           }
         }
@@ -206,6 +206,26 @@ class PageCache implements HttpKernelInterface {
     /** @var \Symfony\Component\HttpFoundation\Response $response */
     $response = $this->httpKernel->handle($request, $type, $catch);
 
+    // Only set the 'X-Drupal-Cache' header if caching is allowed for this
+    // response.
+    if ($this->storeResponse($request, $response)) {
+      $response->headers->set('X-Drupal-Cache', 'MISS');
+    }
+
+    return $response;
+  }
+
+  /**
+   * Stores a response in the page cache.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   A request object.
+   * @param \Symfony\Component\HttpFoundation\Response $response
+   *   A response object that should be stored in the page cache.
+   *
+   * @returns bool
+   */
+  protected function storeResponse(Request $request, Response $response) {
     // Drupal's primary cache invalidation architecture is cache tags: any
     // response that varies by a configuration value or data in a content
     // entity should have cache tags, to allow for instant cache invalidation
@@ -228,7 +248,7 @@ class PageCache implements HttpKernelInterface {
     //   so by replacing/extending this middleware service or adding another
     //   one.
     if (!$response instanceof CacheableResponseInterface) {
-      return $response;
+      return FALSE;
     }
 
     // Currently it is not possible to cache binary file or streamed responses:
@@ -236,12 +256,12 @@ class PageCache implements HttpKernelInterface {
     // Therefore exclude them, even for subclasses that implement
     // CacheableResponseInterface.
     if ($response instanceof BinaryFileResponse || $response instanceof StreamedResponse) {
-      return $response;
+      return FALSE;
     }
 
     // Allow policy rules to further restrict which responses to cache.
     if ($this->responsePolicy->check($response, $request) === ResponsePolicyInterface::DENY) {
-      return $response;
+      return FALSE;
     }
 
     $request_time = $request->server->get('REQUEST_TIME');
@@ -273,10 +293,7 @@ class PageCache implements HttpKernelInterface {
       $this->set($request, $response, $expire, $tags);
     }
 
-    // Mark response as a cache miss.
-    $response->headers->set('X-Drupal-Cache', 'MISS');
-
-    return $response;
+    return TRUE;
   }
 
   /**
@@ -340,10 +357,10 @@ class PageCache implements HttpKernelInterface {
    *   The cache ID for this request.
    */
   protected function getCacheId(Request $request) {
-    $cid_parts = array(
+    $cid_parts = [
       $request->getUri(),
       $request->getRequestFormat(),
-    );
+    ];
     return implode(':', $cid_parts);
   }
 
diff --git a/web/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php b/web/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
index c8db96e5c..6ec8a29cf 100644
--- a/web/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
+++ b/web/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
@@ -6,6 +6,7 @@ use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\simpletest\WebTestBase;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+use Drupal\node\NodeInterface;
 
 /**
  * Enables the page cache and tests its cache tags in various scenarios.
@@ -35,35 +36,35 @@ class PageCacheTagsIntegrationTest extends WebTestBase {
   /**
    * Test that cache tags are properly bubbled up to the page level.
    */
-  function testPageCacheTags() {
+  public function testPageCacheTags() {
     // Create two nodes.
     $author_1 = $this->drupalCreateUser();
-    $node_1 = $this->drupalCreateNode(array(
+    $node_1 = $this->drupalCreateNode([
       'uid' => $author_1->id(),
       'title' => 'Node 1',
-      'body' => array(
-        0 => array('value' => 'Body 1', 'format' => 'basic_html'),
-      ),
-      'promote' => NODE_PROMOTED,
-    ));
+      'body' => [
+        0 => ['value' => 'Body 1', 'format' => 'basic_html'],
+      ],
+      'promote' => NodeInterface::PROMOTED,
+    ]);
     $author_2 = $this->drupalCreateUser();
-    $node_2 = $this->drupalCreateNode(array(
+    $node_2 = $this->drupalCreateNode([
       'uid' => $author_2->id(),
       'title' => 'Node 2',
-      'body' => array(
-        0 => array('value' => 'Body 2', 'format' => 'full_html'),
-      ),
-      'promote' => NODE_PROMOTED,
-    ));
+      'body' => [
+        0 => ['value' => 'Body 2', 'format' => 'full_html'],
+      ],
+      'promote' => NodeInterface::PROMOTED,
+    ]);
 
     // Place a block, but only make it visible on full node page 2.
-    $block = $this->drupalPlaceBlock('views_block:comments_recent-block_1', array(
-      'visibility' => array(
-        'request_path' => array(
+    $block = $this->drupalPlaceBlock('views_block:comments_recent-block_1', [
+      'visibility' => [
+        'request_path' => [
           'pages' => '/node/' . $node_2->id(),
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
     $cache_contexts = [
       'languages:' . LanguageInterface::TYPE_INTERFACE,
@@ -78,7 +79,8 @@ class PageCacheTagsIntegrationTest extends WebTestBase {
     ];
 
     // Full node page 1.
-    $this->assertPageCacheContextsAndTags($node_1->urlInfo(), $cache_contexts, array(
+    $this->assertPageCacheContextsAndTags($node_1->urlInfo(), $cache_contexts, [
+      'http_response',
       'rendered',
       'block_view',
       'config:block_list',
@@ -112,13 +114,14 @@ class PageCacheTagsIntegrationTest extends WebTestBase {
       // FinishResponseSubscriber adds this cache tag to responses that have the
       // 'user.permissions' cache context for anonymous users.
       'config:user.role.anonymous',
-    ));
+    ]);
 
     // Render the view block adds the languages cache context.
     $cache_contexts[] = 'languages:' . LanguageInterface::TYPE_CONTENT;
 
     // Full node page 2.
-    $this->assertPageCacheContextsAndTags($node_2->urlInfo(), $cache_contexts, array(
+    $this->assertPageCacheContextsAndTags($node_2->urlInfo(), $cache_contexts, [
+      'http_response',
       'rendered',
       'block_view',
       'config:block_list',
@@ -155,7 +158,7 @@ class PageCacheTagsIntegrationTest extends WebTestBase {
       // 'user.permissions' cache context for anonymous users.
       'config:user.role.anonymous',
       'user:0',
-    ));
+    ]);
   }
 
 }
diff --git a/web/core/modules/page_cache/src/Tests/PageCacheTest.php b/web/core/modules/page_cache/src/Tests/PageCacheTest.php
index 1ec9282eb..c1ee8548e 100644
--- a/web/core/modules/page_cache/src/Tests/PageCacheTest.php
+++ b/web/core/modules/page_cache/src/Tests/PageCacheTest.php
@@ -24,7 +24,7 @@ class PageCacheTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('test_page_test', 'system_test', 'entity_test');
+  public static $modules = ['test_page_test', 'system_test', 'entity_test'];
 
   /**
    * {@inheritdoc}
@@ -44,29 +44,30 @@ class PageCacheTest extends WebTestBase {
    * Since tag based invalidation works, we know that our tag properly
    * persisted.
    */
-  function testPageCacheTags() {
+  public function testPageCacheTags() {
     $config = $this->config('system.performance');
     $config->set('cache.page.max_age', 300);
     $config->save();
 
     $path = 'system-test/cache_tags_page';
-    $tags = array('system_test_cache_tags_page');
+    $tags = ['system_test_cache_tags_page'];
     $this->drupalGet($path);
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
 
     // Verify a cache hit, but also the presence of the correct cache tags.
     $this->drupalGet($path);
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
-    $cid_parts = array(\Drupal::url('system_test.cache_tags_page', array(), array('absolute' => TRUE)), 'html');
+    $cid_parts = [\Drupal::url('system_test.cache_tags_page', [], ['absolute' => TRUE]), 'html'];
     $cid = implode(':', $cid_parts);
     $cache_entry = \Drupal::cache('render')->get($cid);
     sort($cache_entry->tags);
-    $expected_tags = array(
+    $expected_tags = [
       'config:user.role.anonymous',
+      'http_response',
       'pre_render',
       'rendered',
       'system_test_cache_tags_page',
-    );
+    ];
     $this->assertIdentical($cache_entry->tags, $expected_tags);
 
     Cache::invalidateTags($tags);
@@ -77,27 +78,28 @@ class PageCacheTest extends WebTestBase {
   /**
    * Test that the page cache doesn't depend on cacheability headers.
    */
-  function testPageCacheTagsIndependentFromCacheabilityHeaders() {
+  public function testPageCacheTagsIndependentFromCacheabilityHeaders() {
     $this->setHttpResponseDebugCacheabilityHeaders(FALSE);
 
     $path = 'system-test/cache_tags_page';
-    $tags = array('system_test_cache_tags_page');
+    $tags = ['system_test_cache_tags_page'];
     $this->drupalGet($path);
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
 
     // Verify a cache hit, but also the presence of the correct cache tags.
     $this->drupalGet($path);
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
-    $cid_parts = array(\Drupal::url('system_test.cache_tags_page', array(), array('absolute' => TRUE)), 'html');
+    $cid_parts = [\Drupal::url('system_test.cache_tags_page', [], ['absolute' => TRUE]), 'html'];
     $cid = implode(':', $cid_parts);
     $cache_entry = \Drupal::cache('render')->get($cid);
     sort($cache_entry->tags);
-    $expected_tags = array(
+    $expected_tags = [
       'config:user.role.anonymous',
+      'http_response',
       'pre_render',
       'rendered',
       'system_test_cache_tags_page',
-    );
+    ];
     $this->assertIdentical($cache_entry->tags, $expected_tags);
 
     Cache::invalidateTags($tags);
@@ -109,7 +111,7 @@ class PageCacheTest extends WebTestBase {
    * Tests support for different cache items with different request formats
    * specified via a query parameter.
    */
-  function testQueryParameterFormatRequests() {
+  public function testQueryParameterFormatRequests() {
     $config = $this->config('system.performance');
     $config->set('cache.page.max_age', 300);
     $config->save();
@@ -173,7 +175,7 @@ class PageCacheTest extends WebTestBase {
   /**
    * Tests support of requests with If-Modified-Since and If-None-Match headers.
    */
-  function testConditionalRequests() {
+  public function testConditionalRequests() {
     $config = $this->config('system.performance');
     $config->set('cache.page.max_age', 300);
     $config->save();
@@ -188,28 +190,28 @@ class PageCacheTest extends WebTestBase {
     $etag = $this->drupalGetHeader('ETag');
     $last_modified = $this->drupalGetHeader('Last-Modified');
 
-    $this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified, 'If-None-Match: ' . $etag));
+    $this->drupalGet('', [], ['If-Modified-Since: ' . $last_modified, 'If-None-Match: ' . $etag]);
     $this->assertResponse(304, 'Conditional request returned 304 Not Modified.');
 
-    $this->drupalGet('', array(), array('If-Modified-Since: ' . gmdate(DATE_RFC822, strtotime($last_modified)), 'If-None-Match: ' . $etag));
+    $this->drupalGet('', [], ['If-Modified-Since: ' . gmdate(DATE_RFC822, strtotime($last_modified)), 'If-None-Match: ' . $etag]);
     $this->assertResponse(304, 'Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.');
 
-    $this->drupalGet('', array(), array('If-Modified-Since: ' . gmdate(DATE_RFC850, strtotime($last_modified)), 'If-None-Match: ' . $etag));
+    $this->drupalGet('', [], ['If-Modified-Since: ' . gmdate(DATE_RFC850, strtotime($last_modified)), 'If-None-Match: ' . $etag]);
     $this->assertResponse(304, 'Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.');
 
-    $this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified));
+    $this->drupalGet('', [], ['If-Modified-Since: ' . $last_modified]);
     // Verify the page is not printed twice when the cache is warm.
     $this->assertNoPattern('#<html.*<html#');
     $this->assertResponse(200, 'Conditional request without If-None-Match returned 200 OK.');
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.');
 
-    $this->drupalGet('', array(), array('If-Modified-Since: ' . gmdate(DateTimePlus::RFC7231, strtotime($last_modified) + 1), 'If-None-Match: ' . $etag));
+    $this->drupalGet('', [], ['If-Modified-Since: ' . gmdate(DateTimePlus::RFC7231, strtotime($last_modified) + 1), 'If-None-Match: ' . $etag]);
     $this->assertResponse(200, 'Conditional request with new a If-Modified-Since date newer than Last-Modified returned 200 OK.');
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.');
 
     $user = $this->drupalCreateUser();
     $this->drupalLogin($user);
-    $this->drupalGet('', array(), array('If-Modified-Since: ' . $last_modified, 'If-None-Match: ' . $etag));
+    $this->drupalGet('', [], ['If-Modified-Since: ' . $last_modified, 'If-None-Match: ' . $etag]);
     $this->assertResponse(200, 'Conditional request returned 200 OK for authenticated user.');
     $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Absence of Page was not cached.');
   }
@@ -217,14 +219,14 @@ class PageCacheTest extends WebTestBase {
   /**
    * Tests cache headers.
    */
-  function testPageCache() {
+  public function testPageCache() {
     $config = $this->config('system.performance');
     $config->set('cache.page.max_age', 300);
     $config->set('response.gzip', 1);
     $config->save();
 
     // Fill the cache.
-    $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
+    $this->drupalGet('system-test/set-header', ['query' => ['name' => 'Foo', 'value' => 'bar']]);
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Page was not cached.');
     $this->assertEqual(strtolower($this->drupalGetHeader('Vary')), 'cookie,accept-encoding', 'Vary header was sent.');
     // Symfony's Response logic determines a specific order for the subvalues
@@ -235,7 +237,7 @@ class PageCacheTest extends WebTestBase {
     $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.');
 
     // Check cache.
-    $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
+    $this->drupalGet('system-test/set-header', ['query' => ['name' => 'Foo', 'value' => 'bar']]);
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.');
     $this->assertEqual(strtolower($this->drupalGetHeader('Vary')), 'cookie,accept-encoding', 'Vary: Cookie header was sent.');
     $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'max-age=300, public', 'Cache-Control header was sent.');
@@ -243,15 +245,15 @@ class PageCacheTest extends WebTestBase {
     $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.');
 
     // Check replacing default headers.
-    $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Expires', 'value' => 'Fri, 19 Nov 2008 05:00:00 GMT')));
+    $this->drupalGet('system-test/set-header', ['query' => ['name' => 'Expires', 'value' => 'Fri, 19 Nov 2008 05:00:00 GMT']]);
     $this->assertEqual($this->drupalGetHeader('Expires'), 'Fri, 19 Nov 2008 05:00:00 GMT', 'Default header was replaced.');
-    $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Vary', 'value' => 'User-Agent')));
+    $this->drupalGet('system-test/set-header', ['query' => ['name' => 'Vary', 'value' => 'User-Agent']]);
     $this->assertEqual(strtolower($this->drupalGetHeader('Vary')), 'user-agent,accept-encoding', 'Default header was replaced.');
 
     // Check that authenticated users bypass the cache.
     $user = $this->drupalCreateUser();
     $this->drupalLogin($user);
-    $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
+    $this->drupalGet('system-test/set-header', ['query' => ['name' => 'Foo', 'value' => 'bar']]);
     $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Caching was bypassed.');
     $this->assertTrue(strpos(strtolower($this->drupalGetHeader('Vary')), 'cookie') === FALSE, 'Vary: Cookie header was not sent.');
     $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, private', 'Cache-Control header was sent.');
@@ -330,7 +332,7 @@ class PageCacheTest extends WebTestBase {
   /**
    * Tests the 4xx-response cache tag is added and invalidated.
    */
-  function testPageCacheAnonymous403404() {
+  public function testPageCacheAnonymous403404() {
     $admin_url = Url::fromRoute('system.admin');
     $invalid_url = 'foo/does_not_exist';
     $tests = [
@@ -347,16 +349,16 @@ class PageCacheTest extends WebTestBase {
       $this->drupalGet($content_url);
       $this->assertResponse($code);
       $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
-      $entity_values = array(
+      $entity_values = [
         'name' => $this->randomMachineName(),
         'user_id' => 1,
-        'field_test_text' => array(
-          0 => array(
+        'field_test_text' => [
+          0 => [
             'value' => $this->randomString(),
             'format' => 'plain_text',
-          )
-        ),
-      );
+          ]
+        ],
+      ];
       $entity = EntityTest::create($entity_values);
       $entity->save();
       // Saving an entity clears 4xx cache tag.
@@ -378,19 +380,19 @@ class PageCacheTest extends WebTestBase {
       // Given that a second might have passed we cannot be sure that
       // $difference will exactly equal the default cache_ttl_4xx setting.
       // Account for any timing difference or rounding errors by ensuring the
-      // value is within 5 seconds.
+      // value is within 10 seconds.
       $this->assertTrue(
-        $difference > $cache_ttl_4xx - 5 &&
-        $difference < $cache_ttl_4xx + 5,
-        'The cache entry expiry time uses the cache_ttl_4xx setting.'
+        $difference > $cache_ttl_4xx - 10 &&
+        $difference < $cache_ttl_4xx + 10,
+        "The cache entry expiry time uses the cache_ttl_4xx setting. Expire: {$cache_item->expire} Created: {$cache_item->created}"
       );
     }
 
     // Disable 403 and 404 caching.
-    $settings['settings']['cache_ttl_4xx'] = (object) array(
+    $settings['settings']['cache_ttl_4xx'] = (object) [
       'value' => 0,
       'required' => TRUE,
-    );
+    ];
     $this->writeSettings($settings);
     \Drupal::service('cache.render')->deleteAll();
 
@@ -411,10 +413,10 @@ class PageCacheTest extends WebTestBase {
     $config->set('cache.page.max_age', 300);
     $config->save();
 
-    $settings['settings']['omit_vary_cookie'] = (object) array(
+    $settings['settings']['omit_vary_cookie'] = (object) [
       'value' => TRUE,
       'required' => TRUE,
-    );
+    ];
     $this->writeSettings($settings);
 
     // Fill the cache.
diff --git a/web/core/modules/page_cache/tests/modules/page_cache_form_test.install b/web/core/modules/page_cache/tests/modules/page_cache_form_test.install
index 72e3d70b4..07f68ce48 100644
--- a/web/core/modules/page_cache/tests/modules/page_cache_form_test.install
+++ b/web/core/modules/page_cache/tests/modules/page_cache_form_test.install
@@ -5,6 +5,9 @@
  * Install hooks for page_cache_form_test.
  */
 
+/**
+ * Implements hook_install().
+ */
 function page_cache_form_test_install() {
   // Set an explicit module weight, to ensure that the form alter hook is
   // always called after page_cache_form_alter().
diff --git a/web/core/modules/path/migration_templates/d7_url_alias.yml b/web/core/modules/path/migration_templates/d7_url_alias.yml
index a3ddec1ad..713a34676 100644
--- a/web/core/modules/path/migration_templates/d7_url_alias.yml
+++ b/web/core/modules/path/migration_templates/d7_url_alias.yml
@@ -18,5 +18,17 @@ process:
       - constants/slash
       - alias
   langcode: language
+  node_translation:
+    -
+      plugin: explode
+      source: source
+      delimiter: /
+    -
+      plugin: extract
+      index:
+        - 1
+    -
+      plugin: migration
+      migration: d7_node_translation
 destination:
   plugin: url_alias
diff --git a/web/core/modules/path/path.api.php b/web/core/modules/path/path.api.php
index 04e1fb316..df20b95e9 100644
--- a/web/core/modules/path/path.api.php
+++ b/web/core/modules/path/path.api.php
@@ -21,10 +21,10 @@
  */
 function hook_path_insert($path) {
   db_insert('mytable')
-    ->fields(array(
+    ->fields([
       'alias' => $path['alias'],
       'pid' => $path['pid'],
-    ))
+    ])
     ->execute();
 }
 
@@ -40,7 +40,7 @@ function hook_path_insert($path) {
 function hook_path_update($path) {
   if ($path['alias'] != $path['original']['alias']) {
     db_update('mytable')
-      ->fields(array('alias' => $path['alias']))
+      ->fields(['alias' => $path['alias']])
       ->condition('pid', $path['pid'])
       ->execute();
   }
diff --git a/web/core/modules/path/path.install b/web/core/modules/path/path.install
index 7d454a00b..fba049eac 100644
--- a/web/core/modules/path/path.install
+++ b/web/core/modules/path/path.install
@@ -5,11 +5,6 @@
  * Update functions for the path module.
  */
 
-/**
- * @addtogroup updates-8.2.0
- * @{
- */
-
 /**
  * Change the path field to computed for node and taxonomy_term.
  */
@@ -26,7 +21,3 @@ function path_update_8200() {
     }
   }
 }
-
-/**
- * @} End of "addtogroup updates-8.2.0".
- */
diff --git a/web/core/modules/path/path.module b/web/core/modules/path/path.module
index 182c6a9dd..a724b773d 100644
--- a/web/core/modules/path/path.module
+++ b/web/core/modules/path/path.module
@@ -18,13 +18,13 @@ function path_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.path':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Path module allows you to specify an alias, or custom URL, for any existing internal system path. Aliases should not be confused with URL redirects, which allow you to forward a changed or inactive URL to a new URL. In addition to making URLs more readable, aliases also help search engines index content more effectively. Multiple aliases may be used for a single internal system path. To automate the aliasing of paths, you can install the contributed module <a href=":pathauto">Pathauto</a>. For more information, see the <a href=":path">online documentation for the Path module</a>.', array(':path' => 'https://www.drupal.org/documentation/modules/path', ':pathauto' => 'https://www.drupal.org/project/pathauto')) . '</p>';
+      $output .= '<p>' . t('The Path module allows you to specify an alias, or custom URL, for any existing internal system path. Aliases should not be confused with URL redirects, which allow you to forward a changed or inactive URL to a new URL. In addition to making URLs more readable, aliases also help search engines index content more effectively. Multiple aliases may be used for a single internal system path. To automate the aliasing of paths, you can install the contributed module <a href=":pathauto">Pathauto</a>. For more information, see the <a href=":path">online documentation for the Path module</a>.', [':path' => 'https://www.drupal.org/documentation/modules/path', ':pathauto' => 'https://www.drupal.org/project/pathauto']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Creating aliases') . '</dt>';
-      $output .= '<dd>' . t('If you create or edit a taxonomy term you can add an alias (for example <em>music/jazz</em>) in the field "URL alias". When creating or editing content you can add an alias (for example <em>about-us/team</em>) under the section "URL path settings" in the field "URL alias". Aliases for any other path can be added through the page <a href=":aliases">URL aliases</a>. To add aliases a user needs the permission <a href=":permissions">Create and edit URL aliases</a>.', array(':aliases' => \Drupal::url('path.admin_overview'), ':permissions' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-path')))) . '</dd>';
+      $output .= '<dd>' . t('If you create or edit a taxonomy term you can add an alias (for example <em>music/jazz</em>) in the field "URL alias". When creating or editing content you can add an alias (for example <em>about-us/team</em>) under the section "URL path settings" in the field "URL alias". Aliases for any other path can be added through the page <a href=":aliases">URL aliases</a>. To add aliases a user needs the permission <a href=":permissions">Create and edit URL aliases</a>.', [':aliases' => \Drupal::url('path.admin_overview'), ':permissions' => \Drupal::url('user.admin_permissions', [], ['fragment' => 'module-path'])]) . '</dd>';
       $output .= '<dt>' . t('Managing aliases') . '</dt>';
-      $output .= '<dd>' . t('The Path module provides a way to search and view a <a href=":aliases">list of all aliases</a> that are in use on your website. Aliases can be added, edited and deleted through this list.', array(':aliases' => \Drupal::url('path.admin_overview'))) . '</dd>';
+      $output .= '<dd>' . t('The Path module provides a way to search and view a <a href=":aliases">list of all aliases</a> that are in use on your website. Aliases can be added, edited and deleted through this list.', [':aliases' => \Drupal::url('path.admin_overview')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -41,20 +41,20 @@ function path_help($route_name, RouteMatchInterface $route_match) {
  */
 function path_form_node_form_alter(&$form, FormStateInterface $form_state) {
   $node = $form_state->getFormObject()->getEntity();
-  $form['path_settings'] = array(
+  $form['path_settings'] = [
     '#type' => 'details',
     '#title' => t('URL path settings'),
     '#open' => !empty($form['path']['widget'][0]['alias']['#value']),
     '#group' => 'advanced',
     '#access' => !empty($form['path']['#access']) && $node->hasField('path') && $node->get('path')->access('edit'),
-    '#attributes' => array(
-      'class' => array('path-form'),
-    ),
-    '#attached' => array(
-      'library' => array('path/drupal.path'),
-    ),
+    '#attributes' => [
+      'class' => ['path-form'],
+    ],
+    '#attached' => [
+      'library' => ['path/drupal.path'],
+    ],
     '#weight' => 30,
-  );
+  ];
   $form['path']['#group'] = 'path_settings';
 }
 
@@ -66,10 +66,10 @@ function path_entity_base_field_info(EntityTypeInterface $entity_type) {
     $fields['path'] = BaseFieldDefinition::create('path')
       ->setLabel(t('URL alias'))
       ->setTranslatable(TRUE)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'path',
         'weight' => 30,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE)
       ->setComputed(TRUE);
 
diff --git a/web/core/modules/path/src/Controller/PathController.php b/web/core/modules/path/src/Controller/PathController.php
index 26b5d7694..51f88dd67 100644
--- a/web/core/modules/path/src/Controller/PathController.php
+++ b/web/core/modules/path/src/Controller/PathController.php
@@ -69,63 +69,63 @@ class PathController extends ControllerBase {
     // alias with a language.
     $multilanguage = ($this->moduleHandler()->moduleExists('language') || $this->aliasStorage->languageAliasExists());
 
-    $header = array();
-    $header[] = array('data' => $this->t('Alias'), 'field' => 'alias', 'sort' => 'asc');
-    $header[] = array('data' => $this->t('System'), 'field' => 'source');
+    $header = [];
+    $header[] = ['data' => $this->t('Alias'), 'field' => 'alias', 'sort' => 'asc'];
+    $header[] = ['data' => $this->t('System'), 'field' => 'source'];
     if ($multilanguage) {
-      $header[] = array('data' => $this->t('Language'), 'field' => 'langcode');
+      $header[] = ['data' => $this->t('Language'), 'field' => 'langcode'];
     }
     $header[] = $this->t('Operations');
 
-    $rows = array();
+    $rows = [];
     $destination = $this->getDestinationArray();
     foreach ($this->aliasStorage->getAliasesForAdminListing($header, $keys) as $data) {
-      $row = array();
+      $row = [];
       // @todo Should Path module store leading slashes? See
       //   https://www.drupal.org/node/2430593.
-      $row['data']['alias'] = $this->l(Unicode::truncate($data->alias, 50, FALSE, TRUE), Url::fromUserInput($data->source, array(
-        'attributes' => array('title' => $data->alias),
-      )));
-      $row['data']['source'] = $this->l(Unicode::truncate($data->source, 50, FALSE, TRUE), Url::fromUserInput($data->source, array(
+      $row['data']['alias'] = $this->l(Unicode::truncate($data->alias, 50, FALSE, TRUE), Url::fromUserInput($data->source, [
+        'attributes' => ['title' => $data->alias],
+      ]));
+      $row['data']['source'] = $this->l(Unicode::truncate($data->source, 50, FALSE, TRUE), Url::fromUserInput($data->source, [
         'alias' => TRUE,
-        'attributes' => array('title' => $data->source),
-      )));
+        'attributes' => ['title' => $data->source],
+      ]));
       if ($multilanguage) {
         $row['data']['language_name'] = $this->languageManager()->getLanguageName($data->langcode);
       }
 
-      $operations = array();
-      $operations['edit'] = array(
+      $operations = [];
+      $operations['edit'] = [
         'title' => $this->t('Edit'),
         'url' => Url::fromRoute('path.admin_edit', ['pid' => $data->pid], ['query' => $destination]),
-      );
-      $operations['delete'] = array(
+      ];
+      $operations['delete'] = [
         'title' => $this->t('Delete'),
         'url' => Url::fromRoute('path.delete', ['pid' => $data->pid], ['query' => $destination]),
-      );
-      $row['data']['operations'] = array(
-        'data' => array(
+      ];
+      $row['data']['operations'] = [
+        'data' => [
           '#type' => 'operations',
           '#links' => $operations,
-        ),
-      );
+        ],
+      ];
 
       // If the system path maps to a different URL alias, highlight this table
       // row to let the user know of old aliases.
       if ($data->alias != $this->aliasManager->getAliasByPath($data->source, $data->langcode)) {
-        $row['class'] = array('warning');
+        $row['class'] = ['warning'];
       }
 
       $rows[] = $row;
     }
 
-    $build['path_table'] = array(
+    $build['path_table'] = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
-      '#empty' => $this->t('No URL aliases available. <a href=":link">Add URL alias</a>.', array(':link' => $this->url('path.admin_add'))),
-    );
-    $build['path_pager'] = array('#type' => 'pager');
+      '#empty' => $this->t('No URL aliases available. <a href=":link">Add URL alias</a>.', [':link' => $this->url('path.admin_add')]),
+    ];
+    $build['path_pager'] = ['#type' => 'pager'];
 
     return $build;
   }
diff --git a/web/core/modules/path/src/Form/AddForm.php b/web/core/modules/path/src/Form/AddForm.php
index 5b7acef8b..8f8d4f6b1 100644
--- a/web/core/modules/path/src/Form/AddForm.php
+++ b/web/core/modules/path/src/Form/AddForm.php
@@ -20,12 +20,12 @@ class AddForm extends PathFormBase {
    * {@inheritdoc}
    */
   protected function buildPath($pid) {
-    return array(
+    return [
       'source' => '',
       'alias' => '',
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'pid' => NULL,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/path/src/Form/DeleteForm.php b/web/core/modules/path/src/Form/DeleteForm.php
index 45cd9a280..b28fdc04e 100644
--- a/web/core/modules/path/src/Form/DeleteForm.php
+++ b/web/core/modules/path/src/Form/DeleteForm.php
@@ -57,7 +57,7 @@ class DeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return t('Are you sure you want to delete path alias %title?', array('%title' => $this->pathAlias['alias']));
+    return t('Are you sure you want to delete path alias %title?', ['%title' => $this->pathAlias['alias']]);
   }
 
   /**
@@ -71,7 +71,7 @@ class DeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, $pid = NULL) {
-    $this->pathAlias = $this->aliasStorage->load(array('pid' => $pid));
+    $this->pathAlias = $this->aliasStorage->load(['pid' => $pid]);
 
     $form = parent::buildForm($form, $form_state);
 
@@ -82,7 +82,7 @@ class DeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->aliasStorage->delete(array('pid' => $this->pathAlias['pid']));
+    $this->aliasStorage->delete(['pid' => $this->pathAlias['pid']]);
 
     $form_state->setRedirect('path.admin_overview');
   }
diff --git a/web/core/modules/path/src/Form/EditForm.php b/web/core/modules/path/src/Form/EditForm.php
index aeb285dad..7d4a36930 100644
--- a/web/core/modules/path/src/Form/EditForm.php
+++ b/web/core/modules/path/src/Form/EditForm.php
@@ -21,7 +21,7 @@ class EditForm extends PathFormBase {
    * {@inheritdoc}
    */
   protected function buildPath($pid) {
-    return $this->aliasStorage->load(array('pid' => $pid));
+    return $this->aliasStorage->load(['pid' => $pid]);
   }
 
   /**
@@ -31,27 +31,27 @@ class EditForm extends PathFormBase {
     $form = parent::buildForm($form, $form_state, $pid);
 
     $form['#title'] = $this->path['alias'];
-    $form['pid'] = array(
+    $form['pid'] = [
       '#type' => 'hidden',
       '#value' => $this->path['pid'],
-    );
+    ];
 
-    $url = new Url('path.delete', array(
+    $url = new Url('path.delete', [
       'pid' => $this->path['pid'],
-    ));
+    ]);
 
     if ($this->getRequest()->query->has('destination')) {
       $url->setOption('query', $this->getDestinationArray());
     }
 
-    $form['actions']['delete'] = array(
+    $form['actions']['delete'] = [
       '#type' => 'link',
       '#title' => $this->t('Delete'),
       '#url' => $url,
-      '#attributes' => array(
-        'class' => array('button', 'button--danger'),
-      ),
-    );
+      '#attributes' => [
+        'class' => ['button', 'button--danger'],
+      ],
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/path/src/Form/PathFilterForm.php b/web/core/modules/path/src/Form/PathFilterForm.php
index 6ac15855a..f7829061e 100644
--- a/web/core/modules/path/src/Form/PathFilterForm.php
+++ b/web/core/modules/path/src/Form/PathFilterForm.php
@@ -21,31 +21,31 @@ class PathFilterForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, $keys = NULL) {
-    $form['#attributes'] = array('class' => array('search-form'));
-    $form['basic'] = array(
+    $form['#attributes'] = ['class' => ['search-form']];
+    $form['basic'] = [
       '#type' => 'details',
       '#title' => $this->t('Filter aliases'),
       '#open' => TRUE,
-      '#attributes' => array('class' => array('container-inline')),
-    );
-    $form['basic']['filter'] = array(
+      '#attributes' => ['class' => ['container-inline']],
+    ];
+    $form['basic']['filter'] = [
       '#type' => 'search',
       '#title' => 'Path alias',
       '#title_display' => 'invisible',
       '#default_value' => $keys,
       '#maxlength' => 128,
       '#size' => 25,
-    );
-    $form['basic']['submit'] = array(
+    ];
+    $form['basic']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Filter'),
-    );
+    ];
     if ($keys) {
-      $form['basic']['reset'] = array(
+      $form['basic']['reset'] = [
         '#type' => 'submit',
         '#value' => $this->t('Reset'),
-        '#submit' => array('::resetForm'),
-      );
+        '#submit' => ['::resetForm'],
+      ];
     }
     return $form;
   }
@@ -54,9 +54,9 @@ class PathFilterForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setRedirect('path.admin_overview_filter', array(), array(
-      'query' => array('search' => trim($form_state->getValue('filter'))),
-    ));
+    $form_state->setRedirect('path.admin_overview_filter', [], [
+      'query' => ['search' => trim($form_state->getValue('filter'))],
+    ]);
   }
 
   /**
diff --git a/web/core/modules/path/src/Form/PathFormBase.php b/web/core/modules/path/src/Form/PathFormBase.php
index dba3a3fa5..884d24fb8 100644
--- a/web/core/modules/path/src/Form/PathFormBase.php
+++ b/web/core/modules/path/src/Form/PathFormBase.php
@@ -95,7 +95,7 @@ abstract class PathFormBase extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state, $pid = NULL) {
     $this->path = $this->buildPath($pid);
-    $form['source'] = array(
+    $form['source'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Existing system path'),
       '#default_value' => $this->path['source'],
@@ -104,8 +104,8 @@ abstract class PathFormBase extends FormBase {
       '#description' => $this->t('Specify the existing path you wish to alias. For example: /node/28, /forum/1, /taxonomy/term/1.'),
       '#field_prefix' => $this->requestContext->getCompleteBaseUrl(),
       '#required' => TRUE,
-    );
-    $form['alias'] = array(
+    ];
+    $form['alias'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Path alias'),
       '#default_value' => $this->path['alias'],
@@ -114,17 +114,17 @@ abstract class PathFormBase extends FormBase {
       '#description' => $this->t('Specify an alternative path by which this data can be accessed. For example, type "/about" when writing an about page.'),
       '#field_prefix' => $this->requestContext->getCompleteBaseUrl(),
       '#required' => TRUE,
-    );
+    ];
 
     // A hidden value unless language.module is enabled.
     if (\Drupal::moduleHandler()->moduleExists('language')) {
       $languages = \Drupal::languageManager()->getLanguages();
-      $language_options = array();
+      $language_options = [];
       foreach ($languages as $langcode => $language) {
         $language_options[$langcode] = $language->getName();
       }
 
-      $form['langcode'] = array(
+      $form['langcode'] = [
         '#type' => 'select',
         '#title' => $this->t('Language'),
         '#options' => $language_options,
@@ -133,21 +133,21 @@ abstract class PathFormBase extends FormBase {
         '#default_value' => $this->path['langcode'],
         '#weight' => -10,
         '#description' => $this->t('A path alias set for a specific language will always be used when displaying this page in that language, and takes precedence over path aliases set as <em>- None -</em>.'),
-      );
+      ];
     }
     else {
-      $form['langcode'] = array(
+      $form['langcode'] = [
         '#type' => 'value',
         '#value' => $this->path['langcode']
-      );
+      ];
     }
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
       '#button_type' => 'primary',
-    );
+    ];
 
     return $form;
   }
@@ -193,7 +193,7 @@ abstract class PathFormBase extends FormBase {
 
 
     if (!$this->pathValidator->isValid(trim($source, '/'))) {
-      $form_state->setErrorByName('source', t("The path '@link_path' is either invalid or you do not have access to it.", array('@link_path' => $source)));
+      $form_state->setErrorByName('source', t("The path '@link_path' is either invalid or you do not have access to it.", ['@link_path' => $source]));
     }
   }
 
diff --git a/web/core/modules/path/src/Plugin/Field/FieldType/PathItem.php b/web/core/modules/path/src/Plugin/Field/FieldType/PathItem.php
index 239588fd5..4d8da7a8a 100644
--- a/web/core/modules/path/src/Plugin/Field/FieldType/PathItem.php
+++ b/web/core/modules/path/src/Plugin/Field/FieldType/PathItem.php
@@ -37,7 +37,7 @@ class PathItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array();
+    return [];
   }
 
   /**
@@ -62,7 +62,7 @@ class PathItem extends FieldItemBase {
     else {
       // Delete old alias if user erased it.
       if ($this->pid && !$this->alias) {
-        \Drupal::service('path.alias_storage')->delete(array('pid' => $this->pid));
+        \Drupal::service('path.alias_storage')->delete(['pid' => $this->pid]);
       }
       // Only save a non-empty alias.
       elseif ($this->alias) {
diff --git a/web/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php b/web/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php
index 366db885a..b31af4694 100644
--- a/web/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php
+++ b/web/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php
@@ -26,47 +26,47 @@ class PathWidget extends WidgetBase {
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $entity = $items->getEntity();
-    $path = array();
+    $path = [];
     if (!$entity->isNew()) {
-      $conditions = array('source' => '/' . $entity->urlInfo()->getInternalPath());
+      $conditions = ['source' => '/' . $entity->urlInfo()->getInternalPath()];
       if ($items->getLangcode() != LanguageInterface::LANGCODE_NOT_SPECIFIED) {
         $conditions['langcode'] = $items->getLangcode();
       }
       $path = \Drupal::service('path.alias_storage')->load($conditions);
       if ($path === FALSE) {
-        $path = array();
+        $path = [];
       }
     }
-    $path += array(
+    $path += [
       'pid' => NULL,
       'source' => !$entity->isNew() ? '/' . $entity->urlInfo()->getInternalPath() : NULL,
       'alias' => '',
       'langcode' => $items->getLangcode(),
-    );
+    ];
 
-    $element += array(
-      '#element_validate' => array(array(get_class($this), 'validateFormElement')),
-    );
-    $element['alias'] = array(
+    $element += [
+      '#element_validate' => [[get_class($this), 'validateFormElement']],
+    ];
+    $element['alias'] = [
       '#type' => 'textfield',
       '#title' => $element['#title'],
       '#default_value' => $path['alias'],
       '#required' => $element['#required'],
       '#maxlength' => 255,
       '#description' => $this->t('Specify an alternative path by which this data can be accessed. For example, type "/about" when writing an about page.'),
-    );
-    $element['pid'] = array(
+    ];
+    $element['pid'] = [
       '#type' => 'value',
       '#value' => $path['pid'],
-    );
-    $element['source'] = array(
+    ];
+    $element['source'] = [
       '#type' => 'value',
       '#value' => $path['source'],
-    );
-    $element['langcode'] = array(
+    ];
+    $element['langcode'] = [
       '#type' => 'value',
       '#value' => $path['langcode'],
-    );
+    ];
     return $element;
   }
 
diff --git a/web/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php b/web/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
index a71bcc9cb..385ee4ba4 100644
--- a/web/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
+++ b/web/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
@@ -58,7 +58,7 @@ class UrlAlias extends DestinationBase implements ContainerFactoryPluginInterfac
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     $source = $row->getDestinationProperty('source');
     $alias = $row->getDestinationProperty('alias');
     $langcode = $row->getDestinationProperty('langcode');
@@ -75,7 +75,7 @@ class UrlAlias extends DestinationBase implements ContainerFactoryPluginInterfac
 
     $path = $this->aliasStorage->save($source, $alias, $langcode, $pid);
 
-    return array($path['pid']);
+    return [$path['pid']];
   }
 
   /**
diff --git a/web/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php b/web/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php
index 3529ce283..7714cbd1c 100644
--- a/web/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php
+++ b/web/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php
@@ -24,10 +24,10 @@ abstract class UrlAliasBase extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'pid' => $this->t('The numeric identifier of the path alias.'),
       'language' => $this->t('The language code of the URL alias.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/path/src/Tests/PathTestBase.php b/web/core/modules/path/src/Tests/PathTestBase.php
index c4a88af7d..33cf5aba9 100644
--- a/web/core/modules/path/src/Tests/PathTestBase.php
+++ b/web/core/modules/path/src/Tests/PathTestBase.php
@@ -6,6 +6,9 @@ use Drupal\simpletest\WebTestBase;
 
 /**
  * Provides a base class for testing the Path module.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\path\Functional\PathTestBase instead.
  */
 abstract class PathTestBase extends WebTestBase {
 
@@ -14,15 +17,15 @@ abstract class PathTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'path');
+  public static $modules = ['node', 'path'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create Basic page and Article node types.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-      $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
     }
   }
 
diff --git a/web/core/modules/path/src/Tests/PathAdminTest.php b/web/core/modules/path/tests/src/Functional/PathAdminTest.php
similarity index 84%
rename from web/core/modules/path/src/Tests/PathAdminTest.php
rename to web/core/modules/path/tests/src/Functional/PathAdminTest.php
index 906ce6433..a43a1f8de 100644
--- a/web/core/modules/path/src/Tests/PathAdminTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathAdminTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 /**
  * Tests the Path admin UI.
@@ -14,13 +14,13 @@ class PathAdminTest extends PathTestBase {
    *
    * @var array
    */
-  public static $modules = array('path');
+  public static $modules = ['path'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create test user and log in.
-    $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content', 'administer url aliases', 'create url aliases'));
+    $web_user = $this->drupalCreateUser(['create page content', 'edit own page content', 'administer url aliases', 'create url aliases']);
     $this->drupalLogin($web_user);
   }
 
@@ -35,63 +35,63 @@ class PathAdminTest extends PathTestBase {
 
     // Create aliases.
     $alias1 = '/' . $this->randomMachineName(8);
-    $edit = array(
+    $edit = [
       'source' => '/node/' . $node1->id(),
       'alias' => $alias1,
-    );
+    ];
     $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
 
     $alias2 = '/' . $this->randomMachineName(8);
-    $edit = array(
+    $edit = [
       'source' => '/node/' . $node2->id(),
       'alias' => $alias2,
-    );
+    ];
     $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
 
     $alias3 = '/' . $this->randomMachineName(4) . '/' . $this->randomMachineName(4);
-    $edit = array(
+    $edit = [
       'source' => '/node/' . $node3->id(),
       'alias' => $alias3,
-    );
+    ];
     $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
 
     // Filter by the first alias.
-    $edit = array(
+    $edit = [
       'filter' => $alias1,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Filter'));
     $this->assertLinkByHref($alias1);
     $this->assertNoLinkByHref($alias2);
     $this->assertNoLinkByHref($alias3);
 
     // Filter by the second alias.
-    $edit = array(
+    $edit = [
       'filter' => $alias2,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Filter'));
     $this->assertNoLinkByHref($alias1);
     $this->assertLinkByHref($alias2);
     $this->assertNoLinkByHref($alias3);
 
     // Filter by the third alias which has a slash.
-    $edit = array(
+    $edit = [
       'filter' => $alias3,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Filter'));
     $this->assertNoLinkByHref($alias1);
     $this->assertNoLinkByHref($alias2);
     $this->assertLinkByHref($alias3);
 
     // Filter by a random string with a different length.
-    $edit = array(
+    $edit = [
       'filter' => $this->randomMachineName(10),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Filter'));
     $this->assertNoLinkByHref($alias1);
     $this->assertNoLinkByHref($alias2);
 
     // Reset the filter.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm(NULL, $edit, t('Reset'));
     $this->assertLinkByHref($alias1);
     $this->assertLinkByHref($alias2);
diff --git a/web/core/modules/path/src/Tests/PathAliasTest.php b/web/core/modules/path/tests/src/Functional/PathAliasTest.php
similarity index 91%
rename from web/core/modules/path/src/Tests/PathAliasTest.php
rename to web/core/modules/path/tests/src/Functional/PathAliasTest.php
index 28c582dd4..a63ad3d7d 100644
--- a/web/core/modules/path/src/Tests/PathAliasTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathAliasTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Cache\Cache;
@@ -19,25 +19,25 @@ class PathAliasTest extends PathTestBase {
    *
    * @var array
    */
-  public static $modules = array('path');
+  public static $modules = ['path'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create test user and log in.
-    $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content', 'administer url aliases', 'create url aliases'));
+    $web_user = $this->drupalCreateUser(['create page content', 'edit own page content', 'administer url aliases', 'create url aliases']);
     $this->drupalLogin($web_user);
   }
 
   /**
    * Tests the path cache.
    */
-  function testPathCache() {
+  public function testPathCache() {
     // Create test node.
     $node1 = $this->drupalCreateNode();
 
     // Create alias.
-    $edit = array();
+    $edit = [];
     $edit['source'] = '/node/' . $node1->id();
     $edit['alias'] = '/' . $this->randomMachineName(8);
     $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
@@ -51,7 +51,7 @@ class PathAliasTest extends PathTestBase {
     // created.
     \Drupal::cache('data')->deleteAll();
     // Make sure the path is not converted to the alias.
-    $this->drupalGet(trim($edit['source'], '/'), array('alias' => TRUE));
+    $this->drupalGet(trim($edit['source'], '/'), ['alias' => TRUE]);
     $this->assertTrue(\Drupal::cache('data')->get('preload-paths:' . $edit['source']), 'Cache entry was created.');
 
     // Visit the alias for the node and confirm a cache entry is created.
@@ -65,12 +65,12 @@ class PathAliasTest extends PathTestBase {
   /**
    * Tests alias functionality through the admin interfaces.
    */
-  function testAdminAlias() {
+  public function testAdminAlias() {
     // Create test node.
     $node1 = $this->drupalCreateNode();
 
     // Create alias.
-    $edit = array();
+    $edit = [];
     $edit['source'] = '/node/' . $node1->id();
     $edit['alias'] = '/' . $this->getRandomGenerator()->word(8);
     $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
@@ -129,7 +129,7 @@ class PathAliasTest extends PathTestBase {
     $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
 
     // Confirm no duplicate was created.
-    $this->assertRaw(t('The alias %alias is already in use in this language.', array('%alias' => $edit['alias'])), 'Attempt to move alias was rejected.');
+    $this->assertRaw(t('The alias %alias is already in use in this language.', ['%alias' => $edit['alias']]), 'Attempt to move alias was rejected.');
 
     $edit_upper = $edit;
     $edit_upper['alias'] = Unicode::strtoupper($edit['alias']);
@@ -142,8 +142,8 @@ class PathAliasTest extends PathTestBase {
     // Delete alias.
     $this->drupalGet('admin/config/search/path/edit/' . $pid);
     $this->clickLink(t('Delete'));
-    $this->assertRaw(t('Are you sure you want to delete path alias %name?', array('%name' => $edit['alias'])));
-    $this->drupalPostForm(NULL, array(), t('Confirm'));
+    $this->assertRaw(t('Are you sure you want to delete path alias %name?', ['%name' => $edit['alias']]));
+    $this->drupalPostForm(NULL, [], t('Confirm'));
 
     // Confirm that the alias no longer works.
     $this->drupalGet($edit['alias']);
@@ -151,7 +151,7 @@ class PathAliasTest extends PathTestBase {
     $this->assertResponse(404);
 
     // Create a really long alias.
-    $edit = array();
+    $edit = [];
     $edit['source'] = '/node/' . $node1->id();
     $alias = '/' . $this->randomMachineName(128);
     $edit['alias'] = $alias;
@@ -166,7 +166,7 @@ class PathAliasTest extends PathTestBase {
     $node3 = $this->drupalCreateNode();
 
     // Create absolute path alias.
-    $edit = array();
+    $edit = [];
     $edit['source'] = '/node/' . $node3->id();
     $node3_alias = '/' . $this->randomMachineName(8);
     $edit['alias'] = $node3_alias;
@@ -176,7 +176,7 @@ class PathAliasTest extends PathTestBase {
     $node4 = $this->drupalCreateNode();
 
     // Create alias with trailing slash.
-    $edit = array();
+    $edit = [];
     $edit['source'] = '/node/' . $node4->id();
     $node4_alias = '/' . $this->randomMachineName(8);
     $edit['alias'] = $node4_alias . '/';
@@ -205,12 +205,12 @@ class PathAliasTest extends PathTestBase {
     $edit['alias'] = $node4_alias;
     $edit['source'] = '/node/' . $node3->id();
     $this->drupalPostForm('admin/config/search/path/edit/' . $pid, $edit, t('Save'));
-    $this->assertRaw(t('The alias %alias is already in use in this language.', array('%alias' => $edit['alias'])));
+    $this->assertRaw(t('The alias %alias is already in use in this language.', ['%alias' => $edit['alias']]));
 
     // Create an alias without a starting slash.
     $node5 = $this->drupalCreateNode();
 
-    $edit = array();
+    $edit = [];
     $edit['source'] = 'node/' . $node5->id();
     $node5_alias = $this->randomMachineName(8);
     $edit['alias'] = $node5_alias . '/';
@@ -224,12 +224,12 @@ class PathAliasTest extends PathTestBase {
   /**
    * Tests alias functionality through the node interfaces.
    */
-  function testNodeAlias() {
+  public function testNodeAlias() {
     // Create test node.
     $node1 = $this->drupalCreateNode();
 
     // Create alias.
-    $edit = array();
+    $edit = [];
     $edit['path[0][alias]'] = '/' . $this->randomMachineName(8);
     $this->drupalPostForm('node/' . $node1->id() . '/edit', $edit, t('Save'));
 
@@ -284,7 +284,7 @@ class PathAliasTest extends PathTestBase {
     $this->assertText(t('The alias is already in use.'), 'Attempt to moved alias was rejected.');
 
     // Delete alias.
-    $this->drupalPostForm('node/' . $node1->id() . '/edit', array('path[0][alias]' => ''), t('Save'));
+    $this->drupalPostForm('node/' . $node1->id() . '/edit', ['path[0][alias]' => ''], t('Save'));
 
     // Confirm that the alias no longer works.
     $this->drupalGet($edit['path[0][alias]']);
@@ -295,7 +295,7 @@ class PathAliasTest extends PathTestBase {
     $node3 = $this->drupalCreateNode();
 
     // Set its path alias to an absolute path.
-    $edit = array('path[0][alias]' => '/' . $this->randomMachineName(8));
+    $edit = ['path[0][alias]' => '/' . $this->randomMachineName(8)];
     $this->drupalPostForm('node/' . $node3->id() . '/edit', $edit, t('Save'));
 
     // Confirm that the alias was converted to a relative path.
@@ -307,7 +307,7 @@ class PathAliasTest extends PathTestBase {
     $node4 = $this->drupalCreateNode();
 
     // Set its path alias to have a trailing slash.
-    $edit = array('path[0][alias]' => '/' . $this->randomMachineName(8) . '/');
+    $edit = ['path[0][alias]' => '/' . $this->randomMachineName(8) . '/'];
     $this->drupalPostForm('node/' . $node4->id() . '/edit', $edit, t('Save'));
 
     // Confirm that the alias was converted to a relative path.
@@ -319,7 +319,7 @@ class PathAliasTest extends PathTestBase {
     $node5 = $this->drupalCreateNode();
 
     // Set a path alias.
-    $edit = array('path[0][alias]' => '/' . $this->randomMachineName(8));
+    $edit = ['path[0][alias]' => '/' . $this->randomMachineName(8)];
     $this->drupalPostForm('node/' . $node5->id() . '/edit', $edit, t('Save'));
 
     // Delete the node and check that the path alias is also deleted.
@@ -337,17 +337,17 @@ class PathAliasTest extends PathTestBase {
    * @return int
    *   Integer representing the path ID.
    */
-  function getPID($alias) {
-    return db_query("SELECT pid FROM {url_alias} WHERE alias = :alias", array(':alias' => $alias))->fetchField();
+  public function getPID($alias) {
+    return db_query("SELECT pid FROM {url_alias} WHERE alias = :alias", [':alias' => $alias])->fetchField();
   }
 
   /**
    * Tests that duplicate aliases fail validation.
    */
-  function testDuplicateNodeAlias() {
+  public function testDuplicateNodeAlias() {
     // Create one node with a random alias.
     $node_one = $this->drupalCreateNode();
-    $edit = array();
+    $edit = [];
     $edit['path[0][alias]'] = '/' . $this->randomMachineName();
     $this->drupalPostForm('node/' . $node_one->id() . '/edit', $edit, t('Save'));
 
diff --git a/web/core/modules/path/src/Tests/PathLanguageTest.php b/web/core/modules/path/tests/src/Functional/PathLanguageTest.php
similarity index 91%
rename from web/core/modules/path/src/Tests/PathLanguageTest.php
rename to web/core/modules/path/tests/src/Functional/PathLanguageTest.php
index 4cb2c994b..8e41edeae 100644
--- a/web/core/modules/path/src/Tests/PathLanguageTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 /**
  * Confirm that paths work with translated nodes.
@@ -14,7 +14,7 @@ class PathLanguageTest extends PathTestBase {
    *
    * @var array
    */
-  public static $modules = array('path', 'locale', 'locale_test', 'content_translation');
+  public static $modules = ['path', 'locale', 'locale_test', 'content_translation'];
 
   /**
    * An user with permissions to administer content types.
@@ -26,7 +26,7 @@ class PathLanguageTest extends PathTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $permissions = array(
+    $permissions = [
       'access administration pages',
       'administer content translation',
       'administer content types',
@@ -37,29 +37,29 @@ class PathLanguageTest extends PathTestBase {
       'create url aliases',
       'edit any page content',
       'translate any entity',
-    );
+    ];
     // Create and log in user.
     $this->webUser = $this->drupalCreateUser($permissions);
     $this->drupalLogin($this->webUser);
 
     // Enable French language.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'fr';
 
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Enable URL language detection and selection.
-    $edit = array('language_interface[enabled][language-url]' => 1);
+    $edit = ['language_interface[enabled][language-url]' => 1];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Enable translation for page node.
-    $edit = array(
+    $edit = [
       'entity_types[node]' => 1,
       'settings[node][page][translatable]' => 1,
       'settings[node][page][fields][path]' => 1,
       'settings[node][page][fields][body]' => 1,
       'settings[node][page][settings][language][language_alterable]' => 1,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
     \Drupal::entityManager()->clearCachedDefinitions();
 
@@ -71,13 +71,13 @@ class PathLanguageTest extends PathTestBase {
   /**
    * Test alias functionality through the admin interfaces.
    */
-  function testAliasTranslation() {
+  public function testAliasTranslation() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
-    $english_node = $this->drupalCreateNode(array('type' => 'page', 'langcode' => 'en'));
+    $english_node = $this->drupalCreateNode(['type' => 'page', 'langcode' => 'en']);
     $english_alias = $this->randomMachineName();
 
     // Edit the node to set language and path.
-    $edit = array();
+    $edit = [];
     $edit['path[0][alias]'] = '/' . $english_alias;
     $this->drupalPostForm('node/' . $english_node->id() . '/edit', $edit, t('Save'));
 
@@ -89,7 +89,7 @@ class PathLanguageTest extends PathTestBase {
     $this->drupalGet('node/' . $english_node->id() . '/translations');
     $this->clickLink(t('Add'));
 
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $edit['body[0][value]'] = $this->randomMachineName();
     $french_alias = $this->randomMachineName();
@@ -105,7 +105,7 @@ class PathLanguageTest extends PathTestBase {
     $languages = $this->container->get('language_manager')->getLanguages();
 
     // Ensure the node was created.
-    $node_storage->resetCache(array($english_node->id()));
+    $node_storage->resetCache([$english_node->id()]);
     $english_node = $node_storage->load($english_node->id());
     $english_node_french_translation = $english_node->getTranslation('fr');
     $this->assertTrue($english_node->hasTranslation('fr'), 'Node found in database.');
@@ -118,22 +118,22 @@ class PathLanguageTest extends PathTestBase {
     // many levels, and we need to clear those caches.
     $this->container->get('language_manager')->reset();
     $languages = $this->container->get('language_manager')->getLanguages();
-    $url = $english_node_french_translation->url('canonical', array('language' => $languages['fr']));
+    $url = $english_node_french_translation->url('canonical', ['language' => $languages['fr']]);
 
     $this->assertTrue(strpos($url, $edit['path[0][alias]']), 'URL contains the path alias.');
 
     // Confirm that the alias works even when changing language negotiation
     // options. Enable User language detection and selection over URL one.
-    $edit = array(
+    $edit = [
       'language_interface[enabled][language-user]' => 1,
       'language_interface[weight][language-user]' => -9,
       'language_interface[enabled][language-url]' => 1,
       'language_interface[weight][language-url]' => -8,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Change user language preference.
-    $edit = array('preferred_langcode' => 'fr');
+    $edit = ['preferred_langcode' => 'fr'];
     $this->drupalPostForm("user/" . $this->webUser->id() . "/edit", $edit, t('Save'));
 
     // Check that the English alias works. In this situation French is the
@@ -152,7 +152,7 @@ class PathLanguageTest extends PathTestBase {
     $this->assertText($english_node_french_translation->body->value, 'Alias for French translation works.');
 
     // Disable URL language negotiation.
-    $edit = array('language_interface[enabled][language-url]' => FALSE);
+    $edit = ['language_interface[enabled][language-url]' => FALSE];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Check that the English alias still works.
diff --git a/web/core/modules/path/src/Tests/PathLanguageUiTest.php b/web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
similarity index 77%
rename from web/core/modules/path/src/Tests/PathLanguageUiTest.php
rename to web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
index 540cc85db..c2e327624 100644
--- a/web/core/modules/path/src/Tests/PathLanguageUiTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 /**
  * Confirm that the Path module user interface works with languages.
@@ -14,32 +14,32 @@ class PathLanguageUiTest extends PathTestBase {
    *
    * @var array
    */
-  public static $modules = array('path', 'locale', 'locale_test');
+  public static $modules = ['path', 'locale', 'locale_test'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create and log in user.
-    $web_user = $this->drupalCreateUser(array('edit any page content', 'create page content', 'administer url aliases', 'create url aliases', 'administer languages', 'access administration pages'));
+    $web_user = $this->drupalCreateUser(['edit any page content', 'create page content', 'administer url aliases', 'create url aliases', 'administer languages', 'access administration pages']);
     $this->drupalLogin($web_user);
 
     // Enable French language.
-    $edit = array();
+    $edit = [];
     $edit['predefined_langcode'] = 'fr';
 
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
 
     // Enable URL language detection and selection.
-    $edit = array('language_interface[enabled][language-url]' => 1);
+    $edit = ['language_interface[enabled][language-url]' => 1];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
   }
 
   /**
    * Tests that a language-neutral URL alias works.
    */
-  function testLanguageNeutralUrl() {
+  public function testLanguageNeutralUrl() {
     $name = $this->randomMachineName(8);
-    $edit = array();
+    $edit = [];
     $edit['source'] = '/admin/config/search/path';
     $edit['alias'] = '/' . $name;
     $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
@@ -51,9 +51,9 @@ class PathLanguageUiTest extends PathTestBase {
   /**
    * Tests that a default language URL alias works.
    */
-  function testDefaultLanguageUrl() {
+  public function testDefaultLanguageUrl() {
     $name = $this->randomMachineName(8);
-    $edit = array();
+    $edit = [];
     $edit['source'] = '/admin/config/search/path';
     $edit['alias'] = '/' . $name;
     $edit['langcode'] = 'en';
@@ -66,9 +66,9 @@ class PathLanguageUiTest extends PathTestBase {
   /**
    * Tests that a non-default language URL alias works.
    */
-  function testNonDefaultUrl() {
+  public function testNonDefaultUrl() {
     $name = $this->randomMachineName(8);
-    $edit = array();
+    $edit = [];
     $edit['source'] = '/admin/config/search/path';
     $edit['alias'] = '/' . $name;
     $edit['langcode'] = 'fr';
diff --git a/web/core/modules/path/src/Tests/PathNodeFormTest.php b/web/core/modules/path/tests/src/Functional/PathNodeFormTest.php
similarity index 86%
rename from web/core/modules/path/src/Tests/PathNodeFormTest.php
rename to web/core/modules/path/tests/src/Functional/PathNodeFormTest.php
index 79b43a773..ea730fdcf 100644
--- a/web/core/modules/path/src/Tests/PathNodeFormTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathNodeFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 /**
  * Tests the Path Node form UI.
@@ -14,13 +14,13 @@ class PathNodeFormTest extends PathTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'path');
+  public static $modules = ['node', 'path'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create test user and log in.
-    $web_user = $this->drupalCreateUser(array('create page content', 'create url aliases'));
+    $web_user = $this->drupalCreateUser(['create page content', 'create url aliases']);
     $this->drupalLogin($web_user);
   }
 
diff --git a/web/core/modules/path/src/Tests/PathTaxonomyTermTest.php b/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
similarity index 87%
rename from web/core/modules/path/src/Tests/PathTaxonomyTermTest.php
rename to web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
index f62fb6c4c..80bedab75 100644
--- a/web/core/modules/path/src/Tests/PathTaxonomyTermTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\path\Tests;
+namespace Drupal\Tests\path\Functional;
 
 use Drupal\taxonomy\Entity\Vocabulary;
 
@@ -16,7 +16,7 @@ class PathTaxonomyTermTest extends PathTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   protected function setUp() {
     parent::setUp();
@@ -29,24 +29,24 @@ class PathTaxonomyTermTest extends PathTestBase {
     $vocabulary->save();
 
     // Create and log in user.
-    $web_user = $this->drupalCreateUser(array('administer url aliases', 'administer taxonomy', 'access administration pages'));
+    $web_user = $this->drupalCreateUser(['administer url aliases', 'administer taxonomy', 'access administration pages']);
     $this->drupalLogin($web_user);
   }
 
   /**
    * Tests alias functionality through the admin interfaces.
    */
-  function testTermAlias() {
+  public function testTermAlias() {
     // Create a term in the default 'Tags' vocabulary with URL alias.
     $vocabulary = Vocabulary::load('tags');
     $description = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'name[0][value]' => $this->randomMachineName(),
       'description[0][value]' => $description,
       'path[0][alias]' => '/' . $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $vocabulary->id() . '/add', $edit, t('Save'));
-    $tid = db_query("SELECT tid FROM {taxonomy_term_field_data} WHERE name = :name AND default_langcode = 1", array(':name' => $edit['name[0][value]']))->fetchField();
+    $tid = db_query("SELECT tid FROM {taxonomy_term_field_data} WHERE name = :name AND default_langcode = 1", [':name' => $edit['name[0][value]']])->fetchField();
 
     // Confirm that the alias works.
     $this->drupalGet($edit['path[0][alias]']);
@@ -59,7 +59,7 @@ class PathTaxonomyTermTest extends PathTestBase {
     $this->assertTrue(!empty($elements), 'Term page contains shortlink URL.');
 
     // Change the term's URL alias.
-    $edit2 = array();
+    $edit2 = [];
     $edit2['path[0][alias]'] = '/' . $this->randomMachineName();
     $this->drupalPostForm('taxonomy/term/' . $tid . '/edit', $edit2, t('Save'));
 
@@ -73,7 +73,7 @@ class PathTaxonomyTermTest extends PathTestBase {
     $this->assertResponse(404, 'Old URL alias returns 404.');
 
     // Remove the term's URL alias.
-    $edit3 = array();
+    $edit3 = [];
     $edit3['path[0][alias]'] = '';
     $this->drupalPostForm('taxonomy/term/' . $tid . '/edit', $edit3, t('Save'));
 
diff --git a/web/core/modules/path/tests/src/Functional/PathTestBase.php b/web/core/modules/path/tests/src/Functional/PathTestBase.php
new file mode 100644
index 000000000..d4b8826d5
--- /dev/null
+++ b/web/core/modules/path/tests/src/Functional/PathTestBase.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\path\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Provides a base class for testing the Path module.
+ */
+abstract class PathTestBase extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'path'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create Basic page and Article node types.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+    }
+  }
+
+}
diff --git a/web/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php b/web/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
index 8df5392fc..0580b830c 100644
--- a/web/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
+++ b/web/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
@@ -61,46 +61,46 @@ class MigrateUrlAliasTest extends MigrateDrupal6TestBase {
   public function testUrlAlias() {
     $id_map = $this->getMigration('d6_url_alias')->getIdMap();
     // Test that the field exists.
-    $conditions = array(
+    $conditions = [
       'source' => '/node/1',
       'alias' => '/alias-one',
       'langcode' => 'af',
-    );
+    ];
     $path = \Drupal::service('path.alias_storage')->load($conditions);
     $this->assertPath('1', $conditions, $path);
-    $this->assertIdentical($id_map->lookupDestinationID(array($path['pid'])), array('1'), "Test IdMap");
+    $this->assertIdentical($id_map->lookupDestinationID([$path['pid']]), ['1'], "Test IdMap");
 
-    $conditions = array(
+    $conditions = [
       'source' => '/node/2',
       'alias' => '/alias-two',
       'langcode' => 'en',
-    );
+    ];
     $path = \Drupal::service('path.alias_storage')->load($conditions);
     $this->assertPath('2', $conditions, $path);
 
     // Test that we can re-import using the UrlAlias destination.
     Database::getConnection('default', 'migrate')
       ->update('url_alias')
-      ->fields(array('dst' => 'new-url-alias'))
+      ->fields(['dst' => 'new-url-alias'])
       ->condition('src', 'node/2')
       ->execute();
 
     \Drupal::database()
       ->update($id_map->mapTableName())
-      ->fields(array('source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE))
+      ->fields(['source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE])
       ->execute();
     $migration = $this->getMigration('d6_url_alias');
     $this->executeMigration($migration);
 
-    $path = \Drupal::service('path.alias_storage')->load(array('pid' => $path['pid']));
+    $path = \Drupal::service('path.alias_storage')->load(['pid' => $path['pid']]);
     $conditions['alias'] = '/new-url-alias';
     $this->assertPath('2', $conditions, $path);
 
-    $conditions = array(
+    $conditions = [
       'source' => '/node/3',
       'alias' => '/alias-three',
       'langcode' => 'und',
-    );
+    ];
     $path = \Drupal::service('path.alias_storage')->load($conditions);
     $this->assertPath('3', $conditions, $path);
   }
diff --git a/web/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php b/web/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php
index 88c102b4e..18452fedf 100644
--- a/web/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php
+++ b/web/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php
@@ -14,14 +14,33 @@ class MigrateUrlAliasTest extends MigrateDrupal7TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['path'];
+  public static $modules = [
+    'content_translation',
+    'language',
+    'node',
+    'path',
+    'text',
+  ];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d7_url_alias');
+
+    $this->installEntitySchema('node');
+    $this->installConfig('node');
+    $this->installSchema('node', ['node_access']);
+
+    $this->executeMigrations([
+      'language',
+      'd7_user_role',
+      'd7_user',
+      'd7_node_type',
+      'd7_node',
+      'd7_node_translation',
+      'd7_url_alias',
+    ]);
   }
 
   /**
@@ -38,4 +57,33 @@ class MigrateUrlAliasTest extends MigrateDrupal7TestBase {
     $this->assertIdentical('und', $path['langcode']);
   }
 
+  /**
+   * Test the URL alias migration with translated nodes.
+   */
+  public function testUrlAliasWithTranslatedNodes() {
+    $alias_storage = $this->container->get('path.alias_storage');
+
+    // Alias for the 'The thing about Deep Space 9' node in English.
+    $path = $alias_storage->load(['alias' => '/deep-space-9']);
+    $this->assertSame('/node/2', $path['source']);
+    $this->assertSame('en', $path['langcode']);
+
+    // Alias for the 'The thing about Deep Space 9' Icelandic translation,
+    // which should now point to node/2 instead of node/3.
+    $path = $alias_storage->load(['alias' => '/deep-space-9-is']);
+    $this->assertSame('/node/2', $path['source']);
+    $this->assertSame('is', $path['langcode']);
+
+    // Alias for the 'The thing about Firefly' node in Icelandic.
+    $path = $alias_storage->load(['alias' => '/firefly-is']);
+    $this->assertSame('/node/4', $path['source']);
+    $this->assertSame('is', $path['langcode']);
+
+    // Alias for the 'The thing about Firefly' English translation,
+    // which should now point to node/4 instead of node/5.
+    $path = $alias_storage->load(['alias' => '/firefly']);
+    $this->assertSame('/node/4', $path['source']);
+    $this->assertSame('en', $path['langcode']);
+  }
+
 }
diff --git a/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php b/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
index df64a5c2e..602e84f42 100644
--- a/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
+++ b/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
@@ -18,7 +18,7 @@ class PathNoCanonicalLinkTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('path', 'content_translation_test', 'language', 'entity_test', 'user', 'system');
+  public static $modules = ['path', 'content_translation_test', 'language', 'entity_test', 'user', 'system'];
 
   protected function setUp() {
     parent::setUp();
diff --git a/web/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php b/web/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php
index 0bb55ae5e..7ef7c2f37 100644
--- a/web/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php
+++ b/web/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php
@@ -21,7 +21,7 @@ class PathFieldDefinitionTest extends BaseFieldDefinitionTestBase {
    * {@inheritdoc}
    */
   protected function getModuleAndPath() {
-    return array('path', dirname(dirname(dirname(dirname(__DIR__)))));
+    return ['path', dirname(dirname(dirname(dirname(__DIR__))))];
   }
 
   /**
@@ -29,7 +29,7 @@ class PathFieldDefinitionTest extends BaseFieldDefinitionTestBase {
    * @covers ::getSchema
    */
   public function testGetColumns() {
-    $this->assertSame(array(), $this->definition->getColumns());
+    $this->assertSame([], $this->definition->getColumns());
   }
 
 }
diff --git a/web/core/modules/quickedit/js/views/EntityToolbarView.js b/web/core/modules/quickedit/js/views/EntityToolbarView.js
index 4e8e913dd..4fa0506f5 100644
--- a/web/core/modules/quickedit/js/views/EntityToolbarView.js
+++ b/web/core/modules/quickedit/js/views/EntityToolbarView.js
@@ -51,7 +51,7 @@
 
       // Reposition the entity toolbar as the viewport and the position within
       // the viewport changes.
-      $(window).on('resize.quickedit scroll.quickedit', debounce($.proxy(this.windowChangeHandler, this), 150));
+      $(window).on('resize.quickedit scroll.quickedit drupalViewportOffsetChange.quickedit', debounce($.proxy(this.windowChangeHandler, this), 150));
 
       // Adjust the fence placement within which the entity toolbar may be
       // positioned.
@@ -141,7 +141,7 @@
       this.$fence.remove();
 
       // Stop listening to additional events.
-      $(window).off('resize.quickedit scroll.quickedit');
+      $(window).off('resize.quickedit scroll.quickedit drupalViewportOffsetChange.quickedit');
       $(document).off('drupalViewportOffsetChange.quickedit');
 
       Backbone.View.prototype.remove.call(this);
diff --git a/web/core/modules/quickedit/quickedit.api.php b/web/core/modules/quickedit/quickedit.api.php
index 8e6a2a8ee..581b5616e 100644
--- a/web/core/modules/quickedit/quickedit.api.php
+++ b/web/core/modules/quickedit/quickedit.api.php
@@ -70,11 +70,11 @@ function hook_quickedit_editor_alter(&$editors) {
  * @see \Drupal\Core\Field\FieldItemListInterface::view()
  */
 function hook_quickedit_render_field(Drupal\Core\Entity\EntityInterface $entity, $field_name, $view_mode_id, $langcode) {
-  return array(
+  return [
     '#prefix' => '<div class="example-markup">',
     'field' => $entity->getTranslation($langcode)->get($field_name)->view($view_mode_id),
     '#suffix' => '</div>',
-  );
+  ];
 }
 
 /**
diff --git a/web/core/modules/quickedit/quickedit.module b/web/core/modules/quickedit/quickedit.module
index 2d69a66ea..051b94834 100644
--- a/web/core/modules/quickedit/quickedit.module
+++ b/web/core/modules/quickedit/quickedit.module
@@ -22,12 +22,12 @@ function quickedit_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.quickedit':
       $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Quick Edit module allows users with the <a href=":quickedit_permission">Access in-place editing</a> and <a href=":contextual_permission">Use contextual links</a> permissions to edit field content without visiting a separate page. For more information, see the <a href=":handbook_url">online documentation for the Quick Edit module</a>.', array(':handbook_url' => 'https://www.drupal.org/documentation/modules/edit', ':quickedit_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-quickedit')), ':contextual_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-contextual')))) . '</p>';
+      $output .= '<p>' . t('The Quick Edit module allows users with the <a href=":quickedit_permission">Access in-place editing</a> and <a href=":contextual_permission">Use contextual links</a> permissions to edit field content without visiting a separate page. For more information, see the <a href=":handbook_url">online documentation for the Quick Edit module</a>.', [':handbook_url' => 'https://www.drupal.org/documentation/modules/edit', ':quickedit_permission' => \Drupal::url('user.admin_permissions', [], ['fragment' => 'module-quickedit']), ':contextual_permission' => \Drupal::url('user.admin_permissions', [], ['fragment' => 'module-contextual'])]) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Editing content in-place') . '</dt>';
       $output .= '<dd>';
-      $output .= '<p>' . t('To edit content in place, you need to activate quick edit mode for a content item. Activate quick edit mode by choosing Quick edit from the contextual links for an area displaying the content (see the <a href=":contextual">Contextual Links module help</a> for more information about how to use contextual links).', array(':contextual' => \Drupal::url('help.page', array('name' => 'contextual')))) . '</p>';
+      $output .= '<p>' . t('To edit content in place, you need to activate quick edit mode for a content item. Activate quick edit mode by choosing Quick edit from the contextual links for an area displaying the content (see the <a href=":contextual">Contextual Links module help</a> for more information about how to use contextual links).', [':contextual' => \Drupal::url('help.page', ['name' => 'contextual'])]) . '</p>';
       $output .= '<p>' . t('Once quick edit mode is activated, you will be able to edit the individual fields of your content. In the default theme, with a JavaScript-enabled browser and a mouse, the output of different fields in your content is outlined in blue, a pop-up gives the field name as you hover over the field output, and clicking on a field activates the editor. Closing the pop-up window ends quick edit mode.') . '</p>';
       $output .= '</dd>';
       $output .= '</dl>';
@@ -108,7 +108,7 @@ function quickedit_field_formatter_info_alter(&$info) {
   foreach ($info as $key => $settings) {
     // Set in-place editor to 'form' if none is supplied.
     if (empty($settings['quickedit'])) {
-      $info[$key]['quickedit'] = array('editor' => 'form');
+      $info[$key]['quickedit'] = ['editor' => 'form'];
     }
   }
 }
@@ -117,7 +117,10 @@ function quickedit_field_formatter_info_alter(&$info) {
  * Implements hook_preprocess_HOOK() for the page title template.
  */
 function quickedit_preprocess_page_title(&$variables) {
-  $variables['title_attributes']['class'][] = 'js-quickedit-page-title';
+  $variables['#cache']['contexts'][] = 'user.permissions';
+  if (\Drupal::currentUser()->hasPermission('access in-place editing')) {
+    $variables['title_attributes']['class'][] = 'js-quickedit-page-title';
+  }
 }
 
 /**
diff --git a/web/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php b/web/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php
index 7ea42b434..1e84b0eb1 100644
--- a/web/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php
+++ b/web/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php
@@ -27,7 +27,7 @@ class FieldFormSavedCommand extends BaseCommand {
    *   The same re-rendered edited field, but in different view modes, for other
    *   instances of the same field on the user's page. Keyed by view mode.
    */
-  public function __construct($data, $other_view_modes = array()) {
+  public function __construct($data, $other_view_modes = []) {
     parent::__construct('quickeditFieldFormSaved', $data);
 
     $this->other_view_modes = $other_view_modes;
@@ -37,11 +37,11 @@ class FieldFormSavedCommand extends BaseCommand {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => $this->command,
       'data' => $this->data,
       'other_view_modes' => $this->other_view_modes,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/quickedit/src/EditorSelector.php b/web/core/modules/quickedit/src/EditorSelector.php
index a531b1a49..9149786f0 100644
--- a/web/core/modules/quickedit/src/EditorSelector.php
+++ b/web/core/modules/quickedit/src/EditorSelector.php
@@ -65,7 +65,7 @@ class EditorSelector implements EditorSelectorInterface {
     }
 
     // No early return, so create a list of all choices.
-    $editor_choices = array($editor_id);
+    $editor_choices = [$editor_id];
     if (isset($this->alternatives[$editor_id])) {
       $editor_choices = array_merge($editor_choices, $this->alternatives[$editor_id]);
     }
@@ -86,7 +86,7 @@ class EditorSelector implements EditorSelectorInterface {
    * {@inheritdoc}
    */
   public function getEditorAttachments(array $editor_ids) {
-    $attachments = array();
+    $attachments = [];
     $editor_ids = array_unique($editor_ids);
 
     // Editor plugins' attachments.
diff --git a/web/core/modules/quickedit/src/Form/QuickEditFieldForm.php b/web/core/modules/quickedit/src/Form/QuickEditFieldForm.php
index e64f3f2d1..ba2dac38e 100644
--- a/web/core/modules/quickedit/src/Form/QuickEditFieldForm.php
+++ b/web/core/modules/quickedit/src/Form/QuickEditFieldForm.php
@@ -100,19 +100,19 @@ class QuickEditFieldForm extends FormBase {
 
     // Add a dummy changed timestamp field to attach form errors to.
     if ($entity instanceof EntityChangedInterface) {
-      $form['changed_field'] = array(
+      $form['changed_field'] = [
         '#type' => 'hidden',
         '#value' => $entity->getChangedTime(),
-      );
+      ];
     }
 
     // Add a submit button. Give it a class for easy JavaScript targeting.
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => t('Save'),
-      '#attributes' => array('class' => array('quickedit-form-submit')),
-    );
+      '#attributes' => ['class' => ['quickedit-form-submit']],
+    ];
 
     // Simplify it for optimal in-place use.
     $this->simplify($form, $form_state);
@@ -183,7 +183,7 @@ class QuickEditFieldForm extends FormBase {
     // @todo Refine automated log messages and abstract them to all entity
     //   types: https://www.drupal.org/node/1678002.
     if ($entity->getEntityTypeId() == 'node' && $entity->isNewRevision() && $entity->revision_log->isEmpty()) {
-      $entity->revision_log = t('Updated the %field-name field through in-place editing.', array('%field-name' => $entity->get($field_name)->getFieldDefinition()->getLabel()));
+      $entity->revision_log = t('Updated the %field-name field through in-place editing.', ['%field-name' => $entity->get($field_name)->getFieldDefinition()->getLabel()]);
     }
 
     return $entity;
diff --git a/web/core/modules/quickedit/src/MetadataGenerator.php b/web/core/modules/quickedit/src/MetadataGenerator.php
index a22bf65a6..71b750d4a 100644
--- a/web/core/modules/quickedit/src/MetadataGenerator.php
+++ b/web/core/modules/quickedit/src/MetadataGenerator.php
@@ -54,9 +54,9 @@ class MetadataGenerator implements MetadataGeneratorInterface {
    * {@inheritdoc}
    */
   public function generateEntityMetadata(EntityInterface $entity) {
-    return array(
+    return [
       'label' => $entity->label(),
-    );
+    ];
   }
 
   /**
@@ -69,24 +69,24 @@ class MetadataGenerator implements MetadataGeneratorInterface {
     // Early-return if user does not have access.
     $access = $this->accessChecker->accessEditEntityField($entity, $field_name);
     if (!$access) {
-      return array('access' => FALSE);
+      return ['access' => FALSE];
     }
 
     // Early-return if no editor is available.
     $formatter_id = EntityViewDisplay::collectRenderDisplay($entity, $view_mode)->getRenderer($field_name)->getPluginId();
     $editor_id = $this->editorSelector->getEditor($formatter_id, $items);
     if (!isset($editor_id)) {
-      return array('access' => FALSE);
+      return ['access' => FALSE];
     }
 
     // Gather metadata, allow the editor to add additional metadata of its own.
     $label = $items->getFieldDefinition()->getLabel();
     $editor = $this->editorManager->createInstance($editor_id);
-    $metadata = array(
+    $metadata = [
       'label' => $label,
       'access' => TRUE,
       'editor' => $editor_id,
-    );
+    ];
     $custom_metadata = $editor->getMetadata($items);
     if (count($custom_metadata)) {
       $metadata['custom'] = $custom_metadata;
diff --git a/web/core/modules/quickedit/src/Plugin/InPlaceEditor/FormEditor.php b/web/core/modules/quickedit/src/Plugin/InPlaceEditor/FormEditor.php
index 6a9907086..83ab1b463 100644
--- a/web/core/modules/quickedit/src/Plugin/InPlaceEditor/FormEditor.php
+++ b/web/core/modules/quickedit/src/Plugin/InPlaceEditor/FormEditor.php
@@ -25,11 +25,11 @@ class FormEditor extends InPlaceEditorBase {
    * {@inheritdoc}
    */
   public function getAttachments() {
-    return array(
-      'library' => array(
+    return [
+      'library' => [
         'quickedit/quickedit.inPlaceEditor.form',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/quickedit/src/Plugin/InPlaceEditor/PlainTextEditor.php b/web/core/modules/quickedit/src/Plugin/InPlaceEditor/PlainTextEditor.php
index 1f61a5621..5217c20f4 100644
--- a/web/core/modules/quickedit/src/Plugin/InPlaceEditor/PlainTextEditor.php
+++ b/web/core/modules/quickedit/src/Plugin/InPlaceEditor/PlainTextEditor.php
@@ -28,11 +28,11 @@ class PlainTextEditor extends InPlaceEditorBase {
    * {@inheritdoc}
    */
   public function getAttachments() {
-    return array(
-      'library' => array(
+    return [
+      'library' => [
         'quickedit/quickedit.inPlaceEditor.plainText',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/quickedit/src/Plugin/InPlaceEditorBase.php b/web/core/modules/quickedit/src/Plugin/InPlaceEditorBase.php
index d09c38e18..005f41fb8 100644
--- a/web/core/modules/quickedit/src/Plugin/InPlaceEditorBase.php
+++ b/web/core/modules/quickedit/src/Plugin/InPlaceEditorBase.php
@@ -18,8 +18,8 @@ abstract class InPlaceEditorBase extends PluginBase implements InPlaceEditorInte
   /**
    * {@inheritdoc}
    */
-  function getMetadata(FieldItemListInterface $items) {
-    return array();
+  public function getMetadata(FieldItemListInterface $items) {
+    return [];
   }
 
 }
diff --git a/web/core/modules/quickedit/src/QuickEditController.php b/web/core/modules/quickedit/src/QuickEditController.php
index a42bcd093..2b1e4b230 100644
--- a/web/core/modules/quickedit/src/QuickEditController.php
+++ b/web/core/modules/quickedit/src/QuickEditController.php
@@ -98,7 +98,7 @@ class QuickEditController extends ControllerBase {
     }
     $entities = $request->request->get('entities');
 
-    $metadata = array();
+    $metadata = [];
     foreach ($fields as $field) {
       list($entity_type, $entity_id, $field_name, $langcode, $view_mode) = explode('/', $field);
 
@@ -205,7 +205,7 @@ class QuickEditController extends ControllerBase {
 
       // Re-render the updated field for other view modes (i.e. for other
       // instances of the same logical field on the user's page).
-      $other_view_mode_ids = $request->request->get('other_view_modes') ?: array();
+      $other_view_mode_ids = $request->request->get('other_view_modes') ?: [];
       $other_view_modes = array_map($render_field_in_view_mode, array_combine($other_view_mode_ids, $other_view_mode_ids));
 
       $response->addCommand(new FieldFormSavedCommand($output, $other_view_modes));
@@ -220,9 +220,9 @@ class QuickEditController extends ControllerBase {
 
       $errors = $form_state->getErrors();
       if (count($errors)) {
-        $status_messages = array(
+        $status_messages = [
           '#type' => 'status_messages'
-        );
+        ];
         $response->addCommand(new FieldFormValidationErrorsCommand($this->renderer->renderRoot($status_messages)));
       }
     }
@@ -266,7 +266,7 @@ class QuickEditController extends ControllerBase {
       // by a dash; the first part must be the module name.
       $mode_id_parts = explode('-', $view_mode_id, 2);
       $module = reset($mode_id_parts);
-      $args = array($entity, $field_name, $view_mode_id, $langcode);
+      $args = [$entity, $field_name, $view_mode_id, $langcode];
       $output = $this->moduleHandler()->invoke($module, 'quickedit_render_field', $args);
     }
 
@@ -291,10 +291,10 @@ class QuickEditController extends ControllerBase {
 
     // Return information about the entity that allows a front end application
     // to identify it.
-    $output = array(
+    $output = [
       'entity_type' => $entity->getEntityTypeId(),
       'entity_id' => $entity->id()
-    );
+    ];
 
     // Respond to client that the entity was saved properly.
     $response = new AjaxResponse();
diff --git a/web/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php b/web/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
index 1eedb1c66..a1ef6cd2e 100644
--- a/web/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
+++ b/web/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
@@ -25,7 +25,7 @@ class QuickEditAutocompleteTermTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'taxonomy', 'quickedit');
+  public static $modules = ['node', 'taxonomy', 'quickedit'];
 
   /**
    * Stores the node used for the tests.
@@ -72,9 +72,9 @@ class QuickEditAutocompleteTermTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'article',
-    ));
+    ]);
     // Create the vocabulary for the tag field.
     $this->vocabulary = Vocabulary::create([
       'name' => 'quickedit testing tags',
@@ -83,12 +83,12 @@ class QuickEditAutocompleteTermTest extends WebTestBase {
     $this->vocabulary->save();
     $this->fieldName = 'field_' . $this->vocabulary->id();
 
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'article', $this->fieldName, 'Tags', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', 'article', 'default')
@@ -114,7 +114,7 @@ class QuickEditAutocompleteTermTest extends WebTestBase {
     $this->term1 = $this->createTerm();
     $this->term2 = $this->createTerm();
 
-    $node = array();
+    $node = [];
     $node['type'] = 'article';
     $node[$this->fieldName][]['target_id'] = $this->term1->id();
     $node[$this->fieldName][]['target_id'] = $this->term2->id();
@@ -130,7 +130,7 @@ class QuickEditAutocompleteTermTest extends WebTestBase {
     $this->drupalLogin($this->editorUser);
 
     $quickedit_uri = 'quickedit/form/node/' . $this->node->id() . '/' . $this->fieldName . '/' . $this->node->language()->getId() . '/full';
-    $post = array('nocssjs' => 'true') + $this->getAjaxPageStatePostData();
+    $post = ['nocssjs' => 'true'] + $this->getAjaxPageStatePostData();
     $response = $this->drupalPost($quickedit_uri, '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
     $ajax_commands = Json::decode($response);
 
@@ -140,13 +140,13 @@ class QuickEditAutocompleteTermTest extends WebTestBase {
     $this->assertTrue($form_tokens_found, 'Form tokens found in output.');
 
     if ($form_tokens_found) {
-      $post = array(
+      $post = [
         'form_id' => 'quickedit_field_form',
         'form_token' => $token_match[1],
         'form_build_id' => $build_id_match[1],
-        $this->fieldName . '[target_id]' => implode(', ', array($this->term1->getName(), 'new term', $this->term2->getName())),
+        $this->fieldName . '[target_id]' => implode(', ', [$this->term1->getName(), 'new term', $this->term2->getName()]),
         'op' => t('Save'),
-      );
+      ];
 
       // Submit field form and check response. Should render back all the terms.
       $response = $this->drupalPost($quickedit_uri, '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
@@ -161,7 +161,7 @@ class QuickEditAutocompleteTermTest extends WebTestBase {
       // Load the form again, which should now get it back from
       // PrivateTempStore.
       $quickedit_uri = 'quickedit/form/node/' . $this->node->id() . '/' . $this->fieldName . '/' . $this->node->language()->getId() . '/full';
-      $post = array('nocssjs' => 'true') + $this->getAjaxPageStatePostData();
+      $post = ['nocssjs' => 'true'] + $this->getAjaxPageStatePostData();
       $response = $this->drupalPost($quickedit_uri, '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
       $ajax_commands = Json::decode($response);
 
@@ -170,15 +170,15 @@ class QuickEditAutocompleteTermTest extends WebTestBase {
       // taxonomy terms, including the one that has just been newly created and
       // which is not yet stored.
       $this->setRawContent($ajax_commands[0]['data']);
-      $expected = array(
+      $expected = [
         $this->term1->getName() . ' (' . $this->term1->id() . ')',
         'new term',
         $this->term2->getName() . ' (' . $this->term2->id() . ')',
-      );
+      ];
       $this->assertFieldByName($this->fieldName . '[target_id]', implode(', ', $expected));
 
       // Save the entity.
-      $post = array('nocssjs' => 'true');
+      $post = ['nocssjs' => 'true'];
       $response = $this->drupalPostWithFormat('quickedit/entity/node/' . $this->node->id(), 'json', $post);
       $this->assertResponse(200);
 
diff --git a/web/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php b/web/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
index 2a91feca3..a6705f41e 100644
--- a/web/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
+++ b/web/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
@@ -27,13 +27,13 @@ class QuickEditLoadingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'contextual',
     'quickedit',
     'filter',
     'node',
     'image',
-  );
+  ];
 
   /**
    * An user with permissions to create and edit articles.
@@ -53,19 +53,19 @@ class QuickEditLoadingTest extends WebTestBase {
     parent::setUp();
 
     // Create a text format.
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $filtered_html_format->save();
 
     // Create a node type.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'article',
       'name' => 'Article',
-    ));
+    ]);
 
     // Set the node type to initially not have revisions.
     // Testing with revisions will be done later.
@@ -74,22 +74,22 @@ class QuickEditLoadingTest extends WebTestBase {
     $node_type->save();
 
     // Create one node of the above node type using the above text format.
-    $this->drupalCreateNode(array(
+    $this->drupalCreateNode([
       'type' => 'article',
-      'body' => array(
-        0 => array(
+      'body' => [
+        0 => [
           'value' => '<p>How are you?</p>',
           'format' => 'filtered_html',
-        )
-      ),
+        ]
+      ],
       'revision_log' => $this->randomString(),
-    ));
+    ]);
 
     // Create 2 users, the only difference being the ability to use in-place
     // editing
-    $basic_permissions = array('access content', 'create article content', 'edit any article content', 'use text format filtered_html', 'access contextual links');
+    $basic_permissions = ['access content', 'create article content', 'edit any article content', 'use text format filtered_html', 'access contextual links'];
     $this->authorUser = $this->drupalCreateUser($basic_permissions);
-    $this->editorUser = $this->drupalCreateUser(array_merge($basic_permissions, array('access in-place editing')));
+    $this->editorUser = $this->drupalCreateUser(array_merge($basic_permissions, ['access in-place editing']));
   }
 
   /**
@@ -103,29 +103,31 @@ class QuickEditLoadingTest extends WebTestBase {
     $this->assertNoRaw('core/modules/quickedit/js/quickedit.js', 'Quick Edit library not loaded.');
     $this->assertNoRaw('core/modules/quickedit/js/editors/formEditor.js', "'form' in-place editor not loaded.");
 
-    // HTML annotation does not exist for users without permission to in-place
-    // edit.
+    // HTML annotation and title class does not exist for users without
+    // permission to in-place edit.
     $this->assertNoRaw('data-quickedit-entity-id="node/1"');
     $this->assertNoRaw('data-quickedit-field-id="node/1/body/en/full"');
+    $this->assertNoFieldByXPath('//h1[contains(@class, "js-quickedit-page-title")]');
 
     // Retrieving the metadata should result in an empty 403 response.
-    $post = array('fields[0]' => 'node/1/body/en/full');
+    $post = ['fields[0]' => 'node/1/body/en/full'];
     $response = $this->drupalPostWithFormat(Url::fromRoute('quickedit.metadata'), 'json', $post);
-    $this->assertIdentical('{"message":""}', $response);
+    $this->assertIdentical(Json::encode(['message' => "The 'access in-place editing' permission is required."]), $response);
     $this->assertResponse(403);
 
     // Quick Edit's JavaScript would SearchRankingTestnever hit these endpoints if the metadata
     // was empty as above, but we need to make sure that malicious users aren't
     // able to use any of the other endpoints either.
-    $post = array('editors[0]' => 'form') + $this->getAjaxPageStatePostData();
+    $post = ['editors[0]' => 'form'] + $this->getAjaxPageStatePostData();
     $response = $this->drupalPost('quickedit/attachments', '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
-    $this->assertIdentical('{}', $response);
+    $message = Json::encode(['message' => "A fatal error occurred: The 'access in-place editing' permission is required."]);
+    $this->assertIdentical($message, $response);
     $this->assertResponse(403);
-    $post = array('nocssjs' => 'true') + $this->getAjaxPageStatePostData();
+    $post = ['nocssjs' => 'true'] + $this->getAjaxPageStatePostData();
     $response = $this->drupalPost('quickedit/form/' . 'node/1/body/en/full', '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
-    $this->assertIdentical('{}', $response);
+    $this->assertIdentical($message, $response);
     $this->assertResponse(403);
-    $edit = array();
+    $edit = [];
     $edit['form_id'] = 'quickedit_field_form';
     $edit['form_token'] = 'xIOzMjuc-PULKsRn_KxFn7xzNk5Bx7XKXLfQfw1qOnA';
     $edit['form_build_id'] = 'form-kVmovBpyX-SJfTT5kY0pjTV35TV-znor--a64dEnMR8';
@@ -134,11 +136,11 @@ class QuickEditLoadingTest extends WebTestBase {
     $edit['body[0][format]'] = 'filtered_html';
     $edit['op'] = t('Save');
     $response = $this->drupalPost('quickedit/form/' . 'node/1/body/en/full', '', $edit, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
-    $this->assertIdentical('{}', $response);
+    $this->assertIdentical($message, $response);
     $this->assertResponse(403);
-    $post = array('nocssjs' => 'true');
+    $post = ['nocssjs' => 'true'];
     $response = $this->drupalPostWithFormat('quickedit/entity/' . 'node/1', 'json', $post);
-    $this->assertIdentical('{"message":""}', $response);
+    $this->assertIdentical(Json::encode(['message' => "The 'access in-place editing' permission is required."]), $response);
     $this->assertResponse(403);
   }
 
@@ -157,9 +159,11 @@ class QuickEditLoadingTest extends WebTestBase {
     $this->assertTrue(in_array('quickedit/quickedit', $libraries), 'Quick Edit library loaded.');
     $this->assertFalse(in_array('quickedit/quickedit.inPlaceEditor.form', $libraries), "'form' in-place editor not loaded.");
 
-    // HTML annotation must always exist (to not break the render cache).
+    // HTML annotation and title class must always exist (to not break the
+    // render cache).
     $this->assertRaw('data-quickedit-entity-id="node/1"');
     $this->assertRaw('data-quickedit-field-id="node/1/body/en/full"');
+    $this->assertFieldByXPath('//h1[contains(@class, "js-quickedit-page-title")]');
 
     // There should be only one revision so far.
     $node = Node::load(1);
@@ -169,16 +173,16 @@ class QuickEditLoadingTest extends WebTestBase {
 
     // Retrieving the metadata should result in a 200 JSON response.
     $htmlPageDrupalSettings = $this->drupalSettings;
-    $post = array('fields[0]' => 'node/1/body/en/full');
+    $post = ['fields[0]' => 'node/1/body/en/full'];
     $response = $this->drupalPostWithFormat('quickedit/metadata', 'json', $post);
     $this->assertResponse(200);
-    $expected = array(
-      'node/1/body/en/full' => array(
+    $expected = [
+      'node/1/body/en/full' => [
         'label' => 'Body',
         'access' => TRUE,
         'editor' => 'form',
-      )
-    );
+      ]
+    ];
     $this->assertIdentical(Json::decode($response), $expected, 'The metadata HTTP request answers with the correct JSON response.');
     // Restore drupalSettings to build the next requests; simpletest wipes them
     // after a JSON response.
@@ -187,7 +191,7 @@ class QuickEditLoadingTest extends WebTestBase {
     // Retrieving the attachments should result in a 200 response, containing:
     //  1. a settings command with useless metadata: AjaxController is dumb
     //  2. an insert command that loads the required in-place editors
-    $post = array('editors[0]' => 'form') + $this->getAjaxPageStatePostData();
+    $post = ['editors[0]' => 'form'] + $this->getAjaxPageStatePostData();
     $response = $this->drupalPost('quickedit/attachments', '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
     $ajax_commands = Json::decode($response);
     $this->assertIdentical(2, count($ajax_commands), 'The attachments HTTP request results in two AJAX commands.');
@@ -199,7 +203,7 @@ class QuickEditLoadingTest extends WebTestBase {
 
     // Retrieving the form for this field should result in a 200 response,
     // containing only a quickeditFieldForm command.
-    $post = array('nocssjs' => 'true', 'reset' => 'true') + $this->getAjaxPageStatePostData();
+    $post = ['nocssjs' => 'true', 'reset' => 'true'] + $this->getAjaxPageStatePostData();
     $response = $this->drupalPost('quickedit/form/' . 'node/1/body/en/full', '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
     $this->assertResponse(200);
     $ajax_commands = Json::decode($response);
@@ -213,17 +217,17 @@ class QuickEditLoadingTest extends WebTestBase {
     $this->assertTrue($form_tokens_found, 'Form tokens found in output.');
 
     if ($form_tokens_found) {
-      $edit = array(
+      $edit = [
         'body[0][summary]' => '',
         'body[0][value]' => '<p>Fine thanks.</p>',
         'body[0][format]' => 'filtered_html',
         'op' => t('Save'),
-      );
-      $post = array(
+      ];
+      $post = [
         'form_id' => 'quickedit_field_form',
         'form_token' => $token_match[1],
         'form_build_id' => $build_id_match[1],
-      );
+      ];
       $post += $edit + $this->getAjaxPageStatePostData();
 
       // Submit field form and check response. This should store the updated
@@ -234,14 +238,14 @@ class QuickEditLoadingTest extends WebTestBase {
       $this->assertIdentical(1, count($ajax_commands), 'The field form HTTP request results in one AJAX command.');
       $this->assertIdentical('quickeditFieldFormSaved', $ajax_commands[0]['command'], 'The first AJAX command is a quickeditFieldFormSaved command.');
       $this->assertTrue(strpos($ajax_commands[0]['data'], 'Fine thanks.'), 'Form value saved and printed back.');
-      $this->assertIdentical($ajax_commands[0]['other_view_modes'], array(), 'Field was not rendered in any other view mode.');
+      $this->assertIdentical($ajax_commands[0]['other_view_modes'], [], 'Field was not rendered in any other view mode.');
 
       // Ensure the text on the original node did not change yet.
       $this->drupalGet('node/1');
       $this->assertText('How are you?');
 
       // Save the entity by moving the PrivateTempStore values to entity storage.
-      $post = array('nocssjs' => 'true');
+      $post = ['nocssjs' => 'true'];
       $response = $this->drupalPostWithFormat('quickedit/entity/' . 'node/1', 'json', $post);
       $this->assertResponse(200);
       $ajax_commands = Json::decode($response);
@@ -269,7 +273,7 @@ class QuickEditLoadingTest extends WebTestBase {
       $node_type->save();
 
       // Retrieve field form.
-      $post = array('nocssjs' => 'true', 'reset' => 'true');
+      $post = ['nocssjs' => 'true', 'reset' => 'true'];
       $response = $this->drupalPost('quickedit/form/' . 'node/1/body/en/full', '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
       $this->assertResponse(200);
       $ajax_commands = Json::decode($response);
@@ -281,11 +285,11 @@ class QuickEditLoadingTest extends WebTestBase {
       preg_match('/\sname="form_token" value="([^"]+)"/', $ajax_commands[0]['data'], $token_match);
       preg_match('/\sname="form_build_id" value="([^"]+)"/', $ajax_commands[0]['data'], $build_id_match);
       $edit['body[0][value]'] = '<p>kthxbye</p>';
-      $post = array(
+      $post = [
         'form_id' => 'quickedit_field_form',
         'form_token' => $token_match[1],
         'form_build_id' => $build_id_match[1],
-      );
+      ];
       $post += $edit + $this->getAjaxPageStatePostData();
       $response = $this->drupalPost('quickedit/form/' . 'node/1/body/en/full', '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
       $this->assertResponse(200);
@@ -295,7 +299,7 @@ class QuickEditLoadingTest extends WebTestBase {
       $this->assertTrue(strpos($ajax_commands[0]['data'], 'kthxbye'), 'Form value saved and printed back.');
 
       // Save the entity.
-      $post = array('nocssjs' => 'true');
+      $post = ['nocssjs' => 'true'];
       $response = $this->drupalPostWithFormat('quickedit/entity/' . 'node/1', 'json', $post);
       $this->assertResponse(200);
       $ajax_commands = Json::decode($response);
@@ -322,21 +326,21 @@ class QuickEditLoadingTest extends WebTestBase {
 
     // Ensure that the full page title is actually in-place editable
     $node = Node::load(1);
-    $elements = $this->xpath('//h1/span[@data-quickedit-field-id="node/1/title/en/full" and normalize-space(text())=:title]', array(':title' => $node->label()));
+    $elements = $this->xpath('//h1/span[@data-quickedit-field-id="node/1/title/en/full" and normalize-space(text())=:title]', [':title' => $node->label()]);
     $this->assertTrue(!empty($elements), 'Title with data-quickedit-field-id attribute found.');
 
     // Retrieving the metadata should result in a 200 JSON response.
     $htmlPageDrupalSettings = $this->drupalSettings;
-    $post = array('fields[0]' => 'node/1/title/en/full');
+    $post = ['fields[0]' => 'node/1/title/en/full'];
     $response = $this->drupalPostWithFormat('quickedit/metadata', 'json', $post);
     $this->assertResponse(200);
-    $expected = array(
-      'node/1/title/en/full' => array(
+    $expected = [
+      'node/1/title/en/full' => [
         'label' => 'Title',
         'access' => TRUE,
         'editor' => 'plain_text',
-      )
-    );
+      ]
+    ];
     $this->assertIdentical(Json::decode($response), $expected, 'The metadata HTTP request answers with the correct JSON response.');
     // Restore drupalSettings to build the next requests; simpletest wipes them
     // after a JSON response.
@@ -344,7 +348,7 @@ class QuickEditLoadingTest extends WebTestBase {
 
     // Retrieving the form for this field should result in a 200 response,
     // containing only a quickeditFieldForm command.
-    $post = array('nocssjs' => 'true', 'reset' => 'true') + $this->getAjaxPageStatePostData();
+    $post = ['nocssjs' => 'true', 'reset' => 'true'] + $this->getAjaxPageStatePostData();
     $response = $this->drupalPost('quickedit/form/' . 'node/1/title/en/full', '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
     $this->assertResponse(200);
     $ajax_commands = Json::decode($response);
@@ -359,15 +363,15 @@ class QuickEditLoadingTest extends WebTestBase {
     $this->assertTrue($form_tokens_found, 'Form tokens found in output.');
 
     if ($form_tokens_found) {
-      $edit = array(
+      $edit = [
         'title[0][value]' => 'Obligatory question',
         'op' => t('Save'),
-      );
-      $post = array(
+      ];
+      $post = [
         'form_id' => 'quickedit_field_form',
         'form_token' => $token_match[1],
         'form_build_id' => $build_id_match[1],
-      );
+      ];
       $post += $edit + $this->getAjaxPageStatePostData();
 
       // Submit field form and check response. This should store the
@@ -384,7 +388,7 @@ class QuickEditLoadingTest extends WebTestBase {
       $this->assertNoText('Obligatory question');
 
       // Save the entity by moving the PrivateTempStore values to entity storage.
-      $post = array('nocssjs' => 'true');
+      $post = ['nocssjs' => 'true'];
       $response = $this->drupalPostWithFormat('quickedit/entity/' . 'node/1', 'json', $post);
       $this->assertResponse(200);
       $ajax_commands = Json::decode($response);
@@ -405,9 +409,9 @@ class QuickEditLoadingTest extends WebTestBase {
    */
   public function testDisplayOptions() {
     $node = Node::load('1');
-    $display_settings = array(
+    $display_settings = [
       'label' => 'inline',
-    );
+    ];
     $build = $node->body->view($display_settings);
     $output = \Drupal::service('renderer')->renderRoot($build);
     $this->assertFalse(strpos($output, 'data-quickedit-field-id'), 'data-quickedit-field-id attribute not added when rendering field using dynamic display options.');
@@ -417,13 +421,13 @@ class QuickEditLoadingTest extends WebTestBase {
    * Tests that Quick Edit works with custom render pipelines.
    */
   public function testCustomPipeline() {
-    \Drupal::service('module_installer')->install(array('quickedit_test'));
+    \Drupal::service('module_installer')->install(['quickedit_test']);
 
     $custom_render_url = 'quickedit/form/node/1/body/en/quickedit_test-custom-render-data';
     $this->drupalLogin($this->editorUser);
 
     // Request editing to render results with the custom render pipeline.
-    $post = array('nocssjs' => 'true') + $this->getAjaxPageStatePostData();
+    $post = ['nocssjs' => 'true'] + $this->getAjaxPageStatePostData();
     $response = $this->drupalPost($custom_render_url, '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
     $ajax_commands = Json::decode($response);
 
@@ -433,7 +437,7 @@ class QuickEditLoadingTest extends WebTestBase {
     $this->assertTrue($form_tokens_found, 'Form tokens found in output.');
 
     if ($form_tokens_found) {
-      $post = array(
+      $post = [
         'form_id' => 'quickedit_field_form',
         'form_token' => $token_match[1],
         'form_build_id' => $build_id_match[1],
@@ -441,10 +445,10 @@ class QuickEditLoadingTest extends WebTestBase {
         'body[0][value]' => '<p>Fine thanks.</p>',
         'body[0][format]' => 'filtered_html',
         'op' => t('Save'),
-      );
+      ];
       // Assume there is another field on this page, which doesn't use a custom
       // render pipeline, but the default one, and it uses the "full" view mode.
-      $post += array('other_view_modes[]' => 'full');
+      $post += ['other_view_modes[]' => 'full'];
 
       // Submit field form and check response. Should render with the custom
       // render pipeline.
@@ -455,7 +459,7 @@ class QuickEditLoadingTest extends WebTestBase {
       $this->assertIdentical('quickeditFieldFormSaved', $ajax_commands[0]['command'], 'The first AJAX command is a quickeditFieldFormSaved command.');
       $this->assertTrue(strpos($ajax_commands[0]['data'], 'Fine thanks.'), 'Form value saved and printed back.');
       $this->assertTrue(strpos($ajax_commands[0]['data'], '<div class="quickedit-test-wrapper">') !== FALSE, 'Custom render pipeline used to render the value.');
-      $this->assertIdentical(array_keys($ajax_commands[0]['other_view_modes']), array('full'), 'Field was also rendered in the "full" view mode.');
+      $this->assertIdentical(array_keys($ajax_commands[0]['other_view_modes']), ['full'], 'Field was also rendered in the "full" view mode.');
       $this->assertTrue(strpos($ajax_commands[0]['other_view_modes']['full'], 'Fine thanks.'), '"full" version of field contains the form value.');
     }
   }
@@ -467,7 +471,7 @@ class QuickEditLoadingTest extends WebTestBase {
   public function testConcurrentEdit() {
     $this->drupalLogin($this->editorUser);
 
-    $post = array('nocssjs' => 'true') + $this->getAjaxPageStatePostData();
+    $post = ['nocssjs' => 'true'] + $this->getAjaxPageStatePostData();
     $response = $this->drupalPost('quickedit/form/' . 'node/1/body/en/full', '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
     $this->assertResponse(200);
     $ajax_commands = Json::decode($response);
@@ -478,7 +482,7 @@ class QuickEditLoadingTest extends WebTestBase {
     $this->assertTrue($form_tokens_found, 'Form tokens found in output.');
 
     if ($form_tokens_found) {
-      $post = array(
+      $post = [
         'nocssjs' => 'true',
         'form_id' => 'quickedit_field_form',
         'form_token' => $token_match[1],
@@ -487,10 +491,10 @@ class QuickEditLoadingTest extends WebTestBase {
         'body[0][value]' => '<p>Fine thanks.</p>',
         'body[0][format]' => 'filtered_html',
         'op' => t('Save'),
-      );
+      ];
 
       // Save the node on the regular node edit form.
-      $this->drupalPostForm('node/1/edit', array(), t('Save'));
+      $this->drupalPostForm('node/1/edit', [], t('Save'));
       // Ensure different save timestamps for field editing.
       sleep(2);
 
@@ -509,7 +513,7 @@ class QuickEditLoadingTest extends WebTestBase {
    * Tests that Quick Edit's data- attributes are present for content blocks.
    */
   public function testContentBlock() {
-    \Drupal::service('module_installer')->install(array('block_content'));
+    \Drupal::service('module_installer')->install(['block_content']);
 
     // Create and place a content_block block.
     $block = BlockContent::create([
diff --git a/web/core/modules/quickedit/tests/modules/quickedit_test.module b/web/core/modules/quickedit/tests/modules/quickedit_test.module
index 3d2106d31..b6199a6e8 100644
--- a/web/core/modules/quickedit/tests/modules/quickedit_test.module
+++ b/web/core/modules/quickedit/tests/modules/quickedit_test.module
@@ -12,11 +12,11 @@ use Drupal\Core\Entity\EntityInterface;
  */
 function quickedit_test_quickedit_render_field(EntityInterface $entity, $field_name, $view_mode_id, $langcode) {
   $entity = \Drupal::entityManager()->getTranslationFromContext($entity, $langcode);
-  return array(
+  return [
     '#prefix' => '<div class="quickedit-test-wrapper">',
     'field' => $entity->get($field_name)->view($view_mode_id),
     '#suffix' => '</div>',
-  );
+  ];
 }
 
 /**
diff --git a/web/core/modules/quickedit/tests/modules/src/Plugin/InPlaceEditor/WysiwygEditor.php b/web/core/modules/quickedit/tests/modules/src/Plugin/InPlaceEditor/WysiwygEditor.php
index 596df75a5..c26bf909d 100644
--- a/web/core/modules/quickedit/tests/modules/src/Plugin/InPlaceEditor/WysiwygEditor.php
+++ b/web/core/modules/quickedit/tests/modules/src/Plugin/InPlaceEditor/WysiwygEditor.php
@@ -42,11 +42,11 @@ class WysiwygEditor extends InPlaceEditorBase {
    * {@inheritdoc}
    */
   public function getAttachments() {
-    return array(
-      'library' => array(
+    return [
+      'library' => [
         'quickedit_test/not-existing-wysiwyg',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php b/web/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php
index 0b3820ced..08a8fe04a 100644
--- a/web/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php
+++ b/web/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php
@@ -53,13 +53,13 @@ class EditorSelectionTest extends QuickEditTestBase {
     $this->createFieldWithStorage(
       $field_name, 'string', 1, 'Simple text field',
       // Instance settings.
-      array(),
+      [],
       // Widget type & settings.
       'string_textfield',
-      array('size' => 42),
+      ['size' => 42],
       // 'default' formatter type & settings.
       'string',
-      array()
+      []
     );
 
     // Create an entity with values for this text field.
@@ -84,7 +84,7 @@ class EditorSelectionTest extends QuickEditTestBase {
    */
   public function testTextWysiwyg() {
     // Enable edit_test module so that the 'wysiwyg' editor becomes available.
-    $this->enableModules(array('quickedit_test'));
+    $this->enableModules(['quickedit_test']);
     $this->editorManager = $this->container->get('plugin.manager.quickedit.editor');
     $this->editorSelector = new EditorSelector($this->editorManager, $this->container->get('plugin.manager.field.formatter'));
 
@@ -92,13 +92,13 @@ class EditorSelectionTest extends QuickEditTestBase {
     $this->createFieldWithStorage(
       $field_name, 'text', 1, 'Long text field',
       // Instance settings.
-      array(),
+      [],
       // Widget type & settings.
       'text_textarea',
-      array('size' => 42),
+      ['size' => 42],
       // 'default' formatter type & settings.
       'text_default',
-      array()
+      []
     );
 
     // Create an entity with values for this text field.
@@ -129,13 +129,13 @@ class EditorSelectionTest extends QuickEditTestBase {
     $this->createFieldWithStorage(
       $field_name, 'integer', 1, 'Simple number field',
       // Instance settings.
-      array(),
+      [],
       // Widget type & settings.
       'number',
-      array(),
+      [],
       // 'default' formatter type & settings.
       'number_integer',
-      array()
+      []
     );
 
     // Create an entity with values for this text field.
diff --git a/web/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php b/web/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
index 7fdc8fbf6..a3bc7b52c 100644
--- a/web/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
+++ b/web/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
@@ -18,7 +18,7 @@ class MetadataGeneratorTest extends QuickEditTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('quickedit_test');
+  public static $modules = ['quickedit_test'];
 
   /**
    * The manager for editor plugins.
@@ -66,26 +66,26 @@ class MetadataGeneratorTest extends QuickEditTestBase {
     $this->createFieldWithStorage(
       $field_1_name, 'string', 1, $field_1_label,
       // Instance settings.
-      array(),
+      [],
       // Widget type & settings.
       'string_textfield',
-      array('size' => 42),
+      ['size' => 42],
       // 'default' formatter type & settings.
       'string',
-      array()
+      []
     );
     $field_2_name = 'field_nr';
     $field_2_label = 'Simple number field';
     $this->createFieldWithStorage(
       $field_2_name, 'integer', 1, $field_2_label,
       // Instance settings.
-      array(),
+      [],
       // Widget type & settings.
       'number',
-      array(),
+      [],
       // 'default' formatter type & settings.
       'number_integer',
-      array()
+      []
     );
 
     // Create an entity with values for this text field.
@@ -98,21 +98,21 @@ class MetadataGeneratorTest extends QuickEditTestBase {
     // Verify metadata for field 1.
     $items_1 = $entity->get($field_1_name);
     $metadata_1 = $this->metadataGenerator->generateFieldMetadata($items_1, 'default');
-    $expected_1 = array(
+    $expected_1 = [
       'access' => TRUE,
       'label' => 'Plain text field',
       'editor' => 'plain_text',
-    );
+    ];
     $this->assertEqual($expected_1, $metadata_1, 'The correct metadata is generated for the first field.');
 
     // Verify metadata for field 2.
     $items_2 = $entity->get($field_2_name);
     $metadata_2 = $this->metadataGenerator->generateFieldMetadata($items_2, 'default');
-    $expected_2 = array(
+    $expected_2 = [
       'access' => TRUE,
       'label' => 'Simple number field',
       'editor' => 'form',
-    );
+    ];
     $this->assertEqual($expected_2, $metadata_2, 'The correct metadata is generated for the second field.');
   }
 
@@ -134,24 +134,24 @@ class MetadataGeneratorTest extends QuickEditTestBase {
     $this->createFieldWithStorage(
       $field_name, 'text', 1, $field_label,
       // Instance settings.
-      array(),
+      [],
       // Widget type & settings.
       'text_textfield',
-      array('size' => 42),
+      ['size' => 42],
       // 'default' formatter type & settings.
       'text_default',
-      array()
+      []
     );
 
     // Create a text format.
-    $full_html_format = FilterFormat::create(array(
+    $full_html_format = FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
-      'filters' => array(
-        'filter_htmlcorrector' => array('status' => 1),
-      ),
-    ));
+      'filters' => [
+        'filter_htmlcorrector' => ['status' => 1],
+      ],
+    ]);
     $full_html_format->save();
 
     // Create an entity with values for this rich text field.
@@ -164,14 +164,14 @@ class MetadataGeneratorTest extends QuickEditTestBase {
     // Verify metadata.
     $items = $entity->get($field_name);
     $metadata = $this->metadataGenerator->generateFieldMetadata($items, 'default');
-    $expected = array(
+    $expected = [
       'access' => TRUE,
       'label' => 'Rich text field',
       'editor' => 'wysiwyg',
-      'custom' => array(
+      'custom' => [
         'format' => 'full_html'
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($expected, $metadata); //, 'The correct metadata (including custom metadata) is generated.');
   }
 
diff --git a/web/core/modules/quickedit/tests/src/Kernel/QuickEditTestBase.php b/web/core/modules/quickedit/tests/src/Kernel/QuickEditTestBase.php
index bfdb229f6..294374858 100644
--- a/web/core/modules/quickedit/tests/src/Kernel/QuickEditTestBase.php
+++ b/web/core/modules/quickedit/tests/src/Kernel/QuickEditTestBase.php
@@ -37,11 +37,11 @@ abstract class QuickEditTestBase extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->fields = new \ArrayObject(array(), \ArrayObject::ARRAY_AS_PROPS);
+    $this->fields = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
 
     $this->installEntitySchema('user');
     $this->installEntitySchema('entity_test');
-    $this->installConfig(array('field', 'filter'));
+    $this->installConfig(['field', 'filter']);
   }
 
   /**
@@ -67,12 +67,12 @@ abstract class QuickEditTestBase extends KernelTestBase {
    */
   protected function createFieldWithStorage($field_name, $type, $cardinality, $label, $field_settings, $widget_type, $widget_settings, $formatter_type, $formatter_settings) {
     $field_storage = $field_name . '_field_storage';
-    $this->fields->$field_storage = FieldStorageConfig::create(array(
+    $this->fields->$field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => $type,
       'cardinality' => $cardinality,
-    ));
+    ]);
     $this->fields->$field_storage->save();
 
     $field = $field_name . '_field';
@@ -87,18 +87,18 @@ abstract class QuickEditTestBase extends KernelTestBase {
     $this->fields->$field->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => $widget_type,
         'settings' => $widget_settings,
-      ))
+      ])
       ->save();
 
     entity_get_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'label' => 'above',
         'type' => $formatter_type,
         'settings' => $formatter_settings
-      ))
+      ])
       ->save();
   }
 
diff --git a/web/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php b/web/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php
index d7ceb59bb..7e7e0bbb9 100644
--- a/web/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php
+++ b/web/core/modules/quickedit/tests/src/Unit/Access/EditEntityFieldAccessCheckTest.php
@@ -43,11 +43,11 @@ class EditEntityFieldAccessCheckTest extends UnitTestCase {
    * @see \Drupal\Tests\edit\Unit\quickedit\Access\EditEntityFieldAccessCheckTest::testAccess()
    */
   public function providerTestAccess() {
-    $data = array();
-    $data[] = array(TRUE, TRUE, AccessResult::allowed());
-    $data[] = array(FALSE, TRUE, AccessResult::neutral());
-    $data[] = array(TRUE, FALSE, AccessResult::neutral());
-    $data[] = array(FALSE, FALSE, AccessResult::neutral());
+    $data = [];
+    $data[] = [TRUE, TRUE, AccessResult::allowed()];
+    $data[] = [FALSE, TRUE, AccessResult::neutral()];
+    $data[] = [TRUE, FALSE, AccessResult::neutral()];
+    $data[] = [FALSE, FALSE, AccessResult::neutral()];
 
     return $data;
   }
@@ -108,15 +108,15 @@ class EditEntityFieldAccessCheckTest extends UnitTestCase {
    * Provides test data for testAccessForbidden.
    */
   public function providerTestAccessForbidden() {
-    $data = array();
+    $data = [];
     // Tests the access method without a field_name.
-    $data[] = array(NULL, LanguageInterface::LANGCODE_NOT_SPECIFIED);
+    $data[] = [NULL, LanguageInterface::LANGCODE_NOT_SPECIFIED];
     // Tests the access method with a non-existent field.
-    $data[] = array('not_valid', LanguageInterface::LANGCODE_NOT_SPECIFIED);
+    $data[] = ['not_valid', LanguageInterface::LANGCODE_NOT_SPECIFIED];
     // Tests the access method without a langcode.
-    $data[] = array('valid', NULL);
+    $data[] = ['valid', NULL];
     // Tests the access method with an invalid langcode.
-    $data[] = array('valid', 'xx-lolspeak');
+    $data[] = ['valid', 'xx-lolspeak'];
     return $data;
   }
 
@@ -132,16 +132,16 @@ class EditEntityFieldAccessCheckTest extends UnitTestCase {
 
     $entity->expects($this->any())
       ->method('hasTranslation')
-      ->will($this->returnValueMap(array(
-        array(LanguageInterface::LANGCODE_NOT_SPECIFIED, TRUE),
-        array('xx-lolspeak', FALSE),
-      )));
+      ->will($this->returnValueMap([
+        [LanguageInterface::LANGCODE_NOT_SPECIFIED, TRUE],
+        ['xx-lolspeak', FALSE],
+      ]));
     $entity->expects($this->any())
       ->method('hasField')
-      ->will($this->returnValueMap(array(
-        array('valid', TRUE),
-        array('not_valid', FALSE),
-      )));
+      ->will($this->returnValueMap([
+        ['valid', TRUE],
+        ['not_valid', FALSE],
+      ]));
 
     return $entity;
   }
diff --git a/web/core/modules/rdf/rdf.api.php b/web/core/modules/rdf/rdf.api.php
index 3dbe7d1e2..dd7ae2227 100644
--- a/web/core/modules/rdf/rdf.api.php
+++ b/web/core/modules/rdf/rdf.api.php
@@ -25,7 +25,7 @@
  * @ingroup rdf
  */
 function hook_rdf_namespaces() {
-  return array(
+  return [
     'content'  => 'http://purl.org/rss/1.0/modules/content/',
     'dc'       => 'http://purl.org/dc/terms/',
     'foaf'     => 'http://xmlns.com/foaf/0.1/',
@@ -35,7 +35,7 @@ function hook_rdf_namespaces() {
     'sioct'    => 'http://rdfs.org/sioc/types#',
     'skos'     => 'http://www.w3.org/2004/02/skos/core#',
     'xsd'      => 'http://www.w3.org/2001/XMLSchema#',
-  );
+  ];
 }
 
 /**
diff --git a/web/core/modules/rdf/rdf.module b/web/core/modules/rdf/rdf.module
index 3108ee127..0afcb0918 100644
--- a/web/core/modules/rdf/rdf.module
+++ b/web/core/modules/rdf/rdf.module
@@ -17,7 +17,7 @@ function rdf_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.rdf':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The RDF module enriches your content with metadata to let other applications (e.g., search engines, aggregators, and so on) better understand its relationships and attributes. This semantically enriched, machine-readable output for your website uses the <a href=":rdfa">RDFa specification</a>, which allows RDF data to be embedded in HTML markup. Other modules can define mappings of their data to RDF terms, and the RDF module makes this RDF data available to the theme. The core modules define RDF mappings for their data model, and the core themes output this RDF metadata information along with the human-readable visual information. For more information, see the <a href=":rdf">online documentation for the RDF module</a>.', array(':rdfa' => 'http://www.w3.org/TR/xhtml-rdfa-primer/', ':rdf' => 'https://www.drupal.org/documentation/modules/rdf')) . '</p>';
+      $output .= '<p>' . t('The RDF module enriches your content with metadata to let other applications (e.g., search engines, aggregators, and so on) better understand its relationships and attributes. This semantically enriched, machine-readable output for your website uses the <a href=":rdfa">RDFa specification</a>, which allows RDF data to be embedded in HTML markup. Other modules can define mappings of their data to RDF terms, and the RDF module makes this RDF data available to the theme. The core modules define RDF mappings for their data model, and the core themes output this RDF metadata information along with the human-readable visual information. For more information, see the <a href=":rdf">online documentation for the RDF module</a>.', [':rdfa' => 'http://www.w3.org/TR/xhtml-rdfa-primer/', ':rdf' => 'https://www.drupal.org/documentation/modules/rdf']) . '</p>';
       return $output;
   }
 }
@@ -74,10 +74,10 @@ function rdf_get_mapping($entity_type, $bundle) {
 
   // If not found, create a fresh mapping object.
   if (!$mapping) {
-    $mapping = RdfMapping::create(array(
+    $mapping = RdfMapping::create([
       'targetEntityType' => $entity_type,
       'bundle' => $bundle,
-    ));
+    ]);
   }
 
   return $mapping;
@@ -87,7 +87,7 @@ function rdf_get_mapping($entity_type, $bundle) {
  * Implements hook_rdf_namespaces().
  */
 function rdf_rdf_namespaces() {
-  return array(
+  return [
     'content'  => 'http://purl.org/rss/1.0/modules/content/',
     'dc'       => 'http://purl.org/dc/terms/',
     'foaf'     => 'http://xmlns.com/foaf/0.1/',
@@ -98,7 +98,7 @@ function rdf_rdf_namespaces() {
     'sioct'    => 'http://rdfs.org/sioc/types#',
     'skos'     => 'http://www.w3.org/2004/02/skos/core#',
     'xsd'      => 'http://www.w3.org/2001/XMLSchema#',
-  );
+  ];
 }
 
 /**
@@ -108,14 +108,14 @@ function rdf_rdf_namespaces() {
  * implement it.
  */
 function rdf_get_namespaces() {
-  $namespaces = array();
+  $namespaces = [];
   // In order to resolve duplicate namespaces by using the earliest defined
   // namespace, do not use \Drupal::moduleHandler()->invokeAll().
   foreach (\Drupal::moduleHandler()->getImplementations('rdf_namespaces') as $module) {
     $function = $module . '_rdf_namespaces';
     foreach ($function() as $prefix => $namespace) {
       if (array_key_exists($prefix, $namespaces) && $namespace !== $namespaces[$prefix]) {
-        throw new Exception(t('Tried to map @prefix to @namespace, but @prefix is already mapped to @orig_namespace.', array('@prefix' => $prefix, '@namespace' => $namespace, '@orig_namespace' => $namespaces[$prefix])));
+        throw new Exception(t('Tried to map @prefix to @namespace, but @prefix is already mapped to @orig_namespace.', ['@prefix' => $prefix, '@namespace' => $namespace, '@orig_namespace' => $namespaces[$prefix]]));
       }
       else {
         $namespaces[$prefix] = $namespace;
@@ -165,7 +165,7 @@ function rdf_get_namespaces() {
  *   RDFa attributes suitable for Drupal\Core\Template\Attribute.
  */
 function rdf_rdfa_attributes($mapping, $data = NULL) {
-  $attributes = array();
+  $attributes = [];
 
   // The type of mapping defaults to 'property'.
   $type = isset($mapping['mapping_type']) ? $mapping['mapping_type'] : 'property';
@@ -249,14 +249,14 @@ function rdf_comment_storage_load($comments) {
  * Implements hook_theme().
  */
 function rdf_theme() {
-  return array(
-    'rdf_wrapper' => array(
-      'variables' => array('attributes' => array(), 'content' => NULL),
-    ),
-    'rdf_metadata' => array(
-      'variables' => array('metadata' => array()),
-    ),
-  );
+  return [
+    'rdf_wrapper' => [
+      'variables' => ['attributes' => [], 'content' => NULL],
+    ],
+    'rdf_metadata' => [
+      'variables' => ['metadata' => []],
+    ],
+  ];
 }
 
 /**
@@ -266,7 +266,7 @@ function rdf_preprocess_html(&$variables) {
   // Adds RDF namespace prefix bindings in the form of an RDFa 1.1 prefix
   // attribute inside the html element.
   if (!isset($variables['html_attributes']['prefix'])) {
-    $variables['html_attributes']['prefix'] = array();
+    $variables['html_attributes']['prefix'] = [];
   }
   foreach (rdf_get_namespaces() as $prefix => $uri) {
     $variables['html_attributes']['prefix'][] = $prefix . ': ' . $uri . " ";
@@ -315,20 +315,20 @@ function rdf_preprocess_node(&$variables) {
   if ($title_mapping) {
     $title_attributes['property'] = empty($title_mapping['properties']) ? NULL : $title_mapping['properties'];
     $title_attributes['content'] = $variables['node']->label();
-    $variables['title_suffix']['rdf_meta_title'] = array(
+    $variables['title_suffix']['rdf_meta_title'] = [
       '#theme' => 'rdf_metadata',
-      '#metadata' => array($title_attributes),
-    );
+      '#metadata' => [$title_attributes],
+    ];
   }
 
   // Adds RDFa markup for the date.
   $created_mapping = $mapping->getPreparedFieldMapping('created');
   if (!empty($created_mapping) && $variables['display_submitted']) {
     $date_attributes = rdf_rdfa_attributes($created_mapping, $variables['node']->get('created')->first()->toArray());
-    $rdf_metadata = array(
+    $rdf_metadata = [
       '#theme' => 'rdf_metadata',
-      '#metadata' => array($date_attributes),
-    );
+      '#metadata' => [$date_attributes],
+    ];
     $variables['metadata'] = drupal_render($rdf_metadata);
   }
 
@@ -345,10 +345,10 @@ function rdf_preprocess_node(&$variables) {
         // Adds RDFa markup for the comment count near the node title as
         // metadata.
         $comment_count_attributes = rdf_rdfa_attributes($comment_count_mapping, $variables['node']->get($field_name)->comment_count);
-        $variables['title_suffix']['rdf_meta_comment_count'] = array(
+        $variables['title_suffix']['rdf_meta_comment_count'] = [
           '#theme' => 'rdf_metadata',
-          '#metadata' => array($comment_count_attributes),
-        );
+          '#metadata' => [$comment_count_attributes],
+        ];
       }
     }
   }
@@ -377,15 +377,15 @@ function rdf_preprocess_user(&$variables) {
     // rdf_preprocess_username().
     $name_mapping = $mapping->getPreparedFieldMapping('name');
     if (!empty($name_mapping['properties'])) {
-      $username_meta = array(
+      $username_meta = [
         '#tag' => 'meta',
-        '#attributes' => array(
+        '#attributes' => [
           'about' => $account->url(),
           'property' => $name_mapping['properties'],
           'content' => $account->getDisplayName(),
           'lang' => '',
-        ),
-      );
+        ],
+      ];
       $variables['#attached']['html_head'][] = [$username_meta, 'rdf_user_username'];
     }
   }
@@ -482,10 +482,10 @@ function rdf_preprocess_comment(&$variables) {
     // cached as part of the entity.
     $date_attributes = $comment->rdf_data['date'];
 
-    $rdf_metadata = array(
+    $rdf_metadata = [
       '#theme' => 'rdf_metadata',
-      '#metadata' => array($date_attributes),
-    );
+      '#metadata' => [$date_attributes],
+    ];
     // Ensure the original variable is represented as a render array.
     $created = !is_array($variables['created']) ? ['#markup' => $variables['created']] : $variables['created'];
     $submitted = !is_array($variables['submitted']) ? ['#markup' => $variables['submitted']] : $variables['submitted'];
@@ -527,10 +527,10 @@ function rdf_preprocess_comment(&$variables) {
   }
   // Adds RDF metadata markup above comment body if any.
   if (!empty($variables['rdf_metadata_attributes']) && isset($variables['content']['comment_body'])) {
-    $rdf_metadata = array(
+    $rdf_metadata = [
       '#theme' => 'rdf_metadata',
       '#metadata' => $variables['rdf_metadata_attributes'],
-    );
+    ];
     if (!empty($variables['content']['comment_body']['#prefix'])) {
       $rdf_metadata['#suffix'] = $variables['content']['comment_body']['#prefix'];
     }
@@ -555,14 +555,14 @@ function rdf_preprocess_taxonomy_term(&$variables) {
   // Add RDFa markup for the taxonomy term name as metadata, if present.
   $name_field_mapping = $mapping->getPreparedFieldMapping('name');
   if (!empty($name_field_mapping) && !empty($name_field_mapping['properties'])) {
-    $name_attributes = array(
+    $name_attributes = [
       'property' => $name_field_mapping['properties'],
       'content' => $term->getName(),
-    );
-    $variables['title_suffix']['taxonomy_term_rdfa'] = array(
+    ];
+    $variables['title_suffix']['taxonomy_term_rdfa'] = [
       '#theme' => 'rdf_metadata',
-      '#metadata' => array($name_attributes),
-    );
+      '#metadata' => [$name_attributes],
+    ];
   }
 }
 
@@ -573,7 +573,7 @@ function rdf_preprocess_image(&$variables) {
   // Adds the RDF type for image.  We cannot use the usual entity-based mapping
   // to get 'foaf:Image' because image does not have its own entity type or
   // bundle.
-  $variables['attributes']['typeof'] = array('foaf:Image');
+  $variables['attributes']['typeof'] = ['foaf:Image'];
 }
 
 /**
diff --git a/web/core/modules/rdf/src/Entity/RdfMapping.php b/web/core/modules/rdf/src/Entity/RdfMapping.php
index 6ac95abd7..076587fd2 100644
--- a/web/core/modules/rdf/src/Entity/RdfMapping.php
+++ b/web/core/modules/rdf/src/Entity/RdfMapping.php
@@ -12,6 +12,12 @@ use Drupal\rdf\RdfMappingInterface;
  * @ConfigEntityType(
  *   id = "rdf_mapping",
  *   label = @Translation("RDF mapping"),
+ *   label_singular = @Translation("RDF mapping item"),
+ *   label_plural = @Translation("RDF mappings items"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count RDF mapping item",
+ *     plural = "@count RDF mapping items",
+ *   ),
  *   config_prefix = "mapping",
  *   entity_keys = {
  *     "id" = "id"
@@ -53,20 +59,20 @@ class RdfMapping extends ConfigEntityBase implements RdfMappingInterface {
    *
    * @var array
    */
-  protected $types = array();
+  protected $types = [];
 
   /**
    * The mappings for fields on this bundle.
    *
    * @var array
    */
-  protected $fieldMappings = array();
+  protected $fieldMappings = [];
 
   /**
    * {@inheritdoc}
    */
   public function getPreparedBundleMapping() {
-    return array('types' => $this->types);
+    return ['types' => $this->types];
   }
 
   /**
@@ -74,9 +80,9 @@ class RdfMapping extends ConfigEntityBase implements RdfMappingInterface {
    */
   public function getBundleMapping() {
     if (!empty($this->types)) {
-      return array('types' => $this->types);
+      return ['types' => $this->types];
     }
-    return array();
+    return [];
   }
 
   /**
@@ -94,16 +100,16 @@ class RdfMapping extends ConfigEntityBase implements RdfMappingInterface {
    * {@inheritdoc}
    */
   public function getPreparedFieldMapping($field_name) {
-    $field_mapping = array(
+    $field_mapping = [
       'properties' => NULL,
       'datatype' => NULL,
       'datatype_callback' => NULL,
       'mapping_type' => NULL,
-    );
+    ];
     if (isset($this->fieldMappings[$field_name])) {
       $field_mapping = array_merge($field_mapping, $this->fieldMappings[$field_name]);
     }
-    return empty($field_mapping['properties']) ? array() : $field_mapping;
+    return empty($field_mapping['properties']) ? [] : $field_mapping;
   }
 
   /**
@@ -113,13 +119,13 @@ class RdfMapping extends ConfigEntityBase implements RdfMappingInterface {
     if (isset($this->fieldMappings[$field_name])) {
       return $this->fieldMappings[$field_name];
     }
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function setFieldMapping($field_name, array $mapping = array()) {
+  public function setFieldMapping($field_name, array $mapping = []) {
     $this->fieldMappings[$field_name] = $mapping;
     return $this;
   }
diff --git a/web/core/modules/rdf/src/RdfMappingInterface.php b/web/core/modules/rdf/src/RdfMappingInterface.php
index fa8def268..ce0128848 100644
--- a/web/core/modules/rdf/src/RdfMappingInterface.php
+++ b/web/core/modules/rdf/src/RdfMappingInterface.php
@@ -102,6 +102,6 @@ interface RdfMappingInterface extends ConfigEntityInterface {
    * @return \Drupal\rdf\Entity\RdfMapping
    *   The RdfMapping object.
    */
-  public function setFieldMapping($field_name, array $mapping = array());
+  public function setFieldMapping($field_name, array $mapping = []);
 
 }
diff --git a/web/core/modules/rdf/src/SchemaOrgDataConverter.php b/web/core/modules/rdf/src/SchemaOrgDataConverter.php
index dc0404848..d20a42616 100644
--- a/web/core/modules/rdf/src/SchemaOrgDataConverter.php
+++ b/web/core/modules/rdf/src/SchemaOrgDataConverter.php
@@ -22,7 +22,7 @@ class SchemaOrgDataConverter {
    *
    * @see http://schema.org/UserInteraction
    */
-  static function interactionCount($count, $arguments) {
+  public static function interactionCount($count, $arguments) {
     $interaction_type = $arguments['interaction_type'];
     return "$interaction_type:$count";
   }
diff --git a/web/core/modules/rdf/src/Tests/CommentAttributesTest.php b/web/core/modules/rdf/src/Tests/CommentAttributesTest.php
index 5febcb988..8ca5798cd 100644
--- a/web/core/modules/rdf/src/Tests/CommentAttributesTest.php
+++ b/web/core/modules/rdf/src/Tests/CommentAttributesTest.php
@@ -20,7 +20,7 @@ class CommentAttributesTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $modules = array('views', 'node', 'comment', 'rdf');
+  public static $modules = ['views', 'node', 'comment', 'rdf'];
 
   /**
    * URI of the front page of the Drupal site.
@@ -40,11 +40,11 @@ class CommentAttributesTest extends CommentTestBase {
     parent::setUp();
 
     // Enables anonymous user comments.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
       'access comments' => TRUE,
       'post comments' => TRUE,
       'skip comment approval' => TRUE,
-    ));
+    ]);
     // Allows anonymous to leave their contact information.
     $this->setCommentAnonymous(COMMENT_ANONYMOUS_MAY_CONTACT);
     $this->setCommentPreview(DRUPAL_OPTIONAL);
@@ -58,53 +58,53 @@ class CommentAttributesTest extends CommentTestBase {
 
     // Set relation between node and comment.
     $article_mapping = rdf_get_mapping('node', 'article');
-    $comment_count_mapping = array(
-      'properties' => array('sioc:num_replies'),
+    $comment_count_mapping = [
+      'properties' => ['sioc:num_replies'],
       'datatype' => 'xsd:integer',
-      'datatype_callback' => array('callable' => 'Drupal\rdf\CommonDataConverter::rawValue'),
-    );
+      'datatype_callback' => ['callable' => 'Drupal\rdf\CommonDataConverter::rawValue'],
+    ];
     $article_mapping->setFieldMapping('comment_count', $comment_count_mapping)->save();
 
     // Save user mapping.
     $user_mapping = rdf_get_mapping('user', 'user');
-    $username_mapping = array(
-      'properties' => array('foaf:name'),
-    );
+    $username_mapping = [
+      'properties' => ['foaf:name'],
+    ];
     $user_mapping->setFieldMapping('name', $username_mapping)->save();
-    $user_mapping->setFieldMapping('homepage', array('properties' => array('foaf:page'), 'mapping_type' => 'rel'))->save();
+    $user_mapping->setFieldMapping('homepage', ['properties' => ['foaf:page'], 'mapping_type' => 'rel'])->save();
 
     // Save comment mapping.
     $mapping = rdf_get_mapping('comment', 'comment');
-    $mapping->setBundleMapping(array('types' => array('sioc:Post', 'sioct:Comment')))->save();
-    $field_mappings = array(
-      'subject' => array(
-        'properties' => array('dc:title'),
-      ),
-      'created' => array(
-        'properties' => array('dc:date', 'dc:created'),
+    $mapping->setBundleMapping(['types' => ['sioc:Post', 'sioct:Comment']])->save();
+    $field_mappings = [
+      'subject' => [
+        'properties' => ['dc:title'],
+      ],
+      'created' => [
+        'properties' => ['dc:date', 'dc:created'],
         'datatype' => 'xsd:dateTime',
-        'datatype_callback' => array('callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'),
-      ),
-      'changed' => array(
-        'properties' => array('dc:modified'),
+        'datatype_callback' => ['callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'],
+      ],
+      'changed' => [
+        'properties' => ['dc:modified'],
         'datatype' => 'xsd:dateTime',
-        'datatype_callback' => array('callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'),
-      ),
-      'comment_body' => array(
-        'properties' => array('content:encoded'),
-      ),
-      'pid' => array(
-        'properties' => array('sioc:reply_of'),
+        'datatype_callback' => ['callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'],
+      ],
+      'comment_body' => [
+        'properties' => ['content:encoded'],
+      ],
+      'pid' => [
+        'properties' => ['sioc:reply_of'],
         'mapping_type' => 'rel',
-      ),
-      'uid' => array(
-        'properties' => array('sioc:has_creator'),
+      ],
+      'uid' => [
+        'properties' => ['sioc:has_creator'],
         'mapping_type' => 'rel',
-      ),
-      'name' => array(
-        'properties' => array('foaf:name'),
-      ),
-    );
+      ],
+      'name' => [
+        'properties' => ['foaf:name'],
+      ],
+    ];
     // Iterate over shared field mappings and save.
     foreach ($field_mappings as $field_name => $field_mapping) {
       $mapping->setFieldMapping($field_name, $field_mapping)->save();
@@ -126,11 +126,11 @@ class CommentAttributesTest extends CommentTestBase {
     $parser->parse($graph, $this->drupalGet('node'), 'rdfa', $this->baseUri);
 
     // Number of comments.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => 2,
       'datatype' => 'http://www.w3.org/2001/XMLSchema#integer',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->nodeUri, 'http://rdfs.org/sioc/ns#num_replies', $expected_value), 'Number of comments found in RDF output of teaser view (sioc:num_replies).');
 
     // Tests number of comments in full node view, expected value is the same.
@@ -183,7 +183,7 @@ class CommentAttributesTest extends CommentTestBase {
     $this->_testBasicCommentRdfaMarkup($graph, $comment1);
 
     // Posts comment #2 as anonymous user.
-    $anonymous_user = array();
+    $anonymous_user = [];
     $anonymous_user['name'] = $this->randomMachineName();
     $anonymous_user['mail'] = 'tester@simpletest.org';
     $anonymous_user['homepage'] = 'http://example.org/';
@@ -222,22 +222,22 @@ class CommentAttributesTest extends CommentTestBase {
     $parser->parse($graph, $this->drupalGet('node/' . $this->node->id()), 'rdfa', $this->baseUri);
 
     // Tests the reply_of relationship of a first level comment.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $this->nodeUri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($comment_1_uri, 'http://rdfs.org/sioc/ns#reply_of', $expected_value), 'Comment relation to its node found in RDF output (sioc:reply_of).');
 
     // Tests the reply_of relationship of a second level comment.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $this->nodeUri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($comment_2_uri, 'http://rdfs.org/sioc/ns#reply_of', $expected_value), 'Comment relation to its node found in RDF output (sioc:reply_of).');
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $comment_1_uri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($comment_2_uri, 'http://rdfs.org/sioc/ns#reply_of', $expected_value), 'Comment relation to its parent comment found in RDF output (sioc:reply_of).');
   }
 
@@ -251,61 +251,61 @@ class CommentAttributesTest extends CommentTestBase {
    * @param $account
    *   An array containing information about an anonymous user.
    */
-  function _testBasicCommentRdfaMarkup($graph, CommentInterface $comment, $account = array()) {
-    $comment_uri = $comment->url('canonical', array('absolute' => TRUE));
+  public function _testBasicCommentRdfaMarkup($graph, CommentInterface $comment, $account = []) {
+    $comment_uri = $comment->url('canonical', ['absolute' => TRUE]);
 
     // Comment type.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => 'http://rdfs.org/sioc/types#Comment',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($comment_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Comment type found in RDF output (sioct:Comment).');
     // Comment type.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => 'http://rdfs.org/sioc/ns#Post',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($comment_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Comment type found in RDF output (sioc:Post).');
 
     // Comment title.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $comment->getSubject(),
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($comment_uri, 'http://purl.org/dc/terms/title', $expected_value), 'Comment subject found in RDF output (dc:title).');
 
     // Comment date.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => format_date($comment->getCreatedTime(), 'custom', 'c', 'UTC'),
       'datatype' => 'http://www.w3.org/2001/XMLSchema#dateTime',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($comment_uri, 'http://purl.org/dc/terms/date', $expected_value), 'Comment date found in RDF output (dc:date).');
     // Comment date.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => format_date($comment->getCreatedTime(), 'custom', 'c', 'UTC'),
       'datatype' => 'http://www.w3.org/2001/XMLSchema#dateTime',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($comment_uri, 'http://purl.org/dc/terms/created', $expected_value), 'Comment date found in RDF output (dc:created).');
 
     // Comment body.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $comment->comment_body->value . "\n",
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($comment_uri, 'http://purl.org/rss/1.0/modules/content/encoded', $expected_value), 'Comment body found in RDF output (content:encoded).');
 
     // The comment author can be a registered user or an anonymous user.
     if ($comment->getOwnerId() > 0) {
-      $author_uri = \Drupal::url('entity.user.canonical', ['user' => $comment->getOwnerId()], array('absolute' => TRUE));
+      $author_uri = \Drupal::url('entity.user.canonical', ['user' => $comment->getOwnerId()], ['absolute' => TRUE]);
       // Comment relation to author.
-      $expected_value = array(
+      $expected_value = [
         'type' => 'uri',
         'value' => $author_uri,
-      );
+      ];
       $this->assertTrue($graph->hasProperty($comment_uri, 'http://rdfs.org/sioc/ns#has_creator', $expected_value), 'Comment relation to author found in RDF output (sioc:has_creator).');
     }
     else {
@@ -321,18 +321,18 @@ class CommentAttributesTest extends CommentTestBase {
 
     // Author name.
     $name = empty($account["name"]) ? $this->webUser->getUsername() : $account["name"] . " (not verified)";
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $name,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($author_uri, 'http://xmlns.com/foaf/0.1/name', $expected_value), 'Comment author name found in RDF output (foaf:name).');
 
     // Comment author homepage (only for anonymous authors).
     if ($comment->getOwnerId() == 0) {
-      $expected_value = array(
+      $expected_value = [
         'type' => 'uri',
         'value' => 'http://example.org/',
-      );
+      ];
       $this->assertTrue($graph->hasProperty($author_uri, 'http://xmlns.com/foaf/0.1/page', $expected_value), 'Comment author link found in RDF output (foaf:page).');
     }
   }
@@ -353,8 +353,8 @@ class CommentAttributesTest extends CommentTestBase {
    * @return \Drupal\comment\Entity\Comment
    *   The saved comment.
    */
-  function saveComment($nid, $uid, $contact = NULL, $pid = 0) {
-    $values = array(
+  public function saveComment($nid, $uid, $contact = NULL, $pid = 0) {
+    $values = [
       'entity_id' => $nid,
       'entity_type' => 'node',
       'field_name' => 'comment',
@@ -363,7 +363,7 @@ class CommentAttributesTest extends CommentTestBase {
       'subject' => $this->randomMachineName(),
       'comment_body' => $this->randomMachineName(),
       'status' => 1,
-    );
+    ];
     if ($contact) {
       $values += $contact;
     }
diff --git a/web/core/modules/rdf/src/Tests/Field/TestDataConverter.php b/web/core/modules/rdf/src/Tests/Field/TestDataConverter.php
index e314f67c1..fd30b278a 100644
--- a/web/core/modules/rdf/src/Tests/Field/TestDataConverter.php
+++ b/web/core/modules/rdf/src/Tests/Field/TestDataConverter.php
@@ -16,7 +16,7 @@ class TestDataConverter {
    * @return string
    *   Returns the data.
    */
-  static function convertFoo($data) {
+  public static function convertFoo($data) {
     return 'foo' . $data['value'];
   }
 
diff --git a/web/core/modules/rdf/src/Tests/GetNamespacesTest.php b/web/core/modules/rdf/src/Tests/GetNamespacesTest.php
index 8aeaf7992..ca46c5cd7 100644
--- a/web/core/modules/rdf/src/Tests/GetNamespacesTest.php
+++ b/web/core/modules/rdf/src/Tests/GetNamespacesTest.php
@@ -17,33 +17,33 @@ class GetNamespacesTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('rdf', 'rdf_test_namespaces');
+  public static $modules = ['rdf', 'rdf_test_namespaces'];
 
   /**
    * Tests RDF namespaces.
    */
-  function testGetRdfNamespaces() {
+  public function testGetRdfNamespaces() {
     // Fetches the front page and extracts RDFa 1.1 prefixes.
     $this->drupalGet('');
 
-    $element = $this->xpath('//html[contains(@prefix, :prefix_binding)]', array(
+    $element = $this->xpath('//html[contains(@prefix, :prefix_binding)]', [
       ':prefix_binding' => 'rdfs: http://www.w3.org/2000/01/rdf-schema#',
-    ));
+    ]);
     $this->assertTrue(!empty($element), 'A prefix declared once is displayed.');
 
-    $element = $this->xpath('//html[contains(@prefix, :prefix_binding)]', array(
+    $element = $this->xpath('//html[contains(@prefix, :prefix_binding)]', [
       ':prefix_binding' => 'foaf: http://xmlns.com/foaf/0.1/',
-    ));
+    ]);
     $this->assertTrue(!empty($element), 'The same prefix declared in several implementations of hook_rdf_namespaces() is valid as long as all the namespaces are the same.');
 
-    $element = $this->xpath('//html[contains(@prefix, :prefix_binding)]', array(
+    $element = $this->xpath('//html[contains(@prefix, :prefix_binding)]', [
       ':prefix_binding' => 'foaf1: http://xmlns.com/foaf/0.1/',
-    ));
+    ]);
     $this->assertTrue(!empty($element), 'Two prefixes can be assigned the same namespace.');
 
-    $element = $this->xpath('//html[contains(@prefix, :prefix_binding)]', array(
+    $element = $this->xpath('//html[contains(@prefix, :prefix_binding)]', [
       ':prefix_binding' => 'dc: http://purl.org/dc/terms/',
-    ));
+    ]);
     $this->assertTrue(!empty($element), 'When a prefix has conflicting namespaces, the first declared one is used.');
   }
 
diff --git a/web/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php b/web/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
index cce663bae..d4d7d3594 100644
--- a/web/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
+++ b/web/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
@@ -19,7 +19,7 @@ class ImageFieldAttributesTest extends ImageFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('rdf', 'image');
+  public static $modules = ['rdf', 'image'];
 
   /**
    * The name of the image field used in the test.
@@ -52,11 +52,11 @@ class ImageFieldAttributesTest extends ImageFieldTestBase {
 
     // Set the RDF mapping for the new field.
     rdf_get_mapping('node', 'article')
-      ->setFieldMapping($this->fieldName, array(
-        'properties' => array('og:image'),
+      ->setFieldMapping($this->fieldName, [
+        'properties' => ['og:image'],
         'mapping_type' => 'rel',
-      ))
-      ->setBundleMapping(array('types' => array()))
+      ])
+      ->setBundleMapping(['types' => []])
       ->save();
 
     // Get the test image that simpletest provides.
@@ -71,12 +71,12 @@ class ImageFieldAttributesTest extends ImageFieldTestBase {
   /**
    * Tests that image fields in teasers have correct resources.
    */
-  function testNodeTeaser() {
+  public function testNodeTeaser() {
     // Set the display options for the teaser.
-    $display_options = array(
+    $display_options = [
       'type' => 'image',
-      'settings' => array('image_style' => 'medium', 'image_link' => 'content'),
-    );
+      'settings' => ['image_style' => 'medium', 'image_link' => 'content'],
+    ];
     $display = entity_get_display('node', 'article', 'teaser');
     $display->setComponent($this->fieldName, $display_options)
       ->save();
@@ -96,17 +96,17 @@ class ImageFieldAttributesTest extends ImageFieldTestBase {
     $image_uri = ImageStyle::load('medium')->buildUrl($this->file->getFileUri());
 
     // Test relations from node to image.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $image_uri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($node_uri, 'http://ogp.me/ns#image', $expected_value), 'Node to file relation found in RDF output (og:image).');
 
     // Test image type.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => 'http://xmlns.com/foaf/0.1/Image',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($image_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Image type found in RDF output (foaf:Image).');
   }
 
diff --git a/web/core/modules/rdf/tests/rdf_conflicting_namespaces/rdf_conflicting_namespaces.module b/web/core/modules/rdf/tests/rdf_conflicting_namespaces/rdf_conflicting_namespaces.module
index 2fbdba4a6..ddaf5cbe9 100644
--- a/web/core/modules/rdf/tests/rdf_conflicting_namespaces/rdf_conflicting_namespaces.module
+++ b/web/core/modules/rdf/tests/rdf_conflicting_namespaces/rdf_conflicting_namespaces.module
@@ -9,7 +9,7 @@
  * Implements hook_rdf_namespaces().
  */
 function rdf_conflicting_namespaces_rdf_namespaces() {
-  return array(
+  return [
     'dc' => 'http://purl.org/conflicting/namespace',
-  );
+  ];
 }
diff --git a/web/core/modules/rdf/tests/rdf_test_namespaces/rdf_test_namespaces.module b/web/core/modules/rdf/tests/rdf_test_namespaces/rdf_test_namespaces.module
index d44c51977..327bd5bc8 100644
--- a/web/core/modules/rdf/tests/rdf_test_namespaces/rdf_test_namespaces.module
+++ b/web/core/modules/rdf/tests/rdf_test_namespaces/rdf_test_namespaces.module
@@ -9,8 +9,8 @@
  * Implements hook_rdf_namespaces().
  */
 function rdf_test_namespaces_rdf_namespaces() {
-  return array(
+  return [
     'foaf'     => 'http://xmlns.com/foaf/0.1/',
     'foaf1'    => 'http://xmlns.com/foaf/0.1/',
-  );
+  ];
 }
diff --git a/web/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
similarity index 76%
rename from web/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php
rename to web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
index 48653a5fd..41a03657a 100644
--- a/web/core/modules/rdf/src/Tests/EntityReferenceFieldAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\taxonomy\Tests\TaxonomyTestBase;
@@ -17,7 +17,7 @@ class EntityReferenceFieldAttributesTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $modules = array('rdf', 'field_test', 'file', 'image');
+  public static $modules = ['rdf', 'field_test', 'file', 'image'];
 
   /**
    * The name of the taxonomy term reference field used in the test.
@@ -36,38 +36,38 @@ class EntityReferenceFieldAttributesTest extends TaxonomyTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $web_user = $this->drupalCreateUser(array('bypass node access', 'administer taxonomy'));
+    $web_user = $this->drupalCreateUser(['bypass node access', 'administer taxonomy']);
     $this->drupalLogin($web_user);
     $this->vocabulary = $this->createVocabulary();
 
     // Create the field.
     $this->fieldName = 'field_taxonomy_test';
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'article', $this->fieldName, 'Tags', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($this->fieldName, array('type' => 'options_select'))
+      ->setComponent($this->fieldName, ['type' => 'options_select'])
       ->save();
     entity_get_display('node', 'article', 'full')
-      ->setComponent($this->fieldName, array('type' => 'entity_reference_label'))
+      ->setComponent($this->fieldName, ['type' => 'entity_reference_label'])
       ->save();
 
     // Set the RDF mapping for the new field.
     rdf_get_mapping('node', 'article')
-      ->setFieldMapping($this->fieldName, array(
-        'properties' => array('dc:subject'),
+      ->setFieldMapping($this->fieldName, [
+        'properties' => ['dc:subject'],
         'mapping_type' => 'rel',
-      ))
+      ])
       ->save();
 
     rdf_get_mapping('taxonomy_term', $this->vocabulary->id())
-      ->setBundleMapping(array('types' => array('skos:Concept')))
-      ->setFieldMapping('name', array('properties' => array('rdfs:label')))
+      ->setBundleMapping(['types' => ['skos:Concept']])
+      ->setFieldMapping('name', ['properties' => ['rdfs:label']])
       ->save();
   }
 
@@ -77,10 +77,10 @@ class EntityReferenceFieldAttributesTest extends TaxonomyTestBase {
    * Ensure that file fields have the correct resource as the object in RDFa
    * when displayed as a teaser.
    */
-  function testNodeTeaser() {
+  public function testNodeTeaser() {
     // Set the teaser display to show this field.
     entity_get_display('node', 'article', 'teaser')
-      ->setComponent($this->fieldName, array('type' => 'entity_reference_label'))
+      ->setComponent($this->fieldName, ['type' => 'entity_reference_label'])
       ->save();
 
     // Create a term in each vocabulary.
@@ -90,14 +90,14 @@ class EntityReferenceFieldAttributesTest extends TaxonomyTestBase {
     $taxonomy_term_2_uri = $term2->url('canonical', ['absolute' => TRUE]);
 
     // Create the node.
-    $node = $this->drupalCreateNode(array('type' => 'article'));
-    $node->set($this->fieldName, array(
-      array('target_id' => $term1->id()),
-      array('target_id' => $term2->id()),
-    ));
+    $node = $this->drupalCreateNode(['type' => 'article']);
+    $node->set($this->fieldName, [
+      ['target_id' => $term1->id()],
+      ['target_id' => $term2->id()],
+    ]);
 
     // Render the node.
-    $node_render_array = entity_view_multiple(array($node), 'teaser');
+    $node_render_array = entity_view_multiple([$node], 'teaser');
     $html = \Drupal::service('renderer')->renderRoot($node_render_array);
 
     // Parse the teaser.
@@ -108,39 +108,39 @@ class EntityReferenceFieldAttributesTest extends TaxonomyTestBase {
 
     // Node relations to taxonomy terms.
     $node_uri = $node->url('canonical', ['absolute' => TRUE]);
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $taxonomy_term_1_uri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($node_uri, 'http://purl.org/dc/terms/subject', $expected_value), 'Node to term relation found in RDF output (dc:subject).');
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $taxonomy_term_2_uri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($node_uri, 'http://purl.org/dc/terms/subject', $expected_value), 'Node to term relation found in RDF output (dc:subject).');
     // Taxonomy terms triples.
     // Term 1.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => 'http://www.w3.org/2004/02/skos/core#Concept',
-    );
+    ];
     // @todo Enable with https://www.drupal.org/node/2072791.
     //$this->assertTrue($graph->hasProperty($taxonomy_term_1_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Taxonomy term type found in RDF output (skos:Concept).');
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $term1->getName(),
-    );
+    ];
     //$this->assertTrue($graph->hasProperty($taxonomy_term_1_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Taxonomy term name found in RDF output (rdfs:label).');
     // Term 2.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => 'http://www.w3.org/2004/02/skos/core#Concept',
-    );
+    ];
     //$this->assertTrue($graph->hasProperty($taxonomy_term_2_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Taxonomy term type found in RDF output (skos:Concept).');
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $term2->getName(),
-    );
+    ];
     //$this->assertTrue($graph->hasProperty($taxonomy_term_2_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Taxonomy term name found in RDF output (rdfs:label).');
   }
 
diff --git a/web/core/modules/rdf/src/Tests/FileFieldAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
similarity index 83%
rename from web/core/modules/rdf/src/Tests/FileFieldAttributesTest.php
rename to web/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
index 34e76ae3c..ad743580d 100644
--- a/web/core/modules/rdf/src/Tests/FileFieldAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\file\Tests\FileFieldTestBase;
 use Drupal\file\Entity\File;
@@ -17,7 +17,7 @@ class FileFieldAttributesTest extends FileFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('rdf', 'file');
+  public static $modules = ['rdf', 'file'];
 
   /**
    * The name of the file field used in the test.
@@ -50,19 +50,19 @@ class FileFieldAttributesTest extends FileFieldTestBase {
 
     // Set the teaser display to show this field.
     entity_get_display('node', 'article', 'teaser')
-      ->setComponent($this->fieldName, array('type' => 'file_default'))
+      ->setComponent($this->fieldName, ['type' => 'file_default'])
       ->save();
 
     // Set the RDF mapping for the new field.
     $mapping = rdf_get_mapping('node', 'article');
-    $mapping->setFieldMapping($this->fieldName, array('properties' => array('rdfs:seeAlso'), 'mapping_type' => 'rel'))->save();
+    $mapping->setFieldMapping($this->fieldName, ['properties' => ['rdfs:seeAlso'], 'mapping_type' => 'rel'])->save();
 
     $test_file = $this->getTestFile('text');
 
     // Create a new node with the uploaded file.
     $nid = $this->uploadNodeFile($test_file, $this->fieldName, $type_name);
 
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $this->node = $node_storage->load($nid);
     $this->file = File::load($this->node->{$this->fieldName}->target_id);
   }
@@ -73,9 +73,9 @@ class FileFieldAttributesTest extends FileFieldTestBase {
    * Ensure that file fields have the correct resource as the object in RDFa
    * when displayed as a teaser.
    */
-  function testNodeTeaser() {
+  public function testNodeTeaser() {
     // Render the teaser.
-    $node_render_array = entity_view_multiple(array($this->node), 'teaser');
+    $node_render_array = entity_view_multiple([$this->node], 'teaser');
     $html = \Drupal::service('renderer')->renderRoot($node_render_array);
 
     // Parses front page where the node is displayed in its teaser form.
@@ -88,10 +88,10 @@ class FileFieldAttributesTest extends FileFieldTestBase {
     $file_uri = file_create_url($this->file->getFileUri());
 
     // Node relation to attached file.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $file_uri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($node_uri, 'http://www.w3.org/2000/01/rdf-schema#seeAlso', $expected_value), 'Node to file relation found in RDF output (rdfs:seeAlso).');
     $this->drupalGet('node');
   }
diff --git a/web/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php b/web/core/modules/rdf/tests/src/Functional/GetRdfNamespacesTest.php
similarity index 76%
rename from web/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php
rename to web/core/modules/rdf/tests/src/Functional/GetRdfNamespacesTest.php
index 7fde6f0c4..5d31d3ac2 100644
--- a/web/core/modules/rdf/src/Tests/GetRdfNamespacesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/GetRdfNamespacesTest.php
@@ -1,27 +1,27 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests hook_rdf_namespaces().
  *
  * @group rdf
  */
-class GetRdfNamespacesTest extends WebTestBase {
+class GetRdfNamespacesTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('rdf', 'rdf_test_namespaces');
+  public static $modules = ['rdf', 'rdf_test_namespaces'];
 
   /**
    * Tests getting RDF namespaces.
    */
-  function testGetRdfNamespaces() {
+  public function testGetRdfNamespaces() {
     // Get all RDF namespaces.
     $ns = rdf_get_namespaces();
 
@@ -31,7 +31,7 @@ class GetRdfNamespacesTest extends WebTestBase {
 
     // Enable rdf_conflicting_namespaces to ensure that an exception is thrown
     // when RDF namespaces are conflicting.
-    \Drupal::service('module_installer')->install(array('rdf_conflicting_namespaces'), TRUE);
+    \Drupal::service('module_installer')->install(['rdf_conflicting_namespaces'], TRUE);
     try {
       $ns = rdf_get_namespaces();
       $this->fail('Expected exception not thrown for conflicting namespace declaration.');
diff --git a/web/core/modules/rdf/src/Tests/NodeAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
similarity index 78%
rename from web/core/modules/rdf/src/Tests/NodeAttributesTest.php
rename to web/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
index 5c6b2676c..87067bd68 100644
--- a/web/core/modules/rdf/src/Tests/NodeAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\node\Tests\NodeTestBase;
 
@@ -16,36 +16,36 @@ class NodeAttributesTest extends NodeTestBase {
    *
    * @var array
    */
-  public static $modules = array('rdf');
+  public static $modules = ['rdf'];
 
   protected function setUp() {
     parent::setUp();
 
     rdf_get_mapping('node', 'article')
-      ->setBundleMapping(array(
-        'types' => array('sioc:Item', 'foaf:Document'),
-      ))
-      ->setFieldMapping('title', array(
-        'properties' => array('dc:title'),
-      ))
-      ->setFieldMapping('created', array(
-        'properties' => array('dc:date', 'dc:created'),
+      ->setBundleMapping([
+        'types' => ['sioc:Item', 'foaf:Document'],
+      ])
+      ->setFieldMapping('title', [
+        'properties' => ['dc:title'],
+      ])
+      ->setFieldMapping('created', [
+        'properties' => ['dc:date', 'dc:created'],
         'datatype' => 'xsd:dateTime',
-        'datatype_callback' => array('callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'),
-      ))
+        'datatype_callback' => ['callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'],
+      ])
       ->save();
   }
 
   /**
    * Creates a node of type article and tests its RDFa markup.
    */
-  function testNodeAttributes() {
+  public function testNodeAttributes() {
     // Create node with single quotation mark title to ensure it does not get
     // escaped more than once.
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'type' => 'article',
       'title' => $this->randomMachineName(8) . "'",
-    ));
+    ]);
 
     $node_uri = $node->url('canonical', ['absolute' => TRUE]);
     $base_uri = \Drupal::url('<front>', [], ['absolute' => TRUE]);
@@ -57,37 +57,37 @@ class NodeAttributesTest extends NodeTestBase {
 
     // Inspects RDF graph output.
     // Node type.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => 'http://rdfs.org/sioc/ns#Item',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($node_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Node type found in RDF output (sioc:Item).');
     // Node type.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => 'http://xmlns.com/foaf/0.1/Document',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($node_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Node type found in RDF output (foaf:Document).');
     // Node title.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $node->getTitle(),
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($node_uri, 'http://purl.org/dc/terms/title', $expected_value), 'Node title found in RDF output (dc:title).');
     // Node date (date format must be UTC).
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => \Drupal::service('date.formatter')->format($node->getCreatedTime(), 'custom', 'c', 'UTC'),
       'datatype' => 'http://www.w3.org/2001/XMLSchema#dateTime',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($node_uri, 'http://purl.org/dc/terms/date', $expected_value), 'Node date found in RDF output (dc:date).');
     // Node date (date format must be UTC).
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => \Drupal::service('date.formatter')->format($node->getCreatedTime(), 'custom', 'c', 'UTC'),
       'datatype' => 'http://www.w3.org/2001/XMLSchema#dateTime',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($node_uri, 'http://purl.org/dc/terms/created', $expected_value), 'Node date found in RDF output (dc:created).');
   }
 
diff --git a/web/core/modules/rdf/src/Tests/StandardProfileTest.php b/web/core/modules/rdf/tests/src/Functional/StandardProfileTest.php
similarity index 89%
rename from web/core/modules/rdf/src/Tests/StandardProfileTest.php
rename to web/core/modules/rdf/tests/src/Functional/StandardProfileTest.php
index e6c358de6..76ae39bc8 100644
--- a/web/core/modules/rdf/src/Tests/StandardProfileTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/StandardProfileTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\Core\Url;
 use Drupal\file\Entity\File;
 use Drupal\image\Entity\ImageStyle;
 use Drupal\node\Entity\NodeType;
 use Drupal\node\NodeInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\comment\Entity\Comment;
 use Drupal\taxonomy\Entity\Term;
 
@@ -16,7 +16,7 @@ use Drupal\taxonomy\Entity\Term;
  *
  * @group rdf
  */
-class StandardProfileTest extends WebTestBase {
+class StandardProfileTest extends BrowserTestBase {
 
   /**
    * The profile used during tests.
@@ -107,23 +107,23 @@ class StandardProfileTest extends WebTestBase {
 
     // Use Classy theme for testing markup output.
     \Drupal::service('theme_handler')->install(['classy']);
-    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->config('system.theme')->set('default', 'classy')->save();
 
     $this->baseUri = \Drupal::url('<front>', [], ['absolute' => TRUE]);
 
     // Create two test users.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer content types',
       'administer comments',
       'access comments',
       'access content',
-    ));
-    $this->webUser = $this->drupalCreateUser(array(
+    ]);
+    $this->webUser = $this->drupalCreateUser([
       'access comments',
       'post comments',
       'skip comment approval',
       'access content',
-    ));
+    ]);
 
     $this->drupalLogin($this->adminUser);
 
@@ -141,46 +141,46 @@ class StandardProfileTest extends WebTestBase {
     $this->image->save();
 
     // Create article.
-    $article_settings = array(
+    $article_settings = [
       'type' => 'article',
-      'promote' => NODE_PROMOTED,
-      'field_image' => array(
-        array(
+      'promote' => NodeInterface::PROMOTED,
+      'field_image' => [
+        [
           'target_id' => $this->image->id(),
-        ),
-      ),
-      'field_tags' => array(
-        array(
+        ],
+      ],
+      'field_tags' => [
+        [
           'target_id' => $this->term->id(),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     $this->article = $this->drupalCreateNode($article_settings);
     // Create second article to test teaser list.
-    $this->drupalCreateNode(array('type' => 'article', 'promote' => NODE_PROMOTED,));
+    $this->drupalCreateNode(['type' => 'article', 'promote' => NodeInterface::PROMOTED]);
 
     // Create article comment.
     $this->articleComment = $this->saveComment($this->article->id(), $this->webUser->id(), NULL, 0);
 
     // Create page.
-    $this->page = $this->drupalCreateNode(array('type' => 'page'));
+    $this->page = $this->drupalCreateNode(['type' => 'page']);
 
     // Set URIs.
     // Image.
     $image_file = $this->article->get('field_image')->entity;
     $this->imageUri = ImageStyle::load('large')->buildUrl($image_file->getFileUri());
     // Term.
-    $this->termUri = $this->term->url('canonical', array('absolute' => TRUE));
+    $this->termUri = $this->term->url('canonical', ['absolute' => TRUE]);
     // Article.
-    $this->articleUri = $this->article->url('canonical', array('absolute' => TRUE));
+    $this->articleUri = $this->article->url('canonical', ['absolute' => TRUE]);
     // Page.
-    $this->pageUri = $this->page->url('canonical', array('absolute' => TRUE));
+    $this->pageUri = $this->page->url('canonical', ['absolute' => TRUE]);
     // Author.
-    $this->authorUri = $this->adminUser->url('canonical', array('absolute' => TRUE));
+    $this->authorUri = $this->adminUser->url('canonical', ['absolute' => TRUE]);
     // Comment.
-    $this->articleCommentUri = $this->articleComment->url('canonical', array('absolute' => TRUE));
+    $this->articleCommentUri = $this->articleComment->url('canonical', ['absolute' => TRUE]);
     // Commenter.
-    $this->commenterUri = $this->webUser->url('canonical', array('absolute' => TRUE));
+    $this->commenterUri = $this->webUser->url('canonical', ['absolute' => TRUE]);
 
     $this->drupalLogout();
   }
@@ -211,11 +211,11 @@ class StandardProfileTest extends WebTestBase {
     $this->assertEqual(2, count($graph->allOfType('http://schema.org/Article')), 'Two articles found on front page.');
 
     // Test interaction count.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => 'UserComments:1',
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/interactionCount', $expected_value), "Teaser comment count was found (schema:interactionCount).");
 
     // Test the properties that are common between pages and articles and are
@@ -228,10 +228,10 @@ class StandardProfileTest extends WebTestBase {
     //   image, move this to testArticleProperties().
     $image_file = $this->article->get('field_image')->entity;
     $image_uri = ImageStyle::load('medium')->buildUrl($image_file->getFileUri());
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $image_uri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/image', $expected_value), "Teaser image was found (schema:image).");
   }
 
@@ -258,10 +258,10 @@ class StandardProfileTest extends WebTestBase {
 
     // @todo Once the image points to the original instead of the processed
     //   image, move this to testArticleProperties().
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $this->imageUri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/image', $expected_value), "Article image was found (schema:image).");
   }
 
@@ -303,10 +303,10 @@ class StandardProfileTest extends WebTestBase {
     $this->assertEqual($graph->type($this->authorUri), 'schema:Person', "User type was found (schema:Person) on user page.");
 
     // User name.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $this->adminUser->label(),
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->authorUri, 'http://schema.org/name', $expected_value), "User name was found (schema:name) on user page.");
 
     $this->drupalLogout();
@@ -323,11 +323,11 @@ class StandardProfileTest extends WebTestBase {
     $this->assertEqual($graph->type($this->termUri), 'schema:Thing', "Term type was found (schema:Thing) on term page.");
 
     // Term name.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $this->term->getName(),
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->termUri, 'http://schema.org/name', $expected_value), "Term name was found (schema:name) on term page.");
 
     // @todo Add test for term description once it is a field:
@@ -345,47 +345,47 @@ class StandardProfileTest extends WebTestBase {
    *   The word to use in the test assertion message.
    */
   protected function assertRdfaCommonNodeProperties($graph, NodeInterface $node, $message_prefix) {
-    $uri = $node->url('canonical', array('absolute' => TRUE));
+    $uri = $node->url('canonical', ['absolute' => TRUE]);
 
     // Title.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $node->get('title')->value,
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($uri, 'http://schema.org/name', $expected_value), "$message_prefix title was found (schema:name).");
 
     // Created date.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => format_date($node->get('created')->value, 'custom', 'c', 'UTC'),
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($uri, 'http://schema.org/dateCreated', $expected_value), "$message_prefix created date was found (schema:dateCreated) in teaser.");
 
     // Body.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $node->get('body')->value,
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($uri, 'http://schema.org/text', $expected_value), "$message_prefix body was found (schema:text) in teaser.");
 
     // Author.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $this->authorUri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($uri, 'http://schema.org/author', $expected_value), "$message_prefix author was found (schema:author) in teaser.");
 
     // Author type.
     $this->assertEqual($graph->type($this->authorUri), 'schema:Person', "$message_prefix author type was found (schema:Person).");
 
     // Author name.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $this->adminUser->label(),
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->authorUri, 'http://schema.org/name', $expected_value), "$message_prefix author name was found (schema:name).");
   }
 
@@ -399,10 +399,10 @@ class StandardProfileTest extends WebTestBase {
    */
   protected function assertRdfaArticleProperties($graph, $message_prefix) {
     // Tags.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $this->termUri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/about', $expected_value), "$message_prefix tag was found (schema:about).");
 
     // Tag type.
@@ -410,11 +410,11 @@ class StandardProfileTest extends WebTestBase {
     //$this->assertEqual($graph->type($this->termUri), 'schema:Thing', 'Tag type was found (schema:Thing).');
 
     // Tag name.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $this->term->getName(),
       'lang' => 'en',
-    );
+    ];
     // @todo Enable with https://www.drupal.org/node/2072791.
     //$this->assertTrue($graph->hasProperty($this->termUri, 'http://schema.org/name', $expected_value), "$message_prefix name was found (schema:name).");
   }
@@ -427,58 +427,58 @@ class StandardProfileTest extends WebTestBase {
    */
   protected function assertRdfaNodeCommentProperties($graph) {
     // Relationship between node and comment.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $this->articleCommentUri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/comment', $expected_value), 'Relationship between node and comment found (schema:comment).');
 
     // Comment type.
     $this->assertEqual($graph->type($this->articleCommentUri), 'schema:Comment', 'Comment type was found (schema:Comment).');
 
     // Comment title.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $this->articleComment->get('subject')->value,
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->articleCommentUri, 'http://schema.org/name', $expected_value), 'Article comment title was found (schema:name).');
 
     // Comment created date.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => format_date($this->articleComment->get('created')->value, 'custom', 'c', 'UTC'),
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->articleCommentUri, 'http://schema.org/dateCreated', $expected_value), 'Article comment created date was found (schema:dateCreated).');
 
     // Comment body.
     $text = $this->articleComment->get('comment_body')->value;
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       // There is an extra carriage return in the when parsing comments as
       // output by Bartik, so it must be added to the expected value.
       'value' => "$text
 ",
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->articleCommentUri, 'http://schema.org/text', $expected_value), 'Article comment body was found (schema:text).');
 
     // Comment uid.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => $this->commenterUri,
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->articleCommentUri, 'http://schema.org/author', $expected_value), 'Article comment author was found (schema:author).');
 
     // Comment author type.
     $this->assertEqual($graph->type($this->commenterUri), 'schema:Person', 'Comment author type was found (schema:Person).');
 
     // Comment author name.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $this->webUser->getUsername(),
-    );
+    ];
     $this->assertTrue($graph->hasProperty($this->commenterUri, 'http://schema.org/name', $expected_value), 'Comment author name was found (schema:name).');
   }
 
@@ -499,7 +499,7 @@ class StandardProfileTest extends WebTestBase {
    *   The saved comment.
    */
   protected function saveComment($nid, $uid, $contact = NULL, $pid = 0) {
-    $values = array(
+    $values = [
       'entity_id' => $nid,
       'entity_type' => 'node',
       'field_name' => 'comment',
@@ -508,7 +508,7 @@ class StandardProfileTest extends WebTestBase {
       'subject' => $this->randomMachineName(),
       'comment_body' => $this->randomMachineName(),
       'status' => 1,
-    );
+    ];
     if ($contact) {
       $values += $contact;
     }
diff --git a/web/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/TaxonomyAttributesTest.php
similarity index 83%
rename from web/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php
rename to web/core/modules/rdf/tests/src/Functional/TaxonomyAttributesTest.php
index 6be2c5bc3..ea74ce5c2 100644
--- a/web/core/modules/rdf/src/Tests/TaxonomyAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/TaxonomyAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
 use Drupal\taxonomy\Tests\TaxonomyTestBase;
 
@@ -16,7 +16,7 @@ class TaxonomyAttributesTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $modules = array('rdf', 'views');
+  public static $modules = ['rdf', 'views'];
 
   /**
    * Vocabulary created for testing purposes.
@@ -32,17 +32,17 @@ class TaxonomyAttributesTest extends TaxonomyTestBase {
 
     // RDF mapping - term bundle.
     rdf_get_mapping('taxonomy_term', $this->vocabulary->id())
-      ->setBundleMapping(array('types' => array('skos:Concept')))
-      ->setFieldMapping('name', array(
-        'properties' => array('rdfs:label', 'skos:prefLabel'),
-      ))
+      ->setBundleMapping(['types' => ['skos:Concept']])
+      ->setFieldMapping('name', [
+        'properties' => ['rdfs:label', 'skos:prefLabel'],
+      ])
       ->save();
   }
 
   /**
    * Creates a random term and ensures the RDF output is correct.
    */
-  function testTaxonomyTermRdfaAttributes() {
+  public function testTaxonomyTermRdfaAttributes() {
     $term = $this->createTerm($this->vocabulary);
     $term_uri = $term->url('canonical', ['absolute' => TRUE]);
 
@@ -54,24 +54,24 @@ class TaxonomyAttributesTest extends TaxonomyTestBase {
 
     // Inspects RDF graph output.
     // Term type.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'uri',
       'value' => 'http://www.w3.org/2004/02/skos/core#Concept',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($term_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Term type found in RDF output (skos:Concept).');
     // Term label.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $term->getName(),
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($term_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Term label found in RDF output (rdfs:label).');
     // Term label.
-    $expected_value = array(
+    $expected_value = [
       'type' => 'literal',
       'value' => $term->getName(),
       'lang' => 'en',
-    );
+    ];
     $this->assertTrue($graph->hasProperty($term_uri, 'http://www.w3.org/2004/02/skos/core#prefLabel', $expected_value), 'Term label found in RDF output (skos:prefLabel).');
 
     // @todo Add test for term description once it is a field:
diff --git a/web/core/modules/rdf/src/Tests/UserAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/UserAttributesTest.php
similarity index 73%
rename from web/core/modules/rdf/src/Tests/UserAttributesTest.php
rename to web/core/modules/rdf/tests/src/Functional/UserAttributesTest.php
index 232b5b2e8..7e9828600 100644
--- a/web/core/modules/rdf/src/Tests/UserAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/UserAttributesTest.php
@@ -1,32 +1,32 @@
 <?php
 
-namespace Drupal\rdf\Tests;
+namespace Drupal\Tests\rdf\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the RDFa markup of Users.
  *
  * @group rdf
  */
-class UserAttributesTest extends WebTestBase {
+class UserAttributesTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('rdf', 'node');
+  public static $modules = ['rdf', 'node'];
 
   protected function setUp() {
     parent::setUp();
     rdf_get_mapping('user', 'user')
-      ->setBundleMapping(array(
-        'types' => array('sioc:UserAccount'),
-      ))
-      ->setFieldMapping('name', array(
-        'properties' => array('foaf:name'),
-      ))
+      ->setBundleMapping([
+        'types' => ['sioc:UserAccount'],
+      ])
+      ->setFieldMapping('name', [
+        'properties' => ['foaf:name'],
+      ])
       ->save();
   }
 
@@ -36,21 +36,21 @@ class UserAttributesTest extends WebTestBase {
    * Creates a random user and ensures the default mapping for the user is
    * being used.
    */
-  function testUserAttributesInMarkup() {
+  public function testUserAttributesInMarkup() {
     // Creates users that should and should not be truncated
     // by template_preprocess_username (20 characters)
     // one of these users tests right on the cusp (20).
-    $user1 = $this->drupalCreateUser(array('access user profiles'));
+    $user1 = $this->drupalCreateUser(['access user profiles']);
 
-    $authors = array(
-      $this->drupalCreateUser(array(), $this->randomMachineName(30)),
-      $this->drupalCreateUser(array(), $this->randomMachineName(20)),
-      $this->drupalCreateUser(array(), $this->randomMachineName(5))
-    );
+    $authors = [
+      $this->drupalCreateUser([], $this->randomMachineName(30)),
+      $this->drupalCreateUser([], $this->randomMachineName(20)),
+      $this->drupalCreateUser([], $this->randomMachineName(5))
+    ];
 
     $this->drupalLogin($user1);
 
-    $this->drupalCreateContentType(array('type' => 'article'));
+    $this->drupalCreateContentType(['type' => 'article']);
 
     /** @var \Drupal\user\UserInterface[] $authors */
     foreach ($authors as $author) {
@@ -65,21 +65,21 @@ class UserAttributesTest extends WebTestBase {
 
       // Inspects RDF graph output.
       // User type.
-      $expected_value = array(
+      $expected_value = [
         'type' => 'uri',
         'value' => 'http://rdfs.org/sioc/ns#UserAccount',
-      );
+      ];
       $this->assertTrue($graph->hasProperty($account_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'User type found in RDF output (sioc:UserAccount).');
       // User name.
-      $expected_value = array(
+      $expected_value = [
         'type' => 'literal',
         'value' => $author->getUsername(),
-      );
+      ];
       $this->assertTrue($graph->hasProperty($account_uri, 'http://xmlns.com/foaf/0.1/name', $expected_value), 'User name found in RDF output (foaf:name).');
 
       // User creates a node.
       $this->drupalLogin($author);
-      $node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
+      $node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1]);
       $this->drupalLogin($user1);
 
       // Parses the node created by the user.
@@ -90,16 +90,16 @@ class UserAttributesTest extends WebTestBase {
 
       // Ensures the default bundle mapping for user is used on the Authored By
       // information on the node.
-      $expected_value = array(
+      $expected_value = [
         'type' => 'uri',
         'value' => 'http://rdfs.org/sioc/ns#UserAccount',
-      );
+      ];
       $this->assertTrue($graph->hasProperty($account_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'User type found in RDF output (sioc:UserAccount).');
       // User name.
-      $expected_value = array(
+      $expected_value = [
         'type' => 'literal',
         'value' => $author->getUsername(),
-      );
+      ];
       $this->assertTrue($graph->hasProperty($account_uri, 'http://xmlns.com/foaf/0.1/name', $expected_value), 'User name found in RDF output (foaf:name).');
 
     }
diff --git a/web/core/modules/rdf/tests/src/Kernel/CrudTest.php b/web/core/modules/rdf/tests/src/Kernel/CrudTest.php
index 60b4208d0..f8292a38b 100644
--- a/web/core/modules/rdf/tests/src/Kernel/CrudTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/CrudTest.php
@@ -16,7 +16,7 @@ class CrudTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('entity_test', 'rdf', 'system');
+  public static $modules = ['entity_test', 'rdf', 'system'];
 
   /**
    * @var string
@@ -42,7 +42,7 @@ class CrudTest extends KernelTestBase {
   /**
    * Tests creation of RDF mapping.
    */
-  function testMappingCreation() {
+  public function testMappingCreation() {
     $mapping_config_name = "{$this->prefix}.{$this->entityType}.{$this->bundle}";
 
     // Save bundle mapping config.
@@ -55,20 +55,20 @@ class CrudTest extends KernelTestBase {
   /**
    * Test the handling of bundle mappings.
    */
-  function testBundleMapping() {
+  public function testBundleMapping() {
     // Test that the bundle mapping can be saved.
-    $types = array('sioc:Post', 'foaf:Document');
+    $types = ['sioc:Post', 'foaf:Document'];
     rdf_get_mapping($this->entityType, $this->bundle)
-      ->setBundleMapping(array('types' => $types))
+      ->setBundleMapping(['types' => $types])
       ->save();
     $bundle_mapping = rdf_get_mapping($this->entityType, $this->bundle)
       ->getBundleMapping();
     $this->assertEqual($types, $bundle_mapping['types'], 'Bundle mapping saved.');
 
     // Test that the bundle mapping can be edited.
-    $types = array('schema:BlogPosting');
+    $types = ['schema:BlogPosting'];
     rdf_get_mapping($this->entityType, $this->bundle)
-      ->setBundleMapping(array('types' => $types))
+      ->setBundleMapping(['types' => $types])
       ->save();
     $bundle_mapping = rdf_get_mapping($this->entityType, $this->bundle)
       ->getBundleMapping();
@@ -78,15 +78,15 @@ class CrudTest extends KernelTestBase {
   /**
    * Test the handling of field mappings.
    */
-  function testFieldMapping() {
+  public function testFieldMapping() {
     $field_name = 'created';
 
     // Test that the field mapping can be saved.
-    $mapping = array(
-      'properties' => array('dc:created'),
+    $mapping = [
+      'properties' => ['dc:created'],
       'datatype' => 'xsd:dateTime',
-      'datatype_callback' => array('callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'),
-    );
+      'datatype_callback' => ['callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'],
+    ];
     rdf_get_mapping($this->entityType, $this->bundle)
       ->setFieldMapping($field_name, $mapping)
       ->save();
@@ -95,11 +95,11 @@ class CrudTest extends KernelTestBase {
     $this->assertEqual($mapping, $field_mapping, 'Field mapping saved.');
 
     // Test that the field mapping can be edited.
-    $mapping = array(
-      'properties' => array('dc:date'),
+    $mapping = [
+      'properties' => ['dc:date'],
       'datatype' => 'foo:bar',
-      'datatype_callback' => array('callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'),
-    );
+      'datatype_callback' => ['callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'],
+    ];
     rdf_get_mapping($this->entityType, $this->bundle)
       ->setFieldMapping($field_name, $mapping)
       ->save();
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php
index a35a9c43a..fc78691b9 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php
@@ -26,7 +26,7 @@ class DateTimeFieldRdfaTest extends FieldRdfaTestBase {
   /**
   * {@inheritdoc}
   */
-  public static $modules = array('datetime');
+  public static $modules = ['datetime'];
 
   protected function setUp() {
     parent::setUp();
@@ -35,12 +35,12 @@ class DateTimeFieldRdfaTest extends FieldRdfaTestBase {
 
     // Add the mapping.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:dateCreated'),
-    ))->save();
+    $mapping->setFieldMapping($this->fieldName, [
+      'properties' => ['schema:dateCreated'],
+    ])->save();
 
     // Set up test entity.
-    $this->entity = EntityTest::create(array());
+    $this->entity = EntityTest::create([]);
     $this->entity->{$this->fieldName}->value = $this->testValue;
   }
 
@@ -48,7 +48,7 @@ class DateTimeFieldRdfaTest extends FieldRdfaTestBase {
    * Tests the default formatter.
    */
   public function testDefaultFormatter() {
-    $this->assertFormatterRdfa(array('type' => 'datetime_default'), 'http://schema.org/dateCreated', array('value' => $this->testValue . 'Z', 'type' => 'literal', 'datatype' => 'http://www.w3.org/2001/XMLSchema#dateTime'));
+    $this->assertFormatterRdfa(['type' => 'datetime_default'], 'http://schema.org/dateCreated', ['value' => $this->testValue . 'Z', 'type' => 'literal', 'datatype' => 'http://www.w3.org/2001/XMLSchema#dateTime']);
   }
 
 }
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php
index c12175165..85ae88810 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php
@@ -19,7 +19,7 @@ class EmailFieldRdfaTest extends FieldRdfaTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('text');
+  public static $modules = ['text'];
 
   protected function setUp() {
     parent::setUp();
@@ -28,13 +28,13 @@ class EmailFieldRdfaTest extends FieldRdfaTestBase {
 
     // Add the mapping.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:email'),
-    ))->save();
+    $mapping->setFieldMapping($this->fieldName, [
+      'properties' => ['schema:email'],
+    ])->save();
 
     // Set up test values.
     $this->testValue = 'test@example.com';
-    $this->entity = EntityTest::create(array());
+    $this->entity = EntityTest::create([]);
     $this->entity->{$this->fieldName}->value = $this->testValue;
   }
 
@@ -43,9 +43,9 @@ class EmailFieldRdfaTest extends FieldRdfaTestBase {
    */
   public function testAllFormatters() {
     // Test the plain formatter.
-    $this->assertFormatterRdfa(array('type' => 'string'), 'http://schema.org/email', array('value' => $this->testValue));
+    $this->assertFormatterRdfa(['type' => 'string'], 'http://schema.org/email', ['value' => $this->testValue]);
     // Test the mailto formatter.
-    $this->assertFormatterRdfa(array('type' => 'email_mailto'), 'http://schema.org/email', array('value' => $this->testValue));
+    $this->assertFormatterRdfa(['type' => 'email_mailto'], 'http://schema.org/email', ['value' => $this->testValue]);
   }
 
 }
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php
index cefa7e0fd..9312fbc92 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php
@@ -52,7 +52,7 @@ class EntityReferenceRdfaTest extends FieldRdfaTestBase {
     $this->installEntitySchema('entity_test_rev');
 
     // Give anonymous users permission to view test entities.
-    $this->installConfig(array('user'));
+    $this->installConfig(['user']);
     Role::load(RoleInterface::ANONYMOUS_ID)
       ->grantPermission('view test entity')
       ->save();
@@ -61,20 +61,20 @@ class EntityReferenceRdfaTest extends FieldRdfaTestBase {
 
     // Add the mapping.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:knows'),
-    ))->save();
+    $mapping->setFieldMapping($this->fieldName, [
+      'properties' => ['schema:knows'],
+    ])->save();
 
     // Create the entity to be referenced.
     $this->targetEntity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('name' => $this->randomMachineName()));
+      ->create(['name' => $this->randomMachineName()]);
     $this->targetEntity->save();
 
     // Create the entity that will have the entity reference field.
     $this->entity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('name' => $this->randomMachineName()));
+      ->create(['name' => $this->randomMachineName()]);
     $this->entity->save();
     $this->entity->{$this->fieldName}->entity = $this->targetEntity;
     $this->uri = $this->getAbsoluteUri($this->entity);
@@ -87,9 +87,9 @@ class EntityReferenceRdfaTest extends FieldRdfaTestBase {
     $entity_uri = $this->getAbsoluteUri($this->targetEntity);
 
     // Tests the label formatter.
-    $this->assertFormatterRdfa(array('type' => 'entity_reference_label'), 'http://schema.org/knows', array('value' => $entity_uri, 'type' => 'uri'));
+    $this->assertFormatterRdfa(['type' => 'entity_reference_label'], 'http://schema.org/knows', ['value' => $entity_uri, 'type' => 'uri']);
     // Tests the entity formatter.
-    $this->assertFormatterRdfa(array('type' => 'entity_reference_entity_view'), 'http://schema.org/knows', array('value' => $entity_uri, 'type' => 'uri'));
+    $this->assertFormatterRdfa(['type' => 'entity_reference_entity_view'], 'http://schema.org/knows', ['value' => $entity_uri, 'type' => 'uri']);
   }
 
 }
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php
index 1e1a809f6..94f7f24da 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php
@@ -19,23 +19,23 @@ class FieldRdfaDatatypeCallbackTest extends FieldRdfaTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('text', 'filter');
+  public static $modules = ['text', 'filter'];
 
   protected function setUp() {
     parent::setUp();
 
     $this->createTestField();
 
-    $this->installConfig(array('filter'));
+    $this->installConfig(['filter']);
 
     // Add the mapping.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:interactionCount'),
-      'datatype_callback' => array(
+    $mapping->setFieldMapping($this->fieldName, [
+      'properties' => ['schema:interactionCount'],
+      'datatype_callback' => [
         'callable' => 'Drupal\rdf\Tests\Field\TestDataConverter::convertFoo',
-      ),
-    ))->save();
+      ],
+    ])->save();
 
     // Set up test values.
     $this->testValue = $this->randomMachineName();
@@ -51,7 +51,7 @@ class FieldRdfaDatatypeCallbackTest extends FieldRdfaTestBase {
    */
   public function testDefaultFormatter() {
     // Expected value is the output of the datatype callback, not the raw value.
-    $this->assertFormatterRdfa(array('type' => 'text_default'), 'http://schema.org/interactionCount', array('value' => 'foo' . $this->testValue));
+    $this->assertFormatterRdfa(['type' => 'text_default'], 'http://schema.org/interactionCount', ['value' => 'foo' . $this->testValue]);
   }
 
 }
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php b/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php
index 74311850a..82ea9efdc 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php
@@ -48,7 +48,7 @@ abstract class FieldRdfaTestBase extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('rdf');
+  public static $modules = ['rdf'];
 
   /**
    * @var string
@@ -83,7 +83,7 @@ abstract class FieldRdfaTestBase extends FieldKernelTestBase {
    *   - datatype: (optional) The datatype of the value (e.g. xsd:dateTime).
    */
   protected function assertFormatterRdfa($formatter, $property, $expected_rdf_value) {
-    $expected_rdf_value += array('type' => 'literal');
+    $expected_rdf_value += ['type' => 'literal'];
 
     // The field formatter will be rendered inside the entity. Set the field
     // formatter in the entity display options before rendering the entity.
@@ -111,12 +111,12 @@ abstract class FieldRdfaTestBase extends FieldKernelTestBase {
    * @param array $field_settings
    *   (optional) An array of field settings.
    */
-  protected function createTestField($field_settings = array()) {
-    FieldStorageConfig::create(array(
+  protected function createTestField($field_settings = []) {
+    FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'entity_test',
       'type' => $this->fieldType,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => $this->fieldName,
@@ -135,7 +135,7 @@ abstract class FieldRdfaTestBase extends FieldKernelTestBase {
    *   The absolute URI.
    */
   protected function getAbsoluteUri($entity) {
-    return $entity->url('canonical', array('absolute' => TRUE));
+    return $entity->url('canonical', ['absolute' => TRUE]);
   }
 
   /**
@@ -172,14 +172,14 @@ abstract class FieldRdfaTestBase extends FieldKernelTestBase {
    *   format and return values see the SimpleXML documentation,
    *   http://php.net/manual/function.simplexml-element-xpath.php.
    */
-  protected function xpathContent($content, $xpath, array $arguments = array()) {
+  protected function xpathContent($content, $xpath, array $arguments = []) {
     if ($elements = $this->parseContent($content)) {
       $xpath = $this->buildXPathQuery($xpath, $arguments);
       $result = $elements->xpath($xpath);
       // Some combinations of PHP / libxml versions return an empty array
       // instead of the documented FALSE. Forcefully convert any falsish values
       // to an empty array to allow foreach(...) constructions.
-      return $result ? $result : array();
+      return $result ? $result : [];
     }
     else {
       return FALSE;
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php
index d4e1cf0fb..30735e3a8 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php
@@ -19,7 +19,7 @@ class LinkFieldRdfaTest extends FieldRdfaTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('link', 'text');
+  public static $modules = ['link', 'text'];
 
   /**
    * {@inheritdoc}
@@ -31,9 +31,9 @@ class LinkFieldRdfaTest extends FieldRdfaTestBase {
 
     // Add the mapping.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:link'),
-    ))->save();
+    $mapping->setFieldMapping($this->fieldName, [
+      'properties' => ['schema:link'],
+    ])->save();
 
   }
 
@@ -43,14 +43,14 @@ class LinkFieldRdfaTest extends FieldRdfaTestBase {
   public function testAllFormattersExternal() {
     // Set up test values.
     $this->testValue = 'http://test.me/foo/bar/neque/porro/quisquam/est/qui-dolorem?foo/bar/neque/porro/quisquam/est/qui-dolorem';
-    $this->entity = EntityTest::create(array());
+    $this->entity = EntityTest::create([]);
     $this->entity->{$this->fieldName}->uri = $this->testValue;
 
     // Set up the expected result.
-    $expected_rdf = array(
+    $expected_rdf = [
       'value' => $this->testValue,
       'type' => 'uri',
-    );
+    ];
 
     $this->runTestAllFormatters($expected_rdf, 'external');
   }
@@ -61,15 +61,15 @@ class LinkFieldRdfaTest extends FieldRdfaTestBase {
   public function testAllFormattersInternal() {
     // Set up test values.
     $this->testValue = 'admin';
-    $this->entity = EntityTest::create(array());
+    $this->entity = EntityTest::create([]);
     $this->entity->{$this->fieldName}->uri = 'internal:/admin';
 
     // Set up the expected result.
     // AssertFormatterRdfa looks for a full path.
-    $expected_rdf = array(
+    $expected_rdf = [
       'value' => $this->uri . '/' . $this->testValue,
       'type' => 'uri',
-    );
+    ];
 
     $this->runTestAllFormatters($expected_rdf, 'internal');
   }
@@ -80,14 +80,14 @@ class LinkFieldRdfaTest extends FieldRdfaTestBase {
   public function testAllFormattersFront() {
     // Set up test values.
     $this->testValue = '/';
-    $this->entity = EntityTest::create(array());
+    $this->entity = EntityTest::create([]);
     $this->entity->{$this->fieldName}->uri = 'internal:/';
 
     // Set up the expected result.
-    $expected_rdf = array(
+    $expected_rdf = [
       'value' => $this->uri . '/',
       'type' => 'uri',
-    );
+    ];
 
     $this->runTestAllFormatters($expected_rdf, 'front');
   }
@@ -98,86 +98,86 @@ class LinkFieldRdfaTest extends FieldRdfaTestBase {
   public function runTestAllFormatters($expected_rdf, $type = NULL) {
 
     // Test the link formatter: trim at 80, no other settings.
-    $formatter = array(
+    $formatter = [
       'type' => 'link',
-      'settings' => array(
+      'settings' => [
         'trim_length' => 80,
         'url_only' => FALSE,
         'url_plain' => FALSE,
         'rel' => '',
         'target' => '',
-      ),
-    );
+      ],
+    ];
     $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
 
     // Test the link formatter: trim at 40, nofollow, new window.
-    $formatter = array(
+    $formatter = [
       'type' => 'link',
-      'settings' => array(
+      'settings' => [
         'trim_length' => 40,
         'url_only' => FALSE,
         'url_plain' => FALSE,
         'rel' => 'nofollow',
         'target' => '_blank',
-      ),
-    );
+      ],
+    ];
     $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
 
     // Test the link formatter: trim at 40, URL only (not plaintext) nofollow,
     // new window.
-    $formatter = array(
+    $formatter = [
       'type' => 'link',
-      'settings' => array(
+      'settings' => [
         'trim_length' => 40,
         'url_only' => TRUE,
         'url_plain' => FALSE,
         'rel' => 'nofollow',
         'target' => '_blank',
-      ),
-    );
+      ],
+    ];
     $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
 
     // Test the link_separate formatter: trim at 40, nofollow, new window.
-    $formatter = array(
+    $formatter = [
       'type' => 'link_separate',
-      'settings' => array(
+      'settings' => [
         'trim_length' => 40,
         'rel' => 'nofollow',
         'target' => '_blank',
-      ),
-    );
+      ],
+    ];
     $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
 
     // Change the expected value here to literal. When formatted as plaintext
     // then the RDF is expecting a 'literal' not a 'uri'.
-    $expected_rdf = array(
+    $expected_rdf = [
       'value' => $this->testValue,
       'type' => 'literal',
-    );
+    ];
     // Test the link formatter: trim at 20, url only (as plaintext.)
-    $formatter = array(
+    $formatter = [
       'type' => 'link',
-      'settings' => array(
+      'settings' => [
         'trim_length' => 20,
         'url_only' => TRUE,
         'url_plain' => TRUE,
         'rel' => '0',
         'target' => '0',
-      ),
-    );
+      ],
+    ];
     $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
 
     // Test the link formatter: do not trim, url only (as plaintext.)
-    $formatter = array(
+    $formatter = [
       'type' => 'link',
-      'settings' => array(
+      'settings' => [
         'trim_length' => 0,
         'url_only' => TRUE,
         'url_plain' => TRUE,
         'rel' => '0',
         'target' => '0',
-      ),
-    );
+      ],
+    ];
     $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
   }
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php
index 514ca9d6b..5c7d38569 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php
@@ -19,7 +19,7 @@ class NumberFieldRdfaTest extends FieldRdfaTestBase {
     $testValue = 3;
     $this->createTestField();
     $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa(array('type' => 'number_integer'), 'http://schema.org/baseSalary', array('value' => $testValue));
+    $this->assertFormatterRdfa(['type' => 'number_integer'], 'http://schema.org/baseSalary', ['value' => $testValue]);
 
     // Test that the content attribute is not created.
     $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
@@ -31,26 +31,26 @@ class NumberFieldRdfaTest extends FieldRdfaTestBase {
    */
   public function testIntegerFormatterWithSettings() {
     \Drupal::service('theme_handler')->install(['classy']);
-    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->config('system.theme')->set('default', 'classy')->save();
     $this->fieldType = 'integer';
-    $formatter = array(
+    $formatter = [
       'type' => 'number_integer',
-      'settings' => array(
+      'settings' => [
         'thousand_separator' => '.',
         'prefix_suffix' => TRUE,
-      ),
-    );
+      ],
+    ];
     $testValue = 3333333.33;
-    $field_settings = array(
+    $field_settings = [
       'prefix' => '#',
       'suffix' => ' llamas.',
-    );
+    ];
     $this->createTestField($field_settings);
     $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', ['value' => $testValue]);
 
     // Test that the content attribute is created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', [':testValue' => $testValue]);
     $this->assertTrue($result);
   }
 
@@ -62,7 +62,7 @@ class NumberFieldRdfaTest extends FieldRdfaTestBase {
     $testValue = 3.33;
     $this->createTestField();
     $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa(array('type' => 'number_unformatted'), 'http://schema.org/baseSalary', array('value' => $testValue));
+    $this->assertFormatterRdfa(['type' => 'number_unformatted'], 'http://schema.org/baseSalary', ['value' => $testValue]);
 
     // Test that the content attribute is not created.
     $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
@@ -74,27 +74,27 @@ class NumberFieldRdfaTest extends FieldRdfaTestBase {
    */
   public function testFloatFormatterWithSettings() {
     \Drupal::service('theme_handler')->install(['classy']);
-    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->config('system.theme')->set('default', 'classy')->save();
     $this->fieldType = 'float';
-    $formatter = array(
+    $formatter = [
       'type' => 'number_decimal',
-      'settings' => array(
+      'settings' => [
         'thousand_separator' => '.',
         'decimal_separator' => ',',
         'prefix_suffix' => TRUE,
-      ),
-    );
+      ],
+    ];
     $testValue = 3333333.33;
-    $field_settings = array(
+    $field_settings = [
       'prefix' => '$',
       'suffix' => ' more.',
-    );
+    ];
     $this->createTestField($field_settings);
     $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', ['value' => $testValue]);
 
     // Test that the content attribute is created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', [':testValue' => $testValue]);
     $this->assertTrue($result);
   }
 
@@ -103,16 +103,16 @@ class NumberFieldRdfaTest extends FieldRdfaTestBase {
    */
   public function testFloatFormatterWithScale() {
     $this->fieldType = 'float';
-    $formatter = array(
+    $formatter = [
       'type' => 'number_decimal',
-      'settings' => array(
+      'settings' => [
         'scale' => 5,
-      ),
-    );
+      ],
+    ];
     $testValue = 3.33;
     $this->createTestField();
     $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', ['value' => $testValue]);
 
     // Test that the content attribute is not created.
     $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
@@ -124,21 +124,21 @@ class NumberFieldRdfaTest extends FieldRdfaTestBase {
    */
   public function testFloatFormatterWithScaleExercised() {
     \Drupal::service('theme_handler')->install(['classy']);
-    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->config('system.theme')->set('default', 'classy')->save();
     $this->fieldType = 'float';
-    $formatter = array(
+    $formatter = [
       'type' => 'number_decimal',
-      'settings' => array(
+      'settings' => [
         'scale' => 5,
-      ),
-    );
+      ],
+    ];
     $testValue = 3.1234567;
     $this->createTestField();
     $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', ['value' => $testValue]);
 
     // Test that the content attribute is created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', [':testValue' => $testValue]);
     $this->assertTrue($result);
   }
 
@@ -150,7 +150,7 @@ class NumberFieldRdfaTest extends FieldRdfaTestBase {
     $testValue = 3.33;
     $this->createTestField();
     $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa(array('type' => 'number_decimal'), 'http://schema.org/baseSalary', array('value' => $testValue));
+    $this->assertFormatterRdfa(['type' => 'number_decimal'], 'http://schema.org/baseSalary', ['value' => $testValue]);
 
     // Test that the content attribute is not created.
     $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
@@ -162,27 +162,27 @@ class NumberFieldRdfaTest extends FieldRdfaTestBase {
    */
   public function testDecimalFormatterWithSettings() {
     \Drupal::service('theme_handler')->install(['classy']);
-    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->config('system.theme')->set('default', 'classy')->save();
     $this->fieldType = 'decimal';
-    $formatter = array(
+    $formatter = [
       'type' => 'number_decimal',
-      'settings' => array(
+      'settings' => [
         'thousand_separator' => 't',
         'decimal_separator' => '#',
         'prefix_suffix' => TRUE,
-      ),
-    );
+      ],
+    ];
     $testValue = 3333333.33;
-    $field_settings = array(
+    $field_settings = [
       'prefix' => '$',
       'suffix' => ' more.',
-    );
+    ];
     $this->createTestField($field_settings);
     $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', ['value' => $testValue]);
 
     // Test that the content attribute is created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', [':testValue' => $testValue]);
     $this->assertTrue($result);
   }
 
@@ -192,12 +192,12 @@ class NumberFieldRdfaTest extends FieldRdfaTestBase {
   protected function createTestEntity($testValue) {
     // Add the mapping.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:baseSalary'),
-    ))->save();
+    $mapping->setFieldMapping($this->fieldName, [
+      'properties' => ['schema:baseSalary'],
+    ])->save();
 
     // Set up test entity.
-    $this->entity = EntityTest::create(array());
+    $this->entity = EntityTest::create([]);
     $this->entity->{$this->fieldName}->value = $testValue;
   }
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php
index a0b28e94d..738e40c03 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php
@@ -37,9 +37,9 @@ class StringFieldRdfaTest extends FieldRdfaTestBase {
 
     // Add the mapping.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:text'),
-    ))->save();
+    $mapping->setFieldMapping($this->fieldName, [
+      'properties' => ['schema:text'],
+    ])->save();
 
     // Set up test entity.
     $this->entity = EntityTest::create();
@@ -52,7 +52,7 @@ class StringFieldRdfaTest extends FieldRdfaTestBase {
    */
   public function testStringFormatters() {
     // Tests the string formatter.
-    $this->assertFormatterRdfa(array('type' => 'string'), 'http://schema.org/text', array('value' => $this->testValue));
+    $this->assertFormatterRdfa(['type' => 'string'], 'http://schema.org/text', ['value' => $this->testValue]);
   }
 
 }
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php
index 974125608..d705b2106 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php
@@ -26,7 +26,7 @@ class TelephoneFieldRdfaTest extends FieldRdfaTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('telephone', 'text');
+  public static $modules = ['telephone', 'text'];
 
   protected function setUp() {
     parent::setUp();
@@ -35,13 +35,13 @@ class TelephoneFieldRdfaTest extends FieldRdfaTestBase {
 
     // Add the mapping.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:telephone'),
-    ))->save();
+    $mapping->setFieldMapping($this->fieldName, [
+      'properties' => ['schema:telephone'],
+    ])->save();
 
     // Set up test values.
     $this->testValue = '555-555-5555';
-    $this->entity = EntityTest::create(array());
+    $this->entity = EntityTest::create([]);
     $this->entity->{$this->fieldName}->value = $this->testValue;
   }
 
@@ -50,18 +50,18 @@ class TelephoneFieldRdfaTest extends FieldRdfaTestBase {
    */
   public function testAllFormatters() {
     // Tests the plain formatter.
-    $this->assertFormatterRdfa(array('type' => 'string'), 'http://schema.org/telephone', array('value' => $this->testValue));
+    $this->assertFormatterRdfa(['type' => 'string'], 'http://schema.org/telephone', ['value' => $this->testValue]);
     // Tests the telephone link formatter.
-    $this->assertFormatterRdfa(array('type' => 'telephone_link'), 'http://schema.org/telephone', array('value' => 'tel:' . $this->testValue, 'type' => 'uri'));
+    $this->assertFormatterRdfa(['type' => 'telephone_link'], 'http://schema.org/telephone', ['value' => 'tel:' . $this->testValue, 'type' => 'uri']);
 
-    $formatter = array(
+    $formatter = [
       'type' => 'telephone_link',
-      'settings' => array('title' => 'Contact us'),
-    );
-    $expected_rdf_value = array(
+      'settings' => ['title' => 'Contact us'],
+    ];
+    $expected_rdf_value = [
       'value' => 'tel:' . $this->testValue,
       'type' => 'uri',
-    );
+    ];
     // Tests the telephone link formatter with custom title.
     $this->assertFormatterRdfa($formatter, 'http://schema.org/telephone', $expected_rdf_value);
   }
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php
index cce349957..48bc5b8f6 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php
@@ -33,20 +33,20 @@ class TextFieldRdfaTest extends FieldRdfaTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('text', 'filter');
+  public static $modules = ['text', 'filter'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->installConfig(array('filter'));
+    $this->installConfig(['filter']);
 
     $this->createTestField();
 
     // Add the mapping.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:text'),
-    ))->save();
+    $mapping->setFieldMapping($this->fieldName, [
+      'properties' => ['schema:text'],
+    ])->save();
 
     // Set up test entity.
     $this->entity = EntityTest::create();
@@ -63,11 +63,11 @@ class TextFieldRdfaTest extends FieldRdfaTestBase {
     $formatted_value = strip_tags($this->entity->{$this->fieldName}->processed);
 
     // Tests the default formatter.
-    $this->assertFormatterRdfa(array('type' => 'text_default'), 'http://schema.org/text', array('value' => $formatted_value));
+    $this->assertFormatterRdfa(['type' => 'text_default'], 'http://schema.org/text', ['value' => $formatted_value]);
     // Tests the summary formatter.
-    $this->assertFormatterRdfa(array('type' => 'text_summary_or_trimmed'), 'http://schema.org/text', array('value' => $formatted_value));
+    $this->assertFormatterRdfa(['type' => 'text_summary_or_trimmed'], 'http://schema.org/text', ['value' => $formatted_value]);
     // Tests the trimmed formatter.
-    $this->assertFormatterRdfa(array('type' => 'text_trimmed'), 'http://schema.org/text', array('value' => $formatted_value));
+    $this->assertFormatterRdfa(['type' => 'text_trimmed'], 'http://schema.org/text', ['value' => $formatted_value]);
   }
 
 }
diff --git a/web/core/modules/rdf/tests/src/Kernel/RdfaAttributesTest.php b/web/core/modules/rdf/tests/src/Kernel/RdfaAttributesTest.php
index 42a4dc448..39f483122 100644
--- a/web/core/modules/rdf/tests/src/Kernel/RdfaAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/RdfaAttributesTest.php
@@ -16,16 +16,16 @@ class RdfaAttributesTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('rdf');
+  public static $modules = ['rdf'];
 
   /**
    * Test attribute creation for mappings which use 'property'.
    */
-  function testProperty() {
-    $properties = array('dc:title');
+  public function testProperty() {
+    $properties = ['dc:title'];
 
-    $mapping = array('properties' => $properties);
-    $expected_attributes = array('property' => $properties);
+    $mapping = ['properties' => $properties];
+    $expected_attributes = ['property' => $properties];
 
     $this->_testAttributes($expected_attributes, $mapping);
   }
@@ -33,18 +33,18 @@ class RdfaAttributesTest extends KernelTestBase {
   /**
    * Test attribute creation for mappings which use 'datatype'.
    */
-  function testDatatype() {
-    $properties = array('foo:bar1');
+  public function testDatatype() {
+    $properties = ['foo:bar1'];
     $datatype = 'foo:bar1type';
 
-    $mapping = array(
+    $mapping = [
       'datatype' => $datatype,
       'properties' => $properties,
-    );
-    $expected_attributes = array(
+    ];
+    $expected_attributes = [
       'datatype' => $datatype,
       'property' => $properties,
-    );
+    ];
 
     $this->_testAttributes($expected_attributes, $mapping);
   }
@@ -52,23 +52,23 @@ class RdfaAttributesTest extends KernelTestBase {
   /**
    * Test attribute creation for mappings which override human-readable content.
    */
-  function testDatatypeCallback() {
-    $properties = array('dc:created');
+  public function testDatatypeCallback() {
+    $properties = ['dc:created'];
     $datatype = 'xsd:dateTime';
 
     $date = 1252750327;
     $iso_date = date('c', $date);
 
-    $mapping = array(
+    $mapping = [
       'datatype' => $datatype,
       'properties' => $properties,
-      'datatype_callback' => array('callable' => 'date_iso8601'),
-    );
-    $expected_attributes = array(
+      'datatype_callback' => ['callable' => 'date_iso8601'],
+    ];
+    $expected_attributes = [
       'datatype' => $datatype,
       'property' => $properties,
       'content' => $iso_date,
-    );
+    ];
 
     $this->_testAttributes($expected_attributes, $mapping, $date);
   }
@@ -77,23 +77,23 @@ class RdfaAttributesTest extends KernelTestBase {
   /**
    * Test attribute creation for mappings which use data converters.
    */
-  function testDatatypeCallbackWithConverter() {
-    $properties = array('schema:interactionCount');
+  public function testDatatypeCallbackWithConverter() {
+    $properties = ['schema:interactionCount'];
 
     $data = "23";
     $content = "UserComments:23";
 
-    $mapping = array(
+    $mapping = [
       'properties' => $properties,
-      'datatype_callback' => array(
+      'datatype_callback' => [
         'callable' => 'Drupal\rdf\SchemaOrgDataConverter::interactionCount',
-        'arguments' => array('interaction_type' => 'UserComments'),
-      ),
-    );
-    $expected_attributes = array(
+        'arguments' => ['interaction_type' => 'UserComments'],
+      ],
+    ];
+    $expected_attributes = [
       'property' => $properties,
       'content' => $content,
-    );
+    ];
 
     $this->_testAttributes($expected_attributes, $mapping, $data);
   }
@@ -101,14 +101,14 @@ class RdfaAttributesTest extends KernelTestBase {
   /**
    * Test attribute creation for mappings which use 'rel'.
    */
-  function testRel() {
-    $properties = array('sioc:has_creator', 'dc:creator');
+  public function testRel() {
+    $properties = ['sioc:has_creator', 'dc:creator'];
 
-    $mapping = array(
+    $mapping = [
       'properties' => $properties,
       'mapping_type' => 'rel',
-    );
-    $expected_attributes = array('rel' => $properties);
+    ];
+    $expected_attributes = ['rel' => $properties];
 
     $this->_testAttributes($expected_attributes, $mapping);
   }
diff --git a/web/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php b/web/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
index 5b66d42f5..5908ee726 100644
--- a/web/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
+++ b/web/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
@@ -72,7 +72,7 @@ class RdfMappingConfigEntityUnitTest extends UnitTestCase {
     $target_entity_type->expects($this->any())
       ->method('getProvider')
       ->will($this->returnValue('test_module'));
-    $values = array('targetEntityType' => $target_entity_type_id);
+    $values = ['targetEntityType' => $target_entity_type_id];
     $target_entity_type->expects($this->any())
       ->method('getBundleEntityType')
       ->will($this->returnValue(NULL));
@@ -99,23 +99,23 @@ class RdfMappingConfigEntityUnitTest extends UnitTestCase {
     $target_entity_type_id = $this->randomMachineName(16);
     $target_entity_type = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
     $target_entity_type->expects($this->any())
-                     ->method('getProvider')
-                     ->will($this->returnValue('test_module'));
+      ->method('getProvider')
+      ->will($this->returnValue('test_module'));
     $bundle_id = $this->randomMachineName(10);
-    $values = array('targetEntityType' => $target_entity_type_id , 'bundle' => $bundle_id);
+    $values = ['targetEntityType' => $target_entity_type_id , 'bundle' => $bundle_id];
 
     $target_entity_type->expects($this->any())
       ->method('getBundleConfigDependency')
-      ->will($this->returnValue(array('type' => 'config', 'name' => 'test_module.type.' . $bundle_id)));
+      ->will($this->returnValue(['type' => 'config', 'name' => 'test_module.type.' . $bundle_id]));
 
     $this->entityManager->expects($this->at(0))
-                        ->method('getDefinition')
-                        ->with($target_entity_type_id)
-                        ->will($this->returnValue($target_entity_type));
+      ->method('getDefinition')
+      ->with($target_entity_type_id)
+      ->will($this->returnValue($target_entity_type));
     $this->entityManager->expects($this->at(1))
-                        ->method('getDefinition')
-                        ->with($this->entityTypeId)
-                        ->will($this->returnValue($this->entityType));
+      ->method('getDefinition')
+      ->with($this->entityTypeId)
+      ->will($this->returnValue($this->entityType));
 
     $entity = new RdfMapping($values, $this->entityTypeId);
     $dependencies = $entity->calculateDependencies()->getDependencies();
diff --git a/web/core/modules/responsive_image/responsive_image.module b/web/core/modules/responsive_image/responsive_image.module
index e88dac08f..4388e8963 100644
--- a/web/core/modules/responsive_image/responsive_image.module
+++ b/web/core/modules/responsive_image/responsive_image.module
@@ -16,8 +16,20 @@ use Drupal\breakpoint\BreakpointInterface;
 
 /**
  * The machine name for the empty image breakpoint image style option.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ *   Drupal\responsive_image\ResponsiveImageStyleInterface::EMPTY_IMAGE
+ *   instead.
  */
 const RESPONSIVE_IMAGE_EMPTY_IMAGE = '_empty image_';
+
+/**
+ * The machine name for the original image breakpoint image style option.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ *   \Drupal\responsive_image\ResponsiveImageStyleInterface::ORIGINAL_IMAGE
+ *   instead.
+ */
 const RESPONSIVE_IMAGE_ORIGINAL_IMAGE = '_original image_';
 
 /**
@@ -28,25 +40,25 @@ function responsive_image_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.responsive_image':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Responsive Image module provides an image formatter that allows browsers to select which image file to display based on media queries or which image file types the browser supports, using the HTML 5 picture and source elements and/or the sizes, srcset and type attributes. For more information, see the <a href=":responsive_image">online documentation for the Responsive Image module</a>.', array( ':responsive_image' => 'https://www.drupal.org/documentation/modules/responsive_image')) . '</p>';
+      $output .= '<p>' . t('The Responsive Image module provides an image formatter that allows browsers to select which image file to display based on media queries or which image file types the browser supports, using the HTML 5 picture and source elements and/or the sizes, srcset and type attributes. For more information, see the <a href=":responsive_image">online documentation for the Responsive Image module</a>.', [ ':responsive_image' => 'https://www.drupal.org/documentation/modules/responsive_image']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Defining responsive image styles') . '</dt>';
-      $output .= '<dd>' . t('By creating responsive image styles you define which options the browser has in selecting which image file to display. In most cases this means providing different image sizes based on the viewport size. On the <a href=":responsive_image_style">Responsive image styles</a> page, click <em>Add responsive image style</em> to create a new style. First choose a label, a fallback image style and a breakpoint group and click Save.', array(':responsive_image_style' => \Drupal::url('entity.responsive_image_style.collection'))) . '</dd>';
+      $output .= '<dd>' . t('By creating responsive image styles you define which options the browser has in selecting which image file to display. In most cases this means providing different image sizes based on the viewport size. On the <a href=":responsive_image_style">Responsive image styles</a> page, click <em>Add responsive image style</em> to create a new style. First choose a label, a fallback image style and a breakpoint group and click Save.', [':responsive_image_style' => \Drupal::url('entity.responsive_image_style.collection')]) . '</dd>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Fallback image style') . '</dt>';
       $output .= '<dd>' . t('The fallback image style is typically the smallest size image you expect to appear in this space. Because the responsive images module uses the Picturefill library so that responsive images can work in older browsers, the fallback image should only appear on a site if an error occurs.') . '</dd>';
       $output .= '<dt>' . t('Breakpoint groups: viewport sizing vs art direction') . '</dt>';
-      $output .= '<dd>' . t('The breakpoint group typically only needs a single breakpoint with an empty media query in order to do <em>viewport sizing.</em> Multiple breakpoints are used for changing the crop or aspect ratio of images at different viewport sizes, which is often referred to as <em>art direction.</em> Once you select a breakpoint group, you can choose which breakpoints to use for the responsive image style. By default, the option <em>do not use this breakpoint</em> is selected for each breakpoint. See the <a href=":breakpoint_help">help page of the Breakpoint module</a> for more information.', array(':breakpoint_help' => \Drupal::url('help.page', array('name' => 'breakpoint')))) . '</dd>';
+      $output .= '<dd>' . t('The breakpoint group typically only needs a single breakpoint with an empty media query in order to do <em>viewport sizing.</em> Multiple breakpoints are used for changing the crop or aspect ratio of images at different viewport sizes, which is often referred to as <em>art direction.</em> Once you select a breakpoint group, you can choose which breakpoints to use for the responsive image style. By default, the option <em>do not use this breakpoint</em> is selected for each breakpoint. See the <a href=":breakpoint_help">help page of the Breakpoint module</a> for more information.', [':breakpoint_help' => \Drupal::url('help.page', ['name' => 'breakpoint'])]) . '</dd>';
       $output .= '<dt>' . t('Breakpoint settings: sizes vs image styles') . '</dt>';
       $output .= '<dd>' . t('While you have the option to provide only one image style per breakpoint, the sizes option allows you to provide more options to browsers as to which image file it can display, even when using multiple breakpoints for art direction. Breakpoints are defined in the configuration files of the theme.') . '</dd>';
       $output .= '<dt>' . t('Sizes field') . '</dt>';
       $output .= '<dd>' . t('Once the sizes option is selected, you can let the browser know the size of this image in relation to the site layout, using the <em>Sizes</em> field. For a hero image that always fills the entire screen, you could simply enter 100vw, which means 100% of the viewport width. For an image that fills 90% of the screen for small viewports, but only fills 40% of the screen when the viewport is larger than 40em (typically 640px), you could enter "(min-width: 40em) 40vw, 90vw" in the Sizes field. The last item in the comma-separated list is the smallest viewport size: other items in the comma-separated list should have a media condition paired with an image width. <em>Media conditions</em> are similar to a media query, often a min-width paired with a viewport width using em or px units: e.g. (min-width: 640px) or (min-width: 40em). This is paired with the <em>image width</em> at that viewport size using px, em or vw units. The vw unit is viewport width and is used instead of a percentage because the percentage always refers to the width of the entire viewport.') . '</dd>';
       $output .= '<dt>' . t('Image styles for sizes') . '</dt>';
-      $output .= '<dd>' . t('Below the Sizes field you can choose multiple image styles so the browser can choose the best image file size to fill the space defined in the Sizes field. Typically you will want to use image styles that resize your image to have options that range from the smallest px width possible for the space the image will appear in to the largest px width possible, with a variety of widths in between. You may want to provide image styles with widths that are 1.5x to 2x the space available in the layout to account for high resolution screens. Image styles can be defined on the <a href=":image_styles">Image styles page</a> that is provided by the <a href=":image_help">Image module</a>.', array(':image_styles' => \Drupal::url('entity.image_style.collection'), ':image_help' => \Drupal::url('help.page', array('name' => 'image')))) . '</dd>';
+      $output .= '<dd>' . t('Below the Sizes field you can choose multiple image styles so the browser can choose the best image file size to fill the space defined in the Sizes field. Typically you will want to use image styles that resize your image to have options that range from the smallest px width possible for the space the image will appear in to the largest px width possible, with a variety of widths in between. You may want to provide image styles with widths that are 1.5x to 2x the space available in the layout to account for high resolution screens. Image styles can be defined on the <a href=":image_styles">Image styles page</a> that is provided by the <a href=":image_help">Image module</a>.', [':image_styles' => \Drupal::url('entity.image_style.collection'), ':image_help' => \Drupal::url('help.page', ['name' => 'image'])]) . '</dd>';
       $output .= '</dl></dd>';
       $output .= '<dt>' . t('Using responsive image styles in Image fields') . '</dt>';
-      $output .= '<dd>' . t('After defining responsive image styles, you can use them in the display settings for your Image fields, so that the site displays responsive images using the HTML5 picture tag. Open the Manage display page for the entity type (content type, taxonomy vocabulary, etc.) that the Image field is attached to. Choose the format <em>Responsive image</em>, click the Edit icon, and select one of the responsive image styles that you have created. For general information on how to manage fields and their display see the <a href=":field_ui">Field UI module help page</a>. For background information about entities and fields see the <a href=":field_help">Field module help page</a>.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':field_help' => \Drupal::url('help.page', array('name' => 'field')))) . '</dd>';
+      $output .= '<dd>' . t('After defining responsive image styles, you can use them in the display settings for your Image fields, so that the site displays responsive images using the HTML5 picture tag. Open the Manage display page for the entity type (content type, taxonomy vocabulary, etc.) that the Image field is attached to. Choose the format <em>Responsive image</em>, click the Edit icon, and select one of the responsive image styles that you have created. For general information on how to manage fields and their display see the <a href=":field_ui">Field UI module help page</a>. For background information about entities and fields see the <a href=":field_help">Field module help page</a>.', [':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#', ':field_help' => \Drupal::url('help.page', ['name' => 'field'])]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -59,25 +71,25 @@ function responsive_image_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function responsive_image_theme() {
-  return array(
-    'responsive_image' => array(
-      'variables' => array(
+  return [
+    'responsive_image' => [
+      'variables' => [
         'uri' => NULL,
-        'attributes' => array(),
-        'responsive_image_style_id' => array(),
+        'attributes' => [],
+        'responsive_image_style_id' => [],
         'height' => NULL,
         'width' => NULL,
-      ),
-    ),
-    'responsive_image_formatter' => array(
-      'variables' => array(
+      ],
+    ],
+    'responsive_image_formatter' => [
+      'variables' => [
         'item' => NULL,
         'item_attributes' => NULL,
         'url' => NULL,
         'responsive_image_style_id' => NULL,
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 }
 
 /**
@@ -98,18 +110,18 @@ function template_preprocess_responsive_image_formatter(&$variables) {
   // provided in the responsive image formatter.
   $responsive_image_style = ResponsiveImageStyle::load($variables['responsive_image_style_id']);
   if ($responsive_image_style) {
-    $variables['responsive_image'] = array(
+    $variables['responsive_image'] = [
       '#type' => 'responsive_image',
       '#responsive_image_style_id' => $variables['responsive_image_style_id'],
-    );
+    ];
   }
   else {
-    $variables['responsive_image'] = array(
+    $variables['responsive_image'] = [
       '#theme' => 'image',
-    );
+    ];
   }
   $item = $variables['item'];
-  $attributes = array();
+  $attributes = [];
   // Do not output an empty 'title' attribute.
   if (Unicode::strlen($item->title) != 0) {
     $attributes['title'] = $item->title;
@@ -126,7 +138,7 @@ function template_preprocess_responsive_image_formatter(&$variables) {
     $variables['responsive_image']['#uri'] = $item->uri;
   }
 
-  foreach (array('width', 'height') as $key) {
+  foreach (['width', 'height'] as $key) {
     $variables['responsive_image']["#$key"] = $item->$key;
   }
   $variables['responsive_image']['#attributes'] = $attributes;
@@ -189,25 +201,21 @@ function template_preprocess_responsive_image(&$variables) {
         $variables['attributes'][$attribute] = $value;
       }
     }
-    $variables['img_element'] = array(
+    $variables['img_element'] = [
       '#theme' => 'image',
       '#uri' => _responsive_image_image_style_url($responsive_image_style->getFallbackImageStyle(), $variables['uri']),
-    );
+    ];
   }
   else {
     $variables['output_image_tag'] = FALSE;
-    // Prepare the fallback image. Use srcset in the fallback image to avoid
-    // unnecessary preloading of images in older browsers. See
-    // http://scottjehl.github.io/picturefill/#using-picture and
-    // http://scottjehl.github.io/picturefill/#gotchas for more information.
-    $variables['img_element'] = array(
+    // Prepare the fallback image. We use the src attribute, which might cause
+    // double downloads in browsers that don't support the picture tag (might,
+    // because when picturefill kicks in, it cancels the download and triggers
+    // the download for the correct image).
+    $variables['img_element'] = [
       '#theme' => 'image',
-      '#srcset' => array(
-        array(
-          'uri' => _responsive_image_image_style_url($responsive_image_style->getFallbackImageStyle(), $variables['uri']),
-        ),
-      ),
-    );
+      '#uri' => _responsive_image_image_style_url($responsive_image_style->getFallbackImageStyle(), $variables['uri']),
+    ];
   }
 
   if (isset($variables['attributes'])) {
@@ -290,7 +298,7 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $
  * <picture>
  *   <source media="(min-width: 0px)" srcset="sites/default/files/styles/thumbnail/image.jpeg" />
  *   <source media="(min-width: 560px)" sizes="(min-width: 700px) 700px, 100vw" srcset="sites/default/files/styles/large/image.jpeg 480w, sites/default/files/styles/medium/image.jpeg 220w" />
- *   <img srcset="fallback.jpeg" />
+ *   <img src="fallback.jpeg" />
  * </picture>
  * @endcode
  *
@@ -319,7 +327,7 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $
  * <picture>
  *   <source [...] mime-type="image/webp" srcset="image1.webp 1x, image2.webp 2x, image3.webp 3x"/>
  *   <source [...] mime-type="image/jpeg" srcset="image1.jpeg 1x, image2.jpeg 2x, image3.jpeg 3x"/>
- *   <img srcset="fallback.jpeg" />
+ *   <img src="fallback.jpeg" />
  * </picture>
  * @endcode
  * This way a browser can decide which <source> tag is preferred based on the
@@ -397,9 +405,9 @@ function _responsive_image_build_source_attributes(array $variables, BreakpointI
     $height = $variables['height'];
   }
   $extension = pathinfo($variables['uri'], PATHINFO_EXTENSION);
-  $sizes = array();
-  $srcset = array();
-  $derivative_mime_types = array();
+  $sizes = [];
+  $srcset = [];
+  $derivative_mime_types = [];
   foreach ($multipliers as $multiplier => $image_style_mapping) {
     switch ($image_style_mapping['image_mapping_type']) {
       // Create a <source> tag with the 'sizes' attribute.
@@ -407,7 +415,7 @@ function _responsive_image_build_source_attributes(array $variables, BreakpointI
         // Loop through the image styles for this breakpoint and multiplier.
         foreach ($image_style_mapping['image_mapping']['sizes_image_styles'] as $image_style_name) {
           // Get the dimensions.
-          $dimensions = responsive_image_get_image_dimensions($image_style_name, array('width' => $width, 'height' => $height), $variables['uri']);
+          $dimensions = responsive_image_get_image_dimensions($image_style_name, ['width' => $width, 'height' => $height], $variables['uri']);
           // Get MIME type.
           $derivative_mime_type = responsive_image_get_mime_type($image_style_name, $extension);
           $derivative_mime_types[] = $derivative_mime_type;
@@ -443,9 +451,9 @@ function _responsive_image_build_source_attributes(array $variables, BreakpointI
   }
   // Sort the srcset from small to large image width or multiplier.
   ksort($srcset);
-  $source_attributes = new Attribute(array(
+  $source_attributes = new Attribute([
     'srcset' => implode(', ', array_unique($srcset)),
-  ));
+  ]);
   $media_query = trim($breakpoint->getMediaQuery());
   if (!empty($media_query)) {
     $source_attributes->setAttribute('media', $media_query);
@@ -478,10 +486,10 @@ function _responsive_image_build_source_attributes(array $variables, BreakpointI
 function responsive_image_get_image_dimensions($image_style_name, array $dimensions, $uri) {
   // Determine the dimensions of the styled image.
   if ($image_style_name == RESPONSIVE_IMAGE_EMPTY_IMAGE) {
-    $dimensions = array(
+    $dimensions = [
       'width' => 1,
       'height' => 1,
-    );
+    ];
   }
   elseif ($entity = ImageStyle::load($image_style_name)) {
     $entity->transformDimensions($dimensions, $uri);
diff --git a/web/core/modules/responsive_image/responsive_image.post_update.php b/web/core/modules/responsive_image/responsive_image.post_update.php
index d6767f729..33fec7194 100644
--- a/web/core/modules/responsive_image/responsive_image.post_update.php
+++ b/web/core/modules/responsive_image/responsive_image.post_update.php
@@ -8,11 +8,6 @@
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 
-/**
- * @addtogroup updates-8.1.x
- * @{
- */
-
 /**
  * Make responsive image formatters dependent on responsive image styles.
  */
@@ -26,7 +21,3 @@ function responsive_image_post_update_recreate_dependencies() {
     }
   });
 }
-
-/**
- * @} End of "addtogroup updates-8.1.x".
- */
diff --git a/web/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php b/web/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
index fabfc60db..5ad9d9530 100644
--- a/web/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
+++ b/web/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
@@ -68,7 +68,7 @@ class ResponsiveImageStyle extends ConfigEntityBase implements ResponsiveImageSt
    *
    * @var array
    */
-  protected $image_style_mappings = array();
+  protected $image_style_mappings = [];
 
   /**
    * @var array
@@ -103,18 +103,18 @@ class ResponsiveImageStyle extends ConfigEntityBase implements ResponsiveImageSt
     // If there is an existing mapping, overwrite it.
     foreach ($this->image_style_mappings as &$mapping) {
       if ($mapping['breakpoint_id'] === $breakpoint_id && $mapping['multiplier'] === $multiplier) {
-        $mapping = array(
+        $mapping = [
           'breakpoint_id' => $breakpoint_id,
           'multiplier' => $multiplier,
-        ) + $image_style_mapping;
+        ] + $image_style_mapping;
         $this->keyedImageStyleMappings = NULL;
         return $this;
       }
     }
-    $this->image_style_mappings[] = array(
+    $this->image_style_mappings[] = [
       'breakpoint_id' => $breakpoint_id,
       'multiplier' => $multiplier,
-    ) + $image_style_mapping;
+    ] + $image_style_mapping;
     $this->keyedImageStyleMappings = NULL;
     return $this;
   }
@@ -132,7 +132,7 @@ class ResponsiveImageStyle extends ConfigEntityBase implements ResponsiveImageSt
    */
   public function getKeyedImageStyleMappings() {
     if (!$this->keyedImageStyleMappings) {
-      $this->keyedImageStyleMappings = array();
+      $this->keyedImageStyleMappings = [];
       foreach ($this->image_style_mappings as $mapping) {
         if (!static::isEmptyImageStyleMapping($mapping)) {
           $this->keyedImageStyleMappings[$mapping['breakpoint_id']][$mapping['multiplier']] = $mapping;
@@ -188,7 +188,7 @@ class ResponsiveImageStyle extends ConfigEntityBase implements ResponsiveImageSt
    * {@inheritdoc}
    */
   public function removeImageStyleMappings() {
-    $this->image_style_mappings = array();
+    $this->image_style_mappings = [];
     $this->keyedImageStyleMappings = NULL;
     return $this;
   }
diff --git a/web/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/web/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
index ff91e686c..6d9b7fa2f 100644
--- a/web/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
+++ b/web/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
@@ -23,6 +23,9 @@ use Drupal\Core\Utility\LinkGeneratorInterface;
  *   label = @Translation("Responsive image"),
  *   field_types = {
  *     "image",
+ *   },
+ *   quickedit = {
+ *     "editor" = "image"
  *   }
  * )
  */
@@ -112,17 +115,17 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'responsive_image_style' => '',
       'image_link' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $responsive_image_options = array();
+    $responsive_image_options = [];
     $responsive_image_styles = $this->responsiveImageStyleStorage->loadMultiple();
     if ($responsive_image_styles && !empty($responsive_image_styles)) {
       foreach ($responsive_image_styles as $machine_name => $responsive_image_style) {
@@ -132,29 +135,29 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
       }
     }
 
-    $elements['responsive_image_style'] = array(
+    $elements['responsive_image_style'] = [
       '#title' => t('Responsive image style'),
       '#type' => 'select',
       '#default_value' => $this->getSetting('responsive_image_style'),
       '#required' => TRUE,
       '#options' => $responsive_image_options,
-      '#description' => array(
+      '#description' => [
         '#markup' => $this->linkGenerator->generate($this->t('Configure Responsive Image Styles'), new Url('entity.responsive_image_style.collection')),
         '#access' => $this->currentUser->hasPermission('administer responsive image styles'),
-        ),
-    );
+        ],
+    ];
 
-    $link_types = array(
+    $link_types = [
       'content' => t('Content'),
       'file' => t('File'),
-    );
-    $elements['image_link'] = array(
+    ];
+    $elements['image_link'] = [
       '#title' => t('Link image to'),
       '#type' => 'select',
       '#default_value' => $this->getSetting('image_link'),
       '#empty_option' => t('Nothing'),
       '#options' => $link_types,
-    );
+    ];
 
     return $elements;
   }
@@ -163,16 +166,16 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $responsive_image_style = $this->responsiveImageStyleStorage->load($this->getSetting('responsive_image_style'));
     if ($responsive_image_style) {
-      $summary[] = t('Responsive image style: @responsive_image_style', array('@responsive_image_style' => $responsive_image_style->label()));
+      $summary[] = t('Responsive image style: @responsive_image_style', ['@responsive_image_style' => $responsive_image_style->label()]);
 
-      $link_types = array(
+      $link_types = [
         'content' => t('Linked to content'),
         'file' => t('Linked to file'),
-      );
+      ];
       // Display this setting only if image is linked.
       if (isset($link_types[$this->getSetting('image_link')])) {
         $summary[] = $link_types[$this->getSetting('image_link')];
@@ -189,7 +192,7 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
     $files = $this->getEntitiesToView($items, $langcode);
 
     // Early opt-out if the field is empty.
@@ -211,7 +214,7 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
 
     // Collect cache tags to be added for each item in the field.
     $responsive_image_style = $this->responsiveImageStyleStorage->load($this->getSetting('responsive_image_style'));
-    $image_styles_to_load = array();
+    $image_styles_to_load = [];
     $cache_tags = [];
     if ($responsive_image_style) {
       $cache_tags = Cache::mergeTags($cache_tags, $responsive_image_style->getCacheTags());
@@ -234,16 +237,16 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
       $item_attributes = $item->_attributes;
       unset($item->_attributes);
 
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#theme' => 'responsive_image_formatter',
         '#item' => $item,
         '#item_attributes' => $item_attributes,
         '#responsive_image_style_id' => $responsive_image_style ? $responsive_image_style->id() : '',
         '#url' => $url,
-        '#cache' => array(
+        '#cache' => [
           'tags' => $cache_tags,
-        ),
-      );
+        ],
+      ];
     }
     return $elements;
   }
diff --git a/web/core/modules/responsive_image/src/ResponsiveImageStyleForm.php b/web/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
index 3e5b051ad..8ad0e6a6c 100644
--- a/web/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
+++ b/web/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
@@ -51,32 +51,32 @@ class ResponsiveImageStyleForm extends EntityForm {
    */
   public function form(array $form, FormStateInterface $form_state) {
     if ($this->operation == 'duplicate') {
-      $form['#title'] = $this->t('<em>Duplicate responsive image style</em> @label', array('@label' => $this->entity->label()));
+      $form['#title'] = $this->t('<em>Duplicate responsive image style</em> @label', ['@label' => $this->entity->label()]);
       $this->entity = $this->entity->createDuplicate();
     }
     if ($this->operation == 'edit') {
-      $form['#title'] = $this->t('<em>Edit responsive image style</em> @label', array('@label' => $this->entity->label()));
+      $form['#title'] = $this->t('<em>Edit responsive image style</em> @label', ['@label' => $this->entity->label()]);
     }
 
     /** @var \Drupal\responsive_image\ResponsiveImageStyleInterface $responsive_image_style */
     $responsive_image_style = $this->entity;
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label'),
       '#maxlength' => 255,
       '#default_value' => $responsive_image_style->label(),
       '#description' => $this->t("Example: 'Hero image' or 'Author image'."),
       '#required' => TRUE,
-    );
-    $form['id'] = array(
+    ];
+    $form['id'] = [
       '#type' => 'machine_name',
       '#default_value' => $responsive_image_style->id(),
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => '\Drupal\responsive_image\Entity\ResponsiveImageStyle::load',
-        'source' => array('label'),
-      ),
+        'source' => ['label'],
+      ],
       '#disabled' => (bool) $responsive_image_style->id() && $this->operation != 'duplicate',
-    );
+    ];
 
     $image_styles = image_style_options(TRUE);
     $image_styles[RESPONSIVE_IMAGE_ORIGINAL_IMAGE] = $this->t('- None (original image) -');
@@ -89,25 +89,25 @@ class ResponsiveImageStyleForm extends EntityForm {
       $description = $this->t('Select a breakpoint group from the installed themes and modules.');
     }
 
-    $form['breakpoint_group'] = array(
+    $form['breakpoint_group'] = [
       '#type' => 'select',
       '#title' => $this->t('Breakpoint group'),
       '#default_value' => $responsive_image_style->getBreakpointGroup() ?: 'responsive_image',
       '#options' => $this->breakpointManager->getGroups(),
       '#required' => TRUE,
       '#description' => $description,
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => '::breakpointMappingFormAjax',
         'wrapper' => 'responsive-image-style-breakpoints-wrapper',
-      ),
-    );
+      ],
+    ];
 
-    $form['keyed_styles'] = array(
+    $form['keyed_styles'] = [
       '#type' => 'container',
-      '#attributes' => array(
+      '#attributes' => [
         'id' => 'responsive-image-style-breakpoints-wrapper',
-      ),
-    );
+      ],
+    ];
 
     // By default, breakpoints are ordered from smallest weight to largest:
     // the smallest weight is expected to have the smallest breakpoint width,
@@ -119,69 +119,69 @@ class ResponsiveImageStyleForm extends EntityForm {
     foreach ($breakpoints as $breakpoint_id => $breakpoint) {
       foreach ($breakpoint->getMultipliers() as $multiplier) {
         $label = $multiplier . ' ' . $breakpoint->getLabel() . ' [' . $breakpoint->getMediaQuery() . ']';
-        $form['keyed_styles'][$breakpoint_id][$multiplier] = array(
+        $form['keyed_styles'][$breakpoint_id][$multiplier] = [
           '#type' => 'details',
           '#title' => $label,
-        );
+        ];
         $image_style_mapping = $responsive_image_style->getImageStyleMapping($breakpoint_id, $multiplier);
         if (\Drupal::moduleHandler()->moduleExists('help')) {
-          $description = $this->t('See the <a href=":responsive_image_help">Responsive Image help page</a> for information on the sizes attribute.', array(':responsive_image_help' => \Drupal::url('help.page', array('name' => 'responsive_image'))));
+          $description = $this->t('See the <a href=":responsive_image_help">Responsive Image help page</a> for information on the sizes attribute.', [':responsive_image_help' => \Drupal::url('help.page', ['name' => 'responsive_image'])]);
         }
         else {
           $description = $this->t('Enable the Help module for more information on the sizes attribute.');
         }
-        $form['keyed_styles'][$breakpoint_id][$multiplier]['image_mapping_type'] = array(
+        $form['keyed_styles'][$breakpoint_id][$multiplier]['image_mapping_type'] = [
           '#title' => $this->t('Type'),
           '#type' => 'radios',
-          '#options' => array(
+          '#options' => [
             'sizes' => $this->t('Select multiple image styles and use the sizes attribute.'),
             'image_style' => $this->t('Select a single image style.'),
             '_none' => $this->t('Do not use this breakpoint.'),
-          ),
+          ],
           '#default_value' => isset($image_style_mapping['image_mapping_type']) ? $image_style_mapping['image_mapping_type'] : '_none',
           '#description' => $description,
-        );
-        $form['keyed_styles'][$breakpoint_id][$multiplier]['image_style'] = array(
+        ];
+        $form['keyed_styles'][$breakpoint_id][$multiplier]['image_style'] = [
           '#type' => 'select',
           '#title' => $this->t('Image style'),
           '#options' => $image_styles,
           '#default_value' => isset($image_style_mapping['image_mapping']) && is_string($image_style_mapping['image_mapping']) ? $image_style_mapping['image_mapping'] : '',
           '#description' => $this->t('Select an image style for this breakpoint.'),
-          '#states' => array(
-            'visible' => array(
-              ':input[name="keyed_styles[' . $breakpoint_id . '][' . $multiplier . '][image_mapping_type]"]' => array('value' => 'image_style'),
-            ),
-          ),
-        );
-        $form['keyed_styles'][$breakpoint_id][$multiplier]['sizes'] = array(
+          '#states' => [
+            'visible' => [
+              ':input[name="keyed_styles[' . $breakpoint_id . '][' . $multiplier . '][image_mapping_type]"]' => ['value' => 'image_style'],
+            ],
+          ],
+        ];
+        $form['keyed_styles'][$breakpoint_id][$multiplier]['sizes'] = [
           '#type' => 'textfield',
           '#title' => $this->t('Sizes'),
           '#default_value' => isset($image_style_mapping['image_mapping']['sizes']) ? $image_style_mapping['image_mapping']['sizes'] : '100vw',
           '#description' => $this->t('Enter the value for the sizes attribute, for example: %example_sizes.', ['%example_sizes' => '(min-width:700px) 700px, 100vw']),
-          '#states' => array(
-            'visible' => array(
-              ':input[name="keyed_styles[' . $breakpoint_id . '][' . $multiplier . '][image_mapping_type]"]' => array('value' => 'sizes'),
-            ),
-            'required' => array(
-              ':input[name="keyed_styles[' . $breakpoint_id . '][' . $multiplier . '][image_mapping_type]"]' => array('value' => 'sizes'),
-            ),
-          ),
-        );
-        $form['keyed_styles'][$breakpoint_id][$multiplier]['sizes_image_styles'] = array(
+          '#states' => [
+            'visible' => [
+              ':input[name="keyed_styles[' . $breakpoint_id . '][' . $multiplier . '][image_mapping_type]"]' => ['value' => 'sizes'],
+            ],
+            'required' => [
+              ':input[name="keyed_styles[' . $breakpoint_id . '][' . $multiplier . '][image_mapping_type]"]' => ['value' => 'sizes'],
+            ],
+          ],
+        ];
+        $form['keyed_styles'][$breakpoint_id][$multiplier]['sizes_image_styles'] = [
           '#title' => $this->t('Image styles'),
           '#type' => 'checkboxes',
-          '#options' => array_diff_key($image_styles, array('' => '')),
+          '#options' => array_diff_key($image_styles, ['' => '']),
           '#description' => $this->t('Select image styles with widths that range from the smallest amount of space this image will take up in the layout to the largest, bearing in mind that high resolution screens will need images 1.5x to 2x larger.'),
-          '#default_value' => isset($image_style_mapping['image_mapping']['sizes_image_styles']) ? $image_style_mapping['image_mapping']['sizes_image_styles'] : array(),
-          '#states' => array(
-            'visible' => array(
-              ':input[name="keyed_styles[' . $breakpoint_id . '][' . $multiplier . '][image_mapping_type]"]' => array('value' => 'sizes'),
-            ),
-            'required' => array(
-              ':input[name="keyed_styles[' . $breakpoint_id . '][' . $multiplier . '][image_mapping_type]"]' => array('value' => 'sizes'),
-            ),
-          ),
-        );
+          '#default_value' => isset($image_style_mapping['image_mapping']['sizes_image_styles']) ? $image_style_mapping['image_mapping']['sizes_image_styles'] : [],
+          '#states' => [
+            'visible' => [
+              ':input[name="keyed_styles[' . $breakpoint_id . '][' . $multiplier . '][image_mapping_type]"]' => ['value' => 'sizes'],
+            ],
+            'required' => [
+              ':input[name="keyed_styles[' . $breakpoint_id . '][' . $multiplier . '][image_mapping_type]"]' => ['value' => 'sizes'],
+            ],
+          ],
+        ];
 
         // Expand the details if "do not use this breakpoint" was not selected.
         if ($form['keyed_styles'][$breakpoint_id][$multiplier]['image_mapping_type']['#default_value'] != '_none') {
@@ -190,14 +190,14 @@ class ResponsiveImageStyleForm extends EntityForm {
       }
     }
 
-    $form['fallback_image_style'] = array(
+    $form['fallback_image_style'] = [
       '#title' => $this->t('Fallback image style'),
       '#type' => 'select',
       '#default_value' => $responsive_image_style->getFallbackImageStyle(),
       '#options' => $image_styles,
       '#required' => TRUE,
       '#description' => t('Select the smallest image style you expect to appear in this space. The fallback image style should only appear on the site if an error occurs.'),
-    );
+    ];
 
     $form['#tree'] = TRUE;
 
@@ -252,20 +252,20 @@ class ResponsiveImageStyleForm extends EntityForm {
       foreach ($form_state->getValue('keyed_styles') as $breakpoint_id => $multipliers) {
         foreach ($multipliers as $multiplier => $image_style_mapping) {
           if ($image_style_mapping['image_mapping_type'] === 'sizes') {
-            $mapping = array(
+            $mapping = [
               'image_mapping_type' => 'sizes',
-              'image_mapping' => array(
+              'image_mapping' => [
                 'sizes' => $image_style_mapping['sizes'],
                 'sizes_image_styles' => array_keys(array_filter($image_style_mapping['sizes_image_styles'])),
-              )
-            );
+              ]
+            ];
             $responsive_image_style->addImageStyleMapping($breakpoint_id, $multiplier, $mapping);
           }
           elseif ($image_style_mapping['image_mapping_type'] === 'image_style') {
-            $mapping = array(
+            $mapping = [
               'image_mapping_type' => 'image_style',
               'image_mapping' => $image_style_mapping['image_style'],
-            );
+            ];
             $responsive_image_style->addImageStyleMapping($breakpoint_id, $multiplier, $mapping);
           }
         }
@@ -273,15 +273,15 @@ class ResponsiveImageStyleForm extends EntityForm {
     }
     $responsive_image_style->save();
 
-    $this->logger('responsive_image')->notice('Responsive image style @label saved.', array('@label' => $responsive_image_style->label()));
-    drupal_set_message($this->t('Responsive image style %label saved.', array('%label' => $responsive_image_style->label())));
+    $this->logger('responsive_image')->notice('Responsive image style @label saved.', ['@label' => $responsive_image_style->label()]);
+    drupal_set_message($this->t('Responsive image style %label saved.', ['%label' => $responsive_image_style->label()]));
 
     // Redirect to edit form after creating a new responsive image style or
     // after selecting another breakpoint group.
     if (!$responsive_image_style->hasImageStyleMappings()) {
       $form_state->setRedirect(
         'entity.responsive_image_style.edit_form',
-        array('responsive_image_style' => $responsive_image_style->id())
+        ['responsive_image_style' => $responsive_image_style->id()]
       );
     }
     else {
diff --git a/web/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php b/web/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php
index a3fbc7176..226797188 100644
--- a/web/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php
+++ b/web/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php
@@ -9,6 +9,16 @@ use Drupal\Core\Config\Entity\ConfigEntityInterface;
  */
 interface ResponsiveImageStyleInterface extends ConfigEntityInterface {
 
+  /**
+   * The machine name for the empty image breakpoint image style option.
+   */
+  const EMPTY_IMAGE = '_empty image_';
+
+  /**
+   * The machine name for the original image breakpoint image style option.
+   */
+  const ORIGINAL_IMAGE = '_original image_';
+
   /**
    * Checks if there is at least one mapping defined.
    *
diff --git a/web/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php b/web/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
index 648a171bf..1b4ded009 100644
--- a/web/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
+++ b/web/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
@@ -33,11 +33,11 @@ class ResponsiveImageStyleListBuilder extends ConfigEntityListBuilder {
    */
   public function getDefaultOperations(EntityInterface $entity) {
     $operations = parent::getDefaultOperations($entity);
-    $operations['duplicate'] = array(
+    $operations['duplicate'] = [
       'title' => t('Duplicate'),
       'weight' => 15,
       'url' => $entity->urlInfo('duplicate-form'),
-    );
+    ];
     return $operations;
   }
 
diff --git a/web/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php b/web/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
index 8f8b5058e..0439771b1 100644
--- a/web/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
+++ b/web/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
@@ -16,7 +16,7 @@ class ResponsiveImageAdminUITest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('responsive_image', 'responsive_image_test_module');
+  public static $modules = ['responsive_image', 'responsive_image_test_module'];
 
   /**
    * Drupal\simpletest\WebTestBase\setUp().
@@ -43,12 +43,12 @@ class ResponsiveImageAdminUITest extends WebTestBase {
     $this->assertFieldByName('breakpoint_group', 'responsive_image');
 
     // Create a new group.
-    $edit = array(
+    $edit = [
       'label' => 'Style One',
       'id' => 'style_one',
       'breakpoint_group' => 'responsive_image_test_module',
       'fallback_image_style' => 'thumbnail',
-    );
+    ];
     $this->drupalPostForm('admin/config/media/responsive-image-style/add', $edit, t('Save'));
 
     // Check if the new group is created.
@@ -64,14 +64,14 @@ class ResponsiveImageAdminUITest extends WebTestBase {
     $this->assertFieldByName('breakpoint_group', 'responsive_image_test_module');
     $this->assertFieldByName('fallback_image_style', 'thumbnail');
 
-    $cases = array(
-      array('mobile', '1x'),
-      array('mobile', '2x'),
-      array('narrow', '1x'),
-      array('narrow', '2x'),
-      array('wide', '1x'),
-      array('wide', '2x'),
-    );
+    $cases = [
+      ['mobile', '1x'],
+      ['mobile', '2x'],
+      ['narrow', '1x'],
+      ['narrow', '2x'],
+      ['wide', '1x'],
+      ['wide', '2x'],
+    ];
     $image_styles = array_merge(
       [RESPONSIVE_IMAGE_EMPTY_IMAGE, RESPONSIVE_IMAGE_ORIGINAL_IMAGE],
       array_keys(image_style_options(FALSE))
@@ -99,7 +99,7 @@ class ResponsiveImageAdminUITest extends WebTestBase {
     }
 
     // Save styles for 1x variant only.
-    $edit = array(
+    $edit = [
       'label' => 'Style One',
       'breakpoint_group' => 'responsive_image_test_module',
       'fallback_image_style' => 'thumbnail',
@@ -111,7 +111,7 @@ class ResponsiveImageAdminUITest extends WebTestBase {
       'keyed_styles[responsive_image_test_module.narrow][1x][sizes_image_styles][medium]' => 'medium',
       'keyed_styles[responsive_image_test_module.wide][1x][image_mapping_type]' => 'image_style',
       'keyed_styles[responsive_image_test_module.wide][1x][image_style]' => 'large',
-    );
+    ];
     $this->drupalPostForm('admin/config/media/responsive-image-style/style_one', $edit, t('Save'));
     $this->drupalGet('admin/config/media/responsive-image-style/style_one');
 
@@ -135,7 +135,7 @@ class ResponsiveImageAdminUITest extends WebTestBase {
 
     // Delete the style.
     $this->drupalGet('admin/config/media/responsive-image-style/style_one/delete');
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
     $this->drupalGet('admin/config/media/responsive-image-style');
     $this->assertText('There is no Responsive image style yet.');
   }
diff --git a/web/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/web/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
index f5b277dcd..b50d71be6 100644
--- a/web/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
+++ b/web/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
@@ -32,7 +32,7 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_ui', 'responsive_image', 'responsive_image_test_module');
+  public static $modules = ['field_ui', 'responsive_image', 'responsive_image_test_module'];
 
   /**
    * Drupal\simpletest\WebTestBase\setUp().
@@ -41,7 +41,7 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
     parent::setUp();
 
     // Create user.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer responsive images',
       'access content',
       'access administration pages',
@@ -53,15 +53,15 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
       'edit any article content',
       'delete any article content',
       'administer image styles'
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
     // Add responsive image style.
-    $this->responsiveImgStyle = ResponsiveImageStyle::create(array(
+    $this->responsiveImgStyle = ResponsiveImageStyle::create([
       'id' => 'style_one',
       'label' => 'Style One',
       'breakpoint_group' => 'responsive_image_test_module',
       'fallback_image_style' => 'large',
-    ));
+    ]);
   }
 
   /**
@@ -78,7 +78,7 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
   public function testResponsiveImageFieldFormattersPrivate() {
     $this->addTestImageStyleMappings();
     // Remove access content permission from anonymous users.
-    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, array('access content' => FALSE));
+    user_role_change_permissions(RoleInterface::ANONYMOUS_ID, ['access content' => FALSE]);
     $this->doTestResponsiveImageFieldFormatters('private');
   }
 
@@ -99,56 +99,56 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
   protected function addTestImageStyleMappings($empty_styles = FALSE) {
     if ($empty_styles) {
       $this->responsiveImgStyle
-        ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', array(
+        ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', [
           'image_mapping_type' => 'image_style',
           'image_mapping' => '',
-        ))
-        ->addImageStyleMapping('responsive_image_test_module.narrow', '1x', array(
+        ])
+        ->addImageStyleMapping('responsive_image_test_module.narrow', '1x', [
           'image_mapping_type' => 'sizes',
-          'image_mapping' => array(
+          'image_mapping' => [
             'sizes' => '(min-width: 700px) 700px, 100vw',
-            'sizes_image_styles' => array(),
-          ),
-        ))
-        ->addImageStyleMapping('responsive_image_test_module.wide', '1x', array(
+            'sizes_image_styles' => [],
+          ],
+        ])
+        ->addImageStyleMapping('responsive_image_test_module.wide', '1x', [
           'image_mapping_type' => 'image_style',
           'image_mapping' => '',
-        ))
+        ])
         ->save();
     }
     else {
       $this->responsiveImgStyle
         // Test the output of an empty image.
-        ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', array(
+        ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', [
           'image_mapping_type' => 'image_style',
           'image_mapping' => RESPONSIVE_IMAGE_EMPTY_IMAGE,
-        ))
+        ])
         // Test the output with a 1.5x multiplier.
-        ->addImageStyleMapping('responsive_image_test_module.mobile', '1.5x', array(
+        ->addImageStyleMapping('responsive_image_test_module.mobile', '1.5x', [
           'image_mapping_type' => 'image_style',
           'image_mapping' => 'thumbnail',
-        ))
+        ])
         // Test the output of the 'sizes' attribute.
-        ->addImageStyleMapping('responsive_image_test_module.narrow', '1x', array(
+        ->addImageStyleMapping('responsive_image_test_module.narrow', '1x', [
           'image_mapping_type' => 'sizes',
-          'image_mapping' => array(
+          'image_mapping' => [
             'sizes' => '(min-width: 700px) 700px, 100vw',
-            'sizes_image_styles' => array(
+            'sizes_image_styles' => [
               'large',
               'medium',
-            ),
-          ),
-        ))
+            ],
+          ],
+        ])
         // Test the normal output of mapping to an image style.
-        ->addImageStyleMapping('responsive_image_test_module.wide', '1x', array(
+        ->addImageStyleMapping('responsive_image_test_module.wide', '1x', [
           'image_mapping_type' => 'image_style',
           'image_mapping' => 'large',
-        ))
+        ])
         // Test the output of the original image.
-        ->addImageStyleMapping('responsive_image_test_module.wide', '3x', array(
+        ->addImageStyleMapping('responsive_image_test_module.wide', '3x', [
           'image_mapping_type' => 'image_style',
           'image_mapping' => RESPONSIVE_IMAGE_ORIGINAL_IMAGE,
-        ))
+        ])
         ->save();
     }
   }
@@ -169,7 +169,7 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
     $renderer = $this->container->get('renderer');
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $this->createImageField($field_name, 'article', array('uri_scheme' => $scheme));
+    $this->createImageField($field_name, 'article', ['uri_scheme' => $scheme]);
     // Create a new node with an image attached. Make sure we use a large image
     // so the scale effects of the image styles always have an effect.
     $test_image = current($this->drupalGetTestFiles('image', 39325));
@@ -178,26 +178,26 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
     $alt = $this->randomMachineName();
 
     $nid = $this->uploadNodeImage($test_image, $field_name, 'article', $alt);
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
     $node = $node_storage->load($nid);
 
     // Test that the default formatter is being used.
     $image_uri = File::load($node->{$field_name}->target_id)->getFileUri();
-    $image = array(
+    $image = [
       '#theme' => 'image',
       '#uri' => $image_uri,
       '#width' => 360,
       '#height' => 240,
       '#alt' => $alt,
-    );
+    ];
     $default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
     $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
 
     // Test field not being configured. This should not cause a fatal error.
-    $display_options = array(
+    $display_options = [
       'type' => 'responsive_image_test',
       'settings' => ResponsiveImageFormatter::defaultSettings(),
-    );
+    ];
     $display = $this->container->get('entity.manager')
       ->getStorage('entity_view_display')
       ->load('node.article.default');
@@ -215,13 +215,13 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
     $this->drupalGet('node/' . $nid);
 
     // Test theme function for responsive image, but using the test formatter.
-    $display_options = array(
+    $display_options = [
       'type' => 'responsive_image_test',
-      'settings' => array(
+      'settings' => [
         'image_link' => 'file',
         'responsive_image_style' => 'style_one',
-      ),
-    );
+      ],
+    ];
     $display = entity_get_display('node', 'article', 'default');
     $display->setComponent($field_name, $display_options)
       ->save();
@@ -229,13 +229,13 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
     $this->drupalGet('node/' . $nid);
 
     // Use the responsive image formatter linked to file formatter.
-    $display_options = array(
+    $display_options = [
       'type' => 'responsive_image',
-      'settings' => array(
+      'settings' => [
         'image_link' => 'file',
         'responsive_image_style' => 'style_one',
-      ),
-    );
+      ],
+    ];
     $display = entity_get_display('node', 'article', 'default');
     $display->setComponent($field_name, $display_options)
       ->save();
@@ -312,15 +312,11 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
 
     // Test the fallback image style.
     $image = \Drupal::service('image.factory')->get($image_uri);
-    $fallback_image = array(
+    $fallback_image = [
       '#theme' => 'image',
       '#alt' => $alt,
-      '#srcset' => array(
-        array(
-          'uri' => file_url_transform_relative($large_style->buildUrl($image->getSource())),
-        ),
-      ),
-    );
+      '#uri' => file_url_transform_relative($large_style->buildUrl($image->getSource())),
+    ];
     // The image.html.twig template has a newline after the <img> tag but
     // responsive-image.html.twig doesn't have one after the fallback image, so
     // we remove it here.
@@ -359,32 +355,32 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
   public function testResponsiveImageFieldFormattersEmptyMediaQuery() {
     $this->responsiveImgStyle
       // Test the output of an empty media query.
-      ->addImageStyleMapping('responsive_image_test_module.empty', '1x', array(
+      ->addImageStyleMapping('responsive_image_test_module.empty', '1x', [
         'image_mapping_type' => 'image_style',
         'image_mapping' => RESPONSIVE_IMAGE_EMPTY_IMAGE,
-      ))
+      ])
       // Test the output with a 1.5x multiplier.
-      ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', array(
+      ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', [
         'image_mapping_type' => 'image_style',
         'image_mapping' => 'thumbnail',
-      ))
+      ])
       ->save();
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $this->createImageField($field_name, 'article', array('uri_scheme' => 'public'));
+    $this->createImageField($field_name, 'article', ['uri_scheme' => 'public']);
     // Create a new node with an image attached.
     $test_image = current($this->drupalGetTestFiles('image'));
     $nid = $this->uploadNodeImage($test_image, $field_name, 'article', $this->randomMachineName());
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
 
     // Use the responsive image formatter linked to file formatter.
-    $display_options = array(
+    $display_options = [
       'type' => 'responsive_image',
-      'settings' => array(
+      'settings' => [
         'image_link' => '',
         'responsive_image_style' => 'style_one',
-      ),
-    );
+      ],
+    ];
     $display = entity_get_display('node', 'article', 'default');
     $display->setComponent($field_name, $display_options)
       ->save();
@@ -408,31 +404,31 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
   public function testResponsiveImageFieldFormattersOneSource() {
     $this->responsiveImgStyle
       // Test the output of an empty media query.
-      ->addImageStyleMapping('responsive_image_test_module.empty', '1x', array(
+      ->addImageStyleMapping('responsive_image_test_module.empty', '1x', [
         'image_mapping_type' => 'image_style',
         'image_mapping' => 'medium',
-      ))
-      ->addImageStyleMapping('responsive_image_test_module.empty', '2x', array(
+      ])
+      ->addImageStyleMapping('responsive_image_test_module.empty', '2x', [
           'image_mapping_type' => 'image_style',
           'image_mapping' => 'large',
-        ))
+        ])
       ->save();
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $this->createImageField($field_name, 'article', array('uri_scheme' => 'public'));
+    $this->createImageField($field_name, 'article', ['uri_scheme' => 'public']);
     // Create a new node with an image attached.
     $test_image = current($this->drupalGetTestFiles('image'));
     $nid = $this->uploadNodeImage($test_image, $field_name, 'article', $this->randomMachineName());
-    $node_storage->resetCache(array($nid));
+    $node_storage->resetCache([$nid]);
 
     // Use the responsive image formatter linked to file formatter.
-    $display_options = array(
+    $display_options = [
       'type' => 'responsive_image',
-      'settings' => array(
+      'settings' => [
         'image_link' => '',
         'responsive_image_style' => 'style_one',
-      ),
-    );
+      ],
+    ];
     $display = entity_get_display('node', 'article', 'default');
     $display->setComponent($field_name, $display_options)
       ->save();
@@ -456,19 +452,19 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
    */
   private function assertResponsiveImageFieldFormattersLink($link_type) {
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_settings = array('alt_field_required' => 0);
-    $this->createImageField($field_name, 'article', array('uri_scheme' => 'public'), $field_settings);
+    $field_settings = ['alt_field_required' => 0];
+    $this->createImageField($field_name, 'article', ['uri_scheme' => 'public'], $field_settings);
     // Create a new node with an image attached.
     $test_image = current($this->drupalGetTestFiles('image'));
 
     // Test the image linked to file formatter.
-    $display_options = array(
+    $display_options = [
       'type' => 'responsive_image',
-      'settings' => array(
+      'settings' => [
         'image_link' => $link_type,
         'responsive_image_style' => 'style_one',
-      ),
-    );
+      ],
+    ];
     entity_get_display('node', 'article', 'default')
       ->setComponent($field_name, $display_options)
       ->save();
@@ -479,17 +475,17 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
     $this->assertPattern('/picture/');
 
     $nid = $this->uploadNodeImage($test_image, $field_name, 'article');
-    $this->container->get('entity.manager')->getStorage('node')->resetCache(array($nid));
+    $this->container->get('entity.manager')->getStorage('node')->resetCache([$nid]);
     $node = Node::load($nid);
 
     // Use the responsive image formatter linked to file formatter.
-    $display_options = array(
+    $display_options = [
       'type' => 'responsive_image',
-      'settings' => array(
+      'settings' => [
         'image_link' => $link_type,
         'responsive_image_style' => 'style_one',
-      ),
-    );
+      ],
+    ];
     entity_get_display('node', 'article', 'default')
       ->setComponent($field_name, $display_options)
       ->save();
diff --git a/web/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php b/web/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
index 8b1030f32..c6acb5683 100644
--- a/web/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
+++ b/web/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
@@ -21,7 +21,7 @@ class ResponsiveImageFieldUiTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field_ui', 'image', 'responsive_image', 'responsive_image_test_module', 'block');
+  public static $modules = ['node', 'field_ui', 'image', 'responsive_image', 'responsive_image_test_module', 'block'];
 
   /**
    * {@inheritdoc}
@@ -30,19 +30,19 @@ class ResponsiveImageFieldUiTest extends WebTestBase {
     parent::setUp();
     $this->drupalPlaceBlock('system_breadcrumb_block');
     // Create a test user.
-    $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'bypass node access'));
+    $admin_user = $this->drupalCreateUser(['access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'bypass node access']);
     $this->drupalLogin($admin_user);
 
     // Create content type, with underscores.
     $type_name = strtolower($this->randomMachineName(8)) . '_test';
-    $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name));
+    $type = $this->drupalCreateContentType(['name' => $type_name, 'type' => $type_name]);
     $this->type = $type->id();
   }
 
   /**
    * Tests formatter settings.
    */
-  function testResponsiveImageFormatterUI() {
+  public function testResponsiveImageFormatterUI() {
     $manage_fields = 'admin/structure/types/manage/' . $this->type;
     $manage_display = $manage_fields . '/display';
 
@@ -52,35 +52,39 @@ class ResponsiveImageFieldUiTest extends WebTestBase {
     $this->drupalGet($manage_display);
 
     // Change the formatter and check that the summary is updated.
-    $edit = array('fields[field_image][type]' => 'responsive_image', 'refresh_rows' => 'field_image');
-    $this->drupalPostAjaxForm(NULL, $edit, array('op' => t('Refresh')));
+    $edit = [
+      'fields[field_image][type]' => 'responsive_image',
+      'fields[field_image][region]' => 'content',
+      'refresh_rows' => 'field_image',
+    ];
+    $this->drupalPostAjaxForm(NULL, $edit, ['op' => t('Refresh')]);
     $this->assertText("Select a responsive image style.", 'The expected summary is displayed.');
 
     // Submit the form.
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $this->assertText("Select a responsive image style.", 'The expected summary is displayed.');
 
     // Create responsive image styles.
-    $responsive_image_style = ResponsiveImageStyle::create(array(
+    $responsive_image_style = ResponsiveImageStyle::create([
       'id' => 'style_one',
       'label' => 'Style One',
       'breakpoint_group' => 'responsive_image_test_module',
       'fallback_image_style' => 'thumbnail',
-    ));
+    ]);
     $responsive_image_style
-      ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', array(
+      ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', [
         'image_mapping_type' => 'image_style',
         'image_mapping' => 'thumbnail',
-      ))
-      ->addImageStyleMapping('responsive_image_test_module.narrow', '1x', array(
+      ])
+      ->addImageStyleMapping('responsive_image_test_module.narrow', '1x', [
         'image_mapping_type' => 'image_style',
         'image_mapping' => 'medium'
-      ))
+      ])
       // Test the normal output of mapping to an image style.
-      ->addImageStyleMapping('responsive_image_test_module.wide', '1x', array(
+      ->addImageStyleMapping('responsive_image_test_module.wide', '1x', [
         'image_mapping_type' => 'image_style',
         'image_mapping' => 'large',
-      ))
+      ])
       ->save();
     \Drupal::entityManager()->clearCachedFieldDefinitions();
     // Refresh the page.
@@ -89,38 +93,38 @@ class ResponsiveImageFieldUiTest extends WebTestBase {
 
     // Click on the formatter settings button to open the formatter settings
     // form.
-    $this->drupalPostAjaxForm(NULL, array(), "field_image_settings_edit");
+    $this->drupalPostAjaxForm(NULL, [], "field_image_settings_edit");
 
     // Assert that the correct fields are present.
-    $fieldnames = array(
+    $fieldnames = [
       'fields[field_image][settings_edit_form][settings][responsive_image_style]',
       'fields[field_image][settings_edit_form][settings][image_link]',
-    );
+    ];
     foreach ($fieldnames as $fieldname) {
       $this->assertField($fieldname);
     }
-    $edit = array(
+    $edit = [
       'fields[field_image][settings_edit_form][settings][responsive_image_style]' => 'style_one',
       'fields[field_image][settings_edit_form][settings][image_link]' => 'content',
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, "field_image_plugin_settings_update");
 
     // Save the form to save the settings.
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $this->assertText('Responsive image style: Style One');
     $this->assertText('Linked to content');
 
     // Click on the formatter settings button to open the formatter settings
     // form.
-    $this->drupalPostAjaxForm(NULL, array(), "field_image_settings_edit");
-    $edit = array(
+    $this->drupalPostAjaxForm(NULL, [], "field_image_settings_edit");
+    $edit = [
       'fields[field_image][settings_edit_form][settings][responsive_image_style]' => 'style_one',
       'fields[field_image][settings_edit_form][settings][image_link]' => 'file',
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, "field_image_plugin_settings_update");
 
     // Save the form to save the third party settings.
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $this->assertText('Responsive image style: Style One');
     $this->assertText('Linked to file');
   }
diff --git a/web/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php b/web/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
index 3911aad42..bc9663dcf 100644
--- a/web/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
+++ b/web/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
@@ -39,8 +39,8 @@ class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase {
   protected function setUp() {
     $this->entityType = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
-       ->method('getProvider')
-       ->will($this->returnValue('responsive_image'));
+      ->method('getProvider')
+      ->will($this->returnValue('responsive_image'));
 
     $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
     $this->entityManager->expects($this->any())
@@ -101,7 +101,7 @@ class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase {
     $this->breakpointManager->expects($this->any())
       ->method('getGroupProviders')
       ->with('test_group')
-      ->willReturn(array('bartik' => 'theme', 'toolbar' => 'module'));
+      ->willReturn(['bartik' => 'theme', 'toolbar' => 'module']);
 
     $dependencies = $entity->calculateDependencies()->getDependencies();
     $this->assertEquals(['toolbar'], $dependencies['module']);
@@ -114,49 +114,49 @@ class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase {
    * @covers ::hasImageStyleMappings
    */
   public function testHasImageStyleMappings() {
-    $entity = new ResponsiveImageStyle(array());
+    $entity = new ResponsiveImageStyle([]);
     $this->assertFalse($entity->hasImageStyleMappings());
-    $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+    $entity->addImageStyleMapping('test_breakpoint', '1x', [
         'image_mapping_type' => 'image_style',
         'image_mapping' => '',
-    ));
+    ]);
     $this->assertFalse($entity->hasImageStyleMappings());
     $entity->removeImageStyleMappings();
-    $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+    $entity->addImageStyleMapping('test_breakpoint', '1x', [
         'image_mapping_type' => 'sizes',
-        'image_mapping' => array(
+        'image_mapping' => [
           'sizes' => '(min-width:700px) 700px, 100vw',
-          'sizes_image_styles' => array(),
-        ),
-    ));
+          'sizes_image_styles' => [],
+        ],
+    ]);
     $this->assertFalse($entity->hasImageStyleMappings());
     $entity->removeImageStyleMappings();
-    $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+    $entity->addImageStyleMapping('test_breakpoint', '1x', [
         'image_mapping_type' => 'sizes',
-        'image_mapping' => array(
+        'image_mapping' => [
           'sizes' => '',
-          'sizes_image_styles' => array(
+          'sizes_image_styles' => [
             'large' => 'large',
-          ),
-        ),
-    ));
+          ],
+        ],
+    ]);
     $this->assertFalse($entity->hasImageStyleMappings());
     $entity->removeImageStyleMappings();
-    $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+    $entity->addImageStyleMapping('test_breakpoint', '1x', [
         'image_mapping_type' => 'image_style',
         'image_mapping' => 'large',
-    ));
+    ]);
     $this->assertTrue($entity->hasImageStyleMappings());
     $entity->removeImageStyleMappings();
-    $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+    $entity->addImageStyleMapping('test_breakpoint', '1x', [
         'image_mapping_type' => 'sizes',
-        'image_mapping' => array(
+        'image_mapping' => [
           'sizes' => '(min-width:700px) 700px, 100vw',
-          'sizes_image_styles' => array(
+          'sizes_image_styles' => [
             'large' => 'large',
-          ),
-        ),
-    ));
+          ],
+        ],
+    ]);
     $this->assertTrue($entity->hasImageStyleMappings());
   }
 
@@ -165,17 +165,17 @@ class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase {
    * @covers ::getImageStyleMapping
    */
   public function testGetImageStyleMapping() {
-    $entity = new ResponsiveImageStyle(array(''));
-    $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+    $entity = new ResponsiveImageStyle(['']);
+    $entity->addImageStyleMapping('test_breakpoint', '1x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'large',
-    ));
-    $expected = array(
+    ]);
+    $expected = [
       'breakpoint_id' => 'test_breakpoint',
       'multiplier' => '1x',
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'large',
-    );
+    ];
     $this->assertEquals($expected, $entity->getImageStyleMapping('test_breakpoint', '1x'));
     $this->assertNull($entity->getImageStyleMapping('test_unknown_breakpoint', '1x'));
   }
@@ -185,90 +185,90 @@ class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase {
    * @covers ::getKeyedImageStyleMappings
    */
   public function testGetKeyedImageStyleMappings() {
-    $entity = new ResponsiveImageStyle(array(''));
-    $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+    $entity = new ResponsiveImageStyle(['']);
+    $entity->addImageStyleMapping('test_breakpoint', '1x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'large',
-    ));
-    $entity->addImageStyleMapping('test_breakpoint', '2x', array(
+    ]);
+    $entity->addImageStyleMapping('test_breakpoint', '2x', [
       'image_mapping_type' => 'sizes',
-      'image_mapping' => array(
+      'image_mapping' => [
         'sizes' => '(min-width:700px) 700px, 100vw',
-        'sizes_image_styles' => array(
+        'sizes_image_styles' => [
           'large' => 'large',
-        ),
-      ),
-    ));
-    $entity->addImageStyleMapping('test_breakpoint2', '1x', array(
+        ],
+      ],
+    ]);
+    $entity->addImageStyleMapping('test_breakpoint2', '1x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'thumbnail',
-    ));
-    $entity->addImageStyleMapping('test_breakpoint2', '2x', array(
+    ]);
+    $entity->addImageStyleMapping('test_breakpoint2', '2x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => '_original image_',
-    ));
+    ]);
 
-    $expected = array(
-      'test_breakpoint' => array(
-        '1x' => array(
+    $expected = [
+      'test_breakpoint' => [
+        '1x' => [
           'breakpoint_id' => 'test_breakpoint',
           'multiplier' => '1x',
           'image_mapping_type' => 'image_style',
           'image_mapping' => 'large',
-        ),
-        '2x' => array(
+        ],
+        '2x' => [
           'breakpoint_id' => 'test_breakpoint',
           'multiplier' => '2x',
           'image_mapping_type' => 'sizes',
-          'image_mapping' => array(
+          'image_mapping' => [
             'sizes' => '(min-width:700px) 700px, 100vw',
-            'sizes_image_styles' => array(
+            'sizes_image_styles' => [
               'large' => 'large',
-            ),
-          ),
-        ),
-      ),
-      'test_breakpoint2' => array(
-        '1x' => array(
+            ],
+          ],
+        ],
+      ],
+      'test_breakpoint2' => [
+        '1x' => [
           'breakpoint_id' => 'test_breakpoint2',
           'multiplier' => '1x',
           'image_mapping_type' => 'image_style',
           'image_mapping' => 'thumbnail',
-        ),
-        '2x' => array(
+        ],
+        '2x' => [
           'breakpoint_id' => 'test_breakpoint2',
           'multiplier' => '2x',
           'image_mapping_type' => 'image_style',
           'image_mapping' => '_original image_',
-        ),
-      )
-    );
+        ],
+      ]
+    ];
     $this->assertEquals($expected, $entity->getKeyedImageStyleMappings());
 
     // Add another mapping to ensure keyed mapping static cache is rebuilt.
-    $entity->addImageStyleMapping('test_breakpoint2', '2x', array(
+    $entity->addImageStyleMapping('test_breakpoint2', '2x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'medium',
-    ));
-    $expected['test_breakpoint2']['2x'] = array(
+    ]);
+    $expected['test_breakpoint2']['2x'] = [
       'breakpoint_id' => 'test_breakpoint2',
       'multiplier' => '2x',
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'medium',
-    );
+    ];
     $this->assertEquals($expected, $entity->getKeyedImageStyleMappings());
 
     // Overwrite a mapping to ensure keyed mapping static cache is rebuilt.
-    $entity->addImageStyleMapping('test_breakpoint2', '2x', array(
+    $entity->addImageStyleMapping('test_breakpoint2', '2x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'large',
-    ));
-    $expected['test_breakpoint2']['2x'] = array(
+    ]);
+    $expected['test_breakpoint2']['2x'] = [
       'breakpoint_id' => 'test_breakpoint2',
       'multiplier' => '2x',
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'large',
-    );
+    ];
     $this->assertEquals($expected, $entity->getKeyedImageStyleMappings());
   }
 
@@ -277,50 +277,50 @@ class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase {
    * @covers ::getImageStyleMappings
    */
   public function testGetImageStyleMappings() {
-    $entity = new ResponsiveImageStyle(array(''));
-    $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+    $entity = new ResponsiveImageStyle(['']);
+    $entity->addImageStyleMapping('test_breakpoint', '1x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'large',
-    ));
-    $entity->addImageStyleMapping('test_breakpoint', '2x', array(
+    ]);
+    $entity->addImageStyleMapping('test_breakpoint', '2x', [
       'image_mapping_type' => 'sizes',
-      'image_mapping' => array(
+      'image_mapping' => [
         'sizes' => '(min-width:700px) 700px, 100vw',
-        'sizes_image_styles' => array(
+        'sizes_image_styles' => [
           'large' => 'large',
-        ),
-      ),
-    ));
-    $entity->addImageStyleMapping('test_breakpoint2', '1x', array(
+        ],
+      ],
+    ]);
+    $entity->addImageStyleMapping('test_breakpoint2', '1x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'thumbnail',
-    ));
+    ]);
 
-    $expected = array(
-      array(
+    $expected = [
+      [
         'breakpoint_id' => 'test_breakpoint',
         'multiplier' => '1x',
         'image_mapping_type' => 'image_style',
         'image_mapping' => 'large',
-      ),
-      array(
+      ],
+      [
         'breakpoint_id' => 'test_breakpoint',
         'multiplier' => '2x',
         'image_mapping_type' => 'sizes',
-        'image_mapping' => array(
+        'image_mapping' => [
           'sizes' => '(min-width:700px) 700px, 100vw',
-          'sizes_image_styles' => array(
+          'sizes_image_styles' => [
             'large' => 'large',
-          ),
-        ),
-      ),
-      array(
+          ],
+        ],
+      ],
+      [
         'breakpoint_id' => 'test_breakpoint2',
         'multiplier' => '1x',
         'image_mapping_type' => 'image_style',
         'image_mapping' => 'thumbnail',
-      ),
-    );
+      ],
+    ];
     $this->assertEquals($expected, $entity->getImageStyleMappings());
   }
 
@@ -329,24 +329,24 @@ class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase {
    * @covers ::removeImageStyleMappings
    */
   public function testRemoveImageStyleMappings() {
-    $entity = new ResponsiveImageStyle(array(''));
-    $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+    $entity = new ResponsiveImageStyle(['']);
+    $entity->addImageStyleMapping('test_breakpoint', '1x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'large',
-    ));
-    $entity->addImageStyleMapping('test_breakpoint', '2x', array(
+    ]);
+    $entity->addImageStyleMapping('test_breakpoint', '2x', [
       'image_mapping_type' => 'sizes',
-      'image_mapping' => array(
+      'image_mapping' => [
         'sizes' => '(min-width:700px) 700px, 100vw',
-        'sizes_image_styles' => array(
+        'sizes_image_styles' => [
           'large' => 'large',
-        ),
-      ),
-    ));
-    $entity->addImageStyleMapping('test_breakpoint2', '1x', array(
+        ],
+      ],
+    ]);
+    $entity->addImageStyleMapping('test_breakpoint2', '1x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'thumbnail',
-    ));
+    ]);
 
     $this->assertTrue($entity->hasImageStyleMappings());
     $entity->removeImageStyleMappings();
@@ -360,24 +360,24 @@ class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase {
    * @covers ::getBreakpointGroup
    */
   public function testSetBreakpointGroup() {
-    $entity = new ResponsiveImageStyle(array('breakpoint_group' => 'test_group'));
-    $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+    $entity = new ResponsiveImageStyle(['breakpoint_group' => 'test_group']);
+    $entity->addImageStyleMapping('test_breakpoint', '1x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'large',
-    ));
-    $entity->addImageStyleMapping('test_breakpoint', '2x', array(
+    ]);
+    $entity->addImageStyleMapping('test_breakpoint', '2x', [
       'image_mapping_type' => 'sizes',
-      'image_mapping' => array(
+      'image_mapping' => [
         'sizes' => '(min-width:700px) 700px, 100vw',
-        'sizes_image_styles' => array(
+        'sizes_image_styles' => [
           'large' => 'large',
-        ),
-      ),
-    ));
-    $entity->addImageStyleMapping('test_breakpoint2', '1x', array(
+        ],
+      ],
+    ]);
+    $entity->addImageStyleMapping('test_breakpoint2', '1x', [
       'image_mapping_type' => 'image_style',
       'image_mapping' => 'thumbnail',
-    ));
+    ]);
 
     // Ensure that setting to same group does not remove mappings.
     $entity->setBreakpointGroup('test_group');
diff --git a/web/core/modules/rest/config/install/rest.settings.yml b/web/core/modules/rest/config/install/rest.settings.yml
index eb3da2df4..8f70c6997 100644
--- a/web/core/modules/rest/config/install/rest.settings.yml
+++ b/web/core/modules/rest/config/install/rest.settings.yml
@@ -1,7 +1,3 @@
-# Set the domain for REST type and relation links.
-# If left blank, the site's domain will be used.
-link_domain: ~
-
 # Before Drupal 8.2, EntityResource used permissions as well as the entity
 # access system for access checking. This was confusing, and it only did this
 # for historical reasons. New Drupal installations opt out from this by default
diff --git a/web/core/modules/rest/config/schema/rest.schema.yml b/web/core/modules/rest/config/schema/rest.schema.yml
index 2c255ab88..49b4b2d94 100644
--- a/web/core/modules/rest/config/schema/rest.schema.yml
+++ b/web/core/modules/rest/config/schema/rest.schema.yml
@@ -3,6 +3,7 @@ rest.settings:
   type: config_object
   label: 'REST settings'
   mapping:
+    # @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
     link_domain:
       type: string
       label: 'Domain of the relation'
diff --git a/web/core/modules/rest/rest.api.php b/web/core/modules/rest/rest.api.php
index fb8993d26..ac601072b 100644
--- a/web/core/modules/rest/rest.api.php
+++ b/web/core/modules/rest/rest.api.php
@@ -31,6 +31,9 @@ function hook_rest_resource_alter(&$definitions) {
 /**
  * Alter the REST type URI.
  *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ *   hook_serialization_type_uri_alter() instead. This exists solely for BC.
+ *
  * Modules may wish to alter the type URI generated for a resource based on the
  * context of the serializer/normalizer operation.
  *
@@ -44,9 +47,9 @@ function hook_rest_resource_alter(&$definitions) {
  * @see \Symfony\Component\Serializer\NormalizerInterface::normalize()
  * @see \Symfony\Component\Serializer\DenormalizerInterface::denormalize()
  */
-function hook_rest_type_uri_alter(&$uri, $context = array()) {
+function hook_rest_type_uri_alter(&$uri, $context = []) {
   if ($context['mymodule'] == TRUE) {
-    $base = \Drupal::config('rest.settings')->get('link_domain');
+    $base = \Drupal::config('serialization.settings')->get('link_domain');
     $uri = str_replace($base, 'http://mymodule.domain', $uri);
   }
 }
@@ -55,6 +58,9 @@ function hook_rest_type_uri_alter(&$uri, $context = array()) {
 /**
  * Alter the REST relation URI.
  *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ *   hook_serialization_relation_uri_alter() instead. This exists solely for BC.
+ *
  * Modules may wish to alter the relation URI generated for a resource based on
  * the context of the serializer/normalizer operation.
  *
@@ -68,9 +74,9 @@ function hook_rest_type_uri_alter(&$uri, $context = array()) {
  * @see \Symfony\Component\Serializer\NormalizerInterface::normalize()
  * @see \Symfony\Component\Serializer\DenormalizerInterface::denormalize()
  */
-function hook_rest_relation_uri_alter(&$uri, $context = array()) {
+function hook_rest_relation_uri_alter(&$uri, $context = []) {
   if ($context['mymodule'] == TRUE) {
-    $base = \Drupal::config('rest.settings')->get('link_domain');
+    $base = \Drupal::config('serialization.settings')->get('link_domain');
     $uri = str_replace($base, 'http://mymodule.domain', $uri);
   }
 }
diff --git a/web/core/modules/rest/rest.install b/web/core/modules/rest/rest.install
index af6664e03..32c5b1d27 100644
--- a/web/core/modules/rest/rest.install
+++ b/web/core/modules/rest/rest.install
@@ -12,25 +12,19 @@ use Drupal\Core\StringTranslation\TranslatableMarkup;
  * Implements hook_requirements().
  */
 function rest_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
 
   if (version_compare(PHP_VERSION, '5.6.0', '>=') && version_compare(PHP_VERSION, '7', '<') && ini_get('always_populate_raw_post_data') != -1) {
-    $requirements['always_populate_raw_post_data'] = array(
+    $requirements['always_populate_raw_post_data'] = [
       'title' => t('always_populate_raw_post_data PHP setting'),
       'value' => t('Not set to -1.'),
       'severity' => REQUIREMENT_ERROR,
       'description' => t('The always_populate_raw_post_data PHP setting should be set to -1 in PHP version 5.6. Please check the <a href="https://php.net/manual/en/ini.core.php#ini.always-populate-raw-post-data">PHP manual</a> for information on how to correct this.'),
-    );
+    ];
   }
   return $requirements;
 }
 
-/**
- * @defgroup updates-8.1.x-to-8.2.x
- * @{
- * Update functions from 8.1.x to 8.2.x.
- */
-
 /**
  * Install the REST config entity type and fix old settings-based config.
  *
@@ -90,7 +84,3 @@ function rest_update_8203() {
   $rest_settings->set('bc_entity_resource_permissions', TRUE)
     ->save(TRUE);
 }
-
-/**
- * @} End of "defgroup updates-8.1.x-to-8.2.x".
- */
diff --git a/web/core/modules/rest/rest.module b/web/core/modules/rest/rest.module
index 24e1c5f70..afdb9ffe3 100644
--- a/web/core/modules/rest/rest.module
+++ b/web/core/modules/rest/rest.module
@@ -15,13 +15,13 @@ function rest_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.rest':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The RESTful Web Services module provides a framework for exposing REST resources on your site. It provides support for content entities (see the <a href=":field">Field module help page</a> for more information about entities) such as content, users, taxonomy terms, etc.; REST support for content items of the Node module is enabled by default, and support for other types of content entities can be enabled. Other modules may add support for other types of REST resources. For more information, see the <a href=":rest">online documentation for the RESTful Web Services module</a>.', array(':rest' => 'https://www.drupal.org/documentation/modules/rest', ':field' => (\Drupal::moduleHandler()->moduleExists('field')) ? \Drupal::url('help.page', array('name' => 'field')) : '#')) . '</p>';
+      $output .= '<p>' . t('The RESTful Web Services module provides a framework for exposing REST resources on your site. It provides support for content entities (see the <a href=":field">Field module help page</a> for more information about entities) such as content, users, taxonomy terms, etc.; REST support for content items of the Node module is enabled by default, and support for other types of content entities can be enabled. Other modules may add support for other types of REST resources. For more information, see the <a href=":rest">online documentation for the RESTful Web Services module</a>.', [':rest' => 'https://www.drupal.org/documentation/modules/rest', ':field' => (\Drupal::moduleHandler()->moduleExists('field')) ? \Drupal::url('help.page', ['name' => 'field']) : '#']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Installing supporting modules') . '</dt>';
-      $output .= '<dd>' . t('In order to use REST on a web site, you need to install modules that provide serialization and authentication services. You can use the Core module <a href=":hal">HAL</a> for serialization and <a href=":basic_auth">HTTP Basic Authentication</a> for authentication, or install a contributed or custom module.', array(':hal' => (\Drupal::moduleHandler()->moduleExists('hal')) ? \Drupal::url('help.page', array('name' => 'hal')) : '#', ':basic_auth' => (\Drupal::moduleHandler()->moduleExists('basic_auth')) ? \Drupal::url('help.page', array('name' => 'basic_auth')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('In order to use REST on a web site, you need to install modules that provide serialization and authentication services. You can use the Core module <a href=":hal">HAL</a> for serialization and <a href=":basic_auth">HTTP Basic Authentication</a> for authentication, or install a contributed or custom module.', [':hal' => (\Drupal::moduleHandler()->moduleExists('hal')) ? \Drupal::url('help.page', ['name' => 'hal']) : '#', ':basic_auth' => (\Drupal::moduleHandler()->moduleExists('basic_auth')) ? \Drupal::url('help.page', ['name' => 'basic_auth']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Enabling REST support for an entity type') . '</dt>';
-      $output .= '<dd>' . t('REST support for content items of the Node module is enabled by default, and support for other types of content entities can be enabled. To enable support, you can use a <a href=":config">process based on configuration editing</a> or the contributed <a href=":restui">Rest UI module</a>.', array(':config' => 'https://www.drupal.org/documentation/modules/rest', ':restui' => 'https://www.drupal.org/project/restui')) . '</dd>';
+      $output .= '<dd>' . t('REST support for content items of the Node module is enabled by default, and support for other types of content entities can be enabled. To enable support, you can use a <a href=":config">process based on configuration editing</a> or the contributed <a href=":restui">Rest UI module</a>.', [':config' => 'https://www.drupal.org/documentation/modules/rest', ':restui' => 'https://www.drupal.org/project/restui']) . '</dd>';
       $output .= '<dd>' . t('You will also need to grant anonymous users permission to perform each of the REST operations you want to be available, and set up authentication properly to authorize web requests.') . '</dd>';
       $output .= '</dl>';
       return $output;
diff --git a/web/core/modules/rest/rest.post_update.php b/web/core/modules/rest/rest.post_update.php
index ecbc73c40..6d4517880 100644
--- a/web/core/modules/rest/rest.post_update.php
+++ b/web/core/modules/rest/rest.post_update.php
@@ -8,11 +8,6 @@
 use Drupal\rest\Entity\RestResourceConfig;
 use Drupal\rest\RestResourceConfigInterface;
 
-/**
- * @addtogroup updates-8.1.x-to-8.2.x
- * @{
- */
-
 /**
  * Create REST resource configuration entities.
  *
@@ -66,8 +61,3 @@ function rest_post_update_resource_granularity() {
     }
   }
 }
-
-
-/**
- * @} End of "addtogroup updates-8.1.x-to-8.2.x".
- */
diff --git a/web/core/modules/rest/rest.services.yml b/web/core/modules/rest/rest.services.yml
index 1cc34c14b..869eb1964 100644
--- a/web/core/modules/rest/rest.services.yml
+++ b/web/core/modules/rest/rest.services.yml
@@ -11,15 +11,6 @@ services:
   # @todo Remove this service in Drupal 9.0.0.
   access_check.rest.csrf:
     alias: access_check.header.csrf
-  rest.link_manager:
-    class: Drupal\rest\LinkManager\LinkManager
-    arguments: ['@rest.link_manager.type', '@rest.link_manager.relation']
-  rest.link_manager.type:
-    class: Drupal\rest\LinkManager\TypeLinkManager
-    arguments: ['@cache.default', '@module_handler', '@config.factory', '@request_stack', '@entity_type.bundle.info']
-  rest.link_manager.relation:
-    class: Drupal\rest\LinkManager\RelationLinkManager
-    arguments: ['@cache.default', '@entity.manager', '@module_handler', '@config.factory', '@request_stack']
   rest.resource_routes:
     class: Drupal\rest\Routing\ResourceRoutes
     arguments: ['@plugin.manager.rest', '@entity_type.manager', '@logger.channel.rest']
@@ -28,3 +19,15 @@ services:
   logger.channel.rest:
     parent: logger.channel_base
     arguments: ['rest']
+
+  # Event subscribers.
+  rest.resource_response.subscriber:
+    class: Drupal\rest\EventSubscriber\ResourceResponseSubscriber
+    tags:
+      - { name: event_subscriber }
+    arguments: ['@serializer', '@renderer', '@current_route_match']
+  rest.config_subscriber:
+    class: Drupal\rest\EventSubscriber\RestConfigSubscriber
+    arguments: ['@router.builder']
+    tags:
+      - { name: event_subscriber }
diff --git a/web/core/modules/rest/src/Entity/RestResourceConfig.php b/web/core/modules/rest/src/Entity/RestResourceConfig.php
index bb8358416..12bd846ea 100644
--- a/web/core/modules/rest/src/Entity/RestResourceConfig.php
+++ b/web/core/modules/rest/src/Entity/RestResourceConfig.php
@@ -3,6 +3,7 @@
 namespace Drupal\rest\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;
+use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\DefaultSingleLazyPluginCollection;
 use Drupal\rest\RestResourceConfigInterface;
 
@@ -255,4 +256,22 @@ class RestResourceConfig extends ConfigEntityBase implements RestResourceConfigI
     return strtoupper($method);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function postSave(EntityStorageInterface $storage, $update = TRUE) {
+    parent::postSave($storage, $update);
+
+    \Drupal::service('router.builder')->setRebuildNeeded();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function postDelete(EntityStorageInterface $storage, array $entities) {
+    parent::postDelete($storage, $entities);
+
+    \Drupal::service('router.builder')->setRebuildNeeded();
+  }
+
 }
diff --git a/web/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php b/web/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php
new file mode 100644
index 000000000..5cb887bec
--- /dev/null
+++ b/web/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php
@@ -0,0 +1,204 @@
+<?php
+
+namespace Drupal\rest\EventSubscriber;
+
+use Drupal\Core\Cache\CacheableResponse;
+use Drupal\Core\Cache\CacheableResponseInterface;
+use Drupal\Core\Render\RenderContext;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\rest\ResourceResponseInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Response subscriber that serializes and removes ResourceResponses' data.
+ */
+class ResourceResponseSubscriber implements EventSubscriberInterface {
+
+  /**
+   * The serializer.
+   *
+   * @var \Symfony\Component\Serializer\SerializerInterface
+   */
+  protected $serializer;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * The current route match.
+   *
+   * @var \Drupal\Core\Routing\RouteMatchInterface
+   */
+  protected $routeMatch;
+
+  /**
+   * Constructs a ResourceResponseSubscriber object.
+   *
+   * @param \Symfony\Component\Serializer\SerializerInterface $serializer
+   *   The serializer.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The current route match.
+   */
+  public function __construct(SerializerInterface $serializer, RendererInterface $renderer, RouteMatchInterface $route_match) {
+    $this->serializer = $serializer;
+    $this->renderer = $renderer;
+    $this->routeMatch = $route_match;
+  }
+
+  /**
+   * Serializes ResourceResponse responses' data, and removes that data.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
+   *   The event to process.
+   */
+  public function onResponse(FilterResponseEvent $event) {
+    $response = $event->getResponse();
+    if (!$response instanceof ResourceResponseInterface) {
+      return;
+    }
+
+    $request = $event->getRequest();
+    $format = $this->getResponseFormat($this->routeMatch, $request);
+    $this->renderResponseBody($request, $response, $this->serializer, $format);
+    $event->setResponse($this->flattenResponse($response));
+  }
+
+  /**
+   * Determines the format to respond in.
+   *
+   * Respects the requested format if one is specified. However, it is common to
+   * forget to specify a request format in case of a POST or PATCH. Rather than
+   * simply throwing an error, we apply the robustness principle: when POSTing
+   * or PATCHing using a certain format, you probably expect a response in that
+   * same format.
+   *
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The current route match.
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The current request.
+   *
+   * @return string
+   *   The response format.
+   */
+  public function getResponseFormat(RouteMatchInterface $route_match, Request $request) {
+    $route = $route_match->getRouteObject();
+    $acceptable_request_formats = $route->hasRequirement('_format') ? explode('|', $route->getRequirement('_format')) : [];
+    $acceptable_content_type_formats = $route->hasRequirement('_content_type_format') ? explode('|', $route->getRequirement('_content_type_format')) : [];
+    $acceptable_formats = $request->isMethodSafe() ? $acceptable_request_formats : $acceptable_content_type_formats;
+
+    $requested_format = $request->getRequestFormat();
+    $content_type_format = $request->getContentType();
+
+    // If an acceptable format is requested, then use that. Otherwise, including
+    // and particularly when the client forgot to specify a format, then use
+    // heuristics to select the format that is most likely expected.
+    if (in_array($requested_format, $acceptable_formats)) {
+      return $requested_format;
+    }
+    // If a request body is present, then use the format corresponding to the
+    // request body's Content-Type for the response, if it's an acceptable
+    // format for the request.
+    elseif (!empty($request->getContent()) && in_array($content_type_format, $acceptable_content_type_formats)) {
+      return $content_type_format;
+    }
+    // Otherwise, use the first acceptable format.
+    elseif (!empty($acceptable_formats)) {
+      return $acceptable_formats[0];
+    }
+    // Sometimes, there are no acceptable formats, e.g. DELETE routes.
+    else {
+      return NULL;
+    }
+  }
+
+  /**
+   * Renders a resource response body.
+   *
+   * Serialization can invoke rendering (e.g., generating URLs), but the
+   * serialization API does not provide a mechanism to collect the
+   * bubbleable metadata associated with that (e.g., language and other
+   * contexts), so instead, allow those to "leak" and collect them here in
+   * a render context.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The request object.
+   * @param \Drupal\rest\ResourceResponseInterface $response
+   *   The response from the REST resource.
+   * @param \Symfony\Component\Serializer\SerializerInterface $serializer
+   *   The serializer to use.
+   * @param string|null $format
+   *   The response format, or NULL in case the response does not need a format,
+   *   for example for the response to a DELETE request.
+   *
+   * @todo Add test coverage for language negotiation contexts in
+   *   https://www.drupal.org/node/2135829.
+   */
+  protected function renderResponseBody(Request $request, ResourceResponseInterface $response, SerializerInterface $serializer, $format) {
+    $data = $response->getResponseData();
+
+    // If there is data to send, serialize and set it as the response body.
+    if ($data !== NULL) {
+      $context = new RenderContext();
+      $output = $this->renderer
+        ->executeInRenderContext($context, function () use ($serializer, $data, $format) {
+          return $serializer->serialize($data, $format);
+        });
+
+      if ($response instanceof CacheableResponseInterface && !$context->isEmpty()) {
+        $response->addCacheableDependency($context->pop());
+      }
+
+      $response->setContent($output);
+      $response->headers->set('Content-Type', $request->getMimeType($format));
+    }
+  }
+
+  /**
+   * Flattens a fully rendered resource response.
+   *
+   * Ensures that complex data structures in ResourceResponse::getResponseData()
+   * are not serialized. Not doing this means that caching this response object
+   * requires unserializing the PHP data when reading this response object from
+   * cache, which can be very costly, and is unnecessary.
+   *
+   * @param \Drupal\rest\ResourceResponseInterface $response
+   *   A fully rendered resource response.
+   *
+   * @return \Drupal\Core\Cache\CacheableResponse|\Symfony\Component\HttpFoundation\Response
+   *   The flattened response.
+   */
+  protected function flattenResponse(ResourceResponseInterface $response) {
+    $final_response = ($response instanceof CacheableResponseInterface) ? new CacheableResponse() : new Response();
+    $final_response->setContent($response->getContent());
+    $final_response->setStatusCode($response->getStatusCode());
+    $final_response->setProtocolVersion($response->getProtocolVersion());
+    $final_response->setCharset($response->getCharset());
+    $final_response->headers = clone $response->headers;
+    if ($final_response instanceof CacheableResponseInterface) {
+      $final_response->addCacheableDependency($response->getCacheableMetadata());
+    }
+    return $final_response;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    // Run shortly before \Drupal\Core\EventSubscriber\FinishResponseSubscriber.
+    $events[KernelEvents::RESPONSE][] = ['onResponse', 5];
+    return $events;
+  }
+
+}
diff --git a/web/core/modules/rest/src/EventSubscriber/RestConfigSubscriber.php b/web/core/modules/rest/src/EventSubscriber/RestConfigSubscriber.php
new file mode 100644
index 000000000..abab34a86
--- /dev/null
+++ b/web/core/modules/rest/src/EventSubscriber/RestConfigSubscriber.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\rest\EventSubscriber;
+
+use Drupal\Core\Config\ConfigCrudEvent;
+use Drupal\Core\Config\ConfigEvents;
+use Drupal\Core\Routing\RouteBuilderInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * A subscriber triggering a route rebuild when certain configuration changes.
+ */
+class RestConfigSubscriber implements EventSubscriberInterface {
+
+  /**
+   * The router builder.
+   *
+   * @var \Drupal\Core\Routing\RouteBuilderInterface
+   */
+  protected $routerBuilder;
+
+  /**
+   * Constructs the RestConfigSubscriber.
+   *
+   * @param \Drupal\Core\Routing\RouteBuilderInterface $route_builder
+   *   The router builder service.
+   */
+  public function __construct(RouteBuilderInterface $router_builder) {
+    $this->routerBuilder = $router_builder;
+  }
+
+  /**
+   * Informs the router builder a rebuild is needed when necessary.
+   *
+   * @param \Drupal\Core\Config\ConfigCrudEvent $event
+   *   The Event to process.
+   */
+  public function onSave(ConfigCrudEvent $event) {
+    $saved_config = $event->getConfig();
+    if ($saved_config->getName() === 'rest.settings' && $event->isChanged('bc_entity_resource_permissions')) {
+      $this->routerBuilder->setRebuildNeeded();
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::SAVE][] = ['onSave'];
+    return $events;
+  }
+
+}
diff --git a/web/core/modules/rest/src/LinkManager/ConfigurableLinkManagerInterface.php b/web/core/modules/rest/src/LinkManager/ConfigurableLinkManagerInterface.php
index c2eb1f136..f9343f40c 100644
--- a/web/core/modules/rest/src/LinkManager/ConfigurableLinkManagerInterface.php
+++ b/web/core/modules/rest/src/LinkManager/ConfigurableLinkManagerInterface.php
@@ -2,19 +2,10 @@
 
 namespace Drupal\rest\LinkManager;
 
+use Drupal\hal\LinkManager\ConfigurableLinkManagerInterface as MovedConfigurableLinkManagerInterface;
+
 /**
- * Defines an interface for a link manager with a configurable domain.
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ *   been moved to the hal module. This exists solely for BC.
  */
-interface ConfigurableLinkManagerInterface {
-
-  /**
-   * Sets the link domain used in constructing link URIs.
-   *
-   * @param string $domain
-   *   The link domain to use for constructing link URIs.
-   *
-   * @return $this
-   */
-  public function setLinkDomain($domain);
-
-}
+interface ConfigurableLinkManagerInterface extends MovedConfigurableLinkManagerInterface {}
diff --git a/web/core/modules/rest/src/LinkManager/LinkManager.php b/web/core/modules/rest/src/LinkManager/LinkManager.php
index bd94a6580..4cb8384f6 100644
--- a/web/core/modules/rest/src/LinkManager/LinkManager.php
+++ b/web/core/modules/rest/src/LinkManager/LinkManager.php
@@ -2,70 +2,10 @@
 
 namespace Drupal\rest\LinkManager;
 
-class LinkManager implements LinkManagerInterface {
+use Drupal\hal\LinkManager\LinkManager as MovedLinkManager;
 
-  /**
-   * The type link manager.
-   *
-   * @var \Drupal\rest\LinkManager\TypeLinkManagerInterface
-   */
-  protected $typeLinkManager;
-
-  /**
-   * The relation link manager.
-   *
-   * @var \Drupal\rest\LinkManager\RelationLinkManagerInterface
-   */
-  protected $relationLinkManager;
-
-  /**
-   * Constructor.
-   *
-   * @param \Drupal\rest\LinkManager\TypeLinkManagerInterface $type_link_manager
-   *   Manager for handling bundle URIs.
-   * @param \Drupal\rest\LinkManager\RelationLinkManagerInterface $relation_link_manager
-   *   Manager for handling bundle URIs.
-   */
-  public function __construct(TypeLinkManagerInterface $type_link_manager, RelationLinkManagerInterface $relation_link_manager) {
-    $this->typeLinkManager = $type_link_manager;
-    $this->relationLinkManager = $relation_link_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTypeUri($entity_type, $bundle, $context = array()) {
-    return $this->typeLinkManager->getTypeUri($entity_type, $bundle, $context);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTypeInternalIds($type_uri, $context = array()) {
-    return $this->typeLinkManager->getTypeInternalIds($type_uri, $context);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRelationUri($entity_type, $bundle, $field_name, $context = array()) {
-    return $this->relationLinkManager->getRelationUri($entity_type, $bundle, $field_name, $context);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRelationInternalIds($relation_uri) {
-    return $this->relationLinkManager->getRelationInternalIds($relation_uri);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setLinkDomain($domain) {
-    $this->relationLinkManager->setLinkDomain($domain);
-    $this->typeLinkManager->setLinkDomain($domain);
-    return $this;
-  }
-
-}
+/**
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ *   been moved to the hal module. This exists solely for BC.
+ */
+class LinkManager extends MovedLinkManager implements LinkManagerInterface {}
diff --git a/web/core/modules/rest/src/LinkManager/LinkManagerBase.php b/web/core/modules/rest/src/LinkManager/LinkManagerBase.php
index 0896a80f7..13f700422 100644
--- a/web/core/modules/rest/src/LinkManager/LinkManagerBase.php
+++ b/web/core/modules/rest/src/LinkManager/LinkManagerBase.php
@@ -2,57 +2,10 @@
 
 namespace Drupal\rest\LinkManager;
 
+use Drupal\hal\LinkManager\LinkManagerBase as MovedLinkManagerBase;
+
 /**
- * Defines an abstract base-class for REST link manager objects.
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ *   been moved to the hal module. This exists solely for BC.
  */
-abstract class LinkManagerBase {
-
-  /**
-   * Link domain used for type links URIs.
-   *
-   * @var string
-   */
-  protected $linkDomain;
-
-  /**
-   * Config factory service.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The request stack.
-   *
-   * @var \Symfony\Component\HttpFoundation\RequestStack
-   */
-  protected $requestStack;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setLinkDomain($domain) {
-    $this->linkDomain = rtrim($domain, '/');
-    return $this;
-  }
-
-  /**
-   * Gets the link domain.
-   *
-   * @return string
-   *   The link domain.
-   */
-  protected function getLinkDomain() {
-    if (empty($this->linkDomain)) {
-      if ($domain = $this->configFactory->get('rest.settings')->get('link_domain')) {
-        $this->linkDomain = rtrim($domain, '/');
-      }
-      else {
-        $request = $this->requestStack->getCurrentRequest();
-        $this->linkDomain = $request->getSchemeAndHttpHost() . $request->getBasePath();
-      }
-    }
-    return $this->linkDomain;
-  }
-
-}
+abstract class LinkManagerBase extends MovedLinkManagerBase {}
diff --git a/web/core/modules/rest/src/LinkManager/LinkManagerInterface.php b/web/core/modules/rest/src/LinkManager/LinkManagerInterface.php
index 1bd04ff50..15852a59d 100644
--- a/web/core/modules/rest/src/LinkManager/LinkManagerInterface.php
+++ b/web/core/modules/rest/src/LinkManager/LinkManagerInterface.php
@@ -2,17 +2,10 @@
 
 namespace Drupal\rest\LinkManager;
 
+use Drupal\hal\LinkManager\LinkManagerInterface as MovedLinkManagerInterface;
+
 /**
- * Interface implemented by link managers.
- *
- * There are no explicit methods on the manager interface. Instead link managers
- * broker the interactions of the different components, and therefore must
- * implement each component interface, which is enforced by this interface
- * extending all of the component ones.
- *
- * While a link manager may directly implement these interface methods with
- * custom logic, it is expected to be more common for plugin managers to proxy
- * the method invocations to the respective components.
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ *   been moved to the hal module. This exists solely for BC.
  */
-interface LinkManagerInterface extends TypeLinkManagerInterface, RelationLinkManagerInterface {
-}
+interface LinkManagerInterface extends MovedLinkManagerInterface {}
diff --git a/web/core/modules/rest/src/LinkManager/RelationLinkManager.php b/web/core/modules/rest/src/LinkManager/RelationLinkManager.php
index 297ffd9a0..8a5d49d5a 100644
--- a/web/core/modules/rest/src/LinkManager/RelationLinkManager.php
+++ b/web/core/modules/rest/src/LinkManager/RelationLinkManager.php
@@ -2,141 +2,10 @@
 
 namespace Drupal\rest\LinkManager;
 
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
+use Drupal\hal\LinkManager\RelationLinkManager as MovedLinkRelationManager;
 
-class RelationLinkManager extends LinkManagerBase implements RelationLinkManagerInterface {
-
-  /**
-   * @var \Drupal\Core\Cache\CacheBackendInterface;
-   */
-  protected $cache;
-
-  /**
-   * Entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * Module handler service.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * Constructor.
-   *
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
-   *   The cache of relation URIs and their associated Typed Data IDs.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler service.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory service.
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack.
-   */
-  public function __construct(CacheBackendInterface $cache, EntityManagerInterface $entity_manager, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory, RequestStack $request_stack) {
-    $this->cache = $cache;
-    $this->entityManager = $entity_manager;
-    $this->configFactory = $config_factory;
-    $this->moduleHandler = $module_handler;
-    $this->requestStack = $request_stack;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRelationUri($entity_type, $bundle, $field_name, $context = array()) {
-    // Per the interface documention of this method, the returned URI may
-    // optionally also serve as the URL of a documentation page about this
-    // field. However, the REST module does not currently implement such
-    // a documentation page. Therefore, we return a URI assembled relative to
-    // the site's base URL, which is sufficient to uniquely identify the site's
-    // entity type + bundle + field for use in hypermedia formats, but we do
-    // not take into account unclean URLs, language prefixing, or anything else
-    // that would be required for Drupal to be able to respond with content
-    // at this URL. If a module is installed that adds such content, but
-    // requires this URL to be different (e.g., include a language prefix),
-    // then the module must also override the RelationLinkManager class/service
-    // to return the desired URL.
-    $uri = $this->getLinkDomain() . "/rest/relation/$entity_type/$bundle/$field_name";
-    $this->moduleHandler->alter('rest_relation_uri', $uri, $context);
-    return $uri;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRelationInternalIds($relation_uri, $context = array()) {
-    $relations = $this->getRelations($context);
-    if (isset($relations[$relation_uri])) {
-      return $relations[$relation_uri];
-    }
-    return FALSE;
-  }
-
-  /**
-   * Get the array of relation links.
-   *
-   * Any field can be handled as a relation simply by changing how it is
-   * normalized. Therefore, there is no prior knowledge that can be used here
-   * to determine which fields to assign relation URIs. Instead, each field,
-   * even primitives, are given a relation URI. It is up to the caller to
-   * determine which URIs to use.
-   *
-   * @param array $context
-   *   Context from the normalizer/serializer operation.
-   *
-   * @return array
-   *   An array of typed data ids (entity_type, bundle, and field name) keyed
-   *   by corresponding relation URI.
-   */
-  protected function getRelations($context = array()) {
-    $cid = 'rest:links:relations';
-    $cache = $this->cache->get($cid);
-    if (!$cache) {
-      $this->writeCache($context);
-      $cache = $this->cache->get($cid);
-    }
-    return $cache->data;
-  }
-
-  /**
-   * Writes the cache of relation links.
-   *
-   * @param array $context
-   *   Context from the normalizer/serializer operation.
-   */
-  protected function writeCache($context = array()) {
-    $data = array();
-
-    foreach ($this->entityManager->getDefinitions() as $entity_type) {
-      if ($entity_type instanceof ContentEntityTypeInterface) {
-        foreach ($this->entityManager->getBundleInfo($entity_type->id()) as $bundle => $bundle_info) {
-          foreach ($this->entityManager->getFieldDefinitions($entity_type->id(), $bundle) as $field_definition) {
-            $relation_uri = $this->getRelationUri($entity_type->id(), $bundle, $field_definition->getName(), $context);
-            $data[$relation_uri] = array(
-              'entity_type' => $entity_type,
-              'bundle' => $bundle,
-              'field_name' => $field_definition->getName(),
-            );
-          }
-        }
-      }
-    }
-    // These URIs only change when field info changes, so cache it permanently
-    // and only clear it when the fields cache is cleared.
-    $this->cache->set('rest:links:relations', $data, Cache::PERMANENT, array('entity_field_info'));
-  }
-
-}
+/**
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ *   been moved to the hal module. This exists solely for BC.
+ */
+class RelationLinkManager extends MovedLinkRelationManager implements RelationLinkManagerInterface {}
diff --git a/web/core/modules/rest/src/LinkManager/RelationLinkManagerInterface.php b/web/core/modules/rest/src/LinkManager/RelationLinkManagerInterface.php
index 53cd03991..c9a89388f 100644
--- a/web/core/modules/rest/src/LinkManager/RelationLinkManagerInterface.php
+++ b/web/core/modules/rest/src/LinkManager/RelationLinkManagerInterface.php
@@ -2,38 +2,10 @@
 
 namespace Drupal\rest\LinkManager;
 
-interface RelationLinkManagerInterface extends ConfigurableLinkManagerInterface {
+use Drupal\hal\LinkManager\RelationLinkManagerInterface as MovedRelationLinkManagerInterface;
 
-  /**
-   * Gets the URI that corresponds to a field.
-   *
-   * When using hypermedia formats, this URI can be used to indicate which
-   * field the data represents. Documentation about this field can also be
-   * provided at this URI.
-   *
-   * @param string $entity_type
-   *   The bundle's entity type.
-   * @param string $bundle
-   *   The bundle name.
-   * @param string $field_name
-   *   The field name.
-   * @param array $context
-   *   (optional) Optional serializer/normalizer context.
-   *
-   * @return string
-   *   The corresponding URI for the field.
-   */
-  public function getRelationUri($entity_type, $bundle, $field_name, $context = array());
-
-  /**
-   * Translates a REST URI into internal IDs.
-   *
-   * @param string $relation_uri
-   *   Relation URI to transform into internal IDs
-   *
-   * @return array
-   *   Array with keys 'entity_type', 'bundle' and 'field_name'.
-   */
-  public function getRelationInternalIds($relation_uri);
-
-}
+/**
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ *   been moved to the hal module. This exists solely for BC.
+ */
+interface RelationLinkManagerInterface extends MovedRelationLinkManagerInterface {}
diff --git a/web/core/modules/rest/src/LinkManager/TypeLinkManager.php b/web/core/modules/rest/src/LinkManager/TypeLinkManager.php
index 6752f6201..7c81a2582 100644
--- a/web/core/modules/rest/src/LinkManager/TypeLinkManager.php
+++ b/web/core/modules/rest/src/LinkManager/TypeLinkManager.php
@@ -2,147 +2,10 @@
 
 namespace Drupal\rest\LinkManager;
 
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
+use Drupal\hal\LinkManager\TypeLinkManager as MovedTypeLinkManager;
 
-class TypeLinkManager extends LinkManagerBase implements TypeLinkManagerInterface {
-
-  /**
-   * Injected cache backend.
-   *
-   * @var \Drupal\Core\Cache\CacheBackendInterface;
-   */
-  protected $cache;
-
-  /**
-   * Module handler service.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The bundle info service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
-   */
-  protected $bundleInfoService;
-
-  /**
-   * Constructor.
-   *
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
-   *   The injected cache backend for caching type URIs.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler service.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory service.
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack.
-   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info_service
-   *   The bundle info service.
-   */
-  public function __construct(CacheBackendInterface $cache, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config_factory, RequestStack $request_stack, EntityTypeBundleInfoInterface $bundle_info_service) {
-    $this->cache = $cache;
-    $this->configFactory = $config_factory;
-    $this->moduleHandler = $module_handler;
-    $this->requestStack = $request_stack;
-    $this->bundleInfoService = $bundle_info_service;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTypeUri($entity_type, $bundle, $context = array()) {
-    // Per the interface documention of this method, the returned URI may
-    // optionally also serve as the URL of a documentation page about this
-    // bundle. However, the REST module does not currently implement such
-    // a documentation page. Therefore, we return a URI assembled relative to
-    // the site's base URL, which is sufficient to uniquely identify the site's
-    // entity type and bundle for use in hypermedia formats, but we do not
-    // take into account unclean URLs, language prefixing, or anything else
-    // that would be required for Drupal to be able to respond with content
-    // at this URL. If a module is installed that adds such content, but
-    // requires this URL to be different (e.g., include a language prefix),
-    // then the module must also override the TypeLinkManager class/service to
-    // return the desired URL.
-    $uri = $this->getLinkDomain() . "/rest/type/$entity_type/$bundle";
-    $this->moduleHandler->alter('rest_type_uri', $uri, $context);
-    return $uri;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTypeInternalIds($type_uri, $context = array()) {
-    $types = $this->getTypes($context);
-    if (isset($types[$type_uri])) {
-      return $types[$type_uri];
-    }
-    return FALSE;
-  }
-
-  /**
-   * Get the array of type links.
-   *
-   * @param array $context
-   *   Context from the normalizer/serializer operation.
-   *
-   * @return array
-   *   An array of typed data ids (entity_type and bundle) keyed by
-   *   corresponding type URI.
-   */
-  protected function getTypes($context = array()) {
-    $cid = 'rest:links:types';
-    $cache = $this->cache->get($cid);
-    if (!$cache) {
-      $data = $this->writeCache($context);
-    }
-    else {
-      $data = $cache->data;
-    }
-    return $data;
-  }
-
-  /**
-   * Writes the cache of type links.
-   *
-   * @param array $context
-   *   Context from the normalizer/serializer operation.
-   *
-   * @return array
-   *   An array of typed data ids (entity_type and bundle) keyed by
-   *   corresponding type URI.
-   */
-  protected function writeCache($context = array()) {
-    $data = array();
-
-    // Type URIs correspond to bundles. Iterate through the bundles to get the
-    // URI and data for them.
-    $entity_types = \Drupal::entityManager()->getDefinitions();
-    foreach ($this->bundleInfoService->getAllBundleInfo() as $entity_type_id => $bundles) {
-      // Only content entities are supported currently.
-      // @todo Consider supporting config entities.
-      if ($entity_types[$entity_type_id]->isSubclassOf('\Drupal\Core\Config\Entity\ConfigEntityInterface')) {
-        continue;
-      }
-      foreach ($bundles as $bundle => $bundle_info) {
-        // Get a type URI for the bundle.
-        $bundle_uri = $this->getTypeUri($entity_type_id, $bundle, $context);
-        $data[$bundle_uri] = array(
-          'entity_type' => $entity_type_id,
-          'bundle' => $bundle,
-        );
-      }
-    }
-    // These URIs only change when entity info changes, so cache it permanently
-    // and only clear it when entity_info is cleared.
-    $this->cache->set('rest:links:types', $data, Cache::PERMANENT, array('entity_types'));
-    return $data;
-  }
-
-}
+/**
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ *   been moved to the hal module. This exists solely for BC.
+ */
+class TypeLinkManager extends MovedTypeLinkManager implements TypeLinkManagerInterface {}
diff --git a/web/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php b/web/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php
index 484ca76f1..85407fff6 100644
--- a/web/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php
+++ b/web/core/modules/rest/src/LinkManager/TypeLinkManagerInterface.php
@@ -2,39 +2,10 @@
 
 namespace Drupal\rest\LinkManager;
 
-interface TypeLinkManagerInterface extends ConfigurableLinkManagerInterface {
+use Drupal\hal\LinkManager\TypeLinkManagerInterface as MovedTypeLinkManagerInterface;
 
-  /**
-   * Gets the URI that corresponds to a bundle.
-   *
-   * When using hypermedia formats, this URI can be used to indicate which
-   * bundle the data represents. Documentation about required and optional
-   * fields can also be provided at this URI.
-   *
-   * @param $entity_type
-   *   The bundle's entity type.
-   * @param $bundle
-   *   The bundle name.
-   * @param array $context
-   *   (optional) Optional serializer/normalizer context.
-   *
-   * @return string
-   *   The corresponding URI for the bundle.
-   */
-  public function getTypeUri($entity_type, $bundle, $context = array());
-
-  /**
-   * Get a bundle's Typed Data IDs based on a URI.
-   *
-   * @param string $type_uri
-   *   The type URI.
-   * @param array $context
-   *   Context from the normalizer/serializer operation.
-   *
-   * @return array | boolean
-   *   If the URI matches a bundle, returns an array containing entity_type and
-   *   bundle. Otherwise, returns false.
-   */
-  public function getTypeInternalIds($type_uri, $context = array());
-
-}
+/**
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. This has
+ *   been moved to the hal module. This exists solely for BC.
+ */
+interface TypeLinkManagerInterface extends MovedTypeLinkManagerInterface {}
diff --git a/web/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php b/web/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php
index 6a6ddae96..010fad736 100644
--- a/web/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php
+++ b/web/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php
@@ -65,17 +65,17 @@ class EntityDeriver implements ContainerDeriverInterface {
     if (!isset($this->derivatives)) {
       // Add in the default plugin configuration and the resource type.
       foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
-        $this->derivatives[$entity_type_id] = array(
+        $this->derivatives[$entity_type_id] = [
           'id' => 'entity:' . $entity_type_id,
           'entity_type' => $entity_type_id,
           'serialization_class' => $entity_type->getClass(),
           'label' => $entity_type->getLabel(),
-        );
+        ];
 
-        $default_uris = array(
+        $default_uris = [
           'canonical' => "/entity/$entity_type_id/" . '{' . $entity_type_id . '}',
           'https://www.drupal.org/link-relations/create' => "/entity/$entity_type_id",
-        );
+        ];
 
         foreach ($default_uris as $link_relation => $default_uri) {
           // Check if there are link templates defined for the entity type and
diff --git a/web/core/modules/rest/src/Plugin/ResourceBase.php b/web/core/modules/rest/src/Plugin/ResourceBase.php
index 93684dbbc..3062aa29e 100644
--- a/web/core/modules/rest/src/Plugin/ResourceBase.php
+++ b/web/core/modules/rest/src/Plugin/ResourceBase.php
@@ -31,7 +31,7 @@ abstract class ResourceBase extends PluginBase implements ContainerFactoryPlugin
    *
    * @var array
    */
-  protected $serializerFormats = array();
+  protected $serializerFormats = [];
 
   /**
    * A logger instance.
@@ -81,13 +81,13 @@ abstract class ResourceBase extends PluginBase implements ContainerFactoryPlugin
    * resource".
    */
   public function permissions() {
-    $permissions = array();
+    $permissions = [];
     $definition = $this->getPluginDefinition();
     foreach ($this->availableMethods() as $method) {
       $lowered_method = strtolower($method);
-      $permissions["restful $lowered_method $this->pluginId"] = array(
-        'title' => $this->t('Access @method on %label resource', array('@method' => $method, '%label' => $definition['label'])),
-      );
+      $permissions["restful $lowered_method $this->pluginId"] = [
+        'title' => $this->t('Access @method on %label resource', ['@method' => $method, '%label' => $definition['label']]),
+      ];
     }
     return $permissions;
   }
@@ -113,14 +113,14 @@ abstract class ResourceBase extends PluginBase implements ContainerFactoryPlugin
           $route->setPath($create_path);
           // Restrict the incoming HTTP Content-type header to the known
           // serialization formats.
-          $route->addRequirements(array('_content_type_format' => implode('|', $this->serializerFormats)));
+          $route->addRequirements(['_content_type_format' => implode('|', $this->serializerFormats)]);
           $collection->add("$route_name.$method", $route);
           break;
 
         case 'PATCH':
           // Restrict the incoming HTTP Content-type header to the known
           // serialization formats.
-          $route->addRequirements(array('_content_type_format' => implode('|', $this->serializerFormats)));
+          $route->addRequirements(['_content_type_format' => implode('|', $this->serializerFormats)]);
           $collection->add("$route_name.$method", $route);
           break;
 
@@ -131,7 +131,7 @@ abstract class ResourceBase extends PluginBase implements ContainerFactoryPlugin
           foreach ($this->serializerFormats as $format_name) {
             // Expose one route per available format.
             $format_route = clone $route;
-            $format_route->addRequirements(array('_format' => $format_name));
+            $format_route->addRequirements(['_format' => $format_name]);
             $collection->add("$route_name.$method.$format_name", $format_route);
           }
           break;
@@ -155,7 +155,7 @@ abstract class ResourceBase extends PluginBase implements ContainerFactoryPlugin
    *   The list of allowed HTTP request method strings.
    */
   protected function requestMethods() {
-    return array(
+    return [
       'HEAD',
       'GET',
       'POST',
@@ -165,7 +165,7 @@ abstract class ResourceBase extends PluginBase implements ContainerFactoryPlugin
       'OPTIONS',
       'CONNECT',
       'PATCH',
-    );
+    ];
   }
 
   /**
@@ -173,7 +173,7 @@ abstract class ResourceBase extends PluginBase implements ContainerFactoryPlugin
    */
   public function availableMethods() {
     $methods = $this->requestMethods();
-    $available = array();
+    $available = [];
     foreach ($methods as $method) {
       // Only expose methods where the HTTP request method exists on the plugin.
       if (method_exists($this, strtolower($method))) {
@@ -195,15 +195,15 @@ abstract class ResourceBase extends PluginBase implements ContainerFactoryPlugin
    *   The created base route.
    */
   protected function getBaseRoute($canonical_path, $method) {
-    return new Route($canonical_path, array(
+    return new Route($canonical_path, [
       '_controller' => 'Drupal\rest\RequestHandler::handle',
-    ),
+    ],
       $this->getBaseRouteRequirements($method),
-      array(),
+      [],
       '',
-      array(),
+      [],
       // The HTTP method is a requirement for this route.
-      array($method)
+      [$method]
     );
   }
 
diff --git a/web/core/modules/rest/src/Plugin/rest/resource/EntityResource.php b/web/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
index 91ce482ec..9b1d15f00 100644
--- a/web/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
+++ b/web/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
@@ -3,17 +3,22 @@
 namespace Drupal\rest\Plugin\rest\resource;
 
 use Drupal\Component\Plugin\DependentPluginInterface;
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Cache\CacheableResponseInterface;
 use Drupal\Core\Config\Entity\ConfigEntityType;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageException;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\TypedData\PrimitiveInterface;
 use Drupal\rest\Plugin\ResourceBase;
 use Drupal\rest\ResourceResponse;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\rest\ModifiedResourceResponse;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -36,6 +41,9 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
  */
 class EntityResource extends ResourceBase implements DependentPluginInterface {
 
+  use EntityResourceValidationTrait;
+  use EntityResourceAccessTrait;
+
   /**
    * The entity type targeted by this resource.
    *
@@ -50,6 +58,13 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
    */
   protected $configFactory;
 
+  /**
+   * The link relation type manager used to create HTTP header links.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   */
+  protected $linkRelationTypeManager;
+
   /**
    * Constructs a Drupal\rest\Plugin\rest\resource\EntityResource object.
    *
@@ -67,11 +82,14 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
    *   A logger instance.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The config factory.
+   * @param \Drupal\Component\Plugin\PluginManagerInterface $link_relation_type_manager
+   *   The link relation type manager.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, $serializer_formats, LoggerInterface $logger, ConfigFactoryInterface $config_factory) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, $serializer_formats, LoggerInterface $logger, ConfigFactoryInterface $config_factory, PluginManagerInterface $link_relation_type_manager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $serializer_formats, $logger);
     $this->entityType = $entity_type_manager->getDefinition($plugin_definition['entity_type']);
     $this->configFactory = $config_factory;
+    $this->linkRelationTypeManager = $link_relation_type_manager;
   }
 
   /**
@@ -85,7 +103,8 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
       $container->get('entity_type.manager'),
       $container->getParameter('serializer.formats'),
       $container->get('logger.factory')->get('rest'),
-      $container->get('config.factory')
+      $container->get('config.factory'),
+      $container->get('plugin.manager.link_relation_type')
     );
   }
 
@@ -103,7 +122,7 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
   public function get(EntityInterface $entity) {
     $entity_access = $entity->access('view', NULL, TRUE);
     if (!$entity_access->isAllowed()) {
-      throw new AccessDeniedHttpException();
+      throw new AccessDeniedHttpException($entity_access->getReason() ?: $this->generateFallbackAccessDeniedMessage($entity, 'view'));
     }
 
     $response = new ResourceResponse($entity, 200);
@@ -122,6 +141,8 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
       }
     }
 
+    $this->addLinkHeaders($entity, $response);
+
     return $response;
   }
 
@@ -141,8 +162,9 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
       throw new BadRequestHttpException('No entity content received.');
     }
 
-    if (!$entity->access('create')) {
-      throw new AccessDeniedHttpException();
+    $entity_access = $entity->access('create', NULL, TRUE);
+    if (!$entity_access->isAllowed()) {
+      throw new AccessDeniedHttpException($entity_access->getReason() ?: $this->generateFallbackAccessDeniedMessage($entity, 'create'));
     }
     $definition = $this->getPluginDefinition();
     // Verify that the deserialized entity is of the type that we expect to
@@ -156,33 +178,64 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
       throw new BadRequestHttpException('Only new entities can be created');
     }
 
-    // Only check 'edit' permissions for fields that were actually
-    // submitted by the user. Field access makes no difference between 'create'
-    // and 'update', so the 'edit' operation is used here.
-    foreach ($entity->_restSubmittedFields as $key => $field_name) {
-      if (!$entity->get($field_name)->access('edit')) {
-        throw new AccessDeniedHttpException("Access denied on creating field '$field_name'");
-      }
-    }
+    $this->checkEditFieldAccess($entity);
 
     // Validate the received data before saving.
     $this->validate($entity);
     try {
       $entity->save();
-      $this->logger->notice('Created entity %type with ID %id.', array('%type' => $entity->getEntityTypeId(), '%id' => $entity->id()));
+      $this->logger->notice('Created entity %type with ID %id.', ['%type' => $entity->getEntityTypeId(), '%id' => $entity->id()]);
 
       // 201 Created responses return the newly created entity in the response
       // body. These responses are not cacheable, so we add no cacheability
       // metadata here.
-      $url = $entity->urlInfo('canonical', ['absolute' => TRUE])->toString(TRUE);
-      $response = new ModifiedResourceResponse($entity, 201, ['Location' => $url->getGeneratedUrl()]);
-      return $response;
+      $headers = [];
+      if (in_array('canonical', $entity->uriRelationships(), TRUE)) {
+        $url = $entity->urlInfo('canonical', ['absolute' => TRUE])->toString(TRUE);
+        $headers['Location'] = $url->getGeneratedUrl();
+      }
+      return new ModifiedResourceResponse($entity, 201, $headers);
     }
     catch (EntityStorageException $e) {
       throw new HttpException(500, 'Internal Server Error', $e);
     }
   }
 
+  /**
+   * Gets the values from the field item list casted to the correct type.
+   *
+   * Values are casted to the correct type so we can determine whether or not
+   * something has changed. REST formats such as JSON support typed data but
+   * Drupal's database API will return values as strings. Currently, only
+   * primitive data types know how to cast their values to the correct type.
+   *
+   * @param \Drupal\Core\Field\FieldItemListInterface $field_item_list
+   *   The field item list to retrieve its data from.
+   *
+   * @return mixed[][]
+   *   The values from the field item list casted to the correct type. The array
+   *   of values returned is a multidimensional array keyed by delta and the
+   *   property name.
+   */
+  protected function getCastedValueFromFieldItemList(FieldItemListInterface $field_item_list) {
+    $value = $field_item_list->getValue();
+
+    foreach ($value as $delta => $field_item_value) {
+      /** @var \Drupal\Core\Field\FieldItemInterface $field_item */
+      $field_item = $field_item_list->get($delta);
+      $properties = $field_item->getProperties(TRUE);
+      // Foreach field value we check whether we know the underlying property.
+      // If we exists we try to cast the value.
+      foreach ($field_item_value as $property_name => $property_value) {
+        if (isset($properties[$property_name]) && ($property = $field_item->get($property_name)) && $property instanceof PrimitiveInterface) {
+          $value[$delta][$property_name] = $property->getCastedValue();
+        }
+      }
+    }
+
+    return $value;
+  }
+
   /**
    * Responds to entity PATCH requests.
    *
@@ -204,8 +257,9 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
     if ($entity->getEntityTypeId() != $definition['entity_type']) {
       throw new BadRequestHttpException('Invalid entity type');
     }
-    if (!$original_entity->access('update')) {
-      throw new AccessDeniedHttpException();
+    $entity_access = $original_entity->access('update', NULL, TRUE);
+    if (!$entity_access->isAllowed()) {
+      throw new AccessDeniedHttpException($entity_access->getReason() ?: $this->generateFallbackAccessDeniedMessage($entity, 'update'));
     }
 
     // Overwrite the received properties.
@@ -218,8 +272,15 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
       // them. However, rather than throwing an error, we just ignore them as
       // long as their specified values match their current values.
       if (in_array($field_name, $entity_keys, TRUE)) {
+        // @todo Work around the wrong assumption that entity keys need special
+        // treatment, when only read-only fields need it.
+        // This will be fixed in https://www.drupal.org/node/2824851.
+        if ($entity->getEntityTypeId() == 'comment' && $field_name == 'status' && !$original_entity->get($field_name)->access('edit')) {
+          throw new AccessDeniedHttpException("Access denied on updating field '$field_name'.");
+        }
+
         // Unchanged values for entity keys don't need access checking.
-        if ($original_entity->get($field_name)->getValue() === $entity->get($field_name)->getValue()) {
+        if ($this->getCastedValueFromFieldItemList($original_entity->get($field_name)) === $this->getCastedValueFromFieldItemList($entity->get($field_name))) {
           continue;
         }
         // It is not possible to set the language to NULL as it is automatically
@@ -239,7 +300,7 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
     $this->validate($original_entity);
     try {
       $original_entity->save();
-      $this->logger->notice('Updated entity %type with ID %id.', array('%type' => $original_entity->getEntityTypeId(), '%id' => $original_entity->id()));
+      $this->logger->notice('Updated entity %type with ID %id.', ['%type' => $original_entity->getEntityTypeId(), '%id' => $original_entity->id()]);
 
       // Return the updated entity in the response body.
       return new ModifiedResourceResponse($original_entity, 200);
@@ -261,12 +322,13 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
    * @throws \Symfony\Component\HttpKernel\Exception\HttpException
    */
   public function delete(EntityInterface $entity) {
-    if (!$entity->access('delete')) {
-      throw new AccessDeniedHttpException();
+    $entity_access = $entity->access('delete', NULL, TRUE);
+    if (!$entity_access->isAllowed()) {
+      throw new AccessDeniedHttpException($entity_access->getReason() ?: $this->generateFallbackAccessDeniedMessage($entity, 'delete'));
     }
     try {
       $entity->delete();
-      $this->logger->notice('Deleted entity %type with ID %id.', array('%type' => $entity->getEntityTypeId(), '%id' => $entity->id()));
+      $this->logger->notice('Deleted entity %type with ID %id.', ['%type' => $entity->getEntityTypeId(), '%id' => $entity->id()]);
 
       // DELETE responses have an empty body.
       return new ModifiedResourceResponse(NULL, 204);
@@ -277,36 +339,23 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
   }
 
   /**
-   * Verifies that the whole entity does not violate any validation constraints.
+   * Generates a fallback access denied message, when no specific reason is set.
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity object.
+   * @param string $operation
+   *   The disallowed entity operation.
    *
-   * @throws \Symfony\Component\HttpKernel\Exception\HttpException
-   *   If validation errors are found.
+   * @return string
+   *   The proper message to display in the AccessDeniedHttpException.
    */
-  protected function validate(EntityInterface $entity) {
-    // @todo Remove when https://www.drupal.org/node/2164373 is committed.
-    if (!$entity instanceof FieldableEntityInterface) {
-      return;
-    }
-    $violations = $entity->validate();
+  protected function generateFallbackAccessDeniedMessage(EntityInterface $entity, $operation) {
+    $message = "You are not authorized to {$operation} this {$entity->getEntityTypeId()} entity";
 
-    // Remove violations of inaccessible fields as they cannot stem from our
-    // changes.
-    $violations->filterByFieldAccess();
-
-    if (count($violations) > 0) {
-      $message = "Unprocessable Entity: validation failed.\n";
-      foreach ($violations as $violation) {
-        $message .= $violation->getPropertyPath() . ': ' . $violation->getMessage() . "\n";
-      }
-      // Instead of returning a generic 400 response we use the more specific
-      // 422 Unprocessable Entity code from RFC 4918. That way clients can
-      // distinguish between general syntax errors in bad serializations (code
-      // 400) and semantic errors in well-formed requests (code 422).
-      throw new HttpException(422, $message);
+    if ($entity->bundle() !== $entity->getEntityTypeId()) {
+      $message .= " of bundle {$entity->bundle()}";
     }
+    return "{$message}.";
   }
 
   /**
@@ -331,7 +380,7 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
     $route = parent::getBaseRoute($canonical_path, $method);
     $definition = $this->getPluginDefinition();
 
-    $parameters = $route->getOption('parameters') ?: array();
+    $parameters = $route->getOption('parameters') ?: [];
     $parameters[$definition['entity_type']]['type'] = 'entity:' . $definition['entity_type'];
     $route->setOption('parameters', $parameters);
 
@@ -371,4 +420,35 @@ class EntityResource extends ResourceBase implements DependentPluginInterface {
     }
   }
 
+  /**
+   * Adds link headers to a response.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity.
+   * @param \Symfony\Component\HttpFoundation\Response $response
+   *   The response.
+   *
+   * @see https://tools.ietf.org/html/rfc5988#section-5
+   */
+  protected function addLinkHeaders(EntityInterface $entity, Response $response) {
+    foreach ($entity->getEntityType()->getLinkTemplates() as $relation_name => $link_template) {
+      if ($definition = $this->linkRelationTypeManager->getDefinition($relation_name, FALSE)) {
+        $generator_url = $entity->toUrl($relation_name)
+          ->setAbsolute(TRUE)
+          ->toString(TRUE);
+        if ($response instanceof CacheableResponseInterface) {
+          $response->addCacheableDependency($generator_url);
+        }
+        $uri = $generator_url->getGeneratedUrl();
+        $relationship = $relation_name;
+        if (!empty($definition['uri'])) {
+          $relationship = $definition['uri'];
+        }
+
+        $link_header = '<' . $uri . '>; rel="' . $relationship . '"';
+        $response->headers->set('Link', $link_header, FALSE);
+      }
+    }
+  }
+
 }
diff --git a/web/core/modules/rest/src/Plugin/rest/resource/EntityResourceAccessTrait.php b/web/core/modules/rest/src/Plugin/rest/resource/EntityResourceAccessTrait.php
new file mode 100644
index 000000000..7bf8e824e
--- /dev/null
+++ b/web/core/modules/rest/src/Plugin/rest/resource/EntityResourceAccessTrait.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\rest\Plugin\rest\resource;
+
+use Drupal\Core\Entity\EntityInterface;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+
+/**
+ * @internal
+ * @todo Consider making public in https://www.drupal.org/node/2300677
+ */
+trait EntityResourceAccessTrait {
+
+  /**
+   * Performs edit access checks for fields.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity whose fields edit access should be checked for.
+   *
+   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+   *   Throws access denied when the user does not have permissions to edit a
+   *   field.
+   */
+  protected function checkEditFieldAccess(EntityInterface $entity) {
+    // Only check 'edit' permissions for fields that were actually submitted by
+    // the user. Field access makes no difference between 'create' and 'update',
+    // so the 'edit' operation is used here.
+    foreach ($entity->_restSubmittedFields as $key => $field_name) {
+      if (!$entity->get($field_name)->access('edit')) {
+        throw new AccessDeniedHttpException("Access denied on creating field '$field_name'.");
+      }
+    }
+  }
+
+}
diff --git a/web/core/modules/rest/src/Plugin/rest/resource/EntityResourceValidationTrait.php b/web/core/modules/rest/src/Plugin/rest/resource/EntityResourceValidationTrait.php
new file mode 100644
index 000000000..09b4b64ba
--- /dev/null
+++ b/web/core/modules/rest/src/Plugin/rest/resource/EntityResourceValidationTrait.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Drupal\rest\Plugin\rest\resource;
+
+use Drupal\Component\Render\PlainTextOutput;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+
+/**
+ * @internal
+ * @todo Consider making public in https://www.drupal.org/node/2300677
+ */
+trait EntityResourceValidationTrait {
+
+  /**
+   * Verifies that the whole entity does not violate any validation constraints.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity to validate.
+   *
+   * @throws \Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException
+   *   If validation errors are found.
+   */
+  protected function validate(EntityInterface $entity) {
+    // @todo Remove when https://www.drupal.org/node/2164373 is committed.
+    if (!$entity instanceof FieldableEntityInterface) {
+      return;
+    }
+    $violations = $entity->validate();
+
+    // Remove violations of inaccessible fields as they cannot stem from our
+    // changes.
+    $violations->filterByFieldAccess();
+
+    if ($violations->count() > 0) {
+      $message = "Unprocessable Entity: validation failed.\n";
+      foreach ($violations as $violation) {
+        // We strip every HTML from the error message to have a nicer to read
+        // message on REST responses.
+        $message .= $violation->getPropertyPath() . ': ' . PlainTextOutput::renderFromHtml($violation->getMessage()) . "\n";
+      }
+      throw new UnprocessableEntityHttpException($message);
+    }
+  }
+
+}
diff --git a/web/core/modules/rest/src/Plugin/views/display/RestExport.php b/web/core/modules/rest/src/Plugin/views/display/RestExport.php
index 1a7a7f1a7..15abaa6fd 100644
--- a/web/core/modules/rest/src/Plugin/views/display/RestExport.php
+++ b/web/core/modules/rest/src/Plugin/views/display/RestExport.php
@@ -14,6 +14,7 @@ use Drupal\views\Render\ViewsRenderPipelineMarkup;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\PathPluginBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
@@ -265,21 +266,21 @@ class RestExport extends PathPluginBase implements ResponseDisplayPluginInterfac
     // Hide some settings, as they aren't useful for pure data output.
     unset($options['show_admin_links'], $options['analyze-theme']);
 
-    $categories['path'] = array(
+    $categories['path'] = [
       'title' => $this->t('Path settings'),
       'column' => 'second',
-      'build' => array(
+      'build' => [
         '#weight' => -10,
-      ),
-    );
+      ],
+    ];
 
     $options['path']['category'] = 'path';
     $options['path']['title'] = $this->t('Path');
-    $options['auth'] = array(
+    $options['auth'] = [
       'category' => 'path',
       'title' => $this->t('Authentication'),
       'value' => views_ui_truncate($auth, 24),
-    );
+    ];
 
     // Remove css/exposed form settings, as they are not used for the data
     // display.
@@ -295,13 +296,13 @@ class RestExport extends PathPluginBase implements ResponseDisplayPluginInterfac
     parent::buildOptionsForm($form, $form_state);
     if ($form_state->get('section') === 'auth') {
       $form['#title'] .= $this->t('The supported authentication methods for this view');
-      $form['auth'] = array(
+      $form['auth'] = [
         '#type' => 'checkboxes',
         '#title' => $this->t('Authentication methods'),
-        '#description' => $this->t('These are the supported authentication providers for this view. When this view is requested, the client will be forced to authenticate with one of the selected providers. Make sure you set the appropiate requirements at the <em>Access</em> section since the Authentication System will fallback to the anonymous user if it fails to authenticate. For example: require Access: Role | Authenticated User.'),
+        '#description' => $this->t('These are the supported authentication providers for this view. When this view is requested, the client will be forced to authenticate with one of the selected providers. Make sure you set the appropriate requirements at the <em>Access</em> section since the Authentication System will fallback to the anonymous user if it fails to authenticate. For example: require Access: Role | Authenticated User.'),
         '#options' => $this->getAuthOptions(),
         '#default_value' => $this->getOption('auth'),
-      );
+      ];
     }
   }
 
@@ -347,6 +348,26 @@ class RestExport extends PathPluginBase implements ResponseDisplayPluginInterfac
     }
   }
 
+  /**
+   * Determines whether the view overrides the given route.
+   *
+   * @param string $view_path
+   *   The path of the view.
+   * @param \Symfony\Component\Routing\Route $view_route
+   *   The route of the view.
+   * @param \Symfony\Component\Routing\Route $route
+   *   The route itself.
+   *
+   * @return bool
+   *   TRUE, when the view should override the given route.
+   */
+  protected function overrideApplies($view_path, Route $view_route, Route $route) {
+    $route_formats = explode('|', $route->getRequirement('_format'));
+    $view_route_formats = explode('|', $view_route->getRequirement('_format'));
+    return $this->overrideAppliesPathAndMethod($view_path, $view_route, $route)
+      && (!$route->hasRequirement('_format') || array_intersect($route_formats, $view_route_formats) != []);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -385,7 +406,7 @@ class RestExport extends PathPluginBase implements ResponseDisplayPluginInterfac
    * {@inheritdoc}
    */
   public function render() {
-    $build = array();
+    $build = [];
     $build['#markup'] = $this->renderer->executeInRenderContext(new RenderContext(), function() {
       return $this->view->style_plugin->render();
     });
diff --git a/web/core/modules/rest/src/Plugin/views/row/DataFieldRow.php b/web/core/modules/rest/src/Plugin/views/row/DataFieldRow.php
index 8cebb738d..175db17b5 100644
--- a/web/core/modules/rest/src/Plugin/views/row/DataFieldRow.php
+++ b/web/core/modules/rest/src/Plugin/views/row/DataFieldRow.php
@@ -31,14 +31,14 @@ class DataFieldRow extends RowPluginBase {
    *
    * @var array
    */
-  protected $replacementAliases = array();
+  protected $replacementAliases = [];
 
   /**
    * Stores an array of options to determine if the raw field output is used.
    *
    * @var array
    */
-  protected $rawOutputOptions = array();
+  protected $rawOutputOptions = [];
 
   /**
    * {@inheritdoc}
@@ -61,7 +61,7 @@ class DataFieldRow extends RowPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['field_options'] = array('default' => array());
+    $options['field_options'] = ['default' => []];
 
     return $options;
   }
@@ -72,12 +72,12 @@ class DataFieldRow extends RowPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['field_options'] = array(
+    $form['field_options'] = [
       '#type' => 'table',
-      '#header' => array($this->t('Field'), $this->t('Alias'), $this->t('Raw output')),
+      '#header' => [$this->t('Field'), $this->t('Alias'), $this->t('Raw output')],
       '#empty' => $this->t('You have no fields. Add some to your view.'),
       '#tree' => TRUE,
-    );
+    ];
 
     $options = $this->options['field_options'];
 
@@ -87,22 +87,22 @@ class DataFieldRow extends RowPluginBase {
         if (!empty($field['exclude'])) {
           continue;
         }
-        $form['field_options'][$id]['field'] = array(
+        $form['field_options'][$id]['field'] = [
           '#markup' => $id,
-        );
-        $form['field_options'][$id]['alias'] = array(
-          '#title' => $this->t('Alias for @id', array('@id' => $id)),
+        ];
+        $form['field_options'][$id]['alias'] = [
+          '#title' => $this->t('Alias for @id', ['@id' => $id]),
           '#title_display' => 'invisible',
           '#type' => 'textfield',
           '#default_value' => isset($options[$id]['alias']) ? $options[$id]['alias'] : '',
-          '#element_validate' => array(array($this, 'validateAliasName')),
-        );
-        $form['field_options'][$id]['raw_output'] = array(
-          '#title' => $this->t('Raw output for @id', array('@id' => $id)),
+          '#element_validate' => [[$this, 'validateAliasName']],
+        ];
+        $form['field_options'][$id]['raw_output'] = [
+          '#title' => $this->t('Raw output for @id', ['@id' => $id]),
           '#title_display' => 'invisible',
           '#type' => 'checkbox',
           '#default_value' => isset($options[$id]['raw_output']) ? $options[$id]['raw_output'] : '',
-        );
+        ];
       }
     }
   }
@@ -121,7 +121,7 @@ class DataFieldRow extends RowPluginBase {
    */
   public function validateOptionsForm(&$form, FormStateInterface $form_state) {
     // Collect an array of aliases to validate.
-    $aliases = static::extractFromOptionsArray('alias', $form_state->getValue(array('row_options', 'field_options')));
+    $aliases = static::extractFromOptionsArray('alias', $form_state->getValue(['row_options', 'field_options']));
 
     // If array filter returns empty, no values have been entered. Unique keys
     // should only be validated if we have some.
@@ -134,7 +134,7 @@ class DataFieldRow extends RowPluginBase {
    * {@inheritdoc}
    */
   public function render($row) {
-    $output = array();
+    $output = [];
 
     foreach ($this->view->field as $id => $field) {
       // If the raw output option has been set, just get the raw value.
diff --git a/web/core/modules/rest/src/Plugin/views/style/Serializer.php b/web/core/modules/rest/src/Plugin/views/style/Serializer.php
index 7e9b4331e..895b9fe1a 100644
--- a/web/core/modules/rest/src/Plugin/views/style/Serializer.php
+++ b/web/core/modules/rest/src/Plugin/views/style/Serializer.php
@@ -45,7 +45,7 @@ class Serializer extends StylePluginBase implements CacheableDependencyInterface
    *
    * @var array
    */
-  protected $formats = array();
+  protected $formats = [];
 
   /**
    * The serialization format providers, keyed by format.
@@ -85,7 +85,7 @@ class Serializer extends StylePluginBase implements CacheableDependencyInterface
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['formats'] = array('default' => array());
+    $options['formats'] = ['default' => []];
 
     return $options;
   }
@@ -96,13 +96,13 @@ class Serializer extends StylePluginBase implements CacheableDependencyInterface
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['formats'] = array(
+    $form['formats'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Accepted request formats'),
       '#description' => $this->t('Request formats that will be allowed in responses. If none are selected all formats will be allowed.'),
       '#options' => $this->getFormatOptions(),
       '#default_value' => $this->options['formats'],
-    );
+    ];
   }
 
   /**
@@ -111,15 +111,15 @@ class Serializer extends StylePluginBase implements CacheableDependencyInterface
   public function submitOptionsForm(&$form, FormStateInterface $form_state) {
     parent::submitOptionsForm($form, $form_state);
 
-    $formats = $form_state->getValue(array('style_options', 'formats'));
-    $form_state->setValue(array('style_options', 'formats'), array_filter($formats));
+    $formats = $form_state->getValue(['style_options', 'formats']);
+    $form_state->setValue(['style_options', 'formats'], array_filter($formats));
   }
 
   /**
    * {@inheritdoc}
    */
   public function render() {
-    $rows = array();
+    $rows = [];
     // If the Data Entity row plugin is used, this will be an array of entities
     // which will pass through Serializer to one of the registered Normalizers,
     // which will transform it to arrays/scalars. If the Data field row plugin
diff --git a/web/core/modules/rest/src/RequestHandler.php b/web/core/modules/rest/src/RequestHandler.php
index 088dca298..dd8e31a67 100644
--- a/web/core/modules/rest/src/RequestHandler.php
+++ b/web/core/modules/rest/src/RequestHandler.php
@@ -2,22 +2,22 @@
 
 namespace Drupal\rest;
 
+use Drupal\Core\Cache\CacheableResponseInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Cache\CacheableResponseInterface;
-use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-use Symfony\Component\Serializer\SerializerInterface;
 
 /**
  * Acts as intermediate request forwarder for resource plugins.
+ *
+ * @see \Drupal\rest\EventSubscriber\ResourceResponseSubscriber
  */
 class RequestHandler implements ContainerAwareInterface, ContainerInjectionInterface {
 
@@ -98,18 +98,16 @@ class RequestHandler implements ContainerAwareInterface, ContainerInjectionInter
         $definition = $resource->getPluginDefinition();
         try {
           if (!empty($definition['serialization_class'])) {
-            $unserialized = $serializer->deserialize($received, $definition['serialization_class'], $format, array('request_method' => $method));
+            $unserialized = $serializer->deserialize($received, $definition['serialization_class'], $format, ['request_method' => $method]);
           }
           // If the plugin does not specify a serialization class just decode
           // the received data.
           else {
-            $unserialized = $serializer->decode($received, $format, array('request_method' => $method));
+            $unserialized = $serializer->decode($received, $format, ['request_method' => $method]);
           }
         }
         catch (UnexpectedValueException $e) {
-          $error['error'] = $e->getMessage();
-          $content = $serializer->serialize($error, $format);
-          return new Response($content, 400, array('Content-Type' => $request->getMimeType($format)));
+          throw new BadRequestHttpException($e->getMessage());
         }
       }
       else {
@@ -120,7 +118,7 @@ class RequestHandler implements ContainerAwareInterface, ContainerInjectionInter
     // Determine the request parameters that should be passed to the resource
     // plugin.
     $route_parameters = $route_match->getParameters();
-    $parameters = array();
+    $parameters = [];
     // Filter out all internal parameters starting with "_".
     foreach ($route_parameters as $key => $parameter) {
       if ($key{0} !== '_') {
@@ -129,118 +127,13 @@ class RequestHandler implements ContainerAwareInterface, ContainerInjectionInter
     }
 
     // Invoke the operation on the resource plugin.
-    $format = $this->getResponseFormat($route_match, $request);
-    $response = call_user_func_array(array($resource, $method), array_merge($parameters, array($unserialized, $request)));
-
-    return $response instanceof ResourceResponseInterface ?
-      $this->renderResponse($request, $response, $serializer, $format, $resource_config) :
-      $response;
-  }
-
-  /**
-   * Determines the format to respond in.
-   *
-   * Respects the requested format if one is specified. However, it is common to
-   * forget to specify a request format in case of a POST or PATCH. Rather than
-   * simply throwing an error, we apply the robustness principle: when POSTing
-   * or PATCHing using a certain format, you probably expect a response in that
-   * same format.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *   The current route match.
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The current request.
-   *
-   * @return string
-   *   The response format.
-   */
-  protected function getResponseFormat(RouteMatchInterface $route_match, Request $request) {
-    $route = $route_match->getRouteObject();
-    $acceptable_request_formats = $route->hasRequirement('_format') ? explode('|', $route->getRequirement('_format')) : [];
-    $acceptable_content_type_formats = $route->hasRequirement('_content_type_format') ? explode('|', $route->getRequirement('_content_type_format')) : [];
-    $acceptable_formats = $request->isMethodSafe() ? $acceptable_request_formats : $acceptable_content_type_formats;
-
-    $requested_format = $request->getRequestFormat();
-    $content_type_format = $request->getContentType();
-
-    // If an acceptable format is requested, then use that. Otherwise, including
-    // and particularly when the client forgot to specify a format, then use
-    // heuristics to select the format that is most likely expected.
-    if (in_array($requested_format, $acceptable_formats)) {
-      return $requested_format;
-    }
-    // If a request body is present, then use the format corresponding to the
-    // request body's Content-Type for the response, if it's an acceptable
-    // format for the request.
-    elseif (!empty($request->getContent()) && in_array($content_type_format, $acceptable_content_type_formats)) {
-      return $content_type_format;
-    }
-    // Otherwise, use the first acceptable format.
-    elseif (!empty($acceptable_formats)) {
-      return $acceptable_formats[0];
-    }
-    // Sometimes, there are no acceptable formats, e.g. DELETE routes.
-    else {
-      return NULL;
-    }
-  }
-
-  /**
-   * Renders a resource response.
-   *
-   * Serialization can invoke rendering (e.g., generating URLs), but the
-   * serialization API does not provide a mechanism to collect the
-   * bubbleable metadata associated with that (e.g., language and other
-   * contexts), so instead, allow those to "leak" and collect them here in
-   * a render context.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request object.
-   * @param \Drupal\rest\ResourceResponseInterface $response
-   *   The response from the REST resource.
-   * @param \Symfony\Component\Serializer\SerializerInterface $serializer
-   *   The serializer to use.
-   * @param string|null $format
-   *   The response format, or NULL in case the response does not need a format,
-   *   for example for the response to a DELETE request.
-   * @param \Drupal\rest\RestResourceConfigInterface $resource_config
-   *   The resource config.
-   *
-   * @return \Drupal\rest\ResourceResponse
-   *   The altered response.
-   *
-   * @todo Add test coverage for language negotiation contexts in
-   *   https://www.drupal.org/node/2135829.
-   */
-  protected function renderResponse(Request $request, ResourceResponseInterface $response, SerializerInterface $serializer, $format, RestResourceConfigInterface $resource_config) {
-    $data = $response->getResponseData();
+    $response = call_user_func_array([$resource, $method], array_merge($parameters, [$unserialized, $request]));
 
     if ($response instanceof CacheableResponseInterface) {
       // Add rest config's cache tags.
       $response->addCacheableDependency($resource_config);
     }
 
-    // If there is data to send, serialize and set it as the response body.
-    if ($data !== NULL) {
-      if ($response instanceof CacheableResponseInterface) {
-        $context = new RenderContext();
-        $output = $this->container->get('renderer')
-          ->executeInRenderContext($context, function () use ($serializer, $data, $format) {
-            return $serializer->serialize($data, $format);
-          });
-
-        if (!$context->isEmpty()) {
-          $response->addCacheableDependency($context->pop());
-        }
-      }
-      else {
-        $output = $serializer->serialize($data, $format);
-      }
-
-      $response->setContent($output);
-      $response->headers->set('Content-Type', $request->getMimeType($format));
-    }
-
     return $response;
   }
 
diff --git a/web/core/modules/rest/src/ResourceResponse.php b/web/core/modules/rest/src/ResourceResponse.php
index d4279a4c9..eb955c293 100644
--- a/web/core/modules/rest/src/ResourceResponse.php
+++ b/web/core/modules/rest/src/ResourceResponse.php
@@ -31,7 +31,7 @@ class ResourceResponse extends Response implements CacheableResponseInterface, R
    * @param array $headers
    *   An array of response headers.
    */
-  public function __construct($data = NULL, $status = 200, $headers = array()) {
+  public function __construct($data = NULL, $status = 200, $headers = []) {
     $this->responseData = $data;
     parent::__construct('', $status, $headers);
   }
diff --git a/web/core/modules/rest/src/RestServiceProvider.php b/web/core/modules/rest/src/RestServiceProvider.php
new file mode 100644
index 000000000..ca6b14b76
--- /dev/null
+++ b/web/core/modules/rest/src/RestServiceProvider.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\rest;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\DependencyInjection\ServiceProviderInterface;
+use Drupal\rest\LinkManager\LinkManager;
+use Drupal\rest\LinkManager\RelationLinkManager;
+use Drupal\rest\LinkManager\TypeLinkManager;
+use Symfony\Component\DependencyInjection\DefinitionDecorator;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Provides BC services.
+ *
+ * These services are not added via rest.services.yml because the service
+ * classes extend classes from the HAL module. They also have no use without
+ * that module.
+ */
+class RestServiceProvider implements ServiceProviderInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function register(ContainerBuilder $container) {
+    $modules = $container->getParameter(('container.modules'));
+    if (isset($modules['hal'])) {
+      // @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+      //   Use hal.link_manager instead.
+      $service_definition = new DefinitionDecorator(new Reference('hal.link_manager'));
+      $service_definition->setClass(LinkManager::class);
+      $container->setDefinition('rest.link_manager', $service_definition);
+
+      // @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+      //   Use hal.link_manager.type instead.
+      $service_definition = new DefinitionDecorator(new Reference('hal.link_manager.type'));
+      $service_definition->setClass(TypeLinkManager::class);
+      $container->setDefinition('rest.link_manager.type', $service_definition);
+
+      // @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+      //   Use hal.link_manager.relation instead.
+      $service_definition = new DefinitionDecorator(new Reference('hal.link_manager.relation'));
+      $service_definition->setClass(RelationLinkManager::class);
+      $container->setDefinition('rest.link_manager.relation', $service_definition);
+    }
+  }
+
+}
diff --git a/web/core/modules/rest/src/Routing/ResourceRoutes.php b/web/core/modules/rest/src/Routing/ResourceRoutes.php
index 8aedfba59..6aec267db 100644
--- a/web/core/modules/rest/src/Routing/ResourceRoutes.php
+++ b/web/core/modules/rest/src/Routing/ResourceRoutes.php
@@ -59,13 +59,14 @@ class ResourceRoutes extends RouteSubscriberBase {
    * @return array
    */
   protected function alterRoutes(RouteCollection $collection) {
-    // Iterate over all enabled REST resource configs.
+    // Iterate over all enabled REST resource config entities.
     /** @var \Drupal\rest\RestResourceConfigInterface[] $resource_configs */
     $resource_configs = $this->resourceConfigStorage->loadMultiple();
-    // Iterate over all enabled resource plugins.
     foreach ($resource_configs as $resource_config) {
-      $resource_routes = $this->getRoutesForResourceConfig($resource_config);
-      $collection->addCollection($resource_routes);
+      if ($resource_config->status()) {
+        $resource_routes = $this->getRoutesForResourceConfig($resource_config);
+        $collection->addCollection($resource_routes);
+      }
     }
   }
 
@@ -95,13 +96,13 @@ class ResourceRoutes extends RouteSubscriberBase {
 
         // Check that authentication providers are defined.
         if (empty($rest_resource_config->getAuthenticationProviders($method))) {
-          $this->logger->error('At least one authentication provider must be defined for resource @id', array(':id' => $rest_resource_config->id()));
+          $this->logger->error('At least one authentication provider must be defined for resource @id', [':id' => $rest_resource_config->id()]);
           continue;
         }
 
         // Check that formats are defined.
         if (empty($rest_resource_config->getFormats($method))) {
-          $this->logger->error('At least one format must be defined for resource @id', array(':id' => $rest_resource_config->id()));
+          $this->logger->error('At least one format must be defined for resource @id', [':id' => $rest_resource_config->id()]);
           continue;
         }
 
diff --git a/web/core/modules/rest/src/Tests/RESTTestBase.php b/web/core/modules/rest/src/Tests/RESTTestBase.php
index c755967ea..40a9fe2f3 100644
--- a/web/core/modules/rest/src/Tests/RESTTestBase.php
+++ b/web/core/modules/rest/src/Tests/RESTTestBase.php
@@ -2,10 +2,13 @@
 
 namespace Drupal\rest\Tests;
 
+use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Config\Entity\ConfigEntityType;
 use Drupal\node\NodeInterface;
 use Drupal\rest\RestResourceConfigInterface;
 use Drupal\simpletest\WebTestBase;
+use GuzzleHttp\Cookie\FileCookieJar;
+use GuzzleHttp\Cookie\SetCookie;
 
 /**
  * Test helper class that provides a REST client method to send HTTP requests.
@@ -62,18 +65,57 @@ abstract class RESTTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('rest', 'entity_test');
+  public static $modules = ['rest', 'entity_test'];
+
+  /**
+   * The last response.
+   *
+   * @var \Psr\Http\Message\ResponseInterface
+   */
+  protected $response;
 
   protected function setUp() {
     parent::setUp();
     $this->defaultFormat = 'hal_json';
     $this->defaultMimeType = 'application/hal+json';
-    $this->defaultAuth = array('cookie');
+    $this->defaultAuth = ['cookie'];
     $this->resourceConfigStorage = $this->container->get('entity_type.manager')->getStorage('rest_resource_config');
     // Create a test content type for node testing.
     if (in_array('node', static::$modules)) {
-      $this->drupalCreateContentType(array('name' => 'resttest', 'type' => 'resttest'));
+      $this->drupalCreateContentType(['name' => 'resttest', 'type' => 'resttest']);
     }
+
+    $this->cookieFile = $this->publicFilesDirectory . '/cookie.jar';
+  }
+
+  /**
+   * Calculates cookies used by guzzle later.
+   *
+   * @return \GuzzleHttp\Cookie\CookieJarInterface
+   *   The used CURL options in guzzle.
+   */
+  protected function cookies() {
+    $cookies = [];
+
+    foreach ($this->cookies as $key => $cookie) {
+      $cookies[$key][] = $cookie['value'];
+    }
+
+    $request = \Drupal::request();
+    $cookies = NestedArray::mergeDeep($cookies, $this->extractCookiesFromRequest($request));
+
+    $cookie_jar = new FileCookieJar($this->cookieFile);
+    foreach ($cookies as $key => $cookie_values) {
+      foreach ($cookie_values as $cookie_value) {
+        // setcookie() sets the value of a cookie to be deleted, when its gonna
+        // be removed.
+        if ($cookie_value !== 'deleted') {
+          $cookie_jar->setCookie(new SetCookie(['Name' => $key, 'Value' => $cookie_value, 'Domain' => $request->getHost()]));
+        }
+      }
+    }
+
+    return $cookie_jar;
   }
 
   /**
@@ -100,118 +142,137 @@ abstract class RESTTestBase extends WebTestBase {
     if (!isset($mime_type)) {
       $mime_type = $this->defaultMimeType;
     }
-    if (!in_array($method, array('GET', 'HEAD', 'OPTIONS', 'TRACE'))) {
+    if (!in_array($method, ['GET', 'HEAD', 'OPTIONS', 'TRACE'])) {
       // GET the CSRF token first for writing requests.
       $requested_token = $this->drupalGet('session/token');
     }
 
+    $client = \Drupal::httpClient();
     $url = $this->buildUrl($url);
 
-    $curl_options = array();
+    $options = [
+      'http_errors' => FALSE,
+      'cookies' => $this->cookies(),
+      'curl' => [
+        CURLOPT_HEADERFUNCTION => [&$this, 'curlHeaderCallback'],
+      ],
+    ];
     switch ($method) {
       case 'GET':
-        // Set query if there are additional GET parameters.
-        $curl_options = array(
-          CURLOPT_HTTPGET => TRUE,
-          CURLOPT_CUSTOMREQUEST => 'GET',
-          CURLOPT_URL => $url,
-          CURLOPT_NOBODY => FALSE,
-          CURLOPT_HTTPHEADER => array('Accept: ' . $mime_type),
-        );
+        $options += [
+          'headers' => [
+            'Accept' => $mime_type,
+          ],
+        ];
+        $response = $client->get($url, $options);
         break;
 
       case 'HEAD':
-        $curl_options = array(
-          CURLOPT_HTTPGET => FALSE,
-          CURLOPT_CUSTOMREQUEST => 'HEAD',
-          CURLOPT_URL => $url,
-          CURLOPT_NOBODY => TRUE,
-          CURLOPT_HTTPHEADER => array('Accept: ' . $mime_type),
-        );
+        $response = $client->head($url, $options);
         break;
 
       case 'POST':
-        $curl_options = array(
-          CURLOPT_HTTPGET => FALSE,
-          CURLOPT_POST => TRUE,
-          CURLOPT_POSTFIELDS => $body,
-          CURLOPT_URL => $url,
-          CURLOPT_NOBODY => FALSE,
-          CURLOPT_HTTPHEADER => $csrf_token !== FALSE ? array(
-            'Content-Type: ' . $mime_type,
-            'X-CSRF-Token: ' . ($csrf_token === NULL ? $requested_token : $csrf_token),
-          ) : array(
-            'Content-Type: ' . $mime_type,
-          ),
-        );
+        $options += [
+          'headers' => $csrf_token !== FALSE ? [
+            'Content-Type' => $mime_type,
+            'X-CSRF-Token' => ($csrf_token === NULL ? $requested_token : $csrf_token),
+          ] : [
+            'Content-Type' => $mime_type,
+          ],
+          'body' => $body,
+        ];
+        $response = $client->post($url, $options);
         break;
 
       case 'PUT':
-        $curl_options = array(
-          CURLOPT_HTTPGET => FALSE,
-          CURLOPT_CUSTOMREQUEST => 'PUT',
-          CURLOPT_POSTFIELDS => $body,
-          CURLOPT_URL => $url,
-          CURLOPT_NOBODY => FALSE,
-          CURLOPT_HTTPHEADER => $csrf_token !== FALSE ? array(
-            'Content-Type: ' . $mime_type,
-            'X-CSRF-Token: ' . ($csrf_token === NULL ? $requested_token : $csrf_token),
-          ) : array(
-            'Content-Type: ' . $mime_type,
-          ),
-        );
+        $options += [
+          'headers' => $csrf_token !== FALSE ? [
+            'Content-Type' => $mime_type,
+            'X-CSRF-Token' => ($csrf_token === NULL ? $requested_token : $csrf_token),
+          ] : [
+            'Content-Type' => $mime_type,
+          ],
+          'body' => $body,
+        ];
+        $response = $client->put($url, $options);
         break;
 
       case 'PATCH':
-        $curl_options = array(
-          CURLOPT_HTTPGET => FALSE,
-          CURLOPT_CUSTOMREQUEST => 'PATCH',
-          CURLOPT_POSTFIELDS => $body,
-          CURLOPT_URL => $url,
-          CURLOPT_NOBODY => FALSE,
-          CURLOPT_HTTPHEADER => $csrf_token !== FALSE ? array(
-            'Content-Type: ' . $mime_type,
-            'X-CSRF-Token: ' . ($csrf_token === NULL ? $requested_token : $csrf_token),
-          ) : array(
-            'Content-Type: ' . $mime_type,
-          ),
-        );
+        $options += [
+          'headers' => $csrf_token !== FALSE ? [
+            'Content-Type' => $mime_type,
+            'X-CSRF-Token' => ($csrf_token === NULL ? $requested_token : $csrf_token),
+          ] : [
+            'Content-Type' => $mime_type,
+          ],
+          'body' => $body,
+        ];
+        $response = $client->patch($url, $options);
         break;
 
       case 'DELETE':
-        $curl_options = array(
-          CURLOPT_HTTPGET => FALSE,
-          CURLOPT_CUSTOMREQUEST => 'DELETE',
-          CURLOPT_URL => $url,
-          CURLOPT_NOBODY => FALSE,
-          CURLOPT_HTTPHEADER => $csrf_token !== FALSE ? array(
-            'X-CSRF-Token: ' . ($csrf_token === NULL ? $requested_token : $csrf_token),
-          ) : array(),
-        );
+        $options += [
+          'headers' => $csrf_token !== FALSE ? [
+            'Content-Type' => $mime_type,
+            'X-CSRF-Token' => ($csrf_token === NULL ? $requested_token : $csrf_token),
+          ] : [],
+        ];
+        $response = $client->delete($url, $options);
         break;
     }
 
-    if ($mime_type === 'none') {
-      unset($curl_options[CURLOPT_HTTPHEADER]['Content-Type']);
-    }
-
-    $this->responseBody = $this->curlExec($curl_options);
+    $this->response = $response;
+    $this->responseBody = (string) $response->getBody();
+    $this->setRawContent($this->responseBody);
 
     // Ensure that any changes to variables in the other thread are picked up.
     $this->refreshVariables();
 
-    $headers = $this->drupalGetHeaders();
-
     $this->verbose($method . ' request to: ' . $url .
-      '<hr />Code: ' . curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE) .
-      (isset($curl_options[CURLOPT_HTTPHEADER]) ? '<hr />Request headers: ' . nl2br(print_r($curl_options[CURLOPT_HTTPHEADER], TRUE)) : '' ) .
-      (isset($curl_options[CURLOPT_POSTFIELDS]) ? '<hr />Request body: ' . nl2br(print_r($curl_options[CURLOPT_POSTFIELDS], TRUE)) : '' ) .
-      '<hr />Response headers: ' . nl2br(print_r($headers, TRUE)) .
+      '<hr />Code: ' . $this->response->getStatusCode() .
+      (isset($options['headers']) ? '<hr />Request headers: ' . nl2br(print_r($options['headers'], TRUE)) : '') .
+      (isset($options['body']) ? '<hr />Request body: ' . nl2br(print_r($options['body'], TRUE)) : '') .
+      '<hr />Response headers: ' . nl2br(print_r($response->getHeaders(), TRUE)) .
       '<hr />Response body: ' . $this->responseBody);
 
     return $this->responseBody;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function assertResponse($code, $message = '', $group = 'Browser') {
+    if (!isset($this->response)) {
+      return parent::assertResponse($code, $message, $group);
+    }
+    return $this->assertEqual($code, $this->response->getStatusCode(), $message ? $message : "HTTP response expected $code, actual {$this->response->getStatusCode()}", $group);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function drupalGetHeaders($all_requests = FALSE) {
+    if (!isset($this->response)) {
+      return parent::drupalGetHeaders($all_requests);
+    }
+    $lowercased_keys = array_map('strtolower', array_keys($this->response->getHeaders()));
+    return array_map(function (array $header) {
+      return implode(', ', $header);
+    }, array_combine($lowercased_keys, array_values($this->response->getHeaders())));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function drupalGetHeader($name, $all_requests = FALSE) {
+    if (!isset($this->response)) {
+      return parent::drupalGetHeader($name, $all_requests);
+    }
+    if ($header = $this->response->getHeader($name)) {
+      return implode(', ', $header);
+    }
+  }
+
   /**
    * Creates entity objects based on their types.
    *
@@ -242,28 +303,28 @@ abstract class RESTTestBase extends WebTestBase {
   protected function entityValues($entity_type_id) {
     switch ($entity_type_id) {
       case 'entity_test':
-        return array(
+        return [
           'name' => $this->randomMachineName(),
           'user_id' => 1,
-          'field_test_text' => array(0 => array(
+          'field_test_text' => [0 => [
             'value' => $this->randomString(),
             'format' => 'plain_text',
-          )),
-        );
+          ]],
+        ];
       case 'config_test':
         return [
           'id' => $this->randomMachineName(),
           'label' => 'Test label',
         ];
       case 'node':
-        return array('title' => $this->randomString(), 'type' => 'resttest');
+        return ['title' => $this->randomString(), 'type' => 'resttest'];
       case 'node_type':
-        return array(
+        return [
           'type' => 'article',
           'name' => $this->randomMachineName(),
-        );
+        ];
       case 'user':
-        return array('name' => $this->randomMachineName());
+        return ['name' => $this->randomMachineName()];
 
       case 'comment':
         return [
@@ -279,11 +340,20 @@ abstract class RESTTestBase extends WebTestBase {
           'vid' => 'tags',
           'name' => $this->randomMachineName(),
         ];
+      case 'block':
+        // Block placements depend on themes, ensure Bartik is installed.
+        $this->container->get('theme_installer')->install(['bartik']);
+        return [
+          'id' => strtolower($this->randomMachineName(8)),
+          'plugin' => 'system_powered_by_block',
+          'theme' => 'bartik',
+          'region' => 'header',
+        ];
       default:
         if ($this->isConfigEntity($entity_type_id)) {
           return $this->configEntityValues($entity_type_id);
         }
-        return array();
+        return [];
     }
   }
 
@@ -350,8 +420,7 @@ abstract class RESTTestBase extends WebTestBase {
    * Rebuilds routing caches.
    */
   protected function rebuildCache() {
-    // Rebuild routing cache, so that the REST API paths are available.
-    $this->container->get('router.builder')->rebuild();
+    $this->container->get('router.builder')->rebuildIfNeeded();
   }
 
   /**
@@ -362,6 +431,8 @@ abstract class RESTTestBase extends WebTestBase {
    * override it every time it is omitted.
    */
   protected function curlExec($curl_options, $redirect = FALSE) {
+    unset($this->response);
+
     if (!isset($curl_options[CURLOPT_CUSTOMREQUEST])) {
       if (!empty($curl_options[CURLOPT_HTTPGET])) {
         $curl_options[CURLOPT_CUSTOMREQUEST] = 'GET';
@@ -389,22 +460,22 @@ abstract class RESTTestBase extends WebTestBase {
       case 'entity_test':
         switch ($operation) {
           case 'view':
-            return array('view test entity');
+            return ['view test entity'];
           case 'create':
           case 'update':
           case 'delete':
-            return array('administer entity_test content');
+            return ['administer entity_test content'];
         }
       case 'node':
         switch ($operation) {
           case 'view':
-            return array('access content');
+            return ['access content'];
           case 'create':
-            return array('create resttest content');
+            return ['create resttest content'];
           case 'update':
-            return array('edit any resttest content');
+            return ['edit any resttest content'];
           case 'delete':
-            return array('delete any resttest content');
+            return ['delete any resttest content'];
         }
 
       case 'comment':
@@ -502,7 +573,7 @@ abstract class RESTTestBase extends WebTestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertResponseBody($expected, $message = '', $group = 'REST Response') {
-    return $this->assertIdentical($expected, $this->responseBody, $message ? $message : strtr('Response body @expected (expected) is equal to @response (actual).', array('@expected' => var_export($expected, TRUE), '@response' => var_export($this->responseBody, TRUE))), $group);
+    return $this->assertIdentical($expected, $this->responseBody, $message ? $message : strtr('Response body @expected (expected) is equal to @response (actual).', ['@expected' => var_export($expected, TRUE), '@response' => var_export($this->responseBody, TRUE)]), $group);
   }
 
   /**
diff --git a/web/core/modules/rest/src/Tests/ResourceTest.php b/web/core/modules/rest/src/Tests/ResourceTest.php
index 72bed0f4e..baf91e9ae 100644
--- a/web/core/modules/rest/src/Tests/ResourceTest.php
+++ b/web/core/modules/rest/src/Tests/ResourceTest.php
@@ -19,7 +19,7 @@ class ResourceTest extends RESTTestBase {
    *
    * @var array
    */
-  public static $modules = array('hal', 'rest', 'entity_test', 'rest_test');
+  public static $modules = ['hal', 'rest', 'entity_test', 'rest_test'];
 
   /**
    * The entity.
diff --git a/web/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php b/web/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php
index 2a910fe28..c3d2c2ed9 100644
--- a/web/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php
+++ b/web/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php
@@ -84,5 +84,4 @@ class ExcludedFieldTokenTest extends ViewTestBase {
     $this->assertIdentical($actual_json, json_encode($expected));
   }
 
-
 }
diff --git a/web/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/web/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
index 4c004fcaf..83a154848 100644
--- a/web/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
+++ b/web/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
@@ -40,14 +40,14 @@ class StyleSerializerTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'entity_test', 'hal', 'rest_test_views', 'node', 'text', 'field', 'language', 'basic_auth');
+  public static $modules = ['views_ui', 'entity_test', 'hal', 'rest_test_views', 'node', 'text', 'field', 'language', 'basic_auth'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_serializer_display_field', 'test_serializer_display_entity', 'test_serializer_display_entity_translated', 'test_serializer_node_display_field', 'test_serializer_node_exposed_filter');
+  public static $testViews = ['test_serializer_display_field', 'test_serializer_display_entity', 'test_serializer_display_entity_translated', 'test_serializer_node_display_field', 'test_serializer_node_exposed_filter'];
 
   /**
    * A user with administrative privileges to look at test entity and configure views.
@@ -57,13 +57,13 @@ class StyleSerializerTest extends PluginTestBase {
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('rest_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['rest_test_views']);
 
-    $this->adminUser = $this->drupalCreateUser(array('administer views', 'administer entity_test content', 'access user profiles', 'view test entity'));
+    $this->adminUser = $this->drupalCreateUser(['administer views', 'administer entity_test content', 'access user profiles', 'view test entity']);
 
     // Save some entity_test entities.
     for ($i = 1; $i <= 10; $i++) {
-      EntityTest::create(array('name' => 'test_' . $i, 'user_id' => $this->adminUser->id()))->save();
+      EntityTest::create(['name' => 'test_' . $i, 'user_id' => $this->adminUser->id()])->save();
     }
 
     $this->enableViewsTestModule();
@@ -122,9 +122,9 @@ class StyleSerializerTest extends PluginTestBase {
     $headers = $this->drupalGetHeaders();
     $this->assertEqual($headers['content-type'], 'application/json', 'The header Content-type is correct.');
 
-    $expected = array();
+    $expected = [];
     foreach ($view->result as $row) {
-      $expected_row = array();
+      $expected_row = [];
       foreach ($view->field as $id => $field) {
         $expected_row[$id] = $field->render($row);
       }
@@ -154,7 +154,7 @@ class StyleSerializerTest extends PluginTestBase {
     // Get the serializer service.
     $serializer = $this->container->get('serializer');
 
-    $entities = array();
+    $entities = [];
     foreach ($view->result as $row) {
       $entities[] = $row->_entity;
     }
@@ -180,15 +180,15 @@ class StyleSerializerTest extends PluginTestBase {
 
     // Change the default format to xml.
     $view->setDisplay('rest_export_1');
-    $view->getDisplay()->setOption('style', array(
+    $view->getDisplay()->setOption('style', [
       'type' => 'serializer',
-      'options' => array(
+      'options' => [
         'uses_fields' => FALSE,
-        'formats' => array(
+        'formats' => [
           'xml' => 'xml',
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     $view->save();
     $expected = $serializer->serialize($entities, 'xml');
     $actual_xml = $this->drupalGet('test/serialize/entity');
@@ -197,16 +197,16 @@ class StyleSerializerTest extends PluginTestBase {
 
     // Allow multiple formats.
     $view->setDisplay('rest_export_1');
-    $view->getDisplay()->setOption('style', array(
+    $view->getDisplay()->setOption('style', [
       'type' => 'serializer',
-      'options' => array(
+      'options' => [
         'uses_fields' => FALSE,
-        'formats' => array(
+        'formats' => [
           'xml' => 'xml',
           'json' => 'json',
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     $view->save();
     $expected = $serializer->serialize($entities, 'json');
     $actual_json = $this->drupalGetWithFormat('test/serialize/entity', 'json');
@@ -219,7 +219,7 @@ class StyleSerializerTest extends PluginTestBase {
   /**
    * Verifies site maintenance mode functionality.
    */
-  protected function testSiteMaintenance() {
+  public function testSiteMaintenance() {
     $view = Views::getView('test_serializer_display_field');
     $view->initDisplay();
     $this->executeView($view);
@@ -346,8 +346,8 @@ class StyleSerializerTest extends PluginTestBase {
     $style_options = 'admin/structure/views/nojs/display/test_serializer_display_field/rest_export_1/style_options';
 
     // Select only 'xml' as an accepted format.
-    $this->drupalPostForm($style_options, array('style_options[formats][xml]' => 'xml'), t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm($style_options, ['style_options[formats][xml]' => 'xml'], t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     // Should return a 406.
     $this->drupalGetWithFormat('test/serialize/field', 'json');
@@ -359,8 +359,8 @@ class StyleSerializerTest extends PluginTestBase {
     $this->assertResponse(200, 'A 200 response was returned when XML was requested.');
 
     // Add 'json' as an accepted format, so we have multiple.
-    $this->drupalPostForm($style_options, array('style_options[formats][json]' => 'json'), t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm($style_options, ['style_options[formats][json]' => 'json'], t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     // Should return a 200.
     // @todo This should be fixed when we have better content negotiation.
@@ -369,7 +369,7 @@ class StyleSerializerTest extends PluginTestBase {
     $this->assertResponse(200, 'A 200 response was returned when any format was requested.');
 
     // Should return a 200. Emulates a sample Firefox header.
-    $this->drupalGet('test/serialize/field', array(), array('Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'));
+    $this->drupalGet('test/serialize/field', [], ['Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8']);
     $this->assertHeader('content-type', 'application/json');
     $this->assertResponse(200, 'A 200 response was returned when a browser accept header was requested.');
 
@@ -393,7 +393,7 @@ class StyleSerializerTest extends PluginTestBase {
     $this->assertResponse(200, 'A 200 response was returned when HTML was requested.');
 
     // Now configure now format, so all of them should be allowed.
-    $this->drupalPostForm($style_options, array('style_options[formats][json]' => '0', 'style_options[formats][xml]' => '0'), t('Apply'));
+    $this->drupalPostForm($style_options, ['style_options[formats][json]' => '0', 'style_options[formats][xml]' => '0'], t('Apply'));
 
     // Should return a 200.
     $this->drupalGetWithFormat('test/serialize/field', 'json');
@@ -424,16 +424,16 @@ class StyleSerializerTest extends PluginTestBase {
 
     // Test an empty string for an alias, this should not be used. This also
     // tests that the form can be submitted with no aliases.
-    $this->drupalPostForm($row_options, array('row_options[field_options][name][alias]' => ''), t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm($row_options, ['row_options[field_options][name][alias]' => ''], t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $view = Views::getView('test_serializer_display_field');
     $view->setDisplay('rest_export_1');
     $this->executeView($view);
 
-    $expected = array();
+    $expected = [];
     foreach ($view->result as $row) {
-      $expected_row = array();
+      $expected_row = [];
       foreach ($view->field as $id => $field) {
         $expected_row[$id] = $field->render($row);
       }
@@ -443,32 +443,32 @@ class StyleSerializerTest extends PluginTestBase {
     $this->assertIdentical($this->drupalGetJSON('test/serialize/field'), $this->castSafeStrings($expected));
 
     // Test a random aliases for fields, they should be replaced.
-    $alias_map = array(
+    $alias_map = [
       'name' => $this->randomMachineName(),
       // Use # to produce an invalid character for the validation.
       'nothing' => '#' . $this->randomMachineName(),
       'created' => 'created',
-    );
+    ];
 
-    $edit = array('row_options[field_options][name][alias]' => $alias_map['name'], 'row_options[field_options][nothing][alias]' => $alias_map['nothing']);
+    $edit = ['row_options[field_options][name][alias]' => $alias_map['name'], 'row_options[field_options][nothing][alias]' => $alias_map['nothing']];
     $this->drupalPostForm($row_options, $edit, t('Apply'));
     $this->assertText(t('The machine-readable name must contain only letters, numbers, dashes and underscores.'));
 
     // Change the map alias value to a valid one.
     $alias_map['nothing'] = $this->randomMachineName();
 
-    $edit = array('row_options[field_options][name][alias]' => $alias_map['name'], 'row_options[field_options][nothing][alias]' => $alias_map['nothing']);
+    $edit = ['row_options[field_options][name][alias]' => $alias_map['name'], 'row_options[field_options][nothing][alias]' => $alias_map['nothing']];
     $this->drupalPostForm($row_options, $edit, t('Apply'));
 
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $view = Views::getView('test_serializer_display_field');
     $view->setDisplay('rest_export_1');
     $this->executeView($view);
 
-    $expected = array();
+    $expected = [];
     foreach ($view->result as $row) {
-      $expected_row = array();
+      $expected_row = [];
       foreach ($view->field as $id => $field) {
         $expected_row[$alias_map[$id]] = $field->render($row);
       }
@@ -491,12 +491,12 @@ class StyleSerializerTest extends PluginTestBase {
 
     // Test an empty string for an alias, this should not be used. This also
     // tests that the form can be submitted with no aliases.
-    $values = array(
+    $values = [
       'row_options[field_options][created][raw_output]' => '1',
       'row_options[field_options][name][raw_output]' => '1',
-    );
+    ];
     $this->drupalPostForm($row_options, $values, t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $view = Views::getView('test_serializer_display_field');
     $view->setDisplay('rest_export_1');
@@ -562,7 +562,7 @@ class StyleSerializerTest extends PluginTestBase {
     // Get the serializer service.
     $serializer = $this->container->get('serializer');
 
-    $entities = array();
+    $entities = [];
     foreach ($view->result as $row) {
       $entities[] = $row->_entity;
     }
@@ -580,15 +580,15 @@ class StyleSerializerTest extends PluginTestBase {
 
     // Change the request format to xml.
     $view->setDisplay('rest_export_1');
-    $view->getDisplay()->setOption('style', array(
+    $view->getDisplay()->setOption('style', [
       'type' => 'serializer',
-      'options' => array(
+      'options' => [
         'uses_fields' => FALSE,
-        'formats' => array(
+        'formats' => [
           'xml' => 'xml',
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
     $this->executeView($view);
     $build = $view->preview();
@@ -602,7 +602,7 @@ class StyleSerializerTest extends PluginTestBase {
   public function testSerializerViewsUI() {
     $this->drupalLogin($this->adminUser);
     // Click the "Update preview button".
-    $this->drupalPostForm('admin/structure/views/view/test_serializer_display_field/edit/rest_export_1', $edit = array(), t('Update preview'));
+    $this->drupalPostForm('admin/structure/views/view/test_serializer_display_field/edit/rest_export_1', $edit = [], t('Update preview'));
     $this->assertResponse(200);
     // Check if we receive the expected result.
     $result = $this->xpath('//div[@id="views-live-preview"]/pre');
@@ -613,7 +613,7 @@ class StyleSerializerTest extends PluginTestBase {
    * Tests the field row style using fieldapi fields.
    */
   public function testFieldapiField() {
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     $node = $this->drupalCreateNode();
 
     $result = $this->drupalGetJSON('test/serialize/node-field');
@@ -749,44 +749,44 @@ class StyleSerializerTest extends PluginTestBase {
    * the value provided.
    */
   public function testRestViewExposedFilter() {
-    $this->drupalCreateContentType(array('type' => 'page'));
-    $node0 = $this->drupalCreateNode(array('title' => 'Node 1'));
-    $node1 = $this->drupalCreateNode(array('title' => 'Node 11'));
-    $node2 = $this->drupalCreateNode(array('title' => 'Node 111'));
+    $this->drupalCreateContentType(['type' => 'page']);
+    $node0 = $this->drupalCreateNode(['title' => 'Node 1']);
+    $node1 = $this->drupalCreateNode(['title' => 'Node 11']);
+    $node2 = $this->drupalCreateNode(['title' => 'Node 111']);
 
     // Test that no filter brings back all three nodes.
     $result = $this->drupalGetJSON('test/serialize/node-exposed-filter');
 
-    $expected = array(
-      0 => array(
+    $expected = [
+      0 => [
         'nid' => $node0->id(),
         'body' => $node0->body->processed,
-      ),
-      1 => array(
+      ],
+      1 => [
         'nid' => $node1->id(),
         'body' => $node1->body->processed,
-      ),
-      2 => array(
+      ],
+      2 => [
         'nid' => $node2->id(),
         'body' => $node2->body->processed,
-      ),
-    );
+      ],
+    ];
 
     $this->assertEqual($result, $expected, 'Querying a view with no exposed filter returns all nodes.');
 
     // Test that title starts with 'Node 11' query finds 2 of the 3 nodes.
     $result = $this->drupalGetJSON('test/serialize/node-exposed-filter', ['query' => ['title' => 'Node 11']]);
 
-    $expected = array(
-      0 => array(
+    $expected = [
+      0 => [
         'nid' => $node1->id(),
         'body' => $node1->body->processed,
-      ),
-      1 => array(
+      ],
+      1 => [
         'nid' => $node2->id(),
         'body' => $node2->body->processed,
-      ),
-    );
+      ],
+    ];
 
     $cache_contexts = [
       'languages:language_content',
diff --git a/web/core/modules/rest/tests/modules/rest_test/rest_test.module b/web/core/modules/rest/tests/modules/rest_test/rest_test.module
index 01511ea1e..7df286370 100644
--- a/web/core/modules/rest/tests/modules/rest_test/rest_test.module
+++ b/web/core/modules/rest/tests/modules/rest_test/rest_test.module
@@ -10,24 +10,6 @@ use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Access\AccessResult;
 
-/**
- * Implements hook_rest_type_uri_alter().
- */
-function rest_test_rest_type_uri_alter(&$uri, $context = array()) {
-  if (!empty($context['rest_test'])) {
-    $uri = 'rest_test_type';
-  }
-}
-
-/**
- * Implements hook_rest_relation_uri_alter().
- */
-function rest_test_rest_relation_uri_alter(&$uri, $context = array()) {
-  if (!empty($context['rest_test'])) {
-    $uri = 'rest_test_relation';
-  }
-}
-
 /**
  * Implements hook_entity_field_access().
  *
diff --git a/web/core/modules/rest/tests/modules/rest_test/rest_test.services.yml b/web/core/modules/rest/tests/modules/rest_test/rest_test.services.yml
new file mode 100644
index 000000000..ccdbeae73
--- /dev/null
+++ b/web/core/modules/rest/tests/modules/rest_test/rest_test.services.yml
@@ -0,0 +1,9 @@
+services:
+  rest_test.authentication.test_auth:
+    class: Drupal\rest_test\Authentication\Provider\TestAuth
+    tags:
+      - { name: authentication_provider, provider_id: 'rest_test_auth' }
+  rest_test.authentication.test_auth_global:
+    class: Drupal\rest_test\Authentication\Provider\TestAuthGlobal
+    tags:
+      - { name: authentication_provider, provider_id: 'rest_test_auth_global', global: TRUE }
diff --git a/web/core/modules/rest/tests/modules/rest_test/src/Authentication/Provider/TestAuth.php b/web/core/modules/rest/tests/modules/rest_test/src/Authentication/Provider/TestAuth.php
new file mode 100644
index 000000000..36302acbb
--- /dev/null
+++ b/web/core/modules/rest/tests/modules/rest_test/src/Authentication/Provider/TestAuth.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\rest_test\Authentication\Provider;
+
+use Drupal\Core\Authentication\AuthenticationProviderInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Authentication provider for testing purposes.
+ */
+class TestAuth implements AuthenticationProviderInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(Request $request) {
+    return $request->headers->has('REST-test-auth');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function authenticate(Request $request) {
+    return NULL;
+  }
+
+}
diff --git a/web/core/modules/rest/tests/modules/rest_test/src/Authentication/Provider/TestAuthGlobal.php b/web/core/modules/rest/tests/modules/rest_test/src/Authentication/Provider/TestAuthGlobal.php
new file mode 100644
index 000000000..8ca917418
--- /dev/null
+++ b/web/core/modules/rest/tests/modules/rest_test/src/Authentication/Provider/TestAuthGlobal.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\rest_test\Authentication\Provider;
+
+use Drupal\Core\Authentication\AuthenticationProviderInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Global authentication provider for testing purposes.
+ */
+class TestAuthGlobal implements AuthenticationProviderInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(Request $request) {
+    return $request->headers->has('REST-test-auth-global');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function authenticate(Request $request) {
+    return NULL;
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php b/web/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php
index 18dc296b2..8975c3fa2 100644
--- a/web/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php
+++ b/web/core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php
@@ -53,10 +53,8 @@ trait CookieResourceTestTrait {
    * {@inheritdoc}
    */
   protected function initAuthentication() {
-    // @todo Remove hardcoded use of the 'json' format, and use static::$format
-    // + static::$mimeType instead in https://www.drupal.org/node/2820888.
     $user_login_url = Url::fromRoute('user.login.http')
-      ->setRouteParameter('_format', 'json');
+      ->setRouteParameter('_format', static::$format);
 
     $request_body = [
       'name' => $this->account->name->value,
@@ -64,7 +62,9 @@ trait CookieResourceTestTrait {
     ];
 
     $request_options[RequestOptions::BODY] = $this->serializer->encode($request_body, 'json');
-    $request_options[RequestOptions::HEADERS]['Accept'] = 'application/json';
+    $request_options[RequestOptions::HEADERS] = [
+      'Content-Type' => static::$mimeType,
+    ];
     $response = $this->request('POST', $user_login_url, $request_options);
 
     // Parse and store the session cookie.
@@ -92,7 +92,10 @@ trait CookieResourceTestTrait {
    * {@inheritdoc}
    */
   protected function assertResponseWhenMissingAuthentication(ResponseInterface $response) {
-    $this->assertResourceErrorResponse(403, '', $response);
+    // Requests needing cookie authentication but missing it results in a 403
+    // response. The cookie authentication mechanism sets no response message.
+    // @todo https://www.drupal.org/node/2847623
+    $this->assertResourceErrorResponse(403, FALSE, $response);
   }
 
   /**
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php
new file mode 100644
index 000000000..4d55c25b9
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ActionJsonAnonTest extends ActionResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonBasicAuthTest.php
new file mode 100644
index 000000000..bc998ed16
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ActionJsonBasicAuthTest extends ActionResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonCookieTest.php
new file mode 100644
index 000000000..ab7c50657
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ActionJsonCookieTest extends ActionResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php
new file mode 100644
index 000000000..76aff4bcc
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Action;
+
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+use Drupal\system\Entity\Action;
+use Drupal\user\RoleInterface;
+
+abstract class ActionResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'action';
+
+  /**
+   * @var \Drupal\system\ActionConfigEntityInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    $this->grantPermissionsToTestedRole(['administer actions']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    $action = Action::create([
+      'id' => 'user_add_role_action.' . RoleInterface::ANONYMOUS_ID,
+      'type' => 'user',
+      'label' => t('Add the anonymous role to the selected users'),
+      'configuration' => [
+        'rid' => RoleInterface::ANONYMOUS_ID,
+      ],
+      'plugin' => 'user_add_role_action',
+    ]);
+    $action->save();
+
+    return $action;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    return [
+      'configuration' => [
+        'rid' => 'anonymous',
+      ],
+      'dependencies' => [
+        'config' => ['user.role.anonymous'],
+        'module' => ['user'],
+      ],
+      'id' => 'user_add_role_action.anonymous',
+      'label' => 'Add the anonymous role to the selected users',
+      'langcode' => 'en',
+      'plugin' => 'user_add_role_action',
+      'status' => TRUE,
+      'type' => 'user',
+      'uuid' => $this->entity->uuid(),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheContexts() {
+    return [
+      'user.permissions',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    // @todo Update in https://www.drupal.org/node/2300677.
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php
index 9c764bda7..2312de02c 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php
@@ -21,9 +21,4 @@ class BlockJsonAnonTest extends BlockResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php
index f191e124a..ea690b49a 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\Block;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\JsonBasicAuthWorkaroundFor2805281Trait;
 
 /**
  * @group rest
@@ -27,19 +26,9 @@ class BlockJsonBasicAuthTest extends BlockResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use JsonBasicAuthWorkaroundFor2805281Trait {
-    JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php
index f609448f6..c15ff8f2d 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php
@@ -21,11 +21,6 @@ class BlockJsonCookieTest extends BlockResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php
index 94c0b0475..0be762206 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php
@@ -113,7 +113,7 @@ abstract class BlockResourceTestBase extends EntityResourceTestBase {
    */
   protected function getExpectedCacheContexts() {
     // @see ::createEntity()
-    return [];
+    return ['url.site'];
   }
 
   /**
@@ -122,9 +122,25 @@ abstract class BlockResourceTestBase extends EntityResourceTestBase {
   protected function getExpectedCacheTags() {
     // Because the 'user.permissions' cache context is missing, the cache tag
     // for the anonymous user role is never added automatically.
-    return array_filter(parent::getExpectedCacheTags(), function ($tag) {
+    return array_values(array_filter(parent::getExpectedCacheTags(), function ($tag) {
       return $tag !== 'config:user.role.anonymous';
-    });
+    }));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'GET':
+        return "You are not authorized to view this block entity.";
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
   }
 
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php
index 6ce580d03..5aef7cf24 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php
@@ -21,11 +21,6 @@ class CommentJsonAnonTest extends CommentResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    *
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php
index 0ab513847..e05d733f6 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\JsonBasicAuthWorkaroundFor2805281Trait;
 
 /**
  * @group rest
@@ -27,19 +26,9 @@ class CommentJsonBasicAuthTest extends CommentResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use JsonBasicAuthWorkaroundFor2805281Trait {
-    JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php
index 967baa5d6..945b34a0d 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php
@@ -21,11 +21,6 @@ class CommentJsonCookieTest extends CommentResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php
index 5529fb240..7fe517a2a 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php
@@ -28,6 +28,7 @@ abstract class CommentResourceTestBase extends EntityResourceTestBase {
    * {@inheritdoc}
    */
   protected static $patchProtectedFieldNames = [
+    'status',
     'pid',
     'entity_id',
     'uid',
@@ -35,7 +36,6 @@ abstract class CommentResourceTestBase extends EntityResourceTestBase {
     'homepage',
     'created',
     'changed',
-    'status',
     'thread',
     'entity_type',
     'field_name',
@@ -87,10 +87,10 @@ abstract class CommentResourceTestBase extends EntityResourceTestBase {
     $this->addDefaultCommentField('entity_test', 'bar', 'comment');
 
     // Create a "Camelids" test entity that the comment will be assigned to.
-    $commented_entity = EntityTest::create(array(
+    $commented_entity = EntityTest::create([
       'name' => 'Camelids',
       'type' => 'bar',
-    ));
+    ]);
     $commented_entity->save();
 
     // Create a "Llama" comment.
@@ -144,17 +144,17 @@ abstract class CommentResourceTestBase extends EntityResourceTestBase {
       ],
       'status' => [
         [
-          'value' => 1,
+          'value' => TRUE,
         ],
       ],
       'created' => [
         [
-          'value' => '123456789',
+          'value' => 123456789,
         ],
       ],
       'changed' => [
         [
-          'value' => '123456789',
+          'value' => $this->entity->getChangedTime(),
         ],
       ],
       'default_langcode' => [
@@ -164,7 +164,7 @@ abstract class CommentResourceTestBase extends EntityResourceTestBase {
       ],
       'uid' => [
         [
-          'target_id' => $author->id(),
+          'target_id' => (int) $author->id(),
           'target_type' => 'user',
           'target_uuid' => $author->uuid(),
           'url' => base_path() . 'user/' . $author->id(),
@@ -178,7 +178,7 @@ abstract class CommentResourceTestBase extends EntityResourceTestBase {
       ],
       'entity_id' => [
         [
-          'target_id' => '1',
+          'target_id' => 1,
           'target_type' => 'entity_test',
           'target_uuid' => EntityTest::load(1)->uuid(),
           'url' => base_path() . 'entity_test/1',
@@ -278,8 +278,10 @@ abstract class CommentResourceTestBase extends EntityResourceTestBase {
     // DX: 422 when missing 'entity_type' field.
     $request_options[RequestOptions::BODY] = $this->serializer->encode(array_diff_key($this->getNormalizedPostEntity(), ['entity_type' => TRUE]), static::$format);
     $response = $this->request('POST', $url, $request_options);
-    // @todo Uncomment, remove next line in https://www.drupal.org/node/2820364.
-    $this->assertResourceErrorResponse(500, 'A fatal error occurred: Internal Server Error', $response);
+    // @todo Uncomment, remove next 3 lines in https://www.drupal.org/node/2820364.
+    $this->assertSame(500, $response->getStatusCode());
+    $this->assertSame(['application/json'], $response->getHeader('Content-Type'));
+    $this->assertSame('{"message":"A fatal error occurred: Internal Server Error"}', (string) $response->getBody());
     //$this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nentity_type: This value should not be null.\n", $response);
 
     // DX: 422 when missing 'entity_id' field.
@@ -301,9 +303,29 @@ abstract class CommentResourceTestBase extends EntityResourceTestBase {
     // DX: 422 when missing 'entity_type' field.
     $request_options[RequestOptions::BODY] = $this->serializer->encode(array_diff_key($this->getNormalizedPostEntity(), ['field_name' => TRUE]), static::$format);
     $response = $this->request('POST', $url, $request_options);
-    // @todo Uncomment, remove next line in https://www.drupal.org/node/2820364.
-    $this->assertResourceErrorResponse(500, 'A fatal error occurred: Field  is unknown.', $response);
+    // @todo Uncomment, remove next 3 lines in https://www.drupal.org/node/2820364.
+    $this->assertSame(500, $response->getStatusCode());
+    $this->assertSame(['application/json'], $response->getHeader('Content-Type'));
+    $this->assertSame('{"message":"A fatal error occurred: Field  is unknown."}', (string) $response->getBody());
     //$this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nfield_name: This value should not be null.\n", $response);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'GET';
+        return "The 'access comments' permission is required and the comment must be published.";
+      case 'POST';
+        return "The 'post comments' permission is required.";
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+  }
+
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonAnonTest.php
new file mode 100644
index 000000000..ac27de004
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class CommentTypeJsonAnonTest extends CommentTypeResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonBasicAuthTest.php
new file mode 100644
index 000000000..b91bad8ba
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class CommentTypeJsonBasicAuthTest extends CommentTypeResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonCookieTest.php
new file mode 100644
index 000000000..5915e29d5
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class CommentTypeJsonCookieTest extends CommentTypeResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php
new file mode 100644
index 000000000..9d882117f
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
+
+use Drupal\comment\Entity\CommentType;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+
+/**
+ * ResourceTestBase for CommentType entity.
+ */
+abstract class CommentTypeResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'comment'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'comment_type';
+
+  /**
+   * The CommentType entity.
+   *
+   * @var \Drupal\comment\CommentTypeInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    $this->grantPermissionsToTestedRole(['administer comment types']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    // Create a "Camelids" comment type.
+    $camelids = CommentType::create([
+      'id' => 'camelids',
+      'label' => 'Camelids',
+      'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.',
+      'target_entity_type_id' => 'node',
+    ]);
+
+    $camelids->save();
+
+    return $camelids;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    return [
+      'dependencies' => [],
+      'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.',
+      'id' => 'camelids',
+      'label' => 'Camelids',
+      'langcode' => 'en',
+      'status' => TRUE,
+      'target_entity_type_id' => 'node',
+      'uuid' => $this->entity->uuid(),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    // @todo Update in https://www.drupal.org/node/2300677.
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php
index db79e6c09..32997dc15 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php
@@ -21,9 +21,4 @@ class ConfigTestJsonAnonTest extends ConfigTestResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php
index 309a8f12f..1144e76a1 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\JsonBasicAuthWorkaroundFor2805281Trait;
 
 /**
  * @group rest
@@ -27,19 +26,9 @@ class ConfigTestJsonBasicAuthTest extends ConfigTestResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use JsonBasicAuthWorkaroundFor2805281Trait {
-    JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php
index c243bde99..fe257863d 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php
@@ -21,11 +21,6 @@ class ConfigTestJsonCookieTest extends ConfigTestResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php
new file mode 100644
index 000000000..debfa4cd8
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ConfigurableLanguageJsonAnonTest extends ConfigurableLanguageResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonBasicAuthTest.php
new file mode 100644
index 000000000..e453f953e
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ConfigurableLanguageJsonBasicAuthTest extends ConfigurableLanguageResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonCookieTest.php
new file mode 100644
index 000000000..9972ed0a5
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ConfigurableLanguageJsonCookieTest extends ConfigurableLanguageResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php
new file mode 100644
index 000000000..301beb2f0
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+abstract class ConfigurableLanguageResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'configurable_language';
+
+  /**
+   * @var \Drupal\language\ConfigurableLanguageInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    $this->grantPermissionsToTestedRole(['administer languages']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    $configurable_language = ConfigurableLanguage::create([
+      'id' => 'll',
+      'label' => 'Llama Language',
+    ]);
+    $configurable_language->save();
+
+    return $configurable_language;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    return [
+      'dependencies' => [],
+      'direction' => 'ltr',
+      'id' => 'll',
+      'label' => 'Llama Language',
+      'langcode' => 'en',
+      'locked' => FALSE,
+      'status' => TRUE,
+      'uuid' => $this->entity->uuid(),
+      'weight' => 0,
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheContexts() {
+    return Cache::mergeContexts(parent::getExpectedCacheContexts(), ['languages:language_interface']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    // @todo Update in https://www.drupal.org/node/2300677.
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
index 6dd0bb0c6..e7ce86291 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
@@ -5,7 +5,6 @@ namespace Drupal\Tests\rest\Functional\EntityResource;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
-use Drupal\Core\Entity\EntityChangedInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Url;
 use Drupal\field\Entity\FieldConfig;
@@ -43,10 +42,9 @@ use Psr\Http\Message\ResponseInterface;
  *    (permissions or perhaps custom access control handling, such as node
  *    grants), plus
  * 2. a concrete subclass extending the abstract entity type-specific subclass
- *    that specifies the exact @code $format @endcode, @code $mimeType @endcode,
- *    @code $expectedErrorMimeType @endcode and @code $auth @endcode for this
- *    concrete test. Usually that's all that's necessary: most concrete
- *    subclasses will be very thin.
+ *    that specifies the exact @code $format @endcode, @code $mimeType @endcode
+ *    and @code $auth @endcode for this concrete test. Usually that's all that's
+ *    necessary: most concrete subclasses will be very thin.
  *
  * For every of these concrete subclasses, a comprehensive test scenario will
  * run per HTTP method:
@@ -111,11 +109,6 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
    */
   protected static $secondCreatedEntityId = 3;
 
-  /**
-   * @var \GuzzleHttp\ClientInterface
-   */
-  protected $httpClient;
-
   /**
    * The main entity used for testing.
    *
@@ -138,13 +131,13 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
   public static $modules = ['rest_test', 'text'];
 
   /**
-   * {@inheritdoc}
+   * Provides an entity resource.
    */
   protected function provisionEntityResource() {
     // It's possible to not have any authentication providers enabled, when
     // testing public (anonymous) usage of a REST resource.
     $auth = isset(static::$auth) ? [static::$auth] : [];
-    $this->provisionResource('entity.' . static::$entityTypeId, [static::$format], $auth);
+    $this->provisionResource([static::$format], $auth);
   }
 
   /**
@@ -153,14 +146,13 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
   public function setUp() {
     parent::setUp();
 
+    // Calculate REST Resource config entity ID.
+    static::$resourceConfigId = 'entity.' . static::$entityTypeId;
+
     $this->serializer = $this->container->get('serializer');
     $this->entityStorage = $this->container->get('entity_type.manager')
       ->getStorage(static::$entityTypeId);
 
-    // Set up a HTTP client that accepts relative URLs.
-    $this->httpClient = $this->container->get('http_client_factory')
-      ->fromOptions(['base_uri' => $this->baseUrl]);
-
     // Create an entity.
     $this->entity = $this->createEntity();
 
@@ -187,18 +179,8 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
 
       // Set a default value on the field.
       $this->entity->set('field_rest_test', ['value' => 'All the faith he had had had had no effect on the outcome of his life.']);
-      // @todo Remove in this if-test in https://www.drupal.org/node/2808335.
-      if ($this->entity instanceof EntityChangedInterface) {
-        $changed = $this->entity->getChangedTime();
-        $this->entity->setChangedTime(42);
-        $this->entity->save();
-        $this->entity->setChangedTime($changed);
-      }
       $this->entity->save();
     }
-
-    // @todo Remove this in https://www.drupal.org/node/2815845.
-    drupal_flush_all_caches();
   }
 
   /**
@@ -241,6 +223,43 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     return $this->getNormalizedPostEntity();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return $this->getExpectedBCUnauthorizedAccessMessage($method);
+    }
+
+    $permission = $this->entity->getEntityType()->getAdminPermission();
+    if ($permission !== FALSE) {
+      return "The '{$permission}' permission is required.";
+    }
+
+    $http_method_to_entity_operation = [
+      'GET' => 'view',
+      'POST' => 'create',
+      'PATCH' => 'update',
+      'DELETE' => 'delete',
+    ];
+    $operation = $http_method_to_entity_operation[$method];
+    $message = sprintf('You are not authorized to %s this %s entity', $operation, $this->entity->getEntityTypeId());
+
+    if ($this->entity->bundle() !== $this->entity->getEntityTypeId()) {
+      $message .= ' of bundle ' . $this->entity->bundle();
+    }
+
+    return "$message.";
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedBcUnauthorizedAccessMessage($method) {
+    return "The 'restful " . strtolower($method) . " entity:" . $this->entity->getEntityTypeId() . "' permission is required.";
+  }
+
   /**
    * The expected cache tags for the GET/HEAD response of the test entity.
    *
@@ -255,6 +274,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     if (!static::$auth) {
       $expected_cache_tags[] = 'config:user.role.anonymous';
     }
+    $expected_cache_tags[] = 'http_response';
     return Cache::mergeTags($expected_cache_tags, $this->entity->getCacheTags());
   }
 
@@ -267,6 +287,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
    */
   protected function getExpectedCacheContexts() {
     return [
+      'url.site',
       'user.permissions',
     ];
   }
@@ -301,7 +322,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     // response because ?_format query string is present.
     $response = $this->request('GET', $url, $request_options);
     if ($has_canonical_url) {
-      $this->assertResourceErrorResponse(403, '', $response);
+      $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('GET'), $response);
     }
     else {
       $this->assertResourceErrorResponse(404, 'No route found for "GET ' . str_replace($this->baseUrl, '', $this->getUrl()->setAbsolute()->toString()) . '"', $response);
@@ -335,13 +356,28 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       $this->assertResponseWhenMissingAuthentication($response);
     }
 
+    $request_options[RequestOptions::HEADERS]['REST-test-auth'] = '1';
+
+    // DX: 403 when attempting to use unallowed authentication provider.
+    $response = $this->request('GET', $url, $request_options);
+    $this->assertResourceErrorResponse(403, 'The used authentication method is not allowed on this route.', $response);
+
+    unset($request_options[RequestOptions::HEADERS]['REST-test-auth']);
+    $request_options[RequestOptions::HEADERS]['REST-test-auth-global'] = '1';
+
+    // DX: 403 when attempting to use unallowed global authentication provider.
+    $response = $this->request('GET', $url, $request_options);
+    $this->assertResourceErrorResponse(403, 'The used authentication method is not allowed on this route.', $response);
+
+    unset($request_options[RequestOptions::HEADERS]['REST-test-auth-global']);
     $request_options = NestedArray::mergeDeep($request_options, $this->getAuthenticationRequestOptions('GET'));
 
 
     // DX: 403 when unauthorized.
     $response = $this->request('GET', $url, $request_options);
-    // @todo Update the message in https://www.drupal.org/node/2808233.
-    $this->assertResourceErrorResponse(403, '', $response);
+    $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('GET'), $response);
+    $this->assertArrayNotHasKey('Link', $response->getHeaders());
+
 
 
     $this->setUpAuthorization('GET');
@@ -371,15 +407,38 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $this->assertEquals($this->getExpectedCacheTags(), empty($cache_tags_header_value) ? [] : explode(' ', $cache_tags_header_value));
     $cache_contexts_header_value = $response->getHeader('X-Drupal-Cache-Contexts')[0];
     $this->assertEquals($this->getExpectedCacheContexts(), empty($cache_contexts_header_value) ? [] : explode(' ', $cache_contexts_header_value));
-    // Comparing the exact serialization is pointless, because the order of
-    // fields does not matter (at least not yet). That's why we only compare the
-    // normalized entity with the decoded response: it's comparing PHP arrays
-    // instead of strings.
-    $this->assertEquals($this->getExpectedNormalizedEntity(), $this->serializer->decode((string) $response->getBody(), static::$format));
+    // Sort the serialization data first so we can do an identical comparison
+    // for the keys with the array order the same (it needs to match with
+    // identical comparison).
+    $expected = $this->getExpectedNormalizedEntity();
+    ksort($expected);
+    $actual = $this->serializer->decode((string) $response->getBody(), static::$format);
+    ksort($actual);
+    $this->assertSame($expected, $actual);
+
     // Not only assert the normalization, also assert deserialization of the
     // response results in the expected object.
     $unserialized = $this->serializer->deserialize((string) $response->getBody(), get_class($this->entity), static::$format);
     $this->assertSame($unserialized->uuid(), $this->entity->uuid());
+    // Finally, assert that the expected 'Link' headers are present.
+    if ($this->entity->getEntityType()->getLinkTemplates()) {
+      $this->assertArrayHasKey('Link', $response->getHeaders());
+      $link_relation_type_manager = $this->container->get('plugin.manager.link_relation_type');
+      $expected_link_relation_headers = array_map(function ($rel) use ($link_relation_type_manager) {
+        $definition = $link_relation_type_manager->getDefinition($rel, FALSE);
+        return (!empty($definition['uri']))
+          ? $definition['uri']
+          : $rel;
+      }, array_keys($this->entity->getEntityType()->getLinkTemplates()));
+      $parse_rel_from_link_header = function ($value) use ($link_relation_type_manager) {
+        $matches = [];
+        if (preg_match('/rel="([^"]+)"/', $value, $matches) === 1) {
+          return $matches[1];
+        }
+        return FALSE;
+      };
+      $this->assertSame($expected_link_relation_headers, array_map($parse_rel_from_link_header, $response->getHeader('Link')));
+    }
     $get_headers = $response->getHeaders();
 
     // Verify that the GET and HEAD responses are the same. The only difference
@@ -394,16 +453,42 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     }
     $this->assertSame($get_headers, $head_headers);
 
+    // Only run this for fieldable entities. It doesn't make sense for config
+    // entities as config values are already casted. They also run through the
+    // ConfigEntityNormalizer, which doesn't deal with fields individually.
+    if ($this->entity instanceof FieldableEntityInterface) {
+      $this->config('serialization.settings')->set('bc_primitives_as_strings', TRUE)->save(TRUE);
+      // Rebuild the container so new config is reflected in the removal of the
+      // PrimitiveDataNormalizer.
+      $this->rebuildAll();
 
+
+      $response = $this->request('GET', $url, $request_options);
+      $this->assertResourceResponse(200, FALSE, $response);
+
+
+      // Again do an identical comparison, but this time transform the expected
+      // normalized entity's values to strings. This ensures the BC layer for
+      // bc_primitives_as_strings works as expected.
+      $expected = $this->getExpectedNormalizedEntity();
+      // Config entities are not affected.
+      // @see \Drupal\serialization\Normalizer\ConfigEntityNormalizer::normalize()
+      $expected = static::castToString($expected);
+      ksort($expected);
+      $actual = $this->serializer->decode((string) $response->getBody(), static::$format);
+      ksort($actual);
+      $this->assertSame($expected, $actual);
+    }
+
+
+    // BC: rest_update_8203().
     $this->config('rest.settings')->set('bc_entity_resource_permissions', TRUE)->save(TRUE);
-    // @todo Remove this in https://www.drupal.org/node/2815845.
-    drupal_flush_all_caches();
+    $this->refreshTestStateAfterRestConfigChange();
 
 
     // DX: 403 when unauthorized.
     $response = $this->request('GET', $url, $request_options);
-    // @todo Update the message in https://www.drupal.org/node/2808233.
-    $this->assertResourceErrorResponse(403, '', $response);
+    $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('GET'), $response);
 
 
     $this->grantPermissionsToTestedRole(['restful get entity:' . static::$entityTypeId]);
@@ -414,13 +499,39 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $this->assertResourceResponse(200, FALSE, $response);
 
 
+    $this->resourceConfigStorage->load(static::$resourceConfigId)->disable()->save();
+    $this->refreshTestStateAfterRestConfigChange();
+
+
+    // DX: upon disabling a resource, it's immediately no longer available.
+    $this->assertResourceNotAvailable($url, $request_options);
+
+
+    $this->resourceConfigStorage->load(static::$resourceConfigId)->enable()->save();
+    $this->refreshTestStateAfterRestConfigChange();
+
+
+    // DX: upon re-enabling a resource, immediate 200.
+    $response = $this->request('GET', $url, $request_options);
+    $this->assertResourceResponse(200, FALSE, $response);
+
+
+    $this->resourceConfigStorage->load(static::$resourceConfigId)->delete();
+    $this->refreshTestStateAfterRestConfigChange();
+
+
+    // DX: upon deleting a resource, it's immediately no longer available.
+    $this->assertResourceNotAvailable($url, $request_options);
+
+
+    $this->provisionEntityResource();
     $url->setOption('query', ['_format' => 'non_existing_format']);
 
 
     // DX: 406 when requesting unsupported format.
     $response = $this->request('GET', $url, $request_options);
     $this->assert406Response($response);
-    $this->assertNotSame([static::$expectedErrorMimeType], $response->getHeader('Content-Type'));
+    $this->assertNotSame([static::$mimeType], $response->getHeader('Content-Type'));
 
 
     $request_options[RequestOptions::HEADERS]['Accept'] = static::$mimeType;
@@ -430,7 +541,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     // @todo Update in https://www.drupal.org/node/2825347.
     $response = $this->request('GET', $url, $request_options);
     $this->assert406Response($response);
-    $this->assertSame([static::$expectedErrorMimeType], $response->getHeader('Content-Type'));
+    $this->assertSame(['application/json'], $response->getHeader('Content-Type'));
 
 
     $url = Url::fromRoute('rest.entity.' . static::$entityTypeId . '.GET.' . static::$format);
@@ -445,6 +556,30 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $this->assertResourceErrorResponse(404, $message, $response);
   }
 
+  /**
+   * Transforms a normalization: casts all non-string types to strings.
+   *
+   * @param array $normalization
+   *   A normalization to transform.
+   *
+   * @return array
+   *   The transformed normalization.
+   */
+  protected static function castToString(array $normalization) {
+    foreach ($normalization as $key => $value) {
+      if (is_bool($value)) {
+        $normalization[$key] = (string) (int) $value;
+      }
+      elseif (is_int($value) || is_float($value)) {
+        $normalization[$key] = (string) $value;
+      }
+      elseif (is_array($value)) {
+        $normalization[$key] = static::castToString($value);
+      }
+    }
+    return $normalization;
+  }
+
   /**
    * Tests a POST request for an entity, plus edge cases to ensure good DX.
    */
@@ -463,8 +598,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $parseable_valid_request_body   = $this->serializer->encode($this->getNormalizedPostEntity(), static::$format);
     $parseable_valid_request_body_2 = $this->serializer->encode($this->getNormalizedPostEntity(), static::$format);
     $parseable_invalid_request_body   = $this->serializer->encode($this->makeNormalizationInvalid($this->getNormalizedPostEntity()), static::$format);
-    // @todo Change to ['uuid' => UUID] in https://www.drupal.org/node/2820743.
-    $parseable_invalid_request_body_2 = $this->serializer->encode($this->getNormalizedPostEntity() + ['uuid' => [['value' => $this->randomMachineName(129)]]], static::$format);
+    $parseable_invalid_request_body_2 = $this->serializer->encode($this->getNormalizedPostEntity() + ['uuid' => [$this->randomMachineName(129)]], static::$format);
     $parseable_invalid_request_body_3 = $this->serializer->encode($this->getNormalizedPostEntity() + ['field_rest_test' => [['value' => $this->randomString()]]], static::$format);
 
     // The URL and Guzzle request options that will be used in this test. The
@@ -476,15 +610,11 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $request_options = [];
 
 
-    // DX: 404 when resource not provisioned, but HTML if canonical route.
+    // DX: 404 when resource not provisioned. HTML response because missing
+    // ?_format query string.
     $response = $this->request('POST', $url, $request_options);
-    if ($has_canonical_url) {
-      $this->assertSame(404, $response->getStatusCode());
-      $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
-    }
-    else {
-      $this->assertResourceErrorResponse(404, 'No route found for "GET ' . str_replace($this->baseUrl, '', $this->getUrl()->setAbsolute()->toString()) . '"', $response);
-    }
+    $this->assertSame(404, $response->getStatusCode());
+    $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
 
 
     $url->setOption('query', ['_format' => static::$format]);
@@ -500,16 +630,12 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $url->setOption('query', []);
 
 
-    // DX: 415 when no Content-Type request header, but HTML if canonical route.
+    // DX: 415 when no Content-Type request header. HTML response because
+    // missing ?_format query string.
     $response = $this->request('POST', $url, $request_options);
-    if ($has_canonical_url) {
-      $this->assertSame(415, $response->getStatusCode());
-      $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
-      $this->assertContains(htmlspecialchars('No "Content-Type" request header specified'), (string) $response->getBody());
-    }
-    else {
-      $this->assertResourceErrorResponse(415, 'No "Content-Type" request header specified', $response);
-    }
+    $this->assertSame(415, $response->getStatusCode());
+    $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
+    $this->assertContains(htmlspecialchars('No "Content-Type" request header specified'), (string) $response->getBody());
 
 
     $url->setOption('query', ['_format' => static::$format]);
@@ -533,12 +659,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
 
     // DX: 400 when unparseable request body.
     $response = $this->request('POST', $url, $request_options);
-    // @todo Uncomment, remove next 3 in https://www.drupal.org/node/2813853.
-    // $this->assertResourceErrorResponse(400, 'Syntax error', $response);
-    $this->assertSame(400, $response->getStatusCode());
-    $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-    $this->assertSame($this->serializer->encode(['error' => 'Syntax error'], static::$format), (string) $response->getBody());
-
+    $this->assertResourceErrorResponse(400, 'Syntax error', $response);
 
 
     $request_options[RequestOptions::BODY] = $parseable_invalid_request_body;
@@ -557,8 +678,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
 
     // DX: 403 when unauthorized.
     $response = $this->request('POST', $url, $request_options);
-    // @todo Update the message in https://www.drupal.org/node/2808233.
-    $this->assertResourceErrorResponse(403, '', $response);
+    $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('POST'), $response);
 
 
     $this->setUpAuthorization('POST');
@@ -567,24 +687,19 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     // DX: 422 when invalid entity: multiple values sent for single-value field.
     $response = $this->request('POST', $url, $request_options);
     $label_field = $this->entity->getEntityType()->hasKey('label') ? $this->entity->getEntityType()->getKey('label') : static::$labelFieldName;
-    $label_field_capitalized = ucfirst($label_field);
-    // @todo Uncomment, remove next 3 in https://www.drupal.org/node/2813755.
-    // $this->assertErrorResponse(422, "Unprocessable Entity: validation failed.\ntitle: <em class=\"placeholder\">Title</em>: this field cannot hold more than 1 values.\n", $response);
-    $this->assertSame(422, $response->getStatusCode());
-    $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-    $this->assertSame($this->serializer->encode(['message' => "Unprocessable Entity: validation failed.\n$label_field: <em class=\"placeholder\">$label_field_capitalized</em>: this field cannot hold more than 1 values.\n"], static::$format), (string) $response->getBody());
+    $label_field_capitalized = $this->entity->getFieldDefinition($label_field)->getLabel();
+    $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\n$label_field: $label_field_capitalized: this field cannot hold more than 1 values.\n", $response);
 
 
     $request_options[RequestOptions::BODY] = $parseable_invalid_request_body_2;
 
 
     // DX: 422 when invalid entity: UUID field too long.
-    $response = $this->request('POST', $url, $request_options);
-    // @todo Uncomment, remove next 3 in https://www.drupal.org/node/2813755.
-    // $this->assertErrorResponse(422, "Unprocessable Entity: validation failed.\nuuid.0.value: <em class=\"placeholder\">UUID</em>: may not be longer than 128 characters.\n", $response);
-    $this->assertSame(422, $response->getStatusCode());
-    $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-    $this->assertSame($this->serializer->encode(['message' => "Unprocessable Entity: validation failed.\nuuid.0.value: <em class=\"placeholder\">UUID</em>: may not be longer than 128 characters.\n"], static::$format), (string) $response->getBody());
+    // @todo Fix this in https://www.drupal.org/node/2149851.
+    if ($this->entity->getEntityType()->hasKey('uuid')) {
+      $response = $this->request('POST', $url, $request_options);
+      $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nuuid.0.value: UUID: may not be longer than 128 characters.\n", $response);
+    }
 
 
     $request_options[RequestOptions::BODY] = $parseable_invalid_request_body_3;
@@ -592,8 +707,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
 
     // DX: 403 when entity contains field without 'edit' access.
     $response = $this->request('POST', $url, $request_options);
-    // @todo Add trailing period in https://www.drupal.org/node/2821013.
-    $this->assertResourceErrorResponse(403, "Access denied on creating field 'field_rest_test'", $response);
+    $this->assertResourceErrorResponse(403, "Access denied on creating field 'field_rest_test'.", $response);
 
 
     $request_options[RequestOptions::BODY] = $parseable_valid_request_body;
@@ -622,20 +736,24 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     // 201 for well-formed request.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceResponse(201, FALSE, $response);
-    $this->assertSame([str_replace($this->entity->id(), static::$firstCreatedEntityId, $this->entity->toUrl('canonical')->setAbsolute(TRUE)->toString())], $response->getHeader('Location'));
+    if ($has_canonical_url) {
+      $location = $this->entityStorage->load(static::$firstCreatedEntityId)->toUrl('canonical')->setAbsolute(TRUE)->toString();
+      $this->assertSame([$location], $response->getHeader('Location'));
+    }
+    else {
+      $this->assertSame([], $response->getHeader('Location'));
+    }
     $this->assertFalse($response->hasHeader('X-Drupal-Cache'));
 
 
     $this->config('rest.settings')->set('bc_entity_resource_permissions', TRUE)->save(TRUE);
+    $this->refreshTestStateAfterRestConfigChange();
     $request_options[RequestOptions::BODY] = $parseable_valid_request_body_2;
-    // @todo Remove this in https://www.drupal.org/node/2815845.
-    drupal_flush_all_caches();
 
 
     // DX: 403 when unauthorized.
     $response = $this->request('POST', $url, $request_options);
-    // @todo Update the message in https://www.drupal.org/node/2808233.
-    $this->assertResourceErrorResponse(403, '', $response);
+    $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('POST'), $response);
 
 
     $this->grantPermissionsToTestedRole(['restful post entity:' . static::$entityTypeId]);
@@ -644,7 +762,13 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     // 201 for well-formed request.
     $response = $this->request('POST', $url, $request_options);
     $this->assertResourceResponse(201, FALSE, $response);
-    $this->assertSame([str_replace($this->entity->id(), static::$secondCreatedEntityId, $this->entity->toUrl('canonical')->setAbsolute(TRUE)->toString())], $response->getHeader('Location'));
+    if ($has_canonical_url) {
+      $location = $this->entityStorage->load(static::$secondCreatedEntityId)->toUrl('canonical')->setAbsolute(TRUE)->toString();
+      $this->assertSame([$location], $response->getHeader('Location'));
+    }
+    else {
+      $this->assertSame([], $response->getHeader('Location'));
+    }
     $this->assertFalse($response->hasHeader('X-Drupal-Cache'));
   }
 
@@ -677,23 +801,31 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $request_options = [];
 
 
-    // DX: 405 when resource not provisioned, but HTML if canonical route.
+    // DX: 404 when resource not provisioned, 405 if canonical route. Plain text
+    // or HTML response because missing ?_format query string.
     $response = $this->request('PATCH', $url, $request_options);
     if ($has_canonical_url) {
       $this->assertSame(405, $response->getStatusCode());
+      $this->assertSame(['GET, POST, HEAD'], $response->getHeader('Allow'));
       $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
     }
     else {
-      $this->assertResourceErrorResponse(404, 'No route found for "PATCH ' . str_replace($this->baseUrl, '', $this->getUrl()->setAbsolute()->toString()) . '"', $response);
+      $this->assertSame(404, $response->getStatusCode());
+      $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
     }
 
 
     $url->setOption('query', ['_format' => static::$format]);
 
 
-    // DX: 405 when resource not provisioned.
+    // DX: 404 when resource not provisioned, 405 if canonical route.
     $response = $this->request('PATCH', $url, $request_options);
-    $this->assertResourceErrorResponse(405, 'No route found for "PATCH ' . str_replace($this->baseUrl, '', $this->getUrl()->setAbsolute()->toString()) . '": Method Not Allowed (Allow: GET, POST, HEAD)', $response);
+    if ($has_canonical_url) {
+      $this->assertResourceErrorResponse(405, 'No route found for "PATCH ' . str_replace($this->baseUrl, '', $this->getUrl()->setAbsolute()->toString()) . '": Method Not Allowed (Allow: GET, POST, HEAD)', $response);
+    }
+    else {
+      $this->assertResourceErrorResponse(404, 'No route found for "PATCH ' . str_replace($this->baseUrl, '', $this->getUrl()->setAbsolute()->toString()) . '"', $response);
+    }
 
 
     $this->provisionEntityResource();
@@ -701,16 +833,11 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $url->setOption('query', []);
 
 
-    // DX: 415 when no Content-Type request header, but HTML if canonical route.
+    // DX: 415 when no Content-Type request header.
     $response = $this->request('PATCH', $url, $request_options);
-    if ($has_canonical_url) {
-      $this->assertSame(415, $response->getStatusCode());
-      $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
-      $this->assertTrue(FALSE !== strpos((string) $response->getBody(), htmlspecialchars('No "Content-Type" request header specified')));
-    }
-    else {
-      $this->assertResourceErrorResponse(415, 'No "Content-Type" request header specified', $response);
-    }
+    $this->assertSame(415, $response->getStatusCode());
+    $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
+    $this->assertTrue(FALSE !== strpos((string) $response->getBody(), htmlspecialchars('No "Content-Type" request header specified')));
 
 
     $url->setOption('query', ['_format' => static::$format]);
@@ -734,11 +861,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
 
     // DX: 400 when unparseable request body.
     $response = $this->request('PATCH', $url, $request_options);
-    // @todo Uncomment, remove next 3 in https://www.drupal.org/node/2813853.
-    // $this->assertResourceErrorResponse(400, 'Syntax error', $response);
-    $this->assertSame(400, $response->getStatusCode());
-    $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-    $this->assertSame($this->serializer->encode(['error' => 'Syntax error'], static::$format), (string) $response->getBody());
+    $this->assertResourceErrorResponse(400, 'Syntax error', $response);
 
 
 
@@ -758,8 +881,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
 
     // DX: 403 when unauthorized.
     $response = $this->request('PATCH', $url, $request_options);
-    // @todo Update the message in https://www.drupal.org/node/2808233.
-    $this->assertResourceErrorResponse(403, '', $response);
+    $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('PATCH'), $response);
 
 
     $this->setUpAuthorization('PATCH');
@@ -768,12 +890,8 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     // DX: 422 when invalid entity: multiple values sent for single-value field.
     $response = $this->request('PATCH', $url, $request_options);
     $label_field = $this->entity->getEntityType()->hasKey('label') ? $this->entity->getEntityType()->getKey('label') : static::$labelFieldName;
-    $label_field_capitalized = ucfirst($label_field);
-    // @todo Uncomment, remove next 3 in https://www.drupal.org/node/2813755.
-    // $this->assertErrorResponse(422, "Unprocessable Entity: validation failed.\ntitle: <em class=\"placeholder\">Title</em>: this field cannot hold more than 1 values.\n", $response);
-    // $this->assertSame(422, $response->getStatusCode());
-    // $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-    $this->assertSame($this->serializer->encode(['message' => "Unprocessable Entity: validation failed.\n$label_field: <em class=\"placeholder\">$label_field_capitalized</em>: this field cannot hold more than 1 values.\n"], static::$format), (string) $response->getBody());
+    $label_field_capitalized = $this->entity->getFieldDefinition($label_field)->getLabel();
+    $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\n$label_field: $label_field_capitalized: this field cannot hold more than 1 values.\n", $response);
 
 
     $request_options[RequestOptions::BODY] = $parseable_invalid_request_body_2;
@@ -838,15 +956,13 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
 
 
     $this->config('rest.settings')->set('bc_entity_resource_permissions', TRUE)->save(TRUE);
+    $this->refreshTestStateAfterRestConfigChange();
     $request_options[RequestOptions::BODY] = $parseable_valid_request_body_2;
-    // @todo Remove this in https://www.drupal.org/node/2815845.
-    drupal_flush_all_caches();
 
 
     // DX: 403 when unauthorized.
     $response = $this->request('PATCH', $url, $request_options);
-    // @todo Update the message in https://www.drupal.org/node/2808233.
-    $this->assertResourceErrorResponse(403, '', $response);
+    $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('PATCH'), $response);
 
 
     $this->grantPermissionsToTestedRole(['restful patch entity:' . static::$entityTypeId]);
@@ -880,24 +996,32 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     $request_options = [];
 
 
-    // DX: 405 when resource not provisioned, but HTML if canonical route.
+    // DX: 405 when resource not provisioned, but HTML if canonical route. Plain
+    // text  or HTML response because missing ?_format query string.
     $response = $this->request('DELETE', $url, $request_options);
     if ($has_canonical_url) {
       $this->assertSame(405, $response->getStatusCode());
+      $this->assertSame(['GET, POST, HEAD'], $response->getHeader('Allow'));
       $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
     }
     else {
-      $this->assertResourceErrorResponse(404, 'No route found for "DELETE ' . str_replace($this->baseUrl, '', $this->getUrl()->setAbsolute()->toString()) . '"', $response);
+      $this->assertSame(404, $response->getStatusCode());
+      $this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
     }
 
 
     $url->setOption('query', ['_format' => static::$format]);
 
 
-    // DX: 405 when resource not provisioned.
+    // DX: 404 when resource not provisioned, 405 if canonical route.
     $response = $this->request('DELETE', $url, $request_options);
-    $this->assertResourceErrorResponse(405, 'No route found for "DELETE ' . str_replace($this->baseUrl, '', $this->getUrl()->setAbsolute()->toString()) . '": Method Not Allowed (Allow: GET, POST, HEAD)', $response);
-
+    if ($has_canonical_url) {
+      $this->assertSame(['GET, POST, HEAD'], $response->getHeader('Allow'));
+      $this->assertResourceErrorResponse(405, 'No route found for "DELETE ' . str_replace($this->baseUrl, '', $this->getUrl()->setAbsolute()->toString()) . '": Method Not Allowed (Allow: GET, POST, HEAD)', $response);
+    }
+    else {
+      $this->assertResourceErrorResponse(404, 'No route found for "DELETE ' . str_replace($this->baseUrl, '', $this->getUrl()->setAbsolute()->toString()) . '"', $response);
+    }
 
     $this->provisionEntityResource();
 
@@ -915,8 +1039,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
 
     // DX: 403 when unauthorized.
     $response = $this->request('DELETE', $url, $request_options);
-    // @todo Update the message in https://www.drupal.org/node/2808233.
-    $this->assertResourceErrorResponse(403, '', $response);
+    $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('DELETE'), $response);
 
 
     $this->setUpAuthorization('DELETE');
@@ -930,23 +1053,24 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     // 204 for well-formed request.
     $response = $this->request('DELETE', $url, $request_options);
     $this->assertSame(204, $response->getStatusCode());
-    // @todo Uncomment the following line when https://www.drupal.org/node/2821711 is fixed.
+    // DELETE responses should not include a Content-Type header. But Apache
+    // sets it to 'text/html' by default. We also cannot detect the presence of
+    // Apache either here in the CLI. For now having this documented here is all
+    // we can do.
     // $this->assertSame(FALSE, $response->hasHeader('Content-Type'));
     $this->assertSame('', (string) $response->getBody());
     $this->assertFalse($response->hasHeader('X-Drupal-Cache'));
 
 
     $this->config('rest.settings')->set('bc_entity_resource_permissions', TRUE)->save(TRUE);
-    // @todo Remove this in https://www.drupal.org/node/2815845.
-    drupal_flush_all_caches();
+    $this->refreshTestStateAfterRestConfigChange();
     $this->entity = $this->createEntity();
     $url = $this->getUrl()->setOption('query', $url->getOption('query'));
 
 
     // DX: 403 when unauthorized.
     $response = $this->request('DELETE', $url, $request_options);
-    // @todo Update the message in https://www.drupal.org/node/2808233.
-    $this->assertResourceErrorResponse(403, '', $response);
+    $this->assertResourceErrorResponse(403, $this->getExpectedUnauthorizedAccessMessage('DELETE'), $response);
 
 
     $this->grantPermissionsToTestedRole(['restful delete entity:' . static::$entityTypeId]);
@@ -982,11 +1106,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
         // DX: 400 when incorrect entity type bundle is specified.
         // @todo Change to 422 in https://www.drupal.org/node/2827084.
         $response = $this->request($method, $url, $request_options);
-        // @todo use this commented line instead of the 3 lines thereafter once https://www.drupal.org/node/2813853 lands.
-        //      $this->assertResourceErrorResponse(400, '"bad_bundle_name" is not a valid bundle type for denormalization.', $response);
-        $this->assertSame(400, $response->getStatusCode());
-        $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-        $this->assertSame($this->serializer->encode(['error' => '"bad_bundle_name" is not a valid bundle type for denormalization.'], static::$format), (string) $response->getBody());
+        $this->assertResourceErrorResponse(400, '"bad_bundle_name" is not a valid bundle type for denormalization.', $response);
       }
 
 
@@ -997,11 +1117,7 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
       // DX: 400 when no entity type bundle is specified.
       // @todo Change to 422 in https://www.drupal.org/node/2827084.
       $response = $this->request($method, $url, $request_options);
-      // @todo use this commented line instead of the 3 lines thereafter once https://www.drupal.org/node/2813853 lands.
-      // $this->assertResourceErrorResponse(400, 'A string must be provided as a bundle value.', $response);
-      $this->assertSame(400, $response->getStatusCode());
-      $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-      $this->assertSame($this->serializer->encode(['error' => 'A string must be provided as a bundle value.'], static::$format), (string) $response->getBody());
+      $this->assertResourceErrorResponse(400, sprintf('Could not determine entity type bundle: "%s" field is missing.', $bundle_field_name), $response);
     }
   }
 
@@ -1090,4 +1206,23 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
     }
   }
 
+  /**
+   * Asserts that a resource is unavailable: 404, 406 if it has canonical route.
+   *
+   * @param \Drupal\Core\Url $url
+   *   URL to request.
+   * @param array $request_options
+   *   Request options to apply.
+   */
+  protected function assertResourceNotAvailable(Url $url, array $request_options) {
+    $has_canonical_url = $this->entity->hasLinkTemplate('canonical');
+    $response = $this->request('GET', $url, $request_options);
+    if (!$has_canonical_url) {
+      $this->assertSame(404, $response->getStatusCode());
+    }
+    else {
+      $this->assert406Response($response);
+    }
+  }
+
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonAnonTest.php
index a7e442055..ff047d40b 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonAnonTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonAnonTest.php
@@ -21,9 +21,4 @@ class EntityTestJsonAnonTest extends EntityTestResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php
index be7578410..aff854edd 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonBasicAuthTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\EntityTest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\JsonBasicAuthWorkaroundFor2805281Trait;
 
 /**
  * @group rest
@@ -27,19 +26,9 @@ class EntityTestJsonBasicAuthTest extends EntityTestResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use JsonBasicAuthWorkaroundFor2805281Trait {
-    JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonCookieTest.php
index 84079220d..c0090d5d0 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonCookieTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestJsonCookieTest.php
@@ -21,11 +21,6 @@ class EntityTestJsonCookieTest extends EntityTestResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestResourceTestBase.php
index da86d0006..2935a00fa 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTest/EntityTestResourceTestBase.php
@@ -73,7 +73,7 @@ abstract class EntityTestResourceTestBase extends EntityResourceTestBase {
       ],
       'id' => [
         [
-          'value' => '1',
+          'value' => 1,
         ],
       ],
       'langcode' => [
@@ -93,12 +93,12 @@ abstract class EntityTestResourceTestBase extends EntityResourceTestBase {
       ],
       'created' => [
         [
-          'value' => $this->entity->get('created')->value,
+          'value' => (int) $this->entity->get('created')->value,
         ]
       ],
       'user_id' => [
         [
-          'target_id' => $author->id(),
+          'target_id' => (int) $author->id(),
           'target_type' => 'user',
           'target_uuid' => $author->uuid(),
           'url' => $author->toUrl()->toString(),
@@ -124,4 +124,22 @@ abstract class EntityTestResourceTestBase extends EntityResourceTestBase {
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'GET':
+        return "The 'view test entity' permission is required.";
+      case 'POST':
+        return "The following permissions are required: 'administer entity_test content' OR 'administer entity_test_with_bundle content' OR 'create entity_test entity_test_with_bundle entities'.";
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+  }
+
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonAnonTest.php
new file mode 100644
index 000000000..10c4ec498
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class EntityTestLabelJsonAnonTest extends EntityTestLabelResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonBasicAuthTest.php
new file mode 100644
index 000000000..2a43e038c
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class EntityTestLabelJsonBasicAuthTest extends EntityTestLabelResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonCookieTest.php
new file mode 100644
index 000000000..2fec09d6a
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class EntityTestLabelJsonCookieTest extends EntityTestLabelResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php
new file mode 100644
index 000000000..d0307872f
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityTestLabel/EntityTestLabelResourceTestBase.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\EntityTestLabel;
+
+use Drupal\entity_test\Entity\EntityTestLabel;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+use Drupal\user\Entity\User;
+
+abstract class EntityTestLabelResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'entity_test_label';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $patchProtectedFieldNames = [];
+
+  /**
+   * @var \Drupal\entity_test\Entity\EntityTestLabel
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    switch ($method) {
+      case 'GET':
+        $this->grantPermissionsToTestedRole(['view test entity']);
+        break;
+      case 'POST':
+        $this->grantPermissionsToTestedRole([
+          'administer entity_test content',
+          'administer entity_test_with_bundle content',
+          'create entity_test entity_test_with_bundle entities',
+        ]);
+        break;
+      case 'PATCH':
+      case 'DELETE':
+        $this->grantPermissionsToTestedRole(['administer entity_test content']);
+        break;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    $entity_test_label = EntityTestLabel::create([
+      'name' => 'label_llama',
+    ]);
+    $entity_test_label->setOwnerId(0);
+    $entity_test_label->save();
+    return $entity_test_label;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    $author = User::load(0);
+    $normalization = [
+      'uuid' => [
+        [
+          'value' => $this->entity->uuid(),
+        ],
+      ],
+      'id' => [
+        [
+          'value' => (int) $this->entity->id(),
+        ],
+      ],
+      'langcode' => [
+        [
+          'value' => 'en',
+        ],
+      ],
+      'type' => [
+        [
+          'value' => 'entity_test_label',
+        ],
+      ],
+      'name' => [
+        [
+          'value' => 'label_llama',
+        ],
+      ],
+      'created' => [
+        [
+          'value' => (int) $this->entity->get('created')->value,
+        ],
+      ],
+      'user_id' => [
+        [
+          'target_id' => (int) $author->id(),
+          'target_type' => 'user',
+          'target_uuid' => $author->uuid(),
+          'url' => $author->toUrl()->toString(),
+        ],
+      ],
+    ];
+
+    return $normalization;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    return [
+      'type' => 'entity_test_label',
+      'name' => [
+        [
+          'value' => 'label_llama',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheContexts() {
+    return ['user.permissions'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'GET':
+        return "The 'view test entity' permission is required.";
+      case 'POST':
+        return "The following permissions are required: 'administer entity_test content' OR 'administer entity_test_with_bundle content' OR 'create entity_test_label entity_test_with_bundle entities'.";
+      case 'PATCH':
+      case 'DELETE':
+        return "The 'administer entity_test content' permission is required.";
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonAnonTest.php
new file mode 100644
index 000000000..60a24fb9c
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class FilterFormatJsonAnonTest extends FilterFormatResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonBasicAuthTest.php
new file mode 100644
index 000000000..4e143c33e
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class FilterFormatJsonBasicAuthTest extends FilterFormatResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonCookieTest.php
new file mode 100644
index 000000000..73c0c22ab
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class FilterFormatJsonCookieTest extends FilterFormatResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php
new file mode 100644
index 000000000..4d65e00f5
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\FilterFormat;
+
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+
+abstract class FilterFormatResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'filter_format';
+
+  /**
+   * @var \Drupal\filter\FilterFormatInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    $this->grantPermissionsToTestedRole(['administer filters']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    $pablo_format = FilterFormat::create([
+      'name' => 'Pablo Piccasso',
+      'format' => 'pablo',
+      'langcode' => 'es',
+      'filters' => [
+        'filter_html' => [
+          'status' => TRUE,
+          'settings' => [
+            'allowed_html' => '<p> <a> <b> <lo>',
+          ],
+        ],
+      ],
+    ]);
+    $pablo_format->save();
+    return $pablo_format;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    return [
+      'dependencies' => [],
+      'filters' => [
+        'filter_html' => [
+          'id' => 'filter_html',
+          'provider' => 'filter',
+          'status' => TRUE,
+          'weight' => -10,
+          'settings' => [
+            'allowed_html' => '<p> <a> <b> <lo>',
+            'filter_html_help' => TRUE,
+            'filter_html_nofollow' => FALSE,
+          ],
+        ],
+      ],
+      'format' => 'pablo',
+      'langcode' => 'es',
+      'name' => 'Pablo Piccasso',
+      'status' => TRUE,
+      'uuid' => $this->entity->uuid(),
+      'weight' => 0,
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    // @todo Update in https://www.drupal.org/node/2300677.
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonAnonTest.php
new file mode 100644
index 000000000..0089f8eda
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ImageStyleJsonAnonTest extends ImageStyleResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonBasicAuthTest.php
new file mode 100644
index 000000000..10117505a
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ImageStyleJsonBasicAuthTest extends ImageStyleResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonCookieTest.php
new file mode 100644
index 000000000..321baae7b
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ImageStyleJsonCookieTest extends ImageStyleResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php
new file mode 100644
index 000000000..ccd68d95b
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/ImageStyle/ImageStyleResourceTestBase.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\ImageStyle;
+
+use Drupal\image\Entity\ImageStyle;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+
+/**
+ * ResourceTestBase for ImageStyle entity.
+ */
+abstract class ImageStyleResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['image'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'image_style';
+
+  /**
+   * The ImageStyle entity.
+   *
+   * @var \Drupal\image\ImageStyleInterface
+   */
+  protected $entity;
+
+  /**
+   * The effect UUID.
+   *
+   * @var string
+   */
+  protected $effectUuid;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    $this->grantPermissionsToTestedRole(['administer image styles']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    // Create a "Camelids" image style.
+    $camelids = ImageStyle::create([
+      'name' => 'camelids',
+      'label' => 'Camelids',
+    ]);
+
+    // Add an image effect.
+    $effect = [
+      'id' => 'image_scale_and_crop',
+      'data' => [
+        'width' => 120,
+        'height' => 121,
+      ],
+      'weight' => 0,
+    ];
+    $this->effectUuid = $camelids->addImageEffect($effect);
+
+    $camelids->save();
+
+    return $camelids;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    return [
+      'dependencies' => [],
+      'effects' => [
+        $this->effectUuid => [
+          'uuid' => $this->effectUuid,
+          'id' => 'image_scale_and_crop',
+          'weight' => 0,
+          'data' => [
+            'width' => 120,
+            'height' => 121,
+          ],
+        ],
+      ],
+      'label' => 'Camelids',
+      'langcode' => 'en',
+      'name' => 'camelids',
+      'status' => TRUE,
+      'uuid' => $this->entity->uuid(),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    // @todo Update in https://www.drupal.org/node/2300677.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    return "The 'administer image styles' permission is required.";
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonAnonTest.php
new file mode 100644
index 000000000..dac1b0a6d
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ItemJsonAnonTest extends ItemResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonBasicAuthTest.php
new file mode 100644
index 000000000..19b6179c7
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ItemJsonBasicAuthTest extends ItemResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonCookieTest.php
new file mode 100644
index 000000000..1c149d7c6
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ItemJsonCookieTest extends ItemResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php
new file mode 100644
index 000000000..9b72b6614
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Item/ItemResourceTestBase.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Item;
+
+use Drupal\aggregator\Entity\Feed;
+use Drupal\aggregator\Entity\Item;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+
+/**
+ * ResourceTestBase for Item entity.
+ */
+abstract class ItemResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'aggregator_item';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $patchProtectedFieldNames = [];
+
+  /**
+   * The Item entity.
+   *
+   * @var \Drupal\aggregator\ItemInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    switch ($method) {
+      case 'GET':
+        $this->grantPermissionsToTestedRole(['access news feeds']);
+        break;
+
+      case 'POST':
+      case 'PATCH':
+      case 'DELETE':
+        $this->grantPermissionsToTestedRole(['administer news feeds']);
+        break;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    // Create a "Camelids" feed.
+    $feed = Feed::create([
+      'title' => 'Camelids',
+      'url' => 'https://groups.drupal.org/not_used/167169',
+      'refresh' => 900,
+      'checked' => 1389919932,
+      'description' => 'Drupal Core Group feed',
+    ]);
+    $feed->save();
+
+    // Create a "Llama" item.
+    $item = Item::create();
+    $item->setTitle('Llama')
+      ->setFeedId($feed->id())
+      ->setLink('https://www.drupal.org/')
+      ->setPostedTime(123456789)
+      ->save();
+
+    return $item;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    $feed = Feed::load($this->entity->getFeedId());
+
+    return [
+      'iid' => [
+        [
+          'value' => 1,
+        ],
+      ],
+      'langcode' => [
+        [
+          'value' => 'en',
+        ],
+      ],
+      'fid' => [
+        [
+          'target_id' => 1,
+          'target_type' => 'aggregator_feed',
+          'target_uuid' => $feed->uuid(),
+          'url' => base_path() . 'aggregator/sources/1',
+        ],
+      ],
+      'title' => [
+        [
+          'value' => 'Llama',
+        ],
+      ],
+      'link' => [
+        [
+          'value' => 'https://www.drupal.org/',
+        ],
+      ],
+      'author' => [],
+      'description' => [],
+      'timestamp' => [
+        [
+          'value' => 123456789,
+        ],
+      ],
+      'guid' => [],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    return [
+      'fid' => [
+        [
+          'target_id' => 1,
+        ],
+      ],
+      'title' => [
+        [
+          'value' => 'Llama',
+        ],
+      ],
+      'link' => [
+        [
+          'value' => 'https://www.drupal.org/',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheContexts() {
+    // @see ::createEntity()
+    return ['user.permissions'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'GET':
+        return "The 'access news feeds' permission is required.";
+
+      case 'POST':
+      case 'PATCH':
+      case 'DELETE':
+        return "The 'administer news feeds' permission is required.";
+
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonAnonTest.php
new file mode 100644
index 000000000..219cc53c8
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class MenuLinkContentJsonAnonTest extends MenuLinkContentResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonBasicAuthTest.php
new file mode 100644
index 000000000..952088b91
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class MenuLinkContentJsonBasicAuthTest extends MenuLinkContentResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonCookieTest.php
new file mode 100644
index 000000000..73b45672e
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class MenuLinkContentJsonCookieTest extends MenuLinkContentResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php
new file mode 100644
index 000000000..f907d9a59
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/MenuLinkContent/MenuLinkContentResourceTestBase.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\MenuLinkContent;
+
+use Drupal\menu_link_content\Entity\MenuLinkContent;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+
+/**
+ * ResourceTestBase for MenuLinkContent entity.
+ */
+abstract class MenuLinkContentResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['menu_link_content'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'menu_link_content';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $patchProtectedFieldNames = [
+    'changed',
+  ];
+
+  /**
+   * The MenuLinkContent entity.
+   *
+   * @var \Drupal\menu_link_content\MenuLinkContentInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    switch ($method) {
+      case 'GET':
+      case 'POST':
+      case 'PATCH':
+      case 'DELETE':
+        $this->grantPermissionsToTestedRole(['administer menu']);
+        break;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    $menu_link = MenuLinkContent::create([
+      'id' => 'llama',
+      'title' => 'Llama Gabilondo',
+      'description' => 'Llama Gabilondo',
+      'link' => 'https://nl.wikipedia.org/wiki/Llama',
+      'weight' => 0,
+      'menu_name' => 'main',
+    ]);
+    $menu_link->save();
+
+    return $menu_link;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    return [
+      'title' => [
+        [
+          'value' => 'Dramallama',
+        ],
+      ],
+      'link' => [
+        [
+          'uri' => 'http://www.urbandictionary.com/define.php?term=drama%20llama',
+        ],
+      ],
+      'bundle' => [
+        [
+          'value' => 'menu_link_content',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    return [
+      'uuid' => [
+        [
+          'value' => $this->entity->uuid(),
+        ],
+      ],
+      'id' => [
+        [
+          'value' => 1,
+        ],
+      ],
+      'title' => [
+        [
+          'value' => 'Llama Gabilondo',
+        ],
+      ],
+      'link' => [
+        [
+          'uri' => 'https://nl.wikipedia.org/wiki/Llama',
+          'title' => NULL,
+          'options' => [],
+        ],
+      ],
+      'weight' => [
+        [
+          'value' => 0,
+        ],
+      ],
+      'menu_name' => [
+        [
+          'value' => 'main',
+        ],
+      ],
+      'langcode' => [
+        [
+          'value' => 'en',
+        ],
+      ],
+      'bundle' => [
+        [
+          'value' => 'menu_link_content',
+        ],
+      ],
+      'description' => [
+        [
+          'value' => 'Llama Gabilondo',
+        ],
+      ],
+      'external' => [
+        [
+          'value' => FALSE,
+        ],
+      ],
+      'rediscover' => [
+        [
+          'value' => FALSE,
+        ],
+      ],
+      'expanded' => [
+        [
+          'value' => FALSE,
+        ],
+      ],
+      'enabled' => [
+        [
+          'value' => TRUE,
+        ],
+      ],
+      'changed' => [
+        [
+          'value' => $this->entity->getChangedTime(),
+        ],
+      ],
+      'default_langcode' => [
+        [
+          'value' => TRUE,
+        ],
+      ],
+      'parent' => [],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'DELETE':
+        return "You are not authorized to delete this menu_link_content entity.";
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php
index 24d47c495..47239dba3 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonAnonTest.php
@@ -21,9 +21,4 @@ class NodeJsonAnonTest extends NodeResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
index b71d1d57a..ff7746d76 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonBasicAuthTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\Node;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\JsonBasicAuthWorkaroundFor2805281Trait;
 
 /**
  * @group rest
@@ -27,19 +26,9 @@ class NodeJsonBasicAuthTest extends NodeResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use JsonBasicAuthWorkaroundFor2805281Trait {
-    JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonCookieTest.php
index f0bd6534b..490155e75 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonCookieTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeJsonCookieTest.php
@@ -21,11 +21,6 @@ class NodeJsonCookieTest extends NodeResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
index d7651c4b9..cfbd97161 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php
@@ -116,32 +116,32 @@ abstract class NodeResourceTestBase extends EntityResourceTestBase {
       ],
       'status' => [
         [
-          'value' => 1,
+          'value' => TRUE,
         ],
       ],
       'created' => [
         [
-          'value' => '123456789',
+          'value' => 123456789,
         ],
       ],
       'changed' => [
         [
-          'value' => '123456789',
+          'value' => $this->entity->getChangedTime(),
         ],
       ],
       'promote' => [
         [
-          'value' => 1,
+          'value' => TRUE,
         ],
       ],
       'sticky' => [
         [
-          'value' => '0',
+          'value' => FALSE,
         ],
       ],
       'revision_timestamp' => [
         [
-          'value' => '123456789',
+          'value' => 123456789,
         ],
       ],
       'revision_translation_affected' => [
@@ -156,7 +156,7 @@ abstract class NodeResourceTestBase extends EntityResourceTestBase {
       ],
       'uid' => [
         [
-          'target_id' => $author->id(),
+          'target_id' => (int) $author->id(),
           'target_type' => 'user',
           'target_uuid' => $author->uuid(),
           'url' => base_path() . 'user/' . $author->id(),
@@ -164,14 +164,13 @@ abstract class NodeResourceTestBase extends EntityResourceTestBase {
       ],
       'revision_uid' => [
         [
-          'target_id' => $author->id(),
+          'target_id' => (int) $author->id(),
           'target_type' => 'user',
           'target_uuid' => $author->uuid(),
           'url' => base_path() . 'user/' . $author->id(),
         ],
       ],
-      'revision_log' => [
-      ],
+      'revision_log' => [],
     ];
   }
 
@@ -193,4 +192,18 @@ abstract class NodeResourceTestBase extends EntityResourceTestBase {
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    if ($method === 'GET' || $method == 'PATCH' || $method == 'DELETE') {
+      return "The 'access content' permission is required.";
+    }
+    return parent::getExpectedUnauthorizedAccessMessage($method);
+  }
+
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonAnonTest.php
new file mode 100644
index 000000000..7050ff1eb
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class NodeTypeJsonAnonTest extends NodeTypeResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonBasicAuthTest.php
new file mode 100644
index 000000000..cee236429
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class NodeTypeJsonBasicAuthTest extends NodeTypeResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonCookieTest.php
new file mode 100644
index 000000000..a0bc036df
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class NodeTypeJsonCookieTest extends NodeTypeResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php
new file mode 100644
index 000000000..c374bfb7c
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/NodeType/NodeTypeResourceTestBase.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\NodeType;
+
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+
+/**
+ * ResourceTestBase for NodeType entity.
+ */
+abstract class NodeTypeResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'node_type';
+
+  /**
+   * The NodeType entity.
+   *
+   * @var \Drupal\node\NodeTypeInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    $this->grantPermissionsToTestedRole(['administer content types', 'access content']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    // Create a "Camelids" node type.
+    $camelids = NodeType::create([
+      'name' => 'Camelids',
+      'type' => 'camelids',
+      'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.',
+    ]);
+
+    $camelids->save();
+
+    return $camelids;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    return [
+      'dependencies' => [],
+      'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.',
+      'display_submitted' => TRUE,
+      'help' => NULL,
+      'langcode' => 'en',
+      'name' => 'Camelids',
+      'new_revision' => TRUE,
+      'preview_mode' => 1,
+      'status' => TRUE,
+      'type' => 'camelids',
+      'uuid' => $this->entity->uuid(),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    // @todo Update in https://www.drupal.org/node/2300677.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    return "The 'access content' permission is required.";
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php
index 3ec96eb7a..eb0b05fba 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonAnonTest.php
@@ -21,9 +21,4 @@ class RoleJsonAnonTest extends RoleResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php
index 75fcd0800..267a3b89d 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonBasicAuthTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\Role;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Psr\Http\Message\ResponseInterface;
 
 /**
  * @group rest
@@ -27,22 +26,9 @@ class RoleJsonBasicAuthTest extends RoleResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function assertResponseWhenMissingAuthentication(ResponseInterface $response) {
-    $this->assertSame(401, $response->getStatusCode());
-    $this->assertSame('{"message":"A fatal error occurred: No authentication credentials provided."}', (string) $response->getBody());
-  }
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonCookieTest.php
index 9f4ec073c..874031685 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonCookieTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Role/RoleJsonCookieTest.php
@@ -21,11 +21,6 @@ class RoleJsonCookieTest extends RoleResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonAnonTest.php
new file mode 100644
index 000000000..a3aff54e6
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class SearchPageJsonAnonTest extends SearchPageResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonBasicAuthTest.php
new file mode 100644
index 000000000..0ee5556da
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class SearchPageJsonBasicAuthTest extends SearchPageResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonCookieTest.php
new file mode 100644
index 000000000..c74a35715
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class SearchPageJsonCookieTest extends SearchPageResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php
new file mode 100644
index 000000000..e81993f64
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/SearchPage/SearchPageResourceTestBase.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\SearchPage;
+
+use Drupal\search\Entity\SearchPage;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+
+abstract class SearchPageResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'search'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'search_page';
+
+  /**
+   * @var \Drupal\search\SearchPageInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    switch ($method) {
+      case 'GET':
+        $this->grantPermissionsToTestedRole(['access content']);
+        break;
+
+      case 'POST':
+      case 'PATCH':
+      case 'DELETE':
+        $this->grantPermissionsToTestedRole(['administer search']);
+        break;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    $search_page = SearchPage::create([
+      'id' => 'hinode_search',
+      'plugin' => 'node_search',
+      'label' => 'Search of magnetic activity of the Sun',
+      'path' => 'sun',
+    ]);
+    $search_page->save();
+    return $search_page;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    return [
+      'configuration' => [
+        'rankings' => [],
+      ],
+      'dependencies' => [
+        'module' => ['node'],
+      ],
+      'id' => 'hinode_search',
+      'label' => 'Search of magnetic activity of the Sun',
+      'langcode' => 'en',
+      'path' => 'sun',
+      'plugin' => 'node_search',
+      'status' => TRUE,
+      'uuid' => $this->entity->uuid(),
+      'weight' => 0,
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    // @todo Update in https://www.drupal.org/node/2300677.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'GET':
+        return "The 'access content' permission is required.";
+
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonAnonTest.php
new file mode 100644
index 000000000..8f317b3c0
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonAnonTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ShortcutJsonAnonTest extends ShortcutResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonBasicAuthTest.php
new file mode 100644
index 000000000..31f1117a9
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonBasicAuthTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+
+use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ShortcutJsonBasicAuthTest extends ShortcutResourceTestBase {
+
+  use BasicAuthResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonCookieTest.php
new file mode 100644
index 000000000..3a043c879
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutJsonCookieTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group rest
+ */
+class ShortcutJsonCookieTest extends ShortcutResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php
new file mode 100644
index 000000000..fb8ebaad3
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Shortcut/ShortcutResourceTestBase.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace Drupal\Tests\rest\Functional\EntityResource\Shortcut;
+
+use Drupal\shortcut\Entity\Shortcut;
+use Drupal\shortcut\Entity\ShortcutSet;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+
+/**
+ * ResourceTestBase for Shortcut entity.
+ */
+abstract class ShortcutResourceTestBase extends EntityResourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['comment', 'shortcut'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $entityTypeId = 'shortcut';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $patchProtectedFieldNames = [];
+
+  /**
+   * The Shortcut entity.
+   *
+   * @var \Drupal\shortcut\ShortcutInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpAuthorization($method) {
+    switch ($method) {
+      case 'GET':
+      case 'POST':
+      case 'PATCH':
+      case 'DELETE':
+        $this->grantPermissionsToTestedRole(['access shortcuts', 'customize shortcut links']);
+        break;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function createEntity() {
+    // Create shortcut.
+    $shortcut = Shortcut::create([
+      'shortcut_set' => 'default',
+      'title' => t('Comments'),
+      'weight' => -20,
+      'link' => [
+        'uri' => 'internal:/admin/content/comment',
+      ],
+    ]);
+    $shortcut->save();
+
+    return $shortcut;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedNormalizedEntity() {
+    return [
+      'uuid' => [
+        [
+          'value' => $this->entity->uuid(),
+        ],
+      ],
+      'id' => [
+        [
+          'value' => (int) $this->entity->id(),
+        ],
+      ],
+      'title' => [
+        [
+          'value' => 'Comments',
+        ],
+      ],
+      'shortcut_set' => [
+        [
+          'target_id' => 'default',
+          'target_type' => 'shortcut_set',
+          'target_uuid' => ShortcutSet::load('default')->uuid(),
+        ],
+      ],
+      'link' => [
+        [
+          'uri' => 'internal:/admin/content/comment',
+          'title' => NULL,
+          'options' => [],
+        ],
+      ],
+      'weight' => [
+        [
+          'value' => -20,
+        ],
+      ],
+      'langcode' => [
+        [
+          'value' => 'en',
+        ],
+      ],
+      'default_langcode' => [
+        [
+          'value' => TRUE,
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getNormalizedPostEntity() {
+    return [
+      'title' => [
+        [
+          'value' => 'Comments',
+        ],
+      ],
+      'link' => [
+        [
+          'uri' => 'internal:/',
+        ],
+      ],
+      'shortcut_set' => 'default',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'GET':
+      case 'POST':
+      case 'PATCH':
+      case 'DELETE':
+        return "The shortcut set must be the currently displayed set for the user and the user must have 'access shortcuts' AND 'customize shortcut links' permissions.";
+
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php
index 6e01c0314..90a85e722 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonAnonTest.php
@@ -21,9 +21,4 @@ class TermJsonAnonTest extends TermResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php
index 6befa3a9a..97df5c841 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonBasicAuthTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\Term;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\JsonBasicAuthWorkaroundFor2805281Trait;
 
 /**
  * @group rest
@@ -27,19 +26,9 @@ class TermJsonBasicAuthTest extends TermResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use JsonBasicAuthWorkaroundFor2805281Trait {
-    JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonCookieTest.php
index 6268a747f..ccf066b78 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonCookieTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermJsonCookieTest.php
@@ -21,11 +21,6 @@ class TermJsonCookieTest extends TermResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php
index b6dce4f4b..698451b58 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php
@@ -108,7 +108,7 @@ abstract class TermResourceTestBase extends EntityResourceTestBase {
       ],
       'changed' => [
         [
-          'value' => '123456789',
+          'value' => $this->entity->getChangedTime(),
         ],
       ],
       'default_langcode' => [
@@ -137,4 +137,26 @@ abstract class TermResourceTestBase extends EntityResourceTestBase {
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'GET':
+        return "The 'access content' permission is required.";
+      case 'POST':
+        return "The 'administer taxonomy' permission is required.";
+      case 'PATCH':
+        return "The following permissions are required: 'edit terms in camelids' OR 'administer taxonomy'.";
+      case 'DELETE':
+        return "The following permissions are required: 'delete terms in camelids' OR 'administer taxonomy'.";
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+  }
+
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonAnonTest.php
index a20aff834..176f3be1a 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonAnonTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonAnonTest.php
@@ -21,9 +21,4 @@ class UserJsonAnonTest extends UserResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php
index f67e0a679..ea6ddea2d 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonBasicAuthTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\User;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\JsonBasicAuthWorkaroundFor2805281Trait;
 
 /**
  * @group rest
@@ -27,19 +26,9 @@ class UserJsonBasicAuthTest extends UserResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use JsonBasicAuthWorkaroundFor2805281Trait {
-    JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonCookieTest.php
index 12ee0c919..9fae07d89 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonCookieTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserJsonCookieTest.php
@@ -21,11 +21,6 @@ class UserJsonCookieTest extends UserResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php
index 31cf083af..04fe435a4 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/User/UserResourceTestBase.php
@@ -82,7 +82,7 @@ abstract class UserResourceTestBase extends EntityResourceTestBase {
   protected function getExpectedNormalizedEntity() {
     return [
       'uid' => [
-        ['value' => '3'],
+        ['value' => 3],
       ],
       'uuid' => [
         ['value' => $this->entity->uuid()],
@@ -99,12 +99,12 @@ abstract class UserResourceTestBase extends EntityResourceTestBase {
       ],
       'created' => [
         [
-          'value' => '123456789',
+          'value' => 123456789,
         ],
       ],
       'changed' => [
         [
-          'value' => '123456789',
+          'value' => $this->entity->getChangedTime(),
         ],
       ],
       'default_langcode' => [
@@ -163,11 +163,7 @@ abstract class UserResourceTestBase extends EntityResourceTestBase {
 
     // DX: 422 when changing email without providing the password.
     $response = $this->request('PATCH', $url, $request_options);
-    // @todo use this commented line instead of the 3 lines thereafter once https://www.drupal.org/node/2813755 lands.
-    // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nmail: Your current password is missing or incorrect; it's required to change the <em class=\"placeholder\">Email</em>.\n", $response);
-    $this->assertSame(422, $response->getStatusCode());
-    $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-    $this->assertSame($this->serializer->encode(['message' => "Unprocessable Entity: validation failed.\nmail: Your current password is missing or incorrect; it's required to change the <em class=\"placeholder\">Email</em>.\n"], static::$format), (string) $response->getBody());
+    $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nmail: Your current password is missing or incorrect; it's required to change the Email.\n", $response);
 
 
     $normalization['pass'] = [['existing' => 'wrong']];
@@ -175,11 +171,7 @@ abstract class UserResourceTestBase extends EntityResourceTestBase {
 
     // DX: 422 when changing email while providing a wrong password.
     $response = $this->request('PATCH', $url, $request_options);
-    // @todo use this commented line instead of the 3 lines thereafter once https://www.drupal.org/node/2813755 lands.
-    // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nmail: Your current password is missing or incorrect; it's required to change the <em class=\"placeholder\">Email</em>.\n", $response);
-    $this->assertSame(422, $response->getStatusCode());
-    $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-    $this->assertSame($this->serializer->encode(['message' => "Unprocessable Entity: validation failed.\nmail: Your current password is missing or incorrect; it's required to change the <em class=\"placeholder\">Email</em>.\n"], static::$format), (string) $response->getBody());
+    $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nmail: Your current password is missing or incorrect; it's required to change the Email.\n", $response);
 
 
     $normalization['pass'] = [['existing' => $this->account->passRaw]];
@@ -200,11 +192,7 @@ abstract class UserResourceTestBase extends EntityResourceTestBase {
 
     // DX: 422 when changing password without providing the current password.
     $response = $this->request('PATCH', $url, $request_options);
-    // @todo use this commented line instead of the 3 lines thereafter once https://www.drupal.org/node/2813755 lands.
-    // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\npass: Your current password is missing or incorrect; it's required to change the <em class=\"placeholder\">Password</em>.\n", $response);
-    $this->assertSame(422, $response->getStatusCode());
-    $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
-    $this->assertSame($this->serializer->encode(['message' => "Unprocessable Entity: validation failed.\npass: Your current password is missing or incorrect; it's required to change the <em class=\"placeholder\">Password</em>.\n"], static::$format), (string) $response->getBody());
+    $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\npass: Your current password is missing or incorrect; it's required to change the Password.\n", $response);
 
 
     $normalization['pass'][0]['existing'] = $this->account->pass_raw;
@@ -229,4 +217,24 @@ abstract class UserResourceTestBase extends EntityResourceTestBase {
     $this->assertSame(200, $response->getStatusCode());
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedUnauthorizedAccessMessage($method) {
+    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
+      return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+
+    switch ($method) {
+      case 'GET':
+        return "The 'access user profiles' permission is required and the user must be active.";
+      case 'PATCH':
+        return "You are not authorized to update this user entity.";
+      case 'DELETE':
+        return 'You are not authorized to delete this user entity.';
+      default:
+        return parent::getExpectedUnauthorizedAccessMessage($method);
+    }
+  }
+
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonAnonTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonAnonTest.php
index 4e2910699..40f26ab7d 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonAnonTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonAnonTest.php
@@ -21,11 +21,6 @@ class VocabularyJsonAnonTest extends VocabularyResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * Disable the GET test coverage due to bug in taxonomy module.
    * @todo Fix in https://www.drupal.org/node/2805281: remove this override.
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
index 106005006..492a8addd 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonBasicAuthTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\rest\Functional\EntityResource\Vocabulary;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\JsonBasicAuthWorkaroundFor2805281Trait;
 
 /**
  * @group rest
@@ -27,19 +26,9 @@ class VocabularyJsonBasicAuthTest extends VocabularyResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
   protected static $auth = 'basic_auth';
 
-  // @todo Fix in https://www.drupal.org/node/2805281: remove this trait usage.
-  use JsonBasicAuthWorkaroundFor2805281Trait {
-    JsonBasicAuthWorkaroundFor2805281Trait::assertResponseWhenMissingAuthentication insteadof BasicAuthResourceTestTrait;
-  }
-
 }
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonCookieTest.php b/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonCookieTest.php
index f8939c68b..db8b65716 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonCookieTest.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/Vocabulary/VocabularyJsonCookieTest.php
@@ -21,11 +21,6 @@ class VocabularyJsonCookieTest extends VocabularyResourceTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/rest/tests/src/Functional/JsonBasicAuthWorkaroundFor2805281Trait.php b/web/core/modules/rest/tests/src/Functional/JsonBasicAuthWorkaroundFor2805281Trait.php
deleted file mode 100644
index 495bf5ae7..000000000
--- a/web/core/modules/rest/tests/src/Functional/JsonBasicAuthWorkaroundFor2805281Trait.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional;
-
-use Psr\Http\Message\ResponseInterface;
-
-trait JsonBasicAuthWorkaroundFor2805281Trait {
-
-  /**
-   * {@inheritdoc}
-   *
-   * Note that strange 'A fatal error occurred: ' prefix, that should not exist.
-   *
-   * @todo Fix in https://www.drupal.org/node/2805281: remove this trait.
-   */
-  protected function assertResponseWhenMissingAuthentication(ResponseInterface $response) {
-    $this->assertSame(401, $response->getStatusCode());
-    $this->assertSame([static::$expectedErrorMimeType], $response->getHeader('Content-Type'));
-    // Note that strange 'A fatal error occurred: ' prefix, that should not
-    // exist.
-    // @todo Fix in https://www.drupal.org/node/2805281.
-    $this->assertSame('{"message":"A fatal error occurred: No authentication credentials provided."}', (string) $response->getBody());
-  }
-
-}
diff --git a/web/core/modules/rest/tests/src/Functional/ResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/ResourceTestBase.php
index f1f0458dc..c346157be 100644
--- a/web/core/modules/rest/tests/src/Functional/ResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/ResourceTestBase.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\rest\Functional;
 
+use Behat\Mink\Driver\BrowserKitDriver;
 use Drupal\Core\Url;
 use Drupal\rest\RestResourceConfigInterface;
 use Drupal\Tests\BrowserTestBase;
@@ -46,17 +47,6 @@ abstract class ResourceTestBase extends BrowserTestBase {
    */
   protected static $mimeType = 'application/json';
 
-  /**
-   * The expected MIME type in case of 4xx error responses.
-   *
-   * (Can be different, when $mimeType for example encodes a particular
-   * normalization, such as 'application/hal+json': its error response MIME
-   * type is 'application/json'.)
-   *
-   * @var string
-   */
-  protected static $expectedErrorMimeType = 'application/json';
-
   /**
    * The authentication mechanism to use in this test.
    *
@@ -66,6 +56,15 @@ abstract class ResourceTestBase extends BrowserTestBase {
    */
   protected static $auth = FALSE;
 
+  /**
+   * The REST Resource Config entity ID under test (i.e. a resource type).
+   *
+   * The REST Resource plugin ID can be calculated from this.
+   *
+   * @var string
+   */
+  protected static $resourceConfigId = NULL;
+
   /**
    * The account to use for authentication, if any.
    *
@@ -94,6 +93,11 @@ abstract class ResourceTestBase extends BrowserTestBase {
    */
   public static $modules = ['rest'];
 
+  /**
+   * @var \GuzzleHttp\ClientInterface
+   */
+  protected $httpClient;
+
   /**
    * {@inheritdoc}
    */
@@ -130,30 +134,51 @@ abstract class ResourceTestBase extends BrowserTestBase {
 
     // Ensure there's a clean slate: delete all REST resource config entities.
     $this->resourceConfigStorage->delete($this->resourceConfigStorage->loadMultiple());
+    $this->refreshTestStateAfterRestConfigChange();
+
+    // Set up a HTTP client that accepts relative URLs.
+    $this->httpClient = $this->container->get('http_client_factory')
+      ->fromOptions(['base_uri' => $this->baseUrl]);
   }
 
   /**
-   * Provisions a REST resource.
+   * Provisions the REST resource under test.
    *
-   * @param string $resource_type
-   *   The resource type (REST resource plugin ID).
    * @param string[] $formats
    *   The allowed formats for this resource.
    * @param string[] $authentication
    *   The allowed authentication providers for this resource.
    */
-  protected function provisionResource($resource_type, $formats = [], $authentication = []) {
+  protected function provisionResource($formats = [], $authentication = []) {
     $this->resourceConfigStorage->create([
-      'id' => $resource_type,
+      'id' => static::$resourceConfigId,
       'granularity' => RestResourceConfigInterface::RESOURCE_GRANULARITY,
       'configuration' => [
         'methods' => ['GET', 'POST', 'PATCH', 'DELETE'],
         'formats' => $formats,
         'authentication' => $authentication,
-      ]
+      ],
+      'status' => TRUE,
     ])->save();
-    // @todo Remove this in https://www.drupal.org/node/2815845.
-    drupal_flush_all_caches();
+    $this->refreshTestStateAfterRestConfigChange();
+  }
+
+  /**
+   * Refreshes the state of the tester to be in sync with the testee.
+   *
+   * Should be called after every change made to:
+   * - RestResourceConfig entities
+   * - the 'rest.settings' simple configuration
+   */
+  protected function refreshTestStateAfterRestConfigChange() {
+    // Ensure that the cache tags invalidator has its internal values reset.
+    // Otherwise the http_response cache tag invalidation won't work.
+    $this->refreshVariables();
+
+    // Tests using this base class may trigger route rebuilds due to changes to
+    // RestResourceConfig entities or 'rest.settings'. Ensure the test generates
+    // routes using an up-to-date router.
+    \Drupal::service('router.builder')->rebuildIfNeeded();
   }
 
   /**
@@ -214,6 +239,29 @@ abstract class ResourceTestBase extends BrowserTestBase {
    */
   abstract protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options);
 
+  /**
+   * Return the expected error message.
+   *
+   * @param string $method
+   *   The HTTP method (GET, POST, PATCH, DELETE).
+   *
+   * @return string
+   *    The error string.
+   */
+  abstract protected function getExpectedUnauthorizedAccessMessage($method);
+
+  /**
+   * Return the default expected error message if the
+   * bc_entity_resource_permissions is true.
+   *
+   * @param string $method
+   *   The HTTP method (GET, POST, PATCH, DELETE).
+   *
+   * @return string
+   *   The error string.
+   */
+  abstract protected function getExpectedBcUnauthorizedAccessMessage($method);
+
   /**
    * Initializes authentication.
    *
@@ -295,16 +343,13 @@ abstract class ResourceTestBase extends BrowserTestBase {
    */
   protected function request($method, Url $url, array $request_options) {
     $request_options[RequestOptions::HTTP_ERRORS] = FALSE;
+    $request_options = $this->decorateWithXdebugCookie($request_options);
     return $this->httpClient->request($method, $url->toString(), $request_options);
   }
 
   /**
    * Asserts that a resource response has the given status code and body.
    *
-   * (Also asserts that the expected error MIME type is present, but this is
-   * defined globally for the test via static::$expectedErrorMimeType, because
-   * all error responses should use the same MIME type.)
-   *
    * @param int $expected_status_code
    *   The expected response status.
    * @param string|false $expected_body
@@ -318,7 +363,7 @@ abstract class ResourceTestBase extends BrowserTestBase {
       $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
     }
     else {
-      $this->assertSame([static::$expectedErrorMimeType], $response->getHeader('Content-Type'));
+      $this->assertSame([static::$mimeType], $response->getHeader('Content-Type'));
     }
     if ($expected_body !== FALSE) {
       $this->assertSame($expected_body, (string) $response->getBody());
@@ -328,10 +373,6 @@ abstract class ResourceTestBase extends BrowserTestBase {
   /**
    * Asserts that a resource error response has the given message.
    *
-   * (Also asserts that the expected error MIME type is present, but this is
-   * defined globally for the test via static::$expectedErrorMimeType, because
-   * all error responses should use the same MIME type.)
-   *
    * @param int $expected_status_code
    *   The expected response status.
    * @param string $expected_message
@@ -340,10 +381,34 @@ abstract class ResourceTestBase extends BrowserTestBase {
    *   The error response to assert.
    */
   protected function assertResourceErrorResponse($expected_status_code, $expected_message, ResponseInterface $response) {
-    // @todo Fix this in https://www.drupal.org/node/2813755.
-    $encode_options = ['json_encode_options' => JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT];
-    $expected_body = $this->serializer->encode(['message' => $expected_message], static::$format, $encode_options);
+    $expected_body = ($expected_message !== FALSE) ? $this->serializer->encode(['message' => $expected_message], static::$format) : FALSE;
     $this->assertResourceResponse($expected_status_code, $expected_body, $response);
   }
 
+  /**
+   * Adds the Xdebug cookie to the request options.
+   *
+   * @param array $request_options
+   *   The request options.
+   *
+   * @return array
+   *   Request options updated with the Xdebug cookie if present.
+   */
+  protected function decorateWithXdebugCookie(array $request_options) {
+    $session = $this->getSession();
+    $driver = $session->getDriver();
+    if ($driver instanceof BrowserKitDriver) {
+      $client = $driver->getClient();
+      foreach ($client->getCookieJar()->all() as $cookie) {
+        if (isset($request_options[RequestOptions::HEADERS]['Cookie'])) {
+          $request_options[RequestOptions::HEADERS]['Cookie'] .= '; ' . $cookie->getName() . '=' . $cookie->getValue();
+        }
+        else {
+          $request_options[RequestOptions::HEADERS]['Cookie'] = $cookie->getName() . '=' . $cookie->getValue();
+        }
+      }
+    }
+    return $request_options;
+  }
+
 }
diff --git a/web/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php b/web/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
index 905b449a7..b417e2acd 100644
--- a/web/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
+++ b/web/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\rest\Kernel;
 
-use Drupal\Component\Serialization\Json;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Routing\RouteMatch;
 use Drupal\KernelTests\KernelTestBase;
@@ -10,8 +9,6 @@ use Drupal\rest\Plugin\ResourceBase;
 use Drupal\rest\RequestHandler;
 use Drupal\rest\ResourceResponse;
 use Drupal\rest\RestResourceConfigInterface;
-use Prophecy\Argument;
-use Prophecy\Prophecy\MethodProphecy;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
@@ -48,11 +45,9 @@ class RequestHandlerTest extends KernelTestBase {
   }
 
   /**
-   * Assert some basic handler method logic.
-   *
    * @covers ::handle
    */
-  public function testBaseHandler() {
+  public function testHandle() {
     $request = new Request();
     $route_match = new RouteMatch('test', new Route('/rest/test', ['_rest_resource_config' => 'restplugin'], ['_format' => 'json']));
 
@@ -91,249 +86,6 @@ class RequestHandlerTest extends KernelTestBase {
     $this->assertEquals($response, $handler_response);
   }
 
-  /**
-   * Test that given structured data, the request handler will serialize it.
-   *
-   * @dataProvider providerTestSerialization
-   * @covers ::handle
-   */
-  public function testSerialization($data, $expected_response = FALSE) {
-    $request = new Request();
-    $route_match = new RouteMatch('test', new Route('/rest/test', ['_rest_resource_config' => 'restplugin'], ['_format' => 'json']));
-
-    $resource = $this->prophesize(StubRequestHandlerResourcePlugin::class);
-
-    // Mock the configuration.
-    $config = $this->prophesize(RestResourceConfigInterface::class);
-    $config->getResourcePlugin()->willReturn($resource->reveal());
-    $config->getCacheContexts()->willReturn([]);
-    $config->getCacheTags()->willReturn([]);
-    $config->getCacheMaxAge()->willReturn(12);
-    $this->entityStorage->load('restplugin')->willReturn($config->reveal());
-
-    $response = new ResourceResponse($data);
-    $resource->get(NULL, $request)
-      ->willReturn($response);
-    $handler_response = $this->requestHandler->handle($route_match, $request);
-    // Content is a serialized version of the data we provided.
-    $this->assertEquals($expected_response !== FALSE ? $expected_response : json_encode($data), $handler_response->getContent());
-  }
-
-  public function providerTestSerialization() {
-    return [
-      // The default data for \Drupal\rest\ResourceResponse.
-      [NULL, ''],
-      [''],
-      ['string'],
-      ['Complex \ string $%^&@ with unicode ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ'],
-      [[]],
-      [['test']],
-      [['test' => 'foobar']],
-      [TRUE],
-      [FALSE],
-      // @todo Not supported. https://www.drupal.org/node/2427811
-      // [new \stdClass()],
-      // [(object) ['test' => 'foobar']],
-    ];
-  }
-
-  /**
-   * @covers ::getResponseFormat
-   *
-   * Note this does *not* need to test formats being requested that are not
-   * accepted by the server, because the routing system would have already
-   * prevented those from reaching RequestHandler.
-   *
-   * @param string[] $methods
-   *   The HTTP methods to test.
-   * @param string[] $supported_formats
-   *   The supported formats for the REST route to be tested.
-   * @param string|false $request_format
-   *   The value for the ?_format URL query argument, if any.
-   * @param string[] $request_headers
-   *   The request headers to send, if any.
-   * @param string|null $request_body
-   *   The request body to send, if any.
-   * @param string|null $expected_response_content_type
-   *   The expected MIME type of the response, if any.
-   * @param string $expected_response_content
-   *   The expected content of the response.
-   *
-   * @dataProvider providerTestResponseFormat
-   */
-  public function testResponseFormat($methods, array $supported_formats, $request_format, array $request_headers, $request_body, $expected_response_content_type, $expected_response_content) {
-    $rest_config_name = $this->randomMachineName();
-
-    $parameters = [];
-    if ($request_format !== FALSE) {
-      $parameters['_format'] = $request_format;
-    }
-
-    foreach ($request_headers as $key => $value) {
-      unset($request_headers[$key]);
-      $key = strtoupper(str_replace('-', '_', $key));
-      $request_headers[$key] = $value;
-    }
-
-    foreach ($methods as $method) {
-      $request = Request::create('/rest/test', $method, $parameters, [], [], $request_headers, $request_body);
-      $route_requirement_key_format = $request->isMethodSafe() ? '_format' : '_content_type_format';
-      $route_match = new RouteMatch('test', new Route('/rest/test', ['_rest_resource_config' => $rest_config_name], [$route_requirement_key_format => implode('|', $supported_formats)]));
-
-      $resource = $this->prophesize(StubRequestHandlerResourcePlugin::class);
-
-      // Mock the configuration.
-      $config = $this->prophesize(RestResourceConfigInterface::class);
-      $config->getFormats($method)->willReturn($supported_formats);
-      $config->getResourcePlugin()->willReturn($resource->reveal());
-      $config->getCacheContexts()->willReturn([]);
-      $config->getCacheTags()->willReturn([]);
-      $config->getCacheMaxAge()->willReturn(12);
-      $this->entityStorage->load($rest_config_name)->willReturn($config->reveal());
-
-      // Mock the resource plugin.
-      $response = new ResourceResponse($method !== 'DELETE' ? ['REST' => 'Drupal'] : NULL);
-      $resource->getPluginDefinition()->willReturn([]);
-      $method_prophecy = new MethodProphecy($resource, strtolower($method), [Argument::any(), $request]);
-      $method_prophecy->willReturn($response);
-      $resource->addMethodProphecy($method_prophecy);
-
-      // Test the request handler.
-      $handler_response = $this->requestHandler->handle($route_match, $request);
-      $this->assertSame($expected_response_content_type, $handler_response->headers->get('Content-Type'));
-      $this->assertEquals($expected_response_content, $handler_response->getContent());
-    }
-  }
-
-  /**
-   * @return array
-   *   0. methods to test
-   *   1. supported formats for route requirements
-   *   2. request format
-   *   3. request headers
-   *   4. request body
-   *   5. expected response content type
-   *   6. expected response body
-   */
-  public function providerTestResponseFormat() {
-    $json_encoded = Json::encode(['REST' => 'Drupal']);
-    $xml_encoded = "<?xml version=\"1.0\"?>\n<response><REST>Drupal</REST></response>\n";
-
-    $safe_method_test_cases = [
-      'safe methods: client requested format (JSON)' => [
-        // @todo add 'HEAD' in https://www.drupal.org/node/2752325
-        ['GET'],
-        ['xml', 'json'],
-        'json',
-        [],
-        NULL,
-        'application/json',
-        $json_encoded,
-      ],
-      'safe methods: client requested format (XML)' => [
-        // @todo add 'HEAD' in https://www.drupal.org/node/2752325
-        ['GET'],
-        ['xml', 'json'],
-        'xml',
-        [],
-        NULL,
-        'text/xml',
-        $xml_encoded,
-      ],
-      'safe methods: client requested no format: response should use the first configured format (JSON)' => [
-        // @todo add 'HEAD' in https://www.drupal.org/node/2752325
-        ['GET'],
-        ['json', 'xml'],
-        FALSE,
-        [],
-        NULL,
-        'application/json',
-        $json_encoded,
-      ],
-      'safe methods: client requested no format: response should use the first configured format (XML)' => [
-        // @todo add 'HEAD' in https://www.drupal.org/node/2752325
-        ['GET'],
-        ['xml', 'json'],
-        FALSE,
-        [],
-        NULL,
-        'text/xml',
-        $xml_encoded,
-      ],
-    ];
-
-    $unsafe_method_bodied_test_cases = [
-      'unsafe methods with response (POST, PATCH): client requested no format, response should use request body format (JSON)' => [
-        ['POST', 'PATCH'],
-        ['xml', 'json'],
-        FALSE,
-        ['Content-Type' => 'application/json'],
-        $json_encoded,
-        'application/json',
-        $json_encoded,
-      ],
-      'unsafe methods with response (POST, PATCH): client requested no format, response should use request body format (XML)' => [
-        ['POST', 'PATCH'],
-        ['xml', 'json'],
-        FALSE,
-        ['Content-Type' => 'text/xml'],
-        $xml_encoded,
-        'text/xml',
-        $xml_encoded,
-      ],
-      'unsafe methods with response (POST, PATCH): client requested format other than request body format (JSON): response format should use requested format (XML)' => [
-        ['POST', 'PATCH'],
-        ['xml', 'json'],
-        'xml',
-        ['Content-Type' => 'application/json'],
-        $json_encoded,
-        'text/xml',
-        $xml_encoded,
-      ],
-      'unsafe methods with response (POST, PATCH): client requested format other than request body format (XML), but is allowed for the request body (JSON)' => [
-        ['POST', 'PATCH'],
-        ['xml', 'json'],
-        'json',
-        ['Content-Type' => 'text/xml'],
-        $xml_encoded,
-        'application/json',
-        $json_encoded,
-      ],
-    ];
-
-    $unsafe_method_bodyless_test_cases = [
-      'unsafe methods with response bodies (DELETE): client requested no format, response should have no format' => [
-        ['DELETE'],
-        ['xml', 'json'],
-        FALSE,
-        ['Content-Type' => 'application/json'],
-        $json_encoded,
-        NULL,
-        '',
-      ],
-      'unsafe methods with response bodies (DELETE): client requested format (XML), response should have no format' => [
-        ['DELETE'],
-        ['xml', 'json'],
-        'xml',
-        ['Content-Type' => 'application/json'],
-        $json_encoded,
-        NULL,
-        '',
-      ],
-      'unsafe methods with response bodies (DELETE): client requested format (JSON), response should have no format' => [
-        ['DELETE'],
-        ['xml', 'json'],
-        'json',
-        ['Content-Type' => 'application/json'],
-        $json_encoded,
-        NULL,
-        '',
-      ],
-    ];
-
-    return $safe_method_test_cases + $unsafe_method_bodied_test_cases + $unsafe_method_bodyless_test_cases;
-  }
-
 }
 
 /**
@@ -341,9 +93,9 @@ class RequestHandlerTest extends KernelTestBase {
  */
 class StubRequestHandlerResourcePlugin extends ResourceBase {
 
-  function get() {}
-  function post() {}
-  function patch() {}
-  function delete() {}
+  public function get() {}
+  public function post() {}
+  public function patch() {}
+  public function delete() {}
 
 }
diff --git a/web/core/modules/rest/tests/src/Kernel/RestLinkManagerTest.php b/web/core/modules/rest/tests/src/Kernel/RestLinkManagerTest.php
deleted file mode 100644
index ab558e576..000000000
--- a/web/core/modules/rest/tests/src/Kernel/RestLinkManagerTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Kernel;
-
-use Drupal\Core\Url;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests that REST type and relation link managers work as expected
- * @group rest
- */
-class RestLinkManagerTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['serialization', 'rest', 'rest_test', 'system'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    \Drupal::service('router.builder')->rebuild();
-  }
-
-  /**
-   * Tests that type hooks work as expected.
-   */
-  public function testRestLinkManagers() {
-    \Drupal::moduleHandler()->invoke('rest', 'install');
-    /* @var \Drupal\rest\LinkManager\TypeLinkManagerInterface $type_manager */
-    $type_manager = \Drupal::service('rest.link_manager.type');
-    $base = Url::fromRoute('<front>', [], ['absolute' => TRUE])->toString();
-    $link = $type_manager->getTypeUri('node', 'page');
-    $this->assertEqual($link, $base . 'rest/type/node/page');
-    // Now with optional context.
-    $link = $type_manager->getTypeUri('node', 'page', ['rest_test' => TRUE]);
-    $this->assertEqual($link, 'rest_test_type');
-
-    /* @var \Drupal\rest\LinkManager\RelationLinkManagerInterface $relation_manager */
-    $relation_manager = \Drupal::service('rest.link_manager.relation');
-    $link = $relation_manager->getRelationUri('node', 'page', 'field_ref');
-    $this->assertEqual($link, $base . 'rest/relation/node/page/field_ref');
-    // Now with optional context.
-    $link = $relation_manager->getRelationUri('node', 'page', 'foobar', ['rest_test' => TRUE]);
-    $this->assertEqual($link, 'rest_test_relation');
-  }
-
-  /**
-   * Tests that type hooks work as expected even without install hook.
-   */
-  public function testRestLinkManagersNoInstallHook() {
-    /* @var \Drupal\rest\LinkManager\TypeLinkManagerInterface $type_manager */
-    $type_manager = \Drupal::service('rest.link_manager.type');
-    $base = Url::fromRoute('<front>', [], ['absolute' => TRUE])->toString();
-    $link = $type_manager->getTypeUri('node', 'page');
-    $this->assertEqual($link, $base . 'rest/type/node/page');
-    // Now with optional context.
-    $link = $type_manager->getTypeUri('node', 'page', ['rest_test' => TRUE]);
-    $this->assertEqual($link, 'rest_test_type');
-
-    /* @var \Drupal\rest\LinkManager\RelationLinkManagerInterface $relation_manager */
-    $relation_manager = \Drupal::service('rest.link_manager.relation');
-    $link = $relation_manager->getRelationUri('node', 'page', 'field_ref');
-    $this->assertEqual($link, $base . 'rest/relation/node/page/field_ref');
-    // Now with optional context.
-    $link = $relation_manager->getRelationUri('node', 'page', 'foobar', ['rest_test' => TRUE]);
-    $this->assertEqual($link, 'rest_test_relation');
-  }
-
-  /**
-   * Tests \Drupal\rest\LinkManager\LinkManager::setLinkDomain().
-   */
-  public function testRestLinkManagersSetLinkDomain() {
-    /* @var \Drupal\rest\LinkManager\LinkManager $link_manager */
-    $link_manager = \Drupal::service('rest.link_manager');
-    $link_manager->setLinkDomain('http://example.com/');
-    $link = $link_manager->getTypeUri('node', 'page');
-    $this->assertEqual($link, 'http://example.com/rest/type/node/page');
-    $link = $link_manager->getRelationUri('node', 'page', 'field_ref');
-    $this->assertEqual($link, 'http://example.com/rest/relation/node/page/field_ref');
-  }
-
-}
diff --git a/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php b/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
index c55ea3bbf..3ed654531 100644
--- a/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
+++ b/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
@@ -39,18 +39,18 @@ class CollectRoutesTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
 
-    $this->view = $this->getMock('\Drupal\views\Entity\View', array('initHandlers'), array(
-      array('id' => 'test_view'),
+    $this->view = $this->getMock('\Drupal\views\Entity\View', ['initHandlers'], [
+      ['id' => 'test_view'],
       'view',
-    ));
+    ]);
 
-    $view_executable = $this->getMock('\Drupal\views\ViewExecutable', array('initHandlers', 'getTitle'), array(), '', FALSE);
+    $view_executable = $this->getMock('\Drupal\views\ViewExecutable', ['initHandlers', 'getTitle'], [], '', FALSE);
     $view_executable->expects($this->any())
       ->method('getTitle')
       ->willReturn('View title');
 
     $view_executable->storage = $this->view;
-    $view_executable->argument = array();
+    $view_executable->argument = [];
 
     $display_manager = $this->getMockBuilder('\Drupal\views\Plugin\ViewsPluginManager')
       ->disableOriginalConstructor()
@@ -86,21 +86,21 @@ class CollectRoutesTest extends UnitTestCase {
 
     \Drupal::setContainer($container);
 
-    $this->restExport = RestExport::create($container, array(), "test_routes", array());
+    $this->restExport = RestExport::create($container, [], "test_routes", []);
     $this->restExport->view = $view_executable;
 
     // Initialize a display.
-    $this->restExport->display = array('id' => 'page_1');
+    $this->restExport->display = ['id' => 'page_1'];
 
     // Set the style option.
-    $this->restExport->setOption('style', array('type' => 'serializer'));
+    $this->restExport->setOption('style', ['type' => 'serializer']);
 
     // Set the auth option.
     $this->restExport->setOption('auth', ['basic_auth']);
 
     $display_manager->expects($this->once())
       ->method('getDefinition')
-      ->will($this->returnValue(array('id' => 'test', 'provider' => 'test')));
+      ->will($this->returnValue(['id' => 'test', 'provider' => 'test']));
 
     $none = $this->getMockBuilder('\Drupal\views\Plugin\views\access\None')
       ->disableOriginalConstructor()
@@ -110,11 +110,11 @@ class CollectRoutesTest extends UnitTestCase {
       ->method('createInstance')
       ->will($this->returnValue($none));
 
-    $style_plugin = $this->getMock('\Drupal\rest\Plugin\views\style\Serializer', array('getFormats', 'init'), array(), '', FALSE);
+    $style_plugin = $this->getMock('\Drupal\rest\Plugin\views\style\Serializer', ['getFormats', 'init'], [], '', FALSE);
 
     $style_plugin->expects($this->once())
       ->method('getFormats')
-      ->will($this->returnValue(array('json')));
+      ->will($this->returnValue(['json']));
 
     $style_plugin->expects($this->once())
       ->method('init')
diff --git a/web/core/modules/rest/tests/src/Unit/EntityResourceValidationTraitTest.php b/web/core/modules/rest/tests/src/Unit/EntityResourceValidationTraitTest.php
new file mode 100644
index 000000000..8c9758e8a
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Unit/EntityResourceValidationTraitTest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Drupal\Tests\rest\Unit;
+
+use Drupal\Core\Entity\EntityConstraintViolationList;
+use Drupal\node\Entity\Node;
+use Drupal\Tests\UnitTestCase;
+use Drupal\user\Entity\User;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+use Symfony\Component\Validator\ConstraintViolationInterface;
+
+/**
+ * @group rest
+ * @coversDefaultClass \Drupal\rest\Plugin\rest\resource\EntityResourceValidationTrait
+ */
+class EntityResourceValidationTraitTest extends UnitTestCase {
+
+  /**
+   * @covers ::validate
+   */
+  public function testValidate() {
+    $trait = $this->getMockForTrait('Drupal\rest\Plugin\rest\resource\EntityResourceValidationTrait');
+
+    $method = new \ReflectionMethod($trait, 'validate');
+    $method->setAccessible(TRUE);
+
+    $violations = $this->prophesize(EntityConstraintViolationList::class);
+    $violations->filterByFieldAccess()->shouldBeCalled()->willReturn([]);
+    $violations->count()->shouldBeCalled()->willReturn(0);
+
+    $entity = $this->prophesize(Node::class);
+    $entity->validate()->shouldBeCalled()->willReturn($violations->reveal());
+
+    $method->invoke($trait, $entity->reveal());
+  }
+
+  /**
+   * @covers ::validate
+   */
+  public function testFailedValidate() {
+    $violation1 = $this->prophesize(ConstraintViolationInterface::class);
+    $violation1->getPropertyPath()->willReturn('property_path');
+    $violation1->getMessage()->willReturn('message');
+
+    $violation2 = $this->prophesize(ConstraintViolationInterface::class);
+    $violation2->getPropertyPath()->willReturn('property_path');
+    $violation2->getMessage()->willReturn('message');
+
+    $entity = $this->prophesize(User::class);
+
+    $violations = $this->getMockBuilder(EntityConstraintViolationList::class)
+      ->setConstructorArgs([$entity->reveal(), [$violation1->reveal(), $violation2->reveal()]])
+      ->setMethods(['filterByFieldAccess'])
+      ->getMock();
+
+    $violations->expects($this->once())
+      ->method('filterByFieldAccess')
+      ->will($this->returnValue([]));
+
+    $entity->validate()->willReturn($violations);
+
+    $trait = $this->getMockForTrait('Drupal\rest\Plugin\rest\resource\EntityResourceValidationTrait');
+
+    $method = new \ReflectionMethod($trait, 'validate');
+    $method->setAccessible(TRUE);
+
+    $this->setExpectedException(UnprocessableEntityHttpException::class);
+
+    $method->invoke($trait, $entity->reveal());
+  }
+
+}
diff --git a/web/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php b/web/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
new file mode 100644
index 000000000..b16a13119
--- /dev/null
+++ b/web/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
@@ -0,0 +1,371 @@
+<?php
+
+namespace Drupal\Tests\rest\Unit\EventSubscriber;
+
+use Drupal\Component\Serialization\Json;
+use Drupal\Core\Cache\CacheableResponseInterface;
+use Drupal\Core\Render\RenderContext;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Routing\RouteMatch;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\rest\EventSubscriber\ResourceResponseSubscriber;
+use Drupal\rest\ModifiedResourceResponse;
+use Drupal\rest\ResourceResponse;
+use Drupal\rest\ResourceResponseInterface;
+use Drupal\serialization\Encoder\JsonEncoder;
+use Drupal\serialization\Encoder\XmlEncoder;
+use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Serializer\Serializer;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @coversDefaultClass \Drupal\rest\EventSubscriber\ResourceResponseSubscriber
+ * @group rest
+ */
+class ResourceResponseSubscriberTest extends UnitTestCase {
+
+  /**
+   * @covers ::onResponse
+   * @dataProvider providerTestSerialization
+   */
+  public function testSerialization($data, $expected_response = FALSE) {
+    $request = new Request();
+    $route_match = new RouteMatch('test', new Route('/rest/test', ['_rest_resource_config' => 'restplugin'], ['_format' => 'json']));
+
+    $handler_response = new ResourceResponse($data);
+    $resource_response_subscriber = $this->getFunctioningResourceResponseSubscriber($route_match);
+    $event = new FilterResponseEvent(
+      $this->prophesize(HttpKernelInterface::class)->reveal(),
+      $request,
+      HttpKernelInterface::MASTER_REQUEST,
+      $handler_response
+    );
+    $resource_response_subscriber->onResponse($event);
+
+    // Content is a serialized version of the data we provided.
+    $this->assertEquals($expected_response !== FALSE ? $expected_response : Json::encode($data), $event->getResponse()->getContent());
+  }
+
+  public function providerTestSerialization() {
+    return [
+      // The default data for \Drupal\rest\ResourceResponse.
+      'default' => [NULL, ''],
+      'empty string' => [''],
+      'simple string' => ['string'],
+      'complex string' => ['Complex \ string $%^&@ with unicode ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ'],
+      'empty array' => [[]],
+      'numeric array' => [['test']],
+      'associative array' => [['test' => 'foobar']],
+      'boolean true' => [TRUE],
+      'boolean false' => [FALSE],
+      // @todo Not supported. https://www.drupal.org/node/2427811
+      // [new \stdClass()],
+      // [(object) ['test' => 'foobar']],
+    ];
+  }
+
+  /**
+   * @covers ::getResponseFormat
+   *
+   * Note this does *not* need to test formats being requested that are not
+   * accepted by the server, because the routing system would have already
+   * prevented those from reaching the controller.
+   *
+   * @dataProvider providerTestResponseFormat
+   */
+  public function testResponseFormat($methods, array $supported_formats, $request_format, array $request_headers, $request_body, $expected_response_format, $expected_response_content_type, $expected_response_content) {
+    $parameters = [];
+    if ($request_format !== FALSE) {
+      $parameters['_format'] = $request_format;
+    }
+
+    foreach ($request_headers as $key => $value) {
+      unset($request_headers[$key]);
+      $key = strtoupper(str_replace('-', '_', $key));
+      $request_headers[$key] = $value;
+    }
+
+    foreach ($methods as $method) {
+      $request = Request::create('/rest/test', $method, $parameters, [], [], $request_headers, $request_body);
+      $route_requirement_key_format = $request->isMethodSafe() ? '_format' : '_content_type_format';
+      $route_match = new RouteMatch('test', new Route('/rest/test', ['_rest_resource_config' => $this->randomMachineName()], [$route_requirement_key_format => implode('|', $supported_formats)]));
+
+      $resource_response_subscriber = new ResourceResponseSubscriber(
+        $this->prophesize(SerializerInterface::class)->reveal(),
+        $this->prophesize(RendererInterface::class)->reveal(),
+        $route_match
+      );
+
+      $this->assertSame($expected_response_format, $resource_response_subscriber->getResponseFormat($route_match, $request));
+    }
+  }
+
+  /**
+   * @covers ::onResponse
+   * @covers ::getResponseFormat
+   * @covers ::renderResponseBody
+   * @covers ::flattenResponse
+   *
+   * @dataProvider providerTestResponseFormat
+   */
+  public function testOnResponseWithCacheableResponse($methods, array $supported_formats, $request_format, array $request_headers, $request_body, $expected_response_format, $expected_response_content_type, $expected_response_content) {
+    $rest_config_name = $this->randomMachineName();
+
+    $parameters = [];
+    if ($request_format !== FALSE) {
+      $parameters['_format'] = $request_format;
+    }
+
+    foreach ($request_headers as $key => $value) {
+      unset($request_headers[$key]);
+      $key = strtoupper(str_replace('-', '_', $key));
+      $request_headers[$key] = $value;
+    }
+
+    foreach ($methods as $method) {
+      $request = Request::create('/rest/test', $method, $parameters, [], [], $request_headers, $request_body);
+      $route_requirement_key_format = $request->isMethodSafe() ? '_format' : '_content_type_format';
+      $route_match = new RouteMatch('test', new Route('/rest/test', ['_rest_resource_config' => $rest_config_name], [$route_requirement_key_format => implode('|', $supported_formats)]));
+
+      // The RequestHandler must return a ResourceResponseInterface object.
+      $handler_response = new ResourceResponse($method !== 'DELETE' ? ['REST' => 'Drupal'] : NULL);
+      $this->assertInstanceOf(ResourceResponseInterface::class, $handler_response);
+      $this->assertInstanceOf(CacheableResponseInterface::class, $handler_response);
+
+      // The ResourceResponseSubscriber must then generate a response body and
+      // transform it to a plain CacheableResponse object.
+      $resource_response_subscriber = $this->getFunctioningResourceResponseSubscriber($route_match);
+      $event = new FilterResponseEvent(
+        $this->prophesize(HttpKernelInterface::class)->reveal(),
+        $request,
+        HttpKernelInterface::MASTER_REQUEST,
+        $handler_response
+      );
+      $resource_response_subscriber->onResponse($event);
+      $final_response = $event->getResponse();
+      $this->assertNotInstanceOf(ResourceResponseInterface::class, $final_response);
+      $this->assertInstanceOf(CacheableResponseInterface::class, $final_response);
+      $this->assertSame($expected_response_content_type, $final_response->headers->get('Content-Type'));
+      $this->assertEquals($expected_response_content, $final_response->getContent());
+    }
+  }
+
+  /**
+   * @covers ::onResponse
+   * @covers ::getResponseFormat
+   * @covers ::renderResponseBody
+   * @covers ::flattenResponse
+   *
+   * @dataProvider providerTestResponseFormat
+   */
+  public function testOnResponseWithUncacheableResponse($methods, array $supported_formats, $request_format, array $request_headers, $request_body, $expected_response_format, $expected_response_content_type, $expected_response_content) {
+    $rest_config_name = $this->randomMachineName();
+
+    $parameters = [];
+    if ($request_format !== FALSE) {
+      $parameters['_format'] = $request_format;
+    }
+
+    foreach ($request_headers as $key => $value) {
+      unset($request_headers[$key]);
+      $key = strtoupper(str_replace('-', '_', $key));
+      $request_headers[$key] = $value;
+    }
+
+    foreach ($methods as $method) {
+      $request = Request::create('/rest/test', $method, $parameters, [], [], $request_headers, $request_body);
+      $route_requirement_key_format = $request->isMethodSafe() ? '_format' : '_content_type_format';
+      $route_match = new RouteMatch('test', new Route('/rest/test', ['_rest_resource_config' => $rest_config_name], [$route_requirement_key_format => implode('|', $supported_formats)]));
+
+      // The RequestHandler must return a ResourceResponseInterface object.
+      $handler_response = new ModifiedResourceResponse($method !== 'DELETE' ? ['REST' => 'Drupal'] : NULL);
+      $this->assertInstanceOf(ResourceResponseInterface::class, $handler_response);
+      $this->assertNotInstanceOf(CacheableResponseInterface::class, $handler_response);
+
+      // The ResourceResponseSubscriber must then generate a response body and
+      // transform it to a plain Response object.
+      $resource_response_subscriber = $this->getFunctioningResourceResponseSubscriber($route_match);
+      $event = new FilterResponseEvent(
+        $this->prophesize(HttpKernelInterface::class)->reveal(),
+        $request,
+        HttpKernelInterface::MASTER_REQUEST,
+        $handler_response
+      );
+      $resource_response_subscriber->onResponse($event);
+      $final_response = $event->getResponse();
+      $this->assertNotInstanceOf(ResourceResponseInterface::class, $final_response);
+      $this->assertNotInstanceOf(CacheableResponseInterface::class, $final_response);
+      $this->assertSame($expected_response_content_type, $final_response->headers->get('Content-Type'));
+      $this->assertEquals($expected_response_content, $final_response->getContent());
+    }
+  }
+
+  /**
+   * @return array
+   *   0. methods to test
+   *   1. supported formats for route requirements
+   *   2. request format
+   *   3. request headers
+   *   4. request body
+   *   5. expected response format
+   *   6. expected response content type
+   *   7. expected response body
+   */
+  public function providerTestResponseFormat() {
+    $json_encoded = Json::encode(['REST' => 'Drupal']);
+    $xml_encoded = "<?xml version=\"1.0\"?>\n<response><REST>Drupal</REST></response>\n";
+
+    $safe_method_test_cases = [
+      'safe methods: client requested format (JSON)' => [
+        // @todo add 'HEAD' in https://www.drupal.org/node/2752325
+        ['GET'],
+        ['xml', 'json'],
+        'json',
+        [],
+        NULL,
+        'json',
+        'application/json',
+        $json_encoded,
+      ],
+      'safe methods: client requested format (XML)' => [
+        // @todo add 'HEAD' in https://www.drupal.org/node/2752325
+        ['GET'],
+        ['xml', 'json'],
+        'xml',
+        [],
+        NULL,
+        'xml',
+        'text/xml',
+        $xml_encoded,
+      ],
+      'safe methods: client requested no format: response should use the first configured format (JSON)' => [
+        // @todo add 'HEAD' in https://www.drupal.org/node/2752325
+        ['GET'],
+        ['json', 'xml'],
+        FALSE,
+        [],
+        NULL,
+        'json',
+        'application/json',
+        $json_encoded,
+      ],
+      'safe methods: client requested no format: response should use the first configured format (XML)' => [
+        // @todo add 'HEAD' in https://www.drupal.org/node/2752325
+        ['GET'],
+        ['xml', 'json'],
+        FALSE,
+        [],
+        NULL,
+        'xml',
+        'text/xml',
+        $xml_encoded,
+      ],
+    ];
+
+    $unsafe_method_bodied_test_cases = [
+      'unsafe methods with response (POST, PATCH): client requested no format, response should use request body format (JSON)' => [
+        ['POST', 'PATCH'],
+        ['xml', 'json'],
+        FALSE,
+        ['Content-Type' => 'application/json'],
+        $json_encoded,
+        'json',
+        'application/json',
+        $json_encoded,
+      ],
+      'unsafe methods with response (POST, PATCH): client requested no format, response should use request body format (XML)' => [
+        ['POST', 'PATCH'],
+        ['xml', 'json'],
+        FALSE,
+        ['Content-Type' => 'text/xml'],
+        $xml_encoded,
+        'xml',
+        'text/xml',
+        $xml_encoded,
+      ],
+      'unsafe methods with response (POST, PATCH): client requested format other than request body format (JSON): response format should use requested format (XML)' => [
+        ['POST', 'PATCH'],
+        ['xml', 'json'],
+        'xml',
+        ['Content-Type' => 'application/json'],
+        $json_encoded,
+        'xml',
+        'text/xml',
+        $xml_encoded,
+      ],
+      'unsafe methods with response (POST, PATCH): client requested format other than request body format (XML), but is allowed for the request body (JSON)' => [
+        ['POST', 'PATCH'],
+        ['xml', 'json'],
+        'json',
+        ['Content-Type' => 'text/xml'],
+        $xml_encoded,
+        'json',
+        'application/json',
+        $json_encoded,
+      ],
+    ];
+
+    $unsafe_method_bodyless_test_cases = [
+      'unsafe methods with response bodies (DELETE): client requested no format, response should have no format' => [
+        ['DELETE'],
+        ['xml', 'json'],
+        FALSE,
+        ['Content-Type' => 'application/json'],
+        NULL,
+        'xml',
+        NULL,
+        '',
+      ],
+      'unsafe methods with response bodies (DELETE): client requested format (XML), response should have no format' => [
+        ['DELETE'],
+        ['xml', 'json'],
+        'xml',
+        ['Content-Type' => 'application/json'],
+        NULL,
+        'xml',
+        NULL,
+        '',
+      ],
+      'unsafe methods with response bodies (DELETE): client requested format (JSON), response should have no format' => [
+        ['DELETE'],
+        ['xml', 'json'],
+        'json',
+        ['Content-Type' => 'application/json'],
+        NULL,
+        'json',
+        NULL,
+        '',
+      ],
+    ];
+
+    return $safe_method_test_cases + $unsafe_method_bodied_test_cases + $unsafe_method_bodyless_test_cases;
+  }
+
+  /**
+   * @return \Drupal\rest\EventSubscriber\ResourceResponseSubscriber
+   */
+  protected function getFunctioningResourceResponseSubscriber(RouteMatchInterface $route_match) {
+    // Create a dummy of the renderer service.
+    $renderer = $this->prophesize(RendererInterface::class);
+    $renderer->executeInRenderContext(Argument::type(RenderContext::class), Argument::type('callable'))
+      ->will(function ($args) {
+        $callable = $args[1];
+        return $callable();
+      });
+
+    // Instantiate the ResourceResponseSubscriber we will test.
+    $resource_response_subscriber = new ResourceResponseSubscriber(
+      new Serializer([], [new JsonEncoder(), new XmlEncoder()]),
+      $renderer->reveal(),
+      $route_match
+    );
+
+    return $resource_response_subscriber;
+  }
+
+}
diff --git a/web/core/modules/search/search.install b/web/core/modules/search/search.install
index f920aa5ae..d55c4d2f0 100644
--- a/web/core/modules/search/search.install
+++ b/web/core/modules/search/search.install
@@ -9,116 +9,116 @@
  * Implements hook_schema().
  */
 function search_schema() {
-  $schema['search_dataset'] = array(
+  $schema['search_dataset'] = [
     'description' => 'Stores items that will be searched.',
-    'fields' => array(
-      'sid' => array(
+    'fields' => [
+      'sid' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'Search item ID, e.g. node ID for nodes.',
-      ),
-      'langcode' => array(
+      ],
+      'langcode' => [
         'type' => 'varchar_ascii',
         'length' => '12',
         'not null' => TRUE,
         'description' => 'The {languages}.langcode of the item variant.',
         'default' => '',
-      ),
-      'type' => array(
+      ],
+      'type' => [
         'type' => 'varchar_ascii',
         'length' => 64,
         'not null' => TRUE,
         'description' => 'Type of item, e.g. node.',
-      ),
-      'data' => array(
+      ],
+      'data' => [
         'type' => 'text',
         'not null' => TRUE,
         'size' => 'big',
         'description' => 'List of space-separated words from the item.',
-      ),
-      'reindex' => array(
+      ],
+      'reindex' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'Set to force node reindexing.',
-      ),
-    ),
-    'primary key' => array('sid', 'langcode', 'type'),
-  );
+      ],
+    ],
+    'primary key' => ['sid', 'langcode', 'type'],
+  ];
 
-  $schema['search_index'] = array(
+  $schema['search_index'] = [
     'description' => 'Stores the search index, associating words, items and scores.',
-    'fields' => array(
-      'word' => array(
+    'fields' => [
+      'word' => [
         'type' => 'varchar',
         'length' => 50,
         'not null' => TRUE,
         'default' => '',
         'description' => 'The {search_total}.word that is associated with the search item.',
-      ),
-      'sid' => array(
+      ],
+      'sid' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The {search_dataset}.sid of the searchable item to which the word belongs.',
-      ),
-      'langcode' => array(
+      ],
+      'langcode' => [
         'type' => 'varchar_ascii',
         'length' => '12',
         'not null' => TRUE,
         'description' => 'The {languages}.langcode of the item variant.',
         'default' => '',
-      ),
-      'type' => array(
+      ],
+      'type' => [
         'type' => 'varchar_ascii',
         'length' => 64,
         'not null' => TRUE,
         'description' => 'The {search_dataset}.type of the searchable item to which the word belongs.',
-      ),
-      'score' => array(
+      ],
+      'score' => [
         'type' => 'float',
         'not null' => FALSE,
         'description' => 'The numeric score of the word, higher being more important.',
-      ),
-    ),
-    'indexes' => array(
-      'sid_type' => array('sid', 'langcode', 'type'),
-    ),
-    'foreign keys' => array(
-      'search_dataset' => array(
+      ],
+    ],
+    'indexes' => [
+      'sid_type' => ['sid', 'langcode', 'type'],
+    ],
+    'foreign keys' => [
+      'search_dataset' => [
         'table' => 'search_dataset',
-        'columns' => array(
+        'columns' => [
           'sid' => 'sid',
           'langcode' => 'langcode',
           'type' => 'type',
-        ),
-      ),
-    ),
-    'primary key' => array('word', 'sid', 'langcode', 'type'),
-  );
+        ],
+      ],
+    ],
+    'primary key' => ['word', 'sid', 'langcode', 'type'],
+  ];
 
-  $schema['search_total'] = array(
+  $schema['search_total'] = [
     'description' => 'Stores search totals for words.',
-    'fields' => array(
-      'word' => array(
+    'fields' => [
+      'word' => [
         'description' => 'Primary Key: Unique word in the search index.',
         'type' => 'varchar',
         'length' => 50,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'count' => array(
+      ],
+      'count' => [
         'description' => "The count of the word in the index using Zipf's law to equalize the probability distribution.",
         'type' => 'float',
         'not null' => FALSE,
-      ),
-    ),
-    'primary key' => array('word'),
-  );
+      ],
+    ],
+    'primary key' => ['word'],
+  ];
 
   return $schema;
 }
@@ -129,7 +129,7 @@ function search_schema() {
  * For the Status Report, return information about search index status.
  */
 function search_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
 
   if ($phase == 'runtime') {
     $remaining = 0;
@@ -145,11 +145,11 @@ function search_requirements($phase) {
     // Use floor() to calculate the percentage, so if it is not quite 100%, it
     // will show as 99%, to indicate "almost done".
     $percent = ($total > 0 ? floor(100 * $done / $total) : 100);
-    $requirements['search_status'] = array(
+    $requirements['search_status'] = [
       'title' => t('Search index progress'),
-      'value' => t('@percent% (@remaining remaining)', array('@percent' => $percent, '@remaining' => $remaining)),
+      'value' => t('@percent% (@remaining remaining)', ['@percent' => $percent, '@remaining' => $remaining]),
       'severity' => REQUIREMENT_INFO,
-    );
+    ];
   }
 
   return $requirements;
diff --git a/web/core/modules/search/search.module b/web/core/modules/search/search.module
index c36aa443d..bf00878d3 100644
--- a/web/core/modules/search/search.module
+++ b/web/core/modules/search/search.module
@@ -74,20 +74,20 @@ function search_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.search':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Search module provides the ability to set up search pages based on plugins provided by other modules. In Drupal core, there are two page-type plugins: the Content page type provides keyword searching for content managed by the Node module, and the Users page type provides keyword searching for registered users. Contributed modules may provide other page-type plugins. For more information, see the <a href=":search-module">online documentation for the Search module</a>.', array(':search-module' => 'https://www.drupal.org/documentation/modules/search')) . '</p>';
+      $output .= '<p>' . t('The Search module provides the ability to set up search pages based on plugins provided by other modules. In Drupal core, there are two page-type plugins: the Content page type provides keyword searching for content managed by the Node module, and the Users page type provides keyword searching for registered users. Contributed modules may provide other page-type plugins. For more information, see the <a href=":search-module">online documentation for the Search module</a>.', [':search-module' => 'https://www.drupal.org/documentation/modules/search']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Configuring search pages') . '</dt>';
-      $output .= '<dd>' . t('To configure search pages, visit the <a href=":search-settings">Search pages page</a>. In the Search pages section, you can add a new search page, edit the configuration of existing search pages, enable and disable search pages, and choose the default search page. Each enabled search page has a URL path starting with <em>search</em>, and each will appear as a tab or local task link on the <a href=":search-url">search page</a>; you can configure the text that is shown in the tab. In addition, some search page plugins have additional settings that you can configure for each search page.', array(':search-settings' => \Drupal::url('entity.search_page.collection'), ':search-url' => \Drupal::url('search.view'))) . '</dd>';
+      $output .= '<dd>' . t('To configure search pages, visit the <a href=":search-settings">Search pages page</a>. In the Search pages section, you can add a new search page, edit the configuration of existing search pages, enable and disable search pages, and choose the default search page. Each enabled search page has a URL path starting with <em>search</em>, and each will appear as a tab or local task link on the <a href=":search-url">search page</a>; you can configure the text that is shown in the tab. In addition, some search page plugins have additional settings that you can configure for each search page.', [':search-settings' => \Drupal::url('entity.search_page.collection'), ':search-url' => \Drupal::url('search.view')]) . '</dd>';
       $output .= '<dt>' . t('Managing the search index') . '</dt>';
-      $output .= '<dd>' . t('Some search page plugins, such as the core Content search page, index searchable text using the Drupal core search index, and will not work unless content is indexed. Indexing is done during <em>cron</em> runs, so it requires a <a href=":cron">cron maintenance task</a> to be set up. There are also several settings affecting indexing that can be configured on the <a href=":search-settings">Search pages page</a>: the number of items to index per cron run, the minimum word length to index, and how to handle Chinese, Japanese, and Korean characters.', array(':cron' => \Drupal::url('system.cron_settings'), ':search-settings' => \Drupal::url('entity.search_page.collection'))) . '</dd>';
-      $output .= '<dd>' . t('Modules providing search page plugins generally ensure that content-related actions on your site (creating, editing, or deleting content and comments) automatically cause affected content items to be marked for indexing or reindexing at the next cron run. When content is marked for reindexing, the previous content remains in the index until cron runs, at which time it is replaced by the new content. However, there are some actions related to the structure of your site that do not cause affected content to be marked for reindexing. Examples of structure-related actions that affect content include deleting or editing taxonomy terms, enabling or disabling modules that add text to content (such as Taxonomy, Comment, and field-providing modules), and modifying the fields or display parameters of your content types. If you take one of these actions and you want to ensure that the search index is updated to reflect your changed site structure, you can mark all content for reindexing by clicking the "Re-index site" button on the <a href=":search-settings">Search pages page</a>. If you have a lot of content on your site, it may take several cron runs for the content to be reindexed.', array(':search-settings' => \Drupal::url('entity.search_page.collection'))) . '</dd>';
+      $output .= '<dd>' . t('Some search page plugins, such as the core Content search page, index searchable text using the Drupal core search index, and will not work unless content is indexed. Indexing is done during <em>cron</em> runs, so it requires a <a href=":cron">cron maintenance task</a> to be set up. There are also several settings affecting indexing that can be configured on the <a href=":search-settings">Search pages page</a>: the number of items to index per cron run, the minimum word length to index, and how to handle Chinese, Japanese, and Korean characters.', [':cron' => \Drupal::url('system.cron_settings'), ':search-settings' => \Drupal::url('entity.search_page.collection')]) . '</dd>';
+      $output .= '<dd>' . t('Modules providing search page plugins generally ensure that content-related actions on your site (creating, editing, or deleting content and comments) automatically cause affected content items to be marked for indexing or reindexing at the next cron run. When content is marked for reindexing, the previous content remains in the index until cron runs, at which time it is replaced by the new content. However, there are some actions related to the structure of your site that do not cause affected content to be marked for reindexing. Examples of structure-related actions that affect content include deleting or editing taxonomy terms, enabling or disabling modules that add text to content (such as Taxonomy, Comment, and field-providing modules), and modifying the fields or display parameters of your content types. If you take one of these actions and you want to ensure that the search index is updated to reflect your changed site structure, you can mark all content for reindexing by clicking the "Re-index site" button on the <a href=":search-settings">Search pages page</a>. If you have a lot of content on your site, it may take several cron runs for the content to be reindexed.', [':search-settings' => \Drupal::url('entity.search_page.collection')]) . '</dd>';
       $output .= '<dt>' . t('Displaying the Search block') . '</dt>';
-      $output .= '<dd>' . t('The Search module includes a block, which can be enabled and configured on the <a href=":blocks">Block layout page</a>, if you have the Block module enabled; the default block title is Search, and it is the Search form block in the Forms category, if you wish to add another instance. The block is available to users with the <a href=":search_permission">Use search</a> permission, and it performs a search using the configured default search page.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', ':search_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-search')))) . '</dd>';
+      $output .= '<dd>' . t('The Search module includes a block, which can be enabled and configured on the <a href=":blocks">Block layout page</a>, if you have the Block module enabled; the default block title is Search, and it is the Search form block in the Forms category, if you wish to add another instance. The block is available to users with the <a href=":search_permission">Use search</a> permission, and it performs a search using the configured default search page.', [':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', ':search_permission' => \Drupal::url('user.admin_permissions', [], ['fragment' => 'module-search'])]) . '</dd>';
       $output .= '<dt>' . t('Searching your site') . '</dt>';
-      $output .= '<dd>' . t('Users with <a href=":search_permission">Use search</a> permission can use the Search block and <a href=":search">Search page</a>. Users with the <a href=":node_permission">View published content</a> permission can use configured search pages of type <em>Content</em> to search for content containing exact keywords; in addition, users with <a href=":search_permission">Use advanced search</a> permission can use more complex search filtering. Users with the <a href=":user_permission">View user information</a> permission can use configured search pages of type <em>Users</em> to search for active users containing the keyword anywhere in the username, and users with the <a href=":user_permission">Administer users</a> permission can search for active and blocked users, by email address or username keyword.', array(':search' => \Drupal::url('search.view'), ':search_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-search')), ':node_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-node')), ':user_permission' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-user')))) . '</dd>';
+      $output .= '<dd>' . t('Users with <a href=":search_permission">Use search</a> permission can use the Search block and <a href=":search">Search page</a>. Users with the <a href=":node_permission">View published content</a> permission can use configured search pages of type <em>Content</em> to search for content containing exact keywords; in addition, users with <a href=":search_permission">Use advanced search</a> permission can use more complex search filtering. Users with the <a href=":user_permission">View user information</a> permission can use configured search pages of type <em>Users</em> to search for active users containing the keyword anywhere in the username, and users with the <a href=":user_permission">Administer users</a> permission can search for active and blocked users, by email address or username keyword.', [':search' => \Drupal::url('search.view'), ':search_permission' => \Drupal::url('user.admin_permissions', [], ['fragment' => 'module-search']), ':node_permission' => \Drupal::url('user.admin_permissions', [], ['fragment' => 'module-node']), ':user_permission' => \Drupal::url('user.admin_permissions', [], ['fragment' => 'module-user'])]) . '</dd>';
       $output .= '<dt>' . t('Extending the Search module') . '</dt>';
-      $output .= '<dd>' . t('By default, the Search module only supports exact keyword matching in content searches. You can modify this behavior by installing a language-specific stemming module for your language (such as <a href=":porterstemmer_url">Porter Stemmer</a> for American English), which allows words such as walk, walking, and walked to be matched in the Search module. Another approach is to use a third-party search technology with stemming or partial word matching features built in, such as <a href=":solr_url">Apache Solr</a> or <a href=":sphinx_url">Sphinx</a>. There are also contributed modules that provide additional search pages. These and other <a href=":contrib-search">search-related contributed modules</a> can be downloaded by visiting Drupal.org.', array(':contrib-search' => 'https://www.drupal.org/project/project_module?f[2]=im_vid_3%3A105', ':porterstemmer_url' => 'https://www.drupal.org/project/porterstemmer', ':solr_url' => 'https://www.drupal.org/project/apachesolr', ':sphinx_url' => 'https://www.drupal.org/project/sphinx')) . '</dd>';
+      $output .= '<dd>' . t('By default, the Search module only supports exact keyword matching in content searches. You can modify this behavior by installing a language-specific stemming module for your language (such as <a href=":porterstemmer_url">Porter Stemmer</a> for American English), which allows words such as walk, walking, and walked to be matched in the Search module. Another approach is to use a third-party search technology with stemming or partial word matching features built in, such as <a href=":solr_url">Apache Solr</a> or <a href=":sphinx_url">Sphinx</a>. There are also contributed modules that provide additional search pages. These and other <a href=":contrib-search">search-related contributed modules</a> can be downloaded by visiting Drupal.org.', [':contrib-search' => 'https://www.drupal.org/project/project_module?f[2]=im_vid_3%3A105', ':porterstemmer_url' => 'https://www.drupal.org/project/porterstemmer', ':solr_url' => 'https://www.drupal.org/project/apachesolr', ':sphinx_url' => 'https://www.drupal.org/project/sphinx']) . '</dd>';
       $output .= '</dl>';
       return $output;
   }
@@ -97,12 +97,12 @@ function search_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function search_theme() {
-  return array(
-    'search_result' => array(
-      'variables' => array('result' => NULL, 'plugin_id' => NULL),
+  return [
+    'search_result' => [
+      'variables' => ['result' => NULL, 'plugin_id' => NULL],
       'file' => 'search.pages.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -167,7 +167,7 @@ function search_index_clear($type = NULL, $sid = NULL, $langcode = NULL) {
  * total counts in the search_total table, and need to be recounted.
  */
 function search_dirty($word = NULL) {
-  $dirty = &drupal_static(__FUNCTION__, array());
+  $dirty = &drupal_static(__FUNCTION__, []);
   if ($word !== NULL) {
     $dirty[$word] = TRUE;
   }
@@ -206,18 +206,18 @@ function search_update_totals() {
   // Update word IDF (Inverse Document Frequency) counts for new/changed words.
   foreach (search_dirty() as $word => $dummy) {
     // Get total count
-    $total = db_query("SELECT SUM(score) FROM {search_index} WHERE word = :word", array(':word' => $word), array('target' => 'replica'))->fetchField();
+    $total = db_query("SELECT SUM(score) FROM {search_index} WHERE word = :word", [':word' => $word], ['target' => 'replica'])->fetchField();
     // Apply Zipf's law to equalize the probability distribution.
     $total = log10(1 + 1 / (max(1, $total)));
     db_merge('search_total')
       ->key('word', $word)
-      ->fields(array('count' => $total))
+      ->fields(['count' => $total])
       ->execute();
   }
   // Find words that were deleted from search_index, but are still in
   // search_total. We use a LEFT JOIN between the two tables and keep only the
   // rows which fail to join.
-  $result = db_query("SELECT t.word AS realword, i.word FROM {search_total} t LEFT JOIN {search_index} i ON t.word = i.word WHERE i.word IS NULL", array(), array('target' => 'replica'));
+  $result = db_query("SELECT t.word AS realword, i.word FROM {search_total} t LEFT JOIN {search_index} i ON t.word = i.word WHERE i.word IS NULL", [], ['target' => 'replica']);
   $or = db_or();
   foreach ($result as $word) {
     $or->condition('word', $word->realword);
@@ -329,7 +329,7 @@ function search_expand_cjk($matches) {
   }
   $tokens = ' ';
   // Build a FIFO queue of characters.
-  $chars = array();
+  $chars = [];
   for ($i = 0; $i < $length; $i++) {
     // Add the next character off the beginning of the string to the queue.
     $current = Unicode::substr($str, 0, 1);
@@ -382,7 +382,7 @@ function search_index_split($text, $langcode = NULL) {
 function _search_index_truncate(&$text) {
   // Use a static array to avoid re-truncating text we've done before.
   // The same words may often be passed in during excerpt generation.
-  static $truncated = array();
+  static $truncated = [];
   if (isset($truncated[$text])) {
     $text = $truncated[$text];
     return;
@@ -408,7 +408,7 @@ function _search_index_truncate(&$text) {
  */
 function search_invoke_preprocess(&$text, $langcode = NULL) {
   foreach (\Drupal::moduleHandler()->getImplementations('search_preprocess') as $module) {
-    $text = \Drupal::moduleHandler()->invoke($module, 'search_preprocess', array($text, $langcode));
+    $text = \Drupal::moduleHandler()->invoke($module, 'search_preprocess', [$text, $langcode]);
   }
 }
 
@@ -437,7 +437,7 @@ function search_index($type, $sid, $langcode, $text) {
 
   // Strip off all ignored tags to speed up processing, but insert space before
   // and after them to keep word boundaries.
-  $text = str_replace(array('<', '>'), array(' <', '> '), $text);
+  $text = str_replace(['<', '>'], [' <', '> '], $text);
   $text = strip_tags($text, '<' . implode('><', array_keys($tags)) . '>');
 
   // Split HTML tags from plain text.
@@ -448,11 +448,11 @@ function search_index($type, $sid, $langcode, $text) {
   $tag = FALSE; // Odd/even counter. Tag or no tag.
   $score = 1; // Starting score per word
   $accum = ' '; // Accumulator for cleaned up data
-  $tagstack = array(); // Stack with open tags
+  $tagstack = []; // Stack with open tags
   $tagwords = 0; // Counter for consecutive words
   $focus = 1; // Focus state
 
-  $scored_words = array(); // Accumulator for words for index
+  $scored_words = []; // Accumulator for words for index
 
   foreach ($split as $value) {
     if ($tag) {
@@ -464,7 +464,7 @@ function search_index($type, $sid, $langcode, $text) {
         $tagname = substr($tagname, 1);
         // If we encounter unexpected tags, reset score to avoid incorrect boosting.
         if (!count($tagstack) || $tagstack[0] != $tagname) {
-          $tagstack = array();
+          $tagstack = [];
           $score = 1;
         }
         else {
@@ -476,7 +476,7 @@ function search_index($type, $sid, $langcode, $text) {
         if (isset($tagstack[0]) && $tagstack[0] == $tagname) {
           // None of the tags we look for make sense when nested identically.
           // If they are, it's probably broken HTML.
-          $tagstack = array();
+          $tagstack = [];
           $score = 1;
         }
         else {
@@ -508,7 +508,7 @@ function search_index($type, $sid, $langcode, $text) {
           $tagwords++;
           // Too many words inside a single tag probably mean a tag was accidentally left open.
           if (count($tagstack) && $tagwords >= 15) {
-            $tagstack = array();
+            $tagstack = [];
             $score = 1;
           }
         }
@@ -523,13 +523,13 @@ function search_index($type, $sid, $langcode, $text) {
 
   // Insert cleaned up data into dataset
   db_insert('search_dataset')
-    ->fields(array(
+    ->fields([
       'sid' => $sid,
       'langcode' => $langcode,
       'type' => $type,
       'data' => $accum,
       'reindex' => 0,
-    ))
+    ])
     ->execute();
 
   // Insert results into search index
@@ -538,14 +538,14 @@ function search_index($type, $sid, $langcode, $text) {
     // appropriately. If not, we create a new record with the appropriate
     // starting score.
     db_merge('search_index')
-      ->keys(array(
+      ->keys([
         'word' => $word,
         'sid' => $sid,
         'langcode' => $langcode,
         'type' => $type,
-      ))
-      ->fields(array('score' => $score))
-      ->expression('score', 'score + :score', array(':score' => $score))
+      ])
+      ->fields(['score' => $score])
+      ->expression('score', 'score + :score', [':score' => $score])
       ->execute();
     search_dirty($word);
   }
@@ -571,7 +571,7 @@ function search_index($type, $sid, $langcode, $text) {
  */
 function search_mark_for_reindex($type = NULL, $sid = NULL, $langcode = NULL) {
   $query = db_update('search_dataset')
-    ->fields(array('reindex' => REQUEST_TIME))
+    ->fields(['reindex' => REQUEST_TIME])
     // Only mark items that were not previously marked for reindex, so that
     // marked items maintain their priority by request time.
     ->condition('reindex', 0);
@@ -650,14 +650,14 @@ function search_excerpt($keys, $text, $langcode = NULL) {
   $keys = array_merge($matches[2], $matches[3]);
 
   // Prepare text by stripping HTML tags and decoding HTML entities.
-  $text = strip_tags(str_replace(array('<', '>'), array(' <', '> '), $text));
+  $text = strip_tags(str_replace(['<', '>'], [' <', '> '], $text));
   $text = Html::decodeEntities($text);
   $text_length = strlen($text);
 
   // Make a list of unique keywords that are actually found in the text,
   // which could be items in $keys or replacements that are equivalent through
   // search_simplify().
-  $temp_keys = array();
+  $temp_keys = [];
   foreach ($keys as $key) {
     $key = _search_find_match_with_simplify($key, $text, $boundary_character, $langcode);
     if (isset($key)) {
@@ -672,13 +672,13 @@ function search_excerpt($keys, $text, $langcode = NULL) {
   // Extract fragments of about 60 characters around keywords, bounded by word
   // boundary characters. Try to reach 256 characters, using second occurrences
   // if necessary.
-  $ranges = array();
+  $ranges = [];
   $length = 0;
-  $look_start = array();
+  $look_start = [];
   $remaining_keys = $keys;
 
   while ($length < 256 && !empty($remaining_keys)) {
-    $found_keys = array();
+    $found_keys = [];
     foreach ($remaining_keys as $key) {
       if ($length >= 256) {
         break;
@@ -693,7 +693,7 @@ function search_excerpt($keys, $text, $langcode = NULL) {
       // See if we can find $key after where we found it the last time. Since
       // we are requiring a match on a word boundary, make sure $text starts
       // and ends with a space.
-      $matches = array();
+      $matches = [];
       if (preg_match('/' . $preceded_by_boundary . $key . $followed_by_boundary . '/iu', ' ' . $text . ' ', $matches, PREG_OFFSET_CAPTURE, $look_start[$key])) {
         $found_position = $matches[0][1];
         $look_start[$key] = $found_position + 1;
@@ -741,7 +741,7 @@ function search_excerpt($keys, $text, $langcode = NULL) {
   ksort($ranges);
 
   // Collapse overlapping text ranges into one. The sorting makes it O(n).
-  $new_ranges = array();
+  $new_ranges = [];
   $max_end = 0;
   foreach ($ranges as $this_from => $this_to) {
     $max_end = max($max_end, $this_to);
@@ -766,7 +766,7 @@ function search_excerpt($keys, $text, $langcode = NULL) {
   $new_ranges[$working_from] = $working_to;
 
   // Fetch text within the combined ranges we found.
-  $out = array();
+  $out = [];
   foreach ($new_ranges as $from => $to) {
     $out[] = substr($text, $from, $to - $from);
   }
@@ -846,7 +846,7 @@ function _search_find_match_with_simplify($key, $text, $boundary, $langcode = NU
   // Split $text into words, keeping track of where the word boundaries are.
   $words = preg_split('/' . $boundary . '+/u', $text, NULL, PREG_SPLIT_OFFSET_CAPTURE);
   // Add an entry pointing to the end of the string, for the loop below.
-  $words[] = array('', strlen($text));
+  $words[] = ['', strlen($text)];
 
   // Using a binary search, find the earliest possible ending position in
   // $text where it will still match the keyword after applying
diff --git a/web/core/modules/search/search.pages.inc b/web/core/modules/search/search.pages.inc
index a161a9bfa..9467dd825 100644
--- a/web/core/modules/search/search.pages.inc
+++ b/web/core/modules/search/search.pages.inc
@@ -12,7 +12,7 @@ use Drupal\Core\Language\LanguageInterface;
  * Implements hook_theme_suggestions_HOOK().
  */
 function search_theme_suggestions_search_result(array $variables) {
-  return array('search_result__' . $variables['plugin_id']);
+  return ['search_result__' . $variables['plugin_id']];
 }
 
 /**
@@ -42,7 +42,7 @@ function template_preprocess_search_result(&$variables) {
     $variables['content_attributes']['lang'] = $result['language'];
   }
 
-  $info = array();
+  $info = [];
   if (!empty($result['plugin_id'])) {
     $info['plugin_id'] = $result['plugin_id'];
   }
@@ -59,9 +59,9 @@ function template_preprocess_search_result(&$variables) {
   $variables['snippet'] = isset($result['snippet']) ? $result['snippet'] : '';
   // Provide separated and grouped meta information..
   $variables['info_split'] = $info;
-  $variables['info'] = array(
+  $variables['info'] = [
     '#type' => 'inline_template',
     '#template' => '{{ info|safe_join(" - ") }}',
-    '#context' => array('info' => $info),
-  );
+    '#context' => ['info' => $info],
+  ];
 }
diff --git a/web/core/modules/search/src/Controller/SearchController.php b/web/core/modules/search/src/Controller/SearchController.php
index 3460c3206..ac078e18e 100644
--- a/web/core/modules/search/src/Controller/SearchController.php
+++ b/web/core/modules/search/src/Controller/SearchController.php
@@ -72,7 +72,7 @@ class SearchController extends ControllerBase {
    *   The search form and search results build array.
    */
   public function view(Request $request, SearchPageInterface $entity) {
-    $build = array();
+    $build = [];
     $plugin = $entity->getPlugin();
 
     // Build the form first, because it may redirect during the submit,
@@ -89,12 +89,12 @@ class SearchController extends ControllerBase {
     // Build search results, if keywords or other search parameters are in the
     // GET parameters. Note that we need to try the search if 'keys' is in
     // there at all, vs. being empty, due to advanced search.
-    $results = array();
+    $results = [];
     if ($request->query->has('keys')) {
       if ($plugin->isSearchExecutable()) {
         // Log the search.
         if ($this->config('search.settings')->get('logging')) {
-          $this->logger->notice('Searched %type for %keys.', array('%keys' => $keys, '%type' => $entity->label()));
+          $this->logger->notice('Searched %type for %keys.', ['%keys' => $keys, '%type' => $entity->label()]);
         }
 
         // Collect the search results.
@@ -108,22 +108,22 @@ class SearchController extends ControllerBase {
     }
 
     if (count($results)) {
-      $build['search_results_title'] = array(
+      $build['search_results_title'] = [
         '#markup' => '<h2>' . $this->t('Search results') . '</h2>',
-      );
+      ];
     }
 
-    $build['search_results'] = array(
-      '#theme' => array('item_list__search_results__' . $plugin->getPluginId(), 'item_list__search_results'),
+    $build['search_results'] = [
+      '#theme' => ['item_list__search_results__' . $plugin->getPluginId(), 'item_list__search_results'],
       '#items' => $results,
-      '#empty' => array(
+      '#empty' => [
         '#markup' => '<h3>' . $this->t('Your search yielded no results.') . '</h3>',
-      ),
+      ],
       '#list_type' => 'ol',
-      '#context' => array(
+      '#context' => [
         'plugin' => $plugin->getPluginId(),
-      ),
-    );
+      ],
+    ];
 
     $this->renderer->addCacheableDependency($build, $entity);
     if ($plugin instanceof CacheableDependencyInterface) {
@@ -138,9 +138,9 @@ class SearchController extends ControllerBase {
       $build['search_results']['#cache']['tags'][] = 'search_index:' . $plugin->getType();
     }
 
-    $build['pager'] = array(
+    $build['pager'] = [
       '#type' => 'pager',
-    );
+    ];
 
     return $build;
   }
@@ -157,7 +157,7 @@ class SearchController extends ControllerBase {
    *   The search help page.
    */
   public function searchHelp(SearchPageInterface $entity) {
-    $build = array();
+    $build = [];
 
     $build['search_help'] = $entity->getPlugin()->getHelp();
 
@@ -189,7 +189,7 @@ class SearchController extends ControllerBase {
    *   The title for the search page edit form.
    */
   public function editTitle(SearchPageInterface $search_page) {
-    return $this->t('Edit %label search page', array('%label' => $search_page->label()));
+    return $this->t('Edit %label search page', ['%label' => $search_page->label()]);
   }
 
   /**
@@ -207,10 +207,10 @@ class SearchController extends ControllerBase {
     $search_page->$op()->save();
 
     if ($op == 'enable') {
-      drupal_set_message($this->t('The %label search page has been enabled.', array('%label' => $search_page->label())));
+      drupal_set_message($this->t('The %label search page has been enabled.', ['%label' => $search_page->label()]));
     }
     elseif ($op == 'disable') {
-      drupal_set_message($this->t('The %label search page has been disabled.', array('%label' => $search_page->label())));
+      drupal_set_message($this->t('The %label search page has been disabled.', ['%label' => $search_page->label()]));
     }
 
     $url = $search_page->urlInfo('collection');
@@ -230,7 +230,7 @@ class SearchController extends ControllerBase {
     // Set the default page to this search page.
     $this->searchPageRepository->setDefaultSearchPage($search_page);
 
-    drupal_set_message($this->t('The default search page is now %label. Be sure to check the ordering of your search pages.', array('%label' => $search_page->label())));
+    drupal_set_message($this->t('The default search page is now %label. Be sure to check the ordering of your search pages.', ['%label' => $search_page->label()]));
     return $this->redirect('entity.search_page.collection');
   }
 
diff --git a/web/core/modules/search/src/Entity/SearchPage.php b/web/core/modules/search/src/Entity/SearchPage.php
index 1cb2f892f..298331fdf 100644
--- a/web/core/modules/search/src/Entity/SearchPage.php
+++ b/web/core/modules/search/src/Entity/SearchPage.php
@@ -73,7 +73,7 @@ class SearchPage extends ConfigEntityBase implements SearchPageInterface, Entity
    *
    * @var array
    */
-  protected $configuration = array();
+  protected $configuration = [];
 
   /**
    * The search plugin ID.
@@ -129,7 +129,7 @@ class SearchPage extends ConfigEntityBase implements SearchPageInterface, Entity
    * {@inheritdoc}
    */
   public function getPluginCollections() {
-    return array('configuration' => $this->getPluginCollection());
+    return ['configuration' => $this->getPluginCollection()];
   }
 
   /**
diff --git a/web/core/modules/search/src/Form/SearchBlockForm.php b/web/core/modules/search/src/Form/SearchBlockForm.php
index 0e623a877..7a9405fd7 100644
--- a/web/core/modules/search/src/Form/SearchBlockForm.php
+++ b/web/core/modules/search/src/Form/SearchBlockForm.php
@@ -76,8 +76,6 @@ class SearchBlockForm extends FormBase {
     // Set up the form to submit using GET to the correct search page.
     $entity_id = $this->searchPageRepository->getDefaultSearchPage();
 
-    $form = [];
-
     // SearchPageRepository::getDefaultSearchPage() depends on search.settings.
     // The dependency needs to be added before the conditional return, otherwise
     // the block would get cached without the necessary cacheablity metadata in
@@ -86,9 +84,9 @@ class SearchBlockForm extends FormBase {
     $this->renderer->addCacheableDependency($form, $this->configFactory->get('search.settings'));
 
     if (!$entity_id) {
-      $form['message'] = array(
+      $form['message'] = [
         '#markup' => $this->t('Search is currently disabled'),
-      );
+      ];
       return $form;
     }
 
@@ -96,22 +94,22 @@ class SearchBlockForm extends FormBase {
     $form['#action'] = $this->url($route);
     $form['#method'] = 'get';
 
-    $form['keys'] = array(
+    $form['keys'] = [
       '#type' => 'search',
       '#title' => $this->t('Search'),
       '#title_display' => 'invisible',
       '#size' => 15,
       '#default_value' => '',
-      '#attributes' => array('title' => $this->t('Enter the terms you wish to search for.')),
-    );
+      '#attributes' => ['title' => $this->t('Enter the terms you wish to search for.')],
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Search'),
       // Prevent op from showing up in the query string.
       '#name' => '',
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/search/src/Form/SearchPageAddForm.php b/web/core/modules/search/src/Form/SearchPageAddForm.php
index a97f1fa5e..d5bc7850e 100644
--- a/web/core/modules/search/src/Form/SearchPageAddForm.php
+++ b/web/core/modules/search/src/Form/SearchPageAddForm.php
@@ -39,7 +39,7 @@ class SearchPageAddForm extends SearchPageFormBase {
 
     parent::save($form, $form_state);
 
-    drupal_set_message($this->t('The %label search page has been added.', array('%label' => $this->entity->label())));
+    drupal_set_message($this->t('The %label search page has been added.', ['%label' => $this->entity->label()]));
   }
 
 }
diff --git a/web/core/modules/search/src/Form/SearchPageEditForm.php b/web/core/modules/search/src/Form/SearchPageEditForm.php
index 694b8567b..9d082eb55 100644
--- a/web/core/modules/search/src/Form/SearchPageEditForm.php
+++ b/web/core/modules/search/src/Form/SearchPageEditForm.php
@@ -24,7 +24,7 @@ class SearchPageEditForm extends SearchPageFormBase {
   public function save(array $form, FormStateInterface $form_state) {
     parent::save($form, $form_state);
 
-    drupal_set_message($this->t('The %label search page has been updated.', array('%label' => $this->entity->label())));
+    drupal_set_message($this->t('The %label search page has been updated.', ['%label' => $this->entity->label()]));
   }
 
 }
diff --git a/web/core/modules/search/src/Form/SearchPageForm.php b/web/core/modules/search/src/Form/SearchPageForm.php
index 1521beb6d..88b99e55e 100644
--- a/web/core/modules/search/src/Form/SearchPageForm.php
+++ b/web/core/modules/search/src/Form/SearchPageForm.php
@@ -38,37 +38,37 @@ class SearchPageForm extends EntityForm {
     $plugin = $this->entity->getPlugin();
     $form_state->set('search_page_id', $this->entity->id());
 
-    $form['basic'] = array(
+    $form['basic'] = [
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('container-inline'),
-      ),
-    );
-    $form['basic']['keys'] = array(
+      '#attributes' => [
+        'class' => ['container-inline'],
+      ],
+    ];
+    $form['basic']['keys'] = [
       '#type' => 'search',
       '#title' => $this->t('Enter your keywords'),
       '#default_value' => $plugin->getKeywords(),
       '#size' => 30,
       '#maxlength' => 255,
-    );
+    ];
 
     // processed_keys is used to coordinate keyword passing between other forms
     // that hook into the basic search form.
-    $form['basic']['processed_keys'] = array(
+    $form['basic']['processed_keys'] = [
       '#type' => 'value',
       '#value' => '',
-    );
-    $form['basic']['submit'] = array(
+    ];
+    $form['basic']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Search'),
-    );
+    ];
 
-    $form['help_link'] = array(
+    $form['help_link'] = [
       '#type' => 'link',
       '#url' => new Url('search.help_' . $this->entity->id()),
       '#title' => $this->t('Search help'),
-      '#options' => array('attributes' => array('class' => 'search-help-link')),
-    );
+      '#options' => ['attributes' => ['class' => 'search-help-link']],
+    ];
 
     // Allow the plugin to add to or alter the search form.
     $plugin->searchFormAlter($form, $form_state);
@@ -81,7 +81,7 @@ class SearchPageForm extends EntityForm {
    */
   protected function actions(array $form, FormStateInterface $form_state) {
     // The submit button is added in the form directly.
-    return array();
+    return [];
   }
 
   /**
@@ -97,8 +97,8 @@ class SearchPageForm extends EntityForm {
     $route = 'search.view_' . $form_state->get('search_page_id');
     $form_state->setRedirect(
       $route,
-      array(),
-      array('query' => $query)
+      [],
+      ['query' => $query]
     );
   }
 
diff --git a/web/core/modules/search/src/Form/SearchPageFormBase.php b/web/core/modules/search/src/Form/SearchPageFormBase.php
index 92b4fbe03..1638f90a8 100644
--- a/web/core/modules/search/src/Form/SearchPageFormBase.php
+++ b/web/core/modules/search/src/Form/SearchPageFormBase.php
@@ -3,7 +3,6 @@
 namespace Drupal\search\Form;
 
 use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\search\SearchPageRepositoryInterface;
@@ -28,13 +27,6 @@ abstract class SearchPageFormBase extends EntityForm {
    */
   protected $plugin;
 
-  /**
-   * The entity query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $entityQuery;
-
   /**
    * The search page repository.
    *
@@ -45,13 +37,10 @@ abstract class SearchPageFormBase extends EntityForm {
   /**
    * Constructs a new search form.
    *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query
-   *   The entity query.
    * @param \Drupal\search\SearchPageRepositoryInterface $search_page_repository
    *   The search page repository.
    */
-  public function __construct(QueryFactory $entity_query, SearchPageRepositoryInterface $search_page_repository) {
-    $this->entityQuery = $entity_query;
+  public function __construct(SearchPageRepositoryInterface $search_page_repository) {
     $this->searchPageRepository = $search_page_repository;
   }
 
@@ -60,7 +49,6 @@ abstract class SearchPageFormBase extends EntityForm {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.query'),
       $container->get('search.search_page_repository')
     );
   }
@@ -84,35 +72,35 @@ abstract class SearchPageFormBase extends EntityForm {
    * {@inheritdoc}
    */
   public function form(array $form, FormStateInterface $form_state) {
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label'),
       '#description' => $this->t('The label for this search page.'),
       '#default_value' => $this->entity->label(),
       '#maxlength' => '255',
-    );
+    ];
 
-    $form['id'] = array(
+    $form['id'] = [
       '#type' => 'machine_name',
       '#default_value' => $this->entity->id(),
       '#disabled' => !$this->entity->isNew(),
       '#maxlength' => 64,
-      '#machine_name' => array(
-        'exists' => array($this, 'exists'),
-      ),
-    );
-    $form['path'] = array(
+      '#machine_name' => [
+        'exists' => [$this, 'exists'],
+      ],
+    ];
+    $form['path'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Path'),
       '#field_prefix' => 'search/',
       '#default_value' => $this->entity->getPath(),
       '#maxlength' => '255',
       '#required' => TRUE,
-    );
-    $form['plugin'] = array(
+    ];
+    $form['plugin'] = [
       '#type' => 'value',
       '#value' => $this->entity->get('plugin'),
-    );
+    ];
 
     if ($this->plugin instanceof PluginFormInterface) {
       $form += $this->plugin->buildConfigurationForm($form, $form_state);
@@ -131,7 +119,7 @@ abstract class SearchPageFormBase extends EntityForm {
    *   TRUE if the search configuration exists, FALSE otherwise.
    */
   public function exists($id) {
-    $entity = $this->entityQuery->get('search_page')
+    $entity = $this->entityTypeManager->getStorage('search_page')->getQuery()
       ->condition('id', $id)
       ->execute();
     return (bool) $entity;
@@ -144,7 +132,7 @@ abstract class SearchPageFormBase extends EntityForm {
     parent::validateForm($form, $form_state);
 
     // Ensure each path is unique.
-    $path = $this->entityQuery->get('search_page')
+    $path = $this->entityTypeManager->getStorage('search_page')->getQuery()
       ->condition('path', $form_state->getValue('path'))
       ->condition('id', $form_state->getValue('id'), '<>')
       ->execute();
diff --git a/web/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php b/web/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php
index 3a39cbc16..50a44dbf3 100644
--- a/web/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php
+++ b/web/core/modules/search/src/Plugin/ConfigurableSearchPluginBase.php
@@ -30,7 +30,7 @@ abstract class ConfigurableSearchPluginBase extends SearchPluginBase implements
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array();
+    return [];
   }
 
   /**
@@ -57,7 +57,7 @@ abstract class ConfigurableSearchPluginBase extends SearchPluginBase implements
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/search/src/Plugin/Derivative/SearchLocalTask.php b/web/core/modules/search/src/Plugin/Derivative/SearchLocalTask.php
index adc356e95..9f62a375e 100644
--- a/web/core/modules/search/src/Plugin/Derivative/SearchLocalTask.php
+++ b/web/core/modules/search/src/Plugin/Derivative/SearchLocalTask.php
@@ -42,17 +42,17 @@ class SearchLocalTask extends DeriverBase implements ContainerDeriverInterface {
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    $this->derivatives = array();
+    $this->derivatives = [];
 
     if ($default = $this->searchPageRepository->getDefaultSearchPage()) {
       $active_search_pages = $this->searchPageRepository->getActiveSearchPages();
       foreach ($this->searchPageRepository->sortSearchPages($active_search_pages) as $entity_id => $entity) {
-        $this->derivatives[$entity_id] = array(
+        $this->derivatives[$entity_id] = [
           'title' => $entity->label(),
           'route_name' => 'search.view_' . $entity_id,
           'base_route' => 'search.plugins:' . $default,
           'weight' => $entity->getWeight(),
-        );
+        ];
       }
     }
     return $this->derivatives;
diff --git a/web/core/modules/search/src/Plugin/SearchPluginBase.php b/web/core/modules/search/src/Plugin/SearchPluginBase.php
index d253972ce..7bf4f0f4e 100644
--- a/web/core/modules/search/src/Plugin/SearchPluginBase.php
+++ b/web/core/modules/search/src/Plugin/SearchPluginBase.php
@@ -97,13 +97,13 @@ abstract class SearchPluginBase extends PluginBase implements ContainerFactoryPl
   public function buildResults() {
     $results = $this->execute();
 
-    $built = array();
+    $built = [];
     foreach ($results as $result) {
-      $built[] = array(
+      $built[] = [
         '#theme' => 'search_result',
         '#result' => $result,
         '#plugin_id' => $this->getPluginId(),
-      );
+      ];
     }
 
     return $built;
@@ -123,7 +123,7 @@ abstract class SearchPluginBase extends PluginBase implements ContainerFactoryPl
     // If the user entered a search string, truncate it and append it to the
     // title.
     if (!empty($this->keywords)) {
-      return $this->t('Search for @keywords', array('@keywords' => Unicode::truncate($this->keywords, 60, TRUE, TRUE)));
+      return $this->t('Search for @keywords', ['@keywords' => Unicode::truncate($this->keywords, 60, TRUE, TRUE)]);
     }
     // Use the default 'Search' title.
     return $this->t('Search');
@@ -135,7 +135,7 @@ abstract class SearchPluginBase extends PluginBase implements ContainerFactoryPl
   public function buildSearchUrlQuery(FormStateInterface $form_state) {
     // Grab the keywords entered in the form and put them as 'keys' in the GET.
     $keys = trim($form_state->getValue('keys'));
-    $query = array('keys' => $keys);
+    $query = ['keys' => $keys];
 
     return $query;
   }
@@ -146,16 +146,16 @@ abstract class SearchPluginBase extends PluginBase implements ContainerFactoryPl
   public function getHelp() {
     // This default search help is appropriate for plugins like NodeSearch
     // that use the SearchQuery class.
-    $help = array('list' => array(
+    $help = ['list' => [
       '#theme' => 'item_list',
-      '#items' => array(
+      '#items' => [
         $this->t('Search looks for exact, case-insensitive keywords; keywords shorter than a minimum length are ignored.'),
         $this->t('Use upper-case OR to get more results. Example: cat OR dog (content contains either "cat" or "dog").'),
         $this->t('You can use upper-case AND to require all words, but this is the same as the default behavior. Example: cat AND dog (same as cat dog, content must contain both "cat" and "dog").'),
         $this->t('Use quotes to search for a phrase. Example: "the cat eats mice".'),
         $this->t('You can precede keywords by - to exclude them; you must still have at least one "positive" keyword. Example: cat -dog (content must contain cat and cannot contain dog).'),
-      ),
-    ));
+      ],
+    ]];
 
     return $help;
   }
diff --git a/web/core/modules/search/src/Plugin/migrate/process/SearchConfigurationRankings.php b/web/core/modules/search/src/Plugin/migrate/process/SearchConfigurationRankings.php
index f021df68b..8199215c3 100644
--- a/web/core/modules/search/src/Plugin/migrate/process/SearchConfigurationRankings.php
+++ b/web/core/modules/search/src/Plugin/migrate/process/SearchConfigurationRankings.php
@@ -21,7 +21,7 @@ class SearchConfigurationRankings extends ProcessPluginBase {
    * Generate the configuration rankings.
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    $return = array();
+    $return = [];
     foreach ($row->getSource() as $name => $rank) {
       if (substr($name, 0, 10) == 'node_rank_' && is_numeric($rank)) {
         $return[substr($name, 10)] = $rank;
diff --git a/web/core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php b/web/core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
index 6c1d16b04..206f1f806 100644
--- a/web/core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
+++ b/web/core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
@@ -21,7 +21,7 @@ class SearchConfigurationRankings extends ProcessPluginBase {
    * Generate the configuration rankings.
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    $return = array();
+    $return = [];
     foreach ($row->getSource() as $name => $rank) {
       if (substr($name, 0, 10) == 'node_rank_' && $rank) {
         $return[substr($name, 10)] = $rank;
diff --git a/web/core/modules/search/src/Plugin/views/argument/Search.php b/web/core/modules/search/src/Plugin/views/argument/Search.php
index 9c3d6bb3a..82afbbfe6 100644
--- a/web/core/modules/search/src/Plugin/views/argument/Search.php
+++ b/web/core/modules/search/src/Plugin/views/argument/Search.php
@@ -47,7 +47,7 @@ class Search extends ArgumentPluginBase {
    */
   protected function queryParseSearchExpression($input) {
     if (!isset($this->searchQuery)) {
-      $this->searchQuery = db_select('search_index', 'i', array('target' => 'replica'))->extend('Drupal\search\ViewsSearchQuery');
+      $this->searchQuery = db_select('search_index', 'i', ['target' => 'replica'])->extend('Drupal\search\ViewsSearchQuery');
       $this->searchQuery->searchExpression($input, $this->searchType);
       $this->searchQuery->publicParseSearchExpression();
     }
@@ -79,17 +79,17 @@ class Search extends ArgumentPluginBase {
       $search_condition = db_and();
 
       // Create a new join to relate the 'search_total' table to our current 'search_index' table.
-      $definition = array(
+      $definition = [
         'table' => 'search_total',
         'field' => 'word',
         'left_table' => $search_index,
         'left_field' => 'word',
-      );
+      ];
       $join = Views::pluginManager('join')->createInstance('standard', $definition);
       $search_total = $this->query->addRelationship('search_total', $join, $search_index);
 
       // Add the search score field to the query.
-      $this->search_score = $this->query->addField('', "$search_index.score * $search_total.count", 'score', array('function' => 'sum'));
+      $this->search_score = $this->query->addField('', "$search_index.score * $search_total.count", 'score', ['function' => 'sum']);
 
       // Add the conditions set up by the search query to the views query.
       $search_condition->condition("$search_index.type", $this->searchType);
@@ -120,7 +120,7 @@ class Search extends ArgumentPluginBase {
       $this->query->addGroupBy("$search_index.sid");
       $matches = $this->searchQuery->matches();
       $placeholder = $this->placeholder();
-      $this->query->addHavingExpression(0, "COUNT(*) >= $placeholder", array($placeholder => $matches));
+      $this->query->addHavingExpression(0, "COUNT(*) >= $placeholder", [$placeholder => $matches]);
     }
 
     // Set to NULL to prevent PDO exception when views object is cached
diff --git a/web/core/modules/search/src/Plugin/views/filter/Search.php b/web/core/modules/search/src/Plugin/views/filter/Search.php
index ea52e1ceb..c95fd96ec 100644
--- a/web/core/modules/search/src/Plugin/views/filter/Search.php
+++ b/web/core/modules/search/src/Plugin/views/filter/Search.php
@@ -67,28 +67,28 @@ class Search extends FilterPluginBase {
    * {@inheritdoc}
    */
   protected function operatorForm(&$form, FormStateInterface $form_state) {
-    $form['operator'] = array(
+    $form['operator'] = [
       '#type' => 'radios',
       '#title' => $this->t('On empty input'),
       '#default_value' => $this->operator,
-      '#options' => array(
+      '#options' => [
         'optional' => $this->t('Show All'),
         'required' => $this->t('Show None'),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   protected function valueForm(&$form, FormStateInterface $form_state) {
-    $form['value'] = array(
+    $form['value'] = [
       '#type' => 'textfield',
       '#size' => 15,
       '#default_value' => $this->value,
-      '#attributes' => array('title' => $this->t('Search keywords')),
+      '#attributes' => ['title' => $this->t('Search keywords')],
       '#title' => !$form_state->get('exposed') ? $this->t('Keywords') : '',
-    );
+    ];
   }
 
   /**
@@ -117,7 +117,7 @@ class Search extends FilterPluginBase {
   protected function queryParseSearchExpression($input) {
     if (!isset($this->searchQuery)) {
       $this->parsed = TRUE;
-      $this->searchQuery = db_select('search_index', 'i', array('target' => 'replica'))->extend('Drupal\search\ViewsSearchQuery');
+      $this->searchQuery = db_select('search_index', 'i', ['target' => 'replica'])->extend('Drupal\search\ViewsSearchQuery');
       $this->searchQuery->searchExpression($input, $this->searchType);
       $this->searchQuery->publicParseSearchExpression();
     }
@@ -154,17 +154,17 @@ class Search extends FilterPluginBase {
 
       // Create a new join to relate the 'search_total' table to our current
       // 'search_index' table.
-      $definition = array(
+      $definition = [
         'table' => 'search_total',
         'field' => 'word',
         'left_table' => $search_index,
         'left_field' => 'word',
-      );
+      ];
       $join = Views::pluginManager('join')->createInstance('standard', $definition);
       $search_total = $this->query->addRelationship('search_total', $join, $search_index);
 
       // Add the search score field to the query.
-      $this->search_score = $this->query->addField('', "$search_index.score * $search_total.count", 'score', array('function' => 'sum'));
+      $this->search_score = $this->query->addField('', "$search_index.score * $search_total.count", 'score', ['function' => 'sum']);
 
       // Add the conditions set up by the search query to the views query.
       $search_condition->condition("$search_index.type", $this->searchType);
@@ -196,7 +196,7 @@ class Search extends FilterPluginBase {
       $this->query->addGroupBy("$search_index.sid");
       $matches = $this->searchQuery->matches();
       $placeholder = $this->placeholder();
-      $this->query->addHavingExpression($this->options['group'], "COUNT(*) >= $placeholder", array($placeholder => $matches));
+      $this->query->addHavingExpression($this->options['group'], "COUNT(*) >= $placeholder", [$placeholder => $matches]);
     }
     // Set to NULL to prevent PDO exception when views object is cached.
     $this->searchQuery = NULL;
diff --git a/web/core/modules/search/src/Plugin/views/row/SearchRow.php b/web/core/modules/search/src/Plugin/views/row/SearchRow.php
index 51f785368..29e150d55 100644
--- a/web/core/modules/search/src/Plugin/views/row/SearchRow.php
+++ b/web/core/modules/search/src/Plugin/views/row/SearchRow.php
@@ -22,7 +22,7 @@ class SearchRow extends RowPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['score'] = array('default' => TRUE);
+    $options['score'] = ['default' => TRUE];
 
     return $options;
   }
@@ -31,23 +31,23 @@ class SearchRow extends RowPluginBase {
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['score'] = array(
+    $form['score'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Display score'),
       '#default_value' => $this->options['score'],
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function render($row) {
-    return array(
+    return [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#row' => $row,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/search/src/Plugin/views/sort/Score.php b/web/core/modules/search/src/Plugin/views/sort/Score.php
index 7a7bbf0f7..f5910f0d5 100644
--- a/web/core/modules/search/src/Plugin/views/sort/Score.php
+++ b/web/core/modules/search/src/Plugin/views/sort/Score.php
@@ -21,7 +21,7 @@ class Score extends SortPluginBase {
     // Our filter stores it as $handler->search_score -- and we also
     // need to check its relationship to make sure that we're using the same
     // one or obviously this won't work.
-    foreach (array('filter', 'argument') as $type) {
+    foreach (['filter', 'argument'] as $type) {
       foreach ($this->view->{$type} as $handler) {
         if (isset($handler->search_score) && $handler->relationship == $this->relationship) {
           $this->query->addOrderBy(NULL, NULL, $this->options['order'], $handler->search_score);
diff --git a/web/core/modules/search/src/Routing/SearchPageRoutes.php b/web/core/modules/search/src/Routing/SearchPageRoutes.php
index b85cbe8f2..6e199d3df 100644
--- a/web/core/modules/search/src/Routing/SearchPageRoutes.php
+++ b/web/core/modules/search/src/Routing/SearchPageRoutes.php
@@ -45,70 +45,70 @@ class SearchPageRoutes implements ContainerInjectionInterface {
    *   An array of route objects.
    */
   public function routes() {
-    $routes = array();
+    $routes = [];
     // @todo Decide if /search should continue to redirect to /search/$default,
     //   or just perform the appropriate search.
     if ($default_page = $this->searchPageRepository->getDefaultSearchPage()) {
       $routes['search.view'] = new Route(
         '/search',
-        array(
+        [
           '_controller' => 'Drupal\search\Controller\SearchController::redirectSearchPage',
           '_title' => 'Search',
           'entity' => $default_page,
-        ),
-        array(
+        ],
+        [
           '_entity_access' => 'entity.view',
           '_permission' => 'search content',
-        ),
-        array(
-          'parameters' => array(
-            'entity' => array(
+        ],
+        [
+          'parameters' => [
+            'entity' => [
               'type' => 'entity:search_page',
-            ),
-          ),
-        )
+            ],
+          ],
+        ]
       );
     }
     $active_pages = $this->searchPageRepository->getActiveSearchPages();
     foreach ($active_pages as $entity_id => $entity) {
       $routes["search.view_$entity_id"] = new Route(
         '/search/' . $entity->getPath(),
-        array(
+        [
           '_controller' => 'Drupal\search\Controller\SearchController::view',
           '_title' => 'Search',
           'entity' => $entity_id,
-        ),
-        array(
+        ],
+        [
           '_entity_access' => 'entity.view',
           '_permission' => 'search content',
-        ),
-        array(
-          'parameters' => array(
-            'entity' => array(
+        ],
+        [
+          'parameters' => [
+            'entity' => [
               'type' => 'entity:search_page',
-            ),
-          ),
-        )
+            ],
+          ],
+        ]
       );
 
       $routes["search.help_$entity_id"] = new Route(
         '/search/' . $entity->getPath() . '/help',
-        array(
+        [
           '_controller' => 'Drupal\search\Controller\SearchController::searchHelp',
           '_title' => 'Search help',
           'entity' => $entity_id,
-        ),
-        array(
+        ],
+        [
           '_entity_access' => 'entity.view',
           '_permission' => 'search content',
-        ),
-        array(
-          'parameters' => array(
-            'entity' => array(
+        ],
+        [
+          'parameters' => [
+            'entity' => [
               'type' => 'entity:search_page',
-            ),
-          ),
-        )
+            ],
+          ],
+        ]
       );
     }
     return $routes;
diff --git a/web/core/modules/search/src/SearchPageAccessControlHandler.php b/web/core/modules/search/src/SearchPageAccessControlHandler.php
index be135bc89..2627f51e0 100644
--- a/web/core/modules/search/src/SearchPageAccessControlHandler.php
+++ b/web/core/modules/search/src/SearchPageAccessControlHandler.php
@@ -20,7 +20,7 @@ class SearchPageAccessControlHandler extends EntityAccessControlHandler {
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     /** @var $entity \Drupal\search\SearchPageInterface */
-    if (in_array($operation, array('delete', 'disable'))) {
+    if (in_array($operation, ['delete', 'disable'])) {
       if ($entity->isDefaultSearch()) {
         return AccessResult::forbidden()->addCacheableDependency($entity);
       }
diff --git a/web/core/modules/search/src/SearchPageListBuilder.php b/web/core/modules/search/src/SearchPageListBuilder.php
index c76a999aa..9a8f6deb3 100644
--- a/web/core/modules/search/src/SearchPageListBuilder.php
+++ b/web/core/modules/search/src/SearchPageListBuilder.php
@@ -26,7 +26,7 @@ class SearchPageListBuilder extends DraggableListBuilder implements FormInterfac
    *
    * @var \Drupal\search\SearchPageInterface[]
    */
-  protected $entities = array();
+  protected $entities = [];
 
   /**
    * Stores the configuration factory.
@@ -90,24 +90,24 @@ class SearchPageListBuilder extends DraggableListBuilder implements FormInterfac
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header['label'] = array(
+    $header['label'] = [
       'data' => $this->t('Label'),
-    );
-    $header['url'] = array(
+    ];
+    $header['url'] = [
       'data' => $this->t('URL'),
-      'class' => array(RESPONSIVE_PRIORITY_LOW),
-    );
-    $header['plugin'] = array(
+      'class' => [RESPONSIVE_PRIORITY_LOW],
+    ];
+    $header['plugin'] = [
       'data' => $this->t('Type'),
-      'class' => array(RESPONSIVE_PRIORITY_LOW),
-    );
-    $header['status'] = array(
+      'class' => [RESPONSIVE_PRIORITY_LOW],
+    ];
+    $header['status'] = [
       'data' => $this->t('Status'),
-    );
-    $header['progress'] = array(
+    ];
+    $header['progress'] = [
       'data' => $this->t('Indexing progress'),
-      'class' => array(RESPONSIVE_PRIORITY_MEDIUM),
-    );
+      'class' => [RESPONSIVE_PRIORITY_MEDIUM],
+    ];
     return $header + parent::buildHeader();
   }
 
@@ -120,11 +120,11 @@ class SearchPageListBuilder extends DraggableListBuilder implements FormInterfac
     $row['url']['#markup'] = 'search/' . $entity->getPath();
     // If the search page is active, link to it.
     if ($entity->status()) {
-      $row['url'] = array(
+      $row['url'] = [
         '#type' => 'link',
         '#title' => $row['url'],
         '#url' => Url::fromRoute('search.view_' . $entity->id()),
-      );
+      ];
     }
 
     $definition = $entity->getPlugin()->getPluginDefinition();
@@ -143,10 +143,10 @@ class SearchPageListBuilder extends DraggableListBuilder implements FormInterfac
 
     if ($entity->isIndexable()) {
       $status = $entity->getPlugin()->indexStatus();
-      $row['progress']['#markup'] = $this->t('%num_indexed of %num_total indexed', array(
+      $row['progress']['#markup'] = $this->t('%num_indexed of %num_total indexed', [
         '%num_indexed' => $status['total'] - $status['remaining'],
         '%num_total' => $status['total']
-      ));
+      ]);
     }
     else {
       $row['progress']['#markup'] = $this->t('Does not use index');
@@ -178,102 +178,102 @@ class SearchPageListBuilder extends DraggableListBuilder implements FormInterfac
     // will show as 99%, to indicate "almost done".
     $percentage = $total > 0 ? floor(100 * $done / $total) : 100;
     $percentage .= '%';
-    $status = '<p><strong>' . $this->t('%percentage of the site has been indexed.', array('%percentage' => $percentage)) . ' ' . $count . '</strong></p>';
-    $form['status'] = array(
+    $status = '<p><strong>' . $this->t('%percentage of the site has been indexed.', ['%percentage' => $percentage]) . ' ' . $count . '</strong></p>';
+    $form['status'] = [
       '#type' => 'details',
       '#title' => $this->t('Indexing progress'),
       '#open' => TRUE,
-      '#description' => $this->t('Only items in the index will appear in search results. To build and maintain the index, a correctly configured <a href=":cron">cron maintenance task</a> is required.', array(':cron' => \Drupal::url('system.cron_settings'))),
-    );
-    $form['status']['status'] = array('#markup' => $status);
-    $form['status']['wipe'] = array(
+      '#description' => $this->t('Only items in the index will appear in search results. To build and maintain the index, a correctly configured <a href=":cron">cron maintenance task</a> is required.', [':cron' => \Drupal::url('system.cron_settings')]),
+    ];
+    $form['status']['status'] = ['#markup' => $status];
+    $form['status']['wipe'] = [
       '#type' => 'submit',
       '#value' => $this->t('Re-index site'),
-      '#submit' => array('::searchAdminReindexSubmit'),
-    );
+      '#submit' => ['::searchAdminReindexSubmit'],
+    ];
 
-    $items = array(10, 20, 50, 100, 200, 500);
+    $items = [10, 20, 50, 100, 200, 500];
     $items = array_combine($items, $items);
 
     // Indexing throttle:
-    $form['indexing_throttle'] = array(
+    $form['indexing_throttle'] = [
       '#type' => 'details',
       '#title' => $this->t('Indexing throttle'),
       '#open' => TRUE,
-    );
-    $form['indexing_throttle']['cron_limit'] = array(
+    ];
+    $form['indexing_throttle']['cron_limit'] = [
       '#type' => 'select',
       '#title' => $this->t('Number of items to index per cron run'),
       '#default_value' => $search_settings->get('index.cron_limit'),
       '#options' => $items,
-      '#description' => $this->t('The maximum number of items indexed in each run of the <a href=":cron">cron maintenance task</a>. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing. Some search page types may have their own setting for this.', array(':cron' => \Drupal::url('system.cron_settings'))),
-    );
+      '#description' => $this->t('The maximum number of items indexed in each run of the <a href=":cron">cron maintenance task</a>. If necessary, reduce the number of items to prevent timeouts and memory errors while indexing. Some search page types may have their own setting for this.', [':cron' => \Drupal::url('system.cron_settings')]),
+    ];
     // Indexing settings:
-    $form['indexing_settings'] = array(
+    $form['indexing_settings'] = [
       '#type' => 'details',
       '#title' => $this->t('Default indexing settings'),
       '#open' => TRUE,
-    );
-    $form['indexing_settings']['info'] = array(
+    ];
+    $form['indexing_settings']['info'] = [
       '#markup' => $this->t("<p>Search pages that use an index may use the default index provided by the Search module, or they may use a different indexing mechanism. These settings are for the default index. <em>Changing these settings will cause the default search index to be rebuilt to reflect the new settings. Searching will continue to work, based on the existing index, but new content won't be indexed until all existing content has been re-indexed.</em></p><p><em>The default settings should be appropriate for the majority of sites.</em></p>")
-    );
-    $form['indexing_settings']['minimum_word_size'] = array(
+    ];
+    $form['indexing_settings']['minimum_word_size'] = [
       '#type' => 'number',
       '#title' => $this->t('Minimum word length to index'),
       '#default_value' => $search_settings->get('index.minimum_word_size'),
       '#min' => 1,
       '#max' => 1000,
       '#description' => $this->t('The minimum character length for a word to be added to the index. Searches must include a keyword of at least this length.'),
-    );
-    $form['indexing_settings']['overlap_cjk'] = array(
+    ];
+    $form['indexing_settings']['overlap_cjk'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Simple CJK handling'),
       '#default_value' => $search_settings->get('index.overlap_cjk'),
       '#description' => $this->t('Whether to apply a simple Chinese/Japanese/Korean tokenizer based on overlapping sequences. Turn this off if you want to use an external preprocessor for this instead. Does not affect other languages.')
-    );
+    ];
 
     // Indexing settings:
-    $form['logging'] = array(
+    $form['logging'] = [
       '#type' => 'details',
       '#title' => $this->t('Logging'),
       '#open' => TRUE,
-    );
+    ];
 
-    $form['logging']['logging'] = array(
+    $form['logging']['logging'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Log searches'),
       '#default_value' => $search_settings->get('logging'),
       '#description' => $this->t('If checked, all searches will be logged. Uncheck to skip logging. Logging may affect performance.'),
-    );
+    ];
 
-    $form['search_pages'] = array(
+    $form['search_pages'] = [
       '#type' => 'details',
       '#title' => $this->t('Search pages'),
       '#open' => TRUE,
-    );
-    $form['search_pages']['add_page'] = array(
+    ];
+    $form['search_pages']['add_page'] = [
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('container-inline'),
-      ),
-    );
+      '#attributes' => [
+        'class' => ['container-inline'],
+      ],
+    ];
     // In order to prevent validation errors for the parent form, this cannot be
     // required, see self::validateAddSearchPage().
-    $form['search_pages']['add_page']['search_type'] = array(
+    $form['search_pages']['add_page']['search_type'] = [
       '#type' => 'select',
       '#title' => $this->t('Search page type'),
       '#empty_option' => $this->t('- Choose page type -'),
       '#options' => array_map(function ($definition) {
         return $definition['title'];
       }, $this->searchManager->getDefinitions()),
-    );
-    $form['search_pages']['add_page']['add_search_submit'] = array(
+    ];
+    $form['search_pages']['add_page']['add_search_submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Add search page'),
-      '#validate' => array('::validateAddSearchPage'),
-      '#submit' => array('::submitAddSearchPage'),
-      '#limit_validation_errors' => array(array('search_type')),
-    );
+      '#validate' => ['::validateAddSearchPage'],
+      '#submit' => ['::submitAddSearchPage'],
+      '#limit_validation_errors' => [['search_type']],
+    ];
 
     // Move the listing into the search_pages element.
     $form['search_pages'][$this->entitiesKey] = $form[$this->entitiesKey];
@@ -281,11 +281,11 @@ class SearchPageListBuilder extends DraggableListBuilder implements FormInterfac
     unset($form[$this->entitiesKey]);
 
     $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save configuration'),
       '#button_type' => 'primary',
-    );
+    ];
 
     return $form;
   }
@@ -302,13 +302,13 @@ class SearchPageListBuilder extends DraggableListBuilder implements FormInterfac
       unset($operations['disable'], $operations['delete']);
     }
     else {
-      $operations['default'] = array(
+      $operations['default'] = [
         'title' => $this->t('Set as default'),
         'url' => Url::fromRoute('entity.search_page.set_default', [
           'search_page' => $entity->id(),
         ]),
         'weight' => 50,
-      );
+      ];
     }
 
     return $operations;
@@ -369,7 +369,7 @@ class SearchPageListBuilder extends DraggableListBuilder implements FormInterfac
   public function submitAddSearchPage(array &$form, FormStateInterface $form_state) {
     $form_state->setRedirect(
       'search.add_type',
-      array('search_plugin_id' => $form_state->getValue('search_type'))
+      ['search_plugin_id' => $form_state->getValue('search_type')]
     );
   }
 
diff --git a/web/core/modules/search/src/SearchPageRepository.php b/web/core/modules/search/src/SearchPageRepository.php
index 459ea5782..6f4dc64d5 100644
--- a/web/core/modules/search/src/SearchPageRepository.php
+++ b/web/core/modules/search/src/SearchPageRepository.php
@@ -105,7 +105,7 @@ class SearchPageRepository implements SearchPageRepositoryInterface {
    */
   public function sortSearchPages($search_pages) {
     $entity_type = $this->storage->getEntityType();
-    uasort($search_pages, array($entity_type->getClass(), 'sort'));
+    uasort($search_pages, [$entity_type->getClass(), 'sort']);
     return $search_pages;
   }
 
diff --git a/web/core/modules/search/src/SearchQuery.php b/web/core/modules/search/src/SearchQuery.php
index 2ca2bda3a..7c4e07e20 100644
--- a/web/core/modules/search/src/SearchQuery.php
+++ b/web/core/modules/search/src/SearchQuery.php
@@ -96,7 +96,7 @@ class SearchQuery extends SelectExtender {
    *
    * @var array
    */
-  protected $keys = array('positive' => array(), 'negative' => array());
+  protected $keys = ['positive' => [], 'negative' => []];
 
   /**
    * Indicates whether the query conditions are simple or complex (LIKE).
@@ -129,7 +129,7 @@ class SearchQuery extends SelectExtender {
    *
    * @var array
    */
-  protected $words = array();
+  protected $words = [];
 
   /**
    * Multiplier to normalize the keyword score.
@@ -164,14 +164,14 @@ class SearchQuery extends SelectExtender {
    *
    * @see SearchQuery::addScore()
    */
-  protected $scores = array();
+  protected $scores = [];
 
   /**
    * Arguments for the score expressions.
    *
    * @var array
    */
-  protected $scoresArguments = array();
+  protected $scoresArguments = [];
 
   /**
    * The number of 'i.relevance' occurrences in score expressions.
@@ -185,7 +185,7 @@ class SearchQuery extends SelectExtender {
    *
    * @var array
    */
-  protected $multiply = array();
+  protected $multiply = [];
 
   /**
    * Sets the search query expression.
@@ -258,7 +258,7 @@ class SearchQuery extends SelectExtender {
       $words = search_simplify($match[2]);
       // Re-explode in case simplification added more words, except when
       // matching a phrase.
-      $words = $phrase ? array($words) : preg_split('/ /', $words, -1, PREG_SPLIT_NO_EMPTY);
+      $words = $phrase ? [$words] : preg_split('/ /', $words, -1, PREG_SPLIT_NO_EMPTY);
       // Negative matches.
       if ($match[1] == '-') {
         $this->keys['negative'] = array_merge($this->keys['negative'], $words);
@@ -269,7 +269,7 @@ class SearchQuery extends SelectExtender {
         $last = array_pop($this->keys['positive']);
         // Starting a new OR?
         if (!is_array($last)) {
-          $last = array($last);
+          $last = [$last];
         }
         $this->keys['positive'][] = $last;
         $in_or = TRUE;
@@ -373,7 +373,7 @@ class SearchQuery extends SelectExtender {
     }
 
     // Return matching snippet and number of added words.
-    return array($num_new_scores, $num_valid_words);
+    return [$num_new_scores, $num_valid_words];
   }
 
   /**
@@ -419,7 +419,7 @@ class SearchQuery extends SelectExtender {
     // simple queries, this condition could lead to incorrectly deciding not
     // to continue with the full query.
     if ($this->simple) {
-      $this->having('COUNT(*) >= :matches', array(':matches' => $this->matches));
+      $this->having('COUNT(*) >= :matches', [':matches' => $this->matches]);
     }
 
     // Clone the query object to calculate normalization.
@@ -498,7 +498,7 @@ class SearchQuery extends SelectExtender {
    *
    * @return $this
    */
-  public function addScore($score, $arguments = array(), $multiply = FALSE) {
+  public function addScore($score, $arguments = [], $multiply = FALSE) {
     if ($multiply) {
       $i = count($this->multiply);
       // Modify the score expression so it is multiplied by the multiplier,
@@ -589,7 +589,7 @@ class SearchQuery extends SelectExtender {
     // Add query metadata.
     $this
       ->addMetaData('normalize', $this->normalize)
-      ->fields('i', array('type', 'sid'));
+      ->fields('i', ['type', 'sid']);
     return $this->query->execute();
   }
 
@@ -617,12 +617,12 @@ class SearchQuery extends SelectExtender {
     // Remove existing fields and expressions, they are not needed for a count
     // query.
     $fields =& $inner->getFields();
-    $fields = array();
+    $fields = [];
     $expressions =& $inner->getExpressions();
-    $expressions = array();
+    $expressions = [];
 
     // Add sid as the only field and count them as a subquery.
-    $count = db_select($inner->fields('i', array('sid')), NULL, array('target' => 'replica'));
+    $count = db_select($inner->fields('i', ['sid']), NULL, ['target' => 'replica']);
 
     // Add the COUNT() expression.
     $count->addExpression('COUNT(*)');
diff --git a/web/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php b/web/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
index 9bd13bdc1..ad00b5252 100644
--- a/web/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
+++ b/web/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
@@ -19,7 +19,7 @@ class SearchAdvancedSearchFormTest extends SearchTestBase {
   protected function setUp() {
     parent::setUp();
     // Create and log in user.
-    $test_user = $this->drupalCreateUser(array('access content', 'search content', 'use advanced search', 'administer nodes'));
+    $test_user = $this->drupalCreateUser(['access content', 'search content', 'use advanced search', 'administer nodes']);
     $this->drupalLogin($test_user);
 
     // Create initial node.
@@ -37,44 +37,44 @@ class SearchAdvancedSearchFormTest extends SearchTestBase {
   /**
    * Tests advanced search by node type.
    */
-  function testNodeType() {
+  public function testNodeType() {
     // Verify some properties of the node that was created.
     $this->assertTrue($this->node->getType() == 'page', 'Node type is Basic page.');
     $dummy_title = 'Lorem ipsum';
     $this->assertNotEqual($dummy_title, $this->node->label(), "Dummy title doesn't equal node title.");
 
     // Search for the dummy title with a GET query.
-    $this->drupalGet('search/node', array('query' => array('keys' => $dummy_title)));
+    $this->drupalGet('search/node', ['query' => ['keys' => $dummy_title]]);
     $this->assertNoText($this->node->label(), 'Basic page node is not found with dummy title.');
 
     // Search for the title of the node with a GET query.
-    $this->drupalGet('search/node', array('query' => array('keys' => $this->node->label())));
+    $this->drupalGet('search/node', ['query' => ['keys' => $this->node->label()]]);
     $this->assertText($this->node->label(), 'Basic page node is found with GET query.');
 
     // Search for the title of the node with a POST query.
-    $edit = array('or' => $this->node->label());
+    $edit = ['or' => $this->node->label()];
     $this->drupalPostForm('search/node', $edit, t('Advanced search'));
     $this->assertText($this->node->label(), 'Basic page node is found with POST query.');
 
     // Search by node type.
-    $this->drupalPostForm('search/node', array_merge($edit, array('type[page]' => 'page')), t('Advanced search'));
+    $this->drupalPostForm('search/node', array_merge($edit, ['type[page]' => 'page']), t('Advanced search'));
     $this->assertText($this->node->label(), 'Basic page node is found with POST query and type:page.');
 
-    $this->drupalPostForm('search/node', array_merge($edit, array('type[article]' => 'article')), t('Advanced search'));
+    $this->drupalPostForm('search/node', array_merge($edit, ['type[article]' => 'article']), t('Advanced search'));
     $this->assertText('search yielded no results', 'Article node is not found with POST query and type:article.');
   }
 
   /**
    * Tests that after submitting the advanced search form, the form is refilled.
    */
-  function testFormRefill() {
-    $edit = array(
+  public function testFormRefill() {
+    $edit = [
       'keys' => 'cat',
       'or' => 'dog gerbil',
       'phrase' => 'pets are nice',
       'negative' => 'fish snake',
       'type[page]' => 'page',
-    );
+    ];
     $this->drupalPostForm('search/node', $edit, t('Advanced search'));
 
     // Test that the encoded query appears in the page title. Only test the
@@ -85,11 +85,11 @@ class SearchAdvancedSearchFormTest extends SearchTestBase {
     // Verify that all of the form fields are filled out.
     foreach ($edit as $key => $value) {
       if ($key != 'type[page]') {
-        $elements = $this->xpath('//input[@name=:name]', array(':name' => $key));
+        $elements = $this->xpath('//input[@name=:name]', [':name' => $key]);
         $this->assertTrue(isset($elements[0]) && $elements[0]['value'] == $value, "Field $key is set to $value");
       }
       else {
-        $elements = $this->xpath('//input[@name=:name]', array(':name' => $key));
+        $elements = $this->xpath('//input[@name=:name]', [':name' => $key]);
         $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), "Field $key is checked");
       }
     }
@@ -97,12 +97,12 @@ class SearchAdvancedSearchFormTest extends SearchTestBase {
     // Now test by submitting the or/not part of the query in the main
     // search box, and verify that the advanced form is not filled out.
     // (It shouldn't be filled out unless you submit values in those fields.)
-    $edit2 = array('keys' => 'cat dog OR gerbil -fish -snake');
+    $edit2 = ['keys' => 'cat dog OR gerbil -fish -snake'];
     $this->drupalPostForm('search/node', $edit2, t('Advanced search'));
     $this->assertText('Search for cat dog OR gerbil -fish -snake');
     foreach ($edit as $key => $value) {
       if ($key != 'type[page]') {
-        $elements = $this->xpath('//input[@name=:name]', array(':name' => $key));
+        $elements = $this->xpath('//input[@name=:name]', [':name' => $key]);
         $this->assertFalse(isset($elements[0]) && $elements[0]['value'] == $value, "Field $key is not set to $value");
       }
     }
diff --git a/web/core/modules/search/src/Tests/SearchBlockTest.php b/web/core/modules/search/src/Tests/SearchBlockTest.php
index 7d42a85a4..21afda7f0 100644
--- a/web/core/modules/search/src/Tests/SearchBlockTest.php
+++ b/web/core/modules/search/src/Tests/SearchBlockTest.php
@@ -14,13 +14,13 @@ class SearchBlockTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('block');
+  public static $modules = ['block'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create and log in user.
-    $admin_user = $this->drupalCreateUser(array('administer blocks', 'search content'));
+    $admin_user = $this->drupalCreateUser(['administer blocks', 'search content']);
     $this->drupalLogin($admin_user);
   }
 
@@ -46,7 +46,7 @@ class SearchBlockTest extends SearchTestBase {
     $this->assertTrue(empty($elements), 'The search input field does not have empty name attribute.');
 
     // Test a normal search via the block form, from the front page.
-    $terms = array('keys' => 'test');
+    $terms = ['keys' => 'test'];
     $this->submitGetForm('', $terms, t('Search'));
     $this->assertResponse(200);
     $this->assertText('Your search yielded no results');
@@ -72,12 +72,12 @@ class SearchBlockTest extends SearchTestBase {
     $entity_id = $search_page_repository->getDefaultSearchPage();
     $this->assertEqual(
       $this->getUrl(),
-      \Drupal::url('search.view_' . $entity_id, array(), array('query' => array('keys' => $terms['keys']), 'absolute' => TRUE)),
+      \Drupal::url('search.view_' . $entity_id, [], ['query' => ['keys' => $terms['keys']], 'absolute' => TRUE]),
       'Submitted to correct URL.'
     );
 
     // Test an empty search via the block form, from the front page.
-    $terms = array('keys' => '');
+    $terms = ['keys' => ''];
     $this->submitGetForm('', $terms, t('Search'));
     $this->assertResponse(200);
     $this->assertText('Please enter some keywords');
@@ -86,22 +86,22 @@ class SearchBlockTest extends SearchTestBase {
     // submitted empty.
     $this->assertEqual(
       $this->getUrl(),
-      \Drupal::url('search.view_' . $entity_id, array(), array('query' => array('keys' => ''), 'absolute' => TRUE)),
+      \Drupal::url('search.view_' . $entity_id, [], ['query' => ['keys' => ''], 'absolute' => TRUE]),
       'Redirected to correct URL.'
     );
 
     // Test that after entering a too-short keyword in the form, you can then
     // search again with a longer keyword. First test using the block form.
-    $this->submitGetForm('node', array('keys' => $this->randomMachineName(1)), t('Search'));
+    $this->submitGetForm('node', ['keys' => $this->randomMachineName(1)], t('Search'));
     $this->assertText('You must include at least one keyword to match in the content', 'Keyword message is displayed when searching for short word');
     $this->assertNoText(t('Please enter some keywords'), 'With short word entered, no keywords message is not displayed');
-    $this->submitGetForm(NULL, array('keys' => $this->randomMachineName()), t('Search'), 'search-block-form');
+    $this->submitGetForm(NULL, ['keys' => $this->randomMachineName()], t('Search'), 'search-block-form');
     $this->assertNoText('You must include at least one keyword to match in the content', 'Keyword message is not displayed when searching for long word after short word search');
 
     // Same test again, using the search page form for the second search this
     // time.
-    $this->submitGetForm('node', array('keys' => $this->randomMachineName(1)), t('Search'));
-    $this->drupalPostForm(NULL, array('keys' => $this->randomMachineName()), t('Search'), array(), array(), 'search-form');
+    $this->submitGetForm('node', ['keys' => $this->randomMachineName(1)], t('Search'));
+    $this->drupalPostForm(NULL, ['keys' => $this->randomMachineName()], t('Search'), [], [], 'search-form');
     $this->assertNoText('You must include at least one keyword to match in the content', 'Keyword message is not displayed when searching for long word after short word search');
 
   }
diff --git a/web/core/modules/search/src/Tests/SearchCommentTest.php b/web/core/modules/search/src/Tests/SearchCommentTest.php
index f67637ffc..704742925 100644
--- a/web/core/modules/search/src/Tests/SearchCommentTest.php
+++ b/web/core/modules/search/src/Tests/SearchCommentTest.php
@@ -22,7 +22,7 @@ class SearchCommentTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'node', 'comment');
+  public static $modules = ['filter', 'node', 'comment'];
 
   /**
    * Test subject for comments.
@@ -55,17 +55,17 @@ class SearchCommentTest extends SearchTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $full_html_format = FilterFormat::create(array(
+    $full_html_format = FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
-      'filters' => array(),
-    ));
+      'filters' => [],
+    ]);
     $full_html_format->save();
 
     // Create and log in an administrative user having access to the Full HTML
     // text format.
-    $permissions = array(
+    $permissions = [
       'administer filters',
       $full_html_format->getPermissionName(),
       'administer permissions',
@@ -73,7 +73,7 @@ class SearchCommentTest extends SearchTestBase {
       'post comments',
       'skip comment approval',
       'access comments',
-    );
+    ];
     $this->adminUser = $this->drupalCreateUser($permissions);
     $this->drupalLogin($this->adminUser);
     // Add a comment field.
@@ -83,18 +83,18 @@ class SearchCommentTest extends SearchTestBase {
   /**
    * Verify that comments are rendered using proper format in search results.
    */
-  function testSearchResultsComment() {
+  public function testSearchResultsComment() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     // Create basic_html format that escapes all HTML.
-    $basic_html_format = FilterFormat::create(array(
+    $basic_html_format = FilterFormat::create([
       'format' => 'basic_html',
       'name' => 'Basic HTML',
       'weight' => 1,
-      'filters' => array(
-        'filter_html_escape' => array('status' => 1),
-      ),
-      'roles' => array(RoleInterface::AUTHENTICATED_ID),
-    ));
+      'filters' => [
+        'filter_html_escape' => ['status' => 1],
+      ],
+      'roles' => [RoleInterface::AUTHENTICATED_ID],
+    ]);
     $basic_html_format->save();
 
     $comment_body = 'Test comment body';
@@ -105,17 +105,17 @@ class SearchCommentTest extends SearchTestBase {
     $field->save();
 
     // Allow anonymous users to search content.
-    $edit = array(
+    $edit = [
       RoleInterface::ANONYMOUS_ID . '[search content]' => 1,
       RoleInterface::ANONYMOUS_ID . '[access comments]' => 1,
       RoleInterface::ANONYMOUS_ID . '[post comments]' => 1,
-    );
+    ];
     $this->drupalPostForm('admin/people/permissions', $edit, t('Save permissions'));
 
     // Create a node.
-    $node = $this->drupalCreateNode(array('type' => 'article'));
+    $node = $this->drupalCreateNode(['type' => 'article']);
     // Post a comment using 'Full HTML' text format.
-    $edit_comment = array();
+    $edit_comment = [];
     $edit_comment['subject[0][value]'] = 'Test comment subject';
     $edit_comment['comment_body[0][value]'] = '<h1>' . $comment_body . '</h1>';
     $full_html_format_id = 'full_html';
@@ -125,7 +125,7 @@ class SearchCommentTest extends SearchTestBase {
     // Post a comment with an evil script tag in the comment subject and a
     // script tag nearby a keyword in the comment body. Use the 'FULL HTML' text
     // format so the script tag stored.
-    $edit_comment2 = array();
+    $edit_comment2 = [];
     $edit_comment2['subject[0][value]'] = "<script>alert('subjectkeyword');</script>";
     $edit_comment2['comment_body[0][value]'] = "nearbykeyword<script>alert('somethinggeneric');</script>";
     $edit_comment2['comment_body[0][format]'] = $full_html_format_id;
@@ -133,7 +133,7 @@ class SearchCommentTest extends SearchTestBase {
 
     // Post a comment with a keyword inside an evil script tag in the comment
     // body. Use the 'FULL HTML' text format so the script tag is stored.
-    $edit_comment3 = array();
+    $edit_comment3 = [];
     $edit_comment3['subject[0][value]'] = 'asubject';
     $edit_comment3['comment_body[0][value]'] = "<script>alert('insidekeyword');</script>";
     $edit_comment3['comment_body[0][format]'] = $full_html_format_id;
@@ -144,19 +144,19 @@ class SearchCommentTest extends SearchTestBase {
     $this->cronRun();
 
     // Search for the comment subject.
-    $edit = array(
+    $edit = [
       'keys' => "'" . $edit_comment['subject[0][value]'] . "'",
-    );
+    ];
     $this->drupalPostForm('search/node', $edit, t('Search'));
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $node2 = $node_storage->load($node->id());
     $this->assertText($node2->label(), 'Node found in search results.');
     $this->assertText($edit_comment['subject[0][value]'], 'Comment subject found in search results.');
 
     // Search for the comment body.
-    $edit = array(
+    $edit = [
       'keys' => "'" . $comment_body . "'",
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Search'));
     $this->assertText($node2->label(), 'Node found in search results.');
 
@@ -166,9 +166,9 @@ class SearchCommentTest extends SearchTestBase {
     $this->assertNoEscaped($edit_comment['comment_body[0][value]'], 'HTML in comment body is not escaped.');
 
     // Search for the evil script comment subject.
-    $edit = array(
+    $edit = [
       'keys' => 'subjectkeyword',
-    );
+    ];
     $this->drupalPostForm('search/node', $edit, t('Search'));
 
     // Verify the evil comment subject is escaped in search results.
@@ -215,7 +215,7 @@ class SearchCommentTest extends SearchTestBase {
   /**
    * Verify access rules for comment indexing with different permissions.
    */
-  function testSearchResultsCommentAccess() {
+  public function testSearchResultsCommentAccess() {
     $comment_body = 'Test comment body';
     $this->commentSubject = 'Test comment subject';
     $roles = $this->adminUser->getRoles(TRUE);
@@ -226,10 +226,10 @@ class SearchCommentTest extends SearchTestBase {
     $field = FieldConfig::loadByName('node', 'article', 'comment');
     $field->setSetting('preview', DRUPAL_OPTIONAL);
     $field->save();
-    $this->node = $this->drupalCreateNode(array('type' => 'article'));
+    $this->node = $this->drupalCreateNode(['type' => 'article']);
 
     // Post a comment using 'Full HTML' text format.
-    $edit_comment = array();
+    $edit_comment = [];
     $edit_comment['subject[0][value]'] = $this->commentSubject;
     $edit_comment['comment_body[0][value]'] = '<h1>' . $comment_body . '</h1>';
     $this->drupalPostForm('comment/reply/node/' . $this->node->id() . '/comment', $edit_comment, t('Save'));
@@ -276,26 +276,26 @@ class SearchCommentTest extends SearchTestBase {
   /**
    * Set permissions for role.
    */
-  function setRolePermissions($rid, $access_comments = FALSE, $search_content = TRUE) {
-    $permissions = array(
+  public function setRolePermissions($rid, $access_comments = FALSE, $search_content = TRUE) {
+    $permissions = [
       'access comments' => $access_comments,
       'search content' => $search_content,
-    );
+    ];
     user_role_change_permissions($rid, $permissions);
   }
 
   /**
    * Update search index and search for comment.
    */
-  function assertCommentAccess($assume_access, $message) {
+  public function assertCommentAccess($assume_access, $message) {
     // Invoke search index update.
     search_mark_for_reindex('node_search', $this->node->id());
     $this->cronRun();
 
     // Search for the comment subject.
-    $edit = array(
+    $edit = [
       'keys' => "'" . $this->commentSubject . "'",
-    );
+    ];
     $this->drupalPostForm('search/node', $edit, t('Search'));
 
     if ($assume_access) {
@@ -312,21 +312,21 @@ class SearchCommentTest extends SearchTestBase {
   /**
    * Verify that 'add new comment' does not appear in search results or index.
    */
-  function testAddNewComment() {
+  public function testAddNewComment() {
     // Create a node with a short body.
-    $settings = array(
+    $settings = [
       'type' => 'article',
       'title' => 'short title',
-      'body' => array(array('value' => 'short body text')),
-    );
+      'body' => [['value' => 'short body text']],
+    ];
 
-    $user = $this->drupalCreateUser(array(
+    $user = $this->drupalCreateUser([
       'search content',
       'create article content',
       'access content',
       'post comments',
       'access comments',
-    ));
+    ]);
     $this->drupalLogin($user);
 
     $node = $this->drupalCreateNode($settings);
@@ -341,12 +341,12 @@ class SearchCommentTest extends SearchTestBase {
 
     // Search for 'comment'. Should be no results.
     $this->drupalLogin($user);
-    $this->drupalPostForm('search/node', array('keys' => 'comment'), t('Search'));
+    $this->drupalPostForm('search/node', ['keys' => 'comment'], t('Search'));
     $this->assertText(t('Your search yielded no results'));
 
     // Search for the node title. Should be found, and 'Add new comment' should
     // not be part of the search snippet.
-    $this->drupalPostForm('search/node', array('keys' => 'short'), t('Search'));
+    $this->drupalPostForm('search/node', ['keys' => 'short'], t('Search'));
     $this->assertText($node->label(), 'Search for keyword worked');
     $this->assertNoText(t('Add new comment'));
   }
diff --git a/web/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php b/web/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
index fe93f9068..191e0cf0d 100644
--- a/web/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
+++ b/web/core/modules/search/src/Tests/SearchConfigSettingsFormTest.php
@@ -17,7 +17,7 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'search_extra_type', 'test_page_test');
+  public static $modules = ['block', 'search_extra_type', 'test_page_test'];
 
   /**
    * User who can search and administer search.
@@ -37,7 +37,7 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
     parent::setUp();
 
     // Log in as a user that can create and search content.
-    $this->searchUser = $this->drupalCreateUser(array('search content', 'administer search', 'administer nodes', 'bypass node access', 'access user profiles', 'administer users', 'administer blocks', 'access site reports'));
+    $this->searchUser = $this->drupalCreateUser(['search content', 'administer search', 'administer nodes', 'bypass node access', 'access user profiles', 'administer users', 'administer blocks', 'access site reports']);
     $this->drupalLogin($this->searchUser);
 
     // Add a single piece of content and index it.
@@ -61,42 +61,42 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
   /**
    * Verifies the search settings form.
    */
-  function testSearchSettingsPage() {
+  public function testSearchSettingsPage() {
 
     // Test that the settings form displays the correct count of items left to index.
     $this->drupalGet('admin/config/search/pages');
-    $this->assertText(t('There are @count items left to index.', array('@count' => 0)));
+    $this->assertText(t('There are @count items left to index.', ['@count' => 0]));
 
     // Test the re-index button.
-    $this->drupalPostForm('admin/config/search/pages', array(), t('Re-index site'));
+    $this->drupalPostForm('admin/config/search/pages', [], t('Re-index site'));
     $this->assertText(t('Are you sure you want to re-index the site'));
-    $this->drupalPostForm('admin/config/search/pages/reindex', array(), t('Re-index site'));
+    $this->drupalPostForm('admin/config/search/pages/reindex', [], t('Re-index site'));
     $this->assertText(t('All search indexes will be rebuilt'));
     $this->drupalGet('admin/config/search/pages');
     $this->assertText(t('There is 1 item left to index.'));
 
     // Test that the form saves with the default values.
-    $this->drupalPostForm('admin/config/search/pages', array(), t('Save configuration'));
+    $this->drupalPostForm('admin/config/search/pages', [], t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'), 'Form saves with the default values.');
 
     // Test that the form does not save with an invalid word length.
-    $edit = array(
+    $edit = [
       'minimum_word_size' => $this->randomMachineName(3),
-    );
+    ];
     $this->drupalPostForm('admin/config/search/pages', $edit, t('Save configuration'));
     $this->assertNoText(t('The configuration options have been saved.'), 'Form does not save with an invalid word length.');
 
     // Test logging setting. It should be off by default.
     $text = $this->randomMachineName(5);
-    $this->drupalPostForm('search/node', array('keys' => $text), t('Search'));
+    $this->drupalPostForm('search/node', ['keys' => $text], t('Search'));
     $this->drupalGet('admin/reports/dblog');
     $this->assertNoLink('Searched Content for ' . $text . '.', 'Search was not logged');
 
     // Turn on logging.
-    $edit = array('logging' => TRUE);
+    $edit = ['logging' => TRUE];
     $this->drupalPostForm('admin/config/search/pages', $edit, t('Save configuration'));
     $text = $this->randomMachineName(5);
-    $this->drupalPostForm('search/node', array('keys' => $text), t('Search'));
+    $this->drupalPostForm('search/node', ['keys' => $text], t('Search'));
     $this->drupalGet('admin/reports/dblog');
     $this->assertLink('Searched Content for ' . $text . '.', 0, 'Search was logged');
 
@@ -105,7 +105,7 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
   /**
    * Verifies plugin-supplied settings form.
    */
-  function testSearchModuleSettingsPage() {
+  public function testSearchModuleSettingsPage() {
     $this->drupalGet('admin/config/search/pages');
     $this->clickLink(t('Edit'), 1);
 
@@ -113,13 +113,13 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
     $this->assertTrue($this->xpath('//select[@id="edit-extra-type-settings-boost"]//option[@value="bi" and @selected="selected"]'), 'Module specific settings are picked up from the default config');
 
     // Change extra type setting and also modify a common search setting.
-    $edit = array(
+    $edit = [
       'extra_type_settings[boost]' => 'ii',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save search page'));
 
     // Ensure that the modifications took effect.
-    $this->assertRaw(t('The %label search page has been updated.', array('%label' => 'Dummy search type')));
+    $this->assertRaw(t('The %label search page has been updated.', ['%label' => 'Dummy search type']));
     $this->drupalGet('admin/config/search/pages/manage/dummy_search_type');
     $this->assertTrue($this->xpath('//select[@id="edit-extra-type-settings-boost"]//option[@value="ii" and @selected="selected"]'), 'Module specific settings can be changed');
   }
@@ -127,23 +127,23 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
   /**
    * Verifies that you can disable individual search plugins.
    */
-  function testSearchModuleDisabling() {
+  public function testSearchModuleDisabling() {
     // Array of search plugins to test: 'keys' are the keywords to search for,
     // and 'text' is the text to assert is on the results page.
-    $plugin_info = array(
-      'node_search' => array(
+    $plugin_info = [
+      'node_search' => [
         'keys' => 'pizza',
         'text' => $this->searchNode->label(),
-      ),
-      'user_search' => array(
+      ],
+      'user_search' => [
         'keys' => $this->searchUser->getUsername(),
         'text' => $this->searchUser->getEmail(),
-      ),
-      'dummy_search_type' => array(
+      ],
+      'dummy_search_type' => [
         'keys' => 'foo',
         'text' => 'Dummy search snippet to display',
-      ),
-    );
+      ],
+    ];
     $plugins = array_keys($plugin_info);
     /** @var $entities \Drupal\search\SearchPageInterface[] */
     $entities = SearchPage::loadMultiple();
@@ -158,7 +158,7 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
 
       // Run a search from the correct search URL.
       $info = $plugin_info[$entity_id];
-      $this->drupalGet('search/' . $entity->getPath(), array('query' => array('keys' => $info['keys'])));
+      $this->drupalGet('search/' . $entity->getPath(), ['query' => ['keys' => $info['keys']]]);
       $this->assertResponse(200);
       $this->assertNoText('no results', $entity->label() . ' search found results');
       $this->assertText($info['text'], 'Correct search text found');
@@ -173,10 +173,10 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
 
       // Run a search from the search block on the node page. Verify you get
       // to this plugin's search results page.
-      $terms = array('keys' => $info['keys']);
+      $terms = ['keys' => $info['keys']];
       $this->submitGetForm('node', $terms, t('Search'));
       $current = $this->getURL();
-      $expected = \Drupal::url('search.view_' . $entity->id(), array(), array('query' => array('keys' => $info['keys']), 'absolute' => TRUE));
+      $expected = \Drupal::url('search.view_' . $entity->id(), [], ['query' => ['keys' => $info['keys']], 'absolute' => TRUE]);
       $this->assertEqual( $current, $expected, 'Block redirected to right search page');
 
       // Try an invalid search path, which should 404.
@@ -197,16 +197,16 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
 
     \Drupal::service('router.builder')->rebuild();
 
-    $paths = array(
-      array('path' => 'search/node', 'options' => array('query' => array('keys' => 'pizza'))),
-      array('path' => 'search/node', 'options' => array()),
-    );
+    $paths = [
+      ['path' => 'search/node', 'options' => ['query' => ['keys' => 'pizza']]],
+      ['path' => 'search/node', 'options' => []],
+    ];
 
     foreach ($paths as $item) {
       $this->drupalGet($item['path'], $item['options']);
       foreach ($plugins as $entity_id) {
         $label = $entities[$entity_id]->label();
-        $this->assertText($label, format_string('%label search tab is shown', array('%label' => $label)));
+        $this->assertText($label, format_string('%label search tab is shown', ['%label' => $label]));
       }
     }
   }
@@ -216,7 +216,7 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
    */
   public function testDefaultSearchPageOrdering() {
     $this->drupalGet('search');
-    $elements = $this->xpath('//*[contains(@class, :class)]//a', array(':class' => 'tabs primary'));
+    $elements = $this->xpath('//*[contains(@class, :class)]//a', [':class' => 'tabs primary']);
     $this->assertIdentical((string) $elements[0]['href'], \Drupal::url('search.view_node_search'));
     $this->assertIdentical((string) $elements[1]['href'], \Drupal::url('search.view_dummy_search_type'));
     $this->assertIdentical((string) $elements[2]['href'], \Drupal::url('search.view_user_search'));
@@ -237,24 +237,24 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
     $this->assertText(t('No search pages have been configured.'));
 
     // Add a search page.
-    $edit = array();
+    $edit = [];
     $edit['search_type'] = 'search_extra_type_search';
     $this->drupalPostForm(NULL, $edit, t('Add search page'));
     $this->assertTitle('Add new search page | Drupal');
 
-    $first = array();
+    $first = [];
     $first['label'] = $this->randomString();
     $first_id = $first['id'] = strtolower($this->randomMachineName(8));
     $first['path'] = strtolower($this->randomMachineName(8));
     $this->drupalPostForm(NULL, $first, t('Save'));
     $this->assertDefaultSearch($first_id, 'The default page matches the only search page.');
-    $this->assertRaw(t('The %label search page has been added.', array('%label' => $first['label'])));
+    $this->assertRaw(t('The %label search page has been added.', ['%label' => $first['label']]));
 
     // Attempt to add a search page with an existing path.
-    $edit = array();
+    $edit = [];
     $edit['search_type'] = 'search_extra_type_search';
     $this->drupalPostForm(NULL, $edit, t('Add search page'));
-    $edit = array();
+    $edit = [];
     $edit['label'] = $this->randomString();
     $edit['id'] = strtolower($this->randomMachineName(8));
     $edit['path'] = $first['path'];
@@ -262,7 +262,7 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
     $this->assertText(t('The search page path must be unique.'));
 
     // Add a second search page.
-    $second = array();
+    $second = [];
     $second['label'] = $this->randomString();
     $second_id = $second['id'] = strtolower($this->randomMachineName(8));
     $second['path'] = strtolower($this->randomMachineName(8));
@@ -271,18 +271,18 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
 
     // Ensure both search pages have their tabs displayed.
     $this->drupalGet('search');
-    $elements = $this->xpath('//*[contains(@class, :class)]//a', array(':class' => 'tabs primary'));
+    $elements = $this->xpath('//*[contains(@class, :class)]//a', [':class' => 'tabs primary']);
     $this->assertIdentical((string) $elements[0]['href'], Url::fromRoute('search.view_' . $first_id)->toString());
     $this->assertIdentical((string) $elements[1]['href'], Url::fromRoute('search.view_' . $second_id)->toString());
 
     // Switch the weight of the search pages and check the order of the tabs.
-    $edit = array(
+    $edit = [
       'entities[' . $first_id . '][weight]' => 10,
       'entities[' . $second_id . '][weight]' => -10,
-    );
+    ];
     $this->drupalPostForm('admin/config/search/pages', $edit, t('Save configuration'));
     $this->drupalGet('search');
-    $elements = $this->xpath('//*[contains(@class, :class)]//a', array(':class' => 'tabs primary'));
+    $elements = $this->xpath('//*[contains(@class, :class)]//a', [':class' => 'tabs primary']);
     $this->assertIdentical((string) $elements[0]['href'], Url::fromRoute('search.view_' . $second_id)->toString());
     $this->assertIdentical((string) $elements[1]['href'], Url::fromRoute('search.view_' . $first_id)->toString());
 
@@ -293,7 +293,7 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
 
     // Change the default search page.
     $this->clickLink(t('Set as default'));
-    $this->assertRaw(t('The default search page is now %label. Be sure to check the ordering of your search pages.', array('%label' => $second['label'])));
+    $this->assertRaw(t('The default search page is now %label. Be sure to check the ordering of your search pages.', ['%label' => $second['label']]));
     $this->verifySearchPageOperations($first_id, TRUE, TRUE, TRUE, FALSE);
     $this->verifySearchPageOperations($second_id, TRUE, FALSE, FALSE, FALSE);
 
@@ -312,9 +312,9 @@ class SearchConfigSettingsFormTest extends SearchTestBase {
 
     // Test deleting.
     $this->clickLink(t('Delete'));
-    $this->assertRaw(t('Are you sure you want to delete the search page %label?', array('%label' => $first['label'])));
-    $this->drupalPostForm(NULL, array(), t('Delete'));
-    $this->assertRaw(t('The search page %label has been deleted.', array('%label' => $first['label'])));
+    $this->assertRaw(t('Are you sure you want to delete the search page %label?', ['%label' => $first['label']]));
+    $this->drupalPostForm(NULL, [], t('Delete'));
+    $this->assertRaw(t('The search page %label has been deleted.', ['%label' => $first['label']]));
     $this->verifySearchPageOperations($first_id, FALSE, FALSE, FALSE, FALSE);
   }
 
diff --git a/web/core/modules/search/src/Tests/SearchEmbedFormTest.php b/web/core/modules/search/src/Tests/SearchEmbedFormTest.php
index 22da9b611..5f3fbea32 100644
--- a/web/core/modules/search/src/Tests/SearchEmbedFormTest.php
+++ b/web/core/modules/search/src/Tests/SearchEmbedFormTest.php
@@ -14,7 +14,7 @@ class SearchEmbedFormTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('search_embedded_form');
+  public static $modules = ['search_embedded_form'];
 
   /**
    * Node used for testing.
@@ -34,7 +34,7 @@ class SearchEmbedFormTest extends SearchTestBase {
     parent::setUp();
 
     // Create a user and a node, and update the search index.
-    $test_user = $this->drupalCreateUser(array('access content', 'search content', 'administer nodes'));
+    $test_user = $this->drupalCreateUser(['access content', 'search content', 'administer nodes']);
     $this->drupalLogin($test_user);
 
     $this->node = $this->drupalCreateNode();
@@ -50,10 +50,10 @@ class SearchEmbedFormTest extends SearchTestBase {
   /**
    * Tests that the embedded form appears and can be submitted.
    */
-  function testEmbeddedForm() {
+  public function testEmbeddedForm() {
     // First verify we can submit the form from the module's page.
     $this->drupalPostForm('search_embedded_form',
-      array('name' => 'John'),
+      ['name' => 'John'],
       t('Send away'));
     $this->assertText(t('Test form was submitted'), 'Form message appears');
     $count = \Drupal::state()->get('search_embedded_form.submit_count');
@@ -61,10 +61,10 @@ class SearchEmbedFormTest extends SearchTestBase {
     $this->submitCount = $count;
 
     // Now verify that we can see and submit the form from the search results.
-    $this->drupalGet('search/node', array('query' => array('keys' => $this->node->label())));
+    $this->drupalGet('search/node', ['query' => ['keys' => $this->node->label()]]);
     $this->assertText(t('Your name'), 'Form is visible');
     $this->drupalPostForm(NULL,
-      array('name' => 'John'),
+      ['name' => 'John'],
       t('Send away'));
     $this->assertText(t('Test form was submitted'), 'Form message appears');
     $count = \Drupal::state()->get('search_embedded_form.submit_count');
@@ -74,7 +74,7 @@ class SearchEmbedFormTest extends SearchTestBase {
     // Now verify that if we submit the search form, it doesn't count as
     // our form being submitted.
     $this->drupalPostForm('search',
-      array('keys' => 'foo'),
+      ['keys' => 'foo'],
       t('Search'));
     $this->assertNoText(t('Test form was submitted'), 'Form message does not appear');
     $count = \Drupal::state()->get('search_embedded_form.submit_count');
diff --git a/web/core/modules/search/src/Tests/SearchLanguageTest.php b/web/core/modules/search/src/Tests/SearchLanguageTest.php
index cdd0bd4c6..ec150855d 100644
--- a/web/core/modules/search/src/Tests/SearchLanguageTest.php
+++ b/web/core/modules/search/src/Tests/SearchLanguageTest.php
@@ -17,7 +17,7 @@ class SearchLanguageTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Array of nodes available to search.
@@ -30,7 +30,7 @@ class SearchLanguageTest extends SearchTestBase {
     parent::setUp();
 
     // Create and log in user.
-    $test_user = $this->drupalCreateUser(array('access content', 'search content', 'use advanced search', 'administer nodes', 'administer languages', 'access administration pages', 'administer site configuration'));
+    $test_user = $this->drupalCreateUser(['access content', 'search content', 'use advanced search', 'administer nodes', 'administer languages', 'access administration pages', 'administer site configuration']);
     $this->drupalLogin($test_user);
 
     // Add a new language.
@@ -45,38 +45,38 @@ class SearchLanguageTest extends SearchTestBase {
 
     // Create a few page nodes with multilingual body values.
     $default_format = filter_default_format();
-    $nodes = array(
-      array(
+    $nodes = [
+      [
         'title' => 'First node en',
         'type' => 'page',
-        'body' => array(array('value' => $this->randomMachineName(32), 'format' => $default_format)),
+        'body' => [['value' => $this->randomMachineName(32), 'format' => $default_format]],
         'langcode' => 'en',
-      ),
-      array(
+      ],
+      [
         'title' => 'Second node this is the Spanish title',
         'type' => 'page',
-        'body' => array(array('value' => $this->randomMachineName(32), 'format' => $default_format)),
+        'body' => [['value' => $this->randomMachineName(32), 'format' => $default_format]],
         'langcode' => 'es',
-      ),
-      array(
+      ],
+      [
         'title' => 'Third node en',
         'type' => 'page',
-        'body' => array(array('value' => $this->randomMachineName(32), 'format' => $default_format)),
+        'body' => [['value' => $this->randomMachineName(32), 'format' => $default_format]],
         'langcode' => 'en',
-      ),
-    );
+      ],
+    ];
     $this->searchableNodes = [];
     foreach ($nodes as $setting) {
       $this->searchableNodes[] = $this->drupalCreateNode($setting);
     }
 
     // Add English translation to the second node.
-    $translation = $this->searchableNodes[1]->addTranslation('en', array('title' => 'Second node en'));
+    $translation = $this->searchableNodes[1]->addTranslation('en', ['title' => 'Second node en']);
     $translation->body->value = $this->randomMachineName(32);
     $this->searchableNodes[1]->save();
 
     // Add Spanish translation to the third node.
-    $translation = $this->searchableNodes[2]->addTranslation('es', array('title' => 'Third node es'));
+    $translation = $this->searchableNodes[2]->addTranslation('es', ['title' => 'Third node es']);
     $translation->body->value = $this->randomMachineName(32);
     $this->searchableNodes[2]->save();
 
@@ -86,9 +86,9 @@ class SearchLanguageTest extends SearchTestBase {
     search_update_totals();
   }
 
-  function testLanguages() {
+  public function testLanguages() {
     // Add predefined language.
-    $edit = array('predefined_langcode' => 'fr');
+    $edit = ['predefined_langcode' => 'fr'];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
     $this->assertText('French', 'Language added successfully.');
 
@@ -99,11 +99,11 @@ class SearchLanguageTest extends SearchTestBase {
     $this->assertText(t('French'), 'French is a possible choice.');
 
     // Ensure selecting no language does not make the query different.
-    $this->drupalPostForm('search/node', array(), t('Advanced search'));
+    $this->drupalPostForm('search/node', [], t('Advanced search'));
     $this->assertUrl(\Drupal::url('search.view_node_search', [], ['query' => ['keys' => ''], 'absolute' => TRUE]), [], 'Correct page redirection, no language filtering.');
 
     // Pick French and ensure it is selected.
-    $edit = array('language[fr]' => TRUE);
+    $edit = ['language[fr]' => TRUE];
     $this->drupalPostForm('search/node', $edit, t('Advanced search'));
     // Get the redirected URL.
     $url = $this->getUrl();
@@ -112,7 +112,7 @@ class SearchLanguageTest extends SearchTestBase {
     $this->assertTrue(strpos($query_string, '=language:fr') !== FALSE, 'Language filter language:fr add to the query string.');
 
     // Search for keyword node and language filter as Spanish.
-    $edit = array('keys' => 'node', 'language[es]' => TRUE);
+    $edit = ['keys' => 'node', 'language[es]' => TRUE];
     $this->drupalPostForm('search/node', $edit, t('Advanced search'));
     // Check for Spanish results.
     $this->assertLink('Second node this is the Spanish title', 0, 'Second node Spanish title found in search results');
@@ -126,12 +126,12 @@ class SearchLanguageTest extends SearchTestBase {
     $path = 'admin/config/regional/language';
     $this->drupalGet($path);
     $this->assertFieldChecked('edit-site-default-language-en', 'Default language updated.');
-    $edit = array(
+    $edit = [
       'site_default_language' => 'fr',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save configuration'));
     $this->assertNoFieldChecked('edit-site-default-language-en', 'Default language updated.');
-    $this->drupalPostForm('admin/config/regional/language/delete/en', array(), t('Delete'));
+    $this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
   }
 
 }
diff --git a/web/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php b/web/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php
index e73ca8623..9b8605235 100644
--- a/web/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php
+++ b/web/core/modules/search/src/Tests/SearchNodeUpdateAndDeletionTest.php
@@ -14,7 +14,7 @@ class SearchNodeUpdateAndDeletionTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array();
+  public static $modules = [];
 
   /**
    * A user with permission to access and search content.
@@ -27,19 +27,19 @@ class SearchNodeUpdateAndDeletionTest extends SearchTestBase {
     parent::setUp();
 
     // Create a test user and log in.
-    $this->testUser = $this->drupalCreateUser(array('access content', 'search content'));
+    $this->testUser = $this->drupalCreateUser(['access content', 'search content']);
     $this->drupalLogin($this->testUser);
   }
 
   /**
    * Tests that the search index info is properly updated when a node changes.
    */
-  function testSearchIndexUpdateOnNodeChange() {
+  public function testSearchIndexUpdateOnNodeChange() {
     // Create a node.
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'title' => 'Someone who says Ni!',
-      'body' => array(array('value' => "We are the knights who say Ni!")),
-      'type' => 'page'));
+      'body' => [['value' => "We are the knights who say Ni!"]],
+      'type' => 'page']);
 
     $node_search_plugin = $this->container->get('plugin.manager.search')->createInstance('node_search');
     // Update the search index.
@@ -47,7 +47,7 @@ class SearchNodeUpdateAndDeletionTest extends SearchTestBase {
     search_update_totals();
 
     // Search the node to verify it appears in search results
-    $edit = array('keys' => 'knights');
+    $edit = ['keys' => 'knights'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertText($node->label());
 
@@ -60,7 +60,7 @@ class SearchNodeUpdateAndDeletionTest extends SearchTestBase {
     search_update_totals();
 
     // Search again to verify the new text appears in test results.
-    $edit = array('keys' => 'shrubbery');
+    $edit = ['keys' => 'shrubbery'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertText($node->label());
   }
@@ -68,12 +68,12 @@ class SearchNodeUpdateAndDeletionTest extends SearchTestBase {
   /**
    * Tests that the search index info is updated when a node is deleted.
    */
-  function testSearchIndexUpdateOnNodeDeletion() {
+  public function testSearchIndexUpdateOnNodeDeletion() {
     // Create a node.
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'title' => 'No dragons here',
-      'body' => array(array('value' => 'Again: No dragons here')),
-      'type' => 'page'));
+      'body' => [['value' => 'Again: No dragons here']],
+      'type' => 'page']);
 
     $node_search_plugin = $this->container->get('plugin.manager.search')->createInstance('node_search');
     // Update the search index.
@@ -81,12 +81,12 @@ class SearchNodeUpdateAndDeletionTest extends SearchTestBase {
     search_update_totals();
 
     // Search the node to verify it appears in search results
-    $edit = array('keys' => 'dragons');
+    $edit = ['keys' => 'dragons'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertText($node->label());
 
     // Get the node info from the search index tables.
-    $search_index_dataset = db_query("SELECT sid FROM {search_index} WHERE type = 'node_search' AND  word = :word", array(':word' => 'dragons'))
+    $search_index_dataset = db_query("SELECT sid FROM {search_index} WHERE type = 'node_search' AND  word = :word", [':word' => 'dragons'])
       ->fetchField();
     $this->assertNotEqual($search_index_dataset, FALSE, t('Node info found on the search_index'));
 
@@ -94,7 +94,7 @@ class SearchNodeUpdateAndDeletionTest extends SearchTestBase {
     $node->delete();
 
     // Check if the node info is gone from the search table.
-    $search_index_dataset = db_query("SELECT sid FROM {search_index} WHERE type = 'node_search' AND  word = :word", array(':word' => 'dragons'))
+    $search_index_dataset = db_query("SELECT sid FROM {search_index} WHERE type = 'node_search' AND  word = :word", [':word' => 'dragons'])
       ->fetchField();
     $this->assertFalse($search_index_dataset, t('Node info successfully removed from search_index'));
 
diff --git a/web/core/modules/search/src/Tests/SearchNumberMatchingTest.php b/web/core/modules/search/src/Tests/SearchNumberMatchingTest.php
index a6ad05728..7671c7b12 100644
--- a/web/core/modules/search/src/Tests/SearchNumberMatchingTest.php
+++ b/web/core/modules/search/src/Tests/SearchNumberMatchingTest.php
@@ -27,7 +27,7 @@ class SearchNumberMatchingTest extends SearchTestBase {
    *
    * @var string[]
    */
-  protected $numbers = array(
+  protected $numbers = [
     '123456789',
     '12/34/56789',
     '12.3456789',
@@ -35,7 +35,7 @@ class SearchNumberMatchingTest extends SearchTestBase {
     '123,456,789',
     '-123456789',
     '0123456789',
-  );
+  ];
 
   /**
    * An array of nodes created for testing purposes.
@@ -47,15 +47,15 @@ class SearchNumberMatchingTest extends SearchTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->testUser = $this->drupalCreateUser(array('search content', 'access content', 'administer nodes', 'access site reports'));
+    $this->testUser = $this->drupalCreateUser(['search content', 'access content', 'administer nodes', 'access site reports']);
     $this->drupalLogin($this->testUser);
 
     foreach ($this->numbers as $num) {
-      $info = array(
-        'body' => array(array('value' => $num)),
+      $info = [
+        'body' => [['value' => $num]],
         'type' => 'page',
         'language' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      );
+      ];
       $this->nodes[] = $this->drupalCreateNode($info);
     }
 
@@ -68,16 +68,16 @@ class SearchNumberMatchingTest extends SearchTestBase {
   /**
    * Tests that all the numbers can be searched.
    */
-  function testNumberSearching() {
+  public function testNumberSearching() {
     for ($i = 0; $i < count($this->numbers); $i++) {
       $node = $this->nodes[$i];
 
       // Verify that the node title does not appear on the search page
       // with a dummy search.
       $this->drupalPostForm('search/node',
-        array('keys' => 'foo'),
+        ['keys' => 'foo'],
         t('Search'));
-      $this->assertNoText($node->label(), format_string('%number: node title not shown in dummy search', array('%number' => $i)));
+      $this->assertNoText($node->label(), format_string('%number: node title not shown in dummy search', ['%number' => $i]));
 
       // Now verify that we can find node i by searching for any of the
       // numbers.
@@ -88,9 +88,9 @@ class SearchNumberMatchingTest extends SearchTestBase {
         $number = ltrim($number, '-');
 
         $this->drupalPostForm('search/node',
-          array('keys' => $number),
+          ['keys' => $number],
           t('Search'));
-        $this->assertText($node->label(), format_string('%i: node title shown (search found the node) in search for number %number', array('%i' => $i, '%number' => $number)));
+        $this->assertText($node->label(), format_string('%i: node title shown (search found the node) in search for number %number', ['%i' => $i, '%number' => $number]));
       }
     }
 
diff --git a/web/core/modules/search/src/Tests/SearchNumbersTest.php b/web/core/modules/search/src/Tests/SearchNumbersTest.php
index 30d3906f8..dbb503966 100644
--- a/web/core/modules/search/src/Tests/SearchNumbersTest.php
+++ b/web/core/modules/search/src/Tests/SearchNumbersTest.php
@@ -26,7 +26,7 @@ class SearchNumbersTest extends SearchTestBase {
    *
    * @var string[]
    */
-  protected $numbers = array(
+  protected $numbers = [
     'ISBN' => '978-0446365383',
     'UPC' => '036000 291452',
     'EAN bar code' => '5901234123457',
@@ -41,7 +41,7 @@ class SearchNumbersTest extends SearchTestBase {
     'over fifty characters' => '666666666666666666666666666666666666666666666666666666666666',
     'date' => '01/02/2009',
     'commas' => '987,654,321',
-  );
+  ];
 
   /**
    * An array of nodes created for testing purposes.
@@ -53,16 +53,16 @@ class SearchNumbersTest extends SearchTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->testUser = $this->drupalCreateUser(array('search content', 'access content', 'administer nodes', 'access site reports'));
+    $this->testUser = $this->drupalCreateUser(['search content', 'access content', 'administer nodes', 'access site reports']);
     $this->drupalLogin($this->testUser);
 
     foreach ($this->numbers as $doc => $num) {
-      $info = array(
-        'body' => array(array('value' => $num)),
+      $info = [
+        'body' => [['value' => $num]],
         'type' => 'page',
         'language' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
         'title' => $doc . ' number',
-      );
+      ];
       $this->nodes[$doc] = $this->drupalCreateNode($info);
     }
 
@@ -75,7 +75,7 @@ class SearchNumbersTest extends SearchTestBase {
   /**
    * Tests that all the numbers can be searched.
    */
-  function testNumberSearching() {
+  public function testNumberSearching() {
     $types = array_keys($this->numbers);
 
     foreach ($types as $type) {
@@ -88,16 +88,16 @@ class SearchNumbersTest extends SearchTestBase {
       // Verify that the node title does not appear on the search page
       // with a dummy search.
       $this->drupalPostForm('search/node',
-        array('keys' => 'foo'),
+        ['keys' => 'foo'],
         t('Search'));
       $this->assertNoText($node->label(), $type . ': node title not shown in dummy search');
 
       // Verify that the node title does appear as a link on the search page
       // when searching for the number.
       $this->drupalPostForm('search/node',
-        array('keys' => $number),
+        ['keys' => $number],
         t('Search'));
-      $this->assertText($node->label(), format_string('%type: node title shown (search found the node) in search for number %number.', array('%type' => $type, '%number' => $number)));
+      $this->assertText($node->label(), format_string('%type: node title shown (search found the node) in search for number %number.', ['%type' => $type, '%number' => $number]));
     }
   }
 
diff --git a/web/core/modules/search/src/Tests/SearchPageCacheTagsTest.php b/web/core/modules/search/src/Tests/SearchPageCacheTagsTest.php
index 3a7bc67e7..417d9918a 100644
--- a/web/core/modules/search/src/Tests/SearchPageCacheTagsTest.php
+++ b/web/core/modules/search/src/Tests/SearchPageCacheTagsTest.php
@@ -37,7 +37,7 @@ class SearchPageCacheTagsTest extends SearchTestBase {
     parent::setUp();
 
     // Create user.
-    $this->searchingUser = $this->drupalCreateUser(array('search content', 'access user profiles'));
+    $this->searchingUser = $this->drupalCreateUser(['search content', 'access user profiles']);
 
     // Create a node and update the search index.
     $this->node = $this->drupalCreateNode(['title' => 'bike shed shop']);
@@ -50,7 +50,7 @@ class SearchPageCacheTagsTest extends SearchTestBase {
   /**
    * Tests the presence of the expected cache tag in various situations.
    */
-  function testSearchText() {
+  public function testSearchText() {
     $this->drupalLogin($this->searchingUser);
 
     // Initial page for searching nodes.
@@ -60,7 +60,7 @@ class SearchPageCacheTagsTest extends SearchTestBase {
     $this->assertCacheTag('node_list');
 
     // Node search results.
-    $edit = array();
+    $edit = [];
     $edit['keys'] = 'bike shed';
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertText('bike shed shop');
@@ -70,6 +70,7 @@ class SearchPageCacheTagsTest extends SearchTestBase {
     $this->assertCacheTag('node:1');
     $this->assertCacheTag('user:2');
     $this->assertCacheTag('rendered');
+    $this->assertCacheTag('http_response');
     $this->assertCacheTag('node_list');
 
     // Updating a node should invalidate the search plugin's index cache tag.
@@ -83,6 +84,7 @@ class SearchPageCacheTagsTest extends SearchTestBase {
     $this->assertCacheTag('node:1');
     $this->assertCacheTag('user:2');
     $this->assertCacheTag('rendered');
+    $this->assertCacheTag('http_response');
     $this->assertCacheTag('node_list');
 
     // Deleting a node should invalidate the search plugin's index cache tag.
@@ -172,6 +174,7 @@ class SearchPageCacheTagsTest extends SearchTestBase {
       'config:search.page.node_search',
       'search_index',
       'search_index:node_search',
+      'http_response',
       'rendered',
       'node_list',
     ];
@@ -179,7 +182,7 @@ class SearchPageCacheTagsTest extends SearchTestBase {
     // Node search results for shop, should return node:1 (bike shed shop) and
     // node:2 (Llama shop). The related authors cache tags should be visible as
     // well.
-    $edit = array();
+    $edit = [];
     $edit['keys'] = 'shop';
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertText('bike shed shop');
@@ -192,13 +195,12 @@ class SearchPageCacheTagsTest extends SearchTestBase {
       'node_view',
       'config:filter.format.plain_text',
     ]);
-    $cache_tags = $this->drupalGetHeader('X-Drupal-Cache-Tags');
-    $this->assertEqual(explode(' ', $cache_tags), $expected_cache_tags);
+    $this->assertCacheTags($expected_cache_tags);
 
     // Only get the new node in the search results, should result in node:1,
     // node:2 and user:3 as cache tags even though only node:1 is shown. This is
     // because node:2 is reference in node:1 as an entity reference.
-    $edit = array();
+    $edit = [];
     $edit['keys'] = 'Llama';
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertText('Llama shop');
@@ -208,8 +210,7 @@ class SearchPageCacheTagsTest extends SearchTestBase {
       'user:3',
       'node_view',
     ]);
-    $cache_tags = $this->drupalGetHeader('X-Drupal-Cache-Tags');
-    $this->assertEqual(explode(' ', $cache_tags), $expected_cache_tags);
+    $this->assertCacheTags($expected_cache_tags);
   }
 
 }
diff --git a/web/core/modules/search/src/Tests/SearchPageTextTest.php b/web/core/modules/search/src/Tests/SearchPageTextTest.php
index db33d85c0..95d097d20 100644
--- a/web/core/modules/search/src/Tests/SearchPageTextTest.php
+++ b/web/core/modules/search/src/Tests/SearchPageTextTest.php
@@ -32,7 +32,7 @@ class SearchPageTextTest extends SearchTestBase {
     parent::setUp();
 
     // Create user.
-    $this->searchingUser = $this->drupalCreateUser(array('search content', 'access user profiles', 'use advanced search'));
+    $this->searchingUser = $this->drupalCreateUser(['search content', 'access user profiles', 'use advanced search']);
     $this->drupalPlaceBlock('local_tasks_block');
     $this->drupalPlaceBlock('page_title_block');
   }
@@ -42,8 +42,8 @@ class SearchPageTextTest extends SearchTestBase {
    *
    * This is a regression test for https://www.drupal.org/node/2338081
    */
-  function testSearchLabelXSS() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer search')));
+  public function testSearchLabelXSS() {
+    $this->drupalLogin($this->drupalCreateUser(['administer search']));
 
     $keys['label'] = '<script>alert("Dont Panic");</script>';
     $this->drupalPostForm('admin/config/search/pages/manage/node_search', $keys, t('Save search page'));
@@ -56,21 +56,21 @@ class SearchPageTextTest extends SearchTestBase {
   /**
    * Tests the failed search text, and various other text on the search page.
    */
-  function testSearchText() {
+  public function testSearchText() {
     $this->drupalLogin($this->searchingUser);
     $this->drupalGet('search/node');
     $this->assertText(t('Enter your keywords'));
     $this->assertText(t('Search'));
     $this->assertTitle(t('Search') . ' | Drupal', 'Search page title is correct');
 
-    $edit = array();
+    $edit = [];
     $search_terms = 'bike shed ' . $this->randomMachineName();
     $edit['keys'] = $search_terms;
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertText('search yielded no results');
     $this->assertText(t('Search'));
     $title_source = 'Search for @keywords | Drupal';
-    $this->assertTitle(t($title_source, array('@keywords' => Unicode::truncate($search_terms, 60, TRUE, TRUE))), 'Search page title is correct');
+    $this->assertTitle(t($title_source, ['@keywords' => Unicode::truncate($search_terms, 60, TRUE, TRUE)]), 'Search page title is correct');
     $this->assertNoText('Node', 'Erroneous tab and breadcrumb text is not present');
     $this->assertNoText(t('Node'), 'Erroneous translated tab and breadcrumb text is not present');
     $this->assertText(t('Content'), 'Tab and breadcrumb text is present');
@@ -80,23 +80,23 @@ class SearchPageTextTest extends SearchTestBase {
     $this->assertText('Use upper-case OR to get more results', 'Correct text is on content search help page');
 
     // Search for a longer text, and see that it is in the title, truncated.
-    $edit = array();
+    $edit = [];
     $search_terms = 'Every word is like an unnecessary stain on silence and nothingness.';
     $edit['keys'] = $search_terms;
     $this->drupalPostForm('search/node', $edit, t('Search'));
-    $this->assertTitle(t($title_source, array('@keywords' => 'Every word is like an unnecessary stain on silence and…')), 'Search page title is correct');
+    $this->assertTitle(t($title_source, ['@keywords' => 'Every word is like an unnecessary stain on silence and…']), 'Search page title is correct');
 
     // Search for a string with a lot of special characters.
     $search_terms = 'Hear nothing > "see nothing" `feel' . " '1982.";
     $edit['keys'] = $search_terms;
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $actual_title = (string) current($this->xpath('//title'));
-    $this->assertEqual($actual_title, Html::decodeEntities(t($title_source, array('@keywords' => Unicode::truncate($search_terms, 60, TRUE, TRUE)))), 'Search page title is correct');
+    $this->assertEqual($actual_title, Html::decodeEntities(t($title_source, ['@keywords' => Unicode::truncate($search_terms, 60, TRUE, TRUE)])), 'Search page title is correct');
 
     $edit['keys'] = $this->searchingUser->getUsername();
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertText(t('Search'));
-    $this->assertTitle(t($title_source, array('@keywords' => Unicode::truncate($this->searchingUser->getUsername(), 60, TRUE, TRUE))));
+    $this->assertTitle(t($title_source, ['@keywords' => Unicode::truncate($this->searchingUser->getUsername(), 60, TRUE, TRUE)]));
 
     $this->clickLink('Search help');
     $this->assertText('Search help', 'Correct title is on search help page');
@@ -105,14 +105,14 @@ class SearchPageTextTest extends SearchTestBase {
     // Test that search keywords containing slashes are correctly loaded
     // from the GET params and displayed in the search form.
     $arg = $this->randomMachineName() . '/' . $this->randomMachineName();
-    $this->drupalGet('search/node', array('query' => array('keys' => $arg)));
+    $this->drupalGet('search/node', ['query' => ['keys' => $arg]]);
     $input = $this->xpath("//input[@id='edit-keys' and @value='{$arg}']");
     $this->assertFalse(empty($input), 'Search keys with a / are correctly set as the default value in the search box.');
 
     // Test a search input exceeding the limit of AND/OR combinations to test
     // the Denial-of-Service protection.
     $limit = $this->config('search.settings')->get('and_or_limit');
-    $keys = array();
+    $keys = [];
     for ($i = 0; $i < $limit + 1; $i++) {
       // Use a key of 4 characters to ensure we never generate 'AND' or 'OR'.
       $keys[] = $this->randomMachineName(4);
@@ -122,40 +122,40 @@ class SearchPageTextTest extends SearchTestBase {
     }
     $edit['keys'] = implode(' ', $keys);
     $this->drupalPostForm('search/node', $edit, t('Search'));
-    $this->assertRaw(t('Your search used too many AND/OR expressions. Only the first @count terms were included in this search.', array('@count' => $limit)));
+    $this->assertRaw(t('Your search used too many AND/OR expressions. Only the first @count terms were included in this search.', ['@count' => $limit]));
 
     // Test that a search on Node or User with no keywords entered generates
     // the "Please enter some keywords" message.
-    $this->drupalPostForm('search/node', array(), t('Search'));
+    $this->drupalPostForm('search/node', [], t('Search'));
     $this->assertText(t('Please enter some keywords'), 'With no keywords entered, message is displayed on node page');
-    $this->drupalPostForm('search/user', array(), t('Search'));
+    $this->drupalPostForm('search/user', [], t('Search'));
     $this->assertText(t('Please enter some keywords'), 'With no keywords entered, message is displayed on user page');
 
     // Make sure the "Please enter some keywords" message is NOT displayed if
     // you use "or" words or phrases in Advanced Search.
-    $this->drupalPostForm('search/node', array('or' => $this->randomMachineName() . ' ' . $this->randomMachineName()), t('Advanced search'));
+    $this->drupalPostForm('search/node', ['or' => $this->randomMachineName() . ' ' . $this->randomMachineName()], t('Advanced search'));
     $this->assertNoText(t('Please enter some keywords'), 'With advanced OR keywords entered, no keywords message is not displayed on node page');
-    $this->drupalPostForm('search/node', array('phrase' => '"' . $this->randomMachineName() . '" "' . $this->randomMachineName() . '"'), t('Advanced search'));
+    $this->drupalPostForm('search/node', ['phrase' => '"' . $this->randomMachineName() . '" "' . $this->randomMachineName() . '"'], t('Advanced search'));
     $this->assertNoText(t('Please enter some keywords'), 'With advanced phrase entered, no keywords message is not displayed on node page');
 
     // Verify that if you search for a too-short keyword, you get the right
     // message, and that if after that you search for a longer keyword, you
     // do not still see the message.
-    $this->drupalPostForm('search/node', array('keys' => $this->randomMachineName(1)), t('Search'));
+    $this->drupalPostForm('search/node', ['keys' => $this->randomMachineName(1)], t('Search'));
     $this->assertText('You must include at least one keyword', 'Keyword message is displayed when searching for short word');
     $this->assertNoText(t('Please enter some keywords'), 'With short word entered, no keywords message is not displayed');
-    $this->drupalPostForm(NULL, array('keys' => $this->randomMachineName()), t('Search'));
+    $this->drupalPostForm(NULL, ['keys' => $this->randomMachineName()], t('Search'));
     $this->assertNoText('You must include at least one keyword', 'Keyword message is not displayed when searching for long word after short word search');
 
     // Test that if you search for a URL with .. in it, you still end up at
     // the search page. See issue https://www.drupal.org/node/890058.
-    $this->drupalPostForm('search/node', array('keys' => '../../admin'), t('Search'));
+    $this->drupalPostForm('search/node', ['keys' => '../../admin'], t('Search'));
     $this->assertResponse(200, 'Searching for ../../admin with non-admin user does not lead to a 403 error');
     $this->assertText('no results', 'Searching for ../../admin with non-admin user gives you a no search results page');
 
     // Test that if you search for a URL starting with "./", you still end up
     // at the search page. See issue https://www.drupal.org/node/1421560.
-    $this->drupalPostForm('search/node', array('keys' => '.something'), t('Search'));
+    $this->drupalPostForm('search/node', ['keys' => '.something'], t('Search'));
     $this->assertResponse(200, 'Searching for .something does not lead to a 403 error');
     $this->assertText('no results', 'Searching for .something gives you a no search results page');
   }
diff --git a/web/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php b/web/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php
index 38cb3508e..ab264a1a8 100644
--- a/web/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php
+++ b/web/core/modules/search/src/Tests/SearchPreprocessLangcodeTest.php
@@ -14,7 +14,7 @@ class SearchPreprocessLangcodeTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('search_langcode_test');
+  public static $modules = ['search_langcode_test'];
 
   /**
    * Test node for searching.
@@ -26,21 +26,21 @@ class SearchPreprocessLangcodeTest extends SearchTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $web_user = $this->drupalCreateUser(array(
+    $web_user = $this->drupalCreateUser([
       'create page content',
       'edit own page content',
       'search content',
       'use advanced search',
-    ));
+    ]);
     $this->drupalLogin($web_user);
   }
 
   /**
    * Tests that hook_search_preprocess() returns the correct langcode.
    */
-  function testPreprocessLangcode() {
+  public function testPreprocessLangcode() {
     // Create a node.
-    $this->node = $this->drupalCreateNode(array('body' => array(array()), 'langcode' => 'en'));
+    $this->node = $this->drupalCreateNode(['body' => [[]], 'langcode' => 'en']);
 
     // First update the index. This does the initial processing.
     $this->container->get('plugin.manager.search')->createInstance('node_search')->updateIndex();
@@ -53,7 +53,7 @@ class SearchPreprocessLangcodeTest extends SearchTestBase {
     // Search for the additional text that is added by the preprocess
     // function. If you search for text that is in the node, preprocess is
     // not invoked on the node during the search excerpt generation.
-    $edit = array('or' => 'Additional text');
+    $edit = ['or' => 'Additional text'];
     $this->drupalPostForm('search/node', $edit, t('Advanced search'));
 
     // Checks if the langcode message has been set by hook_search_preprocess().
@@ -63,13 +63,13 @@ class SearchPreprocessLangcodeTest extends SearchTestBase {
   /**
    * Tests stemming for hook_search_preprocess().
    */
-  function testPreprocessStemming() {
+  public function testPreprocessStemming() {
     // Create a node.
-    $this->node = $this->drupalCreateNode(array(
+    $this->node = $this->drupalCreateNode([
       'title' => 'we are testing',
-      'body' => array(array()),
+      'body' => [[]],
       'langcode' => 'en',
-    ));
+    ]);
 
     // First update the index. This does the initial processing.
     $this->container->get('plugin.manager.search')->createInstance('node_search')->updateIndex();
@@ -80,7 +80,7 @@ class SearchPreprocessLangcodeTest extends SearchTestBase {
     search_update_totals();
 
     // Search for the title of the node with a POST query.
-    $edit = array('or' => 'testing');
+    $edit = ['or' => 'testing'];
     $this->drupalPostForm('search/node', $edit, t('Advanced search'));
 
     // Check if the node has been found.
@@ -88,7 +88,7 @@ class SearchPreprocessLangcodeTest extends SearchTestBase {
     $this->assertText('we are testing');
 
     // Search for the same node using a different query.
-    $edit = array('or' => 'test');
+    $edit = ['or' => 'test'];
     $this->drupalPostForm('search/node', $edit, t('Advanced search'));
 
     // Check if the node has been found.
diff --git a/web/core/modules/search/src/Tests/SearchQueryAlterTest.php b/web/core/modules/search/src/Tests/SearchQueryAlterTest.php
index 0cb473f5f..66269dd6c 100644
--- a/web/core/modules/search/src/Tests/SearchQueryAlterTest.php
+++ b/web/core/modules/search/src/Tests/SearchQueryAlterTest.php
@@ -13,22 +13,22 @@ class SearchQueryAlterTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('search_query_alter');
+  public static $modules = ['search_query_alter'];
 
   /**
    * Tests that the query alter works.
    */
-  function testQueryAlter() {
+  public function testQueryAlter() {
     // Log in with sufficient privileges.
-    $this->drupalLogin($this->drupalCreateUser(array('create page content', 'search content')));
+    $this->drupalLogin($this->drupalCreateUser(['create page content', 'search content']));
 
     // Create a node and an article with the same keyword. The query alter
     // test module will alter the query so only articles should be returned.
-    $data = array(
+    $data = [
       'type' => 'page',
       'title' => 'test page',
-      'body' => array(array('value' => 'pizza')),
-    );
+      'body' => [['value' => 'pizza']],
+    ];
     $this->drupalCreateNode($data);
 
     $data['type'] = 'article';
@@ -40,7 +40,7 @@ class SearchQueryAlterTest extends SearchTestBase {
     search_update_totals();
 
     // Search for the body keyword 'pizza'.
-    $this->drupalPostForm('search/node', array('keys' => 'pizza'), t('Search'));
+    $this->drupalPostForm('search/node', ['keys' => 'pizza'], t('Search'));
     // The article should be there but not the page.
     $this->assertText('article', 'Article is in search results');
     $this->assertNoText('page', 'Page is not in search results');
diff --git a/web/core/modules/search/src/Tests/SearchRankingTest.php b/web/core/modules/search/src/Tests/SearchRankingTest.php
index 2045233e1..28241d2af 100644
--- a/web/core/modules/search/src/Tests/SearchRankingTest.php
+++ b/web/core/modules/search/src/Tests/SearchRankingTest.php
@@ -29,7 +29,7 @@ class SearchRankingTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('statistics', 'comment');
+  public static $modules = ['statistics', 'comment'];
 
   protected function setUp() {
     parent::setUp();
@@ -38,7 +38,7 @@ class SearchRankingTest extends SearchTestBase {
     $this->nodeSearch = SearchPage::load('node_search');
 
     // Log in with sufficient privileges.
-    $this->drupalLogin($this->drupalCreateUser(array('post comments', 'skip comment approval', 'create page content', 'administer search')));
+    $this->drupalLogin($this->drupalCreateUser(['post comments', 'skip comment approval', 'create page content', 'administer search']));
   }
 
   public function testRankings() {
@@ -46,24 +46,24 @@ class SearchRankingTest extends SearchTestBase {
     $this->addDefaultCommentField('node', 'page');
 
     // Build a list of the rankings to test.
-    $node_ranks = array('sticky', 'promote', 'relevance', 'recent', 'comments', 'views');
+    $node_ranks = ['sticky', 'promote', 'relevance', 'recent', 'comments', 'views'];
 
     // Create nodes for testing.
-    $nodes = array();
+    $nodes = [];
     foreach ($node_ranks as $node_rank) {
-      $settings = array(
+      $settings = [
         'type' => 'page',
-        'comment' => array(array(
+        'comment' => [[
           'status' => CommentItemInterface::HIDDEN,
-        )),
+        ]],
         'title' => 'Drupal rocks',
-        'body' => array(array('value' => "Drupal's search rocks")),
+        'body' => [['value' => "Drupal's search rocks"]],
         // Node is one day old.
         'created' => REQUEST_TIME - 24 * 3600,
         'sticky' => 0,
         'promote' => 0,
-      );
-      foreach (array(0, 1) as $num) {
+      ];
+      foreach ([0, 1] as $num) {
         if ($num == 1) {
           switch ($node_rank) {
             case 'sticky':
@@ -87,7 +87,7 @@ class SearchRankingTest extends SearchTestBase {
     }
 
     // Add a comment to one of the nodes.
-    $edit = array();
+    $edit = [];
     $edit['subject[0][value]'] = 'my comment title';
     $edit['comment_body[0][value]'] = 'some random comment';
     $this->drupalGet('comment/reply/node/' . $nodes['comments'][1]->id() . '/comment');
@@ -102,7 +102,7 @@ class SearchRankingTest extends SearchTestBase {
     // counter for this node.
     $nid = $nodes['views'][1]->id();
     db_insert('node_counter')
-      ->fields(array('totalcount' => 5, 'daycount' => 5, 'timestamp' => REQUEST_TIME, 'nid' => $nid))
+      ->fields(['totalcount' => 5, 'daycount' => 5, 'timestamp' => REQUEST_TIME, 'nid' => $nid])
       ->execute();
 
     // Run cron to update the search index and comment/statistics totals.
@@ -118,7 +118,7 @@ class SearchRankingTest extends SearchTestBase {
     }
 
     // Test each of the possible rankings.
-    $edit = array();
+    $edit = [];
     foreach ($node_ranks as $node_rank) {
       // Enable the ranking we are testing.
       $edit['rankings[' . $node_rank . '][value]'] = 10;
@@ -129,7 +129,7 @@ class SearchRankingTest extends SearchTestBase {
       // Reload the plugin to get the up-to-date values.
       $this->nodeSearch = SearchPage::load('node_search');
       // Do the search and assert the results.
-      $this->nodeSearch->getPlugin()->setSearch('rocks', array(), array());
+      $this->nodeSearch->getPlugin()->setSearch('rocks', [], []);
       $set = $this->nodeSearch->getPlugin()->execute();
       $this->assertEqual($set[0]['node']->id(), $nodes[$node_rank][1]->id(), 'Search ranking "' . $node_rank . '" order.');
 
@@ -147,14 +147,14 @@ class SearchRankingTest extends SearchTestBase {
 
     // Try with sticky, then promoted. This is a test for issue
     // https://www.drupal.org/node/771596.
-    $node_ranks = array(
+    $node_ranks = [
       'sticky' => 10,
       'promote' => 1,
       'relevance' => 0,
       'recent' => 0,
       'comments' => 0,
       'views' => 0,
-    );
+    ];
     $configuration = $this->nodeSearch->getPlugin()->getConfiguration();
     foreach ($node_ranks as $var => $value) {
       $configuration['rankings'][$var] = $value;
@@ -164,7 +164,7 @@ class SearchRankingTest extends SearchTestBase {
 
     // Do the search and assert the results. The sticky node should show up
     // first, then the promoted node, then all the rest.
-    $this->nodeSearch->getPlugin()->setSearch('rocks', array(), array());
+    $this->nodeSearch->getPlugin()->setSearch('rocks', [], []);
     $set = $this->nodeSearch->getPlugin()->execute();
     $this->assertEqual($set[0]['node']->id(), $nodes['sticky'][1]->id(), 'Search ranking for sticky first worked.');
     $this->assertEqual($set[1]['node']->id(), $nodes['promote'][1]->id(), 'Search ranking for promoted second worked.');
@@ -172,14 +172,14 @@ class SearchRankingTest extends SearchTestBase {
     // Try with recent, then comments. This is a test for issues
     // https://www.drupal.org/node/771596 and
     // https://www.drupal.org/node/303574.
-    $node_ranks = array(
+    $node_ranks = [
       'sticky' => 0,
       'promote' => 0,
       'relevance' => 0,
       'recent' => 10,
       'comments' => 1,
       'views' => 0,
-    );
+    ];
     $configuration = $this->nodeSearch->getPlugin()->getConfiguration();
     foreach ($node_ranks as $var => $value) {
       $configuration['rankings'][$var] = $value;
@@ -189,7 +189,7 @@ class SearchRankingTest extends SearchTestBase {
 
     // Do the search and assert the results. The recent node should show up
     // first, then the commented node, then all the rest.
-    $this->nodeSearch->getPlugin()->setSearch('rocks', array(), array());
+    $this->nodeSearch->getPlugin()->setSearch('rocks', [], []);
     $set = $this->nodeSearch->getPlugin()->execute();
     $this->assertEqual($set[0]['node']->id(), $nodes['recent'][1]->id(), 'Search ranking for recent first worked.');
     $this->assertEqual($set[1]['node']->id(), $nodes['comments'][1]->id(), 'Search ranking for comments second worked.');
@@ -200,33 +200,33 @@ class SearchRankingTest extends SearchTestBase {
    * Test rankings of HTML tags.
    */
   public function testHTMLRankings() {
-    $full_html_format = FilterFormat::create(array(
+    $full_html_format = FilterFormat::create([
       'format' => 'full_html',
       'name' => 'Full HTML',
-    ));
+    ]);
     $full_html_format->save();
 
     // Test HTML tags with different weights.
-    $sorted_tags = array('h1', 'h2', 'h3', 'h4', 'a', 'h5', 'h6', 'notag');
+    $sorted_tags = ['h1', 'h2', 'h3', 'h4', 'a', 'h5', 'h6', 'notag'];
     $shuffled_tags = $sorted_tags;
 
     // Shuffle tags to ensure HTML tags are ranked properly.
     shuffle($shuffled_tags);
-    $settings = array(
+    $settings = [
       'type' => 'page',
       'title' => 'Simple node',
-    );
-    $nodes = array();
+    ];
+    $nodes = [];
     foreach ($shuffled_tags as $tag) {
       switch ($tag) {
         case 'a':
-          $settings['body'] = array(array('value' => \Drupal::l('Drupal Rocks', new Url('<front>')), 'format' => 'full_html'));
+          $settings['body'] = [['value' => \Drupal::l('Drupal Rocks', new Url('<front>')), 'format' => 'full_html']];
           break;
         case 'notag':
-          $settings['body'] = array(array('value' => 'Drupal Rocks'));
+          $settings['body'] = [['value' => 'Drupal Rocks']];
           break;
         default:
-          $settings['body'] = array(array('value' => "<$tag>Drupal Rocks</$tag>", 'format' => 'full_html'));
+          $settings['body'] = [['value' => "<$tag>Drupal Rocks</$tag>", 'format' => 'full_html']];
           break;
       }
       $nodes[$tag] = $this->drupalCreateNode($settings);
@@ -236,7 +236,7 @@ class SearchRankingTest extends SearchTestBase {
     $this->nodeSearch->getPlugin()->updateIndex();
     search_update_totals();
 
-    $this->nodeSearch->getPlugin()->setSearch('rocks', array(), array());
+    $this->nodeSearch->getPlugin()->setSearch('rocks', [], []);
     // Do the search and assert the results.
     $set = $this->nodeSearch->getPlugin()->execute();
 
@@ -252,16 +252,16 @@ class SearchRankingTest extends SearchTestBase {
     }
 
     // Test tags with the same weight against the sorted tags.
-    $unsorted_tags = array('u', 'b', 'i', 'strong', 'em');
+    $unsorted_tags = ['u', 'b', 'i', 'strong', 'em'];
     foreach ($unsorted_tags as $tag) {
-      $settings['body'] = array(array('value' => "<$tag>Drupal Rocks</$tag>", 'format' => 'full_html'));
+      $settings['body'] = [['value' => "<$tag>Drupal Rocks</$tag>", 'format' => 'full_html']];
       $node = $this->drupalCreateNode($settings);
 
       // Update the search index.
       $this->nodeSearch->getPlugin()->updateIndex();
       search_update_totals();
 
-      $this->nodeSearch->getPlugin()->setSearch('rocks', array(), array());
+      $this->nodeSearch->getPlugin()->setSearch('rocks', [], []);
       // Do the search and assert the results.
       $set = $this->nodeSearch->getPlugin()->execute();
 
diff --git a/web/core/modules/search/src/Tests/SearchTestBase.php b/web/core/modules/search/src/Tests/SearchTestBase.php
index 83967b3a0..1c157b6d0 100644
--- a/web/core/modules/search/src/Tests/SearchTestBase.php
+++ b/web/core/modules/search/src/Tests/SearchTestBase.php
@@ -7,6 +7,9 @@ use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Defines the common search test code.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\search\Functional\SearchTestBase instead.
  */
 abstract class SearchTestBase extends WebTestBase {
 
@@ -15,15 +18,15 @@ abstract class SearchTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'search', 'dblog');
+  public static $modules = ['node', 'search', 'dblog'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create Basic page and Article node types.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-      $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
     }
   }
 
@@ -68,13 +71,13 @@ abstract class SearchTestBase extends WebTestBase {
       foreach ($forms as $form) {
         // Try to set the fields of this form as specified in $edit.
         $edit = $edit_save;
-        $post = array();
-        $upload = array();
+        $post = [];
+        $upload = [];
         $submit_matches = $this->handleForm($post, $edit, $upload, $submit, $form);
         if (!$edit && $submit_matches) {
           // Everything matched, so "submit" the form.
           $action = isset($form['action']) ? $this->getAbsoluteUrl((string) $form['action']) : NULL;
-          $this->drupalGet($action, array('query' => $post));
+          $this->drupalGet($action, ['query' => $post]);
           return;
         }
       }
@@ -82,10 +85,10 @@ abstract class SearchTestBase extends WebTestBase {
       // We have not found a form which contained all fields of $edit and
       // the submit button.
       foreach ($edit as $name => $value) {
-        $this->fail(SafeMarkup::format('Failed to set field @name to @value', array('@name' => $name, '@value' => $value)));
+        $this->fail(SafeMarkup::format('Failed to set field @name to @value', ['@name' => $name, '@value' => $value]));
       }
-      $this->assertTrue($submit_matches, format_string('Found the @submit button', array('@submit' => $submit)));
-      $this->fail(format_string('Found the requested form fields at @path', array('@path' => $path)));
+      $this->assertTrue($submit_matches, format_string('Found the @submit button', ['@submit' => $submit]));
+      $this->fail(format_string('Found the requested form fields at @path', ['@path' => $path]));
     }
   }
 
diff --git a/web/core/modules/search/src/ViewsSearchQuery.php b/web/core/modules/search/src/ViewsSearchQuery.php
index fc67ed172..ca4b16c71 100644
--- a/web/core/modules/search/src/ViewsSearchQuery.php
+++ b/web/core/modules/search/src/ViewsSearchQuery.php
@@ -69,7 +69,7 @@ class ViewsSearchQuery extends SearchQuery {
    *   item from a \Drupal\Core\Database\Query\Condition::conditions array,
    *   which must have a 'field' element.
    */
-  function conditionReplaceString($search, $replace, &$condition) {
+  public function conditionReplaceString($search, $replace, &$condition) {
     if ($condition['field'] instanceof Condition) {
       $conditions =& $condition['field']->conditions();
       foreach ($conditions as $key => &$subcondition) {
diff --git a/web/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php b/web/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php
index 29c047d05..64d9418fb 100644
--- a/web/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php
+++ b/web/core/modules/search/tests/modules/search_embedded_form/src/Form/SearchEmbeddedForm.php
@@ -23,20 +23,20 @@ class SearchEmbeddedForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $count = \Drupal::state()->get('search_embedded_form.submit_count');
 
-    $form['name'] = array(
+    $form['name'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Your name'),
       '#maxlength' => 255,
       '#default_value' => '',
       '#required' => TRUE,
-      '#description' => $this->t('Times form has been submitted: %count', array('%count' => $count)),
-    );
+      '#description' => $this->t('Times form has been submitted: %count', ['%count' => $count]),
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Send away'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php b/web/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
index d02fd81a3..d18ff1c92 100644
--- a/web/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
+++ b/web/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
@@ -50,18 +50,18 @@ class SearchExtraTypeSearch extends ConfigurableSearchPluginBase {
    *   A structured list of search results
    */
   public function execute() {
-    $results = array();
+    $results = [];
     if (!$this->isSearchExecutable()) {
       return $results;
     }
-    return array(
-      array(
+    return [
+      [
         'link' => Url::fromRoute('test_page_test.test_page')->toString(),
         'type' => 'Dummy result type',
         'title' => 'Dummy title',
         'snippet' => SafeMarkup::format("Dummy search snippet to display. Keywords: @keywords\n\nConditions: @search_parameters", ['@keywords' => $this->keywords, '@search_parameters' => print_r($this->searchParameters, TRUE)]),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -72,15 +72,15 @@ class SearchExtraTypeSearch extends ConfigurableSearchPluginBase {
     $output['prefix']['#markup'] = '<h2>Test page text is here</h2> <ol class="search-results">';
 
     foreach ($results as $entry) {
-      $output[] = array(
+      $output[] = [
         '#theme' => 'search_result',
         '#result' => $entry,
         '#plugin_id' => 'search_extra_type_search',
-      );
+      ];
     }
-    $pager = array(
+    $pager = [
       '#type' => 'pager',
-    );
+    ];
     $output['suffix']['#markup'] = '</ol>' . drupal_render($pager);
 
     return $output;
@@ -91,21 +91,21 @@ class SearchExtraTypeSearch extends ConfigurableSearchPluginBase {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     // Output form for defining rank factor weights.
-    $form['extra_type_settings'] = array(
+    $form['extra_type_settings'] = [
       '#type' => 'fieldset',
       '#title' => t('Extra type settings'),
       '#tree' => TRUE,
-    );
+    ];
 
-    $form['extra_type_settings']['boost'] = array(
+    $form['extra_type_settings']['boost'] = [
       '#type' => 'select',
       '#title' => t('Boost method'),
-      '#options' => array(
+      '#options' => [
         'bi' => t('Bistromathic'),
         'ii' => t('Infinite Improbability'),
-      ),
+      ],
       '#default_value' => $this->configuration['boost'],
-    );
+    ];
     return $form;
   }
 
@@ -113,16 +113,16 @@ class SearchExtraTypeSearch extends ConfigurableSearchPluginBase {
    * {@inheritdoc}
    */
   public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    $this->configuration['boost'] = $form_state->getValue(array('extra_type_settings', 'boost'));
+    $this->configuration['boost'] = $form_state->getValue(['extra_type_settings', 'boost']);
   }
 
   /**
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'boost' => 'bi',
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/search/src/Tests/SearchCommentCountToggleTest.php b/web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
similarity index 90%
rename from web/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
rename to web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
index 48f8bb64c..7cd9f8562 100644
--- a/web/core/modules/search/src/Tests/SearchCommentCountToggleTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
@@ -26,7 +26,7 @@ class SearchCommentCountToggleTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'comment');
+  public static $modules = ['node', 'comment'];
 
   /**
    * A user with permission to search and post comments.
@@ -46,7 +46,7 @@ class SearchCommentCountToggleTest extends SearchTestBase {
     parent::setUp();
 
     // Create searching user.
-    $this->searchingUser = $this->drupalCreateUser(array('search content', 'access content', 'access comments', 'post comments', 'skip comment approval'));
+    $this->searchingUser = $this->drupalCreateUser(['search content', 'access content', 'access comments', 'post comments', 'skip comment approval']);
 
     // Log in with sufficient privileges.
     $this->drupalLogin($this->searchingUser);
@@ -54,13 +54,13 @@ class SearchCommentCountToggleTest extends SearchTestBase {
     // Add a comment field.
     $this->addDefaultCommentField('node', 'article');
     // Create initial nodes.
-    $node_params = array('type' => 'article', 'body' => array(array('value' => 'SearchCommentToggleTestCase')));
+    $node_params = ['type' => 'article', 'body' => [['value' => 'SearchCommentToggleTestCase']]];
 
     $this->searchableNodes['1 comment'] = $this->drupalCreateNode($node_params);
     $this->searchableNodes['0 comments'] = $this->drupalCreateNode($node_params);
 
     // Create a comment array
-    $edit_comment = array();
+    $edit_comment = [];
     $edit_comment['subject[0][value]'] = $this->randomMachineName();
     $edit_comment['comment_body[0][value]'] = $this->randomMachineName();
 
@@ -79,11 +79,11 @@ class SearchCommentCountToggleTest extends SearchTestBase {
   /**
    * Verify that comment count display toggles properly on comment status of node
    */
-  function testSearchCommentCountToggle() {
+  public function testSearchCommentCountToggle() {
     // Search for the nodes by string in the node body.
-    $edit = array(
+    $edit = [
       'keys' => "'SearchCommentToggleTestCase'",
-    );
+    ];
     $this->drupalGet('search/node');
 
     // Test comment count display for nodes with comment status set to Open
diff --git a/web/core/modules/search/src/Tests/SearchDateIntervalTest.php b/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
similarity index 93%
rename from web/core/modules/search/src/Tests/SearchDateIntervalTest.php
rename to web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
index 967f1f537..827691392 100644
--- a/web/core/modules/search/src/Tests/SearchDateIntervalTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 
@@ -43,13 +43,13 @@ class SearchDateIntervalTest extends SearchTestBase {
         'format' => $default_format,
       ],
       'langcode' => 'en',
-      'created' => $created_time_en->format('U'),
+      'created' => $created_time_en->getTimestamp(),
     ]);
 
     // Add Spanish translation to the node.
     $translation = $node->addTranslation('es', ['title' => 'Node ES']);
     $translation->body->value = $this->randomMachineName(32);
-    $translation->created->value = $created_time_es->format('U');
+    $translation->created->value = $created_time_es->getTimestamp();
     $node->save();
 
     // Update the index.
diff --git a/web/core/modules/search/src/Tests/SearchExactTest.php b/web/core/modules/search/tests/src/Functional/SearchExactTest.php
similarity index 84%
rename from web/core/modules/search/src/Tests/SearchExactTest.php
rename to web/core/modules/search/tests/src/Functional/SearchExactTest.php
index d17646bb5..04163918e 100644
--- a/web/core/modules/search/src/Tests/SearchExactTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchExactTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests that searching for a phrase gets the correct page count.
@@ -11,27 +11,27 @@ class SearchExactTest extends SearchTestBase {
   /**
    * Tests that the correct number of pager links are found for both keywords and phrases.
    */
-  function testExactQuery() {
+  public function testExactQuery() {
     // Log in with sufficient privileges.
-    $user = $this->drupalCreateUser(array('create page content', 'search content'));
+    $user = $this->drupalCreateUser(['create page content', 'search content']);
     $this->drupalLogin($user);
 
-    $settings = array(
+    $settings = [
       'type' => 'page',
       'title' => 'Simple Node',
-    );
+    ];
     // Create nodes with exact phrase.
     for ($i = 0; $i <= 17; $i++) {
-      $settings['body'] = array(array('value' => 'love pizza'));
+      $settings['body'] = [['value' => 'love pizza']];
       $this->drupalCreateNode($settings);
     }
     // Create nodes containing keywords.
     for ($i = 0; $i <= 17; $i++) {
-      $settings['body'] = array(array('value' => 'love cheesy pizza'));
+      $settings['body'] = [['value' => 'love cheesy pizza']];
       $this->drupalCreateNode($settings);
     }
     // Create another node and save it for later.
-    $settings['body'] = array(array('value' => 'Druplicon'));
+    $settings['body'] = [['value' => 'Druplicon']];
     $node = $this->drupalCreateNode($settings);
 
     // Update the search index.
@@ -42,7 +42,7 @@ class SearchExactTest extends SearchTestBase {
     $this->refreshVariables();
 
     // Test that the correct number of pager links are found for keyword search.
-    $edit = array('keys' => 'love pizza');
+    $edit = ['keys' => 'love pizza'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertLinkByHref('page=1', 0, '2nd page link is found for keyword search.');
     $this->assertLinkByHref('page=2', 0, '3rd page link is found for keyword search.');
@@ -50,7 +50,7 @@ class SearchExactTest extends SearchTestBase {
     $this->assertNoLinkByHref('page=4', '5th page link is not found for keyword search.');
 
     // Test that the correct number of pager links are found for exact phrase search.
-    $edit = array('keys' => '"love pizza"');
+    $edit = ['keys' => '"love pizza"'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertLinkByHref('page=1', 0, '2nd page link is found for exact phrase search.');
     $this->assertNoLinkByHref('page=2', '3rd page link is not found for exact phrase search.');
@@ -60,7 +60,7 @@ class SearchExactTest extends SearchTestBase {
     $node_type_config->set('display_submitted', TRUE);
     $node_type_config->save();
 
-    $edit = array('keys' => 'Druplicon');
+    $edit = ['keys' => 'Druplicon'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertText($user->getUsername(), 'Basic page node displays author name when post settings are on.');
     $this->assertText(format_date($node->getChangedTime(), 'short'), 'Basic page node displays post date when post settings are on.');
@@ -69,7 +69,7 @@ class SearchExactTest extends SearchTestBase {
     // information is not displayed.
     $node_type_config->set('display_submitted', FALSE);
     $node_type_config->save();
-    $edit = array('keys' => 'Druplicon');
+    $edit = ['keys' => 'Druplicon'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertNoText($user->getUsername(), 'Basic page node does not display author name when post settings are off.');
     $this->assertNoText(format_date($node->getChangedTime(), 'short'), 'Basic page node does not display post date when post settings are off.');
diff --git a/web/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php b/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
similarity index 67%
rename from web/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php
rename to web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
index 1625d8de9..26bff66bd 100644
--- a/web/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\Component\Utility\Html;
 
@@ -20,7 +20,7 @@ class SearchKeywordsConditionsTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('comment', 'search_extra_type', 'test_page_test');
+  public static $modules = ['comment', 'search_extra_type', 'test_page_test'];
 
   /**
    * A user with permission to search and post comments.
@@ -33,7 +33,7 @@ class SearchKeywordsConditionsTest extends SearchTestBase {
     parent::setUp();
 
     // Create searching user.
-    $this->searchingUser = $this->drupalCreateUser(array('search content', 'access content', 'access comments', 'skip comment approval'));
+    $this->searchingUser = $this->drupalCreateUser(['search content', 'access content', 'access comments', 'skip comment approval']);
     // Log in with sufficient privileges.
     $this->drupalLogin($this->searchingUser);
   }
@@ -41,22 +41,22 @@ class SearchKeywordsConditionsTest extends SearchTestBase {
   /**
    * Verify the keywords are captured and conditions respected.
    */
-  function testSearchKeywordsConditions() {
+  public function testSearchKeywordsConditions() {
     // No keys, not conditions - no results.
     $this->drupalGet('search/dummy_path');
     $this->assertNoText('Dummy search snippet to display');
     // With keys - get results.
     $keys = 'bike shed ' . $this->randomMachineName();
-    $this->drupalGet("search/dummy_path", array('query' => array('keys' => $keys)));
+    $this->drupalGet("search/dummy_path", ['query' => ['keys' => $keys]]);
     $this->assertText("Dummy search snippet to display. Keywords: {$keys}");
     $keys = 'blue drop ' . $this->randomMachineName();
-    $this->drupalGet("search/dummy_path", array('query' => array('keys' => $keys)));
+    $this->drupalGet("search/dummy_path", ['query' => ['keys' => $keys]]);
     $this->assertText("Dummy search snippet to display. Keywords: {$keys}");
     // Add some conditions and keys.
     $keys = 'moving drop ' . $this->randomMachineName();
-    $this->drupalGet("search/dummy_path", array('query' => array('keys' => 'bike', 'search_conditions' => $keys)));
+    $this->drupalGet("search/dummy_path", ['query' => ['keys' => 'bike', 'search_conditions' => $keys]]);
     $this->assertText("Dummy search snippet to display.");
-    $this->assertRaw(Html::escape(print_r(array('keys' => 'bike', 'search_conditions' => $keys), TRUE)));
+    $this->assertRaw(Html::escape(print_r(['keys' => 'bike', 'search_conditions' => $keys], TRUE)));
   }
 
 }
diff --git a/web/core/modules/search/src/Tests/SearchMultilingualEntityTest.php b/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
similarity index 86%
rename from web/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
rename to web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
index e133101d5..3dfc1179c 100644
--- a/web/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -17,7 +17,7 @@ class SearchMultilingualEntityTest extends SearchTestBase {
    *
    * @var \Drupal\node\NodeInterface[]
    */
-  protected $searchableNodes = array();
+  protected $searchableNodes = [];
 
   /**
    * Node search plugin.
@@ -26,14 +26,14 @@ class SearchMultilingualEntityTest extends SearchTestBase {
    */
   protected $plugin;
 
-  public static $modules = array('language', 'locale', 'comment');
+  public static $modules = ['language', 'locale', 'comment'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create a user who can administer search, do searches, see the status
     // report, and administer cron. Log in.
-    $user = $this->drupalCreateUser(array('administer search', 'search content', 'use advanced search', 'access content', 'access site reports', 'administer site configuration'));
+    $user = $this->drupalCreateUser(['administer search', 'search content', 'use advanced search', 'access content', 'access site reports', 'administer site configuration']);
     $this->drupalLogin($user);
 
     // Set up the search plugin.
@@ -56,53 +56,53 @@ class SearchMultilingualEntityTest extends SearchTestBase {
 
     // Create a few page nodes with multilingual body values.
     $default_format = filter_default_format();
-    $nodes = array(
-      array(
+    $nodes = [
+      [
         'title' => 'First node en',
         'type' => 'page',
-        'body' => array(array('value' => $this->randomMachineName(32), 'format' => $default_format)),
+        'body' => [['value' => $this->randomMachineName(32), 'format' => $default_format]],
         'langcode' => 'en',
-      ),
-      array(
+      ],
+      [
         'title' => 'Second node this is the English title',
         'type' => 'page',
-        'body' => array(array('value' => $this->randomMachineName(32), 'format' => $default_format)),
+        'body' => [['value' => $this->randomMachineName(32), 'format' => $default_format]],
         'langcode' => 'en',
-      ),
-      array(
+      ],
+      [
         'title' => 'Third node en',
         'type' => 'page',
-        'body' => array(array('value' => $this->randomMachineName(32), 'format' => $default_format)),
+        'body' => [['value' => $this->randomMachineName(32), 'format' => $default_format]],
         'langcode' => 'en',
-      ),
+      ],
       // After the third node, we don't care what the settings are. But we
       // need to have at least 5 to make sure the throttling is working
       // correctly. So, let's make 8 total.
-      array(
-      ),
-      array(
-      ),
-      array(
-      ),
-      array(
-      ),
-      array(
-      ),
-    );
-    $this->searchableNodes = array();
+      [
+      ],
+      [
+      ],
+      [
+      ],
+      [
+      ],
+      [
+      ],
+    ];
+    $this->searchableNodes = [];
     foreach ($nodes as $setting) {
       $this->searchableNodes[] = $this->drupalCreateNode($setting);
     }
 
     // Add a single translation to the second node.
-    $translation = $this->searchableNodes[1]->addTranslation('hu', array('title' => 'Second node hu'));
+    $translation = $this->searchableNodes[1]->addTranslation('hu', ['title' => 'Second node hu']);
     $translation->body->value = $this->randomMachineName(32);
     $this->searchableNodes[1]->save();
 
     // Add two translations to the third node.
-    $translation = $this->searchableNodes[2]->addTranslation('hu', array('title' => 'Third node this is the Hungarian title'));
+    $translation = $this->searchableNodes[2]->addTranslation('hu', ['title' => 'Third node this is the Hungarian title']);
     $translation->body->value = $this->randomMachineName(32);
-    $translation = $this->searchableNodes[2]->addTranslation('sv', array('title' => 'Third node sv'));
+    $translation = $this->searchableNodes[2]->addTranslation('sv', ['title' => 'Third node sv']);
     $translation->body->value = $this->randomMachineName(32);
     $this->searchableNodes[2]->save();
 
@@ -114,7 +114,7 @@ class SearchMultilingualEntityTest extends SearchTestBase {
   /**
    * Tests the indexing throttle and search results with multilingual nodes.
    */
-  function testMultilingualSearch() {
+  public function testMultilingualSearch() {
     // Index only 2 nodes per cron run. We cannot do this setting in the UI,
     // because it doesn't go this low.
     $this->config('search.settings')->set('index.cron_limit', 2)->save();
@@ -132,7 +132,7 @@ class SearchMultilingualEntityTest extends SearchTestBase {
 
     // Now index the rest of the nodes.
     // Make sure index throttle is high enough, via the UI.
-    $this->drupalPostForm('admin/config/search/pages', array('cron_limit' => 20), t('Save configuration'));
+    $this->drupalPostForm('admin/config/search/pages', ['cron_limit' => 20], t('Save configuration'));
     $this->assertEqual(20, $this->config('search.settings')->get('index.cron_limit', 100), 'Config setting was saved correctly');
     // Get a new search plugin, to make sure it has this setting.
     $this->plugin = $this->container->get('plugin.manager.search')->createInstance('node_search');
@@ -143,8 +143,8 @@ class SearchMultilingualEntityTest extends SearchTestBase {
     $this->assertDatabaseCounts(8, 0, 'after updating fully');
 
     // Click the reindex button on the admin page, verify counts, and reindex.
-    $this->drupalPostForm('admin/config/search/pages', array(), t('Re-index site'));
-    $this->drupalPostForm(NULL, array(), t('Re-index site'));
+    $this->drupalPostForm('admin/config/search/pages', [], t('Re-index site'));
+    $this->drupalPostForm(NULL, [], t('Re-index site'));
     $this->assertIndexCounts(8, 8, 'after reindex');
     $this->assertDatabaseCounts(8, 0, 'after reindex');
     $this->plugin->updateIndex();
@@ -153,30 +153,30 @@ class SearchMultilingualEntityTest extends SearchTestBase {
     // Test search results.
 
     // This should find two results for the second and third node.
-    $this->plugin->setSearch('English OR Hungarian', array(), array());
+    $this->plugin->setSearch('English OR Hungarian', [], []);
     $search_result = $this->plugin->execute();
     $this->assertEqual(count($search_result), 2, 'Found two results.');
     // Nodes are saved directly after each other and have the same created time
     // so testing for the order is not possible.
-    $results = array($search_result[0]['title'], $search_result[1]['title']);
+    $results = [$search_result[0]['title'], $search_result[1]['title']];
     $this->assertTrue(in_array('Third node this is the Hungarian title', $results), 'The search finds the correct Hungarian title.');
     $this->assertTrue(in_array('Second node this is the English title', $results), 'The search finds the correct English title.');
 
     // Now filter for Hungarian results only.
-    $this->plugin->setSearch('English OR Hungarian', array('f' => array('language:hu')), array());
+    $this->plugin->setSearch('English OR Hungarian', ['f' => ['language:hu']], []);
     $search_result = $this->plugin->execute();
 
     $this->assertEqual(count($search_result), 1, 'The search found only one result');
     $this->assertEqual($search_result[0]['title'], 'Third node this is the Hungarian title', 'The search finds the correct Hungarian title.');
 
     // Test for search with common key word across multiple languages.
-    $this->plugin->setSearch('node', array(), array());
+    $this->plugin->setSearch('node', [], []);
     $search_result = $this->plugin->execute();
 
     $this->assertEqual(count($search_result), 6, 'The search found total six results');
 
     // Test with language filters and common key word.
-    $this->plugin->setSearch('node', array('f' => array('language:hu')), array());
+    $this->plugin->setSearch('node', ['f' => ['language:hu']], []);
     $search_result = $this->plugin->execute();
 
     $this->assertEqual(count($search_result), 2, 'The search found 2 results');
@@ -207,14 +207,14 @@ class SearchMultilingualEntityTest extends SearchTestBase {
     $current = REQUEST_TIME;
     $old = $current - 10;
     db_update('search_dataset')
-      ->fields(array('reindex' => $old))
+      ->fields(['reindex' => $old])
       ->condition('reindex', $current, '>=')
       ->execute();
 
     // Save the node again. Verify that the request time on it is not updated.
     $this->searchableNodes[1]->save();
     $result = db_select('search_dataset', 'd')
-      ->fields('d', array('reindex'))
+      ->fields('d', ['reindex'])
       ->condition('type', 'node_search')
       ->condition('sid', $this->searchableNodes[1]->id())
       ->execute()
@@ -302,7 +302,7 @@ class SearchMultilingualEntityTest extends SearchTestBase {
   protected function assertDatabaseCounts($count_node, $count_foo, $message) {
     // Count number of distinct nodes by ID.
     $results = db_select('search_dataset', 'i')
-      ->fields('i', array('sid'))
+      ->fields('i', ['sid'])
       ->condition('type', 'node_search')
       ->groupBy('sid')
       ->execute()
@@ -311,7 +311,7 @@ class SearchMultilingualEntityTest extends SearchTestBase {
 
     // Count number of "foo" records.
     $results = db_select('search_dataset', 'i')
-      ->fields('i', array('sid'))
+      ->fields('i', ['sid'])
       ->condition('type', 'foo')
       ->execute()
       ->fetchCol();
diff --git a/web/core/modules/search/src/Tests/SearchNodeDiacriticsTest.php b/web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
similarity index 75%
rename from web/core/modules/search/src/Tests/SearchNodeDiacriticsTest.php
rename to web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
index a8b45a57a..848e35762 100644
--- a/web/core/modules/search/src/Tests/SearchNodeDiacriticsTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests search functionality with diacritics.
@@ -21,17 +21,17 @@ class SearchNodeDiacriticsTest extends SearchTestBase {
     node_access_rebuild();
 
     // Create a test user and log in.
-    $this->testUser = $this->drupalCreateUser(array('access content', 'search content', 'use advanced search', 'access user profiles'));
+    $this->testUser = $this->drupalCreateUser(['access content', 'search content', 'use advanced search', 'access user profiles']);
     $this->drupalLogin($this->testUser);
   }
 
   /**
    * Tests that search returns results with diacritics in the search phrase.
    */
-  function testPhraseSearchPunctuation() {
+  public function testPhraseSearchPunctuation() {
     $body_text = 'The Enricþment Center is cómmīŦŧęđ to the well BɆĬŇĜ of æll påŔťıçȉpǎǹţș. ';
     $body_text .= 'Also meklēt (see #731298)';
-    $this->drupalCreateNode(array('body' => array(array('value' => $body_text))));
+    $this->drupalCreateNode(['body' => [['value' => $body_text]]]);
 
     // Update the search index.
     $this->container->get('plugin.manager.search')->createInstance('node_search')->updateIndex();
@@ -40,39 +40,39 @@ class SearchNodeDiacriticsTest extends SearchTestBase {
     // Refresh variables after the treatment.
     $this->refreshVariables();
 
-    $edit = array('keys' => 'meklet');
+    $edit = ['keys' => 'meklet'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertRaw('<strong>meklēt</strong>');
 
-    $edit = array('keys' => 'meklēt');
+    $edit = ['keys' => 'meklēt'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertRaw('<strong>meklēt</strong>');
 
-    $edit = array('keys' => 'cómmīŦŧęđ BɆĬŇĜ påŔťıçȉpǎǹţș');
+    $edit = ['keys' => 'cómmīŦŧęđ BɆĬŇĜ påŔťıçȉpǎǹţș'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertRaw('<strong>cómmīŦŧęđ</strong>');
     $this->assertRaw('<strong>BɆĬŇĜ</strong>');
     $this->assertRaw('<strong>påŔťıçȉpǎǹţș</strong>');
 
-    $edit = array('keys' => 'committed being participants');
+    $edit = ['keys' => 'committed being participants'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertRaw('<strong>cómmīŦŧęđ</strong>');
     $this->assertRaw('<strong>BɆĬŇĜ</strong>');
     $this->assertRaw('<strong>påŔťıçȉpǎǹţș</strong>');
 
-    $edit = array('keys' => 'Enricþment');
+    $edit = ['keys' => 'Enricþment'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertRaw('<strong>Enricþment</strong>');
 
-    $edit = array('keys' => 'Enritchment');
+    $edit = ['keys' => 'Enritchment'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertNoRaw('<strong>Enricþment</strong>');
 
-    $edit = array('keys' => 'æll');
+    $edit = ['keys' => 'æll'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertRaw('<strong>æll</strong>');
 
-    $edit = array('keys' => 'all');
+    $edit = ['keys' => 'all'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertNoRaw('<strong>æll</strong>');
   }
diff --git a/web/core/modules/search/src/Tests/SearchNodePunctuationTest.php b/web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
similarity index 70%
rename from web/core/modules/search/src/Tests/SearchNodePunctuationTest.php
rename to web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
index c185aeace..59354460e 100644
--- a/web/core/modules/search/src/Tests/SearchNodePunctuationTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests search functionality with punctuation and HTML entities.
@@ -21,16 +21,16 @@ class SearchNodePunctuationTest extends SearchTestBase {
     node_access_rebuild();
 
     // Create a test user and log in.
-    $this->testUser = $this->drupalCreateUser(array('access content', 'search content', 'use advanced search', 'access user profiles'));
+    $this->testUser = $this->drupalCreateUser(['access content', 'search content', 'use advanced search', 'access user profiles']);
     $this->drupalLogin($this->testUser);
   }
 
   /**
    * Tests that search works with punctuation and HTML entities.
    */
-  function testPhraseSearchPunctuation() {
-    $node = $this->drupalCreateNode(array('body' => array(array('value' => "The bunny's ears were fluffy."))));
-    $node2 = $this->drupalCreateNode(array('body' => array(array('value' => 'Dignissim Aliquam &amp; Quieligo meus natu quae quia te. Damnum&copy; erat&mdash; neo pneum. Facilisi feugiat ibidem ratis.'))));
+  public function testPhraseSearchPunctuation() {
+    $node = $this->drupalCreateNode(['body' => [['value' => "The bunny's ears were fluffy."]]]);
+    $node2 = $this->drupalCreateNode(['body' => [['value' => 'Dignissim Aliquam &amp; Quieligo meus natu quae quia te. Damnum&copy; erat&mdash; neo pneum. Facilisi feugiat ibidem ratis.']]]);
 
     // Update the search index.
     $this->container->get('plugin.manager.search')->createInstance('node_search')->updateIndex();
@@ -40,7 +40,7 @@ class SearchNodePunctuationTest extends SearchTestBase {
     $this->refreshVariables();
 
     // Submit a phrase wrapped in double quotes to include the punctuation.
-    $edit = array('keys' => '"bunny\'s"');
+    $edit = ['keys' => '"bunny\'s"'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertText($node->label());
 
@@ -49,12 +49,12 @@ class SearchNodePunctuationTest extends SearchTestBase {
     $this->assertLink($username);
 
     // Search for "&" and verify entities are not broken up in the output.
-    $edit = array('keys' => '&');
+    $edit = ['keys' => '&'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertNoRaw('<strong>&</strong>amp;');
     $this->assertText('You must include at least one keyword');
 
-    $edit = array('keys' => '&amp;');
+    $edit = ['keys' => '&amp;'];
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertNoRaw('<strong>&</strong>amp;');
     $this->assertText('You must include at least one keyword');
diff --git a/web/core/modules/search/src/Tests/SearchPageOverrideTest.php b/web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
similarity index 73%
rename from web/core/modules/search/src/Tests/SearchPageOverrideTest.php
rename to web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
index 97689045b..4dfca49d1 100644
--- a/web/core/modules/search/src/Tests/SearchPageOverrideTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests if the result page can be overridden.
@@ -17,7 +17,7 @@ class SearchPageOverrideTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('search_extra_type');
+  public static $modules = ['search_extra_type'];
 
   /**
    * A user with permission to administer search.
@@ -30,13 +30,13 @@ class SearchPageOverrideTest extends SearchTestBase {
     parent::setUp();
 
     // Log in as a user that can create and search content.
-    $this->searchUser = $this->drupalCreateUser(array('search content', 'administer search'));
+    $this->searchUser = $this->drupalCreateUser(['search content', 'administer search']);
     $this->drupalLogin($this->searchUser);
   }
 
-  function testSearchPageHook() {
+  public function testSearchPageHook() {
     $keys = 'bike shed ' . $this->randomMachineName();
-    $this->drupalGet("search/dummy_path", array('query' => array('keys' => $keys)));
+    $this->drupalGet("search/dummy_path", ['query' => ['keys' => $keys]]);
     $this->assertText('Dummy search snippet', 'Dummy search snippet is shown');
     $this->assertText('Test page text is here', 'Page override is working');
   }
diff --git a/web/core/modules/search/src/Tests/SearchSetLocaleTest.php b/web/core/modules/search/tests/src/Functional/SearchSetLocaleTest.php
similarity index 83%
rename from web/core/modules/search/src/Tests/SearchSetLocaleTest.php
rename to web/core/modules/search/tests/src/Functional/SearchSetLocaleTest.php
index 0ec413780..f6923f432 100644
--- a/web/core/modules/search/src/Tests/SearchSetLocaleTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchSetLocaleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 
 /**
  * Tests that search works with numeric locale settings.
@@ -14,7 +14,7 @@ class SearchSetLocaleTest extends SearchTestBase {
    *
    * @var array
    */
-  public static $modules = array('comment');
+  public static $modules = ['comment'];
 
   /**
    * A node search plugin instance.
@@ -29,7 +29,7 @@ class SearchSetLocaleTest extends SearchTestBase {
     // Create a plugin instance.
     $this->nodeSearchPlugin = $this->container->get('plugin.manager.search')->createInstance('node_search');
     // Create a node with a very simple body.
-    $this->drupalCreateNode(array('body' => array(array('value' => 'tapir'))));
+    $this->drupalCreateNode(['body' => [['value' => 'tapir']]]);
     // Update the search index.
     $this->nodeSearchPlugin->updateIndex();
     search_update_totals();
@@ -41,7 +41,7 @@ class SearchSetLocaleTest extends SearchTestBase {
   public function testSearchWithNumericLocale() {
     // French decimal point is comma.
     setlocale(LC_NUMERIC, 'fr_FR');
-    $this->nodeSearchPlugin->setSearch('tapir', array(), array());
+    $this->nodeSearchPlugin->setSearch('tapir', [], []);
     // The call to execute will throw an exception if a float in the wrong
     // format is passed in the query to the database, so an assertion is not
     // necessary here.
diff --git a/web/core/modules/search/src/Tests/SearchSimplifyTest.php b/web/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
similarity index 82%
rename from web/core/modules/search/src/Tests/SearchSimplifyTest.php
rename to web/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
index bdb96c93d..bd3bbb43d 100644
--- a/web/core/modules/search/src/Tests/SearchSimplifyTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 use Drupal\Component\Utility\Unicode;
 
 /**
@@ -12,7 +12,7 @@ class SearchSimplifyTest extends SearchTestBase {
   /**
    * Tests that all Unicode characters simplify correctly.
    */
-  function testSearchSimplifyUnicode() {
+  public function testSearchSimplifyUnicode() {
     // This test uses a file that was constructed so that the even lines are
     // boundary characters, and the odd lines are valid word characters. (It
     // was generated as a sequence of all the Unicode characters, and then the
@@ -22,7 +22,7 @@ class SearchSimplifyTest extends SearchTestBase {
     // verify that simplification doesn't lose any characters.
     $input = file_get_contents(\Drupal::root() . '/core/modules/search/tests/UnicodeTest.txt');
     $basestrings = explode(chr(10), $input);
-    $strings = array();
+    $strings = [];
     foreach ($basestrings as $key => $string) {
       if ($key % 2) {
         // Even line - should simplify down to a space.
@@ -64,13 +64,13 @@ class SearchSimplifyTest extends SearchTestBase {
   /**
    * Tests that search_simplify() does the right thing with punctuation.
    */
-  function testSearchSimplifyPunctuation() {
-    $cases = array(
-      array('20.03/94-28,876', '20039428876', 'Punctuation removed from numbers'),
-      array('great...drupal--module', 'great drupal module', 'Multiple dot and dashes are word boundaries'),
-      array('very_great-drupal.module', 'verygreatdrupalmodule', 'Single dot, dash, underscore are removed'),
-      array('regular,punctuation;word', 'regular punctuation word', 'Punctuation is a word boundary'),
-    );
+  public function testSearchSimplifyPunctuation() {
+    $cases = [
+      ['20.03/94-28,876', '20039428876', 'Punctuation removed from numbers'],
+      ['great...drupal--module', 'great drupal module', 'Multiple dot and dashes are word boundaries'],
+      ['very_great-drupal.module', 'verygreatdrupalmodule', 'Single dot, dash, underscore are removed'],
+      ['regular,punctuation;word', 'regular punctuation word', 'Punctuation is a word boundary'],
+    ];
 
     foreach ($cases as $case) {
       $out = trim(search_simplify($case[0]));
diff --git a/web/core/modules/search/tests/src/Functional/SearchTestBase.php b/web/core/modules/search/tests/src/Functional/SearchTestBase.php
new file mode 100644
index 000000000..3739b570f
--- /dev/null
+++ b/web/core/modules/search/tests/src/Functional/SearchTestBase.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Drupal\Tests\search\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Component\Utility\SafeMarkup;
+
+/**
+ * Defines the common search test code.
+ */
+abstract class SearchTestBase extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'search', 'dblog'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create Basic page and Article node types.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+    }
+  }
+
+  /**
+   * Simulates submission of a form using GET instead of POST.
+   *
+   * Forms that use the GET method cannot be submitted with
+   * WebTestBase::drupalPostForm(), which explicitly uses POST to submit the
+   * form. So this method finds the form, verifies that it has input fields and
+   * a submit button matching the inputs to this method, and then calls
+   * WebTestBase::drupalGet() to simulate the form submission to the 'action'
+   * URL of the form (if set, or the current URL if not).
+   *
+   * See WebTestBase::drupalPostForm() for more detailed documentation of the
+   * function parameters.
+   *
+   * @param string $path
+   *   Location of the form to be submitted: either a Drupal path, absolute
+   *   path, or NULL to use the current page.
+   * @param array $edit
+   *   Form field data to submit. Unlike drupalPostForm(), this does not support
+   *   file uploads.
+   * @param string $submit
+   *   Value of the submit button to submit clicking. Unlike drupalPostForm(),
+   *   this does not support AJAX.
+   * @param string $form_html_id
+   *   (optional) HTML ID of the form, to disambiguate.
+   */
+  protected function submitGetForm($path, $edit, $submit, $form_html_id = NULL) {
+    if (isset($path)) {
+      $this->drupalGet($path);
+    }
+
+    if ($this->parse()) {
+      // Iterate over forms to find one that matches $edit and $submit.
+      $edit_save = $edit;
+      $xpath = '//form';
+      if (!empty($form_html_id)) {
+        $xpath .= "[@id='" . $form_html_id . "']";
+      }
+      $forms = $this->xpath($xpath);
+      foreach ($forms as $form) {
+        // Try to set the fields of this form as specified in $edit.
+        $edit = $edit_save;
+        $post = [];
+        $upload = [];
+        $submit_matches = $this->handleForm($post, $edit, $upload, $submit, $form);
+        if (!$edit && $submit_matches) {
+          // Everything matched, so "submit" the form.
+          $action = isset($form['action']) ? $this->getAbsoluteUrl((string) $form['action']) : NULL;
+          $this->drupalGet($action, ['query' => $post]);
+          return;
+        }
+      }
+
+      // We have not found a form which contained all fields of $edit and
+      // the submit button.
+      foreach ($edit as $name => $value) {
+        $this->fail(SafeMarkup::format('Failed to set field @name to @value', ['@name' => $name, '@value' => $value]));
+      }
+      $this->assertTrue($submit_matches, format_string('Found the @submit button', ['@submit' => $submit]));
+      $this->fail(format_string('Found the requested form fields at @path', ['@path' => $path]));
+    }
+  }
+
+}
diff --git a/web/core/modules/search/src/Tests/SearchTokenizerTest.php b/web/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
similarity index 94%
rename from web/core/modules/search/src/Tests/SearchTokenizerTest.php
rename to web/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
index f8b3ccbe1..7215312d0 100644
--- a/web/core/modules/search/src/Tests/SearchTokenizerTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\search\Tests;
+namespace Drupal\Tests\search\Functional;
 use Drupal\Component\Utility\Unicode;
 
 /**
@@ -18,7 +18,7 @@ class SearchTokenizerTest extends SearchTestBase {
    * character classes are tokenized properly. See PREG_CLASS_CKJ for more
    * information.
    */
-  function testTokenizer() {
+  public function testTokenizer() {
     // Set the minimum word size to 1 (to split all CJK characters) and make
     // sure CJK tokenizing is turned on.
     $this->config('search.settings')
@@ -31,7 +31,7 @@ class SearchTokenizerTest extends SearchTestBase {
     // the Unicode tables.
 
     // Beginnings of the character ranges.
-    $starts = array(
+    $starts = [
       'CJK unified' => 0x4e00,
       'CJK Ext A' => 0x3400,
       'CJK Compat' => 0xf900,
@@ -52,10 +52,10 @@ class SearchTokenizerTest extends SearchTestBase {
       'Bomofo Ext' => 0x31a0,
       'Lisu' => 0xa4d0,
       'Yi' => 0xa000,
-    );
+    ];
 
     // Ends of the character ranges.
-    $ends = array(
+    $ends = [
       'CJK unified' => 0x9fcf,
       'CJK Ext A' => 0x4dbf,
       'CJK Compat' => 0xfaff,
@@ -76,11 +76,11 @@ class SearchTokenizerTest extends SearchTestBase {
       'Bomofo Ext' => 0x31b7,
       'Lisu' => 0xa4fd,
       'Yi' => 0xa48f,
-    );
+    ];
 
     // Generate characters consisting of starts, midpoints, and ends.
-    $chars = array();
-    $charcodes = array();
+    $chars = [];
+    $charcodes = [];
     foreach ($starts as $key => $value) {
       $charcodes[] = $starts[$key];
       $chars[] = $this->code2utf($starts[$key]);
@@ -106,7 +106,7 @@ class SearchTokenizerTest extends SearchTestBase {
    * This is just a sanity check - it verifies that strings of letters are
    * not tokenized.
    */
-  function testNoTokenizer() {
+  public function testNoTokenizer() {
     // Set the minimum word size to 1 (to split all CJK characters) and make
     // sure CJK tokenizing is turned on.
     $this->config('search.settings')
@@ -128,7 +128,7 @@ class SearchTokenizerTest extends SearchTestBase {
    * converts a number to the corresponding unicode character. Adapted from
    * functions supplied in comments on several functions on php.net.
    */
-  function code2utf($num) {
+  public function code2utf($num) {
     if ($num < 128) {
       return chr($num);
     }
diff --git a/web/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php b/web/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php
index bcbc40e0d..a70114a6a 100644
--- a/web/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php
+++ b/web/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php
@@ -35,20 +35,20 @@ class MigrateSearchPageTest extends MigrateDrupal6TestBase {
     $search_page = SearchPage::load($id);
     $this->assertIdentical($id, $search_page->id());
     $configuration = $search_page->getPlugin()->getConfiguration();
-    $this->assertIdentical($configuration['rankings'], array(
+    $this->assertIdentical($configuration['rankings'], [
       'comments' => 5,
       'promote' => 0,
       'recent' => 0,
       'relevance' => 2,
       'sticky' => 8,
       'views' => 1,
-    ));
+    ]);
     $this->assertIdentical('node', $search_page->getPath());
 
     // Test that we can re-import using the EntitySearchPage destination.
     Database::getConnection('default', 'migrate')
       ->update('variable')
-      ->fields(array('value' => serialize(4)))
+      ->fields(['value' => serialize(4)])
       ->condition('name', 'node_rank_comments')
       ->execute();
 
diff --git a/web/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php b/web/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php
index e480fec5e..d28bbd824 100644
--- a/web/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php
+++ b/web/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\search\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
diff --git a/web/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php b/web/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php
index d7dae3e85..86d3b2200 100644
--- a/web/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php
+++ b/web/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php
@@ -18,7 +18,7 @@ class MigrateSearchPageTest extends MigrateDrupal7TestBase {
    *
    * {@inheritdoc}
    */
-  public static $modules = array('node', 'search');
+  public static $modules = ['node', 'search'];
 
   /**
    * {@inheritdoc}
@@ -37,20 +37,20 @@ class MigrateSearchPageTest extends MigrateDrupal7TestBase {
     $search_page = SearchPage::load($id);
     $this->assertIdentical($id, $search_page->id());
     $configuration = $search_page->getPlugin()->getConfiguration();
-    $expected_rankings = array(
+    $expected_rankings = [
       'comments' => 0,
       'promote' => 0,
       'relevance' => 2,
       'sticky' => 0,
       'views' => 0,
-    );
+    ];
     $this->assertIdentical($expected_rankings, $configuration['rankings']);
     $this->assertIdentical('node', $search_page->getPath());
 
     // Test that we can re-import using the EntitySearchPage destination.
     Database::getConnection('default', 'migrate')
       ->update('variable')
-      ->fields(array('value' => serialize(4)))
+      ->fields(['value' => serialize(4)])
       ->condition('name', 'node_rank_comments')
       ->execute();
 
diff --git a/web/core/modules/search/tests/src/Kernel/SearchExcerptTest.php b/web/core/modules/search/tests/src/Kernel/SearchExcerptTest.php
index 85c09174a..e10075d09 100644
--- a/web/core/modules/search/tests/src/Kernel/SearchExcerptTest.php
+++ b/web/core/modules/search/tests/src/Kernel/SearchExcerptTest.php
@@ -16,7 +16,7 @@ class SearchExcerptTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('search', 'search_langcode_test');
+  public static $modules = ['search', 'search_langcode_test'];
 
   /**
    * Tests search_excerpt() with several simulated search keywords.
@@ -27,7 +27,7 @@ class SearchExcerptTest extends KernelTestBase {
    * contains either highlighted keywords or the original marked
    * up string if no keywords matched the string.
    */
-  function testSearchExcerpt() {
+  public function testSearchExcerpt() {
     // Make some text with entities and tags.
     $text = 'The <strong>quick</strong> <a href="#">brown</a> fox &amp; jumps <h2>over</h2> the lazy dog';
     $expected = 'The quick brown fox &amp; jumps over the lazy dog';
@@ -74,7 +74,7 @@ class SearchExcerptTest extends KernelTestBase {
    * search_simplify(). This test passes keywords that match simplified words
    * and compares them with strings that contain the original unsimplified word.
    */
-  function testSearchExcerptSimplified() {
+  public function testSearchExcerptSimplified() {
     $start_time = microtime(TRUE);
 
     $lorem1 = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam vitae arcu at leo cursus laoreet. Curabitur dui tortor, adipiscing malesuada tempor in, bibendum ac diam. Cras non tellus a libero pellentesque condimentum. What is a Drupalism? Suspendisse ac lacus libero. Ut non est vel nisl faucibus interdum nec sed leo. Pellentesque sem risus, vulputate eu semper eget, auctor in libero.';
diff --git a/web/core/modules/search/tests/src/Kernel/SearchMatchTest.php b/web/core/modules/search/tests/src/Kernel/SearchMatchTest.php
index 0a17f7173..7037646bc 100644
--- a/web/core/modules/search/tests/src/Kernel/SearchMatchTest.php
+++ b/web/core/modules/search/tests/src/Kernel/SearchMatchTest.php
@@ -37,7 +37,7 @@ class SearchMatchTest extends KernelTestBase {
   /**
    * Test search indexing.
    */
-  function testMatching() {
+  public function testMatching() {
     $this->_setup();
     $this->_testQueries();
   }
@@ -45,7 +45,7 @@ class SearchMatchTest extends KernelTestBase {
   /**
    * Set up a small index of items to test against.
    */
-  function _setup() {
+  public function _setup() {
     $this->config('search.settings')->set('index.minimum_word_size', 3)->save();
 
     for ($i = 1; $i <= 7; ++$i) {
@@ -55,11 +55,11 @@ class SearchMatchTest extends KernelTestBase {
       search_index(static::SEARCH_TYPE_2, $i + 7, LanguageInterface::LANGCODE_NOT_SPECIFIED, $this->getText2($i));
     }
     // No getText builder function for Japanese text; just a simple array.
-    foreach (array(
+    foreach ([
       13 => '以呂波耳・ほへとち。リヌルヲ。',
       14 => 'ドルーパルが大好きよ！',
       15 => 'コーヒーとケーキ',
-    ) as $i => $jpn) {
+    ] as $i => $jpn) {
       search_index(static::SEARCH_TYPE_JPN, $i, LanguageInterface::LANGCODE_NOT_SPECIFIED, $jpn);
     }
     search_update_totals();
@@ -77,7 +77,7 @@ class SearchMatchTest extends KernelTestBase {
    *   6  enim am minim veniam es cillum
    *   7  am minim veniam es cillum dolore eu
    */
-  function getText($n) {
+  public function getText($n) {
     $words = explode(' ', "Ipsum dolore sit am. Ut enim am minim veniam. Es cillum dolore eu.");
     return implode(' ', array_slice($words, $n - 1, $n));
   }
@@ -92,7 +92,7 @@ class SearchMatchTest extends KernelTestBase {
    *   11 came over from germany
    *   12 over from germany swimming
    */
-  function getText2($n) {
+  public function getText2($n) {
     $words = explode(' ', "Dear King Philip came over from Germany swimming.");
     return implode(' ', array_slice($words, $n - 1, $n));
   }
@@ -100,7 +100,7 @@ class SearchMatchTest extends KernelTestBase {
   /**
    * Run predefine queries looking for indexed terms.
    */
-  function _testQueries() {
+  public function _testQueries() {
     // Note: OR queries that include short words in OR groups are only accepted
     // if the ORed terms are ANDed with at least one long word in the rest of
     // the query. Examples:
@@ -108,106 +108,106 @@ class SearchMatchTest extends KernelTestBase {
     // is good, and
     //   dolore OR ut = (dolore) OR (ut)
     // is bad. This is a design limitation to avoid full table scans.
-    $queries = array(
+    $queries = [
       // Simple AND queries.
-      'ipsum' => array(1),
-      'enim' => array(4, 5, 6),
-      'xxxxx' => array(),
-      'enim minim' => array(5, 6),
-      'enim xxxxx' => array(),
-      'dolore eu' => array(7),
-      'dolore xx' => array(),
-      'ut minim' => array(5),
-      'xx minim' => array(),
-      'enim veniam am minim ut' => array(5),
+      'ipsum' => [1],
+      'enim' => [4, 5, 6],
+      'xxxxx' => [],
+      'enim minim' => [5, 6],
+      'enim xxxxx' => [],
+      'dolore eu' => [7],
+      'dolore xx' => [],
+      'ut minim' => [5],
+      'xx minim' => [],
+      'enim veniam am minim ut' => [5],
       // Simple OR and AND/OR queries.
-      'dolore OR ipsum' => array(1, 2, 7),
-      'dolore OR xxxxx' => array(2, 7),
-      'dolore OR ipsum OR enim' => array(1, 2, 4, 5, 6, 7),
-      'ipsum OR dolore sit OR cillum' => array(2, 7),
-      'minim dolore OR ipsum' => array(7),
-      'dolore OR ipsum veniam' => array(7),
-      'minim dolore OR ipsum OR enim' => array(5, 6, 7),
-      'dolore xx OR yy' => array(),
-      'xxxxx dolore OR ipsum' => array(),
+      'dolore OR ipsum' => [1, 2, 7],
+      'dolore OR xxxxx' => [2, 7],
+      'dolore OR ipsum OR enim' => [1, 2, 4, 5, 6, 7],
+      'ipsum OR dolore sit OR cillum' => [2, 7],
+      'minim dolore OR ipsum' => [7],
+      'dolore OR ipsum veniam' => [7],
+      'minim dolore OR ipsum OR enim' => [5, 6, 7],
+      'dolore xx OR yy' => [],
+      'xxxxx dolore OR ipsum' => [],
       // Sequence of OR queries.
-      'minim' => array(5, 6, 7),
-      'minim OR xxxx' => array(5, 6, 7),
-      'minim OR xxxx OR minim' => array(5, 6, 7),
-      'minim OR xxxx minim' => array(5, 6, 7),
-      'minim OR xxxx minim OR yyyy' => array(5, 6, 7),
-      'minim OR xxxx minim OR cillum' => array(6, 7, 5),
-      'minim OR xxxx minim OR xxxx' => array(5, 6, 7),
+      'minim' => [5, 6, 7],
+      'minim OR xxxx' => [5, 6, 7],
+      'minim OR xxxx OR minim' => [5, 6, 7],
+      'minim OR xxxx minim' => [5, 6, 7],
+      'minim OR xxxx minim OR yyyy' => [5, 6, 7],
+      'minim OR xxxx minim OR cillum' => [6, 7, 5],
+      'minim OR xxxx minim OR xxxx' => [5, 6, 7],
       // Negative queries.
-      'dolore -sit' => array(7),
-      'dolore -eu' => array(2),
-      'dolore -xxxxx' => array(2, 7),
-      'dolore -xx' => array(2, 7),
+      'dolore -sit' => [7],
+      'dolore -eu' => [2],
+      'dolore -xxxxx' => [2, 7],
+      'dolore -xx' => [2, 7],
       // Phrase queries.
-      '"dolore sit"' => array(2),
-      '"sit dolore"' => array(),
-      '"am minim veniam es"' => array(6, 7),
-      '"minim am veniam es"' => array(),
+      '"dolore sit"' => [2],
+      '"sit dolore"' => [],
+      '"am minim veniam es"' => [6, 7],
+      '"minim am veniam es"' => [],
       // Mixed queries.
-      '"am minim veniam es" OR dolore' => array(2, 6, 7),
-      '"minim am veniam es" OR "dolore sit"' => array(2),
-      '"minim am veniam es" OR "sit dolore"' => array(),
-      '"am minim veniam es" -eu' => array(6),
-      '"am minim veniam" -"cillum dolore"' => array(5, 6),
-      '"am minim veniam" -"dolore cillum"' => array(5, 6, 7),
-      'xxxxx "minim am veniam es" OR dolore' => array(),
-      'xx "minim am veniam es" OR dolore' => array()
-    );
+      '"am minim veniam es" OR dolore' => [2, 6, 7],
+      '"minim am veniam es" OR "dolore sit"' => [2],
+      '"minim am veniam es" OR "sit dolore"' => [],
+      '"am minim veniam es" -eu' => [6],
+      '"am minim veniam" -"cillum dolore"' => [5, 6],
+      '"am minim veniam" -"dolore cillum"' => [5, 6, 7],
+      'xxxxx "minim am veniam es" OR dolore' => [],
+      'xx "minim am veniam es" OR dolore' => []
+    ];
     foreach ($queries as $query => $results) {
       $result = db_select('search_index', 'i')
         ->extend('Drupal\search\SearchQuery')
         ->searchExpression($query, static::SEARCH_TYPE)
         ->execute();
 
-      $set = $result ? $result->fetchAll() : array();
+      $set = $result ? $result->fetchAll() : [];
       $this->_testQueryMatching($query, $set, $results);
       $this->_testQueryScores($query, $set, $results);
     }
 
     // These queries are run against the second index type, SEARCH_TYPE_2.
-    $queries = array(
+    $queries = [
       // Simple AND queries.
-      'ipsum' => array(),
-      'enim' => array(),
-      'enim minim' => array(),
-      'dear' => array(8),
-      'germany' => array(11, 12),
-    );
+      'ipsum' => [],
+      'enim' => [],
+      'enim minim' => [],
+      'dear' => [8],
+      'germany' => [11, 12],
+    ];
     foreach ($queries as $query => $results) {
       $result = db_select('search_index', 'i')
         ->extend('Drupal\search\SearchQuery')
         ->searchExpression($query, static::SEARCH_TYPE_2)
         ->execute();
 
-      $set = $result ? $result->fetchAll() : array();
+      $set = $result ? $result->fetchAll() : [];
       $this->_testQueryMatching($query, $set, $results);
       $this->_testQueryScores($query, $set, $results);
     }
 
     // These queries are run against the third index type, SEARCH_TYPE_JPN.
-    $queries = array(
+    $queries = [
       // Simple AND queries.
-      '呂波耳' => array(13),
-      '以呂波耳' => array(13),
-      'ほへと　ヌルヲ' => array(13),
-      'とちリ' => array(),
-      'ドルーパル' => array(14),
-      'パルが大' => array(14),
-      'コーヒー' => array(15),
-      'ヒーキ' => array(),
-    );
+      '呂波耳' => [13],
+      '以呂波耳' => [13],
+      'ほへと　ヌルヲ' => [13],
+      'とちリ' => [],
+      'ドルーパル' => [14],
+      'パルが大' => [14],
+      'コーヒー' => [15],
+      'ヒーキ' => [],
+    ];
     foreach ($queries as $query => $results) {
       $result = db_select('search_index', 'i')
         ->extend('Drupal\search\SearchQuery')
         ->searchExpression($query, static::SEARCH_TYPE_JPN)
         ->execute();
 
-      $set = $result ? $result->fetchAll() : array();
+      $set = $result ? $result->fetchAll() : [];
       $this->_testQueryMatching($query, $set, $results);
       $this->_testQueryScores($query, $set, $results);
     }
@@ -218,9 +218,9 @@ class SearchMatchTest extends KernelTestBase {
    *
    * Verify if a query produces the correct results.
    */
-  function _testQueryMatching($query, $set, $results) {
+  public function _testQueryMatching($query, $set, $results) {
     // Get result IDs.
-    $found = array();
+    $found = [];
     foreach ($set as $item) {
       $found[] = $item->sid;
     }
@@ -236,9 +236,9 @@ class SearchMatchTest extends KernelTestBase {
    *
    * Verify if a query produces normalized, monotonous scores.
    */
-  function _testQueryScores($query, $set, $results) {
+  public function _testQueryScores($query, $set, $results) {
     // Get result scores.
-    $scores = array();
+    $scores = [];
     foreach ($set as $item) {
       $scores[] = $item->calculated_score;
     }
diff --git a/web/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php b/web/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php
index d634207ba..69dffd87c 100644
--- a/web/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php
+++ b/web/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php
@@ -75,14 +75,14 @@ class SearchPageRepositoryTest extends UnitTestCase {
       ->will($this->returnValue($this->query));
     $this->query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(array('test' => 'test', 'other_test' => 'other_test')));
+      ->will($this->returnValue(['test' => 'test', 'other_test' => 'other_test']));
 
-    $entities = array();
+    $entities = [];
     $entities['test'] = $this->getMock('Drupal\search\SearchPageInterface');
     $entities['other_test'] = $this->getMock('Drupal\search\SearchPageInterface');
     $this->storage->expects($this->once())
       ->method('loadMultiple')
-      ->with(array('test' => 'test', 'other_test' => 'other_test'))
+      ->with(['test' => 'test', 'other_test' => 'other_test'])
       ->will($this->returnValue($entities));
 
     $result = $this->searchPageRepository->getActiveSearchPages();
@@ -103,7 +103,7 @@ class SearchPageRepositoryTest extends UnitTestCase {
       ->will($this->returnValue($this->query));
     $this->query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(array('test' => 'test')));
+      ->will($this->returnValue(['test' => 'test']));
 
     $this->assertSame(TRUE, $this->searchPageRepository->isSearchActive());
   }
@@ -118,9 +118,9 @@ class SearchPageRepositoryTest extends UnitTestCase {
       ->will($this->returnValue($this->query));
     $this->query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(array('test' => 'test', 'other_test' => 'other_test')));
+      ->will($this->returnValue(['test' => 'test', 'other_test' => 'other_test']));
 
-    $entities = array();
+    $entities = [];
     $entities['test'] = $this->getMock('Drupal\search\SearchPageInterface');
     $entities['test']->expects($this->once())
       ->method('isIndexable')
@@ -131,7 +131,7 @@ class SearchPageRepositoryTest extends UnitTestCase {
       ->will($this->returnValue(FALSE));
     $this->storage->expects($this->once())
       ->method('loadMultiple')
-      ->with(array('test' => 'test', 'other_test' => 'other_test'))
+      ->with(['test' => 'test', 'other_test' => 'other_test'])
       ->will($this->returnValue($entities));
 
     $result = $this->searchPageRepository->getIndexableSearchPages();
@@ -167,7 +167,7 @@ class SearchPageRepositoryTest extends UnitTestCase {
       ->will($this->returnValue($this->query));
     $this->query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(array('test' => 'test', 'other_test' => 'other_test')));
+      ->will($this->returnValue(['test' => 'test', 'other_test' => 'other_test']));
 
     $config = $this->getMockBuilder('Drupal\Core\Config\Config')
       ->disableOriginalConstructor()
@@ -194,7 +194,7 @@ class SearchPageRepositoryTest extends UnitTestCase {
       ->will($this->returnValue($this->query));
     $this->query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(array('test' => 'test')));
+      ->will($this->returnValue(['test' => 'test']));
 
     $config = $this->getMockBuilder('Drupal\Core\Config\Config')
       ->disableOriginalConstructor()
@@ -259,10 +259,10 @@ class SearchPageRepositoryTest extends UnitTestCase {
     // Declare entities out of their expected order so we can be sure they were
     // sorted. We cannot mock these because of uasort(), see
     // https://bugs.php.net/bug.php?id=50688.
-    $unsorted_entities['test4'] = new TestSearchPage(array('weight' => 0, 'status' => FALSE, 'label' => 'Test4'));
-    $unsorted_entities['test3'] = new TestSearchPage(array('weight' => 10, 'status' => TRUE, 'label' => 'Test3'));
-    $unsorted_entities['test2'] = new TestSearchPage(array('weight' => 0, 'status' => TRUE, 'label' => 'Test2'));
-    $unsorted_entities['test1'] = new TestSearchPage(array('weight' => 0, 'status' => TRUE, 'label' => 'Test1'));
+    $unsorted_entities['test4'] = new TestSearchPage(['weight' => 0, 'status' => FALSE, 'label' => 'Test4']);
+    $unsorted_entities['test3'] = new TestSearchPage(['weight' => 10, 'status' => TRUE, 'label' => 'Test3']);
+    $unsorted_entities['test2'] = new TestSearchPage(['weight' => 0, 'status' => TRUE, 'label' => 'Test2']);
+    $unsorted_entities['test1'] = new TestSearchPage(['weight' => 0, 'status' => TRUE, 'label' => 'Test1']);
     $expected = $unsorted_entities;
     ksort($expected);
 
diff --git a/web/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php b/web/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php
index 19221f26f..25ab8735a 100644
--- a/web/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php
+++ b/web/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php
@@ -37,7 +37,7 @@ class SearchPluginCollectionTest extends UnitTestCase {
    */
   protected function setUp() {
     $this->pluginManager = $this->getMock('Drupal\Component\Plugin\PluginManagerInterface');
-    $this->searchPluginCollection = new SearchPluginCollection($this->pluginManager, 'banana', array('id' => 'banana', 'color' => 'yellow'), 'fruit_stand');
+    $this->searchPluginCollection = new SearchPluginCollection($this->pluginManager, 'banana', ['id' => 'banana', 'color' => 'yellow'], 'fruit_stand');
   }
 
   /**
diff --git a/web/core/modules/serialization/config/install/serialization.settings.yml b/web/core/modules/serialization/config/install/serialization.settings.yml
new file mode 100644
index 000000000..39c583aaa
--- /dev/null
+++ b/web/core/modules/serialization/config/install/serialization.settings.yml
@@ -0,0 +1,4 @@
+# Before Drupal 8.3, typed data primitive values were normalized as strings, as
+# this was usually returned from database storage. A primitive data normalizer
+# has been introduced to get the casted value instead.
+bc_primitives_as_strings: false
diff --git a/web/core/modules/serialization/config/schema/serialization.schema.yml b/web/core/modules/serialization/config/schema/serialization.schema.yml
new file mode 100644
index 000000000..0fdd2da14
--- /dev/null
+++ b/web/core/modules/serialization/config/schema/serialization.schema.yml
@@ -0,0 +1,7 @@
+serialization.settings:
+  type: config_object
+  label: 'Serialization settings'
+  mapping:
+    bc_primitives_as_strings:
+      type: boolean
+      label: 'Whether to retain pre Drupal 8.3 behavior of serializing all primitive items as strings.'
diff --git a/web/core/modules/serialization/serialization.install b/web/core/modules/serialization/serialization.install
new file mode 100644
index 000000000..6620b446e
--- /dev/null
+++ b/web/core/modules/serialization/serialization.install
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @file
+ * Update functions for the Serialization module.
+ */
+
+/**
+ * Implements hook_requirements().
+ */
+function serialization_requirements($phase) {
+  $requirements = [];
+
+  if ($phase == 'runtime') {
+    $requirements['serialization_as_strings'] = [
+      'title' => t('Serialized data types'),
+      'severity' => REQUIREMENT_INFO,
+    ];
+
+    if (\Drupal::config('serialization.settings')->get('bc_primitives_as_strings')) {
+      $requirements['serialization_as_strings']['value'] = t('Enabled');
+      $requirements['serialization_as_strings']['description'] = t('The Serialization API is configured to output only string values for REST and other applications (instead of integers or Booleans when appropriate). <a href="https://www.drupal.org/node/2837696">Disabling this backwards compatibility mode</a> is recommended unless your sites or applications require string output.');
+    }
+    else {
+      $requirements['serialization_as_strings']['value'] = t('Not enabled');
+      $requirements['serialization_as_strings']['description'] = t('The Serialization API is configured with the recommended default and outputs typed values (integers, Booleans, or strings as appropriate) for REST and other applications. If your site or applications require string output, you can <a href="https://www.drupal.org/node/2837696">enable backwards compatibility mode</a>.');
+    }
+  }
+
+  return $requirements;
+}
+
+/**
+ * @see hal_update_8301()
+ */
+function serialization_update_8301() {}
+
+/**
+ * Add serialization.settings::bc_primitives_as_strings configuration.
+ */
+function serialization_update_8302() {
+  $config_factory = \Drupal::configFactory();
+  $config_factory->getEditable('serialization.settings')
+    ->set('bc_primitives_as_strings', FALSE)
+    ->save(TRUE);
+
+  return t('The REST API will no longer output all values as strings. Integers/booleans will be used where appropriate. If your site depends on these value being strings, <a href="https://www.drupal.org/node/2837696">read the change record to learn how to enable the BC mode.</a>');
+}
diff --git a/web/core/modules/serialization/serialization.module b/web/core/modules/serialization/serialization.module
index 39c5fbfa0..4b2db100b 100644
--- a/web/core/modules/serialization/serialization.module
+++ b/web/core/modules/serialization/serialization.module
@@ -18,8 +18,8 @@ function serialization_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<p>' . t('The Serialization module provides a service for serializing and deserializing data to and from formats such as JSON and XML.') . '</p>';
       $output .= '<p>' . t('Serialization is the process of converting data structures like arrays and objects into a string. This allows the data to be represented in a way that is easy to exchange and store (for example, for transmission over the Internet or for storage in a local file system). These representations can then be deserialized to get back to the original data structures.') . '</p>';
       $output .= '<p>' . t('The serializer splits this process into two parts. Normalization converts an object to a normalized array structure. Encoding takes that array and converts it to a string.') . '</p>';
-      $output .= '<p>' . t('This module does not have a user interface. It is used by other modules which need to serialize data, such as <a href=":rest">REST</a>.', array(':rest' => (\Drupal::moduleHandler()->moduleExists('rest')) ? \Drupal::url('help.page', array('name' => 'rest')) : '#')) . '</p>';
-      $output .= '<p>' . t('For more information, see the <a href=":doc_url">online documentation for the Serialization module</a>.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/serialization')) . '</p>';
+      $output .= '<p>' . t('This module does not have a user interface. It is used by other modules which need to serialize data, such as <a href=":rest">REST</a>.', [':rest' => (\Drupal::moduleHandler()->moduleExists('rest')) ? \Drupal::url('help.page', ['name' => 'rest']) : '#']) . '</p>';
+      $output .= '<p>' . t('For more information, see the <a href=":doc_url">online documentation for the Serialization module</a>.', [':doc_url' => 'https://www.drupal.org/documentation/modules/serialization']) . '</p>';
       return $output;
   }
 }
diff --git a/web/core/modules/serialization/serialization.services.yml b/web/core/modules/serialization/serialization.services.yml
index 8b570c076..3e47b005c 100644
--- a/web/core/modules/serialization/serialization.services.yml
+++ b/web/core/modules/serialization/serialization.services.yml
@@ -17,6 +17,10 @@ services:
     tags:
       - { name: normalizer }
     arguments: ['@entity.manager']
+  serializer.normalizer.primitive_data:
+    class: Drupal\serialization\Normalizer\PrimitiveDataNormalizer
+    tags:
+      - { name: normalizer, priority: 5, bc: bc_primitives_as_strings, bc_config_name: 'serialization.settings' }
   serializer.normalizer.complex_data:
     class: Drupal\serialization\Normalizer\ComplexDataNormalizer
     tags:
@@ -25,13 +29,28 @@ services:
     class: Drupal\serialization\Normalizer\EntityReferenceFieldItemNormalizer
     tags:
       # Set the priority lower than the hal entity reference field item
-      # normalizer, so that we do not replace that for hal_json.
+      # normalizer, so that we do not replace that for hal_json but higher than
+      # this modules generic field item normalizer.
       # @todo Find a better way for this in https://www.drupal.org/node/2575761.
-      - { name: normalizer, priority: 5 }
+      - { name: normalizer, priority: 8 }
+  serialization.normalizer.field_item:
+    class: Drupal\serialization\Normalizer\FieldItemNormalizer
+    tags:
+      # Priority must be lower than serializer.normalizer.field_item.hal and any
+      # field type specific normalizer such as
+      # serializer.normalizer.entity_reference_field_item.
+      - { name: normalizer, priority: 6 }
+  serialization.normalizer.field:
+    class: Drupal\serialization\Normalizer\FieldNormalizer
+    tags:
+      # Priority must be lower than serializer.normalizer.field.hal.
+      - { name: normalizer, priority: 6 }
   serializer.normalizer.list:
     class: Drupal\serialization\Normalizer\ListNormalizer
     tags:
-      - { name: normalizer }
+      # Priority must be higher than serialization.normalizer.field but less
+      # than hal field normalizer.
+      - { name: normalizer, priority: 9 }
   serializer.normalizer.password_field_item:
       class: Drupal\serialization\Normalizer\NullNormalizer
       arguments: ['Drupal\Core\Field\Plugin\Field\FieldType\PasswordItem']
@@ -73,4 +92,9 @@ services:
     class: Drupal\serialization\EventSubscriber\UserRouteAlterSubscriber
     tags:
       - { name: event_subscriber }
-    arguments: ['@serializer', '%serializer.formats%']
+    arguments: ['%serializer.formats%']
+  serialization.bc_config_subscriber:
+    class: Drupal\serialization\EventSubscriber\BcConfigSubscriber
+    tags:
+      - { name: event_subscriber }
+    arguments: ['@kernel']
diff --git a/web/core/modules/serialization/src/Encoder/JsonEncoder.php b/web/core/modules/serialization/src/Encoder/JsonEncoder.php
index 63e1ddbdf..ad085ac00 100644
--- a/web/core/modules/serialization/src/Encoder/JsonEncoder.php
+++ b/web/core/modules/serialization/src/Encoder/JsonEncoder.php
@@ -4,6 +4,8 @@ namespace Drupal\serialization\Encoder;
 
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
+use Symfony\Component\Serializer\Encoder\JsonDecode;
+use Symfony\Component\Serializer\Encoder\JsonEncode;
 use Symfony\Component\Serializer\Encoder\JsonEncoder as BaseJsonEncoder;
 
 /**
@@ -16,7 +18,19 @@ class JsonEncoder extends BaseJsonEncoder implements EncoderInterface, DecoderIn
    *
    * @var array
    */
-  protected static $format = array('json', 'ajax');
+  protected static $format = ['json', 'ajax'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(JsonEncode $encodingImpl = NULL, JsonDecode $decodingImpl = NULL) {
+    // Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be
+    // embedded into HTML.
+    // @see \Symfony\Component\HttpFoundation\JsonResponse
+    $json_encoding_options = JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT;
+    $this->encodingImpl = $encodingImpl ?: new JsonEncode($json_encoding_options);
+    $this->decodingImpl = $decodingImpl ?: new JsonDecode(TRUE);
+  }
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/serialization/src/Encoder/XmlEncoder.php b/web/core/modules/serialization/src/Encoder/XmlEncoder.php
index abd78968a..558271356 100644
--- a/web/core/modules/serialization/src/Encoder/XmlEncoder.php
+++ b/web/core/modules/serialization/src/Encoder/XmlEncoder.php
@@ -19,7 +19,7 @@ class XmlEncoder implements EncoderInterface, DecoderInterface {
    *
    * @var array
    */
-  static protected $format = array('xml');
+  static protected $format = ['xml'];
 
   /**
    * An instance of the Symfony XmlEncoder to perform the actual encoding.
@@ -54,7 +54,7 @@ class XmlEncoder implements EncoderInterface, DecoderInterface {
   /**
    * {@inheritdoc}
    */
-  public function encode($data, $format, array $context = array()){
+  public function encode($data, $format, array $context = []){
     return $this->getBaseEncoder()->encode($data, $format, $context);
   }
 
@@ -68,7 +68,7 @@ class XmlEncoder implements EncoderInterface, DecoderInterface {
   /**
    * {@inheritdoc}
    */
-  public function decode($data, $format, array $context = array()){
+  public function decode($data, $format, array $context = []){
     return $this->getBaseEncoder()->decode($data, $format, $context);
   }
 
diff --git a/web/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php b/web/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php
index 6ab879450..7f24901f7 100644
--- a/web/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php
+++ b/web/core/modules/serialization/src/EntityResolver/ChainEntityResolver.php
@@ -14,7 +14,7 @@ class ChainEntityResolver implements ChainEntityResolverInterface {
    *
    * @var \Drupal\serialization\EntityResolver\EntityResolverInterface[]
    */
-  protected $resolvers = array();
+  protected $resolvers = [];
 
   /**
    * Constructs a ChainEntityResolver object.
@@ -22,7 +22,7 @@ class ChainEntityResolver implements ChainEntityResolverInterface {
    * @param \Drupal\serialization\EntityResolver\EntityResolverInterface[] $resolvers
    *   The array of concrete resolvers.
    */
-  public function __construct(array $resolvers = array()) {
+  public function __construct(array $resolvers = []) {
     $this->resolvers = $resolvers;
   }
 
diff --git a/web/core/modules/serialization/src/EventSubscriber/BcConfigSubscriber.php b/web/core/modules/serialization/src/EventSubscriber/BcConfigSubscriber.php
new file mode 100644
index 000000000..79d3a905b
--- /dev/null
+++ b/web/core/modules/serialization/src/EventSubscriber/BcConfigSubscriber.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Drupal\serialization\EventSubscriber;
+
+use Drupal\Core\Config\ConfigCrudEvent;
+use Drupal\Core\Config\ConfigEvents;
+use Drupal\Core\DrupalKernelInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Config event subscriber to rebuild the container when BC config is saved.
+ */
+class BcConfigSubscriber implements EventSubscriberInterface {
+
+  /**
+   * The Drupal Kernel.
+   *
+   * @var \Drupal\Core\DrupalKernelInterface
+   */
+  protected $kernel;
+
+  /**
+   * BcConfigSubscriber constructor.
+   *
+   * @param \Drupal\Core\DrupalKernelInterface $kernel
+   *   The Drupal Kernel.
+   */
+  public function __construct(DrupalKernelInterface $kernel) {
+    $this->kernel = $kernel;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    $events[ConfigEvents::SAVE][] = 'onConfigSave';
+    return $events;
+  }
+
+  /**
+   * Invalidates the service container if serialization BC config gets updated.
+   *
+   * @param \Drupal\Core\Config\ConfigCrudEvent $event
+   */
+  public function onConfigSave(ConfigCrudEvent $event) {
+    $saved_config = $event->getConfig();
+
+    if ($saved_config->getName() === 'serialization.settings') {
+      if ($event->isChanged('bc_primitives_as_strings')) {
+        $this->kernel->invalidateContainer();
+      }
+    }
+  }
+
+}
diff --git a/web/core/modules/serialization/src/EventSubscriber/DefaultExceptionSubscriber.php b/web/core/modules/serialization/src/EventSubscriber/DefaultExceptionSubscriber.php
index ba9183637..a1e7bad2f 100644
--- a/web/core/modules/serialization/src/EventSubscriber/DefaultExceptionSubscriber.php
+++ b/web/core/modules/serialization/src/EventSubscriber/DefaultExceptionSubscriber.php
@@ -56,88 +56,25 @@ class DefaultExceptionSubscriber extends HttpExceptionSubscriberBase {
   }
 
   /**
-   * Handles a 400 error for HTTP.
+   * Handles all 4xx errors for all serialization failures.
    *
    * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
    *   The event to process.
    */
-  public function on400(GetResponseForExceptionEvent $event) {
-    $this->setEventResponse($event, Response::HTTP_BAD_REQUEST);
-  }
+  public function on4xx(GetResponseForExceptionEvent $event) {
+    /** @var \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface $exception */
+    $exception = $event->getException();
+    $request = $event->getRequest();
 
-  /**
-   * Handles a 403 error for HTTP.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on403(GetResponseForExceptionEvent $event) {
-    $this->setEventResponse($event, Response::HTTP_FORBIDDEN);
-  }
-
-  /**
-   * Handles a 404 error for HTTP.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on404(GetResponseForExceptionEvent $event) {
-    $this->setEventResponse($event, Response::HTTP_NOT_FOUND);
-  }
-
-  /**
-   * Handles a 405 error for HTTP.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on405(GetResponseForExceptionEvent $event) {
-    $this->setEventResponse($event, Response::HTTP_METHOD_NOT_ALLOWED);
-  }
-
-  /**
-   * Handles a 406 error for HTTP.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on406(GetResponseForExceptionEvent $event) {
-    $this->setEventResponse($event, Response::HTTP_NOT_ACCEPTABLE);
-  }
-
-  /**
-   * Handles a 422 error for HTTP.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on422(GetResponseForExceptionEvent $event) {
-    $this->setEventResponse($event, Response::HTTP_UNPROCESSABLE_ENTITY);
-  }
-
-  /**
-   * Handles a 429 error for HTTP.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process.
-   */
-  public function on429(GetResponseForExceptionEvent $event) {
-    $this->setEventResponse($event, Response::HTTP_TOO_MANY_REQUESTS);
-  }
-
-  /**
-   * Sets the Response for the exception event.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The current exception event.
-   * @param int $status
-   *   The HTTP status code to set for the response.
-   */
-  protected function setEventResponse(GetResponseForExceptionEvent $event, $status) {
-    $format = $event->getRequest()->getRequestFormat();
+    $format = $request->getRequestFormat();
     $content = ['message' => $event->getException()->getMessage()];
     $encoded_content = $this->serializer->serialize($content, $format);
-    $response = new Response($encoded_content, $status);
+    $headers = $exception->getHeaders();
+
+    // Add the MIME type from the request to send back in the header.
+    $headers['Content-Type'] = $request->getMimeType($format);
+
+    $response = new Response($encoded_content, $exception->getStatusCode(), $headers);
     $event->setResponse($response);
   }
 
diff --git a/web/core/modules/serialization/src/EventSubscriber/UserRouteAlterSubscriber.php b/web/core/modules/serialization/src/EventSubscriber/UserRouteAlterSubscriber.php
index 013402c5c..2d5d78fbf 100644
--- a/web/core/modules/serialization/src/EventSubscriber/UserRouteAlterSubscriber.php
+++ b/web/core/modules/serialization/src/EventSubscriber/UserRouteAlterSubscriber.php
@@ -5,20 +5,12 @@ namespace Drupal\serialization\EventSubscriber;
 use Drupal\Core\Routing\RouteBuildEvent;
 use Drupal\Core\Routing\RoutingEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\Serializer\SerializerInterface;
 
 /**
  * Alters user authentication routes to support additional serialization formats.
  */
 class UserRouteAlterSubscriber implements EventSubscriberInterface {
 
-  /**
-   * The serializer.
-   *
-   * @var \Symfony\Component\Serializer\Serializer
-   */
-  protected $serializer;
-
   /**
    * The available serialization formats.
    *
@@ -29,13 +21,10 @@ class UserRouteAlterSubscriber implements EventSubscriberInterface {
   /**
    * UserRouteAlterSubscriber constructor.
    *
-   * @param \Symfony\Component\Serializer\SerializerInterface $serializer
-   *   The serializer service.
    * @param array $serializer_formats
    *   The available serializer formats.
    */
-  public function __construct(SerializerInterface $serializer, array $serializer_formats) {
-    $this->serializer = $serializer;
+  public function __construct(array $serializer_formats) {
     $this->serializerFormats = $serializer_formats;
   }
 
diff --git a/web/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php b/web/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php
index 5062738e9..3d2031218 100644
--- a/web/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php
+++ b/web/core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php
@@ -24,8 +24,9 @@ class ComplexDataNormalizer extends NormalizerBase {
   /**
    * {@inheritdoc}
    */
-  public function normalize($object, $format = NULL, array $context = array()) {
-    $attributes = array();
+  public function normalize($object, $format = NULL, array $context = []) {
+    $attributes = [];
+    /** @var \Drupal\Core\TypedData\TypedDataInterface $field */
     foreach ($object as $name => $field) {
       $attributes[$name] = $this->serializer->normalize($field, $format, $context);
     }
diff --git a/web/core/modules/serialization/src/Normalizer/ConfigEntityNormalizer.php b/web/core/modules/serialization/src/Normalizer/ConfigEntityNormalizer.php
index d17005c17..344bcc338 100644
--- a/web/core/modules/serialization/src/Normalizer/ConfigEntityNormalizer.php
+++ b/web/core/modules/serialization/src/Normalizer/ConfigEntityNormalizer.php
@@ -12,12 +12,12 @@ class ConfigEntityNormalizer extends EntityNormalizer {
    *
    * @var array
    */
-  protected $supportedInterfaceOrClass = array('Drupal\Core\Config\Entity\ConfigEntityInterface');
+  protected $supportedInterfaceOrClass = ['Drupal\Core\Config\Entity\ConfigEntityInterface'];
 
   /**
    * {@inheritdoc}
    */
-  public function normalize($object, $format = NULL, array $context = array()) {
+  public function normalize($object, $format = NULL, array $context = []) {
     return $object->toArray();
   }
 
diff --git a/web/core/modules/serialization/src/Normalizer/ContentEntityNormalizer.php b/web/core/modules/serialization/src/Normalizer/ContentEntityNormalizer.php
index 0fb5300ad..f1ca82d54 100644
--- a/web/core/modules/serialization/src/Normalizer/ContentEntityNormalizer.php
+++ b/web/core/modules/serialization/src/Normalizer/ContentEntityNormalizer.php
@@ -8,19 +8,17 @@ namespace Drupal\serialization\Normalizer;
 class ContentEntityNormalizer extends EntityNormalizer {
 
   /**
-   * The interface or class that this Normalizer supports.
-   *
-   * @var array
+   * {@inheritdoc}
    */
   protected $supportedInterfaceOrClass = ['Drupal\Core\Entity\ContentEntityInterface'];
 
   /**
    * {@inheritdoc}
    */
-  public function normalize($object, $format = NULL, array $context = array()) {
-    $context += array(
+  public function normalize($object, $format = NULL, array $context = []) {
+    $context += [
       'account' => NULL,
-    );
+    ];
 
     $attributes = [];
     foreach ($object as $name => $field) {
diff --git a/web/core/modules/serialization/src/Normalizer/EntityNormalizer.php b/web/core/modules/serialization/src/Normalizer/EntityNormalizer.php
index b800e812a..84baec94b 100644
--- a/web/core/modules/serialization/src/Normalizer/EntityNormalizer.php
+++ b/web/core/modules/serialization/src/Normalizer/EntityNormalizer.php
@@ -2,8 +2,9 @@
 
 namespace Drupal\serialization\Normalizer;
 
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 /**
@@ -11,19 +12,14 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
  */
 class EntityNormalizer extends ComplexDataNormalizer implements DenormalizerInterface {
 
+  use FieldableEntityNormalizerTrait;
+
   /**
    * The interface or class that this Normalizer supports.
    *
    * @var array
    */
-  protected $supportedInterfaceOrClass = array('Drupal\Core\Entity\EntityInterface');
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
+  protected $supportedInterfaceOrClass = [EntityInterface::class];
 
   /**
    * Constructs an EntityNormalizer object.
@@ -39,49 +35,26 @@ class EntityNormalizer extends ComplexDataNormalizer implements DenormalizerInte
    * {@inheritdoc}
    */
   public function denormalize($data, $class, $format = NULL, array $context = []) {
-    // Get the entity type ID while letting context override the $class param.
-    $entity_type_id = !empty($context['entity_type']) ? $context['entity_type'] : $this->entityManager->getEntityTypeFromClass($class);
+    $entity_type_id = $this->determineEntityTypeId($class, $context);
+    $entity_type_definition = $this->getEntityTypeDefinition($entity_type_id);
 
-    /** @var \Drupal\Core\Entity\EntityTypeInterface $entity_type_definition */
-    // Get the entity type definition.
-    $entity_type_definition = $this->entityManager->getDefinition($entity_type_id, FALSE);
+    // The bundle property will be required to denormalize a bundleable
+    // fieldable entity.
+    if ($entity_type_definition->hasKey('bundle') && $entity_type_definition->isSubclassOf(FieldableEntityInterface::class)) {
+      // Get an array containing the bundle only. This also remove the bundle
+      // key from the $data array.
+      $bundle_data = $this->extractBundleData($data, $entity_type_definition);
 
-    // Don't try to create an entity without an entity type id.
-    if (!$entity_type_definition) {
-      throw new UnexpectedValueException(sprintf('The specified entity type "%s" does not exist. A valid etnity type is required for denormalization', $entity_type_id));
+      // Create the entity from bundle data only, then apply field values after.
+      $entity = $this->entityManager->getStorage($entity_type_id)->create($bundle_data);
+
+      $this->denormalizeFieldData($data, $entity, $format, $context);
     }
-
-    // The bundle property will be required to denormalize a bundleable entity.
-    if ($entity_type_definition->hasKey('bundle')) {
-      $bundle_key = $entity_type_definition->getKey('bundle');
-      // Get the base field definitions for this entity type.
-      $base_field_definitions = $this->entityManager->getBaseFieldDefinitions($entity_type_id);
-
-      // Get the ID key from the base field definition for the bundle key or
-      // default to 'value'.
-      $key_id = isset($base_field_definitions[$bundle_key]) ? $base_field_definitions[$bundle_key]->getFieldStorageDefinition()->getMainPropertyName() : 'value';
-
-      // Normalize the bundle if it is not explicitly set.
-      $data[$bundle_key] = isset($data[$bundle_key][0][$key_id]) ? $data[$bundle_key][0][$key_id] : (isset($data[$bundle_key]) ? $data[$bundle_key] : NULL);
-
-      // Get the bundle entity type from the entity type definition.
-      $bundle_type_id = $entity_type_definition->getBundleEntityType();
-      $bundle_types = $bundle_type_id ? $this->entityManager->getStorage($bundle_type_id)->getQuery()->execute() : [];
-
-      // Make sure a bundle has been provided.
-      if (!is_string($data[$bundle_key])) {
-        throw new UnexpectedValueException('A string must be provided as a bundle value.');
-      }
-
-      // Make sure the submitted bundle is a valid bundle for the entity type.
-      if ($bundle_types && !in_array($data[$bundle_key], $bundle_types)) {
-        throw new UnexpectedValueException(sprintf('"%s" is not a valid bundle type for denormalization.', $data[$bundle_key]));
-      }
+    else {
+      // Create the entity from all data.
+      $entity = $this->entityManager->getStorage($entity_type_id)->create($data);
     }
 
-    // Create the entity from data.
-    $entity = $this->entityManager->getStorage($entity_type_id)->create($data);
-
     // Pass the names of the fields whose values can be merged.
     // @todo https://www.drupal.org/node/2456257 remove this.
     $entity->_restSubmittedFields = array_keys($data);
diff --git a/web/core/modules/serialization/src/Normalizer/FieldItemNormalizer.php b/web/core/modules/serialization/src/Normalizer/FieldItemNormalizer.php
new file mode 100644
index 000000000..decca4322
--- /dev/null
+++ b/web/core/modules/serialization/src/Normalizer/FieldItemNormalizer.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\serialization\Normalizer;
+
+use Drupal\Core\Field\FieldItemInterface;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+/**
+ * Denormalizes field item object structure by updating the entity field values.
+ */
+class FieldItemNormalizer extends ComplexDataNormalizer implements DenormalizerInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $supportedInterfaceOrClass = FieldItemInterface::class;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function denormalize($data, $class, $format = NULL, array $context = []) {
+    if (!isset($context['target_instance'])) {
+      throw new InvalidArgumentException('$context[\'target_instance\'] must be set to denormalize with the FieldItemNormalizer');
+    }
+
+    if ($context['target_instance']->getParent() == NULL) {
+      throw new InvalidArgumentException('The field item passed in via $context[\'target_instance\'] must have a parent set.');
+    }
+
+    /** @var \Drupal\Core\Field\FieldItemInterface $field_item */
+    $field_item = $context['target_instance'];
+
+    $field_item->setValue($this->constructValue($data, $context));
+    return $field_item;
+  }
+
+  /**
+   * Build the field item value using the incoming data.
+   *
+   * Most normalizers that extend this class can simply use this method to
+   * construct the denormalized value without having to override denormalize()
+   * and reimplementing its validation logic or its call to set the field value.
+   *
+   * @param mixed $data
+   *   The incoming data for this field item.
+   * @param array $context
+   *   The context passed into the Normalizer.
+   *
+   * @return mixed
+   *   The value to use in Entity::setValue().
+   */
+  protected function constructValue($data, $context) {
+    return $data;
+  }
+
+}
diff --git a/web/core/modules/serialization/src/Normalizer/FieldNormalizer.php b/web/core/modules/serialization/src/Normalizer/FieldNormalizer.php
new file mode 100644
index 000000000..a5051cfb4
--- /dev/null
+++ b/web/core/modules/serialization/src/Normalizer/FieldNormalizer.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\serialization\Normalizer;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+/**
+ * Denormalizes data to Drupal field values.
+ *
+ * This class simply calls denormalize() on the individual FieldItems. The
+ * FieldItem normalizers are responsible for setting the field values for each
+ * item.
+ *
+ * @see \Drupal\serialization\Normalizer\FieldItemNormalizer.
+ */
+class FieldNormalizer extends ListNormalizer implements DenormalizerInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $supportedInterfaceOrClass = FieldItemListInterface::class;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function denormalize($data, $class, $format = NULL, array $context = []) {
+    if (!isset($context['target_instance'])) {
+      throw new InvalidArgumentException('$context[\'target_instance\'] must be set to denormalize with the FieldNormalizer');
+    }
+
+    if ($context['target_instance']->getParent() == NULL) {
+      throw new InvalidArgumentException('The field passed in via $context[\'target_instance\'] must have a parent set.');
+    }
+
+    /** @var FieldItemListInterface $items */
+    $items = $context['target_instance'];
+    $item_class = $items->getItemDefinition()->getClass();
+
+    if (!is_array($data)) {
+      throw new UnexpectedValueException(sprintf('Field values for "%s" must use an array structure', $items->getName()));
+    }
+
+    foreach ($data as $item_data) {
+      // Create a new item and pass it as the target for the unserialization of
+      // $item_data. All items in field should have removed before this method
+      // was called.
+      // @see \Drupal\serialization\Normalizer\ContentEntityNormalizer::denormalize().
+      $context['target_instance'] = $items->appendItem();
+      $this->serializer->denormalize($item_data, $item_class, $format, $context);
+    }
+    return $items;
+  }
+
+}
diff --git a/web/core/modules/serialization/src/Normalizer/FieldableEntityNormalizerTrait.php b/web/core/modules/serialization/src/Normalizer/FieldableEntityNormalizerTrait.php
new file mode 100644
index 000000000..c8211a8d5
--- /dev/null
+++ b/web/core/modules/serialization/src/Normalizer/FieldableEntityNormalizerTrait.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Drupal\serialization\Normalizer;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * A trait for providing fieldable entity normalization/denormalization methods.
+ *
+ * @todo Move this into a FieldableEntityNormalizer in Drupal 9. This is a trait
+ *   used in \Drupal\serialization\Normalizer\EntityNormalizer to maintain BC.
+ *   @see https://www.drupal.org/node/2834734
+ */
+trait FieldableEntityNormalizerTrait {
+
+  /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface
+   */
+  protected $entityManager;
+
+  /**
+   * Determines the entity type ID to denormalize as.
+   *
+   * @param string $class
+   *   The entity type class to be denormalized to.
+   * @param array $context
+   *   The serialization context data.
+   *
+   * @return string
+   *   The entity type ID.
+   */
+  protected function determineEntityTypeId($class, $context) {
+    // Get the entity type ID while letting context override the $class param.
+    return !empty($context['entity_type']) ? $context['entity_type'] : $this->entityManager->getEntityTypeFromClass($class);
+  }
+
+  /**
+   * Gets the entity type definition.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID to load the definition for.
+   *
+   * @return \Drupal\Core\Entity\EntityTypeInterface
+   *   The loaded entity type definition.
+   *
+   * @throws \Symfony\Component\Serializer\Exception\UnexpectedValueException
+   */
+  protected function getEntityTypeDefinition($entity_type_id) {
+    /** @var \Drupal\Core\Entity\EntityTypeInterface $entity_type_definition */
+    // Get the entity type definition.
+    $entity_type_definition = $this->entityManager->getDefinition($entity_type_id, FALSE);
+
+    // Don't try to create an entity without an entity type id.
+    if (!$entity_type_definition) {
+      throw new UnexpectedValueException(sprintf('The specified entity type "%s" does not exist. A valid entity type is required for denormalization', $entity_type_id));
+    }
+
+    return $entity_type_definition;
+  }
+
+  /**
+   * Denormalizes the bundle property so entity creation can use it.
+   *
+   * @param array $data
+   *   The data being denormalized.
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type_definition
+   *   The entity type definition.
+   *
+   * @throws \Symfony\Component\Serializer\Exception\UnexpectedValueException
+   *
+   * @return string
+   *   The valid bundle name.
+   */
+  protected function extractBundleData(array &$data, EntityTypeInterface $entity_type_definition) {
+    $bundle_key = $entity_type_definition->getKey('bundle');
+    // Get the base field definitions for this entity type.
+    $base_field_definitions = $this->entityManager->getBaseFieldDefinitions($entity_type_definition->id());
+
+    // Get the ID key from the base field definition for the bundle key or
+    // default to 'value'.
+    $key_id = isset($base_field_definitions[$bundle_key]) ? $base_field_definitions[$bundle_key]->getFieldStorageDefinition()->getMainPropertyName() : 'value';
+
+    // Normalize the bundle if it is not explicitly set.
+    $bundle_value = isset($data[$bundle_key][0][$key_id]) ? $data[$bundle_key][0][$key_id] : (isset($data[$bundle_key]) ? $data[$bundle_key] : NULL);
+    // Unset the bundle from the data.
+    unset($data[$bundle_key]);
+
+    // Get the bundle entity type from the entity type definition.
+    $bundle_type_id = $entity_type_definition->getBundleEntityType();
+    $bundle_types = $bundle_type_id ? $this->entityManager->getStorage($bundle_type_id)->getQuery()->execute() : [];
+
+    // Make sure a bundle has been provided.
+    if (!is_string($bundle_value)) {
+      throw new UnexpectedValueException(sprintf('Could not determine entity type bundle: "%s" field is missing.', $bundle_key));
+    }
+
+    // Make sure the submitted bundle is a valid bundle for the entity type.
+    if ($bundle_types && !in_array($bundle_value, $bundle_types)) {
+      throw new UnexpectedValueException(sprintf('"%s" is not a valid bundle type for denormalization.', $bundle_value));
+    }
+
+    return [$bundle_key => $bundle_value];
+  }
+
+  /**
+   * Denormalizes entity data by denormalizing each field individually.
+   *
+   * @param array $data
+   *   The data to denormalize.
+   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+   *   The fieldable entity to set field values for.
+   * @param string $format
+   *   The serialization format.
+   * @param array $context
+   *   The context data.
+   */
+  protected function denormalizeFieldData(array $data, FieldableEntityInterface $entity, $format, array $context) {
+    foreach ($data as $field_name => $field_data) {
+      $field_item_list = $entity->get($field_name);
+
+      // Remove any values that were set as a part of entity creation (e.g
+      // uuid). If the incoming field data is set to an empty array, this will
+      // also have the effect of emptying the field in REST module.
+      $field_item_list->setValue([]);
+      $field_item_list_class = get_class($field_item_list);
+
+      if ($field_data) {
+        // The field instance must be passed in the context so that the field
+        // denormalizer can update field values for the parent entity.
+        $context['target_instance'] = $field_item_list;
+        $this->serializer->denormalize($field_data, $field_item_list_class, $format, $context);
+      }
+    }
+  }
+
+}
diff --git a/web/core/modules/serialization/src/Normalizer/ListNormalizer.php b/web/core/modules/serialization/src/Normalizer/ListNormalizer.php
index 1729cfce8..471886e87 100644
--- a/web/core/modules/serialization/src/Normalizer/ListNormalizer.php
+++ b/web/core/modules/serialization/src/Normalizer/ListNormalizer.php
@@ -23,8 +23,8 @@ class ListNormalizer extends NormalizerBase {
   /**
    * {@inheritdoc}
    */
-  public function normalize($object, $format = NULL, array $context = array()) {
-    $attributes = array();
+  public function normalize($object, $format = NULL, array $context = []) {
+    $attributes = [];
     foreach ($object as $fieldItem) {
       $attributes[] = $this->serializer->normalize($fieldItem, $format, $context);
     }
diff --git a/web/core/modules/serialization/src/Normalizer/MarkupNormalizer.php b/web/core/modules/serialization/src/Normalizer/MarkupNormalizer.php
index 9cb3cd9ca..f4c197b69 100644
--- a/web/core/modules/serialization/src/Normalizer/MarkupNormalizer.php
+++ b/web/core/modules/serialization/src/Normalizer/MarkupNormalizer.php
@@ -12,12 +12,12 @@ class MarkupNormalizer extends NormalizerBase {
    *
    * @var array
    */
-  protected $supportedInterfaceOrClass = array('Drupal\Component\Render\MarkupInterface');
+  protected $supportedInterfaceOrClass = ['Drupal\Component\Render\MarkupInterface'];
 
   /**
    * {@inheritdoc}
    */
-  public function normalize($object, $format = NULL, array $context = array()) {
+  public function normalize($object, $format = NULL, array $context = []) {
     return (string) $object;
   }
 
diff --git a/web/core/modules/serialization/src/Normalizer/NullNormalizer.php b/web/core/modules/serialization/src/Normalizer/NullNormalizer.php
index c6a8de5ff..dbc61f781 100644
--- a/web/core/modules/serialization/src/Normalizer/NullNormalizer.php
+++ b/web/core/modules/serialization/src/Normalizer/NullNormalizer.php
@@ -20,7 +20,7 @@ class NullNormalizer extends NormalizerBase {
   /**
    * {@inheritdoc}
    */
-  public function normalize($object, $format = NULL, array $context = array()) {
+  public function normalize($object, $format = NULL, array $context = []) {
     return NULL;
   }
 
diff --git a/web/core/modules/serialization/src/Normalizer/PrimitiveDataNormalizer.php b/web/core/modules/serialization/src/Normalizer/PrimitiveDataNormalizer.php
new file mode 100644
index 000000000..cce108cac
--- /dev/null
+++ b/web/core/modules/serialization/src/Normalizer/PrimitiveDataNormalizer.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\serialization\Normalizer;
+
+use Drupal\Core\TypedData\PrimitiveInterface;
+
+/**
+ * Converts primitive data objects to their casted values.
+ */
+class PrimitiveDataNormalizer extends NormalizerBase {
+
+  /**
+   * The interface or class that this Normalizer supports.
+   *
+   * @var string
+   */
+  protected $supportedInterfaceOrClass = PrimitiveInterface::class;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function normalize($object, $format = NULL, array $context = []) {
+    // Typed data casts NULL objects to their empty variants, so for example
+    // the empty string ('') for string type data, or 0 for integer typed data.
+    // In a better world with typed data implementing algebraic data types,
+    // getCastedValue would return NULL, but as typed data is not aware of real
+    // optional values on the primitive level, we implement our own optional
+    // value normalization here.
+    return $object->getValue() === NULL ? NULL : $object->getCastedValue();
+  }
+
+}
diff --git a/web/core/modules/serialization/src/Normalizer/TypedDataNormalizer.php b/web/core/modules/serialization/src/Normalizer/TypedDataNormalizer.php
index 53a62df4e..60ce7d08f 100644
--- a/web/core/modules/serialization/src/Normalizer/TypedDataNormalizer.php
+++ b/web/core/modules/serialization/src/Normalizer/TypedDataNormalizer.php
@@ -17,7 +17,7 @@ class TypedDataNormalizer extends NormalizerBase {
   /**
    * {@inheritdoc}
    */
-  public function normalize($object, $format = NULL, array $context = array()) {
+  public function normalize($object, $format = NULL, array $context = []) {
     return $object->getValue();
   }
 
diff --git a/web/core/modules/serialization/src/RegisterEntityResolversCompilerPass.php b/web/core/modules/serialization/src/RegisterEntityResolversCompilerPass.php
index 90a2c26a0..47c2be034 100644
--- a/web/core/modules/serialization/src/RegisterEntityResolversCompilerPass.php
+++ b/web/core/modules/serialization/src/RegisterEntityResolversCompilerPass.php
@@ -19,7 +19,7 @@ class RegisterEntityResolversCompilerPass implements CompilerPassInterface {
    */
   public function process(ContainerBuilder $container) {
     $definition = $container->getDefinition('serializer.entity_resolver');
-    $resolvers = array();
+    $resolvers = [];
 
     // Retrieve registered Normalizers and Encoders from the container.
     foreach ($container->findTaggedServiceIds('entity_resolver') as $id => $attributes) {
@@ -29,7 +29,7 @@ class RegisterEntityResolversCompilerPass implements CompilerPassInterface {
 
     // Add the registered concrete EntityResolvers to the ChainEntityResolver.
     foreach ($this->sort($resolvers) as $resolver) {
-      $definition->addMethodCall('addResolver', array($resolver));
+      $definition->addMethodCall('addResolver', [$resolver]);
     }
   }
 
@@ -48,7 +48,7 @@ class RegisterEntityResolversCompilerPass implements CompilerPassInterface {
    *   to low priority.
    */
   protected function sort($services) {
-    $sorted = array();
+    $sorted = [];
     krsort($services);
 
     // Flatten the array.
diff --git a/web/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php b/web/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php
index f4611f3fc..10474d17e 100644
--- a/web/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php
+++ b/web/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\serialization;
 
+use Drupal\Core\Config\BootstrapConfigStorageFactory;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -22,6 +23,12 @@ class RegisterSerializationClassesCompilerPass implements CompilerPassInterface
 
     // Retrieve registered Normalizers and Encoders from the container.
     foreach ($container->findTaggedServiceIds('normalizer') as $id => $attributes) {
+      // If there is a BC key present, pass this to determine if the normalizer
+      // should be skipped.
+      if (isset($attributes[0]['bc']) && $this->normalizerBcSettingIsEnabled($attributes[0]['bc'], $attributes[0]['bc_config_name'])) {
+        continue;
+      }
+
       $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
       $normalizers[$priority][] = new Reference($id);
     }
@@ -39,7 +46,7 @@ class RegisterSerializationClassesCompilerPass implements CompilerPassInterface
     }
 
     // Find all serialization formats known.
-    $formats = array();
+    $formats = [];
     $format_providers = [];
     foreach ($container->findTaggedServiceIds('encoder') as $service_id => $attributes) {
       $format = $attributes[0]['format'];
@@ -53,6 +60,18 @@ class RegisterSerializationClassesCompilerPass implements CompilerPassInterface
     $container->setParameter('serializer.format_providers', $format_providers);
   }
 
+  /**
+   * Returns whether a normalizer BC setting is disabled or not.
+   *
+   * @param string $key
+   *
+   * @return bool
+   */
+  protected function normalizerBcSettingIsEnabled($key, $config_name) {
+    $settings = BootstrapConfigStorageFactory::get()->read($config_name);
+    return !empty($settings[$key]);
+  }
+
   /**
    * Sorts by priority.
    *
@@ -68,7 +87,7 @@ class RegisterSerializationClassesCompilerPass implements CompilerPassInterface
    *   to low priority.
    */
   protected function sort($services) {
-    $sorted = array();
+    $sorted = [];
     krsort($services);
 
     // Flatten the array.
diff --git a/web/core/modules/serialization/tests/modules/field_normalization_test/field_normalization_test.info.yml b/web/core/modules/serialization/tests/modules/field_normalization_test/field_normalization_test.info.yml
new file mode 100644
index 000000000..4ba215ecb
--- /dev/null
+++ b/web/core/modules/serialization/tests/modules/field_normalization_test/field_normalization_test.info.yml
@@ -0,0 +1,6 @@
+name: 'FieldItem normalization test support'
+type: module
+description: 'Provides test support for fieldItem normalization test support.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/web/core/modules/serialization/tests/modules/field_normalization_test/field_normalization_test.services.yml b/web/core/modules/serialization/tests/modules/field_normalization_test/field_normalization_test.services.yml
new file mode 100644
index 000000000..36243e795
--- /dev/null
+++ b/web/core/modules/serialization/tests/modules/field_normalization_test/field_normalization_test.services.yml
@@ -0,0 +1,6 @@
+services:
+  serializer.normalizer.silly_fielditem:
+    class: Drupal\field_normalization_test\Normalization\TextItemSillyNormalizer
+    tags:
+      # The priority must be higher than serialization.normalizer.field_item.
+      - { name: normalizer , priority: 9 }
diff --git a/web/core/modules/serialization/tests/modules/field_normalization_test/src/Normalization/TextItemSillyNormalizer.php b/web/core/modules/serialization/tests/modules/field_normalization_test/src/Normalization/TextItemSillyNormalizer.php
new file mode 100644
index 000000000..45438f407
--- /dev/null
+++ b/web/core/modules/serialization/tests/modules/field_normalization_test/src/Normalization/TextItemSillyNormalizer.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\field_normalization_test\Normalization;
+
+use Drupal\serialization\Normalizer\FieldItemNormalizer;
+use Drupal\text\Plugin\Field\FieldType\TextItemBase;
+
+/**
+ * A test TextItem normalizer to test denormalization.
+ */
+class TextItemSillyNormalizer extends FieldItemNormalizer {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $supportedInterfaceOrClass = TextItemBase::class;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function normalize($object, $format = NULL, array $context = []) {
+    $data = parent::normalize($object, $format, $context);
+    $data['value'] .= '::silly_suffix';
+    return $data;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function constructValue($data, $context) {
+    $value = parent::constructValue($data, $context);
+    $value['value']  = str_replace('::silly_suffix', '', $value['value']);
+    return $value;
+  }
+
+}
diff --git a/web/core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php b/web/core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php
index 0eb9aa5d9..165e97858 100644
--- a/web/core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php
+++ b/web/core/modules/serialization/tests/serialization_test/src/SerializationTestEncoder.php
@@ -16,7 +16,7 @@ class SerializationTestEncoder implements EncoderInterface {
   /**
    * {@inheritdoc}
    */
-  public function encode($data, $format, array $context = array()) {
+  public function encode($data, $format, array $context = []) {
     // @see \Drupal\serialization_test\SerializationTestNormalizer::normalize().
     return 'Normalized by ' . $data['normalized_by'] . ', Encoded by SerializationTestEncoder';
   }
diff --git a/web/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php b/web/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php
index 16775534f..2105adf59 100644
--- a/web/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php
+++ b/web/core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php
@@ -25,7 +25,7 @@ class SerializationTestNormalizer implements NormalizerInterface {
    *   An array containing a normalized representation of $object, appropriate
    *   for encoding to the requested format.
    */
-  public function normalize($object, $format = NULL, array $context = array()) {
+  public function normalize($object, $format = NULL, array $context = []) {
     $normalized = (array) $object;
     // Add identifying value that can be used to verify that the expected
     // normalizer was invoked.
diff --git a/web/core/modules/serialization/tests/src/Kernel/EntityResolverTest.php b/web/core/modules/serialization/tests/src/Kernel/EntityResolverTest.php
index ec94028f3..38af46e99 100644
--- a/web/core/modules/serialization/tests/src/Kernel/EntityResolverTest.php
+++ b/web/core/modules/serialization/tests/src/Kernel/EntityResolverTest.php
@@ -34,14 +34,14 @@ class EntityResolverTest extends NormalizerTestBase {
     \Drupal::service('router.builder')->rebuild();
 
     // Create the test field storage.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'entity_test_mulrev',
       'field_name' => 'field_test_entity_reference',
       'type' => 'entity_reference',
-      'settings' => array(
+      'settings' => [
         'target_type' => 'entity_test_mulrev',
-      ),
-    ))->save();
+      ],
+    ])->save();
 
     // Create the test field.
     FieldConfig::create([
@@ -54,41 +54,41 @@ class EntityResolverTest extends NormalizerTestBase {
   /**
    * Test that fields referencing UUIDs can be denormalized.
    */
-  function testUuidEntityResolver() {
+  public function testUuidEntityResolver() {
     // Create an entity to get the UUID from.
-    $entity = EntityTestMulRev::create(array('type' => 'entity_test_mulrev'));
+    $entity = EntityTestMulRev::create(['type' => 'entity_test_mulrev']);
     $entity->set('name', 'foobar');
-    $entity->set('field_test_entity_reference', array(array('target_id' => 1)));
+    $entity->set('field_test_entity_reference', [['target_id' => 1]]);
     $entity->save();
 
-    $field_uri = Url::fromUri('base:rest/relation/entity_test_mulrev/entity_test_mulrev/field_test_entity_reference', array('absolute' => TRUE))->toString();
+    $field_uri = Url::fromUri('base:rest/relation/entity_test_mulrev/entity_test_mulrev/field_test_entity_reference', ['absolute' => TRUE])->toString();
 
-    $data = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/type/entity_test_mulrev/entity_test_mulrev', array('absolute' => TRUE))->toString(),
-        ),
-        $field_uri => array(
-          array(
+    $data = [
+      '_links' => [
+        'type' => [
+          'href' => Url::fromUri('base:rest/type/entity_test_mulrev/entity_test_mulrev', ['absolute' => TRUE])->toString(),
+        ],
+        $field_uri => [
+          [
             'href' => $entity->url(),
-          ),
-        ),
-      ),
-      '_embedded' => array(
-        $field_uri => array(
-          array(
-            '_links' => array(
+          ],
+        ],
+      ],
+      '_embedded' => [
+        $field_uri => [
+          [
+            '_links' => [
               'self' => $entity->url(),
-            ),
-            'uuid' => array(
-              array(
+            ],
+            'uuid' => [
+              [
                 'value' => $entity->uuid(),
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
+              ],
+            ],
+          ],
+        ],
+      ],
+    ];
 
     $denormalized = $this->container->get('serializer')->denormalize($data, 'Drupal\entity_test\Entity\EntityTestMulRev', $this->format);
     $field_value = $denormalized->get('field_test_entity_reference')->getValue();
diff --git a/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php b/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
index 0f84d3d79..71fa6b3ec 100644
--- a/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
+++ b/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
@@ -17,7 +17,7 @@ class EntitySerializationTest extends NormalizerTestBase {
    *
    * @var array
    */
-  public static $modules = array('serialization', 'system', 'field', 'entity_test', 'text', 'filter', 'user', 'entity_serialization_test');
+  public static $modules = ['serialization', 'system', 'field', 'entity_test', 'text', 'filter', 'user', 'entity_serialization_test'];
 
   /**
    * The test values.
@@ -29,7 +29,7 @@ class EntitySerializationTest extends NormalizerTestBase {
   /**
    * The test entity.
    *
-   * @var \Drupal\Core\Entity\ContentEntityBase
+   * @var \Drupal\Core\Entity\ContentEntityInterface
    */
   protected $entity;
 
@@ -58,7 +58,7 @@ class EntitySerializationTest extends NormalizerTestBase {
     parent::setUp();
 
     // User create needs sequence table.
-    $this->installSchema('system', array('sequences'));
+    $this->installSchema('system', ['sequences']);
 
     // Create a test user to use as the entity owner.
     $this->user = \Drupal::entityManager()->getStorage('user')->create([
@@ -69,74 +69,75 @@ class EntitySerializationTest extends NormalizerTestBase {
     $this->user->save();
 
     // Create a test entity to serialize.
-    $this->values = array(
+    $this->values = [
       'name' => $this->randomMachineName(),
       'user_id' => $this->user->id(),
-      'field_test_text' => array(
+      'field_test_text' => [
         'value' => $this->randomMachineName(),
         'format' => 'full_html',
-      ),
-    );
+      ],
+    ];
     $this->entity = EntityTestMulRev::create($this->values);
     $this->entity->save();
 
     $this->serializer = $this->container->get('serializer');
 
-    $this->installConfig(array('field'));
+    $this->installConfig(['field']);
   }
 
   /**
    * Test the normalize function.
    */
   public function testNormalize() {
-    $expected = array(
-      'id' => array(
-        array('value' => 1),
-      ),
-      'uuid' => array(
-        array('value' => $this->entity->uuid()),
-      ),
-      'langcode' => array(
-        array('value' => 'en'),
-      ),
-      'name' => array(
-        array('value' => $this->values['name']),
-      ),
-      'type' => array(
-        array('value' => 'entity_test_mulrev'),
-      ),
-      'created' => array(
-        array('value' => $this->entity->created->value),
-      ),
-      'user_id' => array(
-        array(
-          'target_id' => $this->user->id(),
+    $expected = [
+      'id' => [
+        ['value' => 1],
+      ],
+      'uuid' => [
+        ['value' => $this->entity->uuid()],
+      ],
+      'langcode' => [
+        ['value' => 'en'],
+      ],
+      'name' => [
+        ['value' => $this->values['name']],
+      ],
+      'type' => [
+        ['value' => 'entity_test_mulrev'],
+      ],
+      'created' => [
+        ['value' => $this->entity->created->value],
+      ],
+      'user_id' => [
+        [
+          // id() will return the string value as it comes from the database.
+          'target_id' => (int) $this->user->id(),
           'target_type' => $this->user->getEntityTypeId(),
           'target_uuid' => $this->user->uuid(),
           'url' => $this->user->url(),
-        ),
-      ),
-      'revision_id' => array(
-        array('value' => 1),
-      ),
-      'default_langcode' => array(
-        array('value' => TRUE),
-      ),
-      'non_rev_field' => array(),
-      'field_test_text' => array(
-        array(
+        ],
+      ],
+      'revision_id' => [
+        ['value' => 1],
+      ],
+      'default_langcode' => [
+        ['value' => TRUE],
+      ],
+      'non_rev_field' => [],
+      'field_test_text' => [
+        [
           'value' => $this->values['field_test_text']['value'],
           'format' => $this->values['field_test_text']['format'],
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     $normalized = $this->serializer->normalize($this->entity);
 
     foreach (array_keys($expected) as $fieldName) {
-      $this->assertEqual($expected[$fieldName], $normalized[$fieldName], "ComplexDataNormalizer produces expected array for $fieldName.");
+      $this->assertSame($expected[$fieldName], $normalized[$fieldName], "Normalization produces expected array for $fieldName.");
     }
-    $this->assertEqual(array_diff_key($normalized, $expected), array(), 'No unexpected data is added to the normalized array.');
+    $this->assertEqual(array_diff_key($normalized, $expected), [], 'No unexpected data is added to the normalized array.');
   }
 
   /**
@@ -181,7 +182,7 @@ class EntitySerializationTest extends NormalizerTestBase {
 
     // Generate the expected xml in a way that allows changes to entity property
     // order.
-    $expected = array(
+    $expected = [
       'id' => '<id><value>' . $this->entity->id() . '</value></id>',
       'uuid' => '<uuid><value>' . $this->entity->uuid() . '</value></uuid>',
       'langcode' => '<langcode><value>en</value></langcode>',
@@ -193,7 +194,7 @@ class EntitySerializationTest extends NormalizerTestBase {
       'default_langcode' => '<default_langcode><value>1</value></default_langcode>',
       'non_rev_field' => '<non_rev_field/>',
       'field_test_text' => '<field_test_text><value>' . $this->values['field_test_text']['value'] . '</value><format>' . $this->values['field_test_text']['format'] . '</format></field_test_text>',
-    );
+    ];
     // Sort it in the same order as normalised.
     $expected = array_merge($normalized, $expected);
     // Add header and footer.
@@ -214,9 +215,9 @@ class EntitySerializationTest extends NormalizerTestBase {
   public function testDenormalize() {
     $normalized = $this->serializer->normalize($this->entity);
 
-    foreach (array('json', 'xml') as $type) {
-      $denormalized = $this->serializer->denormalize($normalized, $this->entityClass, $type, array('entity_type' => 'entity_test_mulrev'));
-      $this->assertTrue($denormalized instanceof $this->entityClass, SafeMarkup::format('Denormalized entity is an instance of @class', array('@class' => $this->entityClass)));
+    foreach (['json', 'xml'] as $type) {
+      $denormalized = $this->serializer->denormalize($normalized, $this->entityClass, $type, ['entity_type' => 'entity_test_mulrev']);
+      $this->assertTrue($denormalized instanceof $this->entityClass, SafeMarkup::format('Denormalized entity is an instance of @class', ['@class' => $this->entityClass]));
       $this->assertIdentical($denormalized->getEntityTypeId(), $this->entity->getEntityTypeId(), 'Expected entity type found.');
       $this->assertIdentical($denormalized->bundle(), $this->entity->bundle(), 'Expected entity bundle found.');
       $this->assertIdentical($denormalized->uuid(), $this->entity->uuid(), 'Expected entity UUID found.');
diff --git a/web/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php b/web/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php
new file mode 100644
index 000000000..3e41d6303
--- /dev/null
+++ b/web/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Drupal\Tests\serialization\Kernel;
+
+use Drupal\entity_test\Entity\EntityTestMulRev;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * Test field level normalization process.
+ *
+ * @group serialization
+ */
+class FieldItemSerializationTest extends NormalizerTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['serialization', 'system', 'field', 'entity_test', 'text', 'filter', 'user', 'field_normalization_test'];
+
+  /**
+   * The class name of the test class.
+   *
+   * @var string
+   */
+  protected $entityClass = 'Drupal\entity_test\Entity\EntityTestMulRev';
+
+  /**
+   * The test values.
+   *
+   * @var array
+   */
+  protected $values;
+
+  /**
+   * The test entity.
+   *
+   * @var \Drupal\Core\Entity\ContentEntityBase
+   */
+  protected $entity;
+
+  /**
+   * The serializer service.
+   *
+   * @var \Symfony\Component\Serializer\Serializer.
+   */
+  protected $serializer;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Auto-create a field for testing default field values.
+    FieldStorageConfig::create([
+      'entity_type' => 'entity_test_mulrev',
+      'field_name' => 'field_test_text_default',
+      'type' => 'text',
+      'cardinality' => 1,
+      'translatable' => FALSE,
+    ])->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test_mulrev',
+      'field_name' => 'field_test_text_default',
+      'bundle' => 'entity_test_mulrev',
+      'label' => 'Test text-field with default',
+      'default_value' => [
+        [
+          'value' => 'This is the default',
+          'format' => 'full_html',
+        ],
+      ],
+      'widget' => [
+        'type' => 'text_textfield',
+        'weight' => 0,
+      ],
+    ])->save();
+
+    // Create a test entity to serialize.
+    $this->values = [
+      'name' => $this->randomMachineName(),
+      'field_test_text' => [
+        'value' => $this->randomMachineName(),
+        'format' => 'full_html',
+      ],
+    ];
+    $this->entity = EntityTestMulRev::create($this->values);
+    $this->entity->save();
+
+    $this->serializer = $this->container->get('serializer');
+
+    $this->installConfig(['field']);
+  }
+
+  /**
+   * Tests normalizing and denormalizing an entity with field item normalizer.
+   */
+  public function testFieldNormalizeDenormalize() {
+    $normalized = $this->serializer->normalize($this->entity, 'json');
+
+    $expected_field_value = $this->entity->field_test_text[0]->getValue()['value'] . '::silly_suffix';
+    $this->assertEquals($expected_field_value, $normalized['field_test_text'][0]['value'], 'Text field item normalized');
+    $denormalized = $this->serializer->denormalize($normalized, $this->entityClass, 'json');
+
+    $this->assertEquals($denormalized->field_test_text[0]->getValue(), $this->entity->field_test_text[0]->getValue(), 'Text field item denormalized.');
+    $this->assertEquals($denormalized->field_test_text_default[0]->getValue(), $this->entity->field_test_text_default[0]->getValue(), 'Text field item with default denormalized.');
+
+    // Unset the values for text field that has a default value.
+    unset($normalized['field_test_text_default']);
+    $denormalized_without_all_fields = $this->serializer->denormalize($normalized, $this->entityClass, 'json');
+    // Check that denormalized entity is still the same even if not all fields
+    // are not provided.
+    $this->assertEquals($denormalized_without_all_fields->field_test_text[0]->getValue(), $this->entity->field_test_text[0]->getValue(), 'Text field item denormalized.');
+    // Even though field_test_text_default value was unset before
+    // denormalization it should still have the default values for the field.
+    $this->assertEquals($denormalized_without_all_fields->field_test_text_default[0]->getValue(), $this->entity->field_test_text_default[0]->getValue(), 'Text field item with default denormalized.');
+  }
+
+  /**
+   * Tests denormalizing using a scalar field value.
+   */
+  public function testFieldDenormalizeWithScalarValue() {
+    $this->setExpectedException(UnexpectedValueException::class, 'Field values for "uuid" must use an array structure');
+
+    $normalized = $this->serializer->normalize($this->entity, 'json');
+
+    // Change the UUID value to use the UUID directly. No array structure.
+    $normalized['uuid'] = $normalized['uuid'][0]['value'];
+
+    $this->serializer->denormalize($normalized, $this->entityClass, 'json');
+  }
+
+}
diff --git a/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php b/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php
index 7706b6d17..25299b16f 100644
--- a/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php
+++ b/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php
@@ -16,35 +16,35 @@ abstract class NormalizerTestBase extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('serialization', 'system', 'field', 'entity_test', 'text', 'filter', 'user');
+  public static $modules = ['serialization', 'system', 'field', 'entity_test', 'text', 'filter', 'user'];
 
   protected function setUp() {
     parent::setUp();
 
     $this->installEntitySchema('entity_test_mulrev');
     $this->installEntitySchema('user');
-    $this->installConfig(array('field'));
+    $this->installConfig(['field']);
     \Drupal::service('router.builder')->rebuild();
     \Drupal::moduleHandler()->invoke('rest', 'install');
 
     // Auto-create a field for testing.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'entity_test_mulrev',
       'field_name' => 'field_test_text',
       'type' => 'text',
       'cardinality' => 1,
       'translatable' => FALSE,
-    ))->save();
-    FieldConfig::create(array(
+    ])->save();
+    FieldConfig::create([
       'entity_type' => 'entity_test_mulrev',
       'field_name' => 'field_test_text',
       'bundle' => 'entity_test_mulrev',
       'label' => 'Test text-field',
-      'widget' => array(
+      'widget' => [
         'type' => 'text_textfield',
         'weight' => 0,
-      ),
-    ))->save();
+      ],
+    ])->save();
   }
 
 }
diff --git a/web/core/modules/serialization/tests/src/Kernel/SerializationTest.php b/web/core/modules/serialization/tests/src/Kernel/SerializationTest.php
index 8b700a328..a7ad145e6 100644
--- a/web/core/modules/serialization/tests/src/Kernel/SerializationTest.php
+++ b/web/core/modules/serialization/tests/src/Kernel/SerializationTest.php
@@ -17,7 +17,7 @@ class SerializationTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('serialization', 'serialization_test');
+  public static $modules = ['serialization', 'serialization_test'];
 
   /**
    * The serializer service to test.
diff --git a/web/core/modules/serialization/src/Tests/RegisterSerializationClassesCompilerPassTest.php b/web/core/modules/serialization/tests/src/Unit/CompilerPass/RegisterSerializationClassesCompilerPassTest.php
similarity index 96%
rename from web/core/modules/serialization/src/Tests/RegisterSerializationClassesCompilerPassTest.php
rename to web/core/modules/serialization/tests/src/Unit/CompilerPass/RegisterSerializationClassesCompilerPassTest.php
index 6406bbbae..630535dea 100644
--- a/web/core/modules/serialization/src/Tests/RegisterSerializationClassesCompilerPassTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/CompilerPass/RegisterSerializationClassesCompilerPassTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\serialization\Tests;
+namespace Drupal\Tests\serialization\Unit\CompilerPass;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\serialization\RegisterSerializationClassesCompilerPass;
diff --git a/web/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php b/web/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php
index ea38aa991..88c7a1d8e 100644
--- a/web/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php
@@ -28,7 +28,7 @@ class XmlEncoderTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $testArray = array('test' => 'test');
+  protected $testArray = ['test' => 'test'];
 
   protected function setUp() {
     $this->baseEncoder = $this->getMock('Symfony\Component\Serializer\Encoder\XmlEncoder');
@@ -58,7 +58,7 @@ class XmlEncoderTest extends UnitTestCase {
   public function testEncode() {
     $this->baseEncoder->expects($this->once())
       ->method('encode')
-      ->with($this->testArray, 'test', array())
+      ->with($this->testArray, 'test', [])
       ->will($this->returnValue('test'));
 
     $this->assertEquals('test', $this->encoder->encode($this->testArray, 'test'));
@@ -70,7 +70,7 @@ class XmlEncoderTest extends UnitTestCase {
   public function testDecode() {
     $this->baseEncoder->expects($this->once())
       ->method('decode')
-      ->with('test', 'test', array())
+      ->with('test', 'test', [])
       ->will($this->returnValue($this->testArray));
 
     $this->assertEquals($this->testArray, $this->encoder->decode('test', 'test'));
diff --git a/web/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php b/web/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
index 38819e11e..64e73b693 100644
--- a/web/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
@@ -47,10 +47,10 @@ class ChainEntityResolverTest extends UnitTestCase {
    * @covers ::resolve
    */
   public function testResolverWithNoneResolved() {
-    $resolvers = array(
+    $resolvers = [
       $this->createEntityResolverMock(),
       $this->createEntityResolverMock(),
-    );
+    ];
 
     $resolver = new ChainEntityResolver($resolvers);
 
@@ -78,10 +78,10 @@ class ChainEntityResolverTest extends UnitTestCase {
    * @covers ::resolve
    */
   public function testResolverWithFirstResolved() {
-    $resolvers = array(
+    $resolvers = [
       $this->createEntityResolverMock(10),
       $this->createEntityResolverMock(NULL, FALSE),
-    );
+    ];
 
     $resolver = new ChainEntityResolver($resolvers);
 
@@ -95,10 +95,10 @@ class ChainEntityResolverTest extends UnitTestCase {
    * @covers ::resolve
    */
   public function testResolverWithLastResolved() {
-    $resolvers = array(
+    $resolvers = [
       $this->createEntityResolverMock(),
       $this->createEntityResolverMock(10),
-    );
+    ];
 
     $resolver = new ChainEntityResolver($resolvers);
 
@@ -112,10 +112,10 @@ class ChainEntityResolverTest extends UnitTestCase {
    * @covers ::resolve
    */
   public function testResolverWithResolvedToZero() {
-    $resolvers = array(
+    $resolvers = [
       $this->createEntityResolverMock(0),
       $this->createEntityResolverMock(NULL, FALSE),
-    );
+    ];
 
     $resolver = new ChainEntityResolver($resolvers);
 
diff --git a/web/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php b/web/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php
index a05d417a9..812392568 100644
--- a/web/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php
@@ -44,7 +44,7 @@ class UuidResolverTest extends UnitTestCase {
       ->method('loadEntityByUuid');
 
     $normalizer = $this->getMock('Symfony\Component\Serializer\Normalizer\NormalizerInterface');
-    $this->assertNull($this->resolver->resolve($normalizer, array(), 'test_type'));
+    $this->assertNull($this->resolver->resolve($normalizer, [], 'test_type'));
   }
 
   /**
@@ -57,9 +57,9 @@ class UuidResolverTest extends UnitTestCase {
     $normalizer = $this->getMock('Drupal\serialization\EntityResolver\UuidReferenceInterface');
     $normalizer->expects($this->once())
       ->method('getUuid')
-      ->with(array())
+      ->with([])
       ->will($this->returnValue(NULL));
-    $this->assertNull($this->resolver->resolve($normalizer, array(), 'test_type'));
+    $this->assertNull($this->resolver->resolve($normalizer, [], 'test_type'));
   }
 
   /**
@@ -76,10 +76,10 @@ class UuidResolverTest extends UnitTestCase {
     $normalizer = $this->getMock('Drupal\serialization\EntityResolver\UuidReferenceInterface');
     $normalizer->expects($this->once())
       ->method('getUuid')
-      ->with(array())
+      ->with([])
       ->will($this->returnValue($uuid));
 
-    $this->assertNull($this->resolver->resolve($normalizer, array(), 'test_type'));
+    $this->assertNull($this->resolver->resolve($normalizer, [], 'test_type'));
   }
 
   /**
@@ -101,9 +101,9 @@ class UuidResolverTest extends UnitTestCase {
     $normalizer = $this->getMock('Drupal\serialization\EntityResolver\UuidReferenceInterface');
     $normalizer->expects($this->once())
       ->method('getUuid')
-      ->with(array())
+      ->with([])
       ->will($this->returnValue($uuid));
-    $this->assertSame(1, $this->resolver->resolve($normalizer, array(), 'test_type'));
+    $this->assertSame(1, $this->resolver->resolve($normalizer, [], 'test_type'));
   }
 
 }
diff --git a/web/core/modules/serialization/tests/src/Unit/EventSubscriber/DefaultExceptionSubscriberTest.php b/web/core/modules/serialization/tests/src/Unit/EventSubscriber/DefaultExceptionSubscriberTest.php
new file mode 100644
index 000000000..e20f6f7fe
--- /dev/null
+++ b/web/core/modules/serialization/tests/src/Unit/EventSubscriber/DefaultExceptionSubscriberTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Drupal\Tests\serialization\Unit\EventSubscriber;
+
+use Drupal\serialization\Encoder\JsonEncoder;
+use Drupal\serialization\EventSubscriber\DefaultExceptionSubscriber;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\Serializer\Serializer;
+
+/**
+ * @coversDefaultClass \Drupal\serialization\EventSubscriber\DefaultExceptionSubscriber
+ * @group serialization
+ */
+class DefaultExceptionSubscriberTest extends UnitTestCase {
+
+  /**
+   * @covers ::on4xx
+   */
+  public function testOn4xx() {
+    $kernel = $this->prophesize(HttpKernelInterface::class);
+    $request = Request::create('/test');
+    $request->setRequestFormat('json');
+
+    $e = new MethodNotAllowedHttpException(['POST', 'PUT'], 'test message');
+    $event = new GetResponseForExceptionEvent($kernel->reveal(), $request, 'GET', $e);
+    $subscriber = new DefaultExceptionSubscriber(new Serializer([], [new JsonEncoder()]), []);
+    $subscriber->on4xx($event);
+    $response = $event->getResponse();
+
+    $this->assertInstanceOf(Response::class, $response);
+    $this->assertEquals('{"message":"test message"}', $response->getContent());
+    $this->assertEquals(405, $response->getStatusCode());
+    $this->assertEquals('POST, PUT', $response->headers->get('Allow'));
+    $this->assertEquals('application/json', $response->headers->get('Content-Type'));
+  }
+
+}
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php
index ec9a4d07c..371450a50 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php
@@ -17,7 +17,7 @@ class ConfigEntityNormalizerTest extends UnitTestCase {
    * @covers ::normalize
    */
   public function testNormalize() {
-    $test_export_properties = array('test' => 'test');
+    $test_export_properties = ['test' => 'test'];
 
     $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
     $normalizer = new ConfigEntityNormalizer($entity_manager);
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php
index 9613fdbb9..4beecf420 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php
@@ -40,7 +40,7 @@ class ContentEntityNormalizerTest extends UnitTestCase {
     $this->contentEntityNormalizer = new ContentEntityNormalizer($this->entityManager);
     $this->serializer = $this->getMockBuilder('Symfony\Component\Serializer\Serializer')
       ->disableOriginalConstructor()
-      ->setMethods(array('normalize'))
+      ->setMethods(['normalize'])
       ->getMock();
     $this->contentEntityNormalizer->setSerializer($this->serializer);
   }
@@ -66,10 +66,10 @@ class ContentEntityNormalizerTest extends UnitTestCase {
       ->with($this->containsOnlyInstancesOf('Drupal\Core\Field\FieldItemListInterface'), 'test_format', ['account' => NULL])
       ->will($this->returnValue('test'));
 
-    $definitions = array(
+    $definitions = [
       'field_1' => $this->createMockFieldListItem(),
       'field_2' => $this->createMockFieldListItem(FALSE),
-    );
+    ];
     $content_entity_mock = $this->createMockForContentEntity($definitions);
 
     $normalized = $this->contentEntityNormalizer->normalize($content_entity_mock, 'test_format');
@@ -98,10 +98,10 @@ class ContentEntityNormalizerTest extends UnitTestCase {
 
     // The mock account should get passed directly into the access() method on
     // field items from $context['account'].
-    $definitions = array(
+    $definitions = [
       'field_1' => $this->createMockFieldListItem(TRUE, $mock_account),
       'field_2' => $this->createMockFieldListItem(FALSE, $mock_account),
-    );
+    ];
     $content_entity_mock = $this->createMockForContentEntity($definitions);
 
     $normalized = $this->contentEntityNormalizer->normalize($content_entity_mock, 'test_format', $context);
@@ -121,7 +121,7 @@ class ContentEntityNormalizerTest extends UnitTestCase {
   public function createMockForContentEntity($definitions) {
     $content_entity_mock = $this->getMockBuilder('Drupal\Core\Entity\ContentEntityBase')
       ->disableOriginalConstructor()
-      ->setMethods(array('getFields'))
+      ->setMethods(['getFields'])
       ->getMockForAbstractClass();
     $content_entity_mock->expects($this->once())
       ->method('getFields')
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php
index 702107015..bbddbdd48 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php
@@ -2,8 +2,11 @@
 
 namespace Drupal\Tests\serialization\Unit\Normalizer;
 
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\serialization\Normalizer\EntityNormalizer;
 use Drupal\Tests\UnitTestCase;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 
 /**
  * @coversDefaultClass \Drupal\serialization\Normalizer\EntityNormalizer
@@ -49,14 +52,14 @@ class EntityNormalizerTest extends UnitTestCase {
     $list_item_1 = $this->getMock('Drupal\Core\TypedData\TypedDataInterface');
     $list_item_2 = $this->getMock('Drupal\Core\TypedData\TypedDataInterface');
 
-    $definitions = array(
+    $definitions = [
       'field_1' => $list_item_1,
       'field_2' => $list_item_2,
-    );
+    ];
 
     $content_entity = $this->getMockBuilder('Drupal\Core\Entity\ContentEntityBase')
       ->disableOriginalConstructor()
-      ->setMethods(array('getFields'))
+      ->setMethods(['getFields'])
       ->getMockForAbstractClass();
     $content_entity->expects($this->once())
       ->method('getFields')
@@ -64,7 +67,7 @@ class EntityNormalizerTest extends UnitTestCase {
 
     $serializer = $this->getMockBuilder('Symfony\Component\Serializer\Serializer')
       ->disableOriginalConstructor()
-      ->setMethods(array('normalize'))
+      ->setMethods(['normalize'])
       ->getMock();
     $serializer->expects($this->at(0))
       ->method('normalize')
@@ -82,11 +85,10 @@ class EntityNormalizerTest extends UnitTestCase {
    * Tests the denormalize() method with no entity type provided in context.
    *
    * @covers ::denormalize
-   *
-   * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
    */
   public function testDenormalizeWithNoEntityType() {
-    $this->entityNormalizer->denormalize(array(), 'Drupal\Core\Entity\ContentEntityBase');
+    $this->setExpectedException(UnexpectedValueException::class);
+    $this->entityNormalizer->denormalize([], 'Drupal\Core\Entity\ContentEntityBase');
   }
 
   /**
@@ -104,6 +106,10 @@ class EntityNormalizerTest extends UnitTestCase {
     ];
 
     $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
+
+    $entity_type->expects($this->once())
+      ->method('id')
+      ->willReturn('test');
     $entity_type->expects($this->once())
       ->method('hasKey')
       ->with('bundle')
@@ -112,6 +118,11 @@ class EntityNormalizerTest extends UnitTestCase {
       ->method('getKey')
       ->with('bundle')
       ->will($this->returnValue('test_type'));
+    $entity_type->expects($this->once())
+      ->method('isSubClassOf')
+      ->with(FieldableEntityInterface::class)
+      ->willReturn(TRUE);
+
     $entity_type->expects($this->once())
       ->method('getBundleEntityType')
       ->will($this->returnValue('test_bundle'));
@@ -154,32 +165,56 @@ class EntityNormalizerTest extends UnitTestCase {
       ->with('test_bundle')
       ->will($this->returnValue($entity_type_storage));
 
-    // The expected test data should have a modified test_type property.
-    $expected_test_data = array(
-      'key_1' => 'value_1',
-      'key_2' => 'value_2',
-      'test_type' => 'test_bundle',
-    );
+    $key_1 = $this->getMock(FieldItemListInterface::class);
+    $key_2 = $this->getMock(FieldItemListInterface::class);
+
+    $entity = $this->getMock(FieldableEntityInterface::class);
+    $entity->expects($this->at(0))
+      ->method('get')
+      ->with('key_1')
+      ->willReturn($key_1);
+    $entity->expects($this->at(1))
+      ->method('get')
+      ->with('key_2')
+      ->willReturn($key_2);
 
     $storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
+    // Create should only be called with the bundle property at first.
+    $expected_test_data = [
+      'test_type' => 'test_bundle',
+    ];
+
     $storage->expects($this->once())
       ->method('create')
       ->with($expected_test_data)
-      ->will($this->returnValue($this->getMock('Drupal\Core\Entity\EntityInterface')));
+      ->will($this->returnValue($entity));
 
     $this->entityManager->expects($this->at(3))
       ->method('getStorage')
       ->with('test')
       ->will($this->returnValue($storage));
 
+    // Setup expectations for the serializer. This will be called for each field
+    // item.
+    $serializer = $this->getMockBuilder('Symfony\Component\Serializer\Serializer')
+      ->disableOriginalConstructor()
+      ->setMethods(['denormalize'])
+      ->getMock();
+    $serializer->expects($this->at(0))
+      ->method('denormalize')
+      ->with('value_1', get_class($key_1), NULL, ['target_instance' => $key_1, 'entity_type' => 'test']);
+    $serializer->expects($this->at(1))
+      ->method('denormalize')
+      ->with('value_2', get_class($key_2), NULL, ['target_instance' => $key_2, 'entity_type' => 'test']);
+
+    $this->entityNormalizer->setSerializer($serializer);
+
     $this->assertNotNull($this->entityNormalizer->denormalize($test_data, 'Drupal\Core\Entity\ContentEntityBase', NULL, ['entity_type' => 'test']));
   }
 
   /**
    * Tests the denormalize method with a bundle property.
    *
-   * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
-   *
    * @covers ::denormalize
    */
   public function testDenormalizeWithInvalidBundle() {
@@ -192,6 +227,10 @@ class EntityNormalizerTest extends UnitTestCase {
     ];
 
     $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
+
+    $entity_type->expects($this->once())
+      ->method('id')
+      ->willReturn('test');
     $entity_type->expects($this->once())
       ->method('hasKey')
       ->with('bundle')
@@ -200,6 +239,11 @@ class EntityNormalizerTest extends UnitTestCase {
       ->method('getKey')
       ->with('bundle')
       ->will($this->returnValue('test_type'));
+    $entity_type->expects($this->once())
+      ->method('isSubClassOf')
+      ->with(FieldableEntityInterface::class)
+      ->willReturn(TRUE);
+
     $entity_type->expects($this->once())
       ->method('getBundleEntityType')
       ->will($this->returnValue('test_bundle'));
@@ -242,7 +286,7 @@ class EntityNormalizerTest extends UnitTestCase {
       ->with('test_bundle')
       ->will($this->returnValue($entity_type_storage));
 
-
+    $this->setExpectedException(UnexpectedValueException::class);
     $this->entityNormalizer->denormalize($test_data, 'Drupal\Core\Entity\ContentEntityBase', NULL, ['entity_type' => 'test']);
   }
 
@@ -252,10 +296,10 @@ class EntityNormalizerTest extends UnitTestCase {
    * @covers ::denormalize
    */
   public function testDenormalizeWithNoBundle() {
-    $test_data = array(
+    $test_data = [
       'key_1' => 'value_1',
       'key_2' => 'value_2',
-    );
+    ];
 
     $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
     $entity_type->expects($this->once())
@@ -284,7 +328,7 @@ class EntityNormalizerTest extends UnitTestCase {
     $this->entityManager->expects($this->never())
       ->method('getBaseFieldDefinitions');
 
-    $this->assertNotNull($this->entityNormalizer->denormalize($test_data, 'Drupal\Core\Entity\ContentEntityBase', NULL, array('entity_type' => 'test')));
+    $this->assertNotNull($this->entityNormalizer->denormalize($test_data, 'Drupal\Core\Entity\ContentEntityBase', NULL, ['entity_type' => 'test']));
   }
 
 }
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php
index bbc7c1103..fccc6dbaa 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php
@@ -34,7 +34,7 @@ class ListNormalizerTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $expectedListValues = array('test', 'test', 'test');
+  protected $expectedListValues = ['test', 'test', 'test'];
 
   /**
    * The mocked typed data.
@@ -54,7 +54,7 @@ class ListNormalizerTest extends UnitTestCase {
     // Set up a mock container as ItemList() will call for the 'typed_data_manager'
     // service.
     $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
-      ->setMethods(array('get'))
+      ->setMethods(['get'])
       ->getMock();
     $container->expects($this->any())
       ->method('get')
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
index e77882ace..f5e8f0f7b 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/NormalizerBaseTest.php
@@ -45,20 +45,20 @@ class NormalizerBaseTest extends UnitTestCase {
    *   An array of provider data for testSupportsNormalization.
    */
   public function providerTestSupportsNormalization() {
-    return array(
+    return [
       // Something that is not an object should return FALSE immediately.
-      array(FALSE, array()),
+      [FALSE, []],
       // An object with no class set should return FALSE.
-      array(FALSE, new \stdClass()),
+      [FALSE, new \stdClass()],
       // Set a supported Class.
-      array(TRUE, new \stdClass(), 'stdClass'),
+      [TRUE, new \stdClass(), 'stdClass'],
       // Set a supported interface.
-      array(TRUE, new \RecursiveArrayIterator(), 'RecursiveIterator'),
+      [TRUE, new \RecursiveArrayIterator(), 'RecursiveIterator'],
       // Set a different class.
-      array(FALSE, new \stdClass(), 'ArrayIterator'),
+      [FALSE, new \stdClass(), 'ArrayIterator'],
       // Set a different interface.
-      array(FALSE, new \stdClass(), 'RecursiveIterator'),
-    );
+      [FALSE, new \stdClass(), 'RecursiveIterator'],
+    ];
   }
 
 }
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/PrimitiveDataNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/PrimitiveDataNormalizerTest.php
new file mode 100644
index 000000000..acdc6daa3
--- /dev/null
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/PrimitiveDataNormalizerTest.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Drupal\Tests\serialization\Unit\Normalizer;
+
+use Drupal\Core\TypedData\DataDefinition;
+use Drupal\Core\TypedData\Plugin\DataType\BooleanData;
+use Drupal\Core\TypedData\Plugin\DataType\IntegerData;
+use Drupal\Core\TypedData\Plugin\DataType\StringData;
+use Drupal\Tests\UnitTestCase;
+use Drupal\serialization\Normalizer\PrimitiveDataNormalizer;
+
+/**
+ * @coversDefaultClass \Drupal\serialization\Normalizer\PrimitiveDataNormalizer
+ * @group serialization
+ */
+class PrimitiveDataNormalizerTest extends UnitTestCase {
+
+  /**
+   * The TypedDataNormalizer instance.
+   *
+   * @var \Drupal\serialization\Normalizer\TypedDataNormalizer
+   */
+  protected $normalizer;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->normalizer = new PrimitiveDataNormalizer();
+  }
+
+  /**
+   * @covers ::supportsNormalization
+   * @dataProvider dataProviderPrimitiveData
+   */
+  public function testSupportsNormalization($primitive_data, $expected) {
+    $this->assertTrue($this->normalizer->supportsNormalization($primitive_data));
+  }
+
+  /**
+   * @covers ::supportsNormalization
+   */
+  public function testSupportsNormalizationFail() {
+    // Test that an object not implementing PrimitiveInterface fails.
+    $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass()));
+  }
+
+  /**
+   * @covers ::normalize
+   * @dataProvider dataProviderPrimitiveData
+   */
+  public function testNormalize($primitive_data, $expected) {
+    $this->assertSame($expected, $this->normalizer->normalize($primitive_data));
+  }
+
+  /**
+   * Data provider for testNormalize().
+   */
+  public function dataProviderPrimitiveData() {
+    $data = [];
+
+    $definition = DataDefinition::createFromDataType('string');
+    $string = new StringData($definition, 'string');
+    $string->setValue('test');
+
+    $data['string'] = [$string, 'test'];
+
+    $definition = DataDefinition::createFromDataType('string');
+    $string = new StringData($definition, 'string');
+    $string->setValue(NULL);
+
+    $data['string-null'] = [$string, NULL];
+
+    $definition = DataDefinition::createFromDataType('integer');
+    $integer = new IntegerData($definition, 'integer');
+    $integer->setValue(5);
+
+    $data['integer'] = [$integer, 5];
+
+    $definition = DataDefinition::createFromDataType('integer');
+    $integer = new IntegerData($definition, 'integer');
+    $integer->setValue(NULL);
+
+    $data['integer-null'] = [$integer, NULL];
+
+    $definition = DataDefinition::createFromDataType('boolean');
+    $boolean = new BooleanData($definition, 'boolean');
+    $boolean->setValue(TRUE);
+
+    $data['boolean'] = [$boolean, TRUE];
+
+    $definition = DataDefinition::createFromDataType('boolean');
+    $boolean = new BooleanData($definition, 'boolean');
+    $boolean->setValue(NULL);
+
+    $data['boolean-null'] = [$boolean, NULL];
+
+    return $data;
+  }
+
+}
diff --git a/web/core/modules/shortcut/shortcut.install b/web/core/modules/shortcut/shortcut.install
index 8df408fe9..21ebf5194 100644
--- a/web/core/modules/shortcut/shortcut.install
+++ b/web/core/modules/shortcut/shortcut.install
@@ -9,39 +9,39 @@
  * Implements hook_schema().
  */
 function shortcut_schema() {
-  $schema['shortcut_set_users'] = array(
+  $schema['shortcut_set_users'] = [
     'description' => 'Maps users to shortcut sets.',
-    'fields' => array(
-      'uid' => array(
+    'fields' => [
+      'uid' => [
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'description' => 'The {users}.uid for this set.',
-      ),
-      'set_name' => array(
+      ],
+      'set_name' => [
         'type' => 'varchar_ascii',
         'length' => 32,
         'not null' => TRUE,
         'default' => '',
         'description' => "The {shortcut_set}.set_name that will be displayed for this user.",
-      ),
-    ),
-    'primary key' => array('uid'),
-    'indexes' => array(
-      'set_name' => array('set_name'),
-    ),
-    'foreign keys' => array(
-      'set_user' => array(
+      ],
+    ],
+    'primary key' => ['uid'],
+    'indexes' => [
+      'set_name' => ['set_name'],
+    ],
+    'foreign keys' => [
+      'set_user' => [
         'table' => 'users',
-        'columns' => array('uid' => 'uid'),
-      ),
-      'set_name' => array(
+        'columns' => ['uid' => 'uid'],
+      ],
+      'set_name' => [
         'table' => 'shortcut_set',
-        'columns' => array('set_name' => 'set_name'),
-      ),
-    ),
-  );
+        'columns' => ['set_name' => 'set_name'],
+      ],
+    ],
+  ];
 
   return $schema;
 }
diff --git a/web/core/modules/shortcut/shortcut.module b/web/core/modules/shortcut/shortcut.module
index b7294ad65..8ace7bdb1 100644
--- a/web/core/modules/shortcut/shortcut.module
+++ b/web/core/modules/shortcut/shortcut.module
@@ -20,16 +20,16 @@ function shortcut_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.shortcut':
       $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Shortcut module allows users to create sets of <em>shortcut</em> links to commonly-visited pages of the site. Shortcuts are contained within <em>sets</em>. Each user with <em>Select any shortcut set</em> permission can select a shortcut set created by anyone at the site. For more information, see the <a href=":shortcut">online documentation for the Shortcut module</a>.', array(':shortcut' => 'https://www.drupal.org/documentation/modules/shortcut')) . '</p>';
+      $output .= '<p>' . t('The Shortcut module allows users to create sets of <em>shortcut</em> links to commonly-visited pages of the site. Shortcuts are contained within <em>sets</em>. Each user with <em>Select any shortcut set</em> permission can select a shortcut set created by anyone at the site. For more information, see the <a href=":shortcut">online documentation for the Shortcut module</a>.', [':shortcut' => 'https://www.drupal.org/documentation/modules/shortcut']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl><dt>' . t('Administering shortcuts') . '</dt>';
-      $output .= '<dd>' . t('Users with the <em>Administer shortcuts</em> permission can manage shortcut sets and edit the shortcuts within sets from the <a href=":shortcuts">Shortcuts administration page</a>.', array(':shortcuts' => \Drupal::url('entity.shortcut_set.collection'))) . '</dd>';
+      $output .= '<dd>' . t('Users with the <em>Administer shortcuts</em> permission can manage shortcut sets and edit the shortcuts within sets from the <a href=":shortcuts">Shortcuts administration page</a>.', [':shortcuts' => \Drupal::url('entity.shortcut_set.collection')]) . '</dd>';
       $output .= '<dt>' . t('Choosing shortcut sets') . '</dt>';
       $output .= '<dd>' . t('Users with permission to switch shortcut sets can choose a shortcut set to use from the Shortcuts tab of their user account page.') . '</dd>';
       $output .= '<dt>' . t('Adding and removing shortcuts') . '</dt>';
       $output .= '<dd>' . t('The Shortcut module creates an add/remove link for each page on your site; the link lets you add or remove the current page from the currently-enabled set of shortcuts (if your theme displays it and you have permission to edit your shortcut set). The core Seven administration theme displays this link next to the page title, as a grey or yellow star. If you click on the grey star, you will add that page to your preferred set of shortcuts. If the page is already part of your shortcut set, the link will be a yellow star, and will allow you to remove the current page from your shortcut set.') . '</dd>';
       $output .= '<dt>' . t('Displaying shortcuts') . '</dt>';
-      $output .= '<dd>' . t('You can display your shortcuts by enabling the <em>Shortcuts</em> block on the <a href=":blocks">Blocks administration page</a>. Certain administrative modules also display your shortcuts; for example, the core <a href=":toolbar-help">Toolbar module</a> provides a corresponding menu item.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', ':toolbar-help' => (\Drupal::moduleHandler()->moduleExists('toolbar')) ? \Drupal::url('help.page', array('name' => 'toolbar')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('You can display your shortcuts by enabling the <em>Shortcuts</em> block on the <a href=":blocks">Blocks administration page</a>. Certain administrative modules also display your shortcuts; for example, the core <a href=":toolbar-help">Toolbar module</a> provides a corresponding menu item.', [':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#', ':toolbar-help' => (\Drupal::moduleHandler()->moduleExists('toolbar')) ? \Drupal::url('help.page', ['name' => 'toolbar']) : '#']) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -38,7 +38,7 @@ function shortcut_help($route_name, RouteMatchInterface $route_match) {
     case 'entity.shortcut_set.edit_form':
       $user = \Drupal::currentUser();
       if ($user->hasPermission('access shortcuts') && $user->hasPermission('switch shortcut sets')) {
-        $output = '<p>' . t('Define which shortcut set you are using on the <a href=":shortcut-link">Shortcuts tab</a> of your account page.', array(':shortcut-link' => \Drupal::url('shortcut.set_switch', array('user' => $user->id())))) . '</p>';
+        $output = '<p>' . t('Define which shortcut set you are using on the <a href=":shortcut-link">Shortcuts tab</a> of your account page.', [':shortcut-link' => \Drupal::url('shortcut.set_switch', ['user' => $user->id()])]) . '</p>';
         return $output;
       }
   }
@@ -65,7 +65,11 @@ function shortcut_set_edit_access(ShortcutSetInterface $shortcut_set = NULL) {
   // Sufficiently-privileged users can edit their currently displayed shortcut
   // set, but not other sets. They must also be able to access shortcuts.
   $may_edit_current_shortcut_set = $account->hasPermission('customize shortcut links') && (!isset($shortcut_set) || $shortcut_set == shortcut_current_displayed_set()) && $account->hasPermission('access shortcuts');
-  return AccessResult::allowedIf($may_edit_current_shortcut_set)->cachePerPermissions();
+  $result = AccessResult::allowedIf($may_edit_current_shortcut_set)->cachePerPermissions();
+  if (!$result->isAllowed()) {
+    $result->setReason("The shortcut set must be the currently displayed set for the user and the user must have 'access shortcuts' AND 'customize shortcut links' permissions.");
+  }
+  return $result;
 }
 
 /**
@@ -162,7 +166,7 @@ function shortcut_set_unassign_user($account) {
  *   the default set is returned.
  */
 function shortcut_current_displayed_set($account = NULL) {
-  $shortcut_sets = &drupal_static(__FUNCTION__, array());
+  $shortcut_sets = &drupal_static(__FUNCTION__, []);
   $user = \Drupal::currentUser();
   if (!isset($account)) {
     $account = $user;
@@ -209,7 +213,7 @@ function shortcut_default_set($account = NULL) {
   // have one, we allow the last module which returns a valid result to take
   // precedence. If no module returns a valid set, fall back on the site-wide
   // default, which is the lowest-numbered shortcut set.
-  $suggestions = array_reverse(\Drupal::moduleHandler()->invokeAll('shortcut_default_set', array($account)));
+  $suggestions = array_reverse(\Drupal::moduleHandler()->invokeAll('shortcut_default_set', [$account]));
   $suggestions[] = 'default';
   foreach ($suggestions as $name) {
     if ($shortcut_set = ShortcutSet::load($name)) {
@@ -252,37 +256,37 @@ function shortcut_set_title_exists($title) {
  *   An array of shortcut links, in the format returned by the menu system.
  */
 function shortcut_renderable_links($shortcut_set = NULL) {
-  $shortcut_links = array();
+  $shortcut_links = [];
 
   if (!isset($shortcut_set)) {
     $shortcut_set = shortcut_current_displayed_set();
   }
 
-  $cache_tags = array();
+  $cache_tags = [];
   foreach ($shortcut_set->getShortcuts() as $shortcut) {
     $shortcut = \Drupal::entityManager()->getTranslationFromContext($shortcut);
     $url = $shortcut->getUrl();
     if ($url->access()) {
-      $links[$shortcut->id()] = array(
+      $links[$shortcut->id()] = [
         'type' => 'link',
         'title' => $shortcut->label(),
         'url' => $shortcut->getUrl(),
-      );
+      ];
       $cache_tags = Cache::mergeTags($cache_tags, $shortcut->getCacheTags());
     }
   }
 
   if (!empty($links)) {
-    $shortcut_links = array(
+    $shortcut_links = [
       '#theme' => 'links__toolbar_shortcuts',
       '#links' => $links,
-      '#attributes' => array(
-        'class' => array('toolbar-menu'),
-      ),
-      '#cache' => array(
+      '#attributes' => [
+        'class' => ['toolbar-menu'],
+      ],
+      '#cache' => [
         'tags' => $cache_tags,
-      ),
-    );
+      ],
+    ];
   }
 
   return $shortcut_links;
@@ -313,15 +317,15 @@ function shortcut_preprocess_page_title(&$variables) {
     // string form, so we can set the default name for the shortcut.
     // Strip HTML tags from the title.
     $name = trim(strip_tags(render($variables['title'])));
-    $query = array(
+    $query = [
       'link' => $link,
       'name' => $name,
-    );
+    ];
 
     $shortcut_set = shortcut_current_displayed_set();
 
     // Check if $link is already a shortcut and set $link_mode accordingly.
-    $shortcuts = \Drupal::entityManager()->getStorage('shortcut')->loadByProperties(array('shortcut_set' => $shortcut_set->id()));
+    $shortcuts = \Drupal::entityManager()->getStorage('shortcut')->loadByProperties(['shortcut_set' => $shortcut_set->id()]);
     /** @var \Drupal\shortcut\ShortcutInterface $shortcut */
     foreach ($shortcuts as $shortcut) {
       if (($shortcut_url = $shortcut->getUrl()) && $shortcut_url->isRouted() && $shortcut_url->getRouteName() == $route_match->getRouteName() && $shortcut_url->getRouteParameters() == $route_match->getRawParameters()->all()) {
@@ -332,36 +336,36 @@ function shortcut_preprocess_page_title(&$variables) {
     $link_mode = isset($shortcut_id) ? "remove" : "add";
 
     if ($link_mode == "add") {
-      $link_text = shortcut_set_switch_access()->isAllowed() ? t('Add to %shortcut_set shortcuts', array('%shortcut_set' => $shortcut_set->label())) : t('Add to shortcuts');
+      $link_text = shortcut_set_switch_access()->isAllowed() ? t('Add to %shortcut_set shortcuts', ['%shortcut_set' => $shortcut_set->label()]) : t('Add to shortcuts');
       $route_name = 'shortcut.link_add_inline';
-      $route_parameters = array('shortcut_set' => $shortcut_set->id());
+      $route_parameters = ['shortcut_set' => $shortcut_set->id()];
     }
     else {
       $query['id'] = $shortcut_id;
-      $link_text = shortcut_set_switch_access()->isAllowed() ? t('Remove from %shortcut_set shortcuts', array('%shortcut_set' => $shortcut_set->label())) : t('Remove from shortcuts');
+      $link_text = shortcut_set_switch_access()->isAllowed() ? t('Remove from %shortcut_set shortcuts', ['%shortcut_set' => $shortcut_set->label()]) : t('Remove from shortcuts');
       $route_name = 'entity.shortcut.link_delete_inline';
-      $route_parameters = array('shortcut' => $shortcut_id);
+      $route_parameters = ['shortcut' => $shortcut_id];
     }
 
     if (theme_get_setting('third_party_settings.shortcut.module_link')) {
       $query += \Drupal::destination()->getAsArray();
-      $variables['title_suffix']['add_or_remove_shortcut'] = array(
-        '#attached' => array(
-          'library' => array(
+      $variables['title_suffix']['add_or_remove_shortcut'] = [
+        '#attached' => [
+          'library' => [
             'shortcut/drupal.shortcut',
-          ),
-        ),
+          ],
+        ],
         '#type' => 'link',
-        '#title' => SafeMarkup::format('<span class="shortcut-action__icon"></span><span class="shortcut-action__message">@text</span>', array('@text' => $link_text)),
+        '#title' => SafeMarkup::format('<span class="shortcut-action__icon"></span><span class="shortcut-action__message">@text</span>', ['@text' => $link_text]),
         '#url' => Url::fromRoute($route_name, $route_parameters),
-        '#options' => array('query' => $query),
-        '#attributes' => array(
-          'class' => array(
+        '#options' => ['query' => $query],
+        '#attributes' => [
+          'class' => [
             'shortcut-action',
             'shortcut-action--' . $link_mode,
-          ),
-        ),
-      );
+          ],
+        ],
+      ];
     }
   }
 }
@@ -390,37 +394,37 @@ function shortcut_toolbar() {
     \Drupal::service('renderer')->addCacheableDependency($items['shortcuts'], $shortcut_set);
     $configure_link = NULL;
     if (shortcut_set_edit_access($shortcut_set)->isAllowed()) {
-      $configure_link = array(
+      $configure_link = [
         '#type' => 'link',
         '#title' => t('Edit shortcuts'),
         '#url' => Url::fromRoute('entity.shortcut_set.customize_form', ['shortcut_set' => $shortcut_set->id()]),
-        '#options' => array('attributes' => array('class' => array('edit-shortcuts'))),
-      );
+        '#options' => ['attributes' => ['class' => ['edit-shortcuts']]],
+      ];
     }
     if (!empty($links) || !empty($configure_link)) {
-      $items['shortcuts'] += array(
+      $items['shortcuts'] += [
         '#type' => 'toolbar_item',
-        'tab' => array(
+        'tab' => [
           '#type' => 'link',
           '#title' => t('Shortcuts'),
           '#url' => $shortcut_set->urlInfo('collection'),
-          '#attributes' => array(
+          '#attributes' => [
             'title' => t('Shortcuts'),
-            'class' => array('toolbar-icon', 'toolbar-icon-shortcut'),
-          ),
-        ),
-        'tray' => array(
+            'class' => ['toolbar-icon', 'toolbar-icon-shortcut'],
+          ],
+        ],
+        'tray' => [
           '#heading' => t('User-defined shortcuts'),
           'shortcuts' => $links,
           'configure' => $configure_link,
-        ),
+        ],
         '#weight' => -10,
-        '#attached' => array(
-          'library' => array(
+        '#attached' => [
+          'library' => [
             'shortcut/drupal.shortcut',
-          ),
-        ),
-      );
+          ],
+        ],
+      ];
     }
   }
 
diff --git a/web/core/modules/shortcut/src/Controller/ShortcutController.php b/web/core/modules/shortcut/src/Controller/ShortcutController.php
index ff0e184c9..4f33b0b55 100644
--- a/web/core/modules/shortcut/src/Controller/ShortcutController.php
+++ b/web/core/modules/shortcut/src/Controller/ShortcutController.php
@@ -21,7 +21,7 @@ class ShortcutController extends ControllerBase {
    *   The shortcut add form.
    */
   public function addForm(ShortcutSetInterface $shortcut_set) {
-    $shortcut = $this->entityManager()->getStorage('shortcut')->create(array('shortcut_set' => $shortcut_set->id()));
+    $shortcut = $this->entityManager()->getStorage('shortcut')->create(['shortcut_set' => $shortcut_set->id()]);
     return $this->entityFormBuilder()->getForm($shortcut, 'add');
   }
 
@@ -40,10 +40,10 @@ class ShortcutController extends ControllerBase {
 
     try {
       $shortcut->delete();
-      drupal_set_message($this->t('The shortcut %title has been deleted.', array('%title' => $label)));
+      drupal_set_message($this->t('The shortcut %title has been deleted.', ['%title' => $label]));
     }
     catch (\Exception $e) {
-      drupal_set_message($this->t('Unable to delete the shortcut for %title.', array('%title' => $label)), 'error');
+      drupal_set_message($this->t('Unable to delete the shortcut for %title.', ['%title' => $label]), 'error');
     }
 
     return $this->redirect('<front>');
diff --git a/web/core/modules/shortcut/src/Controller/ShortcutSetController.php b/web/core/modules/shortcut/src/Controller/ShortcutSetController.php
index 8d84f9abe..58a68d70e 100644
--- a/web/core/modules/shortcut/src/Controller/ShortcutSetController.php
+++ b/web/core/modules/shortcut/src/Controller/ShortcutSetController.php
@@ -55,20 +55,20 @@ class ShortcutSetController extends ControllerBase {
     $link = $request->query->get('link');
     $name = $request->query->get('name');
     if (parse_url($link, PHP_URL_SCHEME) === NULL && $this->pathValidator->isValid($link)) {
-      $shortcut = $this->entityManager()->getStorage('shortcut')->create(array(
+      $shortcut = $this->entityManager()->getStorage('shortcut')->create([
         'title' => $name,
         'shortcut_set' => $shortcut_set->id(),
-        'link' => array(
+        'link' => [
           'uri' => 'internal:/' . $link,
-        ),
-      ));
+        ],
+      ]);
 
       try {
         $shortcut->save();
-        drupal_set_message($this->t('Added a shortcut for %title.', array('%title' => $shortcut->label())));
+        drupal_set_message($this->t('Added a shortcut for %title.', ['%title' => $shortcut->label()]));
       }
       catch (\Exception $e) {
-        drupal_set_message($this->t('Unable to add a shortcut for %title.', array('%title' => $shortcut->label())), 'error');
+        drupal_set_message($this->t('Unable to add a shortcut for %title.', ['%title' => $shortcut->label()]), 'error');
       }
 
       return $this->redirect('<front>');
diff --git a/web/core/modules/shortcut/src/Entity/Shortcut.php b/web/core/modules/shortcut/src/Entity/Shortcut.php
index 6ddaf0537..87e2ccb91 100644
--- a/web/core/modules/shortcut/src/Entity/Shortcut.php
+++ b/web/core/modules/shortcut/src/Entity/Shortcut.php
@@ -123,13 +123,13 @@ class Shortcut extends ContentEntityBase implements ShortcutInterface {
       ->setRequired(TRUE)
       ->setTranslatable(TRUE)
       ->setSetting('max_length', 255)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -10,
-        'settings' => array(
+        'settings' => [
           'size' => 40,
-        ),
-      ));
+        ],
+      ]);
 
     $fields['weight'] = BaseFieldDefinition::create('integer')
       ->setLabel(t('Weight'))
@@ -139,14 +139,14 @@ class Shortcut extends ContentEntityBase implements ShortcutInterface {
       ->setLabel(t('Path'))
       ->setDescription(t('The location this shortcut points to.'))
       ->setRequired(TRUE)
-      ->setSettings(array(
+      ->setSettings([
         'link_type' => LinkItemInterface::LINK_INTERNAL,
         'title' => DRUPAL_DISABLED,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'link_default',
         'weight' => 0,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     return $fields;
diff --git a/web/core/modules/shortcut/src/Entity/ShortcutSet.php b/web/core/modules/shortcut/src/Entity/ShortcutSet.php
index 7b42310e5..3d3815db7 100644
--- a/web/core/modules/shortcut/src/Entity/ShortcutSet.php
+++ b/web/core/modules/shortcut/src/Entity/ShortcutSet.php
@@ -116,8 +116,8 @@ class ShortcutSet extends ConfigEntityBundleBase implements ShortcutSetInterface
    * {@inheritdoc}
    */
   public function getShortcuts() {
-    $shortcuts = \Drupal::entityManager()->getStorage('shortcut')->loadByProperties(array('shortcut_set' => $this->id()));
-    uasort($shortcuts, array('\Drupal\shortcut\Entity\Shortcut', 'sort'));
+    $shortcuts = \Drupal::entityManager()->getStorage('shortcut')->loadByProperties(['shortcut_set' => $this->id()]);
+    uasort($shortcuts, ['\Drupal\shortcut\Entity\Shortcut', 'sort']);
     return $shortcuts;
   }
 
diff --git a/web/core/modules/shortcut/src/Form/SetCustomize.php b/web/core/modules/shortcut/src/Form/SetCustomize.php
index 89e512320..6c9757782 100644
--- a/web/core/modules/shortcut/src/Form/SetCustomize.php
+++ b/web/core/modules/shortcut/src/Form/SetCustomize.php
@@ -23,24 +23,24 @@ class SetCustomize extends EntityForm {
    */
   public function form(array $form, FormStateInterface $form_state) {
     $form = parent::form($form, $form_state);
-    $form['shortcuts'] = array(
+    $form['shortcuts'] = [
       '#tree' => TRUE,
       '#weight' => -20,
-    );
+    ];
 
-    $form['shortcuts']['links'] = array(
+    $form['shortcuts']['links'] = [
       '#type' => 'table',
-      '#header' => array(t('Name'), t('Weight'), t('Operations')),
-      '#empty' => $this->t('No shortcuts available. <a href=":link">Add a shortcut</a>', array(':link' => $this->url('shortcut.link_add', array('shortcut_set' => $this->entity->id())))),
-      '#attributes' => array('id' => 'shortcuts'),
-      '#tabledrag' => array(
-        array(
+      '#header' => [t('Name'), t('Weight'), t('Operations')],
+      '#empty' => $this->t('No shortcuts available. <a href=":link">Add a shortcut</a>', [':link' => $this->url('shortcut.link_add', ['shortcut_set' => $this->entity->id()])]),
+      '#attributes' => ['id' => 'shortcuts'],
+      '#tabledrag' => [
+        [
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'shortcut-weight',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     foreach ($this->entity->getShortcuts() as $shortcut) {
       $id = $shortcut->id();
@@ -49,33 +49,33 @@ class SetCustomize extends EntityForm {
         continue;
       }
       $form['shortcuts']['links'][$id]['#attributes']['class'][] = 'draggable';
-      $form['shortcuts']['links'][$id]['name'] = array(
+      $form['shortcuts']['links'][$id]['name'] = [
         '#type' => 'link',
         '#title' => $shortcut->getTitle(),
-      ) + $url->toRenderArray();
+      ] + $url->toRenderArray();
       unset($form['shortcuts']['links'][$id]['name']['#access_callback']);
       $form['shortcuts']['links'][$id]['#weight'] = $shortcut->getWeight();
-      $form['shortcuts']['links'][$id]['weight'] = array(
+      $form['shortcuts']['links'][$id]['weight'] = [
         '#type' => 'weight',
-        '#title' => t('Weight for @title', array('@title' => $shortcut->getTitle())),
+        '#title' => t('Weight for @title', ['@title' => $shortcut->getTitle()]),
         '#title_display' => 'invisible',
         '#default_value' => $shortcut->getWeight(),
-        '#attributes' => array('class' => array('shortcut-weight')),
-      );
+        '#attributes' => ['class' => ['shortcut-weight']],
+      ];
 
-      $links['edit'] = array(
+      $links['edit'] = [
         'title' => t('Edit'),
         'url' => $shortcut->urlInfo(),
-      );
-      $links['delete'] = array(
+      ];
+      $links['delete'] = [
         'title' => t('Delete'),
         'url' => $shortcut->urlInfo('delete-form'),
-      );
-      $form['shortcuts']['links'][$id]['operations'] = array(
+      ];
+      $form['shortcuts']['links'][$id]['operations'] = [
         '#type' => 'operations',
         '#links' => $links,
         '#access' => $url->access(),
-      );
+      ];
     }
     return $form;
   }
@@ -85,14 +85,14 @@ class SetCustomize extends EntityForm {
    */
   protected function actions(array $form, FormStateInterface $form_state) {
     // Only includes a Save action for the entity, no direct Delete button.
-    return array(
-      'submit' => array(
+    return [
+      'submit' => [
         '#type' => 'submit',
         '#value' => t('Save'),
         '#access' => (bool) Element::getVisibleChildren($form['shortcuts']['links']),
-        '#submit' => array('::submitForm', '::save'),
-      ),
-    );
+        '#submit' => ['::submitForm', '::save'],
+      ],
+    ];
   }
 
   /**
@@ -100,7 +100,7 @@ class SetCustomize extends EntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     foreach ($this->entity->getShortcuts() as $shortcut) {
-      $weight = $form_state->getValue(array('shortcuts', 'links', $shortcut->id(), 'weight'));
+      $weight = $form_state->getValue(['shortcuts', 'links', $shortcut->id(), 'weight']);
       $shortcut->setWeight($weight);
       $shortcut->save();
     }
diff --git a/web/core/modules/shortcut/src/Form/ShortcutDeleteForm.php b/web/core/modules/shortcut/src/Form/ShortcutDeleteForm.php
index aee678801..fcabeec7e 100644
--- a/web/core/modules/shortcut/src/Form/ShortcutDeleteForm.php
+++ b/web/core/modules/shortcut/src/Form/ShortcutDeleteForm.php
@@ -21,9 +21,9 @@ class ShortcutDeleteForm extends ContentEntityDeleteForm {
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('entity.shortcut_set.customize_form', array(
+    return new Url('entity.shortcut_set.customize_form', [
       'shortcut_set' => $this->entity->bundle(),
-    ));
+    ]);
   }
 
   /**
diff --git a/web/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php b/web/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php
index 3c732d6bc..c383627b8 100644
--- a/web/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php
+++ b/web/core/modules/shortcut/src/Form/ShortcutSetDeleteForm.php
@@ -65,9 +65,9 @@ class ShortcutSetDeleteForm extends EntityDeleteForm {
       $info .= '<p>' . t('If you have chosen this shortcut set as the default for some or all users, they may also be affected by deleting it.') . '</p>';
     }
 
-    $form['info'] = array(
+    $form['info'] = [
       '#markup' => $info,
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/shortcut/src/Form/SwitchShortcutSet.php b/web/core/modules/shortcut/src/Form/SwitchShortcutSet.php
index 220f49b9f..649cef765 100644
--- a/web/core/modules/shortcut/src/Form/SwitchShortcutSet.php
+++ b/web/core/modules/shortcut/src/Form/SwitchShortcutSet.php
@@ -77,60 +77,60 @@ class SwitchShortcutSet extends FormBase {
 
     $account_is_user = $this->user->id() == $account->id();
     if (count($options) > 1) {
-      $form['set'] = array(
+      $form['set'] = [
         '#type' => 'radios',
         '#title' => $account_is_user ? $this->t('Choose a set of shortcuts to use') : $this->t('Choose a set of shortcuts for this user'),
         '#options' => $options,
         '#default_value' => $current_set->id(),
-      );
+      ];
 
-      $form['label'] = array(
+      $form['label'] = [
         '#type' => 'textfield',
         '#title' => $this->t('Label'),
         '#description' => $this->t('The new set is created by copying items from your default shortcut set.'),
         '#access' => $add_access,
-        '#states' => array(
-          'visible' => array(
-            ':input[name="set"]' => array('value' => 'new'),
-          ),
-          'required' => array(
-            ':input[name="set"]' => array('value' => 'new'),
-          ),
-        ),
-      );
-      $form['id'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="set"]' => ['value' => 'new'],
+          ],
+          'required' => [
+            ':input[name="set"]' => ['value' => 'new'],
+          ],
+        ],
+      ];
+      $form['id'] = [
         '#type' => 'machine_name',
-        '#machine_name' => array(
-          'exists' => array($this, 'exists'),
+        '#machine_name' => [
+          'exists' => [$this, 'exists'],
           'replace_pattern' => '[^a-z0-9-]+',
           'replace' => '-',
-        ),
+        ],
         // This ID could be used for menu name.
         '#maxlength' => 23,
-        '#states' => array(
-          'required' => array(
-            ':input[name="set"]' => array('value' => 'new'),
-          ),
-        ),
+        '#states' => [
+          'required' => [
+            ':input[name="set"]' => ['value' => 'new'],
+          ],
+        ],
         '#required' => FALSE,
-      );
+      ];
 
       if (!$account_is_user) {
         $default_set = $this->shortcutSetStorage->getDefaultSet($this->user);
-        $form['new']['#description'] = $this->t('The new set is created by copying items from the %default set.', array('%default' => $default_set->label()));
+        $form['new']['#description'] = $this->t('The new set is created by copying items from the %default set.', ['%default' => $default_set->label()]);
       }
 
-      $form['actions'] = array('#type' => 'actions');
-      $form['actions']['submit'] = array(
+      $form['actions'] = ['#type' => 'actions'];
+      $form['actions']['submit'] = [
         '#type' => 'submit',
         '#value' => $this->t('Change set'),
-      );
+      ];
     }
     else {
       // There is only 1 option, so output a message in the $form array.
-      $form['info'] = array(
-        '#markup' => '<p>' . $this->t('You are currently using the %set-name shortcut set.', array('%set-name' => $current_set->label())) . '</p>',
-      );
+      $form['info'] = [
+        '#markup' => '<p>' . $this->t('You are currently using the %set-name shortcut set.', ['%set-name' => $current_set->label()]) . '</p>',
+      ];
     }
 
     return $form;
@@ -173,16 +173,16 @@ class SwitchShortcutSet extends FormBase {
     if ($form_state->getValue('set') == 'new') {
       // Save a new shortcut set with links copied from the user's default set.
       /* @var \Drupal\shortcut\Entity\ShortcutSet $set */
-      $set = $this->shortcutSetStorage->create(array(
+      $set = $this->shortcutSetStorage->create([
         'id' => $form_state->getValue('id'),
         'label' => $form_state->getValue('label'),
-      ));
+      ]);
       $set->save();
-      $replacements = array(
+      $replacements = [
         '%user' => $this->user->label(),
         '%set_name' => $set->label(),
         ':switch-url' => $this->url('<current>'),
-      );
+      ];
       if ($account_is_user) {
         // Only administrators can create new shortcut sets, so we know they have
         // access to switch back.
@@ -193,17 +193,17 @@ class SwitchShortcutSet extends FormBase {
       }
       $form_state->setRedirect(
         'entity.shortcut_set.customize_form',
-        array('shortcut_set' => $set->id())
+        ['shortcut_set' => $set->id()]
       );
     }
     else {
       // Switch to a different shortcut set.
       /* @var \Drupal\shortcut\Entity\ShortcutSet $set */
       $set = $this->shortcutSetStorage->load($form_state->getValue('set'));
-      $replacements = array(
+      $replacements = [
         '%user' => $this->user->getDisplayName(),
         '%set_name' => $set->label(),
-      );
+      ];
       drupal_set_message($account_is_user ? $this->t('You are now using the %set_name shortcut set.', $replacements) : $this->t('%user is now using the %set_name shortcut set.', $replacements));
     }
 
diff --git a/web/core/modules/shortcut/src/Plugin/Block/ShortcutsBlock.php b/web/core/modules/shortcut/src/Plugin/Block/ShortcutsBlock.php
index 1678f6aae..ab2d57e41 100644
--- a/web/core/modules/shortcut/src/Plugin/Block/ShortcutsBlock.php
+++ b/web/core/modules/shortcut/src/Plugin/Block/ShortcutsBlock.php
@@ -21,9 +21,9 @@ class ShortcutsBlock extends BlockBase {
    * {@inheritdoc}
    */
   public function build() {
-    return array(
+    return [
       shortcut_renderable_links(shortcut_current_displayed_set()),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php b/web/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php
index cd86f0f5e..0cb843be7 100644
--- a/web/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php
+++ b/web/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php
@@ -60,14 +60,14 @@ class ShortcutSetUsers extends DestinationBase implements ContainerFactoryPlugin
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'set_name' => array(
+    return [
+      'set_name' => [
         'type' => 'string',
-      ),
-      'uid' => array(
+      ],
+      'uid' => [
         'type' => 'integer',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -83,14 +83,14 @@ class ShortcutSetUsers extends DestinationBase implements ContainerFactoryPlugin
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     /** @var \Drupal\shortcut\ShortcutSetInterface $set */
     $set = $this->shortcutSetStorage->load($row->getDestinationProperty('set_name'));
     /** @var \Drupal\user\UserInterface $account */
     $account = User::load($row->getDestinationProperty('uid'));
     $this->shortcutSetStorage->assignUser($set, $account);
 
-    return array($set->id(), $account->id());
+    return [$set->id(), $account->id()];
   }
 
 }
diff --git a/web/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php b/web/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php
index c964e5c46..444c38feb 100644
--- a/web/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php
+++ b/web/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php
@@ -19,7 +19,7 @@ class Shortcut extends DrupalSqlBase {
    */
   public function query() {
     return $this->select('menu_links', 'ml')
-      ->fields('ml', array('mlid', 'menu_name', 'link_path', 'link_title', 'weight'))
+      ->fields('ml', ['mlid', 'menu_name', 'link_path', 'link_title', 'weight'])
       ->condition('hidden', '0')
       ->condition('menu_name', 'shortcut-set-%', 'LIKE')
       ->orderBy('ml.mlid');
@@ -29,13 +29,13 @@ class Shortcut extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'mlid' => $this->t("The menu.mlid primary key for this menu item (= shortcut link)."),
       'menu_name' => $this->t("The menu_name (= set name) for this shortcut link."),
       'link_path' => $this->t("The link for this shortcut."),
       'link_title' => $this->t("The title for this shortcut."),
       'weight' => $this->t("The weight for this shortcut"),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSet.php b/web/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSet.php
index 75f145433..a088ca8ef 100644
--- a/web/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSet.php
+++ b/web/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSet.php
@@ -25,10 +25,10 @@ class ShortcutSet extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'set_name' => $this->t("The name under which the set's links are stored."),
       'title' => $this->t("The title of the set."),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSetUsers.php b/web/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSetUsers.php
index dd5a13fc8..b86dccde1 100644
--- a/web/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSetUsers.php
+++ b/web/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSetUsers.php
@@ -25,24 +25,24 @@ class ShortcutSetUsers extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'uid' => $this->t('The users.uid for this set.'),
       'set_name' => $this->t('The shortcut_set.set_name that will be displayed for this user.'),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'set_name' => array(
+    return [
+      'set_name' => [
         'type' => 'string',
-      ),
-      'uid' => array(
+      ],
+      'uid' => [
         'type' => 'integer',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/shortcut/src/ShortcutForm.php b/web/core/modules/shortcut/src/ShortcutForm.php
index b87db1bce..bfe3133e4 100644
--- a/web/core/modules/shortcut/src/ShortcutForm.php
+++ b/web/core/modules/shortcut/src/ShortcutForm.php
@@ -35,16 +35,16 @@ class ShortcutForm extends ContentEntityForm {
     }
 
     if ($status == SAVED_UPDATED) {
-      $message = $this->t('The shortcut %link has been updated.', array('%link' => $view_link));
+      $message = $this->t('The shortcut %link has been updated.', ['%link' => $view_link]);
     }
     else {
-      $message = $this->t('Added a shortcut for %title.', array('%title' => $view_link));
+      $message = $this->t('Added a shortcut for %title.', ['%title' => $view_link]);
     }
     drupal_set_message($message);
 
     $form_state->setRedirect(
       'entity.shortcut_set.customize_form',
-      array('shortcut_set' => $entity->bundle())
+      ['shortcut_set' => $entity->bundle()]
     );
   }
 
diff --git a/web/core/modules/shortcut/src/ShortcutSetForm.php b/web/core/modules/shortcut/src/ShortcutSetForm.php
index 012de5fa6..721d2517d 100644
--- a/web/core/modules/shortcut/src/ShortcutSetForm.php
+++ b/web/core/modules/shortcut/src/ShortcutSetForm.php
@@ -17,25 +17,25 @@ class ShortcutSetForm extends BundleEntityFormBase {
     $form = parent::form($form, $form_state);
 
     $entity = $this->entity;
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => t('Set name'),
       '#description' => t('The new set is created by copying items from your default shortcut set.'),
       '#required' => TRUE,
       '#default_value' => $entity->label(),
-    );
-    $form['id'] = array(
+    ];
+    $form['id'] = [
       '#type' => 'machine_name',
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => '\Drupal\shortcut\Entity\ShortcutSet::load',
-        'source' => array('label'),
+        'source' => ['label'],
         'replace_pattern' => '[^a-z0-9-]+',
         'replace' => '-',
-      ),
+      ],
       '#default_value' => $entity->id(),
       // This id could be used for menu name.
       '#maxlength' => 23,
-    );
+    ];
 
     $form['actions']['submit']['#value'] = t('Create new set');
 
@@ -51,10 +51,10 @@ class ShortcutSetForm extends BundleEntityFormBase {
     $entity->save();
 
     if ($is_new) {
-      drupal_set_message(t('The %set_name shortcut set has been created. You can edit it from this page.', array('%set_name' => $entity->label())));
+      drupal_set_message(t('The %set_name shortcut set has been created. You can edit it from this page.', ['%set_name' => $entity->label()]));
     }
     else {
-      drupal_set_message(t('Updated set name to %set-name.', array('%set-name' => $entity->label())));
+      drupal_set_message(t('Updated set name to %set-name.', ['%set-name' => $entity->label()]));
     }
     $form_state->setRedirectUrl($this->entity->urlInfo('customize-form'));
   }
diff --git a/web/core/modules/shortcut/src/ShortcutSetListBuilder.php b/web/core/modules/shortcut/src/ShortcutSetListBuilder.php
index 0e5d81d8b..2cc582e94 100644
--- a/web/core/modules/shortcut/src/ShortcutSetListBuilder.php
+++ b/web/core/modules/shortcut/src/ShortcutSetListBuilder.php
@@ -30,10 +30,10 @@ class ShortcutSetListBuilder extends ConfigEntityListBuilder {
       $operations['edit']['title'] = t('Edit shortcut set');
     }
 
-    $operations['list'] = array(
+    $operations['list'] = [
       'title' => t('List links'),
       'url' => $entity->urlInfo('customize-form'),
-    );
+    ];
     return $operations;
   }
 
diff --git a/web/core/modules/shortcut/src/ShortcutSetStorage.php b/web/core/modules/shortcut/src/ShortcutSetStorage.php
index d76c0c46c..b136c2fb0 100644
--- a/web/core/modules/shortcut/src/ShortcutSetStorage.php
+++ b/web/core/modules/shortcut/src/ShortcutSetStorage.php
@@ -73,7 +73,7 @@ class ShortcutSetStorage extends ConfigEntityStorage implements ShortcutSetStora
   public function assignUser(ShortcutSetInterface $shortcut_set, $account) {
     db_merge('shortcut_set_users')
       ->key('uid', $account->id())
-      ->fields(array('set_name' => $shortcut_set->id()))
+      ->fields(['set_name' => $shortcut_set->id()])
       ->execute();
     drupal_static_reset('shortcut_current_displayed_set');
   }
@@ -93,7 +93,7 @@ class ShortcutSetStorage extends ConfigEntityStorage implements ShortcutSetStora
    */
   public function getAssignedToUser($account) {
     $query = db_select('shortcut_set_users', 'ssu');
-    $query->fields('ssu', array('set_name'));
+    $query->fields('ssu', ['set_name']);
     $query->condition('ssu.uid', $account->id());
     return $query->execute()->fetchField();
   }
@@ -102,7 +102,7 @@ class ShortcutSetStorage extends ConfigEntityStorage implements ShortcutSetStora
    * {@inheritdoc}
    */
   public function countAssignedUsers(ShortcutSetInterface $shortcut_set) {
-    return db_query('SELECT COUNT(*) FROM {shortcut_set_users} WHERE set_name = :name', array(':name' => $shortcut_set->id()))->fetchField();
+    return db_query('SELECT COUNT(*) FROM {shortcut_set_users} WHERE set_name = :name', [':name' => $shortcut_set->id()])->fetchField();
   }
 
   /**
@@ -113,7 +113,7 @@ class ShortcutSetStorage extends ConfigEntityStorage implements ShortcutSetStora
     // have one, we allow the last module which returns a valid result to take
     // precedence. If no module returns a valid set, fall back on the site-wide
     // default, which is the lowest-numbered shortcut set.
-    $suggestions = array_reverse($this->moduleHandler->invokeAll('shortcut_default_set', array($account)));
+    $suggestions = array_reverse($this->moduleHandler->invokeAll('shortcut_default_set', [$account]));
     $suggestions[] = 'default';
     $shortcut_set = NULL;
     foreach ($suggestions as $name) {
diff --git a/web/core/modules/shortcut/src/Tests/ShortcutLinksTest.php b/web/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
index 679f89bbe..cf4ae0fbe 100644
--- a/web/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
+++ b/web/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
@@ -22,7 +22,7 @@ class ShortcutLinksTest extends ShortcutTestBase {
    *
    * @var array
    */
-  public static $modules = array('router_test', 'views', 'block');
+  public static $modules = ['router_test', 'views', 'block'];
 
   /**
    * {@inheritdoc}
@@ -40,10 +40,10 @@ class ShortcutLinksTest extends ShortcutTestBase {
     $set = $this->set;
 
     // Create an alias for the node so we can test aliases.
-    $path = array(
+    $path = [
       'source' => '/node/' . $this->node->id(),
       'alias' => '/' . $this->randomMachineName(8),
-    );
+    ];
     $this->container->get('path.alias_storage')->save($path['source'], $path['alias']);
 
     // Create some paths to test.
@@ -65,13 +65,13 @@ class ShortcutLinksTest extends ShortcutTestBase {
     // Check that each new shortcut links where it should.
     foreach ($test_cases as $test_path) {
       $title = $this->randomMachineName();
-      $form_data = array(
+      $form_data = [
         'title[0][value]' => $title,
         'link[0][uri]' => $test_path,
-      );
+      ];
       $this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $set->id() . '/add-link', $form_data, t('Save'));
       $this->assertResponse(200);
-      $this->assertText(t('Added a shortcut for @title.', array('@title' => $title)));
+      $this->assertText(t('Added a shortcut for @title.', ['@title' => $title]));
       $saved_set = ShortcutSet::load($set->id());
       $paths = $this->getShortcutInformation($saved_set, 'link');
       $this->assertTrue(in_array('internal:' . $test_path, $paths), 'Shortcut created: ' . $test_path);
@@ -115,10 +115,10 @@ class ShortcutLinksTest extends ShortcutTestBase {
 
     // Create a new shortcut set and add a link to it.
     $this->drupalLogin($this->adminUser);
-    $edit = array(
+    $edit = [
       'label' => $this->randomMachineName(),
       'id' => strtolower($this->randomMachineName()),
-    );
+    ];
     $this->drupalPostForm('admin/config/user-interface/shortcut/add-set', $edit, t('Save'));
     $title = $this->randomMachineName();
     $form_data = [
@@ -133,7 +133,7 @@ class ShortcutLinksTest extends ShortcutTestBase {
    * Tests that the "add to shortcut" and "remove from shortcut" links work.
    */
   public function testShortcutQuickLink() {
-    \Drupal::service('theme_handler')->install(array('seven'));
+    \Drupal::service('theme_handler')->install(['seven']);
     $this->config('system.theme')->set('admin', 'seven')->save();
     $this->config('node.settings')->set('use_admin_theme', '1')->save();
     $this->container->get('router.builder')->rebuild();
@@ -177,7 +177,7 @@ class ShortcutLinksTest extends ShortcutTestBase {
     $this->assertText('Added a shortcut for Create Basic page.');
     // Assure that Article does not have its shortcut indicated as set.
     $this->drupalGet('node/add/article');
-    $link = $this->xpath('//a[normalize-space()=:label]', array(':label' => 'Remove from Default shortcuts'));
+    $link = $this->xpath('//a[normalize-space()=:label]', [':label' => 'Remove from Default shortcuts']);
     $this->assertTrue(empty($link), 'Link Remove to Default shortcuts not found for Create Article page.');
     // Add Shortcut for Article.
     $this->clickLink('Add to Default shortcuts');
@@ -198,11 +198,11 @@ class ShortcutLinksTest extends ShortcutTestBase {
     $this->assertShortcutQuickLink('Add to Default shortcuts');
 
     \Drupal::service('module_installer')->install(['block_content']);
-    BlockContentType::create(array(
+    BlockContentType::create([
       'id' => 'basic',
       'label' => 'Basic block',
       'revision' => FALSE,
-    ))->save();
+    ])->save();
     // Test page with HTML tags in title.
     $this->drupalGet('admin/structure/block/block-content/manage/basic');
     $page_title = new FormattableMarkup('Edit %label custom block type', ['%label' => 'Basic block']);
@@ -226,12 +226,12 @@ class ShortcutLinksTest extends ShortcutTestBase {
 
     $shortcuts = $set->getShortcuts();
     $shortcut = reset($shortcuts);
-    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), array('title[0][value]' => $new_link_name), t('Save'));
+    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), ['title[0][value]' => $new_link_name], t('Save'));
     $saved_set = ShortcutSet::load($set->id());
     $titles = $this->getShortcutInformation($saved_set, 'title');
     $this->assertTrue(in_array($new_link_name, $titles), 'Shortcut renamed: ' . $new_link_name);
     $this->assertLink($new_link_name, 0, 'Renamed shortcut link appears on the page.');
-    $this->assertText(t('The shortcut @link has been updated.', array('@link' => $new_link_name)));
+    $this->assertText(t('The shortcut @link has been updated.', ['@link' => $new_link_name]));
   }
 
   /**
@@ -245,12 +245,12 @@ class ShortcutLinksTest extends ShortcutTestBase {
 
     $shortcuts = $set->getShortcuts();
     $shortcut = reset($shortcuts);
-    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), array('title[0][value]' => $shortcut->getTitle(), 'link[0][uri]' => $new_link_path), t('Save'));
+    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), ['title[0][value]' => $shortcut->getTitle(), 'link[0][uri]' => $new_link_path], t('Save'));
     $saved_set = ShortcutSet::load($set->id());
     $paths = $this->getShortcutInformation($saved_set, 'link');
     $this->assertTrue(in_array('internal:' . $new_link_path, $paths), 'Shortcut path changed: ' . $new_link_path);
     $this->assertLinkByHref($new_link_path, 0, 'Shortcut with new path appears on the page.');
-    $this->assertText(t('The shortcut @link has been updated.', array('@link' => $shortcut->getTitle())));
+    $this->assertText(t('The shortcut @link has been updated.', ['@link' => $shortcut->getTitle()]));
   }
 
   /**
@@ -277,7 +277,7 @@ class ShortcutLinksTest extends ShortcutTestBase {
 
     $shortcuts = $set->getShortcuts();
     $shortcut = reset($shortcuts);
-    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id() . '/delete', array(), 'Delete');
+    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id() . '/delete', [], 'Delete');
     $saved_set = ShortcutSet::load($set->id());
     $ids = $this->getShortcutInformation($saved_set, 'id');
     $this->assertFalse(in_array($shortcut->id(), $ids), 'Successfully deleted a shortcut.');
@@ -297,7 +297,7 @@ class ShortcutLinksTest extends ShortcutTestBase {
    */
   public function testNoShortcutLink() {
     // Change to a theme that displays shortcuts.
-    \Drupal::service('theme_handler')->install(array('seven'));
+    \Drupal::service('theme_handler')->install(['seven']);
     $this->config('system.theme')
       ->set('default', 'seven')
       ->save();
@@ -328,7 +328,7 @@ class ShortcutLinksTest extends ShortcutTestBase {
    */
   public function testAccessShortcutsPermission() {
     // Change to a theme that displays shortcuts.
-    \Drupal::service('theme_handler')->install(array('seven'));
+    \Drupal::service('theme_handler')->install(['seven']);
     $this->config('system.theme')
       ->set('default', 'seven')
       ->save();
@@ -340,20 +340,20 @@ class ShortcutLinksTest extends ShortcutTestBase {
 
     // Verify that users without the 'access shortcuts' permission can't see the
     // shortcuts.
-    $this->drupalLogin($this->drupalCreateUser(array('access toolbar')));
+    $this->drupalLogin($this->drupalCreateUser(['access toolbar']));
     $this->assertNoLink('Shortcuts', 'Shortcut link not found on page.');
 
     // Verify that users without the 'administer site configuration' permission
     // can't see the cron shortcuts.
-    $this->drupalLogin($this->drupalCreateUser(array('access toolbar', 'access shortcuts')));
+    $this->drupalLogin($this->drupalCreateUser(['access toolbar', 'access shortcuts']));
     $this->assertNoLink('Shortcuts', 'Shortcut link not found on page.');
     $this->assertNoLink('Cron', 'Cron shortcut link not found on page.');
 
     // Verify that users with the 'access shortcuts' permission can see the
     // shortcuts.
-    $this->drupalLogin($this->drupalCreateUser(array(
+    $this->drupalLogin($this->drupalCreateUser([
       'access toolbar', 'access shortcuts', 'administer site configuration',
-    )));
+    ]));
     $this->clickLink('Shortcuts', 0, 'Shortcut link found on page.');
     $this->assertLink('Cron', 0, 'Cron shortcut link found on page.');
 
@@ -365,7 +365,7 @@ class ShortcutLinksTest extends ShortcutTestBase {
    */
   public function testShortcutLinkOrder() {
     // Ensure to give permissions to access the shortcuts.
-    $this->drupalLogin($this->drupalCreateUser(array('access toolbar', 'access shortcuts', 'access content overview', 'administer content types')));
+    $this->drupalLogin($this->drupalCreateUser(['access toolbar', 'access shortcuts', 'access content overview', 'administer content types']));
     $this->drupalGet(Url::fromRoute('<front>'));
     $shortcuts = $this->cssSelect('#toolbar-item-shortcuts-tray .toolbar-menu a');
     $this->assertEqual((string) $shortcuts[0], 'Add content');
@@ -386,24 +386,24 @@ class ShortcutLinksTest extends ShortcutTestBase {
   private function verifyAccessShortcutsPermissionForEditPages() {
     // Create a user with customize links and switch sets permissions  but
     // without the 'access shortcuts' permission.
-    $test_permissions = array(
+    $test_permissions = [
       'customize shortcut links',
       'switch shortcut sets',
-    );
+    ];
     $noaccess_user = $this->drupalCreateUser($test_permissions);
     $this->drupalLogin($noaccess_user);
 
     // Verify that set administration pages are inaccessible without the
     // 'access shortcuts' permission.
-    $edit_paths = array(
+    $edit_paths = [
       'admin/config/user-interface/shortcut/manage/default/customize',
       'admin/config/user-interface/shortcut/manage/default',
       'user/' . $noaccess_user->id() . '/shortcuts',
-    );
+    ];
 
     foreach ($edit_paths as $path) {
       $this->drupalGet($path);
-      $message = format_string('Access is denied on %s', array('%s' => $path));
+      $message = format_string('Access is denied on %s', ['%s' => $path]);
       $this->assertResponse(403, $message);
     }
   }
@@ -426,7 +426,7 @@ class ShortcutLinksTest extends ShortcutTestBase {
 
     // Verify that users without the 'access shortcuts' permission can see the
     // shortcut block.
-    $this->drupalLogin($this->drupalCreateUser(array()));
+    $this->drupalLogin($this->drupalCreateUser([]));
     $this->drupalGet('');
     $this->assertNoBlockAppears($block);
   }
@@ -454,8 +454,8 @@ class ShortcutLinksTest extends ShortcutTestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertShortcutQuickLink($label, $index = 0, $message = '', $group = 'Other') {
-    $links = $this->xpath('//a[normalize-space()=:label]', array(':label' => $label));
-    $message = ($message ? $message : SafeMarkup::format('Shortcut quick link with label %label found.', array('%label' => $label)));
+    $links = $this->xpath('//a[normalize-space()=:label]', [':label' => $label]);
+    $message = ($message ? $message : SafeMarkup::format('Shortcut quick link with label %label found.', ['%label' => $label]));
     return $this->assert(isset($links[$index]), $message, $group);
   }
 
diff --git a/web/core/modules/shortcut/src/Tests/ShortcutSetsTest.php b/web/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
index 3a0475735..e34518e0a 100644
--- a/web/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
+++ b/web/core/modules/shortcut/src/Tests/ShortcutSetsTest.php
@@ -30,13 +30,13 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests creating a shortcut set.
    */
-  function testShortcutSetAdd() {
+  public function testShortcutSetAdd() {
     $this->drupalGet('admin/config/user-interface/shortcut');
     $this->clickLink(t('Add shortcut set'));
-    $edit = array(
+    $edit = [
       'label' => $this->randomMachineName(),
       'id' => strtolower($this->randomMachineName()),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $new_set = $this->container->get('entity.manager')->getStorage('shortcut_set')->load($edit['id']);
     $this->assertIdentical($new_set->id(), $edit['id'], 'Successfully created a shortcut set.');
@@ -47,7 +47,7 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests editing a shortcut set.
    */
-  function testShortcutSetEdit() {
+  public function testShortcutSetEdit() {
     $set = $this->set;
     $shortcuts = $set->getShortcuts();
 
@@ -66,14 +66,14 @@ class ShortcutSetsTest extends ShortcutTestBase {
     $this->assertEqual(count($elements), 3, 'Correct number of table header cells found.');
 
     // Test the contents of each th cell.
-    $expected_items = array(t('Name'), t('Weight'), t('Operations'));
+    $expected_items = [t('Name'), t('Weight'), t('Operations')];
     foreach ($elements as $key => $element) {
       $this->assertEqual((string) $element[0], $expected_items[$key]);
     }
 
     // Look for test shortcuts in the table.
     $weight = count($shortcuts);
-    $edit = array();
+    $edit = [];
     foreach ($shortcuts as $shortcut) {
       $title = $shortcut->getTitle();
 
@@ -100,12 +100,12 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests switching a user's own shortcut set.
    */
-  function testShortcutSetSwitchOwn() {
+  public function testShortcutSetSwitchOwn() {
     $new_set = $this->generateShortcutSet($this->randomMachineName());
 
     // Attempt to switch the default shortcut set to the newly created shortcut
     // set.
-    $this->drupalPostForm('user/' . $this->adminUser->id() . '/shortcuts', array('set' => $new_set->id()), t('Change set'));
+    $this->drupalPostForm('user/' . $this->adminUser->id() . '/shortcuts', ['set' => $new_set->id()], t('Change set'));
     $this->assertResponse(200);
     $current_set = shortcut_current_displayed_set($this->adminUser);
     $this->assertTrue($new_set->id() == $current_set->id(), 'Successfully switched own shortcut set.');
@@ -114,7 +114,7 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests switching another user's shortcut set.
    */
-  function testShortcutSetAssign() {
+  public function testShortcutSetAssign() {
     $new_set = $this->generateShortcutSet($this->randomMachineName());
 
     \Drupal::entityManager()->getStorage('shortcut_set')->assignUser($new_set, $this->shortcutUser);
@@ -125,12 +125,12 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests switching a user's shortcut set and creating one at the same time.
    */
-  function testShortcutSetSwitchCreate() {
-    $edit = array(
+  public function testShortcutSetSwitchCreate() {
+    $edit = [
       'set' => 'new',
       'id' => strtolower($this->randomMachineName()),
       'label' => $this->randomString(),
-    );
+    ];
     $this->drupalPostForm('user/' . $this->adminUser->id() . '/shortcuts', $edit, t('Change set'));
     $current_set = shortcut_current_displayed_set($this->adminUser);
     $this->assertNotEqual($current_set->id(), $this->set->id(), 'A shortcut set can be switched to at the same time as it is created.');
@@ -140,8 +140,8 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests switching a user's shortcut set without providing a new set name.
    */
-  function testShortcutSetSwitchNoSetName() {
-    $edit = array('set' => 'new');
+  public function testShortcutSetSwitchNoSetName() {
+    $edit = ['set' => 'new'];
     $this->drupalPostForm('user/' . $this->adminUser->id() . '/shortcuts', $edit, t('Change set'));
     $this->assertText(t('The new set label is required.'));
     $current_set = shortcut_current_displayed_set($this->adminUser);
@@ -152,13 +152,13 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests renaming a shortcut set.
    */
-  function testShortcutSetRename() {
+  public function testShortcutSetRename() {
     $set = $this->set;
 
     $new_label = $this->randomMachineName();
     $this->drupalGet('admin/config/user-interface/shortcut');
     $this->clickLink(t('Edit shortcut set'));
-    $this->drupalPostForm(NULL, array('label' => $new_label), t('Save'));
+    $this->drupalPostForm(NULL, ['label' => $new_label], t('Save'));
     $set = ShortcutSet::load($set->id());
     $this->assertTrue($set->label() == $new_label, 'Shortcut set has been successfully renamed.');
   }
@@ -166,7 +166,7 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests unassigning a shortcut set.
    */
-  function testShortcutSetUnassign() {
+  public function testShortcutSetUnassign() {
     $new_set = $this->generateShortcutSet($this->randomMachineName());
 
     $shortcut_set_storage = \Drupal::entityManager()->getStorage('shortcut_set');
@@ -180,10 +180,10 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests deleting a shortcut set.
    */
-  function testShortcutSetDelete() {
+  public function testShortcutSetDelete() {
     $new_set = $this->generateShortcutSet($this->randomMachineName());
 
-    $this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $new_set->id() . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $new_set->id() . '/delete', [], t('Delete'));
     $sets = ShortcutSet::loadMultiple();
     $this->assertFalse(isset($sets[$new_set->id()]), 'Successfully deleted a shortcut set.');
   }
@@ -191,7 +191,7 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests deleting the default shortcut set.
    */
-  function testShortcutSetDeleteDefault() {
+  public function testShortcutSetDeleteDefault() {
     $this->drupalGet('admin/config/user-interface/shortcut/manage/default/delete');
     $this->assertResponse(403);
   }
@@ -199,7 +199,7 @@ class ShortcutSetsTest extends ShortcutTestBase {
   /**
    * Tests creating a new shortcut set with a defined set name.
    */
-  function testShortcutSetCreateWithSetName() {
+  public function testShortcutSetCreateWithSetName() {
     $random_name = $this->randomMachineName();
     $new_set = $this->generateShortcutSet($random_name, $random_name);
     $sets = ShortcutSet::loadMultiple();
diff --git a/web/core/modules/shortcut/src/Tests/ShortcutTestBase.php b/web/core/modules/shortcut/src/Tests/ShortcutTestBase.php
index b32afb29d..1e3196ceb 100644
--- a/web/core/modules/shortcut/src/Tests/ShortcutTestBase.php
+++ b/web/core/modules/shortcut/src/Tests/ShortcutTestBase.php
@@ -17,7 +17,7 @@ abstract class ShortcutTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'toolbar', 'shortcut');
+  public static $modules = ['node', 'toolbar', 'shortcut'];
 
   /**
    * User with permission to administer shortcuts.
@@ -52,37 +52,37 @@ abstract class ShortcutTestBase extends WebTestBase {
 
     if ($this->profile != 'standard') {
       // Create Basic page and Article node types.
-      $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-      $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
 
       // Populate the default shortcut set.
-      $shortcut = Shortcut::create(array(
+      $shortcut = Shortcut::create([
         'shortcut_set' => 'default',
         'title' => t('Add content'),
         'weight' => -20,
-        'link' => array(
+        'link' => [
           'uri' => 'internal:/node/add',
-        ),
-      ));
+        ],
+      ]);
       $shortcut->save();
 
-      $shortcut = Shortcut::create(array(
+      $shortcut = Shortcut::create([
         'shortcut_set' => 'default',
         'title' => t('All content'),
         'weight' => -19,
-        'link' => array(
+        'link' => [
           'uri' => 'internal:/admin/content',
-        ),
-      ));
+        ],
+      ]);
       $shortcut->save();
     }
 
     // Create users.
-    $this->adminUser = $this->drupalCreateUser(array('access toolbar', 'administer shortcuts', 'view the administration theme', 'create article content', 'create page content', 'access content overview', 'administer users', 'link to any page', 'edit any article content'));
-    $this->shortcutUser = $this->drupalCreateUser(array('customize shortcut links', 'switch shortcut sets', 'access shortcuts', 'access content'));
+    $this->adminUser = $this->drupalCreateUser(['access toolbar', 'administer shortcuts', 'view the administration theme', 'create article content', 'create page content', 'access content overview', 'administer users', 'link to any page', 'edit any article content']);
+    $this->shortcutUser = $this->drupalCreateUser(['customize shortcut links', 'switch shortcut sets', 'access shortcuts', 'access content']);
 
     // Create a node.
-    $this->node = $this->drupalCreateNode(array('type' => 'article'));
+    $this->node = $this->drupalCreateNode(['type' => 'article']);
 
     // Log in as admin and grab the default shortcut set.
     $this->drupalLogin($this->adminUser);
@@ -93,11 +93,11 @@ abstract class ShortcutTestBase extends WebTestBase {
   /**
    * Creates a generic shortcut set.
    */
-  function generateShortcutSet($label = '', $id = NULL) {
-    $set = ShortcutSet::create(array(
+  public function generateShortcutSet($label = '', $id = NULL) {
+    $set = ShortcutSet::create([
       'id' => isset($id) ? $id : strtolower($this->randomMachineName()),
       'label' => empty($label) ? $this->randomString() : $label,
-    ));
+    ]);
     $set->save();
     return $set;
   }
@@ -116,8 +116,8 @@ abstract class ShortcutTestBase extends WebTestBase {
    * @return array
    *   Array of the requested information from each link.
    */
-  function getShortcutInformation(ShortcutSetInterface $set, $key) {
-    $info = array();
+  public function getShortcutInformation(ShortcutSetInterface $set, $key) {
+    $info = [];
     \Drupal::entityManager()->getStorage('shortcut')->resetCache();
     foreach ($set->getShortcuts() as $shortcut) {
       if ($key == 'link') {
diff --git a/web/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php b/web/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
index 4be41c36d..300ca3b72 100644
--- a/web/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
+++ b/web/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
@@ -23,13 +23,13 @@ class ShortcutTranslationUITest extends ContentTranslationUITestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'language',
     'content_translation',
     'link',
     'shortcut',
     'toolbar'
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -44,7 +44,7 @@ class ShortcutTranslationUITest extends ContentTranslationUITestBase {
    * {@inheritdoc}
    */
   protected function getTranslatorPermissions() {
-    return array_merge(parent::getTranslatorPermissions(), array('access shortcuts', 'administer shortcuts', 'access toolbar'));
+    return array_merge(parent::getTranslatorPermissions(), ['access shortcuts', 'administer shortcuts', 'access toolbar']);
   }
 
   /**
@@ -59,7 +59,7 @@ class ShortcutTranslationUITest extends ContentTranslationUITestBase {
    * {@inheritdoc}
    */
   protected function getNewEntityValues($langcode) {
-    return array('title' => array(array('value' => $this->randomMachineName()))) + parent::getNewEntityValues($langcode);
+    return ['title' => [['value' => $this->randomMachineName()]]] + parent::getNewEntityValues($langcode);
   }
 
   protected function doTestBasicTranslation() {
@@ -71,14 +71,14 @@ class ShortcutTranslationUITest extends ContentTranslationUITestBase {
     $entity = $storage->load($this->entityId);
     foreach ($this->langcodes as $langcode) {
       if ($entity->hasTranslation($langcode)) {
-        $language = new Language(array('id' => $langcode));
+        $language = new Language(['id' => $langcode]);
         // Request the front page in this language and assert that the right
         // translation shows up in the shortcut list with the right path.
-        $this->drupalGet('<front>', array('language' => $language));
-        $expected_path = \Drupal::urlGenerator()->generateFromRoute('user.page', array(), array('language' => $language));
+        $this->drupalGet('<front>', ['language' => $language]);
+        $expected_path = \Drupal::urlGenerator()->generateFromRoute('user.page', [], ['language' => $language]);
         $label = $entity->getTranslation($langcode)->label();
-        $elements = $this->xpath('//nav[contains(@class, "toolbar-lining")]/ul[@class="toolbar-menu"]/li/a[contains(@href, :href) and normalize-space(text())=:label]', array(':href' => $expected_path, ':label' => $label));
-        $this->assertTrue(!empty($elements), format_string('Translated @language shortcut link @label found.', array('@label' => $label, '@language' => $language->getName())));
+        $elements = $this->xpath('//nav[contains(@class, "toolbar-lining")]/ul[@class="toolbar-menu"]/li/a[contains(@href, :href) and normalize-space(text())=:label]', [':href' => $expected_path, ':label' => $label]);
+        $this->assertTrue(!empty($elements), format_string('Translated @language shortcut link @label found.', ['@label' => $label, '@language' => $language->getName()]));
       }
     }
   }
@@ -96,14 +96,14 @@ class ShortcutTranslationUITest extends ContentTranslationUITestBase {
     foreach ($this->langcodes as $langcode) {
       // We only want to test the title for non-english translations.
       if ($langcode != 'en') {
-        $options = array('language' => $languages[$langcode]);
+        $options = ['language' => $languages[$langcode]];
         $url = $entity->urlInfo('edit-form', $options);
         $this->drupalGet($url);
 
-        $title = t('@title [%language translation]', array(
+        $title = t('@title [%language translation]', [
           '@title' => $entity->getTranslation($langcode)->label(),
           '%language' => $languages[$langcode]->getName(),
-        ));
+        ]);
         $this->assertRaw($title);
       }
     }
@@ -120,7 +120,7 @@ class ShortcutTranslationUITest extends ContentTranslationUITestBase {
 
     $this->assertFalse(
       $entity instanceof EntityChangedInterface,
-      format_string('%entity is not implementing EntityChangedInterface.', array('%entity' => $this->entityTypeId))
+      format_string('%entity is not implementing EntityChangedInterface.', ['%entity' => $this->entityTypeId])
     );
   }
 
diff --git a/web/core/modules/shortcut/src/Tests/ShortcutCacheTagsTest.php b/web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
similarity index 93%
rename from web/core/modules/shortcut/src/Tests/ShortcutCacheTagsTest.php
rename to web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
index a437ffb01..e2d6a226f 100644
--- a/web/core/modules/shortcut/src/Tests/ShortcutCacheTagsTest.php
+++ b/web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\shortcut\Tests;
+namespace Drupal\Tests\shortcut\Functional;
 
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\shortcut\Entity\Shortcut;
@@ -18,7 +18,7 @@ class ShortcutCacheTagsTest extends EntityCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('shortcut');
+  public static $modules = ['shortcut'];
 
   /**
    * {@inheritdoc}
@@ -39,12 +39,12 @@ class ShortcutCacheTagsTest extends EntityCacheTagsTestBase {
    */
   protected function createEntity() {
     // Create a "Llama" shortcut.
-    $shortcut = Shortcut::create(array(
+    $shortcut = Shortcut::create([
       'shortcut_set' => 'default',
       'title' => t('Llama'),
       'weight' => 0,
       'link' => [['uri' => 'internal:/admin']],
-    ));
+    ]);
     $shortcut->save();
 
     return $shortcut;
diff --git a/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php b/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
index 865828641..b6543723d 100644
--- a/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
+++ b/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
@@ -18,12 +18,12 @@ class MigrateShortcutSetTest extends MigrateDrupal7TestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'link',
     'field',
     'shortcut',
     'menu_link_content',
-  );
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetUsersTest.php b/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetUsersTest.php
index 1b15dcdef..ae939569c 100644
--- a/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetUsersTest.php
+++ b/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetUsersTest.php
@@ -17,12 +17,12 @@ class MigrateShortcutSetUsersTest extends MigrateDrupal7TestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'link',
     'field',
     'shortcut',
     'menu_link_content',
-  );
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php b/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
index 18f55170a..e685151a5 100644
--- a/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
+++ b/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
@@ -18,12 +18,12 @@ class MigrateShortcutTest extends MigrateDrupal7TestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'link',
     'field',
     'shortcut',
     'menu_link_content',
-  );
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php b/web/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php
index f85a2cf4c..09b6468af 100644
--- a/web/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php
+++ b/web/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php
@@ -12,10 +12,10 @@ use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
 class ShortcutLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array(
+    $this->directoryList = [
       'shortcut' => 'core/modules/shortcut',
       'user' => 'core/modules/user',
-    );
+    ];
     parent::setUp();
   }
 
@@ -25,9 +25,9 @@ class ShortcutLocalTasksTest extends LocalTaskIntegrationTestBase {
    * @dataProvider getShortcutPageRoutes
    */
   public function testShortcutPageLocalTasks($route) {
-    $tasks = array(
-      0 => array('shortcut.set_switch', 'entity.user.canonical', 'entity.user.edit_form',),
-    );
+    $tasks = [
+      0 => ['shortcut.set_switch', 'entity.user.canonical', 'entity.user.edit_form'],
+    ];
     $this->assertLocalTasks($route, $tasks);
   }
 
@@ -35,11 +35,11 @@ class ShortcutLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function getShortcutPageRoutes() {
-    return array(
-      array('entity.user.canonical'),
-      array('entity.user.edit_form'),
-      array('shortcut.set_switch'),
-    );
+    return [
+      ['entity.user.canonical'],
+      ['entity.user.edit_form'],
+      ['shortcut.set_switch'],
+    ];
   }
 
 }
diff --git a/web/core/modules/simpletest/simpletest.install b/web/core/modules/simpletest/simpletest.install
index 0e3cd00d5..b6cfc80e1 100644
--- a/web/core/modules/simpletest/simpletest.install
+++ b/web/core/modules/simpletest/simpletest.install
@@ -16,37 +16,37 @@ const SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT = '128M';
  * Implements hook_requirements().
  */
 function simpletest_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
 
   $has_phpunit = class_exists('\PHPUnit_Framework_TestCase');
   $has_curl = function_exists('curl_init');
   $open_basedir = ini_get('open_basedir');
 
-  $requirements['phpunit'] = array(
+  $requirements['phpunit'] = [
     'title' => t('PHPUnit dependency'),
     'value' => $has_phpunit ? t('Found') : t('Not found'),
-  );
+  ];
   if (!$has_phpunit) {
     $requirements['phpunit']['severity'] = REQUIREMENT_ERROR;
     $requirements['phpunit']['description'] = t("The testing framework requires the PHPUnit package. Please run 'composer install --dev' to ensure it is present.");
   }
 
-  $requirements['curl'] = array(
+  $requirements['curl'] = [
     'title' => t('cURL'),
     'value' => $has_curl ? t('Enabled') : t('Not found'),
-  );
+  ];
   if (!$has_curl) {
     $requirements['curl']['severity'] = REQUIREMENT_ERROR;
-    $requirements['curl']['description'] = t('The testing framework could not be installed because the PHP <a href="http://php.net/manual/curl.setup.php">cURL</a> library is not available.');
+    $requirements['curl']['description'] = t('The testing framework requires the <a href="https://secure.php.net/manual/en/curl.setup.php">PHP cURL library</a>. For more information, see the <a href="https://www.drupal.org/requirements/php/curl">online information on installing the PHP cURL extension</a>.');
   }
 
   // SimpleTest currently needs 2 cURL options which are incompatible with
   // having PHP's open_basedir restriction set.
   // See https://www.drupal.org/node/674304.
-  $requirements['php_open_basedir'] = array(
+  $requirements['php_open_basedir'] = [
     'title' => t('PHP open_basedir restriction'),
     'value' => $open_basedir ? t('Enabled') : t('Disabled'),
-  );
+  ];
   if ($open_basedir) {
     $requirements['php_open_basedir']['severity'] = REQUIREMENT_ERROR;
     $requirements['php_open_basedir']['description'] = t('The testing framework requires the PHP <a href="http://php.net/manual/ini.core.php#ini.open-basedir">open_basedir</a> restriction to be disabled. Check your webserver configuration or contact your web host.');
@@ -57,29 +57,29 @@ function simpletest_requirements($phase) {
   $memory_limit = ini_get('memory_limit');
   if (!Environment::checkMemoryLimit(SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT, $memory_limit)) {
     $requirements['php_memory_limit']['severity'] = REQUIREMENT_WARNING;
-    $requirements['php_memory_limit']['description'] = t('The testing framework requires the PHP memory limit to be at least %memory_minimum_limit. The current value is %memory_limit. <a href=":url">Follow these steps to continue</a>.', array('%memory_limit' => $memory_limit, '%memory_minimum_limit' => SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT, ':url' => 'https://www.drupal.org/node/207036'));
+    $requirements['php_memory_limit']['description'] = t('The testing framework requires the PHP memory limit to be at least %memory_minimum_limit. The current value is %memory_limit. <a href=":url">Follow these steps to continue</a>.', ['%memory_limit' => $memory_limit, '%memory_minimum_limit' => SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT, ':url' => 'https://www.drupal.org/node/207036']);
   }
 
   $site_directory = 'sites/simpletest';
   if (!drupal_verify_install_file(\Drupal::root() . '/' . $site_directory, FILE_EXIST | FILE_READABLE | FILE_WRITABLE | FILE_EXECUTABLE, 'dir')) {
-    $requirements['simpletest_site_directory'] = array(
+    $requirements['simpletest_site_directory'] = [
       'title' => t('Simpletest site directory'),
       'value' => is_dir(\Drupal::root() . '/' . $site_directory) ? t('Not writable') : t('Missing'),
       'severity' => REQUIREMENT_ERROR,
-      'description' => t('The testing framework requires the %sites-simpletest directory to exist and be writable in order to run tests.', array(
+      'description' => t('The testing framework requires the %sites-simpletest directory to exist and be writable in order to run tests.', [
         '%sites-simpletest' => $site_directory,
-      )),
-    );
+      ]),
+    ];
   }
   elseif (!file_save_htaccess(\Drupal::root() . '/' . $site_directory, FALSE)) {
-    $requirements['simpletest_site_directory'] = array(
+    $requirements['simpletest_site_directory'] = [
       'title' => t('Simpletest site directory'),
       'value' => t('Not protected'),
       'severity' => REQUIREMENT_ERROR,
-      'description' => t('The file %file does not exist and could not be created automatically, which poses a security risk. Ensure that the directory is writable.', array(
+      'description' => t('The file %file does not exist and could not be created automatically, which poses a security risk. Ensure that the directory is writable.', [
         '%file' => $site_directory . '/.htaccess',
-      )),
-    );
+      ]),
+    ];
   }
 
   return $requirements;
@@ -89,91 +89,91 @@ function simpletest_requirements($phase) {
  * Implements hook_schema().
  */
 function simpletest_schema() {
-  $schema['simpletest'] = array(
+  $schema['simpletest'] = [
     'description' => 'Stores simpletest messages',
-    'fields' => array(
-      'message_id'  => array(
+    'fields' => [
+      'message_id'  => [
         'type' => 'serial',
         'not null' => TRUE,
         'description' => 'Primary Key: Unique simpletest message ID.',
-      ),
-      'test_id' => array(
+      ],
+      'test_id' => [
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
         'description' => 'Test ID, messages belonging to the same ID are reported together',
-      ),
-      'test_class' => array(
+      ],
+      'test_class' => [
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
         'description' => 'The name of the class that created this message.',
-      ),
-      'status' => array(
+      ],
+      'status' => [
         'type' => 'varchar',
         'length' => 9,
         'not null' => TRUE,
         'default' => '',
         'description' => 'Message status. Core understands pass, fail, exception.',
-      ),
-      'message' => array(
+      ],
+      'message' => [
         'type' => 'text',
         'not null' => TRUE,
         'description' => 'The message itself.',
-      ),
-      'message_group' => array(
+      ],
+      'message_group' => [
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
         'description' => 'The message group this message belongs to. For example: warning, browser, user.',
-      ),
-      'function' => array(
+      ],
+      'function' => [
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
         'description' => 'Name of the assertion function or method that created this message.',
-      ),
-      'line' => array(
+      ],
+      'line' => [
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
         'description' => 'Line number on which the function is called.',
-      ),
-      'file' => array(
+      ],
+      'file' => [
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
         'description' => 'Name of the file where the function is called.',
-      ),
-    ),
-    'primary key' => array('message_id'),
-    'indexes' => array(
-      'reporter' => array('test_class', 'message_id'),
-    ),
-  );
-  $schema['simpletest_test_id'] = array(
+      ],
+    ],
+    'primary key' => ['message_id'],
+    'indexes' => [
+      'reporter' => ['test_class', 'message_id'],
+    ],
+  ];
+  $schema['simpletest_test_id'] = [
     'description' => 'Stores simpletest test IDs, used to auto-increment the test ID so that a fresh test ID is used.',
-    'fields' => array(
-      'test_id'  => array(
+    'fields' => [
+      'test_id'  => [
         'type' => 'serial',
         'not null' => TRUE,
         'description' => 'Primary Key: Unique simpletest ID used to group test results together. Each time a set of tests
                             are run a new test ID is used.',
-      ),
-      'last_prefix' => array(
+      ],
+      'last_prefix' => [
         'type' => 'varchar',
         'length' => 60,
         'not null' => FALSE,
         'default' => '',
         'description' => 'The last database prefix used during testing.',
-      ),
-    ),
-    'primary key' => array('test_id'),
-  );
+      ],
+    ],
+    'primary key' => ['test_id'],
+  ];
   return $schema;
 }
 
diff --git a/web/core/modules/simpletest/simpletest.module b/web/core/modules/simpletest/simpletest.module
index f72ca5c6a..7d72aa44b 100644
--- a/web/core/modules/simpletest/simpletest.module
+++ b/web/core/modules/simpletest/simpletest.module
@@ -12,6 +12,7 @@ use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\simpletest\TestBase;
 use Drupal\Core\Test\TestDatabase;
 use Drupal\simpletest\TestDiscovery;
+use Drupal\Tests\Listeners\SimpletestUiPrinter;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Drupal\Core\Test\TestStatus;
 
@@ -23,11 +24,11 @@ function simpletest_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.simpletest':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Testing module provides a framework for running automated tests. It can be used to verify a working state of Drupal before and after any code changes, or as a means for developers to write and execute tests for their modules. For more information, see the <a href=":simpletest">online documentation for the Testing module</a>.', array(':simpletest' => 'https://www.drupal.org/documentation/modules/simpletest')) . '</p>';
+      $output .= '<p>' . t('The Testing module provides a framework for running automated tests. It can be used to verify a working state of Drupal before and after any code changes, or as a means for developers to write and execute tests for their modules. For more information, see the <a href=":simpletest">online documentation for the Testing module</a>.', [':simpletest' => 'https://www.drupal.org/documentation/modules/simpletest']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Running tests') . '</dt>';
-      $output .= '<dd><p>' . t('Visit the <a href=":admin-simpletest">Testing page</a> to display a list of available tests. For comprehensive testing, select <em>all</em> tests, or individually select tests for more targeted testing. Note that it might take several minutes for all tests to complete.', array(':admin-simpletest' => \Drupal::url('simpletest.test_form'))) . '</p>';
+      $output .= '<dd><p>' . t('Visit the <a href=":admin-simpletest">Testing page</a> to display a list of available tests. For comprehensive testing, select <em>all</em> tests, or individually select tests for more targeted testing. Note that it might take several minutes for all tests to complete.', [':admin-simpletest' => \Drupal::url('simpletest.test_form')]) . '</p>';
       $output .= '<p>' . t('After the tests run, a message will be displayed next to each test group indicating whether tests within it passed, failed, or had exceptions. A pass means that the test returned the expected results, while fail means that it did not. An exception normally indicates an error outside of the test, such as a PHP warning or notice. If there were failures or exceptions, the results will be expanded to show details, and the tests that had failures or exceptions will be indicated in red or pink rows. You can then use these results to refine your code and tests, until all tests pass.') . '</p></dd>';
       $output .= '</dl>';
       return $output;
@@ -42,11 +43,11 @@ function simpletest_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function simpletest_theme() {
-  return array(
-    'simpletest_result_summary' => array(
-      'variables' => array('label' => NULL, 'items' => array(), 'pass' => 0, 'fail' => 0, 'exception' => 0, 'debug' => 0),
-    ),
-  );
+  return [
+    'simpletest_result_summary' => [
+      'variables' => ['label' => NULL, 'items' => [], 'pass' => 0, 'fail' => 0, 'exception' => 0, 'debug' => 0],
+    ],
+  ];
 }
 
 /**
@@ -137,7 +138,7 @@ function simpletest_run_tests($test_list) {
   }
 
   $test_id = db_insert('simpletest_test_id')
-    ->useDefaults(array('test_id'))
+    ->useDefaults(['test_id'])
     ->execute();
 
   // Clear out the previous verbose files.
@@ -147,16 +148,16 @@ function simpletest_run_tests($test_list) {
   $first_test = reset($test_list);
   $info = TestDiscovery::getTestInfo($first_test);
 
-  $batch = array(
+  $batch = [
     'title' => t('Running tests'),
-    'operations' => array(
-      array('_simpletest_batch_operation', array($test_list, $test_id)),
-    ),
+    'operations' => [
+      ['_simpletest_batch_operation', [$test_list, $test_id]],
+    ],
     'finished' => '_simpletest_batch_finished',
     'progress_message' => '',
-    'library' => array('simpletest/drupal.simpletest'),
-    'init_message' => t('Processing test @num of @max - %test.', array('%test' => $info['name'], '@num' => '1', '@max' => count($test_list))),
-  );
+    'library' => ['simpletest/drupal.simpletest'],
+    'init_message' => t('Processing test @num of @max - %test.', ['%test' => $info['name'], '@num' => '1', '@max' => count($test_list)]),
+  ];
   batch_set($batch);
 
   \Drupal::moduleHandler()->invokeAll('test_group_started');
@@ -236,12 +237,12 @@ function simpletest_summarize_phpunit_result($results) {
   $summaries = [];
   foreach ($results as $result) {
     if (!isset($summaries[$result['test_class']])) {
-      $summaries[$result['test_class']] = array(
+      $summaries[$result['test_class']] = [
         '#pass' => 0,
         '#fail' => 0,
         '#exception' => 0,
         '#debug' => 0,
-      );
+      ];
     }
 
     switch ($result['status']) {
@@ -317,14 +318,17 @@ function simpletest_phpunit_run_command(array $unescaped_test_classnames, $phpun
   // this variable.
   if ($base_url) {
     putenv('SIMPLETEST_BASE_URL=' . $base_url);
+    putenv('BROWSERTEST_OUTPUT_DIRECTORY=' . \Drupal::service('file_system')->realpath('public://simpletest'));
   }
   $phpunit_bin = simpletest_phpunit_command();
 
-  $command = array(
+  $command = [
     $phpunit_bin,
     '--log-junit',
     escapeshellarg($phpunit_file),
-  );
+    '--printer',
+    escapeshellarg(SimpletestUiPrinter::class),
+  ];
 
   // Optimized for running a single test.
   if (count($unescaped_test_classnames) == 1) {
@@ -338,10 +342,10 @@ function simpletest_phpunit_run_command(array $unescaped_test_classnames, $phpun
     }, $unescaped_test_classnames);
 
     $filter_string = implode("|", $escaped_test_classnames);
-    $command = array_merge($command, array(
+    $command = array_merge($command, [
       '--filter',
       escapeshellarg($filter_string),
-    ));
+    ]);
   }
 
   // Need to change directories before running the command so that we can use
@@ -357,6 +361,7 @@ function simpletest_phpunit_run_command(array $unescaped_test_classnames, $phpun
   putenv('SIMPLETEST_DB=');
   if ($base_url) {
     putenv('SIMPLETEST_BASE_URL=');
+    putenv('BROWSERTEST_OUTPUT_DIRECTORY=');
   }
   return $ret;
 }
@@ -374,17 +379,16 @@ function simpletest_phpunit_command() {
   $reflector = new ReflectionClass($autoloader);
   $vendor_dir = dirname(dirname($reflector->getFileName()));
 
-  // Don't use the committed version in composer's bin dir if running on
-  // windows.
+  // The file in Composer's bin dir is a *nix link, which does not work when
+  // extracted from a tarball and generally not on Windows.
+  $command = $vendor_dir . '/phpunit/phpunit/phpunit';
   if (substr(PHP_OS, 0, 3) == 'WIN') {
+    // On Windows it is necessary to run the script using the PHP executable.
     $php_executable_finder = new PhpExecutableFinder();
     $php = $php_executable_finder->find();
-    $phpunit_bin = escapeshellarg($php) . ' -f ' . escapeshellarg($vendor_dir . '/phpunit/phpunit/composer/bin/phpunit') . ' --';
+    $command = $php . ' -f ' . escapeshellarg($command) . ' --';
   }
-  else {
-    $phpunit_bin = $vendor_dir . '/phpunit/phpunit/phpunit';
-  }
-  return $phpunit_bin;
+  return $command;
 }
 
 /**
@@ -397,7 +401,7 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
     // First iteration: initialize working values.
     $test_list = $test_list_init;
     $context['sandbox']['max'] = count($test_list);
-    $test_results = array('#pass' => 0, '#fail' => 0, '#exception' => 0, '#debug' => 0);
+    $test_results = ['#pass' => 0, '#fail' => 0, '#exception' => 0, '#debug' => 0];
   }
   else {
     // Nth iteration: get the current values where we last stored them.
@@ -416,7 +420,7 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
   else {
     $test = new $test_class($test_id);
     $test->run();
-    \Drupal::moduleHandler()->invokeAll('test_finished', array($test->results));
+    \Drupal::moduleHandler()->invokeAll('test_finished', [$test->results]);
     $test_results[$test_class] = $test->results;
   }
   $size = count($test_list);
@@ -427,25 +431,25 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
     $test_results[$key] += $value;
   }
   $test_results[$test_class]['#name'] = $info['name'];
-  $items = array();
+  $items = [];
   foreach (Element::children($test_results) as $class) {
-    $class_test_result = $test_results[$class] + array(
+    $class_test_result = $test_results[$class] + [
       '#theme' => 'simpletest_result_summary',
       '#label' => t($test_results[$class]['#name'] . ':'),
-    );
+    ];
     array_unshift($items, drupal_render($class_test_result));
   }
-  $context['message'] = t('Processed test @num of @max - %test.', array('%test' => $info['name'], '@num' => $max - $size, '@max' => $max));
-  $overall_results = $test_results + array(
+  $context['message'] = t('Processed test @num of @max - %test.', ['%test' => $info['name'], '@num' => $max - $size, '@max' => $max]);
+  $overall_results = $test_results + [
     '#theme' => 'simpletest_result_summary',
     '#label' => t('Overall results:'),
-  );
+  ];
   $context['message'] .= drupal_render($overall_results);
 
-  $item_list = array(
+  $item_list = [
     '#theme' => 'item_list',
     '#items' => $items,
-  );
+  ];
   $context['message'] .= drupal_render($item_list);
 
   // Save working values for the next iteration.
@@ -463,7 +467,7 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
  */
 function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
   if ($success) {
-    drupal_set_message(t('The test run finished in @elapsed.', array('@elapsed' => $elapsed)));
+    drupal_set_message(t('The test run finished in @elapsed.', ['@elapsed' => $elapsed]));
   }
   else {
     // Use the test_id passed as a parameter to _simpletest_batch_operation().
@@ -492,16 +496,16 @@ function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
  */
 function simpletest_last_test_get($test_id) {
   $last_prefix = TestDatabase::getConnection()
-    ->queryRange('SELECT last_prefix FROM {simpletest_test_id} WHERE test_id = :test_id', 0, 1, array(
+    ->queryRange('SELECT last_prefix FROM {simpletest_test_id} WHERE test_id = :test_id', 0, 1, [
       ':test_id' => $test_id,
-    ))
+    ])
     ->fetchField();
   $last_test_class = TestDatabase::getConnection()
-    ->queryRange('SELECT test_class FROM {simpletest} WHERE test_id = :test_id ORDER BY message_id DESC', 0, 1, array(
+    ->queryRange('SELECT test_class FROM {simpletest} WHERE test_id = :test_id ORDER BY message_id DESC', 0, 1, [
       ':test_id' => $test_id,
-    ))
+    ])
     ->fetchField();
-  return array($last_prefix, $last_test_class);
+  return [$last_prefix, $last_test_class];
 }
 
 /**
@@ -529,10 +533,10 @@ function simpletest_log_read($test_id, $database_prefix, $test_class) {
       if (preg_match('/\[.*?\] (.*?): (.*?) in (.*) on line (\d+)/', $line, $match)) {
         // Parse PHP fatal errors for example: PHP Fatal error: Call to
         // undefined function break_me() in /path/to/file.php on line 17
-        $caller = array(
+        $caller = [
           'line' => $match[4],
           'file' => $match[3],
-        );
+        ];
         TestBase::insertAssert($test_id, $test_class, FALSE, $match[2], $match[1], $caller);
       }
       else {
@@ -569,13 +573,20 @@ function simpletest_log_read($test_id, $database_prefix, $test_class) {
  *       ),
  *     );
  *   @endcode
+ *
+ * @deprecated in Drupal 8.3.x, for removal before 9.0.0 release. Use
+ *   \Drupal::service('test_discovery')->getTestClasses($extension, $types)
+ *   instead.
  */
 function simpletest_test_get_all($extension = NULL, array $types = []) {
   return \Drupal::service('test_discovery')->getTestClasses($extension, $types);
 }
 
 /**
- * Registers namespaces for disabled modules.
+ * Registers test namespaces of all extensions and core test classes.
+ *
+ * @deprecated in Drupal 8.3.x for removal before 9.0.0 release. Use
+ *   \Drupal::service('test_discovery')->registerTestNamespaces() instead.
  */
 function simpletest_classloader_register() {
   \Drupal::service('test_discovery')->registerTestNamespaces();
@@ -681,7 +692,9 @@ function simpletest_clean_temporary_directories() {
     foreach ($files as $file) {
       if ($file[0] != '.') {
         $path = DRUPAL_ROOT . '/sites/simpletest/' . $file;
-        file_unmanaged_delete_recursive($path, array('Drupal\simpletest\TestBase', 'filePreDeleteCallback'));
+        file_unmanaged_delete_recursive($path, function ($any_path) {
+          @chmod($any_path, 0700);
+        });
         $count++;
       }
     }
@@ -708,7 +721,7 @@ function simpletest_clean_results_table($test_id = NULL) {
   if (\Drupal::config('simpletest.settings')->get('clear_results')) {
     $connection = TestDatabase::getConnection();
     if ($test_id) {
-      $count = $connection->query('SELECT COUNT(test_id) FROM {simpletest_test_id} WHERE test_id = :test_id', array(':test_id' => $test_id))->fetchField();
+      $count = $connection->query('SELECT COUNT(test_id) FROM {simpletest_test_id} WHERE test_id = :test_id', [':test_id' => $test_id])->fetchField();
 
       $connection->delete('simpletest')
         ->condition('test_id', $test_id)
@@ -760,7 +773,7 @@ function simpletest_phpunit_xml_to_rows($test_id, $phpunit_xml_file) {
   if (!$contents) {
     return;
   }
-  $records = array();
+  $records = [];
   $testcases = simpletest_phpunit_find_testcases(new SimpleXMLElement($contents));
   foreach ($testcases as $testcase) {
     $records[] = simpletest_phpunit_testcase_to_row($test_id, $testcase);
@@ -780,7 +793,7 @@ function simpletest_phpunit_xml_to_rows($test_id, $phpunit_xml_file) {
  *   A list of all test cases.
  */
 function simpletest_phpunit_find_testcases(\SimpleXMLElement $element, \SimpleXMLElement $parent = NULL) {
-  $testcases = array();
+  $testcases = [];
 
   if (!isset($parent)) {
     $parent = $element;
@@ -834,7 +847,7 @@ function simpletest_phpunit_testcase_to_row($test_id, \SimpleXMLElement $testcas
 
   $attributes = $testcase->attributes();
 
-  $record = array(
+  $record = [
     'test_id' => $test_id,
     'test_class' => (string) $attributes->class,
     'status' => $pass ? 'pass' : 'fail',
@@ -844,6 +857,6 @@ function simpletest_phpunit_testcase_to_row($test_id, \SimpleXMLElement $testcas
     'function' => $attributes->class . '->' . $attributes->name . '()',
     'line' => $attributes->line ?: 0,
     'file' => $attributes->file,
-  );
+  ];
   return $record;
 }
diff --git a/web/core/modules/simpletest/src/AssertContentTrait.php b/web/core/modules/simpletest/src/AssertContentTrait.php
index e19f319c7..5a6c8c06e 100644
--- a/web/core/modules/simpletest/src/AssertContentTrait.php
+++ b/web/core/modules/simpletest/src/AssertContentTrait.php
@@ -61,7 +61,7 @@ trait AssertContentTrait {
     $this->content = $content;
     $this->plainTextContent = NULL;
     $this->elements = NULL;
-    $this->drupalSettings = array();
+    $this->drupalSettings = [];
     if (preg_match('@<script type="application/json" data-drupal-selector="drupal-settings-json">([^<]*)</script>@', $content, $matches)) {
       $this->drupalSettings = Json::decode($matches[1]);
     }
@@ -75,7 +75,7 @@ trait AssertContentTrait {
       $raw_content = $this->getRawContent();
       // Strip everything between the HEAD tags.
       $raw_content = preg_replace('@<head>(.+?)</head>@si', '', $raw_content);
-      $this->plainTextContent = Xss::filter($raw_content, array());
+      $this->plainTextContent = Xss::filter($raw_content, []);
     }
     return $this->plainTextContent;
   }
@@ -127,7 +127,7 @@ trait AssertContentTrait {
       $html_dom = new \DOMDocument();
       @$html_dom->loadHTML('<?xml encoding="UTF-8">' . $this->getRawContent());
       if ($html_dom) {
-        $this->pass(SafeMarkup::format('Valid HTML found on "@path"', array('@path' => $this->getUrl())), 'Browser');
+        $this->pass(SafeMarkup::format('Valid HTML found on "@path"', ['@path' => $this->getUrl()]), 'Browser');
         // It's much easier to work with simplexml than DOM, luckily enough
         // we can just simply import our DOM tree.
         $this->elements = simplexml_import_dom($html_dom);
@@ -170,7 +170,7 @@ trait AssertContentTrait {
    * @return string
    *   An XPath query with arguments replaced.
    */
-  protected function buildXPathQuery($xpath, array $args = array()) {
+  protected function buildXPathQuery($xpath, array $args = []) {
     // Replace placeholders.
     foreach ($args as $placeholder => $value) {
       // Cast MarkupInterface objects to string.
@@ -260,7 +260,7 @@ trait AssertContentTrait {
    *   Option elements in select.
    */
   protected function getAllOptions(\SimpleXMLElement $element) {
-    $options = array();
+    $options = [];
     // Add all options items.
     foreach ($element->option as $option) {
       $options[] = $option;
@@ -300,8 +300,8 @@ trait AssertContentTrait {
   protected function assertLink($label, $index = 0, $message = '', $group = 'Other') {
     // Cast MarkupInterface objects to string.
     $label = (string) $label;
-    $links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
-    $message = ($message ? $message : strtr('Link with label %label found.', array('%label' => $label)));
+    $links = $this->xpath('//a[normalize-space(text())=:label]', [':label' => $label]);
+    $message = ($message ? $message : strtr('Link with label %label found.', ['%label' => $label]));
     return $this->assert(isset($links[$index]), $message, $group);
   }
 
@@ -327,8 +327,8 @@ trait AssertContentTrait {
   protected function assertNoLink($label, $message = '', $group = 'Other') {
     // Cast MarkupInterface objects to string.
     $label = (string) $label;
-    $links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
-    $message = ($message ? $message : SafeMarkup::format('Link with label %label not found.', array('%label' => $label)));
+    $links = $this->xpath('//a[normalize-space(text())=:label]', [':label' => $label]);
+    $message = ($message ? $message : SafeMarkup::format('Link with label %label not found.', ['%label' => $label]));
     return $this->assert(empty($links), $message, $group);
   }
 
@@ -354,8 +354,8 @@ trait AssertContentTrait {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertLinkByHref($href, $index = 0, $message = '', $group = 'Other') {
-    $links = $this->xpath('//a[contains(@href, :href)]', array(':href' => $href));
-    $message = ($message ? $message : SafeMarkup::format('Link containing href %href found.', array('%href' => $href)));
+    $links = $this->xpath('//a[contains(@href, :href)]', [':href' => $href]);
+    $message = ($message ? $message : SafeMarkup::format('Link containing href %href found.', ['%href' => $href]));
     return $this->assert(isset($links[$index]), $message, $group);
   }
 
@@ -379,8 +379,8 @@ trait AssertContentTrait {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertNoLinkByHref($href, $message = '', $group = 'Other') {
-    $links = $this->xpath('//a[contains(@href, :href)]', array(':href' => $href));
-    $message = ($message ? $message : SafeMarkup::format('No link containing href %href found.', array('%href' => $href)));
+    $links = $this->xpath('//a[contains(@href, :href)]', [':href' => $href]);
+    $message = ($message ? $message : SafeMarkup::format('No link containing href %href found.', ['%href' => $href]));
     return $this->assert(empty($links), $message, $group);
   }
 
@@ -404,8 +404,8 @@ trait AssertContentTrait {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertNoLinkByHrefInMainRegion($href, $message = '', $group = 'Other') {
-    $links = $this->xpath('//main//a[contains(@href, :href)]', array(':href' => $href));
-    $message = ($message ? $message : SafeMarkup::format('No link containing href %href found.', array('%href' => $href)));
+    $links = $this->xpath('//main//a[contains(@href, :href)]', [':href' => $href]);
+    $message = ($message ? $message : SafeMarkup::format('No link containing href %href found.', ['%href' => $href]));
     return $this->assert(empty($links), $message, $group);
   }
 
@@ -604,7 +604,7 @@ trait AssertContentTrait {
    */
   protected function assertTextHelper($text, $message = '', $group = 'Other', $not_exists = TRUE) {
     if (!$message) {
-      $message = !$not_exists ? SafeMarkup::format('"@text" found', array('@text' => $text)) : SafeMarkup::format('"@text" not found', array('@text' => $text));
+      $message = !$not_exists ? SafeMarkup::format('"@text" found', ['@text' => $text]) : SafeMarkup::format('"@text" not found', ['@text' => $text]);
     }
     return $this->assert($not_exists == (strpos($this->getTextContent(), (string) $text) === FALSE), $message, $group);
   }
@@ -723,7 +723,7 @@ trait AssertContentTrait {
    */
   protected function assertPattern($pattern, $message = '', $group = 'Other') {
     if (!$message) {
-      $message = SafeMarkup::format('Pattern "@pattern" found', array('@pattern' => $pattern));
+      $message = SafeMarkup::format('Pattern "@pattern" found', ['@pattern' => $pattern]);
     }
     return $this->assert((bool) preg_match($pattern, $this->getRawContent()), $message, $group);
   }
@@ -749,7 +749,7 @@ trait AssertContentTrait {
    */
   protected function assertNoPattern($pattern, $message = '', $group = 'Other') {
     if (!$message) {
-      $message = SafeMarkup::format('Pattern "@pattern" not found', array('@pattern' => $pattern));
+      $message = SafeMarkup::format('Pattern "@pattern" not found', ['@pattern' => $pattern]);
     }
     return $this->assert(!preg_match($pattern, $this->getRawContent()), $message, $group);
   }
@@ -772,7 +772,7 @@ trait AssertContentTrait {
    */
   protected function assertTextPattern($pattern, $message = NULL, $group = 'Other') {
     if (!isset($message)) {
-      $message = SafeMarkup::format('Pattern "@pattern" found', array('@pattern' => $pattern));
+      $message = SafeMarkup::format('Pattern "@pattern" found', ['@pattern' => $pattern]);
     }
     return $this->assert((bool) preg_match($pattern, $this->getTextContent()), $message, $group);
   }
@@ -804,10 +804,10 @@ trait AssertContentTrait {
       $actual = $this->castSafeStrings($actual);
       $title = $this->castSafeStrings($title);
       if (!$message) {
-        $message = SafeMarkup::format('Page title @actual is equal to @expected.', array(
+        $message = SafeMarkup::format('Page title @actual is equal to @expected.', [
           '@actual' => var_export($actual, TRUE),
           '@expected' => var_export($title, TRUE),
-        ));
+        ]);
       }
       return $this->assertEqual($actual, $title, $message, $group);
     }
@@ -836,10 +836,10 @@ trait AssertContentTrait {
   protected function assertNoTitle($title, $message = '', $group = 'Other') {
     $actual = (string) current($this->xpath('//title'));
     if (!$message) {
-      $message = SafeMarkup::format('Page title @actual is not equal to @unexpected.', array(
+      $message = SafeMarkup::format('Page title @actual is not equal to @unexpected.', [
         '@actual' => var_export($actual, TRUE),
         '@unexpected' => var_export($title, TRUE),
-      ));
+      ]);
     }
     return $this->assertNotEqual($actual, $title, $message, $group);
   }
@@ -867,7 +867,7 @@ trait AssertContentTrait {
    * @return bool
    *   TRUE on pass, FALSE on fail.
    */
-  protected function assertThemeOutput($callback, array $variables = array(), $expected = '', $message = '', $group = 'Other') {
+  protected function assertThemeOutput($callback, array $variables = [], $expected = '', $message = '', $group = 'Other') {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
 
@@ -885,7 +885,7 @@ trait AssertContentTrait {
     if (!$message) {
       $message = '%callback rendered correctly.';
     }
-    $message = format_string($message, array('%callback' => 'theme_' . $callback . '()'));
+    $message = format_string($message, ['%callback' => 'theme_' . $callback . '()']);
     return $this->assertIdentical($output, $expected, $message, $group);
   }
 
@@ -1064,15 +1064,15 @@ trait AssertContentTrait {
   protected function assertFieldByName($name, $value = NULL, $message = NULL, $group = 'Browser') {
     if (!isset($message)) {
       if (!isset($value)) {
-        $message = SafeMarkup::format('Found field with name @name', array(
+        $message = SafeMarkup::format('Found field with name @name', [
           '@name' => var_export($name, TRUE),
-        ));
+        ]);
       }
       else {
-        $message = SafeMarkup::format('Found field with name @name and value @value', array(
+        $message = SafeMarkup::format('Found field with name @name and value @value', [
           '@name' => var_export($name, TRUE),
           '@value' => var_export($value, TRUE),
-        ));
+        ]);
       }
     }
     return $this->assertFieldByXPath($this->constructFieldXpath('name', $name), $value, $message, $group);
@@ -1103,7 +1103,7 @@ trait AssertContentTrait {
    *   TRUE on pass, FALSE on fail.
    */
   protected function assertNoFieldByName($name, $value = '', $message = '', $group = 'Browser') {
-    return $this->assertNoFieldByXPath($this->constructFieldXpath('name', $name), $value, $message ? $message : SafeMarkup::format('Did not find field by name @name', array('@name' => $name)), $group);
+    return $this->assertNoFieldByXPath($this->constructFieldXpath('name', $name), $value, $message ? $message : SafeMarkup::format('Did not find field by name @name', ['@name' => $name]), $group);
   }
 
   /**
@@ -1136,7 +1136,7 @@ trait AssertContentTrait {
       $value = (string) $value;
     }
     $message = (string) $message;
-    return $this->assertFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : SafeMarkup::format('Found field by id @id', array('@id' => $id)), $group);
+    return $this->assertFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : SafeMarkup::format('Found field by id @id', ['@id' => $id]), $group);
   }
 
   /**
@@ -1164,7 +1164,7 @@ trait AssertContentTrait {
    *   TRUE on pass, FALSE on fail.
    */
   protected function assertNoFieldById($id, $value = '', $message = '', $group = 'Browser') {
-    return $this->assertNoFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : SafeMarkup::format('Did not find field by id @id', array('@id' => $id)), $group);
+    return $this->assertNoFieldByXPath($this->constructFieldXpath('id', $id), $value, $message ? $message : SafeMarkup::format('Did not find field by id @id', ['@id' => $id]), $group);
   }
 
   /**
@@ -1187,8 +1187,8 @@ trait AssertContentTrait {
    *   TRUE on pass, FALSE on fail.
    */
   protected function assertFieldChecked($id, $message = '', $group = 'Browser') {
-    $elements = $this->xpath('//input[@id=:id]', array(':id' => $id));
-    return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), $message ? $message : SafeMarkup::format('Checkbox field @id is checked.', array('@id' => $id)), $group);
+    $elements = $this->xpath('//input[@id=:id]', [':id' => $id]);
+    return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), $message ? $message : SafeMarkup::format('Checkbox field @id is checked.', ['@id' => $id]), $group);
   }
 
   /**
@@ -1211,8 +1211,8 @@ trait AssertContentTrait {
    *   TRUE on pass, FALSE on fail.
    */
   protected function assertNoFieldChecked($id, $message = '', $group = 'Browser') {
-    $elements = $this->xpath('//input[@id=:id]', array(':id' => $id));
-    return $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']), $message ? $message : SafeMarkup::format('Checkbox field @id is not checked.', array('@id' => $id)), $group);
+    $elements = $this->xpath('//input[@id=:id]', [':id' => $id]);
+    return $this->assertTrue(isset($elements[0]) && empty($elements[0]['checked']), $message ? $message : SafeMarkup::format('Checkbox field @id is not checked.', ['@id' => $id]), $group);
   }
 
   /**
@@ -1237,8 +1237,8 @@ trait AssertContentTrait {
    *   TRUE on pass, FALSE on fail.
    */
   protected function assertOption($id, $option, $message = '', $group = 'Browser') {
-    $options = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
-    return $this->assertTrue(isset($options[0]), $message ? $message : SafeMarkup::format('Option @option for field @id exists.', array('@option' => $option, '@id' => $id)), $group);
+    $options = $this->xpath('//select[@id=:id]//option[@value=:option]', [':id' => $id, ':option' => $option]);
+    return $this->assertTrue(isset($options[0]), $message ? $message : SafeMarkup::format('Option @option for field @id exists.', ['@option' => $option, '@id' => $id]), $group);
   }
 
   /**
@@ -1281,8 +1281,8 @@ trait AssertContentTrait {
    *   TRUE on pass, FALSE on fail.
    */
   protected function assertOptionWithDrupalSelector($drupal_selector, $option, $message = '', $group = 'Browser') {
-    $options = $this->xpath('//select[@data-drupal-selector=:data_drupal_selector]//option[@value=:option]', array(':data_drupal_selector' => $drupal_selector, ':option' => $option));
-    return $this->assertTrue(isset($options[0]), $message ? $message : SafeMarkup::format('Option @option for field @data_drupal_selector exists.', array('@option' => $option, '@data_drupal_selector' => $drupal_selector)), $group);
+    $options = $this->xpath('//select[@data-drupal-selector=:data_drupal_selector]//option[@value=:option]', [':data_drupal_selector' => $drupal_selector, ':option' => $option]);
+    return $this->assertTrue(isset($options[0]), $message ? $message : SafeMarkup::format('Option @option for field @data_drupal_selector exists.', ['@option' => $option, '@data_drupal_selector' => $drupal_selector]), $group);
   }
 
   /**
@@ -1307,9 +1307,9 @@ trait AssertContentTrait {
    *   TRUE on pass, FALSE on fail.
    */
   protected function assertNoOption($id, $option, $message = '', $group = 'Browser') {
-    $selects = $this->xpath('//select[@id=:id]', array(':id' => $id));
-    $options = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
-    return $this->assertTrue(isset($selects[0]) && !isset($options[0]), $message ? $message : SafeMarkup::format('Option @option for field @id does not exist.', array('@option' => $option, '@id' => $id)), $group);
+    $selects = $this->xpath('//select[@id=:id]', [':id' => $id]);
+    $options = $this->xpath('//select[@id=:id]//option[@value=:option]', [':id' => $id, ':option' => $option]);
+    return $this->assertTrue(isset($selects[0]) && !isset($options[0]), $message ? $message : SafeMarkup::format('Option @option for field @id does not exist.', ['@option' => $option, '@id' => $id]), $group);
   }
 
   /**
@@ -1336,8 +1336,8 @@ trait AssertContentTrait {
    * @todo $id is unusable. Replace with $name.
    */
   protected function assertOptionSelected($id, $option, $message = '', $group = 'Browser') {
-    $elements = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
-    return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['selected']), $message ? $message : SafeMarkup::format('Option @option for field @id is selected.', array('@option' => $option, '@id' => $id)), $group);
+    $elements = $this->xpath('//select[@id=:id]//option[@value=:option]', [':id' => $id, ':option' => $option]);
+    return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['selected']), $message ? $message : SafeMarkup::format('Option @option for field @id is selected.', ['@option' => $option, '@id' => $id]), $group);
   }
 
   /**
@@ -1364,8 +1364,8 @@ trait AssertContentTrait {
    * @todo $id is unusable. Replace with $name.
    */
   protected function assertOptionSelectedWithDrupalSelector($drupal_selector, $option, $message = '', $group = 'Browser') {
-    $elements = $this->xpath('//select[@data-drupal-selector=:data_drupal_selector]//option[@value=:option]', array(':data_drupal_selector' => $drupal_selector, ':option' => $option));
-    return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['selected']), $message ? $message : SafeMarkup::format('Option @option for field @data_drupal_selector is selected.', array('@option' => $option, '@data_drupal_selector' => $drupal_selector)), $group);
+    $elements = $this->xpath('//select[@data-drupal-selector=:data_drupal_selector]//option[@value=:option]', [':data_drupal_selector' => $drupal_selector, ':option' => $option]);
+    return $this->assertTrue(isset($elements[0]) && !empty($elements[0]['selected']), $message ? $message : SafeMarkup::format('Option @option for field @data_drupal_selector is selected.', ['@option' => $option, '@data_drupal_selector' => $drupal_selector]), $group);
   }
 
   /**
@@ -1390,8 +1390,8 @@ trait AssertContentTrait {
    *   TRUE on pass, FALSE on fail.
    */
   protected function assertNoOptionSelected($id, $option, $message = '', $group = 'Browser') {
-    $elements = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
-    return $this->assertTrue(isset($elements[0]) && empty($elements[0]['selected']), $message ? $message : SafeMarkup::format('Option @option for field @id is not selected.', array('@option' => $option, '@id' => $id)), $group);
+    $elements = $this->xpath('//select[@id=:id]//option[@value=:option]', [':id' => $id, ':option' => $option]);
+    return $this->assertTrue(isset($elements[0]) && empty($elements[0]['selected']), $message ? $message : SafeMarkup::format('Option @option for field @id is not selected.', ['@option' => $option, '@id' => $id]), $group);
   }
 
   /**
@@ -1464,12 +1464,12 @@ trait AssertContentTrait {
    * @return bool
    *   TRUE on pass, FALSE on fail.
    */
-  protected function assertNoDuplicateIds($message = '', $group = 'Other', $ids_to_skip = array()) {
+  protected function assertNoDuplicateIds($message = '', $group = 'Other', $ids_to_skip = []) {
     $status = TRUE;
     foreach ($this->xpath('//*[@id]') as $element) {
       $id = (string) $element['id'];
       if (isset($seen_ids[$id]) && !in_array($id, $ids_to_skip)) {
-        $this->fail(SafeMarkup::format('The HTML ID %id is unique.', array('%id' => $id)), $group);
+        $this->fail(SafeMarkup::format('The HTML ID %id is unique.', ['%id' => $id]), $group);
         $status = FALSE;
       }
       $seen_ids[$id] = TRUE;
@@ -1490,7 +1490,7 @@ trait AssertContentTrait {
    */
   protected function constructFieldXpath($attribute, $value) {
     $xpath = '//textarea[@' . $attribute . '=:value]|//input[@' . $attribute . '=:value]|//select[@' . $attribute . '=:value]';
-    return $this->buildXPathQuery($xpath, array(':value' => $value));
+    return $this->buildXPathQuery($xpath, [':value' => $value]);
   }
 
 }
diff --git a/web/core/modules/simpletest/src/BlockCreationTrait.php b/web/core/modules/simpletest/src/BlockCreationTrait.php
index 4b36f787d..b252d9e9e 100644
--- a/web/core/modules/simpletest/src/BlockCreationTrait.php
+++ b/web/core/modules/simpletest/src/BlockCreationTrait.php
@@ -38,19 +38,19 @@ trait BlockCreationTrait {
    * @todo
    *   Add support for creating custom block instances.
    */
-  protected function placeBlock($plugin_id, array $settings = array()) {
+  protected function placeBlock($plugin_id, array $settings = []) {
     $config = \Drupal::configFactory();
-    $settings += array(
+    $settings += [
       'plugin' => $plugin_id,
       'region' => 'sidebar_first',
       'id' => strtolower($this->randomMachineName(8)),
       'theme' => $config->get('system.theme')->get('default'),
       'label' => $this->randomMachineName(8),
-      'visibility' => array(),
+      'visibility' => [],
       'weight' => 0,
-    );
+    ];
     $values = [];
-    foreach (array('region', 'id', 'theme', 'plugin', 'weight', 'visibility') as $key) {
+    foreach (['region', 'id', 'theme', 'plugin', 'weight', 'visibility'] as $key) {
       $values[$key] = $settings[$key];
       // Remove extra values that do not belong in the settings array.
       unset($settings[$key]);
diff --git a/web/core/modules/simpletest/src/ContentTypeCreationTrait.php b/web/core/modules/simpletest/src/ContentTypeCreationTrait.php
index 54712df0b..9ad0a2179 100644
--- a/web/core/modules/simpletest/src/ContentTypeCreationTrait.php
+++ b/web/core/modules/simpletest/src/ContentTypeCreationTrait.php
@@ -22,7 +22,7 @@ trait ContentTypeCreationTrait {
    * @return \Drupal\node\Entity\NodeType
    *   Created content type.
    */
-  protected function createContentType(array $values = array()) {
+  protected function createContentType(array $values = []) {
     // Find a non-existent random type name.
     if (!isset($values['type'])) {
       do {
@@ -32,19 +32,19 @@ trait ContentTypeCreationTrait {
     else {
       $id = $values['type'];
     }
-    $values += array(
+    $values += [
       'type' => $id,
       'name' => $id,
-    );
+    ];
     $type = NodeType::create($values);
     $status = $type->save();
     node_add_body_field($type);
 
     if ($this instanceof \PHPUnit_Framework_TestCase) {
-      $this->assertSame($status, SAVED_NEW, (new FormattableMarkup('Created content type %type.', array('%type' => $type->id())))->__toString());
+      $this->assertSame($status, SAVED_NEW, (new FormattableMarkup('Created content type %type.', ['%type' => $type->id()]))->__toString());
     }
     else {
-      $this->assertEqual($status, SAVED_NEW, (new FormattableMarkup('Created content type %type.', array('%type' => $type->id())))->__toString());
+      $this->assertEqual($status, SAVED_NEW, (new FormattableMarkup('Created content type %type.', ['%type' => $type->id()]))->__toString());
     }
 
     return $type;
diff --git a/web/core/modules/simpletest/src/Form/SimpletestResultsForm.php b/web/core/modules/simpletest/src/Form/SimpletestResultsForm.php
index c22c0a7d0..090ae0276 100644
--- a/web/core/modules/simpletest/src/Form/SimpletestResultsForm.php
+++ b/web/core/modules/simpletest/src/Form/SimpletestResultsForm.php
@@ -59,40 +59,40 @@ class SimpletestResultsForm extends FormBase {
    * Builds the status image map.
    */
   protected static function buildStatusImageMap() {
-    $image_pass = array(
+    $image_pass = [
       '#theme' => 'image',
       '#uri' => 'core/misc/icons/73b355/check.svg',
       '#width' => 18,
       '#height' => 18,
       '#alt' => 'Pass',
-    );
-    $image_fail = array(
+    ];
+    $image_fail = [
       '#theme' => 'image',
       '#uri' => 'core/misc/icons/e32700/error.svg',
       '#width' => 18,
       '#height' => 18,
       '#alt' => 'Fail',
-    );
-    $image_exception = array(
+    ];
+    $image_exception = [
       '#theme' => 'image',
       '#uri' => 'core/misc/icons/e29700/warning.svg',
       '#width' => 18,
       '#height' => 18,
       '#alt' => 'Exception',
-    );
-    $image_debug = array(
+    ];
+    $image_debug = [
       '#theme' => 'image',
       '#uri' => 'core/misc/icons/e29700/warning.svg',
       '#width' => 18,
       '#height' => 18,
       '#alt' => 'Debug',
-    );
-    return array(
+    ];
+    return [
       'pass' => $image_pass,
       'fail' => $image_fail,
       'exception' => $image_exception,
       'debug' => $image_debug,
-    );
+    ];
   }
 
   /**
@@ -108,10 +108,10 @@ class SimpletestResultsForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state, $test_id = NULL) {
     // Make sure there are test results to display and a re-run is not being
     // performed.
-    $results = array();
+    $results = [];
     if (is_numeric($test_id) && !$results = $this->getResults($test_id)) {
       drupal_set_message($this->t('No test results to display.'), 'error');
-      return new RedirectResponse($this->url('simpletest.test_form', array(), array('absolute' => TRUE)));
+      return new RedirectResponse($this->url('simpletest.test_form', [], ['absolute' => TRUE]));
     }
 
     // Load all classes and include CSS.
@@ -120,45 +120,45 @@ class SimpletestResultsForm extends FormBase {
     $filter = static::addResultForm($form, $results, $this->getStringTranslation());
 
     // Actions.
-    $form['#action'] = $this->url('simpletest.result_form', array('test_id' => 're-run'));
-    $form['action'] = array(
+    $form['#action'] = $this->url('simpletest.result_form', ['test_id' => 're-run']);
+    $form['action'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Actions'),
-      '#attributes' => array('class' => array('container-inline')),
+      '#attributes' => ['class' => ['container-inline']],
       '#weight' => -11,
-    );
+    ];
 
-    $form['action']['filter'] = array(
+    $form['action']['filter'] = [
       '#type' => 'select',
       '#title' => 'Filter',
-      '#options' => array(
-        'all' => $this->t('All (@count)', array('@count' => count($filter['pass']) + count($filter['fail']))),
-        'pass' => $this->t('Pass (@count)', array('@count' => count($filter['pass']))),
-        'fail' => $this->t('Fail (@count)', array('@count' => count($filter['fail']))),
-      ),
-    );
+      '#options' => [
+        'all' => $this->t('All (@count)', ['@count' => count($filter['pass']) + count($filter['fail'])]),
+        'pass' => $this->t('Pass (@count)', ['@count' => count($filter['pass'])]),
+        'fail' => $this->t('Fail (@count)', ['@count' => count($filter['fail'])]),
+      ],
+    ];
     $form['action']['filter']['#default_value'] = ($filter['fail'] ? 'fail' : 'all');
 
     // Categorized test classes for to be used with selected filter value.
-    $form['action']['filter_pass'] = array(
+    $form['action']['filter_pass'] = [
       '#type' => 'hidden',
       '#default_value' => implode(',', $filter['pass']),
-    );
-    $form['action']['filter_fail'] = array(
+    ];
+    $form['action']['filter_fail'] = [
       '#type' => 'hidden',
       '#default_value' => implode(',', $filter['fail']),
-    );
+    ];
 
-    $form['action']['op'] = array(
+    $form['action']['op'] = [
       '#type' => 'submit',
       '#value' => $this->t('Run tests'),
-    );
+    ];
 
-    $form['action']['return'] = array(
+    $form['action']['return'] = [
       '#type' => 'link',
       '#title' => $this->t('Return to list'),
       '#url' => Url::fromRoute('simpletest.test_form'),
-    );
+    ];
 
     if (is_numeric($test_id)) {
       simpletest_clean_results_table($test_id);
@@ -171,8 +171,8 @@ class SimpletestResultsForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $pass = $form_state->getValue('filter_pass') ? explode(',', $form_state->getValue('filter_pass')) : array();
-    $fail = $form_state->getValue('filter_fail') ? explode(',', $form_state->getValue('filter_fail')) : array();
+    $pass = $form_state->getValue('filter_pass') ? explode(',', $form_state->getValue('filter_pass')) : [];
+    $fail = $form_state->getValue('filter_fail') ? explode(',', $form_state->getValue('filter_fail')) : [];
 
     if ($form_state->getValue('filter') == 'all') {
       $classes = array_merge($pass, $fail);
@@ -189,7 +189,7 @@ class SimpletestResultsForm extends FormBase {
       return;
     }
 
-    $form_execute = array();
+    $form_execute = [];
     $form_state_execute = new FormState();
     foreach ($classes as $class) {
       $form_state_execute->setValue(['tests', $class], $class);
@@ -247,10 +247,10 @@ class SimpletestResultsForm extends FormBase {
    */
   public static function addResultForm(array &$form, array $results) {
     // Transform the test results to be grouped by test class.
-    $test_results = array();
+    $test_results = [];
     foreach ($results as $result) {
       if (!isset($test_results[$result->test_class])) {
-        $test_results[$result->test_class] = array();
+        $test_results[$result->test_class] = [];
       }
       $test_results[$result->test_class][] = $result;
     }
@@ -258,55 +258,55 @@ class SimpletestResultsForm extends FormBase {
     $image_status_map = static::buildStatusImageMap();
 
     // Keep track of which test cases passed or failed.
-    $filter = array(
-      'pass' => array(),
-      'fail' => array(),
-    );
+    $filter = [
+      'pass' => [],
+      'fail' => [],
+    ];
 
     // Summary result widget.
-    $form['result'] = array(
+    $form['result'] = [
       '#type' => 'fieldset',
       '#title' => 'Results',
       // Because this is used in a theme-less situation need to provide a
       // default.
-      '#attributes' => array(),
-    );
-    $form['result']['summary'] = $summary = array(
+      '#attributes' => [],
+    ];
+    $form['result']['summary'] = $summary = [
       '#theme' => 'simpletest_result_summary',
       '#pass' => 0,
       '#fail' => 0,
       '#exception' => 0,
       '#debug' => 0,
-    );
+    ];
 
     \Drupal::service('test_discovery')->registerTestNamespaces();
 
     // Cycle through each test group.
-    $header = array(
+    $header = [
       'Message',
       'Group',
       'Filename',
       'Line',
       'Function',
-      array('colspan' => 2, 'data' => 'Status')
-    );
-    $form['result']['results'] = array();
+      ['colspan' => 2, 'data' => 'Status']
+    ];
+    $form['result']['results'] = [];
     foreach ($test_results as $group => $assertions) {
       // Create group details with summary information.
       $info = TestDiscovery::getTestInfo($group);
-      $form['result']['results'][$group] = array(
+      $form['result']['results'][$group] = [
         '#type' => 'details',
         '#title' => $info['name'],
         '#open' => TRUE,
         '#description' => $info['description'],
-      );
+      ];
       $form['result']['results'][$group]['summary'] = $summary;
       $group_summary =& $form['result']['results'][$group]['summary'];
 
       // Create table of assertions for the group.
-      $rows = array();
+      $rows = [];
       foreach ($assertions as $assertion) {
-        $row = array();
+        $row = [];
         $row[] = ['data' => ['#markup' => $assertion->message]];
         $row[] = $assertion->message_group;
         $row[] = \Drupal::service('file_system')->basename(($assertion->file));
@@ -318,16 +318,16 @@ class SimpletestResultsForm extends FormBase {
         if ($assertion->message_group == 'Debug') {
           $class = 'simpletest-debug';
         }
-        $rows[] = array('data' => $row, 'class' => array($class));
+        $rows[] = ['data' => $row, 'class' => [$class]];
 
         $group_summary['#' . $assertion->status]++;
         $form['result']['summary']['#' . $assertion->status]++;
       }
-      $form['result']['results'][$group]['table'] = array(
+      $form['result']['results'][$group]['table'] = [
         '#type' => 'table',
         '#header' => $header,
         '#rows' => $rows,
-      );
+      ];
 
       // Set summary information.
       $group_summary['#ok'] = $group_summary['#fail'] + $group_summary['#exception'] == 0;
diff --git a/web/core/modules/simpletest/src/Form/SimpletestSettingsForm.php b/web/core/modules/simpletest/src/Form/SimpletestSettingsForm.php
index 744915fbe..d1ee436c8 100644
--- a/web/core/modules/simpletest/src/Form/SimpletestSettingsForm.php
+++ b/web/core/modules/simpletest/src/Form/SimpletestSettingsForm.php
@@ -29,56 +29,56 @@ class SimpletestSettingsForm extends ConfigFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $config = $this->config('simpletest.settings');
-    $form['general'] = array(
+    $form['general'] = [
       '#type' => 'details',
       '#title' => $this->t('General'),
       '#open' => TRUE,
-    );
-    $form['general']['simpletest_clear_results'] = array(
+    ];
+    $form['general']['simpletest_clear_results'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Clear results after each complete test suite run'),
       '#description' => $this->t('By default SimpleTest will clear the results after they have been viewed on the results page, but in some cases it may be useful to leave the results in the database. The results can then be viewed at <em>admin/config/development/testing/results/[test_id]</em>. The test ID can be found in the database, simpletest table, or kept track of when viewing the results the first time. Additionally, some modules may provide more analysis or features that require this setting to be disabled.'),
       '#default_value' => $config->get('clear_results'),
-    );
-    $form['general']['simpletest_verbose'] = array(
+    ];
+    $form['general']['simpletest_verbose'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Provide verbose information when running tests'),
       '#description' => $this->t('The verbose data will be printed along with the standard assertions and is useful for debugging. The verbose data will be erased between each test suite run. The verbose data output is very detailed and should only be used when debugging.'),
       '#default_value' => $config->get('verbose'),
-    );
+    ];
 
-    $form['httpauth'] = array(
+    $form['httpauth'] = [
       '#type' => 'details',
       '#title' => $this->t('HTTP authentication'),
       '#description' => $this->t('HTTP auth settings to be used by the SimpleTest browser during testing. Useful when the site requires basic HTTP authentication.'),
-    );
-    $form['httpauth']['simpletest_httpauth_method'] = array(
+    ];
+    $form['httpauth']['simpletest_httpauth_method'] = [
       '#type' => 'select',
       '#title' => $this->t('Method'),
-      '#options' => array(
+      '#options' => [
         CURLAUTH_BASIC => $this->t('Basic'),
         CURLAUTH_DIGEST => $this->t('Digest'),
         CURLAUTH_GSSNEGOTIATE => $this->t('GSS negotiate'),
         CURLAUTH_NTLM => $this->t('NTLM'),
         CURLAUTH_ANY => $this->t('Any'),
         CURLAUTH_ANYSAFE => $this->t('Any safe'),
-      ),
+      ],
       '#default_value' => $config->get('httpauth.method'),
-    );
+    ];
     $username = $config->get('httpauth.username');
     $password = $config->get('httpauth.password');
-    $form['httpauth']['simpletest_httpauth_username'] = array(
+    $form['httpauth']['simpletest_httpauth_username'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Username'),
       '#default_value' => $username,
-    );
+    ];
     if (!empty($username) && !empty($password)) {
       $form['httpauth']['simpletest_httpauth_username']['#description'] = $this->t('Leave this blank to delete both the existing username and password.');
     }
-    $form['httpauth']['simpletest_httpauth_password'] = array(
+    $form['httpauth']['simpletest_httpauth_password'] = [
       '#type' => 'password',
       '#title' => $this->t('Password'),
-    );
+    ];
     if ($password) {
       $form['httpauth']['simpletest_httpauth_password']['#description'] = $this->t('To change the password, enter the new password here.');
     }
diff --git a/web/core/modules/simpletest/src/Form/SimpletestTestForm.php b/web/core/modules/simpletest/src/Form/SimpletestTestForm.php
index 8ad5fe2ab..f954546eb 100644
--- a/web/core/modules/simpletest/src/Form/SimpletestTestForm.php
+++ b/web/core/modules/simpletest/src/Form/SimpletestTestForm.php
@@ -5,6 +5,7 @@ namespace Drupal\simpletest\Form;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\RendererInterface;
+use Drupal\simpletest\TestDiscovery;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -19,12 +20,20 @@ class SimpletestTestForm extends FormBase {
    */
   protected $renderer;
 
+  /**
+   * The test discovery service.
+   *
+   * @var \Drupal\simpletest\TestDiscovery
+   */
+  protected $testDiscovery;
+
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('renderer')
+      $container->get('renderer'),
+      $container->get('test_discovery')
     );
   }
 
@@ -33,9 +42,12 @@ class SimpletestTestForm extends FormBase {
    *
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
+   * @param \Drupal\simpletest\TestDiscovery $test_discovery
+   *   The test discovery service.
    */
-  public function __construct(RendererInterface $renderer) {
+  public function __construct(RendererInterface $renderer, TestDiscovery $test_discovery) {
     $this->renderer = $renderer;
+    $this->testDiscovery = $test_discovery;
   }
 
   /**
@@ -49,24 +61,24 @@ class SimpletestTestForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Run tests'),
       '#tableselect' => TRUE,
       '#button_type' => 'primary',
-    );
-    $form['clean'] = array(
+    ];
+    $form['clean'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Clean test environment'),
       '#description' => $this->t('Remove tables with the prefix "simpletest" and temporary directories that are left over from tests that crashed. This is intended for developers when creating tests.'),
       '#weight' => 200,
-    );
-    $form['clean']['op'] = array(
+    ];
+    $form['clean']['op'] = [
       '#type' => 'submit',
       '#value' => $this->t('Clean environment'),
-      '#submit' => array('simpletest_clean_environment'),
-    );
+      '#submit' => ['simpletest_clean_environment'],
+    ];
 
     // Do not needlessly re-execute a full test discovery if the user input
     // already contains an explicit list of test classes to run.
@@ -76,43 +88,43 @@ class SimpletestTestForm extends FormBase {
     }
 
     // JavaScript-only table filters.
-    $form['filters'] = array(
+    $form['filters'] = [
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('table-filter', 'js-show'),
-      ),
-    );
-    $form['filters']['text'] = array(
+      '#attributes' => [
+        'class' => ['table-filter', 'js-show'],
+      ],
+    ];
+    $form['filters']['text'] = [
       '#type' => 'search',
       '#title' => $this->t('Search'),
       '#size' => 30,
       '#placeholder' => $this->t('Enter test name…'),
-      '#attributes' => array(
-        'class' => array('table-filter-text'),
+      '#attributes' => [
+        'class' => ['table-filter-text'],
         'data-table' => '#simpletest-test-form',
         'autocomplete' => 'off',
         'title' => $this->t('Enter at least 3 characters of the test name or description to filter by.'),
-      ),
-    );
+      ],
+    ];
 
-    $form['tests'] = array(
+    $form['tests'] = [
       '#type' => 'table',
       '#id' => 'simpletest-form-table',
       '#tableselect' => TRUE,
-      '#header' => array(
-        array('data' => $this->t('Test'), 'class' => array('simpletest-test-label')),
-        array('data' => $this->t('Description'), 'class' => array('simpletest-test-description')),
-      ),
+      '#header' => [
+        ['data' => $this->t('Test'), 'class' => ['simpletest-test-label']],
+        ['data' => $this->t('Description'), 'class' => ['simpletest-test-description']],
+      ],
       '#empty' => $this->t('No tests to display.'),
-      '#attached' => array(
-        'library' => array(
+      '#attached' => [
+        'library' => [
           'simpletest/drupal.simpletest',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     // Define the images used to expand/collapse the test groups.
-    $image_collapsed = array(
+    $image_collapsed = [
       '#theme' => 'image',
       '#uri' => 'core/misc/menu-collapsed.png',
       '#width' => '7',
@@ -120,8 +132,8 @@ class SimpletestTestForm extends FormBase {
       '#alt' => $this->t('Expand'),
       '#title' => $this->t('Expand'),
       '#suffix' => '<a href="#" class="simpletest-collapse">(' . $this->t('Expand') . ')</a>',
-    );
-    $image_extended = array(
+    ];
+    $image_extended = [
       '#theme' => 'image',
       '#uri' => 'core/misc/menu-expanded.png',
       '#width' => '7',
@@ -129,18 +141,18 @@ class SimpletestTestForm extends FormBase {
       '#alt' => $this->t('Collapse'),
       '#title' => $this->t('Collapse'),
       '#suffix' => '<a href="#" class="simpletest-collapse">(' . $this->t('Collapse') . ')</a>',
-    );
+    ];
     $form['tests']['#attached']['drupalSettings']['simpleTest']['images'] = [
       (string) $this->renderer->renderPlain($image_collapsed),
       (string) $this->renderer->renderPlain($image_extended),
     ];
 
     // Generate the list of tests arranged by group.
-    $groups = simpletest_test_get_all();
+    $groups = $this->testDiscovery->getTestClasses();
     foreach ($groups as $group => $tests) {
-      $form['tests'][$group] = array(
-        '#attributes' => array('class' => array('simpletest-group')),
-      );
+      $form['tests'][$group] = [
+        '#attributes' => ['class' => ['simpletest-group']],
+      ];
 
       // Make the class name safe for output on the page by replacing all
       // non-word/decimal characters with a dash (-).
@@ -148,47 +160,47 @@ class SimpletestTestForm extends FormBase {
 
       // Override tableselect column with custom selector for this group.
       // This group-select-all checkbox is injected via JavaScript.
-      $form['tests'][$group]['select'] = array(
-        '#wrapper_attributes' => array(
+      $form['tests'][$group]['select'] = [
+        '#wrapper_attributes' => [
           'id' => $group_class,
-          'class' => array('simpletest-group-select-all'),
-        ),
-      );
-      $form['tests'][$group]['title'] = array(
+          'class' => ['simpletest-group-select-all'],
+        ],
+      ];
+      $form['tests'][$group]['title'] = [
         // Expand/collapse image.
         '#prefix' => '<div class="simpletest-image" id="simpletest-test-group-' . $group_class . '"></div>',
         '#markup' => '<label for="' . $group_class . '-group-select-all">' . $group . '</label>',
-        '#wrapper_attributes' => array(
-          'class' => array('simpletest-group-label'),
-        ),
-      );
-      $form['tests'][$group]['description'] = array(
+        '#wrapper_attributes' => [
+          'class' => ['simpletest-group-label'],
+        ],
+      ];
+      $form['tests'][$group]['description'] = [
         '#markup' => '&nbsp;',
-        '#wrapper_attributes' => array(
-          'class' => array('simpletest-group-description'),
-        ),
-      );
+        '#wrapper_attributes' => [
+          'class' => ['simpletest-group-description'],
+        ],
+      ];
 
       // Cycle through each test within the current group.
       foreach ($tests as $class => $info) {
-        $form['tests'][$class] = array(
-          '#attributes' => array('class' => array($group_class . '-test', 'js-hide')),
-        );
-        $form['tests'][$class]['title'] = array(
+        $form['tests'][$class] = [
+          '#attributes' => ['class' => [$group_class . '-test', 'js-hide']],
+        ];
+        $form['tests'][$class]['title'] = [
           '#type' => 'label',
           '#title' => '\\' . $info['name'],
-          '#wrapper_attributes' => array(
-            'class' => array('simpletest-test-label', 'table-filter-text-source'),
-          ),
-        );
-        $form['tests'][$class]['description'] = array(
+          '#wrapper_attributes' => [
+            'class' => ['simpletest-test-label', 'table-filter-text-source'],
+          ],
+        ];
+        $form['tests'][$class]['description'] = [
           '#prefix' => '<div class="description">',
           '#plain_text' => $info['description'],
           '#suffix' => '</div>',
-          '#wrapper_attributes' => array(
-            'class' => array('simpletest-test-description', 'table-filter-text-source'),
-          ),
-        );
+          '#wrapper_attributes' => [
+            'class' => ['simpletest-test-description', 'table-filter-text-source'],
+          ],
+        ];
       }
     }
 
@@ -200,7 +212,7 @@ class SimpletestTestForm extends FormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     // Test discovery does not run upon form submission.
-    simpletest_classloader_register();
+    $this->testDiscovery->registerTestNamespaces();
 
     // This form accepts arbitrary user input for 'tests'.
     // An invalid value will cause the $class_name lookup below to die with a
@@ -221,7 +233,7 @@ class SimpletestTestForm extends FormBase {
       $test_id = simpletest_run_tests($tests_list, 'drupal');
       $form_state->setRedirect(
         'simpletest.result_form',
-        array('test_id' => $test_id)
+        ['test_id' => $test_id]
       );
     }
   }
diff --git a/web/core/modules/simpletest/src/InstallerTestBase.php b/web/core/modules/simpletest/src/InstallerTestBase.php
index f1f3a11bf..92f33dcf5 100644
--- a/web/core/modules/simpletest/src/InstallerTestBase.php
+++ b/web/core/modules/simpletest/src/InstallerTestBase.php
@@ -23,7 +23,7 @@ abstract class InstallerTestBase extends WebTestBase {
    *   An array of settings to write out, in the format expected by
    *   drupal_rewrite_settings().
    */
-  protected $settings = array();
+  protected $settings = [];
 
   /**
    * The language code in which to install Drupal.
@@ -46,7 +46,7 @@ abstract class InstallerTestBase extends WebTestBase {
    *
    * @var array
    */
-  protected $parameters = array();
+  protected $parameters = [];
 
   /**
    * A string translation map used for translated installer screens.
@@ -55,9 +55,9 @@ abstract class InstallerTestBase extends WebTestBase {
    *
    * @var array
    */
-  protected $translations = array(
+  protected $translations = [
     'Save and continue' => 'Save and continue',
-  );
+  ];
 
   /**
    * Whether the installer has completed.
@@ -73,12 +73,12 @@ abstract class InstallerTestBase extends WebTestBase {
     $this->isInstalled = FALSE;
 
     // Define information about the user 1 account.
-    $this->rootUser = new UserSession(array(
+    $this->rootUser = new UserSession([
       'uid' => 1,
       'name' => 'admin',
       'mail' => 'admin@example.com',
       'pass_raw' => $this->randomMachineName(),
-    ));
+    ]);
 
     // If any $settings are defined for this test, copy and prepare an actual
     // settings.php, so as to resemble a regular installation.
@@ -171,9 +171,9 @@ abstract class InstallerTestBase extends WebTestBase {
    * Installer step: Select language.
    */
   protected function setUpLanguage() {
-    $edit = array(
+    $edit = [
       'langcode' => $this->langcode,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, $this->translations['Save and continue']);
   }
 
@@ -181,9 +181,9 @@ abstract class InstallerTestBase extends WebTestBase {
    * Installer step: Select installation profile.
    */
   protected function setUpProfile() {
-    $edit = array(
+    $edit = [
       'profile' => $this->profile,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, $this->translations['Save and continue']);
   }
 
diff --git a/web/core/modules/simpletest/src/KernelTestBase.php b/web/core/modules/simpletest/src/KernelTestBase.php
index fbf58a5d9..8c92ec7da 100644
--- a/web/core/modules/simpletest/src/KernelTestBase.php
+++ b/web/core/modules/simpletest/src/KernelTestBase.php
@@ -5,6 +5,7 @@ namespace Drupal\simpletest;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Variable;
+use Drupal\Core\Config\Development\ConfigSchemaChecker;
 use Drupal\Core\Database\Database;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DrupalKernel;
@@ -60,7 +61,7 @@ abstract class KernelTestBase extends TestBase {
    *
    * @var array
    */
-  public static $modules = array();
+  public static $modules = [];
 
   private $moduleFiles;
   private $themeFiles;
@@ -70,7 +71,7 @@ abstract class KernelTestBase extends TestBase {
    *
    * @var array
    */
-  protected $configDirectories = array();
+  protected $configDirectories = [];
 
   /**
    * A KeyValueMemoryFactory instance to use when building the container.
@@ -84,12 +85,12 @@ abstract class KernelTestBase extends TestBase {
    *
    * @var array
    */
-  protected $streamWrappers = array();
+  protected $streamWrappers = [];
 
   /**
    * {@inheritdoc}
    */
-  function __construct($test_id = NULL) {
+  public function __construct($test_id = NULL) {
     parent::__construct($test_id);
     $this->skipClasses[__CLASS__] = TRUE;
   }
@@ -100,8 +101,8 @@ abstract class KernelTestBase extends TestBase {
   protected function beforePrepareEnvironment() {
     // Copy/prime extension file lists once to avoid filesystem scans.
     if (!isset($this->moduleFiles)) {
-      $this->moduleFiles = \Drupal::state()->get('system.module.files') ?: array();
-      $this->themeFiles = \Drupal::state()->get('system.theme.files') ?: array();
+      $this->moduleFiles = \Drupal::state()->get('system.module.files') ?: [];
+      $this->themeFiles = \Drupal::state()->get('system.theme.files') ?: [];
     }
   }
 
@@ -114,7 +115,7 @@ abstract class KernelTestBase extends TestBase {
    *   Thrown when CONFIG_SYNC_DIRECTORY cannot be created or made writable.
    */
   protected function prepareConfigDirectories() {
-    $this->configDirectories = array();
+    $this->configDirectories = [];
     include_once DRUPAL_ROOT . '/core/includes/install.inc';
     // Assign the relative path to the global variable.
     $path = $this->siteDirectory . '/config_' . CONFIG_SYNC_DIRECTORY;
@@ -231,11 +232,11 @@ EOD;
     // \Drupal\Core\Config\ConfigInstaller::installDefaultConfig() to work.
     // Write directly to active storage to avoid early instantiation of
     // the event dispatcher which can prevent modules from registering events.
-    \Drupal::service('config.storage')->write('core.extension', array('module' => array(), 'theme' => array()));
+    \Drupal::service('config.storage')->write('core.extension', ['module' => [], 'theme' => [], 'profile' => '']);
 
     // Collect and set a fixed module list.
     $class = get_class($this);
-    $modules = array();
+    $modules = [];
     while ($class) {
       if (property_exists($class, 'modules')) {
         // Only add the modules, if the $modules property was not inherited.
@@ -261,7 +262,7 @@ EOD;
     // @see https://www.drupal.org/node/2028109
     file_prepare_directory($this->publicFilesDirectory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);
     $this->settingsSet('file_public_path', $this->publicFilesDirectory);
-    $this->streamWrappers = array();
+    $this->streamWrappers = [];
     $this->registerStreamWrapper('public', 'Drupal\Core\StreamWrapper\PublicStream');
     // The temporary stream wrapper is able to operate both with and without
     // configuration.
@@ -321,13 +322,13 @@ EOD;
 
     if ($this->strictConfigSchema) {
       $container
-        ->register('simpletest.config_schema_checker', 'Drupal\Core\Config\Testing\ConfigSchemaChecker')
+        ->register('simpletest.config_schema_checker', ConfigSchemaChecker::class)
         ->addArgument(new Reference('config.typed'))
         ->addArgument($this->getConfigSchemaExclusions())
         ->addTag('event_subscriber');
     }
 
-    $keyvalue_options = $container->getParameter('factory.keyvalue') ?: array();
+    $keyvalue_options = $container->getParameter('factory.keyvalue') ?: [];
     $keyvalue_options['default'] = 'keyvalue.memory';
     $container->setParameter('factory.keyvalue', $keyvalue_options);
     $container->set('keyvalue.memory', $this->keyValueFactory);
@@ -365,14 +366,14 @@ EOD;
     }
 
     if ($container->hasDefinition('password')) {
-      $container->getDefinition('password')->setArguments(array(1));
+      $container->getDefinition('password')->setArguments([1]);
     }
 
     // Register the stream wrapper manager.
     $container
       ->register('stream_wrapper_manager', 'Drupal\Core\StreamWrapper\StreamWrapperManager')
       ->addArgument(new Reference('module_handler'))
-      ->addMethodCall('setContainer', array(new Reference('service_container')));
+      ->addMethodCall('setContainer', [new Reference('service_container')]);
 
     $request = Request::create('/');
     $container->get('request_stack')->push($request);
@@ -404,9 +405,9 @@ EOD;
       }
       \Drupal::service('config.installer')->installDefaultConfig('module', $module);
     }
-    $this->pass(format_string('Installed default config: %modules.', array(
+    $this->pass(format_string('Installed default config: %modules.', [
       '%modules' => implode(', ', $modules),
-    )));
+    ]));
   }
 
   /**
@@ -446,10 +447,10 @@ EOD;
       }
       $this->container->get('database')->schema()->createTable($table, $schema);
     }
-    $this->pass(format_string('Installed %module tables: %tables.', array(
+    $this->pass(format_string('Installed %module tables: %tables.', [
       '%tables' => '{' . implode('}, {', $tables) . '}',
       '%module' => $module,
-    )));
+    ]));
   }
 
 
@@ -475,18 +476,18 @@ EOD;
       $all_tables_exist = TRUE;
       foreach ($tables as $table) {
         if (!$db_schema->tableExists($table)) {
-          $this->fail(SafeMarkup::format('Installed entity type table for the %entity_type entity type: %table', array(
+          $this->fail(SafeMarkup::format('Installed entity type table for the %entity_type entity type: %table', [
             '%entity_type' => $entity_type_id,
             '%table' => $table,
-          )));
+          ]));
           $all_tables_exist = FALSE;
         }
       }
       if ($all_tables_exist) {
-        $this->pass(SafeMarkup::format('Installed entity type tables for the %entity_type entity type: %tables', array(
+        $this->pass(SafeMarkup::format('Installed entity type tables for the %entity_type entity type: %tables', [
           '%entity_type' => $entity_type_id,
           '%tables' => '{' . implode('}, {', $tables) . '}',
-        )));
+        ]));
       }
     }
   }
@@ -538,9 +539,9 @@ EOD;
     // Note that the kernel has rebuilt the container; this $module_handler is
     // no longer the $module_handler instance from above.
     $this->container->get('module_handler')->reload();
-    $this->pass(format_string('Enabled modules: %modules.', array(
+    $this->pass(format_string('Enabled modules: %modules.', [
       '%modules' => implode(', ', $modules),
-    )));
+    ]));
   }
 
   /**
@@ -573,9 +574,9 @@ EOD;
     // no longer the $module_handler instance from above.
     $module_handler = $this->container->get('module_handler');
     $module_handler->reload();
-    $this->pass(format_string('Disabled modules: %modules.', array(
+    $this->pass(format_string('Disabled modules: %modules.', [
       '%modules' => implode(', ', $modules),
-    )));
+    ]));
   }
 
   /**
diff --git a/web/core/modules/simpletest/src/NodeCreationTrait.php b/web/core/modules/simpletest/src/NodeCreationTrait.php
index 9ed55d809..20dc3f837 100644
--- a/web/core/modules/simpletest/src/NodeCreationTrait.php
+++ b/web/core/modules/simpletest/src/NodeCreationTrait.php
@@ -22,7 +22,7 @@ trait NodeCreationTrait {
    * @return \Drupal\node\NodeInterface
    *   A node entity matching $title.
    */
-  function getNodeByTitle($title, $reset = FALSE) {
+  public function getNodeByTitle($title, $reset = FALSE) {
     if ($reset) {
       \Drupal::entityTypeManager()->getStorage('node')->resetCache();
     }
@@ -64,17 +64,17 @@ trait NodeCreationTrait {
    * @return \Drupal\node\NodeInterface
    *   The created node entity.
    */
-  protected function createNode(array $settings = array()) {
+  protected function createNode(array $settings = []) {
     // Populate defaults array.
-    $settings += array(
-      'body'      => array(array(
+    $settings += [
+      'body'      => [[
         'value' => $this->randomMachineName(32),
         'format' => filter_default_format(),
-      )),
+      ]],
       'title'     => $this->randomMachineName(8),
       'type'      => 'page',
       'uid'       => \Drupal::currentUser()->id(),
-    );
+    ];
     $node = Node::create($settings);
     $node->save();
 
diff --git a/web/core/modules/simpletest/src/TestBase.php b/web/core/modules/simpletest/src/TestBase.php
index 282298dc0..1491cc2af 100644
--- a/web/core/modules/simpletest/src/TestBase.php
+++ b/web/core/modules/simpletest/src/TestBase.php
@@ -10,6 +10,7 @@ use Drupal\Core\Database\Database;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\StreamWrapper\PublicStream;
 use Drupal\Core\Test\TestDatabase;
+use Drupal\Core\Test\TestSetupTrait;
 use Drupal\Core\Utility\Error;
 use Drupal\Tests\ConfigTestTrait;
 use Drupal\Tests\RandomGeneratorTrait;
@@ -22,6 +23,7 @@ use Drupal\Tests\SessionTestTrait;
  */
 abstract class TestBase {
 
+  use TestSetupTrait;
   use SessionTestTrait;
   use RandomGeneratorTrait;
   use AssertHelperTrait;
@@ -31,20 +33,6 @@ abstract class TestBase {
     copyConfig as public;
   }
 
-  /**
-   * The test run ID.
-   *
-   * @var string
-   */
-  protected $testId;
-
-  /**
-   * The site directory of this test run.
-   *
-   * @var string
-   */
-  protected $siteDirectory = NULL;
-
   /**
    * The database prefix of this test run.
    *
@@ -62,19 +50,19 @@ abstract class TestBase {
    *
    * @var Array
    */
-  public $results = array(
+  public $results = [
     '#pass' => 0,
     '#fail' => 0,
     '#exception' => 0,
     '#debug' => 0,
-  );
+  ];
 
   /**
    * Assertions thrown in that test case.
    *
    * @var Array
    */
-  protected $assertions = array();
+  protected $assertions = [];
 
   /**
    * This class is skipped when looking for the source of an assertion.
@@ -84,7 +72,7 @@ abstract class TestBase {
    * that called it. So we need to skip the classes defining these helper
    * methods.
    */
-  protected $skipClasses = array(__CLASS__ => TRUE);
+  protected $skipClasses = [__CLASS__ => TRUE];
 
   /**
    * TRUE if verbose debugging is enabled.
@@ -177,13 +165,6 @@ abstract class TestBase {
    */
   protected $originalPrefix;
 
-  /**
-   * The original installation profile.
-   *
-   * @var string
-   */
-  protected $originalProfile;
-
   /**
    * The name of the session cookie of the test-runner.
    *
@@ -205,13 +186,6 @@ abstract class TestBase {
    */
   protected $originalShutdownCallbacks;
 
-  /**
-   * The site directory of the original parent site.
-   *
-   * @var string
-   */
-  protected $originalSite;
-
   /**
    * The original user, before testing began.
    *
@@ -219,36 +193,6 @@ abstract class TestBase {
    */
   protected $originalUser;
 
-  /**
-   * The public file directory for the test environment.
-   *
-   * This is set in TestBase::prepareEnvironment().
-   *
-   * @var string
-   */
-  protected $publicFilesDirectory;
-
-  /**
-   * The private file directory for the test environment.
-   *
-   * This is set in TestBase::prepareEnvironment().
-   *
-   * @var string
-   */
-  protected $privateFilesDirectory;
-
-  /**
-   * The temporary file directory for the test environment.
-   *
-   * This is set in TestBase::prepareEnvironment(). This value has to match the
-   * temporary directory created in install_base_system() for test installs.
-   *
-   * @see install_base_system()
-   *
-   * @var string
-   */
-  protected $tempFilesDirectory;
-
   /**
    * The translation file directory for the test environment.
    *
@@ -267,20 +211,6 @@ abstract class TestBase {
    */
   public $dieOnFail = FALSE;
 
-  /**
-   * The DrupalKernel instance used in the test.
-   *
-   * @var \Drupal\Core\DrupalKernel
-   */
-  protected $kernel;
-
-  /**
-   * The dependency injection container used in the test.
-   *
-   * @var \Symfony\Component\DependencyInjection\ContainerInterface
-   */
-  protected $container;
-
   /**
    * The config importer that can used in a test.
    *
@@ -288,31 +218,6 @@ abstract class TestBase {
    */
   protected $configImporter;
 
-  /**
-   * Set to TRUE to strict check all configuration saved.
-   *
-   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
-   *
-   * @var bool
-   */
-  protected $strictConfigSchema = TRUE;
-
-  /**
-   * An array of config object names that are excluded from schema checking.
-   *
-   * @var string[]
-   */
-  protected static $configSchemaCheckerExclusions = array(
-    // Following are used to test lack of or partial schema. Where partial
-    // schema is provided, that is explicitly tested in specific tests.
-    'config_schema_test.noschema',
-    'config_schema_test.someschema',
-    'config_schema_test.schema_data_types',
-    'config_schema_test.no_schema_data_types',
-    // Used to test application of schema to filtering of configuration.
-    'config_test.dynamic.system',
-  );
-
   /**
    * HTTP authentication method (specified as a CURLAUTH_* constant).
    *
@@ -350,7 +255,7 @@ abstract class TestBase {
    *   Array of errors containing a list of unmet requirements.
    */
   protected function checkRequirements() {
-    return array();
+    return [];
   }
 
   /**
@@ -414,7 +319,7 @@ abstract class TestBase {
     }
 
     // Creation assertion array that can be displayed while tests are running.
-    $assertion = array(
+    $assertion = [
       'test_id' => $this->testId,
       'test_class' => get_class($this),
       'status' => $status,
@@ -423,7 +328,7 @@ abstract class TestBase {
       'function' => $caller['function'],
       'line' => $caller['line'],
       'file' => $caller['file'],
-    );
+    ];
 
     // Store assertion for display after the test has completed.
     $message_id = $this->storeAssertion($assertion);
@@ -459,19 +364,19 @@ abstract class TestBase {
    * @see \Drupal\simpletest\TestBase::assert()
    * @see \Drupal\simpletest\TestBase::deleteAssert()
    */
-  public static function insertAssert($test_id, $test_class, $status, $message = '', $group = 'Other', array $caller = array()) {
+  public static function insertAssert($test_id, $test_class, $status, $message = '', $group = 'Other', array $caller = []) {
     // Convert boolean status to string status.
     if (is_bool($status)) {
       $status = $status ? 'pass' : 'fail';
     }
 
-    $caller += array(
+    $caller += [
       'function' => 'Unknown',
       'line' => 0,
       'file' => 'Unknown',
-    );
+    ];
 
-    $assertion = array(
+    $assertion = [
       'test_id' => $test_id,
       'test_class' => $test_class,
       'status' => $status,
@@ -480,7 +385,7 @@ abstract class TestBase {
       'function' => $caller['function'],
       'line' => $caller['line'],
       'file' => $caller['file'],
-    );
+    ];
 
     // We can't use storeAssertion() because this method is static.
     return self::getDatabaseConnection()
@@ -508,16 +413,6 @@ abstract class TestBase {
       ->execute();
   }
 
-  /**
-   * Returns the database connection to the site running Simpletest.
-   *
-   * @return \Drupal\Core\Database\Connection
-   *   The database connection to use for inserting assertions.
-   */
-  public static function getDatabaseConnection() {
-    return TestDatabase::getConnection();
-  }
-
   /**
    * Cycles through backtrace until the first non-assertion method is found.
    *
@@ -562,7 +457,7 @@ abstract class TestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertTrue($value, $message = '', $group = 'Other') {
-    return $this->assert((bool) $value, $message ? $message : SafeMarkup::format('Value @value is TRUE.', array('@value' => var_export($value, TRUE))), $group);
+    return $this->assert((bool) $value, $message ? $message : SafeMarkup::format('Value @value is TRUE.', ['@value' => var_export($value, TRUE)]), $group);
   }
 
   /**
@@ -587,7 +482,7 @@ abstract class TestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertFalse($value, $message = '', $group = 'Other') {
-    return $this->assert(!$value, $message ? $message : SafeMarkup::format('Value @value is FALSE.', array('@value' => var_export($value, TRUE))), $group);
+    return $this->assert(!$value, $message ? $message : SafeMarkup::format('Value @value is FALSE.', ['@value' => var_export($value, TRUE)]), $group);
   }
 
   /**
@@ -610,7 +505,7 @@ abstract class TestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertNull($value, $message = '', $group = 'Other') {
-    return $this->assert(!isset($value), $message ? $message : SafeMarkup::format('Value @value is NULL.', array('@value' => var_export($value, TRUE))), $group);
+    return $this->assert(!isset($value), $message ? $message : SafeMarkup::format('Value @value is NULL.', ['@value' => var_export($value, TRUE)]), $group);
   }
 
   /**
@@ -633,7 +528,7 @@ abstract class TestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertNotNull($value, $message = '', $group = 'Other') {
-    return $this->assert(isset($value), $message ? $message : SafeMarkup::format('Value @value is not NULL.', array('@value' => var_export($value, TRUE))), $group);
+    return $this->assert(isset($value), $message ? $message : SafeMarkup::format('Value @value is not NULL.', ['@value' => var_export($value, TRUE)]), $group);
   }
 
   /**
@@ -665,7 +560,7 @@ abstract class TestBase {
     $second = $this->castSafeStrings($second);
     $is_equal = $first == $second;
     if (!$is_equal || !$message) {
-      $default_message = SafeMarkup::format('Value @first is equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE)));
+      $default_message = SafeMarkup::format('Value @first is equal to value @second.', ['@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE)]);
       $message = $message ? $message . PHP_EOL . $default_message : $default_message;
     }
     return $this->assert($is_equal, $message, $group);
@@ -700,7 +595,7 @@ abstract class TestBase {
     $second = $this->castSafeStrings($second);
     $not_equal = $first != $second;
     if (!$not_equal || !$message) {
-      $default_message = SafeMarkup::format('Value @first is not equal to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE)));
+      $default_message = SafeMarkup::format('Value @first is not equal to value @second.', ['@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE)]);
       $message = $message ? $message . PHP_EOL . $default_message : $default_message;
     }
     return $this->assert($not_equal, $message, $group);
@@ -730,7 +625,7 @@ abstract class TestBase {
   protected function assertIdentical($first, $second, $message = '', $group = 'Other') {
     $is_identical = $first === $second;
     if (!$is_identical || !$message) {
-      $default_message = SafeMarkup::format('Value @first is identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE)));
+      $default_message = SafeMarkup::format('Value @first is identical to value @second.', ['@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE)]);
       $message = $message ? $message . PHP_EOL . $default_message : $default_message;
     }
     return $this->assert($is_identical, $message, $group);
@@ -760,7 +655,7 @@ abstract class TestBase {
   protected function assertNotIdentical($first, $second, $message = '', $group = 'Other') {
     $not_identical = $first !== $second;
     if (!$not_identical || !$message) {
-      $default_message = SafeMarkup::format('Value @first is not identical to value @second.', array('@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE)));
+      $default_message = SafeMarkup::format('Value @first is not identical to value @second.', ['@first' => var_export($first, TRUE), '@second' => var_export($second, TRUE)]);
       $message = $message ? $message . PHP_EOL . $default_message : $default_message;
     }
     return $this->assert($not_identical, $message, $group);
@@ -788,10 +683,10 @@ abstract class TestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertIdenticalObject($object1, $object2, $message = '', $group = 'Other') {
-    $message = $message ?: SafeMarkup::format('@object1 is identical to @object2', array(
+    $message = $message ?: SafeMarkup::format('@object1 is identical to @object2', [
       '@object1' => var_export($object1, TRUE),
       '@object2' => var_export($object2, TRUE),
-    ));
+    ]);
     $identical = TRUE;
     foreach ($object1 as $key => $value) {
       $identical = $identical && isset($object2->$key) && $object2->$key === $value;
@@ -963,14 +858,14 @@ abstract class TestBase {
    *   taken into account, but it can be useful to only run a few selected test
    *   methods during debugging.
    */
-  public function run(array $methods = array()) {
+  public function run(array $methods = []) {
     $class = get_class($this);
 
     if ($missing_requirements = $this->checkRequirements()) {
       $object_info = new \ReflectionObject($this);
-      $caller = array(
+      $caller = [
         'file' => $object_info->getFileName(),
-      );
+      ];
       foreach ($missing_requirements as $missing_requirement) {
         TestBase::insertAssert($this->testId, $class, FALSE, $missing_requirement, 'Requirements check', $caller);
       }
@@ -1008,7 +903,7 @@ abstract class TestBase {
     // compatibility.
     Handle::register();
 
-    set_error_handler(array($this, 'errorHandler'));
+    set_error_handler([$this, 'errorHandler']);
     // Iterate through all the methods in this class, unless a specific list of
     // methods to run was passed.
     $test_methods = array_filter(get_class_methods($class), function ($method) {
@@ -1017,7 +912,7 @@ abstract class TestBase {
     if (empty($test_methods)) {
       // Call $this->assert() here because we need to pass along custom caller
       // information, lest the wrong originating code file/line be identified.
-      $this->assert(FALSE, 'No test methods found.', 'Requirements', array('function' => __METHOD__ . '()', 'file' => __FILE__, 'line' => __LINE__));
+      $this->assert(FALSE, 'No test methods found.', 'Requirements', ['function' => __METHOD__ . '()', 'file' => __FILE__, 'line' => __LINE__]);
     }
     if ($methods) {
       $test_methods = array_intersect($test_methods, $methods);
@@ -1026,11 +921,11 @@ abstract class TestBase {
       // Insert a fail record. This will be deleted on completion to ensure
       // that testing completed.
       $method_info = new \ReflectionMethod($class, $method);
-      $caller = array(
+      $caller = [
         'file' => $method_info->getFileName(),
         'line' => $method_info->getStartLine(),
         'function' => $class . '->' . $method . '()',
-      );
+      ];
       $test_completion_check_id = TestBase::insertAssert($this->testId, $class, FALSE, 'The test did not complete due to a fatal error.', 'Completion check', $caller);
 
       try {
@@ -1119,7 +1014,7 @@ abstract class TestBase {
     // All assertions as well as the SimpleTest batch operations are associated
     // with the testId, so the database prefix has to be associated with it.
     $affected_rows = self::getDatabaseConnection()->update('simpletest_test_id')
-      ->fields(array('last_prefix' => $this->databasePrefix))
+      ->fields(['last_prefix' => $this->databasePrefix])
       ->condition('test_id', $this->testId)
       ->execute();
     if (!$affected_rows) {
@@ -1127,36 +1022,6 @@ abstract class TestBase {
     }
   }
 
-  /**
-   * Changes the database connection to the prefixed one.
-   *
-   * @see TestBase::prepareEnvironment()
-   */
-  private function changeDatabasePrefix() {
-    if (empty($this->databasePrefix)) {
-      $this->prepareDatabasePrefix();
-    }
-    // If the backup already exists, something went terribly wrong.
-    // This case is possible, because database connection info is a static
-    // global state construct on the Database class, which at least persists
-    // for all test methods executed in one PHP process.
-    if (Database::getConnectionInfo('simpletest_original_default')) {
-      throw new \RuntimeException("Bad Database connection state: 'simpletest_original_default' connection key already exists. Broken test?");
-    }
-
-    // Clone the current connection and replace the current prefix.
-    $connection_info = Database::getConnectionInfo('default');
-    Database::renameConnection('default', 'simpletest_original_default');
-    foreach ($connection_info as $target => $value) {
-      // Replace the full table prefix definition to ensure that no table
-      // prefixes of the test runner leak into the test.
-      $connection_info[$target]['prefix'] = array(
-        'default' => $value['prefix']['default'] . $this->databasePrefix,
-      );
-    }
-    Database::addConnectionInfo('default', 'default', $connection_info['default']);
-  }
-
   /**
    * Act on global state information before the environment is altered for a test.
    *
@@ -1238,7 +1103,7 @@ abstract class TestBase {
     // handlers defined by the original one.
     $callbacks = &drupal_register_shutdown_function();
     $this->originalShutdownCallbacks = $callbacks;
-    $callbacks = array();
+    $callbacks = [];
 
     // Create test directory ahead of installation so fatal errors and debug
     // information can be logged during installation process.
@@ -1288,11 +1153,11 @@ abstract class TestBase {
     drupal_valid_test_ua($this->databasePrefix);
 
     // Reset settings.
-    new Settings(array(
+    new Settings([
       // For performance, simply use the database prefix as hash salt.
       'hash_salt' => $this->databasePrefix,
       'container_yamls' => [],
-    ));
+    ]);
 
     drupal_set_time_limit($this->timeLimit);
   }
@@ -1316,7 +1181,7 @@ abstract class TestBase {
    */
   private function restoreEnvironment() {
     // Destroy the session if one was started during the test-run.
-    $_SESSION = array();
+    $_SESSION = [];
     if (PHP_SAPI !== 'cli' && session_status() === PHP_SESSION_ACTIVE) {
       session_destroy();
       $params = session_get_cookie_params();
@@ -1332,7 +1197,7 @@ abstract class TestBase {
     drupal_static_reset();
 
     if ($this->container && $this->container->has('state') && $state = $this->container->get('state')) {
-      $captured_emails = $state->get('system.test_mail_collector') ?: array();
+      $captured_emails = $state->get('system.test_mail_collector') ?: [];
       $emailCount = count($captured_emails);
       if ($emailCount) {
         $message = $emailCount == 1 ? '1 email was sent during this test.' : $emailCount . ' emails were sent during this test.';
@@ -1367,7 +1232,7 @@ abstract class TestBase {
     \Drupal::setContainer($this->originalContainer);
 
     // Delete test site directory.
-    file_unmanaged_delete_recursive($this->siteDirectory, array($this, 'filePreDeleteCallback'));
+    file_unmanaged_delete_recursive($this->siteDirectory, [$this, 'filePreDeleteCallback']);
 
     // Restore original database connection.
     Database::removeConnection('default');
@@ -1413,7 +1278,7 @@ abstract class TestBase {
    */
   public function errorHandler($severity, $message, $file = NULL, $line = NULL) {
     if ($severity & error_reporting()) {
-      $error_map = array(
+      $error_map = [
         E_STRICT => 'Run-time notice',
         E_WARNING => 'Warning',
         E_NOTICE => 'Notice',
@@ -1425,7 +1290,7 @@ abstract class TestBase {
         E_RECOVERABLE_ERROR => 'Recoverable error',
         E_DEPRECATED => 'Deprecated',
         E_USER_DEPRECATED => 'User deprecated',
-      );
+      ];
 
       $backtrace = debug_backtrace();
 
@@ -1450,15 +1315,15 @@ abstract class TestBase {
     $backtrace = $exception->getTrace();
     $verbose_backtrace = $backtrace;
     // Push on top of the backtrace the call that generated the exception.
-    array_unshift($backtrace, array(
+    array_unshift($backtrace, [
       'line' => $exception->getLine(),
       'file' => $exception->getFile(),
-    ));
+    ]);
     $decoded_exception = Error::decodeException($exception);
     unset($decoded_exception['backtrace']);
-    $message = SafeMarkup::format('%type: @message in %function (line %line of %file). <pre class="backtrace">@backtrace</pre>', $decoded_exception + array(
+    $message = SafeMarkup::format('%type: @message in %function (line %line of %file). <pre class="backtrace">@backtrace</pre>', $decoded_exception + [
       '@backtrace' => Error::formatBacktrace($verbose_backtrace),
-    ));
+    ]);
     $this->error($message, 'Uncaught exception', Error::getLastCaller($backtrace));
   }
 
@@ -1510,15 +1375,15 @@ abstract class TestBase {
    *   single value only.
    */
   public static function generatePermutations($parameters) {
-    $all_permutations = array(array());
+    $all_permutations = [[]];
     foreach ($parameters as $parameter => $values) {
-      $new_permutations = array();
+      $new_permutations = [];
       // Iterate over all values of the parameter.
       foreach ($values as $value) {
         // Iterate over all existing permutations.
         foreach ($all_permutations as $permutation) {
           // Add the new parameter value to existing permutations.
-          $new_permutations[] = $permutation + array($parameter => $value);
+          $new_permutations[] = $permutation + [$parameter => $value];
         }
       }
       // Replace the old permutations with the new permutations.
@@ -1575,23 +1440,4 @@ abstract class TestBase {
     return $this->tempFilesDirectory;
   }
 
-  /**
-   * Gets the config schema exclusions for this test.
-   *
-   * @return string[]
-   *   An array of config object names that are excluded from schema checking.
-   */
-  protected function getConfigSchemaExclusions() {
-    $class = get_class($this);
-    $exceptions = [];
-    while ($class) {
-      if (property_exists($class, 'configSchemaCheckerExclusions')) {
-        $exceptions = array_merge($exceptions, $class::$configSchemaCheckerExclusions);
-      }
-      $class = get_parent_class($class);
-    }
-    // Filter out any duplicates.
-    return array_unique($exceptions);
-  }
-
 }
diff --git a/web/core/modules/simpletest/src/TestDiscovery.php b/web/core/modules/simpletest/src/TestDiscovery.php
index d3a72ddb3..5374520e5 100644
--- a/web/core/modules/simpletest/src/TestDiscovery.php
+++ b/web/core/modules/simpletest/src/TestDiscovery.php
@@ -81,7 +81,7 @@ class TestDiscovery {
   }
 
   /**
-   * Registers test namespaces of all available extensions.
+   * Registers test namespaces of all extensions and core test classes.
    *
    * @return array
    *   An associative array whose keys are PSR-4 namespace prefixes and whose
@@ -91,7 +91,7 @@ class TestDiscovery {
     if (isset($this->testNamespaces)) {
       return $this->testNamespaces;
     }
-    $this->testNamespaces = array();
+    $this->testNamespaces = [];
 
     $existing = $this->classLoader->getPrefixesPsr4();
 
@@ -101,7 +101,7 @@ class TestDiscovery {
     $this->testNamespaces['Drupal\\FunctionalTests\\'] = [$this->root . '/core/tests/Drupal/FunctionalTests'];
     $this->testNamespaces['Drupal\\FunctionalJavascriptTests\\'] = [$this->root . '/core/tests/Drupal/FunctionalJavascriptTests'];
 
-    $this->availableExtensions = array();
+    $this->availableExtensions = [];
     foreach ($this->getExtensions() as $name => $extension) {
       $this->availableExtensions[$extension->getType()][$name] = $name;
 
@@ -119,6 +119,10 @@ class TestDiscovery {
       $this->testNamespaces["Drupal\\Tests\\$name\\Kernel\\"][] = "$base_path/tests/src/Kernel";
       $this->testNamespaces["Drupal\\Tests\\$name\\Functional\\"][] = "$base_path/tests/src/Functional";
       $this->testNamespaces["Drupal\\Tests\\$name\\FunctionalJavascript\\"][] = "$base_path/tests/src/FunctionalJavascript";
+
+      // Add discovery for traits which are shared between different test
+      // suites.
+      $this->testNamespaces["Drupal\\Tests\\$name\\Traits\\"][] = "$base_path/tests/src/Traits";
     }
 
     foreach ($this->testNamespaces as $prefix => $paths) {
@@ -160,7 +164,7 @@ class TestDiscovery {
         return $cache->data;
       }
     }
-    $list = array();
+    $list = [];
 
     $classmap = $this->findAllClassFiles($extension);
 
@@ -234,7 +238,7 @@ class TestDiscovery {
    *   fully-qualified classnames to pathnames.
    */
   public function findAllClassFiles($extension = NULL) {
-    $classmap = array();
+    $classmap = [];
     $namespaces = $this->registerTestNamespaces();
     if (isset($extension)) {
       // Include tests in the \Drupal\Tests\{$extension} namespace.
@@ -290,7 +294,7 @@ class TestDiscovery {
       return $current->isFile() && $current->getExtension() === 'php';
     });
     $files = new \RecursiveIteratorIterator($filter);
-    $classes = array();
+    $classes = [];
     foreach ($files as $fileinfo) {
       $class = $namespace_prefix;
       if ('' !== $subpath = $fileinfo->getSubPath()) {
@@ -328,10 +332,10 @@ class TestDiscovery {
       $reflection = new \ReflectionClass($classname);
       $doc_comment = $reflection->getDocComment();
     }
-    $info = array(
+    $info = [
       'name' => $classname,
-    );
-    $annotations = array();
+    ];
+    $annotations = [];
     // Look for annotations, allow an arbitrary amount of spaces before the
     // * but nothing else.
     preg_match_all('/^[ ]*\* \@([^\s]*) (.*$)/m', $doc_comment, $matches);
@@ -375,7 +379,7 @@ class TestDiscovery {
   /**
    * Parses the phpDoc summary line of a test class.
    *
-   * @param string $doc_comment.
+   * @param string $doc_comment
    *
    * @return string
    *   The parsed phpDoc summary line. An empty string is returned if no summary
@@ -475,7 +479,7 @@ class TestDiscovery {
   protected function getExtensions() {
     $listing = new ExtensionDiscovery($this->root);
     // Ensure that tests in all profiles are discovered.
-    $listing->setProfileDirectories(array());
+    $listing->setProfileDirectories([]);
     $extensions = $listing->scan('module', TRUE);
     $extensions += $listing->scan('profile', TRUE);
     $extensions += $listing->scan('theme', TRUE);
diff --git a/web/core/modules/simpletest/src/TestServiceProvider.php b/web/core/modules/simpletest/src/TestServiceProvider.php
index 817b68e54..de3117fd2 100644
--- a/web/core/modules/simpletest/src/TestServiceProvider.php
+++ b/web/core/modules/simpletest/src/TestServiceProvider.php
@@ -17,7 +17,7 @@ class TestServiceProvider implements ServiceProviderInterface, ServiceModifierIn
   /**
    * {@inheritdoc}
    */
-  function register(ContainerBuilder $container) {
+  public function register(ContainerBuilder $container) {
     if (static::$currentTest && method_exists(static::$currentTest, 'containerBuild')) {
       static::$currentTest->containerBuild($container);
     }
diff --git a/web/core/modules/simpletest/src/Tests/BrokenSetUpTest.php b/web/core/modules/simpletest/src/Tests/BrokenSetUpTest.php
index e988f4d3d..febb9cfda 100644
--- a/web/core/modules/simpletest/src/Tests/BrokenSetUpTest.php
+++ b/web/core/modules/simpletest/src/Tests/BrokenSetUpTest.php
@@ -22,7 +22,7 @@ class BrokenSetUpTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('simpletest');
+  public static $modules = ['simpletest'];
 
   /**
    * The path to the shared trigger file.
@@ -39,7 +39,7 @@ class BrokenSetUpTest extends WebTestBase {
       $this->sharedTriggerFile = $this->publicFilesDirectory . '/trigger';
 
       // Create and log in user.
-      $admin_user = $this->drupalCreateUser(array('administer unit tests'));
+      $admin_user = $this->drupalCreateUser(['administer unit tests']);
       $this->drupalLogin($admin_user);
     }
     // If the test is being run from within simpletest, set up the broken test.
@@ -71,7 +71,7 @@ class BrokenSetUpTest extends WebTestBase {
   /**
    * Runs this test case from within the simpletest child site.
    */
-  function testMethod() {
+  public function testMethod() {
     // If the test is being run from the main site, run it again from the web
     // interface within the simpletest child site.
     if (!$this->isInChildSite()) {
diff --git a/web/core/modules/simpletest/src/Tests/BrowserTest.php b/web/core/modules/simpletest/src/Tests/BrowserTest.php
index f98fe48c2..fdfaff851 100644
--- a/web/core/modules/simpletest/src/Tests/BrowserTest.php
+++ b/web/core/modules/simpletest/src/Tests/BrowserTest.php
@@ -37,20 +37,20 @@ class BrowserTest extends WebTestBase {
   /**
    * Test \Drupal\simpletest\WebTestBase::getAbsoluteUrl().
    */
-  function testGetAbsoluteUrl() {
+  public function testGetAbsoluteUrl() {
     $url = 'user/login';
 
     $this->drupalGet($url);
-    $absolute = \Drupal::url('user.login', array(), array('absolute' => TRUE));
+    $absolute = \Drupal::url('user.login', [], ['absolute' => TRUE]);
     $this->assertEqual($absolute, $this->url, 'Passed and requested URL are equal.');
     $this->assertEqual($this->url, $this->getAbsoluteUrl($this->url), 'Requested and returned absolute URL are equal.');
 
-    $this->drupalPostForm(NULL, array(), t('Log in'));
+    $this->drupalPostForm(NULL, [], t('Log in'));
     $this->assertEqual($absolute, $this->url, 'Passed and requested URL are equal.');
     $this->assertEqual($this->url, $this->getAbsoluteUrl($this->url), 'Requested and returned absolute URL are equal.');
 
     $this->clickLink('Create new account');
-    $absolute = \Drupal::url('user.register', array(), array('absolute' => TRUE));
+    $absolute = \Drupal::url('user.register', [], ['absolute' => TRUE]);
     $this->assertEqual($absolute, $this->url, 'Passed and requested URL are equal.');
     $this->assertEqual($this->url, $this->getAbsoluteUrl($this->url), 'Requested and returned absolute URL are equal.');
   }
@@ -58,7 +58,7 @@ class BrowserTest extends WebTestBase {
   /**
    * Tests XPath escaping.
    */
-  function testXPathEscaping() {
+  public function testXPathEscaping() {
     $testpage = <<< EOF
 <html>
 <body>
@@ -72,16 +72,16 @@ EOF;
     $this->setRawContent($testpage);
 
     // Matches the first link.
-    $urls = $this->xpath('//a[text()=:text]', array(':text' => 'A "weird" link, just to bother the dumb "XPath 1.0"'));
+    $urls = $this->xpath('//a[text()=:text]', [':text' => 'A "weird" link, just to bother the dumb "XPath 1.0"']);
     $this->assertEqual($urls[0]['href'], 'link1', 'Match with quotes.');
 
-    $urls = $this->xpath('//a[text()=:text]', array(':text' => 'A second "even more weird" link, in memory of George O\'Malley'));
+    $urls = $this->xpath('//a[text()=:text]', [':text' => 'A second "even more weird" link, in memory of George O\'Malley']);
     $this->assertEqual($urls[0]['href'], 'link2', 'Match with mixed single and double quotes.');
 
-    $urls = $this->xpath('//a[text()=:text]', array(':text' => 'A $third$ link, so weird it\'s worth $1 million'));
+    $urls = $this->xpath('//a[text()=:text]', [':text' => 'A $third$ link, so weird it\'s worth $1 million']);
     $this->assertEqual($urls[0]['href'], 'link3', 'Match with a regular expression back reference symbol (dollar sign).');
 
-    $urls = $this->xpath('//a[text()=:text]', array(':text' => 'A fourth link, containing alternative \\1 regex backreferences \\2'));
+    $urls = $this->xpath('//a[text()=:text]', [':text' => 'A fourth link, containing alternative \\1 regex backreferences \\2']);
     $this->assertEqual($urls[0]['href'], 'link4', 'Match with another regular expression back reference symbol (double backslash).');
   }
 
diff --git a/web/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php b/web/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
index a1063e7b2..379aed449 100644
--- a/web/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
+++ b/web/core/modules/simpletest/src/Tests/InstallationProfileModuleTestsTest.php
@@ -16,7 +16,7 @@ class InstallationProfileModuleTestsTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('simpletest');
+  public static $modules = ['simpletest'];
 
   /**
    * An administrative user with permission to adminsiter unit tests.
@@ -42,19 +42,19 @@ class InstallationProfileModuleTestsTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer unit tests'));
+    $this->adminUser = $this->drupalCreateUser(['administer unit tests']);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Tests existence of test case located in an installation profile module.
    */
-  function testInstallationProfileTests() {
+  public function testInstallationProfileTests() {
     $this->drupalGet('admin/config/development/testing');
     $this->assertText('Drupal\drupal_system_listing_compatible_test\Tests\SystemListingCompatibleTest');
-    $edit = array(
+    $edit = [
       'tests[Drupal\drupal_system_listing_compatible_test\Tests\SystemListingCompatibleTest]' => TRUE,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Run tests'));
     $this->assertText('SystemListingCompatibleTest test executed.');
   }
diff --git a/web/core/modules/simpletest/src/Tests/KernelTestBaseTest.php b/web/core/modules/simpletest/src/Tests/KernelTestBaseTest.php
index 15ecf1fe7..1e9e75da0 100644
--- a/web/core/modules/simpletest/src/Tests/KernelTestBaseTest.php
+++ b/web/core/modules/simpletest/src/Tests/KernelTestBaseTest.php
@@ -20,7 +20,7 @@ class KernelTestBaseTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('entity_test');
+  public static $modules = ['entity_test'];
 
   /**
    * {@inheritdoc}
@@ -50,8 +50,8 @@ EOS;
   /**
    * Tests expected behavior of setUp().
    */
-  function testSetUp() {
-    $modules = array('entity_test');
+  public function testSetUp() {
+    $modules = ['entity_test'];
     $table = 'entity_test';
 
     // Verify that specified $modules have been loaded.
@@ -79,7 +79,7 @@ EOS;
   /**
    * Tests expected load behavior of enableModules().
    */
-  function testEnableModulesLoad() {
+  public function testEnableModulesLoad() {
     $module = 'field_test';
 
     // Verify that the module does not exist yet.
@@ -90,7 +90,7 @@ EOS;
     $this->assertFalse(in_array($module, $list), "{$module}_entity_display_build_alter() in \Drupal::moduleHandler()->getImplementations() not found.");
 
     // Enable the module.
-    $this->enableModules(array($module));
+    $this->enableModules([$module]);
 
     // Verify that the module exists.
     $this->assertTrue(\Drupal::moduleHandler()->moduleExists($module), "$module module found.");
@@ -103,7 +103,7 @@ EOS;
   /**
    * Tests expected installation behavior of enableModules().
    */
-  function testEnableModulesInstall() {
+  public function testEnableModulesInstall() {
     $module = 'module_test';
     $table = 'module_test';
 
@@ -117,7 +117,7 @@ EOS;
     $this->assertFalse(db_table_exists($table), "'$table' database table not found.");
 
     // Install the module.
-    \Drupal::service('module_installer')->install(array($module));
+    \Drupal::service('module_installer')->install([$module]);
 
     // Verify that the enabled module exists.
     $this->assertTrue(\Drupal::moduleHandler()->moduleExists($module), "$module module found.");
@@ -134,11 +134,11 @@ EOS;
   /**
    * Tests installing modules with DependencyInjection services.
    */
-  function testEnableModulesInstallContainer() {
+  public function testEnableModulesInstallContainer() {
     // Install Node module.
-    $this->enableModules(array('user', 'field', 'node'));
+    $this->enableModules(['user', 'field', 'node']);
 
-    $this->installEntitySchema('node', array('node', 'node_field_data'));
+    $this->installEntitySchema('node', ['node', 'node_field_data']);
     // Perform an entity query against node.
     $query = \Drupal::entityQuery('node');
     // Disable node access checks, since User module is not enabled.
@@ -151,7 +151,7 @@ EOS;
   /**
    * Tests expected behavior of installSchema().
    */
-  function testInstallSchema() {
+  public function testInstallSchema() {
     $module = 'entity_test';
     $table = 'entity_test_example';
     // Verify that we can install a table from the module schema.
@@ -190,7 +190,7 @@ EOS;
     $this->assertTrue($schema, "'$table' table schema found.");
 
     // Verify that the same table can be installed after enabling the module.
-    $this->enableModules(array($module));
+    $this->enableModules([$module]);
     $this->installSchema($module, $table);
     $this->assertTrue(db_table_exists($table), "'$table' database table found.");
     $schema = drupal_get_module_schema($module, $table);
@@ -200,10 +200,10 @@ EOS;
   /**
    * Tests expected behavior of installEntitySchema().
    */
-  function testInstallEntitySchema() {
+  public function testInstallEntitySchema() {
     $entity = 'entity_test';
     // The entity_test Entity has a field that depends on the User module.
-    $this->enableModules(array('user'));
+    $this->enableModules(['user']);
     // Verity that the entity schema is created properly.
     $this->installEntitySchema($entity);
     $this->assertTrue(db_table_exists($entity), "'$entity' database table found.");
@@ -212,14 +212,14 @@ EOS;
   /**
    * Tests expected behavior of installConfig().
    */
-  function testInstallConfig() {
+  public function testInstallConfig() {
     // The user module has configuration that depends on system.
-    $this->enableModules(array('system'));
+    $this->enableModules(['system']);
     $module = 'user';
 
     // Verify that default config can only be installed for enabled modules.
     try {
-      $this->installConfig(array($module));
+      $this->installConfig([$module]);
       $this->fail('Exception for non-enabled module found.');
     }
     catch (\Exception $e) {
@@ -228,8 +228,8 @@ EOS;
     $this->assertFalse($this->container->get('config.storage')->exists('user.settings'));
 
     // Verify that default config can be installed.
-    $this->enableModules(array('user'));
-    $this->installConfig(array('user'));
+    $this->enableModules(['user']);
+    $this->installConfig(['user']);
     $this->assertTrue($this->container->get('config.storage')->exists('user.settings'));
     $this->assertTrue($this->config('user.settings')->get('register'));
   }
@@ -237,9 +237,9 @@ EOS;
   /**
    * Tests that the module list is retained after enabling/installing/disabling.
    */
-  function testEnableModulesFixedList() {
+  public function testEnableModulesFixedList() {
     // Install system module.
-    $this->container->get('module_installer')->install(array('system', 'menu_link_content'));
+    $this->container->get('module_installer')->install(['system', 'menu_link_content']);
     $entity_manager = \Drupal::entityManager();
 
     // entity_test is loaded via $modules; its entity type should exist.
@@ -247,17 +247,17 @@ EOS;
     $this->assertTrue(TRUE == $entity_manager->getDefinition('entity_test'));
 
     // Load some additional modules; entity_test should still exist.
-    $this->enableModules(array('field', 'text', 'entity_test'));
+    $this->enableModules(['field', 'text', 'entity_test']);
     $this->assertEqual($this->container->get('module_handler')->moduleExists('entity_test'), TRUE);
     $this->assertTrue(TRUE == $entity_manager->getDefinition('entity_test'));
 
     // Install some other modules; entity_test should still exist.
-    $this->container->get('module_installer')->install(array('user', 'field', 'field_test'), FALSE);
+    $this->container->get('module_installer')->install(['user', 'field', 'field_test'], FALSE);
     $this->assertEqual($this->container->get('module_handler')->moduleExists('entity_test'), TRUE);
     $this->assertTrue(TRUE == $entity_manager->getDefinition('entity_test'));
 
     // Uninstall one of those modules; entity_test should still exist.
-    $this->container->get('module_installer')->uninstall(array('field_test'));
+    $this->container->get('module_installer')->uninstall(['field_test']);
     $this->assertEqual($this->container->get('module_handler')->moduleExists('entity_test'), TRUE);
     $this->assertTrue(TRUE == $entity_manager->getDefinition('entity_test'));
 
@@ -267,19 +267,19 @@ EOS;
     $this->assertTrue(TRUE == $entity_manager->getDefinition('entity_test'));
 
     // Reactivate the previously uninstalled module.
-    $this->enableModules(array('field_test'));
+    $this->enableModules(['field_test']);
 
     // Create a field.
-    $display = EntityViewDisplay::create(array(
+    $display = EntityViewDisplay::create([
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'default',
-    ));
-    $field_storage = FieldStorageConfig::create(array(
+    ]);
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'test_field',
       'entity_type' => 'entity_test',
       'type' => 'test_field'
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -290,52 +290,52 @@ EOS;
   /**
    * Tests that ThemeManager works right after loading a module.
    */
-  function testEnableModulesTheme() {
+  public function testEnableModulesTheme() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
-    $original_element = $element = array(
+    $original_element = $element = [
       '#type' => 'container',
       '#markup' => 'Foo',
-      '#attributes' => array(),
-    );
-    $this->enableModules(array('system'));
+      '#attributes' => [],
+    ];
+    $this->enableModules(['system']);
     // \Drupal\Core\Theme\ThemeManager::render() throws an exception if modules
     // are not loaded yet.
     $this->assertTrue($renderer->renderRoot($element));
 
     $element = $original_element;
-    $this->disableModules(array('entity_test'));
+    $this->disableModules(['entity_test']);
     $this->assertTrue($renderer->renderRoot($element));
   }
 
   /**
    * Tests that there is no theme by default.
    */
-  function testNoThemeByDefault() {
+  public function testNoThemeByDefault() {
     $themes = $this->config('core.extension')->get('theme');
-    $this->assertEqual($themes, array());
+    $this->assertEqual($themes, []);
 
     $extensions = $this->container->get('config.storage')->read('core.extension');
-    $this->assertEqual($extensions['theme'], array());
+    $this->assertEqual($extensions['theme'], []);
 
     $active_theme = $this->container->get('theme.manager')->getActiveTheme();
     $this->assertEqual($active_theme->getName(), 'core');
   }
 
   /**
-   * Tests that drupal_get_profile() returns NULL.
+   * Tests that \Drupal::installProfile() returns NULL.
    *
    * As the currently active installation profile is used when installing
    * configuration, for example, this is essential to ensure test isolation.
    */
   public function testDrupalGetProfile() {
-    $this->assertNull(drupal_get_profile());
+    $this->assertNull(\Drupal::installProfile());
   }
 
   /**
    * {@inheritdoc}
    */
-  public function run(array $methods = array()) {
+  public function run(array $methods = []) {
     parent::run($methods);
 
     // Check that all tables of the test instance have been deleted. At this
@@ -357,11 +357,11 @@ EOS;
         ':prefix' => $this->databasePrefix
       ]);
 
-      $result = $connection->query("SELECT name FROM " . $this->databasePrefix . ".sqlite_master WHERE type = :type AND name LIKE :table_name AND name NOT LIKE :pattern", array(
+      $result = $connection->query("SELECT name FROM " . $this->databasePrefix . ".sqlite_master WHERE type = :type AND name LIKE :table_name AND name NOT LIKE :pattern", [
         ':type' => 'table',
         ':table_name' => '%',
         ':pattern' => 'sqlite_%',
-      ))->fetchAllKeyed(0, 0);
+      ])->fetchAllKeyed(0, 0);
 
       $this->assertTrue(empty($result), 'All test tables have been removed.');
     }
diff --git a/web/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php b/web/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php
index 0b21d546d..d62cc48a3 100644
--- a/web/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php
+++ b/web/core/modules/simpletest/src/Tests/MissingCheckedRequirementsTest.php
@@ -16,11 +16,11 @@ class MissingCheckedRequirementsTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('simpletest');
+  public static $modules = ['simpletest'];
 
   protected function setUp() {
     parent::setUp();
-    $admin_user = $this->drupalCreateUser(array('administer unit tests'));
+    $admin_user = $this->drupalCreateUser(['administer unit tests']);
     $this->drupalLogin($admin_user);
   }
 
@@ -29,9 +29,9 @@ class MissingCheckedRequirementsTest extends WebTestBase {
    */
   protected function checkRequirements() {
     if ($this->isInChildSite()) {
-      return array(
+      return [
         'Test is not allowed to run.'
-      );
+      ];
     }
     return parent::checkRequirements();
   }
diff --git a/web/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php b/web/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
index 3b2061ec4..7e4f9125b 100644
--- a/web/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
+++ b/web/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
@@ -18,12 +18,12 @@ class SimpleTestBrowserTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('simpletest', 'test_page_test');
+  public static $modules = ['simpletest', 'test_page_test'];
 
   protected function setUp() {
     parent::setUp();
     // Create and log in an admin user.
-    $this->drupalLogin($this->drupalCreateUser(array('administer unit tests')));
+    $this->drupalLogin($this->drupalCreateUser(['administer unit tests']));
   }
 
   /**
@@ -33,9 +33,9 @@ class SimpleTestBrowserTest extends WebTestBase {
     // Retrieve the test page and check its title and headers.
     $this->drupalGet('test-page');
     $this->assertTrue($this->drupalGetHeader('Date'), 'An HTTP header was received.');
-    $this->assertTitle(t('Test page | @site-name', array(
+    $this->assertTitle(t('Test page | @site-name', [
       '@site-name' => $this->config('system.site')->get('name'),
-    )));
+    ]));
     $this->assertNoTitle('Foo');
 
     $old_user_id = $this->container->get('current_user')->id();
@@ -57,13 +57,13 @@ class SimpleTestBrowserTest extends WebTestBase {
 
     // Test the maximum redirection option.
     $this->maximumRedirects = 1;
-    $edit = array(
+    $edit = [
       'name' => $user->getUsername(),
       'pass' => $user->pass_raw
-    );
-    $this->drupalPostForm('user/login', $edit, t('Log in'), array(
-      'query' => array('destination' => 'user/logout'),
-    ));
+    ];
+    $this->drupalPostForm('user/login', $edit, t('Log in'), [
+      'query' => ['destination' => 'user/logout'],
+    ]);
     $headers = $this->drupalGetHeaders(TRUE);
     $this->assertEqual(count($headers), 2, 'Simpletest stopped following redirects after the first one.');
 
@@ -73,7 +73,7 @@ class SimpleTestBrowserTest extends WebTestBase {
     // @see drupal_valid_test_ua()
     // Not using File API; a potential error must trigger a PHP warning.
     unlink($this->siteDirectory . '/.htkey');
-    $this->drupalGet(Url::fromUri('base:core/install.php', array('external' => TRUE, 'absolute' => TRUE))->toString());
+    $this->drupalGet(Url::fromUri('base:core/install.php', ['external' => TRUE, 'absolute' => TRUE])->toString());
     $this->assertResponse(403, 'Cannot access install.php.');
   }
 
@@ -92,7 +92,7 @@ class SimpleTestBrowserTest extends WebTestBase {
     // Generate a valid simpletest User-Agent to pass validation.
     $this->assertTrue(preg_match('/test\d+/', $this->databasePrefix, $matches), 'Database prefix contains test prefix.');
     $test_ua = drupal_generate_test_ua($matches[0]);
-    $this->additionalCurlOptions = array(CURLOPT_USERAGENT => $test_ua);
+    $this->additionalCurlOptions = [CURLOPT_USERAGENT => $test_ua];
 
     // Test pages only available for testing.
     $this->drupalGet($HTTP_path);
@@ -101,7 +101,7 @@ class SimpleTestBrowserTest extends WebTestBase {
     $this->assertResponse(200, 'Requesting https.php with a legitimate simpletest User-Agent returns OK.');
 
     // Now slightly modify the HMAC on the header, which should not validate.
-    $this->additionalCurlOptions = array(CURLOPT_USERAGENT => $test_ua . 'X');
+    $this->additionalCurlOptions = [CURLOPT_USERAGENT => $test_ua . 'X'];
     $this->drupalGet($HTTP_path);
     $this->assertResponse(403, 'Requesting http.php with a bad simpletest User-Agent fails.');
     $this->drupalGet($https_path);
@@ -109,7 +109,7 @@ class SimpleTestBrowserTest extends WebTestBase {
 
     // Use a real User-Agent and verify that the special files http.php and
     // https.php can't be accessed.
-    $this->additionalCurlOptions = array(CURLOPT_USERAGENT => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12');
+    $this->additionalCurlOptions = [CURLOPT_USERAGENT => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.12) Gecko/20101026 Firefox/3.6.12'];
     $this->drupalGet($HTTP_path);
     $this->assertResponse(403, 'Requesting http.php with a normal User-Agent fails.');
     $this->drupalGet($https_path);
@@ -126,20 +126,20 @@ class SimpleTestBrowserTest extends WebTestBase {
     // to be created. However this scenario is covered by the testception of
     // \Drupal\simpletest\Tests\SimpleTestTest.
 
-    $tests = array(
+    $tests = [
       // A KernelTestBase test.
       'Drupal\KernelTests\KernelTestBaseTest',
       // A PHPUnit unit test.
       'Drupal\Tests\action\Unit\Menu\ActionLocalTasksTest',
       // A PHPUnit functional test.
       ThroughUITest::class,
-    );
+    ];
 
     foreach ($tests as $test) {
       $this->drupalGet('admin/config/development/testing');
-      $edit = array(
+      $edit = [
         "tests[$test]" => TRUE,
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Run tests'));
       $this->assertText('0 fails, 0 exceptions');
     }
diff --git a/web/core/modules/simpletest/src/Tests/SimpleTestInstallBatchTest.php b/web/core/modules/simpletest/src/Tests/SimpleTestInstallBatchTest.php
index 72cb74c61..5663ad9cd 100644
--- a/web/core/modules/simpletest/src/Tests/SimpleTestInstallBatchTest.php
+++ b/web/core/modules/simpletest/src/Tests/SimpleTestInstallBatchTest.php
@@ -20,7 +20,7 @@ class SimpleTestInstallBatchTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('simpletest', 'simpletest_test', 'entity_test');
+  public static $modules = ['simpletest', 'simpletest_test', 'entity_test'];
 
   /**
    * Tests loading entities created in a batch in simpletest_test_install().
diff --git a/web/core/modules/simpletest/src/Tests/SimpleTestTest.php b/web/core/modules/simpletest/src/Tests/SimpleTestTest.php
index ff20f5e96..a32c14236 100644
--- a/web/core/modules/simpletest/src/Tests/SimpleTestTest.php
+++ b/web/core/modules/simpletest/src/Tests/SimpleTestTest.php
@@ -34,7 +34,7 @@ class SimpleTestTest extends WebTestBase {
    *
    * Used to ensure they are incrementing.
    */
-  protected $testIds = array();
+  protected $testIds = [];
 
   /**
    * Translated fail message.
@@ -97,12 +97,12 @@ EOD;
       parent::setUp();
       $this->assertNotIdentical(\Drupal::getContainer(), $original_container, 'WebTestBase test creates a new container.');
       // Create and log in an admin user.
-      $this->drupalLogin($this->drupalCreateUser(array('administer unit tests')));
+      $this->drupalLogin($this->drupalCreateUser(['administer unit tests']));
     }
     else {
       // This causes three of the five fails that are asserted in
       // confirmStubResults().
-      self::$modules = array('non_existent_module');
+      self::$modules = ['non_existent_module'];
       parent::setUp();
     }
   }
@@ -110,7 +110,7 @@ EOD;
   /**
    * Ensures the tests selected through the web interface are run and displayed.
    */
-  function testWebTestRunner() {
+  public function testWebTestRunner() {
     $this->passMessage = t('SimpleTest pass.');
     $this->failMessage = t('SimpleTest fail.');
     $this->validPermission = 'access administration pages';
@@ -127,7 +127,7 @@ EOD;
         // Run this test from web interface.
         $this->drupalGet('admin/config/development/testing');
 
-        $edit = array();
+        $edit = [];
         $edit['tests[Drupal\simpletest\Tests\SimpleTestTest]'] = TRUE;
         $this->drupalPostForm(NULL, $edit, t('Run tests'));
 
@@ -148,7 +148,7 @@ EOD;
    * Here we force test results which must match the expected results from
    * confirmStubResults().
    */
-  function stubTest() {
+  public function stubTest() {
     // Ensure the .htkey file exists since this is only created just before a
     // request. This allows the stub test to make requests. The event does not
     // fire here and drupal_generate_test_ua() can not generate a key for a
@@ -192,10 +192,10 @@ EOD;
 
     // This causes the third to fifth of the sixteen passes asserted in
     // confirmStubResults().
-    $user = $this->drupalCreateUser(array($this->validPermission), 'SimpleTestTest');
+    $user = $this->drupalCreateUser([$this->validPermission], 'SimpleTestTest');
 
     // This causes the fifth of the five fails asserted in confirmStubResults().
-    $this->drupalCreateUser(array($this->invalidPermission));
+    $this->drupalCreateUser([$this->invalidPermission]);
 
     // Test logging in as a user.
     // This causes the sixth to tenth of the sixteen passes asserted in
@@ -204,7 +204,7 @@ EOD;
 
     // This causes the eleventh of the sixteen passes asserted in
     // confirmStubResults().
-    $this->pass(t('Test ID is @id.', array('@id' => $this->testId)));
+    $this->pass(t('Test ID is @id.', ['@id' => $this->testId]));
 
     // These cause the twelfth to fifteenth of the sixteen passes asserted in
     // confirmStubResults().
@@ -232,21 +232,21 @@ EOD;
   /**
    * Assert nothing.
    */
-  function assertNothing() {
+  public function assertNothing() {
     $this->pass("This is nothing.");
   }
 
   /**
    * Confirm that the stub test produced the desired results.
    */
-  function confirmStubTestResults() {
-    $this->assertAssertion(t('Unable to install modules %modules due to missing modules %missing.', array('%modules' => 'non_existent_module', '%missing' => 'non_existent_module')), 'Other', 'Fail', 'SimpleTestTest.php', 'Drupal\simpletest\Tests\SimpleTestTest->setUp()');
+  public function confirmStubTestResults() {
+    $this->assertAssertion(t('Unable to install modules %modules due to missing modules %missing.', ['%modules' => 'non_existent_module', '%missing' => 'non_existent_module']), 'Other', 'Fail', 'SimpleTestTest.php', 'Drupal\simpletest\Tests\SimpleTestTest->setUp()');
 
     $this->assertAssertion($this->passMessage, 'Other', 'Pass', 'SimpleTestTest.php', 'Drupal\simpletest\Tests\SimpleTestTest->stubTest()');
     $this->assertAssertion($this->failMessage, 'Other', 'Fail', 'SimpleTestTest.php', 'Drupal\simpletest\Tests\SimpleTestTest->stubTest()');
 
-    $this->assertAssertion(t('Created permissions: @perms', array('@perms' => $this->validPermission)), 'Role', 'Pass', 'SimpleTestTest.php', 'Drupal\simpletest\Tests\SimpleTestTest->stubTest()');
-    $this->assertAssertion(t('Invalid permission %permission.', array('%permission' => $this->invalidPermission)), 'Role', 'Fail', 'SimpleTestTest.php', 'Drupal\simpletest\Tests\SimpleTestTest->stubTest()');
+    $this->assertAssertion(t('Created permissions: @perms', ['@perms' => $this->validPermission]), 'Role', 'Pass', 'SimpleTestTest.php', 'Drupal\simpletest\Tests\SimpleTestTest->stubTest()');
+    $this->assertAssertion(t('Invalid permission %permission.', ['%permission' => $this->invalidPermission]), 'Role', 'Fail', 'SimpleTestTest.php', 'Drupal\simpletest\Tests\SimpleTestTest->stubTest()');
 
     // Check that the user was logged in successfully.
     $this->assertAssertion('User SimpleTestTest successfully logged in.', 'User login', 'Pass', 'SimpleTestTest.php', 'Drupal\simpletest\Tests\SimpleTestTest->stubTest()');
@@ -274,7 +274,7 @@ EOD;
   /**
    * Fetch the test id from the test results.
    */
-  function getTestIdFromResults() {
+  public function getTestIdFromResults() {
     foreach ($this->childTestResults['assertions'] as $assertion) {
       if (preg_match('@^Test ID is ([0-9]*)\.$@', $assertion['message'], $matches)) {
         return $matches[1];
@@ -299,7 +299,7 @@ EOD;
    *
    * @return Assertion result.
    */
-  function assertAssertion($message, $type, $status, $file, $function) {
+  public function assertAssertion($message, $type, $status, $file, $function) {
     $message = trim(strip_tags($message));
     $found = FALSE;
     foreach ($this->childTestResults['assertions'] as $assertion) {
@@ -312,24 +312,24 @@ EOD;
         break;
       }
     }
-    return $this->assertTrue($found, format_string('Found assertion {"@message", "@type", "@status", "@file", "@function"}.', array('@message' => $message, '@type' => $type, '@status' => $status, "@file" => $file, "@function" => $function)));
+    return $this->assertTrue($found, format_string('Found assertion {"@message", "@type", "@status", "@file", "@function"}.', ['@message' => $message, '@type' => $type, '@status' => $status, "@file" => $file, "@function" => $function]));
   }
 
   /**
    * Get the results from a test and store them in the class array $results.
    */
-  function getTestResults() {
-    $results = array();
+  public function getTestResults() {
+    $results = [];
     if ($this->parse()) {
       if ($details = $this->getResultFieldSet()) {
         // Code assumes this is the only test in group.
         $results['summary'] = $this->asText($details->div->div[1]);
         $results['name'] = $this->asText($details->summary);
 
-        $results['assertions'] = array();
+        $results['assertions'] = [];
         $tbody = $details->div->table->tbody;
         foreach ($tbody->tr as $row) {
-          $assertion = array();
+          $assertion = [];
           $assertion['message'] = $this->asText($row->td[0]);
           $assertion['type'] = $this->asText($row->td[1]);
           $assertion['file'] = $this->asText($row->td[2]);
@@ -347,7 +347,7 @@ EOD;
   /**
    * Get the details containing the results for group this test is in.
    */
-  function getResultFieldSet() {
+  public function getResultFieldSet() {
     $all_details = $this->xpath('//details');
     foreach ($all_details as $details) {
       if ($this->asText($details->summary) == __CLASS__) {
@@ -366,7 +366,7 @@ EOD;
    * @return
    *   Extracted text.
    */
-  function asText(\SimpleXMLElement $element) {
+  public function asText(\SimpleXMLElement $element) {
     if (!is_object($element)) {
       return $this->fail('The element is not an element.');
     }
diff --git a/web/core/modules/simpletest/src/Tests/TimeZoneTest.php b/web/core/modules/simpletest/src/Tests/TimeZoneTest.php
index 2f33eaa42..9a98c7902 100644
--- a/web/core/modules/simpletest/src/Tests/TimeZoneTest.php
+++ b/web/core/modules/simpletest/src/Tests/TimeZoneTest.php
@@ -28,7 +28,7 @@ class TimeZoneTest extends WebTestBase {
   /**
    * Tests that user accounts have the default time zone set.
    */
-  function testAccountTimeZones() {
+  public function testAccountTimeZones() {
     $expected = 'Australia/Sydney';
     $this->assertEqual($this->rootUser->getTimeZone(), $expected, 'Root user has correct time zone.');
     $this->assertEqual($this->adminUser->getTimeZone(), $expected, 'Admin user has correct time zone.');
diff --git a/web/core/modules/simpletest/src/Tests/UiPhpUnitOutputTest.php b/web/core/modules/simpletest/src/Tests/UiPhpUnitOutputTest.php
new file mode 100644
index 000000000..324bf1d57
--- /dev/null
+++ b/web/core/modules/simpletest/src/Tests/UiPhpUnitOutputTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Drupal\simpletest\Tests;
+
+use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\simpletest\Functional\SimpletestPhpunitBrowserTest;
+
+/**
+ * Test PHPUnit output for the Simpletest UI.
+ *
+ * @group simpletest
+ *
+ * @see \Drupal\Tests\Listeners\SimpletestUiPrinter
+ */
+class UiPhpUnitOutputTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var string[]
+   */
+  public static $modules = ['simpletest'];
+
+  /**
+   * Tests that PHPUnit output in the Simpletest UI looks good.
+   */
+  public function testOutput() {
+    require_once __DIR__ . '/../../tests/fixtures/simpletest_phpunit_browsertest.php';
+    $phpunit_junit_file = $this->container->get('file_system')->realpath('public://phpunit_junit.xml');
+    // Prepare the default browser test output directory in the child site.
+    $this->container->get('file_system')->mkdir('public://simpletest');
+    $status = 0;
+    $output = [];
+    simpletest_phpunit_run_command([SimpletestPhpunitBrowserTest::class], $phpunit_junit_file, $status, $output);
+
+    // Check that there are <br> tags for the HTML output by
+    // SimpletestUiPrinter.
+    $this->assertEqual($output[18], 'HTML output was generated<br />');
+    // Check that URLs are printed as HTML links.
+    $this->assertIdentical(strpos($output[19], '<a href="http'), 0);
+  }
+
+}
diff --git a/web/core/modules/simpletest/src/UserCreationTrait.php b/web/core/modules/simpletest/src/UserCreationTrait.php
index f6665b4c0..4b4d0ec95 100644
--- a/web/core/modules/simpletest/src/UserCreationTrait.php
+++ b/web/core/modules/simpletest/src/UserCreationTrait.php
@@ -43,7 +43,7 @@ trait UserCreationTrait {
    *   A fully loaded user object with pass_raw property, or FALSE if account
    *   creation fails.
    */
-  protected function createUser(array $permissions = array(), $name = NULL, $admin = FALSE) {
+  protected function createUser(array $permissions = [], $name = NULL, $admin = FALSE) {
     // Create a role with the given permission set, if any.
     $rid = FALSE;
     if ($permissions) {
@@ -54,13 +54,13 @@ trait UserCreationTrait {
     }
 
     // Create a user assigned to that role.
-    $edit = array();
+    $edit = [];
     $edit['name'] = !empty($name) ? $name : $this->randomMachineName();
     $edit['mail'] = $edit['name'] . '@example.com';
     $edit['pass'] = user_password();
     $edit['status'] = 1;
     if ($rid) {
-      $edit['roles'] = array($rid);
+      $edit['roles'] = [$rid];
     }
 
     if ($admin) {
@@ -70,7 +70,7 @@ trait UserCreationTrait {
     $account = User::create($edit);
     $account->save();
 
-    $this->assertTrue($account->id(), SafeMarkup::format('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), 'User login');
+    $this->assertTrue($account->id(), SafeMarkup::format('User created with name %name and pass %pass', ['%name' => $edit['name'], '%pass' => $edit['pass']]), 'User login');
     if (!$account->id()) {
       return FALSE;
     }
@@ -141,19 +141,19 @@ trait UserCreationTrait {
     }
 
     // Create new role.
-    $role = Role::create(array(
+    $role = Role::create([
       'id' => $rid,
       'label' => $name,
-    ));
+    ]);
     if (isset($weight)) {
       $role->set('weight', $weight);
     }
     $result = $role->save();
 
-    $this->assertIdentical($result, SAVED_NEW, SafeMarkup::format('Created role ID @rid with name @name.', array(
+    $this->assertIdentical($result, SAVED_NEW, SafeMarkup::format('Created role ID @rid with name @name.', [
       '@name' => var_export($role->label(), TRUE),
       '@rid' => var_export($role->id(), TRUE),
-    )), 'Role');
+    ]), 'Role');
 
     if ($result === SAVED_NEW) {
       // Grant the specified permissions to the role, if any.
@@ -162,10 +162,10 @@ trait UserCreationTrait {
         $assigned_permissions = Role::load($role->id())->getPermissions();
         $missing_permissions = array_diff($permissions, $assigned_permissions);
         if (!$missing_permissions) {
-          $this->pass(SafeMarkup::format('Created permissions: @perms', array('@perms' => implode(', ', $permissions))), 'Role');
+          $this->pass(SafeMarkup::format('Created permissions: @perms', ['@perms' => implode(', ', $permissions)]), 'Role');
         }
         else {
-          $this->fail(SafeMarkup::format('Failed to create permissions: @perms', array('@perms' => implode(', ', $missing_permissions))), 'Role');
+          $this->fail(SafeMarkup::format('Failed to create permissions: @perms', ['@perms' => implode(', ', $missing_permissions)]), 'Role');
         }
       }
       return $role->id();
@@ -189,7 +189,7 @@ trait UserCreationTrait {
     $valid = TRUE;
     foreach ($permissions as $permission) {
       if (!in_array($permission, $available)) {
-        $this->fail(SafeMarkup::format('Invalid permission %permission.', array('%permission' => $permission)), 'Role');
+        $this->fail(SafeMarkup::format('Invalid permission %permission.', ['%permission' => $permission]), 'Role');
         $valid = FALSE;
       }
     }
diff --git a/web/core/modules/simpletest/src/WebTestBase.php b/web/core/modules/simpletest/src/WebTestBase.php
index 547de13a4..2491bc84b 100644
--- a/web/core/modules/simpletest/src/WebTestBase.php
+++ b/web/core/modules/simpletest/src/WebTestBase.php
@@ -3,32 +3,25 @@
 namespace Drupal\simpletest;
 
 use Drupal\block\Entity\Block;
-use Drupal\Component\FileCache\FileCacheFactory;
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\UrlHelper;
-use Drupal\Core\Cache\Cache;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Database\Database;
-use Drupal\Core\DrupalKernel;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
-use Drupal\Core\Extension\MissingDependencyException;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Serialization\Yaml;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Session\AnonymousUserSession;
-use Drupal\Core\Session\UserSession;
-use Drupal\Core\Site\Settings;
 use Drupal\Core\Test\AssertMailTrait;
+use Drupal\Core\Test\FunctionalTestSetupTrait;
 use Drupal\Core\Url;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+use Drupal\Tests\Traits\Core\CronRunTrait;
 use Drupal\Tests\TestFileCreationTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Yaml\Yaml as SymfonyYaml;
+use Drupal\Tests\XdebugRequestTrait;
 use Zend\Diactoros\Uri;
 
 /**
@@ -38,6 +31,7 @@ use Zend\Diactoros\Uri;
  */
 abstract class WebTestBase extends TestBase {
 
+  use FunctionalTestSetupTrait;
   use AssertContentTrait;
   use TestFileCreationTrait {
     getTestFiles as drupalGetTestFiles;
@@ -50,6 +44,7 @@ abstract class WebTestBase extends TestBase {
   use ContentTypeCreationTrait {
     createContentType as drupalCreateContentType;
   }
+  use CronRunTrait;
   use AssertMailTrait {
     getMails as drupalGetMails;
   }
@@ -63,6 +58,8 @@ abstract class WebTestBase extends TestBase {
     createAdminRole as drupalCreateAdminRole;
   }
 
+  use XdebugRequestTrait;
+
   /**
    * The profile to install as a basis for testing.
    *
@@ -103,7 +100,7 @@ abstract class WebTestBase extends TestBase {
    *
    * @var array
    */
-  protected $cookies = array();
+  protected $cookies = [];
 
   /**
    * Indicates that headers should be dumped if verbose output is enabled.
@@ -122,14 +119,6 @@ abstract class WebTestBase extends TestBase {
    */
   protected $loggedInUser = FALSE;
 
-  /**
-   * The "#1" admin user.
-   *
-   * @var \Drupal\Core\Session\AccountInterface
-   */
-  protected $rootUser;
-
-
   /**
    * The current cookie file used by cURL.
    *
@@ -144,7 +133,7 @@ abstract class WebTestBase extends TestBase {
    * \Drupal\simpletest\WebTestBase itself never sets this but always obeys what
    * is set.
    */
-  protected $additionalCurlOptions = array();
+  protected $additionalCurlOptions = [];
 
   /**
    * The original batch, before it was changed for testing purposes.
@@ -165,7 +154,7 @@ abstract class WebTestBase extends TestBase {
    *
    * @var array
    */
-  protected $originalShutdownCallbacks = array();
+  protected $originalShutdownCallbacks = [];
 
   /**
    * The current session ID, if available.
@@ -197,24 +186,12 @@ abstract class WebTestBase extends TestBase {
    */
   protected $metaRefreshCount = 0;
 
-  /**
-   * The kernel used in this test.
-   *
-   * @var \Drupal\Core\DrupalKernel
-   */
-  protected $kernel;
-
-  /**
-   * The config directories used in this test.
-   */
-  protected $configDirectories = array();
-
   /**
    * Cookies to set on curl requests.
    *
    * @var array
    */
-  protected $curlCookies = array();
+  protected $curlCookies = [];
 
   /**
    * An array of custom translations suitable for drupal_rewrite_settings().
@@ -223,17 +200,10 @@ abstract class WebTestBase extends TestBase {
    */
   protected $customTranslations;
 
-  /**
-   * The class loader to use for installation and initialization of setup.
-   *
-   * @var \Symfony\Component\Classloader\Classloader
-   */
-  protected $classLoader;
-
   /**
    * Constructor for \Drupal\simpletest\WebTestBase.
    */
-  function __construct($test_id = NULL) {
+  public function __construct($test_id = NULL) {
     parent::__construct($test_id);
     $this->skipClasses[__CLASS__] = TRUE;
     $this->classLoader = require DRUPAL_ROOT . '/autoload.php';
@@ -289,7 +259,7 @@ abstract class WebTestBase extends TestBase {
 
     $render_controller = $this->container->get('entity.manager')->getViewBuilder($entity->getEntityTypeId());
     if ($reset) {
-      $render_controller->resetCache(array($entity->id()));
+      $render_controller->resetCache([$entity->id()]);
     }
     $build = $render_controller->view($entity, $view_mode, $langcode);
     $ensure_fully_built($build);
@@ -305,7 +275,7 @@ abstract class WebTestBase extends TestBase {
    */
   protected function assertBlockAppears(Block $block) {
     $result = $this->findBlockInstance($block);
-    $this->assertTrue(!empty($result), format_string('Ensure the block @id appears on the page', array('@id' => $block->id())));
+    $this->assertTrue(!empty($result), format_string('Ensure the block @id appears on the page', ['@id' => $block->id()]));
   }
 
   /**
@@ -316,7 +286,7 @@ abstract class WebTestBase extends TestBase {
    */
   protected function assertNoBlockAppears(Block $block) {
     $result = $this->findBlockInstance($block);
-    $this->assertFalse(!empty($result), format_string('Ensure the block @id does not appear on the page', array('@id' => $block->id())));
+    $this->assertFalse(!empty($result), format_string('Ensure the block @id does not appear on the page', ['@id' => $block->id()]));
   }
 
   /**
@@ -329,7 +299,7 @@ abstract class WebTestBase extends TestBase {
    *   The result from the xpath query.
    */
   protected function findBlockInstance(Block $block) {
-    return $this->xpath('//div[@id = :id]', array(':id' => 'block-' . $block->id()));
+    return $this->xpath('//div[@id = :id]', [':id' => 'block-' . $block->id()]);
   }
 
   /**
@@ -364,17 +334,17 @@ abstract class WebTestBase extends TestBase {
       $this->drupalLogout();
     }
 
-    $edit = array(
+    $edit = [
       'name' => $account->getUsername(),
       'pass' => $account->pass_raw
-    );
+    ];
     $this->drupalPostForm('user/login', $edit, t('Log in'));
 
     // @see WebTestBase::drupalUserIsLoggedIn()
     if (isset($this->sessionId)) {
       $account->session_id = $this->sessionId;
     }
-    $pass = $this->assert($this->drupalUserIsLoggedIn($account), format_string('User %name successfully logged in.', array('%name' => $account->getUsername())), 'User login');
+    $pass = $this->assert($this->drupalUserIsLoggedIn($account), format_string('User %name successfully logged in.', ['%name' => $account->getUsername()]), 'User login');
     if ($pass) {
       $this->loggedInUser = $account;
       $this->container->get('current_user')->setAccount($account);
@@ -407,7 +377,7 @@ abstract class WebTestBase extends TestBase {
     // Make a request to the logout page, and redirect to the user page, the
     // idea being if you were properly logged out you should be seeing a login
     // screen.
-    $this->drupalGet('user/logout', array('query' => array('destination' => 'user/login')));
+    $this->drupalGet('user/logout', ['query' => ['destination' => 'user/login']]);
     $this->assertResponse(200, 'User was logged out.');
     $pass = $this->assertField('name', 'Username field found.', 'Logout');
     $pass = $pass && $this->assertField('pass', 'Password field found.', 'Logout');
@@ -475,177 +445,6 @@ abstract class WebTestBase extends TestBase {
     $this->rebuildAll();
   }
 
-  /**
-   * Execute the non-interactive installer.
-   *
-   * @see install_drupal()
-   */
-  protected function doInstall() {
-    require_once DRUPAL_ROOT . '/core/includes/install.core.inc';
-    install_drupal($this->classLoader, $this->installParameters());
-  }
-
-  /**
-   * Prepares site settings and services before installation.
-   */
-  protected function prepareSettings() {
-    // Prepare installer settings that are not install_drupal() parameters.
-    // Copy and prepare an actual settings.php, so as to resemble a regular
-    // installation.
-    // Not using File API; a potential error must trigger a PHP warning.
-    $directory = DRUPAL_ROOT . '/' . $this->siteDirectory;
-    copy(DRUPAL_ROOT . '/sites/default/default.settings.php', $directory . '/settings.php');
-
-    // The public file system path is created during installation. Additionally,
-    // during tests:
-    // - The temporary directory is set and created by install_base_system().
-    // - The private file directory is created post install by
-    //   WebTestBase::initConfig().
-    // @see system_requirements()
-    // @see TestBase::prepareEnvironment()
-    // @see install_base_system()
-    // @see\Drupal\simpletest\WebTestBase::initConfig()
-    $settings['settings']['file_public_path'] = (object) [
-      'value' => $this->publicFilesDirectory,
-      'required' => TRUE,
-    ];
-    $settings['settings']['file_private_path'] = (object) [
-      'value' => $this->privateFilesDirectory,
-      'required' => TRUE,
-    ];
-    // Save the original site directory path, so that extensions in the
-    // site-specific directory can still be discovered in the test site
-    // environment.
-    // @see \Drupal\Core\Extension\ExtensionDiscovery::scan()
-    $settings['settings']['test_parent_site'] = (object) [
-      'value' => $this->originalSite,
-      'required' => TRUE,
-    ];
-    // Add the parent profile's search path to the child site's search paths.
-    // @see \Drupal\Core\Extension\ExtensionDiscovery::getProfileDirectories()
-    $settings['conf']['simpletest.settings']['parent_profile'] = (object) [
-      'value' => $this->originalProfile,
-      'required' => TRUE,
-    ];
-    $this->writeSettings($settings);
-    // Allow for test-specific overrides.
-    $settings_testing_file = DRUPAL_ROOT . '/' . $this->originalSite . '/settings.testing.php';
-    if (file_exists($settings_testing_file)) {
-      // Copy the testing-specific settings.php overrides in place.
-      copy($settings_testing_file, $directory . '/settings.testing.php');
-      // Add the name of the testing class to settings.php and include the
-      // testing specific overrides
-      file_put_contents($directory . '/settings.php', "\n\$test_class = '" . get_class($this) . "';\n" . 'include DRUPAL_ROOT . \'/\' . $site_path . \'/settings.testing.php\';' . "\n", FILE_APPEND);
-    }
-    $settings_services_file = DRUPAL_ROOT . '/' . $this->originalSite . '/testing.services.yml';
-    if (!file_exists($settings_services_file)) {
-      // Otherwise, use the default services as a starting point for overrides.
-      $settings_services_file = DRUPAL_ROOT . '/sites/default/default.services.yml';
-    }
-    // Copy the testing-specific service overrides in place.
-    copy($settings_services_file, $directory . '/services.yml');
-    if ($this->strictConfigSchema) {
-      // Add a listener to validate configuration schema on save.
-      $yaml = new SymfonyYaml();
-      $content = file_get_contents($directory . '/services.yml');
-      $services = $yaml->parse($content);
-      $services['services']['simpletest.config_schema_checker'] = [
-        'class' => 'Drupal\Core\Config\Testing\ConfigSchemaChecker',
-        'arguments' => ['@config.typed', $this->getConfigSchemaExclusions()],
-        'tags' => [['name' => 'event_subscriber']]
-      ];
-      file_put_contents($directory . '/services.yml', $yaml->dump($services));
-    }
-    // Since Drupal is bootstrapped already, install_begin_request() will not
-    // bootstrap again. Hence, we have to reload the newly written custom
-    // settings.php manually.
-    Settings::initialize(DRUPAL_ROOT, $this->siteDirectory, $this->classLoader);
-  }
-
-  /**
-   * Initialize settings created during install.
-   */
-  protected function initSettings() {
-    Settings::initialize(DRUPAL_ROOT, $this->siteDirectory, $this->classLoader);
-    foreach ($GLOBALS['config_directories'] as $type => $path) {
-      $this->configDirectories[$type] = $path;
-    }
-
-    // After writing settings.php, the installer removes write permissions
-    // from the site directory. To allow drupal_generate_test_ua() to write
-    // a file containing the private key for drupal_valid_test_ua(), the site
-    // directory has to be writable.
-    // TestBase::restoreEnvironment() will delete the entire site directory.
-    // Not using File API; a potential error must trigger a PHP warning.
-    chmod(DRUPAL_ROOT . '/' . $this->siteDirectory, 0777);
-
-    // During tests, cacheable responses should get the debugging cacheability
-    // headers by default.
-    $this->setContainerParameter('http.response.debug_cacheability_headers', TRUE);
-  }
-
-  /**
-   * Initialize various configurations post-installation.
-   *
-   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
-   *   The container.
-   */
-  protected function initConfig(ContainerInterface $container) {
-    $config = $container->get('config.factory');
-
-    // Manually create the private directory.
-    file_prepare_directory($this->privateFilesDirectory, FILE_CREATE_DIRECTORY);
-
-    // Manually configure the test mail collector implementation to prevent
-    // tests from sending out emails and collect them in state instead.
-    // While this should be enforced via settings.php prior to installation,
-    // some tests expect to be able to test mail system implementations.
-    $config->getEditable('system.mail')
-      ->set('interface.default', 'test_mail_collector')
-      ->save();
-
-    // By default, verbosely display all errors and disable all production
-    // environment optimizations for all tests to avoid needless overhead and
-    // ensure a sane default experience for test authors.
-    // @see https://www.drupal.org/node/2259167
-    $config->getEditable('system.logging')
-      ->set('error_level', 'verbose')
-      ->save();
-    $config->getEditable('system.performance')
-      ->set('css.preprocess', FALSE)
-      ->set('js.preprocess', FALSE)
-      ->save();
-
-    // Set an explicit time zone to not rely on the system one, which may vary
-    // from setup to setup. The Australia/Sydney time zone is chosen so all
-    // tests are run using an edge case scenario (UTC+10 and DST). This choice
-    // is made to prevent time zone related regressions and reduce the
-    // fragility of the testing system in general.
-    $config->getEditable('system.date')
-      ->set('timezone.default', 'Australia/Sydney')
-      ->save();
-  }
-
-  /**
-   * Reset and rebuild the environment after setup.
-   */
-  protected function rebuildAll() {
-    // Reset/rebuild all data structures after enabling the modules, primarily
-    // to synchronize all data structures and caches between the test runner and
-    // the child site.
-    // @see \Drupal\Core\DrupalKernel::bootCode()
-    // @todo Test-specific setUp() methods may set up further fixtures; find a
-    //   way to execute this after setUp() is done, or to eliminate it entirely.
-    $this->resetAll();
-    $this->kernel->prepareLegacyRequest(\Drupal::request());
-
-    // Explicitly call register() again on the container registered in \Drupal.
-    // @todo This should already be called through
-    //   DrupalKernel::prepareLegacyRequest() -> DrupalKernel::boot() but that
-    //   appears to be calling a different container.
-    $this->container->get('stream_wrapper_manager')->register();
-  }
-
   /**
    * Returns the parameters that will be used when Simpletest installs Drupal.
    *
@@ -670,38 +469,36 @@ abstract class WebTestBase extends TestBase {
       unset($connection_info['default']['host']);
       unset($connection_info['default']['port']);
     }
-    $parameters = array(
+    $parameters = [
       'interactive' => FALSE,
-      'parameters' => array(
+      'parameters' => [
         'profile' => $this->profile,
         'langcode' => 'en',
-      ),
-      'forms' => array(
-        'install_settings_form' => array(
+      ],
+      'forms' => [
+        'install_settings_form' => [
           'driver' => $driver,
           $driver => $connection_info['default'],
-        ),
-        'install_configure_form' => array(
+        ],
+        'install_configure_form' => [
           'site_name' => 'Drupal',
           'site_mail' => 'simpletest@example.com',
-          'account' => array(
+          'account' => [
             'name' => $this->rootUser->name,
             'mail' => $this->rootUser->getEmail(),
-            'pass' => array(
+            'pass' => [
               'pass1' => $this->rootUser->pass_raw,
               'pass2' => $this->rootUser->pass_raw,
-            ),
-          ),
+            ],
+          ],
           // \Drupal\Core\Render\Element\Checkboxes::valueCallback() requires
           // NULL instead of FALSE values for programmatic form submissions to
           // disable a checkbox.
-          'update_status_module' => array(
-            1 => NULL,
-            2 => NULL,
-          ),
-        ),
-      ),
-    );
+          'enable_update_status_module' => NULL,
+          'enable_update_status_emails' => NULL,
+        ],
+      ],
+    ];
 
     // If we only have one db driver available, we cannot set the driver.
     include_once DRUPAL_ROOT . '/core/includes/install.inc';
@@ -738,77 +535,6 @@ abstract class WebTestBase extends TestBase {
     $batch = $this->originalBatch;
   }
 
-  /**
-   * Initializes user 1 for the site to be installed.
-   */
-  protected function initUserSession() {
-    // Define information about the user 1 account.
-    $this->rootUser = new UserSession(array(
-      'uid' => 1,
-      'name' => 'admin',
-      'mail' => 'admin@example.com',
-      'pass_raw' => $this->randomMachineName(),
-      'timezone' => date_default_timezone_get(),
-    ));
-
-    // The child site derives its session name from the database prefix when
-    // running web tests.
-    $this->generateSessionName($this->databasePrefix);
-  }
-
-  /**
-   * Initializes the kernel after installation.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   Request object.
-   *
-   * @return \Symfony\Component\DependencyInjection\ContainerInterface
-   *   The container.
-   */
-  protected function initKernel(Request $request) {
-    $this->kernel = DrupalKernel::createFromRequest($request, $this->classLoader, 'prod', TRUE);
-    $this->kernel->prepareLegacyRequest($request);
-    // Force the container to be built from scratch instead of loaded from the
-    // disk. This forces us to not accidentally load the parent site.
-    return $this->kernel->rebuildContainer();
-  }
-
-  /**
-   * Install modules defined by `static::$modules`.
-   *
-   * To install test modules outside of the testing environment, add
-   * @code
-   * $settings['extension_discovery_scan_tests'] = TRUE;
-   * @endcode
-   * to your settings.php.
-   *
-   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
-   *   The container.
-   */
-  protected function installModulesFromClassProperty(ContainerInterface $container) {
-    $class = get_class($this);
-    $modules = [];
-    while ($class) {
-      if (property_exists($class, 'modules')) {
-        $modules = array_merge($modules, $class::$modules);
-      }
-      $class = get_parent_class($class);
-    }
-    if ($modules) {
-      $modules = array_unique($modules);
-      try {
-        $success = $container->get('module_installer')->install($modules, TRUE);
-        $this->assertTrue($success, SafeMarkup::format('Enabled modules: %modules', ['%modules' => implode(', ', $modules)]));
-      }
-      catch (MissingDependencyException $e) {
-        // The exception message has all the details.
-        $this->fail($e->getMessage());
-      }
-
-      $this->rebuildContainer();
-    }
-  }
-
   /**
    * Returns all supported database driver installer objects.
    *
@@ -824,46 +550,6 @@ abstract class WebTestBase extends TestBase {
     return $database_types;
   }
 
-  /**
-   * Rewrites the settings.php file of the test site.
-   *
-   * @param array $settings
-   *   An array of settings to write out, in the format expected by
-   *   drupal_rewrite_settings().
-   *
-   * @see drupal_rewrite_settings()
-   */
-  protected function writeSettings(array $settings) {
-    include_once DRUPAL_ROOT . '/core/includes/install.inc';
-    $filename = $this->siteDirectory . '/settings.php';
-    // system_requirements() removes write permissions from settings.php
-    // whenever it is invoked.
-    // Not using File API; a potential error must trigger a PHP warning.
-    chmod($filename, 0666);
-    drupal_rewrite_settings($settings, $filename);
-  }
-
-  /**
-   * Changes parameters in the services.yml file.
-   *
-   * @param $name
-   *   The name of the parameter.
-   * @param $value
-   *   The value of the parameter.
-   */
-  protected function setContainerParameter($name, $value) {
-    $filename = $this->siteDirectory . '/services.yml';
-    chmod($filename, 0666);
-
-    $services = Yaml::decode(file_get_contents($filename));
-    $services['parameters'][$name] = $value;
-    file_put_contents($filename, Yaml::encode($services));
-
-    // Ensure that the cache is deleted for the yaml file loader.
-    $file_cache = FileCacheFactory::get('container_yaml_loader');
-    $file_cache->delete($filename);
-  }
-
   /**
    * Queues custom translations to be written to settings.php.
    *
@@ -888,7 +574,7 @@ abstract class WebTestBase extends TestBase {
     // If $values is empty, then the test expects all custom translations to be
     // cleared.
     if (empty($values)) {
-      $this->customTranslations[$langcode] = array();
+      $this->customTranslations[$langcode] = [];
     }
     // Otherwise, $values are expected to be merged into previously passed
     // values, while retaining keys that are not explicitly set.
@@ -908,17 +594,17 @@ abstract class WebTestBase extends TestBase {
    * calling this method.
    */
   protected function writeCustomTranslations() {
-    $settings = array();
+    $settings = [];
     foreach ($this->customTranslations as $langcode => $values) {
       $settings_key = 'locale_custom_strings_' . $langcode;
 
       // Update in-memory settings directly.
       $this->settingsSet($settings_key, $values);
 
-      $settings['settings'][$settings_key] = (object) array(
+      $settings['settings'][$settings_key] = (object) [
         'value' => $values,
         'required' => TRUE,
-      );
+      ];
     }
     // Only rewrite settings if there are any translation changes to write.
     if (!empty($settings)) {
@@ -926,73 +612,6 @@ abstract class WebTestBase extends TestBase {
     }
   }
 
-  /**
-   * Rebuilds \Drupal::getContainer().
-   *
-   * Use this to update the test process's kernel with a new service container.
-   * For example, when the list of enabled modules is changed via the internal
-   * browser the test process's kernel has a service container with an out of
-   * date module list.
-   *
-   * @see TestBase::prepareEnvironment()
-   * @see TestBase::restoreEnvironment()
-   *
-   * @todo Fix https://www.drupal.org/node/2021959 so that module enable/disable
-   *   changes are immediately reflected in \Drupal::getContainer(). Until then,
-   *   tests can invoke this workaround when requiring services from newly
-   *   enabled modules to be immediately available in the same request.
-   */
-  protected function rebuildContainer() {
-    // Rebuild the kernel and bring it back to a fully bootstrapped state.
-    $this->container = $this->kernel->rebuildContainer();
-
-    // Make sure the url generator has a request object, otherwise calls to
-    // $this->drupalGet() will fail.
-    $this->prepareRequestForGenerator();
-  }
-
-  /**
-   * Resets all data structures after having enabled new modules.
-   *
-   * This method is called by \Drupal\simpletest\WebTestBase::setUp() after
-   * enabling the requested modules. It must be called again when additional
-   * modules are enabled later.
-   */
-  protected function resetAll() {
-    // Clear all database and static caches and rebuild data structures.
-    drupal_flush_all_caches();
-    $this->container = \Drupal::getContainer();
-
-    // Reset static variables and reload permissions.
-    $this->refreshVariables();
-  }
-
-  /**
-   * Refreshes in-memory configuration and state information.
-   *
-   * Useful after a page request is made that changes configuration or state in
-   * a different thread.
-   *
-   * In other words calling a settings page with $this->drupalPostForm() with a
-   * changed value would update configuration to reflect that change, but in the
-   * thread that made the call (thread running the test) the changed values
-   * would not be picked up.
-   *
-   * This method clears the cache and loads a fresh copy.
-   */
-  protected function refreshVariables() {
-    // Clear the tag cache.
-    \Drupal::service('cache_tags.invalidator')->resetChecksums();
-    foreach (Cache::getBins() as $backend) {
-      if (is_callable(array($backend, 'reset'))) {
-        $backend->reset();
-      }
-    }
-
-    $this->container->get('config.factory')->reset();
-    $this->container->get('state')->resetCache();
-  }
-
   /**
    * Cleans up after testing.
    *
@@ -1011,13 +630,13 @@ abstract class WebTestBase extends TestBase {
 
     // Ensure that internal logged in variable and cURL options are reset.
     $this->loggedInUser = FALSE;
-    $this->additionalCurlOptions = array();
+    $this->additionalCurlOptions = [];
 
     // Close the CURL handler and reset the cookies array used for upgrade
     // testing so test classes containing multiple tests are not polluted.
     $this->curlClose();
-    $this->curlCookies = array();
-    $this->cookies = array();
+    $this->curlCookies = [];
+    $this->cookies = [];
   }
 
   /**
@@ -1040,7 +659,7 @@ abstract class WebTestBase extends TestBase {
         $this->cookieFile = $this->publicFilesDirectory . '/cookie.jar';
       }
 
-      $curl_options = array(
+      $curl_options = [
         CURLOPT_COOKIEJAR => $this->cookieFile,
         CURLOPT_URL => $base_url,
         CURLOPT_FOLLOWLOCATION => FALSE,
@@ -1049,11 +668,11 @@ abstract class WebTestBase extends TestBase {
         CURLOPT_SSL_VERIFYPEER => FALSE,
         // Required to make the tests run on HTTPS.
         CURLOPT_SSL_VERIFYHOST => FALSE,
-        CURLOPT_HEADERFUNCTION => array(&$this, 'curlHeaderCallback'),
+        CURLOPT_HEADERFUNCTION => [&$this, 'curlHeaderCallback'],
         CURLOPT_USERAGENT => $this->databasePrefix,
         // Disable support for the @ prefix for uploading files.
         CURLOPT_SAFE_UPLOAD => TRUE,
-      );
+      ];
       if (isset($this->httpAuthCredentials)) {
         $curl_options[CURLOPT_HTTPAUTH] = $this->httpAuthMethod;
         $curl_options[CURLOPT_USERPWD] = $this->httpAuthCredentials;
@@ -1112,41 +731,22 @@ abstract class WebTestBase extends TestBase {
       $curl_options[CURLOPT_HTTPHEADER][] = 'Expect:';
     }
 
-    $cookies = array();
+    $cookies = [];
     if (!empty($this->curlCookies)) {
       $cookies = $this->curlCookies;
     }
-    // In order to debug web tests you need to either set a cookie, have the
-    // Xdebug session in the URL or set an environment variable in case of CLI
-    // requests. If the developer listens to connection on the parent site, by
-    // default the cookie is not forwarded to the client side, so you cannot
-    // debug the code running on the child site. In order to make debuggers work
-    // this bit of information is forwarded. Make sure that the debugger listens
-    // to at least three external connections.
-    $request = \Drupal::request();
-    $cookie_params = $request->cookies;
-    if ($cookie_params->has('XDEBUG_SESSION')) {
-      $cookies[] = 'XDEBUG_SESSION=' . $cookie_params->get('XDEBUG_SESSION');
-    }
-    // For CLI requests, the information is stored in $_SERVER.
-    $server = $request->server;
-    if ($server->has('XDEBUG_CONFIG')) {
-      // $_SERVER['XDEBUG_CONFIG'] has the form "key1=value1 key2=value2 ...".
-      $pairs = explode(' ', $server->get('XDEBUG_CONFIG'));
-      foreach ($pairs as $pair) {
-        list($key, $value) = explode('=', $pair);
-        // Account for key-value pairs being separated by multiple spaces.
-        if (trim($key, ' ') == 'idekey') {
-          $cookies[] = 'XDEBUG_SESSION=' . trim($value, ' ');
-        }
+
+    foreach ($this->extractCookiesFromRequest(\Drupal::request()) as $cookie_name => $values) {
+      foreach ($values as $value) {
+        $cookies[] = $cookie_name . '=' . $value;
       }
     }
 
     // Merge additional cookies in.
     if (!empty($cookies)) {
-      $curl_options += array(
+      $curl_options += [
         CURLOPT_COOKIE => '',
-      );
+      ];
       // Ensure any existing cookie data string ends with the correct separator.
       if (!empty($curl_options[CURLOPT_COOKIE])) {
         $curl_options[CURLOPT_COOKIE] = rtrim($curl_options[CURLOPT_COOKIE], '; ') . '; ';
@@ -1159,7 +759,7 @@ abstract class WebTestBase extends TestBase {
     if (!$redirect) {
       // Reset headers, the session ID and the redirect counter.
       $this->sessionId = NULL;
-      $this->headers = array();
+      $this->headers = [];
       $this->redirectCount = 0;
     }
 
@@ -1171,10 +771,10 @@ abstract class WebTestBase extends TestBase {
     // to prevent fragments being sent to the web server as part
     // of the request.
     // TODO: Remove this for Drupal 8, since fixed in curl 7.20.0.
-    if (in_array($status, array(300, 301, 302, 303, 305, 307)) && $this->redirectCount < $this->maximumRedirects) {
+    if (in_array($status, [300, 301, 302, 303, 305, 307]) && $this->redirectCount < $this->maximumRedirects) {
       if ($this->drupalGetHeader('location')) {
         $this->redirectCount++;
-        $curl_options = array();
+        $curl_options = [];
         $curl_options[CURLOPT_URL] = $this->drupalGetHeader('location');
         $curl_options[CURLOPT_HTTPGET] = TRUE;
         return $this->curlExec($curl_options, TRUE);
@@ -1184,12 +784,12 @@ abstract class WebTestBase extends TestBase {
     $this->setRawContent($content);
     $this->url = isset($original_url) ? $original_url : curl_getinfo($this->curlHandle, CURLINFO_EFFECTIVE_URL);
 
-    $message_vars = array(
+    $message_vars = [
       '@method' => !empty($curl_options[CURLOPT_NOBODY]) ? 'HEAD' : (empty($curl_options[CURLOPT_POSTFIELDS]) ? 'GET' : 'POST'),
       '@url' => isset($original_url) ? $original_url : $url,
       '@status' => $status,
       '@length' => format_size(strlen($this->getRawContent()))
-    );
+    ];
     $message = SafeMarkup::format('@method @url returned @status (@length).', $message_vars);
     $this->assertTrue($this->getRawContent() !== FALSE, $message, 'Browser');
     return $this->getRawContent();
@@ -1223,7 +823,7 @@ abstract class WebTestBase extends TestBase {
     if (preg_match('/^X-Drupal-Assertion-[0-9]+: (.*)$/', $header, $matches)) {
       // Call \Drupal\simpletest\WebTestBase::error() with the parameters from
       // the header.
-      call_user_func_array(array(&$this, 'error'), unserialize(urldecode($matches[1])));
+      call_user_func_array([&$this, 'error'], unserialize(urldecode($matches[1])));
     }
 
     // Save cookies.
@@ -1231,7 +831,7 @@ abstract class WebTestBase extends TestBase {
       $name = $matches[1];
       $parts = array_map('trim', explode(';', $matches[2]));
       $value = array_shift($parts);
-      $this->cookies[$name] = array('value' => $value, 'secure' => in_array('secure', $parts));
+      $this->cookies[$name] = ['value' => $value, 'secure' => in_array('secure', $parts)];
       if ($name === $this->getSessionName()) {
         if ($value != 'deleted') {
           $this->sessionId = $value;
@@ -1285,11 +885,11 @@ abstract class WebTestBase extends TestBase {
    * @return string
    *   The retrieved HTML string, also available as $this->getRawContent()
    */
-  protected function drupalGet($path, array $options = array(), array $headers = array()) {
+  protected function drupalGet($path, array $options = [], array $headers = []) {
     // We re-using a CURL connection here. If that connection still has certain
     // options set, it might change the GET into a POST. Make sure we clear out
     // previous options.
-    $out = $this->curlExec(array(CURLOPT_HTTPGET => TRUE, CURLOPT_URL => $this->buildUrl($path, $options), CURLOPT_NOBODY => FALSE, CURLOPT_HTTPHEADER => $headers));
+    $out = $this->curlExec([CURLOPT_HTTPGET => TRUE, CURLOPT_URL => $this->buildUrl($path, $options), CURLOPT_NOBODY => FALSE, CURLOPT_HTTPHEADER => $headers]);
     // Ensure that any changes to variables in the other thread are picked up.
     $this->refreshVariables();
 
@@ -1328,7 +928,7 @@ abstract class WebTestBase extends TestBase {
    * @return array
    *   Decoded json.
    */
-  protected function drupalGetJSON($path, array $options = array(), array $headers = array()) {
+  protected function drupalGetJSON($path, array $options = [], array $headers = []) {
     return Json::decode($this->drupalGetWithFormat($path, 'json', $options, $headers));
   }
 
@@ -1365,7 +965,7 @@ abstract class WebTestBase extends TestBase {
    * @return array
    *   Decoded JSON.
    */
-  protected function drupalGetAjax($path, array $options = array(), array $headers = array()) {
+  protected function drupalGetAjax($path, array $options = [], array $headers = []) {
     if (!isset($options['query'][MainContentViewSubscriber::WRAPPER_FORMAT])) {
       $options['query'][MainContentViewSubscriber::WRAPPER_FORMAT] = 'drupal_ajax';
     }
@@ -1385,7 +985,7 @@ abstract class WebTestBase extends TestBase {
    * @return string
    *   The retrieved content.
    */
-  protected function drupalGetXHR($path, array $options = array(), array $headers = array()) {
+  protected function drupalGetXHR($path, array $options = [], array $headers = []) {
     $headers[] = 'X-Requested-With: XMLHttpRequest';
     return $this->drupalGet($path, $options, $headers);
   }
@@ -1474,7 +1074,7 @@ abstract class WebTestBase extends TestBase {
    *   POST data, so it must already be urlencoded and contain a leading "&"
    *   (e.g., "&extra_var1=hello+world&extra_var2=you%26me").
    */
-  protected function drupalPostForm($path, $edit, $submit, array $options = array(), array $headers = array(), $form_html_id = NULL, $extra_post = NULL) {
+  protected function drupalPostForm($path, $edit, $submit, array $options = [], array $headers = [], $form_html_id = NULL, $extra_post = NULL) {
     if (is_object($submit)) {
       // Cast MarkupInterface objects to string.
       $submit = (string) $submit;
@@ -1500,8 +1100,8 @@ abstract class WebTestBase extends TestBase {
       foreach ($forms as $form) {
         // We try to set the fields of this form as specified in $edit.
         $edit = $edit_save;
-        $post = array();
-        $upload = array();
+        $post = [];
+        $upload = [];
         $submit_matches = $this->handleForm($post, $edit, $upload, $ajax ? NULL : $submit, $form);
         $action = isset($form['action']) ? $this->getAbsoluteUrl((string) $form['action']) : $this->getUrl();
         if ($ajax) {
@@ -1541,7 +1141,7 @@ abstract class WebTestBase extends TestBase {
           else {
             $post = $this->serializePostValues($post) . $extra_post;
           }
-          $out = $this->curlExec(array(CURLOPT_URL => $action, CURLOPT_POST => TRUE, CURLOPT_POSTFIELDS => $post, CURLOPT_HTTPHEADER => $headers));
+          $out = $this->curlExec([CURLOPT_URL => $action, CURLOPT_POST => TRUE, CURLOPT_POSTFIELDS => $post, CURLOPT_HTTPHEADER => $headers]);
           // Ensure that any changes to variables in the other thread are picked
           // up.
           $this->refreshVariables();
@@ -1569,12 +1169,12 @@ abstract class WebTestBase extends TestBase {
       }
       // We have not found a form which contained all fields of $edit.
       foreach ($edit as $name => $value) {
-        $this->fail(SafeMarkup::format('Failed to set field @name to @value', array('@name' => $name, '@value' => $value)));
+        $this->fail(SafeMarkup::format('Failed to set field @name to @value', ['@name' => $name, '@value' => $value]));
       }
       if (!$ajax && isset($submit)) {
-        $this->assertTrue($submit_matches, format_string('Found the @submit button', array('@submit' => $submit)));
+        $this->assertTrue($submit_matches, format_string('Found the @submit button', ['@submit' => $submit]));
       }
-      $this->fail(format_string('Found the requested form fields at @path', array('@path' => ($path instanceof Url) ? $path->toString() : $path)));
+      $this->fail(format_string('Found the requested form fields at @path', ['@path' => ($path instanceof Url) ? $path->toString() : $path]));
     }
   }
 
@@ -1620,7 +1220,7 @@ abstract class WebTestBase extends TestBase {
    * @see drupalProcessAjaxResponse()
    * @see ajax.js
    */
-  protected function drupalPostAjaxForm($path, $edit, $triggering_element, $ajax_path = NULL, array $options = array(), array $headers = array(), $form_html_id = NULL, $ajax_settings = NULL) {
+  protected function drupalPostAjaxForm($path, $edit, $triggering_element, $ajax_path = NULL, array $options = [], array $headers = [], $form_html_id = NULL, $ajax_settings = NULL) {
 
     // Get the content of the initial page prior to calling drupalPostForm(),
     // since drupalPostForm() replaces $this->content.
@@ -1657,7 +1257,7 @@ abstract class WebTestBase extends TestBase {
     }
 
     // Add extra information to the POST data as ajax.js does.
-    $extra_post = array();
+    $extra_post = [];
     if (isset($ajax_settings['submit'])) {
       foreach ($ajax_settings['submit'] as $key => $value) {
         $extra_post[$key] = $value;
@@ -1695,7 +1295,7 @@ abstract class WebTestBase extends TestBase {
     $ajax_path = $this->container->get('unrouted_url_assembler')->assemble('base://' . $ajax_path, $options);
 
     // Submit the POST request.
-    $return = Json::decode($this->drupalPostForm(NULL, $edit, array('path' => $ajax_path, 'triggering_element' => $triggering_element), $options, $headers, $form_html_id, $extra_post));
+    $return = Json::decode($this->drupalPostForm(NULL, $edit, ['path' => $ajax_path, 'triggering_element' => $triggering_element], $options, $headers, $form_html_id, $extra_post));
     if ($this->assertAjaxHeader) {
       $this->assertIdentical($this->drupalGetHeader('X-Drupal-Ajax-Token'), '1', 'Ajax response header found.');
     }
@@ -1741,9 +1341,9 @@ abstract class WebTestBase extends TestBase {
 
     // ajax.js applies some defaults to the settings object, so do the same
     // for what's used by this function.
-    $ajax_settings += array(
+    $ajax_settings += [
       'method' => 'replaceWith',
-    );
+    ];
     // DOM can load HTML soup. But, HTML soup can throw warnings, suppress
     // them.
     $dom = new \DOMDocument();
@@ -1770,7 +1370,7 @@ abstract class WebTestBase extends TestBase {
           // @todo Ajax commands can target any jQuery selector, but these are
           //   hard to fully emulate with XPath. For now, just handle 'head'
           //   and 'body', since these are used by the Ajax renderer.
-          elseif (in_array($command['selector'], array('head', 'body'))) {
+          elseif (in_array($command['selector'], ['head', 'body'])) {
             $wrapperNode = $xpath->query('//' . $command['selector'])->item(0);
           }
           if ($wrapperNode) {
@@ -1864,16 +1464,16 @@ abstract class WebTestBase extends TestBase {
    * @see WebTestBase::getAjaxPageStatePostData()
    * @see WebTestBase::curlExec()
    */
-  protected function drupalPost($path, $accept, array $post, $options = array()) {
-    return $this->curlExec(array(
+  protected function drupalPost($path, $accept, array $post, $options = []) {
+    return $this->curlExec([
       CURLOPT_URL => $this->buildUrl($path, $options),
       CURLOPT_POST => TRUE,
       CURLOPT_POSTFIELDS => $this->serializePostValues($post),
-      CURLOPT_HTTPHEADER => array(
+      CURLOPT_HTTPHEADER => [
         'Accept: ' . $accept,
         'Content-Type: application/x-www-form-urlencoded',
-      ),
-    ));
+      ],
+    ]);
   }
 
   /**
@@ -1910,7 +1510,7 @@ abstract class WebTestBase extends TestBase {
    *   The Ajax page state POST data.
    */
   protected function getAjaxPageStatePostData() {
-    $post = array();
+    $post = [];
     $drupal_settings = $this->drupalSettings;
     if (isset($drupal_settings['ajaxPageState']['theme'])) {
       $post['ajax_page_state[theme]'] = $drupal_settings['ajaxPageState']['theme'];
@@ -1937,7 +1537,7 @@ abstract class WebTestBase extends TestBase {
    * @return string
    *   The serialized result.
    */
-  protected function serializePostValues($post = array()) {
+  protected function serializePostValues($post = []) {
     foreach ($post as $key => $value) {
       $post[$key] = urlencode($key) . '=' . urlencode($value);
     }
@@ -1954,7 +1554,7 @@ abstract class WebTestBase extends TestBase {
    *   The flattened $edit array suitable for WebTestBase::drupalPostForm().
    */
   protected function translatePostValues(array $values) {
-    $edit = array();
+    $edit = [];
     // The easiest and most straightforward way to translate values suitable for
     // WebTestBase::drupalPostForm() is to actually build the POST data string
     // and convert the resulting key/value pairs back into a flat array.
@@ -1966,13 +1566,6 @@ abstract class WebTestBase extends TestBase {
     return $edit;
   }
 
-  /**
-   * Runs cron in the Drupal installed by Simpletest.
-   */
-  protected function cronRun() {
-    $this->drupalGet('cron/' . \Drupal::state()->get('system.cron_key'));
-  }
-
   /**
    * Checks for meta refresh tag and if found call drupalGet() recursively.
    *
@@ -2011,10 +1604,10 @@ abstract class WebTestBase extends TestBase {
    * @return
    *   The retrieved headers, also available as $this->getRawContent()
    */
-  protected function drupalHead($path, array $options = array(), array $headers = array()) {
+  protected function drupalHead($path, array $options = [], array $headers = []) {
     $options['absolute'] = TRUE;
     $url = $this->buildUrl($path, $options);
-    $out = $this->curlExec(array(CURLOPT_NOBODY => TRUE, CURLOPT_URL => $url, CURLOPT_HTTPHEADER => $headers));
+    $out = $this->curlExec([CURLOPT_NOBODY => TRUE, CURLOPT_URL => $url, CURLOPT_HTTPHEADER => $headers]);
     // Ensure that any changes to variables in the other thread are picked up.
     $this->refreshVariables();
 
@@ -2245,13 +1838,13 @@ abstract class WebTestBase extends TestBase {
     // Cast MarkupInterface objects to string.
     $label = (string) $label;
     $url_before = $this->getUrl();
-    $urls = $this->xpath($pattern, array(':label' => $label));
+    $urls = $this->xpath($pattern, [':label' => $label]);
     if (isset($urls[$index])) {
       $url_target = $this->getAbsoluteUrl($urls[$index]['href']);
-      $this->pass(SafeMarkup::format('Clicked link %label (@url_target) from @url_before', array('%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before)), 'Browser');
+      $this->pass(SafeMarkup::format('Clicked link %label (@url_target) from @url_before', ['%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before]), 'Browser');
       return $this->drupalGet($url_target);
     }
-    $this->fail(SafeMarkup::format('Link %label does not exist on @url_before', array('%label' => $label, '@url_before' => $url_before)), 'Browser');
+    $this->fail(SafeMarkup::format('Link %label does not exist on @url_before', ['%label' => $label, '@url_before' => $url_before]), 'Browser');
     return FALSE;
   }
 
@@ -2328,7 +1921,7 @@ abstract class WebTestBase extends TestBase {
    */
   protected function drupalGetHeaders($all_requests = FALSE) {
     $request = 0;
-    $headers = array($request => array());
+    $headers = [$request => []];
     foreach ($this->headers as $header) {
       $header = trim($header);
       if ($header === '') {
@@ -2439,7 +2032,7 @@ abstract class WebTestBase extends TestBase {
    * @return
    *   TRUE on pass, FALSE on fail.
    */
-  protected function assertUrl($path, array $options = array(), $message = '', $group = 'Other') {
+  protected function assertUrl($path, array $options = [], $message = '', $group = 'Other') {
     if ($path instanceof Url) {
       $url_obj = $path;
     }
@@ -2454,10 +2047,10 @@ abstract class WebTestBase extends TestBase {
     }
     $url = $url_obj->setAbsolute()->toString();
     if (!$message) {
-      $message = SafeMarkup::format('Expected @url matches current URL (@current_url).', array(
+      $message = SafeMarkup::format('Expected @url matches current URL (@current_url).', [
         '@url' => var_export($url, TRUE),
         '@current_url' => $this->getUrl(),
-      ));
+      ]);
     }
     // Paths in query strings can be encoded or decoded with no functional
     // difference, decode them for comparison purposes.
@@ -2489,7 +2082,7 @@ abstract class WebTestBase extends TestBase {
   protected function assertResponse($code, $message = '', $group = 'Browser') {
     $curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
     $match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code;
-    return $this->assertTrue($match, $message ? $message : SafeMarkup::format('HTTP response expected @code, actual @curl_code', array('@code' => $code, '@curl_code' => $curl_code)), $group);
+    return $this->assertTrue($match, $message ? $message : SafeMarkup::format('HTTP response expected @code, actual @curl_code', ['@code' => $code, '@curl_code' => $curl_code]), $group);
   }
 
   /**
@@ -2515,61 +2108,7 @@ abstract class WebTestBase extends TestBase {
   protected function assertNoResponse($code, $message = '', $group = 'Browser') {
     $curl_code = curl_getinfo($this->curlHandle, CURLINFO_HTTP_CODE);
     $match = is_array($code) ? in_array($curl_code, $code) : $curl_code == $code;
-    return $this->assertFalse($match, $message ? $message : SafeMarkup::format('HTTP response not expected @code, actual @curl_code', array('@code' => $code, '@curl_code' => $curl_code)), $group);
-  }
-
-  /**
-   * Creates a mock request and sets it on the generator.
-   *
-   * This is used to manipulate how the generator generates paths during tests.
-   * It also ensures that calls to $this->drupalGet() will work when running
-   * from run-tests.sh because the url generator no longer looks at the global
-   * variables that are set there but relies on getting this information from a
-   * request object.
-   *
-   * @param bool $clean_urls
-   *   Whether to mock the request using clean urls.
-   * @param $override_server_vars
-   *   An array of server variables to override.
-   *
-   * @return \Symfony\Component\HttpFoundation\Request
-   *   The mocked request object.
-   */
-  protected function prepareRequestForGenerator($clean_urls = TRUE, $override_server_vars = array()) {
-    $request = Request::createFromGlobals();
-    $server = $request->server->all();
-    if (basename($server['SCRIPT_FILENAME']) != basename($server['SCRIPT_NAME'])) {
-      // We need this for when the test is executed by run-tests.sh.
-      // @todo Remove this once run-tests.sh has been converted to use a Request
-      //   object.
-      $cwd = getcwd();
-      $server['SCRIPT_FILENAME'] = $cwd . '/' . basename($server['SCRIPT_NAME']);
-      $base_path = rtrim($server['REQUEST_URI'], '/');
-    }
-    else {
-      $base_path = $request->getBasePath();
-    }
-    if ($clean_urls) {
-      $request_path = $base_path ? $base_path . '/user' : 'user';
-    }
-    else {
-      $request_path = $base_path ? $base_path . '/index.php/user' : '/index.php/user';
-    }
-    $server = array_merge($server, $override_server_vars);
-
-    $request = Request::create($request_path, 'GET', array(), array(), array(), $server);
-    // Ensure the request time is REQUEST_TIME to ensure that API calls
-    // in the test use the right timestamp.
-    $request->server->set('REQUEST_TIME', REQUEST_TIME);
-    $this->container->get('request_stack')->push($request);
-
-    // The request context is normally set by the router_listener from within
-    // its KernelEvents::REQUEST listener. In the simpletest parent site this
-    // event is not fired, therefore it is necessary to updated the request
-    // context manually here.
-    $this->container->get('router.request_context')->fromRequest($request);
-
-    return $request;
+    return $this->assertFalse($match, $message ? $message : SafeMarkup::format('HTTP response not expected @code, actual @curl_code', ['@code' => $code, '@curl_code' => $curl_code]), $group);
   }
 
   /**
@@ -2583,7 +2122,7 @@ abstract class WebTestBase extends TestBase {
    * @return string
    *   An absolute URL string.
    */
-  protected function buildUrl($path, array $options = array()) {
+  protected function buildUrl($path, array $options = []) {
     if ($path instanceof Url) {
       $url_options = $path->getOptions();
       $options = $url_options + $options;
diff --git a/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_browsertest.php b/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_browsertest.php
new file mode 100644
index 000000000..0e9c4165a
--- /dev/null
+++ b/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_browsertest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\simpletest\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * A PHPUnit-based browser test that will be run from Simpletest.
+ *
+ * To avoid accidentally running it is not in a normal PSR-4 directory.
+ *
+ * @group simpletest
+ */
+class SimpletestPhpunitBrowserTest extends BrowserTestBase {
+
+  /**
+   * Dummy test that logs the visited front page for HTML output.
+   */
+  public function testOutput() {
+    $this->drupalGet('<front>');
+    $this->assertSession()->responseContains('<h2>TEST escaping</h2>');
+  }
+
+}
diff --git a/web/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.install b/web/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.install
index 447a192f4..aabe921f5 100644
--- a/web/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.install
+++ b/web/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.install
@@ -12,13 +12,13 @@ use Drupal\entity_test\Entity\EntityTest;
  */
 function simpletest_test_install() {
   $total = 2;
-  $operations = array();
+  $operations = [];
   for ($i = 1; $i <= $total; $i++) {
-    $operations[] = array('_simpletest_test_callback', array($i));
+    $operations[] = ['_simpletest_test_callback', [$i]];
   }
-  $batch = array(
+  $batch = [
     'operations' => $operations,
-  );
+  ];
   batch_set($batch);
   $batch =& batch_get();
   $batch['progressive'] = FALSE;
@@ -29,6 +29,6 @@ function simpletest_test_install() {
  * Callback for batch operations.
  */
 function _simpletest_test_callback($id) {
-  $entity = EntityTest::create(array('id' => $id));
+  $entity = EntityTest::create(['id' => $id]);
   $entity->save();
 }
diff --git a/web/core/modules/simpletest/src/Tests/FolderTest.php b/web/core/modules/simpletest/tests/src/Functional/FolderTest.php
similarity index 64%
rename from web/core/modules/simpletest/src/Tests/FolderTest.php
rename to web/core/modules/simpletest/tests/src/Functional/FolderTest.php
index d43c63803..e57813fa7 100644
--- a/web/core/modules/simpletest/src/Tests/FolderTest.php
+++ b/web/core/modules/simpletest/tests/src/Functional/FolderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * This test will check SimpleTest's treatment of hook_install during setUp.
@@ -10,16 +10,16 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group simpletest
  */
-class FolderTest extends WebTestBase {
+class FolderTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('image');
+  public static $modules = ['image'];
 
-  function testFolderSetup() {
+  public function testFolderSetup() {
     $directory = file_default_scheme() . '://styles';
     $this->assertTrue(file_prepare_directory($directory, FALSE), 'Directory created.');
   }
diff --git a/web/core/modules/simpletest/src/Tests/MailCaptureTest.php b/web/core/modules/simpletest/tests/src/Functional/MailCaptureTest.php
similarity index 64%
rename from web/core/modules/simpletest/src/Tests/MailCaptureTest.php
rename to web/core/modules/simpletest/tests/src/Functional/MailCaptureTest.php
index 700c757c9..f610eaf42 100644
--- a/web/core/modules/simpletest/src/Tests/MailCaptureTest.php
+++ b/web/core/modules/simpletest/tests/src/Functional/MailCaptureTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Core\Test\AssertMailTrait;
 
 /**
  * Tests the SimpleTest email capturing logic, the assertMail assertion and the
@@ -10,28 +11,31 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group simpletest
  */
-class MailCaptureTest extends WebTestBase {
+class MailCaptureTest extends BrowserTestBase {
+  use AssertMailTrait {
+    getMails as drupalGetMails;
+  }
   /**
    * Test to see if the wrapper function is executed correctly.
    */
-  function testMailSend() {
+  public function testMailSend() {
     // Create an email.
     $subject = $this->randomString(64);
     $body = $this->randomString(128);
-    $message = array(
+    $message = [
       'id' => 'drupal_mail_test',
-      'headers' => array('Content-type' => 'text/html'),
+      'headers' => ['Content-type' => 'text/html'],
       'subject' => $subject,
       'to' => 'foobar@example.com',
       'body' => $body,
-    );
+    ];
 
     // Before we send the email, drupalGetMails should return an empty array.
     $captured_emails = $this->drupalGetMails();
     $this->assertEqual(count($captured_emails), 0, 'The captured emails queue is empty.', 'Email');
 
     // Send the email.
-    \Drupal::service('plugin.manager.mail')->getInstance(array('module' => 'simpletest', 'key' => 'drupal_mail_test'))->mail($message);
+    \Drupal::service('plugin.manager.mail')->getInstance(['module' => 'simpletest', 'key' => 'drupal_mail_test'])->mail($message);
 
     // Ensure that there is one email in the captured emails array.
     $captured_emails = $this->drupalGetMails();
@@ -40,19 +44,19 @@ class MailCaptureTest extends WebTestBase {
     // Assert that the email was sent by iterating over the message properties
     // and ensuring that they are captured intact.
     foreach ($message as $field => $value) {
-      $this->assertMail($field, $value, format_string('The email was sent and the value for property @field is intact.', array('@field' => $field)), 'Email');
+      $this->assertMail($field, $value, format_string('The email was sent and the value for property @field is intact.', ['@field' => $field]), 'Email');
     }
 
     // Send additional emails so more than one email is captured.
     for ($index = 0; $index < 5; $index++) {
-      $message = array(
+      $message = [
         'id' => 'drupal_mail_test_' . $index,
-        'headers' => array('Content-type' => 'text/html'),
+        'headers' => ['Content-type' => 'text/html'],
         'subject' => $this->randomString(64),
         'to' => $this->randomMachineName(32) . '@example.com',
         'body' => $this->randomString(512),
-      );
-      \Drupal::service('plugin.manager.mail')->getInstance(array('module' => 'drupal_mail_test', 'key' => $index))->mail($message);
+      ];
+      \Drupal::service('plugin.manager.mail')->getInstance(['module' => 'drupal_mail_test', 'key' => $index])->mail($message);
     }
 
     // There should now be 6 emails captured.
@@ -60,18 +64,18 @@ class MailCaptureTest extends WebTestBase {
     $this->assertEqual(count($captured_emails), 6, 'All emails were captured.', 'Email');
 
     // Test different ways of getting filtered emails via drupalGetMails().
-    $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test'));
+    $captured_emails = $this->drupalGetMails(['id' => 'drupal_mail_test']);
     $this->assertEqual(count($captured_emails), 1, 'Only one email is returned when filtering by id.', 'Email');
-    $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test', 'subject' => $subject));
+    $captured_emails = $this->drupalGetMails(['id' => 'drupal_mail_test', 'subject' => $subject]);
     $this->assertEqual(count($captured_emails), 1, 'Only one email is returned when filtering by id and subject.', 'Email');
-    $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test', 'subject' => $subject, 'from' => 'this_was_not_used@example.com'));
+    $captured_emails = $this->drupalGetMails(['id' => 'drupal_mail_test', 'subject' => $subject, 'from' => 'this_was_not_used@example.com']);
     $this->assertEqual(count($captured_emails), 0, 'No emails are returned when querying with an unused from address.', 'Email');
 
     // Send the last email again, so we can confirm that the
     // drupalGetMails-filter correctly returns all emails with a given
     // property/value.
-    \Drupal::service('plugin.manager.mail')->getInstance(array('module' => 'drupal_mail_test', 'key' => $index))->mail($message);
-    $captured_emails = $this->drupalGetMails(array('id' => 'drupal_mail_test_4'));
+    \Drupal::service('plugin.manager.mail')->getInstance(['module' => 'drupal_mail_test', 'key' => $index])->mail($message);
+    $captured_emails = $this->drupalGetMails(['id' => 'drupal_mail_test_4']);
     $this->assertEqual(count($captured_emails), 2, 'All emails with the same id are returned when filtering by id.', 'Email');
   }
 
diff --git a/web/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php b/web/core/modules/simpletest/tests/src/Functional/MissingDependentModuleUnitTest.php
similarity index 64%
rename from web/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php
rename to web/core/modules/simpletest/tests/src/Functional/MissingDependentModuleUnitTest.php
index 9c707b869..acd55dd01 100644
--- a/web/core/modules/simpletest/src/Tests/MissingDependentModuleUnitTest.php
+++ b/web/core/modules/simpletest/tests/src/Functional/MissingDependentModuleUnitTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * This test should not load since it requires a module that is not found.
@@ -10,12 +10,12 @@ use Drupal\simpletest\WebTestBase;
  * @group simpletest
  * @dependencies simpletest_missing_module
  */
-class MissingDependentModuleUnitTest extends WebTestBase {
+class MissingDependentModuleUnitTest extends BrowserTestBase {
 
   /**
    * Ensure that this test will not be loaded despite its dependency.
    */
-  function testFail() {
+  public function testFail() {
     $this->fail('Running test with missing required module.');
   }
 
diff --git a/web/core/modules/simpletest/src/Tests/OtherInstallationProfileTestsTest.php b/web/core/modules/simpletest/tests/src/Functional/OtherInstallationProfileTestsTest.php
similarity index 82%
rename from web/core/modules/simpletest/src/Tests/OtherInstallationProfileTestsTest.php
rename to web/core/modules/simpletest/tests/src/Functional/OtherInstallationProfileTestsTest.php
index b4263f176..09ec7b4db 100644
--- a/web/core/modules/simpletest/src/Tests/OtherInstallationProfileTestsTest.php
+++ b/web/core/modules/simpletest/tests/src/Functional/OtherInstallationProfileTestsTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Verifies that tests in other installation profiles are found.
@@ -10,14 +10,14 @@ use Drupal\simpletest\WebTestBase;
  * @group simpletest
  * @see SimpleTestInstallationProfileModuleTestsTestCase
  */
-class OtherInstallationProfileTestsTest extends WebTestBase {
+class OtherInstallationProfileTestsTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('simpletest');
+  public static $modules = ['simpletest'];
 
   /**
    * Use the Minimal profile.
@@ -43,14 +43,14 @@ class OtherInstallationProfileTestsTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer unit tests'));
+    $this->adminUser = $this->drupalCreateUser(['administer unit tests']);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Tests that tests located in another installation profile appear.
    */
-  function testOtherInstallationProfile() {
+  public function testOtherInstallationProfile() {
     // Assert the existence of a test in a different installation profile than
     // the current.
     $this->drupalGet('admin/config/development/testing');
diff --git a/web/core/modules/simpletest/src/Tests/UserHelpersTest.php b/web/core/modules/simpletest/tests/src/Functional/UserHelpersTest.php
similarity index 90%
rename from web/core/modules/simpletest/src/Tests/UserHelpersTest.php
rename to web/core/modules/simpletest/tests/src/Functional/UserHelpersTest.php
index c3fb00b02..53ea3079f 100644
--- a/web/core/modules/simpletest/src/Tests/UserHelpersTest.php
+++ b/web/core/modules/simpletest/tests/src/Functional/UserHelpersTest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Drupal\simpletest\Tests;
+namespace Drupal\Tests\simpletest\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests User related helper methods of WebTestBase.
  *
  * @group simpletest
  */
-class UserHelpersTest extends WebTestBase {
+class UserHelpersTest extends BrowserTestBase {
 
   /**
    * Tests WebTestBase::drupalUserIsLoggedIn().
    */
-  function testDrupalUserIsLoggedIn() {
+  public function testDrupalUserIsLoggedIn() {
     $first_user = $this->drupalCreateUser();
     $second_user = $this->drupalCreateUser();
 
diff --git a/web/core/modules/simpletest/tests/src/FunctionalJavascript/JavascriptGetDrupalSettingsTest.php b/web/core/modules/simpletest/tests/src/FunctionalJavascript/JavascriptGetDrupalSettingsTest.php
index db8b3acd5..0048159bf 100644
--- a/web/core/modules/simpletest/tests/src/FunctionalJavascript/JavascriptGetDrupalSettingsTest.php
+++ b/web/core/modules/simpletest/tests/src/FunctionalJavascript/JavascriptGetDrupalSettingsTest.php
@@ -14,7 +14,7 @@ class JavascriptGetDrupalSettingsTest extends JavascriptTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['test_page_test'];
+  protected static $modules = ['test_page_test'];
 
   /**
    * Tests retrieval of Drupal settings.
diff --git a/web/core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php b/web/core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php
index 6bac63a1e..f8f9ffb02 100644
--- a/web/core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php
+++ b/web/core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\simpletest\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -17,7 +17,7 @@ class MigrateSimpletestConfigsTest extends MigrateDrupal6TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('simpletest');
+  public static $modules = ['simpletest'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/simpletest/tests/src/Traits/TestTrait.php b/web/core/modules/simpletest/tests/src/Traits/TestTrait.php
new file mode 100644
index 000000000..eeac4963e
--- /dev/null
+++ b/web/core/modules/simpletest/tests/src/Traits/TestTrait.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\Tests\simpletest\Traits;
+
+/**
+ * A nothing trait, but declared in the Drupal\Tests namespace.
+ *
+ * We use this trait to test autoloading of traits outside of the normal test
+ * suite namespaces.
+ *
+ * @see \Drupal\Tests\simpletest\Unit\TraitAccessTest
+ */
+trait TestTrait {
+
+  /**
+   * Random string for a not very interesting trait.
+   *
+   * @var string
+   */
+  protected $stuff = 'stuff';
+
+  /**
+   * Return a test string to a trait user.
+   *
+   * @return string
+   *   Just a random sort of string.
+   */
+  protected function getStuff() {
+    return $this->stuff;
+  }
+
+}
diff --git a/web/core/modules/simpletest/tests/src/Unit/TestBaseTest.php b/web/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
index 3baa1d752..cdfe9869b 100644
--- a/web/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
+++ b/web/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
@@ -25,13 +25,13 @@ class TestBaseTest extends UnitTestCase {
    */
   public function getTestBaseForAssertionTests($test_id) {
     $mock_test_base = $this->getMockBuilder('Drupal\simpletest\TestBase')
-        ->setConstructorArgs(array($test_id))
-        ->setMethods(array('storeAssertion'))
-        ->getMockForAbstractClass();
+      ->setConstructorArgs([$test_id])
+      ->setMethods(['storeAssertion'])
+      ->getMockForAbstractClass();
     // Override storeAssertion() so we don't need a database.
     $mock_test_base->expects($this->any())
-        ->method('storeAssertion')
-        ->will($this->returnValue(NULL));
+      ->method('storeAssertion')
+      ->will($this->returnValue(NULL));
     return $mock_test_base;
   }
 
@@ -62,16 +62,16 @@ class TestBaseTest extends UnitTestCase {
    *   - The string to validate.
    */
   public function providerRandomStringValidate() {
-    return array(
-      array(FALSE, ' curry paste'),
-      array(FALSE, 'curry paste '),
-      array(FALSE, 'curry  paste'),
-      array(FALSE, 'curry   paste'),
-      array(TRUE, 'curry paste'),
-      array(TRUE, 'thai green curry paste'),
-      array(TRUE, '@startswithat'),
-      array(TRUE, 'contains@at'),
-    );
+    return [
+      [FALSE, ' curry paste'],
+      [FALSE, 'curry paste '],
+      [FALSE, 'curry  paste'],
+      [FALSE, 'curry   paste'],
+      [TRUE, 'curry paste'],
+      [TRUE, 'thai green curry paste'],
+      [TRUE, '@startswithat'],
+      [TRUE, 'contains@at'],
+    ];
   }
 
   /**
@@ -136,7 +136,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertInternalType(
         'array',
-        $this->invokeProtectedMethod($test_base, 'checkRequirements', array())
+        $this->invokeProtectedMethod($test_base, 'checkRequirements', [])
     );
   }
 
@@ -153,14 +153,14 @@ class TestBaseTest extends UnitTestCase {
    *   - Caller, passed to assert().
    */
   public function providerAssert() {
-    return array(
-      array(TRUE, 'pass', TRUE, 'Yay pass', 'test', array()),
-      array(FALSE, 'fail', FALSE, 'Boo fail', 'test', array()),
-      array(TRUE, 'pass', 'pass', 'Yay pass', 'test', array()),
-      array(FALSE, 'fail', 'fail', 'Boo fail', 'test', array()),
-      array(FALSE, 'exception', 'exception', 'Boo fail', 'test', array()),
-      array(FALSE, 'debug', 'debug', 'Boo fail', 'test', array()),
-    );
+    return [
+      [TRUE, 'pass', TRUE, 'Yay pass', 'test', []],
+      [FALSE, 'fail', FALSE, 'Boo fail', 'test', []],
+      [TRUE, 'pass', 'pass', 'Yay pass', 'test', []],
+      [FALSE, 'fail', 'fail', 'Boo fail', 'test', []],
+      [FALSE, 'exception', 'exception', 'Boo fail', 'test', []],
+      [FALSE, 'debug', 'debug', 'Boo fail', 'test', []],
+    ];
   }
 
   /**
@@ -185,7 +185,7 @@ class TestBaseTest extends UnitTestCase {
     $this->assertEquals(
         $expected,
         $ref_assert->invokeArgs($test_base,
-          array($status, $message, $group, $caller)
+          [$status, $message, $group, $caller]
         )
     );
 
@@ -211,10 +211,10 @@ class TestBaseTest extends UnitTestCase {
    * Data provider for assertTrue().
    */
   public function providerAssertTrue() {
-    return array(
-      array(TRUE, TRUE),
-      array(FALSE, FALSE),
-    );
+    return [
+      [TRUE, TRUE],
+      [FALSE, FALSE],
+    ];
   }
 
   /**
@@ -225,7 +225,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
         $expected,
-        $this->invokeProtectedMethod($test_base, 'assertTrue', array($value))
+        $this->invokeProtectedMethod($test_base, 'assertTrue', [$value])
     );
   }
 
@@ -237,7 +237,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
         (!$expected),
-        $this->invokeProtectedMethod($test_base, 'assertFalse', array($value))
+        $this->invokeProtectedMethod($test_base, 'assertFalse', [$value])
     );
   }
 
@@ -245,10 +245,10 @@ class TestBaseTest extends UnitTestCase {
    * Data provider for assertNull().
    */
   public function providerAssertNull() {
-    return array(
-      array(TRUE, NULL),
-      array(FALSE, ''),
-    );
+    return [
+      [TRUE, NULL],
+      [FALSE, ''],
+    ];
   }
 
   /**
@@ -259,7 +259,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
         $expected,
-        $this->invokeProtectedMethod($test_base, 'assertNull', array($value))
+        $this->invokeProtectedMethod($test_base, 'assertNull', [$value])
     );
   }
 
@@ -271,7 +271,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
         (!$expected),
-        $this->invokeProtectedMethod($test_base, 'assertNotNull', array($value))
+        $this->invokeProtectedMethod($test_base, 'assertNotNull', [$value])
     );
   }
 
@@ -325,7 +325,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
         $expected_identical,
-        $this->invokeProtectedMethod($test_base, 'assertIdentical', array($first, $second))
+        $this->invokeProtectedMethod($test_base, 'assertIdentical', [$first, $second])
     );
   }
 
@@ -337,7 +337,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
         (!$expected_identical),
-        $this->invokeProtectedMethod($test_base, 'assertNotIdentical', array($first, $second))
+        $this->invokeProtectedMethod($test_base, 'assertNotIdentical', [$first, $second])
     );
   }
 
@@ -349,7 +349,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
         $expected_equal,
-        $this->invokeProtectedMethod($test_base, 'assertEqual', array($first, $second))
+        $this->invokeProtectedMethod($test_base, 'assertEqual', [$first, $second])
     );
   }
 
@@ -361,7 +361,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
         (!$expected_equal),
-        $this->invokeProtectedMethod($test_base, 'assertNotEqual', array($first, $second))
+        $this->invokeProtectedMethod($test_base, 'assertNotEqual', [$first, $second])
     );
   }
 
@@ -374,11 +374,11 @@ class TestBaseTest extends UnitTestCase {
     $obj2 = $obj1;
     $obj3 = clone $obj1;
     $obj4 = new \stdClass();
-    return array(
-      array(TRUE, $obj1, $obj2),
-      array(TRUE, $obj1, $obj3),
-      array(FALSE, $obj1, $obj4),
-    );
+    return [
+      [TRUE, $obj1, $obj2],
+      [TRUE, $obj1, $obj3],
+      [FALSE, $obj1, $obj4],
+    ];
   }
 
   /**
@@ -389,7 +389,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
       $expected,
-      $this->invokeProtectedMethod($test_base, 'assertIdenticalObject', array($first, $second))
+      $this->invokeProtectedMethod($test_base, 'assertIdenticalObject', [$first, $second])
     );
   }
 
@@ -400,7 +400,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
         TRUE,
-        $this->invokeProtectedMethod($test_base, 'pass', array())
+        $this->invokeProtectedMethod($test_base, 'pass', [])
     );
   }
 
@@ -411,7 +411,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertEquals(
         FALSE,
-        $this->invokeProtectedMethod($test_base, 'fail', array())
+        $this->invokeProtectedMethod($test_base, 'fail', [])
     );
   }
 
@@ -423,10 +423,10 @@ class TestBaseTest extends UnitTestCase {
    *   - Group for use in assert().
    */
   public function providerError() {
-    return array(
-      array('debug', 'User notice'),
-      array('exception', 'Not User notice'),
-    );
+    return [
+      ['debug', 'User notice'],
+      ['exception', 'Not User notice'],
+    ];
   }
 
   /**
@@ -436,7 +436,7 @@ class TestBaseTest extends UnitTestCase {
   public function testError($status, $group) {
     // Mock up a TestBase object.
     $mock_test_base = $this->getMockBuilder('Drupal\simpletest\TestBase')
-      ->setMethods(array('assert'))
+      ->setMethods(['assert'])
       ->getMockForAbstractClass();
 
     // Set expectations for assert().
@@ -451,7 +451,7 @@ class TestBaseTest extends UnitTestCase {
     // Invoke error().
     $this->assertEquals(
         "$status:$group",
-        $this->invokeProtectedMethod($mock_test_base, 'error', array('msg', $group))
+        $this->invokeProtectedMethod($mock_test_base, 'error', ['msg', $group])
     );
   }
 
@@ -462,7 +462,7 @@ class TestBaseTest extends UnitTestCase {
     $test_base = $this->getTestBaseForAssertionTests('test_id');
     $this->assertInstanceOf(
         'Drupal\Component\Utility\Random',
-        $this->invokeProtectedMethod($test_base, 'getRandomGenerator', array())
+        $this->invokeProtectedMethod($test_base, 'getRandomGenerator', [])
     );
   }
 
diff --git a/web/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php b/web/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
index df98377d1..f36243e3d 100644
--- a/web/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
+++ b/web/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
@@ -10,6 +10,7 @@ namespace Drupal\Tests\simpletest\Unit;
 use Composer\Autoload\ClassLoader;
 use Drupal\Core\Extension\Extension;
 use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\simpletest\Exception\MissingGroupException;
 use Drupal\simpletest\TestDiscovery;
 use Drupal\Tests\UnitTestCase;
 use org\bovigo\vfs\vfsStream;
@@ -235,8 +236,6 @@ class TestInfoParsingTest extends UnitTestCase {
 
   /**
    * @covers ::getTestInfo
-   * @expectedException \Drupal\simpletest\Exception\MissingGroupException
-   * @expectedExceptionMessage Missing @group annotation in Drupal\KernelTests\field\BulkDeleteTest
    */
   public function testTestInfoParserMissingGroup() {
     $classname = 'Drupal\KernelTests\field\BulkDeleteTest';
@@ -245,6 +244,7 @@ class TestInfoParsingTest extends UnitTestCase {
  * Bulk delete storages and fields, and clean up afterwards.
  */
 EOT;
+    $this->setExpectedException(MissingGroupException::class, 'Missing @group annotation in Drupal\KernelTests\field\BulkDeleteTest');
     TestDiscovery::getTestInfo($classname, $doc_comment);
   }
 
diff --git a/web/core/modules/simpletest/tests/src/Unit/TraitAccessTest.php b/web/core/modules/simpletest/tests/src/Unit/TraitAccessTest.php
new file mode 100644
index 000000000..dbaffbf9a
--- /dev/null
+++ b/web/core/modules/simpletest/tests/src/Unit/TraitAccessTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Drupal\Tests\simpletest\Unit;
+
+use Drupal\Tests\UnitTestCase;
+use Drupal\Tests\simpletest\Traits\TestTrait;
+
+/**
+ * Test whether traits are autoloaded during PHPUnit discovery time.
+ *
+ * @group simpletest
+ */
+class TraitAccessTest extends UnitTestCase {
+
+  use TestTrait;
+
+  /**
+   * @coversNothing
+   */
+  public function testSimpleStuff() {
+    $stuff = $this->getStuff();
+    $this->assertSame($stuff, 'stuff', "Same old stuff");
+  }
+
+}
diff --git a/web/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php b/web/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php
index 1c087a6fd..df909560a 100644
--- a/web/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php
+++ b/web/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php
@@ -18,12 +18,12 @@ class WebTestBaseTest extends UnitTestCase {
    *   An array of values passed to the test method.
    */
   public function providerAssertFieldByName() {
-    $data = array();
-    $data[] = array('select_2nd_selected', 'test', '1', FALSE);
-    $data[] = array('select_2nd_selected', 'test', '2', TRUE);
-    $data[] = array('select_none_selected', 'test', '', FALSE);
-    $data[] = array('select_none_selected', 'test', '1', TRUE);
-    $data[] = array('select_none_selected', 'test', NULL, TRUE);
+    $data = [];
+    $data[] = ['select_2nd_selected', 'test', '1', FALSE];
+    $data[] = ['select_2nd_selected', 'test', '2', TRUE];
+    $data[] = ['select_none_selected', 'test', '', FALSE];
+    $data[] = ['select_none_selected', 'test', '1', TRUE];
+    $data[] = ['select_none_selected', 'test', NULL, TRUE];
 
     return $data;
   }
@@ -50,7 +50,7 @@ class WebTestBaseTest extends UnitTestCase {
 
     $web_test = $this->getMockBuilder('Drupal\simpletest\WebTestBase')
       ->disableOriginalConstructor()
-      ->setMethods(array('getRawContent', 'assertTrue', 'pass'))
+      ->setMethods(['getRawContent', 'assertTrue', 'pass'])
       ->getMock();
 
     $web_test->expects($this->any())
@@ -65,7 +65,7 @@ class WebTestBaseTest extends UnitTestCase {
 
     $test_method = new \ReflectionMethod('Drupal\simpletest\WebTestBase', 'assertFieldByName');
     $test_method->setAccessible(TRUE);
-    $test_method->invokeArgs($web_test, array($name, $value, 'message'));
+    $test_method->invokeArgs($web_test, [$name, $value, 'message']);
   }
 
   /**
@@ -87,32 +87,32 @@ class WebTestBaseTest extends UnitTestCase {
    *     to mock no link found on the page.
    */
   public function providerTestClickLink() {
-    return array(
+    return [
       // Test for a non-existent label.
-      array(
+      [
         FALSE,
         'does_not_exist',
         0,
-        array(),
-      ),
+        [],
+      ],
       // Test for an existing label.
-      array(
+      [
         'This Text Returned By drupalGet()',
         'exists',
         0,
-        array(0 => array('href' => 'this_is_a_url')),
-      ),
+        [0 => ['href' => 'this_is_a_url']],
+      ],
       // Test for an existing label that isn't the first one.
-      array(
+      [
         'This Text Returned By drupalGet()',
         'exists',
         1,
-        array(
-          0 => array('href' => 'this_is_a_url'),
-          1 => array('href' => 'this_is_another_url'),
-        ),
-      ),
-    );
+        [
+          0 => ['href' => 'this_is_a_url'],
+          1 => ['href' => 'this_is_another_url'],
+        ],
+      ],
+    ];
   }
 
   /**
@@ -134,14 +134,14 @@ class WebTestBaseTest extends UnitTestCase {
     // Mock a WebTestBase object and some of its methods.
     $web_test = $this->getMockBuilder('Drupal\simpletest\WebTestBase')
       ->disableOriginalConstructor()
-      ->setMethods(array(
+      ->setMethods([
         'pass',
         'fail',
         'getUrl',
         'xpath',
         'drupalGet',
         'getAbsoluteUrl',
-      ))
+      ])
       ->getMock();
 
     // Mocked getUrl() is only used for reporting so we just return a string.
diff --git a/web/core/modules/statistics/config/install/statistics.settings.yml b/web/core/modules/statistics/config/install/statistics.settings.yml
index f788bece3..668606292 100644
--- a/web/core/modules/statistics/config/install/statistics.settings.yml
+++ b/web/core/modules/statistics/config/install/statistics.settings.yml
@@ -1,5 +1,2 @@
-access_log:
-  enabled: false
-  max_lifetime: 259200
 count_content_views: 0
 display_max_age: 3600
diff --git a/web/core/modules/statistics/config/schema/statistics.schema.yml b/web/core/modules/statistics/config/schema/statistics.schema.yml
index d5e62008b..c72a22726 100644
--- a/web/core/modules/statistics/config/schema/statistics.schema.yml
+++ b/web/core/modules/statistics/config/schema/statistics.schema.yml
@@ -4,16 +4,6 @@ statistics.settings:
   type: config_object
   label: 'Statistics settings'
   mapping:
-    access_log:
-      type: mapping
-      label: 'Access log settings'
-      mapping:
-        enabled:
-          type: boolean
-          label: 'Enable'
-        max_lifetime:
-          type: integer
-          label: 'Maximum lifetime'
     count_content_views:
       type: integer
       label: 'Count content views'
diff --git a/web/core/modules/statistics/migration_templates/statistics_settings.yml b/web/core/modules/statistics/migration_templates/statistics_settings.yml
index 62c2c0612..1f5b5bbd0 100644
--- a/web/core/modules/statistics/migration_templates/statistics_settings.yml
+++ b/web/core/modules/statistics/migration_templates/statistics_settings.yml
@@ -10,8 +10,6 @@ source:
     - statistics_flush_accesslog_timer
     - statistics_count_content_views
 process:
-  'access_log/enabled': statistics_enable_access_log
-  'access_log/max_lifetime': statistics_flush_accesslog_timer
   'count_content_views': statistics_count_content_views
 destination:
   plugin: config
diff --git a/web/core/modules/statistics/src/NodeStatisticsDatabaseStorage.php b/web/core/modules/statistics/src/NodeStatisticsDatabaseStorage.php
new file mode 100644
index 000000000..0cccb1700
--- /dev/null
+++ b/web/core/modules/statistics/src/NodeStatisticsDatabaseStorage.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace Drupal\statistics;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\State\StateInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Provides the default database storage backend for statistics.
+ */
+class NodeStatisticsDatabaseStorage implements StatisticsStorageInterface {
+
+  /**
+  * The database connection used.
+  *
+  * @var \Drupal\Core\Database\Connection
+  */
+  protected $connection;
+
+  /**
+   * The state service.
+   *
+   * @var \Drupal\Core\State\StateInterface
+   */
+  protected $state;
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * Constructs the statistics storage.
+   *
+   * @param \Drupal\Core\Database\Connection $connection
+   *   The database connection for the node view storage.
+   * @param \Drupal\Core\State\StateInterface $state
+   *   The state service.
+   */
+  public function __construct(Connection $connection, StateInterface $state, RequestStack $request_stack) {
+    $this->connection = $connection;
+    $this->state = $state;
+    $this->requestStack = $request_stack;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function recordView($id) {
+    return (bool) $this->connection
+      ->merge('node_counter')
+      ->key('nid', $id)
+      ->fields([
+        'daycount' => 1,
+        'totalcount' => 1,
+        'timestamp' => $this->getRequestTime(),
+      ])
+      ->expression('daycount', 'daycount + 1')
+      ->expression('totalcount', 'totalcount + 1')
+      ->execute();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fetchViews($ids) {
+    $views = $this->connection
+      ->select('node_counter', 'nc')
+      ->fields('nc', ['totalcount', 'daycount', 'timestamp'])
+      ->condition('nid', $ids, 'IN')
+      ->execute()
+      ->fetchAll();
+    foreach ($views as $id => $view) {
+      $views[$id] = new StatisticsViewsResult($view->totalcount, $view->daycount, $view->timestamp);
+    }
+    return $views;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fetchView($id) {
+    $views = $this->fetchViews([$id]);
+    return reset($views);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fetchAll($order = 'totalcount', $limit = 5) {
+    assert(in_array($order, ['totalcount', 'daycount', 'timestamp']), "Invalid order argument.");
+
+    return $this->connection
+      ->select('node_counter', 'nc')
+      ->fields('nc', ['nid'])
+      ->orderBy($order, 'DESC')
+      ->range(0, $limit)
+      ->execute()
+      ->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function deleteViews($id) {
+    return (bool) $this->connection
+      ->delete('node_counter')
+      ->condition('nid', $id)
+      ->execute();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function resetDayCount() {
+    $statistics_timestamp = $this->state->get('statistics.day_timestamp') ?: 0;
+    if (($this->getRequestTime() - $statistics_timestamp) >= 86400) {
+      $this->state->set('statistics.day_timestamp', $this->getRequestTime());
+      $this->connection->update('node_counter')
+        ->fields(['daycount' => 0])
+        ->execute();
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function maxTotalCount() {
+    $query = $this->connection->select('node_counter', 'nc');
+    $query->addExpression('MAX(totalcount)');
+    $max_total_count = (int)$query->execute()->fetchField();
+    return $max_total_count;
+  }
+
+  /**
+   * Get current request time.
+   *
+   * @return int
+   *   Unix timestamp for current server request time.
+   */
+  protected function getRequestTime() {
+    return $this->requestStack->getCurrentRequest()->server->get('REQUEST_TIME');
+  }
+
+}
diff --git a/web/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php b/web/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
index 8f4384e29..1802a4569 100644
--- a/web/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
+++ b/web/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
@@ -4,8 +4,14 @@ namespace Drupal\statistics\Plugin\Block;
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Block\BlockBase;
+use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Session\AccountInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\statistics\StatisticsStorageInterface;
 
 /**
  * Provides a 'Popular content' block.
@@ -15,17 +21,82 @@ use Drupal\Core\Session\AccountInterface;
  *   admin_label = @Translation("Popular content")
  * )
  */
-class StatisticsPopularBlock extends BlockBase {
+class StatisticsPopularBlock extends BlockBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The entity repository service.
+   *
+   * @var \Drupal\Core\Entity\EntityRepositoryInterface
+   */
+  protected $entityRepository;
+
+  /**
+   * The storage for statistics.
+   *
+   * @var \Drupal\statistics\StatisticsStorageInterface
+   */
+  protected $statisticsStorage;
+
+  /**
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * Constructs an StatisticsPopularBlock object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
+   *   The entity repository service
+   * @param \Drupal\statistics\StatisticsStorageInterface $statistics_storage
+   *   The storage for statistics.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityRepositoryInterface $entity_repository, StatisticsStorageInterface $statistics_storage, RendererInterface $renderer) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->entityTypeManager = $entity_type_manager;
+    $this->entityRepository = $entity_repository;
+    $this->statisticsStorage = $statistics_storage;
+    $this->renderer = $renderer;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager'),
+      $container->get('entity.repository'),
+      $container->get('statistics.storage.node'),
+      $container->get('renderer')
+    );
+  }
 
   /**
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'top_day_num' => 0,
       'top_all_num' => 0,
       'top_last_num' => 0
-    );
+    ];
   }
 
   /**
@@ -40,29 +111,29 @@ class StatisticsPopularBlock extends BlockBase {
    */
   public function blockForm($form, FormStateInterface $form_state) {
     // Popular content block settings.
-    $numbers = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40);
-    $numbers = array('0' => $this->t('Disabled')) + array_combine($numbers, $numbers);
-    $form['statistics_block_top_day_num'] = array(
+    $numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40];
+    $numbers = ['0' => $this->t('Disabled')] + array_combine($numbers, $numbers);
+    $form['statistics_block_top_day_num'] = [
      '#type' => 'select',
      '#title' => $this->t("Number of day's top views to display"),
      '#default_value' => $this->configuration['top_day_num'],
      '#options' => $numbers,
      '#description' => $this->t('How many content items to display in "day" list.'),
-    );
-    $form['statistics_block_top_all_num'] = array(
+    ];
+    $form['statistics_block_top_all_num'] = [
       '#type' => 'select',
       '#title' => $this->t('Number of all time views to display'),
       '#default_value' => $this->configuration['top_all_num'],
       '#options' => $numbers,
       '#description' => $this->t('How many content items to display in "all time" list.'),
-    );
-    $form['statistics_block_top_last_num'] = array(
+    ];
+    $form['statistics_block_top_last_num'] = [
       '#type' => 'select',
       '#title' => $this->t('Number of most recent views to display'),
       '#default_value' => $this->configuration['top_last_num'],
       '#options' => $numbers,
       '#description' => $this->t('How many content items to display in "recently viewed" list.'),
-    );
+    ];
     return $form;
   }
 
@@ -79,31 +150,67 @@ class StatisticsPopularBlock extends BlockBase {
    * {@inheritdoc}
    */
   public function build() {
-    $content = array();
+    $content = [];
 
     if ($this->configuration['top_day_num'] > 0) {
-      $result = statistics_title_list('daycount', $this->configuration['top_day_num']);
-      if ($result) {
-        $content['top_day'] = node_title_list($result, $this->t("Today's:"));
+      $nids = $this->statisticsStorage->fetchAll('daycount', $this->configuration['top_day_num']);
+      if ($nids) {
+        $content['top_day'] = $this->nodeTitleList($nids, $this->t("Today's:"));
         $content['top_day']['#suffix'] = '<br />';
       }
     }
 
     if ($this->configuration['top_all_num'] > 0) {
-      $result = statistics_title_list('totalcount', $this->configuration['top_all_num']);
-      if ($result) {
-        $content['top_all'] = node_title_list($result, $this->t('All time:'));
+      $nids = $this->statisticsStorage->fetchAll('totalcount', $this->configuration['top_all_num']);
+      if ($nids) {
+        $content['top_all'] = $this->nodeTitleList($nids, $this->t('All time:'));
         $content['top_all']['#suffix'] = '<br />';
       }
     }
 
     if ($this->configuration['top_last_num'] > 0) {
-      $result = statistics_title_list('timestamp', $this->configuration['top_last_num']);
-      $content['top_last'] = node_title_list($result, $this->t('Last viewed:'));
+      $nids = $this->statisticsStorage->fetchAll('timestamp', $this->configuration['top_last_num']);
+      $content['top_last'] = $this->nodeTitleList($nids, $this->t('Last viewed:'));
       $content['top_last']['#suffix'] = '<br />';
     }
 
     return $content;
   }
 
+  /**
+   * Generates the ordered array of node links for build().
+   *
+   * @param int[] $nids
+   *   An ordered array of node ids.
+   * @param string $title
+   *   The title for the list.
+   *
+   * @return array
+   *   A render array for the list.
+   */
+  protected function nodeTitleList(array $nids, $title) {
+    $nodes = $this->entityTypeManager->getStorage('node')->loadMultiple($nids);
+
+    $items = [];
+    foreach ($nids as $nid) {
+      $node = $this->entityRepository->getTranslationFromContext($nodes[$nid]);
+      $item = [
+        '#type' => 'link',
+        '#title' => $node->getTitle(),
+        '#url' => $node->urlInfo('canonical'),
+      ];
+      $this->renderer->addCacheableDependency($item, $node);
+      $items[] = $item;
+    }
+
+    return [
+      '#theme' => 'item_list__node',
+      '#items' => $items,
+      '#title' => $title,
+      '#cache' => [
+        'tags' => $this->entityTypeManager->getDefinition('node')->getListCacheTags(),
+      ],
+    ];
+  }
+
 }
diff --git a/web/core/modules/statistics/src/StatisticsSettingsForm.php b/web/core/modules/statistics/src/StatisticsSettingsForm.php
index 2abb5642a..71a1764b8 100644
--- a/web/core/modules/statistics/src/StatisticsSettingsForm.php
+++ b/web/core/modules/statistics/src/StatisticsSettingsForm.php
@@ -65,17 +65,17 @@ class StatisticsSettingsForm extends ConfigFormBase {
     $config = $this->config('statistics.settings');
 
     // Content counter settings.
-    $form['content'] = array(
+    $form['content'] = [
       '#type' => 'details',
       '#title' => t('Content viewing counter settings'),
       '#open' => TRUE,
-    );
-    $form['content']['statistics_count_content_views'] = array(
+    ];
+    $form['content']['statistics_count_content_views'] = [
       '#type' => 'checkbox',
       '#title' => t('Count content views'),
       '#default_value' => $config->get('count_content_views'),
       '#description' => t('Increment a counter each time content is viewed.'),
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/statistics/src/StatisticsStorageInterface.php b/web/core/modules/statistics/src/StatisticsStorageInterface.php
new file mode 100644
index 000000000..ccb51e44b
--- /dev/null
+++ b/web/core/modules/statistics/src/StatisticsStorageInterface.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Drupal\statistics;
+
+/**
+ * Provides an interface defining Statistics Storage.
+ *
+ * Stores the views per day, total views and timestamp of last view
+ * for entities.
+ */
+interface StatisticsStorageInterface {
+
+  /**
+   * Count a entity view.
+   *
+   * @param int $id
+   *   The ID of the entity to count.
+   *
+   * @return bool
+   *   TRUE if the entity view has been counted.
+   */
+  public function recordView($id);
+
+  /**
+   * Returns the number of times entities have been viewed.
+   *
+   * @param array $ids
+   *   An array of IDs of entities to fetch the views for.
+   *
+   * @return array \Drupal\statistics\StatisticsViewsResult
+   */
+  public function fetchViews($ids);
+
+  /**
+   * Returns the number of times a single entity has been viewed.
+   *
+   * @param int $id
+   *   The ID of the entity to fetch the views for.
+   *
+   * @return \Drupal\statistics\StatisticsViewsResult
+   */
+  public function fetchView($id);
+
+  /**
+   * Returns the number of times a entity has been viewed.
+   *
+   * @param string $order
+   *   The counter name to order by:
+   *   - 'totalcount' The total number of views.
+   *   - 'daycount' The number of views today.
+   *   - 'timestamp' The unix timestamp of the last view.
+   *
+   * @param int $limit
+   *   The number of entity IDs to return.
+   *
+   * @return array
+   *   An ordered array of entity IDs.
+   */
+  public function fetchAll($order = 'totalcount', $limit = 5);
+
+  /**
+   * Delete counts for a specific entity.
+   *
+   * @param int $id
+   *   The ID of the entity which views to delete.
+   *
+   * @return bool
+   *   TRUE if the entity views have been deleted.
+   */
+  public function deleteViews($id);
+
+  /**
+   * Reset the day counter for all entities once every day.
+   */
+  public function resetDayCount();
+
+  /**
+   * Returns the highest 'totalcount' value.
+   *
+   * @return int
+   *   The highest 'totalcount' value.
+   */
+  public function maxTotalCount();
+
+}
diff --git a/web/core/modules/statistics/src/StatisticsViewsResult.php b/web/core/modules/statistics/src/StatisticsViewsResult.php
new file mode 100644
index 000000000..ef0db9775
--- /dev/null
+++ b/web/core/modules/statistics/src/StatisticsViewsResult.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Drupal\statistics;
+
+/**
+ * Value object for passing statistic results.
+ */
+class StatisticsViewsResult {
+
+  /**
+   * @var int
+   */
+  protected $totalCount;
+
+  /**
+   * @var int
+   */
+  protected $dayCount;
+
+  /**
+   * @var int
+   */
+  protected $timestamp;
+
+  public function __construct($total_count, $day_count, $timestamp) {
+    $this->totalCount = $total_count;
+    $this->dayCount = $day_count;
+    $this->timestamp = $timestamp;
+  }
+
+  /**
+   * Total number of times the entity has been viewed.
+   *
+   * @return int
+   */
+  public function getTotalCount() {
+    return $this->totalCount;
+  }
+
+
+  /**
+   * Total number of times the entity has been viewed "today".
+   *
+   * @return int
+   */
+  public function getDayCount() {
+    return $this->dayCount;
+  }
+
+
+  /**
+   * Timestamp of when the entity was last viewed.
+   *
+   * @return int
+   */
+  public function getTimestamp() {
+    return $this->timestamp;
+  }
+
+}
diff --git a/web/core/modules/statistics/src/Tests/StatisticsAdminTest.php b/web/core/modules/statistics/src/Tests/StatisticsAdminTest.php
index 6d87fd975..3ce0457d4 100644
--- a/web/core/modules/statistics/src/Tests/StatisticsAdminTest.php
+++ b/web/core/modules/statistics/src/Tests/StatisticsAdminTest.php
@@ -16,7 +16,7 @@ class StatisticsAdminTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'statistics');
+  public static $modules = ['node', 'statistics'];
 
   /**
    * A user that has permission to administer statistics.
@@ -47,18 +47,18 @@ class StatisticsAdminTest extends WebTestBase {
 
     // Create Basic page node type.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
     }
-    $this->privilegedUser = $this->drupalCreateUser(array('administer statistics', 'view post access counter', 'create page content'));
+    $this->privilegedUser = $this->drupalCreateUser(['administer statistics', 'view post access counter', 'create page content']);
     $this->drupalLogin($this->privilegedUser);
-    $this->testNode = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->privilegedUser->id()));
+    $this->testNode = $this->drupalCreateNode(['type' => 'page', 'uid' => $this->privilegedUser->id()]);
     $this->client = \Drupal::httpClient();
   }
 
   /**
    * Verifies that the statistics settings page works.
    */
-  function testStatisticsSettings() {
+  public function testStatisticsSettings() {
     $config = $this->config('statistics.settings');
     $this->assertFalse($config->get('count_content_views'), 'Count content view log is disabled by default.');
 
@@ -72,19 +72,19 @@ class StatisticsAdminTest extends WebTestBase {
     $this->drupalGet('node/' . $this->testNode->id());
     // Manually calling statistics.php, simulating ajax behavior.
     $nid = $this->testNode->id();
-    $post = array('nid' => $nid);
+    $post = ['nid' => $nid];
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
-    $this->client->post($stats_path, array('form_params' => $post));
+    $this->client->post($stats_path, ['form_params' => $post]);
 
     // Hit the node again (the counter is incremented after the hit, so
     // "1 view" will actually be shown when the node is hit the second time).
     $this->drupalGet('node/' . $this->testNode->id());
-    $this->client->post($stats_path, array('form_params' => $post));
+    $this->client->post($stats_path, ['form_params' => $post]);
     $this->assertText('1 view', 'Node is viewed once.');
 
     $this->drupalGet('node/' . $this->testNode->id());
-    $this->client->post($stats_path, array('form_params' => $post));
+    $this->client->post($stats_path, ['form_params' => $post]);
     $this->assertText('2 views', 'Node is viewed 2 times.');
 
     // Increase the max age to test that nodes are no longer immediately
@@ -93,7 +93,7 @@ class StatisticsAdminTest extends WebTestBase {
     $this->drupalGet('node/' . $this->testNode->id());
     $this->assertText('3 views', 'Node is viewed 3 times.');
 
-    $this->client->post($stats_path, array('form_params' => $post));
+    $this->client->post($stats_path, ['form_params' => $post]);
     $this->drupalGet('node/' . $this->testNode->id());
     $this->assertText('3 views', 'Views counter was not updated.');
   }
@@ -101,19 +101,19 @@ class StatisticsAdminTest extends WebTestBase {
   /**
    * Tests that when a node is deleted, the node counter is deleted too.
    */
-  function testDeleteNode() {
+  public function testDeleteNode() {
     $this->config('statistics.settings')->set('count_content_views', 1)->save();
 
     $this->drupalGet('node/' . $this->testNode->id());
     // Manually calling statistics.php, simulating ajax behavior.
     $nid = $this->testNode->id();
-    $post = array('nid' => $nid);
+    $post = ['nid' => $nid];
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
-    $this->client->post($stats_path, array('form_params' => $post));
+    $this->client->post($stats_path, ['form_params' => $post]);
 
     $result = db_select('node_counter', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->condition('n.nid', $this->testNode->id())
       ->execute()
       ->fetchAssoc();
@@ -122,7 +122,7 @@ class StatisticsAdminTest extends WebTestBase {
     $this->testNode->delete();
 
     $result = db_select('node_counter', 'n')
-      ->fields('n', array('nid'))
+      ->fields('n', ['nid'])
       ->condition('n.nid', $this->testNode->id())
       ->execute()
       ->fetchAssoc();
@@ -132,7 +132,7 @@ class StatisticsAdminTest extends WebTestBase {
   /**
    * Tests that cron clears day counts and expired access logs.
    */
-  function testExpiredLogs() {
+  public function testExpiredLogs() {
     $this->config('statistics.settings')
       ->set('count_content_views', 1)
       ->save();
@@ -141,12 +141,12 @@ class StatisticsAdminTest extends WebTestBase {
     $this->drupalGet('node/' . $this->testNode->id());
     // Manually calling statistics.php, simulating ajax behavior.
     $nid = $this->testNode->id();
-    $post = array('nid' => $nid);
+    $post = ['nid' => $nid];
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
-    $this->client->post($stats_path, array('form_params' => $post));
+    $this->client->post($stats_path, ['form_params' => $post]);
     $this->drupalGet('node/' . $this->testNode->id());
-    $this->client->post($stats_path, array('form_params' => $post));
+    $this->client->post($stats_path, ['form_params' => $post]);
     $this->assertText('1 view', 'Node is viewed once.');
 
     // statistics_cron() will subtract
@@ -160,7 +160,7 @@ class StatisticsAdminTest extends WebTestBase {
     $this->assertNoText('node/' . $this->testNode->id(), 'No hit URL found.');
 
     $result = db_select('node_counter', 'nc')
-      ->fields('nc', array('daycount'))
+      ->fields('nc', ['daycount'])
       ->condition('nid', $this->testNode->id(), '=')
       ->execute()
       ->fetchField();
diff --git a/web/core/modules/statistics/src/Tests/StatisticsLoggingTest.php b/web/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
index 9aa3cc3f9..152c95ae6 100644
--- a/web/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
+++ b/web/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
@@ -19,7 +19,7 @@ class StatisticsLoggingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'statistics', 'block', 'locale');
+  public static $modules = ['node', 'statistics', 'block', 'locale'];
 
   /**
    * User with permissions to create and edit pages.
@@ -47,10 +47,10 @@ class StatisticsLoggingTest extends WebTestBase {
 
     // Create Basic page node type.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
     }
 
-    $this->authUser = $this->drupalCreateUser(array(
+    $this->authUser = $this->drupalCreateUser([
       // For node creation.
       'access content',
       'create page content',
@@ -58,21 +58,21 @@ class StatisticsLoggingTest extends WebTestBase {
       // For language negotiation administration.
       'administer languages',
       'access administration pages',
-    ));
+    ]);
 
     // Ensure we have a node page to access.
-    $this->node = $this->drupalCreateNode(array('title' => $this->randomMachineName(255), 'uid' => $this->authUser->id()));
+    $this->node = $this->drupalCreateNode(['title' => $this->randomMachineName(255), 'uid' => $this->authUser->id()]);
 
     // Add a custom language and enable path-based language negotiation.
     $this->drupalLogin($this->authUser);
-    $this->language = array(
+    $this->language = [
       'predefined_langcode' => 'custom',
       'langcode' => 'xx',
       'label' => $this->randomMachineName(16),
       'direction' => 'ltr',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $this->language, t('Add custom language'));
-    $this->drupalPostForm('admin/config/regional/language/detection', array('language_interface[enabled][language-url]' => 1), t('Save settings'));
+    $this->drupalPostForm('admin/config/regional/language/detection', ['language_interface[enabled][language-url]' => 1], t('Save settings'));
     $this->drupalLogout();
 
     // Enable access logging.
@@ -88,7 +88,7 @@ class StatisticsLoggingTest extends WebTestBase {
   /**
    * Verifies node hit counter logging and script placement.
    */
-  function testLogging() {
+  public function testLogging() {
     $path = 'node/' . $this->node->id();
     $module_path = drupal_get_path('module', 'statistics');
     $stats_path = base_path() . $module_path . '/statistics.php';
@@ -121,8 +121,8 @@ class StatisticsLoggingTest extends WebTestBase {
 
     // Manually call statistics.php to simulate ajax data collection behavior.
     global $base_root;
-    $post = array('nid' => $this->node->id());
-    $this->client->post($base_root . $stats_path, array('form_params' => $post));
+    $post = ['nid' => $this->node->id()];
+    $this->client->post($base_root . $stats_path, ['form_params' => $post]);
     $node_counter = statistics_get($this->node->id());
     $this->assertIdentical($node_counter['totalcount'], '1');
   }
diff --git a/web/core/modules/statistics/src/Tests/StatisticsReportsTest.php b/web/core/modules/statistics/src/Tests/StatisticsReportsTest.php
index 402807412..ea597f40b 100644
--- a/web/core/modules/statistics/src/Tests/StatisticsReportsTest.php
+++ b/web/core/modules/statistics/src/Tests/StatisticsReportsTest.php
@@ -2,6 +2,9 @@
 
 namespace Drupal\statistics\Tests;
 
+use Drupal\Core\Cache\Cache;
+use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+
 /**
  * Tests display of statistics report blocks.
  *
@@ -9,32 +12,34 @@ namespace Drupal\statistics\Tests;
  */
 class StatisticsReportsTest extends StatisticsTestBase {
 
+  use AssertPageCacheContextsAndTagsTrait;
+
   /**
    * Tests the "popular content" block.
    */
-  function testPopularContentBlock() {
+  public function testPopularContentBlock() {
     // Clear the block cache to load the Statistics module's block definitions.
     $this->container->get('plugin.manager.block')->clearCachedDefinitions();
 
     // Visit a node to have something show up in the block.
-    $node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->blockingUser->id()));
+    $node = $this->drupalCreateNode(['type' => 'page', 'uid' => $this->blockingUser->id()]);
     $this->drupalGet('node/' . $node->id());
     // Manually calling statistics.php, simulating ajax behavior.
     $nid = $node->id();
-    $post = http_build_query(array('nid' => $nid));
-    $headers = array('Content-Type' => 'application/x-www-form-urlencoded');
+    $post = http_build_query(['nid' => $nid]);
+    $headers = ['Content-Type' => 'application/x-www-form-urlencoded'];
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
     $client = \Drupal::httpClient();
-    $client->post($stats_path, array('headers' => $headers, 'body' => $post));
+    $client->post($stats_path, ['headers' => $headers, 'body' => $post]);
 
     // Configure and save the block.
-    $this->drupalPlaceBlock('statistics_popular_block', array(
+    $block = $this->drupalPlaceBlock('statistics_popular_block', [
       'label' => 'Popular content',
       'top_day_num' => 3,
       'top_all_num' => 3,
       'top_last_num' => 3,
-    ));
+    ]);
 
     // Get some page and check if the block is displayed.
     $this->drupalGet('user');
@@ -43,9 +48,16 @@ class StatisticsReportsTest extends StatisticsTestBase {
     $this->assertText('All time', 'Found the all time popular content.');
     $this->assertText('Last viewed', 'Found the last viewed popular content.');
 
-    // statistics.module doesn't use node entities, prevent the node language
-    // from being added to the options.
-    $this->assertRaw(\Drupal::l($node->label(), $node->urlInfo('canonical', ['language' => NULL])), 'Found link to visited node.');
+    $tags = Cache::mergeTags($node->getCacheTags(), $block->getCacheTags());
+    $tags = Cache::mergeTags($tags, $this->blockingUser->getCacheTags());
+    $tags = Cache::mergeTags($tags, ['block_view', 'config:block_list', 'node_list', 'rendered', 'user_view']);
+    $this->assertCacheTags($tags);
+    $contexts = Cache::mergeContexts($node->getCacheContexts(), $block->getCacheContexts());
+    $contexts = Cache::mergeContexts($contexts, ['url.query_args:_wrapper_format']);
+    $this->assertCacheContexts($contexts);
+
+    // Check if the node link is displayed.
+    $this->assertRaw(\Drupal::l($node->label(), $node->urlInfo('canonical')), 'Found link to visited node.');
   }
 
 }
diff --git a/web/core/modules/statistics/src/Tests/StatisticsTestBase.php b/web/core/modules/statistics/src/Tests/StatisticsTestBase.php
index b18b0ac69..4f530cf9c 100644
--- a/web/core/modules/statistics/src/Tests/StatisticsTestBase.php
+++ b/web/core/modules/statistics/src/Tests/StatisticsTestBase.php
@@ -6,6 +6,9 @@ use Drupal\simpletest\WebTestBase;
 
 /**
  * Defines a base class for testing the Statistics module.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\statistics\Functional\StatisticsTestBase instead.
  */
 abstract class StatisticsTestBase extends WebTestBase {
 
@@ -14,7 +17,7 @@ abstract class StatisticsTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'block', 'ban', 'statistics');
+  public static $modules = ['node', 'block', 'ban', 'statistics'];
 
   /**
    * User with permissions to ban IP's.
@@ -28,18 +31,18 @@ abstract class StatisticsTestBase extends WebTestBase {
 
     // Create Basic page node type.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
     }
 
     // Create user.
-    $this->blockingUser = $this->drupalCreateUser(array(
+    $this->blockingUser = $this->drupalCreateUser([
       'access administration pages',
       'access site reports',
       'ban IP addresses',
       'administer blocks',
       'administer statistics',
       'administer users',
-    ));
+    ]);
     $this->drupalLogin($this->blockingUser);
 
     // Enable logging.
diff --git a/web/core/modules/statistics/src/Tests/Views/IntegrationTest.php b/web/core/modules/statistics/src/Tests/Views/IntegrationTest.php
index 7fe99f93e..18f558158 100644
--- a/web/core/modules/statistics/src/Tests/Views/IntegrationTest.php
+++ b/web/core/modules/statistics/src/Tests/Views/IntegrationTest.php
@@ -19,7 +19,7 @@ class IntegrationTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('statistics', 'statistics_test_views', 'node');
+  public static $modules = ['statistics', 'statistics_test_views', 'node'];
 
   /**
    * Stores the user object that accesses the page.
@@ -40,25 +40,24 @@ class IntegrationTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_statistics_integration');
+  public static $testViews = ['test_statistics_integration'];
 
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('statistics_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['statistics_test_views']);
 
     // Create a new user for viewing nodes and statistics.
-    $this->webUser = $this->drupalCreateUser(array('access content', 'view post access counter'));
+    $this->webUser = $this->drupalCreateUser(['access content', 'view post access counter']);
 
     // Create a new user for viewing nodes only.
-    $this->deniedUser = $this->drupalCreateUser(array('access content'));
+    $this->deniedUser = $this->drupalCreateUser(['access content']);
 
-    $this->drupalCreateContentType(array('type' => 'page'));
-    $this->node = $this->drupalCreateNode(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
+    $this->node = $this->drupalCreateNode(['type' => 'page']);
 
-    // Enable access logging.
+    // Enable counting of content views.
     $this->config('statistics.settings')
-      ->set('access_log.enabled', 1)
       ->set('count_content_views', 1)
       ->save();
 
@@ -76,7 +75,7 @@ class IntegrationTest extends ViewTestBase {
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
     $client = \Drupal::httpClient();
-    $client->post($stats_path, array('form_params' => array('nid' => $this->node->id())));
+    $client->post($stats_path, ['form_params' => ['nid' => $this->node->id()]]);
     $this->drupalGet('test_statistics_integration');
 
     $expected = statistics_get($this->node->id());
diff --git a/web/core/modules/statistics/statistics.install b/web/core/modules/statistics/statistics.install
index 11c72f4af..deac9010a 100644
--- a/web/core/modules/statistics/statistics.install
+++ b/web/core/modules/statistics/statistics.install
@@ -18,42 +18,42 @@ function statistics_uninstall() {
  * Implements hook_schema().
  */
 function statistics_schema() {
-  $schema['node_counter'] = array(
+  $schema['node_counter'] = [
     'description' => 'Access statistics for {node}s.',
-    'fields' => array(
-      'nid' => array(
+    'fields' => [
+      'nid' => [
         'description' => 'The {node}.nid for these statistics.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'totalcount' => array(
+      ],
+      'totalcount' => [
         'description' => 'The total number of times the {node} has been viewed.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'size' => 'big',
-      ),
-      'daycount' => array(
+      ],
+      'daycount' => [
         'description' => 'The total number of times the {node} has been viewed today.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
         'size' => 'medium',
-      ),
-      'timestamp' => array(
+      ],
+      'timestamp' => [
         'description' => 'The most recent time the {node} has been viewed.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-    ),
-    'primary key' => array('nid'),
-  );
+      ],
+    ],
+    'primary key' => ['nid'],
+  ];
 
   return $schema;
 }
@@ -63,7 +63,7 @@ function statistics_schema() {
  */
 function statistics_update_8001() {
   if (!\Drupal::moduleHandler()->moduleExists('node')) {
-    if (\Drupal::service('module_installer')->uninstall(array('statistics'), TRUE)) {
+    if (\Drupal::service('module_installer')->uninstall(['statistics'], TRUE)) {
       return 'The statistics module depends on the node module and has therefore been uninstalled.';
     }
     else {
@@ -79,3 +79,10 @@ function statistics_update_8002() {
   // Set the new configuration setting for max age to the initial value.
   \Drupal::configFactory()->getEditable('statistics.settings')->set('display_max_age', 3600)->save();
 }
+
+/**
+ * Remove access_log settings.
+ */
+function statistics_update_8300() {
+  \Drupal::configFactory()->getEditable('statistics.settings')->clear('access_log')->save();
+}
diff --git a/web/core/modules/statistics/statistics.module b/web/core/modules/statistics/statistics.module
index 68d88f5ac..a7f1e1060 100644
--- a/web/core/modules/statistics/statistics.module
+++ b/web/core/modules/statistics/statistics.module
@@ -19,13 +19,13 @@ function statistics_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.statistics':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Statistics module shows you how often content is viewed. This is useful in determining which pages of your site are most popular. For more information, see the <a href=":statistics_do">online documentation for the Statistics module</a>.', array(':statistics_do' => 'https://www.drupal.org/documentation/modules/statistics/')) . '</p>';
+      $output .= '<p>' . t('The Statistics module shows you how often content is viewed. This is useful in determining which pages of your site are most popular. For more information, see the <a href=":statistics_do">online documentation for the Statistics module</a>.', [':statistics_do' => 'https://www.drupal.org/documentation/modules/statistics/']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Displaying popular content') . '</dt>';
-      $output .= '<dd>' . t('The module includes a <em>Popular content</em> block that displays the most viewed pages today and for all time, and the last content viewed. To use the block, enable <em>Count content views</em> on the <a href=":statistics-settings">Statistics page</a>, and then you can enable and configure the block on the <a href=":blocks">Block layout page</a>.', array(':statistics-settings' => \Drupal::url('statistics.settings'), ':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '</dd>';
+      $output .= '<dd>' . t('The module includes a <em>Popular content</em> block that displays the most viewed pages today and for all time, and the last content viewed. To use the block, enable <em>Count content views</em> on the <a href=":statistics-settings">Statistics page</a>, and then you can enable and configure the block on the <a href=":blocks">Block layout page</a>.', [':statistics-settings' => \Drupal::url('statistics.settings'), ':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#']) . '</dd>';
       $output .= '<dt>' . t('Page view counter') . '</dt>';
-      $output .= '<dd>' . t('The Statistics module includes a counter for each page that increases whenever the page is viewed. To use the counter, enable <em>Count content views</em> on the <a href=":statistics-settings">Statistics page</a>, and set the necessary <a href=":permissions">permissions</a> (<em>View content hits</em>) so that the counter is visible to the users.', array(':statistics-settings' => \Drupal::url('statistics.settings'), ':permissions' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-statistics')))) . '</dd>';
+      $output .= '<dd>' . t('The Statistics module includes a counter for each page that increases whenever the page is viewed. To use the counter, enable <em>Count content views</em> on the <a href=":statistics-settings">Statistics page</a>, and set the necessary <a href=":permissions">permissions</a> (<em>View content hits</em>) so that the counter is visible to the users.', [':statistics-settings' => \Drupal::url('statistics.settings'), ':permissions' => \Drupal::url('user.admin_permissions', [], ['fragment' => 'module-statistics'])]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -40,7 +40,7 @@ function statistics_help($route_name, RouteMatchInterface $route_match) {
 function statistics_node_view(array &$build, EntityInterface $node, EntityViewDisplayInterface $display, $view_mode) {
   if (!$node->isNew() && $view_mode == 'full' && node_is_page($node) && empty($node->in_preview)) {
     $build['#attached']['library'][] = 'statistics/drupal.statistics';
-    $settings = array('data' => array('nid' => $node->id()), 'url' => Url::fromUri('base:' . drupal_get_path('module', 'statistics') . '/statistics.php')->toString());
+    $settings = ['data' => ['nid' => $node->id()], 'url' => Url::fromUri('base:' . drupal_get_path('module', 'statistics') . '/statistics.php')->toString()];
     $build['#attached']['drupalSettings']['statistics'] = $settings;
   }
 }
@@ -52,14 +52,14 @@ function statistics_node_links_alter(array &$links, NodeInterface $entity, array
   if ($context['view_mode'] != 'rss') {
     $links['#cache']['contexts'][] = 'user.permissions';
     if (\Drupal::currentUser()->hasPermission('view post access counter')) {
-      $statistics = statistics_get($entity->id());
+      $statistics = \Drupal::service('statistics.storage.node')->fetchView($entity->id());
       if ($statistics) {
-        $statistics_links['statistics_counter']['title'] = \Drupal::translation()->formatPlural($statistics['totalcount'], '1 view', '@count views');
-        $links['statistics'] = array(
+        $statistics_links['statistics_counter']['title'] = \Drupal::translation()->formatPlural($statistics->getTotalCount(), '1 view', '@count views');
+        $links['statistics'] = [
           '#theme' => 'links__node__statistics',
           '#links' => $statistics_links,
-          '#attributes' => array('class' => array('links', 'inline')),
-        );
+          '#attributes' => ['class' => ['links', 'inline']],
+        ];
       }
       $links['#cache']['max-age'] = \Drupal::config('statistics.settings')->get('display_max_age');
     }
@@ -70,18 +70,10 @@ function statistics_node_links_alter(array &$links, NodeInterface $entity, array
  * Implements hook_cron().
  */
 function statistics_cron() {
-  $statistics_timestamp = \Drupal::state()->get('statistics.day_timestamp') ?: 0;
-
-  if ((REQUEST_TIME - $statistics_timestamp) >= 86400) {
-    // Reset day counts.
-    db_update('node_counter')
-      ->fields(array('daycount' => 0))
-      ->execute();
-    \Drupal::state()->set('statistics.day_timestamp', REQUEST_TIME);
-  }
-
-  // Calculate the maximum of node views, for node search ranking.
-  \Drupal::state()->set('statistics.node_counter_scale', 1.0 / max(1.0, db_query('SELECT MAX(totalcount) FROM {node_counter}')->fetchField()));
+  $storage = \Drupal::service('statistics.storage.node');
+  $storage->resetDayCount();
+  $max_total_count = $storage->maxTotalCount();
+  \Drupal::state()->set('statistics.node_counter_scale', 1.0 / max(1.0, $max_total_count));
 }
 
 /**
@@ -101,15 +93,15 @@ function statistics_cron() {
  *   be executed correctly.
  */
 function statistics_title_list($dbfield, $dbrows) {
-  if (in_array($dbfield, array('totalcount', 'daycount', 'timestamp'))) {
+  if (in_array($dbfield, ['totalcount', 'daycount', 'timestamp'])) {
     $query = db_select('node_field_data', 'n');
     $query->addTag('node_access');
     $query->join('node_counter', 's', 'n.nid = s.nid');
     $query->join('users_field_data', 'u', 'n.uid = u.uid');
 
     return $query
-      ->fields('n', array('nid', 'title'))
-      ->fields('u', array('uid', 'name'))
+      ->fields('n', ['nid', 'title'])
+      ->fields('u', ['uid', 'name'])
       ->condition($dbfield, 0, '<>')
       ->condition('n.status', 1)
       // @todo This should be actually filtering on the desired node status
@@ -123,26 +115,21 @@ function statistics_title_list($dbfield, $dbrows) {
   return FALSE;
 }
 
-
 /**
  * Retrieves a node's "view statistics".
  *
- * @param int $nid
- *   The node ID.
- *
- * @return array
- *   An associative array containing:
- *   - totalcount: Integer for the total number of times the node has been
- *     viewed.
- *   - daycount: Integer for the total number of times the node has been viewed
- *     "today". For the daycount to be reset, cron must be enabled.
- *   - timestamp: Integer for the timestamp of when the node was last viewed.
+ * @deprecated in Drupal 8.2.x, will be removed before Drupal 9.0.0.
+ *   Use \Drupal::service('statistics.storage.node')->fetchView($id).
  */
-function statistics_get($nid) {
-
-  if ($nid > 0) {
-    // Retrieve an array with both totalcount and daycount.
-    return db_query('SELECT totalcount, daycount, timestamp FROM {node_counter} WHERE nid = :nid', array(':nid' => $nid), array('target' => 'replica'))->fetchAssoc();
+function statistics_get($id) {
+  if ($id > 0) {
+    /** @var \Drupal\statistics\StatisticsViewsResult $statistics */
+    $statistics = \Drupal::service('statistics.storage.node')->fetchView($id);
+    return [
+      'totalcount' => $statistics->getTotalCount(),
+      'daycount' => $statistics->getDayCount(),
+      'timestamp' => $statistics->getTimestamp(),
+    ];
   }
 }
 
@@ -151,9 +138,8 @@ function statistics_get($nid) {
  */
 function statistics_node_predelete(EntityInterface $node) {
   // Clean up statistics table when node is deleted.
-  db_delete('node_counter')
-    ->condition('nid', $node->id())
-    ->execute();
+  $id = $node->id();
+  return \Drupal::service('statistics.storage.node')->deleteViews($id);
 }
 
 /**
@@ -161,15 +147,15 @@ function statistics_node_predelete(EntityInterface $node) {
  */
 function statistics_ranking() {
   if (\Drupal::config('statistics.settings')->get('count_content_views')) {
-    return array(
-      'views' => array(
+    return [
+      'views' => [
         'title' => t('Number of views'),
-        'join' => array(
+        'join' => [
           'type' => 'LEFT',
           'table' => 'node_counter',
           'alias' => 'node_counter',
           'on' => 'node_counter.nid = i.sid',
-        ),
+        ],
         // Inverse law that maps the highest view count on the site to 1 and 0
         // to 0. Note that the ROUND here is necessary for PostgreSQL and SQLite
         // in order to ensure that the :statistics_scale argument is treated as
@@ -177,9 +163,9 @@ function statistics_ranking() {
         // values in as strings instead of numbers in complex expressions like
         // this.
         'score' => '2.0 - 2.0 / (1.0 + node_counter.totalcount * (ROUND(:statistics_scale, 4)))',
-        'arguments' => array(':statistics_scale' => \Drupal::state()->get('statistics.node_counter_scale') ?: 0),
-      ),
-    );
+        'arguments' => [':statistics_scale' => \Drupal::state()->get('statistics.node_counter_scale') ?: 0],
+      ],
+    ];
   }
 }
 
diff --git a/web/core/modules/statistics/statistics.php b/web/core/modules/statistics/statistics.php
index a79af5f0f..a43509eaf 100644
--- a/web/core/modules/statistics/statistics.php
+++ b/web/core/modules/statistics/statistics.php
@@ -14,8 +14,9 @@ $autoloader = require_once 'autoload.php';
 
 $kernel = DrupalKernel::createFromRequest(Request::createFromGlobals(), $autoloader, 'prod');
 $kernel->boot();
+$container = $kernel->getContainer();
 
-$views = $kernel->getContainer()
+$views = $container
   ->get('config.factory')
   ->get('statistics.settings')
   ->get('count_content_views');
@@ -23,15 +24,7 @@ $views = $kernel->getContainer()
 if ($views) {
   $nid = filter_input(INPUT_POST, 'nid', FILTER_VALIDATE_INT);
   if ($nid) {
-    \Drupal::database()->merge('node_counter')
-      ->key('nid', $nid)
-      ->fields(array(
-        'daycount' => 1,
-        'totalcount' => 1,
-        'timestamp' => REQUEST_TIME,
-      ))
-      ->expression('daycount', 'daycount + 1')
-      ->expression('totalcount', 'totalcount + 1')
-      ->execute();
+    $container->get('request_stack')->push(Request::createFromGlobals());
+    $container->get('statistics.storage.node')->recordView($nid);
   }
 }
diff --git a/web/core/modules/statistics/statistics.services.yml b/web/core/modules/statistics/statistics.services.yml
new file mode 100644
index 000000000..cf1557302
--- /dev/null
+++ b/web/core/modules/statistics/statistics.services.yml
@@ -0,0 +1,6 @@
+services:
+  statistics.storage.node:
+    class: Drupal\statistics\NodeStatisticsDatabaseStorage
+    arguments: ['@database', '@state', '@request_stack']
+    tags:
+      - { name: backend_overridable }
diff --git a/web/core/modules/statistics/statistics.tokens.inc b/web/core/modules/statistics/statistics.tokens.inc
index e9d8ded43..96500b898 100644
--- a/web/core/modules/statistics/statistics.tokens.inc
+++ b/web/core/modules/statistics/statistics.tokens.inc
@@ -11,23 +11,23 @@ use Drupal\Core\Render\BubbleableMetadata;
  * Implements hook_token_info().
  */
 function statistics_token_info() {
-  $node['total-count'] = array(
+  $node['total-count'] = [
     'name' => t("Number of views"),
     'description' => t("The number of visitors who have read the node."),
-  );
-  $node['day-count'] = array(
+  ];
+  $node['day-count'] = [
     'name' => t("Views today"),
     'description' => t("The number of visitors who have read the node today."),
-  );
-  $node['last-view'] = array(
+  ];
+  $node['last-view'] = [
     'name' => t("Last view"),
     'description' => t("The date on which a visitor last read the node."),
     'type' => 'date',
-  );
+  ];
 
-  return array(
-    'tokens' => array('node' => $node),
-  );
+  return [
+    'tokens' => ['node' => $node],
+  ];
 }
 
 /**
@@ -36,7 +36,7 @@ function statistics_token_info() {
 function statistics_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
-  $replacements = array();
+  $replacements = [];
 
   if ($type == 'node' & !empty($data['node'])) {
     $node = $data['node'];
@@ -58,7 +58,7 @@ function statistics_tokens($type, $tokens, array $data, array $options, Bubbleab
 
     if ($created_tokens = $token_service->findWithPrefix($tokens, 'last-view')) {
       $statistics = statistics_get($node->id());
-      $replacements += $token_service->generate('date', $created_tokens, array('date' => $statistics['timestamp']), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('date', $created_tokens, ['date' => $statistics['timestamp']], $options, $bubbleable_metadata);
     }
   }
 
diff --git a/web/core/modules/statistics/statistics.views.inc b/web/core/modules/statistics/statistics.views.inc
index e85125188..03e73ffcf 100644
--- a/web/core/modules/statistics/statistics.views.inc
+++ b/web/core/modules/statistics/statistics.views.inc
@@ -11,66 +11,66 @@
 function statistics_views_data() {
   $data['node_counter']['table']['group']  = t('Content statistics');
 
-  $data['node_counter']['table']['join'] = array(
-    'node_field_data' => array(
+  $data['node_counter']['table']['join'] = [
+    'node_field_data' => [
       'left_field' => 'nid',
       'field' => 'nid',
-    ),
-  );
+    ],
+  ];
 
-  $data['node_counter']['totalcount'] = array(
+  $data['node_counter']['totalcount'] = [
     'title' => t('Total views'),
     'help' => t('The total number of times the node has been viewed.'),
-    'field' => array(
+    'field' => [
       'id' => 'statistics_numeric',
       'click sortable' => TRUE,
-     ),
-    'filter' => array(
+     ],
+    'filter' => [
       'id' => 'numeric',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'numeric',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['node_counter']['daycount'] = array(
+  $data['node_counter']['daycount'] = [
     'title' => t('Views today'),
     'help' => t('The total number of times the node has been viewed today.'),
-    'field' => array(
+    'field' => [
       'id' => 'statistics_numeric',
       'click sortable' => TRUE,
-     ),
-    'filter' => array(
+     ],
+    'filter' => [
       'id' => 'numeric',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'numeric',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
-  $data['node_counter']['timestamp'] = array(
+  $data['node_counter']['timestamp'] = [
     'title' => t('Most recent view'),
     'help' => t('The most recent time the node has been viewed.'),
-    'field' => array(
+    'field' => [
       'id' => 'node_counter_timestamp',
       'click sortable' => TRUE,
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'date',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'date',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
+    ],
+  ];
 
   return $data;
 }
diff --git a/web/core/modules/statistics/src/Tests/StatisticsAttachedTest.php b/web/core/modules/statistics/tests/src/Functional/StatisticsAttachedTest.php
similarity index 82%
rename from web/core/modules/statistics/src/Tests/StatisticsAttachedTest.php
rename to web/core/modules/statistics/tests/src/Functional/StatisticsAttachedTest.php
index f869b2a86..787c35bff 100644
--- a/web/core/modules/statistics/src/Tests/StatisticsAttachedTest.php
+++ b/web/core/modules/statistics/tests/src/Functional/StatisticsAttachedTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\node\Entity\Node;
 
 /**
@@ -10,14 +10,14 @@ use Drupal\node\Entity\Node;
  *
  * @group statistics
  */
-class StatisticsAttachedTest extends WebTestBase {
+class StatisticsAttachedTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'statistics');
+  public static $modules = ['node', 'statistics'];
 
   /**
    * {@inheritdoc}
@@ -29,7 +29,7 @@ class StatisticsAttachedTest extends WebTestBase {
 
     // Install "statistics_test_attached" and set it as the default theme.
     $theme = 'statistics_test_attached';
-    \Drupal::service('theme_handler')->install(array($theme));
+    \Drupal::service('theme_handler')->install([$theme]);
     $this->config('system.theme')
       ->set('default', $theme)
       ->save();
diff --git a/web/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php b/web/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
new file mode 100644
index 000000000..3be95e2ab
--- /dev/null
+++ b/web/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\Tests\statistics\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Defines a base class for testing the Statistics module.
+ */
+abstract class StatisticsTestBase extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'block', 'ban', 'statistics'];
+
+  /**
+   * User with permissions to ban IP's.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $blockingUser;
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create Basic page node type.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+    }
+
+    // Create user.
+    $this->blockingUser = $this->drupalCreateUser([
+      'access administration pages',
+      'access site reports',
+      'ban IP addresses',
+      'administer blocks',
+      'administer statistics',
+      'administer users',
+    ]);
+    $this->drupalLogin($this->blockingUser);
+
+    // Enable logging.
+    $this->config('statistics.settings')
+      ->set('count_content_views', 1)
+      ->save();
+  }
+
+}
diff --git a/web/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php b/web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
similarity index 67%
rename from web/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
rename to web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
index e2e4533d6..8402d221a 100644
--- a/web/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
+++ b/web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\statistics\Tests;
+namespace Drupal\Tests\statistics\Functional;
 
 /**
  * Generates text using placeholders for dummy content to check statistics token
@@ -12,28 +12,28 @@ class StatisticsTokenReplaceTest extends StatisticsTestBase {
   /**
    * Creates a node, then tests the statistics tokens generated from it.
    */
-  function testStatisticsTokenReplacement() {
+  public function testStatisticsTokenReplacement() {
     $language_interface = \Drupal::languageManager()->getCurrentLanguage();
 
     // Create user and node.
-    $user = $this->drupalCreateUser(array('create page content'));
+    $user = $this->drupalCreateUser(['create page content']);
     $this->drupalLogin($user);
-    $node = $this->drupalCreateNode(array('type' => 'page', 'uid' => $user->id()));
+    $node = $this->drupalCreateNode(['type' => 'page', 'uid' => $user->id()]);
 
     // Hit the node.
     $this->drupalGet('node/' . $node->id());
     // Manually calling statistics.php, simulating ajax behavior.
     $nid = $node->id();
-    $post = http_build_query(array('nid' => $nid));
-    $headers = array('Content-Type' => 'application/x-www-form-urlencoded');
+    $post = http_build_query(['nid' => $nid]);
+    $headers = ['Content-Type' => 'application/x-www-form-urlencoded'];
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics') . '/statistics.php';
     $client = \Drupal::httpClient();
-    $client->post($stats_path, array('headers' => $headers, 'body' => $post));
+    $client->post($stats_path, ['headers' => $headers, 'body' => $post]);
     $statistics = statistics_get($node->id());
 
     // Generate and test tokens.
-    $tests = array();
+    $tests = [];
     $tests['[node:total-count]'] = 1;
     $tests['[node:day-count]'] = 1;
     $tests['[node:last-view]'] = format_date($statistics['timestamp']);
@@ -43,8 +43,8 @@ class StatisticsTokenReplaceTest extends StatisticsTestBase {
     $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
 
     foreach ($tests as $input => $expected) {
-      $output = \Drupal::token()->replace($input, array('node' => $node), array('langcode' => $language_interface->getId()));
-      $this->assertEqual($output, $expected, format_string('Statistics token %token replaced.', array('%token' => $input)));
+      $output = \Drupal::token()->replace($input, ['node' => $node], ['langcode' => $language_interface->getId()]);
+      $this->assertEqual($output, $expected, format_string('Statistics token %token replaced.', ['%token' => $input]));
     }
   }
 
diff --git a/web/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php b/web/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php
index 401a5e82b..da6ab300e 100644
--- a/web/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php
+++ b/web/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\statistics\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -17,7 +17,7 @@ class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('statistics');
+  public static $modules = ['statistics'];
 
   /**
    * {@inheritdoc}
@@ -32,8 +32,6 @@ class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase {
    */
   public function testStatisticsSettings() {
     $config = $this->config('statistics.settings');
-    $this->assertIdentical(FALSE, $config->get('access_log.enabled'));
-    $this->assertIdentical(259200, $config->get('access_log.max_lifetime'));
     $this->assertIdentical(0, $config->get('count_content_views'));
     $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config->get());
   }
diff --git a/web/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateStatisticsConfigsTest.php b/web/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateStatisticsConfigsTest.php
index e5d3310ad..36e270d8f 100644
--- a/web/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateStatisticsConfigsTest.php
+++ b/web/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateStatisticsConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\statistics\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
@@ -17,7 +17,7 @@ class MigrateStatisticsConfigsTest extends MigrateDrupal7TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('statistics');
+  public static $modules = ['statistics'];
 
   /**
    * {@inheritdoc}
@@ -32,8 +32,6 @@ class MigrateStatisticsConfigsTest extends MigrateDrupal7TestBase {
    */
   public function testStatisticsSettings() {
     $config = $this->config('statistics.settings');
-    $this->assertIdentical(TRUE, $config->get('access_log.enabled'));
-    $this->assertIdentical(3600, $config->get('access_log.max_lifetime'));
     $this->assertIdentical(1, $config->get('count_content_views'));
     $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config->get());
   }
diff --git a/web/core/modules/syslog/src/Logger/SysLog.php b/web/core/modules/syslog/src/Logger/SysLog.php
index 002ecde5e..c2b73dee3 100644
--- a/web/core/modules/syslog/src/Logger/SysLog.php
+++ b/web/core/modules/syslog/src/Logger/SysLog.php
@@ -63,7 +63,7 @@ class SysLog implements LoggerInterface {
   /**
    * {@inheritdoc}
    */
-  public function log($level, $message, array $context = array()) {
+  public function log($level, $message, array $context = []) {
     global $base_url;
 
     // Ensure we have a connection available.
@@ -73,7 +73,7 @@ class SysLog implements LoggerInterface {
     $message_placeholders = $this->parser->parseMessagePlaceholders($message, $context);
     $message = empty($message_placeholders) ? $message : strtr($message, $message_placeholders);
 
-    $entry = strtr($this->config->get('format'), array(
+    $entry = strtr($this->config->get('format'), [
       '!base_url' => $base_url,
       '!timestamp' => $context['timestamp'],
       '!type' => $context['channel'],
@@ -83,7 +83,7 @@ class SysLog implements LoggerInterface {
       '!uid' => $context['uid'],
       '!link' => strip_tags($context['link']),
       '!message' => strip_tags($message),
-    ));
+    ]);
 
     syslog($level, $entry);
   }
diff --git a/web/core/modules/syslog/src/Tests/SyslogTest.php b/web/core/modules/syslog/src/Tests/SyslogTest.php
deleted file mode 100644
index a40847c2a..000000000
--- a/web/core/modules/syslog/src/Tests/SyslogTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Drupal\syslog\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests syslog settings.
- *
- * @group syslog
- */
-class SyslogTest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('syslog');
-
-  /**
-   * Tests the syslog settings page.
-   */
-  function testSettings() {
-    $admin_user = $this->drupalCreateUser(array('administer site configuration'));
-    $this->drupalLogin($admin_user);
-
-    // If we're on Windows, there is no configuration form.
-    if (defined('LOG_LOCAL6')) {
-      $this->drupalPostForm('admin/config/development/logging', array('syslog_facility' => LOG_LOCAL6), t('Save configuration'));
-      $this->assertText(t('The configuration options have been saved.'));
-
-      $this->drupalGet('admin/config/development/logging');
-      if ($this->parse()) {
-        $field = $this->xpath('//option[@value=:value]', array(':value' => LOG_LOCAL6)); // Should be one field.
-        $this->assertTrue($field[0]['selected'] == 'selected', 'Facility value saved.');
-      }
-    }
-  }
-
-}
diff --git a/web/core/modules/syslog/syslog.module b/web/core/modules/syslog/syslog.module
index 68fe61452..2722702d8 100644
--- a/web/core/modules/syslog/syslog.module
+++ b/web/core/modules/syslog/syslog.module
@@ -17,7 +17,7 @@ function syslog_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.syslog':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Syslog module logs events by sending messages to the logging facility of your web server\'s operating system. Syslog is an operating system administrative logging tool that provides valuable information for use in system management and security auditing. Most suited to medium and large sites, Syslog provides filtering tools that allow messages to be routed by type and severity. For more information, see the <a href=":syslog">online documentation for the Syslog module</a>, as well as PHP\'s documentation pages for the <a href="http://php.net/manual/function.openlog.php">openlog</a> and <a href="http://php.net/manual/function.syslog.php">syslog</a> functions.', array(':syslog' => 'https://www.drupal.org/documentation/modules/syslog')) . '</p>';
+      $output .= '<p>' . t('The Syslog module logs events by sending messages to the logging facility of your web server\'s operating system. Syslog is an operating system administrative logging tool that provides valuable information for use in system management and security auditing. Most suited to medium and large sites, Syslog provides filtering tools that allow messages to be routed by type and severity. For more information, see the <a href=":syslog">online documentation for the Syslog module</a>, as well as PHP\'s documentation pages for the <a href="http://php.net/manual/function.openlog.php">openlog</a> and <a href="http://php.net/manual/function.syslog.php">syslog</a> functions.', [':syslog' => 'https://www.drupal.org/documentation/modules/syslog']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Logging for UNIX, Linux, and Mac OS X') . '</dt>';
@@ -35,27 +35,27 @@ function syslog_help($route_name, RouteMatchInterface $route_match) {
 function syslog_form_system_logging_settings_alter(&$form, FormStateInterface $form_state) {
   $config = \Drupal::configFactory()->getEditable('syslog.settings');
   $help = \Drupal::moduleHandler()->moduleExists('help') ? ' ' . \Drupal::l(t('More information'), new Url('help.page', ['name' => 'syslog'])) . '.' : NULL;
-  $form['syslog_identity'] = array(
+  $form['syslog_identity'] = [
     '#type'          => 'textfield',
     '#title'         => t('Syslog identity'),
     '#default_value' => $config->get('identity'),
     '#description'   => t('A string that will be prepended to every message logged to Syslog. If you have multiple sites logging to the same Syslog log file, a unique identity per site makes it easy to tell the log entries apart.') . $help,
-  );
+  ];
   if (defined('LOG_LOCAL0')) {
-    $form['syslog_facility'] = array(
+    $form['syslog_facility'] = [
       '#type'          => 'select',
       '#title'         => t('Syslog facility'),
       '#default_value' => $config->get('facility'),
       '#options'       => syslog_facility_list(),
       '#description'   => t('Depending on the system configuration, Syslog and other logging tools use this code to identify or filter messages from within the entire system log.') . $help,
-     );
+     ];
   }
-  $form['syslog_format'] = array(
+  $form['syslog_format'] = [
     '#type'          => 'textarea',
     '#title'         => t('Syslog format'),
     '#default_value' => $config->get('format'),
     '#description'   => t('Specify the format of the syslog entry. Available variables are: <dl><dt><code>!base_url</code></dt><dd>Base URL of the site.</dd><dt><code>!timestamp</code></dt><dd>Unix timestamp of the log entry.</dd><dt><code>!type</code></dt><dd>The category to which this message belongs.</dd><dt><code>!ip</code></dt><dd>IP address of the user triggering the message.</dd><dt><code>!request_uri</code></dt><dd>The requested URI.</dd><dt><code>!referer</code></dt><dd>HTTP Referer if available.</dd><dt><code>!uid</code></dt><dd>User ID.</dd><dt><code>!link</code></dt><dd>A link to associate with the message.</dd><dt><code>!message</code></dt><dd>The message to store in the log.</dd></dl>'),
-  );
+  ];
 
   $form['#submit'][] = 'syslog_logging_settings_submit';
 }
@@ -80,7 +80,7 @@ function syslog_logging_settings_submit($form, FormStateInterface $form_state) {
  *   An array of syslog facilities for UNIX/Linux.
  */
 function syslog_facility_list() {
-  return array(
+  return [
     LOG_LOCAL0 => 'LOG_LOCAL0',
     LOG_LOCAL1 => 'LOG_LOCAL1',
     LOG_LOCAL2 => 'LOG_LOCAL2',
@@ -89,5 +89,5 @@ function syslog_facility_list() {
     LOG_LOCAL5 => 'LOG_LOCAL5',
     LOG_LOCAL6 => 'LOG_LOCAL6',
     LOG_LOCAL7 => 'LOG_LOCAL7',
-  );
+  ];
 }
diff --git a/web/core/modules/syslog/tests/src/Functional/SyslogTest.php b/web/core/modules/syslog/tests/src/Functional/SyslogTest.php
new file mode 100644
index 000000000..11b577f2f
--- /dev/null
+++ b/web/core/modules/syslog/tests/src/Functional/SyslogTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\Tests\syslog\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests syslog settings.
+ *
+ * @group syslog
+ */
+class SyslogTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['syslog'];
+
+  /**
+   * Tests the syslog settings page.
+   */
+  public function testSettings() {
+    $admin_user = $this->drupalCreateUser(['administer site configuration']);
+    $this->drupalLogin($admin_user);
+
+    // If we're on Windows, there is no configuration form.
+    if (defined('LOG_LOCAL6')) {
+      $this->drupalPostForm('admin/config/development/logging', ['syslog_facility' => LOG_LOCAL6], t('Save configuration'));
+      $this->assertText(t('The configuration options have been saved.'));
+
+      $this->drupalGet('admin/config/development/logging');
+      // Should be one field.
+      $field = $this->xpath('//option[@value=:value]', [':value' => LOG_LOCAL6]);
+      $this->assertSame('selected', $field[0]->getAttribute('selected'), 'Facility value saved.');
+    }
+  }
+
+}
diff --git a/web/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php b/web/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
index f2bf8c9e3..aa6620311 100644
--- a/web/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
+++ b/web/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\syslog\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -17,7 +17,7 @@ class MigrateSyslogConfigsTest extends MigrateDrupal6TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('syslog');
+  public static $modules = ['syslog'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php b/web/core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php
index e81b821b5..2996b4241 100644
--- a/web/core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php
+++ b/web/core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\syslog\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
diff --git a/web/core/modules/system/config/install/system.cron.yml b/web/core/modules/system/config/install/system.cron.yml
index e6f30d3d2..c27b41dbb 100644
--- a/web/core/modules/system/config/install/system.cron.yml
+++ b/web/core/modules/system/config/install/system.cron.yml
@@ -1,3 +1,4 @@
 threshold:
   requirements_warning: 172800
   requirements_error: 1209600
+logging: 1
diff --git a/web/core/modules/system/config/schema/system.schema.yml b/web/core/modules/system/config/schema/system.schema.yml
index e34d375cf..c23ed7e0a 100644
--- a/web/core/modules/system/config/schema/system.schema.yml
+++ b/web/core/modules/system/config/schema/system.schema.yml
@@ -72,6 +72,9 @@ system.cron:
         requirements_error:
           type: integer
           label: 'Requirements error period'
+    logging:
+      type: integer
+      label: 'Detailed cron logging'
 
 system.date:
   type: config_object
diff --git a/web/core/modules/system/css/components/system-status-counter.css b/web/core/modules/system/css/components/system-status-counter.css
new file mode 100644
index 000000000..1f568f021
--- /dev/null
+++ b/web/core/modules/system/css/components/system-status-counter.css
@@ -0,0 +1,30 @@
+/**
+ * @file
+ * Styles for the system status counter component.
+ */
+
+.system-status-counter__status-icon {
+  display: inline-block;
+  height: 25px;
+  width: 25px;
+  vertical-align: middle;
+}
+.system-status-counter__status-icon:before {
+  content: "";
+  background-size: 16px;
+  background-position: center 2px;
+  background-repeat: no-repeat;
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+
+.system-status-counter__status-icon--error:before {
+  background-image: url(../../../../misc/icons/e32700/error.svg);
+}
+.system-status-counter__status-icon--warning:before {
+  background-image: url(../../../../misc/icons/e29700/warning.svg);
+}
+.system-status-counter__status-icon--checked:before {
+  background-image: url(../../../../misc/icons/73b355/check.svg);
+}
diff --git a/web/core/modules/system/css/components/system-status-report-counters.css b/web/core/modules/system/css/components/system-status-report-counters.css
new file mode 100644
index 000000000..1a4e2400f
--- /dev/null
+++ b/web/core/modules/system/css/components/system-status-report-counters.css
@@ -0,0 +1,27 @@
+/**
+ * @file
+ * Styles for the system status report counters.
+ */
+
+.system-status-report-counters__item {
+  width: 100%;
+  padding: .5em 0;
+  text-align: center;
+  white-space: nowrap;
+  background-color: rgba(0, 0, 0, 0.063);
+  margin-bottom: .5em;
+}
+
+@media screen and (min-width: 60em) {
+  .system-status-report-counters {
+    flex-wrap: wrap;
+    display: flex;
+    justify-content: space-between;
+  }
+  .system-status-report-counters__item--half-width {
+    width: 49%;
+  }
+  .system-status-report-counters__item--third-width {
+    width: 33%;
+  }
+}
diff --git a/web/core/modules/system/css/components/system-status-report-general-info.css b/web/core/modules/system/css/components/system-status-report-general-info.css
new file mode 100644
index 000000000..8334d4d19
--- /dev/null
+++ b/web/core/modules/system/css/components/system-status-report-general-info.css
@@ -0,0 +1,14 @@
+/**
+ * @file
+ * Default styles for the System Status general info.
+ */
+
+.system-status-general-info__item {
+  border: 1px solid #ccc;
+  margin-top: 1em;
+  padding: 0 1em 1em;
+}
+
+.system-status-general-info__item-title {
+  border-bottom: 1px solid #ccc;
+}
diff --git a/web/core/modules/system/css/system.admin.css b/web/core/modules/system/css/system.admin.css
index 6bfd6f809..913ce57fc 100644
--- a/web/core/modules/system/css/system.admin.css
+++ b/web/core/modules/system/css/system.admin.css
@@ -204,10 +204,11 @@ small .admin-link:after {
 .system-status-report__status-title {
   position: relative;
   vertical-align: top;
-  width: 25%;
+  width: 100%;
   padding: 10px 6px 10px 40px; /* LTR */
   box-sizing: border-box;
   font-weight: normal;
+  background-color: transparent;
 }
 [dir="rtl"] .system-status-report__status-title {
     padding: 10px 40px 10px 6px;
@@ -232,6 +233,9 @@ small .admin-link:after {
 .system-status-report__status-icon--warning:before {
   background-image: url(../../../misc/icons/e29700/warning.svg);
 }
+.system-status-report__entry__value {
+  padding: 1em .5em;
+}
 
 /**
  * Appearance page.
@@ -387,3 +391,6 @@ small .admin-link:after {
 [dir="rtl"] .system-themes-admin-form {
   clear: right;
 }
+.cron-description__run-cron {
+  display: block;
+}
diff --git a/web/core/modules/system/src/Controller/AdminController.php b/web/core/modules/system/src/Controller/AdminController.php
index 57c13f653..3da4b0901 100644
--- a/web/core/modules/system/src/Controller/AdminController.php
+++ b/web/core/modules/system/src/Controller/AdminController.php
@@ -23,13 +23,13 @@ class AdminController extends ControllerBase {
     }
 
     uasort($module_info, 'system_sort_modules_by_info_name');
-    $menu_items = array();
+    $menu_items = [];
 
     foreach ($module_info as $module => $info) {
       // Only display a section if there are any available tasks.
       if ($admin_tasks = system_get_module_admin_tasks($module, $info->info)) {
         // Sort links by title.
-        uasort($admin_tasks, array('\Drupal\Component\Utility\SortArray', 'sortByTitleElement'));
+        uasort($admin_tasks, ['\Drupal\Component\Utility\SortArray', 'sortByTitleElement']);
         // Move 'Configure permissions' links to the bottom of each section.
         $permission_key = "user.admin_permissions.$module";
         if (isset($admin_tasks[$permission_key])) {
@@ -38,14 +38,14 @@ class AdminController extends ControllerBase {
           $admin_tasks[$permission_key] = $permission_task;
         }
 
-        $menu_items[$info->info['name']] = array($info->info['description'], $admin_tasks);
+        $menu_items[$info->info['name']] = [$info->info['description'], $admin_tasks];
       }
     }
 
-    $output = array(
+    $output = [
       '#theme' => 'system_admin_index',
       '#menu_items' => $menu_items,
-    );
+    ];
 
     return $output;
   }
diff --git a/web/core/modules/system/src/Controller/DbUpdateController.php b/web/core/modules/system/src/Controller/DbUpdateController.php
index f378631a5..9e0a374a4 100644
--- a/web/core/modules/system/src/Controller/DbUpdateController.php
+++ b/web/core/modules/system/src/Controller/DbUpdateController.php
@@ -150,7 +150,7 @@ class DbUpdateController extends ControllerBase {
       $_SESSION['update_ignore_warnings'] = TRUE;
     }
 
-    $regions = array();
+    $regions = [];
     $requirements = update_check_requirements();
     $severity = drupal_requirements_severity($requirements);
     if ($severity == REQUIREMENT_ERROR || ($severity == REQUIREMENT_WARNING && empty($_SESSION['update_ignore_warnings']))) {
@@ -212,32 +212,32 @@ class DbUpdateController extends ControllerBase {
     $this->keyValueExpirableFactory->get('update')->deleteAll();
     $this->keyValueExpirableFactory->get('update_available_release')->deleteAll();
 
-    $build['info_header'] = array(
+    $build['info_header'] = [
       '#markup' => '<p>' . $this->t('Use this utility to update your database whenever a new release of Drupal or a module is installed.') . '</p><p>' . $this->t('For more detailed information, see the <a href="https://www.drupal.org/upgrade">upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.') . '</p>',
-    );
+    ];
 
     $info[] = $this->t("<strong>Back up your code</strong>. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism.");
-    $info[] = $this->t('Put your site into <a href=":url">maintenance mode</a>.', array(
+    $info[] = $this->t('Put your site into <a href=":url">maintenance mode</a>.', [
       ':url' => Url::fromRoute('system.site_maintenance_mode')->toString(TRUE)->getGeneratedUrl(),
-    ));
+    ]);
     $info[] = $this->t('<strong>Back up your database</strong>. This process will change your database values and in case of emergency you may need to revert to a backup.');
     $info[] = $this->t('Install your new files in the appropriate location, as described in the handbook.');
-    $build['info'] = array(
+    $build['info'] = [
       '#theme' => 'item_list',
       '#list_type' => 'ol',
       '#items' => $info,
-    );
-    $build['info_footer'] = array(
+    ];
+    $build['info_footer'] = [
       '#markup' => '<p>' . $this->t('When you have performed the steps above, you may proceed.') . '</p>',
-    );
+    ];
 
-    $build['link'] = array(
+    $build['link'] = [
       '#type' => 'link',
       '#title' => $this->t('Continue'),
-      '#attributes' => array('class' => array('button', 'button--primary')),
+      '#attributes' => ['class' => ['button', 'button--primary']],
       // @todo Revisit once https://www.drupal.org/node/2548095 is in.
       '#url' => Url::fromUri('base://selection'),
-    );
+    ];
     return $build;
   }
 
@@ -256,15 +256,15 @@ class DbUpdateController extends ControllerBase {
 
     $count = 0;
     $incompatible_count = 0;
-    $build['start'] = array(
+    $build['start'] = [
       '#tree' => TRUE,
       '#type' => 'details',
-    );
+    ];
 
     // Ensure system.module's updates appear first.
-    $build['start']['system'] = array();
+    $build['start']['system'] = [];
 
-    $starting_updates = array();
+    $starting_updates = [];
     $incompatible_updates_exist = FALSE;
     $updates_per_module = [];
     foreach (['update', 'post_update'] as $update_type) {
@@ -278,30 +278,30 @@ class DbUpdateController extends ControllerBase {
       }
       foreach ($updates as $module => $update) {
         if (!isset($update['start'])) {
-          $build['start'][$module] = array(
+          $build['start'][$module] = [
             '#type' => 'item',
             '#title' => $module . ' module',
             '#markup' => $update['warning'],
             '#prefix' => '<div class="messages messages--warning">',
             '#suffix' => '</div>',
-          );
+          ];
           $incompatible_updates_exist = TRUE;
           continue;
         }
         if (!empty($update['pending'])) {
           $updates_per_module += [$module => []];
           $updates_per_module[$module] = array_merge($updates_per_module[$module], $update['pending']);
-          $build['start'][$module] = array(
+          $build['start'][$module] = [
             '#type' => 'hidden',
             '#value' => $update['start'],
-          );
+          ];
           // Store the previous items in order to merge normal updates and
           // post_update functions together.
-          $build['start'][$module] = array(
+          $build['start'][$module] = [
             '#theme' => 'item_list',
             '#items' => $updates_per_module[$module],
             '#title' => $module . ' module',
-          );
+          ];
 
           if ($update_type === 'update') {
             $starting_updates[$module] = $update['start'];
@@ -329,7 +329,7 @@ class DbUpdateController extends ControllerBase {
           $build['start'][$module_update_key]['#items'][$data['number']] .= '<div class="warning">' . $text . '</div>';
         }
         // Move the module containing this update to the top of the list.
-        $build['start'] = array($module_update_key => $build['start'][$module_update_key]) + $build['start'];
+        $build['start'] = [$module_update_key => $build['start'][$module_update_key]] + $build['start'];
       }
     }
 
@@ -341,25 +341,25 @@ class DbUpdateController extends ControllerBase {
     if (empty($count)) {
       drupal_set_message($this->t('No pending updates.'));
       unset($build);
-      $build['links'] = array(
+      $build['links'] = [
         '#theme' => 'links',
         '#links' => $this->helpfulLinks($request),
-      );
+      ];
 
       // No updates to run, so caches won't get flushed later.  Clear them now.
       drupal_flush_all_caches();
     }
     else {
-      $build['help'] = array(
+      $build['help'] = [
         '#markup' => '<p>' . $this->t('The version of Drupal you are updating from has been automatically detected.') . '</p>',
         '#weight' => -5,
-      );
+      ];
       if ($incompatible_count) {
         $build['start']['#title'] = $this->formatPlural(
           $count,
           '1 pending update (@number_applied to be applied, @number_incompatible skipped)',
           '@count pending updates (@number_applied to be applied, @number_incompatible skipped)',
-          array('@number_applied' => $count - $incompatible_count, '@number_incompatible' => $incompatible_count)
+          ['@number_applied' => $count - $incompatible_count, '@number_incompatible' => $incompatible_count]
         );
       }
       else {
@@ -367,15 +367,15 @@ class DbUpdateController extends ControllerBase {
       }
       // @todo Simplify with https://www.drupal.org/node/2548095
       $base_url = str_replace('/update.php', '', $request->getBaseUrl());
-      $url = (new Url('system.db_update', array('op' => 'run')))->setOption('base_url', $base_url);
-      $build['link'] = array(
+      $url = (new Url('system.db_update', ['op' => 'run']))->setOption('base_url', $base_url);
+      $build['link'] = [
         '#type' => 'link',
         '#title' => $this->t('Apply pending updates'),
-        '#attributes' => array('class' => array('button', 'button--primary')),
+        '#attributes' => ['class' => ['button', 'button--primary']],
         '#weight' => 5,
         '#url' => $url,
         '#access' => $url->access($this->currentUser()),
-      );
+      ];
     }
 
     return $build;
@@ -397,24 +397,24 @@ class DbUpdateController extends ControllerBase {
     // Report end result.
     $dblog_exists = $this->moduleHandler->moduleExists('dblog');
     if ($dblog_exists && $this->account->hasPermission('access site reports')) {
-      $log_message = $this->t('All errors have been <a href=":url">logged</a>.', array(
+      $log_message = $this->t('All errors have been <a href=":url">logged</a>.', [
         ':url' => Url::fromRoute('dblog.overview')->setOption('base_url', $base_url)->toString(TRUE)->getGeneratedUrl(),
-      ));
+      ]);
     }
     else {
       $log_message = $this->t('All errors have been logged.');
     }
 
     if (!empty($_SESSION['update_success'])) {
-      $message = '<p>' . $this->t('Updates were attempted. If you see no failures below, you may proceed happily back to your <a href=":url">site</a>. Otherwise, you may need to update your database manually.', array(':url' => Url::fromRoute('<front>')->setOption('base_url', $base_url)->toString(TRUE)->getGeneratedUrl())) . ' ' . $log_message . '</p>';
+      $message = '<p>' . $this->t('Updates were attempted. If you see no failures below, you may proceed happily back to your <a href=":url">site</a>. Otherwise, you may need to update your database manually.', [':url' => Url::fromRoute('<front>')->setOption('base_url', $base_url)->toString(TRUE)->getGeneratedUrl()]) . ' ' . $log_message . '</p>';
     }
     else {
       $last = reset($_SESSION['updates_remaining']);
       list($module, $version) = array_pop($last);
-      $message = '<p class="error">' . $this->t('The update process was aborted prematurely while running <strong>update #@version in @module.module</strong>.', array(
+      $message = '<p class="error">' . $this->t('The update process was aborted prematurely while running <strong>update #@version in @module.module</strong>.', [
         '@version' => $version,
         '@module' => $module,
-      )) . ' ' . $log_message;
+      ]) . ' ' . $log_message;
       if ($dblog_exists) {
         $message .= ' ' . $this->t('You may need to check the <code>watchdog</code> database table manually.');
       }
@@ -425,23 +425,23 @@ class DbUpdateController extends ControllerBase {
       $message .= '<p>' . $this->t("<strong>Reminder: don't forget to set the <code>\$settings['update_free_access']</code> value in your <code>settings.php</code> file back to <code>FALSE</code>.</strong>") . '</p>';
     }
 
-    $build['message'] = array(
+    $build['message'] = [
       '#markup' => $message,
-    );
-    $build['links'] = array(
+    ];
+    $build['links'] = [
       '#theme' => 'links',
       '#links' => $this->helpfulLinks($request),
-    );
+    ];
 
     // Output a list of info messages.
     if (!empty($_SESSION['update_results'])) {
-      $all_messages = array();
+      $all_messages = [];
       foreach ($_SESSION['update_results'] as $module => $updates) {
         if ($module != '#abort') {
           $module_has_message = FALSE;
-          $info_messages = array();
+          $info_messages = [];
           foreach ($updates as $name => $queries) {
-            $messages = array();
+            $messages = [];
             foreach ($queries as $query) {
               // If there is no message for this update, don't show anything.
               if (empty($query['query'])) {
@@ -449,16 +449,16 @@ class DbUpdateController extends ControllerBase {
               }
 
               if ($query['success']) {
-                $messages[] = array(
-                  '#wrapper_attributes' => array('class' => array('success')),
+                $messages[] = [
+                  '#wrapper_attributes' => ['class' => ['success']],
                   '#markup' => $query['query'],
-                );
+                ];
               }
               else {
-                $messages[] = array(
-                  '#wrapper_attributes' => array('class' => array('failure')),
+                $messages[] = [
+                  '#wrapper_attributes' => ['class' => ['failure']],
                   '#markup' => '<strong>' . $this->t('Failed:') . '</strong> ' . $query['query'],
-                );
+                ];
               }
             }
 
@@ -470,32 +470,32 @@ class DbUpdateController extends ControllerBase {
               else {
                 $title = $this->t('Update @name', ['@name' => trim($name, '_')]);
               }
-              $info_messages[] = array(
+              $info_messages[] = [
                 '#theme' => 'item_list',
                 '#items' => $messages,
                 '#title' => $title,
-              );
+              ];
             }
           }
 
           // If there were any messages then prefix them with the module name
           // and add it to the global message list.
           if ($module_has_message) {
-            $all_messages[] = array(
+            $all_messages[] = [
               '#type' => 'container',
-              '#prefix' => '<h3>' . $this->t('@module module', array('@module' => $module)) . '</h3>',
+              '#prefix' => '<h3>' . $this->t('@module module', ['@module' => $module]) . '</h3>',
               '#children' => $info_messages,
-            );
+            ];
           }
         }
       }
       if ($all_messages) {
-        $build['query_messages'] = array(
+        $build['query_messages'] = [
           '#type' => 'container',
           '#children' => $all_messages,
-          '#attributes' => array('class' => array('update-results')),
+          '#attributes' => ['class' => ['update-results']],
           '#prefix' => '<h2>' . $this->t('The following updates returned messages:') . '</h2>',
-        );
+        ];
       }
     }
     unset($_SESSION['update_results']);
@@ -515,17 +515,17 @@ class DbUpdateController extends ControllerBase {
    *   A render array.
    */
   public function requirements($severity, array $requirements, Request $request) {
-    $options = $severity == REQUIREMENT_WARNING ? array('continue' => 1) : array();
+    $options = $severity == REQUIREMENT_WARNING ? ['continue' => 1] : [];
     // @todo Revisit once https://www.drupal.org/node/2548095 is in. Something
     // like Url::fromRoute('system.db_update')->setOptions() should then be
     // possible.
     $try_again_url = Url::fromUri($request->getUriForPath(''))->setOptions(['query' => $options])->toString(TRUE)->getGeneratedUrl();
 
-    $build['status_report'] = array(
-      '#theme' => 'status_report',
+    $build['status_report'] = [
+      '#type' => 'status_report',
       '#requirements' => $requirements,
-      '#suffix' => $this->t('Check the messages and <a href=":url">try again</a>.', array(':url' => $try_again_url))
-    );
+      '#suffix' => $this->t('Check the messages and <a href=":url">try again</a>.', [':url' => $try_again_url])
+    ];
 
     $build['#title'] = $this->t('Requirements problem');
     return $build;
@@ -543,19 +543,19 @@ class DbUpdateController extends ControllerBase {
    */
   protected function updateTasksList($active = NULL) {
     // Default list of tasks.
-    $tasks = array(
+    $tasks = [
       'requirements' => $this->t('Verify requirements'),
       'info' => $this->t('Overview'),
       'selection' => $this->t('Review updates'),
       'run' => $this->t('Run updates'),
       'results' => $this->t('Review log'),
-    );
+    ];
 
-    $task_list = array(
+    $task_list = [
       '#theme' => 'maintenance_task_list',
       '#items' => $tasks,
       '#active' => $active,
-    );
+    ];
     return $task_list;
   }
 
@@ -576,7 +576,7 @@ class DbUpdateController extends ControllerBase {
       $this->state->set('system.maintenance_mode', TRUE);
     }
 
-    $operations = array();
+    $operations = [];
 
     // Resolve any update dependencies to determine the actual updates that will
     // be run and the order they will be run in.
@@ -587,9 +587,9 @@ class DbUpdateController extends ControllerBase {
     // batch API can pass in to the batch operation each time it is called. (We
     // do not store the entire update dependency array here because it is
     // potentially very large.)
-    $dependency_map = array();
+    $dependency_map = [];
     foreach ($updates as $function => $update) {
-      $dependency_map[$function] = !empty($update['reverse_paths']) ? array_keys($update['reverse_paths']) : array();
+      $dependency_map[$function] = !empty($update['reverse_paths']) ? array_keys($update['reverse_paths']) : [];
     }
 
     // Determine updates to be performed.
@@ -602,7 +602,7 @@ class DbUpdateController extends ControllerBase {
           drupal_set_installed_schema_version($update['module'], $update['number'] - 1);
           unset($start[$update['module']]);
         }
-        $operations[] = array('update_do_one', array($update['module'], $update['number'], $dependency_map[$function]));
+        $operations[] = ['update_do_one', [$update['module'], $update['number'], $dependency_map[$function]]];
       }
     }
 
@@ -618,12 +618,12 @@ class DbUpdateController extends ControllerBase {
     }
 
     $batch['operations'] = $operations;
-    $batch += array(
+    $batch += [
       'title' => $this->t('Updating'),
       'init_message' => $this->t('Starting updates'),
       'error_message' => $this->t('An unrecoverable error has occurred. You can find the error message below. It is advised to copy it to the clipboard for reference.'),
-      'finished' => array('\Drupal\system\Controller\DbUpdateController', 'batchFinished'),
-    );
+      'finished' => ['\Drupal\system\Controller\DbUpdateController', 'batchFinished'],
+    ];
     batch_set($batch);
 
     // @todo Revisit once https://www.drupal.org/node/2548095 is in.
@@ -673,15 +673,15 @@ class DbUpdateController extends ControllerBase {
   protected function helpfulLinks(Request $request) {
     // @todo Simplify with https://www.drupal.org/node/2548095
     $base_url = str_replace('/update.php', '', $request->getBaseUrl());
-    $links['front'] = array(
+    $links['front'] = [
       'title' => $this->t('Front page'),
       'url' => Url::fromRoute('<front>')->setOption('base_url', $base_url),
-    );
+    ];
     if ($this->account->hasPermission('access administration pages')) {
-      $links['admin-pages'] = array(
+      $links['admin-pages'] = [
         'title' => $this->t('Administration pages'),
         'url' => Url::fromRoute('system.admin')->setOption('base_url', $base_url),
-      );
+      ];
     }
     return $links;
   }
@@ -693,7 +693,7 @@ class DbUpdateController extends ControllerBase {
    *   The module updates that can be performed.
    */
   protected function getModuleUpdates() {
-    $return = array();
+    $return = [];
     $updates = update_get_update_list();
     foreach ($updates as $module => $update) {
       $return[$module] = $update['start'];
diff --git a/web/core/modules/system/src/Controller/EntityAutocompleteController.php b/web/core/modules/system/src/Controller/EntityAutocompleteController.php
index 53ec818f3..974c2ded3 100644
--- a/web/core/modules/system/src/Controller/EntityAutocompleteController.php
+++ b/web/core/modules/system/src/Controller/EntityAutocompleteController.php
@@ -77,7 +77,7 @@ class EntityAutocompleteController extends ControllerBase {
    *   or if it does not match the stored data.
    */
   public function handleAutocomplete(Request $request, $target_type, $selection_handler, $selection_settings_key) {
-    $matches = array();
+    $matches = [];
     // Get the typed string from the URL, if it exists.
     if ($input = $request->query->get('q')) {
       $typed_string = Tags::explode($input);
diff --git a/web/core/modules/system/src/Controller/Http4xxController.php b/web/core/modules/system/src/Controller/Http4xxController.php
index 3724901ca..f8c97e4f5 100644
--- a/web/core/modules/system/src/Controller/Http4xxController.php
+++ b/web/core/modules/system/src/Controller/Http4xxController.php
@@ -25,7 +25,7 @@ class Http4xxController extends ControllerBase {
    * The default 403 content.
    *
    * @return array
-   *   A render array containing the message to display for 404 pages.
+   *   A render array containing the message to display for 403 pages.
    */
   public function on403() {
     return [
diff --git a/web/core/modules/system/src/Controller/SystemController.php b/web/core/modules/system/src/Controller/SystemController.php
index 41ed82469..4af1dcb85 100644
--- a/web/core/modules/system/src/Controller/SystemController.php
+++ b/web/core/modules/system/src/Controller/SystemController.php
@@ -4,7 +4,6 @@ namespace Drupal\system\Controller;
 
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Extension\ThemeHandlerInterface;
 use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Menu\MenuLinkTreeInterface;
@@ -19,13 +18,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class SystemController extends ControllerBase {
 
-  /**
-   * The entity query factory object.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
-
   /**
    * System Manager Service.
    *
@@ -66,8 +58,6 @@ class SystemController extends ControllerBase {
    *
    * @param \Drupal\system\SystemManager $systemManager
    *   System manager service.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $queryFactory
-   *   The entity query object.
    * @param \Drupal\Core\Theme\ThemeAccessCheck $theme_access
    *   The theme access checker service.
    * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
@@ -77,9 +67,8 @@ class SystemController extends ControllerBase {
    * @param \Drupal\Core\Menu\MenuLinkTreeInterface $menu_link_tree
    *   The menu link tree service.
    */
-  public function __construct(SystemManager $systemManager, QueryFactory $queryFactory, ThemeAccessCheck $theme_access, FormBuilderInterface $form_builder, ThemeHandlerInterface $theme_handler, MenuLinkTreeInterface $menu_link_tree) {
+  public function __construct(SystemManager $systemManager, ThemeAccessCheck $theme_access, FormBuilderInterface $form_builder, ThemeHandlerInterface $theme_handler, MenuLinkTreeInterface $menu_link_tree) {
     $this->systemManager = $systemManager;
-    $this->queryFactory = $queryFactory;
     $this->themeAccess = $theme_access;
     $this->formBuilder = $form_builder;
     $this->themeHandler = $theme_handler;
@@ -92,7 +81,6 @@ class SystemController extends ControllerBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('system.manager'),
-      $container->get('entity.query'),
       $container->get('access_check.theme'),
       $container->get('form_builder'),
       $container->get('theme_handler'),
@@ -112,19 +100,19 @@ class SystemController extends ControllerBase {
   public function overview($link_id) {
     // Check for status report errors.
     if ($this->systemManager->checkRequirements() && $this->currentUser()->hasPermission('administer site configuration')) {
-      drupal_set_message($this->t('One or more problems were detected with your Drupal installation. Check the <a href=":status">status report</a> for more information.', array(':status' => $this->url('system.status'))), 'error');
+      drupal_set_message($this->t('One or more problems were detected with your Drupal installation. Check the <a href=":status">status report</a> for more information.', [':status' => $this->url('system.status')]), 'error');
     }
     // Load all menu links below it.
     $parameters = new MenuTreeParameters();
     $parameters->setRoot($link_id)->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks();
     $tree = $this->menuLinkTree->load(NULL, $parameters);
-    $manipulators = array(
-      array('callable' => 'menu.default_tree_manipulators:checkAccess'),
-      array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
-    );
+    $manipulators = [
+      ['callable' => 'menu.default_tree_manipulators:checkAccess'],
+      ['callable' => 'menu.default_tree_manipulators:generateIndexAndSort'],
+    ];
     $tree = $this->menuLinkTree->transform($tree, $manipulators);
     $tree_access_cacheability = new CacheableMetadata();
-    $blocks = array();
+    $blocks = [];
     foreach ($tree as $key => $element) {
       $tree_access_cacheability = $tree_access_cacheability->merge(CacheableMetadata::createFromObject($element->access));
 
@@ -136,10 +124,10 @@ class SystemController extends ControllerBase {
       $link = $element->link;
       $block['title'] = $link->getTitle();
       $block['description'] = $link->getDescription();
-      $block['content'] = array(
+      $block['content'] = [
         '#theme' => 'admin_block_content',
         '#content' => $this->systemManager->getAdminBlock($link),
-      );
+      ];
 
       if (!empty($block['content']['#content'])) {
         $blocks[$key] = $block;
@@ -173,7 +161,7 @@ class SystemController extends ControllerBase {
    * @return \Symfony\Component\HttpFoundation\RedirectResponse
    */
   public function compactPage($mode) {
-    user_cookie_save(array('admin_compact_mode' => ($mode == 'on')));
+    user_cookie_save(['admin_compact_mode' => ($mode == 'on')]);
     return $this->redirect('<front>');
   }
 
@@ -199,9 +187,9 @@ class SystemController extends ControllerBase {
     uasort($themes, 'system_sort_modules_by_info_name');
 
     $theme_default = $config->get('default');
-    $theme_groups  = array('installed' => array(), 'uninstalled' => array());
+    $theme_groups  = ['installed' => [], 'uninstalled' => []];
     $admin_theme = $config->get('admin');
-    $admin_theme_options = array();
+    $admin_theme_options = [];
 
     foreach ($themes as &$theme) {
       if (!empty($theme->info['hidden'])) {
@@ -218,17 +206,17 @@ class SystemController extends ControllerBase {
         $theme_keys[] = $theme->getName();
       }
       else {
-        $theme_keys = array($theme->getName());
+        $theme_keys = [$theme->getName()];
       }
       // Look for a screenshot in the current theme or in its closest ancestor.
       foreach (array_reverse($theme_keys) as $theme_key) {
         if (isset($themes[$theme_key]) && file_exists($themes[$theme_key]->info['screenshot'])) {
-          $theme->screenshot = array(
+          $theme->screenshot = [
             'uri' => $themes[$theme_key]->info['screenshot'],
-            'alt' => $this->t('Screenshot for @theme theme', array('@theme' => $theme->info['name'])),
-            'title' => $this->t('Screenshot for @theme theme', array('@theme' => $theme->info['name'])),
-            'attributes' => array('class' => array('screenshot')),
-          );
+            'alt' => $this->t('Screenshot for @theme theme', ['@theme' => $theme->info['name']]),
+            'title' => $this->t('Screenshot for @theme theme', ['@theme' => $theme->info['name']]),
+            'attributes' => ['class' => ['screenshot']],
+          ];
           break;
         }
       }
@@ -245,16 +233,16 @@ class SystemController extends ControllerBase {
         // Confirm that the theme engine is available.
         $theme->incompatible_engine = isset($theme->info['engine']) && !isset($theme->owner);
       }
-      $theme->operations = array();
+      $theme->operations = [];
       if (!empty($theme->status) || !$theme->incompatible_core && !$theme->incompatible_php && !$theme->incompatible_base && !$theme->incompatible_engine) {
         // Create the operations links.
         $query['theme'] = $theme->getName();
         if ($this->themeAccess->checkAccess($theme->getName())) {
-          $theme->operations[] = array(
+          $theme->operations[] = [
             'title' => $this->t('Settings'),
             'url' => Url::fromRoute('system.theme_settings_theme', ['theme' => $theme->getName()]),
-            'attributes' => array('title' => $this->t('Settings for @theme theme', array('@theme' => $theme->info['name']))),
-          );
+            'attributes' => ['title' => $this->t('Settings for @theme theme', ['@theme' => $theme->info['name']])],
+          ];
         }
         if (!empty($theme->status)) {
           if (!$theme->is_default) {
@@ -269,40 +257,40 @@ class SystemController extends ControllerBase {
               }
             }
             if ($theme_uninstallable) {
-              $theme->operations[] = array(
+              $theme->operations[] = [
                 'title' => $this->t('Uninstall'),
                 'url' => Url::fromRoute('system.theme_uninstall'),
                 'query' => $query,
-                'attributes' => array('title' => $this->t('Uninstall @theme theme', array('@theme' => $theme->info['name']))),
-              );
+                'attributes' => ['title' => $this->t('Uninstall @theme theme', ['@theme' => $theme->info['name']])],
+              ];
             }
-            $theme->operations[] = array(
+            $theme->operations[] = [
               'title' => $this->t('Set as default'),
               'url' => Url::fromRoute('system.theme_set_default'),
               'query' => $query,
-              'attributes' => array('title' => $this->t('Set @theme as default theme', array('@theme' => $theme->info['name']))),
-            );
+              'attributes' => ['title' => $this->t('Set @theme as default theme', ['@theme' => $theme->info['name']])],
+            ];
           }
           $admin_theme_options[$theme->getName()] = $theme->info['name'];
         }
         else {
-          $theme->operations[] = array(
+          $theme->operations[] = [
             'title' => $this->t('Install'),
             'url' => Url::fromRoute('system.theme_install'),
             'query' => $query,
-            'attributes' => array('title' => $this->t('Install @theme theme', array('@theme' => $theme->info['name']))),
-          );
-          $theme->operations[] = array(
+            'attributes' => ['title' => $this->t('Install @theme theme', ['@theme' => $theme->info['name']])],
+          ];
+          $theme->operations[] = [
             'title' => $this->t('Install and set as default'),
             'url' => Url::fromRoute('system.theme_set_default'),
             'query' => $query,
-            'attributes' => array('title' => $this->t('Install @theme as default theme', array('@theme' => $theme->info['name']))),
-          );
+            'attributes' => ['title' => $this->t('Install @theme as default theme', ['@theme' => $theme->info['name']])],
+          ];
         }
       }
 
       // Add notes to default and administration theme.
-      $theme->notes = array();
+      $theme->notes = [];
       if ($theme->is_default) {
         $theme->notes[] = $this->t('default theme');
       }
@@ -315,9 +303,9 @@ class SystemController extends ControllerBase {
     }
 
     // There are two possible theme groups.
-    $theme_group_titles = array(
+    $theme_group_titles = [
       'installed' => $this->formatPlural(count($theme_groups['installed']), 'Installed theme', 'Installed themes'),
-    );
+    ];
     if (!empty($theme_groups['uninstalled'])) {
       $theme_group_titles['uninstalled'] = $this->formatPlural(count($theme_groups['uninstalled']), 'Uninstalled theme', 'Uninstalled themes');
     }
@@ -325,12 +313,12 @@ class SystemController extends ControllerBase {
     uasort($theme_groups['installed'], 'system_sort_themes');
     $this->moduleHandler()->alter('system_themes_page', $theme_groups);
 
-    $build = array();
-    $build[] = array(
+    $build = [];
+    $build[] = [
       '#theme' => 'system_themes_page',
       '#theme_groups' => $theme_groups,
       '#theme_group_titles' => $theme_group_titles,
-    );
+    ];
     $build[] = $this->formBuilder->getForm('Drupal\system\Form\ThemeAdminForm', $admin_theme_options);
 
     return $build;
diff --git a/web/core/modules/system/src/Controller/SystemInfoController.php b/web/core/modules/system/src/Controller/SystemInfoController.php
index aa9f14045..76c2c7a37 100644
--- a/web/core/modules/system/src/Controller/SystemInfoController.php
+++ b/web/core/modules/system/src/Controller/SystemInfoController.php
@@ -47,7 +47,7 @@ class SystemInfoController implements ContainerInjectionInterface {
    */
   public function status() {
     $requirements = $this->systemManager->listRequirements();
-    return array('#theme' => 'status_report', '#requirements' => $requirements);
+    return ['#type' => 'status_report_page', '#requirements' => $requirements];
   }
 
   /**
@@ -63,7 +63,7 @@ class SystemInfoController implements ContainerInjectionInterface {
       $output = ob_get_clean();
     }
     else {
-      $output = t('The phpinfo() function has been disabled for security reasons. For more information, visit <a href=":phpinfo">Enabling and disabling phpinfo()</a> handbook page.', array(':phpinfo' => 'https://www.drupal.org/node/243993'));
+      $output = t('The phpinfo() function has been disabled for security reasons. For more information, visit <a href=":phpinfo">Enabling and disabling phpinfo()</a> handbook page.', [':phpinfo' => 'https://www.drupal.org/node/243993']);
     }
     return new Response($output);
   }
diff --git a/web/core/modules/system/src/Controller/ThemeController.php b/web/core/modules/system/src/Controller/ThemeController.php
index e1353561d..9160085be 100644
--- a/web/core/modules/system/src/Controller/ThemeController.php
+++ b/web/core/modules/system/src/Controller/ThemeController.php
@@ -71,15 +71,15 @@ class ThemeController extends ControllerBase {
       if (!empty($themes[$theme])) {
         // Do not uninstall the default or admin theme.
         if ($theme === $config->get('default') || $theme === $config->get('admin')) {
-          drupal_set_message($this->t('%theme is the default theme and cannot be uninstalled.', array('%theme' => $themes[$theme]->info['name'])), 'error');
+          drupal_set_message($this->t('%theme is the default theme and cannot be uninstalled.', ['%theme' => $themes[$theme]->info['name']]), 'error');
         }
         else {
-          $this->themeHandler->uninstall(array($theme));
-          drupal_set_message($this->t('The %theme theme has been uninstalled.', array('%theme' => $themes[$theme]->info['name'])));
+          $this->themeHandler->uninstall([$theme]);
+          drupal_set_message($this->t('The %theme theme has been uninstalled.', ['%theme' => $themes[$theme]->info['name']]));
         }
       }
       else {
-        drupal_set_message($this->t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
+        drupal_set_message($this->t('The %theme theme was not found.', ['%theme' => $theme]), 'error');
       }
 
       return $this->redirect('system.themes_page');
@@ -106,12 +106,12 @@ class ThemeController extends ControllerBase {
 
     if (isset($theme)) {
       try {
-        if ($this->themeHandler->install(array($theme))) {
+        if ($this->themeHandler->install([$theme])) {
           $themes = $this->themeHandler->listInfo();
-          drupal_set_message($this->t('The %theme theme has been installed.', array('%theme' => $themes[$theme]->info['name'])));
+          drupal_set_message($this->t('The %theme theme has been installed.', ['%theme' => $themes[$theme]->info['name']]));
         }
         else {
-          drupal_set_message($this->t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
+          drupal_set_message($this->t('The %theme theme was not found.', ['%theme' => $theme]), 'error');
         }
       }
       catch (PreExistingConfigException $e) {
@@ -121,10 +121,10 @@ class ThemeController extends ControllerBase {
             count($config_objects),
             'Unable to install @extension, %config_names already exists in active configuration.',
             'Unable to install @extension, %config_names already exist in active configuration.',
-            array(
+            [
               '%config_names' => implode(', ', $config_objects),
               '@extension' => $theme,
-            )),
+            ]),
           'error'
         );
       }
@@ -160,7 +160,7 @@ class ThemeController extends ControllerBase {
 
       // Check if the specified theme is one recognized by the system.
       // Or try to install the theme.
-      if (isset($themes[$theme]) || $this->themeHandler->install(array($theme))) {
+      if (isset($themes[$theme]) || $this->themeHandler->install([$theme])) {
         $themes = $this->themeHandler->listInfo();
 
         // Set the default theme.
@@ -171,17 +171,17 @@ class ThemeController extends ControllerBase {
         // theme.
         $admin_theme = $config->get('admin');
         if ($admin_theme != 0 && $admin_theme != $theme) {
-          drupal_set_message($this->t('Please note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', array(
+          drupal_set_message($this->t('Please note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', [
             '%admin_theme' => $themes[$admin_theme]->info['name'],
             '%selected_theme' => $themes[$theme]->info['name'],
-          )));
+          ]));
         }
         else {
-          drupal_set_message($this->t('%theme is now the default theme.', array('%theme' => $themes[$theme]->info['name'])));
+          drupal_set_message($this->t('%theme is now the default theme.', ['%theme' => $themes[$theme]->info['name']]));
         }
       }
       else {
-        drupal_set_message($this->t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
+        drupal_set_message($this->t('The %theme theme was not found.', ['%theme' => $theme]), 'error');
       }
 
       return $this->redirect('system.themes_page');
diff --git a/web/core/modules/system/src/DateFormatAccessControlHandler.php b/web/core/modules/system/src/DateFormatAccessControlHandler.php
index 597d6cdbb..c9cee601e 100644
--- a/web/core/modules/system/src/DateFormatAccessControlHandler.php
+++ b/web/core/modules/system/src/DateFormatAccessControlHandler.php
@@ -23,7 +23,7 @@ class DateFormatAccessControlHandler extends EntityAccessControlHandler {
       return AccessResult::allowed();
     }
     // Locked date formats cannot be updated or deleted.
-    elseif (in_array($operation, array('update', 'delete'))) {
+    elseif (in_array($operation, ['update', 'delete'])) {
       if ($entity->isLocked()) {
         return AccessResult::forbidden()->addCacheableDependency($entity);
       }
diff --git a/web/core/modules/system/src/Element/StatusReportPage.php b/web/core/modules/system/src/Element/StatusReportPage.php
new file mode 100644
index 000000000..5d2f98530
--- /dev/null
+++ b/web/core/modules/system/src/Element/StatusReportPage.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Drupal\system\Element;
+
+use Drupal\Core\Render\Element\RenderElement;
+use Drupal\Core\Render\Element\StatusReport;
+use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
+
+/**
+ * Creates status report page element.
+ *
+ * @RenderElement("status_report_page")
+ */
+class StatusReportPage extends RenderElement {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInfo() {
+    $class = get_class($this);
+    return [
+      '#theme' => 'status_report_page',
+      '#pre_render' => [
+        [$class, 'preRenderCounters'],
+        [$class, 'preRenderGeneralInfo'],
+        [$class, 'preRenderRequirements'],
+      ],
+    ];
+  }
+
+  /**
+   * #pre_render callback to get general info out of requirements.
+   */
+  public static function preRenderGeneralInfo($element) {
+    $element['#general_info'] = [
+      '#theme' => 'status_report_general_info',
+    ];
+    // Loop through requirements and pull out items.
+    foreach ($element['#requirements'] as $key => $requirement) {
+      switch ($key) {
+        case 'cron':
+          foreach ($requirement['description'] as &$description_elements) {
+            foreach ($description_elements as &$description_element) {
+              if (isset($description_element['#url']) && $description_element['#url']->getRouteName() == 'system.run_cron') {
+                $description_element['#attributes']['class'][] = 'button';
+                $description_element['#attributes']['class'][] = 'button--small';
+                $description_element['#attributes']['class'][] = 'button--primary';
+                $description_element['#attributes']['class'][] = 'system-status-general-info__run-cron';
+              }
+            }
+          }
+          $element['#general_info']['#' . $key] = $requirement;
+          unset($element['#requirements'][$key]);
+          break;
+
+        case 'drupal':
+        case 'webserver':
+        case 'database_system':
+        case 'database_system_version':
+        case 'php':
+        case 'php_memory_limit':
+          $element['#general_info']['#' . $key] = $requirement;
+          unset($element['#requirements'][$key]);
+          break;
+      }
+    }
+
+    return $element;
+  }
+
+  /**
+   * #pre_render callback to create counter elements.
+   */
+  public static function preRenderCounters($element) {
+    // Count number of items with different severity for summary.
+    $counters = [
+      'error' => [
+        'amount' => 0,
+        'text' => t('Error'),
+        'text_plural' => t('Errors'),
+      ],
+      'warning' => [
+        'amount' => 0,
+        'text' => t('Warning'),
+        'text_plural' => t('Warnings'),
+      ],
+      'checked' => [
+        'amount' => 0,
+        'text' => t('Checked'),
+        'text_plural' => t('Checked'),
+      ],
+    ];
+
+    $severities = StatusReport::getSeverities();
+    foreach ($element['#requirements'] as $key => &$requirement) {
+      $severity = $severities[REQUIREMENT_INFO];
+      if (isset($requirement['severity'])) {
+        $severity = $severities[(int) $requirement['severity']];
+      }
+      elseif (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') {
+        $severity = $severities[REQUIREMENT_OK];
+      }
+
+      if (isset($counters[$severity['status']])) {
+        $counters[$severity['status']]['amount']++;
+      }
+    }
+
+    foreach ($counters as $key => $counter) {
+      if ($counter['amount'] === 0) {
+        continue;
+      }
+
+      $text = new PluralTranslatableMarkup($counter['amount'], $counter['text'], $counter['text_plural']);
+
+      $element['#counters'][$key] = [
+        '#theme' => 'status_report_counter',
+        '#amount' => $counter['amount'],
+        '#text' => $text,
+        '#severity' => $key,
+      ];
+    }
+
+    return $element;
+  }
+
+  /**
+   * #pre_render callback to create status report requirements.
+   */
+  public static function preRenderRequirements($element) {
+    $element['#requirements'] = [
+      '#type' => 'status_report',
+      '#requirements' => $element['#requirements'],
+    ];
+
+    return $element;
+  }
+
+}
diff --git a/web/core/modules/system/src/Entity/Action.php b/web/core/modules/system/src/Entity/Action.php
index 9b27616eb..a4128384e 100644
--- a/web/core/modules/system/src/Entity/Action.php
+++ b/web/core/modules/system/src/Entity/Action.php
@@ -57,7 +57,7 @@ class Action extends ConfigEntityBase implements ActionConfigEntityInterface, En
    *
    * @var array
    */
-  protected $configuration = array();
+  protected $configuration = [];
 
   /**
    * The plugin ID of the action.
@@ -90,7 +90,7 @@ class Action extends ConfigEntityBase implements ActionConfigEntityInterface, En
    * {@inheritdoc}
    */
   public function getPluginCollections() {
-    return array('configuration' => $this->getPluginCollection());
+    return ['configuration' => $this->getPluginCollection()];
   }
 
   /**
diff --git a/web/core/modules/system/src/EventSubscriber/AdminRouteSubscriber.php b/web/core/modules/system/src/EventSubscriber/AdminRouteSubscriber.php
index 33eab0223..b83fe7e13 100644
--- a/web/core/modules/system/src/EventSubscriber/AdminRouteSubscriber.php
+++ b/web/core/modules/system/src/EventSubscriber/AdminRouteSubscriber.php
@@ -31,7 +31,7 @@ class AdminRouteSubscriber extends RouteSubscriberBase {
     // Use a lower priority than \Drupal\field_ui\Routing\RouteSubscriber or
     // \Drupal\views\EventSubscriber\RouteSubscriber to ensure we add the option
     // to their routes.
-    $events[RoutingEvents::ALTER] = array('onAlterRoutes', -200);
+    $events[RoutingEvents::ALTER] = ['onAlterRoutes', -200];
 
     return $events;
   }
diff --git a/web/core/modules/system/src/FileDownloadController.php b/web/core/modules/system/src/FileDownloadController.php
index 8c95de2c9..08b1632b2 100644
--- a/web/core/modules/system/src/FileDownloadController.php
+++ b/web/core/modules/system/src/FileDownloadController.php
@@ -45,7 +45,7 @@ class FileDownloadController extends ControllerBase {
 
     if (file_stream_wrapper_valid_scheme($scheme) && file_exists($uri)) {
       // Let other modules provide headers and controls access to the file.
-      $headers = $this->moduleHandler()->invokeAll('file_download', array($uri));
+      $headers = $this->moduleHandler()->invokeAll('file_download', [$uri]);
 
       foreach ($headers as $result) {
         if ($result == -1) {
diff --git a/web/core/modules/system/src/Form/CronForm.php b/web/core/modules/system/src/Form/CronForm.php
index af1623e96..d4726aac5 100644
--- a/web/core/modules/system/src/Form/CronForm.php
+++ b/web/core/modules/system/src/Form/CronForm.php
@@ -10,11 +10,13 @@ use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\State\StateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Form\ConfigFormBaseTrait;
 
 /**
  * Configure cron settings for this site.
  */
 class CronForm extends FormBase {
+  use ConfigFormBaseTrait;
 
   /**
    * Stores the state storage service.
@@ -65,6 +67,13 @@ class CronForm extends FormBase {
     $this->moduleHandler = $module_handler;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEditableConfigNames() {
+    return ['system.cron'];
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -89,29 +98,49 @@ class CronForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['description'] = array(
+    $form['description'] = [
       '#markup' => '<p>' . t('Cron takes care of running periodic tasks like checking for updates and indexing content for search.') . '</p>',
-    );
-    $form['run'] = array(
+    ];
+    $form['run'] = [
       '#type' => 'submit',
       '#value' => t('Run cron'),
-    );
-    $status = '<p>' . $this->t('Last run: %time ago.', array('%time' => $this->dateFormatter->formatTimeDiffSince($this->state->get('system.cron_last')))) . '</p>';
-    $form['status'] = array(
+    ];
+    $status = '<p>' . $this->t('Last run: %time ago.', ['%time' => $this->dateFormatter->formatTimeDiffSince($this->state->get('system.cron_last'))]) . '</p>';
+    $form['status'] = [
       '#markup' => $status,
-    );
+    ];
 
-    $cron_url = $this->url('system.cron', array('key' => $this->state->get('system.cron_key')), array('absolute' => TRUE));
-    $form['cron_url'] = array(
-      '#markup' => '<p>' . t('To run cron from outside the site, go to <a href=":cron">@cron</a>', array(':cron' => $cron_url, '@cron' => $cron_url)) . '</p>',
-    );
+    $cron_url = $this->url('system.cron', ['key' => $this->state->get('system.cron_key')], ['absolute' => TRUE]);
+    $form['cron_url'] = [
+      '#markup' => '<p>' . t('To run cron from outside the site, go to <a href=":cron">@cron</a>', [':cron' => $cron_url, '@cron' => $cron_url]) . '</p>',
+    ];
 
     if (!$this->moduleHandler->moduleExists('automated_cron')) {
-      $form['cron'] = array(
+      $form['automated_cron'] = [
         '#markup' => $this->t('Enable the <em>Automated Cron</em> module to allow cron execution at the end of a server response.'),
-      );
+      ];
     }
 
+    $form['cron'] = [
+      '#title' => t('Cron settings'),
+      '#type' => 'details',
+      '#open' => TRUE,
+    ];
+
+    $form['cron']['logging'] = [
+      '#type' => 'checkbox',
+      '#title' => t('Detailed cron logging'),
+      '#default_value' => $this->config('system.cron')->get('logging'),
+      '#description' => 'Run times of individual cron jobs will be written to watchdog',
+    ];
+
+    $form['actions']['#type'] = 'actions';
+    $form['actions']['submit'] = [
+      '#type' => 'submit',
+      '#value' => t('Save configuration'),
+      '#button_type' => 'primary',
+    ];
+
     return $form;
   }
 
@@ -119,6 +148,11 @@ class CronForm extends FormBase {
    * Runs cron and reloads the page.
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->config('system.cron')
+      ->set('logging', $form_state->getValue('logging'))
+      ->save();
+    drupal_set_message(t('The configuration options have been saved.'));
+
     // Run cron manually from Cron form.
     if ($this->cron->run()) {
       drupal_set_message(t('Cron ran successfully.'));
diff --git a/web/core/modules/system/src/Form/DateFormatDeleteForm.php b/web/core/modules/system/src/Form/DateFormatDeleteForm.php
index a8e1c0413..901c34b1a 100644
--- a/web/core/modules/system/src/Form/DateFormatDeleteForm.php
+++ b/web/core/modules/system/src/Form/DateFormatDeleteForm.php
@@ -41,9 +41,9 @@ class DateFormatDeleteForm extends EntityDeleteForm {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return t('Are you sure you want to delete the format %name : %format?', array(
+    return t('Are you sure you want to delete the format %name : %format?', [
       '%name' => $this->entity->label(),
-      '%format' => $this->dateFormatter->format(REQUEST_TIME, $this->entity->id()))
+      '%format' => $this->dateFormatter->format(REQUEST_TIME, $this->entity->id())]
     );
   }
 
diff --git a/web/core/modules/system/src/Form/DateFormatEditForm.php b/web/core/modules/system/src/Form/DateFormatEditForm.php
index cec00208a..c63c0d7ac 100644
--- a/web/core/modules/system/src/Form/DateFormatEditForm.php
+++ b/web/core/modules/system/src/Form/DateFormatEditForm.php
@@ -15,7 +15,7 @@ class DateFormatEditForm extends DateFormatFormBase {
   public function form(array $form, FormStateInterface $form_state) {
     $form = parent::form($form, $form_state);
 
-    $now = t('Displayed as %date', array('%date' => $this->dateFormatter->format(REQUEST_TIME, $this->entity->id())));
+    $now = t('Displayed as %date', ['%date' => $this->dateFormatter->format(REQUEST_TIME, $this->entity->id())]);
     $form['date_format_pattern']['#field_suffix'] = ' <small data-drupal-date-formatter="preview">' . $now . '</small>';
     $form['date_format_pattern']['#default_value'] = $this->entity->getPattern();
 
diff --git a/web/core/modules/system/src/Form/DateFormatFormBase.php b/web/core/modules/system/src/Form/DateFormatFormBase.php
index adb24fa42..ed6714fc6 100644
--- a/web/core/modules/system/src/Form/DateFormatFormBase.php
+++ b/web/core/modules/system/src/Form/DateFormatFormBase.php
@@ -76,26 +76,26 @@ abstract class DateFormatFormBase extends EntityForm {
    * {@inheritdoc}
    */
   public function form(array $form, FormStateInterface $form_state) {
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => 'Name',
       '#maxlength' => 100,
       '#description' => t('Name of the date format'),
       '#default_value' => $this->entity->label(),
-    );
+    ];
 
-    $form['id'] = array(
+    $form['id'] = [
       '#type' => 'machine_name',
       '#description' => t('A unique machine-readable name. Can only contain lowercase letters, numbers, and underscores.'),
       '#disabled' => !$this->entity->isNew(),
       '#default_value' => $this->entity->id(),
-      '#machine_name' => array(
-        'exists' => array($this, 'exists'),
+      '#machine_name' => [
+        'exists' => [$this, 'exists'],
         'replace_pattern' => '([^a-z0-9_]+)|(^custom$)',
         'error' => $this->t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores. Additionally, it can not be the reserved word "custom".'),
-      ),
-    );
-    $form['date_format_pattern'] = array(
+      ],
+    ];
+    $form['date_format_pattern'] = [
       '#type' => 'textfield',
       '#title' => t('Format string'),
       '#maxlength' => 100,
@@ -105,14 +105,14 @@ abstract class DateFormatFormBase extends EntityForm {
         'data-drupal-date-formatter' => 'source',
       ],
       '#field_suffix' => ' <small class="js-hide" data-drupal-date-formatter="preview">' . $this->t('Displayed as %date_format', ['%date_format' => '']) . '</small>',
-    );
+    ];
 
-    $form['langcode'] = array(
+    $form['langcode'] = [
       '#type' => 'language_select',
       '#title' => t('Language'),
       '#languages' => LanguageInterface::STATE_ALL,
       '#default_value' => $this->entity->language()->getId(),
-    );
+    ];
     $form['#attached']['drupalSettings']['dateFormats'] = $this->dateFormatter->getSampleDateFormats();
     $form['#attached']['library'][] = 'system/drupal.system.date';
     return parent::form($form, $form_state);
diff --git a/web/core/modules/system/src/Form/FileSystemForm.php b/web/core/modules/system/src/Form/FileSystemForm.php
index 9271bf453..ff0b79243 100644
--- a/web/core/modules/system/src/Form/FileSystemForm.php
+++ b/web/core/modules/system/src/Form/FileSystemForm.php
@@ -77,59 +77,59 @@ class FileSystemForm extends ConfigFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $config = $this->config('system.file');
-    $form['file_public_path'] = array(
+    $form['file_public_path'] = [
       '#type' => 'item',
       '#title' => t('Public file system path'),
       '#markup' => PublicStream::basePath(),
       '#description' => t('A local file system path where public files will be stored. This directory must exist and be writable by Drupal. This directory must be relative to the Drupal installation directory and be accessible over the web. This must be changed in settings.php'),
-    );
+    ];
 
-    $form['file_public_base_url'] = array(
+    $form['file_public_base_url'] = [
       '#type' => 'item',
       '#title' => t('Public file base URL'),
       '#markup' => PublicStream::baseUrl(),
       '#description' => t('The base URL that will be used for public file URLs. This can be changed in settings.php'),
-    );
+    ];
 
-    $form['file_private_path'] = array(
+    $form['file_private_path'] = [
       '#type' => 'item',
       '#title' => t('Private file system path'),
       '#markup' => (PrivateStream::basePath() ? PrivateStream::basePath() : t('Not set')),
       '#description' => t('An existing local file system path for storing private files. It should be writable by Drupal and not accessible over the web. This must be changed in settings.php'),
-    );
+    ];
 
-    $form['file_temporary_path'] = array(
+    $form['file_temporary_path'] = [
       '#type' => 'textfield',
       '#title' => t('Temporary directory'),
       '#default_value' => $config->get('path.temporary'),
       '#maxlength' => 255,
       '#description' => t('A local file system path where temporary files will be stored. This directory should not be accessible over the web.'),
-      '#after_build' => array('system_check_directory'),
-    );
+      '#after_build' => ['system_check_directory'],
+    ];
     // Any visible, writeable wrapper can potentially be used for the files
     // directory, including a remote file system that integrates with a CDN.
     $options = $this->streamWrapperManager->getDescriptions(StreamWrapperInterface::WRITE_VISIBLE);
 
     if (!empty($options)) {
-      $form['file_default_scheme'] = array(
+      $form['file_default_scheme'] = [
         '#type' => 'radios',
         '#title' => t('Default download method'),
         '#default_value' => $config->get('default_scheme'),
         '#options' => $options,
         '#description' => t('This setting is used as the preferred download method. The use of public files is more efficient, but does not provide any access control.'),
-      );
+      ];
     }
 
-    $intervals = array(0, 21600, 43200, 86400, 604800, 2419200, 7776000);
-    $period = array_combine($intervals, array_map(array($this->dateFormatter, 'formatInterval'), $intervals));
+    $intervals = [0, 21600, 43200, 86400, 604800, 2419200, 7776000];
+    $period = array_combine($intervals, array_map([$this->dateFormatter, 'formatInterval'], $intervals));
     $period[0] = t('Never');
-    $form['temporary_maximum_age'] = array(
+    $form['temporary_maximum_age'] = [
       '#type' => 'select',
       '#title' => t('Delete orphaned files after'),
       '#default_value' => $config->get('temporary_maximum_age'),
       '#options' => $period,
       '#description' => t('Orphaned files are not referenced from any content but remain in the file system and may appear in administrative listings. <strong>Warning:</strong> If enabled, orphaned files will be permanently deleted and may not be recoverable.'),
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/system/src/Form/ImageToolkitForm.php b/web/core/modules/system/src/Form/ImageToolkitForm.php
index 39634aeaa..0e70b47a3 100644
--- a/web/core/modules/system/src/Form/ImageToolkitForm.php
+++ b/web/core/modules/system/src/Form/ImageToolkitForm.php
@@ -18,7 +18,7 @@ class ImageToolkitForm extends ConfigFormBase {
    *
    * @var \Drupal\Core\ImageToolkit\ImageToolkitInterface[]
    */
-  protected $availableToolkits = array();
+  protected $availableToolkits = [];
 
   /**
    * Constructs a ImageToolkitForm object.
@@ -66,30 +66,30 @@ class ImageToolkitForm extends ConfigFormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $current_toolkit = $this->config('system.image')->get('toolkit');
 
-    $form['image_toolkit'] = array(
+    $form['image_toolkit'] = [
       '#type' => 'radios',
       '#title' => $this->t('Select an image processing toolkit'),
       '#default_value' => $current_toolkit,
-      '#options' => array(),
-    );
+      '#options' => [],
+    ];
 
     // If we have more than one image toolkit, allow the user to select the one
     // to use, and load each of the toolkits' settings form.
     foreach ($this->availableToolkits as $id => $toolkit) {
       $definition = $toolkit->getPluginDefinition();
       $form['image_toolkit']['#options'][$id] = $definition['title'];
-      $form['image_toolkit_settings'][$id] = array(
+      $form['image_toolkit_settings'][$id] = [
         '#type' => 'details',
-        '#title' => $this->t('@toolkit settings', array('@toolkit' => $definition['title'])),
+        '#title' => $this->t('@toolkit settings', ['@toolkit' => $definition['title']]),
         '#open' => TRUE,
         '#tree' => TRUE,
-        '#states' => array(
-          'visible' => array(
-            ':radio[name="image_toolkit"]' => array('value' => $id),
-          ),
-        ),
-      );
-      $form['image_toolkit_settings'][$id] += $toolkit->buildConfigurationForm(array(), $form_state);
+        '#states' => [
+          'visible' => [
+            ':radio[name="image_toolkit"]' => ['value' => $id],
+          ],
+        ],
+      ];
+      $form['image_toolkit_settings'][$id] += $toolkit->buildConfigurationForm([], $form_state);
     }
 
     return parent::buildForm($form, $form_state);
diff --git a/web/core/modules/system/src/Form/LoggingForm.php b/web/core/modules/system/src/Form/LoggingForm.php
index 22135e18e..a305a4ff1 100644
--- a/web/core/modules/system/src/Form/LoggingForm.php
+++ b/web/core/modules/system/src/Form/LoggingForm.php
@@ -29,18 +29,18 @@ class LoggingForm extends ConfigFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $config = $this->config('system.logging');
-    $form['error_level'] = array(
+    $form['error_level'] = [
       '#type' => 'radios',
       '#title' => t('Error messages to display'),
       '#default_value' => $config->get('error_level'),
-      '#options' => array(
+      '#options' => [
         ERROR_REPORTING_HIDE => t('None'),
         ERROR_REPORTING_DISPLAY_SOME => t('Errors and warnings'),
         ERROR_REPORTING_DISPLAY_ALL => t('All messages'),
         ERROR_REPORTING_DISPLAY_VERBOSE => t('All messages, with backtrace information'),
-      ),
+      ],
       '#description' => t('It is recommended that sites running on production environments do not display any errors.'),
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/system/src/Form/ModulesListConfirmForm.php b/web/core/modules/system/src/Form/ModulesListConfirmForm.php
index 88452e06b..50026606d 100644
--- a/web/core/modules/system/src/Form/ModulesListConfirmForm.php
+++ b/web/core/modules/system/src/Form/ModulesListConfirmForm.php
@@ -36,7 +36,7 @@ class ModulesListConfirmForm extends ConfirmFormBase {
    *
    * @var array
    */
-  protected $modules = array();
+  protected $modules = [];
 
   /**
    * The module installer.
@@ -120,10 +120,10 @@ class ModulesListConfirmForm extends ConfirmFormBase {
     }
 
     $items = $this->buildMessageList();
-    $form['message'] = array(
+    $form['message'] = [
       '#theme' => 'item_list',
       '#items' => $items,
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
@@ -177,10 +177,10 @@ class ModulesListConfirmForm extends ConfirmFormBase {
             count($config_objects),
             'Unable to install @extension, %config_names already exists in active configuration.',
             'Unable to install @extension, %config_names already exist in active configuration.',
-            array(
+            [
               '%config_names' => implode(', ', $config_objects),
               '@extension' => $this->modules['install'][$e->getExtension()]
-            )),
+            ]),
           'error'
         );
         return;
@@ -194,10 +194,10 @@ class ModulesListConfirmForm extends ConfirmFormBase {
       }
 
       $module_names = array_values($this->modules['install']);
-      drupal_set_message($this->formatPlural(count($module_names), 'Module %name has been enabled.', '@count modules have been enabled: %names.', array(
+      drupal_set_message($this->formatPlural(count($module_names), 'Module %name has been enabled.', '@count modules have been enabled: %names.', [
         '%name' => $module_names[0],
         '%names' => implode(', ', $module_names),
-      )));
+      ]));
     }
 
     $form_state->setRedirectUrl($this->getCancelUrl());
diff --git a/web/core/modules/system/src/Form/ModulesListForm.php b/web/core/modules/system/src/Form/ModulesListForm.php
index e74d898ca..28ff7ef4c 100644
--- a/web/core/modules/system/src/Form/ModulesListForm.php
+++ b/web/core/modules/system/src/Form/ModulesListForm.php
@@ -119,26 +119,26 @@ class ModulesListForm extends FormBase {
     // Include system.admin.inc so we can use the sort callbacks.
     $this->moduleHandler->loadInclude('system', 'inc', 'system.admin');
 
-    $form['filters'] = array(
+    $form['filters'] = [
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('table-filter', 'js-show'),
-      ),
-    );
+      '#attributes' => [
+        'class' => ['table-filter', 'js-show'],
+      ],
+    ];
 
-    $form['filters']['text'] = array(
+    $form['filters']['text'] = [
       '#type' => 'search',
       '#title' => $this->t('Filter modules'),
       '#title_display' => 'invisible',
       '#size' => 30,
       '#placeholder' => $this->t('Filter by name or description'),
       '#description' => $this->t('Enter a part of the module name or description'),
-      '#attributes' => array(
-        'class' => array('table-filter-text'),
+      '#attributes' => [
+        'class' => ['table-filter-text'],
         'data-table' => '#system-modules',
         'autocomplete' => 'off',
-      ),
-    );
+      ],
+    ];
 
     // Sort all modules by their names.
     $modules = system_rebuild_module_data();
@@ -150,20 +150,21 @@ class ModulesListForm extends FormBase {
       if (empty($module->info['hidden'])) {
         $package = $module->info['package'];
         $form['modules'][$package][$filename] = $this->buildRow($modules, $module, $distribution);
+        $form['modules'][$package][$filename]['#parents'] = ['modules', $filename];
       }
     }
 
     // Add a wrapper around every package.
     foreach (Element::children($form['modules']) as $package) {
-      $form['modules'][$package] += array(
+      $form['modules'][$package] += [
         '#type' => 'details',
         '#title' => $this->t($package),
         '#open' => TRUE,
         '#theme' => 'system_modules_details',
-        '#attributes' => array('class' => array('package-listing')),
+        '#attributes' => ['class' => ['package-listing']],
         // Ensure that the "Core" package comes first.
         '#weight' => $package == 'Core' ? -10 : NULL,
-      );
+      ];
     }
 
     // If testing modules are shown, collapse the corresponding package by
@@ -173,15 +174,15 @@ class ModulesListForm extends FormBase {
     }
 
     // Lastly, sort all packages by title.
-    uasort($form['modules'], array('\Drupal\Component\Utility\SortArray', 'sortByTitleProperty'));
+    uasort($form['modules'], ['\Drupal\Component\Utility\SortArray', 'sortByTitleProperty']);
 
     $form['#attached']['library'][] = 'system/drupal.system.modules';
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Install'),
       '#button_type' => 'primary',
-    );
+    ];
 
     return $form;
   }
@@ -200,9 +201,9 @@ class ModulesListForm extends FormBase {
    */
   protected function buildRow(array $modules, Extension $module, $distribution) {
     // Set the basic properties.
-    $row['#required'] = array();
-    $row['#requires'] = array();
-    $row['#required_by'] = array();
+    $row['#required'] = [];
+    $row['#requires'] = [];
+    $row['#required_by'] = [];
 
     $row['name']['#markup'] = $module->info['name'];
     $row['description']['#markup'] = $this->t($module->info['description']);
@@ -212,48 +213,48 @@ class ModulesListForm extends FormBase {
     // implementation exists then the module provides an overview page, rather
     // than checking to see if the page exists, which is costly.
     if ($this->moduleHandler->moduleExists('help') && $module->status && in_array($module->getName(), $this->moduleHandler->getImplementations('help'))) {
-      $row['links']['help'] = array(
+      $row['links']['help'] = [
         '#type' => 'link',
         '#title' => $this->t('Help'),
         '#url' => Url::fromRoute('help.page', ['name' => $module->getName()]),
-        '#options' => array('attributes' => array('class' => array('module-link', 'module-link-help'), 'title' => $this->t('Help'))),
-      );
+        '#options' => ['attributes' => ['class' => ['module-link', 'module-link-help'], 'title' => $this->t('Help')]],
+      ];
     }
 
     // Generate link for module's permission, if the user has access to it.
     if ($module->status && $this->currentUser->hasPermission('administer permissions') && $this->permissionHandler->moduleProvidesPermissions($module->getName())) {
-      $row['links']['permissions'] = array(
+      $row['links']['permissions'] = [
         '#type' => 'link',
         '#title' => $this->t('Permissions'),
         '#url' => Url::fromRoute('user.admin_permissions'),
-        '#options' => array('fragment' => 'module-' . $module->getName(), 'attributes' => array('class' => array('module-link', 'module-link-permissions'), 'title' => $this->t('Configure permissions'))),
-      );
+        '#options' => ['fragment' => 'module-' . $module->getName(), 'attributes' => ['class' => ['module-link', 'module-link-permissions'], 'title' => $this->t('Configure permissions')]],
+      ];
     }
 
     // Generate link for module's configuration page, if it has one.
     if ($module->status && isset($module->info['configure'])) {
-      $route_parameters = isset($module->info['configure_parameters']) ? $module->info['configure_parameters'] : array();
+      $route_parameters = isset($module->info['configure_parameters']) ? $module->info['configure_parameters'] : [];
       if ($this->accessManager->checkNamedRoute($module->info['configure'], $route_parameters, $this->currentUser)) {
-        $row['links']['configure'] = array(
+        $row['links']['configure'] = [
           '#type' => 'link',
           '#title' => $this->t('Configure <span class="visually-hidden">the @module module</span>', ['@module' => $module->info['name']]),
           '#url' => Url::fromRoute($module->info['configure'], $route_parameters),
-          '#options' => array(
-            'attributes' => array(
-              'class' => array('module-link', 'module-link-configure'),
-            ),
-          ),
-        );
+          '#options' => [
+            'attributes' => [
+              'class' => ['module-link', 'module-link-configure'],
+            ],
+          ],
+        ];
       }
     }
 
     // Present a checkbox for installing and indicating the status of a module.
-    $row['enable'] = array(
+    $row['enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Install'),
       '#default_value' => (bool) $module->status,
       '#disabled' => (bool) $module->status,
-    );
+    ];
 
     // Disable the checkbox for required modules.
     if (!empty($module->info['required'])) {
@@ -267,24 +268,24 @@ class ModulesListForm extends FormBase {
 
     // Initialize an empty array of reasons why the module is incompatible. Add
     // each reason as a separate element of the array.
-    $reasons = array();
+    $reasons = [];
 
     // Check the core compatibility.
     if ($module->info['core'] != \Drupal::CORE_COMPATIBILITY) {
       $compatible = FALSE;
-      $reasons[] = $this->t('This version is not compatible with Drupal @core_version and should be replaced.', array(
+      $reasons[] = $this->t('This version is not compatible with Drupal @core_version and should be replaced.', [
         '@core_version' => \Drupal::CORE_COMPATIBILITY,
-      ));
+      ]);
     }
 
     // Ensure this module is compatible with the currently installed version of PHP.
     if (version_compare(phpversion(), $module->info['php']) < 0) {
       $compatible = FALSE;
       $required = $module->info['php'] . (substr_count($module->info['php'], '.') < 2 ? '.*' : '');
-      $reasons[] = $this->t('This module requires PHP version @php_required and is incompatible with PHP version @php_version.', array(
+      $reasons[] = $this->t('This module requires PHP version @php_required and is incompatible with PHP version @php_version.', [
         '@php_required' => $required,
         '@php_version' => phpversion(),
-      ));
+      ]);
     }
 
     // If this module is not compatible, disable the checkbox.
@@ -298,7 +299,7 @@ class ModulesListForm extends FormBase {
     // If this module requires other modules, add them to the array.
     foreach ($module->requires as $dependency => $version) {
       if (!isset($modules[$dependency])) {
-        $row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">missing</span>)', array('@module' => Unicode::ucfirst($dependency)));
+        $row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">missing</span>)', ['@module' => Unicode::ucfirst($dependency)]);
         $row['enable']['#disabled'] = TRUE;
       }
       // Only display visible modules.
@@ -307,25 +308,25 @@ class ModulesListForm extends FormBase {
         // Disable the module's checkbox if it is incompatible with the
         // dependency's version.
         if ($incompatible_version = drupal_check_incompatibility($version, str_replace(\Drupal::CORE_COMPATIBILITY . '-', '', $modules[$dependency]->info['version']))) {
-          $row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">incompatible with</span> version @version)', array(
+          $row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">incompatible with</span> version @version)', [
             '@module' => $name . $incompatible_version,
             '@version' => $modules[$dependency]->info['version'],
-          ));
+          ]);
           $row['enable']['#disabled'] = TRUE;
         }
         // Disable the checkbox if the dependency is incompatible with this
         // version of Drupal core.
         elseif ($modules[$dependency]->info['core'] != \Drupal::CORE_COMPATIBILITY) {
-          $row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">incompatible with</span> this version of Drupal core)', array(
+          $row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">incompatible with</span> this version of Drupal core)', [
             '@module' => $name,
-          ));
+          ]);
           $row['enable']['#disabled'] = TRUE;
         }
         elseif ($modules[$dependency]->status) {
-          $row['#requires'][$dependency] = $this->t('@module', array('@module' => $name));
+          $row['#requires'][$dependency] = $this->t('@module', ['@module' => $name]);
         }
         else {
-          $row['#requires'][$dependency] = $this->t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $name));
+          $row['#requires'][$dependency] = $this->t('@module (<span class="admin-disabled">disabled</span>)', ['@module' => $name]);
         }
       }
     }
@@ -335,11 +336,11 @@ class ModulesListForm extends FormBase {
     foreach ($module->required_by as $dependent => $version) {
       if (isset($modules[$dependent]) && empty($modules[$dependent]->info['hidden'])) {
         if ($modules[$dependent]->status == 1 && $module->status == 1) {
-          $row['#required_by'][$dependent] = $this->t('@module', array('@module' => $modules[$dependent]->info['name']));
+          $row['#required_by'][$dependent] = $this->t('@module', ['@module' => $modules[$dependent]->info['name']]);
           $row['enable']['#disabled'] = TRUE;
         }
         else {
-          $row['#required_by'][$dependent] = $this->t('@module (<span class="admin-disabled">disabled</span>)', array('@module' => $modules[$dependent]->info['name']));
+          $row['#required_by'][$dependent] = $this->t('@module (<span class="admin-disabled">disabled</span>)', ['@module' => $modules[$dependent]->info['name']]);
         }
       }
     }
@@ -357,33 +358,29 @@ class ModulesListForm extends FormBase {
    *   An array of modules to install and their dependencies.
    */
   protected function buildModuleList(FormStateInterface $form_state) {
-    $packages = $form_state->getValue('modules');
-
     // Build a list of modules to install.
-    $modules = array(
-      'install' => array(),
-      'dependencies' => array(),
+    $modules = [
+      'install' => [],
+      'dependencies' => [],
       'experimental' => [],
-    );
+    ];
 
-    // Required modules have to be installed.
-    // @todo This should really not be handled here.
     $data = system_rebuild_module_data();
     foreach ($data as $name => $module) {
-      if (!empty($module->required) && !$this->moduleHandler->moduleExists($name)) {
+      // If the module is installed there is nothing to do.
+      if ($this->moduleHandler->moduleExists($name)) {
+        continue;
+      }
+      // Required modules have to be installed.
+      if (!empty($module->required)) {
         $modules['install'][$name] = $module->info['name'];
       }
-    }
-
-    // First, build a list of all modules that were selected.
-    foreach ($packages as $package => $items) {
-      foreach ($items as $name => $checkbox) {
-        if ($checkbox['enable'] && !$this->moduleHandler->moduleExists($name)) {
-          $modules['install'][$name] = $data[$name]->info['name'];
-          // Identify experimental modules.
-          if ($package == 'Core (Experimental)') {
-            $modules['experimental'][$name] = $data[$name]->info['name'];
-          }
+      // Selected modules should be installed.
+      elseif (($checkbox = $form_state->getValue(['modules', $name], FALSE)) && $checkbox['enable']) {
+        $modules['install'][$name] = $data[$name]->info['name'];
+        // Identify experimental modules.
+        if ($data[$name]->info['package'] == 'Core (Experimental)') {
+          $modules['experimental'][$name] = $data[$name]->info['name'];
         }
       }
     }
@@ -450,10 +447,10 @@ class ModulesListForm extends FormBase {
       try {
         $this->moduleInstaller->install(array_keys($modules['install']));
         $module_names = array_values($modules['install']);
-        drupal_set_message($this->formatPlural(count($module_names), 'Module %name has been enabled.', '@count modules have been enabled: %names.', array(
+        drupal_set_message($this->formatPlural(count($module_names), 'Module %name has been enabled.', '@count modules have been enabled: %names.', [
           '%name' => $module_names[0],
           '%names' => implode(', ', $module_names),
-        )));
+        ]));
       }
       catch (PreExistingConfigException $e) {
         $config_objects = $e->flattenConfigObjects($e->getConfigObjects());
@@ -462,10 +459,10 @@ class ModulesListForm extends FormBase {
             count($config_objects),
             'Unable to install @extension, %config_names already exists in active configuration.',
             'Unable to install @extension, %config_names already exist in active configuration.',
-            array(
+            [
               '%config_names' => implode(', ', $config_objects),
               '@extension' => $modules['install'][$e->getExtension()]
-            )),
+            ]),
           'error'
         );
         return;
diff --git a/web/core/modules/system/src/Form/ModulesUninstallConfirmForm.php b/web/core/modules/system/src/Form/ModulesUninstallConfirmForm.php
index f4a482307..c72f240ac 100644
--- a/web/core/modules/system/src/Form/ModulesUninstallConfirmForm.php
+++ b/web/core/modules/system/src/Form/ModulesUninstallConfirmForm.php
@@ -51,7 +51,7 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase {
    *
    * @var array
    */
-  protected $modules = array();
+  protected $modules = [];
 
   /**
    * Constructs a ModulesUninstallConfirmForm object.
@@ -135,12 +135,12 @@ class ModulesUninstallConfirmForm extends ConfirmFormBase {
 
     $data = system_rebuild_module_data();
     $form['text']['#markup'] = '<p>' . $this->t('The following modules will be completely uninstalled from your site, and <em>all data from these modules will be lost</em>!') . '</p>';
-    $form['modules'] = array(
+    $form['modules'] = [
       '#theme' => 'item_list',
       '#items' => array_map(function ($module) use ($data) {
         return $data[$module]->info['name'];
       }, $this->modules),
-    );
+    ];
 
     // List the dependent entities.
     $this->addDependencyListsToForm($form, 'module', $this->modules, $this->configManager, $this->entityManager);
diff --git a/web/core/modules/system/src/Form/ModulesUninstallForm.php b/web/core/modules/system/src/Form/ModulesUninstallForm.php
index 92a15a78a..80348c59f 100644
--- a/web/core/modules/system/src/Form/ModulesUninstallForm.php
+++ b/web/core/modules/system/src/Form/ModulesUninstallForm.php
@@ -85,28 +85,28 @@ class ModulesUninstallForm extends FormBase {
     // Include system.admin.inc so we can use the sort callbacks.
     $this->moduleHandler->loadInclude('system', 'inc', 'system.admin');
 
-    $form['filters'] = array(
+    $form['filters'] = [
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('table-filter', 'js-show'),
-      ),
-    );
+      '#attributes' => [
+        'class' => ['table-filter', 'js-show'],
+      ],
+    ];
 
-    $form['filters']['text'] = array(
+    $form['filters']['text'] = [
       '#type' => 'search',
       '#title' => $this->t('Filter modules'),
       '#title_display' => 'invisible',
       '#size' => 30,
       '#placeholder' => $this->t('Filter by name or description'),
       '#description' => $this->t('Enter a part of the module name or description'),
-      '#attributes' => array(
-        'class' => array('table-filter-text'),
+      '#attributes' => [
+        'class' => ['table-filter-text'],
         'data-table' => '#system-modules-uninstall',
         'autocomplete' => 'off',
-      ),
-    );
+      ],
+    ];
 
-    $form['modules'] = array();
+    $form['modules'] = [];
 
     // Only build the rest of the form if there are any modules available to
     // uninstall;
@@ -120,18 +120,18 @@ class ModulesUninstallForm extends FormBase {
     uasort($uninstallable, 'system_sort_modules_by_info_name');
     $validation_reasons = $this->moduleInstaller->validateUninstall(array_keys($uninstallable));
 
-    $form['uninstall'] = array('#tree' => TRUE);
+    $form['uninstall'] = ['#tree' => TRUE];
     foreach ($uninstallable as $module_key => $module) {
       $name = $module->info['name'] ?: $module->getName();
       $form['modules'][$module->getName()]['#module_name'] = $name;
       $form['modules'][$module->getName()]['name']['#markup'] = $name;
       $form['modules'][$module->getName()]['description']['#markup'] = $this->t($module->info['description']);
 
-      $form['uninstall'][$module->getName()] = array(
+      $form['uninstall'][$module->getName()] = [
         '#type' => 'checkbox',
-        '#title' => $this->t('Uninstall @module module', array('@module' => $name)),
+        '#title' => $this->t('Uninstall @module module', ['@module' => $name]),
         '#title_display' => 'invisible',
-      );
+      ];
 
       // If a validator returns reasons not to uninstall a module,
       // list the reasons and disable the check box.
@@ -152,11 +152,11 @@ class ModulesUninstallForm extends FormBase {
     }
 
     $form['#attached']['library'][] = 'system/drupal.system.modules';
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Uninstall'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/src/Form/PerformanceForm.php b/web/core/modules/system/src/Form/PerformanceForm.php
index d9e091799..a2e85927d 100644
--- a/web/core/modules/system/src/Form/PerformanceForm.php
+++ b/web/core/modules/system/src/Form/PerformanceForm.php
@@ -100,64 +100,64 @@ class PerformanceForm extends ConfigFormBase {
 
     $config = $this->config('system.performance');
 
-    $form['clear_cache'] = array(
+    $form['clear_cache'] = [
       '#type' => 'details',
       '#title' => t('Clear cache'),
       '#open' => TRUE,
-    );
+    ];
 
-    $form['clear_cache']['clear'] = array(
+    $form['clear_cache']['clear'] = [
       '#type' => 'submit',
       '#value' => t('Clear all caches'),
-      '#submit' => array('::submitCacheClear'),
-    );
+      '#submit' => ['::submitCacheClear'],
+    ];
 
-    $form['caching'] = array(
+    $form['caching'] = [
       '#type' => 'details',
       '#title' => t('Caching'),
       '#open' => TRUE,
       '#description' => $this->t('Note: Drupal provides an internal page cache module that is recommended for small to medium-sized websites.'),
-    );
+    ];
     // Identical options to the ones for block caching.
     // @see \Drupal\Core\Block\BlockBase::buildConfigurationForm()
-    $period = array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400);
-    $period = array_map(array($this->dateFormatter, 'formatInterval'), array_combine($period, $period));
+    $period = [0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400];
+    $period = array_map([$this->dateFormatter, 'formatInterval'], array_combine($period, $period));
     $period[0] = '<' . t('no caching') . '>';
-    $form['caching']['page_cache_maximum_age'] = array(
+    $form['caching']['page_cache_maximum_age'] = [
       '#type' => 'select',
       '#title' => t('Page cache maximum age'),
       '#default_value' => $config->get('cache.page.max_age'),
       '#options' => $period,
       '#description' => t('The maximum time a page can be cached by browsers and proxies. This is used as the value for max-age in Cache-Control headers.'),
-    );
+    ];
 
     $directory = 'public://';
     $is_writable = is_dir($directory) && is_writable($directory);
     $disabled = !$is_writable;
     $disabled_message = '';
     if (!$is_writable) {
-      $disabled_message = ' ' . t('<strong class="error">Set up the <a href=":file-system">public files directory</a> to make these optimizations available.</strong>', array(':file-system' => $this->url('system.file_system_settings')));
+      $disabled_message = ' ' . t('<strong class="error">Set up the <a href=":file-system">public files directory</a> to make these optimizations available.</strong>', [':file-system' => $this->url('system.file_system_settings')]);
     }
 
-    $form['bandwidth_optimization'] = array(
+    $form['bandwidth_optimization'] = [
       '#type' => 'details',
       '#title' => t('Bandwidth optimization'),
       '#open' => TRUE,
       '#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to your website.') . $disabled_message,
-    );
+    ];
 
-    $form['bandwidth_optimization']['preprocess_css'] = array(
+    $form['bandwidth_optimization']['preprocess_css'] = [
       '#type' => 'checkbox',
       '#title' => t('Aggregate CSS files'),
       '#default_value' => $config->get('css.preprocess'),
       '#disabled' => $disabled,
-    );
-    $form['bandwidth_optimization']['preprocess_js'] = array(
+    ];
+    $form['bandwidth_optimization']['preprocess_js'] = [
       '#type' => 'checkbox',
       '#title' => t('Aggregate JavaScript files'),
       '#default_value' => $config->get('js.preprocess'),
       '#disabled' => $disabled,
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/system/src/Form/RegionalForm.php b/web/core/modules/system/src/Form/RegionalForm.php
index 9472a4cb7..c365fc055 100644
--- a/web/core/modules/system/src/Form/RegionalForm.php
+++ b/web/core/modules/system/src/Form/RegionalForm.php
@@ -67,76 +67,76 @@ class RegionalForm extends ConfigFormBase {
     // Date settings:
     $zones = system_time_zones();
 
-    $form['locale'] = array(
+    $form['locale'] = [
       '#type' => 'details',
       '#title' => t('Locale'),
       '#open' => TRUE,
-    );
+    ];
 
-    $form['locale']['site_default_country'] = array(
+    $form['locale']['site_default_country'] = [
       '#type' => 'select',
       '#title' => t('Default country'),
       '#empty_value' => '',
       '#default_value' => $system_date->get('country.default'),
       '#options' => $countries,
-      '#attributes' => array('class' => array('country-detect')),
-    );
+      '#attributes' => ['class' => ['country-detect']],
+    ];
 
-    $form['locale']['date_first_day'] = array(
+    $form['locale']['date_first_day'] = [
       '#type' => 'select',
       '#title' => t('First day of week'),
       '#default_value' => $system_date->get('first_day'),
-      '#options' => array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')),
-    );
+      '#options' => [0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')],
+    ];
 
-    $form['timezone'] = array(
+    $form['timezone'] = [
       '#type' => 'details',
       '#title' => t('Time zones'),
       '#open' => TRUE,
-    );
+    ];
 
-    $form['timezone']['date_default_timezone'] = array(
+    $form['timezone']['date_default_timezone'] = [
       '#type' => 'select',
       '#title' => t('Default time zone'),
       '#default_value' => $system_date->get('timezone.default') ?: date_default_timezone_get(),
       '#options' => $zones,
-    );
+    ];
 
     $configurable_timezones = $system_date->get('timezone.user.configurable');
-    $form['timezone']['configurable_timezones'] = array(
+    $form['timezone']['configurable_timezones'] = [
       '#type' => 'checkbox',
       '#title' => t('Users may set their own time zone'),
       '#default_value' => $configurable_timezones,
-    );
+    ];
 
-    $form['timezone']['configurable_timezones_wrapper'] = array(
+    $form['timezone']['configurable_timezones_wrapper'] = [
       '#type' => 'container',
-      '#states' => array(
+      '#states' => [
         // Hide the user configured timezone settings when users are forced to use
         // the default setting.
-        'invisible' => array(
-          'input[name="configurable_timezones"]' => array('checked' => FALSE),
-        ),
-      ),
-    );
-    $form['timezone']['configurable_timezones_wrapper']['empty_timezone_message'] = array(
+        'invisible' => [
+          'input[name="configurable_timezones"]' => ['checked' => FALSE],
+        ],
+      ],
+    ];
+    $form['timezone']['configurable_timezones_wrapper']['empty_timezone_message'] = [
       '#type' => 'checkbox',
       '#title' => t('Remind users at login if their time zone is not set'),
       '#default_value' => $system_date->get('timezone.user.warn'),
       '#description' => t('Only applied if users may set their own time zone.')
-    );
+    ];
 
-    $form['timezone']['configurable_timezones_wrapper']['user_default_timezone'] = array(
+    $form['timezone']['configurable_timezones_wrapper']['user_default_timezone'] = [
       '#type' => 'radios',
       '#title' => t('Time zone for new users'),
       '#default_value' => $system_date->get('timezone.user.default'),
-      '#options' => array(
+      '#options' => [
         DRUPAL_USER_TIMEZONE_DEFAULT => t('Default time zone'),
         DRUPAL_USER_TIMEZONE_EMPTY   => t('Empty time zone'),
         DRUPAL_USER_TIMEZONE_SELECT  => t('Users may set their own time zone at registration'),
-      ),
+      ],
       '#description' => t('Only applied if users may set their own time zone.')
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/system/src/Form/RssFeedsForm.php b/web/core/modules/system/src/Form/RssFeedsForm.php
index 79aa69ba4..986ff1149 100644
--- a/web/core/modules/system/src/Form/RssFeedsForm.php
+++ b/web/core/modules/system/src/Form/RssFeedsForm.php
@@ -29,31 +29,31 @@ class RssFeedsForm extends ConfigFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $rss_config = $this->config('system.rss');
-    $form['feed_description'] = array(
+    $form['feed_description'] = [
       '#type' => 'textarea',
       '#title' => t('Feed description'),
       '#default_value' => $rss_config->get('channel.description'),
       '#description' => t('Description of your site, included in each feed.')
-    );
-    $options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30);
-    $form['feed_default_items'] = array(
+    ];
+    $options = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30];
+    $form['feed_default_items'] = [
       '#type' => 'select',
       '#title' => t('Number of items in each feed'),
       '#default_value' => $rss_config->get('items.limit'),
       '#options' => array_combine($options, $options),
       '#description' => t('Default number of items to include in each feed.')
-    );
-    $form['feed_view_mode'] = array(
+    ];
+    $form['feed_view_mode'] = [
       '#type' => 'select',
       '#title' => t('Feed content'),
       '#default_value' => $rss_config->get('items.view_mode'),
-      '#options' => array(
+      '#options' => [
         'title' => t('Titles only'),
         'teaser' => t('Titles plus teaser'),
         'fulltext' => t('Full text'),
-      ),
+      ],
       '#description' => t('Global setting for the default display of content items in each feed.')
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/system/src/Form/SiteInformationForm.php b/web/core/modules/system/src/Form/SiteInformationForm.php
index 92986d6d6..7173ebe94 100644
--- a/web/core/modules/system/src/Form/SiteInformationForm.php
+++ b/web/core/modules/system/src/Form/SiteInformationForm.php
@@ -92,63 +92,63 @@ class SiteInformationForm extends ConfigFormBase {
       $site_mail = ini_get('sendmail_from');
     }
 
-    $form['site_information'] = array(
+    $form['site_information'] = [
       '#type' => 'details',
       '#title' => t('Site details'),
       '#open' => TRUE,
-    );
-    $form['site_information']['site_name'] = array(
+    ];
+    $form['site_information']['site_name'] = [
       '#type' => 'textfield',
       '#title' => t('Site name'),
       '#default_value' => $site_config->get('name'),
       '#required' => TRUE,
-    );
-    $form['site_information']['site_slogan'] = array(
+    ];
+    $form['site_information']['site_slogan'] = [
       '#type' => 'textfield',
       '#title' => t('Slogan'),
       '#default_value' => $site_config->get('slogan'),
       '#description' => t("How this is used depends on your site's theme."),
-    );
-    $form['site_information']['site_mail'] = array(
+    ];
+    $form['site_information']['site_mail'] = [
       '#type' => 'email',
       '#title' => t('Email address'),
       '#default_value' => $site_mail,
       '#description' => t("The <em>From</em> address in automated emails sent during registration and new password requests, and other notifications. (Use an address ending in your site's domain to help prevent this email being flagged as spam.)"),
       '#required' => TRUE,
-    );
-    $form['front_page'] = array(
+    ];
+    $form['front_page'] = [
       '#type' => 'details',
       '#title' => t('Front page'),
       '#open' => TRUE,
-    );
+    ];
     $front_page = $site_config->get('page.front') != '/user/login' ? $this->aliasManager->getAliasByPath($site_config->get('page.front')) : '';
-    $form['front_page']['site_frontpage'] = array(
+    $form['front_page']['site_frontpage'] = [
       '#type' => 'textfield',
       '#title' => t('Default front page'),
       '#default_value' => $front_page,
       '#size' => 40,
       '#description' => t('Optionally, specify a relative URL to display as the front page. Leave blank to display the default front page.'),
       '#field_prefix' => $this->requestContext->getCompleteBaseUrl(),
-    );
-    $form['error_page'] = array(
+    ];
+    $form['error_page'] = [
       '#type' => 'details',
       '#title' => t('Error pages'),
       '#open' => TRUE,
-    );
-    $form['error_page']['site_403'] = array(
+    ];
+    $form['error_page']['site_403'] = [
       '#type' => 'textfield',
       '#title' => t('Default 403 (access denied) page'),
       '#default_value' => $site_config->get('page.403'),
       '#size' => 40,
       '#description' => t('This page is displayed when the requested document is denied to the current user. Leave blank to display a generic "access denied" page.'),
-    );
-    $form['error_page']['site_404'] = array(
+    ];
+    $form['error_page']['site_404'] = [
       '#type' => 'textfield',
       '#title' => t('Default 404 (not found) page'),
       '#default_value' => $site_config->get('page.404'),
       '#size' => 40,
       '#description' => t('This page is displayed when no other content matches the requested document. Leave blank to display a generic "page not found" page.'),
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
@@ -172,7 +172,7 @@ class SiteInformationForm extends ConfigFormBase {
 
     }
     if (!$this->pathValidator->isValid($form_state->getValue('site_frontpage'))) {
-      $form_state->setErrorByName('site_frontpage', $this->t("The path '%path' is either invalid or you do not have access to it.", array('%path' => $form_state->getValue('site_frontpage'))));
+      $form_state->setErrorByName('site_frontpage', $this->t("The path '%path' is either invalid or you do not have access to it.", ['%path' => $form_state->getValue('site_frontpage')]));
     }
     // Get the normal paths of both error pages.
     if (!$form_state->isValueEmpty('site_403')) {
@@ -189,11 +189,11 @@ class SiteInformationForm extends ConfigFormBase {
     }
     // Validate 403 error path.
     if (!$form_state->isValueEmpty('site_403') && !$this->pathValidator->isValid($form_state->getValue('site_403'))) {
-      $form_state->setErrorByName('site_403', $this->t("The path '%path' is either invalid or you do not have access to it.", array('%path' => $form_state->getValue('site_403'))));
+      $form_state->setErrorByName('site_403', $this->t("The path '%path' is either invalid or you do not have access to it.", ['%path' => $form_state->getValue('site_403')]));
     }
     // Validate 404 error path.
     if (!$form_state->isValueEmpty('site_404') && !$this->pathValidator->isValid($form_state->getValue('site_404'))) {
-      $form_state->setErrorByName('site_404', $this->t("The path '%path' is either invalid or you do not have access to it.", array('%path' => $form_state->getValue('site_404'))));
+      $form_state->setErrorByName('site_404', $this->t("The path '%path' is either invalid or you do not have access to it.", ['%path' => $form_state->getValue('site_404')]));
     }
 
     parent::validateForm($form, $form_state);
diff --git a/web/core/modules/system/src/Form/SiteMaintenanceModeForm.php b/web/core/modules/system/src/Form/SiteMaintenanceModeForm.php
index 02c5a9a3a..fb509aafe 100644
--- a/web/core/modules/system/src/Form/SiteMaintenanceModeForm.php
+++ b/web/core/modules/system/src/Form/SiteMaintenanceModeForm.php
@@ -6,6 +6,7 @@ use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\Form\ConfigFormBase;
+use Drupal\user\PermissionHandlerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -20,6 +21,13 @@ class SiteMaintenanceModeForm extends ConfigFormBase {
    */
   protected $state;
 
+  /**
+  * The permission handler.
+  *
+  * @var \Drupal\user\PermissionHandlerInterface
+  */
+  protected $permissionHandler;
+
   /**
    * Constructs a new SiteMaintenanceModeForm.
    *
@@ -27,10 +35,13 @@ class SiteMaintenanceModeForm extends ConfigFormBase {
    *   The factory for configuration objects.
    * @param \Drupal\Core\State\StateInterface $state
    *   The state keyvalue collection to use.
+   * @param \Drupal\user\PermissionHandlerInterface $permission_handler
+   *   The permission handler.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, StateInterface $state) {
+  public function __construct(ConfigFactoryInterface $config_factory, StateInterface $state, PermissionHandlerInterface $permission_handler) {
     parent::__construct($config_factory);
     $this->state = $state;
+    $this->permissionHandler = $permission_handler;
   }
 
   /**
@@ -39,7 +50,8 @@ class SiteMaintenanceModeForm extends ConfigFormBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
-      $container->get('state')
+      $container->get('state'),
+      $container->get('user.permissions')
     );
   }
   /**
@@ -61,17 +73,19 @@ class SiteMaintenanceModeForm extends ConfigFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $config = $this->config('system.maintenance');
-    $form['maintenance_mode'] = array(
+    $permissions = $this->permissionHandler->getPermissions();
+    $permission_label = $permissions['access site in maintenance mode']['title'];
+    $form['maintenance_mode'] = [
       '#type' => 'checkbox',
       '#title' => t('Put site into maintenance mode'),
       '#default_value' => $this->state->get('system.maintenance_mode'),
-      '#description' => t('Visitors will only see the maintenance mode message. Only users with the "Access site in maintenance mode" <a href=":permissions-url">permission</a> will be able to access the site. Authorized users can log in directly via the <a href=":user-login">user login</a> page.', array(':permissions-url' => $this->url('user.admin_permissions'), ':user-login' => $this->url('user.login'))),
-    );
-    $form['maintenance_mode_message'] = array(
+      '#description' => t('Visitors will only see the maintenance mode message. Only users with the "@permission-label" <a href=":permissions-url">permission</a> will be able to access the site. Authorized users can log in directly via the <a href=":user-login">user login</a> page.', ['@permission-label' => $permission_label, ':permissions-url' => $this->url('user.admin_permissions'), ':user-login' => $this->url('user.login')]),
+    ];
+    $form['maintenance_mode_message'] = [
       '#type' => 'textarea',
       '#title' => t('Message to display when in maintenance mode'),
       '#default_value' => $config->get('message'),
-    );
+    ];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/system/src/Form/ThemeAdminForm.php b/web/core/modules/system/src/Form/ThemeAdminForm.php
index a3ec4191c..e8d17edd2 100644
--- a/web/core/modules/system/src/Form/ThemeAdminForm.php
+++ b/web/core/modules/system/src/Form/ThemeAdminForm.php
@@ -29,24 +29,24 @@ class ThemeAdminForm extends ConfigFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state, array $theme_options = NULL) {
     // Administration theme settings.
-    $form['admin_theme'] = array(
+    $form['admin_theme'] = [
       '#type' => 'details',
       '#title' => $this->t('Administration theme'),
       '#open' => TRUE,
-    );
-    $form['admin_theme']['admin_theme'] = array(
+    ];
+    $form['admin_theme']['admin_theme'] = [
       '#type' => 'select',
-      '#options' => array(0 => $this->t('Default theme')) + $theme_options,
+      '#options' => [0 => $this->t('Default theme')] + $theme_options,
       '#title' => $this->t('Administration theme'),
       '#description' => $this->t('Choose "Default theme" to always use the same theme as the rest of the site.'),
       '#default_value' => $this->config('system.theme')->get('admin'),
-    );
-    $form['admin_theme']['actions'] = array('#type' => 'actions');
-    $form['admin_theme']['actions']['submit'] = array(
+    ];
+    $form['admin_theme']['actions'] = ['#type' => 'actions'];
+    $form['admin_theme']['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save configuration'),
       '#button_type' => 'primary',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/src/Form/ThemeSettingsForm.php b/web/core/modules/system/src/Form/ThemeSettingsForm.php
index 7e9893c36..f5cfb0908 100644
--- a/web/core/modules/system/src/Form/ThemeSettingsForm.php
+++ b/web/core/modules/system/src/Form/ThemeSettingsForm.php
@@ -12,6 +12,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\ConfigFormBase;
+use Drupal\Core\Theme\ThemeManagerInterface;
 
 /**
  * Displays theme configuration for entire site and individual themes.
@@ -46,6 +47,13 @@ class ThemeSettingsForm extends ConfigFormBase {
    */
   protected $editableConfig = [];
 
+  /**
+   * The theme manager.
+   *
+   * @var \Drupal\Core\Theme\ThemeManagerInterface
+   */
+  protected $themeManager;
+
   /**
    * Constructs a ThemeSettingsForm object.
    *
@@ -58,12 +66,13 @@ class ThemeSettingsForm extends ConfigFormBase {
    * @param \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface $mime_type_guesser
    *   The MIME type guesser instance to use.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, MimeTypeGuesserInterface $mime_type_guesser) {
+  public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, MimeTypeGuesserInterface $mime_type_guesser, ThemeManagerInterface $theme_manager) {
     parent::__construct($config_factory);
 
     $this->moduleHandler = $module_handler;
     $this->themeHandler = $theme_handler;
     $this->mimeTypeGuesser = $mime_type_guesser;
+    $this->themeManager = $theme_manager;
   }
 
   /**
@@ -74,7 +83,8 @@ class ThemeSettingsForm extends ConfigFormBase {
       $container->get('config.factory'),
       $container->get('module_handler'),
       $container->get('theme_handler'),
-      $container->get('file.mime_type.guesser')
+      $container->get('file.mime_type.guesser'),
+      $container->get('theme.manager')
     );
   }
 
@@ -122,25 +132,25 @@ class ThemeSettingsForm extends ConfigFormBase {
     //   by https://www.drupal.org/node/2402467.
     $this->editableConfig = [$config_key];
 
-    $form['var'] = array(
+    $form['var'] = [
       '#type' => 'hidden',
       '#value' => $var
-    );
-    $form['config_key'] = array(
+    ];
+    $form['config_key'] = [
       '#type' => 'hidden',
       '#value' => $config_key
-    );
+    ];
 
     // Toggle settings
-    $toggles = array(
+    $toggles = [
       'node_user_picture' => t('User pictures in posts'),
       'comment_user_picture' => t('User pictures in comments'),
       'comment_user_verification' => t('User verification status in comments'),
       'favicon' => t('Shortcut icon'),
-    );
+    ];
 
     // Some features are not always available
-    $disabled = array();
+    $disabled = [];
     if (!user_picture_enabled()) {
       $disabled['toggle_node_user_picture'] = TRUE;
       $disabled['toggle_comment_user_picture'] = TRUE;
@@ -150,14 +160,14 @@ class ThemeSettingsForm extends ConfigFormBase {
       $disabled['toggle_comment_user_verification'] = TRUE;
     }
 
-    $form['theme_settings'] = array(
+    $form['theme_settings'] = [
       '#type' => 'details',
       '#title' => t('Page element display'),
       '#open' => TRUE,
-    );
+    ];
     foreach ($toggles as $name => $title) {
       if ((!$theme) || in_array($name, $features)) {
-        $form['theme_settings']['toggle_' . $name] = array('#type' => 'checkbox', '#title' => $title, '#default_value' => theme_get_setting('features.' . $name, $theme));
+        $form['theme_settings']['toggle_' . $name] = ['#type' => 'checkbox', '#title' => $title, '#default_value' => theme_get_setting('features.' . $name, $theme)];
         // Disable checkboxes for features not supported in the current configuration.
         if (isset($disabled['toggle_' . $name])) {
           $form['theme_settings']['toggle_' . $name]['#disabled'] = TRUE;
@@ -173,82 +183,82 @@ class ThemeSettingsForm extends ConfigFormBase {
 
     // Logo settings, only available when file.module is enabled.
     if ((!$theme || in_array('logo', $features)) && $this->moduleHandler->moduleExists('file')) {
-      $form['logo'] = array(
+      $form['logo'] = [
         '#type' => 'details',
         '#title' => t('Logo image'),
         '#open' => TRUE,
-      );
-      $form['logo']['default_logo'] = array(
+      ];
+      $form['logo']['default_logo'] = [
         '#type' => 'checkbox',
         '#title' => t('Use the logo supplied by the theme'),
         '#default_value' => theme_get_setting('logo.use_default', $theme),
         '#tree' => FALSE,
-      );
-      $form['logo']['settings'] = array(
+      ];
+      $form['logo']['settings'] = [
         '#type' => 'container',
-        '#states' => array(
+        '#states' => [
           // Hide the logo settings when using the default logo.
-          'invisible' => array(
-            'input[name="default_logo"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['logo']['settings']['logo_path'] = array(
+          'invisible' => [
+            'input[name="default_logo"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['logo']['settings']['logo_path'] = [
         '#type' => 'textfield',
         '#title' => t('Path to custom logo'),
         '#default_value' => theme_get_setting('logo.path', $theme),
-      );
-      $form['logo']['settings']['logo_upload'] = array(
+      ];
+      $form['logo']['settings']['logo_upload'] = [
         '#type' => 'file',
         '#title' => t('Upload logo image'),
         '#maxlength' => 40,
         '#description' => t("If you don't have direct file access to the server, use this field to upload your logo.")
-      );
+      ];
     }
 
     if (((!$theme) || in_array('favicon', $features)) && $this->moduleHandler->moduleExists('file')) {
-      $form['favicon'] = array(
+      $form['favicon'] = [
         '#type' => 'details',
         '#title' => t('Favicon'),
         '#open' => TRUE,
         '#description' => t("Your shortcut icon, or favicon, is displayed in the address bar and bookmarks of most browsers."),
-        '#states' => array(
+        '#states' => [
           // Hide the shortcut icon settings fieldset when shortcut icon display
           // is disabled.
-          'invisible' => array(
-            'input[name="toggle_favicon"]' => array('checked' => FALSE),
-          ),
-        ),
-      );
-      $form['favicon']['default_favicon'] = array(
+          'invisible' => [
+            'input[name="toggle_favicon"]' => ['checked' => FALSE],
+          ],
+        ],
+      ];
+      $form['favicon']['default_favicon'] = [
         '#type' => 'checkbox',
         '#title' => t('Use the favicon supplied by the theme'),
         '#default_value' => theme_get_setting('favicon.use_default', $theme),
-      );
-      $form['favicon']['settings'] = array(
+      ];
+      $form['favicon']['settings'] = [
         '#type' => 'container',
-        '#states' => array(
+        '#states' => [
           // Hide the favicon settings when using the default favicon.
-          'invisible' => array(
-            'input[name="default_favicon"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['favicon']['settings']['favicon_path'] = array(
+          'invisible' => [
+            'input[name="default_favicon"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['favicon']['settings']['favicon_path'] = [
         '#type' => 'textfield',
         '#title' => t('Path to custom icon'),
         '#default_value' => theme_get_setting('favicon.path', $theme),
-      );
-      $form['favicon']['settings']['favicon_upload'] = array(
+      ];
+      $form['favicon']['settings']['favicon_upload'] = [
         '#type' => 'file',
         '#title' => t('Upload favicon image'),
         '#description' => t("If you don't have direct file access to the server, use this field to upload your shortcut icon.")
-      );
+      ];
     }
 
     // Inject human-friendly values and form element descriptions for logo and
     // favicon.
-    foreach (array('logo' => 'logo.svg', 'favicon' => 'favicon.ico') as $type => $default) {
+    foreach (['logo' => 'logo.svg', 'favicon' => 'favicon.ico'] as $type => $default) {
       if (isset($form[$type]['settings'][$type . '_path'])) {
         $element = &$form[$type]['settings'][$type . '_path'];
 
@@ -263,20 +273,20 @@ class ThemeSettingsForm extends ConfigFormBase {
 
         // Prepare local file path for description.
         if ($original_path && isset($friendly_path)) {
-          $local_file = strtr($original_path, array('public:/' => PublicStream::basePath()));
+          $local_file = strtr($original_path, ['public:/' => PublicStream::basePath()]);
         }
         elseif ($theme) {
           $local_file = drupal_get_path('theme', $theme) . '/' . $default;
         }
         else {
-          $local_file = \Drupal::theme()->getActiveTheme()->getPath() . '/' . $default;
+          $local_file = $this->themeManager->getActiveTheme()->getPath() . '/' . $default;
         }
 
-        $element['#description'] = t('Examples: <code>@implicit-public-file</code> (for a file in the public filesystem), <code>@explicit-file</code>, or <code>@local-file</code>.', array(
+        $element['#description'] = t('Examples: <code>@implicit-public-file</code> (for a file in the public filesystem), <code>@explicit-file</code>, or <code>@local-file</code>.', [
           '@implicit-public-file' => isset($friendly_path) ? $friendly_path : $default,
           '@explicit-file' => file_uri_scheme($original_path) !== FALSE ? $original_path : 'public://' . $default,
           '@local-file' => $local_file,
-        ));
+        ]);
       }
     }
 
@@ -284,12 +294,12 @@ class ThemeSettingsForm extends ConfigFormBase {
       // Call engine-specific settings.
       $function = $themes[$theme]->prefix . '_engine_settings';
       if (function_exists($function)) {
-        $form['engine_specific'] = array(
+        $form['engine_specific'] = [
           '#type' => 'details',
           '#title' => t('Theme-engine-specific settings'),
           '#open' => TRUE,
-          '#description' => t('These settings only exist for the themes based on the %engine theme engine.', array('%engine' => $themes[$theme]->prefix)),
-        );
+          '#description' => t('These settings only exist for the themes based on the %engine theme engine.', ['%engine' => $themes[$theme]->prefix]),
+        ];
         $function($form, $form_state);
       }
 
@@ -299,17 +309,17 @@ class ThemeSettingsForm extends ConfigFormBase {
         $theme_keys[] = $theme;
       }
       else {
-        $theme_keys = array($theme);
+        $theme_keys = [$theme];
       }
 
       // Save the name of the current theme (if any), so that we can temporarily
       // override the current theme and allow theme_get_setting() to work
       // without having to pass the theme name to it.
-      $default_active_theme = \Drupal::theme()->getActiveTheme();
+      $default_active_theme = $this->themeManager->getActiveTheme();
       $default_theme = $default_active_theme->getName();
       /** @var \Drupal\Core\Theme\ThemeInitialization $theme_initialization */
       $theme_initialization = \Drupal::service('theme.initialization');
-      \Drupal::theme()->setActiveTheme($theme_initialization->getActiveThemeByName($theme));
+      $this->themeManager->setActiveTheme($theme_initialization->getActiveThemeByName($theme));
 
       // Process the theme and all its base themes.
       foreach ($theme_keys as $theme) {
@@ -328,10 +338,10 @@ class ThemeSettingsForm extends ConfigFormBase {
 
       // Restore the original current theme.
       if (isset($default_theme)) {
-        \Drupal::theme()->setActiveTheme($default_active_theme);
+        $this->themeManager->setActiveTheme($default_active_theme);
       }
       else {
-        \Drupal::theme()->resetActiveTheme();
+        $this->themeManager->resetActiveTheme();
       }
     }
 
@@ -346,7 +356,7 @@ class ThemeSettingsForm extends ConfigFormBase {
 
     if ($this->moduleHandler->moduleExists('file')) {
       // Handle file uploads.
-      $validators = array('file_validate_is_image' => array());
+      $validators = ['file_validate_is_image' => []];
 
       // Check for a new uploaded logo.
       $file = file_save_upload('logo_upload', $validators, FALSE, 0);
@@ -362,7 +372,7 @@ class ThemeSettingsForm extends ConfigFormBase {
         }
       }
 
-      $validators = array('file_validate_extensions' => array('ico png gif jpg jpeg apng svg'));
+      $validators = ['file_validate_extensions' => ['ico png gif jpg jpeg apng svg']];
 
       // Check for a new uploaded favicon.
       $file = file_save_upload('favicon_upload', $validators, FALSE, 0);
diff --git a/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php b/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php
index dcfc0732f..9f1a5590a 100644
--- a/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php
+++ b/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php
@@ -52,7 +52,7 @@ class PathBasedBreadcrumbBuilder implements BreadcrumbBuilderInterface {
   protected $router;
 
   /**
-   * The dynamic router service.
+   * The inbound path processor.
    *
    * @var \Drupal\Core\PathProcessor\InboundPathProcessorInterface
    */
@@ -122,14 +122,14 @@ class PathBasedBreadcrumbBuilder implements BreadcrumbBuilderInterface {
    */
   public function build(RouteMatchInterface $route_match) {
     $breadcrumb = new Breadcrumb();
-    $links = array();
+    $links = [];
 
     // General path-based breadcrumbs. Use the actual request path, prior to
     // resolving path aliases, so the breadcrumb can be defined by simply
     // creating a hierarchy of path aliases.
     $path = trim($this->context->getPathInfo(), '/');
     $path_elements = explode('/', $path);
-    $exclude = array();
+    $exclude = [];
     // Don't show a link to the front-page path.
     $front = $this->config->get('page.front');
     $exclude[$front] = TRUE;
@@ -154,7 +154,7 @@ class PathBasedBreadcrumbBuilder implements BreadcrumbBuilderInterface {
           if (!isset($title)) {
             // Fallback to using the raw path component as the title if the
             // route is missing a _title or _title_callback attribute.
-            $title = str_replace(array('-', '_'), ' ', Unicode::ucfirst(end($path_elements)));
+            $title = str_replace(['-', '_'], ' ', Unicode::ucfirst(end($path_elements)));
           }
           $url = Url::fromRouteMatch($route_match);
           $links[] = new Link($title, $url);
diff --git a/web/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/web/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
index f6b0958c6..330528528 100644
--- a/web/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
+++ b/web/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
@@ -60,12 +60,12 @@ class SystemBrandingBlock extends BlockBase implements ContainerFactoryPluginInt
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'use_site_logo' => TRUE,
       'use_site_name' => TRUE,
       'use_site_slogan' => TRUE,
       'label_display' => FALSE,
-    );
+    ];
   }
 
   /**
@@ -77,15 +77,15 @@ class SystemBrandingBlock extends BlockBase implements ContainerFactoryPluginInt
 
     // Get permissions.
     $url_system_theme_settings = new Url('system.theme_settings');
-    $url_system_theme_settings_theme = new Url('system.theme_settings_theme', array('theme' => $theme));
+    $url_system_theme_settings_theme = new Url('system.theme_settings_theme', ['theme' => $theme]);
 
     if ($url_system_theme_settings->access() && $url_system_theme_settings_theme->access()) {
       // Provide links to the Appearance Settings and Theme Settings pages
       // if the user has access to administer themes.
-      $site_logo_description = $this->t('Defined on the <a href=":appearance">Appearance Settings</a> or <a href=":theme">Theme Settings</a> page.', array(
+      $site_logo_description = $this->t('Defined on the <a href=":appearance">Appearance Settings</a> or <a href=":theme">Theme Settings</a> page.', [
         ':appearance' => $url_system_theme_settings->toString(),
         ':theme' => $url_system_theme_settings_theme->toString(),
-      ));
+      ]);
     }
     else {
       // Explain that the user does not have access to the Appearance and Theme
@@ -99,8 +99,8 @@ class SystemBrandingBlock extends BlockBase implements ContainerFactoryPluginInt
 
       // Provide link to Site Information page if the user has access to
       // administer site configuration.
-      $site_name_description = $this->t('Defined on the <a href=":information">Site Information</a> page.', array(':information' => $site_information_url));
-      $site_slogan_description = $this->t('Defined on the <a href=":information">Site Information</a> page.', array(':information' => $site_information_url));
+      $site_name_description = $this->t('Defined on the <a href=":information">Site Information</a> page.', [':information' => $site_information_url]);
+      $site_slogan_description = $this->t('Defined on the <a href=":information">Site Information</a> page.', [':information' => $site_information_url]);
     }
     else {
       // Explain that the user does not have access to the Site Information
@@ -109,30 +109,30 @@ class SystemBrandingBlock extends BlockBase implements ContainerFactoryPluginInt
       $site_slogan_description = $this->t('Defined on the Site Information page. You do not have the appropriate permissions to change the site logo.');
     }
 
-    $form['block_branding'] = array(
+    $form['block_branding'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Toggle branding elements'),
       '#description' => $this->t('Choose which branding elements you want to show in this block instance.'),
-    );
-    $form['block_branding']['use_site_logo'] = array(
+    ];
+    $form['block_branding']['use_site_logo'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Site logo'),
       '#description' => $site_logo_description,
       '#default_value' => $this->configuration['use_site_logo'],
-    );
+    ];
 
-    $form['block_branding']['use_site_name'] = array(
+    $form['block_branding']['use_site_name'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Site name'),
       '#description' => $site_name_description,
       '#default_value' => $this->configuration['use_site_name'],
-    );
-    $form['block_branding']['use_site_slogan'] = array(
+    ];
+    $form['block_branding']['use_site_slogan'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Site slogan'),
       '#description' => $site_slogan_description,
       '#default_value' => $this->configuration['use_site_slogan'],
-    );
+    ];
     return $form;
   }
 
@@ -150,25 +150,25 @@ class SystemBrandingBlock extends BlockBase implements ContainerFactoryPluginInt
    * {@inheritdoc}
    */
   public function build() {
-    $build = array();
+    $build = [];
     $site_config = $this->configFactory->get('system.site');
 
-    $build['site_logo'] = array(
+    $build['site_logo'] = [
       '#theme' => 'image',
       '#uri' => theme_get_setting('logo.url'),
       '#alt' => $this->t('Home'),
       '#access' => $this->configuration['use_site_logo'],
-    );
+    ];
 
-    $build['site_name'] = array(
+    $build['site_name'] = [
       '#markup' => $site_config->get('name'),
       '#access' => $this->configuration['use_site_name'],
-    );
+    ];
 
-    $build['site_slogan'] = array(
+    $build['site_slogan'] = [
       '#markup' => $site_config->get('slogan'),
       '#access' => $this->configuration['use_site_slogan'],
-    );
+    ];
 
     return $build;
   }
diff --git a/web/core/modules/system/src/Plugin/Block/SystemMenuBlock.php b/web/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
index de9ee7975..c142c86c8 100644
--- a/web/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
+++ b/web/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
@@ -76,36 +76,36 @@ class SystemMenuBlock extends BlockBase implements ContainerFactoryPluginInterfa
     $config = $this->configuration;
 
     $defaults = $this->defaultConfiguration();
-    $form['menu_levels'] = array(
+    $form['menu_levels'] = [
       '#type' => 'details',
       '#title' => $this->t('Menu levels'),
       // Open if not set to defaults.
       '#open' => $defaults['level'] !== $config['level'] || $defaults['depth'] !== $config['depth'],
       '#process' => [[get_class(), 'processMenuLevelParents']],
-    );
+    ];
 
     $options = range(0, $this->menuTree->maxDepth());
     unset($options[0]);
 
-    $form['menu_levels']['level'] = array(
+    $form['menu_levels']['level'] = [
       '#type' => 'select',
-      '#title' => $this->t('Initial menu level'),
+      '#title' => $this->t('Initial visibility level'),
       '#default_value' => $config['level'],
       '#options' => $options,
-      '#description' => $this->t('The menu will only be visible if the menu item for the current page is at or below the selected starting level. Select level 1 to always keep this menu visible.'),
+      '#description' => $this->t('The menu is only visible if the menu item for the current page is at this level or below it. Use level 1 to always display this menu.'),
       '#required' => TRUE,
-    );
+    ];
 
     $options[0] = $this->t('Unlimited');
 
-    $form['menu_levels']['depth'] = array(
+    $form['menu_levels']['depth'] = [
       '#type' => 'select',
-      '#title' => $this->t('Maximum number of menu levels to display'),
+      '#title' => $this->t('Number of levels to display'),
       '#default_value' => $config['depth'],
       '#options' => $options,
-      '#description' => $this->t('The maximum number of menu levels to show, starting from the initial menu level. For example: with an initial level 2 and a maximum number of 3, menu levels 2, 3 and 4 can be displayed.'),
+      '#description' => $this->t('This maximum number includes the initial level.'),
       '#required' => TRUE,
-    );
+    ];
 
     return $form;
   }
@@ -148,10 +148,10 @@ class SystemMenuBlock extends BlockBase implements ContainerFactoryPluginInterfa
     }
 
     $tree = $this->menuTree->load($menu_name, $parameters);
-    $manipulators = array(
-      array('callable' => 'menu.default_tree_manipulators:checkAccess'),
-      array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
-    );
+    $manipulators = [
+      ['callable' => 'menu.default_tree_manipulators:checkAccess'],
+      ['callable' => 'menu.default_tree_manipulators:generateIndexAndSort'],
+    ];
     $tree = $this->menuTree->transform($tree, $manipulators);
     return $this->menuTree->build($tree);
   }
diff --git a/web/core/modules/system/src/Plugin/Block/SystemMessagesBlock.php b/web/core/modules/system/src/Plugin/Block/SystemMessagesBlock.php
index bbfb03695..0b6638f43 100644
--- a/web/core/modules/system/src/Plugin/Block/SystemMessagesBlock.php
+++ b/web/core/modules/system/src/Plugin/Block/SystemMessagesBlock.php
@@ -22,9 +22,9 @@ class SystemMessagesBlock extends BlockBase implements MessagesBlockPluginInterf
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'label_display' => FALSE,
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php b/web/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php
index 132b00030..c1e0ba8b8 100644
--- a/web/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php
+++ b/web/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php
@@ -25,7 +25,7 @@ class SystemPoweredByBlock extends BlockBase {
    * {@inheritdoc}
    */
   public function build() {
-    return array('#markup' => '<span>' . $this->t('Powered by <a href=":poweredby">Drupal</a>', array(':poweredby' => 'https://www.drupal.org')) . '</span>');
+    return ['#markup' => '<span>' . $this->t('Powered by <a href=":poweredby">Drupal</a>', [':poweredby' => 'https://www.drupal.org']) . '</span>'];
   }
 
 }
diff --git a/web/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php b/web/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php
index 2f7375dce..d282963aa 100644
--- a/web/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php
+++ b/web/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php
@@ -70,21 +70,21 @@ class CurrentThemeCondition extends ConditionPluginBase implements ContainerFact
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array('theme' => '') + parent::defaultConfiguration();
+    return ['theme' => ''] + parent::defaultConfiguration();
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['theme'] = array(
+    $form['theme'] = [
       '#type' => 'select',
       '#title' => $this->t('Theme'),
       '#default_value' => $this->configuration['theme'],
       '#options' => array_map(function ($theme_info) {
         return $theme_info->info['name'];
       }, $this->themeHandler->listInfo()),
-    );
+    ];
     return parent::buildConfigurationForm($form, $form_state);
   }
 
@@ -112,10 +112,10 @@ class CurrentThemeCondition extends ConditionPluginBase implements ContainerFact
    */
   public function summary() {
     if ($this->isNegated()) {
-      return $this->t('The current theme is not @theme', array('@theme' => $this->configuration['theme']));
+      return $this->t('The current theme is not @theme', ['@theme' => $this->configuration['theme']]);
     }
 
-    return $this->t('The current theme is @theme', array('@theme' => $this->configuration['theme']));
+    return $this->t('The current theme is @theme', ['@theme' => $this->configuration['theme']]);
   }
 
   /**
diff --git a/web/core/modules/system/src/Plugin/Condition/RequestPath.php b/web/core/modules/system/src/Plugin/Condition/RequestPath.php
index 17373cef7..ae9d77da2 100644
--- a/web/core/modules/system/src/Plugin/Condition/RequestPath.php
+++ b/web/core/modules/system/src/Plugin/Condition/RequestPath.php
@@ -94,22 +94,22 @@ class RequestPath extends ConditionPluginBase implements ContainerFactoryPluginI
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array('pages' => '') + parent::defaultConfiguration();
+    return ['pages' => ''] + parent::defaultConfiguration();
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['pages'] = array(
+    $form['pages'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Pages'),
       '#default_value' => $this->configuration['pages'],
-      '#description' => $this->t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. An example path is %user-wildcard for every user page. %front is the front page.", array(
+      '#description' => $this->t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. An example path is %user-wildcard for every user page. %front is the front page.", [
         '%user-wildcard' => '/user/*',
         '%front' => '<front>',
-      )),
-    );
+      ]),
+    ];
     return parent::buildConfigurationForm($form, $form_state);
   }
 
@@ -128,9 +128,9 @@ class RequestPath extends ConditionPluginBase implements ContainerFactoryPluginI
     $pages = array_map('trim', explode("\n", $this->configuration['pages']));
     $pages = implode(', ', $pages);
     if (!empty($this->configuration['negate'])) {
-      return $this->t('Do not return true on the following pages: @pages', array('@pages' => $pages));
+      return $this->t('Do not return true on the following pages: @pages', ['@pages' => $pages]);
     }
-    return $this->t('Return true on the following pages: @pages', array('@pages' => $pages));
+    return $this->t('Return true on the following pages: @pages', ['@pages' => $pages]);
   }
 
   /**
diff --git a/web/core/modules/system/src/Plugin/Derivative/SystemMenuBlock.php b/web/core/modules/system/src/Plugin/Derivative/SystemMenuBlock.php
index 2f802e650..5da502717 100644
--- a/web/core/modules/system/src/Plugin/Derivative/SystemMenuBlock.php
+++ b/web/core/modules/system/src/Plugin/Derivative/SystemMenuBlock.php
@@ -47,7 +47,7 @@ class SystemMenuBlock extends DeriverBase implements ContainerDeriverInterface {
     foreach ($this->menuStorage->loadMultiple() as $menu => $entity) {
       $this->derivatives[$menu] = $base_plugin_definition;
       $this->derivatives[$menu]['admin_label'] = $entity->label();
-      $this->derivatives[$menu]['config_dependencies']['config'] = array($entity->getConfigDependencyName());
+      $this->derivatives[$menu]['config_dependencies']['config'] = [$entity->getConfigDependencyName()];
     }
     return $this->derivatives;
   }
diff --git a/web/core/modules/system/src/Plugin/Derivative/ThemeLocalTask.php b/web/core/modules/system/src/Plugin/Derivative/ThemeLocalTask.php
index 3ff29dcb3..ab9f87d94 100644
--- a/web/core/modules/system/src/Plugin/Derivative/ThemeLocalTask.php
+++ b/web/core/modules/system/src/Plugin/Derivative/ThemeLocalTask.php
@@ -46,7 +46,7 @@ class ThemeLocalTask extends DeriverBase implements ContainerDeriverInterface {
       if ($this->themeHandler->hasUi($theme_name)) {
         $this->derivatives[$theme_name] = $base_plugin_definition;
         $this->derivatives[$theme_name]['title'] = $theme->info['name'];
-        $this->derivatives[$theme_name]['route_parameters'] = array('theme' => $theme_name);
+        $this->derivatives[$theme_name]['route_parameters'] = ['theme' => $theme_name];
       }
     }
     return $this->derivatives;
diff --git a/web/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/web/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
index 7b195cc9b..818c5b5cf 100644
--- a/web/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
+++ b/web/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
@@ -143,7 +143,7 @@ class GDToolkit extends ImageToolkitBase {
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['image_jpeg_quality'] = array(
+    $form['image_jpeg_quality'] = [
       '#type' => 'number',
       '#title' => t('JPEG quality'),
       '#description' => t('Define the image quality for JPEG manipulations. Ranges from 0 to 100. Higher values mean better image quality but bigger files.'),
@@ -151,7 +151,7 @@ class GDToolkit extends ImageToolkitBase {
       '#max' => 100,
       '#default_value' => $this->configFactory->getEditable('system.image.gd')->get('jpeg_quality', FALSE),
       '#field_suffix' => t('%'),
-    );
+    ];
     return $form;
   }
 
@@ -160,7 +160,7 @@ class GDToolkit extends ImageToolkitBase {
    */
   public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
     $this->configFactory->getEditable('system.image.gd')
-      ->set('jpeg_quality', $form_state->getValue(array('gd', 'image_jpeg_quality')))
+      ->set('jpeg_quality', $form_state->getValue(['gd', 'image_jpeg_quality']))
       ->save();
   }
 
@@ -186,13 +186,13 @@ class GDToolkit extends ImageToolkitBase {
         // Convert indexed images to truecolor, copying the image to a new
         // truecolor resource, so that filters work correctly and don't result
         // in unnecessary dither.
-        $data = array(
+        $data = [
           'width' => imagesx($resource),
           'height' => imagesy($resource),
           'extension' => image_type_to_extension($this->getType(), FALSE),
           'transparent_color' => $this->getTransparentColor(),
           'is_temp' => TRUE,
-        );
+        ];
         if ($this->apply('create_new', $data)) {
           imagecopy($this->getResource(), $resource, 0, 0, 0, 0, imagesx($resource), imagesy($resource));
           imagedestroy($resource);
@@ -362,13 +362,13 @@ class GDToolkit extends ImageToolkitBase {
    * {@inheritdoc}
    */
   public function getRequirements() {
-    $requirements = array();
+    $requirements = [];
 
     $info = gd_info();
-    $requirements['version'] = array(
+    $requirements['version'] = [
       'title' => t('GD library'),
       'value' => $info['GD Version'],
-    );
+    ];
 
     // Check for filter and rotate support.
     if (!function_exists('imagefilter') || !function_exists('imagerotate')) {
@@ -391,7 +391,7 @@ class GDToolkit extends ImageToolkitBase {
    * {@inheritdoc}
    */
   public static function getSupportedExtensions() {
-    $extensions = array();
+    $extensions = [];
     foreach (static::supportedTypes() as $image_type) {
       // @todo Automatically fetch possible extensions for each mime type.
       // @see https://www.drupal.org/node/2311679
@@ -440,7 +440,7 @@ class GDToolkit extends ImageToolkitBase {
    *   IMAGETYPE_* constant (e.g. IMAGETYPE_JPEG, IMAGETYPE_PNG, etc.).
    */
   protected static function supportedTypes() {
-    return array(IMAGETYPE_PNG, IMAGETYPE_JPEG, IMAGETYPE_GIF);
+    return [IMAGETYPE_PNG, IMAGETYPE_JPEG, IMAGETYPE_GIF];
   }
 
 }
diff --git a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
index 7c5fca146..5404e2e00 100644
--- a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
+++ b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
@@ -19,11 +19,11 @@ class Convert extends GDImageToolkitOperationBase {
    * {@inheritdoc}
    */
   protected function arguments() {
-    return array(
-      'extension' => array(
+    return [
+      'extension' => [
         'description' => 'The new extension of the converted image',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -47,13 +47,13 @@ class Convert extends GDImageToolkitOperationBase {
     $height = $this->getToolkit()->getHeight();
     $original_resource = $this->getToolkit()->getResource();
     $original_type = $this->getToolkit()->getType();
-    $data = array(
+    $data = [
       'width' => $width,
       'height' => $height,
       'extension' => $arguments['extension'],
       'transparent_color' => $this->getToolkit()->getTransparentColor(),
       'is_temp' => TRUE,
-    );
+    ];
     if ($this->getToolkit()->apply('create_new', $data)) {
       if (imagecopyresampled($this->getToolkit()->getResource(), $original_resource, 0, 0, 0, 0, $width, $height, $width, $height)) {
         imagedestroy($original_resource);
diff --git a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
index 0d1c5a611..cb57cc489 100644
--- a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
+++ b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
@@ -21,29 +21,29 @@ class CreateNew extends GDImageToolkitOperationBase {
    * {@inheritdoc}
    */
   protected function arguments() {
-    return array(
-      'width' => array(
+    return [
+      'width' => [
         'description' => 'The width of the image, in pixels',
-      ),
-      'height' => array(
+      ],
+      'height' => [
         'description' => 'The height of the image, in pixels',
-      ),
-      'extension' => array(
+      ],
+      'extension' => [
         'description' => 'The extension of the image file (e.g. png, gif, etc.)',
         'required' => FALSE,
         'default' => 'png',
-      ),
-      'transparent_color' => array(
+      ],
+      'transparent_color' => [
         'description' => 'The RGB hex color for GIF transparency',
         'required' => FALSE,
         'default' => '#ffffff',
-      ),
-      'is_temp' => array(
+      ],
+      'is_temp' => [
         'description' => 'If TRUE, this operation is being used to create a temporary image by another GD operation. After performing its function, the caller is responsible for destroying the original GD resource.',
         'required' => FALSE,
         'default' => FALSE,
-      ),
-    );
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
index e5ca672f0..07a112b91 100644
--- a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
+++ b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
@@ -19,24 +19,24 @@ class Crop extends GDImageToolkitOperationBase {
    * {@inheritdoc}
    */
   protected function arguments() {
-    return array(
-      'x' => array(
+    return [
+      'x' => [
         'description' => 'The starting x offset at which to start the crop, in pixels',
-      ),
-      'y' => array(
+      ],
+      'y' => [
         'description' => 'The starting y offset at which to start the crop, in pixels',
-      ),
-      'width' => array(
+      ],
+      'width' => [
         'description' => 'The width of the cropped area, in pixels',
         'required' => FALSE,
         'default' => NULL,
-      ),
-      'height' => array(
+      ],
+      'height' => [
         'description' => 'The height of the cropped area, in pixels',
         'required' => FALSE,
         'default' => NULL,
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -54,7 +54,7 @@ class Crop extends GDImageToolkitOperationBase {
     $arguments['width'] = empty($arguments['width']) ? $arguments['height'] / $aspect : $arguments['width'];
 
     // Assure integers for all arguments.
-    foreach (array('x', 'y', 'width', 'height') as $key) {
+    foreach (['x', 'y', 'width', 'height'] as $key) {
       $arguments[$key] = (int) round($arguments[$key]);
     }
 
@@ -77,13 +77,13 @@ class Crop extends GDImageToolkitOperationBase {
     // the original resource on it with resampling. Destroy the original
     // resource upon success.
     $original_resource = $this->getToolkit()->getResource();
-    $data = array(
+    $data = [
       'width' => $arguments['width'],
       'height' => $arguments['height'],
       'extension' => image_type_to_extension($this->getToolkit()->getType(), FALSE),
       'transparent_color' => $this->getToolkit()->getTransparentColor(),
       'is_temp' => TRUE,
-    );
+    ];
     if ($this->getToolkit()->apply('create_new', $data)) {
       if (imagecopyresampled($this->getToolkit()->getResource(), $original_resource, 0, 0, $arguments['x'], $arguments['y'], $arguments['width'], $arguments['height'], $arguments['width'], $arguments['height'])) {
         imagedestroy($original_resource);
diff --git a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Desaturate.php b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Desaturate.php
index bae8483ef..54ed29b9b 100644
--- a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Desaturate.php
+++ b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Desaturate.php
@@ -20,7 +20,7 @@ class Desaturate extends GDImageToolkitOperationBase {
    */
   protected function arguments() {
     // This operation does not use any parameters.
-    return array();
+    return [];
   }
 
   /**
@@ -29,7 +29,7 @@ class Desaturate extends GDImageToolkitOperationBase {
   protected function execute(array $arguments) {
     // PHP installations using non-bundled GD do not have imagefilter.
     if (!function_exists('imagefilter')) {
-      $this->logger->notice("The image '@file' could not be desaturated because the imagefilter() function is not available in this PHP installation.", array('@file' => $this->getToolkit()->getSource()));
+      $this->logger->notice("The image '@file' could not be desaturated because the imagefilter() function is not available in this PHP installation.", ['@file' => $this->getToolkit()->getSource()]);
       return FALSE;
     }
 
diff --git a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
index 51c5f53a7..155bef246 100644
--- a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
+++ b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
@@ -19,14 +19,14 @@ class Resize extends GDImageToolkitOperationBase {
    * {@inheritdoc}
    */
   protected function arguments() {
-    return array(
-      'width' => array(
+    return [
+      'width' => [
         'description' => 'The new width of the resized image, in pixels',
-      ),
-      'height' => array(
+      ],
+      'height' => [
         'description' => 'The new height of the resized image, in pixels',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -51,18 +51,18 @@ class Resize extends GDImageToolkitOperationBase {
   /**
    * {@inheritdoc}
    */
-  protected function execute(array $arguments = array()) {
+  protected function execute(array $arguments = []) {
     // Create a new resource of the required dimensions, and copy and resize
     // the original resource on it with resampling. Destroy the original
     // resource upon success.
     $original_resource = $this->getToolkit()->getResource();
-    $data = array(
+    $data = [
       'width' => $arguments['width'],
       'height' => $arguments['height'],
       'extension' => image_type_to_extension($this->getToolkit()->getType(), FALSE),
       'transparent_color' => $this->getToolkit()->getTransparentColor(),
       'is_temp' => TRUE,
-    );
+    ];
     if ($this->getToolkit()->apply('create_new', $data)) {
       if (imagecopyresampled($this->getToolkit()->getResource(), $original_resource, 0, 0, 0, 0, $arguments['width'], $arguments['height'], imagesx($original_resource), imagesy($original_resource))) {
         imagedestroy($original_resource);
diff --git a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Rotate.php b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Rotate.php
index 62a5405d7..433561253 100644
--- a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Rotate.php
+++ b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Rotate.php
@@ -21,16 +21,16 @@ class Rotate extends GDImageToolkitOperationBase {
    * {@inheritdoc}
    */
   protected function arguments() {
-    return array(
-      'degrees' => array(
+    return [
+      'degrees' => [
         'description' => 'The number of (clockwise) degrees to rotate the image',
-      ),
-      'background' => array(
+      ],
+      'background' => [
         'description' => "A string specifying the hexadecimal color code to use as background for the uncovered area of the image after the rotation. E.g. '#000000' for black, '#ff00ff' for magenta, and '#ffffff' for white. For images that support transparency, this will default to transparent white",
         'required' => FALSE,
         'default' => NULL,
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -45,11 +45,11 @@ class Rotate extends GDImageToolkitOperationBase {
     // Validate or set background color argument.
     if (!empty($arguments['background'])) {
       // Validate the background color: Color::hexToRgb does so for us.
-      $background = Color::hexToRgb($arguments['background']) + array( 'alpha' => 0 );
+      $background = Color::hexToRgb($arguments['background']) + [ 'alpha' => 0 ];
     }
     else {
       // Background color is not specified: use transparent white as background.
-      $background = array('red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127);
+      $background = ['red' => 255, 'green' => 255, 'blue' => 255, 'alpha' => 127];
     }
     // Store the color index for the background as that is what GD uses.
     $arguments['background_idx'] = imagecolorallocatealpha($this->getToolkit()->getResource(), $background['red'], $background['green'], $background['blue'], $background['alpha']);
@@ -89,7 +89,7 @@ class Rotate extends GDImageToolkitOperationBase {
   protected function execute(array $arguments) {
     // PHP installations using non-bundled GD do not have imagerotate.
     if (!function_exists('imagerotate')) {
-      $this->logger->notice('The image %file could not be rotated because the imagerotate() function is not available in this PHP installation.', array('%file' => $this->getToolkit()->getSource()));
+      $this->logger->notice('The image %file could not be rotated because the imagerotate() function is not available in this PHP installation.', ['%file' => $this->getToolkit()->getSource()]);
       return FALSE;
     }
 
diff --git a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
index bd7a95278..37097d864 100644
--- a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
+++ b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
@@ -19,23 +19,23 @@ class Scale extends Resize {
    * {@inheritdoc}
    */
   protected function arguments() {
-    return array(
-      'width' => array(
+    return [
+      'width' => [
         'description' => 'The target width, in pixels. This value is omitted then the scaling will based only on the height value',
         'required' => FALSE,
         'default' => NULL,
-      ),
-      'height' => array(
+      ],
+      'height' => [
         'description' => 'The target height, in pixels. This value is omitted then the scaling will based only on the width value',
         'required' => FALSE,
         'default' => NULL,
-      ),
-      'upscale' => array(
+      ],
+      'upscale' => [
         'description' => 'Boolean indicating that files smaller than the dimensions will be scaled up. This generally results in a low quality image',
         'required' => FALSE,
         'default' => FALSE,
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -78,7 +78,7 @@ class Scale extends Resize {
   /**
    * {@inheritdoc}
    */
-  protected function execute(array $arguments = array()) {
+  protected function execute(array $arguments = []) {
     // Don't scale if we don't change the dimensions at all.
     if ($arguments['width'] !== $this->getToolkit()->getWidth() || $arguments['height'] !== $this->getToolkit()->getHeight()) {
       // Don't upscale if the option isn't enabled.
diff --git a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
index 8568823bf..510020f8d 100644
--- a/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
+++ b/web/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
@@ -19,14 +19,14 @@ class ScaleAndCrop extends GDImageToolkitOperationBase {
    * {@inheritdoc}
    */
   protected function arguments() {
-    return array(
-      'width' => array(
+    return [
+      'width' => [
         'description' => 'The target width, in pixels',
-      ),
-      'height' => array(
+      ],
+      'height' => [
         'description' => 'The target height, in pixels',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -40,10 +40,10 @@ class ScaleAndCrop extends GDImageToolkitOperationBase {
 
     $arguments['x'] = (int) round(($actualWidth * $scaleFactor - $arguments['width']) / 2);
     $arguments['y'] = (int) round(($actualHeight * $scaleFactor - $arguments['height']) / 2);
-    $arguments['resize'] = array(
+    $arguments['resize'] = [
       'width' => (int) round($actualWidth * $scaleFactor),
       'height' => (int) round($actualHeight * $scaleFactor),
-    );
+    ];
 
     // Fail when width or height are 0 or negative.
     if ($arguments['width'] <= 0) {
@@ -59,7 +59,7 @@ class ScaleAndCrop extends GDImageToolkitOperationBase {
   /**
    * {@inheritdoc}
    */
-  protected function execute(array $arguments = array()) {
+  protected function execute(array $arguments = []) {
     return $this->getToolkit()->apply('resize', $arguments['resize'])
         && $this->getToolkit()->apply('crop', $arguments);
   }
diff --git a/web/core/modules/system/src/Plugin/migrate/source/Menu.php b/web/core/modules/system/src/Plugin/migrate/source/Menu.php
index 6dbf2e7a4..c55bc4bb7 100644
--- a/web/core/modules/system/src/Plugin/migrate/source/Menu.php
+++ b/web/core/modules/system/src/Plugin/migrate/source/Menu.php
@@ -25,11 +25,11 @@ class Menu extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'menu_name' => $this->t('The menu name. Primary key.'),
       'title' => $this->t('The human-readable name of the menu.'),
       'description' => $this->t('A description of the menu'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/system/src/Plugin/views/field/BulkForm.php b/web/core/modules/system/src/Plugin/views/field/BulkForm.php
index f9f581b42..65fdc51cc 100644
--- a/web/core/modules/system/src/Plugin/views/field/BulkForm.php
+++ b/web/core/modules/system/src/Plugin/views/field/BulkForm.php
@@ -49,7 +49,7 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
    *
    * @var \Drupal\system\ActionConfigEntityInterface[]
    */
-  protected $actions = array();
+  protected $actions = [];
 
   /**
    * The language manager.
@@ -162,13 +162,13 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['action_title'] = array('default' => $this->t('Action'));
-    $options['include_exclude'] = array(
+    $options['action_title'] = ['default' => $this->t('Action')];
+    $options['include_exclude'] = [
       'default' => 'exclude',
-    );
-    $options['selected_actions'] = array(
-      'default' => array(),
-    );
+    ];
+    $options['selected_actions'] = [
+      'default' => [],
+    ];
     return $options;
   }
 
@@ -176,28 +176,28 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['action_title'] = array(
+    $form['action_title'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Action title'),
       '#default_value' => $this->options['action_title'],
       '#description' => $this->t('The title shown above the actions dropdown.'),
-    );
+    ];
 
-    $form['include_exclude'] = array(
+    $form['include_exclude'] = [
       '#type' => 'radios',
       '#title' => $this->t('Available actions'),
-      '#options' => array(
+      '#options' => [
         'exclude' => $this->t('All actions, except selected'),
         'include' => $this->t('Only selected actions'),
-      ),
+      ],
       '#default_value' => $this->options['include_exclude'],
-    );
-    $form['selected_actions'] = array(
+    ];
+    $form['selected_actions'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Selected actions'),
       '#options' => $this->getBulkOptions(FALSE),
       '#default_value' => $this->options['selected_actions'],
-    );
+    ];
 
     parent::buildOptionsForm($form, $form_state);
   }
@@ -208,8 +208,8 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
   public function validateOptionsForm(&$form, FormStateInterface $form_state) {
     parent::validateOptionsForm($form, $form_state);
 
-    $selected_actions = $form_state->getValue(array('options', 'selected_actions'));
-    $form_state->setValue(array('options', 'selected_actions'), array_values(array_filter($selected_actions)));
+    $selected_actions = $form_state->getValue(['options', 'selected_actions']);
+    $form_state->setValue(['options', 'selected_actions'], array_values(array_filter($selected_actions)));
   }
 
   /**
@@ -259,7 +259,7 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
       foreach ($this->view->result as $row_index => $row) {
         $entity = $this->getEntityTranslation($this->getEntity($row), $row);
 
-        $form[$this->options['id']][$row_index] = array(
+        $form[$this->options['id']][$row_index] = [
           '#type' => 'checkbox',
           // We are not able to determine a main "title" for each row, so we can
           // only output a generic label.
@@ -267,28 +267,28 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
           '#title_display' => 'invisible',
           '#default_value' => !empty($form_state->getValue($this->options['id'])[$row_index]) ? 1 : NULL,
           '#return_value' => $this->calculateEntityBulkFormKey($entity, $use_revision),
-        );
+        ];
       }
 
       // Replace the form submit button label.
       $form['actions']['submit']['#value'] = $this->t('Apply to selected items');
 
       // Ensure a consistent container for filters/operations in the view header.
-      $form['header'] = array(
+      $form['header'] = [
         '#type' => 'container',
         '#weight' => -100,
-      );
+      ];
 
       // Build the bulk operations action widget for the header.
       // Allow themes to apply .container-inline on this separate container.
-      $form['header'][$this->options['id']] = array(
+      $form['header'][$this->options['id']] = [
         '#type' => 'container',
-      );
-      $form['header'][$this->options['id']]['action'] = array(
+      ];
+      $form['header'][$this->options['id']]['action'] = [
         '#type' => 'select',
         '#title' => $this->options['action_title'],
         '#options' => $this->getBulkOptions(),
-      );
+      ];
 
       // Duplicate the form actions into the action container in the header.
       $form['header'][$this->options['id']]['actions'] = $form['actions'];
@@ -308,7 +308,7 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
    *   An associative array of operations, suitable for a select element.
    */
   protected function getBulkOptions($filtered = TRUE) {
-    $options = array();
+    $options = [];
     // Filter the action list.
     foreach ($this->actions as $id => $action) {
       if ($filtered) {
@@ -344,9 +344,12 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
    */
   public function viewsFormSubmit(&$form, FormStateInterface $form_state) {
     if ($form_state->get('step') == 'views_form_views_form') {
-      // Filter only selected checkboxes.
-      $selected = array_filter($form_state->getValue($this->options['id']));
-      $entities = array();
+      // Filter only selected checkboxes. Use the actual user input rather than
+      // the raw form values array, since the site data may change before the
+      // bulk form is submitted, which can lead to data loss.
+      $user_input = $form_state->getUserInput();
+      $selected = array_filter($user_input[$this->options['id']]);
+      $entities = [];
       $action = $this->actions[$form_state->getValue('action')];
       $count = 0;
 
@@ -372,18 +375,18 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
 
       $operation_definition = $action->getPluginDefinition();
       if (!empty($operation_definition['confirm_form_route_name'])) {
-        $options = array(
+        $options = [
           'query' => $this->getDestinationArray(),
-        );
-        $form_state->setRedirect($operation_definition['confirm_form_route_name'], array(), $options);
+        ];
+        $form_state->setRedirect($operation_definition['confirm_form_route_name'], [], $options);
       }
       else {
         // Don't display the message unless there are some elements affected and
         // there is no confirmation form.
         if ($count) {
-          drupal_set_message($this->formatPlural($count, '%action was applied to @count item.', '%action was applied to @count items.', array(
+          drupal_set_message($this->formatPlural($count, '%action was applied to @count item.', '%action was applied to @count items.', [
             '%action' => $action->label(),
-          )));
+          ]));
         }
       }
     }
diff --git a/web/core/modules/system/src/SystemConfigSubscriber.php b/web/core/modules/system/src/SystemConfigSubscriber.php
index 3c0de5fa4..ddd37be37 100644
--- a/web/core/modules/system/src/SystemConfigSubscriber.php
+++ b/web/core/modules/system/src/SystemConfigSubscriber.php
@@ -81,11 +81,11 @@ class SystemConfigSubscriber implements EventSubscriberInterface {
    * {@inheritdoc}
    */
   public static function getSubscribedEvents() {
-    $events[ConfigEvents::SAVE][] = array('onConfigSave', 0);
+    $events[ConfigEvents::SAVE][] = ['onConfigSave', 0];
     // The empty check has a high priority so that it can stop propagation if
     // there is no configuration to import.
-    $events[ConfigEvents::IMPORT_VALIDATE][] = array('onConfigImporterValidateNotEmpty', 512);
-    $events[ConfigEvents::IMPORT_VALIDATE][] = array('onConfigImporterValidateSiteUUID', 256);
+    $events[ConfigEvents::IMPORT_VALIDATE][] = ['onConfigImporterValidateNotEmpty', 512];
+    $events[ConfigEvents::IMPORT_VALIDATE][] = ['onConfigImporterValidateSiteUUID', 256];
     return $events;
   }
 
diff --git a/web/core/modules/system/src/SystemManager.php b/web/core/modules/system/src/SystemManager.php
index e5d3a18bd..d2e03443d 100644
--- a/web/core/modules/system/src/SystemManager.php
+++ b/web/core/modules/system/src/SystemManager.php
@@ -109,8 +109,8 @@ class SystemManager {
     drupal_load_updates();
 
     // Check run-time requirements and status information.
-    $requirements = $this->moduleHandler->invokeAll('requirements', array('runtime'));
-    usort($requirements, function($a, $b) {
+    $requirements = $this->moduleHandler->invokeAll('requirements', ['runtime']);
+    uasort($requirements, function($a, $b) {
       if (!isset($a['weight'])) {
         if (!isset($b['weight'])) {
           return strcasecmp($a['title'], $b['title']);
@@ -159,15 +159,15 @@ class SystemManager {
     // or elsewhere could give us a blank block.
     $link = $this->menuActiveTrail->getActiveLink('admin');
     if ($link && $content = $this->getAdminBlock($link)) {
-      $output = array(
+      $output = [
         '#theme' => 'admin_block_content',
         '#content' => $content,
-      );
+      ];
     }
     else {
-      $output = array(
+      $output = [
         '#markup' => t('You do not have any administrative items.'),
-      );
+      ];
     }
     return $output;
   }
@@ -182,16 +182,16 @@ class SystemManager {
    *   An array of menu items, as expected by admin-block-content.html.twig.
    */
   public function getAdminBlock(MenuLinkInterface $instance) {
-    $content = array();
+    $content = [];
     // Only find the children of this link.
     $link_id = $instance->getPluginId();
     $parameters = new MenuTreeParameters();
     $parameters->setRoot($link_id)->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks();
     $tree = $this->menuTree->load(NULL, $parameters);
-    $manipulators = array(
-      array('callable' => 'menu.default_tree_manipulators:checkAccess'),
-      array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
-    );
+    $manipulators = [
+      ['callable' => 'menu.default_tree_manipulators:checkAccess'],
+      ['callable' => 'menu.default_tree_manipulators:generateIndexAndSort'],
+    ];
     $tree = $this->menuTree->transform($tree, $manipulators);
     foreach ($tree as $key => $element) {
       // Only render accessible links.
diff --git a/web/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php b/web/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php
index 4ca7390a1..4116f5f89 100644
--- a/web/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php
+++ b/web/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php
@@ -11,13 +11,13 @@ class AjaxInGroupTest extends AjaxTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalLogin($this->drupalCreateUser(array('access content')));
+    $this->drupalLogin($this->drupalCreateUser(['access content']));
   }
 
   /**
    * Submits forms with select and checkbox elements via Ajax.
    */
-  function testSimpleAjaxFormValue() {
+  public function testSimpleAjaxFormValue() {
     $this->drupalGet('/ajax_forms_test_get_form');
     $this->assertText('Test group');
     $this->assertText('AJAX checkbox in a group');
diff --git a/web/core/modules/system/src/Tests/Ajax/AjaxTestBase.php b/web/core/modules/system/src/Tests/Ajax/AjaxTestBase.php
index e4db3bd9c..66e06c88a 100644
--- a/web/core/modules/system/src/Tests/Ajax/AjaxTestBase.php
+++ b/web/core/modules/system/src/Tests/Ajax/AjaxTestBase.php
@@ -14,7 +14,7 @@ abstract class AjaxTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'ajax_test', 'ajax_forms_test');
+  public static $modules = ['node', 'ajax_test', 'ajax_forms_test'];
 
   /**
    * Asserts the array of Ajax commands contains the searched command.
diff --git a/web/core/modules/system/src/Tests/Ajax/CommandsTest.php b/web/core/modules/system/src/Tests/Ajax/CommandsTest.php
index 7e26fa39d..6970cc30d 100644
--- a/web/core/modules/system/src/Tests/Ajax/CommandsTest.php
+++ b/web/core/modules/system/src/Tests/Ajax/CommandsTest.php
@@ -32,91 +32,91 @@ class CommandsTest extends AjaxTestBase {
   /**
    * Tests the various Ajax Commands.
    */
-  function testAjaxCommands() {
+  public function testAjaxCommands() {
     $form_path = 'ajax_forms_test_ajax_commands_form';
-    $web_user = $this->drupalCreateUser(array('access content'));
+    $web_user = $this->drupalCreateUser(['access content']);
     $this->drupalLogin($web_user);
 
-    $edit = array();
+    $edit = [];
 
     // Tests the 'add_css' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX 'add_css' command")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX 'add_css' command")]);
     $expected = new AddCssCommand('my/file.css');
     $this->assertCommand($commands, $expected->render(), "'add_css' AJAX command issued with correct data.");
 
     // Tests the 'after' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX 'After': Click to put something after the div")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX 'After': Click to put something after the div")]);
     $expected = new AfterCommand('#after_div', 'This will be placed after');
     $this->assertCommand($commands, $expected->render(), "'after' AJAX command issued with correct data.");
 
     // Tests the 'alert' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX 'Alert': Click to alert")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX 'Alert': Click to alert")]);
     $expected = new AlertCommand(t('Alert'));
     $this->assertCommand($commands, $expected->render(), "'alert' AJAX Command issued with correct text.");
 
     // Tests the 'append' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX 'Append': Click to append something")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX 'Append': Click to append something")]);
     $expected = new AppendCommand('#append_div', 'Appended text');
     $this->assertCommand($commands, $expected->render(), "'append' AJAX command issued with correct data.");
 
     // Tests the 'before' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX 'before': Click to put something before the div")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX 'before': Click to put something before the div")]);
     $expected = new BeforeCommand('#before_div', 'Before text');
     $this->assertCommand($commands, $expected->render(), "'before' AJAX command issued with correct data.");
 
     // Tests the 'changed' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX changed: Click to mark div changed.")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX changed: Click to mark div changed.")]);
     $expected = new ChangedCommand('#changed_div');
     $this->assertCommand($commands, $expected->render(), "'changed' AJAX command issued with correct selector.");
 
     // Tests the 'changed' command using the second argument.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX changed: Click to mark div changed with asterisk.")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX changed: Click to mark div changed with asterisk.")]);
     $expected = new ChangedCommand('#changed_div', '#changed_div_mark_this');
     $this->assertCommand($commands, $expected->render(), "'changed' AJAX command (with asterisk) issued with correct selector.");
 
     // Tests the 'css' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("Set the '#box' div to be blue.")));
-    $expected = new CssCommand('#css_div', array('background-color' => 'blue'));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("Set the '#box' div to be blue.")]);
+    $expected = new CssCommand('#css_div', ['background-color' => 'blue']);
     $this->assertCommand($commands, $expected->render(), "'css' AJAX command issued with correct selector.");
 
     // Tests the 'data' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX data command: Issue command.")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX data command: Issue command.")]);
     $expected = new DataCommand('#data_div', 'testkey', 'testvalue');
     $this->assertCommand($commands, $expected->render(), "'data' AJAX command issued with correct key and value.");
 
     // Tests the 'html' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX html: Replace the HTML in a selector.")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX html: Replace the HTML in a selector.")]);
     $expected = new HtmlCommand('#html_div', 'replacement text');
     $this->assertCommand($commands, $expected->render(), "'html' AJAX command issued with correct data.");
 
     // Tests the 'insert' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX insert: Let client insert based on #ajax['method'].")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX insert: Let client insert based on #ajax['method'].")]);
     $expected = new InsertCommand('#insert_div', 'insert replacement text');
     $this->assertCommand($commands, $expected->render(), "'insert' AJAX command issued with correct data.");
 
     // Tests the 'invoke' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX invoke command: Invoke addClass() method.")));
-    $expected = new InvokeCommand('#invoke_div', 'addClass', array('error'));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX invoke command: Invoke addClass() method.")]);
+    $expected = new InvokeCommand('#invoke_div', 'addClass', ['error']);
     $this->assertCommand($commands, $expected->render(), "'invoke' AJAX command issued with correct method and argument.");
 
     // Tests the 'prepend' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX 'prepend': Click to prepend something")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX 'prepend': Click to prepend something")]);
     $expected = new PrependCommand('#prepend_div', 'prepended text');
     $this->assertCommand($commands, $expected->render(), "'prepend' AJAX command issued with correct data.");
 
     // Tests the 'remove' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX 'remove': Click to remove text")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX 'remove': Click to remove text")]);
     $expected = new RemoveCommand('#remove_text');
     $this->assertCommand($commands, $expected->render(), "'remove' AJAX command issued with correct command and selector.");
 
     // Tests the 'restripe' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX 'restripe' command")));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX 'restripe' command")]);
     $expected = new RestripeCommand('#restripe_table');
     $this->assertCommand($commands, $expected->render(), "'restripe' AJAX command issued with correct selector.");
 
     // Tests the 'settings' command.
-    $commands = $this->drupalPostAjaxForm($form_path, $edit, array('op' => t("AJAX 'settings' command")));
-    $expected = new SettingsCommand(array('ajax_forms_test' => array('foo' => 42)));
+    $commands = $this->drupalPostAjaxForm($form_path, $edit, ['op' => t("AJAX 'settings' command")]);
+    $expected = new SettingsCommand(['ajax_forms_test' => ['foo' => 42]]);
     $this->assertCommand($commands, $expected->render(), "'settings' AJAX command issued with correct data.");
   }
 
diff --git a/web/core/modules/system/src/Tests/Ajax/DialogTest.php b/web/core/modules/system/src/Tests/Ajax/DialogTest.php
index 254f01d33..ec947825f 100644
--- a/web/core/modules/system/src/Tests/Ajax/DialogTest.php
+++ b/web/core/modules/system/src/Tests/Ajax/DialogTest.php
@@ -19,72 +19,72 @@ class DialogTest extends AjaxTestBase {
    *
    * @var array
    */
-  public static $modules = array('ajax_test', 'ajax_forms_test', 'contact');
+  public static $modules = ['ajax_test', 'ajax_forms_test', 'contact'];
 
   /**
    * Test sending non-JS and AJAX requests to open and manipulate modals.
    */
   public function testDialog() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer contact forms')));
+    $this->drupalLogin($this->drupalCreateUser(['administer contact forms']));
     // Ensure the elements render without notices or exceptions.
     $this->drupalGet('ajax-test/dialog');
 
     // Set up variables for this test.
     $dialog_renderable = AjaxTestController::dialogContents();
     $dialog_contents = \Drupal::service('renderer')->renderRoot($dialog_renderable);
-    $modal_expected_response = array(
+    $modal_expected_response = [
       'command' => 'openDialog',
       'selector' => '#drupal-modal',
       'settings' => NULL,
       'data' => $dialog_contents,
-      'dialogOptions' => array(
+      'dialogOptions' => [
         'modal' => TRUE,
         'title' => 'AJAX Dialog & contents',
-      ),
-    );
-    $form_expected_response = array(
+      ],
+    ];
+    $form_expected_response = [
       'command' => 'openDialog',
       'selector' => '#drupal-modal',
       'settings' => NULL,
-      'dialogOptions' => array(
+      'dialogOptions' => [
         'modal' => TRUE,
         'title' => 'Ajax Form contents',
-      ),
-    );
-    $entity_form_expected_response = array(
+      ],
+    ];
+    $entity_form_expected_response = [
       'command' => 'openDialog',
       'selector' => '#drupal-modal',
       'settings' => NULL,
-      'dialogOptions' => array(
+      'dialogOptions' => [
         'modal' => TRUE,
         'title' => 'Add contact form',
-      ),
-    );
-    $normal_expected_response = array(
+      ],
+    ];
+    $normal_expected_response = [
       'command' => 'openDialog',
       'selector' => '#ajax-test-dialog-wrapper-1',
       'settings' => NULL,
       'data' => $dialog_contents,
-      'dialogOptions' => array(
+      'dialogOptions' => [
         'modal' => FALSE,
         'title' => 'AJAX Dialog & contents',
-      ),
-    );
-    $no_target_expected_response = array(
+      ],
+    ];
+    $no_target_expected_response = [
       'command' => 'openDialog',
       'selector' => '#drupal-dialog-ajax-testdialog-contents',
       'settings' => NULL,
       'data' => $dialog_contents,
-      'dialogOptions' => array(
+      'dialogOptions' => [
         'modal' => FALSE,
         'title' => 'AJAX Dialog & contents',
-      ),
-    );
-    $close_expected_response = array(
+      ],
+    ];
+    $close_expected_response = [
       'command' => 'closeDialog',
       'selector' => '#ajax-test-dialog-wrapper-1',
       'persist' => FALSE,
-    );
+    ];
 
     // Check that requesting a modal dialog without JS goes to a page.
     $this->drupalGet('ajax-test/dialog-contents');
@@ -95,7 +95,7 @@ class DialogTest extends AjaxTestBase {
     $this->assertRaw($dialog_contents, 'Modal dialog page on XMLHttpRequest present.');
 
     // Emulate going to the JS version of the page and check the JSON response.
-    $ajax_result = $this->drupalGetAjax('ajax-test/dialog-contents', array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_modal')));
+    $ajax_result = $this->drupalGetAjax('ajax-test/dialog-contents', ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_modal']]);
     $this->assertEqual($modal_expected_response, $ajax_result[3], 'Modal dialog JSON response matches.');
     // Test the HTML escaping of & character.
     $this->assertEqual($ajax_result[3]['dialogOptions']['title'], 'AJAX Dialog & contents');
@@ -108,26 +108,26 @@ class DialogTest extends AjaxTestBase {
     // Emulate going to the JS version of the page and check the JSON response.
     // This needs to use WebTestBase::drupalPostAjaxForm() so that the correct
     // dialog options are sent.
-    $ajax_result = $this->drupalPostAjaxForm('ajax-test/dialog', array(
+    $ajax_result = $this->drupalPostAjaxForm('ajax-test/dialog', [
         // We have to mock a form element to make drupalPost submit from a link.
         'textfield' => 'test',
-      ), array(), 'ajax-test/dialog-contents', array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_dialog')), array(), NULL, array(
-      'submit' => array(
+      ], [], 'ajax-test/dialog-contents', ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_dialog']], [], NULL, [
+      'submit' => [
         'dialogOptions[target]' => 'ajax-test-dialog-wrapper-1',
-      )
-    ));
+      ]
+    ]);
     $this->assertEqual($normal_expected_response, $ajax_result[3], 'Normal dialog JSON response matches.');
 
     // Emulate going to the JS version of the page and check the JSON response.
     // This needs to use WebTestBase::drupalPostAjaxForm() so that the correct
     // dialog options are sent.
-    $ajax_result = $this->drupalPostAjaxForm('ajax-test/dialog', array(
+    $ajax_result = $this->drupalPostAjaxForm('ajax-test/dialog', [
         // We have to mock a form element to make drupalPost submit from a link.
         'textfield' => 'test',
-      ), array(), 'ajax-test/dialog-contents', array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_dialog')), array(), NULL, array(
+      ], [], 'ajax-test/dialog-contents', ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_dialog']], [], NULL, [
       // Don't send a target.
-      'submit' => array()
-    ));
+      'submit' => []
+    ]);
     // Make sure the selector ID starts with the right string.
     $this->assert(strpos($ajax_result[3]['selector'], $no_target_expected_response['selector']) === 0, 'Selector starts with right string.');
     unset($ajax_result[3]['selector']);
@@ -142,7 +142,7 @@ class DialogTest extends AjaxTestBase {
     // Test submitting via a POST request through the button for modals. This
     // approach more accurately reflects the real responses by Drupal because
     // all of the necessary page variables are emulated.
-    $ajax_result = $this->drupalPostAjaxForm('ajax-test/dialog', array(), 'button1');
+    $ajax_result = $this->drupalPostAjaxForm('ajax-test/dialog', [], 'button1');
 
     // Check that CSS and JavaScript are "added" to the page dynamically.
     $this->assertTrue(in_array('core/drupal.dialog.ajax', explode(',', $ajax_result[0]['settings']['ajaxPageState']['libraries'])), 'core/drupal.dialog.ajax library is added to the page.');
@@ -159,7 +159,7 @@ class DialogTest extends AjaxTestBase {
     $this->assertNotEqual($ajax_result[4]['dialogOptions']['title'], 'AJAX Dialog &amp; contents');
 
     // Abbreviated test for "normal" dialogs, testing only the difference.
-    $ajax_result = $this->drupalPostAjaxForm('ajax-test/dialog', array(), 'button2');
+    $ajax_result = $this->drupalPostAjaxForm('ajax-test/dialog', [], 'button2');
     $this->assertEqual($normal_expected_response, $ajax_result[4], 'POST request normal dialog JSON response matches.');
 
     // Check that requesting a form dialog without JS goes to a page.
@@ -170,7 +170,7 @@ class DialogTest extends AjaxTestBase {
     $this->assertTrue(!empty($form), 'Non-JS form page present.');
 
     // Emulate going to the JS version of the form and check the JSON response.
-    $ajax_result = $this->drupalGetAjax('ajax-test/dialog-form', array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_modal')));
+    $ajax_result = $this->drupalGetAjax('ajax-test/dialog-form', ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_modal']]);
     $expected_ajax_settings = [
       'edit-preview' => [
         'callback' => '::preview',
@@ -202,7 +202,7 @@ class DialogTest extends AjaxTestBase {
     $this->assertTrue(!empty($form), 'Non-JS entity form page present.');
 
     // Emulate going to the JS version of the form and check the JSON response.
-    $ajax_result = $this->drupalGetAjax('admin/structure/contact/add', array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_modal')));
+    $ajax_result = $this->drupalGetAjax('admin/structure/contact/add', ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_modal']]);
     $this->setRawContent($ajax_result[3]['data']);
     // Remove the data, the form build id and token will never match.
     unset($ajax_result[3]['data']);
diff --git a/web/core/modules/system/src/Tests/Ajax/ElementValidationTest.php b/web/core/modules/system/src/Tests/Ajax/ElementValidationTest.php
index 5133ce376..d20f453be 100644
--- a/web/core/modules/system/src/Tests/Ajax/ElementValidationTest.php
+++ b/web/core/modules/system/src/Tests/Ajax/ElementValidationTest.php
@@ -16,8 +16,8 @@ class ElementValidationTest extends AjaxTestBase {
    * filled in, and we want to see if the activation of the "drivertext"
    * Ajax-enabled field fails due to the required field being empty.
    */
-  function testAjaxElementValidation() {
-    $edit = array('drivertext' => t('some dumb text'));
+  public function testAjaxElementValidation() {
+    $edit = ['drivertext' => t('some dumb text')];
 
     // Post with 'drivertext' as the triggering element.
     $this->drupalPostAjaxForm('ajax_validation_test', $edit, 'drivertext');
@@ -26,7 +26,7 @@ class ElementValidationTest extends AjaxTestBase {
     $this->assertText('ajax_forms_test_validation_form_callback invoked', 'The correct callback was invoked');
 
     $this->drupalGet('ajax_validation_test');
-    $edit = array('drivernumber' => 12345);
+    $edit = ['drivernumber' => 12345];
 
     // Post with 'drivernumber' as the triggering element.
     $this->drupalPostAjaxForm('ajax_validation_test', $edit, 'drivernumber');
diff --git a/web/core/modules/system/src/Tests/Ajax/FormValuesTest.php b/web/core/modules/system/src/Tests/Ajax/FormValuesTest.php
index 0a23db184..9f4b52175 100644
--- a/web/core/modules/system/src/Tests/Ajax/FormValuesTest.php
+++ b/web/core/modules/system/src/Tests/Ajax/FormValuesTest.php
@@ -13,28 +13,28 @@ class FormValuesTest extends AjaxTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalLogin($this->drupalCreateUser(array('access content')));
+    $this->drupalLogin($this->drupalCreateUser(['access content']));
   }
 
   /**
    * Submits forms with select and checkbox elements via Ajax.
    */
-  function testSimpleAjaxFormValue() {
+  public function testSimpleAjaxFormValue() {
     // Verify form values of a select element.
-    foreach (array('red', 'green', 'blue') as $item) {
-      $edit = array(
+    foreach (['red', 'green', 'blue'] as $item) {
+      $edit = [
         'select' => $item,
-      );
+      ];
       $commands = $this->drupalPostAjaxForm('ajax_forms_test_get_form', $edit, 'select');
       $expected = new DataCommand('#ajax_selected_color', 'form_state_value_select', $item);
       $this->assertCommand($commands, $expected->render(), 'Verification of AJAX form values from a selectbox issued with a correct value.');
     }
 
     // Verify form values of a checkbox element.
-    foreach (array(FALSE, TRUE) as $item) {
-      $edit = array(
+    foreach ([FALSE, TRUE] as $item) {
+      $edit = [
         'checkbox' => $item,
-      );
+      ];
       $commands = $this->drupalPostAjaxForm('ajax_forms_test_get_form', $edit, 'checkbox');
       $expected = new DataCommand('#ajax_checkbox_value', 'form_state_value_select', (int) $item);
       $this->assertCommand($commands, $expected->render(), 'Verification of AJAX form values from a checkbox issued with a correct value.');
@@ -46,11 +46,11 @@ class FormValuesTest extends AjaxTestBase {
     // We don't need to check for the X-Drupal-Ajax-Token header with these
     // invalid requests.
     $this->assertAjaxHeader = FALSE;
-    foreach (array('null', 'empty', 'nonexistent') as $key) {
+    foreach (['null', 'empty', 'nonexistent'] as $key) {
       $element_name = 'select_' . $key . '_callback';
-      $edit = array(
+      $edit = [
         $element_name => 'red',
-      );
+      ];
       $commands = $this->drupalPostAjaxForm('ajax_forms_test_get_form', $edit, $element_name);
       $this->assertResponse(500);
     }
diff --git a/web/core/modules/system/src/Tests/Ajax/FrameworkTest.php b/web/core/modules/system/src/Tests/Ajax/FrameworkTest.php
index fb59bcc58..14bae0644 100644
--- a/web/core/modules/system/src/Tests/Ajax/FrameworkTest.php
+++ b/web/core/modules/system/src/Tests/Ajax/FrameworkTest.php
@@ -22,7 +22,7 @@ class FrameworkTest extends AjaxTestBase {
   public function testAJAXRender() {
     // Verify that settings command is generated if JavaScript settings exist.
     $commands = $this->drupalGetAjax('ajax-test/render');
-    $expected = new SettingsCommand(array('ajax' => 'test'), TRUE);
+    $expected = new SettingsCommand(['ajax' => 'test'], TRUE);
     $this->assertCommand($commands, $expected->render(), 'JavaScript settings command is present.');
   }
 
@@ -30,14 +30,14 @@ class FrameworkTest extends AjaxTestBase {
    * Tests AjaxResponse::prepare() AJAX commands ordering.
    */
   public function testOrder() {
-    $expected_commands = array();
+    $expected_commands = [];
 
     // Expected commands, in a very specific order.
     $asset_resolver = \Drupal::service('asset.resolver');
     $css_collection_renderer = \Drupal::service('asset.css.collection_renderer');
     $js_collection_renderer = \Drupal::service('asset.js.collection_renderer');
     $renderer = \Drupal::service('renderer');
-    $expected_commands[0] = new SettingsCommand(array('ajax' => 'test'), TRUE);
+    $expected_commands[0] = new SettingsCommand(['ajax' => 'test'], TRUE);
     $build['#attached']['library'][] = 'ajax_test/order-css-command';
     $assets = AttachedAssets::createFromRenderArray($build);
     $css_render_array = $css_collection_renderer->render($asset_resolver->getCssAssets($assets, FALSE));
@@ -65,7 +65,7 @@ class FrameworkTest extends AjaxTestBase {
     // 3. JavaScript files in the header
     // 4. JavaScript files in the footer
     // 5. Any other AJAX commands, in whatever order they were added.
-    $commands = $this->drupalPostAjaxForm(NULL, array(), NULL, 'ajax-test/order', array(), array(), NULL, array());
+    $commands = $this->drupalPostAjaxForm(NULL, [], NULL, 'ajax-test/order', [], [], NULL, []);
     $this->assertCommand(array_slice($commands, 0, 1), $expected_commands[0]->render(), 'Settings command is first.');
     $this->assertCommand(array_slice($commands, 1, 1), $expected_commands[1]->render(), 'CSS command is second (and CSS files are ordered correctly).');
     $this->assertCommand(array_slice($commands, 2, 1), $expected_commands[2]->render(), 'Header JS command is third.');
@@ -78,10 +78,10 @@ class FrameworkTest extends AjaxTestBase {
    */
   public function testAJAXRenderError() {
     // Verify custom error message.
-    $edit = array(
+    $edit = [
       'message' => 'Custom error message.',
-    );
-    $commands = $this->drupalGetAjax('ajax-test/render-error', array('query' => $edit));
+    ];
+    $commands = $this->drupalGetAjax('ajax-test/render-error', ['query' => $edit]);
     $expected = new AlertCommand($edit['message']);
     $this->assertCommand($commands, $expected->render(), 'Custom error message is output.');
   }
@@ -95,12 +95,12 @@ class FrameworkTest extends AjaxTestBase {
     $js_collection_renderer = \Drupal::service('asset.js.collection_renderer');
     $renderer = \Drupal::service('renderer');
 
-    $expected = array(
+    $expected = [
       'setting_name' => 'ajax_forms_test_lazy_load_form_submit',
       'setting_value' => 'executed',
       'library_1' => 'system/admin',
       'library_2' => 'system/drupal.system',
-    );
+    ];
 
     // Get the base page.
     $this->drupalGet('ajax_forms_test_lazy_load_form');
@@ -109,9 +109,9 @@ class FrameworkTest extends AjaxTestBase {
 
     // Verify that the base page doesn't have the settings and files that are to
     // be lazy loaded as part of the next requests.
-    $this->assertTrue(!isset($original_settings[$expected['setting_name']]), format_string('Page originally lacks the %setting, as expected.', array('%setting' => $expected['setting_name'])));
-    $this->assertTrue(!in_array($expected['library_1'], $original_libraries), format_string('Page originally lacks the %library library, as expected.', array('%library' => $expected['library_1'])));
-    $this->assertTrue(!in_array($expected['library_2'], $original_libraries), format_string('Page originally lacks the %library library, as expected.', array('%library' => $expected['library_2'])));
+    $this->assertTrue(!isset($original_settings[$expected['setting_name']]), format_string('Page originally lacks the %setting, as expected.', ['%setting' => $expected['setting_name']]));
+    $this->assertTrue(!in_array($expected['library_1'], $original_libraries), format_string('Page originally lacks the %library library, as expected.', ['%library' => $expected['library_1']]));
+    $this->assertTrue(!in_array($expected['library_2'], $original_libraries), format_string('Page originally lacks the %library library, as expected.', ['%library' => $expected['library_2']]));
 
     // Calculate the expected CSS and JS.
     $assets = new AttachedAssets();
@@ -128,14 +128,14 @@ class FrameworkTest extends AjaxTestBase {
     $expected_js_html = $renderer->renderRoot($js_render_array);
 
     // Submit the AJAX request without triggering files getting added.
-    $commands = $this->drupalPostAjaxForm(NULL, array('add_files' => FALSE), array('op' => t('Submit')));
+    $commands = $this->drupalPostAjaxForm(NULL, ['add_files' => FALSE], ['op' => t('Submit')]);
     $new_settings = $this->getDrupalSettings();
     $new_libraries = explode(',', $new_settings['ajaxPageState']['libraries']);
 
     // Verify the setting was not added when not expected.
-    $this->assertTrue(!isset($new_settings[$expected['setting_name']]), format_string('Page still lacks the %setting, as expected.', array('%setting' => $expected['setting_name'])));
-    $this->assertTrue(!in_array($expected['library_1'], $new_libraries), format_string('Page still lacks the %library library, as expected.', array('%library' => $expected['library_1'])));
-    $this->assertTrue(!in_array($expected['library_2'], $new_libraries), format_string('Page still lacks the %library library, as expected.', array('%library' => $expected['library_2'])));
+    $this->assertTrue(!isset($new_settings[$expected['setting_name']]), format_string('Page still lacks the %setting, as expected.', ['%setting' => $expected['setting_name']]));
+    $this->assertTrue(!in_array($expected['library_1'], $new_libraries), format_string('Page still lacks the %library library, as expected.', ['%library' => $expected['library_1']]));
+    $this->assertTrue(!in_array($expected['library_2'], $new_libraries), format_string('Page still lacks the %library library, as expected.', ['%library' => $expected['library_2']]));
     // Verify a settings command does not add CSS or scripts to drupalSettings
     // and no command inserts the corresponding tags on the page.
     $found_settings_command = FALSE;
@@ -148,24 +148,24 @@ class FrameworkTest extends AjaxTestBase {
         $found_markup_command = TRUE;
       }
     }
-    $this->assertFalse($found_settings_command, format_string('Page state still lacks the %library_1 and %library_2 libraries, as expected.', array('%library_1' => $expected['library_1'], '%library_2' => $expected['library_2'])));
-    $this->assertFalse($found_markup_command, format_string('Page still lacks the %library_1 and %library_2 libraries, as expected.', array('%library_1' => $expected['library_1'], '%library_2' => $expected['library_2'])));
+    $this->assertFalse($found_settings_command, format_string('Page state still lacks the %library_1 and %library_2 libraries, as expected.', ['%library_1' => $expected['library_1'], '%library_2' => $expected['library_2']]));
+    $this->assertFalse($found_markup_command, format_string('Page still lacks the %library_1 and %library_2 libraries, as expected.', ['%library_1' => $expected['library_1'], '%library_2' => $expected['library_2']]));
 
     // Submit the AJAX request and trigger adding files.
-    $commands = $this->drupalPostAjaxForm(NULL, array('add_files' => TRUE), array('op' => t('Submit')));
+    $commands = $this->drupalPostAjaxForm(NULL, ['add_files' => TRUE], ['op' => t('Submit')]);
     $new_settings = $this->getDrupalSettings();
     $new_libraries = explode(',', $new_settings['ajaxPageState']['libraries']);
 
     // Verify the expected setting was added, both to drupalSettings, and as
     // the first AJAX command.
-    $this->assertIdentical($new_settings[$expected['setting_name']], $expected['setting_value'], format_string('Page now has the %setting.', array('%setting' => $expected['setting_name'])));
-    $expected_command = new SettingsCommand(array($expected['setting_name'] => $expected['setting_value']), TRUE);
+    $this->assertIdentical($new_settings[$expected['setting_name']], $expected['setting_value'], format_string('Page now has the %setting.', ['%setting' => $expected['setting_name']]));
+    $expected_command = new SettingsCommand([$expected['setting_name'] => $expected['setting_value']], TRUE);
     $this->assertCommand(array_slice($commands, 0, 1), $expected_command->render(), 'The settings command was first.');
 
     // Verify the expected CSS file was added, both to drupalSettings, and as
     // the second AJAX command for inclusion into the HTML.
-    $this->assertTrue(in_array($expected['library_1'], $new_libraries), format_string('Page state now has the %library library.', array('%library' => $expected['library_1'])));
-    $this->assertCommand(array_slice($commands, 1, 1), array('data' => $expected_css_html), format_string('Page now has the %library library.', array('%library' => $expected['library_1'])));
+    $this->assertTrue(in_array($expected['library_1'], $new_libraries), format_string('Page state now has the %library library.', ['%library' => $expected['library_1']]));
+    $this->assertCommand(array_slice($commands, 1, 1), ['data' => $expected_css_html], format_string('Page now has the %library library.', ['%library' => $expected['library_1']]));
 
     // Verify the expected JS file was added, both to drupalSettings, and as
     // the third AJAX command for inclusion into the HTML. By testing for an
@@ -173,15 +173,15 @@ class FrameworkTest extends AjaxTestBase {
     // unexpected JavaScript code, such as a jQuery.extend() that would
     // potentially clobber rather than properly merge settings, didn't
     // accidentally get added.
-    $this->assertTrue(in_array($expected['library_2'], $new_libraries), format_string('Page state now has the %library library.', array('%library' => $expected['library_2'])));
-    $this->assertCommand(array_slice($commands, 2, 1), array('data' => $expected_js_html), format_string('Page now has the %library library.', array('%library' => $expected['library_2'])));
+    $this->assertTrue(in_array($expected['library_2'], $new_libraries), format_string('Page state now has the %library library.', ['%library' => $expected['library_2']]));
+    $this->assertCommand(array_slice($commands, 2, 1), ['data' => $expected_js_html], format_string('Page now has the %library library.', ['%library' => $expected['library_2']]));
   }
 
   /**
    * Tests that drupalSettings.currentPath is not updated on AJAX requests.
    */
   public function testCurrentPathChange() {
-    $commands = $this->drupalPostAjaxForm('ajax_forms_test_lazy_load_form', array('add_files' => FALSE), array('op' => t('Submit')));
+    $commands = $this->drupalPostAjaxForm('ajax_forms_test_lazy_load_form', ['add_files' => FALSE], ['op' => t('Submit')]);
     foreach ($commands as $command) {
       if ($command['command'] == 'settings') {
         $this->assertFalse(isset($command['settings']['currentPath']), 'Value of drupalSettings.currentPath is not updated after an AJAX request.');
@@ -195,14 +195,14 @@ class FrameworkTest extends AjaxTestBase {
   public function testLazyLoadOverriddenCSS() {
     // The test theme overrides js.module.css without an implementation,
     // thereby removing it.
-    \Drupal::service('theme_handler')->install(array('test_theme'));
+    \Drupal::service('theme_handler')->install(['test_theme']);
     $this->config('system.theme')
       ->set('default', 'test_theme')
       ->save();
 
     // This gets the form, and emulates an Ajax submission on it, including
     // adding markup to the HEAD and BODY for any lazy loaded JS/CSS files.
-    $this->drupalPostAjaxForm('ajax_forms_test_lazy_load_form', array('add_files' => TRUE), array('op' => t('Submit')));
+    $this->drupalPostAjaxForm('ajax_forms_test_lazy_load_form', ['add_files' => TRUE], ['op' => t('Submit')]);
 
     // Verify that the resulting HTML does not load the overridden CSS file.
     // We add a "?" to the assertion, because drupalSettings may include
diff --git a/web/core/modules/system/src/Tests/Ajax/MultiFormTest.php b/web/core/modules/system/src/Tests/Ajax/MultiFormTest.php
index e07204cc7..9ca2a6678 100644
--- a/web/core/modules/system/src/Tests/Ajax/MultiFormTest.php
+++ b/web/core/modules/system/src/Tests/Ajax/MultiFormTest.php
@@ -19,38 +19,38 @@ class MultiFormTest extends AjaxTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Page']);
 
     // Create a multi-valued field for 'page' nodes to use for Ajax testing.
     $field_name = 'field_ajax_test';
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'node',
       'field_name' => $field_name,
       'type' => 'text',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'bundle' => 'page',
     ])->save();
     entity_get_form_display('node', 'page', 'default')
-      ->setComponent($field_name, array('type' => 'text_textfield'))
+      ->setComponent($field_name, ['type' => 'text_textfield'])
       ->save();
 
     // Log in a user who can create 'page' nodes.
-    $this->drupalLogin ($this->drupalCreateUser(array('create page content')));
+    $this->drupalLogin ($this->drupalCreateUser(['create page content']));
   }
 
   /**
    * Tests that pages with the 'node_page_form' included twice work correctly.
    */
-  function testMultiForm() {
+  public function testMultiForm() {
     // HTML IDs for elements within the field are potentially modified with
     // each Ajax submission, but these variables are stable and help target the
     // desired elements.
@@ -84,7 +84,7 @@ class MultiFormTest extends AjaxTestBase {
       $forms = $this->xpath($form_xpath);
       foreach ($forms as $offset => $form) {
         $form_html_id = (string) $form['id'];
-        $this->drupalPostAjaxForm(NULL, array(), array($button_name => $button_value), NULL, array(), array(), $form_html_id);
+        $this->drupalPostAjaxForm(NULL, [], [$button_name => $button_value], NULL, [], [], $form_html_id);
         $form = $this->xpath($form_xpath)[$offset];
         $field = $form->xpath('.' . $field_xpath);
 
diff --git a/web/core/modules/system/src/Tests/Batch/PageTest.php b/web/core/modules/system/src/Tests/Batch/PageTest.php
index f9948ed5e..dbdf18c3d 100644
--- a/web/core/modules/system/src/Tests/Batch/PageTest.php
+++ b/web/core/modules/system/src/Tests/Batch/PageTest.php
@@ -16,22 +16,22 @@ class PageTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('batch_test');
+  public static $modules = ['batch_test'];
 
   /**
    * Tests that the batch API progress page uses the correct theme.
    */
-  function testBatchProgressPageTheme() {
+  public function testBatchProgressPageTheme() {
     // Make sure that the page which starts the batch (an administrative page)
     // is using a different theme than would normally be used by the batch API.
-    $this->container->get('theme_handler')->install(array('seven', 'bartik'));
+    $this->container->get('theme_handler')->install(['seven', 'bartik']);
     $this->config('system.theme')
       ->set('default', 'bartik')
       ->set('admin', 'seven')
       ->save();
 
     // Log in as an administrator who can see the administrative theme.
-    $admin_user = $this->drupalCreateUser(array('view the administration theme'));
+    $admin_user = $this->drupalCreateUser(['view the administration theme']);
     $this->drupalLogin($admin_user);
     // Visit an administrative page that runs a test batch, and check that the
     // theme that was used during batch execution (which the batch callback
@@ -40,13 +40,13 @@ class PageTest extends WebTestBase {
     $this->drupalGet('admin/batch-test/test-theme');
     // The stack should contain the name of the theme used on the progress
     // page.
-    $this->assertEqual(batch_test_stack(), array('seven'), 'A progressive batch correctly uses the theme of the page that started the batch.');
+    $this->assertEqual(batch_test_stack(), ['seven'], 'A progressive batch correctly uses the theme of the page that started the batch.');
   }
 
   /**
    * Tests that the batch API progress page shows the title correctly.
    */
-  function testBatchProgressPageTitle() {
+  public function testBatchProgressPageTitle() {
     // Visit an administrative page that runs a test batch, and check that the
     // title shown during batch execution (which the batch callback function
     // saved as a variable) matches the theme used on the administrative page.
@@ -59,7 +59,7 @@ class PageTest extends WebTestBase {
   /**
    * Tests that the progress messages are correct.
    */
-  function testBatchProgressMessages() {
+  public function testBatchProgressMessages() {
     // Go to the initial step only.
     $this->maximumMetaRefreshCount = 0;
     $this->drupalGet('batch-test/test-title');
diff --git a/web/core/modules/system/src/Tests/Batch/ProcessingTest.php b/web/core/modules/system/src/Tests/Batch/ProcessingTest.php
index 66c0fc6b1..6b90cc804 100644
--- a/web/core/modules/system/src/Tests/Batch/ProcessingTest.php
+++ b/web/core/modules/system/src/Tests/Batch/ProcessingTest.php
@@ -17,12 +17,12 @@ class ProcessingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('batch_test', 'test_page_test');
+  public static $modules = ['batch_test', 'test_page_test'];
 
   /**
    * Tests batches triggered outside of form submission.
    */
-  function testBatchNoForm() {
+  public function testBatchNoForm() {
     // Displaying the page triggers batch 1.
     $this->drupalGet('batch-test/no-form');
     $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 2 performed successfully.');
@@ -33,7 +33,7 @@ class ProcessingTest extends WebTestBase {
   /**
    * Tests batches that redirect in the batch finished callback.
    */
-  function testBatchRedirectFinishedCallback() {
+  public function testBatchRedirectFinishedCallback() {
     // Displaying the page triggers batch 1.
     $this->drupalGet('batch-test/finish-redirect');
     $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 2 performed successfully.');
@@ -45,16 +45,16 @@ class ProcessingTest extends WebTestBase {
   /**
    * Tests batches defined in a form submit handler.
    */
-  function testBatchForm() {
+  public function testBatchForm() {
     // Batch 0: no operation.
-    $edit = array('batch' => 'batch_0');
+    $edit = ['batch' => 'batch_0'];
     $this->drupalPostForm('batch-test', $edit, 'Submit');
     $this->assertNoEscaped('<', 'No escaped markup is present.');
     $this->assertBatchMessages($this->_resultMessages('batch_0'), 'Batch with no operation performed successfully.');
     $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
 
     // Batch 1: several simple operations.
-    $edit = array('batch' => 'batch_1');
+    $edit = ['batch' => 'batch_1'];
     $this->drupalPostForm('batch-test', $edit, 'Submit');
     $this->assertNoEscaped('<', 'No escaped markup is present.');
     $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch with simple operations performed successfully.');
@@ -62,7 +62,7 @@ class ProcessingTest extends WebTestBase {
     $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
 
     // Batch 2: one multistep operation.
-    $edit = array('batch' => 'batch_2');
+    $edit = ['batch' => 'batch_2'];
     $this->drupalPostForm('batch-test', $edit, 'Submit');
     $this->assertNoEscaped('<', 'No escaped markup is present.');
     $this->assertBatchMessages($this->_resultMessages('batch_2'), 'Batch with multistep operation performed successfully.');
@@ -70,7 +70,7 @@ class ProcessingTest extends WebTestBase {
     $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
 
     // Batch 3: simple + multistep combined.
-    $edit = array('batch' => 'batch_3');
+    $edit = ['batch' => 'batch_3'];
     $this->drupalPostForm('batch-test', $edit, 'Submit');
     $this->assertNoEscaped('<', 'No escaped markup is present.');
     $this->assertBatchMessages($this->_resultMessages('batch_3'), 'Batch with simple and multistep operations performed successfully.');
@@ -78,7 +78,7 @@ class ProcessingTest extends WebTestBase {
     $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
 
     // Batch 4: nested batch.
-    $edit = array('batch' => 'batch_4');
+    $edit = ['batch' => 'batch_4'];
     $this->drupalPostForm('batch-test', $edit, 'Submit');
     $this->assertNoEscaped('<', 'No escaped markup is present.');
     $this->assertBatchMessages($this->_resultMessages('batch_4'), 'Nested batch performed successfully.');
@@ -89,34 +89,41 @@ class ProcessingTest extends WebTestBase {
   /**
    * Tests batches defined in a multistep form.
    */
-  function testBatchFormMultistep() {
+  public function testBatchFormMultistep() {
     $this->drupalGet('batch-test/multistep');
     $this->assertNoEscaped('<', 'No escaped markup is present.');
     $this->assertText('step 1', 'Form is displayed in step 1.');
 
     // First step triggers batch 1.
-    $this->drupalPostForm(NULL, array(), 'Submit');
+    $this->drupalPostForm(NULL, [], 'Submit');
     $this->assertBatchMessages($this->_resultMessages('batch_1'), 'Batch for step 1 performed successfully.');
     $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_1'), 'Execution order was correct.');
     $this->assertText('step 2', 'Form is displayed in step 2.');
     $this->assertNoEscaped('<', 'No escaped markup is present.');
 
     // Second step triggers batch 2.
-    $this->drupalPostForm(NULL, array(), 'Submit');
+    $this->drupalPostForm(NULL, [], 'Submit');
     $this->assertBatchMessages($this->_resultMessages('batch_2'), 'Batch for step 2 performed successfully.');
     $this->assertEqual(batch_test_stack(), $this->_resultStack('batch_2'), 'Execution order was correct.');
     $this->assertText('Redirection successful.', 'Redirection after batch execution is correct.');
     $this->assertNoEscaped('<', 'No escaped markup is present.');
+
+    // Extra query arguments will trigger logic that will add them to the
+    // redirect URL. Make sure they are persisted.
+    $this->drupalGet('batch-test/multistep', ['query' => ['big_tree' => 'small_axe']]);
+    $this->drupalPostForm(NULL, [], 'Submit');
+    $this->assertText('step 2', 'Form is displayed in step 2.');
+    $this->assertTrue(strpos($this->getUrl(), 'batch-test/multistep?big_tree=small_axe'), 'Query argument was persisted and another extra argument was added.');
   }
 
   /**
    * Tests batches defined in different submit handlers on the same form.
    */
-  function testBatchFormMultipleBatches() {
+  public function testBatchFormMultipleBatches() {
     // Batches 1, 2 and 3 are triggered in sequence by different submit
     // handlers. Each submit handler modify the submitted 'value'.
     $value = rand(0, 255);
-    $edit = array('value' => $value);
+    $edit = ['value' => $value];
     $this->drupalPostForm('batch-test/chained', $edit, 'Submit');
     // Check that result messages are present and in the correct order.
     $this->assertBatchMessages($this->_resultMessages('chained'), 'Batches defined in separate submit handlers performed successfully.');
@@ -131,7 +138,7 @@ class ProcessingTest extends WebTestBase {
    *
    * Same as above, but the form is submitted through drupal_form_execute().
    */
-  function testBatchFormProgrammatic() {
+  public function testBatchFormProgrammatic() {
     // Batches 1, 2 and 3 are triggered in sequence by different submit
     // handlers. Each submit handler modify the submitted 'value'.
     $value = rand(0, 255);
@@ -147,12 +154,12 @@ class ProcessingTest extends WebTestBase {
   /**
    * Test form submission during a batch operation.
    */
-  function testDrupalFormSubmitInBatch() {
+  public function testDrupalFormSubmitInBatch() {
     // Displaying the page triggers a batch that programmatically submits a
     // form.
     $value = rand(0, 255);
     $this->drupalGet('batch-test/nested-programmatic/' . $value);
-    $this->assertEqual(batch_test_stack(), array('mock form submitted with value = ' . $value), '\Drupal::formBuilder()->submitForm() ran successfully within a batch operation.');
+    $this->assertEqual(batch_test_stack(), ['mock form submitted with value = ' . $value], '\Drupal::formBuilder()->submitForm() ran successfully within a batch operation.');
   }
 
   /**
@@ -160,7 +167,7 @@ class ProcessingTest extends WebTestBase {
    *
    * @see https://www.drupal.org/node/600836
    */
-  function testBatchLargePercentage() {
+  public function testBatchLargePercentage() {
     // Displaying the page triggers batch 5.
     $this->drupalGet('batch-test/large-percentage');
     $this->assertBatchMessages($this->_resultMessages('batch_5'), 'Batch for step 2 performed successfully.');
@@ -180,7 +187,7 @@ class ProcessingTest extends WebTestBase {
    * @return
    *   TRUE on pass, FALSE on fail.
    */
-  function assertBatchMessages($texts, $message) {
+  public function assertBatchMessages($texts, $message) {
     $pattern = '|' . implode('.*', $texts) . '|s';
     return $this->assertPattern($pattern, $message);
   }
@@ -188,8 +195,8 @@ class ProcessingTest extends WebTestBase {
   /**
    * Returns expected execution stacks for the test batches.
    */
-  function _resultStack($id, $value = 0) {
-    $stack = array();
+  public function _resultStack($id, $value = 0) {
+    $stack = [];
     switch ($id) {
       case 'batch_1':
         for ($i = 1; $i <= 10; $i++) {
@@ -255,8 +262,8 @@ class ProcessingTest extends WebTestBase {
   /**
    * Returns expected result messages for the test batches.
    */
-  function _resultMessages($id) {
-    $messages = array();
+  public function _resultMessages($id) {
+    $messages = [];
 
     switch ($id) {
       case 'batch_0':
diff --git a/web/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php b/web/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php
index 94ea1ac44..6bea791e9 100644
--- a/web/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php
+++ b/web/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php
@@ -89,7 +89,7 @@ trait AssertPageCacheContextsAndTagsTrait {
     $this->assertCacheContexts($expected_contexts);
 
     // Assert page cache item + expected cache tags.
-    $cid_parts = array($url->setAbsolute()->toString(), 'html');
+    $cid_parts = [$url->setAbsolute()->toString(), 'html'];
     $cid = implode(':', $cid_parts);
     $cache_entry = \Drupal::cache('render')->get($cid);
     sort($cache_entry->tags);
@@ -122,10 +122,14 @@ trait AssertPageCacheContextsAndTagsTrait {
    */
   protected function assertCacheTags(array $expected_tags, $include_default_tags = TRUE) {
     // The anonymous role cache tag is only added if the user is anonymous.
-    if ($include_default_tags && \Drupal::currentUser()->isAnonymous()) {
-      $expected_tags = Cache::mergeTags($expected_tags, ['config:user.role.anonymous']);
+    if ($include_default_tags) {
+      if (\Drupal::currentUser()->isAnonymous()) {
+        $expected_tags = Cache::mergeTags($expected_tags, ['config:user.role.anonymous']);
+      }
+      $expected_tags[] = 'http_response';
     }
     $actual_tags = $this->getCacheHeaderValues('X-Drupal-Cache-Tags');
+    $expected_tags = array_unique($expected_tags);
     sort($expected_tags);
     sort($actual_tags);
     $this->assertIdentical($actual_tags, $expected_tags);
diff --git a/web/core/modules/system/src/Tests/Cache/CacheTestBase.php b/web/core/modules/system/src/Tests/Cache/CacheTestBase.php
index efca9fdf4..e1bf79828 100644
--- a/web/core/modules/system/src/Tests/Cache/CacheTestBase.php
+++ b/web/core/modules/system/src/Tests/Cache/CacheTestBase.php
@@ -6,6 +6,9 @@ use Drupal\simpletest\WebTestBase;
 
 /**
  * Provides helper methods for cache tests.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\system\Functional\Cache\CacheTestBase instead.
  */
 abstract class CacheTestBase extends WebTestBase {
 
@@ -71,7 +74,7 @@ abstract class CacheTestBase extends WebTestBase {
    * @param $bin
    *   The bin the cache item was stored in.
    */
-  function assertCacheRemoved($message, $cid = NULL, $bin = NULL) {
+  public function assertCacheRemoved($message, $cid = NULL, $bin = NULL) {
     if ($bin == NULL) {
       $bin = $this->defaultBin;
     }
diff --git a/web/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php b/web/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php
index 6c3d98f71..d47e88a51 100644
--- a/web/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php
+++ b/web/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php
@@ -105,7 +105,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
   }
 
   protected function setUp() {
-    $this->cachebackends = array();
+    $this->cachebackends = [];
     $this->defaultValue = $this->randomMachineName(10);
 
     parent::setUp();
@@ -134,7 +134,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $backend = $this->getCacheBackend();
 
     $this->assertIdentical(FALSE, $backend->get('test1'), "Backend does not contain data for cache id test1.");
-    $with_backslash = array('foo' => '\Drupal\foo\Bar');
+    $with_backslash = ['foo' => '\Drupal\foo\Bar'];
     $backend->set('test1', $with_backslash);
     $cached = $backend->get('test1');
     $this->assert(is_object($cached), "Backend returned an object for cache id test1.");
@@ -145,10 +145,10 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertEqual($cached->expire, Cache::PERMANENT, 'Expire time is correct.');
 
     $this->assertIdentical(FALSE, $backend->get('test2'), "Backend does not contain data for cache id test2.");
-    $backend->set('test2', array('value' => 3), REQUEST_TIME + 3);
+    $backend->set('test2', ['value' => 3], REQUEST_TIME + 3);
     $cached = $backend->get('test2');
     $this->assert(is_object($cached), "Backend returned an object for cache id test2.");
-    $this->assertIdentical(array('value' => 3), $cached->data);
+    $this->assertIdentical(['value' => 3], $cached->data);
     $this->assertTrue($cached->valid, 'Item is marked as valid.');
     $this->assertTrue($cached->created >= REQUEST_TIME && $cached->created <= round(microtime(TRUE), 3), 'Created time is correct.');
     $this->assertEqual($cached->expire, REQUEST_TIME + 3, 'Expire time is correct.');
@@ -162,7 +162,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertEqual($cached->expire, REQUEST_TIME - 3, 'Expire time is correct.');
 
     $this->assertIdentical(FALSE, $backend->get('test4'), "Backend does not contain data for cache id test4.");
-    $with_eof = array('foo' => "\nEOF\ndata");
+    $with_eof = ['foo' => "\nEOF\ndata"];
     $backend->set('test4', $with_eof);
     $cached = $backend->get('test4');
     $this->assert(is_object($cached), "Backend returned an object for cache id test4.");
@@ -172,7 +172,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertEqual($cached->expire, Cache::PERMANENT, 'Expire time is correct.');
 
     $this->assertIdentical(FALSE, $backend->get('test5'), "Backend does not contain data for cache id test5.");
-    $with_eof_and_semicolon = array('foo' => "\nEOF;\ndata");
+    $with_eof_and_semicolon = ['foo' => "\nEOF;\ndata"];
     $backend->set('test5', $with_eof_and_semicolon);
     $cached = $backend->get('test5');
     $this->assert(is_object($cached), "Backend returned an object for cache id test5.");
@@ -181,7 +181,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertTrue($cached->created >= REQUEST_TIME && $cached->created <= round(microtime(TRUE), 3), 'Created time is correct.');
     $this->assertEqual($cached->expire, Cache::PERMANENT, 'Expire time is correct.');
 
-    $with_variable = array('foo' => '$bar');
+    $with_variable = ['foo' => '$bar'];
     $backend->set('test6', $with_variable);
     $cached = $backend->get('test6');
     $this->assert(is_object($cached), "Backend returned an object for cache id test6.");
@@ -260,14 +260,14 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
   public function testValueTypeIsKept() {
     $backend = $this->getCacheBackend();
 
-    $variables = array(
+    $variables = [
       'test1' => 1,
       'test2' => '0',
       'test3' => '',
       'test4' => 12.64,
       'test5' => FALSE,
-      'test6' => array(1, 2, 3),
-    );
+      'test6' => [1, 2, 3],
+    ];
 
     // Create cache entries.
     foreach ($variables as $cid => $data) {
@@ -300,14 +300,14 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $backend->set($long_cid, 300);
 
     // Mismatch order for harder testing.
-    $reference = array(
+    $reference = [
       'test3',
       'test7',
       'test21', // Cid does not exist.
       'test6',
       'test19', // Cid does not exist until added before second getMultiple().
       'test2',
-    );
+    ];
 
     $cids = $reference;
     $ret = $backend->getMultiple($cids);
@@ -367,7 +367,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertFalse(in_array('test19', $cids), "Added cache id test19 is not in cids array.");
 
     // Test with a long $cid and non-numeric array key.
-    $cids = array('key:key' => $long_cid);
+    $cids = ['key:key' => $long_cid];
     $return = $backend->getMultiple($cids);
     $this->assertEqual(300, $return[$long_cid]->data);
     $this->assertTrue(empty($cids));
@@ -383,13 +383,13 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
 
     // Set multiple testing keys.
     $backend->set('cid_1', 'Some other value');
-    $items = array(
-      'cid_1' => array('data' => 1),
-      'cid_2' => array('data' => 2),
-      'cid_3' => array('data' => array(1, 2)),
-      'cid_4' => array('data' => 1, 'expire' => $future_expiration),
-      'cid_5' => array('data' => 1, 'tags' => array('test:a', 'test:b')),
-    );
+    $items = [
+      'cid_1' => ['data' => 1],
+      'cid_2' => ['data' => 2],
+      'cid_3' => ['data' => [1, 2]],
+      'cid_4' => ['data' => 1, 'expire' => $future_expiration],
+      'cid_5' => ['data' => 1, 'tags' => ['test:a', 'test:b']],
+    ];
     $backend->setMultiple($items);
     $cids = array_keys($items);
     $cached = $backend->getMultiple($cids);
@@ -414,9 +414,9 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     // assertion.
     try {
       $items = [
-        'exception_test_1' => array('data' => 1, 'tags' => []),
-        'exception_test_2' => array('data' => 2, 'tags' => ['valid']),
-        'exception_test_3' => array('data' => 3, 'tags' => ['node' => [3, 5, 7]]),
+        'exception_test_1' => ['data' => 1, 'tags' => []],
+        'exception_test_2' => ['data' => 2, 'tags' => ['valid']],
+        'exception_test_3' => ['data' => 3, 'tags' => ['node' => [3, 5, 7]]],
       ];
       $backend->setMultiple($items);
       $this->fail('::setMultiple() was called with invalid cache tags, runtime assertion did not fail.');
@@ -444,13 +444,13 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
 
     $backend->delete('test1');
     $backend->delete('test23'); // Nonexistent key should not cause an error.
-    $backend->deleteMultiple(array(
+    $backend->deleteMultiple([
       'test3',
       'test5',
       'test7',
       'test19', // Nonexistent key should not cause an error.
       'test21', // Nonexistent key should not cause an error.
-    ));
+    ]);
 
     // Test if expected keys have been deleted.
     $this->assertIdentical(FALSE, $backend->get('test1'), "Cache id test1 deleted.");
@@ -468,7 +468,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertIdentical(FALSE, $backend->get('test21'), "Cache id test21 does not exist.");
 
     // Calling deleteMultiple() with an empty array should not cause an error.
-    $this->assertFalse($backend->deleteMultiple(array()));
+    $this->assertFalse($backend->deleteMultiple([]));
   }
 
   /**
@@ -494,21 +494,21 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
    * Test Drupal\Core\Cache\CacheBackendInterface::invalidate() and
    * Drupal\Core\Cache\CacheBackendInterface::invalidateMultiple().
    */
-  function testInvalidate() {
+  public function testInvalidate() {
     $backend = $this->getCacheBackend();
     $backend->set('test1', 1);
     $backend->set('test2', 2);
     $backend->set('test3', 2);
     $backend->set('test4', 2);
 
-    $reference = array('test1', 'test2', 'test3', 'test4');
+    $reference = ['test1', 'test2', 'test3', 'test4'];
 
     $cids = $reference;
     $ret = $backend->getMultiple($cids);
     $this->assertEqual(count($ret), 4, 'Four items returned.');
 
     $backend->invalidate('test1');
-    $backend->invalidateMultiple(array('test2', 'test3'));
+    $backend->invalidateMultiple(['test2', 'test3']);
 
     $cids = $reference;
     $ret = $backend->getMultiple($cids);
@@ -520,55 +520,55 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
 
     // Calling invalidateMultiple() with an empty array should not cause an
     // error.
-    $this->assertFalse($backend->invalidateMultiple(array()));
+    $this->assertFalse($backend->invalidateMultiple([]));
   }
 
   /**
    * Tests Drupal\Core\Cache\CacheBackendInterface::invalidateTags().
    */
-  function testInvalidateTags() {
+  public function testInvalidateTags() {
     $backend = $this->getCacheBackend();
 
     // Create two cache entries with the same tag and tag value.
-    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, array('test_tag:2'));
-    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, array('test_tag:2'));
+    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, ['test_tag:2']);
+    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, ['test_tag:2']);
     $this->assertTrue($backend->get('test_cid_invalidate1') && $backend->get('test_cid_invalidate2'), 'Two cache items were created.');
 
     // Invalidate test_tag of value 1. This should invalidate both entries.
-    Cache::invalidateTags(array('test_tag:2'));
+    Cache::invalidateTags(['test_tag:2']);
     $this->assertFalse($backend->get('test_cid_invalidate1') || $backend->get('test_cid_invalidate2'), 'Two cache items invalidated after invalidating a cache tag.');
     $this->assertTrue($backend->get('test_cid_invalidate1', TRUE) && $backend->get('test_cid_invalidate2', TRUE), 'Cache items not deleted after invalidating a cache tag.');
 
     // Create two cache entries with the same tag and an array tag value.
-    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, array('test_tag:1'));
-    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, array('test_tag:1'));
+    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, ['test_tag:1']);
+    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, ['test_tag:1']);
     $this->assertTrue($backend->get('test_cid_invalidate1') && $backend->get('test_cid_invalidate2'), 'Two cache items were created.');
 
     // Invalidate test_tag of value 1. This should invalidate both entries.
-    Cache::invalidateTags(array('test_tag:1'));
+    Cache::invalidateTags(['test_tag:1']);
     $this->assertFalse($backend->get('test_cid_invalidate1') || $backend->get('test_cid_invalidate2'), 'Two caches removed after invalidating a cache tag.');
     $this->assertTrue($backend->get('test_cid_invalidate1', TRUE) && $backend->get('test_cid_invalidate2', TRUE), 'Cache items not deleted after invalidating a cache tag.');
 
     // Create three cache entries with a mix of tags and tag values.
-    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, array('test_tag:1'));
-    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, array('test_tag:2'));
-    $backend->set('test_cid_invalidate3', $this->defaultValue, Cache::PERMANENT, array('test_tag_foo:3'));
+    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, ['test_tag:1']);
+    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, ['test_tag:2']);
+    $backend->set('test_cid_invalidate3', $this->defaultValue, Cache::PERMANENT, ['test_tag_foo:3']);
     $this->assertTrue($backend->get('test_cid_invalidate1') && $backend->get('test_cid_invalidate2') && $backend->get('test_cid_invalidate3'), 'Three cached items were created.');
-    Cache::invalidateTags(array('test_tag_foo:3'));
+    Cache::invalidateTags(['test_tag_foo:3']);
     $this->assertTrue($backend->get('test_cid_invalidate1') && $backend->get('test_cid_invalidate2'), 'Cache items not matching the tag were not invalidated.');
     $this->assertFalse($backend->get('test_cid_invalidated3'), 'Cached item matching the tag was removed.');
 
     // Create cache entry in multiple bins. Two cache entries
     // (test_cid_invalidate1 and test_cid_invalidate2) still exist from previous
     // tests.
-    $tags = array('test_tag:1', 'test_tag:2', 'test_tag:3');
-    $bins = array('path', 'bootstrap', 'page');
+    $tags = ['test_tag:1', 'test_tag:2', 'test_tag:3'];
+    $bins = ['path', 'bootstrap', 'page'];
     foreach ($bins as $bin) {
       $this->getCacheBackend($bin)->set('test', $this->defaultValue, Cache::PERMANENT, $tags);
       $this->assertTrue($this->getCacheBackend($bin)->get('test'), 'Cache item was set in bin.');
     }
 
-    Cache::invalidateTags(array('test_tag:2'));
+    Cache::invalidateTags(['test_tag:2']);
 
     // Test that the cache entry has been invalidated in multiple bins.
     foreach ($bins as $bin) {
diff --git a/web/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php b/web/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php
index 2c778188d..582a2f4f0 100644
--- a/web/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php
+++ b/web/core/modules/system/src/Tests/Cache/PageCacheTagsTestBase.php
@@ -8,6 +8,9 @@ use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Provides helper methods for page cache tags tests.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\system\Functional\Cache\PageCacheTagsTestBase instead.
  */
 abstract class PageCacheTagsTestBase extends WebTestBase {
 
@@ -44,12 +47,12 @@ abstract class PageCacheTagsTestBase extends WebTestBase {
    */
   protected function verifyPageCache(Url $url, $hit_or_miss, $tags = FALSE) {
     $this->drupalGet($url);
-    $message = SafeMarkup::format('Page cache @hit_or_miss for %path.', array('@hit_or_miss' => $hit_or_miss, '%path' => $url->toString()));
+    $message = SafeMarkup::format('Page cache @hit_or_miss for %path.', ['@hit_or_miss' => $hit_or_miss, '%path' => $url->toString()]);
     $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), $hit_or_miss, $message);
 
     if ($hit_or_miss === 'HIT' && is_array($tags)) {
       $absolute_url = $url->setAbsolute()->toString();
-      $cid_parts = array($absolute_url, 'html');
+      $cid_parts = [$absolute_url, 'html'];
       $cid = implode(':', $cid_parts);
       $cache_entry = \Drupal::cache('render')->get($cid);
       sort($cache_entry->tags);
diff --git a/web/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php b/web/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php
index b3c195d56..8815bf340 100644
--- a/web/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php
+++ b/web/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php
@@ -58,7 +58,7 @@ class SessionExistsCacheContextTest extends WebTestBase {
   /**
    * Asserts whether a session cookie is present on the client or not.
    */
-  function assertSessionCookieOnClient($expected_present) {
+  public function assertSessionCookieOnClient($expected_present) {
     $non_deleted_cookies = array_filter($this->cookies, function ($item) { return $item['value'] !== 'deleted'; });
     $this->assertEqual($expected_present, isset($non_deleted_cookies[$this->getSessionName()]), 'Session cookie exists.');
   }
diff --git a/web/core/modules/system/src/Tests/Common/AddFeedTest.php b/web/core/modules/system/src/Tests/Common/AddFeedTest.php
index b53928162..40ff215df 100644
--- a/web/core/modules/system/src/Tests/Common/AddFeedTest.php
+++ b/web/core/modules/system/src/Tests/Common/AddFeedTest.php
@@ -15,41 +15,41 @@ class AddFeedTest extends WebTestBase {
   /**
    * Tests attaching feeds with paths, URLs, and titles.
    */
-  function testBasicFeedAddNoTitle() {
+  public function testBasicFeedAddNoTitle() {
     $path = $this->randomMachineName(12);
     $external_url = 'http://' . $this->randomMachineName(12) . '/' . $this->randomMachineName(12);
-    $fully_qualified_local_url = Url::fromUri('base:' . $this->randomMachineName(12), array('absolute' => TRUE))->toString();
+    $fully_qualified_local_url = Url::fromUri('base:' . $this->randomMachineName(12), ['absolute' => TRUE])->toString();
 
     $path_for_title = $this->randomMachineName(12);
     $external_for_title = 'http://' . $this->randomMachineName(12) . '/' . $this->randomMachineName(12);
-    $fully_qualified_for_title = Url::fromUri('base:' . $this->randomMachineName(12), array('absolute' => TRUE))->toString();
+    $fully_qualified_for_title = Url::fromUri('base:' . $this->randomMachineName(12), ['absolute' => TRUE])->toString();
 
-    $urls = array(
-      'path without title' => array(
-        'url' => Url::fromUri('base:' . $path, array('absolute' => TRUE))->toString(),
+    $urls = [
+      'path without title' => [
+        'url' => Url::fromUri('base:' . $path, ['absolute' => TRUE])->toString(),
         'title' => '',
-      ),
-      'external URL without title' => array(
+      ],
+      'external URL without title' => [
         'url' => $external_url,
         'title' => '',
-      ),
-      'local URL without title' => array(
+      ],
+      'local URL without title' => [
         'url' => $fully_qualified_local_url,
         'title' => '',
-      ),
-      'path with title' => array(
-        'url' => Url::fromUri('base:' . $path_for_title, array('absolute' => TRUE))->toString(),
+      ],
+      'path with title' => [
+        'url' => Url::fromUri('base:' . $path_for_title, ['absolute' => TRUE])->toString(),
         'title' => $this->randomMachineName(12),
-      ),
-      'external URL with title' => array(
+      ],
+      'external URL with title' => [
         'url' => $external_for_title,
         'title' => $this->randomMachineName(12),
-      ),
-      'local URL with title' => array(
+      ],
+      'local URL with title' => [
         'url' => $fully_qualified_for_title,
         'title' => $this->randomMachineName(12),
-      ),
-    );
+      ],
+    ];
 
     $build = [];
     foreach ($urls as $feed_info) {
@@ -63,14 +63,14 @@ class AddFeedTest extends WebTestBase {
     $this->setRawContent($response->getContent());
     // Assert that the content contains the RSS links we specified.
     foreach ($urls as $description => $feed_info) {
-      $this->assertPattern($this->urlToRSSLinkPattern($feed_info['url'], $feed_info['title']), format_string('Found correct feed header for %description', array('%description' => $description)));
+      $this->assertPattern($this->urlToRSSLinkPattern($feed_info['url'], $feed_info['title']), format_string('Found correct feed header for %description', ['%description' => $description]));
     }
   }
 
   /**
    * Creates a pattern representing the RSS feed in the page.
    */
-  function urlToRSSLinkPattern($url, $title = '') {
+  public function urlToRSSLinkPattern($url, $title = '') {
     // Escape any regular expression characters in the URL ('?' is the worst).
     $url = preg_replace('/([+?.*])/', '[$0]', $url);
     $generated_pattern = '%<link +href="' . $url . '" +rel="alternate" +title="' . $title . '" +type="application/rss.xml" */>%';
@@ -82,12 +82,12 @@ class AddFeedTest extends WebTestBase {
    *
    * @see https://www.drupal.org/node/1211668
    */
-  function testFeedIconEscaping() {
-    $variables = array(
+  public function testFeedIconEscaping() {
+    $variables = [
       '#theme' => 'feed_icon',
       '#url' => 'node',
       '#title' => '<>&"\'',
-    );
+    ];
     $text = \Drupal::service('renderer')->renderRoot($variables);
     $this->assertEqual(trim(strip_tags($text)), 'Subscribe to &lt;&gt;&amp;&quot;&#039;', 'feed_icon template escapes reserved HTML characters.');
   }
diff --git a/web/core/modules/system/src/Tests/Common/AlterTest.php b/web/core/modules/system/src/Tests/Common/AlterTest.php
index 86bed7d24..863bd54de 100644
--- a/web/core/modules/system/src/Tests/Common/AlterTest.php
+++ b/web/core/modules/system/src/Tests/Common/AlterTest.php
@@ -16,24 +16,24 @@ class AlterTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'common_test');
+  public static $modules = ['block', 'common_test'];
 
   /**
    * Tests if the theme has been altered.
    */
-  function testDrupalAlter() {
+  public function testDrupalAlter() {
     // This test depends on Bartik, so make sure that it is always the current
     // active theme.
-    \Drupal::service('theme_handler')->install(array('bartik'));
+    \Drupal::service('theme_handler')->install(['bartik']);
     \Drupal::theme()->setActiveTheme(\Drupal::service('theme.initialization')->initTheme('bartik'));
 
-    $array = array('foo' => 'bar');
+    $array = ['foo' => 'bar'];
     $entity = new \stdClass();
     $entity->foo = 'bar';
 
     // Verify alteration of a single argument.
     $array_copy = $array;
-    $array_expected = array('foo' => 'Drupal theme');
+    $array_expected = ['foo' => 'Drupal theme'];
     \Drupal::moduleHandler()->alter('drupal_alter', $array_copy);
     \Drupal::theme()->alter('drupal_alter', $array_copy);
     $this->assertEqual($array_copy, $array_expected, 'Single array was altered.');
@@ -47,12 +47,12 @@ class AlterTest extends WebTestBase {
 
     // Verify alteration of multiple arguments.
     $array_copy = $array;
-    $array_expected = array('foo' => 'Drupal theme');
+    $array_expected = ['foo' => 'Drupal theme'];
     $entity_copy = clone $entity;
     $entity_expected = clone $entity;
     $entity_expected->foo = 'Drupal theme';
     $array2_copy = $array;
-    $array2_expected = array('foo' => 'Drupal theme');
+    $array2_expected = ['foo' => 'Drupal theme'];
     \Drupal::moduleHandler()->alter('drupal_alter', $array_copy, $entity_copy, $array2_copy);
     \Drupal::theme()->alter('drupal_alter', $array_copy, $entity_copy, $array2_copy);
     $this->assertEqual($array_copy, $array_expected, 'First argument to \Drupal::moduleHandler->alter() was altered.');
@@ -63,9 +63,9 @@ class AlterTest extends WebTestBase {
     // common_test_module_implements_alter() places 'block' implementation after
     // other modules.
     $array_copy = $array;
-    $array_expected = array('foo' => 'Drupal block theme');
-    \Drupal::moduleHandler()->alter(array('drupal_alter', 'drupal_alter_foo'), $array_copy);
-    \Drupal::theme()->alter(array('drupal_alter', 'drupal_alter_foo'), $array_copy);
+    $array_expected = ['foo' => 'Drupal block theme'];
+    \Drupal::moduleHandler()->alter(['drupal_alter', 'drupal_alter_foo'], $array_copy);
+    \Drupal::theme()->alter(['drupal_alter', 'drupal_alter_foo'], $array_copy);
     $this->assertEqual($array_copy, $array_expected, 'hook_TYPE_alter() implementations ran in correct order.');
   }
 
diff --git a/web/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php b/web/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php
index 196d46311..1afdd4eeb 100644
--- a/web/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php
+++ b/web/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php
@@ -25,7 +25,7 @@ class EarlyRenderingControllerTest extends WebTestBase {
   /**
    * Tests theme preprocess functions being able to attach assets.
    */
-  function testEarlyRendering() {
+  public function testEarlyRendering() {
     // Render array: non-early & early.
     $this->drupalGet(Url::fromRoute('early_rendering_controller_test.render_array'));
     $this->assertResponse(200);
diff --git a/web/core/modules/system/src/Tests/Common/FormatDateTest.php b/web/core/modules/system/src/Tests/Common/FormatDateTest.php
index cddf0a3fa..c174e3432 100644
--- a/web/core/modules/system/src/Tests/Common/FormatDateTest.php
+++ b/web/core/modules/system/src/Tests/Common/FormatDateTest.php
@@ -17,7 +17,7 @@ class FormatDateTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Arbitrary langcode for a custom language.
@@ -32,16 +32,16 @@ class FormatDateTest extends WebTestBase {
       ->save();
     $formats = $this->container->get('entity.manager')
       ->getStorage('date_format')
-      ->loadMultiple(array('long', 'medium', 'short'));
+      ->loadMultiple(['long', 'medium', 'short']);
     $formats['long']->setPattern('l, j. F Y - G:i')->save();
     $formats['medium']->setPattern('j. F Y - G:i')->save();
     $formats['short']->setPattern('Y M j - g:ia')->save();
     $this->refreshVariables();
 
-    $this->settingsSet('locale_custom_strings_' . self::LANGCODE, array(
-      '' => array('Sunday' => 'domingo'),
-      'Long month name' => array('March' => 'marzo'),
-    ));
+    $this->settingsSet('locale_custom_strings_' . self::LANGCODE, [
+      '' => ['Sunday' => 'domingo'],
+      'Long month name' => ['March' => 'marzo'],
+    ]);
 
     ConfigurableLanguage::createFromLangcode(static::LANGCODE)->save();
     $this->resetAll();
@@ -50,24 +50,24 @@ class FormatDateTest extends WebTestBase {
   /**
    * Tests admin-defined formats in format_date().
    */
-  function testAdminDefinedFormatDate() {
+  public function testAdminDefinedFormatDate() {
     // Create and log in an admin user.
-    $this->drupalLogin($this->drupalCreateUser(array('administer site configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
 
     // Add new date format.
-    $edit = array(
+    $edit = [
       'id' => 'example_style',
       'label' => 'Example Style',
       'date_format_pattern' => 'j M y',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
 
     // Add a second date format with a different case than the first.
-    $edit = array(
+    $edit = [
       'id' => 'example_style_uppercase',
       'label' => 'Example Style Uppercase',
       'date_format_pattern' => 'j M Y',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
     $this->assertText(t('Custom date format added.'));
 
diff --git a/web/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php b/web/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php
index 0e1e29838..e671f8721 100644
--- a/web/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php
+++ b/web/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\system\Tests\Common;
 
 use Drupal\simpletest\WebTestBase;
+use Drupal\node\NodeInterface;
 
 /**
  * Tests that anonymous users are not served any JavaScript in the Standard
@@ -18,7 +19,7 @@ class NoJavaScriptAnonymousTest extends WebTestBase {
     parent::setUp();
 
     // Grant the anonymous user the permission to look at user profiles.
-    user_role_grant_permissions('anonymous', array('access user profiles'));
+    user_role_grant_permissions('anonymous', ['access user profiles']);
   }
 
   /**
@@ -26,9 +27,9 @@ class NoJavaScriptAnonymousTest extends WebTestBase {
    */
   public function testNoJavaScript() {
     // Create a node that is listed on the frontpage.
-    $this->drupalCreateNode(array(
-      'promote' => NODE_PROMOTED,
-    ));
+    $this->drupalCreateNode([
+      'promote' => NodeInterface::PROMOTED,
+    ]);
     $user = $this->drupalCreateUser();
 
     // Test frontpage.
diff --git a/web/core/modules/system/src/Tests/Common/RenderWebTest.php b/web/core/modules/system/src/Tests/Common/RenderWebTest.php
index fde7fa683..ed0e08640 100644
--- a/web/core/modules/system/src/Tests/Common/RenderWebTest.php
+++ b/web/core/modules/system/src/Tests/Common/RenderWebTest.php
@@ -19,12 +19,12 @@ class RenderWebTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('common_test');
+  public static $modules = ['common_test'];
 
   /**
    * Asserts the cache context for the wrapper format is always present.
    */
-  function testWrapperFormatCacheContext() {
+  public function testWrapperFormatCacheContext() {
     $this->drupalGet('common-test/type-link-active-class');
     $this->assertIdentical(0, strpos($this->getRawContent(), "<!DOCTYPE html>\n<html"));
     $this->assertIdentical('text/html; charset=UTF-8', $this->drupalGetHeader('Content-Type'));
@@ -43,135 +43,135 @@ class RenderWebTest extends WebTestBase {
    * Tests rendering form elements without passing through
    * \Drupal::formBuilder()->doBuildForm().
    */
-  function testDrupalRenderFormElements() {
+  public function testDrupalRenderFormElements() {
     // Define a series of form elements.
-    $element = array(
+    $element = [
       '#type' => 'button',
       '#value' => $this->randomMachineName(),
-    );
-    $this->assertRenderedElement($element, '//input[@type=:type]', array(':type' => 'submit'));
+    ];
+    $this->assertRenderedElement($element, '//input[@type=:type]', [':type' => 'submit']);
 
-    $element = array(
+    $element = [
       '#type' => 'textfield',
       '#title' => $this->randomMachineName(),
       '#value' => $this->randomMachineName(),
-    );
-    $this->assertRenderedElement($element, '//input[@type=:type]', array(':type' => 'text'));
+    ];
+    $this->assertRenderedElement($element, '//input[@type=:type]', [':type' => 'text']);
 
-    $element = array(
+    $element = [
       '#type' => 'password',
       '#title' => $this->randomMachineName(),
-    );
-    $this->assertRenderedElement($element, '//input[@type=:type]', array(':type' => 'password'));
+    ];
+    $this->assertRenderedElement($element, '//input[@type=:type]', [':type' => 'password']);
 
-    $element = array(
+    $element = [
       '#type' => 'textarea',
       '#title' => $this->randomMachineName(),
       '#value' => $this->randomMachineName(),
-    );
+    ];
     $this->assertRenderedElement($element, '//textarea');
 
-    $element = array(
+    $element = [
       '#type' => 'radio',
       '#title' => $this->randomMachineName(),
       '#value' => FALSE,
-    );
-    $this->assertRenderedElement($element, '//input[@type=:type]', array(':type' => 'radio'));
+    ];
+    $this->assertRenderedElement($element, '//input[@type=:type]', [':type' => 'radio']);
 
-    $element = array(
+    $element = [
       '#type' => 'checkbox',
       '#title' => $this->randomMachineName(),
-    );
-    $this->assertRenderedElement($element, '//input[@type=:type]', array(':type' => 'checkbox'));
+    ];
+    $this->assertRenderedElement($element, '//input[@type=:type]', [':type' => 'checkbox']);
 
-    $element = array(
+    $element = [
       '#type' => 'select',
       '#title' => $this->randomMachineName(),
-      '#options' => array(
+      '#options' => [
         0 => $this->randomMachineName(),
         1 => $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
     $this->assertRenderedElement($element, '//select');
 
-    $element = array(
+    $element = [
       '#type' => 'file',
       '#title' => $this->randomMachineName(),
-    );
-    $this->assertRenderedElement($element, '//input[@type=:type]', array(':type' => 'file'));
+    ];
+    $this->assertRenderedElement($element, '//input[@type=:type]', [':type' => 'file']);
 
-    $element = array(
+    $element = [
       '#type' => 'item',
       '#title' => $this->randomMachineName(),
       '#markup' => $this->randomMachineName(),
-    );
-    $this->assertRenderedElement($element, '//div[contains(@class, :class) and contains(., :markup)]/label[contains(., :label)]', array(
+    ];
+    $this->assertRenderedElement($element, '//div[contains(@class, :class) and contains(., :markup)]/label[contains(., :label)]', [
       ':class' => 'js-form-type-item',
       ':markup' => $element['#markup'],
       ':label' => $element['#title'],
-    ));
+    ]);
 
-    $element = array(
+    $element = [
       '#type' => 'hidden',
       '#title' => $this->randomMachineName(),
       '#value' => $this->randomMachineName(),
-    );
-    $this->assertRenderedElement($element, '//input[@type=:type]', array(':type' => 'hidden'));
+    ];
+    $this->assertRenderedElement($element, '//input[@type=:type]', [':type' => 'hidden']);
 
-    $element = array(
+    $element = [
       '#type' => 'link',
       '#title' => $this->randomMachineName(),
       '#url' => Url::fromRoute('common_test.destination'),
-      '#options' => array(
+      '#options' => [
         'absolute' => TRUE,
-      ),
-    );
-    $this->assertRenderedElement($element, '//a[@href=:href and contains(., :title)]', array(
+      ],
+    ];
+    $this->assertRenderedElement($element, '//a[@href=:href and contains(., :title)]', [
       ':href' => URL::fromRoute('common_test.destination')->setAbsolute()->toString(),
       ':title' => $element['#title'],
-    ));
+    ]);
 
-    $element = array(
+    $element = [
       '#type' => 'details',
       '#open' => TRUE,
       '#title' => $this->randomMachineName(),
-    );
-    $this->assertRenderedElement($element, '//details/summary[contains(., :title)]', array(
+    ];
+    $this->assertRenderedElement($element, '//details/summary[contains(., :title)]', [
       ':title' => $element['#title'],
-    ));
+    ]);
 
-    $element = array(
+    $element = [
       '#type' => 'details',
       '#open' => TRUE,
       '#title' => $this->randomMachineName(),
-    );
+    ];
     $this->assertRenderedElement($element, '//details');
 
-    $element['item'] = array(
+    $element['item'] = [
       '#type' => 'item',
       '#title' => $this->randomMachineName(),
       '#markup' => $this->randomMachineName(),
-    );
-    $this->assertRenderedElement($element, '//details/div/div[contains(@class, :class) and contains(., :markup)]', array(
+    ];
+    $this->assertRenderedElement($element, '//details/div/div[contains(@class, :class) and contains(., :markup)]', [
       ':class' => 'js-form-type-item',
       ':markup' => $element['item']['#markup'],
-    ));
+    ]);
   }
 
   /**
    * Tests that elements are rendered properly.
    */
-  protected function assertRenderedElement(array $element, $xpath, array $xpath_args = array()) {
+  protected function assertRenderedElement(array $element, $xpath, array $xpath_args = []) {
     $original_element = $element;
     $this->setRawContent(drupal_render_root($element));
     $this->verbose('<hr />' . $this->getRawContent());
 
     // @see \Drupal\simpletest\WebTestBase::xpath()
     $xpath = $this->buildXPathQuery($xpath, $xpath_args);
-    $element += array('#value' => NULL);
-    $this->assertFieldByXPath($xpath, $element['#value'], format_string('#type @type was properly rendered.', array(
+    $element += ['#value' => NULL];
+    $this->assertFieldByXPath($xpath, $element['#value'], format_string('#type @type was properly rendered.', [
       '@type' => var_export($element['#type'], TRUE),
-    )));
+    ]));
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php b/web/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
index 1be7e9482..9af773b86 100644
--- a/web/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
+++ b/web/core/modules/system/src/Tests/Common/SimpleTestErrorCollectorTest.php
@@ -16,7 +16,7 @@ class SimpleTestErrorCollectorTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('system_test', 'error_test');
+  public static $modules = ['system_test', 'error_test'];
 
   /**
    * Errors triggered during the test.
@@ -26,13 +26,13 @@ class SimpleTestErrorCollectorTest extends WebTestBase {
    *
    * @var Array
    */
-  protected $collectedErrors = array();
+  protected $collectedErrors = [];
 
   /**
    * Tests that simpletest collects errors from the tested site.
    */
-  function testErrorCollect() {
-    $this->collectedErrors = array();
+  public function testErrorCollect() {
+    $this->collectedErrors = [];
     $this->drupalGet('error-test/generate-warnings-with-report');
     $this->assertEqual(count($this->collectedErrors), 3, 'Three errors were collected');
 
@@ -71,23 +71,23 @@ class SimpleTestErrorCollectorTest extends WebTestBase {
     }
     // Everything else should be collected but not propagated.
     else {
-      $this->collectedErrors[] = array(
+      $this->collectedErrors[] = [
         'message' => $message,
         'group' => $group,
         'caller' => $caller
-      );
+      ];
     }
   }
 
   /**
    * Asserts that a collected error matches what we are expecting.
    */
-  function assertError($error, $group, $function, $file, $message = NULL) {
-    $this->assertEqual($error['group'], $group, format_string("Group was %group", array('%group' => $group)));
-    $this->assertEqual($error['caller']['function'], $function, format_string("Function was %function", array('%function' => $function)));
-    $this->assertEqual(drupal_basename($error['caller']['file']), $file, format_string("File was %file", array('%file' => $file)));
+  public function assertError($error, $group, $function, $file, $message = NULL) {
+    $this->assertEqual($error['group'], $group, format_string("Group was %group", ['%group' => $group]));
+    $this->assertEqual($error['caller']['function'], $function, format_string("Function was %function", ['%function' => $function]));
+    $this->assertEqual(drupal_basename($error['caller']['file']), $file, format_string("File was %file", ['%file' => $file]));
     if (isset($message)) {
-      $this->assertEqual($error['message'], $message, format_string("Message was %message", array('%message' => $message)));
+      $this->assertEqual($error['message'], $message, format_string("Message was %message", ['%message' => $message]));
     }
   }
 
diff --git a/web/core/modules/system/src/Tests/Common/UrlTest.php b/web/core/modules/system/src/Tests/Common/UrlTest.php
index 062e3e42d..d72f8e529 100644
--- a/web/core/modules/system/src/Tests/Common/UrlTest.php
+++ b/web/core/modules/system/src/Tests/Common/UrlTest.php
@@ -20,19 +20,19 @@ use Drupal\simpletest\WebTestBase;
  */
 class UrlTest extends WebTestBase {
 
-  public static $modules = array('common_test', 'url_alter_test');
+  public static $modules = ['common_test', 'url_alter_test'];
 
   /**
    * Confirms that invalid URLs are filtered in link generating functions.
    */
-  function testLinkXSS() {
+  public function testLinkXSS() {
     // Test \Drupal::l().
     $text = $this->randomMachineName();
     $path = "<SCRIPT>alert('XSS')</SCRIPT>";
     $encoded_path = "3CSCRIPT%3Ealert%28%27XSS%27%29%3C/SCRIPT%3E";
 
     $link = \Drupal::l($text, Url::fromUserInput('/' . $path));
-    $this->assertTrue(strpos($link, $encoded_path) !== FALSE && strpos($link, $path) === FALSE, format_string('XSS attack @path was filtered by \Drupal\Core\Utility\LinkGeneratorInterface::generate().', array('@path' => $path)));
+    $this->assertTrue(strpos($link, $encoded_path) !== FALSE && strpos($link, $path) === FALSE, format_string('XSS attack @path was filtered by \Drupal\Core\Utility\LinkGeneratorInterface::generate().', ['@path' => $path]));
 
     // Test \Drupal\Core\Url.
     $link = Url::fromUri('base:' . $path)->toString();
@@ -42,7 +42,7 @@ class UrlTest extends WebTestBase {
   /**
    * Tests that #type=link bubbles outbound route/path processors' metadata.
    */
-  function testLinkBubbleableMetadata() {
+  public function testLinkBubbleableMetadata() {
     $cases = [
       ['Regular link', 'internal:/user', [], ['contexts' => [], 'tags' => [], 'max-age' => Cache::PERMANENT], []],
       ['Regular link, absolute', 'internal:/user', ['absolute' => TRUE], ['contexts' => ['url.site'], 'tags' => [], 'max-age' => Cache::PERMANENT], []],
@@ -71,20 +71,20 @@ class UrlTest extends WebTestBase {
   /**
    * Tests that default and custom attributes are handled correctly on links.
    */
-  function testLinkAttributes() {
+  public function testLinkAttributes() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
 
     // Test that hreflang is added when a link has a known language.
-    $language = new Language(array('id' => 'fr', 'name' => 'French'));
-    $hreflang_link = array(
+    $language = new Language(['id' => 'fr', 'name' => 'French']);
+    $hreflang_link = [
       '#type' => 'link',
-      '#options' => array(
+      '#options' => [
         'language' => $language,
-      ),
+      ],
       '#url' => Url::fromUri('https://www.drupal.org'),
       '#title' => 'bar',
-    );
+    ];
     $langcode = $language->getId();
 
     // Test that the default hreflang handling for links does not override a
@@ -93,45 +93,45 @@ class UrlTest extends WebTestBase {
     $hreflang_override_link['#options']['attributes']['hreflang'] = 'foo';
 
     $rendered = $renderer->renderRoot($hreflang_link);
-    $this->assertTrue($this->hasAttribute('hreflang', $rendered, $langcode), format_string('hreflang attribute with value @langcode is present on a rendered link when langcode is provided in the render array.', array('@langcode' => $langcode)));
+    $this->assertTrue($this->hasAttribute('hreflang', $rendered, $langcode), format_string('hreflang attribute with value @langcode is present on a rendered link when langcode is provided in the render array.', ['@langcode' => $langcode]));
 
     $rendered = $renderer->renderRoot($hreflang_override_link);
-    $this->assertTrue($this->hasAttribute('hreflang', $rendered, 'foo'), format_string('hreflang attribute with value @hreflang is present on a rendered link when @hreflang is provided in the render array.', array('@hreflang' => 'foo')));
+    $this->assertTrue($this->hasAttribute('hreflang', $rendered, 'foo'), format_string('hreflang attribute with value @hreflang is present on a rendered link when @hreflang is provided in the render array.', ['@hreflang' => 'foo']));
 
     // Test the active class in links produced by
     // \Drupal\Core\Utility\LinkGeneratorInterface::generate() and #type 'link'.
-    $options_no_query = array();
-    $options_query = array(
-      'query' => array(
+    $options_no_query = [];
+    $options_query = [
+      'query' => [
         'foo' => 'bar',
         'one' => 'two',
-      ),
-    );
-    $options_query_reverse = array(
-      'query' => array(
+      ],
+    ];
+    $options_query_reverse = [
+      'query' => [
         'one' => 'two',
         'foo' => 'bar',
-      ),
-    );
+      ],
+    ];
 
     // Test #type link.
     $path = 'common-test/type-link-active-class';
 
     $this->drupalGet($path, $options_no_query);
-    $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', array(':href' => Url::fromRoute('common_test.l_active_class', [], $options_no_query)->toString(), ':class' => 'is-active'));
+    $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', [':href' => Url::fromRoute('common_test.l_active_class', [], $options_no_query)->toString(), ':class' => 'is-active']);
     $this->assertTrue(isset($links[0]), 'A link generated by the link generator to the current page is marked active.');
 
-    $links = $this->xpath('//a[@href = :href and not(contains(@class, :class))]', array(':href' => Url::fromRoute('common_test.l_active_class', [], $options_query)->toString(), ':class' => 'is-active'));
+    $links = $this->xpath('//a[@href = :href and not(contains(@class, :class))]', [':href' => Url::fromRoute('common_test.l_active_class', [], $options_query)->toString(), ':class' => 'is-active']);
     $this->assertTrue(isset($links[0]), 'A link generated by the link generator to the current page with a query string when the current page has no query string is not marked active.');
 
     $this->drupalGet($path, $options_query);
-    $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', array(':href' => Url::fromRoute('common_test.l_active_class', [], $options_query)->toString(), ':class' => 'is-active'));
+    $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', [':href' => Url::fromRoute('common_test.l_active_class', [], $options_query)->toString(), ':class' => 'is-active']);
     $this->assertTrue(isset($links[0]), 'A link generated by the link generator to the current page with a query string that matches the current query string is marked active.');
 
-    $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', array(':href' => Url::fromRoute('common_test.l_active_class', [], $options_query_reverse)->toString(), ':class' => 'is-active'));
+    $links = $this->xpath('//a[@href = :href and contains(@class, :class)]', [':href' => Url::fromRoute('common_test.l_active_class', [], $options_query_reverse)->toString(), ':class' => 'is-active']);
     $this->assertTrue(isset($links[0]), 'A link generated by the link generator to the current page with a query string that has matching parameters to the current query string but in a different order is marked active.');
 
-    $links = $this->xpath('//a[@href = :href and not(contains(@class, :class))]', array(':href' => Url::fromRoute('common_test.l_active_class', [], $options_no_query)->toString(), ':class' => 'is-active'));
+    $links = $this->xpath('//a[@href = :href and not(contains(@class, :class))]', [':href' => Url::fromRoute('common_test.l_active_class', [], $options_no_query)->toString(), ':class' => 'is-active']);
     $this->assertTrue(isset($links[0]), 'A link generated by the link generator to the current page without a query string when the current page has a query string is not marked active.');
 
     // Test adding a custom class in links produced by
@@ -139,28 +139,28 @@ class UrlTest extends WebTestBase {
     // Test the link generator.
     $class_l = $this->randomMachineName();
     $link_l = \Drupal::l($this->randomMachineName(), new Url('<current>', [], ['attributes' => ['class' => [$class_l]]]));
-    $this->assertTrue($this->hasAttribute('class', $link_l, $class_l), format_string('Custom class @class is present on link when requested by l()', array('@class' => $class_l)));
+    $this->assertTrue($this->hasAttribute('class', $link_l, $class_l), format_string('Custom class @class is present on link when requested by l()', ['@class' => $class_l]));
 
     // Test #type.
     $class_theme = $this->randomMachineName();
-    $type_link = array(
+    $type_link = [
       '#type' => 'link',
       '#title' => $this->randomMachineName(),
       '#url' => Url::fromRoute('<current>'),
-      '#options' => array(
-        'attributes' => array(
-          'class' => array($class_theme),
-        ),
-      ),
-    );
+      '#options' => [
+        'attributes' => [
+          'class' => [$class_theme],
+        ],
+      ],
+    ];
     $link_theme = $renderer->renderRoot($type_link);
-    $this->assertTrue($this->hasAttribute('class', $link_theme, $class_theme), format_string('Custom class @class is present on link when requested by #type', array('@class' => $class_theme)));
+    $this->assertTrue($this->hasAttribute('class', $link_theme, $class_theme), format_string('Custom class @class is present on link when requested by #type', ['@class' => $class_theme]));
   }
 
   /**
    * Tests that link functions support render arrays as 'text'.
    */
-  function testLinkRenderArrayText() {
+  public function testLinkRenderArrayText() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
 
@@ -169,26 +169,26 @@ class UrlTest extends WebTestBase {
 
     // Test a renderable array passed to the link generator.
     $renderer->executeInRenderContext(new RenderContext(), function() use ($renderer, $l) {
-      $renderable_text = array('#markup' => 'foo');
+      $renderable_text = ['#markup' => 'foo'];
       $l_renderable_text = \Drupal::l($renderable_text, Url::fromUri('https://www.drupal.org'));
       $this->assertEqual($l_renderable_text, $l);
     });
 
     // Test a themed link with plain text 'text'.
-    $type_link_plain_array = array(
+    $type_link_plain_array = [
       '#type' => 'link',
       '#title' => 'foo',
       '#url' => Url::fromUri('https://www.drupal.org'),
-    );
+    ];
     $type_link_plain = $renderer->renderRoot($type_link_plain_array);
     $this->assertEqual($type_link_plain, $l);
 
     // Build a themed link with renderable 'text'.
-    $type_link_nested_array = array(
+    $type_link_nested_array = [
       '#type' => 'link',
-      '#title' => array('#markup' => 'foo'),
+      '#title' => ['#markup' => 'foo'],
       '#url' => Url::fromUri('https://www.drupal.org'),
-    );
+    ];
     $type_link_nested = $renderer->renderRoot($type_link_nested_array);
     $this->assertEqual($type_link_nested, $l);
   }
@@ -211,54 +211,54 @@ class UrlTest extends WebTestBase {
   /**
    * Tests UrlHelper::filterQueryParameters().
    */
-  function testDrupalGetQueryParameters() {
-    $original = array(
+  public function testDrupalGetQueryParameters() {
+    $original = [
       'a' => 1,
-      'b' => array(
+      'b' => [
         'd' => 4,
-        'e' => array(
+        'e' => [
           'f' => 5,
-        ),
-      ),
+        ],
+      ],
       'c' => 3,
-    );
+    ];
 
     // First-level exclusion.
     $result = $original;
     unset($result['b']);
-    $this->assertEqual(UrlHelper::filterQueryParameters($original, array('b')), $result, "'b' was removed.");
+    $this->assertEqual(UrlHelper::filterQueryParameters($original, ['b']), $result, "'b' was removed.");
 
     // Second-level exclusion.
     $result = $original;
     unset($result['b']['d']);
-    $this->assertEqual(UrlHelper::filterQueryParameters($original, array('b[d]')), $result, "'b[d]' was removed.");
+    $this->assertEqual(UrlHelper::filterQueryParameters($original, ['b[d]']), $result, "'b[d]' was removed.");
 
     // Third-level exclusion.
     $result = $original;
     unset($result['b']['e']['f']);
-    $this->assertEqual(UrlHelper::filterQueryParameters($original, array('b[e][f]')), $result, "'b[e][f]' was removed.");
+    $this->assertEqual(UrlHelper::filterQueryParameters($original, ['b[e][f]']), $result, "'b[e][f]' was removed.");
 
     // Multiple exclusions.
     $result = $original;
     unset($result['a'], $result['b']['e'], $result['c']);
-    $this->assertEqual(UrlHelper::filterQueryParameters($original, array('a', 'b[e]', 'c')), $result, "'a', 'b[e]', 'c' were removed.");
+    $this->assertEqual(UrlHelper::filterQueryParameters($original, ['a', 'b[e]', 'c']), $result, "'a', 'b[e]', 'c' were removed.");
   }
 
   /**
    * Tests UrlHelper::parse().
    */
-  function testDrupalParseUrl() {
+  public function testDrupalParseUrl() {
     // Relative, absolute, and external URLs, without/with explicit script path,
     // without/with Drupal path.
-    foreach (array('', '/', 'https://www.drupal.org/') as $absolute) {
-      foreach (array('', 'index.php/') as $script) {
-        foreach (array('', 'foo/bar') as $path) {
+    foreach (['', '/', 'https://www.drupal.org/'] as $absolute) {
+      foreach (['', 'index.php/'] as $script) {
+        foreach (['', 'foo/bar'] as $path) {
           $url = $absolute . $script . $path . '?foo=bar&bar=baz&baz#foo';
-          $expected = array(
+          $expected = [
             'path' => $absolute . $script . $path,
-            'query' => array('foo' => 'bar', 'bar' => 'baz', 'baz' => ''),
+            'query' => ['foo' => 'bar', 'bar' => 'baz', 'baz' => ''],
             'fragment' => 'foo',
-          );
+          ];
           $this->assertEqual(UrlHelper::parse($url), $expected, 'URL parsed correctly.');
         }
       }
@@ -266,11 +266,11 @@ class UrlTest extends WebTestBase {
 
     // Relative URL that is known to confuse parse_url().
     $url = 'foo/bar:1';
-    $result = array(
+    $result = [
       'path' => 'foo/bar:1',
-      'query' => array(),
+      'query' => [],
       'fragment' => '',
-    );
+    ];
     $this->assertEqual(UrlHelper::parse($url), $result, 'Relative URL parsed correctly.');
 
     // Test that drupal can recognize an absolute URL. Used to prevent attack vectors.
@@ -285,7 +285,7 @@ class UrlTest extends WebTestBase {
   /**
    * Tests external URL handling.
    */
-  function testExternalUrls() {
+  public function testExternalUrls() {
     $test_url = 'https://www.drupal.org/';
 
     // Verify external URL can contain a fragment.
@@ -296,7 +296,7 @@ class UrlTest extends WebTestBase {
     // Verify fragment can be overridden in an external URL.
     $url = $test_url . '#drupal';
     $fragment = $this->randomMachineName(10);
-    $result = Url::fromUri($url, array('fragment' => $fragment))->toString();
+    $result = Url::fromUri($url, ['fragment' => $fragment])->toString();
     $this->assertEqual($test_url . '#' . $fragment, $result, 'External URL fragment is overridden with a custom fragment in $options.');
 
     // Verify external URL can contain a query string.
@@ -306,14 +306,14 @@ class UrlTest extends WebTestBase {
 
     // Verify external URL can be extended with a query string.
     $url = $test_url;
-    $query = array($this->randomMachineName(5) => $this->randomMachineName(5));
-    $result = Url::fromUri($url, array('query' => $query))->toString();
+    $query = [$this->randomMachineName(5) => $this->randomMachineName(5)];
+    $result = Url::fromUri($url, ['query' => $query])->toString();
     $this->assertEqual($url . '?' . http_build_query($query, '', '&'), $result, 'External URL can be extended with a query string in $options.');
 
     // Verify query string can be extended in an external URL.
     $url = $test_url . '?drupal=awesome';
-    $query = array($this->randomMachineName(5) => $this->randomMachineName(5));
-    $result = Url::fromUri($url, array('query' => $query))->toString();
+    $query = [$this->randomMachineName(5) => $this->randomMachineName(5)];
+    $result = Url::fromUri($url, ['query' => $query])->toString();
     $this->assertEqual($url . '&' . http_build_query($query, '', '&'), $result);
   }
 
diff --git a/web/core/modules/system/src/Tests/Condition/ConditionFormTest.php b/web/core/modules/system/src/Tests/Condition/ConditionFormTest.php
index 21d0fcb9e..42945b250 100644
--- a/web/core/modules/system/src/Tests/Condition/ConditionFormTest.php
+++ b/web/core/modules/system/src/Tests/Condition/ConditionFormTest.php
@@ -16,14 +16,14 @@ use Drupal\simpletest\WebTestBase;
  */
 class ConditionFormTest extends WebTestBase {
 
-  public static $modules = array('node', 'condition_test');
+  public static $modules = ['node', 'condition_test'];
 
   /**
    * Submit the condition_node_type_test_form to test condition forms.
    */
-  function testConfigForm() {
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Page'));
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+  public function testConfigForm() {
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Page']);
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
 
     $article = Node::create([
       'type' => 'article',
@@ -34,7 +34,7 @@ class ConditionFormTest extends WebTestBase {
     $this->drupalGet('condition_test');
     $this->assertField('bundles[article]', 'There is an article bundle selector.');
     $this->assertField('bundles[page]', 'There is a page bundle selector.');
-    $this->drupalPostForm(NULL, array('bundles[page]' => 'page', 'bundles[article]' => 'article'), t('Submit'));
+    $this->drupalPostForm(NULL, ['bundles[page]' => 'page', 'bundles[article]' => 'article'], t('Submit'));
     // @see \Drupal\condition_test\FormController::submitForm()
     $this->assertText('Bundle: page');
     $this->assertText('Bundle: article');
diff --git a/web/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php b/web/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
index d484d68fd..8fb369a37 100644
--- a/web/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
+++ b/web/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
@@ -15,7 +15,7 @@ abstract class DatabaseWebTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('database_test');
+  public static $modules = ['database_test'];
 
   protected function setUp() {
     parent::setUp();
diff --git a/web/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php b/web/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
index cdfeab8d0..a264d33ea 100644
--- a/web/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
+++ b/web/core/modules/system/src/Tests/Database/SelectPagerDefaultTest.php
@@ -16,7 +16,7 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
    */
-  function testEvenPagerQuery() {
+  public function testEvenPagerQuery() {
     // To keep the test from being too brittle, we determine up front
     // what the page count should be dynamically, and pass the control
     // information forward to the actual query on the other side of the
@@ -33,14 +33,14 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
     }
 
     for ($page = 0; $page <= $num_pages; ++$page) {
-      $this->drupalGet('database_test/pager_query_even/' . $limit, array('query' => array('page' => $page)));
+      $this->drupalGet('database_test/pager_query_even/' . $limit, ['query' => ['page' => $page]]);
       $data = json_decode($this->getRawContent());
 
       if ($page == $num_pages) {
         $correct_number = $count - ($limit * $page);
       }
 
-      $this->assertEqual(count($data->names), $correct_number, format_string('Correct number of records returned by pager: @number', array('@number' => $correct_number)));
+      $this->assertEqual(count($data->names), $correct_number, format_string('Correct number of records returned by pager: @number', ['@number' => $correct_number]));
     }
   }
 
@@ -50,7 +50,7 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
    */
-  function testOddPagerQuery() {
+  public function testOddPagerQuery() {
     // To keep the test from being too brittle, we determine up front
     // what the page count should be dynamically, and pass the control
     // information forward to the actual query on the other side of the
@@ -67,14 +67,14 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
     }
 
     for ($page = 0; $page <= $num_pages; ++$page) {
-      $this->drupalGet('database_test/pager_query_odd/' . $limit, array('query' => array('page' => $page)));
+      $this->drupalGet('database_test/pager_query_odd/' . $limit, ['query' => ['page' => $page]]);
       $data = json_decode($this->getRawContent());
 
       if ($page == $num_pages) {
         $correct_number = $count - ($limit * $page);
       }
 
-      $this->assertEqual(count($data->names), $correct_number, format_string('Correct number of records returned by pager: @number', array('@number' => $correct_number)));
+      $this->assertEqual(count($data->names), $correct_number, format_string('Correct number of records returned by pager: @number', ['@number' => $correct_number]));
     }
   }
 
@@ -83,11 +83,11 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
    *
    * This is a regression test for #467984.
    */
-  function testInnerPagerQuery() {
+  public function testInnerPagerQuery() {
     $query = db_select('test', 't')
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender');
     $query
-      ->fields('t', array('age'))
+      ->fields('t', ['age'])
       ->orderBy('age')
       ->limit(5);
 
@@ -97,7 +97,7 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
     $ages = $outer_query
       ->execute()
       ->fetchCol();
-    $this->assertEqual($ages, array(25, 26, 27, 28), 'Inner pager query returned the correct ages.');
+    $this->assertEqual($ages, [25, 26, 27, 28], 'Inner pager query returned the correct ages.');
   }
 
   /**
@@ -105,37 +105,37 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
    *
    * This is a regression test for #467984.
    */
-  function testHavingPagerQuery() {
+  public function testHavingPagerQuery() {
     $query = db_select('test', 't')
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender');
     $query
-      ->fields('t', array('name'))
+      ->fields('t', ['name'])
       ->orderBy('name')
       ->groupBy('name')
-      ->having('MAX(age) > :count', array(':count' => 26))
+      ->having('MAX(age) > :count', [':count' => 26])
       ->limit(5);
 
     $ages = $query
       ->execute()
       ->fetchCol();
-    $this->assertEqual($ages, array('George', 'Ringo'), 'Pager query with having expression returned the correct ages.');
+    $this->assertEqual($ages, ['George', 'Ringo'], 'Pager query with having expression returned the correct ages.');
   }
 
   /**
    * Confirms that every pager gets a valid, non-overlapping element ID.
    */
-  function testElementNumbers() {
+  public function testElementNumbers() {
 
     $request = Request::createFromGlobals();
-    $request->query->replace(array(
+    $request->query->replace([
       'page' => '3, 2, 1, 0',
-    ));
+    ]);
     \Drupal::getContainer()->get('request_stack')->push($request);
 
     $name = db_select('test', 't')
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
       ->element(2)
-      ->fields('t', array('name'))
+      ->fields('t', ['name'])
       ->orderBy('age')
       ->limit(1)
       ->execute()
@@ -147,7 +147,7 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
     $name = db_select('test', 't')
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
       ->element(1)
-      ->fields('t', array('name'))
+      ->fields('t', ['name'])
       ->orderBy('age')
       ->limit(1)
       ->execute()
@@ -156,7 +156,7 @@ class SelectPagerDefaultTest extends DatabaseWebTestBase {
 
     $name = db_select('test', 't')
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
-      ->fields('t', array('name'))
+      ->fields('t', ['name'])
       ->orderBy('age')
       ->limit(1)
       ->execute()
diff --git a/web/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php b/web/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
index 7ccbbb5ef..97a676b16 100644
--- a/web/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
+++ b/web/core/modules/system/src/Tests/Database/SelectTableSortDefaultTest.php
@@ -15,18 +15,18 @@ class SelectTableSortDefaultTest extends DatabaseWebTestBase {
    * Note that we have to make an HTTP request to a test page handler
    * because the pager depends on GET parameters.
    */
-  function testTableSortQuery() {
-    $sorts = array(
-      array('field' => t('Task ID'), 'sort' => 'desc', 'first' => 'perform at superbowl', 'last' => 'eat'),
-      array('field' => t('Task ID'), 'sort' => 'asc', 'first' => 'eat', 'last' => 'perform at superbowl'),
-      array('field' => t('Task'), 'sort' => 'asc', 'first' => 'code', 'last' => 'sleep'),
-      array('field' => t('Task'), 'sort' => 'desc', 'first' => 'sleep', 'last' => 'code'),
+  public function testTableSortQuery() {
+    $sorts = [
+      ['field' => t('Task ID'), 'sort' => 'desc', 'first' => 'perform at superbowl', 'last' => 'eat'],
+      ['field' => t('Task ID'), 'sort' => 'asc', 'first' => 'eat', 'last' => 'perform at superbowl'],
+      ['field' => t('Task'), 'sort' => 'asc', 'first' => 'code', 'last' => 'sleep'],
+      ['field' => t('Task'), 'sort' => 'desc', 'first' => 'sleep', 'last' => 'code'],
       // more elements here
 
-    );
+    ];
 
     foreach ($sorts as $sort) {
-      $this->drupalGet('database_test/tablesort/', array('query' => array('order' => $sort['field'], 'sort' => $sort['sort'])));
+      $this->drupalGet('database_test/tablesort/', ['query' => ['order' => $sort['field'], 'sort' => $sort['sort']]]);
       $data = json_decode($this->getRawContent());
 
       $first = array_shift($data->tasks);
@@ -43,25 +43,25 @@ class SelectTableSortDefaultTest extends DatabaseWebTestBase {
    * If a tablesort's orderByHeader is called before another orderBy, then its
    * header happens first.
    */
-  function testTableSortQueryFirst() {
-    $sorts = array(
-      array('field' => t('Task ID'), 'sort' => 'desc', 'first' => 'perform at superbowl', 'last' => 'eat'),
-      array('field' => t('Task ID'), 'sort' => 'asc', 'first' => 'eat', 'last' => 'perform at superbowl'),
-      array('field' => t('Task'), 'sort' => 'asc', 'first' => 'code', 'last' => 'sleep'),
-      array('field' => t('Task'), 'sort' => 'desc', 'first' => 'sleep', 'last' => 'code'),
+  public function testTableSortQueryFirst() {
+    $sorts = [
+      ['field' => t('Task ID'), 'sort' => 'desc', 'first' => 'perform at superbowl', 'last' => 'eat'],
+      ['field' => t('Task ID'), 'sort' => 'asc', 'first' => 'eat', 'last' => 'perform at superbowl'],
+      ['field' => t('Task'), 'sort' => 'asc', 'first' => 'code', 'last' => 'sleep'],
+      ['field' => t('Task'), 'sort' => 'desc', 'first' => 'sleep', 'last' => 'code'],
       // more elements here
 
-    );
+    ];
 
     foreach ($sorts as $sort) {
-      $this->drupalGet('database_test/tablesort_first/', array('query' => array('order' => $sort['field'], 'sort' => $sort['sort'])));
+      $this->drupalGet('database_test/tablesort_first/', ['query' => ['order' => $sort['field'], 'sort' => $sort['sort']]]);
       $data = json_decode($this->getRawContent());
 
       $first = array_shift($data->tasks);
       $last = array_pop($data->tasks);
 
-      $this->assertEqual($first->task, $sort['first'], format_string('Items appear in the correct order sorting by @field @sort.', array('@field' => $sort['field'], '@sort' => $sort['sort'])));
-      $this->assertEqual($last->task, $sort['last'], format_string('Items appear in the correct order sorting by @field @sort.', array('@field' => $sort['field'], '@sort' => $sort['sort'])));
+      $this->assertEqual($first->task, $sort['first'], format_string('Items appear in the correct order sorting by @field @sort.', ['@field' => $sort['field'], '@sort' => $sort['sort']]));
+      $this->assertEqual($last->task, $sort['last'], format_string('Items appear in the correct order sorting by @field @sort.', ['@field' => $sort['field'], '@sort' => $sort['sort']]));
     }
   }
 
@@ -71,7 +71,7 @@ class SelectTableSortDefaultTest extends DatabaseWebTestBase {
    * Specifically that no sort is set in a tableselect, and that header links
    * are correct.
    */
-  function testTableSortDefaultSort() {
+  public function testTableSortDefaultSort() {
     $this->drupalGet('database_test/tablesort_default_sort');
 
     // Verify that the table was displayed. Just the header is checked for
diff --git a/web/core/modules/system/src/Tests/Database/TemporaryQueryTest.php b/web/core/modules/system/src/Tests/Database/TemporaryQueryTest.php
index 1bfa75466..d0dce74e4 100644
--- a/web/core/modules/system/src/Tests/Database/TemporaryQueryTest.php
+++ b/web/core/modules/system/src/Tests/Database/TemporaryQueryTest.php
@@ -14,19 +14,19 @@ class TemporaryQueryTest extends DatabaseWebTestBase {
    *
    * @var array
    */
-  public static $modules = array('database_test');
+  public static $modules = ['database_test'];
 
   /**
    * Returns the number of rows of a table.
    */
-  function countTableRows($table_name) {
+  public function countTableRows($table_name) {
     return db_select($table_name)->countQuery()->execute()->fetchField();
   }
 
   /**
    * Confirms that temporary tables work and are limited to one request.
    */
-  function testTemporaryQuery() {
+  public function testTemporaryQuery() {
     $this->drupalGet('database_test/db_query_temporary');
     $data = json_decode($this->getRawContent());
     if ($data) {
@@ -38,8 +38,8 @@ class TemporaryQueryTest extends DatabaseWebTestBase {
     }
 
     // Now try to run two db_query_temporary() in the same request.
-    $table_name_test = db_query_temporary('SELECT name FROM {test}', array());
-    $table_name_task = db_query_temporary('SELECT pid FROM {test_task}', array());
+    $table_name_test = db_query_temporary('SELECT name FROM {test}', []);
+    $table_name_task = db_query_temporary('SELECT pid FROM {test_task}', []);
 
     $this->assertEqual($this->countTableRows($table_name_test), $this->countTableRows('test'), 'A temporary table was created successfully in this request.');
     $this->assertEqual($this->countTableRows($table_name_task), $this->countTableRows('test_task'), 'A second temporary table was created successfully in this request.');
@@ -50,7 +50,7 @@ class TemporaryQueryTest extends DatabaseWebTestBase {
       -- Let's select some rows into a temporary table
       SELECT name FROM {test}
     ";
-    $table_name_test = db_query_temporary($sql, array());
+    $table_name_test = db_query_temporary($sql, []);
     $this->assertEqual($this->countTableRows($table_name_test), $this->countTableRows('test'), 'Leading white space and comments do not interfere with temporary table creation.');
   }
 
diff --git a/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
index 9ecefad4f..7f5c5e340 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
+++ b/web/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
@@ -16,6 +16,9 @@ use Drupal\user\RoleInterface;
 
 /**
  * Provides helper methods for Entity cache tags tests.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\system\Functional\Entity\EntityCacheTagsTestBase instead.
  */
 abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
 
@@ -68,18 +71,18 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
     if ($this->entity->getEntityType()->get('field_ui_base_route')) {
       // Add field, so we can modify the field storage and field entities to
       // verify that changes to those indeed clear cache tags.
-      FieldStorageConfig::create(array(
+      FieldStorageConfig::create([
         'field_name' => 'configurable_field',
         'entity_type' => $this->entity->getEntityTypeId(),
         'type' => 'test_field',
-        'settings' => array(),
-      ))->save();
+        'settings' => [],
+      ])->save();
       FieldConfig::create([
         'entity_type' => $this->entity->getEntityTypeId(),
         'bundle' => $this->entity->bundle(),
         'field_name' => 'configurable_field',
         'label' => 'Configurable field',
-        'settings' => array(),
+        'settings' => [],
       ])->save();
 
       // Reload the entity now that a new field has been added to it.
@@ -110,11 +113,11 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
    * @see \Drupal\simpletest\TestBase::getInfo()
    */
   protected static function generateStandardizedInfo($entity_type_label, $group) {
-    return array(
+    return [
       'name' => "$entity_type_label entity cache tags",
       'description' => "Test the $entity_type_label entity's cache tags.",
       'group' => $group,
-    );
+    ];
   }
 
   /**
@@ -170,7 +173,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
    * @see \Drupal\system\Tests\Entity\EntityCacheTagsTestBase::createEntity()
    */
   protected function getAdditionalCacheTagsForEntity(EntityInterface $entity) {
-    return array();
+    return [];
   }
 
   /**
@@ -205,7 +208,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
   protected function selectViewMode($entity_type) {
     $view_modes = \Drupal::entityManager()
       ->getStorage('entity_view_mode')
-      ->loadByProperties(array('targetEntityType' => $entity_type));
+      ->loadByProperties(['targetEntityType' => $entity_type]);
 
     if (empty($view_modes)) {
       return 'default';
@@ -241,46 +244,46 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
 
     // Add a field of the given type to the given entity type's "foo" bundle.
     $field_name = $referenced_entity->getEntityTypeId() . '_reference';
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => $entity_type,
       'type' => 'entity_reference',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-      'settings' => array(
+      'settings' => [
         'target_type' => $referenced_entity->getEntityTypeId(),
-      ),
-    ))->save();
+      ],
+    ])->save();
     FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => $entity_type,
       'bundle' => $bundle,
-      'settings' => array(
+      'settings' => [
         'handler' => 'default',
-        'handler_settings' => array(
-          'target_bundles' => array(
+        'handler_settings' => [
+          'target_bundles' => [
             $referenced_entity->bundle() => $referenced_entity->bundle(),
-          ),
-          'sort' => array('field' => '_none'),
+          ],
+          'sort' => ['field' => '_none'],
           'auto_create' => FALSE,
-        ),
-      ),
+        ],
+      ],
     ])->save();
     if (!$this->entity->getEntityType()->hasHandlerClass('view_builder')) {
       entity_get_display($entity_type, $bundle, 'full')
-        ->setComponent($field_name, array(
+        ->setComponent($field_name, [
           'type' => 'entity_reference_label',
-        ))
+        ])
         ->save();
     }
     else {
       $referenced_entity_view_mode = $this->selectViewMode($this->entity->getEntityTypeId());
       entity_get_display($entity_type, $bundle, 'full')
-        ->setComponent($field_name, array(
+        ->setComponent($field_name, [
           'type' => 'entity_reference_entity_view',
-          'settings' => array(
+          'settings' => [
             'view_mode' => $referenced_entity_view_mode,
-          ),
-        ))
+          ],
+        ])
         ->save();
     }
 
@@ -288,28 +291,28 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
     $label_key = \Drupal::entityManager()->getDefinition($entity_type)->getKey('label');
     $referencing_entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         $label_key => 'Referencing ' . $entity_type,
         'status' => 1,
         'type' => $bundle,
-        $field_name => array('target_id' => $referenced_entity->id()),
-      ));
+        $field_name => ['target_id' => $referenced_entity->id()],
+      ]);
     $referencing_entity->save();
 
     // Create an entity that does not reference the entity being tested.
     $non_referencing_entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         $label_key => 'Non-referencing ' . $entity_type,
         'status' => 1,
         'type' => $bundle,
-      ));
+      ]);
     $non_referencing_entity->save();
 
-    return array(
+    return [
       $referencing_entity,
       $non_referencing_entity,
-    );
+    ];
   }
 
   /**
@@ -343,14 +346,14 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
     // 'user.permissions' is a required cache context, and responses that vary
     // by this cache context when requested by anonymous users automatically
     // also get this cache tag, to ensure correct invalidation.
-    $page_cache_tags = Cache::mergeTags(['rendered'], ['config:user.role.anonymous']);
+    $page_cache_tags = Cache::mergeTags(['http_response', 'rendered'], ['config:user.role.anonymous']);
     // If the block module is used, the Block page display variant is used,
     // which adds the block config entity type's list cache tags.
     $page_cache_tags = Cache::mergeTags($page_cache_tags, \Drupal::moduleHandler()->moduleExists('block') ? ['config:block_list'] : []);
 
     $page_cache_tags_referencing_entity = in_array('user.permissions', $this->getAccessCacheContextsForEntity($this->referencingEntity)) ? ['config:user.role.anonymous'] : [];
 
-    $view_cache_tag = array();
+    $view_cache_tag = [];
     if ($this->entity->getEntityType()->hasHandlerClass('view_builder')) {
       $view_cache_tag = \Drupal::entityManager()->getViewBuilder($entity_type)
         ->getCacheTags();
@@ -641,7 +644,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
 
     // Verify cache hits.
     $referencing_entity_cache_tags = Cache::mergeTags($this->referencingEntity->getCacheTags(), \Drupal::entityManager()->getViewBuilder('entity_test')->getCacheTags());
-    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, ['rendered']);
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, ['http_response', 'rendered']);
 
     $nonempty_entity_listing_cache_tags = Cache::mergeTags($this->entity->getEntityType()->getListCacheTags(), $this->getAdditionalCacheTagsForEntityListing());
     $nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $page_cache_tags);
diff --git a/web/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php b/web/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php
index 0123597e7..3b1e7bd66 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php
+++ b/web/core/modules/system/src/Tests/Entity/EntityDefinitionTestTrait.php
@@ -37,6 +37,7 @@ trait EntityDefinitionTestTrait {
     $keys = $entity_type->getKeys();
     $keys['revision'] = 'revision_id';
     $entity_type->set('entity_keys', $keys);
+    $entity_type->set('revision_table', 'entity_test_update_revision');
 
     $this->state->set('entity_test_update.entity_type', $entity_type);
   }
@@ -50,6 +51,7 @@ trait EntityDefinitionTestTrait {
     $keys = $entity_type->getKeys();
     unset($keys['revision']);
     $entity_type->set('entity_keys', $keys);
+    $entity_type->set('revision_table', NULL);
 
     $this->state->set('entity_test_update.entity_type', $entity_type);
   }
@@ -86,6 +88,24 @@ trait EntityDefinitionTestTrait {
     $this->state->set('entity_test_update.entity_type', $entity_type);
   }
 
+  /**
+   * Updates the 'entity_test_update' entity type to revisionable and
+   * translatable.
+   */
+  protected function updateEntityTypeToRevisionableAndTranslatable() {
+    $entity_type = clone $this->entityManager->getDefinition('entity_test_update');
+
+    $keys = $entity_type->getKeys();
+    $keys['revision'] = 'revision_id';
+    $entity_type->set('entity_keys', $keys);
+    $entity_type->set('translatable', TRUE);
+    $entity_type->set('data_table', 'entity_test_update_data');
+    $entity_type->set('revision_table', 'entity_test_update_revision');
+    $entity_type->set('revision_data_table', 'entity_test_update_revision_data');
+
+    $this->state->set('entity_test_update.entity_type', $entity_type);
+  }
+
   /**
    * Adds a new base field to the 'entity_test_update' entity type.
    *
@@ -202,9 +222,9 @@ trait EntityDefinitionTestTrait {
    * @see \Drupal\entity_test\EntityTestStorageSchema::getEntitySchema()
    */
   protected function addEntityIndex() {
-    $indexes = array(
-      'entity_test_update__new_index' => array('name', 'user_id'),
-    );
+    $indexes = [
+      'entity_test_update__new_index' => ['name', 'test_single_property'],
+    ];
     $this->state->set('entity_test_update.additional_entity_indexes', $indexes);
   }
 
diff --git a/web/core/modules/system/src/Tests/Entity/EntityFormTest.php b/web/core/modules/system/src/Tests/Entity/EntityFormTest.php
index 4e0ced512..2ebc35061 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityFormTest.php
+++ b/web/core/modules/system/src/Tests/Entity/EntityFormTest.php
@@ -17,11 +17,11 @@ class EntityFormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('entity_test', 'language');
+  public static $modules = ['entity_test', 'language'];
 
   protected function setUp() {
     parent::setUp();
-    $web_user = $this->drupalCreateUser(array('administer entity_test content', 'view test entity'));
+    $web_user = $this->drupalCreateUser(['administer entity_test content', 'view test entity']);
     $this->drupalLogin($web_user);
 
     // Add a language.
@@ -31,7 +31,7 @@ class EntityFormTest extends WebTestBase {
   /**
    * Tests basic form CRUD functionality.
    */
-  function testFormCRUD() {
+  public function testFormCRUD() {
     // All entity variations have to have the same results.
     foreach (entity_test_entity_types() as $entity_type) {
       $this->doTestFormCRUD($entity_type);
@@ -53,7 +53,7 @@ class EntityFormTest extends WebTestBase {
    *
    * @see entity_test_entity_form_display_alter()
    */
-  function testEntityFormDisplayAlter() {
+  public function testEntityFormDisplayAlter() {
     $this->drupalGet('entity_test/add');
     $altered_field = $this->xpath('//input[@name="field_test_text[0][value]" and @size="42"]');
     $this->assertTrue(count($altered_field) === 1, 'The altered field has the correct size value.');
@@ -69,28 +69,28 @@ class EntityFormTest extends WebTestBase {
     $name1 = $this->randomMachineName(8);
     $name2 = $this->randomMachineName(10);
 
-    $edit = array(
+    $edit = [
       'name[0][value]' => $name1,
       'field_test_text[0][value]' => $this->randomMachineName(16),
-    );
+    ];
 
     $this->drupalPostForm($entity_type . '/add', $edit, t('Save'));
     $entity = $this->loadEntityByName($entity_type, $name1);
-    $this->assertTrue($entity, format_string('%entity_type: Entity found in the database.', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity, format_string('%entity_type: Entity found in the database.', ['%entity_type' => $entity_type]));
 
     $edit['name[0][value]'] = $name2;
     $this->drupalPostForm($entity_type . '/manage/' . $entity->id() . '/edit', $edit, t('Save'));
     $entity = $this->loadEntityByName($entity_type, $name1);
-    $this->assertFalse($entity, format_string('%entity_type: The entity has been modified.', array('%entity_type' => $entity_type)));
+    $this->assertFalse($entity, format_string('%entity_type: The entity has been modified.', ['%entity_type' => $entity_type]));
     $entity = $this->loadEntityByName($entity_type, $name2);
-    $this->assertTrue($entity, format_string('%entity_type: Modified entity found in the database.', array('%entity_type' => $entity_type)));
-    $this->assertNotEqual($entity->name->value, $name1, format_string('%entity_type: The entity name has been modified.', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity, format_string('%entity_type: Modified entity found in the database.', ['%entity_type' => $entity_type]));
+    $this->assertNotEqual($entity->name->value, $name1, format_string('%entity_type: The entity name has been modified.', ['%entity_type' => $entity_type]));
 
     $this->drupalGet($entity_type . '/manage/' . $entity->id() . '/edit');
     $this->clickLink(t('Delete'));
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
     $entity = $this->loadEntityByName($entity_type, $name2);
-    $this->assertFalse($entity, format_string('%entity_type: Entity not found in the database.', array('%entity_type' => $entity_type)));
+    $this->assertFalse($entity, format_string('%entity_type: Entity not found in the database.', ['%entity_type' => $entity_type]));
   }
 
   /**
@@ -104,33 +104,33 @@ class EntityFormTest extends WebTestBase {
     $name1_ro = $this->randomMachineName(9);
     $name2_ro = $this->randomMachineName(11);
 
-    $edit = array(
+    $edit = [
       'name[0][value]' => $name1,
       'field_test_text[0][value]' => $this->randomMachineName(16),
-    );
+    ];
 
     $this->drupalPostForm($entity_type_id . '/add', $edit, t('Save'));
     $entity = $this->loadEntityByName($entity_type_id, $name1);
-    $this->assertTrue($entity, format_string('%entity_type: Entity found in the database.', array('%entity_type' => $entity_type_id)));
+    $this->assertTrue($entity, format_string('%entity_type: Entity found in the database.', ['%entity_type' => $entity_type_id]));
 
     // Add a translation to the newly created entity without using the Content
     // translation module.
     $entity->addTranslation('ro', ['name' => $name1_ro])->save();
     $translated_entity = $this->loadEntityByName($entity_type_id, $name1)->getTranslation('ro');
-    $this->assertEqual($translated_entity->name->value, $name1_ro, format_string('%entity_type: The translation has been added.', array('%entity_type' => $entity_type_id)));
+    $this->assertEqual($translated_entity->name->value, $name1_ro, format_string('%entity_type: The translation has been added.', ['%entity_type' => $entity_type_id]));
 
     $edit['name[0][value]'] = $name2_ro;
     $this->drupalPostForm('ro/' . $entity_type_id . '/manage/' . $entity->id() . '/edit', $edit, t('Save'));
     $translated_entity = $this->loadEntityByName($entity_type_id, $name1)->getTranslation('ro');
-    $this->assertTrue($translated_entity, format_string('%entity_type: Modified translation found in the database.', array('%entity_type' => $entity_type_id)));
-    $this->assertEqual($translated_entity->name->value, $name2_ro, format_string('%entity_type: The name of the translation has been modified.', array('%entity_type' => $entity_type_id)));
+    $this->assertTrue($translated_entity, format_string('%entity_type: Modified translation found in the database.', ['%entity_type' => $entity_type_id]));
+    $this->assertEqual($translated_entity->name->value, $name2_ro, format_string('%entity_type: The name of the translation has been modified.', ['%entity_type' => $entity_type_id]));
 
     $this->drupalGet('ro/' . $entity_type_id . '/manage/' . $entity->id() . '/edit');
     $this->clickLink(t('Delete'));
-    $this->drupalPostForm(NULL, array(), t('Delete Romanian translation'));
+    $this->drupalPostForm(NULL, [], t('Delete Romanian translation'));
     $entity = $this->loadEntityByName($entity_type_id, $name1);
-    $this->assertNotNull($entity, format_string('%entity_type: The original entity still exists.', array('%entity_type' => $entity_type_id)));
-    $this->assertFalse($entity->hasTranslation('ro'), format_string('%entity_type: Entity translation does not exist anymore.', array('%entity_type' => $entity_type_id)));
+    $this->assertNotNull($entity, format_string('%entity_type: The original entity still exists.', ['%entity_type' => $entity_type_id]));
+    $this->assertFalse($entity->hasTranslation('ro'), format_string('%entity_type: Entity translation does not exist anymore.', ['%entity_type' => $entity_type_id]));
   }
 
   /**
@@ -141,7 +141,7 @@ class EntityFormTest extends WebTestBase {
     // correctly picked up.
     $entity_storage = $this->container->get('entity.manager')->getStorage($entity_type);
     $entity_storage->resetCache();
-    $entities = $entity_storage->loadByProperties(array('name' => $name));
+    $entities = $entity_storage->loadByProperties(['name' => $name]);
     return $entities ? current($entities) : NULL;
   }
 
diff --git a/web/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php b/web/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php
index d64e0192f..f5134249a 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php
+++ b/web/core/modules/system/src/Tests/Entity/EntityTranslationFormTest.php
@@ -19,7 +19,7 @@ class EntityTranslationFormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('entity_test', 'language', 'node');
+  public static $modules = ['entity_test', 'language', 'node'];
 
   protected $langcodes;
 
@@ -29,12 +29,12 @@ class EntityTranslationFormTest extends WebTestBase {
     \Drupal::state()->set('entity_test.translation', TRUE);
 
     // Create test languages.
-    $this->langcodes = array();
+    $this->langcodes = [];
     for ($i = 0; $i < 2; ++$i) {
-      $language = ConfigurableLanguage::create(array(
+      $language = ConfigurableLanguage::create([
         'id' => 'l' . $i,
         'label' => $this->randomString(),
-      ));
+      ]);
       $this->langcodes[$i] = $language->id();
       $language->save();
     }
@@ -43,14 +43,14 @@ class EntityTranslationFormTest extends WebTestBase {
   /**
    * Tests entity form language.
    */
-  function testEntityFormLanguage() {
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+  public function testEntityFormLanguage() {
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
-    $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content', 'administer content types'));
+    $web_user = $this->drupalCreateUser(['create page content', 'edit own page content', 'administer content types']);
     $this->drupalLogin($web_user);
 
     // Create a node with language LanguageInterface::LANGCODE_NOT_SPECIFIED.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalGet('node/add/page');
@@ -75,21 +75,21 @@ class EntityTranslationFormTest extends WebTestBase {
 
     // Enable language selector.
     $this->drupalGet('admin/structure/types/manage/page');
-    $edit = array('language_configuration[language_alterable]' => TRUE, 'language_configuration[langcode]' => LanguageInterface::LANGCODE_NOT_SPECIFIED);
+    $edit = ['language_configuration[language_alterable]' => TRUE, 'language_configuration[langcode]' => LanguageInterface::LANGCODE_NOT_SPECIFIED];
     $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
-    $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Basic page')), 'Basic page content type has been updated.');
+    $this->assertRaw(t('The content type %type has been updated.', ['%type' => 'Basic page']), 'Basic page content type has been updated.');
 
     // Create a node with language.
-    $edit = array();
+    $edit = [];
     $langcode = $this->langcodes[0];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $edit['langcode[0][value]'] = $langcode;
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
-    $this->assertText(t('Basic page @title has been created.', array('@title' => $edit['title[0][value]'])), 'Basic page created.');
+    $this->assertText(t('Basic page @title has been created.', ['@title' => $edit['title[0][value]']]), 'Basic page created.');
 
     // Verify that the creation message contains a link to a node.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'node/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'node/']);
     $this->assert(isset($view_link), 'The message area contains a link to a node');
 
     // Check to make sure the node was created.
diff --git a/web/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php b/web/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
index 2ec64e8da..5d7dc6fd5 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
+++ b/web/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
@@ -34,7 +34,7 @@ abstract class EntityUnitTestBase extends KernelTestBase {
    *
    * @var array
    */
-  protected $generatedIds = array();
+  protected $generatedIds = [];
 
   /**
    * The state service.
@@ -65,7 +65,7 @@ abstract class EntityUnitTestBase extends KernelTestBase {
         // Only check the modules, if the $modules property was not inherited.
         $rp = new \ReflectionProperty($class, 'modules');
         if ($rp->class == $class) {
-          foreach (array_intersect(array('node', 'comment'), $class::$modules) as $module) {
+          foreach (array_intersect(['node', 'comment'], $class::$modules) as $module) {
             $this->installEntitySchema($module);
           }
           if (in_array('forum', $class::$modules, TRUE)) {
@@ -82,7 +82,7 @@ abstract class EntityUnitTestBase extends KernelTestBase {
       $class = get_parent_class($class);
     }
 
-    $this->installConfig(array('field'));
+    $this->installConfig(['field']);
   }
 
   /**
@@ -96,13 +96,13 @@ abstract class EntityUnitTestBase extends KernelTestBase {
    * @return \Drupal\user\Entity\User
    *   The created user entity.
    */
-  protected function createUser($values = array(), $permissions = array()) {
+  protected function createUser($values = [], $permissions = []) {
     if ($permissions) {
       // Create a new role and apply permissions to it.
-      $role = Role::create(array(
+      $role = Role::create([
         'id' => strtolower($this->randomMachineName(8)),
         'label' => $this->randomMachineName(8),
-      ));
+      ]);
       $role->save();
       user_role_grant_permissions($role->id(), $permissions);
       $values['roles'][] = $role->id();
@@ -128,7 +128,7 @@ abstract class EntityUnitTestBase extends KernelTestBase {
    */
   protected function reloadEntity(EntityInterface $entity) {
     $controller = $this->entityManager->getStorage($entity->getEntityTypeId());
-    $controller->resetCache(array($entity->id()));
+    $controller->resetCache([$entity->id()]);
     return $controller->load($entity->id());
   }
 
@@ -141,7 +141,7 @@ abstract class EntityUnitTestBase extends KernelTestBase {
   protected function getHooksInfo() {
     $key = 'entity_test.hooks';
     $hooks = $this->state->get($key);
-    $this->state->set($key, array());
+    $this->state->set($key, []);
     return $hooks;
   }
 
@@ -152,7 +152,7 @@ abstract class EntityUnitTestBase extends KernelTestBase {
    *   The module to install.
    */
   protected function installModule($module) {
-    $this->enableModules(array($module));
+    $this->enableModules([$module]);
     $this->refreshServices();
   }
 
@@ -163,7 +163,7 @@ abstract class EntityUnitTestBase extends KernelTestBase {
    *   The module to uninstall.
    */
   protected function uninstallModule($module) {
-    $this->disableModules(array($module));
+    $this->disableModules([$module]);
     $this->refreshServices();
   }
 
diff --git a/web/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php b/web/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
index f6da0a2d2..74c110380 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
+++ b/web/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
@@ -53,7 +53,7 @@ abstract class EntityWithUriCacheTagsTestBase extends EntityCacheTagsTestBase {
       }
       $expected_cache_tags = Cache::mergeTags($cache_tag, $view_cache_tag);
       $expected_cache_tags = Cache::mergeTags($expected_cache_tags, $this->getAdditionalCacheTagsForEntity($this->entity));
-      $expected_cache_tags = Cache::mergeTags($expected_cache_tags, array($render_cache_tag));
+      $expected_cache_tags = Cache::mergeTags($expected_cache_tags, [$render_cache_tag]);
       $this->verifyRenderCache($cid, $expected_cache_tags, $redirected_cid);
     }
 
diff --git a/web/core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php b/web/core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
index ceab801e3..ddc52fe52 100644
--- a/web/core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
+++ b/web/core/modules/system/src/Tests/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
@@ -134,7 +134,7 @@ class UpdateApiEntityDefinitionUpdateTest extends WebTestBase {
   /**
    * Tests that entity updates are correctly reported in the status report page.
    */
-  function testStatusReport() {
+  public function testStatusReport() {
     // Create a test entity.
     $entity = EntityTest::create(['name' => $this->randomString(), 'user_id' => mt_rand()]);
     $entity->save();
diff --git a/web/core/modules/system/src/Tests/Form/AlterTest.php b/web/core/modules/system/src/Tests/Form/AlterTest.php
index ae307224c..216e5d201 100644
--- a/web/core/modules/system/src/Tests/Form/AlterTest.php
+++ b/web/core/modules/system/src/Tests/Form/AlterTest.php
@@ -17,22 +17,22 @@ class AlterTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'form_test');
+  public static $modules = ['block', 'form_test'];
 
   /**
    * Tests execution order of hook_form_alter() and hook_form_FORM_ID_alter().
    */
-  function testExecutionOrder() {
+  public function testExecutionOrder() {
     $this->drupalGet('form-test/alter');
     // Ensure that the order is first by module, then for a given module, the
     // id-specific one after the generic one.
-    $expected = array(
+    $expected = [
       'block_form_form_test_alter_form_alter() executed.',
       'form_test_form_alter() executed.',
       'form_test_form_form_test_alter_form_alter() executed.',
       'system_form_form_test_alter_form_alter() executed.',
-    );
-    $content = preg_replace('/\s+/', ' ', Xss::filter($this->content, array()));
+    ];
+    $content = preg_replace('/\s+/', ' ', Xss::filter($this->content, []));
     $this->assert(strpos($content, implode(' ', $expected)) !== FALSE, 'Form alter hooks executed in the expected order.');
   }
 
diff --git a/web/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php b/web/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
index 3702d35eb..d6e99705e 100644
--- a/web/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
+++ b/web/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
@@ -18,19 +18,19 @@ class ArbitraryRebuildTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('text', 'form_test');
+  public static $modules = ['text', 'form_test'];
 
   protected function setUp() {
     parent::setUp();
 
     // Auto-create a field for testing.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => 'user',
       'field_name' => 'test_multiple',
       'type' => 'text',
       'cardinality' => -1,
       'translatable' => FALSE,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'user',
       'field_name' => 'test_multiple',
@@ -38,21 +38,21 @@ class ArbitraryRebuildTest extends WebTestBase {
       'label' => 'Test a multiple valued field',
     ])->save();
     entity_get_form_display('user', 'user', 'register')
-      ->setComponent('test_multiple', array(
+      ->setComponent('test_multiple', [
         'type' => 'text_textfield',
         'weight' => 0,
-      ))
+      ])
       ->save();
   }
 
   /**
    * Tests a basic rebuild with the user registration form.
    */
-  function testUserRegistrationRebuild() {
-    $edit = array(
+  public function testUserRegistrationRebuild() {
+    $edit = [
       'name' => 'foo',
       'mail' => 'bar@example.com',
-    );
+    ];
     $this->drupalPostForm('user/register', $edit, 'Rebuild');
     $this->assertText('Form rebuilt.');
     $this->assertFieldByName('name', 'foo', 'Entered username has been kept.');
@@ -62,11 +62,11 @@ class ArbitraryRebuildTest extends WebTestBase {
   /**
    * Tests a rebuild caused by a multiple value field.
    */
-  function testUserRegistrationMultipleField() {
-    $edit = array(
+  public function testUserRegistrationMultipleField() {
+    $edit = [
       'name' => 'foo',
       'mail' => 'bar@example.com',
-    );
+    ];
     $this->drupalPostForm('user/register', $edit, t('Add another item'));
     $this->assertText('Test a multiple valued field', 'Form has been rebuilt.');
     $this->assertFieldByName('name', 'foo', 'Entered username has been kept.');
diff --git a/web/core/modules/system/src/Tests/Form/CheckboxTest.php b/web/core/modules/system/src/Tests/Form/CheckboxTest.php
index ebeeeeae1..61e7bd9ba 100644
--- a/web/core/modules/system/src/Tests/Form/CheckboxTest.php
+++ b/web/core/modules/system/src/Tests/Form/CheckboxTest.php
@@ -17,16 +17,16 @@ class CheckboxTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
-  function testFormCheckbox() {
+  public function testFormCheckbox() {
     // Ensure that the checked state is determined and rendered correctly for
     // tricky combinations of default and return values.
-    foreach (array(FALSE, NULL, TRUE, 0, '0', '', 1, '1', 'foobar', '1foobar') as $default_value) {
+    foreach ([FALSE, NULL, TRUE, 0, '0', '', 1, '1', 'foobar', '1foobar'] as $default_value) {
       // Only values that can be used for array indices are supported for
       // #return_value, with the exception of integer 0, which is not supported.
       // @see \Drupal\Core\Render\Element\Checkbox::processCheckbox().
-      foreach (array('0', '', 1, '1', 'foobar', '1foobar') as $return_value) {
+      foreach (['0', '', 1, '1', 'foobar', '1foobar'] as $return_value) {
         $form_array = \Drupal::formBuilder()->getForm('\Drupal\form_test\Form\FormTestCheckboxTypeJugglingForm', $default_value, $return_value);
         $form = \Drupal::service('renderer')->renderRoot($form_array);
         if ($default_value === TRUE) {
@@ -48,33 +48,33 @@ class CheckboxTest extends WebTestBase {
           $checked = ($default_value === '1foobar');
         }
         $checked_in_html = strpos($form, 'checked') !== FALSE;
-        $message = format_string('#default_value is %default_value #return_value is %return_value.', array('%default_value' => var_export($default_value, TRUE), '%return_value' => var_export($return_value, TRUE)));
+        $message = format_string('#default_value is %default_value #return_value is %return_value.', ['%default_value' => var_export($default_value, TRUE), '%return_value' => var_export($return_value, TRUE)]);
         $this->assertIdentical($checked, $checked_in_html, $message);
       }
     }
 
     // Ensure that $form_state->getValues() is populated correctly for a
     // checkboxes group that includes a 0-indexed array of options.
-    $results = json_decode($this->drupalPostForm('form-test/checkboxes-zero/1', array(), 'Save'));
-    $this->assertIdentical($results->checkbox_off, array(0, 0, 0), 'All three in checkbox_off are zeroes: off.');
-    $this->assertIdentical($results->checkbox_zero_default, array('0', 0, 0), 'The first choice is on in checkbox_zero_default');
-    $this->assertIdentical($results->checkbox_string_zero_default, array('0', 0, 0), 'The first choice is on in checkbox_string_zero_default');
-    $edit = array('checkbox_off[0]' => '0');
+    $results = json_decode($this->drupalPostForm('form-test/checkboxes-zero/1', [], 'Save'));
+    $this->assertIdentical($results->checkbox_off, [0, 0, 0], 'All three in checkbox_off are zeroes: off.');
+    $this->assertIdentical($results->checkbox_zero_default, ['0', 0, 0], 'The first choice is on in checkbox_zero_default');
+    $this->assertIdentical($results->checkbox_string_zero_default, ['0', 0, 0], 'The first choice is on in checkbox_string_zero_default');
+    $edit = ['checkbox_off[0]' => '0'];
     $results = json_decode($this->drupalPostForm('form-test/checkboxes-zero/1', $edit, 'Save'));
-    $this->assertIdentical($results->checkbox_off, array('0', 0, 0), 'The first choice is on in checkbox_off but the rest is not');
+    $this->assertIdentical($results->checkbox_off, ['0', 0, 0], 'The first choice is on in checkbox_off but the rest is not');
 
     // Ensure that each checkbox is rendered correctly for a checkboxes group
     // that includes a 0-indexed array of options.
-    $this->drupalPostForm('form-test/checkboxes-zero/0', array(), 'Save');
+    $this->drupalPostForm('form-test/checkboxes-zero/0', [], 'Save');
     $checkboxes = $this->xpath('//input[@type="checkbox"]');
 
     $this->assertIdentical(count($checkboxes), 9, 'Correct number of checkboxes found.');
     foreach ($checkboxes as $checkbox) {
       $checked = isset($checkbox['checked']);
       $name = (string) $checkbox['name'];
-      $this->assertIdentical($checked, $name == 'checkbox_zero_default[0]' || $name == 'checkbox_string_zero_default[0]', format_string('Checkbox %name correctly checked', array('%name' => $name)));
+      $this->assertIdentical($checked, $name == 'checkbox_zero_default[0]' || $name == 'checkbox_string_zero_default[0]', format_string('Checkbox %name correctly checked', ['%name' => $name]));
     }
-    $edit = array('checkbox_off[0]' => '0');
+    $edit = ['checkbox_off[0]' => '0'];
     $this->drupalPostForm('form-test/checkboxes-zero/0', $edit, 'Save');
     $checkboxes = $this->xpath('//input[@type="checkbox"]');
 
@@ -82,7 +82,7 @@ class CheckboxTest extends WebTestBase {
     foreach ($checkboxes as $checkbox) {
       $checked = isset($checkbox['checked']);
       $name = (string) $checkbox['name'];
-      $this->assertIdentical($checked, $name == 'checkbox_off[0]' || $name == 'checkbox_zero_default[0]' || $name == 'checkbox_string_zero_default[0]', format_string('Checkbox %name correctly checked', array('%name' => $name)));
+      $this->assertIdentical($checked, $name == 'checkbox_off[0]' || $name == 'checkbox_zero_default[0]' || $name == 'checkbox_string_zero_default[0]', format_string('Checkbox %name correctly checked', ['%name' => $name]));
     }
   }
 
diff --git a/web/core/modules/system/src/Tests/Form/ConfirmFormTest.php b/web/core/modules/system/src/Tests/Form/ConfirmFormTest.php
index 312aa2ef7..31ede02a7 100644
--- a/web/core/modules/system/src/Tests/Form/ConfirmFormTest.php
+++ b/web/core/modules/system/src/Tests/Form/ConfirmFormTest.php
@@ -18,33 +18,33 @@ class ConfirmFormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
-  function testConfirmForm() {
+  public function testConfirmForm() {
     // Test the building of the form.
     $this->drupalGet('form-test/confirm-form');
     $site_name = $this->config('system.site')->get('name');
-    $this->assertTitle(t('ConfirmFormTestForm::getQuestion(). | @site-name', array('@site-name' => $site_name)), 'The question was found as the page title.');
+    $this->assertTitle(t('ConfirmFormTestForm::getQuestion(). | @site-name', ['@site-name' => $site_name]), 'The question was found as the page title.');
     $this->assertText(t('ConfirmFormTestForm::getDescription().'), 'The description was used.');
     $this->assertFieldByXPath('//input[@id="edit-submit"]', t('ConfirmFormTestForm::getConfirmText().'), 'The confirm text was used.');
 
     // Test cancelling the form.
     $this->clickLink(t('ConfirmFormTestForm::getCancelText().'));
-    $this->assertUrl('form-test/autocomplete', array(), "The form's cancel link was followed.");
+    $this->assertUrl('form-test/autocomplete', [], "The form's cancel link was followed.");
 
     // Test submitting the form.
     $this->drupalPostForm('form-test/confirm-form', NULL, t('ConfirmFormTestForm::getConfirmText().'));
     $this->assertText('The ConfirmFormTestForm::submitForm() method was used for this form.');
-    $this->assertUrl('', array(), "The form's redirect was followed.");
+    $this->assertUrl('', [], "The form's redirect was followed.");
 
     // Test submitting the form with a destination.
-    $this->drupalPostForm('form-test/confirm-form', NULL, t('ConfirmFormTestForm::getConfirmText().'), array('query' => array('destination' => 'admin/config')));
-    $this->assertUrl('admin/config', array(), "The form's redirect was not followed, the destination query string was followed.");
+    $this->drupalPostForm('form-test/confirm-form', NULL, t('ConfirmFormTestForm::getConfirmText().'), ['query' => ['destination' => 'admin/config']]);
+    $this->assertUrl('admin/config', [], "The form's redirect was not followed, the destination query string was followed.");
 
     // Test cancelling the form with a complex destination.
     $this->drupalGet('form-test/confirm-form-array-path');
     $this->clickLink(t('ConfirmFormArrayPathTestForm::getCancelText().'));
-    $this->assertUrl('form-test/confirm-form', array('query' => array('destination' => 'admin/config')), "The form's complex cancel link was followed.");
+    $this->assertUrl('form-test/confirm-form', ['query' => ['destination' => 'admin/config']], "The form's complex cancel link was followed.");
   }
 
   /**
@@ -53,14 +53,14 @@ class ConfirmFormTest extends WebTestBase {
   public function testConfirmFormWithExternalDestination() {
     $this->drupalGet('form-test/confirm-form');
     $this->assertCancelLinkUrl(Url::fromRoute('form_test.route8'));
-    $this->drupalGet('form-test/confirm-form', array('query' => array('destination' => 'node')));
+    $this->drupalGet('form-test/confirm-form', ['query' => ['destination' => 'node']]);
     $this->assertCancelLinkUrl(Url::fromUri('internal:/node'));
-    $this->drupalGet('form-test/confirm-form', array('query' => array('destination' => 'http://example.com')));
+    $this->drupalGet('form-test/confirm-form', ['query' => ['destination' => 'http://example.com']]);
     $this->assertCancelLinkUrl(Url::fromRoute('form_test.route8'));
-    $this->drupalGet('form-test/confirm-form', array('query' => array('destination' => '<front>')));
+    $this->drupalGet('form-test/confirm-form', ['query' => ['destination' => '<front>']]);
     $this->assertCancelLinkUrl(Url::fromRoute('<front>'));
     // Other invalid destinations, should fall back to the form default.
-    $this->drupalGet('form-test/confirm-form', array('query' => array('destination' => '/http://example.com')));
+    $this->drupalGet('form-test/confirm-form', ['query' => ['destination' => '/http://example.com']]);
     $this->assertCancelLinkUrl(Url::fromRoute('form_test.route8'));
   }
 
diff --git a/web/core/modules/system/src/Tests/Form/ElementTest.php b/web/core/modules/system/src/Tests/Form/ElementTest.php
index 0ae2edc49..0e1c3ce0c 100644
--- a/web/core/modules/system/src/Tests/Form/ElementTest.php
+++ b/web/core/modules/system/src/Tests/Form/ElementTest.php
@@ -16,41 +16,41 @@ class ElementTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * Tests placeholder text for elements that support placeholders.
    */
-  function testPlaceHolderText() {
+  public function testPlaceHolderText() {
     $this->drupalGet('form-test/placeholder-text');
     $expected = 'placeholder-text';
     // Test to make sure non-textarea elements have the proper placeholder text.
-    foreach (array('textfield', 'tel', 'url', 'password', 'email', 'number') as $type) {
-      $element = $this->xpath('//input[@id=:id and @placeholder=:expected]', array(
+    foreach (['textfield', 'tel', 'url', 'password', 'email', 'number'] as $type) {
+      $element = $this->xpath('//input[@id=:id and @placeholder=:expected]', [
         ':id' => 'edit-' . $type,
         ':expected' => $expected,
-      ));
-      $this->assertTrue(!empty($element), format_string('Placeholder text placed in @type.', array('@type' => $type)));
+      ]);
+      $this->assertTrue(!empty($element), format_string('Placeholder text placed in @type.', ['@type' => $type]));
     }
 
     // Test to make sure textarea has the proper placeholder text.
-    $element = $this->xpath('//textarea[@id=:id and @placeholder=:expected]', array(
+    $element = $this->xpath('//textarea[@id=:id and @placeholder=:expected]', [
       ':id' => 'edit-textarea',
       ':expected' => $expected,
-    ));
+    ]);
     $this->assertTrue(!empty($element), 'Placeholder text placed in textarea.');
   }
 
   /**
    * Tests expansion of #options for #type checkboxes and radios.
    */
-  function testOptions() {
+  public function testOptions() {
     $this->drupalGet('form-test/checkboxes-radios');
 
     // Verify that all options appear in their defined order.
-    foreach (array('checkbox', 'radio') as $type) {
-      $elements = $this->xpath('//input[@type=:type]', array(':type' => $type));
-      $expected_values = array('0', 'foo', '1', 'bar', '>');
+    foreach (['checkbox', 'radio'] as $type) {
+      $elements = $this->xpath('//input[@type=:type]', [':type' => $type]);
+      $expected_values = ['0', 'foo', '1', 'bar', '>'];
       foreach ($elements as $element) {
         $expected = array_shift($expected_values);
         $this->assertIdentical((string) $element['value'], $expected);
@@ -68,45 +68,45 @@ class ElementTest extends WebTestBase {
 
     // Verify that all options appear in their defined order, taking a custom
     // #weight into account.
-    foreach (array('checkbox', 'radio') as $type) {
-      $elements = $this->xpath('//input[@type=:type]', array(':type' => $type));
-      $expected_values = array('0', 'foo', 'bar', '>', '1');
+    foreach (['checkbox', 'radio'] as $type) {
+      $elements = $this->xpath('//input[@type=:type]', [':type' => $type]);
+      $expected_values = ['0', 'foo', 'bar', '>', '1'];
       foreach ($elements as $element) {
         $expected = array_shift($expected_values);
         $this->assertIdentical((string) $element['value'], $expected);
       }
     }
     // Verify that custom #description properties are output.
-    foreach (array('checkboxes', 'radios') as $type) {
-      $elements = $this->xpath('//input[@id=:id]/following-sibling::div[@class=:class]', array(
+    foreach (['checkboxes', 'radios'] as $type) {
+      $elements = $this->xpath('//input[@id=:id]/following-sibling::div[@class=:class]', [
         ':id' => 'edit-' . $type . '-foo',
         ':class' => 'description',
-      ));
-      $this->assertTrue(count($elements), format_string('Custom %type option description found.', array(
+      ]);
+      $this->assertTrue(count($elements), format_string('Custom %type option description found.', [
         '%type' => $type,
-      )));
+      ]));
     }
   }
 
   /**
    * Tests wrapper ids for checkboxes and radios.
    */
-  function testWrapperIds() {
+  public function testWrapperIds() {
     $this->drupalGet('form-test/checkboxes-radios');
 
     // Verify that wrapper id is different from element id.
-    foreach (array('checkboxes', 'radios') as $type) {
-      $element_ids = $this->xpath('//div[@id=:id]', array(':id' => 'edit-' . $type));
-      $wrapper_ids = $this->xpath('//fieldset[@id=:id]', array(':id' => 'edit-' . $type . '--wrapper'));
-      $this->assertTrue(count($element_ids) == 1, format_string('A single element id found for type %type', array('%type' => $type)));
-      $this->assertTrue(count($wrapper_ids) == 1, format_string('A single wrapper id found for type %type', array('%type' => $type)));
+    foreach (['checkboxes', 'radios'] as $type) {
+      $element_ids = $this->xpath('//div[@id=:id]', [':id' => 'edit-' . $type]);
+      $wrapper_ids = $this->xpath('//fieldset[@id=:id]', [':id' => 'edit-' . $type . '--wrapper']);
+      $this->assertTrue(count($element_ids) == 1, format_string('A single element id found for type %type', ['%type' => $type]));
+      $this->assertTrue(count($wrapper_ids) == 1, format_string('A single wrapper id found for type %type', ['%type' => $type]));
     }
   }
 
   /**
    * Tests button classes.
    */
-  function testButtonClasses() {
+  public function testButtonClasses() {
     $this->drupalGet('form-test/button-class');
     // Just contains(@class, "button") won't do because then
     // "button--foo" would contain "button". Instead, check
@@ -120,7 +120,7 @@ class ElementTest extends WebTestBase {
   /**
    * Tests the #group property.
    */
-  function testGroupElements() {
+  public function testGroupElements() {
     $this->drupalGet('form-test/group-details');
     $elements = $this->xpath('//div[@class="details-wrapper"]//div[@class="details-wrapper"]//label');
     $this->assertTrue(count($elements) == 1);
@@ -162,7 +162,7 @@ class ElementTest extends WebTestBase {
     $result = $this->xpath('//input[@id="edit-autocomplete-2" and contains(@data-autocomplete-path, "form-test/autocomplete-2/value")]');
     $this->assertEqual(count($result), 0, 'Ensure that the user does not have access to the autocompletion');
 
-    $user = $this->drupalCreateUser(array('access autocomplete test'));
+    $user = $this->drupalCreateUser(['access autocomplete test']);
     $this->drupalLogin($user);
     $this->drupalGet('form-test/autocomplete');
 
diff --git a/web/core/modules/system/src/Tests/Form/ElementsLabelsTest.php b/web/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
index 5965dc255..2a57e5d70 100644
--- a/web/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
+++ b/web/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
@@ -16,13 +16,13 @@ class ElementsLabelsTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * Test form elements, labels, title attributes and required marks output
    * correctly and have the correct label option class if needed.
    */
-  function testFormLabels() {
+  public function testFormLabels() {
     $this->drupalGet('form_test/form-labels');
 
     // Check that the checkbox/radio processing is not interfering with
@@ -99,7 +99,7 @@ class ElementsLabelsTest extends WebTestBase {
   /**
    * Tests different display options for form element descriptions.
    */
-  function testFormDescriptions() {
+  public function testFormDescriptions() {
     $this->drupalGet('form_test/form-descriptions');
 
     // Check #description placement with #description_display='after'.
@@ -126,7 +126,7 @@ class ElementsLabelsTest extends WebTestBase {
   /**
    * Test forms in theme-less environments.
    */
-  function testFormsInThemeLessEnvironments() {
+  public function testFormsInThemeLessEnvironments() {
     $form = $this->getFormWithLimitedProperties();
     $render_service = $this->container->get('renderer');
     // This should not throw any notices.
@@ -137,12 +137,12 @@ class ElementsLabelsTest extends WebTestBase {
    * Return a form with element with not all properties defined.
    */
   protected function getFormWithLimitedProperties() {
-    $form = array();
+    $form = [];
 
-    $form['fieldset'] = array(
+    $form['fieldset'] = [
       '#type' => 'fieldset',
       '#title' => 'Fieldset',
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php b/web/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
index 34a558cb0..208f85911 100644
--- a/web/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
+++ b/web/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
@@ -17,12 +17,12 @@ class ElementsTableSelectTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * Test the display of checkboxes when #multiple is TRUE.
    */
-  function testMultipleTrue() {
+  public function testMultipleTrue() {
 
     $this->drupalGet('form_test/tableselect/multiple-true');
 
@@ -31,37 +31,37 @@ class ElementsTableSelectTest extends WebTestBase {
     // Test for the presence of the Select all rows tableheader.
     $this->assertFieldByXPath('//th[@class="select-all"]', NULL, 'Presence of the "Select all" checkbox.');
 
-    $rows = array('row1', 'row2', 'row3');
+    $rows = ['row1', 'row2', 'row3'];
     foreach ($rows as $row) {
-      $this->assertFieldByXPath('//input[@type="checkbox"]', $row, format_string('Checkbox for value @row.', array('@row' => $row)));
+      $this->assertFieldByXPath('//input[@type="checkbox"]', $row, format_string('Checkbox for value @row.', ['@row' => $row]));
     }
   }
 
   /**
    * Test the presence of ajax functionality for all options.
    */
-  function testAjax() {
-    $rows = array('row1', 'row2', 'row3');
+  public function testAjax() {
+    $rows = ['row1', 'row2', 'row3'];
     // Test checkboxes (#multiple == TRUE).
     foreach ($rows as $row) {
       $element = 'tableselect[' . $row . ']';
-      $edit = array($element => TRUE);
+      $edit = [$element => TRUE];
       $result = $this->drupalPostAjaxForm('form_test/tableselect/multiple-true', $edit, $element);
-      $this->assertFalse(empty($result), t('Ajax triggers on checkbox for @row.', array('@row' => $row)));
+      $this->assertFalse(empty($result), t('Ajax triggers on checkbox for @row.', ['@row' => $row]));
     }
     // Test radios (#multiple == FALSE).
     $element = 'tableselect';
     foreach ($rows as $row) {
-      $edit = array($element => $row);
+      $edit = [$element => $row];
       $result = $this->drupalPostAjaxForm('form_test/tableselect/multiple-false', $edit, $element);
-      $this->assertFalse(empty($result), t('Ajax triggers on radio for @row.', array('@row' => $row)));
+      $this->assertFalse(empty($result), t('Ajax triggers on radio for @row.', ['@row' => $row]));
     }
   }
 
   /**
    * Test the display of radios when #multiple is FALSE.
    */
-  function testMultipleFalse() {
+  public function testMultipleFalse() {
     $this->drupalGet('form_test/tableselect/multiple-false');
 
     $this->assertNoText(t('Empty text.'), 'Empty text should not be displayed.');
@@ -69,16 +69,16 @@ class ElementsTableSelectTest extends WebTestBase {
     // Test for the absence of the Select all rows tableheader.
     $this->assertNoFieldByXPath('//th[@class="select-all"]', '', 'Absence of the "Select all" checkbox.');
 
-    $rows = array('row1', 'row2', 'row3');
+    $rows = ['row1', 'row2', 'row3'];
     foreach ($rows as $row) {
-      $this->assertFieldByXPath('//input[@type="radio"]', $row, format_string('Radio button for value @row.', array('@row' => $row)));
+      $this->assertFieldByXPath('//input[@type="radio"]', $row, format_string('Radio button for value @row.', ['@row' => $row]));
     }
   }
 
   /**
    * Tests the display when #colspan is set.
    */
-  function testTableselectColSpan() {
+  public function testTableselectColSpan() {
     $this->drupalGet('form_test/tableselect/colspan');
 
     $this->assertText(t('Three'), 'Presence of the third column');
@@ -93,7 +93,7 @@ class ElementsTableSelectTest extends WebTestBase {
     // radio, one cell in the first column, one cell in the second column,
     // and two cells in the third column which has colspan 2.
     for ( $i = 0; $i <= 1; $i++) {
-      $this->assertEqual(count($table_body[0]->tr[$i]->td), 5, format_string('There are five cells in row @row.', array('@row' => $i)));
+      $this->assertEqual(count($table_body[0]->tr[$i]->td), 5, format_string('There are five cells in row @row.', ['@row' => $i]));
     }
     // The third row should have 3 cells, one for the radio, one spanning the
     // first and second column, and a third in column 3 (which has colspan 3).
@@ -103,7 +103,7 @@ class ElementsTableSelectTest extends WebTestBase {
   /**
    * Test the display of the #empty text when #options is an empty array.
    */
-  function testEmptyText() {
+  public function testEmptyText() {
     $this->drupalGet('form_test/tableselect/empty-text');
     $this->assertText(t('Empty text.'), 'Empty text should be displayed.');
   }
@@ -111,10 +111,10 @@ class ElementsTableSelectTest extends WebTestBase {
   /**
    * Test the submission of single and multiple values when #multiple is TRUE.
    */
-  function testMultipleTrueSubmit() {
+  public function testMultipleTrueSubmit() {
 
     // Test a submission with one checkbox checked.
-    $edit = array();
+    $edit = [];
     $edit['tableselect[row1]'] = TRUE;
     $this->drupalPostForm('form_test/tableselect/multiple-true', $edit, 'Submit');
 
@@ -136,7 +136,7 @@ class ElementsTableSelectTest extends WebTestBase {
   /**
    * Test submission of values when #multiple is FALSE.
    */
-  function testMultipleFalseSubmit() {
+  public function testMultipleFalseSubmit() {
     $edit['tableselect'] = 'row1';
     $this->drupalPostForm('form_test/tableselect/multiple-false', $edit, 'Submit');
     $this->assertText(t('Submitted: row1'), 'Selected radio button');
@@ -145,7 +145,7 @@ class ElementsTableSelectTest extends WebTestBase {
   /**
    * Test the #js_select property.
    */
-  function testAdvancedSelect() {
+  public function testAdvancedSelect() {
     // When #multiple = TRUE a Select all checkbox should be displayed by default.
     $this->drupalGet('form_test/tableselect/advanced-select/multiple-true-default');
     $this->assertFieldByXPath('//th[@class="select-all"]', NULL, 'Display a "Select all" checkbox by default when #multiple is TRUE.');
@@ -166,22 +166,22 @@ class ElementsTableSelectTest extends WebTestBase {
   /**
    * Test the whether the option checker gives an error on invalid tableselect values for checkboxes.
    */
-  function testMultipleTrueOptionchecker() {
+  public function testMultipleTrueOptionchecker() {
 
     list($header, $options) = _form_test_tableselect_get_data();
 
-    $form['tableselect'] = array(
+    $form['tableselect'] = [
       '#type' => 'tableselect',
       '#header' => $header,
       '#options' => $options,
-    );
+    ];
 
     // Test with a valid value.
-    list(, , $errors) = $this->formSubmitHelper($form, array('tableselect' => array('row1' => 'row1')));
+    list(, , $errors) = $this->formSubmitHelper($form, ['tableselect' => ['row1' => 'row1']]);
     $this->assertFalse(isset($errors['tableselect']), 'Option checker allows valid values for checkboxes.');
 
     // Test with an invalid value.
-    list(, , $errors) = $this->formSubmitHelper($form, array('tableselect' => array('non_existing_value' => 'non_existing_value')));
+    list(, , $errors) = $this->formSubmitHelper($form, ['tableselect' => ['non_existing_value' => 'non_existing_value']]);
     $this->assertTrue(isset($errors['tableselect']), 'Option checker disallows invalid values for checkboxes.');
 
   }
@@ -190,23 +190,23 @@ class ElementsTableSelectTest extends WebTestBase {
   /**
    * Test the whether the option checker gives an error on invalid tableselect values for radios.
    */
-  function testMultipleFalseOptionchecker() {
+  public function testMultipleFalseOptionchecker() {
 
     list($header, $options) = _form_test_tableselect_get_data();
 
-    $form['tableselect'] = array(
+    $form['tableselect'] = [
       '#type' => 'tableselect',
       '#header' => $header,
       '#options' => $options,
       '#multiple' => FALSE,
-    );
+    ];
 
     // Test with a valid value.
-    list(, , $errors) = $this->formSubmitHelper($form, array('tableselect' => 'row1'));
+    list(, , $errors) = $this->formSubmitHelper($form, ['tableselect' => 'row1']);
     $this->assertFalse(isset($errors['tableselect']), 'Option checker allows valid values for radio buttons.');
 
     // Test with an invalid value.
-    list(, , $errors) = $this->formSubmitHelper($form, array('tableselect' => 'non_existing_value'));
+    list(, , $errors) = $this->formSubmitHelper($form, ['tableselect' => 'non_existing_value']);
     $this->assertTrue(isset($errors['tableselect']), 'Option checker disallows invalid values for radio buttons.');
   }
 
@@ -226,7 +226,7 @@ class ElementsTableSelectTest extends WebTestBase {
     $form_id = $this->randomMachineName();
     $form_state = new FormState();
 
-    $form['op'] = array('#type' => 'submit', '#value' => t('Submit'));
+    $form['op'] = ['#type' => 'submit', '#value' => t('Submit')];
     // The form token CSRF protection should not interfere with this test, so we
     // bypass it by setting the token to FALSE.
     $form['#token'] = FALSE;
@@ -252,7 +252,7 @@ class ElementsTableSelectTest extends WebTestBase {
 
     // Return the processed form together with form_state and errors
     // to allow the caller lowlevel access to the form.
-    return array($form, $form_state, $errors);
+    return [$form, $form_state, $errors];
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php b/web/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
index 2e630ccca..3ef90e13a 100644
--- a/web/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
+++ b/web/core/modules/system/src/Tests/Form/ElementsVerticalTabsTest.php
@@ -18,7 +18,7 @@ class ElementsVerticalTabsTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * A user with permission to access vertical_tab_test_tabs.
@@ -37,7 +37,7 @@ class ElementsVerticalTabsTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('access vertical_tab_test tabs'));
+    $this->adminUser = $this->drupalCreateUser(['access vertical_tab_test tabs']);
     $this->webUser = $this->drupalCreateUser();
     $this->drupalLogin($this->adminUser);
   }
@@ -47,7 +47,7 @@ class ElementsVerticalTabsTest extends WebTestBase {
    *
    * Otherwise, collapse.js adds "SHOW" or "HIDE" labels to the tabs.
    */
-  function testJavaScriptOrdering() {
+  public function testJavaScriptOrdering() {
     $this->drupalGet('form_test/vertical-tabs');
     $position1 = strpos($this->content, 'core/misc/vertical-tabs.js');
     $position2 = strpos($this->content, 'core/misc/collapse.js');
@@ -57,7 +57,7 @@ class ElementsVerticalTabsTest extends WebTestBase {
   /**
    * Ensures that vertical tab markup is not shown if user has no tab access.
    */
-  function testWrapperNotShownWhenEmpty() {
+  public function testWrapperNotShownWhenEmpty() {
     // Test admin user can see vertical tabs and wrapper.
     $this->drupalGet('form_test/vertical-tabs');
     $wrapper = $this->xpath("//div[@data-vertical-tabs-panes]");
@@ -73,7 +73,7 @@ class ElementsVerticalTabsTest extends WebTestBase {
   /**
    * Ensures that default vertical tab is correctly selected.
    */
-  function testDefaultTab() {
+  public function testDefaultTab() {
     $this->drupalGet('form_test/vertical-tabs');
     $this->assertFieldByName('vertical_tabs__active_tab', 'edit-tab3', t('The default vertical tab is correctly selected.'));
   }
@@ -81,7 +81,7 @@ class ElementsVerticalTabsTest extends WebTestBase {
   /**
    * Ensures that vertical tab form values are cleaned.
    */
-  function testDefaultTabCleaned() {
+  public function testDefaultTabCleaned() {
     $values = Json::decode($this->drupalPostForm('form_test/form-state-values-clean', [], t('Submit')));
     $this->assertFalse(isset($values['vertical_tabs__active_tab']), SafeMarkup::format('%element was removed.', ['%element' => 'vertical_tabs__active_tab']));
   }
diff --git a/web/core/modules/system/src/Tests/Form/EmailTest.php b/web/core/modules/system/src/Tests/Form/EmailTest.php
index e53247f3c..a9d445d63 100644
--- a/web/core/modules/system/src/Tests/Form/EmailTest.php
+++ b/web/core/modules/system/src/Tests/Form/EmailTest.php
@@ -17,28 +17,28 @@ class EmailTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   protected $profile = 'testing';
 
   /**
    * Tests that #type 'email' fields are properly validated.
    */
-  function testFormEmail() {
-    $edit = array();
+  public function testFormEmail() {
+    $edit = [];
     $edit['email'] = 'invalid';
     $edit['email_required'] = ' ';
     $this->drupalPostForm('form-test/email', $edit, 'Submit');
-    $this->assertRaw(t('The email address %mail is not valid.', array('%mail' => 'invalid')));
-    $this->assertRaw(t('@name field is required.', array('@name' => 'Address')));
+    $this->assertRaw(t('The email address %mail is not valid.', ['%mail' => 'invalid']));
+    $this->assertRaw(t('@name field is required.', ['@name' => 'Address']));
 
-    $edit = array();
+    $edit = [];
     $edit['email_required'] = '  foo.bar@example.com ';
     $values = Json::decode($this->drupalPostForm('form-test/email', $edit, 'Submit'));
     $this->assertIdentical($values['email'], '');
     $this->assertEqual($values['email_required'], 'foo.bar@example.com');
 
-    $edit = array();
+    $edit = [];
     $edit['email'] = 'foo@example.com';
     $edit['email_required'] = 'example@drupal.org';
     $values = Json::decode($this->drupalPostForm('form-test/email', $edit, 'Submit'));
diff --git a/web/core/modules/system/src/Tests/Form/FormStoragePageCacheTest.php b/web/core/modules/system/src/Tests/Form/FormStoragePageCacheTest.php
index 0ef62e865..b6c668658 100644
--- a/web/core/modules/system/src/Tests/Form/FormStoragePageCacheTest.php
+++ b/web/core/modules/system/src/Tests/Form/FormStoragePageCacheTest.php
@@ -14,7 +14,7 @@ class FormStoragePageCacheTest extends WebTestBase {
   /**
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/system/src/Tests/Form/FormTest.php b/web/core/modules/system/src/Tests/Form/FormTest.php
index cf738369b..4b8d042fa 100644
--- a/web/core/modules/system/src/Tests/Form/FormTest.php
+++ b/web/core/modules/system/src/Tests/Form/FormTest.php
@@ -25,19 +25,19 @@ class FormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'form_test', 'file', 'datetime');
+  public static $modules = ['filter', 'form_test', 'file', 'datetime'];
 
   protected function setUp() {
     parent::setUp();
 
-    $filtered_html_format = FilterFormat::create(array(
+    $filtered_html_format = FilterFormat::create([
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
-    ));
+    ]);
     $filtered_html_format->save();
 
     $filtered_html_permission = $filtered_html_format->getPermissionName();
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array($filtered_html_permission));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [$filtered_html_permission]);
   }
 
   /**
@@ -48,50 +48,50 @@ class FormTest extends WebTestBase {
    *
    * If the form field is found in $form_state->getErrors() then the test pass.
    */
-  function testRequiredFields() {
+  public function testRequiredFields() {
     // Originates from https://www.drupal.org/node/117748.
     // Sets of empty strings and arrays.
-    $empty_strings = array('""' => "", '"\n"' => "\n", '" "' => " ", '"\t"' => "\t", '" \n\t "' => " \n\t ", '"\n\n\n\n\n"' => "\n\n\n\n\n");
-    $empty_arrays = array('array()' => array());
-    $empty_checkbox = array(NULL);
+    $empty_strings = ['""' => "", '"\n"' => "\n", '" "' => " ", '"\t"' => "\t", '" \n\t "' => " \n\t ", '"\n\n\n\n\n"' => "\n\n\n\n\n"];
+    $empty_arrays = ['array()' => []];
+    $empty_checkbox = [NULL];
 
-    $elements['textfield']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'textfield');
+    $elements['textfield']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'textfield'];
     $elements['textfield']['empty_values'] = $empty_strings;
 
-    $elements['telephone']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'tel');
+    $elements['telephone']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'tel'];
     $elements['telephone']['empty_values'] = $empty_strings;
 
-    $elements['url']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'url');
+    $elements['url']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'url'];
     $elements['url']['empty_values'] = $empty_strings;
 
-    $elements['search']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'search');
+    $elements['search']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'search'];
     $elements['search']['empty_values'] = $empty_strings;
 
-    $elements['password']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'password');
+    $elements['password']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'password'];
     $elements['password']['empty_values'] = $empty_strings;
 
-    $elements['password_confirm']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'password_confirm');
+    $elements['password_confirm']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'password_confirm'];
     // Provide empty values for both password fields.
     foreach ($empty_strings as $key => $value) {
-      $elements['password_confirm']['empty_values'][$key] = array('pass1' => $value, 'pass2' => $value);
+      $elements['password_confirm']['empty_values'][$key] = ['pass1' => $value, 'pass2' => $value];
     }
 
-    $elements['textarea']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'textarea');
+    $elements['textarea']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'textarea'];
     $elements['textarea']['empty_values'] = $empty_strings;
 
-    $elements['radios']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'radios', '#options' => array('' => t('None'), $this->randomMachineName(), $this->randomMachineName(), $this->randomMachineName()));
+    $elements['radios']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'radios', '#options' => ['' => t('None'), $this->randomMachineName(), $this->randomMachineName(), $this->randomMachineName()]];
     $elements['radios']['empty_values'] = $empty_arrays;
 
-    $elements['checkbox']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'checkbox', '#required' => TRUE);
+    $elements['checkbox']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'checkbox', '#required' => TRUE];
     $elements['checkbox']['empty_values'] = $empty_checkbox;
 
-    $elements['checkboxes']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'checkboxes', '#options' => array($this->randomMachineName(), $this->randomMachineName(), $this->randomMachineName()));
+    $elements['checkboxes']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'checkboxes', '#options' => [$this->randomMachineName(), $this->randomMachineName(), $this->randomMachineName()]];
     $elements['checkboxes']['empty_values'] = $empty_arrays;
 
-    $elements['select']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'select', '#options' => array('' => t('None'), $this->randomMachineName(), $this->randomMachineName(), $this->randomMachineName()));
+    $elements['select']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'select', '#options' => ['' => t('None'), $this->randomMachineName(), $this->randomMachineName(), $this->randomMachineName()]];
     $elements['select']['empty_values'] = $empty_strings;
 
-    $elements['file']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'file');
+    $elements['file']['element'] = ['#title' => $this->randomMachineName(), '#type' => 'file'];
     $elements['file']['empty_values'] = $empty_strings;
 
     // Regular expression to find the expected marker on required elements.
@@ -99,11 +99,11 @@ class FormTest extends WebTestBase {
     // Go through all the elements and all the empty values for them.
     foreach ($elements as $type => $data) {
       foreach ($data['empty_values'] as $key => $empty) {
-        foreach (array(TRUE, FALSE) as $required) {
+        foreach ([TRUE, FALSE] as $required) {
           $form_id = $this->randomMachineName();
-          $form = array();
+          $form = [];
           $form_state = new FormState();
-          $form['op'] = array('#type' => 'submit', '#value' => t('Submit'));
+          $form['op'] = ['#type' => 'submit', '#value' => t('Submit')];
           $element = $data['element']['#title'];
           $form[$element] = $data['element'];
           $form[$element]['#required'] = $required;
@@ -163,17 +163,17 @@ class FormTest extends WebTestBase {
    *
    * @see \Drupal\form_test\Form\FormTestValidateRequiredForm
    */
-  function testRequiredCheckboxesRadio() {
+  public function testRequiredCheckboxesRadio() {
     $form = \Drupal::formBuilder()->getForm('\Drupal\form_test\Form\FormTestValidateRequiredForm');
 
     // Attempt to submit the form with no required fields set.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('form-test/validate-required', $edit, 'Submit');
 
     // The only error messages that should appear are the relevant 'required'
     // messages for each field.
-    $expected = array();
-    foreach (array('textfield', 'checkboxes', 'select', 'radios') as $key) {
+    $expected = [];
+    foreach (['textfield', 'checkboxes', 'select', 'radios'] as $key) {
       if (isset($form[$key]['#required_error'])) {
         $expected[] = $form[$key]['#required_error'];
       }
@@ -181,7 +181,7 @@ class FormTest extends WebTestBase {
         $expected[] = $form[$key]['#form_test_required_error'];
       }
       else {
-        $expected[] = t('@name field is required.', array('@name' => $form[$key]['#title']));
+        $expected[] = t('@name field is required.', ['@name' => $form[$key]['#title']]);
       }
     }
 
@@ -191,7 +191,7 @@ class FormTest extends WebTestBase {
       $expected_key = array_search($error[0], $expected);
       // If the error message is not one of the expected messages, fail.
       if ($expected_key === FALSE) {
-        $this->fail(format_string("Unexpected error message: @error", array('@error' => $error[0])));
+        $this->fail(format_string("Unexpected error message: @error", ['@error' => $error[0]]));
       }
       // Remove the expected message from the list once it is found.
       else {
@@ -201,7 +201,7 @@ class FormTest extends WebTestBase {
 
     // Fail if any expected messages were not found.
     foreach ($expected as $not_found) {
-      $this->fail(format_string("Found error message: @error", array('@error' => $not_found)));
+      $this->fail(format_string("Found error message: @error", ['@error' => $not_found]));
     }
 
     // Verify that input elements are still empty.
@@ -218,12 +218,12 @@ class FormTest extends WebTestBase {
 
     // Submit again with required fields set and verify that there are no
     // error messages.
-    $edit = array(
+    $edit = [
       'textfield' => $this->randomString(),
       'checkboxes[foo]' => TRUE,
       'select' => 'foo',
       'radios' => 'bar',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Submit');
     $this->assertNoFieldByXpath('//div[contains(@class, "error")]', FALSE, 'No error message is displayed when all required fields are filled.');
     $this->assertRaw("The form_test_validate_required_form form was submitted successfully.", 'Validation form submitted successfully.');
@@ -240,13 +240,13 @@ class FormTest extends WebTestBase {
     $this->drupalLogin($account);
     // Submit again with required fields set but an invalid form token and
     // verify that all the values are retained.
-    $edit = array(
+    $edit = [
       'textfield' => $this->randomString(),
       'checkboxes[bar]' => TRUE,
       'select' => 'bar',
       'radios' => 'foo',
       'form_token' => 'invalid token',
-    );
+    ];
     $this->drupalPostForm(Url::fromRoute('form_test.validate_required'), $edit, 'Submit');
     $this->assertFieldByXpath('//div[contains(@class, "error")]', NULL, 'Error message is displayed with invalid token even when required fields are filled.');
     $this->assertText('The form has become outdated. Copy any unsaved work in the form below');
@@ -258,11 +258,11 @@ class FormTest extends WebTestBase {
     $this->assertFieldChecked('edit-radios-foo');
 
     // Check another form that has a textarea input.
-    $edit = array(
+    $edit = [
       'textfield' => $this->randomString(),
       'textarea' => $this->randomString() . "\n",
       'form_token' => 'invalid token',
-    );
+    ];
     $this->drupalPostForm(Url::fromRoute('form_test.required'), $edit, 'Submit');
     $this->assertFieldByXpath('//div[contains(@class, "error")]', NULL, 'Error message is displayed with invalid token even when required fields are filled.');
     $this->assertText('The form has become outdated. Copy any unsaved work in the form below');
@@ -270,20 +270,20 @@ class FormTest extends WebTestBase {
     $this->assertFieldByName('textarea', $edit['textarea']);
 
     // Check another form that has a number input.
-    $edit = array(
+    $edit = [
       'integer_step' => mt_rand(1, 100),
       'form_token' => 'invalid token',
-    );
+    ];
     $this->drupalPostForm(Url::fromRoute('form_test.number'), $edit, 'Submit');
     $this->assertFieldByXpath('//div[contains(@class, "error")]', NULL, 'Error message is displayed with invalid token even when required fields are filled.');
     $this->assertText('The form has become outdated. Copy any unsaved work in the form below');
     $this->assertFieldByName('integer_step', $edit['integer_step']);
 
     // Check a form with a Url field
-    $edit = array(
+    $edit = [
       'url' => $this->randomString(),
       'form_token' => 'invalid token',
-    );
+    ];
     $this->drupalPostForm(Url::fromRoute('form_test.url'), $edit, 'Submit');
     $this->assertFieldByXpath('//div[contains(@class, "error")]', NULL, 'Error message is displayed with invalid token even when required fields are filled.');
     $this->assertText('The form has become outdated. Copy any unsaved work in the form below');
@@ -312,9 +312,9 @@ class FormTest extends WebTestBase {
    *
    * @see \Drupal\form_test\Form\FormTestValidateRequiredNoTitleForm
    */
-  function testRequiredTextfieldNoTitle() {
+  public function testRequiredTextfieldNoTitle() {
     // Attempt to submit the form with no required field set.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('form-test/validate-required-no-title', $edit, 'Submit');
     $this->assertNoRaw("The form_test_validate_required_form_no_title form was submitted successfully.", 'Validation form submitted successfully.');
 
@@ -326,9 +326,9 @@ class FormTest extends WebTestBase {
 
     // Submit again with required fields set and verify that there are no
     // error messages.
-    $edit = array(
+    $edit = [
       'textfield' => $this->randomString(),
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Submit');
     $this->assertNoFieldByXpath('//input[contains(@class, "error")]', FALSE, 'No error input form element class found.');
     $this->assertRaw("The form_test_validate_required_form_no_title form was submitted successfully.", 'Validation form submitted successfully.');
@@ -339,35 +339,35 @@ class FormTest extends WebTestBase {
    *
    * @see _form_test_checkbox()
    */
-  function testCheckboxProcessing() {
+  public function testCheckboxProcessing() {
     // First, try to submit without the required checkbox.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('form-test/checkbox', $edit, t('Submit'));
-    $this->assertRaw(t('@name field is required.', array('@name' => 'required_checkbox')), 'A required checkbox is actually mandatory');
+    $this->assertRaw(t('@name field is required.', ['@name' => 'required_checkbox']), 'A required checkbox is actually mandatory');
 
     // Now try to submit the form correctly.
-    $values = Json::decode($this->drupalPostForm(NULL, array('required_checkbox' => 1), t('Submit')));
-    $expected_values = array(
+    $values = Json::decode($this->drupalPostForm(NULL, ['required_checkbox' => 1], t('Submit')));
+    $expected_values = [
       'disabled_checkbox_on' => 'disabled_checkbox_on',
       'disabled_checkbox_off' => '',
       'checkbox_on' => 'checkbox_on',
       'checkbox_off' => '',
       'zero_checkbox_on' => '0',
       'zero_checkbox_off' => '',
-    );
+    ];
     foreach ($expected_values as $widget => $expected_value) {
-      $this->assertEqual($values[$widget], $expected_value, format_string('Checkbox %widget returns expected value (expected: %expected, got: %value)', array(
+      $this->assertEqual($values[$widget], $expected_value, format_string('Checkbox %widget returns expected value (expected: %expected, got: %value)', [
         '%widget' => var_export($widget, TRUE),
         '%expected' => var_export($expected_value, TRUE),
         '%value' => var_export($values[$widget], TRUE),
-      )));
+      ]));
     }
   }
 
   /**
    * Tests validation of #type 'select' elements.
    */
-  function testSelect() {
+  public function testSelect() {
     $form = \Drupal::formBuilder()->getForm('Drupal\form_test\Form\FormTestSelectForm');
     $this->drupalGet('form-test/select');
 
@@ -376,8 +376,8 @@ class FormTest extends WebTestBase {
     $this->assertNoRaw('<strong>four</strong>');
 
     // Posting without any values should throw validation errors.
-    $this->drupalPostForm(NULL, array(), 'Submit');
-    $no_errors = array(
+    $this->drupalPostForm(NULL, [], 'Submit');
+    $no_errors = [
         'select',
         'select_required',
         'select_optional',
@@ -388,35 +388,35 @@ class FormTest extends WebTestBase {
         'no_default_empty_value_optional',
         'multiple',
         'multiple_no_default',
-    );
+    ];
     foreach ($no_errors as $key) {
-      $this->assertNoText(t('@name field is required.', array('@name' => $form[$key]['#title'])));
+      $this->assertNoText(t('@name field is required.', ['@name' => $form[$key]['#title']]));
     }
 
-    $expected_errors = array(
+    $expected_errors = [
         'no_default',
         'no_default_empty_option',
         'no_default_empty_value',
         'no_default_empty_value_one',
         'multiple_no_default_required',
-    );
+    ];
     foreach ($expected_errors as $key) {
-      $this->assertText(t('@name field is required.', array('@name' => $form[$key]['#title'])));
+      $this->assertText(t('@name field is required.', ['@name' => $form[$key]['#title']]));
     }
 
     // Post values for required fields.
-    $edit = array(
+    $edit = [
       'no_default' => 'three',
       'no_default_empty_option' => 'three',
       'no_default_empty_value' => 'three',
       'no_default_empty_value_one' => 'three',
       'multiple_no_default_required[]' => 'three',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Submit');
     $values = Json::decode($this->getRawContent());
 
     // Verify expected values.
-    $expected = array(
+    $expected = [
       'select' => 'one',
       'empty_value' => 'one',
       'empty_value_one' => 'one',
@@ -428,23 +428,23 @@ class FormTest extends WebTestBase {
       'no_default_empty_value' => 'three',
       'no_default_empty_value_one' => 'three',
       'no_default_empty_value_optional' => 0,
-      'multiple' => array('two' => 'two'),
-      'multiple_no_default' => array(),
-      'multiple_no_default_required' => array('three' => 'three'),
-    );
+      'multiple' => ['two' => 'two'],
+      'multiple_no_default' => [],
+      'multiple_no_default_required' => ['three' => 'three'],
+    ];
     foreach ($expected as $key => $value) {
-      $this->assertIdentical($values[$key], $value, format_string('@name: @actual is equal to @expected.', array(
+      $this->assertIdentical($values[$key], $value, format_string('@name: @actual is equal to @expected.', [
         '@name' => $key,
         '@actual' => var_export($values[$key], TRUE),
         '@expected' => var_export($value, TRUE),
-      )));
+      ]));
     }
   }
 
   /**
    * Tests a select element when #options is not set.
    */
-  function testEmptySelect() {
+  public function testEmptySelect() {
     $this->drupalGet('form-test/empty-select');
     $this->assertFieldByXPath("//select[1]", NULL, 'Select element found.');
     $this->assertNoFieldByXPath("//select[1]/option", NULL, 'No option element found.');
@@ -453,19 +453,19 @@ class FormTest extends WebTestBase {
   /**
    * Tests validation of #type 'number' and 'range' elements.
    */
-  function testNumber() {
+  public function testNumber() {
     $form = \Drupal::formBuilder()->getForm('\Drupal\form_test\Form\FormTestNumberForm');
 
     // Array with all the error messages to be checked.
-    $error_messages = array(
+    $error_messages = [
       'no_number' => '%name must be a number.',
       'too_low' => '%name must be higher than or equal to %min.',
       'too_high' => '%name must be lower than or equal to %max.',
       'step_mismatch' => '%name is not a valid number.',
-    );
+    ];
 
     // The expected errors.
-    $expected = array(
+    $expected = [
       'integer_no_number' => 'no_number',
       'integer_no_step' => 0,
       'integer_no_step_step_error' => 'step_mismatch',
@@ -485,20 +485,20 @@ class FormTest extends WebTestBase {
       'float_step_hard_no_error' => 0,
       'float_step_hard_error' => 'step_mismatch',
       'float_step_any_no_error' => 0,
-    );
+    ];
 
     // First test the number element type, then range.
-    foreach (array('form-test/number', 'form-test/number/range') as $path) {
+    foreach (['form-test/number', 'form-test/number/range'] as $path) {
       // Post form and show errors.
-      $this->drupalPostForm($path, array(), 'Submit');
+      $this->drupalPostForm($path, [], 'Submit');
 
       foreach ($expected as $element => $error) {
         // Create placeholder array.
-        $placeholders = array(
+        $placeholders = [
           '%name' => $form[$element]['#title'],
           '%min' => isset($form[$element]['#min']) ? $form[$element]['#min'] : '0',
           '%max' => isset($form[$element]['#max']) ? $form[$element]['#max'] : '0',
-        );
+        ];
 
         foreach ($error_messages as $id => $message) {
           // Check if the error exists on the page, if the current message ID is
@@ -517,23 +517,23 @@ class FormTest extends WebTestBase {
   /**
    * Tests default value handling of #type 'range' elements.
    */
-  function testRange() {
-    $values = json_decode($this->drupalPostForm('form-test/range', array(), 'Submit'));
+  public function testRange() {
+    $values = json_decode($this->drupalPostForm('form-test/range', [], 'Submit'));
     $this->assertEqual($values->with_default_value, 18);
     $this->assertEqual($values->float, 10.5);
     $this->assertEqual($values->integer, 6);
     $this->assertEqual($values->offset, 6.9);
 
-    $this->drupalPostForm('form-test/range/invalid', array(), 'Submit');
+    $this->drupalPostForm('form-test/range/invalid', [], 'Submit');
     $this->assertFieldByXPath('//input[@type="range" and contains(@class, "error")]', NULL, 'Range element has the error class.');
   }
 
   /**
    * Tests validation of #type 'color' elements.
    */
-  function testColorValidation() {
+  public function testColorValidation() {
     // Keys are inputs, values are expected results.
-    $values = array(
+    $values = [
       '' => '#000000',
       '#000' => '#000000',
       'AAA' => '#aaaaaa',
@@ -541,25 +541,25 @@ class FormTest extends WebTestBase {
       '#99ccBc' => '#99ccbc',
       '#aabbcc' => '#aabbcc',
       '123456' => '#123456',
-    );
+    ];
 
     // Tests that valid values are properly normalized.
     foreach ($values as $input => $expected) {
-      $edit = array(
+      $edit = [
         'color' => $input,
-      );
+      ];
       $result = json_decode($this->drupalPostForm('form-test/color', $edit, 'Submit'));
       $this->assertEqual($result->color, $expected);
     }
 
     // Tests invalid values are rejected.
-    $values = array('#0008', '#1234', '#fffffg', '#abcdef22', '17', '#uaa');
+    $values = ['#0008', '#1234', '#fffffg', '#abcdef22', '17', '#uaa'];
     foreach ($values as $input) {
-      $edit = array(
+      $edit = [
         'color' => $input,
-      );
+      ];
       $this->drupalPostForm('form-test/color', $edit, 'Submit');
-      $this->assertRaw(t('%name must be a valid color.', array('%name' => 'Color')));
+      $this->assertRaw(t('%name must be a valid color.', ['%name' => 'Color']));
     }
   }
 
@@ -568,14 +568,14 @@ class FormTest extends WebTestBase {
    *
    * @see _form_test_disabled_elements()
    */
-  function testDisabledElements() {
+  public function testDisabledElements() {
     // Get the raw form in its original state.
     $form_state = new FormState();
-    $form = (new FormTestDisabledElementsForm())->buildForm(array(), $form_state);
+    $form = (new FormTestDisabledElementsForm())->buildForm([], $form_state);
 
     // Build a submission that tries to hijack the form by submitting input for
     // elements that are disabled.
-    $edit = array();
+    $edit = [];
     foreach (Element::children($form) as $key) {
       if (isset($form[$key]['#test_hijack_value'])) {
         if (is_array($form[$key]['#test_hijack_value'])) {
@@ -591,14 +591,14 @@ class FormTest extends WebTestBase {
 
     // Submit the form with no input, as the browser does for disabled elements,
     // and fetch the $form_state->getValues() that is passed to the submit handler.
-    $this->drupalPostForm('form-test/disabled-elements', array(), t('Submit'));
+    $this->drupalPostForm('form-test/disabled-elements', [], t('Submit'));
     $returned_values['normal'] = Json::decode($this->content);
 
     // Do the same with input, as could happen if JavaScript un-disables an
     // element. drupalPostForm() emulates a browser by not submitting input for
     // disabled elements, so we need to un-disable those elements first.
     $this->drupalGet('form-test/disabled-elements');
-    $disabled_elements = array();
+    $disabled_elements = [];
     foreach ($this->xpath('//*[@disabled]') as $element) {
       $disabled_elements[] = (string) $element['name'];
       unset($element['disabled']);
@@ -608,10 +608,10 @@ class FormTest extends WebTestBase {
     // the disabled container.
     $actual_count = count($disabled_elements);
     $expected_count = 42;
-    $this->assertEqual($actual_count, $expected_count, SafeMarkup::format('Found @actual elements with disabled property (expected @expected).', array(
+    $this->assertEqual($actual_count, $expected_count, SafeMarkup::format('Found @actual elements with disabled property (expected @expected).', [
       '@actual' => count($disabled_elements),
       '@expected' => $expected_count,
-    )));
+    ]));
 
     $this->drupalPostForm(NULL, $edit, t('Submit'));
     $returned_values['hijacked'] = Json::decode($this->content);
@@ -626,7 +626,7 @@ class FormTest extends WebTestBase {
   /**
    * Assert that the values submitted to a form matches the default values of the elements.
    */
-  function assertFormValuesDefault($values, $form) {
+  public function assertFormValuesDefault($values, $form) {
     foreach (Element::children($form) as $key) {
       if (isset($form[$key]['#default_value'])) {
         if (isset($form[$key]['#expected_value'])) {
@@ -640,7 +640,7 @@ class FormTest extends WebTestBase {
           // Checkboxes values are not filtered out.
           $values[$key] = array_filter($values[$key]);
         }
-        $this->assertIdentical($expected_value, $values[$key], format_string('Default value for %type: expected %expected, returned %returned.', array('%type' => $key, '%expected' => var_export($expected_value, TRUE), '%returned' => var_export($values[$key], TRUE))));
+        $this->assertIdentical($expected_value, $values[$key], format_string('Default value for %type: expected %expected, returned %returned.', ['%type' => $key, '%expected' => var_export($expected_value, TRUE), '%returned' => var_export($values[$key], TRUE)]));
       }
 
       // Recurse children.
@@ -653,27 +653,27 @@ class FormTest extends WebTestBase {
    *
    * @see _form_test_disabled_elements()
    */
-  function testDisabledMarkup() {
+  public function testDisabledMarkup() {
     $this->drupalGet('form-test/disabled-elements');
     $form = \Drupal::formBuilder()->getForm('\Drupal\form_test\Form\FormTestDisabledElementsForm');
-    $type_map = array(
+    $type_map = [
       'textarea' => 'textarea',
       'select' => 'select',
       'weight' => 'select',
       'datetime' => 'datetime',
-    );
+    ];
 
     foreach ($form as $name => $item) {
       // Skip special #types.
-      if (!isset($item['#type']) || in_array($item['#type'], array('hidden', 'text_format'))) {
+      if (!isset($item['#type']) || in_array($item['#type'], ['hidden', 'text_format'])) {
         continue;
       }
       // Setup XPath and CSS class depending on #type.
-      if (in_array($item['#type'], array('button', 'submit'))) {
+      if (in_array($item['#type'], ['button', 'submit'])) {
         $path = "//!type[contains(@class, :div-class) and @value=:value]";
         $class = 'is-disabled';
       }
-      elseif (in_array($item['#type'], array('image_button'))) {
+      elseif (in_array($item['#type'], ['image_button'])) {
         $path = "//!type[contains(@class, :div-class) and @value=:value]";
         $class = 'is-disabled';
       }
@@ -687,27 +687,27 @@ class FormTest extends WebTestBase {
       if (isset($type_map[$item['#type']])) {
         $type = $type_map[$item['#type']];
       }
-      $path = strtr($path, array('!type' => $type));
+      $path = strtr($path, ['!type' => $type]);
       // Verify that the element exists.
-      $element = $this->xpath($path, array(
+      $element = $this->xpath($path, [
         ':name' => Html::escape($name),
         ':div-class' => $class,
         ':value' => isset($item['#value']) ? $item['#value'] : '',
-      ));
-      $this->assertTrue(isset($element[0]), format_string('Disabled form element class found for #type %type.', array('%type' => $item['#type'])));
+      ]);
+      $this->assertTrue(isset($element[0]), format_string('Disabled form element class found for #type %type.', ['%type' => $item['#type']]));
     }
 
     // Verify special element #type text-format.
-    $element = $this->xpath('//div[contains(@class, :div-class)]/descendant::textarea[@name=:name]', array(
+    $element = $this->xpath('//div[contains(@class, :div-class)]/descendant::textarea[@name=:name]', [
       ':name' => 'text_format[value]',
       ':div-class' => 'form-disabled',
-    ));
-    $this->assertTrue(isset($element[0]), format_string('Disabled form element class found for #type %type.', array('%type' => 'text_format[value]')));
-    $element = $this->xpath('//div[contains(@class, :div-class)]/descendant::select[@name=:name]', array(
+    ]);
+    $this->assertTrue(isset($element[0]), format_string('Disabled form element class found for #type %type.', ['%type' => 'text_format[value]']));
+    $element = $this->xpath('//div[contains(@class, :div-class)]/descendant::select[@name=:name]', [
       ':name' => 'text_format[format]',
       ':div-class' => 'form-disabled',
-    ));
-    $this->assertTrue(isset($element[0]), format_string('Disabled form element class found for #type %type.', array('%type' => 'text_format[format]')));
+    ]);
+    $this->assertTrue(isset($element[0]), format_string('Disabled form element class found for #type %type.', ['%type' => 'text_format[format]']));
   }
 
   /**
@@ -715,34 +715,34 @@ class FormTest extends WebTestBase {
    *
    * @see _form_test_input_forgery()
    */
-  function testInputForgery() {
+  public function testInputForgery() {
     $this->drupalGet('form-test/input-forgery');
     $checkbox = $this->xpath('//input[@name="checkboxes[two]"]');
     $checkbox[0]['value'] = 'FORGERY';
-    $this->drupalPostForm(NULL, array('checkboxes[one]' => TRUE, 'checkboxes[two]' => TRUE), t('Submit'));
+    $this->drupalPostForm(NULL, ['checkboxes[one]' => TRUE, 'checkboxes[two]' => TRUE], t('Submit'));
     $this->assertText('An illegal choice has been detected.', 'Input forgery was detected.');
   }
 
   /**
    * Tests required attribute.
    */
-  function testRequiredAttribute() {
+  public function testRequiredAttribute() {
     $this->drupalGet('form-test/required-attribute');
     $expected = 'required';
     // Test to make sure the elements have the proper required attribute.
-    foreach (array('textfield', 'password') as $type) {
-      $element = $this->xpath('//input[@id=:id and @required=:expected]', array(
+    foreach (['textfield', 'password'] as $type) {
+      $element = $this->xpath('//input[@id=:id and @required=:expected]', [
         ':id' => 'edit-' . $type,
         ':expected' => $expected,
-      ));
-      $this->assertTrue(!empty($element), format_string('The @type has the proper required attribute.', array('@type' => $type)));
+      ]);
+      $this->assertTrue(!empty($element), format_string('The @type has the proper required attribute.', ['@type' => $type]));
     }
 
     // Test to make sure textarea has the proper required attribute.
-    $element = $this->xpath('//textarea[@id=:id and @required=:expected]', array(
+    $element = $this->xpath('//textarea[@id=:id and @required=:expected]', [
       ':id' => 'edit-textarea',
       ':expected' => $expected,
-    ));
+    ]);
     $this->assertTrue(!empty($element), 'The textarea has the proper required attribute.');
   }
 
diff --git a/web/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php b/web/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php
index 7b3d73cb0..d443d4b64 100644
--- a/web/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php
+++ b/web/core/modules/system/src/Tests/Form/LanguageSelectElementTest.php
@@ -20,47 +20,47 @@ class LanguageSelectElementTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test', 'language');
+  public static $modules = ['form_test', 'language'];
 
   /**
    * Tests that the options printed by the language select element are correct.
    */
-  function testLanguageSelectElementOptions() {
+  public function testLanguageSelectElementOptions() {
     // Add some languages.
-    ConfigurableLanguage::create(array(
+    ConfigurableLanguage::create([
       'id' => 'aaa',
       'label' => $this->randomMachineName(),
-    ))->save();
+    ])->save();
 
-    ConfigurableLanguage::create(array(
+    ConfigurableLanguage::create([
       'id' => 'bbb',
       'label' => $this->randomMachineName(),
-    ))->save();
+    ])->save();
 
     \Drupal::languageManager()->reset();
 
     $this->drupalGet('form-test/language_select');
     // Check that the language fields were rendered on the page.
-    $ids = array(
+    $ids = [
         'edit-languages-all' => LanguageInterface::STATE_ALL,
         'edit-languages-configurable' => LanguageInterface::STATE_CONFIGURABLE,
         'edit-languages-locked' => LanguageInterface::STATE_LOCKED,
         'edit-languages-config-and-locked' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_LOCKED
-    );
+    ];
     foreach ($ids as $id => $flags) {
-      $this->assertField($id, format_string('The @id field was found on the page.', array('@id' => $id)));
-      $options = array();
+      $this->assertField($id, format_string('The @id field was found on the page.', ['@id' => $id]));
+      $options = [];
       /* @var $language_manager \Drupal\Core\Language\LanguageManagerInterface */
       $language_manager = $this->container->get('language_manager');
       foreach ($language_manager->getLanguages($flags) as $langcode => $language) {
-        $options[$langcode] = $language->isLocked() ? t('- @name -', array('@name' => $language->getName())) : $language->getName();
+        $options[$langcode] = $language->isLocked() ? t('- @name -', ['@name' => $language->getName()]) : $language->getName();
       }
       $this->_testLanguageSelectElementOptions($id, $options);
     }
 
     // Test that the #options were not altered by #languages.
-    $this->assertField('edit-language-custom-options', format_string('The @id field was found on the page.', array('@id' => 'edit-language-custom-options')));
-    $this->_testLanguageSelectElementOptions('edit-language-custom-options', array('opt1' => 'First option', 'opt2' => 'Second option', 'opt3' => 'Third option'));
+    $this->assertField('edit-language-custom-options', format_string('The @id field was found on the page.', ['@id' => 'edit-language-custom-options']));
+    $this->_testLanguageSelectElementOptions('edit-language-custom-options', ['opt1' => 'First option', 'opt2' => 'Second option', 'opt3' => 'Third option']);
   }
 
   /**
@@ -68,20 +68,20 @@ class LanguageSelectElementTest extends WebTestBase {
    *
    * This happens when the language module is disabled.
    */
-  function testHiddenLanguageSelectElement() {
+  public function testHiddenLanguageSelectElement() {
     // Disable the language module, so that the language select field will not
     // be rendered.
-    $this->container->get('module_installer')->uninstall(array('language'));
+    $this->container->get('module_installer')->uninstall(['language']);
     $this->drupalGet('form-test/language_select');
     // Check that the language fields were rendered on the page.
-    $ids = array('edit-languages-all', 'edit-languages-configurable', 'edit-languages-locked', 'edit-languages-config-and-locked');
+    $ids = ['edit-languages-all', 'edit-languages-configurable', 'edit-languages-locked', 'edit-languages-config-and-locked'];
     foreach ($ids as $id) {
-      $this->assertNoField($id, format_string('The @id field was not found on the page.', array('@id' => $id)));
+      $this->assertNoField($id, format_string('The @id field was not found on the page.', ['@id' => $id]));
     }
 
     // Check that the submitted values were the default values of the language
     // field elements.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm(NULL, $edit, t('Submit'));
     $values = Json::decode($this->getRawContent());
     $this->assertEqual($values['languages_all'], 'xx');
@@ -111,7 +111,7 @@ class LanguageSelectElementTest extends WebTestBase {
       $this->assertEqual((string) $option, $option_title);
       next($options);
     }
-    $this->assertEqual($count, count($options), format_string('The number of languages and the number of options shown by the language element are the same: @languages languages, @number options', array('@languages' => count($options), '@number' => $count)));
+    $this->assertEqual($count, count($options), format_string('The number of languages and the number of options shown by the language element are the same: @languages languages, @number options', ['@languages' => count($options), '@number' => $count]));
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Form/ProgrammaticTest.php b/web/core/modules/system/src/Tests/Form/ProgrammaticTest.php
index 5fbefb5e5..d365fb6bf 100644
--- a/web/core/modules/system/src/Tests/Form/ProgrammaticTest.php
+++ b/web/core/modules/system/src/Tests/Form/ProgrammaticTest.php
@@ -17,39 +17,39 @@ class ProgrammaticTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * Test the programmatic form submission workflow.
    */
-  function testSubmissionWorkflow() {
+  public function testSubmissionWorkflow() {
     // Backup the current batch status and reset it to avoid conflicts while
     // processing the dummy form submit handler.
     $current_batch = $batch =& batch_get();
-    $batch = array();
+    $batch = [];
 
     // Test that a programmatic form submission is rejected when a required
     // textfield is omitted and correctly processed when it is provided.
-    $this->submitForm(array(), FALSE);
-    $this->submitForm(array('textfield' => 'test 1'), TRUE);
-    $this->submitForm(array(), FALSE);
-    $this->submitForm(array('textfield' => 'test 2'), TRUE);
+    $this->submitForm([], FALSE);
+    $this->submitForm(['textfield' => 'test 1'], TRUE);
+    $this->submitForm([], FALSE);
+    $this->submitForm(['textfield' => 'test 2'], TRUE);
 
     // Test that a programmatic form submission can turn on and off checkboxes
     // which are, by default, checked.
-    $this->submitForm(array('textfield' => 'dummy value', 'checkboxes' => array(1 => 1, 2 => 2)), TRUE);
-    $this->submitForm(array('textfield' => 'dummy value', 'checkboxes' => array(1 => 1, 2 => NULL)), TRUE);
-    $this->submitForm(array('textfield' => 'dummy value', 'checkboxes' => array(1 => NULL, 2 => 2)), TRUE);
-    $this->submitForm(array('textfield' => 'dummy value', 'checkboxes' => array(1 => NULL, 2 => NULL)), TRUE);
+    $this->submitForm(['textfield' => 'dummy value', 'checkboxes' => [1 => 1, 2 => 2]], TRUE);
+    $this->submitForm(['textfield' => 'dummy value', 'checkboxes' => [1 => 1, 2 => NULL]], TRUE);
+    $this->submitForm(['textfield' => 'dummy value', 'checkboxes' => [1 => NULL, 2 => 2]], TRUE);
+    $this->submitForm(['textfield' => 'dummy value', 'checkboxes' => [1 => NULL, 2 => NULL]], TRUE);
 
     // Test that a programmatic form submission can correctly click a button
     // that limits validation errors based on user input. Since we do not
     // submit any values for "textfield" here and the textfield is required, we
     // only expect form validation to pass when validation is limited to a
     // different field.
-    $this->submitForm(array('op' => 'Submit with limited validation', 'field_to_validate' => 'all'), FALSE);
-    $this->submitForm(array('op' => 'Submit with limited validation', 'field_to_validate' => 'textfield'), FALSE);
-    $this->submitForm(array('op' => 'Submit with limited validation', 'field_to_validate' => 'field_to_validate'), TRUE);
+    $this->submitForm(['op' => 'Submit with limited validation', 'field_to_validate' => 'all'], FALSE);
+    $this->submitForm(['op' => 'Submit with limited validation', 'field_to_validate' => 'textfield'], FALSE);
+    $this->submitForm(['op' => 'Submit with limited validation', 'field_to_validate' => 'field_to_validate'], TRUE);
 
     // Restore the current batch status.
     $batch = $current_batch;
@@ -73,10 +73,10 @@ class ProgrammaticTest extends WebTestBase {
     // Check that the form returns an error when expected, and vice versa.
     $errors = $form_state->getErrors();
     $valid_form = empty($errors);
-    $args = array(
+    $args = [
       '%values' => print_r($values, TRUE),
       '%errors' => $valid_form ? t('None') : implode(' ', $errors),
-    );
+    ];
     $this->assertTrue($valid_input == $valid_form, format_string('Input values: %values<br />Validation handler errors: %errors', $args));
 
     // We check submitted values only if we have a valid input.
@@ -84,7 +84,7 @@ class ProgrammaticTest extends WebTestBase {
       // Fetching the values that were set in the submission handler.
       $stored_values = $form_state->get('programmatic_form_submit');
       foreach ($values as $key => $value) {
-        $this->assertEqual($stored_values[$key], $value, format_string('Submission handler correctly executed: %stored_key is %stored_value', array('%stored_key' => $key, '%stored_value' => print_r($value, TRUE))));
+        $this->assertEqual($stored_values[$key], $value, format_string('Submission handler correctly executed: %stored_key is %stored_value', ['%stored_key' => $key, '%stored_value' => print_r($value, TRUE)]));
       }
     }
   }
diff --git a/web/core/modules/system/src/Tests/Form/RebuildTest.php b/web/core/modules/system/src/Tests/Form/RebuildTest.php
index bee15fe1d..2e138bdfb 100644
--- a/web/core/modules/system/src/Tests/Form/RebuildTest.php
+++ b/web/core/modules/system/src/Tests/Form/RebuildTest.php
@@ -21,7 +21,7 @@ class RebuildTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'form_test');
+  public static $modules = ['node', 'form_test'];
 
   /**
    * A user for testing.
@@ -33,21 +33,21 @@ class RebuildTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
-    $this->webUser = $this->drupalCreateUser(array('access content'));
+    $this->webUser = $this->drupalCreateUser(['access content']);
     $this->drupalLogin($this->webUser);
   }
 
   /**
    * Tests preservation of values.
    */
-  function testRebuildPreservesValues() {
-    $edit = array(
+  public function testRebuildPreservesValues() {
+    $edit = [
       'checkbox_1_default_off' => TRUE,
       'checkbox_1_default_on' => FALSE,
       'text_1' => 'foo',
-    );
+    ];
     $this->drupalPostForm('form-test/form-rebuild-preserve-values', $edit, 'Add more');
 
     // Verify that initial elements retained their submitted values.
@@ -67,33 +67,33 @@ class RebuildTest extends WebTestBase {
    * The 'action' attribute of a form should not change after an Ajax submission
    * followed by a non-Ajax submission, which triggers a validation error.
    */
-  function testPreserveFormActionAfterAJAX() {
+  public function testPreserveFormActionAfterAJAX() {
     // Create a multi-valued field for 'page' nodes to use for Ajax testing.
     $field_name = 'field_ajax_test';
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => 'text',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'bundle' => 'page',
     ])->save();
     entity_get_form_display('node', 'page', 'default')
-      ->setComponent($field_name, array('type' => 'text_textfield'))
+      ->setComponent($field_name, ['type' => 'text_textfield'])
       ->save();
 
     // Log in a user who can create 'page' nodes.
-    $this->webUser = $this->drupalCreateUser(array('create page content'));
+    $this->webUser = $this->drupalCreateUser(['create page content']);
     $this->drupalLogin($this->webUser);
 
     // Get the form for adding a 'page' node. Submit an "add another item" Ajax
     // submission and verify it worked by ensuring the updated page has two text
     // field items in the field for which we just added an item.
     $this->drupalGet('node/add/page');
-    $this->drupalPostAjaxForm(NULL, array(), array('field_ajax_test_add_more' => t('Add another item')), NULL, array(), array(), 'node-page-form');
+    $this->drupalPostAjaxForm(NULL, [], ['field_ajax_test_add_more' => t('Add another item')], NULL, [], [], 'node-page-form');
     $this->assert(count($this->xpath('//div[contains(@class, "field--name-field-ajax-test")]//input[@type="text"]')) == 2, 'AJAX submission succeeded.');
 
     // Submit the form with the non-Ajax "Save" button, leaving the title field
@@ -101,7 +101,7 @@ class RebuildTest extends WebTestBase {
     // occurred, because this test is for testing what happens when a form is
     // re-rendered without being re-built, which is what happens when there's
     // a validation error.
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $this->assertText('Title field is required.', 'Non-AJAX submission correctly triggered a validation error.');
 
     // Ensure that the form contains two items in the multi-valued field, so we
diff --git a/web/core/modules/system/src/Tests/Form/ResponseTest.php b/web/core/modules/system/src/Tests/Form/ResponseTest.php
index 658b67267..e3064a551 100644
--- a/web/core/modules/system/src/Tests/Form/ResponseTest.php
+++ b/web/core/modules/system/src/Tests/Form/ResponseTest.php
@@ -17,7 +17,7 @@ class ResponseTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * Tests that enforced responses propagate through subscribers and middleware.
diff --git a/web/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php b/web/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php
index eb53244a9..976209e7b 100644
--- a/web/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php
+++ b/web/core/modules/system/src/Tests/Form/StateValuesCleanAdvancedTest.php
@@ -18,7 +18,7 @@ class StateValuesCleanAdvancedTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('file', 'form_test');
+  public static $modules = ['file', 'form_test'];
 
   /**
    * An image file path for uploading.
@@ -28,7 +28,7 @@ class StateValuesCleanAdvancedTest extends WebTestBase {
   /**
    * Tests \Drupal\Core\Form\FormState::cleanValues().
    */
-  function testFormStateValuesCleanAdvanced() {
+  public function testFormStateValuesCleanAdvanced() {
 
     // Get an image for uploading.
     $image_files = $this->drupalGetTestFiles('image');
@@ -38,7 +38,7 @@ class StateValuesCleanAdvancedTest extends WebTestBase {
     $this->assertTrue(is_file($this->image->uri), "The image file we're going to upload exists.");
 
     // "Browse" for the desired file.
-    $edit = array('files[image]' => drupal_realpath($this->image->uri));
+    $edit = ['files[image]' => drupal_realpath($this->image->uri)];
 
     // Post the form.
     $this->drupalPostForm('form_test/form-state-values-clean-advanced', $edit, t('Submit'));
diff --git a/web/core/modules/system/src/Tests/Form/StateValuesCleanTest.php b/web/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
index 7761bd8ad..8e79ac29d 100644
--- a/web/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
+++ b/web/core/modules/system/src/Tests/Form/StateValuesCleanTest.php
@@ -19,31 +19,31 @@ class StateValuesCleanTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * Tests \Drupal\Core\Form\FormState::cleanValues().
    */
-  function testFormStateValuesClean() {
-    $values = Json::decode($this->drupalPostForm('form_test/form-state-values-clean', array(), t('Submit')));
+  public function testFormStateValuesClean() {
+    $values = Json::decode($this->drupalPostForm('form_test/form-state-values-clean', [], t('Submit')));
 
     // Setup the expected result.
-    $result = array(
+    $result = [
       'beer' => 1000,
-      'baz' => array('beer' => 2000),
-    );
+      'baz' => ['beer' => 2000],
+    ];
 
     // Verify that all internal Form API elements were removed.
-    $this->assertFalse(isset($values['form_id']), format_string('%element was removed.', array('%element' => 'form_id')));
-    $this->assertFalse(isset($values['form_token']), format_string('%element was removed.', array('%element' => 'form_token')));
-    $this->assertFalse(isset($values['form_build_id']), format_string('%element was removed.', array('%element' => 'form_build_id')));
-    $this->assertFalse(isset($values['op']), format_string('%element was removed.', array('%element' => 'op')));
+    $this->assertFalse(isset($values['form_id']), format_string('%element was removed.', ['%element' => 'form_id']));
+    $this->assertFalse(isset($values['form_token']), format_string('%element was removed.', ['%element' => 'form_token']));
+    $this->assertFalse(isset($values['form_build_id']), format_string('%element was removed.', ['%element' => 'form_build_id']));
+    $this->assertFalse(isset($values['op']), format_string('%element was removed.', ['%element' => 'op']));
 
     // Verify that all buttons were removed.
-    $this->assertFalse(isset($values['foo']), format_string('%element was removed.', array('%element' => 'foo')));
-    $this->assertFalse(isset($values['bar']), format_string('%element was removed.', array('%element' => 'bar')));
-    $this->assertFalse(isset($values['baz']['foo']), format_string('%element was removed.', array('%element' => 'foo')));
-    $this->assertFalse(isset($values['baz']['baz']), format_string('%element was removed.', array('%element' => 'baz')));
+    $this->assertFalse(isset($values['foo']), format_string('%element was removed.', ['%element' => 'foo']));
+    $this->assertFalse(isset($values['bar']), format_string('%element was removed.', ['%element' => 'bar']));
+    $this->assertFalse(isset($values['baz']['foo']), format_string('%element was removed.', ['%element' => 'foo']));
+    $this->assertFalse(isset($values['baz']['baz']), format_string('%element was removed.', ['%element' => 'baz']));
 
     // Verify values manually added for cleaning were removed.
     $this->assertFalse(isset($values['wine']), SafeMarkup::format('%element was removed.', ['%element' => 'wine']));
diff --git a/web/core/modules/system/src/Tests/Form/StorageTest.php b/web/core/modules/system/src/Tests/Form/StorageTest.php
index d29f36b61..7896b5362 100644
--- a/web/core/modules/system/src/Tests/Form/StorageTest.php
+++ b/web/core/modules/system/src/Tests/Form/StorageTest.php
@@ -23,7 +23,7 @@ class StorageTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test', 'dblog');
+  public static $modules = ['form_test', 'dblog'];
 
   protected function setUp() {
     parent::setUp();
@@ -34,11 +34,11 @@ class StorageTest extends WebTestBase {
   /**
    * Tests using the form in a usual way.
    */
-  function testForm() {
+  public function testForm() {
     $this->drupalGet('form_test/form-storage');
     $this->assertText('Form constructions: 1');
 
-    $edit = array('title' => 'new', 'value' => 'value_is_set');
+    $edit = ['title' => 'new', 'value' => 'value_is_set'];
 
     // Use form rebuilding triggered by a submit button.
     $this->drupalPostForm(NULL, $edit, 'Continue submit');
@@ -47,7 +47,7 @@ class StorageTest extends WebTestBase {
 
     // Reset the form to the values of the storage, using a form rebuild
     // triggered by button of type button.
-    $this->drupalPostForm(NULL, array('title' => 'changed'), 'Reset');
+    $this->drupalPostForm(NULL, ['title' => 'changed'], 'Reset');
     $this->assertFieldByName('title', 'new', 'Values have been reset.');
     // After rebuilding, the form has been cached.
     $this->assertText('Form constructions: 4');
@@ -60,11 +60,11 @@ class StorageTest extends WebTestBase {
   /**
    * Tests using the form after calling $form_state->setCached().
    */
-  function testFormCached() {
-    $this->drupalGet('form_test/form-storage', array('query' => array('cache' => 1)));
+  public function testFormCached() {
+    $this->drupalGet('form_test/form-storage', ['query' => ['cache' => 1]]);
     $this->assertText('Form constructions: 1');
 
-    $edit = array('title' => 'new', 'value' => 'value_is_set');
+    $edit = ['title' => 'new', 'value' => 'value_is_set'];
 
     // Use form rebuilding triggered by a submit button.
     $this->drupalPostForm(NULL, $edit, 'Continue submit');
@@ -75,7 +75,7 @@ class StorageTest extends WebTestBase {
 
     // Reset the form to the values of the storage, using a form rebuild
     // triggered by button of type button.
-    $this->drupalPostForm(NULL, array('title' => 'changed'), 'Reset');
+    $this->drupalPostForm(NULL, ['title' => 'changed'], 'Reset');
     $this->assertFieldByName('title', 'new', 'Values have been reset.');
     $this->assertText('Form constructions: 4');
 
@@ -87,8 +87,8 @@ class StorageTest extends WebTestBase {
   /**
    * Tests validation when form storage is used.
    */
-  function testValidation() {
-    $this->drupalPostForm('form_test/form-storage', array('title' => '', 'value' => 'value_is_set'), 'Continue submit');
+  public function testValidation() {
+    $this->drupalPostForm('form_test/form-storage', ['title' => '', 'value' => 'value_is_set'], 'Continue submit');
     $this->assertPattern('/value_is_set/', 'The input values have been kept.');
   }
 
@@ -102,28 +102,28 @@ class StorageTest extends WebTestBase {
    * during form validation, while another, required element in the form
    * triggers a form validation error.
    */
-  function testCachedFormStorageValidation() {
+  public function testCachedFormStorageValidation() {
     // Request the form with 'cache' query parameter to enable form caching.
-    $this->drupalGet('form_test/form-storage', array('query' => array('cache' => 1)));
+    $this->drupalGet('form_test/form-storage', ['query' => ['cache' => 1]]);
 
     // Skip step 1 of the multi-step form, since the first step copies over
     // 'title' into form storage, but we want to verify that changes in the form
     // storage are updated in the cache during form validation.
-    $edit = array('title' => 'foo');
+    $edit = ['title' => 'foo'];
     $this->drupalPostForm(NULL, $edit, 'Continue submit');
 
     // In step 2, trigger a validation error for the required 'title' field, and
     // post the special 'change_title' value for the 'value' field, which
     // conditionally invokes the #element_validate handler to update the form
     // storage.
-    $edit = array('title' => '', 'value' => 'change_title');
+    $edit = ['title' => '', 'value' => 'change_title'];
     $this->drupalPostForm(NULL, $edit, 'Save');
 
     // At this point, the form storage should contain updated values, but we do
     // not see them, because the form has not been rebuilt yet due to the
     // validation error. Post again and verify that the rebuilt form contains
     // the values of the updated form storage.
-    $this->drupalPostForm(NULL, array('title' => 'foo', 'value' => 'bar'), 'Save');
+    $this->drupalPostForm(NULL, ['title' => 'foo', 'value' => 'bar'], 'Save');
     $this->assertText("The thing has been changed.", 'The altered form storage value was updated in cache and taken over.');
   }
 
diff --git a/web/core/modules/system/src/Tests/Form/SystemConfigFormTest.php b/web/core/modules/system/src/Tests/Form/SystemConfigFormTest.php
index 69a7f7e66..19be45f3f 100644
--- a/web/core/modules/system/src/Tests/Form/SystemConfigFormTest.php
+++ b/web/core/modules/system/src/Tests/Form/SystemConfigFormTest.php
@@ -16,16 +16,16 @@ class SystemConfigFormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * Tests the SystemConfigFormTestBase class.
    */
-  function testSystemConfigForm() {
+  public function testSystemConfigForm() {
     $this->drupalGet('form-test/system-config-form');
-    $element = $this->xpath('//div[@id = :id]/input[contains(@class, :class)]', array(':id' => 'edit-actions', ':class' => 'button--primary'));
+    $element = $this->xpath('//div[@id = :id]/input[contains(@class, :class)]', [':id' => 'edit-actions', ':class' => 'button--primary']);
     $this->assertTrue($element, 'The primary action submit button was found.');
-    $this->drupalPostForm(NULL, array(), t('Save configuration'));
+    $this->drupalPostForm(NULL, [], t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));
   }
 
diff --git a/web/core/modules/system/src/Tests/Form/TriggeringElementTest.php b/web/core/modules/system/src/Tests/Form/TriggeringElementTest.php
index 5d8a18082..973d37db9 100644
--- a/web/core/modules/system/src/Tests/Form/TriggeringElementTest.php
+++ b/web/core/modules/system/src/Tests/Form/TriggeringElementTest.php
@@ -16,36 +16,36 @@ class TriggeringElementTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * Test the determination of the triggering element when no button
    * information is included in the POST data, as is sometimes the case when
    * the ENTER key is pressed in a textfield in Internet Explorer.
    */
-  function testNoButtonInfoInPost() {
+  public function testNoButtonInfoInPost() {
     $path = 'form-test/clicked-button';
-    $edit = array();
+    $edit = [];
     $form_html_id = 'form-test-clicked-button';
 
     // Ensure submitting a form with no buttons results in no triggering element
     // and the form submit handler not running.
-    $this->drupalPostForm($path, $edit, NULL, array(), array(), $form_html_id);
+    $this->drupalPostForm($path, $edit, NULL, [], [], $form_html_id);
     $this->assertText('There is no clicked button.', '$form_state->getTriggeringElement() set to NULL.');
     $this->assertNoText('Submit handler for form_test_clicked_button executed.', 'Form submit handler did not execute.');
 
     // Ensure submitting a form with one or more submit buttons results in the
     // triggering element being set to the first one the user has access to. An
     // argument with 'r' in it indicates a restricted (#access=FALSE) button.
-    $this->drupalPostForm($path . '/s', $edit, NULL, array(), array(), $form_html_id);
+    $this->drupalPostForm($path . '/s', $edit, NULL, [], [], $form_html_id);
     $this->assertText('The clicked button is button1.', '$form_state->getTriggeringElement() set to only button.');
     $this->assertText('Submit handler for form_test_clicked_button executed.', 'Form submit handler executed.');
 
-    $this->drupalPostForm($path . '/s/s', $edit, NULL, array(), array(), $form_html_id);
+    $this->drupalPostForm($path . '/s/s', $edit, NULL, [], [], $form_html_id);
     $this->assertText('The clicked button is button1.', '$form_state->getTriggeringElement() set to first button.');
     $this->assertText('Submit handler for form_test_clicked_button executed.', 'Form submit handler executed.');
 
-    $this->drupalPostForm($path . '/rs/s', $edit, NULL, array(), array(), $form_html_id);
+    $this->drupalPostForm($path . '/rs/s', $edit, NULL, [], [], $form_html_id);
     $this->assertText('The clicked button is button2.', '$form_state->getTriggeringElement() set to first available button.');
     $this->assertText('Submit handler for form_test_clicked_button executed.', 'Form submit handler executed.');
 
@@ -53,15 +53,15 @@ class TriggeringElementTest extends WebTestBase {
     // triggering element being set to the first button, regardless of type. For
     // the FAPI 'button' type, this should result in the submit handler not
     // executing. The types are 's'(ubmit), 'b'(utton), and 'i'(mage_button).
-    $this->drupalPostForm($path . '/s/b/i', $edit, NULL, array(), array(), $form_html_id);
+    $this->drupalPostForm($path . '/s/b/i', $edit, NULL, [], [], $form_html_id);
     $this->assertText('The clicked button is button1.', '$form_state->getTriggeringElement() set to first button.');
     $this->assertText('Submit handler for form_test_clicked_button executed.', 'Form submit handler executed.');
 
-    $this->drupalPostForm($path . '/b/s/i', $edit, NULL, array(), array(), $form_html_id);
+    $this->drupalPostForm($path . '/b/s/i', $edit, NULL, [], [], $form_html_id);
     $this->assertText('The clicked button is button1.', '$form_state->getTriggeringElement() set to first button.');
     $this->assertNoText('Submit handler for form_test_clicked_button executed.', 'Form submit handler did not execute.');
 
-    $this->drupalPostForm($path . '/i/s/b', $edit, NULL, array(), array(), $form_html_id);
+    $this->drupalPostForm($path . '/i/s/b', $edit, NULL, [], [], $form_html_id);
     $this->assertText('The clicked button is button1.', '$form_state->getTriggeringElement() set to first button.');
     $this->assertText('Submit handler for form_test_clicked_button executed.', 'Form submit handler executed.');
   }
@@ -70,7 +70,7 @@ class TriggeringElementTest extends WebTestBase {
    * Test that the triggering element does not get set to a button with
    * #access=FALSE.
    */
-  function testAttemptAccessControlBypass() {
+  public function testAttemptAccessControlBypass() {
     $path = 'form-test/clicked-button';
     $form_html_id = 'form-test-clicked-button';
 
@@ -84,7 +84,7 @@ class TriggeringElementTest extends WebTestBase {
     // data we want into \Drupal::request()->request.
     $elements = $this->xpath('//form[@id="' . $form_html_id . '"]//input[@name="text"]');
     $elements[0]['name'] = 'button1';
-    $this->drupalPostForm(NULL, array('button1' => 'button1'), NULL, array(), array(), $form_html_id);
+    $this->drupalPostForm(NULL, ['button1' => 'button1'], NULL, [], [], $form_html_id);
 
     // Ensure that the triggering element was not set to the restricted button.
     // Do this with both a negative and positive assertion, because negative
diff --git a/web/core/modules/system/src/Tests/Form/UrlTest.php b/web/core/modules/system/src/Tests/Form/UrlTest.php
index 4bf6f608f..aceb6b420 100644
--- a/web/core/modules/system/src/Tests/Form/UrlTest.php
+++ b/web/core/modules/system/src/Tests/Form/UrlTest.php
@@ -17,29 +17,29 @@ class UrlTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   protected $profile = 'testing';
 
   /**
    * Tests that #type 'url' fields are properly validated and trimmed.
    */
-  function testFormUrl() {
-    $edit = array();
+  public function testFormUrl() {
+    $edit = [];
     $edit['url'] = 'http://';
     $edit['url_required'] = ' ';
     $this->drupalPostForm('form-test/url', $edit, 'Submit');
-    $this->assertRaw(t('The URL %url is not valid.', array('%url' => 'http://')));
-    $this->assertRaw(t('@name field is required.', array('@name' => 'Required URL')));
+    $this->assertRaw(t('The URL %url is not valid.', ['%url' => 'http://']));
+    $this->assertRaw(t('@name field is required.', ['@name' => 'Required URL']));
 
-    $edit = array();
+    $edit = [];
     $edit['url'] = "\n";
     $edit['url_required'] = 'http://example.com/   ';
     $values = Json::decode($this->drupalPostForm('form-test/url', $edit, 'Submit'));
     $this->assertIdentical($values['url'], '');
     $this->assertEqual($values['url_required'], 'http://example.com/');
 
-    $edit = array();
+    $edit = [];
     $edit['url'] = 'http://foo.bar.example.com/';
     $edit['url_required'] = 'https://www.drupal.org/node/1174630?page=0&foo=bar#new';
     $values = Json::decode($this->drupalPostForm('form-test/url', $edit, 'Submit'));
diff --git a/web/core/modules/system/src/Tests/Form/ValidationTest.php b/web/core/modules/system/src/Tests/Form/ValidationTest.php
index 35b340b5e..7854fc24a 100644
--- a/web/core/modules/system/src/Tests/Form/ValidationTest.php
+++ b/web/core/modules/system/src/Tests/Form/ValidationTest.php
@@ -17,52 +17,52 @@ class ValidationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * Tests #element_validate and #validate.
    */
-  function testValidate() {
+  public function testValidate() {
     $this->drupalGet('form-test/validate');
     // Verify that #element_validate handlers can alter the form and submitted
     // form values.
-    $edit = array(
+    $edit = [
       'name' => 'element_validate',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Save');
     $this->assertFieldByName('name', '#value changed by #element_validate', 'Form element #value was altered.');
     $this->assertText('Name value: value changed by setValueForElement() in #element_validate', 'Form element value in $form_state was altered.');
 
     // Verify that #validate handlers can alter the form and submitted
     // form values.
-    $edit = array(
+    $edit = [
       'name' => 'validate',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Save');
     $this->assertFieldByName('name', '#value changed by #validate', 'Form element #value was altered.');
     $this->assertText('Name value: value changed by setValueForElement() in #validate', 'Form element value in $form_state was altered.');
 
     // Verify that #element_validate handlers can make form elements
     // inaccessible, but values persist.
-    $edit = array(
+    $edit = [
       'name' => 'element_validate_access',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Save');
     $this->assertNoFieldByName('name', 'Form element was hidden.');
     $this->assertText('Name value: element_validate_access', 'Value for inaccessible form element exists.');
 
     // Verify that value for inaccessible form element persists.
-    $this->drupalPostForm(NULL, array(), 'Save');
+    $this->drupalPostForm(NULL, [], 'Save');
     $this->assertNoFieldByName('name', 'Form element was hidden.');
     $this->assertText('Name value: element_validate_access', 'Value for inaccessible form element exists.');
 
     // Verify that #validate handlers don't run if the CSRF token is invalid.
     $this->drupalLogin($this->drupalCreateUser());
     $this->drupalGet('form-test/validate');
-    $edit = array(
+    $edit = [
       'name' => 'validate',
       'form_token' => 'invalid token'
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Save');
     $this->assertNoFieldByName('name', '#value changed by #validate', 'Form element #value was not altered.');
     $this->assertNoText('Name value: value changed by setValueForElement() in #validate', 'Form element value in $form_state was not altered.');
@@ -72,7 +72,7 @@ class ValidationTest extends WebTestBase {
   /**
    * Tests that a form with a disabled CSRF token can be validated.
    */
-  function testDisabledToken() {
+  public function testDisabledToken() {
     $this->drupalPostForm('form-test/validate-no-token', [], 'Save');
     $this->assertText('The form_test_validate_no_token form has been submitted successfully.');
   }
@@ -80,12 +80,12 @@ class ValidationTest extends WebTestBase {
   /**
    * Tests partial form validation through #limit_validation_errors.
    */
-  function testValidateLimitErrors() {
-    $edit = array(
+  public function testValidateLimitErrors() {
+    $edit = [
       'test' => 'invalid',
       'test_numeric_index[0]' => 'invalid',
       'test_substring[foo]' => 'invalid',
-    );
+    ];
     $path = 'form-test/limit-validation-errors';
 
     // Render the form, and verify that the buttons with limited server-side
@@ -93,18 +93,18 @@ class ValidationTest extends WebTestBase {
     // client-side validation by the browser).
     $this->drupalGet($path);
     $expected = 'formnovalidate';
-    foreach (array('partial', 'partial-numeric-index', 'substring') as $type) {
-      $element = $this->xpath('//input[@id=:id and @formnovalidate=:expected]', array(
+    foreach (['partial', 'partial-numeric-index', 'substring'] as $type) {
+      $element = $this->xpath('//input[@id=:id and @formnovalidate=:expected]', [
         ':id' => 'edit-' . $type,
         ':expected' => $expected,
-      ));
-      $this->assertTrue(!empty($element), format_string('The @type button has the proper formnovalidate attribute.', array('@type' => $type)));
+      ]);
+      $this->assertTrue(!empty($element), format_string('The @type button has the proper formnovalidate attribute.', ['@type' => $type]));
     }
     // The button with full server-side validation should not have the
     // 'formnovalidate' attribute.
-    $element = $this->xpath('//input[@id=:id and not(@formnovalidate)]', array(
+    $element = $this->xpath('//input[@id=:id and not(@formnovalidate)]', [
       ':id' => 'edit-full',
-    ));
+    ]);
     $this->assertTrue(!empty($element), 'The button with full server-side validation does not have the formnovalidate attribute.');
 
     // Submit the form by pressing the 'Partial validate' button (uses
@@ -112,75 +112,75 @@ class ValidationTest extends WebTestBase {
     // validated, but the #element_validate handler for the 'test' field
     // is triggered.
     $this->drupalPostForm($path, $edit, t('Partial validate'));
-    $this->assertNoText(t('@name field is required.', array('@name' => 'Title')));
+    $this->assertNoText(t('@name field is required.', ['@name' => 'Title']));
     $this->assertText('Test element is invalid');
 
     // Edge case of #limit_validation_errors containing numeric indexes: same
     // thing with the 'Partial validate (numeric index)' button and the
     // 'test_numeric_index' field.
     $this->drupalPostForm($path, $edit, t('Partial validate (numeric index)'));
-    $this->assertNoText(t('@name field is required.', array('@name' => 'Title')));
+    $this->assertNoText(t('@name field is required.', ['@name' => 'Title']));
     $this->assertText('Test (numeric index) element is invalid');
 
     // Ensure something like 'foobar' isn't considered "inside" 'foo'.
     $this->drupalPostForm($path, $edit, t('Partial validate (substring)'));
-    $this->assertNoText(t('@name field is required.', array('@name' => 'Title')));
+    $this->assertNoText(t('@name field is required.', ['@name' => 'Title']));
     $this->assertText('Test (substring) foo element is invalid');
 
     // Ensure not validated values are not available to submit handlers.
-    $this->drupalPostForm($path, array('title' => '', 'test' => 'valid'), t('Partial validate'));
+    $this->drupalPostForm($path, ['title' => '', 'test' => 'valid'], t('Partial validate'));
     $this->assertText('Only validated values appear in the form values.');
 
     // Now test full form validation and ensure that the #element_validate
     // handler is still triggered.
     $this->drupalPostForm($path, $edit, t('Full validate'));
-    $this->assertText(t('@name field is required.', array('@name' => 'Title')));
+    $this->assertText(t('@name field is required.', ['@name' => 'Title']));
     $this->assertText('Test element is invalid');
   }
 
   /**
    * Tests #pattern validation.
    */
-  function testPatternValidation() {
-    $textfield_error = t('%name field is not in the right format.', array('%name' => 'One digit followed by lowercase letters'));
-    $tel_error = t('%name field is not in the right format.', array('%name' => 'Everything except numbers'));
-    $password_error = t('%name field is not in the right format.', array('%name' => 'Password'));
+  public function testPatternValidation() {
+    $textfield_error = t('%name field is not in the right format.', ['%name' => 'One digit followed by lowercase letters']);
+    $tel_error = t('%name field is not in the right format.', ['%name' => 'Everything except numbers']);
+    $password_error = t('%name field is not in the right format.', ['%name' => 'Password']);
 
     // Invalid textfield, valid tel.
-    $edit = array(
+    $edit = [
       'textfield' => 'invalid',
       'tel' => 'valid',
-    );
+    ];
     $this->drupalPostForm('form-test/pattern', $edit, 'Submit');
     $this->assertRaw($textfield_error);
     $this->assertNoRaw($tel_error);
     $this->assertNoRaw($password_error);
 
     // Valid textfield, invalid tel, valid password.
-    $edit = array(
+    $edit = [
       'textfield' => '7seven',
       'tel' => '818937',
       'password' => '0100110',
-    );
+    ];
     $this->drupalPostForm('form-test/pattern', $edit, 'Submit');
     $this->assertNoRaw($textfield_error);
     $this->assertRaw($tel_error);
     $this->assertNoRaw($password_error);
 
     // Non required fields are not validated if empty.
-    $edit = array(
+    $edit = [
       'textfield' => '',
       'tel' => '',
-    );
+    ];
     $this->drupalPostForm('form-test/pattern', $edit, 'Submit');
     $this->assertNoRaw($textfield_error);
     $this->assertNoRaw($tel_error);
     $this->assertNoRaw($password_error);
 
     // Invalid password.
-    $edit = array(
+    $edit = [
       'password' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('form-test/pattern', $edit, 'Submit');
     $this->assertNoRaw($textfield_error);
     $this->assertNoRaw($tel_error);
@@ -188,13 +188,13 @@ class ValidationTest extends WebTestBase {
 
     // The pattern attribute overrides #pattern and is not validated on the
     // server side.
-    $edit = array(
+    $edit = [
       'textfield' => '',
       'tel' => '',
       'url' => 'http://www.example.com/',
-    );
+    ];
     $this->drupalPostForm('form-test/pattern', $edit, 'Submit');
-    $this->assertNoRaw(t('%name field is not in the right format.', array('%name' => 'Client side validation')));
+    $this->assertNoRaw(t('%name field is not in the right format.', ['%name' => 'Client side validation']));
   }
 
   /**
@@ -202,40 +202,40 @@ class ValidationTest extends WebTestBase {
    *
    * @see \Drupal\form_test\Form\FormTestValidateRequiredForm
    */
-  function testCustomRequiredError() {
+  public function testCustomRequiredError() {
     $form = \Drupal::formBuilder()->getForm('\Drupal\form_test\Form\FormTestValidateRequiredForm');
 
     // Verify that a custom #required error can be set.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('form-test/validate-required', $edit, 'Submit');
 
     foreach (Element::children($form) as $key) {
       if (isset($form[$key]['#required_error'])) {
-        $this->assertNoText(t('@name field is required.', array('@name' => $form[$key]['#title'])));
+        $this->assertNoText(t('@name field is required.', ['@name' => $form[$key]['#title']]));
         $this->assertText($form[$key]['#required_error']);
       }
       elseif (isset($form[$key]['#form_test_required_error'])) {
-        $this->assertNoText(t('@name field is required.', array('@name' => $form[$key]['#title'])));
+        $this->assertNoText(t('@name field is required.', ['@name' => $form[$key]['#title']]));
         $this->assertText($form[$key]['#form_test_required_error']);
       }
     }
     $this->assertNoText(t('An illegal choice has been detected. Please contact the site administrator.'));
 
     // Verify that no custom validation error appears with valid values.
-    $edit = array(
+    $edit = [
       'textfield' => $this->randomString(),
       'checkboxes[foo]' => TRUE,
       'select' => 'foo',
-    );
+    ];
     $this->drupalPostForm('form-test/validate-required', $edit, 'Submit');
 
     foreach (Element::children($form) as $key) {
       if (isset($form[$key]['#required_error'])) {
-        $this->assertNoText(t('@name field is required.', array('@name' => $form[$key]['#title'])));
+        $this->assertNoText(t('@name field is required.', ['@name' => $form[$key]['#title']]));
         $this->assertNoText($form[$key]['#required_error']);
       }
       elseif (isset($form[$key]['#form_test_required_error'])) {
-        $this->assertNoText(t('@name field is required.', array('@name' => $form[$key]['#title'])));
+        $this->assertNoText(t('@name field is required.', ['@name' => $form[$key]['#title']]));
         $this->assertNoText($form[$key]['#form_test_required_error']);
       }
     }
diff --git a/web/core/modules/system/src/Tests/Image/ToolkitSetupFormTest.php b/web/core/modules/system/src/Tests/Image/ToolkitSetupFormTest.php
index 66989de0b..7dc9d3387 100644
--- a/web/core/modules/system/src/Tests/Image/ToolkitSetupFormTest.php
+++ b/web/core/modules/system/src/Tests/Image/ToolkitSetupFormTest.php
@@ -23,23 +23,23 @@ class ToolkitSetupFormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'image_test');
+  public static $modules = ['system', 'image_test'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer site configuration',
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Test Image toolkit setup form.
    */
-  function testToolkitSetupForm() {
+  public function testToolkitSetupForm() {
     // Get form.
     $this->drupalGet('admin/config/media/image-toolkit');
 
@@ -47,26 +47,26 @@ class ToolkitSetupFormTest extends WebTestBase {
     $this->assertFieldByName('image_toolkit', 'gd', 'The default image toolkit is GD.');
 
     // Test changing the jpeg image quality.
-    $edit = array('gd[image_jpeg_quality]' => '70');
+    $edit = ['gd[image_jpeg_quality]' => '70'];
     $this->drupalPostForm(NULL, $edit, 'Save configuration');
     $this->assertEqual($this->config('system.image.gd')->get('jpeg_quality'), '70');
 
     // Test changing the toolkit.
-    $edit = array('image_toolkit' => 'test');
+    $edit = ['image_toolkit' => 'test'];
     $this->drupalPostForm(NULL, $edit, 'Save configuration');
     $this->assertEqual($this->config('system.image')->get('toolkit'), 'test');
     $this->assertFieldByName('test[test_parameter]', '10');
 
     // Test changing the test toolkit parameter.
-    $edit = array('test[test_parameter]' => '0');
+    $edit = ['test[test_parameter]' => '0'];
     $this->drupalPostForm(NULL, $edit, 'Save configuration');
     $this->assertText(t('Test parameter should be different from 0.'), 'Validation error displayed.');
-    $edit = array('test[test_parameter]' => '20');
+    $edit = ['test[test_parameter]' => '20'];
     $this->drupalPostForm(NULL, $edit, 'Save configuration');
     $this->assertEqual($this->config('system.image.test_toolkit')->get('test_parameter'), '20');
 
     // Test access without the permission 'administer site configuration'.
-    $this->drupalLogin($this->drupalCreateUser(array('access administration pages')));
+    $this->drupalLogin($this->drupalCreateUser(['access administration pages']));
     $this->drupalGet('admin/config/media/image-toolkit');
     $this->assertResponse(403);
   }
diff --git a/web/core/modules/system/src/Tests/Image/ToolkitTest.php b/web/core/modules/system/src/Tests/Image/ToolkitTest.php
index 884832386..f70c261ef 100644
--- a/web/core/modules/system/src/Tests/Image/ToolkitTest.php
+++ b/web/core/modules/system/src/Tests/Image/ToolkitTest.php
@@ -12,42 +12,42 @@ class ToolkitTest extends ToolkitTestBase {
    * Check that ImageToolkitManager::getAvailableToolkits() only returns
    * available toolkits.
    */
-  function testGetAvailableToolkits() {
+  public function testGetAvailableToolkits() {
     $manager = $this->container->get('image.toolkit.manager');
     $toolkits = $manager->getAvailableToolkits();
     $this->assertTrue(isset($toolkits['test']), 'The working toolkit was returned.');
     $this->assertTrue(isset($toolkits['test:derived_toolkit']), 'The derived toolkit was returned.');
     $this->assertFalse(isset($toolkits['broken']), 'The toolkit marked unavailable was not returned');
-    $this->assertToolkitOperationsCalled(array());
+    $this->assertToolkitOperationsCalled([]);
   }
 
   /**
    * Tests Image's methods.
    */
-  function testLoad() {
+  public function testLoad() {
     $image = $this->getImage();
     $this->assertTrue(is_object($image), 'Returned an object.');
     $this->assertEqual($image->getToolkitId(), 'test', 'Image had toolkit set.');
-    $this->assertToolkitOperationsCalled(array('parseFile'));
+    $this->assertToolkitOperationsCalled(['parseFile']);
   }
 
   /**
    * Test the image_save() function.
    */
-  function testSave() {
+  public function testSave() {
     $this->assertFalse($this->image->save(), 'Function returned the expected value.');
-    $this->assertToolkitOperationsCalled(array('save'));
+    $this->assertToolkitOperationsCalled(['save']);
   }
 
   /**
    * Test the image_apply() function.
    */
-  function testApply() {
-    $data = array('p1' => 1, 'p2' => TRUE, 'p3' => 'text');
+  public function testApply() {
+    $data = ['p1' => 1, 'p2' => TRUE, 'p3' => 'text'];
     $this->assertTrue($this->image->apply('my_operation', $data), 'Function returned the expected value.');
 
     // Check that apply was called and with the correct parameters.
-    $this->assertToolkitOperationsCalled(array('apply'));
+    $this->assertToolkitOperationsCalled(['apply']);
     $calls = $this->imageTestGetAllCalls();
     $this->assertEqual($calls['apply'][0][0], 'my_operation', "'my_operation' was passed correctly as operation");
     $this->assertEqual($calls['apply'][0][1]['p1'], 1, 'integer parameter p1 was passed correctly');
@@ -58,14 +58,14 @@ class ToolkitTest extends ToolkitTestBase {
   /**
    * Test the image_apply() function.
    */
-  function testApplyNoParameters() {
+  public function testApplyNoParameters() {
     $this->assertTrue($this->image->apply('my_operation'), 'Function returned the expected value.');
 
     // Check that apply was called and with the correct parameters.
-    $this->assertToolkitOperationsCalled(array('apply'));
+    $this->assertToolkitOperationsCalled(['apply']);
     $calls = $this->imageTestGetAllCalls();
     $this->assertEqual($calls['apply'][0][0], 'my_operation', "'my_operation' was passed correctly as operation");
-    $this->assertEqual($calls['apply'][0][1], array(), 'passing no parameters was handled correctly');
+    $this->assertEqual($calls['apply'][0][1], [], 'passing no parameters was handled correctly');
   }
 
   /**
diff --git a/web/core/modules/system/src/Tests/Image/ToolkitTestBase.php b/web/core/modules/system/src/Tests/Image/ToolkitTestBase.php
index 53ede0dc7..0051e9411 100644
--- a/web/core/modules/system/src/Tests/Image/ToolkitTestBase.php
+++ b/web/core/modules/system/src/Tests/Image/ToolkitTestBase.php
@@ -15,7 +15,7 @@ abstract class ToolkitTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('image_test');
+  public static $modules = ['image_test'];
 
   /**
    * The URI for the file.
@@ -75,10 +75,10 @@ abstract class ToolkitTestBase extends WebTestBase {
    *   Array with string containing with the operation name, e.g. 'load',
    *   'save', 'crop', etc.
    */
-  function assertToolkitOperationsCalled(array $expected) {
+  public function assertToolkitOperationsCalled(array $expected) {
     // If one of the image operations is expected, apply should be expected as
     // well.
-    $operations = array(
+    $operations = [
       'resize',
       'rotate',
       'crop',
@@ -88,7 +88,7 @@ abstract class ToolkitTestBase extends WebTestBase {
       'scale_and_crop',
       'my_operation',
       'convert',
-    );
+    ];
     if (count(array_intersect($expected, $operations)) > 0 && !in_array('apply', $expected)) {
       $expected[] = 'apply';
     }
@@ -99,10 +99,10 @@ abstract class ToolkitTestBase extends WebTestBase {
     // Determine if there were any expected that were not called.
     $uncalled = array_diff($expected, $actual);
     if (count($uncalled)) {
-      $this->assertTrue(FALSE, SafeMarkup::format('Expected operations %expected to be called but %uncalled was not called.', array('%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled))));
+      $this->assertTrue(FALSE, SafeMarkup::format('Expected operations %expected to be called but %uncalled was not called.', ['%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled)]));
     }
     else {
-      $this->assertTrue(TRUE, SafeMarkup::format('All the expected operations were called: %expected', array('%expected' => implode(', ', $expected))));
+      $this->assertTrue(TRUE, SafeMarkup::format('All the expected operations were called: %expected', ['%expected' => implode(', ', $expected)]));
     }
 
     // Determine if there were any unexpected calls.
@@ -110,7 +110,7 @@ abstract class ToolkitTestBase extends WebTestBase {
     // count it as an error.
     $unexpected = array_diff($actual, $expected);
     if (count($unexpected) && (!in_array('apply', $expected) || count(array_intersect($unexpected, $operations)) !== count($unexpected))) {
-      $this->assertTrue(FALSE, SafeMarkup::format('Unexpected operations were called: %unexpected.', array('%unexpected' => implode(', ', $unexpected))));
+      $this->assertTrue(FALSE, SafeMarkup::format('Unexpected operations were called: %unexpected.', ['%unexpected' => implode(', ', $unexpected)]));
     }
     else {
       $this->assertTrue(TRUE, 'No unexpected operations were called.');
@@ -120,22 +120,22 @@ abstract class ToolkitTestBase extends WebTestBase {
   /**
    * Resets/initializes the history of calls to the test toolkit functions.
    */
-  function imageTestReset() {
+  public function imageTestReset() {
     // Keep track of calls to these operations
-    $results = array(
-      'parseFile' => array(),
-      'save' => array(),
-      'settings' => array(),
-      'apply' => array(),
-      'resize' => array(),
-      'rotate' => array(),
-      'crop' => array(),
-      'desaturate' => array(),
-      'create_new' => array(),
-      'scale' => array(),
-      'scale_and_crop' => array(),
-      'convert' => array(),
-    );
+    $results = [
+      'parseFile' => [],
+      'save' => [],
+      'settings' => [],
+      'apply' => [],
+      'resize' => [],
+      'rotate' => [],
+      'crop' => [],
+      'desaturate' => [],
+      'create_new' => [],
+      'scale' => [],
+      'scale_and_crop' => [],
+      'convert' => [],
+    ];
     \Drupal::state()->set('image_test.results', $results);
   }
 
@@ -147,8 +147,8 @@ abstract class ToolkitTestBase extends WebTestBase {
    *   'resize', 'rotate', 'crop', 'desaturate') with values being arrays of
    *   parameters passed to each call.
    */
-  function imageTestGetAllCalls() {
-    return \Drupal::state()->get('image_test.results') ?: array();
+  public function imageTestGetAllCalls() {
+    return \Drupal::state()->get('image_test.results') ?: [];
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Installer/DistributionProfileExistingSettingsTest.php b/web/core/modules/system/src/Tests/Installer/DistributionProfileExistingSettingsTest.php
new file mode 100644
index 000000000..2fe5d4f1b
--- /dev/null
+++ b/web/core/modules/system/src/Tests/Installer/DistributionProfileExistingSettingsTest.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Drupal\system\Tests\Installer;
+
+use Drupal\Component\Serialization\Yaml;
+use Drupal\Core\Database\Database;
+use Drupal\Core\DrupalKernel;
+use Drupal\Core\Site\Settings;
+use Drupal\simpletest\InstallerTestBase;
+use Symfony\Component\HttpFoundation\Request;
+
+
+/**
+ * Tests distribution profile support with existing settings.
+ *
+ * @group Installer
+ */
+class DistributionProfileExistingSettingsTest extends InstallerTestBase {
+
+  /**
+   * The distribution profile info.
+   *
+   * @var array
+   */
+  protected $info;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->info = [
+      'type' => 'profile',
+      'core' => \Drupal::CORE_COMPATIBILITY,
+      'name' => 'Distribution profile',
+      'distribution' => [
+        'name' => 'My Distribution',
+        'install' => [
+          'theme' => 'bartik',
+        ],
+      ],
+    ];
+    // File API functions are not available yet.
+    $path = $this->siteDirectory . '/profiles/mydistro';
+    mkdir($path, 0777, TRUE);
+    file_put_contents("$path/mydistro.info.yml", Yaml::encode($this->info));
+
+    // Pre-configure hash salt.
+    // Any string is valid, so simply use the class name of this test.
+    $this->settings['settings']['hash_salt'] = (object) [
+      'value' => __CLASS__,
+      'required' => TRUE,
+    ];
+
+    // Pre-configure database credentials.
+    $connection_info = Database::getConnectionInfo();
+    unset($connection_info['default']['pdo']);
+    unset($connection_info['default']['init_commands']);
+
+    $this->settings['databases']['default'] = (object) [
+      'value' => $connection_info,
+      'required' => TRUE,
+    ];
+
+    // Use the kernel to find the site path because the site.path service should
+    // not be available at this point in the install process.
+    $site_path = DrupalKernel::findSitePath(Request::createFromGlobals());
+    // Pre-configure config directories.
+    $this->settings['config_directories'] = [
+      CONFIG_SYNC_DIRECTORY => (object) [
+        'value' => $site_path . '/files/config_staging',
+        'required' => TRUE,
+      ],
+    ];
+    mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE);
+    parent::setUp();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpLanguage() {
+    // Make settings file not writable.
+    $filename = $this->siteDirectory . '/settings.php';
+    // Make the settings file read-only.
+    // Not using File API; a potential error must trigger a PHP warning.
+    chmod($filename, 0444);
+
+    // Verify that the distribution name appears.
+    $this->assertRaw($this->info['distribution']['name']);
+    // Verify that the requested theme is used.
+    $this->assertRaw($this->info['distribution']['install']['theme']);
+    // Verify that the "Choose profile" step does not appear.
+    $this->assertNoText('profile');
+
+    parent::setUpLanguage();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpProfile() {
+    // This step is skipped, because there is a distribution profile.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpSettings() {
+    // This step should not appear, since settings.php is fully configured
+    // already.
+  }
+
+  /**
+   * Confirms that the installation succeeded.
+   */
+  public function testInstalled() {
+    $this->assertUrl('user/1');
+    $this->assertResponse(200);
+    // Confirm that we are logged-in after installation.
+    $this->assertText($this->rootUser->getUsername());
+
+    // Confirm that Drupal recognizes this distribution as the current profile.
+    $this->assertEqual(\Drupal::installProfile(), 'mydistro');
+    $this->assertNull(Settings::get('install_profile'), 'The install profile has not been written to settings.php.');
+    $this->assertEqual($this->config('core.extension')->get('profile'), 'mydistro', 'The install profile has been written to core.extension configuration.');
+
+    $this->rebuildContainer();
+    $this->pass('Container can be rebuilt even though distribution is not written to settings.php.');
+    $this->assertEqual(\Drupal::installProfile(), 'mydistro');
+  }
+
+}
diff --git a/web/core/modules/system/src/Tests/Installer/DistributionProfileTest.php b/web/core/modules/system/src/Tests/Installer/DistributionProfileTest.php
index 0bb47acb4..e52b0469b 100644
--- a/web/core/modules/system/src/Tests/Installer/DistributionProfileTest.php
+++ b/web/core/modules/system/src/Tests/Installer/DistributionProfileTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\system\Tests\Installer;
 
 use Drupal\Core\Serialization\Yaml;
+use Drupal\Core\Site\Settings;
 use Drupal\simpletest\InstallerTestBase;
 
 /**
@@ -20,17 +21,17 @@ class DistributionProfileTest extends InstallerTestBase {
   protected $info;
 
   protected function setUp() {
-    $this->info = array(
+    $this->info = [
       'type' => 'profile',
       'core' => \Drupal::CORE_COMPATIBILITY,
       'name' => 'Distribution profile',
-      'distribution' => array(
+      'distribution' => [
         'name' => 'My Distribution',
-        'install' => array(
+        'install' => [
           'theme' => 'bartik',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     // File API functions are not available yet.
     $path = $this->siteDirectory . '/profiles/mydistro';
     mkdir($path, 0777, TRUE);
@@ -68,6 +69,11 @@ class DistributionProfileTest extends InstallerTestBase {
     $this->assertResponse(200);
     // Confirm that we are logged-in after installation.
     $this->assertText($this->rootUser->getUsername());
+
+    // Confirm that Drupal recognizes this distribution as the current profile.
+    $this->assertEqual(\Drupal::installProfile(), 'mydistro');
+    $this->assertEqual(Settings::get('install_profile'), 'mydistro', 'The install profile has been written to settings.php.');
+    $this->assertEqual($this->config('core.extension')->get('profile'), 'mydistro', 'The install profile has been written to core.extension configuration.');
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php b/web/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php
index b8658fbb8..1b6868351 100644
--- a/web/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php
+++ b/web/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php
@@ -30,18 +30,18 @@ class DistributionProfileTranslationQueryTest extends InstallerTestBase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->info = array(
+    $this->info = [
       'type' => 'profile',
       'core' => \Drupal::CORE_COMPATIBILITY,
       'name' => 'Distribution profile',
-      'distribution' => array(
+      'distribution' => [
         'name' => 'My Distribution',
         'langcode' => $this->langcode,
-        'install' => array(
+        'install' => [
           'theme' => 'bartik',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     // File API functions are not available yet.
     $path = $this->siteDirectory . '/profiles/mydistro';
     mkdir($path, 0777, TRUE);
diff --git a/web/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php b/web/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php
index 29b9b3ccd..799affe37 100644
--- a/web/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php
+++ b/web/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php
@@ -30,18 +30,18 @@ class DistributionProfileTranslationTest extends InstallerTestBase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->info = array(
+    $this->info = [
       'type' => 'profile',
       'core' => \Drupal::CORE_COMPATIBILITY,
       'name' => 'Distribution profile',
-      'distribution' => array(
+      'distribution' => [
         'name' => 'My Distribution',
         'langcode' => $this->langcode,
-        'install' => array(
+        'install' => [
           'theme' => 'bartik',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     // File API functions are not available yet.
     $path = $this->siteDirectory . '/profiles/mydistro';
     mkdir($path, 0777, TRUE);
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php b/web/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php
index eb50a0d88..2ab980fea 100644
--- a/web/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php
+++ b/web/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php
@@ -24,10 +24,10 @@ class InstallerConfigDirectorySetNoDirectoryErrorTest extends InstallerTestBase
    */
   protected function setUp() {
     $this->configDirectory = $this->publicFilesDirectory . '/config_' . Crypt::randomBytesBase64();
-    $this->settings['config_directories'][CONFIG_SYNC_DIRECTORY] = (object) array(
+    $this->settings['config_directories'][CONFIG_SYNC_DIRECTORY] = (object) [
       'value' => $this->configDirectory . '/sync',
       'required' => TRUE,
-    );
+    ];
     // Create the files directory early so we can test the error case.
     mkdir($this->publicFilesDirectory);
     // Create a file so the directory can not be created.
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryTest.php b/web/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryTest.php
index 4daa45cc4..11febf2d6 100644
--- a/web/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryTest.php
+++ b/web/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryTest.php
@@ -24,15 +24,15 @@ class InstallerConfigDirectorySetNoDirectoryTest extends InstallerTestBase {
    */
   protected function setUp() {
     $this->syncDirectory = $this->publicFilesDirectory . '/config_' . Crypt::randomBytesBase64() . '/sync';
-    $this->settings['config_directories'][CONFIG_SYNC_DIRECTORY] = (object) array(
+    $this->settings['config_directories'][CONFIG_SYNC_DIRECTORY] = (object) [
       'value' => $this->syncDirectory,
       'required' => TRUE,
-    );
+    ];
     // Other directories will be created too.
-    $this->settings['config_directories']['custom'] = (object) array(
+    $this->settings['config_directories']['custom'] = (object) [
       'value' => $this->publicFilesDirectory . '/config_custom',
       'required' => TRUE,
-    );
+    ];
     parent::setUp();
   }
 
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerExistingConfigDirectoryTest.php b/web/core/modules/system/src/Tests/Installer/InstallerExistingConfigDirectoryTest.php
index ae6b6069e..b06b4caf6 100644
--- a/web/core/modules/system/src/Tests/Installer/InstallerExistingConfigDirectoryTest.php
+++ b/web/core/modules/system/src/Tests/Installer/InstallerExistingConfigDirectoryTest.php
@@ -24,10 +24,10 @@ class InstallerExistingConfigDirectoryTest extends InstallerTestBase {
   protected function setUp() {
     mkdir($this->siteDirectory . '/config_read_only', 0444);
     $this->expectedFilePerms = fileperms($this->siteDirectory . '/config_read_only');
-    $this->settings['config_directories'][CONFIG_SYNC_DIRECTORY] = (object) array(
+    $this->settings['config_directories'][CONFIG_SYNC_DIRECTORY] = (object) [
       'value' => $this->siteDirectory . '/config_read_only',
       'required' => TRUE,
-    );
+    ];
     parent::setUp();
   }
 
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php b/web/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php
index 733f6bc4f..63d3ce407 100644
--- a/web/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php
+++ b/web/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php
@@ -22,10 +22,10 @@ class InstallerExistingDatabaseSettingsTest extends InstallerTestBase {
     unset($connection_info['default']['pdo']);
     unset($connection_info['default']['init_commands']);
 
-    $this->settings['databases']['default'] = (object) array(
+    $this->settings['databases']['default'] = (object) [
       'value' => $connection_info,
       'required' => TRUE,
-    );
+    ];
     parent::setUp();
   }
 
@@ -40,13 +40,13 @@ class InstallerExistingDatabaseSettingsTest extends InstallerTestBase {
     // All database settings should be pre-configured, except password.
     $values = $this->parameters['forms']['install_settings_form'];
     $driver = $values['driver'];
-    $edit = array();
+    $edit = [];
     if (isset($values[$driver]['password']) && $values[$driver]['password'] !== '') {
-      $edit = $this->translatePostValues(array(
-        $driver => array(
+      $edit = $this->translatePostValues([
+        $driver => [
           'password' => $values[$driver]['password'],
-        ),
-      ));
+        ],
+      ]);
     }
     $this->drupalPostForm(NULL, $edit, $this->translations['Save and continue']);
   }
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsMismatchProfileBrokenTest.php b/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsMismatchProfileBrokenTest.php
new file mode 100644
index 000000000..6d866f0cf
--- /dev/null
+++ b/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsMismatchProfileBrokenTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Drupal\system\Tests\Installer;
+
+use Drupal\Core\DrupalKernel;
+use Drupal\simpletest\InstallerTestBase;
+use Drupal\Core\Database\Database;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Tests installer breaks with a profile mismatch and a read-only settings.php.
+ *
+ * @group Installer
+ */
+class InstallerExistingSettingsMismatchProfileBrokenTest extends InstallerTestBase {
+
+  /**
+   * {@inheritdoc}
+   *
+   * Configures a preexisting settings.php file without an install_profile
+   * setting before invoking the interactive installer.
+   */
+  protected function setUp() {
+    // Pre-configure hash salt.
+    // Any string is valid, so simply use the class name of this test.
+    $this->settings['settings']['hash_salt'] = (object) [
+      'value' => __CLASS__,
+      'required' => TRUE,
+    ];
+
+    // Pre-configure database credentials.
+    $connection_info = Database::getConnectionInfo();
+    unset($connection_info['default']['pdo']);
+    unset($connection_info['default']['init_commands']);
+
+    $this->settings['databases']['default'] = (object) [
+      'value' => $connection_info,
+      'required' => TRUE,
+    ];
+
+    // During interactive install we'll change this to a different profile and
+    // this test will ensure that the new value is written to settings.php.
+    $this->settings['settings']['install_profile'] = (object) [
+      'value' => 'minimal',
+      'required' => TRUE,
+    ];
+
+    // Pre-configure config directories.
+    $site_path = DrupalKernel::findSitePath(Request::createFromGlobals());
+    $this->settings['config_directories'] = [
+      CONFIG_SYNC_DIRECTORY => (object) [
+        'value' => $site_path . '/files/config_staging',
+        'required' => TRUE,
+      ],
+    ];
+    mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE);
+
+    parent::setUp();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function visitInstaller() {
+    // Make settings file not writable. This will break the installer.
+    $filename = $this->siteDirectory . '/settings.php';
+    // Make the settings file read-only.
+    // Not using File API; a potential error must trigger a PHP warning.
+    chmod($filename, 0444);
+
+    $this->drupalGet($GLOBALS['base_url'] . '/core/install.php?langcode=en&profile=testing');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpLanguage() {
+    // This step is skipped, because there is a lagcode as a query param.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpProfile() {
+    // This step is skipped, because there is a profile as a query param.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpSettings() {
+    // This step should not appear, since settings.php is fully configured
+    // already.
+  }
+
+  protected function setUpSite() {
+    // This step should not appear, since settings.php could not be written.
+  }
+
+  /**
+   * Verifies that installation did not succeed.
+   */
+  public function testBrokenInstaller() {
+    $this->assertTitle('Install profile mismatch | Drupal');
+    $this->assertText("The selected profile testing does not match the install_profile setting, which is minimal. Cannot write updated setting to {$this->siteDirectory}/settings.php.");
+  }
+
+}
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsMismatchProfileTest.php b/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsMismatchProfileTest.php
new file mode 100644
index 000000000..0349fe515
--- /dev/null
+++ b/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsMismatchProfileTest.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Drupal\system\Tests\Installer;
+
+use Drupal\Core\DrupalKernel;
+use Drupal\Core\Site\Settings;
+use Drupal\simpletest\InstallerTestBase;
+use Drupal\Core\Database\Database;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Tests the installer with an existing settings file but no install profile.
+ *
+ * @group Installer
+ */
+class InstallerExistingSettingsMismatchProfileTest extends InstallerTestBase {
+
+  /**
+   * {@inheritdoc}
+   *
+   * Configures a preexisting settings.php file without an install_profile
+   * setting before invoking the interactive installer.
+   */
+  protected function setUp() {
+    // Pre-configure hash salt.
+    // Any string is valid, so simply use the class name of this test.
+    $this->settings['settings']['hash_salt'] = (object) [
+      'value' => __CLASS__,
+      'required' => TRUE,
+    ];
+
+    // Pre-configure database credentials.
+    $connection_info = Database::getConnectionInfo();
+    unset($connection_info['default']['pdo']);
+    unset($connection_info['default']['init_commands']);
+
+    $this->settings['databases']['default'] = (object) [
+      'value' => $connection_info,
+      'required' => TRUE,
+    ];
+
+    // During interactive install we'll change this to a different profile and
+    // this test will ensure that the new value is written to settings.php.
+    $this->settings['settings']['install_profile'] = (object) [
+      'value' => 'minimal',
+      'required' => TRUE,
+    ];
+
+    // Pre-configure config directories.
+    $this->settings['config_directories'] = [
+      CONFIG_SYNC_DIRECTORY => (object) [
+        'value' => DrupalKernel::findSitePath(Request::createFromGlobals()) . '/files/config_sync',
+        'required' => TRUE,
+      ],
+    ];
+    mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE);
+
+    parent::setUp();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function visitInstaller() {
+    // Provide profile and language in query string to skip these pages.
+    $this->drupalGet($GLOBALS['base_url'] . '/core/install.php?langcode=en&profile=testing');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpLanguage() {
+    // This step is skipped, because there is a lagcode as a query param.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpProfile() {
+    // This step is skipped, because there is a profile as a query param.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpSettings() {
+    // This step should not appear, since settings.php is fully configured
+    // already.
+  }
+
+  /**
+   * Verifies that installation succeeded.
+   */
+  public function testInstaller() {
+    $this->assertUrl('user/1');
+    $this->assertResponse(200);
+    $this->assertEqual('testing', \Drupal::installProfile());
+    $this->assertEqual('testing', Settings::get('install_profile'), 'Profile was correctly changed to testing in Settings.php');
+  }
+
+}
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsNoProfileTest.php b/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsNoProfileTest.php
index 84f861a75..3405cb598 100644
--- a/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsNoProfileTest.php
+++ b/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsNoProfileTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\system\Tests\Installer;
 
 use Drupal\Core\DrupalKernel;
-use Drupal\Core\Site\Settings;
 use Drupal\simpletest\InstallerTestBase;
 use Drupal\Core\Database\Database;
 use Symfony\Component\HttpFoundation\Request;
@@ -24,28 +23,28 @@ class InstallerExistingSettingsNoProfileTest extends InstallerTestBase {
   protected function setUp() {
     // Pre-configure hash salt.
     // Any string is valid, so simply use the class name of this test.
-    $this->settings['settings']['hash_salt'] = (object) array(
+    $this->settings['settings']['hash_salt'] = (object) [
       'value' => __CLASS__,
       'required' => TRUE,
-    );
+    ];
 
     // Pre-configure database credentials.
     $connection_info = Database::getConnectionInfo();
     unset($connection_info['default']['pdo']);
     unset($connection_info['default']['init_commands']);
 
-    $this->settings['databases']['default'] = (object) array(
+    $this->settings['databases']['default'] = (object) [
       'value' => $connection_info,
       'required' => TRUE,
-    );
+    ];
 
     // Pre-configure config directories.
-    $this->settings['config_directories'] = array(
-      CONFIG_SYNC_DIRECTORY => (object) array(
+    $this->settings['config_directories'] = [
+      CONFIG_SYNC_DIRECTORY => (object) [
         'value' => DrupalKernel::findSitePath(Request::createFromGlobals()) . '/files/config_sync',
         'required' => TRUE,
-      ),
-    );
+      ],
+    ];
     mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE);
 
     parent::setUp();
@@ -65,7 +64,7 @@ class InstallerExistingSettingsNoProfileTest extends InstallerTestBase {
   public function testInstaller() {
     $this->assertUrl('user/1');
     $this->assertResponse(200);
-    $this->assertEqual('testing', Settings::get('install_profile'));
+    $this->assertEqual('testing', \Drupal::installProfile());
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php b/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php
index 6ecd9fdf3..4f09b6b7c 100644
--- a/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php
+++ b/web/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\system\Tests\Installer;
 
+use Drupal\Core\Site\Settings;
 use Drupal\simpletest\InstallerTestBase;
 use Drupal\Core\Database\Database;
 use Drupal\Core\DrupalKernel;
@@ -23,38 +24,38 @@ class InstallerExistingSettingsTest extends InstallerTestBase {
   protected function setUp() {
     // Pre-configure hash salt.
     // Any string is valid, so simply use the class name of this test.
-    $this->settings['settings']['hash_salt'] = (object) array(
+    $this->settings['settings']['hash_salt'] = (object) [
       'value' => __CLASS__,
       'required' => TRUE,
-    );
+    ];
 
     // During interactive install we'll change this to a different profile and
     // this test will ensure that the new value is written to settings.php.
-    $this->settings['settings']['install_profile'] = (object) array(
+    $this->settings['settings']['install_profile'] = (object) [
       'value' => 'minimal',
       'required' => TRUE,
-    );
+    ];
 
     // Pre-configure database credentials.
     $connection_info = Database::getConnectionInfo();
     unset($connection_info['default']['pdo']);
     unset($connection_info['default']['init_commands']);
 
-    $this->settings['databases']['default'] = (object) array(
+    $this->settings['databases']['default'] = (object) [
       'value' => $connection_info,
       'required' => TRUE,
-    );
+    ];
 
     // Use the kernel to find the site path because the site.path service should
     // not be available at this point in the install process.
     $site_path = DrupalKernel::findSitePath(Request::createFromGlobals());
     // Pre-configure config directories.
-    $this->settings['config_directories'] = array(
-      CONFIG_SYNC_DIRECTORY => (object) array(
+    $this->settings['config_directories'] = [
+      CONFIG_SYNC_DIRECTORY => (object) [
         'value' => $site_path . '/files/config_sync',
         'required' => TRUE,
-      ),
-    );
+      ],
+    ];
     mkdir($this->settings['config_directories'][CONFIG_SYNC_DIRECTORY]->value, 0777, TRUE);
 
     parent::setUp();
@@ -74,7 +75,8 @@ class InstallerExistingSettingsTest extends InstallerTestBase {
   public function testInstaller() {
     $this->assertUrl('user/1');
     $this->assertResponse(200);
-    $this->assertEqual('testing', drupal_get_profile(), 'Profile was changed from minimal to testing during interactive install.');
+    $this->assertEqual('testing', \Drupal::installProfile(), 'Profile was changed from minimal to testing during interactive install.');
+    $this->assertEqual('testing', Settings::get('install_profile'), 'Profile was correctly changed to testing in Settings.php');
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerTest.php b/web/core/modules/system/src/Tests/Installer/InstallerTest.php
index 7a145f860..01422a5cb 100644
--- a/web/core/modules/system/src/Tests/Installer/InstallerTest.php
+++ b/web/core/modules/system/src/Tests/Installer/InstallerTest.php
@@ -22,9 +22,9 @@ class InstallerTest extends InstallerTestBase {
 
     // Verify that the confirmation message appears.
     require_once \Drupal::root() . '/core/includes/install.inc';
-    $this->assertRaw(t('Congratulations, you installed @drupal!', array(
+    $this->assertRaw(t('Congratulations, you installed @drupal!', [
       '@drupal' => drupal_install_profile_distribution_name(),
-    )));
+    ]));
   }
 
   /**
@@ -48,7 +48,7 @@ class InstallerTest extends InstallerTestBase {
   protected function setUpProfile() {
     // Assert that the expected title is present.
     $this->assertEqual('Select an installation profile', $this->cssSelect('main h2')[0]);
-    $result = $this->xpath('//span[contains(@class, :class) and contains(text(), :text)]', array(':class' => 'visually-hidden', ':text' => 'Select an installation profile'));
+    $result = $this->xpath('//span[contains(@class, :class) and contains(text(), :text)]', [':class' => 'visually-hidden', ':text' => 'Select an installation profile']);
     $this->assertEqual(count($result), 1, "Title/Label not displayed when '#title_display' => 'invisible' attribute is set");
 
     parent::setUpProfile();
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php b/web/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
index 84dfad3e9..a608cada7 100644
--- a/web/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
+++ b/web/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
@@ -116,10 +116,10 @@ ENDPO;
 
       // Activate a module, to make sure that config is not overridden by module
       // installation.
-      $edit = array(
-        'modules[Core][views][enable]' => TRUE,
-        'modules[Core][filter][enable]' => TRUE,
-      );
+      $edit = [
+        'modules[views][enable]' => TRUE,
+        'modules[filter][enable]' => TRUE,
+      ];
       $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
       // Verify the strings from the translation are still as expected.
@@ -149,7 +149,7 @@ ENDPO;
 
     foreach ($test_samples as $sample) {
       foreach ($langcodes as $langcode) {
-        $edit = array();
+        $edit = [];
         $edit['langcode'] = $langcode;
         $edit['translation'] = 'translated';
         $edit['string'] = $sample;
diff --git a/web/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php b/web/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
index fd6e0019b..7a803e700 100644
--- a/web/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
+++ b/web/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
@@ -84,11 +84,11 @@ class InstallerTranslationTest extends InstallerTestBase {
     $this->assertEqual($account->language()->getId(), 'de', 'New user is German.');
 
     // Ensure that we can enable basic_auth on a non-english site.
-    $this->drupalPostForm('admin/modules', array('modules[Web services][basic_auth][enable]' => TRUE), t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[basic_auth][enable]' => TRUE], t('Install'));
     $this->assertResponse(200);
 
     // Assert that the theme CSS was added to the page.
-    $edit = array('preprocess_css' => FALSE);
+    $edit = ['preprocess_css' => FALSE];
     $this->drupalPostForm('admin/config/development/performance', $edit, t('Save configuration'));
     $this->drupalGet('<front>');
     $this->assertRaw('classy/css/components/action-links.css');
@@ -96,7 +96,7 @@ class InstallerTranslationTest extends InstallerTestBase {
     // Verify the strings from the translation files were imported.
     $test_samples = ['Save and continue', 'Anonymous'];
     foreach ($test_samples as $sample) {
-      $edit = array();
+      $edit = [];
       $edit['langcode'] = 'de';
       $edit['translation'] = 'translated';
       $edit['string'] = $sample;
diff --git a/web/core/modules/system/src/Tests/Installer/MultipleDistributionsProfileTest.php b/web/core/modules/system/src/Tests/Installer/MultipleDistributionsProfileTest.php
new file mode 100644
index 000000000..171a0afc3
--- /dev/null
+++ b/web/core/modules/system/src/Tests/Installer/MultipleDistributionsProfileTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Drupal\system\Tests\Installer;
+
+use Drupal\Component\Serialization\Yaml;
+use Drupal\Core\Site\Settings;
+use Drupal\simpletest\InstallerTestBase;
+
+/**
+ * Tests multiple distribution profile support.
+ *
+ * @group Installer
+ */
+class MultipleDistributionsProfileTest extends InstallerTestBase {
+
+  /**
+   * The distribution profile info.
+   *
+   * @var array
+   */
+  protected $info;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    // Create two distributions.
+    foreach (['distribution_one', 'distribution_two'] as $name) {
+      $info = [
+        'type' => 'profile',
+        'core' => \Drupal::CORE_COMPATIBILITY,
+        'name' => $name . ' profile',
+        'distribution' => [
+          'name' => $name,
+          'install' => [
+            'theme' => 'bartik',
+          ],
+        ],
+      ];
+      // File API functions are not available yet.
+      $path = $this->siteDirectory . '/profiles/' . $name;
+      mkdir($path, 0777, TRUE);
+      file_put_contents("$path/$name.info.yml", Yaml::encode($info));
+    }
+    // Install the first distribution.
+    $this->profile = 'distribution_one';
+
+    parent::setUp();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpLanguage() {
+    // Verify that the distribution name appears.
+    $this->assertRaw('distribution_one');
+    // Verify that the requested theme is used.
+    $this->assertRaw('bartik');
+    // Verify that the "Choose profile" step does not appear.
+    $this->assertNoText('profile');
+
+    parent::setUpLanguage();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpProfile() {
+    // This step is skipped, because there is a distribution profile.
+  }
+
+  /**
+   * Confirms that the installation succeeded.
+   */
+  public function testInstalled() {
+    $this->assertUrl('user/1');
+    $this->assertResponse(200);
+    // Confirm that we are logged-in after installation.
+    $this->assertText($this->rootUser->getUsername());
+
+    // Confirm that Drupal recognizes this distribution as the current profile.
+    $this->assertEqual(\Drupal::installProfile(), 'distribution_one');
+    $this->assertEqual(Settings::get('install_profile'), 'distribution_one', 'The install profile has been written to settings.php.');
+    $this->assertEqual($this->config('core.extension')->get('profile'), 'distribution_one', 'The install profile has been written to core.extension configuration.');
+
+    $this->rebuildContainer();
+    $this->pass('Container can be rebuilt as distribution is written to configuration.');
+    $this->assertEqual(\Drupal::installProfile(), 'distribution_one');
+  }
+
+}
diff --git a/web/core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php b/web/core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php
index b54c4113b..91af34a2d 100644
--- a/web/core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php
+++ b/web/core/modules/system/src/Tests/Installer/SingleVisibleProfileTest.php
@@ -29,12 +29,12 @@ class SingleVisibleProfileTest extends InstallerTestBase {
   protected $info;
 
   protected function setUp() {
-    $this->info = array(
+    $this->info = [
       'type' => 'profile',
       'core' => \Drupal::CORE_COMPATIBILITY,
       'name' => 'Override standard',
       'hidden' => TRUE,
-    );
+    ];
     // File API functions are not available yet.
     $path = $this->siteDirectory . '/profiles/standard';
     mkdir($path, 0777, TRUE);
diff --git a/web/core/modules/system/src/Tests/Installer/SiteNameTest.php b/web/core/modules/system/src/Tests/Installer/SiteNameTest.php
index ec4c0e136..081dfb16a 100644
--- a/web/core/modules/system/src/Tests/Installer/SiteNameTest.php
+++ b/web/core/modules/system/src/Tests/Installer/SiteNameTest.php
@@ -31,7 +31,7 @@ class SiteNameTest extends WebTestBase {
   /**
    * Tests that the desired site name appears on the page after installation.
    */
-  function testSiteName() {
+  public function testSiteName() {
     $this->drupalGet('');
     $this->assertRaw($this->siteName, 'The site name that was set during the installation appears on the front page after installation.');
   }
diff --git a/web/core/modules/system/src/Tests/Installer/StandardInstallerTest.php b/web/core/modules/system/src/Tests/Installer/StandardInstallerTest.php
index 61e7c84db..b0ceef942 100644
--- a/web/core/modules/system/src/Tests/Installer/StandardInstallerTest.php
+++ b/web/core/modules/system/src/Tests/Installer/StandardInstallerTest.php
@@ -20,9 +20,9 @@ class StandardInstallerTest extends ConfigAfterInstallerTestBase {
   public function testInstaller() {
     // Verify that the confirmation message appears.
     require_once \Drupal::root() . '/core/includes/install.inc';
-    $this->assertRaw(t('Congratulations, you installed @drupal!', array(
+    $this->assertRaw(t('Congratulations, you installed @drupal!', [
       '@drupal' => drupal_install_profile_distribution_name(),
-    )));
+    ]));
   }
 
   /**
diff --git a/web/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php b/web/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php
index f9c35eec3..a18f45cd3 100644
--- a/web/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php
+++ b/web/core/modules/system/src/Tests/Menu/AssertBreadcrumbTrait.php
@@ -32,7 +32,7 @@ trait AssertBreadcrumbTrait {
    *   (optional) Whether the last link in $tree is expected to be active (TRUE)
    *   or just to be in the active trail (FALSE).
    */
-  protected function assertBreadcrumb($goto, array $trail, $page_title = NULL, array $tree = array(), $last_active = TRUE) {
+  protected function assertBreadcrumb($goto, array $trail, $page_title = NULL, array $tree = [], $last_active = TRUE) {
     if (isset($goto)) {
       $this->drupalGet($goto);
     }
@@ -40,7 +40,7 @@ trait AssertBreadcrumbTrait {
 
     // Additionally assert page title, if given.
     if (isset($page_title)) {
-      $this->assertTitle(strtr('@title | Drupal', array('@title' => $page_title)));
+      $this->assertTitle(strtr('@title | Drupal', ['@title' => $page_title]));
     }
 
     // Additionally assert active trail in a menu tree output, if given.
@@ -84,25 +84,25 @@ trait AssertBreadcrumbTrait {
     // No parts must be left, or an expected "Home" will always pass.
     $pass = ($pass && empty($parts));
 
-    $this->assertTrue($pass, format_string('Breadcrumb %parts found on @path.', array(
+    $this->assertTrue($pass, format_string('Breadcrumb %parts found on @path.', [
       '%parts' => implode(' » ', $trail),
       '@path' => $this->getUrl(),
-    )));
+    ]));
   }
 
   /**
    * Returns the breadcrumb contents of the current page in the internal browser.
    */
   protected function getBreadcrumbParts() {
-    $parts = array();
+    $parts = [];
     $elements = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
     if (!empty($elements)) {
       foreach ($elements as $element) {
-        $parts[] = array(
+        $parts[] = [
           'text' => (string) $element,
           'href' => (string) $element['href'],
           'title' => (string) $element['title'],
-        );
+        ];
       }
     }
     return $parts;
diff --git a/web/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php b/web/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php
index 4313b4cf2..05e0268c2 100644
--- a/web/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php
+++ b/web/core/modules/system/src/Tests/Menu/AssertMenuActiveTrailTrait.php
@@ -30,11 +30,11 @@ trait AssertMenuActiveTrailTrait {
       foreach ($tree as $link_path => $link_title) {
         $part_xpath = (!$i ? '//' : '/following-sibling::ul/descendant::');
         $part_xpath .= 'li[contains(@class, :class)]/a[contains(@href, :href) and contains(text(), :title)]';
-        $part_args = array(
+        $part_args = [
           ':class' => 'menu-item--active-trail',
           ':href' => Url::fromUri('base:' . $link_path)->toString(),
           ':title' => $link_title,
-        );
+        ];
         $xpath .= $this->buildXPathQuery($part_xpath, $part_args);
         $i++;
       }
@@ -49,17 +49,17 @@ trait AssertMenuActiveTrailTrait {
     }
     $xpath_last_active = ($last_active ? 'and contains(@class, :class-active)' : '');
     $xpath .= 'li[contains(@class, :class-trail)]/a[contains(@href, :href) ' . $xpath_last_active . 'and contains(text(), :title)]';
-    $args = array(
+    $args = [
       ':class-trail' => 'menu-item--active-trail',
       ':class-active' => 'is-active',
       ':href' => Url::fromUri('base:' . $active_link_path)->toString(),
       ':title' => $active_link_title,
-    );
+    ];
     $elements = $this->xpath($xpath, $args);
-    $this->assertTrue(!empty($elements), format_string('Active link %title was found in menu tree, including active trail links %tree.', array(
+    $this->assertTrue(!empty($elements), format_string('Active link %title was found in menu tree, including active trail links %tree.', [
       '%title' => $active_link_title,
       '%tree' => implode(' » ', $tree),
-    )));
+    ]));
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Menu/BreadcrumbTest.php b/web/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
index f756300e3..64c8c1597 100644
--- a/web/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
+++ b/web/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
@@ -18,7 +18,7 @@ class BreadcrumbTest extends MenuTestBase {
    *
    * @var array
    */
-  public static $modules = array('menu_test', 'block');
+  public static $modules = ['menu_test', 'block'];
 
   /**
    * An administrative user.
@@ -49,96 +49,96 @@ class BreadcrumbTest extends MenuTestBase {
     // This test puts menu links in the Tools menu and then tests for their
     // presence on the page, so we need to ensure that the Tools block will be
     // displayed in the admin theme.
-    $this->drupalPlaceBlock('system_menu_block:tools', array(
+    $this->drupalPlaceBlock('system_menu_block:tools', [
       'region' => 'content',
       'theme' => $this->config('system.theme')->get('admin'),
-    ));
+    ]);
   }
 
   /**
    * Tests breadcrumbs on node and administrative paths.
    */
-  function testBreadCrumbs() {
+  public function testBreadCrumbs() {
     // Prepare common base breadcrumb elements.
-    $home = array('' => 'Home');
-    $admin = $home + array('admin' => t('Administration'));
-    $config = $admin + array('admin/config' => t('Configuration'));
+    $home = ['' => 'Home'];
+    $admin = $home + ['admin' => t('Administration')];
+    $config = $admin + ['admin/config' => t('Configuration')];
     $type = 'article';
 
     // Verify Taxonomy administration breadcrumbs.
-    $trail = $admin + array(
+    $trail = $admin + [
       'admin/structure' => t('Structure'),
-    );
+    ];
     $this->assertBreadcrumb('admin/structure/taxonomy', $trail);
 
-    $trail += array(
+    $trail += [
       'admin/structure/taxonomy' => t('Taxonomy'),
-    );
+    ];
     $this->assertBreadcrumb('admin/structure/taxonomy/manage/tags', $trail);
-    $trail += array(
+    $trail += [
       'admin/structure/taxonomy/manage/tags' => t('Tags'),
-    );
+    ];
     $this->assertBreadcrumb('admin/structure/taxonomy/manage/tags/overview', $trail);
     $this->assertBreadcrumb('admin/structure/taxonomy/manage/tags/add', $trail);
 
     // Verify Menu administration breadcrumbs.
-    $trail = $admin + array(
+    $trail = $admin + [
       'admin/structure' => t('Structure'),
-    );
+    ];
     $this->assertBreadcrumb('admin/structure/menu', $trail);
 
-    $trail += array(
+    $trail += [
       'admin/structure/menu' => t('Menus'),
-    );
+    ];
     $this->assertBreadcrumb('admin/structure/menu/manage/tools', $trail);
 
-    $trail += array(
+    $trail += [
       'admin/structure/menu/manage/tools' => t('Tools'),
-    );
+    ];
     $this->assertBreadcrumb("admin/structure/menu/link/node.add_page/edit", $trail);
     $this->assertBreadcrumb('admin/structure/menu/manage/tools/add', $trail);
 
     // Verify Node administration breadcrumbs.
-    $trail = $admin + array(
+    $trail = $admin + [
       'admin/structure' => t('Structure'),
       'admin/structure/types' => t('Content types'),
-    );
+    ];
     $this->assertBreadcrumb('admin/structure/types/add', $trail);
     $this->assertBreadcrumb("admin/structure/types/manage/$type", $trail);
-    $trail += array(
+    $trail += [
       "admin/structure/types/manage/$type" => t('Article'),
-    );
+    ];
     $this->assertBreadcrumb("admin/structure/types/manage/$type/fields", $trail);
     $this->assertBreadcrumb("admin/structure/types/manage/$type/display", $trail);
-    $trail_teaser = $trail + array(
+    $trail_teaser = $trail + [
       "admin/structure/types/manage/$type/display" => t('Manage display'),
-    );
+    ];
     $this->assertBreadcrumb("admin/structure/types/manage/$type/display/teaser", $trail_teaser);
     $this->assertBreadcrumb("admin/structure/types/manage/$type/delete", $trail);
-    $trail += array(
+    $trail += [
       "admin/structure/types/manage/$type/fields" => t('Manage fields'),
-    );
+    ];
     $this->assertBreadcrumb("admin/structure/types/manage/$type/fields/node.$type.body", $trail);
 
     // Verify Filter text format administration breadcrumbs.
     $filter_formats = filter_formats();
     $format = reset($filter_formats);
     $format_id = $format->id();
-    $trail = $config + array(
+    $trail = $config + [
       'admin/config/content' => t('Content authoring'),
-    );
+    ];
     $this->assertBreadcrumb('admin/config/content/formats', $trail);
 
-    $trail += array(
+    $trail += [
       'admin/config/content/formats' => t('Text formats and editors'),
-    );
+    ];
     $this->assertBreadcrumb('admin/config/content/formats/add', $trail);
     $this->assertBreadcrumb("admin/config/content/formats/manage/$format_id", $trail);
     // @todo Remove this part once we have a _title_callback, see
     //   https://www.drupal.org/node/2076085.
-    $trail += array(
+    $trail += [
       "admin/config/content/formats/manage/$format_id" => $format->label(),
-    );
+    ];
     $this->assertBreadcrumb("admin/config/content/formats/manage/$format_id/disable", $trail);
 
     // Verify node breadcrumbs (without menu link).
@@ -151,13 +151,13 @@ class BreadcrumbTest extends MenuTestBase {
     // Also verify that the node does not appear elsewhere (e.g., menu trees).
     $this->assertNoLink($node1->getTitle());
 
-    $trail += array(
+    $trail += [
       "node/$nid1" => $node1->getTitle(),
-    );
+    ];
     $this->assertBreadcrumb("node/$nid1/edit", $trail);
 
     // Verify that breadcrumb on node listing page contains "Home" only.
-    $trail = array();
+    $trail = [];
     $this->assertBreadcrumb('node', $trail);
 
     // Verify node breadcrumbs (in menu).
@@ -165,7 +165,7 @@ class BreadcrumbTest extends MenuTestBase {
     // latter is a preferred menu by default.
     // @todo Also test all themes? Manually testing led to the suspicion that
     //   breadcrumbs may differ, possibly due to theme overrides.
-    $menus = array('main', 'tools');
+    $menus = ['main', 'tools'];
     // Alter node type menu settings.
     $node_type = NodeType::load($type);
     $node_type->setThirdPartySetting('menu_ui', 'available_menus', $menus);
@@ -175,17 +175,17 @@ class BreadcrumbTest extends MenuTestBase {
     foreach ($menus as $menu) {
       // Create a parent node in the current menu.
       $title = $this->randomMachineName();
-      $node2 = $this->drupalCreateNode(array(
+      $node2 = $this->drupalCreateNode([
         'type' => $type,
         'title' => $title,
-        'menu' => array(
+        'menu' => [
           'enabled' => 1,
           'title' => 'Parent ' . $title,
           'description' => '',
           'menu_name' => $menu,
           'parent' => '',
-        ),
-      ));
+        ],
+      ]);
 
       if ($menu == 'tools') {
         $parent = $node2;
@@ -195,38 +195,38 @@ class BreadcrumbTest extends MenuTestBase {
     // Create a Tools menu link for 'node', move the last parent node menu
     // link below it, and verify a full breadcrumb for the last child node.
     $menu = 'tools';
-    $edit = array(
+    $edit = [
       'title[0][value]' => 'Root',
       'link[0][uri]' => '/node',
-    );
+    ];
     $this->drupalPostForm("admin/structure/menu/manage/$menu/add", $edit, t('Save'));
-    $menu_links = entity_load_multiple_by_properties('menu_link_content', array('title' => 'Root'));
+    $menu_links = entity_load_multiple_by_properties('menu_link_content', ['title' => 'Root']);
     $link = reset($menu_links);
 
-    $edit = array(
+    $edit = [
       'menu[menu_parent]' => $link->getMenuName() . ':' . $link->getPluginId(),
-    );
+    ];
     $this->drupalPostForm('node/' . $parent->id() . '/edit', $edit, t('Save and keep published'));
-    $expected = array(
+    $expected = [
       "node" => $link->getTitle(),
-    );
+    ];
     $trail = $home + $expected;
-    $tree = $expected + array(
+    $tree = $expected + [
       'node/' . $parent->id() => $parent->menu['title'],
-    );
-    $trail += array(
+    ];
+    $trail += [
       'node/' . $parent->id() => $parent->menu['title'],
-    );
+    ];
 
     // Add a taxonomy term/tag to last node, and add a link for that term to the
     // Tools menu.
-    $tags = array(
-      'Drupal' => array(),
-      'Breadcrumbs' => array(),
-    );
-    $edit = array(
+    $tags = [
+      'Drupal' => [],
+      'Breadcrumbs' => [],
+    ];
+    $edit = [
       'field_tags[target_id]' => implode(',', array_keys($tags)),
-    );
+    ];
     $this->drupalPostForm('node/' . $parent->id() . '/edit', $edit, t('Save and keep published'));
 
     // Put both terms into a hierarchy Drupal » Breadcrumbs. Required for both
@@ -234,13 +234,13 @@ class BreadcrumbTest extends MenuTestBase {
     // the breadcrumb based on taxonomy term hierarchy.
     $parent_tid = 0;
     foreach ($tags as $name => $null) {
-      $terms = entity_load_multiple_by_properties('taxonomy_term', array('name' => $name));
+      $terms = entity_load_multiple_by_properties('taxonomy_term', ['name' => $name]);
       $term = reset($terms);
       $tags[$name]['term'] = $term;
       if ($parent_tid) {
-        $edit = array(
-          'parent[]' => array($parent_tid),
-        );
+        $edit = [
+          'parent[]' => [$parent_tid],
+        ];
         $this->drupalPostForm("taxonomy/term/{$term->id()}/edit", $edit, t('Save'));
       }
       $parent_tid = $term->id();
@@ -248,24 +248,24 @@ class BreadcrumbTest extends MenuTestBase {
     $parent_mlid = '';
     foreach ($tags as $name => $data) {
       $term = $data['term'];
-      $edit = array(
+      $edit = [
         'title[0][value]' => "$name link",
         'link[0][uri]' => "/taxonomy/term/{$term->id()}",
         'menu_parent' => "$menu:{$parent_mlid}",
         'enabled[value]' => 1,
-      );
+      ];
       $this->drupalPostForm("admin/structure/menu/manage/$menu/add", $edit, t('Save'));
-      $menu_links = entity_load_multiple_by_properties('menu_link_content', array(
+      $menu_links = entity_load_multiple_by_properties('menu_link_content', [
         'title' => $edit['title[0][value]'],
         'link.uri' => 'internal:/taxonomy/term/' . $term->id(),
-      ));
+      ]);
       $tags[$name]['link'] = reset($menu_links);
       $parent_mlid = $tags[$name]['link']->getPluginId();
     }
 
     // Verify expected breadcrumbs for menu links.
     $trail = $home;
-    $tree = array();
+    $tree = [];
     // Logout the user because we want to check the active class as well, which
     // is just rendered as anonymous user.
     $this->drupalLogout();
@@ -275,9 +275,9 @@ class BreadcrumbTest extends MenuTestBase {
       $link = $data['link'];
 
       $link_path = $link->getUrlObject()->getInternalPath();
-      $tree += array(
+      $tree += [
         $link_path => $link->getTitle(),
-      );
+      ];
       $this->assertBreadcrumb($link_path, $trail, $term->getName(), $tree);
       $this->assertEscaped($parent->getTitle(), 'Tagged node found.');
 
@@ -285,28 +285,28 @@ class BreadcrumbTest extends MenuTestBase {
       // untranslated menu links automatically generated from menu router items
       // ('taxonomy/term/%') should never be translated and appear in any menu
       // other than the breadcrumb trail.
-      $elements = $this->xpath('//nav[@id=:menu]/descendant::a[@href=:href]', array(
+      $elements = $this->xpath('//nav[@id=:menu]/descendant::a[@href=:href]', [
         ':menu' => 'block-bartik-tools',
         ':href' => Url::fromUri('base:' . $link_path)->toString(),
-      ));
+      ]);
       $this->assertTrue(count($elements) == 1, "Link to {$link_path} appears only once.");
 
       // Next iteration should expect this tag as parent link.
       // Note: Term name, not link name, due to taxonomy_term_page().
-      $trail += array(
+      $trail += [
         $link_path => $term->getName(),
-      );
+      ];
     }
 
     // Verify breadcrumbs on user and user/%.
     // We need to log back in and out below, and cannot simply grant the
     // 'administer users' permission, since user_page() makes your head explode.
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array(
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, [
       'access user profiles',
-    ));
+    ]);
 
     // Verify breadcrumb on front page.
-    $this->assertBreadcrumb('<front>', array());
+    $this->assertBreadcrumb('<front>', []);
 
     // Verify breadcrumb on user pages (without menu link) for anonymous user.
     $trail = $home;
@@ -318,39 +318,39 @@ class BreadcrumbTest extends MenuTestBase {
     $trail = $home;
     $this->assertBreadcrumb('user', $trail, $this->adminUser->getUsername());
     $this->assertBreadcrumb('user/' . $this->adminUser->id(), $trail, $this->adminUser->getUsername());
-    $trail += array(
+    $trail += [
       'user/' . $this->adminUser->id() => $this->adminUser->getUsername(),
-    );
+    ];
     $this->assertBreadcrumb('user/' . $this->adminUser->id() . '/edit', $trail, $this->adminUser->getUsername());
 
     // Create a second user to verify breadcrumb on user pages again.
-    $this->webUser = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser([
       'administer users',
       'access user profiles',
-    ));
+    ]);
     $this->drupalLogin($this->webUser);
 
     // Verify correct breadcrumb and page title on another user's account pages.
     $trail = $home;
     $this->assertBreadcrumb('user/' . $this->adminUser->id(), $trail, $this->adminUser->getUsername());
-    $trail += array(
+    $trail += [
       'user/' . $this->adminUser->id() => $this->adminUser->getUsername(),
-    );
+    ];
     $this->assertBreadcrumb('user/' . $this->adminUser->id() . '/edit', $trail, $this->adminUser->getUsername());
 
     // Verify correct breadcrumb and page title when viewing own user account.
     $trail = $home;
     $this->assertBreadcrumb('user/' . $this->webUser->id(), $trail, $this->webUser->getUsername());
-    $trail += array(
+    $trail += [
       'user/' . $this->webUser->id() => $this->webUser->getUsername(),
-    );
+    ];
     $this->assertBreadcrumb('user/' . $this->webUser->id() . '/edit', $trail, $this->webUser->getUsername());
 
     // Create an only slightly privileged user being able to access site reports
     // but not administration pages.
-    $this->webUser = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser([
       'access site reports',
-    ));
+    ]);
     $this->drupalLogin($this->webUser);
 
     // Verify that we can access recent log entries, there is a corresponding
@@ -366,7 +366,7 @@ class BreadcrumbTest extends MenuTestBase {
     $this->assertNoResponse(403);
 
     // Since the Reports page is accessible, that will show.
-    $trail += array('admin/reports' => t('Reports'));
+    $trail += ['admin/reports' => t('Reports')];
     $this->assertBreadcrumb('admin/reports/dblog', $trail, t('Recent log messages'));
     $this->assertNoResponse(403);
 
diff --git a/web/core/modules/system/src/Tests/Menu/LocalActionTest.php b/web/core/modules/system/src/Tests/Menu/LocalActionTest.php
index 40dc744fb..3886cb809 100644
--- a/web/core/modules/system/src/Tests/Menu/LocalActionTest.php
+++ b/web/core/modules/system/src/Tests/Menu/LocalActionTest.php
@@ -68,9 +68,9 @@ class LocalActionTest extends WebTestBase {
    *   A list of expected action link titles, keyed by the hrefs.
    */
   protected function assertLocalAction(array $actions) {
-    $elements = $this->xpath('//a[contains(@class, :class)]', array(
+    $elements = $this->xpath('//a[contains(@class, :class)]', [
       ':class' => 'button-action',
-    ));
+    ]);
     $index = 0;
     foreach ($actions as $action) {
       /** @var \Drupal\Core\Url $url */
diff --git a/web/core/modules/system/src/Tests/Menu/LocalTasksTest.php b/web/core/modules/system/src/Tests/Menu/LocalTasksTest.php
index 522e12b28..7171d3e54 100644
--- a/web/core/modules/system/src/Tests/Menu/LocalTasksTest.php
+++ b/web/core/modules/system/src/Tests/Menu/LocalTasksTest.php
@@ -48,19 +48,19 @@ class LocalTasksTest extends WebTestBase {
    *   secondary. Defaults to 0.
    */
   protected function assertLocalTasks(array $routes, $level = 0) {
-    $elements = $this->xpath('//*[contains(@class, :class)]//a', array(
+    $elements = $this->xpath('//*[contains(@class, :class)]//a', [
       ':class' => $level == 0 ? 'tabs primary' : 'tabs secondary',
-    ));
+    ]);
     $this->assertTrue(count($elements), 'Local tasks found.');
     foreach ($routes as $index => $route_info) {
       list($route_name, $route_parameters) = $route_info;
       $expected = Url::fromRoute($route_name, $route_parameters)->toString();
       $method = ($elements[$index]['href'] == $expected ? 'pass' : 'fail');
-      $this->{$method}(format_string('Task @number href @value equals @expected.', array(
+      $this->{$method}(format_string('Task @number href @value equals @expected.', [
         '@number' => $index + 1,
         '@value' => (string) $elements[$index]['href'],
         '@expected' => $expected,
-      )));
+      ]));
     }
   }
 
@@ -89,9 +89,9 @@ class LocalTasksTest extends WebTestBase {
    *   secondary. Defaults to 0.
    */
   protected function assertNoLocalTasks($level = 0) {
-    $elements = $this->xpath('//*[contains(@class, :class)]//a', array(
+    $elements = $this->xpath('//*[contains(@class, :class)]//a', [
       ':class' => $level == 0 ? 'tabs primary' : 'tabs secondary',
-    ));
+    ]);
     $this->assertFalse(count($elements), 'Local tasks not found.');
   }
 
@@ -176,7 +176,7 @@ class LocalTasksTest extends WebTestBase {
 
     // Test that we we correctly apply the active class to tabs where one of the
     // request attributes is upcast to an entity object.
-    $entity = \Drupal::entityManager()->getStorage('entity_test')->create(array('bundle' => 'test'));
+    $entity = \Drupal::entityManager()->getStorage('entity_test')->create(['bundle' => 'test']);
     $entity->save();
 
     $this->drupalGet(Url::fromRoute('menu_test.local_task_test_upcasting_sub1', ['entity_test' => '1']));
diff --git a/web/core/modules/system/src/Tests/Menu/MenuRouterTest.php b/web/core/modules/system/src/Tests/Menu/MenuRouterTest.php
index e7328d927..521a69153 100644
--- a/web/core/modules/system/src/Tests/Menu/MenuRouterTest.php
+++ b/web/core/modules/system/src/Tests/Menu/MenuRouterTest.php
@@ -82,7 +82,7 @@ class MenuRouterTest extends WebTestBase {
   protected function doTestTitleCallbackFalse() {
     $this->drupalGet('test-page');
     $this->assertText('A title with @placeholder', 'Raw text found on the page');
-    $this->assertNoText(t('A title with @placeholder', array('@placeholder' => 'some other text')), 'Text with placeholder substitutions not found.');
+    $this->assertNoText(t('A title with @placeholder', ['@placeholder' => 'some other text']), 'Text with placeholder substitutions not found.');
   }
 
   /**
@@ -110,7 +110,7 @@ class MenuRouterTest extends WebTestBase {
    * Tests for menu_name parameter for default menu links.
    */
   protected function doTestMenuName() {
-    $admin_user = $this->drupalCreateUser(array('administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($admin_user);
     /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
     $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
@@ -179,7 +179,7 @@ class MenuRouterTest extends WebTestBase {
    * Tests a menu on a router page.
    */
   protected function doTestMenuOnRoute() {
-    \Drupal::service('module_installer')->install(array('router_test'));
+    \Drupal::service('module_installer')->install(['router_test']);
     \Drupal::service('router.builder')->rebuild();
     $this->resetAll();
 
@@ -210,7 +210,7 @@ class MenuRouterTest extends WebTestBase {
   public function testMaintenanceModeLoginPaths() {
     $this->container->get('state')->set('system.maintenance_mode', TRUE);
 
-    $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => $this->config('system.site')->get('name')));
+    $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', ['@site' => $this->config('system.site')->get('name')]);
     $this->drupalGet('test-page');
     $this->assertText($offline_message);
     $this->drupalGet('menu_login_callback');
@@ -224,7 +224,7 @@ class MenuRouterTest extends WebTestBase {
    * 'user' and 'user/register' gets redirected to the user edit page.
    */
   public function testAuthUserUserLogin() {
-    $web_user = $this->drupalCreateUser(array());
+    $web_user = $this->drupalCreateUser([]);
     $this->drupalLogin($web_user);
 
     $this->drupalGet('user/login');
@@ -282,7 +282,7 @@ class MenuRouterTest extends WebTestBase {
     $this->assertRaw('bartik/css/base/elements.css', "The maintenance theme's CSS appears on the page.");
 
     // An administrator, however, should continue to see the requested theme.
-    $admin_user = $this->drupalCreateUser(array('access site in maintenance mode'));
+    $admin_user = $this->drupalCreateUser(['access site in maintenance mode']);
     $this->drupalLogin($admin_user);
     $this->drupalGet('menu-test/theme-callback/use-admin-theme');
     $this->assertText('Active theme: seven. Actual theme: seven.', 'The theme negotiation system is correctly triggered for an administrator when the site is in maintenance mode.');
@@ -302,13 +302,13 @@ class MenuRouterTest extends WebTestBase {
 
     // Now install the theme and request it again.
     $theme_handler = $this->container->get('theme_handler');
-    $theme_handler->install(array('test_theme'));
+    $theme_handler->install(['test_theme']);
 
     $this->drupalGet('menu-test/theme-callback/use-test-theme');
     $this->assertText('Active theme: test_theme. Actual theme: test_theme.', 'The theme negotiation system uses an optional theme once it has been installed.');
     $this->assertRaw('test_theme/kitten.css', "The optional theme's CSS appears on the page.");
 
-    $theme_handler->uninstall(array('test_theme'));
+    $theme_handler->uninstall(['test_theme']);
   }
 
   /**
diff --git a/web/core/modules/system/src/Tests/Module/DependencyTest.php b/web/core/modules/system/src/Tests/Module/DependencyTest.php
index 8b219b27b..dc00c27ae 100644
--- a/web/core/modules/system/src/Tests/Module/DependencyTest.php
+++ b/web/core/modules/system/src/Tests/Module/DependencyTest.php
@@ -12,37 +12,37 @@ class DependencyTest extends ModuleTestBase {
   /**
    * Checks functionality of project namespaces for dependencies.
    */
-  function testProjectNamespaceForDependencies() {
-    $edit = array(
-      'modules[Core][filter][enable]' => TRUE,
-    );
+  public function testProjectNamespaceForDependencies() {
+    $edit = [
+      'modules[filter][enable]' => TRUE,
+    ];
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
     // Enable module with project namespace to ensure nothing breaks.
-    $edit = array(
-      'modules[Testing][system_project_namespace_test][enable]' => TRUE,
-    );
+    $edit = [
+      'modules[system_project_namespace_test][enable]' => TRUE,
+    ];
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
-    $this->assertModules(array('system_project_namespace_test'), TRUE);
+    $this->assertModules(['system_project_namespace_test'], TRUE);
   }
 
   /**
    * Attempts to enable the Content Translation module without Language enabled.
    */
-  function testEnableWithoutDependency() {
+  public function testEnableWithoutDependency() {
     // Attempt to enable Content Translation without Language enabled.
-    $edit = array();
-    $edit['modules[Multilingual][content_translation][enable]'] = 'content_translation';
+    $edit = [];
+    $edit['modules[content_translation][enable]'] = 'content_translation';
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->assertText(t('Some required modules must be enabled'), 'Dependency required.');
 
-    $this->assertModules(array('content_translation', 'language'), FALSE);
+    $this->assertModules(['content_translation', 'language'], FALSE);
 
     // Assert that the language tables weren't enabled.
     $this->assertTableCount('language', FALSE);
 
     $this->drupalPostForm(NULL, NULL, t('Continue'));
     $this->assertText(t('2 modules have been enabled: Content Translation, Language.'), 'Modules status has been updated.');
-    $this->assertModules(array('content_translation', 'language'), TRUE);
+    $this->assertModules(['content_translation', 'language'], TRUE);
 
     // Assert that the language YAML files were created.
     $storage = $this->container->get('config.storage');
@@ -52,67 +52,67 @@ class DependencyTest extends ModuleTestBase {
   /**
    * Attempts to enable a module with a missing dependency.
    */
-  function testMissingModules() {
+  public function testMissingModules() {
     // Test that the system_dependencies_test module is marked
     // as missing a dependency.
     $this->drupalGet('admin/modules');
-    $this->assertRaw(t('@module (<span class="admin-missing">missing</span>)', array('@module' => Unicode::ucfirst('_missing_dependency'))), 'A module with missing dependencies is marked as such.');
-    $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Testing][system_dependencies_test][enable]"]');
+    $this->assertRaw(t('@module (<span class="admin-missing">missing</span>)', ['@module' => Unicode::ucfirst('_missing_dependency')]), 'A module with missing dependencies is marked as such.');
+    $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[system_dependencies_test][enable]"]');
     $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
   }
 
   /**
    * Tests enabling a module that depends on an incompatible version of a module.
    */
-  function testIncompatibleModuleVersionDependency() {
+  public function testIncompatibleModuleVersionDependency() {
     // Test that the system_incompatible_module_version_dependencies_test is
     // marked as having an incompatible dependency.
     $this->drupalGet('admin/modules');
-    $this->assertRaw(t('@module (<span class="admin-missing">incompatible with</span> version @version)', array(
+    $this->assertRaw(t('@module (<span class="admin-missing">incompatible with</span> version @version)', [
       '@module' => 'System incompatible module version test (>2.0)',
       '@version' => '1.0',
-    )), 'A module that depends on an incompatible version of a module is marked as such.');
-    $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Testing][system_incompatible_module_version_dependencies_test][enable]"]');
+    ]), 'A module that depends on an incompatible version of a module is marked as such.');
+    $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[system_incompatible_module_version_dependencies_test][enable]"]');
     $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
   }
 
   /**
    * Tests enabling a module that depends on a module with an incompatible core version.
    */
-  function testIncompatibleCoreVersionDependency() {
+  public function testIncompatibleCoreVersionDependency() {
     // Test that the system_incompatible_core_version_dependencies_test is
     // marked as having an incompatible dependency.
     $this->drupalGet('admin/modules');
-    $this->assertRaw(t('@module (<span class="admin-missing">incompatible with</span> this version of Drupal core)', array(
+    $this->assertRaw(t('@module (<span class="admin-missing">incompatible with</span> this version of Drupal core)', [
       '@module' => 'System incompatible core version test',
-    )), 'A module that depends on a module with an incompatible core version is marked as such.');
-    $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[Testing][system_incompatible_core_version_dependencies_test][enable]"]');
+    ]), 'A module that depends on a module with an incompatible core version is marked as such.');
+    $checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[system_incompatible_core_version_dependencies_test][enable]"]');
     $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
   }
 
   /**
    * Tests enabling a module that depends on a module which fails hook_requirements().
    */
-  function testEnableRequirementsFailureDependency() {
-    \Drupal::service('module_installer')->install(array('comment'));
+  public function testEnableRequirementsFailureDependency() {
+    \Drupal::service('module_installer')->install(['comment']);
 
-    $this->assertModules(array('requirements1_test'), FALSE);
-    $this->assertModules(array('requirements2_test'), FALSE);
+    $this->assertModules(['requirements1_test'], FALSE);
+    $this->assertModules(['requirements2_test'], FALSE);
 
     // Attempt to install both modules at the same time.
-    $edit = array();
-    $edit['modules[Testing][requirements1_test][enable]'] = 'requirements1_test';
-    $edit['modules[Testing][requirements2_test][enable]'] = 'requirements2_test';
+    $edit = [];
+    $edit['modules[requirements1_test][enable]'] = 'requirements1_test';
+    $edit['modules[requirements2_test][enable]'] = 'requirements2_test';
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Makes sure the modules were NOT installed.
     $this->assertText(t('Requirements 1 Test failed requirements'), 'Modules status has been updated.');
-    $this->assertModules(array('requirements1_test'), FALSE);
-    $this->assertModules(array('requirements2_test'), FALSE);
+    $this->assertModules(['requirements1_test'], FALSE);
+    $this->assertModules(['requirements2_test'], FALSE);
 
     // Makes sure that already enabled modules the failing modules depend on
     // were not disabled.
-    $this->assertModules(array('comment'), TRUE);
+    $this->assertModules(['comment'], TRUE);
   }
 
   /**
@@ -120,45 +120,45 @@ class DependencyTest extends ModuleTestBase {
    *
    * Dependencies should be enabled before their dependents.
    */
-  function testModuleEnableOrder() {
-    \Drupal::service('module_installer')->install(array('module_test'), FALSE);
+  public function testModuleEnableOrder() {
+    \Drupal::service('module_installer')->install(['module_test'], FALSE);
     $this->resetAll();
-    $this->assertModules(array('module_test'), TRUE);
+    $this->assertModules(['module_test'], TRUE);
     \Drupal::state()->set('module_test.dependency', 'dependency');
     // module_test creates a dependency chain:
     // - color depends on config
     // - config depends on help
-    $expected_order = array('help', 'config', 'color');
+    $expected_order = ['help', 'config', 'color'];
 
     // Enable the modules through the UI, verifying that the dependency chain
     // is correct.
-    $edit = array();
-    $edit['modules[Core][color][enable]'] = 'color';
+    $edit = [];
+    $edit['modules[color][enable]'] = 'color';
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
-    $this->assertModules(array('color'), FALSE);
+    $this->assertModules(['color'], FALSE);
     // Note that dependencies are sorted alphabetically in the confirmation
     // message.
     $this->assertText(t('You must enable the Configuration Manager, Help modules to install Color.'));
 
-    $edit['modules[Core][config][enable]'] = 'config';
-    $edit['modules[Core][help][enable]'] = 'help';
+    $edit['modules[config][enable]'] = 'config';
+    $edit['modules[help][enable]'] = 'help';
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
-    $this->assertModules(array('color', 'config', 'help'), TRUE);
+    $this->assertModules(['color', 'config', 'help'], TRUE);
 
     // Check the actual order which is saved by module_test_modules_enabled().
-    $module_order = \Drupal::state()->get('module_test.install_order') ?: array();
+    $module_order = \Drupal::state()->get('module_test.install_order') ?: [];
     $this->assertIdentical($module_order, $expected_order);
   }
 
   /**
    * Tests attempting to uninstall a module that has installed dependents.
    */
-  function testUninstallDependents() {
+  public function testUninstallDependents() {
     // Enable the forum module.
-    $edit = array('modules[Core][forum][enable]' => 'forum');
+    $edit = ['modules[forum][enable]' => 'forum'];
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
-    $this->drupalPostForm(NULL, array(), t('Continue'));
-    $this->assertModules(array('forum'), TRUE);
+    $this->drupalPostForm(NULL, [], t('Continue'));
+    $this->assertModules(['forum'], TRUE);
 
     // Check that the comment module cannot be uninstalled.
     $this->drupalGet('admin/modules/uninstall');
@@ -176,13 +176,13 @@ class DependencyTest extends ModuleTestBase {
     }
     // Uninstall the forum module, and check that taxonomy now can also be
     // uninstalled.
-    $edit = array('uninstall[forum]' => 'forum');
+    $edit = ['uninstall[forum]' => 'forum'];
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
     $this->drupalPostForm(NULL, NULL, t('Uninstall'));
     $this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
 
     // Uninstall comment module.
-    $edit = array('uninstall[comment]' => 'comment');
+    $edit = ['uninstall[comment]' => 'comment'];
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
     $this->drupalPostForm(NULL, NULL, t('Uninstall'));
     $this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
diff --git a/web/core/modules/system/src/Tests/Module/HookRequirementsTest.php b/web/core/modules/system/src/Tests/Module/HookRequirementsTest.php
index ccbbff980..c89c206ca 100644
--- a/web/core/modules/system/src/Tests/Module/HookRequirementsTest.php
+++ b/web/core/modules/system/src/Tests/Module/HookRequirementsTest.php
@@ -11,17 +11,17 @@ class HookRequirementsTest extends ModuleTestBase {
   /**
    * Assert that a module cannot be installed if it fails hook_requirements().
    */
-  function testHookRequirementsFailure() {
-    $this->assertModules(array('requirements1_test'), FALSE);
+  public function testHookRequirementsFailure() {
+    $this->assertModules(['requirements1_test'], FALSE);
 
     // Attempt to install the requirements1_test module.
-    $edit = array();
-    $edit['modules[Testing][requirements1_test][enable]'] = 'requirements1_test';
+    $edit = [];
+    $edit['modules[requirements1_test][enable]'] = 'requirements1_test';
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Makes sure the module was NOT installed.
     $this->assertText(t('Requirements 1 Test failed requirements'), 'Modules status has been updated.');
-    $this->assertModules(array('requirements1_test'), FALSE);
+    $this->assertModules(['requirements1_test'], FALSE);
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Module/InstallUninstallTest.php b/web/core/modules/system/src/Tests/Module/InstallUninstallTest.php
index d8d625bab..f4db81e18 100644
--- a/web/core/modules/system/src/Tests/Module/InstallUninstallTest.php
+++ b/web/core/modules/system/src/Tests/Module/InstallUninstallTest.php
@@ -15,7 +15,7 @@ class InstallUninstallTest extends ModuleTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('system_test', 'dblog', 'taxonomy', 'update_test_postupdate');
+  public static $modules = ['system_test', 'dblog', 'taxonomy', 'update_test_postupdate'];
 
   /**
    * Tests that a fixed set of modules can be installed and uninstalled.
@@ -27,9 +27,9 @@ class InstallUninstallTest extends ModuleTestBase {
 
     // Install and uninstall module_test to ensure hook_preinstall_module and
     // hook_preuninstall_module are fired as expected.
-    $this->container->get('module_installer')->install(array('module_test'));
+    $this->container->get('module_installer')->install(['module_test']);
     $this->assertEqual($this->container->get('state')->get('system_test_preinstall_module'), 'module_test');
-    $this->container->get('module_installer')->uninstall(array('module_test'));
+    $this->container->get('module_installer')->uninstall(['module_test']);
     $this->assertEqual($this->container->get('state')->get('system_test_preuninstall_module'), 'module_test');
     $this->resetAll();
 
@@ -58,9 +58,8 @@ class InstallUninstallTest extends ModuleTestBase {
     // Install the Help module, and verify it installed successfully.
     unset($all_modules['help']);
     $this->assertModuleNotInstalled('help');
-    $edit = array();
-    $package = $required_modules['help']->info['package'];
-    $edit["modules[$package][help][enable]"] = TRUE;
+    $edit = [];
+    $edit["modules[help][enable]"] = TRUE;
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->assertText('has been enabled', 'Modules status has been updated.');
     $this->assertText(t('hook_modules_installed fired for help'));
@@ -77,7 +76,7 @@ class InstallUninstallTest extends ModuleTestBase {
       $was_installed_list = \Drupal::moduleHandler()->getModuleList();
 
       // Start a list of modules that we expect to be installed this time.
-      $modules_to_install = array($name);
+      $modules_to_install = [$name];
       foreach (array_keys($module->requires) as $dependency) {
         if (isset($all_modules[$dependency])) {
           $modules_to_install[] = $dependency;
@@ -91,9 +90,9 @@ class InstallUninstallTest extends ModuleTestBase {
       }
 
       // Install the module.
-      $edit = array();
+      $edit = [];
       $package = $module->info['package'];
-      $edit["modules[$package][$name][enable]"] = TRUE;
+      $edit['modules[' . $name . '][enable]'] = TRUE;
       $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
       // Handle experimental modules, which require a confirmation screen.
@@ -105,7 +104,7 @@ class InstallUninstallTest extends ModuleTestBase {
           // indicating they need to be enabled.
           $this->assertText('You must enable');
         }
-        $this->drupalPostForm(NULL, array(), t('Continue'));
+        $this->drupalPostForm(NULL, [], t('Continue'));
       }
       // Handle the case where modules were installed along with this one and
       // where we therefore hit a confirmation screen.
@@ -114,26 +113,26 @@ class InstallUninstallTest extends ModuleTestBase {
         // about enabling dependencies appears.
         $this->assertText('Some required modules must be enabled');
         $this->assertText('You must enable');
-        $this->drupalPostForm(NULL, array(), t('Continue'));
+        $this->drupalPostForm(NULL, [], t('Continue'));
       }
 
       // List the module display names to check the confirmation message.
-      $module_names = array();
+      $module_names = [];
       foreach ($modules_to_install as $module_to_install) {
         $module_names[] = $all_modules[$module_to_install]->info['name'];
       }
-      $expected_text = \Drupal::translation()->formatPlural(count($module_names), 'Module @name has been enabled.', '@count modules have been enabled: @names.', array(
+      $expected_text = \Drupal::translation()->formatPlural(count($module_names), 'Module @name has been enabled.', '@count modules have been enabled: @names.', [
         '@name' => $module_names[0],
         '@names' => implode(', ', $module_names),
-      ));
+      ]);
       $this->assertText($expected_text, 'Modules status has been updated.');
 
       // Check that hook_modules_installed() was invoked with the expected list
       // of modules, that each module's database tables now exist, and that
       // appropriate messages appear in the logs.
       foreach ($modules_to_install as $module_to_install) {
-        $this->assertText(t('hook_modules_installed fired for @module', array('@module' => $module_to_install)));
-        $this->assertLogMessage('system', "%module module installed.", array('%module' => $module_to_install), RfcLogLevel::INFO);
+        $this->assertText(t('hook_modules_installed fired for @module', ['@module' => $module_to_install]));
+        $this->assertLogMessage('system', "%module module installed.", ['%module' => $module_to_install], RfcLogLevel::INFO);
         $this->assertInstallModuleUpdates($module_to_install);
         $this->assertModuleSuccessfullyInstalled($module_to_install);
       }
@@ -164,7 +163,7 @@ class InstallUninstallTest extends ModuleTestBase {
             // This one is eligible for being uninstalled.
             $package = $all_modules[$to_uninstall]->info['package'];
             $this->assertSuccessfulUninstall($to_uninstall, $package);
-            $added_modules = array_diff($added_modules, array($to_uninstall));
+            $added_modules = array_diff($added_modules, [$to_uninstall]);
           }
         }
 
@@ -188,10 +187,10 @@ class InstallUninstallTest extends ModuleTestBase {
     //   uninstalled.
     // - That enabling more than one module at the same time does not lead to
     //   any errors.
-    $edit = array();
+    $edit = [];
     $experimental = FALSE;
     foreach ($all_modules as $name => $module) {
-      $edit['modules[' . $module->info['package'] . '][' . $name . '][enable]'] = TRUE;
+      $edit['modules[' . $name . '][enable]'] = TRUE;
       // Track whether there is at least one experimental module.
       if ($module->info['package'] == 'Core (Experimental)') {
         $experimental = TRUE;
@@ -202,12 +201,12 @@ class InstallUninstallTest extends ModuleTestBase {
     // If there are experimental modules, click the confirm form.
     if ($experimental) {
       $this->assertText('Are you sure you wish to enable experimental modules?');
-      $this->drupalPostForm(NULL, array(), t('Continue'));
+      $this->drupalPostForm(NULL, [], t('Continue'));
     }
     // The string tested here is translatable but we are only using a part of it
     // so using a translated string is wrong. Doing so would create a new string
     // to translate.
-    $this->assertText(new FormattableMarkup('@count modules have been enabled: ', array('@count' => count($all_modules))), 'Modules status has been updated.');
+    $this->assertText(new FormattableMarkup('@count modules have been enabled: ', ['@count' => count($all_modules)]), 'Modules status has been updated.');
   }
 
   /**
@@ -217,7 +216,7 @@ class InstallUninstallTest extends ModuleTestBase {
    *   Name of the module to check.
    */
   protected function assertModuleNotInstalled($name) {
-    $this->assertModules(array($name), FALSE);
+    $this->assertModules([$name], FALSE);
     $this->assertModuleTablesDoNotExist($name);
   }
 
@@ -228,7 +227,7 @@ class InstallUninstallTest extends ModuleTestBase {
    *   Name of the module to check.
    */
   protected function assertModuleSuccessfullyInstalled($name) {
-    $this->assertModules(array($name), TRUE);
+    $this->assertModules([$name], TRUE);
     $this->assertModuleTablesExist($name);
     $this->assertModuleConfig($name);
   }
@@ -243,19 +242,19 @@ class InstallUninstallTest extends ModuleTestBase {
    *   to 'Core'.
    */
   protected function assertSuccessfulUninstall($module, $package = 'Core') {
-    $edit = array();
+    $edit = [];
     $edit['uninstall[' . $module . ']'] = TRUE;
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
     $this->drupalPostForm(NULL, NULL, t('Uninstall'));
     $this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
-    $this->assertModules(array($module), FALSE);
+    $this->assertModules([$module], FALSE);
 
     // Check that the appropriate hook was fired and the appropriate log
     // message appears. (But don't check for the log message if the dblog
     // module was just uninstalled, since the {watchdog} table won't be there
     // anymore.)
-    $this->assertText(t('hook_modules_uninstalled fired for @module', array('@module' => $module)));
-    $this->assertLogMessage('system', "%module module uninstalled.", array('%module' => $module), RfcLogLevel::INFO);
+    $this->assertText(t('hook_modules_uninstalled fired for @module', ['@module' => $module]));
+    $this->assertLogMessage('system', "%module module uninstalled.", ['%module' => $module], RfcLogLevel::INFO);
 
     // Check that the module's database tables no longer exist.
     $this->assertModuleTablesDoNotExist($module);
diff --git a/web/core/modules/system/src/Tests/Module/ModuleTestBase.php b/web/core/modules/system/src/Tests/Module/ModuleTestBase.php
index e2126170d..a0a4ed226 100644
--- a/web/core/modules/system/src/Tests/Module/ModuleTestBase.php
+++ b/web/core/modules/system/src/Tests/Module/ModuleTestBase.php
@@ -10,6 +10,9 @@ use Drupal\simpletest\WebTestBase;
 
 /**
  * Helper class for module test cases.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\system\Functional\Module\ModuleTestBase instead.
  */
 abstract class ModuleTestBase extends WebTestBase {
 
@@ -18,14 +21,14 @@ abstract class ModuleTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('system_test');
+  public static $modules = ['system_test'];
 
   protected $adminUser;
 
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'administer modules'));
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer modules']);
     $this->drupalLogin($this->adminUser);
   }
 
@@ -38,13 +41,13 @@ abstract class ModuleTestBase extends WebTestBase {
    *   (optional) Whether or not to assert that there are tables that match the
    *   specified base table. Defaults to TRUE.
    */
-  function assertTableCount($base_table, $count = TRUE) {
+  public function assertTableCount($base_table, $count = TRUE) {
     $tables = db_find_tables(Database::getConnection()->prefixTables('{' . $base_table . '}') . '%');
 
     if ($count) {
-      return $this->assertTrue($tables, format_string('Tables matching "@base_table" found.', array('@base_table' => $base_table)));
+      return $this->assertTrue($tables, format_string('Tables matching "@base_table" found.', ['@base_table' => $base_table]));
     }
-    return $this->assertFalse($tables, format_string('Tables matching "@base_table" not found.', array('@base_table' => $base_table)));
+    return $this->assertFalse($tables, format_string('Tables matching "@base_table" not found.', ['@base_table' => $base_table]));
   }
 
   /**
@@ -53,7 +56,7 @@ abstract class ModuleTestBase extends WebTestBase {
    * @param $module
    *   The name of the module.
    */
-  function assertModuleTablesExist($module) {
+  public function assertModuleTablesExist($module) {
     $tables = array_keys(drupal_get_module_schema($module));
     $tables_exist = TRUE;
     foreach ($tables as $table) {
@@ -61,7 +64,7 @@ abstract class ModuleTestBase extends WebTestBase {
         $tables_exist = FALSE;
       }
     }
-    return $this->assertTrue($tables_exist, format_string('All database tables defined by the @module module exist.', array('@module' => $module)));
+    return $this->assertTrue($tables_exist, format_string('All database tables defined by the @module module exist.', ['@module' => $module]));
   }
 
   /**
@@ -70,7 +73,7 @@ abstract class ModuleTestBase extends WebTestBase {
    * @param $module
    *   The name of the module.
    */
-  function assertModuleTablesDoNotExist($module) {
+  public function assertModuleTablesDoNotExist($module) {
     $tables = array_keys(drupal_get_module_schema($module));
     $tables_exist = FALSE;
     foreach ($tables as $table) {
@@ -78,7 +81,7 @@ abstract class ModuleTestBase extends WebTestBase {
         $tables_exist = TRUE;
       }
     }
-    return $this->assertFalse($tables_exist, format_string('None of the database tables defined by the @module module exist.', array('@module' => $module)));
+    return $this->assertFalse($tables_exist, format_string('None of the database tables defined by the @module module exist.', ['@module' => $module]));
   }
 
   /**
@@ -90,7 +93,7 @@ abstract class ModuleTestBase extends WebTestBase {
    * @return bool
    *   TRUE if configuration has been installed, FALSE otherwise.
    */
-  function assertModuleConfig($module) {
+  public function assertModuleConfig($module) {
     $module_config_dir = drupal_get_path('module', $module) . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY;
     if (!is_dir($module_config_dir)) {
       return;
@@ -120,7 +123,7 @@ abstract class ModuleTestBase extends WebTestBase {
     }
     // Verify that all configuration has been installed (which means that $names
     // is empty).
-    return $this->assertFalse($names, format_string('All default configuration of @module module found.', array('@module' => $module)));
+    return $this->assertFalse($names, format_string('All default configuration of @module module found.', ['@module' => $module]));
   }
 
   /**
@@ -132,9 +135,9 @@ abstract class ModuleTestBase extends WebTestBase {
    * @return bool
    *   TRUE if no configuration was found, FALSE otherwise.
    */
-  function assertNoModuleConfig($module) {
+  public function assertNoModuleConfig($module) {
     $names = \Drupal::configFactory()->listAll($module . '.');
-    return $this->assertFalse($names, format_string('No configuration found for @module module.', array('@module' => $module)));
+    return $this->assertFalse($names, format_string('No configuration found for @module module.', ['@module' => $module]));
   }
 
   /**
@@ -145,7 +148,7 @@ abstract class ModuleTestBase extends WebTestBase {
    * @param $enabled
    *   Expected module state.
    */
-  function assertModules(array $modules, $enabled) {
+  public function assertModules(array $modules, $enabled) {
     $this->rebuildContainer();
     foreach ($modules as $module) {
       if ($enabled) {
@@ -154,7 +157,7 @@ abstract class ModuleTestBase extends WebTestBase {
       else {
         $message = 'Module "@module" is not enabled.';
       }
-      $this->assertEqual($this->container->get('module_handler')->moduleExists($module), $enabled, format_string($message, array('@module' => $module)));
+      $this->assertEqual($this->container->get('module_handler')->moduleExists($module), $enabled, format_string($message, ['@module' => $module]));
     }
   }
 
@@ -178,7 +181,7 @@ abstract class ModuleTestBase extends WebTestBase {
    * @param $link
    *   A link to associate with the message.
    */
-  function assertLogMessage($type, $message, $variables = array(), $severity = RfcLogLevel::NOTICE, $link = '') {
+  public function assertLogMessage($type, $message, $variables = [], $severity = RfcLogLevel::NOTICE, $link = '') {
     $count = db_select('watchdog', 'w')
       ->condition('type', $type)
       ->condition('message', $message)
@@ -188,7 +191,7 @@ abstract class ModuleTestBase extends WebTestBase {
       ->countQuery()
       ->execute()
       ->fetchField();
-    $this->assertTrue($count > 0, format_string('watchdog table contains @count rows for @message', array('@count' => $count, '@message' => format_string($message, $variables))));
+    $this->assertTrue($count > 0, format_string('watchdog table contains @count rows for @message', ['@count' => $count, '@message' => format_string($message, $variables)]));
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Module/RequiredTest.php b/web/core/modules/system/src/Tests/Module/RequiredTest.php
index 004854ba2..a2f3560ab 100644
--- a/web/core/modules/system/src/Tests/Module/RequiredTest.php
+++ b/web/core/modules/system/src/Tests/Module/RequiredTest.php
@@ -11,16 +11,16 @@ class RequiredTest extends ModuleTestBase {
   /**
    * Assert that core required modules cannot be disabled.
    */
-  function testDisableRequired() {
+  public function testDisableRequired() {
     $module_info = system_get_info('module');
     $this->drupalGet('admin/modules');
     foreach ($module_info as $module => $info) {
       // Check to make sure the checkbox for each required module is disabled
       // and checked (or absent from the page if the module is also hidden).
       if (!empty($info['required'])) {
-        $field_name = "modules[{$info['package']}][$module][enable]";
+        $field_name = 'modules[' . $module . '][enable]';
         if (empty($info['hidden'])) {
-          $this->assertFieldByXPath("//input[@name='$field_name' and @disabled='disabled' and @checked='checked']", '', format_string('Field @name was disabled and checked.', array('@name' => $field_name)));
+          $this->assertFieldByXPath("//input[@name='$field_name' and @disabled='disabled' and @checked='checked']", '', format_string('Field @name was disabled and checked.', ['@name' => $field_name]));
         }
         else {
           $this->assertNoFieldByName($field_name);
diff --git a/web/core/modules/system/src/Tests/Module/VersionTest.php b/web/core/modules/system/src/Tests/Module/VersionTest.php
index 031d4bad6..daad1a667 100644
--- a/web/core/modules/system/src/Tests/Module/VersionTest.php
+++ b/web/core/modules/system/src/Tests/Module/VersionTest.php
@@ -12,8 +12,8 @@ class VersionTest extends ModuleTestBase {
   /**
    * Test version dependencies.
    */
-  function testModuleVersions() {
-    $dependencies = array(
+  public function testModuleVersions() {
+    $dependencies = [
       // Alternating between being compatible and incompatible with 8.x-2.4-beta3.
       // The first is always a compatible.
       'common_test',
@@ -43,12 +43,12 @@ class VersionTest extends ModuleTestBase {
       'common_test (>2.4-beta2)',
       // Testing extra version. Incompatible.
       'common_test (>2.4-rc0)',
-    );
+    ];
     \Drupal::state()->set('system_test.dependencies', $dependencies);
     $n = count($dependencies);
     for ($i = 0; $i < $n; $i++) {
       $this->drupalGet('admin/modules');
-      $checkbox = $this->xpath('//input[@id="edit-modules-testing-module-test-enable"]');
+      $checkbox = $this->xpath('//input[@id="edit-modules-module-test-enable"]');
       $this->assertEqual(!empty($checkbox[0]['disabled']), $i % 2, $dependencies[$i]);
     }
   }
diff --git a/web/core/modules/system/src/Tests/Pager/PagerTest.php b/web/core/modules/system/src/Tests/Pager/PagerTest.php
index 4c13c0fa1..71413f283 100644
--- a/web/core/modules/system/src/Tests/Pager/PagerTest.php
+++ b/web/core/modules/system/src/Tests/Pager/PagerTest.php
@@ -16,7 +16,7 @@ class PagerTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('dblog', 'pager_test');
+  public static $modules = ['dblog', 'pager_test'];
 
   /**
    * A user with permission to access site reports.
@@ -36,16 +36,16 @@ class PagerTest extends WebTestBase {
       $logger->debug($this->randomString());
     }
 
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'access site reports',
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Tests markup and CSS classes of pager links.
    */
-  function testActiveClass() {
+  public function testActiveClass() {
     // Verify first page.
     $this->drupalGet('admin/reports/dblog');
     $current_page = 0;
@@ -53,21 +53,21 @@ class PagerTest extends WebTestBase {
 
     // Verify any page but first/last.
     $current_page++;
-    $this->drupalGet('admin/reports/dblog', array('query' => array('page' => $current_page)));
+    $this->drupalGet('admin/reports/dblog', ['query' => ['page' => $current_page]]);
     $this->assertPagerItems($current_page);
 
     // Verify last page.
-    $elements = $this->xpath('//li[contains(@class, :class)]/a', array(':class' => 'pager__item--last'));
+    $elements = $this->xpath('//li[contains(@class, :class)]/a', [':class' => 'pager__item--last']);
     preg_match('@page=(\d+)@', $elements[0]['href'], $matches);
     $current_page = (int) $matches[1];
-    $this->drupalGet($GLOBALS['base_root'] . parse_url($this->getUrl())['path'] . $elements[0]['href'], array('external' => TRUE));
+    $this->drupalGet($GLOBALS['base_root'] . parse_url($this->getUrl())['path'] . $elements[0]['href'], ['external' => TRUE]);
     $this->assertPagerItems($current_page);
   }
 
   /**
    * Test proper functioning of the query parameters and the pager cache context.
    */
-  protected function testPagerQueryParametersAndCacheContext() {
+  public function testPagerQueryParametersAndCacheContext() {
     // First page.
     $this->drupalGet('pager-test/query-parameters');
     $this->assertText(t('Pager calls: 0'), 'Initial call to pager shows 0 calls.');
@@ -75,16 +75,16 @@ class PagerTest extends WebTestBase {
     $this->assertCacheContext('url.query_args');
 
     // Go to last page, the count of pager calls need to go to 1.
-    $elements = $this->xpath('//li[contains(@class, :class)]/a', array(':class' => 'pager__item--last'));
+    $elements = $this->xpath('//li[contains(@class, :class)]/a', [':class' => 'pager__item--last']);
     $this->drupalGet($this->getAbsoluteUrl($elements[0]['href']));
     $this->assertText(t('Pager calls: 1'), 'First link call to pager shows 1 calls.');
     $this->assertText('[url.query_args.pagers:0]=0.60');
     $this->assertCacheContext('url.query_args');
 
     // Go back to first page, the count of pager calls need to go to 2.
-    $elements = $this->xpath('//li[contains(@class, :class)]/a', array(':class' => 'pager__item--first'));
+    $elements = $this->xpath('//li[contains(@class, :class)]/a', [':class' => 'pager__item--first']);
     $this->drupalGet($this->getAbsoluteUrl($elements[0]['href']));
-    $this->drupalGet($GLOBALS['base_root'] . parse_url($this->getUrl())['path'] . $elements[0]['href'], array('external' => TRUE));
+    $this->drupalGet($GLOBALS['base_root'] . parse_url($this->getUrl())['path'] . $elements[0]['href'], ['external' => TRUE]);
     $this->assertText(t('Pager calls: 2'), 'Second link call to pager shows 2 calls.');
     $this->assertText('[url.query_args.pagers:0]=0.0');
     $this->assertCacheContext('url.query_args');
@@ -93,7 +93,7 @@ class PagerTest extends WebTestBase {
   /**
    * Test proper functioning of multiple pagers.
    */
-  protected function testMultiplePagers() {
+  public function testMultiplePagers() {
     // First page.
     $this->drupalGet('pager-test/multiple-pagers');
 
@@ -203,7 +203,7 @@ class PagerTest extends WebTestBase {
    *   The current pager page the internal browser is on.
    */
   protected function assertPagerItems($current_page) {
-    $elements = $this->xpath('//ul[contains(@class, :class)]/li', array(':class' => 'pager__items'));
+    $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
     $this->assertTrue(!empty($elements), 'Pager found.');
 
     // Make current page 1-based.
diff --git a/web/core/modules/system/src/Tests/Path/UrlAliasFixtures.php b/web/core/modules/system/src/Tests/Path/UrlAliasFixtures.php
index a527fc5fc..71cd73638 100644
--- a/web/core/modules/system/src/Tests/Path/UrlAliasFixtures.php
+++ b/web/core/modules/system/src/Tests/Path/UrlAliasFixtures.php
@@ -47,28 +47,28 @@ class UrlAliasFixtures {
    * @return array of URL alias definitions.
    */
   public function sampleUrlAliases() {
-    return array(
-      array(
+    return [
+      [
         'source' => '/node/1',
         'alias' => '/alias_for_node_1_en',
         'langcode' => 'en'
-      ),
-      array(
+      ],
+      [
         'source' => '/node/2',
         'alias' => '/alias_for_node_2_en',
         'langcode' => 'en'
-      ),
-      array(
+      ],
+      [
         'source' => '/node/1',
         'alias' => '/alias_for_node_1_fr',
         'langcode' => 'fr'
-      ),
-      array(
+      ],
+      [
         'source' => '/node/1',
         'alias' => '/alias_for_node_1_und',
         'langcode' => 'und'
-      )
-    );
+      ]
+    ];
   }
 
 
@@ -79,7 +79,7 @@ class UrlAliasFixtures {
    *   Table definitions.
    */
   public function tableDefinition() {
-    $tables = array();
+    $tables = [];
 
     // Prime the drupal_get_filename() cache with the location of the system
     // module as its location is known and shouldn't change.
diff --git a/web/core/modules/system/src/Tests/Routing/MockAliasManager.php b/web/core/modules/system/src/Tests/Routing/MockAliasManager.php
index 7c7920f4a..09f36366f 100644
--- a/web/core/modules/system/src/Tests/Routing/MockAliasManager.php
+++ b/web/core/modules/system/src/Tests/Routing/MockAliasManager.php
@@ -14,21 +14,21 @@ class MockAliasManager implements AliasManagerInterface {
    *
    * @var array
    */
-  protected $aliases = array();
+  protected $aliases = [];
 
   /**
    * Array of mocked aliases. Keys are aliases, followed by language.
    *
    * @var array
    */
-  protected $systemPaths = array();
+  protected $systemPaths = [];
 
   /**
    * An index of aliases that have been requested.
    *
    * @var array
    */
-  protected $lookedUp = array();
+  protected $lookedUp = [];
 
   /**
    * The language to assume a path alias is for if not specified.
diff --git a/web/core/modules/system/src/Tests/Routing/MockRouteProvider.php b/web/core/modules/system/src/Tests/Routing/MockRouteProvider.php
index 689fc0680..37f881222 100644
--- a/web/core/modules/system/src/Tests/Routing/MockRouteProvider.php
+++ b/web/core/modules/system/src/Tests/Routing/MockRouteProvider.php
@@ -43,7 +43,7 @@ class MockRouteProvider implements RouteProviderInterface {
    * {@inheritdoc}
    */
   public function getRouteByName($name) {
-    $routes = $this->getRoutesByNames(array($name));
+    $routes = $this->getRoutesByNames([$name]);
     if (empty($routes)) {
       throw new RouteNotFoundException(sprintf('Route "%s" does not exist.', $name));
     }
@@ -62,7 +62,7 @@ class MockRouteProvider implements RouteProviderInterface {
    * {@inheritdoc}
    */
   public function getRoutesByNames($names) {
-    $routes = array();
+    $routes = [];
     foreach ($names as $name) {
       $routes[] = $this->routes->get($name);
     }
@@ -88,7 +88,7 @@ class MockRouteProvider implements RouteProviderInterface {
    * {@inheritdoc}
    */
   public function reset() {
-    $this->routes = array();
+    $this->routes = [];
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Routing/RouterTest.php b/web/core/modules/system/src/Tests/Routing/RouterTest.php
index 1b33bafdc..38d7ecbe0 100644
--- a/web/core/modules/system/src/Tests/Routing/RouterTest.php
+++ b/web/core/modules/system/src/Tests/Routing/RouterTest.php
@@ -21,7 +21,7 @@ class RouterTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('router_test');
+  public static $modules = ['router_test'];
 
   /**
    * Confirms that our FinishResponseSubscriber logic works properly.
@@ -45,7 +45,7 @@ class RouterTest extends WebTestBase {
     // Check expected headers from FinishResponseSubscriber.
     $headers = $this->drupalGetHeaders();
     $this->assertEqual($headers['x-drupal-cache-contexts'], implode(' ', $expected_cache_contexts));
-    $this->assertEqual($headers['x-drupal-cache-tags'], 'config:user.role.anonymous rendered');
+    $this->assertEqual($headers['x-drupal-cache-tags'], 'config:user.role.anonymous http_response rendered');
     // Confirm that the page wrapping is being added, so we're not getting a
     // raw body returned.
     $this->assertRaw('</html>', 'Page markup was found.');
@@ -60,12 +60,12 @@ class RouterTest extends WebTestBase {
     $this->drupalGet('router_test/test18');
     $headers = $this->drupalGetHeaders();
     $this->assertEqual($headers['x-drupal-cache-contexts'], implode(' ', Cache::mergeContexts($renderer_required_cache_contexts, ['url'])));
-    $this->assertEqual($headers['x-drupal-cache-tags'], 'config:user.role.anonymous foo rendered');
+    $this->assertEqual($headers['x-drupal-cache-tags'], 'config:user.role.anonymous foo http_response rendered');
     // 2. controller result: render array, per-role cacheable route access.
     $this->drupalGet('router_test/test19');
     $headers = $this->drupalGetHeaders();
     $this->assertEqual($headers['x-drupal-cache-contexts'], implode(' ', Cache::mergeContexts($renderer_required_cache_contexts, ['url', 'user.roles'])));
-    $this->assertEqual($headers['x-drupal-cache-tags'], 'config:user.role.anonymous foo rendered');
+    $this->assertEqual($headers['x-drupal-cache-tags'], 'config:user.role.anonymous foo http_response rendered');
     // 3. controller result: Response object, globally cacheable route access.
     $this->drupalGet('router_test/test1');
     $headers = $this->drupalGetHeaders();
@@ -80,12 +80,12 @@ class RouterTest extends WebTestBase {
     $this->drupalGet('router_test/test21');
     $headers = $this->drupalGetHeaders();
     $this->assertEqual($headers['x-drupal-cache-contexts'], '');
-    $this->assertEqual($headers['x-drupal-cache-tags'], '');
+    $this->assertEqual($headers['x-drupal-cache-tags'], 'http_response');
     // 6. controller result: CacheableResponse object, per-role cacheable route access.
     $this->drupalGet('router_test/test22');
     $headers = $this->drupalGetHeaders();
     $this->assertEqual($headers['x-drupal-cache-contexts'], 'user.roles');
-    $this->assertEqual($headers['x-drupal-cache-tags'], '');
+    $this->assertEqual($headers['x-drupal-cache-tags'], 'http_response');
 
     // Finally, verify that the X-Drupal-Cache-Contexts and X-Drupal-Cache-Tags
     // headers are not sent when their container parameter is set to FALSE.
@@ -100,12 +100,40 @@ class RouterTest extends WebTestBase {
     $this->assertFalse(isset($headers['x-drupal-cache-tags']));
   }
 
+  /**
+   * Confirms that multiple routes with the same path do not cause an error.
+   */
+  public function testDuplicateRoutePaths() {
+    // Tests two routes with exactly the same path. The route with the maximum
+    // fit and lowest sorting route name will match, regardless of the order the
+    // routes are declared.
+    // @see \Drupal\Core\Routing\RouteProvider::getRoutesByPath()
+    $this->drupalGet('router-test/duplicate-path2');
+    $this->assertResponse(200);
+    $this->assertRaw('router_test.two_duplicate1');
+
+    // Tests three routes with same the path. One of the routes the path has a
+    // different case.
+    $this->drupalGet('router-test/case-sensitive-duplicate-path3');
+    $this->assertResponse(200);
+    $this->assertRaw('router_test.case_sensitive_duplicate1');
+    // While case-insensitive matching works, exact matches are preferred.
+    $this->drupalGet('router-test/case-sensitive-Duplicate-PATH3');
+    $this->assertResponse(200);
+    $this->assertRaw('router_test.case_sensitive_duplicate2');
+    // Test that case-insensitive matching works, falling back to the first
+    // route defined.
+    $this->drupalGet('router-test/case-sensitive-Duplicate-Path3');
+    $this->assertResponse(200);
+    $this->assertRaw('router_test.case_sensitive_duplicate1');
+  }
+
   /**
    * Confirms that placeholders in paths work correctly.
    */
   public function testControllerPlaceholders() {
     // Test with 0 and a random value.
-    $values = array("0", $this->randomMachineName());
+    $values = ["0", $this->randomMachineName()];
     foreach ($values as $value) {
       $this->drupalGet('router_test/test3/' . $value);
       $this->assertResponse(200);
@@ -261,7 +289,7 @@ class RouterTest extends WebTestBase {
    * Tests that routes no longer exist for a module that has been uninstalled.
    */
   public function testRouterUninstallInstall() {
-    \Drupal::service('module_installer')->uninstall(array('router_test'));
+    \Drupal::service('module_installer')->uninstall(['router_test']);
     \Drupal::service('router.builder')->rebuild();
     try {
       \Drupal::service('router.route_provider')->getRouteByName('router_test.1');
@@ -271,7 +299,7 @@ class RouterTest extends WebTestBase {
       $this->pass('Route was delete on uninstall.');
     }
     // Install the module again.
-    \Drupal::service('module_installer')->install(array('router_test'));
+    \Drupal::service('module_installer')->install(['router_test']);
     \Drupal::service('router.builder')->rebuild();
     $route = \Drupal::service('router.route_provider')->getRouteByName('router_test.1');
     $this->assertNotNull($route, 'Route exists after module installation');
diff --git a/web/core/modules/system/src/Tests/Session/SessionHttpsTest.php b/web/core/modules/system/src/Tests/Session/SessionHttpsTest.php
index 8e25fd263..6ba70da52 100644
--- a/web/core/modules/system/src/Tests/Session/SessionHttpsTest.php
+++ b/web/core/modules/system/src/Tests/Session/SessionHttpsTest.php
@@ -33,7 +33,7 @@ class SessionHttpsTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('session_test');
+  public static $modules = ['session_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -50,7 +50,7 @@ class SessionHttpsTest extends WebTestBase {
   }
 
   public function testHttpsSession() {
-    $user = $this->drupalCreateUser(array('access administration pages'));
+    $user = $this->drupalCreateUser(['access administration pages']);
 
     // Test HTTPS session handling by altering the form action to submit the
     // login form through https.php, which creates a mock HTTPS request.
@@ -58,7 +58,7 @@ class SessionHttpsTest extends WebTestBase {
 
     // Test a second concurrent session.
     $this->curlClose();
-    $this->curlCookies = array();
+    $this->curlCookies = [];
     $this->loginHttps($user);
 
     // Check secure cookie on secure page.
@@ -80,7 +80,7 @@ class SessionHttpsTest extends WebTestBase {
 
     // Verify that empty SID cannot be used on the non-secure site.
     $this->curlClose();
-    $this->curlCookies = array($this->insecureSessionName . '=');
+    $this->curlCookies = [$this->insecureSessionName . '='];
     $this->drupalGet($this->httpUrl('admin/config'));
     $this->assertResponse(403);
 
@@ -88,7 +88,7 @@ class SessionHttpsTest extends WebTestBase {
     // login form through http.php, which creates a mock HTTP request on HTTPS
     // test environments.
     $this->curlClose();
-    $this->curlCookies = array();
+    $this->curlCookies = [];
     $this->loginHttp($user);
     $this->drupalGet($this->httpUrl('admin/config'));
     $this->assertResponse(200);
@@ -97,12 +97,12 @@ class SessionHttpsTest extends WebTestBase {
 
     // Verify that empty secure SID cannot be used on the secure site.
     $this->curlClose();
-    $this->curlCookies = array($this->secureSessionName . '=');
+    $this->curlCookies = [$this->secureSessionName . '='];
     $this->drupalGet($this->httpsUrl('admin/config'));
     $this->assertResponse(403);
 
     // Clear browser cookie jar.
-    $this->cookies = array();
+    $this->cookies = [];
   }
 
   /**
@@ -117,7 +117,7 @@ class SessionHttpsTest extends WebTestBase {
     // creates a mock HTTP request on HTTPS test environments.
     $form = $this->xpath('//form[@id="user-login-form"]');
     $form[0]['action'] = $this->httpUrl('user/login');
-    $edit = array('name' => $account->getUsername(), 'pass' => $account->pass_raw);
+    $edit = ['name' => $account->getUsername(), 'pass' => $account->pass_raw];
 
     // When posting directly to the HTTP or HTTPS mock front controller, the
     // location header on the returned response is an absolute URL. That URL
@@ -148,7 +148,7 @@ class SessionHttpsTest extends WebTestBase {
     // creates a mock HTTPS request on HTTP test environments.
     $form = $this->xpath('//form[@id="user-login-form"]');
     $form[0]['action'] = $this->httpsUrl('user/login');
-    $edit = array('name' => $account->getUsername(), 'pass' => $account->pass_raw);
+    $edit = ['name' => $account->getUsername(), 'pass' => $account->pass_raw];
 
     // When posting directly to the HTTP or HTTPS mock front controller, the
     // location header on the returned response is an absolute URL. That URL
@@ -168,7 +168,7 @@ class SessionHttpsTest extends WebTestBase {
     // necessary to manually collect the session cookie and add it to the
     // curlCookies property such that it will be used on subsequent requests via
     // the HTTPS mock.
-    $this->curlCookies = array($this->secureSessionName . '=' . $this->cookies[$this->secureSessionName]['value']);
+    $this->curlCookies = [$this->secureSessionName . '=' . $this->cookies[$this->secureSessionName]['value']];
 
     // Follow the location header.
     $path = $this->getPathFromLocationHeader(TRUE);
@@ -215,9 +215,9 @@ class SessionHttpsTest extends WebTestBase {
    *   has the given insecure and secure session IDs.
    */
   protected function assertSessionIds($sid, $assertion_text) {
-    $args = array(
+    $args = [
       ':sid' => Crypt::hashBase64($sid),
-    );
+    ];
     return $this->assertTrue(db_query('SELECT timestamp FROM {sessions} WHERE sid = :sid', $args)->fetchField(), $assertion_text);
   }
 
diff --git a/web/core/modules/system/src/Tests/Session/SessionTest.php b/web/core/modules/system/src/Tests/Session/SessionTest.php
index 139fba517..fcadd42b9 100644
--- a/web/core/modules/system/src/Tests/Session/SessionTest.php
+++ b/web/core/modules/system/src/Tests/Session/SessionTest.php
@@ -16,7 +16,7 @@ class SessionTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('session_test');
+  public static $modules = ['session_test'];
 
   protected $dumpHeaders = TRUE;
 
@@ -24,7 +24,7 @@ class SessionTest extends WebTestBase {
    * Tests for \Drupal\Core\Session\WriteSafeSessionHandler::setSessionWritable()
    * ::isSessionWritable and \Drupal\Core\Session\SessionManager::regenerate().
    */
-  function testSessionSaveRegenerate() {
+  public function testSessionSaveRegenerate() {
     $session_handler = $this->container->get('session_handler.write_safe');
     $this->assertTrue($session_handler->isSessionWritable(), 'session_handler->isSessionWritable() initially returns TRUE.');
     $session_handler->setSessionWritable(FALSE);
@@ -48,24 +48,24 @@ class SessionTest extends WebTestBase {
     $user->name = 'session_test_user';
     $user->save();
     $this->drupalGet('session-test/id');
-    $matches = array();
+    $matches = [];
     preg_match('/\s*session_id:(.*)\n/', $this->getRawContent(), $matches);
     $this->assertTrue(!empty($matches[1]), 'Found session ID before logging in.');
     $original_session = $matches[1];
 
     // We cannot use $this->drupalLogin($user); because we exit in
     // session_test_user_login() which breaks a normal assertion.
-    $edit = array(
+    $edit = [
       'name' => $user->getUsername(),
       'pass' => $user->pass_raw
-    );
+    ];
     $this->drupalPostForm('user/login', $edit, t('Log in'));
     $this->drupalGet('user');
-    $pass = $this->assertText($user->getUsername(), format_string('Found name: %name', array('%name' => $user->getUsername())), 'User login');
+    $pass = $this->assertText($user->getUsername(), format_string('Found name: %name', ['%name' => $user->getUsername()]), 'User login');
     $this->_logged_in = $pass;
 
     $this->drupalGet('session-test/id');
-    $matches = array();
+    $matches = [];
     preg_match('/\s*session_id:(.*)\n/', $this->getRawContent(), $matches);
     $this->assertTrue(!empty($matches[1]), 'Found session ID after logging in.');
     $this->assertTrue($matches[1] != $original_session, 'Session ID changed after login.');
@@ -74,8 +74,8 @@ class SessionTest extends WebTestBase {
   /**
    * Test data persistence via the session_test module callbacks.
    */
-  function testDataPersistence() {
-    $user = $this->drupalCreateUser(array());
+  public function testDataPersistence() {
+    $user = $this->drupalCreateUser([]);
     // Enable sessions.
     $this->sessionReset($user->id());
 
@@ -127,7 +127,7 @@ class SessionTest extends WebTestBase {
     $this->assertNoText($value_1, 'Session has persisted for an authenticated user after logging out and then back in.', 'Session');
 
     // Change session and create another user.
-    $user2 = $this->drupalCreateUser(array());
+    $user2 = $this->drupalCreateUser([]);
     $this->sessionReset($user2->id());
     $this->drupalLogin($user2);
   }
@@ -147,7 +147,7 @@ class SessionTest extends WebTestBase {
   /**
    * Test that empty anonymous sessions are destroyed.
    */
-  function testEmptyAnonymousSession() {
+  public function testEmptyAnonymousSession() {
     // Disable the dynamic_page_cache module; it'd cause session_test's debug
     // output (that is added in
     // SessionTestSubscriber::onKernelResponseSessionTest()) to not be added.
@@ -210,12 +210,12 @@ class SessionTest extends WebTestBase {
   /**
    * Test that sessions are only saved when necessary.
    */
-  function testSessionWrite() {
-    $user = $this->drupalCreateUser(array());
+  public function testSessionWrite() {
+    $user = $this->drupalCreateUser([]);
     $this->drupalLogin($user);
 
     $sql = 'SELECT u.access, s.timestamp FROM {users_field_data} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE u.uid = :uid';
-    $times1 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
+    $times1 = db_query($sql, [':uid' => $user->id()])->fetchObject();
 
     // Before every request we sleep one second to make sure that if the session
     // is saved, its timestamp will change.
@@ -223,34 +223,34 @@ class SessionTest extends WebTestBase {
     // Modify the session.
     sleep(1);
     $this->drupalGet('session-test/set/foo');
-    $times2 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
+    $times2 = db_query($sql, [':uid' => $user->id()])->fetchObject();
     $this->assertEqual($times2->access, $times1->access, 'Users table was not updated.');
     $this->assertNotEqual($times2->timestamp, $times1->timestamp, 'Sessions table was updated.');
 
     // Write the same value again, i.e. do not modify the session.
     sleep(1);
     $this->drupalGet('session-test/set/foo');
-    $times3 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
+    $times3 = db_query($sql, [':uid' => $user->id()])->fetchObject();
     $this->assertEqual($times3->access, $times1->access, 'Users table was not updated.');
     $this->assertEqual($times3->timestamp, $times2->timestamp, 'Sessions table was not updated.');
 
     // Do not change the session.
     sleep(1);
     $this->drupalGet('');
-    $times4 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
+    $times4 = db_query($sql, [':uid' => $user->id()])->fetchObject();
     $this->assertEqual($times4->access, $times3->access, 'Users table was not updated.');
     $this->assertEqual($times4->timestamp, $times3->timestamp, 'Sessions table was not updated.');
 
     // Force updating of users and sessions table once per second.
     $this->settingsSet('session_write_interval', 0);
     // Write that value also into the test settings.php file.
-    $settings['settings']['session_write_interval'] = (object) array(
+    $settings['settings']['session_write_interval'] = (object) [
       'value' => 0,
       'required' => TRUE,
-    );
+    ];
     $this->writeSettings($settings);
     $this->drupalGet('');
-    $times5 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
+    $times5 = db_query($sql, [':uid' => $user->id()])->fetchObject();
     $this->assertNotEqual($times5->access, $times4->access, 'Users table was updated.');
     $this->assertNotEqual($times5->timestamp, $times4->timestamp, 'Sessions table was updated.');
   }
@@ -258,15 +258,15 @@ class SessionTest extends WebTestBase {
   /**
    * Test that empty session IDs are not allowed.
    */
-  function testEmptySessionID() {
-    $user = $this->drupalCreateUser(array());
+  public function testEmptySessionID() {
+    $user = $this->drupalCreateUser([]);
     $this->drupalLogin($user);
     $this->drupalGet('session-test/is-logged-in');
     $this->assertResponse(200, 'User is logged in.');
 
     // Reset the sid in {sessions} to a blank string. This may exist in the
     // wild in some cases, although we normally prevent it from happening.
-    db_query("UPDATE {sessions} SET sid = '' WHERE uid = :uid", array(':uid' => $user->id()));
+    db_query("UPDATE {sessions} SET sid = '' WHERE uid = :uid", [':uid' => $user->id()]);
     // Send a blank sid in the session cookie, and the session should no longer
     // be valid. Closing the curl handler will stop the previous session ID
     // from persisting.
@@ -284,7 +284,7 @@ class SessionTest extends WebTestBase {
    *
    * @param $uid User id to set as the active session.
    */
-  function sessionReset($uid = 0) {
+  public function sessionReset($uid = 0) {
     // Close the internal browser.
     $this->curlClose();
     $this->loggedInUser = FALSE;
@@ -300,7 +300,7 @@ class SessionTest extends WebTestBase {
   /**
    * Assert whether the SimpleTest browser sent a session cookie.
    */
-  function assertSessionCookie($sent) {
+  public function assertSessionCookie($sent) {
     if ($sent) {
       $this->assertNotNull($this->sessionId, 'Session cookie was sent.');
     }
@@ -312,7 +312,7 @@ class SessionTest extends WebTestBase {
   /**
    * Assert whether $_SESSION is empty at the beginning of the request.
    */
-  function assertSessionEmpty($empty) {
+  public function assertSessionEmpty($empty) {
     if ($empty) {
       $this->assertIdentical($this->drupalGetHeader('X-Session-Empty'), '1', 'Session was empty.');
     }
diff --git a/web/core/modules/system/src/Tests/Session/StackSessionHandlerIntegrationTest.php b/web/core/modules/system/src/Tests/Session/StackSessionHandlerIntegrationTest.php
index af962fa5c..ac368685d 100644
--- a/web/core/modules/system/src/Tests/Session/StackSessionHandlerIntegrationTest.php
+++ b/web/core/modules/system/src/Tests/Session/StackSessionHandlerIntegrationTest.php
@@ -16,7 +16,7 @@ class StackSessionHandlerIntegrationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('session_test');
+  public static $modules = ['session_test'];
 
   /**
    * Tests a request.
diff --git a/web/core/modules/system/src/Tests/System/AccessDeniedTest.php b/web/core/modules/system/src/Tests/System/AccessDeniedTest.php
index 81f9fad18..ba1d59967 100644
--- a/web/core/modules/system/src/Tests/System/AccessDeniedTest.php
+++ b/web/core/modules/system/src/Tests/System/AccessDeniedTest.php
@@ -32,11 +32,11 @@ class AccessDeniedTest extends WebTestBase {
     $this->adminUser->roles[] = 'administrator';
     $this->adminUser->save();
 
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access user profiles'));
-    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('access user profiles'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access user profiles']);
+    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['access user profiles']);
   }
 
-  function testAccessDenied() {
+  public function testAccessDenied() {
     $this->drupalGet('admin');
     $this->assertText(t('Access denied'), 'Found the default 403 page');
     $this->assertResponse(403);
@@ -65,7 +65,7 @@ class AccessDeniedTest extends WebTestBase {
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Save configuration'));
 
     // Enable the user login block.
-    $this->drupalPlaceBlock('user_login_block', array('id' => 'login'));
+    $block = $this->drupalPlaceBlock('user_login_block', ['id' => 'login']);
 
     // Log out and check that the user login block is shown on custom 403 pages.
     $this->drupalLogout();
@@ -90,17 +90,14 @@ class AccessDeniedTest extends WebTestBase {
     // Log back in, set the custom 403 page to /user/login and remove the block
     $this->drupalLogin($this->adminUser);
     $this->config('system.site')->set('page.403', '/user/login')->save();
-    $edit = [
-      'region' => -1,
-    ];
-    $this->drupalPostForm('admin/structure/block/manage/login', $edit, t('Save block'));
+    $block->disable()->save();
 
     // Check that we can log in from the 403 page.
     $this->drupalLogout();
-    $edit = array(
+    $edit = [
       'name' => $this->adminUser->getUsername(),
       'pass' => $this->adminUser->pass_raw,
-    );
+    ];
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Log in'));
 
     // Check that we're still on the same page.
diff --git a/web/core/modules/system/src/Tests/System/AdminTest.php b/web/core/modules/system/src/Tests/System/AdminTest.php
index 8921ad0a8..7921e1c4c 100644
--- a/web/core/modules/system/src/Tests/System/AdminTest.php
+++ b/web/core/modules/system/src/Tests/System/AdminTest.php
@@ -31,7 +31,7 @@ class AdminTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('locale');
+  public static $modules = ['locale'];
 
   protected function setUp() {
     // testAdminPages() requires Locale module.
@@ -41,17 +41,17 @@ class AdminTest extends WebTestBase {
     // who can only access administration pages and perform some Locale module
     // administrative tasks, but not all of them.
     $this->adminUser = $this->drupalCreateUser(array_keys(\Drupal::service('user.permissions')->getPermissions()));
-    $this->webUser = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser([
       'access administration pages',
       'translate interface',
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Tests output on administrative listing pages.
    */
-  function testAdminPages() {
+  public function testAdminPages() {
     // Go to Administration.
     $this->drupalGet('admin');
 
@@ -69,11 +69,11 @@ class AdminTest extends WebTestBase {
     // but no links to its individual sub-configuration pages. Also verify that
     // a user with access to only some Locale module administration pages only
     // sees links to the pages they have access to.
-    $admin_list_pages = array(
+    $admin_list_pages = [
       'admin/index',
       'admin/config',
       'admin/config/regional',
-    );
+    ];
 
     foreach ($admin_list_pages as $page) {
       // For the administrator, verify that there are links to Locale's primary
@@ -125,14 +125,14 @@ class AdminTest extends WebTestBase {
     $parameters = new MenuTreeParameters();
     $parameters->setRoot('system.admin')->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks();
     $tree = $menu_tree->load(NULL, $parameters);
-    $manipulators = array(
-      array('callable' => 'menu.default_tree_manipulators:checkAccess'),
-      array('callable' => 'menu.default_tree_manipulators:flatten'),
-    );
+    $manipulators = [
+      ['callable' => 'menu.default_tree_manipulators:checkAccess'],
+      ['callable' => 'menu.default_tree_manipulators:flatten'],
+    ];
     $tree = $menu_tree->transform($tree, $manipulators);
 
     // Transform the tree to a list of menu links.
-    $menu_links = array();
+    $menu_links = [];
     foreach ($tree as $element) {
       $menu_links[] = $element->link;
     }
@@ -143,7 +143,7 @@ class AdminTest extends WebTestBase {
   /**
    * Test compact mode.
    */
-  function testCompactMode() {
+  public function testCompactMode() {
     // The front page defaults to 'user/login', which redirects to 'user/{user}'
     // for authenticated users. We cannot use '<front>', since this does not
     // match the redirected url.
@@ -151,7 +151,7 @@ class AdminTest extends WebTestBase {
 
     $this->drupalGet('admin/compact/on');
     $this->assertResponse(200, 'A valid page is returned after turning on compact mode.');
-    $this->assertUrl($frontpage_url, array(), 'The user is redirected to the front page after turning on compact mode.');
+    $this->assertUrl($frontpage_url, [], 'The user is redirected to the front page after turning on compact mode.');
     $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'Compact mode turns on.');
     $this->drupalGet('admin/compact/on');
     $this->assertTrue($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'Compact mode remains on after a repeat call.');
@@ -160,7 +160,7 @@ class AdminTest extends WebTestBase {
 
     $this->drupalGet('admin/compact/off');
     $this->assertResponse(200, 'A valid page is returned after turning off compact mode.');
-    $this->assertUrl($frontpage_url, array(), 'The user is redirected to the front page after turning off compact mode.');
+    $this->assertUrl($frontpage_url, [], 'The user is redirected to the front page after turning off compact mode.');
     $this->assertEqual($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'deleted', 'Compact mode turns off.');
     $this->drupalGet('admin/compact/off');
     $this->assertEqual($this->cookies['Drupal.visitor.admin_compact_mode']['value'], 'deleted', 'Compact mode remains off after a repeat call.');
diff --git a/web/core/modules/system/src/Tests/System/CronRunTest.php b/web/core/modules/system/src/Tests/System/CronRunTest.php
index ec35b72bb..111cc0087 100644
--- a/web/core/modules/system/src/Tests/System/CronRunTest.php
+++ b/web/core/modules/system/src/Tests/System/CronRunTest.php
@@ -21,7 +21,7 @@ class CronRunTest extends WebTestBase {
   /**
    * Test cron runs.
    */
-  function testCronRun() {
+  public function testCronRun() {
     // Run cron anonymously without any cron key.
     $this->drupalGet('cron');
     $this->assertResponse(404);
@@ -43,11 +43,11 @@ class CronRunTest extends WebTestBase {
    * In these tests we do not use REQUEST_TIME to track start time, because we
    * need the exact time when cron is triggered.
    */
-  function testAutomatedCron() {
+  public function testAutomatedCron() {
     // Test with a logged in user; anonymous users likely don't cause Drupal to
     // fully bootstrap, because of the internal page cache or an external
     // reverse proxy. Reuse this user for disabling cron later in the test.
-    $admin_user = $this->drupalCreateUser(array('administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($admin_user);
 
     // Ensure cron does not run when a non-zero cron interval is specified and
@@ -83,7 +83,7 @@ class CronRunTest extends WebTestBase {
   /**
    * Make sure exceptions thrown on hook_cron() don't affect other modules.
    */
-  function testCronExceptions() {
+  public function testCronExceptions() {
     \Drupal::state()->delete('common_test.cron');
     // The common_test module throws an exception. If it isn't caught, the tests
     // won't finish successfully.
@@ -96,8 +96,8 @@ class CronRunTest extends WebTestBase {
   /**
    * Make sure the cron UI reads from the state storage.
    */
-  function testCronUI() {
-    $admin_user = $this->drupalCreateUser(array('administer site configuration'));
+  public function testCronUI() {
+    $admin_user = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($admin_user);
     $this->drupalGet('admin/config/system/cron');
     // Don't use REQUEST to calculate the exact time, because that will
@@ -114,14 +114,14 @@ class CronRunTest extends WebTestBase {
    * Ensure that the manual cron run is working.
    */
   public function testManualCron() {
-    $admin_user = $this->drupalCreateUser(array('administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($admin_user);
 
     $this->drupalGet('admin/reports/status/run-cron');
     $this->assertResponse(403);
 
     $this->drupalGet('admin/reports/status');
-    $this->clickLink(t('run cron manually'));
+    $this->clickLink(t('Run cron'));
     $this->assertResponse(200);
     $this->assertText(t('Cron ran successfully.'));
   }
diff --git a/web/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php b/web/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
index 98d82d36b..3edfb7bb7 100644
--- a/web/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
+++ b/web/core/modules/system/src/Tests/System/DefaultMobileMetaTagsTest.php
@@ -20,9 +20,9 @@ class DefaultMobileMetaTagsTest extends WebTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $this->defaultMetaTags = array(
+    $this->defaultMetaTags = [
       'viewport' => '<meta name="viewport" content="width=device-width, initial-scale=1.0" />',
-    );
+    ];
   }
 
   /**
@@ -31,7 +31,7 @@ class DefaultMobileMetaTagsTest extends WebTestBase {
   public function testDefaultMetaTagsExist() {
     $this->drupalGet('');
     foreach ($this->defaultMetaTags as $name => $metatag) {
-      $this->assertRaw($metatag, SafeMarkup::format('Default Mobile meta tag "@name" displayed properly.', array('@name' => $name)), 'System');
+      $this->assertRaw($metatag, SafeMarkup::format('Default Mobile meta tag "@name" displayed properly.', ['@name' => $name]), 'System');
     }
   }
 
@@ -39,10 +39,10 @@ class DefaultMobileMetaTagsTest extends WebTestBase {
    * Verifies that the default mobile meta tags can be removed.
    */
   public function testRemovingDefaultMetaTags() {
-    \Drupal::service('module_installer')->install(array('system_module_test'));
+    \Drupal::service('module_installer')->install(['system_module_test']);
     $this->drupalGet('');
     foreach ($this->defaultMetaTags as $name => $metatag) {
-      $this->assertNoRaw($metatag, SafeMarkup::format('Default Mobile meta tag "@name" removed properly.', array('@name' => $name)), 'System');
+      $this->assertNoRaw($metatag, SafeMarkup::format('Default Mobile meta tag "@name" removed properly.', ['@name' => $name]), 'System');
     }
   }
 
diff --git a/web/core/modules/system/src/Tests/System/ErrorHandlerTest.php b/web/core/modules/system/src/Tests/System/ErrorHandlerTest.php
index 113d49551..dc661fec9 100644
--- a/web/core/modules/system/src/Tests/System/ErrorHandlerTest.php
+++ b/web/core/modules/system/src/Tests/System/ErrorHandlerTest.php
@@ -17,36 +17,36 @@ class ErrorHandlerTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('error_test');
+  public static $modules = ['error_test'];
 
   /**
    * Test the error handler.
    */
-  function testErrorHandler() {
+  public function testErrorHandler() {
     $config = $this->config('system.logging');
-    $error_notice = array(
+    $error_notice = [
       '%type' => 'Notice',
       '@message' => 'Undefined variable: bananas',
       '%function' => 'Drupal\error_test\Controller\ErrorTestController->generateWarnings()',
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
-    );
-    $error_warning = array(
+    ];
+    $error_warning = [
       '%type' => 'Warning',
       '@message' => 'Division by zero',
       '%function' => 'Drupal\error_test\Controller\ErrorTestController->generateWarnings()',
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
-    );
-    $error_user_notice = array(
+    ];
+    $error_user_notice = [
       '%type' => 'User warning',
       '@message' => 'Drupal & awesome',
       '%function' => 'Drupal\error_test\Controller\ErrorTestController->generateWarnings()',
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
-    );
-    $fatal_error = array(
+    ];
+    $fatal_error = [
       '%type' => 'Recoverable fatal error',
       '%function' => 'Drupal\error_test\Controller\ErrorTestController->Drupal\error_test\Controller\{closure}()',
       '@message' => 'Argument 1 passed to Drupal\error_test\Controller\ErrorTestController::Drupal\error_test\Controller\{closure}() must be of the type array, string given, called in ' . \Drupal::root() . '/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php on line 62 and defined',
-    );
+    ];
     if (version_compare(PHP_VERSION, '7.0.0-dev') >= 0) {
       // In PHP 7, instead of a recoverable fatal error we get a TypeError.
       $fatal_error['%type'] = 'TypeError';
@@ -121,31 +121,31 @@ class ErrorHandlerTest extends WebTestBase {
   /**
    * Test the exception handler.
    */
-  function testExceptionHandler() {
+  public function testExceptionHandler() {
     // Ensure the test error log is empty before these tests.
     $this->assertNoErrorsLogged();
 
-    $error_exception = array(
+    $error_exception = [
       '%type' => 'Exception',
       '@message' => 'Drupal & awesome',
       '%function' => 'Drupal\error_test\Controller\ErrorTestController->triggerException()',
       '%line' => 56,
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
-    );
-    $error_pdo_exception = array(
+    ];
+    $error_pdo_exception = [
       '%type' => 'DatabaseExceptionWrapper',
       '@message' => 'SELECT * FROM bananas_are_awesome',
       '%function' => 'Drupal\error_test\Controller\ErrorTestController->triggerPDOException()',
       '%line' => 64,
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
-    );
-    $error_renderer_exception = array(
+    ];
+    $error_renderer_exception = [
       '%type' => 'Exception',
       '@message' => 'This is an exception that occurs during rendering',
       '%function' => 'Drupal\error_test\Controller\ErrorTestController->Drupal\error_test\Controller\{closure}()',
       '%line' => 82,
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
-    );
+    ];
 
     $this->drupalGet('error-test/trigger-exception');
     $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), 'Received expected HTTP status line.');
@@ -158,7 +158,7 @@ class ErrorHandlerTest extends WebTestBase {
     $this->assertText($error_pdo_exception['%type'], format_string('Found %type in error page.', $error_pdo_exception));
     $this->assertText($error_pdo_exception['@message'], format_string('Found @message in error page.', $error_pdo_exception));
     $error_details = format_string('in %function (line ', $error_pdo_exception);
-    $this->assertRaw($error_details, format_string("Found '@message' in error page.", array('@message' => $error_details)));
+    $this->assertRaw($error_details, format_string("Found '@message' in error page.", ['@message' => $error_details]));
 
     $this->drupalGet('error-test/trigger-renderer-exception');
     $this->assertTrue(strpos($this->drupalGetHeader(':status'), '500 Service unavailable (with message)'), 'Received expected HTTP status line.');
@@ -183,17 +183,17 @@ class ErrorHandlerTest extends WebTestBase {
   /**
    * Helper function: assert that the error message is found.
    */
-  function assertErrorMessage(array $error) {
+  public function assertErrorMessage(array $error) {
     $message = new FormattableMarkup('%type: @message in %function (line ', $error);
-    $this->assertRaw($message, format_string('Found error message: @message.', array('@message' => $message)));
+    $this->assertRaw($message, format_string('Found error message: @message.', ['@message' => $message]));
   }
 
   /**
    * Helper function: assert that the error message is not found.
    */
-  function assertNoErrorMessage(array $error) {
+  public function assertNoErrorMessage(array $error) {
     $message = new FormattableMarkup('%type: @message in %function (line ', $error);
-    $this->assertNoRaw($message, format_string('Did not find error message: @message.', array('@message' => $message)));
+    $this->assertNoRaw($message, format_string('Did not find error message: @message.', ['@message' => $message]));
   }
 
   /**
diff --git a/web/core/modules/system/src/Tests/System/FrontPageTest.php b/web/core/modules/system/src/Tests/System/FrontPageTest.php
index 03666fdf1..f5782b708 100644
--- a/web/core/modules/system/src/Tests/System/FrontPageTest.php
+++ b/web/core/modules/system/src/Tests/System/FrontPageTest.php
@@ -17,7 +17,7 @@ class FrontPageTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'system_test', 'views');
+  public static $modules = ['node', 'system_test', 'views'];
 
   /**
    * The path to a node that is created for testing.
@@ -30,12 +30,12 @@ class FrontPageTest extends WebTestBase {
     parent::setUp();
 
     // Create admin user, log in admin user, and create one node.
-    $this->drupalLogin ($this->drupalCreateUser(array(
+    $this->drupalLogin ($this->drupalCreateUser([
       'access content',
       'administer site configuration',
-    )));
-    $this->drupalCreateContentType(array('type' => 'page'));
-    $this->nodePath = "node/" . $this->drupalCreateNode(array('promote' => 1))->id();
+    ]));
+    $this->drupalCreateContentType(['type' => 'page']);
+    $this->nodePath = "node/" . $this->drupalCreateNode(['promote' => 1])->id();
 
     // Configure 'node' as front page.
     $this->config('system.site')->set('page.front', '/node')->save();
@@ -48,10 +48,10 @@ class FrontPageTest extends WebTestBase {
    */
   public function testDrupalFrontPage() {
     // Create a promoted node to test the <title> tag on the front page view.
-    $settings = array(
+    $settings = [
       'title' => $this->randomMachineName(8),
       'promote' => 1,
-    );
+    ];
     $this->drupalCreateNode($settings);
     $this->drupalGet('');
     $this->assertTitle('Home | Drupal');
@@ -63,9 +63,9 @@ class FrontPageTest extends WebTestBase {
     $this->assertNoText(t('On front page.'), 'Path is not the front page.');
 
     // Change the front page to an invalid path.
-    $edit = array('site_frontpage' => '/kittens');
+    $edit = ['site_frontpage' => '/kittens'];
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Save configuration'));
-    $this->assertText(t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $edit['site_frontpage'])));
+    $this->assertText(t("The path '@path' is either invalid or you do not have access to it.", ['@path' => $edit['site_frontpage']]));
 
     // Change the front page to a path without a starting slash.
     $edit = ['site_frontpage' => $this->nodePath];
diff --git a/web/core/modules/system/src/Tests/System/HtaccessTest.php b/web/core/modules/system/src/Tests/System/HtaccessTest.php
index ad6e09ee5..fab7a37a3 100644
--- a/web/core/modules/system/src/Tests/System/HtaccessTest.php
+++ b/web/core/modules/system/src/Tests/System/HtaccessTest.php
@@ -16,7 +16,7 @@ class HtaccessTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'path');
+  public static $modules = ['node', 'path'];
 
   /**
    * Get an array of file paths for access testing.
diff --git a/web/core/modules/system/src/Tests/System/PageNotFoundTest.php b/web/core/modules/system/src/Tests/System/PageNotFoundTest.php
index f289f0e40..b1a88d827 100644
--- a/web/core/modules/system/src/Tests/System/PageNotFoundTest.php
+++ b/web/core/modules/system/src/Tests/System/PageNotFoundTest.php
@@ -26,15 +26,15 @@ class PageNotFoundTest extends WebTestBase {
     parent::setUp();
 
     // Create an administrative user.
-    $this->adminUser = $this->drupalCreateUser(array('administer site configuration', 'link to any page'));
+    $this->adminUser = $this->drupalCreateUser(['administer site configuration', 'link to any page']);
     $this->adminUser->roles[] = 'administrator';
     $this->adminUser->save();
 
-    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access user profiles'));
-    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('access user profiles'));
+    user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access user profiles']);
+    user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['access user profiles']);
   }
 
-  function testPageNotFound() {
+  public function testPageNotFound() {
     $this->drupalLogin($this->adminUser);
     $this->drupalGet($this->randomMachineName(10));
     $this->assertText(t('Page not found'), 'Found the default 404 page');
@@ -47,9 +47,9 @@ class PageNotFoundTest extends WebTestBase {
     $this->assertRaw(SafeMarkup::format("The path '%path' has to start with a slash.", ['%path' => $edit['site_404']]));
 
     // Use a custom 404 page.
-    $edit = array(
+    $edit = [
       'site_404' => '/user/' . $this->adminUser->id(),
-    );
+    ];
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Save configuration'));
 
     $this->drupalGet($this->randomMachineName(10));
diff --git a/web/core/modules/system/src/Tests/System/PageTitleTest.php b/web/core/modules/system/src/Tests/System/PageTitleTest.php
index 848eacc8c..3b4d38a50 100644
--- a/web/core/modules/system/src/Tests/System/PageTitleTest.php
+++ b/web/core/modules/system/src/Tests/System/PageTitleTest.php
@@ -29,24 +29,24 @@ class PageTitleTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
     $this->drupalPlaceBlock('page_title_block');
 
-    $this->contentUser = $this->drupalCreateUser(array('create page content', 'access content', 'administer themes', 'administer site configuration', 'link to any page'));
+    $this->contentUser = $this->drupalCreateUser(['create page content', 'access content', 'administer themes', 'administer site configuration', 'link to any page']);
     $this->drupalLogin($this->contentUser);
   }
 
   /**
    * Tests the handling of HTML in node titles.
    */
-  function testTitleTags() {
+  public function testTitleTags() {
     $title = "string with <em>HTML</em>";
     // Generate node content.
-    $edit = array(
+    $edit = [
       'title[0][value]' => '!SimpleTest! ' . $title . $this->randomMachineName(20),
       'body[0][value]' => '!SimpleTest! test body' . $this->randomMachineName(200),
-    );
+    ];
     // Create the node with HTML in the title.
     $this->drupalPostForm('node/add/page', $edit, t('Save'));
 
@@ -60,7 +60,7 @@ class PageTitleTest extends WebTestBase {
   /**
    * Test if the title of the site is XSS proof.
    */
-  function testTitleXSS() {
+  public function testTitleXSS() {
     // Set some title with JavaScript and HTML chars to escape.
     $title = '</title><script type="text/javascript">alert("Title XSS!");</script> & < > " \' ';
     $title_filtered = Html::escape($title);
@@ -69,10 +69,10 @@ class PageTitleTest extends WebTestBase {
     $slogan_filtered = Xss::filterAdmin($slogan);
 
     // Set title and slogan.
-    $edit = array(
+    $edit = [
       'site_name'    => $title,
       'site_slogan'  => $slogan,
-    );
+    ];
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Save configuration'));
 
     // Place branding block with site name and slogan into header region.
@@ -113,9 +113,9 @@ class PageTitleTest extends WebTestBase {
     $this->assertEqual('Test dynamic title', (string) $result[0]);
 
     // Set some custom translated strings.
-    $this->addCustomTranslations('en', array('' => array(
+    $this->addCustomTranslations('en', ['' => [
       'Static title' => 'Static title translated'
-    )));
+    ]]);
     $this->writeCustomTranslations();
 
     // Ensure that the title got translated.
diff --git a/web/core/modules/system/src/Tests/System/ResponseGeneratorTest.php b/web/core/modules/system/src/Tests/System/ResponseGeneratorTest.php
index f54c6516e..a535b66c4 100644
--- a/web/core/modules/system/src/Tests/System/ResponseGeneratorTest.php
+++ b/web/core/modules/system/src/Tests/System/ResponseGeneratorTest.php
@@ -16,14 +16,14 @@ class ResponseGeneratorTest extends RESTTestBase {
    *
    * @var array
    */
-  public static $modules = array('hal', 'rest', 'node', 'basic_auth');
+  public static $modules = ['hal', 'rest', 'node', 'basic_auth'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
     $permissions = $this->entityPermissions('node', 'view');
     $account = $this->drupalCreateUser($permissions);
@@ -33,7 +33,7 @@ class ResponseGeneratorTest extends RESTTestBase {
   /**
    * Test to see if generator header is added.
    */
-  function testGeneratorHeaderAdded() {
+  public function testGeneratorHeaderAdded() {
 
     $node = $this->drupalCreateNode();
 
diff --git a/web/core/modules/system/src/Tests/System/ShutdownFunctionsTest.php b/web/core/modules/system/src/Tests/System/ShutdownFunctionsTest.php
index 99839abaf..50fae0362 100644
--- a/web/core/modules/system/src/Tests/System/ShutdownFunctionsTest.php
+++ b/web/core/modules/system/src/Tests/System/ShutdownFunctionsTest.php
@@ -16,7 +16,7 @@ class ShutdownFunctionsTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('system_test');
+  public static $modules = ['system_test'];
 
   protected function tearDown() {
     // This test intentionally throws an exception in a PHP shutdown function.
@@ -29,7 +29,7 @@ class ShutdownFunctionsTest extends WebTestBase {
   /**
    * Test shutdown functions.
    */
-  function testShutdownFunctions() {
+  public function testShutdownFunctions() {
     $arg1 = $this->randomMachineName();
     $arg2 = $this->randomMachineName();
     $this->drupalGet('system-test/shutdown-functions/' . $arg1 . '/' . $arg2);
@@ -42,8 +42,8 @@ class ShutdownFunctionsTest extends WebTestBase {
       // We need to wait to ensure that the shutdown functions have fired.
       sleep(1);
     }
-    $this->assertEqual(\Drupal::state()->get('_system_test_first_shutdown_function'), array($arg1, $arg2));
-    $this->assertEqual(\Drupal::state()->get('_system_test_second_shutdown_function'), array($arg1, $arg2));
+    $this->assertEqual(\Drupal::state()->get('_system_test_first_shutdown_function'), [$arg1, $arg2]);
+    $this->assertEqual(\Drupal::state()->get('_system_test_second_shutdown_function'), [$arg1, $arg2]);
 
     if (!$server_using_fastcgi) {
       // Make sure exceptions displayed through
diff --git a/web/core/modules/system/src/Tests/System/SiteMaintenanceTest.php b/web/core/modules/system/src/Tests/System/SiteMaintenanceTest.php
index 49aff66e4..e269a6c73 100644
--- a/web/core/modules/system/src/Tests/System/SiteMaintenanceTest.php
+++ b/web/core/modules/system/src/Tests/System/SiteMaintenanceTest.php
@@ -17,7 +17,7 @@ class SiteMaintenanceTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   protected $adminUser;
 
@@ -29,33 +29,42 @@ class SiteMaintenanceTest extends WebTestBase {
     $this->config('system.performance')->set('js.preprocess', 1)->save();
 
     // Create a user allowed to access site in maintenance mode.
-    $this->user = $this->drupalCreateUser(array('access site in maintenance mode'));
+    $this->user = $this->drupalCreateUser(['access site in maintenance mode']);
     // Create an administrative user.
-    $this->adminUser = $this->drupalCreateUser(array('administer site configuration', 'access site in maintenance mode'));
+    $this->adminUser = $this->drupalCreateUser(['administer site configuration', 'access site in maintenance mode']);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Verifies site maintenance mode functionality.
    */
-  protected function testSiteMaintenance() {
+  public function testSiteMaintenance() {
+
+    // Verify that permission message is displayed.
+    $permission_handler = $this->container->get('user.permissions');
+    $permissions = $permission_handler->getPermissions();
+    $permission_label = $permissions['access site in maintenance mode']['title'];
+    $permission_message = t('Visitors will only see the maintenance mode message. Only users with the "@permission-label" <a href=":permissions-url">permission</a> will be able to access the site. Authorized users can log in directly via the <a href=":user-login">user login</a> page.', ['@permission-label' => $permission_label, ':permissions-url' => \Drupal::url('user.admin_permissions'), ':user-login' => \Drupal::url('user.login')]);
+    $this->drupalGet(Url::fromRoute('system.site_maintenance_mode'));
+    $this->assertRaw($permission_message, 'Found the permission message.');
+
     $this->drupalGet(Url::fromRoute('user.page'));
     // JS should be aggregated, so drupal.js is not in the page source.
-    $links = $this->xpath('//script[contains(@src, :href)]', array(':href' => '/core/misc/drupal.js'));
+    $links = $this->xpath('//script[contains(@src, :href)]', [':href' => '/core/misc/drupal.js']);
     $this->assertFalse(isset($links[0]), 'script /core/misc/drupal.js not in page');
     // Turn on maintenance mode.
-    $edit = array(
+    $edit = [
       'maintenance_mode' => 1,
-    );
+    ];
     $this->drupalPostForm('admin/config/development/maintenance', $edit, t('Save configuration'));
 
-    $admin_message = t('Operating in maintenance mode. <a href=":url">Go online.</a>', array(':url' => \Drupal::url('system.site_maintenance_mode')));
+    $admin_message = t('Operating in maintenance mode. <a href=":url">Go online.</a>', [':url' => \Drupal::url('system.site_maintenance_mode')]);
     $user_message = t('Operating in maintenance mode.');
-    $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => $this->config('system.site')->get('name')));
+    $offline_message = t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', ['@site' => $this->config('system.site')->get('name')]);
 
     $this->drupalGet(Url::fromRoute('user.page'));
     // JS should not be aggregated, so drupal.js is expected in the page source.
-    $links = $this->xpath('//script[contains(@src, :href)]', array(':href' => '/core/misc/drupal.js'));
+    $links = $this->xpath('//script[contains(@src, :href)]', [':href' => '/core/misc/drupal.js']);
     $this->assertTrue(isset($links[0]), 'script /core/misc/drupal.js in page');
     $this->assertRaw($admin_message, 'Found the site maintenance mode message.');
 
@@ -79,10 +88,10 @@ class SiteMaintenanceTest extends WebTestBase {
 
     // Log in user and verify that maintenance mode message is displayed
     // directly after login.
-    $edit = array(
+    $edit = [
       'name' => $this->user->getUsername(),
       'pass' => $this->user->pass_raw,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Log in'));
     $this->assertText($user_message);
 
@@ -93,9 +102,9 @@ class SiteMaintenanceTest extends WebTestBase {
     $this->assertNoRaw($admin_message, 'Site maintenance mode message not displayed.');
 
     $offline_message = 'Sorry, not online.';
-    $edit = array(
+    $edit = [
       'maintenance_mode_message' => $offline_message,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
 
     // Logout and verify that custom site offline message is displayed.
@@ -109,21 +118,21 @@ class SiteMaintenanceTest extends WebTestBase {
     $this->assertText(t('Username or email address'), 'Anonymous users can access user/password');
 
     // Submit password reset form.
-    $edit = array(
+    $edit = [
       'name' => $this->user->getUsername(),
-    );
+    ];
     $this->drupalPostForm('user/password', $edit, t('Submit'));
     $mails = $this->drupalGetMails();
     $start = strpos($mails[0]['body'], 'user/reset/' . $this->user->id());
     $path = substr($mails[0]['body'], $start, 66 + strlen($this->user->id()));
 
     // Log in with temporary login link.
-    $this->drupalPostForm($path, array(), t('Log in'));
+    $this->drupalPostForm($path, [], t('Log in'));
     $this->assertText($user_message);
 
     // Regression test to check if title displays in Bartik on maintenance page.
-    \Drupal::service('theme_handler')->install(array('bartik'));
-    \Drupal::service('theme_handler')->setDefault('bartik');
+    \Drupal::service('theme_handler')->install(['bartik']);
+    $this->config('system.theme')->set('default', 'bartik')->save();
 
     // Logout and verify that offline message is displayed in Bartik.
     $this->drupalLogout();
diff --git a/web/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php b/web/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
index 08f741d8c..a14fd3107 100644
--- a/web/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
+++ b/web/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php
@@ -43,7 +43,7 @@ abstract class SystemConfigFormTestBase extends WebTestBase {
    */
   public function testConfigForm() {
     // Programmatically submit the given values.
-    $values = array();
+    $values = [];
     foreach ($this->values as $form_key => $data) {
       $values[$form_key] = $data['#value'];
     }
@@ -53,10 +53,10 @@ abstract class SystemConfigFormTestBase extends WebTestBase {
     // Check that the form returns an error when expected, and vice versa.
     $errors = $form_state->getErrors();
     $valid_form = empty($errors);
-    $args = array(
+    $args = [
       '%values' => print_r($values, TRUE),
       '%errors' => $valid_form ? t('None') : implode(' ', $errors),
-    );
+    ];
     $this->assertTrue($valid_form, format_string('Input values: %values<br/>Validation handler errors: %errors', $args));
 
     foreach ($this->values as $data) {
diff --git a/web/core/modules/system/src/Tests/System/ThemeTest.php b/web/core/modules/system/src/Tests/System/ThemeTest.php
index e01f28a44..29d88a377 100644
--- a/web/core/modules/system/src/Tests/System/ThemeTest.php
+++ b/web/core/modules/system/src/Tests/System/ThemeTest.php
@@ -30,9 +30,9 @@ class ThemeTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
-    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'view the administration theme', 'administer themes', 'bypass node access', 'administer blocks'));
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'view the administration theme', 'administer themes', 'bypass node access', 'administer blocks']);
     $this->drupalLogin($this->adminUser);
     $this->node = $this->drupalCreateNode();
     $this->drupalPlaceBlock('local_tasks_block');
@@ -41,7 +41,7 @@ class ThemeTest extends WebTestBase {
   /**
    * Test the theme settings form.
    */
-  function testThemeSettings() {
+  public function testThemeSettings() {
     // Ensure invalid theme settings form URLs return a proper 404.
     $this->drupalGet('admin/appearance/settings/bartik');
     $this->assertResponse(404, 'The theme settings form URL for a uninstalled theme could not be found.');
@@ -53,50 +53,50 @@ class ThemeTest extends WebTestBase {
 
     // Specify a filesystem path to be used for the logo.
     $file = current($this->drupalGetTestFiles('image'));
-    $file_relative = strtr($file->uri, array('public:/' => PublicStream::basePath()));
+    $file_relative = strtr($file->uri, ['public:/' => PublicStream::basePath()]);
     $default_theme_path = 'core/themes/classy';
 
-    $supported_paths = array(
+    $supported_paths = [
       // Raw stream wrapper URI.
-      $file->uri => array(
+      $file->uri => [
         'form' => file_uri_target($file->uri),
         'src' => file_url_transform_relative(file_create_url($file->uri)),
-      ),
+      ],
       // Relative path within the public filesystem.
-      file_uri_target($file->uri) => array(
+      file_uri_target($file->uri) => [
         'form' => file_uri_target($file->uri),
         'src' => file_url_transform_relative(file_create_url($file->uri)),
-      ),
+      ],
       // Relative path to a public file.
-      $file_relative => array(
+      $file_relative => [
         'form' => $file_relative,
         'src' => file_url_transform_relative(file_create_url($file->uri)),
-      ),
+      ],
       // Relative path to an arbitrary file.
-      'core/misc/druplicon.png' => array(
+      'core/misc/druplicon.png' => [
         'form' => 'core/misc/druplicon.png',
         'src' => base_path() . 'core/misc/druplicon.png',
-      ),
+      ],
       // Relative path to a file in a theme.
-      $default_theme_path . '/logo.svg' => array(
+      $default_theme_path . '/logo.svg' => [
         'form' => $default_theme_path . '/logo.svg',
         'src' => base_path() . $default_theme_path . '/logo.svg',
-      ),
-    );
+      ],
+    ];
     foreach ($supported_paths as $input => $expected) {
-      $edit = array(
+      $edit = [
         'default_logo' => FALSE,
         'logo_path' => $input,
-      );
+      ];
       $this->drupalPostForm('admin/appearance/settings', $edit, t('Save configuration'));
       $this->assertNoText('The custom logo path is invalid.');
       $this->assertFieldByName('logo_path', $expected['form']);
 
       // Verify logo path examples.
-      $elements = $this->xpath('//div[contains(@class, :item)]/div[@class=:description]/code', array(
+      $elements = $this->xpath('//div[contains(@class, :item)]/div[@class=:description]/code', [
         ':item' => 'js-form-item-logo-path',
         ':description' => 'description',
-      ));
+      ]);
       // Expected default values (if all else fails).
       $implicit_public_file = 'logo.svg';
       $explicit_file = 'public://logo.svg';
@@ -105,7 +105,7 @@ class ThemeTest extends WebTestBase {
       if (file_uri_scheme($input) == 'public') {
         $implicit_public_file = file_uri_target($input);
         $explicit_file = $input;
-        $local_file = strtr($input, array('public:/' => PublicStream::basePath()));
+        $local_file = strtr($input, ['public:/' => PublicStream::basePath()]);
       }
       // Adjust for fully qualified stream wrapper URI elsewhere.
       elseif (file_uri_scheme($input) !== FALSE) {
@@ -125,13 +125,13 @@ class ThemeTest extends WebTestBase {
       // branding block.
       $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']);
       $this->drupalGet('');
-      $elements = $this->xpath('//header//a[@rel=:rel]/img', array(
+      $elements = $this->xpath('//header//a[@rel=:rel]/img', [
           ':rel' => 'home',
-        )
+        ]
       );
       $this->assertEqual((string) $elements[0]['src'], $expected['src']);
     }
-    $unsupported_paths = array(
+    $unsupported_paths = [
       // Stream wrapper URI to non-existing file.
       'public://whatever.png',
       'private://whatever.png',
@@ -153,23 +153,23 @@ class ThemeTest extends WebTestBase {
       '/core/misc/whatever.png',
       // Absolute paths to any local file (even if it exists).
       drupal_realpath($file->uri),
-    );
+    ];
     $this->drupalGet('admin/appearance/settings');
     foreach ($unsupported_paths as $path) {
-      $edit = array(
+      $edit = [
         'default_logo' => FALSE,
         'logo_path' => $path,
-      );
+      ];
       $this->drupalPostForm(NULL, $edit, t('Save configuration'));
       $this->assertText('The custom logo path is invalid.');
     }
 
     // Upload a file to use for the logo.
-    $edit = array(
+    $edit = [
       'default_logo' => FALSE,
       'logo_path' => '',
       'files[logo_upload]' => drupal_realpath($file->uri),
-    );
+    ];
     $this->drupalPostForm('admin/appearance/settings', $edit, t('Save configuration'));
 
     $fields = $this->xpath($this->constructFieldXpath('name', 'logo_path'));
@@ -177,13 +177,13 @@ class ThemeTest extends WebTestBase {
 
     $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']);
     $this->drupalGet('');
-    $elements = $this->xpath('//header//a[@rel=:rel]/img', array(
+    $elements = $this->xpath('//header//a[@rel=:rel]/img', [
         ':rel' => 'home',
-      )
+      ]
     );
     $this->assertEqual($elements[0]['src'], file_url_transform_relative(file_create_url($uploaded_filename)));
 
-    $this->container->get('theme_handler')->install(array('bartik'));
+    $this->container->get('theme_handler')->install(['bartik']);
 
     // Ensure only valid themes are listed in the local tasks.
     $this->drupalPlaceBlock('local_tasks_block', ['region' => 'header']);
@@ -218,7 +218,7 @@ class ThemeTest extends WebTestBase {
   /**
    * Test the theme settings logo form.
    */
-  function testThemeSettingsLogo() {
+  public function testThemeSettingsLogo() {
     // Visit Bartik's theme settings page to replace the logo.
     $this->container->get('theme_handler')->install(['bartik']);
     $this->drupalGet('admin/appearance/settings/bartik');
@@ -241,14 +241,14 @@ class ThemeTest extends WebTestBase {
   /**
    * Test the administration theme functionality.
    */
-  function testAdministrationTheme() {
-    $this->container->get('theme_handler')->install(array('seven'));
+  public function testAdministrationTheme() {
+    $this->container->get('theme_handler')->install(['seven']);
 
     // Install an administration theme and show it on the node admin pages.
-    $edit = array(
+    $edit = [
       'admin_theme' => 'seven',
       'use_admin_theme' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
 
     $this->drupalGet('admin/config');
@@ -264,9 +264,9 @@ class ThemeTest extends WebTestBase {
     $this->assertRaw('core/themes/seven', 'Administration theme used on the edit content page.');
 
     // Disable the admin theme on the node admin pages.
-    $edit = array(
+    $edit = [
       'use_admin_theme' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
 
     $this->drupalGet('admin/config');
@@ -284,10 +284,10 @@ class ThemeTest extends WebTestBase {
     $this->assertRaw('core/themes/classy', 'Site default theme used on the add content page.');
 
     // Reset to the default theme settings.
-    $edit = array(
+    $edit = [
       'admin_theme' => '0',
       'use_admin_theme' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
 
     $this->drupalGet('admin');
@@ -300,15 +300,15 @@ class ThemeTest extends WebTestBase {
   /**
    * Test switching the default theme.
    */
-  function testSwitchDefaultTheme() {
+  public function testSwitchDefaultTheme() {
     /** @var \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler */
     $theme_handler = \Drupal::service('theme_handler');
     // First, install Stark and set it as the default theme programmatically.
-    $theme_handler->install(array('stark'));
-    $theme_handler->setDefault('stark');
+    $theme_handler->install(['stark']);
+    $this->config('system.theme')->set('default', 'stark')->save();
 
     // Install Bartik and set it as the default theme.
-    $theme_handler->install(array('bartik'));
+    $theme_handler->install(['bartik']);
     $this->drupalGet('admin/appearance');
     $this->clickLink(t('Set as default'));
     $this->assertEqual($this->config('system.theme')->get('default'), 'bartik');
@@ -330,15 +330,15 @@ class ThemeTest extends WebTestBase {
    * Include test for themes that have a missing base theme somewhere further up
    * the chain than the immediate base theme.
    */
-  function testInvalidTheme() {
+  public function testInvalidTheme() {
     // theme_page_test_system_info_alter() un-hides all hidden themes.
-    $this->container->get('module_installer')->install(array('theme_page_test'));
+    $this->container->get('module_installer')->install(['theme_page_test']);
     // Clear the system_list() and theme listing cache to pick up the change.
     $this->container->get('theme_handler')->reset();
     $this->drupalGet('admin/appearance');
-    $this->assertText(t('This theme requires the base theme @base_theme to operate correctly.', array('@base_theme' => 'not_real_test_basetheme')));
-    $this->assertText(t('This theme requires the base theme @base_theme to operate correctly.', array('@base_theme' => 'test_invalid_basetheme')));
-    $this->assertText(t('This theme requires the theme engine @theme_engine to operate correctly.', array('@theme_engine' => 'not_real_engine')));
+    $this->assertText(t('This theme requires the base theme @base_theme to operate correctly.', ['@base_theme' => 'not_real_test_basetheme']));
+    $this->assertText(t('This theme requires the base theme @base_theme to operate correctly.', ['@base_theme' => 'test_invalid_basetheme']));
+    $this->assertText(t('This theme requires the theme engine @theme_engine to operate correctly.', ['@theme_engine' => 'not_real_engine']));
     // Check for the error text of a theme with the wrong core version.
     $this->assertText("This theme is not compatible with Drupal 8.x. Check that the .info.yml file contains the correct 'core' value.");
     // Check for the error text of a theme without a content region.
@@ -348,15 +348,15 @@ class ThemeTest extends WebTestBase {
   /**
    * Test uninstalling of themes works.
    */
-  function testUninstallingThemes() {
+  public function testUninstallingThemes() {
     // Install Bartik and set it as the default theme.
-    \Drupal::service('theme_handler')->install(array('bartik'));
+    \Drupal::service('theme_handler')->install(['bartik']);
     // Set up seven as the admin theme.
-    \Drupal::service('theme_handler')->install(array('seven'));
-    $edit = array(
+    \Drupal::service('theme_handler')->install(['seven']);
+    $edit = [
       'admin_theme' => 'seven',
       'use_admin_theme' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
     $this->drupalGet('admin/appearance');
     $this->clickLink(t('Set as default'));
@@ -370,12 +370,12 @@ class ThemeTest extends WebTestBase {
     $this->assertNoRaw('Uninstall Classy theme', 'A link to uninstall the Classy theme does not appear on the theme settings page.');
 
     // Install Stark and set it as the default theme.
-    \Drupal::service('theme_handler')->install(array('stark'));
+    \Drupal::service('theme_handler')->install(['stark']);
 
-    $edit = array(
+    $edit = [
       'admin_theme' => 'stark',
       'use_admin_theme' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
 
     // Check that seven can be uninstalled now.
@@ -408,7 +408,7 @@ class ThemeTest extends WebTestBase {
   /**
    * Tests installing a theme and setting it as default.
    */
-  function testInstallAndSetAsDefault() {
+  public function testInstallAndSetAsDefault() {
     $this->drupalGet('admin/appearance');
     // Bartik is uninstalled in the test profile and has the third "Install and
     // set as default" link.
diff --git a/web/core/modules/system/src/Tests/System/UncaughtExceptionTest.php b/web/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
index a06415266..b66837e1c 100644
--- a/web/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
+++ b/web/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
@@ -24,7 +24,7 @@ class UncaughtExceptionTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('error_service_test');
+  public static $modules = ['error_service_test'];
 
   /**
    * {@inheritdoc}
@@ -224,20 +224,20 @@ class UncaughtExceptionTest extends WebTestBase {
 
     // We simulate a broken database connection by rewrite settings.php to no
     // longer have the proper data.
-    $settings['databases']['default']['default']['username'] = (object) array(
+    $settings['databases']['default']['default']['username'] = (object) [
       'value' => $incorrect_username,
       'required' => TRUE,
-    );
-    $settings['databases']['default']['default']['passowrd'] = (object) array(
+    ];
+    $settings['databases']['default']['default']['password'] = (object) [
       'value' => $this->randomMachineName(16),
       'required' => TRUE,
-    );
+    ];
 
     $this->writeSettings($settings);
 
     $this->drupalGet('');
     $this->assertResponse(500);
-    $this->assertRaw('PDOException');
+    $this->assertRaw('DatabaseAccessDeniedException');
     $this->assertErrorLogged($this->expectedExceptionMessage);
   }
 
diff --git a/web/core/modules/system/src/Tests/Theme/EngineTwigTest.php b/web/core/modules/system/src/Tests/Theme/EngineTwigTest.php
index 51d092d44..ffff75fc4 100644
--- a/web/core/modules/system/src/Tests/Theme/EngineTwigTest.php
+++ b/web/core/modules/system/src/Tests/Theme/EngineTwigTest.php
@@ -18,17 +18,17 @@ class EngineTwigTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('theme_test', 'twig_theme_test');
+  public static $modules = ['theme_test', 'twig_theme_test'];
 
   protected function setUp() {
     parent::setUp();
-    \Drupal::service('theme_handler')->install(array('test_theme'));
+    \Drupal::service('theme_handler')->install(['test_theme']);
   }
 
   /**
    * Tests that the Twig engine handles PHP data correctly.
    */
-  function testTwigVariableDataTypes() {
+  public function testTwigVariableDataTypes() {
     $this->config('system.theme')
       ->set('default', 'test_theme')
       ->save();
@@ -45,13 +45,13 @@ class EngineTwigTest extends WebTestBase {
     $this->drupalGet('twig-theme-test/url-generator');
     // Find the absolute URL of the current site.
     $url_generator = $this->container->get('url_generator');
-    $expected = array(
+    $expected = [
       'path (as route) not absolute: ' . $url_generator->generateFromRoute('user.register'),
-      'url (as route) absolute: ' . $url_generator->generateFromRoute('user.register', array(), array('absolute' => TRUE)),
-      'path (as route) not absolute with fragment: ' . $url_generator->generateFromRoute('user.register', array(), array('fragment' => 'bottom')),
-      'url (as route) absolute despite option: ' . $url_generator->generateFromRoute('user.register', array(), array('absolute' => TRUE)),
-      'url (as route) absolute with fragment: ' . $url_generator->generateFromRoute('user.register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')),
-    );
+      'url (as route) absolute: ' . $url_generator->generateFromRoute('user.register', [], ['absolute' => TRUE]),
+      'path (as route) not absolute with fragment: ' . $url_generator->generateFromRoute('user.register', [], ['fragment' => 'bottom']),
+      'url (as route) absolute despite option: ' . $url_generator->generateFromRoute('user.register', [], ['absolute' => TRUE]),
+      'url (as route) absolute with fragment: ' . $url_generator->generateFromRoute('user.register', [], ['absolute' => TRUE, 'fragment' => 'bottom']),
+    ];
 
     // Verify that url() has the ability to bubble cacheability metadata:
     // absolute URLs should bubble the 'url.site' cache context. (This only
@@ -86,6 +86,7 @@ class EngineTwigTest extends WebTestBase {
       'link via the linkgenerator: ' . $link_generator->generate('register', new Url('user.register', [], ['attributes' => ['class' => ['llama', 'kitten', 'panda']]])),
       'link via the linkgenerator: ' . $link_generator->generate(Markup::create('<span>register</span>'), new Url('user.register', [], ['absolute' => TRUE])),
       'link via the linkgenerator: <a href="' . $generated_url . '"><span>register</span><svg></svg></a>',
+      'link via the linkgenerator: ' . $link_generator->generate('register', new Url('user.register', [], ['attributes' => ['foo' => 'bar']])) . ' ' . $link_generator->generate('register', new Url('user.register', [], ['attributes' => ['foo' => 'bar']])),
     ];
 
     // Verify that link() has the ability to bubble cacheability metadata:
diff --git a/web/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php b/web/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
index cc4af2a80..10eda6184 100644
--- a/web/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
+++ b/web/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
@@ -6,6 +6,7 @@ use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\node\NodeInterface;
 use Drupal\simpletest\WebTestBase;
 use Drupal\comment\Entity\Comment;
 use Drupal\taxonomy\Entity\Term;
@@ -84,7 +85,7 @@ class EntityFilteringThemeTest extends WebTestBase {
     \Drupal::service('theme_handler')->install(array_keys($this->themes));
 
     // Create a test user.
-    $this->user = $this->drupalCreateUser(array('access content', 'access user profiles'));
+    $this->user = $this->drupalCreateUser(['access content', 'access user profiles']);
     $this->user->name = $this->xssLabel;
     $this->user->save();
     $this->drupalLogin($this->user);
@@ -99,36 +100,36 @@ class EntityFilteringThemeTest extends WebTestBase {
     // Add a comment field.
     $this->addDefaultCommentField('node', 'article', 'comment', CommentItemInterface::OPEN);
     // Create a test node tagged with the test term.
-    $this->node = $this->drupalCreateNode(array(
+    $this->node = $this->drupalCreateNode([
       'title' => $this->xssLabel,
       'type' => 'article',
-      'promote' => NODE_PROMOTED,
-      'field_tags' => array(array('target_id' => $this->term->id())),
-    ));
+      'promote' => NodeInterface::PROMOTED,
+      'field_tags' => [['target_id' => $this->term->id()]],
+    ]);
 
     // Create a test comment on the test node.
-    $this->comment = Comment::create(array(
+    $this->comment = Comment::create([
       'entity_id' => $this->node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment',
       'status' => CommentInterface::PUBLISHED,
       'subject' => $this->xssLabel,
-      'comment_body' => array($this->randomMachineName()),
-    ));
+      'comment_body' => [$this->randomMachineName()],
+    ]);
     $this->comment->save();
   }
 
   /**
    * Checks each themed entity for XSS filtering in available themes.
    */
-  function testThemedEntity() {
+  public function testThemedEntity() {
     // Check paths where various view modes of the entities are rendered.
-    $paths = array(
+    $paths = [
       'user',
       'node',
       'node/' . $this->node->id(),
       'taxonomy/term/' . $this->term->id(),
-    );
+    ];
 
     // Check each path in all available themes.
     foreach ($this->themes as $name => $theme) {
diff --git a/web/core/modules/system/src/Tests/Theme/FunctionsTest.php b/web/core/modules/system/src/Tests/Theme/FunctionsTest.php
index fa5a2ac48..825834859 100644
--- a/web/core/modules/system/src/Tests/Theme/FunctionsTest.php
+++ b/web/core/modules/system/src/Tests/Theme/FunctionsTest.php
@@ -21,117 +21,117 @@ class FunctionsTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('router_test');
+  public static $modules = ['router_test'];
 
   /**
    * Tests item-list.html.twig.
    */
-  function testItemList() {
+  public function testItemList() {
     // Verify that empty items produce no output.
-    $variables = array();
+    $variables = [];
     $expected = '';
     $this->assertThemeOutput('item_list', $variables, $expected, 'Empty %callback generates no output.');
 
     // Verify that empty items with title produce no output.
-    $variables = array();
+    $variables = [];
     $variables['title'] = 'Some title';
     $expected = '';
     $this->assertThemeOutput('item_list', $variables, $expected, 'Empty %callback with title generates no output.');
 
     // Verify that empty items produce the empty string.
-    $variables = array();
+    $variables = [];
     $variables['empty'] = 'No items found.';
     $expected = '<div class="item-list">No items found.</div>';
     $this->assertThemeOutput('item_list', $variables, $expected, 'Empty %callback generates empty string.');
 
     // Verify that empty items produce the empty string with title.
-    $variables = array();
+    $variables = [];
     $variables['title'] = 'Some title';
     $variables['empty'] = 'No items found.';
     $expected = '<div class="item-list"><h3>Some title</h3>No items found.</div>';
     $this->assertThemeOutput('item_list', $variables, $expected, 'Empty %callback generates empty string with title.');
 
     // Verify that title set to 0 is output.
-    $variables = array();
+    $variables = [];
     $variables['title'] = 0;
     $variables['empty'] = 'No items found.';
     $expected = '<div class="item-list"><h3>0</h3>No items found.</div>';
     $this->assertThemeOutput('item_list', $variables, $expected, '%callback with title set to 0 generates a title.');
 
     // Verify that title set to a render array is output.
-    $variables = array();
-    $variables['title'] = array(
+    $variables = [];
+    $variables['title'] = [
       '#markup' => '<span>Render array</span>',
-    );
+    ];
     $variables['empty'] = 'No items found.';
     $expected = '<div class="item-list"><h3><span>Render array</span></h3>No items found.</div>';
     $this->assertThemeOutput('item_list', $variables, $expected, '%callback with title set to a render array generates a title.');
 
     // Verify that empty text is not displayed when there are list items.
-    $variables = array();
+    $variables = [];
     $variables['title'] = 'Some title';
     $variables['empty'] = 'No items found.';
-    $variables['items'] = array('Un', 'Deux', 'Trois');
+    $variables['items'] = ['Un', 'Deux', 'Trois'];
     $expected = '<div class="item-list"><h3>Some title</h3><ul><li>Un</li><li>Deux</li><li>Trois</li></ul></div>';
     $this->assertThemeOutput('item_list', $variables, $expected, '%callback does not print empty text when there are list items.');
 
     // Verify nested item lists.
-    $variables = array();
+    $variables = [];
     $variables['title'] = 'Some title';
-    $variables['attributes'] = array(
+    $variables['attributes'] = [
       'id' => 'parentlist',
-    );
-    $variables['items'] = array(
+    ];
+    $variables['items'] = [
       // A plain string value forms an own item.
       'a',
       // Items can be fully-fledged render arrays with their own attributes.
-      array(
-        '#wrapper_attributes' => array(
+      [
+        '#wrapper_attributes' => [
           'id' => 'item-id-b',
-        ),
+        ],
         '#markup' => 'b',
-        'childlist' => array(
+        'childlist' => [
           '#theme' => 'item_list',
-          '#attributes' => array('id' => 'blist'),
+          '#attributes' => ['id' => 'blist'],
           '#list_type' => 'ol',
-          '#items' => array(
+          '#items' => [
             'ba',
-            array(
+            [
               '#markup' => 'bb',
-              '#wrapper_attributes' => array('class' => array('item-class-bb')),
-            ),
-          ),
-        ),
-      ),
+              '#wrapper_attributes' => ['class' => ['item-class-bb']],
+            ],
+          ],
+        ],
+      ],
       // However, items can also be child #items.
-      array(
+      [
         '#markup' => 'c',
-        'childlist' => array(
-          '#attributes' => array('id' => 'clist'),
+        'childlist' => [
+          '#attributes' => ['id' => 'clist'],
           'ca',
-          array(
+          [
             '#markup' => 'cb',
-            '#wrapper_attributes' => array('class' => array('item-class-cb')),
-            'children' => array(
+            '#wrapper_attributes' => ['class' => ['item-class-cb']],
+            'children' => [
               'cba',
               'cbb',
-            ),
-          ),
+            ],
+          ],
           'cc',
-        ),
-      ),
+        ],
+      ],
       // Use #markup to be able to specify #wrapper_attributes.
-      array(
+      [
         '#markup' => 'd',
-        '#wrapper_attributes' => array('id' => 'item-id-d'),
-      ),
+        '#wrapper_attributes' => ['id' => 'item-id-d'],
+      ],
       // An empty item with attributes.
-      array(
-        '#wrapper_attributes' => array('id' => 'item-id-e'),
-      ),
+      [
+        '#wrapper_attributes' => ['id' => 'item-id-e'],
+      ],
       // Lastly, another plain string item.
       'f',
-    );
+    ];
 
     $inner_b = '<div class="item-list"><ol id="blist">';
     $inner_b .= '<li>ba</li>';
@@ -166,128 +166,7 @@ class FunctionsTest extends WebTestBase {
   /**
    * Tests links.html.twig.
    */
-  function testLinks() {
-    // Turn off the query for the
-    // \Drupal\Core\Utility\LinkGeneratorInterface::generate() method to compare
-    // the active link correctly.
-    $original_query = \Drupal::request()->query->all();
-    \Drupal::request()->query->replace(array());
-    // Verify that empty variables produce no output.
-    $variables = array();
-    $expected = '';
-    $this->assertThemeOutput('links', $variables, $expected, 'Empty %callback generates no output.');
-
-    $variables = array();
-    $variables['heading'] = 'Some title';
-    $expected = '';
-    $this->assertThemeOutput('links', $variables, $expected, 'Empty %callback with heading generates no output.');
-
-    // Verify that a list of links is properly rendered.
-    $variables = array();
-    $variables['attributes'] = array('id' => 'somelinks');
-    $variables['links'] = array(
-      'a link' => array(
-        'title' => 'A <link>',
-        'url' => Url::fromUri('base:a/link'),
-      ),
-      'plain text' => array(
-        'title' => 'Plain "text"',
-      ),
-      'html text' => array(
-        'title' => SafeMarkup::format('<span class="unescaped">@text</span>', array('@text' => 'potentially unsafe text that <should> be escaped')),
-      ),
-      'front page' => array(
-        'title' => 'Front page',
-        'url' => Url::fromRoute('<front>'),
-      ),
-      'router-test' => array(
-        'title' => 'Test route',
-        'url' => Url::fromRoute('router_test.1'),
-      ),
-      'query-test' => array(
-        'title' => 'Query test route',
-        'url' => Url::fromRoute('router_test.1'),
-        'query' => array(
-          'key' => 'value',
-        )
-      ),
-    );
-
-    $expected_links = '';
-    $expected_links .= '<ul id="somelinks">';
-    $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
-    $expected_links .= '<li class="plain-text">' . Html::escape('Plain "text"') . '</li>';
-    $expected_links .= '<li class="html-text"><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
-    $expected_links .= '<li class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '">' . Html::escape('Front page') . '</a></li>';
-    $expected_links .= '<li class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . Html::escape('Test route') . '</a></li>';
-    $query = array('key' => 'value');
-    $expected_links .= '<li class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . Html::escape('Query test route') . '</a></li>';
-    $expected_links .= '</ul>';
-
-    // Verify that passing a string as heading works.
-    $variables['heading'] = 'Links heading';
-    $expected_heading = '<h2>Links heading</h2>';
-    $expected = $expected_heading . $expected_links;
-    $this->assertThemeOutput('links', $variables, $expected);
-
-    // Restore the original request's query.
-    \Drupal::request()->query->replace($original_query);
-
-    // Verify that passing an array as heading works (core support).
-    $variables['heading'] = array(
-      'text' => 'Links heading',
-      'level' => 'h3',
-      'attributes' => array('class' => array('heading')),
-    );
-    $expected_heading = '<h3 class="heading">Links heading</h3>';
-    $expected = $expected_heading . $expected_links;
-    $this->assertThemeOutput('links', $variables, $expected);
-
-    // Verify that passing attributes for the heading works.
-    $variables['heading'] = array('text' => 'Links heading', 'level' => 'h3', 'attributes' => array('id' => 'heading'));
-    $expected_heading = '<h3 id="heading">Links heading</h3>';
-    $expected = $expected_heading . $expected_links;
-    $this->assertThemeOutput('links', $variables, $expected);
-
-    // Verify that passing attributes for the links work.
-    $variables['links']['plain text']['attributes'] = array(
-      'class' => array('a/class'),
-    );
-    $expected_links = '';
-    $expected_links .= '<ul id="somelinks">';
-    $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
-    $expected_links .= '<li class="plain-text"><span class="a/class">' . Html::escape('Plain "text"') . '</span></li>';
-    $expected_links .= '<li class="html-text"><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
-    $expected_links .= '<li class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '">' . Html::escape('Front page') . '</a></li>';
-    $expected_links .= '<li class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . Html::escape('Test route') . '</a></li>';
-    $query = array('key' => 'value');
-    $expected_links .= '<li class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . Html::escape('Query test route') . '</a></li>';
-    $expected_links .= '</ul>';
-    $expected = $expected_heading . $expected_links;
-    $this->assertThemeOutput('links', $variables, $expected);
-
-    // Verify the data- attributes for setting the "active" class on links.
-    \Drupal::currentUser()->setAccount(new UserSession(array('uid' => 1)));
-    $variables['set_active_class'] = TRUE;
-    $expected_links = '';
-    $expected_links .= '<ul id="somelinks">';
-    $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
-    $expected_links .= '<li class="plain-text"><span class="a/class">' . Html::escape('Plain "text"') . '</span></li>';
-    $expected_links .= '<li class="html-text"><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
-    $expected_links .= '<li data-drupal-link-system-path="&lt;front&gt;" class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '" data-drupal-link-system-path="&lt;front&gt;">' . Html::escape('Front page') . '</a></li>';
-    $expected_links .= '<li data-drupal-link-system-path="router_test/test1" class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '" data-drupal-link-system-path="router_test/test1">' . Html::escape('Test route') . '</a></li>';
-    $query = array('key' => 'value');
-    $encoded_query = Html::escape(Json::encode($query));
-    $expected_links .= '<li data-drupal-link-query="' . $encoded_query . '" data-drupal-link-system-path="router_test/test1" class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '" data-drupal-link-query="' . $encoded_query . '" data-drupal-link-system-path="router_test/test1">' . Html::escape('Query test route') . '</a></li>';
-    $expected_links .= '</ul>';
-    $expected = $expected_heading . $expected_links;
-    $this->assertThemeOutput('links', $variables, $expected);
-  }
-
-  /**
-   * Tests links.html.twig using links with indexed keys.
-   */
-  function testIndexedKeyedLinks() {
+  public function testLinks() {
     // Turn off the query for the
     // \Drupal\Core\Utility\LinkGeneratorInterface::generate() method to compare
     // the active link correctly.
@@ -306,33 +185,154 @@ class FunctionsTest extends WebTestBase {
     // Verify that a list of links is properly rendered.
     $variables = [];
     $variables['attributes'] = ['id' => 'somelinks'];
-    $variables['links'] = array(
-      array(
+    $variables['links'] = [
+      'a link' => [
         'title' => 'A <link>',
         'url' => Url::fromUri('base:a/link'),
-      ),
-      array(
+      ],
+      'plain text' => [
         'title' => 'Plain "text"',
-      ),
-      array(
-        'title' => SafeMarkup::format('<span class="unescaped">@text</span>', array('@text' => 'potentially unsafe text that <should> be escaped')),
-      ),
-      array(
+      ],
+      'html text' => [
+        'title' => SafeMarkup::format('<span class="unescaped">@text</span>', ['@text' => 'potentially unsafe text that <should> be escaped']),
+      ],
+      'front page' => [
         'title' => 'Front page',
         'url' => Url::fromRoute('<front>'),
-      ),
-      array(
+      ],
+      'router-test' => [
         'title' => 'Test route',
         'url' => Url::fromRoute('router_test.1'),
-      ),
-      array(
+      ],
+      'query-test' => [
         'title' => 'Query test route',
         'url' => Url::fromRoute('router_test.1'),
-        'query' => array(
+        'query' => [
           'key' => 'value',
-        )
-      ),
-    );
+        ]
+      ],
+    ];
+
+    $expected_links = '';
+    $expected_links .= '<ul id="somelinks">';
+    $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
+    $expected_links .= '<li class="plain-text">' . Html::escape('Plain "text"') . '</li>';
+    $expected_links .= '<li class="html-text"><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
+    $expected_links .= '<li class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '">' . Html::escape('Front page') . '</a></li>';
+    $expected_links .= '<li class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . Html::escape('Test route') . '</a></li>';
+    $query = ['key' => 'value'];
+    $expected_links .= '<li class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . Html::escape('Query test route') . '</a></li>';
+    $expected_links .= '</ul>';
+
+    // Verify that passing a string as heading works.
+    $variables['heading'] = 'Links heading';
+    $expected_heading = '<h2>Links heading</h2>';
+    $expected = $expected_heading . $expected_links;
+    $this->assertThemeOutput('links', $variables, $expected);
+
+    // Restore the original request's query.
+    \Drupal::request()->query->replace($original_query);
+
+    // Verify that passing an array as heading works (core support).
+    $variables['heading'] = [
+      'text' => 'Links heading',
+      'level' => 'h3',
+      'attributes' => ['class' => ['heading']],
+    ];
+    $expected_heading = '<h3 class="heading">Links heading</h3>';
+    $expected = $expected_heading . $expected_links;
+    $this->assertThemeOutput('links', $variables, $expected);
+
+    // Verify that passing attributes for the heading works.
+    $variables['heading'] = ['text' => 'Links heading', 'level' => 'h3', 'attributes' => ['id' => 'heading']];
+    $expected_heading = '<h3 id="heading">Links heading</h3>';
+    $expected = $expected_heading . $expected_links;
+    $this->assertThemeOutput('links', $variables, $expected);
+
+    // Verify that passing attributes for the links work.
+    $variables['links']['plain text']['attributes'] = [
+      'class' => ['a/class'],
+    ];
+    $expected_links = '';
+    $expected_links .= '<ul id="somelinks">';
+    $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
+    $expected_links .= '<li class="plain-text"><span class="a/class">' . Html::escape('Plain "text"') . '</span></li>';
+    $expected_links .= '<li class="html-text"><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
+    $expected_links .= '<li class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '">' . Html::escape('Front page') . '</a></li>';
+    $expected_links .= '<li class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . Html::escape('Test route') . '</a></li>';
+    $query = ['key' => 'value'];
+    $expected_links .= '<li class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . Html::escape('Query test route') . '</a></li>';
+    $expected_links .= '</ul>';
+    $expected = $expected_heading . $expected_links;
+    $this->assertThemeOutput('links', $variables, $expected);
+
+    // Verify the data- attributes for setting the "active" class on links.
+    \Drupal::currentUser()->setAccount(new UserSession(['uid' => 1]));
+    $variables['set_active_class'] = TRUE;
+    $expected_links = '';
+    $expected_links .= '<ul id="somelinks">';
+    $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
+    $expected_links .= '<li class="plain-text"><span class="a/class">' . Html::escape('Plain "text"') . '</span></li>';
+    $expected_links .= '<li class="html-text"><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
+    $expected_links .= '<li data-drupal-link-system-path="&lt;front&gt;" class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '" data-drupal-link-system-path="&lt;front&gt;">' . Html::escape('Front page') . '</a></li>';
+    $expected_links .= '<li data-drupal-link-system-path="router_test/test1" class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '" data-drupal-link-system-path="router_test/test1">' . Html::escape('Test route') . '</a></li>';
+    $query = ['key' => 'value'];
+    $encoded_query = Html::escape(Json::encode($query));
+    $expected_links .= '<li data-drupal-link-query="' . $encoded_query . '" data-drupal-link-system-path="router_test/test1" class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '" data-drupal-link-query="' . $encoded_query . '" data-drupal-link-system-path="router_test/test1">' . Html::escape('Query test route') . '</a></li>';
+    $expected_links .= '</ul>';
+    $expected = $expected_heading . $expected_links;
+    $this->assertThemeOutput('links', $variables, $expected);
+  }
+
+  /**
+   * Tests links.html.twig using links with indexed keys.
+   */
+  public function testIndexedKeyedLinks() {
+    // Turn off the query for the
+    // \Drupal\Core\Utility\LinkGeneratorInterface::generate() method to compare
+    // the active link correctly.
+    $original_query = \Drupal::request()->query->all();
+    \Drupal::request()->query->replace([]);
+    // Verify that empty variables produce no output.
+    $variables = [];
+    $expected = '';
+    $this->assertThemeOutput('links', $variables, $expected, 'Empty %callback generates no output.');
+
+    $variables = [];
+    $variables['heading'] = 'Some title';
+    $expected = '';
+    $this->assertThemeOutput('links', $variables, $expected, 'Empty %callback with heading generates no output.');
+
+    // Verify that a list of links is properly rendered.
+    $variables = [];
+    $variables['attributes'] = ['id' => 'somelinks'];
+    $variables['links'] = [
+      [
+        'title' => 'A <link>',
+        'url' => Url::fromUri('base:a/link'),
+      ],
+      [
+        'title' => 'Plain "text"',
+      ],
+      [
+        'title' => SafeMarkup::format('<span class="unescaped">@text</span>', ['@text' => 'potentially unsafe text that <should> be escaped']),
+      ],
+      [
+        'title' => 'Front page',
+        'url' => Url::fromRoute('<front>'),
+      ],
+      [
+        'title' => 'Test route',
+        'url' => Url::fromRoute('router_test.1'),
+      ],
+      [
+        'title' => 'Query test route',
+        'url' => Url::fromRoute('router_test.1'),
+        'query' => [
+          'key' => 'value',
+        ]
+      ],
+    ];
 
     $expected_links = '';
     $expected_links .= '<ul id="somelinks">';
@@ -388,7 +388,7 @@ class FunctionsTest extends WebTestBase {
     $this->assertThemeOutput('links', $variables, $expected);
 
     // Verify the data- attributes for setting the "active" class on links.
-    \Drupal::currentUser()->setAccount(new UserSession(array('uid' => 1)));
+    \Drupal::currentUser()->setAccount(new UserSession(['uid' => 1]));
     $variables['set_active_class'] = TRUE;
     $expected_links = '';
     $expected_links .= '<ul id="somelinks">';
@@ -408,58 +408,58 @@ class FunctionsTest extends WebTestBase {
   /**
    * Test the use of drupal_pre_render_links() on a nested array of links.
    */
-  function testDrupalPreRenderLinks() {
+  public function testDrupalPreRenderLinks() {
     // Define the base array to be rendered, containing a variety of different
     // kinds of links.
-    $base_array = array(
+    $base_array = [
       '#theme' => 'links',
-      '#pre_render' => array('drupal_pre_render_links'),
-      '#links' => array(
-        'parent_link' => array(
+      '#pre_render' => ['drupal_pre_render_links'],
+      '#links' => [
+        'parent_link' => [
           'title' => 'Parent link original',
           'url' => Url::fromRoute('router_test.1'),
-        ),
-      ),
-      'first_child' => array(
+        ],
+      ],
+      'first_child' => [
         '#theme' => 'links',
-        '#links' => array(
+        '#links' => [
           // This should be rendered if 'first_child' is rendered separately,
           // but ignored if the parent is being rendered (since it duplicates
           // one of the parent's links).
-          'parent_link' => array(
+          'parent_link' => [
             'title' => 'Parent link copy',
             'url' => Url::fromRoute('router_test.6'),
-          ),
+          ],
           // This should always be rendered.
-          'first_child_link' => array(
+          'first_child_link' => [
             'title' => 'First child link',
             'url' => Url::fromRoute('router_test.7'),
-          ),
-        ),
-      ),
+          ],
+        ],
+      ],
       // This should always be rendered as part of the parent.
-      'second_child' => array(
+      'second_child' => [
         '#theme' => 'links',
-        '#links' => array(
-          'second_child_link' => array(
+        '#links' => [
+          'second_child_link' => [
             'title' => 'Second child link',
             'url' => Url::fromRoute('router_test.8'),
-          ),
-        ),
-      ),
+          ],
+        ],
+      ],
       // This should never be rendered, since the user does not have access to
       // it.
-      'third_child' => array(
+      'third_child' => [
         '#theme' => 'links',
-        '#links' => array(
-          'third_child_link' => array(
+        '#links' => [
+          'third_child_link' => [
             'title' => 'Third child link',
             'url' => Url::fromRoute('router_test.9'),
-          ),
-        ),
+          ],
+        ],
         '#access' => FALSE,
-      ),
-    );
+      ],
+    ];
 
     // Start with a fresh copy of the base array, and try rendering the entire
     // thing. We expect a single <ul> with appropriate links contained within
@@ -506,9 +506,9 @@ class FunctionsTest extends WebTestBase {
   /**
    * Tests theme_image().
    */
-  function testImage() {
+  public function testImage() {
     // Test that data URIs work with theme_image().
-    $variables = array();
+    $variables = [];
     $variables['uri'] = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==';
     $variables['alt'] = 'Data URI image of a red dot';
     $expected = '<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="Data URI image of a red dot" />' . "\n";
diff --git a/web/core/modules/system/src/Tests/Theme/HtmlAttributesTest.php b/web/core/modules/system/src/Tests/Theme/HtmlAttributesTest.php
index f103caaa7..b2018c777 100644
--- a/web/core/modules/system/src/Tests/Theme/HtmlAttributesTest.php
+++ b/web/core/modules/system/src/Tests/Theme/HtmlAttributesTest.php
@@ -16,12 +16,12 @@ class HtmlAttributesTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('theme_test');
+  public static $modules = ['theme_test'];
 
   /**
    * Tests that attributes in the 'html' and 'body' elements can be altered.
    */
-  function testThemeHtmlAttributes() {
+  public function testThemeHtmlAttributes() {
     $this->drupalGet('');
     $attributes = $this->xpath('/html[@theme_test_html_attribute="theme test html attribute value"]');
     $this->assertTrue(count($attributes) == 1, "Attribute set in the 'html' element via hook_preprocess_HOOK() found.");
diff --git a/web/core/modules/system/src/Tests/Theme/ThemeSuggestionsAlterTest.php b/web/core/modules/system/src/Tests/Theme/ThemeSuggestionsAlterTest.php
index 75e52c9b8..c01a94fec 100644
--- a/web/core/modules/system/src/Tests/Theme/ThemeSuggestionsAlterTest.php
+++ b/web/core/modules/system/src/Tests/Theme/ThemeSuggestionsAlterTest.php
@@ -17,17 +17,17 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('theme_test');
+  public static $modules = ['theme_test'];
 
   protected function setUp() {
     parent::setUp();
-    \Drupal::service('theme_handler')->install(array('test_theme'));
+    \Drupal::service('theme_handler')->install(['test_theme']);
   }
 
   /**
    * Tests that hooks to provide theme suggestions work.
    */
-  function testTemplateSuggestions() {
+  public function testTemplateSuggestions() {
     $this->drupalGet('theme-test/suggestion-provided');
     $this->assertText('Template for testing suggestions provided by the module declaring the theme hook.');
 
@@ -44,7 +44,7 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
   /**
    * Tests hook_theme_suggestions_alter().
    */
-  function testGeneralSuggestionsAlter() {
+  public function testGeneralSuggestionsAlter() {
     $this->drupalGet('theme-test/general-suggestion-alter');
     $this->assertText('Original template for testing hook_theme_suggestions_alter().');
 
@@ -57,7 +57,7 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
 
     // Enable the theme_suggestions_test module to test modules implementing
     // suggestions alter hooks.
-    \Drupal::service('module_installer')->install(array('theme_suggestions_test'));
+    \Drupal::service('module_installer')->install(['theme_suggestions_test']);
     $this->resetAll();
     $this->drupalGet('theme-test/general-suggestion-alter');
     $this->assertText('Template overridden based on new theme suggestion provided by a module via hook_theme_suggestions_alter().');
@@ -66,7 +66,7 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
   /**
    * Tests that theme suggestion alter hooks work for templates.
    */
-  function testTemplateSuggestionsAlter() {
+  public function testTemplateSuggestionsAlter() {
     $this->drupalGet('theme-test/suggestion-alter');
     $this->assertText('Original template for testing hook_theme_suggestions_HOOK_alter().');
 
@@ -79,7 +79,7 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
 
     // Enable the theme_suggestions_test module to test modules implementing
     // suggestions alter hooks.
-    \Drupal::service('module_installer')->install(array('theme_suggestions_test'));
+    \Drupal::service('module_installer')->install(['theme_suggestions_test']);
     $this->resetAll();
     $this->drupalGet('theme-test/suggestion-alter');
     $this->assertText('Template overridden based on new theme suggestion provided by a module via hook_theme_suggestions_HOOK_alter().');
@@ -88,7 +88,7 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
   /**
    * Tests that theme suggestion alter hooks work for specific theme calls.
    */
-  function testSpecificSuggestionsAlter() {
+  public function testSpecificSuggestionsAlter() {
     // Test that the default template is rendered.
     $this->drupalGet('theme-test/specific-suggestion-alter');
     $this->assertText('Template for testing specific theme calls.');
@@ -103,7 +103,7 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
     $this->assertText('theme_test_specific_suggestions__variant', 'Specific theme call is added to the suggestions array.');
 
     // Ensure that the base hook is used to determine the suggestion alter hook.
-    \Drupal::service('module_installer')->install(array('theme_suggestions_test'));
+    \Drupal::service('module_installer')->install(['theme_suggestions_test']);
     $this->resetAll();
     $this->drupalGet('theme-test/specific-suggestion-alter');
     $this->assertText('Template overridden based on suggestion alter hook determined by the base hook.');
@@ -113,7 +113,7 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
   /**
    * Tests that theme suggestion alter hooks work for theme functions.
    */
-  function testThemeFunctionSuggestionsAlter() {
+  public function testThemeFunctionSuggestionsAlter() {
     $this->drupalGet('theme-test/function-suggestion-alter');
     $this->assertText('Original theme function.');
 
@@ -126,7 +126,7 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
 
     // Enable the theme_suggestions_test module to test modules implementing
     // suggestions alter hooks.
-    \Drupal::service('module_installer')->install(array('theme_suggestions_test'));
+    \Drupal::service('module_installer')->install(['theme_suggestions_test']);
     $this->resetAll();
     $this->drupalGet('theme-test/function-suggestion-alter');
     $this->assertText('Theme function overridden based on new theme suggestion provided by a module.');
@@ -143,7 +143,7 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
     // Enable theme_suggestions_test module and make two requests to make sure
     // the include file is always loaded. The file will always be included for
     // the first request because the theme registry is being rebuilt.
-    \Drupal::service('module_installer')->install(array('theme_suggestions_test'));
+    \Drupal::service('module_installer')->install(['theme_suggestions_test']);
     $this->resetAll();
     $this->drupalGet('theme-test/suggestion-alter-include');
     $this->assertText('Function suggested via suggestion alter hook found in include file.', 'Include file loaded for initial request.');
@@ -157,12 +157,12 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
    * hook_theme_suggestions_alter() should fire before
    * hook_theme_suggestions_HOOK_alter() within an extension (module or theme).
    */
-  function testExecutionOrder() {
+  public function testExecutionOrder() {
     // Install our test theme and module.
     $this->config('system.theme')
       ->set('default', 'test_theme')
       ->save();
-    \Drupal::service('module_installer')->install(array('theme_suggestions_test'));
+    \Drupal::service('module_installer')->install(['theme_suggestions_test']);
     $this->resetAll();
 
     // Send two requests so that we get all the messages we've set via
@@ -170,15 +170,15 @@ class ThemeSuggestionsAlterTest extends WebTestBase {
     $this->drupalGet('theme-test/suggestion-alter');
     // Ensure that the order is first by extension, then for a given extension,
     // the hook-specific one after the generic one.
-    $expected = array(
+    $expected = [
       'theme_suggestions_test_theme_suggestions_alter() executed.',
       'theme_suggestions_test_theme_suggestions_theme_test_suggestions_alter() executed.',
       'theme_test_theme_suggestions_alter() executed.',
       'theme_test_theme_suggestions_theme_test_suggestions_alter() executed.',
       'test_theme_theme_suggestions_alter() executed.',
       'test_theme_theme_suggestions_theme_test_suggestions_alter() executed.',
-    );
-    $content = preg_replace('/\s+/', ' ', Xss::filter($this->content, array()));
+    ];
+    $content = preg_replace('/\s+/', ' ', Xss::filter($this->content, []));
     $this->assert(strpos($content, implode(' ', $expected)) !== FALSE, 'Suggestion alter hooks executed in the expected order.');
   }
 
diff --git a/web/core/modules/system/src/Tests/Theme/ThemeTest.php b/web/core/modules/system/src/Tests/Theme/ThemeTest.php
index 4eae7ae0e..64f330e94 100644
--- a/web/core/modules/system/src/Tests/Theme/ThemeTest.php
+++ b/web/core/modules/system/src/Tests/Theme/ThemeTest.php
@@ -22,11 +22,11 @@ class ThemeTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('theme_test', 'node');
+  public static $modules = ['theme_test', 'node'];
 
   protected function setUp() {
     parent::setUp();
-    \Drupal::service('theme_handler')->install(array('test_theme'));
+    \Drupal::service('theme_handler')->install(['test_theme']);
   }
 
   /**
@@ -39,29 +39,29 @@ class ThemeTest extends WebTestBase {
    *   - the render element's #attributes
    *   - any attributes set in the template's preprocessing function
    */
-  function testAttributeMerging() {
-    $theme_test_render_element = array(
-      'elements' => array(
-        '#attributes' => array('data-foo' => 'bar'),
-      ),
-      'attributes' => array(
+  public function testAttributeMerging() {
+    $theme_test_render_element = [
+      'elements' => [
+        '#attributes' => ['data-foo' => 'bar'],
+      ],
+      'attributes' => [
         'id' => 'bazinga',
-      ),
-    );
+      ],
+    ];
     $this->assertThemeOutput('theme_test_render_element', $theme_test_render_element, '<div id="bazinga" data-foo="bar" data-variables-are-preprocessed></div>' . "\n");
   }
 
   /**
    * Test that ThemeManager renders the expected data types.
    */
-  function testThemeDataTypes() {
+  public function testThemeDataTypes() {
     // theme_test_false is an implemented theme hook so \Drupal::theme() service
     // should return a string or an object that implements MarkupInterface,
     // even though the theme function itself can return anything.
-    $foos = array('null' => NULL, 'false' => FALSE, 'integer' => 1, 'string' => 'foo', 'empty_string' => '');
+    $foos = ['null' => NULL, 'false' => FALSE, 'integer' => 1, 'string' => 'foo', 'empty_string' => ''];
     foreach ($foos as $type => $example) {
-      $output = \Drupal::theme()->render('theme_test_foo', array('foo' => $example));
-      $this->assertTrue($output instanceof MarkupInterface || is_string($output), format_string('\Drupal::theme() returns an object that implements MarkupInterface or a string for data type @type.', array('@type' => $type)));
+      $output = \Drupal::theme()->render('theme_test_foo', ['foo' => $example]);
+      $this->assertTrue($output instanceof MarkupInterface || is_string($output), format_string('\Drupal::theme() returns an object that implements MarkupInterface or a string for data type @type.', ['@type' => $type]));
       if ($output instanceof MarkupInterface) {
         $this->assertIdentical((string) $example, $output->__toString());
       }
@@ -72,33 +72,33 @@ class ThemeTest extends WebTestBase {
 
     // suggestionnotimplemented is not an implemented theme hook so \Drupal::theme() service
     // should return FALSE instead of a string.
-    $output = \Drupal::theme()->render(array('suggestionnotimplemented'), array());
+    $output = \Drupal::theme()->render(['suggestionnotimplemented'], []);
     $this->assertIdentical($output, FALSE, '\Drupal::theme() returns FALSE when a hook suggestion is not implemented.');
   }
 
   /**
    * Test function theme_get_suggestions() for SA-CORE-2009-003.
    */
-  function testThemeSuggestions() {
+  public function testThemeSuggestions() {
     // Set the front page as something random otherwise the CLI
     // test runner fails.
     $this->config('system.site')->set('page.front', '/nobody-home')->save();
-    $args = array('node', '1', 'edit');
+    $args = ['node', '1', 'edit'];
     $suggestions = theme_get_suggestions($args, 'page');
-    $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1', 'page__node__edit'), 'Found expected node edit page suggestions');
+    $this->assertEqual($suggestions, ['page__node', 'page__node__%', 'page__node__1', 'page__node__edit'], 'Found expected node edit page suggestions');
     // Check attack vectors.
-    $args = array('node', '\\1');
+    $args = ['node', '\\1'];
     $suggestions = theme_get_suggestions($args, 'page');
-    $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1'), 'Removed invalid \\ from suggestions');
-    $args = array('node', '1/');
+    $this->assertEqual($suggestions, ['page__node', 'page__node__%', 'page__node__1'], 'Removed invalid \\ from suggestions');
+    $args = ['node', '1/'];
     $suggestions = theme_get_suggestions($args, 'page');
-    $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1'), 'Removed invalid / from suggestions');
-    $args = array('node', "1\0");
+    $this->assertEqual($suggestions, ['page__node', 'page__node__%', 'page__node__1'], 'Removed invalid / from suggestions');
+    $args = ['node', "1\0"];
     $suggestions = theme_get_suggestions($args, 'page');
-    $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1'), 'Removed invalid \\0 from suggestions');
+    $this->assertEqual($suggestions, ['page__node', 'page__node__%', 'page__node__1'], 'Removed invalid \\0 from suggestions');
     // Define path with hyphens to be used to generate suggestions.
-    $args = array('node', '1', 'hyphen-path');
-    $result = array('page__node', 'page__node__%', 'page__node__1', 'page__node__hyphen_path');
+    $args = ['node', '1', 'hyphen-path'];
+    $result = ['page__node', 'page__node__%', 'page__node__1', 'page__node__hyphen_path'];
     $suggestions = theme_get_suggestions($args, 'page');
     $this->assertEqual($suggestions, $result, 'Found expected page suggestions for paths containing hyphens.');
   }
@@ -110,7 +110,7 @@ class ThemeTest extends WebTestBase {
    * separate file, so this test also ensures that that file is correctly loaded
    * when needed.
    */
-  function testPreprocessForSuggestions() {
+  public function testPreprocessForSuggestions() {
     // Test with both an unprimed and primed theme registry.
     drupal_theme_rebuild();
     for ($i = 0; $i < 2; $i++) {
@@ -142,7 +142,7 @@ class ThemeTest extends WebTestBase {
   /**
    * Ensure page-front template suggestion is added when on front page.
    */
-  function testFrontPageThemeSuggestion() {
+  public function testFrontPageThemeSuggestion() {
     // Set the current route to user.login because theme_get_suggestions() will
     // query it to see if we are on the front page.
     $request = Request::create('/user/login');
@@ -150,7 +150,7 @@ class ThemeTest extends WebTestBase {
     $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('/user/login'));
     \Drupal::requestStack()->push($request);
     $this->config('system.site')->set('page.front', '/user/login')->save();
-    $suggestions = theme_get_suggestions(array('user', 'login'), 'page');
+    $suggestions = theme_get_suggestions(['user', 'login'], 'page');
     // Set it back to not annoy the batch runner.
     \Drupal::requestStack()->pop();
     $this->assertTrue(in_array('page__front', $suggestions), 'Front page template was suggested.');
@@ -161,7 +161,7 @@ class ThemeTest extends WebTestBase {
    *
    * @see test_theme.info.yml
    */
-  function testCSSOverride() {
+  public function testCSSOverride() {
     // Reuse the same page as in testPreprocessForSuggestions(). We're testing
     // what is output to the HTML HEAD based on what is in a theme's .info.yml
     // file, so it doesn't matter what page we get, as long as it is themed with
@@ -186,7 +186,7 @@ class ThemeTest extends WebTestBase {
   /**
    * Ensures a themes template is overridable based on the 'template' filename.
    */
-  function testTemplateOverride() {
+  public function testTemplateOverride() {
     $this->config('system.theme')
       ->set('default', 'test_theme')
       ->save();
@@ -197,7 +197,7 @@ class ThemeTest extends WebTestBase {
   /**
    * Ensures a theme template can override a theme function.
    */
-  function testFunctionOverride() {
+  public function testFunctionOverride() {
     $this->drupalGet('theme-test/function-template-overridden');
     $this->assertText('Success: Template overrides theme function.', 'Theme function overridden by test_theme template.');
   }
@@ -205,9 +205,9 @@ class ThemeTest extends WebTestBase {
   /**
    * Test the listInfo() function.
    */
-  function testListThemes() {
+  public function testListThemes() {
     $theme_handler = $this->container->get('theme_handler');
-    $theme_handler->install(array('test_subtheme'));
+    $theme_handler->install(['test_subtheme']);
     $themes = $theme_handler->listInfo();
 
     // Check if ThemeHandlerInterface::listInfo() retrieves enabled themes.
@@ -215,8 +215,8 @@ class ThemeTest extends WebTestBase {
 
     // Check if ThemeHandlerInterface::listInfo() returns disabled themes.
     // Check for base theme and subtheme lists.
-    $base_theme_list = array('test_basetheme' => 'Theme test base theme');
-    $sub_theme_list = array('test_subsubtheme' => 'Theme test subsubtheme', 'test_subtheme' => 'Theme test subtheme');
+    $base_theme_list = ['test_basetheme' => 'Theme test base theme'];
+    $sub_theme_list = ['test_subsubtheme' => 'Theme test subsubtheme', 'test_subtheme' => 'Theme test subtheme'];
 
     $this->assertIdentical($themes['test_basetheme']->sub_themes, $sub_theme_list, 'Base theme\'s object includes list of subthemes.');
     $this->assertIdentical($themes['test_subtheme']->base_themes, $base_theme_list, 'Subtheme\'s object includes list of base themes.');
@@ -230,28 +230,28 @@ class ThemeTest extends WebTestBase {
   /**
    * Tests child element rendering for 'render element' theme hooks.
    */
-  function testDrupalRenderChildren() {
-    $element = array(
+  public function testDrupalRenderChildren() {
+    $element = [
       '#theme' => 'theme_test_render_element_children',
-      'child' => array(
+      'child' => [
         '#markup' => 'Foo',
-      ),
-    );
+      ],
+    ];
     $this->assertThemeOutput('theme_test_render_element_children', $element, 'Foo', 'drupal_render() avoids #theme recursion loop when rendering a render element.');
 
-    $element = array(
-      '#theme_wrappers' => array('theme_test_render_element_children'),
-      'child' => array(
+    $element = [
+      '#theme_wrappers' => ['theme_test_render_element_children'],
+      'child' => [
         '#markup' => 'Foo',
-      ),
-    );
+      ],
+    ];
     $this->assertThemeOutput('theme_test_render_element_children', $element, 'Foo', 'drupal_render() avoids #theme_wrappers recursion loop when rendering a render element.');
   }
 
   /**
    * Tests theme can provide classes.
    */
-  function testClassLoading() {
+  public function testClassLoading() {
     new ThemeClass();
   }
 
@@ -270,7 +270,7 @@ class ThemeTest extends WebTestBase {
    * Some modules check the page array in template_preprocess_html(), so we
    * ensure that it has not been rendered prematurely.
    */
-  function testPreprocessHtml() {
+  public function testPreprocessHtml() {
     $this->drupalGet('');
     $attributes = $this->xpath('/html/body[@theme_test_page_variable="Page variable is an array."]');
     $this->assertTrue(count($attributes) == 1, 'In template_preprocess_html(), the page variable is still an array (not rendered yet).');
@@ -281,7 +281,7 @@ class ThemeTest extends WebTestBase {
    * Tests that region attributes can be manipulated via preprocess functions.
    */
   public function testRegionClass() {
-    \Drupal::service('module_installer')->install(array('block', 'theme_region_test'));
+    \Drupal::service('module_installer')->install(['block', 'theme_region_test']);
 
     // Place a block.
     $this->drupalPlaceBlock('system_main_block');
@@ -298,7 +298,7 @@ class ThemeTest extends WebTestBase {
    * when needed.
    */
   public function testSuggestionPreprocessForDefaults() {
-    \Drupal::service('theme_handler')->setDefault('test_theme');
+    $this->config('system.theme')->set('default', 'test_theme')->save();
     // Test with both an unprimed and primed theme registry.
     drupal_theme_rebuild();
     for ($i = 0; $i < 2; $i++) {
diff --git a/web/core/modules/system/src/Tests/Theme/TwigDebugMarkupTest.php b/web/core/modules/system/src/Tests/Theme/TwigDebugMarkupTest.php
index 1783be6f5..457fbad8b 100644
--- a/web/core/modules/system/src/Tests/Theme/TwigDebugMarkupTest.php
+++ b/web/core/modules/system/src/Tests/Theme/TwigDebugMarkupTest.php
@@ -16,18 +16,18 @@ class TwigDebugMarkupTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('theme_test', 'node');
+  public static $modules = ['theme_test', 'node'];
 
   /**
    * Tests debug markup added to Twig template output.
    */
-  function testTwigDebugMarkup() {
+  public function testTwigDebugMarkup() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
     $extension = twig_extension();
-    \Drupal::service('theme_handler')->install(array('test_theme'));
-    \Drupal::service('theme_handler')->setDefault('test_theme');
-    $this->drupalCreateContentType(array('type' => 'page'));
+    \Drupal::service('theme_handler')->install(['test_theme']);
+    $this->config('system.theme')->set('default', 'test_theme')->save();
+    $this->drupalCreateContentType(['type' => 'page']);
     // Enable debug, rebuild the service container, and clear all caches.
     $parameters = $this->container->getParameter('twig.config');
     $parameters['debug'] = TRUE;
@@ -62,7 +62,7 @@ class TwigDebugMarkupTest extends WebTestBase {
     // Create another node and make sure the template suggestions shown in the
     // debug markup are correct.
     $node3 = $this->drupalCreateNode();
-    $build = array('#theme' => 'node__foo__bar');
+    $build = ['#theme' => 'node__foo__bar'];
     $build += node_view($node3);
     $output = $renderer->renderRoot($build);
     $this->assertTrue(strpos($output, "THEME HOOK: 'node__foo__bar'") !== FALSE, 'Theme call information found.');
diff --git a/web/core/modules/system/src/Tests/Theme/TwigFilterTest.php b/web/core/modules/system/src/Tests/Theme/TwigFilterTest.php
index 810ed5331..653e4fa96 100644
--- a/web/core/modules/system/src/Tests/Theme/TwigFilterTest.php
+++ b/web/core/modules/system/src/Tests/Theme/TwigFilterTest.php
@@ -16,54 +16,54 @@ class TwigFilterTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('twig_theme_test');
+  public static $modules = ['twig_theme_test'];
 
   /**
    * Test Twig "without" filter.
    */
   public function testTwigWithoutFilter() {
-    $filter_test = array(
+    $filter_test = [
       '#theme' => 'twig_theme_test_filter',
-      '#quote' => array(
-        'content' => array('#markup' => 'You can only find truth with logic if you have already found truth without it.'),
-        'author' => array('#markup' => 'Gilbert Keith Chesterton'),
-        'date' => array('#markup' => '1874-1936'),
-      ),
-      '#attributes' => array(
+      '#quote' => [
+        'content' => ['#markup' => 'You can only find truth with logic if you have already found truth without it.'],
+        'author' => ['#markup' => 'Gilbert Keith Chesterton'],
+        'date' => ['#markup' => '1874-1936'],
+      ],
+      '#attributes' => [
         'id' => 'quotes',
         'checked' => TRUE,
-        'class' => array('red', 'green', 'blue'),
-      ),
-    );
+        'class' => ['red', 'green', 'blue'],
+      ],
+    ];
     $rendered = \Drupal::service('renderer')->renderRoot($filter_test);
     $this->setRawContent($rendered);
 
-    $elements = array(
-      array(
+    $elements = [
+      [
         'expected' => '<div><strong>No author:</strong> You can only find truth with logic if you have already found truth without it.1874-1936.</div>',
         'message' => '"No author" was successfully rendered.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><strong>Complete quote after without:</strong> You can only find truth with logic if you have already found truth without it.Gilbert Keith Chesterton1874-1936.</div>',
         'message' => '"Complete quote after without" was successfully rendered.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><strong>Only author:</strong> Gilbert Keith Chesterton.</div>',
         'message' => '"Only author:" was successfully rendered.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><strong>No author or date:</strong> You can only find truth with logic if you have already found truth without it..</div>',
         'message' => '"No author or date" was successfully rendered.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><strong>Only date:</strong> 1874-1936.</div>',
         'message' => '"Only date" was successfully rendered.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><strong>Complete quote again for good measure:</strong> You can only find truth with logic if you have already found truth without it.Gilbert Keith Chesterton1874-1936.</div>',
         'message' => '"Complete quote again for good measure" was successfully rendered.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><strong>Marked-up:</strong>
   <blockquote>
     <p>You can only find truth with logic if you have already found truth without it.</p>
@@ -72,48 +72,48 @@ class TwigFilterTest extends WebTestBase {
     </footer>
   </blockquote>',
         'message' => '"Marked-up quote" was successfully rendered.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><span id="quotes" checked class="red green blue">All attributes:</span></div>',
         'message' => 'All attributes printed.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><span class="red green blue" id="quotes" checked>Class attributes in front, remainder at the back:</span></div>',
         'message' => 'Class attributes printed in the front, the rest in the back.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><span id="quotes" checked data-class="red green blue">Class attributes in back, remainder at the front:</span></div>',
         'message' => 'Class attributes printed in the back, the rest in the front.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><span class="red green blue">Class attributes only:</span></div>',
         'message' => 'Class attributes only printed.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><span checked id="quotes" class="red green blue">Without boolean attribute.</span></div>',
         'message' => 'Boolean attribute printed in the front.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><span data-id="quotes" checked class="red green blue">Without string attribute.</span></div>',
         'message' => 'Without string attribute in the front.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><span checked>Without id and class attributes.</span></div>',
         'message' => 'Attributes printed without id and class attributes.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><span id="quotes" checked class="red green blue">All attributes again.</span></div>',
         'message' => 'All attributes printed again.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div id="quotes-here"><span class="gray-like-a-bunny bem__ized--top-feature" id="quotes-here">ID and class. Having the same ID twice is not valid markup but we want to make sure the filter doesn\'t use \Drupal\Component\Utility\Html::getUniqueId().</span></div>',
         'message' => 'Class and ID filtered.',
-      ),
-      array(
+      ],
+      [
         'expected' => '<div><strong>Rendered author string length:</strong> 24.</div>',
         'message' => 'Render filter string\'s length.',
-      ),
-    );
+      ],
+    ];
 
     foreach ($elements as $element) {
       $this->assertRaw($element['expected'], $element['message']);
diff --git a/web/core/modules/system/src/Tests/Theme/TwigNamespaceTest.php b/web/core/modules/system/src/Tests/Theme/TwigNamespaceTest.php
index 27a54d179..ab62889b9 100644
--- a/web/core/modules/system/src/Tests/Theme/TwigNamespaceTest.php
+++ b/web/core/modules/system/src/Tests/Theme/TwigNamespaceTest.php
@@ -16,7 +16,7 @@ class TwigNamespaceTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('twig_theme_test', 'twig_namespace_a', 'twig_namespace_b', 'node');
+  public static $modules = ['twig_theme_test', 'twig_namespace_a', 'twig_namespace_b', 'node'];
 
   /**
    * @var \Drupal\Core\Template\TwigEnvironment
@@ -25,7 +25,7 @@ class TwigNamespaceTest extends WebTestBase {
 
   protected function setUp() {
     parent::setUp();
-    \Drupal::service('theme_handler')->install(array('test_theme', 'bartik'));
+    \Drupal::service('theme_handler')->install(['test_theme', 'bartik']);
     $this->twig = \Drupal::service('twig');
   }
 
@@ -52,7 +52,7 @@ class TwigNamespaceTest extends WebTestBase {
    */
   public function testTwigNamespaces() {
     // Test twig @extends and @include in template files.
-    $test = array('#theme' => 'twig_namespace_test');
+    $test = ['#theme' => 'twig_namespace_test'];
     $this->setRawContent(\Drupal::service('renderer')->renderRoot($test));
 
     $this->assertText('This line is from twig_namespace_a/templates/test.html.twig');
diff --git a/web/core/modules/system/src/Tests/Theme/TwigRawTest.php b/web/core/modules/system/src/Tests/Theme/TwigRawTest.php
index 80afb8eaf..8be63dbb5 100644
--- a/web/core/modules/system/src/Tests/Theme/TwigRawTest.php
+++ b/web/core/modules/system/src/Tests/Theme/TwigRawTest.php
@@ -16,16 +16,16 @@ class TwigRawTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('twig_theme_test');
+  public static $modules = ['twig_theme_test'];
 
   /**
    * Tests the raw filter inside an autoescape tag.
    */
   public function testAutoescapeRaw() {
-    $test = array(
+    $test = [
       '#theme' => 'twig_raw_test',
       '#script' => '<script>alert("This alert is real because I will put it through the raw filter!");</script>',
-    );
+    ];
     $rendered = \Drupal::service('renderer')->renderRoot($test);
     $this->setRawContent($rendered);
     $this->assertRaw('<script>alert("This alert is real because I will put it through the raw filter!");</script>');
diff --git a/web/core/modules/system/src/Tests/Theme/TwigTransTest.php b/web/core/modules/system/src/Tests/Theme/TwigTransTest.php
index 9daf6a01b..b73cdaf0c 100644
--- a/web/core/modules/system/src/Tests/Theme/TwigTransTest.php
+++ b/web/core/modules/system/src/Tests/Theme/TwigTransTest.php
@@ -17,12 +17,12 @@ class TwigTransTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'theme_test',
     'twig_theme_test',
     'locale',
     'language'
-  );
+  ];
 
   /**
    * An administrative user for testing.
@@ -36,10 +36,10 @@ class TwigTransTest extends WebTestBase {
    *
    * @var array
    */
-  protected $languages = array(
+  protected $languages = [
     'xx' => 'Lolspeak',
     'zz' => 'Lolspeak2',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -48,16 +48,16 @@ class TwigTransTest extends WebTestBase {
     parent::setUp();
 
     // Setup test_theme.
-    \Drupal::service('theme_handler')->install(array('test_theme'));
-    \Drupal::service('theme_handler')->setDefault('test_theme');
+    \Drupal::service('theme_handler')->install(['test_theme']);
+    $this->config('system.theme')->set('default', 'test_theme')->save();
 
     // Create and log in as admin.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer languages',
       'access administration pages',
       'administer site configuration',
       'translate interface'
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
 
     // Install languages.
@@ -77,7 +77,7 @@ class TwigTransTest extends WebTestBase {
   public function testTwigTransTags() {
     // Run this once without and once with Twig debug because trans can work
     // differently depending on that setting.
-    $this->drupalGet('twig-theme-test/trans', array('language' => \Drupal::languageManager()->getLanguage('xx')));
+    $this->drupalGet('twig-theme-test/trans', ['language' => \Drupal::languageManager()->getLanguage('xx')]);
     $this->assertTwigTransTags();
 
     // Enable debug, rebuild the service container, and clear all caches.
@@ -87,7 +87,7 @@ class TwigTransTest extends WebTestBase {
     $this->rebuildContainer();
     $this->resetAll();
 
-    $this->drupalGet('twig-theme-test/trans', array('language' => \Drupal::languageManager()->getLanguage('xx')));
+    $this->drupalGet('twig-theme-test/trans', ['language' => \Drupal::languageManager()->getLanguage('xx')]);
     $this->assertTwigTransTags();
   }
 
@@ -197,12 +197,12 @@ class TwigTransTest extends WebTestBase {
       $contents = $this->poFileContents($langcode);
       if ($contents) {
         // Add test language for translation testing.
-        $edit = array(
+        $edit = [
           'predefined_langcode' => 'custom',
           'langcode' => $langcode,
           'label' => $name,
           'direction' => LanguageInterface::DIRECTION_LTR,
-        );
+        ];
 
         // Install the language in Drupal.
         $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
@@ -211,11 +211,11 @@ class TwigTransTest extends WebTestBase {
         // Import the custom .po contents for the language.
         $filename = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
         file_put_contents($filename, $contents);
-        $options = array(
+        $options = [
           'files[file]' => $filename,
           'langcode' => $langcode,
           'customized' => TRUE,
-        );
+        ];
         $this->drupalPostForm('admin/config/regional/translate/import', $options, t('Import'));
         drupal_unlink($filename);
       }
diff --git a/web/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php b/web/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php
index a9723c235..ef22f0e1b 100644
--- a/web/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php
+++ b/web/core/modules/system/src/Tests/Update/DependencyHookInvocationTest.php
@@ -17,7 +17,7 @@ class DependencyHookInvocationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('update_test_0', 'update_test_1', 'update_test_2');
+  public static $modules = ['update_test_0', 'update_test_1', 'update_test_2'];
 
   protected function setUp() {
     parent::setUp();
@@ -27,7 +27,7 @@ class DependencyHookInvocationTest extends WebTestBase {
   /**
    * Test the structure of the array returned by hook_update_dependencies().
    */
-  function testHookUpdateDependencies() {
+  public function testHookUpdateDependencies() {
     $update_dependencies = update_retrieve_dependencies();
     $this->assertTrue($update_dependencies['update_test_0'][8001]['update_test_1'] == 8001, 'An update function that has a dependency on two separate modules has the first dependency recorded correctly.');
     $this->assertTrue($update_dependencies['update_test_0'][8001]['update_test_2'] == 8002, 'An update function that has a dependency on two separate modules has the second dependency recorded correctly.');
diff --git a/web/core/modules/system/src/Tests/Update/DependencyMissingTest.php b/web/core/modules/system/src/Tests/Update/DependencyMissingTest.php
index 9764b4c81..407ef3360 100644
--- a/web/core/modules/system/src/Tests/Update/DependencyMissingTest.php
+++ b/web/core/modules/system/src/Tests/Update/DependencyMissingTest.php
@@ -16,7 +16,7 @@ class DependencyMissingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('update_test_0', 'update_test_2');
+  public static $modules = ['update_test_0', 'update_test_2'];
 
   protected function setUp() {
     // Only install update_test_2.module, even though its updates have a
@@ -25,10 +25,10 @@ class DependencyMissingTest extends WebTestBase {
     require_once \Drupal::root() . '/core/includes/update.inc';
   }
 
-  function testMissingUpdate() {
-    $starting_updates = array(
+  public function testMissingUpdate() {
+    $starting_updates = [
       'update_test_2' => 8001,
-    );
+    ];
     $update_graph = update_resolve_dependencies($starting_updates);
     $this->assertTrue($update_graph['update_test_2_update_8001']['allowed'], "The module's first update function is allowed to run, since it does not have any missing dependencies.");
     $this->assertFalse($update_graph['update_test_2_update_8002']['allowed'], "The module's second update function is not allowed to run, since it has a direct dependency on a missing update.");
diff --git a/web/core/modules/system/src/Tests/Update/DependencyOrderingTest.php b/web/core/modules/system/src/Tests/Update/DependencyOrderingTest.php
index bb3ae3717..8616fb6ba 100644
--- a/web/core/modules/system/src/Tests/Update/DependencyOrderingTest.php
+++ b/web/core/modules/system/src/Tests/Update/DependencyOrderingTest.php
@@ -16,7 +16,7 @@ class DependencyOrderingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('update_test_0', 'update_test_1', 'update_test_2', 'update_test_3');
+  public static $modules = ['update_test_0', 'update_test_1', 'update_test_2', 'update_test_3'];
 
   protected function setUp() {
     parent::setUp();
@@ -26,15 +26,15 @@ class DependencyOrderingTest extends WebTestBase {
   /**
    * Test that updates within a single module run in the correct order.
    */
-  function testUpdateOrderingSingleModule() {
-    $starting_updates = array(
+  public function testUpdateOrderingSingleModule() {
+    $starting_updates = [
       'update_test_1' => 8001,
-    );
-    $expected_updates = array(
+    ];
+    $expected_updates = [
       'update_test_1_update_8001',
       'update_test_1_update_8002',
       'update_test_1_update_8003',
-    );
+    ];
     $actual_updates = array_keys(update_resolve_dependencies($starting_updates));
     $this->assertEqual($expected_updates, $actual_updates, 'Updates within a single module run in the correct order.');
   }
@@ -42,11 +42,11 @@ class DependencyOrderingTest extends WebTestBase {
   /**
    * Test that dependencies between modules are resolved correctly.
    */
-  function testUpdateOrderingModuleInterdependency() {
-    $starting_updates = array(
+  public function testUpdateOrderingModuleInterdependency() {
+    $starting_updates = [
       'update_test_2' => 8001,
       'update_test_3' => 8001,
-    );
+    ];
     $update_order = array_keys(update_resolve_dependencies($starting_updates));
     // Make sure that each dependency is satisfied.
     $first_dependency_satisfied = array_search('update_test_2_update_8001', $update_order) < array_search('update_test_3_update_8001', $update_order);
diff --git a/web/core/modules/system/src/Tests/Update/InstallProfileSystemInstall8300Test.php b/web/core/modules/system/src/Tests/Update/InstallProfileSystemInstall8300Test.php
new file mode 100644
index 000000000..f0eabd62e
--- /dev/null
+++ b/web/core/modules/system/src/Tests/Update/InstallProfileSystemInstall8300Test.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\system\Tests\Update;
+
+use Drupal\Core\Site\Settings;
+
+/**
+ * Tests system_update_8300().
+ *
+ * @group Update
+ */
+class InstallProfileSystemInstall8300Test extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../tests/fixtures/update/drupal-8.bare.standard.php.gz',
+    ];
+  }
+
+  /**
+   * Ensures that the system_update_8300() runs as expected.
+   */
+  public function testUpdate() {
+    // Ensure the BC layers work and settings.php and configuration is in the
+    // expected state before updating.
+    $this->assertEqual('standard', \Drupal::installProfile());
+    $this->assertEqual('standard', Settings::get('install_profile'), 'The install profile has not been written to settings.php.');
+    $this->assertFalse($this->config('core.extension')->get('profile'), 'The install profile is not present in core.extension configuration.');
+
+    $this->runUpdates();
+    // Confirm that Drupal recognizes this distribution as the current profile.
+    $this->assertEqual('standard', \Drupal::installProfile());
+    $this->assertEqual('standard', Settings::get('install_profile'), 'The install profile has not been written to settings.php.');
+    $this->assertEqual('standard', $this->config('core.extension')->get('profile'), 'The install profile has been written to core.extension configuration.');
+  }
+
+}
diff --git a/web/core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php b/web/core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php
index ce5a0066f..59c64f624 100644
--- a/web/core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php
+++ b/web/core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php
@@ -17,7 +17,7 @@ class InvalidUpdateHookTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('update_test_invalid_hook', 'update_script_test', 'dblog');
+  public static $modules = ['update_test_invalid_hook', 'update_script_test', 'dblog'];
 
   /**
    * URL for the upgrade script.
@@ -38,10 +38,10 @@ class InvalidUpdateHookTest extends WebTestBase {
     require_once \Drupal::root() . '/core/includes/update.inc';
 
     $this->updateUrl = $GLOBALS['base_url'] . '/update.php';
-    $this->updateUser = $this->drupalCreateUser(array('administer software updates'));
+    $this->updateUser = $this->drupalCreateUser(['administer software updates']);
   }
 
-  function testInvalidUpdateHook() {
+  public function testInvalidUpdateHook() {
     // Confirm that a module with hook_update_8000() cannot be updated.
     $this->drupalLogin($this->updateUser);
     $this->drupalGet($this->updateUrl);
diff --git a/web/core/modules/system/src/Tests/Update/UpdateEntityDisplayTest.php b/web/core/modules/system/src/Tests/Update/UpdateEntityDisplayTest.php
new file mode 100644
index 000000000..0a2cbf45b
--- /dev/null
+++ b/web/core/modules/system/src/Tests/Update/UpdateEntityDisplayTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Drupal\system\Tests\Update;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+
+/**
+ * Tests system_post_update_add_region_to_entity_displays().
+ *
+ * @group Update
+ */
+class UpdateEntityDisplayTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../tests/fixtures/update/drupal-8.bare.standard.php.gz',
+    ];
+  }
+
+  /**
+   * Tests that entity displays are updated with regions for their fields.
+   */
+  public function testUpdate() {
+    // No region key appears pre-update.
+    $entity_form_display = EntityFormDisplay::load('node.article.default');
+    $options = $entity_form_display->getComponent('body');
+    $this->assertFalse(array_key_exists('region', $options));
+
+    $entity_view_display = EntityViewDisplay::load('node.article.default');
+    $options = $entity_view_display->getComponent('body');
+    $this->assertFalse(array_key_exists('region', $options));
+
+    $this->runUpdates();
+
+    // The region key has been populated with 'content'.
+    $entity_form_display = EntityFormDisplay::load('node.article.default');
+    $options = $entity_form_display->getComponent('body');
+    $this->assertIdentical('content', $options['region']);
+
+    $entity_view_display = EntityViewDisplay::load('node.article.default');
+    $options = $entity_view_display->getComponent('body');
+    $this->assertIdentical('content', $options['region']);
+  }
+
+}
diff --git a/web/core/modules/system/src/Tests/Update/UpdatePathRC1TestBaseFilledTest.php b/web/core/modules/system/src/Tests/Update/UpdatePathRC1TestBaseFilledTest.php
index eb95fce6e..09cc586bc 100644
--- a/web/core/modules/system/src/Tests/Update/UpdatePathRC1TestBaseFilledTest.php
+++ b/web/core/modules/system/src/Tests/Update/UpdatePathRC1TestBaseFilledTest.php
@@ -29,13 +29,13 @@ class UpdatePathRC1TestBaseFilledTest extends UpdatePathRC1TestBaseTest {
 
     $spanish = \Drupal::languageManager()->getLanguage('es');
 
-    $expected_node_data = array(
+    $expected_node_data = [
       [1, 'article', 'en', 'Test Article - New title'],
       [2, 'book', 'en', 'Book page'],
       [3, 'forum', 'en', 'Forum topic'],
       [4, 'page', 'en', 'Test page'],
       [8, 'test_content_type', 'en', 'Test title'],
-    );
+    ];
     foreach ($expected_node_data as $node_data) {
       $id = $node_data[0];
       $type = $node_data[1];
diff --git a/web/core/modules/system/src/Tests/Update/UpdatePathTestBase.php b/web/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
index 04a0d6b76..f7f88c648 100644
--- a/web/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
+++ b/web/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
@@ -3,7 +3,7 @@
 namespace Drupal\system\Tests\Update;
 
 use Drupal\Component\Utility\Crypt;
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Core\Database\Database;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Language\Language;
@@ -132,7 +132,7 @@ abstract class UpdatePathTestBase extends WebTestBase {
    *   (optional) The ID of the test. Tests with the same id are reported
    *   together.
    */
-  function __construct($test_id = NULL) {
+  public function __construct($test_id = NULL) {
     parent::__construct($test_id);
     $this->zlibInstalled = function_exists('gzopen');
   }
@@ -292,7 +292,7 @@ abstract class UpdatePathTestBase extends WebTestBase {
       $this->assertFalse($needs_updates, 'After all updates ran, entity schema is up to date.');
       if ($needs_updates) {
         foreach (\Drupal::entityDefinitionUpdateManager()
-                   ->getChangeSummary() as $entity_type_id => $summary) {
+          ->getChangeSummary() as $entity_type_id => $summary) {
           foreach ($summary as $message) {
             $this->fail($message);
           }
diff --git a/web/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php b/web/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php
index 6edbfe3ae..fe62340af 100644
--- a/web/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php
+++ b/web/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php
@@ -29,13 +29,13 @@ class UpdatePathTestBaseFilledTest extends UpdatePathTestBaseTest {
 
     $spanish = \Drupal::languageManager()->getLanguage('es');
 
-    $expected_node_data = array(
+    $expected_node_data = [
       [1, 'article', 'en', 'Test Article - New title'],
       [2, 'book', 'en', 'Book page'],
       [3, 'forum', 'en', 'Forum topic'],
       [4, 'page', 'en', 'Test page'],
       [8, 'test_content_type', 'en', 'Test title'],
-    );
+    ];
     foreach ($expected_node_data as $node_data) {
       $id = $node_data[0];
       $type = $node_data[1];
diff --git a/web/core/modules/system/src/Tests/Update/UpdateScriptTest.php b/web/core/modules/system/src/Tests/Update/UpdateScriptTest.php
index b80ef82e3..ed076b815 100644
--- a/web/core/modules/system/src/Tests/Update/UpdateScriptTest.php
+++ b/web/core/modules/system/src/Tests/Update/UpdateScriptTest.php
@@ -18,7 +18,7 @@ class UpdateScriptTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('update_script_test', 'dblog', 'language');
+  public static $modules = ['update_script_test', 'dblog', 'language'];
 
   /**
    * {@inheritdoc}
@@ -42,18 +42,18 @@ class UpdateScriptTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
     $this->updateUrl = Url::fromRoute('system.db_update');
-    $this->updateUser = $this->drupalCreateUser(array('administer software updates', 'access site in maintenance mode'));
+    $this->updateUser = $this->drupalCreateUser(['administer software updates', 'access site in maintenance mode']);
     \Drupal::service('entity.definition_update_manager')->applyUpdates();
   }
 
   /**
    * Tests access to the update script.
    */
-  function testUpdateAccess() {
+  public function testUpdateAccess() {
     // Try accessing update.php without the proper permission.
     $regular_user = $this->drupalCreateUser();
     $this->drupalLogin($regular_user);
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->assertResponse(403);
 
     // Check that a link to the update page is not accessible to regular users.
@@ -62,7 +62,7 @@ class UpdateScriptTest extends WebTestBase {
 
     // Try accessing update.php as an anonymous user.
     $this->drupalLogout();
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->assertResponse(403);
 
     // Check that a link to the update page is not accessible to anonymous
@@ -72,7 +72,7 @@ class UpdateScriptTest extends WebTestBase {
 
     // Access the update page with the proper permission.
     $this->drupalLogin($this->updateUser);
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->assertResponse(200);
 
     // Check that a link to the update page is accessible to users with proper
@@ -82,7 +82,7 @@ class UpdateScriptTest extends WebTestBase {
 
     // Access the update page as user 1.
     $this->drupalLogin($this->rootUser);
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->assertResponse(200);
 
     // Check that a link to the update page is accessible to user 1.
@@ -93,13 +93,13 @@ class UpdateScriptTest extends WebTestBase {
   /**
    * Tests that requirements warnings and errors are correctly displayed.
    */
-  function testRequirements() {
+  public function testRequirements() {
     $update_script_test_config = $this->config('update_script_test.settings');
     $this->drupalLogin($this->updateUser);
 
     // If there are no requirements warnings or errors, we expect to be able to
     // go through the update process uninterrupted.
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->clickLink(t('Continue'));
     $this->assertText(t('No pending updates.'), 'End of update process was reached.');
     // Confirm that all caches were cleared.
@@ -113,7 +113,7 @@ class UpdateScriptTest extends WebTestBase {
     // successfully.
     $update_script_test_config->set('requirement_type', REQUIREMENT_WARNING)->save();
     drupal_set_installed_schema_version('update_script_test', drupal_get_installed_schema_version('update_script_test') - 1);
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->assertText('This is a requirements warning provided by the update_script_test module.');
     $this->clickLink('try again');
     $this->assertNoText('This is a requirements warning provided by the update_script_test module.');
@@ -124,7 +124,7 @@ class UpdateScriptTest extends WebTestBase {
     $this->assertText(t('hook_cache_flush() invoked for update_script_test.module.'), 'Caches were cleared after resolving a requirements warning and applying updates.');
 
     // Now try again without pending updates to make sure that works too.
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->assertText('This is a requirements warning provided by the update_script_test module.');
     $this->clickLink('try again');
     $this->assertNoText('This is a requirements warning provided by the update_script_test module.');
@@ -137,7 +137,7 @@ class UpdateScriptTest extends WebTestBase {
     // clicking the link to proceed (since the problem that triggered the error
     // has not been fixed).
     $update_script_test_config->set('requirement_type', REQUIREMENT_ERROR)->save();
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->assertText('This is a requirements error provided by the update_script_test module.');
     $this->clickLink('try again');
     $this->assertText('This is a requirements error provided by the update_script_test module.');
@@ -146,7 +146,7 @@ class UpdateScriptTest extends WebTestBase {
   /**
    * Tests the effect of using the update script on the theme system.
    */
-  function testThemeSystem() {
+  public function testThemeSystem() {
     // Since visiting update.php triggers a rebuild of the theme system from an
     // unusual maintenance mode environment, we check that this rebuild did not
     // put any incorrect information about the themes into the database.
@@ -160,10 +160,10 @@ class UpdateScriptTest extends WebTestBase {
   /**
    * Tests update.php when there are no updates to apply.
    */
-  function testNoUpdateFunctionality() {
+  public function testNoUpdateFunctionality() {
     // Click through update.php with 'administer software updates' permission.
     $this->drupalLogin($this->updateUser);
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->clickLink(t('Continue'));
     $this->assertText(t('No pending updates.'));
     $this->assertNoLink('Administration pages');
@@ -172,9 +172,9 @@ class UpdateScriptTest extends WebTestBase {
     $this->assertResponse(200);
 
     // Click through update.php with 'access administration pages' permission.
-    $admin_user = $this->drupalCreateUser(array('administer software updates', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer software updates', 'access administration pages']);
     $this->drupalLogin($admin_user);
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->clickLink(t('Continue'));
     $this->assertText(t('No pending updates.'));
     $this->assertLink('Administration pages');
@@ -186,7 +186,7 @@ class UpdateScriptTest extends WebTestBase {
   /**
    * Tests update.php after performing a successful update.
    */
-  function testSuccessfulUpdateFunctionality() {
+  public function testSuccessfulUpdateFunctionality() {
     $initial_maintenance_mode = $this->container->get('state')->get('system.maintenance_mode');
     $this->assertFalse($initial_maintenance_mode, 'Site is not in maintenance mode.');
     $this->updateScriptTest($initial_maintenance_mode);
@@ -204,9 +204,9 @@ class UpdateScriptTest extends WebTestBase {
 
     // Click through update.php with 'access administration pages' and
     // 'access site reports' permissions.
-    $admin_user = $this->drupalCreateUser(array('administer software updates', 'access administration pages', 'access site reports', 'access site in maintenance mode'));
+    $admin_user = $this->drupalCreateUser(['administer software updates', 'access administration pages', 'access site reports', 'access site in maintenance mode']);
     $this->drupalLogin($admin_user);
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->clickLink(t('Continue'));
     $this->clickLink(t('Apply pending updates'));
     $this->assertText('Updates were attempted.');
@@ -220,7 +220,7 @@ class UpdateScriptTest extends WebTestBase {
   /**
    * Tests update.php while in maintenance mode.
    */
-  function testMaintenanceModeUpdateFunctionality() {
+  public function testMaintenanceModeUpdateFunctionality() {
     $this->container->get('state')
       ->set('system.maintenance_mode', TRUE);
     $initial_maintenance_mode = $this->container->get('state')
@@ -235,13 +235,13 @@ class UpdateScriptTest extends WebTestBase {
   /**
    * Tests perfoming updates with update.php in a multilingual environment.
    */
-  function testSuccessfulMultilingualUpdateFunctionality() {
+  public function testSuccessfulMultilingualUpdateFunctionality() {
     // Add some custom languages.
-    foreach (array('aa', 'bb') as $language_code) {
-      ConfigurableLanguage::create(array(
+    foreach (['aa', 'bb'] as $language_code) {
+      ConfigurableLanguage::create([
           'id' => $language_code,
           'label' => $this->randomMachineName(),
-        ))->save();
+        ])->save();
     }
 
     $config = \Drupal::service('config.factory')->getEditable('language.negotiation');
@@ -261,18 +261,18 @@ class UpdateScriptTest extends WebTestBase {
     $this->assertEqual($schema_version, 8000, 'update_script_test schema version overridden to 8000.');
 
     // Create admin user.
-    $admin_user = $this->drupalCreateUser(array('administer software updates', 'access administration pages', 'access site reports', 'access site in maintenance mode', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer software updates', 'access administration pages', 'access site reports', 'access site in maintenance mode', 'administer site configuration']);
     $this->drupalLogin($admin_user);
 
     // Visit status report page and ensure, that link to update.php has no path prefix set.
-    $this->drupalGet('en/admin/reports/status', array('external' => TRUE));
+    $this->drupalGet('en/admin/reports/status', ['external' => TRUE]);
     $this->assertResponse(200);
     $this->assertLinkByHref('/update.php');
     $this->assertNoLinkByHref('en/update.php');
 
     // Click through update.php with 'access administration pages' and
     // 'access site reports' permissions.
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->clickLink(t('Continue'));
     $this->clickLink(t('Apply pending updates'));
     $this->assertText('Updates were attempted.');
@@ -303,7 +303,7 @@ class UpdateScriptTest extends WebTestBase {
     else {
       $this->assertNoText('Operating in maintenance mode.');
     }
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->clickLink(t('Continue'));
     $this->clickLink(t('Apply pending updates'));
 
@@ -330,74 +330,74 @@ class UpdateScriptTest extends WebTestBase {
    * Returns the Drupal 7 system table schema.
    */
   public function getSystemSchema() {
-    return array(
+    return [
       'description' => "A list of all modules, themes, and theme engines that are or have been installed in Drupal's file system.",
-      'fields' => array(
-        'filename' => array(
+      'fields' => [
+        'filename' => [
           'description' => 'The path of the primary file for this item, relative to the Drupal root; e.g. modules/node/node.module.',
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'name' => array(
+        ],
+        'name' => [
           'description' => 'The name of the item; e.g. node.',
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'type' => array(
+        ],
+        'type' => [
           'description' => 'The type of the item, either module, theme, or theme_engine.',
           'type' => 'varchar',
           'length' => 12,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'owner' => array(
+        ],
+        'owner' => [
           'description' => "A theme's 'parent' . Can be either a theme or an engine.",
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'status' => array(
+        ],
+        'status' => [
           'description' => 'Boolean indicating whether or not this item is enabled.',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'bootstrap' => array(
+        ],
+        'bootstrap' => [
           'description' => "Boolean indicating whether this module is loaded during Drupal's early bootstrapping phase (e.g. even before the page cache is consulted).",
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'schema_version' => array(
+        ],
+        'schema_version' => [
           'description' => "The module's database schema version number. -1 if the module is not installed (its tables do not exist); \Drupal::CORE_MINIMUM_SCHEMA_VERSION or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed.",
           'type' => 'int',
           'not null' => TRUE,
           'default' => -1,
           'size' => 'small',
-        ),
-        'weight' => array(
+        ],
+        'weight' => [
           'description' => "The order in which this module's hooks should be invoked relative to other modules. Equal-weighted modules are ordered by name.",
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'info' => array(
+        ],
+        'info' => [
           'description' => "A serialized array containing information from the module's .info file; keys can include name, description, package, version, core, dependencies, and php.",
           'type' => 'blob',
           'not null' => FALSE,
-        ),
-      ),
-      'primary key' => array('filename'),
-      'indexes' => array(
-        'system_list' => array('status', 'bootstrap', 'type', 'weight', 'name'),
-        'type_name' => array('type', 'name'),
-      ),
-    );
+        ],
+      ],
+      'primary key' => ['filename'],
+      'indexes' => [
+        'system_list' => ['status', 'bootstrap', 'type', 'weight', 'name'],
+        'type_name' => ['type', 'name'],
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Update/UpdatesWith7xTest.php b/web/core/modules/system/src/Tests/Update/UpdatesWith7xTest.php
index 9782d91c6..c2035d133 100644
--- a/web/core/modules/system/src/Tests/Update/UpdatesWith7xTest.php
+++ b/web/core/modules/system/src/Tests/Update/UpdatesWith7xTest.php
@@ -17,7 +17,7 @@ class UpdatesWith7xTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('update_test_with_7x');
+  public static $modules = ['update_test_with_7x'];
 
   /**
    * The URL for the update page.
@@ -33,10 +33,10 @@ class UpdatesWith7xTest extends WebTestBase {
     parent::setUp();
     require_once \Drupal::root() . '/core/includes/update.inc';
     $this->updateUrl = $GLOBALS['base_url'] . '/update.php';
-    $this->updateUser = $this->drupalCreateUser(array('administer software updates'));
+    $this->updateUser = $this->drupalCreateUser(['administer software updates']);
   }
 
-  function testWith7x() {
+  public function testWith7x() {
     // Ensure that the minimum schema version is 8000, despite 7200 update
     // hooks and a 7XXX hook_update_last_removed().
     $this->assertEqual(drupal_get_installed_schema_version('update_test_with_7x'), 8000);
@@ -47,7 +47,7 @@ class UpdatesWith7xTest extends WebTestBase {
 
     // Click through update.php with 'administer software updates' permission.
     $this->drupalLogin($this->updateUser);
-    $this->drupalGet($this->updateUrl, array('external' => TRUE));
+    $this->drupalGet($this->updateUrl, ['external' => TRUE]);
     $this->clickLink(t('Continue'));
     $this->assertText(t('Some of the pending updates cannot be applied because their dependencies were not met.'));
   }
diff --git a/web/core/modules/system/system.admin.inc b/web/core/modules/system/system.admin.inc
index f9c49c765..799869bbc 100644
--- a/web/core/modules/system/system.admin.inc
+++ b/web/core/modules/system/system.admin.inc
@@ -49,10 +49,10 @@ function template_preprocess_admin_block_content(&$variables) {
  *     'right'.
  */
 function template_preprocess_admin_page(&$variables) {
-  $variables['system_compact_link'] = array(
+  $variables['system_compact_link'] = [
     '#type' => 'system_compact_link',
-  );
-  $variables['containers'] = array();
+  ];
+  $variables['containers'] = [];
   $stripe = 0;
   foreach ($variables['blocks'] as $block) {
     if (!empty($block['content']['#content'])) {
@@ -60,10 +60,10 @@ function template_preprocess_admin_page(&$variables) {
         // Perform automatic striping.
         $block['position'] = ++$stripe % 2 ? 'left' : 'right';
       }
-      $variables['containers'][$block['position']]['blocks'][] = array(
+      $variables['containers'][$block['position']]['blocks'][] = [
         '#theme' => 'admin_block',
         '#block' => $block,
-      );
+      ];
     }
   }
 }
@@ -78,10 +78,10 @@ function template_preprocess_admin_page(&$variables) {
  *   - menu_items: An array of modules to be displayed.
  */
 function template_preprocess_system_admin_index(&$variables) {
-  $variables['system_compact_link'] = array(
+  $variables['system_compact_link'] = [
     '#type' => 'system_compact_link',
-  );
-  $variables['containers'] = array();
+  ];
+  $variables['containers'] = [];
   $stripe = 0;
   // Iterate over all modules.
   foreach ($variables['menu_items'] as $module => $block) {
@@ -89,82 +89,22 @@ function template_preprocess_system_admin_index(&$variables) {
     $position = ++$stripe % 2 ? 'left' : 'right';
     // Output links.
     if (count($items)) {
-      $variables['containers'][$position][] = array(
+      $variables['containers'][$position][] = [
         '#theme' => 'admin_block',
-        '#block' => array(
+        '#block' => [
           'position' => $position,
           'title' => $module,
-          'content' => array(
+          'content' => [
             '#theme' => 'admin_block_content',
             '#content' => $items,
-          ),
+          ],
           'description' => t($description),
-        ),
-      );
+        ],
+      ];
     }
   }
 }
 
-/**
- * Prepares variables for status report template.
- *
- * Default template: status-report.html.twig.
- *
- * This theme function is dependent on install.inc being loaded, because
- * that's where the constants are defined.
- *
- * @param $variables
- *   An associative array containing:
- *   - requirements: An array of requirements/status items. Each requirement
- *     is an associative array containing the following elements:
- *     - title: The name of the requirement.
- *     - value: (optional) The current value (version, time, level, etc).
- *     - description: (optional) The description of the requirement.
- *     - severity: (optional) The requirement's result/severity level, one of:
- *       - REQUIREMENT_INFO: Status information.
- *       - REQUIREMENT_OK: The requirement is satisfied.
- *       - REQUIREMENT_WARNING: The requirement failed with a warning.
- *       - REQUIREMENT_ERROR: The requirement failed with an error.
- */
-function template_preprocess_status_report(&$variables) {
-  $severities = array(
-    REQUIREMENT_INFO => array(
-      'title' => t('Info'),
-      'status' => 'info',
-    ),
-    REQUIREMENT_OK => array(
-      'title' => t('OK'),
-      'status' => 'ok',
-    ),
-    REQUIREMENT_WARNING => array(
-      'title' => t('Warning'),
-      'status' => 'warning',
-    ),
-    REQUIREMENT_ERROR => array(
-      'title' => t('Error'),
-      'status' => 'error',
-    ),
-  );
-
-  foreach ($variables['requirements'] as $i => $requirement) {
-    // Always use the explicit requirement severity, if defined. Otherwise,
-    // default to REQUIREMENT_OK in the installer to visually confirm that
-    // installation requirements are met. And default to REQUIREMENT_INFO to
-    // denote neutral information without special visualization.
-    if (isset($requirement['severity'])) {
-      $severity = $severities[(int) $requirement['severity']];
-    }
-    elseif (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') {
-      $severity = $severities[REQUIREMENT_OK];
-    }
-    else {
-      $severity = $severities[REQUIREMENT_INFO];
-    }
-    $variables['requirements'][$i]['severity_title'] = $severity['title'];
-    $variables['requirements'][$i]['severity_status'] = $severity['status'];
-  }
-}
-
 /**
  * Prepares variables for the module details templates.
  *
@@ -301,7 +241,7 @@ function template_preprocess_system_modules_uninstall(&$variables) {
  *   - theme_group_titles: An associative array containing titles of themes.
  */
 function template_preprocess_system_themes_page(&$variables) {
-  $groups = array();
+  $groups = [];
   $theme_groups = $variables['theme_groups'];
   $variables['attributes']['id'] = 'system-themes-page';
 
@@ -311,33 +251,33 @@ function template_preprocess_system_themes_page(&$variables) {
       continue;
     }
     // Start new theme group.
-    $theme_group = array();
+    $theme_group = [];
     $theme_group['state'] = $state;
     $theme_group['title'] = $title;
-    $theme_group['themes'] = array();
+    $theme_group['themes'] = [];
     $theme_group['attributes'] = new Attribute();
 
     foreach ($theme_groups[$state] as $theme) {
-      $current_theme = array();
+      $current_theme = [];
 
       // Screenshot depicting the theme.
       if ($theme->screenshot) {
-        $current_theme['screenshot'] = array(
+        $current_theme['screenshot'] = [
           '#theme' => 'image',
           '#uri' => $theme->screenshot['uri'],
           '#alt' => $theme->screenshot['alt'],
           '#title' => $theme->screenshot['title'],
           '#attributes' => $theme->screenshot['attributes'],
-        );
+        ];
       }
       else {
-        $current_theme['screenshot'] = array(
+        $current_theme['screenshot'] = [
           '#theme' => 'image',
           '#uri' => drupal_get_path('module', 'system') . '/images/no_screenshot.png',
           '#alt' => t('No screenshot'),
           '#title' => t('No screenshot'),
-          '#attributes' => new Attribute(array('class' => array('no-screenshot'))),
-        );
+          '#attributes' => new Attribute(['class' => ['no-screenshot']]),
+        ];
       }
 
       // Localize the theme description.
@@ -362,23 +302,23 @@ function template_preprocess_system_themes_page(&$variables) {
         if (substr_count($theme->info['php'], '.') < 2) {
           $theme->info['php'] .= '.*';
         }
-        $current_theme['incompatible'] = t('This theme requires PHP version @php_required and is incompatible with PHP version @php_version.', array('@php_required' => $theme->info['php'], '@php_version' => phpversion()));
+        $current_theme['incompatible'] = t('This theme requires PHP version @php_required and is incompatible with PHP version @php_version.', ['@php_required' => $theme->info['php'], '@php_version' => phpversion()]);
       }
       elseif (!empty($theme->incompatible_base)) {
-        $current_theme['incompatible'] = t('This theme requires the base theme @base_theme to operate correctly.', array('@base_theme' => $theme->info['base theme']));
+        $current_theme['incompatible'] = t('This theme requires the base theme @base_theme to operate correctly.', ['@base_theme' => $theme->info['base theme']]);
       }
       elseif (!empty($theme->incompatible_engine)) {
-        $current_theme['incompatible'] = t('This theme requires the theme engine @theme_engine to operate correctly.', array('@theme_engine' => $theme->info['engine']));
+        $current_theme['incompatible'] = t('This theme requires the theme engine @theme_engine to operate correctly.', ['@theme_engine' => $theme->info['engine']]);
       }
 
       // Build operation links.
-      $current_theme['operations'] = array(
+      $current_theme['operations'] = [
         '#theme' => 'links',
         '#links' => $theme->operations,
-        '#attributes' => array(
-          'class' => array('operations', 'clearfix'),
-        ),
-      );
+        '#attributes' => [
+          'class' => ['operations', 'clearfix'],
+        ],
+      ];
       $theme_group['themes'][] = $current_theme;
     }
     $groups[] = $theme_group;
diff --git a/web/core/modules/system/system.api.php b/web/core/modules/system/system.api.php
index 8534ebf70..7951ecd21 100644
--- a/web/core/modules/system/system.api.php
+++ b/web/core/modules/system/system.api.php
@@ -24,11 +24,11 @@ function hook_system_themes_page_alter(&$theme_groups) {
   foreach ($theme_groups as $state => &$group) {
     foreach ($theme_groups[$state] as &$theme) {
       // Add a foo link to each list of theme operations.
-      $theme->operations[] = array(
+      $theme->operations[] = [
         'title' => t('Foo'),
         'url' => Url::fromRoute('system.themes_page'),
-        'query' => array('theme' => $theme->getName())
-      );
+        'query' => ['theme' => $theme->getName()]
+      ];
     }
   }
 }
diff --git a/web/core/modules/system/system.install b/web/core/modules/system/system.install
index 7db1eaeb0..61b2650ad 100644
--- a/web/core/modules/system/system.install
+++ b/web/core/modules/system/system.install
@@ -24,36 +24,36 @@ use Symfony\Component\HttpFoundation\Request;
  */
 function system_requirements($phase) {
   global $install_state;
-  $requirements = array();
+  $requirements = [];
 
   // Report Drupal version
   if ($phase == 'runtime') {
-    $requirements['drupal'] = array(
+    $requirements['drupal'] = [
       'title' => t('Drupal'),
       'value' => \Drupal::VERSION,
       'severity' => REQUIREMENT_INFO,
       'weight' => -10,
-    );
+    ];
 
     // Display the currently active installation profile, if the site
     // is not running the default installation profile.
     $profile = drupal_get_profile();
     if ($profile != 'standard') {
       $info = system_get_info('module', $profile);
-      $requirements['install_profile'] = array(
+      $requirements['install_profile'] = [
         'title' => t('Installation profile'),
-        'value' => t('%profile_name (%profile-%version)', array(
+        'value' => t('%profile_name (%profile-%version)', [
           '%profile_name' => $info['name'],
           '%profile' => $profile,
           '%version' => $info['version']
-        )),
+        ]),
         'severity' => REQUIREMENT_INFO,
         'weight' => -9
-      );
+      ];
     }
 
     // Warn if any experimental modules are installed.
-    $experimental = array();
+    $experimental = [];
     $enabled_modules = \Drupal::moduleHandler()->getModuleList();
     foreach ($enabled_modules as $module => $data) {
       $info = system_get_info('module', $module);
@@ -62,20 +62,20 @@ function system_requirements($phase) {
       }
     }
     if (!empty($experimental)) {
-      $requirements['experimental'] = array(
+      $requirements['experimental'] = [
         'title' => t('Experimental modules enabled'),
-        'value' => t('Experimental modules found: %module_list. <a href=":url">Experimental modules</a> are provided for testing purposes only. Use at your own risk.', array('%module_list' => implode(', ', $experimental), ':url' => 'https://www.drupal.org/core/experimental')),
+        'value' => t('Experimental modules found: %module_list. <a href=":url">Experimental modules</a> are provided for testing purposes only. Use at your own risk.', ['%module_list' => implode(', ', $experimental), ':url' => 'https://www.drupal.org/core/experimental']),
         'severity' => REQUIREMENT_WARNING,
-      );
+      ];
     }
   }
 
   // Web server information.
   $software = \Drupal::request()->server->get('SERVER_SOFTWARE');
-  $requirements['webserver'] = array(
+  $requirements['webserver'] = [
     'title' => t('Web server'),
     'value' => $software,
-  );
+  ];
 
   // Tests clean URL support.
   if ($phase == 'install' && $install_state['interactive'] && !isset($_GET['rewrite']) && strpos($software, 'Apache') !== FALSE) {
@@ -124,30 +124,30 @@ function system_requirements($phase) {
     }
 
     if ($rewrite_warning) {
-      $requirements['apache_version'] = array (
+      $requirements['apache_version'] = [
         'title' => t('Apache version'),
         'value' => $apache_version_string,
         'severity' => REQUIREMENT_WARNING,
-        'description' => t('Due to the settings for ServerTokens in httpd.conf, it is impossible to accurately determine the version of Apache running on this server. The reported value is @reported, to run Drupal without mod_rewrite, a minimum version of 2.2.16 is needed.', array('@reported' => $apache_version_string)),
-      );
+        'description' => t('Due to the settings for ServerTokens in httpd.conf, it is impossible to accurately determine the version of Apache running on this server. The reported value is @reported, to run Drupal without mod_rewrite, a minimum version of 2.2.16 is needed.', ['@reported' => $apache_version_string]),
+      ];
     }
 
     if ($rewrite_error) {
-      $requirements['Apache version'] = array (
+      $requirements['Apache version'] = [
         'title' => t('Apache version'),
         'value' => $apache_version_string,
         'severity' => REQUIREMENT_ERROR,
-        'description' => t('The minimum version of Apache needed to run Drupal without mod_rewrite enabled is 2.2.16. See the <a href=":link">enabling clean URLs</a> page for more information on mod_rewrite.', array(':link' => 'http://drupal.org/node/15365')),
-      );
+        'description' => t('The minimum version of Apache needed to run Drupal without mod_rewrite enabled is 2.2.16. See the <a href=":link">enabling clean URLs</a> page for more information on mod_rewrite.', [':link' => 'http://drupal.org/node/15365']),
+      ];
     }
 
     if (!$rewrite_error && !$rewrite_warning) {
-      $requirements['rewrite_module'] = array (
+      $requirements['rewrite_module'] = [
         'title' => t('Clean URLs'),
         'value' => t('Disabled'),
         'severity' => REQUIREMENT_WARNING,
-        'description' => t('Your server is capable of using clean URLs, but it is not enabled. Using clean URLs gives an improved user experience and is recommended. <a href=":link">Enable clean URLs</a>', array(':link' => 'http://drupal.org/node/15365')),
-      );
+        'description' => t('Your server is capable of using clean URLs, but it is not enabled. Using clean URLs gives an improved user experience and is recommended. <a href=":link">Enable clean URLs</a>', [':link' => 'http://drupal.org/node/15365']),
+      ];
     }
   }
 
@@ -157,22 +157,22 @@ function system_requirements($phase) {
     if ($phase === 'runtime') {
       $phpversion_label = t('@phpversion (<a href=":url">more information</a>)', ['@phpversion' => $phpversion, ':url' => (new Url('system.php'))->toString()]);
     }
-    $requirements['php'] = array(
+    $requirements['php'] = [
       'title' => t('PHP'),
       'value' => $phpversion_label,
-    );
+    ];
   }
   else {
-    $requirements['php'] = array(
+    $requirements['php'] = [
       'title' => t('PHP'),
       'value' => $phpversion_label,
-      'description' => t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, <a href=":phpinfo">Enabling and disabling phpinfo()</a> handbook page.', array(':phpinfo' => 'https://www.drupal.org/node/243993')),
+      'description' => t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, <a href=":phpinfo">Enabling and disabling phpinfo()</a> handbook page.', [':phpinfo' => 'https://www.drupal.org/node/243993']),
       'severity' => REQUIREMENT_INFO,
-    );
+    ];
   }
 
   if (version_compare($phpversion, DRUPAL_MINIMUM_PHP) < 0) {
-    $requirements['php']['description'] = t('Your PHP installation is too old. Drupal requires at least PHP %version.', array('%version' => DRUPAL_MINIMUM_PHP));
+    $requirements['php']['description'] = t('Your PHP installation is too old. Drupal requires at least PHP %version.', ['%version' => DRUPAL_MINIMUM_PHP]);
     $requirements['php']['severity'] = REQUIREMENT_ERROR;
     // If PHP is old, it's not safe to continue with the requirements check.
     return $requirements;
@@ -181,21 +181,21 @@ function system_requirements($phase) {
   // Suggest to update to at least 5.5.21 or 5.6.5 for disabling multiple
   // statements.
   if (($phase === 'install' || \Drupal::database()->driver() === 'mysql') && !SystemRequirements::phpVersionWithPdoDisallowMultipleStatements($phpversion)) {
-    $requirements['php'] = array(
+    $requirements['php'] = [
       'title' => t('PHP (multiple statement disabling)'),
       'value' => $phpversion_label,
       'description' => t('PHP versions higher than 5.6.5 or 5.5.21 provide built-in SQL injection protection for mysql databases. It is recommended to update.'),
       'severity' => REQUIREMENT_INFO,
-    );
+    ];
   }
 
   // Test for PHP extensions.
-  $requirements['php_extensions'] = array(
+  $requirements['php_extensions'] = [
     'title' => t('PHP extensions'),
-  );
+  ];
 
-  $missing_extensions = array();
-  $required_extensions = array(
+  $missing_extensions = [];
+  $required_extensions = [
     'date',
     'dom',
     'filter',
@@ -209,7 +209,7 @@ function system_requirements($phase) {
     'SPL',
     'tokenizer',
     'xml',
-  );
+  ];
   foreach ($required_extensions as $extension) {
     if (!extension_loaded($extension)) {
       $missing_extensions[] = $extension;
@@ -217,22 +217,22 @@ function system_requirements($phase) {
   }
 
   if (!empty($missing_extensions)) {
-    $description = t('Drupal requires you to enable the PHP extensions in the following list (see the <a href=":system_requirements">system requirements page</a> for more information):', array(
+    $description = t('Drupal requires you to enable the PHP extensions in the following list (see the <a href=":system_requirements">system requirements page</a> for more information):', [
       ':system_requirements' => 'https://www.drupal.org/requirements',
-    ));
+    ]);
 
     // We use twig inline_template to avoid twig's autoescape.
-    $description = array(
+    $description = [
       '#type' => 'inline_template',
       '#template' => '{{ description }}{{ missing_extensions }}',
-      '#context' => array(
+      '#context' => [
         'description' => $description,
-        'missing_extensions' => array(
+        'missing_extensions' => [
           '#theme' => 'item_list',
           '#items' => $missing_extensions,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     $requirements['php_extensions']['value'] = t('Disabled');
     $requirements['php_extensions']['severity'] = REQUIREMENT_ERROR;
@@ -245,11 +245,11 @@ function system_requirements($phase) {
   if ($phase == 'install' || $phase == 'runtime') {
     // Check to see if OPcache is installed.
     if (!OpCodeCache::isEnabled()) {
-      $requirements['php_opcache'] = array(
+      $requirements['php_opcache'] = [
         'value' => t('Not enabled'),
         'severity' => REQUIREMENT_WARNING,
         'description' => t('PHP OPcode caching can improve your site\'s performance considerably. It is <strong>highly recommended</strong> to have <a href="http://php.net/manual/opcache.installation.php" target="_blank">OPcache</a> installed on your server.'),
-      );
+      ];
     }
     else {
       $requirements['php_opcache']['value'] = t('Enabled');
@@ -257,35 +257,73 @@ function system_requirements($phase) {
     $requirements['php_opcache']['title'] = t('PHP OPcode caching');
   }
 
+  if ($phase != 'update') {
+    // Test whether we have a good source of random bytes.
+    $requirements['php_random_bytes'] = [
+      'title' => t('Random number generation'),
+    ];
+    try {
+      $bytes = random_bytes(10);
+      if (strlen($bytes) != 10) {
+        throw new \Exception(t('Tried to generate 10 random bytes, generated @count', ['@count' => strlen($bytes)]));
+      }
+      $requirements['php_random_bytes']['value'] = t('Successful');
+    }
+    catch (\Exception $e) {
+      // If /dev/urandom is not available on a UNIX-like system, check whether
+      // open_basedir restrictions are the cause.
+      $open_basedir_blocks_urandom = FALSE;
+      if (DIRECTORY_SEPARATOR === '/' && !@is_readable('/dev/urandom')) {
+        $open_basedir = ini_get('open_basedir');
+        if ($open_basedir) {
+          $open_basedir_paths = explode(PATH_SEPARATOR, $open_basedir);
+          $open_basedir_blocks_urandom = !array_intersect(['/dev', '/dev/', '/dev/urandom'], $open_basedir_paths);
+        }
+      }
+      $args = [
+        ':drupal-php' => 'https://www.drupal.org/docs/7/system-requirements/php#csprng',
+        '%exception_message' => $e->getMessage(),
+      ];
+      if ($open_basedir_blocks_urandom) {
+        $requirements['php_random_bytes']['description'] = t('Drupal is unable to generate highly randomized numbers, which means certain security features like password reset URLs are not as secure as they should be. Instead, only a slow, less-secure fallback generator is available. The most likely cause is that open_basedir restrictions are in effect and /dev/urandom is not on the whitelist. See the <a href=":drupal-php">system requirements</a> page for more information. %exception_message', $args);
+      }
+      else {
+        $requirements['php_random_bytes']['description'] = t('Drupal is unable to generate highly randomized numbers, which means certain security features like password reset URLs are not as secure as they should be. Instead, only a slow, less-secure fallback generator is available. See the <a href=":drupal-php">system requirements</a> page for more information. %exception_message', $args);
+      }
+      $requirements['php_random_bytes']['value'] = t('Less secure');
+      $requirements['php_random_bytes']['severity'] = REQUIREMENT_ERROR;
+    }
+  }
+
   if ($phase == 'install' || $phase == 'update') {
     // Test for PDO (database).
-    $requirements['database_extensions'] = array(
+    $requirements['database_extensions'] = [
       'title' => t('Database support'),
-    );
+    ];
 
     // Make sure PDO is available.
     $database_ok = extension_loaded('pdo');
     if (!$database_ok) {
-      $pdo_message = t('Your web server does not appear to support PDO (PHP Data Objects). Ask your hosting provider if they support the native PDO extension. See the <a href=":link">system requirements</a> page for more information.', array(
+      $pdo_message = t('Your web server does not appear to support PDO (PHP Data Objects). Ask your hosting provider if they support the native PDO extension. See the <a href=":link">system requirements</a> page for more information.', [
         ':link' => 'https://www.drupal.org/requirements/pdo',
-      ));
+      ]);
     }
     else {
       // Make sure at least one supported database driver exists.
       $drivers = drupal_detect_database_types();
       if (empty($drivers)) {
         $database_ok = FALSE;
-        $pdo_message = t('Your web server does not appear to support any common PDO database extensions. Check with your hosting provider to see if they support PDO (PHP Data Objects) and offer any databases that <a href=":drupal-databases">Drupal supports</a>.', array(
+        $pdo_message = t('Your web server does not appear to support any common PDO database extensions. Check with your hosting provider to see if they support PDO (PHP Data Objects) and offer any databases that <a href=":drupal-databases">Drupal supports</a>.', [
           ':drupal-databases' => 'https://www.drupal.org/requirements/database',
-        ));
+        ]);
       }
       // Make sure the native PDO extension is available, not the older PEAR
       // version. (See install_verify_pdo() for details.)
       if (!defined('PDO::ATTR_DEFAULT_FETCH_MODE')) {
         $database_ok = FALSE;
-        $pdo_message = t('Your web server seems to have the wrong version of PDO installed. Drupal requires the PDO extension from PHP core. This system has the older PECL version. See the <a href=":link">system requirements</a> page for more information.', array(
+        $pdo_message = t('Your web server seems to have the wrong version of PDO installed. Drupal requires the PDO extension from PHP core. This system has the older PECL version. See the <a href=":link">system requirements</a> page for more information.', [
           ':link' => 'https://www.drupal.org/requirements/pdo#pecl',
-        ));
+        ]);
       }
     }
 
@@ -302,54 +340,54 @@ function system_requirements($phase) {
     // Database information.
     $class = Database::getConnection()->getDriverClass('Install\\Tasks');
     $tasks = new $class();
-    $requirements['database_system'] = array(
+    $requirements['database_system'] = [
       'title' => t('Database system'),
       'value' => $tasks->name(),
-    );
-    $requirements['database_system_version'] = array(
+    ];
+    $requirements['database_system_version'] = [
       'title' => t('Database system version'),
       'value' => Database::getConnection()->version(),
-    );
+    ];
   }
 
   // Test PHP memory_limit
   $memory_limit = ini_get('memory_limit');
-  $requirements['php_memory_limit'] = array(
+  $requirements['php_memory_limit'] = [
     'title' => t('PHP memory limit'),
     'value' => $memory_limit == -1 ? t('-1 (Unlimited)') : $memory_limit,
-  );
+  ];
 
   if (!Environment::checkMemoryLimit(DRUPAL_MINIMUM_PHP_MEMORY_LIMIT, $memory_limit)) {
-    $description = array();
+    $description = [];
     if ($phase == 'install') {
-      $description['phase'] = t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the installation process.', array('%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT));
+      $description['phase'] = t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the installation process.', ['%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT]);
     }
     elseif ($phase == 'update') {
-      $description['phase'] = t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the update process.', array('%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT));
+      $description['phase'] = t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the update process.', ['%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT]);
     }
     elseif ($phase == 'runtime') {
-      $description['phase'] = t('Depending on your configuration, Drupal can run with a %memory_limit PHP memory limit. However, a %memory_minimum_limit PHP memory limit or above is recommended, especially if your site uses additional custom or contributed modules.', array('%memory_limit' => $memory_limit, '%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT));
+      $description['phase'] = t('Depending on your configuration, Drupal can run with a %memory_limit PHP memory limit. However, a %memory_minimum_limit PHP memory limit or above is recommended, especially if your site uses additional custom or contributed modules.', ['%memory_limit' => $memory_limit, '%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT]);
     }
 
     if (!empty($description['phase'])) {
       if ($php_ini_path = get_cfg_var('cfg_file_path')) {
-        $description['memory'] = t('Increase the memory limit by editing the memory_limit parameter in the file %configuration-file and then restart your web server (or contact your system administrator or hosting provider for assistance).', array('%configuration-file' => $php_ini_path));
+        $description['memory'] = t('Increase the memory limit by editing the memory_limit parameter in the file %configuration-file and then restart your web server (or contact your system administrator or hosting provider for assistance).', ['%configuration-file' => $php_ini_path]);
       }
       else {
         $description['memory'] = t('Contact your system administrator or hosting provider for assistance with increasing your PHP memory limit.');
       }
 
-      $handbook_link = t('For more information, see the online handbook entry for <a href=":memory-limit">increasing the PHP memory limit</a>.', array(':memory-limit' => 'https://www.drupal.org/node/207036'));
+      $handbook_link = t('For more information, see the online handbook entry for <a href=":memory-limit">increasing the PHP memory limit</a>.', [':memory-limit' => 'https://www.drupal.org/node/207036']);
 
-      $description = array(
+      $description = [
         '#type' => 'inline_template',
         '#template' => '{{ description_phase }} {{ description_memory }} {{ handbook }}',
-        '#context' => array(
+        '#context' => [
           'description_phase' => $description['phase'],
           'description_memory' => $description['memory'],
           'handbook' => $handbook_link,
-        ),
-      );
+        ],
+      ];
 
       $requirements['php_memory_limit']['description'] = $description;
       $requirements['php_memory_limit']['severity'] = REQUIREMENT_WARNING;
@@ -358,7 +396,7 @@ function system_requirements($phase) {
 
   // Test configuration files and directory for writability.
   if ($phase == 'runtime') {
-    $conf_errors = array();
+    $conf_errors = [];
     // Find the site path. Kernel service is not always available at this point,
     // but is preferred, when available.
     if (\Drupal::hasService('kernel')) {
@@ -380,13 +418,13 @@ function system_requirements($phase) {
       // In normal operation, writable files or directories are an error.
       $file_protection_severity = REQUIREMENT_ERROR;
       if (!drupal_verify_install_file($site_path, FILE_NOT_WRITABLE, 'dir')) {
-        $conf_errors[] = t("The directory %file is not protected from modifications and poses a security risk. You must change the directory's permissions to be non-writable.", array('%file' => $site_path));
+        $conf_errors[] = t("The directory %file is not protected from modifications and poses a security risk. You must change the directory's permissions to be non-writable.", ['%file' => $site_path]);
       }
     }
-    foreach (array('settings.php', 'settings.local.php', 'services.yml') as $conf_file) {
+    foreach (['settings.php', 'settings.local.php', 'services.yml'] as $conf_file) {
       $full_path = $site_path . '/' . $conf_file;
       if (file_exists($full_path) && (Settings::get('skip_permissions_hardening') || !drupal_verify_install_file($full_path, FILE_EXIST | FILE_READABLE | FILE_NOT_WRITABLE))) {
-        $conf_errors[] = t("The file %file is not protected from modifications and poses a security risk. You must change the file's permissions to be non-writable.", array('%file' => $full_path));
+        $conf_errors[] = t("The file %file is not protected from modifications and poses a security risk. You must change the file's permissions to be non-writable.", ['%file' => $full_path]);
       }
     }
     if (!empty($conf_errors)) {
@@ -395,27 +433,27 @@ function system_requirements($phase) {
       }
       else {
         // We use twig inline_template to avoid double escaping.
-        $description = array(
+        $description = [
           '#type' => 'inline_template',
           '#template' => '{{ configuration_error_list }}',
-          '#context' => array(
-            'configuration_error_list' => array(
+          '#context' => [
+            'configuration_error_list' => [
               '#theme' => 'item_list',
               '#items' => $conf_errors,
-            ),
-          ),
-        );
+            ],
+          ],
+        ];
       }
-      $requirements['configuration_files'] = array(
+      $requirements['configuration_files'] = [
         'value' => t('Not protected'),
         'severity' => $file_protection_severity,
         'description' => $description,
-      );
+      ];
     }
     else {
-      $requirements['configuration_files'] = array(
+      $requirements['configuration_files'] = [
         'value' => t('Protected'),
-      );
+      ];
     }
     $requirements['configuration_files']['title'] = t('Configuration files');
   }
@@ -425,31 +463,31 @@ function system_requirements($phase) {
     // Try to write the .htaccess files first, to prevent false alarms in case
     // (for example) the /tmp directory was wiped.
     file_ensure_htaccess();
-    $htaccess_files['public://.htaccess'] = array(
+    $htaccess_files['public://.htaccess'] = [
       'title' => t('Public files directory'),
       'directory' => drupal_realpath('public://'),
-    );
+    ];
     if (PrivateStream::basePath()) {
-      $htaccess_files['private://.htaccess'] = array(
+      $htaccess_files['private://.htaccess'] = [
         'title' => t('Private files directory'),
         'directory' => drupal_realpath('private://'),
-      );
+      ];
     }
-    $htaccess_files['temporary://.htaccess'] = array(
+    $htaccess_files['temporary://.htaccess'] = [
       'title' => t('Temporary files directory'),
       'directory' => drupal_realpath('temporary://'),
-    );
+    ];
     foreach ($htaccess_files as $htaccess_file => $info) {
       // Check for the string which was added to the recommended .htaccess file
       // in the latest security update.
       if (!file_exists($htaccess_file) || !($contents = @file_get_contents($htaccess_file)) || strpos($contents, 'Drupal_Security_Do_Not_Remove_See_SA_2013_003') === FALSE) {
         $url = 'https://www.drupal.org/SA-CORE-2013-003';
-        $requirements[$htaccess_file] = array(
+        $requirements[$htaccess_file] = [
           'title' => $info['title'],
           'value' => t('Not fully protected'),
           'severity' => REQUIREMENT_ERROR,
-          'description' => t('See <a href=":url">@url</a> for information about the recommended .htaccess file which should be added to the %directory directory to help protect against arbitrary code execution.', array(':url' => $url, '@url' => $url, '%directory' => $info['directory'])),
-        );
+          'description' => t('See <a href=":url">@url</a> for information about the recommended .htaccess file which should be added to the %directory directory to help protect against arbitrary code execution.', [':url' => $url, '@url' => $url, '%directory' => $info['directory']]),
+        ];
       }
     }
   }
@@ -478,13 +516,13 @@ function system_requirements($phase) {
     }
 
     // Set summary and description based on values determined above.
-    $summary = t('Last run @time ago', array('@time' => \Drupal::service('date.formatter')->formatTimeDiffSince($cron_last)));
+    $summary = t('Last run @time ago', ['@time' => \Drupal::service('date.formatter')->formatTimeDiffSince($cron_last)]);
 
-    $requirements['cron'] = array(
+    $requirements['cron'] = [
       'title' => t('Cron maintenance tasks'),
       'severity' => $severity,
       'value' => $summary,
-    );
+    ];
     if ($severity != REQUIREMENT_INFO) {
       $requirements['cron']['description'][] = [
         [
@@ -497,32 +535,38 @@ function system_requirements($phase) {
         ],
       ];
     }
-    $cron_url = \Drupal::url('system.cron', ['key' => \Drupal::state()->get('system.cron_key'), ['absolute' => TRUE]]);
     $requirements['cron']['description'][] = [
       [
-        '#markup' => t('You can <a href=":cron">run cron manually</a>.', [':cron' => \Drupal::url('system.run_cron')]),
+        '#type' => 'link',
+        '#prefix' => '(',
+        '#title' => t('more information'),
+        '#suffix' => ')',
+        '#url' => Url::fromRoute('system.cron_settings'),
       ],
       [
-        '#prefix' => '<br />',
-        '#markup' => t('To run cron from outside the site, go to <a href=":url">@cron</a>', [':url' => $cron_url, '@cron' => $cron_url]),
+        '#prefix' => '<span class="cron-description__run-cron">',
+        '#suffix' => '</span>',
+        '#type' => 'link',
+        '#title' => t('Run cron'),
+        '#url' => Url::fromRoute('system.run_cron'),
       ],
     ];
   }
   if ($phase != 'install') {
     $filesystem_config = \Drupal::config('system.file');
-    $directories = array(
+    $directories = [
       PublicStream::basePath(),
       // By default no private files directory is configured. For private files
       // to be secure the admin needs to provide a path outside the webroot.
       PrivateStream::basePath(),
       file_directory_temp(),
-    );
+    ];
   }
 
   // During an install we need to make assumptions about the file system
   // unless overrides are provided in settings.php.
   if ($phase == 'install') {
-    $directories = array();
+    $directories = [];
     if ($file_public_path = Settings::get('file_public_path')) {
       $directories[] = $file_public_path;
     }
@@ -558,31 +602,31 @@ function system_requirements($phase) {
       }
       if (!is_dir($directory)) {
         if ($phase == 'install') {
-          $description = t('An automated attempt to create the directory %directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see INSTALL.txt or the <a href=":handbook_url">online handbook</a>.', array('%directory' => $directory, ':handbook_url' => 'https://www.drupal.org/server-permissions'));
+          $description = t('An automated attempt to create the directory %directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see INSTALL.txt or the <a href=":handbook_url">online handbook</a>.', ['%directory' => $directory, ':handbook_url' => 'https://www.drupal.org/server-permissions']);
         }
         else {
-          $description = t('The directory %directory does not exist.', array('%directory' => $directory));
+          $description = t('The directory %directory does not exist.', ['%directory' => $directory]);
         }
-        $requirements['config directory ' . $type] = array(
+        $requirements['config directory ' . $type] = [
           'title' => t('Configuration directory: %type', ['%type' => $type]),
           'description' => $description,
           'severity' => REQUIREMENT_ERROR,
-        );
+        ];
       }
     }
   }
   if ($phase != 'install' && (empty($GLOBALS['config_directories']) || empty($GLOBALS['config_directories'][CONFIG_SYNC_DIRECTORY]) )) {
-    $requirements['config directories'] = array(
+    $requirements['config directories'] = [
       'title' => t('Configuration directories'),
       'value' => t('Not present'),
-      'description' => t('Your %file file must define the $config_directories variable as an array containing the names of directories in which configuration files can be found. It must contain a %sync_key key.', array('%file' => $site_path . '/settings.php', '%sync_key' => CONFIG_SYNC_DIRECTORY)),
+      'description' => t('Your %file file must define the $config_directories variable as an array containing the names of directories in which configuration files can be found. It must contain a %sync_key key.', ['%file' => $site_path . '/settings.php', '%sync_key' => CONFIG_SYNC_DIRECTORY]),
       'severity' => REQUIREMENT_ERROR,
-    );
+    ];
   }
 
-  $requirements['file system'] = array(
+  $requirements['file system'] = [
     'title' => t('File system'),
-  );
+  ];
 
   $error = '';
   // For installer, create the directories if possible.
@@ -599,30 +643,30 @@ function system_requirements($phase) {
       $description = '';
       $requirements['file system']['value'] = t('Not writable');
       if (!$is_directory) {
-        $error = t('The directory %directory does not exist.', array('%directory' => $directory));
+        $error = t('The directory %directory does not exist.', ['%directory' => $directory]);
       }
       else {
-        $error = t('The directory %directory is not writable.', array('%directory' => $directory));
+        $error = t('The directory %directory is not writable.', ['%directory' => $directory]);
       }
       // The files directory requirement check is done only during install and runtime.
       if ($phase == 'runtime') {
-        $description = t('You may need to set the correct directory at the <a href=":admin-file-system">file system settings page</a> or change the current directory\'s permissions so that it is writable.', array(':admin-file-system' => \Drupal::url('system.file_system_settings')));
+        $description = t('You may need to set the correct directory at the <a href=":admin-file-system">file system settings page</a> or change the current directory\'s permissions so that it is writable.', [':admin-file-system' => \Drupal::url('system.file_system_settings')]);
       }
       elseif ($phase == 'install') {
         // For the installer UI, we need different wording. 'value' will
         // be treated as version, so provide none there.
-        $description = t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see INSTALL.txt or the <a href=":handbook_url">online handbook</a>.', array(':handbook_url' => 'https://www.drupal.org/server-permissions'));
+        $description = t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see INSTALL.txt or the <a href=":handbook_url">online handbook</a>.', [':handbook_url' => 'https://www.drupal.org/server-permissions']);
         $requirements['file system']['value'] = '';
       }
       if (!empty($description)) {
-        $description = array(
+        $description = [
           '#type' => 'inline_template',
           '#template' => '{{ error }} {{ description }}',
-          '#context' => array(
+          '#context' => [
             'error' => $error,
             'description' => $description,
-          ),
-        );
+          ],
+        ];
         $requirements['file system']['description'] = $description;
         $requirements['file system']['severity'] = REQUIREMENT_ERROR;
       }
@@ -641,10 +685,10 @@ function system_requirements($phase) {
 
   // See if updates are available in update.php.
   if ($phase == 'runtime') {
-    $requirements['update'] = array(
+    $requirements['update'] = [
       'title' => t('Database updates'),
       'value' => t('Up to date'),
-    );
+    ];
 
     // Check installed modules.
     $has_pending_updates = FALSE;
@@ -670,7 +714,7 @@ function system_requirements($phase) {
     if ($has_pending_updates) {
       $requirements['update']['severity'] = REQUIREMENT_ERROR;
       $requirements['update']['value'] = t('Out of date');
-      $requirements['update']['description'] = t('Some modules have database schema updates to install. You should run the <a href=":update">database update script</a> immediately.', array(':update' => \Drupal::url('system.db_update')));
+      $requirements['update']['description'] = t('Some modules have database schema updates to install. You should run the <a href=":update">database update script</a> immediately.', [':update' => \Drupal::url('system.db_update')]);
     }
 
     $requirements['entity_update'] = [
@@ -699,16 +743,16 @@ function system_requirements($phase) {
   // Verify the update.php access setting
   if ($phase == 'runtime') {
     if (Settings::get('update_free_access')) {
-      $requirements['update access'] = array(
+      $requirements['update access'] = [
         'value' => t('Not protected'),
         'severity' => REQUIREMENT_ERROR,
-        'description' => t('The update.php script is accessible to everyone without authentication check, which is a security risk. You must change the @settings_name value in your settings.php back to FALSE.', array('@settings_name' => '$settings[\'update_free_access\']')),
-      );
+        'description' => t('The update.php script is accessible to everyone without authentication check, which is a security risk. You must change the @settings_name value in your settings.php back to FALSE.', ['@settings_name' => '$settings[\'update_free_access\']']),
+      ];
     }
     else {
-      $requirements['update access'] = array(
+      $requirements['update access'] = [
         'value' => t('Protected'),
-      );
+      ];
     }
     $requirements['update access']['title'] = t('Access to update.php');
   }
@@ -726,7 +770,7 @@ function system_requirements($phase) {
       $name = $file->info['name'];
       $php = $file->info['php'];
       if (version_compare($php, PHP_VERSION, '>')) {
-        $requirements['php']['description'] .= t('@name requires at least PHP @version.', array('@name' => $name, '@version' => $php));
+        $requirements['php']['description'] .= t('@name requires at least PHP @version.', ['@name' => $name, '@version' => $php]);
         $requirements['php']['severity'] = REQUIREMENT_ERROR;
       }
       // Check the module's required modules.
@@ -734,12 +778,12 @@ function system_requirements($phase) {
         $required_module = $requirement['name'];
         // Check if the module exists.
         if (!isset($files[$required_module])) {
-          $requirements["$module-$required_module"] = array(
+          $requirements["$module-$required_module"] = [
             'title' => t('Unresolved dependency'),
-            'description' => t('@name requires this module.', array('@name' => $name)),
-            'value' => t('@required_name (Missing)', array('@required_name' => $required_module)),
+            'description' => t('@name requires this module.', ['@name' => $name]),
+            'value' => t('@required_name (Missing)', ['@required_name' => $required_module]),
             'severity' => REQUIREMENT_ERROR,
-          );
+          ];
           continue;
         }
         // Check for an incompatible version.
@@ -749,12 +793,12 @@ function system_requirements($phase) {
         $compatibility = drupal_check_incompatibility($requirement, $version);
         if ($compatibility) {
           $compatibility = rtrim(substr($compatibility, 2), ')');
-          $requirements["$module-$required_module"] = array(
+          $requirements["$module-$required_module"] = [
             'title' => t('Unresolved dependency'),
-            'description' => t('@name requires this module and version. Currently using @required_name version @version', array('@name' => $name, '@required_name' => $required_name, '@version' => $version)),
-            'value' => t('@required_name (Version @compatibility required)', array('@required_name' => $required_name, '@compatibility' => $compatibility)),
+            'description' => t('@name requires this module and version. Currently using @required_name version @version', ['@name' => $name, '@required_name' => $required_name, '@version' => $version]),
+            'value' => t('@required_name (Version @compatibility required)', ['@required_name' => $required_name, '@compatibility' => $compatibility]),
             'severity' => REQUIREMENT_ERROR,
-          );
+          ];
           continue;
         }
       }
@@ -768,29 +812,29 @@ function system_requirements($phase) {
   if ($phase == 'runtime') {
     // Check for update status module.
     if (!\Drupal::moduleHandler()->moduleExists('update')) {
-      $requirements['update status'] = array(
+      $requirements['update status'] = [
         'value' => t('Not enabled'),
         'severity' => REQUIREMENT_WARNING,
-        'description' => t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the Update Manager module from the <a href=":module">module administration page</a> in order to stay up-to-date on new releases. For more information, <a href=":update">Update status handbook page</a>.', array(
+        'description' => t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the Update Manager module from the <a href=":module">module administration page</a> in order to stay up-to-date on new releases. For more information, <a href=":update">Update status handbook page</a>.', [
           ':update' => 'https://www.drupal.org/documentation/modules/update',
           ':module' => \Drupal::url('system.modules_list'),
-        )),
-      );
+        ]),
+      ];
     }
     else {
-      $requirements['update status'] = array(
+      $requirements['update status'] = [
         'value' => t('Enabled'),
-      );
+      ];
     }
     $requirements['update status']['title'] = t('Update notifications');
 
     if (Settings::get('rebuild_access')) {
-      $requirements['rebuild access'] = array(
+      $requirements['rebuild access'] = [
         'title' => t('Rebuild access'),
         'value' => t('Enabled'),
         'severity' => REQUIREMENT_ERROR,
         'description' => t('The rebuild_access setting is enabled in settings.php. It is recommended to have this setting disabled unless you are performing a rebuild.'),
-      );
+      ];
     }
   }
 
@@ -799,19 +843,19 @@ function system_requirements($phase) {
   if ($phase == 'runtime') {
     $trusted_host_patterns = Settings::get('trusted_host_patterns');
     if (empty($trusted_host_patterns)) {
-      $requirements['trusted_host_patterns'] = array(
+      $requirements['trusted_host_patterns'] = [
         'title' => t('Trusted Host Settings'),
         'value' => t('Not enabled'),
-        'description' => t('The trusted_host_patterns setting is not configured in settings.php. This can lead to security vulnerabilities. It is <strong>highly recommended</strong> that you configure this. See <a href=":url">Protecting against HTTP HOST Header attacks</a> for more information.', array(':url' => 'https://www.drupal.org/node/1992030')),
+        'description' => t('The trusted_host_patterns setting is not configured in settings.php. This can lead to security vulnerabilities. It is <strong>highly recommended</strong> that you configure this. See <a href=":url">Protecting against HTTP HOST Header attacks</a> for more information.', [':url' => 'https://www.drupal.org/node/1992030']),
         'severity' => REQUIREMENT_ERROR,
-      );
+      ];
     }
     else {
-      $requirements['trusted_host_patterns'] = array(
+      $requirements['trusted_host_patterns'] = [
         'title' => t('Trusted Host Settings'),
         'value' => t('Enabled'),
-        'description' => t('The trusted_host_patterns setting is set to allow %trusted_host_patterns', array('%trusted_host_patterns' => join(', ', $trusted_host_patterns))),
-      );
+        'description' => t('The trusted_host_patterns setting is set to allow %trusted_host_patterns', ['%trusted_host_patterns' => join(', ', $trusted_host_patterns)]),
+      ];
     }
   }
 
@@ -866,6 +910,23 @@ function system_requirements($phase) {
     }
   }
 
+  // Installations on Windows can run into limitations with MAX_PATH if the
+  // Drupal root directory is too deep in the filesystem. Generally this shows
+  // up in cached Twig templates and other public files with long directory or
+  // file names. There is no definite root directory depth below which Drupal is
+  // guaranteed to function correctly on Windows. Since problems are likely
+  // with more than 100 characters in the Drupal root path, show an error.
+  if (substr(PHP_OS, 0, 3) == 'WIN') {
+    $depth = strlen(realpath(DRUPAL_ROOT . '/' . PublicStream::basePath()));
+    if ($depth > 120) {
+      $requirements['max_path_on_windows'] = [
+        'title' => t('Windows installation depth'),
+        'description' => t('The public files directory path is %depth characters. Paths longer than 120 characters will cause problems on Windows.', ['%depth' => $depth]),
+        'severity' => REQUIREMENT_ERROR,
+      ];
+    }
+  }
+
   return $requirements;
 }
 
@@ -890,133 +951,133 @@ function system_install() {
  * Implements hook_schema().
  */
 function system_schema() {
-  $schema['key_value'] = array(
+  $schema['key_value'] = [
     'description' => 'Generic key-value storage table. See the state system for an example.',
-    'fields' => array(
-      'collection' => array(
+    'fields' => [
+      'collection' => [
         'description' => 'A named collection of key and value pairs.',
         'type' => 'varchar_ascii',
         'length' => 128,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'name' => array(
+      ],
+      'name' => [
         'description' => 'The key of the key-value pair. As KEY is a SQL reserved keyword, name was chosen instead.',
         'type' => 'varchar_ascii',
         'length' => 128,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'value' => array(
+      ],
+      'value' => [
         'description' => 'The value.',
         'type' => 'blob',
         'not null' => TRUE,
         'size' => 'big',
-      ),
-    ),
-    'primary key' => array('collection', 'name'),
-  );
+      ],
+    ],
+    'primary key' => ['collection', 'name'],
+  ];
 
-  $schema['key_value_expire'] = array(
+  $schema['key_value_expire'] = [
     'description' => 'Generic key/value storage table with an expiration.',
-    'fields' => array(
-      'collection' => array(
+    'fields' => [
+      'collection' => [
         'description' => 'A named collection of key and value pairs.',
         'type' => 'varchar_ascii',
         'length' => 128,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'name' => array(
+      ],
+      'name' => [
         // KEY is an SQL reserved word, so use 'name' as the key's field name.
         'description' => 'The key of the key/value pair.',
         'type' => 'varchar_ascii',
         'length' => 128,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'value' => array(
+      ],
+      'value' => [
         'description' => 'The value of the key/value pair.',
         'type' => 'blob',
         'not null' => TRUE,
         'size' => 'big',
-      ),
-      'expire' => array(
+      ],
+      'expire' => [
         'description' => 'The time since Unix epoch in seconds when this item expires. Defaults to the maximum possible time.',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 2147483647,
-      ),
-    ),
-    'primary key' => array('collection', 'name'),
-    'indexes' => array(
-      'all' => array('name', 'collection', 'expire'),
-      'expire' => array('expire'),
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['collection', 'name'],
+    'indexes' => [
+      'all' => ['name', 'collection', 'expire'],
+      'expire' => ['expire'],
+    ],
+  ];
 
-  $schema['sequences'] = array(
+  $schema['sequences'] = [
     'description' => 'Stores IDs.',
-    'fields' => array(
-      'value' => array(
+    'fields' => [
+      'value' => [
         'description' => 'The value of the sequence.',
         'type' => 'serial',
         'unsigned' => TRUE,
         'not null' => TRUE,
-      ),
-     ),
-    'primary key' => array('value'),
-  );
+      ],
+     ],
+    'primary key' => ['value'],
+  ];
 
-  $schema['sessions'] = array(
+  $schema['sessions'] = [
     'description' => "Drupal's session handlers read and write into the sessions table. Each record represents a user session, either anonymous or authenticated.",
-    'fields' => array(
-      'uid' => array(
+    'fields' => [
+      'uid' => [
         'description' => 'The {users}.uid corresponding to a session, or 0 for anonymous user.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
-      ),
-      'sid' => array(
+      ],
+      'sid' => [
         'description' => "A session ID (hashed). The value is generated by Drupal's session handlers.",
         'type' => 'varchar_ascii',
         'length' => 128,
         'not null' => TRUE,
-      ),
-      'hostname' => array(
+      ],
+      'hostname' => [
         'description' => 'The IP address that last used this session ID (sid).',
         'type' => 'varchar_ascii',
         'length' => 128,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'timestamp' => array(
+      ],
+      'timestamp' => [
         'description' => 'The Unix timestamp when this session last requested a page. Old records are purged by PHP automatically.',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'session' => array(
+      ],
+      'session' => [
         'description' => 'The serialized contents of $_SESSION, an array of name/value pairs that persists across page requests by this session ID. Drupal loads $_SESSION from here at the start of each request and saves it at the end.',
         'type' => 'blob',
         'not null' => FALSE,
         'size' => 'big',
-      ),
-    ),
-    'primary key' => array(
+      ],
+    ],
+    'primary key' => [
       'sid',
-    ),
-    'indexes' => array(
-      'timestamp' => array('timestamp'),
-      'uid' => array('uid'),
-    ),
-    'foreign keys' => array(
-      'session_user' => array(
+    ],
+    'indexes' => [
+      'timestamp' => ['timestamp'],
+      'uid' => ['uid'],
+    ],
+    'foreign keys' => [
+      'session_user' => [
         'table' => 'users',
-        'columns' => array('uid' => 'uid'),
-      ),
-    ),
-  );
+        'columns' => ['uid' => 'uid'],
+      ],
+    ],
+  ];
 
   // Create the url_alias table. The alias_storage service can auto-create its
   // table, but this relies on exceptions being thrown. These exceptions will be
@@ -1026,11 +1087,6 @@ function system_schema() {
   return $schema;
 }
 
-/**
- * @addtogroup updates-8.0.0-beta
- * @{
- */
-
 /**
  * Change two fields on the default menu link storage to be serialized data.
  */
@@ -1043,38 +1099,38 @@ function system_update_8001(&$sandbox = NULL) {
       // Converting directly to blob can cause problems with reading out and
       // serializing the string data later on postgres, so rename the existing
       // columns and create replacement ones to hold the serialized objects.
-      $old_fields = array(
-        'title' => array(
+      $old_fields = [
+        'title' => [
           'description' => 'The text displayed for the link.',
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'description' => array(
+        ],
+        'description' => [
           'description' => 'The description of this link - used for admin pages and title attribute.',
           'type' => 'text',
           'not null' => FALSE,
-        ),
-      );
+        ],
+      ];
       foreach ($old_fields as $name => $spec) {
         $schema->changeField('menu_tree', $name, 'system_update_8001_' . $name, $spec);
       }
-      $spec = array(
+      $spec = [
         'description' => 'The title for the link. May be a serialized TranslatableMarkup.',
         'type' => 'blob',
         'size' => 'big',
         'not null' => FALSE,
         'serialize' => TRUE,
-      );
+      ];
       $schema->addField('menu_tree', 'title', $spec);
-      $spec = array(
+      $spec = [
         'description' => 'The description of this link - used for admin pages and title attribute.',
         'type' => 'blob',
         'size' => 'big',
         'not null' => FALSE,
         'serialize' => TRUE,
-      );
+      ];
       $schema->addField('menu_tree', 'description', $spec);
 
       $sandbox['current'] = 0;
@@ -1660,15 +1716,6 @@ function system_update_8013() {
     ->save(TRUE);
 }
 
-/**
- * @} End of "addtogroup updates-8.0.0-beta".
- */
-
-/**
- * @addtogroup updates-8.0.0-rc
- * @{
- */
-
 /**
  * Install the Stable base theme if needed.
  */
@@ -1688,15 +1735,6 @@ function system_update_8014() {
   }
 }
 
-/**
- * @} End of "addtogroup updates-8.0.0-rc".
- */
-
-/**
- * @addtogroup updates-8.2.0
- * @{
- */
-
 /**
  * Fix configuration overrides to not override non existing keys.
  */
@@ -1727,15 +1765,6 @@ function system_update_8201() {
   // Empty update to cause a cache rebuild.
 }
 
-/**
- * @} End of "addtogroup updates-8.2.0".
- */
-
-/**
- * @addtogroup updates-8.2.3
- * @{
- */
-
 /**
  * Clear caches due to behavior change in MachineName element.
  */
@@ -1744,5 +1773,19 @@ function system_update_8202() {
 }
 
 /**
- * @} End of "addtogroup updates-8.2.3".
+ * Add detailed cron logging configuration.
  */
+function system_update_8300() {
+  \Drupal::configFactory()->getEditable('system.cron')
+    ->set('logging', 1)
+    ->save(TRUE);
+}
+
+/**
+ * Add install profile to core.extension configuration.
+ */
+function system_update_8301() {
+  \Drupal::configFactory()->getEditable('core.extension')
+    ->set('profile', \Drupal::installProfile())
+    ->save();
+}
diff --git a/web/core/modules/system/system.libraries.yml b/web/core/modules/system/system.libraries.yml
index 206ae4fc8..98eb28391 100644
--- a/web/core/modules/system/system.libraries.yml
+++ b/web/core/modules/system/system.libraries.yml
@@ -19,6 +19,9 @@ base:
       css/components/reset-appearance.module.css: { weight: -10 }
       css/components/resize.module.css: { weight: -10 }
       css/components/sticky-header.module.css: { weight: -10 }
+      css/components/system-status-counter.css: { weight: -10 }
+      css/components/system-status-report-counters.css: { weight: -10 }
+      css/components/system-status-report-general-info.css: { weight: -10 }
       css/components/tabledrag.module.css: { weight: -10 }
       css/components/tablesort.module.css: { weight: -10 }
       css/components/tree-child.module.css: { weight: -10 }
diff --git a/web/core/modules/system/system.module b/web/core/modules/system/system.module
index 93f4e9b42..a1a6b715a 100644
--- a/web/core/modules/system/system.module
+++ b/web/core/modules/system/system.module
@@ -30,16 +30,25 @@ use GuzzleHttp\Exception\RequestException;
 
 /**
  * New users will be set to the default time zone at registration.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\user\UserInterface::TIMEZONE_DEFAULT instead.
  */
 const DRUPAL_USER_TIMEZONE_DEFAULT = 0;
 
 /**
  * New users will get an empty time zone at registration.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\user\UserInterface::TIMEZONE_EMPTY instead.
  */
 const DRUPAL_USER_TIMEZONE_EMPTY = 1;
 
 /**
  * New users will select their own timezone at registration.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\user\UserInterface::TIMEZONE_SELECT instead.
  */
 const DRUPAL_USER_TIMEZONE_SELECT = 2;
 
@@ -61,6 +70,9 @@ const DRUPAL_REQUIRED = 2;
 /**
  * Return only visible regions.
  *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\block\BlockRepositoryInterface::REGIONS_VISIBLE instead.
+ *
  * @see system_region_list()
  */
 const REGIONS_VISIBLE = 'visible';
@@ -68,6 +80,9 @@ const REGIONS_VISIBLE = 'visible';
 /**
  * Return all regions.
  *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\block\BlockRepositoryInterface::REGIONS_ALL instead.
+ *
  * @see system_region_list()
  */
 const REGIONS_ALL = 'all';
@@ -80,29 +95,29 @@ function system_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.system':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The System module is integral to the site: it provides user interfaces for many core systems and settings, as well as the basic administrative menu structure. For more information, see the <a href=":system">online documentation for the System module</a>.', array(':system' => 'https://www.drupal.org/documentation/modules/system')) . '</p>';
+      $output .= '<p>' . t('The System module is integral to the site: it provides user interfaces for many core systems and settings, as well as the basic administrative menu structure. For more information, see the <a href=":system">online documentation for the System module</a>.', [':system' => 'https://www.drupal.org/documentation/modules/system']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing modules') . '</dt>';
-      $output .= '<dd>' . t('Users with appropriate permission can install and uninstall modules from the <a href=":modules">Extend page</a>. Depending on which distribution or installation profile you choose when you install your site, several modules are installed and others are provided but not installed. Each module provides a discrete set of features; modules may be installed or uninstalled depending on the needs of the site. Many additional modules contributed by members of the Drupal community are available for download from the <a href=":drupal-modules">Drupal.org module page</a>. Note that uninstalling a module is a destructive action: when you uninstall a module, you will permanently lose all data connected to the module.', array(':modules' => \Drupal::url('system.modules_list'), ':drupal-modules' => 'https://www.drupal.org/project/modules')) . '</dd>';
+      $output .= '<dd>' . t('Users with appropriate permission can install and uninstall modules from the <a href=":modules">Extend page</a>. Depending on which distribution or installation profile you choose when you install your site, several modules are installed and others are provided but not installed. Each module provides a discrete set of features; modules may be installed or uninstalled depending on the needs of the site. Many additional modules contributed by members of the Drupal community are available for download from the <a href=":drupal-modules">Drupal.org module page</a>. Note that uninstalling a module is a destructive action: when you uninstall a module, you will permanently lose all data connected to the module.', [':modules' => \Drupal::url('system.modules_list'), ':drupal-modules' => 'https://www.drupal.org/project/modules']) . '</dd>';
       $output .= '<dt>' . t('Managing themes') . '</dt>';
-      $output .= '<dd>' . t('Users with appropriate permission can install and uninstall themes on the <a href=":themes">Appearance page</a>. Themes determine the design and presentation of your site. Depending on which distribution or installation profile you choose when you install your site, a default theme is installed, and possibly a different theme for administration pages. Other themes are provided but not installed, and additional contributed themes are available at the <a href=":drupal-themes">Drupal.org theme page</a>.', array(':themes' => \Drupal::url('system.themes_page'), ':drupal-themes' => 'https://www.drupal.org/project/themes')) . '</dd>';
+      $output .= '<dd>' . t('Users with appropriate permission can install and uninstall themes on the <a href=":themes">Appearance page</a>. Themes determine the design and presentation of your site. Depending on which distribution or installation profile you choose when you install your site, a default theme is installed, and possibly a different theme for administration pages. Other themes are provided but not installed, and additional contributed themes are available at the <a href=":drupal-themes">Drupal.org theme page</a>.', [':themes' => \Drupal::url('system.themes_page'), ':drupal-themes' => 'https://www.drupal.org/project/themes']) . '</dd>';
       $output .= '<dt>' . t('Disabling drag-and-drop functionality') . '</dt>';
       $output .= '<dd>' . t('The default drag-and-drop user interface for ordering tables in the administrative interface presents a challenge for some users, including users of screen readers and other assistive technology. The drag-and-drop interface can be disabled in a table by clicking a link labeled "Show row weights" above the table. The replacement interface allows users to order the table by choosing numerical weights instead of dragging table rows.') . '</dd>';
       $output .= '<dt>' . t('Configuring basic site settings') . '</dt>';
-      $output .= '<dd>' . t('The System module provides pages for managing basic site configuration, including <a href=":date-time-settings">Date and time formats</a> and <a href=":site-info">Basic site settings</a> (site name, email address to send mail from, home page, and error pages). Additional configuration pages are listed on the main <a href=":config">Configuration page</a>.', array(':date-time-settings' => \Drupal::url('entity.date_format.collection'), ':site-info' => \Drupal::url('system.site_information_settings'), ':config' => \Drupal::url('system.admin_config'))) . '</dd>';
+      $output .= '<dd>' . t('The System module provides pages for managing basic site configuration, including <a href=":date-time-settings">Date and time formats</a> and <a href=":site-info">Basic site settings</a> (site name, email address to send mail from, home page, and error pages). Additional configuration pages are listed on the main <a href=":config">Configuration page</a>.', [':date-time-settings' => \Drupal::url('entity.date_format.collection'), ':site-info' => \Drupal::url('system.site_information_settings'), ':config' => \Drupal::url('system.admin_config')]) . '</dd>';
       $output .= '<dt>' . t('Checking site status') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":status">Status report</a> provides an overview of the configuration, status, and health of your site. Review this report to make sure there are not any problems to address, and to find information about the software your site and web server are using.', array(':status' => \Drupal::url('system.status'))) . '</dd>';
+      $output .= '<dd>' . t('The <a href=":status">Status report</a> provides an overview of the configuration, status, and health of your site. Review this report to make sure there are not any problems to address, and to find information about the software your site and web server are using.', [':status' => \Drupal::url('system.status')]) . '</dd>';
       $output .= '<dt>' . t('Using maintenance mode') . '</dt>';
-      $output .= '<dd>' . t('When you are performing site maintenance, you can prevent non-administrative users (including anonymous visitors) from viewing your site by putting it in <a href=":maintenance-mode">Maintenance mode</a>. This will prevent unauthorized users from making changes to the site while you are performing maintenance, or from seeing a broken site while updates are in progress.', array(':maintenance-mode' => \Drupal::url('system.site_maintenance_mode'))) . '</dd>';
+      $output .= '<dd>' . t('When you are performing site maintenance, you can prevent non-administrative users (including anonymous visitors) from viewing your site by putting it in <a href=":maintenance-mode">Maintenance mode</a>. This will prevent unauthorized users from making changes to the site while you are performing maintenance, or from seeing a broken site while updates are in progress.', [':maintenance-mode' => \Drupal::url('system.site_maintenance_mode')]) . '</dd>';
       $output .= '<dt>' . t('Configuring for performance') . '</dt>';
-      $output .= '<dd>' . t('On the <a href=":performance-page">Performance page</a>, the site can be configured to aggregate CSS and JavaScript files, making the total request size smaller. Note that, for small- to medium-sized websites, the <a href=":page-cache">Internal Page Cache module</a> should be installed so that pages are efficiently cached and reused for anonymous users. Finally, for websites of all sizes, the <a href=":dynamic-page-cache">Dynamic Page Cache module</a> should also be installed so that the non-personalized parts of pages are efficiently cached (for all users).', array(':performance-page' => \Drupal::url('system.performance_settings'), ':page-cache' => (\Drupal::moduleHandler()->moduleExists('page_cache')) ? \Drupal::url('help.page', array('name' => 'page_cache')) : '#', ':dynamic-page-cache' => (\Drupal::moduleHandler()->moduleExists('dynamic_page_cache')) ? \Drupal::url('help.page', array('name' => 'dynamic_page_cache')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('On the <a href=":performance-page">Performance page</a>, the site can be configured to aggregate CSS and JavaScript files, making the total request size smaller. Note that, for small- to medium-sized websites, the <a href=":page-cache">Internal Page Cache module</a> should be installed so that pages are efficiently cached and reused for anonymous users. Finally, for websites of all sizes, the <a href=":dynamic-page-cache">Dynamic Page Cache module</a> should also be installed so that the non-personalized parts of pages are efficiently cached (for all users).', [':performance-page' => \Drupal::url('system.performance_settings'), ':page-cache' => (\Drupal::moduleHandler()->moduleExists('page_cache')) ? \Drupal::url('help.page', ['name' => 'page_cache']) : '#', ':dynamic-page-cache' => (\Drupal::moduleHandler()->moduleExists('dynamic_page_cache')) ? \Drupal::url('help.page', ['name' => 'dynamic_page_cache']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Configuring cron') . '</dt>';
-      $output .= '<dd>' . t('In order for the site and its modules to continue to operate well, a set of routine administrative operations must run on a regular basis; these operations are known as <em>cron</em> tasks. On the <a href=":cron">Cron page</a>, you can configure cron to run periodically as part of server responses by installing the <em>Automated Cron</em> module, or you can turn this off and trigger cron from an outside process on your web server. You can verify the status of cron tasks by visiting the <a href=":status">Status report page</a>. For more information, see the <a href=":handbook">online documentation for configuring cron jobs</a>.', array(':status' => \Drupal::url('system.status'), ':handbook' => 'https://www.drupal.org/cron', ':cron' => \Drupal::url('system.cron_settings'))) . '</dd>';
+      $output .= '<dd>' . t('In order for the site and its modules to continue to operate well, a set of routine administrative operations must run on a regular basis; these operations are known as <em>cron</em> tasks. On the <a href=":cron">Cron page</a>, you can configure cron to run periodically as part of server responses by installing the <em>Automated Cron</em> module, or you can turn this off and trigger cron from an outside process on your web server. You can verify the status of cron tasks by visiting the <a href=":status">Status report page</a>. For more information, see the <a href=":handbook">online documentation for configuring cron jobs</a>.', [':status' => \Drupal::url('system.status'), ':handbook' => 'https://www.drupal.org/cron', ':cron' => \Drupal::url('system.cron_settings')]) . '</dd>';
       $output .= '<dt>' . t('Configuring the file system') . '</dt>';
-      $output .= '<dd>' . t('Your site has several file directories, which are used to store and process uploaded and generated files. The <em>public</em> file directory, which is configured in your settings.php file, is the default place for storing uploaded files. Links to files in this directory contain the direct file URL, so when the files are requested, the web server will send them directly without invoking your site code. This means that the files can be downloaded by anyone with the file URL, so requests are not access-controlled but they are efficient. The <em>private</em> file directory, also configured in your settings.php file and ideally located outside the site web root, is access controlled. Links to files in this directory are not direct, so requests to these files are mediated by your site code. This means that your site can check file access permission for each file before deciding to fulfill the request, so the requests are more secure, but less efficient. You should only use the private storage for files that need access control, not for files like your site logo and background images used on every page. The <em>temporary</em> file directory is used internally by your site code for various operations, and is configured on the <a href=":file-system">File system settings</a> page. You can also see the configured public and private file directories on this page, and choose whether public or private should be the default for uploaded files.', array(':file-system' => \Drupal::url('system.file_system_settings'))) . '</dd>';
+      $output .= '<dd>' . t('Your site has several file directories, which are used to store and process uploaded and generated files. The <em>public</em> file directory, which is configured in your settings.php file, is the default place for storing uploaded files. Links to files in this directory contain the direct file URL, so when the files are requested, the web server will send them directly without invoking your site code. This means that the files can be downloaded by anyone with the file URL, so requests are not access-controlled but they are efficient. The <em>private</em> file directory, also configured in your settings.php file and ideally located outside the site web root, is access controlled. Links to files in this directory are not direct, so requests to these files are mediated by your site code. This means that your site can check file access permission for each file before deciding to fulfill the request, so the requests are more secure, but less efficient. You should only use the private storage for files that need access control, not for files like your site logo and background images used on every page. The <em>temporary</em> file directory is used internally by your site code for various operations, and is configured on the <a href=":file-system">File system settings</a> page. You can also see the configured public and private file directories on this page, and choose whether public or private should be the default for uploaded files.', [':file-system' => \Drupal::url('system.file_system_settings')]) . '</dd>';
       $output .= '<dt>' . t('Configuring the image toolkit') . '</dt>';
-      $output .= '<dd>' . t('On the <a href=":toolkit">Image toolkit page</a>, you can select and configure the PHP toolkit used to manipulate images. Depending on which distribution or installation profile you choose when you install your site, the GD2 toolkit and possibly others are included; other toolkits may be provided by contributed modules.', array(':toolkit' => \Drupal::url('system.image_toolkit_settings'))) . '</dd>';
+      $output .= '<dd>' . t('On the <a href=":toolkit">Image toolkit page</a>, you can select and configure the PHP toolkit used to manipulate images. Depending on which distribution or installation profile you choose when you install your site, the GD2 toolkit and possibly others are included; other toolkits may be provided by contributed modules.', [':toolkit' => \Drupal::url('system.image_toolkit_settings')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -110,24 +125,24 @@ function system_help($route_name, RouteMatchInterface $route_match) {
       return '<p>' . t('This page shows you all available administration tasks for each module.') . '</p>';
 
     case 'system.themes_page':
-      $output = '<p>' . t('Set and configure the default theme for your website.  Alternative <a href=":themes">themes</a> are available.', array(':themes' => 'https://www.drupal.org/project/themes')) . '</p>';
+      $output = '<p>' . t('Set and configure the default theme for your website.  Alternative <a href=":themes">themes</a> are available.', [':themes' => 'https://www.drupal.org/project/themes']) . '</p>';
       if (\Drupal::moduleHandler()->moduleExists('block')) {
-        $output .= '<p>' . t('You can place blocks for each theme on the <a href=":blocks">block layout</a> page.', array(':blocks' => \Drupal::url('block.admin_display'))) . '</p>';
+        $output .= '<p>' . t('You can place blocks for each theme on the <a href=":blocks">block layout</a> page.', [':blocks' => \Drupal::url('block.admin_display')]) . '</p>';
       }
       return $output;
 
     case 'system.theme_settings_theme':
       $theme_list = \Drupal::service('theme_handler')->listInfo();
       $theme = $theme_list[$route_match->getParameter('theme')];
-      return '<p>' . t('These options control the display settings for the %name theme. When your site is displayed using this theme, these settings will be used.', array('%name' => $theme->info['name'])) . '</p>';
+      return '<p>' . t('These options control the display settings for the %name theme. When your site is displayed using this theme, these settings will be used.', ['%name' => $theme->info['name']]) . '</p>';
 
     case 'system.theme_settings':
       return '<p>' . t('Control default display settings for your site, across all themes. Use theme-specific settings to override these defaults.') . '</p>';
 
     case 'system.modules_list':
-      $output = '<p>' . t('Download additional <a href=":modules">contributed modules</a> to extend your site\'s functionality.', array(':modules' => 'https://www.drupal.org/project/modules')) . '</p>';
+      $output = '<p>' . t('Download additional <a href=":modules">contributed modules</a> to extend your site\'s functionality.', [':modules' => 'https://www.drupal.org/project/modules']) . '</p>';
       if (!\Drupal::moduleHandler()->moduleExists('update')) {
-        $output .= '<p>' . t('Regularly review available updates to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated. Enable the <a href=":update-manager">Update Manager module</a> to update and install modules and themes.', array(':update-php' => \Drupal::url('system.db_update'), ':update-manager' => \Drupal::url('system.modules_list', [], ['fragment' => 'module-update']))) . '</p>';
+        $output .= '<p>' . t('Regularly review available updates to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated. Enable the <a href=":update-manager">Update Manager module</a> to update and install modules and themes.', [':update-php' => \Drupal::url('system.db_update'), ':update-manager' => \Drupal::url('system.modules_list', [], ['fragment' => 'module-update'])]) . '</p>';
       }
       return $output;
 
@@ -153,7 +168,7 @@ function system_help($route_name, RouteMatchInterface $route_match) {
       break;
 
     case 'system.status':
-      return '<p>' . t("Here you can find a short overview of your site's parameters as well as any problems detected with your installation. It may be useful to copy and paste this information into support requests filed on Drupal.org's support forums and project issue queues. Before filing a support request, ensure that your web server meets the <a href=\":system-requirements\">system requirements.</a>", array(':system-requirements' => 'https://www.drupal.org/requirements')) . '</p>';
+      return '<p>' . t("Here you can find a short overview of your site's parameters as well as any problems detected with your installation. It may be useful to copy and paste this information into support requests filed on Drupal.org's support forums and project issue queues. Before filing a support request, ensure that your web server meets the <a href=\":system-requirements\">system requirements.</a>", [':system-requirements' => 'https://www.drupal.org/requirements']) . '</p>';
   }
 }
 
@@ -161,88 +176,117 @@ function system_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function system_theme() {
-  return array_merge(drupal_common_theme(), array(
+  return array_merge(drupal_common_theme(), [
     // Normally theme suggestion templates are only picked up when they are in
     // themes. We explicitly define theme suggestions here so that the block
     // templates in core/modules/system/templates are picked up.
-    'block__system_branding_block' => array(
+    'block__system_branding_block' => [
       'render element' => 'elements',
       'base hook' => 'block',
-    ),
-    'block__system_messages_block' => array(
+    ],
+    'block__system_messages_block' => [
       'base hook' => 'block',
-    ),
-    'block__system_menu_block' => array(
+    ],
+    'block__system_menu_block' => [
       'render element' => 'elements',
       'base hook' => 'block',
-    ),
-    'system_themes_page' => array(
-      'variables' => array(
-        'theme_groups' => array(),
-        'theme_group_titles' => array(),
-      ),
+    ],
+    'system_themes_page' => [
+      'variables' => [
+        'theme_groups' => [],
+        'theme_group_titles' => [],
+      ],
       'file' => 'system.admin.inc',
-    ),
-    'system_config_form' => array(
+    ],
+    'system_config_form' => [
       'render element' => 'form',
-    ),
-    'confirm_form' => array(
+    ],
+    'confirm_form' => [
       'render element' => 'form',
-    ),
-    'system_modules_details' => array(
+    ],
+    'system_modules_details' => [
       'render element' => 'form',
       'file' => 'system.admin.inc',
-    ),
-    'system_modules_uninstall' => array(
+    ],
+    'system_modules_uninstall' => [
       'render element' => 'form',
       'file' => 'system.admin.inc',
-    ),
-    'status_report' => array(
-      'variables' => array('requirements' => NULL),
+    ],
+    'status_report_page' => [
+      'variables' => [
+        'counters' => [],
+        'general_info' => [],
+        'requirements' => NULL,
+      ],
+    ],
+    'status_report' => [
+      'variables' => [
+        'grouped_requirements' => NULL,
+        'requirements' => NULL,
+      ],
+    ],
+    'status_report_grouped' => [
+      'variables' => [
+        'grouped_requirements' => NULL,
+        'requirements' => NULL,
+      ],
+    ],
+    'status_report_counter' => [
+      'variables' => ['amount' => NULL, 'text' => NULL, 'severity' => NULL],
+    ],
+    'status_report_general_info' => [
+      'variables' => [
+        'drupal' => [],
+        'cron' => [],
+        'database_system' => [],
+        'database_system_version' => [],
+        'php' => [],
+        'php_memory_limit' => [],
+        'webserver' => [],
+      ],
+    ],
+    'admin_page' => [
+      'variables' => ['blocks' => NULL],
       'file' => 'system.admin.inc',
-    ),
-    'admin_page' => array(
-      'variables' => array('blocks' => NULL),
+    ],
+    'admin_block' => [
+      'variables' => ['block' => NULL],
       'file' => 'system.admin.inc',
-    ),
-    'admin_block' => array(
-      'variables' => array('block' => NULL),
+    ],
+    'admin_block_content' => [
+      'variables' => ['content' => NULL],
       'file' => 'system.admin.inc',
-    ),
-    'admin_block_content' => array(
-      'variables' => array('content' => NULL),
+    ],
+    'system_admin_index' => [
+      'variables' => ['menu_items' => NULL],
       'file' => 'system.admin.inc',
-    ),
-    'system_admin_index' => array(
-      'variables' => array('menu_items' => NULL),
-      'file' => 'system.admin.inc',
-    ),
-    'entity_add_list' => array(
-      'variables' => array(
-        'bundles' => array(),
+    ],
+    'entity_add_list' => [
+      'variables' => [
+        'bundles' => [],
         'add_bundle_message' => NULL,
-      ),
+      ],
       'template' => 'entity-add-list',
-    ),
-  ));
+    ],
+  ]);
 }
 
 /**
  * Implements hook_hook_info().
  */
 function system_hook_info() {
-  $hooks['token_info'] = array(
+  $hooks['token_info'] = [
     'group' => 'tokens',
-  );
-  $hooks['token_info_alter'] = array(
+  ];
+  $hooks['token_info_alter'] = [
     'group' => 'tokens',
-  );
-  $hooks['tokens'] = array(
+  ];
+  $hooks['tokens'] = [
     'group' => 'tokens',
-  );
-  $hooks['tokens_alter'] = array(
+  ];
+  $hooks['tokens_alter'] = [
     'group' => 'tokens',
-  );
+  ];
 
   return $hooks;
 }
@@ -251,12 +295,7 @@ function system_hook_info() {
  * Implements hook_theme_suggestions_HOOK().
  */
 function system_theme_suggestions_html(array $variables) {
-  if (\Drupal::service('path.matcher')->isFrontPage()) {
-    $path_args = [''];
-  }
-  else {
-    $path_args = explode('/', ltrim(\Drupal::service('path.current')->getPath(), '/'));
-  }
+  $path_args = explode('/', trim(\Drupal::service('path.current')->getPath(), '/'));
   return theme_get_suggestions($path_args, 'html');
 }
 
@@ -264,12 +303,7 @@ function system_theme_suggestions_html(array $variables) {
  * Implements hook_theme_suggestions_HOOK().
  */
 function system_theme_suggestions_page(array $variables) {
-  if (\Drupal::service('path.matcher')->isFrontPage()) {
-    $path_args = [''];
-  }
-  else {
-    $path_args = explode('/', Url::fromRoute('<current>')->getInternalPath());
-  }
+  $path_args = explode('/', trim(\Drupal::service('path.current')->getPath(), '/'));
   return theme_get_suggestions($path_args, 'page');
 }
 
@@ -277,7 +311,7 @@ function system_theme_suggestions_page(array $variables) {
  * Implements hook_theme_suggestions_HOOK().
  */
 function system_theme_suggestions_maintenance_page(array $variables) {
-  $suggestions = array();
+  $suggestions = [];
 
   // Dead databases will show error messages so supplying this template will
   // allow themers to override the page and the content completely.
@@ -300,7 +334,7 @@ function system_theme_suggestions_maintenance_page(array $variables) {
  * Implements hook_theme_suggestions_HOOK().
  */
 function system_theme_suggestions_region(array $variables) {
-  $suggestions = array();
+  $suggestions = [];
   if (!empty($variables['elements']['#region'])) {
     $suggestions[] = 'region__' . $variables['elements']['#region'];
   }
@@ -311,7 +345,7 @@ function system_theme_suggestions_region(array $variables) {
  * Implements hook_theme_suggestions_HOOK().
  */
 function system_theme_suggestions_field(array $variables) {
-  $suggestions = array();
+  $suggestions = [];
   $element = $variables['element'];
 
   $suggestions[] = 'field__' . $element['#field_type'];
@@ -418,18 +452,18 @@ function template_preprocess_entity_add_list(&$variables) {
  * @return
  *   Nothing, this function just initializes variables in the user's session.
  */
-function system_authorized_init($callback, $file, $arguments = array(), $page_title = NULL) {
+function system_authorized_init($callback, $file, $arguments = [], $page_title = NULL) {
   // First, figure out what file transfer backends the site supports, and put
   // all of those in the SESSION so that authorize.php has access to all of
   // them via the class autoloader, even without a full bootstrap.
   $_SESSION['authorize_filetransfer_info'] = drupal_get_filetransfer_info();
 
   // Now, define the callback to invoke.
-  $_SESSION['authorize_operation'] = array(
+  $_SESSION['authorize_operation'] = [
     'callback' => $callback,
     'file' => $file,
     'arguments' => $arguments,
-  );
+  ];
 
   if (isset($page_title)) {
     $_SESSION['authorize_page_title'] = $page_title;
@@ -446,7 +480,7 @@ function system_authorized_init($callback, $file, $arguments = array(), $page_ti
  *
  * @see system_authorized_init()
  */
-function system_authorized_get_url(array $options = array()) {
+function system_authorized_get_url(array $options = []) {
   // core/authorize.php is an unrouted URL, so using the base: scheme is
   // the correct usage for this case.
   $url = Url::fromUri('base:core/authorize.php');
@@ -463,8 +497,8 @@ function system_authorized_get_url(array $options = array()) {
  *
  * @return \Drupal\Core\Url
  */
-function system_authorized_batch_processing_url(array $options = array()) {
-  $options['query'] = array('batch' => '1');
+function system_authorized_batch_processing_url(array $options = []) {
+  $options['query'] = ['batch' => '1'];
   return system_authorized_get_url($options);
 }
 
@@ -473,7 +507,7 @@ function system_authorized_batch_processing_url(array $options = array()) {
  *
  * @see system_authorized_init()
  */
-function system_authorized_run($callback, $file, $arguments = array(), $page_title = NULL) {
+function system_authorized_run($callback, $file, $arguments = [], $page_title = NULL) {
   system_authorized_init($callback, $file, $arguments, $page_title);
   return new RedirectResponse(system_authorized_get_url()->toString());
 }
@@ -497,43 +531,43 @@ function system_authorized_batch_process() {
  * Implements hook_updater_info().
  */
 function system_updater_info() {
-  return array(
-    'module' => array(
+  return [
+    'module' => [
       'class' => 'Drupal\Core\Updater\Module',
       'name' => t('Update modules'),
       'weight' => 0,
-    ),
-    'theme' => array(
+    ],
+    'theme' => [
       'class' => 'Drupal\Core\Updater\Theme',
       'name' => t('Update themes'),
       'weight' => 0,
-    ),
-  );
+    ],
+  ];
 }
 
 /**
  * Implements hook_filetransfer_info().
  */
 function system_filetransfer_info() {
-  $backends = array();
+  $backends = [];
 
   // This is the default, will be available on most systems.
   if (function_exists('ftp_connect')) {
-    $backends['ftp'] = array(
+    $backends['ftp'] = [
       'title' => t('FTP'),
       'class' => 'Drupal\Core\FileTransfer\FTP',
       'weight' => 0,
-    );
+    ];
   }
 
   // SSH2 lib connection is only available if the proper PHP extension is
   // installed.
   if (function_exists('ssh2_connect')) {
-    $backends['ssh'] = array(
+    $backends['ssh'] = [
       'title' => t('SSH'),
       'class' => 'Drupal\Core\FileTransfer\SSH',
       'weight' => 20,
-    );
+    ];
   }
   return $backends;
 }
@@ -561,61 +595,61 @@ function system_page_attachments(array &$page) {
   if (theme_get_setting('features.favicon')) {
     $favicon = theme_get_setting('favicon.url');
     $type = theme_get_setting('favicon.mimetype');
-    $page['#attached']['html_head_link'][][] = array(
+    $page['#attached']['html_head_link'][][] = [
       'rel' => 'shortcut icon',
       'href' => UrlHelper::stripDangerousProtocols($favicon),
       'type' => $type,
-    );
+    ];
   }
 
   // Get the major Drupal version.
   list($version, ) = explode('.', \Drupal::VERSION);
 
   // Attach default meta tags.
-  $meta_default = array(
+  $meta_default = [
     // Make sure the Content-Type comes first because the IE browser may be
     // vulnerable to XSS via encoding attacks from any content that comes
     // before this META tag, such as a TITLE tag.
-    'system_meta_content_type' => array(
+    'system_meta_content_type' => [
       '#tag' => 'meta',
-      '#attributes' => array(
+      '#attributes' => [
         'charset' => 'utf-8',
-      ),
+      ],
       // Security: This always has to be output first.
       '#weight' => -1000,
-    ),
+    ],
     // Show Drupal and the major version number in the META GENERATOR tag.
-    'system_meta_generator' => array(
+    'system_meta_generator' => [
       '#type' => 'html_tag',
       '#tag' => 'meta',
-      '#attributes' => array(
+      '#attributes' => [
         'name' => 'Generator',
         'content' => 'Drupal ' . $version . ' (https://www.drupal.org)',
-      ),
-    ),
+      ],
+    ],
     // Attach default mobile meta tags for responsive design.
-    'MobileOptimized' => array(
+    'MobileOptimized' => [
       '#tag' => 'meta',
-      '#attributes' => array(
+      '#attributes' => [
         'name' => 'MobileOptimized',
         'content' => 'width',
-      ),
-    ),
-    'HandheldFriendly' => array(
+      ],
+    ],
+    'HandheldFriendly' => [
       '#tag' => 'meta',
-      '#attributes' => array(
+      '#attributes' => [
         'name' => 'HandheldFriendly',
         'content' => 'true',
-      ),
-    ),
-    'viewport' => array(
+      ],
+    ],
+    'viewport' => [
       '#tag' => 'meta',
-      '#attributes' => array(
+      '#attributes' => [
         'name' => 'viewport',
         'content' => 'width=device-width, initial-scale=1.0',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
   foreach ($meta_default as $key => $value) {
     $page['#attached']['html_head'][] = [$value, $key];
   }
@@ -790,7 +824,7 @@ function system_user_login(UserInterface $account) {
   $config = \Drupal::config('system.date');
   // If the user has a NULL time zone, notify them to set a time zone.
   if (!$account->getTimezone() && $config->get('timezone.user.configurable') && $config->get('timezone.user.warn')) {
-    drupal_set_message(t('Configure your <a href=":user-edit">account time zone setting</a>.', array(':user-edit' => $account->url('edit-form', array('query' => \Drupal::destination()->getAsArray(), 'fragment' => 'edit-timezone')))));
+    drupal_set_message(t('Configure your <a href=":user-edit">account time zone setting</a>.', [':user-edit' => $account->url('edit-form', ['query' => \Drupal::destination()->getAsArray(), 'fragment' => 'edit-timezone'])]));
   }
 }
 
@@ -801,23 +835,23 @@ function system_user_timezone(&$form, FormStateInterface $form_state) {
   $user = \Drupal::currentUser();
 
   $account = $form_state->getFormObject()->getEntity();
-  $form['timezone'] = array(
+  $form['timezone'] = [
     '#type' => 'details',
     '#title' => t('Locale settings'),
     '#open' => TRUE,
     '#weight' => 6,
-  );
-  $form['timezone']['timezone'] = array(
+  ];
+  $form['timezone']['timezone'] = [
     '#type' => 'select',
     '#title' => t('Time zone'),
     '#default_value' => $account->getTimezone() ? $account->getTimezone() : \Drupal::config('system.date')->get('timezone.default'),
     '#options' => system_time_zones($account->id() != $user->id()),
     '#description' => t('Select the desired local time and time zone. Dates and times throughout this site will be displayed using this time zone.'),
-  );
+  ];
   $user_input = $form_state->getUserInput();
   if (!$account->getTimezone() && $account->id() == $user->id() && empty($user_input['timezone'])) {
     $form['timezone']['#attached']['library'][] = 'core/drupal.timezone';
-    $form['timezone']['timezone']['#attributes'] = array('class' => array('timezone-detect'));
+    $form['timezone']['timezone']['#attributes'] = ['class' => ['timezone-detect']];
   }
 }
 
@@ -869,14 +903,14 @@ function system_check_directory($form_element, FormStateInterface $form_state) {
   $logger = \Drupal::logger('file system');
   if (!is_dir($directory) && !drupal_mkdir($directory, NULL, TRUE)) {
     // If the directory does not exists and cannot be created.
-    $form_state->setErrorByName($form_element['#parents'][0], t('The directory %directory does not exist and could not be created.', array('%directory' => $directory)));
-    $logger->error('The directory %directory does not exist and could not be created.', array('%directory' => $directory));
+    $form_state->setErrorByName($form_element['#parents'][0], t('The directory %directory does not exist and could not be created.', ['%directory' => $directory]));
+    $logger->error('The directory %directory does not exist and could not be created.', ['%directory' => $directory]);
   }
 
   if (is_dir($directory) && !is_writable($directory) && !drupal_chmod($directory)) {
     // If the directory is not writable and cannot be made so.
-    $form_state->setErrorByName($form_element['#parents'][0], t('The directory %directory exists but is not writable and could not be made writable.', array('%directory' => $directory)));
-    $logger->error('The directory %directory exists but is not writable and could not be made writable.', array('%directory' => $directory));
+    $form_state->setErrorByName($form_element['#parents'][0], t('The directory %directory exists but is not writable and could not be made writable.', ['%directory' => $directory]));
+    $logger->error('The directory %directory exists but is not writable and could not be made writable.', ['%directory' => $directory]);
   }
   elseif (is_dir($directory)) {
     if ($form_element['#name'] == 'file_public_path') {
@@ -937,7 +971,7 @@ function system_get_info($type, $name = NULL) {
     }
   }
   else {
-    $info = array();
+    $info = [];
     $list = system_list($type);
     foreach ($list as $shortname => $item) {
       if (!empty($item->status)) {
@@ -946,7 +980,7 @@ function system_get_info($type, $name = NULL) {
     }
   }
   if (isset($name)) {
-    return isset($info[$name]) ? $info[$name] : array();
+    return isset($info[$name]) ? $info[$name] : [];
   }
   return $info;
 }
@@ -983,13 +1017,13 @@ function _system_rebuild_module_data() {
   }
 
   // Set defaults for module info.
-  $defaults = array(
-    'dependencies' => array(),
+  $defaults = [
+    'dependencies' => [],
     'description' => '',
     'package' => 'Other',
     'version' => NULL,
     'php' => DRUPAL_MINIMUM_PHP,
-  );
+  ];
 
   // Read info files for each module.
   foreach ($modules as $key => $module) {
@@ -1051,7 +1085,7 @@ function _system_rebuild_module_data_ensure_required($module, &$modules) {
       $dependency_name = ModuleHandler::parseDependency($dependency)['name'];
       if (!isset($modules[$dependency_name]->info['required'])) {
         $modules[$dependency_name]->info['required'] = TRUE;
-        $modules[$dependency_name]->info['explanation'] = t('Dependency of required module @module', array('@module' => $module->info['name']));
+        $modules[$dependency_name]->info['explanation'] = t('Dependency of required module @module', ['@module' => $module->info['name']]);
         // Ensure any dependencies it has are required.
         _system_rebuild_module_data_ensure_required($modules[$dependency_name], $modules);
       }
@@ -1072,10 +1106,10 @@ function system_rebuild_module_data() {
   // reference from system_list_reset() during the rebuild.
   if (!isset($modules_cache)) {
     $modules = _system_rebuild_module_data();
-    $files = array();
+    $files = [];
     ksort($modules);
     // Add status, weight, and schema version.
-    $installed_modules = \Drupal::config('core.extension')->get('module') ?: array();
+    $installed_modules = \Drupal::config('core.extension')->get('module') ?: [];
     foreach ($modules as $name => $module) {
       $module->weight = isset($installed_modules[$name]) ? $installed_modules[$name] : 0;
       $module->status = (int) isset($installed_modules[$name]);
@@ -1110,11 +1144,11 @@ function system_region_list($theme, $show = REGIONS_ALL) {
   if (!$theme instanceof Extension) {
     $themes = \Drupal::service('theme_handler')->listInfo();
     if (!isset($themes[$theme])) {
-      return array();
+      return [];
     }
     $theme = $themes[$theme];
   }
-  $list = array();
+  $list = [];
   $info = $theme->info;
   // If requested, suppress hidden regions. See block_admin_display_form().
   foreach ($info['regions'] as $name => $label) {
@@ -1219,15 +1253,15 @@ function system_get_module_admin_tasks($module, array $info) {
     $parameters = new MenuTreeParameters();
     $parameters->setRoot('system.admin')->excludeRoot()->onlyEnabledLinks();
     $tree = $menu_tree->load('system.admin', $parameters);
-    $manipulators = array(
-      array('callable' => 'menu.default_tree_manipulators:checkAccess'),
-      array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
-      array('callable' => 'menu.default_tree_manipulators:flatten'),
-    );
+    $manipulators = [
+      ['callable' => 'menu.default_tree_manipulators:checkAccess'],
+      ['callable' => 'menu.default_tree_manipulators:generateIndexAndSort'],
+      ['callable' => 'menu.default_tree_manipulators:flatten'],
+    ];
     $tree = $menu_tree->transform($tree, $manipulators);
   }
 
-  $admin_tasks = array();
+  $admin_tasks = [];
   foreach ($tree as $element) {
     if (!$element->access->isAllowed()) {
       // @todo Bubble cacheability metadata of both accessible and inaccessible
@@ -1239,11 +1273,11 @@ function system_get_module_admin_tasks($module, array $info) {
     if ($link->getProvider() != $module) {
       continue;
     }
-    $admin_tasks[] = array(
+    $admin_tasks[] = [
       'title' => $link->getTitle(),
       'description' => $link->getDescription(),
       'url' => $link->getUrlObject(),
-    );
+    ];
   }
 
   // Append link for permissions.
@@ -1253,15 +1287,15 @@ function system_get_module_admin_tasks($module, array $info) {
   if ($permission_handler->moduleProvidesPermissions($module)) {
     /** @var \Drupal\Core\Access\AccessManagerInterface $access_manager */
     $access_manager = \Drupal::service('access_manager');
-    if ($access_manager->checkNamedRoute('user.admin_permissions', array(), \Drupal::currentUser())) {
+    if ($access_manager->checkNamedRoute('user.admin_permissions', [], \Drupal::currentUser())) {
       /** @var \Drupal\Core\Url $url */
       $url = new Url('user.admin_permissions');
       $url->setOption('fragment', 'module-' . $module);
-      $admin_tasks["user.admin_permissions.$module"] = array(
-        'title' => t('Configure @module permissions', array('@module' => $info['name'])),
+      $admin_tasks["user.admin_permissions.$module"] = [
+        'title' => t('Configure @module permissions', ['@module' => $info['name']]),
         'description' => '',
         'url' => $url,
-      );
+      ];
     }
   }
 
@@ -1314,7 +1348,7 @@ function system_mail($key, &$message, $params) {
   $subject = PlainTextOutput::renderFromHtml($token_service->replace($context['subject'], $context));
   $body = $token_service->replace($context['message'], $context);
 
-  $message['subject'] .= str_replace(array("\r", "\n"), '', $subject);
+  $message['subject'] .= str_replace(["\r", "\n"], '', $subject);
   $message['body'][] = $body;
 }
 
@@ -1326,13 +1360,13 @@ function system_mail($key, &$message, $params) {
  */
 function system_time_zones($blank = NULL) {
   $zonelist = timezone_identifiers_list();
-  $zones = $blank ? array('' => t('- None selected -')) : array();
+  $zones = $blank ? ['' => t('- None selected -')] : [];
   foreach ($zonelist as $zone) {
     // Because many time zones exist in PHP only for backward compatibility
     // reasons and should not be used, the list is filtered by a regular
     // expression.
     if (preg_match('!^((Africa|America|Antarctica|Arctic|Asia|Atlantic|Australia|Europe|Indian|Pacific)/|UTC$)!', $zone)) {
-      $zones[$zone] = t('@zone', array('@zone' => t(str_replace('_', ' ', $zone))));
+      $zones[$zone] = t('@zone', ['@zone' => t(str_replace('_', ' ', $zone))]);
     }
   }
   // Sort the translated time zones alphabetically.
@@ -1391,11 +1425,11 @@ function system_retrieve_file($url, $destination = NULL, $managed = FALSE, $repl
     $local = $managed ? file_save_data($data, $path, $replace) : file_unmanaged_save_data($data, $path, $replace);
   }
   catch (RequestException $exception) {
-    drupal_set_message(t('Failed to fetch file due to error "%error"', array('%error' => $exception->getMessage())), 'error');
+    drupal_set_message(t('Failed to fetch file due to error "%error"', ['%error' => $exception->getMessage()]), 'error');
     return FALSE;
   }
   if (!$local) {
-    drupal_set_message(t('@remote could not be saved to @path.', array('@remote' => $url, '@path' => $path)), 'error');
+    drupal_set_message(t('@remote could not be saved to @path.', ['@remote' => $url, '@path' => $path]), 'error');
   }
 
   return $local;
diff --git a/web/core/modules/system/system.post_update.php b/web/core/modules/system/system.post_update.php
index b75625c32..b96d3e3b3 100644
--- a/web/core/modules/system/system.post_update.php
+++ b/web/core/modules/system/system.post_update.php
@@ -5,10 +5,9 @@
  * Post update functions for System.
  */
 
-/**
- * @addtogroup updates-8.0.0-beta
- * @{
- */
+use Drupal\Core\Entity\Display\EntityDisplayInterface;
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
 
 /**
  * Re-save all configuration entities to recalculate dependencies.
@@ -39,5 +38,30 @@ function system_post_update_recalculate_configuration_entity_dependencies(&$sand
 }
 
 /**
- * @} End of "addtogroup updates-8.0.0-beta".
+ * Update entity displays to contain the region for each field.
  */
+function system_post_update_add_region_to_entity_displays() {
+  $entity_save = function (EntityDisplayInterface $entity) {
+    // preSave() will fill in the correct region based on the 'type'.
+    $entity->save();
+  };
+  array_map($entity_save, EntityViewDisplay::loadMultiple());
+  array_map($entity_save, EntityFormDisplay::loadMultiple());
+}
+
+
+/**
+ * Force caches using hashes to be cleared (Twig, render cache, etc.).
+ */
+function system_post_update_hashes_clear_cache() {
+  // Empty post-update hook.
+}
+
+/**
+ * Force plugin definitions to be cleared.
+ *
+ * @see https://www.drupal.org/node/2802663
+ */
+function system_post_update_timestamp_plugins() {
+  // Empty post-update hook.
+}
diff --git a/web/core/modules/system/system.routing.yml b/web/core/modules/system/system.routing.yml
index ae89fb038..ee9afc151 100644
--- a/web/core/modules/system/system.routing.yml
+++ b/web/core/modules/system/system.routing.yml
@@ -460,8 +460,6 @@ system.batch_page.html:
     _format: 'html'
   options:
     _admin_route: TRUE
-    # @todo Remove the '_no_big_pipe' route option when https://www.drupal.org/node/2589967 lands.
-    _no_big_pipe: TRUE
 
 system.batch_page.json:
   path: '/batch'
diff --git a/web/core/modules/system/system.tokens.inc b/web/core/modules/system/system.tokens.inc
index 66b5c7faf..55c89ae9f 100644
--- a/web/core/modules/system/system.tokens.inc
+++ b/web/core/modules/system/system.tokens.inc
@@ -14,74 +14,74 @@ use Drupal\Core\Render\BubbleableMetadata;
  * Implements hook_token_info().
  */
 function system_token_info() {
-  $types['site'] = array(
+  $types['site'] = [
     'name' => t("Site information"),
     'description' => t("Tokens for site-wide settings and other global information."),
-  );
-  $types['date'] = array(
+  ];
+  $types['date'] = [
     'name' => t("Dates"),
     'description' => t("Tokens related to times and dates."),
-  );
+  ];
 
   // Site-wide global tokens.
-  $site['name'] = array(
+  $site['name'] = [
     'name' => t("Name"),
     'description' => t("The name of the site."),
-  );
-  $site['slogan'] = array(
+  ];
+  $site['slogan'] = [
     'name' => t("Slogan"),
     'description' => t("The slogan of the site."),
-  );
-  $site['mail'] = array(
+  ];
+  $site['mail'] = [
     'name' => t("Email"),
     'description' => t("The administrative email address for the site."),
-  );
-  $site['url'] = array(
+  ];
+  $site['url'] = [
     'name' => t("URL"),
     'description' => t("The URL of the site's front page."),
-  );
-  $site['url-brief'] = array(
+  ];
+  $site['url-brief'] = [
     'name' => t("URL (brief)"),
     'description' => t("The URL of the site's front page without the protocol."),
-  );
-  $site['login-url'] = array(
+  ];
+  $site['login-url'] = [
     'name' => t("Login page"),
     'description' => t("The URL of the site's login page."),
-  );
+  ];
 
   // Date related tokens.
-  $date['short'] = array(
+  $date['short'] = [
     'name' => t("Short format"),
-    'description' => t("A date in 'short' format. (%date)", array('%date' => format_date(REQUEST_TIME, 'short'))),
-  );
-  $date['medium'] = array(
+    'description' => t("A date in 'short' format. (%date)", ['%date' => format_date(REQUEST_TIME, 'short')]),
+  ];
+  $date['medium'] = [
     'name' => t("Medium format"),
-    'description' => t("A date in 'medium' format. (%date)", array('%date' => format_date(REQUEST_TIME, 'medium'))),
-  );
-  $date['long'] = array(
+    'description' => t("A date in 'medium' format. (%date)", ['%date' => format_date(REQUEST_TIME, 'medium')]),
+  ];
+  $date['long'] = [
     'name' => t("Long format"),
-    'description' => t("A date in 'long' format. (%date)", array('%date' => format_date(REQUEST_TIME, 'long'))),
-  );
-  $date['custom'] = array(
+    'description' => t("A date in 'long' format. (%date)", ['%date' => format_date(REQUEST_TIME, 'long')]),
+  ];
+  $date['custom'] = [
     'name' => t("Custom format"),
     'description' => t('A date in a custom format. See <a href="http://php.net/manual/function.date.php">the PHP documentation</a> for details.'),
-  );
-  $date['since'] = array(
+  ];
+  $date['since'] = [
     'name' => t("Time-since"),
-    'description' => t("A date in 'time-since' format. (%date)", array('%date' => \Drupal::service('date.formatter')->formatTimeDiffSince(REQUEST_TIME - 360))),
-  );
-  $date['raw'] = array(
+    'description' => t("A date in 'time-since' format. (%date)", ['%date' => \Drupal::service('date.formatter')->formatTimeDiffSince(REQUEST_TIME - 360)]),
+  ];
+  $date['raw'] = [
     'name' => t("Raw timestamp"),
-    'description' => t("A date in UNIX timestamp format (%date)", array('%date' => REQUEST_TIME)),
-  );
+    'description' => t("A date in UNIX timestamp format (%date)", ['%date' => REQUEST_TIME]),
+  ];
 
-  return array(
+  return [
     'types' => $types,
-    'tokens' => array(
+    'tokens' => [
       'site' => $site,
       'date' => $date,
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -90,7 +90,7 @@ function system_token_info() {
 function system_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
-  $url_options = array('absolute' => TRUE);
+  $url_options = ['absolute' => TRUE];
   if (isset($options['langcode'])) {
     $url_options['language'] = \Drupal::languageManager()->getLanguage($options['langcode']);
     $langcode = $options['langcode'];
@@ -98,7 +98,7 @@ function system_tokens($type, $tokens, array $data, array $options, BubbleableMe
   else {
     $langcode = NULL;
   }
-  $replacements = array();
+  $replacements = [];
 
   if ($type == 'site') {
     foreach ($tokens as $name => $original) {
@@ -129,16 +129,16 @@ function system_tokens($type, $tokens, array $data, array $options, BubbleableMe
 
         case 'url':
           /** @var \Drupal\Core\GeneratedUrl $result */
-          $result = \Drupal::url('<front>', array(), $url_options, TRUE);
+          $result = \Drupal::url('<front>', [], $url_options, TRUE);
           $bubbleable_metadata->addCacheableDependency($result);
           $replacements[$original] = $result->getGeneratedUrl();
           break;
 
         case 'url-brief':
           /** @var \Drupal\Core\GeneratedUrl $result */
-          $result = \Drupal::url('<front>', array(), $url_options, TRUE);
+          $result = \Drupal::url('<front>', [], $url_options, TRUE);
           $bubbleable_metadata->addCacheableDependency($result);
-          $replacements[$original] = preg_replace(array('!^https?://!', '!/$!'), '', $result->getGeneratedUrl());
+          $replacements[$original] = preg_replace(['!^https?://!', '!/$!'], '', $result->getGeneratedUrl());
           break;
 
         case 'login-url':
@@ -173,7 +173,7 @@ function system_tokens($type, $tokens, array $data, array $options, BubbleableMe
           break;
 
         case 'since':
-          $replacements[$original] = \Drupal::service('date.formatter')->formatTimeDiffSince($date, array('langcode' => $langcode));
+          $replacements[$original] = \Drupal::service('date.formatter')->formatTimeDiffSince($date, ['langcode' => $langcode]);
           $bubbleable_metadata->setCacheMaxAge(0);
           break;
 
diff --git a/web/core/modules/system/templates/datetime-wrapper.html.twig b/web/core/modules/system/templates/datetime-wrapper.html.twig
index 8430baaa1..a14da8937 100644
--- a/web/core/modules/system/templates/datetime-wrapper.html.twig
+++ b/web/core/modules/system/templates/datetime-wrapper.html.twig
@@ -30,4 +30,8 @@
     {{ errors }}
   </div>
 {% endif %}
-{{ description }}
+{% if description %}
+  <div{{ description_attributes }}>
+    {{ description }}
+  </div>
+{% endif %}
diff --git a/web/core/modules/system/templates/status-report-counter.html.twig b/web/core/modules/system/templates/status-report-counter.html.twig
new file mode 100644
index 000000000..8489e495d
--- /dev/null
+++ b/web/core/modules/system/templates/status-report-counter.html.twig
@@ -0,0 +1,16 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the status report counter.
+ *
+ * Available variables:
+ * - amount: The number shown on counter.
+ * - text: The text shown on counter.
+ * - severity: The severity of the counter.
+ *
+ * @ingroup themable
+ */
+#}
+<span class="system-status-counter__status-icon system-status-counter__status-icon--{{ severity }}"></span>
+<span>{{ amount }} {{ text }}</span>
+<a href="#{{ severity }}"><span class="visually-hidden">{{ text }} </span>Details</a>
diff --git a/web/core/modules/system/templates/status-report-general-info.html.twig b/web/core/modules/system/templates/status-report-general-info.html.twig
new file mode 100644
index 000000000..d4d5054dc
--- /dev/null
+++ b/web/core/modules/system/templates/status-report-general-info.html.twig
@@ -0,0 +1,81 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the status report general info.
+ *
+ * Available variables:
+ * - drupal: The status of Drupal installation:
+ *   - value: The current status of Drupal installation.
+ *   - description: The description for current status of Drupal installation.
+ * - cron: The status of cron:
+ *   - value: The current status of cron.
+ *   - description: The description for current status of cron.
+ *   - cron.run_cron: An array to render a button for running cron.
+ * - database_system: The status of database system:
+ *   - value: The current status of database sytem.
+ *   - description: The description for current status of cron.
+ * - database_system_version: The info about current database version:
+ *   - value: The current version of database.
+ *   - description: The description for current version of database.
+ * - php: The current version of PHP:
+ *   - value: The status of currently installed PHP version.
+ *   - description: The description for current installed PHP version.
+ * - php_memory_limit: The info about current PHP memory limit:
+ *   - value: The status of currently set PHP memory limit.
+ *   - description: The description for currently set PHP memory limit.
+ * - webserver: The info about currently installed web server:
+ *   - value: The status of currently installed web server.
+ *   - description: The description for the status of currently installed web
+ *     server.
+ */
+#}
+
+<h2>{{ 'General System Information'|t }}</h2>
+<div class="system-status-general-info__item">
+  <h3 class="system-status-general-info__item-title">{{ 'Drupal Version'|t }}</h3>
+  {{ drupal.value }}
+  {% if drupal.description %}
+    {{ drupal.description }}
+  {% endif %}
+</div>
+<div class="system-status-general-info__item">
+  <h3 class="system-status-general-info__item-title">{{ 'Last Cron Run'|t }}</h3>
+  {{ cron.value }}
+  {% if cron.run_cron %}
+    {{ cron.run_cron }}
+  {% endif %}
+  {% if cron.description %}
+    {{ cron.description }}
+  {% endif %}
+</div>
+<div class="system-status-general-info__item">
+  <h3 class="system-status-general-info__item-title">{{ 'Web Server'|t }}</h3>
+  {{ webserver.value }}
+  {% if webserver.description %}
+    {{ webserver.description }}
+  {% endif %}
+</div>
+<div class="system-status-general-info__item">
+  <h3 class="system-status-general-info__item-title">{{ 'PHP'|t }}</h3>
+  <h4>{{ 'Version'|t }}</h4> {{ php.value }}
+  {% if php.description %}
+    {{ php.description }}
+  {% endif %}
+
+  <h4>{{ 'Memory limit'|t }}</h4>{{ php_memory_limit.value }}
+  {% if php_memory_limit.description %}
+    {{ php_memory_limit.description }}
+  {% endif %}
+</div>
+<div class="system-status-general-info__item">
+  <h3 class="system-status-general-info__item-title">{{ 'Database'|t }}</h3>
+  <h4>{{ 'Version'|t }}</h4>{{ database_system_version.value }}
+  {% if database_system_version.description %}
+    {{ database_system_version.description }}
+  {% endif %}
+
+  <h4>{{ 'System'|t }}</h4>{{ database_system.value }}
+  {% if database_system.description %}
+    {{ database_system.description }}
+  {% endif %}
+</div>
diff --git a/web/core/modules/system/templates/status-report-grouped.html.twig b/web/core/modules/system/templates/status-report-grouped.html.twig
new file mode 100644
index 000000000..bd34e5af0
--- /dev/null
+++ b/web/core/modules/system/templates/status-report-grouped.html.twig
@@ -0,0 +1,49 @@
+{#
+/**
+ * @file
+ * Default theme implementation of grouped status report requirements.
+ *
+ * - grouped_requirements: Contains grouped requirements.
+ *   Each group contains:
+ *   - title: The title of the group.
+ *   - type: The severity of the group.
+ *   - items: The requirement instances.
+ *     Each requirement item contains:
+ *     - title: The title of the requirement.
+ *     - value: (optional) The requirement's status.
+ *     - description: (optional) The requirement's description.
+ *     - severity_title: The title of the severity.
+ *     - severity_status: Indicates the severity status.
+ */
+#}
+{{ attach_library('core/drupal.collapse') }}
+
+<div>
+  {% for group in grouped_requirements %}
+    <div>
+      <h3 id="{{ group.type }}">{{ group.title }}</h3>
+      {% for requirement in group.items %}
+        <details class="system-status-report__entry">
+          {%
+            set summary_classes = [
+              'system-status-report__status-title',
+              group.type in ['warning', 'error'] ? 'system-status-report__status-icon system-status-report__status-icon--' ~ group.type
+            ]
+          %}
+          <summary{{ create_attribute({'class': summary_classes}) }} role="button">
+            {% if requirement.severity_title  %}
+              <span class="visually-hidden">{{ requirement.severity_title }}</span>
+            {% endif %}
+            {{ requirement.title }}
+          </summary>
+          <div class="system-status-report__entry__value">
+            {{ requirement.value }}
+            {% if requirement.description %}
+              <div class="description">{{ requirement.description }}</div>
+            {% endif %}
+          </div>
+        </details>
+      {% endfor %}
+    </div>
+  {% endfor %}
+</div>
diff --git a/web/core/modules/system/templates/status-report-page.html.twig b/web/core/modules/system/templates/status-report-page.html.twig
new file mode 100644
index 000000000..ed6d1ea59
--- /dev/null
+++ b/web/core/modules/system/templates/status-report-page.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the status report page.
+ *
+ * Available variables:
+ * - counters: The list of counter elements.
+ * - general_info: A render array to create general info element.
+ * - requirements: A render array to create requirements table.
+ *
+ * @see template_preprocess_status_report()
+ */
+#}
+{% if counters|length == 3 %}
+  {% set element_width_class = ' system-status-report-counters__item--third-width' %}
+{% elseif counters|length == 2 %}
+  {% set element_width_class = ' system-status-report-counters__item--half-width' %}
+{% endif %}
+<div class="system-status-report-counters">
+  {% for counter in counters %}
+    <div class="system-status-report-counters__item{{ element_width_class }}">
+      {{ counter }}
+    </div>
+  {% endfor %}
+</div>
+
+{{ general_info }}
+{{ requirements }}
diff --git a/web/core/modules/system/templates/status-report.html.twig b/web/core/modules/system/templates/status-report.html.twig
index b6ad73985..ca9cf2b6a 100644
--- a/web/core/modules/system/templates/status-report.html.twig
+++ b/web/core/modules/system/templates/status-report.html.twig
@@ -2,40 +2,38 @@
 /**
  * @file
  * Default theme implementation for the status report.
- *
- * Available variables:
- * - requirements: Contains multiple requirement instances.
- *   Each requirement contains:
- *   - title: The title of the requirement.
- *   - value: (optional) The requirement's status.
- *   - description: (optional) The requirement's description.
- *   - severity_title: The title of the severity.
- *   - severity_status: Indicates the severity status.
- *
- * @see template_preprocess_status_report()
- *
- * @ingroup themeable
- */
-#}
-<table class="system-status-report">
-  <tbody>
-  {% for requirement in requirements %}
-    <tr class="system-status-report__entry system-status-report__entry--{{ requirement.severity_status }} color-{{ requirement.severity_status }}">
-      {% if requirement.severity_status in ['warning', 'error'] %}
-        <th class="system-status-report__status-title system-status-report__status-icon system-status-report__status-icon--{{ requirement.severity_status }}">
+  *
+  * Available variables:
+  * - grouped_requirements: Contains grouped requirements.
+  *   Each group contains:
+  *   - title: The title of the group.
+  *   - type: The severity of the group.
+  *   - items: The requirement instances.
+  *     Each requirement item contains:
+  *     - title: The title of the requirement.
+  *     - value: (optional) The requirement's status.
+  *     - description: (optional) The requirement's description.
+  *     - severity_title: The title of the severity.
+  *     - severity_status: Indicates the severity status.
+  * - requirements: Ungrouped requirements
+  *
+  * @ingroup themeable
+  */
+ #}
+{% for group in grouped_requirements %}
+  <h3 id="{{ group.type }}">{{ group.title }}</h3>
+  {% for requirement in group.items %}
+    <details>
+      <summary role="button">
+        {% if requirement.severity_title  %}
           <span class="visually-hidden">{{ requirement.severity_title }}</span>
-      {% else %}
-        <th class="system-status-report__status-title">
-      {% endif %}
-        {{ requirement.title }}
-      </th>
-      <td>
-        {{ requirement.value }}
-        {% if requirement.description %}
-          <div class="description">{{ requirement.description }}</div>
         {% endif %}
-      </td>
-    </tr>
+        {{ requirement.title }}
+      </summary>
+      {{ requirement.value }}
+      {% if requirement.description %}
+        <div>{{ requirement.description }}</div>
+      {% endif %}
+    </details>
   {% endfor %}
-  </tbody>
-</table>
+{% endfor %}
diff --git a/web/core/modules/system/tests/fixtures/update/block.block.secondtestfor2513534.yml b/web/core/modules/system/tests/fixtures/update/block.block.secondtestfor2513534.yml
new file mode 100644
index 000000000..2999cab9e
--- /dev/null
+++ b/web/core/modules/system/tests/fixtures/update/block.block.secondtestfor2513534.yml
@@ -0,0 +1,18 @@
+uuid: 3c4e92c3-5fb1-408d-993c-6066559230be
+langcode: en
+status: true
+dependencies:
+  theme:
+    - bartik
+id: pagetitle_2
+theme: bartik
+region: '-1'
+weight: null
+provider: null
+plugin: page_title_block
+settings:
+  id: page_title_block
+  label: 'Page title'
+  provider: core
+  label_display: '0'
+visibility: {  }
diff --git a/web/core/modules/system/tests/fixtures/update/block.block.testfor2513534.yml b/web/core/modules/system/tests/fixtures/update/block.block.testfor2513534.yml
new file mode 100644
index 000000000..b8a55fadf
--- /dev/null
+++ b/web/core/modules/system/tests/fixtures/update/block.block.testfor2513534.yml
@@ -0,0 +1,18 @@
+uuid: 87097da9-29d1-441f-8b00-b93852c760d6
+langcode: en
+status: false
+dependencies:
+  theme:
+    - bartik
+id: pagetitle_1
+theme: bartik
+region: '-1'
+weight: -8
+provider: null
+plugin: page_title_block
+settings:
+  id: page_title_block
+  label: 'Page title'
+  provider: core
+  label_display: '0'
+visibility: {  }
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8-rc1.filled.standard.php.gz b/web/core/modules/system/tests/fixtures/update/drupal-8-rc1.filled.standard.php.gz
index 615b88a7d..d7f880d07 100644
Binary files a/web/core/modules/system/tests/fixtures/update/drupal-8-rc1.filled.standard.php.gz and b/web/core/modules/system/tests/fixtures/update/drupal-8-rc1.filled.standard.php.gz differ
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update.php.gz b/web/core/modules/system/tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update.php.gz
new file mode 100644
index 000000000..a7ecfdce2
Binary files /dev/null and b/web/core/modules/system/tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update.php.gz differ
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz b/web/core/modules/system/tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz
new file mode 100644
index 000000000..0252db84e
Binary files /dev/null and b/web/core/modules/system/tests/fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz differ
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php b/web/core/modules/system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php
index 7f23f9026..cb3567689 100644
--- a/web/core/modules/system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php
+++ b/web/core/modules/system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php
@@ -23,16 +23,16 @@ $block_configs[] = Yaml::decode(file_get_contents(__DIR__ . '/block.block.thirdt
 
 foreach ($block_configs as $block_config) {
   $connection->insert('config')
-    ->fields(array(
+    ->fields([
       'collection',
       'name',
       'data',
-    ))
-    ->values(array(
+    ])
+    ->values([
       'collection' => '',
       'name' => 'block.block.' . $block_config['id'],
       'data' => serialize($block_config),
-    ))
+    ])
     ->execute();
 }
 
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.field-schema-data-uninstall-2573667.php b/web/core/modules/system/tests/fixtures/update/drupal-8.field-schema-data-uninstall-2573667.php
index a511cb547..e3531a0c1 100644
--- a/web/core/modules/system/tests/fixtures/update/drupal-8.field-schema-data-uninstall-2573667.php
+++ b/web/core/modules/system/tests/fixtures/update/drupal-8.field-schema-data-uninstall-2573667.php
@@ -11,64 +11,64 @@ use Drupal\Core\Database\Database;
 $connection = Database::getConnection();
 
 $connection->insert('key_value')
-  ->fields(array(
+  ->fields([
     'collection',
     'name',
     'value',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.body',
     'value' => 'a:2:{s:19:"block_content__body";a:4:{s:11:"description";s:42:"Data storage for block_content field body.";s:6:"fields";a:9:{s:6:"bundle";a:5:{s:4:"type";s:13:"varchar_ascii";s:6:"length";i:128;s:8:"not null";b:1;s:7:"default";s:0:"";s:11:"description";s:88:"The field instance bundle to which this row belongs, used when deleting a field instance";}s:7:"deleted";a:5:{s:4:"type";s:3:"int";s:4:"size";s:4:"tiny";s:8:"not null";b:1;s:7:"default";i:0;s:11:"description";s:60:"A boolean indicating whether this data item has been deleted";}s:9:"entity_id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:1;s:11:"description";s:38:"The entity id this data is attached to";}s:11:"revision_id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:1;s:11:"description";s:47:"The entity revision id this data is attached to";}s:8:"langcode";a:5:{s:4:"type";s:13:"varchar_ascii";s:6:"length";i:32;s:8:"not null";b:1;s:7:"default";s:0:"";s:11:"description";s:37:"The language code for this data item.";}s:5:"delta";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:1;s:11:"description";s:67:"The sequence number for this data item, used for multi-value fields";}s:10:"body_value";a:3:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:1;}s:12:"body_summary";a:3:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:0;}s:11:"body_format";a:3:{s:4:"type";s:13:"varchar_ascii";s:6:"length";i:255;s:8:"not null";b:0;}}s:11:"primary key";a:4:{i:0;s:9:"entity_id";i:1;s:7:"deleted";i:2;s:5:"delta";i:3;s:8:"langcode";}s:7:"indexes";a:3:{s:6:"bundle";a:1:{i:0;s:6:"bundle";}s:11:"revision_id";a:1:{i:0;s:11:"revision_id";}s:11:"body_format";a:1:{i:0;s:11:"body_format";}}}s:28:"block_content_revision__body";a:4:{s:11:"description";s:54:"Revision archive storage for block_content field body.";s:6:"fields";a:9:{s:6:"bundle";a:5:{s:4:"type";s:13:"varchar_ascii";s:6:"length";i:128;s:8:"not null";b:1;s:7:"default";s:0:"";s:11:"description";s:88:"The field instance bundle to which this row belongs, used when deleting a field instance";}s:7:"deleted";a:5:{s:4:"type";s:3:"int";s:4:"size";s:4:"tiny";s:8:"not null";b:1;s:7:"default";i:0;s:11:"description";s:60:"A boolean indicating whether this data item has been deleted";}s:9:"entity_id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:1;s:11:"description";s:38:"The entity id this data is attached to";}s:11:"revision_id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:1;s:11:"description";s:47:"The entity revision id this data is attached to";}s:8:"langcode";a:5:{s:4:"type";s:13:"varchar_ascii";s:6:"length";i:32;s:8:"not null";b:1;s:7:"default";s:0:"";s:11:"description";s:37:"The language code for this data item.";}s:5:"delta";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:1;s:11:"description";s:67:"The sequence number for this data item, used for multi-value fields";}s:10:"body_value";a:3:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:1;}s:12:"body_summary";a:3:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:0;}s:11:"body_format";a:3:{s:4:"type";s:13:"varchar_ascii";s:6:"length";i:255;s:8:"not null";b:0;}}s:11:"primary key";a:5:{i:0;s:9:"entity_id";i:1;s:11:"revision_id";i:2;s:7:"deleted";i:3;s:5:"delta";i:4;s:8:"langcode";}s:7:"indexes";a:3:{s:6:"bundle";a:1:{i:0;s:6:"bundle";}s:11:"revision_id";a:1:{i:0;s:11:"revision_id";}s:11:"body_format";a:1:{i:0;s:11:"body_format";}}}}',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.changed',
     'value' => 'a:2:{s:24:"block_content_field_data";a:1:{s:6:"fields";a:1:{s:7:"changed";a:2:{s:4:"type";s:3:"int";s:8:"not null";b:0;}}}s:28:"block_content_field_revision";a:1:{s:6:"fields";a:1:{s:7:"changed";a:2:{s:4:"type";s:3:"int";s:8:"not null";b:0;}}}}',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.default_langcode',
     'value' => 'a:2:{s:24:"block_content_field_data";a:1:{s:6:"fields";a:1:{s:16:"default_langcode";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"tiny";s:8:"not null";b:1;}}}s:28:"block_content_field_revision";a:1:{s:6:"fields";a:1:{s:16:"default_langcode";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"tiny";s:8:"not null";b:1;}}}}',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.id',
     'value' => 'a:4:{s:13:"block_content";a:1:{s:6:"fields";a:1:{s:2:"id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:4:"size";s:6:"normal";s:8:"not null";b:1;}}}s:24:"block_content_field_data";a:1:{s:6:"fields";a:1:{s:2:"id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:4:"size";s:6:"normal";s:8:"not null";b:1;}}}s:22:"block_content_revision";a:1:{s:6:"fields";a:1:{s:2:"id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:4:"size";s:6:"normal";s:8:"not null";b:1;}}}s:28:"block_content_field_revision";a:1:{s:6:"fields";a:1:{s:2:"id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:4:"size";s:6:"normal";s:8:"not null";b:1;}}}}',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.info',
     'value' => 'a:2:{s:24:"block_content_field_data";a:1:{s:6:"fields";a:1:{s:4:"info";a:4:{s:4:"type";s:7:"varchar";s:6:"length";i:255;s:6:"binary";b:0;s:8:"not null";b:0;}}}s:28:"block_content_field_revision";a:1:{s:6:"fields";a:1:{s:4:"info";a:4:{s:4:"type";s:7:"varchar";s:6:"length";i:255;s:6:"binary";b:0;s:8:"not null";b:0;}}}}',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.langcode',
     'value' => 'a:4:{s:13:"block_content";a:1:{s:6:"fields";a:1:{s:8:"langcode";a:4:{s:4:"type";s:7:"varchar";s:6:"length";i:12;s:8:"is_ascii";b:1;s:8:"not null";b:1;}}}s:24:"block_content_field_data";a:1:{s:6:"fields";a:1:{s:8:"langcode";a:4:{s:4:"type";s:7:"varchar";s:6:"length";i:12;s:8:"is_ascii";b:1;s:8:"not null";b:1;}}}s:22:"block_content_revision";a:1:{s:6:"fields";a:1:{s:8:"langcode";a:4:{s:4:"type";s:7:"varchar";s:6:"length";i:12;s:8:"is_ascii";b:1;s:8:"not null";b:1;}}}s:28:"block_content_field_revision";a:1:{s:6:"fields";a:1:{s:8:"langcode";a:4:{s:4:"type";s:7:"varchar";s:6:"length";i:12;s:8:"is_ascii";b:1;s:8:"not null";b:1;}}}}',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.revision_id',
     'value' => 'a:4:{s:13:"block_content";a:1:{s:6:"fields";a:1:{s:11:"revision_id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:4:"size";s:6:"normal";s:8:"not null";b:0;}}}s:24:"block_content_field_data";a:1:{s:6:"fields";a:1:{s:11:"revision_id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:4:"size";s:6:"normal";s:8:"not null";b:1;}}}s:22:"block_content_revision";a:1:{s:6:"fields";a:1:{s:11:"revision_id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:4:"size";s:6:"normal";s:8:"not null";b:1;}}}s:28:"block_content_field_revision";a:1:{s:6:"fields";a:1:{s:11:"revision_id";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:4:"size";s:6:"normal";s:8:"not null";b:1;}}}}',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.revision_log',
     'value' => 'a:1:{s:22:"block_content_revision";a:1:{s:6:"fields";a:1:{s:12:"revision_log";a:3:{s:4:"type";s:4:"text";s:4:"size";s:3:"big";s:8:"not null";b:0;}}}}',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.revision_translation_affected',
     'value' => 'a:2:{s:24:"block_content_field_data";a:1:{s:6:"fields";a:1:{s:29:"revision_translation_affected";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"tiny";s:8:"not null";b:0;}}}s:28:"block_content_field_revision";a:1:{s:6:"fields";a:1:{s:29:"revision_translation_affected";a:3:{s:4:"type";s:3:"int";s:4:"size";s:4:"tiny";s:8:"not null";b:0;}}}}',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.type',
     'value' => 'a:2:{s:13:"block_content";a:2:{s:6:"fields";a:1:{s:4:"type";a:4:{s:11:"description";s:28:"The ID of the target entity.";s:4:"type";s:13:"varchar_ascii";s:6:"length";i:32;s:8:"not null";b:1;}}s:7:"indexes";a:1:{s:36:"block_content_field__type__target_id";a:1:{i:0;s:4:"type";}}}s:24:"block_content_field_data";a:2:{s:6:"fields";a:1:{s:4:"type";a:4:{s:11:"description";s:28:"The ID of the target entity.";s:4:"type";s:13:"varchar_ascii";s:6:"length";i:32;s:8:"not null";b:1;}}s:7:"indexes";a:1:{s:36:"block_content_field__type__target_id";a:1:{i:0;s:4:"type";}}}}',
-  ))
-  ->values(array(
+  ])
+  ->values([
     'collection' => 'entity.storage_schema.sql',
     'name' => 'block_content.field_schema_data.uuid',
     'value' => 'a:1:{s:13:"block_content";a:2:{s:6:"fields";a:1:{s:4:"uuid";a:4:{s:4:"type";s:13:"varchar_ascii";s:6:"length";i:128;s:6:"binary";b:0;s:8:"not null";b:1;}}s:11:"unique keys";a:1:{s:32:"block_content_field__uuid__value";a:1:{i:0;s:4:"uuid";}}}}',
-  ))
+  ])
   ->execute();
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.filled.standard.php.gz b/web/core/modules/system/tests/fixtures/update/drupal-8.filled.standard.php.gz
index 1b3e23965..b3f2afb30 100644
Binary files a/web/core/modules/system/tests/fixtures/update/drupal-8.filled.standard.php.gz and b/web/core/modules/system/tests/fixtures/update/drupal-8.filled.standard.php.gz differ
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.local-actions-tasks-into-blocks-507488.php b/web/core/modules/system/tests/fixtures/update/drupal-8.local-actions-tasks-into-blocks-507488.php
index a47f9e013..6cf44b174 100644
--- a/web/core/modules/system/tests/fixtures/update/drupal-8.local-actions-tasks-into-blocks-507488.php
+++ b/web/core/modules/system/tests/fixtures/update/drupal-8.local-actions-tasks-into-blocks-507488.php
@@ -31,11 +31,11 @@ foreach ($block_configs as $block_config) {
 
 // Update the config entity query "index".
 $existing_blocks = $connection->select('key_value')
-    ->fields('key_value', ['value'])
-    ->condition('collection', 'config.entity.key_store.block')
-    ->condition('name', 'theme:seven')
-    ->execute()
-    ->fetchField();
+  ->fields('key_value', ['value'])
+  ->condition('collection', 'config.entity.key_store.block')
+  ->condition('name', 'theme:seven')
+  ->execute()
+  ->fetchField();
 $existing_blocks = unserialize($existing_blocks);
 
 $connection->update('key_value')
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.seven-secondary-local-tasks-block-2569529.php b/web/core/modules/system/tests/fixtures/update/drupal-8.seven-secondary-local-tasks-block-2569529.php
index 1ac03cae3..63582dc38 100644
--- a/web/core/modules/system/tests/fixtures/update/drupal-8.seven-secondary-local-tasks-block-2569529.php
+++ b/web/core/modules/system/tests/fixtures/update/drupal-8.seven-secondary-local-tasks-block-2569529.php
@@ -31,11 +31,11 @@ foreach ($block_configs as $block_config) {
 
 // Update the config entity query "index".
 $existing_blocks = $connection->select('key_value')
-    ->fields('key_value', ['value'])
-    ->condition('collection', 'config.entity.key_store.block')
-    ->condition('name', 'theme:seven')
-    ->execute()
-    ->fetchField();
+  ->fields('key_value', ['value'])
+  ->condition('collection', 'config.entity.key_store.block')
+  ->condition('name', 'theme:seven')
+  ->execute()
+  ->fetchField();
 $existing_blocks = unserialize($existing_blocks);
 
 $connection->update('key_value')
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.update-test-block-disabled-2513534.php b/web/core/modules/system/tests/fixtures/update/drupal-8.update-test-block-disabled-2513534.php
new file mode 100644
index 000000000..fa394473d
--- /dev/null
+++ b/web/core/modules/system/tests/fixtures/update/drupal-8.update-test-block-disabled-2513534.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @file
+ * Contains database additions to drupal-8.bare.standard.php.gz for testing the
+ * upgrade path of https://www.drupal.org/node/2513534.
+ */
+
+use Drupal\Component\Serialization\Yaml;
+use Drupal\Core\Database\Database;
+
+$connection = Database::getConnection();
+
+// A disabled block.
+$block_configs[] = Yaml::decode(file_get_contents(__DIR__ . '/block.block.testfor2513534.yml'));
+
+// A block placed in the default region.
+$block_configs[] = Yaml::decode(file_get_contents(__DIR__ . '/block.block.secondtestfor2513534.yml'));
+
+foreach ($block_configs as $block_config) {
+  $connection->insert('config')
+    ->fields([
+      'collection',
+      'name',
+      'data',
+    ])
+    ->values([
+      'collection' => '',
+      'name' => 'block.block.' . $block_config['id'],
+      'data' => serialize($block_config),
+    ])
+    ->execute();
+}
+
+// Update the config entity query "index".
+$existing_blocks = $connection->select('key_value')
+  ->fields('key_value', ['value'])
+  ->condition('collection', 'config.entity.key_store.block')
+  ->condition('name', 'theme:bartik')
+  ->execute()
+  ->fetchField();
+$existing_blocks = unserialize($existing_blocks);
+
+$connection->update('key_value')
+  ->fields([
+    'value' => serialize(array_merge($existing_blocks, ['block.block.testfor2513534', 'block.block.secondtestfor2513534']))
+  ])
+  ->condition('collection', 'config.entity.key_store.block')
+  ->condition('name', 'theme:bartik')
+  ->execute();
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.update-test-schema-enabled.php b/web/core/modules/system/tests/fixtures/update/drupal-8.update-test-schema-enabled.php
index 7250741cf..93592ecef 100644
--- a/web/core/modules/system/tests/fixtures/update/drupal-8.update-test-schema-enabled.php
+++ b/web/core/modules/system/tests/fixtures/update/drupal-8.update-test-schema-enabled.php
@@ -10,20 +10,20 @@ use Drupal\Core\Database\Database;
 $connection = Database::getConnection();
 
 // Create the table.
-$connection->schema()->createTable('update_test_schema_table', array(
-  'fields' => array(
-    'a' => array(
+$connection->schema()->createTable('update_test_schema_table', [
+  'fields' => [
+    'a' => [
       'type' => 'int',
       'not null' => TRUE,
       'size' => 'normal',
-    ),
-    'b' => array(
+    ],
+    'b' => [
       'type' => 'blob',
       'not null' => FALSE,
       'size' => 'normal',
-    ),
-  ),
-));
+    ],
+  ],
+]);
 
 // Set the schema version.
 $connection->merge('key_value')
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.php b/web/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.php
index 2fcda10af..7b04a3693 100644
--- a/web/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.php
+++ b/web/core/modules/system/tests/fixtures/update/drupal-8.views-entity-views-data-2455125.php
@@ -18,15 +18,15 @@ $views_configs[] = Yaml::decode(file_get_contents(__DIR__ . '/drupal-8.views-ent
 
 foreach ($views_configs as $views_config) {
   $connection->insert('config')
-    ->fields(array(
+    ->fields([
       'collection',
       'name',
       'data',
-    ))
-    ->values(array(
+    ])
+    ->values([
       'collection' => '',
       'name' => 'views.view.' . $views_config['id'],
       'data' => serialize($views_config),
-    ))
+    ])
     ->execute();
 }
diff --git a/web/core/modules/system/tests/modules/accept_header_routing_test/src/Routing/AcceptHeaderMatcher.php b/web/core/modules/system/tests/modules/accept_header_routing_test/src/Routing/AcceptHeaderMatcher.php
index 0981f46ea..1a3c61eaf 100644
--- a/web/core/modules/system/tests/modules/accept_header_routing_test/src/Routing/AcceptHeaderMatcher.php
+++ b/web/core/modules/system/tests/modules/accept_header_routing_test/src/Routing/AcceptHeaderMatcher.php
@@ -20,7 +20,7 @@ class AcceptHeaderMatcher implements RouteFilterInterface {
     // Generates a list of Symfony formats matching the acceptable MIME types.
     // @todo replace by proper content negotiation library.
     $acceptable_mime_types = $request->getAcceptableContentTypes();
-    $acceptable_formats = array_filter(array_map(array($request, 'getFormat'), $acceptable_mime_types));
+    $acceptable_formats = array_filter(array_map([$request, 'getFormat'], $acceptable_mime_types));
     $primary_format = $request->getRequestFormat();
 
     foreach ($collection as $name => $route) {
diff --git a/web/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module b/web/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
index ecde048bc..262572be9 100644
--- a/web/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
+++ b/web/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
@@ -89,7 +89,7 @@ function ajax_forms_test_advanced_commands_css_callback($form, FormStateInterfac
   $color = 'blue';
 
   $response = new AjaxResponse();
-  $response->addCommand(new CssCommand($selector, array('background-color' => $color)));
+  $response->addCommand(new CssCommand($selector, ['background-color' => $color]));
   return $response;
 }
 
@@ -108,7 +108,7 @@ function ajax_forms_test_advanced_commands_data_callback($form, FormStateInterfa
  */
 function ajax_forms_test_advanced_commands_invoke_callback($form, FormStateInterface $form_state) {
   $response = new AjaxResponse();
-  $response->addCommand(new InvokeCommand('#invoke_div', 'addClass', array('error')));
+  $response->addCommand(new InvokeCommand('#invoke_div', 'addClass', ['error']));
   return $response;
 }
 
@@ -181,7 +181,7 @@ function ajax_forms_test_advanced_commands_add_css_callback($form, FormStateInte
  */
 function ajax_forms_test_validation_form_callback($form, FormStateInterface $form_state) {
   drupal_set_message("ajax_forms_test_validation_form_callback invoked");
-  drupal_set_message(t("Callback: drivertext=%drivertext, spare_required_field=%spare_required_field", array('%drivertext' => $form_state->getValue('drivertext'), '%spare_required_field' => $form_state->getValue('spare_required_field'))));
+  drupal_set_message(t("Callback: drivertext=%drivertext, spare_required_field=%spare_required_field", ['%drivertext' => $form_state->getValue('drivertext'), '%spare_required_field' => $form_state->getValue('spare_required_field')]));
   return ['#markup' => '<div id="message_area">ajax_forms_test_validation_form_callback at ' . date('c') . '</div>'];
 }
 
@@ -190,7 +190,7 @@ function ajax_forms_test_validation_form_callback($form, FormStateInterface $for
  */
 function ajax_forms_test_validation_number_form_callback($form, FormStateInterface $form_state) {
   drupal_set_message("ajax_forms_test_validation_number_form_callback invoked");
-  drupal_set_message(t("Callback: drivernumber=%drivernumber, spare_required_field=%spare_required_field", array('%drivernumber' => $form_state->getValue('drivernumber'), '%spare_required_field' => $form_state->getValue('spare_required_field'))));
+  drupal_set_message(t("Callback: drivernumber=%drivernumber, spare_required_field=%spare_required_field", ['%drivernumber' => $form_state->getValue('drivernumber'), '%spare_required_field' => $form_state->getValue('spare_required_field')]));
   return ['#markup' => '<div id="message_area_number">ajax_forms_test_validation_number_form_callback at ' . date('c') . '</div>'];
 }
 
diff --git a/web/core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php b/web/core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php
index 4b3b03965..0ad80c925 100644
--- a/web/core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php
+++ b/web/core/modules/system/tests/modules/ajax_forms_test/src/Callbacks.php
@@ -15,7 +15,7 @@ class Callbacks {
   /**
    * Ajax callback triggered by select.
    */
-  function selectCallback($form, FormStateInterface $form_state) {
+  public function selectCallback($form, FormStateInterface $form_state) {
     $response = new AjaxResponse();
     $response->addCommand(new HtmlCommand('#ajax_selected_color', $form_state->getValue('select')));
     $response->addCommand(new DataCommand('#ajax_selected_color', 'form_state_value_select', $form_state->getValue('select')));
@@ -25,7 +25,7 @@ class Callbacks {
   /**
    * Ajax callback triggered by checkbox.
    */
-  function checkboxCallback($form, FormStateInterface $form_state) {
+  public function checkboxCallback($form, FormStateInterface $form_state) {
     $response = new AjaxResponse();
     $response->addCommand(new HtmlCommand('#ajax_checkbox_value', (int) $form_state->getValue('checkbox')));
     $response->addCommand(new DataCommand('#ajax_checkbox_value', 'form_state_value_select', (int) $form_state->getValue('checkbox')));
@@ -35,7 +35,7 @@ class Callbacks {
   /**
    * Ajax callback triggered by the checkbox in a #group.
    */
-  function checkboxGroupCallback($form, FormStateInterface $form_state) {
+  public function checkboxGroupCallback($form, FormStateInterface $form_state) {
     return $form['checkbox_in_group_wrapper'];
   }
 
diff --git a/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php b/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php
index d04b21703..e3c09af92 100644
--- a/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php
+++ b/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php
@@ -21,178 +21,178 @@ class AjaxFormsTestCommandsForm extends FormBase {
    * {@inheritdoc}.
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form = array();
+    $form = [];
 
     // Shows the 'after' command with a callback generating commands.
-    $form['after_command_example'] = array(
+    $form['after_command_example'] = [
       '#value' => $this->t("AJAX 'After': Click to put something after the div"),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_after_callback',
-      ),
+      ],
       '#suffix' => '<div id="after_div">Something can be inserted after this</div>',
-    );
+    ];
 
     // Shows the 'alert' command.
-    $form['alert_command_example'] = array(
+    $form['alert_command_example'] = [
       '#value' => $this->t("AJAX 'Alert': Click to alert"),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_alert_callback',
-      ),
-    );
+      ],
+    ];
 
     // Shows the 'append' command.
-    $form['append_command_example'] = array(
+    $form['append_command_example'] = [
       '#value' => $this->t("AJAX 'Append': Click to append something"),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_append_callback',
-      ),
+      ],
       '#suffix' => '<div id="append_div">Append inside this div</div>',
-    );
+    ];
 
 
     // Shows the 'before' command.
-    $form['before_command_example'] = array(
+    $form['before_command_example'] = [
       '#value' => $this->t("AJAX 'before': Click to put something before the div"),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_before_callback',
-      ),
+      ],
       '#suffix' => '<div id="before_div">Insert something before this.</div>',
-    );
+    ];
 
     // Shows the 'changed' command without asterisk.
-    $form['changed_command_example'] = array(
+    $form['changed_command_example'] = [
       '#value' => $this->t("AJAX changed: Click to mark div changed."),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_changed_callback',
-      ),
+      ],
       '#suffix' => '<div id="changed_div"> <div id="changed_div_mark_this">This div can be marked as changed or not.</div></div>',
-    );
+    ];
     // Shows the 'changed' command adding the asterisk.
-    $form['changed_command_asterisk_example'] = array(
+    $form['changed_command_asterisk_example'] = [
       '#value' => $this->t("AJAX changed: Click to mark div changed with asterisk."),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_changed_asterisk_callback',
-      ),
-    );
+      ],
+    ];
 
     // Shows the Ajax 'css' command.
-    $form['css_command_example'] = array(
+    $form['css_command_example'] = [
       '#value' => $this->t("Set the '#box' div to be blue."),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_css_callback',
-      ),
+      ],
       '#suffix' => '<div id="css_div" style="height: 50px; width: 50px; border: 1px solid black"> box</div>',
-    );
+    ];
 
 
     // Shows the Ajax 'data' command. But there is no use of this information,
     // as this would require a javascript client to use the data.
-    $form['data_command_example'] = array(
+    $form['data_command_example'] = [
       '#value' => $this->t("AJAX data command: Issue command."),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_data_callback',
-      ),
+      ],
       '#suffix' => '<div id="data_div">Data attached to this div.</div>',
-    );
+    ];
 
     // Shows the Ajax 'invoke' command.
-    $form['invoke_command_example'] = array(
+    $form['invoke_command_example'] = [
       '#value' => $this->t("AJAX invoke command: Invoke addClass() method."),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_invoke_callback',
-      ),
+      ],
       '#suffix' => '<div id="invoke_div">Original contents</div>',
-    );
+    ];
 
     // Shows the Ajax 'html' command.
-    $form['html_command_example'] = array(
+    $form['html_command_example'] = [
       '#value' => $this->t("AJAX html: Replace the HTML in a selector."),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_html_callback',
-      ),
+      ],
       '#suffix' => '<div id="html_div">Original contents</div>',
-    );
+    ];
 
     // Shows the Ajax 'insert' command.
-    $form['insert_command_example'] = array(
+    $form['insert_command_example'] = [
       '#value' => $this->t("AJAX insert: Let client insert based on #ajax['method']."),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_insert_callback',
         'method' => 'prepend',
-      ),
+      ],
       '#suffix' => '<div id="insert_div">Original contents</div>',
-    );
+    ];
 
     // Shows the Ajax 'prepend' command.
-    $form['prepend_command_example'] = array(
+    $form['prepend_command_example'] = [
       '#value' => $this->t("AJAX 'prepend': Click to prepend something"),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_prepend_callback',
-      ),
+      ],
       '#suffix' => '<div id="prepend_div">Something will be prepended to this div. </div>',
-    );
+    ];
 
     // Shows the Ajax 'remove' command.
-    $form['remove_command_example'] = array(
+    $form['remove_command_example'] = [
       '#value' => $this->t("AJAX 'remove': Click to remove text"),
       '#type' => 'submit',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_remove_callback',
-      ),
+      ],
       '#suffix' => '<div id="remove_div"><div id="remove_text">text to be removed</div></div>',
-    );
+    ];
 
     // Shows the Ajax 'restripe' command.
-    $form['restripe_command_example'] = array(
+    $form['restripe_command_example'] = [
       '#type' => 'submit',
       '#value' => $this->t("AJAX 'restripe' command"),
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_restripe_callback',
-      ),
+      ],
       '#suffix' => '<div id="restripe_div">
                     <table id="restripe_table" style="border: 1px solid black" >
                     <tr id="table-first"><td>first row</td></tr>
                     <tr ><td>second row</td></tr>
                     </table>
                     </div>',
-    );
+    ];
 
     // Demonstrates the Ajax 'settings' command. The 'settings' command has
     // nothing visual to "show", but it can be tested via SimpleTest and via
     // Firebug.
-    $form['settings_command_example'] = array(
+    $form['settings_command_example'] = [
       '#type' => 'submit',
       '#value' => $this->t("AJAX 'settings' command"),
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_settings_callback',
-      ),
-    );
+      ],
+    ];
 
     // Shows the Ajax 'add_css' command.
-    $form['add_css_command_example'] = array(
+    $form['add_css_command_example'] = [
       '#type' => 'submit',
       '#value' => $this->t("AJAX 'add_css' command"),
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_advanced_commands_add_css_callback',
-      ),
-    );
+      ],
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Submit'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php b/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php
index 19aaaf35e..852cf4435 100644
--- a/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php
+++ b/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestLazyLoadForm.php
@@ -26,20 +26,20 @@ class AjaxFormsTestLazyLoadForm extends FormBase {
     // command to ensure that the 'currentPath' setting is not part
     // of the Ajax response.
     $form['#attached']['drupalSettings']['test'] = 'currentPathUpdate';
-    $form['add_files'] = array(
+    $form['add_files'] = [
       '#title' => $this->t('Add files'),
       '#type' => 'checkbox',
       '#default_value' => FALSE,
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Submit'),
-      '#ajax' => array(
+      '#ajax' => [
         'wrapper' => 'ajax-forms-test-lazy-load-ajax-wrapper',
         'callback' => 'ajax_forms_test_lazy_load_form_ajax',
-      ),
+      ],
       '#prefix' => '<div id="ajax-forms-test-lazy-load-ajax-wrapper"></div>',
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php b/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php
index 8ec5b71a5..f69a12323 100644
--- a/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php
+++ b/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php
@@ -24,47 +24,47 @@ class AjaxFormsTestSimpleForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $object = new Callbacks();
 
-    $form = array();
-    $form['select'] = array(
+    $form = [];
+    $form['select'] = [
       '#title' => $this->t('Color'),
       '#type' => 'select',
-      '#options' => array(
+      '#options' => [
         'red' => 'red',
         'green' => 'green',
-        'blue' => 'blue'),
-      '#ajax' => array(
-        'callback' => array($object, 'selectCallback'),
-      ),
+        'blue' => 'blue'],
+      '#ajax' => [
+        'callback' => [$object, 'selectCallback'],
+      ],
       '#suffix' => '<div id="ajax_selected_color">No color yet selected</div>',
-    );
+    ];
 
-    $form['checkbox'] = array(
+    $form['checkbox'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Test checkbox'),
-      '#ajax' => array(
-        'callback' => array($object, 'checkboxCallback'),
-      ),
+      '#ajax' => [
+        'callback' => [$object, 'checkboxCallback'],
+      ],
       '#suffix' => '<div id="ajax_checkbox_value">No action yet</div>',
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('submit'),
-    );
+    ];
 
     // This is for testing invalid callbacks that should return a 500 error in
     // \Drupal\Core\Form\FormAjaxResponseBuilderInterface::buildResponse().
-    $invalid_callbacks = array(
+    $invalid_callbacks = [
       'null' => NULL,
       'empty' => '',
       'nonexistent' => 'some_function_that_does_not_exist',
-    );
+    ];
     foreach ($invalid_callbacks as $key => $value) {
-      $form['select_' . $key . '_callback'] = array(
+      $form['select_' . $key . '_callback'] = [
         '#type' => 'select',
-        '#title' => $this->t('Test %key callbacks', array('%key' => $key)),
-        '#options' => array('red' => 'red'),
-        '#ajax' => array('callback' => $value),
-      );
+        '#title' => $this->t('Test %key callbacks', ['%key' => $key]),
+        '#options' => ['red' => 'red'],
+        '#ajax' => ['callback' => $value],
+      ];
     }
 
     $form['test_group'] = [
diff --git a/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php b/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php
index dbf0b7fa5..fb3019493 100644
--- a/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php
+++ b/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestValidationForm.php
@@ -21,42 +21,42 @@ class AjaxFormsTestValidationForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['drivertext'] = array(
+    $form['drivertext'] = [
       '#title' => $this->t('AJAX-enabled textfield.'),
       '#description' => $this->t("When this one AJAX-triggers and the spare required field is empty, you should not get an error."),
       '#type' => 'textfield',
       '#default_value' => $form_state->getValue('drivertext', ''),
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_validation_form_callback',
         'wrapper' => 'message_area',
         'method' => 'replace',
-      ),
+      ],
       '#suffix' => '<div id="message_area"></div>',
-    );
+    ];
 
-    $form['drivernumber'] = array(
+    $form['drivernumber'] = [
       '#title' => $this->t('AJAX-enabled number field.'),
       '#description' => $this->t("When this one AJAX-triggers and the spare required field is empty, you should not get an error."),
       '#type' => 'number',
       '#default_value' => $form_state->getValue('drivernumber', ''),
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'ajax_forms_test_validation_number_form_callback',
         'wrapper' => 'message_area_number',
         'method' => 'replace',
-      ),
+      ],
       '#suffix' => '<div id="message_area_number"></div>',
-    );
+    ];
 
-    $form['spare_required_field'] = array(
+    $form['spare_required_field'] = [
       '#title' => $this->t("Spare Required Field"),
       '#type' => 'textfield',
       '#required' => TRUE,
-    );
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Submit'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php b/web/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php
index 63cc0abf1..5ba65e801 100644
--- a/web/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php
+++ b/web/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php
@@ -22,22 +22,22 @@ class AjaxTestController {
    */
   public static function dialogContents() {
     // This is a regular render array; the keys do not have special meaning.
-    $content = array(
+    $content = [
       '#title' => '<em>AJAX Dialog & contents</em>',
-      'content' => array(
+      'content' => [
         '#markup' => 'Example message',
-      ),
-      'cancel' => array(
+      ],
+      'cancel' => [
         '#type' => 'link',
         '#title' => 'Cancel',
         '#url' => Url::fromRoute('<front>'),
-        '#attributes' => array(
+        '#attributes' => [
           // This is a special class to which JavaScript assigns dialog closing
           // behavior.
-          'class' => array('dialog-cancel'),
-        ),
-      ),
-    );
+          'class' => ['dialog-cancel'],
+        ],
+      ],
+    ];
 
     return $content;
   }
@@ -111,88 +111,88 @@ class AjaxTestController {
   public function dialog() {
     // Add two wrapper elements for testing non-modal dialogs. Modal dialogs use
     // the global drupal-modal wrapper by default.
-    $build['dialog_wrappers'] = array('#markup' => '<div id="ajax-test-dialog-wrapper-1"></div><div id="ajax-test-dialog-wrapper-2"></div>');
+    $build['dialog_wrappers'] = ['#markup' => '<div id="ajax-test-dialog-wrapper-1"></div><div id="ajax-test-dialog-wrapper-2"></div>'];
 
     // Dialog behavior applied to a button.
     $build['form'] = \Drupal::formBuilder()->getForm('Drupal\ajax_test\Form\AjaxTestDialogForm');
 
     // Dialog behavior applied to a #type => 'link'.
-    $build['link'] = array(
+    $build['link'] = [
       '#type' => 'link',
       '#title' => 'Link 1 (modal)',
       '#url' => Url::fromRoute('ajax_test.dialog_contents'),
-      '#attributes' => array(
-        'class' => array('use-ajax'),
+      '#attributes' => [
+        'class' => ['use-ajax'],
         'data-dialog-type' => 'modal',
-      ),
-    );
+      ],
+    ];
 
     // Dialog behavior applied to links rendered by links.html.twig.
-    $build['links'] = array(
+    $build['links'] = [
       '#theme' => 'links',
-      '#links' => array(
-        'link2' => array(
+      '#links' => [
+        'link2' => [
           'title' => 'Link 2 (modal)',
           'url' => Url::fromRoute('ajax_test.dialog_contents'),
-          'attributes' => array(
-            'class' => array('use-ajax'),
+          'attributes' => [
+            'class' => ['use-ajax'],
             'data-dialog-type' => 'modal',
-            'data-dialog-options' => json_encode(array(
+            'data-dialog-options' => json_encode([
               'width' => 400,
-            ))
-          ),
-        ),
-        'link3' => array(
+            ])
+          ],
+        ],
+        'link3' => [
           'title' => 'Link 3 (non-modal)',
           'url' => Url::fromRoute('ajax_test.dialog_contents'),
-          'attributes' => array(
-            'class' => array('use-ajax'),
+          'attributes' => [
+            'class' => ['use-ajax'],
             'data-dialog-type' => 'dialog',
-            'data-dialog-options' => json_encode(array(
+            'data-dialog-options' => json_encode([
               'target' => 'ajax-test-dialog-wrapper-1',
               'width' => 800,
-            ))
-          ),
-        ),
-        'link4' => array(
+            ])
+          ],
+        ],
+        'link4' => [
           'title' => 'Link 4 (close non-modal if open)',
           'url' => Url::fromRoute('ajax_test.dialog_close'),
-          'attributes' => array(
-            'class' => array('use-ajax'),
+          'attributes' => [
+            'class' => ['use-ajax'],
             'data-dialog-type' => 'modal',
-          ),
-        ),
-        'link5' => array(
+          ],
+        ],
+        'link5' => [
           'title' => 'Link 5 (form)',
           'url' => Url::fromRoute('ajax_test.dialog_form'),
-          'attributes' => array(
-            'class' => array('use-ajax'),
+          'attributes' => [
+            'class' => ['use-ajax'],
             'data-dialog-type' => 'modal',
-          ),
-        ),
-        'link6' => array(
+          ],
+        ],
+        'link6' => [
           'title' => 'Link 6 (entity form)',
           'url' => Url::fromRoute('contact.form_add'),
-          'attributes' => array(
-            'class' => array('use-ajax'),
+          'attributes' => [
+            'class' => ['use-ajax'],
             'data-dialog-type' => 'modal',
-            'data-dialog-options' => json_encode(array(
+            'data-dialog-options' => json_encode([
               'width' => 800,
               'height' => 500,
-            ))
-          ),
-        ),
-        'link7' => array(
+            ])
+          ],
+        ],
+        'link7' => [
           'title' => 'Link 7 (non-modal, no target)',
           'url' => Url::fromRoute('ajax_test.dialog_contents'),
-          'attributes' => array(
-            'class' => array('use-ajax'),
+          'attributes' => [
+            'class' => ['use-ajax'],
             'data-dialog-type' => 'dialog',
-            'data-dialog-options' => json_encode(array(
+            'data-dialog-options' => json_encode([
               'width' => 800,
-            ))
-          ),
-        ),
+            ])
+          ],
+        ],
         'link8' => [
           'title' => 'Link 8 (ajax)',
           'url' => Url::fromRoute('ajax_test.admin.theme'),
@@ -204,8 +204,8 @@ class AjaxTestController {
             ]),
           ],
         ],
-      ),
-    );
+      ],
+    ];
 
     return $build;
   }
diff --git a/web/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php b/web/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php
index a97ed9525..5f11b6b71 100644
--- a/web/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php
+++ b/web/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestDialogForm.php
@@ -28,25 +28,25 @@ class AjaxTestDialogForm extends FormBase {
     // In order to use WebTestBase::drupalPostAjaxForm() to POST from a link, we need
     // to have a dummy field we can set in WebTestBase::drupalPostForm() else it won't
     // submit anything.
-    $form['textfield'] = array(
+    $form['textfield'] = [
       '#type' => 'hidden'
-    );
-    $form['button1'] = array(
+    ];
+    $form['button1'] = [
       '#type' => 'submit',
       '#name' => 'button1',
       '#value' => 'Button 1 (modal)',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => '::modal',
-      ),
-    );
-    $form['button2'] = array(
+      ],
+    ];
+    $form['button2'] = [
       '#type' => 'submit',
       '#name' => 'button2',
       '#value' => 'Button 2 (non-modal)',
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => '::nonModal',
-      ),
-    );
+      ],
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php b/web/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php
index 604876994..ea431efa5 100644
--- a/web/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php
+++ b/web/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php
@@ -24,23 +24,23 @@ class AjaxTestForm extends FormBase {
 
     $form['#action'] = \Drupal::url('ajax_test.dialog');
 
-    $form['description'] = array(
+    $form['description'] = [
       '#markup' => '<p>' . $this->t("Ajax Form contents description.") . '</p>',
-    );
+    ];
 
-    $form['actions'] = array(
+    $form['actions'] = [
       '#type' => 'actions',
-    );
-    $form['actions']['submit'] = array(
+    ];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Do it'),
-    );
-    $form['actions']['preview'] = array(
+    ];
+    $form['actions']['preview'] = [
       '#type' => 'submit',
       '#value' => $this->t('Preview'),
       // No regular submit-handler. This form only works via JavaScript.
-      '#submit' => array(),
-      '#ajax' => array(
+      '#submit' => [],
+      '#ajax' => [
         // This means the ::preview() method on this class would be invoked in
         // case of a click event. However, since Drupal core's test runner only
         // is able to execute PHP, not JS, there is no point in actually
@@ -51,8 +51,8 @@ class AjaxTestForm extends FormBase {
         // we cannot meaningfully test it anyway.
         'callback' => '::preview',
         'event' => 'click',
-      ),
-    );
+      ],
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc b/web/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
index 4a271b087..9116c85fe 100644
--- a/web/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
+++ b/web/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
@@ -100,7 +100,7 @@ function _batch_test_finished_helper($batch_id, $success, $results, $operations)
   if (!$success) {
     // A fatal error occurred during the processing.
     $error_operation = reset($operations);
-    $messages[] = t('An error occurred while processing @op with arguments:<br />@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE)));
+    $messages[] = t('An error occurred while processing @op with arguments:<br />@args', ['@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE)]);
   }
 
   // Use item list template to render the messages.
diff --git a/web/core/modules/system/tests/modules/batch_test/batch_test.module b/web/core/modules/system/tests/modules/batch_test/batch_test.module
index e7a8de6e2..59327de4f 100644
--- a/web/core/modules/system/tests/modules/batch_test/batch_test.module
+++ b/web/core/modules/system/tests/modules/batch_test/batch_test.module
@@ -20,11 +20,11 @@ function _batch_test_nested_drupal_form_submit_callback($value) {
  * Batch 0: Does nothing.
  */
 function _batch_test_batch_0() {
-  $batch = array(
-    'operations' => array(),
+  $batch = [
+    'operations' => [],
     'finished' => '_batch_test_finished_0',
     'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
-  );
+  ];
   return $batch;
 }
 
@@ -38,15 +38,15 @@ function _batch_test_batch_1() {
   $total = 10;
   $sleep = (1000000 / $total) * 2;
 
-  $operations = array();
+  $operations = [];
   for ($i = 1; $i <= $total; $i++) {
-    $operations[] = array('_batch_test_callback_1', array($i, $sleep));
+    $operations[] = ['_batch_test_callback_1', [$i, $sleep]];
   }
-  $batch = array(
+  $batch = [
     'operations' => $operations,
     'finished' => '_batch_test_finished_1',
     'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
-  );
+  ];
   return $batch;
 }
 
@@ -60,14 +60,14 @@ function _batch_test_batch_2() {
   $total = 10;
   $sleep = (1000000 / $total) * 2;
 
-  $operations = array(
-    array('_batch_test_callback_2', array(1, $total, $sleep)),
-  );
-  $batch = array(
+  $operations = [
+    ['_batch_test_callback_2', [1, $total, $sleep]],
+  ];
+  $batch = [
     'operations' => $operations,
     'finished' => '_batch_test_finished_2',
     'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
-  );
+  ];
   return $batch;
 }
 
@@ -85,20 +85,20 @@ function _batch_test_batch_3() {
   $total = 10;
   $sleep = (1000000 / $total) * 2;
 
-  $operations = array();
+  $operations = [];
   for ($i = 1; $i <= round($total / 2); $i++) {
-    $operations[] = array('_batch_test_callback_1', array($i, $sleep));
+    $operations[] = ['_batch_test_callback_1', [$i, $sleep]];
   }
-  $operations[] = array('_batch_test_callback_2', array(1, $total / 2, $sleep));
+  $operations[] = ['_batch_test_callback_2', [1, $total / 2, $sleep]];
   for ($i = round($total / 2) + 1; $i <= $total; $i++) {
-    $operations[] = array('_batch_test_callback_1', array($i, $sleep));
+    $operations[] = ['_batch_test_callback_1', [$i, $sleep]];
   }
-  $operations[] = array('_batch_test_callback_2', array(6, $total / 2, $sleep));
-  $batch = array(
+  $operations[] = ['_batch_test_callback_2', [6, $total / 2, $sleep]];
+  $batch = [
     'operations' => $operations,
     'finished' => '_batch_test_finished_3',
     'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
-  );
+  ];
   return $batch;
 }
 
@@ -115,19 +115,19 @@ function _batch_test_batch_4() {
   $total = 10;
   $sleep = (1000000 / $total) * 2;
 
-  $operations = array();
+  $operations = [];
   for ($i = 1; $i <= round($total / 2); $i++) {
-    $operations[] = array('_batch_test_callback_1', array($i, $sleep));
+    $operations[] = ['_batch_test_callback_1', [$i, $sleep]];
   }
-  $operations[] = array('_batch_test_nested_batch_callback', array());
+  $operations[] = ['_batch_test_nested_batch_callback', []];
   for ($i = round($total / 2) + 1; $i <= $total; $i++) {
-    $operations[] = array('_batch_test_callback_1', array($i, $sleep));
+    $operations[] = ['_batch_test_callback_1', [$i, $sleep]];
   }
-  $batch = array(
+  $batch = [
     'operations' => $operations,
     'finished' => '_batch_test_finished_4',
     'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
-  );
+  ];
   return $batch;
 }
 
@@ -141,15 +141,15 @@ function _batch_test_batch_5() {
   $total = 10;
   $sleep = (1000000 / $total) * 2;
 
-  $operations = array();
+  $operations = [];
   for ($i = 1; $i <= $total; $i++) {
-    $operations[] = array('_batch_test_callback_5', array($i, $sleep));
+    $operations[] = ['_batch_test_callback_5', [$i, $sleep]];
   }
-  $batch = array(
+  $batch = [
     'operations' => $operations,
     'finished' => '_batch_test_finished_5',
     'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc',
-  );
+  ];
   return $batch;
 }
 
diff --git a/web/core/modules/system/tests/modules/batch_test/src/Controller/BatchTestController.php b/web/core/modules/system/tests/modules/batch_test/src/Controller/BatchTestController.php
index 811c7fc35..1d34f8a45 100644
--- a/web/core/modules/system/tests/modules/batch_test/src/Controller/BatchTestController.php
+++ b/web/core/modules/system/tests/modules/batch_test/src/Controller/BatchTestController.php
@@ -16,11 +16,11 @@ class BatchTestController {
    *   Render array containing success message.
    */
   public function testRedirect() {
-    return array(
-      'success' => array(
+    return [
+      'success' => [
         '#markup' => 'Redirection successful.',
-      )
-    );
+      ]
+    ];
   }
 
   /**
@@ -47,9 +47,9 @@ class BatchTestController {
    */
   public function testNestedDrupalFormSubmit($value = 1) {
     // Set the batch and process it.
-    $batch['operations'] = array(
-      array('_batch_test_nested_drupal_form_submit_callback', array($value)),
-    );
+    $batch['operations'] = [
+      ['_batch_test_nested_drupal_form_submit_callback', [$value]],
+    ];
     batch_set($batch);
     return batch_process('batch-test/redirect');
   }
@@ -95,16 +95,16 @@ class BatchTestController {
    * @return array
    *   Render array containing markup.
    */
-  function testProgrammatic($value = 1) {
+  public function testProgrammatic($value = 1) {
     $form_state = (new FormState())->setValues([
       'value' => $value,
     ]);
     \Drupal::formBuilder()->submitForm('Drupal\batch_test\Form\BatchTestChainedForm', $form_state);
-    return array(
-      'success' => array(
+    return [
+      'success' => [
         '#markup' => 'Got out of a programmatic batched form.',
-      )
-    );
+      ]
+    ];
   }
 
   /**
@@ -115,11 +115,11 @@ class BatchTestController {
    */
   public function testThemeBatch() {
     batch_test_stack(NULL, TRUE);
-    $batch = array(
-      'operations' => array(
-        array('_batch_test_theme_callback', array()),
-      ),
-    );
+    $batch = [
+      'operations' => [
+        ['_batch_test_theme_callback', []],
+      ],
+    ];
     batch_set($batch);
     return batch_process('batch-test/redirect');
   }
diff --git a/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestChainedForm.php b/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestChainedForm.php
index aa19ad3fa..fe2d02c5f 100644
--- a/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestChainedForm.php
+++ b/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestChainedForm.php
@@ -23,21 +23,21 @@ class BatchTestChainedForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     // This value is used to test that $form_state persists through batched
     // submit handlers.
-    $form['value'] = array(
+    $form['value'] = [
       '#type' => 'textfield',
       '#title' => 'Value',
       '#default_value' => 1,
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
-    $form['#submit'] = array(
+    ];
+    $form['#submit'] = [
       'Drupal\batch_test\Form\BatchTestChainedForm::batchTestChainedFormSubmit1',
       'Drupal\batch_test\Form\BatchTestChainedForm::batchTestChainedFormSubmit2',
       'Drupal\batch_test\Form\BatchTestChainedForm::batchTestChainedFormSubmit3',
       'Drupal\batch_test\Form\BatchTestChainedForm::batchTestChainedFormSubmit4',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMockForm.php b/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMockForm.php
index ec8caff09..2d26bcf4d 100644
--- a/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMockForm.php
+++ b/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMockForm.php
@@ -21,14 +21,14 @@ class BatchTestMockForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['test_value'] = array(
+    $form['test_value'] = [
       '#title' => t('Test value'),
       '#type' => 'textfield',
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php b/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php
index 260941f50..916831e96 100644
--- a/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php
+++ b/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php
@@ -27,13 +27,13 @@ class BatchTestMultiStepForm extends FormBase {
       $form_state->set('step', $step);
     }
 
-    $form['step_display'] = array(
+    $form['step_display'] = [
       '#markup' => 'step ' . $step . '<br/>',
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
 
     // This is a POST form with multiple steps that does not transition from one
     // step to the next via POST requests, but via GET requests, because it uses
diff --git a/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestSimpleForm.php b/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestSimpleForm.php
index 92cf6b110..999649dfc 100644
--- a/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestSimpleForm.php
+++ b/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestSimpleForm.php
@@ -21,21 +21,21 @@ class BatchTestSimpleForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['batch'] = array(
+    $form['batch'] = [
       '#type' => 'select',
       '#title' => 'Choose batch',
-      '#options' => array(
+      '#options' => [
         'batch_0' => 'batch 0',
         'batch_1' => 'batch 1',
         'batch_2' => 'batch 2',
         'batch_3' => 'batch 3',
         'batch_4' => 'batch 4',
-      ),
-    );
-    $form['submit'] = array(
+      ],
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/common_test/common_test.module b/web/core/modules/system/tests/modules/common_test/common_test.module
index 0633ac889..97bba7b34 100644
--- a/web/core/modules/system/tests/modules/common_test/common_test.module
+++ b/web/core/modules/system/tests/modules/common_test/common_test.module
@@ -114,18 +114,18 @@ function common_test_module_implements_alter(&$implementations, $hook) {
  * Implements hook_theme().
  */
 function common_test_theme() {
-  return array(
-    'common_test_foo' => array(
-      'variables' => array('foo' => 'foo', 'bar' => 'bar'),
-    ),
-    'common_test_render_element' => array(
+  return [
+    'common_test_foo' => [
+      'variables' => ['foo' => 'foo', 'bar' => 'bar'],
+    ],
+    'common_test_render_element' => [
       'render element' => 'foo',
-    ),
-    'common_test_empty' => array(
-      'variables' => array('foo' => 'foo'),
+    ],
+    'common_test_empty' => [
+      'variables' => ['foo' => 'foo'],
       'function' => 'theme_common_test_empty',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
diff --git a/web/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php b/web/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
index f77a5813a..bb98a59c9 100644
--- a/web/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
+++ b/web/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
@@ -18,40 +18,40 @@ class CommonTestController {
    * generator.
    */
   public function typeLinkActiveClass() {
-    return array(
-      'no_query' => array(
+    return [
+      'no_query' => [
         '#type' => 'link',
         '#title' => t('Link with no query string'),
         '#url' => Url::fromRoute('<current>'),
-        '#options' => array(
+        '#options' => [
           'set_active_class' => TRUE,
-        ),
-      ),
-      'with_query' => array(
+        ],
+      ],
+      'with_query' => [
         '#type' => 'link',
         '#title' => t('Link with a query string'),
         '#url' => Url::fromRoute('<current>'),
-        '#options' => array(
-          'query' => array(
+        '#options' => [
+          'query' => [
             'foo' => 'bar',
             'one' => 'two',
-          ),
+          ],
           'set_active_class' => TRUE,
-        ),
-      ),
-      'with_query_reversed' => array(
+        ],
+      ],
+      'with_query_reversed' => [
         '#type' => 'link',
         '#title' => t('Link with the same query string in reverse order'),
         '#url' => Url::fromRoute('<current>'),
-        '#options' => array(
-          'query' => array(
+        '#options' => [
+          'query' => [
             'one' => 'two',
             'foo' => 'bar',
-          ),
+          ],
           'set_active_class' => TRUE,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -61,18 +61,18 @@ class CommonTestController {
    *   An empty string.
    */
   public function jsAndCssQuerystring() {
-    $attached = array(
-      '#attached' => array(
-        'library' => array(
+    $attached = [
+      '#attached' => [
+        'library' => [
           'node/drupal.node',
-        ),
-        'css' => array(
-          drupal_get_path('module', 'node') . '/css/node.admin.css' => array(),
+        ],
+        'css' => [
+          drupal_get_path('module', 'node') . '/css/node.admin.css' => [],
           // A relative URI may have a query string.
-          '/' . drupal_get_path('module', 'node') . '/node-fake.css?arg1=value1&arg2=value2' => array(),
-        ),
-      ),
-    );
+          '/' . drupal_get_path('module', 'node') . '/node-fake.css?arg1=value1&arg2=value2' => [],
+        ],
+      ],
+    ];
     return \Drupal::service('renderer')->renderRoot($attached);
   }
 
diff --git a/web/core/modules/system/tests/modules/condition_test/src/FormController.php b/web/core/modules/system/tests/modules/condition_test/src/FormController.php
index 38b21ccad..da475ae0c 100644
--- a/web/core/modules/system/tests/modules/condition_test/src/FormController.php
+++ b/web/core/modules/system/tests/modules/condition_test/src/FormController.php
@@ -39,10 +39,10 @@ class FormController implements FormInterface {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form = $this->condition->buildConfigurationForm($form, $form_state);
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/database_test/database_test.install b/web/core/modules/system/tests/modules/database_test/database_test.install
index f6b4f68d8..62cf38add 100644
--- a/web/core/modules/system/tests/modules/database_test/database_test.install
+++ b/web/core/modules/system/tests/modules/database_test/database_test.install
@@ -14,281 +14,281 @@
  * like any other, not directly in the test file.
  */
 function database_test_schema() {
-  $schema['test'] = array(
+  $schema['test'] = [
     'description' => 'Basic test table for the database unit tests.',
-    'fields' => array(
-      'id' => array(
+    'fields' => [
+      'id' => [
         'type' => 'serial',
         'unsigned' => TRUE,
         'not null' => TRUE,
-      ),
-      'name' => array(
+      ],
+      'name' => [
         'description' => "A person's name",
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
         'binary' => TRUE,
-      ),
-      'age' => array(
+      ],
+      'age' => [
         'description' => "The person's age",
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'job' => array(
+      ],
+      'job' => [
         'description' => "The person's job",
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => 'Undefined',
-      ),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-      'name' => array('name')
-    ),
-    'indexes' => array(
-      'ages' => array('age'),
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['id'],
+    'unique keys' => [
+      'name' => ['name']
+    ],
+    'indexes' => [
+      'ages' => ['age'],
+    ],
+  ];
 
   // This is an alternate version of the same table that is structured the same
   // but has a non-serial Primary Key.
-  $schema['test_people'] = array(
+  $schema['test_people'] = [
     'description' => 'A duplicate version of the test table, used for additional tests.',
-    'fields' => array(
-      'name' => array(
+    'fields' => [
+      'name' => [
         'description' => "A person's name",
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'age' => array(
+      ],
+      'age' => [
         'description' => "The person's age",
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'job' => array(
+      ],
+      'job' => [
         'description' => "The person's job",
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
-      ),
-    ),
-    'primary key' => array('job'),
-    'indexes' => array(
-      'ages' => array('age'),
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['job'],
+    'indexes' => [
+      'ages' => ['age'],
+    ],
+  ];
 
-  $schema['test_people_copy'] = array(
+  $schema['test_people_copy'] = [
     'description' => 'A duplicate version of the test_people table, used for additional tests.',
-    'fields' => array(
-      'name' => array(
+    'fields' => [
+      'name' => [
         'description' => "A person's name",
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'age' => array(
+      ],
+      'age' => [
         'description' => "The person's age",
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'job' => array(
+      ],
+      'job' => [
         'description' => "The person's job",
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
-      ),
-    ),
-    'primary key' => array('job'),
-    'indexes' => array(
-      'ages' => array('age'),
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['job'],
+    'indexes' => [
+      'ages' => ['age'],
+    ],
+  ];
 
-  $schema['test_one_blob'] = array(
+  $schema['test_one_blob'] = [
     'description' => 'A simple table including a BLOB field for testing BLOB behavior.',
-    'fields' => array(
-      'id' => array(
+    'fields' => [
+      'id' => [
         'description' => 'Simple unique ID.',
         'type' => 'serial',
         'not null' => TRUE,
-      ),
-      'blob1' => array(
+      ],
+      'blob1' => [
         'description' => 'A BLOB field.',
         'type' => 'blob',
-      ),
-    ),
-    'primary key' => array('id'),
-    );
+      ],
+    ],
+    'primary key' => ['id'],
+    ];
 
-  $schema['test_two_blobs'] = array(
+  $schema['test_two_blobs'] = [
     'description' => 'A simple test table with two BLOB fields.',
-    'fields' => array(
-      'id' => array(
+    'fields' => [
+      'id' => [
         'description' => 'Simple unique ID.',
         'type' => 'serial',
         'not null' => TRUE,
-      ),
-      'blob1' => array(
+      ],
+      'blob1' => [
         'description' => 'A dummy BLOB field.',
         'type' => 'blob',
-      ),
-      'blob2' => array(
+      ],
+      'blob2' => [
         'description' => 'A second BLOB field.',
         'type' => 'blob'
-      ),
-    ),
-    'primary key' => array('id'),
-    );
+      ],
+    ],
+    'primary key' => ['id'],
+    ];
 
-  $schema['test_task'] = array(
+  $schema['test_task'] = [
     'description' => 'A task list for people in the test table.',
-    'fields' => array(
-      'tid' => array(
+    'fields' => [
+      'tid' => [
         'description' => 'Task ID, primary key.',
         'type' => 'serial',
         'not null' => TRUE,
-      ),
-      'pid' => array(
+      ],
+      'pid' => [
         'description' => 'The {test_people}.pid, foreign key for the test table.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'task' => array(
+      ],
+      'task' => [
         'description' => 'The task to be completed.',
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'priority' => array(
+      ],
+      'priority' => [
         'description' => 'The priority of the task.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-    ),
-    'primary key' => array('tid'),
-  );
+      ],
+    ],
+    'primary key' => ['tid'],
+  ];
 
-  $schema['test_null'] = array(
+  $schema['test_null'] = [
     'description' => 'Basic test table for NULL value handling.',
-    'fields' => array(
-      'id' => array(
+    'fields' => [
+      'id' => [
         'type' => 'serial',
         'unsigned' => TRUE,
         'not null' => TRUE,
-      ),
-      'name' => array(
+      ],
+      'name' => [
         'description' => "A person's name.",
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => FALSE,
         'default' => '',
-      ),
-      'age' => array(
+      ],
+      'age' => [
         'description' => "The person's age.",
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => FALSE,
-        'default' => 0),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-      'name' => array('name')
-    ),
-    'indexes' => array(
-      'ages' => array('age'),
-    ),
-  );
+        'default' => 0],
+    ],
+    'primary key' => ['id'],
+    'unique keys' => [
+      'name' => ['name']
+    ],
+    'indexes' => [
+      'ages' => ['age'],
+    ],
+  ];
 
-  $schema['test_serialized'] = array(
+  $schema['test_serialized'] = [
     'description' => 'Basic test table for NULL value handling.',
-    'fields' => array(
-      'id' => array(
+    'fields' => [
+      'id' => [
         'type' => 'serial',
         'unsigned' => TRUE,
         'not null' => TRUE,
-      ),
-      'name' => array(
+      ],
+      'name' => [
         'description' => "A person's name.",
         'type' => 'varchar_ascii',
         'length' => 255,
         'not null' => FALSE,
         'default' => '',
-      ),
-      'info' => array(
+      ],
+      'info' => [
         'description' => "The person's data in serialized form.",
         'type' => 'blob',
         'serialize' => TRUE,
-      ),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-      'name' => array('name')
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['id'],
+    'unique keys' => [
+      'name' => ['name']
+    ],
+  ];
 
-  $schema['test_composite_primary'] = array(
+  $schema['test_composite_primary'] = [
     'description' => 'Basic test table with a composite primary key',
-    'fields' => array(
-      'name' => array(
+    'fields' => [
+      'name' => [
         'description' => "A person's name",
         'type' => 'varchar',
         'length' => 50,
         'not null' => TRUE,
         'default' => '',
         'binary' => TRUE,
-      ),
-      'age' => array(
+      ],
+      'age' => [
         'description' => "The person's age",
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'job' => array(
+      ],
+      'job' => [
         'description' => "The person's job",
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => 'Undefined',
-      ),
-    ),
-    'primary key' => array('name', 'age'),
-  );
+      ],
+    ],
+    'primary key' => ['name', 'age'],
+  ];
 
-  $schema['test_special_columns'] = array(
+  $schema['test_special_columns'] = [
     'description' => 'A simple test table with special column names.',
-    'fields' => array(
-      'id' => array(
+    'fields' => [
+      'id' => [
         'description' => 'Simple unique ID.',
         'type' => 'int',
         'not null' => TRUE,
-      ),
-      'offset' => array(
+      ],
+      'offset' => [
         'description' => 'A column with preserved name.',
         'type' => 'text',
-      ),
-    ),
-    'primary key' => array('id'),
-  );
+      ],
+    ],
+    'primary key' => ['id'],
+  ];
 
   $schema['TEST_UPPERCASE'] = $schema['test'];
 
diff --git a/web/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php b/web/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php
index 7de24d49e..bd6dd9c7b 100644
--- a/web/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php
+++ b/web/core/modules/system/tests/modules/database_test/src/Controller/DatabaseTestController.php
@@ -19,11 +19,11 @@ class DatabaseTestController {
    * @return \Symfony\Component\HttpFoundation\JsonResponse
    */
   public function dbQueryTemporary() {
-    $table_name = db_query_temporary('SELECT age FROM {test}', array());
-    return new JsonResponse(array(
+    $table_name = db_query_temporary('SELECT age FROM {test}', []);
+    return new JsonResponse([
       'table_name' => $table_name,
       'row_count' => db_select($table_name)->countQuery()->execute()->fetchField(),
-    ));
+    ]);
   }
 
   /**
@@ -37,7 +37,7 @@ class DatabaseTestController {
   public function pagerQueryEven($limit) {
     $query = db_select('test', 't');
     $query
-      ->fields('t', array('name'))
+      ->fields('t', ['name'])
       ->orderBy('age');
 
     // This should result in 2 pages of results.
@@ -47,9 +47,9 @@ class DatabaseTestController {
 
     $names = $query->execute()->fetchCol();
 
-    return new JsonResponse(array(
+    return new JsonResponse([
       'names' => $names,
-    ));
+    ]);
   }
 
   /**
@@ -63,7 +63,7 @@ class DatabaseTestController {
   public function pagerQueryOdd($limit) {
     $query = db_select('test_task', 't');
     $query
-      ->fields('t', array('task'))
+      ->fields('t', ['task'])
       ->orderBy('pid');
 
     // This should result in 4 pages of results.
@@ -73,9 +73,9 @@ class DatabaseTestController {
 
     $names = $query->execute()->fetchCol();
 
-    return new JsonResponse(array(
+    return new JsonResponse([
       'names' => $names,
-    ));
+    ]);
   }
 
   /**
@@ -87,16 +87,16 @@ class DatabaseTestController {
    * @return \Symfony\Component\HttpFoundation\JsonResponse
    */
   public function testTablesort() {
-    $header = array(
-      'tid' => array('data' => t('Task ID'), 'field' => 'tid', 'sort' => 'desc'),
-      'pid' => array('data' => t('Person ID'), 'field' => 'pid'),
-      'task' => array('data' => t('Task'), 'field' => 'task'),
-      'priority' => array('data' => t('Priority'), 'field' => 'priority', ),
-    );
+    $header = [
+      'tid' => ['data' => t('Task ID'), 'field' => 'tid', 'sort' => 'desc'],
+      'pid' => ['data' => t('Person ID'), 'field' => 'pid'],
+      'task' => ['data' => t('Task'), 'field' => 'task'],
+      'priority' => ['data' => t('Priority'), 'field' => 'priority', ],
+    ];
 
     $query = db_select('test_task', 't');
     $query
-      ->fields('t', array('tid', 'pid', 'task', 'priority'));
+      ->fields('t', ['tid', 'pid', 'task', 'priority']);
 
     $query = $query
       ->extend('Drupal\Core\Database\Query\TableSortExtender')
@@ -105,9 +105,9 @@ class DatabaseTestController {
     // We need all the results at once to check the sort.
     $tasks = $query->execute()->fetchAll();
 
-    return new JsonResponse(array(
+    return new JsonResponse([
       'tasks' => $tasks,
-    ));
+    ]);
   }
 
   /**
@@ -119,16 +119,16 @@ class DatabaseTestController {
    * @return \Symfony\Component\HttpFoundation\JsonResponse
    */
   public function testTablesortFirst() {
-    $header = array(
-      'tid' => array('data' => t('Task ID'), 'field' => 'tid', 'sort' => 'desc'),
-      'pid' => array('data' => t('Person ID'), 'field' => 'pid'),
-      'task' => array('data' => t('Task'), 'field' => 'task'),
-      'priority' => array('data' => t('Priority'), 'field' => 'priority', ),
-    );
+    $header = [
+      'tid' => ['data' => t('Task ID'), 'field' => 'tid', 'sort' => 'desc'],
+      'pid' => ['data' => t('Person ID'), 'field' => 'pid'],
+      'task' => ['data' => t('Task'), 'field' => 'task'],
+      'priority' => ['data' => t('Priority'), 'field' => 'priority', ],
+    ];
 
     $query = db_select('test_task', 't');
     $query
-      ->fields('t', array('tid', 'pid', 'task', 'priority'));
+      ->fields('t', ['tid', 'pid', 'task', 'priority']);
 
     $query = $query
       ->extend('Drupal\Core\Database\Query\TableSortExtender')
@@ -138,9 +138,9 @@ class DatabaseTestController {
     // We need all the results at once to check the sort.
     $tasks = $query->execute()->fetchAll();
 
-    return new JsonResponse(array(
+    return new JsonResponse([
       'tasks' => $tasks,
-    ));
+    ]);
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php b/web/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php
index 96125548b..12eebccab 100644
--- a/web/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php
+++ b/web/core/modules/system/tests/modules/database_test/src/Form/DatabaseTestForm.php
@@ -22,10 +22,10 @@ class DatabaseTestForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $header = array(
-      'username' => array('data' => t('Username'), 'field' => 'u.name'),
-      'status' => array('data' => t('Status'), 'field' => 'u.status'),
-    );
+    $header = [
+      'username' => ['data' => t('Username'), 'field' => 'u.name'],
+      'status' => ['data' => t('Status'), 'field' => 'u.status'],
+    ];
 
     $query = db_select('users_field_data', 'u');
     $query->condition('u.uid', 0, '<>');
@@ -38,7 +38,7 @@ class DatabaseTestForm extends FormBase {
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
       ->extend('Drupal\Core\Database\Query\TableSortExtender');
     $query
-      ->fields('u', array('uid'))
+      ->fields('u', ['uid'])
       ->limit(50)
       ->orderByHeader($header)
       ->setCountQuery($count_query);
@@ -46,22 +46,22 @@ class DatabaseTestForm extends FormBase {
       ->execute()
       ->fetchCol();
 
-    $options = array();
+    $options = [];
 
     foreach (User::loadMultiple($uids) as $account) {
-      $options[$account->id()] = array(
-        'title' => array('data' => array('#title' => $account->getUsername())),
+      $options[$account->id()] = [
+        'title' => ['data' => ['#title' => $account->getUsername()]],
         'username' => $account->getUsername(),
         'status' => $account->isActive() ? t('active') : t('blocked'),
-      );
+      ];
     }
 
-    $form['accounts'] = array(
+    $form['accounts'] = [
       '#type' => 'tableselect',
       '#header' => $header,
       '#options' => $options,
       '#empty' => t('No people available.'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/display_variant_test/src/EventSubscriber/TestPageDisplayVariantSubscriber.php b/web/core/modules/system/tests/modules/display_variant_test/src/EventSubscriber/TestPageDisplayVariantSubscriber.php
index 3768bcdf9..e24266e03 100644
--- a/web/core/modules/system/tests/modules/display_variant_test/src/EventSubscriber/TestPageDisplayVariantSubscriber.php
+++ b/web/core/modules/system/tests/modules/display_variant_test/src/EventSubscriber/TestPageDisplayVariantSubscriber.php
@@ -31,8 +31,8 @@ class TestPageDisplayVariantSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[RenderEvents::SELECT_PAGE_DISPLAY_VARIANT][] = array('onSelectPageDisplayVariant');
+  public static function getSubscribedEvents() {
+    $events[RenderEvents::SELECT_PAGE_DISPLAY_VARIANT][] = ['onSelectPageDisplayVariant'];
     return $events;
   }
 
diff --git a/web/core/modules/system/tests/modules/early_rendering_controller_test/src/TestDomainObjectViewSubscriber.php b/web/core/modules/system/tests/modules/early_rendering_controller_test/src/TestDomainObjectViewSubscriber.php
index 6dac62f6b..e6152ca67 100644
--- a/web/core/modules/system/tests/modules/early_rendering_controller_test/src/TestDomainObjectViewSubscriber.php
+++ b/web/core/modules/system/tests/modules/early_rendering_controller_test/src/TestDomainObjectViewSubscriber.php
@@ -37,7 +37,7 @@ class TestDomainObjectViewSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
+  public static function getSubscribedEvents() {
     $events[KernelEvents::VIEW][] = ['onViewTestDomainObject'];
 
     return $events;
diff --git a/web/core/modules/system/tests/modules/entity_reference_test/entity_reference_test.module b/web/core/modules/system/tests/modules/entity_reference_test/entity_reference_test.module
index 51b506b5d..5ae4fcbbf 100644
--- a/web/core/modules/system/tests/modules/entity_reference_test/entity_reference_test.module
+++ b/web/core/modules/system/tests/modules/entity_reference_test/entity_reference_test.module
@@ -12,7 +12,7 @@ use Drupal\Core\Field\BaseFieldDefinition;
  * Implements hook_entity_base_field_info().
  */
 function entity_reference_test_entity_base_field_info(EntityTypeInterface $entity_type) {
-  $fields = array();
+  $fields = [];
 
   if ($entity_type->id() === 'entity_test') {
     $fields['user_role'] = BaseFieldDefinition::create('entity_reference')
@@ -33,10 +33,10 @@ function entity_reference_test_entity_base_field_info_alter(&$fields, EntityType
     // Allow user_id field to use configurable widget.
     $fields['user_id']
       ->setSetting('handler', 'default')
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'entity_reference_autocomplete',
         'weight' => 0,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
   }
 }
diff --git a/web/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_group_by_empty_relationships.yml b/web/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_group_by_empty_relationships.yml
new file mode 100644
index 000000000..5c9352412
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_group_by_empty_relationships.yml
@@ -0,0 +1,128 @@
+langcode: en
+status: true
+dependencies: {  }
+id: test_entity_reference_group_by_empty_relationships
+label: ''
+module: views
+description: ''
+tag: ''
+base_table: entity_test
+base_field: id
+core: '8'
+display:
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: tag
+      exposed_form:
+        type: basic
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      fields:
+        name_1:
+          id: name_1
+          table: entity_test
+          field: name
+          entity_type: entity_test
+          entity_field: name
+          plugin_id: field
+          relationship: none
+          group_type: group
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          exclude: false
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+        name_2:
+          id: name_2
+          table: entity_test_mul_property_data
+          field: name
+          entity_type: entity_test_mul
+          entity_field: name
+          plugin_id: field
+          relationship: reverse__entity_test_mul__field_data_test_unlimited
+          group_type: group
+          group_column: entity_id
+          group_columns: {  }
+          group_rows: false
+          exclude: false
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+      sorts:
+        name:
+          table: entity_test
+          field: name
+          id: name
+          entity_type: entity_test
+          entity_field: field_test
+          order: ASC
+          plugin_id: standard
+      pager:
+        type: some
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            name_1: name_1
+            name_2: name_2
+          info:
+            name_1:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name_2:
+              sortable: false
+              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
+      relationships:
+        reverse__entity_test_mul__field_data_test_unlimited:
+          id: reverse__entity_test_mul__field_data_test_unlimited
+          table: entity_test
+          field: reverse__entity_test_mul__field_data_test_unlimited
+          entity_type: entity_test
+          plugin_id: entity_reverse
+          group_type: group
+          required: false
+      group_by: true
+    display_plugin: block
+    display_title: Master
+    id: default
+    position: 0
diff --git a/web/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml b/web/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
index 464a007ac..d34d94940 100644
--- a/web/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
+++ b/web/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
@@ -27,19 +27,3 @@ entity_test.entity_test_bundle.*:
     description:
       type: text
       label: 'Description'
-
-entity_test.entity_test_bundle.*.third_party.content_moderation:
-  type: mapping
-  label: 'Enable moderation states for this entity test type'
-  mapping:
-    enabled:
-      type: boolean
-      label: 'Moderation states enabled'
-    allowed_moderation_states:
-      type: sequence
-      sequence:
-        type: string
-        label: 'Moderation state'
-    default_moderation_state:
-      type: string
-      label: 'Moderation state for new entity test'
diff --git a/web/core/modules/system/tests/modules/entity_test/entity_test.install b/web/core/modules/system/tests/modules/entity_test/entity_test.install
index 5e3bcaa2a..c796c9adc 100644
--- a/web/core/modules/system/tests/modules/entity_test/entity_test.install
+++ b/web/core/modules/system/tests/modules/entity_test/entity_test.install
@@ -15,12 +15,12 @@ use Drupal\field\Entity\FieldConfig;
 function entity_test_install() {
   foreach (entity_test_entity_types() as $entity_type) {
     // Auto-create fields for testing.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'entity_type' => $entity_type,
       'field_name' => 'field_test_text',
       'type' => 'text',
       'cardinality' => 1,
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => $entity_type,
       'field_name' => 'field_test_text',
@@ -30,7 +30,7 @@ function entity_test_install() {
     ])->save();
 
     entity_get_form_display($entity_type, $entity_type, 'default')
-      ->setComponent('field_test_text', array('type' => 'text_textfield'))
+      ->setComponent('field_test_text', ['type' => 'text_textfield'])
       ->save();
   }
 }
@@ -40,17 +40,17 @@ function entity_test_install() {
  */
 function entity_test_schema() {
   // Schema for simple entity.
-  $schema['entity_test_example'] = array(
+  $schema['entity_test_example'] = [
     'description' => 'Stores entity_test items.',
-    'fields' => array(
-      'id' => array(
+    'fields' => [
+      'id' => [
         'type' => 'serial',
         'not null' => TRUE,
         'description' => 'Primary Key: Unique entity-test item ID.',
-      ),
-    ),
-    'primary key' => array('id'),
-  );
+      ],
+    ],
+    'primary key' => ['id'],
+  ];
   return $schema;
 }
 
diff --git a/web/core/modules/system/tests/modules/entity_test/entity_test.module b/web/core/modules/system/tests/modules/entity_test/entity_test.module
index f8f56ebbb..e5fa873d0 100644
--- a/web/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/web/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
@@ -53,7 +54,7 @@ const ENTITY_TEST_TYPES_ROUTING = 3;
  *   List with entity_types.
  */
 function entity_test_entity_types($filter = NULL) {
-  $types = array();
+  $types = [];
   if ($filter === NULL || $filter === ENTITY_TEST_TYPES_ROUTING) {
     $types[] = 'entity_test';
   }
@@ -92,9 +93,6 @@ function entity_test_entity_type_alter(array &$entity_types) {
     }
   }
 
-  // Allow entity_test_update tests to override the entity type definition.
-  $entity_types['entity_test_update'] = $state->get('entity_test_update.entity_type', $entity_types['entity_test_update']);
-
   // Allow entity_test_with_bundle tests to override the entity type definition.
   $entity_types['entity_test_with_bundle'] = $state->get('entity_test_with_bundle.entity_type', $entity_types['entity_test_with_bundle']);
 
@@ -167,7 +165,7 @@ function entity_test_entity_base_field_info_alter(&$fields, EntityTypeInterface
  */
 function entity_test_entity_field_storage_info(EntityTypeInterface $entity_type) {
   if ($entity_type->id() == 'entity_test_update') {
-    return \Drupal::state()->get('entity_test_update.additional_field_storage_definitions', array());
+    return \Drupal::state()->get('entity_test_update.additional_field_storage_definitions', []);
   }
 }
 
@@ -184,8 +182,8 @@ function entity_test_entity_field_storage_info(EntityTypeInterface $entity_type)
  *   'entity_test'.
  */
 function entity_test_create_bundle($bundle, $text = NULL, $entity_type = 'entity_test') {
-  $bundles = \Drupal::state()->get($entity_type . '.bundles') ?: array($entity_type => array('label' => 'Entity Test Bundle'));
-  $bundles += array($bundle => array('label' => $text ? $text : $bundle));
+  $bundles = \Drupal::state()->get($entity_type . '.bundles') ?: [$entity_type => ['label' => 'Entity Test Bundle']];
+  $bundles += [$bundle => ['label' => $text ? $text : $bundle]];
   \Drupal::state()->set($entity_type . '.bundles', $bundles);
 
   \Drupal::entityManager()->onBundleCreate($bundle, $entity_type);
@@ -201,7 +199,7 @@ function entity_test_create_bundle($bundle, $text = NULL, $entity_type = 'entity
  *   'entity_test'.
  */
 function entity_test_delete_bundle($bundle, $entity_type = 'entity_test') {
-  $bundles = \Drupal::state()->get($entity_type . '.bundles') ?: array($entity_type => array('label' => 'Entity Test Bundle'));
+  $bundles = \Drupal::state()->get($entity_type . '.bundles') ?: [$entity_type => ['label' => 'Entity Test Bundle']];
   unset($bundles[$bundle]);
   \Drupal::state()->set($entity_type . '.bundles', $bundles);
 
@@ -212,11 +210,11 @@ function entity_test_delete_bundle($bundle, $entity_type = 'entity_test') {
  * Implements hook_entity_bundle_info().
  */
 function entity_test_entity_bundle_info() {
-  $bundles = array();
+  $bundles = [];
   $entity_types = \Drupal::entityManager()->getDefinitions();
   foreach ($entity_types as $entity_type_id => $entity_type) {
     if ($entity_type->getProvider() == 'entity_test' && $entity_type_id != 'entity_test_with_bundle') {
-      $bundles[$entity_type_id] = \Drupal::state()->get($entity_type_id . '.bundles') ?: array($entity_type_id => array('label' => 'Entity Test Bundle'));
+      $bundles[$entity_type_id] = \Drupal::state()->get($entity_type_id . '.bundles') ?: [$entity_type_id => ['label' => 'Entity Test Bundle']];
     }
   }
   return $bundles;
@@ -229,18 +227,18 @@ function entity_test_entity_view_mode_info_alter(&$view_modes) {
   $entity_info = \Drupal::entityManager()->getDefinitions();
   foreach ($entity_info as $entity_type => $info) {
     if ($entity_info[$entity_type]->getProvider() == 'entity_test' && !isset($view_modes[$entity_type])) {
-      $view_modes[$entity_type] = array(
-        'full' => array(
+      $view_modes[$entity_type] = [
+        'full' => [
           'label' => t('Full object'),
           'status' => TRUE,
           'cache' => TRUE,
-        ),
-        'teaser' => array(
+        ],
+        'teaser' => [
           'label' => t('Teaser'),
           'status' => TRUE,
           'cache' => TRUE,
-        ),
-      );
+        ],
+      ];
     }
   }
 }
@@ -252,12 +250,12 @@ function entity_test_entity_form_mode_info_alter(&$form_modes) {
   $entity_info = \Drupal::entityManager()->getDefinitions();
   foreach ($entity_info as $entity_type => $info) {
     if ($entity_info[$entity_type]->getProvider() == 'entity_test') {
-      $form_modes[$entity_type] = array(
-        'compact' => array(
+      $form_modes[$entity_type] = [
+        'compact' => [
           'label' => t('Compact version'),
           'status' => TRUE,
-        ),
-      );
+        ],
+      ];
     }
   }
 }
@@ -266,24 +264,24 @@ function entity_test_entity_form_mode_info_alter(&$form_modes) {
  * Implements hook_entity_extra_field_info().
  */
 function entity_test_entity_extra_field_info() {
-  $extra['entity_test']['bundle_with_extra_fields'] = array(
-    'display' => array(
+  $extra['entity_test']['bundle_with_extra_fields'] = [
+    'display' => [
       // Note: those extra fields do not currently display anything, they are
       // just used in \Drupal\Tests\field_ui\Kernel\EntityDisplayTest to test
       // the behavior of entity display objects.
-      'display_extra_field' => array(
+      'display_extra_field' => [
         'label' => t('Display extra field'),
         'description' => t('An extra field on the display side.'),
         'weight' => 5,
         'visible' => TRUE,
-      ),
-      'display_extra_field_hidden' => array(
+      ],
+      'display_extra_field_hidden' => [
         'label' => t('Display extra field (hidden)'),
         'description' => t('An extra field on the display side, hidden by default.'),
         'visible' => FALSE,
-      ),
-    )
-  );
+      ],
+    ]
+  ];
 
   return $extra;
 }
@@ -412,6 +410,25 @@ function entity_test_entity_test_insert($entity) {
   }
 }
 
+/**
+ * Implements hook_entity_insert().
+ */
+function entity_test_entity_insert(EntityInterface $entity) {
+  if ($entity->getEntityTypeId() == 'entity_test_mulrev' && $entity->label() == 'EntityLoadedRevisionTest') {
+    $entity->setNewRevision(FALSE);
+    $entity->save();
+  }
+}
+
+/**
+ * Implements hook_entity_update().
+ */
+function entity_test_entity_update(EntityInterface $entity) {
+  if ($entity instanceof ContentEntityInterface) {
+    \Drupal::state()->set('entity_test.loadedRevisionId', $entity->getLoadedRevisionId());
+  }
+}
+
 /**
  * Implements hook_entity_field_access().
  *
@@ -656,16 +673,16 @@ function entity_test_field_default_value(FieldableEntityInterface $entity, Field
   // that they are correctly passed.
   $string = $definition->getName() . '_' . $entity->language()->getId();
   // Return a "default value" with multiple items.
-  return array(
-    array(
+  return [
+    [
       'shape' => "shape:0:$string",
       'color' => "color:0:$string",
-    ),
-    array(
+    ],
+    [
       'shape' => "shape:1:$string",
       'color' => "color:1:$string",
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -695,7 +712,7 @@ function entity_test_entity_prepare_view($entity_type, array $entities, array $d
       // Add a dummy field item attribute on field_test_text if it exists.
       if ($entity->hasField('field_test_text') && $displays[$entity->bundle()]->getComponent('field_test_text')) {
         foreach ($entity->get('field_test_text') as $item) {
-          $item->_attributes += array('data-field-item-attr' => 'foobar');
+          $item->_attributes += ['data-field-item-attr' => 'foobar'];
         }
       }
 
@@ -704,7 +721,7 @@ function entity_test_entity_prepare_view($entity_type, array $entities, array $d
       foreach ($fields as $field) {
         if ($field->getType() === 'daterange') {
           $item = $entity->get($field->getName());
-          $item->_attributes += array('data-field-item-attr' => 'foobar');
+          $item->_attributes += ['data-field-item-attr' => 'foobar'];
         }
       }
     }
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Controller/EntityTestController.php b/web/core/modules/system/tests/modules/entity_test/src/Controller/EntityTestController.php
index a753eabde..a69348849 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Controller/EntityTestController.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Controller/EntityTestController.php
@@ -4,40 +4,12 @@ namespace Drupal\entity_test\Controller;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Entity\Query\QueryFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Controller routines for entity_test routes.
  */
 class EntityTestController extends ControllerBase {
 
-  /**
-   * The entity query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $entityQueryFactory;
-
-  /**
-   * Constructs a new EntityTestController.
-   *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory
-   *   The entity query factory.
-   */
-  public function __construct(QueryFactory $entity_query_factory) {
-    $this->entityQueryFactory = $entity_query_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.query')
-    );
-  }
-
   /**
    * Returns an empty page.
    *
@@ -66,11 +38,10 @@ class EntityTestController extends ControllerBase {
       ->getStorage($referenced_entity_type)
       ->load($referenced_entity_id);
     if ($referenced_entity === NULL) {
-      return array();
+      return [];
     }
 
-    $query = $this->entityQueryFactory
-      ->get('entity_test')
+    $query = $this->entityTypeManager()->getStorage('entity_test')->getQuery()
       ->condition($entity_reference_field_name . '.target_id', $referenced_entity_id);
     $entities = $this->entityManager()
       ->getStorage('entity_test')
@@ -91,7 +62,7 @@ class EntityTestController extends ControllerBase {
    */
   public function listEntitiesAlphabetically($entity_type_id) {
     $entity_type_definition = $this->entityManager()->getDefinition($entity_type_id);
-    $query = $this->entityQueryFactory->get($entity_type_id);
+    $query = $this->entityTypeManager()->getStorage($entity_type_id)->getQuery();
 
     // Sort by label field, if any.
     if ($label_field = $entity_type_definition->getKey('label')) {
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php
index a603f5379..f3ada1f6d 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php
@@ -72,15 +72,15 @@ class EntityTest extends ContentEntityBase implements EntityOwnerInterface {
       ->setDescription(t('The name of the test entity.'))
       ->setTranslatable(TRUE)
       ->setSetting('max_length', 32)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'string',
         'weight' => -5,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -5,
-      ));
+      ]);
 
     $fields['created'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Authored on'))
@@ -94,17 +94,17 @@ class EntityTest extends ContentEntityBase implements EntityOwnerInterface {
       ->setSetting('handler', 'default')
       // Default EntityTest entities to have the root user as the owner, to
       // simplify testing.
-      ->setDefaultValue(array(0 => array('target_id' => 1)))
+      ->setDefaultValue([0 => ['target_id' => 1]])
       ->setTranslatable(TRUE)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'entity_reference_autocomplete',
         'weight' => -1,
-        'settings' => array(
+        'settings' => [
           'match_operator' => 'CONTAINS',
           'size' => '60',
           'placeholder' => '',
-        ),
-      ));
+        ],
+      ]);
 
     return $fields;
   }
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
index f7fe8e643..7fe9ce211 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
@@ -53,39 +53,39 @@ class EntityTestBaseFieldDisplay extends EntityTest {
 
     $fields['test_display_configurable'] = BaseFieldDefinition::create('text')
       ->setLabel(t('Field with configurable display'))
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'type' => 'text_default',
         'weight' => 10,
-      ))
+      ])
       ->setDisplayConfigurable('view', TRUE)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'text_textfield',
         'weight' => 10,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['test_display_non_configurable'] = BaseFieldDefinition::create('text')
       ->setLabel(t('Field with non-configurable display'))
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'type' => 'text_default',
         'weight' => 11,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'text_textfield',
         'weight' => 11,
-      ));
+      ]);
 
     $fields['test_display_multiple'] = BaseFieldDefinition::create('text')
       ->setLabel(t('A field with multiple values'))
       ->setCardinality(FieldStorageDefinition::CARDINALITY_UNLIMITED)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'type' => 'text_default',
         'weight' => 12,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'text_textfield',
         'weight' => 12,
-      ));
+      ]);
 
     return $fields;
   }
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php
index a8158b00a..bd28b346b 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestCompositeConstraint.php
@@ -36,15 +36,15 @@ class EntityTestCompositeConstraint extends EntityTest {
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
 
-    $fields['name']->setDisplayOptions('form', array(
+    $fields['name']->setDisplayOptions('form', [
       'type' => 'string',
       'weight' => 0,
-    ));
+    ]);
 
-    $fields['type']->setDisplayOptions('form', array(
+    $fields['type']->setDisplayOptions('form', [
       'type' => 'entity_reference_autocomplete',
       'weight' => 0,
-    ));
+    ]);
 
     return $fields;
   }
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraintViolation.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraintViolation.php
index 448718dc8..e12c74a0d 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraintViolation.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestConstraintViolation.php
@@ -33,11 +33,11 @@ class EntityTestConstraintViolation extends EntityTest {
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
 
-    $fields['name']->setDisplayOptions('form', array(
+    $fields['name']->setDisplayOptions('form', [
       'type' => 'string',
       'weight' => 0,
-    ));
-    $fields['name']->addConstraint('FieldWidgetConstraint', array());
+    ]);
+    $fields['name']->addConstraint('FieldWidgetConstraint', []);
 
     return $fields;
   }
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php
index 5fbc408df..dd3da09dc 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php
@@ -60,6 +60,10 @@ class EntityTestMulChanged extends EntityTestMul implements EntityChangedInterfa
       ->setDescription(t('The time that the entity was last edited.'))
       ->setTranslatable(TRUE);
 
+    $fields['not_translatable'] = BaseFieldDefinition::create('string')
+      ->setLabel(t('Non translatable'))
+      ->setDescription(t('A non-translatable string field'));
+
     return $fields;
   }
 
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php
index 0ee28bf03..f01675f60 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php
@@ -27,6 +27,7 @@ namespace Drupal\entity_test\Entity;
  *   revision_data_table = "entity_test_mulrev_property_revision",
  *   admin_permission = "administer entity_test content",
  *   translatable = TRUE,
+ *   show_revision_ui = TRUE,
  *   entity_keys = {
  *     "id" = "id",
  *     "uuid" = "uuid",
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChangedWithRevisionLog.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChangedWithRevisionLog.php
new file mode 100644
index 000000000..a22954bde
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChangedWithRevisionLog.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\entity_test\Entity;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\RevisionLogEntityTrait;
+use Drupal\Core\Entity\RevisionLogInterface;
+
+/**
+ * Defines the test entity class.
+ *
+ * @ContentEntityType(
+ *   id = "entity_test_mulrev_chnged_revlog",
+ *   label = @Translation("Test entity - revisions log and data table"),
+ *   base_table = "entity_test_mulrev_changed_revlog",
+ *   revision_table = "entity_test_mulrev_changed_revlog_revision",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "uuid" = "uuid",
+ *     "bundle" = "type",
+ *     "revision" = "revision_id",
+ *     "label" = "name",
+ *     "langcode" = "langcode",
+ *   },
+ *   revision_metadata_keys = {
+ *     "revision_user" = "revision_user",
+ *     "revision_created" = "revision_created",
+ *     "revision_log_message" = "revision_log_message"
+ *   },
+ * )
+ */
+class EntityTestMulRevChangedWithRevisionLog extends EntityTestMulRevChanged implements RevisionLogInterface {
+
+  use RevisionLogEntityTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields = parent::baseFieldDefinitions($entity_type);
+    $fields += static::revisionLogBaseFieldDefinitions($entity_type);
+
+    return $fields;
+  }
+
+}
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevPub.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevPub.php
new file mode 100644
index 000000000..862958e92
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevPub.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\entity_test\Entity;
+
+use Drupal\Core\Entity\EntityPublishedInterface;
+use Drupal\Core\Entity\EntityPublishedTrait;
+use Drupal\Core\Entity\EntityTypeInterface;
+
+/**
+ * Defines the test entity class.
+ *
+ * @ContentEntityType(
+ *   id = "entity_test_mulrevpub",
+ *   label = @Translation("Test entity - revisions, data table, and published interface"),
+ *   handlers = {
+ *     "view_builder" = "Drupal\entity_test\EntityTestViewBuilder",
+ *     "access" = "Drupal\entity_test\EntityTestAccessControlHandler",
+ *     "form" = {
+ *       "default" = "Drupal\entity_test\EntityTestForm",
+ *       "delete" = "Drupal\entity_test\EntityTestDeleteForm"
+ *     },
+ *     "translation" = "Drupal\content_translation\ContentTranslationHandler",
+ *     "views_data" = "Drupal\views\EntityViewsData",
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
+ *     },
+ *   },
+ *   base_table = "entity_test_mulrevpub",
+ *   data_table = "entity_test_mulrevpub_property_data",
+ *   revision_table = "entity_test_mulrevpub_revision",
+ *   revision_data_table = "entity_test_mulrevpub_property_revision",
+ *   admin_permission = "administer entity_test content",
+ *   translatable = TRUE,
+ *   show_revision_ui = TRUE,
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "uuid" = "uuid",
+ *     "bundle" = "type",
+ *     "revision" = "revision_id",
+ *     "label" = "name",
+ *     "langcode" = "langcode",
+ *     "published" = "status",
+ *   },
+ *   links = {
+ *     "add-form" = "/entity_test_mulrevpub/add",
+ *     "canonical" = "/entity_test_mulrevpub/manage/{entity_test_mulrevpub}",
+ *     "delete-form" = "/entity_test/delete/entity_test_mulrevpub/{entity_test_mulrevpub}",
+ *     "edit-form" = "/entity_test_mulrevpub/manage/{entity_test_mulrevpub}/edit",
+ *     "revision" = "/entity_test_mulrevpub/{entity_test_mulrevpub}/revision/{entity_test_mulrevpub_revision}/view",
+ *   }
+ * )
+ */
+class EntityTestMulRevPub extends EntityTestMulRev implements EntityPublishedInterface {
+
+  use EntityPublishedTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    return parent::baseFieldDefinitions($entity_type) + EntityPublishedTrait::publishedBaseFieldDefinitions($entity_type);
+  }
+
+}
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php
index 47035ea84..bcbb17bd1 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php
@@ -28,6 +28,7 @@ use Drupal\Core\Field\BaseFieldDefinition;
  *   base_table = "entity_test_rev",
  *   revision_table = "entity_test_rev_revision",
  *   admin_permission = "administer entity_test content",
+ *   show_revision_ui = TRUE,
  *   entity_keys = {
  *     "id" = "id",
  *     "uuid" = "uuid",
@@ -53,13 +54,6 @@ class EntityTestRev extends EntityTest {
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
 
-    $fields['revision_id'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('Revision ID'))
-      ->setDescription(t('The version id of the test entity.'))
-      ->setReadOnly(TRUE)
-      ->setSetting('unsigned', TRUE);
-
-    $fields['langcode']->setRevisionable(TRUE);
     $fields['name']->setRevisionable(TRUE);
     $fields['user_id']->setRevisionable(TRUE);
 
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestUpdate.php b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestUpdate.php
index 6cf0d5ca8..6d72f7aea 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestUpdate.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestUpdate.php
@@ -35,7 +35,7 @@ class EntityTestUpdate extends EntityTestRev {
    */
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
-    $fields += \Drupal::state()->get('entity_test_update.additional_base_field_definitions', array());
+    $fields += \Drupal::state()->get('entity_test_update.additional_base_field_definitions', []);
     return $fields;
   }
 
@@ -44,7 +44,7 @@ class EntityTestUpdate extends EntityTestRev {
    */
   public static function bundleFieldDefinitions(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
     $fields = parent::bundleFieldDefinitions($entity_type, $bundle, $base_field_definitions);
-    $fields += \Drupal::state()->get('entity_test_update.additional_bundle_field_definitions.' . $bundle, array());
+    $fields += \Drupal::state()->get('entity_test_update.additional_bundle_field_definitions.' . $bundle, []);
     return $fields;
   }
 
diff --git a/web/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php b/web/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
index 22816667e..1bd49ddaa 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
@@ -45,13 +45,13 @@ class EntityTestAccessControlHandler extends EntityAccessControlHandler {
       // Viewing the label of the 'entity_test_label' entity type is allowed.
       return AccessResult::allowed();
     }
-    elseif (in_array($operation, array('view', 'view label'))) {
+    elseif (in_array($operation, ['view', 'view label'])) {
       if (!$entity->isDefaultTranslation()) {
         return AccessResult::allowedIfHasPermission($account, 'view test entity translations');
       }
       return AccessResult::allowedIfHasPermission($account, 'view test entity');
     }
-    elseif (in_array($operation, array('update', 'delete'))) {
+    elseif (in_array($operation, ['update', 'delete'])) {
       return AccessResult::allowedIfHasPermission($account, 'administer entity_test content');
     }
 
diff --git a/web/core/modules/system/tests/modules/entity_test/src/EntityTestDefinitionSubscriber.php b/web/core/modules/system/tests/modules/entity_test/src/EntityTestDefinitionSubscriber.php
index a31762e4f..2b06d80bd 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/EntityTestDefinitionSubscriber.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/EntityTestDefinitionSubscriber.php
@@ -38,7 +38,7 @@ class EntityTestDefinitionSubscriber implements EventSubscriberInterface, Entity
   /**
    * {@inheritdoc}
    */
-  function __construct(StateInterface $state) {
+  public function __construct(StateInterface $state) {
     $this->state = $state;
   }
 
diff --git a/web/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php b/web/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
index 7e4caff4d..e4c51143c 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
@@ -32,11 +32,11 @@ class EntityTestForm extends ContentEntityForm {
 
     // @todo: Is there a better way to check if an entity type is revisionable?
     if ($entity->getEntityType()->hasKey('revision') && !$entity->isNew()) {
-      $form['revision'] = array(
+      $form['revision'] = [
         '#type' => 'checkbox',
         '#title' => t('Create new revision'),
         '#default_value' => $entity->isNewRevision(),
-      );
+      ];
     }
 
     return $form;
@@ -58,10 +58,10 @@ class EntityTestForm extends ContentEntityForm {
       $entity->save();
 
       if ($is_new) {
-        $message = t('%entity_type @id has been created.', array('@id' => $entity->id(), '%entity_type' => $entity->getEntityTypeId()));
+        $message = t('%entity_type @id has been created.', ['@id' => $entity->id(), '%entity_type' => $entity->getEntityTypeId()]);
       }
       else {
-        $message = t('%entity_type @id has been updated.', array('@id' => $entity->id(), '%entity_type' => $entity->getEntityTypeId()));
+        $message = t('%entity_type @id has been updated.', ['@id' => $entity->id(), '%entity_type' => $entity->getEntityTypeId()]);
       }
       drupal_set_message($message);
 
@@ -69,7 +69,7 @@ class EntityTestForm extends ContentEntityForm {
         $entity_type = $entity->getEntityTypeId();
         $form_state->setRedirect(
           "entity.$entity_type.edit_form",
-          array($entity_type => $entity->id())
+          [$entity_type => $entity->id()]
         );
       }
       else {
diff --git a/web/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilder.php b/web/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilder.php
index 720e3c3b8..e90a22700 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilder.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilder.php
@@ -18,18 +18,18 @@ class EntityTestViewBuilder extends EntityViewBuilder {
     parent::buildComponents($build, $entities, $displays, $view_mode);
 
     foreach ($entities as $id => $entity) {
-      $build[$id]['label'] = array(
+      $build[$id]['label'] = [
         '#weight' => -100,
         '#plain_text' => $entity->label(),
-      );
-      $build[$id]['separator'] = array(
+      ];
+      $build[$id]['separator'] = [
         '#weight' => -150,
         '#markup' => ' | ',
-      );
-      $build[$id]['view_mode'] = array(
+      ];
+      $build[$id]['view_mode'] = [
         '#weight' => -200,
         '#plain_text' => $view_mode,
-      );
+      ];
     }
   }
 
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Plugin/Derivative/EntityTestLocalTasks.php b/web/core/modules/system/tests/modules/entity_test/src/Plugin/Derivative/EntityTestLocalTasks.php
index 059c3a9f4..ed3f1dc43 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Plugin/Derivative/EntityTestLocalTasks.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Plugin/Derivative/EntityTestLocalTasks.php
@@ -13,16 +13,16 @@ class EntityTestLocalTasks extends DeriverBase {
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    $this->derivatives = array();
+    $this->derivatives = [];
     $types = entity_test_entity_types(ENTITY_TEST_TYPES_ROUTING);
 
     foreach ($types as $entity_type) {
-      $this->derivatives[$entity_type . '.canonical'] = array();
+      $this->derivatives[$entity_type . '.canonical'] = [];
       $this->derivatives[$entity_type . '.canonical']['base_route'] = "entity.$entity_type.canonical";
       $this->derivatives[$entity_type . '.canonical']['route_name'] = "entity.$entity_type.canonical";
       $this->derivatives[$entity_type . '.canonical']['title'] = 'View';
 
-      $this->derivatives[$entity_type . '.edit'] = array();
+      $this->derivatives[$entity_type . '.edit'] = [];
       $this->derivatives[$entity_type . '.edit']['base_route'] = "entity.$entity_type.canonical";
       $this->derivatives[$entity_type . '.edit']['route_name'] = "entity.$entity_type.edit_form";
       $this->derivatives[$entity_type . '.edit']['title'] = 'Edit';
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php b/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
index 2310ffdd3..df2b89b59 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
@@ -46,14 +46,14 @@ class FieldTestItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
           'length' => 255,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/ShapeItem.php b/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/ShapeItem.php
index 0d2ebb9d6..4921dcf48 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/ShapeItem.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/ShapeItem.php
@@ -21,9 +21,9 @@ class ShapeItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'foreign_key_name' => 'shape',
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
@@ -43,30 +43,30 @@ class ShapeItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    $foreign_keys = array();
+    $foreign_keys = [];
     // The 'foreign keys' key is not always used in tests.
     if ($field_definition->getSetting('foreign_key_name')) {
-      $foreign_keys['foreign keys'] = array(
+      $foreign_keys['foreign keys'] = [
         // This is a dummy foreign key definition, references a table that
         // doesn't exist, but that's not a problem.
-        $field_definition->getSetting('foreign_key_name') => array(
+        $field_definition->getSetting('foreign_key_name') => [
           'table' => $field_definition->getSetting('foreign_key_name'),
-          'columns' => array($field_definition->getSetting('foreign_key_name') => 'id'),
-        ),
-      );
+          'columns' => [$field_definition->getSetting('foreign_key_name') => 'id'],
+        ],
+      ];
     }
-    return array(
-      'columns' => array(
-        'shape' => array(
+    return [
+      'columns' => [
+        'shape' => [
           'type' => 'varchar',
           'length' => 32,
-        ),
-        'color' => array(
+        ],
+        'color' => [
           'type' => 'varchar',
           'length' => 32,
-        ),
-      ),
-    ) + $foreign_keys;
+        ],
+      ],
+    ] + $foreign_keys;
   }
 
   /**
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldWidget/ShapeOnlyColorEditableWidget.php b/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldWidget/ShapeOnlyColorEditableWidget.php
index bcff1ec33..ae5dd3039 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldWidget/ShapeOnlyColorEditableWidget.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldWidget/ShapeOnlyColorEditableWidget.php
@@ -17,7 +17,7 @@ use Drupal\Core\Form\FormStateInterface;
  *   },
  * )
  */
-class ShapeOnlyColorEditableWidget extends WidgetBase  {
+class ShapeOnlyColorEditableWidget extends WidgetBase {
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php b/web/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php
index d75d35959..5732060d9 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php
@@ -18,13 +18,13 @@ class EntityTestRoutes {
   public function routes() {
     $types = entity_test_entity_types(ENTITY_TEST_TYPES_ROUTING);
 
-    $routes = array();
+    $routes = [];
     foreach ($types as $entity_type_id) {
       $routes["entity.$entity_type_id.admin_form"] = new Route(
         "$entity_type_id/structure/{bundle}",
-        array('_controller' => '\Drupal\entity_test\Controller\EntityTestController::testAdmin'),
-        array('_permission' => 'administer entity_test content'),
-        array('_admin_route' => TRUE)
+        ['_controller' => '\Drupal\entity_test\Controller\EntityTestController::testAdmin'],
+        ['_permission' => 'administer entity_test content'],
+        ['_admin_route' => TRUE]
       );
     }
     return $routes;
diff --git a/web/core/modules/system/tests/modules/entity_test_extra/entity_test_extra.module b/web/core/modules/system/tests/modules/entity_test_extra/entity_test_extra.module
index d55aab3ca..f399ae4b9 100644
--- a/web/core/modules/system/tests/modules/entity_test_extra/entity_test_extra.module
+++ b/web/core/modules/system/tests/modules/entity_test_extra/entity_test_extra.module
@@ -11,19 +11,19 @@ use Drupal\Core\Entity\EntityTypeInterface;
  * Implements hook_entity_base_field_info().
  */
 function entity_test_extra_entity_base_field_info(EntityTypeInterface $entity_type) {
-  return \Drupal::state()->get($entity_type->id() . '.additional_base_field_definitions', array());
+  return \Drupal::state()->get($entity_type->id() . '.additional_base_field_definitions', []);
 }
 
 /**
  * Implements hook_entity_field_storage_info().
  */
 function entity_test_extra_entity_field_storage_info(EntityTypeInterface $entity_type) {
-  return \Drupal::state()->get($entity_type->id() . '.additional_field_storage_definitions', array());
+  return \Drupal::state()->get($entity_type->id() . '.additional_field_storage_definitions', []);
 }
 
 /**
  * Implements hook_entity_bundle_field_info().
  */
 function entity_test_extra_entity_bundle_field_info(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
-  return \Drupal::state()->get($entity_type->id() . '.' . $bundle . '.additional_bundle_field_definitions', array());
+  return \Drupal::state()->get($entity_type->id() . '.' . $bundle . '.additional_bundle_field_definitions', []);
 }
diff --git a/web/core/modules/system/tests/modules/entity_test_update/config/install/field.field.entity_test_update.entity_test_update.field_test_configurable_field.yml b/web/core/modules/system/tests/modules/entity_test_update/config/install/field.field.entity_test_update.entity_test_update.field_test_configurable_field.yml
new file mode 100644
index 000000000..b1f7cc935
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_test_update/config/install/field.field.entity_test_update.entity_test_update.field_test_configurable_field.yml
@@ -0,0 +1,21 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.entity_test_update.field_test_configurable_field
+  module:
+    - entity_test_update
+id: entity_test_update.entity_test_update.field_test_configurable_field
+field_name: field_test_configurable_field
+entity_type: entity_test_update
+bundle: entity_test_update
+label: 'Test configurable field'
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value1: {  }
+default_value_callback: ''
+settings: {  }
+field_type: multi_value_test
diff --git a/web/core/modules/system/tests/modules/entity_test_update/config/install/field.storage.entity_test_update.field_test_configurable_field.yml b/web/core/modules/system/tests/modules/entity_test_update/config/install/field.storage.entity_test_update.field_test_configurable_field.yml
new file mode 100644
index 000000000..1501f89a1
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_test_update/config/install/field.storage.entity_test_update.field_test_configurable_field.yml
@@ -0,0 +1,17 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - entity_test_update
+id: entity_test_update.field_test_configurable_field
+field_name: field_test_configurable_field
+entity_type: entity_test_update
+type: multi_value_test
+settings: {  }
+module: entity_test_update
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/web/core/modules/system/tests/modules/entity_test_update/config/schema/entity_test_update.schema.yml b/web/core/modules/system/tests/modules/entity_test_update/config/schema/entity_test_update.schema.yml
new file mode 100644
index 000000000..5c604575e
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_test_update/config/schema/entity_test_update.schema.yml
@@ -0,0 +1,9 @@
+field.value.multi_value_test:
+  type: mapping
+  label: 'Default value'
+  mapping:
+    value1:
+      type: sequence
+      sequence:
+        type: string
+        label: 'First value'
diff --git a/web/core/modules/system/tests/modules/entity_test_update/entity_test_update.info.yml b/web/core/modules/system/tests/modules/entity_test_update/entity_test_update.info.yml
new file mode 100644
index 000000000..330028a7a
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_test_update/entity_test_update.info.yml
@@ -0,0 +1,6 @@
+name: 'Entity Update Test'
+type: module
+description: 'Provides an entity type for testing definition and schema updates.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/web/core/modules/system/tests/modules/entity_test_update/entity_test_update.module b/web/core/modules/system/tests/modules/entity_test_update/entity_test_update.module
new file mode 100644
index 000000000..86ca5a971
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_test_update/entity_test_update.module
@@ -0,0 +1,172 @@
+<?php
+
+/**
+ * @file
+ * Provides an entity type for testing definition and schema updates.
+ */
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\entity_test_update\Entity\EntityTestUpdate;
+use Drupal\Core\Entity\EntityTypeInterface;
+
+/**
+ * Implements hook_entity_base_field_info().
+ */
+function entity_test_update_entity_base_field_info(EntityTypeInterface $entity_type) {
+  // Add a base field that will be used to test that fields added through
+  // hook_entity_base_field_info() are handled correctly during a schema
+  // conversion (e.g. from non-revisionable to revisionable).
+  if ($entity_type->id() == 'entity_test_update') {
+    $fields = [];
+    $fields['test_entity_base_field_info'] = BaseFieldDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Field added by hook_entity_base_field_info()'))
+      ->setTranslatable(TRUE)
+      ->setRevisionable(TRUE);
+
+    return $fields;
+  }
+}
+
+/**
+ * Implements hook_entity_type_alter().
+ */
+function entity_test_update_entity_type_alter(array &$entity_types) {
+  // Allow entity_test_update tests to override the entity type definition.
+  $entity_types['entity_test_update'] = \Drupal::state()->get('entity_test_update.entity_type', $entity_types['entity_test_update']);
+}
+
+/**
+ * Implements hook_entity_presave().
+ */
+function entity_test_update_entity_presave(EntityInterface $entity) {
+  // Simulate an error during the save process of a test entity.
+  if ($entity->getEntityTypeId() === 'entity_test_update' && \Drupal::state()->get('entity_test_update.throw_exception', FALSE)) {
+    throw new \Exception('Peekaboo!');
+  }
+}
+
+/**
+ * Creates a given number of 'entity_test_update' entities.
+ *
+ * The 'drupal-8.0.0-rc1-filled.standard.entity_test_update.php.gz' db dump was
+ * created with the following characteristics:
+ * - Drupal 8.0.0-rc1 installed with the Standard profile;
+ * - The 'entity_test_update' module enabled;
+ * - 102 test entities created and saved.
+ *
+ * The 'drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz' db dump
+ * was created with the following characteristics:
+ * - Drupal 8.0.0-rc1 installed with the Standard profile;
+ * - Manually edited the annotation of the entity_test_update entity type in
+ *   order to make it translatable;
+ * - The entity_test_update and Language module enabled;
+ * - Romanian language added;
+ * - 50 test entities created, translated and saved;
+ * - The Content Translation module enabled and configured for our test entity
+ *   type. This was enabled after the first 50 entities were created in order
+ *   to have NULL values for its translation metadata fields
+ *   (e.g. content_translation_status);
+ * - 52 more test entities (with the IDs 51 - 102) crated, translated and saved.
+ *
+ * @param int $start
+ *   (optional) The entity ID to start from. Defaults to 1.
+ * @param int $end
+ *   (optional) The entity ID to end with. Defaults to 50.
+ * @param bool $add_translation
+ *   (optional) Whether to create a translation for each entity. If the number
+ *   of entities is greater than 50, the default translation (en) of the 51st
+ *   entity and the 52nd translation (ro) are disabled through the
+ *   'content_moderation_status' field. Defaults to FALSE.
+ *
+ * @see drupal-8.0.0-rc1-filled.standard.entity_test_update.php.gz
+ * @see drupal-8.0.0-rc1-filled.standard.entity_test_update_mul.php.gz
+ */
+function _entity_test_update_create_test_entities($start = 1, $end = 50, $add_translation = FALSE) {
+  for ($i = $start; $i <= $end; $i++) {
+    $entity  = EntityTestUpdate::create([
+      'id' => $i,
+      'name' => $i,
+      'test_single_property' => $i . ' - test single property',
+      'test_multiple_properties' => [[
+        'value1' => $i . ' - test multiple properties - value1',
+        'value2' => $i . ' - test multiple properties - value2',
+      ]],
+      'test_single_property_multiple_values' => [
+        ['value' => $i . ' - test single property multiple values 0'],
+        ['value' => $i . ' - test single property multiple values 1']
+      ],
+      'test_multiple_properties_multiple_values' => [
+        [
+          'value1' => $i . ' - test multiple properties multiple values - value1 0',
+          'value2' => $i . ' - test multiple properties multiple values - value2 0',
+        ],
+        [
+          'value1' => $i . ' - test multiple properties multiple values - value1 1',
+          'value2' => $i . ' - test multiple properties multiple values - value2 1',
+        ]
+      ],
+      'test_non_rev_field' => $i . ' - test non-revisionable field',
+      'test_non_mul_field' => $i . ' - test non-translatable field',
+      'test_non_mulrev_field' => $i . ' - test non-translatable and non-revisionable field',
+      'field_test_configurable_field' => [
+        [
+          'value1' => $i . ' - field test configurable field - value1 0',
+          'value2' => $i . ' - field test configurable field - value2 0',
+        ],
+        [
+          'value1' => $i . ' - field test configurable field - value1 1',
+          'value2' => $i . ' - field test configurable field - value2 1',
+        ]
+      ],
+      'test_entity_base_field_info' => $i . ' - test entity base field info',
+    ]);
+
+    if ($add_translation) {
+      $entity->addTranslation('ro', [
+        'name' => $i . ' - ro',
+        'test_single_property' => $i . ' - test single property - ro',
+        'test_multiple_properties' => [[
+          'value1' => $i . ' - test multiple properties - value1 - ro',
+          'value2' => $i . ' - test multiple properties - value2 - ro',
+        ]],
+        'test_single_property_multiple_values' => [
+          ['value' => $i . ' - test single property multiple values 0 - ro'],
+          ['value' => $i . ' - test single property multiple values 1 - ro']
+        ],
+        'test_multiple_properties_multiple_values' => [
+          [
+            'value1' => $i . ' - test multiple properties multiple values - value1 0 - ro',
+            'value2' => $i . ' - test multiple properties multiple values - value2 0 - ro',
+          ],
+          [
+            'value1' => $i . ' - test multiple properties multiple values - value1 1 - ro',
+            'value2' => $i . ' - test multiple properties multiple values - value2 1 - ro',
+          ]
+        ],
+        'test_non_rev_field' => $i . ' - test non-revisionable field - ro',
+        'field_test_configurable_field' => [
+          [
+            'value1' => $i . ' - field test configurable field - value1 0 - ro',
+            'value2' => $i . ' - field test configurable field - value2 0 - ro',
+          ],
+          [
+            'value1' => $i . ' - field test configurable field - value1 1 - ro',
+            'value2' => $i . ' - field test configurable field - value2 1 - ro',
+          ]
+        ],
+        'test_entity_base_field_info' => $i . ' - test entity base field info - ro',
+      ]);
+
+      if ($i == 101) {
+        $entity->getTranslation('en')->set('content_translation_status', FALSE);
+      }
+      if ($i == 102) {
+        $entity->getTranslation('ro')->set('content_translation_status', FALSE);
+      }
+    }
+
+    $entity->save();
+  }
+}
diff --git a/web/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php b/web/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php
new file mode 100644
index 000000000..286e8e62b
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_test_update/src/Entity/EntityTestUpdate.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Drupal\entity_test_update\Entity;
+
+use Drupal\Core\Entity\ContentEntityBase;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+
+/**
+ * Defines the test entity class for testing definition and schema updates.
+ *
+ * This entity type starts out non-revisionable and non-translatable, but during
+ * an update test it can be made revisionable and translatable using the helper
+ * methods from \Drupal\system\Tests\Entity\EntityDefinitionTestTrait.
+ *
+ * @ContentEntityType(
+ *   id = "entity_test_update",
+ *   label = @Translation("Test entity update"),
+ *   handlers = {
+ *     "storage_schema" = "Drupal\entity_test_update\EntityTestUpdateStorageSchema",
+ *   },
+ *   base_table = "entity_test_update",
+ *   persistent_cache = FALSE,
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "uuid" = "uuid",
+ *     "bundle" = "type",
+ *     "label" = "name",
+ *     "langcode" = "langcode",
+ *   },
+ *   content_translation_ui_skip = TRUE,
+ * )
+ */
+class EntityTestUpdate extends ContentEntityBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function preCreate(EntityStorageInterface $storage, array &$values) {
+    parent::preCreate($storage, $values);
+    if (empty($values['type'])) {
+      $values['type'] = $storage->getEntityTypeId();
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    // This entity type is used for generating database dumps from Drupal
+    // 8.0.0-rc1, which didn't have the entity key base fields defined in
+    // the parent class (ContentEntityBase), so we have to duplicate them here.
+
+    $fields[$entity_type->getKey('id')] = BaseFieldDefinition::create('integer')
+      ->setLabel(new TranslatableMarkup('ID'))
+      ->setDescription(new TranslatableMarkup('The ID of the test entity.'))
+      ->setReadOnly(TRUE)
+      ->setSetting('unsigned', TRUE);
+
+    $fields[$entity_type->getKey('uuid')] = BaseFieldDefinition::create('uuid')
+      ->setLabel(new TranslatableMarkup('UUID'))
+      ->setDescription(new TranslatableMarkup('The UUID of the test entity.'))
+      ->setReadOnly(TRUE);
+
+    $fields[$entity_type->getKey('bundle')] = BaseFieldDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Type'))
+      ->setDescription(new TranslatableMarkup('The bundle of the test entity.'))
+      ->setRequired(TRUE);
+
+    if ($entity_type->hasKey('revision')) {
+      $fields[$entity_type->getKey('revision')] = BaseFieldDefinition::create('integer')
+        ->setLabel(new TranslatableMarkup('Revision ID'))
+        ->setReadOnly(TRUE)
+        ->setSetting('unsigned', TRUE);
+    }
+
+    $fields[$entity_type->getKey('langcode')] = BaseFieldDefinition::create('language')
+      ->setLabel(new TranslatableMarkup('Language'));
+    if ($entity_type->isRevisionable()) {
+      $fields[$entity_type->getKey('langcode')]->setRevisionable(TRUE);
+    }
+    if ($entity_type->isTranslatable()) {
+      $fields[$entity_type->getKey('langcode')]->setTranslatable(TRUE);
+    }
+
+    $fields['name'] = BaseFieldDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Name'))
+      ->setDescription(new TranslatableMarkup('The name of the test entity.'))
+      ->setTranslatable(TRUE)
+      ->setRevisionable(TRUE)
+      ->setSetting('max_length', 32)
+      ->setDisplayOptions('view', [
+        'label' => 'hidden',
+        'type' => 'string',
+        'weight' => -5,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'string_textfield',
+        'weight' => -5,
+      ]);
+
+    $fields['test_single_property'] = BaseFieldDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Field with a single property'))
+      ->setTranslatable(TRUE)
+      ->setRevisionable(TRUE);
+
+    $fields['test_multiple_properties'] = BaseFieldDefinition::create('multi_value_test')
+      ->setLabel(new TranslatableMarkup('Field with multiple properties'))
+      ->setTranslatable(TRUE)
+      ->setRevisionable(TRUE);
+
+    $fields['test_single_property_multiple_values'] = BaseFieldDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Field with a single property and multiple values'))
+      ->setCardinality(2)
+      ->setTranslatable(TRUE)
+      ->setRevisionable(TRUE);
+
+    $fields['test_multiple_properties_multiple_values'] = BaseFieldDefinition::create('multi_value_test')
+      ->setLabel(new TranslatableMarkup('Field with multiple properties and multiple values'))
+      ->setCardinality(2)
+      ->setTranslatable(TRUE)
+      ->setRevisionable(TRUE);
+
+    $fields['test_non_rev_field'] = BaseFieldDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Non Revisionable Field'))
+      ->setDescription(new TranslatableMarkup('A non-revisionable test field.'))
+      ->setCardinality(1)
+      ->setRevisionable(FALSE)
+      ->setTranslatable(TRUE);
+
+    $fields['test_non_mul_field'] = BaseFieldDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Non Translatable Field'))
+      ->setDescription(new TranslatableMarkup('A non-translatable test field.'))
+      ->setCardinality(1)
+      ->setRevisionable(TRUE)
+      ->setTranslatable(FALSE);
+
+    $fields['test_non_mulrev_field'] = BaseFieldDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Non Revisionable and Translatable Field'))
+      ->setDescription(new TranslatableMarkup('A non-revisionable and non-translatable test field.'))
+      ->setCardinality(1)
+      ->setRevisionable(FALSE)
+      ->setTranslatable(FALSE);
+
+    $fields += \Drupal::state()->get('entity_test_update.additional_base_field_definitions', []);
+    return $fields;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function bundleFieldDefinitions(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
+    $fields = parent::bundleFieldDefinitions($entity_type, $bundle, $base_field_definitions);
+    $fields += \Drupal::state()->get('entity_test_update.additional_bundle_field_definitions.' . $bundle, []);
+    return $fields;
+  }
+
+}
diff --git a/web/core/modules/system/tests/modules/entity_test/src/EntityTestStorageSchema.php b/web/core/modules/system/tests/modules/entity_test_update/src/EntityTestUpdateStorageSchema.php
similarity index 90%
rename from web/core/modules/system/tests/modules/entity_test/src/EntityTestStorageSchema.php
rename to web/core/modules/system/tests/modules/entity_test_update/src/EntityTestUpdateStorageSchema.php
index 67a13bdd0..2b75e8309 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/EntityTestStorageSchema.php
+++ b/web/core/modules/system/tests/modules/entity_test_update/src/EntityTestUpdateStorageSchema.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\entity_test;
+namespace Drupal\entity_test_update;
 
 use Drupal\Core\Entity\ContentEntityTypeInterface;
 use Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema;
@@ -9,7 +9,7 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface;
 /**
  * Defines the entity_test_update storage_schema handler.
  */
-class EntityTestStorageSchema extends SqlContentEntityStorageSchema {
+class EntityTestUpdateStorageSchema extends SqlContentEntityStorageSchema {
 
   /**
    * {@inheritdoc}
@@ -18,7 +18,7 @@ class EntityTestStorageSchema extends SqlContentEntityStorageSchema {
     $schema = parent::getEntitySchema($entity_type, $reset);
 
     if ($entity_type->id() == 'entity_test_update') {
-      $schema[$entity_type->getBaseTable()]['indexes'] += \Drupal::state()->get('entity_test_update.additional_entity_indexes', array());
+      $schema[$entity_type->getBaseTable()]['indexes'] += \Drupal::state()->get('entity_test_update.additional_entity_indexes', []);
     }
     return $schema;
   }
diff --git a/web/core/modules/system/tests/modules/entity_test_update/src/Plugin/Field/FieldType/MultiValueTestItem.php b/web/core/modules/system/tests/modules/entity_test_update/src/Plugin/Field/FieldType/MultiValueTestItem.php
new file mode 100644
index 000000000..cb0881809
--- /dev/null
+++ b/web/core/modules/system/tests/modules/entity_test_update/src/Plugin/Field/FieldType/MultiValueTestItem.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Drupal\entity_test_update\Plugin\Field\FieldType;
+
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\TypedData\DataDefinition;
+use Drupal\Core\Field\FieldItemBase;
+
+/**
+ * Defines the 'multi_value_test' field type.
+ *
+ * @FieldType(
+ *   id = "multi_value_test",
+ *   label = @Translation("Multiple values test"),
+ *   description = @Translation("Another dummy field type."),
+ * )
+ */
+class MultiValueTestItem extends FieldItemBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
+    $properties['value1'] = DataDefinition::create('string')
+      ->setLabel(t('First value'));
+
+    $properties['value2'] = DataDefinition::create('string')
+      ->setLabel(t('Second value'));
+
+    return $properties;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function schema(FieldStorageDefinitionInterface $field_definition) {
+    return [
+      'columns' => [
+        'value1' => [
+          'type' => 'varchar',
+          'length' => 64,
+        ],
+        'value2' => [
+          'type' => 'varchar',
+          'length' => 64,
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isEmpty() {
+    $item = $this->getValue();
+    return empty($item['value1']) && empty($item['value2']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function mainPropertyName() {
+    return 'value1';
+  }
+
+}
diff --git a/web/core/modules/system/tests/modules/error_service_test/src/Logger/TestLog.php b/web/core/modules/system/tests/modules/error_service_test/src/Logger/TestLog.php
index 579d71f8c..3f18bb943 100644
--- a/web/core/modules/system/tests/modules/error_service_test/src/Logger/TestLog.php
+++ b/web/core/modules/system/tests/modules/error_service_test/src/Logger/TestLog.php
@@ -16,7 +16,7 @@ class TestLog implements LoggerInterface {
   /**
    * {@inheritdoc}
    */
-  public function log($level, $message, array $context = array()) {
+  public function log($level, $message, array $context = []) {
     $trigger = [
       '%type' => 'Exception',
       '@message' => 'Deforestation',
diff --git a/web/core/modules/system/tests/modules/form_test/form_test.module b/web/core/modules/system/tests/modules/form_test/form_test.module
index 7114a29ca..e3a5e3f28 100644
--- a/web/core/modules/system/tests/modules/form_test/form_test.module
+++ b/web/core/modules/system/tests/modules/form_test/form_test.module
@@ -41,49 +41,49 @@ function system_form_form_test_alter_form_alter(&$form, FormStateInterface $form
  * Create a header and options array. Helper function for callbacks.
  */
 function _form_test_tableselect_get_data() {
-  $header = array(
+  $header = [
     'one' => t('One'),
     'two' => t('Two'),
     'three' => t('Three'),
     'four' => t('Four'),
-  );
+  ];
 
-  $options['row1'] = array(
-    'title' => array('data' => array('#title' => t('row1'))),
+  $options['row1'] = [
+    'title' => ['data' => ['#title' => t('row1')]],
     'one' => 'row1col1',
     'two' => t('row1col2'),
     'three' => t('row1col3'),
     'four' => t('row1col4'),
-  );
+  ];
 
-  $options['row2'] = array(
-    'title' => array('data' => array('#title' => t('row2'))),
+  $options['row2'] = [
+    'title' => ['data' => ['#title' => t('row2')]],
     'one' => 'row2col1',
     'two' => t('row2col2'),
     'three' => t('row2col3'),
     'four' => t('row2col4'),
-  );
+  ];
 
-  $options['row3'] = array(
-    'title' => array('data' => array('#title' => t('row3'))),
+  $options['row3'] = [
+    'title' => ['data' => ['#title' => t('row3')]],
     'one' => 'row3col1',
     'two' => t('row3col2'),
     'three' => t('row3col3'),
     'four' => t('row3col4'),
-  );
+  ];
 
-  return array($header, $options);
+  return [$header, $options];
 }
 
 /**
  * Implements hook_form_FORM_ID_alter() for the registration form.
  */
 function form_test_form_user_register_form_alter(&$form, FormStateInterface $form_state) {
-  $form['test_rebuild'] = array(
+  $form['test_rebuild'] = [
     '#type' => 'submit',
     '#value' => t('Rebuild'),
-    '#submit' => array('form_test_user_register_form_rebuild'),
-  );
+    '#submit' => ['form_test_user_register_form_rebuild'],
+  ];
 }
 
 /**
diff --git a/web/core/modules/system/tests/modules/form_test/src/AutocompleteController.php b/web/core/modules/system/tests/modules/form_test/src/AutocompleteController.php
index acbfa4092..cc78a9c0c 100644
--- a/web/core/modules/system/tests/modules/form_test/src/AutocompleteController.php
+++ b/web/core/modules/system/tests/modules/form_test/src/AutocompleteController.php
@@ -16,7 +16,7 @@ class AutocompleteController {
    *   A JSON response.
    */
   public function autocomplete1() {
-    return new JsonResponse(array('key' => 'value'));
+    return new JsonResponse(['key' => 'value']);
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Callbacks.php b/web/core/modules/system/tests/modules/form_test/src/Callbacks.php
index 3bf07f306..0310a37e5 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Callbacks.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Callbacks.php
@@ -38,7 +38,7 @@ class Callbacks {
 
     if ($triggered) {
       // Output the element's value from $form_state.
-      drupal_set_message(t('@label value: @value', array('@label' => $element['#title'], '@value' => $form_state->getValue('name'))));
+      drupal_set_message(t('@label value: @value', ['@label' => $element['#title'], '@value' => $form_state->getValue('name')]));
 
       // Trigger a form validation error to see our changes.
       $form_state->setErrorByName('');
diff --git a/web/core/modules/system/tests/modules/form_test/src/ConfirmFormArrayPathTestForm.php b/web/core/modules/system/tests/modules/form_test/src/ConfirmFormArrayPathTestForm.php
index 8885836f2..eaa0f2037 100644
--- a/web/core/modules/system/tests/modules/form_test/src/ConfirmFormArrayPathTestForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/ConfirmFormArrayPathTestForm.php
@@ -20,11 +20,11 @@ class ConfirmFormArrayPathTestForm extends ConfirmFormTestForm {
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('form_test.route6', array(), array(
-      'query' => array(
+    return new Url('form_test.route6', [], [
+      'query' => [
         'destination' => 'admin/config',
-      ),
-    ));
+      ],
+    ]);
   }
 
   /**
diff --git a/web/core/modules/system/tests/modules/form_test/src/ConfirmFormTestForm.php b/web/core/modules/system/tests/modules/form_test/src/ConfirmFormTestForm.php
index d35c59d1f..917f9e0ef 100644
--- a/web/core/modules/system/tests/modules/form_test/src/ConfirmFormTestForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/ConfirmFormTestForm.php
@@ -57,7 +57,7 @@ class ConfirmFormTestForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['element'] = array('#markup' => '<p>The ConfirmFormTestForm::buildForm() method was used for this form.</p>');
+    $form['element'] = ['#markup' => '<p>The ConfirmFormTestForm::buildForm() method was used for this form.</p>'];
 
     return parent::buildForm($form, $form_state);
   }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Controller/FormTestController.php b/web/core/modules/system/tests/modules/form_test/src/Controller/FormTestController.php
index 5d28bf253..4c9fbe2c8 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Controller/FormTestController.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Controller/FormTestController.php
@@ -20,12 +20,12 @@ class FormTestController extends ControllerBase {
    */
   public function twoFormInstances() {
     $user = $this->currentUser();
-    $values = array(
+    $values = [
       'uid' => $user->id(),
       'name' => $user->getUsername(),
       'type' => 'page',
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    );
+    ];
     $node1 = $this->entityManager()->getStorage('node')->create($values);
     $node2 = clone($node1);
     $return['node_form_1'] = $this->entityFormBuilder()->getForm($node1);
diff --git a/web/core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php b/web/core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php
index 15e4545f3..3fb97507a 100644
--- a/web/core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php
+++ b/web/core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php
@@ -39,8 +39,8 @@ class FormTestEventSubscriber implements EventSubscriberInterface {
    * {@inheritdoc}
    */
   public static function getSubscribedEvents() {
-    $events[KernelEvents::REQUEST][] = array('onKernelRequest');
-    $events[KernelEvents::RESPONSE][] = array('onKernelResponse');
+    $events[KernelEvents::REQUEST][] = ['onKernelRequest'];
+    $events[KernelEvents::RESPONSE][] = ['onKernelResponse'];
     return $events;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestButtonClassForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestButtonClassForm.php
index 6870781db..4e3de3bb4 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestButtonClassForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestButtonClassForm.php
@@ -21,16 +21,16 @@ class FormTestButtonClassForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['button'] = array(
+    $form['button'] = [
       '#type' => 'button',
       '#value' => 'test',
       '#button_type' => 'foo',
-    );
-    $form['delete'] = array(
+    ];
+    $form['delete'] = [
       '#type' => 'button',
       '#value' => 'Delete',
       '#button_type' => 'danger',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxForm.php
index 66f7d059f..62220cc61 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxForm.php
@@ -20,65 +20,65 @@ class FormTestCheckboxForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     // A required checkbox.
-    $form['required_checkbox'] = array(
+    $form['required_checkbox'] = [
       '#type' => 'checkbox',
       '#required' => TRUE,
       '#title' => 'required_checkbox',
-    );
+    ];
 
     // A disabled checkbox should get its default value back.
-    $form['disabled_checkbox_on'] = array(
+    $form['disabled_checkbox_on'] = [
       '#type' => 'checkbox',
       '#disabled' => TRUE,
       '#return_value' => 'disabled_checkbox_on',
       '#default_value' => 'disabled_checkbox_on',
       '#title' => 'disabled_checkbox_on',
-    );
-    $form['disabled_checkbox_off'] = array(
+    ];
+    $form['disabled_checkbox_off'] = [
       '#type' => 'checkbox',
       '#disabled' => TRUE,
       '#return_value' => 'disabled_checkbox_off',
       '#default_value' => NULL,
       '#title' => 'disabled_checkbox_off',
-    );
+    ];
 
     // A checkbox is active when #default_value == #return_value.
-    $form['checkbox_on'] = array(
+    $form['checkbox_on'] = [
       '#type' => 'checkbox',
       '#return_value' => 'checkbox_on',
       '#default_value' => 'checkbox_on',
       '#title' => 'checkbox_on',
-    );
+    ];
 
     // But inactive in any other case.
-    $form['checkbox_off'] = array(
+    $form['checkbox_off'] = [
       '#type' => 'checkbox',
       '#return_value' => 'checkbox_off',
       '#default_value' => 'checkbox_on',
       '#title' => 'checkbox_off',
-    );
+    ];
 
     // Checkboxes with a #return_value of '0' are supported.
-    $form['zero_checkbox_on'] = array(
+    $form['zero_checkbox_on'] = [
       '#type' => 'checkbox',
       '#return_value' => '0',
       '#default_value' => '0',
       '#title' => 'zero_checkbox_on',
-    );
+    ];
 
     // In that case, passing a #default_value != '0'
     // means that the checkbox is off.
-    $form['zero_checkbox_off'] = array(
+    $form['zero_checkbox_off'] = [
       '#type' => 'checkbox',
       '#return_value' => '0',
       '#default_value' => '1',
       '#title' => 'zero_checkbox_off',
-    );
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxTypeJugglingForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxTypeJugglingForm.php
index eb48bfcbb..ad0a86e8c 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxTypeJugglingForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxTypeJugglingForm.php
@@ -21,12 +21,12 @@ class FormTestCheckboxTypeJugglingForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, $default_value = NULL, $return_value = NULL) {
-    $form['checkbox'] = array(
+    $form['checkbox'] = [
       '#title' => t('Checkbox'),
       '#type' => 'checkbox',
       '#return_value' => $return_value,
       '#default_value' => $default_value,
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesRadiosForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesRadiosForm.php
index 7c412fec6..a1a45a0ab 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesRadiosForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesRadiosForm.php
@@ -24,53 +24,53 @@ class FormTestCheckboxesRadiosForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state, $customize = FALSE) {
     // Expand #type checkboxes, setting custom element properties for some but not
     // all options.
-    $form['checkboxes'] = array(
+    $form['checkboxes'] = [
       '#type' => 'checkboxes',
       '#title' => 'Checkboxes',
-      '#options' => array(
+      '#options' => [
         0 => 'Zero',
         'foo' => 'Foo',
         1 => 'One',
         'bar' => $this->t('<em>Bar - checkboxes</em>'),
         '>' => "<em>Special Char</em><script>alert('checkboxes');</script>",
-      ),
-    );
+      ],
+    ];
     if ($customize) {
-      $form['checkboxes'] += array(
-        'foo' => array(
+      $form['checkboxes'] += [
+        'foo' => [
           '#description' => 'Enable to foo.',
-        ),
-        1 => array(
+        ],
+        1 => [
           '#weight' => 10,
-        ),
-      );
+        ],
+      ];
     }
 
     // Expand #type radios, setting custom element properties for some but not
     // all options.
-    $form['radios'] = array(
+    $form['radios'] = [
       '#type' => 'radios',
       '#title' => 'Radios',
-      '#options' => array(
+      '#options' => [
         0 => 'Zero',
         'foo' => 'Foo',
         1 => 'One',
         'bar' => '<em>Bar - radios</em>',
         '>' => "<em>Special Char</em><script>alert('radios');</script>",
-      ),
-    );
+      ],
+    ];
     if ($customize) {
-      $form['radios'] += array(
-        'foo' => array(
+      $form['radios'] += [
+        'foo' => [
           '#description' => 'Enable to foo.',
-        ),
-        1 => array(
+        ],
+        1 => [
           '#weight' => 10,
-        ),
-      );
+        ],
+      ];
     }
 
-    $form['submit'] = array('#type' => 'submit', '#value' => 'Submit');
+    $form['submit'] = ['#type' => 'submit', '#value' => 'Submit'];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesZeroForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesZeroForm.php
index 2f2a38f38..59f81e95b 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesZeroForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestCheckboxesZeroForm.php
@@ -23,27 +23,27 @@ class FormTestCheckboxesZeroForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state, $json = TRUE) {
     $form_state->set('json', $json);
-    $form['checkbox_off'] = array(
+    $form['checkbox_off'] = [
       '#title' => t('Checkbox off'),
       '#type' => 'checkboxes',
-      '#options' => array('foo', 'bar', 'baz'),
-    );
-    $form['checkbox_zero_default'] = array(
+      '#options' => ['foo', 'bar', 'baz'],
+    ];
+    $form['checkbox_zero_default'] = [
       '#title' => t('Zero default'),
       '#type' => 'checkboxes',
-      '#options' => array('foo', 'bar', 'baz'),
-      '#default_value' => array(0),
-    );
-    $form['checkbox_string_zero_default'] = array(
+      '#options' => ['foo', 'bar', 'baz'],
+      '#default_value' => [0],
+    ];
+    $form['checkbox_string_zero_default'] = [
       '#title' => t('Zero default (string)'),
       '#type' => 'checkboxes',
-      '#options' => array('foo', 'bar', 'baz'),
-      '#default_value' => array('0'),
-    );
-    $form['submit'] = array(
+      '#options' => ['foo', 'bar', 'baz'],
+      '#default_value' => ['0'],
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Save',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestClickedButtonForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestClickedButtonForm.php
index c6684db16..adab5bda0 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestClickedButtonForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestClickedButtonForm.php
@@ -26,10 +26,10 @@ class FormTestClickedButtonForm extends FormBase {
     // submitted without any information identifying the button responsible for
     // the submission. In other browsers, the form is submitted as though the
     // first button were clicked.
-    $form['text'] = array(
+    $form['text'] = [
       '#title' => 'Text',
       '#type' => 'textfield',
-    );
+    ];
 
     // Loop through each path argument, adding buttons based on the information
     // in the argument. For example, if the path is
@@ -37,7 +37,7 @@ class FormTestClickedButtonForm extends FormBase {
     // 'image_button', and a 'button' with #access=FALSE. This enables form.test
     // to test a variety of combinations.
     $i = 0;
-    $args = array($first, $second, $third);
+    $args = [$first, $second, $third];
     foreach ($args as $arg) {
       $name = 'button' . ++$i;
       // 's', 'b', or 'i' in the argument define the button type wanted.
@@ -54,10 +54,10 @@ class FormTestClickedButtonForm extends FormBase {
         $type = NULL;
       }
       if (isset($type)) {
-        $form[$name] = array(
+        $form[$name] = [
           '#type' => $type,
           '#name' => $name,
-        );
+        ];
         // Image buttons need a #src; the others need a #value.
         if ($type == 'image_button') {
           $form[$name]['#src'] = 'core/misc/druplicon.png';
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestColorForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestColorForm.php
index a9be1eaaf..07638809e 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestColorForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestColorForm.php
@@ -22,14 +22,14 @@ class FormTestColorForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['color'] = array(
+    $form['color'] = [
       '#type' => 'color',
       '#title' => 'Color',
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestDescriptionForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestDescriptionForm.php
index f7527af29..81120ad14 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestDescriptionForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestDescriptionForm.php
@@ -23,26 +23,26 @@ class FormTestDescriptionForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['form_textfield_test_description_before'] = array(
+    $form['form_textfield_test_description_before'] = [
       '#type' => 'textfield',
       '#title' => 'Textfield test for description before element',
       '#description' => 'Textfield test for description before element',
       '#description_display' => 'before',
-    );
+    ];
 
-    $form['form_textfield_test_description_after'] = array(
+    $form['form_textfield_test_description_after'] = [
       '#type' => 'textfield',
       '#title' => 'Textfield test for description after element',
       '#description' => 'Textfield test for description after element',
       '#description_display' => 'after',
-    );
+    ];
 
-    $form['form_textfield_test_description_invisible'] = array(
+    $form['form_textfield_test_description_invisible'] = [
       '#type' => 'textfield',
       '#title' => 'Textfield test for visually-hidden description',
       '#description' => 'Textfield test for visually-hidden description',
       '#description_display' => 'invisible',
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestDisabledElementsForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestDisabledElementsForm.php
index 8ebbf83e9..56e6d2ee0 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestDisabledElementsForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestDisabledElementsForm.php
@@ -24,101 +24,101 @@ class FormTestDisabledElementsForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     // Elements that take a simple default value.
-    foreach (array('textfield', 'textarea', 'search', 'tel', 'hidden') as $type) {
-      $form[$type] = array(
+    foreach (['textfield', 'textarea', 'search', 'tel', 'hidden'] as $type) {
+      $form[$type] = [
         '#type' => $type,
         '#title' => $type,
         '#default_value' => $type,
         '#test_hijack_value' => 'HIJACK',
         '#disabled' => TRUE,
-      );
+      ];
     }
 
     // Multiple values option elements.
-    foreach (array('checkboxes', 'select') as $type) {
-      $form[$type . '_multiple'] = array(
+    foreach (['checkboxes', 'select'] as $type) {
+      $form[$type . '_multiple'] = [
         '#type' => $type,
         '#title' => $type . ' (multiple)',
-        '#options' => array(
+        '#options' => [
           'test_1' => 'Test 1',
           'test_2' => 'Test 2',
-        ),
+        ],
         '#multiple' => TRUE,
-        '#default_value' => array('test_2' => 'test_2'),
+        '#default_value' => ['test_2' => 'test_2'],
         // The keys of #test_hijack_value need to match the #name of the control.
         // @see FormsTestCase::testDisabledElements()
-        '#test_hijack_value' => $type == 'select' ? array('' => 'test_1') : array('test_1' => 'test_1'),
+        '#test_hijack_value' => $type == 'select' ? ['' => 'test_1'] : ['test_1' => 'test_1'],
         '#disabled' => TRUE,
-      );
+      ];
     }
 
     // Single values option elements.
-    foreach (array('radios', 'select') as $type) {
-      $form[$type . '_single'] = array(
+    foreach (['radios', 'select'] as $type) {
+      $form[$type . '_single'] = [
         '#type' => $type,
         '#title' => $type . ' (single)',
-        '#options' => array(
+        '#options' => [
           'test_1' => 'Test 1',
           'test_2' => 'Test 2',
-        ),
+        ],
         '#multiple' => FALSE,
         '#default_value' => 'test_2',
         '#test_hijack_value' => 'test_1',
         '#disabled' => TRUE,
-      );
+      ];
     }
 
     // Checkbox and radio.
-    foreach (array('checkbox', 'radio') as $type) {
-      $form[$type . '_unchecked'] = array(
+    foreach (['checkbox', 'radio'] as $type) {
+      $form[$type . '_unchecked'] = [
         '#type' => $type,
         '#title' => $type . ' (unchecked)',
         '#return_value' => 1,
         '#default_value' => 0,
         '#test_hijack_value' => 1,
         '#disabled' => TRUE,
-      );
-      $form[$type . '_checked'] = array(
+      ];
+      $form[$type . '_checked'] = [
         '#type' => $type,
         '#title' => $type . ' (checked)',
         '#return_value' => 1,
         '#default_value' => 1,
         '#test_hijack_value' => NULL,
         '#disabled' => TRUE,
-      );
+      ];
     }
 
     // Weight, number, range.
-    foreach (array('weight', 'number', 'range') as $type) {
-      $form[$type] = array(
+    foreach (['weight', 'number', 'range'] as $type) {
+      $form[$type] = [
         '#type' => $type,
         '#title' => $type,
         '#default_value' => 10,
         '#test_hijack_value' => 5,
         '#disabled' => TRUE,
-      );
+      ];
     }
 
     // Color.
-    $form['color'] = array(
+    $form['color'] = [
       '#type' => 'color',
       '#title' => 'color',
       '#default_value' => '#0000ff',
       '#test_hijack_value' => '#ff0000',
       '#disabled' => TRUE,
-    );
+    ];
 
     // The #disabled state should propagate to children.
-    $form['disabled_container'] = array(
+    $form['disabled_container'] = [
       '#disabled' => TRUE,
-    );
-    foreach (array('textfield', 'textarea', 'hidden', 'tel', 'url') as $type) {
-      $form['disabled_container']['disabled_container_' . $type] = array(
+    ];
+    foreach (['textfield', 'textarea', 'hidden', 'tel', 'url'] as $type) {
+      $form['disabled_container']['disabled_container_' . $type] = [
         '#type' => $type,
         '#title' => $type,
         '#default_value' => $type,
         '#test_hijack_value' => 'HIJACK',
-      );
+      ];
     }
 
     // Date.
@@ -128,103 +128,103 @@ class FormTestDisabledElementsForm extends FormBase {
     // versions by encoding and decoding it again instead of hardcoding it.
     // See https://github.com/php/php-src/commit/fdb2709dd27c5987c2d2c8aaf0cdbebf9f17f643
     $expected = json_decode(json_encode($date), TRUE);
-    $form['disabled_container']['disabled_container_datetime'] = array(
+    $form['disabled_container']['disabled_container_datetime'] = [
       '#type' => 'datetime',
       '#title' => 'datetime',
       '#default_value' => $date,
       '#expected_value' => $expected,
       '#test_hijack_value' => new DrupalDateTime('1978-12-02 11:30:00', 'Europe/Berlin'),
       '#date_timezone' => 'Europe/Berlin',
-    );
+    ];
 
-    $form['disabled_container']['disabled_container_date'] = array(
+    $form['disabled_container']['disabled_container_date'] = [
       '#type' => 'date',
       '#title' => 'date',
       '#default_value' => '2001-01-13',
       '#expected_value' => '2001-01-13',
       '#test_hijack_value' => '2013-01-01',
       '#date_timezone' => 'Europe/Berlin',
-    );
+    ];
 
 
     // Try to hijack the email field with a valid email.
-    $form['disabled_container']['disabled_container_email'] = array(
+    $form['disabled_container']['disabled_container_email'] = [
       '#type' => 'email',
       '#title' => 'email',
       '#default_value' => 'foo@example.com',
       '#test_hijack_value' => 'bar@example.com',
-    );
+    ];
 
     // Try to hijack the URL field with a valid URL.
-    $form['disabled_container']['disabled_container_url'] = array(
+    $form['disabled_container']['disabled_container_url'] = [
       '#type' => 'url',
       '#title' => 'url',
       '#default_value' => 'http://example.com',
       '#test_hijack_value' => 'http://example.com/foo',
-    );
+    ];
 
     // Text format.
-    $form['text_format'] = array(
+    $form['text_format'] = [
       '#type' => 'text_format',
       '#title' => 'Text format',
       '#disabled' => TRUE,
       '#default_value' => 'Text value',
       '#format' => 'plain_text',
-      '#expected_value' => array(
+      '#expected_value' => [
         'value' => 'Text value',
         'format' => 'plain_text',
-      ),
-      '#test_hijack_value' => array(
+      ],
+      '#test_hijack_value' => [
         'value' => 'HIJACK',
         'format' => 'filtered_html',
-      ),
-    );
+      ],
+    ];
 
     // Password fields.
-    $form['password'] = array(
+    $form['password'] = [
       '#type' => 'password',
       '#title' => 'Password',
       '#disabled' => TRUE,
-    );
-    $form['password_confirm'] = array(
+    ];
+    $form['password_confirm'] = [
       '#type' => 'password_confirm',
       '#title' => 'Password confirm',
       '#disabled' => TRUE,
-    );
+    ];
 
     // Files.
-    $form['file'] = array(
+    $form['file'] = [
       '#type' => 'file',
       '#title' => 'File',
       '#disabled' => TRUE,
-    );
-    $form['managed_file'] = array(
+    ];
+    $form['managed_file'] = [
       '#type' => 'managed_file',
       '#title' => 'Managed file',
       '#disabled' => TRUE,
-    );
+    ];
 
     // Buttons.
-    $form['image_button'] = array(
+    $form['image_button'] = [
       '#type' => 'image_button',
       '#value' => 'Image button',
       '#disabled' => TRUE,
-    );
-    $form['button'] = array(
+    ];
+    $form['button'] = [
       '#type' => 'button',
       '#value' => 'Button',
       '#disabled' => TRUE,
-    );
-    $form['submit_disabled'] = array(
+    ];
+    $form['submit_disabled'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
       '#disabled' => TRUE,
-    );
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestEmailForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestEmailForm.php
index d669515a5..8e82623db 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestEmailForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestEmailForm.php
@@ -22,21 +22,21 @@ class FormTestEmailForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['email'] = array(
+    $form['email'] = [
       '#type' => 'email',
       '#title' => 'Email address',
       '#description' => 'An email address.',
-    );
-    $form['email_required'] = array(
+    ];
+    $form['email_required'] = [
       '#type' => 'email',
       '#title' => 'Address',
       '#required' => TRUE,
       '#description' => 'A required email address field.',
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestEmptySelectForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestEmptySelectForm.php
index b6f945459..14dcb0c33 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestEmptySelectForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestEmptySelectForm.php
@@ -21,12 +21,12 @@ class FormTestEmptySelectForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['empty_select'] = array(
+    $form['empty_select'] = [
       '#type' => 'select',
       '#title' => t('Empty Select'),
       '#multiple' => FALSE,
       '#options' => NULL,
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestFormStateValuesCleanAdvancedForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestFormStateValuesCleanAdvancedForm.php
index d3cbd5206..f910469bd 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestFormStateValuesCleanAdvancedForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestFormStateValuesCleanAdvancedForm.php
@@ -22,16 +22,16 @@ class FormTestFormStateValuesCleanAdvancedForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     // Build an example form containing a managed file and a submit form element.
-    $form['image'] = array(
+    $form['image'] = [
       '#type' => 'managed_file',
       '#title' => t('Image'),
       '#upload_location' => 'public://',
       '#default_value' => 0,
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestFormStateValuesCleanForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestFormStateValuesCleanForm.php
index bef567524..d5e0fd965 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestFormStateValuesCleanForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestFormStateValuesCleanForm.php
@@ -24,13 +24,13 @@ class FormTestFormStateValuesCleanForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     // Build an example form containing multiple submit and button elements; not
     // only on the top-level.
-    $form = array('#tree' => TRUE);
-    $form['foo'] = array('#type' => 'submit', '#value' => t('Submit'));
-    $form['bar'] = array('#type' => 'submit', '#value' => t('Submit'));
-    $form['beer'] = array('#type' => 'value', '#value' => 1000);
-    $form['baz']['foo'] = array('#type' => 'button', '#value' => t('Submit'));
-    $form['baz']['baz'] = array('#type' => 'submit', '#value' => t('Submit'));
-    $form['baz']['beer'] = array('#type' => 'value', '#value' => 2000);
+    $form = ['#tree' => TRUE];
+    $form['foo'] = ['#type' => 'submit', '#value' => t('Submit')];
+    $form['bar'] = ['#type' => 'submit', '#value' => t('Submit')];
+    $form['beer'] = ['#type' => 'value', '#value' => 1000];
+    $form['baz']['foo'] = ['#type' => 'button', '#value' => t('Submit')];
+    $form['baz']['baz'] = ['#type' => 'submit', '#value' => t('Submit')];
+    $form['baz']['beer'] = ['#type' => 'value', '#value' => 2000];
 
     // Add an arbitrary element and manually set it to be cleaned.
     // Using $form_state->addCleanValueKey('wine'); didn't work here.
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupContainerForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupContainerForm.php
index a9298efdd..b141b7cc2 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupContainerForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupContainerForm.php
@@ -21,19 +21,19 @@ class FormTestGroupContainerForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['container'] = array(
+    $form['container'] = [
       '#type' => 'container',
-    );
-    $form['meta'] = array(
+    ];
+    $form['meta'] = [
       '#type' => 'details',
       '#title' => 'Group element',
       '#open' => TRUE,
       '#group' => 'container',
-    );
-    $form['meta']['element'] = array(
+    ];
+    $form['meta']['element'] = [
       '#type' => 'textfield',
       '#title' => 'Nest in details element',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupDetailsForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupDetailsForm.php
index faa83cce9..002b07dd7 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupDetailsForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupDetailsForm.php
@@ -21,22 +21,22 @@ class FormTestGroupDetailsForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, $required = FALSE) {
-    $form['details'] = array(
+    $form['details'] = [
       '#type' => 'details',
       '#title' => 'Root element',
       '#open' => TRUE,
       '#required' => !empty($required),
-    );
-    $form['meta'] = array(
+    ];
+    $form['meta'] = [
       '#type' => 'details',
       '#title' => 'Group element',
       '#open' => TRUE,
       '#group' => 'details',
-    );
-    $form['meta']['element'] = array(
+    ];
+    $form['meta']['element'] = [
       '#type' => 'textfield',
       '#title' => 'Nest in details element',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupFieldsetForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupFieldsetForm.php
index fd7d83b8c..37ef246ec 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupFieldsetForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupFieldsetForm.php
@@ -21,20 +21,20 @@ class FormTestGroupFieldsetForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, $required = FALSE) {
-    $form['fieldset'] = array(
+    $form['fieldset'] = [
       '#type' => 'fieldset',
       '#title' => 'Fieldset',
       '#required' => !empty($required),
-    );
-    $form['meta'] = array(
+    ];
+    $form['meta'] = [
       '#type' => 'container',
       '#title' => 'Group element',
       '#group' => 'fieldset',
-    );
-    $form['meta']['element'] = array(
+    ];
+    $form['meta']['element'] = [
       '#type' => 'textfield',
       '#title' => 'Nest in container element',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupVerticalTabsForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupVerticalTabsForm.php
index 842ae9d0c..2d2f98bdf 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupVerticalTabsForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupVerticalTabsForm.php
@@ -21,27 +21,27 @@ class FormTestGroupVerticalTabsForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['vertical_tabs'] = array(
+    $form['vertical_tabs'] = [
       '#type' => 'vertical_tabs',
-    );
-    $form['meta'] = array(
+    ];
+    $form['meta'] = [
       '#type' => 'details',
       '#title' => 'First group element',
       '#group' => 'vertical_tabs',
-    );
-    $form['meta']['element'] = array(
+    ];
+    $form['meta']['element'] = [
       '#type' => 'textfield',
       '#title' => 'First nested element in details element',
-    );
-    $form['meta_2'] = array(
+    ];
+    $form['meta_2'] = [
       '#type' => 'details',
       '#title' => 'Second group element',
       '#group' => 'vertical_tabs',
-    );
-    $form['meta_2']['element_2'] = array(
+    ];
+    $form['meta_2']['element_2'] = [
       '#type' => 'textfield',
       '#title' => 'Second nested element in details element',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestInputForgeryForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestInputForgeryForm.php
index 2eeaf7f41..c8a82c88b 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestInputForgeryForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestInputForgeryForm.php
@@ -21,18 +21,18 @@ class FormTestInputForgeryForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     // For testing that a user can't submit a value not matching one of the
     // allowed options.
-    $form['checkboxes'] = array(
+    $form['checkboxes'] = [
       '#title' => t('Checkboxes'),
       '#type' => 'checkboxes',
-      '#options' => array(
+      '#options' => [
         'one' => 'One',
         'two' => 'Two',
-      ),
-    );
-    $form['submit'] = array(
+      ],
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLabelForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLabelForm.php
index 1adaa18c1..74c92ab61 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLabelForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLabelForm.php
@@ -21,108 +21,108 @@ class FormTestLabelForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['form_checkboxes_test'] = array(
+    $form['form_checkboxes_test'] = [
       '#type' => 'checkboxes',
       '#title' => t('Checkboxes test'),
-      '#options' => array(
+      '#options' => [
         'first-checkbox' => t('First checkbox'),
         'second-checkbox' => t('Second checkbox'),
         'third-checkbox' => t('Third checkbox'),
         '0' => t('0'),
-      ),
-    );
-    $form['form_radios_test'] = array(
+      ],
+    ];
+    $form['form_radios_test'] = [
       '#type' => 'radios',
       '#title' => t('Radios test'),
-      '#options' => array(
+      '#options' => [
         'first-radio' => t('First radio'),
         'second-radio' => t('Second radio'),
         'third-radio' => t('Third radio'),
         '0' => t('0'),
-      ),
+      ],
       // Test #field_prefix and #field_suffix placement.
       '#field_prefix' => '<span id="form-test-radios-field-prefix">' . t('Radios #field_prefix element') . '</span>',
       '#field_suffix' => '<span id="form-test-radios-field-suffix">' . t('Radios #field_suffix element') . '</span>',
-    );
-    $form['form_checkbox_test'] = array(
+    ];
+    $form['form_checkbox_test'] = [
       '#type' => 'checkbox',
       '#title' => t('Checkbox test'),
-    );
-    $form['form_textfield_test_title_and_required'] = array(
+    ];
+    $form['form_textfield_test_title_and_required'] = [
       '#type' => 'textfield',
       '#title' => t('Textfield test for required with title'),
       '#required' => TRUE,
-    );
-    $form['form_textfield_test_no_title_required'] = array(
+    ];
+    $form['form_textfield_test_no_title_required'] = [
       '#type' => 'textfield',
       // We use an empty title, since not setting #title suppresses the label
       // and required marker.
       '#title' => '',
       '#required' => TRUE,
-    );
-    $form['form_textfield_test_title'] = array(
+    ];
+    $form['form_textfield_test_title'] = [
       '#type' => 'textfield',
       '#title' => t('Textfield test for title only'),
       // Not required.
       // Test #prefix and #suffix placement.
       '#prefix' => '<div id="form-test-textfield-title-prefix">' . t('Textfield #prefix element') . '</div>',
       '#suffix' => '<div id="form-test-textfield-title-suffix">' . t('Textfield #suffix element') . '</div>',
-    );
-    $form['form_textfield_test_title_after'] = array(
+    ];
+    $form['form_textfield_test_title_after'] = [
       '#type' => 'textfield',
       '#title' => t('Textfield test for title after element'),
       '#title_display' => 'after',
-    );
-    $form['form_textfield_test_title_invisible'] = array(
+    ];
+    $form['form_textfield_test_title_invisible'] = [
       '#type' => 'textfield',
       '#title' => t('Textfield test for invisible title'),
       '#title_display' => 'invisible',
-    );
+    ];
     // Textfield test for title set not to display.
-    $form['form_textfield_test_title_no_show'] = array(
+    $form['form_textfield_test_title_no_show'] = [
       '#type' => 'textfield',
-    );
+    ];
     // Checkboxes & radios with title as attribute.
-    $form['form_checkboxes_title_attribute'] = array(
+    $form['form_checkboxes_title_attribute'] = [
       '#type' => 'checkboxes',
       '#title' => 'Checkboxes test',
       '#title_display' => 'attribute',
-      '#options' => array(
+      '#options' => [
         'first-checkbox' => 'First checkbox',
         'second-checkbox' => 'Second checkbox',
-      ),
+      ],
       '#required' => TRUE,
-    );
-    $form['form_radios_title_attribute'] = array(
+    ];
+    $form['form_radios_title_attribute'] = [
       '#type' => 'radios',
       '#title' => 'Radios test',
       '#title_display' => 'attribute',
-      '#options' => array(
+      '#options' => [
         'first-radio' => 'First radio',
         'second-radio' => 'Second radio',
-      ),
+      ],
       '#required' => TRUE,
-    );
-    $form['form_checkboxes_title_invisible'] = array(
+    ];
+    $form['form_checkboxes_title_invisible'] = [
       '#type' => 'checkboxes',
       '#title' => 'Checkboxes test invisible',
       '#title_display' => 'invisible',
-      '#options' => array(
+      '#options' => [
         'first-checkbox' => 'First checkbox',
         'second-checkbox' => 'Second checkbox',
-      ),
+      ],
       '#required' => TRUE,
-    );
-    $form['form_radios_title_invisible'] = array(
+    ];
+    $form['form_radios_title_invisible'] = [
       '#type' => 'radios',
       '#title' => 'Radios test invisible',
       '#title_display' => 'invisible',
-      '#options' => array(
+      '#options' => [
         'first-radio' => 'First radio',
         'second-radio' => 'Second radio',
-      ),
+      ],
       '#required' => TRUE,
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLanguageSelectForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLanguageSelectForm.php
index 047945041..ba41e19fe 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLanguageSelectForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLanguageSelectForm.php
@@ -23,38 +23,38 @@ class FormTestLanguageSelectForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['languages_all'] = array(
+    $form['languages_all'] = [
       '#title' => t('Languages: All'),
       '#type' => 'language_select',
       '#languages' => LanguageInterface::STATE_ALL,
       '#default_value' => 'xx',
-    );
-    $form['languages_configurable'] = array(
+    ];
+    $form['languages_configurable'] = [
       '#title' => t('Languages: Configurable'),
       '#type' => 'language_select',
       '#languages' => LanguageInterface::STATE_CONFIGURABLE,
       '#default_value' => 'en',
-    );
-    $form['languages_locked'] = array(
+    ];
+    $form['languages_locked'] = [
       '#title' => t('Languages: Locked'),
       '#type' => 'language_select',
       '#languages' => LanguageInterface::STATE_LOCKED,
-    );
-    $form['languages_config_and_locked'] = array(
+    ];
+    $form['languages_config_and_locked'] = [
       '#title' => t('Languages: Configurable and locked'),
       '#type' => 'language_select',
       '#languages' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_LOCKED,
       '#default_value' => 'dummy_value',
-    );
-    $form['language_custom_options'] = array(
+    ];
+    $form['language_custom_options'] = [
       '#title' => t('Languages: Custom'),
       '#type' => 'language_select',
       '#languages' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_LOCKED,
-      '#options' => array('opt1' => 'First option', 'opt2' => 'Second option', 'opt3' => 'Third option'),
+      '#options' => ['opt1' => 'First option', 'opt2' => 'Second option', 'opt3' => 'Third option'],
       '#default_value' => 'opt2',
-    );
+    ];
 
-    $form['submit'] = array('#type' => 'submit', '#value' => 'Submit');
+    $form['submit'] = ['#type' => 'submit', '#value' => 'Submit'];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLimitValidationErrorsForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLimitValidationErrorsForm.php
index 2cb22936a..deff0b49d 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLimitValidationErrorsForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestLimitValidationErrorsForm.php
@@ -21,62 +21,62 @@ class FormTestLimitValidationErrorsForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['title'] = array(
+    $form['title'] = [
       '#type' => 'textfield',
       '#title' => 'Title',
       '#required' => TRUE,
-    );
+    ];
 
-    $form['test'] = array(
+    $form['test'] = [
       '#title' => 'Test',
       '#type' => 'textfield',
-      '#element_validate' => array('::elementValidateLimitValidationErrors'),
-    );
-    $form['test_numeric_index'] = array(
+      '#element_validate' => ['::elementValidateLimitValidationErrors'],
+    ];
+    $form['test_numeric_index'] = [
       '#tree' => TRUE,
-    );
-    $form['test_numeric_index'][0] = array(
+    ];
+    $form['test_numeric_index'][0] = [
       '#title' => 'Test (numeric index)',
       '#type' => 'textfield',
-      '#element_validate' => array('::elementValidateLimitValidationErrors'),
-    );
+      '#element_validate' => ['::elementValidateLimitValidationErrors'],
+    ];
 
-    $form['test_substring'] = array(
+    $form['test_substring'] = [
       '#tree' => TRUE,
-    );
-    $form['test_substring']['foo'] = array(
+    ];
+    $form['test_substring']['foo'] = [
       '#title' => 'Test (substring) foo',
       '#type' => 'textfield',
-      '#element_validate' => array('::elementValidateLimitValidationErrors'),
-    );
-    $form['test_substring']['foobar'] = array(
+      '#element_validate' => ['::elementValidateLimitValidationErrors'],
+    ];
+    $form['test_substring']['foobar'] = [
       '#title' => 'Test (substring) foobar',
       '#type' => 'textfield',
-      '#element_validate' => array('::elementValidateLimitValidationErrors'),
-    );
+      '#element_validate' => ['::elementValidateLimitValidationErrors'],
+    ];
 
-    $form['actions']['partial'] = array(
+    $form['actions']['partial'] = [
       '#type' => 'submit',
-      '#limit_validation_errors' => array(array('test')),
-      '#submit' => array('::partialSubmitForm'),
+      '#limit_validation_errors' => [['test']],
+      '#submit' => ['::partialSubmitForm'],
       '#value' => t('Partial validate'),
-    );
-    $form['actions']['partial_numeric_index'] = array(
+    ];
+    $form['actions']['partial_numeric_index'] = [
       '#type' => 'submit',
-      '#limit_validation_errors' => array(array('test_numeric_index', 0)),
-      '#submit' => array('::partialSubmitForm'),
+      '#limit_validation_errors' => [['test_numeric_index', 0]],
+      '#submit' => ['::partialSubmitForm'],
       '#value' => t('Partial validate (numeric index)'),
-    );
-    $form['actions']['substring'] = array(
+    ];
+    $form['actions']['substring'] = [
       '#type' => 'submit',
-      '#limit_validation_errors' => array(array('test_substring', 'foo')),
-      '#submit' => array('::partialSubmitForm'),
+      '#limit_validation_errors' => [['test_substring', 'foo']],
+      '#submit' => ['::partialSubmitForm'],
       '#value' => t('Partial validate (substring)'),
-    );
-    $form['actions']['full'] = array(
+    ];
+    $form['actions']['full'] = [
       '#type' => 'submit',
       '#value' => t('Full validate'),
-    );
+    ];
     return $form;
   }
 
@@ -85,7 +85,7 @@ class FormTestLimitValidationErrorsForm extends FormBase {
    */
   public function elementValidateLimitValidationErrors($element, FormStateInterface $form_state) {
     if ($element['#value'] == 'invalid') {
-      $form_state->setError($element, t('@label element is invalid', array('@label' => $element['#title'])));
+      $form_state->setError($element, t('@label element is invalid', ['@label' => $element['#title']]));
     }
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestNumberForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestNumberForm.php
index 6b9520bff..ab281462e 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestNumberForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestNumberForm.php
@@ -21,114 +21,114 @@ class FormTestNumberForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, $element = 'number') {
-    $base = array(
+    $base = [
       '#type' => $element,
-    );
+    ];
 
-    $form['integer_no_number'] = $base + array(
+    $form['integer_no_number'] = $base + [
       '#title' => 'Integer test, #no_error',
       '#default_value' => '#no_number',
-    );
-    $form['integer_no_step'] = $base + array(
+    ];
+    $form['integer_no_step'] = $base + [
       '#title' => 'Integer test without step',
       '#default_value' => 5,
-    );
-    $form['integer_no_step_step_error'] = $base + array(
+    ];
+    $form['integer_no_step_step_error'] = $base + [
       '#title' => 'Integer test without step, #step_error',
       '#default_value' => 4.5,
-    );
-    $form['integer_step'] = $base + array(
+    ];
+    $form['integer_step'] = $base + [
       '#title' => 'Integer test with step',
       '#default_value' => 5,
       '#step' => 1,
-    );
-    $form['integer_step_error'] = $base + array(
+    ];
+    $form['integer_step_error'] = $base + [
       '#title' => 'Integer test, with step, #step_error',
       '#default_value' => 5,
       '#step' => 2,
-    );
-    $form['integer_step_min'] = $base + array(
+    ];
+    $form['integer_step_min'] = $base + [
       '#title' => 'Integer test with min value',
       '#default_value' => 5,
       '#min' => 0,
       '#step' => 1,
-    );
-    $form['integer_step_min_error'] = $base + array(
+    ];
+    $form['integer_step_min_error'] = $base + [
       '#title' => 'Integer test with min value, #min_error',
       '#default_value' => 5,
       '#min' => 6,
       '#step' => 1,
-    );
-    $form['integer_step_max'] = $base + array(
+    ];
+    $form['integer_step_max'] = $base + [
       '#title' => 'Integer test with max value',
       '#default_value' => 5,
       '#max' => 6,
       '#step' => 1,
-    );
-    $form['integer_step_max_error'] = $base + array(
+    ];
+    $form['integer_step_max_error'] = $base + [
       '#title' => 'Integer test with max value, #max_error',
       '#default_value' => 5,
       '#max' => 4,
       '#step' => 1,
-    );
-    $form['integer_step_min_border'] = $base + array(
+    ];
+    $form['integer_step_min_border'] = $base + [
       '#title' => 'Integer test with min border check',
       '#default_value' => -1,
       '#min' => -1,
       '#step' => 1,
-    );
-    $form['integer_step_max_border'] = $base + array(
+    ];
+    $form['integer_step_max_border'] = $base + [
       '#title' => 'Integer test with max border check',
       '#default_value' => 5,
       '#max' => 5,
       '#step' => 1,
-    );
-    $form['integer_step_based_on_min'] = $base + array(
+    ];
+    $form['integer_step_based_on_min'] = $base + [
       '#title' => 'Integer test with step based on min check',
       '#default_value' => 3,
       '#min' => -1,
       '#step' => 2,
-    );
-    $form['integer_step_based_on_min_error'] = $base + array(
+    ];
+    $form['integer_step_based_on_min_error'] = $base + [
       '#title' => 'Integer test with step based on min check, #step_error',
       '#default_value' => 4,
       '#min' => -1,
       '#step' => 2,
-    );
-    $form['float_small_step'] = $base + array(
+    ];
+    $form['float_small_step'] = $base + [
       '#title' => 'Float test with a small step',
       '#default_value' => 4,
       '#step' => 0.0000000000001,
-    );
-    $form['float_step_no_error'] = $base + array(
+    ];
+    $form['float_step_no_error'] = $base + [
       '#title' => 'Float test',
       '#default_value' => 1.2,
       '#step' => 0.3,
-    );
-    $form['float_step_error'] = $base + array(
+    ];
+    $form['float_step_error'] = $base + [
       '#title' => 'Float test, #step_error',
       '#default_value' => 1.3,
       '#step' => 0.3,
-    );
-    $form['float_step_hard_no_error'] = $base + array(
+    ];
+    $form['float_step_hard_no_error'] = $base + [
       '#title' => 'Float test hard',
       '#default_value' => 0.9411764729088,
       '#step' => 0.00392156863712,
-    );
-    $form['float_step_hard_error'] = $base + array(
+    ];
+    $form['float_step_hard_error'] = $base + [
       '#title' => 'Float test hard, #step_error',
       '#default_value' => 0.9411764,
       '#step' => 0.00392156863,
-    );
-    $form['float_step_any_no_error'] = $base + array(
+    ];
+    $form['float_step_any_no_error'] = $base + [
       '#title' => 'Arbitrary float',
       '#default_value' => 0.839562930284,
       '#step' => 'aNy',
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPatternForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPatternForm.php
index 578017266..9180628b1 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPatternForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPatternForm.php
@@ -21,34 +21,34 @@ class FormTestPatternForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['textfield'] = array(
+    $form['textfield'] = [
       '#type' => 'textfield',
       '#title' => 'One digit followed by lowercase letters',
       '#pattern' => '[0-9][a-z]+',
-    );
-    $form['tel'] = array(
+    ];
+    $form['tel'] = [
       '#type' => 'tel',
       '#title' => 'Everything except numbers',
       '#pattern' => '[^\d]*',
-    );
-    $form['password'] = array(
+    ];
+    $form['password'] = [
       '#type' => 'password',
       '#title' => 'Password',
       '#pattern' => '[01]+',
-    );
-    $form['url'] = array(
+    ];
+    $form['url'] = [
       '#type' => 'url',
       '#title' => 'Client side validation',
       '#decription' => 'Just client side validation, using the #pattern attribute.',
-      '#attributes' => array(
+      '#attributes' => [
         'pattern' => '.*foo.*',
-      ),
+      ],
       '#pattern' => 'ignored',
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPlaceholderForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPlaceholderForm.php
index 21a50ff9f..9dd53219f 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPlaceholderForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPlaceholderForm.php
@@ -21,12 +21,12 @@ class FormTestPlaceholderForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    foreach (array('textfield', 'textarea', 'url', 'password', 'search', 'tel', 'email', 'number') as $type) {
-      $form[$type] = array(
+    foreach (['textfield', 'textarea', 'url', 'password', 'search', 'tel', 'email', 'number'] as $type) {
+      $form[$type] = [
         '#type' => $type,
         '#title' => $type,
         '#placeholder' => 'placeholder-text',
-      );
+      ];
     }
 
     return $form;
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestProgrammaticForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestProgrammaticForm.php
index 1e7a0146c..66928f04f 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestProgrammaticForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestProgrammaticForm.php
@@ -21,61 +21,61 @@ class FormTestProgrammaticForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['textfield'] = array(
+    $form['textfield'] = [
       '#title' => 'Textfield',
       '#type' => 'textfield',
-    );
+    ];
 
-    $form['checkboxes'] = array(
+    $form['checkboxes'] = [
       '#title' => t('Checkboxes'),
       '#type' => 'checkboxes',
-      '#options' => array(
+      '#options' => [
         1 => 'First checkbox',
         2 => 'Second checkbox',
-      ),
+      ],
       // Both checkboxes are selected by default so that we can test the ability
       // of programmatic form submissions to uncheck them.
-      '#default_value' => array(1, 2),
-    );
+      '#default_value' => [1, 2],
+    ];
 
-    $form['field_to_validate'] = array(
+    $form['field_to_validate'] = [
       '#type' => 'radios',
       '#title' => 'Field to validate (in the case of limited validation)',
       '#description' => 'If the form is submitted by clicking the "Submit with limited validation" button, then validation can be limited based on the value of this radio button.',
-      '#options' => array(
+      '#options' => [
         'all' => 'Validate all fields',
         'textfield' => 'Validate the "Textfield" field',
         'field_to_validate' => 'Validate the "Field to validate" field',
-      ),
+      ],
       '#default_value' => 'all',
-    );
+    ];
 
-    $form['field_restricted'] = array(
+    $form['field_restricted'] = [
       '#type' => 'textfield',
       '#title' => 'Textfield (no access)',
       '#access' => FALSE,
-    );
+    ];
 
     // The main submit button for the form.
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     // A secondary submit button that allows validation to be limited based on
     // the value of the above radio selector.
-    $form['submit_limit_validation'] = array(
+    $form['submit_limit_validation'] = [
       '#type' => 'submit',
       '#value' => 'Submit with limited validation',
       // Use the same submit handler for this button as for the form itself.
       // (This must be set explicitly or otherwise the form API will ignore the
       // #limit_validation_errors property.)
-      '#submit' => array('::submitForm'),
-    );
+      '#submit' => ['::submitForm'],
+    ];
     $user_input = $form_state->getUserInput();
     if (!empty($user_input['field_to_validate']) && $user_input['field_to_validate'] != 'all') {
-      $form['submit_limit_validation']['#limit_validation_errors'] = array(
-        array($user_input['field_to_validate']),
-      );
+      $form['submit_limit_validation']['#limit_validation_errors'] = [
+        [$user_input['field_to_validate']],
+      ];
     }
 
     return $form;
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRangeForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRangeForm.php
index 25cdc3e46..94240e5e9 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRangeForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRangeForm.php
@@ -22,7 +22,7 @@ class FormTestRangeForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['with_default_value'] = array(
+    $form['with_default_value'] = [
       '#type' => 'range',
       '#title' => 'Range with default value',
       '#min' => 10,
@@ -30,34 +30,34 @@ class FormTestRangeForm extends FormBase {
       '#step' => 2,
       '#default_value' => 18,
       '#description' => 'The default value is 18.',
-    );
-    $form['float'] = array(
+    ];
+    $form['float'] = [
       '#type' => 'range',
       '#title' => 'Float',
       '#min' => 10,
       '#max' => 11,
       '#step' => 'any',
       '#description' => 'Floating point number between 10 and 11.',
-    );
-    $form['integer'] = array(
+    ];
+    $form['integer'] = [
       '#type' => 'range',
       '#title' => 'Integer',
       '#min' => 2,
       '#max' => 8,
       '#step' => 2,
       '#description' => 'Even integer between 2 and 8.',
-    );
-    $form['offset'] = array(
+    ];
+    $form['offset'] = [
       '#type' => 'range',
       '#title' => 'Offset',
       '#min' => 2.9,
       '#max' => 10.9,
       '#description' => 'Value between 2.9 and 10.9.',
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRangeInvalidForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRangeInvalidForm.php
index 49bb0b9bb..541520585 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRangeInvalidForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRangeInvalidForm.php
@@ -21,17 +21,17 @@ class FormTestRangeInvalidForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['minmax'] = array(
+    $form['minmax'] = [
       '#type' => 'range',
       '#min' => 10,
       '#max' => 5,
       '#title' => 'Invalid range',
       '#description' => 'Minimum greater than maximum.',
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRebuildPreserveValuesForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRebuildPreserveValuesForm.php
index d0d520ec9..58934a781 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRebuildPreserveValuesForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRebuildPreserveValuesForm.php
@@ -23,58 +23,58 @@ class FormTestRebuildPreserveValuesForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     // Start the form with two checkboxes, to test different defaults, and a
     // textfield, to test more than one element type.
-    $form = array(
-      'checkbox_1_default_off' => array(
+    $form = [
+      'checkbox_1_default_off' => [
         '#type' => 'checkbox',
         '#title' => t('This checkbox defaults to unchecked'),
         '#default_value' => FALSE,
-      ),
-      'checkbox_1_default_on' => array(
+      ],
+      'checkbox_1_default_on' => [
         '#type' => 'checkbox',
         '#title' => t('This checkbox defaults to checked'),
         '#default_value' => TRUE,
-      ),
-      'text_1' => array(
+      ],
+      'text_1' => [
         '#type' => 'textfield',
         '#title' => t('This textfield has a non-empty default value.'),
         '#default_value' => 'DEFAULT 1',
-      ),
-    );
+      ],
+    ];
     // Provide an 'add more' button that rebuilds the form with an additional two
     // checkboxes and a textfield. The test is to make sure that the rebuild
     // triggered by this button preserves the user input values for the initial
     // elements and initializes the new elements with the correct default values.
     if (!$form_state->has('add_more')) {
-      $form['add_more'] = array(
+      $form['add_more'] = [
         '#type' => 'submit',
         '#value' => 'Add more',
-        '#submit' => array('::addMoreSubmitForm'),
-      );
+        '#submit' => ['::addMoreSubmitForm'],
+      ];
     }
     else {
-      $form += array(
-        'checkbox_2_default_off' => array(
+      $form += [
+        'checkbox_2_default_off' => [
           '#type' => 'checkbox',
           '#title' => t('This checkbox defaults to unchecked'),
           '#default_value' => FALSE,
-        ),
-        'checkbox_2_default_on' => array(
+        ],
+        'checkbox_2_default_on' => [
           '#type' => 'checkbox',
           '#title' => t('This checkbox defaults to checked'),
           '#default_value' => TRUE,
-        ),
-        'text_2' => array(
+        ],
+        'text_2' => [
           '#type' => 'textfield',
           '#title' => t('This textfield has a non-empty default value.'),
           '#default_value' => 'DEFAULT 2',
-        ),
-      );
+        ],
+      ];
     }
     // A submit button that finishes the form workflow (does not rebuild).
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     return $form;
   }
 
@@ -92,7 +92,7 @@ class FormTestRebuildPreserveValuesForm extends FormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     // Finish the workflow. Do not rebuild.
-    drupal_set_message(t('Form values: %values', array('%values' => var_export($form_state->getValues(), TRUE))));
+    drupal_set_message(t('Form values: %values', ['%values' => var_export($form_state->getValues(), TRUE)]));
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRedirectForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRedirectForm.php
index c540fb755..4768acf90 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRedirectForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRedirectForm.php
@@ -22,23 +22,23 @@ class FormTestRedirectForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['redirection'] = array(
+    $form['redirection'] = [
       '#type' => 'checkbox',
       '#title' => t('Use redirection'),
-    );
-    $form['destination'] = array(
+    ];
+    $form['destination'] = [
       '#type' => 'textfield',
       '#title' => t('Redirect destination'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="redirection"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
-    $form['submit'] = array(
+      '#states' => [
+        'visible' => [
+          ':input[name="redirection"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRequiredAttributeForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRequiredAttributeForm.php
index f11c3caf2..b0aa1b00b 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRequiredAttributeForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestRequiredAttributeForm.php
@@ -21,17 +21,17 @@ class FormTestRequiredAttributeForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    foreach (array('textfield', 'textarea', 'password') as $type) {
-      $form[$type] = array(
+    foreach (['textfield', 'textarea', 'password'] as $type) {
+      $form[$type] = [
         '#type' => $type,
         '#required' => TRUE,
         '#title' => $type,
-      );
+      ];
     }
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestResponseForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestResponseForm.php
index 47bc1b998..0ab3a0d21 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestResponseForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestResponseForm.php
@@ -22,19 +22,19 @@ class FormTestResponseForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['content'] = array(
+    $form['content'] = [
       '#type' => 'textfield',
       '#title' => 'Content',
-    );
-    $form['status'] = array(
+    ];
+    $form['status'] = [
       '#type' => 'textfield',
       '#title' => 'Status',
       '#default_value' => 200,
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestSelectForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestSelectForm.php
index 76cdc1acb..20242ec2e 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestSelectForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestSelectForm.php
@@ -22,100 +22,100 @@ class FormTestSelectForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $base = array(
+    $base = [
       '#type' => 'select',
-      '#options' => array('one' => 'one', 'two' => 'two', 'three' => 'three', 'four' => '<strong>four</strong>'),
-    );
+      '#options' => ['one' => 'one', 'two' => 'two', 'three' => 'three', 'four' => '<strong>four</strong>'],
+    ];
 
-    $form['select'] = $base + array(
+    $form['select'] = $base + [
       '#title' => '#default_value one',
       '#default_value' => 'one',
-    );
-    $form['select_required'] = $base + array(
+    ];
+    $form['select_required'] = $base + [
       '#title' => '#default_value one, #required',
       '#required' => TRUE,
       '#default_value' => 'one',
-    );
-    $form['select_optional'] = $base + array(
+    ];
+    $form['select_optional'] = $base + [
       '#title' => '#default_value one, not #required',
       '#required' => FALSE,
       '#default_value' => 'one',
-    );
-    $form['empty_value'] = $base + array(
+    ];
+    $form['empty_value'] = $base + [
       '#title' => '#default_value one, #required, #empty_value 0',
       '#required' => TRUE,
       '#default_value' => 'one',
       '#empty_value' => 0,
-    );
-    $form['empty_value_one'] = $base + array(
+    ];
+    $form['empty_value_one'] = $base + [
       '#title' => '#default_value = #empty_value, #required',
       '#required' => TRUE,
       '#default_value' => 'one',
       '#empty_value' => 'one',
-    );
+    ];
 
-    $form['no_default'] = $base + array(
+    $form['no_default'] = $base + [
       '#title' => 'No #default_value, #required',
       '#required' => TRUE,
-    );
-    $form['no_default_optional'] = $base + array(
+    ];
+    $form['no_default_optional'] = $base + [
       '#title' => 'No #default_value, not #required',
       '#required' => FALSE,
       '#description' => 'Should result in "one" because it is not required and there is no #empty_value requested, so default browser behavior of preselecting first option is in effect.',
-    );
-    $form['no_default_optional_empty_value'] = $base + array(
+    ];
+    $form['no_default_optional_empty_value'] = $base + [
       '#title' => 'No #default_value, not #required, #empty_value empty string',
       '#empty_value' => '',
       '#required' => FALSE,
       '#description' => 'Should result in an empty string (due to #empty_value) because it is optional.',
-    );
+    ];
 
-    $form['no_default_empty_option'] = $base + array(
+    $form['no_default_empty_option'] = $base + [
       '#title' => 'No #default_value, #required, #empty_option',
       '#required' => TRUE,
       '#empty_option' => '- Choose -',
-    );
-    $form['no_default_empty_option_optional'] = $base + array(
+    ];
+    $form['no_default_empty_option_optional'] = $base + [
       '#title' => 'No #default_value, not #required, #empty_option',
       '#empty_option' => '- Dismiss -',
       '#description' => 'Should result in an empty string (default of #empty_value) because it is optional.',
-    );
+    ];
 
-    $form['no_default_empty_value'] = $base + array(
+    $form['no_default_empty_value'] = $base + [
       '#title' => 'No #default_value, #required, #empty_value 0',
       '#required' => TRUE,
       '#empty_value' => 0,
       '#description' => 'Should never result in 0.',
-    );
-    $form['no_default_empty_value_one'] = $base + array(
+    ];
+    $form['no_default_empty_value_one'] = $base + [
       '#title' => 'No #default_value, #required, #empty_value one',
       '#required' => TRUE,
       '#empty_value' => 'one',
       '#description' => 'A mistakenly assigned #empty_value contained in #options should not be valid.',
-    );
-    $form['no_default_empty_value_optional'] = $base + array(
+    ];
+    $form['no_default_empty_value_optional'] = $base + [
       '#title' => 'No #default_value, not #required, #empty_value 0',
       '#required' => FALSE,
       '#empty_value' => 0,
       '#description' => 'Should result in 0 because it is optional.',
-    );
+    ];
 
-    $form['multiple'] = $base + array(
+    $form['multiple'] = $base + [
       '#title' => '#multiple, #default_value two',
-      '#default_value' => array('two'),
+      '#default_value' => ['two'],
       '#multiple' => TRUE,
-    );
-    $form['multiple_no_default'] = $base + array(
+    ];
+    $form['multiple_no_default'] = $base + [
       '#title' => '#multiple, no #default_value',
       '#multiple' => TRUE,
-    );
-    $form['multiple_no_default_required'] = $base + array(
+    ];
+    $form['multiple_no_default_required'] = $base + [
       '#title' => '#multiple, #required, no #default_value',
       '#required' => TRUE,
       '#multiple' => TRUE,
-    );
+    ];
 
-    $form['submit'] = array('#type' => 'submit', '#value' => 'Submit');
+    $form['submit'] = ['#type' => 'submit', '#value' => 'Submit'];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStatePersistForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStatePersistForm.php
index 2640805cf..e34af83b1 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStatePersistForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStatePersistForm.php
@@ -21,18 +21,18 @@ class FormTestStatePersistForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['title'] = array(
+    $form['title'] = [
       '#type' => 'textfield',
       '#title' => 'title',
       '#default_value' => 'DEFAULT',
       '#required' => TRUE,
-    );
+    ];
     $form_state->set('value', 'State persisted.');
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php
index 948c592ce..f9ae07342 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php
@@ -28,7 +28,7 @@ class FormTestStorageForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     if ($form_state->isRebuilding()) {
-      $form_state->setUserInput(array());
+      $form_state->setUserInput([]);
     }
     // Initialize
     $storage = $form_state->getStorage();
@@ -50,32 +50,32 @@ class FormTestStorageForm extends FormBase {
     $_SESSION['constructions']++;
     drupal_set_message("Form constructions: " . $_SESSION['constructions']);
 
-    $form['title'] = array(
+    $form['title'] = [
       '#type' => 'textfield',
       '#title' => 'Title',
       '#default_value' => $storage['thing']['title'],
       '#required' => TRUE,
-    );
-    $form['value'] = array(
+    ];
+    $form['value'] = [
       '#type' => 'textfield',
       '#title' => 'Value',
       '#default_value' => $storage['thing']['value'],
-      '#element_validate' => array('::elementValidateValueCached'),
-    );
-    $form['continue_button'] = array(
+      '#element_validate' => ['::elementValidateValueCached'],
+    ];
+    $form['continue_button'] = [
       '#type' => 'button',
       '#value' => 'Reset',
       // Rebuilds the form without keeping the values.
-    );
-    $form['continue_submit'] = array(
+    ];
+    $form['continue_submit'] = [
       '#type' => 'submit',
       '#value' => 'Continue submit',
-      '#submit' => array('::continueSubmitForm'),
-    );
-    $form['submit'] = array(
+      '#submit' => ['::continueSubmitForm'],
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Save',
-    );
+    ];
 
     // @todo Remove this in https://www.drupal.org/node/2524408, because form
     //   cache immutability is no longer necessary, because we no longer cache
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
index e7abbfddc..f27e5e066 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
@@ -18,30 +18,30 @@ class FormTestStoragePageCacheForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['title'] = array(
+    $form['title'] = [
       '#type' => 'textfield',
       '#title' => 'Title',
       '#required' => TRUE,
-    );
+    ];
 
-    $form['test_build_id_old'] = array(
+    $form['test_build_id_old'] = [
       '#type' => 'item',
       '#title' => 'Old build id',
       '#markup' => 'No old build id',
-    );
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Save',
-    );
+    ];
 
-    $form['rebuild'] = array(
+    $form['rebuild'] = [
       '#type' => 'submit',
       '#value' => 'Rebuild',
-      '#submit' => array(array($this, 'form_test_storage_page_cache_rebuild')),
-    );
+      '#submit' => [[$this, 'form_test_storage_page_cache_rebuild']],
+    ];
 
-    $form['#after_build'] = array(array($this, 'form_test_storage_page_cache_old_build_id'));
+    $form['#after_build'] = [[$this, 'form_test_storage_page_cache_old_build_id']];
 
     return $form;
   }
@@ -49,7 +49,7 @@ class FormTestStoragePageCacheForm extends FormBase {
   /**
    * Form element #after_build callback: output the old form build-id.
    */
-  function form_test_storage_page_cache_old_build_id($form) {
+  public function form_test_storage_page_cache_old_build_id($form) {
     if (isset($form['#build_id_old'])) {
       $form['test_build_id_old']['#plain_text'] = $form['#build_id_old'];
     }
@@ -59,7 +59,7 @@ class FormTestStoragePageCacheForm extends FormBase {
   /**
    * Form submit callback: Rebuild the form and continue.
    */
-  function form_test_storage_page_cache_rebuild($form, FormStateInterface $form_state) {
+  public function form_test_storage_page_cache_rebuild($form, FormStateInterface $form_state) {
     $form_state->setRebuild();
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectColspanForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectColspanForm.php
index bae573ec1..1c9628bcf 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectColspanForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectColspanForm.php
@@ -20,20 +20,20 @@ class FormTestTableSelectColspanForm extends FormTestTableSelectFormBase {
     list($header, $options) = _form_test_tableselect_get_data();
 
     // Change the data so that the third column has colspan=2.
-    $header['three'] = array('data' => 'Three', 'colspan' => 2);
+    $header['three'] = ['data' => 'Three', 'colspan' => 2];
     unset($header['four']);
     // Set the each row so that column 3 is an array.
     foreach ($options as $name => $row) {
-      $options[$name]['three'] = array($row['three'], $row['four']);
+      $options[$name]['three'] = [$row['three'], $row['four']];
       unset($options[$name]['four']);
     }
     // Combine cells in row 3.
-    $options['row3']['one'] = array('data' => $options['row3']['one'], 'colspan' => 2);
+    $options['row3']['one'] = ['data' => $options['row3']['one'], 'colspan' => 2];
     unset($options['row3']['two']);
-    $options['row3']['three'] = array('data' => $options['row3']['three'][0], 'colspan' => 2);
+    $options['row3']['three'] = ['data' => $options['row3']['three'][0], 'colspan' => 2];
     unset($options['row3']['four']);
 
-    return $this->tableselectFormBuilder($form, $form_state, array('#header' => $header, '#options' => $options));
+    return $this->tableselectFormBuilder($form, $form_state, ['#header' => $header, '#options' => $options]);
   }
 
   /**
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectEmptyForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectEmptyForm.php
index d7954f15d..199a7d3e2 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectEmptyForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectEmptyForm.php
@@ -17,7 +17,7 @@ class FormTestTableSelectEmptyForm extends FormTestTableSelectFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    return $this->tableselectFormBuilder($form, $form_state, array('#options' => array()));
+    return $this->tableselectFormBuilder($form, $form_state, ['#options' => []]);
   }
 
   /**
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php
index 4431460d9..9a1dc2e6c 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php
@@ -23,12 +23,12 @@ abstract class FormTestTableSelectFormBase extends FormBase {
    * @return array
    *   A form with a tableselect element and a submit button.
    */
-  function tableselectFormBuilder($form, FormStateInterface $form_state, $element_properties) {
+  public function tableselectFormBuilder($form, FormStateInterface $form_state, $element_properties) {
     list($header, $options) = _form_test_tableselect_get_data();
 
     $form['tableselect'] = $element_properties;
 
-    $form['tableselect'] += array(
+    $form['tableselect'] += [
       '#prefix' => '<div id="tableselect-wrapper">',
       '#suffix' => '</div>',
       '#type' => 'tableselect',
@@ -36,16 +36,16 @@ abstract class FormTestTableSelectFormBase extends FormBase {
       '#options' => $options,
       '#multiple' => FALSE,
       '#empty' => t('Empty text.'),
-      '#ajax' => array(
+      '#ajax' => [
         'callback' => 'form_test_tableselect_ajax_callback',
         'wrapper' => 'tableselect-wrapper',
-      ),
-    );
+      ],
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectJsSelectForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectJsSelectForm.php
index e5483437f..d6d606aea 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectJsSelectForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectJsSelectForm.php
@@ -19,19 +19,19 @@ class FormTestTableSelectJsSelectForm extends FormTestTableSelectFormBase {
   public function buildForm(array $form, FormStateInterface $form_state, $test_action = NULL) {
     switch ($test_action) {
       case 'multiple-true-default':
-        $options = array('#multiple' => TRUE);
+        $options = ['#multiple' => TRUE];
         break;
 
       case 'multiple-false-default':
-        $options = array('#multiple' => FALSE);
+        $options = ['#multiple' => FALSE];
         break;
 
       case 'multiple-true-no-advanced-select':
-        $options = array('#multiple' => TRUE, '#js_select' => FALSE);
+        $options = ['#multiple' => TRUE, '#js_select' => FALSE];
         break;
 
       case 'multiple-false-advanced-select':
-        $options = array('#multiple' => FALSE, '#js_select' => TRUE);
+        $options = ['#multiple' => FALSE, '#js_select' => TRUE];
         break;
     }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectMultipleFalseForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectMultipleFalseForm.php
index 66fda87b9..f21ae3c6f 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectMultipleFalseForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectMultipleFalseForm.php
@@ -17,14 +17,14 @@ class FormTestTableSelectMultipleFalseForm extends FormTestTableSelectFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    return $this->tableselectFormBuilder($form, $form_state, array('#multiple' => FALSE));
+    return $this->tableselectFormBuilder($form, $form_state, ['#multiple' => FALSE]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    drupal_set_message(t('Submitted: @value', array('@value' => $form_state->getValue('tableselect'))));
+    drupal_set_message(t('Submitted: @value', ['@value' => $form_state->getValue('tableselect')]));
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectMultipleTrueForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectMultipleTrueForm.php
index 5d54b93dc..d4a0c1d40 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectMultipleTrueForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectMultipleTrueForm.php
@@ -17,7 +17,7 @@ class FormTestTableSelectMultipleTrueForm extends FormTestTableSelectFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    return $this->tableselectFormBuilder($form, $form_state, array('#multiple' => TRUE));
+    return $this->tableselectFormBuilder($form, $form_state, ['#multiple' => TRUE]);
   }
 
   /**
@@ -26,7 +26,7 @@ class FormTestTableSelectMultipleTrueForm extends FormTestTableSelectFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $selected = $form_state->getValue('tableselect');
     foreach ($selected as $key => $value) {
-      drupal_set_message(t('Submitted: @key = @value', array('@key' => $key, '@value' => $value)));
+      drupal_set_message(t('Submitted: @key = @value', ['@key' => $key, '@value' => $value]));
     }
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestUrlForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestUrlForm.php
index 88a661556..fff0e8052 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestUrlForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestUrlForm.php
@@ -22,21 +22,21 @@ class FormTestUrlForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['url'] = array(
+    $form['url'] = [
       '#type' => 'url',
       '#title' => 'Optional URL',
       '#description' => 'An optional URL field.',
-    );
-    $form['url_required'] = array(
+    ];
+    $form['url_required'] = [
       '#type' => 'url',
       '#title' => 'Required URL',
       '#description' => 'A required URL field.',
       '#required' => TRUE,
-    );
-    $form['submit'] = array(
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Submit',
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateForm.php
index d17dca4f8..41772da28 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateForm.php
@@ -33,16 +33,16 @@ class FormTestValidateForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $object = new Callbacks();
 
-    $form['name'] = array(
+    $form['name'] = [
       '#type' => 'textfield',
       '#title' => 'Name',
       '#default_value' => '',
-      '#element_validate' => array(array($object, 'validateName')),
-    );
-    $form['submit'] = array(
+      '#element_validate' => [[$object, 'validateName']],
+    ];
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => 'Save',
-    );
+    ];
 
     return $form;
   }
@@ -57,7 +57,7 @@ class FormTestValidateForm extends FormBase {
       // Alter the submitted value in $form_state.
       $form_state->setValueForElement($form['name'], 'value changed by setValueForElement() in #validate');
       // Output the element's value from $form_state.
-      drupal_set_message(t('@label value: @value', array('@label' => $form['name']['#title'], '@value' => $form_state->getValue('name'))));
+      drupal_set_message(t('@label value: @value', ['@label' => $form['name']['#title'], '@value' => $form_state->getValue('name')]));
 
       // Trigger a form validation error to see our changes.
       $form_state->setErrorByName('');
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredForm.php
index b5cf6ec8b..88e6b3531 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredForm.php
@@ -21,50 +21,50 @@ class FormTestValidateRequiredForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $options = array('foo' => 'foo', 'bar' => 'bar');
-    $validate = array('::elementValidateRequired');
+    $options = ['foo' => 'foo', 'bar' => 'bar'];
+    $validate = ['::elementValidateRequired'];
 
-    $form['textfield'] = array(
+    $form['textfield'] = [
       '#type' => 'textfield',
       '#title' => 'Name',
       '#required' => TRUE,
       '#required_error' => t('Please enter a name.'),
-    );
-    $form['checkboxes'] = array(
+    ];
+    $form['checkboxes'] = [
       '#type' => 'checkboxes',
       '#title' => 'Checkboxes',
       '#options' => $options,
       '#required' => TRUE,
       '#form_test_required_error' => t('Please choose at least one option.'),
       '#element_validate' => $validate,
-    );
-    $form['select'] = array(
+    ];
+    $form['select'] = [
       '#type' => 'select',
       '#title' => 'Select',
       '#options' => $options,
       '#required' => TRUE,
       '#form_test_required_error' => t('Please select something.'),
       '#element_validate' => $validate,
-    );
-    $form['radios'] = array(
+    ];
+    $form['radios'] = [
       '#type' => 'radios',
       '#title' => 'Radios',
       '#options' => $options,
       '#required' => TRUE,
-    );
-    $form['radios_optional'] = array(
+    ];
+    $form['radios_optional'] = [
       '#type' => 'radios',
       '#title' => 'Radios (optional)',
       '#options' => $options,
-    );
-    $form['radios_optional_default_value_false'] = array(
+    ];
+    $form['radios_optional_default_value_false'] = [
       '#type' => 'radios',
       '#title' => 'Radios (optional, with a default value of FALSE)',
       '#options' => $options,
       '#default_value' => FALSE,
-    );
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array('#type' => 'submit', '#value' => 'Submit');
+    ];
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = ['#type' => 'submit', '#value' => 'Submit'];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredNoTitleForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredNoTitleForm.php
index 30bd76aa1..29b3b5f96 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredNoTitleForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateRequiredNoTitleForm.php
@@ -21,12 +21,12 @@ class FormTestValidateRequiredNoTitleForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['textfield'] = array(
+    $form['textfield'] = [
       '#type' => 'textfield',
       '#required' => TRUE,
-    );
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array('#type' => 'submit', '#value' => 'Submit');
+    ];
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = ['#type' => 'submit', '#value' => 'Submit'];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsAccessForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsAccessForm.php
index bab4d192c..cb171a667 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsAccessForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsAccessForm.php
@@ -18,81 +18,81 @@ class FormTestVerticalTabsAccessForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['vertical_tabs1'] = array(
+    $form['vertical_tabs1'] = [
       '#type' => 'vertical_tabs',
-    );
-    $form['tab1'] = array(
+    ];
+    $form['tab1'] = [
       '#type' => 'fieldset',
       '#title' => t('Tab 1'),
       '#collapsible' => TRUE,
       '#group' => 'vertical_tabs1',
-    );
-    $form['tab1']['field1'] = array(
+    ];
+    $form['tab1']['field1'] = [
       '#title' => t('Field 1'),
       '#type' => 'checkbox',
       '#default_value' => TRUE,
-    );
-    $form['tab2'] = array(
+    ];
+    $form['tab2'] = [
       '#type' => 'fieldset',
       '#title' => t('Tab 2'),
       '#collapsible' => TRUE,
       '#group' => 'vertical_tabs1',
-    );
-    $form['tab2']['field2'] = array(
+    ];
+    $form['tab2']['field2'] = [
       '#title' => t('Field 2'),
       '#type' => 'textfield',
       '#default_value' => 'field2',
-    );
+    ];
 
-    $form['fieldset1'] = array(
+    $form['fieldset1'] = [
       '#type' => 'fieldset',
       '#title' => t('Fieldset'),
-    );
-    $form['fieldset1']['field3'] = array(
+    ];
+    $form['fieldset1']['field3'] = [
       '#type' => 'checkbox',
       '#title' => t('Field 3'),
       '#default_value' => TRUE,
-    );
+    ];
 
-    $form['container'] = array(
+    $form['container'] = [
       '#type' => 'container',
-    );
-    $form['container']['field4'] = array(
+    ];
+    $form['container']['field4'] = [
       '#type' => 'checkbox',
       '#title' => t('Field 4'),
       '#default_value' => TRUE,
-    );
-    $form['container']['subcontainer'] = array(
+    ];
+    $form['container']['subcontainer'] = [
       '#type' => 'container',
-    );
-    $form['container']['subcontainer']['field5'] = array(
+    ];
+    $form['container']['subcontainer']['field5'] = [
       '#type' => 'checkbox',
       '#title' => t('Field 5'),
       '#default_value' => TRUE,
-    );
+    ];
 
-    $form['vertical_tabs2'] = array(
+    $form['vertical_tabs2'] = [
       '#type' => 'vertical_tabs',
-    );
-    $form['tab3'] = array(
+    ];
+    $form['tab3'] = [
       '#type' => 'fieldset',
       '#title' => t('Tab 3'),
       '#collapsible' => TRUE,
       '#group' => 'vertical_tabs2',
-    );
-    $form['tab3']['field6'] = array(
+    ];
+    $form['tab3']['field6'] = [
       '#title' => t('Field 6'),
       '#type' => 'checkbox',
       '#default_value' => TRUE,
-    );
+    ];
 
-    $form['actions'] = array(
+    $form['actions'] = [
       '#type' => 'actions',
-    );
-    $form['actions']['submit'] = array(
+    ];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php
index 3457db808..b89636a43 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestVerticalTabsForm.php
@@ -20,23 +20,23 @@ class FormTestVerticalTabsForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $tab_count = 3;
 
-    $form['vertical_tabs'] = array(
+    $form['vertical_tabs'] = [
       '#type' => 'vertical_tabs',
       '#default_tab' => 'edit-tab' . $tab_count,
-    );
+    ];
 
     for ($i = 1; $i <= $tab_count; $i++) {
-      $form['tab' . $i] = array(
+      $form['tab' . $i] = [
         '#type' => 'fieldset',
-        '#title' => t('Tab @num', array('@num' => $i)),
+        '#title' => t('Tab @num', ['@num' => $i]),
         '#group' => 'vertical_tabs',
         '#access' => \Drupal::currentUser()->hasPermission('access vertical_tab_test tabs'),
-      );
-      $form['tab' . $i]['field' . $i] = array(
-        '#title' => t('Field @num', array('@num' => $i)),
+      ];
+      $form['tab' . $i]['field' . $i] = [
+        '#title' => t('Field @num', ['@num' => $i]),
         '#type' => 'textfield',
 
-      );
+      ];
     }
 
     return $form;
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/RedirectBlockForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/RedirectBlockForm.php
index 8963462fd..163ac2270 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/RedirectBlockForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/RedirectBlockForm.php
@@ -23,8 +23,8 @@ class RedirectBlockForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array('#type' => 'submit', '#value' => $this->t('Submit'));
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = ['#type' => 'submit', '#value' => $this->t('Submit')];
 
     return $form;
   }
@@ -33,7 +33,7 @@ class RedirectBlockForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setRedirect('form_test.route1', array(), array('query' => array('test1' => 'test2')));
+    $form_state->setRedirect('form_test.route1', [], ['query' => ['test1' => 'test2']]);
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/form_test/src/FormTestArgumentsObject.php b/web/core/modules/system/tests/modules/form_test/src/FormTestArgumentsObject.php
index 7bba8e010..7531ca816 100644
--- a/web/core/modules/system/tests/modules/form_test/src/FormTestArgumentsObject.php
+++ b/web/core/modules/system/tests/modules/form_test/src/FormTestArgumentsObject.php
@@ -28,19 +28,19 @@ class FormTestArgumentsObject extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, $arg = NULL) {
-    $form['element'] = array('#markup' => 'The FormTestArgumentsObject::buildForm() method was used for this form.');
+    $form['element'] = ['#markup' => 'The FormTestArgumentsObject::buildForm() method was used for this form.'];
 
-    $form['bananas'] = array(
+    $form['bananas'] = [
       '#type' => 'textfield',
       '#default_value' => $arg,
       '#title' => $this->t('Bananas'),
-    );
+    ];
 
     $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/FormTestAutocompleteForm.php b/web/core/modules/system/tests/modules/form_test/src/FormTestAutocompleteForm.php
index 5b2390cac..019513d08 100644
--- a/web/core/modules/system/tests/modules/form_test/src/FormTestAutocompleteForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/FormTestAutocompleteForm.php
@@ -21,17 +21,17 @@ class FormTestAutocompleteForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['autocomplete_1'] = array(
+    $form['autocomplete_1'] = [
       '#type' => 'textfield',
       '#title' => 'Autocomplete 1',
       '#autocomplete_route_name' => 'form_test.autocomplete_1',
-    );
-    $form['autocomplete_2'] = array(
+    ];
+    $form['autocomplete_2'] = [
       '#type' => 'textfield',
       '#title' => 'Autocomplete 2',
       '#autocomplete_route_name' => 'form_test.autocomplete_2',
-      '#autocomplete_route_parameters' => array('param' => 'value'),
-    );
+      '#autocomplete_route_parameters' => ['param' => 'value'],
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/system/tests/modules/form_test/src/FormTestControllerObject.php b/web/core/modules/system/tests/modules/form_test/src/FormTestControllerObject.php
index 826bf2c2f..757325348 100644
--- a/web/core/modules/system/tests/modules/form_test/src/FormTestControllerObject.php
+++ b/web/core/modules/system/tests/modules/form_test/src/FormTestControllerObject.php
@@ -40,21 +40,21 @@ class FormTestControllerObject extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, Request $request = NULL, $custom_attributes = NULL) {
-    $form['element'] = array('#markup' => 'The FormTestControllerObject::buildForm() method was used for this form.');
+    $form['element'] = ['#markup' => 'The FormTestControllerObject::buildForm() method was used for this form.'];
 
     $form['custom_attribute']['#markup'] = $custom_attributes;
     $form['request_attribute']['#markup'] = $request->attributes->get('request_attribute');
 
-    $form['bananas'] = array(
+    $form['bananas'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Bananas'),
-    );
+    ];
 
     $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/FormTestObject.php b/web/core/modules/system/tests/modules/form_test/src/FormTestObject.php
index 5fb0dae62..f99fbe730 100644
--- a/web/core/modules/system/tests/modules/form_test/src/FormTestObject.php
+++ b/web/core/modules/system/tests/modules/form_test/src/FormTestObject.php
@@ -28,18 +28,23 @@ class FormTestObject extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['element'] = array('#markup' => 'The FormTestObject::buildForm() method was used for this form.');
+    $form['element'] = ['#markup' => 'The FormTestObject::buildForm() method was used for this form.'];
 
-    $form['bananas'] = array(
+    $form['bananas'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Bananas'),
-    );
+    ];
+    $form['strawberry'] = [
+      '#type' => 'hidden',
+      '#value' => 'red',
+      '#attributes' => ['id' => 'redstrawberryhiddenfield'],
+    ];
 
     $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
-    );
+    ];
 
     $form['#title'] = 'Test dynamic title';
 
diff --git a/web/core/modules/system/tests/modules/form_test/src/FormTestServiceObject.php b/web/core/modules/system/tests/modules/form_test/src/FormTestServiceObject.php
index 10ad61b61..effd319bb 100644
--- a/web/core/modules/system/tests/modules/form_test/src/FormTestServiceObject.php
+++ b/web/core/modules/system/tests/modules/form_test/src/FormTestServiceObject.php
@@ -28,19 +28,19 @@ class FormTestServiceObject extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['element'] = array('#markup' => 'The FormTestServiceObject::buildForm() method was used for this form.');
+    $form['element'] = ['#markup' => 'The FormTestServiceObject::buildForm() method was used for this form.'];
 
-    $form['bananas'] = array(
+    $form['bananas'] = [
       '#type' => 'textfield',
       '#default_value' => 'brown',
       '#title' => $this->t('Bananas'),
-    );
+    ];
 
     $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php b/web/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php
index 6ac953240..e978f2a07 100644
--- a/web/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php
+++ b/web/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php
@@ -13,7 +13,7 @@ abstract class OperationBase extends ImageToolkitOperationBase {
    * {@inheritdoc}
    */
   public function arguments() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/TestToolkit.php b/web/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/TestToolkit.php
index 9766d0990..a28c78690 100644
--- a/web/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/TestToolkit.php
+++ b/web/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/TestToolkit.php
@@ -92,14 +92,14 @@ class TestToolkit extends ImageToolkitBase {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $this->logCall('settings', func_get_args());
-    $form['test_parameter'] = array(
+    $form['test_parameter'] = [
       '#type' => 'number',
       '#title' => $this->t('Test toolkit parameter'),
       '#description' => $this->t('A toolkit parameter for testing purposes.'),
       '#min' => 0,
       '#max' => 100,
       '#default_value' => $this->configFactory->getEditable('system.image.test_toolkit')->get('test_parameter', FALSE),
-    );
+    ];
     return $form;
   }
 
@@ -117,7 +117,7 @@ class TestToolkit extends ImageToolkitBase {
    */
   public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
     $this->configFactory->getEditable('system.image.test_toolkit')
-      ->set('test_parameter', $form_state->getValue(array('test', 'test_parameter')))
+      ->set('test_parameter', $form_state->getValue(['test', 'test_parameter']))
       ->save();
   }
 
@@ -165,7 +165,7 @@ class TestToolkit extends ImageToolkitBase {
    * @see \Drupal\system\Tests\Image\ToolkitTestBase::imageTestGetAllCalls()
    */
   protected function logCall($op, $args) {
-    $results = $this->state->get('image_test.results') ?: array();
+    $results = $this->state->get('image_test.results') ?: [];
     $results[$op][] = $args;
     // A call to apply is also logged under its operation name whereby the
     // array of arguments are logged as separate arguments, this because at the
@@ -236,7 +236,7 @@ class TestToolkit extends ImageToolkitBase {
    * {@inheritdoc}
    */
   public static function getSupportedExtensions() {
-    $extensions = array();
+    $extensions = [];
     foreach (static::supportedTypes() as $image_type) {
       $extensions[] = Unicode::strtolower(image_type_to_extension($image_type, FALSE));
     }
@@ -251,13 +251,13 @@ class TestToolkit extends ImageToolkitBase {
    *   IMAGETYPE_* constant (e.g. IMAGETYPE_JPEG, IMAGETYPE_PNG, etc.).
    */
   protected static function supportedTypes() {
-    return array(IMAGETYPE_PNG, IMAGETYPE_JPEG, IMAGETYPE_GIF);
+    return [IMAGETYPE_PNG, IMAGETYPE_JPEG, IMAGETYPE_GIF];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function apply($operation, array $arguments = array()) {
+  public function apply($operation, array $arguments = []) {
     $this->logCall('apply', func_get_args());
     return TRUE;
   }
diff --git a/web/core/modules/system/tests/modules/keyvalue_test/keyvalue_test.module b/web/core/modules/system/tests/modules/keyvalue_test/keyvalue_test.module
index ed0599605..1e7da67fa 100644
--- a/web/core/modules/system/tests/modules/keyvalue_test/keyvalue_test.module
+++ b/web/core/modules/system/tests/modules/keyvalue_test/keyvalue_test.module
@@ -13,6 +13,6 @@ function keyvalue_test_entity_type_alter(array &$entity_types) {
   if (isset($entity_types['entity_test_label'])) {
     $entity_types['entity_test_label']->setStorageClass('Drupal\Core\Entity\KeyValueStore\KeyValueContentEntityStorage');
     $entity_keys = $entity_types['entity_test_label']->getKeys();
-    $entity_types['entity_test_label']->set('entity_keys', $entity_keys + array('uuid' => 'uuid'));
+    $entity_types['entity_test_label']->set('entity_keys', $entity_keys + ['uuid' => 'uuid']);
   }
 }
diff --git a/web/core/modules/system/tests/modules/layout_test/config/schema/layout_test.schema.yml b/web/core/modules/system/tests/modules/layout_test/config/schema/layout_test.schema.yml
new file mode 100644
index 000000000..521faafae
--- /dev/null
+++ b/web/core/modules/system/tests/modules/layout_test/config/schema/layout_test.schema.yml
@@ -0,0 +1,7 @@
+layout_plugin.settings.layout_test_plugin:
+  type: layout_plugin.settings
+  label: 'Layout test plugin settings'
+  mapping:
+    setting_1:
+      type: string
+      label: 'Setting 1'
diff --git a/web/core/modules/system/tests/modules/layout_test/css/layout-test-2col.css b/web/core/modules/system/tests/modules/layout_test/css/layout-test-2col.css
new file mode 100644
index 000000000..d5c05b9ee
--- /dev/null
+++ b/web/core/modules/system/tests/modules/layout_test/css/layout-test-2col.css
@@ -0,0 +1,16 @@
+
+.layout-example-2col .region-left {
+  float: left;
+  width: 50%;
+}
+* html .layout-example-2col .region-left {
+  width: 49.9%;
+}
+
+.layout-example-2col .region-right {
+  float: left;
+  width: 50%;
+}
+* html .layout-example-2col .region-right {
+  width: 49.9%;
+}
diff --git a/web/core/modules/system/tests/modules/layout_test/layout_test.info.yml b/web/core/modules/system/tests/modules/layout_test/layout_test.info.yml
new file mode 100644
index 000000000..bfed2a5bb
--- /dev/null
+++ b/web/core/modules/system/tests/modules/layout_test/layout_test.info.yml
@@ -0,0 +1,6 @@
+name: 'Layout test'
+type: module
+description: 'Support module for testing layouts.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/web/core/modules/system/tests/modules/layout_test/layout_test.layouts.yml b/web/core/modules/system/tests/modules/layout_test/layout_test.layouts.yml
new file mode 100644
index 000000000..f8fcf5b88
--- /dev/null
+++ b/web/core/modules/system/tests/modules/layout_test/layout_test.layouts.yml
@@ -0,0 +1,29 @@
+layout_test_1col:
+  label: 1 column layout
+  category: Layout test
+  template: templates/layout-test-1col
+  regions:
+    top:
+      label: Top region
+    bottom:
+      label: Bottom region
+
+layout_test_2col:
+  label: 2 column layout
+  category: Layout test
+  template: templates/layout-test-2col
+  library: layout_test/layout_test_2col
+  regions:
+    left:
+      label: Left region
+    right:
+      label: Right region
+
+layout_test_1col_no_template:
+  label: 1 column layout (No template)
+  category: Layout test
+  regions:
+    top:
+      label: Top region
+    bottom:
+      label: Bottom region
diff --git a/web/core/modules/system/tests/modules/layout_test/layout_test.libraries.yml b/web/core/modules/system/tests/modules/layout_test/layout_test.libraries.yml
new file mode 100644
index 000000000..a696c0fc6
--- /dev/null
+++ b/web/core/modules/system/tests/modules/layout_test/layout_test.libraries.yml
@@ -0,0 +1,5 @@
+layout_test_2col:
+  version: 1.x
+  css:
+    theme:
+      css/layout-test-2col.css: {}
diff --git a/web/core/modules/system/tests/modules/layout_test/src/Plugin/Layout/LayoutTestPlugin.php b/web/core/modules/system/tests/modules/layout_test/src/Plugin/Layout/LayoutTestPlugin.php
new file mode 100644
index 000000000..e678bfa60
--- /dev/null
+++ b/web/core/modules/system/tests/modules/layout_test/src/Plugin/Layout/LayoutTestPlugin.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\layout_test\Plugin\Layout;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Layout\LayoutDefault;
+use Drupal\Core\Plugin\PluginFormInterface;
+
+/**
+ * The plugin that handles the default layout template.
+ *
+ * @Layout(
+ *   id = "layout_test_plugin",
+ *   label = @Translation("Layout plugin (with settings)"),
+ *   category = @Translation("Layout test"),
+ *   description = @Translation("Test layout"),
+ *   template = "templates/layout-test-plugin",
+ *   regions = {
+ *     "main" = {
+ *       "label" = @Translation("Main Region")
+ *     }
+ *   }
+ * )
+ */
+class LayoutTestPlugin extends LayoutDefault implements PluginFormInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function defaultConfiguration() {
+    return [
+      'setting_1' => 'Default',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+    $form['setting_1'] = [
+      '#type' => 'textfield',
+      '#title' => 'Blah',
+      '#default_value' => $this->configuration['setting_1'],
+    ];
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
+    $this->configuration['setting_1'] = $form_state->getValue('setting_1');
+  }
+
+}
diff --git a/web/core/modules/system/tests/modules/layout_test/templates/layout-test-1col.html.twig b/web/core/modules/system/tests/modules/layout_test/templates/layout-test-1col.html.twig
new file mode 100644
index 000000000..e7a7eb5ba
--- /dev/null
+++ b/web/core/modules/system/tests/modules/layout_test/templates/layout-test-1col.html.twig
@@ -0,0 +1,14 @@
+{#
+/**
+ * @file
+ * Template for an example 1 column layout.
+ */
+#}
+<div class="layout-example-1col clearfix">
+  <div class="region-top">
+    {{ content.top }}
+  </div>
+  <div class="region-bottom">
+    {{ content.bottom }}
+  </div>
+</div>
diff --git a/web/core/modules/system/tests/modules/layout_test/templates/layout-test-2col.html.twig b/web/core/modules/system/tests/modules/layout_test/templates/layout-test-2col.html.twig
new file mode 100644
index 000000000..11433ee99
--- /dev/null
+++ b/web/core/modules/system/tests/modules/layout_test/templates/layout-test-2col.html.twig
@@ -0,0 +1,14 @@
+{#
+/**
+ * @file
+ * Template for an example 2 column layout.
+ */
+#}
+<div class="layout-example-2col clearfix">
+  <div class="region-left">
+    {{ content.left }}
+  </div>
+  <div class="region-right">
+    {{ content.right }}
+  </div>
+</div>
diff --git a/web/core/modules/system/tests/modules/layout_test/templates/layout-test-plugin.html.twig b/web/core/modules/system/tests/modules/layout_test/templates/layout-test-plugin.html.twig
new file mode 100644
index 000000000..e49942c4c
--- /dev/null
+++ b/web/core/modules/system/tests/modules/layout_test/templates/layout-test-plugin.html.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * @file
+ * Template for layout_test_plugin layout.
+ */
+#}
+<div class="layout-test-plugin clearfix">
+  <div>
+    <span class="setting-1-label">Blah: </span>
+    {{ settings.setting_1 }}
+  </div>
+  <div class="region-main">
+    {{ content.main }}
+  </div>
+</div>
diff --git a/web/core/modules/system/tests/modules/menu_test/menu_test.module b/web/core/modules/system/tests/modules/menu_test/menu_test.module
index f891fce9f..79b4dae2b 100644
--- a/web/core/modules/system/tests/modules/menu_test/menu_test.module
+++ b/web/core/modules/system/tests/modules/menu_test/menu_test.module
@@ -19,35 +19,35 @@ function menu_test_menu_links_discovered_alter(&$links) {
   $links['menu_test.context']['title'] = \Drupal::config('menu_test.menu_item')->get('title');
 
   // Adds a custom menu link.
-  $links['menu_test.custom'] = array(
+  $links['menu_test.custom'] = [
     'title' => 'Custom link',
     'route_name' => 'menu_test.custom',
     'description' => 'Custom link used to check the integrity of manually added menu links.',
     'parent' => 'menu_test',
-  );
+  ];
 }
 
 /**
  * Implements hook_menu_local_tasks_alter().
  */
 function menu_test_menu_local_tasks_alter(&$data, $route_name, RefinableCacheableDependencyInterface &$cacheability) {
-  if (in_array($route_name, array('menu_test.tasks_default'))) {
-    $data['tabs'][0]['foo'] = array(
+  if (in_array($route_name, ['menu_test.tasks_default'])) {
+    $data['tabs'][0]['foo'] = [
       '#theme' => 'menu_local_task',
-      '#link' => array(
+      '#link' => [
         'title' => "Task 1 <script>alert('Welcome to the jungle!')</script>",
-        'url' => Url::fromRoute('menu_test.router_test1', array('bar' => '1')),
-      ),
+        'url' => Url::fromRoute('menu_test.router_test1', ['bar' => '1']),
+      ],
       '#weight' => 10,
-    );
-    $data['tabs'][0]['bar'] = array(
+    ];
+    $data['tabs'][0]['bar'] = [
       '#theme' => 'menu_local_task',
-      '#link' => array(
+      '#link' => [
         'title' => 'Task 2',
-        'url' => Url::fromRoute('menu_test.router_test2', array('bar' => '2')),
-      ),
+        'url' => Url::fromRoute('menu_test.router_test2', ['bar' => '2']),
+      ],
       '#weight' => 20,
-    );
+    ];
   }
   $cacheability->addCacheTags(['kittens:dwarf-cat']);
 }
diff --git a/web/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php b/web/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php
index c0832692c..fe6566cdd 100644
--- a/web/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php
+++ b/web/core/modules/system/tests/modules/menu_test/src/Controller/MenuTestController.php
@@ -83,8 +83,8 @@ class MenuTestController extends ControllerBase {
    * @return string
    *   The route title.
    */
-  public function titleCallback(array $_title_arguments = array(), $_title = '') {
-    $_title_arguments += array('case_number' => '2', 'title' => $_title);
+  public function titleCallback(array $_title_arguments = [], $_title = '') {
+    $_title_arguments += ['case_number' => '2', 'title' => $_title];
     return t($_title_arguments['title']) . ' - Case ' . $_title_arguments['case_number'];
   }
 
diff --git a/web/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php b/web/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php
index 10c0810f6..decfd3674 100644
--- a/web/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php
+++ b/web/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTest.php
@@ -11,10 +11,10 @@ class LocalTaskTest extends DeriverBase {
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
     $weight = $base_plugin_definition['weight'];
-    foreach (array('derive1' => 'Derive 1', 'derive2' => 'Derive 2') as $key => $title) {
+    foreach (['derive1' => 'Derive 1', 'derive2' => 'Derive 2'] as $key => $title) {
       $this->derivatives[$key] = $base_plugin_definition;
       $this->derivatives[$key]['title'] = $title;
-      $this->derivatives[$key]['route_parameters'] = array('placeholder' => $key);
+      $this->derivatives[$key]['route_parameters'] = ['placeholder' => $key];
       $this->derivatives[$key]['weight'] = $weight++; // ensure weights for testing.
     }
     return $this->derivatives;
diff --git a/web/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php b/web/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php
index efd75799b..1f8300a4b 100644
--- a/web/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php
+++ b/web/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php
@@ -16,7 +16,7 @@ class TestLocalAction4 extends LocalActionDefault {
    * {@inheritdoc}
    */
   public function getTitle() {
-    return $this->t('My @arg action', array('@arg' => 'dynamic-title'));
+    return $this->t('My @arg action', ['@arg' => 'dynamic-title']);
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php b/web/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
index 72ef717c7..7ba754884 100644
--- a/web/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
+++ b/web/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
@@ -12,14 +12,14 @@ class TestTasksSettingsSub1 extends LocalTaskDefault {
   /**
    * {@inheritdoc}
    */
-  function getTitle() {
-    return $this->t('Dynamic title for @class', array('@class' => 'TestTasksSettingsSub1'));
+  public function getTitle() {
+    return $this->t('Dynamic title for @class', ['@class' => 'TestTasksSettingsSub1']);
   }
 
   /**
    * {@inheritdoc}
    */
-  function getCacheTags() {
+  public function getCacheTags() {
     return ['kittens:ragdoll'];
   }
 
diff --git a/web/core/modules/system/tests/modules/menu_test/src/TestControllers.php b/web/core/modules/system/tests/modules/menu_test/src/TestControllers.php
index 9ed7851b2..31fb341af 100644
--- a/web/core/modules/system/tests/modules/menu_test/src/TestControllers.php
+++ b/web/core/modules/system/tests/modules/menu_test/src/TestControllers.php
@@ -59,7 +59,7 @@ class TestControllers {
    */
   public function testDefaults($placeholder = NULL) {
     if ($placeholder) {
-      return ['#markup' => SafeMarkup::format("Sometimes there is a placeholder: '@placeholder'.", array('@placeholder' => $placeholder))];
+      return ['#markup' => SafeMarkup::format("Sometimes there is a placeholder: '@placeholder'.", ['@placeholder' => $placeholder])];
     }
     else {
       return ['#markup' => 'Sometimes there is no placeholder.'];
diff --git a/web/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php b/web/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php
index b46f37426..6cd97a0cb 100644
--- a/web/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php
+++ b/web/core/modules/system/tests/modules/module_autoload_test/src/SomeClass.php
@@ -3,7 +3,7 @@
 namespace Drupal\module_autoload_test;
 
 class SomeClass {
-  function testMethod() {
+  public function testMethod() {
     return 'Drupal\\module_autoload_test\\SomeClass::testMethod() was invoked.';
   }
 
diff --git a/web/core/modules/system/tests/modules/module_test/module_test.file.inc b/web/core/modules/system/tests/modules/module_test/module_test.file.inc
index 0842944ca..b40e0f345 100644
--- a/web/core/modules/system/tests/modules/module_test/module_test.file.inc
+++ b/web/core/modules/system/tests/modules/module_test/module_test.file.inc
@@ -9,5 +9,5 @@
  * Implements hook_test_hook().
  */
 function module_test_test_hook() {
-  return array('module_test' => 'success!');
+  return ['module_test' => 'success!'];
 }
diff --git a/web/core/modules/system/tests/modules/module_test/module_test.install b/web/core/modules/system/tests/modules/module_test/module_test.install
index e90fc577a..5f3f6f654 100644
--- a/web/core/modules/system/tests/modules/module_test/module_test.install
+++ b/web/core/modules/system/tests/modules/module_test/module_test.install
@@ -9,18 +9,18 @@
  * Implements hook_schema().
  */
 function module_test_schema() {
-  $schema['module_test'] = array(
+  $schema['module_test'] = [
     'description' => 'Dummy table to test the behavior of hook_schema() during module installation.',
-    'fields' => array(
-      'data' => array(
+    'fields' => [
+      'data' => [
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
         'default' => '',
         'description' => 'An example data column for the module.',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
   return $schema;
 }
 
@@ -30,8 +30,8 @@ function module_test_schema() {
 function module_test_install() {
   $schema = drupal_get_module_schema('module_test', 'module_test');
   db_insert('module_test')
-    ->fields(array(
+    ->fields([
       'data' => $schema['fields']['data']['type'],
-    ))
+    ])
     ->execute();
 }
diff --git a/web/core/modules/system/tests/modules/module_test/module_test.module b/web/core/modules/system/tests/modules/module_test/module_test.module
index 9c5cd9ac2..dba4889d5 100644
--- a/web/core/modules/system/tests/modules/module_test/module_test.module
+++ b/web/core/modules/system/tests/modules/module_test/module_test.module
@@ -60,9 +60,9 @@ function module_test_system_info_alter(&$info, Extension $file, $type) {
  * Implements hook_hook_info().
  */
 function module_test_hook_info() {
-  $hooks['test_hook'] = array(
+  $hooks['test_hook'] = [
     'group' => 'file',
-  );
+  ];
   return $hooks;
 }
 
diff --git a/web/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php b/web/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php
index 39144c67f..1964f740f 100644
--- a/web/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php
+++ b/web/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php
@@ -28,7 +28,7 @@ class PagerTestController extends ControllerBase {
     ];
     $query = db_select('watchdog', 'd')->extend('Drupal\Core\Database\Query\PagerSelectExtender')->element($element);
     $result = $query
-      ->fields('d', array('wid', 'type', 'timestamp'))
+      ->fields('d', ['wid', 'type', 'timestamp'])
       ->limit($limit)
       ->orderBy('d.wid')
       ->execute();
@@ -58,19 +58,19 @@ class PagerTestController extends ControllerBase {
     // Counter of calls to the current pager.
     $query_params = pager_get_query_parameters();
     $pager_calls = isset($query_params['pager_calls']) ? ($query_params['pager_calls'] ? $query_params['pager_calls'] : 0) : 0;
-    $build['l_pager_pager_0'] = array('#markup' => $this->t('Pager calls: @pager_calls', array('@pager_calls' => $pager_calls)));
+    $build['l_pager_pager_0'] = ['#markup' => $this->t('Pager calls: @pager_calls', ['@pager_calls' => $pager_calls])];
 
     // Pager.
-    $build['pager_pager_0'] = array(
+    $build['pager_pager_0'] = [
       '#type' => 'pager',
       '#element' => 0,
-      '#parameters' => array(
+      '#parameters' => [
         'pager_calls' => ++$pager_calls,
-      ),
+      ],
       '#pre_render' => [
         'Drupal\pager_test\Controller\PagerTestController::showPagerCacheContext',
       ]
-    );
+    ];
 
     return $build;
   }
@@ -82,34 +82,34 @@ class PagerTestController extends ControllerBase {
 
     // Build three tables with same query and different pagers.
     $build['pager_table_0'] = $this->buildTestTable(0, 20);
-    $build['pager_pager_0'] = array(
+    $build['pager_pager_0'] = [
       '#type' => 'container',
       '#attributes' => ['class' => ['test-pager-0']],
       'pager' => [
         '#type' => 'pager',
         '#element' => 0,
       ],
-    );
+    ];
 
     $build['pager_table_1'] = $this->buildTestTable(1, 20);
-    $build['pager_pager_1'] = array(
+    $build['pager_pager_1'] = [
       '#type' => 'container',
       '#attributes' => ['class' => ['test-pager-1']],
       'pager' => [
         '#type' => 'pager',
         '#element' => 1,
       ],
-    );
+    ];
 
     $build['pager_table_4'] = $this->buildTestTable(4, 20);
-    $build['pager_pager_4'] = array(
+    $build['pager_pager_4'] = [
       '#type' => 'container',
       '#attributes' => ['class' => ['test-pager-4']],
       'pager' => [
         '#type' => 'pager',
         '#element' => 4,
       ],
-    );
+    ];
 
     return $build;
   }
diff --git a/web/core/modules/system/tests/modules/path_encoded_test/path_encoded_test.info.yml b/web/core/modules/system/tests/modules/path_encoded_test/path_encoded_test.info.yml
new file mode 100644
index 000000000..37208e9b6
--- /dev/null
+++ b/web/core/modules/system/tests/modules/path_encoded_test/path_encoded_test.info.yml
@@ -0,0 +1,6 @@
+name: 'Path encoded character test'
+type: module
+description: 'Support module for testing path aliases on a route with encoded characters in the path.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/web/core/modules/system/tests/modules/path_encoded_test/path_encoded_test.routing.yml b/web/core/modules/system/tests/modules/path_encoded_test/path_encoded_test.routing.yml
new file mode 100644
index 000000000..9a5b30cc3
--- /dev/null
+++ b/web/core/modules/system/tests/modules/path_encoded_test/path_encoded_test.routing.yml
@@ -0,0 +1,23 @@
+path_encoded_test.colon:
+  path: '/hi/llamma:party'
+  defaults:
+    _title: 'Colon'
+    _controller: '\Drupal\path_encoded_test\Controller\PathEncodedTestController::simple'
+  requirements:
+    _access: 'TRUE'
+
+path_encoded_test.atsign:
+  path: '/bloggy/@Dries'
+  defaults:
+    _title: 'At sign'
+    _controller: '\Drupal\path_encoded_test\Controller\PathEncodedTestController::simple'
+  requirements:
+    _access: 'TRUE'
+
+path_encoded_test.parens:
+  path: '/cat(box)'
+  defaults:
+    _title: 'At sign'
+    _controller: '\Drupal\path_encoded_test\Controller\PathEncodedTestController::simple'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/path_encoded_test/src/Controller/PathEncodedTestController.php b/web/core/modules/system/tests/modules/path_encoded_test/src/Controller/PathEncodedTestController.php
new file mode 100644
index 000000000..027c24f73
--- /dev/null
+++ b/web/core/modules/system/tests/modules/path_encoded_test/src/Controller/PathEncodedTestController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\path_encoded_test\Controller;
+
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Returns responses for path_encoded_test routes.
+ */
+class PathEncodedTestController {
+
+  /**
+   * Returns a HTML simple response.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   */
+  public function simple() {
+    return new Response('<html><body>PathEncodedTestController works</body></html>');
+  }
+
+}
diff --git a/web/core/modules/system/tests/modules/path_test/path_test.module b/web/core/modules/system/tests/modules/path_test/path_test.module
index df0393125..32489c021 100644
--- a/web/core/modules/system/tests/modules/path_test/path_test.module
+++ b/web/core/modules/system/tests/modules/path_test/path_test.module
@@ -9,14 +9,14 @@
  * Resets the path test results.
  */
 function path_test_reset() {
-  \Drupal::state()->set('path_test.results', array());
+  \Drupal::state()->set('path_test.results', []);
 }
 
 /**
  * Implements hook_path_update().
  */
 function path_test_path_update($path) {
-  $results = \Drupal::state()->get('path_test.results') ?: array();
+  $results = \Drupal::state()->get('path_test.results') ?: [];
   $results['hook_path_update'] = $path;
   \Drupal::state()->set('path_test.results', $results);
 }
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/Annotation/PluginExample.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/Annotation/PluginExample.php
index daca83bae..b80460d69 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/Annotation/PluginExample.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/Annotation/PluginExample.php
@@ -29,12 +29,12 @@ class PluginExample extends AnnotationBase {
    * {@inheritdoc}
    */
   public function get() {
-    return array(
+    return [
       'id' => $this->id,
       'custom' => $this->custom,
       'class' => $this->class,
       'provider' => $this->provider,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/DefaultsTestPluginManager.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/DefaultsTestPluginManager.php
index eda8f8845..65d7078ce 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/DefaultsTestPluginManager.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/DefaultsTestPluginManager.php
@@ -28,27 +28,27 @@ class DefaultsTestPluginManager extends DefaultPluginManager {
     $this->moduleHandler = $module_handler;
 
     // Specify default values.
-    $this->defaults = array(
-      'metadata' => array(
+    $this->defaults = [
+      'metadata' => [
         'default' => TRUE,
-      ),
-    );
+      ],
+    ];
 
     // Add a plugin with a custom value.
-    $this->discovery->setDefinition('test_block1', array(
+    $this->discovery->setDefinition('test_block1', [
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockTestBlock',
-      'metadata' => array(
+      'metadata' => [
         'custom' => TRUE,
-      ),
-    ));
+      ],
+    ]);
     // Add a plugin that overrides the default value.
-    $this->discovery->setDefinition('test_block2', array(
+    $this->discovery->setDefinition('test_block2', [
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockTestBlock',
-      'metadata' => array(
+      'metadata' => [
         'custom' => TRUE,
         'default' => FALSE,
-      ),
-    ));
+      ],
+    ]);
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
index aebb4730a..8748a7b94 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
@@ -34,10 +34,11 @@ class MockBlockManager extends PluginManagerBase {
     // plugins to the system.
 
     // A simple plugin: the user login block.
-    $this->discovery->setDefinition('user_login', array(
+    $this->discovery->setDefinition('user_login', [
+      'id' => 'user_login',
       'label' => t('User login'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserLoginBlock',
-    ));
+    ]);
 
     // A plugin that requires derivatives: the menu block plugin. We do not want
     // a generic "Menu" block showing up in the Block administration UI.
@@ -45,15 +46,17 @@ class MockBlockManager extends PluginManagerBase {
     // system and each one's title is user configurable. The
     // MockMenuBlockDeriver class ensures that only derivatives, and not the
     // base plugin, are available to the system.
-    $this->discovery->setDefinition('menu', array(
+    $this->discovery->setDefinition('menu', [
+      'id' => 'menu',
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlock',
       'deriver' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlockDeriver',
-    ));
+    ]);
     // A plugin defining itself as a derivative.
-    $this->discovery->setDefinition('menu:foo', array(
+    $this->discovery->setDefinition('menu:foo', [
+      'id' => 'menu',
       'label' => t('Base label'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlock',
-    ));
+    ]);
 
     // A block plugin that can optionally be derived: the layout block plugin.
     // A layout is a special kind of block into which other blocks can be
@@ -61,46 +64,51 @@ class MockBlockManager extends PluginManagerBase {
     // administration UI as well as additional user-created custom layouts. The
     // MockLayoutBlockDeriver class ensures that both the base plugin and the
     // derivatives are available to the system.
-    $this->discovery->setDefinition('layout', array(
+    $this->discovery->setDefinition('layout', [
+      'id' => 'layout',
       'label' => t('Layout'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockLayoutBlock',
       'deriver' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockLayoutBlockDeriver',
-    ));
+    ]);
 
     // A block plugin that requires context to function. This block requires a
     // user object in order to return the user name from the getTitle() method.
-    $this->discovery->setDefinition('user_name', array(
+    $this->discovery->setDefinition('user_name', [
+      'id' => 'user_name',
       'label' => t('User name'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserNameBlock',
-      'context' => array(
+      'context' => [
         'user' => $this->createContextDefinition('entity:user', t('User')),
-      ),
-    ));
+      ],
+    ]);
 
     // An optional context version of the previous block plugin.
-    $this->discovery->setDefinition('user_name_optional', array(
+    $this->discovery->setDefinition('user_name_optional', [
+      'id' => 'user_name_optional',
       'label' => t('User name optional'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserNameBlock',
-      'context' => array(
+      'context' => [
         'user' => $this->createContextDefinition('entity:user', t('User'), FALSE),
-      ),
-    ));
+      ],
+    ]);
 
     // A block plugin that requires a typed data string context to function.
-    $this->discovery->setDefinition('string_context', array(
+    $this->discovery->setDefinition('string_context', [
+      'id' => 'string_context',
       'label' => t('String typed data'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\TypedDataStringBlock',
-    ));
+    ]);
 
     // A complex context plugin that requires both a user and node for context.
-    $this->discovery->setDefinition('complex_context', array(
+    $this->discovery->setDefinition('complex_context', [
+      'id' => 'complex_context',
       'label' => t('Complex context'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockComplexContextBlock',
-      'context' => array(
+      'context' => [
         'user' => $this->createContextDefinition('entity:user', t('User')),
         'node' => $this->createContextDefinition('entity:node', t('Node')),
-      ),
-    ));
+      ],
+    ]);
 
     // In addition to finding all of the plugins available for a type, a plugin
     // type must also be able to create instances of that plugin. For example, a
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestLazyPluginCollection.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestLazyPluginCollection.php
index dd426e481..1009faa54 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestLazyPluginCollection.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestLazyPluginCollection.php
@@ -34,14 +34,14 @@ class TestLazyPluginCollection extends LazyPluginCollection {
    * {@inheritdoc}
    */
   protected function initializePlugin($instance_id) {
-    $this->pluginInstances[$instance_id] = $this->manager->createInstance($instance_id, array());
+    $this->pluginInstances[$instance_id] = $this->manager->createInstance($instance_id, []);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getConfiguration() {
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php
index 60e74d839..ec464a5b7 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php
@@ -19,10 +19,10 @@ class TestPluginManager extends PluginManagerBase {
     $this->discovery = new StaticDiscovery();
 
     // A simple plugin: a mock user login block.
-    $this->discovery->setDefinition('user_login', array(
+    $this->discovery->setDefinition('user_login', [
       'label' => 'User login',
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserLoginBlock',
-    ));
+    ]);
 
     // In addition to finding all of the plugins available for a type, a plugin
     // type must also be able to create instances of that plugin. For example, a
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
index d2fa3a46c..93fca538b 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
@@ -31,7 +31,7 @@ class MockLayoutBlockDeriver implements DeriverInterface {
     // key from the returned definitions.
     unset($base_plugin_definition['deriver']);
 
-    $derivatives = array(
+    $derivatives = [
       // Adding a NULL key signifies that the base plugin may also be used in
       // addition to the derivatives. In this case, we allow the administrator
       // to add a generic layout block to the page.
@@ -40,10 +40,10 @@ class MockLayoutBlockDeriver implements DeriverInterface {
       // We also allow them to add a customized one. Here, we just mock the
       // customized one, but in a real implementation, this would be fetched
       // from some \Drupal::config() object.
-      'foo' => array(
+      'foo' => [
         'label' => t('Layout Foo'),
-      ) + $base_plugin_definition,
-    );
+      ] + $base_plugin_definition,
+    ];
 
     return $derivatives;
   }
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
index 413eb1335..d5f6d6c29 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
@@ -34,20 +34,20 @@ class MockMenuBlockDeriver implements DeriverInterface {
     // Here, we create some mock menu block definitions for menus that might
     // exist in a typical Drupal site. In a real implementation, we would query
     // Drupal's configuration to find out which menus actually exist.
-    $derivatives = array(
-      'main_menu' => array(
+    $derivatives = [
+      'main_menu' => [
         'label' => t('Main menu'),
-      ) + $base_plugin_definition,
-      'navigation' => array(
+      ] + $base_plugin_definition,
+      'navigation' => [
         'label' => t('Navigation'),
-      ) + $base_plugin_definition,
-      'foo' => array(
+      ] + $base_plugin_definition,
+      'foo' => [
         // Instead of the derivative label, the specific label will be used.
         'label' => t('Derivative label'),
         // This setting will be merged in.
          'setting' => 'default'
-      ) + $base_plugin_definition,
-    );
+      ] + $base_plugin_definition,
+    ];
 
     return $derivatives;
   }
diff --git a/web/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php b/web/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php
index f02f0b63f..7b0850e56 100644
--- a/web/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php
+++ b/web/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php
@@ -14,9 +14,9 @@ class RenderPlaceholderMessageTestController implements ContainerAwareInterface
    */
   public function messagesPlaceholderFirst() {
     return $this->build([
-      '<drupal-render-placeholder callback="Drupal\Core\Render\Element\StatusMessages::renderMessages" arguments="0" token="a8c34b5e"></drupal-render-placeholder>',
-      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P1" token="0546ada3"></drupal-render-placeholder>',
-      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P2" token="83d2df0d"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="Drupal\Core\Render\Element\StatusMessages::renderMessages" arguments="0" token="_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P1" token="JBp04zOwNhYqMBgRkyBnPdma8m4l2elDnXMJ9tEsP6k"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P2" token="JnoubSJT1l92Dm4fJw4EPsSzRsmE88H6Q1zu9-OzDh4"></drupal-render-placeholder>',
     ]);
   }
 
@@ -25,9 +25,9 @@ class RenderPlaceholderMessageTestController implements ContainerAwareInterface
    */
   public function messagesPlaceholderMiddle() {
     return $this->build([
-      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P1" token="0546ada3"></drupal-render-placeholder>',
-      '<drupal-render-placeholder callback="Drupal\Core\Render\Element\StatusMessages::renderMessages" arguments="0" token="a8c34b5e"></drupal-render-placeholder>',
-      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P2" token="83d2df0d"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P1" token="JBp04zOwNhYqMBgRkyBnPdma8m4l2elDnXMJ9tEsP6k"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="Drupal\Core\Render\Element\StatusMessages::renderMessages" arguments="0" token="_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P2" token="JnoubSJT1l92Dm4fJw4EPsSzRsmE88H6Q1zu9-OzDh4"></drupal-render-placeholder>',
     ]);
   }
 
@@ -36,9 +36,9 @@ class RenderPlaceholderMessageTestController implements ContainerAwareInterface
    */
   public function messagesPlaceholderLast() {
     return $this->build([
-      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P1" token="0546ada3"></drupal-render-placeholder>',
-      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P2" token="83d2df0d"></drupal-render-placeholder>',
-      '<drupal-render-placeholder callback="Drupal\Core\Render\Element\StatusMessages::renderMessages" arguments="0" token="a8c34b5e"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P1" token="JBp04zOwNhYqMBgRkyBnPdma8m4l2elDnXMJ9tEsP6k"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="\Drupal\render_placeholder_message_test\RenderPlaceholderMessageTestController::setAndLogMessage" arguments="0=P2" token="JnoubSJT1l92Dm4fJw4EPsSzRsmE88H6Q1zu9-OzDh4"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="Drupal\Core\Render\Element\StatusMessages::renderMessages" arguments="0" token="_HAdUpwWmet0TOTe2PSiJuMntExoshbm1kh2wQzzzAA"></drupal-render-placeholder>',
     ]);
   }
 
diff --git a/web/core/modules/system/tests/modules/requirements1_test/requirements1_test.install b/web/core/modules/system/tests/modules/requirements1_test/requirements1_test.install
index c88489399..e8121617a 100644
--- a/web/core/modules/system/tests/modules/requirements1_test/requirements1_test.install
+++ b/web/core/modules/system/tests/modules/requirements1_test/requirements1_test.install
@@ -9,15 +9,15 @@
  * Implements hook_requirements().
  */
 function requirements1_test_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
 
   // Always fails requirements.
   if ('install' == $phase) {
-    $requirements['requirements1_test'] = array(
+    $requirements['requirements1_test'] = [
       'title' => t('Requirements 1 Test'),
       'severity' => REQUIREMENT_ERROR,
       'description' => t('Requirements 1 Test failed requirements.'),
-    );
+    ];
   }
 
   return $requirements;
diff --git a/web/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml b/web/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml
index ad2d41864..4d5d241ba 100644
--- a/web/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml
+++ b/web/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml
@@ -212,3 +212,38 @@ router_test.hierarchy_parent_child2:
     _controller: '\Drupal\router_test\TestControllers::test'
   requirements:
     _access: 'TRUE'
+
+router_test.two_duplicate1:
+  path: '/router-test/duplicate-path2'
+  defaults:
+    _controller: '\Drupal\router_test\TestControllers::testRouteName'
+  requirements:
+    _access: 'TRUE'
+
+router_test.two_duplicate2:
+  path: '/router-test/duplicate-path2'
+  defaults:
+    _controller: '\Drupal\router_test\TestControllers::testRouteName'
+  requirements:
+    _access: 'TRUE'
+
+router_test.case_sensitive_duplicate1:
+  path: '/router-test/case-sensitive-duplicate-path3'
+  defaults:
+    _controller: '\Drupal\router_test\TestControllers::testRouteName'
+  requirements:
+    _access: 'TRUE'
+
+router_test.case_sensitive_duplicate2:
+  path: '/router-test/case-sensitive-Duplicate-PATH3'
+  defaults:
+    _controller: '\Drupal\router_test\TestControllers::testRouteName'
+  requirements:
+    _access: 'TRUE'
+
+router_test.case_sensitive_duplicate3:
+  path: '/router-test/case-sensitive-duplicate-path3'
+  defaults:
+    _controller: '\Drupal\router_test\TestControllers::testRouteName'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php b/web/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php
index 7635704fb..5430e8d8b 100644
--- a/web/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php
+++ b/web/core/modules/system/tests/modules/router_test_directory/src/RouterTestServiceProvider.php
@@ -16,7 +16,7 @@ class RouterTestServiceProvider implements ServiceProviderInterface {
   public function register(ContainerBuilder $container) {
     $container->register('router_test.subscriber', 'Drupal\router_test\RouteTestSubscriber')->addTag('event_subscriber');
     $container->register('access_check.router_test', 'Drupal\router_test\Access\TestAccessCheck')
-      ->addTag('access_check', array('applies_to' => '_access_router_test'));
+      ->addTag('access_check', ['applies_to' => '_access_router_test']);
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/router_test_directory/src/TestContent.php b/web/core/modules/system/tests/modules/router_test_directory/src/TestContent.php
index 9cbe023ab..f392a81e8 100644
--- a/web/core/modules/system/tests/modules/router_test_directory/src/TestContent.php
+++ b/web/core/modules/system/tests/modules/router_test_directory/src/TestContent.php
@@ -63,7 +63,7 @@ class TestContent extends ControllerBase {
    */
   public function subrequestTest(UserInterface $user) {
     $request = \Drupal::request();
-    $request = Request::create('/router_test/test13/' . $user->id(), 'GET', $request->query->all(), $request->cookies->all(), array(), $request->server->all());
+    $request = Request::create('/router_test/test13/' . $user->id(), 'GET', $request->query->all(), $request->cookies->all(), [], $request->server->all());
 
     return $this->httpKernel->handle($request, HttpKernelInterface::SUB_REQUEST);
   }
diff --git a/web/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php b/web/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
index c3bcac7bf..151c1409e 100644
--- a/web/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
+++ b/web/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
@@ -6,6 +6,7 @@ use Drupal\Core\Cache\CacheableResponse;
 use Drupal\Core\ParamConverter\ParamNotConvertedException;
 use Drupal\user\UserInterface;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Zend\Diactoros\Response\HtmlResponse;
 
@@ -110,6 +111,12 @@ class TestControllers {
     ];
   }
 
+  public function testRouteName(Request $request) {
+    return [
+      '#markup' => $request->attributes->get(RouteObjectInterface::ROUTE_NAME),
+    ];
+  }
+
   /**
    * Throws an exception.
    *
diff --git a/web/core/modules/system/tests/modules/service_provider_test/src/TestClass.php b/web/core/modules/system/tests/modules/service_provider_test/src/TestClass.php
index 9a87c9721..d521e1fdb 100644
--- a/web/core/modules/system/tests/modules/service_provider_test/src/TestClass.php
+++ b/web/core/modules/system/tests/modules/service_provider_test/src/TestClass.php
@@ -57,9 +57,9 @@ class TestClass implements EventSubscriberInterface, DestructableInterface, Cont
    * @return array
    *   An array of event listener definitions.
    */
-  static function getSubscribedEvents() {
-    $events[KernelEvents::REQUEST][] = array('onKernelRequestTest');
-    $events[KernelEvents::RESPONSE][] = array('onKernelResponseTest');
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::REQUEST][] = ['onKernelRequestTest'];
+    $events[KernelEvents::RESPONSE][] = ['onKernelResponseTest'];
     return $events;
   }
 
diff --git a/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php b/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
index edde4fd9a..76a546294 100644
--- a/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
+++ b/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
@@ -21,7 +21,7 @@ class SessionTestController extends ControllerBase {
   public function get() {
     return empty($_SESSION['session_test_value'])
       ? []
-      : ['#markup' => $this->t('The current value of the stored session variable is: %val', array('%val' => $_SESSION['session_test_value']))];
+      : ['#markup' => $this->t('The current value of the stored session variable is: %val', ['%val' => $_SESSION['session_test_value']])];
   }
 
   /**
@@ -37,7 +37,7 @@ class SessionTestController extends ControllerBase {
     $value = $request->getSession()->get("session_test_key");
     return empty($value)
       ? []
-      : ['#markup' => $this->t('The current value of the stored session variable is: %val', array('%val' => $value))];
+      : ['#markup' => $this->t('The current value of the stored session variable is: %val', ['%val' => $value])];
   }
 
   /**
@@ -84,7 +84,7 @@ class SessionTestController extends ControllerBase {
   public function set($test_value) {
     $_SESSION['session_test_value'] = $test_value;
 
-    return ['#markup' => $this->t('The current value of the stored session variable has been set to %val', array('%val' => $test_value))];
+    return ['#markup' => $this->t('The current value of the stored session variable has been set to %val', ['%val' => $test_value])];
   }
 
   /**
@@ -100,7 +100,7 @@ class SessionTestController extends ControllerBase {
   public function noSet($test_value) {
     \Drupal::service('session_handler.write_safe')->setSessionWritable(FALSE);
     $this->set($test_value);
-    return ['#markup' => $this->t('session saving was disabled, and then %val was set', array('%val' => $test_value))];
+    return ['#markup' => $this->t('session saving was disabled, and then %val was set', ['%val' => $test_value])];
   }
 
   /**
diff --git a/web/core/modules/system/tests/modules/session_test/src/EventSubscriber/SessionTestSubscriber.php b/web/core/modules/system/tests/modules/session_test/src/EventSubscriber/SessionTestSubscriber.php
index ee03668ea..47c8c5b11 100644
--- a/web/core/modules/system/tests/modules/session_test/src/EventSubscriber/SessionTestSubscriber.php
+++ b/web/core/modules/system/tests/modules/session_test/src/EventSubscriber/SessionTestSubscriber.php
@@ -49,8 +49,8 @@ class SessionTestSubscriber implements EventSubscriberInterface {
    *   An array of event listener definitions.
    */
   public static function getSubscribedEvents() {
-    $events[KernelEvents::RESPONSE][] = array('onKernelResponseSessionTest');
-    $events[KernelEvents::REQUEST][] = array('onKernelRequestSessionTest');
+    $events[KernelEvents::RESPONSE][] = ['onKernelResponseSessionTest'];
+    $events[KernelEvents::REQUEST][] = ['onKernelRequestSessionTest'];
     return $events;
   }
 
diff --git a/web/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php b/web/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php
index 70c4f8347..bf250ac45 100644
--- a/web/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php
+++ b/web/core/modules/system/tests/modules/session_test/src/Form/SessionTestForm.php
@@ -22,17 +22,17 @@ class SessionTestForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['input'] = array(
+    $form['input'] = [
       '#type' => 'textfield',
       '#title' => 'Input',
       '#required' => TRUE,
-    );
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => 'Save',
-    );
+    ];
 
     return $form;
   }
@@ -41,7 +41,7 @@ class SessionTestForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    drupal_set_message(SafeMarkup::format('Ok: @input', array('@input' => $form_state->getValue('input'))));
+    drupal_set_message(SafeMarkup::format('Ok: @input', ['@input' => $form_state->getValue('input')]));
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php b/web/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
index f2e138621..5e49c2403 100644
--- a/web/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
+++ b/web/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
@@ -206,15 +206,15 @@ class SystemTestController extends ControllerBase {
    * Set cache tag on on the returned render array.
    */
   public function system_test_cache_tags_page() {
-    $build['main'] = array(
-      '#cache' => array('tags' => array('system_test_cache_tags_page')),
-      '#pre_render' => array(
+    $build['main'] = [
+      '#cache' => ['tags' => ['system_test_cache_tags_page']],
+      '#pre_render' => [
         '\Drupal\system_test\Controller\SystemTestController::preRenderCacheTags',
-      ),
-      'message' => array(
+      ],
+      'message' => [
         '#markup' => 'Cache tags page example',
-      ),
-    );
+      ],
+    ];
     return $build;
   }
 
@@ -222,12 +222,12 @@ class SystemTestController extends ControllerBase {
    * Set cache max-age on the returned render array.
    */
   public function system_test_cache_maxage_page() {
-    $build['main'] = array(
-      '#cache' => array('max-age' => 90),
-      'message' => array(
+    $build['main'] = [
+      '#cache' => ['max-age' => 90],
+      'message' => [
         '#markup' => 'Cache max-age page example',
-      ),
-    );
+      ],
+    ];
     return $build;
   }
 
@@ -245,8 +245,8 @@ class SystemTestController extends ControllerBase {
    * @see system_authorized_init()
    */
   public function authorizeInit($page_title) {
-    $authorize_url = Url::fromUri('base:core/authorize.php', array('absolute' => TRUE))->toString();
-    system_authorized_init('system_test_authorize_run', __DIR__ . '/../../system_test.module', array(), $page_title);
+    $authorize_url = Url::fromUri('base:core/authorize.php', ['absolute' => TRUE])->toString();
+    system_authorized_init('system_test_authorize_run', __DIR__ . '/../../system_test.module', [], $page_title);
     return new RedirectResponse($authorize_url);
   }
 
@@ -258,7 +258,7 @@ class SystemTestController extends ControllerBase {
     $response = new CacheableResponse();
     $response->headers->set($query['name'], $query['value']);
     $response->getCacheableMetadata()->addCacheContexts(['url.query_args:name', 'url.query_args:value']);
-    $response->setContent($this->t('The following header was set: %name: %value', array('%name' => $query['name'], '%value' => $query['value'])));
+    $response->setContent($this->t('The following header was set: %name: %value', ['%name' => $query['name'], '%value' => $query['value']]));
 
     return $response;
   }
@@ -312,6 +312,21 @@ class SystemTestController extends ControllerBase {
     return 'Bar.' . $foo;
   }
 
+  /**
+   * Simple argument echo.
+   *
+   * @param string $text
+   *   Any string for the {text} slug.
+   *
+   * @return array
+   *   A render array.
+   */
+  public function simpleEcho($text) {
+    return [
+      '#plain_text' => $text,
+    ];
+  }
+
   /**
    * Shows permission-dependent content.
    *
@@ -339,7 +354,7 @@ class SystemTestController extends ControllerBase {
   /**
    * Returns the current date.
    *
-   * @return \Symfony\Component\HttpFoundation\Response $response
+   * @return \Symfony\Component\HttpFoundation\Response
    *   A Response object containing the current date.
    */
   public function getCurrentDate() {
@@ -351,7 +366,7 @@ class SystemTestController extends ControllerBase {
   /**
    * Returns a response with a test header set from the request.
    *
-   * @return \Symfony\Component\HttpFoundation\Response $response
+   * @return \Symfony\Component\HttpFoundation\Response
    *   A Response object containing the test header.
    */
   public function getTestHeader(Request $request) {
diff --git a/web/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php b/web/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php
index de065af25..b7ea3f21e 100644
--- a/web/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php
+++ b/web/core/modules/system/tests/modules/system_test/src/MockFileTransfer.php
@@ -21,11 +21,11 @@ class MockFileTransfer {
    * Returns a settings form with a text field to input a username.
    */
   public function getSettingsForm() {
-    $form = array();
-    $form['system_test_username'] = array(
+    $form = [];
+    $form['system_test_username'] = [
       '#type' => 'textfield',
       '#title' => t('System Test Username'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/system/tests/modules/system_test/system_test.module b/web/core/modules/system/tests/modules/system_test/system_test.module
index 04fa2daaf..81739086c 100644
--- a/web/core/modules/system/tests/modules/system_test/system_test.module
+++ b/web/core/modules/system/tests/modules/system_test/system_test.module
@@ -27,7 +27,7 @@ function system_test_help($route_name, RouteMatchInterface $route_match) {
 function system_test_modules_installed($modules) {
   if (\Drupal::state()->get('system_test.verbose_module_hooks')) {
     foreach ($modules as $module) {
-      drupal_set_message(t('hook_modules_installed fired for @module', array('@module' => $module)));
+      drupal_set_message(t('hook_modules_installed fired for @module', ['@module' => $module]));
     }
   }
 }
@@ -38,7 +38,7 @@ function system_test_modules_installed($modules) {
 function system_test_modules_uninstalled($modules) {
   if (\Drupal::state()->get('system_test.verbose_module_hooks')) {
     foreach ($modules as $module) {
-      drupal_set_message(t('hook_modules_uninstalled fired for @module', array('@module' => $module)));
+      drupal_set_message(t('hook_modules_uninstalled fired for @module', ['@module' => $module]));
     }
   }
 }
@@ -66,12 +66,12 @@ function system_test_system_info_alter(&$info, Extension $file, $type) {
   if ($file->getName() == 'system_dependencies_test') {
     $info['hidden'] = FALSE;
   }
-  if (in_array($file->getName(), array(
+  if (in_array($file->getName(), [
     'system_incompatible_module_version_dependencies_test',
     'system_incompatible_core_version_dependencies_test',
     'system_incompatible_module_version_test',
     'system_incompatible_core_version_test',
-  ))) {
+  ])) {
     $info['hidden'] = FALSE;
   }
   if ($file->getName() == 'requirements1_test' || $file->getName() == 'requirements2_test') {
@@ -99,7 +99,7 @@ function system_test_page_attachments(array &$page) {
  */
 function _system_test_first_shutdown_function($arg1, $arg2) {
   // Set something to ensure that this function got called.
-  \Drupal::state()->set('_system_test_first_shutdown_function', array($arg1, $arg2));
+  \Drupal::state()->set('_system_test_first_shutdown_function', [$arg1, $arg2]);
   drupal_register_shutdown_function('_system_test_second_shutdown_function', $arg1, $arg2);
 }
 
@@ -108,7 +108,7 @@ function _system_test_first_shutdown_function($arg1, $arg2) {
  */
 function _system_test_second_shutdown_function($arg1, $arg2) {
   // Set something to ensure that this function got called.
-  \Drupal::state()->set('_system_test_second_shutdown_function', array($arg1, $arg2));
+  \Drupal::state()->set('_system_test_second_shutdown_function', [$arg1, $arg2]);
 
   // Throw an exception with an HTML tag. Since this is called in a shutdown
   // function, it will not bubble up to the default exception handler but will
@@ -121,13 +121,13 @@ function _system_test_second_shutdown_function($arg1, $arg2) {
  * Implements hook_filetransfer_info().
  */
 function system_test_filetransfer_info() {
-  return array(
-    'system_test' => array(
+  return [
+    'system_test' => [
       'title' => t('System Test FileTransfer'),
       'class' => 'Drupal\system_test\MockFileTransfer',
       'weight' => -10,
-    ),
-  );
+    ],
+  ];
 }
 
 /**
diff --git a/web/core/modules/system/tests/modules/system_test/system_test.routing.yml b/web/core/modules/system/tests/modules/system_test/system_test.routing.yml
index f35f5462b..579b5119c 100644
--- a/web/core/modules/system/tests/modules/system_test/system_test.routing.yml
+++ b/web/core/modules/system/tests/modules/system_test/system_test.routing.yml
@@ -182,3 +182,17 @@ system_test.header:
     _controller: '\Drupal\system_test\Controller\SystemTestController::getTestHeader'
   requirements:
     _access: 'TRUE'
+
+system_test.echo:
+  path: '/system-test/echo/{text}'
+  defaults:
+    _controller: '\Drupal\system_test\Controller\SystemTestController::simpleEcho'
+  requirements:
+    _access: 'TRUE'
+
+system_test.echo_utf8:
+  path: '/system-test/Ȅchȏ/meφΩ/{text}'
+  defaults:
+    _controller: '\Drupal\system_test\Controller\SystemTestController::simpleEcho'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php b/web/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
index 7bb0fb115..2de84e959 100644
--- a/web/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
+++ b/web/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
@@ -15,7 +15,7 @@ class Test {
    *   A render array as expected by drupal_render()
    */
   public function renderTitle() {
-    $build = array();
+    $build = [];
     $build['#markup'] = 'Hello Drupal';
     $build['#title'] = 'Foo';
 
@@ -29,7 +29,7 @@ class Test {
    *   A render array as expected by drupal_render().
    */
   public function staticTitle() {
-    $build = array();
+    $build = [];
     $build['#markup'] = 'Hello Drupal';
 
     return $build;
@@ -66,9 +66,9 @@ class Test {
    *   A render array as expected by drupal_render()
    */
   public function renderPage() {
-    return array(
+    return [
       '#markup' => 'Content',
-    );
+    ];
   }
 
   /**
@@ -98,4 +98,14 @@ class Test {
     return ['#plain_text' => 'Bad html <script>alert(123);</script>'];
   }
 
+  /**
+   * Renders a page with pipe character in link test.
+   *
+   * @return array
+   *   A render array as expected by drupal_render()
+   */
+  public function renderPipeInLink() {
+    return ['#markup' => '<a href="http://example.com">foo|bar|baz</a>'];
+  }
+
 }
diff --git a/web/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php b/web/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php
new file mode 100644
index 000000000..5f25dd75d
--- /dev/null
+++ b/web/core/modules/system/tests/modules/test_page_test/src/Form/TestForm.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\test_page_test\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Defines a test form for testing assertions.
+ */
+class TestForm extends FormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['test_table'] = [
+      '#type' => 'table',
+      '#header' => ['Column 1', 'Column 2', 'Column 3'],
+      'row_1' => [
+        'col_1' => ['#plain_text' => 'foo'],
+        'col_2' => ['#plain_text' => 'bar'],
+        'col_3' => ['#plain_text' => 'baz'],
+      ],
+      'row_2' => [
+        'col_1' => ['#plain_text' => 'one'],
+        'col_2' => ['#plain_text' => 'two'],
+        'col_3' => ['#plain_text' => 'three'],
+      ],
+    ];
+
+    $form['name'] = [
+      '#type' => 'textfield',
+      '#title' => 'Name',
+      '#default_value' => 'Test name',
+    ];
+
+    $form['description'] = [
+      '#type' => 'textfield',
+      '#title' => 'Description',
+      '#default_value' => '',
+    ];
+
+    $form['options'] = [
+      '#type' => 'select',
+      '#title' => 'Options',
+      '#options' => [
+        1 => 'one',
+        2 => 'two',
+        3 => 'three',
+      ],
+      '#default_value' => 2,
+    ];
+
+    $form['save'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Save'),
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'test_page_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // Empty on purpose, we just want to test the rendered form elements.
+  }
+
+}
diff --git a/web/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml b/web/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
index cbcf6d839..5d84695f8 100644
--- a/web/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
+++ b/web/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
@@ -66,3 +66,19 @@ test_page_test.encoded:
     _controller: '\Drupal\test_page_test\Controller\Test::renderEncodedMarkup'
   requirements:
     _access: 'TRUE'
+
+test_page_test.pipe:
+  path: '/test-pipe-char'
+  defaults:
+    _title: 'Page with pipe char in link'
+    _controller: '\Drupal\test_page_test\Controller\Test::renderPipeInLink'
+  requirements:
+    _access: 'TRUE'
+
+test_page_test.field_xpath:
+  path: '/test-field-xpath'
+  defaults:
+    _title: 'Table and form elements for field xpath assertion testing'
+    _form: '\Drupal\test_page_test\Form\TestForm'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module b/web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module
index 974856ad2..50fb86d2b 100644
--- a/web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module
+++ b/web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module
@@ -9,11 +9,11 @@
  * Implements hook_theme().
  */
 function theme_suggestions_test_theme() {
-  $items['theme_suggestions_test_include'] = array(
+  $items['theme_suggestions_test_include'] = [
     'file' => 'theme_suggestions_test.inc',
-    'variables' => array(),
+    'variables' => [],
     'function' => 'theme_theme_suggestions_test_include',
-  );
+  ];
   return $items;
 }
 
diff --git a/web/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php b/web/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
index d5f9110a7..8ac86f1a9 100644
--- a/web/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
+++ b/web/core/modules/system/tests/modules/theme_test/src/EventSubscriber/ThemeTestSubscriber.php
@@ -63,11 +63,11 @@ class ThemeTestSubscriber implements EventSubscriberInterface {
       // theme_test_request_listener_page_callback() to test that even when the
       // theme system is initialized this early, it is still capable of
       // returning output and theming the page as a whole.
-      $more_link = array(
+      $more_link = [
         '#type' => 'more_link',
         '#url' => Url::fromRoute('user.page'),
-        '#attributes' => array('title' => 'Themed output generated in a KernelEvents::REQUEST listener'),
-      );
+        '#attributes' => ['title' => 'Themed output generated in a KernelEvents::REQUEST listener'],
+      ];
       $GLOBALS['theme_test_output'] = $this->renderer->renderPlain($more_link);
     }
   }
@@ -77,9 +77,9 @@ class ThemeTestSubscriber implements EventSubscriberInterface {
    */
   public function onView(GetResponseEvent $event) {
     $current_route = $this->currentRouteMatch->getRouteName();
-    $entity_autcomplete_route = array(
+    $entity_autcomplete_route = [
       'system.entity_autocomplete',
-    );
+    ];
 
     if (in_array($current_route, $entity_autcomplete_route)) {
       if ($this->container->initialized('theme.registry')) {
@@ -91,9 +91,9 @@ class ThemeTestSubscriber implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  static function getSubscribedEvents() {
-    $events[KernelEvents::REQUEST][] = array('onRequest');
-    $events[KernelEvents::VIEW][] = array('onView', -1000);
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::REQUEST][] = ['onRequest'];
+    $events[KernelEvents::VIEW][] = ['onView', -1000];
     return $events;
   }
 
diff --git a/web/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php b/web/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php
index 639f1b743..f1ed8f3a9 100644
--- a/web/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php
+++ b/web/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php
@@ -17,9 +17,9 @@ class ThemeTestController extends ControllerBase {
    *   Render array containing a theme.
    */
   public function functionTemplateOverridden() {
-    return array(
+    return [
       '#theme' => 'theme_test_function_template_override',
-    );
+    ];
   }
 
   /**
@@ -29,13 +29,13 @@ class ThemeTestController extends ControllerBase {
    *   A render array containing custom stylesheets.
    */
   public function testInfoStylesheets() {
-    return array(
-      '#attached' => array(
-        'library' => array(
+    return [
+      '#attached' => [
+        'library' => [
           'theme_test/theme_stylesheets_override_and_remove_test',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -45,7 +45,7 @@ class ThemeTestController extends ControllerBase {
    *   A render array containing a theme override.
    */
   public function testTemplate() {
-    return ['#markup' => \Drupal::theme()->render('theme_test_template_test', array())];
+    return ['#markup' => \Drupal::theme()->render('theme_test_template_test', [])];
   }
 
   /**
@@ -55,12 +55,12 @@ class ThemeTestController extends ControllerBase {
    *   A render array containing an inline template.
    */
   public function testInlineTemplate() {
-    $element = array();
-    $element['test'] = array(
+    $element = [];
+    $element['test'] = [
       '#type' => 'inline_template',
       '#template' => 'test-with-context {{ llama }}',
-      '#context' => array('llama' => 'muuh'),
-    );
+      '#context' => ['llama' => 'muuh'],
+    ];
     return $element;
   }
 
@@ -71,7 +71,7 @@ class ThemeTestController extends ControllerBase {
    *   An HTML string containing the themed output.
    */
   public function testSuggestion() {
-    return ['#markup' => \Drupal::theme()->render(array('theme_test__suggestion', 'theme_test'), array())];
+    return ['#markup' => \Drupal::theme()->render(['theme_test__suggestion', 'theme_test'], [])];
   }
 
   /**
@@ -87,44 +87,44 @@ class ThemeTestController extends ControllerBase {
   /**
    * Menu callback for testing suggestion alter hooks with template files.
    */
-  function suggestionProvided() {
-    return array('#theme' => 'theme_test_suggestion_provided');
+  public function suggestionProvided() {
+    return ['#theme' => 'theme_test_suggestion_provided'];
   }
 
   /**
    * Menu callback for testing suggestion alter hooks with template files.
    */
-  function suggestionAlter() {
-    return array('#theme' => 'theme_test_suggestions');
+  public function suggestionAlter() {
+    return ['#theme' => 'theme_test_suggestions'];
   }
 
   /**
    * Menu callback for testing hook_theme_suggestions_alter().
    */
-  function generalSuggestionAlter() {
-    return array('#theme' => 'theme_test_general_suggestions');
+  public function generalSuggestionAlter() {
+    return ['#theme' => 'theme_test_general_suggestions'];
   }
 
   /**
    * Menu callback for testing suggestion alter hooks with specific suggestions.
    */
-  function specificSuggestionAlter() {
-    return array('#theme' => 'theme_test_specific_suggestions__variant');
+  public function specificSuggestionAlter() {
+    return ['#theme' => 'theme_test_specific_suggestions__variant'];
   }
 
   /**
    * Menu callback for testing suggestion alter hooks with theme functions.
    */
-  function functionSuggestionAlter() {
-    return array('#theme' => 'theme_test_function_suggestions');
+  public function functionSuggestionAlter() {
+    return ['#theme' => 'theme_test_function_suggestions'];
   }
 
 
   /**
    * Menu callback for testing includes with suggestion alter hooks.
    */
-  function suggestionAlterInclude() {
-    return array('#theme' => 'theme_test_suggestions_include');
+  public function suggestionAlterInclude() {
+    return ['#theme' => 'theme_test_suggestions_include'];
   }
 
   /**
diff --git a/web/core/modules/system/tests/modules/theme_test/theme_test.module b/web/core/modules/system/tests/modules/theme_test/theme_test.module
index 540185ec9..2e6f16473 100644
--- a/web/core/modules/system/tests/modules/theme_test/theme_test.module
+++ b/web/core/modules/system/tests/modules/theme_test/theme_test.module
@@ -11,55 +11,55 @@ use Drupal\Core\Extension\Extension;
  * Implements hook_theme().
  */
 function theme_test_theme($existing, $type, $theme, $path) {
-  $items['theme_test'] = array(
+  $items['theme_test'] = [
     'file' => 'theme_test.inc',
-    'variables' => array('foo' => ''),
+    'variables' => ['foo' => ''],
     'function' => 'theme_theme_test',
-  );
-  $items['theme_test_template_test'] = array(
+  ];
+  $items['theme_test_template_test'] = [
     'template' => 'theme_test.template_test',
-  );
-  $items['theme_test_template_test_2'] = array(
+  ];
+  $items['theme_test_template_test_2'] = [
     'template' => 'theme_test.template_test',
-  );
-  $items['theme_test_suggestion_provided'] = array(
-    'variables' => array(),
-  );
-  $items['theme_test_specific_suggestions'] = array(
-    'variables' => array(),
-  );
-  $items['theme_test_suggestions'] = array(
-    'variables' => array(),
-  );
-  $items['theme_test_general_suggestions'] = array(
-    'variables' => array(),
-  );
-  $items['theme_test_function_suggestions'] = array(
-    'variables' => array(),
+  ];
+  $items['theme_test_suggestion_provided'] = [
+    'variables' => [],
+  ];
+  $items['theme_test_specific_suggestions'] = [
+    'variables' => [],
+  ];
+  $items['theme_test_suggestions'] = [
+    'variables' => [],
+  ];
+  $items['theme_test_general_suggestions'] = [
+    'variables' => [],
+  ];
+  $items['theme_test_function_suggestions'] = [
+    'variables' => [],
     'function' => 'theme_theme_test_function_suggestions',
-  );
-  $items['theme_test_suggestions_include'] = array(
-    'variables' => array(),
+  ];
+  $items['theme_test_suggestions_include'] = [
+    'variables' => [],
     'function' => 'theme_theme_test_suggestions_include',
-  );
-  $items['theme_test_foo'] = array(
-    'variables' => array('foo' => NULL),
+  ];
+  $items['theme_test_foo'] = [
+    'variables' => ['foo' => NULL],
     'function' => 'theme_theme_test_foo',
-  );
-  $items['theme_test_render_element'] = array(
+  ];
+  $items['theme_test_render_element'] = [
     'render element' => 'elements',
-  );
-  $items['theme_test_render_element_children'] = array(
+  ];
+  $items['theme_test_render_element_children'] = [
     'render element' => 'element',
     'function' => 'theme_theme_test_render_element_children',
-  );
-  $items['theme_test_function_template_override'] = array(
-    'variables' => array(),
+  ];
+  $items['theme_test_function_template_override'] = [
+    'variables' => [],
     'function' => 'theme_theme_test_function_template_override',
-  );
-  $info['test_theme_not_existing_function'] = array(
+  ];
+  $info['test_theme_not_existing_function'] = [
     'function' => 'test_theme_not_existing_function',
-  );
+  ];
   $items['theme_test_preprocess_suggestions'] = [
     'variables' => [
       'foo' => '',
@@ -83,7 +83,7 @@ function theme_test_preprocess_html(&$variables) {
  * Implements hook_page_bottom().
  */
 function theme_test_page_bottom(array &$page_bottom) {
-  $page_bottom['theme_test_page_bottom'] = array('#markup' => 'theme test page bottom markup');
+  $page_bottom['theme_test_page_bottom'] = ['#markup' => 'theme test page bottom markup'];
 }
 
 /**
@@ -167,7 +167,7 @@ function theme_theme_test_function_suggestions($variables) {
  * Implements hook_theme_suggestions_HOOK().
  */
 function theme_test_theme_suggestions_theme_test_suggestion_provided(array $variables) {
-  return array('theme_test_suggestion_provided__' . 'foo');
+  return ['theme_test_suggestion_provided__' . 'foo'];
 }
 
 /**
diff --git a/web/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php b/web/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
index 4afa3a78c..b364c59dd 100644
--- a/web/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
+++ b/web/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
@@ -2,12 +2,11 @@
 
 namespace Drupal\twig_extension_test\TwigExtension;
 
-use Drupal\Core\Template\TwigExtension;
 
 /**
  * A test Twig extension that adds a custom function and a custom filter.
  */
-class TestExtension extends TwigExtension {
+class TestExtension extends \Twig_Extension {
 
   /**
    * Generates a list of all Twig functions that this extension defines.
@@ -22,9 +21,9 @@ class TestExtension extends TwigExtension {
    *   The value is a standard PHP callback that defines what the function does.
    */
   public function getFunctions() {
-    return array(
-      'testfunc' => new \Twig_Function_Function(array('Drupal\twig_extension_test\TwigExtension\TestExtension', 'testFunction')),
-    );
+    return [
+      'testfunc' => new \Twig_Function_Function(['Drupal\twig_extension_test\TwigExtension\TestExtension', 'testFunction']),
+    ];
   }
 
   /**
@@ -40,9 +39,9 @@ class TestExtension extends TwigExtension {
    *   The value is a standard PHP callback that defines what the filter does.
    */
   public function getFilters() {
-    return array(
-      'testfilter' => new \Twig_Filter_Function(array('Drupal\twig_extension_test\TwigExtension\TestExtension', 'testFilter')),
-    );
+    return [
+      'testfilter' => new \Twig_Filter_Function(['Drupal\twig_extension_test\TwigExtension\TestExtension', 'testFilter']),
+    ];
   }
 
   /**
@@ -94,7 +93,7 @@ class TestExtension extends TwigExtension {
    * @see \Drupal\system\Tests\Theme\TwigExtensionTest::testTwigExtensionFilter()
    */
   public static function testFilter($string) {
-    return str_replace(array('animal'), array('plant'), $string);
+    return str_replace(['animal'], ['plant'], $string);
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/twig_extension_test/src/TwigExtensionTestController.php b/web/core/modules/system/tests/modules/twig_extension_test/src/TwigExtensionTestController.php
index 44e42d950..c15b16d8b 100644
--- a/web/core/modules/system/tests/modules/twig_extension_test/src/TwigExtensionTestController.php
+++ b/web/core/modules/system/tests/modules/twig_extension_test/src/TwigExtensionTestController.php
@@ -14,7 +14,7 @@ class TwigExtensionTestController {
    * Menu callback for testing Twig filters in a Twig template.
    */
   public function testFilterRender() {
-    return array(
+    return [
       '#theme' => 'twig_extension_test_filter',
       '#message' => 'Every animal is not a mineral.',
       '#safe_join_items' => [
@@ -22,14 +22,14 @@ class TwigExtensionTestController {
         $this->t('<em>will be markup</em>'),
         ['#markup' => '<strong>will be rendered</strong>']
       ]
-    );
+    ];
   }
 
   /**
    * Menu callback for testing Twig functions in a Twig template.
    */
   public function testFunctionRender() {
-    return array('#theme' => 'twig_extension_test_function');
+    return ['#theme' => 'twig_extension_test_function'];
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/twig_extension_test/twig_extension_test.module b/web/core/modules/system/tests/modules/twig_extension_test/twig_extension_test.module
index f55e619a7..eb69e3449 100644
--- a/web/core/modules/system/tests/modules/twig_extension_test/twig_extension_test.module
+++ b/web/core/modules/system/tests/modules/twig_extension_test/twig_extension_test.module
@@ -9,14 +9,14 @@
  * Implements hook_theme().
  */
 function twig_extension_test_theme($existing, $type, $theme, $path) {
-  return array(
-    'twig_extension_test_filter' => array(
-      'variables' => array('message' => NULL, 'safe_join_items' => NULL),
+  return [
+    'twig_extension_test_filter' => [
+      'variables' => ['message' => NULL, 'safe_join_items' => NULL],
       'template' => 'twig_extension_test.filter',
-    ),
-    'twig_extension_test_function' => array(
+    ],
+    'twig_extension_test_function' => [
       'render element' => 'element',
       'template' => 'twig_extension_test.function',
-    ),
-  );
+    ],
+  ];
 }
diff --git a/web/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php b/web/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
index 7408ce8f4..8e1f69e79 100644
--- a/web/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
+++ b/web/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
@@ -14,16 +14,16 @@ class TwigThemeTestController {
    * Menu callback for testing PHP variables in a Twig template.
    */
   public function phpVariablesRender() {
-    return ['#markup' => \Drupal::theme()->render('twig_theme_test_php_variables', array())];
+    return ['#markup' => \Drupal::theme()->render('twig_theme_test_php_variables', [])];
   }
 
   /**
    * Menu callback for testing translation blocks in a Twig template.
    */
   public function transBlockRender() {
-    return array(
+    return [
       '#theme' => 'twig_theme_test_trans',
-    );
+    ];
   }
 
   /**
@@ -40,9 +40,9 @@ class TwigThemeTestController {
    * Renders for testing url_generator functions in a Twig template.
    */
   public function urlGeneratorRender() {
-    return array(
+    return [
       '#theme' => 'twig_theme_test_url_generator',
-    );
+    ];
   }
 
   /**
@@ -73,25 +73,25 @@ class TwigThemeTestController {
    * Renders for testing file_url functions in a Twig template.
    */
   public function fileUrlRender() {
-    return array(
+    return [
       '#theme' => 'twig_theme_test_file_url',
-    );
+    ];
   }
 
   /**
    * Renders for testing attach_library functions in a Twig template.
    */
   public function attachLibraryRender() {
-    return array(
+    return [
       '#theme' => 'twig_theme_test_attach_library',
-    );
+    ];
   }
 
   /**
    * Menu callback for testing the Twig registry loader.
    */
   public function registryLoaderRender() {
-    return array('#theme' => 'twig_registry_loader_test');
+    return ['#theme' => 'twig_registry_loader_test'];
   }
 
   /**
diff --git a/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig b/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig
index a836aec93..1b20b46e0 100644
--- a/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig
+++ b/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig
@@ -7,3 +7,4 @@
 <div>link via the linkgenerator: {{ link(title, test_url) }}</div>
 {% set title %}<span>register</span><svg></svg>{% endset %}
 <div>link via the linkgenerator: {{ link(title, test_url) }}</div>
+<div>link via the linkgenerator: {{ link('register', test_url_attribute) }} {{ link('register', test_url_attribute) }}</div>
diff --git a/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
index b3a75e518..a8b408620 100644
--- a/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
+++ b/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
@@ -9,70 +9,70 @@
  * Implements hook_theme().
  */
 function twig_theme_test_theme($existing, $type, $theme, $path) {
-  $items['twig_theme_test_filter'] = array(
-    'variables' => array('quote' => array(), 'attributes' => array()),
+  $items['twig_theme_test_filter'] = [
+    'variables' => ['quote' => [], 'attributes' => []],
     'template' => 'twig_theme_test.filter',
-  );
-  $items['twig_theme_test_php_variables'] = array(
+  ];
+  $items['twig_theme_test_php_variables'] = [
     'template' => 'twig_theme_test.php_variables',
-  );
-  $items['twig_theme_test_trans'] = array(
-    'variables' => array(),
+  ];
+  $items['twig_theme_test_trans'] = [
+    'variables' => [],
     'template' => 'twig_theme_test.trans',
-  );
-  $items['twig_theme_test_placeholder_outside_trans'] = array(
-    'variables' => array('var' => ''),
+  ];
+  $items['twig_theme_test_placeholder_outside_trans'] = [
+    'variables' => ['var' => ''],
     'template' => 'twig_theme_test.placeholder_outside_trans',
-  );
-  $items['twig_namespace_test'] = array(
-    'variables' => array(),
+  ];
+  $items['twig_namespace_test'] = [
+    'variables' => [],
     'template' => 'twig_namespace_test',
-  );
-  $items['twig_registry_loader_test'] = array(
-    'variables' => array(),
-  );
-  $items['twig_registry_loader_test_include'] = array(
-    'variables' => array(),
-  );
-  $items['twig_registry_loader_test_extend'] = array(
-    'variables' => array(),
-  );
-  $items['twig_raw_test'] = array(
-    'variables' => array('script' => ''),
-  );
-  $items['twig_autoescape_test'] = array(
-    'variables' => array('script' => ''),
-  );
-  $items['twig_theme_test_url_generator'] = array(
-    'variables' => array(),
+  ];
+  $items['twig_registry_loader_test'] = [
+    'variables' => [],
+  ];
+  $items['twig_registry_loader_test_include'] = [
+    'variables' => [],
+  ];
+  $items['twig_registry_loader_test_extend'] = [
+    'variables' => [],
+  ];
+  $items['twig_raw_test'] = [
+    'variables' => ['script' => ''],
+  ];
+  $items['twig_autoescape_test'] = [
+    'variables' => ['script' => ''],
+  ];
+  $items['twig_theme_test_url_generator'] = [
+    'variables' => [],
     'template' => 'twig_theme_test.url_generator',
-  );
-  $items['twig_theme_test_link_generator'] = array(
+  ];
+  $items['twig_theme_test_link_generator'] = [
     'variables' => [
       'test_url' => NULL,
       'test_url_attribute' => NULL,
       'attributes' => [],
     ],
     'template' => 'twig_theme_test.link_generator',
-  );
-  $items['twig_theme_test_url_to_string'] = array(
-    'variables' => array('test_url' => NULL),
+  ];
+  $items['twig_theme_test_url_to_string'] = [
+    'variables' => ['test_url' => NULL],
     'template' => 'twig_theme_test.url_to_string',
-  );
-  $items['twig_theme_test_file_url'] = array(
-    'variables' => array(),
+  ];
+  $items['twig_theme_test_file_url'] = [
+    'variables' => [],
     'template' => 'twig_theme_test.file_url',
-  );
-  $items['twig_theme_test_attach_library'] = array(
-    'variables' => array(),
+  ];
+  $items['twig_theme_test_attach_library'] = [
+    'variables' => [],
     'template' => 'twig_theme_test.attach_library',
-  );
-  $items['twig_theme_test_renderable'] = array(
-    'variables' => array(
+  ];
+  $items['twig_theme_test_renderable'] = [
+    'variables' => [
       'renderable' => NULL,
-    ),
+    ],
     'template' => 'twig_theme_test.renderable',
-  );
+  ];
   return $items;
 }
 
@@ -83,36 +83,36 @@ function _test_theme_twig_php_values() {
   // Prefix each variable with "twig_" so that Twig doesn't get confused
   // between a variable and a primitive. Arrays are not tested since they should
   // be a Drupal render array.
-  return array(
-    'twig_null' => array(
+  return [
+    'twig_null' => [
       'value' => NULL,
       'expected' => '',
-    ),
-    'twig_bool_false' => array(
+    ],
+    'twig_bool_false' => [
       'value' => FALSE,
       'expected' => '',
-    ),
-    'twig_bool_true' => array(
+    ],
+    'twig_bool_true' => [
       'value' => TRUE,
       'expected' => '1',
-    ),
-    'twig_int' => array(
+    ],
+    'twig_int' => [
       'value' => 1,
       'expected' => '1',
-    ),
-    'twig_int_0' => array(
+    ],
+    'twig_int_0' => [
       'value' => 0,
       'expected' => '0',
-    ),
-    'twig_float' => array(
+    ],
+    'twig_float' => [
       'value' => 122.34343,
       'expected' => '122.34343',
-    ),
-    'twig_string' => array(
+    ],
+    'twig_string' => [
       'value' => 'Hello world!',
       'expected' => 'Hello world!',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
diff --git a/web/core/modules/system/tests/modules/update_script_test/src/Controller/UpdateScriptTestController.php b/web/core/modules/system/tests/modules/update_script_test/src/Controller/UpdateScriptTestController.php
index b72ab1b91..e1c21c29c 100644
--- a/web/core/modules/system/tests/modules/update_script_test/src/Controller/UpdateScriptTestController.php
+++ b/web/core/modules/system/tests/modules/update_script_test/src/Controller/UpdateScriptTestController.php
@@ -18,12 +18,12 @@ class UpdateScriptTestController extends ControllerBase {
     // @todo Simplify with https://www.drupal.org/node/2548095
     $base_url = str_replace('/update.php', '', $request->getBaseUrl());
     $url = (new Url('system.db_update'))->setOption('base_url', $base_url);
-    $build['main'] = array(
+    $build['main'] = [
       '#type' => 'link',
       '#title' => $this->t('Run database updates'),
       '#url' => $url,
       '#access' => $url->access($this->currentUser()),
-    );
+    ];
 
     return $build;
   }
diff --git a/web/core/modules/system/tests/modules/update_script_test/update_script_test.install b/web/core/modules/system/tests/modules/update_script_test/update_script_test.install
index 0f1718d7d..ce3874320 100644
--- a/web/core/modules/system/tests/modules/update_script_test/update_script_test.install
+++ b/web/core/modules/system/tests/modules/update_script_test/update_script_test.install
@@ -9,27 +9,27 @@
  * Implements hook_requirements().
  */
 function update_script_test_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
 
   if ($phase == 'update') {
     // Set a requirements warning or error when the test requests it.
     $requirement_type = \Drupal::config('update_script_test.settings')->get('requirement_type');
     switch ($requirement_type) {
       case REQUIREMENT_WARNING:
-        $requirements['update_script_test'] = array(
+        $requirements['update_script_test'] = [
           'title' => 'Update script test',
           'value' => 'Warning',
           'description' => 'This is a requirements warning provided by the update_script_test module.',
           'severity' => REQUIREMENT_WARNING,
-        );
+        ];
         break;
       case REQUIREMENT_ERROR:
-        $requirements['update_script_test'] = array(
+        $requirements['update_script_test'] = [
           'title' => 'Update script test',
           'value' => 'Error',
           'description' => 'This is a requirements error provided by the update_script_test module.',
           'severity' => REQUIREMENT_ERROR,
-        );
+        ];
         break;
     }
   }
diff --git a/web/core/modules/system/tests/modules/update_test_1/update_test_1.install b/web/core/modules/system/tests/modules/update_test_1/update_test_1.install
index 7ef5d98ad..1d632c713 100644
--- a/web/core/modules/system/tests/modules/update_test_1/update_test_1.install
+++ b/web/core/modules/system/tests/modules/update_test_1/update_test_1.install
@@ -18,21 +18,21 @@ function update_test_1_update_dependencies() {
   // the correct array structure. Therefore, we use updates from the
   // update_test_0 module (which will be installed first) that they will not
   // get in the way of other tests.
-  $dependencies['update_test_0'][8001] = array(
+  $dependencies['update_test_0'][8001] = [
     // Compare to update_test_2_update_dependencies(), where the same
     // update_test_0 module update function is forced to depend on an update
     // function from a different module. This allows us to test that both
     // dependencies are correctly recorded.
     'update_test_1' => 8001,
-  );
-  $dependencies['update_test_0'][8002] = array(
+  ];
+  $dependencies['update_test_0'][8002] = [
     // Compare to update_test_2_update_dependencies(), where the same
     // update_test_0 module update function is forced to depend on a
     // different update function within the same module. This allows us to
     // test that only the dependency on the higher-numbered update function
     // is recorded.
     'update_test_1' => 8003,
-  );
+  ];
   return $dependencies;
 }
 
diff --git a/web/core/modules/system/tests/modules/update_test_2/update_test_2.install b/web/core/modules/system/tests/modules/update_test_2/update_test_2.install
index 42027204f..8818545c6 100644
--- a/web/core/modules/system/tests/modules/update_test_2/update_test_2.install
+++ b/web/core/modules/system/tests/modules/update_test_2/update_test_2.install
@@ -18,18 +18,18 @@ function update_test_2_update_dependencies() {
   // 2. update_test_3_update_8001()
   // 3. update_test_2_update_8002()
   // 4. update_test_2_update_8003()
-  $dependencies['update_test_2'][8002] = array(
+  $dependencies['update_test_2'][8002] = [
     'update_test_3' => 8001,
-  );
+  ];
 
   // These are coordinated with the corresponding dependencies declared in
   // update_test_1_update_dependencies().
-  $dependencies['update_test_0'][8001] = array(
+  $dependencies['update_test_0'][8001] = [
     'update_test_2' => 8002,
-  );
-  $dependencies['update_test_0'][8002] = array(
+  ];
+  $dependencies['update_test_0'][8002] = [
     'update_test_1' => 8002,
-  );
+  ];
 
   return $dependencies;
 }
diff --git a/web/core/modules/system/tests/modules/update_test_3/update_test_3.install b/web/core/modules/system/tests/modules/update_test_3/update_test_3.install
index ae2da4b09..6a837b69c 100644
--- a/web/core/modules/system/tests/modules/update_test_3/update_test_3.install
+++ b/web/core/modules/system/tests/modules/update_test_3/update_test_3.install
@@ -11,9 +11,9 @@
  * @see update_test_2_update_dependencies()
  */
 function update_test_3_update_dependencies() {
-  $dependencies['update_test_3'][8001] = array(
+  $dependencies['update_test_3'][8001] = [
     'update_test_2' => 8001,
-  );
+  ];
   return $dependencies;
 }
 
diff --git a/web/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php b/web/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php
index b59fe4ccf..3709907dc 100644
--- a/web/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php
+++ b/web/core/modules/system/tests/modules/url_alter_test/src/PathProcessor.php
@@ -16,7 +16,7 @@ class PathProcessor implements InboundPathProcessorInterface {
   public function processInbound($path, Request $request) {
     if (preg_match('!^/user/([^/]+)(/.*)?!', $path, $matches)) {
       if ($account = user_load_by_name($matches[1])) {
-        $matches += array(2 => '');
+        $matches += [2 => ''];
         $path = '/user/' . $account->id() . $matches[2];
       }
     }
diff --git a/web/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php b/web/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
index e6b9fc2f6..9a89df9b8 100644
--- a/web/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
+++ b/web/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
@@ -20,7 +20,7 @@ class PathProcessorTest implements InboundPathProcessorInterface, OutboundPathPr
     // Rewrite user/username to user/uid.
     if (preg_match('!^/user/([^/]+)(/.*)?!', $path, $matches)) {
       if ($account = user_load_by_name($matches[1])) {
-        $matches += array(2 => '');
+        $matches += [2 => ''];
         $path = '/user/' . $account->id() . $matches[2];
       }
     }
@@ -37,11 +37,11 @@ class PathProcessorTest implements InboundPathProcessorInterface, OutboundPathPr
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     // Rewrite user/uid to user/username.
     if (preg_match('!^/user/([0-9]+)(/.*)?!', $path, $matches)) {
       if ($account = User::load($matches[1])) {
-        $matches += array(2 => '');
+        $matches += [2 => ''];
         $path = '/user/' . $account->getUsername() . $matches[2];
         if ($bubbleable_metadata) {
           $bubbleable_metadata->addCacheTags($account->getCacheTags());
@@ -49,6 +49,11 @@ class PathProcessorTest implements InboundPathProcessorInterface, OutboundPathPr
       }
     }
 
+    // Verify that $options are alterable.
+    if ($path == '/user/login') {
+      $options['query']['foo'] = 'bar';
+    }
+
     // Rewrite forum/ to community/.
     return preg_replace('@^/forum(.*)@', '/community$1', $path);
   }
diff --git a/web/core/modules/system/src/Tests/Bootstrap/DrupalSetMessageTest.php b/web/core/modules/system/tests/src/Functional/Bootstrap/DrupalSetMessageTest.php
similarity index 84%
rename from web/core/modules/system/src/Tests/Bootstrap/DrupalSetMessageTest.php
rename to web/core/modules/system/tests/src/Functional/Bootstrap/DrupalSetMessageTest.php
index 29ca02f3e..976e8bebf 100644
--- a/web/core/modules/system/src/Tests/Bootstrap/DrupalSetMessageTest.php
+++ b/web/core/modules/system/tests/src/Functional/Bootstrap/DrupalSetMessageTest.php
@@ -1,27 +1,27 @@
 <?php
 
-namespace Drupal\system\Tests\Bootstrap;
+namespace Drupal\Tests\system\Functional\Bootstrap;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests drupal_set_message() and related functions.
  *
  * @group Bootstrap
  */
-class DrupalSetMessageTest extends WebTestBase {
+class DrupalSetMessageTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('system_test');
+  public static $modules = ['system_test'];
 
   /**
    * Tests drupal_set_message().
    */
-  function testDrupalSetMessage() {
+  public function testDrupalSetMessage() {
     // The page at system-test/drupal-set-message sets two messages and then
     // removes the first before it is displayed.
     $this->drupalGet('system-test/drupal-set-message');
diff --git a/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php b/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
new file mode 100644
index 000000000..f1439eaeb
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Cache;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Provides helper methods for cache tests.
+ */
+abstract class CacheTestBase extends BrowserTestBase {
+
+  protected $defaultBin = 'render';
+  protected $defaultCid = 'test_temporary';
+  protected $defaultValue = 'CacheTest';
+
+  /**
+   * Checks whether or not a cache entry exists.
+   *
+   * @param $cid
+   *   The cache id.
+   * @param $var
+   *   The variable the cache should contain.
+   * @param $bin
+   *   The bin the cache item was stored in.
+   * @return
+   *   TRUE on pass, FALSE on fail.
+   */
+  protected function checkCacheExists($cid, $var, $bin = NULL) {
+    if ($bin == NULL) {
+      $bin = $this->defaultBin;
+    }
+
+    $cached = \Drupal::cache($bin)->get($cid);
+
+    return isset($cached->data) && $cached->data == $var;
+  }
+
+  /**
+   * Asserts that a cache entry exists.
+   *
+   * @param $message
+   *   Message to display.
+   * @param $var
+   *   The variable the cache should contain.
+   * @param $cid
+   *   The cache id.
+   * @param $bin
+   *   The bin the cache item was stored in.
+   */
+  protected function assertCacheExists($message, $var = NULL, $cid = NULL, $bin = NULL) {
+    if ($bin == NULL) {
+      $bin = $this->defaultBin;
+    }
+    if ($cid == NULL) {
+      $cid = $this->defaultCid;
+    }
+    if ($var == NULL) {
+      $var = $this->defaultValue;
+    }
+
+    $this->assertTrue($this->checkCacheExists($cid, $var, $bin), $message);
+  }
+
+  /**
+   * Asserts that a cache entry has been removed.
+   *
+   * @param $message
+   *   Message to display.
+   * @param $cid
+   *   The cache id.
+   * @param $bin
+   *   The bin the cache item was stored in.
+   */
+  public function assertCacheRemoved($message, $cid = NULL, $bin = NULL) {
+    if ($bin == NULL) {
+      $bin = $this->defaultBin;
+    }
+    if ($cid == NULL) {
+      $cid = $this->defaultCid;
+    }
+
+    $cached = \Drupal::cache($bin)->get($cid);
+    $this->assertFalse($cached, $message);
+  }
+
+}
diff --git a/web/core/modules/system/src/Tests/Cache/ClearTest.php b/web/core/modules/system/tests/src/Functional/Cache/ClearTest.php
similarity index 89%
rename from web/core/modules/system/src/Tests/Cache/ClearTest.php
rename to web/core/modules/system/tests/src/Functional/Cache/ClearTest.php
index 3a3fe905f..bec6d502f 100644
--- a/web/core/modules/system/src/Tests/Cache/ClearTest.php
+++ b/web/core/modules/system/tests/src/Functional/Cache/ClearTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\Cache;
+namespace Drupal\Tests\system\Functional\Cache;
 
 /**
  * Tests our clearing is done the proper way.
@@ -21,7 +21,7 @@ class ClearTest extends CacheTestBase {
   /**
    * Tests drupal_flush_all_caches().
    */
-  function testFlushAllCaches() {
+  public function testFlushAllCaches() {
     // Create cache entries for each flushed cache bin.
     $bins = Cache::getBins();
     $this->assertTrue($bins, 'Cache::getBins() returned bins to flush.');
@@ -35,7 +35,7 @@ class ClearTest extends CacheTestBase {
 
     foreach ($bins as $bin => $cache_backend) {
       $cid = 'test_cid_clear' . $bin;
-      $this->assertFalse($this->checkCacheExists($cid, $this->defaultValue, $bin), format_string('All cache entries removed from @bin.', array('@bin' => $bin)));
+      $this->assertFalse($this->checkCacheExists($cid, $this->defaultValue, $bin), format_string('All cache entries removed from @bin.', ['@bin' => $bin]));
     }
   }
 
diff --git a/web/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php b/web/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php
new file mode 100644
index 000000000..39a514fa3
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Cache;
+
+use Drupal\Core\Url;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Component\Utility\SafeMarkup;
+
+/**
+ * Provides helper methods for page cache tags tests.
+ */
+abstract class PageCacheTagsTestBase extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   *
+   * Always enable header dumping in page cache tags tests, this aids debugging.
+   */
+  protected $dumpHeaders = TRUE;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Enable page caching.
+    $config = $this->config('system.performance');
+    $config->set('cache.page.max_age', 3600);
+    $config->save();
+  }
+
+  /**
+   * Verify that when loading a given page, it's a page cache hit or miss.
+   *
+   * @param \Drupal\Core\Url $url
+   *   The page for this URL will be loaded.
+   * @param string $hit_or_miss
+   *   'HIT' if a page cache hit is expected, 'MISS' otherwise.
+   *
+   * @param array|false $tags
+   *   When expecting a page cache hit, you may optionally specify an array of
+   *   expected cache tags. While FALSE, the cache tags will not be verified.
+   */
+  protected function verifyPageCache(Url $url, $hit_or_miss, $tags = FALSE) {
+    $this->drupalGet($url);
+    $message = SafeMarkup::format('Page cache @hit_or_miss for %path.', ['@hit_or_miss' => $hit_or_miss, '%path' => $url->toString()]);
+    $this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), $hit_or_miss, $message);
+
+    if ($hit_or_miss === 'HIT' && is_array($tags)) {
+      $absolute_url = $url->setAbsolute()->toString();
+      $cid_parts = [$absolute_url, 'html'];
+      $cid = implode(':', $cid_parts);
+      $cache_entry = \Drupal::cache('render')->get($cid);
+      sort($cache_entry->tags);
+      $tags = array_unique($tags);
+      sort($tags);
+      $this->assertIdentical($cache_entry->tags, $tags);
+    }
+  }
+
+}
diff --git a/web/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php b/web/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php
similarity index 87%
rename from web/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php
rename to web/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php
index 219bc3457..d2114fdf8 100644
--- a/web/core/modules/system/src/Tests/Datetime/DrupalDateTimeTest.php
+++ b/web/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\system\Tests\Datetime;
+namespace Drupal\Tests\system\Functional\Datetime;
 
 use Drupal\Core\Datetime\DrupalDateTime;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -11,12 +11,12 @@ use Drupal\user\Entity\User;
  *
  * @group Datetime
  */
-class DrupalDateTimeTest extends WebTestBase {
+class DrupalDateTimeTest extends BrowserTestBase {
 
   /**
    * Set up required modules.
    */
-  public static $modules = array();
+  public static $modules = [];
 
   /**
    * Test setup.
@@ -30,11 +30,11 @@ class DrupalDateTimeTest extends WebTestBase {
    * Test that the AJAX Timezone Callback can deal with various formats.
    */
   public function testSystemTimezone() {
-    $options = array(
-      'query' => array(
+    $options = [
+      'query' => [
         'date' => 'Tue+Sep+17+2013+21%3A35%3A31+GMT%2B0100+(BST)#',
-      )
-    );
+      ]
+    ];
     // Query the AJAX Timezone Callback with a long-format date.
     $response = $this->drupalGet('system/timezone/BST/3600/1', $options);
     $this->assertEqual($response, '"Europe\/London"', 'Timezone AJAX callback successfully identifies and responds to a long-format date.');
@@ -80,11 +80,11 @@ class DrupalDateTimeTest extends WebTestBase {
 
     // Create user.
     $this->config('system.date')->set('timezone.user.configurable', 1)->save();
-    $test_user = $this->drupalCreateUser(array());
+    $test_user = $this->drupalCreateUser([]);
     $this->drupalLogin($test_user);
 
     // Set up the user with a different timezone than the site.
-    $edit = array('mail' => $test_user->getEmail(), 'timezone' => 'Asia/Manila');
+    $edit = ['mail' => $test_user->getEmail(), 'timezone' => 'Asia/Manila'];
     $this->drupalPostForm('user/' . $test_user->id() . '/edit', $edit, t('Save'));
 
     // Reload the user and reset the timezone in AccountProxy::setAccount().
@@ -101,7 +101,7 @@ class DrupalDateTimeTest extends WebTestBase {
   /**
    * Tests the ability to override the time zone in the format method.
    */
-  function testTimezoneFormat() {
+  public function testTimezoneFormat() {
     // Create a date in UTC
     $date = DrupalDateTime::createFromTimestamp(87654321, 'UTC');
 
@@ -109,7 +109,7 @@ class DrupalDateTimeTest extends WebTestBase {
     $this->assertEqual($date->format('Y/m/d H:i:s e'), '1972/10/11 12:25:21 UTC', 'Date has default UTC time zone and correct date/time.');
 
     // Verify that the format method can override the time zone.
-    $this->assertEqual($date->format('Y/m/d H:i:s e', array('timezone' => 'America/New_York')), '1972/10/11 08:25:21 America/New_York', 'Date displayed overidden time zone and correct date/time');
+    $this->assertEqual($date->format('Y/m/d H:i:s e', ['timezone' => 'America/New_York']), '1972/10/11 08:25:21 America/New_York', 'Date displayed overidden time zone and correct date/time');
 
     // Verify that the date format method still displays the default time zone
     // for the date object.
diff --git a/web/core/modules/system/src/Tests/DrupalKernel/ContentNegotiationTest.php b/web/core/modules/system/tests/src/Functional/DrupalKernel/ContentNegotiationTest.php
similarity index 88%
rename from web/core/modules/system/src/Tests/DrupalKernel/ContentNegotiationTest.php
rename to web/core/modules/system/tests/src/Functional/DrupalKernel/ContentNegotiationTest.php
index dcd88ec5d..58157369b 100644
--- a/web/core/modules/system/src/Tests/DrupalKernel/ContentNegotiationTest.php
+++ b/web/core/modules/system/tests/src/Functional/DrupalKernel/ContentNegotiationTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\DrupalKernel;
+namespace Drupal\Tests\system\Functional\DrupalKernel;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests content negotiation.
  *
  * @group DrupalKernel
  */
-class ContentNegotiationTest extends WebTestBase {
+class ContentNegotiationTest extends BrowserTestBase {
 
   /**
    * Verifies HTML responses for bogus Accept headers.
@@ -19,8 +19,8 @@ class ContentNegotiationTest extends WebTestBase {
    *
    * @see https://www.drupal.org/node/1716790
    */
-  function testBogusAcceptHeader() {
-    $tests = array(
+  public function testBogusAcceptHeader() {
+    $tests = [
       // See https://bugs.webkit.org/show_bug.cgi?id=27267.
       'Firefox 3.5 (2009)' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
       'IE8 (2009)' => 'image/gif, image/jpeg, image/pjpeg, image/pjpeg, application/x-shockwave-flash, application/xaml+xml, application/vnd.ms-xpsdocument, application/x-ms-xbap, application/x-ms-application, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, application/x-silverlight, */*',
@@ -34,9 +34,9 @@ class ContentNegotiationTest extends WebTestBase {
       'Safari (2010), iOS 4.2.1 (2012)' => 'application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
       'Android #1 (2012)' => 'application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
       'Android #2 (2012)' => 'text/xml,text/html,application/xhtml+xml,image/png,text/plain,*/*;q=0.8',
-    );
+    ];
     foreach ($tests as $case => $header) {
-      $this->drupalGet('', array(), array('Accept: ' . $header));
+      $this->drupalGet('', [], ['Accept: ' . $header]);
       $this->assertNoText('Unsupported Media Type', '"Unsupported Media Type" not found for ' . $case);
       $this->assertText(t('Log in'), '"Log in" found for ' . $case);
     }
diff --git a/web/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php b/web/core/modules/system/tests/src/Functional/Entity/ConfigEntityImportTest.php
similarity index 96%
rename from web/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php
rename to web/core/modules/system/tests/src/Functional/Entity/ConfigEntityImportTest.php
index 0f731bea7..6c5a9d64c 100644
--- a/web/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/ConfigEntityImportTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Drupal\system\Tests\Entity;
+namespace Drupal\Tests\system\Functional\Entity;
 
 use Drupal\Core\Entity\EntityWithPluginCollectionInterface;
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\image\Entity\ImageStyle;
 use Drupal\search\Entity\SearchPage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\Entity\Action;
 
 /**
@@ -14,14 +14,14 @@ use Drupal\system\Entity\Action;
  *
  * @group Entity
  */
-class ConfigEntityImportTest extends WebTestBase {
+class ConfigEntityImportTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('action', 'block', 'filter', 'image', 'search', 'search_extra_type');
+  public static $modules = ['action', 'block', 'filter', 'image', 'search', 'search_extra_type'];
 
   /**
    * {@inheritdoc}
@@ -48,10 +48,10 @@ class ConfigEntityImportTest extends WebTestBase {
   protected function doActionUpdate() {
     // Create a test action with a known label.
     $name = 'system.action.apple';
-    $entity = Action::create(array(
+    $entity = Action::create([
       'id' => 'apple',
       'plugin' => 'action_message_action',
-    ));
+    ]);
     $entity->save();
 
     $this->checkSinglePluginConfigSync($entity, 'configuration', 'message', '');
@@ -69,10 +69,10 @@ class ConfigEntityImportTest extends WebTestBase {
   protected function doBlockUpdate() {
     // Create a test block with a known label.
     $name = 'block.block.apple';
-    $block = $this->drupalPlaceBlock('system_powered_by_block', array(
+    $block = $this->drupalPlaceBlock('system_powered_by_block', [
       'id' => 'apple',
       'label' => 'Red Delicious',
-    ));
+    ]);
 
     $this->checkSinglePluginConfigSync($block, 'settings', 'label', 'Red Delicious');
 
diff --git a/web/core/modules/system/src/Tests/Entity/EntityAddUITest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
similarity index 97%
rename from web/core/modules/system/src/Tests/Entity/EntityAddUITest.php
rename to web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
index f0b286f1c..a16614f14 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityAddUITest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\system\Tests\Entity;
+namespace Drupal\Tests\system\Functional\Entity;
 
 use Drupal\entity_test\Entity\EntityTestBundle;
 use Drupal\entity_test\Entity\EntityTestMul;
 use Drupal\entity_test\Entity\EntityTestWithBundle;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the /add and /add/{type} controllers.
  *
  * @group entity
  */
-class EntityAddUITest extends WebTestBase {
+class EntityAddUITest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php b/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
new file mode 100644
index 000000000..1476dfafe
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
@@ -0,0 +1,720 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Entity;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Url;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\system\Tests\Cache\PageCacheTagsTestBase;
+use Drupal\user\Entity\Role;
+use Drupal\user\RoleInterface;
+
+/**
+ * Provides helper methods for Entity cache tags tests.
+ */
+abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['entity_test', 'field_test'];
+
+  /**
+   * The main entity used for testing.
+   *
+   * @var \Drupal\Core\Entity\EntityInterface
+   */
+  protected $entity;
+
+  /**
+   * The entity instance referencing the main entity.
+   *
+   * @var \Drupal\Core\Entity\EntityInterface
+   */
+  protected $referencingEntity;
+
+  /**
+   * The entity instance not referencing the main entity.
+   *
+   * @var \Drupal\Core\Entity\EntityInterface
+   */
+  protected $nonReferencingEntity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Give anonymous users permission to view test entities, so that we can
+    // verify the cache tags of cached versions of test entity pages.
+    $user_role = Role::load(RoleInterface::ANONYMOUS_ID);
+    $user_role->grantPermission('view test entity');
+    $user_role->save();
+
+    // Create an entity.
+    $this->entity = $this->createEntity();
+
+    // If this is an entity with field UI enabled, then add a configurable
+    // field. We will use this configurable field in later tests to ensure that
+    // field configuration invalidate render cache entries.
+    if ($this->entity->getEntityType()->get('field_ui_base_route')) {
+      // Add field, so we can modify the field storage and field entities to
+      // verify that changes to those indeed clear cache tags.
+      FieldStorageConfig::create([
+        'field_name' => 'configurable_field',
+        'entity_type' => $this->entity->getEntityTypeId(),
+        'type' => 'test_field',
+        'settings' => [],
+      ])->save();
+      FieldConfig::create([
+        'entity_type' => $this->entity->getEntityTypeId(),
+        'bundle' => $this->entity->bundle(),
+        'field_name' => 'configurable_field',
+        'label' => 'Configurable field',
+        'settings' => [],
+      ])->save();
+
+      // Reload the entity now that a new field has been added to it.
+      $storage = $this->container
+        ->get('entity.manager')
+        ->getStorage($this->entity->getEntityTypeId());
+      $storage->resetCache();
+      $this->entity = $storage->load($this->entity->id());
+    }
+
+    // Create a referencing and a non-referencing entity.
+    list(
+      $this->referencingEntity,
+      $this->nonReferencingEntity,
+    ) = $this->createReferenceTestEntities($this->entity);
+  }
+
+  /**
+   * Generates standardized entity cache tags test info.
+   *
+   * @param string $entity_type_label
+   *   The label of the entity type whose cache tags to test.
+   * @param string $group
+   *   The test group.
+   *
+   * @return array
+   *
+   * @see \Drupal\simpletest\TestBase::getInfo()
+   */
+  protected static function generateStandardizedInfo($entity_type_label, $group) {
+    return [
+      'name' => "$entity_type_label entity cache tags",
+      'description' => "Test the $entity_type_label entity's cache tags.",
+      'group' => $group,
+    ];
+  }
+
+  /**
+   * Creates the entity to be tested.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface
+   *   The entity to be tested.
+   */
+  abstract protected function createEntity();
+
+  /**
+   * Returns the access cache contexts for the tested entity.
+   *
+   * Only list cache contexts that aren't part of the required cache contexts.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity to be tested, as created by createEntity().
+   *
+   * @return string[]
+   *   An array of the additional cache contexts.
+   *
+   * @see \Drupal\Core\Entity\EntityAccessControlHandlerInterface
+   */
+  protected function getAccessCacheContextsForEntity(EntityInterface $entity) {
+    return [];
+  }
+
+  /**
+   * Returns the additional (non-standard) cache contexts for the tested entity.
+   *
+   * Only list cache contexts that aren't part of the required cache contexts.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity to be tested, as created by createEntity().
+   *
+   * @return string[]
+   *   An array of the additional cache contexts.
+   *
+   * @see \Drupal\system\Tests\Entity\EntityCacheTagsTestBase::createEntity()
+   */
+  protected function getAdditionalCacheContextsForEntity(EntityInterface $entity) {
+    return [];
+  }
+
+  /**
+   * Returns the additional (non-standard) cache tags for the tested entity.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity to be tested, as created by createEntity().
+   * @return array
+   *   An array of the additional cache tags.
+   *
+   * @see \Drupal\system\Tests\Entity\EntityCacheTagsTestBase::createEntity()
+   */
+  protected function getAdditionalCacheTagsForEntity(EntityInterface $entity) {
+    return [];
+  }
+
+  /**
+   * Returns the additional cache tags for the tested entity's listing by type.
+   *
+   * @return string[]
+   *   An array of the additional cache contexts.
+   */
+  protected function getAdditionalCacheContextsForEntityListing() {
+    return [];
+  }
+
+  /**
+   * Returns the additional cache tags for the tested entity's listing by type.
+   *
+   * Necessary when there are unavoidable default entities of this type, e.g.
+   * the anonymous and administrator User entities always exist.
+   *
+   * @return array
+   *   An array of the additional cache tags.
+   */
+  protected function getAdditionalCacheTagsForEntityListing() {
+    return [];
+  }
+
+  /**
+   * Selects the preferred view mode for the given entity type.
+   *
+   * Prefers 'full', picks the first one otherwise, and if none are available,
+   * chooses 'default'.
+   */
+  protected function selectViewMode($entity_type) {
+    $view_modes = \Drupal::entityManager()
+      ->getStorage('entity_view_mode')
+      ->loadByProperties(['targetEntityType' => $entity_type]);
+
+    if (empty($view_modes)) {
+      return 'default';
+    }
+    else {
+      // Prefer the "full" display mode.
+      if (isset($view_modes[$entity_type . '.full'])) {
+        return 'full';
+      }
+      else {
+        $view_modes = array_keys($view_modes);
+        return substr($view_modes[0], strlen($entity_type) + 1);
+      }
+    }
+  }
+
+  /**
+   * Creates a referencing and a non-referencing entity for testing purposes.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $referenced_entity
+   *   The entity that the referencing entity should reference.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface[]
+   *   An array containing a referencing entity and a non-referencing entity.
+   */
+  protected function createReferenceTestEntities($referenced_entity) {
+    // All referencing entities should be of the type 'entity_test'.
+    $entity_type = 'entity_test';
+
+    // Create a "foo" bundle for the given entity type.
+    $bundle = 'foo';
+    entity_test_create_bundle($bundle, NULL, $entity_type);
+
+    // Add a field of the given type to the given entity type's "foo" bundle.
+    $field_name = $referenced_entity->getEntityTypeId() . '_reference';
+    FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => $entity_type,
+      'type' => 'entity_reference',
+      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
+      'settings' => [
+        'target_type' => $referenced_entity->getEntityTypeId(),
+      ],
+    ])->save();
+    FieldConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => $entity_type,
+      'bundle' => $bundle,
+      'settings' => [
+        'handler' => 'default',
+        'handler_settings' => [
+          'target_bundles' => [
+            $referenced_entity->bundle() => $referenced_entity->bundle(),
+          ],
+          'sort' => ['field' => '_none'],
+          'auto_create' => FALSE,
+        ],
+      ],
+    ])->save();
+    if (!$this->entity->getEntityType()->hasHandlerClass('view_builder')) {
+      entity_get_display($entity_type, $bundle, 'full')
+        ->setComponent($field_name, [
+          'type' => 'entity_reference_label',
+        ])
+        ->save();
+    }
+    else {
+      $referenced_entity_view_mode = $this->selectViewMode($this->entity->getEntityTypeId());
+      entity_get_display($entity_type, $bundle, 'full')
+        ->setComponent($field_name, [
+          'type' => 'entity_reference_entity_view',
+          'settings' => [
+            'view_mode' => $referenced_entity_view_mode,
+          ],
+        ])
+        ->save();
+    }
+
+    // Create an entity that does reference the entity being tested.
+    $label_key = \Drupal::entityManager()->getDefinition($entity_type)->getKey('label');
+    $referencing_entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create([
+        $label_key => 'Referencing ' . $entity_type,
+        'status' => 1,
+        'type' => $bundle,
+        $field_name => ['target_id' => $referenced_entity->id()],
+      ]);
+    $referencing_entity->save();
+
+    // Create an entity that does not reference the entity being tested.
+    $non_referencing_entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create([
+        $label_key => 'Non-referencing ' . $entity_type,
+        'status' => 1,
+        'type' => $bundle,
+      ]);
+    $non_referencing_entity->save();
+
+    return [
+      $referencing_entity,
+      $non_referencing_entity,
+    ];
+  }
+
+  /**
+   * Tests cache tags presence and invalidation of the entity when referenced.
+   *
+   * Tests the following cache tags:
+   * - entity type view cache tag: "<entity type>_view"
+   * - entity cache tag: "<entity type>:<entity ID>"
+   * - entity type list cache tag: "<entity type>_list"
+   * - referencing entity type view cache tag: "<referencing entity type>_view"
+   * - referencing entity type cache tag: "<referencing entity type>:<referencing entity ID>"
+   */
+  public function testReferencedEntity() {
+    $entity_type = $this->entity->getEntityTypeId();
+    $referencing_entity_url = $this->referencingEntity->urlInfo('canonical');
+    $non_referencing_entity_url = $this->nonReferencingEntity->urlInfo('canonical');
+    $listing_url = Url::fromRoute('entity.entity_test.collection_referencing_entities', [
+      'entity_reference_field_name' => $entity_type . '_reference',
+      'referenced_entity_type' => $entity_type,
+      'referenced_entity_id' => $this->entity->id(),
+    ]);
+    $empty_entity_listing_url = Url::fromRoute('entity.entity_test.collection_empty', ['entity_type_id' => $entity_type]);
+    $nonempty_entity_listing_url = Url::fromRoute('entity.entity_test.collection_labels_alphabetically', ['entity_type_id' => $entity_type]);
+
+    // The default cache contexts for rendered entities.
+    $default_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'];
+    $entity_cache_contexts = $default_cache_contexts;
+    $page_cache_contexts = Cache::mergeContexts($default_cache_contexts, ['url.query_args:' . MainContentViewSubscriber::WRAPPER_FORMAT]);
+
+    // Cache tags present on every rendered page.
+    // 'user.permissions' is a required cache context, and responses that vary
+    // by this cache context when requested by anonymous users automatically
+    // also get this cache tag, to ensure correct invalidation.
+    $page_cache_tags = Cache::mergeTags(['http_response', 'rendered'], ['config:user.role.anonymous']);
+    // If the block module is used, the Block page display variant is used,
+    // which adds the block config entity type's list cache tags.
+    $page_cache_tags = Cache::mergeTags($page_cache_tags, \Drupal::moduleHandler()->moduleExists('block') ? ['config:block_list'] : []);
+
+    $page_cache_tags_referencing_entity = in_array('user.permissions', $this->getAccessCacheContextsForEntity($this->referencingEntity)) ? ['config:user.role.anonymous'] : [];
+
+    $view_cache_tag = [];
+    if ($this->entity->getEntityType()->hasHandlerClass('view_builder')) {
+      $view_cache_tag = \Drupal::entityManager()->getViewBuilder($entity_type)
+        ->getCacheTags();
+    }
+
+    $context_metadata = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($entity_cache_contexts);
+    $cache_context_tags = $context_metadata->getCacheTags();
+
+    // Generate the cache tags for the (non) referencing entities.
+    $referencing_entity_cache_tags = Cache::mergeTags($this->referencingEntity->getCacheTags(), \Drupal::entityManager()->getViewBuilder('entity_test')->getCacheTags());
+    // Includes the main entity's cache tags, since this entity references it.
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, $this->entity->getCacheTags());
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, $this->getAdditionalCacheTagsForEntity($this->entity));
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, $view_cache_tag);
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, $cache_context_tags);
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, ['rendered']);
+
+    $non_referencing_entity_cache_tags = Cache::mergeTags($this->nonReferencingEntity->getCacheTags(), \Drupal::entityManager()->getViewBuilder('entity_test')->getCacheTags());
+    $non_referencing_entity_cache_tags = Cache::mergeTags($non_referencing_entity_cache_tags, ['rendered']);
+
+    // Generate the cache tags for all two possible entity listing paths.
+    // 1. list cache tag only (listing query has no match)
+    // 2. list cache tag plus entity cache tag (listing query has a match)
+    $empty_entity_listing_cache_tags = Cache::mergeTags($this->entity->getEntityType()->getListCacheTags(), $page_cache_tags);
+
+    $nonempty_entity_listing_cache_tags = Cache::mergeTags($this->entity->getEntityType()->getListCacheTags(), $this->entity->getCacheTags());
+    $nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $this->getAdditionalCacheTagsForEntityListing($this->entity));
+    $nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $page_cache_tags);
+
+    $this->pass("Test referencing entity.", 'Debug');
+    $this->verifyPageCache($referencing_entity_url, 'MISS');
+
+    // Verify a cache hit, but also the presence of the correct cache tags.
+    $expected_tags = Cache::mergeTags($referencing_entity_cache_tags, $page_cache_tags);
+    $expected_tags = Cache::mergeTags($expected_tags, $page_cache_tags_referencing_entity);
+    $this->verifyPageCache($referencing_entity_url, 'HIT', $expected_tags);
+
+    // Also verify the existence of an entity render cache entry.
+    $cache_keys = ['entity_view', 'entity_test', $this->referencingEntity->id(), 'full'];
+    $cid = $this->createCacheId($cache_keys, $entity_cache_contexts);
+    $access_cache_contexts = $this->getAccessCacheContextsForEntity($this->entity);
+    $additional_cache_contexts = $this->getAdditionalCacheContextsForEntity($this->referencingEntity);
+    $redirected_cid = NULL;
+    if (count($access_cache_contexts) || count($additional_cache_contexts)) {
+      $cache_contexts = Cache::mergeContexts($entity_cache_contexts, $additional_cache_contexts);
+      $cache_contexts = Cache::mergeContexts($cache_contexts, $access_cache_contexts);
+      $redirected_cid = $this->createCacheId($cache_keys, $cache_contexts);
+      $context_metadata = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($cache_contexts);
+      $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, $context_metadata->getCacheTags());
+    }
+    $this->verifyRenderCache($cid, $referencing_entity_cache_tags, $redirected_cid);
+
+    $this->pass("Test non-referencing entity.", 'Debug');
+    $this->verifyPageCache($non_referencing_entity_url, 'MISS');
+    // Verify a cache hit, but also the presence of the correct cache tags.
+    $this->verifyPageCache($non_referencing_entity_url, 'HIT', Cache::mergeTags($non_referencing_entity_cache_tags, $page_cache_tags));
+    // Also verify the existence of an entity render cache entry.
+    $cache_keys = ['entity_view', 'entity_test', $this->nonReferencingEntity->id(), 'full'];
+    $cid = $this->createCacheId($cache_keys, $entity_cache_contexts);
+    $this->verifyRenderCache($cid, $non_referencing_entity_cache_tags);
+
+
+    $this->pass("Test listing of referencing entities.", 'Debug');
+    // Prime the page cache for the listing of referencing entities.
+    $this->verifyPageCache($listing_url, 'MISS');
+
+    // Verify a cache hit, but also the presence of the correct cache tags.
+    $expected_tags = Cache::mergeTags($referencing_entity_cache_tags, $page_cache_tags);
+    $expected_tags = Cache::mergeTags($expected_tags, $page_cache_tags_referencing_entity);
+    $this->verifyPageCache($listing_url, 'HIT', $expected_tags);
+
+    $this->pass("Test empty listing.", 'Debug');
+    // Prime the page cache for the empty listing.
+    $this->verifyPageCache($empty_entity_listing_url, 'MISS');
+    // Verify a cache hit, but also the presence of the correct cache tags.
+    $this->verifyPageCache($empty_entity_listing_url, 'HIT', $empty_entity_listing_cache_tags);
+    // Verify the entity type's list cache contexts are present.
+    $contexts_in_header = $this->drupalGetHeader('X-Drupal-Cache-Contexts');
+    $this->assertEqual(Cache::mergeContexts($page_cache_contexts, $this->getAdditionalCacheContextsForEntityListing()), empty($contexts_in_header) ? [] : explode(' ', $contexts_in_header));
+
+
+    $this->pass("Test listing containing referenced entity.", 'Debug');
+    // Prime the page cache for the listing containing the referenced entity.
+    $this->verifyPageCache($nonempty_entity_listing_url, 'MISS', $nonempty_entity_listing_cache_tags);
+    // Verify a cache hit, but also the presence of the correct cache tags.
+    $this->verifyPageCache($nonempty_entity_listing_url, 'HIT', $nonempty_entity_listing_cache_tags);
+    // Verify the entity type's list cache contexts are present.
+    $contexts_in_header = $this->drupalGetHeader('X-Drupal-Cache-Contexts');
+    $this->assertEqual(Cache::mergeContexts($page_cache_contexts, $this->getAdditionalCacheContextsForEntityListing()), empty($contexts_in_header) ? [] : explode(' ', $contexts_in_header));
+
+
+    // Verify that after modifying the referenced entity, there is a cache miss
+    // for every route except the one for the non-referencing entity.
+    $this->pass("Test modification of referenced entity.", 'Debug');
+    $this->entity->save();
+    $this->verifyPageCache($referencing_entity_url, 'MISS');
+    $this->verifyPageCache($listing_url, 'MISS');
+    $this->verifyPageCache($empty_entity_listing_url, 'MISS');
+    $this->verifyPageCache($nonempty_entity_listing_url, 'MISS');
+    $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+
+    // Verify cache hits.
+    $this->verifyPageCache($referencing_entity_url, 'HIT');
+    $this->verifyPageCache($listing_url, 'HIT');
+    $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+    $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+
+
+    // Verify that after modifying the referencing entity, there is a cache miss
+    // for every route except the ones for the non-referencing entity and the
+    // empty entity listing.
+    $this->pass("Test modification of referencing entity.", 'Debug');
+    $this->referencingEntity->save();
+    $this->verifyPageCache($referencing_entity_url, 'MISS');
+    $this->verifyPageCache($listing_url, 'MISS');
+    $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+    $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+    $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+
+    // Verify cache hits.
+    $this->verifyPageCache($referencing_entity_url, 'HIT');
+    $this->verifyPageCache($listing_url, 'HIT');
+    $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+
+
+    // Verify that after modifying the non-referencing entity, there is a cache
+    // miss only for the non-referencing entity route.
+    $this->pass("Test modification of non-referencing entity.", 'Debug');
+    $this->nonReferencingEntity->save();
+    $this->verifyPageCache($referencing_entity_url, 'HIT');
+    $this->verifyPageCache($listing_url, 'HIT');
+    $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+    $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+    $this->verifyPageCache($non_referencing_entity_url, 'MISS');
+
+    // Verify cache hits.
+    $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+
+
+    if ($this->entity->getEntityType()->hasHandlerClass('view_builder')) {
+      // Verify that after modifying the entity's display, there is a cache miss
+      // for both the referencing entity, and the listing of referencing
+      // entities, but not for any other routes.
+      $referenced_entity_view_mode = $this->selectViewMode($this->entity->getEntityTypeId());
+      $this->pass("Test modification of referenced entity's '$referenced_entity_view_mode' display.", 'Debug');
+      $entity_display = entity_get_display($entity_type, $this->entity->bundle(), $referenced_entity_view_mode);
+      $entity_display->save();
+      $this->verifyPageCache($referencing_entity_url, 'MISS');
+      $this->verifyPageCache($listing_url, 'MISS');
+      $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+      $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+      $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+
+      // Verify cache hits.
+      $this->verifyPageCache($referencing_entity_url, 'HIT');
+      $this->verifyPageCache($listing_url, 'HIT');
+    }
+
+
+    if ($bundle_entity_type_id = $this->entity->getEntityType()->getBundleEntityType()) {
+      // Verify that after modifying the corresponding bundle entity, there is a
+      // cache miss for both the referencing entity, and the listing of
+      // referencing entities, but not for any other routes.
+      $this->pass("Test modification of referenced entity's bundle entity.", 'Debug');
+      $bundle_entity = $this->container->get('entity_type.manager')
+        ->getStorage($bundle_entity_type_id)
+        ->load($this->entity->bundle());
+      $bundle_entity->save();
+      $this->verifyPageCache($referencing_entity_url, 'MISS');
+      $this->verifyPageCache($listing_url, 'MISS');
+      $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+      // Special case: entity types may choose to use their bundle entity type
+      // cache tags, to avoid having excessively granular invalidation.
+      $is_special_case = $bundle_entity->getCacheTags() == $this->entity->getCacheTags() && $bundle_entity->getEntityType()->getListCacheTags() == $this->entity->getEntityType()->getListCacheTags();
+      if ($is_special_case) {
+        $this->verifyPageCache($empty_entity_listing_url, 'MISS');
+        $this->verifyPageCache($nonempty_entity_listing_url, 'MISS');
+      }
+      else {
+        $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+        $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+      }
+
+      // Verify cache hits.
+      $this->verifyPageCache($referencing_entity_url, 'HIT');
+      $this->verifyPageCache($listing_url, 'HIT');
+      if ($is_special_case) {
+        $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+        $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+      }
+    }
+
+
+    if ($this->entity->getEntityType()->get('field_ui_base_route')) {
+      // Verify that after modifying a configurable field on the entity, there
+      // is a cache miss.
+      $this->pass("Test modification of referenced entity's configurable field.", 'Debug');
+      $field_storage_name = $this->entity->getEntityTypeId() . '.configurable_field';
+      $field_storage = FieldStorageConfig::load($field_storage_name);
+      $field_storage->save();
+      $this->verifyPageCache($referencing_entity_url, 'MISS');
+      $this->verifyPageCache($listing_url, 'MISS');
+      $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+      $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+      $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+
+      // Verify cache hits.
+      $this->verifyPageCache($referencing_entity_url, 'HIT');
+      $this->verifyPageCache($listing_url, 'HIT');
+
+
+      // Verify that after modifying a configurable field on the entity, there
+      // is a cache miss.
+      $this->pass("Test modification of referenced entity's configurable field.", 'Debug');
+      $field_name = $this->entity->getEntityTypeId() . '.' . $this->entity->bundle() . '.configurable_field';
+      $field = FieldConfig::load($field_name);
+      $field->save();
+      $this->verifyPageCache($referencing_entity_url, 'MISS');
+      $this->verifyPageCache($listing_url, 'MISS');
+      $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+      $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+      $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+
+      // Verify cache hits.
+      $this->verifyPageCache($referencing_entity_url, 'HIT');
+      $this->verifyPageCache($listing_url, 'HIT');
+    }
+
+
+    // Verify that after invalidating the entity's cache tag directly, there is
+    // a cache miss for every route except the ones for the non-referencing
+    // entity and the empty entity listing.
+    $this->pass("Test invalidation of referenced entity's cache tag.", 'Debug');
+    Cache::invalidateTags($this->entity->getCacheTagsToInvalidate());
+    $this->verifyPageCache($referencing_entity_url, 'MISS');
+    $this->verifyPageCache($listing_url, 'MISS');
+    $this->verifyPageCache($nonempty_entity_listing_url, 'MISS');
+    $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+    $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+
+    // Verify cache hits.
+    $this->verifyPageCache($referencing_entity_url, 'HIT');
+    $this->verifyPageCache($listing_url, 'HIT');
+    $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+
+    // Verify that after invalidating the entity's list cache tag directly,
+    // there is a cache miss for both the empty entity listing and the non-empty
+    // entity listing routes, but not for other routes.
+    $this->pass("Test invalidation of referenced entity's list cache tag.", 'Debug');
+    Cache::invalidateTags($this->entity->getEntityType()->getListCacheTags());
+    $this->verifyPageCache($empty_entity_listing_url, 'MISS');
+    $this->verifyPageCache($nonempty_entity_listing_url, 'MISS');
+    $this->verifyPageCache($referencing_entity_url, 'HIT');
+    $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+    $this->verifyPageCache($listing_url, 'HIT');
+
+    // Verify cache hits.
+    $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+    $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+
+
+    if (!empty($view_cache_tag)) {
+      // Verify that after invalidating the generic entity type's view cache tag
+      // directly, there is a cache miss for both the referencing entity, and the
+      // listing of referencing entities, but not for other routes.
+      $this->pass("Test invalidation of referenced entity's 'view' cache tag.", 'Debug');
+      Cache::invalidateTags($view_cache_tag);
+      $this->verifyPageCache($referencing_entity_url, 'MISS');
+      $this->verifyPageCache($listing_url, 'MISS');
+      $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+      $this->verifyPageCache($empty_entity_listing_url, 'HIT');
+      $this->verifyPageCache($nonempty_entity_listing_url, 'HIT');
+
+      // Verify cache hits.
+      $this->verifyPageCache($referencing_entity_url, 'HIT');
+      $this->verifyPageCache($listing_url, 'HIT');
+    }
+
+    // Verify that after deleting the entity, there is a cache miss for every
+    // route except for the non-referencing entity one.
+    $this->pass('Test deletion of referenced entity.', 'Debug');
+    $this->entity->delete();
+    $this->verifyPageCache($referencing_entity_url, 'MISS');
+    $this->verifyPageCache($listing_url, 'MISS');
+    $this->verifyPageCache($empty_entity_listing_url, 'MISS');
+    $this->verifyPageCache($nonempty_entity_listing_url, 'MISS');
+    $this->verifyPageCache($non_referencing_entity_url, 'HIT');
+
+    // Verify cache hits.
+    $referencing_entity_cache_tags = Cache::mergeTags($this->referencingEntity->getCacheTags(), \Drupal::entityManager()->getViewBuilder('entity_test')->getCacheTags());
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, ['http_response', 'rendered']);
+
+    $nonempty_entity_listing_cache_tags = Cache::mergeTags($this->entity->getEntityType()->getListCacheTags(), $this->getAdditionalCacheTagsForEntityListing());
+    $nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $page_cache_tags);
+
+    $this->verifyPageCache($referencing_entity_url, 'HIT', Cache::mergeTags($referencing_entity_cache_tags, $page_cache_tags));
+    $this->verifyPageCache($listing_url, 'HIT', $page_cache_tags);
+    $this->verifyPageCache($empty_entity_listing_url, 'HIT', $empty_entity_listing_cache_tags);
+    $this->verifyPageCache($nonempty_entity_listing_url, 'HIT', $nonempty_entity_listing_cache_tags);
+  }
+
+  /**
+   * Creates a cache ID from a list of cache keys and a set of cache contexts.
+   *
+   * @param string[] $keys
+   *   A list of cache keys.
+   * @param string[] $contexts
+   *   A set of cache contexts.
+   *
+   * @return string
+   *   The cache ID string.
+   */
+  protected function createCacheId(array $keys, array $contexts) {
+    $cid_parts = $keys;
+
+    $contexts = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($contexts);
+    $cid_parts = array_merge($cid_parts, $contexts->getKeys());
+
+    return implode(':', $cid_parts);
+  }
+
+  /**
+   * Verify that a given render cache entry exists, with the correct cache tags.
+   *
+   * @param string $cid
+   *   The render cache item ID.
+   * @param array $tags
+   *   An array of expected cache tags.
+   * @param string|null $redirected_cid
+   *   (optional) The redirected render cache item ID.
+   */
+  protected function verifyRenderCache($cid, array $tags, $redirected_cid = NULL) {
+    // Also verify the existence of an entity render cache entry.
+    $cache_entry = \Drupal::cache('render')->get($cid);
+    $this->assertTrue($cache_entry, 'A render cache entry exists.');
+    sort($cache_entry->tags);
+    sort($tags);
+    $this->assertIdentical($cache_entry->tags, $tags);
+    $is_redirecting_cache_item = isset($cache_entry->data['#cache_redirect']);
+    if ($redirected_cid === NULL) {
+      $this->assertFalse($is_redirecting_cache_item, 'Render cache entry is not a redirect.');
+      // If this is a redirecting cache item unlike we expected, log it.
+      if ($is_redirecting_cache_item) {
+        debug($cache_entry->data);
+      }
+    }
+    else {
+      // Verify that $cid contains a cache redirect.
+      $this->assertTrue($is_redirecting_cache_item, 'Render cache entry is a redirect.');
+      // If this is not a redirecting cache item unlike we expected, log it.
+      if (!$is_redirecting_cache_item) {
+        debug($cache_entry->data);
+      }
+      // Verify that the cache redirect points to the expected CID.
+      $redirect_cache_metadata = $cache_entry->data['#cache'];
+      $actual_redirection_cid = $this->createCacheId(
+        $redirect_cache_metadata['keys'],
+        $redirect_cache_metadata['contexts']
+      );
+      $this->assertIdentical($redirected_cid, $actual_redirection_cid);
+      // Finally, verify that the redirected CID exists and has the same cache
+      // tags.
+      $this->verifyRenderCache($redirected_cid, $tags);
+    }
+  }
+
+}
diff --git a/web/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityListBuilderTest.php
similarity index 85%
rename from web/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
rename to web/core/modules/system/tests/src/Functional/Entity/EntityListBuilderTest.php
index 2a849b29c..94225f4e9 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityListBuilderTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\system\Tests\Entity;
+namespace Drupal\Tests\system\Functional\Entity;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\entity_test\Entity\EntityTest;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests entity list builder functionality.
  *
  * @group Entity
  */
-class EntityListBuilderTest extends WebTestBase {
+class EntityListBuilderTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('entity_test');
+  public static $modules = ['entity_test'];
 
   /**
    * {@inheritdoc}
@@ -25,9 +25,9 @@ class EntityListBuilderTest extends WebTestBase {
     parent::setUp();
 
     // Create and log in user.
-    $this->webUser = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser([
       'administer entity_test content',
-    ));
+    ]);
     $this->drupalLogin($this->webUser);
   }
 
@@ -37,7 +37,7 @@ class EntityListBuilderTest extends WebTestBase {
   public function testPager() {
     // Create 51 test entities.
     for ($i = 1; $i < 52; $i++) {
-      EntityTest::create(array('name' => 'Test entity ' . $i))->save();
+      EntityTest::create(['name' => 'Test entity ' . $i])->save();
     }
 
     // Load the listing page.
diff --git a/web/core/modules/system/src/Tests/Entity/EntityOperationsTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php
similarity index 82%
rename from web/core/modules/system/src/Tests/Entity/EntityOperationsTest.php
rename to web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php
index 3e4c69f81..b020f4287 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityOperationsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php
@@ -1,28 +1,28 @@
 <?php
 
-namespace Drupal\system\Tests\Entity;
+namespace Drupal\Tests\system\Functional\Entity;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that operations can be injected from the hook.
  *
  * @group Entity
  */
-class EntityOperationsTest extends WebTestBase {
+class EntityOperationsTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('entity_test');
+  public static $modules = ['entity_test'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create and log in user.
-    $this->drupalLogin($this->drupalCreateUser(array('administer permissions')));
+    $this->drupalLogin($this->drupalCreateUser(['administer permissions']));
   }
 
   /**
@@ -36,7 +36,7 @@ class EntityOperationsTest extends WebTestBase {
     $roles = user_roles();
     foreach ($roles as $role) {
       $this->assertLinkByHref($role->url() . '/test_operation');
-      $this->assertLink(format_string('Test Operation: @label', array('@label' => $role->label())));
+      $this->assertLink(format_string('Test Operation: @label', ['@label' => $role->label()]));
     }
   }
 
diff --git a/web/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
similarity index 58%
rename from web/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
rename to web/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
index 86bc703ce..df3310281 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace Drupal\system\Tests\Entity\EntityReferenceSelection;
+namespace Drupal\Tests\system\Functional\Entity\EntityReferenceSelection;
 
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\comment\CommentInterface;
 use Drupal\node\Entity\Node;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\node\NodeInterface;
 use Drupal\user\Entity\User;
 use Drupal\comment\Entity\Comment;
 
@@ -16,7 +17,7 @@ use Drupal\comment\Entity\Comment;
  *
  * @group entity_reference
  */
-class EntityReferenceSelectionAccessTest extends WebTestBase {
+class EntityReferenceSelectionAccessTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
@@ -25,13 +26,13 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'comment');
+  public static $modules = ['node', 'comment'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create an Article node type.
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
   }
 
   /**
@@ -49,10 +50,10 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
 
     foreach ($tests as $test) {
       foreach ($test['arguments'] as $arguments) {
-        $result = call_user_func_array(array($handler, 'getReferenceableEntities'), $arguments);
-        $this->assertEqual($result, $test['result'], format_string('Valid result set returned by @handler.', array('@handler' => $handler_name)));
+        $result = call_user_func_array([$handler, 'getReferenceableEntities'], $arguments);
+        $this->assertEqual($result, $test['result'], format_string('Valid result set returned by @handler.', ['@handler' => $handler_name]));
 
-        $result = call_user_func_array(array($handler, 'countReferenceableEntities'), $arguments);
+        $result = call_user_func_array([$handler, 'countReferenceableEntities'], $arguments);
         if (!empty($test['result'])) {
           $bundle = key($test['result']);
           $count = count($test['result'][$bundle]);
@@ -61,7 +62,7 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
           $count = 0;
         }
 
-        $this->assertEqual($result, $count, format_string('Valid count returned by @handler.', array('@handler' => $handler_name)));
+        $this->assertEqual($result, $count, format_string('Valid count returned by @handler.', ['@handler' => $handler_name]));
       }
     }
   }
@@ -70,39 +71,39 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
    * Test the node-specific overrides of the entity handler.
    */
   public function testNodeHandler() {
-    $selection_options = array(
+    $selection_options = [
       'target_type' => 'node',
       'handler' => 'default',
-      'handler_settings' => array(
+      'handler_settings' => [
         'target_bundles' => NULL,
-      ),
-    );
+      ],
+    ];
 
     // Build a set of test data.
     // Titles contain HTML-special characters to test escaping.
-    $node_values = array(
-      'published1' => array(
+    $node_values = [
+      'published1' => [
         'type' => 'article',
-        'status' => NODE_PUBLISHED,
+        'status' => NodeInterface::PUBLISHED,
         'title' => 'Node published1 (<&>)',
         'uid' => 1,
-      ),
-      'published2' => array(
+      ],
+      'published2' => [
         'type' => 'article',
-        'status' => NODE_PUBLISHED,
+        'status' => NodeInterface::PUBLISHED,
         'title' => 'Node published2 (<&>)',
         'uid' => 1,
-      ),
-      'unpublished' => array(
+      ],
+      'unpublished' => [
         'type' => 'article',
-        'status' => NODE_NOT_PUBLISHED,
+        'status' => NodeInterface::NOT_PUBLISHED,
         'title' => 'Node unpublished (<&>)',
         'uid' => 1,
-      ),
-    );
+      ],
+    ];
 
-    $nodes = array();
-    $node_labels = array();
+    $nodes = [];
+    $node_labels = [];
     foreach ($node_values as $key => $values) {
       $node = Node::create($values);
       $node->save();
@@ -111,84 +112,84 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
     }
 
     // Test as a non-admin.
-    $normal_user = $this->drupalCreateUser(array('access content'));
+    $normal_user = $this->drupalCreateUser(['access content']);
     \Drupal::currentUser()->setAccount($normal_user);
-    $referenceable_tests = array(
-      array(
-        'arguments' => array(
-          array(NULL, 'CONTAINS'),
-        ),
-        'result' => array(
-          'article' => array(
+    $referenceable_tests = [
+      [
+        'arguments' => [
+          [NULL, 'CONTAINS'],
+        ],
+        'result' => [
+          'article' => [
             $nodes['published1']->id() => $node_labels['published1'],
             $nodes['published2']->id() => $node_labels['published2'],
-          ),
-        ),
-      ),
-      array(
-        'arguments' => array(
-          array('published1', 'CONTAINS'),
-          array('Published1', 'CONTAINS'),
-        ),
-        'result' => array(
-          'article' => array(
+          ],
+        ],
+      ],
+      [
+        'arguments' => [
+          ['published1', 'CONTAINS'],
+          ['Published1', 'CONTAINS'],
+        ],
+        'result' => [
+          'article' => [
             $nodes['published1']->id() => $node_labels['published1'],
-          ),
-        ),
-      ),
-      array(
-        'arguments' => array(
-          array('published2', 'CONTAINS'),
-          array('Published2', 'CONTAINS'),
-        ),
-        'result' => array(
-          'article' => array(
+          ],
+        ],
+      ],
+      [
+        'arguments' => [
+          ['published2', 'CONTAINS'],
+          ['Published2', 'CONTAINS'],
+        ],
+        'result' => [
+          'article' => [
             $nodes['published2']->id() => $node_labels['published2'],
-          ),
-        ),
-      ),
-      array(
-        'arguments' => array(
-          array('invalid node', 'CONTAINS'),
-        ),
-        'result' => array(),
-      ),
-      array(
-        'arguments' => array(
-          array('Node unpublished', 'CONTAINS'),
-        ),
-        'result' => array(),
-      ),
-    );
+          ],
+        ],
+      ],
+      [
+        'arguments' => [
+          ['invalid node', 'CONTAINS'],
+        ],
+        'result' => [],
+      ],
+      [
+        'arguments' => [
+          ['Node unpublished', 'CONTAINS'],
+        ],
+        'result' => [],
+      ],
+    ];
     $this->assertReferenceable($selection_options, $referenceable_tests, 'Node handler');
 
     // Test as an admin.
-    $admin_user = $this->drupalCreateUser(array('access content', 'bypass node access'));
+    $admin_user = $this->drupalCreateUser(['access content', 'bypass node access']);
     \Drupal::currentUser()->setAccount($admin_user);
-    $referenceable_tests = array(
-      array(
-        'arguments' => array(
-          array(NULL, 'CONTAINS'),
-        ),
-        'result' => array(
-          'article' => array(
+    $referenceable_tests = [
+      [
+        'arguments' => [
+          [NULL, 'CONTAINS'],
+        ],
+        'result' => [
+          'article' => [
             $nodes['published1']->id() => $node_labels['published1'],
             $nodes['published2']->id() => $node_labels['published2'],
             $nodes['unpublished']->id() => $node_labels['unpublished'],
-          ),
-        ),
-      ),
-      array(
-        'arguments' => array(
-          array('Node unpublished', 'CONTAINS'),
-        ),
-        'result' => array(
-          'article' => array(
+          ],
+        ],
+      ],
+      [
+        'arguments' => [
+          ['Node unpublished', 'CONTAINS'],
+        ],
+        'result' => [
+          'article' => [
             $nodes['unpublished']->id() => $node_labels['unpublished'],
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
     $this->assertReferenceable($selection_options, $referenceable_tests, 'Node handler (admin)');
   }
 
@@ -196,39 +197,39 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
    * Test the user-specific overrides of the entity handler.
    */
   public function testUserHandler() {
-    $selection_options = array(
+    $selection_options = [
       'target_type' => 'user',
       'handler' => 'default',
-      'handler_settings' => array(
+      'handler_settings' => [
         'target_bundles' => NULL,
         'include_anonymous' => TRUE,
-      ),
-    );
+      ],
+    ];
 
     // Build a set of test data.
-    $user_values = array(
+    $user_values = [
       'anonymous' => User::load(0),
       'admin' => User::load(1),
-      'non_admin' => array(
+      'non_admin' => [
         'name' => 'non_admin <&>',
         'mail' => 'non_admin@example.com',
-        'roles' => array(),
+        'roles' => [],
         'pass' => user_password(),
         'status' => 1,
-      ),
-      'blocked' => array(
+      ],
+      'blocked' => [
         'name' => 'blocked <&>',
         'mail' => 'blocked@example.com',
-        'roles' => array(),
+        'roles' => [],
         'pass' => user_password(),
         'status' => 0,
-      ),
-    );
+      ],
+    ];
 
     $user_values['anonymous']->name = $this->config('user.settings')->get('anonymous');
-    $users = array();
+    $users = [];
 
-    $user_labels = array();
+    $user_labels = [];
     foreach ($user_values as $key => $values) {
       if (is_array($values)) {
         $account = User::create($values);
@@ -243,113 +244,113 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
 
     // Test as a non-admin.
     \Drupal::currentUser()->setAccount($users['non_admin']);
-    $referenceable_tests = array(
-      array(
-        'arguments' => array(
-          array(NULL, 'CONTAINS'),
-        ),
-        'result' => array(
-          'user' => array(
+    $referenceable_tests = [
+      [
+        'arguments' => [
+          [NULL, 'CONTAINS'],
+        ],
+        'result' => [
+          'user' => [
             $users['admin']->id() => $user_labels['admin'],
             $users['non_admin']->id() => $user_labels['non_admin'],
-          ),
-        ),
-      ),
-      array(
-        'arguments' => array(
-          array('non_admin', 'CONTAINS'),
-          array('NON_ADMIN', 'CONTAINS'),
-        ),
-        'result' => array(
-          'user' => array(
+          ],
+        ],
+      ],
+      [
+        'arguments' => [
+          ['non_admin', 'CONTAINS'],
+          ['NON_ADMIN', 'CONTAINS'],
+        ],
+        'result' => [
+          'user' => [
             $users['non_admin']->id() => $user_labels['non_admin'],
-          ),
-        ),
-      ),
-      array(
-        'arguments' => array(
-          array('invalid user', 'CONTAINS'),
-        ),
-        'result' => array(),
-      ),
-      array(
-        'arguments' => array(
-          array('blocked', 'CONTAINS'),
-        ),
-        'result' => array(),
-      ),
-    );
+          ],
+        ],
+      ],
+      [
+        'arguments' => [
+          ['invalid user', 'CONTAINS'],
+        ],
+        'result' => [],
+      ],
+      [
+        'arguments' => [
+          ['blocked', 'CONTAINS'],
+        ],
+        'result' => [],
+      ],
+    ];
     $this->assertReferenceable($selection_options, $referenceable_tests, 'User handler');
 
     \Drupal::currentUser()->setAccount($users['admin']);
-    $referenceable_tests = array(
-      array(
-        'arguments' => array(
-          array(NULL, 'CONTAINS'),
-        ),
-        'result' => array(
-          'user' => array(
+    $referenceable_tests = [
+      [
+        'arguments' => [
+          [NULL, 'CONTAINS'],
+        ],
+        'result' => [
+          'user' => [
             $users['anonymous']->id() => $user_labels['anonymous'],
             $users['admin']->id() => $user_labels['admin'],
             $users['non_admin']->id() => $user_labels['non_admin'],
             $users['blocked']->id() => $user_labels['blocked'],
-          ),
-        ),
-      ),
-      array(
-        'arguments' => array(
-          array('blocked', 'CONTAINS'),
-        ),
-        'result' => array(
-          'user' => array(
+          ],
+        ],
+      ],
+      [
+        'arguments' => [
+          ['blocked', 'CONTAINS'],
+        ],
+        'result' => [
+          'user' => [
             $users['blocked']->id() => $user_labels['blocked'],
-          ),
-        ),
-      ),
-      array(
-        'arguments' => array(
-          array('Anonymous', 'CONTAINS'),
-          array('anonymous', 'CONTAINS'),
-        ),
-        'result' => array(
-          'user' => array(
+          ],
+        ],
+      ],
+      [
+        'arguments' => [
+          ['Anonymous', 'CONTAINS'],
+          ['anonymous', 'CONTAINS'],
+        ],
+        'result' => [
+          'user' => [
             $users['anonymous']->id() => $user_labels['anonymous'],
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
     $this->assertReferenceable($selection_options, $referenceable_tests, 'User handler (admin)');
 
     // Test the 'include_anonymous' option.
     $selection_options['handler_settings']['include_anonymous'] = FALSE;
-    $referenceable_tests = array(
-      array(
-        'arguments' => array(
-          array('Anonymous', 'CONTAINS'),
-          array('anonymous', 'CONTAINS'),
-        ),
-        'result' => array(),
-      ),
-    );
+    $referenceable_tests = [
+      [
+        'arguments' => [
+          ['Anonymous', 'CONTAINS'],
+          ['anonymous', 'CONTAINS'],
+        ],
+        'result' => [],
+      ],
+    ];
     $this->assertReferenceable($selection_options, $referenceable_tests, 'User handler (does not include anonymous)');
 
     // Check that the Anonymous user is not included in the results when no
     // label matching is done, for example when using the 'options_select'
     // widget.
-    $referenceable_tests = array(
-      array(
-        'arguments' => array(
-          array(NULL),
-        ),
-        'result' => array(
-          'user' => array(
+    $referenceable_tests = [
+      [
+        'arguments' => [
+          [NULL],
+        ],
+        'result' => [
+          'user' => [
             $users['admin']->id() => $user_labels['admin'],
             $users['non_admin']->id() => $user_labels['non_admin'],
             $users['blocked']->id() => $user_labels['blocked'],
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
     $this->assertReferenceable($selection_options, $referenceable_tests, 'User handler (does not include anonymous)');
   }
 
@@ -357,30 +358,30 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
    * Test the comment-specific overrides of the entity handler.
    */
   public function testCommentHandler() {
-    $selection_options = array(
+    $selection_options = [
       'target_type' => 'comment',
       'handler' => 'default',
-      'handler_settings' => array(
+      'handler_settings' => [
         'target_bundles' => NULL,
-      ),
-    );
+      ],
+    ];
 
     // Build a set of test data.
-    $node_values = array(
-      'published' => array(
+    $node_values = [
+      'published' => [
         'type' => 'article',
         'status' => 1,
         'title' => 'Node published',
         'uid' => 1,
-      ),
-      'unpublished' => array(
+      ],
+      'unpublished' => [
         'type' => 'article',
         'status' => 0,
         'title' => 'Node unpublished',
         'uid' => 1,
-      ),
-    );
-    $nodes = array();
+      ],
+    ];
+    $nodes = [];
     foreach ($node_values as $key => $values) {
       $node = Node::create($values);
       $node->save();
@@ -390,8 +391,8 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
     // Create comment field on article.
     $this->addDefaultCommentField('node', 'article');
 
-    $comment_values = array(
-      'published_published' => array(
+    $comment_values = [
+      'published_published' => [
         'entity_id' => $nodes['published']->id(),
         'entity_type' => 'node',
         'field_name' => 'comment',
@@ -401,8 +402,8 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
         'status' => CommentInterface::PUBLISHED,
         'subject' => 'Comment Published <&>',
         'language' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      ),
-      'published_unpublished' => array(
+      ],
+      'published_unpublished' => [
         'entity_id' => $nodes['published']->id(),
         'entity_type' => 'node',
         'field_name' => 'comment',
@@ -412,8 +413,8 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
         'status' => CommentInterface::NOT_PUBLISHED,
         'subject' => 'Comment Unpublished <&>',
         'language' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      ),
-      'unpublished_published' => array(
+      ],
+      'unpublished_published' => [
         'entity_id' => $nodes['unpublished']->id(),
         'entity_type' => 'node',
         'field_name' => 'comment',
@@ -423,11 +424,11 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
         'status' => CommentInterface::NOT_PUBLISHED,
         'subject' => 'Comment Published on Unpublished node <&>',
         'language' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      ),
-    );
+      ],
+    ];
 
-    $comments = array();
-    $comment_labels = array();
+    $comments = [];
+    $comment_labels = [];
     foreach ($comment_values as $key => $values) {
       $comment = Comment::create($values);
       $comment->save();
@@ -436,79 +437,79 @@ class EntityReferenceSelectionAccessTest extends WebTestBase {
     }
 
     // Test as a non-admin.
-    $normal_user = $this->drupalCreateUser(array('access content', 'access comments'));
+    $normal_user = $this->drupalCreateUser(['access content', 'access comments']);
     \Drupal::currentUser()->setAccount($normal_user);
-    $referenceable_tests = array(
-      array(
-        'arguments' => array(
-          array(NULL, 'CONTAINS'),
-        ),
-        'result' => array(
-          'comment' => array(
+    $referenceable_tests = [
+      [
+        'arguments' => [
+          [NULL, 'CONTAINS'],
+        ],
+        'result' => [
+          'comment' => [
             $comments['published_published']->cid->value => $comment_labels['published_published'],
-          ),
-        ),
-      ),
-      array(
-        'arguments' => array(
-          array('Published', 'CONTAINS'),
-        ),
-        'result' => array(
-          'comment' => array(
+          ],
+        ],
+      ],
+      [
+        'arguments' => [
+          ['Published', 'CONTAINS'],
+        ],
+        'result' => [
+          'comment' => [
             $comments['published_published']->cid->value => $comment_labels['published_published'],
-          ),
-        ),
-      ),
-      array(
-        'arguments' => array(
-          array('invalid comment', 'CONTAINS'),
-        ),
-        'result' => array(),
-      ),
-      array(
-        'arguments' => array(
-          array('Comment Unpublished', 'CONTAINS'),
-        ),
-        'result' => array(),
-      ),
-    );
+          ],
+        ],
+      ],
+      [
+        'arguments' => [
+          ['invalid comment', 'CONTAINS'],
+        ],
+        'result' => [],
+      ],
+      [
+        'arguments' => [
+          ['Comment Unpublished', 'CONTAINS'],
+        ],
+        'result' => [],
+      ],
+    ];
     $this->assertReferenceable($selection_options, $referenceable_tests, 'Comment handler');
 
     // Test as a comment admin.
-    $admin_user = $this->drupalCreateUser(array('access content', 'access comments', 'administer comments'));
+    $admin_user = $this->drupalCreateUser(['access content', 'access comments', 'administer comments']);
     \Drupal::currentUser()->setAccount($admin_user);
-    $referenceable_tests = array(
-      array(
-        'arguments' => array(
-          array(NULL, 'CONTAINS'),
-        ),
-        'result' => array(
-          'comment' => array(
+    $referenceable_tests = [
+      [
+        'arguments' => [
+          [NULL, 'CONTAINS'],
+        ],
+        'result' => [
+          'comment' => [
             $comments['published_published']->cid->value => $comment_labels['published_published'],
             $comments['published_unpublished']->cid->value => $comment_labels['published_unpublished'],
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
     $this->assertReferenceable($selection_options, $referenceable_tests, 'Comment handler (comment admin)');
 
     // Test as a node and comment admin.
-    $admin_user = $this->drupalCreateUser(array('access content', 'access comments', 'administer comments', 'bypass node access'));
+    $admin_user = $this->drupalCreateUser(['access content', 'access comments', 'administer comments', 'bypass node access']);
     \Drupal::currentUser()->setAccount($admin_user);
-    $referenceable_tests = array(
-      array(
-        'arguments' => array(
-          array(NULL, 'CONTAINS'),
-        ),
-        'result' => array(
-          'comment' => array(
+    $referenceable_tests = [
+      [
+        'arguments' => [
+          [NULL, 'CONTAINS'],
+        ],
+        'result' => [
+          'comment' => [
             $comments['published_published']->cid->value => $comment_labels['published_published'],
             $comments['published_unpublished']->cid->value => $comment_labels['published_unpublished'],
             $comments['unpublished_published']->cid->value => $comment_labels['unpublished_published'],
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
     $this->assertReferenceable($selection_options, $referenceable_tests, 'Comment handler (comment + node admin)');
   }
 
diff --git a/web/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityRevisionsTest.php
similarity index 80%
rename from web/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
rename to web/core/modules/system/tests/src/Functional/Entity/EntityRevisionsTest.php
index 13847fa8e..38db0e9dc 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityRevisionsTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\system\Tests\Entity;
+namespace Drupal\Tests\system\Functional\Entity;
 
 use Drupal\entity_test\Entity\EntityTestMulRev;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Create a entity with revisions and test viewing, saving, reverting, and
@@ -12,14 +12,14 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group Entity
  */
-class EntityRevisionsTest extends WebTestBase {
+class EntityRevisionsTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('entity_test', 'language');
+  public static $modules = ['entity_test', 'language'];
 
   /**
    * A user with permission to administer entity_test content.
@@ -32,10 +32,10 @@ class EntityRevisionsTest extends WebTestBase {
     parent::setUp();
 
     // Create and log in user.
-    $this->webUser = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser([
       'administer entity_test content',
       'view test entity',
-    ));
+    ]);
     $this->drupalLogin($this->webUser);
 
     // Enable an additional language.
@@ -64,17 +64,17 @@ class EntityRevisionsTest extends WebTestBase {
     // Create initial entity.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         'name' => 'foo',
         'user_id' => $this->webUser->id(),
-      ));
+      ]);
     $entity->field_test_text->value = 'bar';
     $entity->save();
 
-    $names = array();
-    $texts = array();
-    $created = array();
-    $revision_ids = array();
+    $names = [];
+    $texts = [];
+    $created = [];
+    $revision_ids = [];
 
     // Create three revisions.
     $revision_count = 3;
@@ -93,23 +93,24 @@ class EntityRevisionsTest extends WebTestBase {
       $revision_ids[] = $entity->revision_id->value;
 
       // Check that the fields and properties contain new content.
-      $this->assertTrue($entity->revision_id->value > $legacy_revision_id, format_string('%entity_type: Revision ID changed.', array('%entity_type' => $entity_type)));
-      $this->assertNotEqual($entity->name->value, $legacy_name, format_string('%entity_type: Name changed.', array('%entity_type' => $entity_type)));
-      $this->assertNotEqual($entity->field_test_text->value, $legacy_text, format_string('%entity_type: Text changed.', array('%entity_type' => $entity_type)));
+      $this->assertTrue($entity->revision_id->value > $legacy_revision_id, format_string('%entity_type: Revision ID changed.', ['%entity_type' => $entity_type]));
+      $this->assertNotEqual($entity->name->value, $legacy_name, format_string('%entity_type: Name changed.', ['%entity_type' => $entity_type]));
+      $this->assertNotEqual($entity->field_test_text->value, $legacy_text, format_string('%entity_type: Text changed.', ['%entity_type' => $entity_type]));
     }
 
+    $storage = $this->container->get('entity_type.manager')->getStorage($entity_type);
     for ($i = 0; $i < $revision_count; $i++) {
       // Load specific revision.
-      $entity_revision = entity_revision_load($entity_type, $revision_ids[$i]);
+      $entity_revision = $storage->loadRevision($revision_ids[$i]);
 
       // Check if properties and fields contain the revision specific content.
-      $this->assertEqual($entity_revision->revision_id->value, $revision_ids[$i], format_string('%entity_type: Revision ID matches.', array('%entity_type' => $entity_type)));
-      $this->assertEqual($entity_revision->name->value, $names[$i], format_string('%entity_type: Name matches.', array('%entity_type' => $entity_type)));
-      $this->assertEqual($entity_revision->field_test_text->value, $texts[$i], format_string('%entity_type: Text matches.', array('%entity_type' => $entity_type)));
+      $this->assertEqual($entity_revision->revision_id->value, $revision_ids[$i], format_string('%entity_type: Revision ID matches.', ['%entity_type' => $entity_type]));
+      $this->assertEqual($entity_revision->name->value, $names[$i], format_string('%entity_type: Name matches.', ['%entity_type' => $entity_type]));
+      $this->assertEqual($entity_revision->field_test_text->value, $texts[$i], format_string('%entity_type: Text matches.', ['%entity_type' => $entity_type]));
 
       // Check non-revisioned values are loaded.
-      $this->assertTrue(isset($entity_revision->created->value), format_string('%entity_type: Non-revisioned field is loaded.', array('%entity_type' => $entity_type)));
-      $this->assertEqual($entity_revision->created->value, $created[2], format_string('%entity_type: Non-revisioned field value is the same between revisions.', array('%entity_type' => $entity_type)));
+      $this->assertTrue(isset($entity_revision->created->value), format_string('%entity_type: Non-revisioned field is loaded.', ['%entity_type' => $entity_type]));
+      $this->assertEqual($entity_revision->created->value, $created[2], format_string('%entity_type: Non-revisioned field value is the same between revisions.', ['%entity_type' => $entity_type]));
     }
 
     // Confirm the correct revision text appears in the edit form.
@@ -117,8 +118,8 @@ class EntityRevisionsTest extends WebTestBase {
       ->getStorage($entity_type)
       ->load($entity->id->value);
     $this->drupalGet($entity_type . '/manage/' . $entity->id->value . '/edit');
-    $this->assertFieldById('edit-name-0-value', $entity->name->value, format_string('%entity_type: Name matches in UI.', array('%entity_type' => $entity_type)));
-    $this->assertFieldById('edit-field-test-text-0-value', $entity->field_test_text->value, format_string('%entity_type: Text matches in UI.', array('%entity_type' => $entity_type)));
+    $this->assertFieldById('edit-name-0-value', $entity->name->value, format_string('%entity_type: Name matches in UI.', ['%entity_type' => $entity_type]));
+    $this->assertFieldById('edit-field-test-text-0-value', $entity->field_test_text->value, format_string('%entity_type: Text matches in UI.', ['%entity_type' => $entity_type]));
   }
 
   /**
diff --git a/web/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
similarity index 86%
rename from web/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
rename to web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
index d9f36ff91..684e0be8f 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace Drupal\system\Tests\Entity;
+namespace Drupal\Tests\system\Functional\Entity;
 
 use Drupal\entity_test\Entity\EntityTest;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests EntityViewController functionality.
  *
  * @group Entity
  */
-class EntityViewControllerTest extends WebTestBase {
+class EntityViewControllerTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('entity_test');
+  public static $modules = ['entity_test'];
 
   /**
    * Array of test entities.
    *
    * @var array
    */
-  protected $entities = array();
+  protected $entities = [];
 
   protected function setUp() {
     parent::setUp();
@@ -41,7 +41,7 @@ class EntityViewControllerTest extends WebTestBase {
   /**
    * Tests EntityViewController.
    */
-  function testEntityViewController() {
+  public function testEntityViewController() {
     $get_label_markup = function($label) {
       return '<h1 class="page-title">
             <div class="field field--name-name field--type-string field--label-hidden field__item">' . $label . '</div>
@@ -86,7 +86,7 @@ class EntityViewControllerTest extends WebTestBase {
   public function testFieldItemAttributes() {
     // Make sure the test field will be rendered.
     entity_get_display('entity_test', 'entity_test', 'default')
-      ->setComponent('field_test_text', array('type' => 'text_default'))
+      ->setComponent('field_test_text', ['type' => 'text_default'])
       ->save();
 
     // Create an entity and save test value in field_test_text.
@@ -98,24 +98,24 @@ class EntityViewControllerTest extends WebTestBase {
     // Browse to the entity and verify that the attribute is rendered in the
     // field item HTML markup.
     $this->drupalGet('entity_test/' . $entity->id());
-    $xpath = $this->xpath('//div[@data-field-item-attr="foobar"]/p[text()=:value]', array(':value' => $test_value));
+    $xpath = $this->xpath('//div[@data-field-item-attr="foobar"]/p[text()=:value]', [':value' => $test_value]);
     $this->assertTrue($xpath, 'The field item attribute has been found in the rendered output of the field.');
 
     // Enable the RDF module to ensure that two modules can add attributes to
     // the same field item.
-    \Drupal::service('module_installer')->install(array('rdf'));
+    \Drupal::service('module_installer')->install(['rdf']);
     $this->resetAll();
 
     // Set an RDF mapping for the field_test_text field. This RDF mapping will
     // be turned into RDFa attributes in the field item output.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping('field_test_text', array(
-      'properties' => array('schema:text'),
-    ))->save();
+    $mapping->setFieldMapping('field_test_text', [
+      'properties' => ['schema:text'],
+    ])->save();
     // Browse to the entity and verify that the attributes from both modules
     // are rendered in the field item HTML markup.
     $this->drupalGet('entity_test/' . $entity->id());
-    $xpath = $this->xpath('//div[@data-field-item-attr="foobar" and @property="schema:text"]/p[text()=:value]', array(':value' => $test_value));
+    $xpath = $this->xpath('//div[@data-field-item-attr="foobar" and @property="schema:text"]/p[text()=:value]', [':value' => $test_value]);
     $this->assertTrue($xpath, 'The field item attributes from both modules have been found in the rendered output of the field.');
   }
 
@@ -139,10 +139,10 @@ class EntityViewControllerTest extends WebTestBase {
    *   The created entity.
    */
   protected function createTestEntity($entity_type) {
-    $data = array(
+    $data = [
       'bundle' => $entity_type,
       'name' => $this->randomMachineName(),
-    );
+    ];
     return $this->container->get('entity.manager')->getStorage($entity_type)->create($data);
   }
 
diff --git a/web/core/modules/system/src/Tests/File/ConfigTest.php b/web/core/modules/system/tests/src/Functional/File/ConfigTest.php
similarity index 80%
rename from web/core/modules/system/src/Tests/File/ConfigTest.php
rename to web/core/modules/system/tests/src/Functional/File/ConfigTest.php
index 2313e26e3..da2003aa7 100644
--- a/web/core/modules/system/src/Tests/File/ConfigTest.php
+++ b/web/core/modules/system/tests/src/Functional/File/ConfigTest.php
@@ -1,35 +1,35 @@
 <?php
 
-namespace Drupal\system\Tests\File;
+namespace Drupal\Tests\system\Functional\File;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests file system configuration operations.
  *
  * @group File
  */
-class ConfigTest extends WebTestBase {
+class ConfigTest extends BrowserTestBase {
 
   protected function setUp(){
     parent::setUp();
-    $this->drupalLogin ($this->drupalCreateUser(array('administer site configuration')));
+    $this->drupalLogin ($this->drupalCreateUser(['administer site configuration']));
   }
 
   /**
    * Tests file configuration page.
    */
-  function testFileConfigurationPage() {
+  public function testFileConfigurationPage() {
     $this->drupalGet('admin/config/media/file-system');
 
     // Set the file paths to non-default values.
     // The respective directories are created automatically
     // upon form submission.
     $file_path = $this->publicFilesDirectory;
-    $fields = array(
+    $fields = [
       'file_temporary_path' => $file_path . '/file_config_page_test/temporary',
       'file_default_scheme' => 'private',
-    );
+    ];
 
     // Check that public and private can be selected as default scheme.
     $this->assertText('Public local files served by the webserver.');
@@ -43,10 +43,10 @@ class ConfigTest extends WebTestBase {
 
     // Remove the private path, rebuild the container and verify that private
     // can no longer be selected in the UI.
-    $settings['settings']['file_private_path'] = (object) array(
+    $settings['settings']['file_private_path'] = (object) [
       'value' => '',
       'required' => TRUE,
-    );
+    ];
     $this->writeSettings($settings);
     $this->rebuildContainer();
 
diff --git a/web/core/modules/system/src/Tests/File/FileSaveHtaccessLoggingTest.php b/web/core/modules/system/tests/src/Functional/File/FileSaveHtaccessLoggingTest.php
similarity index 83%
rename from web/core/modules/system/src/Tests/File/FileSaveHtaccessLoggingTest.php
rename to web/core/modules/system/tests/src/Functional/File/FileSaveHtaccessLoggingTest.php
index 5827e24ef..442591d15 100644
--- a/web/core/modules/system/src/Tests/File/FileSaveHtaccessLoggingTest.php
+++ b/web/core/modules/system/tests/src/Functional/File/FileSaveHtaccessLoggingTest.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Drupal\system\Tests\File;
+namespace Drupal\Tests\system\Functional\File;
 
 use Drupal\Component\PhpStorage\FileStorage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the log message added by file_save_htacess().
  *
  * @group File
  */
-class FileSaveHtaccessLoggingTest extends WebTestBase {
+class FileSaveHtaccessLoggingTest extends BrowserTestBase {
 
   protected static $modules = ['dblog'];
 
   /**
    * Tests file_save_htaccess().
    */
-  function testHtaccessSave() {
+  public function testHtaccessSave() {
     // Prepare test directories.
     $private = $this->publicFilesDirectory . '/test/private';
 
diff --git a/web/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php b/web/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
similarity index 79%
rename from web/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php
rename to web/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
index e8a67890e..76d8be800 100644
--- a/web/core/modules/system/src/Tests/FileTransfer/FileTransferTest.php
+++ b/web/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\system\Tests\FileTransfer;
+namespace Drupal\Tests\system\Functional\FileTransfer;
 
 use Drupal\Core\FileTransfer\FileTransferException;
 use Drupal\Core\StreamWrapper\PublicStream;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that the jail is respected and that protocols using recursive file move
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group FileTransfer
  */
-class FileTransferTest extends WebTestBase {
+class FileTransferTest extends BrowserTestBase {
   protected $hostname = 'localhost';
   protected $username = 'drupal';
   protected $password = 'password';
@@ -20,28 +20,28 @@ class FileTransferTest extends WebTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $this->testConnection = TestFileTransfer::factory(\Drupal::root(), array('hostname' => $this->hostname, 'username' => $this->username, 'password' => $this->password, 'port' => $this->port));
+    $this->testConnection = TestFileTransfer::factory(\Drupal::root(), ['hostname' => $this->hostname, 'username' => $this->username, 'password' => $this->password, 'port' => $this->port]);
   }
 
-  function _getFakeModuleFiles() {
-    $files = array(
+  public function _getFakeModuleFiles() {
+    $files = [
       'fake.module',
       'fake.info.yml',
-      'theme' => array(
+      'theme' => [
         'fake.html.twig'
-      ),
-      'inc' => array(
+      ],
+      'inc' => [
         'fake.inc'
-      )
-    );
+      ]
+    ];
     return $files;
   }
 
-  function _buildFakeModule() {
+  public function _buildFakeModule() {
     $location = 'temporary://fake';
     if (is_dir($location)) {
       $ret = 0;
-      $output = array();
+      $output = [];
       exec('rm -Rf ' . escapeshellarg($location), $output, $ret);
       if ($ret != 0) {
         throw new Exception('Error removing fake module directory.');
@@ -53,7 +53,7 @@ class FileTransferTest extends WebTestBase {
     return $location;
   }
 
-  function _writeDirectory($base, $files = array()) {
+  public function _writeDirectory($base, $files = []) {
     mkdir($base);
     foreach ($files as $key => $file) {
       if (is_array($file)) {
@@ -66,7 +66,7 @@ class FileTransferTest extends WebTestBase {
     }
   }
 
-  function testJail() {
+  public function testJail() {
     $source = $this->_buildFakeModule();
 
     // This convoluted piece of code is here because our testing framework does
diff --git a/web/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php b/web/core/modules/system/tests/src/Functional/FileTransfer/MockTestConnection.php
similarity index 53%
rename from web/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php
rename to web/core/modules/system/tests/src/Functional/FileTransfer/MockTestConnection.php
index 7e63dc78f..029e72c95 100644
--- a/web/core/modules/system/src/Tests/FileTransfer/MockTestConnection.php
+++ b/web/core/modules/system/tests/src/Functional/FileTransfer/MockTestConnection.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\system\Tests\FileTransfer;
+namespace Drupal\Tests\system\Functional\FileTransfer;
 
 /**
  * Mock connection object for test case.
  */
 class MockTestConnection {
 
-  protected $commandsRun = array();
+  protected $commandsRun = [];
   public $connectionString;
 
-  function run($cmd) {
+  public function run($cmd) {
     $this->commandsRun[] = $cmd;
   }
 
-  function flushCommands() {
+  public function flushCommands() {
     $out = $this->commandsRun;
-    $this->commandsRun = array();
+    $this->commandsRun = [];
     return $out;
   }
 
diff --git a/web/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php b/web/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
similarity index 70%
rename from web/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php
rename to web/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
index eb73ebc90..ca11ad0f5 100644
--- a/web/core/modules/system/src/Tests/FileTransfer/TestFileTransfer.php
+++ b/web/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\FileTransfer;
+namespace Drupal\Tests\system\Functional\FileTransfer;
 
 use Drupal\Core\FileTransfer\FileTransfer;
 use Drupal\Core\FileTransfer\FileTransferException;
@@ -19,11 +19,11 @@ class TestFileTransfer extends FileTransfer {
    */
   public $shouldIsDirectoryReturnTrue = FALSE;
 
-  function __construct($jail, $username, $password, $hostname = 'localhost', $port = 9999) {
+  public function __construct($jail, $username, $password, $hostname = 'localhost', $port = 9999) {
     parent::__construct($jail, $username, $password, $hostname, $port);
   }
 
-  static function factory($jail, $settings) {
+  public static function factory($jail, $settings) {
     return new TestFileTransfer($jail, $settings['username'], $settings['password'], $settings['hostname'], $settings['port']);
   }
 
@@ -32,7 +32,7 @@ class TestFileTransfer extends FileTransfer {
     $this->connection->connectionString = 'test://' . urlencode($this->username) . ':' . urlencode($this->password) . "@$this->host:$this->port/";
   }
 
-  function copyFileJailed($source, $destination) {
+  public function copyFileJailed($source, $destination) {
     $this->connection->run("copyFile $source $destination");
   }
 
@@ -40,25 +40,25 @@ class TestFileTransfer extends FileTransfer {
     $this->connection->run("rmdir $directory");
   }
 
-  function createDirectoryJailed($directory) {
+  public function createDirectoryJailed($directory) {
     $this->connection->run("mkdir $directory");
   }
 
-  function removeFileJailed($destination) {
+  public function removeFileJailed($destination) {
     if (!ftp_delete($this->connection, $item)) {
-      throw new FileTransferException('Unable to remove to file @file.', NULL, array('@file' => $item));
+      throw new FileTransferException('Unable to remove to file @file.', NULL, ['@file' => $item]);
     }
   }
 
-  function isDirectory($path) {
+  public function isDirectory($path) {
     return $this->shouldIsDirectoryReturnTrue;
   }
 
-  function isFile($path) {
+  public function isFile($path) {
     return FALSE;
   }
 
-  function chmodJailed($path, $mode, $recursive) {
+  public function chmodJailed($path, $mode, $recursive) {
     return;
   }
 
diff --git a/web/core/modules/system/src/Tests/Form/ElementsAccessTest.php b/web/core/modules/system/tests/src/Functional/Form/ElementsAccessTest.php
similarity index 85%
rename from web/core/modules/system/src/Tests/Form/ElementsAccessTest.php
rename to web/core/modules/system/tests/src/Functional/Form/ElementsAccessTest.php
index 13386d7b3..1a92893c3 100644
--- a/web/core/modules/system/src/Tests/Form/ElementsAccessTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ElementsAccessTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\system\Tests\Form;
+namespace Drupal\Tests\system\Functional\Form;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests access control for form elements.
  *
  * @group Form
  */
-class ElementsAccessTest extends WebTestBase {
+class ElementsAccessTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   /**
    * Ensures that child values are still processed when #access = FALSE.
diff --git a/web/core/modules/system/src/Tests/Form/FormObjectTest.php b/web/core/modules/system/tests/src/Functional/Form/FormObjectTest.php
similarity index 89%
rename from web/core/modules/system/src/Tests/Form/FormObjectTest.php
rename to web/core/modules/system/tests/src/Functional/Form/FormObjectTest.php
index 38db2119f..34ebb2e79 100644
--- a/web/core/modules/system/src/Tests/Form/FormObjectTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/FormObjectTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\Form;
+namespace Drupal\Tests\system\Functional\Form;
 
 use Drupal\system\Tests\System\SystemConfigFormTestBase;
 use Drupal\form_test\FormTestObject;
@@ -17,19 +17,19 @@ class FormObjectTest extends SystemConfigFormTestBase {
    *
    * @var array
    */
-  public static $modules = array('form_test');
+  public static $modules = ['form_test'];
 
   protected function setUp() {
     parent::setUp();
 
     $this->form = new FormTestObject($this->container->get('config.factory'));
-    $this->values = array(
-      'bananas' => array(
+    $this->values = [
+      'bananas' => [
         '#value' => $this->randomString(10),
         '#config_name' => 'form_test.object',
         '#config_key' => 'bananas',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -37,14 +37,14 @@ class FormObjectTest extends SystemConfigFormTestBase {
    *
    * @see \Drupal\form_test\EventSubscriber\FormTestEventSubscriber::onKernelRequest()
    */
-  function testObjectFormCallback() {
+  public function testObjectFormCallback() {
     $config_factory = $this->container->get('config.factory');
 
     $this->drupalGet('form-test/object-builder');
     $this->assertText('The FormTestObject::buildForm() method was used for this form.');
     $elements = $this->xpath('//form[@id="form-test-form-test-object"]');
     $this->assertTrue(!empty($elements), 'The correct form ID was used.');
-    $this->drupalPostForm(NULL, array('bananas' => 'green'), t('Save'));
+    $this->drupalPostForm(NULL, ['bananas' => 'green'], t('Save'));
     $this->assertText('The FormTestObject::validateForm() method was used for this form.');
     $this->assertText('The FormTestObject::submitForm() method was used for this form.');
     $value = $config_factory->get('form_test.object')->get('bananas');
@@ -64,7 +64,7 @@ class FormObjectTest extends SystemConfigFormTestBase {
     $this->assertText('The FormTestServiceObject::buildForm() method was used for this form.');
     $elements = $this->xpath('//form[@id="form-test-form-test-service-object"]');
     $this->assertTrue(!empty($elements), 'The correct form ID was used.');
-    $this->drupalPostForm(NULL, array('bananas' => 'brown'), t('Save'));
+    $this->drupalPostForm(NULL, ['bananas' => 'brown'], t('Save'));
     $this->assertText('The FormTestServiceObject::validateForm() method was used for this form.');
     $this->assertText('The FormTestServiceObject::submitForm() method was used for this form.');
     $value = $config_factory->get('form_test.object')->get('bananas');
@@ -77,7 +77,7 @@ class FormObjectTest extends SystemConfigFormTestBase {
     $this->assertTrue(!empty($elements), 'The correct form ID was used.');
     $this->assertText('custom_value', 'Ensure parameters are injected from request attributes.');
     $this->assertText('request_value', 'Ensure the request object is injected.');
-    $this->drupalPostForm(NULL, array('bananas' => 'black'), t('Save'));
+    $this->drupalPostForm(NULL, ['bananas' => 'black'], t('Save'));
     $this->assertText('The FormTestControllerObject::validateForm() method was used for this form.');
     $this->assertText('The FormTestControllerObject::submitForm() method was used for this form.');
     $value = $config_factory->get('form_test.object')->get('bananas');
diff --git a/web/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php b/web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
similarity index 84%
rename from web/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php
rename to web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
index 921a27d78..dc63e64d7 100644
--- a/web/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Drupal\system\Tests\Form;
+namespace Drupal\Tests\system\Functional\Form;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests \Drupal\system\Form\ModulesListForm.
  *
  * @group Form
  */
-class ModulesListFormWebTest extends WebTestBase {
+class ModulesListFormWebTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('system_test', 'help');
+  public static $modules = ['system_test', 'help'];
 
   /**
    * {@inheritdoc}
@@ -30,7 +30,7 @@ class ModulesListFormWebTest extends WebTestBase {
   public function testModuleListForm() {
     $this->drupalLogin(
       $this->drupalCreateUser(
-        array('administer modules', 'administer permissions')
+        ['administer modules', 'administer permissions']
       )
     );
     $this->drupalGet('admin/modules');
diff --git a/web/core/modules/system/src/Tests/Form/RedirectTest.php b/web/core/modules/system/tests/src/Functional/Form/RedirectTest.php
similarity index 69%
rename from web/core/modules/system/src/Tests/Form/RedirectTest.php
rename to web/core/modules/system/tests/src/Functional/Form/RedirectTest.php
index 6b6d36001..a4c9e15b3 100644
--- a/web/core/modules/system/src/Tests/Form/RedirectTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/RedirectTest.php
@@ -1,75 +1,75 @@
 <?php
 
-namespace Drupal\system\Tests\Form;
+namespace Drupal\Tests\system\Functional\Form;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests form redirection functionality.
  *
  * @group Form
  */
-class RedirectTest extends WebTestBase {
+class RedirectTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('form_test', 'block');
+  public static $modules = ['form_test', 'block'];
 
   /**
    * Tests form redirection.
    */
-  function testRedirect() {
+  public function testRedirect() {
     $path = 'form-test/redirect';
-    $options = array('query' => array('foo' => 'bar'));
+    $options = ['query' => ['foo' => 'bar']];
     $options['absolute'] = TRUE;
 
     // Test basic redirection.
-    $edit = array(
+    $edit = [
       'redirection' => TRUE,
       'destination' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Submit'));
-    $this->assertUrl($edit['destination'], array(), 'Basic redirection works.');
+    $this->assertUrl($edit['destination'], [], 'Basic redirection works.');
 
 
     // Test without redirection.
-    $edit = array(
+    $edit = [
       'redirection' => FALSE,
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Submit'));
-    $this->assertUrl($path, array(), 'When redirect is set to FALSE, there should be no redirection.');
+    $this->assertUrl($path, [], 'When redirect is set to FALSE, there should be no redirection.');
 
     // Test redirection with query parameters.
-    $edit = array(
+    $edit = [
       'redirection' => TRUE,
       'destination' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Submit'), $options);
-    $this->assertUrl($edit['destination'], array(), 'Redirection with query parameters works.');
+    $this->assertUrl($edit['destination'], [], 'Redirection with query parameters works.');
 
     // Test without redirection but with query parameters.
-    $edit = array(
+    $edit = [
       'redirection' => FALSE,
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Submit'), $options);
     $this->assertUrl($path, $options, 'When redirect is set to FALSE, there should be no redirection, and the query parameters should be passed along.');
 
     // Test redirection back to the original path.
-    $edit = array(
+    $edit = [
       'redirection' => TRUE,
       'destination' => '',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Submit'));
-    $this->assertUrl($path, array(), 'When using an empty redirection string, there should be no redirection.');
+    $this->assertUrl($path, [], 'When using an empty redirection string, there should be no redirection.');
 
     // Test redirection back to the original path with query parameters.
-    $edit = array(
+    $edit = [
       'redirection' => TRUE,
       'destination' => '',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Submit'), $options);
     $this->assertUrl($path, $options, 'When using an empty redirection string, there should be no redirection, and the query parameters should be passed along.');
   }
@@ -82,15 +82,15 @@ class RedirectTest extends WebTestBase {
     $this->drupalPlaceBlock('redirect_form_block');
 
     // Create a user that does not have permission to administer blocks.
-    $user = $this->drupalCreateUser(array('administer themes'));
+    $user = $this->drupalCreateUser(['administer themes']);
     $this->drupalLogin($user);
 
     // Visit page 'foo' (404 page) and submit the form. Verify it ends up
     // at the right URL.
-    $expected = \Drupal::url('form_test.route1', array(), array('query' => array('test1' => 'test2'), 'absolute' => TRUE));
+    $expected = \Drupal::url('form_test.route1', [], ['query' => ['test1' => 'test2'], 'absolute' => TRUE]);
     $this->drupalGet('foo');
     $this->assertResponse(404);
-    $this->drupalPostForm(NULL, array(), t('Submit'));
+    $this->drupalPostForm(NULL, [], t('Submit'));
     $this->assertResponse(200);
     $this->assertUrl($expected, [], 'Redirected to correct URL/query.');
 
@@ -98,7 +98,7 @@ class RedirectTest extends WebTestBase {
     // ends up at the right URL.
     $this->drupalGet('admin/structure/block');
     $this->assertResponse(403);
-    $this->drupalPostForm(NULL, array(), t('Submit'));
+    $this->drupalPostForm(NULL, [], t('Submit'));
     $this->assertResponse(200);
     $this->assertUrl($expected, [], 'Redirected to correct URL/query.');
   }
diff --git a/web/core/modules/system/src/Tests/Lock/LockFunctionalTest.php b/web/core/modules/system/tests/src/Functional/Lock/LockFunctionalTest.php
similarity index 95%
rename from web/core/modules/system/src/Tests/Lock/LockFunctionalTest.php
rename to web/core/modules/system/tests/src/Functional/Lock/LockFunctionalTest.php
index 0355a7617..0b13f18d6 100644
--- a/web/core/modules/system/src/Tests/Lock/LockFunctionalTest.php
+++ b/web/core/modules/system/tests/src/Functional/Lock/LockFunctionalTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\system\Tests\Lock;
+namespace Drupal\Tests\system\Functional\Lock;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Confirm locking works between two separate requests.
  *
  * @group Lock
  */
-class LockFunctionalTest extends WebTestBase {
+class LockFunctionalTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('system_test');
+  public static $modules = ['system_test'];
 
   /**
    * Confirms that we can acquire and release locks in two parallel requests.
diff --git a/web/core/modules/system/src/Tests/Mail/HtmlToTextTest.php b/web/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php
similarity index 97%
rename from web/core/modules/system/src/Tests/Mail/HtmlToTextTest.php
rename to web/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php
index f396acd31..bdbfd749c 100644
--- a/web/core/modules/system/src/Tests/Mail/HtmlToTextTest.php
+++ b/web/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\system\Tests\Mail;
+namespace Drupal\Tests\system\Functional\Mail;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Mail\MailFormatHelper;
 use Drupal\Core\Site\Settings;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for \Drupal\Core\Mail\MailFormatHelper::htmlToText().
  *
  * @group Mail
  */
-class HtmlToTextTest extends WebTestBase {
+class HtmlToTextTest extends BrowserTestBase {
   /**
    * Converts a string to its PHP source equivalent for display in test messages.
    *
@@ -27,8 +27,8 @@ class HtmlToTextTest extends WebTestBase {
   protected function stringToHtml($text) {
     return '"' .
       str_replace(
-        array("\n", ' '),
-        array('\n', '&nbsp;'),
+        ["\n", ' '],
+        ['\n', '&nbsp;'],
         Html::escape($text)
       ) . '"';
   }
@@ -68,7 +68,7 @@ class HtmlToTextTest extends WebTestBase {
    */
   public function testTags() {
     global $base_path, $base_url;
-    $tests = array(
+    $tests = [
       // @todo Trailing linefeeds should be trimmed.
       '<a href = "https://www.drupal.org">Drupal.org</a>' => "Drupal.org [1]\n\n[1] https://www.drupal.org\n",
       // @todo Footer URLs should be absolute.
@@ -151,7 +151,7 @@ class HtmlToTextTest extends WebTestBase {
       // A couple of tests for Unicode characters.
       '<q>I <em>will</em> be back…</q>' => "I /will/ be back…\n",
       'FrançAIS is ÜBER-åwesome' => "FrançAIS is ÜBER-åwesome\n",
-    );
+    ];
 
     foreach ($tests as $html => $text) {
       $this->assertHtmlToText($html, $text, 'Supported tags');
@@ -168,27 +168,27 @@ class HtmlToTextTest extends WebTestBase {
       'Drupal <b>Drupal</b> Drupal',
       "Drupal *Drupal* Drupal\n",
       'Allowed <b> tag found',
-      array('b')
+      ['b']
     );
     $this->assertHtmlToText(
       'Drupal <h1>Drupal</h1> Drupal',
       "Drupal Drupal Drupal\n",
       'Disallowed <h1> tag not found',
-      array('b')
+      ['b']
     );
 
     $this->assertHtmlToText(
       'Drupal <p><em><b>Drupal</b></em><p> Drupal',
       "Drupal Drupal Drupal\n",
       'Disallowed <p>, <em>, and <b> tags not found',
-      array('a', 'br', 'h1')
+      ['a', 'br', 'h1']
     );
 
     $this->assertHtmlToText(
       '<html><body>Drupal</body></html>',
       "Drupal\n",
       'Unsupported <html> and <body> tags not found',
-      array('html', 'body')
+      ['html', 'body']
     );
   }
 
@@ -203,7 +203,7 @@ class HtmlToTextTest extends WebTestBase {
       $input,
       $collapsed,
       'Whitespace is collapsed',
-      array('p')
+      ['p']
     );
   }
 
@@ -312,17 +312,17 @@ class HtmlToTextTest extends WebTestBase {
    * and spaces are properly handled.
    */
   public function testDrupalHtmlToTextParagraphs() {
-    $tests = array();
-    $tests[] = array(
+    $tests = [];
+    $tests[] = [
         'html' => "<p>line 1<br />\nline 2<br />line 3\n<br />line 4</p><p>paragraph</p>",
         // @todo Trailing line breaks should be trimmed.
         'text' => "line 1\nline 2\nline 3\nline 4\n\nparagraph\n\n",
-    );
-    $tests[] = array(
+    ];
+    $tests[] = [
       'html' => "<p>line 1<br /> line 2</p> <p>line 4<br /> line 5</p> <p>0</p>",
       // @todo Trailing line breaks should be trimmed.
       'text' => "line 1\nline 2\n\nline 4\nline 5\n\n0\n\n",
-    );
+    ];
     foreach ($tests as $test) {
       $this->assertHtmlToText($test['html'], $test['text'], 'Paragraph breaks');
     }
diff --git a/web/core/modules/system/src/Tests/Mail/MailTest.php b/web/core/modules/system/tests/src/Functional/Mail/MailTest.php
similarity index 88%
rename from web/core/modules/system/src/Tests/Mail/MailTest.php
rename to web/core/modules/system/tests/src/Functional/Mail/MailTest.php
index 70f5a4b4c..74549a321 100644
--- a/web/core/modules/system/src/Tests/Mail/MailTest.php
+++ b/web/core/modules/system/tests/src/Functional/Mail/MailTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\system\Tests\Mail;
+namespace Drupal\Tests\system\Functional\Mail;
 
 use Drupal\Core\Mail\Plugin\Mail\TestMailCollector;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system_mail_failure_test\Plugin\Mail\TestPhpMailFailure;
 
 /**
@@ -11,14 +11,14 @@ use Drupal\system_mail_failure_test\Plugin\Mail\TestPhpMailFailure;
  *
  * @group Mail
  */
-class MailTest extends WebTestBase {
+class MailTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('simpletest', 'system_mail_failure_test');
+  public static $modules = ['simpletest', 'system_mail_failure_test'];
 
   /**
    * Assert that the pluggable mail system is functional.
@@ -28,7 +28,7 @@ class MailTest extends WebTestBase {
     $this->config('system.mail')->set('interface.default', 'test_php_mail_failure')->save();
 
     // Get the default MailInterface class instance.
-    $mail_backend = \Drupal::service('plugin.manager.mail')->getInstance(array('module' => 'default', 'key' => 'default'));
+    $mail_backend = \Drupal::service('plugin.manager.mail')->getInstance(['module' => 'default', 'key' => 'default']);
 
     // Assert whether the default mail backend is an instance of the expected
     // class.
@@ -38,7 +38,7 @@ class MailTest extends WebTestBase {
     $this->config('system.mail')->set('interface.mymodule_testkey', 'test_mail_collector')->save();
 
     // Get the added MailInterface class instance.
-    $mail_backend = \Drupal::service('plugin.manager.mail')->getInstance(array('module' => 'mymodule', 'key' => 'testkey'));
+    $mail_backend = \Drupal::service('plugin.manager.mail')->getInstance(['module' => 'mymodule', 'key' => 'testkey']);
 
     // Assert whether the added mail backend is an instance of the expected
     // class.
@@ -56,7 +56,7 @@ class MailTest extends WebTestBase {
     // Use the state system collector mail backend.
     $this->config('system.mail')->set('interface.default', 'test_mail_collector')->save();
     // Reset the state variable that holds sent messages.
-    \Drupal::state()->set('system.test_mail_collector', array());
+    \Drupal::state()->set('system.test_mail_collector', []);
 
     // Send a test message that simpletest_mail_alter should cancel.
     \Drupal::service('plugin.manager.mail')->mail('simpletest', 'cancel_test', 'cancel@example.com', $language_interface->getId());
@@ -77,11 +77,11 @@ class MailTest extends WebTestBase {
     // Use the state system collector mail backend.
     $this->config('system.mail')->set('interface.default', 'test_mail_collector')->save();
     // Reset the state variable that holds sent messages.
-    \Drupal::state()->set('system.test_mail_collector', array());
+    \Drupal::state()->set('system.test_mail_collector', []);
     // Send an email with a reply-to address specified.
     $from_email = 'Drupal <simpletest@example.com>';
     $reply_email = 'someone_else@example.com';
-    \Drupal::service('plugin.manager.mail')->mail('simpletest', 'from_test', 'from_test@example.com', $language, array(), $reply_email);
+    \Drupal::service('plugin.manager.mail')->mail('simpletest', 'from_test', 'from_test@example.com', $language, [], $reply_email);
     // Test that the reply-to email is just the email and not the site name
     // and default sender email.
     $captured_emails = \Drupal::state()->get('system.test_mail_collector');
diff --git a/web/core/modules/system/src/Tests/Menu/MenuAccessTest.php b/web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php
similarity index 92%
rename from web/core/modules/system/src/Tests/Menu/MenuAccessTest.php
rename to web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php
index fff17e58c..10af396a6 100644
--- a/web/core/modules/system/src/Tests/Menu/MenuAccessTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\system\Tests\Menu;
+namespace Drupal\Tests\system\Functional\Menu;
 
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the route access checks on menu links.
  *
  * @group Menu
  */
-class MenuAccessTest extends WebTestBase {
+class MenuAccessTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -56,10 +56,10 @@ class MenuAccessTest extends WebTestBase {
     // Attempt to access a restricted local task.
     $this->drupalGet('foo/asdf/c');
     $this->assertResponse(403);
-    $elements = $this->xpath('//ul[@class=:class]/li/a[@href=:href]', array(
+    $elements = $this->xpath('//ul[@class=:class]/li/a[@href=:href]', [
       ':class' => 'tabs primary',
       ':href' => Url::fromRoute('menu_test.router_test1', ['bar' => 'asdf'])->toString(),
-    ));
+    ]);
     $this->assertTrue(empty($elements), 'No tab linking to foo/asdf found');
     $this->assertNoLinkByHref('foo/asdf/b');
     $this->assertNoLinkByHref('foo/asdf/c');
diff --git a/web/core/modules/system/src/Tests/Menu/MenuLinkSecurityTest.php b/web/core/modules/system/tests/src/Functional/Menu/MenuLinkSecurityTest.php
similarity index 87%
rename from web/core/modules/system/src/Tests/Menu/MenuLinkSecurityTest.php
rename to web/core/modules/system/tests/src/Functional/Menu/MenuLinkSecurityTest.php
index 94bb14af0..c58bf8e50 100644
--- a/web/core/modules/system/src/Tests/Menu/MenuLinkSecurityTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/MenuLinkSecurityTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\system\Tests\Menu;
+namespace Drupal\Tests\system\Functional\Menu;
 
 use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Ensures that menu links don't cause XSS issues.
  *
  * @group Menu
  */
-class MenuLinkSecurityTest extends WebTestBase {
+class MenuLinkSecurityTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/system/src/Tests/Module/ClassLoaderTest.php b/web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
similarity index 75%
rename from web/core/modules/system/src/Tests/Module/ClassLoaderTest.php
rename to web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
index bc2dfd5fc..779a288a7 100644
--- a/web/core/modules/system/src/Tests/Module/ClassLoaderTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\Module;
+namespace Drupal\Tests\system\Functional\Module;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests class loading for modules.
  *
  * @group Module
  */
-class ClassLoaderTest extends WebTestBase {
+class ClassLoaderTest extends BrowserTestBase {
 
   /**
    * The expected result from calling the module-provided class' method.
@@ -21,9 +21,9 @@ class ClassLoaderTest extends WebTestBase {
    *
    * @see \Drupal\module_autoload_test\SomeClass
    */
-  function testClassLoading() {
+  public function testClassLoading() {
     // Enable the module_test and module_autoload_test modules.
-    \Drupal::service('module_installer')->install(array('module_test', 'module_autoload_test'), FALSE);
+    \Drupal::service('module_installer')->install(['module_test', 'module_autoload_test'], FALSE);
     $this->resetAll();
     // Check twice to test an unprimed and primed system_list() cache.
     for ($i = 0; $i < 2; $i++) {
@@ -38,9 +38,9 @@ class ClassLoaderTest extends WebTestBase {
    *
    * @see \Drupal\module_autoload_test\SomeClass
    */
-  function testClassLoadingNotInstalledModules() {
+  public function testClassLoadingNotInstalledModules() {
     // Enable the module_test module.
-    \Drupal::service('module_installer')->install(array('module_test'), FALSE);
+    \Drupal::service('module_installer')->install(['module_test'], FALSE);
     $this->resetAll();
     // Check twice to test an unprimed and primed system_list() cache.
     for ($i = 0; $i < 2; $i++) {
@@ -55,12 +55,12 @@ class ClassLoaderTest extends WebTestBase {
    *
    * @see \Drupal\module_autoload_test\SomeClass
    */
-  function testClassLoadingDisabledModules() {
+  public function testClassLoadingDisabledModules() {
     // Enable the module_test and module_autoload_test modules.
-    \Drupal::service('module_installer')->install(array('module_test', 'module_autoload_test'), FALSE);
+    \Drupal::service('module_installer')->install(['module_test', 'module_autoload_test'], FALSE);
     $this->resetAll();
     // Ensure that module_autoload_test is disabled.
-    $this->container->get('module_installer')->uninstall(array('module_autoload_test'), FALSE);
+    $this->container->get('module_installer')->uninstall(['module_autoload_test'], FALSE);
     $this->resetAll();
     // Check twice to test an unprimed and primed system_list() cache.
     for ($i = 0; $i < 2; $i++) {
@@ -76,8 +76,8 @@ class ClassLoaderTest extends WebTestBase {
   public function testMultipleModules() {
     $this->drupalLogin($this->rootUser);
     $edit = [
-      "modules[Testing][module_install_class_loader_test1][enable]" => TRUE,
-      "modules[Testing][module_install_class_loader_test2][enable]" => TRUE,
+      "modules[module_install_class_loader_test1][enable]" => TRUE,
+      "modules[module_install_class_loader_test2][enable]" => TRUE,
     ];
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->rebuildContainer();
diff --git a/web/core/modules/system/src/Tests/Module/ExperimentalModuleTest.php b/web/core/modules/system/tests/src/Functional/Module/ExperimentalModuleTest.php
similarity index 87%
rename from web/core/modules/system/src/Tests/Module/ExperimentalModuleTest.php
rename to web/core/modules/system/tests/src/Functional/Module/ExperimentalModuleTest.php
index 7b1a376bd..177fc5ba1 100644
--- a/web/core/modules/system/src/Tests/Module/ExperimentalModuleTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/ExperimentalModuleTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\Module;
+namespace Drupal\Tests\system\Functional\Module;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the installation of modules.
  *
  * @group Module
  */
-class ExperimentalModuleTest extends WebTestBase {
+class ExperimentalModuleTest extends BrowserTestBase {
 
 
   /**
@@ -36,7 +36,7 @@ class ExperimentalModuleTest extends WebTestBase {
     // First, test installing a non-experimental module with no dependencies.
     // There should be no confirmation form and no experimental module warning.
     $edit = [];
-    $edit["modules[Testing][test_page_test][enable]"] = TRUE;
+    $edit["modules[test_page_test][enable]"] = TRUE;
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->assertText('Module Test page has been enabled.');
     $this->assertNoText('Experimental modules are provided for testing purposes only.');
@@ -48,7 +48,7 @@ class ExperimentalModuleTest extends WebTestBase {
     // There should be a confirmation form with an experimental warning, but no
     // list of dependencies.
     $edit = [];
-    $edit["modules[Core (Experimental)][experimental_module_test][enable]"] = TRUE;
+    $edit["modules[experimental_module_test][enable]"] = TRUE;
     $this->drupalPostForm('admin/modules', $edit, 'Install');
 
     // The module should not be enabled and there should be a warning and a
@@ -70,7 +70,7 @@ class ExperimentalModuleTest extends WebTestBase {
     // Test enabling a module that is not itself experimental, but that depends
     // on an experimental module.
     $edit = [];
-    $edit["modules[Testing][experimental_module_dependency_test][enable]"] = TRUE;
+    $edit["modules[experimental_module_dependency_test][enable]"] = TRUE;
     $this->drupalPostForm('admin/modules', $edit, 'Install');
 
     // The module should not be enabled and there should be a warning and a
@@ -98,8 +98,8 @@ class ExperimentalModuleTest extends WebTestBase {
     // still a warning about experimental modules, but no message about
     // dependencies, since the user specifically enabled the dependency.
     $edit = [];
-    $edit["modules[Core (Experimental)][experimental_module_test][enable]"] = TRUE;
-    $edit["modules[Testing][experimental_module_dependency_test][enable]"] = TRUE;
+    $edit["modules[experimental_module_test][enable]"] = TRUE;
+    $edit["modules[experimental_module_dependency_test][enable]"] = TRUE;
     $this->drupalPostForm('admin/modules', $edit, 'Install');
 
     // The module should not be enabled and there should be a warning and a
@@ -110,7 +110,7 @@ class ExperimentalModuleTest extends WebTestBase {
     $this->assertText('The following modules are experimental: Experimental Test');
 
     // Ensure the non-experimental module is not listed as experimental.
-    $this->assertNoText('The following modules are experimental: Experimental Test, Experimental Dependency Test');
+    $this->assertNoText('The following modules are experimental: Experimental Dependency Test, Experimental Test');
     $this->assertNoText('The following modules are experimental: Experimental Dependency Test');
 
     // There should be no message about enabling dependencies.
@@ -118,13 +118,13 @@ class ExperimentalModuleTest extends WebTestBase {
 
     // Enable the module and confirm that it worked.
     $this->drupalPostForm(NULL, [], 'Continue');
-    $this->assertText('2 modules have been enabled: Experimental Test, Experimental Dependency Test');
+    $this->assertText('2 modules have been enabled: Experimental Dependency Test, Experimental Test');
 
     // Try to enable an experimental module that can not be due to
     // hook_requirements().
     \Drupal::state()->set('experimental_module_requirements_test_requirements', TRUE);
     $edit = [];
-    $edit["modules[Core (Experimental)][experimental_module_requirements_test][enable]"] = TRUE;
+    $edit["modules[experimental_module_requirements_test][enable]"] = TRUE;
     $this->drupalPostForm('admin/modules', $edit, 'Install');
     $this->assertUrl('admin/modules', [], 'If the module can not be installed we are not taken to the confirm form.');
     $this->assertText('The Experimental Test Requirements module can not be installed.');
diff --git a/web/core/modules/system/src/Tests/Module/InstallTest.php b/web/core/modules/system/tests/src/Functional/Module/InstallTest.php
similarity index 83%
rename from web/core/modules/system/src/Tests/Module/InstallTest.php
rename to web/core/modules/system/tests/src/Functional/Module/InstallTest.php
index babdd76d7..ccbca6d31 100644
--- a/web/core/modules/system/src/Tests/Module/InstallTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/InstallTest.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Drupal\system\Tests\Module;
+namespace Drupal\Tests\system\Functional\Module;
 
 use Drupal\Core\Extension\ExtensionNameLengthException;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the installation of modules.
  *
  * @group Module
  */
-class InstallTest extends WebTestBase {
+class InstallTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('module_test');
+  public static $modules = ['module_test'];
 
   /**
    * Verify that drupal_get_schema() can be used during module installation.
@@ -36,7 +36,7 @@ class InstallTest extends WebTestBase {
    * be an array.
    */
   public function testEnableUserTwice() {
-    \Drupal::service('module_installer')->install(array('user'), FALSE);
+    \Drupal::service('module_installer')->install(['user'], FALSE);
     $this->assertIdentical($this->config('core.extension')->get('module.user'), 0);
   }
 
@@ -70,9 +70,9 @@ class InstallTest extends WebTestBase {
    */
   public function testModuleNameLength() {
     $module_name = 'invalid_module_name_over_the_maximum_allowed_character_length';
-    $message = format_string('Exception thrown when enabling module %name with a name length over the allowed maximum', array('%name' => $module_name));
+    $message = format_string('Exception thrown when enabling module %name with a name length over the allowed maximum', ['%name' => $module_name]);
     try {
-      $this->container->get('module_installer')->install(array($module_name));
+      $this->container->get('module_installer')->install([$module_name]);
       $this->fail($message);
     }
     catch (ExtensionNameLengthException $e) {
@@ -80,9 +80,9 @@ class InstallTest extends WebTestBase {
     }
 
     // Since for the UI, the submit callback uses FALSE, test that too.
-    $message = format_string('Exception thrown when enabling as if via the UI the module %name with a name length over the allowed maximum', array('%name' => $module_name));
+    $message = format_string('Exception thrown when enabling as if via the UI the module %name with a name length over the allowed maximum', ['%name' => $module_name]);
     try {
-      $this->container->get('module_installer')->install(array($module_name), FALSE);
+      $this->container->get('module_installer')->install([$module_name], FALSE);
       $this->fail($message);
     }
     catch (ExtensionNameLengthException $e) {
diff --git a/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php b/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
new file mode 100644
index 000000000..392f2875e
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
@@ -0,0 +1,194 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Module;
+
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Logger\RfcLogLevel;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Helper class for module test cases.
+ */
+abstract class ModuleTestBase extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system_test'];
+
+  protected $adminUser;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer modules']);
+    $this->drupalLogin($this->adminUser);
+  }
+
+  /**
+   * Assert there are tables that begin with the specified base table name.
+   *
+   * @param $base_table
+   *   Beginning of table name to look for.
+   * @param $count
+   *   (optional) Whether or not to assert that there are tables that match the
+   *   specified base table. Defaults to TRUE.
+   */
+  public function assertTableCount($base_table, $count = TRUE) {
+    $tables = db_find_tables(Database::getConnection()->prefixTables('{' . $base_table . '}') . '%');
+
+    if ($count) {
+      return $this->assertTrue($tables, format_string('Tables matching "@base_table" found.', ['@base_table' => $base_table]));
+    }
+    return $this->assertFalse($tables, format_string('Tables matching "@base_table" not found.', ['@base_table' => $base_table]));
+  }
+
+  /**
+   * Assert that all tables defined in a module's hook_schema() exist.
+   *
+   * @param $module
+   *   The name of the module.
+   */
+  public function assertModuleTablesExist($module) {
+    $tables = array_keys(drupal_get_module_schema($module));
+    $tables_exist = TRUE;
+    foreach ($tables as $table) {
+      if (!db_table_exists($table)) {
+        $tables_exist = FALSE;
+      }
+    }
+    return $this->assertTrue($tables_exist, format_string('All database tables defined by the @module module exist.', ['@module' => $module]));
+  }
+
+  /**
+   * Assert that none of the tables defined in a module's hook_schema() exist.
+   *
+   * @param $module
+   *   The name of the module.
+   */
+  public function assertModuleTablesDoNotExist($module) {
+    $tables = array_keys(drupal_get_module_schema($module));
+    $tables_exist = FALSE;
+    foreach ($tables as $table) {
+      if (db_table_exists($table)) {
+        $tables_exist = TRUE;
+      }
+    }
+    return $this->assertFalse($tables_exist, format_string('None of the database tables defined by the @module module exist.', ['@module' => $module]));
+  }
+
+  /**
+   * Asserts that the default configuration of a module has been installed.
+   *
+   * @param string $module
+   *   The name of the module.
+   *
+   * @return bool
+   *   TRUE if configuration has been installed, FALSE otherwise.
+   */
+  public function assertModuleConfig($module) {
+    $module_config_dir = drupal_get_path('module', $module) . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY;
+    if (!is_dir($module_config_dir)) {
+      return;
+    }
+    $module_file_storage = new FileStorage($module_config_dir);
+
+    // Verify that the module's default config directory is not empty and
+    // contains default configuration files (instead of something else).
+    $all_names = $module_file_storage->listAll();
+    if (empty($all_names)) {
+      // Module has an empty config directory. For example it might contain a
+      // schema directory.
+      return;
+    }
+    $this->assertTrue($all_names);
+
+    // Look up each default configuration object name in the active
+    // configuration, and if it exists, remove it from the stack.
+    // Only default config that belongs to $module is guaranteed to exist; any
+    // other default config depends on whether other modules are enabled. Thus,
+    // list all default config once more, but filtered by $module.
+    $names = $module_file_storage->listAll($module . '.');
+    foreach ($names as $key => $name) {
+      if ($this->config($name)->get()) {
+        unset($names[$key]);
+      }
+    }
+    // Verify that all configuration has been installed (which means that $names
+    // is empty).
+    return $this->assertFalse($names, format_string('All default configuration of @module module found.', ['@module' => $module]));
+  }
+
+  /**
+   * Asserts that no configuration exists for a given module.
+   *
+   * @param string $module
+   *   The name of the module.
+   *
+   * @return bool
+   *   TRUE if no configuration was found, FALSE otherwise.
+   */
+  public function assertNoModuleConfig($module) {
+    $names = \Drupal::configFactory()->listAll($module . '.');
+    return $this->assertFalse($names, format_string('No configuration found for @module module.', ['@module' => $module]));
+  }
+
+  /**
+   * Assert the list of modules are enabled or disabled.
+   *
+   * @param $modules
+   *   Module list to check.
+   * @param $enabled
+   *   Expected module state.
+   */
+  public function assertModules(array $modules, $enabled) {
+    $this->rebuildContainer();
+    foreach ($modules as $module) {
+      if ($enabled) {
+        $message = 'Module "@module" is enabled.';
+      }
+      else {
+        $message = 'Module "@module" is not enabled.';
+      }
+      $this->assertEqual($this->container->get('module_handler')->moduleExists($module), $enabled, format_string($message, ['@module' => $module]));
+    }
+  }
+
+  /**
+   * Verify a log entry was entered for a module's status change.
+   *
+   * @param $type
+   *   The category to which this message belongs.
+   * @param $message
+   *   The message to store in the log. Keep $message translatable
+   *   by not concatenating dynamic values into it! Variables in the
+   *   message should be added by using placeholder strings alongside
+   *   the variables argument to declare the value of the placeholders.
+   *   See t() for documentation on how $message and $variables interact.
+   * @param $variables
+   *   Array of variables to replace in the message on display or
+   *   NULL if message is already translated or not possible to
+   *   translate.
+   * @param $severity
+   *   The severity of the message, as per RFC 3164.
+   * @param $link
+   *   A link to associate with the message.
+   */
+  public function assertLogMessage($type, $message, $variables = [], $severity = RfcLogLevel::NOTICE, $link = '') {
+    $count = db_select('watchdog', 'w')
+      ->condition('type', $type)
+      ->condition('message', $message)
+      ->condition('variables', serialize($variables))
+      ->condition('severity', $severity)
+      ->condition('link', $link)
+      ->countQuery()
+      ->execute()
+      ->fetchField();
+    $this->assertTrue($count > 0, format_string('watchdog table contains @count rows for @message', ['@count' => $count, '@message' => format_string($message, $variables)]));
+  }
+
+}
diff --git a/web/core/modules/system/src/Tests/Module/UninstallTest.php b/web/core/modules/system/tests/src/Functional/Module/UninstallTest.php
similarity index 88%
rename from web/core/modules/system/src/Tests/Module/UninstallTest.php
rename to web/core/modules/system/tests/src/Functional/Module/UninstallTest.php
index 20e191dfd..2b17b8fcf 100644
--- a/web/core/modules/system/src/Tests/Module/UninstallTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/UninstallTest.php
@@ -1,35 +1,35 @@
 <?php
 
-namespace Drupal\system\Tests\Module;
+namespace Drupal\Tests\system\Functional\Module;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\EntityMalformedException;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the uninstallation of modules.
  *
  * @group Module
  */
-class UninstallTest extends WebTestBase {
+class UninstallTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('module_test', 'user', 'views', 'node');
+  public static $modules = ['module_test', 'user', 'views', 'node'];
 
   /**
    * Tests the hook_modules_uninstalled() of the user module.
    */
-  function testUserPermsUninstalled() {
+  public function testUserPermsUninstalled() {
     // Uninstalls the module_test module, so hook_modules_uninstalled()
     // is executed.
-    $this->container->get('module_installer')->uninstall(array('module_test'));
+    $this->container->get('module_installer')->uninstall(['module_test']);
 
     // Are the perms defined by module_test removed?
     $this->assertFalse(user_roles(FALSE, 'module_test perm'), 'Permissions were all removed.');
@@ -38,8 +38,8 @@ class UninstallTest extends WebTestBase {
   /**
    * Tests the Uninstall page and Uninstall confirmation page.
    */
-  function testUninstallPage() {
-    $account = $this->drupalCreateUser(array('administer modules'));
+  public function testUninstallPage() {
+    $account = $this->drupalCreateUser(['administer modules']);
     $this->drupalLogin($account);
 
     // Create a node type.
@@ -67,7 +67,7 @@ class UninstallTest extends WebTestBase {
     $node->delete();
 
     // Uninstall module_test.
-    $edit = array();
+    $edit = [];
     $edit['uninstall[module_test]'] = TRUE;
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
     $this->assertNoText(\Drupal::translation()->translate('Configuration deletions'), 'No configuration deletions listed on the module install confirmation page.');
@@ -78,14 +78,14 @@ class UninstallTest extends WebTestBase {
 
     // Uninstall node testing that the configuration that will be deleted is
     // listed.
-    $node_dependencies = \Drupal::service('config.manager')->findConfigEntityDependentsAsEntities('module', array('node'));
-    $edit = array();
+    $node_dependencies = \Drupal::service('config.manager')->findConfigEntityDependentsAsEntities('module', ['node']);
+    $edit = [];
     $edit['uninstall[node]'] = TRUE;
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
     $this->assertText(\Drupal::translation()->translate('Configuration deletions'), 'Configuration deletions listed on the module install confirmation page.');
     $this->assertNoText(\Drupal::translation()->translate('Configuration updates'), 'No configuration updates listed on the module install confirmation page.');
 
-    $entity_types = array();
+    $entity_types = [];
     foreach ($node_dependencies as $entity) {
       $label = $entity->label() ?: $entity->id();
       $this->assertText($label);
@@ -103,7 +103,7 @@ class UninstallTest extends WebTestBase {
     // cleared during the uninstall.
     \Drupal::cache()->set('uninstall_test', 'test_uninstall_page', Cache::PERMANENT);
     $cached = \Drupal::cache()->get('uninstall_test');
-    $this->assertEqual($cached->data, 'test_uninstall_page', SafeMarkup::format('Cache entry found: @bin', array('@bin' => $cached->data)));
+    $this->assertEqual($cached->data, 'test_uninstall_page', SafeMarkup::format('Cache entry found: @bin', ['@bin' => $cached->data]));
 
     $this->drupalPostForm(NULL, NULL, t('Uninstall'));
     $this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
@@ -123,7 +123,7 @@ class UninstallTest extends WebTestBase {
     $this->assertTitle(t('Uninstall') . ' | Drupal');
 
     // Make sure the correct error is shown when no modules are selected.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
     $this->assertText(t('No modules selected.'), 'No module is selected to uninstall');
   }
@@ -132,12 +132,12 @@ class UninstallTest extends WebTestBase {
    * Tests that a module which fails to install can still be uninstalled.
    */
   public function testFailedInstallStatus() {
-    $account = $this->drupalCreateUser(array('administer modules'));
+    $account = $this->drupalCreateUser(['administer modules']);
     $this->drupalLogin($account);
 
     $message = 'Exception thrown when installing module_installer_config_test with an invalid configuration file.';
     try {
-      $this->container->get('module_installer')->install(array('module_installer_config_test'));
+      $this->container->get('module_installer')->install(['module_installer_config_test']);
       $this->fail($message);
     }
     catch (EntityMalformedException $e) {
diff --git a/web/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php b/web/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
similarity index 80%
rename from web/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php
rename to web/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
index b881386c8..faafe8460 100644
--- a/web/core/modules/system/src/Tests/ParamConverter/UpcastingTest.php
+++ b/web/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\system\Tests\ParamConverter;
+namespace Drupal\Tests\system\Functional\ParamConverter;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
 
 /**
@@ -10,9 +10,9 @@ use Drupal\language\Entity\ConfigurableLanguage;
  *
  * @group ParamConverter
  */
-class UpcastingTest extends WebTestBase {
+class UpcastingTest extends BrowserTestBase {
 
-  public static $modules = array('paramconverter_test', 'node', 'language');
+  public static $modules = ['paramconverter_test', 'node', 'language'];
 
   /**
    * Confirms that all parameters are converted as expected.
@@ -25,8 +25,8 @@ class UpcastingTest extends WebTestBase {
    * happening.
    */
   public function testUpcasting() {
-    $node = $this->drupalCreateNode(array('title' => $this->randomMachineName(8)));
-    $user = $this->drupalCreateUser(array('access content'));
+    $node = $this->drupalCreateNode(['title' => $this->randomMachineName(8)]);
+    $user = $this->drupalCreateUser(['access content']);
     $foo = 'bar';
 
     // paramconverter_test/test_user_node_foo/{user}/{node}/{foo}
@@ -48,8 +48,8 @@ class UpcastingTest extends WebTestBase {
    * Confirms we can upcast to controller arguments of the same type.
    */
   public function testSameTypes() {
-    $node = $this->drupalCreateNode(array('title' => $this->randomMachineName(8)));
-    $parent = $this->drupalCreateNode(array('title' => $this->randomMachineName(8)));
+    $node = $this->drupalCreateNode(['title' => $this->randomMachineName(8)]);
+    $parent = $this->drupalCreateNode(['title' => $this->randomMachineName(8)]);
     // paramconverter_test/node/{node}/set/parent/{parent}
     // options.parameters.parent.type = entity:node
     $this->drupalGet("paramconverter_test/node/" . $node->id() . "/set/parent/" . $parent->id());
@@ -63,19 +63,19 @@ class UpcastingTest extends WebTestBase {
     $language = ConfigurableLanguage::createFromLangcode('de');
     $language->save();
     \Drupal::configFactory()->getEditable('language.negotiation')
-      ->set('url.prefixes', array('de' => 'de'))
+      ->set('url.prefixes', ['de' => 'de'])
       ->save();
 
     // The container must be recreated after adding a new language.
     $this->rebuildContainer();
 
-    $node = $this->drupalCreateNode(array('title' => 'English label'));
+    $node = $this->drupalCreateNode(['title' => 'English label']);
     $translation = $node->addTranslation('de');
     $translation->setTitle('Deutscher Titel')->save();
 
     $this->drupalGet("/paramconverter_test/node/" . $node->id() . "/test_language");
     $this->assertRaw("English label");
-    $this->drupalGet("paramconverter_test/node/" . $node->id() . "/test_language", array('language' => $language));
+    $this->drupalGet("paramconverter_test/node/" . $node->id() . "/test_language", ['language' => $language]);
     $this->assertRaw("Deutscher Titel");
   }
 
diff --git a/web/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php b/web/core/modules/system/tests/src/Functional/Path/UrlAlterFunctionalTest.php
similarity index 82%
rename from web/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
rename to web/core/modules/system/tests/src/Functional/Path/UrlAlterFunctionalTest.php
index 743b74bde..271774169 100644
--- a/web/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
+++ b/web/core/modules/system/tests/src/Functional/Path/UrlAlterFunctionalTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Drupal\system\Tests\Path;
+namespace Drupal\Tests\system\Functional\Path;
 
 use Drupal\Core\Database\Database;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Core\Url;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\taxonomy\Entity\Term;
 
 /**
@@ -11,25 +12,25 @@ use Drupal\taxonomy\Entity\Term;
  *
  * @group Path
  */
-class UrlAlterFunctionalTest extends WebTestBase {
+class UrlAlterFunctionalTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('path', 'forum', 'url_alter_test');
+  public static $modules = ['path', 'forum', 'url_alter_test'];
 
   /**
    * Test that URL altering works and that it occurs in the correct order.
    */
-  function testUrlAlter() {
+  public function testUrlAlter() {
     // Ensure that the url_alias table exists after Drupal installation.
     $this->assertTrue(Database::getConnection()->schema()->tableExists('url_alias'), 'The url_alias table exists after Drupal installation.');
 
     // User names can have quotes and plus signs so we should ensure that URL
     // altering works with this.
-    $account = $this->drupalCreateUser(array('administer url aliases'), "a'foo+bar");
+    $account = $this->drupalCreateUser(['administer url aliases'], "a'foo+bar");
     $this->drupalLogin($account);
 
     $uid = $account->id();
@@ -41,14 +42,14 @@ class UrlAlterFunctionalTest extends WebTestBase {
     $this->assertUrlOutboundAlter("/user/$uid", "/user/$name");
 
     // Test that a path always uses its alias.
-    $path = array('source' => "/user/$uid/test1", 'alias' => '/alias/test1');
+    $path = ['source' => "/user/$uid/test1", 'alias' => '/alias/test1'];
     $this->container->get('path.alias_storage')->save($path['source'], $path['alias']);
     $this->rebuildContainer();
     $this->assertUrlInboundAlter('/alias/test1', "/user/$uid/test1");
     $this->assertUrlOutboundAlter("/user/$uid/test1", '/alias/test1');
 
     // Test adding an alias via the UI.
-    $edit = array('source' => "/user/$uid/edit", 'alias' => '/alias/test2');
+    $edit = ['source' => "/user/$uid/edit", 'alias' => '/alias/test2'];
     $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
     $this->assertText(t('The alias has been saved.'));
     $this->drupalGet('alias/test2');
@@ -74,6 +75,10 @@ class UrlAlterFunctionalTest extends WebTestBase {
     $this->drupalGet("community/" . $term->id());
     $this->assertText($term_name, 'The community/{tid} path gets resolved correctly');
     $this->assertUrlOutboundAlter("/forum/" . $term->id(), "/community/" . $term->id());
+
+    // Test outbound query string altering.
+    $url = Url::fromRoute('user.login');
+    $this->assertIdentical(\Drupal::request()->getBaseUrl() . '/user/login?foo=bar', $url->toString());
   }
 
   /**
@@ -90,7 +95,7 @@ class UrlAlterFunctionalTest extends WebTestBase {
   protected function assertUrlOutboundAlter($original, $final) {
     // Test outbound altering.
     $result = $this->container->get('path_processor_manager')->processOutbound($original);
-    return $this->assertIdentical($result, $final, format_string('Altered outbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
+    return $this->assertIdentical($result, $final, format_string('Altered outbound URL %original, expected %final, and got %result.', ['%original' => $original, '%final' => $final, '%result' => $result]));
   }
 
   /**
@@ -107,7 +112,7 @@ class UrlAlterFunctionalTest extends WebTestBase {
   protected function assertUrlInboundAlter($original, $final) {
     // Test inbound altering.
     $result = $this->container->get('path.alias_manager')->getPathByAlias($original);
-    return $this->assertIdentical($result, $final, format_string('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
+    return $this->assertIdentical($result, $final, format_string('Altered inbound URL %original, expected %final, and got %result.', ['%original' => $original, '%final' => $final, '%result' => $result]));
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Render/AjaxPageStateTest.php b/web/core/modules/system/tests/src/Functional/Render/AjaxPageStateTest.php
similarity index 92%
rename from web/core/modules/system/src/Tests/Render/AjaxPageStateTest.php
rename to web/core/modules/system/tests/src/Functional/Render/AjaxPageStateTest.php
index 19e623775..6f5dc7da6 100644
--- a/web/core/modules/system/src/Tests/Render/AjaxPageStateTest.php
+++ b/web/core/modules/system/tests/src/Functional/Render/AjaxPageStateTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\Render;
+namespace Drupal\Tests\system\Functional\Render;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Performs tests for the effects of the ajax_page_state query parameter.
  *
  * @group Render
  */
-class AjaxPageStateTest extends WebTestBase {
+class AjaxPageStateTest extends BrowserTestBase {
 
   /**
    * Modules to install.
@@ -43,7 +43,7 @@ class AjaxPageStateTest extends WebTestBase {
    * and available in code as scripts. Do this as the base test.
    */
   public function testLibrariesAvailable() {
-    $this->drupalGet('node', array());
+    $this->drupalGet('node', []);
     $this->assertRaw(
       '/core/assets/vendor/html5shiv/html5shiv.min.js',
       'The html5shiv library from core should be loaded.'
@@ -63,14 +63,14 @@ class AjaxPageStateTest extends WebTestBase {
    */
   public function testHtml5ShivIsNotLoaded() {
     $this->drupalGet('node',
-      array(
+      [
         "query" =>
-          array(
-            'ajax_page_state' => array(
+          [
+            'ajax_page_state' => [
               'libraries' => 'core/html5shiv'
-            )
-          )
-      )
+            ]
+          ]
+      ]
     );
     $this->assertNoRaw(
       '/core/assets/vendor/html5shiv/html5shiv.min.js',
diff --git a/web/core/modules/system/src/Tests/Render/DisplayVariantTest.php b/web/core/modules/system/tests/src/Functional/Render/DisplayVariantTest.php
similarity index 70%
rename from web/core/modules/system/src/Tests/Render/DisplayVariantTest.php
rename to web/core/modules/system/tests/src/Functional/Render/DisplayVariantTest.php
index 09f54d9a5..2f5415ba7 100644
--- a/web/core/modules/system/src/Tests/Render/DisplayVariantTest.php
+++ b/web/core/modules/system/tests/src/Functional/Render/DisplayVariantTest.php
@@ -1,27 +1,27 @@
 <?php
 
-namespace Drupal\system\Tests\Render;
+namespace Drupal\Tests\system\Functional\Render;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests selecting a display variant.
  *
  * @group Render
  */
-class DisplayVariantTest extends WebTestBase {
+class DisplayVariantTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('display_variant_test');
+  public static $modules = ['display_variant_test'];
 
   /**
    * Tests selecting the variant and passing configuration.
    */
-  function testPageDisplayVariantSelectionEvent() {
+  public function testPageDisplayVariantSelectionEvent() {
     // Tests that our display variant was selected, and that its configuration
     // was passed correctly. If the configuration wasn't passed, we'd get an
     // error page here.
diff --git a/web/core/modules/system/src/Tests/Routing/MockMatcher.php b/web/core/modules/system/tests/src/Functional/Routing/MockMatcher.php
similarity index 93%
rename from web/core/modules/system/src/Tests/Routing/MockMatcher.php
rename to web/core/modules/system/tests/src/Functional/Routing/MockMatcher.php
index 924acd13f..eee6b1395 100644
--- a/web/core/modules/system/src/Tests/Routing/MockMatcher.php
+++ b/web/core/modules/system/tests/src/Functional/Routing/MockMatcher.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\Routing;
+namespace Drupal\Tests\system\Functional\Routing;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
diff --git a/web/core/modules/system/src/Tests/Routing/RouterPermissionTest.php b/web/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php
similarity index 77%
rename from web/core/modules/system/src/Tests/Routing/RouterPermissionTest.php
rename to web/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php
index 2fb009918..62a511f2e 100644
--- a/web/core/modules/system/src/Tests/Routing/RouterPermissionTest.php
+++ b/web/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\system\Tests\Routing;
+namespace Drupal\Tests\system\Functional\Routing;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Function Tests for the routing permission system.
  *
  * @group Routing
  */
-class RouterPermissionTest extends WebTestBase {
+class RouterPermissionTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('router_test');
+  public static $modules = ['router_test'];
 
   /**
    * Tests permission requirements on routes.
@@ -29,7 +29,7 @@ class RouterPermissionTest extends WebTestBase {
     $this->drupalGet('router_test/test8');
     $this->assertResponse(403, 'Access denied by default if no access specified');
 
-    $user = $this->drupalCreateUser(array('access test7'));
+    $user = $this->drupalCreateUser(['access test7']);
     $this->drupalLogin($user);
     $this->drupalGet('router_test/test7');
     $this->assertResponse(200);
diff --git a/web/core/modules/system/src/Tests/ServiceProvider/ServiceProviderWebTest.php b/web/core/modules/system/tests/src/Functional/ServiceProvider/ServiceProviderWebTest.php
similarity index 81%
rename from web/core/modules/system/src/Tests/ServiceProvider/ServiceProviderWebTest.php
rename to web/core/modules/system/tests/src/Functional/ServiceProvider/ServiceProviderWebTest.php
index 5d2505aed..73d691008 100644
--- a/web/core/modules/system/src/Tests/ServiceProvider/ServiceProviderWebTest.php
+++ b/web/core/modules/system/tests/src/Functional/ServiceProvider/ServiceProviderWebTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\system\Tests\ServiceProvider;
+namespace Drupal\Tests\system\Functional\ServiceProvider;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests service provider registration to the DIC.
  *
  * @group ServiceProvider
  */
-class ServiceProviderWebTest extends WebTestBase {
+class ServiceProviderWebTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('file', 'service_provider_test');
+  public static $modules = ['file', 'service_provider_test'];
 
   /**
    * Tests that module service providers get registered to the DIC.
diff --git a/web/core/modules/system/src/Tests/System/AdminMetaTagTest.php b/web/core/modules/system/tests/src/Functional/System/AdminMetaTagTest.php
similarity index 78%
rename from web/core/modules/system/src/Tests/System/AdminMetaTagTest.php
rename to web/core/modules/system/tests/src/Functional/System/AdminMetaTagTest.php
index ea92bd934..c58d1ec91 100644
--- a/web/core/modules/system/src/Tests/System/AdminMetaTagTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/AdminMetaTagTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Confirm that the fingerprinting meta tag appears as expected.
  *
  * @group system
  */
-class AdminMetaTagTest extends WebTestBase {
+class AdminMetaTagTest extends BrowserTestBase {
   /**
    * Verify that the meta tag HTML is generated correctly.
    */
diff --git a/web/core/modules/system/src/Tests/System/DateFormatsLockedTest.php b/web/core/modules/system/tests/src/Functional/System/DateFormatsLockedTest.php
similarity index 90%
rename from web/core/modules/system/src/Tests/System/DateFormatsLockedTest.php
rename to web/core/modules/system/tests/src/Functional/System/DateFormatsLockedTest.php
index c8a0a67cc..faac2b762 100644
--- a/web/core/modules/system/src/Tests/System/DateFormatsLockedTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/DateFormatsLockedTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the locked functionality of date formats.
  *
  * @group system
  */
-class DateFormatsLockedTest extends WebTestBase {
+class DateFormatsLockedTest extends BrowserTestBase {
 
   /**
    * Tests attempts at listing, editing, and deleting locked date formats.
diff --git a/web/core/modules/system/src/Tests/System/DateFormatsMachineNameTest.php b/web/core/modules/system/tests/src/Functional/System/DateFormatsMachineNameTest.php
similarity index 90%
rename from web/core/modules/system/src/Tests/System/DateFormatsMachineNameTest.php
rename to web/core/modules/system/tests/src/Functional/System/DateFormatsMachineNameTest.php
index a7c304a03..7ff8af1fa 100644
--- a/web/core/modules/system/src/Tests/System/DateFormatsMachineNameTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/DateFormatsMachineNameTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests validity of date format machine names.
  *
  * @group system
  */
-class DateFormatsMachineNameTest extends WebTestBase {
+class DateFormatsMachineNameTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
@@ -18,7 +18,7 @@ class DateFormatsMachineNameTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
     // Create a new administrator user for the test.
-    $admin = $this->drupalCreateUser(array('administer site configuration'));
+    $admin = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($admin);
   }
 
@@ -28,49 +28,49 @@ class DateFormatsMachineNameTest extends WebTestBase {
   public function testDateFormatsMachineNameAllowedValues() {
     // Try to create a date format with a not allowed character to test the date
     // format specific machine name replace pattern.
-    $edit = array(
+    $edit = [
       'label' => 'Something Not Allowed',
       'id' => 'something.bad',
       'date_format_pattern' => 'Y-m-d',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
     $this->assertText(t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores. Additionally, it can not be the reserved word "custom".'), 'It is not possible to create a date format with the machine name that has any character other than lowercase letters, digits or underscore.');
 
     // Try to create a date format with the reserved machine name "custom".
-    $edit = array(
+    $edit = [
       'label' => 'Custom',
       'id' => 'custom',
       'date_format_pattern' => 'Y-m-d',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
     $this->assertText(t('The machine-readable name must be unique, and can only contain lowercase letters, numbers, and underscores. Additionally, it can not be the reserved word "custom".'), 'It is not possible to create a date format with the machine name "custom".');
 
     // Try to create a date format with a machine name, "fallback", that
     // already exists.
-    $edit = array(
+    $edit = [
       'label' => 'Fallback',
       'id' => 'fallback',
       'date_format_pattern' => 'j/m/Y',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
     $this->assertText(t('The machine-readable name is already in use. It must be unique.'), 'It is not possible to create a date format with the machine name "fallback". It is a built-in format that already exists.');
 
     // Create a date format with a machine name distinct from the previous two.
     $id = Unicode::strtolower($this->randomMachineName(16));
-    $edit = array(
+    $edit = [
       'label' => $this->randomMachineName(16),
       'id' => $id,
       'date_format_pattern' => 'd/m/Y',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
     $this->assertText(t('Custom date format added.'), 'It is possible to create a date format with a new machine name.');
 
     // Try to create a date format with same machine name as the previous one.
-    $edit = array(
+    $edit = [
       'label' => $this->randomMachineName(16),
       'id' => $id,
       'date_format_pattern' => 'd-m-Y',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
     $this->assertText(t('The machine-readable name is already in use. It must be unique.'), 'It is not possible to create a new date format with an existing machine name.');
   }
diff --git a/web/core/modules/system/src/Tests/System/DateTimeTest.php b/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
similarity index 86%
rename from web/core/modules/system/src/Tests/System/DateTimeTest.php
rename to web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
index 9ca050f40..3d35f96e2 100644
--- a/web/core/modules/system/src/Tests/System/DateTimeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
 use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Configure date and time settings. Test date formatting and time zone
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group system
  */
-class DateTimeTest extends WebTestBase {
+class DateTimeTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -25,21 +25,21 @@ class DateTimeTest extends WebTestBase {
     parent::setUp();
 
     // Create admin user and log in admin user.
-    $this->drupalLogin ($this->drupalCreateUser(array(
+    $this->drupalLogin ($this->drupalCreateUser([
       'administer site configuration',
       'administer content types',
       'administer nodes',
       'administer node fields',
       'administer node form display',
       'administer node display',
-    )));
+    ]));
     $this->drupalPlaceBlock('local_actions_block');
   }
 
   /**
    * Test time zones and DST handling.
    */
-  function testTimeZoneHandling() {
+  public function testTimeZoneHandling() {
     // Setup date/time settings for Honolulu time.
     $config = $this->config('system.date')
       ->set('timezone.default', 'Pacific/Honolulu')
@@ -52,9 +52,9 @@ class DateTimeTest extends WebTestBase {
     // Create some nodes with different authored-on dates.
     $date1 = '2007-01-31 21:00:00 -1000';
     $date2 = '2007-07-31 21:00:00 -1000';
-    $this->drupalCreateContentType(array('type' => 'article'));
-    $node1 = $this->drupalCreateNode(array('created' => strtotime($date1), 'type' => 'article'));
-    $node2 = $this->drupalCreateNode(array('created' => strtotime($date2), 'type' => 'article'));
+    $this->drupalCreateContentType(['type' => 'article']);
+    $node1 = $this->drupalCreateNode(['created' => strtotime($date1), 'type' => 'article']);
+    $node2 = $this->drupalCreateNode(['created' => strtotime($date2), 'type' => 'article']);
 
     // Confirm date format and time zone.
     $this->drupalGet('node/' . $node1->id());
@@ -64,7 +64,7 @@ class DateTimeTest extends WebTestBase {
 
     // Set time zone to Los Angeles time.
     $config->set('timezone.default', 'America/Los_Angeles')->save();
-    \Drupal::entityManager()->getViewBuilder('node')->resetCache(array($node1, $node2));
+    \Drupal::entityManager()->getViewBuilder('node')->resetCache([$node1, $node2]);
 
     // Confirm date format and time zone.
     $this->drupalGet('node/' . $node1->id());
@@ -76,7 +76,7 @@ class DateTimeTest extends WebTestBase {
   /**
    * Test date format configuration.
    */
-  function testDateFormatConfiguration() {
+  public function testDateFormatConfiguration() {
     // Confirm 'no custom date formats available' message appears.
     $this->drupalGet('admin/config/regional/date-time');
 
@@ -85,11 +85,11 @@ class DateTimeTest extends WebTestBase {
     $date_format_id = strtolower($this->randomMachineName(8));
     $name = ucwords($date_format_id);
     $date_format = 'd.m.Y - H:i';
-    $edit = array(
+    $edit = [
       'id' => $date_format_id,
       'label' => $name,
       'date_format_pattern' => $date_format,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
     $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
     $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.');
@@ -100,24 +100,24 @@ class DateTimeTest extends WebTestBase {
     $this->drupalGet('admin/config/regional/date-time');
     $this->clickLink(t('Edit'));
     $this->drupalPostForm(NULL, NULL, t('Save format'));
-    $this->assertUrl('admin/config/regional/date-time', array('absolute' => TRUE), 'Correct page redirection.');
+    $this->assertUrl('admin/config/regional/date-time', ['absolute' => TRUE], 'Correct page redirection.');
     $this->assertText(t('Custom date format updated.'), 'Custom date format successfully updated.');
 
     // Edit custom date format.
     $this->drupalGet('admin/config/regional/date-time');
     $this->clickLink(t('Edit'));
-    $edit = array(
+    $edit = [
       'date_format_pattern' => 'Y m',
-    );
+    ];
     $this->drupalPostForm($this->getUrl(), $edit, t('Save format'));
     $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
     $this->assertText(t('Custom date format updated.'), 'Custom date format successfully updated.');
 
     // Delete custom date format.
     $this->clickLink(t('Delete'));
-    $this->drupalPostForm('admin/config/regional/date-time/formats/manage/' . $date_format_id . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/config/regional/date-time/formats/manage/' . $date_format_id . '/delete', [], t('Delete'));
     $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
-    $this->assertRaw(t('The date format %format has been deleted.', array('%format' => $name)), 'Custom date format removed.');
+    $this->assertRaw(t('The date format %format has been deleted.', ['%format' => $name]), 'Custom date format removed.');
 
     // Make sure the date does not exist in config.
     $date_format = DateFormat::load($date_format_id);
@@ -127,22 +127,22 @@ class DateTimeTest extends WebTestBase {
     $date_format_id = strtolower($this->randomMachineName(8));
     $name = ucwords($date_format_id);
     $date_format = 'Y';
-    $edit = array(
+    $edit = [
       'id' => $date_format_id,
       'label' => $name,
       'date_format_pattern' => $date_format,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
     $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
     $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.');
     $this->assertText($name, 'Custom date format appears in the date format list.');
     $this->assertText(t('Delete'), 'Delete link for custom date format appears.');
 
-    $date_format = DateFormat::create(array(
+    $date_format = DateFormat::create([
       'id' => 'xss_short',
       'label' => 'XSS format',
       'pattern' => '\<\s\c\r\i\p\t\>\a\l\e\r\t\(\'\X\S\S\'\)\;\<\/\s\c\r\i\p\t\>',
-      ));
+      ]);
     $date_format->save();
 
     $this->drupalGet(Url::fromRoute('entity.date_format.collection'));
@@ -152,11 +152,11 @@ class DateTimeTest extends WebTestBase {
     $date_format_id = strtolower($this->randomMachineName(8));
     $name = ucwords($date_format_id);
     $date_format = '& \<\e\m\>Y\<\/\e\m\>';
-    $edit = array(
+    $edit = [
       'id' => $date_format_id,
       'label' => $name,
       'date_format_pattern' => $date_format,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
     $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
     $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.');
@@ -167,52 +167,53 @@ class DateTimeTest extends WebTestBase {
   /**
    * Test handling case with invalid data in selectors (like February, 31st).
    */
-  function testEnteringDateTimeViaSelectors() {
+  public function testEnteringDateTimeViaSelectors() {
 
-    $this->drupalCreateContentType(array('type' => 'page_with_date', 'name' => 'Page with date'));
+    $this->drupalCreateContentType(['type' => 'page_with_date', 'name' => 'Page with date']);
 
     $this->drupalGet('admin/structure/types/manage/page_with_date');
     $this->assertResponse(200, 'Content type created.');
 
     $this->drupalGet('admin/structure/types/manage/page_with_date/fields/add-field');
-    $edit = array(
+    $edit = [
       'new_storage_type' => 'datetime',
       'label' => 'dt',
       'field_name' => 'dt',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/page_with_date/fields/add-field', $edit, t('Save and continue'));
     $this->assertText(t('These settings apply to the'), 'New datetime field created, now configuring');
 
     $this->drupalGet('admin/structure/types/manage/page_with_date/fields/node.page_with_date.field_dt/storage');
-    $edit = array(
+    $edit = [
       'settings[datetime_type]' => 'datetime',
       'cardinality' => 'number',
       'cardinality_number' => '1',
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/page_with_date/fields/node.page_with_date.field_dt/storage', $edit, t('Save field settings'));
 
     $this->drupalGet('admin/structure/types/manage/page_with_date/fields');
     $this->assertText('field_dt', 'New field is in place');
 
     $this->drupalGet('admin/structure/types/manage/page_with_date/form-display');
-    $edit = array(
+    $edit = [
       'fields[field_dt][type]' => 'datetime_datelist',
-    );
+      'fields[field_dt][region]' => 'content',
+    ];
     $this->drupalPostForm('admin/structure/types/manage/page_with_date/form-display', $edit, t('Save'));
     $this->drupalLogout();
 
     // Now log in as a regular editor.
-    $this->drupalLogin($this->drupalCreateUser(array('create page_with_date content')));
+    $this->drupalLogin($this->drupalCreateUser(['create page_with_date content']));
 
     $this->drupalGet('node/add/page_with_date');
-    $edit = array(
+    $edit = [
       'title[0][value]' => 'sample doc',
       'field_dt[0][value][year]' => '2016',
       'field_dt[0][value][month]' => '2',
       'field_dt[0][value][day]' => '31',
       'field_dt[0][value][hour]' => '1',
       'field_dt[0][value][minute]' => '30',
-    );
+    ];
     $this->drupalPostForm('node/add/page_with_date', $edit, t('Save'));
     $this->assertText(t('Selected combination of day and month is not valid.'), 'Inorrect date failed validation');
 
diff --git a/web/core/modules/system/src/Tests/System/IndexPhpTest.php b/web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php
similarity index 58%
rename from web/core/modules/system/src/Tests/System/IndexPhpTest.php
rename to web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php
index 72811a8a3..2bf098931 100644
--- a/web/core/modules/system/src/Tests/System/IndexPhpTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the handling of requests containing 'index.php'.
  *
  * @group system
  */
-class IndexPhpTest extends WebTestBase {
+class IndexPhpTest extends BrowserTestBase {
   protected function setUp() {
     parent::setUp();
   }
@@ -17,13 +17,13 @@ class IndexPhpTest extends WebTestBase {
   /**
    * Test index.php handling.
    */
-  function testIndexPhpHandling() {
+  public function testIndexPhpHandling() {
     $index_php = $GLOBALS['base_url'] . '/index.php';
 
-    $this->drupalGet($index_php, array('external' => TRUE));
+    $this->drupalGet($index_php, ['external' => TRUE]);
     $this->assertResponse(200, 'Make sure index.php returns a valid page.');
 
-    $this->drupalGet($index_php . '/user', array('external' => TRUE));
+    $this->drupalGet($index_php . '/user', ['external' => TRUE]);
     $this->assertResponse(200, 'Make sure index.php/user returns a valid page.');
   }
 
diff --git a/web/core/modules/system/src/Tests/System/MainContentFallbackTest.php b/web/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php
similarity index 82%
rename from web/core/modules/system/src/Tests/System/MainContentFallbackTest.php
rename to web/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php
index 551e4c744..931b84ce2 100644
--- a/web/core/modules/system/src/Tests/System/MainContentFallbackTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test SimplePageVariant main content rendering fallback page display variant.
  *
  * @group system
  */
-class MainContentFallbackTest extends WebTestBase {
+class MainContentFallbackTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('block', 'system_test');
+  public static $modules = ['block', 'system_test'];
 
   protected $adminUser;
   protected $webUser;
@@ -25,22 +25,22 @@ class MainContentFallbackTest extends WebTestBase {
     parent::setUp();
 
     // Create and log in admin user.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'access administration pages',
       'administer site configuration',
       'administer modules',
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
 
     // Create a web user.
-    $this->webUser = $this->drupalCreateUser(array('access user profiles'));
+    $this->webUser = $this->drupalCreateUser(['access user profiles']);
   }
 
   /**
    * Test availability of main content: Drupal falls back to SimplePageVariant.
    */
-  function testMainContentFallback() {
-    $edit = array();
+  public function testMainContentFallback() {
+    $edit = [];
     // Uninstall the block module.
     $edit['uninstall[block]'] = 'block';
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
@@ -63,8 +63,8 @@ class MainContentFallbackTest extends WebTestBase {
 
     // Enable the block module again.
     $this->drupalLogin($this->adminUser);
-    $edit = array();
-    $edit['modules[Core][block][enable]'] = 'block';
+    $edit = [];
+    $edit['modules[block][enable]'] = 'block';
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->assertText(t('Module Block has been enabled.'), 'Modules status has been updated.');
     $this->rebuildContainer();
diff --git a/web/core/modules/system/src/Tests/System/RetrieveFileTest.php b/web/core/modules/system/tests/src/Functional/System/RetrieveFileTest.php
similarity index 92%
rename from web/core/modules/system/src/Tests/System/RetrieveFileTest.php
rename to web/core/modules/system/tests/src/Functional/System/RetrieveFileTest.php
index 8f6fe4af1..ef12a51ad 100644
--- a/web/core/modules/system/src/Tests/System/RetrieveFileTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/RetrieveFileTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests HTTP file fetching and error handling.
  *
  * @group system
  */
-class RetrieveFileTest extends WebTestBase {
+class RetrieveFileTest extends BrowserTestBase {
   /**
    * Invokes system_retrieve_file() in several scenarios.
    */
-  function testFileRetrieving() {
+  public function testFileRetrieving() {
     // Test 404 handling by trying to fetch a randomly named file.
     drupal_mkdir($sourcedir = 'public://' . $this->randomMachineName());
     $filename = 'Файл для тестирования ' . $this->randomMachineName();
diff --git a/web/core/modules/system/src/Tests/System/SitesDirectoryHardeningTest.php b/web/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php
similarity index 91%
rename from web/core/modules/system/src/Tests/System/SitesDirectoryHardeningTest.php
rename to web/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php
index f9331ba8c..fbe97f4da 100644
--- a/web/core/modules/system/src/Tests/System/SitesDirectoryHardeningTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests Drupal permissions hardening of /sites subdirectories.
  *
  * @group system
  */
-class SitesDirectoryHardeningTest extends WebTestBase {
+class SitesDirectoryHardeningTest extends BrowserTestBase {
   use StringTranslationTrait;
 
   /**
@@ -25,17 +25,17 @@ class SitesDirectoryHardeningTest extends WebTestBase {
     $settings_file = $this->settingsFile($site_path);
 
     // First, we check based on what the initial install has set.
-    $this->assertTrue(drupal_verify_install_file($site_path, FILE_NOT_WRITABLE, 'dir'), new FormattableMarkup('Verified permissions for @file.', array('@file' => $site_path)));
+    $this->assertTrue(drupal_verify_install_file($site_path, FILE_NOT_WRITABLE, 'dir'), new FormattableMarkup('Verified permissions for @file.', ['@file' => $site_path]));
 
     // We intentionally don't check for settings.local.php as that file is
     // not created by Drupal.
-    $this->assertTrue(drupal_verify_install_file($settings_file, FILE_EXIST | FILE_READABLE | FILE_NOT_WRITABLE), new FormattableMarkup('Verified permissions for @file.', array('@file' => $settings_file)));
+    $this->assertTrue(drupal_verify_install_file($settings_file, FILE_EXIST | FILE_READABLE | FILE_NOT_WRITABLE), new FormattableMarkup('Verified permissions for @file.', ['@file' => $settings_file]));
 
     $this->makeWritable($site_path);
     $this->checkSystemRequirements();
 
-    $this->assertTrue(drupal_verify_install_file($site_path, FILE_NOT_WRITABLE, 'dir'), new FormattableMarkup('Verified permissions for @file after manual permissions change.', array('@file' => $site_path)));
-    $this->assertTrue(drupal_verify_install_file($settings_file, FILE_EXIST | FILE_READABLE | FILE_NOT_WRITABLE), new FormattableMarkup('Verified permissions for @file after manual permissions change.', array('@file' => $settings_file)));
+    $this->assertTrue(drupal_verify_install_file($site_path, FILE_NOT_WRITABLE, 'dir'), new FormattableMarkup('Verified permissions for @file after manual permissions change.', ['@file' => $site_path]));
+    $this->assertTrue(drupal_verify_install_file($settings_file, FILE_EXIST | FILE_READABLE | FILE_NOT_WRITABLE), new FormattableMarkup('Verified permissions for @file after manual permissions change.', ['@file' => $settings_file]));
   }
 
   /**
diff --git a/web/core/modules/system/src/Tests/System/StatusTest.php b/web/core/modules/system/tests/src/Functional/System/StatusTest.php
similarity index 87%
rename from web/core/modules/system/src/Tests/System/StatusTest.php
rename to web/core/modules/system/tests/src/Functional/System/StatusTest.php
index c17031663..cb81d0521 100644
--- a/web/core/modules/system/src/Tests/System/StatusTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/StatusTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\system\SystemRequirements;
 
 /**
@@ -11,7 +11,7 @@ use Drupal\system\SystemRequirements;
  *
  * @group system
  */
-class StatusTest extends WebTestBase {
+class StatusTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
@@ -26,17 +26,17 @@ class StatusTest extends WebTestBase {
 
     // Unset the sync directory in settings.php to trigger $config_directories
     // error.
-    $settings['config_directories']  = array(
-      CONFIG_SYNC_DIRECTORY => (object) array(
+    $settings['config_directories']  = [
+      CONFIG_SYNC_DIRECTORY => (object) [
         'value' => '',
         'required' => TRUE,
-      ),
-    );
+      ],
+    ];
     $this->writeSettings($settings);
 
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'administer site configuration',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
   }
 
@@ -71,7 +71,7 @@ class StatusTest extends WebTestBase {
     $this->assertNoText(t('Out of date'));
 
     // The global $config_directories is not properly formed.
-    $this->assertRaw(t('Your %file file must define the $config_directories variable as an array containing the names of directories in which configuration files can be found. It must contain a %sync_key key.', array('%file' => $this->siteDirectory . '/settings.php', '%sync_key' => CONFIG_SYNC_DIRECTORY)));
+    $this->assertRaw(t('Your %file file must define the $config_directories variable as an array containing the names of directories in which configuration files can be found. It must contain a %sync_key key.', ['%file' => $this->siteDirectory . '/settings.php', '%sync_key' => CONFIG_SYNC_DIRECTORY]));
 
     // Set the schema version of update_test_postupdate to a lower version, so
     // update_test_postupdate_update_8001() needs to be executed.
diff --git a/web/core/modules/system/src/Tests/System/SystemAuthorizeTest.php b/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
similarity index 75%
rename from web/core/modules/system/src/Tests/System/SystemAuthorizeTest.php
rename to web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
index 5e278d723..8fa81ac29 100644
--- a/web/core/modules/system/src/Tests/System/SystemAuthorizeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
@@ -1,28 +1,28 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the authorize.php script and related API.
  *
  * @group system
  */
-class SystemAuthorizeTest extends WebTestBase {
+class SystemAuthorizeTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('system_test');
+  public static $modules = ['system_test'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create an administrator user.
-    $this->drupalLogin ($this->drupalCreateUser(array('administer software updates')));
+    $this->drupalLogin ($this->drupalCreateUser(['administer software updates']));
   }
 
   /**
@@ -36,17 +36,17 @@ class SystemAuthorizeTest extends WebTestBase {
    *
    * @see system_authorized_init()
    */
-  function drupalGetAuthorizePHP($page_title = 'system-test-auth') {
+  public function drupalGetAuthorizePHP($page_title = 'system-test-auth') {
     $this->drupalGet('system-test/authorize-init/' . $page_title);
   }
 
   /**
    * Tests the FileTransfer hooks
    */
-  function testFileTransferHooks() {
+  public function testFileTransferHooks() {
     $page_title = $this->randomMachineName(16);
     $this->drupalGetAuthorizePHP($page_title);
-    $this->assertTitle(strtr('@title | Drupal', array('@title' => $page_title)), 'authorize.php page title is correct.');
+    $this->assertTitle(strtr('@title | Drupal', ['@title' => $page_title]), 'authorize.php page title is correct.');
     $this->assertNoText('It appears you have reached this page in error.');
     $this->assertText('To continue, provide your server connection details');
     // Make sure we see the new connection method added by system_test.
diff --git a/web/core/modules/system/src/Tests/System/TokenScanTest.php b/web/core/modules/system/tests/src/Functional/System/TokenScanTest.php
similarity index 89%
rename from web/core/modules/system/src/Tests/System/TokenScanTest.php
rename to web/core/modules/system/tests/src/Functional/System/TokenScanTest.php
index 89f2abda4..f284aa978 100644
--- a/web/core/modules/system/src/Tests/System/TokenScanTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/TokenScanTest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Scan token-like patterns in a dummy text to check token scanning.
  *
  * @group system
  */
-class TokenScanTest extends WebTestBase {
+class TokenScanTest extends BrowserTestBase {
 
   /**
    * Scans dummy text, then tests the output.
    */
-  function testTokenScan() {
+  public function testTokenScan() {
     // Define text with valid and not valid, fake and existing token-like
     // strings.
     $text = 'First a [valid:simple], but dummy token, and a dummy [valid:token with: spaces].';
diff --git a/web/core/modules/system/src/Tests/System/TrustedHostsTest.php b/web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php
similarity index 86%
rename from web/core/modules/system/src/Tests/System/TrustedHostsTest.php
rename to web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php
index a9c976ac8..7a65474c7 100644
--- a/web/core/modules/system/src/Tests/System/TrustedHostsTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\System;
+namespace Drupal\Tests\system\Functional\System;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests output on the status overview page.
  *
  * @group system
  */
-class TrustedHostsTest extends WebTestBase {
+class TrustedHostsTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
@@ -17,9 +17,9 @@ class TrustedHostsTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $admin_user = $this->drupalCreateUser(array(
+    $admin_user = $this->drupalCreateUser([
       'administer site configuration',
-    ));
+    ]);
     $this->drupalLogin($admin_user);
   }
 
@@ -39,10 +39,10 @@ class TrustedHostsTest extends WebTestBase {
    * Tests that the status page shows the trusted patterns from settings.php.
    */
   public function testStatusPageWithConfiguration() {
-    $settings['settings']['trusted_host_patterns'] = (object) array(
-      'value' => array('^' . preg_quote(\Drupal::request()->getHost()) . '$'),
+    $settings['settings']['trusted_host_patterns'] = (object) [
+      'value' => ['^' . preg_quote(\Drupal::request()->getHost()) . '$'],
       'required' => TRUE,
-    );
+    ];
 
     $this->writeSettings($settings);
 
@@ -63,10 +63,10 @@ class TrustedHostsTest extends WebTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $host = $this->container->get('request_stack')->getCurrentRequest()->getHost();
-    $settings['settings']['trusted_host_patterns'] = (object) array(
-      'value' => array('^' . preg_quote($host) . '$'),
+    $settings['settings']['trusted_host_patterns'] = (object) [
+      'value' => ['^' . preg_quote($host) . '$'],
       'required' => TRUE,
-    );
+    ];
 
     $this->writeSettings($settings);
 
diff --git a/web/core/modules/system/src/Tests/Theme/EngineNyanCatTest.php b/web/core/modules/system/tests/src/Functional/Theme/EngineNyanCatTest.php
similarity index 65%
rename from web/core/modules/system/src/Tests/Theme/EngineNyanCatTest.php
rename to web/core/modules/system/tests/src/Functional/Theme/EngineNyanCatTest.php
index 0eb43b7d5..6dca1b38d 100644
--- a/web/core/modules/system/src/Tests/Theme/EngineNyanCatTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/EngineNyanCatTest.php
@@ -1,32 +1,32 @@
 <?php
 
-namespace Drupal\system\Tests\Theme;
+namespace Drupal\Tests\system\Functional\Theme;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the multi theme engine support.
  *
  * @group Theme
  */
-class EngineNyanCatTest extends WebTestBase {
+class EngineNyanCatTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('theme_test');
+  public static $modules = ['theme_test'];
 
   protected function setUp() {
     parent::setUp();
-    \Drupal::service('theme_handler')->install(array('test_theme_nyan_cat_engine'));
+    \Drupal::service('theme_handler')->install(['test_theme_nyan_cat_engine']);
   }
 
   /**
    * Ensures a theme's template is overridable based on the 'template' filename.
    */
-  function testTemplateOverride() {
+  public function testTemplateOverride() {
     $this->config('system.theme')
       ->set('default', 'test_theme_nyan_cat_engine')
       ->save();
diff --git a/web/core/modules/system/src/Tests/Theme/FastTest.php b/web/core/modules/system/tests/src/Functional/Theme/FastTest.php
similarity index 55%
rename from web/core/modules/system/src/Tests/Theme/FastTest.php
rename to web/core/modules/system/tests/src/Functional/Theme/FastTest.php
index a05666fe0..d8f85f1f4 100644
--- a/web/core/modules/system/src/Tests/Theme/FastTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/FastTest.php
@@ -1,34 +1,34 @@
 <?php
 
-namespace Drupal\system\Tests\Theme;
+namespace Drupal\Tests\system\Functional\Theme;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests autocompletion not loading registry.
  *
  * @group Theme
  */
-class FastTest extends WebTestBase {
+class FastTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('theme_test');
+  public static $modules = ['theme_test'];
 
   protected function setUp() {
     parent::setUp();
-    $this->account = $this->drupalCreateUser(array('access user profiles'));
+    $this->account = $this->drupalCreateUser(['access user profiles']);
   }
 
   /**
    * Tests access to user autocompletion and verify the correct results.
    */
-  function testUserAutocomplete() {
+  public function testUserAutocomplete() {
     $this->drupalLogin($this->account);
-    $this->drupalGet('user/autocomplete', array('query' => array('q' => $this->account->getUsername())));
+    $this->drupalGet('user/autocomplete', ['query' => ['q' => $this->account->getUsername()]]);
     $this->assertRaw($this->account->getUsername());
     $this->assertNoText('registry initialized', 'The registry was not initialized');
   }
diff --git a/web/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeEarlyInitializationTest.php
similarity index 74%
rename from web/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php
rename to web/core/modules/system/tests/src/Functional/Theme/ThemeEarlyInitializationTest.php
index ddbb770aa..040dfabfc 100644
--- a/web/core/modules/system/src/Tests/Theme/ThemeEarlyInitializationTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeEarlyInitializationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\system\Tests\Theme;
+namespace Drupal\Tests\system\Functional\Theme;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that the theme system can be correctly initialized early in the page
@@ -10,19 +10,19 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group Theme
  */
-class ThemeEarlyInitializationTest extends WebTestBase {
+class ThemeEarlyInitializationTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('theme_test');
+  public static $modules = ['theme_test'];
 
   /**
    * Test that the theme system can generate output in a request listener.
    */
-  function testRequestListener() {
+  public function testRequestListener() {
     $this->drupalGet('theme-test/request-listener');
     // Verify that themed output generated in the request listener appears.
     $this->assertRaw('Themed output generated in a KernelEvents::REQUEST listener');
diff --git a/web/core/modules/system/src/Tests/Theme/ThemeInfoTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
similarity index 71%
rename from web/core/modules/system/src/Tests/Theme/ThemeInfoTest.php
rename to web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
index 043986a61..ee41968a5 100644
--- a/web/core/modules/system/src/Tests/Theme/ThemeInfoTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\system\Tests\Theme;
+namespace Drupal\Tests\system\Functional\Theme;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests processing of theme .info.yml properties.
  *
  * @group Theme
  */
-class ThemeInfoTest extends WebTestBase {
+class ThemeInfoTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('theme_test');
+  public static $modules = ['theme_test'];
 
   /**
    * The theme handler used in this test for enabling themes.
@@ -53,8 +53,8 @@ class ThemeInfoTest extends WebTestBase {
   /**
    * Tests stylesheets-remove.
    */
-  function testStylesheets() {
-    $this->themeHandler->install(array('test_basetheme', 'test_subtheme'));
+  public function testStylesheets() {
+    $this->themeHandler->install(['test_basetheme', 'test_subtheme']);
     $this->config('system.theme')
       ->set('default', 'test_subtheme')
       ->save();
@@ -66,16 +66,16 @@ class ThemeInfoTest extends WebTestBase {
     // should work nevertheless.
     $this->drupalGet('theme-test/info/stylesheets');
 
-    $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', array(':href'  => "$base/base-add.css"))), "$base/base-add.css found");
-    $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', array(':href'  => "base-remove.css"))), "base-remove.css not found");
+    $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href'  => "$base/base-add.css"])), "$base/base-add.css found");
+    $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href'  => "base-remove.css"])), "base-remove.css not found");
 
-    $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', array(':href'  => "$sub/sub-add.css"))), "$sub/sub-add.css found");
-    $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', array(':href'  => "sub-remove.css"))), "sub-remove.css not found");
-    $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', array(':href' => "base-add.sub-remove.css"))), "base-add.sub-remove.css not found");
+    $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href'  => "$sub/sub-add.css"])), "$sub/sub-add.css found");
+    $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href'  => "sub-remove.css"])), "sub-remove.css not found");
+    $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href' => "base-add.sub-remove.css"])), "base-add.sub-remove.css not found");
 
     // Verify that CSS files with the same name are loaded from both the base theme and subtheme.
-    $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', array(':href' => "$base/samename.css"))), "$base/samename.css found");
-    $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', array(':href' => "$sub/samename.css"))), "$sub/samename.css found");
+    $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href' => "$base/samename.css"])), "$base/samename.css found");
+    $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href' => "$sub/samename.css"])), "$sub/samename.css found");
 
   }
 
@@ -83,8 +83,8 @@ class ThemeInfoTest extends WebTestBase {
    * Tests that changes to the info file are picked up.
    */
   public function testChanges() {
-    $this->themeHandler->install(array('test_theme'));
-    $this->themeHandler->setDefault('test_theme');
+    $this->themeHandler->install(['test_theme']);
+    $this->config('system.theme')->set('default', 'test_theme')->save();
     $this->themeManager->resetActiveTheme();
 
     $active_theme = $this->themeManager->getActiveTheme();
diff --git a/web/core/modules/system/src/Tests/Theme/ThemeTokenTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
similarity index 92%
rename from web/core/modules/system/src/Tests/Theme/ThemeTokenTest.php
rename to web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
index c3b1f8c6f..1488c5b3e 100644
--- a/web/core/modules/system/src/Tests/Theme/ThemeTokenTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\Theme;
+namespace Drupal\Tests\system\Functional\Theme;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the generation of 'theme_token' key in Drupal settings.
  *
  * @group Theme
  */
-class ThemeTokenTest extends WebTestBase {
+class ThemeTokenTest extends BrowserTestBase {
 
   /**
    * We want to visit the 'admin/structure/block' page.
diff --git a/web/core/modules/system/src/Tests/Theme/TwigExtensionTest.php b/web/core/modules/system/tests/src/Functional/Theme/TwigExtensionTest.php
similarity index 87%
rename from web/core/modules/system/src/Tests/Theme/TwigExtensionTest.php
rename to web/core/modules/system/tests/src/Functional/Theme/TwigExtensionTest.php
index 4be1f736c..5e3bc722e 100644
--- a/web/core/modules/system/src/Tests/Theme/TwigExtensionTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/TwigExtensionTest.php
@@ -1,32 +1,32 @@
 <?php
 
-namespace Drupal\system\Tests\Theme;
+namespace Drupal\Tests\system\Functional\Theme;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests Twig extensions.
  *
  * @group Theme
  */
-class TwigExtensionTest extends WebTestBase {
+class TwigExtensionTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('theme_test', 'twig_extension_test');
+  public static $modules = ['theme_test', 'twig_extension_test'];
 
   protected function setUp() {
     parent::setUp();
-    \Drupal::service('theme_handler')->install(array('test_theme'));
+    \Drupal::service('theme_handler')->install(['test_theme']);
   }
 
   /**
    * Tests that the provided Twig extension loads the service appropriately.
    */
-  function testTwigExtensionLoaded() {
+  public function testTwigExtensionLoaded() {
     $twigService = \Drupal::service('twig');
     $ext = $twigService->getExtension('twig_extension_test.test_extension');
     $this->assertEqual(get_class($ext), 'Drupal\twig_extension_test\TwigExtension\TestExtension', 'TestExtension loaded successfully.');
@@ -35,7 +35,7 @@ class TwigExtensionTest extends WebTestBase {
   /**
    * Tests that the Twig extension's filter produces expected output.
    */
-  function testTwigExtensionFilter() {
+  public function testTwigExtensionFilter() {
     $this->config('system.theme')
       ->set('default', 'test_theme')
       ->save();
@@ -49,7 +49,7 @@ class TwigExtensionTest extends WebTestBase {
   /**
    * Tests that the Twig extension's function produces expected output.
    */
-  function testTwigExtensionFunction() {
+  public function testTwigExtensionFunction() {
     $this->config('system.theme')
       ->set('default', 'test_theme')
       ->save();
diff --git a/web/core/modules/system/src/Tests/Theme/TwigLoaderTest.php b/web/core/modules/system/tests/src/Functional/Theme/TwigLoaderTest.php
similarity index 53%
rename from web/core/modules/system/src/Tests/Theme/TwigLoaderTest.php
rename to web/core/modules/system/tests/src/Functional/Theme/TwigLoaderTest.php
index 84a112c00..d2b0b5465 100644
--- a/web/core/modules/system/src/Tests/Theme/TwigLoaderTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/TwigLoaderTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\system\Tests\Theme;
+namespace Drupal\Tests\system\Functional\Theme;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests adding Twig loaders.
  *
  * @group Theme
  */
-class TwigLoaderTest extends WebTestBase {
+class TwigLoaderTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -25,10 +25,10 @@ class TwigLoaderTest extends WebTestBase {
     $environment = \Drupal::service('twig');
 
     $template = $environment->loadTemplate('kittens');
-    $this->assertEqual($template->render(array()), 'kittens', 'Passing "kittens" to the custom Twig loader returns "kittens".');
+    $this->assertEqual($template->render([]), 'kittens', 'Passing "kittens" to the custom Twig loader returns "kittens".');
 
     $template = $environment->loadTemplate('meow');
-    $this->assertEqual($template->render(array()), 'cats', 'Passing something other than "kittens" to the custom Twig loader returns "cats".');
+    $this->assertEqual($template->render([]), 'cats', 'Passing something other than "kittens" to the custom Twig loader returns "cats".');
   }
 
 }
diff --git a/web/core/modules/system/src/Tests/Theme/TwigRegistryLoaderTest.php b/web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php
similarity index 89%
rename from web/core/modules/system/src/Tests/Theme/TwigRegistryLoaderTest.php
rename to web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php
index 5cbca9f33..244628998 100644
--- a/web/core/modules/system/src/Tests/Theme/TwigRegistryLoaderTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Drupal\system\Tests\Theme;
+namespace Drupal\Tests\system\Functional\Theme;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests Twig registry loader.
  *
  * @group Theme
  */
-class TwigRegistryLoaderTest extends WebTestBase {
+class TwigRegistryLoaderTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('twig_theme_test', 'block');
+  public static $modules = ['twig_theme_test', 'block'];
 
   /**
    * @var \Drupal\Core\Template\TwigEnvironment
@@ -25,7 +25,7 @@ class TwigRegistryLoaderTest extends WebTestBase {
 
   protected function setUp() {
     parent::setUp();
-    \Drupal::service('theme_handler')->install(array('test_theme_twig_registry_loader', 'test_theme_twig_registry_loader_theme', 'test_theme_twig_registry_loader_subtheme'));
+    \Drupal::service('theme_handler')->install(['test_theme_twig_registry_loader', 'test_theme_twig_registry_loader_theme', 'test_theme_twig_registry_loader_subtheme']);
     $this->twig = \Drupal::service('twig');
   }
 
diff --git a/web/core/modules/system/src/Tests/Theme/TwigSettingsTest.php b/web/core/modules/system/tests/src/Functional/Theme/TwigSettingsTest.php
similarity index 91%
rename from web/core/modules/system/src/Tests/Theme/TwigSettingsTest.php
rename to web/core/modules/system/tests/src/Functional/Theme/TwigSettingsTest.php
index b776639fe..0ad88ce32 100644
--- a/web/core/modules/system/src/Tests/Theme/TwigSettingsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/TwigSettingsTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\system\Tests\Theme;
+namespace Drupal\Tests\system\Functional\Theme;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\Core\PhpStorage\PhpStorageFactory;
 
 /**
@@ -10,19 +10,19 @@ use Drupal\Core\PhpStorage\PhpStorageFactory;
  *
  * @group Theme
  */
-class TwigSettingsTest extends WebTestBase {
+class TwigSettingsTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('theme_test');
+  public static $modules = ['theme_test'];
 
   /**
    * Ensures Twig template auto reload setting can be overridden.
    */
-  function testTwigAutoReloadOverride() {
+  public function testTwigAutoReloadOverride() {
     // Enable auto reload and rebuild the service container.
     $parameters = $this->container->getParameter('twig.config');
     $parameters['auto_reload'] = TRUE;
@@ -44,7 +44,7 @@ class TwigSettingsTest extends WebTestBase {
   /**
    * Ensures Twig engine debug setting can be overridden.
    */
-  function testTwigDebugOverride() {
+  public function testTwigDebugOverride() {
     // Enable debug and rebuild the service container.
     $parameters = $this->container->getParameter('twig.config');
     $parameters['debug'] = TRUE;
@@ -74,11 +74,11 @@ class TwigSettingsTest extends WebTestBase {
   /**
    * Ensures Twig template cache setting can be overridden.
    */
-  function testTwigCacheOverride() {
+  public function testTwigCacheOverride() {
     $extension = twig_extension();
     $theme_handler = $this->container->get('theme_handler');
-    $theme_handler->install(array('test_theme'));
-    $theme_handler->setDefault('test_theme');
+    $theme_handler->install(['test_theme']);
+    $this->config('system.theme')->set('default', 'test_theme')->save();
 
     // The registry still works on theme globals, so set them here.
     \Drupal::theme()->setActiveTheme(\Drupal::service('theme.initialization')->getActiveThemeByName('test_theme'));
diff --git a/web/core/modules/system/tests/src/Kernel/Action/ActionTest.php b/web/core/modules/system/tests/src/Kernel/Action/ActionTest.php
index 4ca24fb5a..6c381d7c8 100644
--- a/web/core/modules/system/tests/src/Kernel/Action/ActionTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Action/ActionTest.php
@@ -17,7 +17,7 @@ class ActionTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('system', 'field', 'user', 'action_test');
+  public static $modules = ['system', 'field', 'user', 'action_test'];
 
   /**
    * The action manager.
@@ -34,7 +34,7 @@ class ActionTest extends KernelTestBase {
 
     $this->actionManager = $this->container->get('plugin.manager.action');
     $this->installEntitySchema('user');
-    $this->installSchema('system', array('sequences'));
+    $this->installSchema('system', ['sequences']);
   }
 
   /**
@@ -59,7 +59,7 @@ class ActionTest extends KernelTestBase {
     // Create a new unsaved user.
     $name = $this->randomMachineName();
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
-    $account = $user_storage->create(array('name' => $name, 'bundle' => 'user'));
+    $account = $user_storage->create(['name' => $name, 'bundle' => 'user']);
     $loaded_accounts = $user_storage->loadMultiple();
     $this->assertEqual(count($loaded_accounts), 0);
 
@@ -76,25 +76,25 @@ class ActionTest extends KernelTestBase {
    */
   public function testDependencies() {
     // Create a new action that depends on a user role.
-    $action = Action::create(array(
+    $action = Action::create([
       'id' => 'user_add_role_action.' . RoleInterface::ANONYMOUS_ID,
       'type' => 'user',
       'label' => t('Add the anonymous role to the selected users'),
-      'configuration' => array(
+      'configuration' => [
         'rid' => RoleInterface::ANONYMOUS_ID,
-      ),
+      ],
       'plugin' => 'user_add_role_action',
-    ));
+    ]);
     $action->save();
 
-    $expected = array(
-      'config' => array(
+    $expected = [
+      'config' => [
         'user.role.' . RoleInterface::ANONYMOUS_ID,
-      ),
-      'module' => array(
+      ],
+      'module' => [
         'user',
-      ),
-    );
+      ],
+    ];
     $this->assertIdentical($expected, $action->calculateDependencies()->getDependencies());
   }
 
diff --git a/web/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php b/web/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php
index ca1c5afff..6a9825e12 100644
--- a/web/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php
@@ -31,7 +31,7 @@ class SystemMenuBlockTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'system',
     'block',
     'menu_test',
@@ -39,7 +39,7 @@ class SystemMenuBlockTest extends KernelTestBase {
     'field',
     'user',
     'link',
-  );
+  ];
 
   /**
    * The block under test.
@@ -97,16 +97,16 @@ class SystemMenuBlockTest extends KernelTestBase {
     $this->blockManager = $this->container->get('plugin.manager.block');
 
     $routes = new RouteCollection();
-    $requirements = array('_access' => 'TRUE');
-    $options = array('_access_checks' => array('access_check.default'));
-    $routes->add('example1', new Route('/example1', array(), $requirements, $options));
-    $routes->add('example2', new Route('/example2', array(), $requirements, $options));
-    $routes->add('example3', new Route('/example3', array(), $requirements, $options));
-    $routes->add('example4', new Route('/example4', array(), $requirements, $options));
-    $routes->add('example5', new Route('/example5', array(), $requirements, $options));
-    $routes->add('example6', new Route('/example6', array(), $requirements, $options));
-    $routes->add('example7', new Route('/example7', array(), $requirements, $options));
-    $routes->add('example8', new Route('/example8', array(), $requirements, $options));
+    $requirements = ['_access' => 'TRUE'];
+    $options = ['_access_checks' => ['access_check.default']];
+    $routes->add('example1', new Route('/example1', [], $requirements, $options));
+    $routes->add('example2', new Route('/example2', [], $requirements, $options));
+    $routes->add('example3', new Route('/example3', [], $requirements, $options));
+    $routes->add('example4', new Route('/example4', [], $requirements, $options));
+    $routes->add('example5', new Route('/example5', [], $requirements, $options));
+    $routes->add('example6', new Route('/example6', [], $requirements, $options));
+    $routes->add('example7', new Route('/example7', [], $requirements, $options));
+    $routes->add('example8', new Route('/example8', [], $requirements, $options));
 
     $mock_route_provider = new MockRouteProvider($routes);
     $this->container->set('router.route_provider', $mock_route_provider);
@@ -115,11 +115,11 @@ class SystemMenuBlockTest extends KernelTestBase {
     $menu_name = 'mock';
     $label = $this->randomMachineName(16);
 
-    $this->menu = Menu::create(array(
+    $this->menu = Menu::create([
       'id' => $menu_name,
       'label' => $label,
       'description' => 'Description text',
-    ));
+    ]);
     $this->menu->save();
 
     // This creates a tree with the following structure:
@@ -132,16 +132,16 @@ class SystemMenuBlockTest extends KernelTestBase {
     // - 6
     // - 8
     // With link 6 being the only external link.
-    $links = array(
-      1 => MenuLinkMock::create(array('id' => 'test.example1', 'route_name' => 'example1', 'title' => 'foo', 'parent' => '', 'weight' => 0)),
-      2 => MenuLinkMock::create(array('id' => 'test.example2', 'route_name' => 'example2', 'title' => 'bar', 'parent' => '', 'route_parameters' => array('foo' => 'bar'), 'weight' => 1)),
-      3 => MenuLinkMock::create(array('id' => 'test.example3', 'route_name' => 'example3', 'title' => 'baz', 'parent' => 'test.example2', 'weight' => 2)),
-      4 => MenuLinkMock::create(array('id' => 'test.example4', 'route_name' => 'example4', 'title' => 'qux', 'parent' => 'test.example3', 'weight' => 3)),
-      5 => MenuLinkMock::create(array('id' => 'test.example5', 'route_name' => 'example5', 'title' => 'foofoo', 'parent' => '', 'expanded' => TRUE, 'weight' => 4)),
-      6 => MenuLinkMock::create(array('id' => 'test.example6', 'route_name' => '', 'url' => 'https://www.drupal.org/', 'title' => 'barbar', 'parent' => '', 'weight' => 5)),
-      7 => MenuLinkMock::create(array('id' => 'test.example7', 'route_name' => 'example7', 'title' => 'bazbaz', 'parent' => 'test.example5', 'weight' => 6)),
-      8 => MenuLinkMock::create(array('id' => 'test.example8', 'route_name' => 'example8', 'title' => 'quxqux', 'parent' => '', 'weight' => 7)),
-    );
+    $links = [
+      1 => MenuLinkMock::create(['id' => 'test.example1', 'route_name' => 'example1', 'title' => 'foo', 'parent' => '', 'weight' => 0]),
+      2 => MenuLinkMock::create(['id' => 'test.example2', 'route_name' => 'example2', 'title' => 'bar', 'parent' => '', 'route_parameters' => ['foo' => 'bar'], 'weight' => 1]),
+      3 => MenuLinkMock::create(['id' => 'test.example3', 'route_name' => 'example3', 'title' => 'baz', 'parent' => 'test.example2', 'weight' => 2]),
+      4 => MenuLinkMock::create(['id' => 'test.example4', 'route_name' => 'example4', 'title' => 'qux', 'parent' => 'test.example3', 'weight' => 3]),
+      5 => MenuLinkMock::create(['id' => 'test.example5', 'route_name' => 'example5', 'title' => 'foofoo', 'parent' => '', 'expanded' => TRUE, 'weight' => 4]),
+      6 => MenuLinkMock::create(['id' => 'test.example6', 'route_name' => '', 'url' => 'https://www.drupal.org/', 'title' => 'barbar', 'parent' => '', 'weight' => 5]),
+      7 => MenuLinkMock::create(['id' => 'test.example7', 'route_name' => 'example7', 'title' => 'bazbaz', 'parent' => 'test.example5', 'weight' => 6]),
+      8 => MenuLinkMock::create(['id' => 'test.example8', 'route_name' => 'example8', 'title' => 'quxqux', 'parent' => '', 'weight' => 7]),
+    ];
     foreach ($links as $instance) {
       $this->menuLinkManager->addDefinition($instance->getPluginId(), $instance->getPluginDefinition());
     }
@@ -152,25 +152,25 @@ class SystemMenuBlockTest extends KernelTestBase {
    */
   public function testSystemMenuBlockConfigDependencies() {
 
-    $block = Block::create(array(
+    $block = Block::create([
       'plugin' => 'system_menu_block:' . $this->menu->id(),
       'region' => 'footer',
       'id' => 'machinename',
       'theme' => 'stark',
-    ));
+    ]);
 
     $dependencies = $block->calculateDependencies()->getDependencies();
-    $expected = array(
-      'config' => array(
+    $expected = [
+      'config' => [
         'system.menu.' . $this->menu->id()
-      ),
-      'module' => array(
+      ],
+      'module' => [
         'system'
-      ),
-      'theme' => array(
+      ],
+      'theme' => [
         'stark'
-      ),
-    );
+      ],
+    ];
     $this->assertIdentical($expected, $dependencies);
   }
 
@@ -180,13 +180,13 @@ class SystemMenuBlockTest extends KernelTestBase {
   public function testConfigLevelDepth() {
     // Helper function to generate a configured block instance.
     $place_block = function ($level, $depth) {
-      return $this->blockManager->createInstance('system_menu_block:' . $this->menu->id(), array(
+      return $this->blockManager->createInstance('system_menu_block:' . $this->menu->id(), [
         'region' => 'footer',
         'id' => 'machinename',
         'theme' => 'stark',
         'level' => $level,
         'depth' => $depth,
-      ));
+      ]);
     };
 
     // All the different block instances we're going to test.
diff --git a/web/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php b/web/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php
index 80729448d..fa1694734 100644
--- a/web/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php
@@ -14,7 +14,7 @@ class PageRenderTest extends KernelTestBase {
   /**
    * Tests hook_page_attachments() exceptions.
    */
-  function testHookPageAttachmentsExceptions() {
+  public function testHookPageAttachmentsExceptions() {
     $this->enableModules(['common_test', 'system']);
     \Drupal::service('router.builder')->rebuild();
 
@@ -24,7 +24,7 @@ class PageRenderTest extends KernelTestBase {
   /**
    * Tests hook_page_attachments_alter() exceptions.
    */
-  function testHookPageAlter() {
+  public function testHookPageAlter() {
     $this->enableModules(['common_test', 'system']);
     \Drupal::service('router.builder')->rebuild();
 
@@ -39,7 +39,7 @@ class PageRenderTest extends KernelTestBase {
    * @param string $hook
    *   The page render hook to assert expected exceptions for.
    */
-  function assertPageRenderHookExceptions($module, $hook) {
+  public function assertPageRenderHookExceptions($module, $hook) {
     $html_renderer = \Drupal::getContainer()->get('main_content_renderer.html');
 
     // Assert a valid hook implementation doesn't trigger an exception.
diff --git a/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php b/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php
index 7de7ecfb6..b0412b433 100644
--- a/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php
@@ -14,17 +14,17 @@ class SystemListingTest extends KernelTestBase {
   /**
    * Tests that files in different directories take precedence as expected.
    */
-  function testDirectoryPrecedence() {
+  public function testDirectoryPrecedence() {
     // Define the module files we will search for, and the directory precedence
     // we expect.
-    $expected_directories = array(
+    $expected_directories = [
       // When both copies of the module are compatible with Drupal core, the
       // copy in the profile directory takes precedence.
-      'drupal_system_listing_compatible_test' => array(
+      'drupal_system_listing_compatible_test' => [
         'core/profiles/testing/modules',
         'core/modules/system/tests/modules',
-      ),
-    );
+      ],
+    ];
 
     // This test relies on two versions of the same module existing in
     // different places in the filesystem. Without that, the test has no
@@ -32,22 +32,22 @@ class SystemListingTest extends KernelTestBase {
     foreach ($expected_directories as $module => $directories) {
       foreach ($directories as $directory) {
         $filename = "$directory/$module/$module.info.yml";
-        $this->assertTrue(file_exists(\Drupal::root() . '/' . $filename), format_string('@filename exists.', array('@filename' => $filename)));
+        $this->assertTrue(file_exists(\Drupal::root() . '/' . $filename), format_string('@filename exists.', ['@filename' => $filename]));
       }
     }
 
     // Now scan the directories and check that the files take precedence as
     // expected.
     $listing = new ExtensionDiscovery(\Drupal::root());
-    $listing->setProfileDirectories(array('core/profiles/testing'));
+    $listing->setProfileDirectories(['core/profiles/testing']);
     $files = $listing->scan('module');
     foreach ($expected_directories as $module => $directories) {
       $expected_directory = array_shift($directories);
       $expected_uri = "$expected_directory/$module/$module.info.yml";
-      $this->assertEqual($files[$module]->getPathname(), $expected_uri, format_string('Module @actual was found at @expected.', array(
+      $this->assertEqual($files[$module]->getPathname(), $expected_uri, format_string('Module @actual was found at @expected.', [
         '@actual' => $files[$module]->getPathname(),
         '@expected' => $expected_uri,
-      )));
+      ]));
     }
   }
 
@@ -56,7 +56,7 @@ class SystemListingTest extends KernelTestBase {
    */
   public function testFileScanIgnoreDirectory() {
     $listing = new ExtensionDiscovery(\Drupal::root(), FALSE);
-    $listing->setProfileDirectories(array('core/profiles/testing'));
+    $listing->setProfileDirectories(['core/profiles/testing']);
     $files = $listing->scan('module');
     $this->assertArrayHasKey('drupal_system_listing_compatible_test', $files);
 
@@ -68,7 +68,7 @@ class SystemListingTest extends KernelTestBase {
 
     $this->setSetting('file_scan_ignore_directories', ['drupal_system_listing_compatible_test']);
     $listing = new ExtensionDiscovery(\Drupal::root(), FALSE);
-    $listing->setProfileDirectories(array('core/profiles/testing'));
+    $listing->setProfileDirectories(['core/profiles/testing']);
     $files = $listing->scan('module');
     $this->assertArrayNotHasKey('drupal_system_listing_compatible_test', $files);
   }
diff --git a/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php b/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
index 8a3e98ed8..22648a639 100644
--- a/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
@@ -38,13 +38,13 @@ class ModuleHandlerTest extends KernelTestBase {
   /**
    * The basic functionality of retrieving enabled modules.
    */
-  function testModuleList() {
+  public function testModuleList() {
     $module_list = ['system'];
 
     $this->assertModuleList($module_list, 'Initial');
 
     // Try to install a new module.
-    $this->moduleInstaller()->install(array('ban'));
+    $this->moduleInstaller()->install(['ban']);
     $module_list[] = 'ban';
     sort($module_list);
     $this->assertModuleList($module_list, 'After adding a module');
@@ -58,10 +58,10 @@ class ModuleHandlerTest extends KernelTestBase {
     $this->assertModuleList($module_list, 'After changing weights');
 
     // Test the fixed list feature.
-    $fixed_list = array(
+    $fixed_list = [
       'system' => 'core/modules/system/system.module',
       'menu' => 'core/modules/menu/menu.module',
-    );
+    ];
     $this->moduleHandler()->setModuleList($fixed_list);
     $new_module_list = array_combine(array_keys($fixed_list), array_keys($fixed_list));
     $this->assertModuleList($new_module_list, t('When using a fixed list'));
@@ -77,7 +77,7 @@ class ModuleHandlerTest extends KernelTestBase {
   protected function assertModuleList(array $expected_values, $condition) {
     $expected_values = array_values(array_unique($expected_values));
     $enabled_modules = array_keys($this->container->get('module_handler')->getModuleList());
-    $this->assertEqual($expected_values, $enabled_modules, format_string('@condition: extension handler returns correct results', array('@condition' => $condition)));
+    $this->assertEqual($expected_values, $enabled_modules, format_string('@condition: extension handler returns correct results', ['@condition' => $condition]));
   }
 
   /**
@@ -92,8 +92,8 @@ class ModuleHandlerTest extends KernelTestBase {
    * @see module_test_system_info_alter()
    * @see https://www.drupal.org/files/issues/dep.gv__0.png
    */
-  function testDependencyResolution() {
-    $this->enableModules(array('module_test'));
+  public function testDependencyResolution() {
+    $this->enableModules(['module_test']);
     $this->assertTrue($this->moduleHandler()->moduleExists('module_test'), 'Test module is enabled.');
 
     // Ensure that modules are not enabled.
@@ -108,7 +108,7 @@ class ModuleHandlerTest extends KernelTestBase {
     drupal_static_reset('system_rebuild_module_data');
 
     try {
-      $result = $this->moduleInstaller()->install(array('color'));
+      $result = $this->moduleInstaller()->install(['color']);
       $this->fail(t('ModuleInstaller::install() throws an exception if dependencies are missing.'));
     }
     catch (MissingDependencyException $e) {
@@ -122,7 +122,7 @@ class ModuleHandlerTest extends KernelTestBase {
     \Drupal::state()->set('module_test.dependency', 'dependency');
     drupal_static_reset('system_rebuild_module_data');
 
-    $result = $this->moduleInstaller()->install(array('color'));
+    $result = $this->moduleInstaller()->install(['color']);
     $this->assertTrue($result, 'ModuleInstaller::install() returns the correct value.');
 
     // Verify that the fake dependency chain was installed.
@@ -132,20 +132,20 @@ class ModuleHandlerTest extends KernelTestBase {
     $this->assertTrue($this->moduleHandler()->moduleExists('color'), 'Module installation with dependencies succeeded.');
 
     // Verify that the modules were enabled in the correct order.
-    $module_order = \Drupal::state()->get('module_test.install_order') ?: array();
-    $this->assertEqual($module_order, array('help', 'config', 'color'));
+    $module_order = \Drupal::state()->get('module_test.install_order') ?: [];
+    $this->assertEqual($module_order, ['help', 'config', 'color']);
 
     // Uninstall all three modules explicitly, but in the incorrect order,
     // and make sure that ModuleInstaller::uninstall() uninstalled them in the
     // correct sequence.
-    $result = $this->moduleInstaller()->uninstall(array('config', 'help', 'color'));
+    $result = $this->moduleInstaller()->uninstall(['config', 'help', 'color']);
     $this->assertTrue($result, 'ModuleInstaller::uninstall() returned TRUE.');
 
-    foreach (array('color', 'config', 'help') as $module) {
+    foreach (['color', 'config', 'help'] as $module) {
       $this->assertEqual(drupal_get_installed_schema_version($module), SCHEMA_UNINSTALLED, "$module module was uninstalled.");
     }
-    $uninstalled_modules = \Drupal::state()->get('module_test.uninstall_order') ?: array();
-    $this->assertEqual($uninstalled_modules, array('color', 'config', 'help'), 'Modules were uninstalled in the correct order.');
+    $uninstalled_modules = \Drupal::state()->get('module_test.uninstall_order') ?: [];
+    $this->assertEqual($uninstalled_modules, ['color', 'config', 'help'], 'Modules were uninstalled in the correct order.');
 
     // Enable Color module again, which should enable both the Config module and
     // Help module. But, this time do it with Config module declaring a
@@ -154,7 +154,7 @@ class ModuleHandlerTest extends KernelTestBase {
     \Drupal::state()->set('module_test.dependency', 'version dependency');
     drupal_static_reset('system_rebuild_module_data');
 
-    $result = $this->moduleInstaller()->install(array('color'));
+    $result = $this->moduleInstaller()->install(['color']);
     $this->assertTrue($result, 'ModuleInstaller::install() returns the correct value.');
 
     // Verify that the fake dependency chain was installed.
@@ -164,14 +164,14 @@ class ModuleHandlerTest extends KernelTestBase {
     $this->assertTrue($this->moduleHandler()->moduleExists('color'), 'Module installation with version dependencies succeeded.');
 
     // Finally, verify that the modules were enabled in the correct order.
-    $enable_order = \Drupal::state()->get('module_test.install_order') ?: array();
-    $this->assertIdentical($enable_order, array('help', 'config', 'color'));
+    $enable_order = \Drupal::state()->get('module_test.install_order') ?: [];
+    $this->assertIdentical($enable_order, ['help', 'config', 'color']);
   }
 
   /**
    * Tests uninstalling a module that is a "dependency" of a profile.
    */
-  function testUninstallProfileDependency() {
+  public function testUninstallProfileDependency() {
     $profile = 'minimal';
     $dependency = 'dblog';
     $this->setSetting('install_profile', $profile);
@@ -180,23 +180,23 @@ class ModuleHandlerTest extends KernelTestBase {
     // yet have any cached way to retrieve its location.
     // @todo Remove as part of https://www.drupal.org/node/2186491
     drupal_get_filename('profile', $profile, 'core/profiles/' . $profile . '/' . $profile . '.info.yml');
-    $this->enableModules(array('module_test', $profile));
+    $this->enableModules(['module_test', $profile]);
 
     drupal_static_reset('system_rebuild_module_data');
     $data = system_rebuild_module_data();
     $this->assertTrue(isset($data[$profile]->requires[$dependency]));
 
-    $this->moduleInstaller()->install(array($dependency));
+    $this->moduleInstaller()->install([$dependency]);
     $this->assertTrue($this->moduleHandler()->moduleExists($dependency));
 
     // Uninstall the profile module "dependency".
-    $result = $this->moduleInstaller()->uninstall(array($dependency));
+    $result = $this->moduleInstaller()->uninstall([$dependency]);
     $this->assertTrue($result, 'ModuleInstaller::uninstall() returns TRUE.');
     $this->assertFalse($this->moduleHandler()->moduleExists($dependency));
     $this->assertEqual(drupal_get_installed_schema_version($dependency), SCHEMA_UNINSTALLED, "$dependency module was uninstalled.");
 
     // Verify that the installation profile itself was not uninstalled.
-    $uninstalled_modules = \Drupal::state()->get('module_test.uninstall_order') ?: array();
+    $uninstalled_modules = \Drupal::state()->get('module_test.uninstall_order') ?: [];
     $this->assertTrue(in_array($dependency, $uninstalled_modules), "$dependency module is in the list of uninstalled modules.");
     $this->assertFalse(in_array($profile, $uninstalled_modules), 'The installation profile is not in the list of uninstalled modules.');
   }
@@ -204,8 +204,8 @@ class ModuleHandlerTest extends KernelTestBase {
   /**
    * Tests uninstalling a module that has content.
    */
-  function testUninstallContentDependency() {
-    $this->enableModules(array('module_test', 'entity_test', 'text', 'user', 'help'));
+  public function testUninstallContentDependency() {
+    $this->enableModules(['module_test', 'entity_test', 'text', 'user', 'help']);
     $this->assertTrue($this->moduleHandler()->moduleExists('entity_test'), 'Test module is enabled.');
     $this->assertTrue($this->moduleHandler()->moduleExists('module_test'), 'Test module is enabled.');
 
@@ -224,13 +224,13 @@ class ModuleHandlerTest extends KernelTestBase {
     drupal_static_reset('system_rebuild_module_data');
 
     // Create an entity so that the modules can not be disabled.
-    $entity = EntityTest::create(array('name' => $this->randomString()));
+    $entity = EntityTest::create(['name' => $this->randomString()]);
     $entity->save();
 
     // Uninstalling entity_test is not possible when there is content.
     try {
       $message = 'ModuleInstaller::uninstall() throws ModuleUninstallValidatorException upon uninstalling a module which does not pass validation.';
-      $this->moduleInstaller()->uninstall(array('entity_test'));
+      $this->moduleInstaller()->uninstall(['entity_test']);
       $this->fail($message);
     }
     catch (ModuleUninstallValidatorException $e) {
@@ -240,7 +240,7 @@ class ModuleHandlerTest extends KernelTestBase {
     // Uninstalling help needs entity_test to be un-installable.
     try {
       $message = 'ModuleInstaller::uninstall() throws ModuleUninstallValidatorException upon uninstalling a module which does not pass validation.';
-      $this->moduleInstaller()->uninstall(array('help'));
+      $this->moduleInstaller()->uninstall(['help']);
       $this->fail($message);
     }
     catch (ModuleUninstallValidatorException $e) {
@@ -250,7 +250,7 @@ class ModuleHandlerTest extends KernelTestBase {
     // Deleting the entity.
     $entity->delete();
 
-    $result = $this->moduleInstaller()->uninstall(array('help'));
+    $result = $this->moduleInstaller()->uninstall(['help']);
     $this->assertTrue($result, 'ModuleInstaller::uninstall() returns TRUE.');
     $this->assertEqual(drupal_get_installed_schema_version('entity_test'), SCHEMA_UNINSTALLED, "entity_test module was uninstalled.");
   }
@@ -258,7 +258,7 @@ class ModuleHandlerTest extends KernelTestBase {
   /**
    * Tests whether the correct module metadata is returned.
    */
-  function testModuleMetaData() {
+  public function testModuleMetaData() {
     // Generate the list of available modules.
     $modules = system_rebuild_module_data();
     // Check that the mtime field exists for the system module.
@@ -289,7 +289,7 @@ class ModuleHandlerTest extends KernelTestBase {
   /**
    * Tests whether the correct theme metadata is returned.
    */
-  function testThemeMetaData() {
+  public function testThemeMetaData() {
     // Generate the list of available themes.
     $themes = \Drupal::service('theme_handler')->rebuildThemeData();
     // Check that the mtime field exists for the bartik theme.
diff --git a/web/core/modules/system/tests/src/Kernel/Form/FormElementLabelTest.php b/web/core/modules/system/tests/src/Kernel/Form/FormElementLabelTest.php
index f93d461bc..2bc895f8a 100644
--- a/web/core/modules/system/tests/src/Kernel/Form/FormElementLabelTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Form/FormElementLabelTest.php
@@ -31,6 +31,16 @@ class FormElementLabelTest extends KernelTestBase {
     $this->render($render_array);
     $elements = $this->xpath($css_selector_converter->toXPath('.kitten'));
     $this->assertCount(1, $elements);
+
+    // Add label attributes to a form element.
+    $render_array = [
+      '#type' => 'textfield',
+      '#label_attributes' => ['class' => ['meow']],
+      '#title' => 'Kitten sounds',
+    ];
+    $this->render($render_array);
+    $elements = $this->xpath($css_selector_converter->toXPath('label.meow'));
+    $this->assertCount(1, $elements);
   }
 
 }
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateDateFormatTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateDateFormatTest.php
index 54aaac277..b45a36050 100644
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateDateFormatTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateDateFormatTest.php
@@ -37,7 +37,7 @@ class MigrateDateFormatTest extends MigrateDrupal6TestBase {
     // Test that we can re-import using the EntityDateFormat destination.
     Database::getConnection('default', 'migrate')
       ->update('variable')
-      ->fields(array('value' => serialize('\S\H\O\R\T d/m/Y - H:i')))
+      ->fields(['value' => serialize('\S\H\O\R\T d/m/Y - H:i')])
       ->condition('name', 'date_format_short')
       ->execute();
 
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateMenuTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateMenuTest.php
index e6ac30c88..51c937789 100644
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateMenuTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateMenuTest.php
@@ -36,14 +36,14 @@ EOT;
     // Test that we can re-import using the ConfigEntityBase destination.
     Database::getConnection('default', 'migrate')
       ->update('menu_custom')
-      ->fields(array('title' => 'Home Navigation'))
+      ->fields(['title' => 'Home Navigation'])
       ->condition('menu_name', 'navigation')
       ->execute();
 
     $migration = $this->getMigration('d6_menu');
     \Drupal::database()
-        ->truncate($migration->getIdMap()->mapTableName())
-        ->execute();
+      ->truncate($migration->getIdMap()->mapTableName())
+      ->execute();
     $this->executeMigration($migration);
 
     $navigation_menu = Menu::load('navigation');
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php
new file mode 100644
index 000000000..c8e800b61
--- /dev/null
+++ b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Migrates various configuration objects owned by the System module.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['action', 'file', 'system'];
+
+  protected $expectedConfig = [
+    'system.cron' => [
+      'threshold' => [
+        'requirements_warning' => 172800,
+        'requirements_error' => 1209600,
+      ],
+      // logging is not handled by the migration.
+      'logging' => 1,
+    ],
+    'system.date' => [
+      // country is not handled by the migration.
+      'country' => [
+        'default' => '',
+      ],
+      'first_day' => 4,
+      // timezone is not handled by the migration.
+      'timezone' => [
+        'default' => 'Europe/Paris',
+        'user' => [
+          'configurable' => FALSE,
+          // warn is not handled by the migration.
+          'warn' => FALSE,
+          // default is not handled by the migration.
+          'default' => 0,
+        ],
+      ],
+    ],
+    'system.file' => [
+      'allow_insecure_uploads' => TRUE,
+      // default_scheme is not handled by the migration.
+      'default_scheme' => 'public',
+      'path' => [
+        'temporary' => 'files/temp',
+      ],
+      // temporary_maximum_age is not handled by the migration.
+      'temporary_maximum_age' => 21600,
+    ],
+    'system.image.gd' => [
+      'jpeg_quality' => 75,
+    ],
+    'system.image' => [
+      'toolkit' => 'gd',
+    ],
+    'system.logging' => [
+      'error_level' => 'some',
+    ],
+    'system.maintenance' => [
+      'message' => 'Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.',
+      // langcode is not handled by the migration.
+      'langcode' => 'en',
+    ],
+    'system.performance' => [
+      'cache' => [
+        'page' => [
+          'max_age' => 0,
+        ],
+      ],
+      'css' => [
+        'preprocess' => FALSE,
+        // gzip is not handled by the migration.
+        'gzip' => TRUE,
+      ],
+      // fast_404 is not handled by the migration.
+      'fast_404' => [
+        'enabled' => TRUE,
+        'paths' => '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i',
+        'exclude_paths' => '/\/(?:styles|imagecache)\//',
+        'html' => '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>',
+      ],
+      'js' => [
+        'preprocess' => FALSE,
+        // gzip is not handled by the migration.
+        'gzip' => TRUE,
+      ],
+      // stale_file_threshold is not handled by the migration.
+      'stale_file_threshold' => 2592000,
+      'response' => [
+        'gzip' => TRUE,
+      ],
+    ],
+    'system.rss' => [
+      // channel is not handled by the migration.
+      'channel' => [
+        'description' => '',
+      ],
+      'items' => [
+        'limit' => 10,
+        'view_mode' => 'title',
+      ],
+      // langcode is not handled by the migration.
+      'langcode' => 'en',
+    ],
+    'system.site' => [
+      // uuid is not handled by the migration.
+      'uuid' => '',
+      'name' => 'site_name',
+      'mail' => 'site_mail@example.com',
+      'slogan' => 'Migrate rocks',
+      'page' => [
+        '403' => '/user',
+        '404' => '/page-not-found',
+        'front' => '/node',
+      ],
+      'admin_compact_mode' => FALSE,
+      'weight_select_max' => 100,
+      // langcode and default_langcode are not handled by the migration.
+      'langcode' => 'en',
+      'default_langcode' => 'en',
+    ],
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $migrations = [
+      'd6_system_cron',
+      'd6_system_date',
+      'd6_system_file',
+      'system_image_gd',
+      'system_image',
+      'system_logging',
+      'system_maintenance',
+      'd6_system_performance',
+      'system_rss',
+      'system_site',
+    ];
+    $this->executeMigrations($migrations);
+  }
+
+  /**
+   * Tests that all expected configuration gets migrated.
+   */
+  public function testConfigurationMigration() {
+    foreach ($this->expectedConfig as $config_id => $values) {
+      $actual = \Drupal::config($config_id)->get();
+      unset($actual['_core']);
+      $this->assertSame($actual, $values, $config_id . ' matches expected values.');
+    }
+  }
+
+}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemCronTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemCronTest.php
deleted file mode 100644
index 0df5df1b3..000000000
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemCronTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Migrate\d6;
-
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade cron variable to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemCronTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_cron');
-  }
-
-  /**
-   * Tests migration of system (cron) variables to system.cron.yml.
-   */
-  public function testSystemCron() {
-    $config = $this->config('system.cron');
-    $this->assertIdentical(172800, $config->get('threshold.requirements_warning'));
-    $this->assertIdentical(1209600, $config->get('threshold.requirements_error'));
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemDateTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemDateTest.php
deleted file mode 100644
index c1d0c719a..000000000
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemDateTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Migrate\d6;
-
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade date time variables to system.date config
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemDateTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_date');
-  }
-
-  /**
-   * Tests migration of user variables to system_date.yml.
-   */
-  public function testSystemDate() {
-    $config = $this->config('system.date');
-    $this->assertIdentical(4, $config->get('first_day'));
-    $this->assertIdentical(FALSE, $config->get('timezone.user.configurable'));
-    $this->assertIdentical("Europe/Paris", $config->get('timezone.default'));
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemFileTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemFileTest.php
deleted file mode 100644
index d96909bf7..000000000
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemFileTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Migrate\d6;
-
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemFileTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_file');
-  }
-
-  /**
-   * Tests migration of system (file) variables to system.file.yml.
-   */
-  public function testSystemFile() {
-    $config = \Drupal::configFactory()->getEditable('system.file');
-    $this->assertIdentical('files/temp', $config->get('path.temporary'));
-    $this->assertIdentical(TRUE, $config->get('allow_insecure_uploads'));
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php
deleted file mode 100644
index 4a3b5a24d..000000000
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Migrate\d6;
-
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade image gd variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemImageGdTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('system_image_gd');
-  }
-
-  /**
-   * Tests migration of system (image GD) variables to system.image.gd.yml.
-   */
-  public function testSystemImageGd() {
-    $config = $this->config('system.image.gd');
-    $this->assertIdentical(75, $config->get('jpeg_quality'));
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php
deleted file mode 100644
index c714ff850..000000000
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Migrate\d6;
-
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade image variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemImageTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('system_image');
-  }
-
-  /**
-   * Tests migration of system (image) variables to system.image.yml.
-   */
-  public function testSystemImage() {
-    $config = $this->config('system.image');
-    $this->assertIdentical('gd', $config->get('toolkit'));
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php
deleted file mode 100644
index f56a7f5c1..000000000
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade error_level variable to system.logging.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemLoggingTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('system_logging');
-  }
-
-  /**
-   * Tests migration of system error_level variables to system.logging.yml.
-   */
-  public function testSystemLogging() {
-    $config = $this->config('system.logging');
-    $this->assertIdentical('some', $config->get('error_level'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'system.logging', $config->get());
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php
deleted file mode 100644
index 72898027e..000000000
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Migrate\d6;
-
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade maintenance variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemMaintenanceTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('system_maintenance');
-  }
-
-  /**
-   * Tests migration of system (maintenance) variables to system.maintenance.yml.
-   */
-  public function testSystemMaintenance() {
-    $config = $this->config('system.maintenance');
-    $this->assertIdentical('Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.', $config->get('message'));
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemPerformanceTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemPerformanceTest.php
deleted file mode 100644
index d341f8389..000000000
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemPerformanceTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Migrate\d6;
-
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade performance variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemPerformanceTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_performance');
-  }
-
-  /**
-   * Tests migration of system (Performance) variables to system.performance.yml.
-   */
-  public function testSystemPerformance() {
-    $config = $this->config('system.performance');
-    $this->assertIdentical(FALSE, $config->get('css.preprocess'));
-    $this->assertIdentical(FALSE, $config->get('js.preprocess'));
-    $this->assertIdentical(0, $config->get('cache.page.max_age'));
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php
deleted file mode 100644
index a22864eb7..000000000
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Migrate\d6;
-
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade rss variable to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemRssTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('system_rss');
-  }
-
-  /**
-   * Tests migration of system (rss) variables to system.rss.yml.
-   */
-  public function testSystemRss() {
-    $config = $this->config('system.rss');
-    $this->assertIdentical(10, $config->get('items.limit'));
-    $this->assertIdentical('title', $config->get('items.view_mode'));
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTest.php
deleted file mode 100644
index a634ddb6f..000000000
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Migrate\d6;
-
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade site variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemSiteTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('system_site');
-  }
-
-  /**
-   * Tests migration of system (site) variables to system.site.yml.
-   */
-  public function testSystemSite() {
-    $config = $this->config('system.site');
-    $this->assertIdentical('site_name', $config->get('name'));
-    $this->assertIdentical('site_mail@example.com', $config->get('mail'));
-    $this->assertIdentical('Migrate rocks', $config->get('slogan'));
-    $this->assertIdentical('/user', $config->get('page.403'));
-    $this->assertIdentical('/page-not-found', $config->get('page.404'));
-    $this->assertIdentical('/node', $config->get('page.front'));
-    $this->assertIdentical(FALSE, $config->get('admin_compact_mode'));
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateMenuTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateMenuTest.php
index 987084539..455be2ad1 100644
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateMenuTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateMenuTest.php
@@ -51,14 +51,14 @@ class MigrateMenuTest extends MigrateDrupal7TestBase {
     // Test that we can re-import using the ConfigEntityBase destination.
     Database::getConnection('default', 'migrate')
       ->update('menu_custom')
-      ->fields(array('title' => 'Home Navigation'))
+      ->fields(['title' => 'Home Navigation'])
       ->condition('menu_name', 'navigation')
       ->execute();
 
     $migration = $this->getMigration('d7_menu');
     \Drupal::database()
-        ->truncate($migration->getIdMap()->mapTableName())
-        ->execute();
+      ->truncate($migration->getIdMap()->mapTableName())
+      ->execute();
     $this->executeMigration($migration);
 
     $navigation_menu = Menu::load('tools');
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
index 59d7b01b8..22e9ba759 100644
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
@@ -24,6 +24,7 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase {
         'requirements_warning' => 172800,
         'requirements_error' => 1209600,
       ],
+      'logging' => 1,
     ],
     'system.date' => [
       'country' => [
diff --git a/web/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php b/web/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
index 8adee9d92..4d1c258b5 100644
--- a/web/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
+++ b/web/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
@@ -57,19 +57,19 @@ class PhpStorageFactoryTest extends KernelTestBase {
     $this->assertTrue($php instanceof MockPhpStorage, 'A MockPhpStorage instance was returned from overridden settings.');
 
     // Test that the name is used for the bin when it is NULL.
-    $this->setSettings('test', array('bin' => NULL));
+    $this->setSettings('test', ['bin' => NULL]);
     $php = PhpStorageFactory::get('test');
     $this->assertTrue($php instanceof MockPhpStorage, 'An MockPhpStorage instance was returned from overridden settings.');
     $this->assertSame('test', $php->getConfigurationValue('bin'), 'Name value was used for bin.');
 
     // Test that a default directory is set if it's empty.
-    $this->setSettings('test', array('directory' => NULL));
+    $this->setSettings('test', ['directory' => NULL]);
     $php = PhpStorageFactory::get('test');
     $this->assertTrue($php instanceof MockPhpStorage, 'An MockPhpStorage instance was returned from overridden settings.');
     $this->assertSame(PublicStream::basePath() . '/php', $php->getConfigurationValue('directory'), 'Default file directory was used.');
 
     // Test that a default storage class is set if it's empty.
-    $this->setSettings('test', array('class' => NULL));
+    $this->setSettings('test', ['class' => NULL]);
     $php = PhpStorageFactory::get('test');
     $this->assertTrue($php instanceof MTimeProtectedFileStorage, 'An MTimeProtectedFileStorage instance was returned from overridden settings with no class.');
 
@@ -79,7 +79,7 @@ class PhpStorageFactoryTest extends KernelTestBase {
     $this->assertNotEquals('mock hash salt', $php->getConfigurationValue('secret'), 'The default secret is not used if a secret is set in the overridden settings.');
 
     // Test that a default secret is set if it's empty.
-    $this->setSettings('test', array('secret' => NULL));
+    $this->setSettings('test', ['secret' => NULL]);
     $php = PhpStorageFactory::get('test');
     $this->assertSame('mock hash salt', $php->getConfigurationValue('secret'), 'The default secret is used if one is not set in the overridden settings.');
   }
@@ -92,13 +92,13 @@ class PhpStorageFactoryTest extends KernelTestBase {
    * @param array $configuration
    *   An array of configuration to set. Will be merged with default values.
    */
-  protected function setSettings($name = 'default', array $configuration = array()) {
-    $settings['php_storage'][$name] = $configuration + array(
+  protected function setSettings($name = 'default', array $configuration = []) {
+    $settings['php_storage'][$name] = $configuration + [
       'class' => 'Drupal\system\PhpStorage\MockPhpStorage',
       'directory' => 'tmp://',
       'secret' => $this->randomString(),
       'bin' => 'test',
-    );
+    ];
     $settings['hash_salt'] = 'mock hash salt';
     new Settings($settings);
   }
diff --git a/web/core/modules/system/tests/src/Kernel/Render/ClassyTest.php b/web/core/modules/system/tests/src/Kernel/Render/ClassyTest.php
index 76cf23ee6..8dbb01e5d 100644
--- a/web/core/modules/system/tests/src/Kernel/Render/ClassyTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Render/ClassyTest.php
@@ -14,7 +14,7 @@ class ClassyTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('system', 'twig_theme_test');
+  public static $modules = ['system', 'twig_theme_test'];
 
   /**
    * {@inheritdoc}
@@ -36,12 +36,12 @@ class ClassyTest extends KernelTestBase {
   /**
    * Test the classy theme.
    */
-  function testClassyTheme() {
+  public function testClassyTheme() {
     drupal_set_message('An error occurred', 'error');
     drupal_set_message('But then something nice happened');
-    $messages = array(
+    $messages = [
       '#type' => 'status_messages',
-    );
+    ];
     $this->render($messages);
     $this->assertNoText('custom-test-messages-class', 'The custom class attribute value added in the status messages preprocess function is not displayed as page content.');
   }
diff --git a/web/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php b/web/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
index 1aa2f667a..cb7f5eb7c 100644
--- a/web/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\system\Kernel\Scripts;
 
 use Drupal\Core\Command\DbCommandBase;
+use Drupal\Core\Database\ConnectionNotDefinedException;
 use Drupal\Core\Database\Database;
 use Drupal\KernelTests\KernelTestBase;
 use Symfony\Component\Console\Input\InputInterface;
@@ -42,8 +43,6 @@ class DbCommandBaseTest extends KernelTestBase {
 
   /**
    * Invalid database names will throw a useful exception.
-   *
-   * @expectedException \Drupal\Core\Database\ConnectionNotDefinedException
    */
   public function testSpecifyDatabaseDoesNotExist() {
     $command = new DbCommandBaseTester();
@@ -51,6 +50,7 @@ class DbCommandBaseTest extends KernelTestBase {
     $command_tester->execute([
       '--database' => 'dne'
     ]);
+    $this->setExpectedException(ConnectionNotDefinedException::class);
     $command->getDatabaseConnection($command_tester->getInput());
   }
 
diff --git a/web/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php b/web/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php
index c90d22663..8a292e502 100644
--- a/web/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php
@@ -51,10 +51,10 @@ class DbImportCommandTest extends KernelTestBase {
    * @requires extension pdo_sqlite
    */
   public function testDbImportCommand() {
-    $connection_info = array(
+    $connection_info = [
       'driver' => 'sqlite',
       'database' => ':memory:',
-    );
+    ];
     Database::addConnectionInfo($this->databasePrefix, 'default', $connection_info);
 
     $command = new DbImportCommand();
diff --git a/web/core/modules/system/tests/src/Kernel/System/CronQueueTest.php b/web/core/modules/system/tests/src/Kernel/System/CronQueueTest.php
index c51ee5a87..649a2c752 100644
--- a/web/core/modules/system/tests/src/Kernel/System/CronQueueTest.php
+++ b/web/core/modules/system/tests/src/Kernel/System/CronQueueTest.php
@@ -55,7 +55,7 @@ class CronQueueTest extends KernelTestBase {
     $queue = $this->container->get('queue')->get('cron_queue_test_exception');
 
     // Enqueue an item for processing.
-    $queue->createItem(array($this->randomMachineName() => $this->randomMachineName()));
+    $queue->createItem([$this->randomMachineName() => $this->randomMachineName()]);
 
     // Run cron; the worker for this queue should throw an exception and handle
     // it.
diff --git a/web/core/modules/system/tests/src/Kernel/System/InfoAlterTest.php b/web/core/modules/system/tests/src/Kernel/System/InfoAlterTest.php
index 8e6f79e01..ebdac3ce0 100644
--- a/web/core/modules/system/tests/src/Kernel/System/InfoAlterTest.php
+++ b/web/core/modules/system/tests/src/Kernel/System/InfoAlterTest.php
@@ -11,7 +11,7 @@ use Drupal\KernelTests\KernelTestBase;
  */
 class InfoAlterTest extends KernelTestBase {
 
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Tests that theme .info.yml data is rebuild after enabling a module.
@@ -20,13 +20,13 @@ class InfoAlterTest extends KernelTestBase {
    * hook_system_info_alter() is enabled. Also tests if core *_list() functions
    * return freshly altered info.
    */
-  function testSystemInfoAlter() {
+  public function testSystemInfoAlter() {
     \Drupal::state()->set('module_required_test.hook_system_info_alter', TRUE);
     $info = system_rebuild_module_data();
     $this->assertFalse(isset($info['node']->info['required']), 'Before the module_required_test is installed the node module is not required.');
 
     // Enable the test module.
-    \Drupal::service('module_installer')->install(array('module_required_test'), FALSE);
+    \Drupal::service('module_installer')->install(['module_required_test'], FALSE);
     $this->assertTrue(\Drupal::moduleHandler()->moduleExists('module_required_test'), 'Test required module is enabled.');
 
     $info = system_rebuild_module_data();
diff --git a/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php b/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
index 040cf1a35..b334e6412 100644
--- a/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
@@ -29,25 +29,25 @@ class TokenReplaceKernelTest extends TokenReplaceKernelTestBase {
    */
   public function testSystemTokenRecognition() {
     // Generate prefixes and suffixes for the token context.
-    $tests = array(
-      array('prefix' => 'this is the ', 'suffix' => ' site'),
-      array('prefix' => 'this is the', 'suffix' => 'site'),
-      array('prefix' => '[', 'suffix' => ']'),
-      array('prefix' => '', 'suffix' => ']]]'),
-      array('prefix' => '[[[', 'suffix' => ''),
-      array('prefix' => ':[:', 'suffix' => '--]'),
-      array('prefix' => '-[-', 'suffix' => ':]:'),
-      array('prefix' => '[:', 'suffix' => ']'),
-      array('prefix' => '[site:', 'suffix' => ':name]'),
-      array('prefix' => '[site:', 'suffix' => ']'),
-    );
+    $tests = [
+      ['prefix' => 'this is the ', 'suffix' => ' site'],
+      ['prefix' => 'this is the', 'suffix' => 'site'],
+      ['prefix' => '[', 'suffix' => ']'],
+      ['prefix' => '', 'suffix' => ']]]'],
+      ['prefix' => '[[[', 'suffix' => ''],
+      ['prefix' => ':[:', 'suffix' => '--]'],
+      ['prefix' => '-[-', 'suffix' => ':]:'],
+      ['prefix' => '[:', 'suffix' => ']'],
+      ['prefix' => '[site:', 'suffix' => ':name]'],
+      ['prefix' => '[site:', 'suffix' => ']'],
+    ];
 
     // Check if the token is recognized in each of the contexts.
     foreach ($tests as $test) {
       $input = $test['prefix'] . '[site:name]' . $test['suffix'];
       $expected = $test['prefix'] . 'Drupal' . $test['suffix'];
-      $output = $this->tokenService->replace($input, array(), array('langcode' => $this->interfaceLanguage->getId()));
-      $this->assertTrue($output == $expected, format_string('Token recognized in string %string', array('%string' => $input)));
+      $output = $this->tokenService->replace($input, [], ['langcode' => $this->interfaceLanguage->getId()]);
+      $this->assertTrue($output == $expected, format_string('Token recognized in string %string', ['%string' => $input]));
     }
 
     // Test token replacement when the string contains no tokens.
@@ -67,12 +67,12 @@ class TokenReplaceKernelTest extends TokenReplaceKernelTestBase {
 
     // Replace with the clear parameter, only the valid token should remain.
     $target = Html::escape($this->config('system.site')->get('name'));
-    $result = $this->tokenService->replace($source, array(), array('langcode' => $this->interfaceLanguage->getId(), 'clear' => TRUE));
+    $result = $this->tokenService->replace($source, [], ['langcode' => $this->interfaceLanguage->getId(), 'clear' => TRUE]);
     $this->assertEqual($target, $result, 'Valid tokens replaced while invalid tokens ignored.');
 
     $target .= '[user:name]';
     $target .= '[bogus:token]';
-    $result = $this->tokenService->replace($source, array(), array('langcode' => $this->interfaceLanguage->getId()));
+    $result = $this->tokenService->replace($source, [], ['langcode' => $this->interfaceLanguage->getId()]);
     $this->assertEqual($target, $result, 'Valid tokens replaced while invalid tokens ignored.');
   }
 
@@ -80,10 +80,10 @@ class TokenReplaceKernelTest extends TokenReplaceKernelTestBase {
    * Tests the generation of all system site information tokens.
    */
   public function testSystemSiteTokenReplacement() {
-    $url_options = array(
+    $url_options = [
       'absolute' => TRUE,
       'language' => $this->interfaceLanguage,
-    );
+    ];
 
     $slogan = '<blink>Slogan</blink>';
     $safe_slogan = Xss::filterAdmin($slogan);
@@ -98,12 +98,12 @@ class TokenReplaceKernelTest extends TokenReplaceKernelTestBase {
 
 
     // Generate and test tokens.
-    $tests = array();
+    $tests = [];
     $tests['[site:name]'] = Html::escape($config->get('name'));
     $tests['[site:slogan]'] = $safe_slogan;
     $tests['[site:mail]'] = $config->get('mail');
     $tests['[site:url]'] = \Drupal::url('<front>', [], $url_options);
-    $tests['[site:url-brief]'] = preg_replace(array('!^https?://!', '!/$!'), '', \Drupal::url('<front>', [], $url_options));
+    $tests['[site:url-brief]'] = preg_replace(['!^https?://!', '!/$!'], '', \Drupal::url('<front>', [], $url_options));
     $tests['[site:login-url]'] = \Drupal::url('user.page', [], $url_options);
 
     $base_bubbleable_metadata = new BubbleableMetadata();
@@ -122,7 +122,7 @@ class TokenReplaceKernelTest extends TokenReplaceKernelTestBase {
 
     foreach ($tests as $input => $expected) {
       $bubbleable_metadata = new BubbleableMetadata();
-      $output = $this->tokenService->replace($input, array(), array('langcode' => $this->interfaceLanguage->getId()), $bubbleable_metadata);
+      $output = $this->tokenService->replace($input, [], ['langcode' => $this->interfaceLanguage->getId()], $bubbleable_metadata);
       $this->assertEqual($output, $expected, new FormattableMarkup('System site information token %token replaced.', ['%token' => $input]));
       $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
@@ -136,21 +136,21 @@ class TokenReplaceKernelTest extends TokenReplaceKernelTestBase {
     $date = REQUEST_TIME - 3600;
 
     // Generate and test tokens.
-    $tests = array();
+    $tests = [];
     $date_formatter = \Drupal::service('date.formatter');
     $tests['[date:short]'] = $date_formatter->format($date, 'short', '', NULL, $this->interfaceLanguage->getId());
     $tests['[date:medium]'] = $date_formatter->format($date, 'medium', '', NULL, $this->interfaceLanguage->getId());
     $tests['[date:long]'] = $date_formatter->format($date, 'long', '', NULL, $this->interfaceLanguage->getId());
     $tests['[date:custom:m/j/Y]'] = $date_formatter->format($date, 'custom', 'm/j/Y', NULL, $this->interfaceLanguage->getId());
-    $tests['[date:since]'] = $date_formatter->formatTimeDiffSince($date, array('langcode' => $this->interfaceLanguage->getId()));
+    $tests['[date:since]'] = $date_formatter->formatTimeDiffSince($date, ['langcode' => $this->interfaceLanguage->getId()]);
     $tests['[date:raw]'] = Xss::filter($date);
 
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
 
     foreach ($tests as $input => $expected) {
-      $output = $this->tokenService->replace($input, array('date' => $date), array('langcode' => $this->interfaceLanguage->getId()));
-      $this->assertEqual($output, $expected, format_string('Date token %token replaced.', array('%token' => $input)));
+      $output = $this->tokenService->replace($input, ['date' => $date], ['langcode' => $this->interfaceLanguage->getId()]);
+      $this->assertEqual($output, $expected, format_string('Date token %token replaced.', ['%token' => $input]));
     }
   }
 
diff --git a/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTestBase.php b/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTestBase.php
index 0e2a3fc61..2c8339060 100644
--- a/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTestBase.php
+++ b/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTestBase.php
@@ -28,12 +28,12 @@ abstract class TokenReplaceKernelTestBase extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   protected function setUp() {
     parent::setUp();
     // Install default system configuration.
-    $this->installConfig(array('system'));
+    $this->installConfig(['system']);
     \Drupal::service('router.builder')->rebuild();
 
     $this->interfaceLanguage = \Drupal::languageManager()->getCurrentLanguage();
diff --git a/web/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php b/web/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
index eb095a780..d1eb8fb90 100644
--- a/web/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
+++ b/web/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
@@ -94,7 +94,7 @@ class PathBasedBreadcrumbBuilderTest extends UnitTestCase {
 
     $this->requestMatcher = $this->getMock('\Symfony\Component\Routing\Matcher\RequestMatcherInterface');
 
-    $config_factory = $this->getConfigFactoryStub(array('system.site' => array('front' => 'test_frontpage')));
+    $config_factory = $this->getConfigFactoryStub(['system.site' => ['front' => 'test_frontpage']]);
 
     $this->pathProcessor = $this->getMock('\Drupal\Core\PathProcessor\InboundPathProcessorInterface');
     $this->context = $this->getMock('\Drupal\Core\Routing\RequestContext');
@@ -182,11 +182,11 @@ class PathBasedBreadcrumbBuilderTest extends UnitTestCase {
       ->method('matchRequest')
       ->will($this->returnCallback(function(Request $request) use ($route_1) {
         if ($request->getPathInfo() == '/example') {
-          return array(
+          return [
             RouteObjectInterface::ROUTE_NAME => 'example',
             RouteObjectInterface::ROUTE_OBJECT => $route_1,
-            '_raw_variables' => new ParameterBag(array()),
-          );
+            '_raw_variables' => new ParameterBag([]),
+          ];
         }
       }));
 
@@ -218,18 +218,18 @@ class PathBasedBreadcrumbBuilderTest extends UnitTestCase {
       ->method('matchRequest')
       ->will($this->returnCallback(function(Request $request) use ($route_1, $route_2) {
         if ($request->getPathInfo() == '/example/bar') {
-          return array(
+          return [
             RouteObjectInterface::ROUTE_NAME => 'example_bar',
             RouteObjectInterface::ROUTE_OBJECT => $route_1,
-            '_raw_variables' => new ParameterBag(array()),
-          );
+            '_raw_variables' => new ParameterBag([]),
+          ];
         }
         elseif ($request->getPathInfo() == '/example') {
-          return array(
+          return [
             RouteObjectInterface::ROUTE_NAME => 'example',
             RouteObjectInterface::ROUTE_OBJECT => $route_2,
-            '_raw_variables' => new ParameterBag(array()),
-          );
+            '_raw_variables' => new ParameterBag([]),
+          ];
         }
       }));
 
@@ -286,11 +286,11 @@ class PathBasedBreadcrumbBuilderTest extends UnitTestCase {
    * @see \Drupal\Tests\system\Unit\Breadcrumbs\PathBasedBreadcrumbBuilderTest::testBuildWithException()
    */
   public function providerTestBuildWithException() {
-    return array(
-      array('Drupal\Core\ParamConverter\ParamNotConvertedException', ''),
-      array('Symfony\Component\Routing\Exception\MethodNotAllowedException', array()),
-      array('Symfony\Component\Routing\Exception\ResourceNotFoundException', ''),
-    );
+    return [
+      ['Drupal\Core\ParamConverter\ParamNotConvertedException', ''],
+      ['Symfony\Component\Routing\Exception\MethodNotAllowedException', []],
+      ['Symfony\Component\Routing\Exception\ResourceNotFoundException', ''],
+    ];
   }
 
   /**
@@ -310,7 +310,7 @@ class PathBasedBreadcrumbBuilderTest extends UnitTestCase {
 
     $this->requestMatcher->expects($this->any())
       ->method('matchRequest')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $breadcrumb = $this->builder->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface'));
 
@@ -348,11 +348,11 @@ class PathBasedBreadcrumbBuilderTest extends UnitTestCase {
       ->method('matchRequest')
       ->will($this->returnCallback(function(Request $request) use ($route_1) {
         if ($request->getPathInfo() == '/user/1') {
-          return array(
+          return [
             RouteObjectInterface::ROUTE_NAME => 'user_page',
             RouteObjectInterface::ROUTE_OBJECT => $route_1,
-            '_raw_variables' => new ParameterBag(array()),
-          );
+            '_raw_variables' => new ParameterBag([]),
+          ];
         }
       }));
 
diff --git a/web/core/modules/system/tests/src/Unit/Installer/InstallTranslationFilePatternTest.php b/web/core/modules/system/tests/src/Unit/Installer/InstallTranslationFilePatternTest.php
index fd2b88495..0dd7510e8 100644
--- a/web/core/modules/system/tests/src/Unit/Installer/InstallTranslationFilePatternTest.php
+++ b/web/core/modules/system/tests/src/Unit/Installer/InstallTranslationFilePatternTest.php
@@ -45,11 +45,11 @@ class InstallTranslationFilePatternTest extends UnitTestCase {
    * @return array
    */
   public function providerValidTranslationFiles() {
-    return array(
-      array('hu', 'drupal-8.0.0-alpha1.hu.po'),
-      array('ta', 'drupal-8.10.10-beta12.ta.po'),
-      array('hi', 'drupal-8.0.0.hi.po'),
-    );
+    return [
+      ['hu', 'drupal-8.0.0-alpha1.hu.po'],
+      ['ta', 'drupal-8.10.10-beta12.ta.po'],
+      ['hi', 'drupal-8.0.0.hi.po'],
+    ];
   }
 
   /**
@@ -64,13 +64,13 @@ class InstallTranslationFilePatternTest extends UnitTestCase {
    * @return array
    */
   public function providerInvalidTranslationFiles() {
-    return array(
-      array('hu', 'drupal-alpha1-*-hu.po'),
-      array('ta', 'drupal-beta12.ta'),
-      array('hi', 'drupal-hi.po'),
-      array('de', 'drupal-dummy-de.po'),
-      array('hu', 'drupal-10.0.1.alpha1-hu.po'),
-    );
+    return [
+      ['hu', 'drupal-alpha1-*-hu.po'],
+      ['ta', 'drupal-beta12.ta'],
+      ['hi', 'drupal-hi.po'],
+      ['de', 'drupal-dummy-de.po'],
+      ['hu', 'drupal-10.0.1.alpha1-hu.po'],
+    ];
   }
 
 }
diff --git a/web/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php b/web/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php
index 9f0afc62f..c632a3e55 100644
--- a/web/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php
+++ b/web/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php
@@ -25,20 +25,20 @@ class SystemLocalTasksTest extends LocalTaskIntegrationTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->directoryList = array(
+    $this->directoryList = [
       'system' => 'core/modules/system',
-    );
+    ];
 
     $this->themeHandler = $this->getMock('Drupal\Core\Extension\ThemeHandlerInterface');
 
     $theme = new Extension($this->root, 'theme', '/core/themes/bartik', 'bartik.info.yml');
     $theme->status = 1;
-    $theme->info = array('name' => 'bartik');
+    $theme->info = ['name' => 'bartik'];
     $this->themeHandler->expects($this->any())
       ->method('listInfo')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         'bartik' => $theme,
-      )));
+      ]));
     $this->themeHandler->expects($this->any())
       ->method('hasUi')
       ->with('bartik')
@@ -59,13 +59,13 @@ class SystemLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function getSystemAdminRoutes() {
-    return array(
-      array('system.admin_content', array(array('system.admin_content'))),
-      array('system.theme_settings_theme', array(
-        array('system.themes_page', 'system.theme_settings'),
-        array('system.theme_settings_global', 'system.theme_settings_theme:bartik'),
-      )),
-    );
+    return [
+      ['system.admin_content', [['system.admin_content']]],
+      ['system.theme_settings_theme', [
+        ['system.themes_page', 'system.theme_settings'],
+        ['system.theme_settings_global', 'system.theme_settings_theme:bartik'],
+      ]],
+    ];
   }
 
 }
diff --git a/web/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php b/web/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
index 90696fda4..689c1782a 100644
--- a/web/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
+++ b/web/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
@@ -53,21 +53,21 @@ class MachineNameControllerTest extends UnitTestCase {
    *     - The expected content of the JSONresponse.
    */
   public function providerTestMachineNameController() {
-    $valid_data = array(
-      array(array('text' => 'Bob', 'langcode' => 'en'), '"Bob"'),
-      array(array('text' => 'Bob', 'langcode' => 'en', 'lowercase' => TRUE), '"bob"'),
-      array(array('text' => 'Bob', 'langcode' => 'en', 'replace' => 'Alice', 'replace_pattern' => 'Bob'), '"Alice"'),
-      array(array('text' => 'Bob', 'langcode' => 'en', 'replace' => 'Alice', 'replace_pattern' => 'Tom'), '"Bob"'),
-      array(array('text' => 'Äwesome', 'langcode' => 'en', 'lowercase' => TRUE), '"awesome"'),
-      array(array('text' => 'Äwesome', 'langcode' => 'de', 'lowercase' => TRUE), '"aewesome"'),
+    $valid_data = [
+      [['text' => 'Bob', 'langcode' => 'en'], '"Bob"'],
+      [['text' => 'Bob', 'langcode' => 'en', 'lowercase' => TRUE], '"bob"'],
+      [['text' => 'Bob', 'langcode' => 'en', 'replace' => 'Alice', 'replace_pattern' => 'Bob'], '"Alice"'],
+      [['text' => 'Bob', 'langcode' => 'en', 'replace' => 'Alice', 'replace_pattern' => 'Tom'], '"Bob"'],
+      [['text' => 'Äwesome', 'langcode' => 'en', 'lowercase' => TRUE], '"awesome"'],
+      [['text' => 'Äwesome', 'langcode' => 'de', 'lowercase' => TRUE], '"aewesome"'],
       // Tests special characters replacement in the input text.
-      array(array('text' => 'B?!"@\/-ob@e', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => '_', 'replace_pattern' => '[^a-z0-9_.]+'), '"b_ob_e"'),
+      [['text' => 'B?!"@\/-ob@e', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => '_', 'replace_pattern' => '[^a-z0-9_.]+'], '"b_ob_e"'],
       // Tests @ character in the replace_pattern regex.
-      array(array('text' => 'Bob@e\0', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => '_', 'replace_pattern' => '[^a-z0-9_.@]+'), '"bob@e_0"'),
+      [['text' => 'Bob@e\0', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => '_', 'replace_pattern' => '[^a-z0-9_.@]+'], '"bob@e_0"'],
       // Tests null byte in the replace_pattern regex.
-      array(array('text' => 'Bob', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => 'fail()', 'replace_pattern' => ".*@e\0"), '"bob"'),
-      array(array('text' => 'Bob@e', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => 'fail()', 'replace_pattern' => ".*@e\0"), '"fail()"'),
-    );
+      [['text' => 'Bob', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => 'fail()', 'replace_pattern' => ".*@e\0"], '"bob"'],
+      [['text' => 'Bob@e', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => 'fail()', 'replace_pattern' => ".*@e\0"], '"fail()"'],
+    ];
 
     $valid_data = array_map(function ($data) {
       if (isset($data[0]['replace_pattern'])) {
diff --git a/web/core/modules/system/tests/themes/engines/nyan_cat/nyan_cat.engine b/web/core/modules/system/tests/themes/engines/nyan_cat/nyan_cat.engine
index 04666dc15..21cf116da 100644
--- a/web/core/modules/system/tests/themes/engines/nyan_cat/nyan_cat.engine
+++ b/web/core/modules/system/tests/themes/engines/nyan_cat/nyan_cat.engine
@@ -21,7 +21,7 @@ function nyan_cat_init(Extension $theme) {
  * Implements hook_theme().
  */
 function nyan_cat_theme($existing, $type, $theme, $path) {
-  $templates = drupal_find_theme_functions($existing, array($theme));
+  $templates = drupal_find_theme_functions($existing, [$theme]);
   $templates += drupal_find_theme_templates($existing, '.nyan-cat.html', $path);
   return $templates;
 }
diff --git a/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.theme b/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.theme
index cd312dbcb..78333a9ab 100644
--- a/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.theme
+++ b/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.theme
@@ -23,7 +23,7 @@ function test_subtheme_views_post_render(ViewExecutable $view, &$output, CachePl
   // We append the function name to the title for test to check for.
   $view->setTitle($view->getTitle() . ":" . __FUNCTION__);
   if ($view->id() == 'test_page_display') {
-    $output['#rows'][0]['#title'] = t('%total_rows items found.', array('%total_rows' => $view->total_rows));
+    $output['#rows'][0]['#title'] = t('%total_rows items found.', ['%total_rows' => $view->total_rows]);
   }
 }
 
diff --git a/web/core/modules/taxonomy/src/Controller/TaxonomyController.php b/web/core/modules/taxonomy/src/Controller/TaxonomyController.php
index 843cdd7a4..27b1ec0c8 100644
--- a/web/core/modules/taxonomy/src/Controller/TaxonomyController.php
+++ b/web/core/modules/taxonomy/src/Controller/TaxonomyController.php
@@ -22,7 +22,7 @@ class TaxonomyController extends ControllerBase {
    *   The taxonomy term add form.
    */
   public function addForm(VocabularyInterface $taxonomy_vocabulary) {
-    $term = $this->entityManager()->getStorage('taxonomy_term')->create(array('vid' => $taxonomy_vocabulary->id()));
+    $term = $this->entityManager()->getStorage('taxonomy_term')->create(['vid' => $taxonomy_vocabulary->id()]);
     return $this->entityFormBuilder()->getForm($term);
   }
 
diff --git a/web/core/modules/taxonomy/src/Entity/Term.php b/web/core/modules/taxonomy/src/Entity/Term.php
index 2e41e2d0f..43e62c612 100644
--- a/web/core/modules/taxonomy/src/Entity/Term.php
+++ b/web/core/modules/taxonomy/src/Entity/Term.php
@@ -61,14 +61,14 @@ class Term extends ContentEntityBase implements TermInterface {
     parent::postDelete($storage, $entities);
 
     // See if any of the term's children are about to be become orphans.
-    $orphans = array();
+    $orphans = [];
     foreach (array_keys($entities) as $tid) {
       if ($children = $storage->loadChildren($tid)) {
         foreach ($children as $child) {
           // If the term has multiple parents, we don't delete it.
           $parents = $storage->loadParents($child->id());
           if (empty($parents)) {
-            $orphans[] = $child->id();
+            $orphans[] = $child;
           }
         }
       }
@@ -79,7 +79,7 @@ class Term extends ContentEntityBase implements TermInterface {
     $storage->deleteTermHierarchy(array_keys($entities));
 
     if (!empty($orphans)) {
-      entity_delete_multiple('taxonomy_term', $orphans);
+      $storage->delete($orphans);
     }
   }
 
@@ -92,7 +92,7 @@ class Term extends ContentEntityBase implements TermInterface {
     // Only change the parents if a value is set, keep the existing values if
     // not.
     if (isset($this->parent->target_id)) {
-      $storage->deleteTermHierarchy(array($this->id()));
+      $storage->deleteTermHierarchy([$this->id()]);
       $storage->updateTermHierarchy($this);
     }
   }
@@ -116,35 +116,33 @@ class Term extends ContentEntityBase implements TermInterface {
 
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))
-      ->setDescription(t('The term name.'))
       ->setTranslatable(TRUE)
       ->setRequired(TRUE)
       ->setSetting('max_length', 255)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'string',
         'weight' => -5,
-      ))
-      ->setDisplayOptions('form', array(
+      ])
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => -5,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['description'] = BaseFieldDefinition::create('text_long')
       ->setLabel(t('Description'))
-      ->setDescription(t('A description of the term.'))
       ->setTranslatable(TRUE)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
         'label' => 'hidden',
         'type' => 'text_default',
         'weight' => 0,
-      ))
+      ])
       ->setDisplayConfigurable('view', TRUE)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'text_textfield',
         'weight' => 0,
-      ))
+      ])
       ->setDisplayConfigurable('form', TRUE);
 
     $fields['weight'] = BaseFieldDefinition::create('integer')
@@ -234,4 +232,17 @@ class Term extends ContentEntityBase implements TermInterface {
     return $this->get('vid')->target_id;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getFieldsToSkipFromTranslationChangesCheck() {
+    // @todo the current implementation of the parent field makes it impossible
+    // for ::hasTranslationChanges() to correctly check the field for changes,
+    // so it is currently skipped from the comparision and has to be fixed by
+    // https://www.drupal.org/node/2843060.
+    $fields = parent::getFieldsToSkipFromTranslationChangesCheck();
+    $fields[] = 'parent';
+    return $fields;
+  }
+
 }
diff --git a/web/core/modules/taxonomy/src/Entity/Vocabulary.php b/web/core/modules/taxonomy/src/Entity/Vocabulary.php
index a2d7eef8a..b0d1ac13d 100644
--- a/web/core/modules/taxonomy/src/Entity/Vocabulary.php
+++ b/web/core/modules/taxonomy/src/Entity/Vocabulary.php
@@ -140,13 +140,13 @@ class Vocabulary extends ConfigEntityBundleBase implements VocabularyInterface {
       return;
     }
 
-    $vocabularies = array();
+    $vocabularies = [];
     foreach ($entities as $vocabulary) {
       $vocabularies[$vocabulary->id()] = $vocabulary->id();
     }
     // Load all Taxonomy module fields and delete those which use only this
     // vocabulary.
-    $field_storages = entity_load_multiple_by_properties('field_storage_config', array('module' => 'taxonomy'));
+    $field_storages = entity_load_multiple_by_properties('field_storage_config', ['module' => 'taxonomy']);
     foreach ($field_storages as $field_storage) {
       $modified_storage = FALSE;
       // Term reference fields may reference terms from more than one
diff --git a/web/core/modules/taxonomy/src/Form/OverviewTerms.php b/web/core/modules/taxonomy/src/Form/OverviewTerms.php
index 4c8cee3fb..0ccb24b49 100644
--- a/web/core/modules/taxonomy/src/Form/OverviewTerms.php
+++ b/web/core/modules/taxonomy/src/Form/OverviewTerms.php
@@ -21,6 +21,13 @@ class OverviewTerms extends FormBase {
    */
   protected $moduleHandler;
 
+  /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface
+   */
+  protected $entityManager;
+
   /**
    * The term storage handler.
    *
@@ -38,6 +45,7 @@ class OverviewTerms extends FormBase {
    */
   public function __construct(ModuleHandlerInterface $module_handler, EntityManagerInterface $entity_manager) {
     $this->moduleHandler = $module_handler;
+    $this->entityManager = $entity_manager;
     $this->storageController = $entity_manager->getStorage('taxonomy_term');
   }
 
@@ -101,10 +109,10 @@ class OverviewTerms extends FormBase {
     $forward_step = 0;
 
     // An array of the terms to be displayed on this page.
-    $current_page = array();
+    $current_page = [];
 
     $delta = 0;
-    $term_deltas = array();
+    $term_deltas = [];
     $tree = $this->storageController->loadTree($taxonomy_vocabulary->id(), 0, NULL, TRUE);
     $tree_index = 0;
     do {
@@ -199,93 +207,94 @@ class OverviewTerms extends FormBase {
     $destination = $this->getDestinationArray();
     $row_position = 0;
     // Build the actual form.
-    $form['terms'] = array(
+    $form['terms'] = [
       '#type' => 'table',
-      '#header' => array($this->t('Name'), $this->t('Weight'), $this->t('Operations')),
-      '#empty' => $this->t('No terms available. <a href=":link">Add term</a>.', array(':link' => $this->url('entity.taxonomy_term.add_form', array('taxonomy_vocabulary' => $taxonomy_vocabulary->id())))),
-      '#attributes' => array(
+      '#header' => [$this->t('Name'), $this->t('Weight'), $this->t('Operations')],
+      '#empty' => $this->t('No terms available. <a href=":link">Add term</a>.', [':link' => $this->url('entity.taxonomy_term.add_form', ['taxonomy_vocabulary' => $taxonomy_vocabulary->id()])]),
+      '#attributes' => [
         'id' => 'taxonomy',
-      ),
-    );
+      ],
+    ];
     foreach ($current_page as $key => $term) {
       /** @var $term \Drupal\Core\Entity\EntityInterface */
+      $term = $this->entityManager->getTranslationFromContext($term);
       $form['terms'][$key]['#term'] = $term;
-      $indentation = array();
+      $indentation = [];
       if (isset($term->depth) && $term->depth > 0) {
-        $indentation = array(
+        $indentation = [
           '#theme' => 'indentation',
           '#size' => $term->depth,
-        );
+        ];
       }
-      $form['terms'][$key]['term'] = array(
+      $form['terms'][$key]['term'] = [
         '#prefix' => !empty($indentation) ? drupal_render($indentation) : '',
         '#type' => 'link',
         '#title' => $term->getName(),
         '#url' => $term->urlInfo(),
-      );
+      ];
       if ($taxonomy_vocabulary->getHierarchy() != VocabularyInterface::HIERARCHY_MULTIPLE && count($tree) > 1) {
         $parent_fields = TRUE;
-        $form['terms'][$key]['term']['tid'] = array(
+        $form['terms'][$key]['term']['tid'] = [
           '#type' => 'hidden',
           '#value' => $term->id(),
-          '#attributes' => array(
-            'class' => array('term-id'),
-          ),
-        );
-        $form['terms'][$key]['term']['parent'] = array(
+          '#attributes' => [
+            'class' => ['term-id'],
+          ],
+        ];
+        $form['terms'][$key]['term']['parent'] = [
           '#type' => 'hidden',
           // Yes, default_value on a hidden. It needs to be changeable by the
           // javascript.
           '#default_value' => $term->parents[0],
-          '#attributes' => array(
-            'class' => array('term-parent'),
-          ),
-        );
-        $form['terms'][$key]['term']['depth'] = array(
+          '#attributes' => [
+            'class' => ['term-parent'],
+          ],
+        ];
+        $form['terms'][$key]['term']['depth'] = [
           '#type' => 'hidden',
           // Same as above, the depth is modified by javascript, so it's a
           // default_value.
           '#default_value' => $term->depth,
-          '#attributes' => array(
-            'class' => array('term-depth'),
-          ),
-        );
+          '#attributes' => [
+            'class' => ['term-depth'],
+          ],
+        ];
       }
-      $form['terms'][$key]['weight'] = array(
+      $form['terms'][$key]['weight'] = [
         '#type' => 'weight',
         '#delta' => $delta,
         '#title' => $this->t('Weight for added term'),
         '#title_display' => 'invisible',
         '#default_value' => $term->getWeight(),
-        '#attributes' => array(
-          'class' => array('term-weight'),
-        ),
-      );
-      $operations = array(
-        'edit' => array(
+        '#attributes' => [
+          'class' => ['term-weight'],
+        ],
+      ];
+      $operations = [
+        'edit' => [
           'title' => $this->t('Edit'),
           'query' => $destination,
           'url' => $term->urlInfo('edit-form'),
-        ),
-        'delete' => array(
+        ],
+        'delete' => [
           'title' => $this->t('Delete'),
           'query' => $destination,
           'url' => $term->urlInfo('delete-form'),
-        ),
-      );
+        ],
+      ];
       if ($this->moduleHandler->moduleExists('content_translation') && content_translation_translate_access($term)->isAllowed()) {
-        $operations['translate'] = array(
+        $operations['translate'] = [
           'title' => $this->t('Translate'),
           'query' => $destination,
           'url' => $term->urlInfo('drupal:content-translation-overview'),
-        );
+        ];
       }
-      $form['terms'][$key]['operations'] = array(
+      $form['terms'][$key]['operations'] = [
         '#type' => 'operations',
         '#links' => $operations,
-      );
+      ];
 
-      $form['terms'][$key]['#attributes']['class'] = array();
+      $form['terms'][$key]['#attributes']['class'] = [];
       if ($parent_fields) {
         $form['terms'][$key]['#attributes']['class'][] = 'draggable';
       }
@@ -314,44 +323,44 @@ class OverviewTerms extends FormBase {
     }
 
     if ($parent_fields) {
-      $form['terms']['#tabledrag'][] = array(
+      $form['terms']['#tabledrag'][] = [
         'action' => 'match',
         'relationship' => 'parent',
         'group' => 'term-parent',
         'subgroup' => 'term-parent',
         'source' => 'term-id',
         'hidden' => FALSE,
-      );
-      $form['terms']['#tabledrag'][] = array(
+      ];
+      $form['terms']['#tabledrag'][] = [
         'action' => 'depth',
         'relationship' => 'group',
         'group' => 'term-depth',
         'hidden' => FALSE,
-      );
+      ];
       $form['terms']['#attached']['library'][] = 'taxonomy/drupal.taxonomy';
       $form['terms']['#attached']['drupalSettings']['taxonomy'] = [
         'backStep' => $back_step,
         'forwardStep' => $forward_step,
       ];
     }
-    $form['terms']['#tabledrag'][] = array(
+    $form['terms']['#tabledrag'][] = [
       'action' => 'order',
       'relationship' => 'sibling',
       'group' => 'term-weight',
-    );
+    ];
 
     if ($taxonomy_vocabulary->getHierarchy() != VocabularyInterface::HIERARCHY_MULTIPLE && count($tree) > 1) {
-      $form['actions'] = array('#type' => 'actions', '#tree' => FALSE);
-      $form['actions']['submit'] = array(
+      $form['actions'] = ['#type' => 'actions', '#tree' => FALSE];
+      $form['actions']['submit'] = [
         '#type' => 'submit',
         '#value' => $this->t('Save'),
         '#button_type' => 'primary',
-      );
-      $form['actions']['reset_alphabetical'] = array(
+      ];
+      $form['actions']['reset_alphabetical'] = [
         '#type' => 'submit',
-        '#submit' => array('::submitReset'),
+        '#submit' => ['::submitReset'],
         '#value' => $this->t('Reset to alphabetical'),
-      );
+      ];
     }
 
     $form['pager_pager'] = ['#type' => 'pager'];
@@ -378,13 +387,13 @@ class OverviewTerms extends FormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     // Sort term order based on weight.
-    uasort($form_state->getValue('terms'), array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
+    uasort($form_state->getValue('terms'), ['Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
 
     $vocabulary = $form_state->get(['taxonomy', 'vocabulary']);
     // Update the current hierarchy type as we go.
     $hierarchy = VocabularyInterface::HIERARCHY_DISABLED;
 
-    $changed_terms = array();
+    $changed_terms = [];
     $tree = $this->storageController->loadTree($vocabulary->id(), 0, NULL, TRUE);
 
     if (empty($tree)) {
@@ -405,7 +414,7 @@ class OverviewTerms extends FormBase {
     }
 
     // Renumber the current page weights and assign any new parents.
-    $level_weights = array();
+    $level_weights = [];
     foreach ($form_state->getValue('terms') as $tid => $values) {
       if (isset($form['terms'][$tid]['#term'])) {
         $term = $form['terms'][$tid]['#term'];
diff --git a/web/core/modules/taxonomy/src/Form/TermDeleteForm.php b/web/core/modules/taxonomy/src/Form/TermDeleteForm.php
index 22ab19b06..0e97ff64a 100644
--- a/web/core/modules/taxonomy/src/Form/TermDeleteForm.php
+++ b/web/core/modules/taxonomy/src/Form/TermDeleteForm.php
@@ -38,7 +38,7 @@ class TermDeleteForm extends ContentEntityDeleteForm {
    * {@inheritdoc}
    */
   protected function getDeletionMessage() {
-    return $this->t('Deleted term %name.', array('%name' => $this->entity->label()));
+    return $this->t('Deleted term %name.', ['%name' => $this->entity->label()]);
   }
 
   /**
@@ -54,7 +54,7 @@ class TermDeleteForm extends ContentEntityDeleteForm {
       $vocabulary = $storage->load($this->entity->bundle());
 
       // @todo Move to storage http://drupal.org/node/1988712
-      taxonomy_check_vocabulary_hierarchy($vocabulary, array('tid' => $term->id()));
+      taxonomy_check_vocabulary_hierarchy($vocabulary, ['tid' => $term->id()]);
     }
   }
 
diff --git a/web/core/modules/taxonomy/src/Form/VocabularyDeleteForm.php b/web/core/modules/taxonomy/src/Form/VocabularyDeleteForm.php
index bada5d6ea..7c91b7868 100644
--- a/web/core/modules/taxonomy/src/Form/VocabularyDeleteForm.php
+++ b/web/core/modules/taxonomy/src/Form/VocabularyDeleteForm.php
@@ -20,7 +20,7 @@ class VocabularyDeleteForm extends EntityDeleteForm {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete the vocabulary %title?', array('%title' => $this->entity->label()));
+    return $this->t('Are you sure you want to delete the vocabulary %title?', ['%title' => $this->entity->label()]);
   }
 
   /**
@@ -34,7 +34,7 @@ class VocabularyDeleteForm extends EntityDeleteForm {
    * {@inheritdoc}
    */
   protected function getDeletionMessage() {
-    return $this->t('Deleted vocabulary %name.', array('%name' => $this->entity->label()));
+    return $this->t('Deleted vocabulary %name.', ['%name' => $this->entity->label()]);
   }
 
 }
diff --git a/web/core/modules/taxonomy/src/Form/VocabularyResetForm.php b/web/core/modules/taxonomy/src/Form/VocabularyResetForm.php
index fb33e358e..e036ff917 100644
--- a/web/core/modules/taxonomy/src/Form/VocabularyResetForm.php
+++ b/web/core/modules/taxonomy/src/Form/VocabularyResetForm.php
@@ -49,7 +49,7 @@ class VocabularyResetForm extends EntityConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to reset the vocabulary %title to alphabetical order?', array('%title' => $this->entity->label()));
+    return $this->t('Are you sure you want to reset the vocabulary %title to alphabetical order?', ['%title' => $this->entity->label()]);
   }
 
   /**
@@ -80,8 +80,8 @@ class VocabularyResetForm extends EntityConfirmFormBase {
     parent::submitForm($form, $form_state);
     $this->termStorage->resetWeights($this->entity->id());
 
-    drupal_set_message($this->t('Reset vocabulary %name to alphabetical order.', array('%name' => $this->entity->label())));
-    $this->logger('taxonomy')->notice('Reset vocabulary %name to alphabetical order.', array('%name' => $this->entity->label()));
+    drupal_set_message($this->t('Reset vocabulary %name to alphabetical order.', ['%name' => $this->entity->label()]));
+    $this->logger('taxonomy')->notice('Reset vocabulary %name to alphabetical order.', ['%name' => $this->entity->label()]);
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
 
diff --git a/web/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php b/web/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
index 7dd4aa2d6..b8f4d14fb 100644
--- a/web/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
+++ b/web/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
@@ -53,7 +53,7 @@ class TermSelection extends DefaultSelection {
       return parent::getReferenceableEntities($match, $match_operator, $limit);
     }
 
-    $options = array();
+    $options = [];
 
     $bundles = $this->entityManager->getBundleInfo('taxonomy_term');
     $handler_settings = $this->configuration['handler_settings'];
diff --git a/web/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php b/web/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php
index 11e832579..0d0d9170b 100644
--- a/web/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php
+++ b/web/core/modules/taxonomy/src/Plugin/Field/FieldFormatter/EntityReferenceTaxonomyTermRssFormatter.php
@@ -25,16 +25,16 @@ class EntityReferenceTaxonomyTermRssFormatter extends EntityReferenceFormatterBa
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
     $parent_entity = $items->getEntity();
-    $elements = array();
+    $elements = [];
 
     foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) {
-      $parent_entity->rss_elements[] = array(
+      $parent_entity->rss_elements[] = [
         'key' => 'category',
         'value' => $entity->label(),
-        'attributes' => array(
-          'domain' => $entity->id() ? \Drupal::url('entity.taxonomy_term.canonical', ['taxonomy_term' => $entity->id()], array('absolute' => TRUE)) : '',
-        ),
-      );
+        'attributes' => [
+          'domain' => $entity->id() ? \Drupal::url('entity.taxonomy_term.canonical', ['taxonomy_term' => $entity->id()], ['absolute' => TRUE]) : '',
+        ],
+      ];
     }
 
     return $elements;
diff --git a/web/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php b/web/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
index 22280ec6c..b66a5cfa8 100644
--- a/web/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
+++ b/web/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
@@ -7,7 +7,6 @@ use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\Plugin\MigrationDeriverTrait;
 use Drupal\migrate_drupal\Plugin\MigrateCckFieldPluginManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -84,8 +83,19 @@ class D7TaxonomyTermDeriver extends DeriverBase implements ContainerDeriverInter
       // we'll create a migration just for the node properties.
     }
 
+    $vocabulary_source_plugin = static::getSourcePlugin('d7_taxonomy_vocabulary');
     try {
-      foreach (static::getSourcePlugin('d7_taxonomy_vocabulary') as $row) {
+      $vocabulary_source_plugin->checkRequirements();
+    }
+    catch (RequirementsException $e) {
+      // If the d7_taxonomy_vocabulary requirements failed, that means we do not
+      // have a Drupal source database configured - there is nothing to
+      // generate.
+      return $this->derivatives;
+    }
+
+    try {
+      foreach ($vocabulary_source_plugin as $row) {
         $bundle = $row->getSourceProperty('machine_name');
         $values = $base_plugin_definition;
 
diff --git a/web/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php b/web/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
index c3035c431..2d4e719d3 100644
--- a/web/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
+++ b/web/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
@@ -20,20 +20,20 @@ class TaxonomyTermReference extends CckFieldPluginBase {
    * {@inheritdoc}
    */
   public function getFieldFormatterMap() {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) {
-    $process = array(
+    $process = [
       'plugin' => 'iterator',
       'source' => $field_name,
-      'process' => array(
+      'process' => [
         'target_id' => 'tid',
-      ),
-    );
+      ],
+    ];
     $migration->setProcessOfProperty($field_name, $process);
   }
 
diff --git a/web/core/modules/taxonomy/src/Plugin/migrate/source/Term.php b/web/core/modules/taxonomy/src/Plugin/migrate/source/Term.php
index ce468a29d..545d205ba 100644
--- a/web/core/modules/taxonomy/src/Plugin/migrate/source/Term.php
+++ b/web/core/modules/taxonomy/src/Plugin/migrate/source/Term.php
@@ -64,14 +64,14 @@ class Term extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    $fields = array(
+    $fields = [
       'tid' => $this->t('The term ID.'),
       'vid' => $this->t('Existing term VID'),
       'name' => $this->t('The name of the term.'),
       'description' => $this->t('The term description.'),
       'weight' => $this->t('Weight'),
       'parent' => $this->t("The Drupal term IDs of the term's parents."),
-    );
+    ];
     if ($this->getModuleSchemaVersion('taxonomy') >= 7000) {
       $fields['format'] = $this->t('Format of the term description.');
     }
@@ -84,7 +84,7 @@ class Term extends DrupalSqlBase {
   public function prepareRow(Row $row) {
     // Find parents for this row.
     $parents = $this->select($this->termHierarchyTable, 'th')
-      ->fields('th', array('parent', 'tid'))
+      ->fields('th', ['parent', 'tid'])
       ->condition('tid', $row->getSourceProperty('tid'))
       ->execute()
       ->fetchCol();
diff --git a/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php b/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php
index 2635aaa70..2b1c806f2 100644
--- a/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php
+++ b/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php
@@ -26,10 +26,10 @@ class TermNode extends DrupalSqlBase {
   public function query() {
     $query = $this->select('term_node', 'tn')
       ->distinct()
-      ->fields('tn', array('nid', 'vid'))
-      ->fields('n', array('type'));
+      ->fields('tn', ['nid', 'vid'])
+      ->fields('n', ['type']);
     // Because this is an inner join it enforces the current revision.
-    $query->innerJoin('term_data', 'td', 'td.tid = tn.tid AND td.vid = :vid', array(':vid' => $this->configuration['vid']));
+    $query->innerJoin('term_data', 'td', 'td.tid = tn.tid AND td.vid = :vid', [':vid' => $this->configuration['vid']]);
     $query->innerJoin('node', 'n', static::JOIN);
     return $query;
   }
@@ -38,11 +38,11 @@ class TermNode extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'nid' => $this->t('The node revision ID.'),
       'vid' => $this->t('The node revision ID.'),
       'tid' => $this->t('The term ID.'),
-    );
+    ];
   }
 
   /**
@@ -51,10 +51,10 @@ class TermNode extends DrupalSqlBase {
   public function prepareRow(Row $row) {
     // Select the terms belonging to the revision selected.
     $query = $this->select('term_node', 'tn')
-      ->fields('tn', array('tid'))
+      ->fields('tn', ['tid'])
       ->condition('n.nid', $row->getSourceProperty('nid'));
     $query->join('node', 'n', static::JOIN);
-    $query->innerJoin('term_data', 'td', 'td.tid = tn.tid AND td.vid = :vid', array(':vid' => $this->configuration['vid']));
+    $query->innerJoin('term_data', 'td', 'td.tid = tn.tid AND td.vid = :vid', [':vid' => $this->configuration['vid']]);
     $row->setSourceProperty('tid', $query->execute()->fetchCol());
     return parent::prepareRow($row);
   }
diff --git a/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php b/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php
index 257303388..714fa9331 100644
--- a/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php
+++ b/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php
@@ -21,7 +21,7 @@ class Vocabulary extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('vocabulary', 'v')
-      ->fields('v', array(
+      ->fields('v', [
         'vid',
         'name',
         'description',
@@ -33,7 +33,7 @@ class Vocabulary extends DrupalSqlBase {
         'tags',
         'module',
         'weight',
-      ));
+      ]);
     return $query;
   }
 
@@ -41,7 +41,7 @@ class Vocabulary extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'vid' => $this->t('The vocabulary ID.'),
       'name' => $this->t('The name of the vocabulary.'),
       'description' => $this->t('The description of the vocabulary.'),
@@ -54,7 +54,7 @@ class Vocabulary extends DrupalSqlBase {
       'weight' => $this->t('The weight of the vocabulary in relation to other vocabularies.'),
       'parents' => $this->t("The Drupal term IDs of the term's parents."),
       'node_types' => $this->t('The names of the node types the vocabulary may be used with.'),
-    );
+    ];
   }
 
   /**
@@ -63,7 +63,7 @@ class Vocabulary extends DrupalSqlBase {
   public function prepareRow(Row $row) {
     // Find node types for this row.
     $node_types = $this->select('vocabulary_node_types', 'nt')
-      ->fields('nt', array('type', 'vid'))
+      ->fields('nt', ['type', 'vid'])
       ->condition('vid', $row->getSourceProperty('vid'))
       ->execute()
       ->fetchCol();
diff --git a/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php b/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php
index ac7a2fe1c..40a0094af 100644
--- a/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php
+++ b/web/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php
@@ -18,7 +18,7 @@ class VocabularyPerType extends Vocabulary {
   public function query() {
     $query = parent::query();
     $query->join('vocabulary_node_types', 'nt', 'v.vid = nt.vid');
-    $query->fields('nt', array('type'));
+    $query->fields('nt', ['type']);
     return $query;
   }
 
diff --git a/web/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php b/web/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php
index e9eb4aa44..31103a8be 100644
--- a/web/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php
+++ b/web/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php
@@ -19,7 +19,7 @@ class Vocabulary extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('taxonomy_vocabulary', 'v')
-      ->fields('v', array(
+      ->fields('v', [
         'vid',
         'name',
         'description',
@@ -27,7 +27,7 @@ class Vocabulary extends DrupalSqlBase {
         'module',
         'weight',
         'machine_name',
-      ));
+      ]);
     return $query;
   }
 
@@ -35,7 +35,7 @@ class Vocabulary extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'vid' => $this->t('The vocabulary ID.'),
       'name' => $this->t('The name of the vocabulary.'),
       'description' => $this->t('The description of the vocabulary.'),
@@ -43,7 +43,7 @@ class Vocabulary extends DrupalSqlBase {
       'module' => $this->t('Module responsible for the vocabulary.'),
       'weight' => $this->t('The weight of the vocabulary in relation to other vocabularies.'),
       'machine_name' => $this->t('Unique machine name of the vocabulary.')
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php b/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php
index 8ab40e3e6..8d1854533 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTid.php
@@ -15,7 +15,7 @@ use Drupal\views\Plugin\views\argument\ManyToOne;
 class IndexTid extends ManyToOne {
 
   public function titleQuery() {
-    $titles = array();
+    $titles = [];
     $terms = Term::loadMultiple($this->value);
     foreach ($terms as $term) {
       $titles[] = \Drupal::entityManager()->getTranslationFromContext($term)->label();
diff --git a/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php b/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
index 68847168f..6933e7456 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
@@ -44,27 +44,27 @@ class IndexTidDepth extends ArgumentPluginBase implements ContainerFactoryPlugin
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['depth'] = array('default' => 0);
-    $options['break_phrase'] = array('default' => FALSE);
-    $options['use_taxonomy_term_path'] = array('default' => FALSE);
+    $options['depth'] = ['default' => 0];
+    $options['break_phrase'] = ['default' => FALSE];
+    $options['use_taxonomy_term_path'] = ['default' => FALSE];
 
     return $options;
   }
 
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['depth'] = array(
+    $form['depth'] = [
       '#type' => 'weight',
       '#title' => $this->t('Depth'),
       '#default_value' => $this->options['depth'],
       '#description' => $this->t('The depth will match nodes tagged with terms in the hierarchy. For example, if you have the term "fruit" and a child term "apple", with a depth of 1 (or higher) then filtering for the term "fruit" will get nodes that are tagged with "apple" as well as "fruit". If negative, the reverse is true; searching for "apple" will also pick up nodes tagged with "fruit" if depth is -1 (or lower).'),
-    );
+    ];
 
-    $form['break_phrase'] = array(
+    $form['break_phrase'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow multiple values'),
       '#description' => $this->t('If selected, users can enter multiple values in the form of 1+2+3. Due to the number of JOINs it would require, AND will be treated as OR with this filter.'),
       '#default_value' => !empty($this->options['break_phrase']),
-    );
+    ];
 
     parent::buildOptionsForm($form, $form_state);
   }
@@ -74,7 +74,7 @@ class IndexTidDepth extends ArgumentPluginBase implements ContainerFactoryPlugin
    */
   protected function defaultActions($which = NULL) {
     if ($which) {
-      if (in_array($which, array('ignore', 'not found', 'empty', 'default'))) {
+      if (in_array($which, ['ignore', 'not found', 'empty', 'default'])) {
         return parent::defaultActions($which);
       }
       return;
@@ -92,7 +92,7 @@ class IndexTidDepth extends ArgumentPluginBase implements ContainerFactoryPlugin
 
     if (!empty($this->options['break_phrase'])) {
       $break = static::breakString($this->argument);
-      if ($break->value === array(-1)) {
+      if ($break->value === [-1]) {
         return FALSE;
       }
 
@@ -130,7 +130,7 @@ class IndexTidDepth extends ArgumentPluginBase implements ContainerFactoryPlugin
     $this->query->addWhere(0, "$this->tableAlias.$this->realField", $subquery, 'IN');
   }
 
-  function title() {
+  public function title() {
     $term = $this->termStorage->load($this->argument);
     if (!empty($term)) {
       return $term->getName();
diff --git a/web/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php b/web/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
index 38e64c732..25efbf35c 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/argument/Taxonomy.php
@@ -45,7 +45,7 @@ class Taxonomy extends NumericArgument implements ContainerFactoryPluginInterfac
   /**
    * Override the behavior of title(). Get the title of the node.
    */
-  function title() {
+  public function title() {
     // There might be no valid argument.
     if ($this->argument) {
       $term = $this->termStorage->load($this->argument);
diff --git a/web/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php b/web/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
index 9432c7c73..d2fe82072 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/argument/VocabularyVid.php
@@ -54,7 +54,7 @@ class VocabularyVid extends NumericArgument {
   /**
    * Override the behavior of title(). Get the name of the vocabulary.
    */
-  function title() {
+  public function title() {
     $vocabulary = $this->vocabularyStorage->load($this->argument);
     if ($vocabulary) {
       return $vocabulary->label();
diff --git a/web/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php b/web/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
index 513ed7e78..95e5b1ef8 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/argument_default/Tid.php
@@ -96,11 +96,11 @@ class Tid extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['term_page'] = array('default' => TRUE);
-    $options['node'] = array('default' => FALSE);
-    $options['anyall'] = array('default' => ',');
-    $options['limit'] = array('default' => FALSE);
-    $options['vids'] = array('default' => array());
+    $options['term_page'] = ['default' => TRUE];
+    $options['node'] = ['default' => FALSE];
+    $options['anyall'] = ['default' => ','];
+    $options['limit'] = ['default' => FALSE];
+    $options['vids'] = ['default' => []];
 
     return $options;
   }
@@ -109,67 +109,67 @@ class Tid extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['term_page'] = array(
+    $form['term_page'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Load default filter from term page'),
       '#default_value' => $this->options['term_page'],
-    );
-    $form['node'] = array(
+    ];
+    $form['node'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Load default filter from node page, that\'s good for related taxonomy blocks'),
       '#default_value' => $this->options['node'],
-    );
+    ];
 
-    $form['limit'] = array(
+    $form['limit'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Limit terms by vocabulary'),
       '#default_value' => $this->options['limit'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[argument_default][taxonomy_tid][node]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[argument_default][taxonomy_tid][node]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
-    $options = array();
+    $options = [];
     $vocabularies = $this->vocabularyStorage->loadMultiple();
     foreach ($vocabularies as $voc) {
       $options[$voc->id()] = $voc->label();
     }
 
-    $form['vids'] = array(
+    $form['vids'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Vocabularies'),
       '#options' => $options,
       '#default_value' => $this->options['vids'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[argument_default][taxonomy_tid][limit]"]' => array('checked' => TRUE),
-          ':input[name="options[argument_default][taxonomy_tid][node]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[argument_default][taxonomy_tid][limit]"]' => ['checked' => TRUE],
+          ':input[name="options[argument_default][taxonomy_tid][node]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
-    $form['anyall'] = array(
+    $form['anyall'] = [
       '#type' => 'radios',
       '#title' => $this->t('Multiple-value handling'),
       '#default_value' => $this->options['anyall'],
-      '#options' => array(
+      '#options' => [
         ',' => $this->t('Filter to items that share all terms'),
         '+' => $this->t('Filter to items that share any term'),
-      ),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[argument_default][taxonomy_tid][node]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      ],
+      '#states' => [
+        'visible' => [
+          ':input[name="options[argument_default][taxonomy_tid][node]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = array()) {
+  public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = []) {
     // Filter unselected items so we don't unnecessarily store giant arrays.
     $options['vids'] = array_filter($options['vids']);
   }
@@ -188,7 +188,7 @@ class Tid extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
     if (!empty($this->options['node'])) {
       // Just check, if a node could be detected.
       if (($node = $this->routeMatch->getParameter('node')) && $node instanceof NodeInterface) {
-        $taxonomy = array();
+        $taxonomy = [];
         foreach ($node->getFieldDefinitions() as $field) {
           if ($field->getType() == 'entity_reference' && $field->getSetting('target_type') == 'taxonomy_term') {
             $taxonomy_terms = $node->{$field->getName()}->referencedEntities();
@@ -199,7 +199,7 @@ class Tid extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
           }
         }
         if (!empty($this->options['limit'])) {
-          $tids = array();
+          $tids = [];
           // filter by vocabulary
           foreach ($taxonomy as $tid => $vocab) {
             if (!empty($this->options['vids'][$vocab])) {
diff --git a/web/core/modules/taxonomy/src/Plugin/views/argument_validator/TermName.php b/web/core/modules/taxonomy/src/Plugin/views/argument_validator/TermName.php
index eb30ff5fe..ac7bad0fa 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/argument_validator/TermName.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/argument_validator/TermName.php
@@ -39,7 +39,7 @@ class TermName extends Entity {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['transform'] = array('default' => FALSE);
+    $options['transform'] = ['default' => FALSE];
 
     return $options;
   }
@@ -50,11 +50,11 @@ class TermName extends Entity {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['transform'] = array(
+    $form['transform'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Transform dashes in URL to spaces in term name filter values'),
       '#default_value' => $this->options['transform'],
-    );
+    ];
   }
 
   /**
@@ -64,7 +64,7 @@ class TermName extends Entity {
     if ($this->options['transform']) {
       $argument = str_replace('-', ' ', $argument);
     }
-    $terms = $this->termStorage->loadByProperties(array('name' => $argument));
+    $terms = $this->termStorage->loadByProperties(['name' => $argument]);
 
     if (!$terms) {
       // Returned empty array no terms with the name.
diff --git a/web/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php b/web/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
index 86a4fce21..e0b9a3221 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
@@ -62,19 +62,19 @@ class TaxonomyIndexTid extends PrerenderList {
 
     // @todo: Wouldn't it be possible to use $this->base_table and no if here?
     if ($view->storage->get('base_table') == 'node_field_revision') {
-      $this->additional_fields['nid'] = array('table' => 'node_field_revision', 'field' => 'nid');
+      $this->additional_fields['nid'] = ['table' => 'node_field_revision', 'field' => 'nid'];
     }
     else {
-      $this->additional_fields['nid'] = array('table' => 'node_field_data', 'field' => 'nid');
+      $this->additional_fields['nid'] = ['table' => 'node_field_data', 'field' => 'nid'];
     }
   }
 
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['link_to_taxonomy'] = array('default' => TRUE);
-    $options['limit'] = array('default' => FALSE);
-    $options['vids'] = array('default' => array());
+    $options['link_to_taxonomy'] = ['default' => TRUE];
+    $options['limit'] = ['default' => FALSE];
+    $options['vids'] = ['default' => []];
 
     return $options;
   }
@@ -83,36 +83,36 @@ class TaxonomyIndexTid extends PrerenderList {
    * Provide "link to term" option.
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['link_to_taxonomy'] = array(
+    $form['link_to_taxonomy'] = [
       '#title' => $this->t('Link this field to its term page'),
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['link_to_taxonomy']),
-    );
+    ];
 
-    $form['limit'] = array(
+    $form['limit'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Limit terms by vocabulary'),
       '#default_value' => $this->options['limit'],
-    );
+    ];
 
-    $options = array();
+    $options = [];
     $vocabularies = $this->vocabularyStorage->loadMultiple();
     foreach ($vocabularies as $voc) {
       $options[$voc->id()] = $voc->label();
     }
 
-    $form['vids'] = array(
+    $form['vids'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Vocabularies'),
       '#options' => $options,
       '#default_value' => $this->options['vids'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[limit]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[limit]"]' => ['checked' => TRUE],
+        ],
+      ],
 
-    );
+    ];
 
     parent::buildOptionsForm($form, $form_state);
   }
@@ -127,7 +127,7 @@ class TaxonomyIndexTid extends PrerenderList {
   public function preRender(&$values) {
     $vocabularies = $this->vocabularyStorage->loadMultiple();
     $this->field_alias = $this->aliases['nid'];
-    $nids = array();
+    $nids = [];
     foreach ($values as $result) {
       if (!empty($result->{$this->aliases['nid']})) {
         $nids[] = $result->{$this->aliases['nid']};
@@ -137,7 +137,7 @@ class TaxonomyIndexTid extends PrerenderList {
     if ($nids) {
       $vocabs = array_filter($this->options['vids']);
       if (empty($this->options['limit'])) {
-        $vocabs = array();
+        $vocabs = [];
       }
       $result = \Drupal::entityManager()->getStorage('taxonomy_term')->getNodeTerms($nids, $vocabs);
 
@@ -157,7 +157,7 @@ class TaxonomyIndexTid extends PrerenderList {
     }
   }
 
-  function render_item($count, $item) {
+  public function render_item($count, $item) {
     return $item['name'];
   }
 
@@ -169,7 +169,7 @@ class TaxonomyIndexTid extends PrerenderList {
   }
 
   protected function addSelfTokens(&$tokens, $item) {
-    foreach (array('tid', 'name', 'vocabulary_vid', 'vocabulary') as $token) {
+    foreach (['tid', 'name', 'vocabulary_vid', 'vocabulary'] as $token) {
       $tokens['{{ ' . $this->options['id'] . '__' . $token . ' }}'] = isset($item[$token]) ? $item[$token] : '';
     }
   }
diff --git a/web/core/modules/taxonomy/src/Plugin/views/field/TermName.php b/web/core/modules/taxonomy/src/Plugin/views/field/TermName.php
index 20bc3c6f3..0a777e9c1 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/field/TermName.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/field/TermName.php
@@ -3,7 +3,7 @@
 namespace Drupal\taxonomy\Plugin\views\field;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\Plugin\views\field\Field;
+use Drupal\views\Plugin\views\field\EntityField;
 use Drupal\views\ResultRow;
 
 /**
@@ -13,7 +13,7 @@ use Drupal\views\ResultRow;
  *
  * @ViewsField("term_name")
  */
-class TermName extends Field {
+class TermName extends EntityField {
 
   /**
    * {@inheritdoc}
@@ -37,7 +37,7 @@ class TermName extends Field {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['convert_spaces'] = array('default' => FALSE);
+    $options['convert_spaces'] = ['default' => FALSE];
     return $options;
   }
 
@@ -45,11 +45,11 @@ class TermName extends Field {
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['convert_spaces'] = array(
+    $form['convert_spaces'] = [
       '#title' => $this->t('Convert spaces in term names to hyphens'),
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['convert_spaces']),
-    );
+    ];
 
     parent::buildOptionsForm($form, $form_state);
   }
diff --git a/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
index d769bb04d..a68c3c8c6 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
@@ -94,18 +94,18 @@ class TaxonomyIndexTid extends ManyToOne {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['type'] = array('default' => 'textfield');
-    $options['limit'] = array('default' => TRUE);
-    $options['vid'] = array('default' => '');
-    $options['hierarchy'] = array('default' => FALSE);
-    $options['error_message'] = array('default' => TRUE);
+    $options['type'] = ['default' => 'textfield'];
+    $options['limit'] = ['default' => TRUE];
+    $options['vid'] = ['default' => ''];
+    $options['hierarchy'] = ['default' => FALSE];
+    $options['error_message'] = ['default' => TRUE];
 
     return $options;
   }
 
   public function buildExtraOptionsForm(&$form, FormStateInterface $form_state) {
     $vocabularies = $this->vocabularyStorage->loadMultiple();
-    $options = array();
+    $options = [];
     foreach ($vocabularies as $voc) {
       $options[$voc->id()] = $voc->label();
     }
@@ -118,56 +118,56 @@ class TaxonomyIndexTid extends ManyToOne {
       }
 
       if (empty($this->definition['vocabulary'])) {
-        $form['vid'] = array(
+        $form['vid'] = [
           '#type' => 'radios',
           '#title' => $this->t('Vocabulary'),
           '#options' => $options,
           '#description' => $this->t('Select which vocabulary to show terms for in the regular options.'),
           '#default_value' => $this->options['vid'],
-        );
+        ];
       }
     }
 
-    $form['type'] = array(
+    $form['type'] = [
       '#type' => 'radios',
       '#title' => $this->t('Selection type'),
-      '#options' => array('select' => $this->t('Dropdown'), 'textfield' => $this->t('Autocomplete')),
+      '#options' => ['select' => $this->t('Dropdown'), 'textfield' => $this->t('Autocomplete')],
       '#default_value' => $this->options['type'],
-    );
+    ];
 
-    $form['hierarchy'] = array(
+    $form['hierarchy'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Show hierarchy in dropdown'),
       '#default_value' => !empty($this->options['hierarchy']),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[type]"]' => array('value' => 'select'),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[type]"]' => ['value' => 'select'],
+        ],
+      ],
+    ];
   }
 
   protected function valueForm(&$form, FormStateInterface $form_state) {
     $vocabulary = $this->vocabularyStorage->load($this->options['vid']);
     if (empty($vocabulary) && $this->options['limit']) {
-      $form['markup'] = array(
+      $form['markup'] = [
         '#markup' => '<div class="js-form-item form-item">' . $this->t('An invalid vocabulary is selected. Please change it in the options.') . '</div>',
-      );
+      ];
       return;
     }
 
     if ($this->options['type'] == 'textfield') {
-      $terms = $this->value ? Term::loadMultiple(($this->value)) : array();
-      $form['value'] = array(
-        '#title' => $this->options['limit'] ? $this->t('Select terms from vocabulary @voc', array('@voc' => $vocabulary->label())) : $this->t('Select terms'),
+      $terms = $this->value ? Term::loadMultiple(($this->value)) : [];
+      $form['value'] = [
+        '#title' => $this->options['limit'] ? $this->t('Select terms from vocabulary @voc', ['@voc' => $vocabulary->label()]) : $this->t('Select terms'),
         '#type' => 'textfield',
         '#default_value' => EntityAutocomplete::getEntityLabels($terms),
-      );
+      ];
 
       if ($this->options['limit']) {
         $form['value']['#type'] = 'entity_autocomplete';
         $form['value']['#target_type'] = 'taxonomy_term';
-        $form['value']['#selection_settings']['target_bundles'] = array($vocabulary->id());
+        $form['value']['#selection_settings']['target_bundles'] = [$vocabulary->id()];
         $form['value']['#tags'] = TRUE;
         $form['value']['#process_default_value'] = FALSE;
       }
@@ -175,18 +175,18 @@ class TaxonomyIndexTid extends ManyToOne {
     else {
       if (!empty($this->options['hierarchy']) && $this->options['limit']) {
         $tree = $this->termStorage->loadTree($vocabulary->id(), 0, NULL, TRUE);
-        $options = array();
+        $options = [];
 
         if ($tree) {
           foreach ($tree as $term) {
             $choice = new \stdClass();
-            $choice->option = array($term->id() => str_repeat('-', $term->depth) . \Drupal::entityManager()->getTranslationFromContext($term)->label());
+            $choice->option = [$term->id() => str_repeat('-', $term->depth) . \Drupal::entityManager()->getTranslationFromContext($term)->label()];
             $options[] = $choice;
           }
         }
       }
       else {
-        $options = array();
+        $options = [];
         $query = \Drupal::entityQuery('taxonomy_term')
           // @todo Sorting on vocabulary properties -
           //   https://www.drupal.org/node/1821274.
@@ -211,7 +211,7 @@ class TaxonomyIndexTid extends ManyToOne {
           $options = $this->reduceValueOptions($options);
 
           if (!empty($this->options['expose']['multiple']) && empty($this->options['expose']['required'])) {
-            $default_value = array();
+            $default_value = [];
           }
         }
 
@@ -225,7 +225,7 @@ class TaxonomyIndexTid extends ManyToOne {
           }
           // Due to #1464174 there is a chance that array('') was saved in the admin ui.
           // Let's choose a safe default value.
-          elseif ($default_value == array('')) {
+          elseif ($default_value == ['']) {
             $default_value = 'All';
           }
           else {
@@ -234,14 +234,14 @@ class TaxonomyIndexTid extends ManyToOne {
           }
         }
       }
-      $form['value'] = array(
+      $form['value'] = [
         '#type' => 'select',
-        '#title' => $this->options['limit'] ? $this->t('Select terms from vocabulary @voc', array('@voc' => $vocabulary->label())) : $this->t('Select terms'),
+        '#title' => $this->options['limit'] ? $this->t('Select terms from vocabulary @voc', ['@voc' => $vocabulary->label()]) : $this->t('Select terms'),
         '#multiple' => TRUE,
         '#options' => $options,
         '#size' => min(9, count($options)),
         '#default_value' => $default_value,
-      );
+      ];
 
       $user_input = $form_state->getUserInput();
       if ($exposed && isset($identifier) && !isset($user_input[$identifier])) {
@@ -265,13 +265,13 @@ class TaxonomyIndexTid extends ManyToOne {
       return;
     }
 
-    $tids = array();
-    if ($values = $form_state->getValue(array('options', 'value'))) {
+    $tids = [];
+    if ($values = $form_state->getValue(['options', 'value'])) {
       foreach ($values as $value) {
         $tids[] = $value['target_id'];
       }
     }
-    $form_state->setValue(array('options', 'value'), $tids);
+    $form_state->setValue(['options', 'value'], $tids);
   }
 
   public function acceptExposedInput($input) {
@@ -348,16 +348,16 @@ class TaxonomyIndexTid extends ManyToOne {
     if ($this->options['type'] != 'select') {
       unset($form['expose']['reduce']);
     }
-    $form['error_message'] = array(
+    $form['error_message'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Display error message'),
       '#default_value' => !empty($this->options['error_message']),
-    );
+    ];
   }
 
   public function adminSummary() {
     // set up $this->valueOptions for the parent summary
-    $this->valueOptions = array();
+    $this->valueOptions = [];
 
     if ($this->value) {
       $this->value = array_filter($this->value);
diff --git a/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php b/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php
index a2b8108ff..732f5b150 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTidDepth.php
@@ -17,15 +17,15 @@ use Drupal\Core\Form\FormStateInterface;
 class TaxonomyIndexTidDepth extends TaxonomyIndexTid {
 
   public function operatorOptions($which = 'title') {
-    return array(
+    return [
       'or' => $this->t('Is one of'),
-    );
+    ];
   }
 
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['depth'] = array('default' => 0);
+    $options['depth'] = ['default' => 0];
 
     return $options;
   }
@@ -33,12 +33,12 @@ class TaxonomyIndexTidDepth extends TaxonomyIndexTid {
   public function buildExtraOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildExtraOptionsForm($form, $form_state);
 
-    $form['depth'] = array(
+    $form['depth'] = [
       '#type' => 'weight',
       '#title' => $this->t('Depth'),
       '#default_value' => $this->options['depth'],
       '#description' => $this->t('The depth will match nodes tagged with terms in the hierarchy. For example, if you have the term "fruit" and a child term "apple", with a depth of 1 (or higher) then filtering for the term "fruit" will get nodes that are tagged with "apple" as well as "fruit". If negative, the reverse is true; searching for "apple" will also pick up nodes tagged with "fruit" if depth is -1 (or lower).'),
-    );
+    ];
   }
 
   public function query() {
diff --git a/web/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php b/web/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
index b1c72e4bd..13fd056ab 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
@@ -74,24 +74,24 @@ class NodeTermData extends RelationshipPluginBase {
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['vids'] = array('default' => array());
+    $options['vids'] = ['default' => []];
     return $options;
   }
 
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     $vocabularies = $this->vocabularyStorage->loadMultiple();
-    $options = array();
+    $options = [];
     foreach ($vocabularies as $voc) {
       $options[$voc->id()] = $voc->label();
     }
 
-    $form['vids'] = array(
+    $form['vids'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Vocabularies'),
       '#options' => $options,
       '#default_value' => $this->options['vids'],
       '#description' => $this->t('Choose which vocabularies you wish to relate. Remember that every term found will create a new record, so this relationship is best used on just one vocabulary that has only one term per node.'),
-    );
+    ];
     parent::buildOptionsForm($form, $form_state);
   }
 
@@ -134,7 +134,7 @@ class NodeTermData extends RelationshipPluginBase {
       $query->condition('td.vid', array_filter($this->options['vids']), 'IN');
       $query->addTag('taxonomy_term_access');
       $query->fields('td');
-      $query->fields('tn', array('nid'));
+      $query->fields('tn', ['nid']);
       $def['table formula'] = $query;
     }
 
diff --git a/web/core/modules/taxonomy/src/TermBreadcrumbBuilder.php b/web/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
index 838011d7b..73588d1f0 100644
--- a/web/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
+++ b/web/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
@@ -68,7 +68,7 @@ class TermBreadcrumbBuilder implements BreadcrumbBuilderInterface {
     foreach (array_reverse($parents) as $term) {
       $term = $this->entityManager->getTranslationFromContext($term);
       $breadcrumb->addCacheableDependency($term);
-      $breadcrumb->addLink(Link::createFromRoute($term->getName(), 'entity.taxonomy_term.canonical', array('taxonomy_term' => $term->id())));
+      $breadcrumb->addLink(Link::createFromRoute($term->getName(), 'entity.taxonomy_term.canonical', ['taxonomy_term' => $term->id()]));
     }
 
     // This breadcrumb builder is based on a route parameter, and hence it
diff --git a/web/core/modules/taxonomy/src/TermForm.php b/web/core/modules/taxonomy/src/TermForm.php
index 1f5635132..6e307ca35 100644
--- a/web/core/modules/taxonomy/src/TermForm.php
+++ b/web/core/modules/taxonomy/src/TermForm.php
@@ -23,12 +23,12 @@ class TermForm extends ContentEntityForm {
     $form_state->set(['taxonomy', 'parent'], $parent);
     $form_state->set(['taxonomy', 'vocabulary'], $vocabulary);
 
-    $form['relations'] = array(
+    $form['relations'] = [
       '#type' => 'details',
       '#title' => $this->t('Relations'),
       '#open' => $vocabulary->getHierarchy() == VocabularyInterface::HIERARCHY_MULTIPLE,
       '#weight' => 10,
-    );
+    ];
 
     // \Drupal\taxonomy\TermStorageInterface::loadTree() and
     // \Drupal\taxonomy\TermStorageInterface::loadParents() may contain large
@@ -46,9 +46,9 @@ class TermForm extends ContentEntityForm {
       $exclude[] = $term->id();
 
       $tree = $taxonomy_storage->loadTree($vocabulary->id());
-      $options = array('<' . $this->t('root') . '>');
+      $options = ['<' . $this->t('root') . '>'];
       if (empty($parent)) {
-        $parent = array(0);
+        $parent = [0];
       }
 
       foreach ($tree as $item) {
@@ -57,33 +57,33 @@ class TermForm extends ContentEntityForm {
         }
       }
 
-      $form['relations']['parent'] = array(
+      $form['relations']['parent'] = [
         '#type' => 'select',
         '#title' => $this->t('Parent terms'),
         '#options' => $options,
         '#default_value' => $parent,
         '#multiple' => TRUE,
-      );
+      ];
     }
 
-    $form['relations']['weight'] = array(
+    $form['relations']['weight'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Weight'),
       '#size' => 6,
       '#default_value' => $term->getWeight(),
       '#description' => $this->t('Terms are displayed in ascending order by weight.'),
       '#required' => TRUE,
-    );
+    ];
 
-    $form['vid'] = array(
+    $form['vid'] = [
       '#type' => 'value',
       '#value' => $vocabulary->id(),
-    );
+    ];
 
-    $form['tid'] = array(
+    $form['tid'] = [
       '#type' => 'value',
       '#value' => $term->id(),
-    );
+    ];
 
     return parent::form($form, $form_state, $term);
   }
@@ -127,21 +127,21 @@ class TermForm extends ContentEntityForm {
     $view_link = $term->link($term->getName());
     switch ($result) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created new term %term.', array('%term' => $view_link)));
-        $this->logger('taxonomy')->notice('Created new term %term.', array('%term' => $term->getName(), 'link' => $edit_link));
+        drupal_set_message($this->t('Created new term %term.', ['%term' => $view_link]));
+        $this->logger('taxonomy')->notice('Created new term %term.', ['%term' => $term->getName(), 'link' => $edit_link]);
         break;
       case SAVED_UPDATED:
-        drupal_set_message($this->t('Updated term %term.', array('%term' => $view_link)));
-        $this->logger('taxonomy')->notice('Updated term %term.', array('%term' => $term->getName(), 'link' => $edit_link));
+        drupal_set_message($this->t('Updated term %term.', ['%term' => $view_link]));
+        $this->logger('taxonomy')->notice('Updated term %term.', ['%term' => $term->getName(), 'link' => $edit_link]);
         break;
     }
 
     $current_parent_count = count($form_state->getValue('parent'));
     $previous_parent_count = count($form_state->get(['taxonomy', 'parent']));
     // Root doesn't count if it's the only parent.
-    if ($current_parent_count == 1 && $form_state->hasValue(array('parent', 0))) {
+    if ($current_parent_count == 1 && $form_state->hasValue(['parent', 0])) {
       $current_parent_count = 0;
-      $form_state->setValue('parent', array());
+      $form_state->setValue('parent', []);
     }
 
     // If the number of parents has been reduced to one or none, do a check on the
diff --git a/web/core/modules/taxonomy/src/TermStorage.php b/web/core/modules/taxonomy/src/TermStorage.php
index bc44c226f..0a00c13de 100644
--- a/web/core/modules/taxonomy/src/TermStorage.php
+++ b/web/core/modules/taxonomy/src/TermStorage.php
@@ -15,49 +15,49 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
    *
    * @var array
    */
-  protected $parents = array();
+  protected $parents = [];
 
   /**
    * Array of all loaded term ancestry keyed by ancestor term ID.
    *
    * @var array
    */
-  protected $parentsAll = array();
+  protected $parentsAll = [];
 
   /**
    * Array of child terms keyed by parent term ID.
    *
    * @var array
    */
-  protected $children = array();
+  protected $children = [];
 
   /**
    * Array of term parents keyed by vocabulary ID and child term ID.
    *
    * @var array
    */
-  protected $treeParents = array();
+  protected $treeParents = [];
 
   /**
    * Array of term ancestors keyed by vocabulary ID and parent term ID.
    *
    * @var array
    */
-  protected $treeChildren = array();
+  protected $treeChildren = [];
 
   /**
    * Array of terms in a tree keyed by vocabulary ID and term ID.
    *
    * @var array
    */
-  protected $treeTerms = array();
+  protected $treeTerms = [];
 
   /**
    * Array of loaded trees keyed by a cache id matching tree arguments.
    *
    * @var array
    */
-  protected $trees = array();
+  protected $trees = [];
 
   /**
    * {@inheritdoc}
@@ -66,10 +66,10 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
    *   An array of values to set, keyed by property name. A value for the
    *   vocabulary ID ('vid') is required.
    */
-  public function create(array $values = array()) {
+  public function create(array $values = []) {
     // Save new terms with no parents by default.
     if (empty($values['parent'])) {
-      $values['parent'] = array(0);
+      $values['parent'] = [0];
     }
     $entity = parent::create($values);
     return $entity;
@@ -80,13 +80,13 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
    */
   public function resetCache(array $ids = NULL) {
     drupal_static_reset('taxonomy_term_count_nodes');
-    $this->parents = array();
-    $this->parentsAll = array();
-    $this->children = array();
-    $this->treeChildren = array();
-    $this->treeParents = array();
-    $this->treeTerms = array();
-    $this->trees = array();
+    $this->parents = [];
+    $this->parentsAll = [];
+    $this->children = [];
+    $this->treeChildren = [];
+    $this->treeParents = [];
+    $this->treeTerms = [];
+    $this->trees = [];
     parent::resetCache($ids);
   }
 
@@ -104,13 +104,13 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
    */
   public function updateTermHierarchy(EntityInterface $term) {
     $query = $this->database->insert('taxonomy_term_hierarchy')
-      ->fields(array('tid', 'parent'));
+      ->fields(['tid', 'parent']);
 
     foreach ($term->parent as $parent) {
-      $query->values(array(
+      $query->values([
         'tid' => $term->id(),
         'parent' => (int) $parent->target_id,
-      ));
+      ]);
     }
     $query->execute();
   }
@@ -120,7 +120,7 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
    */
   public function loadParents($tid) {
     if (!isset($this->parents[$tid])) {
-      $parents = array();
+      $parents = [];
       $query = $this->database->select('taxonomy_term_field_data', 't');
       $query->join('taxonomy_term_hierarchy', 'h', 'h.parent = t.tid');
       $query->addField('t', 'tid');
@@ -142,7 +142,7 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
    */
   public function loadAllParents($tid) {
     if (!isset($this->parentsAll[$tid])) {
-      $parents = array();
+      $parents = [];
       if ($term = $this->load($tid)) {
         $parents[$term->id()] = $term;
         $terms_to_search[] = $term->id();
@@ -169,7 +169,7 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
    */
   public function loadChildren($tid, $vid = NULL) {
     if (!isset($this->children[$tid])) {
-      $children = array();
+      $children = [];
       $query = $this->database->select('taxonomy_term_field_data', 't');
       $query->join('taxonomy_term_hierarchy', 'h', 'h.tid = t.tid');
       $query->addField('t', 'tid');
@@ -198,15 +198,15 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
       // We cache trees, so it's not CPU-intensive to call on a term and its
       // children, too.
       if (!isset($this->treeChildren[$vid])) {
-        $this->treeChildren[$vid] = array();
-        $this->treeParents[$vid] = array();
-        $this->treeTerms[$vid] = array();
+        $this->treeChildren[$vid] = [];
+        $this->treeParents[$vid] = [];
+        $this->treeTerms[$vid] = [];
         $query = $this->database->select('taxonomy_term_field_data', 't');
         $query->join('taxonomy_term_hierarchy', 'h', 'h.tid = t.tid');
         $result = $query
           ->addTag('taxonomy_term_access')
           ->fields('t')
-          ->fields('h', array('parent'))
+          ->fields('h', ['parent'])
           ->condition('t.vid', $vid)
           ->condition('t.default_langcode', 1)
           ->orderBy('t.weight')
@@ -221,17 +221,17 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
 
       // Load full entities, if necessary. The entity controller statically
       // caches the results.
-      $term_entities = array();
+      $term_entities = [];
       if ($load_entities) {
         $term_entities = $this->loadMultiple(array_keys($this->treeTerms[$vid]));
       }
 
       $max_depth = (!isset($max_depth)) ? count($this->treeChildren[$vid]) : $max_depth;
-      $tree = array();
+      $tree = [];
 
       // Keeps track of the parents we have to process, the last entry is used
       // for the next processing step.
-      $process_parents = array();
+      $process_parents = [];
       $process_parents[] = $parent;
 
       // Loops over the parent terms and adds its children to the tree array.
@@ -304,7 +304,7 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
    */
   public function resetWeights($vid) {
     $this->database->update('taxonomy_term_field_data')
-      ->fields(array('weight' => 0))
+      ->fields(['weight' => 0])
       ->condition('vid', $vid)
       ->execute();
   }
@@ -312,10 +312,10 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
   /**
    * {@inheritdoc}
    */
-  public function getNodeTerms(array $nids, array $vocabs = array(), $langcode = NULL) {
+  public function getNodeTerms(array $nids, array $vocabs = [], $langcode = NULL) {
     $query = db_select('taxonomy_term_field_data', 'td');
     $query->innerJoin('taxonomy_index', 'tn', 'td.tid = tn.tid');
-    $query->fields('td', array('tid'));
+    $query->fields('td', ['tid']);
     $query->addField('tn', 'nid', 'node_nid');
     $query->orderby('td.weight');
     $query->orderby('td.name');
@@ -328,15 +328,15 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
       $query->condition('td.langcode', $langcode);
     }
 
-    $results = array();
-    $all_tids = array();
+    $results = [];
+    $all_tids = [];
     foreach ($query->execute() as $term_record) {
       $results[$term_record->node_nid][] = $term_record->tid;
       $all_tids[] = $term_record->tid;
     }
 
     $all_terms = $this->loadMultiple($all_tids);
-    $terms = array();
+    $terms = [];
     foreach ($results as $nid => $tids) {
       foreach ($tids as $tid) {
         $terms[$nid][$tid] = $all_terms[$tid];
@@ -361,13 +361,13 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
   public function __wakeup() {
     parent::__wakeup();
     // Initialize static caches.
-    $this->parents = array();
-    $this->parentsAll = array();
-    $this->children = array();
-    $this->treeChildren = array();
-    $this->treeParents = array();
-    $this->treeTerms = array();
-    $this->trees = array();
+    $this->parents = [];
+    $this->parentsAll = [];
+    $this->children = [];
+    $this->treeChildren = [];
+    $this->treeParents = [];
+    $this->treeTerms = [];
+    $this->trees = [];
   }
 
 }
diff --git a/web/core/modules/taxonomy/src/TermStorageInterface.php b/web/core/modules/taxonomy/src/TermStorageInterface.php
index 99167114d..05d8d7f4c 100644
--- a/web/core/modules/taxonomy/src/TermStorageInterface.php
+++ b/web/core/modules/taxonomy/src/TermStorageInterface.php
@@ -116,6 +116,6 @@ interface TermStorageInterface extends ContentEntityStorageInterface {
    * @return array
    *   An array of nids and the term entities they were tagged with.
    */
-  public function getNodeTerms(array $nids, array $vocabs = array(), $langcode = NULL);
+  public function getNodeTerms(array $nids, array $vocabs = [], $langcode = NULL);
 
 }
diff --git a/web/core/modules/taxonomy/src/TermStorageSchema.php b/web/core/modules/taxonomy/src/TermStorageSchema.php
index 5534821ef..5bcb088db 100644
--- a/web/core/modules/taxonomy/src/TermStorageSchema.php
+++ b/web/core/modules/taxonomy/src/TermStorageSchema.php
@@ -17,93 +17,93 @@ class TermStorageSchema extends SqlContentEntityStorageSchema {
   protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $reset = FALSE) {
     $schema = parent::getEntitySchema($entity_type, $reset = FALSE);
 
-    $schema['taxonomy_term_field_data']['indexes'] += array(
-      'taxonomy_term__tree' => array('vid', 'weight', 'name'),
-      'taxonomy_term__vid_name' => array('vid', 'name'),
-    );
+    $schema['taxonomy_term_field_data']['indexes'] += [
+      'taxonomy_term__tree' => ['vid', 'weight', 'name'],
+      'taxonomy_term__vid_name' => ['vid', 'name'],
+    ];
 
-    $schema['taxonomy_term_hierarchy'] = array(
+    $schema['taxonomy_term_hierarchy'] = [
       'description' => 'Stores the hierarchical relationship between terms.',
-      'fields' => array(
-        'tid' => array(
+      'fields' => [
+        'tid' => [
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
           'description' => 'Primary Key: The {taxonomy_term_data}.tid of the term.',
-        ),
-        'parent' => array(
+        ],
+        'parent' => [
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
           'description' => "Primary Key: The {taxonomy_term_data}.tid of the term's parent. 0 indicates no parent.",
-        ),
-      ),
-      'indexes' => array(
-        'parent' => array('parent'),
-      ),
-      'foreign keys' => array(
-        'taxonomy_term_data' => array(
+        ],
+      ],
+      'indexes' => [
+        'parent' => ['parent'],
+      ],
+      'foreign keys' => [
+        'taxonomy_term_data' => [
           'table' => 'taxonomy_term_data',
-          'columns' => array('tid' => 'tid'),
-        ),
-      ),
-      'primary key' => array('tid', 'parent'),
-    );
+          'columns' => ['tid' => 'tid'],
+        ],
+      ],
+      'primary key' => ['tid', 'parent'],
+    ];
 
-    $schema['taxonomy_index'] = array(
+    $schema['taxonomy_index'] = [
       'description' => 'Maintains denormalized information about node/term relationships.',
-      'fields' => array(
-        'nid' => array(
+      'fields' => [
+        'nid' => [
           'description' => 'The {node}.nid this record tracks.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'tid' => array(
+        ],
+        'tid' => [
           'description' => 'The term ID.',
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'status' => array(
+        ],
+        'status' => [
           'description' => 'Boolean indicating whether the node is published (visible to non-administrators).',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 1,
-        ),
-        'sticky' => array(
+        ],
+        'sticky' => [
           'description' => 'Boolean indicating whether the node is sticky.',
           'type' => 'int',
           'not null' => FALSE,
           'default' => 0,
           'size' => 'tiny',
-        ),
-        'created' => array(
+        ],
+        'created' => [
           'description' => 'The Unix timestamp when the node was created.',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
-        ),
-      ),
-      'primary key' => array('nid', 'tid'),
-      'indexes' => array(
-        'term_node' => array('tid', 'status', 'sticky', 'created'),
-      ),
-      'foreign keys' => array(
-        'tracked_node' => array(
+        ],
+      ],
+      'primary key' => ['nid', 'tid'],
+      'indexes' => [
+        'term_node' => ['tid', 'status', 'sticky', 'created'],
+      ],
+      'foreign keys' => [
+        'tracked_node' => [
           'table' => 'node',
-          'columns' => array('nid' => 'nid'),
-        ),
-        'term' => array(
+          'columns' => ['nid' => 'nid'],
+        ],
+        'term' => [
           'table' => 'taxonomy_term_data',
-          'columns' => array('tid' => 'tid'),
-        ),
-      ),
-    );
+          'columns' => ['tid' => 'tid'],
+        ],
+      ],
+    ];
 
     return $schema;
   }
diff --git a/web/core/modules/taxonomy/src/TermTranslationHandler.php b/web/core/modules/taxonomy/src/TermTranslationHandler.php
index 72539b53d..688c63e38 100644
--- a/web/core/modules/taxonomy/src/TermTranslationHandler.php
+++ b/web/core/modules/taxonomy/src/TermTranslationHandler.php
@@ -16,7 +16,7 @@ class TermTranslationHandler extends ContentTranslationHandler {
    */
   public function entityFormAlter(array &$form, FormStateInterface $form_state, EntityInterface $entity) {
     parent::entityFormAlter($form, $form_state, $entity);
-    $form['actions']['submit']['#submit'][] = array($this, 'entityFormSave');
+    $form['actions']['submit']['#submit'][] = [$this, 'entityFormSave'];
   }
 
   /**
@@ -26,7 +26,7 @@ class TermTranslationHandler extends ContentTranslationHandler {
    *
    * @see \Drupal\Core\Entity\EntityForm::build()
    */
-  function entityFormSave(array $form, FormStateInterface $form_state) {
+  public function entityFormSave(array $form, FormStateInterface $form_state) {
     if ($this->getSourceLangcode($form_state)) {
       $entity = $form_state->getFormObject()->getEntity();
       // We need a redirect here, otherwise we would get an access denied page,
diff --git a/web/core/modules/taxonomy/src/TermViewBuilder.php b/web/core/modules/taxonomy/src/TermViewBuilder.php
index ca74535ac..6748a4b03 100644
--- a/web/core/modules/taxonomy/src/TermViewBuilder.php
+++ b/web/core/modules/taxonomy/src/TermViewBuilder.php
@@ -16,10 +16,10 @@ class TermViewBuilder extends EntityViewBuilder {
    */
   protected function alterBuild(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode) {
     parent::alterBuild($build, $entity, $display, $view_mode);
-    $build['#contextual_links']['taxonomy_term'] = array(
-      'route_parameters' => array('taxonomy_term' => $entity->id()),
-      'metadata' => array('changed' => $entity->getChangedTime()),
-    );
+    $build['#contextual_links']['taxonomy_term'] = [
+      'route_parameters' => ['taxonomy_term' => $entity->id()],
+      'metadata' => ['changed' => $entity->getChangedTime()],
+    ];
   }
 
 }
diff --git a/web/core/modules/taxonomy/src/TermViewsData.php b/web/core/modules/taxonomy/src/TermViewsData.php
index 89b2b55ef..5e98bfe9b 100644
--- a/web/core/modules/taxonomy/src/TermViewsData.php
+++ b/web/core/modules/taxonomy/src/TermViewsData.php
@@ -19,13 +19,13 @@ class TermViewsData extends EntityViewsData {
     $data['taxonomy_term_field_data']['table']['base']['access query tag'] = 'taxonomy_term_access';
     $data['taxonomy_term_field_data']['table']['wizard_id'] = 'taxonomy_term';
 
-    $data['taxonomy_term_field_data']['table']['join'] = array(
+    $data['taxonomy_term_field_data']['table']['join'] = [
       // This is provided for the many_to_one argument.
-      'taxonomy_index' => array(
+      'taxonomy_index' => [
         'field' => 'tid',
         'left_field' => 'tid',
-      ),
-    );
+      ],
+    ];
 
     $data['taxonomy_term_field_data']['tid']['help'] = $this->t('The tid of a taxonomy term.');
 
@@ -39,18 +39,18 @@ class TermViewsData extends EntityViewsData {
     $data['taxonomy_term_field_data']['tid']['filter']['hierarchy table'] = 'taxonomy_term_hierarchy';
     $data['taxonomy_term_field_data']['tid']['filter']['numeric'] = TRUE;
 
-    $data['taxonomy_term_field_data']['tid_raw'] = array(
+    $data['taxonomy_term_field_data']['tid_raw'] = [
       'title' => $this->t('Term ID'),
       'help' => $this->t('The tid of a taxonomy term.'),
       'real field' => 'tid',
-      'filter' => array(
+      'filter' => [
         'id' => 'numeric',
         'allow empty' => TRUE,
-      ),
-    );
+      ],
+    ];
 
-    $data['taxonomy_term_field_data']['tid_representative'] = array(
-      'relationship' => array(
+    $data['taxonomy_term_field_data']['tid_representative'] = [
+      'relationship' => [
         'title' => $this->t('Representative node'),
         'label'  => $this->t('Representative node'),
         'help' => $this->t('Obtains a single representative node for each term, according to a chosen sort criterion.'),
@@ -62,12 +62,12 @@ class TermViewsData extends EntityViewsData {
         'base'   => 'node_field_data',
         'field'  => 'nid',
         'relationship' => 'node_field_data:term_node_tid'
-      ),
-    );
+      ],
+    ];
 
     $data['taxonomy_term_field_data']['vid']['help'] = $this->t('Filter the results of "Taxonomy: Term" to a particular vocabulary.');
     unset($data['taxonomy_term_field_data']['vid']['field']);
-    unset($data['taxonomy_term_field_data']['vid']['argument']);
+    $data['taxonomy_term_field_data']['vid']['argument']['id'] = 'vocabulary_vid';
     unset($data['taxonomy_term_field_data']['vid']['sort']);
 
     $data['taxonomy_term_field_data']['name']['field']['id'] = 'term_name';
@@ -79,114 +79,114 @@ class TermViewsData extends EntityViewsData {
     $data['taxonomy_term_field_data']['changed']['title'] = $this->t('Updated date');
     $data['taxonomy_term_field_data']['changed']['help'] = $this->t('The date the term was last updated.');
 
-    $data['taxonomy_term_field_data']['changed_fulldate'] = array(
+    $data['taxonomy_term_field_data']['changed_fulldate'] = [
       'title' => $this->t('Updated date'),
       'help' => $this->t('Date in the form of CCYYMMDD.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_fulldate',
-      ),
-    );
+      ],
+    ];
 
-    $data['taxonomy_term_field_data']['changed_year_month'] = array(
+    $data['taxonomy_term_field_data']['changed_year_month'] = [
       'title' => $this->t('Updated year + month'),
       'help' => $this->t('Date in the form of YYYYMM.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_year_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['taxonomy_term_field_data']['changed_year'] = array(
+    $data['taxonomy_term_field_data']['changed_year'] = [
       'title' => $this->t('Updated year'),
       'help' => $this->t('Date in the form of YYYY.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_year',
-      ),
-    );
+      ],
+    ];
 
-    $data['taxonomy_term_field_data']['changed_month'] = array(
+    $data['taxonomy_term_field_data']['changed_month'] = [
       'title' => $this->t('Updated month'),
       'help' => $this->t('Date in the form of MM (01 - 12).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['taxonomy_term_field_data']['changed_day'] = array(
+    $data['taxonomy_term_field_data']['changed_day'] = [
       'title' => $this->t('Updated day'),
       'help' => $this->t('Date in the form of DD (01 - 31).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_day',
-      ),
-    );
+      ],
+    ];
 
-    $data['taxonomy_term_field_data']['changed_week'] = array(
+    $data['taxonomy_term_field_data']['changed_week'] = [
       'title' => $this->t('Updated week'),
       'help' => $this->t('Date in the form of WW (01 - 53).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_week',
-      ),
-    );
+      ],
+    ];
 
     $data['taxonomy_index']['table']['group']  = $this->t('Taxonomy term');
 
-    $data['taxonomy_index']['table']['join'] = array(
-      'taxonomy_term_field_data' => array(
+    $data['taxonomy_index']['table']['join'] = [
+      'taxonomy_term_field_data' => [
         // links directly to taxonomy_term_field_data via tid
         'left_field' => 'tid',
         'field' => 'tid',
-      ),
-      'node_field_data' => array(
+      ],
+      'node_field_data' => [
         // links directly to node via nid
         'left_field' => 'nid',
         'field' => 'nid',
-      ),
-      'taxonomy_term_hierarchy' => array(
+      ],
+      'taxonomy_term_hierarchy' => [
         'left_field' => 'tid',
         'field' => 'tid',
-      ),
-    );
+      ],
+    ];
 
-    $data['taxonomy_index']['nid'] = array(
+    $data['taxonomy_index']['nid'] = [
       'title' => $this->t('Content with term'),
       'help' => $this->t('Relate all content tagged with a term.'),
-      'relationship' => array(
+      'relationship' => [
         'id' => 'standard',
         'base' => 'node',
         'base field' => 'nid',
         'label' => $this->t('node'),
         'skip base' => 'node',
-      ),
-    );
+      ],
+    ];
 
     // @todo This stuff needs to move to a node field since really it's all
     //   about nodes.
-    $data['taxonomy_index']['tid'] = array(
+    $data['taxonomy_index']['tid'] = [
       'group' => $this->t('Content'),
       'title' => $this->t('Has taxonomy term ID'),
       'help' => $this->t('Display content if it has the selected taxonomy terms.'),
-      'argument' => array(
+      'argument' => [
         'id' => 'taxonomy_index_tid',
         'name table' => 'taxonomy_term_field_data',
         'name field' => 'name',
         'empty field name' => $this->t('Uncategorized'),
         'numeric' => TRUE,
         'skip base' => 'taxonomy_term_field_data',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'title' => $this->t('Has taxonomy term'),
         'id' => 'taxonomy_index_tid',
         'hierarchy table' => 'taxonomy_term_hierarchy',
         'numeric' => TRUE,
         'skip base' => 'taxonomy_term_field_data',
         'allow empty' => TRUE,
-      ),
-    );
+      ],
+    ];
 
     $data['taxonomy_index']['status'] = [
       'title' => $this->t('Publish status'),
@@ -226,37 +226,37 @@ class TermViewsData extends EntityViewsData {
     $data['taxonomy_term_hierarchy']['table']['group']  = $this->t('Taxonomy term');
     $data['taxonomy_term_hierarchy']['table']['provider']  = 'taxonomy';
 
-    $data['taxonomy_term_hierarchy']['table']['join'] = array(
-      'taxonomy_term_hierarchy' => array(
+    $data['taxonomy_term_hierarchy']['table']['join'] = [
+      'taxonomy_term_hierarchy' => [
         // Link to self through left.parent = right.tid (going down in depth).
         'left_field' => 'tid',
         'field' => 'parent',
-      ),
-      'taxonomy_term_field_data' => array(
+      ],
+      'taxonomy_term_field_data' => [
         // Link directly to taxonomy_term_field_data via tid.
         'left_field' => 'tid',
         'field' => 'tid',
-      ),
-    );
+      ],
+    ];
 
-    $data['taxonomy_term_hierarchy']['parent'] = array(
+    $data['taxonomy_term_hierarchy']['parent'] = [
       'title' => $this->t('Parent term'),
       'help' => $this->t('The parent term of the term. This can produce duplicate entries if you are using a vocabulary that allows multiple parents.'),
-      'relationship' => array(
+      'relationship' => [
         'base' => 'taxonomy_term_field_data',
         'field' => 'parent',
         'label' => $this->t('Parent'),
         'id' => 'standard',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'help' => $this->t('Filter the results of "Taxonomy: Term" by the parent pid.'),
         'id' => 'numeric',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'help' => $this->t('The parent term of the term.'),
         'id' => 'taxonomy',
-      ),
-    );
+      ],
+    ];
 
     return $data;
   }
diff --git a/web/core/modules/taxonomy/src/Tests/RssTest.php b/web/core/modules/taxonomy/src/Tests/RssTest.php
index effd4dd97..81a397d69 100644
--- a/web/core/modules/taxonomy/src/Tests/RssTest.php
+++ b/web/core/modules/taxonomy/src/Tests/RssTest.php
@@ -18,7 +18,7 @@ class RssTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field_ui', 'views');
+  public static $modules = ['node', 'field_ui', 'views'];
 
   /**
    * Vocabulary for testing.
@@ -41,23 +41,23 @@ class RssTest extends TaxonomyTestBase {
     $this->vocabulary = $this->createVocabulary();
     $this->fieldName = 'taxonomy_' . $this->vocabulary->id();
 
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'article', $this->fieldName, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'options_select',
-      ))
+      ])
       ->save();
     entity_get_display('node', 'article', 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
   }
 
@@ -66,26 +66,27 @@ class RssTest extends TaxonomyTestBase {
    *
    * Create a node and assert that taxonomy terms appear in rss.xml.
    */
-  function testTaxonomyRss() {
+  public function testTaxonomyRss() {
     // Create two taxonomy terms.
     $term1 = $this->createTerm($this->vocabulary);
 
     // RSS display must be added manually.
     $this->drupalGet("admin/structure/types/manage/article/display");
-    $edit = array(
+    $edit = [
       "display_modes_custom[rss]" => '1',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Change the format to 'RSS category'.
     $this->drupalGet("admin/structure/types/manage/article/display/rss");
-    $edit = array(
+    $edit = [
       "fields[taxonomy_" . $this->vocabulary->id() . "][type]" => 'entity_reference_rss_category',
-    );
+      "fields[taxonomy_" . $this->vocabulary->id() . "][region]" => 'content',
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Post an article.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $edit[$this->fieldName . '[]'] = $term1->id();
     $this->drupalPostForm('node/add/article', $edit, t('Save'));
@@ -94,7 +95,7 @@ class RssTest extends TaxonomyTestBase {
     $this->drupalGet('rss.xml');
     $test_element = sprintf(
       '<category %s>%s</category>',
-      'domain="' . $term1->url('canonical', array('absolute' => TRUE)) . '"',
+      'domain="' . $term1->url('canonical', ['absolute' => TRUE]) . '"',
       $term1->getName()
     );
     $this->assertRaw($test_element, 'Term is displayed when viewing the rss feed.');
diff --git a/web/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php b/web/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
index 306e160b2..7d2ee2b63 100644
--- a/web/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
+++ b/web/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
@@ -26,48 +26,48 @@ class TaxonomyImageTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $modules = array('image');
+  public static $modules = ['image'];
 
   protected function setUp() {
     parent::setUp();
 
     // Remove access content permission from registered users.
-    user_role_revoke_permissions(RoleInterface::AUTHENTICATED_ID, array('access content'));
+    user_role_revoke_permissions(RoleInterface::AUTHENTICATED_ID, ['access content']);
 
     $this->vocabulary = $this->createVocabulary();
     // Add a field to the vocabulary.
     $entity_type = 'taxonomy_term';
     $name = 'field_test';
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $name,
       'entity_type' => $entity_type,
       'type' => 'image',
-      'settings' => array(
+      'settings' => [
         'uri_scheme' => 'private',
-      ),
-    ))->save();
+      ],
+    ])->save();
     FieldConfig::create([
       'field_name' => $name,
       'entity_type' => $entity_type,
       'bundle' => $this->vocabulary->id(),
-      'settings' => array(),
+      'settings' => [],
     ])->save();
     entity_get_display($entity_type, $this->vocabulary->id(), 'default')
-      ->setComponent($name, array(
+      ->setComponent($name, [
         'type' => 'image',
-        'settings' => array(),
-      ))
+        'settings' => [],
+      ])
       ->save();
     entity_get_form_display($entity_type, $this->vocabulary->id(), 'default')
-      ->setComponent($name, array(
+      ->setComponent($name, [
         'type' => 'image_image',
-        'settings' => array(),
-      ))
+        'settings' => [],
+      ])
       ->save();
   }
 
   public function testTaxonomyImageAccess() {
-    $user = $this->drupalCreateUser(array('administer site configuration', 'administer taxonomy', 'access user profiles'));
+    $user = $this->drupalCreateUser(['administer site configuration', 'administer taxonomy', 'access user profiles']);
     $this->drupalLogin($user);
 
     // Create a term and upload the image.
@@ -77,12 +77,12 @@ class TaxonomyImageTest extends TaxonomyTestBase {
     $edit['files[field_test_0]'] = drupal_realpath($image->uri);
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add', $edit, t('Save'));
     $this->drupalPostForm(NULL, ['field_test[0][alt]' => $this->randomMachineName()], t('Save'));
-    $terms = entity_load_multiple_by_properties('taxonomy_term', array('name' => $edit['name[0][value]']));
+    $terms = entity_load_multiple_by_properties('taxonomy_term', ['name' => $edit['name[0][value]']]);
     $term = reset($terms);
-    $this->assertText(t('Created new term @name.', array('@name' => $term->getName())));
+    $this->assertText(t('Created new term @name.', ['@name' => $term->getName()]));
 
     // Create a user that should have access to the file and one that doesn't.
-    $access_user = $this->drupalCreateUser(array('access content'));
+    $access_user = $this->drupalCreateUser(['access content']);
     $no_access_user = $this->drupalCreateUser();
     $image = File::load($term->field_test->target_id);
     $this->drupalLogin($access_user);
diff --git a/web/core/modules/taxonomy/src/Tests/TaxonomyQueryAlterTest.php b/web/core/modules/taxonomy/src/Tests/TaxonomyQueryAlterTest.php
index 543910b0b..e5e787bb5 100644
--- a/web/core/modules/taxonomy/src/Tests/TaxonomyQueryAlterTest.php
+++ b/web/core/modules/taxonomy/src/Tests/TaxonomyQueryAlterTest.php
@@ -26,7 +26,7 @@ class TaxonomyQueryAlterTest extends WebTestBase {
   public function testTaxonomyQueryAlter() {
     // Create a new vocabulary and add a few terms to it.
     $vocabulary = $this->createVocabulary();
-    $terms = array();
+    $terms = [];
     for ($i = 0; $i < 5; $i++) {
       $terms[$i] = $this->createTerm($vocabulary);
     }
diff --git a/web/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php b/web/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
index 6043d7751..fbf8515ea 100644
--- a/web/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
+++ b/web/core/modules/taxonomy/src/Tests/TaxonomyTermIndentationTest.php
@@ -14,7 +14,7 @@ class TaxonomyTermIndentationTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   /**
    * Vocabulary for testing.
@@ -32,7 +32,7 @@ class TaxonomyTermIndentationTest extends TaxonomyTestBase {
   /**
    * Tests term indentation.
    */
-  function testTermIndentation() {
+  public function testTermIndentation() {
     // Create three taxonomy terms.
     $term1 = $this->createTerm($this->vocabulary);
     $term2 = $this->createTerm($this->vocabulary);
@@ -42,12 +42,12 @@ class TaxonomyTermIndentationTest extends TaxonomyTestBase {
     $taxonomy_storage = $this->container->get('entity.manager')->getStorage('taxonomy_term');
 
     // Indent the second term under the first one.
-    $edit = array(
+    $edit = [
       'terms[tid:' . $term2->id() . ':0][term][tid]' => 2,
       'terms[tid:' . $term2->id() . ':0][term][parent]' => 1,
       'terms[tid:' . $term2->id() . ':0][term][depth]' => 1,
       'terms[tid:' . $term2->id() . ':0][weight]' => 1,
-    );
+    ];
 
     // 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'));
@@ -58,12 +58,12 @@ class TaxonomyTermIndentationTest extends TaxonomyTestBase {
     $this->assertEqual(key($parents), 1, 'Term 1 is the term 2\'s parent');
 
     // Move the second term back out to the root level.
-    $edit = array(
+    $edit = [
       'terms[tid:' . $term2->id() . ':0][term][tid]' => 2,
       'terms[tid:' . $term2->id() . ':0][term][parent]' => 0,
       'terms[tid:' . $term2->id() . ':0][term][depth]' => 0,
       'terms[tid:' . $term2->id() . ':0][weight]' => 1,
-    );
+    ];
 
     $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.
diff --git a/web/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php b/web/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
index aa9123798..838a9b02c 100644
--- a/web/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
+++ b/web/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php
@@ -7,6 +7,9 @@ use Drupal\simpletest\WebTestBase;
 
 /**
  * Provides common helper methods for Taxonomy module tests.
+ *
+ * @deprecated Scheduled for removal in Drupal 9.0.0.
+ *   Use \Drupal\Tests\taxonomy\Functional\TaxonomyTestBase instead.
  */
 abstract class TaxonomyTestBase extends WebTestBase {
 
@@ -18,7 +21,7 @@ abstract class TaxonomyTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy', 'block');
+  public static $modules = ['taxonomy', 'block'];
 
   /**
    * {@inheritdoc}
@@ -29,7 +32,7 @@ abstract class TaxonomyTestBase extends WebTestBase {
 
     // Create Basic page and Article node types.
     if ($this->profile != 'standard') {
-      $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
     }
   }
 
diff --git a/web/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php b/web/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
index f04be0013..744ab1b28 100644
--- a/web/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
+++ b/web/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
@@ -15,7 +15,7 @@ trait TaxonomyTestTrait {
   /**
    * Returns a new vocabulary with random properties.
    */
-  function createVocabulary() {
+  public function createVocabulary() {
     // Create a vocabulary.
     $vocabulary = Vocabulary::create([
       'name' => $this->randomMachineName(),
@@ -40,7 +40,7 @@ trait TaxonomyTestTrait {
    * @return \Drupal\taxonomy\Entity\Term
    *   The new taxonomy term object.
    */
-  function createTerm(Vocabulary $vocabulary, $values = array()) {
+  public function createTerm(Vocabulary $vocabulary, $values = []) {
     $filter_formats = filter_formats();
     $format = array_pop($filter_formats);
     $term = Term::create($values + [
diff --git a/web/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php b/web/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
index 5ae627035..3607fc6b0 100644
--- a/web/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
+++ b/web/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
@@ -79,26 +79,26 @@ trait TaxonomyTranslationTestTrait {
    *   to FALSE.
    */
   protected function setUpTermReferenceField() {
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'article', $this->termFieldName, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
     $field_storage = FieldStorageConfig::loadByName('node', $this->termFieldName);
     $field_storage->setTranslatable(FALSE);
     $field_storage->save();
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($this->termFieldName, array(
+      ->setComponent($this->termFieldName, [
         'type' => 'entity_reference_autocomplete_tags',
-      ))
+      ])
       ->save();
     entity_get_display('node', 'article', 'default')
-      ->setComponent($this->termFieldName, array(
+      ->setComponent($this->termFieldName, [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
   }
 
diff --git a/web/core/modules/taxonomy/src/Tests/TermTest.php b/web/core/modules/taxonomy/src/Tests/TermTest.php
index 311ed6b7c..42f92b1b4 100644
--- a/web/core/modules/taxonomy/src/Tests/TermTest.php
+++ b/web/core/modules/taxonomy/src/Tests/TermTest.php
@@ -52,31 +52,31 @@ class TermTest extends TaxonomyTestBase {
 
     $field_name = 'taxonomy_' . $this->vocabulary->id();
 
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'article', $field_name, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
     $this->field = FieldConfig::loadByName('node', 'article', $field_name);
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'options_select',
-      ))
+      ])
       ->save();
     entity_get_display('node', 'article', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
   }
 
   /**
    * Test terms in a single and multiple hierarchy.
    */
-  function testTaxonomyTermHierarchy() {
+  public function testTaxonomyTermHierarchy() {
     // Create two taxonomy terms.
     $term1 = $this->createTerm($this->vocabulary);
     $term2 = $this->createTerm($this->vocabulary);
@@ -89,8 +89,8 @@ class TermTest extends TaxonomyTestBase {
     $this->assertEqual(0, $vocabulary->getHierarchy(), 'Vocabulary is flat.');
 
     // Edit $term2, setting $term1 as parent.
-    $edit = array();
-    $edit['parent[]'] = array($term1->id());
+    $edit = [];
+    $edit['parent[]'] = [$term1->id()];
     $this->drupalPostForm('taxonomy/term/' . $term2->id() . '/edit', $edit, t('Save'));
 
     // Check the hierarchy.
@@ -107,7 +107,7 @@ class TermTest extends TaxonomyTestBase {
 
     // Create a third term and save this as a parent of term2.
     $term3 = $this->createTerm($this->vocabulary);
-    $term2->parent = array($term1->id(), $term3->id());
+    $term2->parent = [$term1->id(), $term3->id()];
     $term2->save();
     $parents = $taxonomy_storage->loadParents($term2->id());
     $this->assertTrue(isset($parents[$term1->id()]) && isset($parents[$term3->id()]), 'Both parents found successfully.');
@@ -116,7 +116,7 @@ class TermTest extends TaxonomyTestBase {
   /**
    * Tests that many terms with parents show on each page
    */
-  function testTaxonomyTermChildTerms() {
+  public function testTaxonomyTermChildTerms() {
     // Set limit to 10 terms per page. Set variable to 9 so 10 terms appear.
     $this->config('taxonomy.settings')->set('terms_per_page_admin', '9')->save();
     $term1 = $this->createTerm($this->vocabulary);
@@ -127,7 +127,7 @@ class TermTest extends TaxonomyTestBase {
     // Create 40 terms. Terms 1-12 get parent of $term1. All others are
     // individual terms.
     for ($x = 1; $x <= 40; $x++) {
-      $edit = array();
+      $edit = [];
       // Set terms in order so we know which terms will be on which pages.
       $edit['weight'] = $x;
 
@@ -149,14 +149,14 @@ class TermTest extends TaxonomyTestBase {
     }
 
     // Get Page 2.
-    $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview', array('query' => array('page' => 1)));
+    $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview', ['query' => ['page' => 1]]);
     $this->assertText($term1->getName(), 'Parent Term is displayed on Page 2');
     for ($x = 1; $x <= 18; $x++) {
       $this->assertText($terms_array[$x]->getName(), $terms_array[$x]->getName() . ' found on Page 2');
     }
 
     // Get Page 3.
-    $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview', array('query' => array('page' => 2)));
+    $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview', ['query' => ['page' => 2]]);
     $this->assertNoText($term1->getName(), 'Parent Term is not displayed on Page 3');
     for ($x = 1; $x <= 17; $x++) {
       $this->assertNoText($terms_array[$x]->getName(), $terms_array[$x]->getName() . ' not found on Page 3');
@@ -171,13 +171,13 @@ class TermTest extends TaxonomyTestBase {
    *
    * Save & edit a node and assert that taxonomy terms are saved/loaded properly.
    */
-  function testTaxonomyNode() {
+  public function testTaxonomyNode() {
     // Create two taxonomy terms.
     $term1 = $this->createTerm($this->vocabulary);
     $term2 = $this->createTerm($this->vocabulary);
 
     // Post an article.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $edit['body[0][value]'] = $this->randomMachineName();
     $edit[$this->field->getName() . '[]'] = $term1->id();
@@ -190,7 +190,7 @@ class TermTest extends TaxonomyTestBase {
 
     $this->clickLink(t('Edit'));
     $this->assertText($term1->getName(), 'Term is displayed when editing the node.');
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $this->assertText($term1->getName(), 'Term is displayed after saving the node with no changes.');
 
     // Edit the node with a different term.
@@ -210,28 +210,28 @@ class TermTest extends TaxonomyTestBase {
   /**
    * Test term creation with a free-tagging vocabulary from the node form.
    */
-  function testNodeTermCreationAndDeletion() {
+  public function testNodeTermCreationAndDeletion() {
     // Enable tags in the vocabulary.
     $field = $this->field;
     entity_get_form_display($field->getTargetEntityTypeId(), $field->getTargetBundle(), 'default')
-      ->setComponent($field->getName(), array(
+      ->setComponent($field->getName(), [
         'type' => 'entity_reference_autocomplete_tags',
-        'settings' => array(
+        'settings' => [
           'placeholder' => 'Start typing here.',
-        ),
-      ))
+        ],
+      ])
       ->save();
     // Prefix the terms with a letter to ensure there is no clash in the first
     // three letters.
     // @see https://www.drupal.org/node/2397691
-    $terms = array(
+    $terms = [
       'term1' => 'a' . $this->randomMachineName(),
       'term2' => 'b' . $this->randomMachineName(),
       'term3' => 'c' . $this->randomMachineName() . ', ' . $this->randomMachineName(),
       'term4' => 'd' . $this->randomMachineName(),
-    );
+    ];
 
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $edit['body[0][value]'] = $this->randomMachineName();
     // Insert the terms in a comma separated list. Vocabulary 1 is a
@@ -255,10 +255,10 @@ class TermTest extends TaxonomyTestBase {
 
     // Save, creating the terms.
     $this->drupalPostForm('node/add/article', $edit, t('Save'));
-    $this->assertText(t('@type @title has been created.', array('@type' => t('Article'), '@title' => $edit['title[0][value]'])), 'The node was created successfully.');
+    $this->assertText(t('@type @title has been created.', ['@type' => t('Article'), '@title' => $edit['title[0][value]']]), 'The node was created successfully.');
 
     // Verify that the creation message contains a link to a node.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'node/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'node/']);
     $this->assert(isset($view_link), 'The message area contains a link to a node');
 
     foreach ($terms as $term) {
@@ -266,7 +266,7 @@ class TermTest extends TaxonomyTestBase {
     }
 
     // Get the created terms.
-    $term_objects = array();
+    $term_objects = [];
     foreach ($terms as $key => $term) {
       $term_objects[$key] = taxonomy_term_load_multiple_by_name($term);
       $term_objects[$key] = reset($term_objects[$key]);
@@ -288,30 +288,30 @@ class TermTest extends TaxonomyTestBase {
 
     // Delete term 2 from the term delete page.
     $this->drupalGet('taxonomy/term/' . $term_objects['term2']->id() . '/delete');
-    $this->drupalPostForm(NULL, array(), t('Delete'));
-    $term_names = array($term_objects['term3']->getName(), $term_objects['term4']->getName());
+    $this->drupalPostForm(NULL, [], t('Delete'));
+    $term_names = [$term_objects['term3']->getName(), $term_objects['term4']->getName()];
 
     $this->drupalGet('node/' . $node->id());
 
     foreach ($term_names as $term_name) {
-      $this->assertText($term_name, format_string('The term %name appears on the node page after two terms, %deleted1 and %deleted2, were deleted.', array('%name' => $term_name, '%deleted1' => $term_objects['term1']->getName(), '%deleted2' => $term_objects['term2']->getName())));
+      $this->assertText($term_name, format_string('The term %name appears on the node page after two terms, %deleted1 and %deleted2, were deleted.', ['%name' => $term_name, '%deleted1' => $term_objects['term1']->getName(), '%deleted2' => $term_objects['term2']->getName()]));
     }
-    $this->assertNoText($term_objects['term1']->getName(), format_string('The deleted term %name does not appear on the node page.', array('%name' => $term_objects['term1']->getName())));
-    $this->assertNoText($term_objects['term2']->getName(), format_string('The deleted term %name does not appear on the node page.', array('%name' => $term_objects['term2']->getName())));
+    $this->assertNoText($term_objects['term1']->getName(), format_string('The deleted term %name does not appear on the node page.', ['%name' => $term_objects['term1']->getName()]));
+    $this->assertNoText($term_objects['term2']->getName(), format_string('The deleted term %name does not appear on the node page.', ['%name' => $term_objects['term2']->getName()]));
   }
 
   /**
    * Save, edit and delete a term using the user interface.
    */
-  function testTermInterface() {
-    \Drupal::service('module_installer')->install(array('views'));
-    $edit = array(
+  public function testTermInterface() {
+    \Drupal::service('module_installer')->install(['views']);
+    $edit = [
       'name[0][value]' => $this->randomMachineName(12),
       'description[0][value]' => $this->randomMachineName(100),
-    );
+    ];
     // Explicitly set the parents field to 'root', to ensure that
     // TermForm::save() handles the invalid term ID correctly.
-    $edit['parent[]'] = array(0);
+    $edit['parent[]'] = [0];
 
     // Create the term to edit.
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add', $edit, t('Save'));
@@ -328,10 +328,10 @@ class TermTest extends TaxonomyTestBase {
     $this->assertRaw($edit['name[0][value]'], 'The randomly generated term name is present.');
     $this->assertText($edit['description[0][value]'], 'The randomly generated term description is present.');
 
-    $edit = array(
+    $edit = [
       'name[0][value]' => $this->randomMachineName(14),
       'description[0][value]' => $this->randomMachineName(102),
-    );
+    ];
 
     // Edit the term.
     $this->drupalPostForm('taxonomy/term/' . $term->id() . '/edit', $edit, t('Save'));
@@ -380,7 +380,7 @@ class TermTest extends TaxonomyTestBase {
   /**
    * Save, edit and delete a term using the user interface.
    */
-  function testTermReorder() {
+  public function testTermReorder() {
     $this->createTerm($this->vocabulary);
     $this->createTerm($this->vocabulary);
     $this->createTerm($this->vocabulary);
@@ -398,7 +398,7 @@ class TermTest extends TaxonomyTestBase {
     // "tid:1:0[depth]", and "tid:1:0[weight]". Change the order to term2,
     // term3, term1 by setting weight property, make term3 a child of term2 by
     // setting the parent and depth properties, and update all hidden fields.
-    $edit = array(
+    $edit = [
       'terms[tid:' . $term2->id() . ':0][term][tid]' => $term2->id(),
       'terms[tid:' . $term2->id() . ':0][term][parent]' => 0,
       'terms[tid:' . $term2->id() . ':0][term][depth]' => 0,
@@ -411,18 +411,18 @@ class TermTest extends TaxonomyTestBase {
       'terms[tid:' . $term1->id() . ':0][term][parent]' => 0,
       'terms[tid:' . $term1->id() . ':0][term][depth]' => 0,
       'terms[tid:' . $term1->id() . ':0][weight]' => 2,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     $taxonomy_storage->resetCache();
     $terms = $taxonomy_storage->loadTree($this->vocabulary->id());
     $this->assertEqual($terms[0]->tid, $term2->id(), 'Term 2 was moved above term 1.');
-    $this->assertEqual($terms[1]->parents, array($term2->id()), 'Term 3 was made a child of term 2.');
+    $this->assertEqual($terms[1]->parents, [$term2->id()], 'Term 3 was made a child of term 2.');
     $this->assertEqual($terms[2]->tid, $term1->id(), 'Term 1 was moved below term 2.');
 
-    $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview', array(), t('Reset to alphabetical'));
+    $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview', [], t('Reset to alphabetical'));
     // Submit confirmation form.
-    $this->drupalPostForm(NULL, array(), t('Reset to alphabetical'));
+    $this->drupalPostForm(NULL, [], t('Reset to alphabetical'));
     // Ensure form redirected back to overview.
     $this->assertUrl('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview');
 
@@ -431,22 +431,22 @@ class TermTest extends TaxonomyTestBase {
     $this->assertEqual($terms[0]->id(), $term1->id(), 'Term 1 was moved to back above term 2.');
     $this->assertEqual($terms[1]->id(), $term2->id(), 'Term 2 was moved to back below term 1.');
     $this->assertEqual($terms[2]->id(), $term3->id(), 'Term 3 is still below term 2.');
-    $this->assertEqual($terms[2]->parents, array($term2->id()), 'Term 3 is still a child of term 2.');
+    $this->assertEqual($terms[2]->parents, [$term2->id()], 'Term 3 is still a child of term 2.');
   }
 
   /**
    * Test saving a term with multiple parents through the UI.
    */
-  function testTermMultipleParentsInterface() {
+  public function testTermMultipleParentsInterface() {
     // Add a new term to the vocabulary so that we can have multiple parents.
     $parent = $this->createTerm($this->vocabulary);
 
     // Add a new term with multiple parents.
-    $edit = array(
+    $edit = [
       'name[0][value]' => $this->randomMachineName(12),
       'description[0][value]' => $this->randomMachineName(100),
-      'parent[]' => array(0, $parent->id()),
-    );
+      'parent[]' => [0, $parent->id()],
+    ];
     // Save the new term.
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add', $edit, t('Save'));
 
@@ -466,7 +466,7 @@ class TermTest extends TaxonomyTestBase {
   /**
    * Test taxonomy_term_load_multiple_by_name().
    */
-  function testTaxonomyGetTermByName() {
+  public function testTaxonomyGetTermByName() {
     $term = $this->createTerm($this->vocabulary);
 
     // Load the term with the exact name.
@@ -526,18 +526,18 @@ class TermTest extends TaxonomyTestBase {
   /**
    * Tests that editing and saving a node with no changes works correctly.
    */
-  function testReSavingTags() {
+  public function testReSavingTags() {
     // Enable tags in the vocabulary.
     $field = $this->field;
     entity_get_form_display($field->getTargetEntityTypeId(), $field->getTargetBundle(), 'default')
-      ->setComponent($field->getName(), array(
+      ->setComponent($field->getName(), [
         'type' => 'entity_reference_autocomplete_tags',
-      ))
+      ])
       ->save();
 
     // Create a term and a node using it.
     $term = $this->createTerm($this->vocabulary);
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName(8);
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $edit[$this->field->getName() . '[target_id]'] = $term->getName();
@@ -547,7 +547,7 @@ class TermTest extends TaxonomyTestBase {
     // changes.
     $this->clickLink(t('Edit'));
     $this->assertRaw($term->getName(), 'Term is displayed when editing the node.');
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $this->assertRaw($term->getName(), 'Term is displayed after saving the node with no changes.');
   }
 
diff --git a/web/core/modules/taxonomy/src/Tests/TermTranslationTest.php b/web/core/modules/taxonomy/src/Tests/TermTranslationTest.php
index 91b13b158..ccb16f611 100644
--- a/web/core/modules/taxonomy/src/Tests/TermTranslationTest.php
+++ b/web/core/modules/taxonomy/src/Tests/TermTranslationTest.php
@@ -20,23 +20,23 @@ class TermTranslationTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  protected $termTranslationMap = array(
+  protected $termTranslationMap = [
     'one' => 'translatedOne',
     'two' => 'translatedTwo',
     'three' => 'translatedThree',
-  );
+  ];
 
   /**
    * Created terms.
    *
    * @var \Drupal\taxonomy\Entity\Term[]
    */
-  protected $terms = array();
+  protected $terms = [];
 
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('taxonomy', 'language', 'content_translation');
+  public static $modules = ['taxonomy', 'language', 'content_translation'];
 
   /**
    * {@inheritdoc}
@@ -55,7 +55,7 @@ class TermTranslationTest extends TaxonomyTestBase {
    */
   public function testTranslatedBreadcrumbs() {
     // Ensure non-translated breadcrumb is correct.
-    $breadcrumb = array(Url::fromRoute('<front>')->toString() => 'Home');
+    $breadcrumb = [Url::fromRoute('<front>')->toString() => 'Home'];
     foreach ($this->terms as $term) {
       $breadcrumb[$term->url()] = $term->label();
     }
@@ -69,7 +69,7 @@ class TermTranslationTest extends TaxonomyTestBase {
     $languages = \Drupal::languageManager()->getLanguages();
 
     // Construct the expected translated breadcrumb.
-    $breadcrumb = array(Url::fromRoute('<front>', [], ['language' => $languages[$this->translateToLangcode]])->toString() => 'Home');
+    $breadcrumb = [Url::fromRoute('<front>', [], ['language' => $languages[$this->translateToLangcode]])->toString() => 'Home'];
     foreach ($this->terms as $term) {
       $translated = $term->getTranslation($this->translateToLangcode);
       $url = $translated->url('canonical', ['language' => $languages[$this->translateToLangcode]]);
@@ -87,14 +87,14 @@ class TermTranslationTest extends TaxonomyTestBase {
   /**
    * Test translation of terms are showed in the node.
    */
-  protected function testTermsTranslation() {
+  public function testTermsTranslation() {
 
     // Set the display of the term reference field on the article content type
     // to "Check boxes/radio buttons".
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($this->termFieldName, array(
+      ->setComponent($this->termFieldName, [
         'type' => 'options_buttons',
-      ))
+      ])
       ->save();
     $this->drupalLogin($this->drupalCreateUser(['create article content']));
 
@@ -118,15 +118,15 @@ class TermTranslationTest extends TaxonomyTestBase {
     $parent_vid = 0;
     foreach ($this->termTranslationMap as $name => $translation) {
 
-      $term = $this->createTerm($this->vocabulary, array(
+      $term = $this->createTerm($this->vocabulary, [
         'name' => $name,
         'langcode' => $this->baseLangcode,
         'parent' => $parent_vid,
-      ));
+      ]);
 
-      $term->addTranslation($this->translateToLangcode, array(
+      $term->addTranslation($this->translateToLangcode, [
         'name' => $translation,
-      ));
+      ]);
       $term->save();
 
       // Each term is nested under the last.
diff --git a/web/core/modules/taxonomy/src/Tests/TermTranslationUITest.php b/web/core/modules/taxonomy/src/Tests/TermTranslationUITest.php
index fa9652def..43edc156b 100644
--- a/web/core/modules/taxonomy/src/Tests/TermTranslationUITest.php
+++ b/web/core/modules/taxonomy/src/Tests/TermTranslationUITest.php
@@ -25,7 +25,7 @@ class TermTranslationUITest extends ContentTranslationUITestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'content_translation', 'taxonomy');
+  public static $modules = ['language', 'content_translation', 'taxonomy'];
 
   protected function setUp() {
     $this->entityTypeId = 'taxonomy_term';
@@ -54,14 +54,14 @@ class TermTranslationUITest extends ContentTranslationUITestBase {
    * {@inheritdoc}
    */
   protected function getTranslatorPermissions() {
-    return array_merge(parent::getTranslatorPermissions(), array('administer taxonomy'));
+    return array_merge(parent::getTranslatorPermissions(), ['administer taxonomy']);
   }
 
   /**
    * {@inheritdoc}
    */
   protected function getNewEntityValues($langcode) {
-    return array('name' => $this->randomMachineName()) + parent::getNewEntityValues($langcode);
+    return ['name' => $this->randomMachineName()] + parent::getNewEntityValues($langcode);
   }
 
   /**
@@ -73,7 +73,7 @@ class TermTranslationUITest extends ContentTranslationUITestBase {
     // To be able to post values for the configurable base fields (name,
     // description) have to be suffixed with [0][value].
     foreach ($edit as $property => $value) {
-      foreach (array('name', 'description') as $key) {
+      foreach (['name', 'description'] as $key) {
         if ($property == $key) {
           $edit[$key . '[0][value]'] = $value;
           unset($edit[$property]);
@@ -91,7 +91,7 @@ class TermTranslationUITest extends ContentTranslationUITestBase {
 
     // Make sure that no row was inserted for taxonomy vocabularies which do
     // not have translations enabled.
-    $rows = db_query('SELECT tid, count(tid) AS count FROM {taxonomy_term_field_data} WHERE vid <> :vid GROUP BY tid', array(':vid' => $this->bundle))->fetchAll();
+    $rows = db_query('SELECT tid, count(tid) AS count FROM {taxonomy_term_field_data} WHERE vid <> :vid GROUP BY tid', [':vid' => $this->bundle])->fetchAll();
     foreach ($rows as $row) {
       $this->assertTrue($row->count < 2, 'Term does not have translations.');
     }
@@ -100,12 +100,12 @@ class TermTranslationUITest extends ContentTranslationUITestBase {
   /**
    * Tests translate link on vocabulary term list.
    */
-  function testTranslateLinkVocabularyAdminPage() {
+  public function testTranslateLinkVocabularyAdminPage() {
     $this->drupalLogin($this->drupalCreateUser(array_merge(parent::getTranslatorPermissions(), ['access administration pages', 'administer taxonomy'])));
 
-    $values = array(
+    $values = [
       'name' => $this->randomMachineName(),
-    );
+    ];
     $translatable_tid = $this->createEntity($values, $this->langcodes[0], $this->vocabulary->id());
 
     // Create an untranslatable vocabulary.
@@ -118,9 +118,9 @@ class TermTranslationUITest extends ContentTranslationUITestBase {
     ]);
     $untranslatable_vocabulary->save();
 
-    $values = array(
+    $values = [
       'name' => $this->randomMachineName(),
-    );
+    ];
     $untranslatable_tid = $this->createEntity($values, $this->langcodes[0], $untranslatable_vocabulary->id());
 
     // Verify translation links.
@@ -148,14 +148,14 @@ class TermTranslationUITest extends ContentTranslationUITestBase {
     foreach ($this->langcodes as $langcode) {
       // We only want to test the title for non-english translations.
       if ($langcode != 'en') {
-        $options = array('language' => $languages[$langcode]);
+        $options = ['language' => $languages[$langcode]];
         $url = $entity->urlInfo('edit-form', $options);
         $this->drupalGet($url);
 
-        $title = t('@title [%language translation]', array(
+        $title = t('@title [%language translation]', [
           '@title' => $entity->getTranslation($langcode)->label(),
           '%language' => $languages[$langcode]->getName(),
-        ));
+        ]);
         $this->assertRaw($title);
       }
     }
diff --git a/web/core/modules/taxonomy/src/Tests/ThemeTest.php b/web/core/modules/taxonomy/src/Tests/ThemeTest.php
index 54ad6e462..8995c809a 100644
--- a/web/core/modules/taxonomy/src/Tests/ThemeTest.php
+++ b/web/core/modules/taxonomy/src/Tests/ThemeTest.php
@@ -14,7 +14,7 @@ class ThemeTest extends TaxonomyTestBase {
 
     // Make sure we are using distinct default and administrative themes for
     // the duration of these tests.
-    \Drupal::service('theme_handler')->install(array('bartik', 'seven'));
+    \Drupal::service('theme_handler')->install(['bartik', 'seven']);
     $this->config('system.theme')
       ->set('default', 'bartik')
       ->set('admin', 'seven')
@@ -22,14 +22,14 @@ class ThemeTest extends TaxonomyTestBase {
 
     // Create and log in as a user who has permission to add and edit taxonomy
     // terms and view the administrative theme.
-    $admin_user = $this->drupalCreateUser(array('administer taxonomy', 'view the administration theme'));
+    $admin_user = $this->drupalCreateUser(['administer taxonomy', 'view the administration theme']);
     $this->drupalLogin($admin_user);
   }
 
   /**
    * Test the theme used when adding, viewing and editing taxonomy terms.
    */
-  function testTaxonomyTermThemes() {
+  public function testTaxonomyTermThemes() {
     // Adding a term to a vocabulary is considered an administrative action and
     // should use the administrative theme.
     $vocabulary = $this->createVocabulary();
diff --git a/web/core/modules/taxonomy/src/Tests/Views/RelationshipNodeTermDataTest.php b/web/core/modules/taxonomy/src/Tests/Views/RelationshipNodeTermDataTest.php
index c38c45c39..4f0cb4859 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/RelationshipNodeTermDataTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/RelationshipNodeTermDataTest.php
@@ -16,9 +16,9 @@ class RelationshipNodeTermDataTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_taxonomy_node_term_data');
+  public static $testViews = ['test_taxonomy_node_term_data'];
 
-  function testViewsHandlerRelationshipNodeTermData() {
+  public function testViewsHandlerRelationshipNodeTermData() {
     $view = Views::getView('test_taxonomy_node_term_data');
     // Tests \Drupal\taxonomy\Plugin\views\relationship\NodeTermData::calculateDependencies().
     $expected = [
@@ -30,16 +30,16 @@ class RelationshipNodeTermDataTest extends TaxonomyTestBase {
       ],
     ];
     $this->assertIdentical($expected, $view->getDependencies());
-    $this->executeView($view, array($this->term1->id(), $this->term2->id()));
-    $expected_result = array(
-      array(
+    $this->executeView($view, [$this->term1->id(), $this->term2->id()]);
+    $expected_result = [
+      [
         'nid' => $this->nodes[1]->id(),
-      ),
-      array(
+      ],
+      [
         'nid' => $this->nodes[0]->id(),
-      ),
-    );
-    $column_map = array('nid' => 'nid');
+      ],
+    ];
+    $column_map = ['nid' => 'nid'];
     $this->assertIdenticalResultset($view, $expected_result, $column_map);
 
     // Change the view to test relation limited by vocabulary.
@@ -51,7 +51,7 @@ class RelationshipNodeTermDataTest extends TaxonomyTestBase {
     // Tests \Drupal\taxonomy\Plugin\views\relationship\NodeTermData::calculateDependencies().
     $expected['config'][] = 'taxonomy.vocabulary.views_testing_tags';
     $this->assertIdentical($expected, $view->getDependencies());
-    $this->executeView($view, array($this->term1->id(), $this->term2->id()));
+    $this->executeView($view, [$this->term1->id(), $this->term2->id()]);
     $this->assertIdenticalResultset($view, $expected_result, $column_map);
   }
 
diff --git a/web/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php b/web/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php
index d049f8228..aa85c9e5b 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/RelationshipRepresentativeNodeTest.php
@@ -16,7 +16,7 @@ class RelationshipRepresentativeNodeTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_groupwise_term');
+  public static $testViews = ['test_groupwise_term'];
 
   /**
    * Tests the relationship.
@@ -24,17 +24,17 @@ class RelationshipRepresentativeNodeTest extends TaxonomyTestBase {
   public function testRelationship() {
     $view = Views::getView('test_groupwise_term');
     $this->executeView($view);
-    $map = array('node_field_data_taxonomy_term_field_data_nid' => 'nid', 'tid' => 'tid');
-    $expected_result = array(
-      array(
+    $map = ['node_field_data_taxonomy_term_field_data_nid' => 'nid', 'tid' => 'tid'];
+    $expected_result = [
+      [
         'nid' => $this->nodes[1]->id(),
         'tid' => $this->term2->id(),
-      ),
-      array(
+      ],
+      [
         'nid' => $this->nodes[1]->id(),
         'tid' => $this->term1->id(),
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $map);
   }
 
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyDefaultArgumentTest.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyDefaultArgumentTest.php
index c08266f12..8b263b4f6 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyDefaultArgumentTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyDefaultArgumentTest.php
@@ -19,7 +19,7 @@ class TaxonomyDefaultArgumentTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $testViews = array('taxonomy_default_argument_test');
+  public static $testViews = ['taxonomy_default_argument_test'];
 
   /**
    * Tests the relationship.
@@ -37,7 +37,7 @@ class TaxonomyDefaultArgumentTest extends TaxonomyTestBase {
     $view->setResponse($response);
 
     $view->initHandlers();
-    $expected = implode(',', array($this->term1->id(), $this->term2->id()));
+    $expected = implode(',', [$this->term1->id(), $this->term2->id()]);
     $this->assertEqual($expected, $view->argument['tid']->getDefaultArgument());
     $view->destroy();
   }
@@ -68,7 +68,7 @@ class TaxonomyDefaultArgumentTest extends TaxonomyTestBase {
     $view->setResponse($response);
 
     $view->initHandlers();
-    $expected = implode(',', array($this->term1->id(), $this->term2->id()));
+    $expected = implode(',', [$this->term1->id(), $this->term2->id()]);
     $this->assertEqual($expected, $view->argument['tid']->getDefaultArgument());
   }
 
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php
index 4737b989d..41780412c 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php
@@ -17,7 +17,7 @@ class TaxonomyFieldAllTermsTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $testViews = array('taxonomy_all_terms_test');
+  public static $testViews = ['taxonomy_all_terms_test'];
 
   /**
    * Tests the "all terms" field handler.
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php
index fb0c0df2d..86f67ff3d 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php
@@ -22,14 +22,14 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('language', 'taxonomy', 'taxonomy_test_views', 'text', 'views', 'node');
+  public static $modules = ['language', 'taxonomy', 'taxonomy_test_views', 'text', 'views', 'node'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_field_filters');
+  public static $testViews = ['test_field_filters'];
 
   /**
    * The vocabulary used for creating terms.
@@ -45,7 +45,7 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
    */
   public $termNames = [];
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
 
     // Add two new languages.
@@ -53,11 +53,11 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
     ConfigurableLanguage::createFromLangcode('es')->save();
 
     // Set up term names.
-    $this->termNames = array(
+    $this->termNames = [
       'en' => 'Food in Paris',
       'es' => 'Comida en Paris',
       'fr' => 'Nouriture en Paris',
-    );
+    ];
 
     // Create a vocabulary.
     $this->vocabulary = Vocabulary::create([
@@ -67,11 +67,11 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
     $this->vocabulary->save();
 
     // Add a translatable field to the vocabulary.
-    $field = FieldStorageConfig::create(array(
+    $field = FieldStorageConfig::create([
       'field_name' => 'field_foo',
       'entity_type' => 'taxonomy_term',
       'type' => 'text',
-    ));
+    ]);
     $field->save();
     FieldConfig::create([
       'field_name' => 'field_foo',
@@ -81,9 +81,9 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
     ])->save();
 
     // Create term with translations.
-    $taxonomy = $this->createTermWithProperties(array('name' => $this->termNames['en'], 'langcode' => 'en', 'description' => $this->termNames['en'], 'field_foo' => $this->termNames['en']));
-    foreach (array('es', 'fr') as $langcode) {
-      $translation = $taxonomy->addTranslation($langcode, array('name' => $this->termNames[$langcode]));
+    $taxonomy = $this->createTermWithProperties(['name' => $this->termNames['en'], 'langcode' => 'en', 'description' => $this->termNames['en'], 'field_foo' => $this->termNames['en']]);
+    foreach (['es', 'fr'] as $langcode) {
+      $translation = $taxonomy->addTranslation($langcode, ['name' => $this->termNames[$langcode]]);
       $translation->description->value = $this->termNames[$langcode];
       $translation->field_foo->value = $this->termNames[$langcode];
     }
@@ -91,7 +91,7 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
 
     Views::viewsData()->clear();
 
-    ViewTestData::createTestViews(get_class($this), array('taxonomy_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['taxonomy_test_views']);
     $this->container->get('router.builder')->rebuild();
   }
 
@@ -101,27 +101,27 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
   public function testFilters() {
     // Test the name filter page, which filters for name contains 'Comida'.
     // Should show just the Spanish translation, once.
-    $this->assertPageCounts('test-name-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida name filter');
+    $this->assertPageCounts('test-name-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida name filter');
 
     // Test the description filter page, which filters for description contains
     // 'Comida'. Should show just the Spanish translation, once.
-    $this->assertPageCounts('test-desc-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida description filter');
+    $this->assertPageCounts('test-desc-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida description filter');
 
     // Test the field filter page, which filters for field_foo contains
     // 'Comida'. Should show just the Spanish translation, once.
-    $this->assertPageCounts('test-field-filter', array('es' => 1, 'fr' => 0, 'en' => 0), 'Comida field filter');
+    $this->assertPageCounts('test-field-filter', ['es' => 1, 'fr' => 0, 'en' => 0], 'Comida field filter');
 
     // Test the name Paris filter page, which filters for name contains
     // 'Paris'. Should show each translation once.
-    $this->assertPageCounts('test-name-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris name filter');
+    $this->assertPageCounts('test-name-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris name filter');
 
     // Test the description Paris page, which filters for description contains
     // 'Paris'. Should show each translation, once.
-    $this->assertPageCounts('test-desc-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris description filter');
+    $this->assertPageCounts('test-desc-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris description filter');
 
     // Test the field Paris filter page, which filters for field_foo contains
     // 'Paris'. Should show each translation once.
-    $this->assertPageCounts('test-field-paris', array('es' => 1, 'fr' => 1, 'en' => 1), 'Paris field filter');
+    $this->assertPageCounts('test-field-paris', ['es' => 1, 'fr' => 1, 'en' => 1], 'Paris field filter');
 
   }
 
@@ -163,12 +163,12 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
     $filter_formats = filter_formats();
     $format = array_pop($filter_formats);
 
-    $properties += array(
+    $properties += [
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'field_foo' => $this->randomMachineName(),
-    );
+    ];
 
     $term = Term::create([
       'name' => $properties['name'],
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldTidTest.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldTidTest.php
index 6480491fc..b068f083a 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldTidTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldTidTest.php
@@ -17,9 +17,9 @@ class TaxonomyFieldTidTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_taxonomy_tid_field');
+  public static $testViews = ['test_taxonomy_tid_field'];
 
-  function testViewsHandlerTidField() {
+  public function testViewsHandlerTidField() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
 
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidFilterTest.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidFilterTest.php
index 9935aa964..aa5054feb 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidFilterTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidFilterTest.php
@@ -58,7 +58,7 @@ class TaxonomyIndexTidFilterTest extends TaxonomyTestBase {
     $term->save();
     $this->terms[$term->id()] = $term;
 
-    ViewTestData::createTestViews(get_class($this), array('taxonomy_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['taxonomy_test_views']);
   }
 
   /**
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
index 7dff50a48..efa51916d 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
@@ -24,7 +24,7 @@ class TaxonomyIndexTidUiTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_filter_taxonomy_index_tid', 'test_taxonomy_term_name');
+  public static $testViews = ['test_filter_taxonomy_index_tid', 'test_taxonomy_term_name'];
 
   /**
    * Modules to enable.
@@ -71,7 +71,7 @@ class TaxonomyIndexTidUiTest extends UITestBase {
         $term->save();
       }
     }
-    ViewTestData::createTestViews(get_class($this), array('taxonomy_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['taxonomy_test_views']);
 
     Vocabulary::create([
       'vid' => 'empty_vocabulary',
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyParentUITest.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyParentUITest.php
index c79a406cf..a57a09a7a 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyParentUITest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyParentUITest.php
@@ -18,14 +18,14 @@ class TaxonomyParentUITest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_taxonomy_parent');
+  public static $testViews = ['test_taxonomy_parent'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('taxonomy', 'taxonomy_test_views');
+  public static $modules = ['taxonomy', 'taxonomy_test_views'];
 
   /**
    * {@inheritdoc}
@@ -33,7 +33,7 @@ class TaxonomyParentUITest extends UITestBase {
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('taxonomy_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['taxonomy_test_views']);
   }
 
   /**
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyRelationshipTest.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyRelationshipTest.php
index bada7fae8..7024e64b4 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyRelationshipTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyRelationshipTest.php
@@ -18,14 +18,14 @@ class TaxonomyRelationshipTest extends TaxonomyTestBase {
    *
    * @var \Drupal\taxonomy\TermInterface[]
    */
-  protected $terms = array();
+  protected $terms = [];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_taxonomy_term_relationship');
+  public static $testViews = ['test_taxonomy_term_relationship'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyTermViewTest.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyTermViewTest.php
index ef6da478f..bfd65cf46 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyTermViewTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyTermViewTest.php
@@ -21,7 +21,7 @@ class TaxonomyTermViewTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy', 'views');
+  public static $modules = ['taxonomy', 'views'];
 
   /**
    * An user with permissions to administer taxonomy.
@@ -51,23 +51,23 @@ class TaxonomyTermViewTest extends TaxonomyTestBase {
 
     $this->fieldName1 = Unicode::strtolower($this->randomMachineName());
 
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'article', $this->fieldName1, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($this->fieldName1, array(
+      ->setComponent($this->fieldName1, [
         'type' => 'options_select',
-      ))
+      ])
       ->save();
     entity_get_display('node', 'article', 'default')
-      ->setComponent($this->fieldName1, array(
+      ->setComponent($this->fieldName1, [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
   }
 
@@ -79,7 +79,7 @@ class TaxonomyTermViewTest extends TaxonomyTestBase {
     $term = $this->createTerm();
 
     // Post an article.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $original_title = $this->randomMachineName();
     $edit['body[0][value]'] = $this->randomMachineName();
     $edit["{$this->fieldName1}[]"] = $term->id();
@@ -90,7 +90,7 @@ class TaxonomyTermViewTest extends TaxonomyTestBase {
     $this->assertText($term->label());
     $this->assertText($node->label());
 
-    \Drupal::service('module_installer')->install(array('language', 'content_translation'));
+    \Drupal::service('module_installer')->install(['language', 'content_translation']);
     $language = ConfigurableLanguage::createFromLangcode('ur');
     $language->save();
     // Enable translation for the article content type and ensure the change is
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php
index dc5755993..6ff551418 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php
@@ -22,14 +22,14 @@ abstract class TaxonomyTestBase extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy', 'taxonomy_test_views');
+  public static $modules = ['taxonomy', 'taxonomy_test_views'];
 
   /**
    * Stores the nodes used for the different tests.
    *
    * @var \Drupal\node\NodeInterface[]
    */
-  protected $nodes = array();
+  protected $nodes = [];
 
   /**
    * The vocabulary used for creating terms.
@@ -60,13 +60,13 @@ abstract class TaxonomyTestBase extends ViewTestBase {
     $this->mockStandardInstall();
 
     if ($import_test_views) {
-      ViewTestData::createTestViews(get_class($this), array('taxonomy_test_views'));
+      ViewTestData::createTestViews(get_class($this), ['taxonomy_test_views']);
     }
 
     $this->term1 = $this->createTerm();
     $this->term2 = $this->createTerm();
 
-    $node = array();
+    $node = [];
     $node['type'] = 'article';
     $node['field_views_testing_tags'][]['target_id'] = $this->term1->id();
     $node['field_views_testing_tags'][]['target_id'] = $this->term2->id();
@@ -80,9 +80,9 @@ abstract class TaxonomyTestBase extends ViewTestBase {
    * @see https://www.drupal.org/node/1708692
    */
   protected function mockStandardInstall() {
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'article',
-    ));
+    ]);
     // Create the vocabulary for the tag field.
     $this->vocabulary = Vocabulary::create([
       'name' => 'Views testing tags',
@@ -91,32 +91,32 @@ abstract class TaxonomyTestBase extends ViewTestBase {
     $this->vocabulary->save();
     $field_name = 'field_' . $this->vocabulary->id();
 
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'article', $field_name, 'Tags', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'entity_reference_autocomplete_tags',
         'weight' => -4,
-      ))
+      ])
       ->save();
 
     entity_get_display('node', 'article', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'entity_reference_label',
         'weight' => 10,
-      ))
+      ])
       ->save();
     entity_get_display('node', 'article', 'teaser')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'entity_reference_label',
         'weight' => 10,
-      ))
+      ])
       ->save();
   }
 
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyVocabularyArgumentTest.php b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyVocabularyArgumentTest.php
new file mode 100644
index 000000000..532335f19
--- /dev/null
+++ b/web/core/modules/taxonomy/src/Tests/Views/TaxonomyVocabularyArgumentTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Drupal\taxonomy\Tests\Views;
+
+use Drupal\taxonomy\Entity\Vocabulary;
+
+/**
+ * Tests the vocabulary argument.
+ *
+ * @group taxonomy
+ */
+class TaxonomyVocabularyArgumentTest extends TaxonomyTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['taxonomy', 'taxonomy_test_views', 'views'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_argument_taxonomy_vocabulary'];
+
+  /**
+   * @var \Drupal\taxonomy\TermInterface[]
+   */
+  protected $terms = [];
+
+  /**
+   * Vocabularies used for creating terms.
+   *
+   * @var \Drupal\taxonomy\VocabularyInterface[]
+   */
+  protected $vocabularies;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Add default vocabulary to list of vocabularies.
+    $this->vocabularies[] = $this->vocabulary;
+    // Create additional vocabulary.
+    $vocabulary = Vocabulary::create([
+      'name' => 'Views testing category',
+      'vid' => 'views_testing_category',
+    ]);
+    $vocabulary->save();
+    $this->vocabularies[] = $vocabulary;
+
+    // Create some terms.
+    $this->terms[0] = $this->createTerm([
+      'name' => 'First',
+      'vid' => $this->vocabularies[0]->id(),
+    ]);
+    $this->terms[1] = $this->createTerm([
+      'name' => 'Second',
+      'vid' => $this->vocabularies[1]->id(),
+    ]);
+  }
+
+  /**
+   * Tests the vocabulary argument handler.
+   *
+   * @see Drupal\taxonomy\Plugin\views\argument\VocabularyVid
+   */
+  public function testTermWithVocabularyArgument() {
+    $this->drupalGet('test_argument_taxonomy_vocabulary/' . $this->vocabularies[0]->id());
+    // First term should be present.
+    $this->assertText($this->terms[0]->label());
+    // Second term should not be present.
+    $this->assertNoText($this->terms[1]->label());
+  }
+
+}
diff --git a/web/core/modules/taxonomy/src/Tests/Views/TermNameFieldTest.php b/web/core/modules/taxonomy/src/Tests/Views/TermNameFieldTest.php
index 2effe722b..98d1ab4b4 100644
--- a/web/core/modules/taxonomy/src/Tests/Views/TermNameFieldTest.php
+++ b/web/core/modules/taxonomy/src/Tests/Views/TermNameFieldTest.php
@@ -16,7 +16,7 @@ class TermNameFieldTest extends TaxonomyTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $testViews = array('test_taxonomy_term_name');
+  public static $testViews = ['test_taxonomy_term_name'];
 
   /**
    * Tests term name field plugin functionality.
diff --git a/web/core/modules/taxonomy/src/Tests/VocabularyUiTest.php b/web/core/modules/taxonomy/src/Tests/VocabularyUiTest.php
index 3066ef07d..89c7a67f5 100644
--- a/web/core/modules/taxonomy/src/Tests/VocabularyUiTest.php
+++ b/web/core/modules/taxonomy/src/Tests/VocabularyUiTest.php
@@ -31,30 +31,33 @@ class VocabularyUiTest extends TaxonomyTestBase {
   /**
    * Create, edit and delete a vocabulary via the user interface.
    */
-  function testVocabularyInterface() {
+  public function testVocabularyInterface() {
     // Visit the main taxonomy administration page.
     $this->drupalGet('admin/structure/taxonomy');
 
     // Create a new vocabulary.
     $this->clickLink(t('Add vocabulary'));
-    $edit = array();
+    $edit = [];
     $vid = Unicode::strtolower($this->randomMachineName());
     $edit['name'] = $this->randomMachineName();
     $edit['description'] = $this->randomMachineName();
     $edit['vid'] = $vid;
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertRaw(t('Created new vocabulary %name.', array('%name' => $edit['name'])), 'Vocabulary created successfully.');
+    $this->assertRaw(t('Created new vocabulary %name.', ['%name' => $edit['name']]), 'Vocabulary created successfully.');
 
     // Edit the vocabulary.
     $this->drupalGet('admin/structure/taxonomy');
-    $this->assertText($edit['name'], 'Vocabulary found in the vocabulary overview listing.');
+    $this->assertText($edit['name'], 'Vocabulary name found in the vocabulary overview listing.');
+    $this->assertText($edit['description'], 'Vocabulary description found in the vocabulary overview listing.');
     $this->assertLinkByHref(Url::fromRoute('entity.taxonomy_term.add_form', ['taxonomy_vocabulary' => $edit['vid']])->toString());
     $this->clickLink(t('Edit vocabulary'));
-    $edit = array();
+    $edit = [];
     $edit['name'] = $this->randomMachineName();
+    $edit['description'] = $this->randomMachineName();
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->drupalGet('admin/structure/taxonomy');
-    $this->assertText($edit['name'], 'Vocabulary found in the vocabulary overview listing.');
+    $this->assertText($edit['name'], 'Vocabulary name found in the vocabulary overview listing.');
+    $this->assertText($edit['description'], 'Vocabulary description found in the vocabulary overview listing.');
 
     // Try to submit a vocabulary with a duplicate machine name.
     $edit['vid'] = $vid;
@@ -67,28 +70,28 @@ class VocabularyUiTest extends TaxonomyTestBase {
     $this->assertText(t('The machine-readable name must contain only lowercase letters, numbers, and underscores.'));
 
     // Ensure that vocabulary titles are escaped properly.
-    $edit = array();
+    $edit = [];
     $edit['name'] = 'Don\'t Panic';
     $edit['description'] = $this->randomMachineName();
     $edit['vid'] = 'don_t_panic';
     $this->drupalPostForm('admin/structure/taxonomy/add', $edit, t('Save'));
 
     $site_name = $this->config('system.site')->get('name');
-    $this->assertTitle(t('Don\'t Panic | @site-name', array('@site-name' => $site_name)), 'The page title contains the escaped character.');
-    $this->assertNoTitle(t('Don&#039;t Panic | @site-name', array('@site-name' => $site_name)), 'The page title does not contain an encoded character.');
+    $this->assertTitle(t('Don\'t Panic | @site-name', ['@site-name' => $site_name]), 'The page title contains the escaped character.');
+    $this->assertNoTitle(t('Don&#039;t Panic | @site-name', ['@site-name' => $site_name]), 'The page title does not contain an encoded character.');
   }
 
   /**
    * Changing weights on the vocabulary overview with two or more vocabularies.
    */
-  function testTaxonomyAdminChangingWeights() {
+  public function testTaxonomyAdminChangingWeights() {
     // Create some vocabularies.
     for ($i = 0; $i < 10; $i++) {
       $this->createVocabulary();
     }
     // Get all vocabularies and change their weights.
     $vocabularies = Vocabulary::loadMultiple();
-    $edit = array();
+    $edit = [];
     foreach ($vocabularies as $key => $vocabulary) {
       $weight = -$vocabulary->get('weight');
       $vocabularies[$key]->set('weight', $weight);
@@ -110,7 +113,7 @@ class VocabularyUiTest extends TaxonomyTestBase {
   /**
    * Test the vocabulary overview with no vocabularies.
    */
-  function testTaxonomyAdminNoVocabularies() {
+  public function testTaxonomyAdminNoVocabularies() {
     // Delete all vocabularies.
     $vocabularies = Vocabulary::loadMultiple();
     foreach ($vocabularies as $key => $vocabulary) {
@@ -126,13 +129,13 @@ class VocabularyUiTest extends TaxonomyTestBase {
   /**
    * Deleting a vocabulary.
    */
-  function testTaxonomyAdminDeletingVocabulary() {
+  public function testTaxonomyAdminDeletingVocabulary() {
     // Create a vocabulary.
     $vid = Unicode::strtolower($this->randomMachineName());
-    $edit = array(
+    $edit = [
       'name' => $this->randomMachineName(),
       'vid' => $vid,
-    );
+    ];
     $this->drupalPostForm('admin/structure/taxonomy/add', $edit, t('Save'));
     $this->assertText(t('Created new vocabulary'), 'New vocabulary was created.');
 
@@ -144,12 +147,12 @@ class VocabularyUiTest extends TaxonomyTestBase {
     // Delete the vocabulary.
     $this->drupalGet('admin/structure/taxonomy/manage/' . $vocabulary->id());
     $this->clickLink(t('Delete'));
-    $this->assertRaw(t('Are you sure you want to delete the vocabulary %name?', array('%name' => $vocabulary->label())), '[confirm deletion] Asks for confirmation.');
+    $this->assertRaw(t('Are you sure you want to delete the vocabulary %name?', ['%name' => $vocabulary->label()]), '[confirm deletion] Asks for confirmation.');
     $this->assertText(t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'), '[confirm deletion] Inform that all terms will be deleted.');
 
     // Confirm deletion.
     $this->drupalPostForm(NULL, NULL, t('Delete'));
-    $this->assertRaw(t('Deleted vocabulary %name.', array('%name' => $vocabulary->label())), 'Vocabulary deleted.');
+    $this->assertRaw(t('Deleted vocabulary %name.', ['%name' => $vocabulary->label()]), 'Vocabulary deleted.');
     $this->container->get('entity.manager')->getStorage('taxonomy_vocabulary')->resetCache();
     $this->assertFalse(Vocabulary::load($vid), 'Vocabulary not found.');
   }
diff --git a/web/core/modules/taxonomy/src/VocabularyForm.php b/web/core/modules/taxonomy/src/VocabularyForm.php
index 1868ddc38..63f0ccb8a 100644
--- a/web/core/modules/taxonomy/src/VocabularyForm.php
+++ b/web/core/modules/taxonomy/src/VocabularyForm.php
@@ -52,59 +52,59 @@ class VocabularyForm extends BundleEntityFormBase {
       $form['#title'] = $this->t('Edit vocabulary');
     }
 
-    $form['name'] = array(
+    $form['name'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Name'),
       '#default_value' => $vocabulary->label(),
       '#maxlength' => 255,
       '#required' => TRUE,
-    );
-    $form['vid'] = array(
+    ];
+    $form['vid'] = [
       '#type' => 'machine_name',
       '#default_value' => $vocabulary->id(),
       '#maxlength' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
-      '#machine_name' => array(
-        'exists' => array($this, 'exists'),
-        'source' => array('name'),
-      ),
-    );
-    $form['description'] = array(
+      '#machine_name' => [
+        'exists' => [$this, 'exists'],
+        'source' => ['name'],
+      ],
+    ];
+    $form['description'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Description'),
       '#default_value' => $vocabulary->getDescription(),
-    );
+    ];
 
     // $form['langcode'] is not wrapped in an
     // if ($this->moduleHandler->moduleExists('language')) check because the
     // language_select form element works also without the language module being
     // installed. https://www.drupal.org/node/1749954 documents the new element.
-    $form['langcode'] = array(
+    $form['langcode'] = [
       '#type' => 'language_select',
       '#title' => $this->t('Vocabulary language'),
       '#languages' => LanguageInterface::STATE_ALL,
       '#default_value' => $vocabulary->language()->getId(),
-    );
+    ];
     if ($this->moduleHandler->moduleExists('language')) {
-      $form['default_terms_language'] = array(
+      $form['default_terms_language'] = [
         '#type' => 'details',
         '#title' => $this->t('Terms language'),
         '#open' => TRUE,
-      );
-      $form['default_terms_language']['default_language'] = array(
+      ];
+      $form['default_terms_language']['default_language'] = [
         '#type' => 'language_configuration',
-        '#entity_information' => array(
+        '#entity_information' => [
           'entity_type' => 'taxonomy_term',
           'bundle' => $vocabulary->id(),
-        ),
+        ],
         '#default_value' => ContentLanguageSettings::loadByEntityTypeBundle('taxonomy_term', $vocabulary->id()),
-      );
+      ];
     }
     // Set the hierarchy to "multiple parents" by default. This simplifies the
     // vocabulary form and standardizes the term form.
-    $form['hierarchy'] = array(
+    $form['hierarchy'] = [
       '#type' => 'value',
       '#value' => '0',
-    );
+    ];
 
     $form = parent::form($form, $form_state);
     return $this->protectBundleIdElement($form);
@@ -123,14 +123,14 @@ class VocabularyForm extends BundleEntityFormBase {
     $edit_link = $this->entity->link($this->t('Edit'));
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created new vocabulary %name.', array('%name' => $vocabulary->label())));
-        $this->logger('taxonomy')->notice('Created new vocabulary %name.', array('%name' => $vocabulary->label(), 'link' => $edit_link));
+        drupal_set_message($this->t('Created new vocabulary %name.', ['%name' => $vocabulary->label()]));
+        $this->logger('taxonomy')->notice('Created new vocabulary %name.', ['%name' => $vocabulary->label(), 'link' => $edit_link]);
         $form_state->setRedirectUrl($vocabulary->urlInfo('overview-form'));
         break;
 
       case SAVED_UPDATED:
-        drupal_set_message($this->t('Updated vocabulary %name.', array('%name' => $vocabulary->label())));
-        $this->logger('taxonomy')->notice('Updated vocabulary %name.', array('%name' => $vocabulary->label(), 'link' => $edit_link));
+        drupal_set_message($this->t('Updated vocabulary %name.', ['%name' => $vocabulary->label()]));
+        $this->logger('taxonomy')->notice('Updated vocabulary %name.', ['%name' => $vocabulary->label(), 'link' => $edit_link]);
         $form_state->setRedirectUrl($vocabulary->urlInfo('collection'));
         break;
     }
diff --git a/web/core/modules/taxonomy/src/VocabularyListBuilder.php b/web/core/modules/taxonomy/src/VocabularyListBuilder.php
index b5597bb2e..8503c288a 100644
--- a/web/core/modules/taxonomy/src/VocabularyListBuilder.php
+++ b/web/core/modules/taxonomy/src/VocabularyListBuilder.php
@@ -36,16 +36,16 @@ class VocabularyListBuilder extends DraggableListBuilder {
       $operations['edit']['title'] = t('Edit vocabulary');
     }
 
-    $operations['list'] = array(
+    $operations['list'] = [
       'title' => t('List terms'),
       'weight' => 0,
       'url' => $entity->urlInfo('overview-form'),
-    );
-    $operations['add'] = array(
+    ];
+    $operations['add'] = [
       'title' => t('Add terms'),
       'weight' => 10,
       'url' => Url::fromRoute('entity.taxonomy_term.add_form', ['taxonomy_vocabulary' => $entity->id()]),
-    );
+    ];
     unset($operations['delete']);
 
     return $operations;
@@ -56,6 +56,7 @@ class VocabularyListBuilder extends DraggableListBuilder {
    */
   public function buildHeader() {
     $header['label'] = t('Vocabulary name');
+    $header['description'] = t('Description');
     return $header + parent::buildHeader();
   }
 
@@ -64,6 +65,7 @@ class VocabularyListBuilder extends DraggableListBuilder {
    */
   public function buildRow(EntityInterface $entity) {
     $row['label'] = $entity->label();
+    $row['description']['data'] = ['#markup' => $entity->getDescription()];
     return $row + parent::buildRow($entity);
   }
 
@@ -78,7 +80,7 @@ class VocabularyListBuilder extends DraggableListBuilder {
       unset($this->weightKey);
     }
     $build = parent::render();
-    $build['table']['#empty'] = t('No vocabularies available. <a href=":link">Add vocabulary</a>.', array(':link' => \Drupal::url('entity.taxonomy_vocabulary.add_form')));
+    $build['table']['#empty'] = t('No vocabularies available. <a href=":link">Add vocabulary</a>.', [':link' => \Drupal::url('entity.taxonomy_vocabulary.add_form')]);
     return $build;
   }
 
@@ -87,7 +89,7 @@ class VocabularyListBuilder extends DraggableListBuilder {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form = parent::buildForm($form, $form_state);
-    $form['vocabularies']['#attributes'] = array('id' => 'taxonomy');
+    $form['vocabularies']['#attributes'] = ['id' => 'taxonomy'];
     $form['actions']['submit']['#value'] = t('Save');
 
     return $form;
diff --git a/web/core/modules/taxonomy/src/VocabularyStorage.php b/web/core/modules/taxonomy/src/VocabularyStorage.php
index 4b08b2931..bdbf8938f 100644
--- a/web/core/modules/taxonomy/src/VocabularyStorage.php
+++ b/web/core/modules/taxonomy/src/VocabularyStorage.php
@@ -21,7 +21,7 @@ class VocabularyStorage extends ConfigEntityStorage implements VocabularyStorage
    * {@inheritdoc}
    */
   public function getToplevelTids($vids) {
-    return db_query('SELECT t.tid FROM {taxonomy_term_data} t INNER JOIN {taxonomy_term_hierarchy} th ON th.tid = t.tid WHERE t.vid IN ( :vids[] ) AND th.parent = 0', array(':vids[]' => $vids))->fetchCol();
+    return db_query('SELECT t.tid FROM {taxonomy_term_data} t INNER JOIN {taxonomy_term_hierarchy} th ON th.tid = t.tid WHERE t.vid IN ( :vids[] ) AND th.parent = 0', [':vids[]' => $vids])->fetchCol();
   }
 
 }
diff --git a/web/core/modules/taxonomy/taxonomy.module b/web/core/modules/taxonomy/taxonomy.module
index 80884329b..4a93989ad 100644
--- a/web/core/modules/taxonomy/taxonomy.module
+++ b/web/core/modules/taxonomy/taxonomy.module
@@ -47,23 +47,23 @@ const TAXONOMY_HIERARCHY_MULTIPLE = 2;
 function taxonomy_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.taxonomy':
-      $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#';
+      $field_ui_url = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#';
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Taxonomy module allows users who have permission to create and edit content to categorize (tag) content of that type. Users who have the <em>Administer vocabularies and terms</em> <a href=":permissions" title="Taxonomy module permissions">permission</a> can add <em>vocabularies</em> that contain a set of related <em>terms</em>. The terms in a vocabulary can either be pre-set by an administrator or built gradually as content is added and edited. Terms may be organized hierarchically if desired.', array(':permissions' => \Drupal::url('user.admin_permissions', array(), array('fragment' => 'module-taxonomy')))) . '</p>';
-      $output .= '<p>' . t('For more information, see the <a href=":taxonomy">online documentation for the Taxonomy module</a>.', array(':taxonomy' => 'https://www.drupal.org/documentation/modules/taxonomy/')) . '</p>';
+      $output .= '<p>' . t('The Taxonomy module allows users who have permission to create and edit content to categorize (tag) content of that type. Users who have the <em>Administer vocabularies and terms</em> <a href=":permissions" title="Taxonomy module permissions">permission</a> can add <em>vocabularies</em> that contain a set of related <em>terms</em>. The terms in a vocabulary can either be pre-set by an administrator or built gradually as content is added and edited. Terms may be organized hierarchically if desired.', [':permissions' => \Drupal::url('user.admin_permissions', [], ['fragment' => 'module-taxonomy'])]) . '</p>';
+      $output .= '<p>' . t('For more information, see the <a href=":taxonomy">online documentation for the Taxonomy module</a>.', [':taxonomy' => 'https://www.drupal.org/documentation/modules/taxonomy/']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing vocabularies') . '</dt>';
-      $output .= '<dd>' . t('Users who have the <em>Administer vocabularies and terms</em> permission can add and edit vocabularies from the <a href=":taxonomy_admin">Taxonomy administration page</a>. Vocabularies can be deleted from their <em>Edit vocabulary</em> page. Users with the <em>Taxonomy term: Administer fields</em> permission may add additional fields for terms in that vocabulary using the <a href=":field_ui">Field UI module</a>.', array(':taxonomy_admin' => \Drupal::url('entity.taxonomy_vocabulary.collection'), ':field_ui' => $field_ui_url)) . '</dd>';
+      $output .= '<dd>' . t('Users who have the <em>Administer vocabularies and terms</em> permission can add and edit vocabularies from the <a href=":taxonomy_admin">Taxonomy administration page</a>. Vocabularies can be deleted from their <em>Edit vocabulary</em> page. Users with the <em>Taxonomy term: Administer fields</em> permission may add additional fields for terms in that vocabulary using the <a href=":field_ui">Field UI module</a>.', [':taxonomy_admin' => \Drupal::url('entity.taxonomy_vocabulary.collection'), ':field_ui' => $field_ui_url]) . '</dd>';
       $output .= '<dt>' . t('Managing terms') . '</dt>';
-      $output .= '<dd>' . t('Users who have the <em>Administer vocabularies and terms</em> permission or the <em>Edit terms</em> permission for a particular vocabulary can add, edit, and organize the terms in a vocabulary from a vocabulary\'s term listing page, which can be accessed by going to the <a href=":taxonomy_admin">Taxonomy administration page</a> and clicking <em>List terms</em> in the <em>Operations</em> column. Users must have the <em>Administer vocabularies and terms</em> permission or the <em>Delete terms</em> permission for a particular vocabulary to delete terms.', array(':taxonomy_admin' => \Drupal::url('entity.taxonomy_vocabulary.collection'))) . ' </dd>';
+      $output .= '<dd>' . t('Users who have the <em>Administer vocabularies and terms</em> permission or the <em>Edit terms</em> permission for a particular vocabulary can add, edit, and organize the terms in a vocabulary from a vocabulary\'s term listing page, which can be accessed by going to the <a href=":taxonomy_admin">Taxonomy administration page</a> and clicking <em>List terms</em> in the <em>Operations</em> column. Users must have the <em>Administer vocabularies and terms</em> permission or the <em>Delete terms</em> permission for a particular vocabulary to delete terms.', [':taxonomy_admin' => \Drupal::url('entity.taxonomy_vocabulary.collection')]) . ' </dd>';
       $output .= '<dt>' . t('Classifying entity content') . '</dt>';
-      $output .= '<dd>' . t('A user with the <em>Administer fields</em> permission for a certain entity type may add <em>Taxonomy term</em> reference fields to the entity type, which will allow entities to be classified using taxonomy terms. See the <a href=":entity_reference">Entity Reference help</a> for more information about reference fields. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them.', array(':field_ui' => $field_ui_url, ':field' => \Drupal::url('help.page', array('name' => 'field')), ':entity_reference' => \Drupal::url('help.page', array('name' => 'entity_reference')))) . '</dd>';
+      $output .= '<dd>' . t('A user with the <em>Administer fields</em> permission for a certain entity type may add <em>Taxonomy term</em> reference fields to the entity type, which will allow entities to be classified using taxonomy terms. See the <a href=":entity_reference">Entity Reference help</a> for more information about reference fields. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them.', [':field_ui' => $field_ui_url, ':field' => \Drupal::url('help.page', ['name' => 'field']), ':entity_reference' => \Drupal::url('help.page', ['name' => 'entity_reference'])]) . '</dd>';
       $output .= '<dt>' . t('Adding new terms during content creation') . '</dt>';
       $output .= '<dd>' . t('Allowing users to add new terms gradually builds a vocabulary as content is added and edited. Users can add new terms if either of the two <em>Autocomplete</em> widgets is chosen for the Taxonomy term reference field in the <em>Manage form display</em> page for the field. You will also need to enable the <em>Create referenced entities if they don\'t already exist</em> option, and restrict the field to one vocabulary.') . '</dd>';
       $output .= '<dt>' . t('Configuring displays and form displays') . '</dt>';
-      $output .= '<dd>' . t('See the <a href=":entity_reference">Entity Reference help</a> page for the field widgets and formatters that can be configured for any reference field on the <em>Manage display</em> and <em>Manage form display</em> pages. Taxonomy additionally provides an <em>RSS category</em> formatter that displays nothing when the entity item is displayed as HTML, but displays an RSS category instead of a list when the entity item is displayed in an RSS feed.', array(':entity_reference' => \Drupal::url('help.page', array('name' => 'entity_reference')))) . '</li>';
+      $output .= '<dd>' . t('See the <a href=":entity_reference">Entity Reference help</a> page for the field widgets and formatters that can be configured for any reference field on the <em>Manage display</em> and <em>Manage form display</em> pages. Taxonomy additionally provides an <em>RSS category</em> formatter that displays nothing when the entity item is displayed as HTML, but displays an RSS category instead of a list when the entity item is displayed in an RSS feed.', [':entity_reference' => \Drupal::url('help.page', ['name' => 'entity_reference'])]) . '</li>';
       $output .= '</ul>';
       $output .= '</dd>';
       $output .= '</dl>';
@@ -77,11 +77,11 @@ function taxonomy_help($route_name, RouteMatchInterface $route_match) {
       $vocabulary = $route_match->getParameter('taxonomy_vocabulary');
       switch ($vocabulary->getHierarchy()) {
         case VocabularyInterface::HIERARCHY_DISABLED:
-          return '<p>' . t('You can reorganize the terms in %capital_name using their drag-and-drop handles, and group terms under a parent term by sliding them under and to the right of the parent.', array('%capital_name' => Unicode::ucfirst($vocabulary->label()), '%name' => $vocabulary->label())) . '</p>';
+          return '<p>' . t('You can reorganize the terms in %capital_name using their drag-and-drop handles, and group terms under a parent term by sliding them under and to the right of the parent.', ['%capital_name' => Unicode::ucfirst($vocabulary->label()), '%name' => $vocabulary->label()]) . '</p>';
         case VocabularyInterface::HIERARCHY_SINGLE:
-          return '<p>' . t('%capital_name contains terms grouped under parent terms. You can reorganize the terms in %capital_name using their drag-and-drop handles.', array('%capital_name' => Unicode::ucfirst($vocabulary->label()), '%name' => $vocabulary->label())) . '</p>';
+          return '<p>' . t('%capital_name contains terms grouped under parent terms. You can reorganize the terms in %capital_name using their drag-and-drop handles.', ['%capital_name' => Unicode::ucfirst($vocabulary->label()), '%name' => $vocabulary->label()]) . '</p>';
         case VocabularyInterface::HIERARCHY_MULTIPLE:
-          return '<p>' . t('%capital_name contains terms with multiple parents. Drag and drop of terms with multiple parents is not supported, but you can re-enable drag-and-drop support by editing each term to include only a single parent.', array('%capital_name' => Unicode::ucfirst($vocabulary->label()))) . '</p>';
+          return '<p>' . t('%capital_name contains terms with multiple parents. Drag and drop of terms with multiple parents is not supported, but you can re-enable drag-and-drop support by editing each term to include only a single parent.', ['%capital_name' => Unicode::ucfirst($vocabulary->label())]) . '</p>';
       }
   }
 }
@@ -90,9 +90,9 @@ function taxonomy_help($route_name, RouteMatchInterface $route_match) {
  * Entity URI callback.
  */
 function taxonomy_term_uri($term) {
-  return new Url('entity.taxonomy_term.canonical', array(
+  return new Url('entity.taxonomy_term.canonical', [
     'taxonomy_term' => $term->id(),
-  ));
+  ]);
 }
 
 /**
@@ -103,24 +103,24 @@ function taxonomy_page_attachments_alter(array &$page) {
   if ($route_match->getRouteName() == 'entity.taxonomy_term.canonical' && ($term = $route_match->getParameter('taxonomy_term')) && $term instanceof TermInterface) {
     foreach ($term->uriRelationships() as $rel) {
       // Set the URI relationships, like canonical.
-      $page['#attached']['html_head_link'][] = array(
-        array(
+      $page['#attached']['html_head_link'][] = [
+        [
           'rel' => $rel,
           'href' => $term->url($rel),
-        ),
+        ],
         TRUE,
-      );
+      ];
 
       // Set the term path as the canonical URL to prevent duplicate content.
       if ($rel == 'canonical') {
         // Set the non-aliased canonical path as a default shortlink.
-        $page['#attached']['html_head_link'][] = array(
-          array(
+        $page['#attached']['html_head_link'][] = [
+          [
             'rel' => 'shortlink',
-            'href' => $term->url($rel, array('alias' => TRUE)),
-          ),
+            'href' => $term->url($rel, ['alias' => TRUE]),
+          ],
           TRUE,
-        );
+        ];
       }
     }
   }
@@ -130,11 +130,11 @@ function taxonomy_page_attachments_alter(array &$page) {
  * Implements hook_theme().
  */
 function taxonomy_theme() {
-  return array(
-    'taxonomy_term' => array(
+  return [
+    'taxonomy_term' => [
       'render element' => 'elements',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -223,7 +223,7 @@ function taxonomy_term_view_multiple(array $terms, $view_mode = 'full', $langcod
  * Implements hook_theme_suggestions_HOOK().
  */
 function taxonomy_theme_suggestions_taxonomy_term(array $variables) {
-  $suggestions = array();
+  $suggestions = [];
 
   /** @var \Drupal\taxonomy\TermInterface $term */
   $term = $variables['elements']['#taxonomy_term'];
@@ -261,7 +261,7 @@ function template_preprocess_taxonomy_term(&$variables) {
   $variables['page'] = $variables['view_mode'] == 'full' && taxonomy_term_is_page($term);
 
   // Helpful $content variable for templates.
-  $variables['content'] = array();
+  $variables['content'] = [];
   foreach (Element::children($variables['elements']) as $key) {
     $variables['content'][$key] = $variables['elements'][$key];
   }
@@ -307,7 +307,7 @@ function taxonomy_vocabulary_get_names() {
   $names = &drupal_static(__FUNCTION__);
 
   if (!isset($names)) {
-    $names = array();
+    $names = [];
     $config_names = \Drupal::configFactory()->listAll('taxonomy.vocabulary.');
     foreach ($config_names as $config_name) {
       $id = substr($config_name, strlen('taxonomy.vocabulary.'));
@@ -333,7 +333,7 @@ function taxonomy_vocabulary_get_names() {
  *   An array of matching term objects.
  */
 function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
-  $values = array('name' => trim($name));
+  $values = ['name' => trim($name)];
   if (isset($vocabulary)) {
     $vocabularies = taxonomy_vocabulary_get_names();
     if (isset($vocabularies[$vocabulary])) {
@@ -341,7 +341,7 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
     }
     else {
       // Return an empty array when filtering by a non-existing vocabulary.
-      return array();
+      return [];
     }
   }
   return entity_load_multiple_by_properties('taxonomy_term', $values);
@@ -436,7 +436,7 @@ function taxonomy_term_load($tid) {
  * @see \Drupal\Component\Utility\Tags::explode()
  */
 function taxonomy_implode_tags($tags, $vid = NULL) {
-  $typed_tags = array();
+  $typed_tags = [];
   foreach ($tags as $tag) {
     // Extract terms belonging to the vocabulary in question.
     if (!isset($vid) || $tag->bundle() == $vid) {
@@ -510,7 +510,7 @@ function taxonomy_build_node_index($node) {
   // We only maintain the taxonomy index for published nodes.
   if ($status && $node->isDefaultRevision()) {
     // Collect a unique list of all the term IDs from all node fields.
-    $tid_all = array();
+    $tid_all = [];
     $entity_reference_class = 'Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem';
     foreach ($node->getFieldDefinitions() as $field) {
       $field_name = $field->getName();
@@ -530,8 +530,8 @@ function taxonomy_build_node_index($node) {
     if (!empty($tid_all)) {
       foreach ($tid_all as $tid) {
         db_merge('taxonomy_index')
-          ->key(array('nid' => $node->id(), 'tid' => $tid, 'status' => $node->isPublished()))
-          ->fields(array('sticky' => $sticky, 'created' => $node->getCreatedTime()))
+          ->key(['nid' => $node->id(), 'tid' => $tid, 'status' => $node->isPublished()])
+          ->fields(['sticky' => $sticky, 'created' => $node->getCreatedTime()])
           ->execute();
       }
     }
diff --git a/web/core/modules/taxonomy/taxonomy.tokens.inc b/web/core/modules/taxonomy/taxonomy.tokens.inc
index 20251f224..211a12144 100644
--- a/web/core/modules/taxonomy/taxonomy.tokens.inc
+++ b/web/core/modules/taxonomy/taxonomy.tokens.inc
@@ -12,80 +12,80 @@ use Drupal\taxonomy\Entity\Vocabulary;
  * Implements hook_token_info().
  */
 function taxonomy_token_info() {
-  $types['term'] = array(
+  $types['term'] = [
     'name' => t("Taxonomy terms"),
     'description' => t("Tokens related to taxonomy terms."),
     'needs-data' => 'term',
-  );
-  $types['vocabulary'] = array(
+  ];
+  $types['vocabulary'] = [
     'name' => t("Vocabularies"),
     'description' => t("Tokens related to taxonomy vocabularies."),
     'needs-data' => 'vocabulary',
-  );
+  ];
 
   // Taxonomy term related variables.
-  $term['tid'] = array(
+  $term['tid'] = [
     'name' => t("Term ID"),
     'description' => t("The unique ID of the taxonomy term."),
-  );
-  $term['name'] = array(
+  ];
+  $term['name'] = [
     'name' => t("Name"),
     'description' => t("The name of the taxonomy term."),
-  );
-  $term['description'] = array(
+  ];
+  $term['description'] = [
     'name' => t("Description"),
     'description' => t("The optional description of the taxonomy term."),
-  );
-  $term['node-count'] = array(
+  ];
+  $term['node-count'] = [
     'name' => t("Node count"),
     'description' => t("The number of nodes tagged with the taxonomy term."),
-  );
-  $term['url'] = array(
+  ];
+  $term['url'] = [
     'name' => t("URL"),
     'description' => t("The URL of the taxonomy term."),
-  );
+  ];
 
   // Taxonomy vocabulary related variables.
-  $vocabulary['vid'] = array(
+  $vocabulary['vid'] = [
     'name' => t("Vocabulary ID"),
     'description' => t("The unique ID of the taxonomy vocabulary."),
-  );
-  $vocabulary['name'] = array(
+  ];
+  $vocabulary['name'] = [
     'name' => t("Name"),
     'description' => t("The name of the taxonomy vocabulary."),
-  );
-  $vocabulary['description'] = array(
+  ];
+  $vocabulary['description'] = [
     'name' => t("Description"),
     'description' => t("The optional description of the taxonomy vocabulary."),
-  );
-  $vocabulary['node-count'] = array(
+  ];
+  $vocabulary['node-count'] = [
     'name' => t("Node count"),
     'description' => t("The number of nodes tagged with terms belonging to the taxonomy vocabulary."),
-  );
-  $vocabulary['term-count'] = array(
+  ];
+  $vocabulary['term-count'] = [
     'name' => t("Term count"),
     'description' => t("The number of terms belonging to the taxonomy vocabulary."),
-  );
+  ];
 
   // Chained tokens for taxonomies
-  $term['vocabulary'] = array(
+  $term['vocabulary'] = [
     'name' => t("Vocabulary"),
     'description' => t("The vocabulary the taxonomy term belongs to."),
     'type' => 'vocabulary',
-  );
-  $term['parent'] = array(
+  ];
+  $term['parent'] = [
     'name' => t("Parent term"),
     'description' => t("The parent term of the taxonomy term, if one exists."),
     'type' => 'term',
-  );
+  ];
 
-  return array(
+  return [
     'types' => $types,
-    'tokens' => array(
+    'tokens' => [
       'term' => $term,
       'vocabulary' => $vocabulary,
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -94,7 +94,7 @@ function taxonomy_token_info() {
 function taxonomy_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
-  $replacements = array();
+  $replacements = [];
   $taxonomy_storage = \Drupal::entityManager()->getStorage('taxonomy_term');
   if ($type == 'term' && !empty($data['term'])) {
     $term = $data['term'];
@@ -116,7 +116,7 @@ function taxonomy_tokens($type, $tokens, array $data, array $options, Bubbleable
           break;
 
         case 'url':
-          $replacements[$original] = $term->url('canonical', array('absolute' => TRUE));
+          $replacements[$original] = $term->url('canonical', ['absolute' => TRUE]);
           break;
 
         case 'node-count':
@@ -145,12 +145,12 @@ function taxonomy_tokens($type, $tokens, array $data, array $options, Bubbleable
 
     if ($vocabulary_tokens = $token_service->findWithPrefix($tokens, 'vocabulary')) {
       $vocabulary = Vocabulary::load($term->bundle());
-      $replacements += $token_service->generate('vocabulary', $vocabulary_tokens, array('vocabulary' => $vocabulary), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('vocabulary', $vocabulary_tokens, ['vocabulary' => $vocabulary], $options, $bubbleable_metadata);
     }
 
     if (($vocabulary_tokens = $token_service->findWithPrefix($tokens, 'parent')) && $parents = $taxonomy_storage->loadParents($term->id())) {
       $parent = array_pop($parents);
-      $replacements += $token_service->generate('term', $vocabulary_tokens, array('term' => $parent), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('term', $vocabulary_tokens, ['term' => $parent], $options, $bubbleable_metadata);
     }
   }
 
diff --git a/web/core/modules/taxonomy/taxonomy.views.inc b/web/core/modules/taxonomy/taxonomy.views.inc
index 5360d5081..1eedbbe7b 100644
--- a/web/core/modules/taxonomy/taxonomy.views.inc
+++ b/web/core/modules/taxonomy/taxonomy.views.inc
@@ -11,44 +11,44 @@ use Drupal\field\FieldStorageConfigInterface;
  * Implements hook_views_data_alter().
  */
 function taxonomy_views_data_alter(&$data) {
-  $data['node_field_data']['term_node_tid'] = array(
+  $data['node_field_data']['term_node_tid'] = [
     'title' => t('Taxonomy terms on node'),
     'help' => t('Relate nodes to taxonomy terms, specifying which vocabulary or vocabularies to use. This relationship will cause duplicated records if there are multiple terms.'),
-    'relationship' => array(
+    'relationship' => [
       'id' => 'node_term_data',
       'label' => t('term'),
       'base' => 'taxonomy_term_field_data',
-    ),
-    'field' => array(
+    ],
+    'field' => [
       'title' => t('All taxonomy terms'),
       'help' => t('Display all taxonomy terms associated with a node from specified vocabularies.'),
       'id' => 'taxonomy_index_tid',
       'no group by' => TRUE,
       'click sortable' => FALSE,
-    ),
-  );
+    ],
+  ];
 
-  $data['node_field_data']['term_node_tid_depth'] = array(
+  $data['node_field_data']['term_node_tid_depth'] = [
     'help' => t('Display content if it has the selected taxonomy terms, or children of the selected terms. Due to additional complexity, this has fewer options than the versions without depth.'),
     'real field' => 'nid',
-    'argument' => array(
+    'argument' => [
       'title' => t('Has taxonomy term ID (with depth)'),
       'id' => 'taxonomy_index_tid_depth',
       'accept depth modifier' => TRUE,
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'title' => t('Has taxonomy terms (with depth)'),
       'id' => 'taxonomy_index_tid_depth',
-    ),
-  );
+    ],
+  ];
 
-  $data['node_field_data']['term_node_tid_depth_modifier'] = array(
+  $data['node_field_data']['term_node_tid_depth_modifier'] = [
     'title' => t('Has taxonomy term ID depth modifier'),
     'help' => t('Allows the "depth" for Taxonomy: Term ID (with depth) to be modified via an additional contextual filter value.'),
-    'argument' => array(
+    'argument' => [
       'id' => 'taxonomy_index_tid_depth_modifier',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
diff --git a/web/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml b/web/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml
new file mode 100644
index 000000000..a90e618f4
--- /dev/null
+++ b/web/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_argument_taxonomy_vocabulary.yml
@@ -0,0 +1,174 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - taxonomy
+    - user
+id: test_argument_taxonomy_vocabulary
+label: test_argument_taxonomy_vocabulary
+module: views
+description: ''
+tag: ''
+base_table: taxonomy_term_field_data
+base_field: tid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        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: none
+        options:
+          offset: 0
+      style:
+        type: default
+      row:
+        type: 'entity:taxonomy_term'
+      fields:
+        name:
+          id: name
+          table: taxonomy_term_field_data
+          field: name
+          entity_type: taxonomy_term
+          entity_field: name
+          label: ''
+          alter:
+            alter_text: false
+            make_link: false
+            absolute: false
+            trim: false
+            word_boundary: false
+            ellipsis: false
+            strip_tags: false
+            html: false
+          hide_empty: false
+          empty_zero: false
+          type: string
+          settings:
+            link_to_entity: true
+          plugin_id: term_name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          exclude: 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_alter_empty: true
+          click_sort_column: value
+          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
+          convert_spaces: false
+      filters: {  }
+      sorts: {  }
+      title: ''
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments:
+        vid:
+          id: vid
+          table: taxonomy_term_field_data
+          field: vid
+          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: taxonomy_term
+          entity_field: vid
+          plugin_id: vocabulary_vid
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - user.permissions
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: test_argument_taxonomy_vocabulary
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - user.permissions
+      tags: {  }
+
diff --git a/web/core/modules/taxonomy/src/Tests/EfqTest.php b/web/core/modules/taxonomy/tests/src/Functional/EfqTest.php
similarity index 88%
rename from web/core/modules/taxonomy/src/Tests/EfqTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/EfqTest.php
index 572ae8f86..e78d9ec9b 100644
--- a/web/core/modules/taxonomy/src/Tests/EfqTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/EfqTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 /**
  * Verifies operation of a taxonomy-based Entity Query.
@@ -25,8 +25,8 @@ class EfqTest extends TaxonomyTestBase {
   /**
    * Tests that a basic taxonomy entity query works.
    */
-  function testTaxonomyEfq() {
-    $terms = array();
+  public function testTaxonomyEfq() {
+    $terms = [];
     for ($i = 0; $i < 5; $i++) {
       $term = $this->createTerm($this->vocabulary);
       $terms[$term->id()] = $term;
@@ -35,17 +35,17 @@ class EfqTest extends TaxonomyTestBase {
     sort($result);
     $this->assertEqual(array_keys($terms), $result, 'Taxonomy terms were retrieved by entity query.');
     $tid = reset($result);
-    $ids = (object) array(
+    $ids = (object) [
       'entity_type' => 'taxonomy_term',
       'entity_id' => $tid,
       'bundle' => $this->vocabulary->id(),
-    );
+    ];
     $term = _field_create_entity_from_ids($ids);
     $this->assertEqual($term->id(), $tid, 'Taxonomy term can be created based on the IDs.');
 
     // Create a second vocabulary and five more terms.
     $vocabulary2 = $this->createVocabulary();
-    $terms2 = array();
+    $terms2 = [];
     for ($i = 0; $i < 5; $i++) {
       $term = $this->createTerm($vocabulary2);
       $terms2[$term->id()] = $term;
@@ -55,13 +55,13 @@ class EfqTest extends TaxonomyTestBase {
       ->condition('vid', $vocabulary2->id())
       ->execute();
     sort($result);
-    $this->assertEqual(array_keys($terms2), $result, format_string('Taxonomy terms from the %name vocabulary were retrieved by entity query.', array('%name' => $vocabulary2->label())));
+    $this->assertEqual(array_keys($terms2), $result, format_string('Taxonomy terms from the %name vocabulary were retrieved by entity query.', ['%name' => $vocabulary2->label()]));
     $tid = reset($result);
-    $ids = (object) array(
+    $ids = (object) [
       'entity_type' => 'taxonomy_term',
       'entity_id' => $tid,
       'bundle' => $vocabulary2->id(),
-    );
+    ];
     $term = _field_create_entity_from_ids($ids);
     $this->assertEqual($term->id(), $tid, 'Taxonomy term can be created based on the IDs.');
   }
diff --git a/web/core/modules/taxonomy/src/Tests/LegacyTest.php b/web/core/modules/taxonomy/tests/src/Functional/LegacyTest.php
similarity index 87%
rename from web/core/modules/taxonomy/src/Tests/LegacyTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/LegacyTest.php
index b84222635..289471533 100644
--- a/web/core/modules/taxonomy/src/Tests/LegacyTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/LegacyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -18,7 +18,7 @@ class LegacyTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'datetime');
+  public static $modules = ['node', 'datetime'];
 
   protected function setUp() {
     parent::setUp();
@@ -31,18 +31,18 @@ class LegacyTest extends TaxonomyTestBase {
     $vocabulary->save();
     $field_name = 'field_' . $vocabulary->id();
 
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $vocabulary->id() => $vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'article', $field_name, 'Tags', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => 'entity_reference_autocomplete_tags',
-      ))
+      ])
       ->save();
 
     $this->drupalLogin($this->drupalCreateUser(['administer taxonomy', 'administer nodes', 'bypass node access']));
@@ -51,10 +51,10 @@ class LegacyTest extends TaxonomyTestBase {
   /**
    * Test taxonomy functionality with nodes prior to 1970.
    */
-  function testTaxonomyLegacyNode() {
+  public function testTaxonomyLegacyNode() {
     // Posts an article with a taxonomy term and a date prior to 1970.
     $date = new DrupalDateTime('1969-01-01 00:00:00');
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $edit['created[0][value][date]'] = $date->format('Y-m-d');
     $edit['created[0][value][time]'] = $date->format('H:i:s');
diff --git a/web/core/modules/taxonomy/src/Tests/LoadMultipleTest.php b/web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
similarity index 88%
rename from web/core/modules/taxonomy/src/Tests/LoadMultipleTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
index 349516c8f..186031cce 100644
--- a/web/core/modules/taxonomy/src/Tests/LoadMultipleTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\taxonomy\Entity\Term;
 
@@ -20,7 +20,7 @@ class LoadMultipleTest extends TaxonomyTestBase {
    * Create a vocabulary and some taxonomy terms, ensuring they're loaded
    * correctly using entity_load_multiple().
    */
-  function testTaxonomyTermMultipleLoad() {
+  public function testTaxonomyTermMultipleLoad() {
     // Create a vocabulary.
     $vocabulary = $this->createVocabulary();
 
@@ -31,9 +31,9 @@ class LoadMultipleTest extends TaxonomyTestBase {
       $this->createTerm($vocabulary);
     }
     // Load the terms from the vocabulary.
-    $terms = entity_load_multiple_by_properties('taxonomy_term', array('vid' => $vocabulary->id()));
+    $terms = entity_load_multiple_by_properties('taxonomy_term', ['vid' => $vocabulary->id()]);
     $count = count($terms);
-    $this->assertEqual($count, 5, format_string('Correct number of terms were loaded. @count terms.', array('@count' => $count)));
+    $this->assertEqual($count, 5, format_string('Correct number of terms were loaded. @count terms.', ['@count' => $count]));
 
     // Load the same terms again by tid.
     $terms2 = Term::loadMultiple(array_keys($terms));
@@ -47,13 +47,13 @@ class LoadMultipleTest extends TaxonomyTestBase {
     $this->assertFalse($deleted_term);
 
     // Load terms from the vocabulary by vid.
-    $terms3 = entity_load_multiple_by_properties('taxonomy_term', array('vid' => $vocabulary->id()));
+    $terms3 = entity_load_multiple_by_properties('taxonomy_term', ['vid' => $vocabulary->id()]);
     $this->assertEqual(count($terms3), 4, 'Correct number of terms were loaded.');
     $this->assertFalse(isset($terms3[$deleted->id()]));
 
     // Create a single term and load it by name.
     $term = $this->createTerm($vocabulary);
-    $loaded_terms = entity_load_multiple_by_properties('taxonomy_term', array('name' => $term->getName()));
+    $loaded_terms = entity_load_multiple_by_properties('taxonomy_term', ['name' => $term->getName()]);
     $this->assertEqual(count($loaded_terms), 1, 'One term was loaded.');
     $loaded_term = reset($loaded_terms);
     $this->assertEqual($term->id(), $loaded_term->id(), 'Term loaded by name successfully.');
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTestBase.php b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTestBase.php
new file mode 100644
index 000000000..ed8b95f60
--- /dev/null
+++ b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTestBase.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Drupal\Tests\taxonomy\Functional;
+
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\taxonomy\Tests\TaxonomyTestTrait;
+
+/**
+ * Provides common helper methods for Taxonomy module tests.
+ */
+abstract class TaxonomyTestBase extends BrowserTestBase {
+
+  use TaxonomyTestTrait;
+  use EntityReferenceTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['taxonomy', 'block'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->drupalPlaceBlock('system_breadcrumb_block');
+
+    // Create Basic page and Article node types.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+    }
+  }
+
+}
diff --git a/web/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermCacheTagsTest.php
similarity index 89%
rename from web/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/TermCacheTagsTest.php
index 8d7ddad22..35b7d6bd6 100644
--- a/web/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
 use Drupal\taxonomy\Entity\Vocabulary;
@@ -16,7 +16,7 @@ class TermCacheTagsTest extends EntityWithUriCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermEntityReferenceTest.php
similarity index 80%
rename from web/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/TermEntityReferenceTest.php
index de7765424..9d4522ec7 100644
--- a/web/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermEntityReferenceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Entity\FieldConfig;
@@ -26,7 +26,7 @@ class TermEntityReferenceTest extends TaxonomyTestBase {
    * field to limit the target vocabulary to one of them, ensuring that
    * the restriction applies.
    */
-  function testSelectionTestVocabularyRestriction() {
+  public function testSelectionTestVocabularyRestriction() {
 
     // Create two vocabularies.
     $vocabulary = $this->createVocabulary();
@@ -37,41 +37,41 @@ class TermEntityReferenceTest extends TaxonomyTestBase {
 
     // Create an entity reference field.
     $field_name = 'taxonomy_' . $vocabulary->id();
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'translatable' => FALSE,
-      'settings' => array(
+      'settings' => [
         'target_type' => 'taxonomy_term',
-      ),
+      ],
       'type' => 'entity_reference',
       'cardinality' => 1,
-    ));
+    ]);
     $field_storage->save();
-    $field = FieldConfig::create(array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'entity_type' => 'entity_test',
       'bundle' => 'test_bundle',
-      'settings' => array(
+      'settings' => [
         'handler' => 'default',
-        'handler_settings' => array(
+        'handler_settings' => [
           // Restrict selection of terms to a single vocabulary.
-          'target_bundles' => array(
+          'target_bundles' => [
             $vocabulary->id() => $vocabulary->id(),
-          ),
-        ),
-      ),
-    ));
+          ],
+        ],
+      ],
+    ]);
     $field->save();
 
     $handler = $this->container->get('plugin.manager.entity_reference_selection')->getSelectionHandler($field);
     $result = $handler->getReferenceableEntities();
 
-    $expected_result = array(
-      $vocabulary->id() => array(
+    $expected_result = [
+      $vocabulary->id() => [
         $term->id() => $term->getName(),
-      ),
-    );
+      ],
+    ];
 
     $this->assertIdentical($result, $expected_result, 'Terms selection restricted to a single vocabulary.');
   }
diff --git a/web/core/modules/taxonomy/src/Tests/TermIndexTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
similarity index 81%
rename from web/core/modules/taxonomy/src/Tests/TermIndexTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
index 28e816ce6..d4fe8f225 100644
--- a/web/core/modules/taxonomy/src/Tests/TermIndexTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -17,7 +17,7 @@ class TermIndexTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $modules = array('views');
+  public static $modules = ['views'];
 
   /**
    * Vocabulary for testing.
@@ -50,51 +50,51 @@ class TermIndexTest extends TaxonomyTestBase {
     $this->vocabulary = $this->createVocabulary();
 
     $this->fieldName1 = Unicode::strtolower($this->randomMachineName());
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-       ),
+       ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'article', $this->fieldName1, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($this->fieldName1, array(
+      ->setComponent($this->fieldName1, [
         'type' => 'options_select',
-      ))
+      ])
       ->save();
     entity_get_display('node', 'article', 'default')
-      ->setComponent($this->fieldName1, array(
+      ->setComponent($this->fieldName1, [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
 
     $this->fieldName2 = Unicode::strtolower($this->randomMachineName());
     $this->createEntityReferenceField('node', 'article', $this->fieldName2, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($this->fieldName2, array(
+      ->setComponent($this->fieldName2, [
         'type' => 'options_select',
-      ))
+      ])
       ->save();
     entity_get_display('node', 'article', 'default')
-      ->setComponent($this->fieldName2, array(
+      ->setComponent($this->fieldName2, [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
   }
 
   /**
    * Tests that the taxonomy index is maintained properly.
    */
-  function testTaxonomyIndex() {
+  public function testTaxonomyIndex() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     // Create terms in the vocabulary.
     $term_1 = $this->createTerm($this->vocabulary);
     $term_2 = $this->createTerm($this->vocabulary);
 
     // Post an article.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $this->randomMachineName();
     $edit['body[0][value]'] = $this->randomMachineName();
     $edit["{$this->fieldName1}[]"] = $term_1->id();
@@ -103,10 +103,10 @@ class TermIndexTest extends TaxonomyTestBase {
 
     // Check that the term is indexed, and only once.
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_1->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(1, $index_count, 'Term 1 is indexed once.');
 
     // Update the article to change one term.
@@ -114,15 +114,15 @@ class TermIndexTest extends TaxonomyTestBase {
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
 
     // Check that both terms are indexed.
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_1->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(1, $index_count, 'Term 1 is indexed.');
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_2->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(1, $index_count, 'Term 2 is indexed.');
 
     // Update the article to change another term.
@@ -130,19 +130,19 @@ class TermIndexTest extends TaxonomyTestBase {
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
 
     // Check that only one term is indexed.
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_1->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(0, $index_count, 'Term 1 is not indexed.');
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_2->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(1, $index_count, 'Term 2 is indexed once.');
 
     // Redo the above tests without interface.
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $node = $node_storage->load($node->id());
     $node->title = $this->randomMachineName();
 
@@ -150,58 +150,58 @@ class TermIndexTest extends TaxonomyTestBase {
     $node->save();
 
     // Check that the index was not changed.
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_1->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(0, $index_count, 'Term 1 is not indexed.');
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_2->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(1, $index_count, 'Term 2 is indexed once.');
 
     // Update the article to change one term.
-    $node->{$this->fieldName1} = array(array('target_id' => $term_1->id()));
+    $node->{$this->fieldName1} = [['target_id' => $term_1->id()]];
     $node->save();
 
     // Check that both terms are indexed.
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_1->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(1, $index_count, 'Term 1 is indexed.');
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_2->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(1, $index_count, 'Term 2 is indexed.');
 
     // Update the article to change another term.
-    $node->{$this->fieldName2} = array(array('target_id' => $term_1->id()));
+    $node->{$this->fieldName2} = [['target_id' => $term_1->id()]];
     $node->save();
 
     // Check that only one term is indexed.
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_1->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(1, $index_count, 'Term 1 is indexed once.');
-    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', array(
+    $index_count = db_query('SELECT COUNT(*) FROM {taxonomy_index} WHERE nid = :nid AND tid = :tid', [
       ':nid' => $node->id(),
       ':tid' => $term_2->id(),
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual(0, $index_count, 'Term 2 is not indexed.');
   }
 
   /**
    * Tests that there is a link to the parent term on the child term page.
    */
-  function testTaxonomyTermHierarchyBreadcrumbs() {
+  public function testTaxonomyTermHierarchyBreadcrumbs() {
     // Create two taxonomy terms and set term2 as the parent of term1.
     $term1 = $this->createTerm($this->vocabulary);
     $term2 = $this->createTerm($this->vocabulary);
-    $term1->parent = array($term2->id());
+    $term1->parent = [$term2->id()];
     $term1->save();
 
     // Verify that the page breadcrumbs include a link to the parent term.
diff --git a/web/core/modules/taxonomy/src/Tests/TermLanguageTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
similarity index 71%
rename from web/core/modules/taxonomy/src/Tests/TermLanguageTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
index e894ad2fa..f60e77e53 100644
--- a/web/core/modules/taxonomy/src/Tests/TermLanguageTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -12,7 +12,7 @@ use Drupal\language\Entity\ConfigurableLanguage;
  */
 class TermLanguageTest extends TaxonomyTestBase {
 
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   /**
    * Vocabulary for testing.
@@ -31,19 +31,19 @@ class TermLanguageTest extends TaxonomyTestBase {
     $this->vocabulary = $this->createVocabulary();
 
     // Add some custom languages.
-    foreach (array('aa', 'bb', 'cc') as $language_code) {
-      ConfigurableLanguage::create(array(
+    foreach (['aa', 'bb', 'cc'] as $language_code) {
+      ConfigurableLanguage::create([
         'id' => $language_code,
         'label' => $this->randomMachineName(),
-      ))->save();
+      ])->save();
     }
   }
 
-  function testTermLanguage() {
+  public function testTermLanguage() {
     // Configure the vocabulary to not hide the language selector.
-    $edit = array(
+    $edit = [
       'default_language[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id(), $edit, t('Save'));
 
     // Add a term.
@@ -51,10 +51,10 @@ class TermLanguageTest extends TaxonomyTestBase {
     // Check that we have the language selector.
     $this->assertField('edit-langcode-0-value', t('The language selector field was found on the page.'));
     // Submit the term.
-    $edit = array(
+    $edit = [
       'name[0][value]' => $this->randomMachineName(),
       'langcode[0][value]' => 'aa',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $terms = taxonomy_term_load_multiple_by_name($edit['name[0][value]']);
     $term = reset($terms);
@@ -73,22 +73,22 @@ class TermLanguageTest extends TaxonomyTestBase {
     $this->assertOptionSelected('edit-langcode-0-value', $edit['langcode[0][value]'], 'The term language was correctly selected.');
   }
 
-  function testDefaultTermLanguage() {
+  public function testDefaultTermLanguage() {
     // Configure the vocabulary to not hide the language selector, and make the
     // default language of the terms fixed.
-    $edit = array(
+    $edit = [
       'default_language[langcode]' => 'bb',
       'default_language[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id(), $edit, t('Save'));
     $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
     $this->assertOptionSelected('edit-langcode-0-value', 'bb', 'The expected langcode was selected.');
 
     // Make the default language of the terms to be the current interface.
-    $edit = array(
+    $edit = [
       'default_language[langcode]' => 'current_interface',
       'default_language[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id(), $edit, t('Save'));
     $this->drupalGet('aa/admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
     $this->assertOptionSelected('edit-langcode-0-value', 'aa', "The expected langcode, 'aa', was selected.");
@@ -98,13 +98,46 @@ class TermLanguageTest extends TaxonomyTestBase {
     // Change the default language of the site and check if the default terms
     // language is still correctly selected.
     $this->config('system.site')->set('default_langcode', 'cc')->save();
-    $edit = array(
+    $edit = [
       'default_language[langcode]' => LanguageInterface::LANGCODE_SITE_DEFAULT,
       'default_language[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id(), $edit, t('Save'));
     $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
     $this->assertOptionSelected('edit-langcode-0-value', 'cc', "The expected langcode, 'cc', was selected.");
   }
 
+  /**
+   * Tests that translated terms are displayed correctly on the term overview.
+   */
+  public function testTermTranslatedOnOverviewPage() {
+    // Configure the vocabulary to not hide the language selector.
+    $edit = [
+      'default_language[language_alterable]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id(), $edit, t('Save'));
+
+    // Add a term.
+    $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
+    // Submit the term.
+    $edit = [
+      'name[0][value]' => $this->randomMachineName(),
+      'langcode[0][value]' => 'aa',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    $terms = taxonomy_term_load_multiple_by_name($edit['name[0][value]']);
+    $term = reset($terms);
+
+    // Add a translation for that term.
+    $translated_title = $this->randomMachineName();
+    $term->addTranslation('bb', [
+      'name' => $translated_title,
+    ]);
+    $term->save();
+
+    // Overview page in the other language shows the translated term
+    $this->drupalGet('bb/admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview');
+    $this->assertPattern('|<a[^>]*>' . $translated_title . '</a>|', 'The term language is correct');
+  }
+
 }
diff --git a/web/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
similarity index 85%
rename from web/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
index 18cf72088..c5df74dad 100644
--- a/web/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\node\Entity\Node;
+use Drupal\taxonomy\Tests\TaxonomyTranslationTestTrait;
 
 /**
  * Tests the translation of taxonomy terms field on nodes.
@@ -39,7 +40,7 @@ class TermTranslationFieldViewTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'content_translation', 'taxonomy');
+  public static $modules = ['language', 'content_translation', 'taxonomy'];
 
   protected function setUp() {
     parent::setUp();
@@ -78,7 +79,7 @@ class TermTranslationFieldViewTest extends TaxonomyTestBase {
         'value' => $this->randomMachineName(),
         'format' => 'basic_html'
       ]],
-      $this->termFieldName => array(array('target_id' => $this->term->id())),
+      $this->termFieldName => [['target_id' => $this->term->id()]],
       'langcode' => $this->baseLangcode,
     ]);
     $node->save();
@@ -91,14 +92,14 @@ class TermTranslationFieldViewTest extends TaxonomyTestBase {
    * Creates a test subject term, with translation.
    */
   protected function setUpTerm() {
-    $this->term = $this->createTerm($this->vocabulary, array(
+    $this->term = $this->createTerm($this->vocabulary, [
       'name' => $this->baseTagName,
       'langcode' => $this->baseLangcode,
-    ));
+    ]);
 
-    $this->term->addTranslation($this->translateToLangcode, array(
+    $this->term->addTranslation($this->translateToLangcode, [
       'name' => $this->translatedTagName,
-    ));
+    ]);
     $this->term->save();
   }
 
diff --git a/web/core/modules/taxonomy/src/Tests/TokenReplaceTest.php b/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
similarity index 77%
rename from web/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
index f3c6c5dc0..958da3beb 100644
--- a/web/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Render\BubbleableMetadata;
@@ -33,30 +33,30 @@ class TokenReplaceTest extends TaxonomyTestBase {
     $this->vocabulary = $this->createVocabulary();
     $this->fieldName = 'taxonomy_' . $this->vocabulary->id();
 
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'article', $this->fieldName, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'options_select',
-      ))
+      ])
       ->save();
     entity_get_display('node', 'article', 'default')
-      ->setComponent($this->fieldName, array(
+      ->setComponent($this->fieldName, [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
   }
 
   /**
    * Creates some terms and a node, then tests the tokens generated from them.
    */
-  function testTaxonomyTokenReplacement() {
+  public function testTaxonomyTokenReplacement() {
     $token_service = \Drupal::token();
     $language_interface = \Drupal::languageManager()->getCurrentLanguage();
 
@@ -65,23 +65,23 @@ class TokenReplaceTest extends TaxonomyTestBase {
     $term2 = $this->createTerm($this->vocabulary);
 
     // Edit $term2, setting $term1 as parent.
-    $edit = array();
+    $edit = [];
     $edit['name[0][value]'] = '<blink>Blinking Text</blink>';
-    $edit['parent[]'] = array($term1->id());
+    $edit['parent[]'] = [$term1->id()];
     $this->drupalPostForm('taxonomy/term/' . $term2->id() . '/edit', $edit, t('Save'));
 
     // Create node with term2.
-    $edit = array();
-    $node = $this->drupalCreateNode(array('type' => 'article'));
+    $edit = [];
+    $node = $this->drupalCreateNode(['type' => 'article']);
     $edit[$this->fieldName . '[]'] = $term2->id();
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
 
     // Generate and test sanitized tokens for term1.
-    $tests = array();
+    $tests = [];
     $tests['[term:tid]'] = $term1->id();
     $tests['[term:name]'] = $term1->getName();
     $tests['[term:description]'] = $term1->description->processed;
-    $tests['[term:url]'] = $term1->url('canonical', array('absolute' => TRUE));
+    $tests['[term:url]'] = $term1->url('canonical', ['absolute' => TRUE]);
     $tests['[term:node-count]'] = 0;
     $tests['[term:parent:name]'] = '[term:parent:name]';
     $tests['[term:vocabulary:name]'] = $this->vocabulary->label();
@@ -89,7 +89,7 @@ class TokenReplaceTest extends TaxonomyTestBase {
 
     $base_bubbleable_metadata = BubbleableMetadata::createFromObject($term1);
 
-    $metadata_tests = array();
+    $metadata_tests = [];
     $metadata_tests['[term:tid]'] = $base_bubbleable_metadata;
     $metadata_tests['[term:name]'] = $base_bubbleable_metadata;
     $metadata_tests['[term:description]'] = $base_bubbleable_metadata;
@@ -102,20 +102,20 @@ class TokenReplaceTest extends TaxonomyTestBase {
 
     foreach ($tests as $input => $expected) {
       $bubbleable_metadata = new BubbleableMetadata();
-      $output = $token_service->replace($input, array('term' => $term1), array('langcode' => $language_interface->getId()), $bubbleable_metadata);
-      $this->assertEqual($output, $expected, format_string('Sanitized taxonomy term token %token replaced.', array('%token' => $input)));
+      $output = $token_service->replace($input, ['term' => $term1], ['langcode' => $language_interface->getId()], $bubbleable_metadata);
+      $this->assertEqual($output, $expected, format_string('Sanitized taxonomy term token %token replaced.', ['%token' => $input]));
       $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
 
     // Generate and test sanitized tokens for term2.
-    $tests = array();
+    $tests = [];
     $tests['[term:tid]'] = $term2->id();
     $tests['[term:name]'] = $term2->getName();
     $tests['[term:description]'] = $term2->description->processed;
-    $tests['[term:url]'] = $term2->url('canonical', array('absolute' => TRUE));
+    $tests['[term:url]'] = $term2->url('canonical', ['absolute' => TRUE]);
     $tests['[term:node-count]'] = 1;
     $tests['[term:parent:name]'] = $term1->getName();
-    $tests['[term:parent:url]'] = $term1->url('canonical', array('absolute' => TRUE));
+    $tests['[term:parent:url]'] = $term1->url('canonical', ['absolute' => TRUE]);
     $tests['[term:parent:parent:name]'] = '[term:parent:parent:name]';
     $tests['[term:vocabulary:name]'] = $this->vocabulary->label();
 
@@ -123,12 +123,12 @@ class TokenReplaceTest extends TaxonomyTestBase {
     $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
 
     foreach ($tests as $input => $expected) {
-      $output = $token_service->replace($input, array('term' => $term2), array('langcode' => $language_interface->getId()));
-      $this->assertEqual($output, $expected, format_string('Sanitized taxonomy term token %token replaced.', array('%token' => $input)));
+      $output = $token_service->replace($input, ['term' => $term2], ['langcode' => $language_interface->getId()]);
+      $this->assertEqual($output, $expected, format_string('Sanitized taxonomy term token %token replaced.', ['%token' => $input]));
     }
 
     // Generate and test sanitized tokens.
-    $tests = array();
+    $tests = [];
     $tests['[vocabulary:vid]'] = $this->vocabulary->id();
     $tests['[vocabulary:name]'] = $this->vocabulary->label();
     $tests['[vocabulary:description]'] = $this->vocabulary->getDescription();
@@ -139,8 +139,8 @@ class TokenReplaceTest extends TaxonomyTestBase {
     $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
 
     foreach ($tests as $input => $expected) {
-      $output = $token_service->replace($input, array('vocabulary' => $this->vocabulary), array('langcode' => $language_interface->getId()));
-      $this->assertEqual($output, $expected, format_string('Sanitized taxonomy vocabulary token %token replaced.', array('%token' => $input)));
+      $output = $token_service->replace($input, ['vocabulary' => $this->vocabulary], ['langcode' => $language_interface->getId()]);
+      $this->assertEqual($output, $expected, format_string('Sanitized taxonomy vocabulary token %token replaced.', ['%token' => $input]));
     }
   }
 
diff --git a/web/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php b/web/core/modules/taxonomy/tests/src/Functional/VocabularyCrudTest.php
similarity index 84%
rename from web/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/VocabularyCrudTest.php
index 914b7f2a6..2ac2d9de6 100644
--- a/web/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/VocabularyCrudTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\field\Entity\FieldConfig;
@@ -19,12 +19,12 @@ class VocabularyCrudTest extends TaxonomyTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_test', 'taxonomy_crud');
+  public static $modules = ['field_test', 'taxonomy_crud'];
 
   protected function setUp() {
     parent::setUp();
 
-    $admin_user = $this->drupalCreateUser(array('create article content', 'administer taxonomy'));
+    $admin_user = $this->drupalCreateUser(['create article content', 'administer taxonomy']);
     $this->drupalLogin($admin_user);
     $this->vocabulary = $this->createVocabulary();
   }
@@ -32,7 +32,7 @@ class VocabularyCrudTest extends TaxonomyTestBase {
   /**
    * Test deleting a taxonomy that contains terms.
    */
-  function testTaxonomyVocabularyDeleteWithTerms() {
+  public function testTaxonomyVocabularyDeleteWithTerms() {
     // Delete any existing vocabularies.
     foreach (Vocabulary::loadMultiple() as $vocabulary) {
       $vocabulary->delete();
@@ -42,15 +42,15 @@ class VocabularyCrudTest extends TaxonomyTestBase {
     // Assert that there are no terms left.
     $this->assertEqual(0, $query->execute(), 'There are no terms remaining.');
 
-    $terms = array();
+    $terms = [];
     for ($i = 0; $i < 5; $i++) {
       $terms[$i] = $this->createTerm($vocabulary);
     }
 
     // Set up hierarchy. term 2 is a child of 1 and 4 a child of 1 and 2.
-    $terms[2]->parent = array($terms[1]->id());
+    $terms[2]->parent = [$terms[1]->id()];
     $terms[2]->save();
-    $terms[4]->parent = array($terms[1]->id(), $terms[2]->id());
+    $terms[4]->parent = [$terms[1]->id(), $terms[2]->id()];
     $terms[4]->save();
 
     // Assert that there are now 5 terms.
@@ -65,7 +65,7 @@ class VocabularyCrudTest extends TaxonomyTestBase {
   /**
    * Ensure that the vocabulary static reset works correctly.
    */
-  function testTaxonomyVocabularyLoadStaticReset() {
+  public function testTaxonomyVocabularyLoadStaticReset() {
     $original_vocabulary = Vocabulary::load($this->vocabulary->id());
     $this->assertTrue(is_object($original_vocabulary), 'Vocabulary loaded successfully.');
     $this->assertEqual($this->vocabulary->label(), $original_vocabulary->label(), 'Vocabulary loaded successfully.');
@@ -89,7 +89,7 @@ class VocabularyCrudTest extends TaxonomyTestBase {
   /**
    * Tests for loading multiple vocabularies.
    */
-  function testTaxonomyVocabularyLoadMultiple() {
+  public function testTaxonomyVocabularyLoadMultiple() {
 
     // Delete any existing vocabularies.
     foreach (Vocabulary::loadMultiple() as $vocabulary) {
@@ -119,45 +119,45 @@ class VocabularyCrudTest extends TaxonomyTestBase {
 
     // Fetch the vocabularies with entity_load_multiple(), specifying IDs.
     // Ensure they are returned in the same order as the original array.
-    $vocabularies = Vocabulary::loadMultiple(array($vocabulary3->id(), $vocabulary2->id(), $vocabulary1->id()));
+    $vocabularies = Vocabulary::loadMultiple([$vocabulary3->id(), $vocabulary2->id(), $vocabulary1->id()]);
     $loaded_order = array_keys($vocabularies);
-    $expected_order = array($vocabulary3->id(), $vocabulary2->id(), $vocabulary1->id());
+    $expected_order = [$vocabulary3->id(), $vocabulary2->id(), $vocabulary1->id()];
     $this->assertIdentical($loaded_order, $expected_order);
 
     // Test loading vocabularies by their properties.
     $controller = $this->container->get('entity.manager')->getStorage('taxonomy_vocabulary');
     // Fetch vocabulary 1 by name.
-    $vocabulary = current($controller->loadByProperties(array('name' => $vocabulary1->label())));
+    $vocabulary = current($controller->loadByProperties(['name' => $vocabulary1->label()]));
     $this->assertEqual($vocabulary->id(), $vocabulary1->id(), 'Vocabulary loaded successfully by name.');
 
     // Fetch vocabulary 2 by name and ID.
-    $vocabulary = current($controller->loadByProperties(array(
+    $vocabulary = current($controller->loadByProperties([
       'name' => $vocabulary2->label(),
       'vid' => $vocabulary2->id(),
-    )));
+    ]));
     $this->assertEqual($vocabulary->id(), $vocabulary2->id(), 'Vocabulary loaded successfully by name and ID.');
   }
 
   /**
    * Test uninstall and reinstall of the taxonomy module.
    */
-  function testUninstallReinstall() {
+  public function testUninstallReinstall() {
     // Field storages and fields attached to taxonomy term bundles should be
     // removed when the module is uninstalled.
     $field_name = Unicode::strtolower($this->randomMachineName() . '_field_name');
-    $storage_definition = array(
+    $storage_definition = [
       'field_name' => $field_name,
       'entity_type' => 'taxonomy_term',
       'type' => 'text',
       'cardinality' => 4
-    );
+    ];
     FieldStorageConfig::create($storage_definition)->save();
-    $field_definition = array(
+    $field_definition = [
       'field_name' => $field_name,
       'entity_type' => 'taxonomy_term',
       'bundle' => $this->vocabulary->id(),
       'label' => $this->randomMachineName() . '_label',
-    );
+    ];
     FieldConfig::create($field_definition)->save();
 
     // Remove the third party setting from the memory copy of the vocabulary.
@@ -166,8 +166,8 @@ class VocabularyCrudTest extends TaxonomyTestBase {
     $this->vocabulary->unsetThirdPartySetting('taxonomy_crud', 'foo');
 
     require_once \Drupal::root() . '/core/includes/install.inc';
-    $this->container->get('module_installer')->uninstall(array('taxonomy'));
-    $this->container->get('module_installer')->install(array('taxonomy'));
+    $this->container->get('module_installer')->uninstall(['taxonomy']);
+    $this->container->get('module_installer')->install(['taxonomy']);
 
     // Now create a vocabulary with the same name. All fields
     // connected to this vocabulary name should have been removed when the
diff --git a/web/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php b/web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
similarity index 93%
rename from web/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
index 3326e51e6..f25df8a1f 100644
--- a/web/core/modules/taxonomy/src/Tests/VocabularyLanguageTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -13,7 +13,7 @@ use Drupal\language\Entity\ContentLanguageSettings;
  */
 class VocabularyLanguageTest extends TaxonomyTestBase {
 
-  public static $modules = array('language');
+  public static $modules = ['language'];
 
   protected function setUp() {
     parent::setUp();
@@ -22,21 +22,21 @@ class VocabularyLanguageTest extends TaxonomyTestBase {
     $this->drupalLogin($this->drupalCreateUser(['administer taxonomy']));
 
     // Add some custom languages.
-    ConfigurableLanguage::create(array(
+    ConfigurableLanguage::create([
       'id' => 'aa',
       'label' => $this->randomMachineName(),
-    ))->save();
+    ])->save();
 
-    ConfigurableLanguage::create(array(
+    ConfigurableLanguage::create([
       'id' => 'bb',
       'label' => $this->randomMachineName(),
-    ))->save();
+    ])->save();
   }
 
   /**
    * Tests language settings for vocabularies.
    */
-  function testVocabularyLanguage() {
+  public function testVocabularyLanguage() {
     $this->drupalGet('admin/structure/taxonomy/add');
 
     // Check that we have the language selector available.
@@ -67,15 +67,15 @@ class VocabularyLanguageTest extends TaxonomyTestBase {
   /**
    * Tests term language settings for vocabulary terms are saved and updated.
    */
-  function testVocabularyDefaultLanguageForTerms() {
+  public function testVocabularyDefaultLanguageForTerms() {
     // Add a new vocabulary and check that the default language settings are for
     // the terms are saved.
-    $edit = array(
+    $edit = [
       'name' => $this->randomMachineName(),
       'vid' => Unicode::strtolower($this->randomMachineName()),
       'default_language[langcode]' => 'bb',
       'default_language[language_alterable]' => TRUE,
-    );
+    ];
     $vid = $edit['vid'];
     $this->drupalPostForm('admin/structure/taxonomy/add', $edit, t('Save'));
 
@@ -93,10 +93,10 @@ class VocabularyLanguageTest extends TaxonomyTestBase {
     $this->assertFieldChecked('edit-default-language-language-alterable', 'Show language selection option is checked.');
 
     // Edit the vocabulary and check that the new settings are updated.
-    $edit = array(
+    $edit = [
       'default_language[langcode]' => 'aa',
       'default_language[language_alterable]' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $vid, $edit, t('Save'));
 
     // And check again the settings and also the interface.
@@ -109,11 +109,11 @@ class VocabularyLanguageTest extends TaxonomyTestBase {
     $this->assertNoFieldChecked('edit-default-language-language-alterable', 'Show language selection option is not checked.');
 
     // Check that language settings are changed after editing vocabulary.
-    $edit = array(
+    $edit = [
       'name' => $this->randomMachineName(),
       'default_language[langcode]' => 'authors_default',
       'default_language[language_alterable]' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/taxonomy/manage/' . $vid, $edit, t('Save'));
 
     // Check that we have the new settings.
diff --git a/web/core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php b/web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
similarity index 76%
rename from web/core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
index 9a5e8c026..3ba8868f5 100644
--- a/web/core/modules/taxonomy/src/Tests/VocabularyPermissionsTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 /**
  * Tests the taxonomy vocabulary permissions.
@@ -18,12 +18,12 @@ class VocabularyPermissionsTest extends TaxonomyTestBase {
   /**
    * Create, edit and delete a taxonomy term via the user interface.
    */
-  function testVocabularyPermissionsTaxonomyTerm() {
+  public function testVocabularyPermissionsTaxonomyTerm() {
     // Vocabulary used for creating, removing and editing terms.
     $vocabulary = $this->createVocabulary();
 
     // Test as admin user.
-    $user = $this->drupalCreateUser(array('administer taxonomy'));
+    $user = $this->drupalCreateUser(['administer taxonomy']);
     $this->drupalLogin($user);
 
     // Visit the main taxonomy administration page.
@@ -32,14 +32,14 @@ class VocabularyPermissionsTest extends TaxonomyTestBase {
     $this->assertField('edit-name-0-value', 'Add taxonomy term form opened successfully.');
 
     // Submit the term.
-    $edit = array();
+    $edit = [];
     $edit['name[0][value]'] = $this->randomMachineName();
 
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText(t('Created new term @name.', array('@name' => $edit['name[0][value]'])), 'Term created successfully.');
+    $this->assertText(t('Created new term @name.', ['@name' => $edit['name[0][value]']]), 'Term created successfully.');
 
     // Verify that the creation message contains a link to a term.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'term/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'term/']);
     $this->assert(isset($view_link), 'The message area contains a link to a term');
 
     $terms = taxonomy_term_load_multiple_by_name($edit['name[0][value]']);
@@ -52,18 +52,18 @@ class VocabularyPermissionsTest extends TaxonomyTestBase {
 
     $edit['name[0][value]'] = $this->randomMachineName();
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText(t('Updated term @name.', array('@name' => $edit['name[0][value]'])), 'Term updated successfully.');
+    $this->assertText(t('Updated term @name.', ['@name' => $edit['name[0][value]']]), 'Term updated successfully.');
 
     // Delete the vocabulary.
     $this->drupalGet('taxonomy/term/' . $term->id() . '/delete');
-    $this->assertRaw(t('Are you sure you want to delete the @entity-type %label?', array('@entity-type' => 'taxonomy term', '%label' => $edit['name[0][value]'])), 'Delete taxonomy term form opened successfully.');
+    $this->assertRaw(t('Are you sure you want to delete the @entity-type %label?', ['@entity-type' => 'taxonomy term', '%label' => $edit['name[0][value]']]), 'Delete taxonomy term form opened successfully.');
 
     // Confirm deletion.
     $this->drupalPostForm(NULL, NULL, t('Delete'));
-    $this->assertRaw(t('Deleted term %name.', array('%name' => $edit['name[0][value]'])), 'Term deleted.');
+    $this->assertRaw(t('Deleted term %name.', ['%name' => $edit['name[0][value]']]), 'Term deleted.');
 
     // Test as user with "edit" permissions.
-    $user = $this->drupalCreateUser(array("edit terms in {$vocabulary->id()}"));
+    $user = $this->drupalCreateUser(["edit terms in {$vocabulary->id()}"]);
     $this->drupalLogin($user);
 
     // Visit the main taxonomy administration page.
@@ -80,10 +80,10 @@ class VocabularyPermissionsTest extends TaxonomyTestBase {
 
     $edit['name[0][value]'] = $this->randomMachineName();
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText(t('Updated term @name.', array('@name' => $edit['name[0][value]'])), 'Term updated successfully.');
+    $this->assertText(t('Updated term @name.', ['@name' => $edit['name[0][value]']]), 'Term updated successfully.');
 
     // Verify that the update message contains a link to a term.
-    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', array(':href' => 'term/'));
+    $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'term/']);
     $this->assert(isset($view_link), 'The message area contains a link to a term');
 
     // Delete the vocabulary.
@@ -91,7 +91,7 @@ class VocabularyPermissionsTest extends TaxonomyTestBase {
     $this->assertResponse(403, 'Delete taxonomy term form open failed.');
 
     // Test as user with "delete" permissions.
-    $user = $this->drupalCreateUser(array("delete terms in {$vocabulary->id()}"));
+    $user = $this->drupalCreateUser(["delete terms in {$vocabulary->id()}"]);
     $this->drupalLogin($user);
 
     // Visit the main taxonomy administration page.
@@ -107,11 +107,11 @@ class VocabularyPermissionsTest extends TaxonomyTestBase {
 
     // Delete the vocabulary.
     $this->drupalGet('taxonomy/term/' . $term->id() . '/delete');
-    $this->assertRaw(t('Are you sure you want to delete the @entity-type %label?', array('@entity-type' => 'taxonomy term', '%label' => $term->getName())), 'Delete taxonomy term form opened successfully.');
+    $this->assertRaw(t('Are you sure you want to delete the @entity-type %label?', ['@entity-type' => 'taxonomy term', '%label' => $term->getName()]), 'Delete taxonomy term form opened successfully.');
 
     // Confirm deletion.
     $this->drupalPostForm(NULL, NULL, t('Delete'));
-    $this->assertRaw(t('Deleted term %name.', array('%name' => $term->getName())), 'Term deleted.');
+    $this->assertRaw(t('Deleted term %name.', ['%name' => $term->getName()]), 'Term deleted.');
 
     // Test as user without proper permissions.
     $user = $this->drupalCreateUser();
diff --git a/web/core/modules/taxonomy/src/Tests/VocabularyTranslationTest.php b/web/core/modules/taxonomy/tests/src/Functional/VocabularyTranslationTest.php
similarity index 90%
rename from web/core/modules/taxonomy/src/Tests/VocabularyTranslationTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/VocabularyTranslationTest.php
index 7ad76099f..2d312578e 100644
--- a/web/core/modules/taxonomy/src/Tests/VocabularyTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/VocabularyTranslationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\taxonomy\Tests;
+namespace Drupal\Tests\taxonomy\Functional;
 
 use Drupal\Component\Utility\Unicode;
 
@@ -14,7 +14,7 @@ class VocabularyTranslationTest extends TaxonomyTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('content_translation', 'language');
+  public static $modules = ['content_translation', 'language'];
 
   /**
    * {@inheritdoc}
@@ -32,7 +32,7 @@ class VocabularyTranslationTest extends TaxonomyTestBase {
   /**
    * Tests language settings for vocabularies.
    */
-  function testVocabularyLanguage() {
+  public function testVocabularyLanguage() {
     $this->drupalGet('admin/structure/taxonomy/add');
 
     // Check that the field to enable content translation is available.
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php
index bff883056..92ebe5926 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\taxonomy\Kernel\Migrate;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -17,7 +17,7 @@ class MigrateTaxonomyConfigsTest extends MigrateDrupal6TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
index b0311f3da..125283355 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
@@ -15,7 +15,7 @@ class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   /**
    * {@inheritdoc}
@@ -30,44 +30,44 @@ class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
    * Tests the Drupal 6 taxonomy term to Drupal 8 migration.
    */
   public function testTaxonomyTerms() {
-    $expected_results = array(
-      '1' => array(
+    $expected_results = [
+      '1' => [
         'source_vid' => 1,
         'vid' => 'vocabulary_1_i_0_',
         'weight' => 0,
-        'parent' => array(0),
-      ),
-      '2' => array(
+        'parent' => [0],
+      ],
+      '2' => [
         'source_vid' => 2,
         'vid' => 'vocabulary_2_i_1_',
         'weight' => 3,
-        'parent' => array(0),
-      ),
-      '3' => array(
+        'parent' => [0],
+      ],
+      '3' => [
         'source_vid' => 2,
         'vid' => 'vocabulary_2_i_1_',
         'weight' => 4,
-        'parent' => array(2),
-      ),
-      '4' => array(
+        'parent' => [2],
+      ],
+      '4' => [
         'source_vid' => 3,
         'vid' => 'vocabulary_3_i_2_',
         'weight' => 6,
-        'parent' => array(0),
-      ),
-      '5' => array(
+        'parent' => [0],
+      ],
+      '5' => [
         'source_vid' => 3,
         'vid' => 'vocabulary_3_i_2_',
         'weight' => 7,
-        'parent' => array(4),
-      ),
-      '6' => array(
+        'parent' => [4],
+      ],
+      '6' => [
         'source_vid' => 3,
         'vid' => 'vocabulary_3_i_2_',
         'weight' => 8,
-        'parent' => array(4, 5),
-      ),
-    );
+        'parent' => [4, 5],
+      ],
+    ];
     $terms = Term::loadMultiple(array_keys($expected_results));
 
     // Find each term in the tree.
@@ -87,11 +87,11 @@ class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
       $this->assertIdentical("description of term {$tid} of vocabulary {$values['source_vid']}", $term->description->value);
       $this->assertIdentical($values['vid'], $term->vid->target_id);
       $this->assertIdentical((string) $values['weight'], $term->weight->value);
-      if ($values['parent'] === array(0)) {
+      if ($values['parent'] === [0]) {
         $this->assertNull($term->parent->target_id);
       }
       else {
-        $parents = array();
+        $parents = [];
         foreach (\Drupal::entityManager()->getStorage('taxonomy_term')->loadParents($tid) as $parent) {
           $parents[] = (int) $parent->id();
         }
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php
index c2d4ab61a..6c665980b 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php
@@ -15,7 +15,7 @@ class MigrateTaxonomyVocabularyTest extends MigrateDrupal6TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   /**
    * {@inheritdoc}
@@ -32,7 +32,7 @@ class MigrateTaxonomyVocabularyTest extends MigrateDrupal6TestBase {
     for ($i = 0; $i < 3; $i++) {
       $j = $i + 1;
       $vocabulary = Vocabulary::load("vocabulary_{$j}_i_{$i}_");
-      $this->assertIdentical($this->getMigration('d6_taxonomy_vocabulary')->getIdMap()->lookupDestinationID(array($j)), array($vocabulary->id()));
+      $this->assertIdentical($this->getMigration('d6_taxonomy_vocabulary')->getIdMap()->lookupDestinationID([$j]), [$vocabulary->id()]);
       $this->assertIdentical("vocabulary $j (i=$i)", $vocabulary->label());
       $this->assertIdentical("description of vocabulary $j (i=$i)", $vocabulary->getDescription());
       $this->assertIdentical($i, $vocabulary->getHierarchy());
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
index 42f864e48..40f094e6c 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
@@ -34,7 +34,7 @@ class MigrateVocabularyEntityDisplayTest extends MigrateDrupal6TestBase {
     $this->assertIdentical('entity_reference_label', $component['type']);
     $this->assertIdentical(20, $component['weight']);
     // Test the Id map.
-    $this->assertIdentical(array('node', 'article', 'default', 'tags'), $this->getMigration('d6_vocabulary_entity_display')->getIdMap()->lookupDestinationID(array(4, 'article')));
+    $this->assertIdentical(['node', 'article', 'default', 'tags'], $this->getMigration('d6_vocabulary_entity_display')->getIdMap()->lookupDestinationID([4, 'article']));
   }
 
 }
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
index a2e26c71c..32370f25a 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
@@ -34,7 +34,7 @@ class MigrateVocabularyEntityFormDisplayTest extends MigrateDrupal6TestBase {
     $this->assertIdentical('options_select', $component['type']);
     $this->assertIdentical(20, $component['weight']);
     // Test the Id map.
-    $this->assertIdentical(array('node', 'article', 'default', 'tags'), $this->getMigration('d6_vocabulary_entity_form_display')->getIdMap()->lookupDestinationID(array(4, 'article')));
+    $this->assertIdentical(['node', 'article', 'default', 'tags'], $this->getMigration('d6_vocabulary_entity_form_display')->getIdMap()->lookupDestinationID([4, 'article']));
 
     // Test the term widget tags setting.
     $entity_form_display = EntityFormDisplay::load('node.story.default');
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
index 2534c3e30..45db4a817 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
@@ -48,7 +48,7 @@ class MigrateVocabularyFieldInstanceTest extends MigrateDrupal6TestBase {
     $this->assertIdentical(['tags'], $settings['handler_settings']['target_bundles'], 'The target_bundles handler setting is correct.');
     $this->assertIdentical(TRUE, $settings['handler_settings']['auto_create'], 'The "auto_create" setting is correct.');
 
-    $this->assertIdentical(array('node', 'article', 'tags'), $this->getMigration('d6_vocabulary_field_instance')->getIdMap()->lookupDestinationID(array(4, 'article')));
+    $this->assertIdentical(['node', 'article', 'tags'], $this->getMigration('d6_vocabulary_field_instance')->getIdMap()->lookupDestinationID([4, 'article']));
 
     // Test the the field vocabulary_1_i_0_
     $field_id = 'node.story.vocabulary_1_i_0_';
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldTest.php
index eb0c48040..6c3631bfe 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldTest.php
@@ -39,7 +39,7 @@ class MigrateVocabularyFieldTest extends MigrateDrupal6TestBase {
     $this->assertIdentical('taxonomy_term', $settings['target_type'], "Target type is correct.");
     $this->assertIdentical(1, $field_storage->getCardinality(), "Field cardinality in 1.");
 
-    $this->assertIdentical(array('node', 'tags'), $this->getMigration('d6_vocabulary_field')->getIdMap()->lookupDestinationID(array(4)), "Test IdMap");
+    $this->assertIdentical(['node', 'tags'], $this->getMigration('d6_vocabulary_field')->getIdMap()->lookupDestinationID([4]), "Test IdMap");
   }
 
 }
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
index d57e3341b..0d985e242 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
@@ -14,7 +14,7 @@ use Drupal\node\NodeInterface;
  */
 class MigrateNodeTaxonomyTest extends MigrateDrupal7TestBase {
 
-  public static $modules = array(
+  public static $modules = [
     'datetime',
     'field',
     'filter',
@@ -24,7 +24,7 @@ class MigrateNodeTaxonomyTest extends MigrateDrupal7TestBase {
     'taxonomy',
     'telephone',
     'text',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -40,21 +40,21 @@ class MigrateNodeTaxonomyTest extends MigrateDrupal7TestBase {
 
     $this->executeMigration('d7_node_type');
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'type' => 'entity_reference',
       'field_name' => 'field_tags',
       'entity_type' => 'node',
-      'settings' => array(
+      'settings' => [
         'target_type' => 'taxonomy_term',
-      ),
+      ],
       'cardinality' => FieldStorageConfigInterface::CARDINALITY_UNLIMITED,
-    ))->save();
+    ])->save();
 
-    FieldConfig::create(array(
+    FieldConfig::create([
       'entity_type' => 'node',
       'field_name' => 'field_tags',
       'bundle' => 'article',
-    ))->save();
+    ])->save();
 
     $this->executeMigrations([
       'd7_taxonomy_vocabulary',
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
index 3f29fbf77..7f2ceef8a 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
@@ -16,7 +16,7 @@ class MigrateTaxonomyVocabularyTest extends MigrateDrupal7TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php b/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php
index 1e2b23230..0d70d840d 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php
@@ -18,14 +18,14 @@ class TermKernelTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array( 'filter', 'taxonomy', 'text', 'user' );
+  public static $modules = [ 'filter', 'taxonomy', 'text', 'user' ];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('filter'));
+    $this->installConfig(['filter']);
     $this->installEntitySchema('taxonomy_term');
   }
 
@@ -38,11 +38,11 @@ class TermKernelTest extends KernelTestBase {
     $valid_term = $this->createTerm($vocabulary);
     // Delete a valid term.
     $valid_term->delete();
-    $terms = entity_load_multiple_by_properties('taxonomy_term', array('vid' => $vocabulary->id()));
+    $terms = entity_load_multiple_by_properties('taxonomy_term', ['vid' => $vocabulary->id()]);
     $this->assertTrue(empty($terms), 'Vocabulary is empty after deletion');
 
     // Delete an invalid term. Should not throw any notices.
-    entity_delete_multiple('taxonomy_term', array(42));
+    entity_delete_multiple('taxonomy_term', [42]);
   }
 
   /**
@@ -53,18 +53,18 @@ class TermKernelTest extends KernelTestBase {
     $parent_term1 = $this->createTerm($vocabulary);
     $parent_term2 = $this->createTerm($vocabulary);
     $child_term = $this->createTerm($vocabulary);
-    $child_term->parent = array($parent_term1->id(), $parent_term2->id());
+    $child_term->parent = [$parent_term1->id(), $parent_term2->id()];
     $child_term->save();
     $child_term_id = $child_term->id();
 
     $parent_term1->delete();
     $term_storage = $this->container->get('entity.manager')->getStorage('taxonomy_term');
-    $term_storage->resetCache(array($child_term_id));
+    $term_storage->resetCache([$child_term_id]);
     $child_term = Term::load($child_term_id);
     $this->assertTrue(!empty($child_term), 'Child term is not deleted if only one of its parents is removed.');
 
     $parent_term2->delete();
-    $term_storage->resetCache(array($child_term_id));
+    $term_storage->resetCache([$child_term_id]);
     $child_term = Term::load($child_term_id);
     $this->assertTrue(empty($child_term), 'Child term is deleted if all of its parents are removed.');
   }
@@ -75,7 +75,7 @@ class TermKernelTest extends KernelTestBase {
   public function testTaxonomyVocabularyTree() {
     // Create a new vocabulary with 6 terms.
     $vocabulary = $this->createVocabulary();
-    $term = array();
+    $term = [];
     for ($i = 0; $i < 6; $i++) {
       $term[$i] = $this->createTerm($vocabulary);
     }
@@ -90,13 +90,13 @@ class TermKernelTest extends KernelTestBase {
     $term[1]->save();
 
     // $term[2] is a child of 1 and 5.
-    $term[2]->parent = array($term[1]->id(), $term[5]->id());
+    $term[2]->parent = [$term[1]->id(), $term[5]->id()];
     $term[2]->save();
     // $term[3] is a child of 2.
-    $term[3]->parent = array($term[2]->id());
+    $term[3]->parent = [$term[2]->id()];
     $term[3]->save();
     // $term[5] is a child of 4.
-    $term[5]->parent = array($term[4]->id());
+    $term[5]->parent = [$term[4]->id()];
     $term[5]->save();
 
     /**
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php
index 3d9cfb777..437a305f6 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php
@@ -16,7 +16,7 @@ class TermValidationTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   /**
    * {@inheritdoc}
@@ -30,14 +30,14 @@ class TermValidationTest extends EntityKernelTestBase {
    * Tests the term validation constraints.
    */
   public function testValidation() {
-    $this->entityManager->getStorage('taxonomy_vocabulary')->create(array(
+    $this->entityManager->getStorage('taxonomy_vocabulary')->create([
       'vid' => 'tags',
       'name' => 'Tags',
-    ))->save();
-    $term = $this->entityManager->getStorage('taxonomy_term')->create(array(
+    ])->save();
+    $term = $this->entityManager->getStorage('taxonomy_term')->create([
       'name' => 'test',
       'vid' => 'tags',
-    ));
+    ]);
     $violations = $term->validate();
     $this->assertEqual(count($violations), 0, 'No violations when validating a default term.');
 
@@ -46,7 +46,7 @@ class TermValidationTest extends EntityKernelTestBase {
     $this->assertEqual(count($violations), 1, 'Violation found when name is too long.');
     $this->assertEqual($violations[0]->getPropertyPath(), 'name.0.value');
     $field_label = $term->get('name')->getFieldDefinition()->getLabel();
-    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => $field_label, '@max' => 255)));
+    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', ['%name' => $field_label, '@max' => 255]));
 
     $term->set('name', NULL);
     $violations = $term->validate();
@@ -58,7 +58,7 @@ class TermValidationTest extends EntityKernelTestBase {
     $term->set('parent', 9999);
     $violations = $term->validate();
     $this->assertEqual(count($violations), 1, 'Violation found when term parent is invalid.');
-    $this->assertEqual($violations[0]->getMessage(), format_string('The referenced entity (%type: %id) does not exist.', array('%type' => 'taxonomy_term', '%id' => 9999)));
+    $this->assertEqual($violations[0]->getMessage(), format_string('The referenced entity (%type: %id) does not exist.', ['%type' => 'taxonomy_term', '%id' => 9999]));
 
     $term->set('parent', 0);
     $violations = $term->validate();
diff --git a/web/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php b/web/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
index dcd496713..a2df09934 100644
--- a/web/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
+++ b/web/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
 class TaxonomyLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array('taxonomy' => 'core/modules/taxonomy');
+    $this->directoryList = ['taxonomy' => 'core/modules/taxonomy'];
     parent::setUp();
   }
 
@@ -21,10 +21,10 @@ class TaxonomyLocalTasksTest extends LocalTaskIntegrationTestBase {
    *
    * @dataProvider getTaxonomyPageRoutes
    */
-  public function testTaxonomyPageLocalTasks($route, $subtask = array()) {
-    $tasks = array(
-      0 => array('entity.taxonomy_term.canonical', 'entity.taxonomy_term.edit_form'),
-    );
+  public function testTaxonomyPageLocalTasks($route, $subtask = []) {
+    $tasks = [
+      0 => ['entity.taxonomy_term.canonical', 'entity.taxonomy_term.edit_form'],
+    ];
     if ($subtask) $tasks[] = $subtask;
     $this->assertLocalTasks($route, $tasks);
   }
@@ -33,10 +33,10 @@ class TaxonomyLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function getTaxonomyPageRoutes() {
-    return array(
-      array('entity.taxonomy_term.canonical'),
-      array('entity.taxonomy_term.edit_form'),
-    );
+    return [
+      ['entity.taxonomy_term.canonical'],
+      ['entity.taxonomy_term.edit_form'],
+    ];
   }
 
 }
diff --git a/web/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php b/web/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php
index f77b751e4..afdf54146 100644
--- a/web/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php
+++ b/web/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php
@@ -24,20 +24,20 @@ class TelephoneLinkFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'title' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $elements['title'] = array(
+    $elements['title'] = [
       '#type' => 'textfield',
       '#title' => t('Title to replace basic numeric telephone number display'),
       '#default_value' => $this->getSetting('title'),
-    );
+    ];
 
     return $elements;
   }
@@ -46,11 +46,11 @@ class TelephoneLinkFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
     $settings = $this->getSettings();
 
     if (!empty($settings['title'])) {
-      $summary[] = t('Link using text: @title', array('@title' => $settings['title']));
+      $summary[] = t('Link using text: @title', ['@title' => $settings['title']]);
     }
     else {
       $summary[] = t('Link using provided telephone number.');
@@ -63,23 +63,23 @@ class TelephoneLinkFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $element = array();
+    $element = [];
     $title_setting = $this->getSetting('title');
 
     foreach ($items as $delta => $item) {
       // Render each element as link.
-      $element[$delta] = array(
+      $element[$delta] = [
         '#type' => 'link',
         // Use custom title if available, otherwise use the telephone number
         // itself as title.
         '#title' => $title_setting ?: $item->value,
         // Prepend 'tel:' to the telephone number.
         '#url' => Url::fromUri('tel:' . rawurlencode(preg_replace('/\s+/', '', $item->value))),
-        '#options' => array('external' => TRUE),
-      );
+        '#options' => ['external' => TRUE],
+      ];
 
       if (!empty($item->_attributes)) {
-        $element[$delta]['#options'] += array('attributes' => array());
+        $element[$delta]['#options'] += ['attributes' => []];
         $element[$delta]['#options']['attributes'] += $item->_attributes;
         // Unset field item attributes since they have been included in the
         // formatter output and should not be rendered in the field template.
diff --git a/web/core/modules/telephone/src/Plugin/Field/FieldType/TelephoneItem.php b/web/core/modules/telephone/src/Plugin/Field/FieldType/TelephoneItem.php
index 20950e5ff..f2aa1ccdd 100644
--- a/web/core/modules/telephone/src/Plugin/Field/FieldType/TelephoneItem.php
+++ b/web/core/modules/telephone/src/Plugin/Field/FieldType/TelephoneItem.php
@@ -25,14 +25,14 @@ class TelephoneItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
           'length' => 256,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -62,14 +62,14 @@ class TelephoneItem extends FieldItemBase {
     $constraints = parent::getConstraints();
 
     $max_length = 256;
-    $constraints[] = $constraint_manager->create('ComplexData', array(
-      'value' => array(
-        'Length' => array(
+    $constraints[] = $constraint_manager->create('ComplexData', [
+      'value' => [
+        'Length' => [
           'max' => $max_length,
-          'maxMessage' => t('%name: the telephone number may not be longer than @max characters.', array('%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length)),
-        )
-      ),
-    ));
+          'maxMessage' => t('%name: the telephone number may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length]),
+        ]
+      ],
+    ]);
 
     return $constraints;
   }
diff --git a/web/core/modules/telephone/src/Plugin/Field/FieldWidget/TelephoneDefaultWidget.php b/web/core/modules/telephone/src/Plugin/Field/FieldWidget/TelephoneDefaultWidget.php
index f585067d2..1ea1837de 100644
--- a/web/core/modules/telephone/src/Plugin/Field/FieldWidget/TelephoneDefaultWidget.php
+++ b/web/core/modules/telephone/src/Plugin/Field/FieldWidget/TelephoneDefaultWidget.php
@@ -23,21 +23,21 @@ class TelephoneDefaultWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'placeholder' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['placeholder'] = array(
+    $element['placeholder'] = [
       '#type' => 'textfield',
       '#title' => t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
       '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
-    );
+    ];
     return $element;
   }
 
@@ -45,11 +45,11 @@ class TelephoneDefaultWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
+    $summary = [];
 
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', array('@placeholder' => $placeholder));
+      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
     else {
       $summary[] = t('No placeholder');
@@ -62,11 +62,11 @@ class TelephoneDefaultWidget extends WidgetBase {
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element['value'] = $element + array(
+    $element['value'] = $element + [
       '#type' => 'tel',
       '#default_value' => isset($items[$delta]->value) ? $items[$delta]->value : NULL,
       '#placeholder' => $this->getSetting('placeholder'),
-    );
+    ];
     return $element;
   }
 
diff --git a/web/core/modules/telephone/telephone.module b/web/core/modules/telephone/telephone.module
index e088958aa..df2acc251 100644
--- a/web/core/modules/telephone/telephone.module
+++ b/web/core/modules/telephone/telephone.module
@@ -15,11 +15,11 @@ function telephone_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.telephone':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Telephone module allows you to create fields that contain telephone numbers. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":telephone_documentation">online documentation for the Telephone module</a>.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':telephone_documentation' => 'https://www.drupal.org/documentation/modules/telephone')) . '</p>';
+      $output .= '<p>' . t('The Telephone module allows you to create fields that contain telephone numbers. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":telephone_documentation">online documentation for the Telephone module</a>.', [':field' => \Drupal::url('help.page', ['name' => 'field']), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#', ':telephone_documentation' => 'https://www.drupal.org/documentation/modules/telephone']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing and displaying telephone fields') . '</dt>';
-      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the telephone field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('The <em>settings</em> and the <em>display</em> of the telephone field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', [':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Displaying telephone numbers as links') . '</dt>';
       $output .= '<dd>' . t('Telephone numbers can be displayed as links with the scheme name <em>tel:</em> by choosing the <em>Telephone</em> display format on the <em>Manage display</em> page. Any spaces will be stripped out of the link text. This semantic markup improves the user experience on mobile and assistive technology devices.') . '</dd>';
       $output .= '</dl>';
diff --git a/web/core/modules/telephone/src/Tests/TelephoneFieldTest.php b/web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
similarity index 77%
rename from web/core/modules/telephone/src/Tests/TelephoneFieldTest.php
rename to web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
index f7452b0bf..18bedf072 100644
--- a/web/core/modules/telephone/src/Tests/TelephoneFieldTest.php
+++ b/web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\telephone\Tests;
+namespace Drupal\Tests\telephone\Functional;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
@@ -11,18 +11,18 @@ use Drupal\field\Entity\FieldStorageConfig;
  *
  * @group telephone
  */
-class TelephoneFieldTest extends WebTestBase {
+class TelephoneFieldTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'field',
     'node',
     'telephone'
-  );
+  ];
 
   /**
    * A user with permission to create articles.
@@ -34,8 +34,8 @@ class TelephoneFieldTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'article'));
-    $this->webUser = $this->drupalCreateUser(array('create article content', 'edit own article content'));
+    $this->drupalCreateContentType(['type' => 'article']);
+    $this->webUser = $this->drupalCreateUser(['create article content', 'edit own article content']);
     $this->drupalLogin($this->webUser);
   }
 
@@ -44,14 +44,14 @@ class TelephoneFieldTest extends WebTestBase {
   /**
    * Helper function for testTelephoneField().
    */
-  function testTelephoneField() {
+  public function testTelephoneField() {
 
     // Add the telephone field to the article content type.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_telephone',
       'entity_type' => 'node',
       'type' => 'telephone',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'field_name' => 'field_telephone',
       'label' => 'Telephone Number',
@@ -60,19 +60,19 @@ class TelephoneFieldTest extends WebTestBase {
     ])->save();
 
     entity_get_form_display('node', 'article', 'default')
-      ->setComponent('field_telephone', array(
+      ->setComponent('field_telephone', [
         'type' => 'telephone_default',
-        'settings' => array(
+        'settings' => [
           'placeholder' => '123-456-7890',
-        ),
-      ))
+        ],
+      ])
       ->save();
 
     entity_get_display('node', 'article', 'default')
-      ->setComponent('field_telephone', array(
+      ->setComponent('field_telephone', [
         'type' => 'telephone_link',
         'weight' => 1,
-      ))
+      ])
       ->save();
 
     // Display creation form.
@@ -81,19 +81,19 @@ class TelephoneFieldTest extends WebTestBase {
     $this->assertRaw('placeholder="123-456-7890"');
 
     // Test basic entry of telephone field.
-    $edit = array(
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
       'field_telephone[0][value]' => "123456789",
-    );
+    ];
 
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertRaw('<a href="tel:123456789">', 'A telephone link is provided on the article node page.');
 
     // Add number with a space in it. Need to ensure it is stripped on output.
-    $edit = array(
+    $edit = [
       'title[0][value]' => $this->randomMachineName(),
       'field_telephone[0][value]' => "1234 56789",
-    );
+    ];
 
     $this->drupalPostForm('node/add/article', $edit, t('Save'));
     $this->assertRaw('<a href="tel:123456789">', 'Telephone link is output with whitespace removed.');
diff --git a/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php b/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
index 7f94ba3b1..72269409e 100644
--- a/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
+++ b/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
@@ -21,17 +21,17 @@ class TelephoneItemTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('telephone');
+  public static $modules = ['telephone'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create a telephone field storage and field for validation.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_test',
       'entity_type' => 'entity_test',
       'type' => 'telephone',
-    ))->save();
+    ])->save();
     FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'field_test',
diff --git a/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php b/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php
index 0a7811418..e74671699 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php
@@ -24,17 +24,17 @@ class TextDefaultFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     // The ProcessedText element already handles cache context & tag bubbling.
     // @see \Drupal\filter\Element\ProcessedText::preRenderText()
     foreach ($items as $delta => $item) {
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#type' => 'processed_text',
         '#text' => $item->value,
         '#format' => $item->format,
         '#langcode' => $item->getLangcode(),
-      );
+      ];
     }
 
     return $elements;
diff --git a/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php b/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
index 8d69571a5..65852382b 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
@@ -33,24 +33,24 @@ class TextTrimmedFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'trim_length' => '600',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
-    $element['trim_length'] = array(
+    $element['trim_length'] = [
       '#title' => t('Trimmed limit'),
       '#type' => 'number',
       '#field_suffix' => t('characters'),
       '#default_value' => $this->getSetting('trim_length'),
-      '#description' => t('If the summary is not set, the trimmed %label field will end at the last full sentence before this character limit.', array('%label' => $this->fieldDefinition->getLabel())),
+      '#description' => t('If the summary is not set, the trimmed %label field will end at the last full sentence before this character limit.', ['%label' => $this->fieldDefinition->getLabel()]),
       '#min' => 1,
       '#required' => TRUE,
-    );
+    ];
     return $element;
   }
 
@@ -58,8 +58,8 @@ class TextTrimmedFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = array();
-    $summary[] = t('Trimmed limit: @trim_length characters', array('@trim_length' => $this->getSetting('trim_length')));
+    $summary = [];
+    $summary[] = t('Trimmed limit: @trim_length characters', ['@trim_length' => $this->getSetting('trim_length')]);
     return $summary;
   }
 
@@ -67,7 +67,7 @@ class TextTrimmedFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     $render_as_summary = function (&$element) {
       // Make sure any default #pre_render callbacks are set on the element,
@@ -82,12 +82,12 @@ class TextTrimmedFormatter extends FormatterBase {
     // The ProcessedText element already handles cache context & tag bubbling.
     // @see \Drupal\filter\Element\ProcessedText::preRenderText()
     foreach ($items as $delta => $item) {
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#type' => 'processed_text',
         '#text' => NULL,
         '#format' => $item->format,
         '#langcode' => $item->getLangcode(),
-      );
+      ];
 
       if ($this->getPluginId() == 'text_summary_or_trimmed' && !empty($item->summary)) {
         $elements[$delta]['#text'] = $item->summary;
diff --git a/web/core/modules/text/src/Plugin/Field/FieldType/TextItem.php b/web/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
index ed896ad58..447a0b180 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
@@ -23,30 +23,30 @@ class TextItem extends TextItemBase {
    * {@inheritdoc}
    */
   public static function defaultStorageSettings() {
-    return array(
+    return [
       'max_length' => 255,
-    ) + parent::defaultStorageSettings();
+    ] + parent::defaultStorageSettings();
   }
 
   /**
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
           'length' => $field_definition->getSetting('max_length'),
-        ),
-        'format' => array(
+        ],
+        'format' => [
           'type' => 'varchar',
           'length' => 255,
-        ),
-      ),
-      'indexes' => array(
-        'format' => array('format'),
-      ),
-    );
+        ],
+      ],
+      'indexes' => [
+        'format' => ['format'],
+      ],
+    ];
   }
 
   /**
@@ -57,14 +57,14 @@ class TextItem extends TextItemBase {
     $constraints = parent::getConstraints();
 
     if ($max_length = $this->getSetting('max_length')) {
-      $constraints[] = $constraint_manager->create('ComplexData', array(
-        'value' => array(
-          'Length' => array(
+      $constraints[] = $constraint_manager->create('ComplexData', [
+        'value' => [
+          'Length' => [
             'max' => $max_length,
-            'maxMessage' => t('%name: the text may not be longer than @max characters.', array('%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length)),
-          )
-        ),
-      ));
+            'maxMessage' => t('%name: the text may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length]),
+          ]
+        ],
+      ]);
     }
 
     return $constraints;
@@ -74,9 +74,9 @@ class TextItem extends TextItemBase {
    * {@inheritdoc}
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $element = array();
+    $element = [];
 
-    $element['max_length'] = array(
+    $element['max_length'] = [
       '#type' => 'number',
       '#title' => t('Maximum length'),
       '#default_value' => $this->getSetting('max_length'),
@@ -84,7 +84,7 @@ class TextItem extends TextItemBase {
       '#description' => t('The maximum length of the field in characters.'),
       '#min' => 1,
       '#disabled' => $has_data,
-    );
+    ];
     $element += parent::storageSettingsForm($form, $form_state, $has_data);
 
     return $element;
diff --git a/web/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php b/web/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
index 83cea4ff5..6dd433929 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
@@ -39,7 +39,7 @@ abstract class TextItemBase extends FieldItemBase {
    */
   public function applyDefaultValue($notify = TRUE) {
     // @todo: Add in the filter default format here.
-    $this->setValue(array('format' => NULL), $notify);
+    $this->setValue(['format' => NULL], $notify);
     return $this;
   }
 
@@ -82,11 +82,11 @@ abstract class TextItemBase extends FieldItemBase {
       $value = substr($random->sentences(mt_rand(1, $settings['max_length'] / 3), FALSE), 0, $settings['max_length']);
     }
 
-    $values = array(
+    $values = [
       'value' => $value,
       'summary' => $value,
       'format' => filter_fallback_format(),
-    );
+    ];
     return $values;
   }
 
diff --git a/web/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php b/web/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php
index cf1f61634..15e4eb6a8 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php
@@ -22,21 +22,21 @@ class TextLongItem extends TextItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'text',
           'size' => 'big',
-        ),
-        'format' => array(
+        ],
+        'format' => [
           'type' => 'varchar_ascii',
           'length' => 255,
-        ),
-      ),
-      'indexes' => array(
-        'format' => array('format'),
-      ),
-    );
+        ],
+      ],
+      'indexes' => [
+        'format' => ['format'],
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php b/web/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
index d42e3a783..6af6d0431 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
@@ -24,9 +24,9 @@ class TextWithSummaryItem extends TextItemBase {
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
-    return array(
+    return [
       'display_summary' => 0,
-    ) + parent::defaultFieldSettings();
+    ] + parent::defaultFieldSettings();
   }
 
   /**
@@ -52,25 +52,25 @@ class TextWithSummaryItem extends TextItemBase {
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
-      'columns' => array(
-        'value' => array(
+    return [
+      'columns' => [
+        'value' => [
           'type' => 'text',
           'size' => 'big',
-        ),
-        'summary' => array(
+        ],
+        'summary' => [
           'type' => 'text',
           'size' => 'big',
-        ),
-        'format' => array(
+        ],
+        'format' => [
           'type' => 'varchar_ascii',
           'length' => 255,
-        ),
-      ),
-      'indexes' => array(
-        'format' => array('format'),
-      ),
-    );
+        ],
+      ],
+      'indexes' => [
+        'format' => ['format'],
+      ],
+    ];
   }
 
   /**
@@ -85,15 +85,15 @@ class TextWithSummaryItem extends TextItemBase {
    * {@inheritdoc}
    */
   public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
-    $element = array();
+    $element = [];
     $settings = $this->getSettings();
 
-    $element['display_summary'] = array(
+    $element['display_summary'] = [
       '#type' => 'checkbox',
       '#title' => t('Summary input'),
       '#default_value' => $settings['display_summary'],
       '#description' => t('This allows authors to input an explicit summary, to be displayed instead of the automatically trimmed text when using the "Summary or trimmed" display type.'),
-    );
+    ];
 
     return $element;
   }
diff --git a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
index 25bb62719..69a660e4d 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
@@ -20,6 +20,15 @@ use Symfony\Component\Validator\ConstraintViolationInterface;
  */
 class TextareaWidget extends StringTextareaWidget {
 
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    $element = parent::settingsForm($form, $form_state);
+    $element['rows']['#description'] = $this->t('Text editors (like CKEditor) may override this setting.');
+    return $element;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -37,7 +46,7 @@ class TextareaWidget extends StringTextareaWidget {
    * {@inheritdoc}
    */
   public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
-    if ($violation->arrayPropertyPath == array('format') && isset($element['format']['#access']) && !$element['format']['#access']) {
+    if ($violation->arrayPropertyPath == ['format'] && isset($element['format']['#access']) && !$element['format']['#access']) {
       // Ignore validation errors for formats if formats may not be changed,
       // i.e. when existing formats become invalid. See filter_process_format().
       return FALSE;
diff --git a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php
index 0a72e3e5c..f41e5b1e6 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php
@@ -23,11 +23,11 @@ class TextareaWithSummaryWidget extends TextareaWidget {
    * {@inheritdoc}
    */
   public static function defaultSettings() {
-    return array(
+    return [
       'rows' => '9',
       'summary_rows' => '3',
       'placeholder' => '',
-    ) + parent::defaultSettings();
+    ] + parent::defaultSettings();
   }
 
   /**
@@ -35,13 +35,14 @@ class TextareaWithSummaryWidget extends TextareaWidget {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element = parent::settingsForm($form, $form_state);
-    $element['summary_rows'] = array(
+    $element['summary_rows'] = [
       '#type' => 'number',
       '#title' => t('Summary rows'),
       '#default_value' => $this->getSetting('summary_rows'),
+      '#description' => $element['rows']['#description'],
       '#required' => TRUE,
       '#min' => 1,
-    );
+    ];
     return $element;
   }
 
@@ -51,7 +52,7 @@ class TextareaWithSummaryWidget extends TextareaWidget {
   public function settingsSummary() {
     $summary = parent::settingsSummary();
 
-    $summary[] = t('Number of summary rows: @rows', array('@rows' => $this->getSetting('summary_rows')));
+    $summary[] = t('Number of summary rows: @rows', ['@rows' => $this->getSetting('summary_rows')]);
 
     return $summary;
   }
@@ -59,24 +60,24 @@ class TextareaWithSummaryWidget extends TextareaWidget {
   /**
    * {@inheritdoc}
    */
-  function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
+  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $element = parent::formElement($items, $delta, $element, $form, $form_state);
 
     $display_summary = $items[$delta]->summary || $this->getFieldSetting('display_summary');
-    $element['summary'] = array(
+    $element['summary'] = [
       '#type' => $display_summary ? 'textarea' : 'value',
       '#default_value' => $items[$delta]->summary,
       '#title' => t('Summary'),
       '#rows' => $this->getSetting('summary_rows'),
       '#description' => t('Leave blank to use trimmed value of full text as the summary.'),
-      '#attached' => array(
-        'library' => array('text/drupal.text'),
-      ),
-      '#attributes' => array('class' => array('js-text-summary', 'text-summary')),
+      '#attached' => [
+        'library' => ['text/drupal.text'],
+      ],
+      '#attributes' => ['class' => ['js-text-summary', 'text-summary']],
       '#prefix' => '<div class="js-text-summary-wrapper text-summary-wrapper">',
       '#suffix' => '</div>',
       '#weight' => -10,
-    );
+    ];
 
     return $element;
   }
diff --git a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
index 5a3ed05ba..af8493de0 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
@@ -37,7 +37,7 @@ class TextfieldWidget extends StringTextfieldWidget {
    * {@inheritdoc}
    */
   public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
-    if ($violation->arrayPropertyPath == array('format') && isset($element['format']['#access']) && !$element['format']['#access']) {
+    if ($violation->arrayPropertyPath == ['format'] && isset($element['format']['#access']) && !$element['format']['#access']) {
       // Ignore validation errors for formats if formats may not be changed,
       // i.e. when existing formats become invalid. See filter_process_format().
       return FALSE;
diff --git a/web/core/modules/text/src/Plugin/migrate/cckfield/TextField.php b/web/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
index 89475ffd2..24dd450d8 100644
--- a/web/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
+++ b/web/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
@@ -87,11 +87,11 @@ class TextField extends CckFieldPluginBase {
       ];
     }
 
-    $process = array(
+    $process = [
       'plugin' => 'iterator',
       'source' => $field_name,
       'process' => $process,
-    );
+    ];
     $migration->setProcessOfProperty($field_name, $process);
   }
 
diff --git a/web/core/modules/text/src/Tests/TextFieldTest.php b/web/core/modules/text/src/Tests/TextFieldTest.php
index 993346a07..d061c00f1 100644
--- a/web/core/modules/text/src/Tests/TextFieldTest.php
+++ b/web/core/modules/text/src/Tests/TextFieldTest.php
@@ -26,7 +26,7 @@ class TextFieldTest extends StringFieldTest {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer filters'));
+    $this->adminUser = $this->drupalCreateUser(['administer filters']);
   }
 
   // Test fields.
@@ -34,18 +34,18 @@ class TextFieldTest extends StringFieldTest {
   /**
    * Test text field validation.
    */
-  function testTextFieldValidation() {
+  public function testTextFieldValidation() {
     // Create a field with settings to validate.
     $max_length = 3;
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'text',
-      'settings' => array(
+      'settings' => [
         'max_length' => $max_length,
-      )
-    ));
+      ]
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -69,14 +69,14 @@ class TextFieldTest extends StringFieldTest {
   /**
    * Test required long text with file upload.
    */
-  function testRequiredLongTextWithFileUpload() {
+  public function testRequiredLongTextWithFileUpload() {
     // Create a text field.
     $text_field_name = 'text_long';
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $text_field_name,
       'entity_type' => 'entity_test',
       'type' => 'text_with_summary',
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -87,11 +87,11 @@ class TextFieldTest extends StringFieldTest {
 
     // Create a file field.
     $file_field_name = 'file_field';
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $file_field_name,
       'entity_type' => 'entity_test',
       'type' => 'file'
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -100,12 +100,12 @@ class TextFieldTest extends StringFieldTest {
     ])->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($text_field_name, array(
+      ->setComponent($text_field_name, [
         'type' => 'text_textarea_with_summary',
-      ))
-      ->setComponent($file_field_name, array(
+      ])
+      ->setComponent($file_field_name, [
         'type' => 'file_generic',
-      ))
+      ])
       ->save();
     entity_get_display('entity_test', 'entity_test', 'full')
       ->setComponent($text_field_name)
@@ -116,9 +116,9 @@ class TextFieldTest extends StringFieldTest {
     $edit['files[file_field_0]'] = drupal_realpath($test_file->uri);
     $this->drupalPostForm('entity_test/add', $edit, 'Upload');
     $this->assertResponse(200);
-    $edit = array(
+    $edit = [
       'text_long[0][value]' => 'Long text'
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, 'Save');
     $this->assertResponse(200);
     $this->drupalGet('entity_test/1');
@@ -128,7 +128,7 @@ class TextFieldTest extends StringFieldTest {
   /**
    * Test widgets.
    */
-  function testTextfieldWidgets() {
+  public function testTextfieldWidgets() {
     $this->_testTextfieldWidgets('text', 'text_textfield');
     $this->_testTextfieldWidgets('text_long', 'text_textarea');
   }
@@ -136,7 +136,7 @@ class TextFieldTest extends StringFieldTest {
   /**
    * Test widgets + 'formatted_text' setting.
    */
-  function testTextfieldWidgetsFormatted() {
+  public function testTextfieldWidgetsFormatted() {
     $this->_testTextfieldWidgetsFormatted('text', 'text_textfield');
     $this->_testTextfieldWidgetsFormatted('text_long', 'text_textarea');
   }
@@ -144,17 +144,17 @@ class TextFieldTest extends StringFieldTest {
   /**
    * Helper function for testTextfieldWidgetsFormatted().
    */
-  function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
+  public function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = $this->container->get('renderer');
 
     // Create a field.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => $field_type
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
@@ -162,9 +162,9 @@ class TextFieldTest extends StringFieldTest {
       'label' => $this->randomMachineName() . '_label',
     ])->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, array(
+      ->setComponent($field_name, [
         'type' => $widget_type,
-      ))
+      ])
       ->save();
     entity_get_display('entity_test', 'entity_test', 'full')
       ->setComponent($field_name)
@@ -174,7 +174,7 @@ class TextFieldTest extends StringFieldTest {
     $this->drupalLogin($this->adminUser);
     foreach (filter_formats() as $format) {
       if (!$format->isFallbackFormat()) {
-        $this->drupalPostForm('admin/config/content/formats/manage/' . $format->id() . '/disable', array(), t('Disable'));
+        $this->drupalPostForm('admin/config/content/formats/manage/' . $format->id() . '/disable', [], t('Disable'));
       }
     }
     $this->drupalLogin($this->webUser);
@@ -187,13 +187,13 @@ class TextFieldTest extends StringFieldTest {
 
     // Submit with data that should be filtered.
     $value = '<em>' . $this->randomMachineName() . '</em>';
-    $edit = array(
+    $edit = [
       "{$field_name}[0][value]" => $value,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
     $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)), 'Entity was created');
+    $this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
 
     // Display the entity.
     $entity = EntityTest::load($id);
@@ -206,10 +206,10 @@ class TextFieldTest extends StringFieldTest {
     // Create a new text format that does not escape HTML, and grant the user
     // access to it.
     $this->drupalLogin($this->adminUser);
-    $edit = array(
+    $edit = [
       'format' => Unicode::strtolower($this->randomMachineName()),
       'name' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
     filter_formats_reset();
     $format = FilterFormat::load($edit['format']);
@@ -217,7 +217,7 @@ class TextFieldTest extends StringFieldTest {
     $permission = $format->getPermissionName();
     $roles = $this->webUser->getRoles();
     $rid = $roles[0];
-    user_role_grant_permissions($rid, array($permission));
+    user_role_grant_permissions($rid, [$permission]);
     $this->drupalLogin($this->webUser);
 
     // Display edition form.
@@ -227,14 +227,14 @@ class TextFieldTest extends StringFieldTest {
     $this->assertFieldByName("{$field_name}[0][format]", NULL, 'Format selector is displayed');
 
     // Edit and change the text format to the new one that was created.
-    $edit = array(
+    $edit = [
       "{$field_name}[0][format]" => $format_id,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->assertText(t('entity_test @id has been updated.', array('@id' => $id)), 'Entity was updated');
+    $this->assertText(t('entity_test @id has been updated.', ['@id' => $id]), 'Entity was updated');
 
     // Display the entity.
-    $this->container->get('entity.manager')->getStorage('entity_test')->resetCache(array($id));
+    $this->container->get('entity.manager')->getStorage('entity_test')->resetCache([$id]);
     $entity = EntityTest::load($id);
     $display = entity_get_display($entity->getEntityTypeId(), $entity->bundle(), 'full');
     $content = $display->build($entity);
diff --git a/web/core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php b/web/core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php
index 4a9d0d6e3..05b37085e 100644
--- a/web/core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php
+++ b/web/core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\text\Kernel\Migrate;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
diff --git a/web/core/modules/text/tests/src/Kernel/TextFormatterTest.php b/web/core/modules/text/tests/src/Kernel/TextFormatterTest.php
index 747a06ffa..c75ac34bc 100644
--- a/web/core/modules/text/tests/src/Kernel/TextFormatterTest.php
+++ b/web/core/modules/text/tests/src/Kernel/TextFormatterTest.php
@@ -33,7 +33,7 @@ class TextFormatterTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('text');
+  public static $modules = ['text'];
 
   /**
    * {@inheritdoc}
@@ -41,23 +41,23 @@ class TextFormatterTest extends EntityKernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    FilterFormat::create(array(
+    FilterFormat::create([
       'format' => 'my_text_format',
       'name' => 'My text format',
-      'filters' => array(
-        'filter_autop' => array(
+      'filters' => [
+        'filter_autop' => [
           'module' => 'filter',
           'status' => TRUE,
-        ),
-      ),
-    ))->save();
+        ],
+      ],
+    ])->save();
 
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'formatted_text',
       'entity_type' => $this->entityType,
       'type' => 'text',
-      'settings' => array(),
-    ))->save();
+      'settings' => [],
+    ])->save();
     FieldConfig::create([
       'entity_type' => $this->entityType,
       'bundle' => $this->bundle,
@@ -70,28 +70,28 @@ class TextFormatterTest extends EntityKernelTestBase {
    * Tests all text field formatters.
    */
   public function testFormatters() {
-    $formatters = array(
+    $formatters = [
       'text_default',
       'text_trimmed',
       'text_summary_or_trimmed',
-    );
+    ];
 
     // Create the entity to be referenced.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('name' => $this->randomMachineName()));
-    $entity->formatted_text = array(
+      ->create(['name' => $this->randomMachineName()]);
+    $entity->formatted_text = [
       'value' => 'Hello, world!',
       'format' => 'my_text_format',
-    );
+    ];
     $entity->save();
 
     foreach ($formatters as $formatter) {
       // Verify the text field formatter's render array.
-      $build = $entity->get('formatted_text')->view(array('type' => $formatter));
+      $build = $entity->get('formatted_text')->view(['type' => $formatter]);
       \Drupal::service('renderer')->renderRoot($build[0]);
       $this->assertEqual($build[0]['#markup'], "<p>Hello, world!</p>\n");
-      $this->assertEqual($build[0]['#cache']['tags'], FilterFormat::load('my_text_format')->getCacheTags(), format_string('The @formatter formatter has the expected cache tags when formatting a formatted text field.', array('@formatter' => $formatter)));
+      $this->assertEqual($build[0]['#cache']['tags'], FilterFormat::load('my_text_format')->getCacheTags(), format_string('The @formatter formatter has the expected cache tags when formatting a formatted text field.', ['@formatter' => $formatter]));
     }
   }
 
diff --git a/web/core/modules/text/tests/src/Kernel/TextSummaryTest.php b/web/core/modules/text/tests/src/Kernel/TextSummaryTest.php
index abc0b68bc..15d454947 100644
--- a/web/core/modules/text/tests/src/Kernel/TextSummaryTest.php
+++ b/web/core/modules/text/tests/src/Kernel/TextSummaryTest.php
@@ -12,12 +12,12 @@ use Drupal\filter\Entity\FilterFormat;
  */
 class TextSummaryTest extends KernelTestBase {
 
-  public static $modules = array('system', 'user', 'filter', 'text');
+  public static $modules = ['system', 'user', 'filter', 'text'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->installConfig(array('text'));
+    $this->installConfig(['text']);
   }
 
   /**
@@ -25,7 +25,7 @@ class TextSummaryTest extends KernelTestBase {
    * subsequent sentences are not. This edge case is documented at
    * https://www.drupal.org/node/180425.
    */
-  function testFirstSentenceQuestion() {
+  public function testFirstSentenceQuestion() {
     $text = 'A question? A sentence. Another sentence.';
     $expected = 'A question? A sentence.';
     $this->assertTextSummary($text, $expected, NULL, 30);
@@ -34,7 +34,7 @@ class TextSummaryTest extends KernelTestBase {
   /**
    * Test summary with long example.
    */
-  function testLongSentence() {
+  public function testLongSentence() {
     $text = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ' . // 125
             'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ' . // 108
             'Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. ' . // 103
@@ -49,26 +49,26 @@ class TextSummaryTest extends KernelTestBase {
   /**
    * Test various summary length edge cases.
    */
-  function testLength() {
-    FilterFormat::create(array(
+  public function testLength() {
+    FilterFormat::create([
       'format' => 'autop',
-      'filters' => array(
-        'filter_autop' => array(
+      'filters' => [
+        'filter_autop' => [
           'status' => 1,
-        ),
-      ),
-    ))->save();
-    FilterFormat::create(array(
+        ],
+      ],
+    ])->save();
+    FilterFormat::create([
       'format' => 'autop_correct',
-      'filters' => array(
-        'filter_autop' => array(
+      'filters' => [
+        'filter_autop' => [
           'status' => 1,
-        ),
-        'filter_htmlcorrector' => array(
+        ],
+        'filter_htmlcorrector' => [
           'status' => 1,
-        ),
-      ),
-    ))->save();
+        ],
+      ],
+    ])->save();
 
     // This string tests a number of edge cases.
     $text = "<p>\nHi\n</p>\n<p>\nfolks\n<br />\n!\n</p>";
@@ -205,12 +205,12 @@ class TextSummaryTest extends KernelTestBase {
   /**
    * Calls text_summary() and asserts that the expected teaser is returned.
    */
-  function assertTextSummary($text, $expected, $format = NULL, $size = NULL) {
+  public function assertTextSummary($text, $expected, $format = NULL, $size = NULL) {
     $summary = text_summary($text, $format, $size);
-    $this->assertIdentical($summary, $expected, format_string('<pre style="white-space: pre-wrap">@actual</pre> is identical to <pre style="white-space: pre-wrap">@expected</pre>', array(
+    $this->assertIdentical($summary, $expected, format_string('<pre style="white-space: pre-wrap">@actual</pre> is identical to <pre style="white-space: pre-wrap">@expected</pre>', [
       '@actual' => $summary,
       '@expected' => $expected,
-    )));
+    ]));
   }
 
 }
diff --git a/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php b/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
index fc02daa7e..a48c191b5 100644
--- a/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
+++ b/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
@@ -21,7 +21,7 @@ class TextWithSummaryItemTest extends FieldKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter');
+  public static $modules = ['filter'];
 
   /**
    * Field storage entity.
@@ -44,11 +44,11 @@ class TextWithSummaryItemTest extends FieldKernelTestBase {
     $this->installEntitySchema('entity_test_rev');
 
     // Create the necessary formats.
-    $this->installConfig(array('filter'));
-    FilterFormat::create(array(
+    $this->installConfig(['filter']);
+    FilterFormat::create([
       'format' => 'no_filters',
-      'filters' => array(),
-    ))->save();
+      'filters' => [],
+    ])->save();
   }
 
   /**
@@ -100,14 +100,14 @@ class TextWithSummaryItemTest extends FieldKernelTestBase {
    */
   protected function createField($entity_type) {
     // Create a field .
-    $this->fieldStorage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => 'summary_field',
       'entity_type' => $entity_type,
       'type' => 'text_with_summary',
-      'settings' => array(
+      'settings' => [
         'max_length' => 10,
-      )
-    ));
+      ]
+    ]);
     $this->fieldStorage->save();
     $this->field = FieldConfig::create([
       'field_storage' => $this->fieldStorage,
diff --git a/web/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php b/web/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php
index 323fbce8c..d7dfcc679 100644
--- a/web/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php
+++ b/web/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php
@@ -71,12 +71,12 @@ class TextFieldTest extends UnitTestCase {
    * @covers ::processCckFieldValues
    */
   public function testProcessBooleanTextImplicitValues() {
-    $info = array(
+    $info = [
       'widget_type' => 'optionwidgets_onoff',
-      'global_settings' => array(
+      'global_settings' => [
         'allowed_values' => "foo\nbar",
-      )
-    );
+      ]
+    ];
     $this->plugin->processCckFieldValues($this->migration, 'field', $info);
 
     $expected = [
@@ -96,12 +96,12 @@ class TextFieldTest extends UnitTestCase {
    * @covers ::processCckFieldValues
    */
   public function testProcessBooleanTextExplicitValues() {
-    $info = array(
+    $info = [
       'widget_type' => 'optionwidgets_onoff',
-      'global_settings' => array(
+      'global_settings' => [
         'allowed_values' => "foo|Foo\nbaz|Baz",
-      )
-    );
+      ]
+    ];
     $this->plugin->processCckFieldValues($this->migration, 'field', $info);
 
     $expected = [
@@ -121,43 +121,43 @@ class TextFieldTest extends UnitTestCase {
    * Data provider for testGetFieldType().
    */
   public function getFieldTypeProvider() {
-    return array(
-      array('string_long', 'text_textfield', array(
+    return [
+      ['string_long', 'text_textfield', [
         'text_processing' => FALSE,
-      )),
-      array('string', 'text_textfield', array(
+      ]],
+      ['string', 'text_textfield', [
         'text_processing' => FALSE,
         'max_length' => 128,
-      )),
-      array('string_long', 'text_textfield', array(
+      ]],
+      ['string_long', 'text_textfield', [
         'text_processing' => FALSE,
         'max_length' => 4096,
-      )),
-      array('text_long', 'text_textfield', array(
+      ]],
+      ['text_long', 'text_textfield', [
         'text_processing' => TRUE,
-      )),
-      array('text', 'text_textfield', array(
+      ]],
+      ['text', 'text_textfield', [
         'text_processing' => TRUE,
         'max_length' => 128,
-      )),
-      array('text_long', 'text_textfield', array(
+      ]],
+      ['text_long', 'text_textfield', [
         'text_processing' => TRUE,
         'max_length' => 4096,
-      )),
-      array('list_string', 'optionwidgets_buttons'),
-      array('list_string', 'optionwidgets_select'),
-      array('boolean', 'optionwidgets_onoff'),
-      array('text_long', 'text_textarea'),
-      array(NULL, 'undefined'),
-    );
+      ]],
+      ['list_string', 'optionwidgets_buttons'],
+      ['list_string', 'optionwidgets_select'],
+      ['boolean', 'optionwidgets_onoff'],
+      ['text_long', 'text_textarea'],
+      [NULL, 'undefined'],
+    ];
   }
 
   /**
    * @covers ::getFieldType
    * @dataProvider getFieldTypeProvider
    */
-  public function testGetFieldType($expected_type, $widget_type, array $settings = array()) {
-    $row = new Row(array('widget_type' => $widget_type), array('widget_type' => array()));
+  public function testGetFieldType($expected_type, $widget_type, array $settings = []) {
+    $row = new Row(['widget_type' => $widget_type], ['widget_type' => []]);
     $row->setSourceProperty('global_settings', $settings);
     $this->assertSame($expected_type, $this->plugin->getFieldType($row));
   }
diff --git a/web/core/modules/text/text.module b/web/core/modules/text/text.module
index 906b4614a..1932e6164 100644
--- a/web/core/modules/text/text.module
+++ b/web/core/modules/text/text.module
@@ -18,11 +18,11 @@ function text_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.text':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Text module allows you to create short and long text fields with optional summaries. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":text_documentation">online documentation for the Text module</a>.', array(':field' => \Drupal::url('help.page', array('name' => 'field')), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#', ':text_documentation' => 'https://www.drupal.org/documentation/modules/text')) . '</p>';
+      $output .= '<p>' . t('The Text module allows you to create short and long text fields with optional summaries. See the <a href=":field">Field module help</a> and the <a href=":field_ui">Field UI help</a> pages for general information on fields and how to create and manage them. For more information, see the <a href=":text_documentation">online documentation for the Text module</a>.', [':field' => \Drupal::url('help.page', ['name' => 'field']), ':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#', ':text_documentation' => 'https://www.drupal.org/documentation/modules/text']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing and displaying text fields') . '</dt>';
-      $output .= '<dd>' . t('The <em>settings</em> and <em>display</em> of the text field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('The <em>settings</em> and <em>display</em> of the text field can be configured separately. See the <a href=":field_ui">Field UI help</a> for more information on how to manage fields and their display.', [':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', ['name' => 'field_ui']) : '#']) . '</dd>';
       $output .= '<dt>' . t('Creating short text fields') . '</dt>';
       $output .= '<dd>' . t('If you choose <em>Text (plain)</em> or <em>Text (formatted)</em> as the field type on the <em>Manage fields</em> page, then a field with a single row is displayed. You can change the maximum text length in the <em>Field settings</em> when you set up the field.') . '</dd>';
       $output .= '<dt>' . t('Creating long text fields') . '</dt>';
@@ -32,7 +32,7 @@ function text_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dt>' . t('Displaying summaries instead of trimmed text') . '</dt>';
       $output .= '<dd>' . t('As an alternative to using a trimmed version of the text, you can enter a separate summary by choosing the <em>Text (formatted, long, with summary)</em> field type on the <em>Manage fields</em> page. Even when <em>Summary input</em> is enabled, and summaries are provided, you can display <em>trimmed</em> text nonetheless by choosing the appropriate format on the <em>Manage display</em> page.') . '</dd>';
       $output .= '<dt>' . t('Using text formats and editors') . '</dt>';
-      $output .= '<dd>' . t('If you choose <em>Text (plain)</em> or <em>Text (plain, long)</em> you restrict the input to <em>Plain text</em> only. If you choose <em>Text (formatted)</em>, <em>Text (formatted, long)</em>, or <em>Text (formatted, long with summary)</em> you allow users to write formatted text. Which options are available to individual users depends on the settings on the <a href=":formats">Text formats and editors page</a>.', array(':formats' => \Drupal::url('filter.admin_overview'))) . '</dd>';
+      $output .= '<dd>' . t('If you choose <em>Text (plain)</em> or <em>Text (plain, long)</em> you restrict the input to <em>Plain text</em> only. If you choose <em>Text (formatted)</em>, <em>Text (formatted, long)</em>, or <em>Text (formatted, long with summary)</em> you allow users to write formatted text. Which options are available to individual users depends on the settings on the <a href=":formats">Text formats and editors page</a>.', [':formats' => \Drupal::url('filter.admin_overview')]) . '</dd>';
       $output .= '</dl>';
       return $output;
   }
@@ -115,13 +115,13 @@ function text_summary($text, $format = NULL, $size = NULL) {
   $reversed = strrev($summary);
 
   // Build an array of arrays of break points grouped by preference.
-  $break_points = array();
+  $break_points = [];
 
   // A paragraph near the end of sliced summary is most preferable.
-  $break_points[] = array('</p>' => 0);
+  $break_points[] = ['</p>' => 0];
 
   // If no complete paragraph then treat line breaks as paragraphs.
-  $line_breaks = array('<br />' => 6, '<br>' => 4);
+  $line_breaks = ['<br />' => 6, '<br>' => 4];
   // Newline only indicates a line break if line break converter
   // filter is present.
   if (isset($format) && $filters->has('filter_autop') && $filters->get('filter_autop')->status) {
@@ -130,7 +130,7 @@ function text_summary($text, $format = NULL, $size = NULL) {
   $break_points[] = $line_breaks;
 
   // If the first paragraph is too long, split at the end of a sentence.
-  $break_points[] = array('. ' => 1, '! ' => 1, '? ' => 1, '。' => 0, '؟ ' => 1);
+  $break_points[] = ['. ' => 1, '! ' => 1, '? ' => 1, '。' => 0, '؟ ' => 1];
 
   // Iterate over the groups of break points until a break point is found.
   foreach ($break_points as $points) {
diff --git a/web/core/modules/toolbar/src/Element/Toolbar.php b/web/core/modules/toolbar/src/Element/Toolbar.php
index 69a53dbd8..d92330b35 100644
--- a/web/core/modules/toolbar/src/Element/Toolbar.php
+++ b/web/core/modules/toolbar/src/Element/Toolbar.php
@@ -18,35 +18,35 @@ class Toolbar extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#pre_render' => array(
-        array($class, 'preRenderToolbar'),
-      ),
+    return [
+      '#pre_render' => [
+        [$class, 'preRenderToolbar'],
+      ],
       '#theme' => 'toolbar',
-      '#attached' => array(
-        'library' => array(
+      '#attached' => [
+        'library' => [
           'toolbar/toolbar',
-        ),
-      ),
+        ],
+      ],
       // Metadata for the toolbar wrapping element.
-      '#attributes' => array(
+      '#attributes' => [
         // The id cannot be simply "toolbar" or it will clash with the
         // simpletest tests listing which produces a checkbox with attribute
         // id="toolbar".
         'id' => 'toolbar-administration',
         'role' => 'group',
         'aria-label' => $this->t('Site administration toolbar'),
-      ),
+      ],
       // Metadata for the administration bar.
-      '#bar' => array(
+      '#bar' => [
         '#heading' => $this->t('Toolbar items'),
-        '#attributes' => array(
+        '#attributes' => [
           'id' => 'toolbar-bar',
           'role' => 'navigation',
           'aria-label' => $this->t('Toolbar items'),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -68,7 +68,7 @@ class Toolbar extends RenderElement {
     // toolbar presentation.
     $breakpoints = static::breakpointManager()->getBreakpointsByGroup('toolbar');
     if (!empty($breakpoints)) {
-      $media_queries = array();
+      $media_queries = [];
       foreach ($breakpoints as $id => $breakpoint) {
         $media_queries[$id] = $breakpoint->getMediaQuery();
       }
@@ -82,7 +82,7 @@ class Toolbar extends RenderElement {
     // Allow for altering of hook_toolbar().
     $module_handler->alter('toolbar', $items);
     // Sort the children.
-    uasort($items, array('\Drupal\Component\Utility\SortArray', 'sortByWeightProperty'));
+    uasort($items, ['\Drupal\Component\Utility\SortArray', 'sortByWeightProperty']);
 
     // Merge in the original toolbar values.
     $element = array_merge($element, $items);
diff --git a/web/core/modules/toolbar/src/Element/ToolbarItem.php b/web/core/modules/toolbar/src/Element/ToolbarItem.php
index e39295f1e..79cbed2d0 100644
--- a/web/core/modules/toolbar/src/Element/ToolbarItem.php
+++ b/web/core/modules/toolbar/src/Element/ToolbarItem.php
@@ -19,16 +19,16 @@ class ToolbarItem extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#pre_render' => array(
-        array($class, 'preRenderToolbarItem'),
-      ),
-      'tab' => array(
+    return [
+      '#pre_render' => [
+        [$class, 'preRenderToolbarItem'],
+      ],
+      'tab' => [
         '#type' => 'link',
         '#title' => NULL,
         '#url' => Url::fromRoute('<front>'),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -47,33 +47,33 @@ class ToolbarItem extends RenderElement {
     $id = $element['#id'];
 
     // Provide attributes for a toolbar item.
-    $attributes = array(
+    $attributes = [
       'id' => $id,
-    );
+    ];
 
     // If tray content is present, markup the tray and its associated trigger.
     if (!empty($element['tray'])) {
       // Provide attributes necessary for trays.
-      $attributes += array(
+      $attributes += [
         'data-toolbar-tray' => $id . '-tray',
         'aria-owns' => $id . '-tray',
         'role' => 'button',
         'aria-pressed' => 'false',
-      );
+      ];
 
       // Merge in module-provided attributes.
-      $element['tab'] += array('#attributes' => array());
+      $element['tab'] += ['#attributes' => []];
       $element['tab']['#attributes'] += $attributes;
       $element['tab']['#attributes']['class'][] = 'trigger';
 
       // Provide attributes for the tray theme wrapper.
-      $attributes = array(
+      $attributes = [
         'id' => $id . '-tray',
         'data-toolbar-tray' => $id . '-tray',
-      );
+      ];
       // Merge in module-provided attributes.
       if (!isset($element['tray']['#wrapper_attributes'])) {
-        $element['tray']['#wrapper_attributes'] = array();
+        $element['tray']['#wrapper_attributes'] = [];
       }
       $element['tray']['#wrapper_attributes'] += $attributes;
       $element['tray']['#wrapper_attributes']['class'][] = 'toolbar-tray';
diff --git a/web/core/modules/toolbar/src/Menu/ToolbarMenuLinkTree.php b/web/core/modules/toolbar/src/Menu/ToolbarMenuLinkTree.php
index 873ebec7a..24ef4e772 100644
--- a/web/core/modules/toolbar/src/Menu/ToolbarMenuLinkTree.php
+++ b/web/core/modules/toolbar/src/Menu/ToolbarMenuLinkTree.php
@@ -15,7 +15,7 @@ class ToolbarMenuLinkTree extends MenuLinkTree {
   public function build(array $tree, $level = 0) {
     if ($level == 0) {
       if (!$tree) {
-        return array();
+        return [];
       }
       $build = parent::build($tree, $level);
 
diff --git a/web/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php b/web/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
index 56b9d69a1..dd4b5c43c 100644
--- a/web/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
+++ b/web/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
@@ -53,12 +53,12 @@ class ToolbarAdminMenuTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'block', 'menu_ui', 'user', 'taxonomy', 'toolbar', 'language', 'test_page_test', 'locale');
+  public static $modules = ['node', 'block', 'menu_ui', 'user', 'taxonomy', 'toolbar', 'language', 'test_page_test', 'locale'];
 
   protected function setUp() {
     parent::setUp();
 
-    $perms = array(
+    $perms = [
       'access toolbar',
       'access administration pages',
       'administer site configuration',
@@ -75,7 +75,7 @@ class ToolbarAdminMenuTest extends WebTestBase {
       'administer taxonomy',
       'administer languages',
       'translate interface',
-    );
+    ];
 
     // Create an administrative user and log it in.
     $this->adminUser = $this->drupalCreateUser($perms);
@@ -97,13 +97,13 @@ class ToolbarAdminMenuTest extends WebTestBase {
    * Tests the toolbar_modules_installed() and toolbar_modules_uninstalled() hook
    * implementations.
    */
-  function testModuleStatusChangeSubtreesHashCacheClear() {
+  public function testModuleStatusChangeSubtreesHashCacheClear() {
     // Uninstall a module.
-    $edit = array();
+    $edit = [];
     $edit['uninstall[taxonomy]'] = TRUE;
     $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
     // Confirm the uninstall form.
-    $this->drupalPostForm(NULL, array(), t('Uninstall'));
+    $this->drupalPostForm(NULL, [], t('Uninstall'));
     $this->rebuildContainer();
 
     // Assert that the subtrees hash has been altered because the subtrees
@@ -111,8 +111,8 @@ class ToolbarAdminMenuTest extends WebTestBase {
     $this->assertDifferentHash();
 
     // Enable a module.
-    $edit = array();
-    $edit['modules[Core][taxonomy][enable]'] = TRUE;
+    $edit = [];
+    $edit['modules[taxonomy][enable]'] = TRUE;
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->rebuildContainer();
 
@@ -124,12 +124,12 @@ class ToolbarAdminMenuTest extends WebTestBase {
   /**
    * Tests toolbar cache tags implementation.
    */
-  function testMenuLinkUpdateSubtreesHashCacheClear() {
+  public function testMenuLinkUpdateSubtreesHashCacheClear() {
     // The ID of a (any) admin menu link.
     $admin_menu_link_id = 'system.admin_config_development';
 
     // Disable the link.
-    $edit = array();
+    $edit = [];
     $edit['enabled'] = FALSE;
     $this->drupalPostForm("admin/structure/menu/link/" . $admin_menu_link_id . "/edit", $edit, t('Save'));
     $this->assertResponse(200);
@@ -144,13 +144,13 @@ class ToolbarAdminMenuTest extends WebTestBase {
    * Exercises the toolbar_user_role_update() and toolbar_user_update() hook
    * implementations.
    */
-  function testUserRoleUpdateSubtreesHashCacheClear() {
+  public function testUserRoleUpdateSubtreesHashCacheClear() {
     // Find the new role ID.
     $all_rids = $this->adminUser->getRoles();
     unset($all_rids[array_search(RoleInterface::AUTHENTICATED_ID, $all_rids)]);
     $rid = reset($all_rids);
 
-    $edit = array();
+    $edit = [];
     $edit[$rid . '[administer taxonomy]'] = FALSE;
     $this->drupalPostForm('admin/people/permissions', $edit, t('Save permissions'));
 
@@ -179,10 +179,10 @@ class ToolbarAdminMenuTest extends WebTestBase {
 
     $this->hash = $this->getSubtreesHash();
 
-    $rid = $this->drupalCreateRole(array('administer content types',));
+    $rid = $this->drupalCreateRole(['administer content types']);
 
     // Assign the role to the user.
-    $this->drupalPostForm('user/' . $this->adminUser->id() . '/edit', array("roles[$rid]" => $rid), t('Save'));
+    $this->drupalPostForm('user/' . $this->adminUser->id() . '/edit', ["roles[$rid]" => $rid], t('Save'));
     $this->assertText(t('The changes have been saved.'));
 
     // Assert that the subtrees hash has been altered because the subtrees
@@ -208,13 +208,13 @@ class ToolbarAdminMenuTest extends WebTestBase {
    * Tests that changes to a user account by another user clears the changed
    * account's toolbar cached, not the user's who took the action.
    */
-  function testNonCurrentUserAccountUpdates() {
+  public function testNonCurrentUserAccountUpdates() {
     $admin_user_id = $this->adminUser->id();
     $this->hash = $this->getSubtreesHash();
 
     // adminUser2 will add a role to adminUser.
     $this->drupalLogin($this->adminUser2);
-    $rid = $this->drupalCreateRole(array('administer content types',));
+    $rid = $this->drupalCreateRole(['administer content types']);
 
     // Get the subtree hash for adminUser2 to check later that it has not
     // changed. Request a new page to refresh the drupalSettings object.
@@ -223,7 +223,7 @@ class ToolbarAdminMenuTest extends WebTestBase {
     $admin_user_2_hash = $this->getSubtreesHash();
 
     // Assign the role to the user.
-    $this->drupalPostForm('user/' . $admin_user_id . '/edit', array("roles[$rid]" => $rid), t('Save'));
+    $this->drupalPostForm('user/' . $admin_user_id . '/edit', ["roles[$rid]" => $rid], t('Save'));
     $this->assertText(t('The changes have been saved.'));
 
     // Log in adminUser and assert that the subtrees hash has changed.
@@ -243,10 +243,10 @@ class ToolbarAdminMenuTest extends WebTestBase {
   /**
    * Tests that toolbar cache is cleared when string translations are made.
    */
-  function testLocaleTranslationSubtreesHashCacheClear() {
+  public function testLocaleTranslationSubtreesHashCacheClear() {
     $admin_user = $this->adminUser;
     // User to translate and delete string.
-    $translate_user = $this->drupalCreateUser(array('translate interface', 'access administration pages'));
+    $translate_user = $this->drupalCreateUser(['translate interface', 'access administration pages']);
 
     // Create a new language with the langcode 'xx'.
     $langcode = 'xx';
@@ -257,14 +257,14 @@ class ToolbarAdminMenuTest extends WebTestBase {
 
     // Add custom language.
     $this->drupalLogin($admin_user);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
-    t($name, array(), array('langcode' => $langcode));
+    t($name, [], ['langcode' => $langcode]);
     // Reset locale cache.
     $this->container->get('string_translation')->reset();
     $this->assertRaw('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
@@ -285,11 +285,11 @@ class ToolbarAdminMenuTest extends WebTestBase {
     // should create a new menu hash if the toolbar subtrees cache is correctly
     // invalidated.
     $this->drupalLogin($translate_user);
-    $search = array(
+    $search = [
       'string' => 'Search and metadata',
       'langcode' => $langcode,
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     $this->assertNoText(t('No strings available'));
     $this->assertText($name, 'Search found the string as untranslated.');
@@ -298,9 +298,9 @@ class ToolbarAdminMenuTest extends WebTestBase {
     // Translate the string to a random string.
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $translation,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
     $this->assertText(t('The strings have been saved.'), 'The strings have been saved.');
     $this->assertUrl(\Drupal::url('locale.translate_page', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
@@ -324,7 +324,7 @@ class ToolbarAdminMenuTest extends WebTestBase {
   /**
    * Tests that the 'toolbar/subtrees/{hash}' is reachable and correct.
    */
-  function testSubtreesJsonRequest() {
+  public function testSubtreesJsonRequest() {
     $admin_user = $this->adminUser;
     $this->drupalLogin($admin_user);
     // Request a new page to refresh the drupalSettings object.
@@ -339,7 +339,7 @@ class ToolbarAdminMenuTest extends WebTestBase {
   /**
    * Test that subtrees hashes vary by the language of the page.
    */
-  function testLanguageSwitching() {
+  public function testLanguageSwitching() {
     // Create a new language with the langcode 'xx'.
     $langcode = 'xx';
     $language = ConfigurableLanguage::createFromLangcode($langcode);
@@ -350,7 +350,7 @@ class ToolbarAdminMenuTest extends WebTestBase {
     $this->rebuildContainer();
 
     // Get a page with the new language langcode in the URL.
-    $this->drupalGet('test-page', array('language' => $language));
+    $this->drupalGet('test-page', ['language' => $language]);
     // Assert different hash.
     $new_subtree_hash = $this->getSubtreesHash();
 
diff --git a/web/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php b/web/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php
index 8fa2bed56..f4d6a1141 100644
--- a/web/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php
+++ b/web/core/modules/toolbar/src/Tests/ToolbarMenuTranslationTest.php
@@ -23,20 +23,20 @@ class ToolbarMenuTranslationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('toolbar', 'toolbar_test', 'locale', 'locale_test');
+  public static $modules = ['toolbar', 'toolbar_test', 'locale', 'locale_test'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create an administrative user and log it in.
-    $this->adminUser = $this->drupalCreateUser(array('access toolbar', 'translate interface', 'administer languages', 'access administration pages'));
+    $this->adminUser = $this->drupalCreateUser(['access toolbar', 'translate interface', 'administer languages', 'access administration pages']);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Tests that toolbar classes don't change when adding a translation.
    */
-  function testToolbarClasses() {
+  public function testToolbarClasses() {
     $langcode = 'es';
 
     // Add Spanish.
@@ -50,11 +50,11 @@ class ToolbarMenuTranslationTest extends WebTestBase {
     $this->drupalGet($langcode . '/admin/structure');
 
     // Search for the menu item.
-    $search = array(
+    $search = [
       'string' => $menu_item,
       'langcode' => $langcode,
       'translation' => 'untranslated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     // Make sure will be able to translate the menu item.
     $this->assertNoText('No strings available.', 'Search found the menu item as untranslated.');
@@ -67,17 +67,17 @@ class ToolbarMenuTranslationTest extends WebTestBase {
     $menu_item_translated = $this->randomMachineName();
     $textarea = current($this->xpath('//textarea'));
     $lid = (string) $textarea[0]['name'];
-    $edit = array(
+    $edit = [
       $lid => $menu_item_translated,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
 
     // Search for the translated menu item.
-    $search = array(
+    $search = [
       'string' => $menu_item,
       'langcode' => $langcode,
       'translation' => 'translated',
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
     // Make sure the menu item string was translated.
     $this->assertText($menu_item_translated, 'Search found the menu item as translated: ' . $menu_item_translated . '.');
diff --git a/web/core/modules/toolbar/tests/modules/toolbar_test/toolbar_test.module b/web/core/modules/toolbar/tests/modules/toolbar_test/toolbar_test.module
index 4a82ca7cb..323af166c 100644
--- a/web/core/modules/toolbar/tests/modules/toolbar_test/toolbar_test.module
+++ b/web/core/modules/toolbar/tests/modules/toolbar_test/toolbar_test.module
@@ -12,38 +12,38 @@ use Drupal\Core\Url;
  */
 function toolbar_test_toolbar() {
 
-  $items['testing'] = array(
+  $items['testing'] = [
     '#type' => 'toolbar_item',
-    'tab' => array(
+    'tab' => [
       '#type' => 'link',
       '#title' => t('Test tab'),
       '#url' => Url::fromRoute('<front>'),
-      '#options' => array(
-        'attributes' => array(
+      '#options' => [
+        'attributes' => [
           'id' => 'toolbar-tab-testing',
           'title' => t('Test tab'),
-        ),
-      ),
-    ),
-    'tray' => array(
+        ],
+      ],
+    ],
+    'tray' => [
       '#heading' => t('Test tray'),
-      '#wrapper_attributes' => array(
+      '#wrapper_attributes' => [
         'id' => 'toolbar-tray-testing',
-      ),
-      'content' => array(
+      ],
+      'content' => [
         '#theme' => 'item_list',
-        '#items' => array(
-          \Drupal::l(t('link 1'), new Url('<front>', [], array('attributes' => array('title' => 'Test link 1 title')))),
-          \Drupal::l(t('link 2'), new Url('<front>', [], array('attributes' => array('title' => 'Test link 2 title')))),
-          \Drupal::l(t('link 3'), new Url('<front>', [], array('attributes' => array('title' => 'Test link 3 title')))),
-        ),
-        '#attributes' => array(
-          'class' => array('toolbar-menu'),
-        ),
-      ),
-    ),
+        '#items' => [
+          \Drupal::l(t('link 1'), new Url('<front>', [], ['attributes' => ['title' => 'Test link 1 title']])),
+          \Drupal::l(t('link 2'), new Url('<front>', [], ['attributes' => ['title' => 'Test link 2 title']])),
+          \Drupal::l(t('link 3'), new Url('<front>', [], ['attributes' => ['title' => 'Test link 3 title']])),
+        ],
+        '#attributes' => [
+          'class' => ['toolbar-menu'],
+        ],
+      ],
+    ],
     '#weight' => 50,
-  );
+  ];
 
   return $items;
 }
diff --git a/web/core/modules/toolbar/src/Tests/ToolbarHookToolbarTest.php b/web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
similarity index 78%
rename from web/core/modules/toolbar/src/Tests/ToolbarHookToolbarTest.php
rename to web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
index 7cff043d6..f3d3ce611 100644
--- a/web/core/modules/toolbar/src/Tests/ToolbarHookToolbarTest.php
+++ b/web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\toolbar\Tests;
+namespace Drupal\Tests\toolbar\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the implementation of hook_toolbar() by a module.
  *
  * @group toolbar
  */
-class ToolbarHookToolbarTest extends WebTestBase {
+class ToolbarHookToolbarTest extends BrowserTestBase {
 
   /**
    * A user with permission to access the administrative toolbar.
@@ -23,20 +23,20 @@ class ToolbarHookToolbarTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('toolbar', 'toolbar_test', 'test_page_test');
+  public static $modules = ['toolbar', 'toolbar_test', 'test_page_test'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create an administrative user and log it in.
-    $this->adminUser = $this->drupalCreateUser(array('access toolbar'));
+    $this->adminUser = $this->drupalCreateUser(['access toolbar']);
     $this->drupalLogin($this->adminUser);
   }
 
   /**
    * Tests for a tab and tray provided by a module implementing hook_toolbar().
    */
-  function testHookToolbar() {
+  public function testHookToolbar() {
     $this->drupalGet('test-page');
     $this->assertResponse(200);
 
diff --git a/web/core/modules/toolbar/toolbar.api.php b/web/core/modules/toolbar/toolbar.api.php
index b2d04091b..b62308274 100644
--- a/web/core/modules/toolbar/toolbar.api.php
+++ b/web/core/modules/toolbar/toolbar.api.php
@@ -45,45 +45,45 @@ use Drupal\Core\Url;
  * @ingroup toolbar_tabs
  */
 function hook_toolbar() {
-  $items = array();
+  $items = [];
 
   // Add a search field to the toolbar. The search field employs no toolbar
   // module theming functions.
-  $items['global_search'] = array(
+  $items['global_search'] = [
     '#type' => 'toolbar_item',
-    'tab' => array(
+    'tab' => [
       '#type' => 'search',
-      '#attributes' => array(
+      '#attributes' => [
         'placeholder' => t('Search the site'),
-        'class' => array('search-global'),
-      ),
-    ),
+        'class' => ['search-global'],
+      ],
+    ],
     '#weight' => 200,
     // Custom CSS, JS or a library can be associated with the toolbar item.
-    '#attached' => array(
-      'library' => array(
+    '#attached' => [
+      'library' => [
         'search/global',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
   // The 'Home' tab is a simple link, which is wrapped in markup associated
   // with a visual tab styling.
-  $items['home'] = array(
+  $items['home'] = [
     '#type' => 'toolbar_item',
-    'tab' => array(
+    'tab' => [
       '#type' => 'link',
       '#title' => t('Home'),
       '#url' => Url::fromRoute('<front>'),
-      '#options' => array(
-        'attributes' => array(
+      '#options' => [
+        'attributes' => [
           'title' => t('Home page'),
-          'class' => array('toolbar-icon', 'toolbar-icon-home'),
-        ),
-      ),
-    ),
+          'class' => ['toolbar-icon', 'toolbar-icon-home'],
+        ],
+      ],
+    ],
     '#weight' => -20,
-  );
+  ];
 
   // A tray may be associated with a tab.
   //
@@ -93,27 +93,27 @@ function hook_toolbar() {
   // The tray should contain a renderable array. An optional #heading property
   // can be passed. This text is written to a heading tag in the tray as a
   // landmark for accessibility.
-  $items['commerce'] = array(
+  $items['commerce'] = [
     '#type' => 'toolbar_item',
-    'tab' => array(
+    'tab' => [
       '#type' => 'link',
       '#title' => t('Shopping cart'),
       '#url' => Url::fromRoute('cart'),
-      '#options' => array(
-        'attributes' => array(
+      '#options' => [
+        'attributes' => [
           'title' => t('Shopping cart'),
-        ),
-      ),
-    ),
-    'tray' => array(
+        ],
+      ],
+    ],
+    'tray' => [
       '#heading' => t('Shopping cart actions'),
-      'shopping_cart' => array(
+      'shopping_cart' => [
         '#theme' => 'item_list',
-        '#items' => array( /* An item list renderable array */ ),
-      ),
-    ),
+        '#items' => [ /* An item list renderable array */ ],
+      ],
+    ],
     '#weight' => 150,
-  );
+  ];
 
   // The tray can be used to render arbitrary content.
   //
@@ -123,28 +123,28 @@ function hook_toolbar() {
   // If the default behavior and styling of a toolbar tray is not desired, one
   // can render content to the toolbar element and apply custom theming and
   // behaviors.
-  $items['user_messages'] = array(
+  $items['user_messages'] = [
     // Include the toolbar_tab_wrapper to style the link like a toolbar tab.
     // Exclude the theme wrapper if custom styling is desired.
     '#type' => 'toolbar_item',
-    'tab' => array(
+    'tab' => [
       '#type' => 'link',
       '#theme' => 'user_message_toolbar_tab',
-      '#theme_wrappers' => array(),
+      '#theme_wrappers' => [],
       '#title' => t('Messages'),
       '#url' => Url::fromRoute('user.message'),
-      '#options' => array(
-        'attributes' => array(
+      '#options' => [
+        'attributes' => [
           'title' => t('Messages'),
-        ),
-      ),
-    ),
-    'tray' => array(
+        ],
+      ],
+    ],
+    'tray' => [
       '#heading' => t('User messages'),
-      'messages' => array(/* renderable content */),
-    ),
+      'messages' => [/* renderable content */],
+    ],
     '#weight' => 125,
-  );
+  ];
 
   return $items;
 }
diff --git a/web/core/modules/toolbar/toolbar.module b/web/core/modules/toolbar/toolbar.module
index 281f3abbb..4791f87f9 100644
--- a/web/core/modules/toolbar/toolbar.module
+++ b/web/core/modules/toolbar/toolbar.module
@@ -20,7 +20,7 @@ function toolbar_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.toolbar':
       $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Toolbar module provides a toolbar for site administrators, which displays tabs and trays provided by the Toolbar module itself and other modules. For more information, see the <a href=":toolbar_docs">online documentation for the Toolbar module</a>.', array(':toolbar_docs' => 'https://www.drupal.org/documentation/modules/toolbar')) . '</p>';
+      $output .= '<p>' . t('The Toolbar module provides a toolbar for site administrators, which displays tabs and trays provided by the Toolbar module itself and other modules. For more information, see the <a href=":toolbar_docs">online documentation for the Toolbar module</a>.', [':toolbar_docs' => 'https://www.drupal.org/documentation/modules/toolbar']) . '</p>';
       $output .= '<h4>' . t('Terminology') . '</h4>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Tabs') . '</dt>';
@@ -36,13 +36,13 @@ function toolbar_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function toolbar_theme($existing, $type, $theme, $path) {
-  $items['toolbar'] = array(
+  $items['toolbar'] = [
     'render element' => 'element',
-  );
-  $items['menu__toolbar'] = array(
+  ];
+  $items['menu__toolbar'] = [
     'base hook' => 'menu',
-    'variables' => array('items' => array(), 'attributes' => array()),
-  );
+    'variables' => ['items' => [], 'attributes' => []],
+  ];
 
   return $items;
 }
@@ -53,14 +53,14 @@ function toolbar_theme($existing, $type, $theme, $path) {
  * Add admin toolbar to the top of the page automatically.
  */
 function toolbar_page_top(array &$page_top) {
-  $page_top['toolbar'] = array(
+  $page_top['toolbar'] = [
     '#type' => 'toolbar',
     '#access' => \Drupal::currentUser()->hasPermission('access toolbar'),
     '#cache' => [
       'keys' => ['toolbar'],
       'contexts' => ['user.permissions'],
     ],
-  );
+  ];
 }
 
 /**
@@ -83,9 +83,9 @@ function template_preprocess_toolbar(&$variables) {
 
   // Prepare the trays and tabs for each toolbar item as well as the remainder
   // variable that will hold any non-tray, non-tab elements.
-  $variables['trays'] = array();
-  $variables['tabs'] = array();
-  $variables['remainder'] = array();
+  $variables['trays'] = [];
+  $variables['tabs'] = [];
+  $variables['remainder'] = [];
   foreach (Element::children($element) as $key) {
     // Early rendering to collect the wrapper attributes from
     // ToolbarItem elements.
@@ -94,14 +94,14 @@ function template_preprocess_toolbar(&$variables) {
     }
     // Add the tray.
     if (isset($element[$key]['tray'])) {
-      $attributes = array();
+      $attributes = [];
       if (!empty($element[$key]['tray']['#wrapper_attributes'])) {
         $attributes = $element[$key]['tray']['#wrapper_attributes'];
       }
-      $variables['trays'][$key] = array(
+      $variables['trays'][$key] = [
         'links' => $element[$key]['tray'],
         'attributes' => new Attribute($attributes),
-      );
+      ];
       if (array_key_exists('#heading', $element[$key]['tray'])) {
         $variables['trays'][$key]['label'] = $element[$key]['tray']['#heading'];
       }
@@ -109,22 +109,22 @@ function template_preprocess_toolbar(&$variables) {
 
     // Add the tab.
     if (isset($element[$key]['tab'])) {
-      $attributes = array();
+      $attributes = [];
       // Pass the wrapper attributes along.
       if (!empty($element[$key]['#wrapper_attributes'])) {
         $attributes = $element[$key]['#wrapper_attributes'];
       }
 
-      $variables['tabs'][$key] = array(
+      $variables['tabs'][$key] = [
         'link' => $element[$key]['tab'],
         'attributes' => new Attribute($attributes),
-      );
+      ];
     }
 
     // Add other non-tray, non-tab child elements to the remainder variable for
     // later rendering.
     foreach (Element::children($element[$key]) as $child_key) {
-      if (!in_array($child_key, array('tray', 'tab'))) {
+      if (!in_array($child_key, ['tray', 'tab'])) {
         $variables['remainder'][$key][$child_key] = $element[$key][$child_key];
       }
     }
@@ -136,28 +136,28 @@ function template_preprocess_toolbar(&$variables) {
  */
 function toolbar_toolbar() {
   // The 'Home' tab is a simple link, with no corresponding tray.
-  $items['home'] = array(
+  $items['home'] = [
     '#type' => 'toolbar_item',
-    'tab' => array(
+    'tab' => [
       '#type' => 'link',
       '#title' => t('Back to site'),
       '#url' => Url::fromRoute('<front>'),
-      '#attributes' => array(
+      '#attributes' => [
         'title' => t('Return to site content'),
-        'class' => array('toolbar-icon', 'toolbar-icon-escape-admin'),
+        'class' => ['toolbar-icon', 'toolbar-icon-escape-admin'],
         'data-toolbar-escape-admin' => TRUE,
-      ),
-    ),
-    '#wrapper_attributes' => array(
-      'class' => array('hidden', 'home-toolbar-tab'),
-    ),
-    '#attached' => array(
-      'library' => array(
+      ],
+    ],
+    '#wrapper_attributes' => [
+      'class' => ['hidden', 'home-toolbar-tab'],
+    ],
+    '#attached' => [
+      'library' => [
         'toolbar/toolbar.escapeAdmin',
-      ),
-    ),
+      ],
+    ],
     '#weight' => -20,
-  );
+  ];
 
   // To conserve bandwidth, we only include the top-level links in the HTML.
   // The subtrees are fetched through a JSONP script that is generated at the
@@ -171,38 +171,38 @@ function toolbar_toolbar() {
 
   // The administration element has a link that is themed to correspond to
   // a toolbar tray. The tray contains the full administrative menu of the site.
-  $items['administration'] = array(
+  $items['administration'] = [
     '#type' => 'toolbar_item',
-    'tab' => array(
+    'tab' => [
       '#type' => 'link',
       '#title' => t('Manage'),
       '#url' => Url::fromRoute('system.admin'),
-      '#attributes' => array(
+      '#attributes' => [
         'title' => t('Admin menu'),
-        'class' => array('toolbar-icon', 'toolbar-icon-menu'),
+        'class' => ['toolbar-icon', 'toolbar-icon-menu'],
         // A data attribute that indicates to the client to defer loading of
         // the admin menu subtrees until this tab is activated. Admin menu
         // subtrees will not render to the DOM if this attribute is removed.
         // The value of the attribute is intentionally left blank. Only the
         // presence of the attribute is necessary.
         'data-drupal-subtrees' => '',
-      ),
-    ),
-    'tray' => array(
+      ],
+    ],
+    'tray' => [
       '#heading' => t('Administration menu'),
       '#attached' => $subtrees_attached,
-      'toolbar_administration' => array(
-        '#pre_render' => array(
+      'toolbar_administration' => [
+        '#pre_render' => [
           'toolbar_prerender_toolbar_administration_tray',
-        ),
+        ],
         '#type' => 'container',
-        '#attributes' => array(
-          'class' => array('toolbar-menu-administration'),
-        ),
-      ),
-    ),
+        '#attributes' => [
+          'class' => ['toolbar-menu-administration'],
+        ],
+      ],
+    ],
     '#weight' => -15,
-  );
+  ];
   $hash_cacheability->applyTo($items['administration']);
 
   return $items;
@@ -228,11 +228,11 @@ function toolbar_prerender_toolbar_administration_tray(array $element) {
   $parameters->setMinDepth(2)->setMaxDepth(2)->onlyEnabledLinks();
   // @todo Make the menu configurable in https://www.drupal.org/node/1869638.
   $tree = $menu_tree->load('admin', $parameters);
-  $manipulators = array(
-    array('callable' => 'menu.default_tree_manipulators:checkAccess'),
-    array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
-    array('callable' => 'toolbar_menu_navigation_links'),
-  );
+  $manipulators = [
+    ['callable' => 'menu.default_tree_manipulators:checkAccess'],
+    ['callable' => 'menu.default_tree_manipulators:generateIndexAndSort'],
+    ['callable' => 'toolbar_menu_navigation_links'],
+  ];
   $tree = $menu_tree->transform($tree, $manipulators);
   $element['administration_menu'] = $menu_tree->build($tree);
   return $element;
@@ -262,7 +262,7 @@ function toolbar_menu_navigation_links(array $tree) {
       $id = substr(Crypt::hashBase64($url->getUri()), 0, 16);
     }
     else {
-      $id = str_replace(array('.', '<', '>'), array('-', '', ''), $url->getRouteName());
+      $id = str_replace(['.', '<', '>'], ['-', '', ''], $url->getRouteName());
     }
 
     // Get the non-localized title to make the icon class.
@@ -270,7 +270,7 @@ function toolbar_menu_navigation_links(array $tree) {
 
     $element->options['attributes']['id'] = 'toolbar-link-' . $id;
     $element->options['attributes']['class'][] = 'toolbar-icon';
-    $element->options['attributes']['class'][] = 'toolbar-icon-' . strtolower(str_replace(array('.', ' ', '_'), array('-', '-', '-'), $definition['id']));
+    $element->options['attributes']['class'][] = 'toolbar-icon-' . strtolower(str_replace(['.', ' ', '_'], ['-', '-', '-'], $definition['id']));
     $element->options['attributes']['title'] = $link->getDescription();
   }
   return $tree;
@@ -310,13 +310,13 @@ function _toolbar_do_get_rendered_subtrees(array $data) {
   $parameters->setMinDepth(2)->setMaxDepth(4)->onlyEnabledLinks();
   // @todo Make the menu configurable in https://www.drupal.org/node/1869638.
   $tree = $menu_tree->load('admin', $parameters);
-  $manipulators = array(
-    array('callable' => 'menu.default_tree_manipulators:checkAccess'),
-    array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
-    array('callable' => 'toolbar_menu_navigation_links'),
-  );
+  $manipulators = [
+    ['callable' => 'menu.default_tree_manipulators:checkAccess'],
+    ['callable' => 'menu.default_tree_manipulators:generateIndexAndSort'],
+    ['callable' => 'toolbar_menu_navigation_links'],
+  ];
   $tree = $menu_tree->transform($tree, $manipulators);
-  $subtrees = array();
+  $subtrees = [];
   // Calculated the combined cacheability of all subtrees.
   $cacheability = new CacheableMetadata();
   foreach ($tree as $element) {
@@ -333,7 +333,7 @@ function _toolbar_do_get_rendered_subtrees(array $data) {
     // Many routes have dots as route name, while some special ones like <front>
     // have <> characters in them.
     $url = $link->getUrlObject();
-    $id = str_replace(array('.', '<', '>'), array('-', '', '' ), $url->isRouted() ? $url->getRouteName() : $url->getUri());
+    $id = str_replace(['.', '<', '>'], ['-', '', '' ], $url->isRouted() ? $url->getRouteName() : $url->getUri());
 
     $subtrees[$id] = $output;
   }
diff --git a/web/core/modules/tour/src/Entity/Tour.php b/web/core/modules/tour/src/Entity/Tour.php
index 290d3f8fb..6f4038d5d 100644
--- a/web/core/modules/tour/src/Entity/Tour.php
+++ b/web/core/modules/tour/src/Entity/Tour.php
@@ -59,7 +59,7 @@ class Tour extends ConfigEntityBase implements TourInterface {
    *
    * @var array
    */
-  protected $routes = array();
+  protected $routes = [];
 
   /**
    * The routes on which this tour should be displayed, keyed by route id.
@@ -80,7 +80,7 @@ class Tour extends ConfigEntityBase implements TourInterface {
    *
    * @var array
    */
-  protected $tips = array();
+  protected $tips = [];
 
   /**
    * {@inheritdoc}
@@ -109,7 +109,7 @@ class Tour extends ConfigEntityBase implements TourInterface {
    * {@inheritdoc}
    */
   public function getTips() {
-    $tips = array();
+    $tips = [];
     foreach ($this->tips as $id => $tip) {
       $tips[] = $this->getTip($id);
     }
@@ -136,9 +136,9 @@ class Tour extends ConfigEntityBase implements TourInterface {
    */
   public function hasMatchingRoute($route_name, $route_params) {
     if (!isset($this->keyedRoutes)) {
-      $this->keyedRoutes = array();
+      $this->keyedRoutes = [];
       foreach ($this->getRoutes() as $route) {
-        $this->keyedRoutes[$route['route_name']] = isset($route['route_params']) ? $route['route_params'] : array();
+        $this->keyedRoutes[$route['route_name']] = isset($route['route_params']) ? $route['route_params'] : [];
       }
     }
     if (!isset($this->keyedRoutes[$route_name])) {
diff --git a/web/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php b/web/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php
index f7d279386..268741a83 100644
--- a/web/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php
+++ b/web/core/modules/tour/src/Plugin/tour/tip/TipPluginText.php
@@ -116,7 +116,7 @@ class TipPluginText extends TipPluginBase implements ContainerFactoryPluginInter
   public function getOutput() {
     $output = '<h2 class="tour-tip-label" id="tour-tip-' . $this->getAriaId() . '-label">' . Html::escape($this->getLabel()) . '</h2>';
     $output .= '<p class="tour-tip-body" id="tour-tip-' . $this->getAriaId() . '-contents">' . $this->token->replace($this->getBody()) . '</p>';
-    return array('#markup' => $output);
+    return ['#markup' => $output];
   }
 
 }
diff --git a/web/core/modules/tour/src/Tests/TourTest.php b/web/core/modules/tour/src/Tests/TourTest.php
index 78304c6e9..749e7c5a3 100644
--- a/web/core/modules/tour/src/Tests/TourTest.php
+++ b/web/core/modules/tour/src/Tests/TourTest.php
@@ -25,7 +25,7 @@ class TourTest extends TourTestBasic {
    * @var array
    *   A list of permissions.
    */
-  protected $permissions = array('access tour', 'administer languages');
+  protected $permissions = ['access tour', 'administer languages'];
 
   /**
    * Tour tip attributes to be tested. Keyed by the path.
@@ -33,9 +33,9 @@ class TourTest extends TourTestBasic {
    * @var array
    *   An array of tip attributes, keyed by path.
    */
-  protected $tips = array(
-    'tour-test-1' => array(),
-  );
+  protected $tips = [
+    'tour-test-1' => [],
+  ];
 
   /**
    * {@inheritdoc}
@@ -57,18 +57,18 @@ class TourTest extends TourTestBasic {
     $this->drupalGet('tour-test-1');
 
     // Test the TourTestBase class assertTourTips() method.
-    $tips = array();
-    $tips[] = array('data-id' => 'tour-test-1');
-    $tips[] = array('data-class' => 'tour-test-5');
+    $tips = [];
+    $tips[] = ['data-id' => 'tour-test-1'];
+    $tips[] = ['data-class' => 'tour-test-5'];
     $this->assertTourTips($tips);
     $this->assertTourTips();
 
-    $elements = $this->xpath('//li[@data-id=:data_id and @class=:classes and ./p//a[@href=:href and contains(., :text)]]', array(
+    $elements = $this->xpath('//li[@data-id=:data_id and @class=:classes and ./p//a[@href=:href and contains(., :text)]]', [
       ':classes' => 'tip-module-tour-test tip-type-text tip-tour-test-1',
       ':data_id' => 'tour-test-1',
       ':href' => \Drupal::url('<front>', [], ['absolute' => TRUE]),
       ':text' => 'Drupal',
-    ));
+    ]);
     $this->assertEqual(count($elements), 1, 'Found Token replacement.');
 
     $elements = $this->cssSelect("li[data-id=tour-test-1] h2:contains('The first tip')");
@@ -104,43 +104,43 @@ class TourTest extends TourTestBasic {
     $this->assertNotEqual(count($elements), 1, 'Did not find English variant of tip 1.');
 
     // Programmatically create a tour for use through the remainder of the test.
-    $tour = Tour::create(array(
+    $tour = Tour::create([
       'id' => 'tour-entity-create-test-en',
       'label' => 'Tour test english',
       'langcode' => 'en',
       'module' => 'system',
-      'routes' => array(
-        array('route_name' => 'tour_test.1'),
-      ),
-      'tips' => array(
-        'tour-test-1' => array(
+      'routes' => [
+        ['route_name' => 'tour_test.1'],
+      ],
+      'tips' => [
+        'tour-test-1' => [
           'id' => 'tour-code-test-1',
           'plugin' => 'text',
           'label' => 'The rain in spain',
           'body' => 'Falls mostly on the plain.',
           'weight' => '100',
-          'attributes' => array(
+          'attributes' => [
             'data-id' => 'tour-code-test-1',
-          ),
-        ),
-        'tour-code-test-2' => array(
+          ],
+        ],
+        'tour-code-test-2' => [
           'id' => 'tour-code-test-2',
           'plugin' => 'image',
           'label' => 'The awesome image',
           'url' => 'http://local/image.png',
           'weight' => 1,
-          'attributes' => array(
+          'attributes' => [
             'data-id' => 'tour-code-test-2'
-          ),
-        ),
-      ),
-    ));
+          ],
+        ],
+      ],
+    ]);
     $tour->save();
 
     // Ensure that a tour entity has the expected dependencies based on plugin
     // providers and the module named in the configuration entity.
     $dependencies = $tour->calculateDependencies()->getDependencies();
-    $this->assertEqual($dependencies['module'], array('system', 'tour_test'));
+    $this->assertEqual($dependencies['module'], ['system', 'tour_test']);
 
     $this->drupalGet('tour-test-1');
 
@@ -167,21 +167,21 @@ class TourTest extends TourTestBasic {
     // Navigate to tour-test-3 and verify the tour_test_1 tip is found with
     // appropriate classes.
     $this->drupalGet('tour-test-3/foo');
-    $elements = $this->xpath('//li[@data-id=:data_id and @class=:classes and ./h2[contains(., :text)]]', array(
+    $elements = $this->xpath('//li[@data-id=:data_id and @class=:classes and ./h2[contains(., :text)]]', [
       ':classes' => 'tip-module-tour-test tip-type-text tip-tour-test-1',
       ':data_id' => 'tour-test-1',
       ':text' => 'The first tip',
-    ));
+    ]);
     $this->assertEqual(count($elements), 1, 'Found English variant of tip 1.');
 
     // Navigate to tour-test-3 and verify the tour_test_1 tip is not found with
     // appropriate classes.
     $this->drupalGet('tour-test-3/bar');
-    $elements = $this->xpath('//li[@data-id=:data_id and @class=:classes and ./h2[contains(., :text)]]', array(
+    $elements = $this->xpath('//li[@data-id=:data_id and @class=:classes and ./h2[contains(., :text)]]', [
       ':classes' => 'tip-module-tour-test tip-type-text tip-tour-test-1',
       ':data_id' => 'tour-test-1',
       ':text' => 'The first tip',
-    ));
+    ]);
     $this->assertEqual(count($elements), 0, 'Did not find English variant of tip 1.');
   }
 
diff --git a/web/core/modules/tour/src/Tests/TourTestBase.php b/web/core/modules/tour/src/Tests/TourTestBase.php
index 8383c99d1..198051d37 100644
--- a/web/core/modules/tour/src/Tests/TourTestBase.php
+++ b/web/core/modules/tour/src/Tests/TourTestBase.php
@@ -29,7 +29,7 @@ abstract class TourTestBase extends WebTestBase {
    * $this->assertTourTips($tips);
    * @endcode
    */
-  public function assertTourTips($tips = array()) {
+  public function assertTourTips($tips = []) {
     // Get the rendered tips and their data-id and data-class attributes.
     if (empty($tips)) {
       // Tips are rendered as <li> elements inside <ol id="tour">.
@@ -51,11 +51,11 @@ abstract class TourTestBase extends WebTestBase {
       foreach ($tips as $tip) {
         if (!empty($tip['data-id'])) {
           $elements = \PHPUnit_Util_XML::cssSelect('#' . $tip['data-id'], TRUE, $this->content, TRUE);
-          $this->assertTrue(!empty($elements) && count($elements) === 1, format_string('Found corresponding page element for tour tip with id #%data-id', array('%data-id' => $tip['data-id'])));
+          $this->assertTrue(!empty($elements) && count($elements) === 1, format_string('Found corresponding page element for tour tip with id #%data-id', ['%data-id' => $tip['data-id']]));
         }
         elseif (!empty($tip['data-class'])) {
           $elements = \PHPUnit_Util_XML::cssSelect('.' . $tip['data-class'], TRUE, $this->content, TRUE);
-          $this->assertFalse(empty($elements), format_string('Found corresponding page element for tour tip with class .%data-class', array('%data-class' => $tip['data-class'])));
+          $this->assertFalse(empty($elements), format_string('Found corresponding page element for tour tip with class .%data-class', ['%data-class' => $tip['data-class']]));
         }
         else {
           // It's a modal.
@@ -63,7 +63,7 @@ abstract class TourTestBase extends WebTestBase {
         }
         $total++;
       }
-      $this->pass(format_string('Total %total Tips tested of which %modals modal(s).', array('%total' => $total, '%modals' => $modals)));
+      $this->pass(format_string('Total %total Tips tested of which %modals modal(s).', ['%total' => $total, '%modals' => $modals]));
     }
   }
 
diff --git a/web/core/modules/tour/src/Tests/TourTestBasic.php b/web/core/modules/tour/src/Tests/TourTestBasic.php
index e79eb2b45..1db8bc5c6 100644
--- a/web/core/modules/tour/src/Tests/TourTestBasic.php
+++ b/web/core/modules/tour/src/Tests/TourTestBasic.php
@@ -22,7 +22,7 @@ abstract class TourTestBasic extends TourTestBase {
    * );
    * @endcode
    */
-  protected $tips = array();
+  protected $tips = [];
 
   /**
    * An admin user with administrative permissions for tour.
@@ -37,14 +37,14 @@ abstract class TourTestBasic extends TourTestBase {
    * @var array
    *   A list of permissions.
    */
-  protected $permissions = array('access tour');
+  protected $permissions = ['access tour'];
 
   protected function setUp() {
     parent::setUp();
 
     // Make sure we are using distinct default and administrative themes for
     // the duration of these tests.
-    $this->container->get('theme_handler')->install(array('bartik', 'seven'));
+    $this->container->get('theme_handler')->install(['bartik', 'seven']);
     $this->config('system.theme')
       ->set('default', 'bartik')
       ->set('admin', 'seven')
diff --git a/web/core/modules/tour/src/TourViewBuilder.php b/web/core/modules/tour/src/TourViewBuilder.php
index 34172de06..a9bfe5a5f 100644
--- a/web/core/modules/tour/src/TourViewBuilder.php
+++ b/web/core/modules/tour/src/TourViewBuilder.php
@@ -13,35 +13,35 @@ class TourViewBuilder extends EntityViewBuilder {
   /**
    * {@inheritdoc}
    */
-  public function viewMultiple(array $entities = array(), $view_mode = 'full', $langcode = NULL) {
+  public function viewMultiple(array $entities = [], $view_mode = 'full', $langcode = NULL) {
     /** @var \Drupal\tour\TourInterface[] $entities */
-    $build = array();
+    $build = [];
     foreach ($entities as $entity_id => $entity) {
       $tips = $entity->getTips();
       $count = count($tips);
-      $list_items = array();
+      $list_items = [];
       foreach ($tips as $index => $tip) {
         if ($output = $tip->getOutput()) {
-          $attributes = array(
-            'class' => array(
+          $attributes = [
+            'class' => [
               'tip-module-' . Html::cleanCssIdentifier($entity->getModule()),
               'tip-type-' . Html::cleanCssIdentifier($tip->getPluginId()),
               'tip-' . Html::cleanCssIdentifier($tip->id()),
-            ),
-          );
-          $list_items[] = array(
+            ],
+          ];
+          $list_items[] = [
             'output' => $output,
-            'counter' => array(
+            'counter' => [
               '#type' => 'container',
-              '#attributes' => array(
-                'class' => array(
+              '#attributes' => [
+                'class' => [
                   'tour-progress',
-                ),
-              ),
-              '#children' => t('@tour_item of @total', array('@tour_item' => $index + 1, '@total' => $count)),
-            ),
+                ],
+              ],
+              '#children' => t('@tour_item of @total', ['@tour_item' => $index + 1, '@total' => $count]),
+            ],
             '#wrapper_attributes' => $tip->getAttributes() + $attributes,
-          );
+          ];
         }
       }
       // If there is at least one tour item, build the tour.
@@ -49,20 +49,20 @@ class TourViewBuilder extends EntityViewBuilder {
         end($list_items);
         $key = key($list_items);
         $list_items[$key]['#wrapper_attributes']['data-text'] = t('End tour');
-        $build[$entity_id] = array(
+        $build[$entity_id] = [
           '#theme' => 'item_list',
           '#items' => $list_items,
           '#list_type' => 'ol',
-          '#attributes' => array(
+          '#attributes' => [
             'id' => 'tour',
-            'class' => array(
+            'class' => [
               'hidden',
-            ),
-          ),
+            ],
+          ],
           '#cache' => [
             'tags' => $entity->getCacheTags(),
           ],
-        );
+        ];
       }
     }
     // If at least one tour was built, attach the tour library.
diff --git a/web/core/modules/tour/src/Tests/TourCacheTagsTest.php b/web/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php
similarity index 93%
rename from web/core/modules/tour/src/Tests/TourCacheTagsTest.php
rename to web/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php
index 4f2164e18..ff2e9e586 100644
--- a/web/core/modules/tour/src/Tests/TourCacheTagsTest.php
+++ b/web/core/modules/tour/tests/src/Functional/TourCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\tour\Tests;
+namespace Drupal\Tests\tour\Functional;
 
 use Drupal\Core\Url;
 use Drupal\system\Tests\Cache\PageCacheTagsTestBase;
@@ -18,7 +18,7 @@ class TourCacheTagsTest extends PageCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('tour', 'tour_test');
+  public static $modules = ['tour', 'tour_test'];
 
   /**
    * {@inheritdoc}
@@ -48,6 +48,7 @@ class TourCacheTagsTest extends PageCacheTagsTestBase {
     $expected_tags = [
       'config:tour.tour.tour-test',
       'config:user.role.anonymous',
+      'http_response',
       'rendered',
     ];
     $this->verifyPageCache($url, 'HIT', $expected_tags);
@@ -68,6 +69,7 @@ class TourCacheTagsTest extends PageCacheTagsTestBase {
     // Verify a cache hit.
     $expected_tags = [
       'config:user.role.anonymous',
+      'http_response',
       'rendered',
     ];
     $this->verifyPageCache($url, 'HIT', $expected_tags);
diff --git a/web/core/modules/tour/tests/src/Kernel/TourPluginTest.php b/web/core/modules/tour/tests/src/Kernel/TourPluginTest.php
index 9278e2e54..ce47467df 100644
--- a/web/core/modules/tour/tests/src/Kernel/TourPluginTest.php
+++ b/web/core/modules/tour/tests/src/Kernel/TourPluginTest.php
@@ -16,7 +16,7 @@ class TourPluginTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('tour');
+  public static $modules = ['tour'];
 
   /**
    * Stores the tour plugin manager.
@@ -28,7 +28,7 @@ class TourPluginTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installConfig(array('tour'));
+    $this->installConfig(['tour']);
     $this->pluginManager = $this->container->get('plugin.manager.tour.tip');
   }
 
diff --git a/web/core/modules/tour/tests/src/Unit/Entity/TourTest.php b/web/core/modules/tour/tests/src/Unit/Entity/TourTest.php
index 2c71aa965..08944eef2 100644
--- a/web/core/modules/tour/tests/src/Unit/Entity/TourTest.php
+++ b/web/core/modules/tour/tests/src/Unit/Entity/TourTest.php
@@ -29,7 +29,7 @@ class TourTest extends UnitTestCase {
   public function testHasMatchingRoute($routes, $route_name, $route_params, $result) {
     $tour = $this->getMockBuilder('\Drupal\tour\Entity\Tour')
       ->disableOriginalConstructor()
-      ->setMethods(array('getRoutes'))
+      ->setMethods(['getRoutes'])
       ->getMock();
 
     $tour->expects($this->any())
@@ -45,94 +45,94 @@ class TourTest extends UnitTestCase {
    * Provides sample routes for testing.
    */
   public function routeProvider() {
-    return array(
+    return [
       // Simple match.
-      array(
-        array(
-          array('route_name' => 'some.route'),
-        ),
+      [
+        [
+          ['route_name' => 'some.route'],
+        ],
         'some.route',
-        array(),
+        [],
         TRUE,
-      ),
+      ],
       // Simple non-match.
-      array(
-        array(
-          array('route_name' => 'another.route'),
-        ),
+      [
+        [
+          ['route_name' => 'another.route'],
+        ],
         'some.route',
-        array(),
+        [],
         FALSE,
-      ),
+      ],
       // Empty params.
-      array(
-        array(
-          array(
+      [
+        [
+          [
             'route_name' => 'some.route',
-            'route_params' => array('foo' => 'bar'),
-          ),
-        ),
+            'route_params' => ['foo' => 'bar'],
+          ],
+        ],
         'some.route',
-        array(),
+        [],
         FALSE,
-      ),
+      ],
       // Match on params.
-      array(
-        array(
-          array(
+      [
+        [
+          [
             'route_name' => 'some.route',
-            'route_params' => array('foo' => 'bar'),
-          ),
-        ),
+            'route_params' => ['foo' => 'bar'],
+          ],
+        ],
         'some.route',
-        array('foo' => 'bar'),
+        ['foo' => 'bar'],
         TRUE,
-      ),
+      ],
       // Non-matching params.
-      array(
-        array(
-          array(
+      [
+        [
+          [
             'route_name' => 'some.route',
-            'route_params' => array('foo' => 'bar'),
-          ),
-        ),
+            'route_params' => ['foo' => 'bar'],
+          ],
+        ],
         'some.route',
-        array('bar' => 'foo'),
+        ['bar' => 'foo'],
         FALSE,
-      ),
+      ],
       // One matching, one not.
-      array(
-        array(
-          array(
+      [
+        [
+          [
             'route_name' => 'some.route',
-            'route_params' => array('foo' => 'bar'),
-          ),
-          array(
+            'route_params' => ['foo' => 'bar'],
+          ],
+          [
             'route_name' => 'some.route',
-            'route_params' => array('bar' => 'foo'),
-          ),
-        ),
+            'route_params' => ['bar' => 'foo'],
+          ],
+        ],
         'some.route',
-        array('bar' => 'foo'),
+        ['bar' => 'foo'],
         TRUE,
-      ),
+      ],
       // One matching, one not.
-      array(
-        array(
-          array(
+      [
+        [
+          [
             'route_name' => 'some.route',
-            'route_params' => array('foo' => 'bar'),
-          ),
-          array(
+            'route_params' => ['foo' => 'bar'],
+          ],
+          [
             'route_name' => 'some.route',
-            'route_params' => array('foo' => 'baz'),
-          ),
-        ),
+            'route_params' => ['foo' => 'baz'],
+          ],
+        ],
         'some.route',
-        array('foo' => 'baz'),
+        ['foo' => 'baz'],
         TRUE,
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/tour/tests/tour_test/src/Controller/TourTestController.php b/web/core/modules/tour/tests/tour_test/src/Controller/TourTestController.php
index 87b817df7..56505aa0a 100644
--- a/web/core/modules/tour/tests/tour_test/src/Controller/TourTestController.php
+++ b/web/core/modules/tour/tests/tour_test/src/Controller/TourTestController.php
@@ -18,56 +18,56 @@ class TourTestController {
    *   Array of markup.
    */
   public function tourTest1($locale = 'foo') {
-    return array(
-      'tip-1' => array(
+    return [
+      'tip-1' => [
         '#type' => 'container',
-        '#attributes' => array(
+        '#attributes' => [
           'id' => 'tour-test-1',
-        ),
+        ],
         '#children' => t('Where does the rain in Spain fail?'),
-      ),
-      'tip-3' => array(
+      ],
+      'tip-3' => [
         '#type' => 'container',
-        '#attributes' => array(
+        '#attributes' => [
           'id' => 'tour-test-3',
-        ),
+        ],
         '#children' => t('Tip created now?'),
-      ),
-      'tip-4' => array(
+      ],
+      'tip-4' => [
         '#type' => 'container',
-        '#attributes' => array(
+        '#attributes' => [
           'id' => 'tour-test-4',
-        ),
+        ],
         '#children' => t('Tip created later?'),
-      ),
-      'tip-5' => array(
+      ],
+      'tip-5' => [
         '#type' => 'container',
-        '#attributes' => array(
-          'class' => array('tour-test-5'),
-        ),
+        '#attributes' => [
+          'class' => ['tour-test-5'],
+        ],
         '#children' => t('Tip created later?'),
-      ),
-      'code-tip-1' => array(
+      ],
+      'code-tip-1' => [
         '#type' => 'container',
-        '#attributes' => array(
+        '#attributes' => [
           'id' => 'tour-code-test-1',
-        ),
+        ],
         '#children' => t('Tip created now?'),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
    * Outputs some content for testing tours.
    */
   public function tourTest2() {
-    return array(
+    return [
       '#type' => 'container',
-      '#attributes' => array(
+      '#attributes' => [
         'id' => 'tour-test-2',
-      ),
+      ],
       '#children' => t('Pangram example'),
-    );
+    ];
 
   }
 
diff --git a/web/core/modules/tour/tour.module b/web/core/modules/tour/tour.module
index e456361f8..1de83992b 100644
--- a/web/core/modules/tour/tour.module
+++ b/web/core/modules/tour/tour.module
@@ -16,13 +16,13 @@ function tour_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.tour':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t("The Tour module provides users with guided tours of the site interface. Each tour consists of several tips that highlight elements of the user interface, guide the user through a workflow, or explain key concepts of the website. For more information, see the <a href=':tour'>online documentation for the Tour module</a>.", array(':tour' => 'https://www.drupal.org/documentation/modules/tour')) . '</p>';
+      $output .= '<p>' . t("The Tour module provides users with guided tours of the site interface. Each tour consists of several tips that highlight elements of the user interface, guide the user through a workflow, or explain key concepts of the website. For more information, see the <a href=':tour'>online documentation for the Tour module</a>.", [':tour' => 'https://www.drupal.org/documentation/modules/tour']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Viewing tours') . '</dt>';
       $output .= '<dd>' . t("If a tour is available on a page, a <em>Tour</em> button will be visible in the toolbar. If you click this button the first tip of the tour will appear. The tour continues after clicking the <em>Next</em> button in the tip. To see a tour users must have the permission <em>Access tour</em> and JavaScript must be enabled in the browser") . '</dd>';
       $output .= '<dt>' . t('Creating tours') . '</dt>';
-      $output .= '<dd>' . t("Tours can be written as YAML-documents with a text editor, or using the contributed <a href=':tour_ui'>Tour UI</a> module. For more information, see <a href=':doc_url'>the online documentation for writing tours</a>.", array(':doc_url' => 'https://www.drupal.org/developing/api/tour', ':tour_ui' => 'https://www.drupal.org/project/tour_ui')) . '</dd>';
+      $output .= '<dd>' . t("Tours can be written as YAML-documents with a text editor, or using the contributed <a href=':tour_ui'>Tour UI</a> module. For more information, see <a href=':doc_url'>the online documentation for writing tours</a>.", [':doc_url' => 'https://www.drupal.org/developing/api/tour', ':tour_ui' => 'https://www.drupal.org/project/tour_ui']) . '</dd>';
       $output .= '</dl>';
       return $output;
   }
@@ -45,27 +45,27 @@ function tour_toolbar() {
     return $items;
   }
 
-  $items['tour'] += array(
+  $items['tour'] += [
     '#type' => 'toolbar_item',
-    'tab' => array(
+    'tab' => [
       '#type' => 'html_tag',
       '#tag' => 'button',
       '#value' => t('Tour'),
-      '#attributes' => array(
-        'class' => array('toolbar-icon', 'toolbar-icon-help'),
+      '#attributes' => [
+        'class' => ['toolbar-icon', 'toolbar-icon-help'],
         'aria-pressed' => 'false',
-      ),
-    ),
-    '#wrapper_attributes' => array(
-      'class' => array('tour-toolbar-tab', 'hidden'),
+      ],
+    ],
+    '#wrapper_attributes' => [
+      'class' => ['tour-toolbar-tab', 'hidden'],
       'id' => 'toolbar-tab-tour',
-    ),
-    '#attached' => array(
-      'library' => array(
+    ],
+    '#attached' => [
+      'library' => [
         'tour/tour',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
   return $items;
 }
diff --git a/web/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php b/web/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php
deleted file mode 100644
index 471eacfee..000000000
--- a/web/core/modules/tracker/src/Access/ViewOwnTrackerAccessCheck.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\tracker\Access;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\user\UserInterface;
-
-/**
- * Access check for user tracker routes.
- */
-class ViewOwnTrackerAccessCheck implements AccessInterface {
-
-  /**
-   * Checks access.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   The currently logged in account.
-   * @param \Drupal\user\UserInterface $user
-   *   The user whose tracker page is being accessed.
-   *
-   * @return \Drupal\Core\Access\AccessResultInterface
-   *   The access result.
-   */
-  public function access(AccountInterface $account, UserInterface $user) {
-    return AccessResult::allowedIf($user && $account->isAuthenticated() && ($user->id() == $account->id()))->cachePerUser();
-  }
-
-}
diff --git a/web/core/modules/tracker/src/Controller/TrackerUserRecent.php b/web/core/modules/tracker/src/Controller/TrackerUserRecent.php
index 4ca428e5b..ff3d4b02f 100644
--- a/web/core/modules/tracker/src/Controller/TrackerUserRecent.php
+++ b/web/core/modules/tracker/src/Controller/TrackerUserRecent.php
@@ -2,7 +2,9 @@
 
 namespace Drupal\tracker\Controller;
 
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Session\AccountInterface;
 use Drupal\user\UserInterface;
 
 /**
@@ -18,4 +20,20 @@ class TrackerUserRecent extends ControllerBase {
     return tracker_page($user);
   }
 
+  /**
+   * Checks access for the users recent content tracker page.
+   *
+   * @param \Drupal\user\UserInterface $user
+   *   The user being viewed.
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The account viewing the page.
+   *
+   * @return \Drupal\Core\Access\AccessResult
+   *   The access result.
+   */
+  public function checkAccess(UserInterface $user, AccountInterface $account) {
+    return AccessResult::allowedIf($account->isAuthenticated() && $user->id() == $account->id())
+      ->cachePerUser();
+  }
+
 }
diff --git a/web/core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php b/web/core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php
index 1cd42177f..95264803f 100644
--- a/web/core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php
+++ b/web/core/modules/tracker/src/Plugin/Menu/UserTrackerTab.php
@@ -37,7 +37,7 @@ class UserTrackerTab extends LocalTaskDefault {
    * {@inheritdoc}
    */
   public function getRouteParameters(RouteMatchInterface $route_match) {
-    return array('user' => $this->currentUser()->Id());
+    return ['user' => $this->currentUser()->Id()];
   }
 
 }
diff --git a/web/core/modules/tracker/src/Tests/TrackerTest.php b/web/core/modules/tracker/src/Tests/TrackerTest.php
index a927e891c..fa95299b9 100644
--- a/web/core/modules/tracker/src/Tests/TrackerTest.php
+++ b/web/core/modules/tracker/src/Tests/TrackerTest.php
@@ -46,16 +46,16 @@ class TrackerTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
-    $permissions = array('access comments', 'create page content', 'post comments', 'skip comment approval');
+    $permissions = ['access comments', 'create page content', 'post comments', 'skip comment approval'];
     $this->user = $this->drupalCreateUser($permissions);
     $this->otherUser = $this->drupalCreateUser($permissions);
     $this->addDefaultCommentField('node', 'page');
-    user_role_grant_permissions(AccountInterface::ANONYMOUS_ROLE, array(
+    user_role_grant_permissions(AccountInterface::ANONYMOUS_ROLE, [
       'access content',
       'access user profiles',
-    ));
+    ]);
     $this->drupalPlaceBlock('local_tasks_block', ['id' => 'page_tabs_block']);
     $this->drupalPlaceBlock('local_actions_block', ['id' => 'page_actions_block']);
   }
@@ -63,17 +63,17 @@ class TrackerTest extends WebTestBase {
   /**
    * Tests for the presence of nodes on the global tracker listing.
    */
-  function testTrackerAll() {
+  public function testTrackerAll() {
     $this->drupalLogin($this->user);
 
-    $unpublished = $this->drupalCreateNode(array(
+    $unpublished = $this->drupalCreateNode([
       'title' => $this->randomMachineName(8),
       'status' => 0,
-    ));
-    $published = $this->drupalCreateNode(array(
+    ]);
+    $published = $this->drupalCreateNode([
       'title' => $this->randomMachineName(8),
       'status' => 1,
-    ));
+    ]);
 
     $this->drupalGet('activity');
     $this->assertNoText($unpublished->label(), 'Unpublished node does not show up in the tracker listing.');
@@ -129,33 +129,33 @@ class TrackerTest extends WebTestBase {
   /**
    * Tests for the presence of nodes on a user's tracker listing.
    */
-  function testTrackerUser() {
+  public function testTrackerUser() {
     $this->drupalLogin($this->user);
 
-    $unpublished = $this->drupalCreateNode(array(
+    $unpublished = $this->drupalCreateNode([
       'title' => $this->randomMachineName(8),
       'uid' => $this->user->id(),
       'status' => 0,
-    ));
-    $my_published = $this->drupalCreateNode(array(
+    ]);
+    $my_published = $this->drupalCreateNode([
       'title' => $this->randomMachineName(8),
       'uid' => $this->user->id(),
       'status' => 1,
-    ));
-    $other_published_no_comment = $this->drupalCreateNode(array(
+    ]);
+    $other_published_no_comment = $this->drupalCreateNode([
       'title' => $this->randomMachineName(8),
       'uid' => $this->otherUser->id(),
       'status' => 1,
-    ));
-    $other_published_my_comment = $this->drupalCreateNode(array(
+    ]);
+    $other_published_my_comment = $this->drupalCreateNode([
       'title' => $this->randomMachineName(8),
       'uid' => $this->otherUser->id(),
       'status' => 1,
-    ));
-    $comment = array(
+    ]);
+    $comment = [
       'subject[0][value]' => $this->randomMachineName(),
       'comment_body[0][value]' => $this->randomMachineName(20),
-    );
+    ];
     $this->drupalPostForm('comment/reply/node/' . $other_published_my_comment->id() . '/comment', $comment, t('Save'));
 
     $this->drupalGet('user/' . $this->user->id() . '/activity');
@@ -197,12 +197,12 @@ class TrackerTest extends WebTestBase {
     $this->assertNoLink($unpublished->label());
     // Verify that title and tab title have been set correctly.
     $this->assertText('Activity', 'The user activity tab has the name "Activity".');
-    $this->assertTitle(t('@name | @site', array('@name' => $this->user->getUsername(), '@site' => $this->config('system.site')->get('name'))), 'The user tracker page has the correct page title.');
+    $this->assertTitle(t('@name | @site', ['@name' => $this->user->getUsername(), '@site' => $this->config('system.site')->get('name')]), 'The user tracker page has the correct page title.');
 
     // Verify that unpublished comments are removed from the tracker.
-    $admin_user = $this->drupalCreateUser(array('post comments', 'administer comments', 'access user profiles'));
+    $admin_user = $this->drupalCreateUser(['post comments', 'administer comments', 'access user profiles']);
     $this->drupalLogin($admin_user);
-    $this->drupalPostForm('comment/1/edit', array('status' => CommentInterface::NOT_PUBLISHED), t('Save'));
+    $this->drupalPostForm('comment/1/edit', ['status' => CommentInterface::NOT_PUBLISHED], t('Save'));
     $this->drupalGet('user/' . $this->user->id() . '/activity');
     $this->assertNoText($other_published_my_comment->label(), 'Unpublished comments are not counted on the tracker listing.');
 
@@ -223,13 +223,13 @@ class TrackerTest extends WebTestBase {
   /**
    * Tests the metadata for the "new"/"updated" indicators.
    */
-  function testTrackerHistoryMetadata() {
+  public function testTrackerHistoryMetadata() {
     $this->drupalLogin($this->user);
 
     // Create a page node.
-    $edit = array(
+    $edit = [
       'title' => $this->randomMachineName(8),
-    );
+    ];
     $node = $this->drupalCreateNode($edit);
 
     // Verify that the history metadata is present.
@@ -243,10 +243,10 @@ class TrackerTest extends WebTestBase {
     // Add a comment to the page, make sure it is created after the node by
     // sleeping for one second, to ensure the last comment timestamp is
     // different from before.
-    $comment = array(
+    $comment = [
       'subject[0][value]' => $this->randomMachineName(),
       'comment_body[0][value]' => $this->randomMachineName(20),
-    );
+    ];
     sleep(1);
     $this->drupalPostForm('comment/reply/node/' . $node->id() . '/comment', $comment, t('Save'));
     // Reload the node so that comment.module's hook_node_load()
@@ -274,25 +274,25 @@ class TrackerTest extends WebTestBase {
   /**
    * Tests for ordering on a users tracker listing when comments are posted.
    */
-  function testTrackerOrderingNewComments() {
+  public function testTrackerOrderingNewComments() {
     $this->drupalLogin($this->user);
 
-    $node_one = $this->drupalCreateNode(array(
+    $node_one = $this->drupalCreateNode([
       'title' => $this->randomMachineName(8),
-    ));
+    ]);
 
-    $node_two = $this->drupalCreateNode(array(
+    $node_two = $this->drupalCreateNode([
       'title' => $this->randomMachineName(8),
-    ));
+    ]);
 
     // Now get otherUser to track these pieces of content.
     $this->drupalLogin($this->otherUser);
 
     // Add a comment to the first page.
-    $comment = array(
+    $comment = [
       'subject[0][value]' => $this->randomMachineName(),
       'comment_body[0][value]' => $this->randomMachineName(20),
-    );
+    ];
     $this->drupalPostForm('comment/reply/node/' . $node_one->id() . '/comment', $comment, t('Save'));
 
     // If the comment is posted in the same second as the last one then Drupal
@@ -300,10 +300,10 @@ class TrackerTest extends WebTestBase {
     sleep(1);
 
     // Add a comment to the second page.
-    $comment = array(
+    $comment = [
       'subject[0][value]' => $this->randomMachineName(),
       'comment_body[0][value]' => $this->randomMachineName(20),
-    );
+    ];
     $this->drupalPostForm('comment/reply/node/' . $node_two->id() . '/comment', $comment, t('Save'));
 
     // We should at this point have in our tracker for otherUser:
@@ -320,10 +320,10 @@ class TrackerTest extends WebTestBase {
     sleep(1);
 
     // Add a comment to the second page.
-    $comment = array(
+    $comment = [
       'subject[0][value]' => $this->randomMachineName(),
       'comment_body[0][value]' => $this->randomMachineName(20),
-    );
+    ];
     $this->drupalPostForm('comment/reply/node/' . $node_one->id() . '/comment', $comment, t('Save'));
 
     // Switch back to the otherUser and assert that the order has swapped.
@@ -340,25 +340,25 @@ class TrackerTest extends WebTestBase {
   /**
    * Tests that existing nodes are indexed by cron.
    */
-  function testTrackerCronIndexing() {
+  public function testTrackerCronIndexing() {
     $this->drupalLogin($this->user);
 
     // Create 3 nodes.
-    $edits = array();
-    $nodes = array();
+    $edits = [];
+    $nodes = [];
     for ($i = 1; $i <= 3; $i++) {
-      $edits[$i] = array(
+      $edits[$i] = [
         'title' => $this->randomMachineName(),
-      );
+      ];
       $nodes[$i] = $this->drupalCreateNode($edits[$i]);
     }
 
     // Add a comment to the last node as other user.
     $this->drupalLogin($this->otherUser);
-    $comment = array(
+    $comment = [
       'subject[0][value]' => $this->randomMachineName(),
       'comment_body[0][value]' => $this->randomMachineName(20),
-    );
+    ];
     $this->drupalPostForm('comment/reply/node/' . $nodes[3]->id() . '/comment', $comment, t('Save'));
 
     // Start indexing backwards from node 3.
@@ -378,7 +378,7 @@ class TrackerTest extends WebTestBase {
 
     // Assert that all node titles are displayed.
     foreach ($nodes as $i => $node) {
-      $this->assertText($node->label(), format_string('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
+      $this->assertText($node->label(), format_string('Node @i is displayed on the tracker listing pages.', ['@i' => $i]));
     }
 
     // Fetch the site-wide tracker.
@@ -386,32 +386,32 @@ class TrackerTest extends WebTestBase {
 
     // Assert that all node titles are displayed.
     foreach ($nodes as $i => $node) {
-      $this->assertText($node->label(), format_string('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
+      $this->assertText($node->label(), format_string('Node @i is displayed on the tracker listing pages.', ['@i' => $i]));
     }
   }
 
   /**
    * Tests that publish/unpublish works at admin/content/node.
    */
-  function testTrackerAdminUnpublish() {
-    \Drupal::service('module_installer')->install(array('views'));
+  public function testTrackerAdminUnpublish() {
+    \Drupal::service('module_installer')->install(['views']);
     \Drupal::service('router.builder')->rebuild();
-    $admin_user = $this->drupalCreateUser(array('access content overview', 'administer nodes', 'bypass node access'));
+    $admin_user = $this->drupalCreateUser(['access content overview', 'administer nodes', 'bypass node access']);
     $this->drupalLogin($admin_user);
 
-    $node = $this->drupalCreateNode(array(
+    $node = $this->drupalCreateNode([
       'title' => $this->randomMachineName(),
-    ));
+    ]);
 
     // Assert that the node is displayed.
     $this->drupalGet('activity');
     $this->assertText($node->label(), 'A node is displayed on the tracker listing pages.');
 
     // Unpublish the node and ensure that it's no longer displayed.
-    $edit = array(
+    $edit = [
       'action' => 'node_unpublish_action',
       'node_bulk_form[0]' => $node->id(),
-    );
+    ];
     $this->drupalPostForm('admin/content', $edit, t('Apply to selected items'));
 
     $this->drupalGet('activity');
@@ -438,7 +438,7 @@ class TrackerTest extends WebTestBase {
    * @param bool $library_is_present
    *   Whether the drupal.tracker-history library should be present or not.
    */
-  function assertHistoryMetadata($node_id, $node_timestamp, $node_last_comment_timestamp, $library_is_present = TRUE) {
+  public function assertHistoryMetadata($node_id, $node_timestamp, $node_last_comment_timestamp, $library_is_present = TRUE) {
     $settings = $this->getDrupalSettings();
     $this->assertIdentical($library_is_present, isset($settings['ajaxPageState']) && in_array('tracker/history', explode(',', $settings['ajaxPageState']['libraries'])), 'drupal.tracker-history library is present.');
     $this->assertIdentical(1, count($this->xpath('//table/tbody/tr/td[@data-history-node-id="' . $node_id . '" and @data-history-node-timestamp="' . $node_timestamp . '"]')), 'Tracker table cell contains the data-history-node-id and data-history-node-timestamp attributes for the node.');
diff --git a/web/core/modules/tracker/src/Tests/Views/TrackerTestBase.php b/web/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
index 7b2f9462e..53c21f906 100644
--- a/web/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
+++ b/web/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
@@ -20,7 +20,7 @@ abstract class TrackerTestBase extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('comment', 'tracker', 'tracker_test_views');
+  public static $modules = ['comment', 'tracker', 'tracker_test_views'];
 
   /**
    * The node used for testing.
@@ -39,30 +39,30 @@ abstract class TrackerTestBase extends ViewTestBase {
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('tracker_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['tracker_test_views']);
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
     // Add a comment field.
     $this->addDefaultCommentField('node', 'page');
 
-    $permissions = array('access comments', 'create page content', 'post comments', 'skip comment approval');
+    $permissions = ['access comments', 'create page content', 'post comments', 'skip comment approval'];
     $account = $this->drupalCreateUser($permissions);
 
     $this->drupalLogin($account);
 
-    $this->node = $this->drupalCreateNode(array(
+    $this->node = $this->drupalCreateNode([
       'title' => $this->randomMachineName(8),
       'uid' => $account->id(),
       'status' => 1,
-    ));
+    ]);
 
-    $this->comment = Comment::create(array(
+    $this->comment = Comment::create([
       'entity_id' => $this->node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment',
       'subject' => $this->randomMachineName(),
       'comment_body[' . LanguageInterface::LANGCODE_NOT_SPECIFIED . '][0][value]' => $this->randomMachineName(20),
-    ));
+    ]);
 
   }
 
diff --git a/web/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php b/web/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php
index 68b77777a..54732a02e 100644
--- a/web/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php
+++ b/web/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php
@@ -16,29 +16,29 @@ class TrackerUserUidTest extends TrackerTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_tracker_user_uid');
+  public static $testViews = ['test_tracker_user_uid'];
 
   /**
    * Tests the user uid filter and argument.
    */
   public function testUserUid() {
-    $map = array(
+    $map = [
       'nid' => 'nid',
       'title' => 'title',
-    );
+    ];
 
-    $expected = array(
-      array(
+    $expected = [
+      [
         'nid' => $this->node->id(),
         'title' => $this->node->label(),
-      )
-    );
+      ]
+    ];
 
     $view = Views::getView('test_tracker_user_uid');
     $this->executeView($view);
 
     // We should have no results as the filter is set for uid 0.
-    $this->assertIdenticalResultSet($view, array(), $map);
+    $this->assertIdenticalResultSet($view, [], $map);
     $view->destroy();
 
     // Change the filter value to our user.
@@ -55,13 +55,13 @@ class TrackerUserUidTest extends TrackerTestBase {
 
     // Test the incorrect argument UID.
     $view->initHandlers();
-    $this->executeView($view, array(rand()));
-    $this->assertIdenticalResultSet($view, array(), $map);
+    $this->executeView($view, [rand()]);
+    $this->assertIdenticalResultSet($view, [], $map);
     $view->destroy();
 
     // Test the correct argument UID.
     $view->initHandlers();
-    $this->executeView($view, array($this->node->getOwnerId()));
+    $this->executeView($view, [$this->node->getOwnerId()]);
     $this->assertIdenticalResultSet($view, $expected, $map);
   }
 
diff --git a/web/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php b/web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
similarity index 79%
rename from web/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
rename to web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
index 29492bc64..2b320ae4b 100644
--- a/web/core/modules/tracker/src/Tests/TrackerNodeAccessTest.php
+++ b/web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\tracker\Tests;
+namespace Drupal\Tests\tracker\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for private node access on /tracker.
  *
  * @group tracker
  */
-class TrackerNodeAccessTest extends WebTestBase {
+class TrackerNodeAccessTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
@@ -21,12 +21,12 @@ class TrackerNodeAccessTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'comment', 'tracker', 'node_access_test');
+  public static $modules = ['node', 'comment', 'tracker', 'node_access_test'];
 
   protected function setUp() {
     parent::setUp();
     node_access_rebuild();
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     node_access_test_add_field(NodeType::load('page'));
     $this->addDefaultCommentField('node', 'page', 'comment', CommentItemInterface::OPEN);
     \Drupal::state()->set('node_access_test.private', TRUE);
@@ -35,24 +35,24 @@ class TrackerNodeAccessTest extends WebTestBase {
   /**
    * Ensure private node on /tracker is only visible to users with permission.
    */
-  function testTrackerNodeAccess() {
+  public function testTrackerNodeAccess() {
     // Create user with node test view permission.
-    $access_user = $this->drupalCreateUser(array('node test view', 'access user profiles'));
+    $access_user = $this->drupalCreateUser(['node test view', 'access user profiles']);
 
     // Create user without node test view permission.
-    $no_access_user = $this->drupalCreateUser(array('access user profiles'));
+    $no_access_user = $this->drupalCreateUser(['access user profiles']);
 
     $this->drupalLogin($access_user);
 
     // Create some nodes.
-    $private_node = $this->drupalCreateNode(array(
+    $private_node = $this->drupalCreateNode([
       'title' => t('Private node test'),
       'private' => TRUE,
-    ));
-    $public_node = $this->drupalCreateNode(array(
+    ]);
+    $public_node = $this->drupalCreateNode([
       'title' => t('Public node test'),
       'private' => FALSE,
-    ));
+    ]);
 
     // User with access should see both nodes created.
     $this->drupalGet('activity');
diff --git a/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php b/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
index d72f13dc0..7045f45e2 100644
--- a/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
+++ b/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
@@ -47,17 +47,17 @@ class MigrateTrackerNodeTest extends MigrateDrupal7TestBase {
   public function testMigrateTrackerNode() {
     $connection = Database::getConnection('default', 'migrate');
     $num_rows = $connection
-        ->select('tracker_node', 'tn')
-        ->fields('tn', ['nid', 'published', 'changed'])
-        ->countQuery()
-        ->execute()
-        ->fetchField();
+      ->select('tracker_node', 'tn')
+      ->fields('tn', ['nid', 'published', 'changed'])
+      ->countQuery()
+      ->execute()
+      ->fetchField();
     $this->assertIdentical('1', $num_rows);
 
     $tracker_nodes = $connection
-        ->select('tracker_node', 'tn')
-        ->fields('tn', ['nid', 'published', 'changed'])
-        ->execute();
+      ->select('tracker_node', 'tn')
+      ->fields('tn', ['nid', 'published', 'changed'])
+      ->execute();
     $row = $tracker_nodes->fetchAssoc();
     $this->assertIdentical('1', $row['nid']);
     $this->assertIdentical('1', $row['published']);
diff --git a/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php b/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
index e3ed88e9c..0acc4e551 100644
--- a/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
+++ b/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
@@ -47,17 +47,17 @@ class MigrateTrackerUserTest extends MigrateDrupal7TestBase {
   public function testMigrateTrackerUser() {
     $connection = Database::getConnection('default', 'migrate');
     $num_rows = $connection
-        ->select('tracker_user', 'tn')
-        ->fields('tu', ['nid', 'uid', 'published', 'changed'])
-        ->countQuery()
-        ->execute()
-        ->fetchField();
+      ->select('tracker_user', 'tn')
+      ->fields('tu', ['nid', 'uid', 'published', 'changed'])
+      ->countQuery()
+      ->execute()
+      ->fetchField();
     $this->assertIdentical('1', $num_rows);
 
     $tracker_nodes = $connection
-        ->select('tracker_user', 'tu')
-        ->fields('tu', ['nid', 'uid', 'published', 'changed'])
-        ->execute();
+      ->select('tracker_user', 'tu')
+      ->fields('tu', ['nid', 'uid', 'published', 'changed'])
+      ->execute();
     $row = $tracker_nodes->fetchAssoc();
     $this->assertIdentical('1', $row['nid']);
     $this->assertIdentical('2', $row['uid']);
diff --git a/web/core/modules/tracker/tracker.install b/web/core/modules/tracker/tracker.install
index 5f3e5a0fd..bc9ebc57c 100644
--- a/web/core/modules/tracker/tracker.install
+++ b/web/core/modules/tracker/tracker.install
@@ -29,90 +29,90 @@ function tracker_install() {
  * Implements hook_schema().
  */
 function tracker_schema() {
-  $schema['tracker_node'] = array(
+  $schema['tracker_node'] = [
     'description' => 'Tracks when nodes were last changed or commented on.',
-    'fields' => array(
-      'nid' => array(
+    'fields' => [
+      'nid' => [
         'description' => 'The {node}.nid this record tracks.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'published' => array(
+      ],
+      'published' => [
         'description' => 'Boolean indicating whether the node is published.',
         'type' => 'int',
         'not null' => FALSE,
         'default' => 0,
         'size' => 'tiny',
-      ),
-      'changed' => array(
+      ],
+      'changed' => [
         'description' => 'The Unix timestamp when the node was most recently saved or commented on.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-    ),
-    'indexes' => array(
-      'tracker' => array('published', 'changed'),
-    ),
-    'primary key' => array('nid'),
-    'foreign keys' => array(
-      'tracked_node' => array(
+      ],
+    ],
+    'indexes' => [
+      'tracker' => ['published', 'changed'],
+    ],
+    'primary key' => ['nid'],
+    'foreign keys' => [
+      'tracked_node' => [
         'table' => 'node',
-        'columns' => array('nid' => 'nid'),
-      ),
-    ),
-  );
+        'columns' => ['nid' => 'nid'],
+      ],
+    ],
+  ];
 
-  $schema['tracker_user'] = array(
+  $schema['tracker_user'] = [
     'description' => 'Tracks when nodes were last changed or commented on, for each user that authored the node or one of its comments.',
-    'fields' => array(
-      'nid' => array(
+    'fields' => [
+      'nid' => [
         'description' => 'The {node}.nid this record tracks.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'uid' => array(
+      ],
+      'uid' => [
         'description' => 'The {users}.uid of the node author or commenter.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'published' => array(
+      ],
+      'published' => [
         'description' => 'Boolean indicating whether the node is published.',
         'type' => 'int',
         'not null' => FALSE,
         'default' => 0,
         'size' => 'tiny',
-      ),
-      'changed' => array(
+      ],
+      'changed' => [
         'description' => 'The Unix timestamp when the node was most recently saved or commented on.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-    ),
-    'indexes' => array(
-      'tracker' => array('uid', 'published', 'changed'),
-    ),
-    'primary key' => array('nid', 'uid'),
-    'foreign keys' => array(
-      'tracked_node' => array(
+      ],
+    ],
+    'indexes' => [
+      'tracker' => ['uid', 'published', 'changed'],
+    ],
+    'primary key' => ['nid', 'uid'],
+    'foreign keys' => [
+      'tracked_node' => [
         'table' => 'node',
-        'columns' => array('nid' => 'nid'),
-      ),
-      'tracked_user' => array(
+        'columns' => ['nid' => 'nid'],
+      ],
+      'tracked_user' => [
         'table' => 'users',
-        'columns' => array('uid' => 'uid'),
-      ),
-    ),
-  );
+        'columns' => ['uid' => 'uid'],
+      ],
+    ],
+  ];
 
   return $schema;
 }
diff --git a/web/core/modules/tracker/tracker.module b/web/core/modules/tracker/tracker.module
index 1b2f648df..dbde704a5 100644
--- a/web/core/modules/tracker/tracker.module
+++ b/web/core/modules/tracker/tracker.module
@@ -19,11 +19,11 @@ function tracker_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.tracker':
       $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Activity Tracker module displays the most recently added and updated content on your site, and allows you to follow new content created by each user. This module has no configuration options. For more information, see the <a href=":tracker">online documentation for the Activity Tracker module</a>.', array(':tracker' => 'https://www.drupal.org/documentation/modules/tracker')) . '</p>';
+      $output .= '<p>' . t('The Activity Tracker module displays the most recently added and updated content on your site, and allows you to follow new content created by each user. This module has no configuration options. For more information, see the <a href=":tracker">online documentation for the Activity Tracker module</a>.', [':tracker' => 'https://www.drupal.org/documentation/modules/tracker']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Tracking new and updated site content') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":recent">Recent content</a> 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 <em>My recent content</em> tab limits the list to the currently logged-in user.', array(':recent' => \Drupal::url('tracker.page'))) . '</dd>';
+      $output .= '<dd>' . t('The <a href=":recent">Recent content</a> 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 <em>My recent content</em> tab limits the list to the currently logged-in user.', [':recent' => \Drupal::url('tracker.page')]) . '</dd>';
       $output .= '<dt>' . t('Tracking user-specific content') . '</dt>';
       $output .= '<dd>' . t("To follow a specific user's new and updated content, select the <em>Activity</em> tab from the user's profile page.") . '</dd>';
       $output .= '</dl>';
@@ -70,21 +70,21 @@ function tracker_cron() {
 
       // Insert the node-level data.
       db_insert('tracker_node')
-        ->fields(array(
+        ->fields([
           'nid' => $nid,
           'published' => $node->isPublished(),
           'changed' => $changed,
-        ))
+        ])
         ->execute();
 
       // Insert the user-level data for the node's author.
       db_insert('tracker_user')
-        ->fields(array(
+        ->fields([
           'nid' => $nid,
           'published' => $node->isPublished(),
           'changed' => $changed,
           'uid' => $node->getOwnerId(),
-        ))
+        ])
         ->execute();
 
       // Insert the user-level data for the commenters (except if a commenter
@@ -103,12 +103,12 @@ function tracker_cron() {
       if ($result) {
         $query = db_insert('tracker_user');
         foreach ($result as $row) {
-          $query->fields(array(
+          $query->fields([
             'uid' => $row['uid'],
             'nid' => $nid,
             'published' => CommentInterface::PUBLISHED,
             'changed' => $changed,
-          ));
+          ]);
         }
         $query->execute();
       }
@@ -123,7 +123,7 @@ function tracker_cron() {
       // Prepare a starting point for the next run.
       $state->set('tracker.index_nid', $last_nid - 1);
 
-      \Drupal::logger('tracker')->notice('Indexed %count content items for tracking.', array('%count' => $count));
+      \Drupal::logger('tracker')->notice('Indexed %count content items for tracking.', ['%count' => $count]);
     }
     else {
       // If all nodes have been indexed, set to zero to skip future cron runs.
@@ -242,7 +242,7 @@ function tracker_comment_delete(CommentInterface $comment) {
 function _tracker_add($nid, $uid, $changed) {
   // @todo This should be actually filtering on the desired language and just
   //   fall back to the default language.
-  $node = db_query('SELECT nid, status, uid, changed FROM {node_field_data} WHERE nid = :nid AND default_langcode = 1 ORDER BY changed DESC, status DESC', array(':nid' => $nid))->fetchObject();
+  $node = db_query('SELECT nid, status, uid, changed FROM {node_field_data} WHERE nid = :nid AND default_langcode = 1 ORDER BY changed DESC, status DESC', [':nid' => $nid])->fetchObject();
 
   // Adding a comment can only increase the changed timestamp, so our
   // calculation here is simple.
@@ -251,30 +251,30 @@ function _tracker_add($nid, $uid, $changed) {
   // Update the node-level data.
   db_merge('tracker_node')
     ->key('nid', $nid)
-    ->fields(array(
+    ->fields([
       'changed' => $changed,
       'published' => $node->status,
-    ))
+    ])
     ->execute();
 
   // Create or update the user-level data, first for the user posting.
   db_merge('tracker_user')
-    ->keys(array(
+    ->keys([
       'nid' => $nid,
       'uid' => $uid,
-    ))
-    ->fields(array(
+    ])
+    ->fields([
       'changed' => $changed,
       'published' => $node->status,
-    ))
+    ])
     ->execute();
   // Update the times for all the other users tracking the post.
   db_update('tracker_user')
     ->condition('nid', $nid)
-    ->fields(array(
+    ->fields([
       'changed' => $changed,
       'published' => $node->status,
-    ))
+    ])
     ->execute();
 }
 
@@ -293,7 +293,7 @@ function _tracker_add($nid, $uid, $changed) {
  */
 function _tracker_calculate_changed($node) {
   $changed = $node->getChangedTime();
-  $latest_comment = \Drupal::service('comment.statistics')->read(array($node), 'node', FALSE);
+  $latest_comment = \Drupal::service('comment.statistics')->read([$node], 'node', FALSE);
   if ($latest_comment && $latest_comment->last_comment_timestamp > $changed) {
     $changed = $latest_comment->last_comment_timestamp;
   }
@@ -343,7 +343,7 @@ function _tracker_remove($nid, $uid = NULL, $changed = NULL) {
     // and the node itself.
     // We only need to do this if the removed item has a timestamp that equals
     // or exceeds the listed changed timestamp for the node.
-    $tracker_node = db_query('SELECT nid, changed FROM {tracker_node} WHERE nid = :nid', array(':nid' => $nid))->fetchObject();
+    $tracker_node = db_query('SELECT nid, changed FROM {tracker_node} WHERE nid = :nid', [':nid' => $nid])->fetchObject();
     if ($tracker_node && $changed >= $tracker_node->changed) {
       // If we're here, the item being removed is *possibly* the item that
       // established the node's changed timestamp.
@@ -354,17 +354,17 @@ function _tracker_remove($nid, $uid = NULL, $changed = NULL) {
       // And then we push the out the new changed timestamp to our denormalized
       // tables.
       db_update('tracker_node')
-        ->fields(array(
+        ->fields([
           'changed' => $changed,
           'published' => $node->isPublished(),
-        ))
+        ])
         ->condition('nid', $nid)
         ->execute();
       db_update('tracker_node')
-        ->fields(array(
+        ->fields([
           'changed' => $changed,
           'published' => $node->isPublished(),
-        ))
+        ])
         ->condition('nid', $nid)
         ->execute();
     }
diff --git a/web/core/modules/tracker/tracker.pages.inc b/web/core/modules/tracker/tracker.pages.inc
index e3082acfc..76a775f45 100644
--- a/web/core/modules/tracker/tracker.pages.inc
+++ b/web/core/modules/tracker/tracker.pages.inc
@@ -30,7 +30,7 @@ function tracker_page($account = NULL) {
       ->condition('t.uid', $account->id());
   }
   else {
-    $query = db_select('tracker_node', 't', array('target' => 'replica'))
+    $query = db_select('tracker_node', 't', ['target' => 'replica'])
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
       ->addMetaData('base_table', 'tracker_node');
   }
@@ -39,7 +39,7 @@ function tracker_page($account = NULL) {
   // while keeping the correct order.
   $tracker_data = $query
     ->addTag('node_access')
-    ->fields('t', array('nid', 'changed'))
+    ->fields('t', ['nid', 'changed'])
     ->condition('t.published', 1)
     ->orderBy('t.changed', 'DESC')
     ->limit(25)
@@ -86,34 +86,34 @@ function tracker_page($account = NULL) {
         $comments = $node->comment_count;
       }
 
-      $row = array(
+      $row = [
         'type' => node_get_type_label($node),
-        'title' => array(
-          'data' => array(
+        'title' => [
+          'data' => [
             '#type' => 'link',
             '#url' => $node->urlInfo(),
             '#title' => $node->getTitle(),
-          ),
+          ],
           'data-history-node-id' => $node->id(),
           'data-history-node-timestamp' => $node->getChangedTime(),
-        ),
-        'author' => array(
-          'data' => array(
+        ],
+        'author' => [
+          'data' => [
             '#theme' => 'username',
             '#account' => $node->getOwner(),
-          ),
-        ),
-        'comments' => array(
-          'class' => array('comments'),
+          ],
+        ],
+        'comments' => [
+          'class' => ['comments'],
           'data' => $comments,
           'data-history-node-last-comment-timestamp' => $node->last_comment_timestamp,
-        ),
-        'last updated' => array(
-          'data' => t('@time ago', array(
+        ],
+        'last updated' => [
+          'data' => t('@time ago', [
             '@time' => \Drupal::service('date.formatter')->formatTimeDiffSince($node->last_activity),
-          )),
-        ),
-      );
+          ]),
+        ],
+      ];
 
       $rows[] = $row;
 
@@ -128,16 +128,16 @@ function tracker_page($account = NULL) {
   // Add the list cache tag for nodes.
   $cache_tags = Cache::mergeTags($cache_tags, \Drupal::entityManager()->getDefinition('node')->getListCacheTags());
 
-  $page['tracker'] = array(
+  $page['tracker'] = [
     '#rows' => $rows,
-    '#header' => array(t('Type'), t('Title'), t('Author'), t('Comments'), t('Last updated')),
+    '#header' => [t('Type'), t('Title'), t('Author'), t('Comments'), t('Last updated')],
     '#type' => 'table',
     '#empty' => t('No content available.'),
-  );
-  $page['pager'] = array(
+  ];
+  $page['pager'] = [
     '#type' => 'pager',
     '#weight' => 10,
-  );
+  ];
   $page['#sorted'] = TRUE;
   $page['#cache']['tags'] = $cache_tags;
   $page['#cache']['contexts'][] = 'user.node_grants:view';
diff --git a/web/core/modules/tracker/tracker.routing.yml b/web/core/modules/tracker/tracker.routing.yml
index ed2f8681c..ea9855f32 100644
--- a/web/core/modules/tracker/tracker.routing.yml
+++ b/web/core/modules/tracker/tracker.routing.yml
@@ -13,7 +13,7 @@ tracker.users_recent_content:
     _title: 'My recent content'
   requirements:
     _permission: 'access content'
-    _access_tracker_own_information: 'TRUE'
+    _custom_access: '\Drupal\tracker\Controller\TrackerUserRecent::checkAccess'
     user: \d+
 
 tracker.user_tab:
diff --git a/web/core/modules/tracker/tracker.services.yml b/web/core/modules/tracker/tracker.services.yml
deleted file mode 100644
index 11e29e7e8..000000000
--- a/web/core/modules/tracker/tracker.services.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-services:
-  access_check.tracker.view_own:
-    class: Drupal\tracker\Access\ViewOwnTrackerAccessCheck
-    tags:
-      - { name: access_check, applies_to: _access_tracker_own_information }
diff --git a/web/core/modules/tracker/tracker.views.inc b/web/core/modules/tracker/tracker.views.inc
index b7e4b9547..54402879d 100644
--- a/web/core/modules/tracker/tracker.views.inc
+++ b/web/core/modules/tracker/tracker.views.inc
@@ -9,146 +9,146 @@
  * Implements hook_views_data().
  */
 function tracker_views_data() {
-  $data = array();
+  $data = [];
 
   $data['tracker_node']['table']['group'] = t('Tracker');
-  $data['tracker_node']['table']['join'] = array(
-    'node_field_data' => array(
+  $data['tracker_node']['table']['join'] = [
+    'node_field_data' => [
       'type' => 'INNER',
       'left_field' => 'nid',
       'field' => 'nid',
-    ),
-  );
-  $data['tracker_node']['nid'] = array(
+    ],
+  ];
+  $data['tracker_node']['nid'] = [
     'title' => t('Nid'),
     'help' => t('The node ID of the node.'),
-    'field' => array(
+    'field' => [
       'id' => 'node',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'node_nid',
       'name field' => 'title',
       'numeric' => TRUE,
       'validate type' => 'nid',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'numeric',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
-  $data['tracker_node']['published'] = array(
+    ],
+  ];
+  $data['tracker_node']['published'] = [
     'title' => t('Published'),
     'help' => t('Whether or not the node is published.'),
-    'field' => array(
+    'field' => [
       'id' => 'boolean',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'boolean',
       'label' => t('Published'),
       'type' => 'yes-no',
       'accept null' => TRUE,
       'use_equal' => TRUE,
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
-  $data['tracker_node']['changed'] = array(
+    ],
+  ];
+  $data['tracker_node']['changed'] = [
     'title' => t('Updated date'),
     'help' => t('The date the node was last updated.'),
-    'field' => array(
+    'field' => [
       'id' => 'date',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'date',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'date',
-    ),
-  );
+    ],
+  ];
 
   $data['tracker_user']['table']['group'] = t('Tracker - User');
-  $data['tracker_user']['table']['join'] = array(
-    'node_field_data' => array(
+  $data['tracker_user']['table']['join'] = [
+    'node_field_data' => [
       'type' => 'INNER',
       'left_field' => 'nid',
       'field' => 'nid',
-    ),
-    'user_field_data' => array(
+    ],
+    'user_field_data' => [
       'type' => 'INNER',
       'left_field' => 'uid',
       'field' => 'uid',
-    ),
-  );
-  $data['tracker_user']['nid'] = array(
+    ],
+  ];
+  $data['tracker_user']['nid'] = [
     'title' => t('Nid'),
     'help' => t('The node ID of the node a user created or commented on. You must use an argument or filter on UID or you will get misleading results using this field.'),
-    'field' => array(
+    'field' => [
       'id' => 'node',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'node_nid',
       'name field' => 'title',
       'numeric' => TRUE,
       'validate type' => 'nid',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'numeric',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
-  $data['tracker_user']['uid'] = array(
+    ],
+  ];
+  $data['tracker_user']['uid'] = [
     'title' => t('Uid'),
     'help' => t('The user ID of a user who touched the node (either created or commented on it).'),
-    'field' => array(
+    'field' => [
       'id' => 'user_name',
-    ),
-    'argument' => array(
+    ],
+    'argument' => [
       'id' => 'user_uid',
       'name field' => 'name',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'title' => t('Name'),
       'id' => 'user_name',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
-  $data['tracker_user']['published'] = array(
+    ],
+  ];
+  $data['tracker_user']['published'] = [
     'title' => t('Published'),
     'help' => t('Whether or not the node is published. You must use an argument or filter on UID or you will get misleading results using this field.'),
-    'field' => array(
+    'field' => [
       'id' => 'boolean',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'boolean',
       'label' => t('Published'),
       'type' => 'yes-no',
       'accept null' => TRUE,
       'use_equal' => TRUE,
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'standard',
-    ),
-  );
-  $data['tracker_user']['changed'] = array(
+    ],
+  ];
+  $data['tracker_user']['changed'] = [
     'title' => t('Updated date'),
     'help' => t('The date the node was last updated or commented on. You must use an argument or filter on UID or you will get misleading results using this field.'),
-    'field' => array(
+    'field' => [
       'id' => 'date',
-    ),
-    'sort' => array(
+    ],
+    'sort' => [
       'id' => 'date',
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'id' => 'date',
-    ),
-  );
+    ],
+  ];
 
   return $data;
 }
@@ -158,22 +158,22 @@ function tracker_views_data() {
  */
 function tracker_views_data_alter(&$data) {
   // Provide additional uid_touch handlers which are handled by tracker
-  $data['node_field_data']['uid_touch_tracker'] = array(
+  $data['node_field_data']['uid_touch_tracker'] = [
     'group' => t('Tracker - User'),
     'title' => t('User posted or commented'),
     'help' => t('Display nodes only if a user posted the node or commented on the node.'),
-    'argument' => array(
+    'argument' => [
       'field' => 'uid',
       'name table' => 'users_field_data',
       'name field' => 'name',
       'id' => 'tracker_user_uid',
       'no group by' => TRUE,
-    ),
-    'filter' => array(
+    ],
+    'filter' => [
       'field' => 'uid',
       'name table' => 'users_field_data',
       'name field' => 'name',
       'id' => 'tracker_user_uid'
-    ),
-  );
+    ],
+  ];
 }
diff --git a/web/core/modules/update/src/Controller/UpdateController.php b/web/core/modules/update/src/Controller/UpdateController.php
index cdd63b83a..30b25c206 100644
--- a/web/core/modules/update/src/Controller/UpdateController.php
+++ b/web/core/modules/update/src/Controller/UpdateController.php
@@ -44,9 +44,9 @@ class UpdateController extends ControllerBase {
    *   A build array with the update status of projects.
    */
   public function updateStatus() {
-    $build = array(
+    $build = [
       '#theme' => 'update_report'
-    );
+    ];
     if ($available = update_get_available(TRUE)) {
       $this->moduleHandler()->loadInclude('update', 'compare.inc');
       $build['#data'] = update_calculate_project_data($available);
@@ -59,15 +59,15 @@ class UpdateController extends ControllerBase {
    */
   public function updateStatusManually() {
     $this->updateManager->refreshUpdateData();
-    $batch = array(
-      'operations' => array(
-        array(array($this->updateManager, 'fetchDataBatch'), array()),
-      ),
+    $batch = [
+      'operations' => [
+        [[$this->updateManager, 'fetchDataBatch'], []],
+      ],
       'finished' => 'update_fetch_data_finished',
       'title' => t('Checking available update data'),
       'progress_message' => t('Trying to check available update data ...'),
       'error_message' => t('Error checking available update data.'),
-    );
+    ];
     batch_set($batch);
     return batch_process('admin/reports/updates');
   }
diff --git a/web/core/modules/update/src/Form/UpdateManagerInstall.php b/web/core/modules/update/src/Form/UpdateManagerInstall.php
index 3bc2c78a7..b14118286 100644
--- a/web/core/modules/update/src/Form/UpdateManagerInstall.php
+++ b/web/core/modules/update/src/Form/UpdateManagerInstall.php
@@ -79,41 +79,41 @@ class UpdateManagerInstall extends FormBase {
       return $form;
     }
 
-    $form['help_text'] = array(
+    $form['help_text'] = [
       '#prefix' => '<p>',
-      '#markup' => $this->t('You can find <a href=":module_url">modules</a> and <a href=":theme_url">themes</a> on <a href=":drupal_org_url">drupal.org</a>. The following file extensions are supported: %extensions.', array(
+      '#markup' => $this->t('You can find <a href=":module_url">modules</a> and <a href=":theme_url">themes</a> on <a href=":drupal_org_url">drupal.org</a>. The following file extensions are supported: %extensions.', [
         ':module_url' => 'https://www.drupal.org/project/modules',
         ':theme_url' => 'https://www.drupal.org/project/themes',
         ':drupal_org_url' => 'https://www.drupal.org',
         '%extensions' => archiver_get_extensions(),
-      )),
+      ]),
       '#suffix' => '</p>',
-    );
+    ];
 
-    $form['project_url'] = array(
+    $form['project_url'] = [
       '#type' => 'url',
       '#title' => $this->t('Install from a URL'),
-      '#description' => $this->t('For example: %url', array('%url' => 'http://ftp.drupal.org/files/projects/name.tar.gz')),
-    );
+      '#description' => $this->t('For example: %url', ['%url' => 'http://ftp.drupal.org/files/projects/name.tar.gz']),
+    ];
 
-    $form['information'] = array(
+    $form['information'] = [
       '#prefix' => '<strong>',
       '#markup' => $this->t('Or'),
       '#suffix' => '</strong>',
-    );
+    ];
 
-    $form['project_upload'] = array(
+    $form['project_upload'] = [
       '#type' => 'file',
       '#title' => $this->t('Upload a module or theme archive to install'),
-      '#description' => $this->t('For example: %filename from your local computer', array('%filename' => 'name.tar.gz')),
-    );
+      '#description' => $this->t('For example: %filename from your local computer', ['%filename' => 'name.tar.gz']),
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#button_type' => 'primary',
       '#value' => $this->t('Install'),
-    );
+    ];
 
     return $form;
   }
@@ -136,12 +136,12 @@ class UpdateManagerInstall extends FormBase {
     if ($form_state->getValue('project_url')) {
       $local_cache = update_manager_file_get($form_state->getValue('project_url'));
       if (!$local_cache) {
-        drupal_set_message($this->t('Unable to retrieve Drupal project from %url.', array('%url' => $form_state->getValue('project_url'))), 'error');
+        drupal_set_message($this->t('Unable to retrieve Drupal project from %url.', ['%url' => $form_state->getValue('project_url')]), 'error');
         return;
       }
     }
     elseif ($_FILES['files']['name']['project_upload']) {
-      $validators = array('file_validate_extensions' => array(archiver_get_extensions()));
+      $validators = ['file_validate_extensions' => [archiver_get_extensions()]];
       if (!($finfo = file_save_upload('project_upload', $validators, NULL, 0, FILE_EXISTS_REPLACE))) {
         // Failed to upload the file. file_save_upload() calls
         // drupal_set_message() on failure.
@@ -170,7 +170,7 @@ class UpdateManagerInstall extends FormBase {
     // MODULE/) and others list an actual file (i.e., MODULE/README.TXT).
     $project = strtok($files[0], '/\\');
 
-    $archive_errors = $this->moduleHandler->invokeAll('verify_update_archive', array($project, $local_cache, $directory));
+    $archive_errors = $this->moduleHandler->invokeAll('verify_update_archive', [$project, $local_cache, $directory]);
     if (!empty($archive_errors)) {
       drupal_set_message(array_shift($archive_errors), 'error');
       // @todo: Fix me in D8: We need a way to set multiple errors on the same
@@ -204,20 +204,20 @@ class UpdateManagerInstall extends FormBase {
     }
 
     if (!$project_title) {
-      drupal_set_message($this->t('Unable to determine %project name.', array('%project' => $project)), 'error');
+      drupal_set_message($this->t('Unable to determine %project name.', ['%project' => $project]), 'error');
     }
 
     if ($updater->isInstalled()) {
-      drupal_set_message($this->t('%project is already installed.', array('%project' => $project_title)), 'error');
+      drupal_set_message($this->t('%project is already installed.', ['%project' => $project_title]), 'error');
       return;
     }
 
     $project_real_location = drupal_realpath($project_location);
-    $arguments = array(
+    $arguments = [
       'project' => $project,
       'updater_name' => get_class($updater),
       'local_url' => $project_real_location,
-    );
+    ];
 
     // This process is inherently difficult to test therefore use a state flag.
     $test_authorize = FALSE;
@@ -232,7 +232,7 @@ class UpdateManagerInstall extends FormBase {
     if (fileowner($project_real_location) == fileowner($this->sitePath) && !$test_authorize) {
       $this->moduleHandler->loadInclude('update', 'inc', 'update.authorize');
       $filetransfer = new Local($this->root);
-      $response = call_user_func_array('update_authorize_run_install', array_merge(array($filetransfer), $arguments));
+      $response = call_user_func_array('update_authorize_run_install', array_merge([$filetransfer], $arguments));
       if ($response instanceof Response) {
         $form_state->setResponse($response);
       }
diff --git a/web/core/modules/update/src/Form/UpdateManagerUpdate.php b/web/core/modules/update/src/Form/UpdateManagerUpdate.php
index 44b7f6269..db497c276 100644
--- a/web/core/modules/update/src/Form/UpdateManagerUpdate.php
+++ b/web/core/modules/update/src/Form/UpdateManagerUpdate.php
@@ -64,13 +64,13 @@ class UpdateManagerUpdate extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $this->moduleHandler->loadInclude('update', 'inc', 'update.manager');
 
-    $last_markup = array(
+    $last_markup = [
       '#theme' => 'update_last_check',
       '#last' => $this->state->get('update.last_check') ?: 0,
-    );
-    $form['last_check'] = array(
+    ];
+    $form['last_check'] = [
       '#markup' => drupal_render($last_markup),
-    );
+    ];
 
     if (!_update_manager_check_backends($form, 'update')) {
       return $form;
@@ -78,9 +78,9 @@ class UpdateManagerUpdate extends FormBase {
 
     $available = update_get_available(TRUE);
     if (empty($available)) {
-      $form['message'] = array(
+      $form['message'] = [
         '#markup' => $this->t('There was a problem getting update information. Try again later.'),
-      );
+      ];
       return $form;
     }
 
@@ -91,11 +91,11 @@ class UpdateManagerUpdate extends FormBase {
     // manual updates, such as core). Then, each subarray is an array of
     // projects of that type, indexed by project short name, and containing an
     // array of data for cells in that project's row in the appropriate table.
-    $projects = array();
+    $projects = [];
 
     // This stores the actual download link we're going to update from for each
     // project in the form, regardless of if it's enabled or disabled.
-    $form['project_downloads'] = array('#tree' => TRUE);
+    $form['project_downloads'] = ['#tree' => TRUE];
     $this->moduleHandler->loadInclude('update', 'inc', 'update.compare');
     $project_data = update_calculate_project_data($available);
     foreach ($project_data as $name => $project) {
@@ -134,25 +134,25 @@ class UpdateManagerUpdate extends FormBase {
         $recommended_version .= '<div title="{{ major_update_warning_title }}" class="update-major-version-warning">{{ major_update_warning_text }}</div>';
       }
 
-      $recommended_version = array(
+      $recommended_version = [
         '#type' => 'inline_template',
         '#template' => $recommended_version,
-        '#context' => array(
+        '#context' => [
           'release_version' => $recommended_release['version'],
           'release_link' => $recommended_release['release_link'],
-          'project_title' => $this->t('Release notes for @project_title', array('@project_title' => $project['title'])),
+          'project_title' => $this->t('Release notes for @project_title', ['@project_title' => $project['title']]),
           'major_update_warning_title' => $this->t('Major upgrade warning'),
           'major_update_warning_text' => $this->t('This update is a major version update which means that it may not be backwards compatible with your currently running version. It is recommended that you read the release notes and proceed at your own risk.'),
           'release_notes' => $this->t('Release notes'),
-        ),
-      );
+        ],
+      ];
 
       // Create an entry for this project.
-      $entry = array(
+      $entry = [
         'title' => $project_name,
         'installed_version' => $project['existing_version'],
-        'recommended_version' => array('data' => $recommended_version),
-      );
+        'recommended_version' => ['data' => $recommended_version],
+      ];
 
       switch ($project['status']) {
         case UPDATE_NOT_SECURE:
@@ -181,11 +181,11 @@ class UpdateManagerUpdate extends FormBase {
       }
 
       // Use the project title for the tableselect checkboxes.
-      $entry['title'] = array('data' => array(
+      $entry['title'] = ['data' => [
         '#title' => $entry['title'],
         '#markup' => $entry['title'],
-      ));
-      $entry['#attributes'] = array('class' => array('update-' . $type));
+      ]];
+      $entry['#attributes'] = ['class' => ['update-' . $type]];
 
       // Drupal core needs to be upgraded manually.
       $needs_manual = $project['project_type'] == 'core';
@@ -198,15 +198,15 @@ class UpdateManagerUpdate extends FormBase {
         unset($entry['#weight']);
         $attributes = $entry['#attributes'];
         unset($entry['#attributes']);
-        $entry = array(
+        $entry = [
           'data' => $entry,
-        ) + $attributes;
+        ] + $attributes;
       }
       else {
-        $form['project_downloads'][$name] = array(
+        $form['project_downloads'][$name] = [
           '#type' => 'value',
           '#value' => $recommended_release['download_link'],
-        );
+        ];
       }
 
       // Based on what kind of project this is, save the entry into the
@@ -230,62 +230,62 @@ class UpdateManagerUpdate extends FormBase {
     }
 
     if (empty($projects)) {
-      $form['message'] = array(
+      $form['message'] = [
         '#markup' => $this->t('All of your projects are up to date.'),
-      );
+      ];
       return $form;
     }
 
-    $headers = array(
-      'title' => array(
+    $headers = [
+      'title' => [
         'data' => $this->t('Name'),
-        'class' => array('update-project-name'),
-      ),
+        'class' => ['update-project-name'],
+      ],
       'installed_version' => $this->t('Installed version'),
       'recommended_version' => $this->t('Recommended version'),
-    );
+    ];
 
     if (!empty($projects['enabled'])) {
-      $form['projects'] = array(
+      $form['projects'] = [
         '#type' => 'tableselect',
         '#header' => $headers,
         '#options' => $projects['enabled'],
-      );
+      ];
       if (!empty($projects['disabled'])) {
         $form['projects']['#prefix'] = '<h2>' . $this->t('Enabled') . '</h2>';
       }
     }
 
     if (!empty($projects['disabled'])) {
-      $form['disabled_projects'] = array(
+      $form['disabled_projects'] = [
         '#type' => 'tableselect',
         '#header' => $headers,
         '#options' => $projects['disabled'],
         '#weight' => 1,
         '#prefix' => '<h2>' . $this->t('Disabled') . '</h2>',
-      );
+      ];
     }
 
     // If either table has been printed yet, we need a submit button and to
     // validate the checkboxes.
     if (!empty($projects['enabled']) || !empty($projects['disabled'])) {
-      $form['actions'] = array('#type' => 'actions');
-      $form['actions']['submit'] = array(
+      $form['actions'] = ['#type' => 'actions'];
+      $form['actions']['submit'] = [
         '#type' => 'submit',
         '#value' => $this->t('Download these updates'),
-      );
+      ];
     }
 
     if (!empty($projects['manual'])) {
       $prefix = '<h2>' . $this->t('Manual updates required') . '</h2>';
       $prefix .= '<p>' . $this->t('Updates of Drupal core are not supported at this time.') . '</p>';
-      $form['manual_updates'] = array(
+      $form['manual_updates'] = [
         '#type' => 'table',
         '#header' => $headers,
         '#rows' => $projects['manual'],
         '#prefix' => $prefix,
         '#weight' => 120,
-      );
+      ];
     }
 
     return $form;
@@ -311,29 +311,29 @@ class UpdateManagerUpdate extends FormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->moduleHandler->loadInclude('update', 'inc', 'update.manager');
-    $projects = array();
-    foreach (array('projects', 'disabled_projects') as $type) {
+    $projects = [];
+    foreach (['projects', 'disabled_projects'] as $type) {
       if (!$form_state->isValueEmpty($type)) {
         $projects = array_merge($projects, array_keys(array_filter($form_state->getValue($type))));
       }
     }
-    $operations = array();
+    $operations = [];
     foreach ($projects as $project) {
-      $operations[] = array(
+      $operations[] = [
         'update_manager_batch_project_get',
-        array(
+        [
           $project,
-          $form_state->getValue(array('project_downloads', $project)),
-        ),
-      );
+          $form_state->getValue(['project_downloads', $project]),
+        ],
+      ];
     }
-    $batch = array(
+    $batch = [
       'title' => $this->t('Downloading updates'),
       'init_message' => $this->t('Preparing to download selected updates'),
       'operations' => $operations,
       'finished' => 'update_manager_download_batch_finished',
       'file' => drupal_get_path('module', 'update') . '/update.manager.inc',
-    );
+    ];
     batch_set($batch);
   }
 
diff --git a/web/core/modules/update/src/Form/UpdateReady.php b/web/core/modules/update/src/Form/UpdateReady.php
index c8f64a3ee..ef9a2f171 100644
--- a/web/core/modules/update/src/Form/UpdateReady.php
+++ b/web/core/modules/update/src/Form/UpdateReady.php
@@ -91,23 +91,23 @@ class UpdateReady extends FormBase {
       return $form;
     }
 
-    $form['backup'] = array(
+    $form['backup'] = [
       '#prefix' => '<strong>',
-      '#markup' => $this->t('Back up your database and site before you continue. <a href=":backup_url">Learn how</a>.', array(':backup_url' => 'https://www.drupal.org/node/22281')),
+      '#markup' => $this->t('Back up your database and site before you continue. <a href=":backup_url">Learn how</a>.', [':backup_url' => 'https://www.drupal.org/node/22281']),
       '#suffix' => '</strong>',
-    );
+    ];
 
-    $form['maintenance_mode'] = array(
+    $form['maintenance_mode'] = [
       '#title' => $this->t('Perform updates with site in maintenance mode (strongly recommended)'),
       '#type' => 'checkbox',
       '#default_value' => TRUE,
-    );
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Continue'),
-    );
+    ];
 
     return $form;
   }
@@ -126,7 +126,7 @@ class UpdateReady extends FormBase {
       // Make sure the Updater registry is loaded.
       drupal_get_updaters();
 
-      $updates = array();
+      $updates = [];
       $directory = _update_manager_extract_directory();
 
       $projects = $_SESSION['update_manager_update_projects'];
@@ -137,11 +137,11 @@ class UpdateReady extends FormBase {
         $project_location = $directory . '/' . $project;
         $updater = Updater::factory($project_location, $this->root);
         $project_real_location = drupal_realpath($project_location);
-        $updates[] = array(
+        $updates[] = [
           'project' => $project,
           'updater_name' => get_class($updater),
           'local_url' => $project_real_location,
-        );
+        ];
       }
 
       // If the owner of the last directory we extracted is the same as the
@@ -164,7 +164,7 @@ class UpdateReady extends FormBase {
         // The page title must be passed here to ensure it is initially used
         // when authorize.php loads for the first time with the FTP/SSH
         // credentials form.
-        system_authorized_init('update_authorize_run_update', __DIR__ . '/../../update.authorize.inc', array($updates), $this->t('Update manager'));
+        system_authorized_init('update_authorize_run_update', __DIR__ . '/../../update.authorize.inc', [$updates], $this->t('Update manager'));
         $form_state->setRedirectUrl(system_authorized_get_url());
       }
     }
diff --git a/web/core/modules/update/src/Tests/FileTransferAuthorizeFormTest.php b/web/core/modules/update/src/Tests/FileTransferAuthorizeFormTest.php
index 0d0989ba9..9d1819fca 100644
--- a/web/core/modules/update/src/Tests/FileTransferAuthorizeFormTest.php
+++ b/web/core/modules/update/src/Tests/FileTransferAuthorizeFormTest.php
@@ -14,11 +14,11 @@ class FileTransferAuthorizeFormTest extends UpdateTestBase {
    *
    * @var array
    */
-  public static $modules = array('update', 'update_test');
+  public static $modules = ['update', 'update_test'];
 
   protected function setUp() {
     parent::setUp();
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer software updates', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer software updates', 'administer site configuration']);
     $this->drupalLogin($admin_user);
 
     // Create a local cache so the module is not downloaded from drupal.org.
diff --git a/web/core/modules/update/src/Tests/UpdateContribTest.php b/web/core/modules/update/src/Tests/UpdateContribTest.php
index 88cf37841..81f7117a3 100644
--- a/web/core/modules/update/src/Tests/UpdateContribTest.php
+++ b/web/core/modules/update/src/Tests/UpdateContribTest.php
@@ -18,30 +18,30 @@ class UpdateContribTest extends UpdateTestBase {
    *
    * @var array
    */
-  public static $modules = array('update_test', 'update', 'aaa_update_test', 'bbb_update_test', 'ccc_update_test');
+  public static $modules = ['update_test', 'update', 'aaa_update_test', 'bbb_update_test', 'ccc_update_test'];
 
   protected function setUp() {
     parent::setUp();
-    $admin_user = $this->drupalCreateUser(array('administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($admin_user);
   }
 
   /**
    * Tests when there is no available release data for a contrib module.
    */
-  function testNoReleasesAvailable() {
-    $system_info = array(
-      '#all' => array(
+  public function testNoReleasesAvailable() {
+    $system_info = [
+      '#all' => [
         'version' => '8.0.0',
-      ),
-      'aaa_update_test' => array(
+      ],
+      'aaa_update_test' => [
         'project' => 'aaa_update_test',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
-    );
+      ],
+    ];
     $this->config('update_test.settings')->set('system_info', $system_info)->save();
-    $this->refreshUpdateStatus(array('drupal' => '0.0', 'aaa_update_test' => 'no-releases'));
+    $this->refreshUpdateStatus(['drupal' => '0.0', 'aaa_update_test' => 'no-releases']);
     $this->drupalGet('admin/reports/updates');
     // Cannot use $this->standardTests() because we need to check for the
     // 'No available releases found' string.
@@ -60,24 +60,24 @@ class UpdateContribTest extends UpdateTestBase {
   /**
    * Tests the basic functionality of a contrib module on the status report.
    */
-  function testUpdateContribBasic() {
+  public function testUpdateContribBasic() {
     $project_link = \Drupal::l(t('AAA Update test'), Url::fromUri('http://example.com/project/aaa_update_test'));
-    $system_info = array(
-      '#all' => array(
+    $system_info = [
+      '#all' => [
         'version' => '8.0.0',
-      ),
-      'aaa_update_test' => array(
+      ],
+      'aaa_update_test' => [
         'project' => 'aaa_update_test',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
-    );
+      ],
+    ];
     $this->config('update_test.settings')->set('system_info', $system_info)->save();
     $this->refreshUpdateStatus(
-      array(
+      [
         'drupal' => '0.0',
         'aaa_update_test' => '1_0',
-      )
+      ]
     );
     $this->standardTests();
     $this->assertText(t('Up to date'));
@@ -90,10 +90,10 @@ class UpdateContribTest extends UpdateTestBase {
     $system_info['aaa_update_test']['hidden'] = TRUE;
     $this->config('update_test.settings')->set('system_info', $system_info)->save();
     $this->refreshUpdateStatus(
-      array(
+      [
         'drupal' => '0.0',
         'aaa_update_test' => '1_0',
-      )
+      ]
     );
     $this->assertNoRaw($project_link, 'Link to aaa_update_test project does not appear.');
 
@@ -101,10 +101,10 @@ class UpdateContribTest extends UpdateTestBase {
     $system_info['aaa_update_test']['package'] = 'aaa_update_test';
     $this->config('update_test.settings')->set('system_info', $system_info)->save();
     $this->refreshUpdateStatus(
-      array(
+      [
         'drupal' => '0.0',
         'aaa_update_test' => '1_0',
-      )
+      ]
     );
     $this->assertRaw($project_link, 'Link to aaa_update_test project appears.');
   }
@@ -122,40 +122,40 @@ class UpdateContribTest extends UpdateTestBase {
    * if you sort alphabetically by module name (which is the order we see things
    * inside system_rebuild_module_data() for example).
    */
-  function testUpdateContribOrder() {
+  public function testUpdateContribOrder() {
     // We want core to be version 8.0.0.
-    $system_info = array(
-      '#all' => array(
+    $system_info = [
+      '#all' => [
         'version' => '8.0.0',
-      ),
+      ],
       // All the rest should be visible as contrib modules at version 8.x-1.0.
 
       // aaa_update_test needs to be part of the "CCC Update test" project,
       // which would throw off the report if we weren't properly sorting by
       // the project names.
-      'aaa_update_test' => array(
+      'aaa_update_test' => [
         'project' => 'ccc_update_test',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
+      ],
 
       // This should be its own project, and listed first on the report.
-      'bbb_update_test' => array(
+      'bbb_update_test' => [
         'project' => 'bbb_update_test',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
+      ],
 
       // This will contain both aaa_update_test and ccc_update_test, and
       // should come after the bbb_update_test project.
-      'ccc_update_test' => array(
+      'ccc_update_test' => [
         'project' => 'ccc_update_test',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
-    );
+      ],
+    ];
     $this->config('update_test.settings')->set('system_info', $system_info)->save();
-    $this->refreshUpdateStatus(array('drupal' => '0.0', '#all' => '1_0'));
+    $this->refreshUpdateStatus(['drupal' => '0.0', '#all' => '1_0']);
     $this->standardTests();
     // We're expecting the report to say all projects are up to date.
     $this->assertText(t('Up to date'));
@@ -184,37 +184,37 @@ class UpdateContribTest extends UpdateTestBase {
   /**
    * Tests that subthemes are notified about security updates for base themes.
    */
-  function testUpdateBaseThemeSecurityUpdate() {
+  public function testUpdateBaseThemeSecurityUpdate() {
     // @todo https://www.drupal.org/node/2338175 base themes have to be
     //  installed.
     // Only install the subtheme, not the base theme.
-    \Drupal::service('theme_handler')->install(array('update_test_subtheme'));
+    \Drupal::service('theme_handler')->install(['update_test_subtheme']);
 
     // Define the initial state for core and the subtheme.
-    $system_info = array(
+    $system_info = [
       // We want core to be version 8.0.0.
-      '#all' => array(
+      '#all' => [
         'version' => '8.0.0',
-      ),
+      ],
       // Show the update_test_basetheme
-      'update_test_basetheme' => array(
+      'update_test_basetheme' => [
         'project' => 'update_test_basetheme',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
+      ],
       // Show the update_test_subtheme
-      'update_test_subtheme' => array(
+      'update_test_subtheme' => [
         'project' => 'update_test_subtheme',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
-    );
+      ],
+    ];
     $this->config('update_test.settings')->set('system_info', $system_info)->save();
-    $xml_mapping = array(
+    $xml_mapping = [
       'drupal' => '0.0',
       'update_test_subtheme' => '1_0',
       'update_test_basetheme' => '1_1-sec',
-    );
+    ];
     $this->refreshUpdateStatus($xml_mapping);
     $this->assertText(t('Security update required!'));
     $this->assertRaw(\Drupal::l(t('Update test base theme'), Url::fromUri('http://example.com/project/update_test_basetheme')), 'Link to the Update test base theme project appears.');
@@ -226,7 +226,7 @@ class UpdateContribTest extends UpdateTestBase {
    * @todo https://www.drupal.org/node/2338175 extensions can not be hidden and
    *   base themes have to be installed.
    */
-  function testUpdateShowDisabledThemes() {
+  public function testUpdateShowDisabledThemes() {
     $update_settings = $this->config('update.settings');
     // Make sure all the update_test_* themes are disabled.
     $extension_config = $this->config('core.extension');
@@ -238,38 +238,38 @@ class UpdateContribTest extends UpdateTestBase {
     $extension_config->save();
 
     // Define the initial state for core and the test contrib themes.
-    $system_info = array(
+    $system_info = [
       // We want core to be version 8.0.0.
-      '#all' => array(
+      '#all' => [
         'version' => '8.0.0',
-      ),
+      ],
       // The update_test_basetheme should be visible and up to date.
-      'update_test_basetheme' => array(
+      'update_test_basetheme' => [
         'project' => 'update_test_basetheme',
         'version' => '8.x-1.1',
         'hidden' => FALSE,
-      ),
+      ],
       // The update_test_subtheme should be visible and up to date.
-      'update_test_subtheme' => array(
+      'update_test_subtheme' => [
         'project' => 'update_test_subtheme',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
-    );
+      ],
+    ];
     // When there are contributed modules in the site's file system, the
     // total number of attempts made in the test may exceed the default value
     // of update_max_fetch_attempts. Therefore this variable is set very high
     // to avoid test failures in those cases.
     $update_settings->set('fetch.max_attempts', 99999)->save();
     $this->config('update_test.settings')->set('system_info', $system_info)->save();
-    $xml_mapping = array(
+    $xml_mapping = [
       'drupal' => '0.0',
       'update_test_subtheme' => '1_0',
       'update_test_basetheme' => '1_1-sec',
-    );
+    ];
     $base_theme_project_link = \Drupal::l(t('Update test base theme'), Url::fromUri('http://example.com/project/update_test_basetheme'));
     $sub_theme_project_link = \Drupal::l(t('Update test subtheme'), Url::fromUri('http://example.com/project/update_test_subtheme'));
-    foreach (array(TRUE, FALSE) as $check_disabled) {
+    foreach ([TRUE, FALSE] as $check_disabled) {
       $update_settings->set('check.disabled_extensions', $check_disabled)->save();
       $this->refreshUpdateStatus($xml_mapping);
       // In neither case should we see the "Themes" heading for installed
@@ -291,25 +291,25 @@ class UpdateContribTest extends UpdateTestBase {
   /**
    * Tests updates with a hidden base theme.
    */
-  function testUpdateHiddenBaseTheme() {
+  public function testUpdateHiddenBaseTheme() {
     module_load_include('compare.inc', 'update');
 
     // Install the subtheme.
-    \Drupal::service('theme_handler')->install(array('update_test_subtheme'));
+    \Drupal::service('theme_handler')->install(['update_test_subtheme']);
 
     // Add a project and initial state for base theme and subtheme.
-    $system_info = array(
+    $system_info = [
       // Hide the update_test_basetheme.
-      'update_test_basetheme' => array(
+      'update_test_basetheme' => [
         'project' => 'update_test_basetheme',
         'hidden' => TRUE,
-      ),
+      ],
       // Show the update_test_subtheme.
-      'update_test_subtheme' => array(
+      'update_test_subtheme' => [
         'project' => 'update_test_subtheme',
         'hidden' => FALSE,
-      ),
-    );
+      ],
+    ];
     $this->config('update_test.settings')->set('system_info', $system_info)->save();
     $projects = \Drupal::service('update.manager')->getProjects();
     $theme_data = \Drupal::service('theme_handler')->rebuildThemeData();
@@ -322,38 +322,38 @@ class UpdateContribTest extends UpdateTestBase {
   /**
    * Makes sure that if we fetch from a broken URL, sane things happen.
    */
-  function testUpdateBrokenFetchURL() {
-    $system_info = array(
-      '#all' => array(
+  public function testUpdateBrokenFetchURL() {
+    $system_info = [
+      '#all' => [
         'version' => '8.0.0',
-      ),
-      'aaa_update_test' => array(
+      ],
+      'aaa_update_test' => [
         'project' => 'aaa_update_test',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
-      'bbb_update_test' => array(
+      ],
+      'bbb_update_test' => [
         'project' => 'bbb_update_test',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
-      'ccc_update_test' => array(
+      ],
+      'ccc_update_test' => [
         'project' => 'ccc_update_test',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
-    );
+      ],
+    ];
     $this->config('update_test.settings')->set('system_info', $system_info)->save();
 
     // Ensure that the update information is correct before testing.
     $this->drupalGet('admin/reports/updates');
 
-    $xml_mapping = array(
+    $xml_mapping = [
       'drupal' => '0.0',
       'aaa_update_test' => '1_0',
       'bbb_update_test' => 'does-not-exist',
       'ccc_update_test' => '1_0',
-    );
+    ];
     $this->refreshUpdateStatus($xml_mapping);
 
     $this->assertText(t('Up to date'));
@@ -386,33 +386,33 @@ class UpdateContribTest extends UpdateTestBase {
    * hook_update_status_alter() to try to mark this as missing a security
    * update, then assert if we see the appropriate warnings on the right pages.
    */
-  function testHookUpdateStatusAlter() {
+  public function testHookUpdateStatusAlter() {
     $update_test_config = $this->config('update_test.settings');
-    $update_admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer software updates'));
+    $update_admin_user = $this->drupalCreateUser(['administer site configuration', 'administer software updates']);
     $this->drupalLogin($update_admin_user);
 
-    $system_info = array(
-      '#all' => array(
+    $system_info = [
+      '#all' => [
         'version' => '8.0.0',
-      ),
-      'aaa_update_test' => array(
+      ],
+      'aaa_update_test' => [
         'project' => 'aaa_update_test',
         'version' => '8.x-1.0',
         'hidden' => FALSE,
-      ),
-    );
+      ],
+    ];
     $update_test_config->set('system_info', $system_info)->save();
-    $update_status = array(
-      'aaa_update_test' => array(
+    $update_status = [
+      'aaa_update_test' => [
         'status' => UPDATE_NOT_SECURE,
-      ),
-    );
+      ],
+    ];
     $update_test_config->set('update_status', $update_status)->save();
     $this->refreshUpdateStatus(
-      array(
+      [
         'drupal' => '0.0',
         'aaa_update_test' => '1_0',
-      )
+      ]
     );
     $this->drupalGet('admin/reports/updates');
     $this->assertRaw('<h3>' . t('Modules') . '</h3>');
@@ -421,7 +421,7 @@ class UpdateContribTest extends UpdateTestBase {
 
     // Visit the reports page again without the altering and make sure the
     // status is back to normal.
-    $update_test_config->set('update_status', array())->save();
+    $update_test_config->set('update_status', [])->save();
     $this->drupalGet('admin/reports/updates');
     $this->assertRaw('<h3>' . t('Modules') . '</h3>');
     $this->assertNoText(t('Security update required!'));
@@ -433,7 +433,7 @@ class UpdateContribTest extends UpdateTestBase {
     $this->assertText(t('Security update'));
 
     // Turn the altering back off and visit the Update manager UI.
-    $update_test_config->set('update_status', array())->save();
+    $update_test_config->set('update_status', [])->save();
     $this->drupalGet('admin/modules/update');
     $this->assertNoText(t('Security update'));
   }
diff --git a/web/core/modules/update/src/Tests/UpdateCoreTest.php b/web/core/modules/update/src/Tests/UpdateCoreTest.php
index baecde88c..b6287c7c0 100644
--- a/web/core/modules/update/src/Tests/UpdateCoreTest.php
+++ b/web/core/modules/update/src/Tests/UpdateCoreTest.php
@@ -21,7 +21,7 @@ class UpdateCoreTest extends UpdateTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer modules', 'administer themes'));
+    $admin_user = $this->drupalCreateUser(['administer site configuration', 'administer modules', 'administer themes']);
     $this->drupalLogin($admin_user);
     $this->drupalPlaceBlock('local_actions_block');
   }
@@ -33,23 +33,23 @@ class UpdateCoreTest extends UpdateTestBase {
    *   The version.
    */
   protected function setSystemInfo($version) {
-    $setting = array(
-      '#all' => array(
+    $setting = [
+      '#all' => [
         'version' => $version,
-      ),
-    );
+      ],
+    ];
     $this->config('update_test.settings')->set('system_info', $setting)->save();
   }
 
   /**
    * Tests the Update Manager module when no updates are available.
    */
-  function testNoUpdatesAvailable() {
-    foreach (array(0, 1) as $minor_version) {
-      foreach (array(0, 1) as $patch_version) {
-        foreach (array('-alpha1', '-beta1', '') as $extra_version) {
+  public function testNoUpdatesAvailable() {
+    foreach ([0, 1] as $minor_version) {
+      foreach ([0, 1] as $patch_version) {
+        foreach (['-alpha1', '-beta1', ''] as $extra_version) {
           $this->setSystemInfo("8.$minor_version.$patch_version" . $extra_version);
-          $this->refreshUpdateStatus(array('drupal' => "$minor_version.$patch_version" . $extra_version));
+          $this->refreshUpdateStatus(['drupal' => "$minor_version.$patch_version" . $extra_version]);
           $this->standardTests();
           $this->assertText(t('Up to date'));
           $this->assertNoText(t('Update available'));
@@ -63,16 +63,16 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Tests the Update Manager module when one normal update is available.
    */
-  function testNormalUpdateAvailable() {
+  public function testNormalUpdateAvailable() {
     $this->setSystemInfo('8.0.0');
 
     // Ensure that the update check requires a token.
     $this->drupalGet('admin/reports/updates/check');
     $this->assertResponse(403, 'Accessing admin/reports/updates/check without a CSRF token results in access denied.');
 
-    foreach (array(0, 1) as $minor_version) {
-      foreach (array('-alpha1', '-beta1', '') as $extra_version) {
-        $this->refreshUpdateStatus(array('drupal' => "$minor_version.1" . $extra_version));
+    foreach ([0, 1] as $minor_version) {
+      foreach (['-alpha1', '-beta1', ''] as $extra_version) {
+        $this->refreshUpdateStatus(['drupal' => "$minor_version.1" . $extra_version]);
         $this->standardTests();
         $this->drupalGet('admin/reports/updates');
         $this->clickLink(t('Check manually'));
@@ -130,12 +130,12 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Tests the Update Manager module when a major update is available.
    */
-  function testMajorUpdateAvailable() {
-    foreach (array(0, 1) as $minor_version) {
-      foreach (array(0, 1) as $patch_version) {
-        foreach (array('-alpha1', '-beta1', '') as $extra_version) {
+  public function testMajorUpdateAvailable() {
+    foreach ([0, 1] as $minor_version) {
+      foreach ([0, 1] as $patch_version) {
+        foreach (['-alpha1', '-beta1', ''] as $extra_version) {
           $this->setSystemInfo("8.$minor_version.$patch_version" . $extra_version);
-          $this->refreshUpdateStatus(array('drupal' => '9'));
+          $this->refreshUpdateStatus(['drupal' => '9']);
           $this->standardTests();
           $this->drupalGet('admin/reports/updates');
           $this->clickLink(t('Check manually'));
@@ -156,10 +156,10 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Tests the Update Manager module when a security update is available.
    */
-  function testSecurityUpdateAvailable() {
-    foreach (array(0, 1) as $minor_version) {
+  public function testSecurityUpdateAvailable() {
+    foreach ([0, 1] as $minor_version) {
       $this->setSystemInfo("8.$minor_version.0");
-      $this->refreshUpdateStatus(array('drupal' => "$minor_version.2-sec"));
+      $this->refreshUpdateStatus(['drupal' => "$minor_version.2-sec"]);
       $this->standardTests();
       $this->assertNoText(t('Up to date'));
       $this->assertNoText(t('Update available'));
@@ -174,20 +174,20 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Ensures proper results where there are date mismatches among modules.
    */
-  function testDatestampMismatch() {
-    $system_info = array(
-      '#all' => array(
+  public function testDatestampMismatch() {
+    $system_info = [
+      '#all' => [
         // We need to think we're running a -dev snapshot to see dates.
         'version' => '8.1.0-dev',
         'datestamp' => time(),
-      ),
-      'block' => array(
+      ],
+      'block' => [
         // This is 2001-09-09 01:46:40 GMT, so test for "2001-Sep-".
         'datestamp' => '1000000000',
-      ),
-    );
+      ],
+    ];
     $this->config('update_test.settings')->set('system_info', $system_info)->save();
-    $this->refreshUpdateStatus(array('drupal' => 'dev'));
+    $this->refreshUpdateStatus(['drupal' => 'dev']);
     $this->assertNoText(t('2001-Sep-'));
     $this->assertText(t('Up to date'));
     $this->assertNoText(t('Update available'));
@@ -197,13 +197,13 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Checks that running cron updates the list of available updates.
    */
-  function testModulePageRunCron() {
+  public function testModulePageRunCron() {
     $this->setSystemInfo('8.0.0');
     $this->config('update.settings')
       ->set('fetch.url', Url::fromRoute('update_test.update_test')->setAbsolute()->toString())
       ->save();
     $this->config('update_test.settings')
-      ->set('xml_map', array('drupal' => '0.0'))
+      ->set('xml_map', ['drupal' => '0.0'])
       ->save();
 
     $this->cronRun();
@@ -214,14 +214,14 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Checks the messages at admin/modules when the site is up to date.
    */
-  function testModulePageUpToDate() {
+  public function testModulePageUpToDate() {
     $this->setSystemInfo('8.0.0');
     // Instead of using refreshUpdateStatus(), set these manually.
     $this->config('update.settings')
       ->set('fetch.url', Url::fromRoute('update_test.update_test')->setAbsolute()->toString())
       ->save();
     $this->config('update_test.settings')
-      ->set('xml_map', array('drupal' => '0.0'))
+      ->set('xml_map', ['drupal' => '0.0'])
       ->save();
 
     $this->drupalGet('admin/reports/updates');
@@ -235,14 +235,14 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Checks the messages at admin/modules when an update is missing.
    */
-  function testModulePageRegularUpdate() {
+  public function testModulePageRegularUpdate() {
     $this->setSystemInfo('8.0.0');
     // Instead of using refreshUpdateStatus(), set these manually.
     $this->config('update.settings')
       ->set('fetch.url', Url::fromRoute('update_test.update_test')->setAbsolute()->toString())
       ->save();
     $this->config('update_test.settings')
-      ->set('xml_map', array('drupal' => '0.1'))
+      ->set('xml_map', ['drupal' => '0.1'])
       ->save();
 
     $this->drupalGet('admin/reports/updates');
@@ -256,14 +256,14 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Checks the messages at admin/modules when a security update is missing.
    */
-  function testModulePageSecurityUpdate() {
+  public function testModulePageSecurityUpdate() {
     $this->setSystemInfo('8.0.0');
     // Instead of using refreshUpdateStatus(), set these manually.
     $this->config('update.settings')
       ->set('fetch.url', Url::fromRoute('update_test.update_test')->setAbsolute()->toString())
       ->save();
     $this->config('update_test.settings')
-      ->set('xml_map', array('drupal' => '0.2-sec'))
+      ->set('xml_map', ['drupal' => '0.2-sec'])
       ->save();
 
     $this->drupalGet('admin/reports/updates');
@@ -295,8 +295,8 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Tests the Update Manager module when the update server returns 503 errors.
    */
-  function testServiceUnavailable() {
-    $this->refreshUpdateStatus(array(), '503-error');
+  public function testServiceUnavailable() {
+    $this->refreshUpdateStatus([], '503-error');
     // Ensure that no "Warning: SimpleXMLElement..." parse errors are found.
     $this->assertNoText('SimpleXMLElement');
     $this->assertUniqueText(t('Failed to get available update data for one project.'));
@@ -305,13 +305,13 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Tests that exactly one fetch task per project is created and not more.
    */
-  function testFetchTasks() {
-    $projecta = array(
+  public function testFetchTasks() {
+    $projecta = [
       'name' => 'aaa_update_test',
-    );
-    $projectb = array(
+    ];
+    $projectb = [
       'name' => 'bbb_update_test',
-    );
+    ];
     $queue = \Drupal::queue('update_fetch_tasks');
     $this->assertEqual($queue->numberOfItems(), 0, 'Queue is empty');
     update_create_fetch_task($projecta);
@@ -331,14 +331,14 @@ class UpdateCoreTest extends UpdateTestBase {
   /**
    * Checks language module in core package at admin/reports/updates.
    */
-  function testLanguageModuleUpdate() {
+  public function testLanguageModuleUpdate() {
     $this->setSystemInfo('8.0.0');
     // Instead of using refreshUpdateStatus(), set these manually.
     $this->config('update.settings')
       ->set('fetch.url', Url::fromRoute('update_test.update_test')->setAbsolute()->toString())
       ->save();
     $this->config('update_test.settings')
-      ->set('xml_map', array('drupal' => '0.1'))
+      ->set('xml_map', ['drupal' => '0.1'])
       ->save();
 
     $this->drupalGet('admin/reports/updates');
@@ -349,7 +349,7 @@ class UpdateCoreTest extends UpdateTestBase {
    * Ensures that the local actions appear.
    */
   public function testLocalActions() {
-    $admin_user = $this->drupalCreateUser(array('administer site configuration', 'administer modules', 'administer software updates', 'administer themes'));
+    $admin_user = $this->drupalCreateUser(['administer site configuration', 'administer modules', 'administer software updates', 'administer themes']);
     $this->drupalLogin($admin_user);
 
     $this->drupalGet('admin/modules');
diff --git a/web/core/modules/update/src/Tests/UpdateDeleteFileIfStaleTest.php b/web/core/modules/update/src/Tests/UpdateDeleteFileIfStaleTest.php
index 63c2889a5..99499d77c 100644
--- a/web/core/modules/update/src/Tests/UpdateDeleteFileIfStaleTest.php
+++ b/web/core/modules/update/src/Tests/UpdateDeleteFileIfStaleTest.php
@@ -14,7 +14,7 @@ class UpdateDeleteFileIfStaleTest extends UpdateTestBase {
    *
    * @var array
    */
-  public static $modules = array('update');
+  public static $modules = ['update'];
 
   /**
    * {@inheritdoc}
@@ -26,7 +26,7 @@ class UpdateDeleteFileIfStaleTest extends UpdateTestBase {
   /**
    * Tests the deletion of stale files.
    */
-  function testUpdateDeleteFileIfStale() {
+  public function testUpdateDeleteFileIfStale() {
     $file_name = file_unmanaged_save_data($this->randomMachineName());
     $this->assertNotNull($file_name);
 
diff --git a/web/core/modules/update/src/Tests/UpdateTestBase.php b/web/core/modules/update/src/Tests/UpdateTestBase.php
index 9cb3c20fc..fc39d1a3c 100644
--- a/web/core/modules/update/src/Tests/UpdateTestBase.php
+++ b/web/core/modules/update/src/Tests/UpdateTestBase.php
@@ -63,7 +63,7 @@ abstract class UpdateTestBase extends WebTestBase {
   protected function refreshUpdateStatus($xml_map, $url = 'update-test') {
     // Tell the Update Manager module to fetch from the URL provided by
     // update_test module.
-    $this->config('update.settings')->set('fetch.url', Url::fromUri('base:' . $url, array('absolute' => TRUE))->toString())->save();
+    $this->config('update.settings')->set('fetch.url', Url::fromUri('base:' . $url, ['absolute' => TRUE])->toString())->save();
     // Save the map for UpdateTestController::updateTest() to use.
     $this->config('update_test.settings')->set('xml_map', $xml_map)->save();
     // Manually check the update status.
diff --git a/web/core/modules/update/src/Tests/UpdateUploadTest.php b/web/core/modules/update/src/Tests/UpdateUploadTest.php
index 39b6944b9..80d3f15d2 100644
--- a/web/core/modules/update/src/Tests/UpdateUploadTest.php
+++ b/web/core/modules/update/src/Tests/UpdateUploadTest.php
@@ -18,11 +18,11 @@ class UpdateUploadTest extends UpdateTestBase {
    *
    * @var array
    */
-  public static $modules = array('update', 'update_test');
+  public static $modules = ['update', 'update_test'];
 
   protected function setUp() {
     parent::setUp();
-    $admin_user = $this->drupalCreateUser(array('administer modules', 'administer software updates', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer modules', 'administer software updates', 'administer site configuration']);
     $this->drupalLogin($admin_user);
   }
 
@@ -39,23 +39,23 @@ class UpdateUploadTest extends UpdateTestBase {
     // emits a notice in strict mode.
     $imageTestFiles = $this->drupalGetTestFiles('image');
     $invalidArchiveFile = reset($imageTestFiles);
-    $edit = array(
+    $edit = [
       'files[project_upload]' => $invalidArchiveFile->uri,
-    );
+    ];
     // This also checks that the correct archive extensions are allowed.
     $this->drupalPostForm('admin/modules/install', $edit, t('Install'));
-    $this->assertText(t('Only files with the following extensions are allowed: @archive_extensions.', array('@archive_extensions' => archiver_get_extensions())), 'Only valid archives can be uploaded.');
+    $this->assertText(t('Only files with the following extensions are allowed: @archive_extensions.', ['@archive_extensions' => archiver_get_extensions()]), 'Only valid archives can be uploaded.');
     $this->assertUrl('admin/modules/install');
 
     // Check to ensure an existing module can't be reinstalled. Also checks that
     // the archive was extracted since we can't know if the module is already
     // installed until after extraction.
     $validArchiveFile = __DIR__ . '/../../tests/aaa_update_test.tar.gz';
-    $edit = array(
+    $edit = [
       'files[project_upload]' => $validArchiveFile,
-    );
+    ];
     $this->drupalPostForm('admin/modules/install', $edit, t('Install'));
-    $this->assertText(t('@module_name is already installed.', array('@module_name' => 'AAA Update test')), 'Existing module was extracted and not reinstalled.');
+    $this->assertText(t('@module_name is already installed.', ['@module_name' => 'AAA Update test']), 'Existing module was extracted and not reinstalled.');
     $this->assertUrl('admin/modules/install');
 
     // Ensure that a new module can be extracted and installed.
@@ -64,16 +64,16 @@ class UpdateUploadTest extends UpdateTestBase {
     $installedInfoFilePath = $this->container->get('update.root') . '/' . $moduleUpdater::getRootDirectoryRelativePath() . '/update_test_new_module/update_test_new_module.info.yml';
     $this->assertFalse(file_exists($installedInfoFilePath), 'The new module does not exist in the filesystem before it is installed with the Update Manager.');
     $validArchiveFile = __DIR__ . '/../../tests/update_test_new_module/8.x-1.0/update_test_new_module.tar.gz';
-    $edit = array(
+    $edit = [
       'files[project_upload]' => $validArchiveFile,
-    );
+    ];
     $this->drupalPostForm('admin/modules/install', $edit, t('Install'));
     // Check that submitting the form takes the user to authorize.php.
     $this->assertUrl('core/authorize.php');
     $this->assertTitle('Update manager | Drupal');
     // Check for a success message on the page, and check that the installed
     // module now exists in the expected place in the filesystem.
-    $this->assertRaw(t('Installed %project_name successfully', array('%project_name' => 'update_test_new_module')));
+    $this->assertRaw(t('Installed %project_name successfully', ['%project_name' => 'update_test_new_module']));
     $this->assertTrue(file_exists($installedInfoFilePath), 'The new module exists in the filesystem after it is installed with the Update Manager.');
     // Ensure the links are relative to the site root and not
     // core/authorize.php.
@@ -98,27 +98,27 @@ class UpdateUploadTest extends UpdateTestBase {
     $this->assertEqual($info['version'], '8.x-1.0');
 
     // Enable the module.
-    $this->drupalPostForm('admin/modules', array('modules[Testing][update_test_new_module][enable]' => TRUE), t('Install'));
+    $this->drupalPostForm('admin/modules', ['modules[update_test_new_module][enable]' => TRUE], t('Install'));
 
     // Define the update XML such that the new module downloaded above needs an
     // update from 8.x-1.0 to 8.x-1.1.
     $update_test_config = $this->config('update_test.settings');
-    $system_info = array(
-      'update_test_new_module' => array(
+    $system_info = [
+      'update_test_new_module' => [
         'project' => 'update_test_new_module',
-      ),
-    );
+      ],
+    ];
     $update_test_config->set('system_info', $system_info)->save();
-    $xml_mapping = array(
+    $xml_mapping = [
       'update_test_new_module' => '1_1',
-    );
+    ];
     $this->refreshUpdateStatus($xml_mapping);
 
     // Run the updates for the new module.
-    $this->drupalPostForm('admin/reports/updates/update', array('projects[update_test_new_module]' => TRUE), t('Download these updates'));
-    $this->drupalPostForm(NULL, array('maintenance_mode' => FALSE), t('Continue'));
+    $this->drupalPostForm('admin/reports/updates/update', ['projects[update_test_new_module]' => TRUE], t('Download these updates'));
+    $this->drupalPostForm(NULL, ['maintenance_mode' => FALSE], t('Continue'));
     $this->assertText(t('Update was completed successfully.'));
-    $this->assertRaw(t('Installed %project_name successfully', array('%project_name' => 'update_test_new_module')));
+    $this->assertRaw(t('Installed %project_name successfully', ['%project_name' => 'update_test_new_module']));
 
     // Parse the info file again to check that the module has been updated to
     // 8.x-1.1.
@@ -129,7 +129,7 @@ class UpdateUploadTest extends UpdateTestBase {
   /**
    * Ensures that archiver extensions are properly merged in the UI.
    */
-  function testFileNameExtensionMerging() {
+  public function testFileNameExtensionMerging() {
     $this->drupalGet('admin/modules/install');
     // Make sure the bogus extension supported by update_test.module is there.
     $this->assertPattern('/file extensions are supported:.*update-test-extension/', "Found 'update-test-extension' extension.");
@@ -140,15 +140,15 @@ class UpdateUploadTest extends UpdateTestBase {
   /**
    * Checks the messages on update manager pages when missing a security update.
    */
-  function testUpdateManagerCoreSecurityUpdateMessages() {
-    $setting = array(
-      '#all' => array(
+  public function testUpdateManagerCoreSecurityUpdateMessages() {
+    $setting = [
+      '#all' => [
         'version' => '8.0.0',
-      ),
-    );
+      ],
+    ];
     $this->config('update_test.settings')
       ->set('system_info', $setting)
-      ->set('xml_map', array('drupal' => '0.2-sec'))
+      ->set('xml_map', ['drupal' => '0.2-sec'])
       ->save();
     $this->config('update.settings')
       ->set('fetch.url', Url::fromRoute('update_test.update_test')->setAbsolute()->toString())
diff --git a/web/core/modules/update/src/UpdateFetcher.php b/web/core/modules/update/src/UpdateFetcher.php
index 29d5582ee..2b03c9c10 100644
--- a/web/core/modules/update/src/UpdateFetcher.php
+++ b/web/core/modules/update/src/UpdateFetcher.php
@@ -62,7 +62,7 @@ class UpdateFetcher implements UpdateFetcherInterface {
     $data = '';
     try {
       $data = (string) $this->httpClient
-        ->get($url, array('headers' => array('Accept' => 'text/xml')))
+        ->get($url, ['headers' => ['Accept' => 'text/xml']])
         ->getBody();
     }
     catch (RequestException $exception) {
diff --git a/web/core/modules/update/src/UpdateFetcherInterface.php b/web/core/modules/update/src/UpdateFetcherInterface.php
index 8d8f2a9f2..e9f441036 100644
--- a/web/core/modules/update/src/UpdateFetcherInterface.php
+++ b/web/core/modules/update/src/UpdateFetcherInterface.php
@@ -7,6 +7,26 @@ namespace Drupal\update;
  */
 interface UpdateFetcherInterface {
 
+  /**
+   * Project's status cannot be checked.
+   */
+  const NOT_CHECKED = -1;
+
+  /**
+   * No available update data was found for project.
+   */
+  const UNKNOWN = -2;
+
+  /**
+   * There was a failure fetching available update data for this project.
+   */
+  const NOT_FETCHED = -3;
+
+  /**
+   * We need to (re)fetch available update data for this project.
+   */
+  const FETCH_PENDING = -4;
+
   /**
    * Returns the base of the URL to fetch available update data for a project.
    *
diff --git a/web/core/modules/update/src/UpdateManager.php b/web/core/modules/update/src/UpdateManager.php
index 52a7eb28c..07416915a 100644
--- a/web/core/modules/update/src/UpdateManager.php
+++ b/web/core/modules/update/src/UpdateManager.php
@@ -91,7 +91,7 @@ class UpdateManager implements UpdateManagerInterface {
     $this->keyValueStore = $key_value_expirable_factory->get('update');
     $this->themeHandler = $theme_handler;
     $this->availableReleasesTempStore = $key_value_expirable_factory->get('update_available_releases');
-    $this->projects = array();
+    $this->projects = [];
   }
 
   /**
@@ -151,11 +151,11 @@ class UpdateManager implements UpdateManagerInterface {
    * {@inheritdoc}
    */
   public function projectStorage($key) {
-    $projects = array();
+    $projects = [];
 
     // On certain paths, we should clear the data and recompute the projects for
     // update status of the site to avoid presenting stale information.
-    $route_names = array(
+    $route_names = [
       'update.theme_update',
       'system.modules_list',
       'system.theme_install',
@@ -169,12 +169,12 @@ class UpdateManager implements UpdateManagerInterface {
       'update.manual_status',
       'update.confirmation_page',
       'system.themes_page',
-    );
+    ];
     if (in_array(\Drupal::routeMatch()->getRouteName(), $route_names)) {
       $this->keyValueStore->delete($key);
     }
     else {
-      $projects = $this->keyValueStore->get($key, array());
+      $projects = $this->keyValueStore->get($key, []);
     }
     return $projects;
   }
@@ -198,10 +198,10 @@ class UpdateManager implements UpdateManagerInterface {
       if ($item = $this->updateProcessor->claimQueueItem()) {
         if ($this->updateProcessor->processFetchTask($item->data)) {
           $context['results']['updated']++;
-          $context['message'] = $this->t('Checked available update data for %title.', array('%title' => $item->data['info']['name']));
+          $context['message'] = $this->t('Checked available update data for %title.', ['%title' => $item->data['info']['name']]);
         }
         else {
-          $context['message'] = $this->t('Failed to check available update data for %title.', array('%title' => $item->data['info']['name']));
+          $context['message'] = $this->t('Failed to check available update data for %title.', ['%title' => $item->data['info']['name']]);
           $context['results']['failures']++;
         }
         $context['sandbox']['progress']++;
diff --git a/web/core/modules/update/src/UpdateManagerInterface.php b/web/core/modules/update/src/UpdateManagerInterface.php
index d3ea88f49..036138d4e 100644
--- a/web/core/modules/update/src/UpdateManagerInterface.php
+++ b/web/core/modules/update/src/UpdateManagerInterface.php
@@ -7,6 +7,31 @@ namespace Drupal\update;
  */
 interface UpdateManagerInterface {
 
+  /**
+   * Project is missing security update(s).
+   */
+  const NOT_SECURE = 1;
+
+  /**
+   * Current release has been unpublished and is no longer available.
+   */
+  const REVOKED = 2;
+
+  /**
+   * Current release is no longer supported by the project maintainer.
+   */
+  const NOT_SUPPORTED = 3;
+
+  /**
+   * Project has a new release available, but it is not a security release.
+   */
+  const NOT_CURRENT = 4;
+
+  /**
+   * Project is up to date.
+   */
+  const CURRENT = 5;
+
   /**
    * Fetches an array of installed and enabled projects.
    *
diff --git a/web/core/modules/update/src/UpdateProcessor.php b/web/core/modules/update/src/UpdateProcessor.php
index 75e3241c0..25dfc7a00 100644
--- a/web/core/modules/update/src/UpdateProcessor.php
+++ b/web/core/modules/update/src/UpdateProcessor.php
@@ -104,8 +104,8 @@ class UpdateProcessor implements UpdateProcessorInterface {
     $this->availableReleasesTempStore = $key_value_expirable_factory->get('update_available_releases');
     $this->stateStore = $state_store;
     $this->privateKey = $private_key;
-    $this->fetchTasks = array();
-    $this->failed = array();
+    $this->fetchTasks = [];
+    $this->failed = [];
   }
 
   /**
@@ -151,7 +151,7 @@ class UpdateProcessor implements UpdateProcessorInterface {
     $max_fetch_attempts = $this->updateSettings->get('fetch.max_attempts');
 
     $success = FALSE;
-    $available = array();
+    $available = [];
     $site_key = Crypt::hmacBase64($base_url, $this->privateKey->get());
     $fetch_url_base = $this->updateFetcher->getFetchBaseUrl($project);
     $project_name = $project['name'];
@@ -219,23 +219,23 @@ class UpdateProcessor implements UpdateProcessorInterface {
     if (!isset($xml->short_name)) {
       return NULL;
     }
-    $data = array();
+    $data = [];
     foreach ($xml as $k => $v) {
       $data[$k] = (string) $v;
     }
-    $data['releases'] = array();
+    $data['releases'] = [];
     if (isset($xml->releases)) {
       foreach ($xml->releases->children() as $release) {
         $version = (string) $release->version;
-        $data['releases'][$version] = array();
+        $data['releases'][$version] = [];
         foreach ($release->children() as $k => $v) {
           $data['releases'][$version][$k] = (string) $v;
         }
-        $data['releases'][$version]['terms'] = array();
+        $data['releases'][$version]['terms'] = [];
         if ($release->terms) {
           foreach ($release->terms->children() as $term) {
             if (!isset($data['releases'][$version]['terms'][(string) $term->name])) {
-              $data['releases'][$version]['terms'][(string) $term->name] = array();
+              $data['releases'][$version]['terms'][(string) $term->name] = [];
             }
             $data['releases'][$version]['terms'][(string) $term->name][] = (string) $term->value;
           }
diff --git a/web/core/modules/update/src/UpdateSettingsForm.php b/web/core/modules/update/src/UpdateSettingsForm.php
index d830de57f..1860269d6 100644
--- a/web/core/modules/update/src/UpdateSettingsForm.php
+++ b/web/core/modules/update/src/UpdateSettingsForm.php
@@ -59,42 +59,42 @@ class UpdateSettingsForm extends ConfigFormBase implements ContainerInjectionInt
   public function buildForm(array $form, FormStateInterface $form_state) {
     $config = $this->config('update.settings');
 
-    $form['update_check_frequency'] = array(
+    $form['update_check_frequency'] = [
       '#type' => 'radios',
       '#title' => t('Check for updates'),
       '#default_value' => $config->get('check.interval_days'),
-      '#options' => array(
+      '#options' => [
         '1' => t('Daily'),
         '7' => t('Weekly'),
-      ),
+      ],
       '#description' => t('Select how frequently you want to automatically check for new releases of your currently installed modules and themes.'),
-    );
+    ];
 
-    $form['update_check_disabled'] = array(
+    $form['update_check_disabled'] = [
       '#type' => 'checkbox',
       '#title' => t('Check for updates of uninstalled modules and themes'),
       '#default_value' => $config->get('check.disabled_extensions'),
-    );
+    ];
 
     $notification_emails = $config->get('notification.emails');
-    $form['update_notify_emails'] = array(
+    $form['update_notify_emails'] = [
       '#type' => 'textarea',
       '#title' => t('Email addresses to notify when updates are available'),
       '#rows' => 4,
       '#default_value' => implode("\n", $notification_emails),
       '#description' => t('Whenever your site checks for available updates and finds new releases, it can notify a list of users via email. Put each address on a separate line. If blank, no emails will be sent.'),
-    );
+    ];
 
-    $form['update_notification_threshold'] = array(
+    $form['update_notification_threshold'] = [
       '#type' => 'radios',
       '#title' => t('Email notification threshold'),
       '#default_value' => $config->get('notification.threshold'),
-      '#options' => array(
+      '#options' => [
         'all' => t('All newer versions'),
         'security' => t('Only security updates'),
-      ),
-      '#description' => t('You can choose to send email only if a security update is available, or to be notified about all newer versions. If there are updates available of Drupal core or any of your installed modules and themes, your site will always print a message on the <a href=":status_report">status report</a> page, and will also display an error message on administration pages if there is a security update.', array(':status_report' => $this->url('system.status')))
-    );
+      ],
+      '#description' => t('You can choose to send email only if a security update is available, or to be notified about all newer versions. If there are updates available of Drupal core or any of your installed modules and themes, your site will always print a message on the <a href=":status_report">status report</a> page, and will also display an error message on administration pages if there is a security update.', [':status_report' => $this->url('system.status')])
+    ];
 
     return parent::buildForm($form, $form_state);
   }
@@ -105,8 +105,8 @@ class UpdateSettingsForm extends ConfigFormBase implements ContainerInjectionInt
   public function validateForm(array &$form, FormStateInterface $form_state) {
     $form_state->set('notify_emails', []);
     if (!$form_state->isValueEmpty('update_notify_emails')) {
-      $valid = array();
-      $invalid = array();
+      $valid = [];
+      $invalid = [];
       foreach (explode("\n", trim($form_state->getValue('update_notify_emails'))) as $email) {
         $email = trim($email);
         if (!empty($email)) {
@@ -122,10 +122,10 @@ class UpdateSettingsForm extends ConfigFormBase implements ContainerInjectionInt
         $form_state->set('notify_emails', $valid);
       }
       elseif (count($invalid) == 1) {
-        $form_state->setErrorByName('update_notify_emails', $this->t('%email is not a valid email address.', array('%email' => reset($invalid))));
+        $form_state->setErrorByName('update_notify_emails', $this->t('%email is not a valid email address.', ['%email' => reset($invalid)]));
       }
       else {
-        $form_state->setErrorByName('update_notify_emails', $this->t('%emails are not valid email addresses.', array('%emails' => implode(', ', $invalid))));
+        $form_state->setErrorByName('update_notify_emails', $this->t('%emails are not valid email addresses.', ['%emails' => implode(', ', $invalid)]));
       }
     }
 
diff --git a/web/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php b/web/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php
index bdf6d3435..3ca46baa3 100644
--- a/web/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php
+++ b/web/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php
@@ -64,7 +64,7 @@ class UpdateTestController extends ControllerBase {
     }
 
     $file = __DIR__ . "/../../$project_name.$availability_scenario.xml";
-    $headers = array('Content-Type' => 'text/xml; charset=utf-8');
+    $headers = ['Content-Type' => 'text/xml; charset=utf-8'];
     if (!is_file($file)) {
       // Return an empty response.
       return new Response('', 200, $headers);
diff --git a/web/core/modules/update/tests/modules/update_test/src/Plugin/Archiver/UpdateTestArchiver.php b/web/core/modules/update/tests/modules/update_test/src/Plugin/Archiver/UpdateTestArchiver.php
index a9e499a7e..ffa4e46d7 100644
--- a/web/core/modules/update/tests/modules/update_test/src/Plugin/Archiver/UpdateTestArchiver.php
+++ b/web/core/modules/update/tests/modules/update_test/src/Plugin/Archiver/UpdateTestArchiver.php
@@ -32,7 +32,7 @@ class UpdateTestArchiver implements ArchiverInterface {
   /**
    * {@inheritdoc}
    */
-  public function extract($path, array $files = array()) {
+  public function extract($path, array $files = []) {
     return $this;
   }
 
@@ -40,7 +40,7 @@ class UpdateTestArchiver implements ArchiverInterface {
    * {@inheritdoc}
    */
   public function listContents() {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/update/tests/modules/update_test/src/TestFileTransferWithSettingsForm.php b/web/core/modules/update/tests/modules/update_test/src/TestFileTransferWithSettingsForm.php
index 5737c09cd..4afcade70 100644
--- a/web/core/modules/update/tests/modules/update_test/src/TestFileTransferWithSettingsForm.php
+++ b/web/core/modules/update/tests/modules/update_test/src/TestFileTransferWithSettingsForm.php
@@ -29,11 +29,11 @@ class TestFileTransferWithSettingsForm extends Local {
    * Returns a settings form with a text field to input a username.
    */
   public function getSettingsForm() {
-    $form = array();
-    $form['update_test_username'] = array(
+    $form = [];
+    $form['update_test_username'] = [
       '#type' => 'textfield',
       '#title' => t('Update Test Username'),
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/update/tests/modules/update_test/update_test.module b/web/core/modules/update/tests/modules/update_test/update_test.module
index 90b6cdc00..5dd207069 100644
--- a/web/core/modules/update/tests/modules/update_test/update_test.module
+++ b/web/core/modules/update/tests/modules/update_test/update_test.module
@@ -20,7 +20,7 @@ use Drupal\Core\Extension\Extension;
  */
 function update_test_system_info_alter(&$info, Extension $file) {
   $setting = \Drupal::config('update_test.settings')->get('system_info');
-  foreach (array('#all', $file->getName()) as $id) {
+  foreach (['#all', $file->getName()] as $id) {
     if (!empty($setting[$id])) {
       foreach ($setting[$id] as $key => $value) {
         $info[$key] = $value;
@@ -44,7 +44,7 @@ function update_test_update_status_alter(&$projects) {
   $setting = \Drupal::config('update_test.settings')->get('update_status');
   if (!empty($setting)) {
     foreach ($projects as $project_name => &$project) {
-      foreach (array('#all', $project_name) as $id) {
+      foreach (['#all', $project_name] as $id) {
         if (!empty($setting[$id])) {
           foreach ($setting[$id] as $key => $value) {
             $project[$key] = $value;
@@ -62,11 +62,11 @@ function update_test_filetransfer_info() {
   // Define a test file transfer method, to ensure that there will always be at
   // least one method available in the user interface (regardless of the
   // environment in which the update manager tests are run).
-  return array(
-    'system_test' => array(
+  return [
+    'system_test' => [
       'title' => t('Update Test FileTransfer'),
       'class' => 'Drupal\update_test\TestFileTransferWithSettingsForm',
       'weight' => -20,
-    ),
-  );
+    ],
+  ];
 }
diff --git a/web/core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php b/web/core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php
index a02220662..aa3563c60 100644
--- a/web/core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php
+++ b/web/core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\update\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
@@ -17,7 +17,7 @@ class MigrateUpdateConfigsTest extends MigrateDrupal6TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('update');
+  public static $modules = ['update'];
 
   /**
    * {@inheritdoc}
@@ -35,7 +35,7 @@ class MigrateUpdateConfigsTest extends MigrateDrupal6TestBase {
     $this->assertIdentical(2, $config->get('fetch.max_attempts'));
     $this->assertIdentical('http://updates.drupal.org/release-history', $config->get('fetch.url'));
     $this->assertIdentical('all', $config->get('notification.threshold'));
-    $this->assertIdentical(array(), $config->get('notification.emails'));
+    $this->assertIdentical([], $config->get('notification.emails'));
     $this->assertIdentical(7, $config->get('check.interval_days'));
     $this->assertConfigSchema(\Drupal::service('config.typed'), 'update.settings', $config->get());
   }
diff --git a/web/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php b/web/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php
index f57997fd6..113f006aa 100644
--- a/web/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php
+++ b/web/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
 class UpdateLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array('update' => 'core/modules/update');
+    $this->directoryList = ['update' => 'core/modules/update'];
     parent::setUp();
   }
 
@@ -22,20 +22,20 @@ class UpdateLocalTasksTest extends LocalTaskIntegrationTestBase {
    * @dataProvider getUpdateReportRoutes
    */
   public function testUpdateReportLocalTasks($route) {
-    $this->assertLocalTasks($route, array(
-      0 => array('update.status', 'update.settings', 'update.report_update'),
-    ));
+    $this->assertLocalTasks($route, [
+      0 => ['update.status', 'update.settings', 'update.report_update'],
+    ]);
   }
 
   /**
    * Provides a list of report routes to test.
    */
   public function getUpdateReportRoutes() {
-    return array(
-      array('update.status'),
-      array('update.settings'),
-      array('update.report_update'),
-    );
+    return [
+      ['update.status'],
+      ['update.settings'],
+      ['update.report_update'],
+    ];
   }
 
   /**
@@ -44,9 +44,9 @@ class UpdateLocalTasksTest extends LocalTaskIntegrationTestBase {
    * @dataProvider getUpdateModuleRoutes
    */
   public function testUpdateModuleLocalTasks($route) {
-    $this->assertLocalTasks($route, array(
-      0 => array('update.module_update'),
-    ));
+    $this->assertLocalTasks($route, [
+      0 => ['update.module_update'],
+    ]);
     ;
   }
 
@@ -54,9 +54,9 @@ class UpdateLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of module routes to test.
    */
   public function getUpdateModuleRoutes() {
-    return array(
-      array('update.module_update'),
-    );
+    return [
+      ['update.module_update'],
+    ];
   }
 
   /**
@@ -65,9 +65,9 @@ class UpdateLocalTasksTest extends LocalTaskIntegrationTestBase {
    * @dataProvider getUpdateThemeRoutes
    */
   public function testUpdateThemeLocalTasks($route) {
-    $this->assertLocalTasks($route, array(
-      0 => array('update.theme_update'),
-    ));
+    $this->assertLocalTasks($route, [
+      0 => ['update.theme_update'],
+    ]);
     ;
   }
 
@@ -75,9 +75,9 @@ class UpdateLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of theme routes to test.
    */
   public function getUpdateThemeRoutes() {
-    return array(
-      array('update.theme_update'),
-    );
+    return [
+      ['update.theme_update'],
+    ];
   }
 
 }
diff --git a/web/core/modules/update/tests/src/Unit/UpdateFetcherTest.php b/web/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
index c203f3b52..c3e447d1f 100644
--- a/web/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
+++ b/web/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
@@ -27,7 +27,7 @@ class UpdateFetcherTest extends UnitTestCase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $config_factory = $this->getConfigFactoryStub(array('update.settings' => array('fetch_url' => 'http://www.example.com')));
+    $config_factory = $this->getConfigFactoryStub(['update.settings' => ['fetch_url' => 'http://www.example.com']]);
     $http_client_mock = $this->getMock('\GuzzleHttp\ClientInterface');
     $this->updateFetcher = new UpdateFetcher($config_factory, $http_client_mock);
   }
@@ -62,25 +62,25 @@ class UpdateFetcherTest extends UnitTestCase {
    *   - 'expected' - The expected url from UpdateFetcher::buildFetchUrl().
    */
   public function providerTestUpdateBuildFetchUrl() {
-    $data = array();
+    $data = [];
 
     // First test that we didn't break the trivial case.
     $project['name'] = 'update_test';
     $project['project_type'] = '';
     $project['info']['version'] = '';
     $project['info']['project status url'] = 'http://www.example.com';
-    $project['includes'] = array('module1' => 'Module 1', 'module2' => 'Module 2');
+    $project['includes'] = ['module1' => 'Module 1', 'module2' => 'Module 2'];
     $site_key = '';
     $expected = 'http://www.example.com/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY;
 
-    $data[] = array($project, $site_key, $expected);
+    $data[] = [$project, $site_key, $expected];
 
     // For disabled projects it shouldn't add the site key either.
     $site_key = 'site_key';
     $project['project_type'] = 'disabled';
     $expected = 'http://www.example.com/' . $project['name'] . '/' . DRUPAL_CORE_COMPATIBILITY;
 
-    $data[] = array($project, $site_key, $expected);
+    $data[] = [$project, $site_key, $expected];
 
     // For enabled projects, test adding the site key.
     $project['project_type'] = '';
@@ -88,7 +88,7 @@ class UpdateFetcherTest extends UnitTestCase {
     $expected .= '?site_key=site_key';
     $expected .= '&list=' . rawurlencode('module1,module2');
 
-    $data[] = array($project, $site_key, $expected);
+    $data[] = [$project, $site_key, $expected];
 
     // Test when the URL contains a question mark.
     $project['info']['project status url'] = 'http://www.example.com/?project=';
@@ -96,7 +96,7 @@ class UpdateFetcherTest extends UnitTestCase {
     $expected .= '&site_key=site_key';
     $expected .= '&list=' . rawurlencode('module1,module2');
 
-    $data[] = array($project, $site_key, $expected);
+    $data[] = [$project, $site_key, $expected];
 
     return $data;
   }
diff --git a/web/core/modules/update/update.api.php b/web/core/modules/update/update.api.php
index 37ef66a47..48216eb09 100644
--- a/web/core/modules/update/update.api.php
+++ b/web/core/modules/update/update.api.php
@@ -40,11 +40,11 @@ function hook_update_projects_alter(&$projects) {
 
   // Add a disabled module to the list.
   // The key for the array should be the machine-readable project "short name".
-  $projects['disabled_project_name'] = array(
+  $projects['disabled_project_name'] = [
     // Machine-readable project short name (same as the array key above).
     'name' => 'disabled_project_name',
     // Array of values from the main .info.yml file for this project.
-    'info' => array(
+    'info' => [
       'name' => 'Some disabled module',
       'description' => 'A module not enabled on the site that you want to see in the available updates report.',
       'version' => '8.x-1.0',
@@ -52,7 +52,7 @@ function hook_update_projects_alter(&$projects) {
       // The maximum file change time (the "ctime" returned by the filectime()
       // PHP method) for all of the .info.yml files included in this project.
       '_info_file_ctime' => 1243888165,
-    ),
+    ],
     // The date stamp when the project was released, if known. If the disabled
     // project was an officially packaged release from drupal.org, this will
     // be included in the .info.yml file as the 'datestamp' field. This only
@@ -62,15 +62,15 @@ function hook_update_projects_alter(&$projects) {
     // Any modules (or themes) included in this project. Keyed by machine-
     // readable "short name", value is the human-readable project name printed
     // in the UI.
-    'includes' => array(
+    'includes' => [
       'disabled_project' => 'Disabled module',
       'disabled_project_helper' => 'Disabled module helper module',
       'disabled_project_foo' => 'Disabled module foo add-on module',
-    ),
+    ],
     // Does this project contain a 'module', 'theme', 'disabled-module', or
     // 'disabled-theme'?
     'project_type' => 'disabled-module',
-  );
+  ];
 }
 
 /**
@@ -92,11 +92,11 @@ function hook_update_status_alter(&$projects) {
       $projects[$project]['status'] = UPDATE_NOT_CHECKED;
       $projects[$project]['reason'] = t('Ignored from settings');
       if (!empty($settings[$project]['notes'])) {
-        $projects[$project]['extra'][] = array(
-          'class' => array('admin-note'),
+        $projects[$project]['extra'][] = [
+          'class' => ['admin-note'],
           'label' => t('Administrator note'),
           'data' => $settings[$project]['notes'],
-        );
+        ];
       }
     }
   }
@@ -120,9 +120,9 @@ function hook_update_status_alter(&$projects) {
  * @ingroup update_manager_file
  */
 function hook_verify_update_archive($project, $archive_file, $directory) {
-  $errors = array();
+  $errors = [];
   if (!file_exists($directory)) {
-    $errors[] = t('The %directory does not exist.', array('%directory' => $directory));
+    $errors[] = t('The %directory does not exist.', ['%directory' => $directory]);
   }
   // Add other checks on the archive integrity here.
   return $errors;
diff --git a/web/core/modules/update/update.authorize.inc b/web/core/modules/update/update.authorize.inc
index 58f146470..1c2cc60fb 100644
--- a/web/core/modules/update/update.authorize.inc
+++ b/web/core/modules/update/update.authorize.inc
@@ -36,25 +36,25 @@ use Drupal\Core\Url;
  *   should use that response for the current page request.
  */
 function update_authorize_run_update($filetransfer, $projects) {
-  $operations = array();
+  $operations = [];
   foreach ($projects as $project_info) {
-    $operations[] = array(
+    $operations[] = [
       'update_authorize_batch_copy_project',
-      array(
+      [
         $project_info['project'],
         $project_info['updater_name'],
         $project_info['local_url'],
         $filetransfer,
-      ),
-    );
+      ],
+    ];
   }
 
-  $batch = array(
+  $batch = [
     'init_message' => t('Preparing to update your site'),
     'operations' => $operations,
     'finished' => 'update_authorize_update_batch_finished',
     'file' => drupal_get_path('module', 'update') . '/update.authorize.inc',
-  );
+  ];
   batch_set($batch);
 
   // Since authorize.php has its own method for setting the page title, set it
@@ -91,30 +91,30 @@ function update_authorize_run_update($filetransfer, $projects) {
  *   should use that response for the current page request.
  */
 function update_authorize_run_install($filetransfer, $project, $updater_name, $local_url) {
-  $operations[] = array(
+  $operations[] = [
     'update_authorize_batch_copy_project',
-    array(
+    [
       $project,
       $updater_name,
       $local_url,
       $filetransfer,
-    ),
-  );
+    ],
+  ];
 
   // @todo Instantiate our Updater to set the human-readable title?
-  $batch = array(
+  $batch = [
     'init_message' => t('Preparing to install'),
     'operations' => $operations,
     // @todo Use a different finished callback for different messages?
     'finished' => 'update_authorize_install_batch_finished',
     'file' => drupal_get_path('module', 'update') . '/update.authorize.inc',
-  );
+  ];
   batch_set($batch);
 
   // Since authorize.php has its own method for setting the page title, set it
   // manually here rather than passing it in to batch_set() as would normally
   // be done.
-  $_SESSION['authorize_page_title'] = t('Installing %project', array('%project' => $project));
+  $_SESSION['authorize_page_title'] = t('Installing %project', ['%project' => $project]);
 
   // Invoke the batch via authorize.php.
   return system_authorized_batch_process();
@@ -142,14 +142,14 @@ function update_authorize_batch_copy_project($project, $updater_name, $local_url
 
   // Initialize some variables in the Batch API $context array.
   if (!isset($context['results']['log'])) {
-    $context['results']['log'] = array();
+    $context['results']['log'] = [];
   }
   if (!isset($context['results']['log'][$project])) {
-    $context['results']['log'][$project] = array();
+    $context['results']['log'][$project] = [];
   }
 
   if (!isset($context['results']['tasks'])) {
-    $context['results']['tasks'] = array();
+    $context['results']['tasks'] = [];
   }
 
   // The batch API uses a session, and since all the arguments are serialized
@@ -184,7 +184,7 @@ function update_authorize_batch_copy_project($project, $updater_name, $local_url
     return;
   }
 
-  _update_batch_create_message($context['results']['log'][$project], t('Installed %project_name successfully', array('%project_name' => $project)));
+  _update_batch_create_message($context['results']['log'][$project], t('Installed %project_name successfully', ['%project_name' => $project]));
   if (!empty($tasks)) {
     $context['results']['tasks'] += $tasks;
   }
@@ -221,29 +221,29 @@ function update_authorize_update_batch_finished($success, $results) {
     // Take the site out of maintenance mode if it was previously that way.
     if ($offline && isset($_SESSION['maintenance_mode']) && $_SESSION['maintenance_mode'] == FALSE) {
       \Drupal::state()->set('system.maintenance_mode', FALSE);
-      $page_message = array(
+      $page_message = [
         'message' => t('Update was completed successfully. Your site has been taken out of maintenance mode.'),
         'type' => 'status',
-      );
+      ];
     }
     else {
-      $page_message = array(
+      $page_message = [
         'message' => t('Update was completed successfully.'),
         'type' => 'status',
-      );
+      ];
     }
   }
   elseif (!$offline) {
-    $page_message = array(
+    $page_message = [
       'message' => t('Update failed! See the log below for more information.'),
       'type' => 'error',
-    );
+    ];
   }
   else {
-    $page_message = array(
+    $page_message = [
       'message' => t('Update failed! See the log below for more information. Your site is still in maintenance mode.'),
       'type' => 'error',
-    );
+    ];
   }
   // Since we're doing an update of existing code, always add a task for
   // running update.php.
@@ -300,29 +300,29 @@ function update_authorize_install_batch_finished($success, $results) {
     // Take the site out of maintenance mode if it was previously that way.
     if ($offline && isset($_SESSION['maintenance_mode']) && $_SESSION['maintenance_mode'] == FALSE) {
       \Drupal::state()->set('system.maintenance_mode', FALSE);
-      $page_message = array(
+      $page_message = [
         'message' => t('Installation was completed successfully. Your site has been taken out of maintenance mode.'),
         'type' => 'status',
-      );
+      ];
     }
     else {
-      $page_message = array(
+      $page_message = [
         'message' => t('Installation was completed successfully.'),
         'type' => 'status',
-      );
+      ];
     }
   }
   elseif (!$success && !$offline) {
-    $page_message = array(
+    $page_message = [
       'message' => t('Installation failed! See the log below for more information.'),
       'type' => 'error',
-    );
+    ];
   }
   else {
-    $page_message = array(
+    $page_message = [
       'message' => t('Installation failed! See the log below for more information. Your site is still in maintenance mode.'),
       'type' => 'error',
-    );
+    ];
   }
 
   // Unset the variable since it is no longer needed.
@@ -348,7 +348,7 @@ function update_authorize_install_batch_finished($success, $results) {
  *   if there were errors. Defaults to TRUE.
  */
 function _update_batch_create_message(&$project_results, $message, $success = TRUE) {
-  $project_results[] = array('message' => $message, 'success' => $success);
+  $project_results[] = ['message' => $message, 'success' => $success];
 }
 
 /**
diff --git a/web/core/modules/update/update.compare.inc b/web/core/modules/update/update.compare.inc
index a077c38d2..2ba5fdce7 100644
--- a/web/core/modules/update/update.compare.inc
+++ b/web/core/modules/update/update.compare.inc
@@ -32,7 +32,7 @@ function update_process_project_info(&$projects) {
       // Figure out what the currently installed major version is. We need
       // to handle both contribution (e.g. "5.x-1.3", major = 1) and core
       // (e.g. "5.1", major = 5) version strings.
-      $matches = array();
+      $matches = [];
       if (preg_match('/^(\d+\.x-)?(\d+)\..*$/', $info['version'], $matches)) {
         $info['major'] = $matches[2];
       }
@@ -171,7 +171,7 @@ function update_calculate_project_data($available) {
  *   Data about available project releases of a specific project.
  */
 function update_calculate_project_update_status(&$project_data, $available) {
-  foreach (array('title', 'link') as $attribute) {
+  foreach (['title', 'link'] as $attribute) {
     if (!isset($project_data[$attribute]) && isset($available[$attribute])) {
       $project_data[$attribute] = $available[$attribute];
     }
@@ -184,33 +184,33 @@ function update_calculate_project_update_status(&$project_data, $available) {
       case 'insecure':
         $project_data['status'] = UPDATE_NOT_SECURE;
         if (empty($project_data['extra'])) {
-          $project_data['extra'] = array();
+          $project_data['extra'] = [];
         }
-        $project_data['extra'][] = array(
+        $project_data['extra'][] = [
           'label' => t('Project not secure'),
           'data' => t('This project has been labeled insecure by the Drupal security team, and is no longer available for download. Immediately disabling everything included by this project is strongly recommended!'),
-        );
+        ];
         break;
       case 'unpublished':
       case 'revoked':
         $project_data['status'] = UPDATE_REVOKED;
         if (empty($project_data['extra'])) {
-          $project_data['extra'] = array();
+          $project_data['extra'] = [];
         }
-        $project_data['extra'][] = array(
+        $project_data['extra'][] = [
           'label' => t('Project revoked'),
           'data' => t('This project has been revoked, and is no longer available for download. Disabling everything included by this project is strongly recommended!'),
-        );
+        ];
         break;
       case 'unsupported':
         $project_data['status'] = UPDATE_NOT_SUPPORTED;
         if (empty($project_data['extra'])) {
-          $project_data['extra'] = array();
+          $project_data['extra'] = [];
         }
-        $project_data['extra'][] = array(
+        $project_data['extra'][] = [
           'label' => t('Project not supported'),
           'data' => t('This project is no longer supported, and is no longer available for download. Disabling everything included by this project is strongly recommended!'),
-        );
+        ];
         break;
       case 'not-fetched':
         $project_data['status'] = UPDATE_NOT_FETCHED;
@@ -233,7 +233,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
 
   // Figure out the target major version.
   $existing_major = $project_data['existing_major'];
-  $supported_majors = array();
+  $supported_majors = [];
   if (isset($available['supported_majors'])) {
     $supported_majors = explode(',', $available['supported_majors']);
   }
@@ -303,25 +303,25 @@ function update_calculate_project_update_status(&$project_data, $available) {
       elseif ($release['status'] == 'unpublished') {
         $project_data['status'] = UPDATE_REVOKED;
         if (empty($project_data['extra'])) {
-          $project_data['extra'] = array();
+          $project_data['extra'] = [];
         }
-        $project_data['extra'][] = array(
-          'class' => array('release-revoked'),
+        $project_data['extra'][] = [
+          'class' => ['release-revoked'],
           'label' => t('Release revoked'),
           'data' => t('Your currently installed release has been revoked, and is no longer available for download. Disabling everything included in this release or upgrading is strongly recommended!'),
-        );
+        ];
       }
       elseif (isset($release['terms']['Release type']) &&
               in_array('Unsupported', $release['terms']['Release type'])) {
         $project_data['status'] = UPDATE_NOT_SUPPORTED;
         if (empty($project_data['extra'])) {
-          $project_data['extra'] = array();
+          $project_data['extra'] = [];
         }
-        $project_data['extra'][] = array(
-          'class' => array('release-not-supported'),
+        $project_data['extra'][] = [
+          'class' => ['release-not-supported'],
           'label' => t('Release not supported'),
           'data' => t('Your currently installed release is now unsupported, and is no longer available for download. Disabling everything included in this release or upgrading is strongly recommended!'),
-        );
+        ];
       }
     }
 
@@ -341,7 +341,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
     if (isset($release['version_major']) && $release['version_major'] > $target_major) {
       if (in_array($release['version_major'], $supported_majors)) {
         if (!isset($project_data['also'])) {
-          $project_data['also'] = array();
+          $project_data['also'] = [];
         }
         if (!isset($project_data['also'][$release['version_major']])) {
           $project_data['also'][$release['version_major']] = $version;
diff --git a/web/core/modules/update/update.fetch.inc b/web/core/modules/update/update.fetch.inc
index a710dd9f7..9964910b1 100644
--- a/web/core/modules/update/update.fetch.inc
+++ b/web/core/modules/update/update.fetch.inc
@@ -18,9 +18,9 @@ function _update_cron_notify() {
   $update_config = \Drupal::config('update.settings');
   module_load_install('update');
   $status = update_requirements('runtime');
-  $params = array();
+  $params = [];
   $notify_all = ($update_config->get('notification.threshold') == 'all');
-  foreach (array('core', 'contrib') as $report_type) {
+  foreach (['core', 'contrib'] as $report_type) {
     $type = 'update_' . $report_type;
     if (isset($status[$type]['severity'])
         && ($status[$type]['severity'] == REQUIREMENT_ERROR || ($notify_all && $status[$type]['reason'] == UPDATE_NOT_CURRENT))) {
diff --git a/web/core/modules/update/update.install b/web/core/modules/update/update.install
index e8101295c..c616412ac 100644
--- a/web/core/modules/update/update.install
+++ b/web/core/modules/update/update.install
@@ -28,7 +28,7 @@ use Drupal\Core\Url;
  * @see _update_cron_notify()
  */
 function update_requirements($phase) {
-  $requirements = array();
+  $requirements = [];
   if ($phase == 'runtime') {
     if ($available = update_get_available(FALSE)) {
       module_load_include('inc', 'update', 'update.compare');
@@ -97,7 +97,7 @@ function update_uninstall() {
  * @see update_calculate_project_data()
  */
 function _update_requirement_check($project, $type) {
-  $requirement = array();
+  $requirement = [];
   if ($type == 'core') {
     $requirement['title'] = t('Drupal core update status');
   }
@@ -143,17 +143,12 @@ function _update_requirement_check($project, $type) {
       $requirement_label = t('Up to date');
   }
   if ($status != UPDATE_CURRENT && $type == 'core' && isset($project['recommended'])) {
-    $requirement_label .= ' ' . t('(version @version available)', array('@version' => $project['recommended']));
+    $requirement_label .= ' ' . t('(version @version available)', ['@version' => $project['recommended']]);
   }
   $requirement['value'] = \Drupal::l($requirement_label, new Url(_update_manager_access() ? 'update.report_update' : 'update.status'));
   return $requirement;
 }
 
-/**
- * @addtogroup updates-8.1.x
- * @{
- */
-
 /**
  * Rebuild the router to ensure admin/reports/updates/check has CSRF protection.
  */
@@ -161,7 +156,3 @@ function update_update_8001() {
   // Empty update forces a call to drupal_flush_all_caches() which rebuilds the
   // router.
 }
-
-/**
- * @} End of "addtogroup updates-8.1.x".
- */
diff --git a/web/core/modules/update/update.manager.inc b/web/core/modules/update/update.manager.inc
index f9c7c5f3f..e7960072c 100644
--- a/web/core/modules/update/update.manager.inc
+++ b/web/core/modules/update/update.manager.inc
@@ -48,11 +48,11 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
  */
 function update_manager_download_batch_finished($success, $results) {
   if (!empty($results['errors'])) {
-    $item_list = array(
+    $item_list = [
       '#theme' => 'item_list',
       '#title' => t('Downloading updates failed:'),
       '#items' => $results['errors'],
-    );
+    ];
     drupal_set_message(drupal_render($item_list), 'error');
   }
   elseif ($success) {
@@ -91,23 +91,23 @@ function _update_manager_check_backends(&$form, $operation) {
   }
 
   // Otherwise, show the available backends.
-  $form['available_backends'] = array(
+  $form['available_backends'] = [
     '#prefix' => '<p>',
     '#suffix' => '</p>',
-  );
+  ];
 
   $available_backends = drupal_get_filetransfer_info();
   if (empty($available_backends)) {
     if ($operation == 'update') {
-      $form['available_backends']['#markup'] = t('Your server does not support updating modules and themes from this interface. Instead, update modules and themes by uploading the new versions directly to the server, as described in the <a href=":handbook_url">handbook</a>.', array(':handbook_url' => 'https://www.drupal.org/getting-started/install-contrib'));
+      $form['available_backends']['#markup'] = t('Your server does not support updating modules and themes from this interface. Instead, update modules and themes by uploading the new versions directly to the server, as described in the <a href=":handbook_url">handbook</a>.', [':handbook_url' => 'https://www.drupal.org/getting-started/install-contrib']);
     }
     else {
-      $form['available_backends']['#markup'] = t('Your server does not support installing modules and themes from this interface. Instead, install modules and themes by uploading them directly to the server, as described in the <a href=":handbook_url">handbook</a>.', array(':handbook_url' => 'https://www.drupal.org/getting-started/install-contrib'));
+      $form['available_backends']['#markup'] = t('Your server does not support installing modules and themes from this interface. Instead, install modules and themes by uploading them directly to the server, as described in the <a href=":handbook_url">handbook</a>.', [':handbook_url' => 'https://www.drupal.org/getting-started/install-contrib']);
     }
     return FALSE;
   }
 
-  $backend_names = array();
+  $backend_names = [];
   foreach ($available_backends as $backend) {
     $backend_names[] = $backend['title'];
   }
@@ -116,20 +116,20 @@ function _update_manager_check_backends(&$form, $operation) {
       count($available_backends),
       'Updating modules and themes requires <strong>@backends access</strong> to your server. See the <a href=":handbook_url">handbook</a> for other update methods.',
       'Updating modules and themes requires access to your server via one of the following methods: <strong>@backends</strong>. See the <a href=":handbook_url">handbook</a> for other update methods.',
-      array(
+      [
         '@backends' => implode(', ', $backend_names),
         ':handbook_url' => 'https://www.drupal.org/getting-started/install-contrib',
-      ));
+      ]);
   }
   else {
     $form['available_backends']['#markup'] = \Drupal::translation()->formatPlural(
       count($available_backends),
       'Installing modules and themes requires <strong>@backends access</strong> to your server. See the <a href=":handbook_url">handbook</a> for other installation methods.',
       'Installing modules and themes requires access to your server via one of the following methods: <strong>@backends</strong>. See the <a href=":handbook_url">handbook</a> for other installation methods.',
-      array(
+      [
         '@backends' => implode(', ', $backend_names),
         ':handbook_url' => 'https://www.drupal.org/getting-started/install-contrib',
-      ));
+      ]);
   }
   return TRUE;
 }
@@ -150,7 +150,7 @@ function _update_manager_check_backends(&$form, $operation) {
 function update_manager_archive_extract($file, $directory) {
   $archiver = archiver_get_archiver($file);
   if (!$archiver) {
-    throw new Exception(t('Cannot extract %file, not a valid archive.', array ('%file' => $file)));
+    throw new Exception(t('Cannot extract %file, not a valid archive.', ['%file' => $file]));
   }
 
   // Remove the directory if it exists, otherwise it might contain a mixture of
@@ -189,7 +189,7 @@ function update_manager_archive_extract($file, $directory) {
  *   are no errors, it will be an empty array.
  */
 function update_manager_archive_verify($project, $archive_file, $directory) {
-  return \Drupal::moduleHandler()->invokeAll('verify_update_archive', array($project, $archive_file, $directory));
+  return \Drupal::moduleHandler()->invokeAll('verify_update_archive', [$project, $archive_file, $directory]);
 }
 
 /**
@@ -205,7 +205,7 @@ function update_manager_archive_verify($project, $archive_file, $directory) {
  */
 function update_manager_file_get($url) {
   $parsed_url = parse_url($url);
-  $remote_schemes = array('http', 'https', 'ftp', 'ftps', 'smb', 'nfs');
+  $remote_schemes = ['http', 'https', 'ftp', 'ftps', 'smb', 'nfs'];
   if (!isset($parsed_url['scheme']) || !in_array($parsed_url['scheme'], $remote_schemes)) {
     // This is a local file, just return the path.
     return drupal_realpath($url);
@@ -245,14 +245,14 @@ function update_manager_batch_project_get($project, $url, &$context) {
   // This is here to show the user that we are in the process of downloading.
   if (!isset($context['sandbox']['started'])) {
     $context['sandbox']['started'] = TRUE;
-    $context['message'] = t('Downloading %project', array('%project' => $project));
+    $context['message'] = t('Downloading %project', ['%project' => $project]);
     $context['finished'] = 0;
     return;
   }
 
   // Actually try to download the file.
   if (!($local_cache = update_manager_file_get($url))) {
-    $context['results']['errors'][$project] = t('Failed to download %project from %url', array('%project' => $project, '%url' => $url));
+    $context['results']['errors'][$project] = t('Failed to download %project from %url', ['%project' => $project, '%url' => $url]);
     return;
   }
 
diff --git a/web/core/modules/update/update.module b/web/core/modules/update/update.module
index f45b5893e..32b5b8cc8 100644
--- a/web/core/modules/update/update.module
+++ b/web/core/modules/update/update.module
@@ -20,46 +20,73 @@ use Drupal\Core\Site\Settings;
 
 /**
  * Project is missing security update(s).
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\update\UpdateManagerInterface::NOT_SECURE instead.
  */
 const UPDATE_NOT_SECURE = 1;
 
 /**
  * Current release has been unpublished and is no longer available.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\update\UpdateManagerInterface::REVOKED instead.
  */
 const UPDATE_REVOKED = 2;
 
 /**
  * Current release is no longer supported by the project maintainer.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\update\UpdateManagerInterface::NOT_SUPPORTED instead.
  */
 const UPDATE_NOT_SUPPORTED = 3;
 
 /**
  * Project has a new release available, but it is not a security release.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\update\UpdateManagerInterface::NOT_CURRENT instead.
  */
 const UPDATE_NOT_CURRENT = 4;
 
 /**
  * Project is up to date.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\update\UpdateManagerInterface::CURRENT instead.
  */
 const UPDATE_CURRENT = 5;
 
 /**
  * Project's status cannot be checked.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\update\UpdateFetcherInterface::NOT_CHECKED instead.
  */
 const UPDATE_NOT_CHECKED = -1;
 
 /**
  * No available update data was found for project.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\update\UpdateFetcherInterface::UNKNOWN instead.
  */
 const UPDATE_UNKNOWN = -2;
 
 /**
  * There was a failure fetching available update data for this project.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\update\UpdateFetcherInterface::NOT_FETCHED instead.
  */
 const UPDATE_NOT_FETCHED = -3;
 
 /**
  * We need to (re)fetch available update data for this project.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\update\UpdateFetcherInterface::FETCH_PENDING instead.
  */
 const UPDATE_FETCH_PENDING = -4;
 
@@ -71,7 +98,7 @@ function update_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.update':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Update Manager module periodically checks for new versions of your site\'s software (including contributed modules and themes), and alerts administrators to available updates. The Update Manager system is also used by some other modules to manage updates and downloads; for example, the Interface Translation module uses the Update Manager to download translations from the localization server. Note that whenever the Update Manager system is used, anonymous usage statistics are sent to Drupal.org. If desired, you may disable the Update Manager module from the <a href=":modules">Extend page</a>; if you do so, functionality that depends on the Update Manager system will not work. For more information, see the <a href=":update">online documentation for the Update Manager module</a>.', array(':update' => 'https://www.drupal.org/documentation/modules/update', ':modules' => \Drupal::url('system.modules_list'))) . '</p>';
+      $output .= '<p>' . t('The Update Manager module periodically checks for new versions of your site\'s software (including contributed modules and themes), and alerts administrators to available updates. The Update Manager system is also used by some other modules to manage updates and downloads; for example, the Interface Translation module uses the Update Manager to download translations from the localization server. Note that whenever the Update Manager system is used, anonymous usage statistics are sent to Drupal.org. If desired, you may disable the Update Manager module from the <a href=":modules">Extend page</a>; if you do so, functionality that depends on the Update Manager system will not work. For more information, see the <a href=":update">online documentation for the Update Manager module</a>.', [':update' => 'https://www.drupal.org/documentation/modules/update', ':modules' => \Drupal::url('system.modules_list')]) . '</p>';
       // Only explain the Update manager if it has not been disabled.
       if (_update_manager_access()) {
         $output .= '<p>' . t('The Update Manager also allows administrators to update and install modules and themes through the administration interface.') . '</p>';
@@ -79,13 +106,13 @@ function update_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Checking for available updates') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":update-report">Available updates report</a> displays core, contributed modules, and themes for which there are new releases available for download. On the report page, you can also check manually for updates. You can configure the frequency of update checks, which are performed during cron runs, and whether notifications are sent on the <a href=":update-settings">Update Manager settings page</a>.', array(':update-report' => \Drupal::url('update.status'), ':update-settings' => \Drupal::url('update.settings'))) . '</dd>';
+      $output .= '<dd>' . t('The <a href=":update-report">Available updates report</a> displays core, contributed modules, and themes for which there are new releases available for download. On the report page, you can also check manually for updates. You can configure the frequency of update checks, which are performed during cron runs, and whether notifications are sent on the <a href=":update-settings">Update Manager settings page</a>.', [':update-report' => \Drupal::url('update.status'), ':update-settings' => \Drupal::url('update.settings')]) . '</dd>';
       // Only explain the Update manager if it has not been disabled.
       if (_update_manager_access()) {
         $output .= '<dt>' . t('Performing updates through the Update page') . '</dt>';
-        $output .= '<dd>' . t('The Update Manager module allows administrators to perform updates directly from the <a href=":update-page">Update page</a>. It lists all available updates, and you can confirm whether you want to download them. If you don\'t have sufficient access rights to your web server, you could be prompted for your FTP/SSH password. Afterwards the files are transferred into your site installation, overwriting your old files. Direct links to the Update page are also displayed on the <a href=":modules_page">Extend page</a> and the <a href=":themes_page">Appearance page</a>.', array(':modules_page' => \Drupal::url('system.modules_list'), ':themes_page' => \Drupal::url('system.themes_page'), ':update-page' => \Drupal::url('update.report_update'))) . '</dd>';
+        $output .= '<dd>' . t('The Update Manager module allows administrators to perform updates directly from the <a href=":update-page">Update page</a>. It lists all available updates, and you can confirm whether you want to download them. If you don\'t have sufficient access rights to your web server, you could be prompted for your FTP/SSH password. Afterwards the files are transferred into your site installation, overwriting your old files. Direct links to the Update page are also displayed on the <a href=":modules_page">Extend page</a> and the <a href=":themes_page">Appearance page</a>.', [':modules_page' => \Drupal::url('system.modules_list'), ':themes_page' => \Drupal::url('system.themes_page'), ':update-page' => \Drupal::url('update.report_update')]) . '</dd>';
         $output .= '<dt>' . t('Installing new modules and themes through the Install page') . '</dt>';
-        $output .= '<dd>' . t('You can also install new modules and themes in the same fashion, through the <a href=":install">Install page</a>, or by clicking the <em>Install new module/theme</em> links at the top of the <a href=":modules_page">Extend page</a> and the <a href=":themes_page">Appearance page</a>. In this case, you are prompted to provide either the URL to the download, or to upload a packaged release file from your local computer.', array(':modules_page' => \Drupal::url('system.modules_list'), ':themes_page' => \Drupal::url('system.themes_page'), ':install' => \Drupal::url('update.report_install'))) . '</dd>';
+        $output .= '<dd>' . t('You can also install new modules and themes in the same fashion, through the <a href=":install">Install page</a>, or by clicking the <em>Install new module/theme</em> links at the top of the <a href=":modules_page">Extend page</a> and the <a href=":themes_page">Appearance page</a>. In this case, you are prompted to provide either the URL to the download, or to upload a packaged release file from your local computer.', [':modules_page' => \Drupal::url('system.modules_list'), ':themes_page' => \Drupal::url('system.themes_page'), ':install' => \Drupal::url('update.report_install')]) . '</dd>';
       }
       $output .= '</dl>';
       return $output;
@@ -95,10 +122,10 @@ function update_help($route_name, RouteMatchInterface $route_match) {
 
     case 'system.modules_list':
       if (_update_manager_access()) {
-        $output = '<p>' . t('Regularly review and install <a href=":updates">available updates</a> to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated.', array(':update-php' => \Drupal::url('system.db_update'), ':updates' => \Drupal::url('update.status'))) . '</p>';
+        $output = '<p>' . t('Regularly review and install <a href=":updates">available updates</a> to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated.', [':update-php' => \Drupal::url('system.db_update'), ':updates' => \Drupal::url('update.status')]) . '</p>';
       }
       else {
-        $output = '<p>' . t('Regularly review <a href=":updates">available updates</a> to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated.', array(':update-php' => \Drupal::url('system.db_update'), ':updates' => \Drupal::url('update.status'))) . '</p>';
+        $output = '<p>' . t('Regularly review <a href=":updates">available updates</a> to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated.', [':update-php' => \Drupal::url('system.db_update'), ':updates' => \Drupal::url('update.status')]) . '</p>';
       }
       return $output;
   }
@@ -137,7 +164,7 @@ function update_page_top() {
     }
     module_load_install('update');
     $status = update_requirements('runtime');
-    foreach (array('core', 'contrib') as $report_type) {
+    foreach (['core', 'contrib'] as $report_type) {
       $type = 'update_' . $report_type;
       // hook_requirements() supports render arrays therefore we need to render
       // them before using drupal_set_message().
@@ -185,25 +212,25 @@ function _update_manager_access() {
  * Implements hook_theme().
  */
 function update_theme() {
-  return array(
-    'update_last_check' => array(
-      'variables' => array('last' => 0),
-    ),
-    'update_report' => array(
-      'variables' => array('data' => NULL),
+  return [
+    'update_last_check' => [
+      'variables' => ['last' => 0],
+    ],
+    'update_report' => [
+      'variables' => ['data' => NULL],
       'file' => 'update.report.inc',
-    ),
-    'update_project_status' => array(
-      'variables' => array('project' => array()),
+    ],
+    'update_project_status' => [
+      'variables' => ['project' => []],
       'file' => 'update.report.inc',
-    ),
+    ],
     // We are using template instead of '#type' => 'table' here to keep markup
     // out of preprocess and allow for easier changes to markup.
-    'update_version' => array(
-      'variables' => array('version' => NULL, 'title' => NULL, 'attributes' => array()),
+    'update_version' => [
+      'variables' => ['version' => NULL, 'title' => NULL, 'attributes' => []],
       'file' => 'update.report.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -285,10 +312,10 @@ function update_storage_clear_submit($form, FormStateInterface $form_state) {
  */
 function _update_no_data() {
   $destination = \Drupal::destination()->getAsArray();
-  return t('No update information available. <a href=":run_cron">Run cron</a> or <a href=":check_manually">check manually</a>.', array(
+  return t('No update information available. <a href=":run_cron">Run cron</a> or <a href=":check_manually">check manually</a>.', [
     ':run_cron' => \Drupal::url('system.run_cron', [], ['query' => $destination]),
     ':check_manually' => \Drupal::url('update.manual_status', [], ['query' => $destination]),
-  ));
+  ]);
 }
 
 /**
@@ -444,20 +471,20 @@ function update_fetch_data_finished($success, $results) {
 function update_mail($key, &$message, $params) {
   $langcode = $message['langcode'];
   $language = \Drupal::languageManager()->getLanguage($langcode);
-  $message['subject'] .= t('New release(s) available for @site_name', array('@site_name' => \Drupal::config('system.site')->get('name')), array('langcode' => $langcode));
+  $message['subject'] .= t('New release(s) available for @site_name', ['@site_name' => \Drupal::config('system.site')->get('name')], ['langcode' => $langcode]);
   foreach ($params as $msg_type => $msg_reason) {
     $message['body'][] = _update_message_text($msg_type, $msg_reason, $langcode);
   }
-  $message['body'][] = t('See the available updates page for more information:', array(), array('langcode' => $langcode)) . "\n" . \Drupal::url('update.status', [], ['absolute' => TRUE, 'language' => $language]);
+  $message['body'][] = t('See the available updates page for more information:', [], ['langcode' => $langcode]) . "\n" . \Drupal::url('update.status', [], ['absolute' => TRUE, 'language' => $language]);
   if (_update_manager_access()) {
-    $message['body'][] = t('You can automatically install your missing updates using the Update manager:', array(), array('langcode' => $langcode)) . "\n" . \Drupal::url('update.report_update', [], ['absolute' => TRUE, 'language' => $language]);
+    $message['body'][] = t('You can automatically install your missing updates using the Update manager:', [], ['langcode' => $langcode]) . "\n" . \Drupal::url('update.report_update', [], ['absolute' => TRUE, 'language' => $language]);
   }
   $settings_url = \Drupal::url('update.settings', [], ['absolute' => TRUE]);
   if (\Drupal::config('update.settings')->get('notification.threshold') == 'all') {
-    $message['body'][] = t('Your site is currently configured to send these emails when any updates are available. To get notified only for security updates, @url.', array('@url' => $settings_url));
+    $message['body'][] = t('Your site is currently configured to send these emails when any updates are available. To get notified only for security updates, @url.', ['@url' => $settings_url]);
   }
   else {
-    $message['body'][] = t('Your site is currently configured to send these emails only when security updates are available. To get notified for any available updates, @url.', array('@url' => $settings_url));
+    $message['body'][] = t('Your site is currently configured to send these emails only when security updates are available. To get notified for any available updates, @url.', ['@url' => $settings_url]);
   }
 }
 
@@ -484,37 +511,37 @@ function _update_message_text($msg_type, $msg_reason, $langcode = NULL) {
   switch ($msg_reason) {
     case UPDATE_NOT_SECURE:
       if ($msg_type == 'core') {
-        $text = t('There is a security update available for your version of Drupal. To ensure the security of your server, you should update immediately!', array(), array('langcode' => $langcode));
+        $text = t('There is a security update available for your version of Drupal. To ensure the security of your server, you should update immediately!', [], ['langcode' => $langcode]);
       }
       else {
-        $text = t('There are security updates available for one or more of your modules or themes. To ensure the security of your server, you should update immediately!', array(), array('langcode' => $langcode));
+        $text = t('There are security updates available for one or more of your modules or themes. To ensure the security of your server, you should update immediately!', [], ['langcode' => $langcode]);
       }
       break;
 
     case UPDATE_REVOKED:
       if ($msg_type == 'core') {
-        $text = t('Your version of Drupal has been revoked and is no longer available for download. Upgrading is strongly recommended!', array(), array('langcode' => $langcode));
+        $text = t('Your version of Drupal has been revoked and is no longer available for download. Upgrading is strongly recommended!', [], ['langcode' => $langcode]);
       }
       else {
-        $text = t('The installed version of at least one of your modules or themes has been revoked and is no longer available for download. Upgrading or disabling is strongly recommended!', array(), array('langcode' => $langcode));
+        $text = t('The installed version of at least one of your modules or themes has been revoked and is no longer available for download. Upgrading or disabling is strongly recommended!', [], ['langcode' => $langcode]);
       }
       break;
 
     case UPDATE_NOT_SUPPORTED:
       if ($msg_type == 'core') {
-        $text = t('Your version of Drupal is no longer supported. Upgrading is strongly recommended!', array(), array('langcode' => $langcode));
+        $text = t('Your version of Drupal is no longer supported. Upgrading is strongly recommended!', [], ['langcode' => $langcode]);
       }
       else {
-        $text = t('The installed version of at least one of your modules or themes is no longer supported. Upgrading or disabling is strongly recommended. See the project homepage for more details.', array(), array('langcode' => $langcode));
+        $text = t('The installed version of at least one of your modules or themes is no longer supported. Upgrading or disabling is strongly recommended. See the project homepage for more details.', [], ['langcode' => $langcode]);
       }
       break;
 
     case UPDATE_NOT_CURRENT:
       if ($msg_type == 'core') {
-        $text = t('There are updates available for your version of Drupal. To ensure the proper functioning of your site, you should update as soon as possible.', array(), array('langcode' => $langcode));
+        $text = t('There are updates available for your version of Drupal. To ensure the proper functioning of your site, you should update as soon as possible.', [], ['langcode' => $langcode]);
       }
       else {
-        $text = t('There are updates available for one or more of your modules or themes. To ensure the proper functioning of your site, you should update as soon as possible.', array(), array('langcode' => $langcode));
+        $text = t('There are updates available for one or more of your modules or themes. To ensure the proper functioning of your site, you should update as soon as possible.', [], ['langcode' => $langcode]);
       }
       break;
 
@@ -523,10 +550,10 @@ function _update_message_text($msg_type, $msg_reason, $langcode = NULL) {
     case UPDATE_NOT_FETCHED:
     case UPDATE_FETCH_PENDING:
       if ($msg_type == 'core') {
-        $text = t('There was a problem checking <a href=":update-report">available updates</a> for Drupal.', array(':update-report' => \Drupal::url('update.status')), array('langcode' => $langcode));
+        $text = t('There was a problem checking <a href=":update-report">available updates</a> for Drupal.', [':update-report' => \Drupal::url('update.status')], ['langcode' => $langcode]);
       }
       else {
-        $text = t('There was a problem checking <a href=":update-report">available updates</a> for your modules or themes.', array(':update-report' => \Drupal::url('update.status')), array('langcode' => $langcode));
+        $text = t('There was a problem checking <a href=":update-report">available updates</a> for your modules or themes.', [':update-report' => \Drupal::url('update.status')], ['langcode' => $langcode]);
       }
       break;
   }
@@ -566,7 +593,7 @@ function _update_project_status_sort($a, $b) {
  */
 function template_preprocess_update_last_check(&$variables) {
   $variables['time'] = \Drupal::service('date.formatter')->formatTimeDiffSince($variables['last']);
-  $variables['link'] = \Drupal::l(t('Check manually'), new Url('update.manual_status', array(), array('query' => \Drupal::destination()->getAsArray())));
+  $variables['link'] = \Drupal::l(t('Check manually'), new Url('update.manual_status', [], ['query' => \Drupal::destination()->getAsArray()]));
 }
 
 /**
@@ -583,7 +610,7 @@ function template_preprocess_update_last_check(&$variables) {
  * @see _system_rebuild_module_data()
  */
 function update_verify_update_archive($project, $archive_file, $directory) {
-  $errors = array();
+  $errors = [];
 
   // Make sure this isn't a tarball of Drupal core.
   if (
@@ -593,9 +620,9 @@ function update_verify_update_archive($project, $archive_file, $directory) {
     && file_exists("$directory/$project/core/modules/node/node.module")
     && file_exists("$directory/$project/core/modules/system/system.module")
   ) {
-    return array(
-      'no-core' => t('Automatic updating of Drupal core is not supported. See the <a href=":upgrade-guide">upgrade guide</a> for information on how to update Drupal core manually.', array(':upgrade-guide' => 'https://www.drupal.org/upgrade')),
-    );
+    return [
+      'no-core' => t('Automatic updating of Drupal core is not supported. See the <a href=":upgrade-guide">upgrade guide</a> for information on how to update Drupal core manually.', [':upgrade-guide' => 'https://www.drupal.org/upgrade']),
+    ];
   }
 
   // Parse all the .info.yml files and make sure at least one is compatible with
@@ -604,8 +631,8 @@ function update_verify_update_archive($project, $archive_file, $directory) {
   // with some out-of-date modules that are not necessary for its overall
   // functionality).
   $compatible_project = FALSE;
-  $incompatible = array();
-  $files = file_scan_directory("$directory/$project", '/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.info.yml$/', array('key' => 'name', 'min_depth' => 0));
+  $incompatible = [];
+  $files = file_scan_directory("$directory/$project", '/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.info.yml$/', ['key' => 'name', 'min_depth' => 0]);
   foreach ($files as $file) {
     // Get the .info.yml file for the module or theme this file belongs to.
     $info = \Drupal::service('info_parser')->parse($file->uri);
@@ -621,14 +648,14 @@ function update_verify_update_archive($project, $archive_file, $directory) {
   }
 
   if (empty($files)) {
-    $errors[] = t('%archive_file does not contain any .info.yml files.', array('%archive_file' => drupal_basename($archive_file)));
+    $errors[] = t('%archive_file does not contain any .info.yml files.', ['%archive_file' => drupal_basename($archive_file)]);
   }
   elseif (!$compatible_project) {
     $errors[] = \Drupal::translation()->formatPlural(
       count($incompatible),
       '%archive_file contains a version of %names that is not compatible with Drupal @version.',
       '%archive_file contains versions of modules or themes that are not compatible with Drupal @version: %names',
-      array('@version' => \Drupal::CORE_COMPATIBILITY, '%archive_file' => drupal_basename($archive_file), '%names' => implode(', ', $incompatible))
+      ['@version' => \Drupal::CORE_COMPATIBILITY, '%archive_file' => drupal_basename($archive_file), '%names' => implode(', ', $incompatible)]
     );
   }
 
@@ -707,14 +734,14 @@ function _update_manager_cache_directory($create = TRUE) {
 function update_clear_update_disk_cache() {
   // List of update module cache directories. Do not create the directories if
   // they do not exist.
-  $directories = array(
+  $directories = [
     _update_manager_cache_directory(FALSE),
     _update_manager_extract_directory(FALSE),
-  );
+  ];
 
   // Search for files and directories in base folder only without recursion.
   foreach ($directories as $directory) {
-    file_scan_directory($directory, '/.*/', array('callback' => 'update_delete_file_if_stale', 'recurse' => FALSE));
+    file_scan_directory($directory, '/.*/', ['callback' => 'update_delete_file_if_stale', 'recurse' => FALSE]);
   }
 }
 
diff --git a/web/core/modules/update/update.report.inc b/web/core/modules/update/update.report.inc
index 5f198d9ba..7b14a0585 100644
--- a/web/core/modules/update/update.report.inc
+++ b/web/core/modules/update/update.report.inc
@@ -23,36 +23,36 @@ function template_preprocess_update_report(&$variables) {
 
   $last = \Drupal::state()->get('update.last_check') ?: 0;
 
-  $variables['last_checked'] = array(
+  $variables['last_checked'] = [
     '#theme' => 'update_last_check',
     '#last' => $last,
     // Attach the library to a variable that gets printed always.
-    '#attached' => array(
-      'library' => array(
+    '#attached' => [
+      'library' => [
         'update/drupal.update.admin',
-      ),
-    )
-  );
+      ],
+    ]
+  ];
 
   // For no project update data, populate no data message.
   if (empty($data)) {
     $variables['no_updates_message'] = _update_no_data();
   }
 
-  $rows = array();
+  $rows = [];
 
   foreach ($data as $project) {
-    $project_status = array(
+    $project_status = [
       '#theme' => 'update_project_status',
       '#project' => $project,
-    );
+    ];
 
     // Build project rows.
     if (!isset($rows[$project['project_type']])) {
-      $rows[$project['project_type']] = array(
+      $rows[$project['project_type']] = [
         '#type' => 'table',
-        '#attributes' => array('class' => array('update')),
-      );
+        '#attributes' => ['class' => ['update']],
+      ];
     }
     $row_key = !empty($project['title']) ? Unicode::strtolower($project['title']) : Unicode::strtolower($project['name']);
 
@@ -62,7 +62,7 @@ function template_preprocess_update_report(&$variables) {
     // Add project status class attribute to the table row.
     switch ($project['status']) {
       case UPDATE_CURRENT:
-        $rows[$project['project_type']][$row_key]['#attributes'] = array('class' => array('color-success'));
+        $rows[$project['project_type']][$row_key]['#attributes'] = ['class' => ['color-success']];
         break;
       case UPDATE_UNKNOWN:
       case UPDATE_FETCH_PENDING:
@@ -70,32 +70,32 @@ function template_preprocess_update_report(&$variables) {
       case UPDATE_NOT_SECURE:
       case UPDATE_REVOKED:
       case UPDATE_NOT_SUPPORTED:
-        $rows[$project['project_type']][$row_key]['#attributes'] = array('class' => array('color-error'));
+        $rows[$project['project_type']][$row_key]['#attributes'] = ['class' => ['color-error']];
         break;
       case UPDATE_NOT_CHECKED:
       case UPDATE_NOT_CURRENT:
       default:
-        $rows[$project['project_type']][$row_key]['#attributes'] = array('class' => array('color-warning'));
+        $rows[$project['project_type']][$row_key]['#attributes'] = ['class' => ['color-warning']];
         break;
     }
   }
 
-  $project_types = array(
+  $project_types = [
     'core' => t('Drupal core'),
     'module' => t('Modules'),
     'theme' => t('Themes'),
     'module-disabled' => t('Uninstalled modules'),
     'theme-disabled' => t('Uninstalled themes'),
-  );
+  ];
 
-  $variables['project_types'] = array();
+  $variables['project_types'] = [];
   foreach ($project_types as $type_name => $type_label) {
     if (!empty($rows[$type_name])) {
       ksort($rows[$type_name]);
-      $variables['project_types'][] = array(
+      $variables['project_types'][] = [
         'label' => $type_label,
         'table' => $rows[$type_name],
-      );
+      ];
     }
   }
 }
@@ -124,9 +124,9 @@ function template_preprocess_update_project_status(&$variables) {
 
   $variables['existing_version'] = $project['existing_version'];
 
-  $versions_inner = array();
-  $security_class = array();
-  $version_class = array();
+  $versions_inner = [];
+  $security_class = [];
+  $version_class = [];
   if (isset($project['recommended'])) {
     if ($project['status'] != UPDATE_CURRENT || $project['existing_version'] !== $project['recommended']) {
 
@@ -156,57 +156,57 @@ function template_preprocess_update_project_status(&$variables) {
         ) {
           $version_class[] = 'project-update__version--recommended-strong';
         }
-        $versions_inner[] = array(
+        $versions_inner[] = [
           '#theme' => 'update_version',
           '#version' => $project['releases'][$project['recommended']],
           '#title' => t('Recommended version:'),
-          '#attributes' => array('class' => $version_class),
-        );
+          '#attributes' => ['class' => $version_class],
+        ];
       }
 
       // Now, print any security updates.
       if (!empty($project['security updates'])) {
         $security_class[] = 'version-security';
         foreach ($project['security updates'] as $security_update) {
-          $versions_inner[] = array(
+          $versions_inner[] = [
             '#theme' => 'update_version',
             '#version' => $security_update,
             '#title' => t('Security update:'),
-            '#attributes' => array('class' => $security_class),
-          );
+            '#attributes' => ['class' => $security_class],
+          ];
         }
       }
     }
 
     if ($project['recommended'] !== $project['latest_version']) {
-      $versions_inner[] = array(
+      $versions_inner[] = [
         '#theme' => 'update_version',
         '#version' => $project['releases'][$project['latest_version']],
         '#title' => t('Latest version:'),
-        '#attributes' => array('class' => array('version-latest')),
-      );
+        '#attributes' => ['class' => ['version-latest']],
+      ];
     }
     if ($project['install_type'] == 'dev'
       && $project['status'] != UPDATE_CURRENT
       && isset($project['dev_version'])
       && $project['recommended'] !== $project['dev_version']) {
-      $versions_inner[] = array(
+      $versions_inner[] = [
         '#theme' => 'update_version',
         '#version' => $project['releases'][$project['dev_version']],
         '#title' => t('Development version:'),
-        '#attributes' => array('class' => array('version-latest')),
-      );
+        '#attributes' => ['class' => ['version-latest']],
+      ];
     }
   }
 
   if (isset($project['also'])) {
     foreach ($project['also'] as $also) {
-      $versions_inner[] = array(
+      $versions_inner[] = [
         '#theme' => 'update_version',
         '#version' => $project['releases'][$also],
         '#title' => t('Also available:'),
-        '#attributes' => array('class' => array('version-also-available')),
-      );
+        '#attributes' => ['class' => ['version-also-available']],
+      ];
     }
   }
 
@@ -222,10 +222,10 @@ function template_preprocess_update_project_status(&$variables) {
   sort($project['includes']);
   $variables['includes'] = $project['includes'];
 
-  $variables['extras'] = array();
+  $variables['extras'] = [];
   if (!empty($project['extra'])) {
     foreach ($project['extra'] as $value) {
-      $extra_item = array();
+      $extra_item = [];
       $extra_item['attributes'] = new Attribute();
       $extra_item['label'] = $value['label'];
       $extra_item['data'] = [
@@ -285,12 +285,12 @@ function template_preprocess_update_project_status(&$variables) {
       break;
   }
 
-  $variables['status']['icon'] = array(
+  $variables['status']['icon'] = [
     '#theme' => 'image',
     '#width' => 18,
     '#height' => 18,
     '#uri' => $uri,
     '#alt' => $text,
     '#title' => $text,
-  );
+  ];
 }
diff --git a/web/core/modules/user/config/optional/views.view.user_admin_people.yml b/web/core/modules/user/config/optional/views.view.user_admin_people.yml
index 386b10ead..e829a2098 100644
--- a/web/core/modules/user/config/optional/views.view.user_admin_people.yml
+++ b/web/core/modules/user/config/optional/views.view.user_admin_people.yml
@@ -617,6 +617,54 @@ display:
             name: name
             mail: mail
           plugin_id: combine
+        status:
+          id: status
+          table: users_field_data
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: true
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: status_op
+            identifier: status
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: true
+          group_info:
+            label: Status
+            description: ''
+            identifier: status
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1:
+                title: Active
+                operator: '='
+                value: '1'
+              2:
+                title: Blocked
+                operator: '='
+                value: '0'
+          plugin_id: boolean
+          entity_type: user
+          entity_field: status
         roles_target_id:
           id: roles_target_id
           table: user__roles
@@ -697,54 +745,6 @@ display:
             group_items: {  }
           reduce_duplicates: false
           plugin_id: user_permissions
-        status:
-          id: status
-          table: users_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: true
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: status_op
-            identifier: status
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: true
-          group_info:
-            label: Status
-            description: ''
-            identifier: status
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: Active
-                operator: '='
-                value: '1'
-              2:
-                title: Blocked
-                operator: '='
-                value: '0'
-          plugin_id: boolean
-          entity_type: user
-          entity_field: status
         default_langcode:
           id: default_langcode
           table: users_field_data
diff --git a/web/core/modules/user/migration_templates/d6_user_picture_file.yml b/web/core/modules/user/migration_templates/d6_user_picture_file.yml
index d367f33b9..3518d7a6e 100644
--- a/web/core/modules/user/migration_templates/d6_user_picture_file.yml
+++ b/web/core/modules/user/migration_templates/d6_user_picture_file.yml
@@ -11,9 +11,6 @@ source:
     # table are specified, and must end with a /.
     source_base_path: ''
 process:
-    # If you are using both this migration and d6_file in a custom migration
-    # and executing migrations incrementally, it is recommended that you
-    # remove the fid mapping from d6_file to avoid potential ID conflicts.
   filename: filename
   uid: uid
   source_full_path:
diff --git a/web/core/modules/user/src/AccountForm.php b/web/core/modules/user/src/AccountForm.php
index dbdb08b8d..f5e2e49ac 100644
--- a/web/core/modules/user/src/AccountForm.php
+++ b/web/core/modules/user/src/AccountForm.php
@@ -2,11 +2,12 @@
 
 namespace Drupal\user;
 
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityConstraintViolationListInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
@@ -27,13 +28,6 @@ abstract class AccountForm extends ContentEntityForm {
    */
   protected $languageManager;
 
-  /**
-   * The entity query factory service.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $entityQuery;
-
   /**
    * Constructs a new EntityForm object.
    *
@@ -41,13 +35,14 @@ abstract class AccountForm extends ContentEntityForm {
    *   The entity manager.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query
-   *   The entity query factory.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle service.
+   * @param \Drupal\Component\Datetime\TimeInterface $time
+   *   The time service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager, QueryFactory $entity_query) {
-    parent::__construct($entity_manager);
+  public function __construct(EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL) {
+    parent::__construct($entity_manager, $entity_type_bundle_info, $time);
     $this->languageManager = $language_manager;
-    $this->entityQuery = $entity_query;
   }
 
   /**
@@ -57,7 +52,8 @@ abstract class AccountForm extends ContentEntityForm {
     return new static(
       $container->get('entity.manager'),
       $container->get('language_manager'),
-      $container->get('entity.query')
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time')
     );
   }
 
@@ -76,48 +72,48 @@ abstract class AccountForm extends ContentEntityForm {
     $admin = $user->hasPermission('administer users');
 
     // Account information.
-    $form['account'] = array(
+    $form['account'] = [
       '#type'   => 'container',
       '#weight' => -10,
-    );
+    ];
 
     // The mail field is NOT required if account originally had no mail set
     // and the user performing the edit has 'administer users' permission.
     // This allows users without email address to be edited and deleted.
     // Also see \Drupal\user\Plugin\Validation\Constraint\UserMailRequired.
-    $form['account']['mail'] = array(
+    $form['account']['mail'] = [
       '#type' => 'email',
       '#title' => $this->t('Email address'),
       '#description' => $this->t('A valid email address. All emails from the system will be sent to this address. The email address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by email.'),
       '#required' => !(!$account->getEmail() && $user->hasPermission('administer users')),
       '#default_value' => (!$register ? $account->getEmail() : ''),
-    );
+    ];
 
     // Only show name field on registration form or user can change own username.
-    $form['account']['name'] = array(
+    $form['account']['name'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Username'),
       '#maxlength' => USERNAME_MAX_LENGTH,
       '#description' => $this->t("Several special characters are allowed, including space, period (.), hyphen (-), apostrophe ('), underscore (_), and the @ sign."),
       '#required' => TRUE,
-      '#attributes' => array(
-        'class' => array('username'),
+      '#attributes' => [
+        'class' => ['username'],
         'autocorrect' => 'off',
         'autocapitalize' => 'off',
         'spellcheck' => 'false',
-      ),
-      '#default_value' => (!$register ? $account->getUsername() : ''),
+      ],
+      '#default_value' => (!$register ? $account->getAccountName() : ''),
       '#access' => ($register || ($user->id() == $account->id() && $user->hasPermission('change own username')) || $admin),
-    );
+    ];
 
     // Display password field only for existing users or when user is allowed to
     // assign a password during registration.
     if (!$register) {
-      $form['account']['pass'] = array(
+      $form['account']['pass'] = [
         '#type' => 'password_confirm',
         '#size' => 25,
         '#description' => $this->t('To change the current user password, enter the new password in both fields.'),
-      );
+      ];
 
       // To skip the current password field, the user must have logged in via a
       // one-time link and have the token in the URL. Store this in $form_state
@@ -130,7 +126,7 @@ abstract class AccountForm extends ContentEntityForm {
 
       // The user must enter their current password to change to a new one.
       if ($user->id() == $account->id()) {
-        $form['account']['current_pass'] = array(
+        $form['account']['current_pass'] = [
           '#type' => 'password',
           '#title' => $this->t('Current password'),
           '#size' => 25,
@@ -139,34 +135,34 @@ abstract class AccountForm extends ContentEntityForm {
           // Do not let web browsers remember this password, since we are
           // trying to confirm that the person submitting the form actually
           // knows the current one.
-          '#attributes' => array('autocomplete' => 'off'),
-        );
+          '#attributes' => ['autocomplete' => 'off'],
+        ];
         $form_state->set('user', $account);
 
         // The user may only change their own password without their current
         // password if they logged in via a one-time login link.
         if (!$form_state->get('user_pass_reset')) {
-          $form['account']['current_pass']['#description'] = $this->t('Required if you want to change the %mail or %pass below. <a href=":request_new_url" title="Send password reset instructions via email.">Reset your password</a>.', array(
+          $form['account']['current_pass']['#description'] = $this->t('Required if you want to change the %mail or %pass below. <a href=":request_new_url" title="Send password reset instructions via email.">Reset your password</a>.', [
             '%mail' => $form['account']['mail']['#title'],
             '%pass' => $this->t('Password'),
             ':request_new_url' => $this->url('user.pass'),
-          ));
+          ]);
         }
       }
     }
     elseif (!$config->get('verify_mail') || $admin) {
-      $form['account']['pass'] = array(
+      $form['account']['pass'] = [
         '#type' => 'password_confirm',
         '#size' => 25,
         '#description' => $this->t('Provide a password for the new account in both fields.'),
         '#required' => TRUE,
-      );
+      ];
     }
 
     // When not building the user registration form, prevent web browsers from
     // autofilling/prefilling the email, username, and password fields.
     if ($this->getOperation() != 'register') {
-      foreach (array('mail', 'name', 'pass') as $key) {
+      foreach (['mail', 'name', 'pass'] as $key) {
         if (isset($form['account'][$key])) {
           $form['account'][$key]['#attributes']['autocomplete'] = 'off';
         }
@@ -180,35 +176,35 @@ abstract class AccountForm extends ContentEntityForm {
       $status = $config->get('register') == USER_REGISTER_VISITORS ? 1 : 0;
     }
 
-    $form['account']['status'] = array(
+    $form['account']['status'] = [
       '#type' => 'radios',
       '#title' => $this->t('Status'),
       '#default_value' => $status,
-      '#options' => array($this->t('Blocked'), $this->t('Active')),
+      '#options' => [$this->t('Blocked'), $this->t('Active')],
       '#access' => $admin,
-    );
+    ];
 
-    $roles = array_map(array('\Drupal\Component\Utility\Html', 'escape'), user_role_names(TRUE));
+    $roles = array_map(['\Drupal\Component\Utility\Html', 'escape'], user_role_names(TRUE));
 
-    $form['account']['roles'] = array(
+    $form['account']['roles'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Roles'),
-      '#default_value' => (!$register ? $account->getRoles() : array()),
+      '#default_value' => (!$register ? $account->getRoles() : []),
       '#options' => $roles,
       '#access' => $roles && $user->hasPermission('administer permissions'),
-    );
+    ];
 
     // Special handling for the inevitable "Authenticated user" role.
-    $form['account']['roles'][RoleInterface::AUTHENTICATED_ID] = array(
+    $form['account']['roles'][RoleInterface::AUTHENTICATED_ID] = [
       '#default_value' => TRUE,
       '#disabled' => TRUE,
-    );
+    ];
 
-    $form['account']['notify'] = array(
+    $form['account']['notify'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Notify user of new account'),
       '#access' => $register && $admin,
-    );
+    ];
 
     $user_preferred_langcode = $register ? $language_interface->getId() : $account->getPreferredLangcode();
 
@@ -220,16 +216,16 @@ abstract class AccountForm extends ContentEntityForm {
       $negotiator = $this->languageManager->getNegotiator();
       $user_language_added = $negotiator && $negotiator->isNegotiationMethodEnabled(LanguageNegotiationUser::METHOD_ID, LanguageInterface::TYPE_INTERFACE);
     }
-    $form['language'] = array(
+    $form['language'] = [
       '#type' => $this->languageManager->isMultilingual() ? 'details' : 'container',
       '#title' => $this->t('Language settings'),
       '#open' => TRUE,
       // Display language selector when either creating a user on the admin
       // interface or editing a user account.
       '#access' => !$register || $user->hasPermission('administer users'),
-    );
+    ];
 
-    $form['language']['preferred_langcode'] = array(
+    $form['language']['preferred_langcode'] = [
       '#type' => 'language_select',
       '#title' => $this->t('Site language'),
       '#languages' => LanguageInterface::STATE_CONFIGURABLE,
@@ -239,7 +235,7 @@ abstract class AccountForm extends ContentEntityForm {
       // language are synchronized. It can be removed if a different behavior is
       // desired.
       '#pre_render' => ['user_langcode' => [$this, 'alterPreferredLangcodeDescription']],
-    );
+    ];
 
     // Only show the account setting for Administration pages language to users
     // if one of the detection and selection methods uses it.
@@ -248,7 +244,7 @@ abstract class AccountForm extends ContentEntityForm {
       $negotiator = $this->languageManager->getNegotiator();
       $show_admin_language = $negotiator && $negotiator->isNegotiationMethodEnabled(LanguageNegotiationUserAdmin::METHOD_ID);
     }
-    $form['language']['preferred_admin_langcode'] = array(
+    $form['language']['preferred_admin_langcode'] = [
       '#type' => 'language_select',
       '#title' => $this->t('Administration pages language'),
       '#languages' => LanguageInterface::STATE_CONFIGURABLE,
@@ -256,7 +252,7 @@ abstract class AccountForm extends ContentEntityForm {
       '#access' => $show_admin_language,
       '#empty_option' => $this->t('- No preference -'),
       '#empty_value' => '',
-    );
+    ];
 
     // User entities contain both a langcode property (for identifying the
     // language of the entity data) and a preferred_langcode property (see
@@ -265,7 +261,7 @@ abstract class AccountForm extends ContentEntityForm {
     // language. This entity builder provides that synchronization. For
     // use-cases where this synchronization is not desired, a module can alter
     // or remove this item.
-    $form['#entity_builders']['sync_user_langcode'] = [$this, 'syncUserLangcode'];
+    $form['#entity_builders']['sync_user_langcode'] = '::syncUserLangcode';
 
     return parent::form($form, $form_state, $account);
   }
@@ -321,7 +317,7 @@ abstract class AccountForm extends ContentEntityForm {
     $account = parent::buildEntity($form, $form_state);
 
     // Translate the empty value '' of language selects to an unset field.
-    foreach (array('preferred_langcode', 'preferred_admin_langcode') as $field_name) {
+    foreach (['preferred_langcode', 'preferred_admin_langcode'] as $field_name) {
       if ($form_state->getValue($field_name) === '') {
         $account->$field_name = NULL;
       }
@@ -344,7 +340,7 @@ abstract class AccountForm extends ContentEntityForm {
    * {@inheritdoc}
    */
   protected function getEditedFieldNames(FormStateInterface $form_state) {
-    return array_merge(array(
+    return array_merge([
       'name',
       'pass',
       'mail',
@@ -352,7 +348,7 @@ abstract class AccountForm extends ContentEntityForm {
       'langcode',
       'preferred_langcode',
       'preferred_admin_langcode'
-    ), parent::getEditedFieldNames($form_state));
+    ], parent::getEditedFieldNames($form_state));
   }
 
   /**
@@ -362,7 +358,7 @@ abstract class AccountForm extends ContentEntityForm {
     // Manually flag violations of fields not handled by the form display. This
     // is necessary as entity form displays only flag violations for fields
     // contained in the display.
-    $field_names = array(
+    $field_names = [
       'name',
       'pass',
       'mail',
@@ -370,7 +366,7 @@ abstract class AccountForm extends ContentEntityForm {
       'langcode',
       'preferred_langcode',
       'preferred_admin_langcode'
-    );
+    ];
     foreach ($violations->getByFields($field_names) as $violation) {
       list($field_name) = explode('.', $violation->getPropertyPath(), 2);
       $form_state->setErrorByName($field_name, $violation->getMessage());
diff --git a/web/core/modules/user/src/AccountSettingsForm.php b/web/core/modules/user/src/AccountSettingsForm.php
index 1e5cd4980..eacc37857 100644
--- a/web/core/modules/user/src/AccountSettingsForm.php
+++ b/web/core/modules/user/src/AccountSettingsForm.php
@@ -85,25 +85,25 @@ class AccountSettingsForm extends ConfigFormBase {
     $form['#attached']['library'][] = 'user/drupal.user.admin';
 
     // Settings for anonymous users.
-    $form['anonymous_settings'] = array(
+    $form['anonymous_settings'] = [
       '#type' => 'details',
       '#title' => $this->t('Anonymous users'),
       '#open' => TRUE,
-    );
-    $form['anonymous_settings']['anonymous'] = array(
+    ];
+    $form['anonymous_settings']['anonymous'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Name'),
       '#default_value' => $config->get('anonymous'),
       '#description' => $this->t('The name used to indicate anonymous users.'),
       '#required' => TRUE,
-    );
+    ];
 
     // Administrative role option.
-    $form['admin_role'] = array(
+    $form['admin_role'] = [
       '#type' => 'details',
       '#title' => $this->t('Administrator role'),
       '#open' => TRUE,
-    );
+    ];
     // Do not allow users to set the anonymous or authenticated user roles as the
     // administrator role.
     $roles = user_role_names(TRUE);
@@ -114,7 +114,7 @@ class AccountSettingsForm extends ConfigFormBase {
       ->execute();
     $default_value = reset($admin_roles);
 
-    $form['admin_role']['user_admin_role'] = array(
+    $form['admin_role']['user_admin_role'] = [
       '#type' => 'select',
       '#title' => $this->t('Administrator role'),
       '#empty_value' => '',
@@ -124,53 +124,53 @@ class AccountSettingsForm extends ConfigFormBase {
       // Don't allow to select a single admin role in case multiple roles got
       // marked as admin role already.
       '#access' => count($admin_roles) <= 1,
-    );
+    ];
 
     // @todo Remove this check once language settings are generalized.
     if ($this->moduleHandler->moduleExists('content_translation')) {
-      $form['language'] = array(
+      $form['language'] = [
         '#type' => 'details',
         '#title' => $this->t('Language settings'),
         '#open' => TRUE,
         '#tree' => TRUE,
-      );
+      ];
       $form_state->set(['content_translation', 'key'], 'language');
       $form['language'] += content_translation_enable_widget('user', 'user', $form, $form_state);
     }
 
     // User registration settings.
-    $form['registration_cancellation'] = array(
+    $form['registration_cancellation'] = [
       '#type' => 'details',
       '#title' => $this->t('Registration and cancellation'),
       '#open' => TRUE,
-    );
-    $form['registration_cancellation']['user_register'] = array(
+    ];
+    $form['registration_cancellation']['user_register'] = [
       '#type' => 'radios',
       '#title' => $this->t('Who can register accounts?'),
       '#default_value' => $config->get('register'),
-      '#options' => array(
+      '#options' => [
         USER_REGISTER_ADMINISTRATORS_ONLY => $this->t('Administrators only'),
         USER_REGISTER_VISITORS => $this->t('Visitors'),
         USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL => $this->t('Visitors, but administrator approval is required'),
-      )
-    );
-    $form['registration_cancellation']['user_email_verification'] = array(
+      ]
+    ];
+    $form['registration_cancellation']['user_email_verification'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Require email verification when a visitor creates an account'),
       '#default_value' => $config->get('verify_mail'),
       '#description' => $this->t('New users will be required to validate their email address prior to logging into the site, and will be assigned a system-generated password. With this setting disabled, users will be logged in immediately upon registering, and may select their own passwords during registration.')
-    );
-    $form['registration_cancellation']['user_password_strength'] = array(
+    ];
+    $form['registration_cancellation']['user_password_strength'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Enable password strength indicator'),
       '#default_value' => $config->get('password_strength'),
-    );
-    $form['registration_cancellation']['user_cancel_method'] = array(
+    ];
+    $form['registration_cancellation']['user_cancel_method'] = [
       '#type' => 'radios',
       '#title' => $this->t('When cancelling a user account'),
       '#default_value' => $config->get('cancel_method'),
-      '#description' => $this->t('Users with the %select-cancel-method or %administer-users <a href=":permissions-url">permissions</a> can override this default method.', array('%select-cancel-method' => $this->t('Select method for cancelling account'), '%administer-users' => $this->t('Administer users'), ':permissions-url' => $this->url('user.admin_permissions'))),
-    );
+      '#description' => $this->t('Users with the %select-cancel-method or %administer-users <a href=":permissions-url">permissions</a> can override this default method.', ['%select-cancel-method' => $this->t('Select method for cancelling account'), '%administer-users' => $this->t('Administer users'), ':permissions-url' => $this->url('user.admin_permissions')]),
+    ];
     $form['registration_cancellation']['user_cancel_method'] += user_cancel_methods();
     foreach (Element::children($form['registration_cancellation']['user_cancel_method']) as $key) {
       // All account cancellation methods that specify #access cannot be
@@ -182,239 +182,239 @@ class AccountSettingsForm extends ConfigFormBase {
     }
 
     // Default notifications address.
-    $form['mail_notification_address'] = array(
+    $form['mail_notification_address'] = [
       '#type' => 'email',
       '#title' => $this->t('Notification email address'),
       '#default_value' => $site_config->get('mail_notification'),
-      '#description' => $this->t("The email address to be used as the 'from' address for all account notifications listed below. If <em>'Visitors, but administrator approval is required'</em> is selected above, a notification email will also be sent to this address for any new registrations. Leave empty to use the default system email address <em>(%site-email).</em>", array('%site-email' => $site_config->get('mail'))),
+      '#description' => $this->t("The email address to be used as the 'from' address for all account notifications listed below. If <em>'Visitors, but administrator approval is required'</em> is selected above, a notification email will also be sent to this address for any new registrations. Leave empty to use the default system email address <em>(%site-email).</em>", ['%site-email' => $site_config->get('mail')]),
       '#maxlength' => 180,
-    );
+    ];
 
-    $form['email'] = array(
+    $form['email'] = [
       '#type' => 'vertical_tabs',
       '#title' => $this->t('Emails'),
-    );
+    ];
     // These email tokens are shared for all settings, so just define
     // the list once to help ensure they stay in sync.
     $email_token_help = $this->t('Available variables are: [site:name], [site:url], [user:display-name], [user:account-name], [user:mail], [site:login-url], [site:url-brief], [user:edit-url], [user:one-time-login-url], [user:cancel-url].');
 
-    $form['email_admin_created'] = array(
+    $form['email_admin_created'] = [
       '#type' => 'details',
       '#title' => $this->t('Welcome (new user created by administrator)'),
       '#open' => $config->get('register') == USER_REGISTER_ADMINISTRATORS_ONLY,
       '#description' => $this->t('Edit the welcome email messages sent to new member accounts created by an administrator.') . ' ' . $email_token_help,
       '#group' => 'email',
-    );
-    $form['email_admin_created']['user_mail_register_admin_created_subject'] = array(
+    ];
+    $form['email_admin_created']['user_mail_register_admin_created_subject'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Subject'),
       '#default_value' => $mail_config->get('register_admin_created.subject'),
       '#maxlength' => 180,
-    );
-    $form['email_admin_created']['user_mail_register_admin_created_body'] = array(
+    ];
+    $form['email_admin_created']['user_mail_register_admin_created_body'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Body'),
       '#default_value' => $mail_config->get('register_admin_created.body'),
       '#rows' => 15,
-    );
+    ];
 
-    $form['email_pending_approval'] = array(
+    $form['email_pending_approval'] = [
       '#type' => 'details',
       '#title' => $this->t('Welcome (awaiting approval)'),
       '#open' => $config->get('register') == USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL,
       '#description' => $this->t('Edit the welcome email messages sent to new members upon registering, when administrative approval is required.') . ' ' . $email_token_help,
       '#group' => 'email',
-    );
-    $form['email_pending_approval']['user_mail_register_pending_approval_subject'] = array(
+    ];
+    $form['email_pending_approval']['user_mail_register_pending_approval_subject'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Subject'),
       '#default_value' => $mail_config->get('register_pending_approval.subject'),
       '#maxlength' => 180,
-    );
-    $form['email_pending_approval']['user_mail_register_pending_approval_body'] = array(
+    ];
+    $form['email_pending_approval']['user_mail_register_pending_approval_body'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Body'),
       '#default_value' => $mail_config->get('register_pending_approval.body'),
       '#rows' => 8,
-    );
+    ];
 
-    $form['email_pending_approval_admin'] = array(
+    $form['email_pending_approval_admin'] = [
       '#type' => 'details',
       '#title' => $this->t('Admin (user awaiting approval)'),
       '#open' => $config->get('register') == USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL,
       '#description' => $this->t('Edit the email notifying the site administrator that there are new members awaiting administrative approval.') . ' ' . $email_token_help,
       '#group' => 'email',
-    );
-    $form['email_pending_approval_admin']['register_pending_approval_admin_subject'] = array(
+    ];
+    $form['email_pending_approval_admin']['register_pending_approval_admin_subject'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Subject'),
       '#default_value' => $mail_config->get('register_pending_approval_admin.subject'),
       '#maxlength' => 180,
-    );
-    $form['email_pending_approval_admin']['register_pending_approval_admin_body'] = array(
+    ];
+    $form['email_pending_approval_admin']['register_pending_approval_admin_body'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Body'),
       '#default_value' => $mail_config->get('register_pending_approval_admin.body'),
       '#rows' => 8,
-    );
+    ];
 
-    $form['email_no_approval_required'] = array(
+    $form['email_no_approval_required'] = [
       '#type' => 'details',
       '#title' => $this->t('Welcome (no approval required)'),
       '#open' => $config->get('register') == USER_REGISTER_VISITORS,
       '#description' => $this->t('Edit the welcome email messages sent to new members upon registering, when no administrator approval is required.') . ' ' . $email_token_help,
       '#group' => 'email',
-    );
-    $form['email_no_approval_required']['user_mail_register_no_approval_required_subject'] = array(
+    ];
+    $form['email_no_approval_required']['user_mail_register_no_approval_required_subject'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Subject'),
       '#default_value' => $mail_config->get('register_no_approval_required.subject'),
       '#maxlength' => 180,
-    );
-    $form['email_no_approval_required']['user_mail_register_no_approval_required_body'] = array(
+    ];
+    $form['email_no_approval_required']['user_mail_register_no_approval_required_body'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Body'),
       '#default_value' => $mail_config->get('register_no_approval_required.body'),
       '#rows' => 15,
-    );
+    ];
 
-    $form['email_password_reset'] = array(
+    $form['email_password_reset'] = [
       '#type' => 'details',
       '#title' => $this->t('Password recovery'),
       '#description' => $this->t('Edit the email messages sent to users who request a new password.') . ' ' . $email_token_help,
       '#group' => 'email',
       '#weight' => 10,
-    );
-    $form['email_password_reset']['user_mail_password_reset_subject'] = array(
+    ];
+    $form['email_password_reset']['user_mail_password_reset_subject'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Subject'),
       '#default_value' => $mail_config->get('password_reset.subject'),
       '#maxlength' => 180,
-    );
-    $form['email_password_reset']['user_mail_password_reset_body'] = array(
+    ];
+    $form['email_password_reset']['user_mail_password_reset_body'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Body'),
       '#default_value' => $mail_config->get('password_reset.body'),
       '#rows' => 12,
-    );
+    ];
 
-    $form['email_activated'] = array(
+    $form['email_activated'] = [
       '#type' => 'details',
       '#title' => $this->t('Account activation'),
       '#description' => $this->t('Enable and edit email messages sent to users upon account activation (when an administrator activates an account of a user who has already registered, on a site where administrative approval is required).') . ' ' . $email_token_help,
       '#group' => 'email',
-    );
-    $form['email_activated']['user_mail_status_activated_notify'] = array(
+    ];
+    $form['email_activated']['user_mail_status_activated_notify'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Notify user when account is activated'),
       '#default_value' => $config->get('notify.status_activated'),
-    );
-    $form['email_activated']['settings'] = array(
+    ];
+    $form['email_activated']['settings'] = [
       '#type' => 'container',
-      '#states' => array(
+      '#states' => [
         // Hide the additional settings when this email is disabled.
-        'invisible' => array(
-          'input[name="user_mail_status_activated_notify"]' => array('checked' => FALSE),
-        ),
-      ),
-    );
-    $form['email_activated']['settings']['user_mail_status_activated_subject'] = array(
+        'invisible' => [
+          'input[name="user_mail_status_activated_notify"]' => ['checked' => FALSE],
+        ],
+      ],
+    ];
+    $form['email_activated']['settings']['user_mail_status_activated_subject'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Subject'),
       '#default_value' => $mail_config->get('status_activated.subject'),
       '#maxlength' => 180,
-    );
-    $form['email_activated']['settings']['user_mail_status_activated_body'] = array(
+    ];
+    $form['email_activated']['settings']['user_mail_status_activated_body'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Body'),
       '#default_value' => $mail_config->get('status_activated.body'),
       '#rows' => 15,
-    );
+    ];
 
-    $form['email_blocked'] = array(
+    $form['email_blocked'] = [
       '#type' => 'details',
       '#title' => $this->t('Account blocked'),
       '#description' => $this->t('Enable and edit email messages sent to users when their accounts are blocked.') . ' ' . $email_token_help,
       '#group' => 'email',
-    );
-    $form['email_blocked']['user_mail_status_blocked_notify'] = array(
+    ];
+    $form['email_blocked']['user_mail_status_blocked_notify'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Notify user when account is blocked'),
       '#default_value' => $config->get('notify.status_blocked'),
-    );
-    $form['email_blocked']['settings'] = array(
+    ];
+    $form['email_blocked']['settings'] = [
       '#type' => 'container',
-      '#states' => array(
+      '#states' => [
         // Hide the additional settings when the blocked email is disabled.
-        'invisible' => array(
-          'input[name="user_mail_status_blocked_notify"]' => array('checked' => FALSE),
-        ),
-      ),
-    );
-    $form['email_blocked']['settings']['user_mail_status_blocked_subject'] = array(
+        'invisible' => [
+          'input[name="user_mail_status_blocked_notify"]' => ['checked' => FALSE],
+        ],
+      ],
+    ];
+    $form['email_blocked']['settings']['user_mail_status_blocked_subject'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Subject'),
       '#default_value' => $mail_config->get('status_blocked.subject'),
       '#maxlength' => 180,
-    );
-    $form['email_blocked']['settings']['user_mail_status_blocked_body'] = array(
+    ];
+    $form['email_blocked']['settings']['user_mail_status_blocked_body'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Body'),
       '#default_value' => $mail_config->get('status_blocked.body'),
       '#rows' => 3,
-    );
+    ];
 
-    $form['email_cancel_confirm'] = array(
+    $form['email_cancel_confirm'] = [
       '#type' => 'details',
       '#title' => $this->t('Account cancellation confirmation'),
       '#description' => $this->t('Edit the email messages sent to users when they attempt to cancel their accounts.') . ' ' . $email_token_help,
       '#group' => 'email',
-    );
-    $form['email_cancel_confirm']['user_mail_cancel_confirm_subject'] = array(
+    ];
+    $form['email_cancel_confirm']['user_mail_cancel_confirm_subject'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Subject'),
       '#default_value' => $mail_config->get('cancel_confirm.subject'),
       '#maxlength' => 180,
-    );
-    $form['email_cancel_confirm']['user_mail_cancel_confirm_body'] = array(
+    ];
+    $form['email_cancel_confirm']['user_mail_cancel_confirm_body'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Body'),
       '#default_value' => $mail_config->get('cancel_confirm.body'),
       '#rows' => 3,
-    );
+    ];
 
-    $form['email_canceled'] = array(
+    $form['email_canceled'] = [
       '#type' => 'details',
       '#title' => $this->t('Account canceled'),
       '#description' => $this->t('Enable and edit email messages sent to users when their accounts are canceled.') . ' ' . $email_token_help,
       '#group' => 'email',
-    );
-    $form['email_canceled']['user_mail_status_canceled_notify'] = array(
+    ];
+    $form['email_canceled']['user_mail_status_canceled_notify'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Notify user when account is canceled'),
       '#default_value' => $config->get('notify.status_canceled'),
-    );
-    $form['email_canceled']['settings'] = array(
+    ];
+    $form['email_canceled']['settings'] = [
       '#type' => 'container',
-      '#states' => array(
+      '#states' => [
         // Hide the settings when the cancel notify checkbox is disabled.
-        'invisible' => array(
-          'input[name="user_mail_status_canceled_notify"]' => array('checked' => FALSE),
-        ),
-      ),
-    );
-    $form['email_canceled']['settings']['user_mail_status_canceled_subject'] = array(
+        'invisible' => [
+          'input[name="user_mail_status_canceled_notify"]' => ['checked' => FALSE],
+        ],
+      ],
+    ];
+    $form['email_canceled']['settings']['user_mail_status_canceled_subject'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Subject'),
       '#default_value' => $mail_config->get('status_canceled.subject'),
       '#maxlength' => 180,
-    );
-    $form['email_canceled']['settings']['user_mail_status_canceled_body'] = array(
+    ];
+    $form['email_canceled']['settings']['user_mail_status_canceled_body'] = [
       '#type' => 'textarea',
       '#title' => $this->t('Body'),
       '#default_value' => $mail_config->get('status_canceled.body'),
       '#rows' => 3,
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/user/src/Controller/UserController.php b/web/core/modules/user/src/Controller/UserController.php
index 779cf90fb..be15fac4a 100644
--- a/web/core/modules/user/src/Controller/UserController.php
+++ b/web/core/modules/user/src/Controller/UserController.php
@@ -121,7 +121,7 @@ class UserController extends ControllerBase {
         /** @var \Drupal\user\UserInterface $reset_link_user */
         if ($reset_link_user = $this->userStorage->load($uid)) {
           drupal_set_message($this->t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please <a href=":logout">log out</a> and try using the link again.',
-            array('%other_user' => $account->getUsername(), '%resetting_user' => $reset_link_user->getUsername(), ':logout' => $this->url('user.logout'))), 'warning');
+            ['%other_user' => $account->getUsername(), '%resetting_user' => $reset_link_user->getUsername(), ':logout' => $this->url('user.logout')]), 'warning');
         }
         else {
           // Invalid one-time link specifies an unknown user.
@@ -254,7 +254,7 @@ class UserController extends ControllerBase {
    *   Returns a redirect to the profile of the currently logged in user.
    */
   public function userPage() {
-    return $this->redirect('entity.user.canonical', array('user' => $this->currentUser()->id()));
+    return $this->redirect('entity.user.canonical', ['user' => $this->currentUser()->id()]);
   }
 
   /**
@@ -305,9 +305,9 @@ class UserController extends ControllerBase {
     if (isset($account_data['cancel_method']) && !empty($timestamp) && !empty($hashed_pass)) {
       // Validate expiration and hashed password/login.
       if ($timestamp <= $current && $current - $timestamp < $timeout && $user->id() && $timestamp >= $user->getLastLoginTime() && Crypt::hashEquals($hashed_pass, user_pass_rehash($user, $timestamp))) {
-        $edit = array(
+        $edit = [
           'user_cancel_notify' => isset($account_data['cancel_notify']) ? $account_data['cancel_notify'] : $this->config('user.settings')->get('notify.status_canceled'),
-        );
+        ];
         user_cancel($edit, $user->id(), $account_data['cancel_method']);
         // Since user_cancel() is not invoked via Form API, batch processing
         // needs to be invoked manually and should redirect to the front page
diff --git a/web/core/modules/user/src/Entity/Role.php b/web/core/modules/user/src/Entity/Role.php
index 5ecbc0286..0e7ef0e5c 100644
--- a/web/core/modules/user/src/Entity/Role.php
+++ b/web/core/modules/user/src/Entity/Role.php
@@ -72,7 +72,7 @@ class Role extends ConfigEntityBase implements RoleInterface {
    *
    * @var array
    */
-  protected $permissions = array();
+  protected $permissions = [];
 
   /**
    * An indicator whether the role has all permissions.
@@ -136,7 +136,7 @@ class Role extends ConfigEntityBase implements RoleInterface {
     if ($this->isAdmin()) {
       return $this;
     }
-    $this->permissions = array_diff($this->permissions, array($permission));
+    $this->permissions = array_diff($this->permissions, [$permission]);
     return $this;
   }
 
@@ -178,6 +178,12 @@ class Role extends ConfigEntityBase implements RoleInterface {
       });
       $this->weight = $max + 1;
     }
+
+    if (!$this->isSyncing()) {
+      // Permissions are always ordered alphabetically to avoid conflicts in the
+      // exported configuration.
+      sort($this->permissions);
+    }
   }
 
 }
diff --git a/web/core/modules/user/src/Entity/User.php b/web/core/modules/user/src/Entity/User.php
index 6a3d6b161..752953258 100644
--- a/web/core/modules/user/src/Entity/User.php
+++ b/web/core/modules/user/src/Entity/User.php
@@ -82,13 +82,13 @@ class User extends ContentEntityBase implements UserInterface {
 
     // Make sure that the authenticated/anonymous roles are not persisted.
     foreach ($this->get('roles') as $index => $item) {
-      if (in_array($item->target_id, array(RoleInterface::ANONYMOUS_ID, RoleInterface::AUTHENTICATED_ID))) {
+      if (in_array($item->target_id, [RoleInterface::ANONYMOUS_ID, RoleInterface::AUTHENTICATED_ID])) {
         $this->get('roles')->offsetUnset($index);
       }
     }
 
     // Store account cancellation information.
-    foreach (array('user_cancel_method', 'user_cancel_notify') as $key) {
+    foreach (['user_cancel_method', 'user_cancel_notify'] as $key) {
       if (isset($this->{$key})) {
         \Drupal::service('user.data')->set('user', $this->id(), substr($key, 5), $this->{$key});
       }
@@ -140,7 +140,7 @@ class User extends ContentEntityBase implements UserInterface {
    * {@inheritdoc}
    */
   public function getRoles($exclude_locked_roles = FALSE) {
-    $roles = array();
+    $roles = [];
 
     // Users with an ID always have the authenticated user role.
     if (!$exclude_locked_roles) {
@@ -186,7 +186,7 @@ class User extends ContentEntityBase implements UserInterface {
    * {@inheritdoc}
    */
   public function removeRole($rid) {
-    $this->set('roles', array_diff($this->getRoles(TRUE), array($rid)));
+    $this->set('roles', array_diff($this->getRoles(TRUE), [$rid]));
   }
 
   /**
@@ -308,7 +308,7 @@ class User extends ContentEntityBase implements UserInterface {
   /**
    * {@inheritdoc}
    */
-  function getPreferredLangcode($fallback_to_default = TRUE) {
+  public function getPreferredLangcode($fallback_to_default = TRUE) {
     $language_list = $this->languageManager()->getLanguages();
     $preferred_langcode = $this->get('preferred_langcode')->value;
     if (!empty($preferred_langcode) && isset($language_list[$preferred_langcode])) {
@@ -322,7 +322,7 @@ class User extends ContentEntityBase implements UserInterface {
   /**
    * {@inheritdoc}
    */
-  function getPreferredAdminLangcode($fallback_to_default = TRUE) {
+  public function getPreferredAdminLangcode($fallback_to_default = TRUE) {
     $language_list = $this->languageManager()->getLanguages();
     $preferred_langcode = $this->get('preferred_admin_langcode')->value;
     if (!empty($preferred_langcode) && isset($language_list[$preferred_langcode])) {
@@ -438,16 +438,16 @@ class User extends ContentEntityBase implements UserInterface {
 
     $fields['langcode']->setLabel(t('Language code'))
       ->setDescription(t('The user language code.'))
-      ->setDisplayOptions('form', ['type' => 'hidden']);
+      ->setDisplayOptions('form', ['region' => 'hidden']);
 
     $fields['preferred_langcode'] = BaseFieldDefinition::create('language')
       ->setLabel(t('Preferred language code'))
       ->setDescription(t("The user's preferred language code for receiving emails and viewing the site."))
       // @todo: Define this via an options provider once
       // https://www.drupal.org/node/2329937 is completed.
-      ->addPropertyConstraints('value', array(
-        'AllowedValues' => array('callback' => __CLASS__ . '::getAllowedConfigurableLanguageCodes'),
-      ));
+      ->addPropertyConstraints('value', [
+        'AllowedValues' => ['callback' => __CLASS__ . '::getAllowedConfigurableLanguageCodes'],
+      ]);
 
     $fields['preferred_admin_langcode'] = BaseFieldDefinition::create('language')
       ->setLabel(t('Preferred admin language code'))
@@ -455,12 +455,12 @@ class User extends ContentEntityBase implements UserInterface {
       // @todo: A default value of NULL is ignored, so we have to specify
       // an empty field item structure instead. Fix this in
       // https://www.drupal.org/node/2318605.
-      ->setDefaultValue(array(0 => array ('value' => NULL)))
+      ->setDefaultValue([0 => ['value' => NULL]])
       // @todo: Define this via an options provider once
       // https://www.drupal.org/node/2329937 is completed.
-      ->addPropertyConstraints('value', array(
-        'AllowedValues' => array('callback' => __CLASS__ . '::getAllowedConfigurableLanguageCodes'),
-      ));
+      ->addPropertyConstraints('value', [
+        'AllowedValues' => ['callback' => __CLASS__ . '::getAllowedConfigurableLanguageCodes'],
+      ]);
 
     // The name should not vary per language. The username is the visual
     // identifier for a user and needs to be consistent in all languages.
@@ -468,12 +468,12 @@ class User extends ContentEntityBase implements UserInterface {
       ->setLabel(t('Name'))
       ->setDescription(t('The name of this user.'))
       ->setRequired(TRUE)
-      ->setConstraints(array(
+      ->setConstraints([
         // No Length constraint here because the UserName constraint also covers
         // that.
-        'UserName' => array(),
-        'UserNameUnique' => array(),
-      ));
+        'UserName' => [],
+        'UserNameUnique' => [],
+      ]);
     $fields['name']->getItemDefinition()->setClass('\Drupal\user\UserNameItem');
 
     $fields['pass'] = BaseFieldDefinition::create('password')
@@ -495,9 +495,9 @@ class User extends ContentEntityBase implements UserInterface {
       ->setSetting('max_length', 32)
       // @todo: Define this via an options provider once
       // https://www.drupal.org/node/2329937 is completed.
-      ->addPropertyConstraints('value', array(
-        'AllowedValues' => array('callback' => __CLASS__ . '::getAllowedTimezones'),
-      ));
+      ->addPropertyConstraints('value', [
+        'AllowedValues' => ['callback' => __CLASS__ . '::getAllowedTimezones'],
+      ]);
 
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('User status'))
diff --git a/web/core/modules/user/src/Form/UserCancelForm.php b/web/core/modules/user/src/Form/UserCancelForm.php
index 0ab89335b..14c553c3b 100644
--- a/web/core/modules/user/src/Form/UserCancelForm.php
+++ b/web/core/modules/user/src/Form/UserCancelForm.php
@@ -31,7 +31,7 @@ class UserCancelForm extends ContentEntityConfirmFormBase {
     if ($this->entity->id() == $this->currentUser()->id()) {
       return $this->t('Are you sure you want to cancel your account?');
     }
-    return $this->t('Are you sure you want to cancel the account %name?', array('%name' => $this->entity->label()));
+    return $this->t('Are you sure you want to cancel the account %name?', ['%name' => $this->entity->label()]);
   }
 
   /**
@@ -74,43 +74,43 @@ class UserCancelForm extends ContentEntityConfirmFormBase {
 
     // Display account cancellation method selection, if allowed.
     $admin_access = $user->hasPermission('administer users');
-    $form['user_cancel_method'] = array(
+    $form['user_cancel_method'] = [
       '#type' => 'radios',
       '#title' => ($this->entity->id() == $user->id() ? $this->t('When cancelling your account') : $this->t('When cancelling the account')),
       '#access' => $admin_access || $user->hasPermission('select account cancellation method'),
-    );
+    ];
     $form['user_cancel_method'] += $this->cancelMethods;
 
     // Allow user administrators to skip the account cancellation confirmation
     // mail (by default), as long as they do not attempt to cancel their own
     // account.
     $override_access = $admin_access && ($this->entity->id() != $user->id());
-    $form['user_cancel_confirm'] = array(
+    $form['user_cancel_confirm'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Require email confirmation to cancel account'),
       '#default_value' => !$override_access,
       '#access' => $override_access,
       '#description' => $this->t('When enabled, the user must confirm the account cancellation via email.'),
-    );
+    ];
     // Also allow to send account canceled notification mail, if enabled.
     $default_notify = $this->config('user.settings')->get('notify.status_canceled');
-    $form['user_cancel_notify'] = array(
+    $form['user_cancel_notify'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Notify user when account is canceled'),
       '#default_value' => ($override_access ? FALSE : $default_notify),
       '#access' => $override_access && $default_notify,
       '#description' => $this->t('When enabled, the user will receive an email notification after the account has been canceled.'),
-    );
+    ];
 
     // Always provide entity id in the same form key as in the entity edit form.
-    $form['uid'] = array('#type' => 'value', '#value' => $this->entity->id());
+    $form['uid'] = ['#type' => 'value', '#value' => $this->entity->id()];
 
     // Store the user permissions so that it can be altered in hook_form_alter()
     // if desired.
-    $form['access'] = array(
+    $form['access'] = [
       '#type' => 'value',
       '#value' => $user->hasPermission('administer users'),
-    );
+    ];
 
     $form = parent::buildForm($form, $form_state);
 
@@ -138,11 +138,11 @@ class UserCancelForm extends ContentEntityConfirmFormBase {
       $this->entity->save();
       _user_mail_notify('cancel_confirm', $this->entity);
       drupal_set_message($this->t('A confirmation request to cancel your account has been sent to your email address.'));
-      $this->logger('user')->notice('Sent account cancellation request to %name %email.', array('%name' => $this->entity->label(), '%email' => '<' . $this->entity->getEmail() . '>'));
+      $this->logger('user')->notice('Sent account cancellation request to %name %email.', ['%name' => $this->entity->label(), '%email' => '<' . $this->entity->getEmail() . '>']);
 
       $form_state->setRedirect(
         'entity.user.canonical',
-        array('user' => $this->entity->id())
+        ['user' => $this->entity->id()]
       );
     }
   }
diff --git a/web/core/modules/user/src/Form/UserLoginForm.php b/web/core/modules/user/src/Form/UserLoginForm.php
index 43b29e545..25a54ec4b 100644
--- a/web/core/modules/user/src/Form/UserLoginForm.php
+++ b/web/core/modules/user/src/Form/UserLoginForm.php
@@ -88,31 +88,31 @@ class UserLoginForm extends FormBase {
     $config = $this->config('system.site');
 
     // Display login form:
-    $form['name'] = array(
+    $form['name'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Username'),
       '#size' => 60,
       '#maxlength' => USERNAME_MAX_LENGTH,
-      '#description' => $this->t('Enter your @s username.', array('@s' => $config->get('name'))),
+      '#description' => $this->t('Enter your @s username.', ['@s' => $config->get('name')]),
       '#required' => TRUE,
-      '#attributes' => array(
+      '#attributes' => [
         'autocorrect' => 'none',
         'autocapitalize' => 'none',
         'spellcheck' => 'false',
         'autofocus' => 'autofocus',
-      ),
-    );
+      ],
+    ];
 
-    $form['pass'] = array(
+    $form['pass'] = [
       '#type' => 'password',
       '#title' => $this->t('Password'),
       '#size' => 60,
       '#description' => $this->t('Enter the password that accompanies your username.'),
       '#required' => TRUE,
-    );
+    ];
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array('#type' => 'submit', '#value' => $this->t('Log in'));
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = ['#type' => 'submit', '#value' => $this->t('Log in')];
 
     $form['#validate'][] = '::validateName';
     $form['#validate'][] = '::validateAuthentication';
@@ -133,7 +133,7 @@ class UserLoginForm extends FormBase {
     if (!$this->getRequest()->request->has('destination')) {
       $form_state->setRedirect(
         'entity.user.canonical',
-        array('user' => $account->id())
+        ['user' => $account->id()]
       );
     }
     else {
@@ -149,7 +149,7 @@ class UserLoginForm extends FormBase {
   public function validateName(array &$form, FormStateInterface $form_state) {
     if (!$form_state->isValueEmpty('name') && user_is_blocked($form_state->getValue('name'))) {
       // Blocked in user administration.
-      $form_state->setErrorByName('name', $this->t('The username %name has not been activated or is blocked.', array('%name' => $form_state->getValue('name'))));
+      $form_state->setErrorByName('name', $this->t('The username %name has not been activated or is blocked.', ['%name' => $form_state->getValue('name')]));
     }
   }
 
@@ -171,7 +171,7 @@ class UserLoginForm extends FormBase {
         $form_state->set('flood_control_triggered', 'ip');
         return;
       }
-      $accounts = $this->userStorage->loadByProperties(array('name' => $form_state->getValue('name'), 'status' => 1));
+      $accounts = $this->userStorage->loadByProperties(['name' => $form_state->getValue('name'), 'status' => 1]);
       $account = reset($accounts);
       if ($account) {
         if ($flood_config->get('uid_only')) {
@@ -218,11 +218,11 @@ class UserLoginForm extends FormBase {
 
       if ($flood_control_triggered = $form_state->get('flood_control_triggered')) {
         if ($flood_control_triggered == 'user') {
-          $form_state->setErrorByName('name', $this->formatPlural($flood_config->get('user_limit'), 'There has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', 'There have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', array(':url' => $this->url('user.pass'))));
+          $form_state->setErrorByName('name', $this->formatPlural($flood_config->get('user_limit'), 'There has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', 'There have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', [':url' => $this->url('user.pass')]));
         }
         else {
           // We did not find a uid, so the limit is IP-based.
-          $form_state->setErrorByName('name', $this->t('Too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', array(':url' => $this->url('user.pass'))));
+          $form_state->setErrorByName('name', $this->t('Too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', [':url' => $this->url('user.pass')]));
         }
       }
       else {
@@ -231,16 +231,16 @@ class UserLoginForm extends FormBase {
         // $form_state->getValue() may have been modified by validation
         // handlers that ran earlier than this one.
         $user_input = $form_state->getUserInput();
-        $query = isset($user_input['name']) ? array('name' => $user_input['name']) : array();
-        $form_state->setErrorByName('name', $this->t('Unrecognized username or password. <a href=":password">Forgot your password?</a>', array(':password' => $this->url('user.pass', [], array('query' => $query)))));
-        $accounts = $this->userStorage->loadByProperties(array('name' => $form_state->getValue('name')));
+        $query = isset($user_input['name']) ? ['name' => $user_input['name']] : [];
+        $form_state->setErrorByName('name', $this->t('Unrecognized username or password. <a href=":password">Forgot your password?</a>', [':password' => $this->url('user.pass', [], ['query' => $query])]));
+        $accounts = $this->userStorage->loadByProperties(['name' => $form_state->getValue('name')]);
         if (!empty($accounts)) {
-          $this->logger('user')->notice('Login attempt failed for %user.', array('%user' => $form_state->getValue('name')));
+          $this->logger('user')->notice('Login attempt failed for %user.', ['%user' => $form_state->getValue('name')]);
         }
         else {
           // If the username entered is not a valid user,
           // only store the IP address.
-          $this->logger('user')->notice('Login attempt failed from %ip.', array('%ip' => $this->getRequest()->getClientIp()));
+          $this->logger('user')->notice('Login attempt failed from %ip.', ['%ip' => $this->getRequest()->getClientIp()]);
         }
       }
     }
diff --git a/web/core/modules/user/src/Form/UserMultipleCancelConfirm.php b/web/core/modules/user/src/Form/UserMultipleCancelConfirm.php
index 1fb6ab15f..62a64e5d2 100644
--- a/web/core/modules/user/src/Form/UserMultipleCancelConfirm.php
+++ b/web/core/modules/user/src/Form/UserMultipleCancelConfirm.php
@@ -96,6 +96,7 @@ class UserMultipleCancelConfirm extends ConfirmFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     // Retrieve the accounts to be canceled from the temp store.
+    /* @var \Drupal\user\Entity\User[] $accounts */
     $accounts = $this->tempStoreFactory
       ->get('user_user_operations_cancel')
       ->get($this->currentUser()->id());
@@ -104,26 +105,31 @@ class UserMultipleCancelConfirm extends ConfirmFormBase {
     }
 
     $root = NULL;
-    $form['accounts'] = array('#prefix' => '<ul>', '#suffix' => '</ul>', '#tree' => TRUE);
+    $names = [];
+    $form['accounts'] = ['#tree' => TRUE];
     foreach ($accounts as $account) {
       $uid = $account->id();
+      $names[$uid] = $account->label();
       // Prevent user 1 from being canceled.
       if ($uid <= 1) {
         $root = intval($uid) === 1 ? $account : $root;
         continue;
       }
-      $form['accounts'][$uid] = array(
+      $form['accounts'][$uid] = [
         '#type' => 'hidden',
         '#value' => $uid,
-        '#prefix' => '<li>',
-        '#suffix' => $account->label() . "</li>\n",
-      );
+      ];
     }
 
+    $form['account']['names'] = [
+      '#theme' => 'item_list',
+      '#items' => $names,
+    ];
+
     // Output a notice that user 1 cannot be canceled.
     if (isset($root)) {
       $redirect = (count($accounts) == 1);
-      $message = $this->t('The user account %name cannot be canceled.', array('%name' => $root->label()));
+      $message = $this->t('The user account %name cannot be canceled.', ['%name' => $root->label()]);
       drupal_set_message($message, $redirect ? 'error' : 'warning');
       // If only user 1 was selected, redirect to the overview.
       if ($redirect) {
@@ -131,30 +137,30 @@ class UserMultipleCancelConfirm extends ConfirmFormBase {
       }
     }
 
-    $form['operation'] = array('#type' => 'hidden', '#value' => 'cancel');
+    $form['operation'] = ['#type' => 'hidden', '#value' => 'cancel'];
 
-    $form['user_cancel_method'] = array(
+    $form['user_cancel_method'] = [
       '#type' => 'radios',
       '#title' => $this->t('When cancelling these accounts'),
-    );
+    ];
 
     $form['user_cancel_method'] += user_cancel_methods();
 
     // Allow to send the account cancellation confirmation mail.
-    $form['user_cancel_confirm'] = array(
+    $form['user_cancel_confirm'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Require email confirmation to cancel account'),
       '#default_value' => FALSE,
       '#description' => $this->t('When enabled, the user must confirm the account cancellation via email.'),
-    );
+    ];
     // Also allow to send account canceled notification mail, if enabled.
-    $form['user_cancel_notify'] = array(
+    $form['user_cancel_notify'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Notify user when account is canceled'),
       '#default_value' => FALSE,
       '#access' => $this->config('user.settings')->get('notify.status_canceled'),
       '#description' => $this->t('When enabled, the user will receive an email notification after the account has been canceled.'),
-    );
+    ];
 
     $form = parent::buildForm($form, $form_state);
 
@@ -177,7 +183,7 @@ class UserMultipleCancelConfirm extends ConfirmFormBase {
         }
         // Prevent user administrators from deleting themselves without confirmation.
         if ($uid == $current_user_id) {
-          $admin_form_mock = array();
+          $admin_form_mock = [];
           $admin_form_state = $form_state;
           $admin_form_state->unsetValue('user_cancel_confirm');
           // The $user global is not a complete user entity, so load the full
diff --git a/web/core/modules/user/src/Form/UserPasswordForm.php b/web/core/modules/user/src/Form/UserPasswordForm.php
index a89549a0e..ea224fe43 100644
--- a/web/core/modules/user/src/Form/UserPasswordForm.php
+++ b/web/core/modules/user/src/Form/UserPasswordForm.php
@@ -65,40 +65,40 @@ class UserPasswordForm extends FormBase {
    *   The request object.
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['name'] = array(
+    $form['name'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Username or email address'),
       '#size' => 60,
       '#maxlength' => max(USERNAME_MAX_LENGTH, Email::EMAIL_MAX_LENGTH),
       '#required' => TRUE,
-      '#attributes' => array(
+      '#attributes' => [
         'autocorrect' => 'off',
         'autocapitalize' => 'off',
         'spellcheck' => 'false',
         'autofocus' => 'autofocus',
-      ),
-    );
+      ],
+    ];
     // Allow logged in users to request this also.
     $user = $this->currentUser();
     if ($user->isAuthenticated()) {
       $form['name']['#type'] = 'value';
       $form['name']['#value'] = $user->getEmail();
-      $form['mail'] = array(
+      $form['mail'] = [
         '#prefix' => '<p>',
-        '#markup' => $this->t('Password reset instructions will be mailed to %email. You must log out to use the password reset link in the email.', array('%email' => $user->getEmail())),
+        '#markup' => $this->t('Password reset instructions will be mailed to %email. You must log out to use the password reset link in the email.', ['%email' => $user->getEmail()]),
         '#suffix' => '</p>',
-      );
+      ];
     }
     else {
-      $form['mail'] = array(
+      $form['mail'] = [
         '#prefix' => '<p>',
         '#markup' => $this->t('Password reset instructions will be sent to your registered email address.'),
         '#suffix' => '</p>',
-      );
+      ];
       $form['name']['#default_value'] = $this->getRequest()->query->get('name');
     }
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array('#type' => 'submit', '#value' => $this->t('Submit'));
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = ['#type' => 'submit', '#value' => $this->t('Submit')];
     $form['#cache']['contexts'][] = 'url.query_args';
 
     return $form;
@@ -110,23 +110,23 @@ class UserPasswordForm extends FormBase {
   public function validateForm(array &$form, FormStateInterface $form_state) {
     $name = trim($form_state->getValue('name'));
     // Try to load by email.
-    $users = $this->userStorage->loadByProperties(array('mail' => $name));
+    $users = $this->userStorage->loadByProperties(['mail' => $name]);
     if (empty($users)) {
       // No success, try to load by name.
-      $users = $this->userStorage->loadByProperties(array('name' => $name));
+      $users = $this->userStorage->loadByProperties(['name' => $name]);
     }
     $account = reset($users);
     if ($account && $account->id()) {
       // Blocked accounts cannot request a new password.
       if (!$account->isActive()) {
-        $form_state->setErrorByName('name', $this->t('%name is blocked or has not been activated yet.', array('%name' => $name)));
+        $form_state->setErrorByName('name', $this->t('%name is blocked or has not been activated yet.', ['%name' => $name]));
       }
       else {
-        $form_state->setValueForElement(array('#parents' => array('account')), $account);
+        $form_state->setValueForElement(['#parents' => ['account']], $account);
       }
     }
     else {
-      $form_state->setErrorByName('name', $this->t('%name is not recognized as a username or an email address.', array('%name' => $name)));
+      $form_state->setErrorByName('name', $this->t('%name is not recognized as a username or an email address.', ['%name' => $name]));
     }
   }
 
@@ -140,7 +140,7 @@ class UserPasswordForm extends FormBase {
     // Mail one time login URL and instructions using current language.
     $mail = _user_mail_notify('password_reset', $account, $langcode);
     if (!empty($mail)) {
-      $this->logger('user')->notice('Password reset instructions mailed to %name at %email.', array('%name' => $account->getUsername(), '%email' => $account->getEmail()));
+      $this->logger('user')->notice('Password reset instructions mailed to %name at %email.', ['%name' => $account->getUsername(), '%email' => $account->getEmail()]);
       drupal_set_message($this->t('Further instructions have been sent to your email address.'));
     }
 
diff --git a/web/core/modules/user/src/Form/UserPasswordResetForm.php b/web/core/modules/user/src/Form/UserPasswordResetForm.php
index 1372415cf..ce8c7cca1 100644
--- a/web/core/modules/user/src/Form/UserPasswordResetForm.php
+++ b/web/core/modules/user/src/Form/UserPasswordResetForm.php
@@ -38,21 +38,21 @@ class UserPasswordResetForm extends FormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state, AccountInterface $user = NULL, $expiration_date = NULL, $timestamp = NULL, $hash = NULL) {
     if ($expiration_date) {
-      $form['message'] = array('#markup' => $this->t('<p>This is a one-time login for %user_name and will expire on %expiration_date.</p><p>Click on this button to log in to the site and change your password.</p>', array('%user_name' => $user->getUsername(), '%expiration_date' => $expiration_date)));
+      $form['message'] = ['#markup' => $this->t('<p>This is a one-time login for %user_name and will expire on %expiration_date.</p><p>Click on this button to log in to the site and change your password.</p>', ['%user_name' => $user->getUsername(), '%expiration_date' => $expiration_date])];
       $form['#title'] = $this->t('Reset password');
     }
     else {
       // No expiration for first time login.
-      $form['message'] = array('#markup' => $this->t('<p>This is a one-time login for %user_name.</p><p>Click on this button to log in to the site and change your password.</p>', array('%user_name' => $user->getUsername())));
+      $form['message'] = ['#markup' => $this->t('<p>This is a one-time login for %user_name.</p><p>Click on this button to log in to the site and change your password.</p>', ['%user_name' => $user->getUsername()])];
       $form['#title'] = $this->t('Set password');
     }
 
-    $form['help'] = array('#markup' => '<p>' . $this->t('This login can be used only once.') . '</p>');
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['help'] = ['#markup' => '<p>' . $this->t('This login can be used only once.') . '</p>'];
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Log in'),
-    );
+    ];
     $form['#action'] = Url::fromRoute('user.reset.login', [
       'uid' => $user->id(),
       'timestamp' => $timestamp,
diff --git a/web/core/modules/user/src/Form/UserPermissionsForm.php b/web/core/modules/user/src/Form/UserPermissionsForm.php
index 75bbaf235..3c5e46b0d 100644
--- a/web/core/modules/user/src/Form/UserPermissionsForm.php
+++ b/web/core/modules/user/src/Form/UserPermissionsForm.php
@@ -83,9 +83,9 @@ class UserPermissionsForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $role_names = array();
-    $role_permissions = array();
-    $admin_roles = array();
+    $role_names = [];
+    $role_permissions = [];
+    $admin_roles = [];
     foreach ($this->getRoles() as $role_name => $role) {
       // Retrieve role names for columns.
       $role_names[$role_name] = $role->label();
@@ -95,79 +95,79 @@ class UserPermissionsForm extends FormBase {
     }
 
     // Store $role_names for use when saving the data.
-    $form['role_names'] = array(
+    $form['role_names'] = [
       '#type' => 'value',
       '#value' => $role_names,
-    );
+    ];
     // Render role/permission overview:
     $hide_descriptions = system_admin_compact_mode();
 
-    $form['system_compact_link'] = array(
+    $form['system_compact_link'] = [
       '#id' => FALSE,
       '#type' => 'system_compact_link',
-    );
+    ];
 
-    $form['permissions'] = array(
+    $form['permissions'] = [
       '#type' => 'table',
-      '#header' => array($this->t('Permission')),
+      '#header' => [$this->t('Permission')],
       '#id' => 'permissions',
       '#attributes' => ['class' => ['permissions', 'js-permissions']],
       '#sticky' => TRUE,
-    );
+    ];
     foreach ($role_names as $name) {
-      $form['permissions']['#header'][] = array(
+      $form['permissions']['#header'][] = [
         'data' => $name,
-        'class' => array('checkbox'),
-      );
+        'class' => ['checkbox'],
+      ];
     }
 
     $permissions = $this->permissionHandler->getPermissions();
-    $permissions_by_provider = array();
+    $permissions_by_provider = [];
     foreach ($permissions as $permission_name => $permission) {
       $permissions_by_provider[$permission['provider']][$permission_name] = $permission;
     }
 
     foreach ($permissions_by_provider as $provider => $permissions) {
       // Module name.
-      $form['permissions'][$provider] = array(array(
-        '#wrapper_attributes' => array(
+      $form['permissions'][$provider] = [[
+        '#wrapper_attributes' => [
           'colspan' => count($role_names) + 1,
-          'class' => array('module'),
+          'class' => ['module'],
           'id' => 'module-' . $provider,
-        ),
+        ],
         '#markup' => $this->moduleHandler->getName($provider),
-      ));
+      ]];
       foreach ($permissions as $perm => $perm_item) {
         // Fill in default values for the permission.
-        $perm_item += array(
+        $perm_item += [
           'description' => '',
           'restrict access' => FALSE,
           'warning' => !empty($perm_item['restrict access']) ? $this->t('Warning: Give to trusted roles only; this permission has security implications.') : '',
-        );
-        $form['permissions'][$perm]['description'] = array(
+        ];
+        $form['permissions'][$perm]['description'] = [
           '#type' => 'inline_template',
           '#template' => '<div class="permission"><span class="title">{{ title }}</span>{% if description or warning %}<div class="description">{% if warning %}<em class="permission-warning">{{ warning }}</em> {% endif %}{{ description }}</div>{% endif %}</div>',
-          '#context' => array(
+          '#context' => [
             'title' => $perm_item['title'],
-          ),
-        );
+          ],
+        ];
         // Show the permission description.
         if (!$hide_descriptions) {
           $form['permissions'][$perm]['description']['#context']['description'] = $perm_item['description'];
           $form['permissions'][$perm]['description']['#context']['warning'] = $perm_item['warning'];
         }
         foreach ($role_names as $rid => $name) {
-          $form['permissions'][$perm][$rid] = array(
+          $form['permissions'][$perm][$rid] = [
             '#title' => $name . ': ' . $perm_item['title'],
             '#title_display' => 'invisible',
-            '#wrapper_attributes' => array(
-              'class' => array('checkbox'),
-            ),
+            '#wrapper_attributes' => [
+              'class' => ['checkbox'],
+            ],
             '#type' => 'checkbox',
             '#default_value' => in_array($perm, $role_permissions[$rid]) ? 1 : 0,
-            '#attributes' => array('class' => array('rid-' . $rid, 'js-rid-' . $rid)),
-            '#parents' => array($rid, $perm),
-          );
+            '#attributes' => ['class' => ['rid-' . $rid, 'js-rid-' . $rid]],
+            '#parents' => [$rid, $perm],
+          ];
           // Show a column of disabled but checked checkboxes.
           if ($admin_roles[$rid]) {
             $form['permissions'][$perm][$rid]['#disabled'] = TRUE;
@@ -177,12 +177,12 @@ class UserPermissionsForm extends FormBase {
       }
     }
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save permissions'),
       '#button_type' => 'primary',
-    );
+    ];
 
     $form['#attached']['library'][] = 'user/drupal.user.permissions';
 
@@ -192,7 +192,7 @@ class UserPermissionsForm extends FormBase {
   /**
    * {@inheritdoc}
    */
-  function submitForm(array &$form, FormStateInterface $form_state) {
+  public function submitForm(array &$form, FormStateInterface $form_state) {
     foreach ($form_state->getValue('role_names') as $role_name => $name) {
       user_role_change_permissions($role_name, (array) $form_state->getValue($role_name));
     }
diff --git a/web/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php b/web/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php
index 41ae8b878..4281a44b9 100644
--- a/web/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php
+++ b/web/core/modules/user/src/Form/UserPermissionsRoleSpecificForm.php
@@ -21,7 +21,7 @@ class UserPermissionsRoleSpecificForm extends UserPermissionsForm {
    * {@inheritdoc}
    */
   protected function getRoles() {
-    return array($this->userRole->id() => $this->userRole);
+    return [$this->userRole->id() => $this->userRole];
   }
 
   /**
diff --git a/web/core/modules/user/src/PermissionHandler.php b/web/core/modules/user/src/PermissionHandler.php
index d7179b65e..1f07b25d9 100644
--- a/web/core/modules/user/src/PermissionHandler.php
+++ b/web/core/modules/user/src/PermissionHandler.php
@@ -136,8 +136,8 @@ class PermissionHandler implements PermissionHandlerInterface {
    *   - provider: The provider of the permission.
    */
   protected function buildPermissionsYaml() {
-    $all_permissions = array();
-    $all_callback_permissions = array();
+    $all_permissions = [];
+    $all_callback_permissions = [];
 
     foreach ($this->getYamlDiscovery()->findAll() as $provider => $permissions) {
       // The top-level 'permissions_callback' is a list of methods in controller
@@ -151,15 +151,15 @@ class PermissionHandler implements PermissionHandlerInterface {
             // defaults can then get processed below.
             foreach ($callback_permissions as $name => $callback_permission) {
               if (!is_array($callback_permission)) {
-                $callback_permission = array(
+                $callback_permission = [
                   'title' => $callback_permission,
-                );
+                ];
               }
 
-              $callback_permission += array(
+              $callback_permission += [
                 'description' => NULL,
                 'provider' => $provider,
-              );
+              ];
 
               $all_callback_permissions[$name] = $callback_permission;
             }
@@ -171,9 +171,9 @@ class PermissionHandler implements PermissionHandlerInterface {
 
       foreach ($permissions as &$permission) {
         if (!is_array($permission)) {
-          $permission = array(
+          $permission = [
             'title' => $permission,
-          );
+          ];
         }
         $permission['title'] = $this->t($permission['title']);
         $permission['description'] = isset($permission['description']) ? $this->t($permission['description']) : NULL;
@@ -198,7 +198,7 @@ class PermissionHandler implements PermissionHandlerInterface {
    *   - description: The description of the permission, defaults to NULL.
    *   - provider: The provider of the permission.
    */
-  protected function sortPermissions(array $all_permissions = array()) {
+  protected function sortPermissions(array $all_permissions = []) {
     // Get a list of all the modules providing permissions and sort by
     // display name.
     $modules = $this->getModuleNames();
@@ -221,7 +221,7 @@ class PermissionHandler implements PermissionHandlerInterface {
    *   Returns the human readable names of all modules keyed by machine name.
    */
   protected function getModuleNames() {
-    $modules = array();
+    $modules = [];
     foreach (array_keys($this->moduleHandler->getModuleList()) as $module) {
       $modules[$module] = $this->moduleHandler->getName($module);
     }
diff --git a/web/core/modules/user/src/Plugin/Action/CancelUser.php b/web/core/modules/user/src/Plugin/Action/CancelUser.php
index 7c51f5fe1..140ef42e2 100644
--- a/web/core/modules/user/src/Plugin/Action/CancelUser.php
+++ b/web/core/modules/user/src/Plugin/Action/CancelUser.php
@@ -79,7 +79,7 @@ class CancelUser extends ActionBase implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public function execute($object = NULL) {
-    $this->executeMultiple(array($object));
+    $this->executeMultiple([$object]);
   }
 
   /**
diff --git a/web/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php b/web/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php
index 02424bc3f..de4c4040f 100644
--- a/web/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php
+++ b/web/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php
@@ -49,9 +49,9 @@ abstract class ChangeUserRoleBase extends ConfigurableActionBase implements Cont
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
+    return [
       'rid' => '',
-    );
+    ];
   }
 
   /**
@@ -60,13 +60,13 @@ abstract class ChangeUserRoleBase extends ConfigurableActionBase implements Cont
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $roles = user_role_names(TRUE);
     unset($roles[RoleInterface::AUTHENTICATED_ID]);
-    $form['rid'] = array(
+    $form['rid'] = [
       '#type' => 'radios',
       '#title' => t('Role'),
       '#options' => $roles,
       '#default_value' => $this->configuration['rid'],
       '#required' => TRUE,
-    );
+    ];
     return $form;
   }
 
diff --git a/web/core/modules/user/src/Plugin/Block/UserLoginBlock.php b/web/core/modules/user/src/Plugin/Block/UserLoginBlock.php
index 34957c909..ed0e2eaf1 100644
--- a/web/core/modules/user/src/Plugin/Block/UserLoginBlock.php
+++ b/web/core/modules/user/src/Plugin/Block/UserLoginBlock.php
@@ -72,7 +72,7 @@ class UserLoginBlock extends BlockBase implements ContainerFactoryPluginInterfac
    */
   protected function blockAccess(AccountInterface $account) {
     $route_name = $this->routeMatch->getRouteName();
-    if ($account->isAnonymous() && !in_array($route_name, array('user.login', 'user.logout'))) {
+    if ($account->isAnonymous() && !in_array($route_name, ['user.login', 'user.logout'])) {
       return AccessResult::allowed()
         ->addCacheContexts(['route.name', 'user.roles:anonymous']);
     }
@@ -96,28 +96,36 @@ class UserLoginBlock extends BlockBase implements ContainerFactoryPluginInterfac
     $form['pass']['#size'] = 15;
     $form['#action'] = $this->url('<current>', [], ['query' => $this->getDestinationArray(), 'external' => FALSE]);
     // Build action links.
-    $items = array();
+    $items = [];
     if (\Drupal::config('user.settings')->get('register') != USER_REGISTER_ADMINISTRATORS_ONLY) {
-      $items['create_account'] = \Drupal::l($this->t('Create new account'), new Url('user.register', array(), array(
-        'attributes' => array(
-          'title' => $this->t('Create a new user account.'),
-          'class' => array('create-account-link'),
-        ),
-      )));
+      $items['create_account'] = [
+        '#type' => 'link',
+        '#title' => $this->t('Create new account'),
+        '#url' => Url::fromRoute('user.register', [], [
+          'attributes' => [
+            'title' => $this->t('Create a new user account.'),
+            'class' => ['create-account-link'],
+          ],
+        ]),
+      ];
     }
-    $items['request_password'] = \Drupal::l($this->t('Reset your password'), new Url('user.pass', array(), array(
-      'attributes' => array(
-        'title' => $this->t('Send password reset instructions via email.'),
-        'class' => array('request-password-link'),
-      ),
-    )));
-    return array(
+    $items['request_password'] = [
+      '#type' => 'link',
+      '#title' => $this->t('Reset your password'),
+      '#url' => Url::fromRoute('user.pass', [], [
+        'attributes' => [
+          'title' => $this->t('Send password reset instructions via email.'),
+          'class' => ['request-password-link'],
+        ],
+      ]),
+    ];
+    return [
       'user_login_form' => $form,
-      'user_links' => array(
+      'user_links' => [
         '#theme' => 'item_list',
         '#items' => $items,
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/user/src/Plugin/Condition/UserRole.php b/web/core/modules/user/src/Plugin/Condition/UserRole.php
index ea69e1432..60b8b0e29 100644
--- a/web/core/modules/user/src/Plugin/Condition/UserRole.php
+++ b/web/core/modules/user/src/Plugin/Condition/UserRole.php
@@ -22,13 +22,13 @@ class UserRole extends ConditionPluginBase {
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['roles'] = array(
+    $form['roles'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('When the user has the following roles'),
       '#default_value' => $this->configuration['roles'],
       '#options' => array_map('\Drupal\Component\Utility\Html::escape', user_role_names()),
       '#description' => $this->t('If you select no roles, the condition will evaluate to TRUE for all users.'),
-    );
+    ];
     return parent::buildConfigurationForm($form, $form_state);
   }
 
@@ -36,9 +36,9 @@ class UserRole extends ConditionPluginBase {
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array(
-      'roles' => array(),
-    ) + parent::defaultConfiguration();
+    return [
+      'roles' => [],
+    ] + parent::defaultConfiguration();
   }
 
   /**
@@ -62,10 +62,10 @@ class UserRole extends ConditionPluginBase {
       $roles = reset($roles);
     }
     if (!empty($this->configuration['negate'])) {
-      return $this->t('The user is not a member of @roles', array('@roles' => $roles));
+      return $this->t('The user is not a member of @roles', ['@roles' => $roles]);
     }
     else {
-      return $this->t('The user is a member of @roles', array('@roles' => $roles));
+      return $this->t('The user is a member of @roles', ['@roles' => $roles]);
     }
   }
 
diff --git a/web/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php b/web/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php
index 8dfba3963..6f44aa509 100644
--- a/web/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php
+++ b/web/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php
@@ -86,51 +86,51 @@ class UserSelection extends DefaultSelection {
     $selection_handler_settings = $this->configuration['handler_settings'];
 
     // Merge in default values.
-    $selection_handler_settings += array(
-      'filter' => array(
+    $selection_handler_settings += [
+      'filter' => [
         'type' => '_none',
-      ),
+      ],
       'include_anonymous' => TRUE,
-    );
+    ];
 
-    $form['include_anonymous'] = array(
+    $form['include_anonymous'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Include the anonymous user.'),
       '#default_value' => $selection_handler_settings['include_anonymous'],
-    );
+    ];
 
     // Add user specific filter options.
-    $form['filter']['type'] = array(
+    $form['filter']['type'] = [
       '#type' => 'select',
       '#title' => $this->t('Filter by'),
-      '#options' => array(
+      '#options' => [
         '_none' => $this->t('- None -'),
         'role' => $this->t('User role'),
-      ),
+      ],
       '#ajax' => TRUE,
-      '#limit_validation_errors' => array(),
+      '#limit_validation_errors' => [],
       '#default_value' => $selection_handler_settings['filter']['type'],
-    );
+    ];
 
-    $form['filter']['settings'] = array(
+    $form['filter']['settings'] = [
       '#type' => 'container',
-      '#attributes' => array('class' => array('entity_reference-settings')),
-      '#process' => array(array('\Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem', 'formProcessMergeParent')),
-    );
+      '#attributes' => ['class' => ['entity_reference-settings']],
+      '#process' => [['\Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem', 'formProcessMergeParent']],
+    ];
 
     if ($selection_handler_settings['filter']['type'] == 'role') {
       // Merge in default values.
-      $selection_handler_settings['filter'] += array(
+      $selection_handler_settings['filter'] += [
         'role' => NULL,
-      );
+      ];
 
-      $form['filter']['settings']['role'] = array(
+      $form['filter']['settings']['role'] = [
         '#type' => 'checkboxes',
         '#title' => $this->t('Restrict to the selected roles'),
         '#required' => TRUE,
-        '#options' => array_diff_key(user_role_names(TRUE), array(RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID)),
+        '#options' => array_diff_key(user_role_names(TRUE), [RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID]),
         '#default_value' => $selection_handler_settings['filter']['role'],
-      );
+      ];
     }
 
     $form += parent::buildConfigurationForm($form, $form_state);
@@ -239,7 +239,7 @@ class UserSelection extends DefaultSelection {
           $value_part->condition('anonymous_name', $condition['value'], $condition['operator']);
           $value_part->compile($this->connection, $query);
           $or->condition(db_and()
-            ->where(str_replace('anonymous_name', ':anonymous_name', (string) $value_part), $value_part->arguments() + array(':anonymous_name' => \Drupal::config('user.settings')->get('anonymous')))
+            ->where(str_replace('anonymous_name', ':anonymous_name', (string) $value_part), $value_part->arguments() + [':anonymous_name' => \Drupal::config('user.settings')->get('anonymous')])
             ->condition('base_table.uid', 0)
           );
           $query->condition($or);
diff --git a/web/core/modules/user/src/Plugin/Field/FieldFormatter/AuthorFormatter.php b/web/core/modules/user/src/Plugin/Field/FieldFormatter/AuthorFormatter.php
index df97a798e..9f74d67d0 100644
--- a/web/core/modules/user/src/Plugin/Field/FieldFormatter/AuthorFormatter.php
+++ b/web/core/modules/user/src/Plugin/Field/FieldFormatter/AuthorFormatter.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\user\Plugin\Field\FieldFormatter;
 
-use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
@@ -26,18 +25,18 @@ class AuthorFormatter extends EntityReferenceFormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = array();
+    $elements = [];
 
     foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) {
       /** @var $referenced_user \Drupal\user\UserInterface */
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#theme' => 'username',
         '#account' => $entity,
-        '#link_options' => array('attributes' => array('rel' => 'author')),
-        '#cache' => array(
+        '#link_options' => ['attributes' => ['rel' => 'author']],
+        '#cache' => [
           'tags' => $entity->getCacheTags(),
-        ),
-      );
+        ],
+      ];
     }
 
     return $elements;
@@ -54,9 +53,7 @@ class AuthorFormatter extends EntityReferenceFormatterBase {
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity) {
-    // Always allow an entity author's username to be read, even if the current
-    // user does not have permission to view the entity author's profile.
-    return AccessResult::allowed();
+    return $entity->access('view label', NULL, TRUE);
   }
 
 }
diff --git a/web/core/modules/user/src/Plugin/Search/UserSearch.php b/web/core/modules/user/src/Plugin/Search/UserSearch.php
index f8471211d..063d3ef11 100644
--- a/web/core/modules/user/src/Plugin/Search/UserSearch.php
+++ b/web/core/modules/user/src/Plugin/Search/UserSearch.php
@@ -104,7 +104,7 @@ class UserSearch extends SearchPluginBase implements AccessibleInterface {
    * {@inheritdoc}
    */
   public function execute() {
-    $results = array();
+    $results = [];
     if (!$this->isSearchExecutable()) {
       return $results;
     }
@@ -120,12 +120,12 @@ class UserSearch extends SearchPluginBase implements AccessibleInterface {
     $query = $this->database
       ->select('users_field_data', 'users')
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender');
-    $query->fields('users', array('uid'));
+    $query->fields('users', ['uid']);
     $query->condition('default_langcode', 1);
     if ($this->currentUser->hasPermission('administer users')) {
       // Administrators can also search in the otherwise private email field,
       // and they don't need to be restricted to only active users.
-      $query->fields('users', array('mail'));
+      $query->fields('users', ['mail']);
       $query->condition($query->orConditionGroup()
         ->condition('name', '%' . $keys . '%', 'LIKE')
         ->condition('mail', '%' . $keys . '%', 'LIKE')
@@ -144,10 +144,10 @@ class UserSearch extends SearchPluginBase implements AccessibleInterface {
     $accounts = $this->entityManager->getStorage('user')->loadMultiple($uids);
 
     foreach ($accounts as $account) {
-      $result = array(
+      $result = [
         'title' => $account->getDisplayName(),
-        'link' => $account->url('canonical', array('absolute' => TRUE)),
-      );
+        'link' => $account->url('canonical', ['absolute' => TRUE]),
+      ];
       if ($this->currentUser->hasPermission('administer users')) {
         $result['title'] .= ' (' . $account->getEmail() . ')';
       }
@@ -162,13 +162,13 @@ class UserSearch extends SearchPluginBase implements AccessibleInterface {
    * {@inheritdoc}
    */
   public function getHelp() {
-    $help = array('list' => array(
+    $help = ['list' => [
       '#theme' => 'item_list',
-      '#items' => array(
+      '#items' => [
         $this->t('User search looks for user names and partial user names. Example: mar would match usernames mar, delmar, and maryjane.'),
         $this->t('You can use * as a wildcard within your keyword. Example: m*r would match user names mar, delmar, and elementary.'),
-      ),
-    ));
+      ],
+    ]];
 
     return $help;
   }
diff --git a/web/core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidator.php b/web/core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidator.php
index 2bfdca4ca..a8b12af8f 100644
--- a/web/core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidator.php
+++ b/web/core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidator.php
@@ -86,7 +86,7 @@ class ProtectedUserFieldConstraintValidator extends ConstraintValidator implemen
         $changed = $items->getValue() != $account_unchanged->get($field->getName())->getValue();
       }
       if ($changed && (!$account->checkExistingPassword($account_unchanged))) {
-        $this->context->addViolation($constraint->message, array('%name' => $field->getLabel()));
+        $this->context->addViolation($constraint->message, ['%name' => $field->getLabel()]);
       }
     }
   }
diff --git a/web/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php b/web/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php
index 5905e1212..b500a8d97 100644
--- a/web/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php
+++ b/web/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php
@@ -3,8 +3,6 @@
 namespace Drupal\user\Plugin\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidatorInterface;
-use Symfony\Component\Validator\ExecutionContextInterface;
 
 /**
  * Checks if the user's email address is provided if required.
@@ -18,7 +16,7 @@ use Symfony\Component\Validator\ExecutionContextInterface;
  *   label = @Translation("User email required", context = "Validation")
  * )
  */
-class UserMailRequired extends Constraint implements ConstraintValidatorInterface {
+class UserMailRequired extends Constraint {
 
   /**
    * Violation message. Use the same message as FormValidator.
@@ -30,45 +28,4 @@ class UserMailRequired extends Constraint implements ConstraintValidatorInterfac
    */
   public $message = '@name field is required.';
 
-  /**
-   * @var \Symfony\Component\Validator\ExecutionContextInterface
-   */
-  protected $context;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function initialize(ExecutionContextInterface $context) {
-    $this->context = $context;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validatedBy() {
-    return get_class($this);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validate($items, Constraint $constraint) {
-    /** @var \Drupal\Core\Field\FieldItemListInterface $items */
-    /** @var \Drupal\user\UserInterface $account */
-    $account = $items->getEntity();
-    $existing_value = NULL;
-    if ($account->id()) {
-      $account_unchanged = \Drupal::entityManager()
-        ->getStorage('user')
-        ->loadUnchanged($account->id());
-      $existing_value = $account_unchanged->getEmail();
-    }
-
-    $required = !(!$existing_value && \Drupal::currentUser()->hasPermission('administer users'));
-
-    if ($required && (!isset($items) || $items->isEmpty())) {
-      $this->context->addViolation($this->message, ['@name' => $account->getFieldDefinition('mail')->getLabel()]);
-    }
-  }
-
 }
diff --git a/web/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php b/web/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php
new file mode 100644
index 000000000..7e20b7a8c
--- /dev/null
+++ b/web/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\user\Plugin\Validation\Constraint;
+
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * Checks if the user's email address is provided if required.
+ *
+ * The user mail field is NOT required if account originally had no mail set
+ * and the user performing the edit has 'administer users' permission.
+ * This allows users without email address to be edited and deleted.
+ */
+class UserMailRequiredValidator extends ConstraintValidator {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validate($items, Constraint $constraint) {
+    /** @var \Drupal\Core\Field\FieldItemListInterface $items */
+    /** @var \Drupal\user\UserInterface $account */
+    $account = $items->getEntity();
+    $existing_value = NULL;
+    if ($account->id()) {
+      $account_unchanged = \Drupal::entityManager()
+        ->getStorage('user')
+        ->loadUnchanged($account->id());
+      $existing_value = $account_unchanged->getEmail();
+    }
+
+    $required = !(!$existing_value && \Drupal::currentUser()->hasPermission('administer users'));
+
+    if ($required && (!isset($items) || $items->isEmpty())) {
+      $this->context->addViolation($constraint->message, ['@name' => $account->getFieldDefinition('mail')->getLabel()]);
+    }
+  }
+
+}
diff --git a/web/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php b/web/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php
index fa714646b..9e4776bdc 100644
--- a/web/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php
+++ b/web/core/modules/user/src/Plugin/Validation/Constraint/UserNameConstraintValidator.php
@@ -54,7 +54,7 @@ class UserNameConstraintValidator extends ConstraintValidator {
       $this->context->addViolation($constraint->illegalMessage);
     }
     if (Unicode::strlen($name) > USERNAME_MAX_LENGTH) {
-      $this->context->addViolation($constraint->tooLongMessage, array('%name' => $name, '%max' => USERNAME_MAX_LENGTH));
+      $this->context->addViolation($constraint->tooLongMessage, ['%name' => $name, '%max' => USERNAME_MAX_LENGTH]);
     }
   }
 
diff --git a/web/core/modules/user/src/Plugin/migrate/destination/EntityUser.php b/web/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
index b11d8670b..7c2c81af9 100644
--- a/web/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
+++ b/web/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
@@ -77,7 +77,7 @@ class EntityUser extends EntityContentBase {
    * {@inheritdoc}
    * @throws \Drupal\migrate\MigrateException
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     // Do not overwrite the root account password.
     if ($row->getDestinationProperty('uid') == 1) {
       $row->removeDestinationProperty('pass');
@@ -88,7 +88,7 @@ class EntityUser extends EntityContentBase {
   /**
    * {@inheritdoc}
    */
-  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = array()) {
+  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
     // Do not overwrite the root account password.
     if ($entity->id() != 1) {
       // Set the pre_hashed password so that the PasswordItem field does not hash
diff --git a/web/core/modules/user/src/Plugin/migrate/destination/UserData.php b/web/core/modules/user/src/Plugin/migrate/destination/UserData.php
index 6ca60179a..7c48f93e6 100644
--- a/web/core/modules/user/src/Plugin/migrate/destination/UserData.php
+++ b/web/core/modules/user/src/Plugin/migrate/destination/UserData.php
@@ -56,7 +56,7 @@ class UserData extends DestinationBase implements ContainerFactoryPluginInterfac
   /**
    * {@inheritdoc}
    */
-  public function import(Row $row, array $old_destination_id_values = array()) {
+  public function import(Row $row, array $old_destination_id_values = []) {
     $uid = $row->getDestinationProperty('uid');
     $module = $row->getDestinationProperty('module');
     $key = $row->getDestinationProperty('key');
diff --git a/web/core/modules/user/src/Plugin/migrate/process/ConvertTokens.php b/web/core/modules/user/src/Plugin/migrate/process/ConvertTokens.php
index ce93c0e79..ed95db271 100644
--- a/web/core/modules/user/src/Plugin/migrate/process/ConvertTokens.php
+++ b/web/core/modules/user/src/Plugin/migrate/process/ConvertTokens.php
@@ -21,7 +21,7 @@ class ConvertTokens extends ProcessPluginBase {
    * {@inheritdoc}
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    $tokens = array(
+    $tokens = [
       '!site' => '[site:name]',
       '!username' => '[user:name]',
       '!mailto' => '[user:mail]',
@@ -32,7 +32,7 @@ class ConvertTokens extends ProcessPluginBase {
       '!uri' => '[site:url]',
       '!date' => '[date:medium]',
       '!password' => '',
-    );
+    ];
 
     // Given that our source is a database column that could hold a NULL
     // value, sometimes that filters down to here. str_replace() cannot
diff --git a/web/core/modules/user/src/Plugin/migrate/process/ProfileFieldSettings.php b/web/core/modules/user/src/Plugin/migrate/process/ProfileFieldSettings.php
index 6230f7b7b..6e16c59d5 100644
--- a/web/core/modules/user/src/Plugin/migrate/process/ProfileFieldSettings.php
+++ b/web/core/modules/user/src/Plugin/migrate/process/ProfileFieldSettings.php
@@ -17,7 +17,7 @@ class ProfileFieldSettings extends ProcessPluginBase {
    * {@inheritdoc}
    */
   public function transform($type, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    $settings = array();
+    $settings = [];
     switch ($type) {
       case 'date':
         $settings['datetime_type'] = 'date';
diff --git a/web/core/modules/user/src/Plugin/migrate/process/UserUpdate8002.php b/web/core/modules/user/src/Plugin/migrate/process/UserUpdate8002.php
index 36f65741d..7a67c466e 100644
--- a/web/core/modules/user/src/Plugin/migrate/process/UserUpdate8002.php
+++ b/web/core/modules/user/src/Plugin/migrate/process/UserUpdate8002.php
@@ -22,10 +22,10 @@ class UserUpdate8002 extends ProcessPluginBase {
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
     $rid = $row->getSourceProperty('rid');
-    $map = array(
+    $map = [
       1 => 'anonymous',
       2 => 'authenticated',
-    );
+    ];
     return isset($map[$rid]) ? $map[$rid] : $value;
   }
 
diff --git a/web/core/modules/user/src/Plugin/migrate/source/ProfileField.php b/web/core/modules/user/src/Plugin/migrate/source/ProfileField.php
index c2a6fe447..151d5017d 100644
--- a/web/core/modules/user/src/Plugin/migrate/source/ProfileField.php
+++ b/web/core/modules/user/src/Plugin/migrate/source/ProfileField.php
@@ -70,7 +70,7 @@ class ProfileField extends DrupalSqlBase {
       // D6 profile checkboxes values are always 0 or 1 (with no labels), so we
       // need to create two label-less options that will get 0 and 1 for their
       // keys.
-      $row->setSourceProperty('options', array(NULL, NULL));
+      $row->setSourceProperty('options', [NULL, NULL]);
     }
 
     return parent::prepareRow($row);
@@ -80,7 +80,7 @@ class ProfileField extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'fid' => $this->t('Primary Key: Unique profile field ID.'),
       'title' => $this->t('Title of the field shown to the end user.'),
       'name' => $this->t('Internal name of the field used in the form HTML and URLs.'),
@@ -94,7 +94,7 @@ class ProfileField extends DrupalSqlBase {
       'visibility' => $this->t('The level of visibility for the field. (0 = hidden, 1 = private, 2 = public on profile but not member list pages, 3 = public on profile and list pages)'),
       'autocomplete' => $this->t('Whether form auto-completion is enabled. (0 = disabled, 1 = enabled)'),
       'options' => $this->t('List of options to be used in a list selection field.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php b/web/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php
index 746a76fd9..441fdc78c 100644
--- a/web/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php
+++ b/web/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php
@@ -22,24 +22,24 @@ class UserPictureInstance extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function initializeIterator() {
-    return new \ArrayIterator(array(
-      array(
+    return new \ArrayIterator([
+      [
         'id' => '',
         'file_directory' => $this->variableGet('user_picture_path', 'pictures'),
         'max_filesize' => $this->variableGet('user_picture_file_size', '30') . 'KB',
         'max_resolution' => $this->variableGet('user_picture_dimensions', '85x85'),
-      )));
+      ]]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'file_directory' => 'The directory to store images..',
       'max_filesize' => 'The maximum allowed file size in KBs.',
       'max_resolution' => "The maximum resolution.",
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/user/src/Plugin/migrate/source/d6/ProfileFieldValues.php b/web/core/modules/user/src/Plugin/migrate/source/d6/ProfileFieldValues.php
index 0ccbbeb51..80db9df96 100644
--- a/web/core/modules/user/src/Plugin/migrate/source/d6/ProfileFieldValues.php
+++ b/web/core/modules/user/src/Plugin/migrate/source/d6/ProfileFieldValues.php
@@ -21,7 +21,7 @@ class ProfileFieldValues extends DrupalSqlBase {
   public function query() {
     $query = $this->select('profile_values', 'pv')
       ->distinct()
-      ->fields('pv', array('uid'));
+      ->fields('pv', ['uid']);
 
     return $query;
   }
@@ -32,9 +32,9 @@ class ProfileFieldValues extends DrupalSqlBase {
   public function prepareRow(Row $row) {
     // Find profile values for this row.
     $query = $this->select('profile_values', 'pv')
-      ->fields('pv', array('fid', 'value'));
+      ->fields('pv', ['fid', 'value']);
     $query->leftJoin('profile_fields', 'pf', 'pf.fid=pv.fid');
-    $query->fields('pf', array('name', 'type'));
+    $query->fields('pf', ['name', 'type']);
     $query->condition('uid', $row->getSourceProperty('uid'));
     $results = $query->execute();
 
@@ -43,14 +43,14 @@ class ProfileFieldValues extends DrupalSqlBase {
       if ($profile_value['type'] == 'date') {
         $date = unserialize($profile_value['value']);
         $date = date('Y-m-d', mktime(0, 0, 0, $date['month'], $date['day'], $date['year']));
-        $row->setSourceProperty($profile_value['name'], array('value' => $date));
+        $row->setSourceProperty($profile_value['name'], ['value' => $date]);
       }
       elseif ($profile_value['type'] == 'list') {
         // Explode by newline and comma.
         $row->setSourceProperty($profile_value['name'], preg_split("/[\r\n,]+/", $profile_value['value']));
       }
       else {
-        $row->setSourceProperty($profile_value['name'], array($profile_value['value']));
+        $row->setSourceProperty($profile_value['name'], [$profile_value['value']]);
       }
     }
 
@@ -61,16 +61,16 @@ class ProfileFieldValues extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    $fields = array(
+    $fields = [
       'fid' => $this->t('Unique profile field ID.'),
       'uid' => $this->t('The user Id.'),
       'value' => $this->t('The value for this field.'),
-    );
+    ];
 
     $query = $this->select('profile_values', 'pv')
-      ->fields('pv', array('fid', 'value'));
+      ->fields('pv', ['fid', 'value']);
     $query->leftJoin('profile_fields', 'pf', 'pf.fid=pv.fid');
-    $query->fields('pf', array('name', 'title'));
+    $query->fields('pf', ['name', 'title']);
     $results = $query->execute();
     foreach ($results as $profile) {
       $fields[$profile['name']] = $this->t($profile['title']);
@@ -83,12 +83,12 @@ class ProfileFieldValues extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'uid' => array(
+    return [
+      'uid' => [
         'type' => 'integer',
         'alias' => 'pv',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/user/src/Plugin/migrate/source/d6/Role.php b/web/core/modules/user/src/Plugin/migrate/source/d6/Role.php
index 2357c5c86..82ad3e993 100644
--- a/web/core/modules/user/src/Plugin/migrate/source/d6/Role.php
+++ b/web/core/modules/user/src/Plugin/migrate/source/d6/Role.php
@@ -19,14 +19,14 @@ class Role extends DrupalSqlBase {
    *
    * @var array
    */
-  protected $filterPermissions = array();
+  protected $filterPermissions = [];
 
   /**
    * {@inheritdoc}
    */
   public function query() {
     $query = $this->select('role', 'r')
-      ->fields('r', array('rid', 'name'))
+      ->fields('r', ['rid', 'name'])
       ->orderBy('r.rid');
     return $query;
   }
@@ -35,10 +35,10 @@ class Role extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'rid' => $this->t('Role ID.'),
       'name' => $this->t('The name of the user role.'),
-    );
+    ];
   }
 
   /**
@@ -46,7 +46,7 @@ class Role extends DrupalSqlBase {
    */
   protected function initializeIterator() {
     $filter_roles = $this->select('filter_formats', 'f')
-      ->fields('f', array('format', 'roles'))
+      ->fields('f', ['format', 'roles'])
       ->execute()
       ->fetchAllKeyed();
     foreach ($filter_roles as $format => $roles) {
@@ -65,7 +65,7 @@ class Role extends DrupalSqlBase {
   public function prepareRow(Row $row) {
     $rid = $row->getSourceProperty('rid');
     $permissions = $this->select('permission', 'p')
-      ->fields('p', array('perm'))
+      ->fields('p', ['perm'])
       ->condition('rid', $rid)
       ->execute()
       ->fetchField();
diff --git a/web/core/modules/user/src/Plugin/migrate/source/d6/User.php b/web/core/modules/user/src/Plugin/migrate/source/d6/User.php
index 56f68bf8c..c8e9d19a7 100644
--- a/web/core/modules/user/src/Plugin/migrate/source/d6/User.php
+++ b/web/core/modules/user/src/Plugin/migrate/source/d6/User.php
@@ -35,7 +35,7 @@ class User extends DrupalSqlBase {
     // Profile fields.
     if ($this->moduleExists('profile')) {
       $fields += $this->select('profile_fields', 'pf')
-        ->fields('pf', array('name', 'title'))
+        ->fields('pf', ['name', 'title'])
         ->execute()
         ->fetchAllKeyed();
     }
@@ -49,7 +49,7 @@ class User extends DrupalSqlBase {
   public function prepareRow(Row $row) {
     // User roles.
     $roles = $this->select('users_roles', 'ur')
-      ->fields('ur', array('rid'))
+      ->fields('ur', ['rid'])
       ->condition('ur.uid', $row->getSourceProperty('uid'))
       ->execute()
       ->fetchCol();
@@ -60,7 +60,7 @@ class User extends DrupalSqlBase {
     if ($row->hasSourceProperty('timezone_id') && $row->getSourceProperty('timezone_id')) {
       if ($this->getDatabase()->schema()->tableExists('event_timezones')) {
         $event_timezone = $this->select('event_timezones', 'e')
-          ->fields('e', array('name'))
+          ->fields('e', ['name'])
           ->condition('e.timezone', $row->getSourceProperty('timezone_id'))
           ->execute()
           ->fetchField();
@@ -80,12 +80,12 @@ class User extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'uid' => array(
+    return [
+      'uid' => [
         'type' => 'integer',
         'alias' => 'u',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -95,7 +95,7 @@ class User extends DrupalSqlBase {
    *   Associative array having field name as key and description as value.
    */
   protected function baseFields() {
-    $fields = array(
+    $fields = [
       'uid' => $this->t('User ID'),
       'name' => $this->t('Username'),
       'pass' => $this->t('Password'),
@@ -112,7 +112,7 @@ class User extends DrupalSqlBase {
       'picture' => $this->t('Picture'),
       'init' => $this->t('Init'),
       'data' => $this->t('User data'),
-    );
+    ];
 
     // Possible field added by Date contributed module.
     // @see https://api.drupal.org/api/drupal/modules%21user%21user.install/function/user_update_7002/7
diff --git a/web/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php b/web/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php
index 13ae4f31d..6b16ad400 100644
--- a/web/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php
+++ b/web/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php
@@ -21,7 +21,7 @@ class UserPicture extends DrupalSqlBase {
   public function query() {
     $query = $this->select('users', 'u')
       ->condition('picture', '', '<>')
-      ->fields('u', array('uid', 'access', 'picture'))
+      ->fields('u', ['uid', 'access', 'picture'])
       ->orderBy('u.access');
     return $query;
   }
@@ -30,11 +30,11 @@ class UserPicture extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'uid' => 'Primary Key: Unique user ID.',
       'access' => 'Timestamp for previous time user accessed the site.',
       'picture' => "Path to the user's uploaded picture.",
-    );
+    ];
   }
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php b/web/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php
index d394e9c08..8952ffdf8 100644
--- a/web/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php
+++ b/web/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php
@@ -34,7 +34,7 @@ class UserPictureFile extends DrupalSqlBase {
   public function query() {
     $query = $this->select('users', 'u')
       ->condition('u.picture', '', '<>')
-      ->fields('u', array('uid', 'picture'));
+      ->fields('u', ['uid', 'picture']);
     return $query;
   }
 
@@ -62,10 +62,10 @@ class UserPictureFile extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'picture' => "Path to the user's uploaded picture.",
       'filename' => 'The picture filename.',
-    );
+    ];
   }
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/user/src/Plugin/migrate/source/d7/Role.php b/web/core/modules/user/src/Plugin/migrate/source/d7/Role.php
index 1067610e9..9245aab96 100644
--- a/web/core/modules/user/src/Plugin/migrate/source/d7/Role.php
+++ b/web/core/modules/user/src/Plugin/migrate/source/d7/Role.php
@@ -25,11 +25,11 @@ class Role extends DrupalSqlBase {
    * {@inheritdoc}
    */
   public function fields() {
-    return array(
+    return [
       'rid' => $this->t('Role ID.'),
       'name' => $this->t('The name of the user role.'),
       'weight' => $this->t('The weight of the role.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/user/src/Plugin/migrate/source/d7/User.php b/web/core/modules/user/src/Plugin/migrate/source/d7/User.php
index 717e12028..408d99880 100644
--- a/web/core/modules/user/src/Plugin/migrate/source/d7/User.php
+++ b/web/core/modules/user/src/Plugin/migrate/source/d7/User.php
@@ -27,7 +27,7 @@ class User extends FieldableEntity {
    * {@inheritdoc}
    */
   public function fields() {
-    $fields = array(
+    $fields = [
       'uid' => $this->t('User ID'),
       'name' => $this->t('Username'),
       'pass' => $this->t('Password'),
@@ -44,12 +44,12 @@ class User extends FieldableEntity {
       'init' => $this->t('Init'),
       'data' => $this->t('User data'),
       'roles' => $this->t('Roles'),
-    );
+    ];
 
     // Profile fields.
     if ($this->moduleExists('profile')) {
       $fields += $this->select('profile_fields', 'pf')
-        ->fields('pf', array('name', 'title'))
+        ->fields('pf', ['name', 'title'])
         ->execute()
         ->fetchAllKeyed();
     }
@@ -79,9 +79,9 @@ class User extends FieldableEntity {
     // ProfileFieldValues plugin.
     if ($this->getDatabase()->schema()->tableExists('profile_value')) {
       $query = $this->select('profile_value', 'pv')
-        ->fields('pv', array('fid', 'value'));
+        ->fields('pv', ['fid', 'value']);
       $query->leftJoin('profile_field', 'pf', 'pf.fid=pv.fid');
-      $query->fields('pf', array('name', 'type'));
+      $query->fields('pf', ['name', 'type']);
       $query->condition('uid', $row->getSourceProperty('uid'));
       $results = $query->execute();
 
@@ -89,14 +89,14 @@ class User extends FieldableEntity {
         if ($profile_value['type'] == 'date') {
           $date = unserialize($profile_value['value']);
           $date = date('Y-m-d', mktime(0, 0, 0, $date['month'], $date['day'], $date['year']));
-          $row->setSourceProperty($profile_value['name'], array('value' => $date));
+          $row->setSourceProperty($profile_value['name'], ['value' => $date]);
         }
         elseif ($profile_value['type'] == 'list') {
           // Explode by newline and comma.
           $row->setSourceProperty($profile_value['name'], preg_split("/[\r\n,]+/", $profile_value['value']));
         }
         else {
-          $row->setSourceProperty($profile_value['name'], array($profile_value['value']));
+          $row->setSourceProperty($profile_value['name'], [$profile_value['value']]);
         }
       }
     }
@@ -108,12 +108,12 @@ class User extends FieldableEntity {
    * {@inheritdoc}
    */
   public function getIds() {
-    return array(
-      'uid' => array(
+    return [
+      'uid' => [
         'type' => 'integer',
         'alias' => 'u',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/user/src/Plugin/rest/resource/UserRegistrationResource.php b/web/core/modules/user/src/Plugin/rest/resource/UserRegistrationResource.php
new file mode 100644
index 000000000..6a243c3a1
--- /dev/null
+++ b/web/core/modules/user/src/Plugin/rest/resource/UserRegistrationResource.php
@@ -0,0 +1,190 @@
+<?php
+
+namespace Drupal\user\Plugin\rest\resource;
+
+use Drupal\Core\Config\ImmutableConfig;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\rest\ModifiedResourceResponse;
+use Drupal\rest\Plugin\ResourceBase;
+use Drupal\rest\Plugin\rest\resource\EntityResourceAccessTrait;
+use Drupal\rest\Plugin\rest\resource\EntityResourceValidationTrait;
+use Drupal\user\UserInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
+
+/**
+ * Represents user registration as a resource.
+ *
+ * @RestResource(
+ *   id = "user_registration",
+ *   label = @Translation("User registration"),
+ *   serialization_class = "Drupal\user\Entity\User",
+ *   uri_paths = {
+ *     "https://www.drupal.org/link-relations/create" = "/user/register",
+ *   },
+ * )
+ */
+class UserRegistrationResource extends ResourceBase {
+
+  use EntityResourceValidationTrait;
+  use EntityResourceAccessTrait;
+
+  /**
+   * User settings config instance.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $userSettings;
+
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountInterface
+   */
+  protected $currentUser;
+
+  /**
+   * Constructs a new UserRegistrationResource instance.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param array $serializer_formats
+   *   The available serialization formats.
+   * @param \Psr\Log\LoggerInterface $logger
+   *   A logger instance.
+   * @param \Drupal\Core\Config\ImmutableConfig $user_settings
+   *   A user settings config instance.
+   * @param \Drupal\Core\Session\AccountInterface $current_user
+   *   The current user.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, array $serializer_formats, LoggerInterface $logger, ImmutableConfig $user_settings, AccountInterface $current_user) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $serializer_formats, $logger);
+    $this->userSettings = $user_settings;
+    $this->currentUser = $current_user;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->getParameter('serializer.formats'),
+      $container->get('logger.factory')->get('rest'),
+      $container->get('config.factory')->get('user.settings'),
+      $container->get('current_user')
+    );
+  }
+
+  /**
+   * Responds to user registration POST request.
+   *
+   * @param \Drupal\user\UserInterface $account
+   *   The user account entity.
+   *
+   * @return \Drupal\rest\ModifiedResourceResponse
+   *   The HTTP response object.
+   *
+   * @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
+   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+   */
+  public function post(UserInterface $account = NULL) {
+    $this->ensureAccountCanRegister($account);
+
+    // Only activate new users if visitors are allowed to register and no email
+    // verification required.
+    if ($this->userSettings->get('register') == USER_REGISTER_VISITORS && !$this->userSettings->get('verify_mail')) {
+      $account->activate();
+    }
+    else {
+      $account->block();
+    }
+
+    $this->checkEditFieldAccess($account);
+
+    // Make sure that the user entity is valid (email and name are valid).
+    $this->validate($account);
+
+    // Create the account.
+    $account->save();
+
+    $this->sendEmailNotifications($account);
+
+    return new ModifiedResourceResponse($account, 200);
+  }
+
+  /**
+   * Ensure the account can be registered in this request.
+   *
+   * @param \Drupal\user\UserInterface $account
+   *   The user account to register.
+   */
+  protected function ensureAccountCanRegister(UserInterface $account = NULL) {
+    if ($account === NULL) {
+      throw new BadRequestHttpException('No user account data for registration received.');
+    }
+
+    // POSTed user accounts must not have an ID set, because we always want to
+    // create new entities here.
+    if (!$account->isNew()) {
+      throw new BadRequestHttpException('An ID has been set and only new user accounts can be registered.');
+    }
+
+    // Only allow anonymous users to register, authenticated users with the
+    // necessary permissions can POST a new user to the "user" REST resource.
+    // @see \Drupal\rest\Plugin\rest\resource\EntityResource
+    if (!$this->currentUser->isAnonymous()) {
+      throw new AccessDeniedHttpException('Only anonymous users can register a user.');
+    }
+
+    // Verify that the current user can register a user account.
+    if ($this->userSettings->get('register') == USER_REGISTER_ADMINISTRATORS_ONLY) {
+      throw new AccessDeniedHttpException('You cannot register a new user account.');
+    }
+
+    if (!$this->userSettings->get('verify_mail')) {
+      if (empty($account->getPassword())) {
+        // If no e-mail verification then the user must provide a password.
+        throw new UnprocessableEntityHttpException('No password provided.');
+      }
+    }
+    else {
+      if (!empty($account->getPassword())) {
+        // If e-mail verification required then a password cannot provided.
+        // The password will be set when the user logs in.
+        throw new UnprocessableEntityHttpException('A Password cannot be specified. It will be generated on login.');
+      }
+    }
+  }
+
+  /**
+   * Sends email notifications if necessary for user that was registered.
+   *
+   * @param \Drupal\user\UserInterface $account
+   *   The user account.
+   */
+  protected function sendEmailNotifications(UserInterface $account) {
+    $approval_settings = $this->userSettings->get('register');
+    // No e-mail verification is required. Activating the user.
+    if ($approval_settings == USER_REGISTER_VISITORS) {
+      if ($this->userSettings->get('verify_mail')) {
+        // No administrator approval required.
+        _user_mail_notify('register_no_approval_required', $account);
+      }
+    }
+    // Administrator approval required.
+    elseif ($approval_settings == USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL) {
+      _user_mail_notify('register_pending_approval', $account);
+    }
+  }
+
+}
diff --git a/web/core/modules/user/src/Plugin/views/access/Permission.php b/web/core/modules/user/src/Plugin/views/access/Permission.php
index d2d757bd9..8d0c43dfc 100644
--- a/web/core/modules/user/src/Plugin/views/access/Permission.php
+++ b/web/core/modules/user/src/Plugin/views/access/Permission.php
@@ -103,7 +103,7 @@ class Permission extends AccessPluginBase implements CacheableDependencyInterfac
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['perm'] = array('default' => 'access content');
+    $options['perm'] = ['default' => 'access content'];
 
     return $options;
   }
@@ -119,13 +119,13 @@ class Permission extends AccessPluginBase implements CacheableDependencyInterfac
       $perms[$display_name][$perm] = strip_tags($perm_item['title']);
     }
 
-    $form['perm'] = array(
+    $form['perm'] = [
       '#type' => 'select',
       '#options' => $perms,
       '#title' => $this->t('Permission'),
       '#default_value' => $this->options['perm'],
       '#description' => $this->t('Only users with the selected permission flag will be able to access this display.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/user/src/Plugin/views/access/Role.php b/web/core/modules/user/src/Plugin/views/access/Role.php
index 2e5b6b4b0..e35daa1ee 100644
--- a/web/core/modules/user/src/Plugin/views/access/Role.php
+++ b/web/core/modules/user/src/Plugin/views/access/Role.php
@@ -99,31 +99,31 @@ class Role extends AccessPluginBase implements CacheableDependencyInterface {
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['role'] = array('default' => array());
+    $options['role'] = ['default' => []];
 
     return $options;
   }
 
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['role'] = array(
+    $form['role'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Role'),
       '#default_value' => $this->options['role'],
       '#options' => array_map('\Drupal\Component\Utility\Html::escape', user_role_names()),
       '#description' => $this->t('Only the checked roles will be able to access this display.'),
-    );
+    ];
   }
 
   public function validateOptionsForm(&$form, FormStateInterface $form_state) {
-    $role = $form_state->getValue(array('access_options', 'role'));
+    $role = $form_state->getValue(['access_options', 'role']);
     $role = array_filter($role);
 
     if (!$role) {
       $form_state->setError($form['role'], $this->t('You must select at least one role if type is "by role"'));
     }
 
-    $form_state->setValue(array('access_options', 'role'), $role);
+    $form_state->setValue(['access_options', 'role'], $role);
   }
 
   /**
diff --git a/web/core/modules/user/src/Plugin/views/argument/RolesRid.php b/web/core/modules/user/src/Plugin/views/argument/RolesRid.php
index a1bba7937..ff9bf5ec8 100644
--- a/web/core/modules/user/src/Plugin/views/argument/RolesRid.php
+++ b/web/core/modules/user/src/Plugin/views/argument/RolesRid.php
@@ -52,7 +52,7 @@ class RolesRid extends ManyToOne {
    */
   public function titleQuery() {
     $entities = $this->roleStorage->loadMultiple($this->value);
-    $titles = array();
+    $titles = [];
     foreach ($entities as $entity) {
       $titles[] = $entity->label();
     }
diff --git a/web/core/modules/user/src/Plugin/views/argument_default/User.php b/web/core/modules/user/src/Plugin/views/argument_default/User.php
index 0d1d44581..448f79c55 100644
--- a/web/core/modules/user/src/Plugin/views/argument_default/User.php
+++ b/web/core/modules/user/src/Plugin/views/argument_default/User.php
@@ -64,7 +64,7 @@ class User extends ArgumentDefaultPluginBase implements CacheableDependencyInter
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['user'] = array('default' => '');
+    $options['user'] = ['default' => ''];
 
     return $options;
   }
@@ -73,11 +73,11 @@ class User extends ArgumentDefaultPluginBase implements CacheableDependencyInter
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['user'] = array(
+    $form['user'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Also look for a node and use the node author'),
       '#default_value' => $this->options['user'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/user/src/Plugin/views/argument_validator/User.php b/web/core/modules/user/src/Plugin/views/argument_validator/User.php
index fa61dbf66..e7d213917 100644
--- a/web/core/modules/user/src/Plugin/views/argument_validator/User.php
+++ b/web/core/modules/user/src/Plugin/views/argument_validator/User.php
@@ -38,8 +38,8 @@ class User extends Entity {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['restrict_roles'] = array('default' => FALSE);
-    $options['roles'] = array('default' => array());
+    $options['restrict_roles'] = ['default' => FALSE];
+    $options['roles'] = ['default' => []];
 
     return $options;
   }
@@ -51,30 +51,30 @@ class User extends Entity {
     parent::buildOptionsForm($form, $form_state);
     $sanitized_id = ArgumentPluginBase::encodeValidatorId($this->definition['id']);
 
-    $form['restrict_roles'] = array(
+    $form['restrict_roles'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Restrict user based on role'),
       '#default_value' => $this->options['restrict_roles'],
-    );
+    ];
 
-    $form['roles'] = array(
+    $form['roles'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Restrict to the selected roles'),
-      '#options' => array_map(array('\Drupal\Component\Utility\Html', 'escape'), user_role_names(TRUE)),
+      '#options' => array_map(['\Drupal\Component\Utility\Html', 'escape'], user_role_names(TRUE)),
       '#default_value' => $this->options['roles'],
       '#description' => $this->t('If no roles are selected, users from any role will be allowed.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[validate][options][' . $sanitized_id . '][restrict_roles]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[validate][options][' . $sanitized_id . '][restrict_roles]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = array()) {
+  public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = []) {
     // filter trash out of the options so we don't store giant unnecessary arrays
     $options['roles'] = array_filter($options['roles']);
   }
diff --git a/web/core/modules/user/src/Plugin/views/argument_validator/UserName.php b/web/core/modules/user/src/Plugin/views/argument_validator/UserName.php
index 88ffd6461..8ef4999b3 100644
--- a/web/core/modules/user/src/Plugin/views/argument_validator/UserName.php
+++ b/web/core/modules/user/src/Plugin/views/argument_validator/UserName.php
@@ -23,10 +23,10 @@ class UserName extends User {
 
     $entity_type = $this->entityManager->getDefinition('user');
 
-    $form['multiple']['#options'] = array(
-      0 => $this->t('Single name', array('%type' => $entity_type->getLabel())),
-      1 => $this->t('One or more names separated by , or +', array('%type' => $entity_type->getLabel())),
-    );
+    $form['multiple']['#options'] = [
+      0 => $this->t('Single name', ['%type' => $entity_type->getLabel()]),
+      1 => $this->t('One or more names separated by , or +', ['%type' => $entity_type->getLabel()]),
+    ];
   }
 
   /**
@@ -39,14 +39,14 @@ class UserName extends User {
       $names = array_filter(preg_split('/[,+ ]/', $argument));
     }
     elseif ($argument) {
-      $names = array($argument);
+      $names = [$argument];
     }
     // No specified argument should be invalid.
     else {
       return FALSE;
     }
 
-    $accounts = $this->userStorage->loadByProperties(array('name' => $names));
+    $accounts = $this->userStorage->loadByProperties(['name' => $names]);
 
     // If there are no accounts, return FALSE now. As we will not enter the
     // loop below otherwise.
diff --git a/web/core/modules/user/src/Plugin/views/field/Permissions.php b/web/core/modules/user/src/Plugin/views/field/Permissions.php
index bd5c11d5d..71aef5975 100644
--- a/web/core/modules/user/src/Plugin/views/field/Permissions.php
+++ b/web/core/modules/user/src/Plugin/views/field/Permissions.php
@@ -66,7 +66,7 @@ class Permissions extends PrerenderList {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['uid'] = array('table' => 'users_field_data', 'field' => 'uid');
+    $this->additional_fields['uid'] = ['table' => 'users_field_data', 'field' => 'uid'];
   }
 
   public function query() {
@@ -75,12 +75,11 @@ class Permissions extends PrerenderList {
   }
 
   public function preRender(&$values) {
-    $uids = array();
-    $this->items = array();
+    $this->items = [];
 
     $permission_names = \Drupal::service('user.permissions')->getPermissions();
 
-    $rids = array();
+    $rids = [];
     foreach ($values as $result) {
       $user_rids = $this->getEntity($result)->getRoles();
       $uid = $this->getValue($result);
@@ -100,15 +99,13 @@ class Permissions extends PrerenderList {
         }
       }
 
-      foreach ($uids as $uid) {
-        if (isset($this->items[$uid])) {
-          ksort($this->items[$uid]);
-        }
+      foreach ($this->items as &$permission) {
+        ksort($permission);
       }
     }
   }
 
-  function render_item($count, $item) {
+  public function render_item($count, $item) {
     return $item['permission'];
   }
 
diff --git a/web/core/modules/user/src/Plugin/views/field/Roles.php b/web/core/modules/user/src/Plugin/views/field/Roles.php
index 9d8edc04f..e7d9495bc 100644
--- a/web/core/modules/user/src/Plugin/views/field/Roles.php
+++ b/web/core/modules/user/src/Plugin/views/field/Roles.php
@@ -55,7 +55,7 @@ class Roles extends PrerenderList {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields['uid'] = array('table' => 'users_field_data', 'field' => 'uid');
+    $this->additional_fields['uid'] = ['table' => 'users_field_data', 'field' => 'uid'];
   }
 
   public function query() {
@@ -64,8 +64,8 @@ class Roles extends PrerenderList {
   }
 
   public function preRender(&$values) {
-    $uids = array();
-    $this->items = array();
+    $uids = [];
+    $this->items = [];
 
     foreach ($values as $result) {
       $uids[] = $this->getValue($result);
@@ -73,7 +73,7 @@ class Roles extends PrerenderList {
 
     if ($uids) {
       $roles = user_roles();
-      $result = $this->database->query('SELECT u.entity_id as uid, u.roles_target_id as rid FROM {user__roles} u WHERE u.entity_id IN ( :uids[] ) AND u.roles_target_id IN ( :rids[] )', array(':uids[]' => $uids, ':rids[]' => array_keys($roles)));
+      $result = $this->database->query('SELECT u.entity_id as uid, u.roles_target_id as rid FROM {user__roles} u WHERE u.entity_id IN ( :uids[] ) AND u.roles_target_id IN ( :rids[] )', [':uids[]' => $uids, ':rids[]' => array_keys($roles)]);
       foreach ($result as $role) {
         $this->items[$role->uid][$role->rid]['role'] = $roles[$role->rid]->label();
         $this->items[$role->uid][$role->rid]['rid'] = $role->rid;
@@ -90,7 +90,7 @@ class Roles extends PrerenderList {
     }
   }
 
-  function render_item($count, $item) {
+  public function render_item($count, $item) {
     return $item['role'];
   }
 
diff --git a/web/core/modules/user/src/Plugin/views/field/UserBulkForm.php b/web/core/modules/user/src/Plugin/views/field/UserBulkForm.php
index 57ae4370b..3d0196a96 100644
--- a/web/core/modules/user/src/Plugin/views/field/UserBulkForm.php
+++ b/web/core/modules/user/src/Plugin/views/field/UserBulkForm.php
@@ -25,7 +25,7 @@ class UserBulkForm extends BulkForm {
       foreach ($this->view->result as $row_index => $result) {
         $account = $result->_entity;
         if ($account instanceof UserInterface) {
-          $form[$this->options['id']][$row_index]['#title'] = $this->t('Update the user %name', array('%name' => $account->label()));
+          $form[$this->options['id']][$row_index]['#title'] = $this->t('Update the user %name', ['%name' => $account->label()]);
         }
       }
     }
diff --git a/web/core/modules/user/src/Plugin/views/field/UserData.php b/web/core/modules/user/src/Plugin/views/field/UserData.php
index b87346fc6..365ab3b74 100644
--- a/web/core/modules/user/src/Plugin/views/field/UserData.php
+++ b/web/core/modules/user/src/Plugin/views/field/UserData.php
@@ -58,8 +58,8 @@ class UserData extends FieldPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['data_module'] = array('default' => '');
-    $options['data_name'] = array('default' => '');
+    $options['data_module'] = ['default' => ''];
+    $options['data_name'] = ['default' => ''];
 
     return $options;
   }
@@ -71,25 +71,25 @@ class UserData extends FieldPluginBase {
     parent::buildOptionsForm($form, $form_state);
 
     $modules = $this->moduleHandler->getModuleList();
-    $names = array();
+    $names = [];
     foreach (array_keys($modules) as $name) {
       $names[$name] = $this->moduleHandler->getName($name);
     }
 
-    $form['data_module'] = array(
+    $form['data_module'] = [
       '#title' => $this->t('Module name'),
       '#type' => 'select',
       '#description' => $this->t('The module which sets this user data.'),
       '#default_value' => $this->options['data_module'],
       '#options' => $names,
-    );
+    ];
 
-    $form['data_name'] = array(
+    $form['data_name'] = [
       '#title' => $this->t('Name'),
       '#type' => 'textfield',
       '#description' => $this->t('The name of the data key.'),
       '#default_value' => $this->options['data_name'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/user/src/Plugin/views/filter/Name.php b/web/core/modules/user/src/Plugin/views/filter/Name.php
index e241e8763..f4260c5c0 100644
--- a/web/core/modules/user/src/Plugin/views/filter/Name.php
+++ b/web/core/modules/user/src/Plugin/views/filter/Name.php
@@ -19,9 +19,9 @@ class Name extends InOperator {
   protected $alwaysMultiple = TRUE;
 
   protected function valueForm(&$form, FormStateInterface $form_state) {
-    $users = $this->value ? User::loadMultiple($this->value) : array();
+    $users = $this->value ? User::loadMultiple($this->value) : [];
     $default_value = EntityAutocomplete::getEntityLabels($users);
-    $form['value'] = array(
+    $form['value'] = [
       '#type' => 'entity_autocomplete',
       '#title' => $this->t('Usernames'),
       '#description' => $this->t('Enter a comma separated list of user names.'),
@@ -29,7 +29,7 @@ class Name extends InOperator {
       '#tags' => TRUE,
       '#default_value' => $default_value,
       '#process_default_value' => $this->isExposed(),
-    );
+    ];
 
     $user_input = $form_state->getUserInput();
     if ($form_state->get('exposed') && !isset($user_input[$this->options['expose']['identifier']])) {
@@ -40,13 +40,13 @@ class Name extends InOperator {
 
   protected function valueValidate($form, FormStateInterface $form_state) {
     $uids = [];
-    if ($values = $form_state->getValue(array('options', 'value'))) {
+    if ($values = $form_state->getValue(['options', 'value'])) {
       foreach ($values as $value) {
         $uids[] = $value['target_id'];
       }
       sort($uids);
     }
-    $form_state->setValue(array('options', 'value'), $uids);
+    $form_state->setValue(['options', 'value'], $uids);
   }
 
   public function acceptExposedInput($input) {
@@ -105,7 +105,7 @@ class Name extends InOperator {
 
   public function adminSummary() {
     // set up $this->valueOptions for the parent summary
-    $this->valueOptions = array();
+    $this->valueOptions = [];
 
     if ($this->value) {
       $result = \Drupal::entityTypeManager()->getStorage('user')
diff --git a/web/core/modules/user/src/Plugin/views/filter/Permissions.php b/web/core/modules/user/src/Plugin/views/filter/Permissions.php
index 7d444c681..7dd9171aa 100644
--- a/web/core/modules/user/src/Plugin/views/filter/Permissions.php
+++ b/web/core/modules/user/src/Plugin/views/filter/Permissions.php
@@ -88,7 +88,7 @@ class Permissions extends ManyToOne {
    */
   public function query() {
     // @todo user_role_names() should maybe support multiple permissions.
-    $rids = array();
+    $rids = [];
     // Get all role IDs that have the configured permissions.
     foreach ($this->value as $permission) {
       $roles = user_role_names(FALSE, $permission);
diff --git a/web/core/modules/user/src/Plugin/views/filter/Roles.php b/web/core/modules/user/src/Plugin/views/filter/Roles.php
index 64074c392..d84e32409 100644
--- a/web/core/modules/user/src/Plugin/views/filter/Roles.php
+++ b/web/core/modules/user/src/Plugin/views/filter/Roles.php
@@ -62,7 +62,7 @@ class Roles extends ManyToOne {
   /**
    * Override empty and not empty operator labels to be clearer for user roles.
    */
-  function operators() {
+  public function operators() {
     $operators = parent::operators();
     $operators['empty']['title'] = $this->t("Only has the 'authenticated user' role");
     $operators['not empty']['title'] = $this->t("Has roles in addition to 'authenticated user'");
@@ -73,7 +73,7 @@ class Roles extends ManyToOne {
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    $dependencies = array();
+    $dependencies = [];
     foreach ($this->value as $role_id) {
       $role = $this->roleStorage->load($role_id);
       $dependencies[$role->getConfigDependencyKey()][] = $role->getConfigDependencyName();
diff --git a/web/core/modules/user/src/Plugin/views/wizard/Users.php b/web/core/modules/user/src/Plugin/views/wizard/Users.php
index efd42723c..081a509a2 100644
--- a/web/core/modules/user/src/Plugin/views/wizard/Users.php
+++ b/web/core/modules/user/src/Plugin/views/wizard/Users.php
@@ -27,16 +27,16 @@ class Users extends WizardPluginBase {
   /**
    * Set default values for the filters.
    */
-  protected $filters = array(
-    'status' => array(
+  protected $filters = [
+    'status' => [
       'value' => TRUE,
       'table' => 'users_field_data',
       'field' => 'status',
       'plugin_id' => 'boolean',
       'entity_type' => 'user',
       'entity_field' => 'status',
-    )
-  );
+    ]
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/user/src/PrivateTempStore.php b/web/core/modules/user/src/PrivateTempStore.php
index bb0224605..651227c37 100644
--- a/web/core/modules/user/src/PrivateTempStore.php
+++ b/web/core/modules/user/src/PrivateTempStore.php
@@ -112,6 +112,9 @@ class PrivateTempStore {
    *   The key of the data to store.
    * @param mixed $value
    *   The data to store.
+   *
+   * @throws \Drupal\user\TempStoreException
+   *   Thrown when a lock for the backend storage could not be acquired.
    */
   public function set($key, $value) {
     $key = $this->createkey($key);
@@ -122,11 +125,11 @@ class PrivateTempStore {
       }
     }
 
-    $value = (object) array(
+    $value = (object) [
       'owner' => $this->getOwner(),
       'data' => $value,
       'updated' => (int) $this->requestStack->getMasterRequest()->server->get('REQUEST_TIME'),
-    );
+    ];
     $this->storage->setWithExpire($key, $value, $this->expire);
     $this->lockBackend->release($key);
   }
@@ -161,6 +164,9 @@ class PrivateTempStore {
    * @return bool
    *   TRUE if the object was deleted or does not exist, FALSE if it exists but
    *   is not owned by $this->owner.
+   *
+   * @throws \Drupal\user\TempStoreException
+   *   Thrown when a lock for the backend storage could not be acquired.
    */
   public function delete($key) {
     $key = $this->createkey($key);
diff --git a/web/core/modules/user/src/PrivateTempStoreFactory.php b/web/core/modules/user/src/PrivateTempStoreFactory.php
index acbf41bc5..063a9207c 100644
--- a/web/core/modules/user/src/PrivateTempStoreFactory.php
+++ b/web/core/modules/user/src/PrivateTempStoreFactory.php
@@ -61,7 +61,7 @@ class PrivateTempStoreFactory {
    * @param int $expire
    *   The time to live for items, in seconds.
    */
-  function __construct(KeyValueExpirableFactoryInterface $storage_factory, LockBackendInterface $lock_backend, AccountProxyInterface $current_user, RequestStack $request_stack, $expire = 604800) {
+  public function __construct(KeyValueExpirableFactoryInterface $storage_factory, LockBackendInterface $lock_backend, AccountProxyInterface $current_user, RequestStack $request_stack, $expire = 604800) {
     $this->storageFactory = $storage_factory;
     $this->lockBackend = $lock_backend;
     $this->currentUser = $current_user;
@@ -79,7 +79,7 @@ class PrivateTempStoreFactory {
    * @return \Drupal\user\PrivateTempStore
    *   An instance of the key/value store.
    */
-  function get($collection) {
+  public function get($collection) {
     // Store the data for this collection in the database.
     $storage = $this->storageFactory->get("user.private_tempstore.$collection");
     return new PrivateTempStore($storage, $this->lockBackend, $this->currentUser, $this->requestStack, $this->expire);
diff --git a/web/core/modules/user/src/ProfileForm.php b/web/core/modules/user/src/ProfileForm.php
index aee2e3aab..343d4d0e0 100644
--- a/web/core/modules/user/src/ProfileForm.php
+++ b/web/core/modules/user/src/ProfileForm.php
@@ -2,23 +2,13 @@
 
 namespace Drupal\user;
 
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
 
 /**
  * Form handler for the profile forms.
  */
 class ProfileForm extends AccountForm {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager, QueryFactory $entity_query) {
-    parent::__construct($entity_manager, $language_manager, $entity_query);
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -32,7 +22,7 @@ class ProfileForm extends AccountForm {
     $user = $this->currentUser();
     $element['delete']['#type'] = 'submit';
     $element['delete']['#value'] = $this->t('Cancel account');
-    $element['delete']['#submit'] = array('::editCancelSubmit');
+    $element['delete']['#submit'] = ['::editCancelSubmit'];
     $element['delete']['#access'] = $account->id() > 1 && (($account->id() == $user->id() && $user->hasPermission('cancel account')) || $user->hasPermission('administer users'));
 
     return $element;
@@ -53,17 +43,17 @@ class ProfileForm extends AccountForm {
    * Provides a submit handler for the 'Cancel account' button.
    */
   public function editCancelSubmit($form, FormStateInterface $form_state) {
-    $destination = array();
+    $destination = [];
     $query = $this->getRequest()->query;
     if ($query->has('destination')) {
-      $destination = array('destination' => $query->get('destination'));
+      $destination = ['destination' => $query->get('destination')];
       $query->remove('destination');
     }
     // We redirect from user/%/edit to user/%/cancel to make the tabs disappear.
     $form_state->setRedirect(
       'entity.user.cancel_form',
-      array('user' => $this->entity->id()),
-      array('query' => $destination)
+      ['user' => $this->entity->id()],
+      ['query' => $destination]
     );
   }
 
diff --git a/web/core/modules/user/src/ProfileTranslationHandler.php b/web/core/modules/user/src/ProfileTranslationHandler.php
index d981f99f6..5b469525a 100644
--- a/web/core/modules/user/src/ProfileTranslationHandler.php
+++ b/web/core/modules/user/src/ProfileTranslationHandler.php
@@ -32,7 +32,7 @@ class ProfileTranslationHandler extends ContentTranslationHandler {
    */
   public function entityFormAlter(array &$form, FormStateInterface $form_state, EntityInterface $entity) {
     parent::entityFormAlter($form, $form_state, $entity);
-    $form['actions']['submit']['#submit'][] = array($this, 'entityFormSave');
+    $form['actions']['submit']['#submit'][] = [$this, 'entityFormSave'];
   }
 
   /**
diff --git a/web/core/modules/user/src/RegisterForm.php b/web/core/modules/user/src/RegisterForm.php
index 9bc047b58..7a97974fb 100644
--- a/web/core/modules/user/src/RegisterForm.php
+++ b/web/core/modules/user/src/RegisterForm.php
@@ -20,10 +20,10 @@ class RegisterForm extends AccountForm {
     // Pass access information to the submit handler. Running an access check
     // inside the submit function interferes with form processing and breaks
     // hook_form_alter().
-    $form['administer_users'] = array(
+    $form['administer_users'] = [
       '#type' => 'value',
       '#value' => $admin,
-    );
+    ];
 
     $form['#attached']['library'][] = 'core/drupal.form';
 
@@ -94,14 +94,14 @@ class RegisterForm extends AccountForm {
     $form_state->set('user', $account);
     $form_state->setValue('uid', $account->id());
 
-    $this->logger('user')->notice('New user: %name %email.', array('%name' => $form_state->getValue('name'), '%email' => '<' . $form_state->getValue('mail') . '>', 'type' => $account->link($this->t('Edit'), 'edit-form')));
+    $this->logger('user')->notice('New user: %name %email.', ['%name' => $form_state->getValue('name'), '%email' => '<' . $form_state->getValue('mail') . '>', 'type' => $account->link($this->t('Edit'), 'edit-form')]);
 
     // Add plain text password into user account to generate mail tokens.
     $account->password = $pass;
 
     // New administrative account without notification.
     if ($admin && !$notify) {
-      drupal_set_message($this->t('Created a new user account for <a href=":url">%name</a>. No email has been sent.', array(':url' => $account->url(), '%name' => $account->getUsername())));
+      drupal_set_message($this->t('Created a new user account for <a href=":url">%name</a>. No email has been sent.', [':url' => $account->url(), '%name' => $account->getUsername()]));
     }
     // No email verification required; log in user immediately.
     elseif (!$admin && !\Drupal::config('user.settings')->get('verify_mail') && $account->isActive()) {
@@ -113,13 +113,13 @@ class RegisterForm extends AccountForm {
     // No administrator approval required.
     elseif ($account->isActive() || $notify) {
       if (!$account->getEmail() && $notify) {
-        drupal_set_message($this->t('The new user <a href=":url">%name</a> was created without an email address, so no welcome message was sent.', array(':url' => $account->url(), '%name' => $account->getUsername())));
+        drupal_set_message($this->t('The new user <a href=":url">%name</a> was created without an email address, so no welcome message was sent.', [':url' => $account->url(), '%name' => $account->getUsername()]));
       }
       else {
         $op = $notify ? 'register_admin_created' : 'register_no_approval_required';
         if (_user_mail_notify($op, $account)) {
           if ($notify) {
-            drupal_set_message($this->t('A welcome message with further instructions has been emailed to the new user <a href=":url">%name</a>.', array(':url' => $account->url(), '%name' => $account->getUsername())));
+            drupal_set_message($this->t('A welcome message with further instructions has been emailed to the new user <a href=":url">%name</a>.', [':url' => $account->url(), '%name' => $account->getUsername()]));
           }
           else {
             drupal_set_message($this->t('A welcome message with further instructions has been sent to your email address.'));
diff --git a/web/core/modules/user/src/RoleForm.php b/web/core/modules/user/src/RoleForm.php
index 3199c45aa..7e7885354 100644
--- a/web/core/modules/user/src/RoleForm.php
+++ b/web/core/modules/user/src/RoleForm.php
@@ -15,7 +15,7 @@ class RoleForm extends EntityForm {
    */
   public function form(array $form, FormStateInterface $form_state) {
     $entity = $this->entity;
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Role name'),
       '#default_value' => $entity->label(),
@@ -23,22 +23,22 @@ class RoleForm extends EntityForm {
       '#required' => TRUE,
       '#maxlength' => 64,
       '#description' => $this->t('The name for this role. Example: "Moderator", "Editorial board", "Site architect".'),
-    );
-    $form['id'] = array(
+    ];
+    $form['id'] = [
       '#type' => 'machine_name',
       '#default_value' => $entity->id(),
       '#required' => TRUE,
       '#disabled' => !$entity->isNew(),
       '#size' => 30,
       '#maxlength' => 64,
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => ['\Drupal\user\Entity\Role', 'load'],
-      ),
-    );
-    $form['weight'] = array(
+      ],
+    ];
+    $form['weight'] = [
       '#type' => 'value',
       '#value' => $entity->getWeight(),
-    );
+    ];
 
     return parent::form($form, $form_state, $entity);
   }
@@ -55,12 +55,12 @@ class RoleForm extends EntityForm {
 
     $edit_link = $this->entity->link($this->t('Edit'));
     if ($status == SAVED_UPDATED) {
-      drupal_set_message($this->t('Role %label has been updated.', array('%label' => $entity->label())));
-      $this->logger('user')->notice('Role %label has been updated.', array('%label' => $entity->label(), 'link' => $edit_link));
+      drupal_set_message($this->t('Role %label has been updated.', ['%label' => $entity->label()]));
+      $this->logger('user')->notice('Role %label has been updated.', ['%label' => $entity->label(), 'link' => $edit_link]);
     }
     else {
-      drupal_set_message($this->t('Role %label has been added.', array('%label' => $entity->label())));
-      $this->logger('user')->notice('Role %label has been added.', array('%label' => $entity->label(), 'link' => $edit_link));
+      drupal_set_message($this->t('Role %label has been added.', ['%label' => $entity->label()]));
+      $this->logger('user')->notice('Role %label has been added.', ['%label' => $entity->label(), 'link' => $edit_link]);
     }
     $form_state->setRedirect('entity.user_role.collection');
   }
diff --git a/web/core/modules/user/src/RoleListBuilder.php b/web/core/modules/user/src/RoleListBuilder.php
index 16bd92cd6..aa3b844fd 100644
--- a/web/core/modules/user/src/RoleListBuilder.php
+++ b/web/core/modules/user/src/RoleListBuilder.php
@@ -43,11 +43,11 @@ class RoleListBuilder extends DraggableListBuilder {
     $operations = parent::getDefaultOperations($entity);
 
     if ($entity->hasLinkTemplate('edit-permissions-form')) {
-      $operations['permissions'] = array(
+      $operations['permissions'] = [
         'title' => t('Edit permissions'),
         'weight' => 20,
         'url' => $entity->urlInfo('edit-permissions-form'),
-      );
+      ];
     }
     return $operations;
   }
diff --git a/web/core/modules/user/src/SharedTempStore.php b/web/core/modules/user/src/SharedTempStore.php
index d6295266c..2c6113ff6 100644
--- a/web/core/modules/user/src/SharedTempStore.php
+++ b/web/core/modules/user/src/SharedTempStore.php
@@ -142,11 +142,11 @@ class SharedTempStore {
    *   TRUE if the data was set, or FALSE if it already existed.
    */
   public function setIfNotExists($key, $value) {
-    $value = (object) array(
+    $value = (object) [
       'owner' => $this->owner,
       'data' => $value,
       'updated' => (int) $this->requestStack->getMasterRequest()->server->get('REQUEST_TIME'),
-    );
+    ];
     return $this->storage->setWithExpireIfNotExists($key, $value, $this->expire);
   }
 
@@ -164,6 +164,9 @@ class SharedTempStore {
    * @return bool
    *   TRUE if the data was set, or FALSE if it already exists and is not owned
    *   by $this->user.
+   *
+   * @throws \Drupal\user\TempStoreException
+   *   Thrown when a lock for the backend storage could not be acquired.
    */
   public function setIfOwner($key, $value) {
     if ($this->setIfNotExists($key, $value)) {
@@ -185,6 +188,9 @@ class SharedTempStore {
    *   The key of the data to store.
    * @param mixed $value
    *   The data to store.
+   *
+   * @throws \Drupal\user\TempStoreException
+   *   Thrown when a lock for the backend storage could not be acquired.
    */
   public function set($key, $value) {
     if (!$this->lockBackend->acquire($key)) {
@@ -194,11 +200,11 @@ class SharedTempStore {
       }
     }
 
-    $value = (object) array(
+    $value = (object) [
       'owner' => $this->owner,
       'data' => $value,
       'updated' => (int) $this->requestStack->getMasterRequest()->server->get('REQUEST_TIME'),
-    );
+    ];
     $this->storage->setWithExpire($key, $value, $this->expire);
     $this->lockBackend->release($key);
   }
@@ -228,6 +234,9 @@ class SharedTempStore {
    *
    * @param string $key
    *   The key of the data to delete.
+   *
+   * @throws \Drupal\user\TempStoreException
+   *   Thrown when a lock for the backend storage could not be acquired.
    */
   public function delete($key) {
     if (!$this->lockBackend->acquire($key)) {
@@ -251,6 +260,9 @@ class SharedTempStore {
    * @return bool
    *   TRUE if the object was deleted or does not exist, FALSE if it exists but
    *   is not owned by $this->owner.
+   *
+   * @throws \Drupal\user\TempStoreException
+   *   Thrown when a lock for the backend storage could not be acquired.
    */
   public function deleteIfOwner($key) {
     if (!$object = $this->storage->get($key)) {
diff --git a/web/core/modules/user/src/SharedTempStoreFactory.php b/web/core/modules/user/src/SharedTempStoreFactory.php
index 662ef47aa..c1c48a93b 100644
--- a/web/core/modules/user/src/SharedTempStoreFactory.php
+++ b/web/core/modules/user/src/SharedTempStoreFactory.php
@@ -51,7 +51,7 @@ class SharedTempStoreFactory {
    * @param int $expire
    *   The time to live for items, in seconds.
    */
-  function __construct(KeyValueExpirableFactoryInterface $storage_factory, LockBackendInterface $lock_backend, RequestStack $request_stack, $expire = 604800) {
+  public function __construct(KeyValueExpirableFactoryInterface $storage_factory, LockBackendInterface $lock_backend, RequestStack $request_stack, $expire = 604800) {
     $this->storageFactory = $storage_factory;
     $this->lockBackend = $lock_backend;
     $this->requestStack = $request_stack;
@@ -72,7 +72,7 @@ class SharedTempStoreFactory {
    * @return \Drupal\user\SharedTempStore
    *   An instance of the key/value store.
    */
-  function get($collection, $owner = NULL) {
+  public function get($collection, $owner = NULL) {
     // Use the currently authenticated user ID or the active user ID unless
     // the owner is overridden.
     if (!isset($owner)) {
diff --git a/web/core/modules/user/src/Tests/RestRegisterUserTest.php b/web/core/modules/user/src/Tests/RestRegisterUserTest.php
new file mode 100644
index 000000000..62e6bbc68
--- /dev/null
+++ b/web/core/modules/user/src/Tests/RestRegisterUserTest.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace Drupal\user\Tests;
+
+use Drupal\rest\Tests\RESTTestBase;
+use Drupal\user\Entity\Role;
+use Drupal\user\RoleInterface;
+
+/**
+ * Tests user registration via REST resource.
+ *
+ * @group user
+ */
+class RestRegisterUserTest extends RESTTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    $this->enableService('user_registration', 'POST', 'hal_json');
+
+    Role::load(RoleInterface::ANONYMOUS_ID)
+      ->grantPermission('restful post user_registration')
+      ->save();
+
+    Role::load(RoleInterface::AUTHENTICATED_ID)
+      ->grantPermission('restful post user_registration')
+      ->save();
+  }
+
+  /**
+   * Tests that only anonymous users can register users.
+   */
+  public function testRegisterUser() {
+    // Verify that an authenticated user cannot register a new user, despite
+    // being granted permission to do so because only anonymous users can
+    // register themselves, authenticated users with the necessary permissions
+    // can POST a new user to the "user" REST resource.
+    $user = $this->createUser();
+    $this->drupalLogin($user);
+    $this->registerRequest('palmer.eldritch');
+    $this->assertResponse('403', 'Only anonymous users can register users.');
+    $this->drupalLogout();
+
+    $user_settings = $this->config('user.settings');
+
+    // Test out different setting User Registration and Email Verification.
+    // Allow visitors to register with no email verification.
+    $user_settings->set('register', USER_REGISTER_VISITORS);
+    $user_settings->set('verify_mail', 0);
+    $user_settings->save();
+    $user = $this->registerUser('Palmer.Eldritch');
+    $this->assertFalse($user->isBlocked());
+    $this->assertFalse(empty($user->getPassword()));
+    $email_count = count($this->drupalGetMails());
+    $this->assertEqual(0, $email_count);
+
+    // Attempt to register without sending a password.
+    $this->registerRequest('Rick.Deckard', FALSE);
+    $this->assertResponse('422', 'No password provided');
+
+    // Allow visitors to register with email verification.
+    $user_settings->set('register', USER_REGISTER_VISITORS);
+    $user_settings->set('verify_mail', 1);
+    $user_settings->save();
+    $user = $this->registerUser('Jason.Taverner', FALSE);
+    $this->assertTrue(empty($user->getPassword()));
+    $this->assertTrue($user->isBlocked());
+    $this->assertMailString('body', 'You may now log in by clicking this link', 1);
+
+    // Attempt to register with a password when e-mail verification is on.
+    $this->registerRequest('Estraven', TRUE);
+    $this->assertResponse('422', 'A Password cannot be specified. It will be generated on login.');
+
+    // Allow visitors to register with Admin approval and e-mail verification.
+    $user_settings->set('register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL);
+    $user_settings->set('verify_mail', 1);
+    $user_settings->save();
+    $user = $this->registerUser('Bob.Arctor', FALSE);
+    $this->assertTrue(empty($user->getPassword()));
+    $this->assertTrue($user->isBlocked());
+    $this->assertMailString('body', 'Your application for an account is', 2);
+    $this->assertMailString('body', 'Bob.Arctor has applied for an account', 2);
+
+    // Attempt to register with a password when e-mail verification is on.
+    $this->registerRequest('Ursula', TRUE);
+    $this->assertResponse('422', 'A Password cannot be specified. It will be generated on login.');
+
+    // Allow visitors to register with Admin approval and no email verification.
+    $user_settings->set('register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL);
+    $user_settings->set('verify_mail', 0);
+    $user_settings->save();
+    $user = $this->registerUser('Argaven');
+    $this->assertFalse(empty($user->getPassword()));
+    $this->assertTrue($user->isBlocked());
+    $this->assertMailString('body', 'Your application for an account is', 2);
+    $this->assertMailString('body', 'Argaven has applied for an account', 2);
+
+    // Attempt to register without sending a password.
+    $this->registerRequest('Tibe', FALSE);
+    $this->assertResponse('422', 'No password provided');
+  }
+
+  /**
+   * Creates serialize user values.
+   *
+   * @param string $name
+   *   The name of the user. Use only valid values for emails.
+   *
+   * @param bool $include_password
+   *   Whether to include a password in the user values.
+   *
+   * @return string Serialized user values.
+   *   Serialized user values.
+   */
+  protected function createSerializedUser($name, $include_password = TRUE) {
+    global $base_url;
+    // New user info to be serialized.
+    $data = [
+      "_links" => ["type" => ["href" => $base_url . "/rest/type/user/user"]],
+      "langcode" => [["value" => "en"]],
+      "name" => [["value" => $name]],
+      "mail" => [["value" => "$name@example.com"]],
+    ];
+    if ($include_password) {
+      $data['pass']['value'] = 'SuperSecretPassword';
+    }
+
+    // Create a HAL+JSON version for the user entity we want to create.
+    $serialized = $this->container->get('serializer')
+      ->serialize($data, 'hal_json');
+    return $serialized;
+  }
+
+  /**
+   * Registers a user via REST resource.
+   *
+   * @param $name
+   *   User name.
+   *
+   * @param bool $include_password
+   *
+   * @return bool|\Drupal\user\Entity\User
+   */
+  protected function registerUser($name, $include_password = TRUE) {
+    // Verify that an anonymous user can register.
+    $this->registerRequest($name, $include_password);
+    $this->assertResponse('200', 'HTTP response code is correct.');
+    $user = user_load_by_name($name);
+    $this->assertFalse(empty($user), 'User was create as expected');
+    return $user;
+  }
+
+  /**
+   * Make a REST user registration request.
+   *
+   * @param $name
+   * @param $include_password
+   */
+  protected function registerRequest($name, $include_password = TRUE) {
+    $serialized = $this->createSerializedUser($name, $include_password);
+    $this->httpRequest('/user/register', 'POST', $serialized, 'application/hal+json');
+  }
+
+}
diff --git a/web/core/modules/user/src/Tests/Update/UserUpdateOrderPermissionsTest.php b/web/core/modules/user/src/Tests/Update/UserUpdateOrderPermissionsTest.php
new file mode 100644
index 000000000..344cb576e
--- /dev/null
+++ b/web/core/modules/user/src/Tests/Update/UserUpdateOrderPermissionsTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\user\Tests\Update;
+
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\user\Entity\Role;
+
+/**
+ * Tests user permissions sort upgrade path.
+ *
+ * @group Update
+ */
+class UserUpdateOrderPermissionsTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
+    ];
+  }
+
+  /**
+   * Tests that permissions are ordered by machine name.
+   */
+  public function testPermissionsOrder() {
+    $authenticated = Role::load('authenticated');
+    $permissions = $authenticated->getPermissions();
+    sort($permissions);
+    $this->assertNotIdentical($permissions, $authenticated->getPermissions());
+
+    $this->runUpdates();
+    $authenticated = Role::load('authenticated');
+    $this->assertIdentical($permissions, $authenticated->getPermissions());
+  }
+
+}
diff --git a/web/core/modules/user/src/Tests/UserAccountLinksTest.php b/web/core/modules/user/src/Tests/UserAccountLinksTest.php
index 6d7d723fc..15a4b205e 100644
--- a/web/core/modules/user/src/Tests/UserAccountLinksTest.php
+++ b/web/core/modules/user/src/Tests/UserAccountLinksTest.php
@@ -16,7 +16,7 @@ class UserAccountLinksTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('menu_ui', 'block', 'test_page_test');
+  public static $modules = ['menu_ui', 'block', 'test_page_test'];
 
   /**
    * {@inheritdoc}
@@ -31,9 +31,9 @@ class UserAccountLinksTest extends WebTestBase {
   /**
    * Tests the secondary menu.
    */
-  function testSecondaryMenu() {
+  public function testSecondaryMenu() {
     // Create a regular user.
-    $user = $this->drupalCreateUser(array());
+    $user = $this->drupalCreateUser([]);
 
     // Log in and get the homepage.
     $this->drupalLogin($user);
@@ -41,18 +41,18 @@ class UserAccountLinksTest extends WebTestBase {
 
     // For a logged-in user, expect the secondary menu to have links for "My
     // account" and "Log out".
-    $link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', array(
+    $link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', [
       ':menu_class' => 'menu',
       ':href' => 'user',
       ':text' => 'My account',
-    ));
+    ]);
     $this->assertEqual(count($link), 1, 'My account link is in secondary menu.');
 
-    $link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', array(
+    $link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', [
       ':menu_class' => 'menu',
       ':href' => 'user/logout',
       ':text' => 'Log out',
-    ));
+    ]);
     $this->assertEqual(count($link), 1, 'Log out link is in secondary menu.');
 
     // Log out and get the homepage.
@@ -60,35 +60,35 @@ class UserAccountLinksTest extends WebTestBase {
     $this->drupalGet('<front>');
 
     // For a logged-out user, expect the secondary menu to have a "Log in" link.
-    $link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', array(
+    $link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', [
       ':menu_class' => 'menu',
       ':href' => 'user/login',
       ':text' => 'Log in',
-    ));
+    ]);
     $this->assertEqual(count($link), 1, 'Log in link is in secondary menu.');
   }
 
   /**
    * Tests disabling the 'My account' link.
    */
-  function testDisabledAccountLink() {
+  public function testDisabledAccountLink() {
     // Create an admin user and log in.
-    $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer menu')));
+    $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer menu']));
 
     // Verify that the 'My account' link exists before we check for its
     // disappearance.
-    $link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', array(
+    $link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', [
       ':menu_class' => 'menu',
       ':href' => 'user',
       ':text' => 'My account',
-    ));
+    ]);
     $this->assertEqual(count($link), 1, 'My account link is in the secondary menu.');
 
     // Verify that the 'My account' link is enabled. Do not assume the value of
     // auto-increment is 1. Use XPath to obtain input element id and name using
     // the consistent label text.
     $this->drupalGet('admin/structure/menu/manage/account');
-    $label = $this->xpath('//label[contains(.,:text)]/@for', array(':text' => 'Enable My account menu link'));
+    $label = $this->xpath('//label[contains(.,:text)]/@for', [':text' => 'Enable My account menu link']);
     $this->assertFieldChecked((string) $label[0], "The 'My account' link is enabled by default.");
 
     // Disable the 'My account' link.
@@ -99,18 +99,18 @@ class UserAccountLinksTest extends WebTestBase {
     $this->drupalGet('<front>');
 
     // Verify that the 'My account' link does not appear when disabled.
-    $link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', array(
+    $link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', [
       ':menu_class' => 'menu',
       ':href' => 'user',
       ':text' => 'My account',
-    ));
+    ]);
     $this->assertEqual(count($link), 0, 'My account link is not in the secondary menu.');
   }
 
   /**
    * Tests page title is set correctly on user account tabs.
    */
-  function testAccountPageTitles() {
+  public function testAccountPageTitles() {
     // Default page titles are suffixed with the site name - Drupal.
     $title_suffix = ' | Drupal';
 
diff --git a/web/core/modules/user/src/Tests/UserAdminLanguageTest.php b/web/core/modules/user/src/Tests/UserAdminLanguageTest.php
index 03baa044e..cd6cc657b 100644
--- a/web/core/modules/user/src/Tests/UserAdminLanguageTest.php
+++ b/web/core/modules/user/src/Tests/UserAdminLanguageTest.php
@@ -31,12 +31,12 @@ class UserAdminLanguageTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('user', 'language', 'language_test');
+  public static $modules = ['user', 'language', 'language_test'];
 
   protected function setUp() {
     parent::setUp();
     // User to add and remove language.
-    $this->adminUser = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $this->adminUser = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     // User to check non-admin access.
     $this->regularUser = $this->drupalCreateUser();
   }
@@ -44,7 +44,7 @@ class UserAdminLanguageTest extends WebTestBase {
   /**
    * Tests that admin language is not configurable in single language sites.
    */
-  function testUserAdminLanguageConfigurationNotAvailableWithOnlyOneLanguage() {
+  public function testUserAdminLanguageConfigurationNotAvailableWithOnlyOneLanguage() {
     $this->drupalLogin($this->adminUser);
     $this->setLanguageNegotiation();
     $path = 'user/' . $this->adminUser->id() . '/edit';
@@ -56,7 +56,7 @@ class UserAdminLanguageTest extends WebTestBase {
   /**
    * Tests that admin language negotiation is configurable only if enabled.
    */
-  function testUserAdminLanguageConfigurationAvailableWithAdminLanguageNegotiation() {
+  public function testUserAdminLanguageConfigurationAvailableWithAdminLanguageNegotiation() {
     $this->drupalLogin($this->adminUser);
     $this->addCustomLanguage();
     $path = 'user/' . $this->adminUser->id() . '/edit';
@@ -83,7 +83,7 @@ class UserAdminLanguageTest extends WebTestBase {
    * have a setting for pages they cannot access, so they should not be able to
    * set a language for those pages.
    */
-  function testUserAdminLanguageConfigurationAvailableIfAdminLanguageNegotiationIsEnabled() {
+  public function testUserAdminLanguageConfigurationAvailableIfAdminLanguageNegotiationIsEnabled() {
     $this->drupalLogin($this->adminUser);
     // Adds a new language, because with only one language, setting won't show.
     $this->addCustomLanguage();
@@ -103,7 +103,7 @@ class UserAdminLanguageTest extends WebTestBase {
   /**
    * Tests the actual language negotiation.
    */
-  function testActualNegotiation() {
+  public function testActualNegotiation() {
     $this->drupalLogin($this->adminUser);
     $this->addCustomLanguage();
     $this->setLanguageNegotiation();
@@ -117,7 +117,7 @@ class UserAdminLanguageTest extends WebTestBase {
     $this->assertText('Language negotiation method: language-url');
 
     // Set a preferred language code for the user.
-    $edit = array();
+    $edit = [];
     $edit['preferred_admin_langcode'] = 'xx';
     $this->drupalPostForm($path, $edit, t('Save'));
 
@@ -137,7 +137,7 @@ class UserAdminLanguageTest extends WebTestBase {
     $this->assertText('Language negotiation method: language-user-admin');
 
     // Unset the preferred language code for the user.
-    $edit = array();
+    $edit = [];
     $edit['preferred_admin_langcode'] = '';
     $this->drupalPostForm($path, $edit, t('Save'));
     $this->drupalGet($path);
@@ -155,29 +155,29 @@ class UserAdminLanguageTest extends WebTestBase {
    * @param bool $admin_first
    *   Whether the admin negotiation should be first.
    */
-  function setLanguageNegotiation($admin_first = FALSE) {
-    $edit = array(
+  public function setLanguageNegotiation($admin_first = FALSE) {
+    $edit = [
       'language_interface[enabled][language-user-admin]' => TRUE,
       'language_interface[enabled][language-url]' => TRUE,
       'language_interface[weight][language-user-admin]' => ($admin_first ? -12 : -8),
       'language_interface[weight][language-url]' => -10,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
   }
 
   /**
    * Helper method for adding a custom language.
    */
-  function addCustomLanguage() {
+  public function addCustomLanguage() {
     $langcode = 'xx';
     // The English name for the language.
     $name = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
   }
 
diff --git a/web/core/modules/user/src/Tests/UserAdminListingTest.php b/web/core/modules/user/src/Tests/UserAdminListingTest.php
index 2ca50c8ff..9ec95060b 100644
--- a/web/core/modules/user/src/Tests/UserAdminListingTest.php
+++ b/web/core/modules/user/src/Tests/UserAdminListingTest.php
@@ -21,7 +21,7 @@ class UserAdminListingTest extends WebTestBase {
     $this->assertResponse(403, 'Anonymous user does not have access to the user admin listing.');
 
     // Create a bunch of users.
-    $accounts = array();
+    $accounts = [];
     for ($i = 0; $i < 3; $i++) {
       $account = $this->drupalCreateUser();
       $accounts[$account->label()] = $account;
@@ -39,8 +39,8 @@ class UserAdminListingTest extends WebTestBase {
     $accounts[$account->label()] = $account;
     $timestamp_user = $account->label();
 
-    $rid_1 = $this->drupalCreateRole(array(), 'custom_role_1', 'custom_role_1');
-    $rid_2 = $this->drupalCreateRole(array(), 'custom_role_2', 'custom_role_2');
+    $rid_1 = $this->drupalCreateRole([], 'custom_role_1', 'custom_role_1');
+    $rid_2 = $this->drupalCreateRole([], 'custom_role_2', 'custom_role_2');
 
     $account = $this->drupalCreateUser();
     $account->addRole($rid_1);
@@ -50,7 +50,7 @@ class UserAdminListingTest extends WebTestBase {
     $role_account_name = $account->label();
 
     // Create an admin user and look at the listing.
-    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $admin_user = $this->drupalCreateUser(['administer users']);
     $accounts[$admin_user->label()] = $admin_user;
 
     $accounts['admin'] = User::load(1);
@@ -61,22 +61,22 @@ class UserAdminListingTest extends WebTestBase {
     $this->assertResponse(200, 'The admin user has access to the user admin listing.');
 
     $result = $this->xpath('//table[contains(@class, "responsive-enabled")]/tbody/tr');
-    $result_accounts = array();
+    $result_accounts = [];
     foreach ($result as $account) {
       $name = (string) $account->td[0]->span;
-      $roles = array();
+      $roles = [];
       if (isset($account->td[2]->div->ul)) {
         foreach ($account->td[2]->div->ul->li as $element) {
           $roles[] = (string) $element;
         }
       }
-      $result_accounts[$name] = array(
+      $result_accounts[$name] = [
         'name' => $name,
         'status' => (string) $account->td[1],
         'roles' => $roles,
         'member_for' => (string) $account->td[3],
         'last_access' => (string) $account->td[4],
-      );
+      ];
     }
 
     $this->assertFalse(array_keys(array_diff_key($result_accounts, $accounts)), 'Ensure all accounts are listed.');
@@ -84,7 +84,7 @@ class UserAdminListingTest extends WebTestBase {
       $this->assertEqual($values['status'] == t('active'), $accounts[$name]->status->value, 'Ensure the status is displayed properly.');
     }
 
-    $expected_roles = array('custom_role_1', 'custom_role_2');
+    $expected_roles = ['custom_role_1', 'custom_role_2'];
     $this->assertEqual($result_accounts[$role_account_name]['roles'], $expected_roles, 'Ensure roles are listed properly.');
 
     $this->assertEqual($result_accounts[$timestamp_user]['member_for'], \Drupal::service('date.formatter')->formatTimeDiffSince($accounts[$timestamp_user]->created->value), 'Ensure the right member time is displayed.');
diff --git a/web/core/modules/user/src/Tests/UserAdminSettingsFormTest.php b/web/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
index 2fba848bf..b77411154 100644
--- a/web/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
+++ b/web/core/modules/user/src/Tests/UserAdminSettingsFormTest.php
@@ -16,33 +16,33 @@ class UserAdminSettingsFormTest extends SystemConfigFormTestBase {
     parent::setUp();
 
     $this->form = AccountSettingsForm::create($this->container);
-    $this->values = array(
-      'anonymous' => array(
+    $this->values = [
+      'anonymous' => [
         '#value' => $this->randomString(10),
         '#config_name' => 'user.settings',
         '#config_key' => 'anonymous',
-      ),
-      'user_mail_cancel_confirm_body' => array(
+      ],
+      'user_mail_cancel_confirm_body' => [
         '#value' => $this->randomString(),
         '#config_name' => 'user.mail',
         '#config_key' => 'cancel_confirm.body',
-      ),
-      'user_mail_cancel_confirm_subject' => array(
+      ],
+      'user_mail_cancel_confirm_subject' => [
         '#value' => $this->randomString(20),
         '#config_name' => 'user.mail',
         '#config_key' => 'cancel_confirm.subject',
-      ),
-      'register_pending_approval_admin_body' => array(
+      ],
+      'register_pending_approval_admin_body' => [
         '#value' => $this->randomString(),
         '#config_name' => 'user.mail',
         '#config_key' => 'register_pending_approval_admin.body',
-      ),
-      'register_pending_approval_admin_subject' => array(
+      ],
+      'register_pending_approval_admin_subject' => [
         '#value' => $this->randomString(20),
         '#config_name' => 'user.mail',
         '#config_key' => 'register_pending_approval_admin.subject',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/user/src/Tests/UserAdminTest.php b/web/core/modules/user/src/Tests/UserAdminTest.php
index 8d4a22be7..f3ee85a97 100644
--- a/web/core/modules/user/src/Tests/UserAdminTest.php
+++ b/web/core/modules/user/src/Tests/UserAdminTest.php
@@ -17,28 +17,28 @@ class UserAdminTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy', 'views');
+  public static $modules = ['taxonomy', 'views'];
 
   /**
    * Registers a user and deletes it.
    */
-  function testUserAdmin() {
+  public function testUserAdmin() {
     $config = $this->config('user.settings');
     $user_a = $this->drupalCreateUser();
     $user_a->name = 'User A';
     $user_a->mail = $this->randomMachineName() . '@example.com';
     $user_a->save();
-    $user_b = $this->drupalCreateUser(array('administer taxonomy'));
+    $user_b = $this->drupalCreateUser(['administer taxonomy']);
     $user_b->name = 'User B';
     $user_b->save();
-    $user_c = $this->drupalCreateUser(array('administer taxonomy'));
+    $user_c = $this->drupalCreateUser(['administer taxonomy']);
     $user_c->name = 'User C';
     $user_c->save();
 
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
 
     // Create admin user to delete registered user.
-    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $admin_user = $this->drupalCreateUser(['administer users']);
     // Use a predictable name so that we can reliably order the user admin page
     // by name.
     $admin_user->name = 'Admin user';
@@ -51,11 +51,11 @@ class UserAdminTest extends WebTestBase {
     $this->assertText($admin_user->getUsername(), 'Found Admin user on admin users page');
 
     // Test for existence of edit link in table.
-    $link = $user_a->link(t('Edit'), 'edit-form', array('query' => array('destination' => $user_a->url('collection'))));
+    $link = $user_a->link(t('Edit'), 'edit-form', ['query' => ['destination' => $user_a->url('collection')]]);
     $this->assertRaw($link, 'Found user A edit link on admin users page');
 
     // Test exposed filter elements.
-    foreach (array('user', 'role', 'permission', 'status') as $field) {
+    foreach (['user', 'role', 'permission', 'status'] as $field) {
       $this->assertField("edit-$field", "$field exposed filter found.");
     }
     // Make sure the reduce duplicates element from the ManyToOneHelper is not
@@ -63,18 +63,18 @@ class UserAdminTest extends WebTestBase {
     $this->assertNoField('edit-reduce-duplicates', 'Reduce duplicates form element not found in exposed filters.');
 
     // Filter the users by name/email.
-    $this->drupalGet('admin/people', array('query' => array('user' => $user_a->getUsername())));
+    $this->drupalGet('admin/people', ['query' => ['user' => $user_a->getUsername()]]);
     $result = $this->xpath('//table/tbody/tr');
     $this->assertEqual(1, count($result), 'Filter by username returned the right amount.');
     $this->assertEqual($user_a->getUsername(), (string) $result[0]->td[1]->span, 'Filter by username returned the right user.');
 
-    $this->drupalGet('admin/people', array('query' => array('user' => $user_a->getEmail())));
+    $this->drupalGet('admin/people', ['query' => ['user' => $user_a->getEmail()]]);
     $result = $this->xpath('//table/tbody/tr');
     $this->assertEqual(1, count($result), 'Filter by username returned the right amount.');
     $this->assertEqual($user_a->getUsername(), (string) $result[0]->td[1]->span, 'Filter by username returned the right user.');
 
     // Filter the users by permission 'administer taxonomy'.
-    $this->drupalGet('admin/people', array('query' => array('permission' => 'administer taxonomy')));
+    $this->drupalGet('admin/people', ['query' => ['permission' => 'administer taxonomy']]);
 
     // Check if the correct users show up.
     $this->assertNoText($user_a->getUsername(), 'User A not on filtered by perm admin users page');
@@ -84,7 +84,7 @@ class UserAdminTest extends WebTestBase {
     // Filter the users by role. Grab the system-generated role name for User C.
     $roles = $user_c->getRoles();
     unset($roles[array_search(RoleInterface::AUTHENTICATED_ID, $roles)]);
-    $this->drupalGet('admin/people', array('query' => array('role' => reset($roles))));
+    $this->drupalGet('admin/people', ['query' => ['role' => reset($roles)]]);
 
     // Check if the correct users show up when filtered by role.
     $this->assertNoText($user_a->getUsername(), 'User A not on filtered by role on admin users page');
@@ -94,53 +94,53 @@ class UserAdminTest extends WebTestBase {
     // Test blocking of a user.
     $account = $user_storage->load($user_c->id());
     $this->assertTrue($account->isActive(), 'User C not blocked');
-    $edit = array();
+    $edit = [];
     $edit['action'] = 'user_block_user_action';
     $edit['user_bulk_form[4]'] = TRUE;
     $config
       ->set('notify.status_blocked', TRUE)
       ->save();
-    $this->drupalPostForm('admin/people', $edit, t('Apply to selected items'), array(
+    $this->drupalPostForm('admin/people', $edit, t('Apply to selected items'), [
       // Sort the table by username so that we know reliably which user will be
       // targeted with the blocking action.
-      'query' => array('order' => 'name', 'sort' => 'asc')
-    ));
+      'query' => ['order' => 'name', 'sort' => 'asc']
+    ]);
     $site_name = $this->config('system.site')->get('name');
     $this->assertMailString('body', 'Your account on ' . $site_name . ' has been blocked.', 1, 'Blocked message found in the mail sent to user C.');
-    $user_storage->resetCache(array($user_c->id()));
+    $user_storage->resetCache([$user_c->id()]);
     $account = $user_storage->load($user_c->id());
     $this->assertTrue($account->isBlocked(), 'User C blocked');
 
     // Test filtering on admin page for blocked users
-    $this->drupalGet('admin/people', array('query' => array('status' => 2)));
+    $this->drupalGet('admin/people', ['query' => ['status' => 2]]);
     $this->assertNoText($user_a->getUsername(), 'User A not on filtered by status on admin users page');
     $this->assertNoText($user_b->getUsername(), 'User B not on filtered by status on admin users page');
     $this->assertText($user_c->getUsername(), 'User C on filtered by status on admin users page');
 
     // Test unblocking of a user from /admin/people page and sending of activation mail
-    $editunblock = array();
+    $editunblock = [];
     $editunblock['action'] = 'user_unblock_user_action';
     $editunblock['user_bulk_form[4]'] = TRUE;
-    $this->drupalPostForm('admin/people', $editunblock, t('Apply to selected items'), array(
+    $this->drupalPostForm('admin/people', $editunblock, t('Apply to selected items'), [
       // Sort the table by username so that we know reliably which user will be
       // targeted with the blocking action.
-      'query' => array('order' => 'name', 'sort' => 'asc')
-    ));
-    $user_storage->resetCache(array($user_c->id()));
+      'query' => ['order' => 'name', 'sort' => 'asc']
+    ]);
+    $user_storage->resetCache([$user_c->id()]);
     $account = $user_storage->load($user_c->id());
     $this->assertTrue($account->isActive(), 'User C unblocked');
     $this->assertMail("to", $account->getEmail(), "Activation mail sent to user C");
 
     // Test blocking and unblocking another user from /user/[uid]/edit form and sending of activation mail
-    $user_d = $this->drupalCreateUser(array());
-    $user_storage->resetCache(array($user_d->id()));
+    $user_d = $this->drupalCreateUser([]);
+    $user_storage->resetCache([$user_d->id()]);
     $account1 = $user_storage->load($user_d->id());
-    $this->drupalPostForm('user/' . $account1->id() . '/edit', array('status' => 0), t('Save'));
-    $user_storage->resetCache(array($user_d->id()));
+    $this->drupalPostForm('user/' . $account1->id() . '/edit', ['status' => 0], t('Save'));
+    $user_storage->resetCache([$user_d->id()]);
     $account1 = $user_storage->load($user_d->id());
     $this->assertTrue($account1->isBlocked(), 'User D blocked');
-    $this->drupalPostForm('user/' . $account1->id() . '/edit', array('status' => TRUE), t('Save'));
-    $user_storage->resetCache(array($user_d->id()));
+    $this->drupalPostForm('user/' . $account1->id() . '/edit', ['status' => TRUE], t('Save'));
+    $user_storage->resetCache([$user_d->id()]);
     $account1 = $user_storage->load($user_d->id());
     $this->assertTrue($account1->isActive(), 'User D unblocked');
     $this->assertMail("to", $account1->getEmail(), "Activation mail sent to user D");
@@ -149,9 +149,9 @@ class UserAdminTest extends WebTestBase {
   /**
    * Tests the alternate notification email address for user mails.
    */
-  function testNotificationEmailAddress() {
+  public function testNotificationEmailAddress() {
     // Test that the Notification Email address field is on the config page.
-    $admin_user = $this->drupalCreateUser(array('administer users', 'administer account settings'));
+    $admin_user = $this->drupalCreateUser(['administer users', 'administer account settings']);
     $this->drupalLogin($admin_user);
     $this->drupalGet('admin/config/people/accounts');
     $this->assertRaw('id="edit-mail-notification-address"', 'Notification Email address field exists');
@@ -173,27 +173,27 @@ class UserAdminTest extends WebTestBase {
       ->set('mail_notification', $notify_address)
       ->save();
     // Register a new user account.
-    $edit = array();
+    $edit = [];
     $edit['name'] = $this->randomMachineName();
     $edit['mail'] = $edit['name'] . '@example.com';
     $this->drupalPostForm('user/register', $edit, t('Create new account'));
     $subject = 'Account details for ' . $edit['name'] . ' at ' . $system->get('name') . ' (pending admin approval)';
     // Ensure that admin notification mail is sent to the configured
     // Notification Email address.
-    $admin_mail = $this->drupalGetMails(array(
+    $admin_mail = $this->drupalGetMails([
       'to' => $notify_address,
       'from' => $server_address,
       'subject' => $subject,
-    ));
+    ]);
     $this->assertTrue(count($admin_mail), 'New user mail to admin is sent to configured Notification Email address');
     // Ensure that user notification mail is sent from the configured
     // Notification Email address.
-    $user_mail = $this->drupalGetMails(array(
+    $user_mail = $this->drupalGetMails([
       'to' => $edit['mail'],
       'from' => $server_address,
       'reply-to' => $notify_address,
       'subject' => $subject,
-    ));
+    ]);
     $this->assertTrue(count($user_mail), 'New user mail to user is sent from configured Notification Email address');
   }
 
diff --git a/web/core/modules/user/src/Tests/UserBlocksTest.php b/web/core/modules/user/src/Tests/UserBlocksTest.php
index 9216a2765..1495b20b0 100644
--- a/web/core/modules/user/src/Tests/UserBlocksTest.php
+++ b/web/core/modules/user/src/Tests/UserBlocksTest.php
@@ -16,7 +16,7 @@ class UserBlocksTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'views');
+  public static $modules = ['block', 'views'];
 
   /**
    * A user with the 'administer blocks' permission.
@@ -28,7 +28,7 @@ class UserBlocksTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer blocks'));
+    $this->adminUser = $this->drupalCreateUser(['administer blocks']);
     $this->drupalLogin($this->adminUser);
     $this->drupalPlaceBlock('user_login_block');
     $this->drupalLogout($this->adminUser);
@@ -37,7 +37,7 @@ class UserBlocksTest extends WebTestBase {
   /**
    * Tests that user login block is hidden from user/login.
    */
-  function testUserLoginBlockVisibility() {
+  public function testUserLoginBlockVisibility() {
     // Array keyed list where key being the URL address and value being expected
     // visibility as boolean type.
     $paths = [
@@ -61,12 +61,12 @@ class UserBlocksTest extends WebTestBase {
   /**
    * Test the user login block.
    */
-  function testUserLoginBlock() {
+  public function testUserLoginBlock() {
     // Create a user with some permission that anonymous users lack.
-    $user = $this->drupalCreateUser(array('administer permissions'));
+    $user = $this->drupalCreateUser(['administer permissions']);
 
     // Log in using the block.
-    $edit = array();
+    $edit = [];
     $edit['name'] = $user->getUsername();
     $edit['pass'] = $user->pass_raw;
     $this->drupalPostForm('admin/people/permissions', $edit, t('Log in'));
@@ -84,14 +84,14 @@ class UserBlocksTest extends WebTestBase {
     // Check that the user login block is not vulnerable to information
     // disclosure to third party sites.
     $this->drupalLogout();
-    $this->drupalPostForm('http://example.com/', $edit, t('Log in'), array('external' => FALSE));
+    $this->drupalPostForm('http://example.com/', $edit, t('Log in'), ['external' => FALSE]);
     // Check that we remain on the site after login.
     $this->assertUrl($user->url('canonical', ['absolute' => TRUE]), [], 'Redirected to user profile page after login from the frontpage');
 
     // Verify that form validation errors are displayed immediately for forms
     // in blocks and not on subsequent page requests.
     $this->drupalLogout();
-    $edit = array();
+    $edit = [];
     $edit['name'] = 'foo';
     $edit['pass'] = 'invalid password';
     $this->drupalPostForm('filter/tips', $edit, t('Log in'));
@@ -103,13 +103,13 @@ class UserBlocksTest extends WebTestBase {
   /**
    * Test the Who's Online block.
    */
-  function testWhosOnlineBlock() {
+  public function testWhosOnlineBlock() {
     $block = $this->drupalPlaceBlock('views_block:who_s_online-who_s_online_block');
 
     // Generate users.
-    $user1 = $this->drupalCreateUser(array('access user profiles'));
-    $user2 = $this->drupalCreateUser(array());
-    $user3 = $this->drupalCreateUser(array());
+    $user1 = $this->drupalCreateUser(['access user profiles']);
+    $user2 = $this->drupalCreateUser([]);
+    $user3 = $this->drupalCreateUser([]);
 
     // Update access of two users to be within the active timespan.
     $this->updateAccess($user1->id());
@@ -138,7 +138,7 @@ class UserBlocksTest extends WebTestBase {
   private function updateAccess($uid, $access = REQUEST_TIME) {
     db_update('users_field_data')
       ->condition('uid', $uid)
-      ->fields(array('access' => $access))
+      ->fields(['access' => $access])
       ->execute();
   }
 
diff --git a/web/core/modules/user/src/Tests/UserCancelTest.php b/web/core/modules/user/src/Tests/UserCancelTest.php
index 4ce4d9154..a74626e16 100644
--- a/web/core/modules/user/src/Tests/UserCancelTest.php
+++ b/web/core/modules/user/src/Tests/UserCancelTest.php
@@ -22,31 +22,31 @@ class UserCancelTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'comment');
+  public static $modules = ['node', 'comment'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
   }
 
   /**
    * Attempt to cancel account without permission.
    */
-  function testUserCancelWithoutPermission() {
+  public function testUserCancelWithoutPermission() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $this->config('user.settings')->set('cancel_method', 'user_cancel_reassign')->save();
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
 
     // Create a user.
-    $account = $this->drupalCreateUser(array());
+    $account = $this->drupalCreateUser([]);
     $this->drupalLogin($account);
     // Load a real user object.
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
 
     // Create a node.
-    $node = $this->drupalCreateNode(array('uid' => $account->id()));
+    $node = $this->drupalCreateNode(['uid' => $account->id()]);
 
     // Attempt to cancel account.
     $this->drupalGet('user/' . $account->id() . '/edit');
@@ -56,12 +56,12 @@ class UserCancelTest extends WebTestBase {
     $timestamp = $account->getLastLoginTime();
     $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
     $this->assertResponse(403, 'Bogus cancelling request rejected.');
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
     $this->assertTrue($account->isActive(), 'User account was not canceled.');
 
     // Confirm user's content has not been altered.
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $test_node = $node_storage->load($node->id());
     $this->assertTrue(($test_node->getOwnerId() == $account->id() && $test_node->isPublished()), 'Node of the user has not been altered.');
   }
@@ -70,21 +70,21 @@ class UserCancelTest extends WebTestBase {
    * Test ability to change the permission for canceling users.
    */
   public function testUserCancelChangePermission() {
-    \Drupal::service('module_installer')->install(array('user_form_test'));
+    \Drupal::service('module_installer')->install(['user_form_test']);
     \Drupal::service('router.builder')->rebuild();
     $this->config('user.settings')->set('cancel_method', 'user_cancel_reassign')->save();
 
     // Create a regular user.
-    $account = $this->drupalCreateUser(array());
+    $account = $this->drupalCreateUser([]);
 
-    $admin_user = $this->drupalCreateUser(array('cancel other accounts'));
+    $admin_user = $this->drupalCreateUser(['cancel other accounts']);
     $this->drupalLogin($admin_user);
 
     // Delete regular user.
-    $this->drupalPostForm('user_form_test_cancel/' . $account->id(), array(), t('Cancel account'));
+    $this->drupalPostForm('user_form_test_cancel/' . $account->id(), [], t('Cancel account'));
 
     // Confirm deletion.
-    $this->assertRaw(t('%name has been deleted.', array('%name' => $account->getUsername())), 'User deleted.');
+    $this->assertRaw(t('%name has been deleted.', ['%name' => $account->getUsername()]), 'User deleted.');
     $this->assertFalse(User::load($account->id()), 'User is not found in the database.');
   }
 
@@ -94,17 +94,17 @@ class UserCancelTest extends WebTestBase {
    * This should never be possible, or the site owner would become unable to
    * administer the site.
    */
-  function testUserCancelUid1() {
+  public function testUserCancelUid1() {
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
 
-    \Drupal::service('module_installer')->install(array('views'));
+    \Drupal::service('module_installer')->install(['views']);
     \Drupal::service('router.builder')->rebuild();
     // Update uid 1's name and password to we know it.
     $password = user_password();
-    $account = array(
+    $account = [
       'name' => 'user1',
       'pass' => $this->container->get('password')->hash(trim($password)),
-    );
+    ];
     // We cannot use $account->save() here, because this would result in the
     // password being hashed again.
     db_update('users_field_data')
@@ -113,21 +113,21 @@ class UserCancelTest extends WebTestBase {
       ->execute();
 
     // Reload and log in uid 1.
-    $user_storage->resetCache(array(1));
+    $user_storage->resetCache([1]);
     $user1 = $user_storage->load(1);
     $user1->pass_raw = $password;
 
     // Try to cancel uid 1's account with a different user.
-    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $admin_user = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($admin_user);
-    $edit = array(
+    $edit = [
       'action' => 'user_cancel_user_action',
       'user_bulk_form[0]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/people', $edit, t('Apply to selected items'));
 
     // Verify that uid 1's account was not cancelled.
-    $user_storage->resetCache(array(1));
+    $user_storage->resetCache([1]);
     $user1 = $user_storage->load(1);
     $this->assertTrue($user1->isActive(), 'User #1 still exists and is not blocked.');
   }
@@ -135,20 +135,20 @@ class UserCancelTest extends WebTestBase {
   /**
    * Attempt invalid account cancellations.
    */
-  function testUserCancelInvalid() {
+  public function testUserCancelInvalid() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $this->config('user.settings')->set('cancel_method', 'user_cancel_reassign')->save();
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
 
     // Create a user.
-    $account = $this->drupalCreateUser(array('cancel account'));
+    $account = $this->drupalCreateUser(['cancel account']);
     $this->drupalLogin($account);
     // Load a real user object.
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
 
     // Create a node.
-    $node = $this->drupalCreateNode(array('uid' => $account->id()));
+    $node = $this->drupalCreateNode(['uid' => $account->id()]);
 
     // Attempt to cancel account.
     $this->drupalPostForm('user/' . $account->id() . '/edit', NULL, t('Cancel account'));
@@ -162,7 +162,7 @@ class UserCancelTest extends WebTestBase {
     $bogus_timestamp = $timestamp + 60;
     $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account, $bogus_timestamp));
     $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), 'Bogus cancelling request rejected.');
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
     $this->assertTrue($account->isActive(), 'User account was not canceled.');
 
@@ -170,12 +170,12 @@ class UserCancelTest extends WebTestBase {
     $bogus_timestamp = $timestamp - 86400 - 60;
     $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account, $bogus_timestamp));
     $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), 'Expired cancel account request rejected.');
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
     $this->assertTrue($account->isActive(), 'User account was not canceled.');
 
     // Confirm user's content has not been altered.
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $test_node = $node_storage->load($node->id());
     $this->assertTrue(($test_node->getOwnerId() == $account->id() && $test_node->isPublished()), 'Node of the user has not been altered.');
   }
@@ -183,16 +183,16 @@ class UserCancelTest extends WebTestBase {
   /**
    * Disable account and keep all content.
    */
-  function testUserBlock() {
+  public function testUserBlock() {
     $this->config('user.settings')->set('cancel_method', 'user_cancel_block')->save();
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
 
     // Create a user.
-    $web_user = $this->drupalCreateUser(array('cancel account'));
+    $web_user = $this->drupalCreateUser(['cancel account']);
     $this->drupalLogin($web_user);
 
     // Load a real user object.
-    $user_storage->resetCache(array($web_user->id()));
+    $user_storage->resetCache([$web_user->id()]);
     $account = $user_storage->load($web_user->id());
 
     // Attempt to cancel account.
@@ -210,18 +210,18 @@ class UserCancelTest extends WebTestBase {
 
     // Confirm account cancellation request.
     $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
     $this->assertTrue($account->isBlocked(), 'User has been blocked.');
 
     // Confirm that the confirmation message made it through to the end user.
-    $this->assertRaw(t('%name has been disabled.', array('%name' => $account->getUsername())), "Confirmation message displayed to user.");
+    $this->assertRaw(t('%name has been disabled.', ['%name' => $account->getUsername()]), "Confirmation message displayed to user.");
   }
 
   /**
    * Disable account and unpublish all content.
    */
-  function testUserBlockUnpublish() {
+  public function testUserBlockUnpublish() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $this->config('user.settings')->set('cancel_method', 'user_cancel_block_unpublish')->save();
     // Create comment field on page.
@@ -229,14 +229,14 @@ class UserCancelTest extends WebTestBase {
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
 
     // Create a user.
-    $account = $this->drupalCreateUser(array('cancel account'));
+    $account = $this->drupalCreateUser(['cancel account']);
     $this->drupalLogin($account);
     // Load a real user object.
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
 
     // Create a node with two revisions.
-    $node = $this->drupalCreateNode(array('uid' => $account->id()));
+    $node = $this->drupalCreateNode(['uid' => $account->id()]);
     $settings = get_object_vars($node);
     $settings['revision'] = 1;
     $node = $this->drupalCreateNode($settings);
@@ -244,7 +244,7 @@ class UserCancelTest extends WebTestBase {
     // Add a comment to the page.
     $comment_subject = $this->randomMachineName(8);
     $comment_body = $this->randomMachineName(8);
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'subject' => $comment_subject,
       'comment_body' => $comment_body,
       'entity_id' => $node->id(),
@@ -252,7 +252,7 @@ class UserCancelTest extends WebTestBase {
       'field_name' => 'comment',
       'status' => CommentInterface::PUBLISHED,
       'uid' => $account->id(),
-    ));
+    ]);
     $comment->save();
 
     // Attempt to cancel account.
@@ -268,30 +268,30 @@ class UserCancelTest extends WebTestBase {
 
     // Confirm account cancellation request.
     $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
     $this->assertTrue($account->isBlocked(), 'User has been blocked.');
 
     // Confirm user's content has been unpublished.
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $test_node = $node_storage->load($node->id());
     $this->assertFalse($test_node->isPublished(), 'Node of the user has been unpublished.');
     $test_node = node_revision_load($node->getRevisionId());
     $this->assertFalse($test_node->isPublished(), 'Node revision of the user has been unpublished.');
 
     $storage = \Drupal::entityManager()->getStorage('comment');
-    $storage->resetCache(array($comment->id()));
+    $storage->resetCache([$comment->id()]);
     $comment = $storage->load($comment->id());
     $this->assertFalse($comment->isPublished(), 'Comment of the user has been unpublished.');
 
     // Confirm that the confirmation message made it through to the end user.
-    $this->assertRaw(t('%name has been disabled.', array('%name' => $account->getUsername())), "Confirmation message displayed to user.");
+    $this->assertRaw(t('%name has been disabled.', ['%name' => $account->getUsername()]), "Confirmation message displayed to user.");
   }
 
   /**
    * Delete account and anonymize all content.
    */
-  function testUserAnonymize() {
+  public function testUserAnonymize() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $this->config('user.settings')->set('cancel_method', 'user_cancel_reassign')->save();
     // Create comment field on page.
@@ -299,19 +299,19 @@ class UserCancelTest extends WebTestBase {
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
 
     // Create a user.
-    $account = $this->drupalCreateUser(array('cancel account'));
+    $account = $this->drupalCreateUser(['cancel account']);
     $this->drupalLogin($account);
     // Load a real user object.
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
 
     // Create a simple node.
-    $node = $this->drupalCreateNode(array('uid' => $account->id()));
+    $node = $this->drupalCreateNode(['uid' => $account->id()]);
 
     // Add a comment to the page.
     $comment_subject = $this->randomMachineName(8);
     $comment_body = $this->randomMachineName(8);
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'subject' => $comment_subject,
       'comment_body' => $comment_body,
       'entity_id' => $node->id(),
@@ -319,12 +319,12 @@ class UserCancelTest extends WebTestBase {
       'field_name' => 'comment',
       'status' => CommentInterface::PUBLISHED,
       'uid' => $account->id(),
-    ));
+    ]);
     $comment->save();
 
     // Create a node with two revisions, the initial one belonging to the
     // cancelling user.
-    $revision_node = $this->drupalCreateNode(array('uid' => $account->id()));
+    $revision_node = $this->drupalCreateNode(['uid' => $account->id()]);
     $revision = $revision_node->getRevisionId();
     $settings = get_object_vars($revision_node);
     $settings['revision'] = 1;
@@ -335,7 +335,7 @@ class UserCancelTest extends WebTestBase {
     $this->drupalGet('user/' . $account->id() . '/edit');
     $this->drupalPostForm(NULL, NULL, t('Cancel account'));
     $this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
-    $this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', array('%anonymous-name' => $this->config('user.settings')->get('anonymous'))), 'Informs that all content will be attributed to anonymous account.');
+    $this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', ['%anonymous-name' => $this->config('user.settings')->get('anonymous')]), 'Informs that all content will be attributed to anonymous account.');
 
     // Confirm account cancellation.
     $timestamp = time();
@@ -344,28 +344,28 @@ class UserCancelTest extends WebTestBase {
 
     // Confirm account cancellation request.
     $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $this->assertFalse($user_storage->load($account->id()), 'User is not found in the database.');
 
     // Confirm that user's content has been attributed to anonymous user.
     $anonymous_user = User::getAnonymousUser();
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $test_node = $node_storage->load($node->id());
     $this->assertTrue(($test_node->getOwnerId() == 0 && $test_node->isPublished()), 'Node of the user has been attributed to anonymous user.');
     $test_node = node_revision_load($revision, TRUE);
     $this->assertTrue(($test_node->getRevisionUser()->id() == 0 && $test_node->isPublished()), 'Node revision of the user has been attributed to anonymous user.');
-    $node_storage->resetCache(array($revision_node->id()));
+    $node_storage->resetCache([$revision_node->id()]);
     $test_node = $node_storage->load($revision_node->id());
     $this->assertTrue(($test_node->getOwnerId() != 0 && $test_node->isPublished()), "Current revision of the user's node was not attributed to anonymous user.");
 
     $storage = \Drupal::entityManager()->getStorage('comment');
-    $storage->resetCache(array($comment->id()));
+    $storage->resetCache([$comment->id()]);
     $test_comment = $storage->load($comment->id());
     $this->assertTrue(($test_comment->getOwnerId() == 0 && $test_comment->isPublished()), 'Comment of the user has been attributed to anonymous user.');
     $this->assertEqual($test_comment->getAuthorName(), $anonymous_user->getDisplayName(), 'Comment of the user has been attributed to anonymous user name.');
 
     // Confirm that the confirmation message made it through to the end user.
-    $this->assertRaw(t('%name has been deleted.', array('%name' => $account->getUsername())), "Confirmation message displayed to user.");
+    $this->assertRaw(t('%name has been deleted.', ['%name' => $account->getUsername()]), "Confirmation message displayed to user.");
   }
 
   /**
@@ -377,7 +377,7 @@ class UserCancelTest extends WebTestBase {
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
 
     // Create a user.
-    $account = $this->drupalCreateUser(array('cancel account'));
+    $account = $this->drupalCreateUser(['cancel account']);
     $this->drupalLogin($account);
     // Load a real user object.
     $user_storage->resetCache([$account->id()]);
@@ -395,7 +395,7 @@ class UserCancelTest extends WebTestBase {
     $this->drupalGet('user/' . $account->id() . '/edit');
     $this->drupalPostForm(NULL, NULL, t('Cancel account'));
     $this->assertText(t('Are you sure you want to cancel your account?'), 'Confirmation form to cancel account displayed.');
-    $this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', array('%anonymous-name' => $this->config('user.settings')->get('anonymous'))), 'Informs that all content will be attributed to anonymous account.');
+    $this->assertRaw(t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', ['%anonymous-name' => $this->config('user.settings')->get('anonymous')]), 'Informs that all content will be attributed to anonymous account.');
 
     // Confirm account cancellation.
     $timestamp = time();
@@ -418,39 +418,39 @@ class UserCancelTest extends WebTestBase {
   /**
    * Delete account and remove all content.
    */
-  function testUserDelete() {
+  public function testUserDelete() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $this->config('user.settings')->set('cancel_method', 'user_cancel_delete')->save();
-    \Drupal::service('module_installer')->install(array('comment'));
+    \Drupal::service('module_installer')->install(['comment']);
     $this->resetAll();
     $this->addDefaultCommentField('node', 'page');
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
 
     // Create a user.
-    $account = $this->drupalCreateUser(array('cancel account', 'post comments', 'skip comment approval'));
+    $account = $this->drupalCreateUser(['cancel account', 'post comments', 'skip comment approval']);
     $this->drupalLogin($account);
     // Load a real user object.
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
 
     // Create a simple node.
-    $node = $this->drupalCreateNode(array('uid' => $account->id()));
+    $node = $this->drupalCreateNode(['uid' => $account->id()]);
 
     // Create comment.
-    $edit = array();
+    $edit = [];
     $edit['subject[0][value]'] = $this->randomMachineName(8);
     $edit['comment_body[0][value]'] = $this->randomMachineName(16);
 
     $this->drupalPostForm('comment/reply/node/' . $node->id() . '/comment', $edit, t('Preview'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $this->assertText(t('Your comment has been posted.'));
-    $comments = entity_load_multiple_by_properties('comment', array('subject' => $edit['subject[0][value]']));
+    $comments = entity_load_multiple_by_properties('comment', ['subject' => $edit['subject[0][value]']]);
     $comment = reset($comments);
     $this->assertTrue($comment->id(), 'Comment found.');
 
     // Create a node with two revisions, the initial one belonging to the
     // cancelling user.
-    $revision_node = $this->drupalCreateNode(array('uid' => $account->id()));
+    $revision_node = $this->drupalCreateNode(['uid' => $account->id()]);
     $revision = $revision_node->getRevisionId();
     $settings = get_object_vars($revision_node);
     $settings['revision'] = 1;
@@ -470,80 +470,80 @@ class UserCancelTest extends WebTestBase {
 
     // Confirm account cancellation request.
     $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $this->assertFalse($user_storage->load($account->id()), 'User is not found in the database.');
 
     // Confirm that user's content has been deleted.
-    $node_storage->resetCache(array($node->id()));
+    $node_storage->resetCache([$node->id()]);
     $this->assertFalse($node_storage->load($node->id()), 'Node of the user has been deleted.');
     $this->assertFalse(node_revision_load($revision), 'Node revision of the user has been deleted.');
-    $node_storage->resetCache(array($revision_node->id()));
+    $node_storage->resetCache([$revision_node->id()]);
     $this->assertTrue($node_storage->load($revision_node->id()), "Current revision of the user's node was not deleted.");
-    \Drupal::entityManager()->getStorage('comment')->resetCache(array($comment->id()));
+    \Drupal::entityManager()->getStorage('comment')->resetCache([$comment->id()]);
     $this->assertFalse(Comment::load($comment->id()), 'Comment of the user has been deleted.');
 
     // Confirm that the confirmation message made it through to the end user.
-    $this->assertRaw(t('%name has been deleted.', array('%name' => $account->getUsername())), "Confirmation message displayed to user.");
+    $this->assertRaw(t('%name has been deleted.', ['%name' => $account->getUsername()]), "Confirmation message displayed to user.");
   }
 
   /**
    * Create an administrative user and delete another user.
    */
-  function testUserCancelByAdmin() {
+  public function testUserCancelByAdmin() {
     $this->config('user.settings')->set('cancel_method', 'user_cancel_reassign')->save();
 
     // Create a regular user.
-    $account = $this->drupalCreateUser(array());
+    $account = $this->drupalCreateUser([]);
 
     // Create administrative user.
-    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $admin_user = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($admin_user);
 
     // Delete regular user.
     $this->drupalGet('user/' . $account->id() . '/edit');
     $this->drupalPostForm(NULL, NULL, t('Cancel account'));
-    $this->assertRaw(t('Are you sure you want to cancel the account %name?', array('%name' => $account->getUsername())), 'Confirmation form to cancel account displayed.');
+    $this->assertRaw(t('Are you sure you want to cancel the account %name?', ['%name' => $account->getUsername()]), 'Confirmation form to cancel account displayed.');
     $this->assertText(t('Select the method to cancel the account above.'), 'Allows to select account cancellation method.');
 
     // Confirm deletion.
     $this->drupalPostForm(NULL, NULL, t('Cancel account'));
-    $this->assertRaw(t('%name has been deleted.', array('%name' => $account->getUsername())), 'User deleted.');
+    $this->assertRaw(t('%name has been deleted.', ['%name' => $account->getUsername()]), 'User deleted.');
     $this->assertFalse(User::load($account->id()), 'User is not found in the database.');
   }
 
   /**
    * Tests deletion of a user account without an email address.
    */
-  function testUserWithoutEmailCancelByAdmin() {
+  public function testUserWithoutEmailCancelByAdmin() {
     $this->config('user.settings')->set('cancel_method', 'user_cancel_reassign')->save();
 
     // Create a regular user.
-    $account = $this->drupalCreateUser(array());
+    $account = $this->drupalCreateUser([]);
     // This user has no email address.
     $account->mail = '';
     $account->save();
 
     // Create administrative user.
-    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $admin_user = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($admin_user);
 
     // Delete regular user without email address.
     $this->drupalGet('user/' . $account->id() . '/edit');
     $this->drupalPostForm(NULL, NULL, t('Cancel account'));
-    $this->assertRaw(t('Are you sure you want to cancel the account %name?', array('%name' => $account->getUsername())), 'Confirmation form to cancel account displayed.');
+    $this->assertRaw(t('Are you sure you want to cancel the account %name?', ['%name' => $account->getUsername()]), 'Confirmation form to cancel account displayed.');
     $this->assertText(t('Select the method to cancel the account above.'), 'Allows to select account cancellation method.');
 
     // Confirm deletion.
     $this->drupalPostForm(NULL, NULL, t('Cancel account'));
-    $this->assertRaw(t('%name has been deleted.', array('%name' => $account->getUsername())), 'User deleted.');
+    $this->assertRaw(t('%name has been deleted.', ['%name' => $account->getUsername()]), 'User deleted.');
     $this->assertFalse(User::load($account->id()), 'User is not found in the database.');
   }
 
   /**
    * Create an administrative user and mass-delete other users.
    */
-  function testMassUserCancelByAdmin() {
-    \Drupal::service('module_installer')->install(array('views'));
+  public function testMassUserCancelByAdmin() {
+    \Drupal::service('module_installer')->install(['views']);
     \Drupal::service('router.builder')->rebuild();
     $this->config('user.settings')->set('cancel_method', 'user_cancel_reassign')->save();
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
@@ -551,18 +551,18 @@ class UserCancelTest extends WebTestBase {
     $this->config('user.settings')->set('notify.status_canceled', TRUE)->save();
 
     // Create administrative user.
-    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $admin_user = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($admin_user);
 
     // Create some users.
-    $users = array();
+    $users = [];
     for ($i = 0; $i < 3; $i++) {
-      $account = $this->drupalCreateUser(array());
+      $account = $this->drupalCreateUser([]);
       $users[$account->id()] = $account;
     }
 
     // Cancel user accounts, including own one.
-    $edit = array();
+    $edit = [];
     $edit['action'] = 'user_cancel_user_action';
     for ($i = 0; $i <= 4; $i++) {
       $edit['user_bulk_form[' . $i . ']'] = TRUE;
@@ -578,7 +578,7 @@ class UserCancelTest extends WebTestBase {
     $status = TRUE;
     foreach ($users as $account) {
       $status = $status && (strpos($this->content, $account->getUsername() . '</em> has been deleted.') !== FALSE);
-      $user_storage->resetCache(array($account->id()));
+      $user_storage->resetCache([$account->id()]);
       $status = $status && !$user_storage->load($account->id());
     }
     $this->assertTrue($status, 'Users deleted and not found in the database.');
@@ -589,9 +589,25 @@ class UserCancelTest extends WebTestBase {
     $this->assertTrue($admin_user->isActive(), 'Administrative user is found in the database and enabled.');
 
     // Verify that uid 1's account was not cancelled.
-    $user_storage->resetCache(array(1));
+    $user_storage->resetCache([1]);
     $user1 = $user_storage->load(1);
     $this->assertTrue($user1->isActive(), 'User #1 still exists and is not blocked.');
   }
 
+  /**
+   * Tests user cancel with node access.
+   */
+  public function testUserDeleteWithContentAndNodeAccess() {
+
+    \Drupal::service('module_installer')->install(['node_access_test']);
+    // Rebuild node access.
+    node_access_rebuild();
+
+    $account = $this->drupalCreateUser(['access content']);
+    $node = $this->drupalCreateNode(['type' => 'page', 'uid' => $account->id()]);
+    $account->delete();
+    $load2 = \Drupal::entityTypeManager()->getStorage('node')->load($node->id());
+    $this->assertTrue(empty($load2));
+  }
+
 }
diff --git a/web/core/modules/user/src/Tests/UserCreateTest.php b/web/core/modules/user/src/Tests/UserCreateTest.php
index efc7ddf7a..7b534435a 100644
--- a/web/core/modules/user/src/Tests/UserCreateTest.php
+++ b/web/core/modules/user/src/Tests/UserCreateTest.php
@@ -18,14 +18,14 @@ class UserCreateTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('image');
+  public static $modules = ['image'];
 
   /**
    * Create a user through the administration interface and ensure that it
    * displays in the user list.
    */
   public function testUserAdd() {
-    $user = $this->drupalCreateUser(array('administer users'));
+    $user = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($user);
 
     $this->assertEqual($user->getCreatedTime(), REQUEST_TIME, 'Creating a user sets default "created" timestamp.');
@@ -33,18 +33,18 @@ class UserCreateTest extends WebTestBase {
 
     // Create a field.
     $field_name = 'test_field';
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'user',
       'module' => 'image',
       'type' => 'image',
       'cardinality' => 1,
       'locked' => FALSE,
-      'indexes' => array('target_id' => array('target_id')),
-      'settings' => array(
+      'indexes' => ['target_id' => ['target_id']],
+      'settings' => [
         'uri_scheme' => 'public',
-      ),
-    ))->save();
+      ],
+    ])->save();
 
     FieldConfig::create([
       'field_name' => $field_name,
@@ -53,7 +53,7 @@ class UserCreateTest extends WebTestBase {
       'bundle' => 'user',
       'description' => t('Your virtual face or picture.'),
       'required' => FALSE,
-      'settings' => array(
+      'settings' => [
         'file_extensions' => 'png gif jpg jpeg',
         'file_directory' => 'pictures',
         'max_filesize' => '30 KB',
@@ -61,7 +61,7 @@ class UserCreateTest extends WebTestBase {
         'title_field' => 0,
         'max_resolution' => '85x85',
         'min_resolution' => '',
-      ),
+      ],
     ])->save();
 
     // Test user creation page for valid fields.
@@ -86,23 +86,23 @@ class UserCreateTest extends WebTestBase {
 
     // We create two users, notifying one and not notifying the other, to
     // ensure that the tests work in both cases.
-    foreach (array(FALSE, TRUE) as $notify) {
+    foreach ([FALSE, TRUE] as $notify) {
       $name = $this->randomMachineName();
-      $edit = array(
+      $edit = [
         'name' => $name,
         'mail' => $this->randomMachineName() . '@example.com',
         'pass[pass1]' => $pass = $this->randomString(),
         'pass[pass2]' => $pass,
         'notify' => $notify,
-      );
+      ];
       $this->drupalPostForm('admin/people/create', $edit, t('Create new account'));
 
       if ($notify) {
-        $this->assertText(t('A welcome message with further instructions has been emailed to the new user @name.', array('@name' => $edit['name'])), 'User created');
+        $this->assertText(t('A welcome message with further instructions has been emailed to the new user @name.', ['@name' => $edit['name']]), 'User created');
         $this->assertEqual(count($this->drupalGetMails()), 1, 'Notification email sent');
       }
       else {
-        $this->assertText(t('Created a new user account for @name. No email has been sent.', array('@name' => $edit['name'])), 'User created');
+        $this->assertText(t('Created a new user account for @name. No email has been sent.', ['@name' => $edit['name']]), 'User created');
         $this->assertEqual(count($this->drupalGetMails()), 0, 'Notification email not sent');
       }
 
@@ -115,13 +115,13 @@ class UserCreateTest extends WebTestBase {
     // Test that the password '0' is considered a password.
     // @see https://www.drupal.org/node/2563751.
     $name = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'name' => $name,
       'mail' => $this->randomMachineName() . '@example.com',
       'pass[pass1]' => 0,
       'pass[pass2]' => 0,
       'notify' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/people/create', $edit, t('Create new account'));
     $this->assertText("Created a new user account for $name. No email has been sent");
     $this->assertNoText('Password field is required');
diff --git a/web/core/modules/user/src/Tests/UserEditTest.php b/web/core/modules/user/src/Tests/UserEditTest.php
index 225b19440..6f1e36997 100644
--- a/web/core/modules/user/src/Tests/UserEditTest.php
+++ b/web/core/modules/user/src/Tests/UserEditTest.php
@@ -14,19 +14,26 @@ class UserEditTest extends WebTestBase {
   /**
    * Test user edit page.
    */
-  function testUserEdit() {
+  public function testUserEdit() {
     // Test user edit functionality.
-    $user1 = $this->drupalCreateUser(array('change own username'));
-    $user2 = $this->drupalCreateUser(array());
+    $user1 = $this->drupalCreateUser(['change own username']);
+    $user2 = $this->drupalCreateUser([]);
     $this->drupalLogin($user1);
 
     // Test that error message appears when attempting to use a non-unique user name.
     $edit['name'] = $user2->getUsername();
     $this->drupalPostForm("user/" . $user1->id() . "/edit", $edit, t('Save'));
-    $this->assertRaw(t('The username %name is already taken.', array('%name' => $edit['name'])));
+    $this->assertRaw(t('The username %name is already taken.', ['%name' => $edit['name']]));
+
+    // Check that the default value in user name field
+    // is the raw value and not a formatted one.
+    \Drupal::state()->set('user_hooks_test_user_format_name_alter', TRUE);
+    \Drupal::service('module_installer')->install(['user_hooks_test']);
+    $this->drupalGet('user/' . $user1->id() . '/edit');
+    $this->assertFieldByName('name', $user1->getAccountName());
 
     // Check that filling out a single password field does not validate.
-    $edit = array();
+    $edit = [];
     $edit['pass[pass1]'] = '';
     $edit['pass[pass2]'] = $this->randomMachineName();
     $this->drupalPostForm("user/" . $user1->id() . "/edit", $edit, t('Save'));
@@ -39,21 +46,21 @@ class UserEditTest extends WebTestBase {
 
     // Test that the error message appears when attempting to change the mail or
     // pass without the current password.
-    $edit = array();
+    $edit = [];
     $edit['mail'] = $this->randomMachineName() . '@new.example.com';
     $this->drupalPostForm("user/" . $user1->id() . "/edit", $edit, t('Save'));
-    $this->assertRaw(t("Your current password is missing or incorrect; it's required to change the %name.", array('%name' => t('Email'))));
+    $this->assertRaw(t("Your current password is missing or incorrect; it's required to change the %name.", ['%name' => t('Email')]));
 
     $edit['current_pass'] = $user1->pass_raw;
     $this->drupalPostForm("user/" . $user1->id() . "/edit", $edit, t('Save'));
     $this->assertRaw(t("The changes have been saved."));
 
     // Test that the user must enter current password before changing passwords.
-    $edit = array();
+    $edit = [];
     $edit['pass[pass1]'] = $new_pass = $this->randomMachineName();
     $edit['pass[pass2]'] = $new_pass;
     $this->drupalPostForm("user/" . $user1->id() . "/edit", $edit, t('Save'));
-    $this->assertRaw(t("Your current password is missing or incorrect; it's required to change the %name.", array('%name' => t('Password'))));
+    $this->assertRaw(t("Your current password is missing or incorrect; it's required to change the %name.", ['%name' => t('Password')]));
 
     // Try again with the current password.
     $edit['current_pass'] = $user1->pass_raw;
@@ -83,20 +90,20 @@ class UserEditTest extends WebTestBase {
 
     // Check that the user status field has the correct value and that it is
     // properly displayed.
-    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $admin_user = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($admin_user);
 
     $this->drupalGet('user/' . $user1->id() . '/edit');
     $this->assertNoFieldChecked('edit-status-0');
     $this->assertFieldChecked('edit-status-1');
 
-    $edit = array('status' => 0);
+    $edit = ['status' => 0];
     $this->drupalPostForm('user/' . $user1->id() . '/edit', $edit, t('Save'));
     $this->assertText(t('The changes have been saved.'));
     $this->assertFieldChecked('edit-status-0');
     $this->assertNoFieldChecked('edit-status-1');
 
-    $edit = array('status' => 1);
+    $edit = ['status' => 1];
     $this->drupalPostForm('user/' . $user1->id() . '/edit', $edit, t('Save'));
     $this->assertText(t('The changes have been saved.'));
     $this->assertNoFieldChecked('edit-status-0');
@@ -124,16 +131,16 @@ class UserEditTest extends WebTestBase {
   /**
    * Tests editing of a user account without an email address.
    */
-  function testUserWithoutEmailEdit() {
+  public function testUserWithoutEmailEdit() {
     // Test that an admin can edit users without an email address.
-    $admin = $this->drupalCreateUser(array('administer users'));
+    $admin = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($admin);
     // Create a regular user.
-    $user1 = $this->drupalCreateUser(array());
+    $user1 = $this->drupalCreateUser([]);
     // This user has no email address.
     $user1->mail = '';
     $user1->save();
-    $this->drupalPostForm("user/" . $user1->id() . "/edit", array('mail' => ''), t('Save'));
+    $this->drupalPostForm("user/" . $user1->id() . "/edit", ['mail' => ''], t('Save'));
     $this->assertRaw(t("The changes have been saved."));
   }
 
diff --git a/web/core/modules/user/src/Tests/UserLanguageCreationTest.php b/web/core/modules/user/src/Tests/UserLanguageCreationTest.php
index 08ca7077a..0dd29079a 100644
--- a/web/core/modules/user/src/Tests/UserLanguageCreationTest.php
+++ b/web/core/modules/user/src/Tests/UserLanguageCreationTest.php
@@ -18,14 +18,14 @@ class UserLanguageCreationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('user', 'language');
+  public static $modules = ['user', 'language'];
 
   /**
    * Functional test for language handling during user creation.
    */
-  function testLocalUserCreation() {
+  public function testLocalUserCreation() {
     // User to add and remove language and create new users.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'administer users'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'administer users']);
     $this->drupalLogin($admin_user);
 
     // Add predefined language.
@@ -33,9 +33,9 @@ class UserLanguageCreationTest extends WebTestBase {
     ConfigurableLanguage::createFromLangcode($langcode)->save();
 
     // Set language negotiation.
-    $edit = array(
+    $edit = [
       'language_interface[enabled][language-url]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
     $this->assertText(t('Language detection configuration saved.'), 'Set language negotiation.');
 
@@ -47,12 +47,12 @@ class UserLanguageCreationTest extends WebTestBase {
     // Create a user with the admin/people/create form and check if the correct
     // language is set.
     $username = $this->randomMachineName(10);
-    $edit = array(
+    $edit = [
       'name' => $username,
       'mail' => $this->randomMachineName(4) . '@example.com',
       'pass[pass1]' => $username,
       'pass[pass2]' => $username,
-    );
+    ];
 
     $this->drupalPostForm($langcode . '/admin/people/create', $edit, t('Create new account'));
 
@@ -67,10 +67,10 @@ class UserLanguageCreationTest extends WebTestBase {
     $this->assertNoFieldByName('language[fr]', 'Language selector is not accessible.');
 
     $username = $this->randomMachineName(10);
-    $edit = array(
+    $edit = [
       'name' => $username,
       'mail' => $this->randomMachineName(4) . '@example.com',
-    );
+    ];
 
     $this->drupalPostForm($langcode . '/user/register', $edit, t('Create new account'));
 
@@ -88,10 +88,10 @@ class UserLanguageCreationTest extends WebTestBase {
 
     // Set pass_raw so we can log in the new user.
     $user->pass_raw = $this->randomMachineName(10);
-    $edit = array(
+    $edit = [
       'pass[pass1]' => $user->pass_raw,
       'pass[pass2]' => $user->pass_raw,
-    );
+    ];
 
     $this->drupalPostForm($user_edit, $edit, t('Save'));
 
diff --git a/web/core/modules/user/src/Tests/UserLoginTest.php b/web/core/modules/user/src/Tests/UserLoginTest.php
index af00c7473..d92c1c7ae 100644
--- a/web/core/modules/user/src/Tests/UserLoginTest.php
+++ b/web/core/modules/user/src/Tests/UserLoginTest.php
@@ -15,15 +15,15 @@ class UserLoginTest extends WebTestBase {
   /**
    * Tests login with destination.
    */
-  function testLoginCacheTagsAndDestination() {
+  public function testLoginCacheTagsAndDestination() {
     $this->drupalGet('user/login');
     // The user login form says "Enter your <site name> username.", hence it
     // depends on config:system.site, and its cache tags should be present.
     $this->assertCacheTag('config:system.site');
 
-    $user = $this->drupalCreateUser(array());
-    $this->drupalGet('user/login', array('query' => array('destination' => 'foo')));
-    $edit = array('name' => $user->getUserName(), 'pass' => $user->pass_raw);
+    $user = $this->drupalCreateUser([]);
+    $this->drupalGet('user/login', ['query' => ['destination' => 'foo']]);
+    $edit = ['name' => $user->getUserName(), 'pass' => $user->pass_raw];
     $this->drupalPostForm(NULL, $edit, t('Log in'));
     $this->assertUrl('foo', [], 'Redirected to the correct URL');
   }
@@ -31,14 +31,14 @@ class UserLoginTest extends WebTestBase {
   /**
    * Test the global login flood control.
    */
-  function testGlobalLoginFloodControl() {
+  public function testGlobalLoginFloodControl() {
     $this->config('user.flood')
       ->set('ip_limit', 10)
       // Set a high per-user limit out so that it is not relevant in the test.
       ->set('user_limit', 4000)
       ->save();
 
-    $user1 = $this->drupalCreateUser(array());
+    $user1 = $this->drupalCreateUser([]);
     $incorrect_user1 = clone $user1;
     $incorrect_user1->pass_raw .= 'incorrect';
 
@@ -68,18 +68,18 @@ class UserLoginTest extends WebTestBase {
   /**
    * Test the per-user login flood control.
    */
-  function testPerUserLoginFloodControl() {
+  public function testPerUserLoginFloodControl() {
     $this->config('user.flood')
       // Set a high global limit out so that it is not relevant in the test.
       ->set('ip_limit', 4000)
       ->set('user_limit', 3)
       ->save();
 
-    $user1 = $this->drupalCreateUser(array());
+    $user1 = $this->drupalCreateUser([]);
     $incorrect_user1 = clone $user1;
     $incorrect_user1->pass_raw .= 'incorrect';
 
-    $user2 = $this->drupalCreateUser(array());
+    $user2 = $this->drupalCreateUser([]);
 
     // Try 2 failed logins.
     for ($i = 0; $i < 2; $i++) {
@@ -108,7 +108,7 @@ class UserLoginTest extends WebTestBase {
   /**
    * Test that user password is re-hashed upon login after changing $count_log2.
    */
-  function testPasswordRehashOnLogin() {
+  public function testPasswordRehashOnLogin() {
     // Determine default log2 for phpass hashing algorithm
     $default_count_log2 = 16;
 
@@ -116,7 +116,7 @@ class UserLoginTest extends WebTestBase {
     $password_hasher = $this->container->get('password');
 
     // Create a new user and authenticate.
-    $account = $this->drupalCreateUser(array());
+    $account = $this->drupalCreateUser([]);
     $password = $account->pass_raw;
     $this->drupalLogin($account);
     $this->drupalLogout();
@@ -129,13 +129,13 @@ class UserLoginTest extends WebTestBase {
     // containing the necessary container builder code and then verify that the
     // users password gets rehashed during the login.
     $overridden_count_log2 = 19;
-    \Drupal::service('module_installer')->install(array('user_custom_phpass_params_test'));
+    \Drupal::service('module_installer')->install(['user_custom_phpass_params_test']);
     $this->resetAll();
 
     $account->pass_raw = $password;
     $this->drupalLogin($account);
     // Load the stored user, which should have a different password hash now.
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
     $this->assertIdentical($password_hasher->getCountLog2($account->getPassword()), $overridden_count_log2);
     $this->assertTrue($password_hasher->check($password, $account->getPassword()));
@@ -154,20 +154,20 @@ class UserLoginTest extends WebTestBase {
    *   .
    *   - Set to NULL to expect a failed login.
    */
-  function assertFailedLogin($account, $flood_trigger = NULL) {
-    $edit = array(
+  public function assertFailedLogin($account, $flood_trigger = NULL) {
+    $edit = [
       'name' => $account->getUsername(),
       'pass' => $account->pass_raw,
-    );
+    ];
     $this->drupalPostForm('user/login', $edit, t('Log in'));
     $this->assertNoFieldByXPath("//input[@name='pass' and @value!='']", NULL, 'Password value attribute is blank.');
     if (isset($flood_trigger)) {
       if ($flood_trigger == 'user') {
-        $this->assertRaw(\Drupal::translation()->formatPlural($this->config('user.flood')->get('user_limit'), 'There has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', 'There have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', array(':url' => \Drupal::url('user.pass'))));
+        $this->assertRaw(\Drupal::translation()->formatPlural($this->config('user.flood')->get('user_limit'), 'There has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', 'There have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', [':url' => \Drupal::url('user.pass')]));
       }
       else {
         // No uid, so the limit is IP-based.
-        $this->assertRaw(t('Too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', array(':url' => \Drupal::url('user.pass'))));
+        $this->assertRaw(t('Too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or <a href=":url">request a new password</a>.', [':url' => \Drupal::url('user.pass')]));
       }
     }
     else {
diff --git a/web/core/modules/user/src/Tests/UserPasswordResetTest.php b/web/core/modules/user/src/Tests/UserPasswordResetTest.php
index f3463bf1d..528d38bc9 100644
--- a/web/core/modules/user/src/Tests/UserPasswordResetTest.php
+++ b/web/core/modules/user/src/Tests/UserPasswordResetTest.php
@@ -61,7 +61,7 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
     // that it is definitely over a second ago.
     $account->login = REQUEST_TIME - mt_rand(10, 100000);
     db_update('users_field_data')
-      ->fields(array('login' => $account->getLastLoginTime()))
+      ->fields(['login' => $account->getLastLoginTime()])
       ->condition('uid', $account->id())
       ->execute();
   }
@@ -69,7 +69,7 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
   /**
    * Tests password reset functionality.
    */
-  function testUserPasswordReset() {
+  public function testUserPasswordReset() {
     // Verify that accessing the password reset form without having the session
     // variables set results in an access denied message.
     $this->drupalGet(Url::fromRoute('user.reset.form', ['uid' => $this->account->id()]));
@@ -78,11 +78,11 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
     // Try to reset the password for an invalid account.
     $this->drupalGet('user/password');
 
-    $edit = array('name' => $this->randomMachineName(32));
+    $edit = ['name' => $this->randomMachineName(32)];
     $this->drupalPostForm(NULL, $edit, t('Submit'));
 
-    $this->assertText(t('@name is not recognized as a username or an email address.', array('@name' => $edit['name'])), 'Validation error message shown when trying to request password for invalid account.');
-    $this->assertEqual(count($this->drupalGetMails(array('id' => 'user_password_reset'))), 0, 'No email was sent when requesting a password for an invalid account.');
+    $this->assertText(t('@name is not recognized as a username or an email address.', ['@name' => $edit['name']]), 'Validation error message shown when trying to request password for invalid account.');
+    $this->assertEqual(count($this->drupalGetMails(['id' => 'user_password_reset'])), 0, 'No email was sent when requesting a password for an invalid account.');
 
     // Reset the password by username via the password reset page.
     $edit['name'] = $this->account->getUsername();
@@ -90,7 +90,7 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
 
     // Verify that the user was sent an email.
     $this->assertMail('to', $this->account->getEmail(), 'Password email sent to user.');
-    $subject = t('Replacement login information for @username at @site', array('@username' => $this->account->getUsername(), '@site' => $this->config('system.site')->get('name')));
+    $subject = t('Replacement login information for @username at @site', ['@username' => $this->account->getUsername(), '@site' => $this->config('system.site')->get('name')]);
     $this->assertMail('subject', $subject, 'Password reset email subject is correct.');
 
     $resetURL = $this->getResetURL();
@@ -112,19 +112,19 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
     // Check successful login.
     $this->drupalPostForm(NULL, NULL, t('Log in'));
     $this->assertLink(t('Log out'));
-    $this->assertTitle(t('@name | @site', array('@name' => $this->account->getUsername(), '@site' => $this->config('system.site')->get('name'))), 'Logged in using password reset link.');
+    $this->assertTitle(t('@name | @site', ['@name' => $this->account->getUsername(), '@site' => $this->config('system.site')->get('name')]), 'Logged in using password reset link.');
 
     // Make sure the ajax request from uploading a user picture does not
     // invalidate the reset token.
     $image = current($this->drupalGetTestFiles('image'));
-    $edit = array(
+    $edit = [
       'files[user_picture_0]' => drupal_realpath($image->uri),
-    );
+    ];
     $this->drupalPostAjaxForm(NULL, $edit, 'user_picture_0_upload_button');
 
     // Change the forgotten password.
     $password = user_password();
-    $edit = array('pass[pass1]' => $password, 'pass[pass2]' => $password);
+    $edit = ['pass[pass1]' => $password, 'pass[pass2]' => $password];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertText(t('The changes have been saved.'), 'Forgotten password changed.');
 
@@ -141,10 +141,10 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
     // Request a new password again, this time using the email address.
     $this->drupalGet('user/password');
     // Count email messages before to compare with after.
-    $before = count($this->drupalGetMails(array('id' => 'user_password_reset')));
-    $edit = array('name' => $this->account->getEmail());
+    $before = count($this->drupalGetMails(['id' => 'user_password_reset']));
+    $edit = ['name' => $this->account->getEmail()];
     $this->drupalPostForm(NULL, $edit, t('Submit'));
-    $this->assertTrue( count($this->drupalGetMails(array('id' => 'user_password_reset'))) === $before + 1, 'Email sent when requesting password reset using email address.');
+    $this->assertTrue( count($this->drupalGetMails(['id' => 'user_password_reset'])) === $before + 1, 'Email sent when requesting password reset using email address.');
 
     // Visit the user edit page without pass-reset-token and make sure it does
     // not cause an error.
@@ -173,15 +173,15 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
     // Verify a blocked user can not request a new password.
     $this->drupalGet('user/password');
     // Count email messages before to compare with after.
-    $before = count($this->drupalGetMails(array('id' => 'user_password_reset')));
-    $edit = array('name' => $blocked_account->getUsername());
+    $before = count($this->drupalGetMails(['id' => 'user_password_reset']));
+    $edit = ['name' => $blocked_account->getUsername()];
     $this->drupalPostForm(NULL, $edit, t('Submit'));
-    $this->assertRaw(t('%name is blocked or has not been activated yet.', array('%name' => $blocked_account->getUsername())), 'Notified user blocked accounts can not request a new password');
-    $this->assertTrue(count($this->drupalGetMails(array('id' => 'user_password_reset'))) === $before, 'No email was sent when requesting password reset for a blocked account');
+    $this->assertRaw(t('%name is blocked or has not been activated yet.', ['%name' => $blocked_account->getUsername()]), 'Notified user blocked accounts can not request a new password');
+    $this->assertTrue(count($this->drupalGetMails(['id' => 'user_password_reset'])) === $before, 'No email was sent when requesting password reset for a blocked account');
 
     // Verify a password reset link is invalidated when the user's email address changes.
     $this->drupalGet('user/password');
-    $edit = array('name' => $this->account->getUsername());
+    $edit = ['name' => $this->account->getUsername()];
     $this->drupalPostForm(NULL, $edit, t('Submit'));
     $old_email_reset_link = $this->getResetURL();
     $this->account->setEmail("1" . $this->account->getEmail());
@@ -193,12 +193,12 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
     // Verify a password reset link will automatically log a user when /login is
     // appended.
     $this->drupalGet('user/password');
-    $edit = array('name' => $this->account->getUsername());
+    $edit = ['name' => $this->account->getUsername()];
     $this->drupalPostForm(NULL, $edit, t('Submit'));
     $reset_url = $this->getResetURL();
     $this->drupalGet($reset_url . '/login');
     $this->assertLink(t('Log out'));
-    $this->assertTitle(t('@name | @site', array('@name' => $this->account->getUsername(), '@site' => $this->config('system.site')->get('name'))), 'Logged in using password reset link.');
+    $this->assertTitle(t('@name | @site', ['@name' => $this->account->getUsername(), '@site' => $this->config('system.site')->get('name')]), 'Logged in using password reset link.');
 
     // Ensure blocked and deleted accounts can't access the user.reset.login
     // route.
@@ -221,7 +221,7 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
     // Assume the most recent email.
     $_emails = $this->drupalGetMails();
     $email = end($_emails);
-    $urls = array();
+    $urls = [];
     preg_match('#.+user/reset/.+#', $email['body'], $urls);
 
     return $urls[0];
@@ -264,7 +264,7 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
 
     // Change the password.
     $password = user_password();
-    $edit = array('pass[pass1]' => $password, 'pass[pass2]' => $password);
+    $edit = ['pass[pass1]' => $password, 'pass[pass2]' => $password];
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertText(t('The changes have been saved.'), 'Password changed.');
 
@@ -282,15 +282,15 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
    */
   public function testUserResetPasswordTextboxFilled() {
     $this->drupalGet('user/login');
-    $edit = array(
+    $edit = [
       'name' => $this->randomMachineName(),
       'pass' => $this->randomMachineName(),
-    );
+    ];
     $this->drupalPostForm('user/login', $edit, t('Log in'));
     $this->assertRaw(t('Unrecognized username or password. <a href=":password">Forgot your password?</a>',
-      array(':password' => \Drupal::url('user.pass', [], array('query' => array('name' => $edit['name']))))));
+      [':password' => \Drupal::url('user.pass', [], ['query' => ['name' => $edit['name']]])]));
     unset($edit['pass']);
-    $this->drupalGet('user/password', array('query' => array('name' => $edit['name'])));
+    $this->drupalGet('user/password', ['query' => ['name' => $edit['name']]]);
     $this->assertFieldByName('name', $edit['name'], 'User name found.');
     // Ensure the name field value is not cached.
     $this->drupalGet('user/password');
@@ -300,10 +300,10 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
   /**
    * Make sure that users cannot forge password reset URLs of other users.
    */
-  function testResetImpersonation() {
+  public function testResetImpersonation() {
     // Create two identical user accounts except for the user name. They must
     // have the same empty password, so we can't use $this->drupalCreateUser().
-    $edit = array();
+    $edit = [];
     $edit['name'] = $this->randomMachineName();
     $edit['mail'] = $edit['name'] . '@example.com';
     $edit['status'] = 1;
@@ -333,7 +333,7 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
     $this->drupalGet($attack_reset_url);
     $this->drupalPostForm(NULL, NULL, t('Log in'));
     $this->assertNoText($user2->getUsername(), 'The invalid password reset page does not show the user name.');
-    $this->assertUrl('user/password', array(), 'The user is redirected to the password reset request page.');
+    $this->assertUrl('user/password', [], 'The user is redirected to the password reset request page.');
     $this->assertText('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.');
   }
 
diff --git a/web/core/modules/user/src/Tests/UserPermissionsTest.php b/web/core/modules/user/src/Tests/UserPermissionsTest.php
index 5e3ecd549..4f9e260ab 100644
--- a/web/core/modules/user/src/Tests/UserPermissionsTest.php
+++ b/web/core/modules/user/src/Tests/UserPermissionsTest.php
@@ -31,7 +31,7 @@ class UserPermissionsTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer permissions', 'access user profiles', 'administer site configuration', 'administer modules', 'administer account settings'));
+    $this->adminUser = $this->drupalCreateUser(['administer permissions', 'access user profiles', 'administer site configuration', 'administer modules', 'administer account settings']);
 
     // Find the new role ID.
     $all_rids = $this->adminUser->getRoles();
@@ -42,7 +42,7 @@ class UserPermissionsTest extends WebTestBase {
   /**
    * Test changing user permissions through the permissions page.
    */
-  function testUserPermissionChanges() {
+  public function testUserPermissionChanges() {
     $permissions_hash_generator = $this->container->get('user_permissions_hash_generator');
 
     $storage = $this->container->get('entity.manager')->getStorage('user_role');
@@ -59,7 +59,7 @@ class UserPermissionsTest extends WebTestBase {
 
     // Add a permission.
     $this->assertFalse($account->hasPermission('administer users'), 'User does not have "administer users" permission.');
-    $edit = array();
+    $edit = [];
     $edit[$rid . '[administer users]'] = TRUE;
     $this->drupalPostForm('admin/people/permissions', $edit, t('Save permissions'));
     $this->assertText(t('The changes have been saved.'), 'Successful save message displayed.');
@@ -72,7 +72,7 @@ class UserPermissionsTest extends WebTestBase {
 
     // Remove a permission.
     $this->assertTrue($account->hasPermission('access user profiles'), 'User has "access user profiles" permission.');
-    $edit = array();
+    $edit = [];
     $edit[$rid . '[access user profiles]'] = FALSE;
     $this->drupalPostForm('admin/people/permissions', $edit, t('Save permissions'));
     $this->assertText(t('The changes have been saved.'), 'Successful save message displayed.');
@@ -92,7 +92,7 @@ class UserPermissionsTest extends WebTestBase {
   /**
    * Test assigning of permissions for the administrator role.
    */
-  function testAdministratorRole() {
+  public function testAdministratorRole() {
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('admin/config/people/accounts');
 
@@ -102,7 +102,7 @@ class UserPermissionsTest extends WebTestBase {
     $this->assertFalse(Role::load($this->rid)->isAdmin());
 
     // Set the user's role to be the administrator role.
-    $edit = array();
+    $edit = [];
     $edit['user_admin_role'] = $this->rid;
     $this->drupalPostForm('admin/config/people/accounts', $edit, t('Save configuration'));
 
@@ -111,12 +111,12 @@ class UserPermissionsTest extends WebTestBase {
 
     // Enable aggregator module and ensure the 'administer news feeds'
     // permission is assigned by default.
-    \Drupal::service('module_installer')->install(array('aggregator'));
+    \Drupal::service('module_installer')->install(['aggregator']);
 
     $this->assertTrue($this->adminUser->hasPermission('administer news feeds'), 'The permission was automatically assigned to the administrator role');
 
     // Ensure that selecting '- None -' removes the admin role.
-    $edit = array();
+    $edit = [];
     $edit['user_admin_role'] = '';
     $this->drupalPostForm('admin/config/people/accounts', $edit, t('Save configuration'));
 
@@ -135,7 +135,7 @@ class UserPermissionsTest extends WebTestBase {
   /**
    * Verify proper permission changes by user_role_change_permissions().
    */
-  function testUserRoleChangePermissions() {
+  public function testUserRoleChangePermissions() {
     $permissions_hash_generator = $this->container->get('user_permissions_hash_generator');
 
     $rid = $this->rid;
@@ -148,10 +148,10 @@ class UserPermissionsTest extends WebTestBase {
     $this->assertTrue($account->hasPermission('administer site configuration'), 'User has "administer site configuration" permission.');
 
     // Change permissions.
-    $permissions = array(
+    $permissions = [
       'administer users' => 1,
       'access user profiles' => 0,
-    );
+    ];
     user_role_change_permissions($rid, $permissions);
 
     // Verify proper permission changes.
diff --git a/web/core/modules/user/src/Tests/UserPictureTest.php b/web/core/modules/user/src/Tests/UserPictureTest.php
index 3f8db4277..6d546f0b4 100644
--- a/web/core/modules/user/src/Tests/UserPictureTest.php
+++ b/web/core/modules/user/src/Tests/UserPictureTest.php
@@ -33,18 +33,18 @@ class UserPictureTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->webUser = $this->drupalCreateUser(array(
+    $this->webUser = $this->drupalCreateUser([
       'access content',
       'access comments',
       'post comments',
       'skip comment approval',
-    ));
+    ]);
   }
 
   /**
    * Tests creation, display, and deletion of user pictures.
    */
-  function testCreateDeletePicture() {
+  public function testCreateDeletePicture() {
     $this->drupalLogin($this->webUser);
 
     // Save a new picture.
@@ -56,17 +56,17 @@ class UserPictureTest extends WebTestBase {
     $this->assertRaw(file_uri_target($file->getFileUri()), 'User picture found on user account page.');
 
     // Delete the picture.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('user/' . $this->webUser->id() . '/edit', $edit, t('Remove'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     // Call file_cron() to clean up the file. Make sure the timestamp
     // of the file is older than the system.file.temporary_maximum_age
     // configuration value.
     db_update('file_managed')
-      ->fields(array(
+      ->fields([
         'changed' => REQUEST_TIME - ($this->config('system.file')->get('temporary_maximum_age') + 1),
-      ))
+      ])
       ->condition('fid', $file->id())
       ->execute();
     \Drupal::service('cron')->run();
@@ -81,14 +81,14 @@ class UserPictureTest extends WebTestBase {
   /**
    * Tests embedded users on node pages.
    */
-  function testPictureOnNodeComment() {
+  public function testPictureOnNodeComment() {
     $this->drupalLogin($this->webUser);
 
     // Save a new picture.
     $image = current($this->drupalGetTestFiles('image'));
     $file = $this->saveUserPicture($image);
 
-    $node = $this->drupalCreateNode(array('type' => 'article'));
+    $node = $this->drupalCreateNode(['type' => 'article']);
 
     // Enable user pictures on nodes.
     $this->config('system.theme.global')->set('features.node_user_picture', TRUE)->save();
@@ -109,9 +109,9 @@ class UserPictureTest extends WebTestBase {
       ->set('features.comment_user_picture', TRUE)
       ->save();
 
-    $edit = array(
+    $edit = [
       'comment_body[0][value]' => $this->randomString(),
-    );
+    ];
     $this->drupalPostForm('comment/reply/node/' . $node->id() . '/comment', $edit, t('Save'));
     $elements = $this->cssSelect('.comment__meta .field--name-user-picture img[alt="' . $alt_text . '"][src="' . $image_url . '"]');
     $this->assertEqual(count($elements), 1, 'User picture with alt text found on the comment.');
@@ -129,13 +129,13 @@ class UserPictureTest extends WebTestBase {
   /**
    * Edits the user picture for the test user.
    */
-  function saveUserPicture($image) {
-    $edit = array('files[user_picture_0]' => drupal_realpath($image->uri));
+  public function saveUserPicture($image) {
+    $edit = ['files[user_picture_0]' => drupal_realpath($image->uri)];
     $this->drupalPostForm('user/' . $this->webUser->id() . '/edit', $edit, t('Save'));
 
     // Load actual user data from database.
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
-    $user_storage->resetCache(array($this->webUser->id()));
+    $user_storage->resetCache([$this->webUser->id()]);
     $account = $user_storage->load($this->webUser->id());
     return File::load($account->user_picture->target_id);
   }
diff --git a/web/core/modules/user/src/Tests/UserRegistrationTest.php b/web/core/modules/user/src/Tests/UserRegistrationTest.php
index 083136268..ca7a4f0c8 100644
--- a/web/core/modules/user/src/Tests/UserRegistrationTest.php
+++ b/web/core/modules/user/src/Tests/UserRegistrationTest.php
@@ -21,9 +21,9 @@ class UserRegistrationTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_test');
+  public static $modules = ['field_test'];
 
-  function testRegistrationWithEmailVerification() {
+  public function testRegistrationWithEmailVerification() {
     $config = $this->config('user.settings');
     // Require email verification.
     $config->set('verify_mail', TRUE)->save();
@@ -35,7 +35,7 @@ class UserRegistrationTest extends WebTestBase {
 
     // Allow registration by site visitors without administrator approval.
     $config->set('register', USER_REGISTER_VISITORS)->save();
-    $edit = array();
+    $edit = [];
     $edit['name'] = $name = $this->randomMachineName();
     $edit['mail'] = $mail = $edit['name'] . '@example.com';
     $this->drupalPostForm('user/register', $edit, t('Create new account'));
@@ -52,7 +52,7 @@ class UserRegistrationTest extends WebTestBase {
 
     // Allow registration by site visitors, but require administrator approval.
     $config->set('register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)->save();
-    $edit = array();
+    $edit = [];
     $edit['name'] = $name = $this->randomMachineName();
     $edit['mail'] = $mail = $edit['name'] . '@example.com';
     $this->drupalPostForm('user/register', $edit, t('Create new account'));
@@ -62,7 +62,7 @@ class UserRegistrationTest extends WebTestBase {
     $this->assertFalse($new_user->isActive(), 'New account is blocked until approved by an administrator.');
   }
 
-  function testRegistrationWithoutEmailVerification() {
+  public function testRegistrationWithoutEmailVerification() {
     $config = $this->config('user.settings');
     // Don't require email verification and allow registration by site visitors
     // without administrator approval.
@@ -71,7 +71,7 @@ class UserRegistrationTest extends WebTestBase {
       ->set('register', USER_REGISTER_VISITORS)
       ->save();
 
-    $edit = array();
+    $edit = [];
     $edit['name'] = $name = $this->randomMachineName();
     $edit['mail'] = $mail = $edit['name'] . '@example.com';
 
@@ -95,7 +95,7 @@ class UserRegistrationTest extends WebTestBase {
 
     // Allow registration by site visitors, but require administrator approval.
     $config->set('register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)->save();
-    $edit = array();
+    $edit = [];
     $edit['name'] = $name = $this->randomMachineName();
     $edit['mail'] = $mail = $edit['name'] . '@example.com';
     $edit['pass[pass1]'] = $pass = $this->randomMachineName();
@@ -104,22 +104,22 @@ class UserRegistrationTest extends WebTestBase {
     $this->assertText(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.'), 'Users are notified of pending approval');
 
     // Try to log in before administrator approval.
-    $auth = array(
+    $auth = [
       'name' => $name,
       'pass' => $pass,
-    );
+    ];
     $this->drupalPostForm('user/login', $auth, t('Log in'));
-    $this->assertText(t('The username @name has not been activated or is blocked.', array('@name' => $name)), 'User cannot log in yet.');
+    $this->assertText(t('The username @name has not been activated or is blocked.', ['@name' => $name]), 'User cannot log in yet.');
 
     // Activate the new account.
     $accounts = $this->container->get('entity_type.manager')->getStorage('user')
       ->loadByProperties(['name' => $name, 'mail' => $mail]);
     $new_user = reset($accounts);
-    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $admin_user = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($admin_user);
-    $edit = array(
+    $edit = [
       'status' => 1,
-    );
+    ];
     $this->drupalPostForm('user/' . $new_user->id() . '/edit', $edit, t('Save'));
     $this->drupalLogout();
 
@@ -128,7 +128,7 @@ class UserRegistrationTest extends WebTestBase {
     $this->assertText(t('Member for'), 'User can log in after administrator approval.');
   }
 
-  function testRegistrationEmailDuplicates() {
+  public function testRegistrationEmailDuplicates() {
     // Don't require email verification and allow registration by site visitors
     // without administrator approval.
     $this->config('user.settings')
@@ -139,19 +139,19 @@ class UserRegistrationTest extends WebTestBase {
     // Set up a user to check for duplicates.
     $duplicate_user = $this->drupalCreateUser();
 
-    $edit = array();
+    $edit = [];
     $edit['name'] = $this->randomMachineName();
     $edit['mail'] = $duplicate_user->getEmail();
 
     // Attempt to create a new account using an existing email address.
     $this->drupalPostForm('user/register', $edit, t('Create new account'));
-    $this->assertText(t('The email address @email is already taken.', array('@email' => $duplicate_user->getEmail())), 'Supplying an exact duplicate email address displays an error message');
+    $this->assertText(t('The email address @email is already taken.', ['@email' => $duplicate_user->getEmail()]), 'Supplying an exact duplicate email address displays an error message');
 
     // Attempt to bypass duplicate email registration validation by adding spaces.
     $edit['mail'] = '   ' . $duplicate_user->getEmail() . '   ';
 
     $this->drupalPostForm('user/register', $edit, t('Create new account'));
-    $this->assertText(t('The email address @email is already taken.', array('@email' => $duplicate_user->getEmail())), 'Supplying a duplicate email address with added whitespace displays an error message');
+    $this->assertText(t('The email address @email is already taken.', ['@email' => $duplicate_user->getEmail()]), 'Supplying a duplicate email address with added whitespace displays an error message');
   }
 
   /**
@@ -223,7 +223,7 @@ class UserRegistrationTest extends WebTestBase {
     $this->assertTrue($user_storage->loadByProperties(['name' => $edit['name']]));
   }
 
-  function testRegistrationDefaultValues() {
+  public function testRegistrationDefaultValues() {
     // Don't require email verification and allow registration by site visitors
     // without administrator approval.
     $config_user_settings = $this->config('user.settings')
@@ -237,15 +237,11 @@ class UserRegistrationTest extends WebTestBase {
       ->set('timezone.default', 'Europe/Brussels')
       ->save();
 
-    // Check that the account information options are not displayed
-    // as a details element if there is not more than one details in the form.
-    $this->drupalGet('user/register');
-    $this->assertNoRaw('<details id="edit-account"><summary>Account information</summary>');
-
     // Check the presence of expected cache tags.
+    $this->drupalGet('user/register');
     $this->assertCacheTag('config:user.settings');
 
-    $edit = array();
+    $edit = [];
     $edit['name'] = $name = $this->randomMachineName();
     $edit['mail'] = $mail = $edit['name'] . '@example.com';
     $edit['pass[pass1]'] = $new_pass = $this->randomMachineName();
@@ -287,14 +283,14 @@ class UserRegistrationTest extends WebTestBase {
   /**
    * Tests Field API fields on user registration forms.
    */
-  function testRegistrationWithUserFields() {
+  public function testRegistrationWithUserFields() {
     // Create a field on 'user' entity type.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'test_user_field',
       'entity_type' => 'user',
       'type' => 'test_field',
       'cardinality' => 1,
-    ));
+    ]);
     $field_storage->save();
     $field = FieldConfig::create([
       'field_storage' => $field_storage,
@@ -304,7 +300,7 @@ class UserRegistrationTest extends WebTestBase {
     ]);
     $field->save();
     entity_get_form_display('user', 'user', 'default')
-      ->setComponent('test_user_field', array('type' => 'test_field_widget'))
+      ->setComponent('test_user_field', ['type' => 'test_field_widget'])
       ->save();
     entity_get_form_display('user', 'user', 'register')
       ->save();
@@ -317,7 +313,7 @@ class UserRegistrationTest extends WebTestBase {
 
     // Have the field appear on the registration form.
     entity_get_form_display('user', 'user', 'register')
-      ->setComponent('test_user_field', array('type' => 'test_field_widget'))
+      ->setComponent('test_user_field', ['type' => 'test_field_widget'])
       ->save();
 
     $this->drupalGet('user/register');
@@ -325,19 +321,19 @@ class UserRegistrationTest extends WebTestBase {
     $this->assertRegistrationFormCacheTagsWithUserFields();
 
     // Check that validation errors are correctly reported.
-    $edit = array();
+    $edit = [];
     $edit['name'] = $name = $this->randomMachineName();
     $edit['mail'] = $mail = $edit['name'] . '@example.com';
     // Missing input in required field.
     $edit['test_user_field[0][value]'] = '';
     $this->drupalPostForm(NULL, $edit, t('Create new account'));
     $this->assertRegistrationFormCacheTagsWithUserFields();
-    $this->assertRaw(t('@name field is required.', array('@name' => $field->label())), 'Field validation error was correctly reported.');
+    $this->assertRaw(t('@name field is required.', ['@name' => $field->label()]), 'Field validation error was correctly reported.');
     // Invalid input.
     $edit['test_user_field[0][value]'] = '-1';
     $this->drupalPostForm(NULL, $edit, t('Create new account'));
     $this->assertRegistrationFormCacheTagsWithUserFields();
-    $this->assertRaw(t('%name does not accept the value -1.', array('%name' => $field->label())), 'Field validation error was correctly reported.');
+    $this->assertRaw(t('%name does not accept the value -1.', ['%name' => $field->label()]), 'Field validation error was correctly reported.');
 
     // Submit with valid data.
     $value = rand(1, 255);
@@ -352,12 +348,12 @@ class UserRegistrationTest extends WebTestBase {
     // Check that the 'add more' button works.
     $field_storage->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
     $field_storage->save();
-    foreach (array('js', 'nojs') as $js) {
+    foreach (['js', 'nojs'] as $js) {
       $this->drupalGet('user/register');
       $this->assertRegistrationFormCacheTagsWithUserFields();
       // Add two inputs.
       $value = rand(1, 255);
-      $edit = array();
+      $edit = [];
       $edit['test_user_field[0][value]'] = $value;
       if ($js == 'js') {
         $this->drupalPostAjaxForm(NULL, $edit, 'test_user_field_add_more');
@@ -375,11 +371,11 @@ class UserRegistrationTest extends WebTestBase {
       $this->drupalPostForm(NULL, $edit, t('Create new account'));
       // Check user fields.
       $accounts = $this->container->get('entity_type.manager')->getStorage('user')
-        ->loadByProperties(array('name' => $name, 'mail' => $mail));
+        ->loadByProperties(['name' => $name, 'mail' => $mail]);
       $new_user = reset($accounts);
-      $this->assertEqual($new_user->test_user_field[0]->value, $value, format_string('@js : The field value was correctly saved.', array('@js' => $js)));
-      $this->assertEqual($new_user->test_user_field[1]->value, $value + 1, format_string('@js : The field value was correctly saved.', array('@js' => $js)));
-      $this->assertEqual($new_user->test_user_field[2]->value, $value + 2, format_string('@js : The field value was correctly saved.', array('@js' => $js)));
+      $this->assertEqual($new_user->test_user_field[0]->value, $value, format_string('@js : The field value was correctly saved.', ['@js' => $js]));
+      $this->assertEqual($new_user->test_user_field[1]->value, $value + 1, format_string('@js : The field value was correctly saved.', ['@js' => $js]));
+      $this->assertEqual($new_user->test_user_field[2]->value, $value + 2, format_string('@js : The field value was correctly saved.', ['@js' => $js]));
     }
   }
 
diff --git a/web/core/modules/user/src/Tests/UserRoleAdminTest.php b/web/core/modules/user/src/Tests/UserRoleAdminTest.php
index 182da93cb..eca9915d7 100644
--- a/web/core/modules/user/src/Tests/UserRoleAdminTest.php
+++ b/web/core/modules/user/src/Tests/UserRoleAdminTest.php
@@ -32,31 +32,31 @@ class UserRoleAdminTest extends WebTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->adminUser = $this->drupalCreateUser(array('administer permissions', 'administer users'));
+    $this->adminUser = $this->drupalCreateUser(['administer permissions', 'administer users']);
     $this->drupalPlaceBlock('local_tasks_block');
   }
 
   /**
    * Test adding, renaming and deleting roles.
    */
-  function testRoleAdministration() {
+  public function testRoleAdministration() {
     $this->drupalLogin($this->adminUser);
     $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
     // Test presence of tab.
     $this->drupalGet('admin/people/permissions');
-    $tabs = $this->xpath('//ul[@class=:classes and //a[contains(., :text)]]', array(
+    $tabs = $this->xpath('//ul[@class=:classes and //a[contains(., :text)]]', [
       ':classes' => 'tabs primary',
       ':text' => t('Roles'),
-    ));
+    ]);
     $this->assertEqual(count($tabs), 1, 'Found roles tab');
 
     // Test adding a role. (In doing so, we use a role name that happens to
     // correspond to an integer, to test that the role administration pages
     // correctly distinguish between role names and IDs.)
     $role_name = '123';
-    $edit = array('label' => $role_name, 'id' => $role_name);
+    $edit = ['label' => $role_name, 'id' => $role_name];
     $this->drupalPostForm('admin/people/roles/add', $edit, t('Save'));
-    $this->assertRaw(t('Role %label has been added.', array('%label' => 123)));
+    $this->assertRaw(t('Role %label has been added.', ['%label' => 123]));
     $role = Role::load($role_name);
     $this->assertTrue(is_object($role), 'The role was successfully retrieved from the database.');
 
@@ -69,20 +69,20 @@ class UserRoleAdminTest extends WebTestBase {
 
     // Test renaming a role.
     $role_name = '456';
-    $edit = array('label' => $role_name);
+    $edit = ['label' => $role_name];
     $this->drupalPostForm("admin/people/roles/manage/{$role->id()}", $edit, t('Save'));
-    $this->assertRaw(t('Role %label has been updated.', array('%label' => $role_name)));
-    \Drupal::entityManager()->getStorage('user_role')->resetCache(array($role->id()));
+    $this->assertRaw(t('Role %label has been updated.', ['%label' => $role_name]));
+    \Drupal::entityManager()->getStorage('user_role')->resetCache([$role->id()]);
     $new_role = Role::load($role->id());
     $this->assertEqual($new_role->label(), $role_name, 'The role name has been successfully changed.');
 
     // Test deleting a role.
     $this->drupalGet("admin/people/roles/manage/{$role->id()}");
     $this->clickLink(t('Delete'));
-    $this->drupalPostForm(NULL, array(), t('Delete'));
-    $this->assertRaw(t('The role %label has been deleted.', array('%label' => $role_name)));
+    $this->drupalPostForm(NULL, [], t('Delete'));
+    $this->assertRaw(t('The role %label has been deleted.', ['%label' => $role_name]));
     $this->assertNoLinkByHref("admin/people/roles/manage/{$role->id()}", 'Role edit link removed.');
-    \Drupal::entityManager()->getStorage('user_role')->resetCache(array($role->id()));
+    \Drupal::entityManager()->getStorage('user_role')->resetCache([$role->id()]);
     $this->assertFalse(Role::load($role->id()), 'A deleted role can no longer be loaded.');
 
     // Make sure that the system-defined roles can be edited via the user
@@ -98,15 +98,15 @@ class UserRoleAdminTest extends WebTestBase {
   /**
    * Test user role weight change operation and ordering.
    */
-  function testRoleWeightOrdering() {
+  public function testRoleWeightOrdering() {
     $this->drupalLogin($this->adminUser);
     $roles = user_roles();
     $weight = count($roles);
-    $new_role_weights = array();
-    $saved_rids = array();
+    $new_role_weights = [];
+    $saved_rids = [];
 
     // Change the role weights to make the roles in reverse order.
-    $edit = array();
+    $edit = [];
     foreach ($roles as $role) {
       $edit['entities[' . $role->id() . '][weight]'] = $weight;
       $new_role_weights[$role->id()] = $weight;
@@ -119,7 +119,7 @@ class UserRoleAdminTest extends WebTestBase {
     // Load up the user roles with the new weights.
     drupal_static_reset('user_roles');
     $roles = user_roles();
-    $rids = array();
+    $rids = [];
     // Test that the role weights have been correctly saved.
     foreach ($roles as $role) {
       $this->assertEqual($role->getWeight(), $new_role_weights[$role->id()]);
diff --git a/web/core/modules/user/src/Tests/UserTimeZoneTest.php b/web/core/modules/user/src/Tests/UserTimeZoneTest.php
index 3229d319b..396add4c0 100644
--- a/web/core/modules/user/src/Tests/UserTimeZoneTest.php
+++ b/web/core/modules/user/src/Tests/UserTimeZoneTest.php
@@ -17,19 +17,26 @@ class UserTimeZoneTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'system_test');
+  public static $modules = ['node', 'system_test'];
 
   /**
    * Tests the display of dates and time when user-configurable time zones are set.
    */
-  function testUserTimeZone() {
+  public function testUserTimeZone() {
     // Setup date/time settings for Los Angeles time.
     $this->config('system.date')
       ->set('timezone.user.configurable', 1)
       ->set('timezone.default', 'America/Los_Angeles')
       ->save();
+
+    // Load the 'medium' date format, which is the default for node creation
+    // time, and override it. Since we are testing time zones with Daylight
+    // Saving Time, and need to future proof against changes to the zoneinfo
+    // database, we choose the 'I' format placeholder instead of a
+    // human-readable zone name. With 'I', a 1 means the date is in DST, and 0
+    // if not.
     DateFormat::load('medium')
-      ->setPattern('Y-m-d H:i T')
+      ->setPattern('Y-m-d H:i I')
       ->save();
 
     // Create a user account and login.
@@ -42,21 +49,21 @@ class UserTimeZoneTest extends WebTestBase {
     $date2 = '2007-03-11 01:00:00 -0800';
     // One date in PDT (summer time):
     $date3 = '2007-03-20 21:00:00 -0700';
-    $this->drupalCreateContentType(array('type' => 'article'));
-    $node1 = $this->drupalCreateNode(array('created' => strtotime($date1), 'type' => 'article'));
-    $node2 = $this->drupalCreateNode(array('created' => strtotime($date2), 'type' => 'article'));
-    $node3 = $this->drupalCreateNode(array('created' => strtotime($date3), 'type' => 'article'));
+    $this->drupalCreateContentType(['type' => 'article']);
+    $node1 = $this->drupalCreateNode(['created' => strtotime($date1), 'type' => 'article']);
+    $node2 = $this->drupalCreateNode(['created' => strtotime($date2), 'type' => 'article']);
+    $node3 = $this->drupalCreateNode(['created' => strtotime($date3), 'type' => 'article']);
 
     // Confirm date format and time zone.
     $this->drupalGet('node/' . $node1->id());
-    $this->assertText('2007-03-09 21:00 PST', 'Date should be PST.');
+    $this->assertText('2007-03-09 21:00 0', 'Date should be PST.');
     $this->drupalGet('node/' . $node2->id());
-    $this->assertText('2007-03-11 01:00 PST', 'Date should be PST.');
+    $this->assertText('2007-03-11 01:00 0', 'Date should be PST.');
     $this->drupalGet('node/' . $node3->id());
-    $this->assertText('2007-03-20 21:00 PDT', 'Date should be PDT.');
+    $this->assertText('2007-03-20 21:00 1', 'Date should be PDT.');
 
     // Change user time zone to Santiago time.
-    $edit = array();
+    $edit = [];
     $edit['mail'] = $web_user->getEmail();
     $edit['timezone'] = 'America/Santiago';
     $this->drupalPostForm("user/" . $web_user->id() . "/edit", $edit, t('Save'));
@@ -64,25 +71,25 @@ class UserTimeZoneTest extends WebTestBase {
 
     // Confirm date format and time zone.
     $this->drupalGet('node/' . $node1->id());
-    $this->assertText('2007-03-10 02:00 CLST', 'Date should be Chile summer time; five hours ahead of PST.');
+    $this->assertText('2007-03-10 02:00 1', 'Date should be Chile summer time; five hours ahead of PST.');
     $this->drupalGet('node/' . $node2->id());
-    $this->assertText('2007-03-11 05:00 CLT', 'Date should be Chile time; four hours ahead of PST');
+    $this->assertText('2007-03-11 05:00 0', 'Date should be Chile time; four hours ahead of PST');
     $this->drupalGet('node/' . $node3->id());
-    $this->assertText('2007-03-21 00:00 CLT', 'Date should be Chile time; three hours ahead of PDT.');
+    $this->assertText('2007-03-21 00:00 0', 'Date should be Chile time; three hours ahead of PDT.');
 
     // Ensure that anonymous users also use the default timezone.
     $this->drupalLogout();
     $this->drupalGet('node/' . $node1->id());
-    $this->assertText('2007-03-09 21:00 PST', 'Date should be PST.');
+    $this->assertText('2007-03-09 21:00 0', 'Date should be PST.');
     $this->drupalGet('node/' . $node2->id());
-    $this->assertText('2007-03-11 01:00 PST', 'Date should be PST.');
+    $this->assertText('2007-03-11 01:00 0', 'Date should be PST.');
     $this->drupalGet('node/' . $node3->id());
-    $this->assertText('2007-03-20 21:00 PDT', 'Date should be PDT.');
+    $this->assertText('2007-03-20 21:00 1', 'Date should be PDT.');
 
     // Format a date without accessing the current user at all and
     // ensure that it uses the default timezone.
     $this->drupalGet('/system-test/date');
-    $this->assertText('2016-01-13 08:29 PST', 'Date should be PST.');
+    $this->assertText('2016-01-13 08:29 0', 'Date should be PST.');
   }
 
 }
diff --git a/web/core/modules/user/src/Tests/UserTranslationUITest.php b/web/core/modules/user/src/Tests/UserTranslationUITest.php
index 82a344514..32a9b8feb 100644
--- a/web/core/modules/user/src/Tests/UserTranslationUITest.php
+++ b/web/core/modules/user/src/Tests/UserTranslationUITest.php
@@ -23,7 +23,7 @@ class UserTranslationUITest extends ContentTranslationUITestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'content_translation', 'user', 'views');
+  public static $modules = ['language', 'content_translation', 'user', 'views'];
 
   protected function setUp() {
     $this->entityTypeId = 'user';
@@ -38,7 +38,7 @@ class UserTranslationUITest extends ContentTranslationUITestBase {
    * {@inheritdoc}
    */
   protected function getTranslatorPermissions() {
-    return array_merge(parent::getTranslatorPermissions(), array('administer users'));
+    return array_merge(parent::getTranslatorPermissions(), ['administer users']);
   }
 
   /**
@@ -46,7 +46,7 @@ class UserTranslationUITest extends ContentTranslationUITestBase {
    */
   protected function getNewEntityValues($langcode) {
     // User name is not translatable hence we use a fixed value.
-    return array('name' => $this->name) + parent::getNewEntityValues($langcode);
+    return ['name' => $this->name] + parent::getNewEntityValues($langcode);
   }
 
   /**
@@ -62,14 +62,14 @@ class UserTranslationUITest extends ContentTranslationUITestBase {
     foreach ($this->langcodes as $langcode) {
       // We only want to test the title for non-english translations.
       if ($langcode != 'en') {
-        $options = array('language' => $languages[$langcode]);
+        $options = ['language' => $languages[$langcode]];
         $url = $entity->urlInfo('edit-form', $options);
         $this->drupalGet($url);
 
-        $title = t('@title [%language translation]', array(
+        $title = t('@title [%language translation]', [
           '@title' => $entity->getTranslation($langcode)->label(),
           '%language' => $languages[$langcode]->getName(),
-        ));
+        ]);
         $this->assertRaw($title);
       }
     }
diff --git a/web/core/modules/user/src/Tests/Views/AccessPermissionTest.php b/web/core/modules/user/src/Tests/Views/AccessPermissionTest.php
index b8ef5a9f8..477abd941 100644
--- a/web/core/modules/user/src/Tests/Views/AccessPermissionTest.php
+++ b/web/core/modules/user/src/Tests/Views/AccessPermissionTest.php
@@ -19,12 +19,12 @@ class AccessPermissionTest extends AccessTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_access_perm');
+  public static $testViews = ['test_access_perm'];
 
   /**
    * Tests perm access plugin.
    */
-  function testAccessPerm() {
+  public function testAccessPerm() {
     $view = Views::getView('test_access_perm');
     $view->setDisplay();
 
diff --git a/web/core/modules/user/src/Tests/Views/AccessRoleTest.php b/web/core/modules/user/src/Tests/Views/AccessRoleTest.php
index 02a83a71c..4d5db4d02 100644
--- a/web/core/modules/user/src/Tests/Views/AccessRoleTest.php
+++ b/web/core/modules/user/src/Tests/Views/AccessRoleTest.php
@@ -20,18 +20,18 @@ class AccessRoleTest extends AccessTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_access_role');
+  public static $testViews = ['test_access_role'];
 
   /**
    * Tests role access plugin.
    */
-  function testAccessRole() {
+  public function testAccessRole() {
     /** @var \Drupal\views\ViewEntityInterface $view */
     $view = \Drupal::entityManager()->getStorage('view')->load('test_access_role');
     $display = &$view->getDisplay('default');
-    $display['display_options']['access']['options']['role'] = array(
+    $display['display_options']['access']['options']['role'] = [
       $this->normalRole => $this->normalRole,
-    );
+    ];
     $view->save();
     $this->container->get('router.builder')->rebuildIfNeeded();
     $expected = [
@@ -63,10 +63,10 @@ class AccessRoleTest extends AccessTestBase {
     // Test allowing multiple roles.
     $view = Views::getView('test_access_role')->storage;
     $display = &$view->getDisplay('default');
-    $display['display_options']['access']['options']['role'] = array(
+    $display['display_options']['access']['options']['role'] = [
       $this->normalRole => $this->normalRole,
       'anonymous' => 'anonymous',
-    );
+    ];
     $view->save();
     $this->container->get('router.builder')->rebuildIfNeeded();
 
@@ -102,9 +102,9 @@ class AccessRoleTest extends AccessTestBase {
     $display['display_options']['cache'] = [
       'type' => 'tag',
     ];
-    $display['display_options']['access']['options']['role'] = array(
+    $display['display_options']['access']['options']['role'] = [
       $this->normalRole => $this->normalRole,
-    );
+    ];
     $view->save();
 
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
diff --git a/web/core/modules/user/src/Tests/Views/AccessRoleUITest.php b/web/core/modules/user/src/Tests/Views/AccessRoleUITest.php
index 7fb949600..bea8c53c6 100644
--- a/web/core/modules/user/src/Tests/Views/AccessRoleUITest.php
+++ b/web/core/modules/user/src/Tests/Views/AccessRoleUITest.php
@@ -18,14 +18,14 @@ class AccessRoleUITest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_access_role');
+  public static $testViews = ['test_access_role'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('user', 'user_test_views');
+  public static $modules = ['user', 'user_test_views'];
 
   /**
    * {@inheritdoc}
@@ -33,7 +33,7 @@ class AccessRoleUITest extends UITestBase {
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('user_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['user_test_views']);
   }
 
   /**
@@ -41,20 +41,20 @@ class AccessRoleUITest extends UITestBase {
    */
   public function testAccessRoleUI() {
     $entity_manager = $this->container->get('entity.manager');
-    $entity_manager->getStorage('user_role')->create(array('id' => 'custom_role', 'label' => 'Custom role'))->save();
+    $entity_manager->getStorage('user_role')->create(['id' => 'custom_role', 'label' => 'Custom role'])->save();
     $access_url = "admin/structure/views/nojs/display/test_access_role/default/access_options";
-    $this->drupalPostForm($access_url, array('access_options[role][custom_role]' => 1), t('Apply'));
+    $this->drupalPostForm($access_url, ['access_options[role][custom_role]' => 1], t('Apply'));
     $this->assertResponse(200);
 
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $view = $entity_manager->getStorage('view')->load('test_access_role');
 
     $display = $view->getDisplay('default');
-    $this->assertEqual($display['display_options']['access']['options']['role'], array('custom_role' => 'custom_role'));
+    $this->assertEqual($display['display_options']['access']['options']['role'], ['custom_role' => 'custom_role']);
 
     // Test changing access plugin from role to none.
     $this->drupalPostForm('admin/structure/views/nojs/display/test_access_role/default/access', ['access[type]' => 'none'], t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     // Verify that role option is not set.
     $view = $entity_manager->getStorage('view')->load('test_access_role');
     $display = $view->getDisplay('default');
diff --git a/web/core/modules/user/src/Tests/Views/AccessTestBase.php b/web/core/modules/user/src/Tests/Views/AccessTestBase.php
index 90a3d2f52..b0395b0f0 100644
--- a/web/core/modules/user/src/Tests/Views/AccessTestBase.php
+++ b/web/core/modules/user/src/Tests/Views/AccessTestBase.php
@@ -12,7 +12,7 @@ abstract class AccessTestBase extends UserTestBase {
    *
    * @var array
    */
-  public static $modules = array('block');
+  public static $modules = ['block'];
 
   /**
    * Contains a user object that has no special permissions.
@@ -55,8 +55,8 @@ abstract class AccessTestBase extends UserTestBase {
     $roles = $this->webUser->getRoles();
     $this->webRole = $roles[0];
 
-    $this->normalRole = $this->drupalCreateRole(array());
-    $this->normalUser = $this->drupalCreateUser(array('views_test_data test permission'));
+    $this->normalRole = $this->drupalCreateRole([]);
+    $this->normalUser = $this->drupalCreateUser(['views_test_data test permission']);
     $this->normalUser->addRole($this->normalRole);
     $this->normalUser->save();
     // @todo when all the plugin information is cached make a reset function and
diff --git a/web/core/modules/user/src/Tests/Views/ArgumentDefaultTest.php b/web/core/modules/user/src/Tests/Views/ArgumentDefaultTest.php
index 4e21d79cf..7db32373a 100644
--- a/web/core/modules/user/src/Tests/Views/ArgumentDefaultTest.php
+++ b/web/core/modules/user/src/Tests/Views/ArgumentDefaultTest.php
@@ -16,7 +16,7 @@ class ArgumentDefaultTest extends UserTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_plugin_argument_default_current_user');
+  public static $testViews = ['test_plugin_argument_default_current_user'];
 
   public function test_plugin_argument_default_current_user() {
     // Create a user to test.
diff --git a/web/core/modules/user/src/Tests/Views/ArgumentValidateTest.php b/web/core/modules/user/src/Tests/Views/ArgumentValidateTest.php
index 0a4914254..3365bd891 100644
--- a/web/core/modules/user/src/Tests/Views/ArgumentValidateTest.php
+++ b/web/core/modules/user/src/Tests/Views/ArgumentValidateTest.php
@@ -18,7 +18,7 @@ class ArgumentValidateTest extends UserTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view_argument_validate_user', 'test_view_argument_validate_username');
+  public static $testViews = ['test_view_argument_validate_user', 'test_view_argument_validate_username'];
 
   /**
    * A user for this test.
@@ -36,7 +36,7 @@ class ArgumentValidateTest extends UserTestBase {
   /**
    * Tests the User (ID) argument validator.
    */
-  function testArgumentValidateUserUid() {
+  public function testArgumentValidateUserUid() {
     $account = $this->account;
 
     $view = Views::getView('test_view_argument_validate_user');
@@ -48,7 +48,7 @@ class ArgumentValidateTest extends UserTestBase {
     // Fail for a valid numeric, but for a user that doesn't exist
     $this->assertFalse($view->argument['null']->validateArgument(32));
 
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $view->argument['null']->buildOptionsForm($form, $form_state);
     $sanitized_id = ArgumentPluginBase::encodeValidatorId('entity:user');
diff --git a/web/core/modules/user/src/Tests/Views/BulkFormAccessTest.php b/web/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
index 3aa5f93f4..2b3624044 100644
--- a/web/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
+++ b/web/core/modules/user/src/Tests/Views/BulkFormAccessTest.php
@@ -18,26 +18,26 @@ class BulkFormAccessTest extends UserTestBase {
    *
    * @var array
    */
-  public static $modules = array('user_access_test');
+  public static $modules = ['user_access_test'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_user_bulk_form');
+  public static $testViews = ['test_user_bulk_form'];
 
   /**
    * Tests if users that may not be edited, can not be edited in bulk.
    */
   public function testUserEditAccess() {
     // Create an authenticated user.
-    $no_edit_user = $this->drupalCreateUser(array(), 'no_edit');
+    $no_edit_user = $this->drupalCreateUser([], 'no_edit');
     // Ensure this account is not blocked.
     $this->assertFalse($no_edit_user->isBlocked(), 'The user is not blocked.');
 
     // Log in as user admin.
-    $admin_user = $this->drupalCreateUser(array('administer users'));
+    $admin_user = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($admin_user);
 
     // Ensure that the account "no_edit" can not be edited.
@@ -46,10 +46,10 @@ class BulkFormAccessTest extends UserTestBase {
     $this->assertResponse(403, 'The user may not be edited.');
 
     // Test blocking the account "no_edit".
-    $edit = array(
+    $edit = [
       'user_bulk_form[' . ($no_edit_user->id() - 1) . ']' => TRUE,
       'action' => 'user_block_user_action',
-    );
+    ];
     $this->drupalPostForm('test-user-bulk-form', $edit, t('Apply to selected items'));
     $this->assertResponse(200);
 
@@ -67,10 +67,10 @@ class BulkFormAccessTest extends UserTestBase {
     $normal_user = $this->drupalCreateUser();
     $this->assertTrue($normal_user->access('update', $admin_user));
 
-    $edit = array(
+    $edit = [
       'user_bulk_form[' . ($normal_user->id() - 1) . ']' => TRUE,
       'action' => 'user_block_user_action',
-    );
+    ];
     $this->drupalPostForm('test-user-bulk-form', $edit, t('Apply to selected items'));
 
     $normal_user = User::load($normal_user->id());
@@ -79,10 +79,10 @@ class BulkFormAccessTest extends UserTestBase {
     // Log in as user without the 'administer users' permission.
     $this->drupalLogin($this->drupalCreateUser());
 
-    $edit = array(
+    $edit = [
       'user_bulk_form[' . ($normal_user->id() - 1) . ']' => TRUE,
       'action' => 'user_unblock_user_action',
-    );
+    ];
     $this->drupalPostForm('test-user-bulk-form', $edit, t('Apply to selected items'));
 
     // Re-load the normal user and ensure it is still blocked.
@@ -95,11 +95,11 @@ class BulkFormAccessTest extends UserTestBase {
    */
   public function testUserDeleteAccess() {
     // Create two authenticated users.
-    $account = $this->drupalCreateUser(array(), 'no_delete');
-    $account2 = $this->drupalCreateUser(array(), 'may_delete');
+    $account = $this->drupalCreateUser([], 'no_delete');
+    $account2 = $this->drupalCreateUser([], 'may_delete');
 
     // Log in as user admin.
-    $this->drupalLogin($this->drupalCreateUser(array('administer users')));
+    $this->drupalLogin($this->drupalCreateUser(['administer users']));
 
     // Ensure that the account "no_delete" can not be deleted.
     $this->drupalGet('user/' . $account->id() . '/cancel');
@@ -109,15 +109,15 @@ class BulkFormAccessTest extends UserTestBase {
     $this->assertResponse(200, 'The user "may_delete" may be deleted.');
 
     // Test deleting the accounts "no_delete" and "may_delete".
-    $edit = array(
+    $edit = [
       'user_bulk_form[' . ($account->id() - 1) . ']' => TRUE,
       'user_bulk_form[' . ($account2->id() - 1) . ']' => TRUE,
       'action' => 'user_cancel_user_action',
-    );
+    ];
     $this->drupalPostForm('test-user-bulk-form', $edit, t('Apply to selected items'));
-    $edit = array(
+    $edit = [
       'user_cancel_method' => 'user_cancel_delete',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Cancel accounts'));
 
     // Ensure the account "no_delete" still exists.
diff --git a/web/core/modules/user/src/Tests/Views/BulkFormTest.php b/web/core/modules/user/src/Tests/Views/BulkFormTest.php
index 00bdc821b..665af74a9 100644
--- a/web/core/modules/user/src/Tests/Views/BulkFormTest.php
+++ b/web/core/modules/user/src/Tests/Views/BulkFormTest.php
@@ -19,33 +19,33 @@ class BulkFormTest extends UserTestBase {
    *
    * @var array
    */
-  public static $modules = array('views_ui');
+  public static $modules = ['views_ui'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_user_bulk_form', 'test_user_bulk_form_combine_filter');
+  public static $testViews = ['test_user_bulk_form', 'test_user_bulk_form_combine_filter'];
 
   /**
    * Tests the user bulk form.
    */
   public function testBulkForm() {
     // Log in as a user without 'administer users'.
-    $this->drupalLogin($this->drupalCreateUser(array('administer permissions')));
+    $this->drupalLogin($this->drupalCreateUser(['administer permissions']));
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
 
     // Create an user which actually can change users.
-    $this->drupalLogin($this->drupalCreateUser(array('administer users')));
+    $this->drupalLogin($this->drupalCreateUser(['administer users']));
     $this->drupalGet('test-user-bulk-form');
     $result = $this->cssSelect('#edit-action option');
     $this->assertTrue(count($result) > 0);
 
     // Test submitting the page with no selection.
-    $edit = array(
+    $edit = [
       'action' => 'user_block_user_action',
-    );
+    ];
     $this->drupalPostForm('test-user-bulk-form', $edit, t('Apply to selected items'));
     $this->assertText(t('No users selected.'));
 
@@ -56,36 +56,36 @@ class BulkFormTest extends UserTestBase {
     $role = key($roles);
 
     $this->assertFalse($account->hasRole($role), 'The user currently does not have a custom role.');
-    $edit = array(
+    $edit = [
       'user_bulk_form[1]' => TRUE,
       'action' => 'user_add_role_action.' . $role,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     // Re-load the user and check their roles.
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
     $this->assertTrue($account->hasRole($role), 'The user now has the custom role.');
 
-    $edit = array(
+    $edit = [
       'user_bulk_form[1]' => TRUE,
       'action' => 'user_remove_role_action.' . $role,
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     // Re-load the user and check their roles.
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
     $this->assertFalse($account->hasRole($role), 'The user no longer has the custom role.');
 
     // Block a user using the bulk form.
     $this->assertTrue($account->isActive(), 'The user is not blocked.');
     $this->assertRaw($account->label(), 'The user is found in the table.');
-    $edit = array(
+    $edit = [
       'user_bulk_form[1]' => TRUE,
       'action' => 'user_block_user_action',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     // Re-load the user and check their status.
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
     $this->assertTrue($account->isBlocked(), 'The user is blocked.');
     $this->assertNoRaw($account->label(), 'The user is not found in the table.');
@@ -100,16 +100,16 @@ class BulkFormTest extends UserTestBase {
     $this->assertText($this->config('user.settings')->get('anonymous'));
 
     // Attempt to block the anonymous user.
-    $edit = array(
+    $edit = [
       'user_bulk_form[0]' => TRUE,
       'action' => 'user_block_user_action',
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
     $anonymous_account = $user_storage->load(0);
     $this->assertTrue($anonymous_account->isBlocked(), 'Ensure the anonymous user got blocked.');
 
     // Test the list of available actions with a value that contains a dot.
-    $this->drupalLogin($this->drupalCreateUser(array('administer permissions', 'administer views', 'administer users')));
+    $this->drupalLogin($this->drupalCreateUser(['administer permissions', 'administer views', 'administer users']));
     $action_id = 'user_add_role_action.' . $role;
     $edit = [
       'options[include_exclude]' => 'exclude',
@@ -134,7 +134,7 @@ class BulkFormTest extends UserTestBase {
     User::load($this->users[0]->id());
     $view = Views::getView('test_user_bulk_form_combine_filter');
     $errors = $view->validate();
-    $this->assertEqual(reset($errors['default']), t('Field %field set in %filter is not usable for this filter type. Combined field filter only works for simple fields.', array('%field' => 'User: Bulk update', '%filter' => 'Global: Combine fields filter')));
+    $this->assertEqual(reset($errors['default']), t('Field %field set in %filter is not usable for this filter type. Combined field filter only works for simple fields.', ['%field' => 'User: Bulk update', '%filter' => 'Global: Combine fields filter']));
   }
 
 }
diff --git a/web/core/modules/user/src/Tests/Views/FilterPermissionUiTest.php b/web/core/modules/user/src/Tests/Views/FilterPermissionUiTest.php
index e55c6c38e..f9444bc7d 100644
--- a/web/core/modules/user/src/Tests/Views/FilterPermissionUiTest.php
+++ b/web/core/modules/user/src/Tests/Views/FilterPermissionUiTest.php
@@ -30,7 +30,7 @@ class FilterPermissionUiTest extends ViewTestBase {
   protected function setUp() {
     parent::setUp(TRUE);
 
-    ViewTestData::createTestViews(get_class($this), array('user_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['user_test_views']);
     $this->enableViewsTestModule();
   }
 
diff --git a/web/core/modules/user/src/Tests/Views/HandlerArgumentUserUidTest.php b/web/core/modules/user/src/Tests/Views/HandlerArgumentUserUidTest.php
index d84a54252..73ee53fab 100644
--- a/web/core/modules/user/src/Tests/Views/HandlerArgumentUserUidTest.php
+++ b/web/core/modules/user/src/Tests/Views/HandlerArgumentUserUidTest.php
@@ -16,7 +16,7 @@ class HandlerArgumentUserUidTest extends UserTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_user_uid_argument');
+  public static $testViews = ['test_user_uid_argument'];
 
   /**
    * Tests the generated title of an user: uid argument.
@@ -25,29 +25,29 @@ class HandlerArgumentUserUidTest extends UserTestBase {
     $view = Views::getView('test_user_uid_argument');
 
     // Tests an invalid user uid.
-    $this->executeView($view, array(rand(1000, 10000)));
+    $this->executeView($view, [rand(1000, 10000)]);
     $this->assertFalse($view->getTitle());
     $view->destroy();
 
     // Tests a valid user.
     $account = $this->drupalCreateUser();
-    $this->executeView($view, array($account->id()));
+    $this->executeView($view, [$account->id()]);
     $this->assertEqual($view->getTitle(), $account->label());
     $view->destroy();
 
     // Tests the anonymous user.
     $anonymous = $this->config('user.settings')->get('anonymous');
-    $this->executeView($view, array(0));
+    $this->executeView($view, [0]);
     $this->assertEqual($view->getTitle(), $anonymous);
     $view->destroy();
 
     $view->getDisplay()->getHandler('argument', 'uid')->options['break_phrase'] = TRUE;
-    $this->executeView($view, array($account->id() . ',0'));
+    $this->executeView($view, [$account->id() . ',0']);
     $this->assertEqual($view->getTitle(), $account->label() . ', ' . $anonymous);
     $view->destroy();
 
     $view->getDisplay()->getHandler('argument', 'uid')->options['break_phrase'] = TRUE;
-    $this->executeView($view, array('0,' . $account->id()));
+    $this->executeView($view, ['0,' . $account->id()]);
     $this->assertEqual($view->getTitle(), $anonymous . ', ' . $account->label());
     $view->destroy();
   }
diff --git a/web/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php b/web/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php
index de7c65c90..6a5ebfc64 100644
--- a/web/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php
+++ b/web/core/modules/user/src/Tests/Views/HandlerFieldRoleTest.php
@@ -18,18 +18,18 @@ class HandlerFieldRoleTest extends UserTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_views_handler_field_role');
+  public static $testViews = ['test_views_handler_field_role'];
 
   public function testRole() {
     // Create a couple of roles for the view.
     $rolename_a = 'a' . $this->randomMachineName(8);
-    $this->drupalCreateRole(array('access content'), $rolename_a, '<em>' . $rolename_a . '</em>', 9);
+    $this->drupalCreateRole(['access content'], $rolename_a, '<em>' . $rolename_a . '</em>', 9);
 
     $rolename_b = 'b' . $this->randomMachineName(8);
-    $this->drupalCreateRole(array('access content'), $rolename_b, $rolename_b, 8);
+    $this->drupalCreateRole(['access content'], $rolename_b, $rolename_b, 8);
 
     $rolename_not_assigned = $this->randomMachineName(8);
-    $this->drupalCreateRole(array('access content'), $rolename_not_assigned, $rolename_not_assigned);
+    $this->drupalCreateRole(['access content'], $rolename_not_assigned, $rolename_not_assigned);
 
     // Add roles to user 1.
     $user = User::load(1);
diff --git a/web/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php b/web/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
index 6af16447e..39a3ec87c 100644
--- a/web/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
+++ b/web/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
@@ -18,13 +18,13 @@ class HandlerFieldUserNameTest extends UserTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_views_handler_field_user_name');
+  public static $testViews = ['test_views_handler_field_user_name'];
 
   public function testUserName() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
 
-    $new_user = $this->drupalCreateUser(array('access user profiles'));
+    $new_user = $this->drupalCreateUser(['access user profiles']);
     $this->drupalLogin($new_user);
 
     // Set defaults.
diff --git a/web/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php b/web/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php
index eaf24aa0f..c4f70656c 100644
--- a/web/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php
+++ b/web/core/modules/user/src/Tests/Views/HandlerFilterUserNameTest.php
@@ -19,47 +19,47 @@ class HandlerFilterUserNameTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'user_test_views');
+  public static $modules = ['views_ui', 'user_test_views'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_user_name');
+  public static $testViews = ['test_user_name'];
 
   /**
    * Accounts used by this test.
    *
    * @var array
    */
-  protected $accounts = array();
+  protected $accounts = [];
 
   /**
    * Usernames of $accounts.
    *
    * @var array
    */
-  protected $names = array();
+  protected $names = [];
 
   /**
    * Stores the column map for this testCase.
    *
    * @var array
    */
-  public $columnMap = array(
+  public $columnMap = [
     'uid' => 'uid',
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('user_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['user_test_views']);
 
     $this->enableViewsTestModule();
 
-    $this->accounts = array();
-    $this->names = array();
+    $this->accounts = [];
+    $this->names = [];
     for ($i = 0; $i < 3; $i++) {
       $this->accounts[] = $account = $this->drupalCreateUser();
       $this->names[] = $account->label();
@@ -74,10 +74,10 @@ class HandlerFilterUserNameTest extends ViewTestBase {
     $view = Views::getView('test_user_name');
 
     $view->initHandlers();
-    $view->filter['uid']->value = array($this->accounts[0]->id());
+    $view->filter['uid']->value = [$this->accounts[0]->id()];
 
     $this->executeView($view);
-    $this->assertIdenticalResultset($view, array(array('uid' => $this->accounts[0]->id())), $this->columnMap);
+    $this->assertIdenticalResultset($view, [['uid' => $this->accounts[0]->id()]], $this->columnMap);
 
     $this->assertEqual($view->filter['uid']->getValueOptions(), NULL);
   }
@@ -86,40 +86,40 @@ class HandlerFilterUserNameTest extends ViewTestBase {
    * Tests using the user interface.
    */
   public function testAdminUserInterface() {
-    $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
     $this->drupalLogin($admin_user);
 
     $path = 'admin/structure/views/nojs/handler/test_user_name/default/filter/uid';
     $this->drupalGet($path);
 
     // Pass in an invalid username, the validation should catch it.
-    $users = array($this->randomMachineName());
+    $users = [$this->randomMachineName()];
     $users = array_map('strtolower', $users);
-    $edit = array(
+    $edit = [
       'options[value]' => implode(', ', $users)
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Apply'));
-    $this->assertRaw(t('There are no entities matching "%value".', array('%value' => implode(', ', $users))));
+    $this->assertRaw(t('There are no entities matching "%value".', ['%value' => implode(', ', $users)]));
 
     // Pass in an invalid username and a valid username.
     $random_name = $this->randomMachineName();
-    $users = array($random_name, $this->names[0]);
+    $users = [$random_name, $this->names[0]];
     $users = array_map('strtolower', $users);
-    $edit = array(
+    $edit = [
       'options[value]' => implode(', ', $users)
-    );
-    $users = array($users[0]);
+    ];
+    $users = [$users[0]];
     $this->drupalPostForm($path, $edit, t('Apply'));
-    $this->assertRaw(t('There are no entities matching "%value".', array('%value' => implode(', ', $users))));
+    $this->assertRaw(t('There are no entities matching "%value".', ['%value' => implode(', ', $users)]));
 
     // Pass in just valid usernames.
     $users = $this->names;
     $users = array_map('strtolower', $users);
-    $edit = array(
+    $edit = [
       'options[value]' => implode(', ', $users)
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Apply'));
-    $this->assertNoRaw(t('There are no entities matching "%value".', array('%value' => implode(', ', $users))));
+    $this->assertNoRaw(t('There are no entities matching "%value".', ['%value' => implode(', ', $users)]));
   }
 
   /**
@@ -128,14 +128,14 @@ class HandlerFilterUserNameTest extends ViewTestBase {
   public function testExposedFilter() {
     $path = 'test_user_name';
 
-    $options = array();
+    $options = [];
 
     // Pass in an invalid username, the validation should catch it.
-    $users = array($this->randomMachineName());
+    $users = [$this->randomMachineName()];
     $users = array_map('strtolower', $users);
     $options['query']['uid'] = implode(', ', $users);
     $this->drupalGet($path, $options);
-    $this->assertRaw(t('There are no entities matching "%value".', array('%value' => implode(', ', $users))));
+    $this->assertRaw(t('There are no entities matching "%value".', ['%value' => implode(', ', $users)]));
 
     // Pass in an invalid target_id in for the entity_autocomplete value format.
     // There should be no errors, but all results should be returned as the
@@ -149,13 +149,13 @@ class HandlerFilterUserNameTest extends ViewTestBase {
     }
 
     // Pass in an invalid username and a valid username.
-    $users = array($this->randomMachineName(), $this->names[0]);
+    $users = [$this->randomMachineName(), $this->names[0]];
     $users = array_map('strtolower', $users);
     $options['query']['uid'] = implode(', ', $users);
-    $users = array($users[0]);
+    $users = [$users[0]];
 
     $this->drupalGet($path, $options);
-    $this->assertRaw(t('There are no entities matching "%value".', array('%value' => implode(', ', $users))));
+    $this->assertRaw(t('There are no entities matching "%value".', ['%value' => implode(', ', $users)]));
 
     // Pass in just valid usernames.
     $users = $this->names;
diff --git a/web/core/modules/user/src/Tests/Views/RelationshipRepresentativeNodeTest.php b/web/core/modules/user/src/Tests/Views/RelationshipRepresentativeNodeTest.php
index 3ad6346a5..14f44123e 100644
--- a/web/core/modules/user/src/Tests/Views/RelationshipRepresentativeNodeTest.php
+++ b/web/core/modules/user/src/Tests/Views/RelationshipRepresentativeNodeTest.php
@@ -16,7 +16,7 @@ class RelationshipRepresentativeNodeTest extends UserTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_groupwise_user');
+  public static $testViews = ['test_groupwise_user'];
 
   /**
    * Tests the relationship.
@@ -24,17 +24,17 @@ class RelationshipRepresentativeNodeTest extends UserTestBase {
   public function testRelationship() {
     $view = Views::getView('test_groupwise_user');
     $this->executeView($view);
-    $map = array('node_field_data_users_field_data_nid' => 'nid', 'uid' => 'uid');
-    $expected_result = array(
-      array(
+    $map = ['node_field_data_users_field_data_nid' => 'nid', 'uid' => 'uid'];
+    $expected_result = [
+      [
         'uid' => $this->users[1]->id(),
         'nid' => $this->nodes[1]->id(),
-      ),
-      array(
+      ],
+      [
         'uid' => $this->users[0]->id(),
         'nid' => $this->nodes[0]->id(),
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $map);
   }
 
diff --git a/web/core/modules/user/src/Tests/Views/RolesRidArgumentTest.php b/web/core/modules/user/src/Tests/Views/RolesRidArgumentTest.php
index a658b2202..58782e94c 100644
--- a/web/core/modules/user/src/Tests/Views/RolesRidArgumentTest.php
+++ b/web/core/modules/user/src/Tests/Views/RolesRidArgumentTest.php
@@ -15,7 +15,7 @@ class RolesRidArgumentTest extends UserTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_user_roles_rid');
+  public static $testViews = ['test_user_roles_rid'];
 
   /**
    * Tests the generated title of a user: roles argument.
diff --git a/web/core/modules/user/src/Tests/Views/UserChangedTest.php b/web/core/modules/user/src/Tests/Views/UserChangedTest.php
index 50e21e588..ddd7903e5 100644
--- a/web/core/modules/user/src/Tests/Views/UserChangedTest.php
+++ b/web/core/modules/user/src/Tests/Views/UserChangedTest.php
@@ -17,19 +17,19 @@ class UserChangedTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'user_test_views');
+  public static $modules = ['views_ui', 'user_test_views'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_user_changed');
+  public static $testViews = ['test_user_changed'];
 
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('user_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['user_test_views']);
 
     $this->enableViewsTestModule();
   }
@@ -40,7 +40,7 @@ class UserChangedTest extends ViewTestBase {
   public function testChangedField() {
     $path = 'test_user_changed';
 
-    $options = array();
+    $options = [];
 
     $this->drupalGet($path, $options);
 
diff --git a/web/core/modules/user/src/Tests/Views/UserDataTest.php b/web/core/modules/user/src/Tests/Views/UserDataTest.php
index a55eac5e7..4628ae2b7 100644
--- a/web/core/modules/user/src/Tests/Views/UserDataTest.php
+++ b/web/core/modules/user/src/Tests/Views/UserDataTest.php
@@ -24,7 +24,7 @@ class UserDataTest extends UserTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_user_data');
+  public static $testViews = ['test_user_data'];
 
   /**
    * Tests field handler.
diff --git a/web/core/modules/user/src/Tests/Views/UserTestBase.php b/web/core/modules/user/src/Tests/Views/UserTestBase.php
index 4c8007aeb..c49dcb237 100644
--- a/web/core/modules/user/src/Tests/Views/UserTestBase.php
+++ b/web/core/modules/user/src/Tests/Views/UserTestBase.php
@@ -16,31 +16,31 @@ abstract class UserTestBase extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('user_test_views', 'node');
+  public static $modules = ['user_test_views', 'node'];
 
   /**
    * Users to use during this test.
    *
    * @var array
    */
-  protected $users = array();
+  protected $users = [];
 
   /**
    * Nodes to use during this test.
    *
    * @var array
    */
-  protected $nodes = array();
+  protected $nodes = [];
 
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('user_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['user_test_views']);
 
     $this->users[] = $this->drupalCreateUser();
     $this->users[] = User::load(1);
-    $this->nodes[] = $this->drupalCreateNode(array('uid' => $this->users[0]->id()));
-    $this->nodes[] = $this->drupalCreateNode(array('uid' => 1));
+    $this->nodes[] = $this->drupalCreateNode(['uid' => $this->users[0]->id()]);
+    $this->nodes[] = $this->drupalCreateNode(['uid' => 1]);
   }
 
 }
diff --git a/web/core/modules/user/src/UserAccessControlHandler.php b/web/core/modules/user/src/UserAccessControlHandler.php
index 9c86758fd..712b32ab5 100644
--- a/web/core/modules/user/src/UserAccessControlHandler.php
+++ b/web/core/modules/user/src/UserAccessControlHandler.php
@@ -3,6 +3,7 @@
 namespace Drupal\user;
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Access\AccessResultNeutral;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Field\FieldDefinitionInterface;
@@ -56,6 +57,9 @@ class UserAccessControlHandler extends EntityAccessControlHandler {
         elseif ($account->id() == $entity->id()) {
           return AccessResult::allowed()->cachePerUser();
         }
+        else {
+          return AccessResultNeutral::neutral("The 'access user profiles' permission is required and the user must be active.");
+        }
         break;
 
       case 'update':
@@ -76,9 +80,9 @@ class UserAccessControlHandler extends EntityAccessControlHandler {
    */
   protected function checkFieldAccess($operation, FieldDefinitionInterface $field_definition, AccountInterface $account, FieldItemListInterface $items = NULL) {
     // Fields that are not implicitly allowed to administrative users.
-    $explicit_check_fields = array(
+    $explicit_check_fields = [
       'pass',
-    );
+    ];
 
     // Administrative users are allowed to edit and view all fields.
     if (!in_array($field_definition->getName(), $explicit_check_fields) && $account->hasPermission('administer users')) {
diff --git a/web/core/modules/user/src/UserAuth.php b/web/core/modules/user/src/UserAuth.php
index 9fbcf0948..43ce31b86 100644
--- a/web/core/modules/user/src/UserAuth.php
+++ b/web/core/modules/user/src/UserAuth.php
@@ -44,7 +44,7 @@ class UserAuth implements UserAuthInterface {
     $uid = FALSE;
 
     if (!empty($username) && strlen($password) > 0) {
-      $account_search = $this->entityManager->getStorage('user')->loadByProperties(array('name' => $username));
+      $account_search = $this->entityManager->getStorage('user')->loadByProperties(['name' => $username]);
 
       if ($account = reset($account_search)) {
         if ($this->passwordChecker->check($password, $account->getPassword())) {
diff --git a/web/core/modules/user/src/UserData.php b/web/core/modules/user/src/UserData.php
index 3418c8384..735c3de4e 100644
--- a/web/core/modules/user/src/UserData.php
+++ b/web/core/modules/user/src/UserData.php
@@ -50,7 +50,7 @@ class UserData implements UserDataInterface {
     }
     // If $module and $uid was passed, return the name/value pairs.
     elseif (isset($uid)) {
-      $return = array();
+      $return = [];
       foreach ($result as $record) {
         $return[$record->name] = ($record->serialized ? unserialize($record->value) : $record->value);
       }
@@ -58,7 +58,7 @@ class UserData implements UserDataInterface {
     }
     // If $module and $name was passed, return the uid/value pairs.
     elseif (isset($name)) {
-      $return = array();
+      $return = [];
       foreach ($result as $record) {
         $return[$record->uid] = ($record->serialized ? unserialize($record->value) : $record->value);
       }
@@ -66,7 +66,7 @@ class UserData implements UserDataInterface {
     }
     // If only $module was passed, return data keyed by uid and name.
     else {
-      $return = array();
+      $return = [];
       foreach ($result as $record) {
         $return[$record->uid][$record->name] = ($record->serialized ? unserialize($record->value) : $record->value);
       }
@@ -84,15 +84,15 @@ class UserData implements UserDataInterface {
       $serialized = 1;
     }
     $this->connection->merge('users_data')
-      ->keys(array(
+      ->keys([
         'uid' => $uid,
         'module' => $module,
         'name' => $name,
-      ))
-      ->fields(array(
+      ])
+      ->fields([
         'value' => $value,
         'serialized' => $serialized,
-      ))
+      ])
       ->execute();
   }
 
diff --git a/web/core/modules/user/src/UserInterface.php b/web/core/modules/user/src/UserInterface.php
index 1aea75762..6919e0d7b 100644
--- a/web/core/modules/user/src/UserInterface.php
+++ b/web/core/modules/user/src/UserInterface.php
@@ -13,6 +13,43 @@ use Drupal\Core\Session\AccountInterface;
  */
 interface UserInterface extends ContentEntityInterface, EntityChangedInterface, AccountInterface {
 
+  /**
+   * Maximum length of username text field.
+   *
+   * Keep this under 191 characters so we can use a unique constraint in MySQL.
+   */
+  const USERNAME_MAX_LENGTH = 60;
+
+  /**
+   * Only administrators can create user accounts.
+   */
+  const REGISTER_ADMINISTRATORS_ONLY = 'admin_only';
+
+  /**
+   * Visitors can create their own accounts.
+   */
+  const REGISTER_VISITORS = 'visitors';
+
+  /**
+   * Visitors can create accounts that only become active with admin approval.
+   */
+  const REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL = 'visitors_admin_approval';
+
+  /**
+   * New users will be set to the default time zone at registration.
+   */
+  const TIMEZONE_DEFAULT = 0;
+
+  /**
+   * New users will get an empty time zone at registration.
+   */
+  const TIMEZONE_EMPTY = 1;
+
+  /**
+   * New users will select their own timezone at registration.
+   */
+  const TIMEZONE_SELECT = 2;
+
   /**
    * Whether a user has a certain role.
    *
diff --git a/web/core/modules/user/src/UserListBuilder.php b/web/core/modules/user/src/UserListBuilder.php
index 1692f5a5b..306d04609 100644
--- a/web/core/modules/user/src/UserListBuilder.php
+++ b/web/core/modules/user/src/UserListBuilder.php
@@ -8,7 +8,6 @@ use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Routing\RedirectDestinationInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -19,13 +18,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class UserListBuilder extends EntityListBuilder {
 
-  /**
-   * The entity query factory.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $queryFactory;
-
   /**
    * The date formatter service.
    *
@@ -47,16 +39,13 @@ class UserListBuilder extends EntityListBuilder {
    *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageInterface $storage
    *   The entity storage class.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The entity query factory.
    * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
    *   The date formatter service.
    * @param \Drupal\Core\Routing\RedirectDestinationInterface $redirect_destination
    *   The redirect destination service.
    */
-  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, QueryFactory $query_factory, DateFormatterInterface $date_formatter, RedirectDestinationInterface $redirect_destination) {
+  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, DateFormatterInterface $date_formatter, RedirectDestinationInterface $redirect_destination) {
     parent::__construct($entity_type, $storage);
-    $this->queryFactory = $query_factory;
     $this->dateFormatter = $date_formatter;
     $this->redirectDestination = $redirect_destination;
   }
@@ -68,7 +57,6 @@ class UserListBuilder extends EntityListBuilder {
     return new static(
       $entity_type,
       $container->get('entity.manager')->getStorage($entity_type->id()),
-      $container->get('entity.query'),
       $container->get('date.formatter'),
       $container->get('redirect.destination')
     );
@@ -78,7 +66,7 @@ class UserListBuilder extends EntityListBuilder {
    * {@inheritdoc}
    */
   public function load() {
-    $entity_query = $this->queryFactory->get('user');
+    $entity_query = $this->storage->getQuery();
     $entity_query->condition('uid', 0, '<>');
     $entity_query->pager(50);
     $header = $this->buildHeader();
@@ -91,36 +79,36 @@ class UserListBuilder extends EntityListBuilder {
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header = array(
-      'username' => array(
+    $header = [
+      'username' => [
         'data' => $this->t('Username'),
         'field' => 'name',
         'specifier' => 'name',
-      ),
-      'status' => array(
+      ],
+      'status' => [
         'data' => $this->t('Status'),
         'field' => 'status',
         'specifier' => 'status',
-        'class' => array(RESPONSIVE_PRIORITY_LOW),
-      ),
-      'roles' => array(
+        'class' => [RESPONSIVE_PRIORITY_LOW],
+      ],
+      'roles' => [
         'data' => $this->t('Roles'),
-        'class' => array(RESPONSIVE_PRIORITY_LOW),
-      ),
-      'member_for' => array(
+        'class' => [RESPONSIVE_PRIORITY_LOW],
+      ],
+      'member_for' => [
         'data' => $this->t('Member for'),
         'field' => 'created',
         'specifier' => 'created',
         'sort' => 'desc',
-        'class' => array(RESPONSIVE_PRIORITY_LOW),
-      ),
-      'access' => array(
+        'class' => [RESPONSIVE_PRIORITY_LOW],
+      ],
+      'access' => [
         'data' => $this->t('Last access'),
         'field' => 'access',
         'specifier' => 'access',
-        'class' => array(RESPONSIVE_PRIORITY_LOW),
-      ),
-    );
+        'class' => [RESPONSIVE_PRIORITY_LOW],
+      ],
+    ];
     return $header + parent::buildHeader();
   }
 
@@ -128,25 +116,25 @@ class UserListBuilder extends EntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    $row['username']['data'] = array(
+    $row['username']['data'] = [
       '#theme' => 'username',
       '#account' => $entity,
-    );
+    ];
     $row['status'] = $entity->isActive() ? $this->t('active') : $this->t('blocked');
 
     $roles = user_role_names(TRUE);
     unset($roles[RoleInterface::AUTHENTICATED_ID]);
-    $users_roles = array();
+    $users_roles = [];
     foreach ($entity->getRoles() as $role) {
       if (isset($roles[$role])) {
         $users_roles[] = $roles[$role];
       }
     }
     asort($users_roles);
-    $row['roles']['data'] = array(
+    $row['roles']['data'] = [
       '#theme' => 'item_list',
       '#items' => $users_roles,
-    );
+    ];
     $options = [
       'return_as_object' => TRUE,
     ];
diff --git a/web/core/modules/user/src/UserStorage.php b/web/core/modules/user/src/UserStorage.php
index 9759d270a..809f3e384 100644
--- a/web/core/modules/user/src/UserStorage.php
+++ b/web/core/modules/user/src/UserStorage.php
@@ -40,11 +40,11 @@ class UserStorage extends SqlContentEntityStorage implements UserStorageInterfac
    */
   public function updateLastLoginTimestamp(UserInterface $account) {
     $this->database->update('users_field_data')
-      ->fields(array('login' => $account->getLastLoginTime()))
+      ->fields(['login' => $account->getLastLoginTime()])
       ->condition('uid', $account->id())
       ->execute();
     // Ensure that the entity cache is cleared.
-    $this->resetCache(array($account->id()));
+    $this->resetCache([$account->id()]);
   }
 
   /**
@@ -52,13 +52,13 @@ class UserStorage extends SqlContentEntityStorage implements UserStorageInterfac
    */
   public function updateLastAccessTimestamp(AccountInterface $account, $timestamp) {
     $this->database->update('users_field_data')
-      ->fields(array(
+      ->fields([
         'access' => $timestamp,
-      ))
+      ])
       ->condition('uid', $account->id())
       ->execute();
     // Ensure that the entity cache is cleared.
-    $this->resetCache(array($account->id()));
+    $this->resetCache([$account->id()]);
   }
 
   /**
@@ -67,8 +67,8 @@ class UserStorage extends SqlContentEntityStorage implements UserStorageInterfac
   public function deleteRoleReferences(array $rids) {
     // Remove the role from all users.
     $this->database->delete('user__roles')
-        ->condition('roles_target_id', $rids)
-        ->execute();
+      ->condition('roles_target_id', $rids)
+      ->execute();
 
     $this->resetCache();
   }
diff --git a/web/core/modules/user/src/UserStorageSchema.php b/web/core/modules/user/src/UserStorageSchema.php
index c8c3e46e8..5e590b895 100644
--- a/web/core/modules/user/src/UserStorageSchema.php
+++ b/web/core/modules/user/src/UserStorageSchema.php
@@ -17,9 +17,9 @@ class UserStorageSchema extends SqlContentEntityStorageSchema {
   protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $reset = FALSE) {
     $schema = parent::getEntitySchema($entity_type, $reset);
 
-    $schema['users_field_data']['unique keys'] += array(
-      'user__name' => array('name', 'langcode'),
-    );
+    $schema['users_field_data']['unique keys'] += [
+      'user__name' => ['name', 'langcode'],
+    ];
 
     return $schema;
   }
diff --git a/web/core/modules/user/src/UserViewsData.php b/web/core/modules/user/src/UserViewsData.php
index e2229112e..2c7911479 100644
--- a/web/core/modules/user/src/UserViewsData.php
+++ b/web/core/modules/user/src/UserViewsData.php
@@ -21,15 +21,15 @@ class UserViewsData extends EntityViewsData {
     $data['users_field_data']['table']['wizard_id'] = 'user';
 
     $data['users_field_data']['uid']['argument']['id'] = 'user_uid';
-    $data['users_field_data']['uid']['argument'] += array(
+    $data['users_field_data']['uid']['argument'] += [
       'name table' => 'users_field_data',
       'name field' => 'name',
       'empty field name' => \Drupal::config('user.settings')->get('anonymous'),
-    );
+    ];
     $data['users_field_data']['uid']['filter']['id'] = 'user_name';
     $data['users_field_data']['uid']['filter']['title'] = $this->t('Name (autocomplete)');
     $data['users_field_data']['uid']['filter']['help'] = $this->t('The user or author name. Uses an autocomplete widget to find a user name, the actual filter uses the resulting user ID.');
-    $data['users_field_data']['uid']['relationship'] = array(
+    $data['users_field_data']['uid']['relationship'] = [
       'title' => $this->t('Content authored'),
       'help' => $this->t('Relate content to the user who created it. This relationship will create one record for each content item created by the user.'),
       'id' => 'standard',
@@ -37,19 +37,19 @@ class UserViewsData extends EntityViewsData {
       'base field' => 'uid',
       'field' => 'uid',
       'label' => $this->t('nodes'),
-    );
+    ];
 
-    $data['users_field_data']['uid_raw'] = array(
+    $data['users_field_data']['uid_raw'] = [
       'help' => $this->t('The raw numeric user ID.'),
       'real field' => 'uid',
-      'filter' => array(
+      'filter' => [
         'title' => $this->t('The user ID'),
         'id' => 'numeric',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['uid_representative'] = array(
-      'relationship' => array(
+    $data['users_field_data']['uid_representative'] = [
+      'relationship' => [
         'title' => $this->t('Representative node'),
         'label'  => $this->t('Representative node'),
         'help' => $this->t('Obtains a single representative node for each user, according to a chosen sort criterion.'),
@@ -61,18 +61,18 @@ class UserViewsData extends EntityViewsData {
         'base' => 'node_field_data',
         'field' => 'nid',
         'relationship' => 'node_field_data:uid'
-      ),
-    );
+      ],
+    ];
 
-    $data['users']['uid_current'] = array(
+    $data['users']['uid_current'] = [
       'real field' => 'uid',
       'title' => $this->t('Current'),
       'help' => $this->t('Filter the view to the currently logged in user.'),
-      'filter' => array(
+      'filter' => [
         'id' => 'user_current',
         'type' => 'yes-no',
-      ),
-    );
+      ],
+    ];
 
     $data['users_field_data']['name']['help'] = $this->t('The user or author name.');
     $data['users_field_data']['name']['field']['default_formatter'] = 'user_name';
@@ -90,178 +90,178 @@ class UserViewsData extends EntityViewsData {
     $data['users_field_data']['preferred_admin_langcode']['title'] = $this->t('Preferred admin language');
     $data['users_field_data']['preferred_admin_langcode']['help'] = $this->t('Preferred administrative language of the user');
 
-    $data['users_field_data']['created_fulldate'] = array(
+    $data['users_field_data']['created_fulldate'] = [
       'title' => $this->t('Created date'),
       'help' => $this->t('Date in the form of CCYYMMDD.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_fulldate',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['created_year_month'] = array(
+    $data['users_field_data']['created_year_month'] = [
       'title' => $this->t('Created year + month'),
       'help' => $this->t('Date in the form of YYYYMM.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_year_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['created_year'] = array(
+    $data['users_field_data']['created_year'] = [
       'title' => $this->t('Created year'),
       'help' => $this->t('Date in the form of YYYY.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_year',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['created_month'] = array(
+    $data['users_field_data']['created_month'] = [
       'title' => $this->t('Created month'),
       'help' => $this->t('Date in the form of MM (01 - 12).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['created_day'] = array(
+    $data['users_field_data']['created_day'] = [
       'title' => $this->t('Created day'),
       'help' => $this->t('Date in the form of DD (01 - 31).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_day',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['created_week'] = array(
+    $data['users_field_data']['created_week'] = [
       'title' => $this->t('Created week'),
       'help' => $this->t('Date in the form of WW (01 - 53).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'created',
         'id' => 'date_week',
-      ),
-    );
+      ],
+    ];
 
     $data['users_field_data']['status']['filter']['label'] = $this->t('Active');
     $data['users_field_data']['status']['filter']['type'] = 'yes-no';
 
     $data['users_field_data']['changed']['title'] = $this->t('Updated date');
 
-    $data['users_field_data']['changed_fulldate'] = array(
+    $data['users_field_data']['changed_fulldate'] = [
       'title' => $this->t('Updated date'),
       'help' => $this->t('Date in the form of CCYYMMDD.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_fulldate',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['changed_year_month'] = array(
+    $data['users_field_data']['changed_year_month'] = [
       'title' => $this->t('Updated year + month'),
       'help' => $this->t('Date in the form of YYYYMM.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_year_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['changed_year'] = array(
+    $data['users_field_data']['changed_year'] = [
       'title' => $this->t('Updated year'),
       'help' => $this->t('Date in the form of YYYY.'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_year',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['changed_month'] = array(
+    $data['users_field_data']['changed_month'] = [
       'title' => $this->t('Updated month'),
       'help' => $this->t('Date in the form of MM (01 - 12).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_month',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['changed_day'] = array(
+    $data['users_field_data']['changed_day'] = [
       'title' => $this->t('Updated day'),
       'help' => $this->t('Date in the form of DD (01 - 31).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_day',
-      ),
-    );
+      ],
+    ];
 
-    $data['users_field_data']['changed_week'] = array(
+    $data['users_field_data']['changed_week'] = [
       'title' => $this->t('Updated week'),
       'help' => $this->t('Date in the form of WW (01 - 53).'),
-      'argument' => array(
+      'argument' => [
         'field' => 'changed',
         'id' => 'date_week',
-      ),
-    );
+      ],
+    ];
 
-    $data['users']['data'] = array(
+    $data['users']['data'] = [
       'title' => $this->t('Data'),
       'help' => $this->t('Provides access to the user data service.'),
       'real field' => 'uid',
-      'field' => array(
+      'field' => [
         'id' => 'user_data',
-      ),
-    );
+      ],
+    ];
 
-    $data['users']['user_bulk_form'] = array(
+    $data['users']['user_bulk_form'] = [
       'title' => $this->t('Bulk update'),
       'help' => $this->t('Add a form element that lets you run operations on multiple users.'),
-      'field' => array(
+      'field' => [
         'id' => 'user_bulk_form',
-      ),
-    );
+      ],
+    ];
 
     $data['user__roles']['table']['group']  = $this->t('User');
 
-    $data['user__roles']['table']['join'] = array(
-      'users_field_data' => array(
+    $data['user__roles']['table']['join'] = [
+      'users_field_data' => [
         'left_field' => 'uid',
         'field' => 'entity_id',
-      ),
-    );
+      ],
+    ];
 
-    $data['user__roles']['roles_target_id'] = array(
+    $data['user__roles']['roles_target_id'] = [
       'title' => $this->t('Roles'),
       'help' => $this->t('Roles that a user belongs to.'),
-      'field' => array(
+      'field' => [
         'id' => 'user_roles',
         'no group by' => TRUE,
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'user_roles',
         'allow empty' => TRUE,
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'user__roles_rid',
         'name table' => 'role',
         'name field' => 'name',
         'empty field name' => $this->t('No role'),
         'zero is null' => TRUE,
         'numeric' => TRUE,
-      ),
-    );
+      ],
+    ];
 
-    $data['user__roles']['permission'] = array(
+    $data['user__roles']['permission'] = [
       'title' => $this->t('Permission'),
       'help' => $this->t('The user permissions.'),
-      'field' => array(
+      'field' => [
         'id' => 'user_permissions',
         'no group by' => TRUE,
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'user_permissions',
         'real field' => 'roles_target_id',
-      ),
-    );
+      ],
+    ];
 
     return $data;
   }
diff --git a/web/core/modules/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php b/web/core/modules/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php
index 75ec703f8..eaa2a9a61 100644
--- a/web/core/modules/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php
+++ b/web/core/modules/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php
@@ -14,9 +14,9 @@ $connection = Database::getConnection();
 // already.
 $connection->delete('config')->condition('name', 'user.mail')->execute();
 $connection->insert('config')
-  ->fields(array('collection', 'name', 'data'))
-  ->values(array(
+  ->fields(['collection', 'name', 'data'])
+  ->values([
   'collection' => '',
   'name' => 'user.mail',
   'data' => "a:10:{s:14:\"cancel_confirm\";a:2:{s:4:\"body\";s:369:\"[user:name],\n\nA request to cancel your account has been made at [site:name].\n\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\n\n[user:cancel-url]\n\nNOTE: The cancellation of your account is not reversible.\n\nThis link expires in one day and nothing will happen if it is not used.\n\n--  [site:name] team\";s:7:\"subject\";s:59:\"Account cancellation request for [user:name] at [site:name]\";}s:14:\"password_reset\";a:2:{s:4:\"body\";s:397:\"[user:name],\n\nA request to reset the password for your account has been made at [site:name].\n\nYou may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\n\n--  [site:name] team\";s:7:\"subject\";s:60:\"Replacement login information for [user:name] at [site:name]\";}s:22:\"register_admin_created\";a:2:{s:4:\"body\";s:463:\"[user:name],\n\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n--  [site:name] team\";s:7:\"subject\";s:58:\"An administrator created an account for you at [site:name]\";}s:29:\"register_no_approval_required\";a:2:{s:4:\"body\";s:437:\"[user:name],\n\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n--  [site:name] team\";s:7:\"subject\";s:46:\"Account details for [user:name] at [site:name]\";}s:25:\"register_pending_approval\";a:2:{s:4:\"body\";s:281:\"[user:name],\n\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n\n--  [site:name] team\";s:7:\"subject\";s:71:\"Account details for [user:name] at [site:name] (pending admin approval)\";}s:31:\"register_pending_approval_admin\";a:2:{s:4:\"body\";s:56:\"[user:name] has applied for an account.\n\n[user:edit-url]\";s:7:\"subject\";s:71:\"Account details for [user:name] at [site:name] (pending admin approval)\";}s:16:\"status_activated\";a:2:{s:4:\"body\";s:446:\"[user:name],\n\nYour account at [site:name] has been activated.\n\nYou may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n--  [site:name] team\";s:7:\"subject\";s:57:\"Account details for [user:name] at [site:name] (approved)\";}s:14:\"status_blocked\";a:2:{s:4:\"body\";s:89:\"[user:name],\n\nYour account on [site:account-name] has been blocked.\n\n--  [site:name] team\";s:7:\"subject\";s:56:\"Account details for [user:name] at [site:name] (blocked)\";}s:15:\"status_canceled\";a:2:{s:4:\"body\";s:82:\"[user:name],\n\nYour account on [site:name] has been canceled.\n\n--  [site:name] team\";s:7:\"subject\";s:57:\"Account details for [user:name] at [site:name] (canceled)\";}s:8:\"langcode\";s:2:\"en\";}"
-))->execute();
+])->execute();
diff --git a/web/core/modules/user/tests/modules/user_hooks_test/user_hooks_test.module b/web/core/modules/user/tests/modules/user_hooks_test/user_hooks_test.module
index a036c65c6..9baf8ab4d 100644
--- a/web/core/modules/user/tests/modules/user_hooks_test/user_hooks_test.module
+++ b/web/core/modules/user/tests/modules/user_hooks_test/user_hooks_test.module
@@ -13,7 +13,7 @@ use Drupal\Component\Utility\SafeMarkup;
 function user_hooks_test_user_format_name_alter(&$name, $account) {
   if (\Drupal::state()->get('user_hooks_test_user_format_name_alter', FALSE)) {
     if (\Drupal::state()->get('user_hooks_test_user_format_name_alter_safe', FALSE)) {
-      $name = SafeMarkup::format('<em>@uid</em>', array('@uid' => $account->id()));
+      $name = SafeMarkup::format('<em>@uid</em>', ['@uid' => $account->id()]);
     }
     else {
       $name = '<em>' . $account->id() . '</em>';
diff --git a/web/core/modules/user/src/Tests/UserCacheTagsTest.php b/web/core/modules/user/tests/src/Functional/UserCacheTagsTest.php
similarity index 93%
rename from web/core/modules/user/src/Tests/UserCacheTagsTest.php
rename to web/core/modules/user/tests/src/Functional/UserCacheTagsTest.php
index 8dc7437fb..a9e98575b 100644
--- a/web/core/modules/user/src/Tests/UserCacheTagsTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserCacheTagsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
 use Drupal\user\Entity\Role;
@@ -17,7 +17,7 @@ class UserCacheTagsTest extends EntityWithUriCacheTagsTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('user');
+  public static $modules = ['user'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/user/src/Tests/UserCreateFailMailTest.php b/web/core/modules/user/tests/src/Functional/UserCreateFailMailTest.php
similarity index 73%
rename from web/core/modules/user/src/Tests/UserCreateFailMailTest.php
rename to web/core/modules/user/tests/src/Functional/UserCreateFailMailTest.php
index a51229a30..38f2514a4 100644
--- a/web/core/modules/user/src/Tests/UserCreateFailMailTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserCreateFailMailTest.php
@@ -1,45 +1,45 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the create user administration page.
  *
  * @group user
  */
-class UserCreateFailMailTest extends WebTestBase {
+class UserCreateFailMailTest extends BrowserTestBase {
 
   /**
    * Modules to enable
    *
    * @var array
    */
-  public static $modules = array('system_mail_failure_test');
+  public static $modules = ['system_mail_failure_test'];
 
   /**
    * Tests the create user administration page.
    */
   public function testUserAdd() {
-    $user = $this->drupalCreateUser(array('administer users'));
+    $user = $this->drupalCreateUser(['administer users']);
     $this->drupalLogin($user);
 
     // Replace the mail functionality with a fake, malfunctioning service.
     $this->config('system.mail')->set('interface.default', 'test_php_mail_failure')->save();
     // Create a user, but fail to send an email.
     $name = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'name' => $name,
       'mail' => $this->randomMachineName() . '@example.com',
       'pass[pass1]' => $pass = $this->randomString(),
       'pass[pass2]' => $pass,
       'notify' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/people/create', $edit, t('Create new account'));
 
     $this->assertText(t('Unable to send email. Contact the site administrator if the problem persists.'));
-    $this->assertNoText(t('A welcome message with further instructions has been emailed to the new user @name.', array('@name' => $edit['name'])));
+    $this->assertNoText(t('A welcome message with further instructions has been emailed to the new user @name.', ['@name' => $edit['name']]));
   }
 
 }
diff --git a/web/core/modules/user/src/Tests/UserDeleteTest.php b/web/core/modules/user/tests/src/Functional/UserDeleteTest.php
similarity index 66%
rename from web/core/modules/user/src/Tests/UserDeleteTest.php
rename to web/core/modules/user/tests/src/Functional/UserDeleteTest.php
index dbb3002a5..5803a049a 100644
--- a/web/core/modules/user/src/Tests/UserDeleteTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserDeleteTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -10,23 +10,23 @@ use Drupal\user\Entity\User;
  *
  * @group user
  */
-class UserDeleteTest extends WebTestBase {
+class UserDeleteTest extends BrowserTestBase {
 
   /**
    * Test deleting multiple users.
    */
-  function testUserDeleteMultiple() {
+  public function testUserDeleteMultiple() {
     // Create a few users with permissions, so roles will be created.
-    $user_a = $this->drupalCreateUser(array('access user profiles'));
-    $user_b = $this->drupalCreateUser(array('access user profiles'));
-    $user_c = $this->drupalCreateUser(array('access user profiles'));
+    $user_a = $this->drupalCreateUser(['access user profiles']);
+    $user_b = $this->drupalCreateUser(['access user profiles']);
+    $user_c = $this->drupalCreateUser(['access user profiles']);
 
-    $uids = array($user_a->id(), $user_b->id(), $user_c->id());
+    $uids = [$user_a->id(), $user_b->id(), $user_c->id()];
 
     // These users should have a role
     $query = db_select('user__roles', 'r');
     $roles_created = $query
-      ->fields('r', array('entity_id'))
+      ->fields('r', ['entity_id'])
       ->condition('entity_id', $uids, 'IN')
       ->countQuery()
       ->execute()
@@ -40,16 +40,16 @@ class UserDeleteTest extends WebTestBase {
     // Test if the roles assignments are deleted.
     $query = db_select('user__roles', 'r');
     $roles_after_deletion = $query
-      ->fields('r', array('entity_id'))
+      ->fields('r', ['entity_id'])
       ->condition('entity_id', $uids, 'IN')
       ->countQuery()
       ->execute()
       ->fetchField();
     $this->assertTrue($roles_after_deletion == 0, 'Role assignments deleted along with users');
     // Test if the users are deleted, User::load() will return NULL.
-    $this->assertNull(User::load($user_a->id()), format_string('User with id @uid deleted.', array('@uid' => $user_a->id())));
-    $this->assertNull(User::load($user_b->id()), format_string('User with id @uid deleted.', array('@uid' => $user_b->id())));
-    $this->assertNull(User::load($user_c->id()), format_string('User with id @uid deleted.', array('@uid' => $user_c->id())));
+    $this->assertNull(User::load($user_a->id()), format_string('User with id @uid deleted.', ['@uid' => $user_a->id()]));
+    $this->assertNull(User::load($user_b->id()), format_string('User with id @uid deleted.', ['@uid' => $user_b->id()]));
+    $this->assertNull(User::load($user_c->id()), format_string('User with id @uid deleted.', ['@uid' => $user_c->id()]));
   }
 
 }
diff --git a/web/core/modules/user/src/Tests/UserEditedOwnAccountTest.php b/web/core/modules/user/tests/src/Functional/UserEditedOwnAccountTest.php
similarity index 71%
rename from web/core/modules/user/src/Tests/UserEditedOwnAccountTest.php
rename to web/core/modules/user/tests/src/Functional/UserEditedOwnAccountTest.php
index 6c058bfac..a6f4bede5 100644
--- a/web/core/modules/user/src/Tests/UserEditedOwnAccountTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserEditedOwnAccountTest.php
@@ -1,34 +1,34 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests user edited own account can still log in.
  *
  * @group user
  */
-class UserEditedOwnAccountTest extends WebTestBase {
+class UserEditedOwnAccountTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('user_form_test');
+  public static $modules = ['user_form_test'];
 
-  function testUserEditedOwnAccount() {
+  public function testUserEditedOwnAccount() {
     // Change account setting 'Who can register accounts?' to Administrators
     // only.
     $this->config('user.settings')->set('register', USER_REGISTER_ADMINISTRATORS_ONLY)->save();
 
     // Create a new user account and log in.
-    $account = $this->drupalCreateUser(array('change own username'));
+    $account = $this->drupalCreateUser(['change own username']);
     $this->drupalLogin($account);
 
     // Change own username.
-    $edit = array();
+    $edit = [];
     $edit['name'] = $this->randomMachineName();
     $this->drupalPostForm('user/' . $account->id() . '/edit', $edit, t('Save'));
 
diff --git a/web/core/modules/user/src/Tests/UserEntityCallbacksTest.php b/web/core/modules/user/tests/src/Functional/UserEntityCallbacksTest.php
similarity index 88%
rename from web/core/modules/user/src/Tests/UserEntityCallbacksTest.php
rename to web/core/modules/user/tests/src/Functional/UserEntityCallbacksTest.php
index 944b352c9..feea805af 100644
--- a/web/core/modules/user/src/Tests/UserEntityCallbacksTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserEntityCallbacksTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -11,14 +11,14 @@ use Drupal\user\Entity\User;
  *
  * @group user
  */
-class UserEntityCallbacksTest extends WebTestBase {
+class UserEntityCallbacksTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('user', 'user_hooks_test');
+  public static $modules = ['user', 'user_hooks_test'];
 
   /**
    * An authenticated user to use for testing.
@@ -44,7 +44,7 @@ class UserEntityCallbacksTest extends WebTestBase {
   /**
    * Test label callback.
    */
-  function testLabelCallback() {
+  public function testLabelCallback() {
     $this->assertEqual($this->account->label(), $this->account->getUsername(), 'The username should be used as label');
 
     // Setup a random anonymous name to be sure the name is used.
diff --git a/web/core/modules/user/src/Tests/UserLanguageTest.php b/web/core/modules/user/tests/src/Functional/UserLanguageTest.php
similarity index 82%
rename from web/core/modules/user/src/Tests/UserLanguageTest.php
rename to web/core/modules/user/tests/src/Functional/UserLanguageTest.php
index 5c5f73f05..0e6c0f1a7 100644
--- a/web/core/modules/user/src/Tests/UserLanguageTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserLanguageTest.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Functional tests for a user's ability to change their default language.
  *
  * @group user
  */
-class UserLanguageTest extends WebTestBase {
+class UserLanguageTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('user', 'language');
+  public static $modules = ['user', 'language'];
 
   /**
    * Test if user can change their default language.
    */
-  function testUserLanguageConfiguration() {
+  public function testUserLanguageConfiguration() {
     // User to add and remove language.
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
     // User to change their default language.
     $web_user = $this->drupalCreateUser();
 
@@ -34,12 +34,12 @@ class UserLanguageTest extends WebTestBase {
     $langcode = 'xx';
     // The English name for the language.
     $name = $this->randomMachineName(16);
-    $edit = array(
+    $edit = [
       'predefined_langcode' => 'custom',
       'langcode' => $langcode,
       'label' => $name,
       'direction' => LanguageInterface::DIRECTION_LTR,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
     $this->drupalLogout();
 
@@ -52,9 +52,9 @@ class UserLanguageTest extends WebTestBase {
     // Ensure custom language is present.
     $this->assertText($name, 'Language present on form.');
     // Switch to our custom language.
-    $edit = array(
+    $edit = [
       'preferred_langcode' => $langcode,
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Save'));
     // Ensure form was submitted successfully.
     $this->assertText(t('The changes have been saved.'), 'Changes were saved.');
diff --git a/web/core/modules/user/src/Tests/UserMailNotifyTest.php b/web/core/modules/user/tests/src/Functional/UserMailNotifyTest.php
similarity index 96%
rename from web/core/modules/user/src/Tests/UserMailNotifyTest.php
rename to web/core/modules/user/tests/src/Functional/UserMailNotifyTest.php
index 9943c5b73..57bebc042 100644
--- a/web/core/modules/user/src/Tests/UserMailNotifyTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserMailNotifyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\Core\Test\AssertMailTrait;
 use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
@@ -49,7 +49,7 @@ class UserMailNotifyTest extends EntityKernelTestBase {
     $return = _user_mail_notify($op, $this->createUser());
     $this->assertTrue($return, '_user_mail_notify() returns TRUE.');
     foreach ($mail_keys as $key) {
-      $filter = array('key' => $key);
+      $filter = ['key' => $key];
       $this->assertNotEmpty($this->getMails($filter), "Mails with $key exists.");
     }
     $this->assertCount(count($mail_keys), $this->getMails(), 'The expected number of emails sent.');
diff --git a/web/core/modules/user/src/Tests/UserRolesAssignmentTest.php b/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
similarity index 76%
rename from web/core/modules/user/src/Tests/UserRolesAssignmentTest.php
rename to web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
index 485bd2f38..fc8958c09 100644
--- a/web/core/modules/user/src/Tests/UserRolesAssignmentTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that users can be assigned and unassigned roles.
  *
  * @group user
  */
-class UserRolesAssignmentTest extends WebTestBase {
+class UserRolesAssignmentTest extends BrowserTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $admin_user = $this->drupalCreateUser(array('administer permissions', 'administer users'));
+    $admin_user = $this->drupalCreateUser(['administer permissions', 'administer users']);
     $this->drupalLogin($admin_user);
   }
 
@@ -21,18 +21,18 @@ class UserRolesAssignmentTest extends WebTestBase {
    * Tests that a user can be assigned a role and that the role can be removed
    * again.
    */
-  function testAssignAndRemoveRole()  {
-    $rid = $this->drupalCreateRole(array('administer users'));
+  public function testAssignAndRemoveRole()  {
+    $rid = $this->drupalCreateRole(['administer users']);
     $account = $this->drupalCreateUser();
 
     // Assign the role to the user.
-    $this->drupalPostForm('user/' . $account->id() . '/edit', array("roles[$rid]" => $rid), t('Save'));
+    $this->drupalPostForm('user/' . $account->id() . '/edit', ["roles[$rid]" => $rid], t('Save'));
     $this->assertText(t('The changes have been saved.'));
     $this->assertFieldChecked('edit-roles-' . $rid, 'Role is assigned.');
     $this->userLoadAndCheckRoleAssigned($account, $rid);
 
     // Remove the role from the user.
-    $this->drupalPostForm('user/' . $account->id() . '/edit', array("roles[$rid]" => FALSE), t('Save'));
+    $this->drupalPostForm('user/' . $account->id() . '/edit', ["roles[$rid]" => FALSE], t('Save'));
     $this->assertText(t('The changes have been saved.'));
     $this->assertNoFieldChecked('edit-roles-' . $rid, 'Role is removed from user.');
     $this->userLoadAndCheckRoleAssigned($account, $rid, FALSE);
@@ -42,18 +42,18 @@ class UserRolesAssignmentTest extends WebTestBase {
    * Tests that when creating a user the role can be assigned. And that it can
    * be removed again.
    */
-  function testCreateUserWithRole() {
-    $rid = $this->drupalCreateRole(array('administer users'));
+  public function testCreateUserWithRole() {
+    $rid = $this->drupalCreateRole(['administer users']);
     // Create a new user and add the role at the same time.
-    $edit = array(
+    $edit = [
       'name' => $this->randomMachineName(),
       'mail' => $this->randomMachineName() . '@example.com',
       'pass[pass1]' => $pass = $this->randomString(),
       'pass[pass2]' => $pass,
       "roles[$rid]" => $rid,
-    );
+    ];
     $this->drupalPostForm('admin/people/create', $edit, t('Create new account'));
-    $this->assertText(t('Created a new user account for @name.', array('@name' => $edit['name'])));
+    $this->assertText(t('Created a new user account for @name.', ['@name' => $edit['name']]));
     // Get the newly added user.
     $account = user_load_by_name($edit['name']);
 
@@ -62,7 +62,7 @@ class UserRolesAssignmentTest extends WebTestBase {
     $this->userLoadAndCheckRoleAssigned($account, $rid);
 
     // Remove the role again.
-    $this->drupalPostForm('user/' . $account->id() . '/edit', array("roles[$rid]" => FALSE), t('Save'));
+    $this->drupalPostForm('user/' . $account->id() . '/edit', ["roles[$rid]" => FALSE], t('Save'));
     $this->assertText(t('The changes have been saved.'));
     $this->assertNoFieldChecked('edit-roles-' . $rid, 'Role is removed from user.');
     $this->userLoadAndCheckRoleAssigned($account, $rid, FALSE);
@@ -81,7 +81,7 @@ class UserRolesAssignmentTest extends WebTestBase {
    */
   private function userLoadAndCheckRoleAssigned($account, $rid, $is_assigned = TRUE) {
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
-    $user_storage->resetCache(array($account->id()));
+    $user_storage->resetCache([$account->id()]);
     $account = $user_storage->load($account->id());
     if ($is_assigned) {
       $this->assertFalse(array_search($rid, $account->getRoles()) === FALSE, 'The role is present in the user object.');
diff --git a/web/core/modules/user/src/Tests/UserSaveTest.php b/web/core/modules/user/tests/src/Functional/UserSaveTest.php
similarity index 87%
rename from web/core/modules/user/src/Tests/UserSaveTest.php
rename to web/core/modules/user/tests/src/Functional/UserSaveTest.php
index 6a454eee7..c693b39ce 100644
--- a/web/core/modules/user/src/Tests/UserSaveTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserSaveTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -10,12 +10,12 @@ use Drupal\user\Entity\User;
  *
  * @group user
  */
-class UserSaveTest extends WebTestBase {
+class UserSaveTest extends BrowserTestBase {
 
   /**
    * Test creating a user with arbitrary uid.
    */
-  function testUserImport() {
+  public function testUserImport() {
     // User ID must be a number that is not in the database.
 
     $uids = \Drupal::entityManager()->getStorage('user')->getQuery()
@@ -48,7 +48,7 @@ class UserSaveTest extends WebTestBase {
   /**
    * Ensures that an existing password is unset after the user was saved.
    */
-  function testExistingPasswordRemoval() {
+  public function testExistingPasswordRemoval() {
     /** @var \Drupal\user\Entity\User $user */
     $user = User::create(['name' => $this->randomMachineName()]);
     $user->save();
diff --git a/web/core/modules/user/src/Tests/UserSearchTest.php b/web/core/modules/user/tests/src/Functional/UserSearchTest.php
similarity index 82%
rename from web/core/modules/user/src/Tests/UserSearchTest.php
rename to web/core/modules/user/tests/src/Functional/UserSearchTest.php
index d154030e3..8ce0319bf 100644
--- a/web/core/modules/user/src/Tests/UserSearchTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserSearchTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the user search page and verifies that sensitive information is hidden
@@ -10,77 +10,77 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group user
  */
-class UserSearchTest extends WebTestBase {
+class UserSearchTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('search');
+  public static $modules = ['search'];
 
-  function testUserSearch() {
+  public function testUserSearch() {
     // Verify that a user without 'administer users' permission cannot search
     // for users by email address. Additionally, ensure that the username has a
     // plus sign to ensure searching works with that.
-    $user1 = $this->drupalCreateUser(array('access user profiles', 'search content'), "foo+bar");
+    $user1 = $this->drupalCreateUser(['access user profiles', 'search content'], "foo+bar");
     $this->drupalLogin($user1);
     $keys = $user1->getEmail();
-    $edit = array('keys' => $keys);
+    $edit = ['keys' => $keys];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertText(t('Your search yielded no results.'), 'Search by email did not work for non-admin user');
     $this->assertText('no results', 'Search by email gave no-match message');
 
     // Verify that a non-matching query gives an appropriate message.
     $keys = 'nomatch';
-    $edit = array('keys' => $keys);
+    $edit = ['keys' => $keys];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertText('no results', 'Non-matching search gave appropriate message');
 
     // Verify that a user with search permission can search for users by name.
     $keys = $user1->getUsername();
-    $edit = array('keys' => $keys);
+    $edit = ['keys' => $keys];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertLink($keys, 0, 'Search by username worked for non-admin user');
 
     // Verify that searching by sub-string works too.
     $subkey = substr($keys, 1, 5);
-    $edit = array('keys' => $subkey);
+    $edit = ['keys' => $subkey];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertLink($keys, 0, 'Search by username substring worked for non-admin user');
 
     // Verify that wildcard search works.
     $subkey = substr($keys, 0, 2) . '*' . substr($keys, 4, 2);
-    $edit = array('keys' => $subkey);
+    $edit = ['keys' => $subkey];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertLink($keys, 0, 'Search with wildcard worked for non-admin user');
 
     // Verify that a user with 'administer users' permission can search by
     // email.
-    $user2 = $this->drupalCreateUser(array('administer users', 'access user profiles', 'search content'));
+    $user2 = $this->drupalCreateUser(['administer users', 'access user profiles', 'search content']);
     $this->drupalLogin($user2);
     $keys = $user2->getEmail();
-    $edit = array('keys' => $keys);
+    $edit = ['keys' => $keys];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertText($keys, 'Search by email works for administrative user');
     $this->assertText($user2->getUsername(), 'Search by email resulted in username on page for administrative user');
 
     // Verify that a substring works too for email.
     $subkey = substr($keys, 1, 5);
-    $edit = array('keys' => $subkey);
+    $edit = ['keys' => $subkey];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertText($keys, 'Search by email substring works for administrative user');
     $this->assertText($user2->getUsername(), 'Search by email substring resulted in username on page for administrative user');
 
     // Verify that wildcard search works for email
     $subkey = substr($keys, 0, 2) . '*' . substr($keys, 4, 2);
-    $edit = array('keys' => $subkey);
+    $edit = ['keys' => $subkey];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertText($user2->getUsername(), 'Search for email wildcard resulted in username on page for administrative user');
 
     // Verify that if they search by user name, they see email address too.
     $keys = $user1->getUsername();
-    $edit = array('keys' => $keys);
+    $edit = ['keys' => $keys];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertText($keys, 'Search by username works for admin user');
     $this->assertText($user1->getEmail(), 'Search by username for admin shows email address too');
@@ -92,25 +92,25 @@ class UserSearchTest extends WebTestBase {
 
     // Verify that users with "administer users" permissions can see blocked
     // accounts in search results.
-    $edit = array('keys' => $blocked_user->getUsername());
+    $edit = ['keys' => $blocked_user->getUsername()];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertText($blocked_user->getUsername(), 'Blocked users are listed on the user search results for users with the "administer users" permission.');
 
     // Verify that users without "administer users" permissions do not see
     // blocked accounts in search results.
     $this->drupalLogin($user1);
-    $edit = array('keys' => $blocked_user->getUsername());
+    $edit = ['keys' => $blocked_user->getUsername()];
     $this->drupalPostForm('search/user', $edit, t('Search'));
     $this->assertText(t('Your search yielded no results.'), 'Blocked users are hidden from the user search results.');
 
     // Create a user without search permission, and one without user page view
     // permission. Verify that neither one can access the user search page.
-    $user3 = $this->drupalCreateUser(array('search content'));
+    $user3 = $this->drupalCreateUser(['search content']);
     $this->drupalLogin($user3);
     $this->drupalGet('search/user');
     $this->assertResponse('403', 'User without user profile access cannot search');
 
-    $user4 = $this->drupalCreateUser(array('access user profiles'));
+    $user4 = $this->drupalCreateUser(['access user profiles']);
     $this->drupalLogin($user4);
     $this->drupalGet('search/user');
     $this->assertResponse('403', 'User without search permission cannot search');
diff --git a/web/core/modules/user/src/Tests/UserTokenReplaceTest.php b/web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
similarity index 88%
rename from web/core/modules/user/src/Tests/UserTokenReplaceTest.php
rename to web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
index b8cfde0e8..e272b6073 100644
--- a/web/core/modules/user/src/Tests/UserTokenReplaceTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\user\Tests;
+namespace Drupal\Tests\user\Functional;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -14,14 +14,14 @@ use Drupal\user\Entity\User;
  *
  * @group user
  */
-class UserTokenReplaceTest extends WebTestBase {
+class UserTokenReplaceTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('language', 'user_hooks_test');
+  public static $modules = ['language', 'user_hooks_test'];
 
   /**
    * {@inheritdoc}
@@ -34,20 +34,20 @@ class UserTokenReplaceTest extends WebTestBase {
   /**
    * Creates a user, then tests the tokens generated from it.
    */
-  function testUserTokenReplacement() {
+  public function testUserTokenReplacement() {
     $token_service = \Drupal::token();
     $language_interface = \Drupal::languageManager()->getCurrentLanguage();
-    $url_options = array(
+    $url_options = [
       'absolute' => TRUE,
       'language' => $language_interface,
-    );
+    ];
 
     \Drupal::state()->set('user_hooks_test_user_format_name_alter', TRUE);
     \Drupal::state()->set('user_hooks_test_user_format_name_alter_safe', TRUE);
 
     // Create two users and log them in one after another.
-    $user1 = $this->drupalCreateUser(array());
-    $user2 = $this->drupalCreateUser(array());
+    $user1 = $this->drupalCreateUser([]);
+    $user2 = $this->drupalCreateUser([]);
     $this->drupalLogin($user1);
     $this->drupalLogout();
     $this->drupalLogin($user2);
@@ -56,7 +56,7 @@ class UserTokenReplaceTest extends WebTestBase {
     $global_account = User::load(\Drupal::currentUser()->id());
 
     // Generate and test tokens.
-    $tests = array();
+    $tests = [];
     $tests['[user:uid]'] = $account->id();
     $tests['[user:name]'] = $account->getAccountName();
     $tests['[user:account-name]'] = $account->getAccountName();
@@ -121,18 +121,18 @@ class UserTokenReplaceTest extends WebTestBase {
 
     foreach ($tests as $input => $expected) {
       $bubbleable_metadata = new BubbleableMetadata();
-      $output = $token_service->replace($input, array('user' => $anonymous_user), array('langcode' => $language_interface->getId()), $bubbleable_metadata);
-      $this->assertEqual($output, $expected, format_string('Sanitized user token %token replaced.', array('%token' => $input)));
+      $output = $token_service->replace($input, ['user' => $anonymous_user], ['langcode' => $language_interface->getId()], $bubbleable_metadata);
+      $this->assertEqual($output, $expected, format_string('Sanitized user token %token replaced.', ['%token' => $input]));
       $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
 
     // Generate login and cancel link.
-    $tests = array();
+    $tests = [];
     $tests['[user:one-time-login-url]'] = user_pass_reset_url($account);
     $tests['[user:cancel-url]'] = user_cancel_url($account);
 
     // Generate tokens with interface language.
-    $link = \Drupal::url('user.page', [], array('absolute' => TRUE));
+    $link = \Drupal::url('user.page', [], ['absolute' => TRUE]);
     foreach ($tests as $input => $expected) {
       $output = $token_service->replace($input, ['user' => $account], ['langcode' => $language_interface->getId(), 'callback' => 'user_mail_tokens', 'clear' => TRUE]);
       $this->assertTrue(strpos($output, $link) === 0, 'Generated URL is in interface language.');
@@ -141,16 +141,16 @@ class UserTokenReplaceTest extends WebTestBase {
     // Generate tokens with the user's preferred language.
     $account->preferred_langcode = 'de';
     $account->save();
-    $link = \Drupal::url('user.page', [], array('language' => \Drupal::languageManager()->getLanguage($account->getPreferredLangcode()), 'absolute' => TRUE));
+    $link = \Drupal::url('user.page', [], ['language' => \Drupal::languageManager()->getLanguage($account->getPreferredLangcode()), 'absolute' => TRUE]);
     foreach ($tests as $input => $expected) {
       $output = $token_service->replace($input, ['user' => $account], ['callback' => 'user_mail_tokens', 'clear' => TRUE]);
       $this->assertTrue(strpos($output, $link) === 0, "Generated URL is in the user's preferred language.");
     }
 
     // Generate tokens with one specific language.
-    $link = \Drupal::url('user.page', [], array('language' => \Drupal::languageManager()->getLanguage('de'), 'absolute' => TRUE));
+    $link = \Drupal::url('user.page', [], ['language' => \Drupal::languageManager()->getLanguage('de'), 'absolute' => TRUE]);
     foreach ($tests as $input => $expected) {
-      foreach (array($user1, $user2) as $account) {
+      foreach ([$user1, $user2] as $account) {
         $output = $token_service->replace($input, ['user' => $account], ['langcode' => 'de', 'callback' => 'user_mail_tokens', 'clear' => TRUE]);
         $this->assertTrue(strpos($output, $link) === 0, "Generated URL in the requested language.");
       }
diff --git a/web/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php b/web/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php
index 6e553646e..075b04c5e 100644
--- a/web/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php
@@ -48,7 +48,7 @@ class UserRoleConditionTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'field');
+  public static $modules = ['system', 'user', 'field'];
 
   /**
    * {@inheritdoc}
@@ -62,38 +62,38 @@ class UserRoleConditionTest extends KernelTestBase {
     $this->manager = $this->container->get('plugin.manager.condition');
 
     // Set up the authenticated and anonymous roles.
-    Role::create(array(
+    Role::create([
       'id' => RoleInterface::ANONYMOUS_ID,
       'label' => 'Anonymous user',
-    ))->save();
-    Role::create(array(
+    ])->save();
+    Role::create([
       'id' => RoleInterface::AUTHENTICATED_ID,
       'label' => 'Authenticated user',
-    ))->save();
+    ])->save();
 
     // Create new role.
     $rid = strtolower($this->randomMachineName(8));
     $label = $this->randomString(8);
-    $role = Role::create(array(
+    $role = Role::create([
       'id' => $rid,
       'label' => $label,
-    ));
+    ]);
     $role->save();
     $this->role = $role;
 
     // Setup an anonymous user for our tests.
-    $this->anonymous = User::create(array(
+    $this->anonymous = User::create([
       'name' => '',
       'uid' => 0,
-    ));
+    ]);
     $this->anonymous->save();
     // Loading the anonymous user adds the correct role.
     $this->anonymous = User::load($this->anonymous->id());
 
     // Setup an authenticated user for our tests.
-    $this->authenticated = User::create(array(
+    $this->authenticated = User::create([
       'name' => $this->randomMachineName(),
-    ));
+    ]);
     $this->authenticated->save();
     // Add the custom role.
     $this->authenticated->addRole($this->role->id());
@@ -107,7 +107,7 @@ class UserRoleConditionTest extends KernelTestBase {
     // authenticated user roles.
     /** @var $condition \Drupal\Core\Condition\ConditionInterface */
     $condition = $this->manager->createInstance('user_role')
-      ->setConfig('roles', array(RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID))
+      ->setConfig('roles', [RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID])
       ->setContextValue('user', $this->anonymous);
     $this->assertFalse($condition->execute(), 'Anonymous users fail role checks for authenticated.');
     // Check for the proper summary.
@@ -115,13 +115,13 @@ class UserRoleConditionTest extends KernelTestBase {
     $this->assertEqual($condition->summary(), 'The user is a member of Authenticated user');
 
     // Set the user role to anonymous.
-    $condition->setConfig('roles', array(RoleInterface::ANONYMOUS_ID => RoleInterface::ANONYMOUS_ID));
+    $condition->setConfig('roles', [RoleInterface::ANONYMOUS_ID => RoleInterface::ANONYMOUS_ID]);
     $this->assertTrue($condition->execute(), 'Anonymous users pass role checks for anonymous.');
     // Check for the proper summary.
     $this->assertEqual($condition->summary(), 'The user is a member of Anonymous user');
 
     // Set the user role to check anonymous or authenticated.
-    $condition->setConfig('roles', array(RoleInterface::ANONYMOUS_ID => RoleInterface::ANONYMOUS_ID, RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID));
+    $condition->setConfig('roles', [RoleInterface::ANONYMOUS_ID => RoleInterface::ANONYMOUS_ID, RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID]);
     $this->assertTrue($condition->execute(), 'Anonymous users pass role checks for anonymous or authenticated.');
     // Check for the proper summary.
     $this->assertEqual($condition->summary(), 'The user is a member of Anonymous user, Authenticated user');
@@ -132,11 +132,11 @@ class UserRoleConditionTest extends KernelTestBase {
     $this->assertTrue($condition->execute(), 'Authenticated users pass role checks for anonymous or authenticated.');
 
     // Set the role to just authenticated and recheck.
-    $condition->setConfig('roles', array(RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID));
+    $condition->setConfig('roles', [RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID]);
     $this->assertTrue($condition->execute(), 'Authenticated users pass role checks for authenticated.');
 
     // Test Constructor injection.
-    $condition = $this->manager->createInstance('user_role', array('roles' => array(RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID), 'context' => array('user' => $this->authenticated)));
+    $condition = $this->manager->createInstance('user_role', ['roles' => [RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID], 'context' => ['user' => $this->authenticated]]);
     $this->assertTrue($condition->execute(), 'Constructor injection of context and configuration working as anticipated.');
 
     // Check the negated summary.
@@ -144,14 +144,14 @@ class UserRoleConditionTest extends KernelTestBase {
     $this->assertEqual($condition->summary(), 'The user is not a member of Authenticated user');
 
     // Check the complex negated summary.
-    $condition->setConfig('roles', array(RoleInterface::ANONYMOUS_ID => RoleInterface::ANONYMOUS_ID, RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID));
+    $condition->setConfig('roles', [RoleInterface::ANONYMOUS_ID => RoleInterface::ANONYMOUS_ID, RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID]);
     $this->assertEqual($condition->summary(), 'The user is not a member of Anonymous user, Authenticated user');
 
     // Check a custom role.
-    $condition->setConfig('roles', array($this->role->id() => $this->role->id()));
+    $condition->setConfig('roles', [$this->role->id() => $this->role->id()]);
     $condition->setConfig('negate', FALSE);
     $this->assertTrue($condition->execute(), 'Authenticated user is a member of the custom role.');
-    $this->assertEqual($condition->summary(), SafeMarkup::format('The user is a member of @roles', array('@roles' => $this->role->label())));
+    $this->assertEqual($condition->summary(), SafeMarkup::format('The user is a member of @roles', ['@roles' => $this->role->label()]));
   }
 
 }
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldTest.php
index 0f64c79a5..75bccf14b 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldTest.php
@@ -41,7 +41,7 @@ class MigrateUserProfileFieldTest extends MigrateDrupal6TestBase {
     $field_storage = FieldStorageConfig::load('user.profile_sold_to');
     $this->assertIdentical('list_string', $field_storage->getType(), 'Field type is list_string.');
     $settings = $field_storage->getSettings();
-    $this->assertEqual($settings['allowed_values'], array(
+    $this->assertEqual($settings['allowed_values'], [
       'Pill spammers' => 'Pill spammers',
       'Fitness spammers' => 'Fitness spammers',
       'Back\slash' => 'Back\slash',
@@ -49,7 +49,7 @@ class MigrateUserProfileFieldTest extends MigrateDrupal6TestBase {
       'Dot.in.the.middle' => 'Dot.in.the.middle',
       'Faithful servant' => 'Faithful servant',
       'Anonymous donor' => 'Anonymous donor',
-    ));
+    ]);
     $this->assertIdentical('list_string', $field_storage->getType(), 'Field type is list_string.');
 
     // Migrated list field.
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
index 5b6e95d50..eed2be8e7 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\user\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\user\AccountSettingsForm;
 use Drupal\Core\Database\Database;
@@ -71,10 +71,10 @@ class MigrateUserConfigsTest extends MigrateDrupal6TestBase {
     foreach ($user_register_map as $map) {
       // Tests migration of user_register = 1
       Database::getConnection('default', 'migrate')
-          ->update('variable')
-          ->fields(['value' => serialize($map[0])])
-          ->condition('name', 'user_register')
-          ->execute();
+        ->update('variable')
+        ->fields(['value' => serialize($map[0])])
+        ->condition('name', 'user_register')
+        ->execute();
 
       /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
       $migration = $this->getMigration('d6_user_settings');
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureD6FileTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureD6FileTest.php
new file mode 100644
index 000000000..1bef3702b
--- /dev/null
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureD6FileTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
+
+use Drupal\file\Entity\File;
+use Drupal\file\FileInterface;
+use Drupal\Tests\file\Kernel\Migrate\d6\FileMigrationTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * User pictures migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserPictureD6FileTest extends MigrateDrupal6TestBase {
+
+  use FileMigrationTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('file');
+    $this->executeMigration('d6_user_picture_file');
+    $this->setUpMigratedFiles();
+  }
+
+  /**
+   * Asserts a file entity.
+   *
+   * @param int $fid
+   *   The file ID.
+   * @param string $name
+   *   The expected file name.
+   * @param int $size
+   *   The expected file size.
+   * @param string $uri
+   *   The expected file URI.
+   * @param string $type
+   *   The expected MIME type.
+   * @param int $uid
+   *   The expected file owner ID.
+   */
+  protected function assertEntity($fid, $name, $size, $uri, $type, $uid) {
+    /** @var \Drupal\file\FileInterface $file */
+    $file = File::load($fid);
+    $this->assertInstanceOf(FileInterface::class, $file);
+    $this->assertSame($name, $file->getFilename());
+    $this->assertSame($size, $file->getSize());
+    $this->assertSame($uri, $file->getFileUri());
+    $this->assertSame($type, $file->getMimeType());
+    $this->assertSame($uid, $file->getOwnerId());
+  }
+
+  /**
+   * Tests the D6 user pictures migration in combination with D6 file.
+   */
+  public function testUserPicturesWithD6File() {
+    $this->assertEntity(1, 'image-test.jpg', '1901', 'public://image-test.jpg', 'image/jpeg', '2');
+    $this->assertEntity(2, 'image-test.png', '125', 'public://image-test.png', 'image/png', '8');
+    $this->assertEntity(3, 'Image1.png', '39325', 'public://image-1.png', 'image/png', '1');
+    $this->assertEntity(4, 'Image2.jpg', '1831', 'public://image-2.jpg', 'image/jpeg', '1');
+    $this->assertEntity(5, 'Image-test.gif', '183', 'public://image-test.gif', 'image/jpeg', '1');
+    $this->assertEntity(6, 'html-1.txt', '24', 'public://html-1.txt', 'text/plain', '1');
+  }
+
+}
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureFileTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureFileTest.php
index b3b6a6423..1d28e2a7d 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureFileTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureFileTest.php
@@ -29,7 +29,7 @@ class MigrateUserPictureFileTest extends MigrateDrupal6TestBase {
    * Tests the Drupal 6 user pictures to Drupal 8 migration.
    */
   public function testUserPictures() {
-    $file_ids = array();
+    $file_ids = [];
     foreach ($this->migration->getIdMap() as $destination_ids) {
       $file_ids[] = reset($destination_ids);
     }
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
index a52b6a771..5393805ca 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
@@ -38,6 +38,7 @@ class MigrateUserRoleTest extends MigrateDrupal6TestBase {
     /** @var \Drupal\user\RoleInterface $role */
     $role = Role::load($id);
     $this->assertInstanceOf(RoleInterface::class, $role);
+    sort($permissions);
     $this->assertSame($permissions, $role->getPermissions());
     $this->assertSame([[$id]], $id_map->lookupDestinationIds(['rid' => $lookupId]));
   }
@@ -67,9 +68,9 @@ class MigrateUserRoleTest extends MigrateDrupal6TestBase {
       // From permission table.
       'access comments',
       'access content',
+      'migrate test authenticated permission',
       'post comments',
       'skip comment approval',
-      'migrate test authenticated permission',
       // From filter_format.
       'use text format filtered_html',
     ];
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php
index 33952d177..ed287770a 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php
@@ -37,7 +37,7 @@ class MigrateUserTest extends MigrateDrupal6TestBase {
     // Make sure uid 1 is created.
     user_install();
 
-    $file = File::create(array(
+    $file = File::create([
       'fid' => 2,
       'uid' => 2,
       'filename' => 'image-test.jpg',
@@ -46,12 +46,12 @@ class MigrateUserTest extends MigrateDrupal6TestBase {
       'created' => 1,
       'changed' => 1,
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     $file->enforceIsNew();
     file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-1.png'));
     $file->save();
 
-    $file = File::create(array(
+    $file = File::create([
       'fid' => 8,
       'uid' => 8,
       'filename' => 'image-test.png',
@@ -60,7 +60,7 @@ class MigrateUserTest extends MigrateDrupal6TestBase {
       'created' => 1,
       'changed' => 1,
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     $file->enforceIsNew();
     file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-2.jpg'));
     $file->save();
@@ -84,14 +84,14 @@ class MigrateUserTest extends MigrateDrupal6TestBase {
       // Get roles directly from the source.
       $rids = Database::getConnection('default', 'migrate')
         ->select('users_roles', 'ur')
-        ->fields('ur', array('rid'))
+        ->fields('ur', ['rid'])
         ->condition('ur.uid', $source->uid)
         ->execute()
         ->fetchCol();
-      $roles = array(RoleInterface::AUTHENTICATED_ID);
+      $roles = [RoleInterface::AUTHENTICATED_ID];
       $id_map = $this->getMigration('d6_user_role')->getIdMap();
       foreach ($rids as $rid) {
-        $role = $id_map->lookupDestinationId(array($rid));
+        $role = $id_map->lookupDestinationId([$rid]);
         $roles[] = reset($role);
       }
 
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
index edd5e3c03..9b5a7725d 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
@@ -45,6 +45,7 @@ class MigrateUserRoleTest extends MigrateDrupal7TestBase {
         ->condition('rid', $original_rid)
         ->execute()
         ->fetchCol();
+      sort($permissions);
       $this->assertIdentical($permissions, $entity->getPermissions());
     }
   }
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
index d18d0711b..7d73dafec 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
@@ -177,20 +177,20 @@ class MigrateUserTest extends MigrateDrupal7TestBase {
     foreach ($users as $source) {
       $rids = Database::getConnection('default', 'migrate')
         ->select('users_roles', 'ur')
-        ->fields('ur', array('rid'))
+        ->fields('ur', ['rid'])
         ->condition('ur.uid', $source->uid)
         ->execute()
         ->fetchCol();
-      $roles = array(RoleInterface::AUTHENTICATED_ID);
+      $roles = [RoleInterface::AUTHENTICATED_ID];
       $id_map = $this->getMigration('d7_user_role')->getIdMap();
       foreach ($rids as $rid) {
-        $role = $id_map->lookupDestinationId(array($rid));
+        $role = $id_map->lookupDestinationId([$rid]);
         $roles[] = reset($role);
       }
 
       $field_integer = Database::getConnection('default', 'migrate')
         ->select('field_data_field_integer', 'fi')
-        ->fields('fi', array('field_integer_value'))
+        ->fields('fi', ['field_integer_value'])
         ->condition('fi.entity_id', $source->uid)
         ->execute()
         ->fetchCol();
diff --git a/web/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php b/web/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
index 254524a97..b3d7ff1e1 100644
--- a/web/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
+++ b/web/core/modules/user/tests/src/Kernel/TempStoreDatabaseTest.php
@@ -21,7 +21,7 @@ class TempStoreDatabaseTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user');
+  public static $modules = ['system', 'user'];
 
   /**
    * A key/value store factory.
@@ -42,21 +42,21 @@ class TempStoreDatabaseTest extends KernelTestBase {
    *
    * @var array
    */
-  protected $users = array();
+  protected $users = [];
 
   /**
    * An array of random stdClass objects.
    *
    * @var array
    */
-  protected $objects = array();
+  protected $objects = [];
 
   protected function setUp() {
     parent::setUp();
 
     // Install system tables to test the key/value storage without installing a
     // full Drupal environment.
-    $this->installSchema('system', array('key_value_expire'));
+    $this->installSchema('system', ['key_value_expire']);
 
     // Create several objects for testing.
     for ($i = 0; $i <= 3; $i++) {
@@ -135,7 +135,7 @@ class TempStoreDatabaseTest extends KernelTestBase {
     // Now manually expire the item (this is not exposed by the API) and then
     // assert it is no longer accessible.
     db_update('key_value_expire')
-      ->fields(array('expire' => REQUEST_TIME - 1))
+      ->fields(['expire' => REQUEST_TIME - 1])
       ->condition('collection', "user.shared_tempstore.$collection")
       ->condition('name', $key)
       ->execute();
diff --git a/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php b/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php
index 402297254..643302192 100644
--- a/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php
@@ -18,12 +18,12 @@ class UserAccountFormFieldsTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'field');
+  public static $modules = ['system', 'user', 'field'];
 
   /**
    * Tests the root user account form section in the "Configure site" form.
    */
-  function testInstallConfigureForm() {
+  public function testInstallConfigureForm() {
     require_once \Drupal::root() . '/core/includes/install.core.inc';
     require_once \Drupal::root() . '/core/includes/install.inc';
     $install_state = install_state_defaults();
@@ -37,7 +37,7 @@ class UserAccountFormFieldsTest extends KernelTestBase {
 
     // Verify that web browsers may autocomplete the email value and
     // autofill/prefill the name and pass values.
-    foreach (array('mail', 'name', 'pass') as $key) {
+    foreach (['mail', 'name', 'pass'] as $key) {
       $this->assertFalse(isset($form['account'][$key]['#attributes']['autocomplete']), "'$key' field: 'autocomplete' attribute not found.");
     }
   }
@@ -45,9 +45,9 @@ class UserAccountFormFieldsTest extends KernelTestBase {
   /**
    * Tests the user registration form.
    */
-  function testUserRegistrationForm() {
+  public function testUserRegistrationForm() {
     // Install default configuration; required for AccountFormController.
-    $this->installConfig(array('user'));
+    $this->installConfig(['user']);
 
     // Disable email confirmation to unlock the password field.
     $this->config('user.settings')
@@ -61,7 +61,7 @@ class UserAccountFormFieldsTest extends KernelTestBase {
 
     // Verify that web browsers may autocomplete the email value and
     // autofill/prefill the name and pass values.
-    foreach (array('mail', 'name', 'pass') as $key) {
+    foreach (['mail', 'name', 'pass'] as $key) {
       $this->assertFalse(isset($form['account'][$key]['#attributes']['autocomplete']), "'$key' field: 'autocomplete' attribute not found.");
     }
   }
@@ -69,9 +69,9 @@ class UserAccountFormFieldsTest extends KernelTestBase {
   /**
    * Tests the user edit form.
    */
-  function testUserEditForm() {
+  public function testUserEditForm() {
     // Install default configuration; required for AccountFormController.
-    $this->installConfig(array('user'));
+    $this->installConfig(['user']);
 
     // Install the router table and then rebuild.
     \Drupal::service('router.builder')->rebuild();
@@ -82,7 +82,7 @@ class UserAccountFormFieldsTest extends KernelTestBase {
     $this->assertFieldOrder($form['account']);
 
     // Verify that autocomplete is off on all account fields.
-    foreach (array('mail', 'name', 'pass') as $key) {
+    foreach (['mail', 'name', 'pass'] as $key) {
       $this->assertIdentical($form['account'][$key]['#attributes']['autocomplete'], 'off', "'$key' field: 'autocomplete' attribute is 'off'.");
     }
   }
@@ -128,7 +128,7 @@ class UserAccountFormFieldsTest extends KernelTestBase {
   protected function buildAccountForm($operation) {
     // @see HtmlEntityFormController::getFormObject()
     $entity_type = 'user';
-    $fields = array();
+    $fields = [];
     if ($operation != 'register') {
       $fields['uid'] = 2;
     }
diff --git a/web/core/modules/user/tests/src/Kernel/UserActionConfigSchemaTest.php b/web/core/modules/user/tests/src/Kernel/UserActionConfigSchemaTest.php
index 3426349c1..dfafb1d53 100644
--- a/web/core/modules/user/tests/src/Kernel/UserActionConfigSchemaTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserActionConfigSchemaTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\user\Kernel;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\user\Entity\Role;
 
@@ -21,14 +21,14 @@ class UserActionConfigSchemaTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user');
+  public static $modules = ['system', 'user'];
 
   /**
    * Tests whether the user action config schema are valid.
    */
-  function testValidUserActionConfigSchema() {
+  public function testValidUserActionConfigSchema() {
     $rid = strtolower($this->randomMachineName(8));
-    Role::create(array('id' => $rid))->save();
+    Role::create(['id' => $rid])->save();
 
     // Test user_add_role_action configuration.
     $config = $this->config('system.action.user_add_role_action.' . $rid);
diff --git a/web/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php b/web/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php
index 8958c542a..159a699cf 100644
--- a/web/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php
@@ -36,16 +36,16 @@ class UserEntityReferenceTest extends EntityKernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->role1 = Role::create(array(
+    $this->role1 = Role::create([
       'id' => strtolower($this->randomMachineName(8)),
       'label' => $this->randomMachineName(8),
-    ));
+    ]);
     $this->role1->save();
 
-    $this->role2 = Role::create(array(
+    $this->role2 = Role::create([
       'id' => strtolower($this->randomMachineName(8)),
       'label' => $this->randomMachineName(8),
-    ));
+    ]);
     $this->role2->save();
 
     $this->createEntityReferenceField('user', 'user', 'user_reference', 'User reference', 'user');
@@ -54,26 +54,26 @@ class UserEntityReferenceTest extends EntityKernelTestBase {
   /**
    * Tests user selection by roles.
    */
-  function testUserSelectionByRole() {
+  public function testUserSelectionByRole() {
     $field_definition = FieldConfig::loadByName('user', 'user', 'user_reference');
     $handler_settings = $field_definition->getSetting('handler_settings');
-    $handler_settings['filter']['role'] = array(
+    $handler_settings['filter']['role'] = [
       $this->role1->id() => $this->role1->id(),
       $this->role2->id() => 0,
-    );
+    ];
     $handler_settings['filter']['type'] = 'role';
     $field_definition->setSetting('handler_settings', $handler_settings);
     $field_definition->save();
 
-    $user1 = $this->createUser(array('name' => 'aabb'));
+    $user1 = $this->createUser(['name' => 'aabb']);
     $user1->addRole($this->role1->id());
     $user1->save();
 
-    $user2 = $this->createUser(array('name' => 'aabbb'));
+    $user2 = $this->createUser(['name' => 'aabbb']);
     $user2->addRole($this->role1->id());
     $user2->save();
 
-    $user3 = $this->createUser(array('name' => 'aabbbb'));
+    $user3 = $this->createUser(['name' => 'aabbbb']);
     $user3->addRole($this->role2->id());
     $user3->save();
 
@@ -83,7 +83,7 @@ class UserEntityReferenceTest extends EntityKernelTestBase {
 
     $matches = $autocomplete->getMatches('user', 'default', $field_definition->getSetting('handler_settings'), 'aabb');
     $this->assertEqual(count($matches), 2);
-    $users = array();
+    $users = [];
     foreach ($matches as $match) {
       $users[] = $match['label'];
     }
diff --git a/web/core/modules/user/tests/src/Kernel/UserEntityTest.php b/web/core/modules/user/tests/src/Kernel/UserEntityTest.php
index 9002e5ca3..1c501f049 100644
--- a/web/core/modules/user/tests/src/Kernel/UserEntityTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserEntityTest.php
@@ -19,7 +19,7 @@ class UserEntityTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'field');
+  public static $modules = ['system', 'user', 'field'];
 
   /**
    * Tests some of the methods.
@@ -30,39 +30,39 @@ class UserEntityTest extends KernelTestBase {
    */
   public function testUserMethods() {
     $role_storage = $this->container->get('entity.manager')->getStorage('user_role');
-    $role_storage->create(array('id' => 'test_role_one'))->save();
-    $role_storage->create(array('id' => 'test_role_two'))->save();
-    $role_storage->create(array('id' => 'test_role_three'))->save();
+    $role_storage->create(['id' => 'test_role_one'])->save();
+    $role_storage->create(['id' => 'test_role_two'])->save();
+    $role_storage->create(['id' => 'test_role_three'])->save();
 
-    $values = array(
+    $values = [
       'uid' => 1,
-      'roles' => array('test_role_one'),
-    );
+      'roles' => ['test_role_one'],
+    ];
     $user = User::create($values);
 
     $this->assertTrue($user->hasRole('test_role_one'));
     $this->assertFalse($user->hasRole('test_role_two'));
-    $this->assertEqual(array(RoleInterface::AUTHENTICATED_ID, 'test_role_one'), $user->getRoles());
+    $this->assertEqual([RoleInterface::AUTHENTICATED_ID, 'test_role_one'], $user->getRoles());
 
     $user->addRole('test_role_one');
     $this->assertTrue($user->hasRole('test_role_one'));
     $this->assertFalse($user->hasRole('test_role_two'));
-    $this->assertEqual(array(RoleInterface::AUTHENTICATED_ID, 'test_role_one'), $user->getRoles());
+    $this->assertEqual([RoleInterface::AUTHENTICATED_ID, 'test_role_one'], $user->getRoles());
 
     $user->addRole('test_role_two');
     $this->assertTrue($user->hasRole('test_role_one'));
     $this->assertTrue($user->hasRole('test_role_two'));
-    $this->assertEqual(array(RoleInterface::AUTHENTICATED_ID, 'test_role_one', 'test_role_two'), $user->getRoles());
+    $this->assertEqual([RoleInterface::AUTHENTICATED_ID, 'test_role_one', 'test_role_two'], $user->getRoles());
 
     $user->removeRole('test_role_three');
     $this->assertTrue($user->hasRole('test_role_one'));
     $this->assertTrue($user->hasRole('test_role_two'));
-    $this->assertEqual(array(RoleInterface::AUTHENTICATED_ID, 'test_role_one', 'test_role_two'), $user->getRoles());
+    $this->assertEqual([RoleInterface::AUTHENTICATED_ID, 'test_role_one', 'test_role_two'], $user->getRoles());
 
     $user->removeRole('test_role_one');
     $this->assertFalse($user->hasRole('test_role_one'));
     $this->assertTrue($user->hasRole('test_role_two'));
-    $this->assertEqual(array(RoleInterface::AUTHENTICATED_ID, 'test_role_two'), $user->getRoles());
+    $this->assertEqual([RoleInterface::AUTHENTICATED_ID, 'test_role_two'], $user->getRoles());
   }
 
 }
diff --git a/web/core/modules/user/tests/src/Kernel/UserFieldsTest.php b/web/core/modules/user/tests/src/Kernel/UserFieldsTest.php
index f0fb5322f..672ddb065 100644
--- a/web/core/modules/user/tests/src/Kernel/UserFieldsTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserFieldsTest.php
@@ -27,7 +27,7 @@ class UserFieldsTest extends KernelTestBase {
     $this->installEntitySchema('user');
 
     // Set up a test theme that prints the user's mail field.
-    \Drupal::service('theme_handler')->install(array('user_test_theme'));
+    \Drupal::service('theme_handler')->install(['user_test_theme']);
     \Drupal::theme()->setActiveTheme(\Drupal::service('theme.initialization')->initTheme('user_test_theme'));
     // Clear the theme registry.
     $this->container->set('theme.registry', NULL);
@@ -36,7 +36,7 @@ class UserFieldsTest extends KernelTestBase {
   /**
    * Tests account's available fields.
    */
-  function testUserFields() {
+  public function testUserFields() {
     // Create the user to test the user fields.
     $user = User::create([
       'name' => 'foobar',
diff --git a/web/core/modules/user/tests/src/Kernel/UserInstallTest.php b/web/core/modules/user/tests/src/Kernel/UserInstallTest.php
index 2bbcd5fcd..f61811be7 100644
--- a/web/core/modules/user/tests/src/Kernel/UserInstallTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserInstallTest.php
@@ -16,7 +16,7 @@ class UserInstallTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('user');
+  public static $modules = ['user'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/user/tests/src/Kernel/UserRoleDeleteTest.php b/web/core/modules/user/tests/src/Kernel/UserRoleDeleteTest.php
index 1aefbcfce..cac470aaa 100644
--- a/web/core/modules/user/tests/src/Kernel/UserRoleDeleteTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserRoleDeleteTest.php
@@ -17,7 +17,7 @@ class UserRoleDeleteTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'field');
+  public static $modules = ['system', 'user', 'field'];
 
   protected function setUp() {
     parent::setUp();
@@ -32,15 +32,15 @@ class UserRoleDeleteTest extends KernelTestBase {
   public function testRoleDeleteUserRoleReferenceDelete() {
     // Create two test roles.
     $role_storage = $this->container->get('entity.manager')->getStorage('user_role');
-    $role_storage->create(array('id' => 'test_role_one'))->save();
-    $role_storage->create(array('id' => 'test_role_two'))->save();
+    $role_storage->create(['id' => 'test_role_one'])->save();
+    $role_storage->create(['id' => 'test_role_two'])->save();
 
     // Create user and assign both test roles.
-    $values = array(
+    $values = [
       'uid' => 1,
       'name' => $this->randomString(),
-      'roles' => array('test_role_one', 'test_role_two'),
-    );
+      'roles' => ['test_role_one', 'test_role_two'],
+    ];
     $user = User::create($values);
     $user->save();
 
@@ -60,7 +60,7 @@ class UserRoleDeleteTest extends KernelTestBase {
     $this->assertTrue($user->hasRole('test_role_two'));
 
     // Create new role with same name.
-    $role_storage->create(array('id' => 'test_role_one'))->save();
+    $role_storage->create(['id' => 'test_role_one'])->save();
 
     // Load user again from the database.
     $user = User::load($user->id());
diff --git a/web/core/modules/user/tests/src/Kernel/UserRoleEntityTest.php b/web/core/modules/user/tests/src/Kernel/UserRoleEntityTest.php
new file mode 100644
index 000000000..562ada11f
--- /dev/null
+++ b/web/core/modules/user/tests/src/Kernel/UserRoleEntityTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\user\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\user\Entity\Role;
+
+/**
+ * @group user
+ */
+class UserRoleEntityTest extends KernelTestBase {
+
+  public static $modules = ['system', 'user'];
+
+  public function testOrderOfPermissions() {
+    $role = Role::create(['id' => 'test_role']);
+    $role->grantPermission('b')
+      ->grantPermission('a')
+      ->grantPermission('c')
+      ->save();
+    $this->assertEquals($role->getPermissions(), ['a', 'b', 'c']);
+
+    $role->revokePermission('b')->save();
+    $this->assertEquals($role->getPermissions(), ['a', 'c']);
+
+    $role->grantPermission('b')->save();
+    $this->assertEquals($role->getPermissions(), ['a', 'b', 'c']);
+  }
+
+}
diff --git a/web/core/modules/user/tests/src/Kernel/UserSaveStatusTest.php b/web/core/modules/user/tests/src/Kernel/UserSaveStatusTest.php
index 00a29fcd6..17364c059 100644
--- a/web/core/modules/user/tests/src/Kernel/UserSaveStatusTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserSaveStatusTest.php
@@ -17,7 +17,7 @@ class UserSaveStatusTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'field');
+  public static $modules = ['system', 'user', 'field'];
 
   protected function setUp() {
     parent::setUp();
@@ -27,12 +27,12 @@ class UserSaveStatusTest extends KernelTestBase {
   /**
    * Test SAVED_NEW and SAVED_UPDATED statuses for user entity type.
    */
-  function testUserSaveStatus() {
+  public function testUserSaveStatus() {
     // Create a new user.
-    $values = array(
+    $values = [
       'uid' => 1,
       'name' => $this->randomMachineName(),
-    );
+    ];
     $user = User::create($values);
 
     // Test SAVED_NEW.
diff --git a/web/core/modules/user/tests/src/Kernel/UserValidationTest.php b/web/core/modules/user/tests/src/Kernel/UserValidationTest.php
index b27b00f74..f8be028f0 100644
--- a/web/core/modules/user/tests/src/Kernel/UserValidationTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserValidationTest.php
@@ -21,7 +21,7 @@ class UserValidationTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field', 'user', 'system');
+  public static $modules = ['field', 'user', 'system'];
 
   /**
    * {@inheritdoc}
@@ -29,36 +29,36 @@ class UserValidationTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
     $this->installEntitySchema('user');
-    $this->installSchema('system', array('sequences'));
+    $this->installSchema('system', ['sequences']);
 
     // Make sure that the default roles exist.
-    $this->installConfig(array('user'));
+    $this->installConfig(['user']);
 
   }
 
   /**
    * Tests user name validation.
    */
-  function testUsernames() {
-    $test_cases = array( // '<username>' => array('<description>', 'assert<testName>'),
-      'foo'                    => array('Valid username', 'assertNull'),
-      'FOO'                    => array('Valid username', 'assertNull'),
-      'Foo O\'Bar'             => array('Valid username', 'assertNull'),
-      'foo@bar'                => array('Valid username', 'assertNull'),
-      'foo@example.com'        => array('Valid username', 'assertNull'),
-      'foo@-example.com'       => array('Valid username', 'assertNull'), // invalid domains are allowed in usernames
-      'þòøÇߪř€'               => array('Valid username', 'assertNull'),
-      'foo+bar'                => array('Valid username', 'assertNull'), // '+' symbol is allowed
-      'ᚠᛇᚻ᛫ᛒᛦᚦ'                => array('Valid UTF8 username', 'assertNull'), // runes
-      ' foo'                   => array('Invalid username that starts with a space', 'assertNotNull'),
-      'foo '                   => array('Invalid username that ends with a space', 'assertNotNull'),
-      'foo  bar'               => array('Invalid username that contains 2 spaces \'&nbsp;&nbsp;\'', 'assertNotNull'),
-      ''                       => array('Invalid empty username', 'assertNotNull'),
-      'foo/'                   => array('Invalid username containing invalid chars', 'assertNotNull'),
-      'foo' . chr(0) . 'bar'   => array('Invalid username containing chr(0)', 'assertNotNull'), // NULL
-      'foo' . chr(13) . 'bar'  => array('Invalid username containing chr(13)', 'assertNotNull'), // CR
-      str_repeat('x', USERNAME_MAX_LENGTH + 1) => array('Invalid excessively long username', 'assertNotNull'),
-    );
+  public function testUsernames() {
+    $test_cases = [ // '<username>' => array('<description>', 'assert<testName>'),
+      'foo'                    => ['Valid username', 'assertNull'],
+      'FOO'                    => ['Valid username', 'assertNull'],
+      'Foo O\'Bar'             => ['Valid username', 'assertNull'],
+      'foo@bar'                => ['Valid username', 'assertNull'],
+      'foo@example.com'        => ['Valid username', 'assertNull'],
+      'foo@-example.com'       => ['Valid username', 'assertNull'], // invalid domains are allowed in usernames
+      'þòøÇߪř€'               => ['Valid username', 'assertNull'],
+      'foo+bar'                => ['Valid username', 'assertNull'], // '+' symbol is allowed
+      'ᚠᛇᚻ᛫ᛒᛦᚦ'                => ['Valid UTF8 username', 'assertNull'], // runes
+      ' foo'                   => ['Invalid username that starts with a space', 'assertNotNull'],
+      'foo '                   => ['Invalid username that ends with a space', 'assertNotNull'],
+      'foo  bar'               => ['Invalid username that contains 2 spaces \'&nbsp;&nbsp;\'', 'assertNotNull'],
+      ''                       => ['Invalid empty username', 'assertNotNull'],
+      'foo/'                   => ['Invalid username containing invalid chars', 'assertNotNull'],
+      'foo' . chr(0) . 'bar'   => ['Invalid username containing chr(0)', 'assertNotNull'], // NULL
+      'foo' . chr(13) . 'bar'  => ['Invalid username containing chr(13)', 'assertNotNull'], // CR
+      str_repeat('x', USERNAME_MAX_LENGTH + 1) => ['Invalid excessively long username', 'assertNotNull'],
+    ];
     foreach ($test_cases as $name => $test_case) {
       list($description, $test) = $test_case;
       $result = user_validate_name($name);
@@ -69,11 +69,11 @@ class UserValidationTest extends KernelTestBase {
   /**
    * Runs entity validation checks.
    */
-  function testValidation() {
-    $user = User::create(array(
+  public function testValidation() {
+    $user = User::create([
       'name' => 'test',
       'mail' => 'test@example.com',
-    ));
+    ]);
     $violations = $user->validate();
     $this->assertEqual(count($violations), 0, 'No violations when validating a default user.');
 
@@ -84,7 +84,7 @@ class UserValidationTest extends KernelTestBase {
     $violations = $user->validate();
     $this->assertEqual(count($violations), 1, 'Violation found when name is too long.');
     $this->assertEqual($violations[0]->getPropertyPath(), 'name');
-    $this->assertEqual($violations[0]->getMessage(), t('The username %name is too long: it must be %max characters or less.', array('%name' => $name, '%max' => 60)));
+    $this->assertEqual($violations[0]->getMessage(), t('The username %name is too long: it must be %max characters or less.', ['%name' => $name, '%max' => 60]));
 
     // Create a second test user to provoke a name collision.
     $user2 = User::create([
@@ -96,7 +96,7 @@ class UserValidationTest extends KernelTestBase {
     $violations = $user->validate();
     $this->assertEqual(count($violations), 1, 'Violation found on name collision.');
     $this->assertEqual($violations[0]->getPropertyPath(), 'name');
-    $this->assertEqual($violations[0]->getMessage(), t('The username %name is already taken.', array('%name' => 'existing')));
+    $this->assertEqual($violations[0]->getMessage(), t('The username %name is already taken.', ['%name' => 'existing']));
 
     // Make the name valid.
     $user->set('name', $this->randomMachineName());
@@ -116,7 +116,7 @@ class UserValidationTest extends KernelTestBase {
     //   https://www.drupal.org/node/2023465.
     $this->assertEqual(count($violations), 2, 'Violations found when email is too long');
     $this->assertEqual($violations[0]->getPropertyPath(), 'mail.0.value');
-    $this->assertEqual($violations[0]->getMessage(), t('%name: the email address can not be longer than @max characters.', array('%name' => $user->get('mail')->getFieldDefinition()->getLabel(), '@max' => Email::EMAIL_MAX_LENGTH)));
+    $this->assertEqual($violations[0]->getMessage(), t('%name: the email address can not be longer than @max characters.', ['%name' => $user->get('mail')->getFieldDefinition()->getLabel(), '@max' => Email::EMAIL_MAX_LENGTH]));
     $this->assertEqual($violations[1]->getPropertyPath(), 'mail.0.value');
     $this->assertEqual($violations[1]->getMessage(), t('This value is not a valid email address.'));
 
@@ -125,12 +125,12 @@ class UserValidationTest extends KernelTestBase {
     $violations = $user->validate();
     $this->assertEqual(count($violations), 1, 'Violation found when email already exists.');
     $this->assertEqual($violations[0]->getPropertyPath(), 'mail');
-    $this->assertEqual($violations[0]->getMessage(), t('The email address %mail is already taken.', array('%mail' => 'existing@example.com')));
+    $this->assertEqual($violations[0]->getMessage(), t('The email address %mail is already taken.', ['%mail' => 'existing@example.com']));
     $user->set('mail', NULL);
     $violations = $user->validate();
     $this->assertEqual(count($violations), 1, 'Email addresses may not be removed');
     $this->assertEqual($violations[0]->getPropertyPath(), 'mail');
-    $this->assertEqual($violations[0]->getMessage(), t('@name field is required.', array('@name' => $user->getFieldDefinition('mail')->getLabel())));
+    $this->assertEqual($violations[0]->getMessage(), t('@name field is required.', ['@name' => $user->getFieldDefinition('mail')->getLabel()]));
     $user->set('mail', 'someone@example.com');
 
     $user->set('timezone', $this->randomString(33));
@@ -157,14 +157,14 @@ class UserValidationTest extends KernelTestBase {
     $this->assertAllowedValuesViolation($user, 'preferred_admin_langcode');
     $user->set('preferred_admin_langcode', NULL);
 
-    Role::create(array('id' => 'role1'))->save();
-    Role::create(array('id' => 'role2'))->save();
+    Role::create(['id' => 'role1'])->save();
+    Role::create(['id' => 'role2'])->save();
 
     // Test cardinality of user roles.
     $user = User::create([
       'name' => 'role_test',
       'mail' => 'test@example.com',
-      'roles' => array('role1', 'role2'),
+      'roles' => ['role1', 'role2'],
     ]);
     $violations = $user->validate();
     $this->assertEqual(count($violations), 0);
@@ -173,7 +173,7 @@ class UserValidationTest extends KernelTestBase {
     $violations = $user->validate();
     $this->assertEqual(count($violations), 1);
     $this->assertEqual($violations[0]->getPropertyPath(), 'roles.1.target_id');
-    $this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%entity_type: %name) does not exist.', array('%entity_type' => 'user_role', '%name' => 'unknown_role')));
+    $this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%entity_type: %name) does not exist.', ['%entity_type' => 'user_role', '%name' => 'unknown_role']));
   }
 
   /**
@@ -195,7 +195,7 @@ class UserValidationTest extends KernelTestBase {
     $this->assertEqual(count($violations), $count, "Violation found when $field_name is too long.");
     $this->assertEqual($violations[$expected_index]->getPropertyPath(), "$field_name.0.value");
     $field_label = $entity->get($field_name)->getFieldDefinition()->getLabel();
-    $this->assertEqual($violations[$expected_index]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => $field_label, '@max' => $length)));
+    $this->assertEqual($violations[$expected_index]->getMessage(), t('%name: may not be longer than @max characters.', ['%name' => $field_label, '@max' => $length]));
   }
 
   /**
diff --git a/web/core/modules/user/tests/src/Kernel/Views/HandlerFieldPermissionTest.php b/web/core/modules/user/tests/src/Kernel/Views/HandlerFieldPermissionTest.php
index 9def2b81c..0d2122184 100644
--- a/web/core/modules/user/tests/src/Kernel/Views/HandlerFieldPermissionTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Views/HandlerFieldPermissionTest.php
@@ -17,7 +17,7 @@ class HandlerFieldPermissionTest extends UserKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_field_permission');
+  public static $testViews = ['test_field_permission'];
 
   /**
    * Tests the permission field handler output.
@@ -31,15 +31,15 @@ class HandlerFieldPermissionTest extends UserKernelTestBase {
     $view->render();
     $style_plugin = $view->style_plugin;
 
-    $expected_permissions = array();
-    $expected_permissions[$this->users[0]->id()] = array();
-    $expected_permissions[$this->users[1]->id()] = array();
+    $expected_permissions = [];
+    $expected_permissions[$this->users[0]->id()] = [];
+    $expected_permissions[$this->users[1]->id()] = [];
     $expected_permissions[$this->users[2]->id()][] = t('Administer permissions');
     // View user profiles comes first, because we sort by the permission
     // machine name.
+    $expected_permissions[$this->users[3]->id()][] = t('View user information');
     $expected_permissions[$this->users[3]->id()][] = t('Administer permissions');
     $expected_permissions[$this->users[3]->id()][] = t('Administer users');
-    $expected_permissions[$this->users[3]->id()][] = t('View user information');
 
     foreach ($view->result as $index => $row) {
       $uid = $view->field['uid']->getValue($row);
diff --git a/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php b/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php
index 069a9239d..b005f62ad 100644
--- a/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php
@@ -18,7 +18,7 @@ class HandlerFilterPermissionTest extends UserKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_filter_permission');
+  public static $testViews = ['test_filter_permission'];
 
   protected $columnMap;
 
@@ -31,64 +31,64 @@ class HandlerFilterPermissionTest extends UserKernelTestBase {
   public function testFilterPermission() {
     $this->setupPermissionTestData();
 
-    $column_map = array('uid' => 'uid');
+    $column_map = ['uid' => 'uid'];
     $view = Views::getView('test_filter_permission');
 
     // Filter by a non existing permission.
     $view->initHandlers();
-    $view->filter['permission']->value = array('non_existent_permission');
+    $view->filter['permission']->value = ['non_existent_permission'];
     $this->executeView($view);
     $this->assertEqual(count($view->result), 4, 'A non existent permission is not filtered so everything is the result.');
-    $expected[] = array('uid' => 1);
-    $expected[] = array('uid' => 2);
-    $expected[] = array('uid' => 3);
-    $expected[] = array('uid' => 4);
+    $expected[] = ['uid' => 1];
+    $expected[] = ['uid' => 2];
+    $expected[] = ['uid' => 3];
+    $expected[] = ['uid' => 4];
     $this->assertIdenticalResultset($view, $expected, $column_map);
     $view->destroy();
 
     // Filter by a permission.
     $view->initHandlers();
-    $view->filter['permission']->value = array('administer permissions');
+    $view->filter['permission']->value = ['administer permissions'];
     $this->executeView($view);
     $this->assertEqual(count($view->result), 2);
-    $expected = array();
-    $expected[] = array('uid' => 3);
-    $expected[] = array('uid' => 4);
+    $expected = [];
+    $expected[] = ['uid' => 3];
+    $expected[] = ['uid' => 4];
     $this->assertIdenticalResultset($view, $expected, $column_map);
     $view->destroy();
 
     // Filter by not a permission.
     $view->initHandlers();
     $view->filter['permission']->operator = 'not';
-    $view->filter['permission']->value = array('administer users');
+    $view->filter['permission']->value = ['administer users'];
     $this->executeView($view);
     $this->assertEqual(count($view->result), 3);
-    $expected = array();
-    $expected[] = array('uid' => 1);
-    $expected[] = array('uid' => 2);
-    $expected[] = array('uid' => 3);
+    $expected = [];
+    $expected[] = ['uid' => 1];
+    $expected[] = ['uid' => 2];
+    $expected[] = ['uid' => 3];
     $this->assertIdenticalResultset($view, $expected, $column_map);
     $view->destroy();
 
     // Filter by not multiple permissions, that are present in multiple roles.
     $view->initHandlers();
     $view->filter['permission']->operator = 'not';
-    $view->filter['permission']->value = array('administer users', 'administer permissions');
+    $view->filter['permission']->value = ['administer users', 'administer permissions'];
     $this->executeView($view);
     $this->assertEqual(count($view->result), 2);
-    $expected = array();
-    $expected[] = array('uid' => 1);
-    $expected[] = array('uid' => 2);
+    $expected = [];
+    $expected[] = ['uid' => 1];
+    $expected[] = ['uid' => 2];
     $this->assertIdenticalResultset($view, $expected, $column_map);
     $view->destroy();
 
     // Filter by another permission of a role with multiple permissions.
     $view->initHandlers();
-    $view->filter['permission']->value = array('administer users');
+    $view->filter['permission']->value = ['administer users'];
     $this->executeView($view);
     $this->assertEqual(count($view->result), 1);
-    $expected = array();
-    $expected[] = array('uid' => 4);
+    $expected = [];
+    $expected[] = ['uid' => 4];
     $this->assertIdenticalResultset($view, $expected, $column_map);
     $view->destroy();
 
@@ -103,7 +103,7 @@ class HandlerFilterPermissionTest extends UserKernelTestBase {
     foreach ($permissions as $name => $permission) {
       $permission_by_module[$permission['provider']][$name] = $permission;
     }
-    foreach (array('system' => 'System', 'user' => 'User') as $module => $title) {
+    foreach (['system' => 'System', 'user' => 'User'] as $module => $title) {
       $expected = array_map(function ($permission) {
         return Html::escape(strip_tags($permission['title']));
       }, $permission_by_module[$module]);
diff --git a/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterRolesTest.php b/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterRolesTest.php
index 37d0f2cdc..306e81332 100644
--- a/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterRolesTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterRolesTest.php
@@ -20,7 +20,7 @@ class HandlerFilterRolesTest extends UserKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_user_name');
+  public static $testViews = ['test_user_name'];
 
   /**
    * Tests that role filter dependencies are calculated correctly.
diff --git a/web/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php b/web/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php
index 075315c50..0e862c86b 100644
--- a/web/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php
+++ b/web/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php
@@ -15,14 +15,14 @@ abstract class UserKernelTestBase extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('user_test_views', 'user', 'system', 'field');
+  public static $modules = ['user_test_views', 'user', 'system', 'field'];
 
   /**
    * Users to use during this test.
    *
    * @var array
    */
-  protected $users = array();
+  protected $users = [];
 
   /**
    * The entity storage for roles.
@@ -41,7 +41,7 @@ abstract class UserKernelTestBase extends ViewsKernelTestBase {
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('user_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['user_test_views']);
 
     $this->installEntitySchema('user');
 
@@ -55,33 +55,33 @@ abstract class UserKernelTestBase extends ViewsKernelTestBase {
    */
   protected function setupPermissionTestData() {
     // Setup a role without any permission.
-    $this->roleStorage->create(array('id' => 'authenticated'))
+    $this->roleStorage->create(['id' => 'authenticated'])
       ->save();
-    $this->roleStorage->create(array('id' => 'no_permission'))
+    $this->roleStorage->create(['id' => 'no_permission'])
       ->save();
     // Setup a role with just one permission.
-    $this->roleStorage->create(array('id' => 'one_permission'))
+    $this->roleStorage->create(['id' => 'one_permission'])
       ->save();
-    user_role_grant_permissions('one_permission', array('administer permissions'));
+    user_role_grant_permissions('one_permission', ['administer permissions']);
     // Setup a role with multiple permissions.
-    $this->roleStorage->create(array('id' => 'multiple_permissions'))
+    $this->roleStorage->create(['id' => 'multiple_permissions'])
       ->save();
-    user_role_grant_permissions('multiple_permissions', array('administer permissions', 'administer users', 'access user profiles'));
+    user_role_grant_permissions('multiple_permissions', ['administer permissions', 'administer users', 'access user profiles']);
 
     // Setup a user without an extra role.
     $this->users[] = $account = $this->userStorage->create(['name' => $this->randomString()]);
     $account->save();
     // Setup a user with just the first role (so no permission beside the
     // ones from the authenticated role).
-    $this->users[] = $account = $this->userStorage->create(array('name' => 'first_role'));
+    $this->users[] = $account = $this->userStorage->create(['name' => 'first_role']);
     $account->addRole('no_permission');
     $account->save();
     // Setup a user with just the second role (so one additional permission).
-    $this->users[] = $account = $this->userStorage->create(array('name' => 'second_role'));
+    $this->users[] = $account = $this->userStorage->create(['name' => 'second_role']);
     $account->addRole('one_permission');
     $account->save();
     // Setup a user with both the second and the third role.
-    $this->users[] = $account = $this->userStorage->create(array('name' => 'second_third_role'));
+    $this->users[] = $account = $this->userStorage->create(['name' => 'second_third_role']);
     $account->addRole('one_permission');
     $account->addRole('multiple_permissions');
     $account->save();
diff --git a/web/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php b/web/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
index 97e9f33f3..b9986c9b4 100644
--- a/web/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
+++ b/web/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
@@ -12,7 +12,7 @@ use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
 class UserLocalTasksTest extends LocalTaskIntegrationTestBase {
 
   protected function setUp() {
-    $this->directoryList = array('user' => 'core/modules/user');
+    $this->directoryList = ['user' => 'core/modules/user'];
     parent::setUp();
   }
 
@@ -29,12 +29,12 @@ class UserLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function getUserAdminRoutes() {
-    return array(
-      array('entity.user.collection', array(array('entity.user.collection', 'user.admin_permissions', 'entity.user_role.collection'))),
-      array('user.admin_permissions', array(array('entity.user.collection', 'user.admin_permissions', 'entity.user_role.collection'))),
-      array('entity.user_role.collection', array(array('entity.user.collection', 'user.admin_permissions', 'entity.user_role.collection'))),
-      array('entity.user.admin_form', array(array('user.account_settings_tab'))),
-    );
+    return [
+      ['entity.user.collection', [['entity.user.collection', 'user.admin_permissions', 'entity.user_role.collection']]],
+      ['user.admin_permissions', [['entity.user.collection', 'user.admin_permissions', 'entity.user_role.collection']]],
+      ['entity.user_role.collection', [['entity.user.collection', 'user.admin_permissions', 'entity.user_role.collection']]],
+      ['entity.user.admin_form', [['user.account_settings_tab']]],
+    ];
   }
 
   /**
@@ -43,9 +43,9 @@ class UserLocalTasksTest extends LocalTaskIntegrationTestBase {
    * @dataProvider getUserLoginRoutes
    */
   public function testUserLoginLocalTasks($route) {
-    $tasks = array(
-      0 => array('user.register', 'user.pass', 'user.login',),
-    );
+    $tasks = [
+      0 => ['user.register', 'user.pass', 'user.login'],
+    ];
     $this->assertLocalTasks($route, $tasks);
   }
 
@@ -53,11 +53,11 @@ class UserLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function getUserLoginRoutes() {
-    return array(
-      array('user.login'),
-      array('user.register'),
-      array('user.pass'),
-    );
+    return [
+      ['user.login'],
+      ['user.register'],
+      ['user.pass'],
+    ];
   }
 
   /**
@@ -65,10 +65,10 @@ class UserLocalTasksTest extends LocalTaskIntegrationTestBase {
    *
    * @dataProvider getUserPageRoutes
    */
-  public function testUserPageLocalTasks($route, $subtask = array()) {
-    $tasks = array(
-      0 => array('entity.user.canonical', 'entity.user.edit_form',),
-    );
+  public function testUserPageLocalTasks($route, $subtask = []) {
+    $tasks = [
+      0 => ['entity.user.canonical', 'entity.user.edit_form'],
+    ];
     if ($subtask) $tasks[] = $subtask;
     $this->assertLocalTasks($route, $tasks);
   }
@@ -77,10 +77,10 @@ class UserLocalTasksTest extends LocalTaskIntegrationTestBase {
    * Provides a list of routes to test.
    */
   public function getUserPageRoutes() {
-    return array(
-      array('entity.user.canonical'),
-      array('entity.user.edit_form'),
-    );
+    return [
+      ['entity.user.canonical'],
+      ['entity.user.edit_form'],
+    ];
   }
 
 }
diff --git a/web/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php b/web/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php
index bcfd75058..84290cc96 100644
--- a/web/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php
+++ b/web/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php
@@ -55,10 +55,10 @@ class PermissionAccessCheckTest extends UnitTestCase {
     return [
       [[], FALSE],
       [['_permission' => 'allowed'], TRUE, ['user.permissions']],
-      [['_permission' => 'denied'], FALSE, ['user.permissions']],
+      [['_permission' => 'denied'], FALSE, ['user.permissions'], "The 'denied' permission is required."],
       [['_permission' => 'allowed+denied'], TRUE, ['user.permissions']],
       [['_permission' => 'allowed+denied+other'], TRUE, ['user.permissions']],
-      [['_permission' => 'allowed,denied'], FALSE, ['user.permissions']],
+      [['_permission' => 'allowed,denied'], FALSE, ['user.permissions'], "The following permissions are required: 'allowed' AND 'denied'."],
     ];
   }
 
@@ -68,8 +68,11 @@ class PermissionAccessCheckTest extends UnitTestCase {
    * @dataProvider providerTestAccess
    * @covers ::access
    */
-  public function testAccess($requirements, $access, array $contexts = []) {
+  public function testAccess($requirements, $access, array $contexts = [], $message = '') {
     $access_result = AccessResult::allowedIf($access)->addCacheContexts($contexts);
+    if (!empty($message)) {
+      $access_result->setReason($message);
+    }
     $user = $this->getMock('Drupal\Core\Session\AccountInterface');
     $user->expects($this->any())
       ->method('hasPermission')
diff --git a/web/core/modules/user/tests/src/Unit/PermissionHandlerTest.php b/web/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
index b0b91da89..2918d2f61 100644
--- a/web/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
+++ b/web/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
@@ -97,11 +97,11 @@ class PermissionHandlerTest extends UnitTestCase {
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $this->moduleHandler->expects($this->once())
       ->method('getModuleDirectories')
-      ->willReturn(array(
+      ->willReturn([
         'module_a' => vfsStream::url('modules/module_a'),
         'module_b' => vfsStream::url('modules/module_b'),
         'module_c' => vfsStream::url('modules/module_c'),
-      ));
+      ]);
 
     $url = vfsStream::url('modules');
     mkdir($url . '/module_a');
@@ -124,16 +124,16 @@ EOF
   'restrict access': TRUE
 EOF
     );
-    $modules = array('module_a', 'module_b', 'module_c');
-    $extensions = array(
+    $modules = ['module_a', 'module_b', 'module_c'];
+    $extensions = [
       'module_a' => $this->mockModuleExtension('module_a', 'Module a'),
       'module_b' => $this->mockModuleExtension('module_b', 'Module b'),
       'module_c' => $this->mockModuleExtension('module_c', 'Module c'),
-    );
+    ];
     $this->moduleHandler->expects($this->any())
       ->method('getImplementations')
       ->with('permission')
-      ->willReturn(array());
+      ->willReturn([]);
 
     $this->moduleHandler->expects($this->any())
       ->method('getModuleList')
@@ -227,11 +227,11 @@ EOF
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $this->moduleHandler->expects($this->once())
       ->method('getModuleDirectories')
-      ->willReturn(array(
+      ->willReturn([
         'module_a' => vfsStream::url('modules/module_a'),
         'module_b' => vfsStream::url('modules/module_b'),
         'module_c' => vfsStream::url('modules/module_c'),
-      ));
+      ]);
 
     $url = vfsStream::url('modules');
     mkdir($url . '/module_a');
@@ -254,17 +254,17 @@ permission_callbacks:
 EOF
     );
 
-    $modules = array('module_a', 'module_b', 'module_c');
-    $extensions = array(
+    $modules = ['module_a', 'module_b', 'module_c'];
+    $extensions = [
       'module_a' => $this->mockModuleExtension('module_a', 'Module a'),
       'module_b' => $this->mockModuleExtension('module_b', 'Module b'),
       'module_c' => $this->mockModuleExtension('module_c', 'Module c'),
-    );
+    ];
 
     $this->moduleHandler->expects($this->any())
       ->method('getImplementations')
       ->with('permission')
-      ->willReturn(array());
+      ->willReturn([]);
 
     $this->moduleHandler->expects($this->any())
       ->method('getModuleList')
@@ -273,19 +273,19 @@ EOF
     $this->controllerResolver->expects($this->at(0))
       ->method('getControllerFromDefinition')
       ->with('Drupal\\user\\Tests\\TestPermissionCallbacks::singleDescription')
-      ->willReturn(array(new TestPermissionCallbacks(), 'singleDescription'));
+      ->willReturn([new TestPermissionCallbacks(), 'singleDescription']);
     $this->controllerResolver->expects($this->at(1))
       ->method('getControllerFromDefinition')
       ->with('Drupal\\user\\Tests\\TestPermissionCallbacks::titleDescription')
-      ->willReturn(array(new TestPermissionCallbacks(), 'titleDescription'));
+      ->willReturn([new TestPermissionCallbacks(), 'titleDescription']);
     $this->controllerResolver->expects($this->at(2))
       ->method('getControllerFromDefinition')
       ->with('Drupal\\user\\Tests\\TestPermissionCallbacks::titleProvider')
-      ->willReturn(array(new TestPermissionCallbacks(), 'titleProvider'));
+      ->willReturn([new TestPermissionCallbacks(), 'titleProvider']);
     $this->controllerResolver->expects($this->at(3))
       ->method('getControllerFromDefinition')
       ->with('Drupal\\user\\Tests\\TestPermissionCallbacks::titleDescriptionRestrictAccess')
-      ->willReturn(array(new TestPermissionCallbacks(), 'titleDescriptionRestrictAccess'));
+      ->willReturn([new TestPermissionCallbacks(), 'titleDescriptionRestrictAccess']);
 
     $this->permissionHandler = new TestPermissionHandler($this->moduleHandler, $this->stringTranslation, $this->controllerResolver);
 
@@ -307,9 +307,9 @@ EOF
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $this->moduleHandler->expects($this->once())
       ->method('getModuleDirectories')
-      ->willReturn(array(
+      ->willReturn([
         'module_a' => vfsStream::url('modules/module_a'),
-      ));
+      ]);
 
     $url = vfsStream::url('modules');
     mkdir($url . '/module_a');
@@ -322,15 +322,15 @@ permission_callbacks:
 EOF
     );
 
-    $modules = array('module_a');
-    $extensions = array(
+    $modules = ['module_a'];
+    $extensions = [
       'module_a' => $this->mockModuleExtension('module_a', 'Module a'),
-    );
+    ];
 
     $this->moduleHandler->expects($this->any())
       ->method('getImplementations')
       ->with('permission')
-      ->willReturn(array());
+      ->willReturn([]);
 
     $this->moduleHandler->expects($this->any())
       ->method('getModuleList')
@@ -339,7 +339,7 @@ EOF
     $this->controllerResolver->expects($this->once())
       ->method('getControllerFromDefinition')
       ->with('Drupal\\user\\Tests\\TestPermissionCallbacks::titleDescription')
-      ->willReturn(array(new TestPermissionCallbacks(), 'titleDescription'));
+      ->willReturn([new TestPermissionCallbacks(), 'titleDescription']);
 
     $this->permissionHandler = new TestPermissionHandler($this->moduleHandler, $this->stringTranslation, $this->controllerResolver);
 
@@ -399,37 +399,37 @@ class TestPermissionHandler extends PermissionHandler {
 class TestPermissionCallbacks {
 
   public function singleDescription() {
-    return array(
+    return [
       'access_module_a' => 'single_description'
-    );
+    ];
   }
 
   public function titleDescription() {
-    return array(
-      'access module b' => array(
+    return [
+      'access module b' => [
         'title' => 'Access B',
         'description' => 'bla bla',
-      ),
-    );
+      ],
+    ];
   }
 
   public function titleDescriptionRestrictAccess() {
-    return array(
-      'access_module_c' => array(
+    return [
+      'access_module_c' => [
         'title' => 'Access C',
         'description' => 'bla bla',
         'restrict access' => TRUE,
-      ),
-    );
+      ],
+    ];
   }
 
   public function titleProvider() {
-    return array(
-      'access module a via module b' => array(
+    return [
+      'access module a via module b' => [
         'title' => 'Access A via B',
         'provider' => 'module_a',
-      ),
-    );
+      ],
+    ];
   }
 
 }
@@ -442,7 +442,7 @@ class TestTranslationManager implements TranslationInterface {
   /**
    * {@inheritdoc}
    */
-  public function translate($string, array $args = array(), array $options = array()) {
+  public function translate($string, array $args = [], array $options = []) {
     return new TranslatableMarkup($string, $args, $options, $this);
   }
 
@@ -456,7 +456,7 @@ class TestTranslationManager implements TranslationInterface {
   /**
    * {@inheritdoc}
    */
-  public function formatPlural($count, $singular, $plural, array $args = array(), array $options = array()) {
+  public function formatPlural($count, $singular, $plural, array $args = [], array $options = []) {
     return new PluralTranslatableMarkup($count, $singular, $plural, $args, $options, $this);
   }
 
diff --git a/web/core/modules/user/tests/src/Unit/Plugin/Action/AddRoleUserTest.php b/web/core/modules/user/tests/src/Unit/Plugin/Action/AddRoleUserTest.php
index 0763b2565..5ca694b84 100644
--- a/web/core/modules/user/tests/src/Unit/Plugin/Action/AddRoleUserTest.php
+++ b/web/core/modules/user/tests/src/Unit/Plugin/Action/AddRoleUserTest.php
@@ -22,8 +22,8 @@ class AddRoleUserTest extends RoleUserTestBase {
       ->with($this->equalTo('test_role_1'))
       ->will($this->returnValue(TRUE));
 
-    $config = array('rid' => 'test_role_1');
-    $remove_role_plugin = new AddRoleUser($config, 'user_add_role_action', array('type' => 'user'), $this->userRoleEntityType);
+    $config = ['rid' => 'test_role_1'];
+    $remove_role_plugin = new AddRoleUser($config, 'user_add_role_action', ['type' => 'user'], $this->userRoleEntityType);
 
     $remove_role_plugin->execute($this->account);
   }
@@ -40,8 +40,8 @@ class AddRoleUserTest extends RoleUserTestBase {
       ->with($this->equalTo('test_role_1'))
       ->will($this->returnValue(FALSE));
 
-    $config = array('rid' => 'test_role_1');
-    $remove_role_plugin = new AddRoleUser($config, 'user_remove_role_action', array('type' => 'user'), $this->userRoleEntityType);
+    $config = ['rid' => 'test_role_1'];
+    $remove_role_plugin = new AddRoleUser($config, 'user_remove_role_action', ['type' => 'user'], $this->userRoleEntityType);
 
     $remove_role_plugin->execute($this->account);
   }
diff --git a/web/core/modules/user/tests/src/Unit/Plugin/Action/RemoveRoleUserTest.php b/web/core/modules/user/tests/src/Unit/Plugin/Action/RemoveRoleUserTest.php
index 1c6fa25be..878b4baad 100644
--- a/web/core/modules/user/tests/src/Unit/Plugin/Action/RemoveRoleUserTest.php
+++ b/web/core/modules/user/tests/src/Unit/Plugin/Action/RemoveRoleUserTest.php
@@ -22,8 +22,8 @@ class RemoveRoleUserTest extends RoleUserTestBase {
       ->with($this->equalTo('test_role_1'))
       ->will($this->returnValue(TRUE));
 
-    $config = array('rid' => 'test_role_1');
-    $remove_role_plugin = new RemoveRoleUser($config, 'user_remove_role_action', array('type' => 'user'), $this->userRoleEntityType);
+    $config = ['rid' => 'test_role_1'];
+    $remove_role_plugin = new RemoveRoleUser($config, 'user_remove_role_action', ['type' => 'user'], $this->userRoleEntityType);
 
     $remove_role_plugin->execute($this->account);
   }
@@ -40,8 +40,8 @@ class RemoveRoleUserTest extends RoleUserTestBase {
       ->with($this->equalTo('test_role_1'))
       ->will($this->returnValue(FALSE));
 
-    $config = array('rid' => 'test_role_1');
-    $remove_role_plugin = new RemoveRoleUser($config, 'user_remove_role_action', array('type' => 'user'), $this->userRoleEntityType);
+    $config = ['rid' => 'test_role_1'];
+    $remove_role_plugin = new RemoveRoleUser($config, 'user_remove_role_action', ['type' => 'user'], $this->userRoleEntityType);
 
     $remove_role_plugin->execute($this->account);
   }
diff --git a/web/core/modules/user/tests/src/Unit/Plugin/Core/Entity/UserTest.php b/web/core/modules/user/tests/src/Unit/Plugin/Core/Entity/UserTest.php
index 86ce8e9ac..623203ee7 100644
--- a/web/core/modules/user/tests/src/Unit/Plugin/Core/Entity/UserTest.php
+++ b/web/core/modules/user/tests/src/Unit/Plugin/Core/Entity/UserTest.php
@@ -14,20 +14,20 @@ class UserTest extends UserSessionTest {
   /**
    * {@inheritdoc}
    */
-  protected function createUserSession(array $rids = array(), $authenticated = FALSE) {
+  protected function createUserSession(array $rids = [], $authenticated = FALSE) {
     $user = $this->getMockBuilder('Drupal\user\Entity\User')
       ->disableOriginalConstructor()
-      ->setMethods(array('get', 'id'))
+      ->setMethods(['get', 'id'])
       ->getMock();
     $user->expects($this->any())
       ->method('id')
       // @todo Also test the uid = 1 handling.
       ->will($this->returnValue($authenticated ? 2 : 0));
-    $roles = array();
+    $roles = [];
     foreach ($rids as $rid) {
-      $roles[] = (object) array(
+      $roles[] = (object) [
         'target_id' => $rid,
-      );
+      ];
     }
     $user->expects($this->any())
       ->method('get')
@@ -44,14 +44,14 @@ class UserTest extends UserSessionTest {
    */
   public function testUserGetRoles() {
     // Anonymous user.
-    $user = $this->createUserSession(array());
-    $this->assertEquals(array(RoleInterface::ANONYMOUS_ID), $user->getRoles());
-    $this->assertEquals(array(), $user->getRoles(TRUE));
+    $user = $this->createUserSession([]);
+    $this->assertEquals([RoleInterface::ANONYMOUS_ID], $user->getRoles());
+    $this->assertEquals([], $user->getRoles(TRUE));
 
     // Authenticated user.
-    $user = $this->createUserSession(array(), TRUE);
-    $this->assertEquals(array(RoleInterface::AUTHENTICATED_ID), $user->getRoles());
-    $this->assertEquals(array(), $user->getRoles(TRUE));
+    $user = $this->createUserSession([], TRUE);
+    $this->assertEquals([RoleInterface::AUTHENTICATED_ID], $user->getRoles());
+    $this->assertEquals([], $user->getRoles(TRUE));
   }
 
 }
diff --git a/web/core/modules/user/tests/src/Unit/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidatorTest.php b/web/core/modules/user/tests/src/Unit/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidatorTest.php
index d29c8c53e..805c96ec2 100644
--- a/web/core/modules/user/tests/src/Unit/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidatorTest.php
+++ b/web/core/modules/user/tests/src/Unit/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidatorTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\user\Unit\Plugin\Validation\Constraint;
 use Drupal\Tests\UnitTestCase;
 use Drupal\user\Plugin\Validation\Constraint\ProtectedUserFieldConstraint;
 use Drupal\user\Plugin\Validation\Constraint\ProtectedUserFieldConstraintValidator;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @coversDefaultClass \Drupal\user\Plugin\Validation\Constraint\ProtectedUserFieldConstraintValidator
@@ -47,12 +48,12 @@ class ProtectedUserFieldConstraintValidatorTest extends UnitTestCase {
 
     // If a violation is expected, then the context's addViolation method will
     // be called, otherwise it should not be called.
-    $context = $this->getMock('Symfony\Component\Validator\ExecutionContextInterface');
+    $context = $this->getMock(ExecutionContextInterface::class);
 
     if ($expected_violation) {
       $context->expects($this->once())
         ->method('addViolation')
-        ->with($constraint->message, array('%name' => $name));
+        ->with($constraint->message, ['%name' => $name]);
     }
     else {
       $context->expects($this->never())
diff --git a/web/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php b/web/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php
index cdbd30a5d..11a970a0b 100644
--- a/web/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php
+++ b/web/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php
@@ -25,7 +25,7 @@ class UserBulkFormTest extends UnitTestCase {
    * Tests the constructor assignment of actions.
    */
   public function testConstructor() {
-    $actions = array();
+    $actions = [];
 
     for ($i = 1; $i <= 2; $i++) {
       $action = $this->getMock('\Drupal\system\ActionConfigEntityInterface');
@@ -60,7 +60,7 @@ class UserBulkFormTest extends UnitTestCase {
     $views_data->expects($this->any())
       ->method('get')
       ->with('users')
-      ->will($this->returnValue(array('table' => array('entity type' => 'user'))));
+      ->will($this->returnValue(['table' => ['entity type' => 'user']]));
     $container = new ContainerBuilder();
     $container->set('views.views_data', $views_data);
     $container->set('string_translation', $this->getStringTranslationStub());
@@ -82,9 +82,9 @@ class UserBulkFormTest extends UnitTestCase {
       ->getMock();
 
     $definition['title'] = '';
-    $options = array();
+    $options = [];
 
-    $user_bulk_form = new UserBulkForm(array(), 'user_bulk_form', $definition, $entity_manager, $language_manager);
+    $user_bulk_form = new UserBulkForm([], 'user_bulk_form', $definition, $entity_manager, $language_manager);
     $user_bulk_form->init($executable, $display, $options);
 
     $this->assertAttributeEquals(array_slice($actions, 0, -1, TRUE), 'actions', $user_bulk_form);
diff --git a/web/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php b/web/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php
index 515c862a4..8d188114c 100644
--- a/web/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php
+++ b/web/core/modules/user/tests/src/Unit/PrivateTempStoreTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\user\Unit;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\user\PrivateTempStore;
+use Drupal\user\TempStoreException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -81,11 +82,11 @@ class PrivateTempStoreTest extends UnitTestCase {
 
     $this->tempStore = new PrivateTempStore($this->keyValue, $this->lock, $this->currentUser, $this->requestStack, 604800);
 
-    $this->ownObject = (object) array(
+    $this->ownObject = (object) [
       'data' => 'test_data',
       'owner' => $this->currentUser->id(),
       'updated' => (int) $request->server->get('REQUEST_TIME'),
-    );
+    ];
 
     // Clone the object but change the owner.
     $this->otherObject = clone $this->ownObject;
@@ -121,7 +122,6 @@ class PrivateTempStoreTest extends UnitTestCase {
    * Tests the set() method with no lock available.
    *
    * @covers ::set
-   * @expectedException \Drupal\user\TempStoreException
    */
   public function testSetWithNoLockAvailable() {
     $this->lock->expects($this->at(0))
@@ -139,6 +139,7 @@ class PrivateTempStoreTest extends UnitTestCase {
     $this->keyValue->expects($this->once())
       ->method('getCollectionName');
 
+    $this->setExpectedException(TempStoreException::class);
     $this->tempStore->set('test', 'value');
   }
 
@@ -220,7 +221,6 @@ class PrivateTempStoreTest extends UnitTestCase {
    * Tests the delete() method with no lock available.
    *
    * @covers ::delete
-   * @expectedException \Drupal\user\TempStoreException
    */
   public function testDeleteWithNoLockAvailable() {
     $this->keyValue->expects($this->once())
@@ -242,6 +242,7 @@ class PrivateTempStoreTest extends UnitTestCase {
     $this->keyValue->expects($this->once())
       ->method('getCollectionName');
 
+    $this->setExpectedException(TempStoreException::class);
     $this->tempStore->delete('test');
   }
 
diff --git a/web/core/modules/user/tests/src/Unit/SharedTempStoreTest.php b/web/core/modules/user/tests/src/Unit/SharedTempStoreTest.php
index 15a4ec6c2..33bde413e 100644
--- a/web/core/modules/user/tests/src/Unit/SharedTempStoreTest.php
+++ b/web/core/modules/user/tests/src/Unit/SharedTempStoreTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\user\Unit;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\user\SharedTempStore;
+use Drupal\user\TempStoreException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -76,11 +77,11 @@ class SharedTempStoreTest extends UnitTestCase {
 
     $this->tempStore = new SharedTempStore($this->keyValue, $this->lock, $this->owner, $this->requestStack, 604800);
 
-    $this->ownObject = (object) array(
+    $this->ownObject = (object) [
       'data' => 'test_data',
       'owner' => $this->owner,
       'updated' => (int) $request->server->get('REQUEST_TIME'),
-    );
+    ];
 
     // Clone the object but change the owner.
     $this->otherObject = clone $this->ownObject;
@@ -132,7 +133,6 @@ class SharedTempStoreTest extends UnitTestCase {
    * Tests the set() method with no lock available.
    *
    * @covers ::set
-   * @expectedException \Drupal\user\TempStoreException
    */
   public function testSetWithNoLockAvailable() {
     $this->lock->expects($this->at(0))
@@ -150,6 +150,7 @@ class SharedTempStoreTest extends UnitTestCase {
     $this->keyValue->expects($this->once())
       ->method('getCollectionName');
 
+    $this->setExpectedException(TempStoreException::class);
     $this->tempStore->set('test', 'value');
   }
 
@@ -296,7 +297,6 @@ class SharedTempStoreTest extends UnitTestCase {
    * Tests the delete() method with no lock available.
    *
    * @covers ::delete
-   * @expectedException \Drupal\user\TempStoreException
    */
   public function testDeleteWithNoLockAvailable() {
     $this->lock->expects($this->at(0))
@@ -314,6 +314,7 @@ class SharedTempStoreTest extends UnitTestCase {
     $this->keyValue->expects($this->once())
       ->method('getCollectionName');
 
+    $this->setExpectedException(TempStoreException::class);
     $this->tempStore->delete('test');
   }
 
diff --git a/web/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php b/web/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
index 75e6ccb1d..216e8d652 100644
--- a/web/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
+++ b/web/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
@@ -80,10 +80,10 @@ class UserAccessControlHandlerTest extends UnitTestCase {
     $this->owner
       ->expects($this->any())
       ->method('hasPermission')
-      ->will($this->returnValueMap(array(
-        array('administer users', FALSE),
-        array('change own username', TRUE),
-      )));
+      ->will($this->returnValueMap([
+        ['administer users', FALSE],
+        ['change own username', TRUE],
+      ]));
 
     $this->owner
       ->expects($this->any())
@@ -102,7 +102,7 @@ class UserAccessControlHandlerTest extends UnitTestCase {
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $module_handler->expects($this->any())
       ->method('getImplementations')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->accessControlHandler->setModuleHandler($module_handler);
 
     $this->items = $this->getMockBuilder('Drupal\Core\Field\FieldItemList')
@@ -128,7 +128,7 @@ class UserAccessControlHandlerTest extends UnitTestCase {
       ->method('getEntity')
       ->will($this->returnValue($this->{$target}));
 
-    foreach (array('view' => $view, 'edit' => $edit) as $operation => $result) {
+    foreach (['view' => $view, 'edit' => $edit] as $operation => $result) {
       $result_text = !isset($result) ? 'null' : ($result ? 'true' : 'false');
       $message = "User '$field' field access returns '$result_text' with operation '$operation' for '$viewer' accessing '$target'";
       $this->assertSame($result, $this->accessControlHandler->fieldAccess($operation, $field_definition, $this->{$viewer}, $this->items), $message);
@@ -145,44 +145,44 @@ class UserAccessControlHandlerTest extends UnitTestCase {
   }
 
   /**
-   * Provides test data for estUserNameAccess().
+   * Provides test data for testUserNameAccess().
    */
   public function userNameProvider() {
-    $name_access = array(
+    $name_access = [
       // The viewer user is allowed to see user names on all accounts.
-      array(
+      [
         'viewer' => 'viewer',
         'target' => 'viewer',
         'view' => TRUE,
         'edit' => FALSE,
-      ),
-      array(
+      ],
+      [
         'viewer' => 'owner',
         'target' => 'viewer',
         'view' => TRUE,
         'edit' => FALSE,
-      ),
-      array(
+      ],
+      [
         'viewer' => 'viewer',
         'target' => 'owner',
         'view' => TRUE,
         'edit' => FALSE,
-      ),
+      ],
       // The owner user is allowed to change its own user name.
-      array(
+      [
         'viewer' => 'owner',
         'target' => 'owner',
         'view' => TRUE,
         'edit' => TRUE,
-      ),
+      ],
       // The users-administrator user has full access.
-      array(
+      [
         'viewer' => 'admin',
         'target' => 'owner',
         'view' => TRUE,
         'edit' => TRUE,
-      ),
-    );
+      ],
+    ];
     return $name_access;
   }
 
@@ -199,24 +199,24 @@ class UserAccessControlHandlerTest extends UnitTestCase {
    * Provides test data for testHiddenUserSettings().
    */
   public function hiddenUserSettingsProvider() {
-    $access_info = array();
+    $access_info = [];
 
-    $fields = array(
+    $fields = [
       'preferred_langcode',
       'preferred_admin_langcode',
       'timezone',
       'mail',
-    );
+    ];
 
     foreach ($fields as $field) {
-      $access_info[] = array(
+      $access_info[] = [
         'field' => $field,
         'viewer' => 'viewer',
         'target' => 'viewer',
         'view' => TRUE,
         'edit' => TRUE,
-      );
-      $access_info[] = array(
+      ];
+      $access_info[] = [
         'field' => $field,
         'viewer' => 'viewer',
         'target' => 'owner',
@@ -225,21 +225,21 @@ class UserAccessControlHandlerTest extends UnitTestCase {
         // reality edit access will already be checked on entity level and the
         // user without view access will typically not be able to edit.
         'edit' => TRUE,
-      );
-      $access_info[] = array(
+      ];
+      $access_info[] = [
         'field' => $field,
         'viewer' => 'owner',
         'target' => 'owner',
         'view' => TRUE,
         'edit' => TRUE,
-      );
-      $access_info[] = array(
+      ];
+      $access_info[] = [
         'field' => $field,
         'viewer' => 'admin',
         'target' => 'owner',
         'view' => TRUE,
         'edit' => TRUE,
-      );
+      ];
     }
 
     return $access_info;
@@ -258,38 +258,38 @@ class UserAccessControlHandlerTest extends UnitTestCase {
    * Provides test data for testAdminFieldAccess().
    */
   public function adminFieldAccessProvider() {
-    $access_info = array();
+    $access_info = [];
 
-    $fields = array(
+    $fields = [
       'roles',
       'status',
       'access',
       'login',
       'init',
-    );
+    ];
 
     foreach ($fields as $field) {
-      $access_info[] = array(
+      $access_info[] = [
         'field' => $field,
         'viewer' => 'viewer',
         'target' => 'viewer',
         'view' => FALSE,
         'edit' => FALSE,
-      );
-      $access_info[] = array(
+      ];
+      $access_info[] = [
         'field' => $field,
         'viewer' => 'viewer',
         'target' => 'owner',
         'view' => FALSE,
         'edit' => FALSE,
-      );
-      $access_info[] = array(
+      ];
+      $access_info[] = [
         'field' => $field,
         'viewer' => 'admin',
         'target' => 'owner',
         'view' => TRUE,
         'edit' => TRUE,
-      );
+      ];
     }
 
     return $access_info;
@@ -308,14 +308,14 @@ class UserAccessControlHandlerTest extends UnitTestCase {
    * Provides test data for passwordAccessProvider().
    */
   public function passwordAccessProvider() {
-    $pass_access = array(
-      array(
+    $pass_access = [
+      [
         'viewer' => 'viewer',
         'target' => 'viewer',
         'view' => FALSE,
         'edit' => TRUE,
-      ),
-      array(
+      ],
+      [
         'viewer' => 'viewer',
         'target' => 'owner',
         'view' => FALSE,
@@ -323,20 +323,20 @@ class UserAccessControlHandlerTest extends UnitTestCase {
         // reality edit access will already be checked on entity level and the
         // user without view access will typically not be able to edit.
         'edit' => TRUE,
-      ),
-      array(
+      ],
+      [
         'viewer' => 'owner',
         'target' => 'viewer',
         'view' => FALSE,
         'edit' => TRUE,
-      ),
-      array(
+      ],
+      [
         'viewer' => 'admin',
         'target' => 'owner',
         'view' => FALSE,
         'edit' => TRUE,
-      ),
-    );
+      ],
+    ];
     return $pass_access;
   }
 
@@ -353,26 +353,26 @@ class UserAccessControlHandlerTest extends UnitTestCase {
    * Provides test data for testCreatedAccess().
    */
   public function createdAccessProvider() {
-    $created_access = array(
-      array(
+    $created_access = [
+      [
         'viewer' => 'viewer',
         'target' => 'viewer',
         'view' => TRUE,
         'edit' => FALSE,
-      ),
-      array(
+      ],
+      [
         'viewer' => 'owner',
         'target' => 'viewer',
         'view' => TRUE,
         'edit' => FALSE,
-      ),
-      array(
+      ],
+      [
         'viewer' => 'admin',
         'target' => 'owner',
         'view' => TRUE,
         'edit' => TRUE,
-      ),
-    );
+      ],
+    ];
     return $created_access;
   }
 
@@ -392,26 +392,26 @@ class UserAccessControlHandlerTest extends UnitTestCase {
    * Provides test data for testNonExistingFieldAccess().
    */
   public function NonExistingFieldAccessProvider() {
-    $created_access = array(
-      array(
+    $created_access = [
+      [
         'viewer' => 'viewer',
         'target' => 'viewer',
         'view' => TRUE,
         'edit' => TRUE,
-      ),
-      array(
+      ],
+      [
         'viewer' => 'owner',
         'target' => 'viewer',
         'view' => TRUE,
         'edit' => TRUE,
-      ),
-      array(
+      ],
+      [
         'viewer' => 'admin',
         'target' => 'owner',
         'view' => TRUE,
         'edit' => TRUE,
-      ),
-    );
+      ],
+    ];
     return $created_access;
   }
 
diff --git a/web/core/modules/user/tests/src/Unit/UserAuthTest.php b/web/core/modules/user/tests/src/Unit/UserAuthTest.php
index 1b96d8f80..698c8b5fe 100644
--- a/web/core/modules/user/tests/src/Unit/UserAuthTest.php
+++ b/web/core/modules/user/tests/src/Unit/UserAuthTest.php
@@ -69,7 +69,7 @@ class UserAuthTest extends UnitTestCase {
 
     $this->testUser = $this->getMockBuilder('Drupal\user\Entity\User')
       ->disableOriginalConstructor()
-      ->setMethods(array('id', 'setPassword', 'save', 'getPassword'))
+      ->setMethods(['id', 'setPassword', 'save', 'getPassword'])
       ->getMock();
 
     $this->userAuth = new UserAuth($entity_manager, $this->passwordService);
@@ -95,12 +95,12 @@ class UserAuthTest extends UnitTestCase {
    * @return array
    */
   public function providerTestAuthenticateWithMissingCredentials() {
-    return array(
-      array(NULL, NULL),
-      array(NULL, ''),
-      array('', NULL),
-      array('', ''),
-    );
+    return [
+      [NULL, NULL],
+      [NULL, ''],
+      ['', NULL],
+      ['', ''],
+    ];
   }
 
   /**
@@ -111,8 +111,8 @@ class UserAuthTest extends UnitTestCase {
   public function testAuthenticateWithNoAccountReturned() {
     $this->userStorage->expects($this->once())
       ->method('loadByProperties')
-      ->with(array('name' => $this->username))
-      ->will($this->returnValue(array()));
+      ->with(['name' => $this->username])
+      ->will($this->returnValue([]));
 
     $this->assertFalse($this->userAuth->authenticate($this->username, $this->password));
   }
@@ -125,8 +125,8 @@ class UserAuthTest extends UnitTestCase {
   public function testAuthenticateWithIncorrectPassword() {
     $this->userStorage->expects($this->once())
       ->method('loadByProperties')
-      ->with(array('name' => $this->username))
-      ->will($this->returnValue(array($this->testUser)));
+      ->with(['name' => $this->username])
+      ->will($this->returnValue([$this->testUser]));
 
     $this->passwordService->expects($this->once())
       ->method('check')
@@ -148,8 +148,8 @@ class UserAuthTest extends UnitTestCase {
 
     $this->userStorage->expects($this->once())
       ->method('loadByProperties')
-      ->with(array('name' => $this->username))
-      ->will($this->returnValue(array($this->testUser)));
+      ->with(['name' => $this->username])
+      ->will($this->returnValue([$this->testUser]));
 
     $this->passwordService->expects($this->once())
       ->method('check')
@@ -175,8 +175,8 @@ class UserAuthTest extends UnitTestCase {
 
     $this->userStorage->expects($this->once())
       ->method('loadByProperties')
-      ->with(array('name' => $this->username))
-      ->will($this->returnValue(array($this->testUser)));
+      ->with(['name' => $this->username])
+      ->will($this->returnValue([$this->testUser]));
 
     $this->passwordService->expects($this->once())
       ->method('check')
@@ -203,8 +203,8 @@ class UserAuthTest extends UnitTestCase {
 
     $this->userStorage->expects($this->once())
       ->method('loadByProperties')
-      ->with(array('name' => $this->username))
-      ->will($this->returnValue(array($this->testUser)));
+      ->with(['name' => $this->username])
+      ->will($this->returnValue([$this->testUser]));
 
     $this->passwordService->expects($this->once())
       ->method('check')
diff --git a/web/core/modules/user/tests/src/Unit/UserRegistrationResourceTest.php b/web/core/modules/user/tests/src/Unit/UserRegistrationResourceTest.php
new file mode 100644
index 000000000..142685c22
--- /dev/null
+++ b/web/core/modules/user/tests/src/Unit/UserRegistrationResourceTest.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace Drupal\Tests\user\Unit;
+
+use Drupal\Core\Config\ImmutableConfig;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Tests\UnitTestCase;
+use Drupal\user\Entity\User;
+use Drupal\user\Plugin\rest\resource\UserRegistrationResource;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+/**
+ * Only administrators can create user accounts.
+ */
+if (!defined('USER_REGISTER_ADMINISTRATORS_ONLY')) {
+  define('USER_REGISTER_ADMINISTRATORS_ONLY', 'admin_only');
+}
+
+/**
+ * Visitors can create their own accounts.
+ */
+if (!defined('USER_REGISTER_VISITORS')) {
+  define('USER_REGISTER_VISITORS', 'visitors');
+}
+
+/**
+ * Visitors can create accounts, but they don't become active without
+ * administrative approval.
+ */
+if (!defined('USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL')) {
+  define('USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL', 'visitors_admin_approval');
+}
+
+/**
+ * Tests User Registration REST resource.
+ *
+ * @coversDefaultClass \Drupal\user\Plugin\rest\resource\UserRegistrationResource
+ * @group user
+ */
+class UserRegistrationResourceTest extends UnitTestCase {
+
+  const ERROR_MESSAGE = "Unprocessable Entity: validation failed.\nproperty_path: message\nproperty_path_2: message_2\n";
+
+  /**
+   * Class to be tested.
+   *
+   * @var \Drupal\user\Plugin\rest\resource\UserRegistrationResource
+   */
+  protected $testClass;
+
+  /**
+   * A reflection of self::$testClass.
+   *
+   * @var \ReflectionClass
+   */
+  protected $reflection;
+
+  /**
+   * A user settings config instance.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $userSettings;
+
+  /**
+   * Logger service.
+   *
+   * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $logger;
+
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $currentUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->logger = $this->prophesize(LoggerInterface::class)->reveal();
+
+    $this->userSettings = $this->prophesize(ImmutableConfig::class);
+
+    $this->currentUser = $this->prophesize(AccountInterface::class);
+
+    $this->testClass = new UserRegistrationResource([], 'plugin_id', '', [], $this->logger, $this->userSettings->reveal(), $this->currentUser->reveal());
+    $this->reflection = new \ReflectionClass($this->testClass);
+  }
+
+  /**
+   * Tests that an exception is thrown when no data provided for the account.
+   */
+  public function testEmptyPost() {
+    $this->setExpectedException(BadRequestHttpException::class);
+    $this->testClass->post(NULL);
+  }
+
+  /**
+   * Tests that only new user accounts can be registered.
+   */
+  public function testExistedEntityPost() {
+    $entity = $this->prophesize(User::class);
+    $entity->isNew()->willReturn(FALSE);
+    $this->setExpectedException(BadRequestHttpException::class);
+
+    $this->testClass->post($entity->reveal());
+  }
+
+  /**
+   * Tests that admin permissions are required to register a user account.
+   */
+  public function testRegistrationAdminOnlyPost() {
+
+    $this->userSettings->get('register')->willReturn(USER_REGISTER_ADMINISTRATORS_ONLY);
+
+    $this->currentUser->isAnonymous()->willReturn(TRUE);
+
+    $this->testClass = new UserRegistrationResource([], 'plugin_id', '', [], $this->logger, $this->userSettings->reveal(), $this->currentUser->reveal());
+
+    $entity = $this->prophesize(User::class);
+    $entity->isNew()->willReturn(TRUE);
+
+    $this->setExpectedException(AccessDeniedHttpException::class);
+
+    $this->testClass->post($entity->reveal());
+  }
+
+  /**
+   * Tests that only anonymous users can register users.
+   */
+  public function testRegistrationAnonymousOnlyPost() {
+    $this->currentUser->isAnonymous()->willReturn(FALSE);
+
+    $this->testClass = new UserRegistrationResource([], 'plugin_id', '', [], $this->logger, $this->userSettings->reveal(), $this->currentUser->reveal());
+
+    $entity = $this->prophesize(User::class);
+    $entity->isNew()->willReturn(TRUE);
+
+    $this->setExpectedException(AccessDeniedHttpException::class);
+
+    $this->testClass->post($entity->reveal());
+  }
+
+}
diff --git a/web/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php b/web/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php
index 8693fc4b3..b8f288842 100644
--- a/web/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php
+++ b/web/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php
@@ -19,24 +19,24 @@ class RolesRidTest extends UnitTestCase {
    * @covers ::titleQuery
    */
   public function testTitleQuery() {
-    $role1 = new Role(array(
+    $role1 = new Role([
       'id' => 'test_rid_1',
       'label' => 'test rid 1'
-    ), 'user_role');
-    $role2 = new Role(array(
+    ], 'user_role');
+    $role2 = new Role([
       'id' => 'test_rid_2',
       'label' => 'test <strong>rid 2</strong>',
-    ), 'user_role');
+    ], 'user_role');
 
     // Creates a stub entity storage;
     $role_storage = $this->getMockForAbstractClass('Drupal\Core\Entity\EntityStorageInterface');
     $role_storage->expects($this->any())
       ->method('loadMultiple')
-      ->will($this->returnValueMap(array(
-        array(array(), array()),
-        array(array('test_rid_1'), array('test_rid_1' => $role1)),
-        array(array('test_rid_1', 'test_rid_2'), array('test_rid_1' => $role1, 'test_rid_2' => $role2)),
-      )));
+      ->will($this->returnValueMap([
+        [[], []],
+        [['test_rid_1'], ['test_rid_1' => $role1]],
+        [['test_rid_1', 'test_rid_2'], ['test_rid_1' => $role1, 'test_rid_2' => $role2]],
+      ]));
 
     $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
     $entity_type->expects($this->any())
@@ -63,19 +63,19 @@ class RolesRidTest extends UnitTestCase {
     $container->set('entity.manager', $entity_manager);
     \Drupal::setContainer($container);
 
-    $roles_rid_argument = new RolesRid(array(), 'user__roles_rid', array(), $entity_manager);
+    $roles_rid_argument = new RolesRid([], 'user__roles_rid', [], $entity_manager);
 
-    $roles_rid_argument->value = array();
+    $roles_rid_argument->value = [];
     $titles = $roles_rid_argument->titleQuery();
-    $this->assertEquals(array(), $titles);
+    $this->assertEquals([], $titles);
 
-    $roles_rid_argument->value = array('test_rid_1');
+    $roles_rid_argument->value = ['test_rid_1'];
     $titles = $roles_rid_argument->titleQuery();
-    $this->assertEquals(array('test rid 1'), $titles);
+    $this->assertEquals(['test rid 1'], $titles);
 
-    $roles_rid_argument->value = array('test_rid_1', 'test_rid_2');
+    $roles_rid_argument->value = ['test_rid_1', 'test_rid_2'];
     $titles = $roles_rid_argument->titleQuery();
-    $this->assertEquals(array('test rid 1', 'test <strong>rid 2</strong>'), $titles);
+    $this->assertEquals(['test rid 1', 'test <strong>rid 2</strong>'], $titles);
   }
 
 }
diff --git a/web/core/modules/user/user.api.php b/web/core/modules/user/user.api.php
index 2f40eb90b..364dd1ac6 100644
--- a/web/core/modules/user/user.api.php
+++ b/web/core/modules/user/user.api.php
@@ -44,7 +44,7 @@ function hook_user_cancel($edit, $account, $method) {
       $nodes = \Drupal::entityQuery('node')
         ->condition('uid', $account->id())
         ->execute();
-      node_mass_update($nodes, array('status' => 0), NULL, TRUE);
+      node_mass_update($nodes, ['status' => 0], NULL, TRUE);
       break;
 
     case 'user_cancel_reassign':
@@ -53,10 +53,10 @@ function hook_user_cancel($edit, $account, $method) {
       $nodes = \Drupal::entityQuery('node')
         ->condition('uid', $account->id())
         ->execute();
-      node_mass_update($nodes, array('uid' => 0), NULL, TRUE);
+      node_mass_update($nodes, ['uid' => 0], NULL, TRUE);
       // Anonymize old revisions.
       db_update('node_field_revision')
-        ->fields(array('uid' => 0))
+        ->fields(['uid' => 0])
         ->condition('uid', $account->id())
         ->execute();
       break;
@@ -94,12 +94,12 @@ function hook_user_cancel_methods_alter(&$methods) {
   unset($methods['user_cancel_reassign']);
 
   // Add a custom zero-out method.
-  $methods['mymodule_zero_out'] = array(
+  $methods['mymodule_zero_out'] = [
     'title' => t('Delete the account and remove all content.'),
     'description' => t('All your content will be replaced by empty strings.'),
     // access should be used for administrative methods only.
     'access' => $account->hasPermission('access zero-out account cancellation method'),
-  );
+  ];
 }
 
 /**
@@ -123,7 +123,7 @@ function hook_user_cancel_methods_alter(&$methods) {
 function hook_user_format_name_alter(&$name, $account) {
   // Display the user's uid instead of name.
   if ($account->id()) {
-    $name = t('User @uid', array('@uid' => $account->id()));
+    $name = t('User @uid', ['@uid' => $account->id()]);
   }
 }
 
@@ -137,7 +137,7 @@ function hook_user_login($account) {
   $config = \Drupal::config('system.date');
   // If the user has a NULL time zone, notify them to set a time zone.
   if (!$account->getTimezone() && $config->get('timezone.user.configurable') && $config->get('timezone.user.warn')) {
-    drupal_set_message(t('Configure your <a href=":user-edit">account time zone setting</a>.', array(':user-edit' => $account->url('edit-form', array('query' => \Drupal::destination()->getAsArray(), 'fragment' => 'edit-timezone')))));
+    drupal_set_message(t('Configure your <a href=":user-edit">account time zone setting</a>.', [':user-edit' => $account->url('edit-form', ['query' => \Drupal::destination()->getAsArray(), 'fragment' => 'edit-timezone'])]));
   }
 }
 
@@ -149,10 +149,10 @@ function hook_user_login($account) {
  */
 function hook_user_logout($account) {
   db_insert('logouts')
-    ->fields(array(
+    ->fields([
       'uid' => $account->id(),
       'time' => time(),
-    ))
+    ])
     ->execute();
 }
 
diff --git a/web/core/modules/user/user.install b/web/core/modules/user/user.install
index 7cc46ef6a..0af797a43 100644
--- a/web/core/modules/user/user.install
+++ b/web/core/modules/user/user.install
@@ -9,53 +9,53 @@
  * Implements hook_schema().
  */
 function user_schema() {
-  $schema['users_data'] = array(
+  $schema['users_data'] = [
     'description' => 'Stores module data as key/value pairs per user.',
-    'fields' => array(
-      'uid' => array(
+    'fields' => [
+      'uid' => [
         'description' => 'Primary key: {users}.uid for user.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
-      ),
-      'module' => array(
+      ],
+      'module' => [
         'description' => 'The name of the module declaring the variable.',
         'type' => 'varchar_ascii',
         'length' => DRUPAL_EXTENSION_NAME_MAX_LENGTH,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'name' => array(
+      ],
+      'name' => [
         'description' => 'The identifier of the data.',
         'type' => 'varchar_ascii',
         'length' => 128,
         'not null' => TRUE,
         'default' => '',
-      ),
-      'value' => array(
+      ],
+      'value' => [
         'description' => 'The value.',
         'type' => 'blob',
         'not null' => FALSE,
         'size' => 'big',
-      ),
-      'serialized' => array(
+      ],
+      'serialized' => [
         'description' => 'Whether value is serialized.',
         'type' => 'int',
         'size' => 'tiny',
         'unsigned' => TRUE,
         'default' => 0,
-      ),
-    ),
-    'primary key' => array('uid', 'module', 'name'),
-    'indexes' => array(
-      'module' => array('module'),
-      'name' => array('name'),
-    ),
-    'foreign keys' => array(
-      'uid' => array('users' => 'uid'),
-    ),
-  );
+      ],
+    ],
+    'primary key' => ['uid', 'module', 'name'],
+    'indexes' => [
+      'module' => ['module'],
+      'name' => ['name'],
+    ],
+    'foreign keys' => [
+      'uid' => ['users' => 'uid'],
+    ],
+  ];
 
   return $schema;
 }
@@ -67,30 +67,25 @@ function user_install() {
   $storage = \Drupal::entityManager()->getStorage('user');
   // Insert a row for the anonymous user.
   $storage
-    ->create(array(
+    ->create([
       'uid' => 0,
       'status' => 0,
       'name' => '',
-    ))
+    ])
     ->save();
 
   // We need some placeholders here as name and mail are unique.
   // This will be changed by the settings form in the installer.
   $storage
-    ->create(array(
+    ->create([
       'uid' => 1,
       'name' => 'placeholder-for-uid-1',
       'mail' => 'placeholder-for-uid-1',
       'status' => TRUE,
-    ))
+    ])
     ->save();
 }
 
-/**
- * @addtogroup updates-8.1.0-beta
- * @{
- */
-
 /**
  * Fix invalid token in the status_blocked email body.
  */
@@ -103,7 +98,3 @@ function user_update_8100() {
     $config->set('status_blocked', $mail)->save(TRUE);
   }
 }
-
-/**
- * @} End of "addtogroup updates-8.1.0-beta".
- */
diff --git a/web/core/modules/user/user.module b/web/core/modules/user/user.module
index 1e9f539e0..b865e958d 100644
--- a/web/core/modules/user/user.module
+++ b/web/core/modules/user/user.module
@@ -28,22 +28,35 @@ use Drupal\user\UserInterface;
  * Maximum length of username text field.
  *
  * Keep this under 191 characters so we can use a unique constraint in MySQL.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\user\UserInterface::USERNAME_MAX_LENGTH instead.
  */
 const USERNAME_MAX_LENGTH = 60;
 
 /**
  * Only administrators can create user accounts.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\user\UserInterface::REGISTER_ADMINISTRATORS_ONLY instead.
  */
 const USER_REGISTER_ADMINISTRATORS_ONLY = 'admin_only';
 
 /**
  * Visitors can create their own accounts.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\user\UserInterface::REGISTER_VISITORS instead.
  */
 const USER_REGISTER_VISITORS = 'visitors';
 
 /**
  * Visitors can create accounts, but they don't become active without
  * administrative approval.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\user\UserInterface::REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL
+ *   instead.
  */
 const USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL = 'visitors_admin_approval';
 
@@ -55,19 +68,19 @@ function user_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.user':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The User module allows users to register, log in, and log out. It also allows users with proper permissions to manage user roles and permissions. For more information, see the <a href=":user_docs">online documentation for the User module</a>.', array(':user_docs' => 'https://www.drupal.org/documentation/modules/user')) . '</p>';
+      $output .= '<p>' . t('The User module allows users to register, log in, and log out. It also allows users with proper permissions to manage user roles and permissions. For more information, see the <a href=":user_docs">online documentation for the User module</a>.', [':user_docs' => 'https://www.drupal.org/documentation/modules/user']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Creating and managing users') . '</dt>';
-      $output .= '<dd>' . t('Through the <a href=":people">People administration page</a> you can add and cancel user accounts and assign users to roles. By editing one particular user you can change their username, email address, password, and information in other fields.', array(':people' => \Drupal::url('entity.user.collection'))) . '</dd>';
+      $output .= '<dd>' . t('Through the <a href=":people">People administration page</a> you can add and cancel user accounts and assign users to roles. By editing one particular user you can change their username, email address, password, and information in other fields.', [':people' => \Drupal::url('entity.user.collection')]) . '</dd>';
       $output .= '<dt>' . t('Configuring user roles') . '</dt>';
-      $output .= '<dd>' . t('<em>Roles</em> are used to group and classify users; each user can be assigned one or more roles. Typically there are two pre-defined roles: <em>Anonymous user</em> (users that are not logged in), and <em>Authenticated user</em> (users that are registered and logged in). Depending on how your site was set up, an <em>Administrator</em> role may also be available: users with this role will automatically be assigned any new permissions whenever a module is enabled. You can create additional roles on the <a href=":roles">Roles administration page</a>.', array(':roles' => \Drupal::url('entity.user_role.collection'))) . '</dd>';
+      $output .= '<dd>' . t('<em>Roles</em> are used to group and classify users; each user can be assigned one or more roles. Typically there are two pre-defined roles: <em>Anonymous user</em> (users that are not logged in), and <em>Authenticated user</em> (users that are registered and logged in). Depending on how your site was set up, an <em>Administrator</em> role may also be available: users with this role will automatically be assigned any new permissions whenever a module is enabled. You can create additional roles on the <a href=":roles">Roles administration page</a>.', [':roles' => \Drupal::url('entity.user_role.collection')]) . '</dd>';
       $output .= '<dt>' . t('Setting permissions') . '</dt>';
-      $output .= '<dd>' . t('After creating roles, you can set permissions for each role on the <a href=":permissions_user">Permissions page</a>. Granting a permission allows users who have been assigned a particular role to perform an action on the site, such as viewing content, editing or creating  a particular type of content, administering settings for a particular module, or using a particular function of the site (such as search).', array(':permissions_user' => \Drupal::url('user.admin_permissions'))) . '</dd>';
+      $output .= '<dd>' . t('After creating roles, you can set permissions for each role on the <a href=":permissions_user">Permissions page</a>. Granting a permission allows users who have been assigned a particular role to perform an action on the site, such as viewing content, editing or creating  a particular type of content, administering settings for a particular module, or using a particular function of the site (such as search).', [':permissions_user' => \Drupal::url('user.admin_permissions')]) . '</dd>';
       $output .= '<dt>' . t('Managing account settings') . '</dt>';
-      $output .= '<dd>' . t('The <a href=":accounts">Account settings page</a> allows you to manage settings for the displayed name of the Anonymous user role, personal contact forms, user registration settings, and account cancellation settings. On this page you can also manage settings for account personalization, and adapt the text for the email messages that users receive when they register or request a password recovery. You may also set which role is automatically assigned new permissions whenever a module is enabled (the Administrator role).', array(':accounts'  => \Drupal::url('entity.user.admin_form'))) . '</dd>';
+      $output .= '<dd>' . t('The <a href=":accounts">Account settings page</a> allows you to manage settings for the displayed name of the Anonymous user role, personal contact forms, user registration settings, and account cancellation settings. On this page you can also manage settings for account personalization, and adapt the text for the email messages that users receive when they register or request a password recovery. You may also set which role is automatically assigned new permissions whenever a module is enabled (the Administrator role).', [':accounts'  => \Drupal::url('entity.user.admin_form')]) . '</dd>';
       $output .= '<dt>' . t('Managing user account fields') . '</dt>';
-      $output .= '<dd>' . t('Because User accounts are an entity type, you can extend them by adding fields through the Manage fields tab on the <a href=":accounts">Account settings page</a>. By adding fields for e.g., a picture, a biography, or address, you can a create a custom profile for the users of the website. For background information on entities and fields, see the <a href=":field_help">Field module help page</a>.', array(':field_help' => (\Drupal::moduleHandler()->moduleExists('field')) ? \Drupal::url('help.page', array('name' => 'field')) : '#', ':accounts' => \Drupal::url('entity.user.admin_form'))) . '</dd>';
+      $output .= '<dd>' . t('Because User accounts are an entity type, you can extend them by adding fields through the Manage fields tab on the <a href=":accounts">Account settings page</a>. By adding fields for e.g., a picture, a biography, or address, you can a create a custom profile for the users of the website. For background information on entities and fields, see the <a href=":field_help">Field module help page</a>.', [':field_help' => (\Drupal::moduleHandler()->moduleExists('field')) ? \Drupal::url('help.page', ['name' => 'field']) : '#', ':accounts' => \Drupal::url('entity.user.admin_form')]) . '</dd>';
       $output .= '</dl>';
       return $output;
 
@@ -75,10 +88,10 @@ function user_help($route_name, RouteMatchInterface $route_match) {
       return '<p>' . t("This web page allows administrators to register new users. Users' email addresses and usernames must be unique.") . '</p>';
 
     case 'user.admin_permissions':
-      return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href=":role">Roles</a> page to create a role.) Any permissions granted to the Authenticated user role will be given to any user who is logged in to your site. From the <a href=":settings">Account settings</a> page, you can make any role into an Administrator role for the site, meaning that role will be granted all new permissions automatically. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array(':role' => \Drupal::url('entity.user_role.collection'), ':settings' => \Drupal::url('entity.user.admin_form'))) . '</p>';
+      return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href=":role">Roles</a> page to create a role.) Any permissions granted to the Authenticated user role will be given to any user who is logged in to your site. From the <a href=":settings">Account settings</a> page, you can make any role into an Administrator role for the site, meaning that role will be granted all new permissions automatically. You should be careful to ensure that only trusted users are given this access and level of control of your site.', [':role' => \Drupal::url('entity.user_role.collection'), ':settings' => \Drupal::url('entity.user.admin_form')]) . '</p>';
 
     case 'entity.user_role.collection':
-      return '<p>' . t('A role defines a group of users that have certain privileges. These privileges are defined on the <a href=":permissions">Permissions page</a>. Here, you can define the names and the display sort order of the roles on your site. It is recommended to order roles from least permissive (for example, Anonymous user) to most permissive (for example, Administrator user). Users who are not logged in have the Anonymous user role. Users who are logged in have the Authenticated user role, plus any other roles granted to their user account.', array(':permissions' => \Drupal::url('user.admin_permissions'))) . '</p>';
+      return '<p>' . t('A role defines a group of users that have certain privileges. These privileges are defined on the <a href=":permissions">Permissions page</a>. Here, you can define the names and the display sort order of the roles on your site. It is recommended to order roles from least permissive (for example, Anonymous user) to most permissive (for example, Administrator user). Users who are not logged in have the Anonymous user role. Users who are logged in have the Authenticated user role, plus any other roles granted to their user account.', [':permissions' => \Drupal::url('user.admin_permissions')]) . '</p>';
 
     case 'entity.user.field_ui_fields':
       return '<p>' . t('This form lets administrators add and edit fields for storing user data.') . '</p>';
@@ -95,14 +108,14 @@ function user_help($route_name, RouteMatchInterface $route_match) {
  * Implements hook_theme().
  */
 function user_theme() {
-  return array(
-    'user' => array(
+  return [
+    'user' => [
       'render element' => 'elements',
-    ),
-    'username' => array(
-      'variables' => array('account' => NULL, 'attributes' => array(), 'link_options' => array()),
-    ),
-  );
+    ],
+    'username' => [
+      'variables' => ['account' => NULL, 'attributes' => [], 'link_options' => []],
+    ],
+  ];
 }
 
 /**
@@ -136,29 +149,29 @@ function user_picture_enabled() {
  * Implements hook_entity_extra_field_info().
  */
 function user_entity_extra_field_info() {
-  $fields['user']['user']['form']['account'] = array(
+  $fields['user']['user']['form']['account'] = [
     'label' => t('User name and password'),
     'description' => t('User module account form elements.'),
     'weight' => -10,
-  );
-  $fields['user']['user']['form']['language'] = array(
+  ];
+  $fields['user']['user']['form']['language'] = [
     'label' => t('Language settings'),
     'description' => t('User module form element.'),
     'weight' => 0,
-  );
+  ];
   if (\Drupal::config('system.date')->get('timezone.user.configurable')) {
-    $fields['user']['user']['form']['timezone'] = array(
+    $fields['user']['user']['form']['timezone'] = [
       'label' => t('Timezone'),
       'description' => t('System module form element.'),
       'weight' => 6,
-    );
+    ];
   }
 
-  $fields['user']['user']['display']['member_for'] = array(
+  $fields['user']['user']['display']['member_for'] = [
     'label' => t('Member for'),
     'description' => t('User module \'member for\' view element.'),
     'weight' => 5,
-  );
+  ];
 
   return $fields;
 }
@@ -215,7 +228,7 @@ function user_load_multiple(array $uids = NULL, $reset = FALSE) {
  */
 function user_load($uid, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorage('user')->resetCache(array($uid));
+    \Drupal::entityManager()->getStorage('user')->resetCache([$uid]);
   }
   return User::load($uid);
 }
@@ -266,7 +279,7 @@ function user_load_by_name($name) {
  */
 function user_validate_name($name) {
   $definition = BaseFieldDefinition::create('string')
-    ->addConstraint('UserName', array());
+    ->addConstraint('UserName', []);
   $data = \Drupal::typedDataManager()->create($definition);
   $data->setValue($name);
   $violations = $data->validate();
@@ -321,9 +334,9 @@ function user_role_permissions(array $roles) {
     return _user_role_permissions_update($roles);
   }
   $entities = Role::loadMultiple($roles);
-  $role_permissions = array();
+  $role_permissions = [];
   foreach ($roles as $rid) {
-    $role_permissions[$rid] = isset($entities[$rid]) ? $entities[$rid]->getPermissions() : array();
+    $role_permissions[$rid] = isset($entities[$rid]) ? $entities[$rid]->getPermissions() : [];
   }
   return $role_permissions;
 }
@@ -343,9 +356,9 @@ function user_role_permissions(array $roles) {
  *   for the given role.
  */
 function _user_role_permissions_update($roles) {
-  $role_permissions = array();
+  $role_permissions = [];
   foreach ($roles as $rid) {
-    $role_permissions[$rid] = \Drupal::config("user.role.$rid")->get('permissions') ?: array();
+    $role_permissions[$rid] = \Drupal::config("user.role.$rid")->get('permissions') ?: [];
   }
   return $role_permissions;
 }
@@ -371,10 +384,10 @@ function user_is_blocked($name) {
  */
 function user_user_view(array &$build, UserInterface $account, EntityViewDisplayInterface $display) {
   if ($display->getComponent('member_for')) {
-    $build['member_for'] = array(
+    $build['member_for'] = [
       '#type' => 'item',
       '#markup' => '<h4 class="label">' . t('Member for') . '</h4> ' . \Drupal::service('date.formatter')->formatTimeDiffSince($account->getCreatedTime()),
-    );
+    ];
   }
 }
 
@@ -506,9 +519,9 @@ function template_preprocess_username(&$variables) {
         ->toString();
     }
     else {
-      $variables['attributes']['href'] = Url::fromRoute('entity.user.canonical', array(
+      $variables['attributes']['href'] = Url::fromRoute('entity.user.canonical', [
         'user' => $variables['uid'],
-      ))->toString();
+      ])->toString();
     }
   }
 }
@@ -529,7 +542,7 @@ function template_preprocess_username(&$variables) {
  */
 function user_login_finalize(UserInterface $account) {
   \Drupal::currentUser()->setAccount($account);
-  \Drupal::logger('user')->notice('Session opened for %name.', array('%name' => $account->getUsername()));
+  \Drupal::logger('user')->notice('Session opened for %name.', ['%name' => $account->getUsername()]);
   // Update the user table timestamp noting user has logged in.
   // This is also used to invalidate one-time login links.
   $account->setLastLoginTime(REQUEST_TIME);
@@ -543,7 +556,7 @@ function user_login_finalize(UserInterface $account) {
   // in place.
   \Drupal::service('session')->migrate();
   \Drupal::service('session')->set('uid', $account->id());
-  \Drupal::moduleHandler()->invokeAll('user_login', array($account));
+  \Drupal::moduleHandler()->invokeAll('user_login', [$account]);
 }
 
 /**
@@ -578,19 +591,19 @@ function user_user_logout($account) {
  *   A unique URL that provides a one-time log in for the user, from which
  *   they can change their password.
  */
-function user_pass_reset_url($account, $options = array()) {
+function user_pass_reset_url($account, $options = []) {
   $timestamp = REQUEST_TIME;
   $langcode = isset($options['langcode']) ? $options['langcode'] : $account->getPreferredLangcode();
   return \Drupal::url('user.reset',
-    array(
+    [
       'uid' => $account->id(),
       'timestamp' => $timestamp,
       'hash' => user_pass_rehash($account, $timestamp),
-    ),
-    array(
+    ],
+    [
       'absolute' => TRUE,
       'language' => \Drupal::languageManager()->getLanguage($langcode)
-    )
+    ]
   );
 }
 
@@ -611,10 +624,10 @@ function user_pass_reset_url($account, $options = array()) {
  * @see user_mail_tokens()
  * @see \Drupal\user\Controller\UserController::confirmCancel()
  */
-function user_cancel_url(UserInterface $account, $options = array()) {
+function user_cancel_url(UserInterface $account, $options = []) {
   $timestamp = REQUEST_TIME;
   $langcode = isset($options['langcode']) ? $options['langcode'] : $account->getPreferredLangcode();
-  $url_options = array('absolute' => TRUE, 'language' => \Drupal::languageManager()->getLanguage($langcode));
+  $url_options = ['absolute' => TRUE, 'language' => \Drupal::languageManager()->getLanguage($langcode)];
   return \Drupal::url('user.cancel_confirm', [
     'user' => $account->id(),
     'timestamp' => $timestamp,
@@ -670,16 +683,16 @@ function user_cancel($edit, $uid, $method) {
   $account = User::load($uid);
 
   if (!$account) {
-    drupal_set_message(t('The user account %id does not exist.', array('%id' => $uid)), 'error');
-    \Drupal::logger('user')->error('Attempted to cancel non-existing user account: %id.', array('%id' => $uid));
+    drupal_set_message(t('The user account %id does not exist.', ['%id' => $uid]), 'error');
+    \Drupal::logger('user')->error('Attempted to cancel non-existing user account: %id.', ['%id' => $uid]);
     return;
   }
 
   // Initialize batch (to set title).
-  $batch = array(
+  $batch = [
     'title' => t('Cancelling account'),
-    'operations' => array(),
-  );
+    'operations' => [],
+  ];
   batch_set($batch);
 
   // When the 'user_cancel_delete' method is used, user_delete() is called,
@@ -688,16 +701,16 @@ function user_cancel($edit, $uid, $method) {
   // account deletion.
   if ($method != 'user_cancel_delete') {
     // Allow modules to add further sets to this batch.
-    \Drupal::moduleHandler()->invokeAll('user_cancel', array($edit, $account, $method));
+    \Drupal::moduleHandler()->invokeAll('user_cancel', [$edit, $account, $method]);
   }
 
   // Finish the batch and actually cancel the account.
-  $batch = array(
+  $batch = [
     'title' => t('Cancelling user account'),
-    'operations' => array(
-      array('_user_cancel', array($edit, $account, $method)),
-    ),
-  );
+    'operations' => [
+      ['_user_cancel', [$edit, $account, $method]],
+    ],
+  ];
 
   // After cancelling account, ensure that user is logged out.
   if ($account->id() == \Drupal::currentUser()->id()) {
@@ -741,8 +754,8 @@ function _user_cancel($edit, $account, $method) {
       }
       $account->block();
       $account->save();
-      drupal_set_message(t('%name has been disabled.', array('%name' => $account->getDisplayName())));
-      $logger->notice('Blocked user: %name %email.', array('%name' => $account->getAccountName(), '%email' => '<' . $account->getEmail() . '>'));
+      drupal_set_message(t('%name has been disabled.', ['%name' => $account->getDisplayName()]));
+      $logger->notice('Blocked user: %name %email.', ['%name' => $account->getAccountName(), '%email' => '<' . $account->getEmail() . '>']);
       break;
 
     case 'user_cancel_reassign':
@@ -752,8 +765,8 @@ function _user_cancel($edit, $account, $method) {
         _user_mail_notify('status_canceled', $account);
       }
       $account->delete();
-      drupal_set_message(t('%name has been deleted.', array('%name' => $account->getDisplayName())));
-      $logger->notice('Deleted user: %name %email.', array('%name' => $account->getAccountName(), '%email' => '<' . $account->getEmail() . '>'));
+      drupal_set_message(t('%name has been deleted.', ['%name' => $account->getDisplayName()]));
+      $logger->notice('Deleted user: %name %email.', ['%name' => $account->getAccountName(), '%email' => '<' . $account->getEmail() . '>']);
       break;
   }
 
@@ -793,33 +806,33 @@ function _user_cancel_session_regenerate() {
 function user_cancel_methods() {
   $user_settings = \Drupal::config('user.settings');
   $anonymous_name = $user_settings->get('anonymous');
-  $methods = array(
-    'user_cancel_block' => array(
+  $methods = [
+    'user_cancel_block' => [
       'title' => t('Disable the account and keep its content.'),
       'description' => t('Your account will be blocked and you will no longer be able to log in. All of your content will remain attributed to your username.'),
-    ),
-    'user_cancel_block_unpublish' => array(
+    ],
+    'user_cancel_block_unpublish' => [
       'title' => t('Disable the account and unpublish its content.'),
       'description' => t('Your account will be blocked and you will no longer be able to log in. All of your content will be hidden from everyone but administrators.'),
-    ),
-    'user_cancel_reassign' => array(
-      'title' => t('Delete the account and make its content belong to the %anonymous-name user.', array('%anonymous-name' => $anonymous_name)),
-      'description' => t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', array('%anonymous-name' => $anonymous_name)),
-    ),
-    'user_cancel_delete' => array(
+    ],
+    'user_cancel_reassign' => [
+      'title' => t('Delete the account and make its content belong to the %anonymous-name user.', ['%anonymous-name' => $anonymous_name]),
+      'description' => t('Your account will be removed and all account information deleted. All of your content will be assigned to the %anonymous-name user.', ['%anonymous-name' => $anonymous_name]),
+    ],
+    'user_cancel_delete' => [
       'title' => t('Delete the account and its content.'),
       'description' => t('Your account will be removed and all account information deleted. All of your content will also be deleted.'),
       'access' => \Drupal::currentUser()->hasPermission('administer users'),
-    ),
-  );
+    ],
+  ];
   // Allow modules to customize account cancellation methods.
   \Drupal::moduleHandler()->alter('user_cancel_methods', $methods);
 
   // Turn all methods into real form elements.
-  $form = array(
-    '#options' => array(),
+  $form = [
+    '#options' => [],
     '#default_value' => $user_settings->get('cancel_method'),
-  );
+  ];
   foreach ($methods as $name => $method) {
     $form['#options'][$name] = $method['title'];
     // Add the description for the confirmation form. This description is never
@@ -842,7 +855,7 @@ function user_cancel_methods() {
  *   A user ID.
  */
 function user_delete($uid) {
-  user_delete_multiple(array($uid));
+  user_delete_multiple([$uid]);
 }
 
 /**
@@ -911,9 +924,9 @@ function user_mail($key, &$message, $params) {
   $token_service = \Drupal::token();
   $language_manager = \Drupal::languageManager();
   $langcode = $message['langcode'];
-  $variables = array('user' => $params['account']);
+  $variables = ['user' => $params['account']];
 
-  $language = \Drupal::languageManager()->getLanguage($params['account']->getPreferredLangcode());
+  $language = $language_manager->getLanguage($params['account']->getPreferredLangcode());
   $original_language = $language_manager->getConfigOverrideLanguage();
   $language_manager->setConfigOverrideLanguage($language);
   $mail_config = \Drupal::config('user.mail');
@@ -981,34 +994,34 @@ function user_role_names($membersonly = FALSE, $permission = NULL) {
  */
 function user_user_role_insert(RoleInterface $role) {
   // Ignore the authenticated and anonymous roles or the role is being synced.
-  if (in_array($role->id(), array(RoleInterface::AUTHENTICATED_ID, RoleInterface::ANONYMOUS_ID)) || $role->isSyncing()) {
+  if (in_array($role->id(), [RoleInterface::AUTHENTICATED_ID, RoleInterface::ANONYMOUS_ID]) || $role->isSyncing()) {
     return;
   }
 
   $add_id = 'user_add_role_action.' . $role->id();
   if (!Action::load($add_id)) {
-    $action = Action::create(array(
+    $action = Action::create([
       'id' => $add_id,
       'type' => 'user',
-      'label' => t('Add the @label role to the selected users', array('@label' => $role->label())),
-      'configuration' => array(
+      'label' => t('Add the @label role to the selected users', ['@label' => $role->label()]),
+      'configuration' => [
         'rid' => $role->id(),
-      ),
+      ],
       'plugin' => 'user_add_role_action',
-    ));
+    ]);
     $action->trustData()->save();
   }
   $remove_id = 'user_remove_role_action.' . $role->id();
   if (!Action::load($remove_id)) {
-    $action = Action::create(array(
+    $action = Action::create([
       'id' => $remove_id,
       'type' => 'user',
-      'label' => t('Remove the @label role from the selected users', array('@label' => $role->label())),
-      'configuration' => array(
+      'label' => t('Remove the @label role from the selected users', ['@label' => $role->label()]),
+      'configuration' => [
         'rid' => $role->id(),
-      ),
+      ],
       'plugin' => 'user_remove_role_action',
-    ));
+    ]);
     $action->trustData()->save();
   }
 }
@@ -1019,10 +1032,10 @@ function user_user_role_insert(RoleInterface $role) {
 function user_user_role_delete(RoleInterface $role) {
   // Delete role references for all users.
   $user_storage = \Drupal::entityManager()->getStorage('user');
-  $user_storage->deleteRoleReferences(array($role->id()));
+  $user_storage->deleteRoleReferences([$role->id()]);
 
   // Ignore the authenticated and anonymous roles or the role is being synced.
-  if (in_array($role->id(), array(RoleInterface::AUTHENTICATED_ID, RoleInterface::ANONYMOUS_ID)) || $role->isSyncing()) {
+  if (in_array($role->id(), [RoleInterface::AUTHENTICATED_ID, RoleInterface::ANONYMOUS_ID]) || $role->isSyncing()) {
     return;
   }
 
@@ -1112,7 +1125,7 @@ function user_role_load($rid) {
  * @see user_role_grant_permissions()
  * @see user_role_revoke_permissions()
  */
-function user_role_change_permissions($rid, array $permissions = array()) {
+function user_role_change_permissions($rid, array $permissions = []) {
   // Grant new permissions for the role.
   $grant = array_filter($permissions);
   if (!empty($grant)) {
@@ -1136,7 +1149,7 @@ function user_role_change_permissions($rid, array $permissions = array()) {
  * @see user_role_change_permissions()
  * @see user_role_revoke_permissions()
  */
-function user_role_grant_permissions($rid, array $permissions = array()) {
+function user_role_grant_permissions($rid, array $permissions = []) {
   // Grant new permissions for the role.
   if ($role = Role::load($rid)) {
     foreach ($permissions as $permission) {
@@ -1157,7 +1170,7 @@ function user_role_grant_permissions($rid, array $permissions = array()) {
  * @see user_role_change_permissions()
  * @see user_role_grant_permissions()
  */
-function user_role_revoke_permissions($rid, array $permissions = array()) {
+function user_role_revoke_permissions($rid, array $permissions = []) {
   // Revoke permissions for the role.
   $role = Role::load($rid);
   foreach ($permissions as $permission) {
@@ -1238,16 +1251,16 @@ function user_element_info_alter(array &$types) {
  * validation.
  */
 function user_form_process_password_confirm($element) {
-  $password_settings = array(
+  $password_settings = [
     'confirmTitle' => t('Passwords match:'),
     'confirmSuccess' => t('yes'),
     'confirmFailure' => t('no'),
     'showStrengthIndicator' => FALSE,
-  );
+  ];
 
   if (\Drupal::config('user.settings')->get('password_strength')) {
     $password_settings['showStrengthIndicator'] = TRUE;
-    $password_settings += array(
+    $password_settings += [
       'strengthTitle' => t('Password strength:'),
       'hasWeaknesses' => t('Recommendations to make your password stronger:'),
       'tooShort' => t('Make it at least 12 characters'),
@@ -1261,7 +1274,7 @@ function user_form_process_password_confirm($element) {
       'good' => t('Good'),
       'strong' => t('Strong'),
       'username' => \Drupal::currentUser()->getUsername(),
-    );
+    ];
   }
 
   $element['#attached']['library'][] = 'user/drupal.user';
@@ -1310,77 +1323,77 @@ function user_toolbar() {
   // Add logout & user account links or login link.
   $links_cache_contexts = [];
   if ($user->isAuthenticated()) {
-    $links = array(
-      'account' => array(
+    $links = [
+      'account' => [
         'title' => t('View profile'),
         'url' => Url::fromRoute('user.page'),
-        'attributes' => array(
+        'attributes' => [
           'title' => t('User account'),
-        ),
-      ),
-      'account_edit' => array(
+        ],
+      ],
+      'account_edit' => [
         'title' => t('Edit profile'),
         'url' => Url::fromRoute('entity.user.edit_form', ['user' => $user->id()]),
-        'attributes' => array(
+        'attributes' => [
           'title' => t('Edit user account'),
-        ),
-      ),
-      'logout' => array(
+        ],
+      ],
+      'logout' => [
         'title' => t('Log out'),
         'url' => Url::fromRoute('user.logout'),
-      ),
-    );
+      ],
+    ];
     // The "Edit user account" link is per-user.
     $links_cache_contexts[] = 'user';
   }
   else {
-    $links = array(
-      'login' => array(
+    $links = [
+      'login' => [
         'title' => t('Log in'),
         'url' => Url::fromRoute('user.page'),
-      ),
-    );
+      ],
+    ];
   }
 
-  $items['user'] = array(
+  $items['user'] = [
     '#type' => 'toolbar_item',
-    'tab' => array(
+    'tab' => [
       '#type' => 'link',
       '#title' => $user->getDisplayName(),
       '#url' => Url::fromRoute('user.page'),
-      '#attributes' => array(
+      '#attributes' => [
         'title' => t('My account'),
-        'class' => array('toolbar-icon', 'toolbar-icon-user'),
-      ),
+        'class' => ['toolbar-icon', 'toolbar-icon-user'],
+      ],
       '#cache' => [
         'contexts' => [
           // Cacheable per user, because the current user's name is shown.
           'user',
         ],
       ],
-    ),
-    'tray' => array(
+    ],
+    'tray' => [
       '#heading' => t('User account actions'),
-      'user_links' => array(
+      'user_links' => [
         '#cache' => [
           // Cacheable per "authenticated or not", because the links to
           // display depend on that.
-          'contexts' => Cache::mergeContexts(array('user.roles:authenticated'), $links_cache_contexts),
+          'contexts' => Cache::mergeContexts(['user.roles:authenticated'], $links_cache_contexts),
         ],
         '#theme' => 'links__toolbar_user',
         '#links' => $links,
-        '#attributes' => array(
-          'class' => array('toolbar-menu'),
-        ),
-      ),
-    ),
+        '#attributes' => [
+          'class' => ['toolbar-menu'],
+        ],
+      ],
+    ],
     '#weight' => 100,
-    '#attached' => array(
-      'library' => array(
+    '#attached' => [
+      'library' => [
         'user/drupal.user.icons',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
   return $items;
 }
@@ -1391,9 +1404,9 @@ function user_toolbar() {
 function user_logout() {
   $user = \Drupal::currentUser();
 
-  \Drupal::logger('user')->notice('Session closed for %name.', array('%name' => $user->getAccountName()));
+  \Drupal::logger('user')->notice('Session closed for %name.', ['%name' => $user->getAccountName()]);
 
-  \Drupal::moduleHandler()->invokeAll('user_logout', array($user));
+  \Drupal::moduleHandler()->invokeAll('user_logout', [$user]);
 
   // Destroy the current session, and reset $user to the anonymous user.
   // Note: In Symfony the session is intended to be destroyed with
diff --git a/web/core/modules/user/user.post_update.php b/web/core/modules/user/user.post_update.php
new file mode 100644
index 000000000..3f19b0c16
--- /dev/null
+++ b/web/core/modules/user/user.post_update.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Post update functions for User module.
+ */
+
+use Drupal\user\Entity\Role;
+
+/**
+ * Enforce order of role permissions.
+ */
+function user_post_update_enforce_order_of_permissions() {
+  $entity_save = function (Role $role) {
+    $permissions = $role->getPermissions();
+    sort($permissions);
+    if ($permissions !== $role->getPermissions()) {
+      $role->save();
+    }
+  };
+  array_map($entity_save, Role::loadMultiple());
+}
diff --git a/web/core/modules/user/user.tokens.inc b/web/core/modules/user/user.tokens.inc
index 7f456f661..8c02f6e6c 100644
--- a/web/core/modules/user/user.tokens.inc
+++ b/web/core/modules/user/user.tokens.inc
@@ -13,61 +13,61 @@ use Drupal\user\Entity\User;
  * Implements hook_token_info().
  */
 function user_token_info() {
-  $types['user'] = array(
+  $types['user'] = [
     'name' => t('Users'),
     'description' => t('Tokens related to individual user accounts.'),
     'needs-data' => 'user',
-  );
-  $types['current-user'] = array(
+  ];
+  $types['current-user'] = [
     'name' => t('Current user'),
     'description' => t('Tokens related to the currently logged in user.'),
     'type' => 'user',
-  );
+  ];
 
-  $user['uid'] = array(
+  $user['uid'] = [
     'name' => t('User ID'),
     'description' => t("The unique ID of the user account."),
-  );
-  $user['name'] = array(
+  ];
+  $user['name'] = [
     'name' => t("Deprecated: User Name"),
     'description' => t("Deprecated: Use account-name or display-name instead."),
-  );
-  $user['account-name'] = array(
+  ];
+  $user['account-name'] = [
     'name' => t("Account Name"),
     'description' => t("The login name of the user account."),
-  );
-  $user['display-name'] = array(
+  ];
+  $user['display-name'] = [
     'name' => t("Display Name"),
     'description' => t("The display name of the user account."),
-  );
-  $user['mail'] = array(
+  ];
+  $user['mail'] = [
     'name' => t("Email"),
     'description' => t("The email address of the user account."),
-  );
-  $user['url'] = array(
+  ];
+  $user['url'] = [
     'name' => t("URL"),
     'description' => t("The URL of the account profile page."),
-  );
-  $user['edit-url'] = array(
+  ];
+  $user['edit-url'] = [
     'name' => t("Edit URL"),
     'description' => t("The URL of the account edit page."),
-  );
+  ];
 
-  $user['last-login'] = array(
+  $user['last-login'] = [
     'name' => t("Last login"),
     'description' => t("The date the user last logged in to the site."),
     'type' => 'date',
-  );
-  $user['created'] = array(
+  ];
+  $user['created'] = [
     'name' => t("Created"),
     'description' => t("The date the user account was created."),
     'type' => 'date',
-  );
+  ];
 
-  return array(
+  return [
     'types' => $types,
-    'tokens' => array('user' => $user),
-  );
+    'tokens' => ['user' => $user],
+  ];
 }
 
 /**
@@ -76,7 +76,7 @@ function user_token_info() {
 function user_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
 
   $token_service = \Drupal::token();
-  $url_options = array('absolute' => TRUE);
+  $url_options = ['absolute' => TRUE];
   if (isset($options['langcode'])) {
     $url_options['language'] = \Drupal::languageManager()->getLanguage($options['langcode']);
     $langcode = $options['langcode'];
@@ -84,7 +84,7 @@ function user_tokens($type, $tokens, array $data, array $options, BubbleableMeta
   else {
     $langcode = NULL;
   }
-  $replacements = array();
+  $replacements = [];
 
   if ($type == 'user' && !empty($data['user'])) {
     /** @var \Drupal\user\UserInterface $account */
@@ -142,18 +142,18 @@ function user_tokens($type, $tokens, array $data, array $options, BubbleableMeta
     }
 
     if ($login_tokens = $token_service->findWithPrefix($tokens, 'last-login')) {
-      $replacements += $token_service->generate('date', $login_tokens, array('date' => $account->getLastLoginTime()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('date', $login_tokens, ['date' => $account->getLastLoginTime()], $options, $bubbleable_metadata);
     }
 
     if ($registered_tokens = $token_service->findWithPrefix($tokens, 'created')) {
-      $replacements += $token_service->generate('date', $registered_tokens, array('date' => $account->getCreatedTime()), $options, $bubbleable_metadata);
+      $replacements += $token_service->generate('date', $registered_tokens, ['date' => $account->getCreatedTime()], $options, $bubbleable_metadata);
     }
   }
 
   if ($type == 'current-user') {
     $account = User::load(\Drupal::currentUser()->id());
     $bubbleable_metadata->addCacheContexts(['user']);
-    $replacements += $token_service->generate('user', $tokens, array('user' => $account), $options, $bubbleable_metadata);
+    $replacements += $token_service->generate('user', $tokens, ['user' => $account], $options, $bubbleable_metadata);
   }
 
   return $replacements;
diff --git a/web/core/modules/user/user.views_execution.inc b/web/core/modules/user/user.views_execution.inc
index c9a3f1dbc..255fbf268 100644
--- a/web/core/modules/user/user.views_execution.inc
+++ b/web/core/modules/user/user.views_execution.inc
@@ -13,5 +13,5 @@ use Drupal\views\ViewExecutable;
  * Allow replacement of current userid so we can cache these queries.
  */
 function user_views_query_substitutions(ViewExecutable $view) {
-  return array('***CURRENT_USER***' => \Drupal::currentUser()->id());
+  return ['***CURRENT_USER***' => \Drupal::currentUser()->id()];
 }
diff --git a/web/core/modules/views/config/schema/views.data_types.schema.yml b/web/core/modules/views/config/schema/views.data_types.schema.yml
index 0683380c7..a3d1b3430 100644
--- a/web/core/modules/views/config/schema/views.data_types.schema.yml
+++ b/web/core/modules/views/config/schema/views.data_types.schema.yml
@@ -777,7 +777,7 @@ views_filter_group_item:
       type: string
       label: 'Operator'
     value:
-      type: label
+      type: views.filter_value.[%parent.%parent.%parent.%parent.plugin_id]
       label: 'Value'
 
 views_relationship:
diff --git a/web/core/modules/views/config/schema/views.filter.schema.yml b/web/core/modules/views/config/schema/views.filter.schema.yml
index e411489b0..0dc8d35a4 100644
--- a/web/core/modules/views/config/schema/views.filter.schema.yml
+++ b/web/core/modules/views/config/schema/views.filter.schema.yml
@@ -63,6 +63,12 @@ views.filter.in_operator:
         reduce:
           type: boolean
           label: 'Reduce'
+    group_info:
+      mapping:
+        group_items:
+          sequence:
+            type: views.filter.group_item.in_operator
+            label: 'Group item'
 
 views.filter.string:
   type: views_filter
@@ -93,8 +99,12 @@ views.filter_value.numeric:
       type: string
       label: 'Value'
 
+views.filter_value.*:
+  type: string
+  label: 'Filter value'
+
 views.filter_value.equality:
-  type: views.filter_value.numeric
+  type: string
   label: 'Equality'
 
 views.filter.many_to_one:
@@ -109,18 +119,26 @@ views.filter.standard:
   type: views_filter
   label: 'Standard'
 
+# Schema for the views group items.
 views.filter.group_item.*:
   type: views_filter_group_item
-  label: 'Default'
+  label: 'Group item'
 
-views.filter.group_item.numeric:
+views.filter.group_item.boolean:
   type: views_filter_group_item
-  label: 'Group items'
   mapping:
     value:
-      type: views.filter_value.numeric
+      type: views.filter_value.string
+
+views.filter.group_item.in_operator:
+  type: views_filter_group_item
+  mapping:
+    value:
+      type: views.filter_value.in_operator
 
 # Schema for the views filter value.
+views.filter_value.string:
+  type: string
 
 views.filter_value.boolean:
   type: string
@@ -131,3 +149,26 @@ views.filter_value.combine:
 views.filter.language:
   type: views.filter.in_operator
   label: 'Language'
+
+views.filter_value.date:
+  type: views.filter_value.numeric
+  label: 'Date'
+  mapping:
+    type:
+      type: string
+      label: 'Type'
+
+views.filter_value.datetime:
+  type: views.filter_value.numeric
+  label: 'Date'
+  mapping:
+    type:
+      type: string
+      label: 'Type'
+
+views.filter_value.in_operator:
+  type: sequence
+  label: 'Values'
+  sequence:
+    type: string
+    label: 'Value'
diff --git a/web/core/modules/views/js/ajax_view.js b/web/core/modules/views/js/ajax_view.js
index 6422dd0a5..85975b56c 100644
--- a/web/core/modules/views/js/ajax_view.js
+++ b/web/core/modules/views/js/ajax_view.js
@@ -128,13 +128,11 @@
   /**
    * @return {bool}
    *   If there is at least one parent with a view class return false.
-   *
-   * @todo remove .size() replace with .length.
    */
   Drupal.views.ajaxView.prototype.filterNestedViews = function () {
     // If there is at least one parent with a view class, this view
     // is nested (e.g., an attachment). Bail.
-    return !this.$view.parents('.view').size();
+    return !this.$view.parents('.view').length;
   };
 
   /**
diff --git a/web/core/modules/views/src/Ajax/HighlightCommand.php b/web/core/modules/views/src/Ajax/HighlightCommand.php
index c19ff1b66..b04c0bef0 100644
--- a/web/core/modules/views/src/Ajax/HighlightCommand.php
+++ b/web/core/modules/views/src/Ajax/HighlightCommand.php
@@ -32,10 +32,10 @@ class HighlightCommand implements CommandInterface {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => 'viewsHighlight',
       'selector' => $this->selector,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Ajax/ReplaceTitleCommand.php b/web/core/modules/views/src/Ajax/ReplaceTitleCommand.php
index 45972c3c1..90e462abf 100644
--- a/web/core/modules/views/src/Ajax/ReplaceTitleCommand.php
+++ b/web/core/modules/views/src/Ajax/ReplaceTitleCommand.php
@@ -32,10 +32,10 @@ class ReplaceTitleCommand implements CommandInterface {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => 'viewsReplaceTitle',
       'selector' => $this->title,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Ajax/ScrollTopCommand.php b/web/core/modules/views/src/Ajax/ScrollTopCommand.php
index a303ffbbe..bf2db4e7c 100644
--- a/web/core/modules/views/src/Ajax/ScrollTopCommand.php
+++ b/web/core/modules/views/src/Ajax/ScrollTopCommand.php
@@ -32,10 +32,10 @@ class ScrollTopCommand implements CommandInterface {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => 'viewsScrollTop',
       'selector' => $this->selector,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Ajax/ShowButtonsCommand.php b/web/core/modules/views/src/Ajax/ShowButtonsCommand.php
index f5d7dceb7..aecd6bd63 100644
--- a/web/core/modules/views/src/Ajax/ShowButtonsCommand.php
+++ b/web/core/modules/views/src/Ajax/ShowButtonsCommand.php
@@ -33,10 +33,10 @@ class ShowButtonsCommand implements CommandInterface {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => 'viewsShowButtons',
       'changed' => $this->changed,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Ajax/TriggerPreviewCommand.php b/web/core/modules/views/src/Ajax/TriggerPreviewCommand.php
index 080bc0247..64e76cb83 100644
--- a/web/core/modules/views/src/Ajax/TriggerPreviewCommand.php
+++ b/web/core/modules/views/src/Ajax/TriggerPreviewCommand.php
@@ -15,9 +15,9 @@ class TriggerPreviewCommand implements CommandInterface {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => 'viewsTriggerPreview',
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Ajax/ViewAjaxResponse.php b/web/core/modules/views/src/Ajax/ViewAjaxResponse.php
index 9af9a67d4..d19180044 100644
--- a/web/core/modules/views/src/Ajax/ViewAjaxResponse.php
+++ b/web/core/modules/views/src/Ajax/ViewAjaxResponse.php
@@ -32,7 +32,7 @@ class ViewAjaxResponse extends AjaxResponse {
   /**
    * Gets the executed view of this response.
    *
-   * @return \Drupal\views\ViewExecutable $view
+   * @return \Drupal\views\ViewExecutable
    *   The View executed on this ajax request.
    */
   public function getView() {
diff --git a/web/core/modules/views/src/Analyzer.php b/web/core/modules/views/src/Analyzer.php
index 2a3334292..a5de193de 100644
--- a/web/core/modules/views/src/Analyzer.php
+++ b/web/core/modules/views/src/Analyzer.php
@@ -44,7 +44,7 @@ class Analyzer {
    */
   public function getMessages(ViewExecutable $view) {
     $view->initDisplay();
-    $messages = $this->moduleHandler->invokeAll('views_analyze', array($view));
+    $messages = $this->moduleHandler->invokeAll('views_analyze', [$view]);
 
     return $messages;
   }
@@ -57,13 +57,13 @@ class Analyzer {
    */
   public function formatMessages(array $messages) {
     if (empty($messages)) {
-      $messages = array(static::formatMessage(t('View analysis can find nothing to report.'), 'ok'));
+      $messages = [static::formatMessage(t('View analysis can find nothing to report.'), 'ok')];
     }
 
-    $types = array('ok' => array(), 'warning' => array(), 'error' => array());
+    $types = ['ok' => [], 'warning' => [], 'error' => []];
     foreach ($messages as $message) {
       if (empty($types[$message['type']])) {
-        $types[$message['type']] = array();
+        $types[$message['type']] = [];
       }
       $types[$message['type']][] = $message['message'];
     }
@@ -73,10 +73,10 @@ class Analyzer {
       $type .= ' messages';
       $message = '';
       if (count($messages) > 1) {
-        $item_list = array(
+        $item_list = [
           '#theme' => 'item_list',
           '#items' => $messages,
-        );
+        ];
         $message = drupal_render($item_list);
       }
       elseif ($messages) {
@@ -115,8 +115,8 @@ class Analyzer {
    * @return array
    *   A single formatted message, consisting of a key message and a key type.
    */
-  static function formatMessage($message, $type = 'error') {
-    return array('message' => $message, 'type' => $type);
+  public static function formatMessage($message, $type = 'error') {
+    return ['message' => $message, 'type' => $type];
   }
 
 }
diff --git a/web/core/modules/views/src/Controller/ViewAjaxController.php b/web/core/modules/views/src/Controller/ViewAjaxController.php
index 7993d2a58..c40cf8576 100644
--- a/web/core/modules/views/src/Controller/ViewAjaxController.php
+++ b/web/core/modules/views/src/Controller/ViewAjaxController.php
@@ -114,7 +114,7 @@ class ViewAjaxController implements ContainerInjectionInterface {
     $display_id = $request->request->get('view_display_id');
     if (isset($name) && isset($display_id)) {
       $args = $request->request->get('view_args');
-      $args = isset($args) && $args !== '' ? explode('/', $args) : array();
+      $args = isset($args) && $args !== '' ? explode('/', $args) : [];
 
       // Arguments can be empty, make sure they are passed on as NULL so that
       // argument validation is not triggered.
@@ -132,7 +132,7 @@ class ViewAjaxController implements ContainerInjectionInterface {
 
       // Remove all of this stuff from the query of the request so it doesn't
       // end up in pagers and tablesort URLs.
-      foreach (array('view_name', 'view_display_id', 'view_args', 'view_path', 'view_dom_id', 'pager_element', 'view_base_path', AjaxResponseSubscriber::AJAX_REQUEST_PARAMETER) as $key) {
+      foreach (['view_name', 'view_display_id', 'view_args', 'view_path', 'view_dom_id', 'pager_element', 'view_base_path', AjaxResponseSubscriber::AJAX_REQUEST_PARAMETER] as $key) {
         $request->query->remove($key);
         $request->request->remove($key);
       }
diff --git a/web/core/modules/views/src/DisplayPluginCollection.php b/web/core/modules/views/src/DisplayPluginCollection.php
index 0b692b115..7c3c736fa 100644
--- a/web/core/modules/views/src/DisplayPluginCollection.php
+++ b/web/core/modules/views/src/DisplayPluginCollection.php
@@ -80,7 +80,7 @@ class DisplayPluginCollection extends DefaultLazyPluginCollection {
     // display plugin isn't found.
     catch (PluginException $e) {
       $message = $e->getMessage();
-      drupal_set_message(t('@message', array('@message' => $message)), 'warning');
+      drupal_set_message(t('@message', ['@message' => $message]), 'warning');
     }
 
     // If no plugin instance has been created, return NULL.
diff --git a/web/core/modules/views/src/Element/View.php b/web/core/modules/views/src/Element/View.php
index b02e260fe..43d1058c8 100644
--- a/web/core/modules/views/src/Element/View.php
+++ b/web/core/modules/views/src/Element/View.php
@@ -17,16 +17,16 @@ class View extends RenderElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
-      '#pre_render' => array(
-        array($class, 'preRenderViewElement'),
-      ),
+    return [
+      '#pre_render' => [
+        [$class, 'preRenderViewElement'],
+      ],
       '#name' => NULL,
       '#display_id' => 'default',
-      '#arguments' => array(),
+      '#arguments' => [],
       '#embed' => TRUE,
       '#cache' => [],
-    );
+    ];
   }
 
   /**
@@ -92,7 +92,7 @@ class View extends RenderElement {
       }
       if (empty($view->display_handler->getPluginDefinition()['returns_response'])) {
         $element['#attributes']['class'][] = 'views-element-container';
-        $element['#theme_wrappers'] = array('container');
+        $element['#theme_wrappers'] = ['container'];
       }
     }
 
diff --git a/web/core/modules/views/src/Entity/Render/EntityFieldRenderer.php b/web/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
index 1b05c1b2a..3c38da176 100644
--- a/web/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
+++ b/web/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
@@ -7,7 +7,7 @@ use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\views\Plugin\views\field\Field;
+use Drupal\views\Plugin\views\field\EntityField;
 use Drupal\views\Plugin\views\query\QueryPluginBase;
 use Drupal\views\ResultRow;
 use Drupal\views\ViewExecutable;
@@ -111,13 +111,13 @@ class EntityFieldRenderer extends RendererBase {
    *
    * @param \Drupal\views\ResultRow $row
    *   A single row of the query result.
-   * @param \Drupal\views\Plugin\views\field\Field $field
+   * @param \Drupal\views\Plugin\views\field\EntityField $field
    *   (optional) A field to be rendered.
    *
    * @return array
    *   A renderable array for the entity data contained in the result row.
    */
-  public function render(ResultRow $row, Field $field = NULL) {
+  public function render(ResultRow $row, EntityField $field = NULL) {
     // The method is called for each field in each result row. In order to
     // leverage multiple-entity building of formatter output, we build the
     // render arrays for all fields in all rows on the first call.
@@ -259,7 +259,7 @@ class EntityFieldRenderer extends RendererBase {
   protected function getRenderableFieldIds() {
     $field_ids = [];
     foreach ($this->view->field as $field_id => $field) {
-      if ($field instanceof Field && $field->relationship == $this->relationship) {
+      if ($field instanceof EntityField && $field->relationship == $this->relationship) {
         $field_ids[] = $field_id;
       }
     }
diff --git a/web/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php b/web/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php
index e08ef04d3..8fbc191d1 100644
--- a/web/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php
+++ b/web/core/modules/views/src/Entity/Render/EntityTranslationRenderTrait.php
@@ -30,10 +30,10 @@ trait EntityTranslationRenderTrait {
       $view = $this->getView();
       $rendering_language = $view->display_handler->getOption('rendering_language');
       $langcode = NULL;
-      $dynamic_renderers = array(
+      $dynamic_renderers = [
         '***LANGUAGE_entity_translation***' => 'TranslationLanguageRenderer',
         '***LANGUAGE_entity_default***' => 'DefaultLanguageRenderer',
-      );
+      ];
       if (isset($dynamic_renderers[$rendering_language])) {
         // Dynamic language set based on result rows or instance defaults.
         $renderer = $dynamic_renderers[$rendering_language];
diff --git a/web/core/modules/views/src/Entity/View.php b/web/core/modules/views/src/Entity/View.php
index 1e9fac104..298c20b3b 100644
--- a/web/core/modules/views/src/Entity/View.php
+++ b/web/core/modules/views/src/Entity/View.php
@@ -91,7 +91,7 @@ class View extends ConfigEntityBase implements ViewEntityInterface {
    *
    * @var array
    */
-  protected $display = array();
+  protected $display = [];
 
   /**
    * The name of the base field to use.
@@ -182,15 +182,15 @@ class View extends ConfigEntityBase implements ViewEntityInterface {
       }
     }
 
-    $display_options = array(
+    $display_options = [
       'display_plugin' => $plugin_id,
       'id' => $id,
       // Cast the display title to a string since it is an object.
       // @see \Drupal\Core\StringTranslation\TranslatableMarkup
       'display_title' => (string) $title,
       'position' => $id === 'default' ? 0 : count($this->display),
-      'display_options' => array(),
-    );
+      'display_options' => [],
+    ];
 
     // Add the display options to the view.
     $this->display[$id] = $display_options;
@@ -293,7 +293,7 @@ class View extends ConfigEntityBase implements ViewEntityInterface {
     // Sort the displays.
     $display = $this->get('display');
     ksort($display);
-    $this->set('display', array('default' => $display['default']) + $display);
+    $this->set('display', ['default' => $display['default']] + $display);
 
     // @todo Check whether isSyncing is needed.
     if (!$this->isSyncing()) {
@@ -369,17 +369,17 @@ class View extends ConfigEntityBase implements ViewEntityInterface {
 
     // If there is no information about displays available add at least the
     // default display.
-    $values += array(
-      'display' => array(
-        'default' => array(
+    $values += [
+      'display' => [
+        'default' => [
           'display_plugin' => 'default',
           'id' => 'default',
           'display_title' => 'Master',
           'position' => 0,
-          'display_options' => array(),
-        ),
-      )
-    );
+          'display_options' => [],
+        ],
+      ]
+    ];
   }
 
   /**
@@ -424,15 +424,15 @@ class View extends ConfigEntityBase implements ViewEntityInterface {
    * {@inheritdoc}
    */
   public function mergeDefaultDisplaysOptions() {
-    $displays = array();
+    $displays = [];
     foreach ($this->get('display') as $key => $options) {
-      $options += array(
-        'display_options' => array(),
+      $options += [
+        'display_options' => [],
         'display_plugin' => NULL,
         'id' => NULL,
         'display_title' => '',
         'position' => NULL,
-      );
+      ];
       // Add the defaults for the display.
       $displays[$key] = $options;
     }
diff --git a/web/core/modules/views/src/EntityViewsData.php b/web/core/modules/views/src/EntityViewsData.php
index 61def5acd..2ba2086ac 100644
--- a/web/core/modules/views/src/EntityViewsData.php
+++ b/web/core/modules/views/src/EntityViewsData.php
@@ -78,7 +78,7 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
    * @param \Drupal\Core\StringTranslation\TranslationInterface $translation_manager
    *   The translation manager.
    */
-  function __construct(EntityTypeInterface $entity_type, SqlEntityStorageInterface $storage_controller, EntityManagerInterface $entity_manager, ModuleHandlerInterface $module_handler, TranslationInterface $translation_manager) {
+  public function __construct(EntityTypeInterface $entity_type, SqlEntityStorageInterface $storage_controller, EntityManagerInterface $entity_manager, ModuleHandlerInterface $module_handler, TranslationInterface $translation_manager) {
     $this->entityType = $entity_type;
     $this->entityManager = $entity_manager;
     $this->storage = $storage_controller;
@@ -161,28 +161,28 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
 
     if ($label_key = $this->entityType->getKey('label')) {
       if ($data_table) {
-        $data[$views_base_table]['table']['base']['defaults'] = array(
+        $data[$views_base_table]['table']['base']['defaults'] = [
           'field' => $label_key,
           'table' => $data_table,
-        );
+        ];
       }
       else {
-        $data[$views_base_table]['table']['base']['defaults'] = array(
+        $data[$views_base_table]['table']['base']['defaults'] = [
           'field' => $label_key,
-        );
+        ];
       }
     }
 
     // Entity types must implement a list_builder in order to use Views'
     // entity operations field.
     if ($this->entityType->hasListBuilderClass()) {
-      $data[$base_table]['operations'] = array(
-        'field' => array(
+      $data[$base_table]['operations'] = [
+        'field' => [
           'title' => $this->t('Operations links'),
           'help' => $this->t('Provides links to perform entity operations.'),
           'id' => 'entity_operations',
-        ),
-      );
+        ],
+      ];
     }
 
     if ($this->entityType->hasViewBuilderClass()) {
@@ -215,26 +215,26 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
         $views_revision_base_table = $revision_data_table;
       }
       $data[$views_revision_base_table]['table']['entity revision'] = TRUE;
-      $data[$views_revision_base_table]['table']['base'] = array(
+      $data[$views_revision_base_table]['table']['base'] = [
         'field' => $revision_field,
-        'title' => $this->t('@entity_type revisions', array('@entity_type' => $this->entityType->getLabel())),
-      );
+        'title' => $this->t('@entity_type revisions', ['@entity_type' => $this->entityType->getLabel()]),
+      ];
       // Join the revision table to the base table.
-      $data[$views_revision_base_table]['table']['join'][$views_base_table] = array(
+      $data[$views_revision_base_table]['table']['join'][$views_base_table] = [
         'left_field' => $revision_field,
         'field' => $revision_field,
         'type' => 'INNER',
-      );
+      ];
 
       if ($revision_data_table) {
         $data[$revision_data_table]['table']['group'] = $this->t('@entity_type revision', ['@entity_type' => $this->entityType->getLabel()]);
         $data[$revision_data_table]['table']['entity revision'] = TRUE;
 
-        $data[$revision_table]['table']['join'][$revision_data_table] = array(
+        $data[$revision_table]['table']['join'][$revision_data_table] = [
           'left_field' => $revision_field,
           'field' => $revision_field,
           'type' => 'INNER',
-        );
+        ];
       }
     }
 
@@ -404,7 +404,7 @@ class EntityViewsData implements EntityHandlerInterface, EntityViewsDataInterfac
    *   The modified views data field definition.
    */
   protected function mapSingleFieldViewsData($table, $field_name, $field_type, $column_name, $column_type, $first, FieldDefinitionInterface $field_definition) {
-    $views_field = array();
+    $views_field = [];
 
     // Provide a nicer, less verbose label for the first column within a field.
     // @todo Introduce concept of the "main" column for a field, rather than
diff --git a/web/core/modules/views/src/EventSubscriber/RouteSubscriber.php b/web/core/modules/views/src/EventSubscriber/RouteSubscriber.php
index e8b09927e..c2b9ea891 100644
--- a/web/core/modules/views/src/EventSubscriber/RouteSubscriber.php
+++ b/web/core/modules/views/src/EventSubscriber/RouteSubscriber.php
@@ -49,7 +49,7 @@ class RouteSubscriber extends RouteSubscriberBase {
    *
    * @var array
    */
-  protected $viewRouteNames = array();
+  protected $viewRouteNames = [];
 
   /**
    * Constructs a \Drupal\views\EventSubscriber\RouteSubscriber instance.
@@ -76,7 +76,7 @@ class RouteSubscriber extends RouteSubscriberBase {
    */
   public static function getSubscribedEvents() {
     $events = parent::getSubscribedEvents();
-    $events[RoutingEvents::FINISHED] = array('routeRebuildFinished');
+    $events[RoutingEvents::FINISHED] = ['routeRebuildFinished'];
     // Ensure to run after the entity resolver subscriber
     // @see \Drupal\Core\EventSubscriber\EntityRouteAlterSubscriber
     $events[RoutingEvents::ALTER] = ['onAlterRoutes', -175];
@@ -89,7 +89,7 @@ class RouteSubscriber extends RouteSubscriberBase {
    */
   protected function getViewsDisplayIDsWithRoute() {
     if (!isset($this->viewsDisplayPairs)) {
-      $this->viewsDisplayPairs = array();
+      $this->viewsDisplayPairs = [];
 
       // @todo Convert this method to some service.
       $views = $this->getApplicableViews();
@@ -156,7 +156,11 @@ class RouteSubscriber extends RouteSubscriberBase {
   }
 
   /**
-   * {@inheritdoc}
+   * Stores the new route names after they have been rebuilt.
+   *
+   * Callback for the RoutingEvents::FINISHED event.
+   *
+   * @see \Drupal\views\EventSubscriber::getSubscribedEvents()
    */
   public function routeRebuildFinished() {
     $this->reset();
diff --git a/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php b/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php
index 59ecde692..6060ae40b 100644
--- a/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php
+++ b/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php
@@ -144,6 +144,11 @@ class ViewsEntitySchemaSubscriber implements EntityTypeListenerInterface, EventS
       $changes[] = static::REVISION_DATA_TABLE_REMOVAL;
     }
 
+    // Stop here if no changes are needed.
+    if (empty($changes)) {
+      return;
+    }
+
     /** @var \Drupal\views\Entity\View[] $all_views */
     $all_views = $this->entityManager->getStorage('view')->loadMultiple(NULL);
 
diff --git a/web/core/modules/views/src/ExposedFormCache.php b/web/core/modules/views/src/ExposedFormCache.php
index cb67a9ba0..f60cc71c1 100644
--- a/web/core/modules/views/src/ExposedFormCache.php
+++ b/web/core/modules/views/src/ExposedFormCache.php
@@ -14,7 +14,7 @@ class ExposedFormCache {
    *
    * @var array
    */
-  protected $cache = array();
+  protected $cache = [];
 
   /**
    * Save the Views exposed form for later use.
@@ -56,7 +56,7 @@ class ExposedFormCache {
    * Rests the form cache.
    */
   public function reset() {
-    $this->cache = array();
+    $this->cache = [];
   }
 
 }
diff --git a/web/core/modules/views/src/Form/ViewsExposedForm.php b/web/core/modules/views/src/Form/ViewsExposedForm.php
index bacd55495..44e7ec4b0 100644
--- a/web/core/modules/views/src/Form/ViewsExposedForm.php
+++ b/web/core/modules/views/src/Form/ViewsExposedForm.php
@@ -52,10 +52,10 @@ class ViewsExposedForm extends FormBase {
   public function buildForm(array $form, FormStateInterface $form_state) {
     // Don't show the form when batch operations are in progress.
     if ($batch = batch_get() && isset($batch['current_set'])) {
-      return array(
+      return [
         // Set the theme callback to be nothing to avoid errors in template_preprocess_views_exposed_form().
         '#theme' => '',
-      );
+      ];
     }
 
     // Make sure that we validate because this form might be submitted
@@ -74,7 +74,7 @@ class ViewsExposedForm extends FormBase {
       return $cache;
     }
 
-    $form['#info'] = array();
+    $form['#info'] = [];
 
     // Go through each handler and let it generate its exposed widget.
     foreach ($view->display_handler->handlers as $type => $value) {
@@ -100,16 +100,16 @@ class ViewsExposedForm extends FormBase {
       }
     }
 
-    $form['actions'] = array(
+    $form['actions'] = [
       '#type' => 'actions'
-    );
-    $form['actions']['submit'] = array(
+    ];
+    $form['actions']['submit'] = [
       // Prevent from showing up in \Drupal::request()->query.
       '#name' => '',
       '#type' => 'submit',
       '#value' => $this->t('Apply'),
       '#id' => Html::getUniqueId('edit-submit-' . $view->storage->id()),
-    );
+    ];
 
     $form['#action'] = $view->hasUrl() ? $view->getUrl()->toString() : Url::fromRoute('<current>')->toString();
     $form['#theme'] = $view->buildThemeFunctions('views_exposed_form');
@@ -131,7 +131,7 @@ class ViewsExposedForm extends FormBase {
   public function validateForm(array &$form, FormStateInterface $form_state) {
     $view = $form_state->get('view');
 
-    foreach (array('field', 'filter') as $type) {
+    foreach (['field', 'filter'] as $type) {
       /** @var \Drupal\views\Plugin\views\ViewsHandlerInterface[] $handlers */
       $handlers = &$view->$type;
       foreach ($handlers as $key => $handler) {
@@ -148,9 +148,9 @@ class ViewsExposedForm extends FormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     // Form input keys that will not be included in $view->exposed_raw_data.
-    $exclude = array('submit', 'form_build_id', 'form_id', 'form_token', 'exposed_form_plugin', 'reset');
+    $exclude = ['submit', 'form_build_id', 'form_id', 'form_token', 'exposed_form_plugin', 'reset'];
     $values = $form_state->getValues();
-    foreach (array('field', 'filter') as $type) {
+    foreach (['field', 'filter'] as $type) {
       /** @var \Drupal\views\Plugin\views\ViewsHandlerInterface[] $handlers */
       $handlers = &$form_state->get('view')->$type;
       foreach ($handlers as $key => $info) {
@@ -169,7 +169,7 @@ class ViewsExposedForm extends FormBase {
     $view->exposed_data = $values;
     $view->exposed_raw_input = [];
 
-    $exclude = array('submit', 'form_build_id', 'form_id', 'form_token', 'exposed_form_plugin', 'reset');
+    $exclude = ['submit', 'form_build_id', 'form_id', 'form_token', 'exposed_form_plugin', 'reset'];
     /** @var \Drupal\views\Plugin\views\exposed_form\ExposedFormPluginBase $exposed_form_plugin */
     $exposed_form_plugin = $view->display_handler->getPlugin('exposed_form');
     $exposed_form_plugin->exposedFormSubmit($form, $form_state, $exclude);
diff --git a/web/core/modules/views/src/Form/ViewsForm.php b/web/core/modules/views/src/Form/ViewsForm.php
index b124d653d..575b92313 100644
--- a/web/core/modules/views/src/Form/ViewsForm.php
+++ b/web/core/modules/views/src/Form/ViewsForm.php
@@ -151,19 +151,19 @@ class ViewsForm implements FormInterface, ContainerInjectionInterface {
     // Add the base form ID.
     $form_state->addBuildInfo('base_form_id', $this->getBaseFormId());
 
-    $form = array();
+    $form = [];
 
     $query = $this->requestStack->getCurrentRequest()->query->all();
-    $query = UrlHelper::filterQueryParameters($query, array(), '');
+    $query = UrlHelper::filterQueryParameters($query, [], '');
 
-    $options = array('query' => $query);
+    $options = ['query' => $query];
     $form['#action'] = $view->hasUrl() ? $view->getUrl()->setOptions($options)->toString() : Url::fromRoute('<current>')->setOptions($options)->toString();
     // Tell the preprocessor whether it should hide the header, footer, pager,
     // etc.
-    $form['show_view_elements'] = array(
+    $form['show_view_elements'] = [
       '#type' => 'value',
       '#value' => ($step == 'views_form_views_form') ? TRUE : FALSE,
-    );
+    ];
 
     $form_object = $this->getFormObject($form_state);
     $form += $form_object->buildForm($form, $form_state, $view, $output);
diff --git a/web/core/modules/views/src/Form/ViewsFormMainForm.php b/web/core/modules/views/src/Form/ViewsFormMainForm.php
index fb8818ae7..da56f4916 100644
--- a/web/core/modules/views/src/Form/ViewsFormMainForm.php
+++ b/web/core/modules/views/src/Form/ViewsFormMainForm.php
@@ -30,15 +30,15 @@ class ViewsFormMainForm implements FormInterface {
     // (below the exposed widgets).
     $form['output']['#weight'] = 50;
 
-    $form['actions'] = array(
+    $form['actions'] = [
       '#type' => 'actions',
-    );
-    $form['actions']['submit'] = array(
+    ];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => t('Save'),
-    );
+    ];
 
-    $substitutions = array();
+    $substitutions = [];
     foreach ($view->field as $field_name => $field) {
       $form_element_name = $field_name;
       if (method_exists($field, 'form_element_name')) {
@@ -71,11 +71,11 @@ class ViewsFormMainForm implements FormInterface {
             $form_element_row_id = $row_id;
           }
 
-          $substitutions[] = array(
+          $substitutions[] = [
             'placeholder' => '<!--form-item-' . $form_element_name . '--' . $form_element_row_id . '-->',
             'field_name' => $form_element_name,
             'row_id' => $form_element_row_id,
-          );
+          ];
         }
       }
     }
@@ -89,10 +89,10 @@ class ViewsFormMainForm implements FormInterface {
       }
     }
 
-    $form['#substitutions'] = array(
+    $form['#substitutions'] = [
       '#type' => 'value',
       '#value' => $substitutions,
-    );
+    ];
 
     return $form;
   }
@@ -111,7 +111,7 @@ class ViewsFormMainForm implements FormInterface {
     }
 
     // Call the validate method on every area handler that has it.
-    foreach (array('header', 'footer') as $area) {
+    foreach (['header', 'footer'] as $area) {
       foreach ($view->{$area} as $area_handler) {
         if (method_exists($area_handler, 'viewsFormValidate')) {
           $area_handler->viewsFormValidate($form, $form_state);
@@ -134,7 +134,7 @@ class ViewsFormMainForm implements FormInterface {
     }
 
     // Call the submit method on every area handler that has it.
-    foreach (array('header', 'footer') as $area) {
+    foreach (['header', 'footer'] as $area) {
       foreach ($view->{$area} as $area_handler) {
         if (method_exists($area_handler, 'viewsFormSubmit')) {
           $area_handler->viewsFormSubmit($form, $form_state);
diff --git a/web/core/modules/views/src/ManyToOneHelper.php b/web/core/modules/views/src/ManyToOneHelper.php
index a3c4834ac..d772db1a6 100644
--- a/web/core/modules/views/src/ManyToOneHelper.php
+++ b/web/core/modules/views/src/ManyToOneHelper.php
@@ -20,22 +20,22 @@ use Drupal\views\Plugin\views\HandlerBase;
  */
 class ManyToOneHelper {
 
-  function __construct($handler) {
+  public function __construct($handler) {
     $this->handler = $handler;
   }
 
   public static function defineOptions(&$options) {
-    $options['reduce_duplicates'] = array('default' => FALSE);
+    $options['reduce_duplicates'] = ['default' => FALSE];
   }
 
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['reduce_duplicates'] = array(
+    $form['reduce_duplicates'] = [
       '#type' => 'checkbox',
       '#title' => t('Reduce duplicates'),
       '#description' => t("This filter can cause items that have more than one of the selected options to appear as duplicate results. If this filter causes duplicate results to occur, this checkbox can reduce those duplicates; however, the more terms it has to search for, the less performant the query will be, so use this with caution. Shouldn't be set on single-value fields, as it may cause values to disappear from display, if used on an incompatible field."),
       '#default_value' => !empty($this->handler->options['reduce_duplicates']),
       '#weight' => 4,
-    );
+    ];
   }
 
   /**
@@ -133,14 +133,14 @@ class ManyToOneHelper {
     else {
       if (!empty($view->many_to_one_tables[$field])) {
         foreach ($view->many_to_one_tables[$field] as $value) {
-          $join->extra = array(
-            array(
+          $join->extra = [
+            [
               'field' => $this->handler->realField,
               'operator' => '!=',
               'value' => $value,
               'numeric' => !empty($this->definition['numeric']),
-            ),
-          );
+            ],
+          ];
         }
       }
       return $this->addTable($join);
@@ -172,14 +172,14 @@ class ManyToOneHelper {
           $join->type = 'LEFT';
           if (!empty($this->handler->view->many_to_one_tables[$field])) {
             foreach ($this->handler->view->many_to_one_tables[$field] as $value) {
-              $join->extra = array(
-                array(
+              $join->extra = [
+                [
                   'field' => $this->handler->realField,
                   'operator' => '!=',
                   'value' => $value,
                   'numeric' => !empty($this->handler->definition['numeric']),
-                ),
-              );
+                ],
+              ];
             }
           }
 
@@ -193,19 +193,19 @@ class ManyToOneHelper {
       // We do one join per selected value.
       if ($this->handler->operator != 'not') {
         // Clone the join for each table:
-        $this->handler->tableAliases = array();
+        $this->handler->tableAliases = [];
         foreach ($this->handler->value as $value) {
           $join = $this->getJoin();
           if ($this->handler->operator == 'and') {
             $join->type = 'INNER';
           }
-          $join->extra = array(
-            array(
+          $join->extra = [
+            [
               'field' => $this->handler->realField,
               'value' => $value,
               'numeric' => !empty($this->handler->definition['numeric']),
-            ),
-          );
+            ],
+          ];
 
           // The table alias needs to be unique to this value across the
           // multiple times the filter or argument is called by the view.
@@ -229,14 +229,14 @@ class ManyToOneHelper {
       else {
         $join = $this->getJoin();
         $join->type = 'LEFT';
-        $join->extra = array();
+        $join->extra = [];
         $join->extraOperator = 'OR';
         foreach ($this->handler->value as $value) {
-          $join->extra[] = array(
+          $join->extra[] = [
             'field' => $this->handler->realField,
             'value' => $value,
             'numeric' => !empty($this->handler->definition['numeric']),
-          );
+          ];
         }
 
         $this->handler->tableAlias = $this->addTable($join);
@@ -296,9 +296,9 @@ class ManyToOneHelper {
         else {
           $operator = "$operator $placeholder";
         }
-        $placeholders = array(
+        $placeholders = [
           $placeholder => $value,
-        );
+        ];
         $this->handler->query->addWhereExpression($options['group'], "$field $operator", $placeholders);
       }
       else {
@@ -310,7 +310,7 @@ class ManyToOneHelper {
             $this->handler->query->addWhereExpression(0, "$field $operator");
           }
           else {
-            $this->handler->query->addWhereExpression(0, "$field $operator($placeholder)", array($placeholder => $value));
+            $this->handler->query->addWhereExpression(0, "$field $operator($placeholder)", [$placeholder => $value]);
           }
         }
         else {
@@ -318,7 +318,7 @@ class ManyToOneHelper {
             $this->handler->query->addWhereExpression(0, "$field $operator");
           }
           else {
-            $this->handler->query->addWhereExpression(0, "$field $operator $placeholder", array($placeholder => $value));
+            $this->handler->query->addWhereExpression(0, "$field $operator $placeholder", [$placeholder => $value]);
           }
         }
       }
diff --git a/web/core/modules/views/src/Plugin/Block/ViewsBlock.php b/web/core/modules/views/src/Plugin/Block/ViewsBlock.php
index ad8d7c914..34738cddd 100644
--- a/web/core/modules/views/src/Plugin/Block/ViewsBlock.php
+++ b/web/core/modules/views/src/Plugin/Block/ViewsBlock.php
@@ -5,6 +5,7 @@ namespace Drupal\views\Plugin\Block;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\views\Element\View;
+use Drupal\Core\Entity\EntityInterface;
 
 /**
  * Provides a generic Views block.
@@ -23,10 +24,31 @@ class ViewsBlock extends ViewsBlockBase {
   public function build() {
     $this->view->display_handler->preBlockBuild($this);
 
+    $args = [];
+    foreach ($this->view->display_handler->getHandlers('argument') as $argument_name => $argument) {
+      // Initialize the argument value. Work around a limitation in
+      // \Drupal\views\ViewExecutable::_buildArguments() that skips processing
+      // later arguments if an argument with default action "ignore" and no
+      // argument is provided.
+      $args[$argument_name] = $argument->options['default_action'] == 'ignore' ? 'all' : NULL;
+
+      if (!empty($this->context[$argument_name])) {
+        if ($value = $this->context[$argument_name]->getContextValue()) {
+
+          // Context values are often entities, but views arguments expect to
+          // receive just the entity ID, convert it.
+          if ($value instanceof EntityInterface) {
+            $value = $value->id();
+          }
+          $args[$argument_name] = $value;
+        }
+      }
+    }
+
     // We ask ViewExecutable::buildRenderable() to avoid creating a render cache
     // entry for the view output by passing FALSE, because we're going to cache
     // the whole block instead.
-    if ($output = $this->view->buildRenderable($this->displayID, [], FALSE)) {
+    if ($output = $this->view->buildRenderable($this->displayID, array_values($args), FALSE)) {
       // Before returning the block output, convert it to a renderable array
       // with contextual links.
       $this->addContextualLinks($output);
@@ -52,7 +74,7 @@ class ViewsBlock extends ViewsBlockBase {
       return $output;
     }
 
-    return array();
+    return [];
   }
 
   /**
@@ -95,7 +117,7 @@ class ViewsBlock extends ViewsBlockBase {
       return $this->view->display_handler->blockForm($this, $form, $form_state);
     }
 
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/Block/ViewsBlockBase.php b/web/core/modules/views/src/Plugin/Block/ViewsBlockBase.php
index 4a814d751..4e3020ca0 100644
--- a/web/core/modules/views/src/Plugin/Block/ViewsBlockBase.php
+++ b/web/core/modules/views/src/Plugin/Block/ViewsBlockBase.php
@@ -102,7 +102,7 @@ abstract class ViewsBlockBase extends BlockBase implements ContainerFactoryPlugi
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array('views_label' => '');
+    return ['views_label' => ''];
   }
 
   /**
@@ -122,39 +122,39 @@ abstract class ViewsBlockBase extends BlockBase implements ContainerFactoryPlugi
     $form['#pre_render'][] = '\Drupal\views\Plugin\views\PluginBase::preRenderAddFieldsetMarkup';
 
     // Allow to override the label on the actual page.
-    $form['views_label_checkbox'] = array(
+    $form['views_label_checkbox'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Override title'),
       '#default_value' => !empty($this->configuration['views_label']),
-    );
+    ];
 
-    $form['views_label_fieldset'] = array(
+    $form['views_label_fieldset'] = [
       '#type' => 'fieldset',
-      '#states' => array(
-        'visible' => array(
-          array(
-            ':input[name="settings[views_label_checkbox]"]' => array('checked' => TRUE),
-          ),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          [
+            ':input[name="settings[views_label_checkbox]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ],
+    ];
 
-    $form['views_label'] = array(
+    $form['views_label'] = [
       '#title' => $this->t('Title'),
       '#type' => 'textfield',
       '#default_value' => $this->configuration['views_label'] ?: $this->view->getTitle(),
-      '#states' => array(
-        'visible' => array(
-          array(
-            ':input[name="settings[views_label_checkbox]"]' => array('checked' => TRUE),
-          ),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          [
+            ':input[name="settings[views_label_checkbox]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ],
       '#fieldset' => 'views_label_fieldset',
-    );
+    ];
 
     if ($this->view->storage->access('edit') && \Drupal::moduleHandler()->moduleExists('views_ui')) {
-      $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore. (Try changing it directly in <a href=":url">@name</a>.)', array(':url' => \Drupal::url('entity.view.edit_display_form', array('view' => $this->view->storage->id(), 'display_id' => $this->displayID)), '@name' => $this->view->storage->label()));
+      $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore. (Try changing it directly in <a href=":url">@name</a>.)', [':url' => \Drupal::url('entity.view.edit_display_form', ['view' => $this->view->storage->id(), 'display_id' => $this->displayID]), '@name' => $this->view->storage->label()]);
     }
     else {
       $form['views_label']['#description'] = $this->t('Changing the title here means it cannot be dynamically altered anymore.');
@@ -194,7 +194,7 @@ abstract class ViewsBlockBase extends BlockBase implements ContainerFactoryPlugi
       // array, so if the block contains a string of already-rendered markup,
       // convert it to an array.
       if (is_string($output)) {
-        $output = array('#markup' => $output);
+        $output = ['#markup' => $output];
       }
 
       // views_add_contextual_links() needs the following information in
diff --git a/web/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php b/web/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php
index 072d692be..f6a045cf3 100644
--- a/web/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php
+++ b/web/core/modules/views/src/Plugin/Derivative/DefaultWizardDeriver.php
@@ -17,16 +17,16 @@ class DefaultWizardDeriver extends DeriverBase {
   public function getDerivativeDefinitions($base_plugin_definition) {
     $views_data = Views::viewsData();
     $base_tables = array_keys($views_data->fetchBaseTables());
-    $this->derivatives = array();
+    $this->derivatives = [];
     foreach ($base_tables as $table) {
       $views_info = $views_data->get($table);
       if (empty($views_info['table']['wizard_id'])) {
-        $this->derivatives[$table] = array(
+        $this->derivatives[$table] = [
           'id' => 'standard',
           'base_table' => $table,
           'title' => $views_info['table']['base']['title'],
           'class' => 'Drupal\views\Plugin\views\wizard\Standard'
-        );
+        ];
       }
     }
     return parent::getDerivativeDefinitions($base_plugin_definition);
diff --git a/web/core/modules/views/src/Plugin/Derivative/ViewsBlock.php b/web/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
index 2e0c16479..f4da73d4b 100644
--- a/web/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
+++ b/web/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
@@ -19,7 +19,7 @@ class ViewsBlock implements ContainerDeriverInterface {
    *
    * @var array
    */
-  protected $derivatives = array();
+  protected $derivatives = [];
 
   /**
    * The base plugin ID.
@@ -82,6 +82,7 @@ class ViewsBlock implements ContainerDeriverInterface {
       $executable = $view->getExecutable();
       $executable->initDisplay();
       foreach ($executable->displayHandlers as $display) {
+        /** @var \Drupal\views\Plugin\views\display\DisplayPluginInterface $display */
         // Add a block plugin definition for each block display.
         if (isset($display) && !empty($display->definition['uses_hook_block'])) {
           $delta = $view->id() . '-' . $display->display['id'];
@@ -100,15 +101,24 @@ class ViewsBlock implements ContainerDeriverInterface {
             }
           }
 
-          $this->derivatives[$delta] = array(
+          $this->derivatives[$delta] = [
             'category' => $display->getOption('block_category'),
             'admin_label' => $admin_label,
-            'config_dependencies' => array(
-              'config' => array(
+            'config_dependencies' => [
+              'config' => [
                 $view->getConfigDependencyName(),
-              )
-            )
-          );
+              ],
+            ],
+          ];
+
+          // Look for arguments and expose them as context.
+          foreach ($display->getHandlers('argument') as $argument_name => $argument) {
+            /** @var \Drupal\views\Plugin\views\argument\ArgumentPluginBase $argument */
+            if ($context_definition = $argument->getContextDefinition()) {
+              $this->derivatives[$delta]['context'][$argument_name] = $context_definition;
+            }
+          }
+
           $this->derivatives[$delta] += $base_plugin_definition;
         }
       }
diff --git a/web/core/modules/views/src/Plugin/Derivative/ViewsEntityArgumentValidator.php b/web/core/modules/views/src/Plugin/Derivative/ViewsEntityArgumentValidator.php
index 2343c9d51..539eb4798 100644
--- a/web/core/modules/views/src/Plugin/Derivative/ViewsEntityArgumentValidator.php
+++ b/web/core/modules/views/src/Plugin/Derivative/ViewsEntityArgumentValidator.php
@@ -38,7 +38,7 @@ class ViewsEntityArgumentValidator extends DeriverBase implements ContainerDeriv
    *
    * @var array
    */
-  protected $derivatives = array();
+  protected $derivatives = [];
 
   /**
    * Constructs an ViewsEntityArgumentValidator object.
@@ -72,16 +72,16 @@ class ViewsEntityArgumentValidator extends DeriverBase implements ContainerDeriv
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
     $entity_types = $this->entityManager->getDefinitions();
-    $this->derivatives = array();
+    $this->derivatives = [];
     foreach ($entity_types as $entity_type_id => $entity_type) {
-      $this->derivatives[$entity_type_id] = array(
+      $this->derivatives[$entity_type_id] = [
         'id' => 'entity:' . $entity_type_id,
         'provider' => 'views',
         'title' => $entity_type->getLabel(),
-        'help' => $this->t('Validate @label', array('@label' => $entity_type->getLabel())),
+        'help' => $this->t('Validate @label', ['@label' => $entity_type->getLabel()]),
         'entity_type' => $entity_type_id,
         'class' => $base_plugin_definition['class'],
-      );
+      ];
     }
 
     return $this->derivatives;
diff --git a/web/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php b/web/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php
index 6b36c0839..67e7c33fd 100644
--- a/web/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php
+++ b/web/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php
@@ -21,7 +21,7 @@ class ViewsEntityRow implements ContainerDeriverInterface {
    *
    * @var array
    */
-  protected $derivatives = array();
+  protected $derivatives = [];
 
   /**
    * The base plugin ID that the derivative is for.
@@ -89,16 +89,16 @@ class ViewsEntityRow implements ContainerDeriverInterface {
     foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
       // Just add support for entity types which have a views integration.
       if (($base_table = $entity_type->getBaseTable()) && $this->viewsData->get($base_table) && $this->entityManager->hasHandler($entity_type_id, 'view_builder')) {
-        $this->derivatives[$entity_type_id] = array(
+        $this->derivatives[$entity_type_id] = [
           'id' => 'entity:' . $entity_type_id,
           'provider' => 'views',
           'title' => $entity_type->getLabel(),
-          'help' => t('Display the @label', array('@label' => $entity_type->getLabel())),
-          'base' => array($entity_type->getDataTable() ?: $entity_type->getBaseTable()),
+          'help' => t('Display the @label', ['@label' => $entity_type->getLabel()]),
+          'base' => [$entity_type->getDataTable() ?: $entity_type->getBaseTable()],
           'entity_type' => $entity_type_id,
-          'display_types' => array('normal'),
+          'display_types' => ['normal'],
           'class' => $base_plugin_definition['class'],
-        );
+        ];
       }
     }
 
diff --git a/web/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php b/web/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php
index 50edadcb0..fc2e9b894 100644
--- a/web/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php
+++ b/web/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php
@@ -18,7 +18,7 @@ class ViewsExposedFilterBlock implements ContainerDeriverInterface {
    *
    * @var array
    */
-  protected $derivatives = array();
+  protected $derivatives = [];
 
   /**
    * The view storage.
@@ -85,15 +85,15 @@ class ViewsExposedFilterBlock implements ContainerDeriverInterface {
           // Add a block definition for the block.
           if ($display->usesExposedFormInBlock()) {
             $delta = $view->id() . '-' . $display->display['id'];
-            $desc = t('Exposed form: @view-@display_id', array('@view' => $view->id(), '@display_id' => $display->display['id']));
-            $this->derivatives[$delta] = array(
+            $desc = t('Exposed form: @view-@display_id', ['@view' => $view->id(), '@display_id' => $display->display['id']]);
+            $this->derivatives[$delta] = [
               'admin_label' => $desc,
-              'config_dependencies' => array(
-                'config' => array(
+              'config_dependencies' => [
+                'config' => [
                   $view->getConfigDependencyName(),
-                )
-              )
-            );
+                ]
+              ]
+            ];
             $this->derivatives[$delta] += $base_plugin_definition;
           }
         }
diff --git a/web/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php b/web/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php
index a8149848f..bc6400c01 100644
--- a/web/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php
+++ b/web/core/modules/views/src/Plugin/Derivative/ViewsLocalTask.php
@@ -67,7 +67,7 @@ class ViewsLocalTask extends DeriverBase implements ContainerDeriverInterface {
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    $this->derivatives = array();
+    $this->derivatives = [];
 
     $view_route_names = $this->state->get('views.view_route_names');
     foreach ($this->getApplicableMenuViews() as $pair) {
@@ -77,7 +77,7 @@ class ViewsLocalTask extends DeriverBase implements ContainerDeriverInterface {
 
       $executable->setDisplay($display_id);
       $menu = $executable->display_handler->getOption('menu');
-      if (in_array($menu['type'], array('tab', 'default tab'))) {
+      if (in_array($menu['type'], ['tab', 'default tab'])) {
         $plugin_id = 'view.' . $executable->storage->id() . '.' . $display_id;
         $route_name = $view_route_names[$executable->storage->id() . '.' . $display_id];
 
@@ -87,11 +87,11 @@ class ViewsLocalTask extends DeriverBase implements ContainerDeriverInterface {
           continue;
         }
 
-        $this->derivatives[$plugin_id] = array(
+        $this->derivatives[$plugin_id] = [
           'route_name' => $route_name,
           'weight' => $menu['weight'],
           'title' => $menu['title'],
-        ) + $base_plugin_definition;
+        ] + $base_plugin_definition;
 
         // Default local tasks have themselves as root tab.
         if ($menu['type'] == 'default tab') {
@@ -117,7 +117,7 @@ class ViewsLocalTask extends DeriverBase implements ContainerDeriverInterface {
       $menu = $executable->display_handler->getOption('menu');
 
       // We already have set the base_route for default tabs.
-      if (in_array($menu['type'], array('tab'))) {
+      if (in_array($menu['type'], ['tab'])) {
         $plugin_id = 'view.' . $executable->storage->id() . '.' . $display_id;
         $view_route_name = $view_route_names[$executable->storage->id() . '.' . $display_id];
 
diff --git a/web/core/modules/views/src/Plugin/Derivative/ViewsMenuLink.php b/web/core/modules/views/src/Plugin/Derivative/ViewsMenuLink.php
index 1095d01f2..40dfe44a2 100644
--- a/web/core/modules/views/src/Plugin/Derivative/ViewsMenuLink.php
+++ b/web/core/modules/views/src/Plugin/Derivative/ViewsMenuLink.php
@@ -46,7 +46,7 @@ class ViewsMenuLink extends DeriverBase implements ContainerDeriverInterface {
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    $links = array();
+    $links = [];
     $views = Views::getApplicableViews('uses_menu_links');
 
     foreach ($views as $data) {
diff --git a/web/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php b/web/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
index db1905292..05ac9b99f 100644
--- a/web/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
+++ b/web/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
@@ -97,14 +97,14 @@ class ViewsSelection extends PluginBase implements SelectionInterface, Container
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $selection_handler_settings = $this->configuration['handler_settings'];
-    $view_settings = !empty($selection_handler_settings['view']) ? $selection_handler_settings['view'] : array();
+    $view_settings = !empty($selection_handler_settings['view']) ? $selection_handler_settings['view'] : [];
     $displays = Views::getApplicableViews('entity_reference_display');
     // Filter views that list the entity type we want, and group the separate
     // displays by view.
     $entity_type = $this->entityManager->getDefinition($this->configuration['target_type']);
     $view_storage = $this->entityManager->getStorage('view');
 
-    $options = array();
+    $options = [];
     foreach ($displays as $data) {
       list($view_id, $display_id) = $data;
       $view = $view_storage->load($view_id);
@@ -118,36 +118,36 @@ class ViewsSelection extends PluginBase implements SelectionInterface, Container
     // into 'view_name' and 'view_display' in the final submitted values, so
     // we massage the data at validate time on the wrapping element (not
     // ideal).
-    $form['view']['#element_validate'] = array(array(get_called_class(), 'settingsFormValidate'));
+    $form['view']['#element_validate'] = [[get_called_class(), 'settingsFormValidate']];
 
     if ($options) {
       $default = !empty($view_settings['view_name']) ? $view_settings['view_name'] . ':' . $view_settings['display_name'] : NULL;
-      $form['view']['view_and_display'] = array(
+      $form['view']['view_and_display'] = [
         '#type' => 'select',
         '#title' => $this->t('View used to select the entities'),
         '#required' => TRUE,
         '#options' => $options,
         '#default_value' => $default,
         '#description' => '<p>' . $this->t('Choose the view and display that select the entities that can be referenced.<br />Only views with a display of type "Entity Reference" are eligible.') . '</p>',
-      );
+      ];
 
       $default = !empty($view_settings['arguments']) ? implode(', ', $view_settings['arguments']) : '';
-      $form['view']['arguments'] = array(
+      $form['view']['arguments'] = [
         '#type' => 'textfield',
         '#title' => $this->t('View arguments'),
         '#default_value' => $default,
         '#required' => FALSE,
         '#description' => $this->t('Provide a comma separated list of arguments to pass to the view.'),
-      );
+      ];
     }
     else {
       if ($this->currentUser->hasPermission('administer views') && $this->moduleHandler->moduleExists('views_ui')) {
-        $form['view']['no_view_help'] = array(
-          '#markup' => '<p>' . $this->t('No eligible views were found. <a href=":create">Create a view</a> with an <em>Entity Reference</em> display, or add such a display to an <a href=":existing">existing view</a>.', array(
+        $form['view']['no_view_help'] = [
+          '#markup' => '<p>' . $this->t('No eligible views were found. <a href=":create">Create a view</a> with an <em>Entity Reference</em> display, or add such a display to an <a href=":existing">existing view</a>.', [
             ':create' => Url::fromRoute('views_ui.add')->toString(),
             ':existing' => Url::fromRoute('entity.view.collection')->toString(),
-          )) . '</p>',
-        );
+          ]) . '</p>',
+        ];
       }
       else {
         $form['view']['no_view_help']['#markup'] = '<p>' . $this->t('No eligible views were found.') . '</p>';
@@ -191,18 +191,18 @@ class ViewsSelection extends PluginBase implements SelectionInterface, Container
     // Check that the view is valid and the display still exists.
     $this->view = Views::getView($view_name);
     if (!$this->view || !$this->view->access($display_name)) {
-      drupal_set_message(t('The reference view %view_name cannot be found.', array('%view_name' => $view_name)), 'warning');
+      drupal_set_message(t('The reference view %view_name cannot be found.', ['%view_name' => $view_name]), 'warning');
       return FALSE;
     }
     $this->view->setDisplay($display_name);
 
     // Pass options to the display handler to make them available later.
-    $entity_reference_options = array(
+    $entity_reference_options = [
       'match' => $match,
       'match_operator' => $match_operator,
       'limit' => $limit,
       'ids' => $ids,
-    );
+    ];
     $this->view->displayHandlers->get($display_name)->setOption('entity_reference_options', $entity_reference_options);
     return TRUE;
   }
@@ -214,13 +214,13 @@ class ViewsSelection extends PluginBase implements SelectionInterface, Container
     $handler_settings = $this->configuration['handler_settings'];
     $display_name = $handler_settings['view']['display_name'];
     $arguments = $handler_settings['view']['arguments'];
-    $result = array();
+    $result = [];
     if ($this->initializeView($match, $match_operator, $limit)) {
       // Get the results.
       $result = $this->view->executeDisplay($display_name, $arguments);
     }
 
-    $return = array();
+    $return = [];
     if ($result) {
       foreach ($this->view->result as $row) {
         $entity = $row->_entity;
@@ -245,7 +245,7 @@ class ViewsSelection extends PluginBase implements SelectionInterface, Container
     $handler_settings = $this->configuration['handler_settings'];
     $display_name = $handler_settings['view']['display_name'];
     $arguments = $handler_settings['view']['arguments'];
-    $result = array();
+    $result = [];
     if ($this->initializeView(NULL, 'CONTAINS', 0, $ids)) {
       // Get the results.
       $entities = $this->view->executeDisplay($display_name, $arguments);
@@ -272,14 +272,14 @@ class ViewsSelection extends PluginBase implements SelectionInterface, Container
     // empty array instead.
     $arguments_string = trim($element['arguments']['#value']);
     if ($arguments_string === '') {
-      $arguments = array();
+      $arguments = [];
     }
     else {
       // array_map() is called to trim whitespaces from the arguments.
       $arguments = array_map('trim', explode(',', $arguments_string));
     }
 
-    $value = array('view_name' => $view, 'display_name' => $display, 'arguments' => $arguments);
+    $value = ['view_name' => $view, 'display_name' => $display, 'arguments' => $arguments];
     $form_state->setValueForElement($element, $value);
   }
 
diff --git a/web/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php b/web/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php
index d330cdf39..1699f3e94 100644
--- a/web/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php
+++ b/web/core/modules/views/src/Plugin/Menu/Form/ViewsMenuLinkForm.php
@@ -28,16 +28,16 @@ class ViewsMenuLinkForm extends MenuLinkDefaultForm {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
 
     // Put the title field first.
-    $form['title'] = array(
+    $form['title'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Title'),
       // @todo Ensure that the view is not loaded with a localized title.
       //   https://www.drupal.org/node/2309507
       '#default_value' => $this->menuLink->getTitle(),
       '#weight' => -10,
-    );
+    ];
 
-    $form['description'] = array(
+    $form['description'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Description'),
       '#description' => $this->t('Shown when hovering over the menu link.'),
@@ -45,7 +45,7 @@ class ViewsMenuLinkForm extends MenuLinkDefaultForm {
       //   https://www.drupal.org/node/2309507
       '#default_value' => $this->menuLink->getDescription(),
       '#weight' => -5,
-    );
+    ];
 
     $form += parent::buildConfigurationForm($form, $form_state);
 
@@ -56,10 +56,10 @@ class ViewsMenuLinkForm extends MenuLinkDefaultForm {
     $id = $view->storage->id();
     $label = $view->storage->label();
     if ($this->moduleHandler->moduleExists('views_ui')) {
-      $message = $this->t('This link is provided by the Views module. The path can be changed by editing the view <a href=":url">@label</a>', array(':url' => \Drupal::url('entity.view.edit_form', array('view' => $id)), '@label' => $label));
+      $message = $this->t('This link is provided by the Views module. The path can be changed by editing the view <a href=":url">@label</a>', [':url' => \Drupal::url('entity.view.edit_form', ['view' => $id]), '@label' => $label]);
     }
     else {
-      $message = $this->t('This link is provided by the Views module from view %label.', array('%label' => $label));
+      $message = $this->t('This link is provided by the Views module from view %label.', ['%label' => $label]);
     }
     $form['info']['#title'] = $message;
     return $form;
diff --git a/web/core/modules/views/src/Plugin/Menu/ViewsMenuLink.php b/web/core/modules/views/src/Plugin/Menu/ViewsMenuLink.php
index b484c24b1..b4f078fc6 100644
--- a/web/core/modules/views/src/Plugin/Menu/ViewsMenuLink.php
+++ b/web/core/modules/views/src/Plugin/Menu/ViewsMenuLink.php
@@ -18,7 +18,7 @@ class ViewsMenuLink extends MenuLinkBase implements ContainerFactoryPluginInterf
   /**
    * {@inheritdoc}
    */
-  protected $overrideAllowed = array(
+  protected $overrideAllowed = [
     'menu_name' => 1,
     'parent' => 1,
     'weight' => 1,
@@ -26,7 +26,7 @@ class ViewsMenuLink extends MenuLinkBase implements ContainerFactoryPluginInterf
     'enabled' => 1,
     'title' => 1,
     'description' => 1,
-  );
+  ];
 
   /**
    * The entity manager.
diff --git a/web/core/modules/views/src/Plugin/ViewsHandlerManager.php b/web/core/modules/views/src/Plugin/ViewsHandlerManager.php
index d918696d6..bfc859227 100644
--- a/web/core/modules/views/src/Plugin/ViewsHandlerManager.php
+++ b/web/core/modules/views/src/Plugin/ViewsHandlerManager.php
@@ -59,9 +59,9 @@ class ViewsHandlerManager extends DefaultPluginManager implements FallbackPlugin
 
     $this->viewsData = $views_data;
     $this->handlerType = $handler_type;
-    $this->defaults = array(
+    $this->defaults = [
       'plugin_type' => $handler_type,
-    );
+    ];
   }
 
   /**
@@ -86,7 +86,7 @@ class ViewsHandlerManager extends DefaultPluginManager implements FallbackPlugin
 
     if (isset($data[$field][$this->handlerType])) {
       $definition = $data[$field][$this->handlerType];
-      foreach (array('group', 'title', 'title short', 'label', 'help', 'real field', 'real table', 'entity type', 'entity field') as $key) {
+      foreach (['group', 'title', 'title short', 'label', 'help', 'real field', 'real table', 'entity type', 'entity field'] as $key) {
         if (!isset($definition[$key])) {
           // First check the field level.
           if (!empty($data[$field][$key])) {
@@ -111,13 +111,13 @@ class ViewsHandlerManager extends DefaultPluginManager implements FallbackPlugin
     }
 
     // Finally, use the 'broken' handler.
-    return $this->createInstance('broken', array('original_configuration' => $item));
+    return $this->createInstance('broken', ['original_configuration' => $item]);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array()) {
+  public function createInstance($plugin_id, array $configuration = []) {
     $instance = parent::createInstance($plugin_id, $configuration);
     if ($instance instanceof HandlerBase) {
       $instance->setModuleHandler($this->moduleHandler);
@@ -129,7 +129,7 @@ class ViewsHandlerManager extends DefaultPluginManager implements FallbackPlugin
   /**
    * {@inheritdoc}
    */
-  public function getFallbackPluginId($plugin_id, array $configuration = array()) {
+  public function getFallbackPluginId($plugin_id, array $configuration = []) {
     return 'broken';
   }
 
diff --git a/web/core/modules/views/src/Plugin/ViewsPluginManager.php b/web/core/modules/views/src/Plugin/ViewsPluginManager.php
index a8dadb048..8124d3163 100644
--- a/web/core/modules/views/src/Plugin/ViewsPluginManager.php
+++ b/web/core/modules/views/src/Plugin/ViewsPluginManager.php
@@ -31,11 +31,11 @@ class ViewsPluginManager extends DefaultPluginManager {
     $plugin_definition_annotation_name = 'Drupal\views\Annotation\Views' . Container::camelize($type);
     parent::__construct("Plugin/views/$type", $namespaces, $module_handler, 'Drupal\views\Plugin\views\ViewsPluginInterface', $plugin_definition_annotation_name);
 
-    $this->defaults += array(
+    $this->defaults += [
       'parent' => 'parent',
       'plugin_type' => $type,
       'register_theme' => TRUE,
-    );
+    ];
 
     $this->alterInfo('views_plugins_' . $type);
     $this->setCacheBackend($cache_backend, "views:$type");
diff --git a/web/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php b/web/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
index df129da49..00233f7cc 100644
--- a/web/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
+++ b/web/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
@@ -25,7 +25,7 @@ trait BrokenHandlerTrait {
    * @see \Drupal\views\Plugin\views\PluginBase::defineOptions()
    */
   public function defineOptions() {
-    return array();
+    return [];
   }
 
   /**
@@ -55,28 +55,28 @@ trait BrokenHandlerTrait {
 
     foreach ($this->definition['original_configuration'] as $key => $value) {
       if (is_scalar($value)) {
-        $items[] = SafeMarkup::format('@key: @value', array('@key' => $key, '@value' => $value));
+        $items[] = SafeMarkup::format('@key: @value', ['@key' => $key, '@value' => $value]);
       }
     }
 
     $description_bottom = t('Enabling the appropriate module will may solve this issue. Otherwise, check to see if there is a module update available.');
 
-    $form['description'] = array(
+    $form['description'] = [
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('js-form-item', 'form-item', 'description'),
-      ),
-      'description_top' => array(
+      '#attributes' => [
+        'class' => ['js-form-item', 'form-item', 'description'],
+      ],
+      'description_top' => [
         '#markup' => '<p>' . $description_top . '</p>',
-      ),
-      'detail_list' => array(
+      ],
+      'detail_list' => [
         '#theme' => 'item_list',
         '#items' => $items,
-      ),
-      'description_bottom' => array(
+      ],
+      'description_bottom' => [
         '#markup' => '<p>' . $description_bottom . '</p>',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/HandlerBase.php b/web/core/modules/views/src/Plugin/views/HandlerBase.php
index b6b5a5bea..8396c6bbf 100644
--- a/web/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/web/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -138,12 +138,12 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['id'] = array('default' => '');
-    $options['table'] = array('default' => '');
-    $options['field'] = array('default' => '');
-    $options['relationship'] = array('default' => 'none');
-    $options['group_type'] = array('default' => 'group');
-    $options['admin_label'] = array('default' => '');
+    $options['id'] = ['default' => ''];
+    $options['table'] = ['default' => ''];
+    $options['field'] = ['default' => ''];
+    $options['relationship'] = ['default' => 'none'];
+    $options['group_type'] = ['default' => 'group'];
+    $options['admin_label'] = ['default' => ''];
 
     return $options;
   }
@@ -156,7 +156,7 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
       return $this->options['admin_label'];
     }
     $title = ($short && isset($this->definition['title short'])) ? $this->definition['title short'] : $this->definition['title'];
-    return $this->t('@group: @title', array('@group' => $this->definition['group'], '@title' => $title));
+    return $this->t('@group: @title', ['@group' => $this->definition['group'], '@title' => $title]);
   }
 
   /**
@@ -248,36 +248,36 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
     // be moved into one because of the $form_state->getValues() hierarchy. Those
     // elements can add a #fieldset => 'fieldset_name' property, and they'll
     // be moved to their fieldset during pre_render.
-    $form['#pre_render'][] = array(get_class($this), 'preRenderAddFieldsetMarkup');
+    $form['#pre_render'][] = [get_class($this), 'preRenderAddFieldsetMarkup'];
 
     parent::buildOptionsForm($form, $form_state);
 
-    $form['fieldsets'] = array(
+    $form['fieldsets'] = [
       '#type' => 'value',
-      '#value' => array('more', 'admin_label'),
-    );
+      '#value' => ['more', 'admin_label'],
+    ];
 
-    $form['admin_label'] = array(
+    $form['admin_label'] = [
       '#type' => 'details',
       '#title' => $this->t('Administrative title'),
       '#weight' => 150,
-    );
-    $form['admin_label']['admin_label'] = array(
+    ];
+    $form['admin_label']['admin_label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Administrative title'),
       '#description' => $this->t('This title will be displayed on the views edit page instead of the default one. This might be useful if you have the same item twice.'),
       '#default_value' => $this->options['admin_label'],
-      '#parents' => array('options', 'admin_label'),
-    );
+      '#parents' => ['options', 'admin_label'],
+    ];
 
     // This form is long and messy enough that the "Administrative title" option
     // belongs in "Administrative title" fieldset at the bottom of the form.
-    $form['more'] = array(
+    $form['more'] = [
       '#type' => 'details',
       '#title' => $this->t('More'),
       '#weight' => 200,
       '#optional' => TRUE,
-    );
+    ];
 
     // Allow to alter the default values brought into the form.
     // @todo Do we really want to keep this hook.
@@ -329,13 +329,13 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
       $group_types[$id] = $aggregate['title'];
     }
 
-    $form['group_type'] = array(
+    $form['group_type'] = [
       '#type' => 'select',
       '#title' => $this->t('Aggregation type'),
       '#default_value' => $this->options['group_type'],
       '#description' => $this->t('Select the aggregation function to use on this field.'),
       '#options' => $group_types,
-    );
+    ];
   }
 
   /**
@@ -454,7 +454,7 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
   public function access(AccountInterface $account) {
     if (isset($this->definition['access callback']) && function_exists($this->definition['access callback'])) {
       if (isset($this->definition['access arguments']) && is_array($this->definition['access arguments'])) {
-        return call_user_func_array($this->definition['access callback'], array($account) + $this->definition['access arguments']);
+        return call_user_func_array($this->definition['access callback'], [$account] + $this->definition['access arguments']);
       }
       return $this->definition['access callback']($account);
     }
@@ -537,7 +537,7 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
    * Determine if this item is 'exposed', meaning it provides form elements
    * to let users modify the view.
    *
-   * @return TRUE/FALSE
+   * @return bool
    */
   public function isExposed() {
     return !empty($this->options['exposed']);
@@ -587,7 +587,7 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
   /**
    * {@inheritdoc}
    */
-  public function validate() { return array(); }
+  public function validate() { return []; }
 
   /**
    * {@inheritdoc}
@@ -703,7 +703,7 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
    */
   public static function breakString($str, $force_int = FALSE) {
     $operator = NULL;
-    $value = array();
+    $value = [];
 
     // Determine if the string has 'or' operators (plus signs) or 'and'
     // operators (commas) and split the string accordingly.
@@ -726,7 +726,7 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
       $value = array_map('intval', $value);
     }
 
-    return (object) array('value' => $value, 'operator' => $operator);
+    return (object) ['value' => $value, 'operator' => $operator];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/PluginBase.php b/web/core/modules/views/src/Plugin/views/PluginBase.php
index 6d5aec184..e523ebafa 100644
--- a/web/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/PluginBase.php
@@ -66,7 +66,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
    *
    * @var array
    */
-  public $options = array();
+  public $options = [];
 
   /**
    * The top object of a view.
@@ -155,7 +155,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
    * @return array
    *   Returns the options of this handler/plugin.
    */
-  protected function defineOptions() { return array(); }
+  protected function defineOptions() { return []; }
 
   /**
    * Fills up the options of the plugin with defaults.
@@ -175,7 +175,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
   protected function setOptionDefaults(array &$storage, array $options) {
     foreach ($options as $option => $definition) {
       if (isset($definition['contains'])) {
-        $storage[$option] = array();
+        $storage[$option] = [];
         $this->setOptionDefaults($storage[$option], $definition['contains']);
       }
       else {
@@ -231,7 +231,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
         }
 
         if (!isset($storage[$key]) || !is_array($storage[$key])) {
-          $storage[$key] = array();
+          $storage[$key] = [];
         }
 
         // If we're just unpacking our known options, and we're dropping an
@@ -242,7 +242,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
           continue;
         }
 
-        $this->unpackOptions($storage[$key], $value, isset($definition[$key]['contains']) ? $definition[$key]['contains'] : array(), $all, FALSE);
+        $this->unpackOptions($storage[$key], $value, isset($definition[$key]['contains']) ? $definition[$key]['contains'] : [], $all, FALSE);
       }
       elseif ($all || !empty($definition[$key])) {
         $storage[$key] = $value;
@@ -265,7 +265,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
     // be moved into one because of the $form_state->getValues() hierarchy. Those
     // elements can add a #fieldset => 'fieldset_name' property, and they'll
     // be moved to their fieldset during pre_render.
-    $form['#pre_render'][] = array(get_class($this), 'preRenderAddFieldsetMarkup');
+    $form['#pre_render'][] = [get_class($this), 'preRenderAddFieldsetMarkup'];
   }
 
   /**
@@ -293,7 +293,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
   /**
    * {@inheritdoc}
    */
-  public function validate() { return array(); }
+  public function validate() { return []; }
 
   /**
    * {@inheritdoc}
@@ -323,8 +323,8 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
   /**
    * {@inheritdoc}
    */
-  public function globalTokenReplace($string = '', array $options = array()) {
-    return \Drupal::token()->replace($string, array('view' => $this->view), $options);
+  public function globalTokenReplace($string = '', array $options = []) {
+    return \Drupal::token()->replace($string, ['view' => $this->view], $options);
   }
 
   /**
@@ -347,7 +347,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
       return Xss::filterAdmin($text);
     }
 
-    $twig_tokens = array();
+    $twig_tokens = [];
     foreach ($tokens as $token => $replacement) {
       // Twig wants a token replacement array stripped of curly-brackets.
       // Some Views tokens come with curly-braces, others do not.
@@ -371,11 +371,11 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
         $parts = explode('.', $token);
         $top = array_shift($parts);
         assert('preg_match(\'/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/\', $top) === 1', 'Tokens need to be valid Twig variables.');
-        $token_array = array(array_pop($parts) => $replacement);
+        $token_array = [array_pop($parts) => $replacement];
         foreach (array_reverse($parts) as $key) {
           // The key could also be numeric (array index) so allow that.
           assert('is_numeric($key) || (preg_match(\'/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/\', $key) === 1)', 'Tokens need to be valid Twig variables.');
-          $token_array = array($key => $token_array);
+          $token_array = [$key => $token_array];
         }
         if (!isset($twig_tokens[$top])) {
           $twig_tokens[$top] = [];
@@ -389,7 +389,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
       // Otherwise, Xss::filterAdmin could remove valid Twig syntax before the
       // template is parsed.
 
-      $build = array(
+      $build = [
         '#type' => 'inline_template',
         '#template' => $text,
         '#context' => $twig_tokens,
@@ -398,7 +398,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
             return Xss::filterAdmin($children);
           }
         ],
-      );
+      ];
 
       // Currently you cannot attach assets to tokens with
       // Renderer::renderPlain(). This may be unnecessarily limiting. Consider
@@ -414,15 +414,15 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
   /**
    * {@inheritdoc}
    */
-  public function getAvailableGlobalTokens($prepared = FALSE, array $types = array()) {
+  public function getAvailableGlobalTokens($prepared = FALSE, array $types = []) {
     $info = \Drupal::token()->getInfo();
     // Site and view tokens should always be available.
-    $types += array('site', 'view');
+    $types += ['site', 'view'];
     $available = array_intersect_key($info['tokens'], array_flip($types));
 
     // Construct the token string for each token.
     if ($prepared) {
-      $prepared = array();
+      $prepared = [];
       foreach ($available as $type => $tokens) {
         foreach (array_keys($tokens) as $token) {
           $prepared[$type][] = "[$type:$token]";
@@ -439,13 +439,13 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
    * {@inheritdoc}
    */
   public function globalTokenForm(&$form, FormStateInterface $form_state) {
-    $token_items = array();
+    $token_items = [];
 
     foreach ($this->getAvailableGlobalTokens() as $type => $tokens) {
-      $item = array(
+      $item = [
         '#markup' => $type,
-        'children' => array(),
-      );
+        'children' => [],
+      ];
       foreach ($tokens as $name => $info) {
         $item['children'][$name] = "[$type:$name]" . ' - ' . $info['name'] . ': ' . $info['description'];
       }
@@ -453,17 +453,17 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
       $token_items[$type] = $item;
     }
 
-    $form['global_tokens'] = array(
+    $form['global_tokens'] = [
       '#type' => 'details',
       '#title' => $this->t('Available global token replacements'),
-    );
-    $form['global_tokens']['list'] = array(
+    ];
+    $form['global_tokens']['list'] = [
       '#theme' => 'item_list',
       '#items' => $token_items,
-      '#attributes' => array(
-        'class' => array('global-tokens'),
-      ),
-    );
+      '#attributes' => [
+        'class' => ['global-tokens'],
+      ],
+    ];
   }
 
   /**
@@ -546,7 +546,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
   protected function listLanguages($flags = LanguageInterface::STATE_ALL, array $current_values = NULL) {
     $manager = \Drupal::languageManager();
     $languages = $manager->getLanguages($flags);
-    $list = array();
+    $list = [];
 
     // The entity languages should come first, if requested.
     if ($flags & PluginBase::INCLUDE_ENTITY) {
@@ -582,7 +582,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
           $name = $types_info[$id]['name'];
           // Surround IDs by '***LANGUAGE_...***', to avoid query collisions.
           $id = '***LANGUAGE_' . $id . '***';
-          $list[$id] = $this->t('@type language selected for page', array('@type' => $name));
+          $list[$id] = $this->t('@type language selected for page', ['@type' => $name]);
         }
       }
       if (!empty($current_values)) {
@@ -592,7 +592,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
           // add that option too, so it is not lost. If not among the current
           // values, skip displaying it to avoid user confusion.
           if (isset($type['name']) && !isset($list[$id]) && in_array($id, $current_values)) {
-            $list[$id] = $this->t('@type language selected for page', array('@type' => $type['name']));
+            $list[$id] = $this->t('@type language selected for page', ['@type' => $type['name']]);
           }
         }
       }
@@ -619,7 +619,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
    *   the query substitutions needed for the special language types.
    */
   public static function queryLanguageSubstitutions() {
-    $changes = array();
+    $changes = [];
     $manager = \Drupal::languageManager();
 
     // Handle default language.
diff --git a/web/core/modules/views/src/Plugin/views/PluginInterface.php b/web/core/modules/views/src/Plugin/views/PluginInterface.php
index daa07245f..fabbe0669 100644
--- a/web/core/modules/views/src/Plugin/views/PluginInterface.php
+++ b/web/core/modules/views/src/Plugin/views/PluginInterface.php
@@ -4,6 +4,9 @@ namespace Drupal\views\Plugin\views;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
 
+/**
+ * @deprecated as of Drupal 8.3.x, will be removed in Drupal 9.0.0
+ */
 interface PluginInterface extends PluginInspectionInterface {
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/ViewsPluginInterface.php b/web/core/modules/views/src/Plugin/views/ViewsPluginInterface.php
index e685c4d8a..83d9c89bb 100644
--- a/web/core/modules/views/src/Plugin/views/ViewsPluginInterface.php
+++ b/web/core/modules/views/src/Plugin/views/ViewsPluginInterface.php
@@ -113,7 +113,7 @@ interface ViewsPluginInterface extends PluginInspectionInterface, DerivativeInsp
    * @return array
    *   An array of available token replacement info or tokens, grouped by type.
    */
-  public function getAvailableGlobalTokens($prepared = FALSE, array $types = array());
+  public function getAvailableGlobalTokens($prepared = FALSE, array $types = []);
 
   /**
    * Flattens the structure of form elements.
@@ -141,7 +141,7 @@ interface ViewsPluginInterface extends PluginInspectionInterface, DerivativeInsp
    * @return string
    *   The tokenized string.
    */
-  public function globalTokenReplace($string = '', array $options = array());
+  public function globalTokenReplace($string = '', array $options = []);
 
   /**
    * Clears a plugin.
diff --git a/web/core/modules/views/src/Plugin/views/area/AreaPluginBase.php b/web/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
index 2ad7f46be..813e4306c 100644
--- a/web/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
@@ -62,7 +62,7 @@ abstract class AreaPluginBase extends HandlerBase {
     $this->definition['field'] = !empty($this->definition['field']) ? $this->definition['field'] : '';
     $label = !empty($this->definition['label']) ? $this->definition['label'] : $this->definition['field'];
     $options['admin_label']['default'] = $label;
-    $options['empty'] = array('default' => FALSE);
+    $options['empty'] = ['default' => FALSE];
 
     return $options;
   }
@@ -81,11 +81,11 @@ abstract class AreaPluginBase extends HandlerBase {
     parent::buildOptionsForm($form, $form_state);
 
     if ($form_state->get('type') != 'empty') {
-      $form['empty'] = array(
+      $form['empty'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Display even if view has no result'),
         '#default_value' => isset($this->options['empty']) ? $this->options['empty'] : 0,
-      );
+      ];
     }
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/area/Broken.php b/web/core/modules/views/src/Plugin/views/area/Broken.php
index 549c30629..7bd6cdbd8 100644
--- a/web/core/modules/views/src/Plugin/views/area/Broken.php
+++ b/web/core/modules/views/src/Plugin/views/area/Broken.php
@@ -19,7 +19,7 @@ class Broken extends AreaPluginBase {
    */
   public function render($empty = FALSE) {
     // Simply render nothing by returning an empty render array.
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/area/Entity.php b/web/core/modules/views/src/Plugin/views/area/Entity.php
index 30c24ecb3..d073d53fc 100644
--- a/web/core/modules/views/src/Plugin/views/area/Entity.php
+++ b/web/core/modules/views/src/Plugin/views/area/Entity.php
@@ -93,12 +93,12 @@ class Entity extends TokenizeAreaPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['view_mode'] = array(
+    $form['view_mode'] = [
       '#type' => 'select',
       '#options' => $this->entityManager->getViewModeOptions($this->entityType),
       '#title' => $this->t('View mode'),
       '#default_value' => $this->options['view_mode'],
-    );
+    ];
 
     $label = $this->entityManager->getDefinition($this->entityType)->getLabel();
     $target = $this->options['target'];
@@ -121,12 +121,12 @@ class Entity extends TokenizeAreaPluginBase {
       '#default_value' => $target,
     ];
 
-    $form['bypass_access'] = array(
+    $form['bypass_access'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Bypass access checks'),
       '#description' => $this->t('If enabled, access permissions for rendering the entity are not checked.'),
       '#default_value' => !empty($this->options['bypass_access']),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/area/HTTPStatusCode.php b/web/core/modules/views/src/Plugin/views/area/HTTPStatusCode.php
index 4f6667a5e..6cf6ba224 100644
--- a/web/core/modules/views/src/Plugin/views/area/HTTPStatusCode.php
+++ b/web/core/modules/views/src/Plugin/views/area/HTTPStatusCode.php
@@ -20,7 +20,7 @@ class HTTPStatusCode extends AreaPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['status_code'] = array('default' => 200);
+    $options['status_code'] = ['default' => 200];
 
     return $options;
   }
@@ -35,29 +35,29 @@ class HTTPStatusCode extends AreaPluginBase {
     $options = Response::$statusTexts;
 
     // Move 403/404/500 to the top.
-    $options = array(
+    $options = [
       '404' => $options['404'],
       '403' => $options['403'],
       '500' => $options['500'],
-    ) + $options;
+    ] + $options;
 
     // Add the HTTP status code, so it's easier for people to find it.
     array_walk($options, function($title, $code) use(&$options) {
-      $options[$code] = $this->t('@code (@title)', array('@code' => $code, '@title' => $title));
+      $options[$code] = $this->t('@code (@title)', ['@code' => $code, '@title' => $title]);
     });
 
-    $form['status_code'] = array(
+    $form['status_code'] = [
       '#title' => $this->t('HTTP status code'),
       '#type' => 'select',
       '#default_value' => $this->options['status_code'],
       '#options' => $options,
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
-  function render($empty = FALSE) {
+  public function render($empty = FALSE) {
     if (!$empty || !empty($this->options['empty'])) {
       $build['#attached']['http_header'][] = ['Status', $this->options['status_code']];
       return $build;
diff --git a/web/core/modules/views/src/Plugin/views/area/Messages.php b/web/core/modules/views/src/Plugin/views/area/Messages.php
index 37df125a6..c26b995ed 100644
--- a/web/core/modules/views/src/Plugin/views/area/Messages.php
+++ b/web/core/modules/views/src/Plugin/views/area/Messages.php
@@ -26,11 +26,11 @@ class Messages extends AreaPluginBase {
    */
   public function render($empty = FALSE) {
     if (!$empty || !empty($this->options['empty'])) {
-      return array(
+      return [
         '#type' => 'status_messages',
-      );
+      ];
     }
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/area/Result.php b/web/core/modules/views/src/Plugin/views/area/Result.php
index d8139cbee..f0082dbb7 100644
--- a/web/core/modules/views/src/Plugin/views/area/Result.php
+++ b/web/core/modules/views/src/Plugin/views/area/Result.php
@@ -22,9 +22,9 @@ class Result extends AreaPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['content'] = array(
+    $options['content'] = [
       'default' => $this->t('Displaying @start - @end of @total'),
-    );
+    ];
 
     return $options;
   }
@@ -34,9 +34,9 @@ class Result extends AreaPluginBase {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $item_list = array(
+    $item_list = [
       '#theme' => 'item_list',
-      '#items' => array(
+      '#items' => [
         '@start -- the initial record number in the set',
         '@end -- the last record number in the set',
         '@total -- the total records in the set',
@@ -45,16 +45,16 @@ class Result extends AreaPluginBase {
         '@current_page -- the current page number',
         '@current_record_count -- the current page record count',
         '@page_count -- the total page count',
-      ),
-    );
+      ],
+    ];
     $list = drupal_render($item_list);
-    $form['content'] = array(
+    $form['content'] = [
       '#title' => $this->t('Display'),
       '#type' => 'textarea',
       '#rows' => 3,
       '#default_value' => $this->options['content'],
       '#description' => $this->t('You may use HTML code in this field. The following tokens are supported:') . $list,
-    );
+    ];
   }
 
   /**
@@ -72,7 +72,7 @@ class Result extends AreaPluginBase {
   public function render($empty = FALSE) {
     // Must have options and does not work on summaries.
     if (!isset($this->options['content']) || $this->view->style_plugin instanceof DefaultSummary) {
-      return array();
+      return [];
     }
     $output = '';
     $format = $this->options['content'];
@@ -113,9 +113,9 @@ class Result extends AreaPluginBase {
       $output .= Xss::filterAdmin(str_replace(array_keys($replacements), array_values($replacements), $format));
     }
     // Return as render array.
-    return array(
+    return [
       '#markup' => $output,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/area/Text.php b/web/core/modules/views/src/Plugin/views/area/Text.php
index cee182fa5..aafcbf209 100644
--- a/web/core/modules/views/src/Plugin/views/area/Text.php
+++ b/web/core/modules/views/src/Plugin/views/area/Text.php
@@ -18,12 +18,12 @@ class Text extends TokenizeAreaPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['content'] = array(
-      'contains' => array(
-        'value' => array('default' => ''),
-        'format' => array('default' => NULL),
-      ),
-    );
+    $options['content'] = [
+      'contains' => [
+        'value' => ['default' => ''],
+        'format' => ['default' => NULL],
+      ],
+    ];
     return $options;
   }
 
@@ -33,14 +33,25 @@ class Text extends TokenizeAreaPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['content'] = array(
+    $form['content'] = [
       '#title' => $this->t('Content'),
       '#type' => 'text_format',
       '#default_value' => $this->options['content']['value'],
       '#rows' => 6,
       '#format' => isset($this->options['content']['format']) ? $this->options['content']['format'] : filter_default_format(),
       '#editor' => FALSE,
-    );
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preQuery() {
+    $content = $this->options['content']['value'];
+    // Check for tokens that require a total row count.
+    if (strpos($content, '[view:page-count]') !== FALSE || strpos($content, '[view:total-rows]') !== FALSE) {
+      $this->view->get_total_rows = TRUE;
+    }
   }
 
   /**
@@ -49,14 +60,14 @@ class Text extends TokenizeAreaPluginBase {
   public function render($empty = FALSE) {
     $format = isset($this->options['content']['format']) ? $this->options['content']['format'] : filter_default_format();
     if (!$empty || !empty($this->options['empty'])) {
-      return array(
+      return [
         '#type' => 'processed_text',
         '#text' => $this->tokenizeValue($this->options['content']['value']),
         '#format' => $format,
-      );
+      ];
     }
 
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/area/TextCustom.php b/web/core/modules/views/src/Plugin/views/area/TextCustom.php
index 0eeabaa92..56e963dd6 100644
--- a/web/core/modules/views/src/Plugin/views/area/TextCustom.php
+++ b/web/core/modules/views/src/Plugin/views/area/TextCustom.php
@@ -18,7 +18,7 @@ class TextCustom extends TokenizeAreaPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['content'] = array('default' => '');
+    $options['content'] = ['default' => ''];
     return $options;
   }
 
@@ -28,12 +28,12 @@ class TextCustom extends TokenizeAreaPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['content'] = array(
+    $form['content'] = [
       '#title' => $this->t('Content'),
       '#type' => 'textarea',
       '#default_value' => $this->options['content'],
       '#rows' => 6,
-    );
+    ];
   }
 
   /**
@@ -41,12 +41,12 @@ class TextCustom extends TokenizeAreaPluginBase {
    */
   public function render($empty = FALSE) {
     if (!$empty || !empty($this->options['empty'])) {
-      return array(
+      return [
         '#markup' => $this->renderTextarea($this->options['content']),
-      );
+      ];
     }
 
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/area/Title.php b/web/core/modules/views/src/Plugin/views/area/Title.php
index 85e478816..d6139e0a1 100644
--- a/web/core/modules/views/src/Plugin/views/area/Title.php
+++ b/web/core/modules/views/src/Plugin/views/area/Title.php
@@ -18,7 +18,7 @@ class Title extends AreaPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['title'] = array('default' => '');
+    $options['title'] = ['default' => ''];
     return $options;
   }
 
@@ -28,12 +28,12 @@ class Title extends AreaPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['title'] = array(
+    $form['title'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Overridden title'),
       '#default_value' => $this->options['title'],
       '#description' => $this->t('Override the title of this view when it is empty. The available global tokens below can be used here.'),
-    );
+    ];
 
     // Don't use the AreaPluginBase tokenForm method, we don't want row tokens.
     $this->globalTokenForm($form, $form_state);
@@ -57,7 +57,7 @@ class Title extends AreaPluginBase {
    */
   public function render($empty = FALSE) {
     // Do nothing for this handler by returning an empty render array.
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php b/web/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
index e8833787c..1e0047976 100644
--- a/web/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
@@ -21,7 +21,7 @@ abstract class TokenizeAreaPluginBase extends AreaPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['tokenize'] = array('default' => FALSE);
+    $options['tokenize'] = ['default' => FALSE];
     return $options;
   }
 
@@ -39,14 +39,14 @@ abstract class TokenizeAreaPluginBase extends AreaPluginBase {
    * Adds tokenization form elements.
    */
   public function tokenForm(&$form, FormStateInterface $form_state) {
-    $form['tokenize'] = array(
+    $form['tokenize'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Use replacement tokens from the first row'),
       '#default_value' => $this->options['tokenize'],
-    );
+    ];
 
     // Get a list of the available fields and arguments for token replacement.
-    $options = array();
+    $options = [];
     $optgroup_arguments = (string) t('Arguments');
     $optgroup_fields = (string) t('Fields');
     foreach ($this->view->display_handler->getHandlers('field') as $field => $handler) {
@@ -54,35 +54,35 @@ abstract class TokenizeAreaPluginBase extends AreaPluginBase {
     }
 
     foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
-      $options[$optgroup_arguments]["{{ arguments.$arg }}"] = $this->t('@argument title', array('@argument' => $handler->adminLabel()));
-      $options[$optgroup_arguments]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', array('@argument' => $handler->adminLabel()));
+      $options[$optgroup_arguments]["{{ arguments.$arg }}"] = $this->t('@argument title', ['@argument' => $handler->adminLabel()]);
+      $options[$optgroup_arguments]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', ['@argument' => $handler->adminLabel()]);
     }
 
     if (!empty($options)) {
-      $form['tokens'] = array(
+      $form['tokens'] = [
         '#type' => 'details',
         '#title' => $this->t('Replacement patterns'),
         '#open' => TRUE,
         '#id' => 'edit-options-token-help',
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[tokenize]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['tokens']['help'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[tokenize]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['tokens']['help'] = [
         '#markup' => '<p>' . $this->t('The following tokens are available. You may use Twig syntax in this field.') . '</p>',
-      );
+      ];
       foreach (array_keys($options) as $type) {
         if (!empty($options[$type])) {
-          $items = array();
+          $items = [];
           foreach ($options[$type] as $key => $value) {
             $items[] = $key . ' == ' . $value;
           }
-          $form['tokens'][$type]['tokens'] = array(
+          $form['tokens'][$type]['tokens'] = [
             '#theme' => 'item_list',
             '#items' => $items,
-          );
+          ];
         }
       }
     }
diff --git a/web/core/modules/views/src/Plugin/views/area/View.php b/web/core/modules/views/src/Plugin/views/area/View.php
index 12f417cf2..832e23185 100644
--- a/web/core/modules/views/src/Plugin/views/area/View.php
+++ b/web/core/modules/views/src/Plugin/views/area/View.php
@@ -66,8 +66,8 @@ class View extends AreaPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['view_to_insert'] = array('default' => '');
-    $options['inherit_arguments'] = array('default' => FALSE);
+    $options['view_to_insert'] = ['default' => ''];
+    $options['inherit_arguments'] = ['default' => FALSE];
     return $options;
   }
 
@@ -79,22 +79,22 @@ class View extends AreaPluginBase {
 
     $view_display = $this->view->storage->id() . ':' . $this->view->current_display;
 
-    $options = array('' => $this->t('-Select-'));
+    $options = ['' => $this->t('-Select-')];
     $options += Views::getViewsAsOptions(FALSE, 'all', $view_display, FALSE, TRUE);
-    $form['view_to_insert'] = array(
+    $form['view_to_insert'] = [
       '#type' => 'select',
       '#title' => $this->t('View to insert'),
       '#default_value' => $this->options['view_to_insert'],
       '#description' => $this->t('The view to insert into this area.'),
       '#options' => $options,
-    );
+    ];
 
-    $form['inherit_arguments'] = array(
+    $form['inherit_arguments'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Inherit contextual filters'),
       '#default_value' => $this->options['inherit_arguments'],
       '#description' => $this->t('If checked, this view will receive the same contextual filters as its parent.'),
-    );
+    ];
   }
 
   /**
@@ -107,7 +107,7 @@ class View extends AreaPluginBase {
       $view = $this->viewStorage->load($view_name)->getExecutable();
 
       if (empty($view) || !$view->access($display_id)) {
-        return array();
+        return [];
       }
       $view->setDisplay($display_id);
 
@@ -118,7 +118,7 @@ class View extends AreaPluginBase {
       // Check if the view is part of the parent views of this view
       $search = "$view_name:$display_id";
       if (in_array($search, $this->view->parent_views)) {
-        drupal_set_message(t("Recursion detected in view @view display @display.", array('@view' => $view_name, '@display' => $display_id)), 'error');
+        drupal_set_message(t("Recursion detected in view @view display @display.", ['@view' => $view_name, '@display' => $display_id]), 'error');
       }
       else {
         if (!empty($this->options['inherit_arguments']) && !empty($this->view->args)) {
@@ -131,7 +131,7 @@ class View extends AreaPluginBase {
         return $output;
       }
     }
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index db75a675b..3f145195a 100644
--- a/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -105,7 +105,7 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
   /**
    * Determine if the argument needs a style plugin.
    *
-   * @return TRUE/FALSE
+   * @return bool
    */
   public function needsStylePlugin() {
     $info = $this->defaultActions($this->options['default_action']);
@@ -116,35 +116,35 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['default_action'] = array('default' => 'ignore');
-    $options['exception'] = array(
-      'contains' => array(
-        'value' => array('default' => 'all'),
-        'title_enable' => array('default' => FALSE),
-        'title' => array('default' => 'All'),
-      ),
-    );
-    $options['title_enable'] = array('default' => FALSE);
-    $options['title'] = array('default' => '');
-    $options['default_argument_type'] = array('default' => 'fixed');
-    $options['default_argument_options'] = array('default' => array());
-    $options['default_argument_skip_url'] = array('default' => FALSE);
-    $options['summary_options'] = array('default' => array());
-    $options['summary'] = array(
-      'contains' => array(
-        'sort_order' => array('default' => 'asc'),
-        'number_of_records' => array('default' => 0),
-        'format' => array('default' => 'default_summary'),
-      ),
-    );
-    $options['specify_validation'] = array('default' => FALSE);
-    $options['validate'] = array(
-      'contains' => array(
-        'type' => array('default' => 'none'),
-        'fail' => array('default' => 'not found'),
-      ),
-    );
-    $options['validate_options'] = array('default' => array());
+    $options['default_action'] = ['default' => 'ignore'];
+    $options['exception'] = [
+      'contains' => [
+        'value' => ['default' => 'all'],
+        'title_enable' => ['default' => FALSE],
+        'title' => ['default' => 'All'],
+      ],
+    ];
+    $options['title_enable'] = ['default' => FALSE];
+    $options['title'] = ['default' => ''];
+    $options['default_argument_type'] = ['default' => 'fixed'];
+    $options['default_argument_options'] = ['default' => []];
+    $options['default_argument_skip_url'] = ['default' => FALSE];
+    $options['summary_options'] = ['default' => []];
+    $options['summary'] = [
+      'contains' => [
+        'sort_order' => ['default' => 'asc'],
+        'number_of_records' => ['default' => 0],
+        'format' => ['default' => 'default_summary'],
+      ],
+    ];
+    $options['specify_validation'] = ['default' => FALSE];
+    $options['validate'] = [
+      'contains' => [
+        'type' => ['default' => 'none'],
+        'fail' => ['default' => 'not found'],
+      ],
+    ];
+    $options['validate_options'] = ['default' => []];
 
     return $options;
   }
@@ -154,68 +154,68 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
 
     $argument_text = $this->view->display_handler->getArgumentText();
 
-    $form['#pre_render'][] = array(get_class($this), 'preRenderMoveArgumentOptions');
+    $form['#pre_render'][] = [get_class($this), 'preRenderMoveArgumentOptions'];
 
-    $form['description'] = array(
+    $form['description'] = [
       '#markup' => $argument_text['description'],
-      '#theme_wrappers' => array('container'),
-      '#attributes' => array('class' => array('description')),
-    );
+      '#theme_wrappers' => ['container'],
+      '#attributes' => ['class' => ['description']],
+    ];
 
-    $form['no_argument'] = array(
+    $form['no_argument'] = [
       '#type' => 'details',
       '#title' => $argument_text['filter value not present'],
       '#open' => TRUE,
-    );
+    ];
     // Everything in the details is floated, so the last element needs to
     // clear those floats.
-    $form['no_argument']['clearfix'] = array(
+    $form['no_argument']['clearfix'] = [
       '#weight' => 1000,
       '#markup' => '<div class="clearfix"></div>',
-    );
-    $form['default_action'] = array(
+    ];
+    $form['default_action'] = [
       '#title' => $this->t('Default actions'),
       '#title_display' => 'invisible',
       '#type' => 'radios',
-      '#process' => array(array($this, 'processContainerRadios')),
+      '#process' => [[$this, 'processContainerRadios']],
       '#default_value' => $this->options['default_action'],
       '#fieldset' => 'no_argument',
-    );
+    ];
 
-    $form['exception'] = array(
+    $form['exception'] = [
       '#type' => 'details',
       '#title' => $this->t('Exceptions'),
       '#fieldset' => 'no_argument',
-    );
-    $form['exception']['value'] = array(
+    ];
+    $form['exception']['value'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Exception value'),
       '#size' => 20,
       '#default_value' => $this->options['exception']['value'],
       '#description' => $this->t('If this value is received, the filter will be ignored; i.e, "all values"'),
-    );
-    $form['exception']['title_enable'] = array(
+    ];
+    $form['exception']['title_enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Override title'),
       '#default_value' => $this->options['exception']['title_enable'],
-    );
-    $form['exception']['title'] = array(
+    ];
+    $form['exception']['title'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Override title'),
       '#title_display' => 'invisible',
       '#size' => 20,
       '#default_value' => $this->options['exception']['title'],
       '#description' => $this->t('Override the view and other argument titles. You may use Twig syntax in this field as well as the "arguments" and "raw_arguments" arrays.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[exception][title_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[exception][title_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
-    $options = array();
+    $options = [];
     $defaults = $this->defaultActions();
-    $validate_options = array();
+    $validate_options = [];
     foreach ($defaults as $id => $info) {
       $options[$id] = $info['title'];
       if (empty($info['default only'])) {
@@ -227,30 +227,30 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
     }
     $form['default_action']['#options'] = $options;
 
-    $form['argument_present'] = array(
+    $form['argument_present'] = [
       '#type' => 'details',
       '#title' => $argument_text['filter value present'],
       '#open' => TRUE,
-    );
-    $form['title_enable'] = array(
+    ];
+    $form['title_enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Override title'),
       '#default_value' => $this->options['title_enable'],
       '#fieldset' => 'argument_present',
-    );
-    $form['title'] = array(
+    ];
+    $form['title'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Provide title'),
       '#title_display' => 'invisible',
       '#default_value' => $this->options['title'],
       '#description' => $this->t('Override the view and other argument titles. You may use Twig syntax in this field.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[title_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[title_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#fieldset' => 'argument_present',
-    );
+    ];
 
     $output = $this->getTokenHelp();
     $form['token_help'] = [
@@ -269,29 +269,29 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
       ],
     ];
 
-    $form['specify_validation'] = array(
+    $form['specify_validation'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Specify validation criteria'),
       '#default_value' => $this->options['specify_validation'],
       '#fieldset' => 'argument_present',
-    );
+    ];
 
-    $form['validate'] = array(
+    $form['validate'] = [
       '#type' => 'container',
       '#fieldset' => 'argument_present',
-    );
+    ];
     // Validator options include derivatives with :. These are sanitized for js
     // and reverted on submission.
-    $form['validate']['type'] = array(
+    $form['validate']['type'] = [
       '#type' => 'select',
       '#title' => $this->t('Validator'),
       '#default_value' => static::encodeValidatorId($this->options['validate']['type']),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[specify_validation]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[specify_validation]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
     $plugins = Views::pluginManager('argument_validator')->getDefinitions();
     foreach ($plugins as $id => $info) {
@@ -320,21 +320,21 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
           if ($plugin->access() || $this->options['validate']['type'] == $id) {
             // Sanitize ID for js.
             $sanitized_id = static::encodeValidatorId($id);
-            $form['validate']['options'][$sanitized_id] = array(
+            $form['validate']['options'][$sanitized_id] = [
               '#prefix' => '<div id="edit-options-validate-options-' . $sanitized_id . '-wrapper">',
               '#suffix' => '</div>',
               '#type' => 'item',
               // Even if the plugin has no options add the key to the form_state.
               '#input' => TRUE, // trick it into checking input to make #process run
-              '#states' => array(
-                'visible' => array(
-                  ':input[name="options[specify_validation]"]' => array('checked' => TRUE),
-                  ':input[name="options[validate][type]"]' => array('value' => $sanitized_id),
-                ),
-              ),
+              '#states' => [
+                'visible' => [
+                  ':input[name="options[specify_validation]"]' => ['checked' => TRUE],
+                  ':input[name="options[validate][type]"]' => ['value' => $sanitized_id],
+                ],
+              ],
               '#id' => 'edit-options-validate-options-' . $sanitized_id,
-              '#default_value' => array(),
-            );
+              '#default_value' => [],
+            ];
             $plugin->buildOptionsForm($form['validate']['options'][$sanitized_id], $form_state);
             $validate_types[$sanitized_id] = $info['title'];
           }
@@ -345,18 +345,18 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
     asort($validate_types);
     $form['validate']['type']['#options'] = $validate_types;
 
-    $form['validate']['fail'] = array(
+    $form['validate']['fail'] = [
       '#type' => 'select',
       '#title' => $this->t('Action to take if filter value does not validate'),
       '#default_value' => $this->options['validate']['fail'],
       '#options' => $validate_options,
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[specify_validation]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[specify_validation]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#fieldset' => 'argument_present',
-    );
+    ];
   }
 
   /**
@@ -370,8 +370,8 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
 
     foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
       /** @var \Drupal\views\Plugin\views\argument\ArgumentPluginBase $handler */
-      $options[(string) t('Arguments')]["{{ arguments.$arg }}"] = $this->t('@argument title', array('@argument' => $handler->adminLabel()));
-      $options[(string) t('Arguments')]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', array('@argument' => $handler->adminLabel()));
+      $options[(string) t('Arguments')]["{{ arguments.$arg }}"] = $this->t('@argument title', ['@argument' => $handler->adminLabel()]);
+      $options[(string) t('Arguments')]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', ['@argument' => $handler->adminLabel()]);
     }
 
     // We have some options, so make a list.
@@ -381,14 +381,14 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
       ];
       foreach (array_keys($options) as $type) {
         if (!empty($options[$type])) {
-          $items = array();
+          $items = [];
           foreach ($options[$type] as $key => $value) {
             $items[] = $key . ' == ' . $value;
           }
-          $item_list = array(
+          $item_list = [
             '#theme' => 'item_list',
             '#items' => $items,
-          );
+          ];
           $output[] = $item_list;
         }
       }
@@ -488,38 +488,38 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
    * Override this method to provide additional (or fewer) default behaviors.
    */
   protected function defaultActions($which = NULL) {
-    $defaults = array(
-      'ignore' => array(
+    $defaults = [
+      'ignore' => [
         'title' => $this->t('Display all results for the specified field'),
         'method' => 'defaultIgnore',
-      ),
-      'default' => array(
+      ],
+      'default' => [
         'title' => $this->t('Provide default value'),
         'method' => 'defaultDefault',
         'form method' => 'defaultArgumentForm',
         'has default argument' => TRUE,
         'default only' => TRUE, // this can only be used for missing argument, not validation failure
-      ),
-      'not found' => array(
+      ],
+      'not found' => [
         'title' => $this->t('Hide view'),
         'method' => 'defaultNotFound',
         'hard fail' => TRUE, // This is a hard fail condition
-      ),
-      'summary' => array(
+      ],
+      'summary' => [
         'title' => $this->t('Display a summary'),
         'method' => 'defaultSummary',
         'form method' => 'defaultSummaryForm',
         'style plugin' => TRUE,
-      ),
-      'empty' => array(
+      ],
+      'empty' => [
         'title' => $this->t('Display contents of "No results found"'),
         'method' => 'defaultEmpty',
-      ),
-      'access denied' => array(
+      ],
+      'access denied' => [
         'title' => $this->t('Display "Access Denied"'),
         'method' => 'defaultAccessDenied',
-      ),
-    );
+      ],
+    ];
 
     if ($this->view->display_handler->hasPath()) {
       $defaults['not found']['title'] = $this->t('Show "Page not found"');
@@ -541,31 +541,31 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
    */
   public function defaultArgumentForm(&$form, FormStateInterface $form_state) {
     $plugins = Views::pluginManager('argument_default')->getDefinitions();
-    $options = array();
+    $options = [];
 
-    $form['default_argument_skip_url'] = array(
+    $form['default_argument_skip_url'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Skip default argument for view URL'),
       '#default_value' => $this->options['default_argument_skip_url'],
       '#description' => $this->t('Select whether to include this default argument when constructing the URL for this view. Skipping default arguments is useful e.g. in the case of feeds.')
-    );
+    ];
 
-    $form['default_argument_type'] = array(
+    $form['default_argument_type'] = [
       '#prefix' => '<div id="edit-options-default-argument-type-wrapper">',
       '#suffix' => '</div>',
       '#type' => 'select',
       '#id' => 'edit-options-default-argument-type',
       '#title' => $this->t('Type'),
       '#default_value' => $this->options['default_argument_type'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[default_action]"]' => array('value' => 'default'),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[default_action]"]' => ['value' => 'default'],
+        ],
+      ],
       // Views custom key, moves this element to the appropriate container
       // under the radio button.
       '#argument_option' => 'default',
-    );
+    ];
 
     foreach ($plugins as $id => $info) {
       if (!empty($info['no_ui'])) {
@@ -575,21 +575,21 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
       if ($plugin) {
         if ($plugin->access() || $this->options['default_argument_type'] == $id) {
           $form['argument_default']['#argument_option'] = 'default';
-          $form['argument_default'][$id] = array(
+          $form['argument_default'][$id] = [
             '#prefix' => '<div id="edit-options-argument-default-options-' . $id . '-wrapper">',
             '#suffix' => '</div>',
             '#id' => 'edit-options-argument-default-options-' . $id,
             '#type' => 'item',
             // Even if the plugin has no options add the key to the form_state.
             '#input' => TRUE,
-            '#states' => array(
-              'visible' => array(
-                ':input[name="options[default_action]"]' => array('value' => 'default'),
-                ':input[name="options[default_argument_type]"]' => array('value' => $id),
-              ),
-            ),
-            '#default_value' => array(),
-          );
+            '#states' => [
+              'visible' => [
+                ':input[name="options[default_action]"]' => ['value' => 'default'],
+                ':input[name="options[default_argument_type]"]' => ['value' => $id],
+              ],
+            ],
+            '#default_value' => [],
+          ];
           $options[$id] = $info['title'];
           $plugin->buildOptionsForm($form['argument_default'][$id], $form_state);
         }
@@ -606,8 +606,8 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
    */
   public function defaultSummaryForm(&$form, FormStateInterface $form_state) {
     $style_plugins = Views::pluginManager('style')->getDefinitions();
-    $summary_plugins = array();
-    $format_options = array();
+    $summary_plugins = [];
+    $format_options = [];
     foreach ($style_plugins as $key => $plugin) {
       if (isset($plugin['display_types']) && in_array('summary', $plugin['display_types'])) {
         $summary_plugins[$key] = $plugin;
@@ -615,48 +615,48 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
       }
     }
 
-    $form['summary'] = array(
+    $form['summary'] = [
       // Views custom key, moves this element to the appropriate container
       // under the radio button.
       '#argument_option' => 'summary',
-    );
-    $form['summary']['sort_order'] = array(
+    ];
+    $form['summary']['sort_order'] = [
       '#type' => 'radios',
       '#title' => $this->t('Sort order'),
-      '#options' => array('asc' => $this->t('Ascending'), 'desc' => $this->t('Descending')),
+      '#options' => ['asc' => $this->t('Ascending'), 'desc' => $this->t('Descending')],
       '#default_value' => $this->options['summary']['sort_order'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[default_action]"]' => array('value' => 'summary'),
-        ),
-      ),
-    );
-    $form['summary']['number_of_records'] = array(
+      '#states' => [
+        'visible' => [
+          ':input[name="options[default_action]"]' => ['value' => 'summary'],
+        ],
+      ],
+    ];
+    $form['summary']['number_of_records'] = [
       '#type' => 'radios',
       '#title' => $this->t('Sort by'),
       '#default_value' => $this->options['summary']['number_of_records'],
-      '#options' => array(
+      '#options' => [
         0 => $this->getSortName(),
         1 => $this->t('Number of records')
-      ),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[default_action]"]' => array('value' => 'summary'),
-        ),
-      ),
-    );
+      ],
+      '#states' => [
+        'visible' => [
+          ':input[name="options[default_action]"]' => ['value' => 'summary'],
+        ],
+      ],
+    ];
 
-    $form['summary']['format'] = array(
+    $form['summary']['format'] = [
       '#type' => 'radios',
       '#title' => $this->t('Format'),
       '#options' => $format_options,
       '#default_value' => $this->options['summary']['format'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[default_action]"]' => array('value' => 'summary'),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[default_action]"]' => ['value' => 'summary'],
+        ],
+      ],
+    ];
 
     foreach ($summary_plugins as $id => $info) {
       $plugin = $this->getPlugin('style', $id);
@@ -664,20 +664,20 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
         continue;
       }
       if ($plugin) {
-        $form['summary']['options'][$id] = array(
+        $form['summary']['options'][$id] = [
           '#prefix' => '<div id="edit-options-summary-options-' . $id . '-wrapper">',
           '#suffix' => '</div>',
           '#id' => 'edit-options-summary-options-' . $id,
           '#type' => 'item',
           '#input' => TRUE, // trick it into checking input to make #process run
-          '#states' => array(
-            'visible' => array(
-              ':input[name="options[default_action]"]' => array('value' => 'summary'),
-              ':input[name="options[summary][format]"]' => array('value' => $id),
-            ),
-          ),
-          '#default_value' => array(),
-        );
+          '#states' => [
+            'visible' => [
+              ':input[name="options[default_action]"]' => ['value' => 'summary'],
+              ':input[name="options[summary][format]"]' => ['value' => $id],
+            ],
+          ],
+          '#default_value' => [],
+        ];
         $options[$id] = $info['title'];
         $plugin->buildOptionsForm($form['summary']['options'][$id], $form_state);
       }
@@ -703,7 +703,7 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
     }
 
     if (!empty($info['method args'])) {
-      return call_user_func_array(array(&$this, $info['method']), $info['method args']);
+      return call_user_func_array([&$this, $info['method']], $info['method args']);
     }
     else {
       return $this->{$info['method']}();
@@ -760,7 +760,7 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
     // We return with no query; this will force the empty text.
     $this->view->built = TRUE;
     $this->view->executed = TRUE;
-    $this->view->result = array();
+    $this->view->result = [];
     return FALSE;
   }
 
@@ -775,7 +775,7 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
   /**
    * Determine if the argument is set to provide a default argument.
    */
-  function hasDefaultArgument() {
+  public function hasDefaultArgument() {
     $info = $this->defaultActions($this->options['default_action']);
     return !empty($info['has default argument']);
   }
@@ -897,7 +897,7 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
     // Add the number of nodes counter
     $distinct = ($this->view->display_handler->getOption('distinct') && empty($this->query->no_distinct));
 
-    $count_alias = $this->query->addField($this->view->storage->get('base_table'), $this->view->storage->get('base_field'), 'num_records', array('count' => TRUE, 'distinct' => $distinct));
+    $count_alias = $this->query->addField($this->view->storage->get('base_table'), $this->view->storage->get('base_field'), 'num_records', ['count' => TRUE, 'distinct' => $distinct]);
     $this->query->addGroupBy($this->name_alias);
 
     if ($count_field) {
@@ -960,7 +960,7 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
    *
    * This usually needs to be overridden to provide a proper title.
    */
-  function title() {
+  public function title() {
     return $this->argument;
   }
 
@@ -1074,7 +1074,7 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
    * Get the display or row plugin, if it exists.
    */
   public function getPlugin($type = 'argument_default', $name = NULL) {
-    $options = array();
+    $options = [];
     switch ($type) {
       case 'argument_default':
         if (!isset($this->options['default_argument_type'])) {
@@ -1127,7 +1127,7 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
    * their argument is (e.g. alphabetical, numeric, date).
    */
   public function getSortName() {
-    return $this->t('Default sort', array(), array('context' => 'Sort order'));
+    return $this->t('Default sort', [], ['context' => 'Sort order']);
   }
 
   /**
@@ -1142,12 +1142,12 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
   public static function processContainerRadios($element) {
     if (count($element['#options']) > 0) {
       foreach ($element['#options'] as $key => $choice) {
-        $element += array($key => array());
+        $element += [$key => []];
         // Generate the parents as the autogenerator does, so we will have a
         // unique id for each radio button.
-        $parents_for_id = array_merge($element['#parents'], array($key));
+        $parents_for_id = array_merge($element['#parents'], [$key]);
 
-        $element[$key] += array(
+        $element[$key] += [
           '#type' => 'radio',
           '#title' => $choice,
           // The key is sanitized in drupal_attributes() during output from the
@@ -1158,11 +1158,11 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
           '#parents' => $element['#parents'],
           '#id' => Html::getUniqueId('edit-' . implode('-', $parents_for_id)),
           '#ajax' => isset($element['#ajax']) ? $element['#ajax'] : NULL,
-        );
-        $element[$key . '_options'] = array(
+        ];
+        $element[$key . '_options'] = [
           '#type' => 'container',
-          '#attributes' => array('class' => array('views-admin-dependent')),
-        );
+          '#attributes' => ['class' => ['views-admin-dependent']],
+        ];
       }
     }
     return $element;
@@ -1326,6 +1326,17 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
     return $dependencies;
   }
 
+  /**
+   * Returns a context definition for this argument.
+   *
+   * @return \Drupal\Core\Plugin\Context\ContextDefinitionInterface|null
+   *   A context definition that represents the argument or NULL if that is
+   *   not possible.
+   */
+  public function getContextDefinition() {
+    return $this->getPlugin('argument_validator')->getContextDefinition();
+  }
+
 }
 
 /**
diff --git a/web/core/modules/views/src/Plugin/views/argument/Date.php b/web/core/modules/views/src/Plugin/views/argument/Date.php
index 8d1dd4010..a751d561b 100644
--- a/web/core/modules/views/src/Plugin/views/argument/Date.php
+++ b/web/core/modules/views/src/Plugin/views/argument/Date.php
@@ -85,9 +85,9 @@ class Date extends Formula implements ContainerFactoryPluginInterface {
    */
   public function defaultArgumentForm(&$form, FormStateInterface $form_state) {
     parent::defaultArgumentForm($form, $form_state);
-    $form['default_argument_type']['#options'] += array('date' => $this->t('Current date'));
-    $form['default_argument_type']['#options'] += array('node_created' => $this->t("Current node's creation time"));
-    $form['default_argument_type']['#options'] += array('node_changed' => $this->t("Current node's update time"));
+    $form['default_argument_type']['#options'] += ['date' => $this->t('Current date')];
+    $form['default_argument_type']['#options'] += ['node_created' => $this->t("Current node's creation time")];
+    $form['default_argument_type']['#options'] += ['node_changed' => $this->t("Current node's update time")];
   }
 
   /**
@@ -98,7 +98,7 @@ class Date extends Formula implements ContainerFactoryPluginInterface {
     if (!$raw && $this->options['default_argument_type'] == 'date') {
       return date($this->argFormat, REQUEST_TIME);
     }
-    elseif (!$raw && in_array($this->options['default_argument_type'], array('node_created', 'node_changed'))) {
+    elseif (!$raw && in_array($this->options['default_argument_type'], ['node_created', 'node_changed'])) {
       $node = $this->routeMatch->getParameter('node');
 
       if (!($node instanceof NodeInterface)) {
@@ -119,7 +119,7 @@ class Date extends Formula implements ContainerFactoryPluginInterface {
    * {@inheritdoc}
    */
   public function getSortName() {
-    return $this->t('Date', array(), array('context' => 'Sort order'));
+    return $this->t('Date', [], ['context' => 'Sort order']);
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/argument/DayDate.php b/web/core/modules/views/src/Plugin/views/argument/DayDate.php
index 187be041d..42bd81743 100644
--- a/web/core/modules/views/src/Plugin/views/argument/DayDate.php
+++ b/web/core/modules/views/src/Plugin/views/argument/DayDate.php
@@ -31,7 +31,7 @@ class DayDate extends Date {
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     $day = str_pad($this->argument, 2, '0', STR_PAD_LEFT);
     return format_date(strtotime("2005" . "05" . $day . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
   }
diff --git a/web/core/modules/views/src/Plugin/views/argument/Formula.php b/web/core/modules/views/src/Plugin/views/argument/Formula.php
index a80074c6b..83b337822 100644
--- a/web/core/modules/views/src/Plugin/views/argument/Formula.php
+++ b/web/core/modules/views/src/Plugin/views/argument/Formula.php
@@ -59,9 +59,9 @@ class Formula extends ArgumentPluginBase {
     // Now that our table is secure, get our formula.
     $placeholder = $this->placeholder();
     $formula = $this->getFormula() . ' = ' . $placeholder;
-    $placeholders = array(
+    $placeholders = [
       $placeholder => $this->argument,
-    );
+    ];
     $this->query->addWhere(0, $formula, $placeholders, 'formula');
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/argument/FullDate.php b/web/core/modules/views/src/Plugin/views/argument/FullDate.php
index 84bcd8cfa..ca4ca9f60 100644
--- a/web/core/modules/views/src/Plugin/views/argument/FullDate.php
+++ b/web/core/modules/views/src/Plugin/views/argument/FullDate.php
@@ -30,7 +30,7 @@ class FullDate extends Date {
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     return format_date(strtotime($this->argument . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/argument/GroupByNumeric.php b/web/core/modules/views/src/Plugin/views/argument/GroupByNumeric.php
index 1e7ba3886..64be23ef8 100644
--- a/web/core/modules/views/src/Plugin/views/argument/GroupByNumeric.php
+++ b/web/core/modules/views/src/Plugin/views/argument/GroupByNumeric.php
@@ -16,7 +16,7 @@ class GroupByNumeric extends ArgumentPluginBase {
     $field = $this->getField();
     $placeholder = $this->placeholder();
 
-    $this->query->addHavingExpression(0, "$field = $placeholder", array($placeholder => $this->argument));
+    $this->query->addHavingExpression(0, "$field = $placeholder", [$placeholder => $this->argument]);
   }
 
   public function adminLabel($short = FALSE) {
@@ -27,7 +27,7 @@ class GroupByNumeric extends ArgumentPluginBase {
    * {@inheritdoc}
    */
   public function getSortName() {
-    return $this->t('Numerical', array(), array('context' => 'Sort order'));
+    return $this->t('Numerical', [], ['context' => 'Sort order']);
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/argument/LanguageArgument.php b/web/core/modules/views/src/Plugin/views/argument/LanguageArgument.php
index ef9e15202..2eb1870ed 100644
--- a/web/core/modules/views/src/Plugin/views/argument/LanguageArgument.php
+++ b/web/core/modules/views/src/Plugin/views/argument/LanguageArgument.php
@@ -26,7 +26,7 @@ class LanguageArgument extends ArgumentPluginBase {
    * Gets the user friendly version of the language name for display as a
    * title placeholder.
    */
-  function title() {
+  public function title() {
     return $this->language($this->argument);
   }
 
@@ -40,7 +40,7 @@ class LanguageArgument extends ArgumentPluginBase {
    *   The translated name for the language, or "Unknown language" if the
    *   language was not found.
    */
-  function language($langcode) {
+  public function language($langcode) {
     $languages = $this->listLanguages();
     return isset($languages[$langcode]) ? $languages[$langcode] : $this->t('Unknown language');
   }
diff --git a/web/core/modules/views/src/Plugin/views/argument/ManyToOne.php b/web/core/modules/views/src/Plugin/views/argument/ManyToOne.php
index 48385d532..680c19f2a 100644
--- a/web/core/modules/views/src/Plugin/views/argument/ManyToOne.php
+++ b/web/core/modules/views/src/Plugin/views/argument/ManyToOne.php
@@ -34,18 +34,18 @@ class ManyToOne extends ArgumentPluginBase {
 
     // Ensure defaults for these, during summaries and stuff:
     $this->operator = 'or';
-    $this->value = array();
+    $this->value = [];
   }
 
   protected function defineOptions() {
     $options = parent::defineOptions();
 
     if (!empty($this->definition['numeric'])) {
-      $options['break_phrase'] = array('default' => FALSE);
+      $options['break_phrase'] = ['default' => FALSE];
     }
 
-    $options['add_table'] = array('default' => FALSE);
-    $options['require_value'] = array('default' => FALSE);
+    $options['add_table'] = ['default' => FALSE];
+    $options['require_value'] = ['default' => FALSE];
 
     if (isset($this->helper)) {
       $this->helper->defineOptions($options);
@@ -62,28 +62,28 @@ class ManyToOne extends ArgumentPluginBase {
     parent::buildOptionsForm($form, $form_state);
 
     // allow + for or, , for and
-    $form['break_phrase'] = array(
+    $form['break_phrase'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow multiple values'),
       '#description' => $this->t('If selected, users can enter multiple values in the form of 1+2+3 (for OR) or 1,2,3 (for AND).'),
       '#default_value' => !empty($this->options['break_phrase']),
       '#group' => 'options][more',
-    );
+    ];
 
-    $form['add_table'] = array(
+    $form['add_table'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow multiple filter values to work together'),
       '#description' => $this->t('If selected, multiple instances of this filter can work together, as though multiple values were supplied to the same filter. This setting is not compatible with the "Reduce duplicates" setting.'),
       '#default_value' => !empty($this->options['add_table']),
       '#group' => 'options][more',
-    );
+    ];
 
-    $form['require_value'] = array(
+    $form['require_value'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Do not display items with no value in summary'),
       '#default_value' => !empty($this->options['require_value']),
       '#group' => 'options][more',
-    );
+    ];
 
     $this->helper->buildOptionsForm($form, $form_state);
   }
@@ -119,14 +119,14 @@ class ManyToOne extends ArgumentPluginBase {
       $this->unpackArgumentValue($force_int);
     }
     else {
-      $this->value = array($this->argument);
+      $this->value = [$this->argument];
       $this->operator = 'or';
     }
 
     $this->helper->addFilter();
   }
 
-  function title() {
+  public function title() {
     if (!$this->argument) {
       return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
     }
@@ -136,7 +136,7 @@ class ManyToOne extends ArgumentPluginBase {
       $this->unpackArgumentValue($force_int);
     }
     else {
-      $this->value = array($this->argument);
+      $this->value = [$this->argument];
       $this->operator = 'or';
     }
 
@@ -146,7 +146,7 @@ class ManyToOne extends ArgumentPluginBase {
       return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
     }
 
-    if ($this->value === array(-1)) {
+    if ($this->value === [-1]) {
       return !empty($this->definition['invalid input']) ? $this->definition['invalid input'] : $this->t('Invalid input');
     }
 
diff --git a/web/core/modules/views/src/Plugin/views/argument/MonthDate.php b/web/core/modules/views/src/Plugin/views/argument/MonthDate.php
index c1b493bdb..17ce1b987 100644
--- a/web/core/modules/views/src/Plugin/views/argument/MonthDate.php
+++ b/web/core/modules/views/src/Plugin/views/argument/MonthDate.php
@@ -30,7 +30,7 @@ class MonthDate extends Date {
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     $month = str_pad($this->argument, 2, '0', STR_PAD_LEFT);
     return format_date(strtotime("2005" . $month . "15" . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
   }
diff --git a/web/core/modules/views/src/Plugin/views/argument/NullArgument.php b/web/core/modules/views/src/Plugin/views/argument/NullArgument.php
index 181fb33c7..7fadf1688 100644
--- a/web/core/modules/views/src/Plugin/views/argument/NullArgument.php
+++ b/web/core/modules/views/src/Plugin/views/argument/NullArgument.php
@@ -15,7 +15,7 @@ class NullArgument extends ArgumentPluginBase {
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['must_not_be'] = array('default' => FALSE);
+    $options['must_not_be'] = ['default' => FALSE];
     return $options;
   }
 
@@ -25,13 +25,13 @@ class NullArgument extends ArgumentPluginBase {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['must_not_be'] = array(
+    $form['must_not_be'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Fail basic validation if any argument is given'),
       '#default_value' => !empty($this->options['must_not_be']),
       '#description' => $this->t('By checking this field, you can use this to make sure views with more arguments than necessary fail validation.'),
       '#group' => 'options][more',
-    );
+    ];
 
     unset($form['exception']);
   }
@@ -42,7 +42,7 @@ class NullArgument extends ArgumentPluginBase {
    */
   protected function defaultActions($which = NULL) {
     if ($which) {
-      if (in_array($which, array('ignore', 'not found', 'empty', 'default'))) {
+      if (in_array($which, ['ignore', 'not found', 'empty', 'default'])) {
         return parent::defaultActions($which);
       }
       return;
diff --git a/web/core/modules/views/src/Plugin/views/argument/NumericArgument.php b/web/core/modules/views/src/Plugin/views/argument/NumericArgument.php
index b3148369a..5cace4dbc 100644
--- a/web/core/modules/views/src/Plugin/views/argument/NumericArgument.php
+++ b/web/core/modules/views/src/Plugin/views/argument/NumericArgument.php
@@ -3,6 +3,7 @@
 namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\Context\ContextDefinition;
 
 /**
  * Basic argument handler for arguments that are numeric. Incorporates
@@ -29,8 +30,8 @@ class NumericArgument extends ArgumentPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['break_phrase'] = array('default' => FALSE);
-    $options['not'] = array('default' => FALSE);
+    $options['break_phrase'] = ['default' => FALSE];
+    $options['not'] = ['default' => FALSE];
 
     return $options;
   }
@@ -39,24 +40,24 @@ class NumericArgument extends ArgumentPluginBase {
     parent::buildOptionsForm($form, $form_state);
 
     // allow + for or, , for and
-    $form['break_phrase'] = array(
+    $form['break_phrase'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow multiple values'),
       '#description' => $this->t('If selected, users can enter multiple values in the form of 1+2+3 (for OR) or 1,2,3 (for AND).'),
       '#default_value' => !empty($this->options['break_phrase']),
       '#group' => 'options][more',
-    );
+    ];
 
-    $form['not'] = array(
+    $form['not'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Exclude'),
       '#description' => $this->t('If selected, the numbers entered for the filter will be excluded rather than limiting the view.'),
       '#default_value' => !empty($this->options['not']),
       '#group' => 'options][more',
-    );
+    ];
   }
 
-  function title() {
+  public function title() {
     if (!$this->argument) {
       return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
     }
@@ -67,7 +68,7 @@ class NumericArgument extends ArgumentPluginBase {
       $this->operator = $break->operator;
     }
     else {
-      $this->value = array($this->argument);
+      $this->value = [$this->argument];
       $this->operator = 'or';
     }
 
@@ -75,7 +76,7 @@ class NumericArgument extends ArgumentPluginBase {
       return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
     }
 
-    if ($this->value === array(-1)) {
+    if ($this->value === [-1]) {
       return !empty($this->definition['invalid input']) ? $this->definition['invalid input'] : $this->t('Invalid input');
     }
 
@@ -100,7 +101,7 @@ class NumericArgument extends ArgumentPluginBase {
       $this->operator = $break->operator;
     }
     else {
-      $this->value = array($this->argument);
+      $this->value = [$this->argument];
     }
 
     $placeholder = $this->placeholder();
@@ -109,11 +110,11 @@ class NumericArgument extends ArgumentPluginBase {
     if (count($this->value) > 1) {
       $operator = empty($this->options['not']) ? 'IN' : 'NOT IN';
       $placeholder .= '[]';
-      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator($placeholder) $null_check", array($placeholder => $this->value));
+      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator($placeholder) $null_check", [$placeholder => $this->value]);
     }
     else {
       $operator = empty($this->options['not']) ? '=' : '!=';
-      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator $placeholder $null_check", array($placeholder => $this->argument));
+      $this->query->addWhereExpression(0, "$this->tableAlias.$this->realField $operator $placeholder $null_check", [$placeholder => $this->argument]);
     }
   }
 
@@ -121,7 +122,20 @@ class NumericArgument extends ArgumentPluginBase {
    * {@inheritdoc}
    */
   public function getSortName() {
-    return $this->t('Numerical', array(), array('context' => 'Sort order'));
+    return $this->t('Numerical', [], ['context' => 'Sort order']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getContextDefinition() {
+    if ($context_definition = parent::getContextDefinition()) {
+      return $context_definition;
+    }
+
+    // If the parent does not provide a context definition through the
+    // validation plugin, fall back to the integer type.
+    return new ContextDefinition('integer', $this->adminLabel(), FALSE);
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/argument/StringArgument.php b/web/core/modules/views/src/Plugin/views/argument/StringArgument.php
index 085589ab0..6058d6618 100644
--- a/web/core/modules/views/src/Plugin/views/argument/StringArgument.php
+++ b/web/core/modules/views/src/Plugin/views/argument/StringArgument.php
@@ -5,6 +5,7 @@ namespace Drupal\views\Plugin\views\argument;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\ManyToOneHelper;
@@ -30,23 +31,23 @@ class StringArgument extends ArgumentPluginBase {
 
       // Ensure defaults for these, during summaries and stuff:
       $this->operator = 'or';
-      $this->value = array();
+      $this->value = [];
     }
   }
 
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['glossary'] = array('default' => FALSE);
-    $options['limit'] = array('default' => 0);
-    $options['case'] = array('default' => 'none');
-    $options['path_case'] = array('default' => 'none');
-    $options['transform_dash'] = array('default' => FALSE);
-    $options['break_phrase'] = array('default' => FALSE);
+    $options['glossary'] = ['default' => FALSE];
+    $options['limit'] = ['default' => 0];
+    $options['case'] = ['default' => 'none'];
+    $options['path_case'] = ['default' => 'none'];
+    $options['transform_dash'] = ['default' => FALSE];
+    $options['break_phrase'] = ['default' => FALSE];
 
     if (!empty($this->definition['many to one'])) {
-      $options['add_table'] = array('default' => FALSE);
-      $options['require_value'] = array('default' => FALSE);
+      $options['add_table'] = ['default' => FALSE];
+      $options['require_value'] = ['default' => FALSE];
     }
 
     return $options;
@@ -55,89 +56,89 @@ class StringArgument extends ArgumentPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['glossary'] = array(
+    $form['glossary'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Glossary mode'),
       '#description' => $this->t('Glossary mode applies a limit to the number of characters used in the filter value, which allows the summary view to act as a glossary.'),
       '#default_value' => $this->options['glossary'],
       '#group' => 'options][more',
-    );
+    ];
 
-    $form['limit'] = array(
+    $form['limit'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Character limit'),
       '#description' => $this->t('How many characters of the filter value to filter against. If set to 1, all fields starting with the first letter in the filter value would be matched.'),
       '#default_value' => $this->options['limit'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[glossary]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[glossary]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#group' => 'options][more',
-    );
+    ];
 
-    $form['case'] = array(
+    $form['case'] = [
       '#type' => 'select',
       '#title' => $this->t('Case'),
       '#description' => $this->t('When printing the title and summary, how to transform the case of the filter value.'),
-      '#options' => array(
+      '#options' => [
         'none' => $this->t('No transform'),
         'upper' => $this->t('Upper case'),
         'lower' => $this->t('Lower case'),
         'ucfirst' => $this->t('Capitalize first letter'),
         'ucwords' => $this->t('Capitalize each word'),
-      ),
+      ],
       '#default_value' => $this->options['case'],
       '#group' => 'options][more',
-    );
+    ];
 
-    $form['path_case'] = array(
+    $form['path_case'] = [
       '#type' => 'select',
       '#title' => $this->t('Case in path'),
       '#description' => $this->t('When printing URL paths, how to transform the case of the filter value. Do not use this unless with Postgres as it uses case sensitive comparisons.'),
-      '#options' => array(
+      '#options' => [
         'none' => $this->t('No transform'),
         'upper' => $this->t('Upper case'),
         'lower' => $this->t('Lower case'),
         'ucfirst' => $this->t('Capitalize first letter'),
         'ucwords' => $this->t('Capitalize each word'),
-      ),
+      ],
       '#default_value' => $this->options['path_case'],
       '#group' => 'options][more',
-    );
+    ];
 
-    $form['transform_dash'] = array(
+    $form['transform_dash'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Transform spaces to dashes in URL'),
       '#default_value' => $this->options['transform_dash'],
       '#group' => 'options][more',
-    );
+    ];
 
     if (!empty($this->definition['many to one'])) {
-      $form['add_table'] = array(
+      $form['add_table'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Allow multiple filter values to work together'),
         '#description' => $this->t('If selected, multiple instances of this filter can work together, as though multiple values were supplied to the same filter. This setting is not compatible with the "Reduce duplicates" setting.'),
         '#default_value' => !empty($this->options['add_table']),
         '#group' => 'options][more',
-      );
+      ];
 
-      $form['require_value'] = array(
+      $form['require_value'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Do not display items with no value in summary'),
         '#default_value' => !empty($this->options['require_value']),
         '#group' => 'options][more',
-      );
+      ];
     }
 
     // allow + for or, , for and
-    $form['break_phrase'] = array(
+    $form['break_phrase'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow multiple values'),
       '#description' => $this->t('If selected, users can enter multiple values in the form of 1+2+3 (for OR) or 1,2,3 (for AND).'),
       '#default_value' => !empty($this->options['break_phrase']),
       '#group' => 'options][more',
-    );
+    ];
   }
 
   /**
@@ -205,7 +206,7 @@ class StringArgument extends ArgumentPluginBase {
       $this->unpackArgumentValue();
     }
     else {
-      $this->value = array($argument);
+      $this->value = [$argument];
       $this->operator = 'or';
     }
 
@@ -252,9 +253,9 @@ class StringArgument extends ArgumentPluginBase {
       else {
         $field .= ' = ' . $placeholder;
       }
-      $placeholders = array(
+      $placeholders = [
         $placeholder => $argument,
-      );
+      ];
       $this->query->addWhereExpression(0, $field, $placeholders);
     }
     else {
@@ -274,10 +275,10 @@ class StringArgument extends ArgumentPluginBase {
    * {@inheritdoc}
    */
   public function getSortName() {
-    return $this->t('Alphabetical', array(), array('context' => 'Sort order'));
+    return $this->t('Alphabetical', [], ['context' => 'Sort order']);
   }
 
-  function title() {
+  public function title() {
     // Support case-insensitive title comparisons for PostgreSQL by converting
     // the title to lowercase.
     if ($this->options['case'] != 'none' && Database::getConnection()->databaseType() == 'pgsql') {
@@ -293,7 +294,7 @@ class StringArgument extends ArgumentPluginBase {
       $this->unpackArgumentValue();
     }
     else {
-      $this->value = array($this->argument);
+      $this->value = [$this->argument];
       $this->operator = 'or';
     }
 
@@ -301,7 +302,7 @@ class StringArgument extends ArgumentPluginBase {
       return !empty($this->definition['empty field name']) ? $this->definition['empty field name'] : $this->t('Uncategorized');
     }
 
-    if ($this->value === array(-1)) {
+    if ($this->value === [-1]) {
       return !empty($this->definition['invalid input']) ? $this->definition['invalid input'] : $this->t('Invalid input');
     }
 
@@ -319,4 +320,17 @@ class StringArgument extends ArgumentPluginBase {
     return $this->caseTransform(parent::summaryName($data), $this->options['case']);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getContextDefinition() {
+    if ($context_definition = parent::getContextDefinition()) {
+      return $context_definition;
+    }
+
+    // If the parent does not provide a context definition through the
+    // validation plugin, fall back to the string type.
+    return new ContextDefinition('string', $this->adminLabel(), FALSE);
+  }
+
 }
diff --git a/web/core/modules/views/src/Plugin/views/argument/WeekDate.php b/web/core/modules/views/src/Plugin/views/argument/WeekDate.php
index 73cc2055d..918cfec55 100644
--- a/web/core/modules/views/src/Plugin/views/argument/WeekDate.php
+++ b/web/core/modules/views/src/Plugin/views/argument/WeekDate.php
@@ -19,7 +19,7 @@ class WeekDate extends Date {
    */
   public function summaryName($data) {
     $created = $data->{$this->name_alias};
-    return $this->t('Week @week', array('@week' => $created));
+    return $this->t('Week @week', ['@week' => $created]);
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/argument/YearMonthDate.php b/web/core/modules/views/src/Plugin/views/argument/YearMonthDate.php
index 8185513ef..1e1effe1c 100644
--- a/web/core/modules/views/src/Plugin/views/argument/YearMonthDate.php
+++ b/web/core/modules/views/src/Plugin/views/argument/YearMonthDate.php
@@ -30,7 +30,7 @@ class YearMonthDate extends Date {
   /**
    * Provide a link to the next level of the view
    */
-  function title() {
+  public function title() {
     return format_date(strtotime($this->argument . "15" . " 00:00:00 UTC"), 'custom', $this->format, 'UTC');
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php b/web/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
index c3b1c86c5..6cea74d4a 100644
--- a/web/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
@@ -58,7 +58,7 @@ abstract class ArgumentDefaultPluginBase extends PluginBase {
    * Retrieve the options when this is a new access
    * control plugin
    */
-  protected function defineOptions() { return array(); }
+  protected function defineOptions() { return []; }
 
   /**
    * Provide the default form for setting options.
@@ -73,7 +73,7 @@ abstract class ArgumentDefaultPluginBase extends PluginBase {
   /**
    * Provide the default form form for submitting options
    */
-  public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = array()) { }
+  public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = []) { }
 
   /**
    * Determine if the administrator has the privileges to use this
diff --git a/web/core/modules/views/src/Plugin/views/argument_default/Fixed.php b/web/core/modules/views/src/Plugin/views/argument_default/Fixed.php
index 317708aad..da08e561f 100644
--- a/web/core/modules/views/src/Plugin/views/argument_default/Fixed.php
+++ b/web/core/modules/views/src/Plugin/views/argument_default/Fixed.php
@@ -23,7 +23,7 @@ class Fixed extends ArgumentDefaultPluginBase implements CacheableDependencyInte
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['argument'] = array('default' => '');
+    $options['argument'] = ['default' => ''];
 
     return $options;
   }
@@ -33,11 +33,11 @@ class Fixed extends ArgumentDefaultPluginBase implements CacheableDependencyInte
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['argument'] = array(
+    $form['argument'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Fixed value'),
       '#default_value' => $this->options['argument'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/argument_default/QueryParameter.php b/web/core/modules/views/src/Plugin/views/argument_default/QueryParameter.php
index e5b5e201a..1b45615fd 100644
--- a/web/core/modules/views/src/Plugin/views/argument_default/QueryParameter.php
+++ b/web/core/modules/views/src/Plugin/views/argument_default/QueryParameter.php
@@ -23,9 +23,9 @@ class QueryParameter extends ArgumentDefaultPluginBase implements CacheableDepen
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['query_param'] = array('default' => '');
-    $options['fallback'] = array('default' => '');
-    $options['multiple'] = array('default' => 'and');
+    $options['query_param'] = ['default' => ''];
+    $options['fallback'] = ['default' => ''];
+    $options['multiple'] = ['default' => 'and'];
 
     return $options;
   }
@@ -35,28 +35,28 @@ class QueryParameter extends ArgumentDefaultPluginBase implements CacheableDepen
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['query_param'] = array(
+    $form['query_param'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Query parameter'),
       '#description' => $this->t('The query parameter to use.'),
       '#default_value' => $this->options['query_param'],
-    );
-    $form['fallback'] = array(
+    ];
+    $form['fallback'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Fallback value'),
       '#description' => $this->t('The fallback value to use when the above query parameter is not present.'),
       '#default_value' => $this->options['fallback'],
-    );
-    $form['multiple'] = array(
+    ];
+    $form['multiple'] = [
       '#type' => 'radios',
       '#title' => $this->t('Multiple values'),
       '#description' => $this->t('Conjunction to use when handling multiple values. E.g. "?value[0]=a&value[1]=b".'),
       '#default_value' => $this->options['multiple'],
-      '#options' => array(
+      '#options' => [
         'and' => $this->t('AND'),
         'or' => $this->t('OR'),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/argument_default/Raw.php b/web/core/modules/views/src/Plugin/views/argument_default/Raw.php
index 8dd327334..2491bd83c 100644
--- a/web/core/modules/views/src/Plugin/views/argument_default/Raw.php
+++ b/web/core/modules/views/src/Plugin/views/argument_default/Raw.php
@@ -74,8 +74,8 @@ class Raw extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['index'] = array('default' => '');
-    $options['use_alias'] = array('default' => FALSE);
+    $options['index'] = ['default' => ''];
+    $options['use_alias'] = ['default' => FALSE];
 
     return $options;
   }
@@ -85,7 +85,7 @@ class Raw extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['index'] = array(
+    $form['index'] = [
       '#type' => 'select',
       '#title' => $this->t('Path component'),
       '#default_value' => $this->options['index'],
@@ -94,13 +94,13 @@ class Raw extends ArgumentDefaultPluginBase implements CacheableDependencyInterf
       // - values that count from 1 for display to humans.
       '#options' => range(1, 10),
       '#description' => $this->t('The numbering starts from 1, e.g. on the page admin/structure/types, the 3rd path component is "types".'),
-    );
-    $form['use_alias'] = array(
+    ];
+    $form['use_alias'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Use path alias'),
       '#default_value' => $this->options['use_alias'],
       '#description' => $this->t('Use path alias instead of internal path.'),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php b/web/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
index 109af5095..5f40430d2 100644
--- a/web/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
@@ -53,7 +53,7 @@ abstract class ArgumentValidatorPluginBase extends PluginBase {
   /**
    * Retrieves the options when this is a new access control plugin.
    */
-  protected function defineOptions() { return array(); }
+  protected function defineOptions() { return []; }
 
   /**
    * Provides the default form for setting options.
@@ -68,7 +68,7 @@ abstract class ArgumentValidatorPluginBase extends PluginBase {
   /**
    * Provides the default form for submitting options.
    */
-  public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = array()) { }
+  public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = []) { }
 
   /**
    * Determines if the administrator has the privileges to use this plugin.
@@ -104,6 +104,15 @@ abstract class ArgumentValidatorPluginBase extends PluginBase {
    */
   public function processSummaryArguments(&$args) { }
 
+  /**
+   * Returns a context definition for this argument.
+   *
+   * @return \Drupal\Core\Plugin\Context\ContextDefinitionInterface|null
+   *   A context definition that represents the argument or NULL if that is
+   *   not possible.
+   */
+  public function getContextDefinition() { }
+
 }
 
 /**
diff --git a/web/core/modules/views/src/Plugin/views/argument_validator/Entity.php b/web/core/modules/views/src/Plugin/views/argument_validator/Entity.php
index 53e29d7ba..896d24bf6 100644
--- a/web/core/modules/views/src/Plugin/views/argument_validator/Entity.php
+++ b/web/core/modules/views/src/Plugin/views/argument_validator/Entity.php
@@ -5,6 +5,7 @@ namespace Drupal\views\Plugin\views\argument_validator;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -70,10 +71,10 @@ class Entity extends ArgumentValidatorPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['bundles'] = array('default' => array());
-    $options['access'] = array('default' => FALSE);
-    $options['operation'] = array('default' => 'view');
-    $options['multiple'] = array('default' => FALSE);
+    $options['bundles'] = ['default' => []];
+    $options['access'] = ['default' => FALSE];
+    $options['operation'] = ['default' => 'view'];
+    $options['multiple'] = ['default' => FALSE];
 
     return $options;
   }
@@ -92,60 +93,60 @@ class Entity extends ArgumentValidatorPluginBase {
 
     // If the entity has bundles, allow option to restrict to bundle(s).
     if ($entity_type->hasKey('bundle')) {
-      $bundle_options = array();
+      $bundle_options = [];
       foreach ($this->entityManager->getBundleInfo($entity_type_id) as $bundle_id => $bundle_info) {
         $bundle_options[$bundle_id] = $bundle_info['label'];
       }
 
-      $form['bundles'] = array(
+      $form['bundles'] = [
         '#title' => $entity_type->getBundleLabel() ?: $this->t('Bundles'),
         '#default_value' => $this->options['bundles'],
         '#type' => 'checkboxes',
         '#options' => $bundle_options,
         '#description' => $this->t('If none are selected, all are allowed.'),
-      );
+      ];
     }
 
     // Offer the option to filter by access to the entity in the argument.
-    $form['access'] = array(
+    $form['access'] = [
       '#type' => 'checkbox',
-      '#title' => $this->t('Validate user has access to the %name', array('%name' => $entity_type->getLabel())),
+      '#title' => $this->t('Validate user has access to the %name', ['%name' => $entity_type->getLabel()]),
       '#default_value' => $this->options['access'],
-    );
-    $form['operation'] = array(
+    ];
+    $form['operation'] = [
       '#type' => 'radios',
       '#title' => $this->t('Access operation to check'),
-      '#options' => array(
+      '#options' => [
         'view' => $this->t('View'),
         'update' => $this->t('Edit'),
         'delete' => $this->t('Delete'),
-      ),
+      ],
       '#default_value' => $this->options['operation'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[validate][options][' . $sanitized_id . '][access]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[validate][options][' . $sanitized_id . '][access]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
     // If class is multiple capable give the option to validate single/multiple.
     if ($this->multipleCapable) {
-      $form['multiple'] = array(
+      $form['multiple'] = [
         '#type' => 'radios',
         '#title' => $this->t('Multiple arguments'),
-        '#options' => array(
-          0 => $this->t('Single ID', array('%type' => $entity_type->getLabel())),
-          1 => $this->t('One or more IDs separated by , or +', array('%type' => $entity_type->getLabel())),
-        ),
+        '#options' => [
+          0 => $this->t('Single ID', ['%type' => $entity_type->getLabel()]),
+          1 => $this->t('One or more IDs separated by , or +', ['%type' => $entity_type->getLabel()]),
+        ],
         '#default_value' => (string) $this->options['multiple'],
-      );
+      ];
     }
   }
 
   /**
    * {@inheritdoc}
    */
-  public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = array()) {
+  public function submitOptionsForm(&$form, FormStateInterface $form_state, &$options = []) {
     // Filter out unused options so we don't store giant unnecessary arrays.
     $options['bundles'] = array_filter($options['bundles']);
   }
@@ -162,7 +163,7 @@ class Entity extends ArgumentValidatorPluginBase {
       $ids = array_filter(preg_split('/[,+ ]/', $argument));
     }
     elseif ($argument) {
-      $ids = array($argument);
+      $ids = [$argument];
     }
     // No specified argument should be invalid.
     else {
@@ -228,4 +229,11 @@ class Entity extends ArgumentValidatorPluginBase {
     return $dependencies;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getContextDefinition() {
+    return new ContextDefinition('entity:' . $this->definition['entity_type'], $this->argument->adminLabel(), FALSE);
+  }
+
 }
diff --git a/web/core/modules/views/src/Plugin/views/argument_validator/NumericArgumentValidator.php b/web/core/modules/views/src/Plugin/views/argument_validator/NumericArgumentValidator.php
index a3184f4f9..7368e0628 100644
--- a/web/core/modules/views/src/Plugin/views/argument_validator/NumericArgumentValidator.php
+++ b/web/core/modules/views/src/Plugin/views/argument_validator/NumericArgumentValidator.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\views\Plugin\views\argument_validator;
 
+use Drupal\Core\Plugin\Context\ContextDefinition;
+
 /**
  * Validate whether an argument is numeric or not.
  *
@@ -18,4 +20,11 @@ class NumericArgumentValidator extends ArgumentValidatorPluginBase {
     return is_numeric($argument);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getContextDefinition() {
+    return new ContextDefinition('integer', $this->argument->adminLabel(), FALSE);
+  }
+
 }
diff --git a/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php b/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
index 87465ca06..36b8e19c9 100644
--- a/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
@@ -31,7 +31,7 @@ abstract class CachePluginBase extends PluginBase {
   /**
    * Contains all data that should be written/read from cache.
    */
-  public $storage = array();
+  public $storage = [];
 
   /**
    * Which cache bin to store query results in.
@@ -104,11 +104,11 @@ abstract class CachePluginBase extends PluginBase {
         // Not supported currently, but this is certainly where we'd put it.
         break;
       case 'results':
-        $data = array(
+        $data = [
           'result' => $this->prepareViewResult($this->view->result),
           'total_rows' => isset($this->view->total_rows) ? $this->view->total_rows : 0,
           'current_page' => $this->view->getCurrentPage(),
-        );
+        ];
         $expire = ($this->cacheSetMaxAge($type) === Cache::PERMANENT) ? Cache::PERMANENT : (int) $this->view->getRequest()->server->get('REQUEST_TIME') + $this->cacheSetMaxAge($type);
         \Drupal::cache($this->resultsBin)->set($this->generateResultsKey(), $data, $expire, $this->getCacheTags());
         break;
@@ -183,16 +183,16 @@ abstract class CachePluginBase extends PluginBase {
     if (!isset($this->resultsKey)) {
       $build_info = $this->view->build_info;
 
-      foreach (array('query', 'count_query') as $index) {
+      foreach (['query', 'count_query'] as $index) {
         // If the default query back-end is used generate SQL query strings from
         // the query objects.
         if ($build_info[$index] instanceof Select) {
           $query = clone $build_info[$index];
           $query->preExecute();
-          $build_info[$index] = array(
+          $build_info[$index] = [
             'query' => (string)$query,
             'arguments' => $query->getArguments(),
-          );
+          ];
         }
       }
 
@@ -263,7 +263,7 @@ abstract class CachePluginBase extends PluginBase {
    * @param \Drupal\views\ResultRow[] $result
    *   The result containing loaded entities.
    *
-   * @return \Drupal\views\ResultRow[] $result
+   * @return \Drupal\views\ResultRow[]
    *   The result without loaded entities.
    */
   protected function prepareViewResult(array $result) {
diff --git a/web/core/modules/views/src/Plugin/views/cache/Time.php b/web/core/modules/views/src/Plugin/views/cache/Time.php
index 601fbac9f..962693d92 100644
--- a/web/core/modules/views/src/Plugin/views/cache/Time.php
+++ b/web/core/modules/views/src/Plugin/views/cache/Time.php
@@ -76,64 +76,64 @@ class Time extends CachePluginBase {
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['results_lifespan'] = array('default' => 3600);
-    $options['results_lifespan_custom'] = array('default' => 0);
-    $options['output_lifespan'] = array('default' => 3600);
-    $options['output_lifespan_custom'] = array('default' => 0);
+    $options['results_lifespan'] = ['default' => 3600];
+    $options['results_lifespan_custom'] = ['default' => 0];
+    $options['output_lifespan'] = ['default' => 3600];
+    $options['output_lifespan_custom'] = ['default' => 0];
 
     return $options;
   }
 
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $options = array(60, 300, 1800, 3600, 21600, 518400);
-    $options = array_map(array($this->dateFormatter, 'formatInterval'), array_combine($options, $options));
-    $options = array(0 => $this->t('Never cache')) + $options + array('custom' => $this->t('Custom'));
+    $options = [60, 300, 1800, 3600, 21600, 518400];
+    $options = array_map([$this->dateFormatter, 'formatInterval'], array_combine($options, $options));
+    $options = [0 => $this->t('Never cache')] + $options + ['custom' => $this->t('Custom')];
 
-    $form['results_lifespan'] = array(
+    $form['results_lifespan'] = [
       '#type' => 'select',
       '#title' => $this->t('Query results'),
       '#description' => $this->t('The length of time raw query results should be cached.'),
       '#options' => $options,
       '#default_value' => $this->options['results_lifespan'],
-    );
-    $form['results_lifespan_custom'] = array(
+    ];
+    $form['results_lifespan_custom'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Seconds'),
       '#size' => '25',
       '#maxlength' => '30',
       '#description' => $this->t('Length of time in seconds raw query results should be cached.'),
       '#default_value' => $this->options['results_lifespan_custom'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="cache_options[results_lifespan]"]' => array('value' => 'custom'),
-        ),
-      ),
-    );
-    $form['output_lifespan'] = array(
+      '#states' => [
+        'visible' => [
+          ':input[name="cache_options[results_lifespan]"]' => ['value' => 'custom'],
+        ],
+      ],
+    ];
+    $form['output_lifespan'] = [
       '#type' => 'select',
       '#title' => $this->t('Rendered output'),
       '#description' => $this->t('The length of time rendered HTML output should be cached.'),
       '#options' => $options,
       '#default_value' => $this->options['output_lifespan'],
-    );
-    $form['output_lifespan_custom'] = array(
+    ];
+    $form['output_lifespan_custom'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Seconds'),
       '#size' => '25',
       '#maxlength' => '30',
       '#description' => $this->t('Length of time in seconds rendered HTML output should be cached.'),
       '#default_value' => $this->options['output_lifespan_custom'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="cache_options[output_lifespan]"]' => array('value' => 'custom'),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="cache_options[output_lifespan]"]' => ['value' => 'custom'],
+        ],
+      ],
+    ];
   }
 
   public function validateOptionsForm(&$form, FormStateInterface $form_state) {
-    $custom_fields = array('output_lifespan', 'results_lifespan');
+    $custom_fields = ['output_lifespan', 'results_lifespan'];
     foreach ($custom_fields as $field) {
       $cache_options = $form_state->getValue('cache_options');
       if ($cache_options[$field] == 'custom' && !is_numeric($cache_options[$field . '_custom'])) {
diff --git a/web/core/modules/views/src/Plugin/views/display/Attachment.php b/web/core/modules/views/src/Plugin/views/display/Attachment.php
index 6171525a2..315ab5951 100644
--- a/web/core/modules/views/src/Plugin/views/display/Attachment.php
+++ b/web/core/modules/views/src/Plugin/views/display/Attachment.php
@@ -34,12 +34,12 @@ class Attachment extends DisplayPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['displays'] = array('default' => array());
-    $options['attachment_position'] = array('default' => 'before');
-    $options['inherit_arguments'] = array('default' => TRUE);
-    $options['inherit_exposed_filters'] = array('default' => FALSE);
-    $options['inherit_pager'] = array('default' => FALSE);
-    $options['render_pager'] = array('default' => FALSE);
+    $options['displays'] = ['default' => []];
+    $options['attachment_position'] = ['default' => 'before'];
+    $options['inherit_arguments'] = ['default' => TRUE];
+    $options['inherit_exposed_filters'] = ['default' => FALSE];
+    $options['inherit_pager'] = ['default' => FALSE];
+    $options['render_pager'] = ['default' => FALSE];
 
     return $options;
   }
@@ -49,11 +49,11 @@ class Attachment extends DisplayPluginBase {
   }
 
   public function attachmentPositions($position = NULL) {
-    $positions = array(
+    $positions = [
       'before' => $this->t('Before'),
       'after' => $this->t('After'),
       'both' => $this->t('Both'),
-    );
+    ];
 
     if ($position) {
       return $positions[$position];
@@ -71,13 +71,13 @@ class Attachment extends DisplayPluginBase {
     // It is very important to call the parent function here:
     parent::optionsSummary($categories, $options);
 
-    $categories['attachment'] = array(
+    $categories['attachment'] = [
       'title' => $this->t('Attachment settings'),
       'column' => 'second',
-      'build' => array(
+      'build' => [
         '#weight' => -10,
-      ),
-    );
+      ],
+    ];
 
     $displays = array_filter($this->getOption('displays'));
     if (count($displays) > 1) {
@@ -94,41 +94,41 @@ class Attachment extends DisplayPluginBase {
       $attach_to = $this->t('Not defined');
     }
 
-    $options['displays'] = array(
+    $options['displays'] = [
       'category' => 'attachment',
       'title' => $this->t('Attach to'),
       'value' => $attach_to,
-    );
+    ];
 
-    $options['attachment_position'] = array(
+    $options['attachment_position'] = [
       'category' => 'attachment',
       'title' => $this->t('Attachment position'),
       'value' => $this->attachmentPositions($this->getOption('attachment_position')),
-    );
+    ];
 
-    $options['inherit_arguments'] = array(
+    $options['inherit_arguments'] = [
       'category' => 'attachment',
       'title' => $this->t('Inherit contextual filters'),
       'value' => $this->getOption('inherit_arguments') ? $this->t('Yes') : $this->t('No'),
-    );
+    ];
 
-    $options['inherit_exposed_filters'] = array(
+    $options['inherit_exposed_filters'] = [
       'category' => 'attachment',
       'title' => $this->t('Inherit exposed filters'),
       'value' => $this->getOption('inherit_exposed_filters') ? $this->t('Yes') : $this->t('No'),
-    );
+    ];
 
-    $options['inherit_pager'] = array(
+    $options['inherit_pager'] = [
       'category' => 'pager',
       'title' => $this->t('Inherit pager'),
       'value' => $this->getOption('inherit_pager') ? $this->t('Yes') : $this->t('No'),
-    );
+    ];
 
-    $options['render_pager'] = array(
+    $options['render_pager'] = [
       'category' => 'pager',
       'title' => $this->t('Render pager'),
       'value' => $this->getOption('render_pager') ? $this->t('Yes') : $this->t('No'),
-    );
+    ];
 
   }
 
@@ -142,65 +142,65 @@ class Attachment extends DisplayPluginBase {
     switch ($form_state->get('section')) {
       case 'inherit_arguments':
         $form['#title'] .= $this->t('Inherit contextual filters');
-        $form['inherit_arguments'] = array(
+        $form['inherit_arguments'] = [
           '#type' => 'checkbox',
           '#title' => $this->t('Inherit'),
           '#description' => $this->t('Should this display inherit its contextual filter values from the parent display to which it is attached?'),
           '#default_value' => $this->getOption('inherit_arguments'),
-        );
+        ];
         break;
       case 'inherit_exposed_filters':
         $form['#title'] .= $this->t('Inherit exposed filters');
-        $form['inherit_exposed_filters'] = array(
+        $form['inherit_exposed_filters'] = [
           '#type' => 'checkbox',
           '#title' => $this->t('Inherit'),
           '#description' => $this->t('Should this display inherit its exposed filter values from the parent display to which it is attached?'),
           '#default_value' => $this->getOption('inherit_exposed_filters'),
-        );
+        ];
         break;
       case 'inherit_pager':
         $form['#title'] .= $this->t('Inherit pager');
-        $form['inherit_pager'] = array(
+        $form['inherit_pager'] = [
           '#type' => 'checkbox',
           '#title' => $this->t('Inherit'),
           '#description' => $this->t('Should this display inherit its paging values from the parent display to which it is attached?'),
           '#default_value' => $this->getOption('inherit_pager'),
-        );
+        ];
         break;
       case 'render_pager':
         $form['#title'] .= $this->t('Render pager');
-        $form['render_pager'] = array(
+        $form['render_pager'] = [
           '#type' => 'checkbox',
           '#title' => $this->t('Render'),
           '#description' => $this->t('Should this display render the pager values? This is only meaningful if inheriting a pager.'),
           '#default_value' => $this->getOption('render_pager'),
-        );
+        ];
         break;
       case 'attachment_position':
         $form['#title'] .= $this->t('Position');
-        $form['attachment_position'] = array(
+        $form['attachment_position'] = [
           '#title' => $this->t('Position'),
           '#type' => 'radios',
           '#description' => $this->t('Attach before or after the parent display?'),
           '#options' => $this->attachmentPositions(),
           '#default_value' => $this->getOption('attachment_position'),
-        );
+        ];
         break;
       case 'displays':
         $form['#title'] .= $this->t('Attach to');
-        $displays = array();
+        $displays = [];
         foreach ($this->view->storage->get('display') as $display_id => $display) {
           if ($this->view->displayHandlers->has($display_id) && $this->view->displayHandlers->get($display_id)->acceptAttachments()) {
             $displays[$display_id] = $display['display_title'];
           }
         }
-        $form['displays'] = array(
+        $form['displays'] = [
           '#title' => $this->t('Displays'),
           '#type' => 'checkboxes',
           '#description' => $this->t('Select which display or displays this should attach to.'),
           '#options' => array_map('\Drupal\Component\Utility\Html::escape', $displays),
           '#default_value' => $this->getOption('displays'),
-        );
+        ];
         break;
     }
   }
@@ -240,7 +240,7 @@ class Attachment extends DisplayPluginBase {
       return;
     }
 
-    $args = $this->getOption('inherit_arguments') ? $this->view->args : array();
+    $args = $this->getOption('inherit_arguments') ? $this->view->args : [];
     $view->setArguments($args);
     $view->setDisplay($this->display['id']);
     if ($this->getOption('inherit_pager')) {
diff --git a/web/core/modules/views/src/Plugin/views/display/Block.php b/web/core/modules/views/src/Plugin/views/display/Block.php
index e3208b462..5e833d752 100644
--- a/web/core/modules/views/src/Plugin/views/display/Block.php
+++ b/web/core/modules/views/src/Plugin/views/display/Block.php
@@ -78,15 +78,15 @@ class Block extends DisplayPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['block_description'] = array('default' => '');
-    $options['block_category'] = array('default' => $this->t('Lists (Views)'));
-    $options['block_hide_empty'] = array('default' => FALSE);
+    $options['block_description'] = ['default' => ''];
+    $options['block_category'] = ['default' => $this->t('Lists (Views)')];
+    $options['block_hide_empty'] = ['default' => FALSE];
 
-    $options['allow'] = array(
-      'contains' => array(
-        'items_per_page' => array('default' => 'items_per_page'),
-      ),
-    );
+    $options['allow'] = [
+      'contains' => [
+        'items_per_page' => ['default' => 'items_per_page'],
+      ],
+    ];
 
     return $options;
   }
@@ -116,7 +116,7 @@ class Block extends DisplayPluginBase {
     // display, and arguments should be set on the view.
     $element = $this->view->render();
     if ($this->outputIsEmpty() && $this->getOption('block_hide_empty') && empty($this->view->style_plugin->definition['even empty'])) {
-      return array();
+      return [];
     }
     else {
       return $element;
@@ -131,13 +131,13 @@ class Block extends DisplayPluginBase {
   public function optionsSummary(&$categories, &$options) {
     parent::optionsSummary($categories, $options);
 
-    $categories['block'] = array(
+    $categories['block'] = [
       'title' => $this->t('Block settings'),
       'column' => 'second',
-      'build' => array(
+      'build' => [
         '#weight' => -10,
-      ),
-    );
+      ],
+    ];
 
     $block_description = strip_tags($this->getOption('block_description'));
     if (empty($block_description)) {
@@ -145,30 +145,30 @@ class Block extends DisplayPluginBase {
     }
     $block_category = $this->getOption('block_category');
 
-    $options['block_description'] = array(
+    $options['block_description'] = [
       'category' => 'block',
       'title' => $this->t('Block name'),
       'value' => views_ui_truncate($block_description, 24),
-    );
-    $options['block_category'] = array(
+    ];
+    $options['block_category'] = [
       'category' => 'block',
       'title' => $this->t('Block category'),
       'value' => views_ui_truncate($block_category, 24),
-    );
+    ];
 
     $filtered_allow = array_filter($this->getOption('allow'));
 
-    $options['allow'] = array(
+    $options['allow'] = [
       'category' => 'block',
       'title' => $this->t('Allow settings'),
       'value' => empty($filtered_allow) ? $this->t('None') : $this->t('Items per page'),
-    );
+    ];
 
-    $options['block_hide_empty'] = array(
+    $options['block_hide_empty'] = [
       'category' => 'other',
       'title' => $this->t('Hide block if the view output is empty'),
       'value' => $this->getOption('block_hide_empty') ? $this->t('Yes') : $this->t('No'),
-    );
+    ];
   }
 
   /**
@@ -180,53 +180,53 @@ class Block extends DisplayPluginBase {
     switch ($form_state->get('section')) {
       case 'block_description':
         $form['#title'] .= $this->t('Block admin description');
-        $form['block_description'] = array(
+        $form['block_description'] = [
           '#type' => 'textfield',
           '#description' => $this->t('This will appear as the name of this block in administer >> structure >> blocks.'),
           '#default_value' => $this->getOption('block_description'),
-        );
+        ];
         break;
       case 'block_category':
         $form['#title'] .= $this->t('Block category');
-        $form['block_category'] = array(
+        $form['block_category'] = [
           '#type' => 'textfield',
           '#autocomplete_route_name' => 'block.category_autocomplete',
-          '#description' => $this->t('The category this block will appear under on the <a href=":href">blocks placement page</a>.', array(':href' => \Drupal::url('block.admin_display'))),
+          '#description' => $this->t('The category this block will appear under on the <a href=":href">blocks placement page</a>.', [':href' => \Drupal::url('block.admin_display')]),
           '#default_value' => $this->getOption('block_category'),
-        );
+        ];
         break;
       case 'block_hide_empty':
         $form['#title'] .= $this->t('Block empty settings');
 
-        $form['block_hide_empty'] = array(
+        $form['block_hide_empty'] = [
           '#title' => $this->t('Hide block if no result/empty text'),
           '#type' => 'checkbox',
           '#description' => $this->t('Hide the block if there is no result and no empty text and no header/footer which is shown on empty result'),
           '#default_value' => $this->getOption('block_hide_empty'),
-        );
+        ];
         break;
       case 'exposed_form_options':
         $this->view->initHandlers();
         if (!$this->usesExposed() && parent::usesExposed()) {
-          $form['exposed_form_options']['warning'] = array(
+          $form['exposed_form_options']['warning'] = [
             '#weight' => -10,
             '#markup' => '<div class="messages messages--warning">' . $this->t('Exposed filters in block displays require "Use AJAX" to be set to work correctly.') . '</div>',
-          );
+          ];
         }
         break;
       case 'allow':
         $form['#title'] .= $this->t('Allow settings in the block configuration');
 
-        $options = array(
+        $options = [
           'items_per_page' => $this->t('Items per page'),
-        );
+        ];
 
         $allow = array_filter($this->getOption('allow'));
-        $form['allow'] = array(
+        $form['allow'] = [
           '#type' => 'checkboxes',
           '#default_value' => $allow,
           '#options' => $options,
-        );
+        ];
         break;
     }
   }
@@ -260,7 +260,7 @@ class Block extends DisplayPluginBase {
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return array $form
+   * @return array
    *   The renderable form array representing the entire configuration form.
    *
    * @see \Drupal\views\Plugin\Block\ViewsBlock::blockForm()
@@ -276,18 +276,18 @@ class Block extends DisplayPluginBase {
       }
       switch ($type) {
         case 'items_per_page':
-          $form['override']['items_per_page'] = array(
+          $form['override']['items_per_page'] = [
             '#type' => 'select',
             '#title' => $this->t('Items per block'),
-            '#options' => array(
-              'none' => $this->t('@count (default setting)', array('@count' => $this->getPlugin('pager')->getItemsPerPage())),
+            '#options' => [
+              'none' => $this->t('@count (default setting)', ['@count' => $this->getPlugin('pager')->getItemsPerPage()]),
               5 => 5,
               10 => 10,
               20 => 20,
               40 => 40,
-            ),
+            ],
             '#default_value' => $block_configuration['items_per_page'],
-          );
+          ];
           break;
       }
     }
@@ -323,10 +323,10 @@ class Block extends DisplayPluginBase {
    * @see \Drupal\views\Plugin\Block\ViewsBlock::blockSubmit()
    */
   public function blockSubmit(ViewsBlock $block, $form, FormStateInterface $form_state) {
-    if ($items_per_page = $form_state->getValue(array('override', 'items_per_page'))) {
+    if ($items_per_page = $form_state->getValue(['override', 'items_per_page'])) {
       $block->setConfigurationValue('items_per_page', $items_per_page);
     }
-    $form_state->unsetValue(array('override', 'items_per_page'));
+    $form_state->unsetValue(['override', 'items_per_page']);
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 37b6a4cc0..e31b5a295 100644
--- a/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -44,7 +44,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    *
    * @var \Drupal\views\Plugin\views\ViewsPluginInterface[]
    */
-  protected $plugins = array();
+  protected $plugins = [];
 
   /**
    * Stores all available display extenders.
@@ -107,7 +107,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    *
    * @var array
    */
-  protected static $unpackOptions = array();
+  protected static $unpackOptions = [];
 
   /**
    * The display information coming directly from the view entity.
@@ -139,7 +139,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    *   The plugin implementation definition.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition) {
-    parent::__construct(array(), $plugin_id, $plugin_definition);
+    parent::__construct([], $plugin_id, $plugin_definition);
   }
 
   /**
@@ -150,7 +150,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
 
     // Load extenders as soon as possible.
     $display['display_options'] += ['display_extenders' => []];
-    $this->extenders = array();
+    $this->extenders = [];
     if ($extenders = Views::getEnabledDisplayExtenders()) {
       $manager = Views::pluginManager('display_extender');
       $display_extender_options = $display['display_options']['display_extenders'];
@@ -182,7 +182,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     $skip_cache = \Drupal::config('views.settings')->get('skip_cache');
 
     if (empty($view->editing) || !$skip_cache) {
-      $cid = 'views:unpack_options:' . hash('sha256', serialize(array($this->options, $options))) . ':' . \Drupal::languageManager()->getCurrentLanguage()->getId();
+      $cid = 'views:unpack_options:' . hash('sha256', serialize([$this->options, $options])) . ':' . \Drupal::languageManager()->getCurrentLanguage()->getId();
       if (empty(static::$unpackOptions[$cid])) {
         $cache = \Drupal::cache('data')->get($cid);
         if (!empty($cache->data)) {
@@ -400,40 +400,40 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    * {@inheritdoc}
    */
   public function defaultableSections($section = NULL) {
-    $sections = array(
-      'access' => array('access'),
-      'cache' => array('cache'),
-      'title' => array('title'),
-      'css_class' => array('css_class'),
-      'use_ajax' => array('use_ajax'),
-      'hide_attachment_summary' => array('hide_attachment_summary'),
-      'show_admin_links' => array('show_admin_links'),
-      'group_by' => array('group_by'),
-      'query' => array('query'),
-      'use_more' => array('use_more', 'use_more_always', 'use_more_text'),
-      'use_more_always' => array('use_more', 'use_more_always', 'use_more_text'),
-      'use_more_text' => array('use_more', 'use_more_always', 'use_more_text'),
-      'link_display' => array('link_display', 'link_url'),
+    $sections = [
+      'access' => ['access'],
+      'cache' => ['cache'],
+      'title' => ['title'],
+      'css_class' => ['css_class'],
+      'use_ajax' => ['use_ajax'],
+      'hide_attachment_summary' => ['hide_attachment_summary'],
+      'show_admin_links' => ['show_admin_links'],
+      'group_by' => ['group_by'],
+      'query' => ['query'],
+      'use_more' => ['use_more', 'use_more_always', 'use_more_text'],
+      'use_more_always' => ['use_more', 'use_more_always', 'use_more_text'],
+      'use_more_text' => ['use_more', 'use_more_always', 'use_more_text'],
+      'link_display' => ['link_display', 'link_url'],
 
       // Force these to cascade properly.
-      'style' => array('style', 'row'),
-      'row' => array('style', 'row'),
+      'style' => ['style', 'row'],
+      'row' => ['style', 'row'],
 
-      'pager' => array('pager'),
+      'pager' => ['pager'],
 
-      'exposed_form' => array('exposed_form'),
+      'exposed_form' => ['exposed_form'],
 
       // These sections are special.
-      'header' => array('header'),
-      'footer' => array('footer'),
-      'empty' => array('empty'),
-      'relationships' => array('relationships'),
-      'fields' => array('fields'),
-      'sorts' => array('sorts'),
-      'arguments' => array('arguments'),
-      'filters' => array('filters', 'filter_groups'),
-      'filter_groups' => array('filters', 'filter_groups'),
-    );
+      'header' => ['header'],
+      'footer' => ['footer'],
+      'empty' => ['empty'],
+      'relationships' => ['relationships'],
+      'fields' => ['fields'],
+      'sorts' => ['sorts'],
+      'arguments' => ['arguments'],
+      'filters' => ['filters', 'filter_groups'],
+      'filter_groups' => ['filters', 'filter_groups'],
+    ];
 
     // If the display cannot use a pager, then we cannot default it.
     if (!$this->usesPager()) {
@@ -456,9 +456,9 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
   }
 
   protected function defineOptions() {
-    $options = array(
-      'defaults' => array(
-        'default' => array(
+    $options = [
+      'defaults' => [
+        'default' => [
           'access' => TRUE,
           'cache' => TRUE,
           'query' => TRUE,
@@ -492,152 +492,152 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
           'arguments' => TRUE,
           'filters' => TRUE,
           'filter_groups' => TRUE,
-        ),
-      ),
+        ],
+      ],
 
-      'title' => array(
+      'title' => [
         'default' => '',
-      ),
-      'enabled' => array(
+      ],
+      'enabled' => [
         'default' => TRUE,
-      ),
-      'display_comment' => array(
+      ],
+      'display_comment' => [
         'default' => '',
-      ),
-      'css_class' => array(
+      ],
+      'css_class' => [
         'default' => '',
-      ),
-      'display_description' => array(
+      ],
+      'display_description' => [
         'default' => '',
-      ),
-      'use_ajax' => array(
+      ],
+      'use_ajax' => [
         'default' => FALSE,
-      ),
-      'hide_attachment_summary' => array(
+      ],
+      'hide_attachment_summary' => [
         'default' => FALSE,
-      ),
-      'show_admin_links' => array(
+      ],
+      'show_admin_links' => [
         'default' => TRUE,
-      ),
-      'use_more' => array(
+      ],
+      'use_more' => [
         'default' => FALSE,
-      ),
-      'use_more_always' => array(
+      ],
+      'use_more_always' => [
         'default' => TRUE,
-      ),
-      'use_more_text' => array(
+      ],
+      'use_more_text' => [
         'default' => 'more',
-      ),
-      'link_display' => array(
+      ],
+      'link_display' => [
         'default' => '',
-      ),
-      'link_url' => array(
+      ],
+      'link_url' => [
         'default' => '',
-      ),
-      'group_by' => array(
+      ],
+      'group_by' => [
         'default' => FALSE,
-      ),
-      'rendering_language' => array(
+      ],
+      'rendering_language' => [
         'default' => '***LANGUAGE_entity_translation***',
-      ),
+      ],
 
       // These types are all plugins that can have individual settings
       // and therefore need special handling.
-      'access' => array(
-        'contains' => array(
-          'type' => array('default' => 'none'),
-          'options' => array('default' => array()),
-        ),
-        'merge_defaults' => array($this, 'mergePlugin'),
-      ),
-      'cache' => array(
-        'contains' => array(
-          'type' => array('default' => 'tag'),
-          'options' => array('default' => array()),
-        ),
-        'merge_defaults' => array($this, 'mergePlugin'),
-      ),
-      'query' => array(
-        'contains' => array(
-          'type' => array('default' => 'views_query'),
-          'options' => array('default' => array()),
-         ),
-        'merge_defaults' => array($this, 'mergePlugin'),
-      ),
-      'exposed_form' => array(
-        'contains' => array(
-          'type' => array('default' => 'basic'),
-          'options' => array('default' => array()),
-         ),
-        'merge_defaults' => array($this, 'mergePlugin'),
-      ),
-      'pager' => array(
-        'contains' => array(
-          'type' => array('default' => 'mini'),
-          'options' => array('default' => array()),
-         ),
-        'merge_defaults' => array($this, 'mergePlugin'),
-      ),
-      'style' => array(
-        'contains' => array(
-          'type' => array('default' => 'default'),
-          'options' => array('default' => array()),
-        ),
-        'merge_defaults' => array($this, 'mergePlugin'),
-      ),
-      'row' => array(
-        'contains' => array(
-          'type' => array('default' => 'fields'),
-          'options' => array('default' => array()),
-        ),
-        'merge_defaults' => array($this, 'mergePlugin'),
-      ),
+      'access' => [
+        'contains' => [
+          'type' => ['default' => 'none'],
+          'options' => ['default' => []],
+        ],
+        'merge_defaults' => [$this, 'mergePlugin'],
+      ],
+      'cache' => [
+        'contains' => [
+          'type' => ['default' => 'tag'],
+          'options' => ['default' => []],
+        ],
+        'merge_defaults' => [$this, 'mergePlugin'],
+      ],
+      'query' => [
+        'contains' => [
+          'type' => ['default' => 'views_query'],
+          'options' => ['default' => []],
+         ],
+        'merge_defaults' => [$this, 'mergePlugin'],
+      ],
+      'exposed_form' => [
+        'contains' => [
+          'type' => ['default' => 'basic'],
+          'options' => ['default' => []],
+         ],
+        'merge_defaults' => [$this, 'mergePlugin'],
+      ],
+      'pager' => [
+        'contains' => [
+          'type' => ['default' => 'mini'],
+          'options' => ['default' => []],
+         ],
+        'merge_defaults' => [$this, 'mergePlugin'],
+      ],
+      'style' => [
+        'contains' => [
+          'type' => ['default' => 'default'],
+          'options' => ['default' => []],
+        ],
+        'merge_defaults' => [$this, 'mergePlugin'],
+      ],
+      'row' => [
+        'contains' => [
+          'type' => ['default' => 'fields'],
+          'options' => ['default' => []],
+        ],
+        'merge_defaults' => [$this, 'mergePlugin'],
+      ],
 
-      'exposed_block' => array(
+      'exposed_block' => [
         'default' => FALSE,
-      ),
+      ],
 
-      'header' => array(
-        'default' => array(),
-        'merge_defaults' => array($this, 'mergeHandler'),
-      ),
-      'footer' => array(
-        'default' => array(),
-        'merge_defaults' => array($this, 'mergeHandler'),
-      ),
-      'empty' => array(
-        'default' => array(),
-        'merge_defaults' => array($this, 'mergeHandler'),
-      ),
+      'header' => [
+        'default' => [],
+        'merge_defaults' => [$this, 'mergeHandler'],
+      ],
+      'footer' => [
+        'default' => [],
+        'merge_defaults' => [$this, 'mergeHandler'],
+      ],
+      'empty' => [
+        'default' => [],
+        'merge_defaults' => [$this, 'mergeHandler'],
+      ],
 
       // We want these to export last.
       // These are the 5 handler types.
-      'relationships' => array(
-        'default' => array(),
-        'merge_defaults' => array($this, 'mergeHandler'),
-      ),
-      'fields' => array(
-        'default' => array(),
-        'merge_defaults' => array($this, 'mergeHandler'),
-      ),
-      'sorts' => array(
-        'default' => array(),
-        'merge_defaults' => array($this, 'mergeHandler'),
-      ),
-      'arguments' => array(
-        'default' => array(),
-        'merge_defaults' => array($this, 'mergeHandler'),
-      ),
-      'filter_groups' => array(
-        'contains' => array(
-          'operator' => array('default' => 'AND'),
-          'groups' => array('default' => array(1 => 'AND')),
-        ),
-      ),
-      'filters' => array(
-        'default' => array(),
-      ),
-    );
+      'relationships' => [
+        'default' => [],
+        'merge_defaults' => [$this, 'mergeHandler'],
+      ],
+      'fields' => [
+        'default' => [],
+        'merge_defaults' => [$this, 'mergeHandler'],
+      ],
+      'sorts' => [
+        'default' => [],
+        'merge_defaults' => [$this, 'mergeHandler'],
+      ],
+      'arguments' => [
+        'default' => [],
+        'merge_defaults' => [$this, 'mergeHandler'],
+      ],
+      'filter_groups' => [
+        'contains' => [
+          'operator' => ['default' => 'AND'],
+          'groups' => ['default' => [1 => 'AND']],
+        ],
+      ],
+      'filters' => [
+        'default' => [],
+      ],
+    ];
 
     if (!$this->usesPager()) {
       $options['defaults']['default']['pager'] = FALSE;
@@ -682,7 +682,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    */
   public function getAttachedDisplays() {
     $current_display_id = $this->display['id'];
-    $attached_displays = array();
+    $attached_displays = [];
 
     // Go through all displays and search displays which link to this one.
     foreach ($this->view->storage->get('display') as $display_id => $display) {
@@ -840,7 +840,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    */
   public function &getHandlers($type) {
     if (!isset($this->handlers[$type])) {
-      $this->handlers[$type] = array();
+      $this->handlers[$type] = [];
       $types = ViewExecutable::getHandlerTypes();
       $plural = $types[$type]['plural'];
 
@@ -950,7 +950,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     // Collect all the dependencies of handlers and plugins. Only calculate
     // their dependencies if they are configured by this display.
     $plugins = array_merge($this->getAllHandlers(TRUE), $this->getAllPlugins(TRUE));
-    array_walk($plugins, array($this, 'calculatePluginDependencies'));
+    array_walk($plugins, [$this, 'calculatePluginDependencies']);
 
     return $this->dependencies;
   }
@@ -960,7 +960,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    * {@inheritdoc}
    */
   public function getFieldLabels($groupable_only = FALSE) {
-    $options = array();
+    $options = [];
     foreach ($this->getHandlers('relationship') as $relationship => $handler) {
       $relationships[$relationship] = $handler->adminLabel();
     }
@@ -1015,48 +1015,36 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     }
 
     if (!empty($class)) {
-      $text = SafeMarkup::format('<span>@text</span>', array('@text' => $text));
+      $text = SafeMarkup::format('<span>@text</span>', ['@text' => $text]);
     }
 
     if (empty($title)) {
       $title = $text;
     }
 
-    return \Drupal::l($text, new Url('views_ui.form_display', array(
+    return \Drupal::l($text, new Url('views_ui.form_display', [
         'js' => 'nojs',
         'view' => $this->view->storage->id(),
         'display_id' => $this->display['id'],
         'type' => $section
-      ), array(
-        'attributes' => array(
-          'class' => array('views-ajax-link', $class),
+      ], [
+        'attributes' => [
+          'class' => ['views-ajax-link', $class],
           'title' => $title,
           'id' => Html::getUniqueId('views-' . $this->display['id'] . '-' . $section)
-        )
-    )));
+        ]
+    ]));
   }
 
   /**
    * {@inheritdoc}
    */
   public function getArgumentsTokens() {
-    $tokens = array();
+    $tokens = [];
     if (!empty($this->view->build_info['substitutions'])) {
       $tokens = $this->view->build_info['substitutions'];
     }
 
-    // Add tokens for every argument (contextual filter) and path arg.
-    $handlers = count($this->view->display_handler->getHandlers('argument'));
-    for ($count = 1; $count <= $handlers; $count++) {
-      if (!isset($tokens["%$count"])) {
-        $tokens["%$count"] = '';
-      }
-      // Use strip tags as there should never be HTML in the path.
-      // However, we need to preserve special characters like " that
-      // were encoded by \Drupal\Component\Utility\Html::escape().
-      $tokens["!$count"] = isset($this->view->args[$count - 1]) ? strip_tags(Html::decodeEntities($this->view->args[$count - 1])) : '';
-    }
-
     return $tokens;
   }
 
@@ -1064,94 +1052,94 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    * {@inheritdoc}
    */
   public function optionsSummary(&$categories, &$options) {
-    $categories = array(
-      'title' => array(
+    $categories = [
+      'title' => [
         'title' => $this->t('Title'),
         'column' => 'first',
-      ),
-      'format' => array(
+      ],
+      'format' => [
         'title' => $this->t('Format'),
         'column' => 'first',
-      ),
-      'filters' => array(
+      ],
+      'filters' => [
         'title' => $this->t('Filters'),
         'column' => 'first',
-      ),
-      'fields' => array(
+      ],
+      'fields' => [
         'title' => $this->t('Fields'),
         'column' => 'first',
-      ),
-      'pager' => array(
+      ],
+      'pager' => [
         'title' => $this->t('Pager'),
         'column' => 'second',
-      ),
-      'language' => array(
+      ],
+      'language' => [
         'title' => $this->t('Language'),
         'column' => 'second',
-      ),
-      'exposed' => array(
+      ],
+      'exposed' => [
         'title' => $this->t('Exposed form'),
         'column' => 'third',
-        'build' => array(
+        'build' => [
           '#weight' => 1,
-        ),
-      ),
-      'access' => array(
+        ],
+      ],
+      'access' => [
         'title' => '',
         'column' => 'second',
-        'build' => array(
+        'build' => [
           '#weight' => -5,
-        ),
-      ),
-      'other' => array(
+        ],
+      ],
+      'other' => [
         'title' => $this->t('Other'),
         'column' => 'third',
-        'build' => array(
+        'build' => [
           '#weight' => 2,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     if ($this->display['id'] != 'default') {
-      $options['display_id'] = array(
+      $options['display_id'] = [
         'category' => 'other',
         'title' => $this->t('Machine Name'),
         'value' => !empty($this->display['new_id']) ? $this->display['new_id'] : $this->display['id'],
         'desc' => $this->t('Change the machine name of this display.'),
-      );
+      ];
     }
 
     $display_comment = views_ui_truncate($this->getOption('display_comment'), 80);
-    $options['display_comment'] = array(
+    $options['display_comment'] = [
       'category' => 'other',
       'title' => $this->t('Administrative comment'),
       'value' => !empty($display_comment) ? $display_comment : $this->t('None'),
       'desc' => $this->t('Comment or document this display.'),
-    );
+    ];
 
     $title = strip_tags($this->getOption('title'));
     if (!$title) {
       $title = $this->t('None');
     }
 
-    $options['title'] = array(
+    $options['title'] = [
       'category' => 'title',
       'title' => $this->t('Title'),
       'value' => views_ui_truncate($title, 32),
       'desc' => $this->t('Change the title that this display will use.'),
-    );
+    ];
 
     $style_plugin_instance = $this->getPlugin('style');
     $style_summary = empty($style_plugin_instance->definition['title']) ? $this->t('Missing style plugin') : $style_plugin_instance->summaryTitle();
     $style_title = empty($style_plugin_instance->definition['title']) ? $this->t('Missing style plugin') : $style_plugin_instance->pluginTitle();
 
-    $options['style'] = array(
+    $options['style'] = [
       'category' => 'format',
       'title' => $this->t('Format'),
       'value' => $style_title,
       'setting' => $style_summary,
       'desc' => $this->t('Change the way content is formatted.'),
-    );
+    ];
 
     // This adds a 'Settings' link to the style_options setting if the style has
     // options.
@@ -1164,13 +1152,13 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
       $row_summary = empty($row_plugin_instance->definition['title']) ? $this->t('Missing row plugin') : $row_plugin_instance->summaryTitle();
       $row_title = empty($row_plugin_instance->definition['title']) ? $this->t('Missing row plugin') : $row_plugin_instance->pluginTitle();
 
-      $options['row'] = array(
+      $options['row'] = [
         'category' => 'format',
         'title' => $this->t('Show'),
         'value' => $row_title,
         'setting' => $row_summary,
         'desc' => $this->t('Change the way each row in the view is styled.'),
-      );
+      ];
       // This adds a 'Settings' link to the row_options setting if the row style
       // has options.
       if ($row_plugin_instance->usesOptions()) {
@@ -1178,28 +1166,28 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
       }
     }
     if ($this->usesAJAX()) {
-      $options['use_ajax'] = array(
+      $options['use_ajax'] = [
         'category' => 'other',
         'title' => $this->t('Use AJAX'),
         'value' => $this->getOption('use_ajax') ? $this->t('Yes') : $this->t('No'),
         'desc' => $this->t('Change whether or not this display will use AJAX.'),
-      );
+      ];
     }
     if ($this->usesAttachments()) {
-      $options['hide_attachment_summary'] = array(
+      $options['hide_attachment_summary'] = [
         'category' => 'other',
         'title' => $this->t('Hide attachments in summary'),
         'value' => $this->getOption('hide_attachment_summary') ? $this->t('Yes') : $this->t('No'),
         'desc' => $this->t('Change whether or not to display attachments when displaying a contextual filter summary.'),
-      );
+      ];
     }
     if (!isset($this->definition['contextual links locations']) || !empty($this->definition['contextual links locations'])) {
-      $options['show_admin_links'] = array(
+      $options['show_admin_links'] = [
         'category' => 'other',
         'title' => $this->t('Contextual links'),
         'value' => $this->getOption('show_admin_links') ? $this->t('Shown') : $this->t('Hidden'),
         'desc' => $this->t('Change whether or not to display contextual links for this view.'),
-      );
+      ];
     }
 
     $pager_plugin = $this->getPlugin('pager');
@@ -1210,13 +1198,13 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
 
     $pager_str = $pager_plugin->summaryTitle();
 
-    $options['pager'] = array(
+    $options['pager'] = [
       'category' => 'pager',
       'title' => $this->t('Use pager'),
       'value' => $pager_plugin->pluginTitle(),
       'setting' => $pager_str,
       'desc' => $this->t("Change this display's pager setting."),
-    );
+    ];
 
     // If pagers aren't allowed, change the text of the item.
     if (!$this->usesPager()) {
@@ -1228,39 +1216,39 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     }
 
     if ($this->usesMore()) {
-      $options['use_more'] = array(
+      $options['use_more'] = [
         'category' => 'pager',
         'title' => $this->t('More link'),
         'value' => $this->getOption('use_more') ? $this->t('Yes') : $this->t('No'),
         'desc' => $this->t('Specify whether this display will provide a "more" link.'),
-      );
+      ];
     }
 
     $this->view->initQuery();
     if ($this->view->query->getAggregationInfo()) {
-      $options['group_by'] = array(
+      $options['group_by'] = [
         'category' => 'other',
         'title' => $this->t('Use aggregation'),
         'value' => $this->getOption('group_by') ? $this->t('Yes') : $this->t('No'),
         'desc' => $this->t('Allow grouping and aggregation (calculation) of fields.'),
-      );
+      ];
     }
 
-    $options['query'] = array(
+    $options['query'] = [
       'category' => 'other',
       'title' => $this->t('Query settings'),
       'value' => $this->t('Settings'),
       'desc' => $this->t('Allow to set some advanced settings for the query plugin'),
-    );
+    ];
 
     if (\Drupal::languageManager()->isMultilingual() && $this->isBaseTableTranslatable()) {
       $rendering_language_options = $this->buildRenderingLanguageOptions();
-      $options['rendering_language'] = array(
+      $options['rendering_language'] = [
         'category' => 'language',
         'title' => $this->t('Rendering Language'),
         'value' => $rendering_language_options[$this->getOption('rendering_language')],
         'desc' => $this->t('All content that supports translations will be displayed in the selected language.'),
-      );
+      ];
     }
 
     $access_plugin = $this->getPlugin('access');
@@ -1271,13 +1259,13 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
 
     $access_str = $access_plugin->summaryTitle();
 
-    $options['access'] = array(
+    $options['access'] = [
       'category' => 'access',
       'title' => $this->t('Access'),
       'value' => $access_plugin->pluginTitle(),
       'setting' => $access_str,
       'desc' => $this->t('Specify access control type for this display.'),
-    );
+    ];
 
     if ($access_plugin->usesOptions()) {
       $options['access']['links']['access_options'] = $this->t('Change settings for this access type.');
@@ -1291,13 +1279,13 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
 
     $cache_str = $cache_plugin->summaryTitle();
 
-    $options['cache'] = array(
+    $options['cache'] = [
       'category' => 'other',
       'title' => $this->t('Caching'),
       'value' => $cache_plugin->pluginTitle(),
       'setting' => $cache_str,
       'desc' => $this->t('Specify caching type for this display.'),
-    );
+    ];
 
     if ($cache_plugin->usesOptions()) {
       $options['cache']['links']['cache_options'] = $this->t('Change settings for this caching type.');
@@ -1322,21 +1310,21 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
         }
       }
 
-      $options['link_display'] = array(
+      $options['link_display'] = [
         'category' => 'pager',
         'title' => $this->t('Link display'),
         'value' => $link_display,
         'desc' => $this->t('Specify which display or custom URL this display will link to.'),
-      );
+      ];
     }
 
     if ($this->usesExposedFormInBlock()) {
-      $options['exposed_block'] = array(
+      $options['exposed_block'] = [
         'category' => 'exposed',
         'title' => $this->t('Exposed form in block'),
         'value' => $this->getOption('exposed_block') ? $this->t('Yes') : $this->t('No'),
         'desc' => $this->t('Allow the exposed form to appear in a block instead of the view.'),
-      );
+      ];
     }
 
     /** @var \Drupal\views\Plugin\views\exposed_form\ExposedFormPluginInterface $exposed_form_plugin */
@@ -1348,13 +1336,13 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
 
     $exposed_form_str = $exposed_form_plugin->summaryTitle();
 
-    $options['exposed_form'] = array(
+    $options['exposed_form'] = [
       'category' => 'exposed',
       'title' => $this->t('Exposed form style'),
       'value' => $exposed_form_plugin->pluginTitle(),
       'setting' => $exposed_form_str,
       'desc' => $this->t('Select the kind of exposed filter to use.'),
-    );
+    ];
 
     if ($exposed_form_plugin->usesOptions()) {
       $options['exposed_form']['links']['exposed_form_options'] = $this->t('Exposed form settings for this exposed form style.');
@@ -1365,12 +1353,12 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
       $css_class = $this->t('None');
     }
 
-    $options['css_class'] = array(
+    $options['css_class'] = [
       'category' => 'other',
       'title' => $this->t('CSS class'),
       'value' => $css_class,
       'desc' => $this->t('Change the CSS class name(s) that will be added to this display.'),
-    );
+    ];
 
     foreach ($this->extenders as $extender) {
       $extender->optionsSummary($categories, $options);
@@ -1402,144 +1390,144 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     switch ($section) {
       case 'display_id':
         $form['#title'] .= $this->t('The machine name of this display');
-        $form['display_id'] = array(
+        $form['display_id'] = [
           '#type' => 'textfield',
           '#title' => $this->t('Machine name of the display'),
           '#default_value' => !empty($this->display['new_id']) ? $this->display['new_id'] : $this->display['id'],
           '#required' => TRUE,
           '#size' => 64,
-        );
+        ];
         break;
       case 'display_title':
         $form['#title'] .= $this->t('The name and the description of this display');
-        $form['display_title'] = array(
+        $form['display_title'] = [
           '#title' => $this->t('Administrative name'),
           '#type' => 'textfield',
           '#default_value' => $this->display['display_title'],
-        );
-        $form['display_description'] = array(
+        ];
+        $form['display_description'] = [
           '#title' => $this->t('Administrative description'),
           '#type' => 'textfield',
           '#default_value' => $this->getOption('display_description'),
-        );
+        ];
         break;
       case 'display_comment':
         $form['#title'] .= $this->t('Administrative comment');
-        $form['display_comment'] = array(
+        $form['display_comment'] = [
           '#type' => 'textarea',
           '#title' => $this->t('Administrative comment'),
           '#description' => $this->t('This description will only be seen within the administrative interface and can be used to document this display.'),
           '#default_value' => $this->getOption('display_comment'),
-        );
+        ];
         break;
       case 'title':
         $form['#title'] .= $this->t('The title of this view');
-        $form['title'] = array(
+        $form['title'] = [
           '#title' => $this->t('Title'),
           '#type' => 'textfield',
           '#description' => $this->t('This title will be displayed with the view, wherever titles are normally displayed; i.e, as the page title, block title, etc.'),
           '#default_value' => $this->getOption('title'),
           '#maxlength' => 255,
-        );
+        ];
         break;
       case 'css_class':
         $form['#title'] .= $this->t('CSS class');
-        $form['css_class'] = array(
+        $form['css_class'] = [
           '#type' => 'textfield',
           '#title' => $this->t('CSS class name(s)'),
           '#description' => $this->t('Separate multiple classes by spaces.'),
           '#default_value' => $this->getOption('css_class'),
-        );
+        ];
         break;
       case 'use_ajax':
         $form['#title'] .= $this->t('AJAX');
-        $form['use_ajax'] = array(
+        $form['use_ajax'] = [
           '#description' => $this->t('Options such as paging, table sorting, and exposed filters will not initiate a page refresh.'),
           '#type' => 'checkbox',
           '#title' => $this->t('Use AJAX'),
           '#default_value' => $this->getOption('use_ajax') ? 1 : 0,
-        );
+        ];
         break;
       case 'hide_attachment_summary':
         $form['#title'] .= $this->t('Hide attachments when displaying a contextual filter summary');
-        $form['hide_attachment_summary'] = array(
+        $form['hide_attachment_summary'] = [
           '#type' => 'checkbox',
           '#title' => $this->t('Hide attachments in summary'),
           '#default_value' => $this->getOption('hide_attachment_summary') ? 1 : 0,
-        );
+        ];
         break;
       case 'show_admin_links':
         $form['#title'] .= $this->t('Show contextual links on this view.');
-        $form['show_admin_links'] = array(
+        $form['show_admin_links'] = [
           '#type' => 'checkbox',
           '#title' => $this->t('Show contextual links'),
           '#default_value' => $this->getOption('show_admin_links'),
-        );
+        ];
       break;
       case 'use_more':
         $form['#title'] .= $this->t('Add a more link to the bottom of the display.');
-        $form['use_more'] = array(
+        $form['use_more'] = [
           '#type' => 'checkbox',
           '#title' => $this->t('Create more link'),
           '#description' => $this->t("This will add a more link to the bottom of this view, which will link to the page view. If you have more than one page view, the link will point to the display specified in 'Link display' section under pager. You can override the URL at the link display setting."),
           '#default_value' => $this->getOption('use_more'),
-        );
-        $form['use_more_always'] = array(
+        ];
+        $form['use_more_always'] = [
           '#type' => 'checkbox',
           '#title' => $this->t('Always display the more link'),
           '#description' => $this->t('Check this to display the more link even if there are no more items to display.'),
           '#default_value' => $this->getOption('use_more_always'),
-          '#states' => array(
-            'visible' => array(
-              ':input[name="use_more"]' => array('checked' => TRUE),
-            ),
-          ),
-        );
-        $form['use_more_text'] = array(
+          '#states' => [
+            'visible' => [
+              ':input[name="use_more"]' => ['checked' => TRUE],
+            ],
+          ],
+        ];
+        $form['use_more_text'] = [
           '#type' => 'textfield',
           '#title' => $this->t('More link text'),
           '#description' => $this->t('The text to display for the more link.'),
           '#default_value' => $this->getOption('use_more_text'),
-          '#states' => array(
-            'visible' => array(
-              ':input[name="use_more"]' => array('checked' => TRUE),
-            ),
-          ),
-        );
+          '#states' => [
+            'visible' => [
+              ':input[name="use_more"]' => ['checked' => TRUE],
+            ],
+          ],
+        ];
         break;
       case 'group_by':
         $form['#title'] .= $this->t('Allow grouping and aggregation (calculation) of fields.');
-        $form['group_by'] = array(
+        $form['group_by'] = [
           '#type' => 'checkbox',
           '#title' => $this->t('Aggregate'),
           '#description' => $this->t('If enabled, some fields may become unavailable. All fields that are selected for grouping will be collapsed to one record per distinct value. Other fields which are selected for aggregation will have the function run on them. For example, you can group nodes on title and count the number of nids in order to get a list of duplicate titles.'),
           '#default_value' => $this->getOption('group_by'),
-        );
+        ];
         break;
       case 'access':
         $form['#title'] .= $this->t('Access restrictions');
-        $form['access'] = array(
+        $form['access'] = [
           '#prefix' => '<div class="clearfix">',
           '#suffix' => '</div>',
           '#tree' => TRUE,
-        );
+        ];
 
         $access = $this->getOption('access');
-        $form['access']['type'] = array(
+        $form['access']['type'] = [
           '#title' => $this->t('Access'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => Views::fetchPluginNames('access', $this->getType(), array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('access', $this->getType(), [$this->view->storage->get('base_table')]),
           '#default_value' => $access['type'],
-        );
+        ];
 
         $access_plugin = $this->getPlugin('access');
         if ($access_plugin->usesOptions()) {
-          $form['markup'] = array(
+          $form['markup'] = [
             '#prefix' => '<div class="js-form-item form-item description">',
-            '#markup' => $this->t('You may also adjust the @settings for the currently selected access restriction.', array('@settings' => $this->optionLink($this->t('settings'), 'access_options'))),
+            '#markup' => $this->t('You may also adjust the @settings for the currently selected access restriction.', ['@settings' => $this->optionLink($this->t('settings'), 'access_options')]),
             '#suffix' => '</div>',
-          );
+          ];
         }
 
         break;
@@ -1547,45 +1535,45 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
         $plugin = $this->getPlugin('access');
         $form['#title'] .= $this->t('Access options');
         if ($plugin) {
-          $form['access_options'] = array(
+          $form['access_options'] = [
             '#tree' => TRUE,
-          );
+          ];
           $plugin->buildOptionsForm($form['access_options'], $form_state);
         }
         break;
       case 'cache':
         $form['#title'] .= $this->t('Caching');
-        $form['cache'] = array(
+        $form['cache'] = [
           '#prefix' => '<div class="clearfix">',
           '#suffix' => '</div>',
           '#tree' => TRUE,
-        );
+        ];
 
         $cache = $this->getOption('cache');
-        $form['cache']['type'] = array(
+        $form['cache']['type'] = [
           '#title' => $this->t('Caching'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => Views::fetchPluginNames('cache', $this->getType(), array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('cache', $this->getType(), [$this->view->storage->get('base_table')]),
           '#default_value' => $cache['type'],
-        );
+        ];
 
         $cache_plugin = $this->getPlugin('cache');
         if ($cache_plugin->usesOptions()) {
-          $form['markup'] = array(
+          $form['markup'] = [
             '#prefix' => '<div class="js-form-item form-item description">',
             '#suffix' => '</div>',
-            '#markup' => $this->t('You may also adjust the @settings for the currently selected cache mechanism.', array('@settings' => $this->optionLink($this->t('settings'), 'cache_options'))),
-          );
+            '#markup' => $this->t('You may also adjust the @settings for the currently selected cache mechanism.', ['@settings' => $this->optionLink($this->t('settings'), 'cache_options')]),
+          ];
         }
         break;
       case 'cache_options':
         $plugin = $this->getPlugin('cache');
         $form['#title'] .= $this->t('Caching options');
         if ($plugin) {
-          $form['cache_options'] = array(
+          $form['cache_options'] = [
             '#tree' => TRUE,
-          );
+          ];
           $plugin->buildOptionsForm($form['cache_options'], $form_state);
         }
         break;
@@ -1596,16 +1584,16 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
         $form['#title'] .= $this->t('Query options');
         $this->view->initQuery();
         if ($this->view->query) {
-          $form['query'] = array(
+          $form['query'] = [
             '#tree' => TRUE,
-            'type' => array(
+            'type' => [
               '#type' => 'value',
               '#value' => $plugin_name,
-            ),
-            'options' => array(
+            ],
+            'options' => [
               '#tree' => TRUE,
-            ),
-          );
+            ],
+          ];
 
           $this->view->query->buildOptionsForm($form['query']['options'], $form_state);
         }
@@ -1614,13 +1602,13 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
         $form['#title'] .= $this->t('Rendering language');
         if (\Drupal::languageManager()->isMultilingual() && $this->isBaseTableTranslatable()) {
           $options = $this->buildRenderingLanguageOptions();
-          $form['rendering_language'] = array(
+          $form['rendering_language'] = [
             '#type' => 'select',
             '#options' => $options,
             '#title' => $this->t('Rendering language'),
             '#description' => $this->t('All content that supports translations will be displayed in the selected language.'),
             '#default_value' => $this->getOption('rendering_language'),
-          );
+          ];
         }
         else {
           $form['rendering_language']['#markup'] = $this->t('The view is not based on a translatable entity type or the site is not multilingual.');
@@ -1629,26 +1617,26 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
       case 'style':
         $form['#title'] .= $this->t('How should this view be styled');
         $style_plugin = $this->getPlugin('style');
-        $form['style'] = array(
+        $form['style'] = [
           '#prefix' => '<div class="clearfix">',
           '#suffix' => '</div>',
           '#tree' => TRUE,
-        );
-        $form['style']['type'] = array(
+        ];
+        $form['style']['type'] = [
           '#title' => $this->t('Style'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => Views::fetchPluginNames('style', $this->getType(), array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('style', $this->getType(), [$this->view->storage->get('base_table')]),
           '#default_value' => $style_plugin->definition['id'],
           '#description' => $this->t('If the style you choose has settings, be sure to click the settings button that will appear next to it in the View summary.'),
-        );
+        ];
 
         if ($style_plugin->usesOptions()) {
-          $form['markup'] = array(
+          $form['markup'] = [
             '#prefix' => '<div class="js-form-item form-item description">',
             '#suffix' => '</div>',
-            '#markup' => $this->t('You may also adjust the @settings for the currently selected style.', array('@settings' => $this->optionLink($this->t('settings'), 'style_options'))),
-          );
+            '#markup' => $this->t('You may also adjust the @settings for the currently selected style.', ['@settings' => $this->optionLink($this->t('settings'), 'style_options')]),
+          ];
         }
 
         break;
@@ -1678,31 +1666,31 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
       case 'row':
         $form['#title'] .= $this->t('How should each row in this view be styled');
         $row_plugin_instance = $this->getPlugin('row');
-        $form['row'] = array(
+        $form['row'] = [
           '#prefix' => '<div class="clearfix">',
           '#suffix' => '</div>',
           '#tree' => TRUE,
-        );
-        $form['row']['type'] = array(
+        ];
+        $form['row']['type'] = [
           '#title' => $this->t('Row'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => Views::fetchPluginNames('row', $this->getType(), array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('row', $this->getType(), [$this->view->storage->get('base_table')]),
           '#default_value' => $row_plugin_instance->definition['id'],
-        );
+        ];
 
         if ($row_plugin_instance->usesOptions()) {
-          $form['markup'] = array(
+          $form['markup'] = [
             '#prefix' => '<div class="js-form-item form-item description">',
             '#suffix' => '</div>',
-            '#markup' => $this->t('You may also adjust the @settings for the currently selected row style.', array('@settings' => $this->optionLink($this->t('settings'), 'row_options'))),
-          );
+            '#markup' => $this->t('You may also adjust the @settings for the currently selected row style.', ['@settings' => $this->optionLink($this->t('settings'), 'row_options')]),
+          ];
         }
 
         break;
       case 'link_display':
         $form['#title'] .= $this->t('Which display to use for path');
-        $options = array(FALSE => $this->t('None'), 'custom_url' => $this->t('Custom URL'));
+        $options = [FALSE => $this->t('None'), 'custom_url' => $this->t('Custom URL')];
 
         foreach ($this->view->storage->get('display') as $display_id => $display) {
           if ($this->view->displayHandlers->get($display_id)->hasPath()) {
@@ -1710,18 +1698,18 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
           }
         }
 
-        $form['link_display'] = array(
+        $form['link_display'] = [
           '#type' => 'radios',
           '#options' => $options,
           '#description' => $this->t("Which display to use to get this display's path for things like summary links, rss feed links, more links, etc."),
           '#default_value' => $this->getOption('link_display'),
-        );
+        ];
 
-        $options = array();
+        $options = [];
         $optgroup_arguments = (string) t('Arguments');
         foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
-          $options[$optgroup_arguments]["{{ arguments.$arg }}"] = $this->t('@argument title', array('@argument' => $handler->adminLabel()));
-          $options[$optgroup_arguments]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', array('@argument' => $handler->adminLabel()));
+          $options[$optgroup_arguments]["{{ arguments.$arg }}"] = $this->t('@argument title', ['@argument' => $handler->adminLabel()]);
+          $options[$optgroup_arguments]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', ['@argument' => $handler->adminLabel()]);
         }
 
         // Default text.
@@ -1738,102 +1726,102 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
           ];
           foreach (array_keys($options) as $type) {
             if (!empty($options[$type])) {
-              $items = array();
+              $items = [];
               foreach ($options[$type] as $key => $value) {
                 $items[] = $key . ' == ' . $value;
               }
-              $item_list = array(
+              $item_list = [
                 '#theme' => 'item_list',
                 '#items' => $items,
-              );
+              ];
               $description[] = $item_list;
             }
           }
         }
 
-        $form['link_url'] = array(
+        $form['link_url'] = [
           '#type' => 'textfield',
           '#title' => $this->t('Custom URL'),
           '#default_value' => $this->getOption('link_url'),
           '#description' => $description,
-          '#states' => array(
-            'visible' => array(
-              ':input[name="link_display"]' => array('value' => 'custom_url'),
-            ),
-          ),
-        );
+          '#states' => [
+            'visible' => [
+              ':input[name="link_display"]' => ['value' => 'custom_url'],
+            ],
+          ],
+        ];
         break;
       case 'exposed_block':
         $form['#title'] .= $this->t('Put the exposed form in a block');
-        $form['description'] = array(
+        $form['description'] = [
           '#markup' => '<div class="js-form-item form-item description">' . $this->t('If set, any exposed widgets will not appear with this view. Instead, a block will be made available to the Drupal block administration system, and the exposed form will appear there. Note that this block must be enabled manually, Views will not enable it for you.') . '</div>',
-        );
-        $form['exposed_block'] = array(
+        ];
+        $form['exposed_block'] = [
           '#type' => 'radios',
-          '#options' => array(1 => $this->t('Yes'), 0 => $this->t('No')),
+          '#options' => [1 => $this->t('Yes'), 0 => $this->t('No')],
           '#default_value' => $this->getOption('exposed_block') ? 1 : 0,
-        );
+        ];
         break;
       case 'exposed_form':
         $form['#title'] .= $this->t('Exposed Form');
-        $form['exposed_form'] = array(
+        $form['exposed_form'] = [
           '#prefix' => '<div class="clearfix">',
           '#suffix' => '</div>',
           '#tree' => TRUE,
-        );
+        ];
 
         $exposed_form = $this->getOption('exposed_form');
-        $form['exposed_form']['type'] = array(
+        $form['exposed_form']['type'] = [
           '#title' => $this->t('Exposed form'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => Views::fetchPluginNames('exposed_form', $this->getType(), array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('exposed_form', $this->getType(), [$this->view->storage->get('base_table')]),
           '#default_value' => $exposed_form['type'],
-        );
+        ];
 
         $exposed_form_plugin = $this->getPlugin('exposed_form');
         if ($exposed_form_plugin->usesOptions()) {
-          $form['markup'] = array(
+          $form['markup'] = [
             '#prefix' => '<div class="js-form-item form-item description">',
             '#suffix' => '</div>',
-            '#markup' => $this->t('You may also adjust the @settings for the currently selected style.', array('@settings' => $this->optionLink($this->t('settings'), 'exposed_form_options'))),
-          );
+            '#markup' => $this->t('You may also adjust the @settings for the currently selected style.', ['@settings' => $this->optionLink($this->t('settings'), 'exposed_form_options')]),
+          ];
         }
         break;
       case 'exposed_form_options':
         $plugin = $this->getPlugin('exposed_form');
         $form['#title'] .= $this->t('Exposed form options');
         if ($plugin) {
-          $form['exposed_form_options'] = array(
+          $form['exposed_form_options'] = [
             '#tree' => TRUE,
-          );
+          ];
           $plugin->buildOptionsForm($form['exposed_form_options'], $form_state);
         }
         break;
       case 'pager':
         $form['#title'] .= $this->t('Select pager');
-        $form['pager'] = array(
+        $form['pager'] = [
           '#prefix' => '<div class="clearfix">',
           '#suffix' => '</div>',
           '#tree' => TRUE,
-        );
+        ];
 
         $pager = $this->getOption('pager');
-        $form['pager']['type'] = array(
+        $form['pager']['type'] = [
           '#title' => $this->t('Pager'),
           '#title_display' => 'invisible',
           '#type' => 'radios',
-          '#options' => Views::fetchPluginNames('pager', !$this->usesPager() ? 'basic' : NULL, array($this->view->storage->get('base_table'))),
+          '#options' => Views::fetchPluginNames('pager', !$this->usesPager() ? 'basic' : NULL, [$this->view->storage->get('base_table')]),
           '#default_value' => $pager['type'],
-        );
+        ];
 
         $pager_plugin = $this->getPlugin('pager');
         if ($pager_plugin->usesOptions()) {
-          $form['markup'] = array(
+          $form['markup'] = [
             '#prefix' => '<div class="js-form-item form-item description">',
             '#suffix' => '</div>',
-            '#markup' => $this->t('You may also adjust the @settings for the currently selected pager.', array('@settings' => $this->optionLink($this->t('settings'), 'pager_options'))),
-          );
+            '#markup' => $this->t('You may also adjust the @settings for the currently selected pager.', ['@settings' => $this->optionLink($this->t('settings'), 'pager_options')]),
+          ];
         }
 
         break;
@@ -1841,9 +1829,9 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
         $plugin = $this->getPlugin('pager');
         $form['#title'] .= $this->t('Pager options');
         if ($plugin) {
-          $form['pager_options'] = array(
+          $form['pager_options'] = [
             '#tree' => TRUE,
-          );
+          ];
           $plugin->buildOptionsForm($form['pager_options'], $form_state);
         }
         break;
@@ -1967,16 +1955,16 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
       case 'style':
         $plugin_type = $section;
         $plugin_options = $this->getOption($plugin_type);
-        $type = $form_state->getValue(array($plugin_type, 'type'));
+        $type = $form_state->getValue([$plugin_type, 'type']);
         if ($plugin_options['type'] != $type) {
           /** @var \Drupal\views\Plugin\views\ViewsPluginInterface $plugin */
           $plugin = Views::pluginManager($plugin_type)->createInstance($type);
           if ($plugin) {
             $plugin->init($this->view, $this, $plugin_options['options']);
-            $plugin_options = array(
+            $plugin_options = [
               'type' => $type,
               'options' => $plugin->options,
-            );
+            ];
             $plugin->filterByDefinedOptions($plugin_options['options']);
             $this->setOption($plugin_type, $plugin_options);
             if ($plugin->usesOptions()) {
@@ -2094,18 +2082,18 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
       // If a URL is available (either from the display or a custom path),
       // render the "More" link.
       if ($url) {
-        $url_options = array();
+        $url_options = [];
         if (!empty($this->view->exposed_raw_input)) {
           $url_options['query'] = $this->view->exposed_raw_input;
         }
         $url->setOptions($url_options);
 
-        return array(
+        return [
           '#type' => 'more_link',
           '#url' => $url,
           '#title' => $this->useMoreText(),
           '#view' => $this->view,
-        );
+        ];
       }
     }
   }
@@ -2114,9 +2102,9 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    * {@inheritdoc}
    */
   public function render() {
-    $rows = (!empty($this->view->result) || $this->view->style_plugin->evenEmpty()) ? $this->view->style_plugin->render($this->view->result) : array();
+    $rows = (!empty($this->view->result) || $this->view->style_plugin->evenEmpty()) ? $this->view->style_plugin->render($this->view->result) : [];
 
-    $element = array(
+    $element = [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#pre_render' => [[$this, 'elementPreRender']],
@@ -2124,7 +2112,8 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
       // Assigned by reference so anything added in $element['#attached'] will
       // be available on the view.
       '#attached' => &$this->view->element['#attached'],
-    );
+      '#cache' => &$this->view->element['#cache'],
+    ];
 
     $this->applyDisplayCachablityMetadata($this->view->element);
 
@@ -2158,15 +2147,15 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
 
     // Force a render array so CSS/JS can be attached.
     if (!is_array($element['#rows'])) {
-      $element['#rows'] = array('#markup' => $element['#rows']);
+      $element['#rows'] = ['#markup' => $element['#rows']];
     }
 
     $element['#header'] = $view->display_handler->renderArea('header', $empty);
     $element['#footer'] = $view->display_handler->renderArea('footer', $empty);
-    $element['#empty'] = $empty ? $view->display_handler->renderArea('empty', $empty) : array();
-    $element['#exposed'] = !empty($view->exposed_widgets) ? $view->exposed_widgets : array();
+    $element['#empty'] = $empty ? $view->display_handler->renderArea('empty', $empty) : [];
+    $element['#exposed'] = !empty($view->exposed_widgets) ? $view->exposed_widgets : [];
     $element['#more'] = $view->display_handler->renderMoreLink();
-    $element['#feed_icons'] = !empty($view->feedIcons) ? $view->feedIcons : array();
+    $element['#feed_icons'] = !empty($view->feedIcons) ? $view->feedIcons : [];
 
     if ($view->display_handler->renderPager()) {
       $exposed_input = isset($view->exposed_raw_input) ? $view->exposed_raw_input : NULL;
@@ -2196,12 +2185,12 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
       // The form is requesting that all non-essential views elements be hidden,
       // usually because the rendered step is not a view result.
       if ($form['show_view_elements']['#value'] == FALSE) {
-        $element['#header'] = array();
-        $element['#exposed'] = array();
-        $element['#pager'] = array();
-        $element['#footer'] = array();
-        $element['#more'] = array();
-        $element['#feed_icons'] = array();
+        $element['#header'] = [];
+        $element['#exposed'] = [];
+        $element['#pager'] = [];
+        $element['#footer'] = [];
+        $element['#more'] = [];
+        $element['#feed_icons'] = [];
       }
 
       $element['#rows'] = $form;
@@ -2214,7 +2203,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    * {@inheritdoc}
    */
   public function renderArea($area, $empty = FALSE) {
-    $return = array();
+    $return = [];
     foreach ($this->getHandlers($area) as $key => $area_handler) {
       if ($area_render = $area_handler->render($empty)) {
         if (isset($area_handler->position)) {
@@ -2387,7 +2376,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
   /**
    * {@inheritdoc}
    */
-  function preview() {
+  public function preview() {
     return $this->view->render();
   }
 
@@ -2402,7 +2391,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    * {@inheritdoc}
    */
   public function validate() {
-    $errors = array();
+    $errors = [];
     // Make sure displays that use fields HAVE fields.
     if ($this->usesFields()) {
       $fields = FALSE;
@@ -2413,7 +2402,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
       }
 
       if (!$fields) {
-        $errors[] = $this->t('Display "@display" uses fields but there are none defined for it or all are excluded.', array('@display' => $this->display['display_title']));
+        $errors[] = $this->t('Display "@display" uses fields but there are none defined for it or all are excluded.', ['@display' => $this->display['display_title']]);
       }
     }
 
@@ -2421,18 +2410,18 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     if ($this->isMoreEnabled() && $this->getOption('link_display') !== 'custom_url') {
       $routed_display = $this->getRoutedDisplay();
       if (!$routed_display || !$routed_display->isEnabled()) {
-        $errors[] = $this->t('Display "@display" uses a "more" link but there are no displays it can link to. You need to specify a custom URL.', array('@display' => $this->display['display_title']));
+        $errors[] = $this->t('Display "@display" uses a "more" link but there are no displays it can link to. You need to specify a custom URL.', ['@display' => $this->display['display_title']]);
       }
     }
 
     if ($this->hasPath() && !$this->getOption('path')) {
-      $errors[] = $this->t('Display "@display" uses a path but the path is undefined.', array('@display' => $this->display['display_title']));
+      $errors[] = $this->t('Display "@display" uses a path but the path is undefined.', ['@display' => $this->display['display_title']]);
     }
 
     // Validate style plugin.
     $style = $this->getPlugin('style');
     if (empty($style)) {
-      $errors[] = $this->t('Display "@display" has an invalid style plugin.', array('@display' => $this->display['display_title']));
+      $errors[] = $this->t('Display "@display" has an invalid style plugin.', ['@display' => $this->display['display_title']]);
     }
     else {
       $result = $style->validate();
@@ -2453,7 +2442,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     foreach (ViewExecutable::getHandlerTypes() as $type => $handler_type_info) {
       foreach ($this->getHandlers($type) as $handler_id => $handler) {
         if (!empty($handler->options['relationship']) && $handler->options['relationship'] != 'none' && !in_array($handler->options['relationship'], $relationships)) {
-          $errors[] = $this->t('The %handler_type %handler uses a relationship that has been removed.', array('%handler_type' => $handler_type_info['lstitle'], '%handler' => $handler->adminLabel()));
+          $errors[] = $this->t('The %handler_type %handler uses a relationship that has been removed.', ['%handler_type' => $handler_type_info['lstitle'], '%handler' => $handler->adminLabel()]);
         }
       }
     }
@@ -2509,7 +2498,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     }
 
     // Check whether all of the area handlers are empty.
-    foreach (array('empty', 'footer', 'header') as $type) {
+    foreach (['empty', 'footer', 'header'] as $type) {
       $handlers = $this->getHandlers($type);
       foreach ($handlers as $handler) {
         // If one is not empty, return FALSE now.
@@ -2526,15 +2515,15 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    * {@inheritdoc}
    */
   public function getSpecialBlocks() {
-    $blocks = array();
+    $blocks = [];
 
     if ($this->usesExposedFormInBlock()) {
       $delta = '-exp-' . $this->view->storage->id() . '-' . $this->display['id'];
-      $desc = $this->t('Exposed form: @view-@display_id', array('@view' => $this->view->storage->id(), '@display_id' => $this->display['id']));
+      $desc = $this->t('Exposed form: @view-@display_id', ['@view' => $this->view->storage->id(), '@display_id' => $this->display['id']]);
 
-      $blocks[$delta] = array(
+      $blocks[$delta] = [
         'info' => $desc,
-      );
+      ];
     }
 
     return $blocks;
@@ -2562,21 +2551,21 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
    * {@inheritdoc}
    */
   public function getArgumentText() {
-    return array(
+    return [
       'filter value not present' => $this->t('When the filter value is <em>NOT</em> available'),
       'filter value present' => $this->t('When the filter value <em>IS</em> available or a default is provided'),
       'description' => $this->t("This display does not have a source for contextual filters, so no contextual filter value will be available unless you select 'Provide default'."),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getPagerText() {
-    return array(
+    return [
       'items per page title' => $this->t('Items to display'),
       'items per page description' => $this->t('Enter 0 for no limit.')
-    );
+    ];
   }
 
   /**
@@ -2586,7 +2575,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     $defined_options = $this->defineOptions();
 
     // Build a map of plural => singular for handler types.
-    $type_map = array();
+    $type_map = [];
     foreach (ViewExecutable::getHandlerTypes() as $type => $info) {
       $type_map[$info['plural']] = $type;
     }
@@ -2663,7 +2652,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     //   https://www.drupal.org/node/2173811.
     // Pass the current rendering language (in this case a one element array) so
     // is not lost when there are language configuration changes.
-    return $this->listLanguages(LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_SITE_DEFAULT | PluginBase::INCLUDE_NEGOTIATED | PluginBase::INCLUDE_ENTITY, array($this->getOption('rendering_language')));
+    return $this->listLanguages(LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_SITE_DEFAULT | PluginBase::INCLUDE_NEGOTIATED | PluginBase::INCLUDE_ENTITY, [$this->getOption('rendering_language')]);
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php b/web/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
index d3b4c79b6..f8630af08 100644
--- a/web/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
+++ b/web/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
@@ -497,7 +497,7 @@ interface DisplayPluginInterface {
    *
    * Also might be used for some other AJAXy reason.
    */
-  function preview();
+  public function preview();
 
   /**
    * Returns the display type that this display requires.
diff --git a/web/core/modules/views/src/Plugin/views/display/EntityReference.php b/web/core/modules/views/src/Plugin/views/display/EntityReference.php
index bf2d46034..73b137ce0 100644
--- a/web/core/modules/views/src/Plugin/views/display/EntityReference.php
+++ b/web/core/modules/views/src/Plugin/views/display/EntityReference.php
@@ -47,9 +47,9 @@ class EntityReference extends DisplayPluginBase {
 
     // Force the style plugin to 'entity_reference_style' and the row plugin to
     // 'fields'.
-    $options['style']['contains']['type'] = array('default' => 'entity_reference');
+    $options['style']['contains']['type'] = ['default' => 'entity_reference'];
     $options['defaults']['default']['style'] = FALSE;
-    $options['row']['contains']['type'] = array('default' => 'entity_reference');
+    $options['row']['contains']['type'] = ['default' => 'entity_reference'];
     $options['defaults']['default']['row'] = FALSE;
 
     // Make sure the query is not cached.
@@ -165,14 +165,14 @@ class EntityReference extends DisplayPluginBase {
     // Verify that search fields are set up.
     $style = $this->getOption('style');
     if (!isset($style['options']['search_fields'])) {
-      $errors[] = $this->t('Display "@display" needs a selected search fields to work properly. See the settings for the Entity Reference list format.', array('@display' => $this->display['display_title']));
+      $errors[] = $this->t('Display "@display" needs a selected search fields to work properly. See the settings for the Entity Reference list format.', ['@display' => $this->display['display_title']]);
     }
     else {
       // Verify that the search fields used actually exist.
       $fields = array_keys($this->handlers['field']);
       foreach ($style['options']['search_fields'] as $field_alias => $enabled) {
         if ($enabled && !in_array($field_alias, $fields)) {
-          $errors[] = $this->t('Display "@display" uses field %field as search field, but the field is no longer present. See the settings for the Entity Reference list format.', array('@display' => $this->display['display_title'], '%field' => $field_alias));
+          $errors[] = $this->t('Display "@display" uses field %field as search field, but the field is no longer present. See the settings for the Entity Reference list format.', ['@display' => $this->display['display_title'], '%field' => $field_alias]);
         }
       }
     }
diff --git a/web/core/modules/views/src/Plugin/views/display/Feed.php b/web/core/modules/views/src/Plugin/views/display/Feed.php
index bd5909101..b9a2990ce 100644
--- a/web/core/modules/views/src/Plugin/views/display/Feed.php
+++ b/web/core/modules/views/src/Plugin/views/display/Feed.php
@@ -90,11 +90,11 @@ class Feed extends PathPluginBase implements ResponseDisplayPluginInterface {
     $output = $this->view->render();
 
     if (!empty($this->view->live_preview)) {
-      $output = array(
+      $output = [
         '#prefix' => '<pre>',
         '#plain_text' => drupal_render_root($output),
         '#suffix' => '</pre>',
-      );
+      ];
     }
 
     return $output;
@@ -117,7 +117,7 @@ class Feed extends PathPluginBase implements ResponseDisplayPluginInterface {
   public function defaultableSections($section = NULL) {
     $sections = parent::defaultableSections($section);
 
-    if (in_array($section, array('style', 'row'))) {
+    if (in_array($section, ['style', 'row'])) {
       return FALSE;
     }
 
@@ -137,11 +137,11 @@ class Feed extends PathPluginBase implements ResponseDisplayPluginInterface {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['displays'] = array('default' => array());
+    $options['displays'] = ['default' => []];
 
     // Overrides for standard stuff.
     $options['style']['contains']['type']['default'] = 'rss';
-    $options['style']['contains']['options']['default']  = array('description' => '');
+    $options['style']['contains']['options']['default']  = ['description' => ''];
     $options['sitename_title']['default'] = FALSE;
     $options['row']['contains']['type']['default'] = 'rss_fields';
     $options['defaults']['default']['style'] = FALSE;
@@ -160,7 +160,7 @@ class Feed extends PathPluginBase implements ResponseDisplayPluginInterface {
     // definition, but in this case it's dependent on the view's base table,
     // which we don't know until init().
     if (empty($this->options['row']['type']) || $this->options['row']['type'] === 'rss_fields') {
-      $row_plugins = Views::fetchPluginNames('row', $this->getType(), array($this->view->storage->get('base_table')));
+      $row_plugins = Views::fetchPluginNames('row', $this->getType(), [$this->view->storage->get('base_table')]);
       $default_row_plugin = key($row_plugins);
 
       $options = $this->getOption('row');
@@ -177,13 +177,13 @@ class Feed extends PathPluginBase implements ResponseDisplayPluginInterface {
 
     // Since we're childing off the 'path' type, we'll still *call* our
     // category 'page' but let's override it so it says feed settings.
-    $categories['page'] = array(
+    $categories['page'] = [
       'title' => $this->t('Feed settings'),
       'column' => 'second',
-      'build' => array(
+      'build' => [
         '#weight' => -10,
-      ),
-    );
+      ],
+    ];
 
     if ($this->getOption('sitename_title')) {
       $options['title']['value'] = $this->t('Using the site name');
@@ -205,11 +205,11 @@ class Feed extends PathPluginBase implements ResponseDisplayPluginInterface {
       $attach_to = $this->t('None');
     }
 
-    $options['displays'] = array(
+    $options['displays'] = [
       'category' => 'page',
       'title' => $this->t('Attach to'),
       'value' => $attach_to,
-    );
+    ];
   }
 
   /**
@@ -224,34 +224,34 @@ class Feed extends PathPluginBase implements ResponseDisplayPluginInterface {
         $title = $form['title'];
         // A little juggling to move the 'title' field beyond our checkbox.
         unset($form['title']);
-        $form['sitename_title'] = array(
+        $form['sitename_title'] = [
           '#type' => 'checkbox',
           '#title' => $this->t('Use the site name for the title'),
           '#default_value' => $this->getOption('sitename_title'),
-        );
+        ];
         $form['title'] = $title;
-        $form['title']['#states'] = array(
-          'visible' => array(
-            ':input[name="sitename_title"]' => array('checked' => FALSE),
-          ),
-        );
+        $form['title']['#states'] = [
+          'visible' => [
+            ':input[name="sitename_title"]' => ['checked' => FALSE],
+          ],
+        ];
         break;
       case 'displays':
         $form['#title'] .= $this->t('Attach to');
-        $displays = array();
+        $displays = [];
         foreach ($this->view->storage->get('display') as $display_id => $display) {
           // @todo The display plugin should have display_title and id as well.
           if ($this->view->displayHandlers->has($display_id) && $this->view->displayHandlers->get($display_id)->acceptAttachments()) {
             $displays[$display_id] = $display['display_title'];
           }
         }
-        $form['displays'] = array(
+        $form['displays'] = [
           '#title' => $this->t('Displays'),
           '#type' => 'checkboxes',
           '#description' => $this->t('The feed icon will be available only to the selected displays.'),
           '#options' => array_map('\Drupal\Component\Utility\Html::escape', $displays),
           '#default_value' => $this->getOption('displays'),
-        );
+        ];
         break;
       case 'path':
         $form['path']['#description'] = $this->t('This view will be displayed by visiting this path on your site. It is recommended that the path be something like "path/%/%/feed" or "path/%/%/rss.xml", putting one % in the path for each contextual filter you have defined in the view.');
diff --git a/web/core/modules/views/src/Plugin/views/display/Page.php b/web/core/modules/views/src/Plugin/views/display/Page.php
index d79b75b83..aca0683f3 100644
--- a/web/core/modules/views/src/Plugin/views/display/Page.php
+++ b/web/core/modules/views/src/Plugin/views/display/Page.php
@@ -118,27 +118,27 @@ class Page extends PathPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['menu'] = array(
-      'contains' => array(
-        'type' => array('default' => 'none'),
-        'title' => array('default' => ''),
-        'description' => array('default' => ''),
-        'weight' => array('default' => 0),
-        'enabled' => array('default' => TRUE),
-        'menu_name' => array('default' => 'main'),
-        'parent' => array('default' => ''),
-        'context' => array('default' => ''),
-        'expanded' => array('default' => FALSE),
-      ),
-    );
-    $options['tab_options'] = array(
-      'contains' => array(
-        'type' => array('default' => 'none'),
-        'title' => array('default' => ''),
-        'description' => array('default' => ''),
-        'weight' => array('default' => 0),
-      ),
-    );
+    $options['menu'] = [
+      'contains' => [
+        'type' => ['default' => 'none'],
+        'title' => ['default' => ''],
+        'description' => ['default' => ''],
+        'weight' => ['default' => 0],
+        'enabled' => ['default' => TRUE],
+        'menu_name' => ['default' => 'main'],
+        'parent' => ['default' => ''],
+        'context' => ['default' => ''],
+        'expanded' => ['default' => FALSE],
+      ],
+    ];
+    $options['tab_options'] = [
+      'contains' => [
+        'type' => ['default' => 'none'],
+        'title' => ['default' => ''],
+        'description' => ['default' => ''],
+        'weight' => ['default' => 0],
+      ],
+    ];
 
     return $options;
   }
@@ -175,9 +175,9 @@ class Page extends PathPluginBase {
     // @todo Figure out how to support custom response objects. Maybe for pages
     //   it should be dropped.
     if (is_array($render)) {
-      $render += array(
+      $render += [
         '#title' => ['#markup' => $this->view->getTitle(), '#allowed_tags' => Xss::getHtmlTagList()],
-      );
+      ];
     }
     return $render;
   }
@@ -190,7 +190,7 @@ class Page extends PathPluginBase {
 
     $menu = $this->getOption('menu');
     if (!is_array($menu)) {
-      $menu = array('type' => 'none');
+      $menu = ['type' => 'none'];
     }
     switch ($menu['type']) {
       case 'none':
@@ -198,19 +198,19 @@ class Page extends PathPluginBase {
         $menu_str = $this->t('No menu');
         break;
       case 'normal':
-        $menu_str = $this->t('Normal: @title', array('@title' => $menu['title']));
+        $menu_str = $this->t('Normal: @title', ['@title' => $menu['title']]);
         break;
       case 'tab':
       case 'default tab':
-        $menu_str = $this->t('Tab: @title', array('@title' => $menu['title']));
+        $menu_str = $this->t('Tab: @title', ['@title' => $menu['title']]);
         break;
     }
 
-    $options['menu'] = array(
+    $options['menu'] = [
       'category' => 'page',
       'title' => $this->t('Menu'),
       'value' => views_ui_truncate($menu_str, 24),
-    );
+    ];
 
     // This adds a 'Settings' link to the style_options setting if the style
     // has options.
@@ -229,67 +229,67 @@ class Page extends PathPluginBase {
     switch ($form_state->get('section')) {
       case 'menu':
         $form['#title'] .= $this->t('Menu item entry');
-        $form['menu'] = array(
+        $form['menu'] = [
           '#prefix' => '<div class="clearfix">',
           '#suffix' => '</div>',
           '#tree' => TRUE,
-        );
+        ];
         $menu = $this->getOption('menu');
         if (empty($menu)) {
-          $menu = array('type' => 'none', 'title' => '', 'weight' => 0, 'expanded' => FALSE);
+          $menu = ['type' => 'none', 'title' => '', 'weight' => 0, 'expanded' => FALSE];
         }
-        $form['menu']['type'] = array(
+        $form['menu']['type'] = [
           '#prefix' => '<div class="views-left-30">',
           '#suffix' => '</div>',
           '#title' => $this->t('Type'),
           '#type' => 'radios',
-          '#options' => array(
+          '#options' => [
             'none' => $this->t('No menu entry'),
             'normal' => $this->t('Normal menu entry'),
             'tab' => $this->t('Menu tab'),
             'default tab' => $this->t('Default menu tab')
-          ),
+          ],
           '#default_value' => $menu['type'],
-        );
+        ];
 
-        $form['menu']['title'] = array(
+        $form['menu']['title'] = [
           '#prefix' => '<div class="views-left-50">',
           '#title' => $this->t('Menu link title'),
           '#type' => 'textfield',
           '#default_value' => $menu['title'],
-          '#states' => array(
-            'visible' => array(
-              array(
-                ':input[name="menu[type]"]' => array('value' => 'normal'),
-              ),
-              array(
-                ':input[name="menu[type]"]' => array('value' => 'tab'),
-              ),
-              array(
-                ':input[name="menu[type]"]' => array('value' => 'default tab'),
-              ),
-            ),
-          ),
-        );
-        $form['menu']['description'] = array(
+          '#states' => [
+            'visible' => [
+              [
+                ':input[name="menu[type]"]' => ['value' => 'normal'],
+              ],
+              [
+                ':input[name="menu[type]"]' => ['value' => 'tab'],
+              ],
+              [
+                ':input[name="menu[type]"]' => ['value' => 'default tab'],
+              ],
+            ],
+          ],
+        ];
+        $form['menu']['description'] = [
           '#title' => $this->t('Description'),
           '#type' => 'textfield',
           '#default_value' => $menu['description'],
           '#description' => $this->t("Shown when hovering over the menu link."),
-          '#states' => array(
-            'visible' => array(
-              array(
-                ':input[name="menu[type]"]' => array('value' => 'normal'),
-              ),
-              array(
-                ':input[name="menu[type]"]' => array('value' => 'tab'),
-              ),
-              array(
-                ':input[name="menu[type]"]' => array('value' => 'default tab'),
-              ),
-            ),
-          ),
-        );
+          '#states' => [
+            'visible' => [
+              [
+                ':input[name="menu[type]"]' => ['value' => 'normal'],
+              ],
+              [
+                ':input[name="menu[type]"]' => ['value' => 'tab'],
+              ],
+              [
+                ':input[name="menu[type]"]' => ['value' => 'default tab'],
+              ],
+            ],
+          ],
+        ];
         $form['menu']['expanded'] = [
           '#title' => $this->t('Show as expanded'),
           '#type' => 'checkbox',
@@ -302,133 +302,133 @@ class Page extends PathPluginBase {
         if (\Drupal::moduleHandler()->moduleExists('menu_ui')) {
           $menu_link = 'views_view:views.' . $form_state->get('view')->id() . '.' . $form_state->get('display_id');
           $form['menu']['parent'] = \Drupal::service('menu.parent_form_selector')->parentSelectElement($menu_parent, $menu_link);
-          $form['menu']['parent'] += array(
+          $form['menu']['parent'] += [
             '#title' => $this->t('Parent'),
             '#description' => $this->t('The maximum depth for a link and all its children is fixed. Some menu links may not be available as parents if selecting them would exceed this limit.'),
-            '#attributes' => array('class' => array('menu-title-select')),
-            '#states' => array(
-              'visible' => array(
-                array(
-                  ':input[name="menu[type]"]' => array('value' => 'normal'),
-                ),
-                array(
-                  ':input[name="menu[type]"]' => array('value' => 'tab'),
-                ),
-              ),
-            ),
-          );
+            '#attributes' => ['class' => ['menu-title-select']],
+            '#states' => [
+              'visible' => [
+                [
+                  ':input[name="menu[type]"]' => ['value' => 'normal'],
+                ],
+                [
+                  ':input[name="menu[type]"]' => ['value' => 'tab'],
+                ],
+              ],
+            ],
+          ];
         }
         else {
-          $form['menu']['parent'] = array(
+          $form['menu']['parent'] = [
             '#type' => 'value',
             '#value' => $menu_parent,
-          );
-          $form['menu']['markup'] = array(
+          ];
+          $form['menu']['markup'] = [
             '#markup' => $this->t('Menu selection requires the activation of Menu UI module.'),
-          );
+          ];
         }
-        $form['menu']['weight'] = array(
+        $form['menu']['weight'] = [
           '#title' => $this->t('Weight'),
           '#type' => 'textfield',
           '#default_value' => isset($menu['weight']) ? $menu['weight'] : 0,
           '#description' => $this->t('In the menu, the heavier links will sink and the lighter links will be positioned nearer the top.'),
-          '#states' => array(
-            'visible' => array(
-              array(
-                ':input[name="menu[type]"]' => array('value' => 'normal'),
-              ),
-              array(
-                ':input[name="menu[type]"]' => array('value' => 'tab'),
-              ),
-              array(
-                ':input[name="menu[type]"]' => array('value' => 'default tab'),
-              ),
-            ),
-          ),
-        );
-        $form['menu']['context'] = array(
+          '#states' => [
+            'visible' => [
+              [
+                ':input[name="menu[type]"]' => ['value' => 'normal'],
+              ],
+              [
+                ':input[name="menu[type]"]' => ['value' => 'tab'],
+              ],
+              [
+                ':input[name="menu[type]"]' => ['value' => 'default tab'],
+              ],
+            ],
+          ],
+        ];
+        $form['menu']['context'] = [
           '#title' => $this->t('Context'),
           '#suffix' => '</div>',
           '#type' => 'checkbox',
           '#default_value' => !empty($menu['context']),
           '#description' => $this->t('Displays the link in contextual links'),
-          '#states' => array(
-            'visible' => array(
-              ':input[name="menu[type]"]' => array('value' => 'tab'),
-            ),
-          ),
-        );
+          '#states' => [
+            'visible' => [
+              ':input[name="menu[type]"]' => ['value' => 'tab'],
+            ],
+          ],
+        ];
         break;
       case 'tab_options':
         $form['#title'] .= $this->t('Default tab options');
         $tab_options = $this->getOption('tab_options');
         if (empty($tab_options)) {
-          $tab_options = array('type' => 'none', 'title' => '', 'weight' => 0);
+          $tab_options = ['type' => 'none', 'title' => '', 'weight' => 0];
         }
 
-        $form['tab_markup'] = array(
+        $form['tab_markup'] = [
           '#markup' => '<div class="js-form-item form-item description">' . $this->t('When providing a menu item as a tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is <em>foo/bar/baz</em>, the parent path would be <em>foo/bar</em>.') . '</div>',
-        );
+        ];
 
-        $form['tab_options'] = array(
+        $form['tab_options'] = [
           '#prefix' => '<div class="clearfix">',
           '#suffix' => '</div>',
           '#tree' => TRUE,
-        );
-        $form['tab_options']['type'] = array(
+        ];
+        $form['tab_options']['type'] = [
           '#prefix' => '<div class="views-left-25">',
           '#suffix' => '</div>',
           '#title' => $this->t('Parent menu item'),
           '#type' => 'radios',
-          '#options' => array('none' => $this->t('Already exists'), 'normal' => $this->t('Normal menu item'), 'tab' => $this->t('Menu tab')),
+          '#options' => ['none' => $this->t('Already exists'), 'normal' => $this->t('Normal menu item'), 'tab' => $this->t('Menu tab')],
           '#default_value' => $tab_options['type'],
-        );
-        $form['tab_options']['title'] = array(
+        ];
+        $form['tab_options']['title'] = [
           '#prefix' => '<div class="views-left-75">',
           '#title' => $this->t('Title'),
           '#type' => 'textfield',
           '#default_value' => $tab_options['title'],
           '#description' => $this->t('If creating a parent menu item, enter the title of the item.'),
-          '#states' => array(
-            'visible' => array(
-              array(
-                ':input[name="tab_options[type]"]' => array('value' => 'normal'),
-              ),
-              array(
-                ':input[name="tab_options[type]"]' => array('value' => 'tab'),
-              ),
-            ),
-          ),
-        );
-        $form['tab_options']['description'] = array(
+          '#states' => [
+            'visible' => [
+              [
+                ':input[name="tab_options[type]"]' => ['value' => 'normal'],
+              ],
+              [
+                ':input[name="tab_options[type]"]' => ['value' => 'tab'],
+              ],
+            ],
+          ],
+        ];
+        $form['tab_options']['description'] = [
           '#title' => $this->t('Description'),
           '#type' => 'textfield',
           '#default_value' => $tab_options['description'],
           '#description' => $this->t('If creating a parent menu item, enter the description of the item.'),
-          '#states' => array(
-            'visible' => array(
-              array(
-                ':input[name="tab_options[type]"]' => array('value' => 'normal'),
-              ),
-              array(
-                ':input[name="tab_options[type]"]' => array('value' => 'tab'),
-              ),
-            ),
-          ),
-        );
-        $form['tab_options']['weight'] = array(
+          '#states' => [
+            'visible' => [
+              [
+                ':input[name="tab_options[type]"]' => ['value' => 'normal'],
+              ],
+              [
+                ':input[name="tab_options[type]"]' => ['value' => 'tab'],
+              ],
+            ],
+          ],
+        ];
+        $form['tab_options']['weight'] = [
           '#suffix' => '</div>',
           '#title' => $this->t('Tab weight'),
           '#type' => 'textfield',
           '#default_value' => $tab_options['weight'],
           '#size' => 5,
           '#description' => $this->t('If the parent menu item is a tab, enter the weight of the tab. Heavier tabs will sink and the lighter tabs will be positioned nearer to the first menu item.'),
-          '#states' => array(
-            'visible' => array(
-              ':input[name="tab_options[type]"]' => array('value' => 'tab'),
-            ),
-          ),
-        );
+          '#states' => [
+            'visible' => [
+              ':input[name="tab_options[type]"]' => ['value' => 'tab'],
+            ],
+          ],
+        ];
         break;
     }
   }
@@ -441,7 +441,7 @@ class Page extends PathPluginBase {
 
     if ($form_state->get('section') == 'menu') {
       $path = $this->getOption('path');
-      $menu_type = $form_state->getValue(array('menu', 'type'));
+      $menu_type = $form_state->getValue(['menu', 'type']);
       if ($menu_type == 'normal' && strpos($path, '%') !== FALSE) {
         $form_state->setError($form['menu']['type'], $this->t('Views cannot create normal menu items for paths with a % in them.'));
       }
@@ -454,7 +454,7 @@ class Page extends PathPluginBase {
         }
       }
 
-      if ($menu_type != 'none' && $form_state->isValueEmpty(array('menu', 'title'))) {
+      if ($menu_type != 'none' && $form_state->isValueEmpty(['menu', 'title'])) {
         $form_state->setError($form['menu']['title'], $this->t('Title is required for this menu type.'));
       }
     }
@@ -472,7 +472,7 @@ class Page extends PathPluginBase {
         list($menu['menu_name'], $menu['parent']) = explode(':', $menu['parent'], 2);
         $this->setOption('menu', $menu);
         // send ajax form to options page if we use it.
-        if ($form_state->getValue(array('menu', 'type')) == 'default tab') {
+        if ($form_state->getValue(['menu', 'type']) == 'default tab') {
           $form_state->get('view')->addFormToStack('display', $this->display['id'], 'tab_options');
         }
         break;
@@ -490,13 +490,13 @@ class Page extends PathPluginBase {
 
     $menu = $this->getOption('menu');
     if (!empty($menu['type']) && $menu['type'] != 'none' && empty($menu['title'])) {
-      $errors[] = $this->t('Display @display is set to use a menu but the menu link text is not set.', array('@display' => $this->display['display_title']));
+      $errors[] = $this->t('Display @display is set to use a menu but the menu link text is not set.', ['@display' => $this->display['display_title']]);
     }
 
     if ($menu['type'] == 'default tab') {
       $tab_options = $this->getOption('tab_options');
       if (!empty($tab_options['type']) && $tab_options['type'] != 'none' && empty($tab_options['title'])) {
-        $errors[] = $this->t('Display @display is set to use a parent menu but the parent menu link text is not set.', array('@display' => $this->display['display_title']));
+        $errors[] = $this->t('Display @display is set to use a parent menu but the parent menu link text is not set.', ['@display' => $this->display['display_title']]);
       }
     }
 
@@ -507,21 +507,21 @@ class Page extends PathPluginBase {
    * {@inheritdoc}
    */
   public function getArgumentText() {
-    return array(
+    return [
       'filter value not present' => $this->t('When the filter value is <em>NOT</em> in the URL'),
       'filter value present' => $this->t('When the filter value <em>IS</em> in the URL or a default is provided'),
       'description' => $this->t('The contextual filter values are provided by the URL.'),
-    );
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getPagerText() {
-    return array(
+    return [
       'items per page title' => $this->t('Items per page'),
       'items per page description' => $this->t('Enter 0 for no limit.')
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/display/PathPluginBase.php b/web/core/modules/views/src/Plugin/views/display/PathPluginBase.php
index 966cc1ad4..17d8663ed 100644
--- a/web/core/modules/views/src/Plugin/views/display/PathPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/display/PathPluginBase.php
@@ -109,8 +109,8 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['path'] = array('default' => '');
-    $options['route_name'] = array('default' => '');
+    $options['path'] = ['default' => ''];
+    $options['route_name'] = ['default' => ''];
 
     return $options;
   }
@@ -127,13 +127,13 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
    *   The route for the view.
    */
   protected function getRoute($view_id, $display_id) {
-    $defaults = array(
+    $defaults = [
       '_controller' => 'Drupal\views\Routing\ViewPageController::handle',
       '_title' => $this->view->getTitle(),
       'view_id' => $view_id,
       'display_id' => $display_id,
       '_view_display_show_admin_links' => $this->getOption('show_admin_links'),
-    );
+    ];
 
     // @todo How do we apply argument validation?
     $bits = explode('/', $this->getOption('path'));
@@ -145,7 +145,7 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
     $argument_ids = array_keys((array) $this->getOption('arguments'));
     $total_arguments = count($argument_ids);
 
-    $argument_map = array();
+    $argument_map = [];
 
     // Replace arguments in the views UI (defined via %) with parameters in
     // routes (defined via {}). As a name for the parameter use arg_$key, so
@@ -223,22 +223,65 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
       $route_name = "view.$view_id.$display_id";
     }
     $collection->add($route_name, $route);
-    return array("$view_id.$display_id" => $route_name);
+    return ["$view_id.$display_id" => $route_name];
+  }
+
+  /**
+   * Determines whether the view overrides the given route.
+   *
+   * @param string $view_path
+   *   The path of the view.
+   * @param \Symfony\Component\Routing\Route $view_route
+   *   The route of the view.
+   * @param \Symfony\Component\Routing\Route $route
+   *   The route itself.
+   *
+   * @return bool
+   *   TRUE, when the view should override the given route.
+   */
+  protected function overrideApplies($view_path, Route $view_route, Route $route) {
+    return $this->overrideAppliesPathAndMethod($view_path, $view_route, $route)
+      && (!$route->hasRequirement('_format') || $route->getRequirement('_format') === 'html');
+  }
+
+  /**
+   * Determines whether a override for the path and method should happen.
+   *
+   * @param string $view_path
+   *   The path of the view.
+   * @param \Symfony\Component\Routing\Route $view_route
+   *   The route of the view.
+   * @param \Symfony\Component\Routing\Route $route
+   *   The route itself.
+   *
+   * @return bool
+   *   TRUE, when the view should override the given route.
+   */
+  protected function overrideAppliesPathAndMethod($view_path, Route $view_route, Route $route) {
+    // Find all paths which match the path of the current display..
+    $route_path = RouteCompiler::getPathWithoutDefaults($route);
+    $route_path = RouteCompiler::getPatternOutline($route_path);
+
+    // Ensure that we don't override a route which is already controlled by
+    // views.
+    return !$route->hasDefault('view_id')
+    && ('/' . $view_path == $route_path)
+    // Also ensure that we don't override for example REST routes.
+    && (!$route->getMethods() || in_array('GET', $route->getMethods()));
   }
 
   /**
    * {@inheritdoc}
    */
   public function alterRoutes(RouteCollection $collection) {
-    $view_route_names = array();
+    $view_route_names = [];
     $view_path = $this->getPath();
+    $view_id = $this->view->storage->id();
+    $display_id = $this->display['id'];
+    $view_route = $this->getRoute($view_id, $display_id);
+
     foreach ($collection->all() as $name => $route) {
-      // Find all paths which match the path of the current display..
-      $route_path = RouteCompiler::getPathWithoutDefaults($route);
-      $route_path = RouteCompiler::getPatternOutline($route_path);
-      // Ensure that we don't override a route which is already controlled by
-      // views. Also ensure that we don't override for example REST routes.
-      if (!$route->hasDefault('view_id') && ('/' . $view_path == $route_path) && (!$route->getMethods() || in_array('GET', $route->getMethods()))) {
+      if ($this->overrideApplies($view_path, $view_route, $route)) {
         $parameters = $route->compile()->getPathVariables();
 
         // @todo Figure out whether we need to merge some settings (like
@@ -248,13 +291,9 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
         $original_route = $collection->get($name);
         $collection->remove($name);
 
-        $view_id = $this->view->storage->id();
-        $display_id = $this->display['id'];
-        $route = $this->getRoute($view_id, $display_id);
-
-        $path = $route->getPath();
+        $path = $view_route->getPath();
         // Replace the path with the original parameter names and add a mapping.
-        $argument_map = array();
+        $argument_map = [];
         // We assume that the numeric ids of the parameters match the one from
         // the view argument handlers.
         foreach ($parameters as $position => $parameter_name) {
@@ -263,17 +302,17 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
         }
         // Copy the original options from the route, so for example we ensure
         // that parameter conversion options is carried over.
-        $route->setOptions($route->getOptions() + $original_route->getOptions());
+        $view_route->setOptions($view_route->getOptions() + $original_route->getOptions());
 
         if ($original_route->hasDefault('_title_callback')) {
-          $route->setDefault('_title_callback', $original_route->getDefault('_title_callback'));
+          $view_route->setDefault('_title_callback', $original_route->getDefault('_title_callback'));
         }
 
         // Set the corrected path and the mapping to the route object.
-        $route->setOption('_view_argument_map', $argument_map);
-        $route->setPath($path);
+        $view_route->setOption('_view_argument_map', $argument_map);
+        $view_route->setPath($path);
 
-        $collection->add($name, $route);
+        $collection->add($name, $view_route);
         $view_route_names[$view_id . '.' . $display_id] = $name;
       }
     }
@@ -285,7 +324,7 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
    * {@inheritdoc}
    */
   public function getMenuLinks() {
-    $links = array();
+    $links = [];
 
     // Replace % with the link to our standard views argument loader
     // views_arg_load -- which lives in views.module.
@@ -297,7 +336,7 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
     foreach ($bits as $pos => $bit) {
       if ($bit == '%') {
         // If a view requires any arguments we cannot create a static menu link.
-        return array();
+        return [];
       }
     }
 
@@ -310,15 +349,15 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
     if ($path) {
       $menu = $this->getOption('menu');
       if (!empty($menu['type']) && $menu['type'] == 'normal') {
-        $links[$menu_link_id] = array();
+        $links[$menu_link_id] = [];
         // Some views might override existing paths, so we have to set the route
         // name based upon the altering.
-        $links[$menu_link_id] = array(
+        $links[$menu_link_id] = [
           'route_name' => $this->getRouteName(),
           // Identify URL embedded arguments and correlate them to a handler.
-          'load arguments'  => array($this->view->storage->id(), $this->display['id'], '%index'),
+          'load arguments'  => [$this->view->storage->id(), $this->display['id'], '%index'],
           'id' => $menu_link_id,
-        );
+        ];
         $links[$menu_link_id]['title'] = $menu['title'];
         $links[$menu_link_id]['description'] = $menu['description'];
         $links[$menu_link_id]['parent'] = $menu['parent'];
@@ -332,10 +371,10 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
         // Insert item into the proper menu.
         $links[$menu_link_id]['menu_name'] = $menu['menu_name'];
         // Keep track of where we came from.
-        $links[$menu_link_id]['metadata'] = array(
+        $links[$menu_link_id]['metadata'] = [
           'view_id' => $view_id,
           'display_id' => $display_id,
-        );
+        ];
       }
     }
 
@@ -365,13 +404,13 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
   public function optionsSummary(&$categories, &$options) {
     parent::optionsSummary($categories, $options);
 
-    $categories['page'] = array(
+    $categories['page'] = [
       'title' => $this->t('Page settings'),
       'column' => 'second',
-      'build' => array(
+      'build' => [
         '#weight' => -10,
-      ),
-    );
+      ],
+    ];
 
     $path = strip_tags($this->getOption('path'));
 
@@ -382,11 +421,11 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
       $path = '/' . $path;
     }
 
-    $options['path'] = array(
+    $options['path'] = [
       'category' => 'page',
       'title' => $this->t('Path'),
       'value' => views_ui_truncate($path, 24),
-    );
+    ];
   }
 
   /**
@@ -398,17 +437,17 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
     switch ($form_state->get('section')) {
       case 'path':
         $form['#title'] .= $this->t('The menu path or URL of this view');
-        $form['path'] = array(
+        $form['path'] = [
           '#type' => 'textfield',
           '#title' => $this->t('Path'),
           '#description' => $this->t('This view will be displayed by visiting this path on your site. You may use "%" in your URL to represent values that will be used for contextual filters: For example, "node/%/feed". If needed you can even specify named route parameters like taxonomy/term/%taxonomy_term'),
           '#default_value' => $this->getOption('path'),
           '#field_prefix' => '<span dir="ltr">' . $this->url('<none>', [], ['absolute' => TRUE]),
           '#field_suffix' => '</span>&lrm;',
-          '#attributes' => array('dir' => LanguageInterface::DIRECTION_LTR),
+          '#attributes' => ['dir' => LanguageInterface::DIRECTION_LTR],
           // Account for the leading backslash.
           '#maxlength' => 254,
-        );
+        ];
         break;
     }
   }
@@ -451,7 +490,7 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
    *   A list of error strings.
    */
   protected function validatePath($path) {
-    $errors = array();
+    $errors = [];
     if (strpos($path, '%') === 0) {
       $errors[] = $this->t('"%" may not be used for the first segment of a path.');
     }
@@ -518,7 +557,7 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
    * {@inheritdoc}
    */
   public function getAlteredRouteNames() {
-    return $this->state->get('views.view_route_names') ?: array();
+    return $this->state->get('views.view_route_names') ?: [];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php b/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
index 62cb79c16..fffe084c7 100644
--- a/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -26,13 +26,13 @@ abstract class ExposedFormPluginBase extends PluginBase implements CacheableDepe
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['submit_button'] = array('default' => $this->t('Apply'));
-    $options['reset_button'] = array('default' => FALSE);
-    $options['reset_button_label'] = array('default' => $this->t('Reset'));
-    $options['exposed_sorts_label'] = array('default' => $this->t('Sort by'));
-    $options['expose_sort_order'] = array('default' => TRUE);
-    $options['sort_asc_label'] = array('default' => $this->t('Asc'));
-    $options['sort_desc_label'] = array('default' => $this->t('Desc'));
+    $options['submit_button'] = ['default' => $this->t('Apply')];
+    $options['reset_button'] = ['default' => FALSE];
+    $options['reset_button_label'] = ['default' => $this->t('Reset')];
+    $options['exposed_sorts_label'] = ['default' => $this->t('Sort by')];
+    $options['expose_sort_order'] = ['default' => TRUE];
+    $options['sort_asc_label'] = ['default' => $this->t('Asc')];
+    $options['sort_desc_label'] = ['default' => $this->t('Desc')];
     return $options;
   }
 
@@ -41,69 +41,69 @@ abstract class ExposedFormPluginBase extends PluginBase implements CacheableDepe
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['submit_button'] = array(
+    $form['submit_button'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Submit button text'),
       '#default_value' => $this->options['submit_button'],
       '#required' => TRUE,
-    );
+    ];
 
-    $form['reset_button'] = array(
+    $form['reset_button'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Include reset button (resets all applied exposed filters)'),
       '#default_value' => $this->options['reset_button'],
-    );
+    ];
 
-    $form['reset_button_label'] = array(
+    $form['reset_button_label'] = [
      '#type' => 'textfield',
       '#title' => $this->t('Reset button label'),
       '#description' => $this->t('Text to display in the reset button of the exposed form.'),
       '#default_value' => $this->options['reset_button_label'],
       '#required' => TRUE,
-      '#states' => array(
-        'invisible' => array(
-          'input[name="exposed_form_options[reset_button]"]' => array('checked' => FALSE),
-        ),
-      ),
-    );
+      '#states' => [
+        'invisible' => [
+          'input[name="exposed_form_options[reset_button]"]' => ['checked' => FALSE],
+        ],
+      ],
+    ];
 
-    $form['exposed_sorts_label'] = array(
+    $form['exposed_sorts_label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Exposed sorts label'),
       '#default_value' => $this->options['exposed_sorts_label'],
       '#required' => TRUE,
-    );
+    ];
 
-    $form['expose_sort_order'] = array(
+    $form['expose_sort_order'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow people to choose the sort order'),
       '#description' => $this->t('If sort order is not exposed, the sort criteria settings for each sort will determine its order.'),
       '#default_value' => $this->options['expose_sort_order'],
-    );
+    ];
 
-    $form['sort_asc_label'] = array(
+    $form['sort_asc_label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label for ascending sort'),
       '#default_value' => $this->options['sort_asc_label'],
       '#required' => TRUE,
-      '#states' => array(
-        'visible' => array(
-          'input[name="exposed_form_options[expose_sort_order]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          'input[name="exposed_form_options[expose_sort_order]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
-    $form['sort_desc_label'] = array(
+    $form['sort_desc_label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label for descending sort'),
       '#default_value' => $this->options['sort_desc_label'],
       '#required' => TRUE,
-      '#states' => array(
-        'visible' => array(
-          'input[name="exposed_form_options[expose_sort_order]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          'input[name="exposed_form_options[expose_sort_order]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
   }
 
   /**
@@ -133,9 +133,15 @@ abstract class ExposedFormPluginBase extends PluginBase implements CacheableDepe
     }
 
     $form = \Drupal::formBuilder()->buildForm('\Drupal\views\Form\ViewsExposedForm', $form_state);
+    $errors = $form_state->getErrors();
+
+    // If the exposed form had errors, do not build the view.
+    if (!empty($errors)) {
+      $this->view->build_info['abort'] = TRUE;
+    }
 
     if (!$this->view->display_handler->displaysExposed() || (!$block && $this->view->display_handler->getOption('exposed_block'))) {
-      return array();
+      return [];
     }
     else {
       return $form;
@@ -147,19 +153,19 @@ abstract class ExposedFormPluginBase extends PluginBase implements CacheableDepe
    */
   public function query() {
     $view = $this->view;
-    $exposed_data = isset($view->exposed_data) ? $view->exposed_data : array();
+    $exposed_data = isset($view->exposed_data) ? $view->exposed_data : [];
     $sort_by = isset($exposed_data['sort_by']) ? $exposed_data['sort_by'] : NULL;
     if (!empty($sort_by)) {
       // Make sure the original order of sorts is preserved
       // (e.g. a sticky sort is often first)
       if (isset($view->sort[$sort_by])) {
-        $view->query->orderby = array();
+        $view->query->orderby = [];
         foreach ($view->sort as $key => $sort) {
           if (!$sort->isExposed()) {
             $sort->query();
           }
           elseif ($key == $sort_by) {
-            if (isset($exposed_data['sort_order']) && in_array($exposed_data['sort_order'], array('ASC', 'DESC'))) {
+            if (isset($exposed_data['sort_order']) && in_array($exposed_data['sort_order'], ['ASC', 'DESC'])) {
               $sort->options['order'] = $exposed_data['sort_order'];
             }
             $sort->setRelationship();
@@ -199,7 +205,7 @@ abstract class ExposedFormPluginBase extends PluginBase implements CacheableDepe
     }
 
     // Check if there is exposed sorts for this view
-    $exposed_sorts = array();
+    $exposed_sorts = [];
     foreach ($this->view->sort as $id => $handler) {
       if ($handler->canExpose() && $handler->isExposed()) {
         $exposed_sorts[$id] = Html::escape($handler->options['expose']['label']);
@@ -207,15 +213,15 @@ abstract class ExposedFormPluginBase extends PluginBase implements CacheableDepe
     }
 
     if (count($exposed_sorts)) {
-      $form['sort_by'] = array(
+      $form['sort_by'] = [
         '#type' => 'select',
         '#options' => $exposed_sorts,
         '#title' => $this->options['exposed_sorts_label'],
-      );
-      $sort_order = array(
+      ];
+      $sort_order = [
         'ASC' => $this->options['sort_asc_label'],
         'DESC' => $this->options['sort_desc_label'],
-      );
+      ];
       $user_input = $form_state->getUserInput();
       if (isset($user_input['sort_by']) && isset($this->view->sort[$user_input['sort_by']])) {
         $default_sort_order = $this->view->sort[$user_input['sort_by']]->options['order'];
@@ -232,22 +238,22 @@ abstract class ExposedFormPluginBase extends PluginBase implements CacheableDepe
       }
 
       if ($this->options['expose_sort_order']) {
-        $form['sort_order'] = array(
+        $form['sort_order'] = [
           '#type' => 'select',
           '#options' => $sort_order,
-          '#title' => $this->t('Order', array(), array('context' => 'Sort order')),
+          '#title' => $this->t('Order', [], ['context' => 'Sort order']),
           '#default_value' => $default_sort_order,
-        );
+        ];
       }
       $form['submit']['#weight'] = 10;
     }
 
     if (!empty($this->options['reset_button'])) {
-      $form['actions']['reset'] = array(
+      $form['actions']['reset'] = [
         '#value' => $this->options['reset_button_label'],
         '#type' => 'submit',
         '#weight' => 10,
-      );
+      ];
 
       // Get an array of exposed filters, keyed by identifier option.
       $exposed_filters = [];
@@ -323,7 +329,7 @@ abstract class ExposedFormPluginBase extends PluginBase implements CacheableDepe
     }
     else {
       $form_state->setRebuild();
-      $this->view->exposed_data = array();
+      $this->view->exposed_data = [];
     }
 
     $form_state->setRedirect('<current>');
diff --git a/web/core/modules/views/src/Plugin/views/exposed_form/InputRequired.php b/web/core/modules/views/src/Plugin/views/exposed_form/InputRequired.php
index 8b885978d..38a528360 100644
--- a/web/core/modules/views/src/Plugin/views/exposed_form/InputRequired.php
+++ b/web/core/modules/views/src/Plugin/views/exposed_form/InputRequired.php
@@ -21,28 +21,28 @@ class InputRequired extends ExposedFormPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['text_input_required'] = array('default' => $this->t('Select any filter and click on Apply to see results'));
-    $options['text_input_required_format'] = array('default' => NULL);
+    $options['text_input_required'] = ['default' => $this->t('Select any filter and click on Apply to see results')];
+    $options['text_input_required_format'] = ['default' => NULL];
     return $options;
   }
 
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['text_input_required'] = array(
+    $form['text_input_required'] = [
       '#type' => 'text_format',
       '#title' => $this->t('Text on demand'),
       '#description' => $this->t('Text to display instead of results until the user selects and applies an exposed filter.'),
       '#default_value' => $this->options['text_input_required'],
       '#format' => isset($this->options['text_input_required_format']) ? $this->options['text_input_required_format'] : filter_default_format(),
       '#editor' => FALSE,
-    );
+    ];
   }
 
   public function submitOptionsForm(&$form, FormStateInterface $form_state) {
     $exposed_form_options = $form_state->getValue('exposed_form_options');
-    $form_state->setValue(array('exposed_form_options', 'text_input_required_format'), $exposed_form_options['text_input_required']['format']);
-    $form_state->setValue(array('exposed_form_options', 'text_input_required'), $exposed_form_options['text_input_required']['value']);
+    $form_state->setValue(['exposed_form_options', 'text_input_required_format'], $exposed_form_options['text_input_required']['format']);
+    $form_state->setValue(['exposed_form_options', 'text_input_required'], $exposed_form_options['text_input_required']['value']);
     parent::submitOptionsForm($form, $form_state);
   }
 
@@ -72,7 +72,7 @@ class InputRequired extends ExposedFormPluginBase {
     // text to display instead of results until the user selects and applies
     // an exposed filter.
     if (!$this->exposedFilterApplied()) {
-      $options = array(
+      $options = [
         'id' => 'area',
         'table' => 'views',
         'field' => 'area',
@@ -88,14 +88,14 @@ class InputRequired extends ExposedFormPluginBase {
           'value' => $this->options['text_input_required'],
           'format' => $this->options['text_input_required_format'],
         ],
-      );
+      ];
       $handler = Views::handlerManager('area')->getHandler($options);
       $handler->init($this->view, $this->displayHandler, $options);
-      $this->displayHandler->handlers['empty'] = array(
+      $this->displayHandler->handlers['empty'] = [
         'area' => $handler,
-      );
+      ];
       // Override the existing empty result message (if applicable).
-      $this->displayHandler->setOption('empty', array('text' => $options));
+      $this->displayHandler->setOption('empty', ['text' => $options]);
     }
   }
 
@@ -104,7 +104,7 @@ class InputRequired extends ExposedFormPluginBase {
       // We return with no query; this will force the empty text.
       $this->view->built = TRUE;
       $this->view->executed = TRUE;
-      $this->view->result = array();
+      $this->view->result = [];
     }
     else {
       parent::query();
diff --git a/web/core/modules/views/src/Plugin/views/field/Boolean.php b/web/core/modules/views/src/Plugin/views/field/Boolean.php
index 59d3b292f..75f097e13 100644
--- a/web/core/modules/views/src/Plugin/views/field/Boolean.php
+++ b/web/core/modules/views/src/Plugin/views/field/Boolean.php
@@ -34,10 +34,10 @@ class Boolean extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['type'] = array('default' => 'yes-no');
-    $options['type_custom_true'] = array('default' => '');
-    $options['type_custom_false'] = array('default' => '');
-    $options['not'] = array('default' => FALSE);
+    $options['type'] = ['default' => 'yes-no'];
+    $options['type_custom_true'] = ['default' => ''];
+    $options['type_custom_false'] = ['default' => ''];
+    $options['not'] = ['default' => FALSE];
 
     return $options;
   }
@@ -48,16 +48,16 @@ class Boolean extends FieldPluginBase {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $default_formats = array(
-      'yes-no' => array(t('Yes'), $this->t('No')),
-      'true-false' => array(t('True'), $this->t('False')),
-      'on-off' => array(t('On'), $this->t('Off')),
-      'enabled-disabled' => array(t('Enabled'), $this->t('Disabled')),
-      'boolean' => array(1, 0),
-      'unicode-yes-no' => array('✔', '✖'),
-    );
-    $output_formats = isset($this->definition['output formats']) ? $this->definition['output formats'] : array();
-    $custom_format = array('custom' => array(t('Custom')));
+    $default_formats = [
+      'yes-no' => [t('Yes'), $this->t('No')],
+      'true-false' => [t('True'), $this->t('False')],
+      'on-off' => [t('On'), $this->t('Off')],
+      'enabled-disabled' => [t('Enabled'), $this->t('Disabled')],
+      'boolean' => [1, 0],
+      'unicode-yes-no' => ['✔', '✖'],
+    ];
+    $output_formats = isset($this->definition['output formats']) ? $this->definition['output formats'] : [];
+    $custom_format = ['custom' => [t('Custom')]];
     $this->formats = array_merge($default_formats, $output_formats, $custom_format);
   }
 
@@ -69,38 +69,38 @@ class Boolean extends FieldPluginBase {
       $options[$key] = implode('/', $item);
     }
 
-    $form['type'] = array(
+    $form['type'] = [
       '#type' => 'select',
       '#title' => $this->t('Output format'),
       '#options' => $options,
       '#default_value' => $this->options['type'],
-    );
-    $form['type_custom_true'] = array(
+    ];
+    $form['type_custom_true'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Custom output for TRUE'),
       '#default_value' => $this->options['type_custom_true'],
-      '#states' => array(
-        'visible' => array(
-          'select[name="options[type]"]' => array('value' => 'custom'),
-        ),
-      ),
-    );
-    $form['type_custom_false'] = array(
+      '#states' => [
+        'visible' => [
+          'select[name="options[type]"]' => ['value' => 'custom'],
+        ],
+      ],
+    ];
+    $form['type_custom_false'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Custom output for FALSE'),
       '#default_value' => $this->options['type_custom_false'],
-      '#states' => array(
-        'visible' => array(
-          'select[name="options[type]"]' => array('value' => 'custom'),
-        ),
-      ),
-    );
-    $form['not'] = array(
+      '#states' => [
+        'visible' => [
+          'select[name="options[type]"]' => ['value' => 'custom'],
+        ],
+      ],
+    ];
+    $form['not'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Reverse'),
       '#description' => $this->t('If checked, true will be displayed as false.'),
       '#default_value' => $this->options['not'],
-    );
+    ];
     parent::buildOptionsForm($form, $form_state);
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/field/Counter.php b/web/core/modules/views/src/Plugin/views/field/Counter.php
index 06d9b5616..d32e5e754 100644
--- a/web/core/modules/views/src/Plugin/views/field/Counter.php
+++ b/web/core/modules/views/src/Plugin/views/field/Counter.php
@@ -28,7 +28,7 @@ class Counter extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['counter_start'] = array('default' => 1);
+    $options['counter_start'] = ['default' => 1];
     return $options;
   }
 
@@ -36,13 +36,13 @@ class Counter extends FieldPluginBase {
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['counter_start'] = array(
+    $form['counter_start'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Starting value'),
       '#default_value' => $this->options['counter_start'],
       '#description' => $this->t('Specify the number the counter should start at.'),
       '#size' => 2,
-    );
+    ];
 
     parent::buildOptionsForm($form, $form_state);
   }
diff --git a/web/core/modules/views/src/Plugin/views/field/Custom.php b/web/core/modules/views/src/Plugin/views/field/Custom.php
index 19552b223..6dfa8ac15 100644
--- a/web/core/modules/views/src/Plugin/views/field/Custom.php
+++ b/web/core/modules/views/src/Plugin/views/field/Custom.php
@@ -37,8 +37,8 @@ class Custom extends FieldPluginBase {
     $options = parent::defineOptions();
 
     // Override the alter text option to always alter the text.
-    $options['alter']['contains']['alter_text'] = array('default' => TRUE);
-    $options['hide_alter_empty'] = array('default' => FALSE);
+    $options['alter']['contains']['alter_text'] = ['default' => TRUE];
+    $options['hide_alter_empty'] = ['default' => FALSE];
     return $options;
   }
 
@@ -52,7 +52,7 @@ class Custom extends FieldPluginBase {
     unset($form['alter']['alter_text']);
     unset($form['alter']['text']['#states']);
     unset($form['alter']['help']['#states']);
-    $form['#pre_render'][] = array($this, 'preRenderCustomForm');
+    $form['#pre_render'][] = [$this, 'preRenderCustomForm'];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/field/Date.php b/web/core/modules/views/src/Plugin/views/field/Date.php
index f5a5204b1..37455cc78 100644
--- a/web/core/modules/views/src/Plugin/views/field/Date.php
+++ b/web/core/modules/views/src/Plugin/views/field/Date.php
@@ -71,9 +71,9 @@ class Date extends FieldPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['date_format'] = array('default' => 'small');
-    $options['custom_date_format'] = array('default' => '');
-    $options['timezone'] = array('default' => '');
+    $options['date_format'] = ['default' => 'small'];
+    $options['custom_date_format'] = ['default' => ''];
+    $options['timezone'] = ['default' => ''];
 
     return $options;
   }
@@ -83,15 +83,15 @@ class Date extends FieldPluginBase {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
 
-    $date_formats = array();
+    $date_formats = [];
     foreach ($this->dateFormatStorage->loadMultiple() as $machine_name => $value) {
-      $date_formats[$machine_name] = $this->t('@name format: @date', array('@name' => $value->label(), '@date' => $this->dateFormatter->format(REQUEST_TIME, $machine_name)));
+      $date_formats[$machine_name] = $this->t('@name format: @date', ['@name' => $value->label(), '@date' => $this->dateFormatter->format(REQUEST_TIME, $machine_name)]);
     }
 
-    $form['date_format'] = array(
+    $form['date_format'] = [
       '#type' => 'select',
       '#title' => $this->t('Date format'),
-      '#options' => $date_formats + array(
+      '#options' => $date_formats + [
         'custom' => $this->t('Custom'),
         'raw time ago' => $this->t('Time ago'),
         'time ago' => $this->t('Time ago (with "ago" appended)'),
@@ -100,32 +100,32 @@ class Date extends FieldPluginBase {
         'raw time span' => $this->t('Time span (future dates have "-" prepended)'),
         'inverse time span' => $this->t('Time span (past dates have "-" prepended)'),
         'time span' => $this->t('Time span (with "ago/hence" appended)'),
-      ),
+      ],
       '#default_value' => isset($this->options['date_format']) ? $this->options['date_format'] : 'small',
-    );
-    $form['custom_date_format'] = array(
+    ];
+    $form['custom_date_format'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Custom date format'),
       '#description' => $this->t('If "Custom", see <a href="http://us.php.net/manual/en/function.date.php" target="_blank">the PHP docs</a> for date formats. Otherwise, enter the number of different time units to display, which defaults to 2.'),
       '#default_value' => isset($this->options['custom_date_format']) ? $this->options['custom_date_format'] : '',
-    );
+    ];
     // Setup #states for all possible date_formats on the custom_date_format form element.
-    foreach (array('custom', 'raw time ago', 'time ago', 'raw time hence', 'time hence', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span') as $custom_date_possible) {
-      $form['custom_date_format']['#states']['visible'][] = array(
-        ':input[name="options[date_format]"]' => array('value' => $custom_date_possible),
-      );
+    foreach (['custom', 'raw time ago', 'time ago', 'raw time hence', 'time hence', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span'] as $custom_date_possible) {
+      $form['custom_date_format']['#states']['visible'][] = [
+        ':input[name="options[date_format]"]' => ['value' => $custom_date_possible],
+      ];
     }
-    $form['timezone'] = array(
+    $form['timezone'] = [
       '#type' => 'select',
       '#title' => $this->t('Timezone'),
       '#description' => $this->t('Timezone to be used for date output.'),
-      '#options' => array('' => $this->t('- Default site/user timezone -')) + system_time_zones(FALSE),
+      '#options' => ['' => $this->t('- Default site/user timezone -')] + system_time_zones(FALSE),
       '#default_value' => $this->options['timezone'],
-    );
-    foreach (array_merge(array('custom'), array_keys($date_formats)) as $timezone_date_formats) {
-      $form['timezone']['#states']['visible'][] = array(
-        ':input[name="options[date_format]"]' => array('value' => $timezone_date_formats),
-      );
+    ];
+    foreach (array_merge(['custom'], array_keys($date_formats)) as $timezone_date_formats) {
+      $form['timezone']['#states']['visible'][] = [
+        ':input[name="options[date_format]"]' => ['value' => $timezone_date_formats],
+      ];
     }
 
     parent::buildOptionsForm($form, $form_state);
@@ -137,7 +137,7 @@ class Date extends FieldPluginBase {
   public function render(ResultRow $values) {
     $value = $this->getValue($values);
     $format = $this->options['date_format'];
-    if (in_array($format, array('custom', 'raw time ago', 'time ago', 'raw time hence', 'time hence', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span'))) {
+    if (in_array($format, ['custom', 'raw time ago', 'time ago', 'raw time hence', 'time hence', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span'])) {
       $custom_format = $this->options['custom_date_format'];
     }
 
@@ -146,26 +146,26 @@ class Date extends FieldPluginBase {
       $time_diff = REQUEST_TIME - $value; // will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence)
       switch ($format) {
         case 'raw time ago':
-          return $this->dateFormatter->formatTimeDiffSince($value, array('granularity' => is_numeric($custom_format) ? $custom_format : 2));
+          return $this->dateFormatter->formatTimeDiffSince($value, ['granularity' => is_numeric($custom_format) ? $custom_format : 2]);
 
         case 'time ago':
-          return $this->t('%time ago', array('%time' => $this->dateFormatter->formatTimeDiffSince($value, array('granularity' => is_numeric($custom_format) ? $custom_format : 2))));
+          return $this->t('%time ago', ['%time' => $this->dateFormatter->formatTimeDiffSince($value, ['granularity' => is_numeric($custom_format) ? $custom_format : 2])]);
 
         case 'raw time hence':
-          return $this->dateFormatter->formatTimeDiffUntil($value, array('granularity' => is_numeric($custom_format) ? $custom_format : 2));
+          return $this->dateFormatter->formatTimeDiffUntil($value, ['granularity' => is_numeric($custom_format) ? $custom_format : 2]);
 
         case 'time hence':
-          return $this->t('%time hence', array('%time' => $this->dateFormatter->formatTimeDiffUntil($value, array('granularity' => is_numeric($custom_format) ? $custom_format : 2))));
+          return $this->t('%time hence', ['%time' => $this->dateFormatter->formatTimeDiffUntil($value, ['granularity' => is_numeric($custom_format) ? $custom_format : 2])]);
 
         case 'raw time span':
-          return ($time_diff < 0 ? '-' : '') . $this->dateFormatter->formatTimeDiffSince($value, array('strict' => FALSE, 'granularity' => is_numeric($custom_format) ? $custom_format : 2));
+          return ($time_diff < 0 ? '-' : '') . $this->dateFormatter->formatTimeDiffSince($value, ['strict' => FALSE, 'granularity' => is_numeric($custom_format) ? $custom_format : 2]);
 
         case 'inverse time span':
-          return ($time_diff > 0 ? '-' : '') . $this->dateFormatter->formatTimeDiffSince($value, array('strict' => FALSE, 'granularity' => is_numeric($custom_format) ? $custom_format : 2));
+          return ($time_diff > 0 ? '-' : '') . $this->dateFormatter->formatTimeDiffSince($value, ['strict' => FALSE, 'granularity' => is_numeric($custom_format) ? $custom_format : 2]);
 
         case 'time span':
-          $time = $this->dateFormatter->formatTimeDiffSince($value, array('strict' => FALSE, 'granularity' => is_numeric($custom_format) ? $custom_format : 2));
-          return ($time_diff < 0) ? $this->t('%time hence', array('%time' => $time)) : $this->t('%time ago', array('%time' => $time));
+          $time = $this->dateFormatter->formatTimeDiffSince($value, ['strict' => FALSE, 'granularity' => is_numeric($custom_format) ? $custom_format : 2]);
+          return ($time_diff < 0) ? $this->t('%time hence', ['%time' => $time]) : $this->t('%time ago', ['%time' => $time]);
 
         case 'custom':
           if ($custom_format == 'r') {
diff --git a/web/core/modules/views/src/Plugin/views/field/Dropbutton.php b/web/core/modules/views/src/Plugin/views/field/Dropbutton.php
index f5cf4d345..b5a9b60dc 100644
--- a/web/core/modules/views/src/Plugin/views/field/Dropbutton.php
+++ b/web/core/modules/views/src/Plugin/views/field/Dropbutton.php
@@ -20,10 +20,10 @@ class Dropbutton extends Links {
     $links = $this->getLinks();
 
     if (!empty($links)) {
-      return array(
+      return [
         '#type' => 'dropbutton',
         '#links' => $links,
-      );
+      ];
     }
     else {
       return '';
diff --git a/web/core/modules/views/src/Plugin/views/field/EntityField.php b/web/core/modules/views/src/Plugin/views/field/EntityField.php
new file mode 100644
index 000000000..5ee05a24d
--- /dev/null
+++ b/web/core/modules/views/src/Plugin/views/field/EntityField.php
@@ -0,0 +1,1080 @@
+<?php
+
+namespace Drupal\views\Plugin\views\field;
+
+use Drupal\Component\Plugin\DependentPluginInterface;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\Field\FormatterPluginManager;
+use Drupal\Core\Form\FormHelper;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\Core\Plugin\PluginDependencyTrait;
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\Core\Render\Element;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\TypedData\TypedDataInterface;
+use Drupal\views\FieldAPIHandlerTrait;
+use Drupal\views\Entity\Render\EntityFieldRenderer;
+use Drupal\views\Plugin\views\display\DisplayPluginBase;
+use Drupal\views\ResultRow;
+use Drupal\views\ViewExecutable;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * A field that displays entity field data.
+ *
+ * @ingroup views_field_handlers
+ *
+ * @ViewsField("field")
+ */
+class EntityField extends FieldPluginBase implements CacheableDependencyInterface, MultiItemsFieldHandlerInterface {
+
+  use FieldAPIHandlerTrait;
+  use PluginDependencyTrait;
+
+  /**
+   * An array to store field renderable arrays for use by renderItems().
+   *
+   * @var array
+   */
+  public $items = [];
+
+  /**
+   * Does the field supports multiple field values.
+   *
+   * @var bool
+   */
+  public $multiple;
+
+  /**
+   * Does the rendered fields get limited.
+   *
+   * @var bool
+   */
+  public $limit_values;
+
+  /**
+   * A shortcut for $view->base_table.
+   *
+   * @var string
+   */
+  public $base_table;
+
+  /**
+   * An array of formatter options.
+   *
+   * @var array
+   */
+  protected $formatterOptions;
+
+  /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface
+   */
+  protected $entityManager;
+
+  /**
+   * The field formatter plugin manager.
+   *
+   * @var \Drupal\Core\Field\FormatterPluginManager
+   */
+  protected $formatterPluginManager;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * The field type plugin manager.
+   *
+   * @var \Drupal\Core\Field\FieldTypePluginManagerInterface
+   */
+  protected $fieldTypePluginManager;
+
+  /**
+   * Static cache for ::getEntityFieldRenderer().
+   *
+   * @var \Drupal\views\Entity\Render\EntityFieldRenderer
+   */
+  protected $entityFieldRenderer;
+
+  /**
+   * Constructs a \Drupal\field\Plugin\views\field\Field object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   *   The field formatter plugin manager.
+   * @param \Drupal\Core\Field\FormatterPluginManager $formatter_plugin_manager
+   *   The field formatter plugin manager.
+   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_plugin_manager
+   *   The field plugin type manager.
+   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   *   The language manager.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, FormatterPluginManager $formatter_plugin_manager, FieldTypePluginManagerInterface $field_type_plugin_manager, LanguageManagerInterface $language_manager, RendererInterface $renderer) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+
+    $this->entityManager = $entity_manager;
+    $this->formatterPluginManager = $formatter_plugin_manager;
+    $this->fieldTypePluginManager = $field_type_plugin_manager;
+    $this->languageManager = $language_manager;
+    $this->renderer = $renderer;
+
+    // @todo Unify 'entity field'/'field_name' instead of converting back and
+    //   forth. https://www.drupal.org/node/2410779
+    if (isset($this->definition['entity field'])) {
+      $this->definition['field_name'] = $this->definition['entity field'];
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity.manager'),
+      $container->get('plugin.manager.field.formatter'),
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('language_manager'),
+      $container->get('renderer')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
+    parent::init($view, $display, $options);
+
+    $this->multiple = FALSE;
+    $this->limit_values = FALSE;
+
+    $field_definition = $this->getFieldDefinition();
+    $cardinality = $field_definition->getFieldStorageDefinition()->getCardinality();
+    if ($field_definition->getFieldStorageDefinition()->isMultiple()) {
+      $this->multiple = TRUE;
+
+      // If "Display all values in the same row" is FALSE, then we always limit
+      // in order to show a single unique value per row.
+      if (!$this->options['group_rows']) {
+        $this->limit_values = TRUE;
+      }
+
+      // If "First and last only" is chosen, limit the values
+      if (!empty($this->options['delta_first_last'])) {
+        $this->limit_values = TRUE;
+      }
+
+      // Otherwise, we only limit values if the user hasn't selected "all", 0, or
+      // the value matching field cardinality.
+      if ((($this->options['delta_limit'] > 0) && ($this->options['delta_limit'] != $cardinality)) || intval($this->options['delta_offset'])) {
+        $this->limit_values = TRUE;
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityManager() {
+    return $this->entityManager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function access(AccountInterface $account) {
+    $access_control_handler = $this->entityManager->getAccessControlHandler($this->getEntityType());
+    return $access_control_handler->fieldAccess('view', $this->getFieldDefinition(), $account);
+  }
+
+  /**
+   * Called to add the field to a query.
+   *
+   * By default, all needed data is taken from entities loaded by the query
+   * plugin. Columns are added only if they are used in groupings.
+   */
+  public function query($use_groupby = FALSE) {
+    $fields = $this->additional_fields;
+    // No need to add the entity type.
+    $entity_type_key = array_search('entity_type', $fields);
+    if ($entity_type_key !== FALSE) {
+      unset($fields[$entity_type_key]);
+    }
+
+    if ($use_groupby) {
+      // Add the fields that we're actually grouping on.
+      $options = [];
+      if ($this->options['group_column'] != 'entity_id') {
+        $options = [$this->options['group_column'] => $this->options['group_column']];
+      }
+      $options += is_array($this->options['group_columns']) ? $this->options['group_columns'] : [];
+
+      // Go through the list and determine the actual column name from field api.
+      $fields = [];
+      $table_mapping = $this->getTableMapping();
+      $field_definition = $this->getFieldStorageDefinition();
+
+      foreach ($options as $column) {
+        $fields[$column] = $table_mapping->getFieldColumnName($field_definition, $column);
+      }
+
+      $this->group_fields = $fields;
+    }
+
+    // Add additional fields (and the table join itself) if needed.
+    if ($this->add_field_table($use_groupby)) {
+      $this->ensureMyTable();
+      $this->addAdditionalFields($fields);
+    }
+
+    // Let the entity field renderer alter the query if needed.
+    $this->getEntityFieldRenderer()->query($this->query, $this->relationship);
+  }
+
+  /**
+   * Determine if the field table should be added to the query.
+   */
+  public function add_field_table($use_groupby) {
+    // Grouping is enabled.
+    if ($use_groupby) {
+      return TRUE;
+    }
+    // This a multiple value field, but "group multiple values" is not checked.
+    if ($this->multiple && !$this->options['group_rows']) {
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function clickSortable() {
+    // A field is not click sortable if it's a multiple field with
+    // "group multiple values" checked, since a click sort in that case would
+    // add a join to the field table, which would produce unwanted duplicates.
+    if ($this->multiple && $this->options['group_rows']) {
+      return FALSE;
+    }
+
+    // If field definition is set, use that.
+    if (isset($this->definition['click sortable'])) {
+      return (bool) $this->definition['click sortable'];
+    }
+
+    // Default to true.
+    return TRUE;
+  }
+
+  /**
+   * Called to determine what to tell the clicksorter.
+   */
+  public function clickSort($order) {
+    // No column selected, can't continue.
+    if (empty($this->options['click_sort_column'])) {
+      return;
+    }
+
+    $this->ensureMyTable();
+    $field_storage_definition = $this->getFieldStorageDefinition();
+    $column = $this->getTableMapping()->getFieldColumnName($field_storage_definition, $this->options['click_sort_column']);
+    if (!isset($this->aliases[$column])) {
+      // Column is not in query; add a sort on it (without adding the column).
+      $this->aliases[$column] = $this->tableAlias . '.' . $column;
+    }
+    $this->query->addOrderBy(NULL, NULL, $order, $this->aliases[$column]);
+  }
+
+  /**
+   * Gets the field storage of the used field.
+   *
+   * @return \Drupal\Core\Field\FieldStorageDefinitionInterface
+   */
+  protected function getFieldStorageDefinition() {
+    $entity_type_id = $this->definition['entity_type'];
+    $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
+
+    $field_storage = NULL;
+    // @todo Unify 'entity field'/'field_name' instead of converting back and
+    //   forth. https://www.drupal.org/node/2410779
+    if (isset($this->definition['field_name'])) {
+      $field_storage = $field_storage_definitions[$this->definition['field_name']];
+    }
+    elseif (isset($this->definition['entity field'])) {
+      $field_storage = $field_storage_definitions[$this->definition['entity field']];
+    }
+    return $field_storage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function defineOptions() {
+    $options = parent::defineOptions();
+
+    $field_storage_definition = $this->getFieldStorageDefinition();
+    $field_type = $this->fieldTypePluginManager->getDefinition($field_storage_definition->getType());
+    $column_names = array_keys($field_storage_definition->getColumns());
+    $default_column = '';
+    // Try to determine a sensible default.
+    if (count($column_names) == 1) {
+      $default_column = $column_names[0];
+    }
+    elseif (in_array('value', $column_names)) {
+      $default_column = 'value';
+    }
+
+    // If the field has a "value" column, we probably need that one.
+    $options['click_sort_column'] = [
+      'default' => $default_column,
+    ];
+
+    if (isset($this->definition['default_formatter'])) {
+      $options['type'] = ['default' => $this->definition['default_formatter']];
+    }
+    elseif (isset($field_type['default_formatter'])) {
+      $options['type'] = ['default' => $field_type['default_formatter']];
+    }
+    else {
+      $options['type'] = ['default' => ''];
+    }
+
+    $options['settings'] = [
+      'default' => isset($this->definition['default_formatter_settings']) ? $this->definition['default_formatter_settings'] : [],
+    ];
+    $options['group_column'] = [
+      'default' => $default_column,
+    ];
+    $options['group_columns'] = [
+      'default' => [],
+    ];
+
+    // Options used for multiple value fields.
+    $options['group_rows'] = [
+      'default' => TRUE,
+    ];
+    // If we know the exact number of allowed values, then that can be
+    // the default. Otherwise, default to 'all'.
+    $options['delta_limit'] = [
+      'default' => ($field_storage_definition->getCardinality() > 1) ? $field_storage_definition->getCardinality() : 0,
+    ];
+    $options['delta_offset'] = [
+      'default' => 0,
+    ];
+    $options['delta_reversed'] = [
+      'default' => FALSE,
+    ];
+    $options['delta_first_last'] = [
+      'default' => FALSE,
+    ];
+
+    $options['multi_type'] = [
+      'default' => 'separator'
+    ];
+    $options['separator'] = [
+      'default' => ', '
+    ];
+
+    $options['field_api_classes'] = [
+      'default' => FALSE,
+    ];
+
+    return $options;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
+    parent::buildOptionsForm($form, $form_state);
+
+    $field = $this->getFieldDefinition();
+    $formatters = $this->formatterPluginManager->getOptions($field->getType());
+    $column_names = array_keys($field->getColumns());
+
+    // If this is a multiple value field, add its options.
+    if ($this->multiple) {
+      $this->multiple_options_form($form, $form_state);
+    }
+
+    // No need to ask the user anything if the field has only one column.
+    if (count($field->getColumns()) == 1) {
+      $form['click_sort_column'] = [
+        '#type' => 'value',
+        '#value' => isset($column_names[0]) ? $column_names[0] : '',
+      ];
+    }
+    else {
+      $form['click_sort_column'] = [
+        '#type' => 'select',
+        '#title' => $this->t('Column used for click sorting'),
+        '#options' => array_combine($column_names, $column_names),
+        '#default_value' => $this->options['click_sort_column'],
+        '#description' => $this->t('Used by Style: Table to determine the actual column to click sort the field on. The default is usually fine.'),
+      ];
+    }
+
+    $form['type'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Formatter'),
+      '#options' => $formatters,
+      '#default_value' => $this->options['type'],
+      '#ajax' => [
+        'url' => views_ui_build_form_url($form_state),
+      ],
+      '#submit' => [[$this, 'submitTemporaryForm']],
+      '#executes_submit_callback' => TRUE,
+    ];
+
+    $form['field_api_classes'] = [
+      '#title' => $this->t('Use field template'),
+      '#type' => 'checkbox',
+      '#default_value' => $this->options['field_api_classes'],
+      '#description' => $this->t('If checked, field api classes will be added by field templates. This is not recommended unless your CSS depends upon these classes. If not checked, template will not be used.'),
+      '#fieldset' => 'style_settings',
+      '#weight' => 20,
+    ];
+
+    if ($this->multiple) {
+      $form['field_api_classes']['#description'] .= ' ' . $this->t('Checking this option will cause the group Display Type and Separator values to be ignored.');
+    }
+
+    // Get the settings form.
+    $settings_form = ['#value' => []];
+    $format = isset($form_state->getUserInput()['options']['type']) ? $form_state->getUserInput()['options']['type'] : $this->options['type'];
+    if ($formatter = $this->getFormatterInstance($format)) {
+      $settings_form = $formatter->settingsForm($form, $form_state);
+      // Convert field UI selector states to work in the Views field form.
+      FormHelper::rewriteStatesSelector($settings_form, "fields[{$field->getName()}][settings_edit_form]", 'options');
+    }
+    $form['settings'] = $settings_form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitFormCalculateOptions(array $options, array $form_state_options) {
+    // When we change the formatter type we don't want to keep any of the
+    // previous configured formatter settings, as there might be schema
+    // conflict.
+    unset($options['settings']);
+    $options = $form_state_options + $options;
+    if (!isset($options['settings'])) {
+      $options['settings'] = [];
+    }
+    return $options;
+  }
+
+  /**
+   * Provide options for multiple value fields.
+   */
+  public function multiple_options_form(&$form, FormStateInterface $form_state) {
+    $field = $this->getFieldDefinition();
+
+    $form['multiple_field_settings'] = [
+      '#type' => 'details',
+      '#title' => $this->t('Multiple field settings'),
+      '#weight' => 5,
+    ];
+
+    $form['group_rows'] = [
+      '#title' => $this->t('Display all values in the same row'),
+      '#type' => 'checkbox',
+      '#default_value' => $this->options['group_rows'],
+      '#description' => $this->t('If checked, multiple values for this field will be shown in the same row. If not checked, each value in this field will create a new row. If using group by, please make sure to group by "Entity ID" for this setting to have any effect.'),
+      '#fieldset' => 'multiple_field_settings',
+    ];
+
+    // Make the string translatable by keeping it as a whole rather than
+    // translating prefix and suffix separately.
+    list($prefix, $suffix) = explode('@count', $this->t('Display @count value(s)'));
+
+    if ($field->getCardinality() == FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED) {
+      $type = 'textfield';
+      $options = NULL;
+      $size = 5;
+    }
+    else {
+      $type = 'select';
+      $range = range(1, $field->getCardinality());
+      $options = array_combine($range, $range);
+      $size = 1;
+    }
+    $form['multi_type'] = [
+      '#type' => 'radios',
+      '#title' => $this->t('Display type'),
+      '#options' => [
+        'ul' => $this->t('Unordered list'),
+        'ol' => $this->t('Ordered list'),
+        'separator' => $this->t('Simple separator'),
+      ],
+      '#states' => [
+        'visible' => [
+          ':input[name="options[group_rows]"]' => ['checked' => TRUE],
+        ],
+      ],
+      '#default_value' => $this->options['multi_type'],
+      '#fieldset' => 'multiple_field_settings',
+    ];
+
+    $form['separator'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Separator'),
+      '#default_value' => $this->options['separator'],
+      '#states' => [
+        'visible' => [
+          ':input[name="options[group_rows]"]' => ['checked' => TRUE],
+          ':input[name="options[multi_type]"]' => ['value' => 'separator'],
+        ],
+      ],
+      '#fieldset' => 'multiple_field_settings',
+    ];
+
+    $form['delta_limit'] = [
+      '#type' => $type,
+      '#size' => $size,
+      '#field_prefix' => $prefix,
+      '#field_suffix' => $suffix,
+      '#options' => $options,
+      '#default_value' => $this->options['delta_limit'],
+      '#prefix' => '<div class="container-inline">',
+      '#states' => [
+        'visible' => [
+          ':input[name="options[group_rows]"]' => ['checked' => TRUE],
+        ],
+      ],
+      '#fieldset' => 'multiple_field_settings',
+    ];
+
+    list($prefix, $suffix) = explode('@count', $this->t('starting from @count'));
+    $form['delta_offset'] = [
+      '#type' => 'textfield',
+      '#size' => 5,
+      '#field_prefix' => $prefix,
+      '#field_suffix' => $suffix,
+      '#default_value' => $this->options['delta_offset'],
+      '#states' => [
+        'visible' => [
+          ':input[name="options[group_rows]"]' => ['checked' => TRUE],
+        ],
+      ],
+      '#description' => $this->t('(first item is 0)'),
+      '#fieldset' => 'multiple_field_settings',
+    ];
+    $form['delta_reversed'] = [
+      '#title' => $this->t('Reversed'),
+      '#type' => 'checkbox',
+      '#default_value' => $this->options['delta_reversed'],
+      '#suffix' => $suffix,
+      '#states' => [
+        'visible' => [
+          ':input[name="options[group_rows]"]' => ['checked' => TRUE],
+        ],
+      ],
+      '#description' => $this->t('(start from last values)'),
+      '#fieldset' => 'multiple_field_settings',
+    ];
+    $form['delta_first_last'] = [
+      '#title' => $this->t('First and last only'),
+      '#type' => 'checkbox',
+      '#default_value' => $this->options['delta_first_last'],
+      '#suffix' => '</div>',
+      '#states' => [
+        'visible' => [
+          ':input[name="options[group_rows]"]' => ['checked' => TRUE],
+        ],
+      ],
+      '#fieldset' => 'multiple_field_settings',
+    ];
+  }
+
+  /**
+   * Extend the groupby form with group columns.
+   */
+  public function buildGroupByForm(&$form, FormStateInterface $form_state) {
+    parent::buildGroupByForm($form, $form_state);
+    // With "field API" fields, the column target of the grouping function
+    // and any additional grouping columns must be specified.
+
+    $field_columns = array_keys($this->getFieldDefinition()->getColumns());
+    $group_columns = [
+      'entity_id' => $this->t('Entity ID'),
+    ] + array_map('ucfirst', array_combine($field_columns, $field_columns));
+
+    $form['group_column'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Group column'),
+      '#default_value' => $this->options['group_column'],
+      '#description' => $this->t('Select the column of this field to apply the grouping function selected above.'),
+      '#options' => $group_columns,
+    ];
+
+    $options = [
+      'bundle' => 'Bundle',
+      'language' => 'Language',
+      'entity_type' => 'Entity_type',
+    ];
+    // Add on defined fields, noting that they're prefixed with the field name.
+    $form['group_columns'] = [
+      '#type' => 'checkboxes',
+      '#title' => $this->t('Group columns (additional)'),
+      '#default_value' => $this->options['group_columns'],
+      '#description' => $this->t('Select any additional columns of this field to include in the query and to group on.'),
+      '#options' => $options + $group_columns,
+    ];
+  }
+
+  public function submitGroupByForm(&$form, FormStateInterface $form_state) {
+    parent::submitGroupByForm($form, $form_state);
+    $item = &$form_state->get('handler')->options;
+
+    // Add settings for "field API" fields.
+    $item['group_column'] = $form_state->getValue(['options', 'group_column']);
+    $item['group_columns'] = array_filter($form_state->getValue(['options', 'group_columns']));
+  }
+
+  /**
+   * Render all items in this field together.
+   *
+   * When using advanced render, each possible item in the list is rendered
+   * individually. Then the items are all pasted together.
+   */
+  public function renderItems($items) {
+    if (!empty($items)) {
+      $items = $this->prepareItemsByDelta($items);
+      if ($this->options['multi_type'] == 'separator' || !$this->options['group_rows']) {
+        $separator = $this->options['multi_type'] == 'separator' ? Xss::filterAdmin($this->options['separator']) : '';
+        $build = [
+          '#type' => 'inline_template',
+          '#template' => '{{ items | safe_join(separator) }}',
+          '#context' => ['separator' => $separator, 'items' => $items],
+        ];
+      }
+      else {
+        $build = [
+          '#theme' => 'item_list',
+          '#items' => $items,
+          '#title' => NULL,
+          '#list_type' => $this->options['multi_type'],
+        ];
+      }
+      return $this->renderer->render($build);
+    }
+  }
+
+  /**
+   * Adapts the $items according to the delta configuration.
+   *
+   * This selects displayed deltas, reorders items, and takes offsets into
+   * account.
+   *
+   * @param array $all_values
+   *   The items for individual rendering.
+   *
+   * @return array
+   *   The manipulated items.
+   */
+  protected function prepareItemsByDelta(array $all_values) {
+    if ($this->options['delta_reversed']) {
+      $all_values = array_reverse($all_values);
+    }
+
+    // We are supposed to show only certain deltas.
+    if ($this->limit_values) {
+      $row = $this->view->result[$this->view->row_index];
+
+      // Offset is calculated differently when row grouping for a field is not
+      // enabled. Since there are multiple rows, delta needs to be taken into
+      // account, so that different values are shown per row.
+      if (!$this->options['group_rows'] && isset($this->aliases['delta']) && isset($row->{$this->aliases['delta']})) {
+        $delta_limit = 1;
+        $offset = $row->{$this->aliases['delta']};
+      }
+      // Single fields don't have a delta available so choose 0.
+      elseif (!$this->options['group_rows'] && !$this->multiple) {
+        $delta_limit = 1;
+        $offset = 0;
+      }
+      else {
+        $delta_limit = $this->options['delta_limit'];
+        $offset = intval($this->options['delta_offset']);
+
+        // We should only get here in this case if there is an offset, and in
+        // that case we are limiting to all values after the offset.
+        if ($delta_limit === 0) {
+          $delta_limit = count($all_values) - $offset;
+        }
+      }
+
+      // Determine if only the first and last values should be shown.
+      $delta_first_last = $this->options['delta_first_last'];
+
+      $new_values = [];
+      for ($i = 0; $i < $delta_limit; $i++) {
+        $new_delta = $offset + $i;
+
+        if (isset($all_values[$new_delta])) {
+          // If first-last option was selected, only use the first and last
+          // values.
+          if (!$delta_first_last
+            // Use the first value.
+            || $new_delta == $offset
+            // Use the last value.
+            || $new_delta == ($delta_limit + $offset - 1)) {
+            $new_values[] = $all_values[$new_delta];
+          }
+        }
+      }
+      $all_values = $new_values;
+    }
+
+    return $all_values;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preRender(&$values) {
+    parent::preRender($values);
+    $this->getEntityFieldRenderer()->preRender($values);
+  }
+
+  /**
+   * Returns the entity field renderer.
+   *
+   * @return \Drupal\views\Entity\Render\EntityFieldRenderer
+   *   The entity field renderer.
+   */
+  protected function getEntityFieldRenderer() {
+    if (!isset($this->entityFieldRenderer)) {
+      // This can be invoked during field handler initialization in which case
+      // view fields are not set yet.
+      if (!empty($this->view->field)) {
+        foreach ($this->view->field as $field) {
+          // An entity field renderer can handle only a single relationship.
+          if ($field->relationship == $this->relationship && isset($field->entityFieldRenderer)) {
+            $this->entityFieldRenderer = $field->entityFieldRenderer;
+            break;
+          }
+        }
+      }
+      if (!isset($this->entityFieldRenderer)) {
+        $entity_type = $this->entityManager->getDefinition($this->getEntityType());
+        $this->entityFieldRenderer = new EntityFieldRenderer($this->view, $this->relationship, $this->languageManager, $entity_type, $this->entityManager);
+      }
+    }
+    return $this->entityFieldRenderer;
+  }
+
+  /**
+   * Gets an array of items for the field.
+   *
+   * @param \Drupal\views\ResultRow $values
+   *   The result row object containing the values.
+   *
+   * @return array
+   *   An array of items for the field.
+   */
+  public function getItems(ResultRow $values) {
+    if (!$this->displayHandler->useGroupBy()) {
+      $build_list = $this->getEntityFieldRenderer()->render($values, $this);
+    }
+    else {
+      // For grouped results we need to retrieve a massaged entity having
+      // grouped field values to ensure that "grouped by" values, especially
+      // those with multiple cardinality work properly. See
+      // \Drupal\Tests\views\Kernel\QueryGroupByTest::testGroupByFieldWithCardinality.
+      $display = [
+        'type' => $this->options['type'],
+        'settings' => $this->options['settings'],
+        'label' => 'hidden',
+      ];
+      // Optional relationships may not provide an entity at all. So we can't
+      // use createEntityForGroupBy() for those rows.
+      if ($entity = $this->getEntity($values)) {
+        $entity = $this->createEntityForGroupBy($entity, $values);
+        // Some bundles might not have a specific field, in which case the faked
+        // entity doesn't have it either.
+        $build_list = isset($entity->{$this->definition['field_name']}) ? $entity->{$this->definition['field_name']}->view($display) : NULL;
+      }
+      else {
+        $build_list = NULL;
+      }
+    }
+
+    if (!$build_list) {
+      return [];
+    }
+
+    if ($this->options['field_api_classes']) {
+      return [['rendered' => $this->renderer->render($build_list)]];
+    }
+
+    // Render using the formatted data itself.
+    $items = [];
+    // Each item is extracted and rendered separately, the top-level formatter
+    // render array itself is never rendered, so we extract its bubbleable
+    // metadata and add it to each child individually.
+    $bubbleable = BubbleableMetadata::createFromRenderArray($build_list);
+    foreach (Element::children($build_list) as $delta) {
+      BubbleableMetadata::createFromRenderArray($build_list[$delta])
+        ->merge($bubbleable)
+        ->applyTo($build_list[$delta]);
+      $items[$delta] = [
+        'rendered' => $build_list[$delta],
+        // Add the raw field items (for use in tokens).
+        'raw' => $build_list['#items'][$delta],
+      ];
+    }
+    return $items;
+  }
+
+  /**
+   * Creates a fake entity with grouped field values.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity to be processed.
+   * @param \Drupal\views\ResultRow $row
+   *   The result row object containing the values.
+   *
+   * @return bool|\Drupal\Core\Entity\FieldableEntityInterface
+   *   Returns a new entity object containing the grouped field values.
+   */
+  protected function createEntityForGroupBy(EntityInterface $entity, ResultRow $row) {
+    // Retrieve the correct translation object.
+    $processed_entity = clone $this->getEntityFieldRenderer()->getEntityTranslation($entity, $row);
+
+    // Copy our group fields into the cloned entity. It is possible this will
+    // cause some weirdness, but there is only so much we can hope to do.
+    if (!empty($this->group_fields) && isset($entity->{$this->definition['field_name']})) {
+      // first, test to see if we have a base value.
+      $base_value = [];
+      // Note: We would copy original values here, but it can cause problems.
+      // For example, text fields store cached filtered values as 'safe_value'
+      // which does not appear anywhere in the field definition so we cannot
+      // affect it. Other side effects could happen similarly.
+      $data = FALSE;
+      foreach ($this->group_fields as $field_name => $column) {
+        if (property_exists($row, $this->aliases[$column])) {
+          $base_value[$field_name] = $row->{$this->aliases[$column]};
+          if (isset($base_value[$field_name])) {
+            $data = TRUE;
+          }
+        }
+      }
+
+      // If any of our aggregated fields have data, fake it:
+      if ($data) {
+        // Now, overwrite the original value with our aggregated value.
+        // This overwrites it so there is always just one entry.
+        $processed_entity->{$this->definition['field_name']} = [$base_value];
+      }
+      else {
+        $processed_entity->{$this->definition['field_name']} = [];
+      }
+    }
+
+    return $processed_entity;
+  }
+
+  public function render_item($count, $item) {
+    return render($item['rendered']);
+  }
+
+  protected function documentSelfTokens(&$tokens) {
+    $field = $this->getFieldDefinition();
+    foreach ($field->getColumns() as $id => $column) {
+      $tokens['{{ ' . $this->options['id'] . '__' . $id . ' }}'] = $this->t('Raw @column', ['@column' => $id]);
+    }
+  }
+
+  protected function addSelfTokens(&$tokens, $item) {
+    $field = $this->getFieldDefinition();
+    foreach ($field->getColumns() as $id => $column) {
+      // Use \Drupal\Component\Utility\Xss::filterAdmin() because it's user data
+      // and we can't be sure it is safe. We know nothing about the data,
+      // though, so we can't really do much else.
+      if (isset($item['raw'])) {
+        $raw = $item['raw'];
+
+        if (is_array($raw)) {
+          if (isset($raw[$id]) && is_scalar($raw[$id])) {
+            $tokens['{{ ' . $this->options['id'] . '__' . $id . ' }}'] = Xss::filterAdmin($raw[$id]);
+          }
+          else {
+            // Make sure that empty values are replaced as well.
+            $tokens['{{ ' . $this->options['id'] . '__' . $id . ' }}'] = '';
+          }
+        }
+
+        if (is_object($raw)) {
+          $property = $raw->get($id);
+          // Check if TypedDataInterface is implemented so we know how to render
+          // the item as a string.
+          if (!empty($property) && $property instanceof TypedDataInterface) {
+            $tokens['{{ ' . $this->options['id'] . '__' . $id . ' }}'] = Xss::filterAdmin($property->getString());
+          }
+          else {
+            // Make sure that empty values are replaced as well.
+            $tokens['{{ ' . $this->options['id'] . '__' . $id . ' }}'] = '';
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Returns the field formatter instance.
+   *
+   * @return \Drupal\Core\Field\FormatterInterface|null
+   *   The field formatter instance.
+   */
+  protected function getFormatterInstance($format = NULL) {
+    if (!isset($format)) {
+      $format = $this->options['type'];
+    }
+    $settings = $this->options['settings'] + $this->formatterPluginManager->getDefaultSettings($format);
+
+    $options = [
+      'field_definition' => $this->getFieldDefinition(),
+      'configuration' => [
+        'type' => $format,
+        'settings' => $settings,
+        'label' => '',
+        'weight' => 0,
+      ],
+      'view_mode' => '_custom',
+    ];
+
+    return $this->formatterPluginManager->getInstance($options);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    $this->dependencies = parent::calculateDependencies();
+
+    // Add the module providing the configured field storage as a dependency.
+    if (($field_storage_definition = $this->getFieldStorageDefinition()) && $field_storage_definition instanceof EntityInterface) {
+      $this->dependencies['config'][] = $field_storage_definition->getConfigDependencyName();
+    }
+    if (!empty($this->options['type'])) {
+      // Add the module providing the formatter.
+      $this->dependencies['module'][] = $this->formatterPluginManager->getDefinition($this->options['type'])['provider'];
+
+      // Add the formatter's dependencies.
+      if (($formatter = $this->getFormatterInstance()) && $formatter instanceof DependentPluginInterface) {
+        $this->calculatePluginDependencies($formatter);
+      }
+    }
+
+    return $this->dependencies;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    return Cache::PERMANENT;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    return $this->getEntityFieldRenderer()->getCacheContexts();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTags() {
+    $field_definition = $this->getFieldDefinition();
+    $field_storage_definition = $this->getFieldStorageDefinition();
+    return Cache::mergeTags(
+      $field_definition instanceof CacheableDependencyInterface ? $field_definition->getCacheTags() : [],
+      $field_storage_definition instanceof CacheableDependencyInterface ? $field_storage_definition->getCacheTags() : []
+    );
+  }
+
+  /**
+   * Gets the table mapping for the entity type of the field.
+   *
+   * @return \Drupal\Core\Entity\Sql\DefaultTableMapping
+   *   The table mapping.
+   */
+  protected function getTableMapping() {
+    return $this->entityManager->getStorage($this->definition['entity_type'])->getTableMapping();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getValue(ResultRow $values, $field = NULL) {
+    $entity = $this->getEntity($values);
+    // Some bundles might not have a specific field, in which case the entity
+    // (potentially a fake one) doesn't have it either.
+    /** @var \Drupal\Core\Field\FieldItemListInterface $field_item_list */
+    $field_item_list = isset($entity->{$this->definition['field_name']}) ? $entity->{$this->definition['field_name']} : NULL;
+
+    if (!isset($field_item_list)) {
+      // There isn't anything we can do without a valid field.
+      return NULL;
+    }
+
+    $field_item_definition = $field_item_list->getFieldDefinition();
+
+    $values = [];
+    foreach ($field_item_list as $field_item) {
+      /** @var \Drupal\Core\Field\FieldItemInterface $field_item */
+      if ($field) {
+        $values[] = $field_item->$field;
+      }
+      // Find the value using the main property of the field. If no main
+      // property is provided fall back to 'value'.
+      elseif ($main_property_name = $field_item->mainPropertyName()) {
+        $values[] = $field_item->{$main_property_name};
+      }
+      else {
+        $values[] = $field_item->value;
+      }
+    }
+    if ($field_item_definition->getFieldStorageDefinition()->getCardinality() == 1) {
+      return reset($values);
+    }
+    else {
+      return $values;
+    }
+  }
+
+}
diff --git a/web/core/modules/views/src/Plugin/views/field/EntityLabel.php b/web/core/modules/views/src/Plugin/views/field/EntityLabel.php
index 967fd526b..86ccd0544 100644
--- a/web/core/modules/views/src/Plugin/views/field/EntityLabel.php
+++ b/web/core/modules/views/src/Plugin/views/field/EntityLabel.php
@@ -23,7 +23,7 @@ class EntityLabel extends FieldPluginBase {
    *
    * @var array
    */
-  protected $loadedReferencers = array();
+  protected $loadedReferencers = [];
 
   /**
    * EntityManager class.
@@ -75,7 +75,7 @@ class EntityLabel extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['link_to_entity'] = array('default' => FALSE);
+    $options['link_to_entity'] = ['default' => FALSE];
     return $options;
   }
 
@@ -83,12 +83,12 @@ class EntityLabel extends FieldPluginBase {
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['link_to_entity'] = array(
+    $form['link_to_entity'] = [
       '#title' => $this->t('Link to entity'),
       '#description' => $this->t('Make entity label a link to entity page.'),
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['link_to_entity']),
-    );
+    ];
     parent::buildOptionsForm($form, $form_state);
   }
 
@@ -128,7 +128,7 @@ class EntityLabel extends FieldPluginBase {
   public function preRender(&$values) {
     parent::preRender($values);
 
-    $entity_ids_per_type = array();
+    $entity_ids_per_type = [];
     foreach ($values as $value) {
       if ($type = $this->getValue($value, 'type')) {
         $entity_ids_per_type[$type][] = $this->getValue($value);
diff --git a/web/core/modules/views/src/Plugin/views/field/EntityOperations.php b/web/core/modules/views/src/Plugin/views/field/EntityOperations.php
index f2a3ba997..c8a307bd1 100644
--- a/web/core/modules/views/src/Plugin/views/field/EntityOperations.php
+++ b/web/core/modules/views/src/Plugin/views/field/EntityOperations.php
@@ -83,9 +83,9 @@ class EntityOperations extends FieldPluginBase {
   public function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['destination'] = array(
+    $options['destination'] = [
       'default' => TRUE,
-    );
+    ];
 
     return $options;
   }
@@ -96,12 +96,12 @@ class EntityOperations extends FieldPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['destination'] = array(
+    $form['destination'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Include destination'),
       '#description' => $this->t('Include a <code>destination</code> parameter in the link to return the user to the original view upon completing the link action.'),
       '#default_value' => $this->options['destination'],
-    );
+    ];
   }
 
   /**
@@ -113,15 +113,15 @@ class EntityOperations extends FieldPluginBase {
     if ($this->options['destination']) {
       foreach ($operations as &$operation) {
         if (!isset($operation['query'])) {
-          $operation['query'] = array();
+          $operation['query'] = [];
         }
         $operation['query'] += $this->getDestinationArray();
       }
     }
-    $build = array(
+    $build = [
       '#type' => 'operations',
       '#links' => $operations,
-    );
+    ];
 
     return $build;
   }
diff --git a/web/core/modules/views/src/Plugin/views/field/Field.php b/web/core/modules/views/src/Plugin/views/field/Field.php
index c4003b4e4..625d3c8ac 100644
--- a/web/core/modules/views/src/Plugin/views/field/Field.php
+++ b/web/core/modules/views/src/Plugin/views/field/Field.php
@@ -2,1074 +2,12 @@
 
 namespace Drupal\views\Plugin\views\field;
 
-use Drupal\Component\Plugin\DependentPluginInterface;
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableDependencyInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Field\FieldTypePluginManagerInterface;
-use Drupal\Core\Field\FormatterPluginManager;
-use Drupal\Core\Form\FormHelper;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Plugin\PluginDependencyTrait;
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\Render\Element;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\views\FieldAPIHandlerTrait;
-use Drupal\views\Entity\Render\EntityFieldRenderer;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\ResultRow;
-use Drupal\views\ViewExecutable;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
 /**
- * A field that displays entity field data.
+ * A stub class to provide backward compatibility for EntityField.
  *
- * @ingroup views_field_handlers
- *
- * @todo Rename the class https://www.drupal.org/node/2408667
- *
- * @ViewsField("field")
+ * @deprecated in Drupal 8.3.x and will be removed before 9.0.0
+ *   Use \Drupal\views\Plugin\views\field\EntityField instead.
  */
-class Field extends FieldPluginBase implements CacheableDependencyInterface, MultiItemsFieldHandlerInterface {
-
-  use FieldAPIHandlerTrait;
-  use PluginDependencyTrait;
-
-  /**
-   * An array to store field renderable arrays for use by renderItems().
-   *
-   * @var array
-   */
-  public $items = array();
-
-  /**
-   * Does the field supports multiple field values.
-   *
-   * @var bool
-   */
-  public $multiple;
-
-  /**
-   * Does the rendered fields get limited.
-   *
-   * @var bool
-   */
-  public $limit_values;
-
-  /**
-   * A shortcut for $view->base_table.
-   *
-   * @var string
-   */
-  public $base_table;
-
-  /**
-   * An array of formatter options.
-   *
-   * @var array
-   */
-  protected $formatterOptions;
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * The field formatter plugin manager.
-   *
-   * @var \Drupal\Core\Field\FormatterPluginManager
-   */
-  protected $formatterPluginManager;
-
-  /**
-   * The language manager.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
-   * The renderer.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * The field type plugin manager.
-   *
-   * @var \Drupal\Core\Field\FieldTypePluginManagerInterface
-   */
-  protected $fieldTypePluginManager;
-
-  /**
-   * Static cache for ::getEntityFieldRenderer().
-   *
-   * @var \Drupal\views\Entity\Render\EntityFieldRenderer
-   */
-  protected $entityFieldRenderer;
-
-  /**
-   * Constructs a \Drupal\field\Plugin\views\field\Field object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The field formatter plugin manager.
-   * @param \Drupal\Core\Field\FormatterPluginManager $formatter_plugin_manager
-   *   The field formatter plugin manager.
-   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_plugin_manager
-   *   The field plugin type manager.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, FormatterPluginManager $formatter_plugin_manager, FieldTypePluginManagerInterface $field_type_plugin_manager, LanguageManagerInterface $language_manager, RendererInterface $renderer) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->entityManager = $entity_manager;
-    $this->formatterPluginManager = $formatter_plugin_manager;
-    $this->fieldTypePluginManager = $field_type_plugin_manager;
-    $this->languageManager = $language_manager;
-    $this->renderer = $renderer;
-
-    // @todo Unify 'entity field'/'field_name' instead of converting back and
-    //   forth. https://www.drupal.org/node/2410779
-    if (isset($this->definition['entity field'])) {
-      $this->definition['field_name'] = $this->definition['entity field'];
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('entity.manager'),
-      $container->get('plugin.manager.field.formatter'),
-      $container->get('plugin.manager.field.field_type'),
-      $container->get('language_manager'),
-      $container->get('renderer')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
-    parent::init($view, $display, $options);
-
-    $this->multiple = FALSE;
-    $this->limit_values = FALSE;
-
-    $field_definition = $this->getFieldDefinition();
-    $cardinality = $field_definition->getFieldStorageDefinition()->getCardinality();
-    if ($field_definition->getFieldStorageDefinition()->isMultiple()) {
-      $this->multiple = TRUE;
-
-      // If "Display all values in the same row" is FALSE, then we always limit
-      // in order to show a single unique value per row.
-      if (!$this->options['group_rows']) {
-        $this->limit_values = TRUE;
-      }
-
-      // If "First and last only" is chosen, limit the values
-      if (!empty($this->options['delta_first_last'])) {
-        $this->limit_values = TRUE;
-      }
-
-      // Otherwise, we only limit values if the user hasn't selected "all", 0, or
-      // the value matching field cardinality.
-      if ((($this->options['delta_limit'] > 0) && ($this->options['delta_limit'] != $cardinality)) || intval($this->options['delta_offset'])) {
-        $this->limit_values = TRUE;
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEntityManager() {
-    return $this->entityManager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function access(AccountInterface $account) {
-    $access_control_handler = $this->entityManager->getAccessControlHandler($this->getEntityType());
-    return $access_control_handler->fieldAccess('view', $this->getFieldDefinition(), $account);
-  }
-
-  /**
-   * Called to add the field to a query.
-   *
-   * By default, all needed data is taken from entities loaded by the query
-   * plugin. Columns are added only if they are used in groupings.
-   */
-  public function query($use_groupby = FALSE) {
-    $fields = $this->additional_fields;
-    // No need to add the entity type.
-    $entity_type_key = array_search('entity_type', $fields);
-    if ($entity_type_key !== FALSE) {
-      unset($fields[$entity_type_key]);
-    }
-
-    if ($use_groupby) {
-      // Add the fields that we're actually grouping on.
-      $options = array();
-      if ($this->options['group_column'] != 'entity_id') {
-        $options = array($this->options['group_column'] => $this->options['group_column']);
-      }
-      $options += is_array($this->options['group_columns']) ? $this->options['group_columns'] : array();
-
-      // Go through the list and determine the actual column name from field api.
-      $fields = array();
-      $table_mapping = $this->getTableMapping();
-      $field_definition = $this->getFieldStorageDefinition();
-
-      foreach ($options as $column) {
-        $fields[$column] = $table_mapping->getFieldColumnName($field_definition, $column);
-      }
-
-      $this->group_fields = $fields;
-    }
-
-    // Add additional fields (and the table join itself) if needed.
-    if ($this->add_field_table($use_groupby)) {
-      $this->ensureMyTable();
-      $this->addAdditionalFields($fields);
-    }
-
-    // Let the entity field renderer alter the query if needed.
-    $this->getEntityFieldRenderer()->query($this->query, $this->relationship);
-  }
-
-  /**
-   * Determine if the field table should be added to the query.
-   */
-  function add_field_table($use_groupby) {
-    // Grouping is enabled.
-    if ($use_groupby) {
-      return TRUE;
-    }
-    // This a multiple value field, but "group multiple values" is not checked.
-    if ($this->multiple && !$this->options['group_rows']) {
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function clickSortable() {
-    // A field is not click sortable if it's a multiple field with
-    // "group multiple values" checked, since a click sort in that case would
-    // add a join to the field table, which would produce unwanted duplicates.
-    if ($this->multiple && $this->options['group_rows']) {
-      return FALSE;
-    }
-
-    // If field definition is set, use that.
-    if (isset($this->definition['click sortable'])) {
-      return (bool) $this->definition['click sortable'];
-    }
-
-    // Default to true.
-    return TRUE;
-  }
-
-  /**
-   * Called to determine what to tell the clicksorter.
-   */
-  public function clickSort($order) {
-    // No column selected, can't continue.
-    if (empty($this->options['click_sort_column'])) {
-      return;
-    }
-
-    $this->ensureMyTable();
-    $field_storage_definition = $this->getFieldStorageDefinition();
-    $column = $this->getTableMapping()->getFieldColumnName($field_storage_definition, $this->options['click_sort_column']);
-    if (!isset($this->aliases[$column])) {
-      // Column is not in query; add a sort on it (without adding the column).
-      $this->aliases[$column] = $this->tableAlias . '.' . $column;
-    }
-    $this->query->addOrderBy(NULL, NULL, $order, $this->aliases[$column]);
-  }
-
-  /**
-   * Gets the field storage of the used field.
-   *
-   * @return \Drupal\Core\Field\FieldStorageDefinitionInterface
-   */
-  protected function getFieldStorageDefinition() {
-    $entity_type_id = $this->definition['entity_type'];
-    $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
-
-    $field_storage = NULL;
-    // @todo Unify 'entity field'/'field_name' instead of converting back and
-    //   forth. https://www.drupal.org/node/2410779
-    if (isset($this->definition['field_name'])) {
-      $field_storage = $field_storage_definitions[$this->definition['field_name']];
-    }
-    elseif (isset($this->definition['entity field'])) {
-      $field_storage = $field_storage_definitions[$this->definition['entity field']];
-    }
-    return $field_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-
-    $field_storage_definition = $this->getFieldStorageDefinition();
-    $field_type = $this->fieldTypePluginManager->getDefinition($field_storage_definition->getType());
-    $column_names = array_keys($field_storage_definition->getColumns());
-    $default_column = '';
-    // Try to determine a sensible default.
-    if (count($column_names) == 1) {
-      $default_column = $column_names[0];
-    }
-    elseif (in_array('value', $column_names)) {
-      $default_column = 'value';
-    }
-
-    // If the field has a "value" column, we probably need that one.
-    $options['click_sort_column'] = array(
-      'default' => $default_column,
-    );
-
-    if (isset($this->definition['default_formatter'])) {
-      $options['type'] = ['default' => $this->definition['default_formatter']];
-    }
-    elseif (isset($field_type['default_formatter'])) {
-      $options['type'] = ['default' => $field_type['default_formatter']];
-    }
-    else {
-      $options['type'] = ['default' => ''];
-    }
-
-    $options['settings'] = array(
-      'default' => isset($this->definition['default_formatter_settings']) ? $this->definition['default_formatter_settings'] : [],
-    );
-    $options['group_column'] = array(
-      'default' => $default_column,
-    );
-    $options['group_columns'] = array(
-      'default' => array(),
-    );
-
-    // Options used for multiple value fields.
-    $options['group_rows'] = array(
-      'default' => TRUE,
-    );
-    // If we know the exact number of allowed values, then that can be
-    // the default. Otherwise, default to 'all'.
-    $options['delta_limit'] = array(
-      'default' => ($field_storage_definition->getCardinality() > 1) ? $field_storage_definition->getCardinality() : 0,
-    );
-    $options['delta_offset'] = array(
-      'default' => 0,
-    );
-    $options['delta_reversed'] = array(
-      'default' => FALSE,
-    );
-    $options['delta_first_last'] = array(
-      'default' => FALSE,
-    );
-
-    $options['multi_type'] = array(
-      'default' => 'separator'
-    );
-    $options['separator'] = array(
-      'default' => ', '
-    );
-
-    $options['field_api_classes'] = array(
-      'default' => FALSE,
-    );
-
-    return $options;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    parent::buildOptionsForm($form, $form_state);
-
-    $field = $this->getFieldDefinition();
-    $formatters = $this->formatterPluginManager->getOptions($field->getType());
-    $column_names = array_keys($field->getColumns());
-
-    // If this is a multiple value field, add its options.
-    if ($this->multiple) {
-      $this->multiple_options_form($form, $form_state);
-    }
-
-    // No need to ask the user anything if the field has only one column.
-    if (count($field->getColumns()) == 1) {
-      $form['click_sort_column'] = array(
-        '#type' => 'value',
-        '#value' => isset($column_names[0]) ? $column_names[0] : '',
-      );
-    }
-    else {
-      $form['click_sort_column'] = array(
-        '#type' => 'select',
-        '#title' => $this->t('Column used for click sorting'),
-        '#options' => array_combine($column_names, $column_names),
-        '#default_value' => $this->options['click_sort_column'],
-        '#description' => $this->t('Used by Style: Table to determine the actual column to click sort the field on. The default is usually fine.'),
-      );
-    }
-
-    $form['type'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Formatter'),
-      '#options' => $formatters,
-      '#default_value' => $this->options['type'],
-      '#ajax' => array(
-        'url' => views_ui_build_form_url($form_state),
-      ),
-      '#submit' => array(array($this, 'submitTemporaryForm')),
-      '#executes_submit_callback' => TRUE,
-    );
-
-    $form['field_api_classes'] = array(
-      '#title' => $this->t('Use field template'),
-      '#type' => 'checkbox',
-      '#default_value' => $this->options['field_api_classes'],
-      '#description' => $this->t('If checked, field api classes will be added by field templates. This is not recommended unless your CSS depends upon these classes. If not checked, template will not be used.'),
-      '#fieldset' => 'style_settings',
-      '#weight' => 20,
-    );
-
-    if ($this->multiple) {
-      $form['field_api_classes']['#description'] .= ' ' . $this->t('Checking this option will cause the group Display Type and Separator values to be ignored.');
-    }
-
-    // Get the settings form.
-    $settings_form = array('#value' => array());
-    $format = isset($form_state->getUserInput()['options']['type']) ? $form_state->getUserInput()['options']['type'] : $this->options['type'];
-    if ($formatter = $this->getFormatterInstance($format)) {
-      $settings_form = $formatter->settingsForm($form, $form_state);
-      // Convert field UI selector states to work in the Views field form.
-      FormHelper::rewriteStatesSelector($settings_form, "fields[{$field->getName()}][settings_edit_form]", 'options');
-    }
-    $form['settings'] = $settings_form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitFormCalculateOptions(array $options, array $form_state_options) {
-    // When we change the formatter type we don't want to keep any of the
-    // previous configured formatter settings, as there might be schema
-    // conflict.
-    unset($options['settings']);
-    $options = $form_state_options + $options;
-    if (!isset($options['settings'])) {
-      $options['settings'] = [];
-    }
-    return $options;
-  }
-
-  /**
-   * Provide options for multiple value fields.
-   */
-  function multiple_options_form(&$form, FormStateInterface $form_state) {
-    $field = $this->getFieldDefinition();
-
-    $form['multiple_field_settings'] = array(
-      '#type' => 'details',
-      '#title' => $this->t('Multiple field settings'),
-      '#weight' => 5,
-    );
-
-    $form['group_rows'] = array(
-      '#title' => $this->t('Display all values in the same row'),
-      '#type' => 'checkbox',
-      '#default_value' => $this->options['group_rows'],
-      '#description' => $this->t('If checked, multiple values for this field will be shown in the same row. If not checked, each value in this field will create a new row. If using group by, please make sure to group by "Entity ID" for this setting to have any effect.'),
-      '#fieldset' => 'multiple_field_settings',
-    );
-
-    // Make the string translatable by keeping it as a whole rather than
-    // translating prefix and suffix separately.
-    list($prefix, $suffix) = explode('@count', $this->t('Display @count value(s)'));
-
-    if ($field->getCardinality() == FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED) {
-      $type = 'textfield';
-      $options = NULL;
-      $size = 5;
-    }
-    else {
-      $type = 'select';
-      $range = range(1, $field->getCardinality());
-      $options = array_combine($range, $range);
-      $size = 1;
-    }
-    $form['multi_type'] = array(
-      '#type' => 'radios',
-      '#title' => $this->t('Display type'),
-      '#options' => array(
-        'ul' => $this->t('Unordered list'),
-        'ol' => $this->t('Ordered list'),
-        'separator' => $this->t('Simple separator'),
-      ),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[group_rows]"]' => array('checked' => TRUE),
-        ),
-      ),
-      '#default_value' => $this->options['multi_type'],
-      '#fieldset' => 'multiple_field_settings',
-    );
-
-    $form['separator'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Separator'),
-      '#default_value' => $this->options['separator'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[group_rows]"]' => array('checked' => TRUE),
-          ':input[name="options[multi_type]"]' => array('value' => 'separator'),
-        ),
-      ),
-      '#fieldset' => 'multiple_field_settings',
-    );
-
-    $form['delta_limit'] = array(
-      '#type' => $type,
-      '#size' => $size,
-      '#field_prefix' => $prefix,
-      '#field_suffix' => $suffix,
-      '#options' => $options,
-      '#default_value' => $this->options['delta_limit'],
-      '#prefix' => '<div class="container-inline">',
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[group_rows]"]' => array('checked' => TRUE),
-        ),
-      ),
-      '#fieldset' => 'multiple_field_settings',
-    );
-
-    list($prefix, $suffix) = explode('@count', $this->t('starting from @count'));
-    $form['delta_offset'] = array(
-      '#type' => 'textfield',
-      '#size' => 5,
-      '#field_prefix' => $prefix,
-      '#field_suffix' => $suffix,
-      '#default_value' => $this->options['delta_offset'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[group_rows]"]' => array('checked' => TRUE),
-        ),
-      ),
-      '#description' => $this->t('(first item is 0)'),
-      '#fieldset' => 'multiple_field_settings',
-    );
-    $form['delta_reversed'] = array(
-      '#title' => $this->t('Reversed'),
-      '#type' => 'checkbox',
-      '#default_value' => $this->options['delta_reversed'],
-      '#suffix' => $suffix,
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[group_rows]"]' => array('checked' => TRUE),
-        ),
-      ),
-      '#description' => $this->t('(start from last values)'),
-      '#fieldset' => 'multiple_field_settings',
-    );
-    $form['delta_first_last'] = array(
-      '#title' => $this->t('First and last only'),
-      '#type' => 'checkbox',
-      '#default_value' => $this->options['delta_first_last'],
-      '#suffix' => '</div>',
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[group_rows]"]' => array('checked' => TRUE),
-        ),
-      ),
-      '#fieldset' => 'multiple_field_settings',
-    );
-  }
-
-  /**
-   * Extend the groupby form with group columns.
-   */
-  public function buildGroupByForm(&$form, FormStateInterface $form_state) {
-    parent::buildGroupByForm($form, $form_state);
-    // With "field API" fields, the column target of the grouping function
-    // and any additional grouping columns must be specified.
-
-    $field_columns = array_keys($this->getFieldDefinition()->getColumns());
-    $group_columns = array(
-      'entity_id' => $this->t('Entity ID'),
-    ) + array_map('ucfirst', array_combine($field_columns, $field_columns));
-
-    $form['group_column'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Group column'),
-      '#default_value' => $this->options['group_column'],
-      '#description' => $this->t('Select the column of this field to apply the grouping function selected above.'),
-      '#options' => $group_columns,
-    );
-
-    $options = array(
-      'bundle' => 'Bundle',
-      'language' => 'Language',
-      'entity_type' => 'Entity_type',
-    );
-    // Add on defined fields, noting that they're prefixed with the field name.
-    $form['group_columns'] = array(
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Group columns (additional)'),
-      '#default_value' => $this->options['group_columns'],
-      '#description' => $this->t('Select any additional columns of this field to include in the query and to group on.'),
-      '#options' => $options + $group_columns,
-    );
-  }
-
-  public function submitGroupByForm(&$form, FormStateInterface $form_state) {
-    parent::submitGroupByForm($form, $form_state);
-    $item = &$form_state->get('handler')->options;
-
-    // Add settings for "field API" fields.
-    $item['group_column'] = $form_state->getValue(array('options', 'group_column'));
-    $item['group_columns'] = array_filter($form_state->getValue(array('options', 'group_columns')));
-  }
-
-  /**
-   * Render all items in this field together.
-   *
-   * When using advanced render, each possible item in the list is rendered
-   * individually. Then the items are all pasted together.
-   */
-  public function renderItems($items) {
-    if (!empty($items)) {
-      $items = $this->prepareItemsByDelta($items);
-      if ($this->options['multi_type'] == 'separator' || !$this->options['group_rows']) {
-        $separator = $this->options['multi_type'] == 'separator' ? Xss::filterAdmin($this->options['separator']) : '';
-        $build = [
-          '#type' => 'inline_template',
-          '#template' => '{{ items | safe_join(separator) }}',
-          '#context' => ['separator' => $separator, 'items' => $items],
-        ];
-      }
-      else {
-        $build = array(
-          '#theme' => 'item_list',
-          '#items' => $items,
-          '#title' => NULL,
-          '#list_type' => $this->options['multi_type'],
-        );
-      }
-      return $this->renderer->render($build);
-    }
-  }
-
-  /**
-   * Adapts the $items according to the delta configuration.
-   *
-   * This selects displayed deltas, reorders items, and takes offsets into
-   * account.
-   *
-   * @param array $all_values
-   *   The items for individual rendering.
-   *
-   * @return array
-   *   The manipulated items.
-   */
-  protected function prepareItemsByDelta(array $all_values) {
-    if ($this->options['delta_reversed']) {
-      $all_values = array_reverse($all_values);
-    }
-
-    // We are supposed to show only certain deltas.
-    if ($this->limit_values) {
-      $row = $this->view->result[$this->view->row_index];
-
-      // Offset is calculated differently when row grouping for a field is not
-      // enabled. Since there are multiple rows, delta needs to be taken into
-      // account, so that different values are shown per row.
-      if (!$this->options['group_rows'] && isset($this->aliases['delta']) && isset($row->{$this->aliases['delta']})) {
-        $delta_limit = 1;
-        $offset = $row->{$this->aliases['delta']};
-      }
-      // Single fields don't have a delta available so choose 0.
-      elseif (!$this->options['group_rows'] && !$this->multiple) {
-        $delta_limit = 1;
-        $offset = 0;
-      }
-      else {
-        $delta_limit = $this->options['delta_limit'];
-        $offset = intval($this->options['delta_offset']);
-
-        // We should only get here in this case if there is an offset, and in
-        // that case we are limiting to all values after the offset.
-        if ($delta_limit === 0) {
-          $delta_limit = count($all_values) - $offset;
-        }
-      }
-
-      // Determine if only the first and last values should be shown.
-      $delta_first_last = $this->options['delta_first_last'];
-
-      $new_values = array();
-      for ($i = 0; $i < $delta_limit; $i++) {
-        $new_delta = $offset + $i;
-
-        if (isset($all_values[$new_delta])) {
-          // If first-last option was selected, only use the first and last
-          // values.
-          if (!$delta_first_last
-            // Use the first value.
-            || $new_delta == $offset
-            // Use the last value.
-            || $new_delta == ($delta_limit + $offset - 1)) {
-            $new_values[] = $all_values[$new_delta];
-          }
-        }
-      }
-      $all_values = $new_values;
-    }
-
-    return $all_values;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preRender(&$values) {
-    parent::preRender($values);
-    $this->getEntityFieldRenderer()->preRender($values);
-  }
-
-  /**
-   * Returns the entity field renderer.
-   *
-   * @return \Drupal\views\Entity\Render\EntityFieldRenderer
-   *   The entity field renderer.
-   */
-  protected function getEntityFieldRenderer() {
-    if (!isset($this->entityFieldRenderer)) {
-      // This can be invoked during field handler initialization in which case
-      // view fields are not set yet.
-      if (!empty($this->view->field)) {
-        foreach ($this->view->field as $field) {
-          // An entity field renderer can handle only a single relationship.
-          if ($field->relationship == $this->relationship && isset($field->entityFieldRenderer)) {
-            $this->entityFieldRenderer = $field->entityFieldRenderer;
-            break;
-          }
-        }
-      }
-      if (!isset($this->entityFieldRenderer)) {
-        $entity_type = $this->entityManager->getDefinition($this->getEntityType());
-        $this->entityFieldRenderer = new EntityFieldRenderer($this->view, $this->relationship, $this->languageManager, $entity_type, $this->entityManager);
-      }
-    }
-    return $this->entityFieldRenderer;
-  }
-
-  /**
-   * Gets an array of items for the field.
-   *
-   * @param \Drupal\views\ResultRow $values
-   *   The result row object containing the values.
-   *
-   * @return array
-   *   An array of items for the field.
-   */
-  public function getItems(ResultRow $values) {
-    if (!$this->displayHandler->useGroupBy()) {
-      $build_list = $this->getEntityFieldRenderer()->render($values, $this);
-    }
-    else {
-      // For grouped results we need to retrieve a massaged entity having
-      // grouped field values to ensure that "grouped by" values, especially
-      // those with multiple cardinality work properly. See
-      // \Drupal\Tests\views\Kernel\QueryGroupByTest::testGroupByFieldWithCardinality.
-      $display = [
-        'type' => $this->options['type'],
-        'settings' => $this->options['settings'],
-        'label' => 'hidden',
-      ];
-      // Some bundles might not have a specific field, in which case the faked
-      // entity doesn't have it either.
-      $entity = $this->createEntityForGroupBy($this->getEntity($values), $values);
-      $build_list = isset($entity->{$this->definition['field_name']}) ? $entity->{$this->definition['field_name']}->view($display) : NULL;
-    }
-
-    if (!$build_list) {
-      return [];
-    }
-
-    if ($this->options['field_api_classes']) {
-      return [['rendered' => $this->renderer->render($build_list)]];
-    }
-
-    // Render using the formatted data itself.
-    $items = [];
-    // Each item is extracted and rendered separately, the top-level formatter
-    // render array itself is never rendered, so we extract its bubbleable
-    // metadata and add it to each child individually.
-    $bubbleable = BubbleableMetadata::createFromRenderArray($build_list);
-    foreach (Element::children($build_list) as $delta) {
-      BubbleableMetadata::createFromRenderArray($build_list[$delta])
-        ->merge($bubbleable)
-        ->applyTo($build_list[$delta]);
-      $items[$delta] = [
-        'rendered' => $build_list[$delta],
-        // Add the raw field items (for use in tokens).
-        'raw' => $build_list['#items'][$delta],
-      ];
-    }
-    return $items;
-  }
-
-  /**
-   * Creates a fake entity with grouped field values.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to be processed.
-   * @param \Drupal\views\ResultRow $row
-   *   The result row object containing the values.
-   *
-   * @return bool|\Drupal\Core\Entity\FieldableEntityInterface
-   *   Returns a new entity object containing the grouped field values.
-   */
-  protected function createEntityForGroupBy(EntityInterface $entity, ResultRow $row) {
-    // Retrieve the correct translation object.
-    $processed_entity = clone $this->getEntityFieldRenderer()->getEntityTranslation($entity, $row);
-
-    // Copy our group fields into the cloned entity. It is possible this will
-    // cause some weirdness, but there is only so much we can hope to do.
-    if (!empty($this->group_fields) && isset($entity->{$this->definition['field_name']})) {
-      // first, test to see if we have a base value.
-      $base_value = array();
-      // Note: We would copy original values here, but it can cause problems.
-      // For example, text fields store cached filtered values as 'safe_value'
-      // which does not appear anywhere in the field definition so we cannot
-      // affect it. Other side effects could happen similarly.
-      $data = FALSE;
-      foreach ($this->group_fields as $field_name => $column) {
-        if (property_exists($row, $this->aliases[$column])) {
-          $base_value[$field_name] = $row->{$this->aliases[$column]};
-          if (isset($base_value[$field_name])) {
-            $data = TRUE;
-          }
-        }
-      }
-
-      // If any of our aggregated fields have data, fake it:
-      if ($data) {
-        // Now, overwrite the original value with our aggregated value.
-        // This overwrites it so there is always just one entry.
-        $processed_entity->{$this->definition['field_name']} = array($base_value);
-      }
-      else {
-        $processed_entity->{$this->definition['field_name']} = array();
-      }
-    }
-
-    return $processed_entity;
-  }
-
-  function render_item($count, $item) {
-    return render($item['rendered']);
-  }
-
-  protected function documentSelfTokens(&$tokens) {
-    $field = $this->getFieldDefinition();
-    foreach ($field->getColumns() as $id => $column) {
-      $tokens['{{ ' . $this->options['id'] . '__' . $id . ' }}'] = $this->t('Raw @column', array('@column' => $id));
-    }
-  }
-
-  protected function addSelfTokens(&$tokens, $item) {
-    $field = $this->getFieldDefinition();
-    foreach ($field->getColumns() as $id => $column) {
-      // Use \Drupal\Component\Utility\Xss::filterAdmin() because it's user data
-      // and we can't be sure it is safe. We know nothing about the data,
-      // though, so we can't really do much else.
-      if (isset($item['raw'])) {
-        $raw = $item['raw'];
-
-        if (is_array($raw)) {
-          if (isset($raw[$id]) && is_scalar($raw[$id])) {
-            $tokens['{{ ' . $this->options['id'] . '__' . $id . ' }}'] = Xss::filterAdmin($raw[$id]);
-          }
-          else {
-            // Make sure that empty values are replaced as well.
-            $tokens['{{ ' . $this->options['id'] . '__' . $id . ' }}'] = '';
-          }
-        }
-
-        if (is_object($raw)) {
-          $property = $raw->get($id);
-          // Check if TypedDataInterface is implemented so we know how to render
-          // the item as a string.
-          if (!empty($property) && $property instanceof TypedDataInterface) {
-            $tokens['{{ ' . $this->options['id'] . '__' . $id . ' }}'] = Xss::filterAdmin($property->getString());
-          }
-          else {
-            // Make sure that empty values are replaced as well.
-            $tokens['{{ ' . $this->options['id'] . '__' . $id . ' }}'] = '';
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Returns the field formatter instance.
-   *
-   * @return \Drupal\Core\Field\FormatterInterface|null
-   *   The field formatter instance.
-   */
-  protected function getFormatterInstance($format = NULL) {
-    if (!isset($format)) {
-      $format = $this->options['type'];
-    }
-    $settings = $this->options['settings'] + $this->formatterPluginManager->getDefaultSettings($format);
-
-    $options = [
-      'field_definition' => $this->getFieldDefinition(),
-      'configuration' => [
-        'type' => $format,
-        'settings' => $settings,
-        'label' => '',
-        'weight' => 0,
-      ],
-      'view_mode' => '_custom',
-    ];
-
-    return $this->formatterPluginManager->getInstance($options);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    $this->dependencies = parent::calculateDependencies();
-
-    // Add the module providing the configured field storage as a dependency.
-    if (($field_storage_definition = $this->getFieldStorageDefinition()) && $field_storage_definition instanceof EntityInterface) {
-      $this->dependencies['config'][] = $field_storage_definition->getConfigDependencyName();
-    }
-    if (!empty($this->options['type'])) {
-      // Add the module providing the formatter.
-      $this->dependencies['module'][] = $this->formatterPluginManager->getDefinition($this->options['type'])['provider'];
-
-      // Add the formatter's dependencies.
-      if (($formatter = $this->getFormatterInstance()) && $formatter instanceof DependentPluginInterface) {
-        $this->calculatePluginDependencies($formatter);
-      }
-    }
-
-    return $this->dependencies;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheMaxAge() {
-    return Cache::PERMANENT;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheContexts() {
-    return $this->getEntityFieldRenderer()->getCacheContexts();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    $field_definition = $this->getFieldDefinition();
-    $field_storage_definition = $this->getFieldStorageDefinition();
-    return Cache::mergeTags(
-      $field_definition instanceof CacheableDependencyInterface ? $field_definition->getCacheTags() : [],
-      $field_storage_definition instanceof CacheableDependencyInterface ? $field_storage_definition->getCacheTags() : []
-    );
-  }
-
-  /**
-   * Gets the table mapping for the entity type of the field.
-   *
-   * @return \Drupal\Core\Entity\Sql\DefaultTableMapping
-   *   The table mapping.
-   */
-  protected function getTableMapping() {
-    return $this->entityManager->getStorage($this->definition['entity_type'])->getTableMapping();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getValue(ResultRow $values, $field = NULL) {
-    $entity = $this->getEntity($values);
-    // Some bundles might not have a specific field, in which case the entity
-    // (potentially a fake one) doesn't have it either.
-    /** @var \Drupal\Core\Field\FieldItemListInterface $field_item_list */
-    $field_item_list = isset($entity->{$this->definition['field_name']}) ? $entity->{$this->definition['field_name']} : NULL;
-
-    if (!isset($field_item_list)) {
-      // There isn't anything we can do without a valid field.
-      return NULL;
-    }
-
-    $field_item_definition = $field_item_list->getFieldDefinition();
-
-    $values = [];
-    foreach ($field_item_list as $field_item) {
-      /** @var \Drupal\Core\Field\FieldItemInterface $field_item */
-      if ($field) {
-        $values[] = $field_item->$field;
-      }
-      // Find the value using the main property of the field. If no main
-      // property is provided fall back to 'value'.
-      elseif ($main_property_name = $field_item->mainPropertyName()) {
-        $values[] = $field_item->{$main_property_name};
-      }
-      else {
-        $values[] = $field_item->value;
-      }
-    }
-    if ($field_item_definition->getFieldStorageDefinition()->getCardinality() == 1) {
-      return reset($values);
-    }
-    else {
-      return $values;
-    }
-  }
+class Field extends EntityField {
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php b/web/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
index d7389c937..2562b954c 100644
--- a/web/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
+++ b/web/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
@@ -265,6 +265,6 @@ interface FieldHandlerInterface extends ViewsHandlerInterface {
    *   is safe it will be wrapped in an object that implements
    *   MarkupInterface. If it is empty or unsafe it will be a string.
    */
-  function theme(ResultRow $values);
+  public function theme(ResultRow $values);
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index bdb44fafd..48c59ef70 100644
--- a/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -69,7 +69,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
   const RENDER_TEXT_PHASE_EMPTY = 2;
 
   public $field_alias = 'unknown';
-  public $aliases = array();
+  public $aliases = [];
 
   /**
    * The field value prior to any rewriting.
@@ -85,7 +85,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
    *
    * @var array
    */
-  public $additional_fields = array();
+  public $additional_fields = [];
 
   /**
    * The link generator.
@@ -114,7 +114,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->additional_fields = array();
+    $this->additional_fields = [];
     if (!empty($this->definition['additional fields'])) {
       $this->additional_fields = $this->definition['additional fields'];
     }
@@ -140,7 +140,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
   public function query() {
     $this->ensureMyTable();
     // Add the field.
-    $params = $this->options['group_type'] != 'group' ? array('function' => $this->options['group_type']) : array();
+    $params = $this->options['group_type'] != 'group' ? ['function' => $this->options['group_type']] : [];
     $this->field_alias = $this->query->addField($this->tableAlias, $this->realField, NULL, $params);
 
     $this->addAdditionalFields();
@@ -165,11 +165,11 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
       $fields = $this->additional_fields;
     }
 
-    $group_params = array();
+    $group_params = [];
     if ($this->options['group_type'] != 'group') {
-      $group_params = array(
+      $group_params = [
         'function' => $this->options['group_type'],
-      );
+      ];
     }
 
     if (!empty($fields) && is_array($fields)) {
@@ -183,12 +183,12 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
           }
 
           if (empty($table_alias)) {
-            debug(t('Handler @handler tried to add additional_field @identifier but @table could not be added!', array('@handler' => $this->definition['id'], '@identifier' => $identifier, '@table' => $info['table'])));
+            debug(t('Handler @handler tried to add additional_field @identifier but @table could not be added!', ['@handler' => $this->definition['id'], '@identifier' => $identifier, '@table' => $info['table']]));
             $this->aliases[$identifier] = 'broken';
             continue;
           }
 
-          $params = array();
+          $params = [];
           if (!empty($info['params'])) {
             $params = $info['params'];
           }
@@ -210,7 +210,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
     if (isset($this->field_alias)) {
       // Since fields should always have themselves already added, just
       // add a sort on the field.
-      $params = $this->options['group_type'] != 'group' ? array('function' => $this->options['group_type']) : array();
+      $params = $this->options['group_type'] != 'group' ? ['function' => $this->options['group_type']] : [];
       $this->query->addOrderBy(NULL, NULL, $order, $this->field_alias, $params);
     }
   }
@@ -307,10 +307,10 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
     static $elements = NULL;
     if (!isset($elements)) {
       // @todo Add possible html5 elements.
-      $elements = array(
+      $elements = [
         '' => $this->t('- Use default -'),
         '0' => $this->t('- None -')
-      );
+      ];
       $elements += \Drupal::config('views.settings')->get('field_rewrite_elements');
     }
 
@@ -334,10 +334,10 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
    */
   public function tokenizeValue($value, $row_index = NULL) {
     if (strpos($value, '{{') !== FALSE) {
-      $fake_item = array(
+      $fake_item = [
         'alter_text' => TRUE,
         'text' => $value,
-      );
+      ];
 
       // Use isset() because empty() will trigger on 0 and 0 is
       // the first row.
@@ -421,60 +421,60 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['label'] = array('default' => '');
+    $options['label'] = ['default' => ''];
     // Some styles (for example table) should have labels enabled by default.
     $style = $this->view->getStyle();
     if (isset($style) && $style->defaultFieldLabels()) {
       $options['label']['default'] = $this->definition['title'];
     }
 
-    $options['exclude'] = array('default' => FALSE);
-    $options['alter'] = array(
-      'contains' => array(
-        'alter_text' => array('default' => FALSE),
-        'text' => array('default' => ''),
-        'make_link' => array('default' => FALSE),
-        'path' => array('default' => ''),
-        'absolute' => array('default' => FALSE),
-        'external' => array('default' => FALSE),
-        'replace_spaces' => array('default' => FALSE),
-        'path_case' => array('default' => 'none'),
-        'trim_whitespace' => array('default' => FALSE),
-        'alt' => array('default' => ''),
-        'rel' => array('default' => ''),
-        'link_class' => array('default' => ''),
-        'prefix' => array('default' => ''),
-        'suffix' => array('default' => ''),
-        'target' => array('default' => ''),
-        'nl2br' => array('default' => FALSE),
-        'max_length' => array('default' => 0),
-        'word_boundary' => array('default' => TRUE),
-        'ellipsis' => array('default' => TRUE),
-        'more_link' => array('default' => FALSE),
-        'more_link_text' => array('default' => ''),
-        'more_link_path' => array('default' => ''),
-        'strip_tags' => array('default' => FALSE),
-        'trim' => array('default' => FALSE),
-        'preserve_tags' => array('default' => ''),
-        'html' => array('default' => FALSE),
-      ),
-    );
-    $options['element_type'] = array('default' => '');
-    $options['element_class'] = array('default' => '');
+    $options['exclude'] = ['default' => FALSE];
+    $options['alter'] = [
+      'contains' => [
+        'alter_text' => ['default' => FALSE],
+        'text' => ['default' => ''],
+        'make_link' => ['default' => FALSE],
+        'path' => ['default' => ''],
+        'absolute' => ['default' => FALSE],
+        'external' => ['default' => FALSE],
+        'replace_spaces' => ['default' => FALSE],
+        'path_case' => ['default' => 'none'],
+        'trim_whitespace' => ['default' => FALSE],
+        'alt' => ['default' => ''],
+        'rel' => ['default' => ''],
+        'link_class' => ['default' => ''],
+        'prefix' => ['default' => ''],
+        'suffix' => ['default' => ''],
+        'target' => ['default' => ''],
+        'nl2br' => ['default' => FALSE],
+        'max_length' => ['default' => 0],
+        'word_boundary' => ['default' => TRUE],
+        'ellipsis' => ['default' => TRUE],
+        'more_link' => ['default' => FALSE],
+        'more_link_text' => ['default' => ''],
+        'more_link_path' => ['default' => ''],
+        'strip_tags' => ['default' => FALSE],
+        'trim' => ['default' => FALSE],
+        'preserve_tags' => ['default' => ''],
+        'html' => ['default' => FALSE],
+      ],
+    ];
+    $options['element_type'] = ['default' => ''];
+    $options['element_class'] = ['default' => ''];
 
-    $options['element_label_type'] = array('default' => '');
-    $options['element_label_class'] = array('default' => '');
-    $options['element_label_colon'] = array('default' => TRUE);
+    $options['element_label_type'] = ['default' => ''];
+    $options['element_label_class'] = ['default' => ''];
+    $options['element_label_colon'] = ['default' => TRUE];
 
-    $options['element_wrapper_type'] = array('default' => '');
-    $options['element_wrapper_class'] = array('default' => '');
+    $options['element_wrapper_type'] = ['default' => ''];
+    $options['element_wrapper_class'] = ['default' => ''];
 
-    $options['element_default_classes'] = array('default' => TRUE);
+    $options['element_default_classes'] = ['default' => TRUE];
 
-    $options['empty'] = array('default' => '');
-    $options['hide_empty'] = array('default' => FALSE);
-    $options['empty_zero'] = array('default' => FALSE);
-    $options['hide_alter_empty'] = array('default' => TRUE);
+    $options['empty'] = ['default' => ''];
+    $options['hide_empty'] = ['default' => FALSE];
+    $options['empty_zero'] = ['default' => FALSE];
+    $options['hide_alter_empty'] = ['default' => TRUE];
 
     return $options;
   }
@@ -484,8 +484,8 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
    */
   public function submitOptionsForm(&$form, FormStateInterface $form_state) {
     $options = &$form_state->getValue('options');
-    $types = array('element_type', 'element_label_type', 'element_wrapper_type');
-    $classes = array_combine(array('element_class', 'element_label_class', 'element_wrapper_class'), $types);
+    $types = ['element_type', 'element_label_type', 'element_wrapper_type'];
+    $classes = array_combine(['element_class', 'element_label_class', 'element_wrapper_class'], $types);
 
     foreach ($types as $type) {
       if (!$options[$type . '_enable']) {
@@ -513,349 +513,349 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
     parent::buildOptionsForm($form, $form_state);
 
     $label = $this->label();
-    $form['custom_label'] = array(
+    $form['custom_label'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Create a label'),
       '#default_value' => $label !== '',
       '#weight' => -103,
-    );
-    $form['label'] = array(
+    ];
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Label'),
       '#default_value' => $label,
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[custom_label]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[custom_label]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#weight' => -102,
-    );
-    $form['element_label_colon'] = array(
+    ];
+    $form['element_label_colon'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Place a colon after the label'),
       '#default_value' => $this->options['element_label_colon'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[custom_label]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[custom_label]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#weight' => -101,
-    );
+    ];
 
-    $form['exclude'] = array(
+    $form['exclude'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Exclude from display'),
       '#default_value' => $this->options['exclude'],
       '#description' => $this->t('Enable to load this field as hidden. Often used to group fields, or to use as token in another field.'),
       '#weight' => -100,
-    );
+    ];
 
-    $form['style_settings'] = array(
+    $form['style_settings'] = [
       '#type' => 'details',
       '#title' => $this->t('Style settings'),
       '#weight' => 99,
-    );
+    ];
 
-    $form['element_type_enable'] = array(
+    $form['element_type_enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Customize field HTML'),
       '#default_value' => !empty($this->options['element_type']) || (string) $this->options['element_type'] == '0' || !empty($this->options['element_class']) || (string) $this->options['element_class'] == '0',
       '#fieldset' => 'style_settings',
-    );
-    $form['element_type'] = array(
+    ];
+    $form['element_type'] = [
       '#title' => $this->t('HTML element'),
       '#options' => $this->getElements(),
       '#type' => 'select',
       '#default_value' => $this->options['element_type'],
       '#description' => $this->t('Choose the HTML element to wrap around this field, e.g. H1, H2, etc.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[element_type_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[element_type_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#fieldset' => 'style_settings',
-    );
+    ];
 
-    $form['element_class_enable'] = array(
+    $form['element_class_enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Create a CSS class'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[element_type_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[element_type_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#default_value' => !empty($this->options['element_class']) || (string) $this->options['element_class'] == '0',
       '#fieldset' => 'style_settings',
-    );
-    $form['element_class'] = array(
+    ];
+    $form['element_class'] = [
       '#title' => $this->t('CSS class'),
       '#description' => $this->t('You may use token substitutions from the rewriting section in this class.'),
       '#type' => 'textfield',
       '#default_value' => $this->options['element_class'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[element_type_enable]"]' => array('checked' => TRUE),
-          ':input[name="options[element_class_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[element_type_enable]"]' => ['checked' => TRUE],
+          ':input[name="options[element_class_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#fieldset' => 'style_settings',
-    );
+    ];
 
-    $form['element_label_type_enable'] = array(
+    $form['element_label_type_enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Customize label HTML'),
       '#default_value' => !empty($this->options['element_label_type']) || (string) $this->options['element_label_type'] == '0' || !empty($this->options['element_label_class']) || (string) $this->options['element_label_class'] == '0',
       '#fieldset' => 'style_settings',
-    );
-    $form['element_label_type'] = array(
+    ];
+    $form['element_label_type'] = [
       '#title' => $this->t('Label HTML element'),
       '#options' => $this->getElements(FALSE),
       '#type' => 'select',
       '#default_value' => $this->options['element_label_type'],
       '#description' => $this->t('Choose the HTML element to wrap around this label, e.g. H1, H2, etc.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[element_label_type_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[element_label_type_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#fieldset' => 'style_settings',
-    );
-    $form['element_label_class_enable'] = array(
+    ];
+    $form['element_label_class_enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Create a CSS class'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[element_label_type_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[element_label_type_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#default_value' => !empty($this->options['element_label_class']) || (string) $this->options['element_label_class'] == '0',
       '#fieldset' => 'style_settings',
-    );
-    $form['element_label_class'] = array(
+    ];
+    $form['element_label_class'] = [
       '#title' => $this->t('CSS class'),
       '#description' => $this->t('You may use token substitutions from the rewriting section in this class.'),
       '#type' => 'textfield',
       '#default_value' => $this->options['element_label_class'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[element_label_type_enable]"]' => array('checked' => TRUE),
-          ':input[name="options[element_label_class_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[element_label_type_enable]"]' => ['checked' => TRUE],
+          ':input[name="options[element_label_class_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#fieldset' => 'style_settings',
-    );
+    ];
 
-    $form['element_wrapper_type_enable'] = array(
+    $form['element_wrapper_type_enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Customize field and label wrapper HTML'),
       '#default_value' => !empty($this->options['element_wrapper_type']) || (string) $this->options['element_wrapper_type'] == '0' || !empty($this->options['element_wrapper_class']) || (string) $this->options['element_wrapper_class'] == '0',
       '#fieldset' => 'style_settings',
-    );
-    $form['element_wrapper_type'] = array(
+    ];
+    $form['element_wrapper_type'] = [
       '#title' => $this->t('Wrapper HTML element'),
       '#options' => $this->getElements(FALSE),
       '#type' => 'select',
       '#default_value' => $this->options['element_wrapper_type'],
       '#description' => $this->t('Choose the HTML element to wrap around this field and label, e.g. H1, H2, etc. This may not be used if the field and label are not rendered together, such as with a table.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[element_wrapper_type_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[element_wrapper_type_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#fieldset' => 'style_settings',
-    );
+    ];
 
-    $form['element_wrapper_class_enable'] = array(
+    $form['element_wrapper_class_enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Create a CSS class'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[element_wrapper_type_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[element_wrapper_type_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#default_value' => !empty($this->options['element_wrapper_class']) || (string) $this->options['element_wrapper_class'] == '0',
       '#fieldset' => 'style_settings',
-    );
-    $form['element_wrapper_class'] = array(
+    ];
+    $form['element_wrapper_class'] = [
       '#title' => $this->t('CSS class'),
       '#description' => $this->t('You may use token substitutions from the rewriting section in this class.'),
       '#type' => 'textfield',
       '#default_value' => $this->options['element_wrapper_class'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[element_wrapper_class_enable]"]' => array('checked' => TRUE),
-          ':input[name="options[element_wrapper_type_enable]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="options[element_wrapper_class_enable]"]' => ['checked' => TRUE],
+          ':input[name="options[element_wrapper_type_enable]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#fieldset' => 'style_settings',
-    );
+    ];
 
-    $form['element_default_classes'] = array(
+    $form['element_default_classes'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Add default classes'),
       '#default_value' => $this->options['element_default_classes'],
       '#description' => $this->t('Use default Views classes to identify the field, field label and field content.'),
       '#fieldset' => 'style_settings',
-    );
+    ];
 
-    $form['alter'] = array(
+    $form['alter'] = [
       '#title' => $this->t('Rewrite results'),
       '#type' => 'details',
       '#weight' => 100,
-    );
+    ];
 
     if ($this->allowAdvancedRender()) {
       $form['alter']['#tree'] = TRUE;
-      $form['alter']['alter_text'] = array(
+      $form['alter']['alter_text'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Override the output of this field with custom text'),
         '#default_value' => $this->options['alter']['alter_text'],
-      );
+      ];
 
-      $form['alter']['text'] = array(
+      $form['alter']['text'] = [
         '#title' => $this->t('Text'),
         '#type' => 'textarea',
         '#default_value' => $this->options['alter']['text'],
-        '#description' => $this->t('The text to display for this field. You may include HTML or <a href=":url">Twig</a>. You may enter data from this view as per the "Replacement patterns" below.', array(':url' => CoreUrl::fromUri('http://twig.sensiolabs.org/documentation')->toString())),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][alter_text]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#description' => $this->t('The text to display for this field. You may include HTML or <a href=":url">Twig</a>. You may enter data from this view as per the "Replacement patterns" below.', [':url' => CoreUrl::fromUri('http://twig.sensiolabs.org/documentation')->toString()]),
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][alter_text]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
 
-      $form['alter']['make_link'] = array(
+      $form['alter']['make_link'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Output this field as a custom link'),
         '#default_value' => $this->options['alter']['make_link'],
-      );
-      $form['alter']['path'] = array(
+      ];
+      $form['alter']['path'] = [
         '#title' => $this->t('Link path'),
         '#type' => 'textfield',
         '#default_value' => $this->options['alter']['path'],
         '#description' => $this->t('The Drupal path or absolute URL for this link. You may enter data from this view as per the "Replacement patterns" below.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
         '#maxlength' => 255,
-      );
-      $form['alter']['absolute'] = array(
+      ];
+      $form['alter']['absolute'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Use absolute path'),
         '#default_value' => $this->options['alter']['absolute'],
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['alter']['replace_spaces'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['alter']['replace_spaces'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Replace spaces with dashes'),
         '#default_value' => $this->options['alter']['replace_spaces'],
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['alter']['external'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['alter']['external'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('External server URL'),
         '#default_value' => $this->options['alter']['external'],
         '#description' => $this->t("Links to an external server using a full URL: e.g. 'http://www.example.com' or 'www.example.com'."),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['alter']['path_case'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['alter']['path_case'] = [
         '#type' => 'select',
         '#title' => $this->t('Transform the case'),
         '#description' => $this->t('When printing URL paths, how to transform the case of the filter value.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-       '#options' => array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+        '#options' => [
           'none' => $this->t('No transform'),
           'upper' => $this->t('Upper case'),
           'lower' => $this->t('Lower case'),
           'ucfirst' => $this->t('Capitalize first letter'),
           'ucwords' => $this->t('Capitalize each word'),
-        ),
+        ],
         '#default_value' => $this->options['alter']['path_case'],
-      );
-      $form['alter']['link_class'] = array(
+      ];
+      $form['alter']['link_class'] = [
         '#title' => $this->t('Link class'),
         '#type' => 'textfield',
         '#default_value' => $this->options['alter']['link_class'],
         '#description' => $this->t('The CSS class to apply to the link.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['alter']['alt'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['alter']['alt'] = [
         '#title' => $this->t('Title text'),
         '#type' => 'textfield',
         '#default_value' => $this->options['alter']['alt'],
         '#description' => $this->t('Text to place as "title" text which most browsers display as a tooltip when hovering over the link.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['alter']['rel'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['alter']['rel'] = [
         '#title' => $this->t('Rel Text'),
         '#type' => 'textfield',
         '#default_value' => $this->options['alter']['rel'],
         '#description' => $this->t('Include Rel attribute for use in lightbox2 or other javascript utility.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['alter']['prefix'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['alter']['prefix'] = [
         '#title' => $this->t('Prefix text'),
         '#type' => 'textfield',
         '#default_value' => $this->options['alter']['prefix'],
         '#description' => $this->t('Any text to display before this link. You may include HTML.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['alter']['suffix'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['alter']['suffix'] = [
         '#title' => $this->t('Suffix text'),
         '#type' => 'textfield',
         '#default_value' => $this->options['alter']['suffix'],
         '#description' => $this->t('Any text to display after this link. You may include HTML.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['alter']['target'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['alter']['target'] = [
         '#title' => $this->t('Target'),
         '#type' => 'textfield',
         '#default_value' => $this->options['alter']['target'],
         '#description' => $this->t("Target of the link, such as _blank, _parent or an iframe's name. This field is rarely used."),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
 
 
       // Get a list of the available fields and arguments for token replacement.
@@ -871,8 +871,8 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
       $options[$optgroup_fields]["{{ {$this->options['id']} }}"] = substr(strrchr($this->adminLabel(), ":"), 2 );
 
       foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
-        $options[$optgroup_arguments]["{{ arguments.$arg }}"] = $this->t('@argument title', array('@argument' => $handler->adminLabel()));
-        $options[$optgroup_arguments]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', array('@argument' => $handler->adminLabel()));
+        $options[$optgroup_arguments]["{{ arguments.$arg }}"] = $this->t('@argument title', ['@argument' => $handler->adminLabel()]);
+        $options[$optgroup_arguments]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', ['@argument' => $handler->adminLabel()]);
       }
 
       $this->documentSelfTokens($options[$optgroup_fields]);
@@ -890,14 +890,14 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
         ];
         foreach (array_keys($options) as $type) {
           if (!empty($options[$type])) {
-            $items = array();
+            $items = [];
             foreach ($options[$type] as $key => $value) {
               $items[] = $key . ' == ' . $value;
             }
-            $item_list = array(
+            $item_list = [
               '#theme' => 'item_list',
               '#items' => $items,
-            );
+            ];
             $output[] = $item_list;
           }
         }
@@ -906,181 +906,181 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
       // run. It also has an extra div because the dependency wants to hide
       // the parent in situations like this, so we need a second div to
       // make this work.
-      $form['alter']['help'] = array(
+      $form['alter']['help'] = [
         '#type' => 'details',
         '#title' => $this->t('Replacement patterns'),
         '#value' => $output,
-        '#states' => array(
-          'visible' => array(
-            array(
-              ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
-            ),
-            array(
-              ':input[name="options[alter][alter_text]"]' => array('checked' => TRUE),
-            ),
-            array(
-              ':input[name="options[alter][more_link]"]' => array('checked' => TRUE),
-            ),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            [
+              ':input[name="options[alter][make_link]"]' => ['checked' => TRUE],
+            ],
+            [
+              ':input[name="options[alter][alter_text]"]' => ['checked' => TRUE],
+            ],
+            [
+              ':input[name="options[alter][more_link]"]' => ['checked' => TRUE],
+            ],
+          ],
+        ],
+      ];
 
-      $form['alter']['trim'] = array(
+      $form['alter']['trim'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Trim this field to a maximum number of characters'),
         '#default_value' => $this->options['alter']['trim'],
-      );
+      ];
 
-      $form['alter']['max_length'] = array(
+      $form['alter']['max_length'] = [
         '#title' => $this->t('Maximum number of characters'),
         '#type' => 'textfield',
         '#default_value' => $this->options['alter']['max_length'],
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][trim]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
 
-      $form['alter']['word_boundary'] = array(
+      $form['alter']['word_boundary'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Trim only on a word boundary'),
         '#description' => $this->t('If checked, this field be trimmed only on a word boundary. This is guaranteed to be the maximum characters stated or less. If there are no word boundaries this could trim a field to nothing.'),
         '#default_value' => $this->options['alter']['word_boundary'],
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][trim]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
 
-      $form['alter']['ellipsis'] = array(
+      $form['alter']['ellipsis'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Add "…" at the end of trimmed text'),
         '#default_value' => $this->options['alter']['ellipsis'],
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][trim]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
 
-      $form['alter']['more_link'] = array(
+      $form['alter']['more_link'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Add a read-more link if output is trimmed'),
         '#default_value' => $this->options['alter']['more_link'],
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][trim]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
 
-      $form['alter']['more_link_text'] = array(
+      $form['alter']['more_link_text'] = [
         '#type' => 'textfield',
         '#title' => $this->t('More link label'),
         '#default_value' => $this->options['alter']['more_link_text'],
         '#description' => $this->t('You may use the "Replacement patterns" above.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
-            ':input[name="options[alter][more_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
-      $form['alter']['more_link_path'] = array(
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][trim]"]' => ['checked' => TRUE],
+            ':input[name="options[alter][more_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
+      $form['alter']['more_link_path'] = [
         '#type' => 'textfield',
         '#title' => $this->t('More link path'),
         '#default_value' => $this->options['alter']['more_link_path'],
         '#description' => $this->t('This can be an internal Drupal path such as node/add or an external URL such as "https://www.drupal.org". You may use the "Replacement patterns" above.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
-            ':input[name="options[alter][more_link]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][trim]"]' => ['checked' => TRUE],
+            ':input[name="options[alter][more_link]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
 
-      $form['alter']['html'] = array(
+      $form['alter']['html'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Field can contain HTML'),
         '#description' => $this->t('An HTML corrector will be run to ensure HTML tags are properly closed after trimming.'),
         '#default_value' => $this->options['alter']['html'],
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][trim]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][trim]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
 
-      $form['alter']['strip_tags'] = array(
+      $form['alter']['strip_tags'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Strip HTML tags'),
         '#default_value' => $this->options['alter']['strip_tags'],
-      );
+      ];
 
-      $form['alter']['preserve_tags'] = array(
+      $form['alter']['preserve_tags'] = [
         '#type' => 'textfield',
         '#title' => $this->t('Preserve certain tags'),
         '#description' => $this->t('List the tags that need to be preserved during the stripping process. example &quot;&lt;p&gt; &lt;br&gt;&quot; which will preserve all p and br elements'),
         '#default_value' => $this->options['alter']['preserve_tags'],
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[alter][strip_tags]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="options[alter][strip_tags]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
 
-      $form['alter']['trim_whitespace'] = array(
+      $form['alter']['trim_whitespace'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Remove whitespace'),
         '#default_value' => $this->options['alter']['trim_whitespace'],
-      );
+      ];
 
-      $form['alter']['nl2br'] = array(
+      $form['alter']['nl2br'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Convert newlines to HTML &lt;br&gt; tags'),
         '#default_value' => $this->options['alter']['nl2br'],
-      );
+      ];
     }
 
-    $form['empty_field_behavior'] = array(
+    $form['empty_field_behavior'] = [
       '#type' => 'details',
       '#title' => $this->t('No results behavior'),
       '#weight' => 100,
-    );
+    ];
 
-    $form['empty'] = array(
+    $form['empty'] = [
       '#type' => 'textarea',
       '#title' => $this->t('No results text'),
       '#default_value' => $this->options['empty'],
       '#description' => $this->t('Provide text to display if this field contains an empty result. You may include HTML. You may enter data from this view as per the "Replacement patterns" in the "Rewrite Results" section below.'),
       '#fieldset' => 'empty_field_behavior',
-    );
+    ];
 
-    $form['empty_zero'] = array(
+    $form['empty_zero'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Count the number 0 as empty'),
       '#default_value' => $this->options['empty_zero'],
       '#description' => $this->t('Enable to display the "no results text" if the field contains the number 0.'),
       '#fieldset' => 'empty_field_behavior',
-    );
+    ];
 
-    $form['hide_empty'] = array(
+    $form['hide_empty'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Hide if empty'),
       '#default_value' => $this->options['hide_empty'],
       '#description' => $this->t('Enable to hide this field if it is empty. Note that the field label or rewritten output may still be displayed. To hide labels, check the style or row style settings for empty fields. To hide rewritten content, check the "Hide rewriting if empty" checkbox.'),
       '#fieldset' => 'empty_field_behavior',
-    );
+    ];
 
-    $form['hide_alter_empty'] = array(
+    $form['hide_alter_empty'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Hide rewriting if empty'),
       '#default_value' => $this->options['hide_alter_empty'],
       '#description' => $this->t('Do not display rewritten content if this field is empty.'),
       '#fieldset' => 'empty_field_behavior',
-    );
+    ];
   }
 
   /**
@@ -1152,7 +1152,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
     if ($this->allowAdvancedRender()) {
       $tokens = NULL;
       if ($this instanceof MultiItemsFieldHandlerInterface) {
-        $items = array();
+        $items = [];
         foreach ($raw_items as $count => $item) {
           $value = $this->render_item($count, $item);
           if (is_array($value)) {
@@ -1169,7 +1169,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
         $value = $this->renderItems($items);
       }
       else {
-        $alter = array('phase' => static::RENDER_TEXT_PHASE_COMPLETELY) + $this->options['alter'];
+        $alter = ['phase' => static::RENDER_TEXT_PHASE_COMPLETELY] + $this->options['alter'];
         $value = $this->renderText($alter);
       }
 
@@ -1291,13 +1291,13 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
 
         // @todo Views should expect and store a leading /. See
         //   https://www.drupal.org/node/2423913.
-        $options = array(
-          'attributes' => array(
-            'class' => array(
+        $options = [
+          'attributes' => [
+            'class' => [
               'views-more-link',
-            ),
-          ),
-        );
+            ],
+          ],
+        ];
         if (UrlHelper::isExternal($more_link_path)) {
           $more_link_url = CoreUrl::fromUri($more_link_path, $options);
         }
@@ -1375,7 +1375,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
    * the user.
    */
   protected function renderAsLink($alter, $text, $tokens) {
-    $options = array(
+    $options = [
       'absolute' => !empty($alter['absolute']) ? TRUE : FALSE,
       'alias' => FALSE,
       'entity' => NULL,
@@ -1383,7 +1383,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
       'fragment' => NULL,
       'language' => NULL,
       'query' => [],
-    );
+    ];
 
     $alter += [
       'path' => NULL
@@ -1395,7 +1395,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
     if ($path != '<front>') {
       // Use strip_tags as there should never be HTML in the path.
       // However, we need to preserve special characters like " that were
-      // removed by SafeMarkup::checkPlain().
+      // removed by Html::escape().
       $path = Html::decodeEntities($this->viewsTokenReplace($alter['path'], $tokens));
 
       // Tokens might contain <front>, so check for <front> again.
@@ -1488,7 +1488,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
     }
 
     if (isset($url['fragment'])) {
-      $path = strtr($path, array('#' . $url['fragment'] => ''));
+      $path = strtr($path, ['#' . $url['fragment'] => '']);
       // If the path is empty we want to have a fragment for the current site.
       if ($path == '') {
         $options['external'] = TRUE;
@@ -1504,7 +1504,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
 
     $class = $this->viewsTokenReplace($alter['link_class'], $tokens);
     if ($class) {
-      $options['attributes']['class'] = array($class);
+      $options['attributes']['class'] = [$class];
     }
 
     if (!empty($alter['rel']) && $rel = $this->viewsTokenReplace($alter['rel'], $tokens)) {
@@ -1534,7 +1534,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
       // \Drupal\Core\Utility\LinkGeneratorInterface::generate().
       $options['query'] = UrlHelper::buildQuery($alter['query']);
       $options['query'] = $this->viewsTokenReplace($options['query'], $tokens);
-      $query = array();
+      $query = [];
       parse_str($options['query'], $query);
       $options['query'] = $query;
     }
@@ -1582,7 +1582,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
    * {@inheritdoc}
    */
   public function getRenderTokens($item) {
-    $tokens = array();
+    $tokens = [];
     if (!empty($this->view->build_info['substitutions'])) {
       $tokens = $this->view->build_info['substitutions'];
     }
@@ -1595,7 +1595,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
 
       // Use strip tags as there should never be HTML in the path.
       // However, we need to preserve special characters like " that
-      // were removed by SafeMarkup::checkPlain().
+      // were removed by Html::escape().
       $tokens["{{ raw_arguments.$arg }}"] = isset($this->view->args[$count]) ? strip_tags(Html::decodeEntities($this->view->args[$count])) : '';
       $count++;
     }
@@ -1677,8 +1677,8 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
    * @return
    *   An array of available tokens, with nested keys representative of the array structure.
    */
-  protected function getTokenValuesRecursive(array $array, array $parent_keys = array()) {
-    $tokens = array();
+  protected function getTokenValuesRecursive(array $array, array $parent_keys = []) {
+    $tokens = [];
 
     foreach ($array as $param => $val) {
       if (is_array($val)) {
@@ -1725,14 +1725,14 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
   /**
    * {@inheritdoc}
    */
-  function theme(ResultRow $values) {
+  public function theme(ResultRow $values) {
     $renderer = $this->getRenderer();
-    $build = array(
+    $build = [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#field' => $this,
       '#row' => $values,
-    );
+    ];
     $output = $renderer->render($build);
 
     // Set the bubbleable rendering metadata on $view->element. This ensures the
@@ -1744,7 +1744,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
   }
 
   public function themeFunctions() {
-    $themes = array();
+    $themes = [];
     $hook = 'views_view_field';
 
     $display = $this->view->display_handler->display;
diff --git a/web/core/modules/views/src/Plugin/views/field/FileSize.php b/web/core/modules/views/src/Plugin/views/field/FileSize.php
index af184d3e1..c8a0b9568 100644
--- a/web/core/modules/views/src/Plugin/views/field/FileSize.php
+++ b/web/core/modules/views/src/Plugin/views/field/FileSize.php
@@ -20,7 +20,7 @@ class FileSize extends FieldPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['file_size_display'] = array('default' => 'formatted');
+    $options['file_size_display'] = ['default' => 'formatted'];
 
     return $options;
   }
@@ -30,14 +30,14 @@ class FileSize extends FieldPluginBase {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['file_size_display'] = array(
+    $form['file_size_display'] = [
       '#title' => $this->t('File size display'),
       '#type' => 'select',
-      '#options' => array(
+      '#options' => [
         'formatted' => $this->t('Formatted (in KB or MB)'),
         'bytes' => $this->t('Raw bytes'),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/field/LanguageField.php b/web/core/modules/views/src/Plugin/views/field/LanguageField.php
index f51f2fbba..53e2c84e1 100644
--- a/web/core/modules/views/src/Plugin/views/field/LanguageField.php
+++ b/web/core/modules/views/src/Plugin/views/field/LanguageField.php
@@ -19,7 +19,7 @@ class LanguageField extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['native_language'] = array('default' => FALSE);
+    $options['native_language'] = ['default' => FALSE];
 
     return $options;
   }
@@ -29,11 +29,11 @@ class LanguageField extends FieldPluginBase {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['native_language'] = array(
+    $form['native_language'] = [
       '#title' => $this->t('Display in native language'),
       '#type' => 'checkbox',
       '#default_value' => $this->options['native_language'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/field/LinkBase.php b/web/core/modules/views/src/Plugin/views/field/LinkBase.php
index ebe1e9d0c..31dca4c7c 100644
--- a/web/core/modules/views/src/Plugin/views/field/LinkBase.php
+++ b/web/core/modules/views/src/Plugin/views/field/LinkBase.php
@@ -82,7 +82,7 @@ abstract class LinkBase extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['text'] = array('default' => $this->getDefaultLabel());
+    $options['text'] = ['default' => $this->getDefaultLabel()];
     return $options;
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/field/Links.php b/web/core/modules/views/src/Plugin/views/field/Links.php
index 6f1695721..4e731a9af 100644
--- a/web/core/modules/views/src/Plugin/views/field/Links.php
+++ b/web/core/modules/views/src/Plugin/views/field/Links.php
@@ -26,8 +26,8 @@ abstract class Links extends FieldPluginBase {
   public function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['fields'] = array('default' => array());
-    $options['destination'] = array('default' => TRUE);
+    $options['fields'] = ['default' => []];
+    $options['destination'] = ['default' => TRUE];
 
     return $options;
   }
@@ -39,19 +39,19 @@ abstract class Links extends FieldPluginBase {
     parent::buildOptionsForm($form, $form_state);
     // Only show fields that precede this one.
     $field_options = $this->getPreviousFieldLabels();
-    $form['fields'] = array(
+    $form['fields'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Fields'),
       '#description' => $this->t('Fields to be included as links.'),
       '#options' => $field_options,
       '#default_value' => $this->options['fields'],
-    );
-    $form['destination'] = array(
+    ];
+    $form['destination'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Include destination'),
       '#description' => $this->t('Include a "destination" parameter in the link to return the user to the original view upon completing the link action.'),
       '#default_value' => $this->options['destination'],
-    );
+    ];
   }
 
   /**
@@ -61,7 +61,7 @@ abstract class Links extends FieldPluginBase {
    *   The links which are used by the render function.
    */
   protected function getLinks() {
-    $links = array();
+    $links = [];
     foreach ($this->options['fields'] as $field) {
       if (empty($this->view->field[$field]->last_render_text)) {
         continue;
@@ -76,13 +76,13 @@ abstract class Links extends FieldPluginBase {
         $url = $this->view->field[$field]->options['alter']['url'];
       }
       // Make sure that tokens are replaced for this paths as well.
-      $tokens = $this->getRenderTokens(array());
+      $tokens = $this->getRenderTokens([]);
       $path = strip_tags(Html::decodeEntities($this->viewsTokenReplace($path, $tokens)));
 
-      $links[$field] = array(
+      $links[$field] = [
         'url' => $path ? UrlObject::fromUri('internal:/' . $path) : $url,
         'title' => $title,
-      );
+      ];
       if (!empty($this->options['destination'])) {
         $links[$field]['query'] = \Drupal::destination()->getAsArray();
       }
diff --git a/web/core/modules/views/src/Plugin/views/field/MachineName.php b/web/core/modules/views/src/Plugin/views/field/MachineName.php
index feba80e63..ea6a0c4be 100644
--- a/web/core/modules/views/src/Plugin/views/field/MachineName.php
+++ b/web/core/modules/views/src/Plugin/views/field/MachineName.php
@@ -36,7 +36,7 @@ class MachineName extends FieldPluginBase {
       }
     }
     else {
-      $this->valueOptions = array();
+      $this->valueOptions = [];
     }
   }
 
@@ -45,7 +45,7 @@ class MachineName extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['machine_name'] = array('default' => FALSE);
+    $options['machine_name'] = ['default' => FALSE];
 
     return $options;
   }
@@ -56,12 +56,12 @@ class MachineName extends FieldPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['machine_name'] = array(
+    $form['machine_name'] = [
       '#title' => $this->t('Output machine name'),
       '#description' => $this->t('Display field as machine name.'),
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['machine_name']),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/field/Markup.php b/web/core/modules/views/src/Plugin/views/field/Markup.php
index 7ca789f64..883bd56fb 100644
--- a/web/core/modules/views/src/Plugin/views/field/Markup.php
+++ b/web/core/modules/views/src/Plugin/views/field/Markup.php
@@ -29,7 +29,7 @@ class Markup extends FieldPluginBase {
 
     $this->format = $this->definition['format'];
 
-    $this->additional_fields = array();
+    $this->additional_fields = [];
     if (is_array($this->format)) {
       $this->additional_fields['format'] = $this->format;
     }
diff --git a/web/core/modules/views/src/Plugin/views/field/NumericField.php b/web/core/modules/views/src/Plugin/views/field/NumericField.php
index 0cf4c889b..8b6a20912 100644
--- a/web/core/modules/views/src/Plugin/views/field/NumericField.php
+++ b/web/core/modules/views/src/Plugin/views/field/NumericField.php
@@ -25,14 +25,14 @@ class NumericField extends FieldPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['set_precision'] = array('default' => FALSE);
-    $options['precision'] = array('default' => 0);
-    $options['decimal'] = array('default' => '.');
-    $options['separator'] = array('default' => ',');
-    $options['format_plural'] = array('default' => FALSE);
-    $options['format_plural_string'] = array('default' => '1' . LOCALE_PLURAL_DELIMITER . '@count');
-    $options['prefix'] = array('default' => '');
-    $options['suffix'] = array('default' => '');
+    $options['set_precision'] = ['default' => FALSE];
+    $options['precision'] = ['default' => 0];
+    $options['decimal'] = ['default' => '.'];
+    $options['separator'] = ['default' => ','];
+    $options['format_plural'] = ['default' => FALSE];
+    $options['format_plural_string'] = ['default' => '1' . LOCALE_PLURAL_DELIMITER . '@count'];
+    $options['prefix'] = ['default' => ''];
+    $options['suffix'] = ['default' => ''];
 
     return $options;
   }
@@ -42,72 +42,72 @@ class NumericField extends FieldPluginBase {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     if (!empty($this->definition['float'])) {
-      $form['set_precision'] = array(
+      $form['set_precision'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Round'),
         '#description' => $this->t('If checked, the number will be rounded.'),
         '#default_value' => $this->options['set_precision'],
-      );
-      $form['precision'] = array(
+      ];
+      $form['precision'] = [
         '#type' => 'textfield',
         '#title' => $this->t('Precision'),
         '#default_value' => $this->options['precision'],
         '#description' => $this->t('Specify how many digits to print after the decimal point.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[set_precision]"]' => array('checked' => TRUE),
-          ),
-        ),
+        '#states' => [
+          'visible' => [
+            ':input[name="options[set_precision]"]' => ['checked' => TRUE],
+          ],
+        ],
         '#size' => 2,
-      );
-      $form['decimal'] = array(
+      ];
+      $form['decimal'] = [
         '#type' => 'textfield',
         '#title' => $this->t('Decimal point'),
         '#default_value' => $this->options['decimal'],
         '#description' => $this->t('What single character to use as a decimal point.'),
         '#size' => 2,
-      );
+      ];
     }
-    $form['separator'] = array(
+    $form['separator'] = [
       '#type' => 'select',
       '#title' => $this->t('Thousands marker'),
-      '#options' => array(
+      '#options' => [
         '' => $this->t('- None -'),
         ',' => $this->t('Comma'),
         ' ' => $this->t('Space'),
         '.' => $this->t('Decimal'),
         '\'' => $this->t('Apostrophe'),
-      ),
+      ],
       '#default_value' => $this->options['separator'],
       '#description' => $this->t('What single character to use as the thousands separator.'),
       '#size' => 2,
-    );
-    $form['format_plural'] = array(
+    ];
+    $form['format_plural'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Format plural'),
       '#description' => $this->t('If checked, special handling will be used for plurality.'),
       '#default_value' => $this->options['format_plural'],
-    );
-    $form['format_plural_string'] = array(
+    ];
+    $form['format_plural_string'] = [
       '#type' => 'value',
       '#default_value' => $this->options['format_plural_string'],
-    );
+    ];
 
     $plural_array = explode(LOCALE_PLURAL_DELIMITER, $this->options['format_plural_string']);
     $plurals = $this->getNumberOfPlurals($this->view->storage->get('langcode'));
     for ($i = 0; $i < $plurals; $i++) {
-      $form['format_plural_values'][$i] = array(
+      $form['format_plural_values'][$i] = [
         '#type' => 'textfield',
         // @todo Should use better labels https://www.drupal.org/node/2499639
         '#title' => ($i == 0 ? $this->t('Singular form') : $this->formatPlural($i, 'First plural form', '@count. plural form')),
         '#default_value' => isset($plural_array[$i]) ? $plural_array[$i] : '',
         '#description' => $this->t('Text to use for this variant, @count will be replaced with the value.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[format_plural]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="options[format_plural]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
     }
     if ($plurals == 2) {
       // Simplify interface text for the most common case.
@@ -116,18 +116,18 @@ class NumericField extends FieldPluginBase {
       $form['format_plural_values'][1]['#description'] = $this->t('Text to use for the plural form, @count will be replaced with the value.');
     }
 
-    $form['prefix'] = array(
+    $form['prefix'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Prefix'),
       '#default_value' => $this->options['prefix'],
       '#description' => $this->t('Text to put before the number, such as currency symbol.'),
-    );
-    $form['suffix'] = array(
+    ];
+    $form['suffix'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Suffix'),
       '#default_value' => $this->options['suffix'],
       '#description' => $this->t('Text to put after the number, such as currency symbol.'),
-    );
+    ];
 
     parent::buildOptionsForm($form, $form_state);
   }
diff --git a/web/core/modules/views/src/Plugin/views/field/PrerenderList.php b/web/core/modules/views/src/Plugin/views/field/PrerenderList.php
index aa8f75207..f851cbb6a 100644
--- a/web/core/modules/views/src/Plugin/views/field/PrerenderList.php
+++ b/web/core/modules/views/src/Plugin/views/field/PrerenderList.php
@@ -25,7 +25,7 @@ abstract class PrerenderList extends FieldPluginBase implements MultiItemsFieldH
    *
    * @var array
    */
-  public $items = array();
+  public $items = [];
 
   /**
    * {@inheritdoc}
@@ -33,8 +33,8 @@ abstract class PrerenderList extends FieldPluginBase implements MultiItemsFieldH
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['type'] = array('default' => 'separator');
-    $options['separator'] = array('default' => ', ');
+    $options['type'] = ['default' => 'separator'];
+    $options['separator'] = ['default' => ', '];
 
     return $options;
   }
@@ -43,27 +43,27 @@ abstract class PrerenderList extends FieldPluginBase implements MultiItemsFieldH
    * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['type'] = array(
+    $form['type'] = [
       '#type' => 'radios',
       '#title' => $this->t('Display type'),
-      '#options' => array(
+      '#options' => [
         'ul' => $this->t('Unordered list'),
         'ol' => $this->t('Ordered list'),
         'separator' => $this->t('Simple separator'),
-      ),
+      ],
       '#default_value' => $this->options['type'],
-    );
+    ];
 
-    $form['separator'] = array(
+    $form['separator'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Separator'),
       '#default_value' => $this->options['separator'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[type]"]' => array('value' => 'separator'),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[type]"]' => ['value' => 'separator'],
+        ],
+      ],
+    ];
     parent::buildOptionsForm($form, $form_state);
   }
 
@@ -83,12 +83,12 @@ abstract class PrerenderList extends FieldPluginBase implements MultiItemsFieldH
         ];
       }
       else {
-        $render = array(
+        $render = [
           '#theme' => 'item_list',
           '#items' => $items,
           '#title' => NULL,
           '#list_type' => $this->options['type'],
-        );
+        ];
       }
       return drupal_render($render);
     }
@@ -110,7 +110,7 @@ abstract class PrerenderList extends FieldPluginBase implements MultiItemsFieldH
       return $this->items[$field];
     }
 
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/field/Serialized.php b/web/core/modules/views/src/Plugin/views/field/Serialized.php
index 3df1cca7b..4d74a4f1a 100644
--- a/web/core/modules/views/src/Plugin/views/field/Serialized.php
+++ b/web/core/modules/views/src/Plugin/views/field/Serialized.php
@@ -19,8 +19,8 @@ class Serialized extends FieldPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['format'] = array('default' => 'unserialized');
-    $options['key'] = array('default' => '');
+    $options['format'] = ['default' => 'unserialized'];
+    $options['key'] = ['default' => ''];
     return $options;
   }
 
@@ -30,27 +30,27 @@ class Serialized extends FieldPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['format'] = array(
+    $form['format'] = [
       '#type' => 'select',
       '#title' => $this->t('Display format'),
       '#description' => $this->t('How should the serialized data be displayed. You can choose a custom array/object key or a print_r on the full output.'),
-      '#options' => array(
+      '#options' => [
         'unserialized' => $this->t('Full data (unserialized)'),
         'serialized' => $this->t('Full data (serialized)'),
         'key' => $this->t('A certain key'),
-      ),
+      ],
       '#default_value' => $this->options['format'],
-    );
-    $form['key'] = array(
+    ];
+    $form['key'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Which key should be displayed'),
       '#default_value' => $this->options['key'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[format]"]' => array('value' => 'key'),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[format]"]' => ['value' => 'key'],
+        ],
+      ],
+    ];
   }
 
   /**
@@ -58,7 +58,7 @@ class Serialized extends FieldPluginBase {
    */
   public function validateOptionsForm(&$form, FormStateInterface $form_state) {
     // Require a key if the format is key.
-    if ($form_state->getValue(array('options', 'format')) == 'key' && $form_state->getValue(array('options', 'key')) == '') {
+    if ($form_state->getValue(['options', 'format']) == 'key' && $form_state->getValue(['options', 'key']) == '') {
       $form_state->setError($form['key'], $this->t('You have to enter a key if you want to display a key of the data.'));
     }
   }
diff --git a/web/core/modules/views/src/Plugin/views/field/TimeInterval.php b/web/core/modules/views/src/Plugin/views/field/TimeInterval.php
index d7ec0d319..79cd19060 100644
--- a/web/core/modules/views/src/Plugin/views/field/TimeInterval.php
+++ b/web/core/modules/views/src/Plugin/views/field/TimeInterval.php
@@ -58,7 +58,7 @@ class TimeInterval extends FieldPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['granularity'] = array('default' => 2);
+    $options['granularity'] = ['default' => 2];
 
     return $options;
   }
@@ -69,12 +69,12 @@ class TimeInterval extends FieldPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['granularity'] = array(
+    $form['granularity'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Granularity'),
       '#description' => $this->t('How many different units to display in the string.'),
       '#default_value' => $this->options['granularity'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/field/Url.php b/web/core/modules/views/src/Plugin/views/field/Url.php
index e847e4479..08e1fbad2 100644
--- a/web/core/modules/views/src/Plugin/views/field/Url.php
+++ b/web/core/modules/views/src/Plugin/views/field/Url.php
@@ -21,7 +21,7 @@ class Url extends FieldPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['display_as_link'] = array('default' => TRUE);
+    $options['display_as_link'] = ['default' => TRUE];
 
     return $options;
   }
@@ -30,11 +30,11 @@ class Url extends FieldPluginBase {
    * Provide link to the page being visited.
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['display_as_link'] = array(
+    $form['display_as_link'] = [
       '#title' => $this->t('Display as link'),
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['display_as_link']),
-    );
+    ];
     parent::buildOptionsForm($form, $form_state);
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/filter/BooleanOperator.php b/web/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
index 7078032e8..917a30b84 100644
--- a/web/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
+++ b/web/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
@@ -54,7 +54,7 @@ class BooleanOperator extends FilterPluginBase {
    * {@inheritdoc}
    */
   public function operatorOptions($which = 'title') {
-    $options = array();
+    $options = [];
     foreach ($this->operators() as $id => $info) {
       $options[$id] = $info[$which];
     }
@@ -68,22 +68,22 @@ class BooleanOperator extends FilterPluginBase {
    * @return array
    */
   protected function operators() {
-    return array(
-      '=' => array(
+    return [
+      '=' => [
         'title' => $this->t('Is equal to'),
         'method' => 'queryOpBoolean',
         'short' => $this->t('='),
         'values' => 1,
-        'query_operator' => static::EQUAL,
-      ),
-      '!=' => array(
+        'query_operator' => self::EQUAL,
+      ],
+      '!=' => [
         'title' => $this->t('Is not equal to'),
         'method' => 'queryOpBoolean',
         'short' => $this->t('!='),
         'values' => 1,
-        'query_operator' => static::NOT_EQUAL,
-      ),
-    );
+        'query_operator' => self::NOT_EQUAL,
+      ],
+    ];
   }
 
   /**
@@ -125,19 +125,19 @@ class BooleanOperator extends FilterPluginBase {
   public function getValueOptions() {
     if (isset($this->definition['type'])) {
       if ($this->definition['type'] == 'yes-no') {
-        $this->valueOptions = array(1 => $this->t('Yes'), 0 => $this->t('No'));
+        $this->valueOptions = [1 => $this->t('Yes'), 0 => $this->t('No')];
       }
       if ($this->definition['type'] == 'on-off') {
-        $this->valueOptions = array(1 => $this->t('On'), 0 => $this->t('Off'));
+        $this->valueOptions = [1 => $this->t('On'), 0 => $this->t('Off')];
       }
       if ($this->definition['type'] == 'enabled-disabled') {
-        $this->valueOptions = array(1 => $this->t('Enabled'), 0 => $this->t('Disabled'));
+        $this->valueOptions = [1 => $this->t('Enabled'), 0 => $this->t('Disabled')];
       }
     }
 
     // Provide a fallback if the above didn't set anything.
     if (!isset($this->valueOptions)) {
-      $this->valueOptions = array(1 => $this->t('True'), 0 => $this->t('False'));
+      $this->valueOptions = [1 => $this->t('True'), 0 => $this->t('False')];
     }
   }
 
@@ -162,12 +162,12 @@ class BooleanOperator extends FilterPluginBase {
       // Configuring a filter: use radios for clarity.
       $filter_form_type = 'radios';
     }
-    $form['value'] = array(
+    $form['value'] = [
       '#type' => $filter_form_type,
       '#title' => $this->value_value,
       '#options' => $this->valueOptions,
       '#default_value' => $this->value,
-    );
+    ];
     if (!empty($this->options['exposed'])) {
       $identifier = $this->options['expose']['identifier'];
       $user_input = $form_state->getUserInput();
@@ -177,13 +177,13 @@ class BooleanOperator extends FilterPluginBase {
       }
       // If we're configuring an exposed filter, add an - Any - option.
       if (!$exposed || empty($this->options['expose']['required'])) {
-        $form['value']['#options'] = array('All' => $this->t('- Any -')) + $form['value']['#options'];
+        $form['value']['#options'] = ['All' => $this->t('- Any -')] + $form['value']['#options'];
       }
     }
   }
 
   protected function valueValidate($form, FormStateInterface $form_state) {
-    if ($form_state->getValue(array('options', 'value')) == 'All' && !$form_state->isValueEmpty(array('options', 'expose', 'required'))) {
+    if ($form_state->getValue(['options', 'value']) == 'All' && !$form_state->isValueEmpty(['options', 'expose', 'required'])) {
       $form_state->setErrorByName('value', $this->t('You must select a value unless this is an non-required exposed filter.'));
     }
   }
@@ -221,7 +221,7 @@ class BooleanOperator extends FilterPluginBase {
 
     $info = $this->operators();
     if (!empty($info[$this->operator]['method'])) {
-      call_user_func(array($this, $info[$this->operator]['method']), $field, $info[$this->operator]['query_operator']);
+      call_user_func([$this, $info[$this->operator]['method']], $field, $info[$this->operator]['query_operator']);
     }
   }
 
@@ -231,13 +231,13 @@ class BooleanOperator extends FilterPluginBase {
    * @param string $field
    *   The field name to add the where condition for.
    * @param string $query_operator
-   *   (optional) Either static::EQUAL or static::NOT_EQUAL. Defaults to
-   *   static::EQUAL.
+   *   (optional) Either self::EQUAL or self::NOT_EQUAL. Defaults to
+   *   self::EQUAL.
    */
-  protected function queryOpBoolean($field, $query_operator = EQUAL) {
+  protected function queryOpBoolean($field, $query_operator = self::EQUAL) {
     if (empty($this->value)) {
       if ($this->accept_null) {
-        if ($query_operator == static::EQUAL) {
+        if ($query_operator === self::EQUAL) {
           $condition = (new Condition('OR'))
             ->condition($field, 0, $query_operator)
             ->isNull($field);
@@ -255,12 +255,13 @@ class BooleanOperator extends FilterPluginBase {
     }
     else {
       if (!empty($this->definition['use_equal'])) {
-        // Forces an '=' operator instead of a '<>' for performance reasons.
-        if ($query_operator == static::EQUAL) {
-          $this->query->addWhere($this->options['group'], $field, 1, static::EQUAL);
+        // Forces a self::EQUAL operator instead of a self::NOT_EQUAL for
+        // performance reasons.
+        if ($query_operator === self::EQUAL) {
+          $this->query->addWhere($this->options['group'], $field, 1, self::EQUAL);
         }
         else {
-          $this->query->addWhere($this->options['group'], $field, 0, static::EQUAL);
+          $this->query->addWhere($this->options['group'], $field, 0, self::EQUAL);
         }
       }
       else {
diff --git a/web/core/modules/views/src/Plugin/views/filter/Bundle.php b/web/core/modules/views/src/Plugin/views/filter/Bundle.php
index 1ae5eb388..46142fe85 100644
--- a/web/core/modules/views/src/Plugin/views/filter/Bundle.php
+++ b/web/core/modules/views/src/Plugin/views/filter/Bundle.php
@@ -94,9 +94,9 @@ class Bundle extends InOperator {
   public function getValueOptions() {
     if (!isset($this->valueOptions)) {
       $types = $this->bundleInfoService->getBundleInfo($this->entityTypeId);
-      $this->valueTitle = $this->t('@entity types', array('@entity' => $this->entityType->getLabel()));
+      $this->valueTitle = $this->t('@entity types', ['@entity' => $this->entityType->getLabel()]);
 
-      $options = array();
+      $options = [];
       foreach ($types as $type => $info) {
         $options[$type] = $info['label'];
       }
diff --git a/web/core/modules/views/src/Plugin/views/filter/Combine.php b/web/core/modules/views/src/Plugin/views/filter/Combine.php
index 1b4ab9c1c..f8ea624e1 100644
--- a/web/core/modules/views/src/Plugin/views/filter/Combine.php
+++ b/web/core/modules/views/src/Plugin/views/filter/Combine.php
@@ -21,7 +21,7 @@ class Combine extends StringFilter {
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['fields'] = array('default' => array());
+    $options['fields'] = ['default' => []];
 
     return $options;
   }
@@ -32,7 +32,7 @@ class Combine extends StringFilter {
 
     // Allow to choose all fields as possible
     if ($this->view->style_plugin->usesFields()) {
-      $options = array();
+      $options = [];
       foreach ($this->view->display_handler->getHandlers('field') as $name => $field) {
         // Only allow clickSortable fields. Fields without clickSorting will
         // probably break in the Combine filter.
@@ -41,14 +41,14 @@ class Combine extends StringFilter {
         }
       }
       if ($options) {
-        $form['fields'] = array(
+        $form['fields'] = [
           '#type' => 'select',
           '#title' => $this->t('Choose fields to combine for filtering'),
           '#description' => $this->t("This filter doesn't work for very special field handlers."),
           '#multiple' => TRUE,
           '#options' => $options,
           '#default_value' => $this->options['fields'],
-        );
+        ];
       }
       else {
         $form_state->setErrorByName('', $this->t('You have to add some fields to be able to use this filter.'));
@@ -58,7 +58,7 @@ class Combine extends StringFilter {
 
   public function query() {
     $this->view->_build('field');
-    $fields = array();
+    $fields = [];
     // Only add the fields if they have a proper field and table alias.
     foreach ($this->options['fields'] as $id) {
       // Overridden fields can lead to fields missing from a display that are
@@ -78,7 +78,7 @@ class Combine extends StringFilter {
     }
     if ($fields) {
       $count = count($fields);
-      $separated_fields = array();
+      $separated_fields = [];
       foreach ($fields as $key => $field) {
         $separated_fields[] = $field;
         if ($key < $count - 1) {
@@ -106,7 +106,7 @@ class Combine extends StringFilter {
         if (!isset($fields[$id])) {
           // Combined field filter only works with fields that are in the field
           // settings.
-          $errors[] = $this->t('Field %field set in %filter is not set in display %display.', array('%field' => $id, '%filter' => $this->adminLabel(), '%display' => $this->displayHandler->display['display_title']));
+          $errors[] = $this->t('Field %field set in %filter is not set in display %display.', ['%field' => $id, '%filter' => $this->adminLabel(), '%display' => $this->displayHandler->display['display_title']]);
           break;
         }
         elseif (!$fields[$id]->clickSortable()) {
@@ -114,12 +114,12 @@ class Combine extends StringFilter {
           // is not click sortable we can assume it is not a simple field.
           // @todo change this check to isComputed. See
           // https://www.drupal.org/node/2349465
-          $errors[] = $this->t('Field %field set in %filter is not usable for this filter type. Combined field filter only works for simple fields.', array('%field' => $fields[$id]->adminLabel(), '%filter' => $this->adminLabel()));
+          $errors[] = $this->t('Field %field set in %filter is not usable for this filter type. Combined field filter only works for simple fields.', ['%field' => $fields[$id]->adminLabel(), '%filter' => $this->adminLabel()]);
         }
       }
     }
     else {
-      $errors[] = $this->t('%display: %filter can only be used on displays that use fields. Set the style or row format for that display to one using fields to use the combine field filter.', array('%display' => $this->displayHandler->display['display_title'], '%filter' => $this->adminLabel()));
+      $errors[] = $this->t('%display: %filter can only be used on displays that use fields. Set the style or row format for that display to one using fields to use the combine field filter.', ['%display' => $this->displayHandler->display['display_title'], '%filter' => $this->adminLabel()]);
     }
     return $errors;
   }
@@ -128,15 +128,15 @@ class Combine extends StringFilter {
    * By default things like opEqual uses add_where, that doesn't support
    * complex expressions, so override opEqual (and all operators below).
    */
-  function opEqual($expression) {
+  public function opEqual($expression) {
     $placeholder = $this->placeholder();
     $operator = $this->operator();
-    $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", array($placeholder => $this->value));
+    $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", [$placeholder => $this->value]);
   }
 
   protected function opContains($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression LIKE $placeholder", array($placeholder => '%' . db_like($this->value) . '%'));
+    $this->query->addWhereExpression($this->options['group'], "$expression LIKE $placeholder", [$placeholder => '%' . db_like($this->value) . '%']);
   }
 
   /**
@@ -169,38 +169,38 @@ class Combine extends StringFilter {
       $temp_placeholder = $placeholder . '_' . $match_key;
       // Clean up the user input and remove the sentence delimiters.
       $word = trim($match[2], ',?!();:-"');
-      $this->query->addWhereExpression($group, "$expression $operator $temp_placeholder", array($temp_placeholder => '%' . Database::getConnection()->escapeLike($word) . '%'));
+      $this->query->addWhereExpression($group, "$expression $operator $temp_placeholder", [$temp_placeholder => '%' . Database::getConnection()->escapeLike($word) . '%']);
     }
   }
 
   protected function opStartsWith($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression LIKE $placeholder", array($placeholder => db_like($this->value) . '%'));
+    $this->query->addWhereExpression($this->options['group'], "$expression LIKE $placeholder", [$placeholder => db_like($this->value) . '%']);
   }
 
   protected function opNotStartsWith($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression NOT LIKE $placeholder", array($placeholder => db_like($this->value) . '%'));
+    $this->query->addWhereExpression($this->options['group'], "$expression NOT LIKE $placeholder", [$placeholder => db_like($this->value) . '%']);
   }
 
   protected function opEndsWith($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression LIKE $placeholder", array($placeholder => '%' . db_like($this->value)));
+    $this->query->addWhereExpression($this->options['group'], "$expression LIKE $placeholder", [$placeholder => '%' . db_like($this->value)]);
   }
 
   protected function opNotEndsWith($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression NOT LIKE $placeholder", array($placeholder => '%' . db_like($this->value)));
+    $this->query->addWhereExpression($this->options['group'], "$expression NOT LIKE $placeholder", [$placeholder => '%' . db_like($this->value)]);
   }
 
   protected function opNotLike($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression NOT LIKE $placeholder", array($placeholder => '%' . db_like($this->value) . '%'));
+    $this->query->addWhereExpression($this->options['group'], "$expression NOT LIKE $placeholder", [$placeholder => '%' . db_like($this->value) . '%']);
   }
 
   protected function opRegex($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression REGEXP $placeholder", array($placeholder => $this->value));
+    $this->query->addWhereExpression($this->options['group'], "$expression REGEXP $placeholder", [$placeholder => $this->value]);
   }
 
   protected function opEmpty($expression) {
diff --git a/web/core/modules/views/src/Plugin/views/filter/Date.php b/web/core/modules/views/src/Plugin/views/filter/Date.php
index 84a1c421c..dbb573fcd 100644
--- a/web/core/modules/views/src/Plugin/views/filter/Date.php
+++ b/web/core/modules/views/src/Plugin/views/filter/Date.php
@@ -27,15 +27,15 @@ class Date extends NumericFilter {
    */
   protected function valueForm(&$form, FormStateInterface $form_state) {
     if (!$form_state->get('exposed')) {
-      $form['value']['type'] = array(
+      $form['value']['type'] = [
         '#type' => 'radios',
         '#title' => $this->t('Value type'),
-        '#options' => array(
+        '#options' => [
           'date' => $this->t('A date in any machine readable format. CCYY-MM-DD HH:MM:SS is preferred.'),
-          'offset' => $this->t('An offset from the current time such as "@example1" or "@example2"', array('@example1' => '+1 day', '@example2' => '-2 hours -30 minutes')),
-        ),
+          'offset' => $this->t('An offset from the current time such as "@example1" or "@example2"', ['@example1' => '+1 day', '@example2' => '-2 hours -30 minutes']),
+        ],
         '#default_value' => !empty($this->value['type']) ? $this->value['type'] : 'date',
-      );
+      ];
     }
     parent::valueForm($form, $form_state);
   }
@@ -43,12 +43,12 @@ class Date extends NumericFilter {
   public function validateOptionsForm(&$form, FormStateInterface $form_state) {
     parent::validateOptionsForm($form, $form_state);
 
-    if (!empty($this->options['exposed']) && $form_state->isValueEmpty(array('options', 'expose', 'required'))) {
+    if (!empty($this->options['exposed']) && $form_state->isValueEmpty(['options', 'expose', 'required'])) {
       // Who cares what the value is if it's exposed and non-required.
       return;
     }
 
-    $this->validateValidTime($form['value'], $form_state, $form_state->getValue(array('options', 'operator')), $form_state->getValue(array('options', 'value')));
+    $this->validateValidTime($form['value'], $form_state, $form_state->getValue(['options', 'operator']), $form_state->getValue(['options', 'value']));
   }
 
   public function validateExposed(&$form, FormStateInterface $form_state) {
@@ -122,9 +122,22 @@ class Date extends NumericFilter {
     }
 
     // Store this because it will get overwritten.
-    $type = $this->value['type'];
+    $type = NULL;
+    if ($this->isAGroup()) {
+      if (is_array($this->group_info)) {
+        $type = $this->group_info['type'];
+      }
+    }
+    else {
+      $type = $this->value['type'];
+    }
     $rc = parent::acceptExposedInput($input);
 
+    // Restore what got overwritten by the parent.
+    if (!is_null($type)) {
+      $this->value['type'] = $type;
+    }
+
     // Don't filter if value(s) are empty.
     $operators = $this->operators();
     if (!empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id'])) {
@@ -145,8 +158,6 @@ class Date extends NumericFilter {
       }
     }
 
-    // restore what got overwritten by the parent.
-    $this->value['type'] = $type;
     return $rc;
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/filter/Equality.php b/web/core/modules/views/src/Plugin/views/filter/Equality.php
index 748c60d69..e1d2aeb1e 100644
--- a/web/core/modules/views/src/Plugin/views/filter/Equality.php
+++ b/web/core/modules/views/src/Plugin/views/filter/Equality.php
@@ -20,22 +20,22 @@ class Equality extends FilterPluginBase {
    * Provide simple equality operator
    */
   public function operatorOptions() {
-    return array(
+    return [
       '=' => $this->t('Is equal to'),
       '!=' => $this->t('Is not equal to'),
-    );
+    ];
   }
 
   /**
    * Provide a simple textfield for equality
    */
   protected function valueForm(&$form, FormStateInterface $form_state) {
-    $form['value'] = array(
+    $form['value'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Value'),
       '#size' => 30,
       '#default_value' => $this->value,
-    );
+    ];
 
     if ($exposed = $form_state->get('exposed')) {
       $identifier = $this->options['expose']['identifier'];
diff --git a/web/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/web/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
index 5c2a8d8c0..335fd99d8 100644
--- a/web/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
@@ -116,26 +116,26 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['operator'] = array('default' => '=');
-    $options['value'] = array('default' => '');
-    $options['group'] = array('default' => '1');
-    $options['exposed'] = array('default' => FALSE);
-    $options['expose'] = array(
-      'contains' => array(
-        'operator_id' => array('default' => FALSE),
-        'label' => array('default' => ''),
-        'description' => array('default' => ''),
-        'use_operator' => array('default' => FALSE),
-        'operator' => array('default' => ''),
-        'identifier' => array('default' => ''),
-        'required' => array('default' => FALSE),
-        'remember' => array('default' => FALSE),
-        'multiple' => array('default' => FALSE),
-        'remember_roles' => array('default' => array(
+    $options['operator'] = ['default' => '='];
+    $options['value'] = ['default' => ''];
+    $options['group'] = ['default' => '1'];
+    $options['exposed'] = ['default' => FALSE];
+    $options['expose'] = [
+      'contains' => [
+        'operator_id' => ['default' => FALSE],
+        'label' => ['default' => ''],
+        'description' => ['default' => ''],
+        'use_operator' => ['default' => FALSE],
+        'operator' => ['default' => ''],
+        'identifier' => ['default' => ''],
+        'required' => ['default' => FALSE],
+        'remember' => ['default' => FALSE],
+        'multiple' => ['default' => FALSE],
+        'remember_roles' => ['default' => [
           RoleInterface::AUTHENTICATED_ID => RoleInterface::AUTHENTICATED_ID,
-        )),
-      ),
-    );
+        ]],
+      ],
+    ];
 
     // A group is a combination of a filter, an operator and a value
     // operating like a single filter.
@@ -145,21 +145,21 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     // an identifier and other settings like the widget and the label.
     // This settings are saved in another array to allow users to switch
     // between a normal filter and a group of filters with a single click.
-    $options['is_grouped'] = array('default' => FALSE);
-    $options['group_info'] = array(
-      'contains' => array(
-        'label' => array('default' => ''),
-        'description' => array('default' => ''),
-        'identifier' => array('default' => ''),
-        'optional' => array('default' => TRUE),
-        'widget' => array('default' => 'select'),
-        'multiple' => array('default' => FALSE),
-        'remember' => array('default' => 0),
-        'default_group' => array('default' => 'All'),
-        'default_group_multiple' => array('default' => array()),
-        'group_items' => array('default' => array()),
-      ),
-    );
+    $options['is_grouped'] = ['default' => FALSE];
+    $options['group_info'] = [
+      'contains' => [
+        'label' => ['default' => ''],
+        'description' => ['default' => ''],
+        'identifier' => ['default' => ''],
+        'optional' => ['default' => TRUE],
+        'widget' => ['default' => 'select'],
+        'multiple' => ['default' => FALSE],
+        'remember' => ['default' => 0],
+        'default_group' => ['default' => 'All'],
+        'default_group_multiple' => ['default' => []],
+        'group_items' => ['default' => []],
+      ],
+    ];
 
     return $options;
   }
@@ -205,19 +205,19 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     if ($this->canBuildGroup()) {
       $this->showBuildGroupButton($form, $form_state);
     }
-    $form['clear_markup_start'] = array(
+    $form['clear_markup_start'] = [
       '#markup' => '<div class="clearfix">',
-    );
+    ];
     if ($this->isAGroup()) {
       if ($this->canBuildGroup()) {
-        $form['clear_markup_start'] = array(
+        $form['clear_markup_start'] = [
           '#markup' => '<div class="clearfix">',
-        );
+        ];
         // Render the build group form.
         $this->showBuildGroupForm($form, $form_state);
-        $form['clear_markup_end'] = array(
+        $form['clear_markup_end'] = [
           '#markup' => '</div>',
-        );
+        ];
       }
     }
     else {
@@ -225,9 +225,9 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
       $this->showOperatorForm($form, $form_state);
       // Add the subform from valueForm().
       $this->showValueForm($form, $form_state);
-      $form['clear_markup_end'] = array(
+      $form['clear_markup_end'] = [
         '#markup' => '</div>',
-      );
+      ];
       if ($this->canExpose()) {
         // Add the subform from buildExposeForm().
         $this->showExposeForm($form, $form_state);
@@ -289,12 +289,12 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
   protected function operatorForm(&$form, FormStateInterface $form_state) {
     $options = $this->operatorOptions();
     if (!empty($options)) {
-      $form['operator'] = array(
+      $form['operator'] = [
         '#type' => count($options) < 10 ? 'radios' : 'select',
         '#title' => $this->t('Operator'),
         '#default_value' => $this->operator,
         '#options' => $options,
-      );
+      ];
     }
   }
 
@@ -302,7 +302,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
    * Provide a list of options for the default operator form.
    * Should be overridden by classes that don't override operatorForm
    */
-  public function operatorOptions() { return array(); }
+  public function operatorOptions() { return []; }
 
   /**
    * Validate the operator form.
@@ -335,7 +335,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
    * @see buildOptionsForm()
    */
   protected function valueForm(&$form, FormStateInterface $form_state) {
-    $form['value'] = array();
+    $form['value'] = [];
   }
 
   /**
@@ -377,47 +377,47 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
    */
   protected function showBuildGroupButton(&$form, FormStateInterface $form_state) {
 
-    $form['group_button'] = array(
+    $form['group_button'] = [
       '#prefix' => '<div class="views-grouped clearfix">',
       '#suffix' => '</div>',
       // Should always come after the description and the relationship.
       '#weight' => -190,
-    );
+    ];
 
     $grouped_description = $this->t('Grouped filters allow a choice between predefined operator|value pairs.');
-    $form['group_button']['radios'] = array(
-      '#theme_wrappers' => array('container'),
-      '#attributes' => array('class' => array('js-only')),
-    );
-    $form['group_button']['radios']['radios'] = array(
+    $form['group_button']['radios'] = [
+      '#theme_wrappers' => ['container'],
+      '#attributes' => ['class' => ['js-only']],
+    ];
+    $form['group_button']['radios']['radios'] = [
       '#title' => $this->t('Filter type to expose'),
       '#description' => $grouped_description,
       '#type' => 'radios',
-      '#options' => array(
+      '#options' => [
         $this->t('Single filter'),
         $this->t('Grouped filters'),
-      ),
-    );
+      ],
+    ];
 
     if (empty($this->options['is_grouped'])) {
-      $form['group_button']['markup'] = array(
+      $form['group_button']['markup'] = [
         '#markup' => '<div class="description grouped-description">' . $grouped_description . '</div>',
-      );
-      $form['group_button']['button'] = array(
-        '#limit_validation_errors' => array(),
+      ];
+      $form['group_button']['button'] = [
+        '#limit_validation_errors' => [],
         '#type' => 'submit',
         '#value' => $this->t('Grouped filters'),
-        '#submit' => array(array($this, 'buildGroupForm')),
-      );
+        '#submit' => [[$this, 'buildGroupForm']],
+      ];
       $form['group_button']['radios']['radios']['#default_value'] = 0;
     }
     else {
-      $form['group_button']['button'] = array(
-        '#limit_validation_errors' => array(),
+      $form['group_button']['button'] = [
+        '#limit_validation_errors' => [],
         '#type' => 'submit',
         '#value' => $this->t('Single filter'),
-        '#submit' => array(array($this, 'buildGroupForm')),
-      );
+        '#submit' => [[$this, 'buildGroupForm']],
+      ];
       $form['group_button']['radios']['radios']['#default_value'] = 1;
     }
   }
@@ -453,47 +453,47 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
    * Shortcut to display the expose/hide button.
    */
   public function showExposeButton(&$form, FormStateInterface $form_state) {
-    $form['expose_button'] = array(
+    $form['expose_button'] = [
       '#prefix' => '<div class="views-expose clearfix">',
       '#suffix' => '</div>',
       // Should always come after the description and the relationship.
       '#weight' => -200,
-    );
+    ];
 
     // Add a checkbox for JS users, which will have behavior attached to it
     // so it can replace the button.
-    $form['expose_button']['checkbox'] = array(
-      '#theme_wrappers' => array('container'),
-      '#attributes' => array('class' => array('js-only')),
-    );
-    $form['expose_button']['checkbox']['checkbox'] = array(
+    $form['expose_button']['checkbox'] = [
+      '#theme_wrappers' => ['container'],
+      '#attributes' => ['class' => ['js-only']],
+    ];
+    $form['expose_button']['checkbox']['checkbox'] = [
       '#title' => $this->t('Expose this filter to visitors, to allow them to change it'),
       '#type' => 'checkbox',
-    );
+    ];
 
     // Then add the button itself.
     if (empty($this->options['exposed'])) {
-      $form['expose_button']['markup'] = array(
+      $form['expose_button']['markup'] = [
         '#markup' => '<div class="description exposed-description">' . $this->t('This filter is not exposed. Expose it to allow the users to change it.') . '</div>',
-      );
-      $form['expose_button']['button'] = array(
-        '#limit_validation_errors' => array(),
+      ];
+      $form['expose_button']['button'] = [
+        '#limit_validation_errors' => [],
         '#type' => 'submit',
         '#value' => $this->t('Expose filter'),
-        '#submit' => array(array($this, 'displayExposedForm')),
-      );
+        '#submit' => [[$this, 'displayExposedForm']],
+      ];
       $form['expose_button']['checkbox']['checkbox']['#default_value'] = 0;
     }
     else {
-      $form['expose_button']['markup'] = array(
+      $form['expose_button']['markup'] = [
         '#markup' => '<div class="description exposed-description">' . $this->t('This filter is exposed. If you hide it, users will not be able to change it.') . '</div>',
-      );
-      $form['expose_button']['button'] = array(
-        '#limit_validation_errors' => array(),
+      ];
+      $form['expose_button']['button'] = [
+        '#limit_validation_errors' => [],
         '#type' => 'submit',
         '#value' => $this->t('Hide filter'),
-        '#submit' => array(array($this, 'displayExposedForm')),
-      );
+        '#submit' => [[$this, 'displayExposedForm']],
+      ];
       $form['expose_button']['checkbox']['checkbox']['#default_value'] = 1;
     }
   }
@@ -509,35 +509,35 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     // prior to rendering. That's why the preRender for it needs to run first,
     // so that when the next preRender (the one for fieldsets) runs, it gets
     // the flattened data.
-    array_unshift($form['#pre_render'], array(get_class($this), 'preRenderFlattenData'));
+    array_unshift($form['#pre_render'], [get_class($this), 'preRenderFlattenData']);
     $form['expose']['#flatten'] = TRUE;
 
     if (empty($this->always_required)) {
-      $form['expose']['required'] = array(
+      $form['expose']['required'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Required'),
         '#default_value' => $this->options['expose']['required'],
-      );
+      ];
     }
     else {
-      $form['expose']['required'] = array(
+      $form['expose']['required'] = [
         '#type' => 'value',
         '#value' => TRUE,
-      );
+      ];
     }
-    $form['expose']['label'] = array(
+    $form['expose']['label'] = [
       '#type' => 'textfield',
       '#default_value' => $this->options['expose']['label'],
       '#title' => $this->t('Label'),
       '#size' => 40,
-    );
+    ];
 
-    $form['expose']['description'] = array(
+    $form['expose']['description'] = [
       '#type' => 'textfield',
       '#default_value' => $this->options['expose']['description'],
       '#title' => $this->t('Description'),
       '#size' => 60,
-    );
+    ];
 
     if (!empty($form['operator']['#type'])) {
       // Increase the width of the left (operator) column.
@@ -546,75 +546,75 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
       $form['value']['#prefix'] = '<div class="views-group-box views-right-60">';
       $form['value']['#suffix'] = '</div>';
 
-      $form['expose']['use_operator'] = array(
+      $form['expose']['use_operator'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Expose operator'),
         '#description' => $this->t('Allow the user to choose the operator.'),
         '#default_value' => !empty($this->options['expose']['use_operator']),
-      );
-      $form['expose']['operator_id'] = array(
+      ];
+      $form['expose']['operator_id'] = [
         '#type' => 'textfield',
         '#default_value' => $this->options['expose']['operator_id'],
         '#title' => $this->t('Operator identifier'),
         '#size' => 40,
         '#description' => $this->t('This will appear in the URL after the ? to identify this operator.'),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="options[expose][use_operator]"]' => array('checked' => TRUE),
-          ),
-        ),
-      );
+        '#states' => [
+          'visible' => [
+            ':input[name="options[expose][use_operator]"]' => ['checked' => TRUE],
+          ],
+        ],
+      ];
     }
     else {
-      $form['expose']['operator_id'] = array(
+      $form['expose']['operator_id'] = [
         '#type' => 'value',
         '#value' => '',
-      );
+      ];
     }
 
     if (empty($this->alwaysMultiple)) {
-      $form['expose']['multiple'] = array(
+      $form['expose']['multiple'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Allow multiple selections'),
         '#description' => $this->t('Enable to allow users to select multiple items.'),
         '#default_value' => $this->options['expose']['multiple'],
-      );
+      ];
     }
-    $form['expose']['remember'] = array(
+    $form['expose']['remember'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Remember the last selection'),
       '#description' => $this->t('Enable to remember the last selection made by the user.'),
       '#default_value' => $this->options['expose']['remember'],
-    );
+    ];
 
     $role_options = array_map('\Drupal\Component\Utility\Html::escape', user_role_names());
-    $form['expose']['remember_roles'] = array(
+    $form['expose']['remember_roles'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('User roles'),
       '#description' => $this->t('Remember exposed selection only for the selected user role(s). If you select no roles, the exposed data will never be stored.'),
       '#default_value' => $this->options['expose']['remember_roles'],
       '#options' => $role_options,
-      '#states' => array(
-        'invisible' => array(
-          ':input[name="options[expose][remember]"]' => array('checked' => FALSE),
-        ),
-      ),
-    );
+      '#states' => [
+        'invisible' => [
+          ':input[name="options[expose][remember]"]' => ['checked' => FALSE],
+        ],
+      ],
+    ];
 
-    $form['expose']['identifier'] = array(
+    $form['expose']['identifier'] = [
       '#type' => 'textfield',
       '#default_value' => $this->options['expose']['identifier'],
       '#title' => $this->t('Filter identifier'),
       '#size' => 40,
       '#description' => $this->t('This will appear in the URL after the ? to identify this filter. Cannot be blank. Only letters, digits and the dot ("."), hyphen ("-"), underscore ("_"), and tilde ("~") characters are allowed.'),
-    );
+    ];
   }
 
   /**
    * Validate the options form.
    */
   public function validateExposeForm($form, FormStateInterface $form_state) {
-    $identifier = $form_state->getValue(array('options', 'expose', 'identifier'));
+    $identifier = $form_state->getValue(['options', 'expose', 'identifier']);
     $this->validateIdentifier($identifier, $form_state, $form['expose']['identifier']);
   }
 
@@ -654,12 +654,12 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
    * Validate the build group options form.
    */
   protected function buildGroupValidate($form, FormStateInterface $form_state) {
-    if (!$form_state->isValueEmpty(array('options', 'group_info'))) {
-      $identifier = $form_state->getValue(array('options', 'group_info', 'identifier'));
+    if (!$form_state->isValueEmpty(['options', 'group_info'])) {
+      $identifier = $form_state->getValue(['options', 'group_info', 'identifier']);
       $this->validateIdentifier($identifier, $form_state, $form['group_info']['identifier']);
     }
 
-    if ($group_items = $form_state->getValue(array('options', 'group_info', 'group_items'))) {
+    if ($group_items = $form_state->getValue(['options', 'group_info', 'group_items'])) {
       foreach ($group_items as $id => $group) {
         if (empty($group['remove'])) {
           $has_valid_value = $this->hasValidGroupedValue($group);
@@ -694,7 +694,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
    *
    * @return string
    */
-  protected function validateIdentifier($identifier, FormStateInterface $form_state = NULL, &$form_group = array()) {
+  protected function validateIdentifier($identifier, FormStateInterface $form_state = NULL, &$form_group = []) {
     $error = '';
     if (empty($identifier)) {
       $error = $this->t('The identifier is required if the filter is exposed.');
@@ -720,9 +720,9 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
    * Save new group items, re-enumerates and remove groups marked to delete.
    */
   protected function buildGroupSubmit($form, FormStateInterface $form_state) {
-    $groups = array();
-    $group_items = $form_state->getValue(array('options', 'group_info', 'group_items'));
-    uasort($group_items, array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
+    $groups = [];
+    $group_items = $form_state->getValue(['options', 'group_info', 'group_items']);
+    uasort($group_items, ['Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
     // Filter out removed items.
 
     // Start from 1 to avoid problems with #default_value in the widget.
@@ -735,26 +735,26 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
         unset($group['weight']);
         $groups[$new_id] = $group;
 
-        if ($form_state->getValue(array('options', 'group_info', 'default_group')) == $id) {
+        if ($form_state->getValue(['options', 'group_info', 'default_group']) == $id) {
           $new_default = $new_id;
         }
       }
       $new_id++;
     }
     if ($new_default != 'All') {
-      $form_state->setValue(array('options', 'group_info', 'default_group'), $new_default);
+      $form_state->setValue(['options', 'group_info', 'default_group'], $new_default);
     }
-    $filter_default_multiple = $form_state->getValue(array('options', 'group_info', 'default_group_multiple'));
-    $form_state->setValue(array('options', 'group_info', 'default_group_multiple'), array_filter($filter_default_multiple));
+    $filter_default_multiple = $form_state->getValue(['options', 'group_info', 'default_group_multiple']);
+    $form_state->setValue(['options', 'group_info', 'default_group_multiple'], array_filter($filter_default_multiple));
 
-    $form_state->setValue(array('options', 'group_info', 'group_items'), $groups);
+    $form_state->setValue(['options', 'group_info', 'group_items'], $groups);
   }
 
   /**
    * Provide default options for exposed filters.
    */
   public function defaultExposeOptions() {
-    $this->options['expose'] = array(
+    $this->options['expose'] = [
       'use_operator' => FALSE,
       'operator' => $this->options['id'] . '_op',
       'identifier' => $this->options['id'],
@@ -763,14 +763,14 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
       'remember' => FALSE,
       'multiple' => FALSE,
       'required' => FALSE,
-    );
+    ];
   }
 
   /**
    * Provide default options for exposed filters.
    */
   protected function buildGroupOptions() {
-    $this->options['group_info'] = array(
+    $this->options['group_info'] = [
       'label' => $this->definition['title'],
       'description' => NULL,
       'identifier' => $this->options['id'],
@@ -779,9 +779,9 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
       'multiple' => FALSE,
       'remember' => FALSE,
       'default_group' => 'All',
-      'default_group_multiple' => array(),
-      'group_items' => array(),
-    );
+      'default_group_multiple' => [],
+      'group_items' => [],
+    ];
   }
 
   /**
@@ -790,7 +790,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
    */
   public function groupForm(&$form, FormStateInterface $form_state) {
     if (!empty($this->options['group_info']['optional']) && !$this->multipleExposedInput()) {
-      $groups = array('All' => $this->t('- Any -'));
+      $groups = ['All' => $this->t('- Any -')];
     }
     foreach ($this->options['group_info']['group_items'] as $id => $group) {
       if (!empty($group['title'])) {
@@ -801,12 +801,12 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     if (count($groups)) {
       $value = $this->options['group_info']['identifier'];
 
-      $form[$value] = array(
+      $form[$value] = [
         '#title' => $this->options['group_info']['label'],
         '#type' => $this->options['group_info']['widget'],
         '#default_value' => $this->group_info,
         '#options' => $groups,
-      );
+      ];
       if (!empty($this->options['group_info']['multiple'])) {
         if (count($groups) < 5) {
           $form[$value]['#type'] = 'checkboxes';
@@ -890,7 +890,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     // prior to rendering. That's why the preRender for it needs to run first,
     // so that when the next preRender (the one for fieldsets) runs, it gets
     // the flattened data.
-    array_unshift($form['#pre_render'], array(get_class($this), 'preRenderFlattenData'));
+    array_unshift($form['#pre_render'], [get_class($this), 'preRenderFlattenData']);
     $form['group_info']['#flatten'] = TRUE;
 
     if (!empty($this->options['group_info']['identifier'])) {
@@ -899,53 +899,53 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     else {
       $identifier = 'group_' . $this->options['expose']['identifier'];
     }
-    $form['group_info']['identifier'] = array(
+    $form['group_info']['identifier'] = [
       '#type' => 'textfield',
       '#default_value' => $identifier,
       '#title' => $this->t('Filter identifier'),
       '#size' => 40,
       '#description' => $this->t('This will appear in the URL after the ? to identify this filter. Cannot be blank. Only letters, digits and the dot ("."), hyphen ("-"), underscore ("_"), and tilde ("~") characters are allowed.'),
-    );
-    $form['group_info']['label'] = array(
+    ];
+    $form['group_info']['label'] = [
       '#type' => 'textfield',
       '#default_value' => $this->options['group_info']['label'],
       '#title' => $this->t('Label'),
       '#size' => 40,
-    );
-    $form['group_info']['description'] = array(
+    ];
+    $form['group_info']['description'] = [
       '#type' => 'textfield',
       '#default_value' => $this->options['group_info']['description'],
       '#title' => $this->t('Description'),
       '#size' => 60,
-    );
-    $form['group_info']['optional'] = array(
+    ];
+    $form['group_info']['optional'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Optional'),
       '#description' => $this->t('This exposed filter is optional and will have added options to allow it not to be set.'),
       '#default_value' => $this->options['group_info']['optional'],
-    );
-    $form['group_info']['multiple'] = array(
+    ];
+    $form['group_info']['multiple'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow multiple selections'),
       '#description' => $this->t('Enable to allow users to select multiple items.'),
       '#default_value' => $this->options['group_info']['multiple'],
-    );
-    $form['group_info']['widget'] = array(
+    ];
+    $form['group_info']['widget'] = [
       '#type' => 'radios',
       '#default_value' => $this->options['group_info']['widget'],
       '#title' => $this->t('Widget type'),
-      '#options' => array(
+      '#options' => [
         'radios' => $this->t('Radios'),
         'select' => $this->t('Select'),
-      ),
+      ],
       '#description' => $this->t('Select which kind of widget will be used to render the group of filters'),
-    );
-    $form['group_info']['remember'] = array(
+    ];
+    $form['group_info']['remember'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Remember'),
       '#description' => $this->t('Remember the last setting the user gave this filter.'),
       '#default_value' => $this->options['group_info']['remember'],
-    );
+    ];
 
     if (!empty($this->options['group_info']['identifier'])) {
       $identifier = $this->options['group_info']['identifier'];
@@ -953,53 +953,53 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     else {
       $identifier = 'group_' . $this->options['expose']['identifier'];
     }
-    $form['group_info']['identifier'] = array(
+    $form['group_info']['identifier'] = [
       '#type' => 'textfield',
       '#default_value' => $identifier,
       '#title' => $this->t('Filter identifier'),
       '#size' => 40,
       '#description' => $this->t('This will appear in the URL after the ? to identify this filter. Cannot be blank. Only letters, digits and the dot ("."), hyphen ("-"), underscore ("_"), and tilde ("~") characters are allowed.'),
-    );
-    $form['group_info']['label'] = array(
+    ];
+    $form['group_info']['label'] = [
       '#type' => 'textfield',
       '#default_value' => $this->options['group_info']['label'],
       '#title' => $this->t('Label'),
       '#size' => 40,
-    );
-    $form['group_info']['optional'] = array(
+    ];
+    $form['group_info']['optional'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Optional'),
       '#description' => $this->t('This exposed filter is optional and will have added options to allow it not to be set.'),
       '#default_value' => $this->options['group_info']['optional'],
-    );
-    $form['group_info']['widget'] = array(
+    ];
+    $form['group_info']['widget'] = [
       '#type' => 'radios',
       '#default_value' => $this->options['group_info']['widget'],
       '#title' => $this->t('Widget type'),
-      '#options' => array(
+      '#options' => [
         'radios' => $this->t('Radios'),
         'select' => $this->t('Select'),
-      ),
+      ],
       '#description' => $this->t('Select which kind of widget will be used to render the group of filters'),
-    );
-    $form['group_info']['remember'] = array(
+    ];
+    $form['group_info']['remember'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Remember'),
       '#description' => $this->t('Remember the last setting the user gave this filter.'),
       '#default_value' => $this->options['group_info']['remember'],
-    );
+    ];
 
-    $groups = array('All' => $this->t('- Any -')); // The string '- Any -' will not be rendered see @theme_views_ui_build_group_filter_form
+    $groups = ['All' => $this->t('- Any -')]; // The string '- Any -' will not be rendered see @theme_views_ui_build_group_filter_form
 
     // Provide 3 options to start when we are in a new group.
     if (count($this->options['group_info']['group_items']) == 0) {
-      $this->options['group_info']['group_items'] = array_fill(1, 3, array());
+      $this->options['group_info']['group_items'] = array_fill(1, 3, []);
     }
 
     // After the general settings, comes a table with all the existent groups.
     $default_weight = 0;
     foreach ($this->options['group_info']['group_items'] as $item_id => $item) {
-      if (!$form_state->isValueEmpty(array('options', 'group_info', 'group_items', $item_id, 'remove'))) {
+      if (!$form_state->isValueEmpty(['options', 'group_info', 'group_items', $item_id, 'remove'])) {
         continue;
       }
       // Each rows contains three widgets:
@@ -1009,8 +1009,8 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
 
       // In each row, we have to display the operator form and the value from
       // $row acts as a fake form to render each widget in a row.
-      $row = array();
-      $groups[$item_id] = $this->t('Grouping @id', array('@id' => $item_id));
+      $row = [];
+      $groups[$item_id] = $this->t('Grouping @id', ['@id' => $item_id]);
       $this->operatorForm($row, $form_state);
       // Force the operator form to be a select box. Some handlers uses
       // radios and they occupy a lot of space in a table row.
@@ -1028,17 +1028,20 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
       $children = Element::children($row['value']);
       if (!empty($children)) {
         foreach ($children as $child) {
-          foreach ($row['value'][$child]['#states']['visible'] as $state) {
-            if (isset($state[':input[name="options[group_info][group_items][' . $item_id . '][operator]"]'])) {
-              $row['value'][$child]['#title'] = '';
+          if (!empty($row['value'][$child]['#states']['visible'])) {
+            foreach ($row['value'][$child]['#states']['visible'] as $state) {
+              if (isset($state[':input[name="options[group_info][group_items][' . $item_id . '][operator]"]'])) {
+                $row['value'][$child]['#title'] = '';
 
-              if (!empty($this->options['group_info']['group_items'][$item_id]['value'][$child])) {
-                $row['value'][$child]['#default_value'] = $this->options['group_info']['group_items'][$item_id]['value'][$child];
+                // Exit this loop and process the next child element.
+                break;
               }
-              // Exit this loop and process the next child element.
-              break;
             }
           }
+
+          if (!empty($this->options['group_info']['group_items'][$item_id]['value'][$child])) {
+            $row['value'][$child]['#default_value'] = $this->options['group_info']['group_items'][$item_id]['value'][$child];
+          }
         }
       }
       else {
@@ -1057,71 +1060,71 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
       }
 
       // Per item group, we have a title that identifies it.
-      $form['group_info']['group_items'][$item_id] = array(
-        'title' => array(
+      $form['group_info']['group_items'][$item_id] = [
+        'title' => [
           '#title' => $this->t('Label'),
           '#title_display' => 'invisible',
           '#type' => 'textfield',
           '#size' => 20,
           '#default_value' => $default_title,
-        ),
+        ],
         'operator' => $row['operator'],
         'value' => $row['value'],
         // No title is given here, since this input is never displayed. It is
         // only triggered by JavaScript.
-        'remove' => array(
+        'remove' => [
           '#type' => 'checkbox',
           '#id' => 'views-removed-' . $item_id,
-          '#attributes' => array('class' => array('views-remove-checkbox')),
+          '#attributes' => ['class' => ['views-remove-checkbox']],
           '#default_value' => 0,
-        ),
-        'weight' => array(
+        ],
+        'weight' => [
           '#title' => $this->t('Weight'),
           '#title_display' => 'invisible',
           '#type' => 'weight',
-          '#delta' => 10,
+          '#delta' => count($this->options['group_info']['group_items']),
           '#default_value' => $default_weight++,
-          '#attributes' => array('class' => array('weight')),
-        ),
-      );
+          '#attributes' => ['class' => ['weight']],
+        ],
+      ];
     }
     // From all groups, let chose which is the default.
-    $form['group_info']['default_group'] = array(
+    $form['group_info']['default_group'] = [
       '#type' => 'radios',
       '#options' => $groups,
       '#default_value' => $this->options['group_info']['default_group'],
       '#required' => TRUE,
-      '#attributes' => array(
-        'class' => array('default-radios'),
-      )
-    );
+      '#attributes' => [
+        'class' => ['default-radios'],
+      ]
+    ];
     // From all groups, let chose which is the default.
-    $form['group_info']['default_group_multiple'] = array(
+    $form['group_info']['default_group_multiple'] = [
       '#type' => 'checkboxes',
       '#options' => $groups,
       '#default_value' => $this->options['group_info']['default_group_multiple'],
-      '#attributes' => array(
-        'class' => array('default-checkboxes'),
-      )
-    );
+      '#attributes' => [
+        'class' => ['default-checkboxes'],
+      ]
+    ];
 
-    $form['group_info']['add_group'] = array(
+    $form['group_info']['add_group'] = [
       '#prefix' => '<div class="views-build-group clear-block">',
       '#suffix' => '</div>',
       '#type' => 'submit',
       '#value' => $this->t('Add another item'),
-      '#submit' => array(array($this, 'addGroupForm')),
-    );
+      '#submit' => [[$this, 'addGroupForm']],
+    ];
 
-    $js = array();
-    $js['tableDrag']['views-filter-groups']['weight'][0] = array(
+    $js = [];
+    $js['tableDrag']['views-filter-groups']['weight'][0] = [
       'target' => 'weight',
       'source' => NULL,
       'relationship' => 'sibling',
       'action' => 'order',
       'hidden' => TRUE,
       'limit' => 0,
-    );
+    ];
     $js_settings = $form_state->get('js_settings');
     if ($js_settings && is_array($js)) {
       $js_settings = array_merge($js_settings, $js);
@@ -1139,7 +1142,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     $item = &$this->options;
 
     // Add a new row.
-    $item['group_info']['group_items'][] = array();
+    $item['group_info']['group_items'][] = [];
 
     $view = $form_state->get('view');
     $display_id = $form_state->get('display_id');
@@ -1186,7 +1189,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     }
 
     if ($type == 'value' && empty($this->always_required) && empty($this->options['expose']['required']) && $form['#type'] == 'select' && empty($form['#multiple'])) {
-      $form['#options'] = array('All' => $this->t('- Any -')) + $form['#options'];
+      $form['#options'] = ['All' => $this->t('- Any -')] + $form['#options'];
       $form['#default_value'] = 'All';
     }
 
@@ -1240,19 +1243,19 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     }
 
     if ($this->isAGroup()) {
-      return array(
+      return [
         'value' => $this->options['group_info']['identifier'],
         'label' => $this->options['group_info']['label'],
         'description' => $this->options['group_info']['description'],
-      );
+      ];
     }
 
-    return array(
+    return [
       'operator' => $this->options['expose']['operator_id'],
       'value' => $this->options['expose']['identifier'],
       'label' => $this->options['expose']['label'],
       'description' => $this->options['expose']['description'],
-    );
+    ];
   }
 
   /**
@@ -1286,7 +1289,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
         $input[$this->options['expose']['operator']] = $this->options['group_info']['group_items'][$selected_group]['operator'];
 
         // Value can be optional, For example for 'empty' and 'not empty' filters.
-        if (isset($this->options['group_info']['group_items'][$selected_group]['value']) && $this->options['group_info']['group_items'][$selected_group]['value'] != '') {
+        if (isset($this->options['group_info']['group_items'][$selected_group]['value']) && $this->options['group_info']['group_items'][$selected_group]['value'] !== '') {
           $input[$this->options['expose']['identifier']] = $this->options['group_info']['group_items'][$selected_group]['value'];
         }
         $this->options['expose']['use_operator'] = TRUE;
@@ -1309,7 +1312,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
     if (!empty($input[$this->options['group_info']['identifier']])) {
       return array_filter($input[$this->options['group_info']['identifier']]);
     }
-    return array();
+    return [];
   }
 
   /**
@@ -1350,7 +1353,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
 
     if ($status !== FALSE) {
       if (!isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
-        $_SESSION['views'][$this->view->storage->id()][$display_id] = array();
+        $_SESSION['views'][$this->view->storage->id()][$display_id] = [];
       }
 
       $session = &$_SESSION['views'][$this->view->storage->id()][$display_id];
@@ -1388,7 +1391,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
         }
 
         if ($this->operator != 'empty' && $this->operator != 'not empty') {
-          if ($value == 'All' || $value === array()) {
+          if ($value == 'All' || $value === []) {
             return FALSE;
           }
 
@@ -1406,7 +1409,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
       if (isset($value)) {
         $this->value = $value;
         if (empty($this->alwaysMultiple) && empty($this->options['expose']['multiple']) && !is_array($value)) {
-          $this->value = array($value);
+          $this->value = [$value];
         }
       }
       else {
@@ -1428,7 +1431,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
 
     // Check if we store exposed value for current user.
     $user = \Drupal::currentUser();
-    $allowed_rids = empty($this->options['expose']['remember_roles']) ? array() : array_filter($this->options['expose']['remember_roles']);
+    $allowed_rids = empty($this->options['expose']['remember_roles']) ? [] : array_filter($this->options['expose']['remember_roles']);
     $intersect_rids = array_intersect(array_keys($allowed_rids), $user->getRoles());
     if (empty($intersect_rids)) {
       return;
@@ -1456,7 +1459,7 @@ abstract class FilterPluginBase extends HandlerBase implements CacheableDependen
 
     if ($status) {
       if (!isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
-        $_SESSION['views'][$this->view->storage->id()][$display_id] = array();
+        $_SESSION['views'][$this->view->storage->id()][$display_id] = [];
       }
 
       $session = &$_SESSION['views'][$this->view->storage->id()][$display_id];
diff --git a/web/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php b/web/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php
index 4f1baa189..4934e6e7a 100644
--- a/web/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php
+++ b/web/core/modules/views/src/Plugin/views/filter/GroupByNumeric.php
@@ -24,17 +24,17 @@ class GroupByNumeric extends NumericFilter {
     $placeholder_min = $this->placeholder();
     $placeholder_max = $this->placeholder();
     if ($this->operator == 'between') {
-      $this->query->addHavingExpression($this->options['group'], "$field >= $placeholder_min", array($placeholder_min => $this->value['min']));
-      $this->query->addHavingExpression($this->options['group'], "$field <= $placeholder_max", array($placeholder_max => $this->value['max']));
+      $this->query->addHavingExpression($this->options['group'], "$field >= $placeholder_min", [$placeholder_min => $this->value['min']]);
+      $this->query->addHavingExpression($this->options['group'], "$field <= $placeholder_max", [$placeholder_max => $this->value['max']]);
     }
     else {
-      $this->query->addHavingExpression($this->options['group'], "$field < $placeholder_min OR $field > $placeholder_max", array($placeholder_min => $this->value['min'], $placeholder_max => $this->value['max']));
+      $this->query->addHavingExpression($this->options['group'], "$field < $placeholder_min OR $field > $placeholder_max", [$placeholder_min => $this->value['min'], $placeholder_max => $this->value['max']]);
     }
   }
 
   protected function opSimple($field) {
     $placeholder = $this->placeholder();
-    $this->query->addHavingExpression($this->options['group'], "$field $this->operator $placeholder", array($placeholder => $this->value['value']));
+    $this->query->addHavingExpression($this->options['group'], "$field $this->operator $placeholder", [$placeholder => $this->value['value']]);
   }
 
   protected function opEmpty($field) {
diff --git a/web/core/modules/views/src/Plugin/views/filter/InOperator.php b/web/core/modules/views/src/Plugin/views/filter/InOperator.php
index ff4186f4a..c2d5bef2d 100644
--- a/web/core/modules/views/src/Plugin/views/filter/InOperator.php
+++ b/web/core/modules/views/src/Plugin/views/filter/InOperator.php
@@ -71,7 +71,7 @@ class InOperator extends FilterPluginBase {
       }
     }
     else {
-      $this->valueOptions = array(t('Yes'), $this->t('No'));
+      $this->valueOptions = [t('Yes'), $this->t('No')];
     }
 
     return $this->valueOptions;
@@ -84,20 +84,20 @@ class InOperator extends FilterPluginBase {
 
   public function buildExposeForm(&$form, FormStateInterface $form_state) {
     parent::buildExposeForm($form, $form_state);
-    $form['expose']['reduce'] = array(
+    $form['expose']['reduce'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Limit list to selected items'),
       '#description' => $this->t('If checked, the only items presented to the user will be the ones selected here.'),
       '#default_value' => !empty($this->options['expose']['reduce']), // safety
-    );
+    ];
   }
 
   protected function defineOptions() {
     $options = parent::defineOptions();
 
     $options['operator']['default'] = 'in';
-    $options['value']['default'] = array();
-    $options['expose']['contains']['reduce'] = array('default' => FALSE);
+    $options['value']['default'] = [];
+    $options['expose']['contains']['reduce'] = ['default' => FALSE];
 
     return $options;
   }
@@ -107,39 +107,39 @@ class InOperator extends FilterPluginBase {
    * to add or remove functionality by overriding this function and
    * adding/removing items from this array.
    */
-  function operators() {
-    $operators = array(
-      'in' => array(
+  public function operators() {
+    $operators = [
+      'in' => [
         'title' => $this->t('Is one of'),
         'short' => $this->t('in'),
         'short_single' => $this->t('='),
         'method' => 'opSimple',
         'values' => 1,
-      ),
-      'not in' => array(
+      ],
+      'not in' => [
         'title' => $this->t('Is not one of'),
         'short' => $this->t('not in'),
         'short_single' => $this->t('<>'),
         'method' => 'opSimple',
         'values' => 1,
-      ),
-    );
+      ],
+    ];
     // if the definition allows for the empty operator, add it.
     if (!empty($this->definition['allow empty'])) {
-      $operators += array(
-        'empty' => array(
+      $operators += [
+        'empty' => [
           'title' => $this->t('Is empty (NULL)'),
           'method' => 'opEmpty',
           'short' => $this->t('empty'),
           'values' => 0,
-        ),
-        'not empty' => array(
+        ],
+        'not empty' => [
           'title' => $this->t('Is not empty (NOT NULL)'),
           'method' => 'opEmpty',
           'short' => $this->t('not empty'),
           'values' => 0,
-        ),
-      );
+        ],
+      ];
     }
 
     return $operators;
@@ -149,7 +149,7 @@ class InOperator extends FilterPluginBase {
    * Build strings from the operators() for 'select' options
    */
   public function operatorOptions($which = 'title') {
-    $options = array();
+    $options = [];
     foreach ($this->operators() as $id => $info) {
       $options[$id] = $info[$which];
     }
@@ -158,7 +158,7 @@ class InOperator extends FilterPluginBase {
   }
 
   protected function operatorValues($values = 1) {
-    $options = array();
+    $options = [];
     foreach ($this->operators() as $id => $info) {
       if (isset($info['values']) && $info['values'] == $values) {
         $options[] = $id;
@@ -169,13 +169,13 @@ class InOperator extends FilterPluginBase {
   }
 
   protected function valueForm(&$form, FormStateInterface $form_state) {
-    $form['value'] = array();
-    $options = array();
+    $form['value'] = [];
+    $options = [];
 
     $exposed = $form_state->get('exposed');
     if (!$exposed) {
       // Add a select all option to the value form.
-      $options = array('all' => $this->t('Select all'));
+      $options = ['all' => $this->t('Select all')];
     }
 
     $this->getValueOptions();
@@ -201,7 +201,7 @@ class InOperator extends FilterPluginBase {
         $options = $this->reduceValueOptions();
 
         if (!empty($this->options['expose']['multiple']) && empty($this->options['expose']['required'])) {
-          $default_value = array();
+          $default_value = [];
         }
       }
 
@@ -221,7 +221,7 @@ class InOperator extends FilterPluginBase {
     }
 
     if ($which == 'all' || $which == 'value') {
-      $form['value'] = array(
+      $form['value'] = [
         '#type' => $this->valueFormType,
         '#title' => $this->valueTitle,
         '#options' => $options,
@@ -229,7 +229,7 @@ class InOperator extends FilterPluginBase {
         // These are only valid for 'select' type, but do no harm to checkboxes.
         '#multiple' => TRUE,
         '#size' => count($options) > 8 ? 8 : count($options),
-      );
+      ];
       $user_input = $form_state->getUserInput();
       if ($exposed && !isset($user_input[$identifier])) {
         $user_input[$identifier] = $default_value;
@@ -243,9 +243,9 @@ class InOperator extends FilterPluginBase {
         }
         // Setup #states for all operators with one value.
         foreach ($this->operatorValues(1) as $operator) {
-          $form['value']['#states']['visible'][] = array(
-            $source => array('value' => $operator),
-          );
+          $form['value']['#states']['visible'][] = [
+            $source => ['value' => $operator],
+          ];
         }
       }
     }
@@ -262,7 +262,7 @@ class InOperator extends FilterPluginBase {
     // Because options may be an array of strings, or an array of mixed arrays
     // and strings (optgroups) or an array of objects, we have to
     // step through and handle each one individually.
-    $options = array();
+    $options = [];
     foreach ($input as $id => $option) {
       if (is_array($option)) {
         $options[$id] = $this->reduceValueOptions($option);
@@ -313,7 +313,7 @@ class InOperator extends FilterPluginBase {
     // *only* a list of checkboxes that were set, and we can use that
     // instead.
 
-    $form_state->setValue(array('options', 'value'), $form['value']['#value']);
+    $form_state->setValue(['options', 'value'], $form['value']['#value']);
   }
 
   public function adminSummary() {
@@ -417,11 +417,11 @@ class InOperator extends FilterPluginBase {
     // If the operator is an operator which doesn't require a value, there is
     // no need for additional validation.
     if (in_array($this->operator, $this->operatorValues(0))) {
-      return array();
+      return [];
     }
 
     if (!in_array($this->operator, $this->operatorValues(1))) {
-      $errors[] = $this->t('The operator is invalid on filter: @filter.', array('@filter' => $this->adminLabel(TRUE)));
+      $errors[] = $this->t('The operator is invalid on filter: @filter.', ['@filter' => $this->adminLabel(TRUE)]);
     }
     if (is_array($this->value)) {
       if (!isset($this->valueOptions)) {
@@ -444,11 +444,11 @@ class InOperator extends FilterPluginBase {
       }
       // Choose different kind of output for 0, a single and multiple values.
       if (count($this->value) == 0) {
-        $errors[] = $this->t('No valid values found on filter: @filter.', array('@filter' => $this->adminLabel(TRUE)));
+        $errors[] = $this->t('No valid values found on filter: @filter.', ['@filter' => $this->adminLabel(TRUE)]);
       }
     }
     elseif (!empty($this->value) && ($this->operator == 'in' || $this->operator == 'not in')) {
-      $errors[] = $this->t('The value @value is not an array for @operator on filter: @filter', array('@value' => var_export($this->value), '@operator' => $this->operator, '@filter' => $this->adminLabel(TRUE)));
+      $errors[] = $this->t('The value @value is not an array for @operator on filter: @filter', ['@value' => var_export($this->value), '@operator' => $this->operator, '@filter' => $this->adminLabel(TRUE)]);
     }
     return $errors;
   }
diff --git a/web/core/modules/views/src/Plugin/views/filter/ManyToOne.php b/web/core/modules/views/src/Plugin/views/filter/ManyToOne.php
index 7fa1fbc46..e678dee82 100644
--- a/web/core/modules/views/src/Plugin/views/filter/ManyToOne.php
+++ b/web/core/modules/views/src/Plugin/views/filter/ManyToOne.php
@@ -41,7 +41,7 @@ class ManyToOne extends InOperator {
     $options = parent::defineOptions();
 
     $options['operator']['default'] = 'or';
-    $options['value']['default'] = array();
+    $options['value']['default'] = [];
 
     if (isset($this->helper)) {
       $this->helper->defineOptions($options);
@@ -54,49 +54,49 @@ class ManyToOne extends InOperator {
     return $options;
   }
 
-  function operators() {
-    $operators = array(
-      'or' => array(
+  public function operators() {
+    $operators = [
+      'or' => [
         'title' => $this->t('Is one of'),
         'short' => $this->t('or'),
         'short_single' => $this->t('='),
         'method' => 'opHelper',
         'values' => 1,
         'ensure_my_table' => 'helper',
-      ),
-      'and' => array(
+      ],
+      'and' => [
         'title' => $this->t('Is all of'),
         'short' => $this->t('and'),
         'short_single' => $this->t('='),
         'method' => 'opHelper',
         'values' => 1,
         'ensure_my_table' => 'helper',
-      ),
-      'not' => array(
+      ],
+      'not' => [
         'title' => $this->t('Is none of'),
         'short' => $this->t('not'),
         'short_single' => $this->t('<>'),
         'method' => 'opHelper',
         'values' => 1,
         'ensure_my_table' => 'helper',
-      ),
-    );
+      ],
+    ];
     // if the definition allows for the empty operator, add it.
     if (!empty($this->definition['allow empty'])) {
-      $operators += array(
-        'empty' => array(
+      $operators += [
+        'empty' => [
           'title' => $this->t('Is empty (NULL)'),
           'method' => 'opEmpty',
           'short' => $this->t('empty'),
           'values' => 0,
-        ),
-        'not empty' => array(
+        ],
+        'not empty' => [
           'title' => $this->t('Is not empty (NOT NULL)'),
           'method' => 'opEmpty',
           'short' => $this->t('not empty'),
           'values' => 0,
-        ),
-      );
+        ],
+      ];
     }
 
     return $operators;
diff --git a/web/core/modules/views/src/Plugin/views/filter/NumericFilter.php b/web/core/modules/views/src/Plugin/views/filter/NumericFilter.php
index e7720dfa0..7f687a14f 100644
--- a/web/core/modules/views/src/Plugin/views/filter/NumericFilter.php
+++ b/web/core/modules/views/src/Plugin/views/filter/NumericFilter.php
@@ -18,91 +18,91 @@ class NumericFilter extends FilterPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['value'] = array(
-      'contains' => array(
-        'min' => array('default' => ''),
-        'max' => array('default' => ''),
-        'value' => array('default' => ''),
-      ),
-    );
+    $options['value'] = [
+      'contains' => [
+        'min' => ['default' => ''],
+        'max' => ['default' => ''],
+        'value' => ['default' => ''],
+      ],
+    ];
 
     return $options;
   }
 
-  function operators() {
-    $operators = array(
-      '<' => array(
+  public function operators() {
+    $operators = [
+      '<' => [
         'title' => $this->t('Is less than'),
         'method' => 'opSimple',
         'short' => $this->t('<'),
         'values' => 1,
-      ),
-      '<=' => array(
+      ],
+      '<=' => [
         'title' => $this->t('Is less than or equal to'),
         'method' => 'opSimple',
         'short' => $this->t('<='),
         'values' => 1,
-      ),
-      '=' => array(
+      ],
+      '=' => [
         'title' => $this->t('Is equal to'),
         'method' => 'opSimple',
         'short' => $this->t('='),
         'values' => 1,
-      ),
-      '!=' => array(
+      ],
+      '!=' => [
         'title' => $this->t('Is not equal to'),
         'method' => 'opSimple',
         'short' => $this->t('!='),
         'values' => 1,
-      ),
-      '>=' => array(
+      ],
+      '>=' => [
         'title' => $this->t('Is greater than or equal to'),
         'method' => 'opSimple',
         'short' => $this->t('>='),
         'values' => 1,
-      ),
-      '>' => array(
+      ],
+      '>' => [
         'title' => $this->t('Is greater than'),
         'method' => 'opSimple',
         'short' => $this->t('>'),
         'values' => 1,
-      ),
-      'between' => array(
+      ],
+      'between' => [
         'title' => $this->t('Is between'),
         'method' => 'opBetween',
         'short' => $this->t('between'),
         'values' => 2,
-      ),
-      'not between' => array(
+      ],
+      'not between' => [
         'title' => $this->t('Is not between'),
         'method' => 'opBetween',
         'short' => $this->t('not between'),
         'values' => 2,
-      ),
-      'regular_expression' => array(
+      ],
+      'regular_expression' => [
         'title' => $this->t('Regular expression'),
         'short' => $this->t('regex'),
-        'method' => 'op_regex',
+        'method' => 'opRegex',
         'values' => 1,
-      ),
-    );
+      ],
+    ];
 
     // if the definition allows for the empty operator, add it.
     if (!empty($this->definition['allow empty'])) {
-      $operators += array(
-        'empty' => array(
+      $operators += [
+        'empty' => [
           'title' => $this->t('Is empty (NULL)'),
           'method' => 'opEmpty',
           'short' => $this->t('empty'),
           'values' => 0,
-        ),
-        'not empty' => array(
+        ],
+        'not empty' => [
           'title' => $this->t('Is not empty (NOT NULL)'),
           'method' => 'opEmpty',
           'short' => $this->t('not empty'),
           'values' => 0,
-        ),
-      );
+        ],
+      ];
     }
 
     return $operators;
@@ -112,7 +112,7 @@ class NumericFilter extends FilterPluginBase {
    * Provide a list of all the numeric operators
    */
   public function operatorOptions($which = 'title') {
-    $options = array();
+    $options = [];
     foreach ($this->operators() as $id => $info) {
       $options[$id] = $info[$which];
     }
@@ -121,7 +121,7 @@ class NumericFilter extends FilterPluginBase {
   }
 
   protected function operatorValues($values = 1) {
-    $options = array();
+    $options = [];
     foreach ($this->operators() as $id => $info) {
       if ($info['values'] == $values) {
         $options[] = $id;
@@ -159,17 +159,17 @@ class NumericFilter extends FilterPluginBase {
 
     $user_input = $form_state->getUserInput();
     if ($which == 'all') {
-      $form['value']['value'] = array(
+      $form['value']['value'] = [
         '#type' => 'textfield',
         '#title' => !$exposed ? $this->t('Value') : '',
         '#size' => 30,
         '#default_value' => $this->value['value'],
-      );
+      ];
       // Setup #states for all operators with one value.
       foreach ($this->operatorValues(1) as $operator) {
-        $form['value']['value']['#states']['visible'][] = array(
-          $source => array('value' => $operator),
-        );
+        $form['value']['value']['#states']['visible'][] = [
+          $source => ['value' => $operator],
+        ];
       }
       if ($exposed && !isset($user_input[$identifier]['value'])) {
         $user_input[$identifier]['value'] = $this->value['value'];
@@ -179,12 +179,12 @@ class NumericFilter extends FilterPluginBase {
     elseif ($which == 'value') {
       // When exposed we drop the value-value and just do value if
       // the operator is locked.
-      $form['value'] = array(
+      $form['value'] = [
         '#type' => 'textfield',
         '#title' => !$exposed ? $this->t('Value') : '',
         '#size' => 30,
         '#default_value' => $this->value['value'],
-      );
+      ];
       if ($exposed && !isset($user_input[$identifier])) {
         $user_input[$identifier] = $this->value['value'];
         $form_state->setUserInput($user_input);
@@ -192,26 +192,26 @@ class NumericFilter extends FilterPluginBase {
     }
 
     if ($which == 'all' || $which == 'minmax') {
-      $form['value']['min'] = array(
+      $form['value']['min'] = [
         '#type' => 'textfield',
         '#title' => !$exposed ? $this->t('Min') : $this->exposedInfo()['label'],
         '#size' => 30,
         '#default_value' => $this->value['min'],
         '#description' => !$exposed ? '' : $this->exposedInfo()['description']
-      );
-      $form['value']['max'] = array(
+      ];
+      $form['value']['max'] = [
         '#type' => 'textfield',
         '#title' => !$exposed ? $this->t('And max') : $this->t('And'),
         '#size' => 30,
         '#default_value' => $this->value['max'],
-      );
+      ];
       if ($which == 'all') {
-        $states = array();
+        $states = [];
         // Setup #states for all operators with two values.
         foreach ($this->operatorValues(2) as $operator) {
-          $states['#states']['visible'][] = array(
-            $source => array('value' => $operator),
-          );
+          $states['#states']['visible'][] = [
+            $source => ['value' => $operator],
+          ];
         }
         $form['value']['min'] += $states;
         $form['value']['max'] += $states;
@@ -225,10 +225,10 @@ class NumericFilter extends FilterPluginBase {
 
       if (!isset($form['value'])) {
         // Ensure there is something in the 'value'.
-        $form['value'] = array(
+        $form['value'] = [
           '#type' => 'value',
           '#value' => NULL
-        );
+        ];
       }
     }
   }
@@ -245,10 +245,10 @@ class NumericFilter extends FilterPluginBase {
 
   protected function opBetween($field) {
     if ($this->operator == 'between') {
-      $this->query->addWhere($this->options['group'], $field, array($this->value['min'], $this->value['max']), 'BETWEEN');
+      $this->query->addWhere($this->options['group'], $field, [$this->value['min'], $this->value['max']], 'BETWEEN');
     }
     else {
-      $this->query->addWhere($this->options['group'], $field, array($this->value['min'], $this->value['max']), 'NOT BETWEEN');
+      $this->query->addWhere($this->options['group'], $field, [$this->value['min'], $this->value['max']], 'NOT BETWEEN');
     }
   }
 
@@ -274,7 +274,7 @@ class NumericFilter extends FilterPluginBase {
    *   The expression pointing to the queries field, for example "foo.bar".
    */
   protected function opRegex($field) {
-    $this->query->addWhere($this->options['group'], $field, $this->value, 'REGEXP');
+    $this->query->addWhere($this->options['group'], $field, $this->value['value'], 'REGEXP');
   }
 
   public function adminSummary() {
@@ -288,7 +288,7 @@ class NumericFilter extends FilterPluginBase {
     $options = $this->operatorOptions('short');
     $output = $options[$this->operator];
     if (in_array($this->operator, $this->operatorValues(2))) {
-      $output .= ' ' . $this->t('@min and @max', array('@min' => $this->value['min'], '@max' => $this->value['max']));
+      $output .= ' ' . $this->t('@min and @max', ['@min' => $this->value['min'], '@max' => $this->value['max']]);
     }
     elseif (in_array($this->operator, $this->operatorValues(1))) {
       $output .= ' ' . $this->value['value'];
@@ -309,9 +309,9 @@ class NumericFilter extends FilterPluginBase {
     if (!empty($this->options['expose']['identifier'])) {
       $value = &$input[$this->options['expose']['identifier']];
       if (!is_array($value)) {
-        $value = array(
+        $value = [
           'value' => $value,
-        );
+        ];
       }
     }
 
diff --git a/web/core/modules/views/src/Plugin/views/filter/StringFilter.php b/web/core/modules/views/src/Plugin/views/filter/StringFilter.php
index 618b58458..4cae120b1 100644
--- a/web/core/modules/views/src/Plugin/views/filter/StringFilter.php
+++ b/web/core/modules/views/src/Plugin/views/filter/StringFilter.php
@@ -25,7 +25,7 @@ class StringFilter extends FilterPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['expose']['contains']['required'] = array('default' => FALSE);
+    $options['expose']['contains']['required'] = ['default' => FALSE];
 
     return $options;
   }
@@ -35,103 +35,103 @@ class StringFilter extends FilterPluginBase {
    * to add or remove functionality by overriding this function and
    * adding/removing items from this array.
    */
-  function operators() {
-    $operators = array(
-      '=' => array(
+  public function operators() {
+    $operators = [
+      '=' => [
         'title' => $this->t('Is equal to'),
         'short' => $this->t('='),
         'method' => 'opEqual',
         'values' => 1,
-      ),
-      '!=' => array(
+      ],
+      '!=' => [
         'title' => $this->t('Is not equal to'),
         'short' => $this->t('!='),
         'method' => 'opEqual',
         'values' => 1,
-      ),
-      'contains' => array(
+      ],
+      'contains' => [
         'title' => $this->t('Contains'),
         'short' => $this->t('contains'),
         'method' => 'opContains',
         'values' => 1,
-      ),
-      'word' => array(
+      ],
+      'word' => [
         'title' => $this->t('Contains any word'),
         'short' => $this->t('has word'),
         'method' => 'opContainsWord',
         'values' => 1,
-      ),
-      'allwords' => array(
+      ],
+      'allwords' => [
         'title' => $this->t('Contains all words'),
         'short' => $this->t('has all'),
         'method' => 'opContainsWord',
         'values' => 1,
-      ),
-      'starts' => array(
+      ],
+      'starts' => [
         'title' => $this->t('Starts with'),
         'short' => $this->t('begins'),
         'method' => 'opStartsWith',
         'values' => 1,
-      ),
-      'not_starts' => array(
+      ],
+      'not_starts' => [
         'title' => $this->t('Does not start with'),
         'short' => $this->t('not_begins'),
         'method' => 'opNotStartsWith',
         'values' => 1,
-      ),
-      'ends' => array(
+      ],
+      'ends' => [
         'title' => $this->t('Ends with'),
         'short' => $this->t('ends'),
         'method' => 'opEndsWith',
         'values' => 1,
-      ),
-      'not_ends' => array(
+      ],
+      'not_ends' => [
         'title' => $this->t('Does not end with'),
         'short' => $this->t('not_ends'),
         'method' => 'opNotEndsWith',
         'values' => 1,
-      ),
-      'not' => array(
+      ],
+      'not' => [
         'title' => $this->t('Does not contain'),
         'short' => $this->t('!has'),
         'method' => 'opNotLike',
         'values' => 1,
-      ),
-      'shorterthan' => array(
+      ],
+      'shorterthan' => [
         'title' => $this->t('Length is shorter than'),
         'short' => $this->t('shorter than'),
         'method' => 'opShorterThan',
         'values' => 1,
-      ),
-      'longerthan' => array(
+      ],
+      'longerthan' => [
         'title' => $this->t('Length is longer than'),
         'short' => $this->t('longer than'),
         'method' => 'opLongerThan',
         'values' => 1,
-      ),
-      'regular_expression' => array(
+      ],
+      'regular_expression' => [
         'title' => $this->t('Regular expression'),
         'short' => $this->t('regex'),
         'method' => 'opRegex',
         'values' => 1,
-      ),
-    );
+      ],
+    ];
     // if the definition allows for the empty operator, add it.
     if (!empty($this->definition['allow empty'])) {
-      $operators += array(
-        'empty' => array(
+      $operators += [
+        'empty' => [
           'title' => $this->t('Is empty (NULL)'),
           'method' => 'opEmpty',
           'short' => $this->t('empty'),
           'values' => 0,
-        ),
-        'not empty' => array(
+        ],
+        'not empty' => [
           'title' => $this->t('Is not empty (NOT NULL)'),
           'method' => 'opEmpty',
           'short' => $this->t('not empty'),
           'values' => 0,
-        ),
-      );
+        ],
+      ];
     }
 
     return $operators;
@@ -141,7 +141,7 @@ class StringFilter extends FilterPluginBase {
    * Build strings from the operators() for 'select' options
    */
   public function operatorOptions($which = 'title') {
-    $options = array();
+    $options = [];
     foreach ($this->operators() as $id => $info) {
       $options[$id] = $info[$which];
     }
@@ -169,7 +169,7 @@ class StringFilter extends FilterPluginBase {
   }
 
   protected function operatorValues($values = 1) {
-    $options = array();
+    $options = [];
     foreach ($this->operators() as $id => $info) {
       if (isset($info['values']) && $info['values'] == $values) {
         $options[] = $id;
@@ -204,12 +204,12 @@ class StringFilter extends FilterPluginBase {
     }
 
     if ($which == 'all' || $which == 'value') {
-      $form['value'] = array(
+      $form['value'] = [
         '#type' => 'textfield',
         '#title' => $this->t('Value'),
         '#size' => 30,
         '#default_value' => $this->value,
-      );
+      ];
       $user_input = $form_state->getUserInput();
       if ($exposed && !isset($user_input[$identifier])) {
         $user_input[$identifier] = $this->value;
@@ -219,23 +219,23 @@ class StringFilter extends FilterPluginBase {
       if ($which == 'all') {
         // Setup #states for all operators with one value.
         foreach ($this->operatorValues(1) as $operator) {
-          $form['value']['#states']['visible'][] = array(
-            $source => array('value' => $operator),
-          );
+          $form['value']['#states']['visible'][] = [
+            $source => ['value' => $operator],
+          ];
         }
       }
     }
 
     if (!isset($form['value'])) {
       // Ensure there is something in the 'value'.
-      $form['value'] = array(
+      $form['value'] = [
         '#type' => 'value',
         '#value' => NULL
-      );
+      ];
     }
   }
 
-  function operator() {
+  public function operator() {
     return $this->operator == '=' ? 'LIKE' : 'NOT LIKE';
   }
 
@@ -281,13 +281,13 @@ class StringFilter extends FilterPluginBase {
         $phrase = TRUE;
       }
       $words = trim($match[2], ',?!();:-');
-      $words = $phrase ? array($words) : preg_split('/ /', $words, -1, PREG_SPLIT_NO_EMPTY);
+      $words = $phrase ? [$words] : preg_split('/ /', $words, -1, PREG_SPLIT_NO_EMPTY);
       foreach ($words as $word) {
         $where->condition($field, '%' . db_like(trim($word, " ,!?")) . '%', 'LIKE');
       }
     }
 
-    if (!$where) {
+    if ($where->count() === 0) {
       return;
     }
 
@@ -320,14 +320,14 @@ class StringFilter extends FilterPluginBase {
     $placeholder = $this->placeholder();
     // Type cast the argument to an integer because the SQLite database driver
     // has to do some specific alterations to the query base on that data type.
-    $this->query->addWhereExpression($this->options['group'], "LENGTH($field) < $placeholder", array($placeholder => (int) $this->value));
+    $this->query->addWhereExpression($this->options['group'], "LENGTH($field) < $placeholder", [$placeholder => (int) $this->value]);
   }
 
   protected function opLongerThan($field) {
     $placeholder = $this->placeholder();
     // Type cast the argument to an integer because the SQLite database driver
     // has to do some specific alterations to the query base on that data type.
-    $this->query->addWhereExpression($this->options['group'], "LENGTH($field) > $placeholder", array($placeholder => (int) $this->value));
+    $this->query->addWhereExpression($this->options['group'], "LENGTH($field) > $placeholder", [$placeholder => (int) $this->value]);
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php b/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
index 37c1e064b..0aa6aa3b6 100644
--- a/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
@@ -191,7 +191,7 @@ class JoinPluginBase extends PluginBase implements JoinPluginInterface {
    *
    * @see \Drupal\views\Plugin\views\join\JoinPluginBase::initJoin()
    */
-  public $configuration = array();
+  public $configuration = [];
 
   /**
    * How all the extras will be combined. Either AND or OR.
@@ -223,10 +223,10 @@ class JoinPluginBase extends PluginBase implements JoinPluginInterface {
   public function __construct(array $configuration, $plugin_id, $plugin_definition) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     // Merge in some default values.
-    $configuration += array(
+    $configuration += [
       'type' => 'LEFT',
       'extra_operator' => 'AND'
-    );
+    ];
     $this->configuration = $configuration;
 
     if (!empty($configuration['table'])) {
@@ -270,17 +270,17 @@ class JoinPluginBase extends PluginBase implements JoinPluginInterface {
     }
 
     $condition = "$left_field = $table[alias].$this->field";
-    $arguments = array();
+    $arguments = [];
 
     // Tack on the extra.
     if (isset($this->extra)) {
       if (is_array($this->extra)) {
-        $extras = array();
+        $extras = [];
         foreach ($this->extra as $info) {
           // Do not require 'value' to be set; allow for field syntax instead.
-          $info += array(
+          $info += [
             'value' => NULL,
-          );
+          ];
           // Figure out the table name. Remember, only use aliases provided
           // if at all possible.
           $join_table = '';
diff --git a/web/core/modules/views/src/Plugin/views/join/Subquery.php b/web/core/modules/views/src/Plugin/views/join/Subquery.php
index fa2e421b8..f407ffce3 100644
--- a/web/core/modules/views/src/Plugin/views/join/Subquery.php
+++ b/web/core/modules/views/src/Plugin/views/join/Subquery.php
@@ -48,14 +48,14 @@ class Subquery extends JoinPluginBase {
 
     // Add our join condition, using a subquery on the left instead of a field.
     $condition = "($this->left_query) = $table[alias].$this->field";
-    $arguments = array();
+    $arguments = [];
 
     // Tack on the extra.
     // This is just copied verbatim from the parent class, which itself has a
     //   bug: https://www.drupal.org/node/1118100.
     if (isset($this->extra)) {
       if (is_array($this->extra)) {
-        $extras = array();
+        $extras = [];
         foreach ($this->extra as $info) {
           // Figure out the table name. Remember, only use aliases provided
           // if at all possible.
diff --git a/web/core/modules/views/src/Plugin/views/pager/Full.php b/web/core/modules/views/src/Plugin/views/pager/Full.php
index 76e646974..7d3adae63 100644
--- a/web/core/modules/views/src/Plugin/views/pager/Full.php
+++ b/web/core/modules/views/src/Plugin/views/pager/Full.php
@@ -27,10 +27,10 @@ class Full extends SqlBase {
     $options = parent::defineOptions();
 
     // Use the same default quantity that core uses by default.
-    $options['quantity'] = array('default' => 9);
+    $options['quantity'] = ['default' => 9];
 
-    $options['tags']['contains']['first'] = array('default' => $this->t('« First'));
-    $options['tags']['contains']['last'] = array('default' => $this->t('Last »'));
+    $options['tags']['contains']['first'] = ['default' => $this->t('« First')];
+    $options['tags']['contains']['last'] = ['default' => $this->t('Last »')];
 
     return $options;
   }
@@ -41,26 +41,26 @@ class Full extends SqlBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['quantity'] = array(
+    $form['quantity'] = [
       '#type' => 'number',
       '#title' => $this->t('Number of pager links visible'),
       '#description' => $this->t('Specify the number of links to pages to display in the pager.'),
       '#default_value' => $this->options['quantity'],
-    );
+    ];
 
-    $form['tags']['first'] = array(
+    $form['tags']['first'] = [
       '#type' => 'textfield',
       '#title' => $this->t('First page link text'),
       '#default_value' => $this->options['tags']['first'],
       '#weight' => -10,
-    );
+    ];
 
-    $form['tags']['last'] = array(
+    $form['tags']['last'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Last page link text'),
       '#default_value' => $this->options['tags']['last'],
       '#weight' => 10,
-    );
+    ];
   }
 
   /**
@@ -68,9 +68,9 @@ class Full extends SqlBase {
    */
   public function summaryTitle() {
     if (!empty($this->options['offset'])) {
-      return $this->formatPlural($this->options['items_per_page'], '@count item, skip @skip', 'Paged, @count items, skip @skip', array('@count' => $this->options['items_per_page'], '@skip' => $this->options['offset']));
+      return $this->formatPlural($this->options['items_per_page'], '@count item, skip @skip', 'Paged, @count items, skip @skip', ['@count' => $this->options['items_per_page'], '@skip' => $this->options['offset']]);
     }
-    return $this->formatPlural($this->options['items_per_page'], '@count item', 'Paged, @count items', array('@count' => $this->options['items_per_page']));
+    return $this->formatPlural($this->options['items_per_page'], '@count item', 'Paged, @count items', ['@count' => $this->options['items_per_page']]);
   }
 
   /**
@@ -79,20 +79,20 @@ class Full extends SqlBase {
   public function render($input) {
     // The 0, 1, 3, 4 indexes are correct. See the template_preprocess_pager()
     // documentation.
-    $tags = array(
+    $tags = [
       0 => $this->options['tags']['first'],
       1 => $this->options['tags']['previous'],
       3 => $this->options['tags']['next'],
       4 => $this->options['tags']['last'],
-    );
-    return array(
+    ];
+    return [
       '#theme' => $this->themeFunctions(),
       '#tags' => $tags,
       '#element' => $this->options['id'],
       '#parameters' => $input,
       '#quantity' => $this->options['quantity'],
       '#route_name' => !empty($this->view->live_preview) ? '<current>' : '<none>',
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/pager/Mini.php b/web/core/modules/views/src/Plugin/views/pager/Mini.php
index c6520f4fb..f92f193b1 100644
--- a/web/core/modules/views/src/Plugin/views/pager/Mini.php
+++ b/web/core/modules/views/src/Plugin/views/pager/Mini.php
@@ -36,9 +36,9 @@ class Mini extends SqlBase {
    */
   public function summaryTitle() {
     if (!empty($this->options['offset'])) {
-      return $this->formatPlural($this->options['items_per_page'], 'Mini pager, @count item, skip @skip', 'Mini pager, @count items, skip @skip', array('@count' => $this->options['items_per_page'], '@skip' => $this->options['offset']));
+      return $this->formatPlural($this->options['items_per_page'], 'Mini pager, @count item, skip @skip', 'Mini pager, @count items, skip @skip', ['@count' => $this->options['items_per_page'], '@skip' => $this->options['offset']]);
     }
-    return $this->formatPlural($this->options['items_per_page'], 'Mini pager, @count item', 'Mini pager, @count items', array('@count' => $this->options['items_per_page']));
+    return $this->formatPlural($this->options['items_per_page'], 'Mini pager, @count item', 'Mini pager, @count items', ['@count' => $this->options['items_per_page']]);
   }
 
   /**
@@ -89,17 +89,17 @@ class Mini extends SqlBase {
    */
   public function render($input) {
     // The 1, 3 indexes are correct, see template_preprocess_pager().
-    $tags = array(
+    $tags = [
       1 => $this->options['tags']['previous'],
       3 => $this->options['tags']['next'],
-    );
-    return array(
+    ];
+    return [
       '#theme' => $this->themeFunctions(),
       '#tags' => $tags,
       '#element' => $this->options['id'],
       '#parameters' => $input,
       '#route_name' => !empty($this->view->live_preview) ? '<current>' : '<none>',
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/pager/None.php b/web/core/modules/views/src/Plugin/views/pager/None.php
index e5dcecdef..ae2891a27 100644
--- a/web/core/modules/views/src/Plugin/views/pager/None.php
+++ b/web/core/modules/views/src/Plugin/views/pager/None.php
@@ -32,14 +32,14 @@ class None extends PagerPluginBase {
 
   public function summaryTitle() {
     if (!empty($this->options['offset'])) {
-      return $this->t('All items, skip @skip', array('@skip' => $this->options['offset']));
+      return $this->t('All items, skip @skip', ['@skip' => $this->options['offset']]);
     }
     return $this->t('All items');
   }
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['offset'] = array('default' => 0);
+    $options['offset'] = ['default' => 0];
 
     return $options;
   }
@@ -49,12 +49,12 @@ class None extends PagerPluginBase {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['offset'] = array(
+    $form['offset'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Offset (number of items to skip)'),
       '#description' => $this->t('For example, set this to 3 and the first 3 items will not be displayed.'),
       '#default_value' => $this->options['offset'],
-    );
+    ];
   }
 
   public function usePager() {
diff --git a/web/core/modules/views/src/Plugin/views/pager/Some.php b/web/core/modules/views/src/Plugin/views/pager/Some.php
index ef7f65d84..59edaea08 100644
--- a/web/core/modules/views/src/Plugin/views/pager/Some.php
+++ b/web/core/modules/views/src/Plugin/views/pager/Some.php
@@ -20,15 +20,15 @@ class Some extends PagerPluginBase {
 
   public function summaryTitle() {
     if (!empty($this->options['offset'])) {
-      return $this->formatPlural($this->options['items_per_page'], '@count item, skip @skip', '@count items, skip @skip', array('@count' => $this->options['items_per_page'], '@skip' => $this->options['offset']));
+      return $this->formatPlural($this->options['items_per_page'], '@count item, skip @skip', '@count items, skip @skip', ['@count' => $this->options['items_per_page'], '@skip' => $this->options['offset']]);
     }
-    return $this->formatPlural($this->options['items_per_page'], '@count item', '@count items', array('@count' => $this->options['items_per_page']));
+    return $this->formatPlural($this->options['items_per_page'], '@count item', '@count items', ['@count' => $this->options['items_per_page']]);
   }
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['items_per_page'] = array('default' => 10);
-    $options['offset'] = array('default' => 0);
+    $options['items_per_page'] = ['default' => 10];
+    $options['offset'] = ['default' => 0];
 
     return $options;
   }
@@ -39,19 +39,19 @@ class Some extends PagerPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
     $pager_text = $this->displayHandler->getPagerText();
-    $form['items_per_page'] = array(
+    $form['items_per_page'] = [
       '#title' => $pager_text['items per page title'],
       '#type' => 'textfield',
       '#description' => $pager_text['items per page description'],
       '#default_value' => $this->options['items_per_page'],
-    );
+    ];
 
-    $form['offset'] = array(
+    $form['offset'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Offset (number of items to skip)'),
       '#description' => $this->t('For example, set this to 3 and the first 3 items will not be displayed.'),
       '#default_value' => $this->options['offset'],
-    );
+    ];
   }
 
   public function usePager() {
diff --git a/web/core/modules/views/src/Plugin/views/pager/SqlBase.php b/web/core/modules/views/src/Plugin/views/pager/SqlBase.php
index 0154762c0..46daeb7ed 100644
--- a/web/core/modules/views/src/Plugin/views/pager/SqlBase.php
+++ b/web/core/modules/views/src/Plugin/views/pager/SqlBase.php
@@ -13,28 +13,28 @@ abstract class SqlBase extends PagerPluginBase implements CacheableDependencyInt
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['items_per_page'] = array('default' => 10);
-    $options['offset'] = array('default' => 0);
-    $options['id'] = array('default' => 0);
-    $options['total_pages'] = array('default' => '');
-    $options['expose'] = array(
-      'contains' => array(
-        'items_per_page' => array('default' => FALSE),
-        'items_per_page_label' => array('default' => $this->t('Items per page')),
-        'items_per_page_options' => array('default' => '5, 10, 25, 50'),
-        'items_per_page_options_all' => array('default' => FALSE),
-        'items_per_page_options_all_label' => array('default' => $this->t('- All -')),
+    $options['items_per_page'] = ['default' => 10];
+    $options['offset'] = ['default' => 0];
+    $options['id'] = ['default' => 0];
+    $options['total_pages'] = ['default' => ''];
+    $options['expose'] = [
+      'contains' => [
+        'items_per_page' => ['default' => FALSE],
+        'items_per_page_label' => ['default' => $this->t('Items per page')],
+        'items_per_page_options' => ['default' => '5, 10, 25, 50'],
+        'items_per_page_options_all' => ['default' => FALSE],
+        'items_per_page_options_all_label' => ['default' => $this->t('- All -')],
 
-        'offset' => array('default' => FALSE),
-        'offset_label' => array('default' => $this->t('Offset')),
-      ),
-    );
-    $options['tags'] = array(
-      'contains' => array(
-        'previous' => array('default' => $this->t('‹ Previous')),
-        'next' => array('default' => $this->t('Next ›')),
-      ),
-    );
+        'offset' => ['default' => FALSE],
+        'offset_label' => ['default' => $this->t('Offset')],
+      ],
+    ];
+    $options['tags'] = [
+      'contains' => [
+        'previous' => ['default' => $this->t('‹ Previous')],
+        'next' => ['default' => $this->t('Next ›')],
+      ],
+    ];
     return $options;
   }
 
@@ -44,135 +44,135 @@ abstract class SqlBase extends PagerPluginBase implements CacheableDependencyInt
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
     $pager_text = $this->displayHandler->getPagerText();
-    $form['items_per_page'] = array(
+    $form['items_per_page'] = [
       '#title' => $pager_text['items per page title'],
       '#type' => 'number',
       '#description' => $pager_text['items per page description'],
       '#default_value' => $this->options['items_per_page'],
-    );
+    ];
 
-    $form['offset'] = array(
+    $form['offset'] = [
       '#type' => 'number',
       '#title' => $this->t('Offset (number of items to skip)'),
       '#description' => $this->t('For example, set this to 3 and the first 3 items will not be displayed.'),
       '#default_value' => $this->options['offset'],
-    );
+    ];
 
-    $form['id'] = array(
+    $form['id'] = [
       '#type' => 'number',
       '#title' => $this->t('Pager ID'),
       '#description' => $this->t("Unless you're experiencing problems with pagers related to this view, you should leave this at 0. If using multiple pagers on one page you may need to set this number to a higher value so as not to conflict within the ?page= array. Large values will add a lot of commas to your URLs, so avoid if possible."),
       '#default_value' => $this->options['id'],
-    );
+    ];
 
-    $form['total_pages'] = array(
+    $form['total_pages'] = [
       '#type' => 'number',
       '#title' => $this->t('Number of pages'),
       '#description' => $this->t('Leave empty to show all pages.'),
       '#default_value' => $this->options['total_pages'],
-    );
+    ];
 
-    $form['tags'] = array(
+    $form['tags'] = [
       '#type' => 'details',
       '#open' => TRUE,
       '#tree' => TRUE,
       '#title' => $this->t('Pager link labels'),
       '#input' => TRUE,
-    );
+    ];
 
-    $form['tags']['previous'] = array(
+    $form['tags']['previous'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Previous page link text'),
       '#default_value' => $this->options['tags']['previous'],
-    );
+    ];
 
-    $form['tags']['next'] = array(
+    $form['tags']['next'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Next page link text'),
       '#default_value' => $this->options['tags']['next'],
-    );
+    ];
 
-    $form['expose'] = array(
+    $form['expose'] = [
       '#type' => 'details',
       '#open' => TRUE,
       '#tree' => TRUE,
       '#title' => $this->t('Exposed options'),
       '#input' => TRUE,
       '#description' => $this->t('Allow user to control selected display options for this view.'),
-    );
+    ];
 
-    $form['expose']['items_per_page'] = array(
+    $form['expose']['items_per_page'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow user to control the number of items displayed in this view'),
       '#default_value' => $this->options['expose']['items_per_page'],
-    );
+    ];
 
-    $form['expose']['items_per_page_label'] = array(
+    $form['expose']['items_per_page_label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Items per page label'),
       '#required' => TRUE,
       '#default_value' => $this->options['expose']['items_per_page_label'],
-      '#states' => array(
-        'invisible' => array(
-          'input[name="pager_options[expose][items_per_page]"]' => array('checked' => FALSE),
-        ),
-      ),
-    );
+      '#states' => [
+        'invisible' => [
+          'input[name="pager_options[expose][items_per_page]"]' => ['checked' => FALSE],
+        ],
+      ],
+    ];
 
-    $form['expose']['items_per_page_options'] = array(
+    $form['expose']['items_per_page_options'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Exposed items per page options'),
       '#required' => TRUE,
       '#description' => $this->t('Set between which values the user can choose when determining the items per page. Separated by comma.'),
       '#default_value' => $this->options['expose']['items_per_page_options'],
-      '#states' => array(
-        'invisible' => array(
-          'input[name="pager_options[expose][items_per_page]"]' => array('checked' => FALSE),
-        ),
-      ),
-    );
+      '#states' => [
+        'invisible' => [
+          'input[name="pager_options[expose][items_per_page]"]' => ['checked' => FALSE],
+        ],
+      ],
+    ];
 
 
-    $form['expose']['items_per_page_options_all'] = array(
+    $form['expose']['items_per_page_options_all'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow user to display all items'),
       '#default_value' => $this->options['expose']['items_per_page_options_all'],
-    );
+    ];
 
-    $form['expose']['items_per_page_options_all_label'] = array(
+    $form['expose']['items_per_page_options_all_label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('All items label'),
       '#default_value' => $this->options['expose']['items_per_page_options_all_label'],
-      '#states' => array(
-        'invisible' => array(
-          'input[name="pager_options[expose][items_per_page_options_all]"]' => array('checked' => FALSE),
-        ),
-      ),
-    );
+      '#states' => [
+        'invisible' => [
+          'input[name="pager_options[expose][items_per_page_options_all]"]' => ['checked' => FALSE],
+        ],
+      ],
+    ];
 
-    $form['expose']['offset'] = array(
+    $form['expose']['offset'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow user to specify number of items skipped from beginning of this view.'),
       '#default_value' => $this->options['expose']['offset'],
-    );
+    ];
 
-    $form['expose']['offset_label'] = array(
+    $form['expose']['offset_label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Offset label'),
       '#required' => TRUE,
       '#default_value' => $this->options['expose']['offset_label'],
-      '#states' => array(
-        'invisible' => array(
-          'input[name="pager_options[expose][offset]"]' => array('checked' => FALSE),
-        ),
-      ),
-    );
+      '#states' => [
+        'invisible' => [
+          'input[name="pager_options[expose][offset]"]' => ['checked' => FALSE],
+        ],
+      ],
+    ];
   }
 
   public function validateOptionsForm(&$form, FormStateInterface $form_state) {
     // Only accept integer values.
     $error = FALSE;
-    $exposed_options = $form_state->getValue(array('pager_options', 'expose', 'items_per_page_options'));
+    $exposed_options = $form_state->getValue(['pager_options', 'expose', 'items_per_page_options']);
     if (strpos($exposed_options, '.') !== FALSE) {
       $error = TRUE;
     }
@@ -192,11 +192,11 @@ abstract class SqlBase extends PagerPluginBase implements CacheableDependencyInt
     }
 
     // Make sure that the items_per_page is part of the expose settings.
-    if (!$form_state->isValueEmpty(array('pager_options', 'expose', 'items_per_page')) && !$form_state->isValueEmpty(array('pager_options', 'items_per_page'))) {
-      $items_per_page = $form_state->getValue(array('pager_options', 'items_per_page'));
+    if (!$form_state->isValueEmpty(['pager_options', 'expose', 'items_per_page']) && !$form_state->isValueEmpty(['pager_options', 'items_per_page'])) {
+      $items_per_page = $form_state->getValue(['pager_options', 'items_per_page']);
       if (array_search($items_per_page, $options) === FALSE) {
         $form_state->setErrorByName('pager_options][expose][items_per_page_options', $this->t("The <em>Exposed items per page</em> field's options must include the value from the <em>Items per page</em> field (@items_per_page).",
-          array('@items_per_page' => $items_per_page))
+          ['@items_per_page' => $items_per_page])
         );
       }
     }
@@ -253,13 +253,13 @@ abstract class SqlBase extends PagerPluginBase implements CacheableDependencyInt
     global $pager_page_array;
 
     if (empty($pager_page_array)) {
-      $pager_page_array = array();
+      $pager_page_array = [];
     }
 
     // Fill in missing values in the global page array, in case the global page
     // array hasn't been initialized before.
     $page = $this->view->getRequest()->query->get('page');
-    $page = isset($page) ? explode(',', $page) : array();
+    $page = isset($page) ? explode(',', $page) : [];
 
     for ($i = 0; $i <= $this->options['id'] || $i < count($pager_page_array); $i++) {
       $pager_page_array[$i] = empty($page[$i]) ? 0 : $page[$i];
@@ -331,7 +331,7 @@ abstract class SqlBase extends PagerPluginBase implements CacheableDependencyInt
   public function exposedFormAlter(&$form, FormStateInterface $form_state) {
     if ($this->itemsPerPageExposed()) {
       $options = explode(',', $this->options['expose']['items_per_page_options']);
-      $sanitized_options = array();
+      $sanitized_options = [];
       if (is_array($options)) {
         foreach ($options as $option) {
           $sanitized_options[intval($option)] = intval($option);
@@ -339,23 +339,23 @@ abstract class SqlBase extends PagerPluginBase implements CacheableDependencyInt
         if (!empty($this->options['expose']['items_per_page_options_all']) && !empty($this->options['expose']['items_per_page_options_all_label'])) {
           $sanitized_options['All'] = $this->options['expose']['items_per_page_options_all_label'];
         }
-        $form['items_per_page'] = array(
+        $form['items_per_page'] = [
           '#type' => 'select',
           '#title' => $this->options['expose']['items_per_page_label'],
           '#options' => $sanitized_options,
           '#default_value' => $this->getItemsPerPage(),
-        );
+        ];
       }
     }
 
     if ($this->isOffsetExposed()) {
-      $form['offset'] = array(
+      $form['offset'] = [
         '#type' => 'textfield',
         '#size' => 10,
         '#maxlength' => 10,
         '#title' => $this->options['expose']['offset_label'],
         '#default_value' => $this->getOffset(),
-      );
+      ];
     }
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/query/QueryPluginBase.php b/web/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
index d4e1b23cc..a2c2e105b 100644
--- a/web/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
@@ -173,7 +173,7 @@ abstract class QueryPluginBase extends PluginBase implements CacheableDependency
 
     // Create an empty group
     if (empty($groups[$group])) {
-      $groups[$group] = array('conditions' => array(), 'args' => array());
+      $groups[$group] = ['conditions' => [], 'args' => []];
     }
 
     $groups[$group]['type'] = strtoupper($type);
@@ -199,7 +199,7 @@ abstract class QueryPluginBase extends PluginBase implements CacheableDependency
    *
    * Query plugins that don't support entities can leave the method empty.
    */
-  function loadEntities(&$results) {}
+  public function loadEntities(&$results) {}
 
   /**
    * Returns a Unix timestamp to database native timestamp expression.
@@ -261,19 +261,19 @@ abstract class QueryPluginBase extends PluginBase implements CacheableDependency
    */
   public function getEntityTableInfo() {
     // Start with the base table.
-    $entity_tables = array();
+    $entity_tables = [];
     $views_data = Views::viewsData();
     $base_table = $this->view->storage->get('base_table');
     $base_table_data = $views_data->get($base_table);
 
     if (isset($base_table_data['table']['entity type'])) {
-      $entity_tables[$base_table_data['table']['entity type']] = array(
+      $entity_tables[$base_table_data['table']['entity type']] = [
         'base' => $base_table,
         'alias' => $base_table,
         'relationship_id' => 'none',
         'entity_type' => $base_table_data['table']['entity type'],
         'revision' => $base_table_data['table']['entity revision'],
-      );
+      ];
 
       // Include the entity provider.
       if (!empty($base_table_data['table']['provider'])) {
@@ -293,13 +293,13 @@ abstract class QueryPluginBase extends PluginBase implements CacheableDependency
           continue;
         }
 
-        $entity_tables[$relationship_id . '__' . $relationship->tableAlias] = array(
+        $entity_tables[$relationship_id . '__' . $relationship->tableAlias] = [
           'base' => $relationship->definition['base'],
           'relationship_id' => $relationship_id,
           'alias' => $relationship->alias,
           'entity_type' => $table_data['table']['entity type'],
           'revision' => $table_data['table']['entity revision'],
-        );
+        ];
 
         // Include the entity provider.
         if (!empty($table_data['table']['provider'])) {
diff --git a/web/core/modules/views/src/Plugin/views/query/Sql.php b/web/core/modules/views/src/Plugin/views/query/Sql.php
index cfe593cc2..1210c1c72 100644
--- a/web/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/web/core/modules/views/src/Plugin/views/query/Sql.php
@@ -32,31 +32,31 @@ class Sql extends QueryPluginBase {
   /**
    * A list of tables in the order they should be added, keyed by alias.
    */
-  protected $tableQueue = array();
+  protected $tableQueue = [];
 
   /**
    * Holds an array of tables and counts added so that we can create aliases
    */
-  public $tables = array();
+  public $tables = [];
 
   /**
    * Holds an array of relationships, which are aliases of the primary
    * table that represent different ways to join the same table in.
    */
-  public $relationships = array();
+  public $relationships = [];
 
   /**
    * An array of sections of the WHERE query. Each section is in itself
    * an array of pieces and a flag as to whether or not it should be AND
    * or OR.
    */
-  public $where = array();
+  public $where = [];
   /**
    * An array of sections of the HAVING query. Each section is in itself
    * an array of pieces and a flag as to whether or not it should be AND
    * or OR.
    */
-  public $having = array();
+  public $having = [];
   /**
    * The default operator to use when connecting the WHERE groups. May be
    * AND or OR.
@@ -66,18 +66,18 @@ class Sql extends QueryPluginBase {
   /**
    * A simple array of order by clauses.
    */
-  public $orderby = array();
+  public $orderby = [];
 
   /**
    * A simple array of group by clauses.
    */
-  public $groupby = array();
+  public $groupby = [];
 
 
   /**
    * An array of fields.
    */
-  public $fields = array();
+  public $fields = [];
 
   /**
    * A flag as to whether or not to make the primary field distinct.
@@ -94,12 +94,12 @@ class Sql extends QueryPluginBase {
   /**
    * An array mapping table aliases and field names to field aliases.
    */
-  protected $fieldAliases = array();
+  protected $fieldAliases = [];
 
   /**
    * Query tags which will be passed over to the dbtng query object.
    */
-  public $tags = array();
+  public $tags = [];
 
   /**
    * Is the view marked as not distinct.
@@ -150,33 +150,33 @@ class Sql extends QueryPluginBase {
 
     $base_table = $this->view->storage->get('base_table');
     $base_field = $this->view->storage->get('base_field');
-    $this->relationships[$base_table] = array(
+    $this->relationships[$base_table] = [
       'link' => NULL,
       'table' => $base_table,
       'alias' => $base_table,
       'base' => $base_table
-    );
+    ];
 
     // init the table queue with our primary table.
-    $this->tableQueue[$base_table] = array(
+    $this->tableQueue[$base_table] = [
       'alias' => $base_table,
       'table' => $base_table,
       'relationship' => $base_table,
       'join' => NULL,
-    );
+    ];
 
     // init the tables with our primary table
-    $this->tables[$base_table][$base_table] = array(
+    $this->tables[$base_table][$base_table] = [
       'count' => 1,
       'alias' => $base_table,
-    );
+    ];
 
-    $this->count_field = array(
+    $this->count_field = [
       'table' => $base_table,
       'field' => $base_field,
       'alias' => $base_field,
       'count' => TRUE,
-    );
+    ];
   }
 
   /**
@@ -198,31 +198,31 @@ class Sql extends QueryPluginBase {
     if (empty($alias)) {
       $alias = $table . '_' . $field;
     }
-    $this->count_field = array(
+    $this->count_field = [
       'table' => $table,
       'field' => $field,
       'alias' => $alias,
       'count' => TRUE,
-    );
+    ];
   }
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['disable_sql_rewrite'] = array(
+    $options['disable_sql_rewrite'] = [
       'default' => FALSE,
-    );
-    $options['distinct'] = array(
+    ];
+    $options['distinct'] = [
       'default' => FALSE,
-    );
-    $options['replica'] = array(
+    ];
+    $options['replica'] = [
       'default' => FALSE,
-    );
-    $options['query_comment'] = array(
+    ];
+    $options['query_comment'] = [
       'default' => '',
-    );
-    $options['query_tags'] = array(
-      'default' => array(),
-    );
+    ];
+    $options['query_tags'] = [
+      'default' => [],
+    ];
 
     return $options;
   }
@@ -233,45 +233,45 @@ class Sql extends QueryPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['disable_sql_rewrite'] = array(
+    $form['disable_sql_rewrite'] = [
       '#title' => $this->t('Disable SQL rewriting'),
       '#description' => $this->t('Disabling SQL rewriting will omit all query tags, i. e. disable node access checks as well as override hook_query_alter() implementations in other modules.'),
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['disable_sql_rewrite']),
       '#suffix' => '<div class="messages messages--warning sql-rewrite-warning js-hide">' . $this->t('WARNING: Disabling SQL rewriting means that node access security is disabled. This may allow users to see data they should not be able to see if your view is misconfigured. Use this option only if you understand and accept this security risk.') . '</div>',
-    );
-    $form['distinct'] = array(
+    ];
+    $form['distinct'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Distinct'),
       '#description' => $this->t('This will make the view display only distinct items. If there are multiple identical items, each will be displayed only once. You can use this to try and remove duplicates from a view, though it does not always work. Note that this can slow queries down, so use it with caution.'),
       '#default_value' => !empty($this->options['distinct']),
-    );
-    $form['replica'] = array(
+    ];
+    $form['replica'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Use Secondary Server'),
       '#description' => $this->t('This will make the query attempt to connect to a replica server if available.  If no replica server is defined or available, it will fall back to the default server.'),
       '#default_value' => !empty($this->options['replica']),
-    );
-    $form['query_comment'] = array(
+    ];
+    $form['query_comment'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Query Comment'),
       '#description' => $this->t('If set, this comment will be embedded in the query and passed to the SQL server. This can be helpful for logging or debugging.'),
       '#default_value' => $this->options['query_comment'],
-    );
-    $form['query_tags'] = array(
+    ];
+    $form['query_tags'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Query Tags'),
       '#description' => $this->t('If set, these tags will be appended to the query and can be used to identify the query in a module. This can be helpful for altering queries.'),
       '#default_value' => implode(', ', $this->options['query_tags']),
-      '#element_validate' => array('views_element_validate_tags'),
-    );
+      '#element_validate' => ['views_element_validate_tags'],
+    ];
   }
 
   /**
    * Special submit handling.
    */
   public function submitOptionsForm(&$form, FormStateInterface $form_state) {
-    $element = array('#parents' => array('query', 'options', 'query_tags'));
+    $element = ['#parents' => ['query', 'options', 'query_tags']];
     $value = explode(',', NestedArray::getValue($form_state->getValues(), $element['#parents']));
     $value = array_filter(array_map('trim', $value));
     $form_state->setValueForElement($element, $value);
@@ -327,24 +327,24 @@ class Sql extends QueryPluginBase {
 
     // Add the table directly to the queue to avoid accidentally marking
     // it.
-    $this->tableQueue[$alias] = array(
+    $this->tableQueue[$alias] = [
       'table' => $join->table,
       'num' => 1,
       'alias' => $alias,
       'join' => $join,
       'relationship' => $link_point,
-    );
+    ];
 
-    $this->relationships[$alias] = array(
+    $this->relationships[$alias] = [
       'link' => $link_point,
       'table' => $join->table,
       'base' => $base,
-    );
+    ];
 
-    $this->tables[$this->view->storage->get('base_table')][$alias] = array(
+    $this->tables[$this->view->storage->get('base_table')][$alias] = [
       'count' => 1,
       'alias' => $alias,
-    );
+    ];
 
     return $alias;
   }
@@ -470,13 +470,13 @@ class Sql extends QueryPluginBase {
       $join = $this->adjustJoin($join, $relationship);
     }
 
-    $this->tableQueue[$alias] = array(
+    $this->tableQueue[$alias] = [
       'table' => $table,
       'num' => $this->tables[$relationship][$table]['count'],
       'alias' => $alias,
       'join' => $join,
       'relationship' => $relationship,
-    );
+    ];
 
     return $alias;
   }
@@ -493,10 +493,10 @@ class Sql extends QueryPluginBase {
         }
         $alias .= $table;
       }
-      $this->tables[$relationship][$table] = array(
+      $this->tables[$relationship][$table] = [
         'count' => 1,
         'alias' => $alias,
-      );
+      ];
     }
     else {
       $this->tables[$relationship][$table]['count']++;
@@ -602,7 +602,7 @@ class Sql extends QueryPluginBase {
    * query they will be added, but additional copies will NOT be added
    * if the table is already there.
    */
-  protected function ensurePath($table, $relationship = NULL, $join = NULL, $traced = array(), $add = array()) {
+  protected function ensurePath($table, $relationship = NULL, $join = NULL, $traced = [], $add = []) {
     if (!isset($relationship)) {
       $relationship = $this->view->storage->get('base_table');
     }
@@ -762,7 +762,7 @@ class Sql extends QueryPluginBase {
    * @return string
    *   The name that this field can be referred to as. Usually this is the alias.
    */
-  public function addField($table, $field, $alias = '', $params = array()) {
+  public function addField($table, $field, $alias = '', $params = []) {
     // We check for this specifically because it gets a special alias.
     if ($table == $this->view->storage->get('base_table') && $field == $this->view->storage->get('base_field') && empty($alias)) {
       $alias = $this->view->storage->get('base_field');
@@ -787,11 +787,11 @@ class Sql extends QueryPluginBase {
     $alias = strtolower(substr($alias, 0, 60));
 
     // Create a field info array.
-    $field_info = array(
+    $field_info = [
       'field' => $field,
       'table' => $table,
       'alias' => $alias,
-    ) + $params;
+    ] + $params;
 
     // Test to see if the field is actually the same or not. Due to
     // differing parameters changing the aggregation function, we need
@@ -817,7 +817,7 @@ class Sql extends QueryPluginBase {
    * mode where we're changing the query because we didn't get data we needed.
    */
   public function clearFields() {
-    $this->fields = array();
+    $this->fields = [];
   }
 
   /**
@@ -866,11 +866,11 @@ class Sql extends QueryPluginBase {
       $this->setWhereGroup('AND', $group);
     }
 
-    $this->where[$group]['conditions'][] = array(
+    $this->where[$group]['conditions'][] = [
       'field' => $field,
       'value' => $value,
       'operator' => $operator,
-    );
+    ];
   }
 
   /**
@@ -892,7 +892,7 @@ class Sql extends QueryPluginBase {
    *
    * @see QueryConditionInterface::where()
    */
-  public function addWhereExpression($group, $snippet, $args = array()) {
+  public function addWhereExpression($group, $snippet, $args = []) {
     // Ensure all variants of 0 are actually 0. Thus '', 0 and NULL are all
     // the default group.
     if (empty($group)) {
@@ -904,11 +904,11 @@ class Sql extends QueryPluginBase {
       $this->setWhereGroup('AND', $group);
     }
 
-    $this->where[$group]['conditions'][] = array(
+    $this->where[$group]['conditions'][] = [
       'field' => $snippet,
       'value' => $args,
       'operator' => 'formula',
-    );
+    ];
   }
 
   /**
@@ -929,7 +929,7 @@ class Sql extends QueryPluginBase {
    *
    * @see QueryConditionInterface::having()
    */
-  public function addHavingExpression($group, $snippet, $args = array()) {
+  public function addHavingExpression($group, $snippet, $args = []) {
     // Ensure all variants of 0 are actually 0. Thus '', 0 and NULL are all
     // the default group.
     if (empty($group)) {
@@ -942,11 +942,11 @@ class Sql extends QueryPluginBase {
     }
 
     // Add the clause and the args.
-    $this->having[$group]['conditions'][] = array(
+    $this->having[$group]['conditions'][] = [
       'field' => $snippet,
       'value' => $args,
       'operator' => 'formula',
-    );
+    ];
   }
 
   /**
@@ -968,7 +968,7 @@ class Sql extends QueryPluginBase {
    * @param $params
    *   Any params that should be passed through to the addField.
    */
-  public function addOrderBy($table, $field = NULL, $order = 'ASC', $alias = '', $params = array()) {
+  public function addOrderBy($table, $field = NULL, $order = 'ASC', $alias = '', $params = []) {
     // Only ensure the table if it's not the special random key.
     // @todo: Maybe it would make sense to just add an addOrderByRand or something similar.
     if ($table && $table != 'rand') {
@@ -988,10 +988,10 @@ class Sql extends QueryPluginBase {
       $as = $this->addField($table, $field, $as, $params);
     }
 
-    $this->orderby[] = array(
+    $this->orderby[] = [
       'field' => $as,
       'direction' => strtoupper($order)
-    );
+    ];
   }
 
   /**
@@ -1030,7 +1030,7 @@ class Sql extends QueryPluginBase {
    * Generates a unique placeholder used in the db query.
    */
   public function placeholder($base = 'views') {
-    static $placeholders = array();
+    static $placeholders = [];
     if (!isset($placeholders[$base])) {
       $placeholders[$base] = 0;
       return ':' . $base;
@@ -1110,7 +1110,7 @@ class Sql extends QueryPluginBase {
    *   An array of the fieldnames which are non-aggregates.
    */
   protected function getNonAggregates() {
-    $non_aggregates = array();
+    $non_aggregates = [];
     foreach ($this->fields as $field) {
       $string = '';
       if (!empty($field['table'])) {
@@ -1166,9 +1166,9 @@ class Sql extends QueryPluginBase {
 
       if (!empty($field['function'])) {
         $info = $this->getAggregationInfo();
-        if (!empty($info[$field['function']]['method']) && is_callable(array($this, $info[$field['function']]['method']))) {
+        if (!empty($info[$field['function']]['method']) && is_callable([$this, $info[$field['function']]['method']])) {
           $string = $this::{$info[$field['function']]['method']}($field['function'], $string);
-          $placeholders = !empty($field['placeholders']) ? $field['placeholders'] : array();
+          $placeholders = !empty($field['placeholders']) ? $field['placeholders'] : [];
           $query->addExpression($string, $fieldname, $placeholders);
         }
 
@@ -1176,7 +1176,7 @@ class Sql extends QueryPluginBase {
       }
       // This is a formula, using no tables.
       elseif (empty($field['table'])) {
-        $placeholders = !empty($field['placeholders']) ? $field['placeholders'] : array();
+        $placeholders = !empty($field['placeholders']) ? $field['placeholders'] : [];
         $query->addExpression($string, $fieldname, $placeholders);
       }
       elseif ($this->distinct && !in_array($fieldname, $this->groupby)) {
@@ -1227,7 +1227,7 @@ class Sql extends QueryPluginBase {
       $this->getCountOptimized = TRUE;
     }
 
-    $options = array();
+    $options = [];
     $target = 'default';
     $key = 'default';
     // Detect an external database and set the
@@ -1273,7 +1273,7 @@ class Sql extends QueryPluginBase {
       // Allow 'GROUP BY' even no aggregation function has been set.
       $this->hasAggregate = $this->view->display_handler->getOption('group_by');
     }
-    $groupby = array();
+    $groupby = [];
     if ($this->hasAggregate && (!empty($this->groupby) || !empty($non_aggregates))) {
       $groupby = array_unique(array_merge($this->groupby, $non_aggregates));
     }
@@ -1282,12 +1282,12 @@ class Sql extends QueryPluginBase {
     // entities can be loaded.
     $entity_information = $this->getEntityTableInfo();
     if ($entity_information) {
-      $params = array();
+      $params = [];
       if ($groupby) {
         // Handle grouping, by retrieving the minimum entity_id.
-        $params = array(
+        $params = [
           'function' => 'min',
-        );
+        ];
       }
 
       foreach ($entity_information as $entity_type_id => $info) {
@@ -1346,7 +1346,7 @@ class Sql extends QueryPluginBase {
     }
 
     // Add all query substitutions as metadata.
-    $query->addMetaData('views_substitutions', \Drupal::moduleHandler()->invokeAll('views_query_substitutions', array($this->view)));
+    $query->addMetaData('views_substitutions', \Drupal::moduleHandler()->invokeAll('views_query_substitutions', [$this->view]));
 
     return $query;
   }
@@ -1355,7 +1355,7 @@ class Sql extends QueryPluginBase {
    * Get the arguments attached to the WHERE and HAVING clauses of this query.
    */
   public function getWhereArgs() {
-    $args = array();
+    $args = [];
     foreach ($this->where as $where) {
       $args = array_merge($args, $where['args']);
     }
@@ -1369,7 +1369,7 @@ class Sql extends QueryPluginBase {
    * Let modules modify the query just prior to finalizing it.
    */
   public function alter(ViewExecutable $view) {
-    \Drupal::moduleHandler()->invokeAll('views_query_alter', array($view, $this));
+    \Drupal::moduleHandler()->invokeAll('views_query_alter', [$view, $this]);
   }
 
   /**
@@ -1424,7 +1424,7 @@ class Sql extends QueryPluginBase {
     }
 
     if ($query) {
-      $additional_arguments = \Drupal::moduleHandler()->invokeAll('views_query_substitutions', array($view));
+      $additional_arguments = \Drupal::moduleHandler()->invokeAll('views_query_substitutions', [$view]);
 
       // Count queries must be run through the preExecute() method.
       // If not, then hook_query_node_access_alter() may munge the count by
@@ -1480,7 +1480,7 @@ class Sql extends QueryPluginBase {
         $this->loadEntities($view->result);
       }
       catch (DatabaseExceptionWrapper $e) {
-        $view->result = array();
+        $view->result = [];
         if (!empty($view->live_preview)) {
           drupal_set_message($e->getMessage(), 'error');
         }
@@ -1514,7 +1514,7 @@ class Sql extends QueryPluginBase {
     }
 
     // Extract all entity types from entity_information.
-    $entity_types = array();
+    $entity_types = [];
     foreach ($entity_information as $info) {
       $entity_type = $info['entity_type'];
       if (!isset($entity_types[$entity_type])) {
@@ -1664,82 +1664,82 @@ class Sql extends QueryPluginBase {
   public function getAggregationInfo() {
     // @todo -- need a way to get database specific and customized aggregation
     // functions into here.
-    return array(
-      'group' => array(
+    return [
+      'group' => [
         'title' => $this->t('Group results together'),
         'is aggregate' => FALSE,
-      ),
-      'count' => array(
+      ],
+      'count' => [
         'title' => $this->t('Count'),
         'method' => 'aggregationMethodSimple',
-        'handler' => array(
+        'handler' => [
           'argument' => 'groupby_numeric',
           'field' => 'numeric',
           'filter' => 'groupby_numeric',
           'sort' => 'groupby_numeric',
-        ),
-      ),
-      'count_distinct' => array(
+        ],
+      ],
+      'count_distinct' => [
         'title' => $this->t('Count DISTINCT'),
         'method' => 'aggregationMethodDistinct',
-        'handler' => array(
+        'handler' => [
           'argument' => 'groupby_numeric',
           'field' => 'numeric',
           'filter' => 'groupby_numeric',
           'sort' => 'groupby_numeric',
-        ),
-      ),
-      'sum' => array(
+        ],
+      ],
+      'sum' => [
         'title' => $this->t('Sum'),
         'method' => 'aggregationMethodSimple',
-        'handler' => array(
+        'handler' => [
           'argument' => 'groupby_numeric',
           'field' => 'numeric',
           'filter' => 'groupby_numeric',
           'sort' => 'groupby_numeric',
-        ),
-      ),
-      'avg' => array(
+        ],
+      ],
+      'avg' => [
         'title' => $this->t('Average'),
         'method' => 'aggregationMethodSimple',
-        'handler' => array(
+        'handler' => [
           'argument' => 'groupby_numeric',
           'field' => 'numeric',
           'filter' => 'groupby_numeric',
           'sort' => 'groupby_numeric',
-        ),
-      ),
-      'min' => array(
+        ],
+      ],
+      'min' => [
         'title' => $this->t('Minimum'),
         'method' => 'aggregationMethodSimple',
-        'handler' => array(
+        'handler' => [
           'argument' => 'groupby_numeric',
           'field' => 'numeric',
           'filter' => 'groupby_numeric',
           'sort' => 'groupby_numeric',
-        ),
-      ),
-      'max' => array(
+        ],
+      ],
+      'max' => [
         'title' => $this->t('Maximum'),
         'method' => 'aggregationMethodSimple',
-        'handler' => array(
+        'handler' => [
           'argument' => 'groupby_numeric',
           'field' => 'numeric',
           'filter' => 'groupby_numeric',
           'sort' => 'groupby_numeric',
-        ),
-      ),
-      'stddev_pop' => array(
+        ],
+      ],
+      'stddev_pop' => [
         'title' => $this->t('Standard deviation'),
         'method' => 'aggregationMethodSimple',
-        'handler' => array(
+        'handler' => [
           'argument' => 'groupby_numeric',
           'field' => 'numeric',
           'filter' => 'groupby_numeric',
           'sort' => 'groupby_numeric',
-        ),
-      )
-    );
+        ],
+      ]
+    ];
   }
 
   public function aggregationMethodSimple($group_type, $field) {
@@ -1794,7 +1794,7 @@ class Sql extends QueryPluginBase {
 
     // set up the database timezone
     $db_type = Database::getConnection()->databaseType();
-    if (in_array($db_type, array('mysql', 'pgsql'))) {
+    if (in_array($db_type, ['mysql', 'pgsql'])) {
       $offset = '+00:00';
       static $already_set = FALSE;
       if (!$already_set) {
@@ -1819,7 +1819,7 @@ class Sql extends QueryPluginBase {
     $db_type = Database::getConnection()->databaseType();
     switch ($db_type) {
       case 'mysql':
-        $replace = array(
+        $replace = [
           'Y' => '%Y',
           'y' => '%y',
           'M' => '%b',
@@ -1836,11 +1836,11 @@ class Sql extends QueryPluginBase {
           'i' => '%i',
           's' => '%s',
           'A' => '%p',
-        );
+        ];
         $format = strtr($format, $replace);
         return "DATE_FORMAT($field, '$format')";
       case 'pgsql':
-        $replace = array(
+        $replace = [
           'Y' => 'YYYY',
           'y' => 'YY',
           'M' => 'Mon',
@@ -1860,7 +1860,7 @@ class Sql extends QueryPluginBase {
           'i' => 'MI',
           's' => 'SS',
           'A' => 'AM',
-        );
+        ];
         $format = strtr($format, $replace);
         if (!$string_date) {
           return "TO_CHAR($field, '$format')";
@@ -1869,7 +1869,7 @@ class Sql extends QueryPluginBase {
         // date, back to a string again.
         return "TO_CHAR(TO_TIMESTAMP($field, 'YYYY-MM-DD HH24:MI:SS'), '$format')";
       case 'sqlite':
-        $replace = array(
+        $replace = [
           'Y' => '%Y',
           // No format for 2 digit year number.
           'y' => '%Y',
@@ -1895,7 +1895,7 @@ class Sql extends QueryPluginBase {
           's' => '%S',
           // No format for AM/PM.
           'A' => '',
-        );
+        ];
         $format = strtr($format, $replace);
 
         // Don't use the 'unixepoch' flag for string date comparisons.
diff --git a/web/core/modules/views/src/Plugin/views/relationship/EntityReverse.php b/web/core/modules/views/src/Plugin/views/relationship/EntityReverse.php
index 42d6fa1e7..7c0160460 100644
--- a/web/core/modules/views/src/Plugin/views/relationship/EntityReverse.php
+++ b/web/core/modules/views/src/Plugin/views/relationship/EntityReverse.php
@@ -48,13 +48,13 @@ class EntityReverse extends RelationshipPluginBase {
     $views_data = Views::viewsData()->get($this->table);
     $left_field = $views_data['table']['base']['field'];
 
-    $first = array(
+    $first = [
       'left_table' => $this->tableAlias,
       'left_field' => $left_field,
       'table' => $this->definition['field table'],
       'field' => $this->definition['field field'],
       'adjusted' => TRUE
-    );
+    ];
     if (!empty($this->options['required'])) {
       $first['type'] = 'INNER';
     }
@@ -76,13 +76,13 @@ class EntityReverse extends RelationshipPluginBase {
 
     // Second, relate the field table to the entity specified using
     // the entity id on the field table and the entity's id field.
-    $second = array(
+    $second = [
       'left_table' => $this->first_alias,
       'left_field' => 'entity_id',
       'table' => $this->definition['base'],
       'field' => $this->definition['base field'],
       'adjusted' => TRUE
-    );
+    ];
 
     if (!empty($this->options['required'])) {
       $second['type'] = 'INNER';
diff --git a/web/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php b/web/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
index dc23a6872..1db8da7f7 100644
--- a/web/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
+++ b/web/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
@@ -65,12 +65,12 @@ class GroupwiseMax extends RelationshipPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['subquery_sort'] = array('default' => NULL);
+    $options['subquery_sort'] = ['default' => NULL];
     // Descending more useful.
-    $options['subquery_order'] = array('default' => 'DESC');
-    $options['subquery_regenerate'] = array('default' => FALSE);
-    $options['subquery_view'] = array('default' => FALSE);
-    $options['subquery_namespace'] = array('default' => FALSE);
+    $options['subquery_order'] = ['default' => 'DESC'];
+    $options['subquery_regenerate'] = ['default' => FALSE];
+    $options['subquery_view'] = ['default' => FALSE];
+    $options['subquery_namespace'] = ['default' => FALSE];
 
     return $options;
   }
@@ -83,7 +83,7 @@ class GroupwiseMax extends RelationshipPluginBase {
 
     // Get the sorts that apply to our base.
     $sorts = Views::viewsDataHelper()->fetchFields($this->definition['base'], 'sort');
-    $sort_options = array();
+    $sort_options = [];
     foreach ($sorts as $sort_id => $sort) {
       $sort_options[$sort_id] = "$sort[group]: $sort[title]";
     }
@@ -91,34 +91,34 @@ class GroupwiseMax extends RelationshipPluginBase {
 
     // Extends the relationship's basic options, allowing the user to pick a
     // sort and an order for it.
-    $form['subquery_sort'] = array(
+    $form['subquery_sort'] = [
       '#type' => 'select',
       '#title' => $this->t('Representative sort criteria'),
       // Provide the base field as sane default sort option.
       '#default_value' => !empty($this->options['subquery_sort']) ? $this->options['subquery_sort'] : $this->definition['base'] . '.' . $base_table_data['table']['base']['field'],
       '#options' => $sort_options,
       '#description' => $this->t("The sort criteria is applied to the data brought in by the relationship to determine how a representative item is obtained for each row. For example, to show the most recent node for each user, pick 'Content: Updated date'."),
-    );
+    ];
 
-    $form['subquery_order'] = array(
+    $form['subquery_order'] = [
       '#type' => 'radios',
       '#title' => $this->t('Representative sort order'),
       '#description' => $this->t("The ordering to use for the sort criteria selected above."),
-      '#options' => array('ASC' => $this->t('Ascending'), 'DESC' => $this->t('Descending')),
+      '#options' => ['ASC' => $this->t('Ascending'), 'DESC' => $this->t('Descending')],
       '#default_value' => $this->options['subquery_order'],
-    );
+    ];
 
-    $form['subquery_namespace'] = array(
+    $form['subquery_namespace'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Subquery namespace'),
       '#description' => $this->t('Advanced. Enter a namespace for the subquery used by this relationship.'),
       '#default_value' => $this->options['subquery_namespace'],
-    );
+    ];
 
 
     // WIP: This stuff doesn't work yet: namespacing issues.
     // A list of suitable views to pick one as the subview.
-    $views = array('' => '- None -');
+    $views = ['' => '- None -'];
     foreach (Views::getAllViews() as $view) {
       // Only get views that are suitable:
       // - base must the base that our relationship joins towards
@@ -130,20 +130,20 @@ class GroupwiseMax extends RelationshipPluginBase {
       }
     }
 
-    $form['subquery_view'] = array(
+    $form['subquery_view'] = [
       '#type' => 'select',
       '#title' => $this->t('Representative view'),
       '#default_value' => $this->options['subquery_view'],
       '#options' => $views,
       '#description' => $this->t('Advanced. Use another view to generate the relationship subquery. This allows you to use filtering and more than one sort. If you pick a view here, the sort options above are ignored. Your view must have the ID of its base as its only field, and should have some kind of sorting.'),
-    );
+    ];
 
-    $form['subquery_regenerate'] = array(
+    $form['subquery_regenerate'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Generate subquery each time view is run'),
       '#default_value' => $this->options['subquery_regenerate'],
       '#description' => $this->t('Will re-generate the subquery for this relationship every time the view is run, instead of only when these options are saved. Use for testing if you are making changes elsewhere. WARNING: seriously impairs performance.'),
-    );
+    ];
   }
 
   /**
@@ -152,7 +152,7 @@ class GroupwiseMax extends RelationshipPluginBase {
    * We use this to obtain our subquery SQL.
    */
   protected function getTemporaryView() {
-    $view = View::create(array('base_table' => $this->definition['base']));
+    $view = View::create(['base_table' => $this->definition['base']]);
     $view->addDisplay('default');
     return $view->getExecutable();
   }
@@ -198,7 +198,7 @@ class GroupwiseMax extends RelationshipPluginBase {
       // We work around this further down.
       $sort = $options['subquery_sort'];
       list($sort_table, $sort_field) = explode('.', $sort);
-      $sort_options = array('order' => $options['subquery_order']);
+      $sort_options = ['order' => $options['subquery_order']];
       $temp_view->addHandler('default', 'sort', $sort_table, $sort_field, $sort_options);
     }
 
@@ -219,7 +219,7 @@ class GroupwiseMax extends RelationshipPluginBase {
       list($relationship_table, $relationship_field) = explode(':', $this->definition['relationship']);
       $relationship_id = $temp_view->addHandler('default', 'relationship', $relationship_table, $relationship_field);
     }
-    $temp_item_options = array('relationship' => $relationship_id);
+    $temp_item_options = ['relationship' => $relationship_id];
 
     // Add the correct argument for our relationship's base
     // ie the 'how to get back to base' argument.
diff --git a/web/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php b/web/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
index 25a0001e7..860189175 100644
--- a/web/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
@@ -99,7 +99,7 @@ abstract class RelationshipPluginBase extends HandlerBase {
     }
 
     $options['admin_label']['default'] = $label;
-    $options['required'] = array('default' => FALSE);
+    $options['required'] = ['default' => FALSE];
 
     return $options;
   }
@@ -113,12 +113,12 @@ abstract class RelationshipPluginBase extends HandlerBase {
     unset($form['admin_label']['#fieldset']);
     $form['admin_label']['#weight'] = -1;
 
-    $form['required'] = array(
+    $form['required'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Require this relationship'),
       '#description' => $this->t('Enable to hide items that do not contain this relationship'),
       '#default_value' => !empty($this->options['required']),
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/row/EntityReference.php b/web/core/modules/views/src/Plugin/views/row/EntityReference.php
index 4ca79ba42..a985ee366 100644
--- a/web/core/modules/views/src/Plugin/views/row/EntityReference.php
+++ b/web/core/modules/views/src/Plugin/views/row/EntityReference.php
@@ -25,7 +25,7 @@ class EntityReference extends Fields {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['separator'] = array('default' => '-');
+    $options['separator'] = ['default' => '-'];
 
     return $options;
   }
diff --git a/web/core/modules/views/src/Plugin/views/row/EntityRow.php b/web/core/modules/views/src/Plugin/views/row/EntityRow.php
index f53652965..e98133af7 100644
--- a/web/core/modules/views/src/Plugin/views/row/EntityRow.php
+++ b/web/core/modules/views/src/Plugin/views/row/EntityRow.php
@@ -130,7 +130,7 @@ class EntityRow extends RowPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['view_mode'] = array('default' => 'default');
+    $options['view_mode'] = ['default' => 'default'];
     return $options;
   }
 
@@ -140,12 +140,12 @@ class EntityRow extends RowPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['view_mode'] = array(
+    $form['view_mode'] = [
       '#type' => 'select',
       '#options' => \Drupal::entityManager()->getViewModeOptions($this->entityTypeId),
       '#title' => $this->t('View mode'),
       '#default_value' => $this->options['view_mode'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/row/Fields.php b/web/core/modules/views/src/Plugin/views/row/Fields.php
index 3904b0c05..711704eab 100644
--- a/web/core/modules/views/src/Plugin/views/row/Fields.php
+++ b/web/core/modules/views/src/Plugin/views/row/Fields.php
@@ -32,10 +32,10 @@ class Fields extends RowPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['inline'] = array('default' => array());
-    $options['separator'] = array('default' => '');
-    $options['hide_empty'] = array('default' => FALSE);
-    $options['default_field_elements'] = array('default' => TRUE);
+    $options['inline'] = ['default' => []];
+    $options['separator'] = ['default' => ''];
+    $options['hide_empty'] = ['default' => FALSE];
+    $options['default_field_elements'] = ['default' => TRUE];
     return $options;
   }
 
@@ -47,48 +47,48 @@ class Fields extends RowPluginBase {
     $options = $this->displayHandler->getFieldLabels();
 
     if (empty($this->options['inline'])) {
-      $this->options['inline'] = array();
+      $this->options['inline'] = [];
     }
 
-    $form['default_field_elements'] = array(
+    $form['default_field_elements'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Provide default field wrapper elements'),
       '#default_value' => $this->options['default_field_elements'],
       '#description' => $this->t('If not checked, fields that are not configured to customize their HTML elements will get no wrappers at all for their field, label and field + label wrappers. You can use this to quickly reduce the amount of markup the view provides by default, at the cost of making it more difficult to apply CSS.'),
-    );
+    ];
 
-    $form['inline'] = array(
+    $form['inline'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Inline fields'),
       '#options' => $options,
       '#default_value' => $this->options['inline'],
       '#description' => $this->t('Inline fields will be displayed next to each other rather than one after another. Note that some fields will ignore this if they are block elements, particularly body fields and other formatted HTML.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="row_options[default_field_elements]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="row_options[default_field_elements]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
-    $form['separator'] = array(
+    $form['separator'] = [
       '#title' => $this->t('Separator'),
       '#type' => 'textfield',
       '#size' => 10,
       '#default_value' => isset($this->options['separator']) ? $this->options['separator'] : '',
       '#description' => $this->t('The separator may be placed between inline fields to keep them from squishing up next to each other. You can use HTML in this field.'),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="row_options[default_field_elements]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="row_options[default_field_elements]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
-    $form['hide_empty'] = array(
+    $form['hide_empty'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Hide empty fields'),
       '#default_value' => $this->options['hide_empty'],
       '#description' => $this->t('Do not display fields, labels or markup for fields that are empty.'),
-    );
+    ];
 
   }
 
@@ -97,8 +97,8 @@ class Fields extends RowPluginBase {
    * There is no need for this function to actually store the data.
    */
   public function submitOptionsForm(&$form, FormStateInterface $form_state) {
-    $inline = $form_state->getValue(array('row_options', 'inline'));
-    $form_state->setValue(array('row_options', 'inline'), array_filter($inline));
+    $inline = $form_state->getValue(['row_options', 'inline']);
+    $form_state->setValue(['row_options', 'inline'], array_filter($inline));
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/row/OpmlFields.php b/web/core/modules/views/src/Plugin/views/row/OpmlFields.php
index 0c8f684bf..aaeecbf69 100644
--- a/web/core/modules/views/src/Plugin/views/row/OpmlFields.php
+++ b/web/core/modules/views/src/Plugin/views/row/OpmlFields.php
@@ -29,14 +29,14 @@ class OpmlFields extends RowPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['text_field'] = array('default' => '');
-    $options['created_field'] = array('default' => '');
-    $options['type_field'] = array('default' => '');
-    $options['description_field'] = array('default' => '');
-    $options['html_url_field'] = array('default' => '');
-    $options['language_field'] = array('default' => '');
-    $options['xml_url_field'] = array('default' => '');
-    $options['url_field'] = array('default' => '');
+    $options['text_field'] = ['default' => ''];
+    $options['created_field'] = ['default' => ''];
+    $options['type_field'] = ['default' => ''];
+    $options['description_field'] = ['default' => ''];
+    $options['html_url_field'] = ['default' => ''];
+    $options['language_field'] = ['default' => ''];
+    $options['xml_url_field'] = ['default' => ''];
+    $options['url_field'] = ['default' => ''];
     return $options;
   }
 
@@ -46,101 +46,101 @@ class OpmlFields extends RowPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $initial_labels = array('' => $this->t('- None -'));
+    $initial_labels = ['' => $this->t('- None -')];
     $view_fields_labels = $this->displayHandler->getFieldLabels();
     $view_fields_labels = array_merge($initial_labels, $view_fields_labels);
 
-    $types = array(
+    $types = [
       'rss' => $this->t('RSS'),
       'link' => $this->t('Link'),
       'include' => $this->t('Include'),
-    );
+    ];
     $types = array_merge($initial_labels, $types);
-    $form['type_field'] = array(
+    $form['type_field'] = [
       '#type' => 'select',
       '#title' => $this->t('Type attribute'),
       '#description' => $this->t('The type of this row.'),
       '#options' => $types,
       '#default_value' => $this->options['type_field'],
-    );
-    $form['text_field'] = array(
+    ];
+    $form['text_field'] = [
       '#type' => 'select',
       '#title' => $this->t('Text attribute'),
       '#description' => $this->t('The field that is going to be used as the OPML text attribute for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['text_field'],
       '#required' => TRUE,
-    );
-    $form['created_field'] = array(
+    ];
+    $form['created_field'] = [
       '#type' => 'select',
       '#title' => $this->t('Created attribute'),
       '#description' => $this->t('The field that is going to be used as the OPML created attribute for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['created_field'],
-    );
-    $form['description_field'] = array(
+    ];
+    $form['description_field'] = [
       '#type' => 'select',
       '#title' => $this->t('Description attribute'),
       '#description' => $this->t('The field that is going to be used as the OPML description attribute for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['description_field'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="row_options[type_field]"]' => array('value' => 'rss'),
-        ),
-      ),
-    );
-    $form['html_url_field'] = array(
+      '#states' => [
+        'visible' => [
+          ':input[name="row_options[type_field]"]' => ['value' => 'rss'],
+        ],
+      ],
+    ];
+    $form['html_url_field'] = [
       '#type' => 'select',
       '#title' => $this->t('HTML URL attribute'),
       '#description' => $this->t('The field that is going to be used as the OPML htmlUrl attribute for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['html_url_field'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="row_options[type_field]"]' => array('value' => 'rss'),
-        ),
-      ),
-    );
-    $form['language_field'] = array(
+      '#states' => [
+        'visible' => [
+          ':input[name="row_options[type_field]"]' => ['value' => 'rss'],
+        ],
+      ],
+    ];
+    $form['language_field'] = [
       '#type' => 'select',
       '#title' => $this->t('Language attribute'),
       '#description' => $this->t('The field that is going to be used as the OPML language attribute for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['language_field'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="row_options[type_field]"]' => array('value' => 'rss'),
-        ),
-      ),
-    );
-    $form['xml_url_field'] = array(
+      '#states' => [
+        'visible' => [
+          ':input[name="row_options[type_field]"]' => ['value' => 'rss'],
+        ],
+      ],
+    ];
+    $form['xml_url_field'] = [
       '#type' => 'select',
       '#title' => $this->t('XML URL attribute'),
       '#description' => $this->t('The field that is going to be used as the OPML text attribute for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['xml_url_field'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="row_options[type_field]"]' => array('value' => 'rss'),
-        ),
-      ),
-    );
-    $form['url_field'] = array(
+      '#states' => [
+        'visible' => [
+          ':input[name="row_options[type_field]"]' => ['value' => 'rss'],
+        ],
+      ],
+    ];
+    $form['url_field'] = [
       '#type' => 'select',
       '#title' => $this->t('URL attribute'),
       '#description' => $this->t('The field that is going to be used as the OPML URL attribute for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['url_field'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="row_options[type_field]"]' => array(
-            array('value' => 'link'),
-            array('value' => 'include'),
-          ),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="row_options[type_field]"]' => [
+            ['value' => 'link'],
+            ['value' => 'include'],
+          ],
+        ],
+      ],
+    ];
   }
 
   /**
@@ -157,7 +157,7 @@ class OpmlFields extends RowPluginBase {
           $errors[] = $this->t('Row style plugin requires specifying which views field to use for XML URL attribute.');
         }
       }
-      elseif (in_array($this->options['type_field'], array('link', 'include'))) {
+      elseif (in_array($this->options['type_field'], ['link', 'include'])) {
         if (empty($this->options['url_field'])) {
           $errors[] = $this->t('Row style plugin requires specifying which views field to use for URL attribute.');
         }
@@ -171,7 +171,7 @@ class OpmlFields extends RowPluginBase {
    */
   public function render($row) {
     // Create the OPML item array.
-    $item = array();
+    $item = [];
     $row_index = $this->view->row_index;
     $item['text'] = $this->getField($row_index, $this->options['text_field']);
     $item['created'] = $this->getField($row_index, $this->options['created_field']);
@@ -190,13 +190,13 @@ class OpmlFields extends RowPluginBase {
     // Remove empty attributes.
     $item = array_filter($item);
 
-    $build = array(
+    $build = [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#row' => $item,
       '#field_alias' => isset($this->field_alias) ? $this->field_alias : '',
-    );
+    ];
     return $build;
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/row/RowPluginBase.php b/web/core/modules/views/src/Plugin/views/row/RowPluginBase.php
index d1e090e0a..1cc3f79a1 100644
--- a/web/core/modules/views/src/Plugin/views/row/RowPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/row/RowPluginBase.php
@@ -54,7 +54,7 @@ abstract class RowPluginBase extends PluginBase {
    *
    * @return bool
    */
-  function usesFields() {
+  public function usesFields() {
     return $this->usesFields;
   }
 
@@ -64,7 +64,7 @@ abstract class RowPluginBase extends PluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
     if (isset($this->base_table)) {
-      $options['relationship'] = array('default' => 'none');
+      $options['relationship'] = ['default' => 'none'];
     }
 
     return $options;
@@ -81,7 +81,7 @@ abstract class RowPluginBase extends PluginBase {
       // A whole bunch of code to figure out what relationships are valid for
       // this item.
       $relationships = $executable->display_handler->getOption('relationships');
-      $relationship_options = array();
+      $relationship_options = [];
 
       foreach ($relationships as $relationship) {
         $relationship_handler = Views::handlerManager('relationship')->getHandler($relationship);
@@ -96,25 +96,25 @@ abstract class RowPluginBase extends PluginBase {
       }
 
       if (!empty($relationship_options)) {
-        $relationship_options = array_merge(array('none' => $this->t('Do not use a relationship')), $relationship_options);
+        $relationship_options = array_merge(['none' => $this->t('Do not use a relationship')], $relationship_options);
         $rel = empty($this->options['relationship']) ? 'none' : $this->options['relationship'];
         if (empty($relationship_options[$rel])) {
           // Pick the first relationship.
           $rel = key($relationship_options);
         }
 
-        $form['relationship'] = array(
+        $form['relationship'] = [
           '#type' => 'select',
           '#title' => $this->t('Relationship'),
           '#options' => $relationship_options,
           '#default_value' => $rel,
-        );
+        ];
       }
       else {
-        $form['relationship'] = array(
+        $form['relationship'] = [
           '#type' => 'value',
           '#value' => 'none',
-        );
+        ];
       }
     }
   }
@@ -164,13 +164,13 @@ abstract class RowPluginBase extends PluginBase {
    *   The rendered output of a single row, used by the style plugin.
    */
   public function render($row) {
-    return array(
+    return [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#row' => $row,
       '#field_alias' => isset($this->field_alias) ? $this->field_alias : '',
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/row/RssFields.php b/web/core/modules/views/src/Plugin/views/row/RssFields.php
index a420bb7f9..1b56aae5f 100644
--- a/web/core/modules/views/src/Plugin/views/row/RssFields.php
+++ b/web/core/modules/views/src/Plugin/views/row/RssFields.php
@@ -27,87 +27,87 @@ class RssFields extends RowPluginBase {
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['title_field'] = array('default' => '');
-    $options['link_field'] = array('default' => '');
-    $options['description_field'] = array('default' => '');
-    $options['creator_field'] = array('default' => '');
-    $options['date_field'] = array('default' => '');
-    $options['guid_field_options']['contains']['guid_field'] = array('default' => '');
-    $options['guid_field_options']['contains']['guid_field_is_permalink'] = array('default' => TRUE);
+    $options['title_field'] = ['default' => ''];
+    $options['link_field'] = ['default' => ''];
+    $options['description_field'] = ['default' => ''];
+    $options['creator_field'] = ['default' => ''];
+    $options['date_field'] = ['default' => ''];
+    $options['guid_field_options']['contains']['guid_field'] = ['default' => ''];
+    $options['guid_field_options']['contains']['guid_field_is_permalink'] = ['default' => TRUE];
     return $options;
   }
 
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $initial_labels = array('' => $this->t('- None -'));
+    $initial_labels = ['' => $this->t('- None -')];
     $view_fields_labels = $this->displayHandler->getFieldLabels();
     $view_fields_labels = array_merge($initial_labels, $view_fields_labels);
 
-    $form['title_field'] = array(
+    $form['title_field'] = [
       '#type' => 'select',
       '#title' => $this->t('Title field'),
       '#description' => $this->t('The field that is going to be used as the RSS item title for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['title_field'],
       '#required' => TRUE,
-    );
-    $form['link_field'] = array(
+    ];
+    $form['link_field'] = [
       '#type' => 'select',
       '#title' => $this->t('Link field'),
       '#description' => $this->t('The field that is going to be used as the RSS item link for each row. This must be a drupal relative path.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['link_field'],
       '#required' => TRUE,
-    );
-    $form['description_field'] = array(
+    ];
+    $form['description_field'] = [
       '#type' => 'select',
       '#title' => $this->t('Description field'),
       '#description' => $this->t('The field that is going to be used as the RSS item description for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['description_field'],
       '#required' => TRUE,
-    );
-    $form['creator_field'] = array(
+    ];
+    $form['creator_field'] = [
       '#type' => 'select',
       '#title' => $this->t('Creator field'),
       '#description' => $this->t('The field that is going to be used as the RSS item creator for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['creator_field'],
       '#required' => TRUE,
-    );
-    $form['date_field'] = array(
+    ];
+    $form['date_field'] = [
       '#type' => 'select',
       '#title' => $this->t('Publication date field'),
       '#description' => $this->t('The field that is going to be used as the RSS item pubDate for each row. It needs to be in RFC 2822 format.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['date_field'],
       '#required' => TRUE,
-    );
-    $form['guid_field_options'] = array(
+    ];
+    $form['guid_field_options'] = [
       '#type' => 'details',
       '#title' => $this->t('GUID settings'),
       '#open' => TRUE,
-    );
-    $form['guid_field_options']['guid_field'] = array(
+    ];
+    $form['guid_field_options']['guid_field'] = [
       '#type' => 'select',
       '#title' => $this->t('GUID field'),
       '#description' => $this->t('The globally unique identifier of the RSS item.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['guid_field_options']['guid_field'],
       '#required' => TRUE,
-    );
-    $form['guid_field_options']['guid_field_is_permalink'] = array(
+    ];
+    $form['guid_field_options']['guid_field_is_permalink'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('GUID is permalink'),
       '#description' => $this->t('The RSS item GUID is a permalink.'),
       '#default_value' => $this->options['guid_field_options']['guid_field_is_permalink'],
-    );
+    ];
   }
 
   public function validate() {
     $errors = parent::validate();
-    $required_options = array('title_field', 'link_field', 'description_field', 'creator_field', 'date_field');
+    $required_options = ['title_field', 'link_field', 'description_field', 'creator_field', 'date_field'];
     foreach ($required_options as $required_option) {
       if (empty($this->options[$required_option])) {
         $errors[] = $this->t('Row style plugin requires specifying which views fields to use for RSS item.');
@@ -129,7 +129,7 @@ class RssFields extends RowPluginBase {
     if (function_exists('rdf_get_namespaces')) {
       // Merge RDF namespaces in the XML namespaces in case they are used
       // further in the RSS content.
-      $xml_rdf_namespaces = array();
+      $xml_rdf_namespaces = [];
       foreach (rdf_get_namespaces() as $prefix => $uri) {
         $xml_rdf_namespaces['xmlns:' . $prefix] = $uri;
       }
@@ -146,14 +146,14 @@ class RssFields extends RowPluginBase {
     $field = $this->getField($row_index, $this->options['description_field']);
     $item->description = is_array($field) ? $field : ['#markup' => $field];
 
-    $item->elements = array(
-      array('key' => 'pubDate', 'value' => $this->getField($row_index, $this->options['date_field'])),
-      array(
+    $item->elements = [
+      ['key' => 'pubDate', 'value' => $this->getField($row_index, $this->options['date_field'])],
+      [
         'key' => 'dc:creator',
         'value' => $this->getField($row_index, $this->options['creator_field']),
-        'namespace' => array('xmlns:dc' => 'http://purl.org/dc/elements/1.1/'),
-      ),
-    );
+        'namespace' => ['xmlns:dc' => 'http://purl.org/dc/elements/1.1/'],
+      ],
+    ];
     $guid_is_permalink_string = 'false';
     $item_guid = $this->getField($row_index, $this->options['guid_field_options']['guid_field']);
     if ($this->options['guid_field_options']['guid_field_is_permalink']) {
@@ -162,11 +162,11 @@ class RssFields extends RowPluginBase {
       //   https://www.drupal.org/node/2430589.
       $item_guid = Url::fromUserInput('/' . $item_guid)->setAbsolute()->toString();
     }
-    $item->elements[] = array(
+    $item->elements[] = [
       'key' => 'guid',
       'value' => $item_guid,
-      'attributes' => array('isPermaLink' => $guid_is_permalink_string),
-    );
+      'attributes' => ['isPermaLink' => $guid_is_permalink_string],
+    ];
 
     $row_index++;
 
@@ -176,13 +176,13 @@ class RssFields extends RowPluginBase {
       }
     }
 
-    $build = array(
+    $build = [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#row' => $item,
       '#field_alias' => isset($this->field_alias) ? $this->field_alias : '',
-    );
+    ];
 
     return $build;
   }
diff --git a/web/core/modules/views/src/Plugin/views/row/RssPluginBase.php b/web/core/modules/views/src/Plugin/views/row/RssPluginBase.php
index b5fd385bd..b8c518bc9 100644
--- a/web/core/modules/views/src/Plugin/views/row/RssPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/row/RssPluginBase.php
@@ -61,7 +61,7 @@ abstract class RssPluginBase extends RowPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['view_mode'] = array('default' => 'default');
+    $options['view_mode'] = ['default' => 'default'];
 
     return $options;
   }
@@ -72,12 +72,12 @@ abstract class RssPluginBase extends RowPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['view_mode'] = array(
+    $form['view_mode'] = [
       '#type' => 'select',
       '#title' => $this->t('Display type'),
       '#options' => $this->buildOptionsForm_summary_options(),
       '#default_value' => $this->options['view_mode'],
-    );
+    ];
   }
 
   /**
@@ -85,7 +85,7 @@ abstract class RssPluginBase extends RowPluginBase {
    */
   public function buildOptionsForm_summary_options() {
     $view_modes = $this->entityManager->getViewModes($this->entityTypeId);
-    $options = array();
+    $options = [];
     foreach ($view_modes as $mode => $settings) {
       $options[$mode] = $settings['label'];
     }
diff --git a/web/core/modules/views/src/Plugin/views/sort/Date.php b/web/core/modules/views/src/Plugin/views/sort/Date.php
index 4017e2b4c..0c7d9e14f 100644
--- a/web/core/modules/views/src/Plugin/views/sort/Date.php
+++ b/web/core/modules/views/src/Plugin/views/sort/Date.php
@@ -17,7 +17,7 @@ class Date extends SortPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['granularity'] = array('default' => 'second');
+    $options['granularity'] = ['default' => 'second'];
 
     return $options;
   }
@@ -25,20 +25,20 @@ class Date extends SortPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['granularity'] = array(
+    $form['granularity'] = [
       '#type' => 'radios',
       '#title' => $this->t('Granularity'),
-      '#options' => array(
+      '#options' => [
         'second' => $this->t('Second'),
         'minute' => $this->t('Minute'),
         'hour'   => $this->t('Hour'),
         'day'    => $this->t('Day'),
         'month'  => $this->t('Month'),
         'year'   => $this->t('Year'),
-      ),
+      ],
       '#description' => $this->t('The granularity is the smallest unit to use when determining whether two dates are the same; for example, if the granularity is "Year" then all dates in 1999, regardless of when they fall in 1999, will be considered the same date.'),
       '#default_value' => $this->options['granularity'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php b/web/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php
index b7245ddc6..5308439e6 100644
--- a/web/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php
+++ b/web/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php
@@ -30,9 +30,9 @@ class GroupByNumeric extends SortPluginBase {
   public function query() {
     $this->ensureMyTable();
 
-    $params = array(
+    $params = [
       'function' => $this->options['group_type'],
-    );
+    ];
 
     $this->query->addOrderBy($this->tableAlias, $this->realField, $this->options['order'], NULL, $params);
   }
diff --git a/web/core/modules/views/src/Plugin/views/sort/SortPluginBase.php b/web/core/modules/views/src/Plugin/views/sort/SortPluginBase.php
index 97122b150..a40dc346b 100644
--- a/web/core/modules/views/src/Plugin/views/sort/SortPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/sort/SortPluginBase.php
@@ -42,13 +42,13 @@ abstract class SortPluginBase extends HandlerBase implements CacheableDependency
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['order'] = array('default' => 'ASC');
-    $options['exposed'] = array('default' => FALSE);
-    $options['expose'] = array(
-      'contains' => array(
-        'label' => array('default' => ''),
-      ),
-    );
+    $options['order'] = ['default' => 'ASC'];
+    $options['exposed'] = ['default' => FALSE];
+    $options['expose'] = [
+      'contains' => [
+        'label' => ['default' => ''],
+      ],
+    ];
     return $options;
   }
 
@@ -79,9 +79,9 @@ abstract class SortPluginBase extends HandlerBase implements CacheableDependency
     if ($this->canExpose()) {
       $this->showExposeButton($form, $form_state);
     }
-    $form['op_val_start'] = array('#value' => '<div class="clearfix">');
+    $form['op_val_start'] = ['#value' => '<div class="clearfix">'];
     $this->showSortForm($form, $form_state);
-    $form['op_val_end'] = array('#value' => '</div>');
+    $form['op_val_end'] = ['#value' => '</div>'];
     if ($this->canExpose()) {
       $this->showExposeForm($form, $form_state);
     }
@@ -91,47 +91,47 @@ abstract class SortPluginBase extends HandlerBase implements CacheableDependency
    * Shortcut to display the expose/hide button.
    */
   public function showExposeButton(&$form, FormStateInterface $form_state) {
-    $form['expose_button'] = array(
+    $form['expose_button'] = [
       '#prefix' => '<div class="views-expose clearfix">',
       '#suffix' => '</div>',
       // Should always come first
       '#weight' => -1000,
-    );
+    ];
 
     // Add a checkbox for JS users, which will have behavior attached to it
     // so it can replace the button.
-    $form['expose_button']['checkbox'] = array(
-      '#theme_wrappers' => array('container'),
-      '#attributes' => array('class' => array('js-only')),
-    );
-    $form['expose_button']['checkbox']['checkbox'] = array(
+    $form['expose_button']['checkbox'] = [
+      '#theme_wrappers' => ['container'],
+      '#attributes' => ['class' => ['js-only']],
+    ];
+    $form['expose_button']['checkbox']['checkbox'] = [
       '#title' => $this->t('Expose this sort to visitors, to allow them to change it'),
       '#type' => 'checkbox',
-    );
+    ];
 
     // Then add the button itself.
     if (empty($this->options['exposed'])) {
-      $form['expose_button']['markup'] = array(
+      $form['expose_button']['markup'] = [
         '#markup' => '<div class="description exposed-description" style="float: left; margin-right:10px">' . $this->t('This sort is not exposed. Expose it to allow the users to change it.') . '</div>',
-      );
-      $form['expose_button']['button'] = array(
-        '#limit_validation_errors' => array(),
+      ];
+      $form['expose_button']['button'] = [
+        '#limit_validation_errors' => [],
         '#type' => 'submit',
         '#value' => $this->t('Expose sort'),
-        '#submit' => array(array($this, 'displayExposedForm')),
-      );
+        '#submit' => [[$this, 'displayExposedForm']],
+      ];
       $form['expose_button']['checkbox']['checkbox']['#default_value'] = 0;
     }
     else {
-      $form['expose_button']['markup'] = array(
+      $form['expose_button']['markup'] = [
         '#markup' => '<div class="description exposed-description">' . $this->t('This sort is exposed. If you hide it, users will not be able to change it.') . '</div>',
-      );
-      $form['expose_button']['button'] = array(
-        '#limit_validation_errors' => array(),
+      ];
+      $form['expose_button']['button'] = [
+        '#limit_validation_errors' => [],
         '#type' => 'submit',
         '#value' => $this->t('Hide sort'),
-        '#submit' => array(array($this, 'displayExposedForm')),
-      );
+        '#submit' => [[$this, 'displayExposedForm']],
+      ];
       $form['expose_button']['checkbox']['checkbox']['#default_value'] = 1;
     }
   }
@@ -166,12 +166,12 @@ abstract class SortPluginBase extends HandlerBase implements CacheableDependency
   protected function showSortForm(&$form, FormStateInterface $form_state) {
     $options = $this->sortOptions();
     if (!empty($options)) {
-      $form['order'] = array(
+      $form['order'] = [
         '#title' => $this->t('Order'),
         '#type' => 'radios',
         '#options' => $options,
         '#default_value' => $this->options['order'],
-      );
+      ];
     }
   }
 
@@ -184,10 +184,10 @@ abstract class SortPluginBase extends HandlerBase implements CacheableDependency
    * Should be overridden by classes that don't override sort_form
    */
   protected function sortOptions() {
-    return array(
+    return [
       'ASC' => $this->t('Sort ascending'),
       'DESC' => $this->t('Sort descending'),
-    );
+    ];
   }
 
   public function buildExposeForm(&$form, FormStateInterface $form_state) {
@@ -195,26 +195,26 @@ abstract class SortPluginBase extends HandlerBase implements CacheableDependency
     // prior to rendering. That's why the preRender for it needs to run first,
     // so that when the next preRender (the one for fieldsets) runs, it gets
     // the flattened data.
-    array_unshift($form['#pre_render'], array(get_class($this), 'preRenderFlattenData'));
+    array_unshift($form['#pre_render'], [get_class($this), 'preRenderFlattenData']);
     $form['expose']['#flatten'] = TRUE;
 
-    $form['expose']['label'] = array(
+    $form['expose']['label'] = [
       '#type' => 'textfield',
       '#default_value' => $this->options['expose']['label'],
       '#title' => $this->t('Label'),
       '#required' => TRUE,
       '#size' => 40,
       '#weight' => -1,
-   );
+   ];
   }
 
   /**
    * Provide default options for exposed sorts.
    */
   public function defaultExposeOptions() {
-    $this->options['expose'] = array(
+    $this->options['expose'] = [
       'label' => $this->definition['title'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/style/DefaultSummary.php b/web/core/modules/views/src/Plugin/views/style/DefaultSummary.php
index abd149dc6..0b4325bcc 100644
--- a/web/core/modules/views/src/Plugin/views/style/DefaultSummary.php
+++ b/web/core/modules/views/src/Plugin/views/style/DefaultSummary.php
@@ -22,10 +22,10 @@ class DefaultSummary extends StylePluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['base_path'] = array('default' => '');
-    $options['count'] = array('default' => TRUE);
-    $options['override'] = array('default' => FALSE);
-    $options['items_per_page'] = array('default' => 25);
+    $options['base_path'] = ['default' => ''];
+    $options['count'] = ['default' => TRUE];
+    $options['override'] = ['default' => FALSE];
+    $options['items_per_page'] = ['default' => 25];
 
     return $options;
   }
@@ -37,7 +37,7 @@ class DefaultSummary extends StylePluginBase {
   }
 
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $form['base_path'] = array(
+    $form['base_path'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Base path'),
       '#default_value' => $this->options['base_path'],
@@ -46,43 +46,43 @@ class DefaultSummary extends StylePluginBase {
         Do not include beginning and ending forward slash. If this value
         is empty, views will use the first path found as the base path,
         in page displays, or / if no path could be found.'),
-    );
-    $form['count'] = array(
+    ];
+    $form['count'] = [
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['count']),
       '#title' => $this->t('Display record count with link'),
-    );
-    $form['override'] = array(
+    ];
+    $form['override'] = [
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['override']),
       '#title' => $this->t('Override number of items to display'),
-    );
+    ];
 
-    $form['items_per_page'] = array(
+    $form['items_per_page'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Items to display'),
       '#default_value' => $this->options['items_per_page'],
-      '#states' => array(
-        'visible' => array(
-          ':input[name="options[summary][options][' . $this->definition['id'] . '][override]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="options[summary][options][' . $this->definition['id'] . '][override]"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
   }
 
   public function render() {
-    $rows = array();
+    $rows = [];
     foreach ($this->view->result as $row) {
       // @todo: Include separator as an option.
       $rows[] = $row;
     }
 
-    return array(
+    return [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#rows' => $rows,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/style/EntityReference.php b/web/core/modules/views/src/Plugin/views/style/EntityReference.php
index f694b00e1..e07a0f185 100644
--- a/web/core/modules/views/src/Plugin/views/style/EntityReference.php
+++ b/web/core/modules/views/src/Plugin/views/style/EntityReference.php
@@ -41,7 +41,7 @@ class EntityReference extends StylePluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['search_fields'] = array('default' => array());
+    $options['search_fields'] = ['default' => []];
 
     return $options;
   }
@@ -53,7 +53,7 @@ class EntityReference extends StylePluginBase {
     parent::buildOptionsForm($form, $form_state);
 
     $options = $this->displayHandler->getFieldLabels(TRUE);
-    $form['search_fields'] = array(
+    $form['search_fields'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Search fields'),
       '#options' => $options,
@@ -61,7 +61,7 @@ class EntityReference extends StylePluginBase {
       '#default_value' => $this->options['search_fields'],
       '#description' => $this->t('Select the field(s) that will be searched when using the autocomplete widget.'),
       '#weight' => -3,
-    );
+    ];
   }
 
   /**
@@ -81,7 +81,7 @@ class EntityReference extends StylePluginBase {
 
     // @todo We don't display grouping info for now. Could be useful for select
     // widget, though.
-    $results = array();
+    $results = [];
     foreach ($sets as $records) {
       foreach ($records as $values) {
         $results[$values->{$id_field_alias}] = $this->view->rowPlugin->render($values);
diff --git a/web/core/modules/views/src/Plugin/views/style/Grid.php b/web/core/modules/views/src/Plugin/views/style/Grid.php
index 34ab8ed28..938c1b523 100644
--- a/web/core/modules/views/src/Plugin/views/style/Grid.php
+++ b/web/core/modules/views/src/Plugin/views/style/Grid.php
@@ -32,13 +32,13 @@ class Grid extends StylePluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['columns'] = array('default' => '4');
-    $options['automatic_width'] = array('default' => TRUE);
-    $options['alignment'] = array('default' => 'horizontal');
-    $options['col_class_custom'] = array('default' => '');
-    $options['col_class_default'] = array('default' => TRUE);
-    $options['row_class_custom'] = array('default' => '');
-    $options['row_class_default'] = array('default' => TRUE);
+    $options['columns'] = ['default' => '4'];
+    $options['automatic_width'] = ['default' => TRUE];
+    $options['alignment'] = ['default' => 'horizontal'];
+    $options['col_class_custom'] = ['default' => ''];
+    $options['col_class_default'] = ['default' => TRUE];
+    $options['row_class_custom'] = ['default' => ''];
+    $options['row_class_default'] = ['default' => TRUE];
     return $options;
   }
 
@@ -47,53 +47,53 @@ class Grid extends StylePluginBase {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['columns'] = array(
+    $form['columns'] = [
       '#type' => 'number',
       '#title' => $this->t('Number of columns'),
       '#default_value' => $this->options['columns'],
       '#required' => TRUE,
       '#min' => 1,
-    );
-    $form['automatic_width'] = array(
+    ];
+    $form['automatic_width'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Automatic width'),
       '#description' => $this->t('The width of each column will be calculated automatically based on the number of columns provided. If additional classes are entered or a theme injects classes based on a grid system, disabling this option may prove beneficial.'),
       '#default_value' => $this->options['automatic_width'],
-    );
-    $form['alignment'] = array(
+    ];
+    $form['alignment'] = [
       '#type' => 'radios',
       '#title' => $this->t('Alignment'),
-      '#options' => array('horizontal' => $this->t('Horizontal'), 'vertical' => $this->t('Vertical')),
+      '#options' => ['horizontal' => $this->t('Horizontal'), 'vertical' => $this->t('Vertical')],
       '#default_value' => $this->options['alignment'],
       '#description' => $this->t('Horizontal alignment will place items starting in the upper left and moving right. Vertical alignment will place items starting in the upper left and moving down.'),
-    );
-    $form['col_class_default'] = array(
+    ];
+    $form['col_class_default'] = [
       '#title' => $this->t('Default column classes'),
       '#description' => $this->t('Add the default views column classes like views-col, col-1 and clearfix to the output. You can use this to quickly reduce the amount of markup the view provides by default, at the cost of making it more difficult to apply CSS.'),
       '#type' => 'checkbox',
       '#default_value' => $this->options['col_class_default'],
-    );
-    $form['col_class_custom'] = array(
+    ];
+    $form['col_class_custom'] = [
       '#title' => $this->t('Custom column class'),
       '#description' => $this->t('Additional classes to provide on each column. Separated by a space.'),
       '#type' => 'textfield',
       '#default_value' => $this->options['col_class_custom'],
-    );
+    ];
     if ($this->usesFields()) {
       $form['col_class_custom']['#description'] .= ' ' . $this->t('You may use field tokens from as per the "Replacement patterns" used in "Rewrite the output of this field" for all fields.');
     }
-    $form['row_class_default'] = array(
+    $form['row_class_default'] = [
       '#title' => $this->t('Default row classes'),
       '#description' => $this->t('Adds the default views row classes like views-row, row-1 and clearfix to the output. You can use this to quickly reduce the amount of markup the view provides by default, at the cost of making it more difficult to apply CSS.'),
       '#type' => 'checkbox',
       '#default_value' => $this->options['row_class_default'],
-    );
-    $form['row_class_custom'] = array(
+    ];
+    $form['row_class_custom'] = [
       '#title' => $this->t('Custom row class'),
       '#description' => $this->t('Additional classes to provide on each row. Separated by a space.'),
       '#type' => 'textfield',
       '#default_value' => $this->options['row_class_custom'],
-    );
+    ];
     if ($this->usesFields()) {
       $form['row_class_custom']['#description'] .= ' ' . $this->t('You may use field tokens from as per the "Replacement patterns" used in "Rewrite the output of this field" for all fields.');
     }
diff --git a/web/core/modules/views/src/Plugin/views/style/HtmlList.php b/web/core/modules/views/src/Plugin/views/style/HtmlList.php
index a89b0f126..a6df09d2b 100644
--- a/web/core/modules/views/src/Plugin/views/style/HtmlList.php
+++ b/web/core/modules/views/src/Plugin/views/style/HtmlList.php
@@ -39,9 +39,9 @@ class HtmlList extends StylePluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['type'] = array('default' => 'ul');
-    $options['class'] = array('default' => '');
-    $options['wrapper_class'] = array('default' => 'item-list');
+    $options['type'] = ['default' => 'ul'];
+    $options['class'] = ['default' => ''];
+    $options['wrapper_class'] = ['default' => 'item-list'];
 
     return $options;
   }
@@ -51,26 +51,26 @@ class HtmlList extends StylePluginBase {
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['type'] = array(
+    $form['type'] = [
       '#type' => 'radios',
       '#title' => $this->t('List type'),
-      '#options' => array('ul' => $this->t('Unordered list'), 'ol' => $this->t('Ordered list')),
+      '#options' => ['ul' => $this->t('Unordered list'), 'ol' => $this->t('Ordered list')],
       '#default_value' => $this->options['type'],
-    );
-    $form['wrapper_class'] = array(
+    ];
+    $form['wrapper_class'] = [
       '#title' => $this->t('Wrapper class'),
       '#description' => $this->t('The class to provide on the wrapper, outside the list.'),
       '#type' => 'textfield',
       '#size' => '30',
       '#default_value' => $this->options['wrapper_class'],
-    );
-    $form['class'] = array(
+    ];
+    $form['class'] = [
       '#title' => $this->t('List class'),
       '#description' => $this->t('The class to provide on the list element itself.'),
       '#type' => 'textfield',
       '#size' => '30',
       '#default_value' => $this->options['class'],
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/style/Mapping.php b/web/core/modules/views/src/Plugin/views/style/Mapping.php
index e7c72422d..7db524788 100644
--- a/web/core/modules/views/src/Plugin/views/style/Mapping.php
+++ b/web/core/modules/views/src/Plugin/views/style/Mapping.php
@@ -49,14 +49,14 @@ abstract class Mapping extends StylePluginBase {
 
     // Parse the mapping and add a default for each.
     foreach ($this->defineMapping() as $key => $value) {
-      $default = !empty($value['#multiple']) ? array() : '';
-      $options['mapping']['contains'][$key] = array(
+      $default = !empty($value['#multiple']) ? [] : '';
+      $options['mapping']['contains'][$key] = [
         'default' => isset($value['#default_value']) ? $value['#default_value'] : $default,
-      );
+      ];
       if (!empty($value['#toggle'])) {
-        $options['mapping']['contains']["toggle_$key"] = array(
+        $options['mapping']['contains']["toggle_$key"] = [
           'default' => FALSE,
-        );
+        ];
       }
     }
 
@@ -79,19 +79,19 @@ abstract class Mapping extends StylePluginBase {
     $field_labels = $this->displayHandler->getFieldLabels();
 
     // Provide some default values.
-    $defaults = array(
+    $defaults = [
       '#type' => 'select',
       '#required' => FALSE,
       '#multiple' => FALSE,
-    );
+    ];
 
     // For each mapping, add a select element to the form.
     foreach ($options as $key => $value) {
       // If the field is optional, add a 'None' value to the top of the options.
-      $field_options = array();
+      $field_options = [];
       $required = !empty($mapping[$key]['#required']);
       if (!$required && empty($mapping[$key]['#multiple'])) {
-        $field_options = array('' => $this->t('- None -'));
+        $field_options = ['' => $this->t('- None -')];
       }
       $field_options += $field_labels;
 
@@ -104,19 +104,19 @@ abstract class Mapping extends StylePluginBase {
       }
 
       // These values must always be set.
-      $overrides = array(
+      $overrides = [
         '#options' => $field_options,
         '#default_value' => $options[$key],
-      );
+      ];
 
       // Optionally allow the select to be toggleable.
       if (!empty($mapping[$key]['#toggle'])) {
-        $form['mapping']["toggle_$key"] = array(
+        $form['mapping']["toggle_$key"] = [
           '#type' => 'checkbox',
-          '#title' => $this->t('Use a custom %field_name', array('%field_name' => strtolower($mapping[$key]['#title']))),
+          '#title' => $this->t('Use a custom %field_name', ['%field_name' => strtolower($mapping[$key]['#title'])]),
           '#default_value' => $this->options['mapping']["toggle_$key"],
-        );
-        $overrides['#states']['visible'][':input[name="style_options[mapping][' . "toggle_$key" . ']"]'] = array('checked' => TRUE);
+        ];
+        $overrides['#states']['visible'][':input[name="style_options[mapping][' . "toggle_$key" . ']"]'] = ['checked' => TRUE];
       }
 
       $form['mapping'][$key] = $overrides + $mapping[$key] + $defaults;
@@ -129,13 +129,13 @@ abstract class Mapping extends StylePluginBase {
    * Provides the mapping definition as an available variable.
    */
   public function render() {
-    return array(
+    return [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#rows' => $this->view->result,
       '#mapping' => $this->defineMapping(),
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/style/Opml.php b/web/core/modules/views/src/Plugin/views/style/Opml.php
index ed02511a0..69679d3ce 100644
--- a/web/core/modules/views/src/Plugin/views/style/Opml.php
+++ b/web/core/modules/views/src/Plugin/views/style/Opml.php
@@ -31,7 +31,7 @@ class Opml extends StylePluginBase {
    */
   public function attachTo(array &$build, $display_id, Url $feed_url, $title) {
     $display = $this->view->displayHandlers->get($display_id);
-    $url_options = array();
+    $url_options = [];
     $input = $this->view->getExposedInput();
     if ($input) {
       $url_options['query'] = $input;
@@ -41,15 +41,15 @@ class Opml extends StylePluginBase {
     $url = $feed_url->setOptions($url_options)->toString();
     if ($display->hasPath()) {
       if (empty($this->preview)) {
-        $build['#attached']['feed'][] = array($url, $title);
+        $build['#attached']['feed'][] = [$url, $title];
       }
     }
     else {
-      $this->view->feedIcons[] = array(
+      $this->view->feedIcons[] = [
         '#theme' => 'feed_icon',
         '#url' => $url,
         '#title' => $title,
-      );
+      ];
     }
   }
 
@@ -61,19 +61,19 @@ class Opml extends StylePluginBase {
       debug('Drupal\views\Plugin\views\style\Opml: Missing row plugin');
       return;
     }
-    $rows = array();
+    $rows = [];
 
     foreach ($this->view->result as $row_index => $row) {
       $this->view->row_index = $row_index;
       $rows[] = $this->view->rowPlugin->render($row);
     }
 
-    $build = array(
+    $build = [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#rows' => $rows,
-    );
+    ];
     unset($this->view->row_index);
     return $build;
   }
diff --git a/web/core/modules/views/src/Plugin/views/style/Rss.php b/web/core/modules/views/src/Plugin/views/style/Rss.php
index e612453e6..b7efa578d 100644
--- a/web/core/modules/views/src/Plugin/views/style/Rss.php
+++ b/web/core/modules/views/src/Plugin/views/style/Rss.php
@@ -28,7 +28,7 @@ class Rss extends StylePluginBase {
   protected $usesRowPlugin = TRUE;
 
   public function attachTo(array &$build, $display_id, Url $feed_url, $title) {
-    $url_options = array();
+    $url_options = [];
     $input = $this->view->getExposedInput();
     if ($input) {
       $url_options['query'] = $input;
@@ -45,18 +45,18 @@ class Rss extends StylePluginBase {
     ];
 
     // Attach a link to the RSS feed, which is an alternate representation.
-    $build['#attached']['html_head_link'][][] = array(
+    $build['#attached']['html_head_link'][][] = [
       'rel' => 'alternate',
       'type' => 'application/rss+xml',
       'title' => $title,
       'href' => $url,
-    );
+    ];
   }
 
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['description'] = array('default' => '');
+    $options['description'] = ['default' => ''];
 
     return $options;
   }
@@ -64,13 +64,13 @@ class Rss extends StylePluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['description'] = array(
+    $form['description'] = [
       '#type' => 'textfield',
       '#title' => $this->t('RSS description'),
       '#default_value' => $this->options['description'],
       '#description' => $this->t('This will appear in the RSS feed itself.'),
       '#maxlength' => 1024,
-    );
+    ];
   }
 
   /**
@@ -80,7 +80,7 @@ class Rss extends StylePluginBase {
    *   A render array.
    */
   protected function getChannelElements() {
-    return array();
+    return [];
   }
 
   /**
@@ -101,13 +101,13 @@ class Rss extends StylePluginBase {
   public function render() {
     if (empty($this->view->rowPlugin)) {
       debug('Drupal\views\Plugin\views\style\Rss: Missing row plugin');
-      return array();
+      return [];
     }
     $rows = [];
 
     // This will be filled in by the row plugin and is used later on in the
     // theming output.
-    $this->namespaces = array('xmlns:dc' => 'http://purl.org/dc/elements/1.1/');
+    $this->namespaces = ['xmlns:dc' => 'http://purl.org/dc/elements/1.1/'];
 
     // Fetch any additional elements for the channel and merge in their
     // namespaces.
@@ -123,12 +123,12 @@ class Rss extends StylePluginBase {
       $rows[] = $this->view->rowPlugin->render($row);
     }
 
-    $build = array(
+    $build = [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#options' => $this->options,
       '#rows' => $rows,
-    );
+    ];
     unset($this->view->row_index);
     return $build;
   }
diff --git a/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index 3bee96a5f..364c9f837 100644
--- a/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -47,7 +47,7 @@ abstract class StylePluginBase extends PluginBase {
   /**
    * Store all available tokens row rows.
    */
-  protected $rowTokens = array();
+  protected $rowTokens = [];
 
   /**
    * Does the style plugin allows to use style plugins.
@@ -122,9 +122,9 @@ abstract class StylePluginBase extends PluginBase {
       $this->view->rowPlugin = $display->getPlugin('row');
     }
 
-    $this->options += array(
-      'grouping' => array(),
-    );
+    $this->options += [
+      'grouping' => [],
+    ];
 
   }
 
@@ -144,7 +144,7 @@ abstract class StylePluginBase extends PluginBase {
    *
    * @return bool
    */
-  function usesRowPlugin() {
+  public function usesRowPlugin() {
     return $this->usesRowPlugin;
 
   }
@@ -154,7 +154,7 @@ abstract class StylePluginBase extends PluginBase {
    *
    * @return bool
    */
-  function usesRowClass() {
+  public function usesRowClass() {
     return $this->usesRowClass;
   }
 
@@ -163,7 +163,7 @@ abstract class StylePluginBase extends PluginBase {
    *
    * @return bool
    */
-  function usesGrouping() {
+  public function usesGrouping() {
     return $this->usesGrouping;
   }
 
@@ -172,7 +172,7 @@ abstract class StylePluginBase extends PluginBase {
    *
    * @return bool
    */
-  function usesFields() {
+  public function usesFields() {
     // If we use a row plugin, ask the row plugin. Chances are, we don't
     // care, it does.
     $row_uses_fields = FALSE;
@@ -230,7 +230,7 @@ abstract class StylePluginBase extends PluginBase {
   public function tokenizeValue($value, $row_index) {
     if (strpos($value, '{{') !== FALSE) {
       // Row tokens might be empty, for example for node row style.
-      $tokens = isset($this->rowTokens[$row_index]) ? $this->rowTokens[$row_index] : array();
+      $tokens = isset($this->rowTokens[$row_index]) ? $this->rowTokens[$row_index] : [];
       if (!empty($this->view->build_info['substitutions'])) {
         $tokens += $this->view->build_info['substitutions'];
       }
@@ -257,12 +257,12 @@ abstract class StylePluginBase extends PluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['grouping'] = array('default' => array());
+    $options['grouping'] = ['default' => []];
     if ($this->usesRowClass()) {
-      $options['row_class'] = array('default' => '');
-      $options['default_row_class'] = array('default' => TRUE);
+      $options['row_class'] = ['default' => ''];
+      $options['default_row_class'] = ['default' => TRUE];
     }
-    $options['uses_fields'] = array('default' => FALSE);
+    $options['uses_fields'] = ['default' => FALSE];
 
     return $options;
   }
@@ -277,7 +277,7 @@ abstract class StylePluginBase extends PluginBase {
     // to FALSE.
     // @TODO: Document "usesGrouping" in docs.php when docs.php is written.
     if ($this->usesFields() && $this->usesGrouping()) {
-      $options = array('' => $this->t('- None -'));
+      $options = ['' => $this->t('- None -')];
       $field_labels = $this->displayHandler->getFieldLabels(TRUE);
       $options += $field_labels;
       // If there are no fields, we can't group on them.
@@ -286,7 +286,7 @@ abstract class StylePluginBase extends PluginBase {
         // select form.
         if (is_string($this->options['grouping'])) {
           $grouping = $this->options['grouping'];
-          $this->options['grouping'] = array();
+          $this->options['grouping'] = [];
           $this->options['grouping'][0]['field'] = $grouping;
         }
         if (isset($this->options['group_rendered']) && is_string($this->options['group_rendered'])) {
@@ -297,67 +297,67 @@ abstract class StylePluginBase extends PluginBase {
         $c = count($this->options['grouping']);
         // Add a form for every grouping, plus one.
         for ($i = 0; $i <= $c; $i++) {
-          $grouping = !empty($this->options['grouping'][$i]) ? $this->options['grouping'][$i] : array();
-          $grouping += array('field' => '', 'rendered' => TRUE, 'rendered_strip' => FALSE);
-          $form['grouping'][$i]['field'] = array(
+          $grouping = !empty($this->options['grouping'][$i]) ? $this->options['grouping'][$i] : [];
+          $grouping += ['field' => '', 'rendered' => TRUE, 'rendered_strip' => FALSE];
+          $form['grouping'][$i]['field'] = [
             '#type' => 'select',
-            '#title' => $this->t('Grouping field Nr.@number', array('@number' => $i + 1)),
+            '#title' => $this->t('Grouping field Nr.@number', ['@number' => $i + 1]),
             '#options' => $options,
             '#default_value' => $grouping['field'],
             '#description' => $this->t('You may optionally specify a field by which to group the records. Leave blank to not group.'),
-          );
-          $form['grouping'][$i]['rendered'] = array(
+          ];
+          $form['grouping'][$i]['rendered'] = [
             '#type' => 'checkbox',
             '#title' => $this->t('Use rendered output to group rows'),
             '#default_value' => $grouping['rendered'],
             '#description' => $this->t('If enabled the rendered output of the grouping field is used to group the rows.'),
-            '#states' => array(
-              'invisible' => array(
-                ':input[name="style_options[grouping][' . $i . '][field]"]' => array('value' => ''),
-              ),
-            ),
-          );
-          $form['grouping'][$i]['rendered_strip'] = array(
+            '#states' => [
+              'invisible' => [
+                ':input[name="style_options[grouping][' . $i . '][field]"]' => ['value' => ''],
+              ],
+            ],
+          ];
+          $form['grouping'][$i]['rendered_strip'] = [
             '#type' => 'checkbox',
             '#title' => $this->t('Remove tags from rendered output'),
             '#default_value' => $grouping['rendered_strip'],
-            '#states' => array(
-              'invisible' => array(
-                ':input[name="style_options[grouping][' . $i . '][field]"]' => array('value' => ''),
-              ),
-            ),
-          );
+            '#states' => [
+              'invisible' => [
+                ':input[name="style_options[grouping][' . $i . '][field]"]' => ['value' => ''],
+              ],
+            ],
+          ];
         }
       }
     }
 
     if ($this->usesRowClass()) {
-      $form['row_class'] = array(
+      $form['row_class'] = [
         '#title' => $this->t('Row class'),
         '#description' => $this->t('The class to provide on each row.'),
         '#type' => 'textfield',
         '#default_value' => $this->options['row_class'],
-      );
+      ];
 
       if ($this->usesFields()) {
         $form['row_class']['#description'] .= ' ' . $this->t('You may use field tokens from as per the "Replacement patterns" used in "Rewrite the output of this field" for all fields.');
       }
 
-      $form['default_row_class'] = array(
+      $form['default_row_class'] = [
         '#title' => $this->t('Add views row classes'),
-        '#description' => $this->t('Add the default row classes like @classes to the output. You can use this to quickly reduce the amount of markup the view provides by default, at the cost of making it more difficult to apply CSS.', array('@classes' => 'views-row')),
+        '#description' => $this->t('Add the default row classes like @classes to the output. You can use this to quickly reduce the amount of markup the view provides by default, at the cost of making it more difficult to apply CSS.', ['@classes' => 'views-row']),
         '#type' => 'checkbox',
         '#default_value' => $this->options['default_row_class'],
-      );
+      ];
     }
 
     if (!$this->usesFields() || !empty($this->options['uses_fields'])) {
-      $form['uses_fields'] = array(
+      $form['uses_fields'] = [
         '#type' => 'checkbox',
         '#title' => $this->t('Force using fields'),
         '#description' => $this->t('If neither the row nor the style plugin supports fields, this field allows to enable them, so you can for example use groupby.'),
         '#default_value' => $this->options['uses_fields'],
-      );
+      ];
     }
   }
 
@@ -366,12 +366,12 @@ abstract class StylePluginBase extends PluginBase {
    */
   public function validateOptionsForm(&$form, FormStateInterface $form_state) {
     // Don't run validation on style plugins without the grouping setting.
-    if ($form_state->hasValue(array('style_options', 'grouping'))) {
+    if ($form_state->hasValue(['style_options', 'grouping'])) {
       // Don't save grouping if no field is specified.
-      $groupings = $form_state->getValue(array('style_options', 'grouping'));
+      $groupings = $form_state->getValue(['style_options', 'grouping']);
       foreach ($groupings as $index => $grouping) {
         if (empty($grouping['field'])) {
-          $form_state->unsetValue(array('style_options', 'grouping', $index));
+          $form_state->unsetValue(['style_options', 'grouping', $index]);
         }
       }
     }
@@ -442,12 +442,12 @@ abstract class StylePluginBase extends PluginBase {
    * @return array
    *   The render array containing the single group theme output.
    */
-  protected function renderRowGroup(array $rows = array()) {
-    return array(
+  protected function renderRowGroup(array $rows = []) {
+    return [
       '#theme' => $this->themeFunctions(),
       '#view' => $this->view,
       '#rows' => $rows,
-    );
+    ];
   }
 
   /**
@@ -481,18 +481,12 @@ abstract class StylePluginBase extends PluginBase {
    *   - group: The group content.
    *   - level: The hierarchical level of the grouping.
    *   - rows: The result rows to be rendered in this group..
-   * @param $level
-   *   (deprecated) This is no longer used and will be removed in Drupal 9. The
-   *   'level' key in $sets is used to indicate the hierarchical level of the
-   *   grouping.
-   *
-   * @todo Remove the $level parameter in https://www.drupal.org/node/2633890.
    *
    * @return string
    *   Rendered output of given grouping sets.
    */
-  public function renderGroupingSets($sets, $level = 0) {
-    $output = array();
+  public function renderGroupingSets($sets) {
+    $output = [];
     $theme_functions = $this->view->buildThemeFunctions($this->groupingTheme);
     foreach ($sets as $set) {
       $level = isset($set['level']) ? $set['level'] : 0;
@@ -500,12 +494,12 @@ abstract class StylePluginBase extends PluginBase {
       $row = reset($set['rows']);
       // Render as a grouping set.
       if (is_array($row) && isset($row['group'])) {
-        $single_output = array(
+        $single_output = [
           '#theme' => $theme_functions,
           '#view' => $this->view,
           '#grouping' => $this->options['grouping'][$level],
           '#rows' => $set['rows'],
-        );
+        ];
       }
       // Render as a record set.
       else {
@@ -568,17 +562,17 @@ abstract class StylePluginBase extends PluginBase {
    *   )
    *   @endcode
    */
-  public function renderGrouping($records, $groupings = array(), $group_rendered = NULL) {
+  public function renderGrouping($records, $groupings = [], $group_rendered = NULL) {
     // This is for backward compatibility, when $groupings was a string
     // containing the ID of a single field.
     if (is_string($groupings)) {
       $rendered = $group_rendered === NULL ? TRUE : $group_rendered;
-      $groupings = array(array('field' => $groupings, 'rendered' => $rendered));
+      $groupings = [['field' => $groupings, 'rendered' => $rendered]];
     }
 
     // Make sure fields are rendered
     $this->renderFields($this->view->result);
-    $sets = array();
+    $sets = [];
     if ($groupings) {
       foreach ($records as $index => $row) {
         // Iterate through configured grouping fields to determine the
@@ -619,7 +613,7 @@ abstract class StylePluginBase extends PluginBase {
           if (empty($set[$grouping])) {
             $set[$grouping]['group'] = $group_content;
             $set[$grouping]['level'] = $level;
-            $set[$grouping]['rows'] = array();
+            $set[$grouping]['rows'] = [];
           }
 
           // Move the set reference into the row set of the group we just determined.
@@ -631,17 +625,17 @@ abstract class StylePluginBase extends PluginBase {
     }
     else {
       // Create a single group with an empty grouping field.
-      $sets[''] = array(
+      $sets[''] = [
         'group' => '',
         'rows' => $records,
-      );
+      ];
     }
 
     // If this parameter isn't explicitly set, modify the output to be fully
     // backward compatible to code before Views 7.x-3.0-rc2.
     // @TODO Remove this as soon as possible e.g. October 2020
     if ($group_rendered === NULL) {
-      $old_style_sets = array();
+      $old_style_sets = [];
       foreach ($sets as $group) {
         $old_style_sets[$group['group']] = $group['rows'];
       }
@@ -812,7 +806,7 @@ abstract class StylePluginBase extends PluginBase {
     if ($this->usesRowPlugin()) {
       $plugin = $this->displayHandler->getPlugin('row');
       if (empty($plugin)) {
-        $errors[] = $this->t('Style @style requires a row style but the row plugin is invalid.', array('@style' => $this->definition['title']));
+        $errors[] = $this->t('Style @style requires a row style but the row plugin is invalid.', ['@style' => $this->definition['title']]);
       }
       else {
         $result = $plugin->validate();
diff --git a/web/core/modules/views/src/Plugin/views/style/Table.php b/web/core/modules/views/src/Plugin/views/style/Table.php
index c49f6e984..00e28b3c6 100644
--- a/web/core/modules/views/src/Plugin/views/style/Table.php
+++ b/web/core/modules/views/src/Plugin/views/style/Table.php
@@ -65,16 +65,16 @@ class Table extends StylePluginBase implements CacheableDependencyInterface {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['columns'] = array('default' => array());
-    $options['default'] = array('default' => '');
-    $options['info'] = array('default' => array());
-    $options['override'] = array('default' => TRUE);
-    $options['sticky'] = array('default' => FALSE);
-    $options['order'] = array('default' => 'asc');
-    $options['caption'] = array('default' => '');
-    $options['summary'] = array('default' => '');
-    $options['description'] = array('default' => '');
-    $options['empty_table'] = array('default' => FALSE);
+    $options['columns'] = ['default' => []];
+    $options['default'] = ['default' => ''];
+    $options['info'] = ['default' => []];
+    $options['override'] = ['default' => TRUE];
+    $options['sticky'] = ['default' => FALSE];
+    $options['order'] = ['default' => 'asc'];
+    $options['caption'] = ['default' => ''];
+    $options['summary'] = ['default' => ''];
+    $options['description'] = ['default' => ''];
+    $options['empty_table'] = ['default' => FALSE];
 
     return $options;
   }
@@ -165,7 +165,7 @@ class Table extends StylePluginBase implements CacheableDependencyInterface {
    *    An array of all the sanitized columns.
    */
   public function sanitizeColumns($columns, $fields = NULL) {
-    $sanitized = array();
+    $sanitized = [];
     if ($fields === NULL) {
       $fields = $this->displayHandler->getOption('fields');
     }
@@ -202,57 +202,57 @@ class Table extends StylePluginBase implements CacheableDependencyInterface {
     parent::buildOptionsForm($form, $form_state);
     $handlers = $this->displayHandler->getHandlers('field');
     if (empty($handlers)) {
-      $form['error_markup'] = array(
+      $form['error_markup'] = [
         '#markup' => '<div class="messages messages--error">' . $this->t('You need at least one field before you can configure your table settings') . '</div>',
-      );
+      ];
       return;
     }
 
-    $form['override'] = array(
+    $form['override'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Override normal sorting if click sorting is used'),
       '#default_value' => !empty($this->options['override']),
-    );
+    ];
 
-    $form['sticky'] = array(
+    $form['sticky'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Enable Drupal style "sticky" table headers (Javascript)'),
       '#default_value' => !empty($this->options['sticky']),
       '#description' => $this->t('(Sticky header effects will not be active for preview below, only on live output.)'),
-    );
+    ];
 
-    $form['caption'] = array(
+    $form['caption'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Caption for the table'),
       '#description' => $this->t('A title semantically associated with your table for increased accessibility.'),
       '#default_value' => $this->options['caption'],
       '#maxlength' => 255,
-    );
+    ];
 
-    $form['accessibility_details'] = array(
+    $form['accessibility_details'] = [
       '#type' => 'details',
       '#title' => $this->t('Table details'),
-    );
+    ];
 
-    $form['summary'] = array(
+    $form['summary'] = [
       '#title' => $this->t('Summary title'),
       '#type' => 'textfield',
       '#default_value' => $this->options['summary'],
       '#fieldset' => 'accessibility_details',
-    );
+    ];
 
-    $form['description'] = array(
+    $form['description'] = [
       '#title' => $this->t('Table description'),
       '#type' => 'textarea',
       '#description' => $this->t('Provide additional details about the table to increase accessibility.'),
       '#default_value' => $this->options['description'],
-      '#states' => array(
-        'visible' => array(
-          'input[name="style_options[summary]"]' => array('filled' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          'input[name="style_options[summary]"]' => ['filled' => TRUE],
+        ],
+      ],
       '#fieldset' => 'accessibility_details',
-    );
+    ];
 
     // Note: views UI registers this theme handler on our behalf. Your module
     // will have to register your theme handlers if you do stuff like this.
@@ -276,137 +276,137 @@ class Table extends StylePluginBase implements CacheableDependencyInterface {
     foreach ($columns as $field => $column) {
       $column_selector = ':input[name="style_options[columns][' . $field . ']"]';
 
-      $form['columns'][$field] = array(
-        '#title' => $this->t('Columns for @field', array('@field' => $field)),
+      $form['columns'][$field] = [
+        '#title' => $this->t('Columns for @field', ['@field' => $field]),
         '#title_display' => 'invisible',
         '#type' => 'select',
         '#options' => $field_names,
         '#default_value' => $column,
-      );
+      ];
       if ($handlers[$field]->clickSortable()) {
-        $form['info'][$field]['sortable'] = array(
-          '#title' => $this->t('Sortable for @field', array('@field' => $field)),
+        $form['info'][$field]['sortable'] = [
+          '#title' => $this->t('Sortable for @field', ['@field' => $field]),
           '#title_display' => 'invisible',
           '#type' => 'checkbox',
           '#default_value' => !empty($this->options['info'][$field]['sortable']),
-          '#states' => array(
-            'visible' => array(
-              $column_selector => array('value' => $field),
-            ),
-          ),
-        );
-        $form['info'][$field]['default_sort_order'] = array(
-          '#title' => $this->t('Default sort order for @field', array('@field' => $field)),
+          '#states' => [
+            'visible' => [
+              $column_selector => ['value' => $field],
+            ],
+          ],
+        ];
+        $form['info'][$field]['default_sort_order'] = [
+          '#title' => $this->t('Default sort order for @field', ['@field' => $field]),
           '#title_display' => 'invisible',
           '#type' => 'select',
-          '#options' => array('asc' => $this->t('Ascending'), 'desc' => $this->t('Descending')),
+          '#options' => ['asc' => $this->t('Ascending'), 'desc' => $this->t('Descending')],
           '#default_value' => !empty($this->options['info'][$field]['default_sort_order']) ? $this->options['info'][$field]['default_sort_order'] : 'asc',
-          '#states' => array(
-            'visible' => array(
-              $column_selector => array('value' => $field),
-              ':input[name="style_options[info][' . $field . '][sortable]"]' => array('checked' => TRUE),
-            ),
-          ),
-        );
+          '#states' => [
+            'visible' => [
+              $column_selector => ['value' => $field],
+              ':input[name="style_options[info][' . $field . '][sortable]"]' => ['checked' => TRUE],
+            ],
+          ],
+        ];
         // Provide an ID so we can have such things.
         $radio_id = Html::getUniqueId('edit-default-' . $field);
-        $form['default'][$field] = array(
-          '#title' => $this->t('Default sort for @field', array('@field' => $field)),
+        $form['default'][$field] = [
+          '#title' => $this->t('Default sort for @field', ['@field' => $field]),
           '#title_display' => 'invisible',
           '#type' => 'radio',
           '#return_value' => $field,
-          '#parents' => array('style_options', 'default'),
+          '#parents' => ['style_options', 'default'],
           '#id' => $radio_id,
           // because 'radio' doesn't fully support '#id' =(
-          '#attributes' => array('id' => $radio_id),
+          '#attributes' => ['id' => $radio_id],
           '#default_value' => $default,
-          '#states' => array(
-            'visible' => array(
-              $column_selector => array('value' => $field),
-            ),
-          ),
-        );
+          '#states' => [
+            'visible' => [
+              $column_selector => ['value' => $field],
+            ],
+          ],
+        ];
       }
-      $form['info'][$field]['align'] = array(
-        '#title' => $this->t('Alignment for @field', array('@field' => $field)),
+      $form['info'][$field]['align'] = [
+        '#title' => $this->t('Alignment for @field', ['@field' => $field]),
         '#title_display' => 'invisible',
         '#type' => 'select',
         '#default_value' => !empty($this->options['info'][$field]['align']) ? $this->options['info'][$field]['align'] : '',
-        '#options' => array(
+        '#options' => [
           '' => $this->t('None'),
-          'views-align-left' => $this->t('Left', array(), array('context' => 'Text alignment')),
-          'views-align-center' => $this->t('Center', array(), array('context' => 'Text alignment')),
-          'views-align-right' => $this->t('Right', array(), array('context' => 'Text alignment')),
-          ),
-        '#states' => array(
-          'visible' => array(
-            $column_selector => array('value' => $field),
-          ),
-        ),
-      );
-      $form['info'][$field]['separator'] = array(
-        '#title' => $this->t('Separator for @field', array('@field' => $field)),
+          'views-align-left' => $this->t('Left', [], ['context' => 'Text alignment']),
+          'views-align-center' => $this->t('Center', [], ['context' => 'Text alignment']),
+          'views-align-right' => $this->t('Right', [], ['context' => 'Text alignment']),
+          ],
+        '#states' => [
+          'visible' => [
+            $column_selector => ['value' => $field],
+          ],
+        ],
+      ];
+      $form['info'][$field]['separator'] = [
+        '#title' => $this->t('Separator for @field', ['@field' => $field]),
         '#title_display' => 'invisible',
         '#type' => 'textfield',
         '#size' => 10,
         '#default_value' => isset($this->options['info'][$field]['separator']) ? $this->options['info'][$field]['separator'] : '',
-        '#states' => array(
-          'visible' => array(
-            $column_selector => array('value' => $field),
-          ),
-        ),
-      );
-      $form['info'][$field]['empty_column'] = array(
-        '#title' => $this->t('Hide empty column for @field', array('@field' => $field)),
+        '#states' => [
+          'visible' => [
+            $column_selector => ['value' => $field],
+          ],
+        ],
+      ];
+      $form['info'][$field]['empty_column'] = [
+        '#title' => $this->t('Hide empty column for @field', ['@field' => $field]),
         '#title_display' => 'invisible',
         '#type' => 'checkbox',
         '#default_value' => isset($this->options['info'][$field]['empty_column']) ? $this->options['info'][$field]['empty_column'] : FALSE,
-        '#states' => array(
-          'visible' => array(
-            $column_selector => array('value' => $field),
-          ),
-        ),
-      );
-      $form['info'][$field]['responsive'] = array(
-        '#title' => $this->t('Responsive setting for @field', array('@field' => $field)),
+        '#states' => [
+          'visible' => [
+            $column_selector => ['value' => $field],
+          ],
+        ],
+      ];
+      $form['info'][$field]['responsive'] = [
+        '#title' => $this->t('Responsive setting for @field', ['@field' => $field]),
         '#title_display' => 'invisible',
         '#type' => 'select',
         '#default_value' => isset($this->options['info'][$field]['responsive']) ? $this->options['info'][$field]['responsive'] : '',
-        '#options' => array('' => $this->t('High'), RESPONSIVE_PRIORITY_MEDIUM => $this->t('Medium'), RESPONSIVE_PRIORITY_LOW => $this->t('Low')),
-        '#states' => array(
-          'visible' => array(
-            $column_selector => array('value' => $field),
-          ),
-        ),
-      );
+        '#options' => ['' => $this->t('High'), RESPONSIVE_PRIORITY_MEDIUM => $this->t('Medium'), RESPONSIVE_PRIORITY_LOW => $this->t('Low')],
+        '#states' => [
+          'visible' => [
+            $column_selector => ['value' => $field],
+          ],
+        ],
+      ];
 
       // markup for the field name
-      $form['info'][$field]['name'] = array(
+      $form['info'][$field]['name'] = [
         '#markup' => $field_names[$field],
-      );
+      ];
     }
 
     // Provide a radio for no default sort
-    $form['default'][-1] = array(
+    $form['default'][-1] = [
       '#title' => $this->t('No default sort'),
       '#title_display' => 'invisible',
       '#type' => 'radio',
       '#return_value' => -1,
-      '#parents' => array('style_options', 'default'),
+      '#parents' => ['style_options', 'default'],
       '#id' => 'edit-default-0',
       '#default_value' => $default,
-    );
+    ];
 
-    $form['empty_table'] = array(
+    $form['empty_table'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Show the empty text in the table'),
       '#default_value' => $this->options['empty_table'],
       '#description' => $this->t('Per default the table is hidden for an empty view. With this option it is possible to show an empty table with the text in it.'),
-    );
+    ];
 
-    $form['description_markup'] = array(
+    $form['description_markup'] = [
       '#markup' => '<div class="js-form-item form-item description">' . $this->t('Place fields into columns; you may combine multiple fields into the same column. If you do, the separator in the column specified will be used to separate the fields. Check the sortable box to make that column click sortable, and check the default sort radio to determine which column will be sorted by default, if any. You may control column order and field labels in the fields section.') . '</div>',
-    );
+    ];
   }
 
   public function evenEmpty() {
diff --git a/web/core/modules/views/src/Plugin/views/style/UnformattedSummary.php b/web/core/modules/views/src/Plugin/views/style/UnformattedSummary.php
index b6b6d6e46..6460841af 100644
--- a/web/core/modules/views/src/Plugin/views/style/UnformattedSummary.php
+++ b/web/core/modules/views/src/Plugin/views/style/UnformattedSummary.php
@@ -21,23 +21,23 @@ class UnformattedSummary extends DefaultSummary {
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['inline'] = array('default' => FALSE);
-    $options['separator'] = array('default' => '');
+    $options['inline'] = ['default' => FALSE];
+    $options['separator'] = ['default' => ''];
     return $options;
   }
 
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
-    $form['inline'] = array(
+    $form['inline'] = [
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['inline']),
       '#title' => $this->t('Display items inline'),
-    );
-    $form['separator'] = array(
+    ];
+    $form['separator'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Separator'),
       '#default_value' => $this->options['separator'],
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/web/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 3f64626f6..1771c710e 100644
--- a/web/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -66,7 +66,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *
    * @var array
    */
-  protected $validated_views = array();
+  protected $validated_views = [];
 
   /**
    * The table column used for sorting by create date of this wizard.
@@ -80,21 +80,21 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *
    * @var array
    */
-  protected $filters = array();
+  protected $filters = [];
 
   /**
    * Views items configuration arrays for sorts added by the wizard.
    *
    * @var array
    */
-  protected $sorts = array();
+  protected $sorts = [];
 
   /**
    * The available store criteria.
    *
    * @var array
    */
-  protected $availableSorts = array();
+  protected $availableSorts = [];
 
   /**
    * Default values for filters.
@@ -104,11 +104,11 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *
    * @var array()
    */
-  protected $filter_defaults = array(
+  protected $filter_defaults = [
     'id' => NULL,
-    'expose' => array('operator' => FALSE),
+    'expose' => ['operator' => FALSE],
     'group' => 1,
-  );
+  ];
 
   /**
    * The bundle info service.
@@ -163,7 +163,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    * @return array
    */
   public function getFilters() {
-    $filters = array();
+    $filters = [];
 
     $default = $this->filter_defaults;
 
@@ -197,100 +197,100 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $style_options = Views::fetchPluginNames('style', 'normal', array($this->base_table));
-    $feed_row_options = Views::fetchPluginNames('row', 'feed', array($this->base_table));
+    $style_options = Views::fetchPluginNames('style', 'normal', [$this->base_table]);
+    $feed_row_options = Views::fetchPluginNames('row', 'feed', [$this->base_table]);
     $path_prefix = $this->url('<none>', [], ['absolute' => TRUE]);
 
     // Add filters and sorts which apply to the view as a whole.
     $this->buildFilters($form, $form_state);
     $this->buildSorts($form, $form_state);
 
-    $form['displays']['page'] = array(
+    $form['displays']['page'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Page settings'),
-      '#attributes' => array('class' => array('views-attachment', 'fieldset-no-legend')),
+      '#attributes' => ['class' => ['views-attachment', 'fieldset-no-legend']],
       '#tree' => TRUE,
-    );
-    $form['displays']['page']['create'] = array(
+    ];
+    $form['displays']['page']['create'] = [
       '#title' => $this->t('Create a page'),
       '#type' => 'checkbox',
-      '#attributes' => array('class' => array('strong')),
+      '#attributes' => ['class' => ['strong']],
       '#default_value' => FALSE,
       '#id' => 'edit-page-create',
-    );
+    ];
 
     // All options for the page display are included in this container so they
     // can be hidden as a group when the "Create a page" checkbox is unchecked.
-    $form['displays']['page']['options'] = array(
+    $form['displays']['page']['options'] = [
       '#type' => 'container',
-      '#attributes' => array('class' => array('options-set')),
-      '#states' => array(
-        'visible' => array(
-          ':input[name="page[create]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#attributes' => ['class' => ['options-set']],
+      '#states' => [
+        'visible' => [
+          ':input[name="page[create]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#prefix' => '<div><div id="edit-page-wrapper">',
       '#suffix' => '</div></div>',
-      '#parents' => array('page'),
-    );
+      '#parents' => ['page'],
+    ];
 
-    $form['displays']['page']['options']['title'] = array(
+    $form['displays']['page']['options']['title'] = [
       '#title' => $this->t('Page title'),
       '#type' => 'textfield',
       '#maxlength' => 255,
-    );
-    $form['displays']['page']['options']['path'] = array(
+    ];
+    $form['displays']['page']['options']['path'] = [
       '#title' => $this->t('Path'),
       '#type' => 'textfield',
       '#field_prefix' => $path_prefix,
       // Account for the leading backslash.
       '#maxlength' => 254,
-    );
-    $form['displays']['page']['options']['style'] = array(
+    ];
+    $form['displays']['page']['options']['style'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Page display settings'),
-      '#attributes' => array('class' => array('container-inline', 'fieldset-no-legend')),
-    );
+      '#attributes' => ['class' => ['container-inline', 'fieldset-no-legend']],
+    ];
 
     // Create the dropdown for choosing the display format.
-    $form['displays']['page']['options']['style']['style_plugin'] = array(
+    $form['displays']['page']['options']['style']['style_plugin'] = [
       '#title' => $this->t('Display format'),
       '#type' => 'select',
       '#options' => $style_options,
-    );
+    ];
     $style_form = &$form['displays']['page']['options']['style'];
-    $style_form['style_plugin']['#default_value'] = static::getSelected($form_state, array('page', 'style', 'style_plugin'), 'default', $style_form['style_plugin']);
+    $style_form['style_plugin']['#default_value'] = static::getSelected($form_state, ['page', 'style', 'style_plugin'], 'default', $style_form['style_plugin']);
     // Changing this dropdown updates $form['displays']['page']['options'] via
     // AJAX.
-    views_ui_add_ajax_trigger($style_form, 'style_plugin', array('displays', 'page', 'options'));
+    views_ui_add_ajax_trigger($style_form, 'style_plugin', ['displays', 'page', 'options']);
 
     $this->buildFormStyle($form, $form_state, 'page');
-    $form['displays']['page']['options']['items_per_page'] = array(
+    $form['displays']['page']['options']['items_per_page'] = [
       '#title' => $this->t('Items to display'),
       '#type' => 'number',
       '#default_value' => 10,
       '#min' => 0,
-    );
-    $form['displays']['page']['options']['pager'] = array(
+    ];
+    $form['displays']['page']['options']['pager'] = [
       '#title' => $this->t('Use a pager'),
       '#type' => 'checkbox',
       '#default_value' => TRUE,
-    );
-    $form['displays']['page']['options']['link'] = array(
+    ];
+    $form['displays']['page']['options']['link'] = [
       '#title' => $this->t('Create a menu link'),
       '#type' => 'checkbox',
       '#id' => 'edit-page-link',
-    );
-    $form['displays']['page']['options']['link_properties'] = array(
+    ];
+    $form['displays']['page']['options']['link_properties'] = [
       '#type' => 'container',
-      '#states' => array(
-        'visible' => array(
-          ':input[name="page[link]"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="page[link]"]' => ['checked' => TRUE],
+        ],
+      ],
       '#prefix' => '<div id="edit-page-link-properties-wrapper">',
       '#suffix' => '</div>',
-    );
+    ];
     if (\Drupal::moduleHandler()->moduleExists('menu_ui')) {
       $menu_options = menu_ui_get_menus();
     }
@@ -301,162 +301,162 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
         $menu_options[$name] = $this->t($title);
       }
     }
-    $form['displays']['page']['options']['link_properties']['menu_name'] = array(
+    $form['displays']['page']['options']['link_properties']['menu_name'] = [
       '#title' => $this->t('Menu'),
       '#type' => 'select',
       '#options' => $menu_options,
-    );
-    $form['displays']['page']['options']['link_properties']['title'] = array(
+    ];
+    $form['displays']['page']['options']['link_properties']['title'] = [
       '#title' => $this->t('Link text'),
       '#type' => 'textfield',
-    );
+    ];
     // Only offer a feed if we have at least one available feed row style.
     if ($feed_row_options) {
-      $form['displays']['page']['options']['feed'] = array(
+      $form['displays']['page']['options']['feed'] = [
         '#title' => $this->t('Include an RSS feed'),
         '#type' => 'checkbox',
         '#id' => 'edit-page-feed',
-      );
-      $form['displays']['page']['options']['feed_properties'] = array(
+      ];
+      $form['displays']['page']['options']['feed_properties'] = [
         '#type' => 'container',
-        '#states' => array(
-          'visible' => array(
-            ':input[name="page[feed]"]' => array('checked' => TRUE),
-          ),
-        ),
+        '#states' => [
+          'visible' => [
+            ':input[name="page[feed]"]' => ['checked' => TRUE],
+          ],
+        ],
         '#prefix' => '<div id="edit-page-feed-properties-wrapper">',
         '#suffix' => '</div>',
-      );
-      $form['displays']['page']['options']['feed_properties']['path'] = array(
+      ];
+      $form['displays']['page']['options']['feed_properties']['path'] = [
         '#title' => $this->t('Feed path'),
         '#type' => 'textfield',
         '#field_prefix' => $path_prefix,
         // Account for the leading backslash.
         '#maxlength' => 254,
-      );
+      ];
       // This will almost never be visible.
-      $form['displays']['page']['options']['feed_properties']['row_plugin'] = array(
+      $form['displays']['page']['options']['feed_properties']['row_plugin'] = [
         '#title' => $this->t('Feed row style'),
         '#type' => 'select',
         '#options' => $feed_row_options,
         '#default_value' => key($feed_row_options),
         '#access' => (count($feed_row_options) > 1),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="page[feed]"]' => array('checked' => TRUE),
-          ),
-        ),
+        '#states' => [
+          'visible' => [
+            ':input[name="page[feed]"]' => ['checked' => TRUE],
+          ],
+        ],
         '#prefix' => '<div id="edit-page-feed-properties-row-plugin-wrapper">',
         '#suffix' => '</div>',
-      );
+      ];
     }
 
     // Only offer the block settings if the module is enabled.
     if (\Drupal::moduleHandler()->moduleExists('block')) {
-      $form['displays']['block'] = array(
+      $form['displays']['block'] = [
         '#type' => 'fieldset',
         '#title' => $this->t('Block settings'),
-        '#attributes' => array('class' => array('views-attachment', 'fieldset-no-legend')),
+        '#attributes' => ['class' => ['views-attachment', 'fieldset-no-legend']],
         '#tree' => TRUE,
-      );
-      $form['displays']['block']['create'] = array(
+      ];
+      $form['displays']['block']['create'] = [
         '#title' => $this->t('Create a block'),
         '#type' => 'checkbox',
-        '#attributes' => array('class' => array('strong')),
+        '#attributes' => ['class' => ['strong']],
         '#id' => 'edit-block-create',
-      );
+      ];
 
       // All options for the block display are included in this container so
       // they can be hidden as a group when the "Create a block" checkbox is
       // unchecked.
-      $form['displays']['block']['options'] = array(
+      $form['displays']['block']['options'] = [
         '#type' => 'container',
-        '#attributes' => array('class' => array('options-set')),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="block[create]"]' => array('checked' => TRUE),
-          ),
-        ),
+        '#attributes' => ['class' => ['options-set']],
+        '#states' => [
+          'visible' => [
+            ':input[name="block[create]"]' => ['checked' => TRUE],
+          ],
+        ],
         '#prefix' => '<div id="edit-block-wrapper">',
         '#suffix' => '</div>',
-        '#parents' => array('block'),
-      );
+        '#parents' => ['block'],
+      ];
 
-      $form['displays']['block']['options']['title'] = array(
+      $form['displays']['block']['options']['title'] = [
         '#title' => $this->t('Block title'),
         '#type' => 'textfield',
         '#maxlength' => 255,
-      );
-      $form['displays']['block']['options']['style'] = array(
+      ];
+      $form['displays']['block']['options']['style'] = [
         '#type' => 'fieldset',
         '#title' => $this->t('Block display settings'),
-        '#attributes' => array('class' => array('container-inline', 'fieldset-no-legend')),
-      );
+        '#attributes' => ['class' => ['container-inline', 'fieldset-no-legend']],
+      ];
 
       // Create the dropdown for choosing the display format.
-      $form['displays']['block']['options']['style']['style_plugin'] = array(
+      $form['displays']['block']['options']['style']['style_plugin'] = [
         '#title' => $this->t('Display format'),
         '#type' => 'select',
         '#options' => $style_options,
-      );
+      ];
       $style_form = &$form['displays']['block']['options']['style'];
-      $style_form['style_plugin']['#default_value'] = static::getSelected($form_state, array('block', 'style', 'style_plugin'), 'default', $style_form['style_plugin']);
+      $style_form['style_plugin']['#default_value'] = static::getSelected($form_state, ['block', 'style', 'style_plugin'], 'default', $style_form['style_plugin']);
       // Changing this dropdown updates $form['displays']['block']['options']
       // via AJAX.
-      views_ui_add_ajax_trigger($style_form, 'style_plugin', array('displays', 'block', 'options'));
+      views_ui_add_ajax_trigger($style_form, 'style_plugin', ['displays', 'block', 'options']);
 
       $this->buildFormStyle($form, $form_state, 'block');
-      $form['displays']['block']['options']['items_per_page'] = array(
+      $form['displays']['block']['options']['items_per_page'] = [
         '#title' => $this->t('Items per block'),
         '#type' => 'number',
         '#default_value' => 5,
         '#min' => 0,
-      );
-      $form['displays']['block']['options']['pager'] = array(
+      ];
+      $form['displays']['block']['options']['pager'] = [
         '#title' => $this->t('Use a pager'),
         '#type' => 'checkbox',
         '#default_value' => FALSE,
-      );
+      ];
     }
 
     // Only offer the REST export settings if the module is enabled.
     if (\Drupal::moduleHandler()->moduleExists('rest')) {
-      $form['displays']['rest_export'] = array(
+      $form['displays']['rest_export'] = [
         '#type' => 'fieldset',
         '#title' => $this->t('REST export settings'),
-        '#attributes' => array('class' => array('views-attachment', 'fieldset-no-legend')),
+        '#attributes' => ['class' => ['views-attachment', 'fieldset-no-legend']],
         '#tree' => TRUE,
-      );
-      $form['displays']['rest_export']['create'] = array(
+      ];
+      $form['displays']['rest_export']['create'] = [
         '#title' => $this->t('Provide a REST export'),
         '#type' => 'checkbox',
-        '#attributes' => array('class' => array('strong')),
+        '#attributes' => ['class' => ['strong']],
         '#id' => 'edit-rest-export-create',
-      );
+      ];
 
       // All options for the REST export display are included in this container
       // so they can be hidden as a group when the "Provide a REST export"
       // checkbox is unchecked.
-      $form['displays']['rest_export']['options'] = array(
+      $form['displays']['rest_export']['options'] = [
         '#type' => 'container',
-        '#attributes' => array('class' => array('options-set')),
-        '#states' => array(
-          'visible' => array(
-            ':input[name="rest_export[create]"]' => array('checked' => TRUE),
-          ),
-        ),
+        '#attributes' => ['class' => ['options-set']],
+        '#states' => [
+          'visible' => [
+            ':input[name="rest_export[create]"]' => ['checked' => TRUE],
+          ],
+        ],
         '#prefix' => '<div id="edit-rest-export-wrapper">',
         '#suffix' => '</div>',
-        '#parents' => array('rest_export'),
-      );
+        '#parents' => ['rest_export'],
+      ];
 
-      $form['displays']['rest_export']['options']['path'] = array(
+      $form['displays']['rest_export']['options']['path'] = [
         '#title' => $this->t('REST export path'),
         '#type' => 'textfield',
         '#field_prefix' => $path_prefix,
         // Account for the leading backslash.
         '#maxlength' => 254,
-      );
+      ];
     }
 
     return $form;
@@ -561,28 +561,28 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
     $style_plugin = Views::pluginManager('style')->createInstance($style);
     if (isset($style_plugin) && $style_plugin->usesRowPlugin()) {
       $options = $this->rowStyleOptions();
-      $style_form['row_plugin'] = array(
+      $style_form['row_plugin'] = [
         '#type' => 'select',
         '#title' => $this->t('of'),
         '#options' => $options,
         '#access' => count($options) > 1,
-      );
+      ];
       // For the block display, the default value should be "titles (linked)",
       // if it's available (since that's the most common use case).
       $block_with_linked_titles_available = ($type == 'block' && isset($options['titles_linked']));
       $default_value = $block_with_linked_titles_available ? 'titles_linked' : key($options);
-      $style_form['row_plugin']['#default_value'] = static::getSelected($form_state, array($type, 'style', 'row_plugin'), $default_value, $style_form['row_plugin']);
+      $style_form['row_plugin']['#default_value'] = static::getSelected($form_state, [$type, 'style', 'row_plugin'], $default_value, $style_form['row_plugin']);
       // Changing this dropdown updates the individual row options via AJAX.
-      views_ui_add_ajax_trigger($style_form, 'row_plugin', array('displays', $type, 'options', 'style', 'row_options'));
+      views_ui_add_ajax_trigger($style_form, 'row_plugin', ['displays', $type, 'options', 'style', 'row_options']);
 
       // This is the region that can be updated by AJAX. The base class doesn't
       // add anything here, but child classes can.
-      $style_form['row_options'] = array(
-        '#theme_wrappers' => array('container'),
-      );
+      $style_form['row_options'] = [
+        '#theme_wrappers' => ['container'],
+      ];
     }
     elseif ($style_plugin->usesFields()) {
-      $style_form['row_plugin'] = array('#markup' => '<span>' . $this->t('of fields') . '</span>');
+      $style_form['row_plugin'] = ['#markup' => '<span>' . $this->t('of fields') . '</span>'];
     }
   }
 
@@ -594,7 +594,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    */
   protected function rowStyleOptions() {
     // Get all available row plugins by default.
-    $options = Views::fetchPluginNames('row', 'normal', array($this->base_table));
+    $options = Views::fetchPluginNames('row', 'normal', [$this->base_table]);
     return $options;
   }
 
@@ -611,21 +611,21 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
     // If the current base table support bundles and has more than one (like user).
     if (!empty($bundles) && $this->entityType && $this->entityType->hasKey('bundle')) {
       // Get all bundles and their human readable names.
-      $options = array('all' => $this->t('All'));
+      $options = ['all' => $this->t('All')];
       foreach ($bundles as $type => $bundle) {
         $options[$type] = $bundle['label'];
       }
-      $form['displays']['show']['type'] = array(
+      $form['displays']['show']['type'] = [
         '#type' => 'select',
         '#title' => $this->t('of type'),
         '#options' => $options,
-      );
-      $selected_bundle = static::getSelected($form_state, array('show', 'type'), 'all', $form['displays']['show']['type']);
+      ];
+      $selected_bundle = static::getSelected($form_state, ['show', 'type'], 'all', $form['displays']['show']['type']);
       $form['displays']['show']['type']['#default_value'] = $selected_bundle;
       // Changing this dropdown updates the entire content of $form['displays']
       // via AJAX, since each bundle might have entirely different fields
       // attached to it, etc.
-      views_ui_add_ajax_trigger($form['displays']['show'], 'type', array('displays'));
+      views_ui_add_ajax_trigger($form['displays']['show'], 'type', ['displays']);
     }
   }
 
@@ -635,16 +635,16 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    * By default, this adds a "sorted by [date]" filter (when it is available).
    */
   protected function buildSorts(&$form, FormStateInterface $form_state) {
-    $sorts = array(
+    $sorts = [
       'none' => $this->t('Unsorted'),
-    );
+    ];
     // Check if we are allowed to sort by creation date.
     $created_column = $this->getCreatedColumn();
     if ($created_column) {
-      $sorts += array(
+      $sorts += [
         $created_column . ':DESC' => $this->t('Newest first'),
         $created_column . ':ASC' => $this->t('Oldest first'),
-      );
+      ];
     }
     if ($available_sorts = $this->getAvailableSorts()) {
       $sorts += $available_sorts;
@@ -652,12 +652,12 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
 
     // If there is no sorts option available continue.
     if (!empty($sorts)) {
-      $form['displays']['show']['sort'] = array(
+      $form['displays']['show']['sort'] = [
         '#type' => 'select',
         '#title' => $this->t('sorted by'),
         '#options' => $sorts,
         '#default_value' => isset($created_column) ? $created_column . ':DESC' : 'none',
-      );
+      ];
     }
   }
 
@@ -669,13 +669,13 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    */
   protected function instantiateView($form, FormStateInterface $form_state) {
     // Build the basic view properties and create the view.
-    $values = array(
+    $values = [
       'id' => $form_state->getValue('id'),
       'label' => $form_state->getValue('label'),
       'description' => $form_state->getValue('description'),
       'base_table' => $this->base_table,
       'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
-    );
+    ];
 
     $view = View::create($values);
 
@@ -702,25 +702,25 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
   protected function buildDisplayOptions($form, FormStateInterface $form_state) {
     // Display: Master
     $display_options['default'] = $this->defaultDisplayOptions();
-    $display_options['default'] += array(
-      'filters' => array(),
-      'sorts' => array(),
-    );
+    $display_options['default'] += [
+      'filters' => [],
+      'sorts' => [],
+    ];
     $display_options['default']['filters'] += $this->defaultDisplayFilters($form, $form_state);
     $display_options['default']['sorts'] += $this->defaultDisplaySorts($form, $form_state);
 
     // Display: Page
-    if (!$form_state->isValueEmpty(array('page', 'create'))) {
+    if (!$form_state->isValueEmpty(['page', 'create'])) {
       $display_options['page'] = $this->pageDisplayOptions($form, $form_state);
 
       // Display: Feed (attached to the page)
-      if (!$form_state->isValueEmpty(array('page', 'feed'))) {
+      if (!$form_state->isValueEmpty(['page', 'feed'])) {
         $display_options['feed'] = $this->pageFeedDisplayOptions($form, $form_state);
       }
     }
 
     // Display: Block
-    if (!$form_state->isValueEmpty(array('block', 'create'))) {
+    if (!$form_state->isValueEmpty(['block', 'create'])) {
       $display_options['block'] = $this->blockDisplayOptions($form, $form_state);
     }
 
@@ -812,7 +812,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *   Returns an array of display options.
    */
   protected function defaultDisplayOptions() {
-    $display_options = array();
+    $display_options = [];
     $display_options['access']['type'] = 'none';
     $display_options['cache']['type'] = 'tag';
     $display_options['query']['type'] = 'views_query';
@@ -823,7 +823,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
 
     // Add default options array to each plugin type.
     foreach ($display_options as &$options) {
-      $options['options'] = array();
+      $options['options'] = [];
     }
 
     // Add a least one field so the view validates and the user has a preview.
@@ -849,14 +849,14 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
     }
     // @todo Refactor the code to use ViewExecutable::addHandler. See
     //   https://www.drupal.org/node/2383157.
-    $display_options['fields'][$default_field] = array(
+    $display_options['fields'][$default_field] = [
       'table' => $default_table,
       'field' => $default_field,
       'id' => $default_field,
       'entity_type' => isset($data[$default_field]['entity type']) ? $data[$default_field]['entity type'] : NULL,
       'entity_field' => isset($data[$default_field]['entity field']) ? $data[$default_field]['entity field'] : NULL,
       'plugin_id' => $data[$default_field]['field']['id'],
-    );
+    ];
 
     return $display_options;
   }
@@ -877,7 +877,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *   accepted by a filter handler.
    */
   protected function defaultDisplayFilters($form, FormStateInterface $form_state) {
-    $filters = array();
+    $filters = [];
 
     // Add any filters provided by the plugin.
     foreach ($this->getFilters() as $name => $info) {
@@ -903,9 +903,9 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *   accepted by a filter handler.
    */
   protected function defaultDisplayFiltersUser(array $form, FormStateInterface $form_state) {
-    $filters = array();
+    $filters = [];
 
-    if (($type = $form_state->getValue(array('show', 'type'))) && $type != 'all') {
+    if (($type = $form_state->getValue(['show', 'type'])) && $type != 'all') {
       $bundle_key = $this->entityType->getKey('bundle');
       // Figure out the table where $bundle_key lives. It may not be the same as
       // the base table for the view; the taxonomy vocabulary machine_name, for
@@ -928,14 +928,14 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
       $handler = $table_data[$bundle_key]['filter']['id'];
       $handler_definition = Views::pluginManager('filter')->getDefinition($handler);
       if ($handler == 'in_operator' || is_subclass_of($handler_definition['class'], 'Drupal\\views\\Plugin\\views\\filter\\InOperator')) {
-        $value = array($type => $type);
+        $value = [$type => $type];
       }
       // Otherwise, use just a single value.
       else {
         $value = $type;
       }
 
-      $filters[$bundle_key] = array(
+      $filters[$bundle_key] = [
         'id' => $bundle_key,
         'table' => $table,
         'field' => $bundle_key,
@@ -943,7 +943,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
         'entity_type' => isset($table_data['table']['entity type']) ? $table_data['table']['entity type'] : NULL,
         'entity_field' => isset($table_data[$bundle_key]['entity field']) ? $table_data[$bundle_key]['entity field'] : NULL,
         'plugin_id' => $handler,
-      );
+      ];
     }
 
     return $filters;
@@ -965,7 +965,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *   accepted by a sort handler.
    */
   protected function defaultDisplaySorts($form, FormStateInterface $form_state) {
-    $sorts = array();
+    $sorts = [];
 
     // Add any sorts provided by the plugin.
     foreach ($this->getSorts() as $name => $info) {
@@ -991,11 +991,11 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *   accepted by a sort handler.
    */
   protected function defaultDisplaySortsUser($form, FormStateInterface $form_state) {
-    $sorts = array();
+    $sorts = [];
 
     // Don't add a sort if there is no form value or the user set the sort to
     // 'none'.
-    if (($sort_type = $form_state->getValue(array('show', 'sort'))) && $sort_type != 'none') {
+    if (($sort_type = $form_state->getValue(['show', 'sort'])) && $sort_type != 'none') {
       list($column, $sort) = explode(':', $sort_type);
       // Column either be a column-name or the table-column-name.
       $column = explode('-', $column);
@@ -1014,7 +1014,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
       // enabled.
       $data = Views::viewsData()->get($table);
       if (isset($data[$column]['sort'])) {
-        $sorts[$column] = array(
+        $sorts[$column] = [
           'id' => $column,
           'table' => $table,
           'field' => $column,
@@ -1022,7 +1022,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
           'entity_type' => isset($data['table']['entity type']) ? $data['table']['entity type'] : NULL,
           'entity_field' => isset($data[$column]['entity field']) ? $data[$column]['entity field'] : NULL,
           'plugin_id' => $data[$column]['sort']['id'],
-       );
+       ];
       }
     }
 
@@ -1041,15 +1041,15 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *   Returns an array of display options.
    */
   protected function pageDisplayOptions(array $form, FormStateInterface $form_state) {
-    $display_options = array();
+    $display_options = [];
     $page = $form_state->getValue('page');
     $display_options['title'] = $page['title'];
     $display_options['path'] = $page['path'];
-    $display_options['style'] = array('type' => $page['style']['style_plugin']);
+    $display_options['style'] = ['type' => $page['style']['style_plugin']];
     // Not every style plugin supports row style plugins.
     // Make sure that the selected row plugin is a valid one.
     $options = $this->rowStyleOptions();
-    $display_options['row'] = array('type' => (isset($page['style']['row_plugin']) && isset($options[$page['style']['row_plugin']])) ? $page['style']['row_plugin'] : 'fields');
+    $display_options['row'] = ['type' => (isset($page['style']['row_plugin']) && isset($options[$page['style']['row_plugin']])) ? $page['style']['row_plugin'] : 'fields'];
 
     // If the specific 0 items per page, use no pager.
     if (empty($page['items_per_page'])) {
@@ -1087,12 +1087,12 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *   Returns an array of display options.
    */
   protected function blockDisplayOptions(array $form, FormStateInterface $form_state) {
-    $display_options = array();
+    $display_options = [];
     $block = $form_state->getValue('block');
     $display_options['title'] = $block['title'];
-    $display_options['style'] = array('type' => $block['style']['style_plugin']);
+    $display_options['style'] = ['type' => $block['style']['style_plugin']];
     $options = $this->rowStyleOptions();
-    $display_options['row'] = array('type' => (isset($block['style']['row_plugin']) && isset($options[$block['style']['row_plugin']])) ? $block['style']['row_plugin'] : 'fields');
+    $display_options['row'] = ['type' => (isset($block['style']['row_plugin']) && isset($options[$block['style']['row_plugin']])) ? $block['style']['row_plugin'] : 'fields'];
     $display_options['pager']['type'] = $block['pager'] ? 'full' : (empty($block['items_per_page']) ? 'none' : 'some');
     $display_options['pager']['options']['items_per_page'] = $block['items_per_page'];
     return $display_options;
@@ -1110,9 +1110,9 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *   Returns an array of display options.
    */
   protected function restExportDisplayOptions(array $form, FormStateInterface $form_state) {
-    $display_options = array();
+    $display_options = [];
     $display_options['path'] = $form_state->getValue(['rest_export', 'path']);
-    $display_options['style'] = array('type' => 'serializer');
+    $display_options['style'] = ['type' => 'serializer'];
 
     return $display_options;
   }
@@ -1129,16 +1129,16 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    *   Returns an array of display options.
    */
   protected function pageFeedDisplayOptions($form, FormStateInterface $form_state) {
-    $display_options = array();
+    $display_options = [];
     $display_options['pager']['type'] = 'some';
-    $display_options['style'] = array('type' => 'rss');
-    $display_options['row'] = array('type' => $form_state->getValue(array('page', 'feed_properties', 'row_plugin')));
-    $display_options['path'] = $form_state->getValue(array('page', 'feed_properties', 'path'));
-    $display_options['title'] = $form_state->getValue(array('page', 'title'));
-    $display_options['displays'] = array(
+    $display_options['style'] = ['type' => 'rss'];
+    $display_options['row'] = ['type' => $form_state->getValue(['page', 'feed_properties', 'row_plugin'])];
+    $display_options['path'] = $form_state->getValue(['page', 'feed_properties', 'path']);
+    $display_options['title'] = $form_state->getValue(['page', 'title']);
+    $display_options['displays'] = [
       'default' => 'default',
       'page_1' => 'page_1',
-    );
+    ];
     return $display_options;
   }
 
@@ -1221,7 +1221,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
    * @param bool $unset
    *   Should the view be removed from the list of validated views.
    *
-   * @return \Drupal\views_ui\ViewUI $view
+   * @return \Drupal\views_ui\ViewUI
    *   The validated view object.
    */
   protected function retrieveValidatedView(array $form, FormStateInterface $form_state, $unset = TRUE) {
diff --git a/web/core/modules/views/src/ResultRow.php b/web/core/modules/views/src/ResultRow.php
index 39febcf6d..da55038fc 100644
--- a/web/core/modules/views/src/ResultRow.php
+++ b/web/core/modules/views/src/ResultRow.php
@@ -34,7 +34,7 @@ class ResultRow {
    * @param array $values
    *   (optional) An array of values to add as properties on the object.
    */
-  public function __construct(array $values = array()) {
+  public function __construct(array $values = []) {
     foreach ($values as $key => $value) {
       $this->{$key} = $value;
     }
diff --git a/web/core/modules/views/src/Routing/ViewPageController.php b/web/core/modules/views/src/Routing/ViewPageController.php
index dc9153c4b..772103d37 100644
--- a/web/core/modules/views/src/Routing/ViewPageController.php
+++ b/web/core/modules/views/src/Routing/ViewPageController.php
@@ -22,9 +22,9 @@ class ViewPageController {
    * @return null|void
    */
   public function handle($view_id, $display_id, RouteMatchInterface $route_match) {
-    $args = array();
+    $args = [];
     $route = $route_match->getRouteObject();
-    $map = $route->hasOption('_view_argument_map') ? $route->getOption('_view_argument_map') : array();
+    $map = $route->hasOption('_view_argument_map') ? $route->getOption('_view_argument_map') : [];
 
     foreach ($map as $attribute => $parameter_name) {
       // Allow parameters be pulled from the request.
diff --git a/web/core/modules/views/src/Tests/DefaultViewsTest.php b/web/core/modules/views/src/Tests/DefaultViewsTest.php
index 5c1f601b2..48e3caeb3 100644
--- a/web/core/modules/views/src/Tests/DefaultViewsTest.php
+++ b/web/core/modules/views/src/Tests/DefaultViewsTest.php
@@ -29,18 +29,18 @@ class DefaultViewsTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('views', 'node', 'search', 'comment', 'taxonomy', 'block', 'user');
+  public static $modules = ['views', 'node', 'search', 'comment', 'taxonomy', 'block', 'user'];
 
   /**
    * An array of argument arrays to use for default views.
    *
    * @var array
    */
-  protected $viewArgMap = array(
-    'backlinks' => array(1),
-    'taxonomy_term' => array(1),
-    'glossary' => array('all'),
-  );
+  protected $viewArgMap = [
+    'backlinks' => [1],
+    'taxonomy_term' => [1],
+    'glossary' => ['all'],
+  ];
 
   protected function setUp() {
     parent::setUp();
@@ -48,7 +48,7 @@ class DefaultViewsTest extends ViewTestBase {
     $this->drupalPlaceBlock('page_title_block');
 
     // Create Basic page node type.
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
     $vocabulary = Vocabulary::create([
       'name' => $this->randomMachineName(),
@@ -56,7 +56,7 @@ class DefaultViewsTest extends ViewTestBase {
       'vid' => Unicode::strtolower($this->randomMachineName()),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'help' => '',
-      'nodes' => array('page' => 'page'),
+      'nodes' => ['page' => 'page'],
       'weight' => mt_rand(0, 10),
     ]);
     $vocabulary->save();
@@ -64,12 +64,12 @@ class DefaultViewsTest extends ViewTestBase {
     // Create a field.
     $field_name = Unicode::strtolower($this->randomMachineName());
 
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $vocabulary->id() => $vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', 'page', $field_name, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     // Create a time in the past for the archive.
@@ -81,7 +81,7 @@ class DefaultViewsTest extends ViewTestBase {
       $user = $this->drupalCreateUser();
       $term = $this->createTerm($vocabulary);
 
-      $values = array('created' => $time, 'type' => 'page');
+      $values = ['created' => $time, 'type' => 'page'];
       $values[$field_name][]['target_id'] = $term->id();
 
       // Make every other node promoted.
@@ -92,19 +92,19 @@ class DefaultViewsTest extends ViewTestBase {
 
       $node = $this->drupalCreateNode($values);
 
-      $comment = array(
+      $comment = [
         'uid' => $user->id(),
         'status' => CommentInterface::PUBLISHED,
         'entity_id' => $node->id(),
         'entity_type' => 'node',
         'field_name' => 'comment'
-      );
+      ];
       Comment::create($comment)->save();
     }
 
     // Some views, such as the "Who's Online" view, only return results if at
     // least one user is logged in.
-    $account = $this->drupalCreateUser(array());
+    $account = $this->drupalCreateUser([]);
     $this->drupalLogin($account);
   }
 
@@ -127,14 +127,14 @@ class DefaultViewsTest extends ViewTestBase {
           $view->preExecute($this->viewArgMap[$name]);
         }
 
-        $this->assert(TRUE, format_string('View @view will be executed.', array('@view' => $view->storage->id())));
+        $this->assert(TRUE, format_string('View @view will be executed.', ['@view' => $view->storage->id()]));
         $view->execute();
 
-        $tokens = array('@name' => $name, '@display_id' => $display_id);
+        $tokens = ['@name' => $name, '@display_id' => $display_id];
         $this->assertTrue($view->executed, format_string('@name:@display_id has been executed.', $tokens));
 
         $count = count($view->result);
-        $this->assertTrue($count > 0, format_string('@count results returned', array('@count' => $count)));
+        $this->assertTrue($count > 0, format_string('@count results returned', ['@count' => $count]));
         $view->destroy();
       }
     }
@@ -143,7 +143,7 @@ class DefaultViewsTest extends ViewTestBase {
   /**
    * Returns a new term with random properties in vocabulary $vid.
    */
-  function createTerm($vocabulary) {
+  public function createTerm($vocabulary) {
     $filter_formats = filter_formats();
     $format = array_pop($filter_formats);
     $term = Term::create([
@@ -164,49 +164,49 @@ class DefaultViewsTest extends ViewTestBase {
   public function testArchiveView() {
     // Create additional nodes compared to the one in the setup method.
     // Create two nodes in the same month, and one in each following month.
-    $node = array(
+    $node = [
       'created' => 280299600, // Sun, 19 Nov 1978 05:00:00 GMT
-    );
+    ];
     $this->drupalCreateNode($node);
     $this->drupalCreateNode($node);
-    $node = array(
+    $node = [
       'created' => 282891600, // Tue, 19 Dec 1978 05:00:00 GMT
-    );
+    ];
     $this->drupalCreateNode($node);
-    $node = array(
+    $node = [
       'created' => 285570000, // Fri, 19 Jan 1979 05:00:00 GMT
-    );
+    ];
     $this->drupalCreateNode($node);
 
     $view = Views::getView('archive');
     $view->setDisplay('page_1');
     $this->executeView($view);
-    $columns = array('nid', 'created_year_month', 'num_records');
+    $columns = ['nid', 'created_year_month', 'num_records'];
     $column_map = array_combine($columns, $columns);
     // Create time of additional nodes created in the setup method.
     $created_year_month = date('Ym', REQUEST_TIME - 3600);
-    $expected_result = array(
-      array(
+    $expected_result = [
+      [
         'nid' => 1,
         'created_year_month' => $created_year_month,
         'num_records' => 11,
-      ),
-      array(
+      ],
+      [
         'nid' => 15,
         'created_year_month' => 197901,
         'num_records' => 1,
-      ),
-      array(
+      ],
+      [
         'nid' => 14,
         'created_year_month' => 197812,
         'num_records' => 1,
-      ),
-      array(
+      ],
+      [
         'nid' => 12,
         'created_year_month' => 197811,
         'num_records' => 2,
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $column_map);
 
     $view->storage->setStatus(TRUE);
diff --git a/web/core/modules/views/src/Tests/Entity/BaseFieldAccessTest.php b/web/core/modules/views/src/Tests/Entity/BaseFieldAccessTest.php
index db1110d47..698a43e79 100644
--- a/web/core/modules/views/src/Tests/Entity/BaseFieldAccessTest.php
+++ b/web/core/modules/views/src/Tests/Entity/BaseFieldAccessTest.php
@@ -18,7 +18,7 @@ class BaseFieldAccessTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_entity_test_protected_access');
+  public static $testViews = ['test_entity_test_protected_access'];
 
   /**
    * Modules to enable
@@ -38,7 +38,7 @@ class BaseFieldAccessTest extends ViewTestBase {
     $update_manager = $this->container->get('entity.definition_update_manager');
     \Drupal::entityManager()->clearCachedDefinitions();
     $update_manager->applyUpdates();
-    ViewTestData::createTestViews(get_class($this), array('comment_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['comment_test_views']);
     \Drupal::state()->set('entity_test.views_data', [
       'entity_test' => [
         'test_text_access' => [
diff --git a/web/core/modules/views/src/Tests/Entity/FieldEntityTest.php b/web/core/modules/views/src/Tests/Entity/FieldEntityTest.php
index 215b631ba..89f71edf0 100644
--- a/web/core/modules/views/src/Tests/Entity/FieldEntityTest.php
+++ b/web/core/modules/views/src/Tests/Entity/FieldEntityTest.php
@@ -24,14 +24,14 @@ class FieldEntityTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_field_get_entity');
+  public static $testViews = ['test_field_get_entity'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'comment');
+  public static $modules = ['node', 'comment'];
 
   /**
    * {@inheritdoc}
@@ -39,10 +39,10 @@ class FieldEntityTest extends ViewTestBase {
   protected function setUp($import_test_views = TRUE) {
     parent::setUp(FALSE);
 
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     $this->addDefaultCommentField('node', 'page');
 
-    ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+    ViewTestData::createTestViews(get_class($this), ['views_test_config']);
   }
 
   /**
@@ -61,12 +61,12 @@ class FieldEntityTest extends ViewTestBase {
       'title' => $this->randomString(),
     ]);
     $node->save();
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'uid' => $account->id(),
       'entity_id' => $node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment'
-    ));
+    ]);
     $comment->save();
 
     $user = $this->drupalCreateUser(['access comments']);
diff --git a/web/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php b/web/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php
index 589c4dc02..f099569b8 100644
--- a/web/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php
+++ b/web/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php
@@ -19,14 +19,14 @@ class FilterEntityBundleTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_entity_type_filter');
+  public static $testViews = ['test_entity_type_filter'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * Entity bundle data.
@@ -40,15 +40,15 @@ class FilterEntityBundleTest extends ViewTestBase {
    *
    * @var array
    */
-  protected $entities = array();
+  protected $entities = [];
 
   protected function setUp() {
     parent::setUp(FALSE);
 
-    $this->drupalCreateContentType(array('type' => 'test_bundle'));
-    $this->drupalCreateContentType(array('type' => 'test_bundle_2'));
+    $this->drupalCreateContentType(['type' => 'test_bundle']);
+    $this->drupalCreateContentType(['type' => 'test_bundle_2']);
 
-    ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+    ViewTestData::createTestViews(get_class($this), ['views_test_config']);
 
     $this->entityBundles = $this->container->get('entity_type.bundle.info')->getBundleInfo('node');
 
@@ -92,7 +92,7 @@ class FilterEntityBundleTest extends ViewTestBase {
     $this->assertEqual(count($view->result), $this->entities['count']);
 
     // Test the valueOptions of the filter handler.
-    $expected = array();
+    $expected = [];
 
     foreach ($this->entityBundles as $key => $info) {
       $expected[$key] = $info['label'];
@@ -106,7 +106,7 @@ class FilterEntityBundleTest extends ViewTestBase {
       // Test each bundle type.
       $view->initDisplay();
       $filters = $view->display_handler->getOption('filters');
-      $filters['type']['value'] = array($key => $key);
+      $filters['type']['value'] = [$key => $key];
       $view->display_handler->setOption('filters', $filters);
       $this->executeView($view);
 
@@ -118,7 +118,7 @@ class FilterEntityBundleTest extends ViewTestBase {
     // Test an invalid bundle type to make sure we have no results.
     $view->initDisplay();
     $filters = $view->display_handler->getOption('filters');
-    $filters['type']['value'] = array('type_3' => 'type_3');
+    $filters['type']['value'] = ['type_3' => 'type_3'];
     $view->display_handler->setOption('filters', $filters);
     $this->executeView($view);
 
diff --git a/web/core/modules/views/src/Tests/Entity/ViewNonTranslatableEntityTest.php b/web/core/modules/views/src/Tests/Entity/ViewNonTranslatableEntityTest.php
index df6f7d4da..82c683995 100644
--- a/web/core/modules/views/src/Tests/Entity/ViewNonTranslatableEntityTest.php
+++ b/web/core/modules/views/src/Tests/Entity/ViewNonTranslatableEntityTest.php
@@ -18,12 +18,12 @@ class ViewNonTranslatableEntityTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'entity_test',
     'content_translation',
     'language_test',
     'views_ui',
-  );
+  ];
 
   /**
    * Tests displaying a view of non-translatable entities.
diff --git a/web/core/modules/views/src/Tests/FieldApiDataTest.php b/web/core/modules/views/src/Tests/FieldApiDataTest.php
index 3fd8a03fa..0e1569592 100644
--- a/web/core/modules/views/src/Tests/FieldApiDataTest.php
+++ b/web/core/modules/views/src/Tests/FieldApiDataTest.php
@@ -19,12 +19,12 @@ class FieldApiDataTest extends FieldTestBase {
     $field_names = $this->setUpFieldStorages(1);
 
     // Attach the field to nodes only.
-    $field = array(
+    $field = [
       'field_name' => $field_names[0],
       'entity_type' => 'node',
       'bundle' => 'page',
       'label' => 'GiraffeA" label'
-    );
+    ];
     FieldConfig::create($field)->save();
 
     // Attach the same field to a different bundle with a different label.
@@ -38,9 +38,9 @@ class FieldApiDataTest extends FieldTestBase {
 
     // Now create some example nodes/users for the view result.
     for ($i = 0; $i < 5; $i++) {
-      $edit = array(
-        $field_names[0] => array((array('value' => $this->randomMachineName()))),
-      );
+      $edit = [
+        $field_names[0] => [(['value' => $this->randomMachineName()])],
+      ];
       $nodes[] = $this->drupalCreateNode($edit);
     }
   }
@@ -50,7 +50,7 @@ class FieldApiDataTest extends FieldTestBase {
    *
    * We check data structure for both node and node revision tables.
    */
-  function testViewsData() {
+  public function testViewsData() {
     $table_mapping = \Drupal::entityManager()->getStorage('node')->getTableMapping();
     $field_storage = $this->fieldStorages[0];
     $current_table = $table_mapping->getDedicatedDataTableName($field_storage);
@@ -63,25 +63,25 @@ class FieldApiDataTest extends FieldTestBase {
     $this->assertTrue(isset($data[$current_table]['table']['join']['node_field_data']));
     $this->assertTrue(isset($data[$revision_table]['table']['join']['node_field_revision']));
 
-    $expected_join = array(
+    $expected_join = [
       'table' => $current_table,
       'left_field' => 'nid',
       'field' => 'entity_id',
-      'extra' => array(
-        array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE),
-        array('left_field' => 'langcode', 'field' => 'langcode'),
-      ),
-    );
+      'extra' => [
+        ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE],
+        ['left_field' => 'langcode', 'field' => 'langcode'],
+      ],
+    ];
     $this->assertEqual($expected_join, $data[$current_table]['table']['join']['node_field_data']);
-    $expected_join = array(
+    $expected_join = [
       'table' => $revision_table,
       'left_field' => 'vid',
       'field' => 'revision_id',
-      'extra' => array(
-        array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE),
-        array('left_field' => 'langcode', 'field' => 'langcode'),
-      ),
-    );
+      'extra' => [
+        ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE],
+        ['left_field' => 'langcode', 'field' => 'langcode'],
+      ],
+    ];
     $this->assertEqual($expected_join, $data[$revision_table]['table']['join']['node_field_revision']);
 
     // Test click sortable.
@@ -124,7 +124,7 @@ class FieldApiDataTest extends FieldTestBase {
    */
   protected function getViewsData() {
     $views_data = $this->container->get('views.views_data');
-    $data = array();
+    $data = [];
 
     // Check the table and the joins of the first field.
     // Attached to node only.
diff --git a/web/core/modules/views/src/Tests/GlossaryTest.php b/web/core/modules/views/src/Tests/GlossaryTest.php
index 508a4ebc0..b1657687d 100644
--- a/web/core/modules/views/src/Tests/GlossaryTest.php
+++ b/web/core/modules/views/src/Tests/GlossaryTest.php
@@ -21,7 +21,7 @@ class GlossaryTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * Tests the default glossary view.
@@ -29,19 +29,19 @@ class GlossaryTest extends ViewTestBase {
   public function testGlossaryView() {
     // Create a content type and add some nodes, with a non-random title.
     $type = $this->drupalCreateContentType();
-    $nodes_per_char = array(
+    $nodes_per_char = [
       'd' => 1,
       'r' => 4,
       'u' => 10,
       'p' => 2,
       'a' => 3,
       'l' => 6,
-    );
+    ];
     $nodes_by_char = [];
     foreach ($nodes_per_char as $char => $count) {
-      $setting = array(
+      $setting = [
         'type' => $type->id()
-      );
+      ];
       for ($i = 0; $i < $count; $i++) {
         $node = $setting;
         $node['title'] = $char . $this->randomString(3);
@@ -95,6 +95,7 @@ class GlossaryTest extends ViewTestBase {
         'node_list',
         'user:0',
         'user_list',
+        'http_response',
         'rendered',
         // FinishResponseSubscriber adds this cache tag to responses that have the
         // 'user.permissions' cache context for anonymous users.
@@ -110,10 +111,10 @@ class GlossaryTest extends ViewTestBase {
       $label = Unicode::strtoupper($char);
       // Get the summary link for a certain character. Filter by label and href
       // to ensure that both of them are correct.
-      $result = $this->xpath('//a[contains(@href, :href) and normalize-space(text())=:label]/..', array(':href' => $href, ':label' => $label));
+      $result = $this->xpath('//a[contains(@href, :href) and normalize-space(text())=:label]/..', [':href' => $href, ':label' => $label]);
       $this->assertTrue(count($result));
       // The rendered output looks like "| (count)" so let's figure out the int.
-      $result_count = trim(str_replace(array('|', '(', ')'), '', (string) $result[0]));
+      $result_count = trim(str_replace(['|', '(', ')'], '', (string) $result[0]));
       $this->assertEqual($result_count, $count, 'The expected number got rendered.');
     }
   }
diff --git a/web/core/modules/views/src/Tests/Handler/AreaHTTPStatusCodeTest.php b/web/core/modules/views/src/Tests/Handler/AreaHTTPStatusCodeTest.php
index 86d1f992a..2656adc4d 100644
--- a/web/core/modules/views/src/Tests/Handler/AreaHTTPStatusCodeTest.php
+++ b/web/core/modules/views/src/Tests/Handler/AreaHTTPStatusCodeTest.php
@@ -17,14 +17,14 @@ class AreaHTTPStatusCodeTest extends HandlerTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_http_status_code');
+  public static $testViews = ['test_http_status_code'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * Tests the area handler.
diff --git a/web/core/modules/views/src/Tests/Handler/AreaTest.php b/web/core/modules/views/src/Tests/Handler/AreaTest.php
index 454ab58d0..ca9fc422d 100644
--- a/web/core/modules/views/src/Tests/Handler/AreaTest.php
+++ b/web/core/modules/views/src/Tests/Handler/AreaTest.php
@@ -19,14 +19,14 @@ class AreaTest extends HandlerTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_example_area', 'test_example_area_access');
+  public static $testViews = ['test_example_area', 'test_example_area_access'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'views_ui');
+  public static $modules = ['node', 'views_ui'];
 
   protected function setUp() {
     parent::setUp();
@@ -36,13 +36,13 @@ class AreaTest extends HandlerTestBase {
 
   protected function viewsData() {
     $data = parent::viewsData();
-    $data['views']['test_example'] = array(
+    $data['views']['test_example'] = [
       'title' => 'Test Example area',
       'help' => 'A area handler which just exists for tests.',
-      'area' => array(
+      'area' => [
         'id' => 'test_example'
-      )
-    );
+      ]
+    ];
 
     return $data;
   }
@@ -52,21 +52,21 @@ class AreaTest extends HandlerTestBase {
    * Tests the generic UI of a area handler.
    */
   public function testUI() {
-    $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
     $this->drupalLogin($admin_user);
 
-    $types = array('header', 'footer', 'empty');
-    $labels = array();
+    $types = ['header', 'footer', 'empty'];
+    $labels = [];
     foreach ($types as $type) {
       $edit_path = 'admin/structure/views/nojs/handler/test_example_area/default/' . $type . '/test_example';
 
       // First setup an empty label.
-      $this->drupalPostForm($edit_path, array(), t('Apply'));
+      $this->drupalPostForm($edit_path, [], t('Apply'));
       $this->assertText('Test Example area');
 
       // Then setup a no empty label.
       $labels[$type] = $this->randomMachineName();
-      $this->drupalPostForm($edit_path, array('options[admin_label]' => $labels[$type]), t('Apply'));
+      $this->drupalPostForm($edit_path, ['options[admin_label]' => $labels[$type]], t('Apply'));
       // Make sure that the new label appears on the site.
       $this->assertText($labels[$type]);
 
@@ -188,7 +188,7 @@ class AreaTest extends HandlerTestBase {
    * Tests global tokens.
    */
   public function testRenderAreaToken() {
-    $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
     $this->drupalLogin($admin_user);
 
     $view = Views::getView('test_example_area');
@@ -204,7 +204,7 @@ class AreaTest extends HandlerTestBase {
 
     // Test the list of available tokens.
     $available = $empty_handler->getAvailableGlobalTokens();
-    foreach (array('site', 'view') as $type) {
+    foreach (['site', 'view'] as $type) {
       $this->assertTrue(!empty($available[$type]) && is_array($available[$type]));
       // Test that each item exists in the list.
       foreach ($available[$type] as $token => $info) {
@@ -230,8 +230,8 @@ class AreaTest extends HandlerTestBase {
     $view->initDisplay('page_1');
 
     // Add the title area handler to the empty area.
-    $view->displayHandlers->get('page_1')->overrideOption('empty', array(
-      'title' => array(
+    $view->displayHandlers->get('page_1')->overrideOption('empty', [
+      'title' => [
         'id' => 'title',
         'table' => 'views',
         'field' => 'title',
@@ -239,8 +239,8 @@ class AreaTest extends HandlerTestBase {
         'empty' => '0',
         'title' => 'Overridden title',
         'plugin_id' => 'title',
-      ),
-    ));
+      ],
+    ]);
 
     $view->storage->enable()->save();
 
diff --git a/web/core/modules/views/src/Tests/Handler/ArgumentStringTest.php b/web/core/modules/views/src/Tests/Handler/ArgumentStringTest.php
index e47b1a362..0682892e8 100644
--- a/web/core/modules/views/src/Tests/Handler/ArgumentStringTest.php
+++ b/web/core/modules/views/src/Tests/Handler/ArgumentStringTest.php
@@ -16,26 +16,26 @@ class ArgumentStringTest extends HandlerTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_glossary');
+  public static $testViews = ['test_glossary'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * Tests the glossary feature.
    */
-  function testGlossary() {
+  public function testGlossary() {
     // Setup some nodes, one with a, two with b and three with c.
     $counter = 1;
-    foreach (array('a', 'b', 'c') as $char) {
+    foreach (['a', 'b', 'c'] as $char) {
       for ($i = 0; $i < $counter; $i++) {
-        $edit = array(
+        $edit = [
           'title' => $char . $this->randomMachineName(),
-        );
+        ];
         $this->drupalCreateNode($edit);
       }
     }
diff --git a/web/core/modules/views/src/Tests/Handler/FieldDropButtonTest.php b/web/core/modules/views/src/Tests/Handler/FieldDropButtonTest.php
index f2082f0a2..9d5c67fa7 100644
--- a/web/core/modules/views/src/Tests/Handler/FieldDropButtonTest.php
+++ b/web/core/modules/views/src/Tests/Handler/FieldDropButtonTest.php
@@ -15,14 +15,14 @@ class FieldDropButtonTest extends HandlerTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_dropbutton');
+  public static $testViews = ['test_dropbutton'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * {@inheritdoc}
@@ -39,16 +39,16 @@ class FieldDropButtonTest extends HandlerTestBase {
    */
   public function testDropbutton() {
     // Create some test nodes.
-    $nodes = array();
+    $nodes = [];
     for ($i = 0; $i < 5; $i++) {
       $nodes[] = $this->drupalCreateNode();
     }
 
     $this->drupalGet('test-dropbutton');
     foreach ($nodes as $node) {
-      $result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', array(':path' => '/node/' . $node->id(), ':title' => $node->label()));
+      $result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', [':path' => '/node/' . $node->id(), ':title' => $node->label()]);
       $this->assertEqual(count($result), 1, 'Just one node title link was found.');
-      $result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', array(':path' => '/node/' . $node->id(), ':title' => t('Custom Text')));
+      $result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', [':path' => '/node/' . $node->id(), ':title' => t('Custom Text')]);
       $this->assertEqual(count($result), 1, 'Just one custom link was found.');
     }
 
diff --git a/web/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php b/web/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
index e76d54e34..7efd1d741 100644
--- a/web/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
+++ b/web/core/modules/views/src/Tests/Handler/FieldEntityOperationsTest.php
@@ -18,16 +18,16 @@ class FieldEntityOperationsTest extends HandlerTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_entity_operations');
+  public static $testViews = ['test_entity_operations'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'language', 'views_ui');
+  public static $modules = ['node', 'language', 'views_ui'];
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
 
     // Create Article content type.
@@ -46,7 +46,7 @@ class FieldEntityOperationsTest extends HandlerTestBase {
 
     // Create some test entities. Every other entity is Hungarian while all
     // have a Spanish translation.
-    $entities = array();
+    $entities = [];
     for ($i = 0; $i < 5; $i++) {
       $entity = Node::create([
         'title' => $this->randomString(),
@@ -60,7 +60,7 @@ class FieldEntityOperationsTest extends HandlerTestBase {
       $entities[$i] = $entity;
     }
 
-    $admin_user = $this->drupalCreateUser(array('access administration pages', 'administer nodes', 'bypass node access'));
+    $admin_user = $this->drupalCreateUser(['access administration pages', 'administer nodes', 'bypass node access']);
     $this->drupalLogin($this->rootUser);
     $this->drupalGet('test-entity-operations');
     /** @var $entity \Drupal\entity_test\Entity\EntityTest */
@@ -72,8 +72,8 @@ class FieldEntityOperationsTest extends HandlerTestBase {
         $this->assertTrue(count($operations) > 0, 'There are operations.');
         foreach ($operations as $operation) {
           $expected_destination = Url::fromUri('internal:/test-entity-operations')->toString();
-          $result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[@href=:path and text()=:title]', array(':path' => $operation['url']->toString() . '?destination=' . $expected_destination, ':title' => $operation['title']));
-          $this->assertEqual(count($result), 1, t('Found entity @operation link with destination parameter.', array('@operation' => $operation['title'])));
+          $result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[@href=:path and text()=:title]', [':path' => $operation['url']->toString() . '?destination=' . $expected_destination, ':title' => $operation['title']]);
+          $this->assertEqual(count($result), 1, t('Found entity @operation link with destination parameter.', ['@operation' => $operation['title']]));
           // Entities which were created in Hungarian should link to the Hungarian
           // edit form, others to the English one (which has no path prefix here).
           $base_path = \Drupal::request()->getBasePath();
diff --git a/web/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php b/web/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
index 4a37b58eb..2521e6329 100644
--- a/web/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
+++ b/web/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
@@ -11,7 +11,7 @@ use Drupal\field\Entity\FieldStorageConfig;
 /**
  * Tests the "Display all values in the same row" setting.
  *
- * @see \Drupal\views\Plugin\views\field\Field
+ * @see \Drupal\views\Plugin\views\field\EntityField
  *
  * @group views
  */
@@ -22,14 +22,14 @@ class FieldGroupRowsTest extends HandlerTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_group_rows', 'test_ungroup_rows');
+  public static $testViews = ['test_group_rows', 'test_ungroup_rows'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'field_test');
+  public static $modules = ['node', 'field_test'];
 
   /**
    * Field that will be created to test the group/ungroup rows functionality
@@ -42,22 +42,22 @@ class FieldGroupRowsTest extends HandlerTestBase {
     parent::setUp();
 
     // Create content type with unlimited text field.
-    $node_type = $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
+    $node_type = $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
 
     // Create the unlimited text field.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
         'field_name' => $this->fieldName,
         'entity_type' => 'node',
         'type' => 'text',
         'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-      ));
+      ]);
     $field_storage->save();
 
     // Create an instance of the text field on the content type.
-    $field = array(
+    $field = [
       'field_storage' => $field_storage,
       'bundle' => $node_type->id(),
-    );
+    ];
     FieldConfig::create($field)->save();
   }
 
@@ -68,10 +68,10 @@ class FieldGroupRowsTest extends HandlerTestBase {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
 
-    $edit = array(
+    $edit = [
       'title' => $this->randomMachineName(),
-      $this->fieldName => array('a', 'b', 'c'),
-    );
+      $this->fieldName => ['a', 'b', 'c'],
+    ];
     $this->drupalCreateNode($edit);
 
     $view = Views::getView('test_group_rows');
diff --git a/web/core/modules/views/src/Tests/Handler/FieldWebTest.php b/web/core/modules/views/src/Tests/Handler/FieldWebTest.php
index e85206985..31de7be7e 100644
--- a/web/core/modules/views/src/Tests/Handler/FieldWebTest.php
+++ b/web/core/modules/views/src/Tests/Handler/FieldWebTest.php
@@ -25,7 +25,7 @@ class FieldWebTest extends HandlerTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view', 'test_field_classes', 'test_field_output', 'test_click_sort');
+  public static $testViews = ['test_view', 'test_field_classes', 'test_field_output', 'test_click_sort'];
 
   /**
    * {@inheritdoc}
@@ -37,9 +37,9 @@ class FieldWebTest extends HandlerTestBase {
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'views_test_data_name' => 'name',
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
@@ -97,7 +97,7 @@ class FieldWebTest extends HandlerTestBase {
    */
   protected function clickSortLoadIdsFromOutput() {
     $fields = $this->xpath("//td[contains(@class, 'views-field-id')]");
-    $ids = array();
+    $ids = [];
     foreach ($fields as $field) {
       $ids[] = (int) $field[0];
     }
@@ -174,14 +174,14 @@ class FieldWebTest extends HandlerTestBase {
    *   format and return values see the SimpleXML documentation,
    *   http://php.net/manual/function.simplexml-element-xpath.php.
    */
-  protected function xpathContent($content, $xpath, array $arguments = array()) {
+  protected function xpathContent($content, $xpath, array $arguments = []) {
     if ($elements = $this->parseContent($content)) {
       $xpath = $this->buildXPathQuery($xpath, $arguments);
       $result = $elements->xpath($xpath);
       // Some combinations of PHP / libxml versions return an empty array
       // instead of the documented FALSE. Forcefully convert any falsish values
       // to an empty array to allow foreach(...) constructions.
-      return $result ? $result : array();
+      return $result ? $result : [];
     }
     else {
       return FALSE;
@@ -224,7 +224,7 @@ class FieldWebTest extends HandlerTestBase {
 
     // Some generic test code adapted from the UrlTest class, which tests
     // mostly the different options for the path.
-    foreach (array(FALSE, TRUE) as $absolute) {
+    foreach ([FALSE, TRUE] as $absolute) {
       $alter = &$id_field->options['alter'];
       $alter['path'] = 'node/123';
 
@@ -258,7 +258,7 @@ class FieldWebTest extends HandlerTestBase {
 
       // @todo The route-based URL generator strips out NULL attributes.
       // $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => NULL], 'fragment' => 'bar', 'absolute' => $absolute]);
-      $expected_result = Url::fromUserInput('/node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute))->toString();
+      $expected_result = Url::fromUserInput('/node/123', ['query' => ['foo' => NULL], 'fragment' => 'bar', 'absolute' => $absolute])->toString();
       $alter['path'] = 'node/123?foo#bar';
       $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
         return $id_field->theme($row);
@@ -345,7 +345,7 @@ class FieldWebTest extends HandlerTestBase {
     $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
       return $id_field->theme($row);
     });
-    $elements = $this->xpathContent($output, '//a[contains(@class, :class)]', array(':class' => $class));
+    $elements = $this->xpathContent($output, '//a[contains(@class, :class)]', [':class' => $class]);
     $this->assertTrue($elements);
     // @fixme link_class, alt, rel cannot be unset, which should be fixed.
     $id_field->options['alter']['link_class'] = '';
@@ -355,7 +355,7 @@ class FieldWebTest extends HandlerTestBase {
     $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
       return $id_field->theme($row);
     });
-    $elements = $this->xpathContent($output, '//a[contains(@title, :alt)]', array(':alt' => $rel));
+    $elements = $this->xpathContent($output, '//a[contains(@title, :alt)]', [':alt' => $rel]);
     $this->assertTrue($elements);
     $id_field->options['alter']['alt'] = '';
 
@@ -364,7 +364,7 @@ class FieldWebTest extends HandlerTestBase {
     $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
       return $id_field->theme($row);
     });
-    $elements = $this->xpathContent($output, '//a[contains(@rel, :rel)]', array(':rel' => $rel));
+    $elements = $this->xpathContent($output, '//a[contains(@rel, :rel)]', [':rel' => $rel]);
     $this->assertTrue($elements);
     $id_field->options['alter']['rel'] = '';
 
@@ -373,7 +373,7 @@ class FieldWebTest extends HandlerTestBase {
     $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
       return $id_field->theme($row);
     });
-    $elements = $this->xpathContent($output, '//a[contains(@target, :target)]', array(':target' => $target));
+    $elements = $this->xpathContent($output, '//a[contains(@target, :target)]', [':target' => $target]);
     $this->assertTrue($elements);
     unset($id_field->options['alter']['target']);
   }
@@ -395,81 +395,81 @@ class FieldWebTest extends HandlerTestBase {
     $id_field->options['label'] = $this->randomMachineName();
     $output = $view->preview();
     $output = $renderer->renderRoot($output);
-    $this->assertFalse($this->xpathContent($output, '//div[contains(@class, :class)]', array(':class' => 'field-content')));
-    $this->assertFalse($this->xpathContent($output, '//div[contains(@class, :class)]', array(':class' => 'field__label')));
+    $this->assertFalse($this->xpathContent($output, '//div[contains(@class, :class)]', [':class' => 'field-content']));
+    $this->assertFalse($this->xpathContent($output, '//div[contains(@class, :class)]', [':class' => 'field__label']));
 
     $id_field->options['element_default_classes'] = TRUE;
     $output = $view->preview();
     $output = $renderer->renderRoot($output);
     // Per default the label and the element of the field are spans.
-    $this->assertTrue($this->xpathContent($output, '//span[contains(@class, :class)]', array(':class' => 'field-content')));
-    $this->assertTrue($this->xpathContent($output, '//span[contains(@class, :class)]', array(':class' => 'views-label')));
-    $this->assertTrue($this->xpathContent($output, '//div[contains(@class, :class)]', array(':class' => 'views-field')));
+    $this->assertTrue($this->xpathContent($output, '//span[contains(@class, :class)]', [':class' => 'field-content']));
+    $this->assertTrue($this->xpathContent($output, '//span[contains(@class, :class)]', [':class' => 'views-label']));
+    $this->assertTrue($this->xpathContent($output, '//div[contains(@class, :class)]', [':class' => 'views-field']));
 
     // Tests the element wrapper classes/element.
     $random_class = $this->randomMachineName();
 
     // Set some common wrapper element types and see whether they appear with and without a custom class set.
-    foreach (array('h1', 'span', 'p', 'div') as $element_type) {
+    foreach (['h1', 'span', 'p', 'div'] as $element_type) {
       $id_field->options['element_wrapper_type'] = $element_type;
 
       // Set a custom wrapper element css class.
       $id_field->options['element_wrapper_class'] = $random_class;
       $output = $view->preview();
       $output = $renderer->renderRoot($output);
-      $this->assertTrue($this->xpathContent($output, "//{$element_type}[contains(@class, :class)]", array(':class' => $random_class)));
+      $this->assertTrue($this->xpathContent($output, "//{$element_type}[contains(@class, :class)]", [':class' => $random_class]));
 
       // Set no custom css class.
       $id_field->options['element_wrapper_class'] = '';
       $output = $view->preview();
       $output = $renderer->renderRoot($output);
-      $this->assertFalse($this->xpathContent($output, "//{$element_type}[contains(@class, :class)]", array(':class' => $random_class)));
+      $this->assertFalse($this->xpathContent($output, "//{$element_type}[contains(@class, :class)]", [':class' => $random_class]));
       $this->assertTrue($this->xpathContent($output, "//li[contains(@class, views-row)]/{$element_type}"));
     }
 
     // Tests the label class/element.
 
     // Set some common label element types and see whether they appear with and without a custom class set.
-    foreach (array('h1', 'span', 'p', 'div') as $element_type) {
+    foreach (['h1', 'span', 'p', 'div'] as $element_type) {
       $id_field->options['element_label_type'] = $element_type;
 
       // Set a custom label element css class.
       $id_field->options['element_label_class'] = $random_class;
       $output = $view->preview();
       $output = $renderer->renderRoot($output);
-      $this->assertTrue($this->xpathContent($output, "//li[contains(@class, views-row)]//{$element_type}[contains(@class, :class)]", array(':class' => $random_class)));
+      $this->assertTrue($this->xpathContent($output, "//li[contains(@class, views-row)]//{$element_type}[contains(@class, :class)]", [':class' => $random_class]));
 
       // Set no custom css class.
       $id_field->options['element_label_class'] = '';
       $output = $view->preview();
       $output = $renderer->renderRoot($output);
-      $this->assertFalse($this->xpathContent($output, "//li[contains(@class, views-row)]//{$element_type}[contains(@class, :class)]", array(':class' => $random_class)));
+      $this->assertFalse($this->xpathContent($output, "//li[contains(@class, views-row)]//{$element_type}[contains(@class, :class)]", [':class' => $random_class]));
       $this->assertTrue($this->xpathContent($output, "//li[contains(@class, views-row)]//{$element_type}"));
     }
 
     // Tests the element classes/element.
 
     // Set some common element element types and see whether they appear with and without a custom class set.
-    foreach (array('h1', 'span', 'p', 'div') as $element_type) {
+    foreach (['h1', 'span', 'p', 'div'] as $element_type) {
       $id_field->options['element_type'] = $element_type;
 
       // Set a custom label element css class.
       $id_field->options['element_class'] = $random_class;
       $output = $view->preview();
       $output = $renderer->renderRoot($output);
-      $this->assertTrue($this->xpathContent($output, "//li[contains(@class, views-row)]//div[contains(@class, views-field)]//{$element_type}[contains(@class, :class)]", array(':class' => $random_class)));
+      $this->assertTrue($this->xpathContent($output, "//li[contains(@class, views-row)]//div[contains(@class, views-field)]//{$element_type}[contains(@class, :class)]", [':class' => $random_class]));
 
       // Set no custom css class.
       $id_field->options['element_class'] = '';
       $output = $view->preview();
       $output = $renderer->renderRoot($output);
-      $this->assertFalse($this->xpathContent($output, "//li[contains(@class, views-row)]//div[contains(@class, views-field)]//{$element_type}[contains(@class, :class)]", array(':class' => $random_class)));
+      $this->assertFalse($this->xpathContent($output, "//li[contains(@class, views-row)]//div[contains(@class, views-field)]//{$element_type}[contains(@class, :class)]", [':class' => $random_class]));
       $this->assertTrue($this->xpathContent($output, "//li[contains(@class, views-row)]//div[contains(@class, views-field)]//{$element_type}"));
     }
 
     // Tests the available html elements.
     $element_types = $id_field->getElements();
-    $expected_elements = array(
+    $expected_elements = [
       '',
       0,
       'div',
@@ -484,7 +484,7 @@ class FieldWebTest extends HandlerTestBase {
       'strong',
       'em',
       'marquee'
-    );
+    ];
 
     $this->assertEqual(array_keys($element_types), $expected_elements);
   }
@@ -560,14 +560,14 @@ class FieldWebTest extends HandlerTestBase {
     $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
       return $name_field->advancedRender($row);
     });
-    $this->assertSubString($output, $trimmed_name, format_string('Make sure the trimmed output (@trimmed) appears in the rendered output (@output).', array('@trimmed' => $trimmed_name, '@output' => $output)));
-    $this->assertNotSubString($output, $row->views_test_data_name, format_string("Make sure the untrimmed value (@untrimmed) shouldn't appear in the rendered output (@output).", array('@untrimmed' => $row->views_test_data_name, '@output' => $output)));
+    $this->assertSubString($output, $trimmed_name, format_string('Make sure the trimmed output (@trimmed) appears in the rendered output (@output).', ['@trimmed' => $trimmed_name, '@output' => $output]));
+    $this->assertNotSubString($output, $row->views_test_data_name, format_string("Make sure the untrimmed value (@untrimmed) shouldn't appear in the rendered output (@output).", ['@untrimmed' => $row->views_test_data_name, '@output' => $output]));
 
     $name_field->options['alter']['max_length'] = 9;
     $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
       return $name_field->advancedRender($row);
     });
-    $this->assertSubString($output, $trimmed_name, format_string('Make sure the untrimmed (@untrimmed) output appears in the rendered output  (@output).', array('@trimmed' => $trimmed_name, '@output' => $output)));
+    $this->assertSubString($output, $trimmed_name, format_string('Make sure the untrimmed (@untrimmed) output appears in the rendered output  (@output).', ['@trimmed' => $trimmed_name, '@output' => $output]));
 
     // Take word_boundary into account for the tests.
     $name_field->options['alter']['max_length'] = 5;
@@ -575,34 +575,34 @@ class FieldWebTest extends HandlerTestBase {
     $random_text_2 = $this->randomMachineName(2);
     $random_text_4 = $this->randomMachineName(4);
     $random_text_8 = $this->randomMachineName(8);
-    $tuples = array(
+    $tuples = [
       // Create one string which doesn't fit at all into the limit.
-      array(
+      [
         'value' => $random_text_8,
         'trimmed_value' => '',
         'trimmed' => TRUE
-      ),
+      ],
       // Create one string with two words which doesn't fit both into the limit.
-      array(
+      [
         'value' => $random_text_8 . ' ' . $random_text_8,
         'trimmed_value' => '',
         'trimmed' => TRUE
-      ),
+      ],
       // Create one string which contains of two words, of which only the first
       // fits into the limit.
-      array(
+      [
         'value' => $random_text_4 . ' ' . $random_text_8,
         'trimmed_value' => $random_text_4,
         'trimmed' => TRUE
-      ),
+      ],
       // Create one string which contains of two words, of which both fits into
       // the limit.
-      array(
+      [
         'value' => $random_text_2 . ' ' . $random_text_2,
         'trimmed_value' => $random_text_2 . ' ' . $random_text_2,
         'trimmed' => FALSE
-      )
-    );
+      ]
+    ];
 
     foreach ($tuples as $tuple) {
       $row->views_test_data_name = $tuple['value'];
@@ -611,10 +611,10 @@ class FieldWebTest extends HandlerTestBase {
       });
 
       if ($tuple['trimmed']) {
-        $this->assertNotSubString($output, $tuple['value'], format_string('The untrimmed value (@untrimmed) should not appear in the trimmed output (@output).', array('@untrimmed' => $tuple['value'], '@output' => $output)));
+        $this->assertNotSubString($output, $tuple['value'], format_string('The untrimmed value (@untrimmed) should not appear in the trimmed output (@output).', ['@untrimmed' => $tuple['value'], '@output' => $output]));
       }
       if (!empty($tuple['trimmed_value'])) {
-        $this->assertSubString($output, $tuple['trimmed_value'], format_string('The trimmed value (@trimmed) should appear in the trimmed output (@output).', array('@trimmed' => $tuple['trimmed_value'], '@output' => $output)));
+        $this->assertSubString($output, $tuple['trimmed_value'], format_string('The trimmed value (@trimmed) should appear in the trimmed output (@output).', ['@trimmed' => $tuple['trimmed_value'], '@output' => $output]));
       }
     }
 
@@ -629,14 +629,14 @@ class FieldWebTest extends HandlerTestBase {
       return $name_field->advancedRender($row);
     });
     $this->assertSubString($output, $more_text, 'Make sure a read more text is displayed if the output got trimmed');
-    $this->assertTrue($this->xpathContent($output, '//a[contains(@href, :path)]', array(':path' => $more_path)), 'Make sure the read more link points to the right destination.');
+    $this->assertTrue($this->xpathContent($output, '//a[contains(@href, :path)]', [':path' => $more_path]), 'Make sure the read more link points to the right destination.');
 
     $name_field->options['alter']['more_link'] = FALSE;
     $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
       return $name_field->advancedRender($row);
     });
     $this->assertNotSubString($output, $more_text, 'Make sure no read more text appears.');
-    $this->assertFalse($this->xpathContent($output, '//a[contains(@href, :path)]', array(':path' => $more_path)), 'Make sure no read more link appears.');
+    $this->assertFalse($this->xpathContent($output, '//a[contains(@href, :path)]', [':path' => $more_path]), 'Make sure no read more link appears.');
 
     // Check for the ellipses.
     $row->views_test_data_name = $this->randomMachineName(8);
diff --git a/web/core/modules/views/src/Tests/Handler/FilterDateTest.php b/web/core/modules/views/src/Tests/Handler/FilterDateTest.php
index 2045b8aff..f81e753d6 100644
--- a/web/core/modules/views/src/Tests/Handler/FilterDateTest.php
+++ b/web/core/modules/views/src/Tests/Handler/FilterDateTest.php
@@ -2,6 +2,10 @@
 
 namespace Drupal\views\Tests\Handler;
 
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\node\Entity\NodeType;
 use Drupal\views\Views;
 
 /**
@@ -10,33 +14,57 @@ use Drupal\views\Views;
  * @group views
  */
 class FilterDateTest extends HandlerTestBase {
+  use SchemaCheckTestTrait;
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_filter_date_between');
+  public static $testViews = ['test_filter_date_between'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'views_ui');
+  public static $modules = ['node', 'views_ui', 'datetime'];
 
   protected function setUp() {
     parent::setUp();
-    // Add some basic test nodes.
-    $this->nodes = array();
-    $this->nodes[] = $this->drupalCreateNode(array('created' => 100000));
-    $this->nodes[] = $this->drupalCreateNode(array('created' => 200000));
-    $this->nodes[] = $this->drupalCreateNode(array('created' => 300000));
-    $this->nodes[] = $this->drupalCreateNode(array('created' => time() + 86400));
 
-    $this->map = array(
+    // Add a date field so we can test datetime handling.
+    NodeType::create([
+      'type' => 'page',
+      'name' => 'Page',
+    ])->save();
+
+    // Setup a field storage and field, but also change the views data for the
+    // entity_test entity type.
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => 'field_date',
+      'type' => 'datetime',
+      'entity_type' => 'node',
+    ]);
+    $field_storage->save();
+
+    $field = FieldConfig::create([
+      'field_name' => 'field_date',
+      'entity_type' => 'node',
+      'bundle' => 'page',
+    ]);
+    $field->save();
+
+    // Add some basic test nodes.
+    $this->nodes = [];
+    $this->nodes[] = $this->drupalCreateNode(['created' => 100000, 'field_date' => 10000]);
+    $this->nodes[] = $this->drupalCreateNode(['created' => 200000, 'field_date' => 20000]);
+    $this->nodes[] = $this->drupalCreateNode(['created' => 300000, 'field_date' => 30000]);
+    $this->nodes[] = $this->drupalCreateNode(['created' => time() + 86400, 'field_date' => time() + 86400]);
+
+    $this->map = [
       'nid' => 'nid',
-    );
+    ];
   }
 
   /**
@@ -46,6 +74,8 @@ class FilterDateTest extends HandlerTestBase {
     $this->_testOffset();
     $this->_testBetween();
     $this->_testUiValidation();
+    $this->_testFilterDateUI();
+    $this->_testFilterDatetimeUI();
   }
 
   /**
@@ -60,9 +90,9 @@ class FilterDateTest extends HandlerTestBase {
     $view->filter['created']->value['type'] = 'offset';
     $view->filter['created']->value['value'] = '+1 hour';
     $view->executeDisplay('default');
-    $expected_result = array(
-      array('nid' => $this->nodes[3]->id()),
-    );
+    $expected_result = [
+      ['nid' => $this->nodes[3]->id()],
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $this->map);
     $view->destroy();
 
@@ -73,9 +103,9 @@ class FilterDateTest extends HandlerTestBase {
     $view->filter['created']->value['max'] = '+2 days';
     $view->filter['created']->value['min'] = '+1 hour';
     $view->executeDisplay('default');
-    $expected_result = array(
-      array('nid' => $this->nodes[3]->id()),
-    );
+    $expected_result = [
+      ['nid' => $this->nodes[3]->id()],
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $this->map);
   }
 
@@ -91,9 +121,9 @@ class FilterDateTest extends HandlerTestBase {
     $view->filter['created']->value['min'] = format_date(150000, 'custom', 'Y-m-d H:i:s');
     $view->filter['created']->value['max'] = format_date(200000, 'custom', 'Y-m-d H:i:s');
     $view->executeDisplay('default');
-    $expected_result = array(
-      array('nid' => $this->nodes[1]->id()),
-    );
+    $expected_result = [
+      ['nid' => $this->nodes[1]->id()],
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $this->map);
     $view->destroy();
 
@@ -102,10 +132,10 @@ class FilterDateTest extends HandlerTestBase {
     $view->filter['created']->operator = 'between';
     $view->filter['created']->value['max'] = format_date(200000, 'custom', 'Y-m-d H:i:s');
     $view->executeDisplay('default');
-    $expected_result = array(
-      array('nid' => $this->nodes[0]->id()),
-      array('nid' => $this->nodes[1]->id()),
-    );
+    $expected_result = [
+      ['nid' => $this->nodes[0]->id()],
+      ['nid' => $this->nodes[1]->id()],
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $this->map);
     $view->destroy();
 
@@ -116,10 +146,10 @@ class FilterDateTest extends HandlerTestBase {
     $view->filter['created']->value['max'] = format_date(200000, 'custom', 'Y-m-d H:i:s');
 
     $view->executeDisplay('default');
-    $expected_result = array(
-      array('nid' => $this->nodes[2]->id()),
-      array('nid' => $this->nodes[3]->id()),
-    );
+    $expected_result = [
+      ['nid' => $this->nodes[2]->id()],
+      ['nid' => $this->nodes[3]->id()],
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $this->map);
     $view->destroy();
 
@@ -128,10 +158,10 @@ class FilterDateTest extends HandlerTestBase {
     $view->filter['created']->operator = 'not between';
     $view->filter['created']->value['max'] = format_date(200000, 'custom', 'Y-m-d H:i:s');
     $view->executeDisplay('default');
-    $expected_result = array(
-      array('nid' => $this->nodes[2]->id()),
-      array('nid' => $this->nodes[3]->id()),
-    );
+    $expected_result = [
+      ['nid' => $this->nodes[2]->id()],
+      ['nid' => $this->nodes[3]->id()],
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $this->map);
   }
 
@@ -140,16 +170,144 @@ class FilterDateTest extends HandlerTestBase {
    */
   protected function _testUiValidation() {
 
-    $this->drupalLogin($this->drupalCreateUser(array('administer views', 'administer site configuration')));
+    $this->drupalLogin($this->drupalCreateUser(['administer views', 'administer site configuration']));
 
     $this->drupalGet('admin/structure/views/view/test_filter_date_between/edit');
     $this->drupalGet('admin/structure/views/nojs/handler/test_filter_date_between/default/filter/created');
 
-    $edit = array();
+    $edit = [];
     // Generate a definitive wrong value, which should be checked by validation.
     $edit['options[value][value]'] = $this->randomString() . '-------';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
     $this->assertText(t('Invalid date format.'), 'Make sure that validation is run and the invalidate date format is identified.');
   }
 
+  /**
+   * Test date filter UI.
+   */
+  protected function _testFilterDateUI() {
+    $this->drupalLogin($this->drupalCreateUser(['administer views']));
+    $this->drupalGet('admin/structure/views/nojs/handler/test_filter_date_between/default/filter/created');
+    $this->drupalPostForm(NULL, [], t('Expose filter'));
+    $this->drupalPostForm(NULL, [], t('Grouped filters'));
+
+    $edit = [];
+    $edit['options[group_info][group_items][1][title]'] = 'simple-offset';
+    $edit['options[group_info][group_items][1][operator]'] = '>';
+    $edit['options[group_info][group_items][1][value][type]'] = 'offset';
+    $edit['options[group_info][group_items][1][value][value]'] = '+1 hour';
+    $edit['options[group_info][group_items][2][title]'] = 'between-offset';
+    $edit['options[group_info][group_items][2][operator]'] = 'between';
+    $edit['options[group_info][group_items][2][value][type]'] = 'offset';
+    $edit['options[group_info][group_items][2][value][min]'] = '+1 hour';
+    $edit['options[group_info][group_items][2][value][max]'] = '+2 days';
+    $edit['options[group_info][group_items][3][title]'] = 'between-date';
+    $edit['options[group_info][group_items][3][operator]'] = 'between';
+    $edit['options[group_info][group_items][3][value][min]'] = format_date(150000, 'custom', 'Y-m-d H:i:s');
+    $edit['options[group_info][group_items][3][value][max]'] = format_date(250000, 'custom', 'Y-m-d H:i:s');
+
+    $this->drupalPostForm(NULL, $edit, t('Apply'));
+
+    $this->drupalGet('admin/structure/views/nojs/handler/test_filter_date_between/default/filter/created');
+    foreach ($edit as $name => $value) {
+      $this->assertFieldByName($name, $value);
+      if (strpos($name, '[value][type]')) {
+        $radio = $this->cssSelect('input[name="' . $name . '"][checked="checked"][type="radio"]');
+        $this->assertEqual((string) $radio[0]['value'], $value);
+      }
+    }
+
+    $this->drupalPostForm('admin/structure/views/view/test_filter_date_between', [], t('Save'));
+    $this->assertConfigSchemaByName('views.view.test_filter_date_between');
+
+    // Test that the exposed filter works as expected.
+    $this->drupalGet('admin/structure/views/view/test_filter_date_between/edit');
+    $this->drupalPostForm(NULL, [], t('Update preview'));
+    $results = $this->cssSelect('.view-content .field-content');
+    $this->assertEqual(count($results), 4);
+    $this->drupalPostForm(NULL, ['created' => '1'], t('Update preview'));
+    $results = $this->cssSelect('.view-content .field-content');
+    $this->assertEqual(count($results), 1);
+    $this->assertEqual((string) $results[0], $this->nodes[3]->id());
+    $this->drupalPostForm(NULL, ['created' => '2'], t('Update preview'));
+    $results = $this->cssSelect('.view-content .field-content');
+    $this->assertEqual(count($results), 1);
+    $this->assertEqual((string) $results[0], $this->nodes[3]->id());
+    $this->drupalPostForm(NULL, ['created' => '3'], t('Update preview'));
+    $results = $this->cssSelect('.view-content .field-content');
+    $this->assertEqual(count($results), 1);
+    $this->assertEqual((string) $results[0], $this->nodes[1]->id());
+
+    // Change the filter to a single filter to test the schema when the operator
+    // is not exposed.
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_filter_date_between/default/filter/created', [], t('Single filter'));
+    $edit = [];
+    $edit['options[operator]'] = '>';
+    $edit['options[value][type]'] = 'date';
+    $edit['options[value][value]'] = format_date(350000, 'custom', 'Y-m-d H:i:s');
+    $this->drupalPostForm(NULL, $edit, t('Apply'));
+    $this->drupalPostForm('admin/structure/views/view/test_filter_date_between', [], t('Save'));
+    $this->assertConfigSchemaByName('views.view.test_filter_date_between');
+
+    // Test that the filter works as expected.
+    $this->drupalPostForm(NULL, [], t('Update preview'));
+    $results = $this->cssSelect('.view-content .field-content');
+    $this->assertEqual(count($results), 1);
+    $this->assertEqual((string) $results[0], $this->nodes[3]->id());
+    $this->drupalPostForm(NULL, ['created' => format_date(250000, 'custom', 'Y-m-d H:i:s')], t('Update preview'));
+    $results = $this->cssSelect('.view-content .field-content');
+    $this->assertEqual(count($results), 2);
+    $this->assertEqual((string) $results[0], $this->nodes[2]->id());
+    $this->assertEqual((string) $results[1], $this->nodes[3]->id());
+  }
+
+  /**
+   * Test datetime grouped filter UI.
+   */
+  protected function _testFilterDatetimeUI() {
+    $this->drupalLogin($this->drupalCreateUser(['administer views']));
+    $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_filter_date_between/default/filter', ['name[node__field_date.field_date_value]' => 'node__field_date.field_date_value'], t('Add and configure filter criteria'));
+
+    $this->drupalPostForm(NULL, [], t('Expose filter'));
+    $this->drupalPostForm(NULL, [], t('Grouped filters'));
+
+    $edit = [];
+    $edit['options[group_info][group_items][1][title]'] = 'simple-offset';
+    $edit['options[group_info][group_items][1][operator]'] = '>';
+    $edit['options[group_info][group_items][1][value][type]'] = 'offset';
+    $edit['options[group_info][group_items][1][value][value]'] = '+1 hour';
+    $edit['options[group_info][group_items][2][title]'] = 'between-offset';
+    $edit['options[group_info][group_items][2][operator]'] = 'between';
+    $edit['options[group_info][group_items][2][value][type]'] = 'offset';
+    $edit['options[group_info][group_items][2][value][min]'] = '+1 hour';
+    $edit['options[group_info][group_items][2][value][max]'] = '+2 days';
+    $edit['options[group_info][group_items][3][title]'] = 'between-date';
+    $edit['options[group_info][group_items][3][operator]'] = 'between';
+    $edit['options[group_info][group_items][3][value][min]'] = format_date(150000, 'custom', 'Y-m-d H:i:s');
+    $edit['options[group_info][group_items][3][value][max]'] = format_date(250000, 'custom', 'Y-m-d H:i:s');
+
+    $this->drupalPostForm(NULL, $edit, t('Apply'));
+
+    $this->drupalPostForm('admin/structure/views/view/test_filter_date_between', [], t('Save'));
+    $this->assertConfigSchemaByName('views.view.test_filter_date_between');
+  }
+
+  /**
+   * Tests that the exposed date filter is displayed without errors.
+   */
+  public function testExposedFilter() {
+    $this->drupalLogin($this->drupalCreateUser(['administer views']));
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_filter_date_between/default/filter/created', [], t('Expose filter'));
+    $this->drupalPostForm('admin/structure/views/view/test_filter_date_between/edit', [], t('Add Page'));
+    $edit = [
+      'path' => 'exposed-date-filter',
+    ];
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_filter_date_between/page_1/path', $edit, t('Apply'));
+
+    $this->drupalPostForm(NULL, [], t('Save'));
+
+    $this->drupalGet('exposed-date-filter');
+    $this->assertField('created');
+  }
+
 }
diff --git a/web/core/modules/views/src/Tests/Handler/HandlerAllTest.php b/web/core/modules/views/src/Tests/Handler/HandlerAllTest.php
index c15ce57e8..565437657 100644
--- a/web/core/modules/views/src/Tests/Handler/HandlerAllTest.php
+++ b/web/core/modules/views/src/Tests/Handler/HandlerAllTest.php
@@ -22,7 +22,7 @@ class HandlerAllTest extends HandlerTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'aggregator',
     'book',
     'block',
@@ -40,13 +40,13 @@ class HandlerAllTest extends HandlerTestBase {
     'statistics',
     'taxonomy',
     'user',
-  );
+  ];
 
   /**
    * Tests most of the handlers.
    */
   public function testHandlers() {
-    $this->drupalCreateContentType(array('type' => 'article'));
+    $this->drupalCreateContentType(['type' => 'article']);
     $this->addDefaultCommentField('node', 'article');
 
     $object_types = array_keys(ViewExecutable::getHandlerTypes());
@@ -55,7 +55,7 @@ class HandlerAllTest extends HandlerTestBase {
         continue;
       }
 
-      $view = View::create(array('base_table' => $base_table));
+      $view = View::create(['base_table' => $base_table]);
       $view = $view->getExecutable();
 
       // @todo The groupwise relationship is currently broken.
@@ -66,18 +66,18 @@ class HandlerAllTest extends HandlerTestBase {
       foreach ($info as $field => $field_info) {
         // Table is a reserved key for the metainformation.
         if ($field != 'table' && !in_array("$base_table:$field", $exclude)) {
-          $item = array(
+          $item = [
             'table' => $base_table,
             'field' => $field,
-          );
+          ];
           foreach ($object_types as $type) {
             if (isset($field_info[$type]['id'])) {
-              $options = array();
+              $options = [];
               if ($type == 'filter') {
                 $handler = $this->container->get("plugin.manager.views.$type")->getHandler($item);
                 // Set the value to use for the filter based on the filter type.
                 if ($handler instanceof InOperator) {
-                  $options['value'] = array(1);
+                  $options['value'] = [1];
                 }
                 else {
                   $options['value'] = 1;
@@ -102,10 +102,10 @@ class HandlerAllTest extends HandlerTestBase {
           foreach ($view->{$type} as $handler) {
             $this->assertTrue($handler instanceof HandlerBase, format_string(
               '@type handler of class %class is an instance of HandlerBase',
-              array(
+              [
                 '@type' => $type,
                 '%class' => get_class($handler),
-              )));
+              ]));
           }
         }
       }
diff --git a/web/core/modules/views/src/Tests/Handler/HandlerTest.php b/web/core/modules/views/src/Tests/Handler/HandlerTest.php
index 8ff4033b5..e07beb383 100644
--- a/web/core/modules/views/src/Tests/Handler/HandlerTest.php
+++ b/web/core/modules/views/src/Tests/Handler/HandlerTest.php
@@ -23,18 +23,18 @@ class HandlerTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view', 'test_view_handler_weight', 'test_handler_relationships', 'test_handler_test_access', 'test_filter_in_operator_ui');
+  public static $testViews = ['test_view', 'test_view_handler_weight', 'test_handler_relationships', 'test_handler_test_access', 'test_filter_in_operator_ui'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'comment', 'node');
+  public static $modules = ['views_ui', 'comment', 'node'];
 
   protected function setUp() {
     parent::setUp();
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     $this->addDefaultCommentField('node', 'page');
     $this->enableViewsTestModule();
   }
@@ -56,7 +56,7 @@ class HandlerTest extends ViewTestBase {
         $data['views_test_data']['access_callback'][$type]['access callback'] = 'views_test_data_handler_test_access_callback';
 
         $data['views_test_data']['access_callback_arguments'][$type]['access callback'] = 'views_test_data_handler_test_access_callback_argument';
-        $data['views_test_data']['access_callback_arguments'][$type]['access arguments'] = array(TRUE);
+        $data['views_test_data']['access_callback_arguments'][$type]['access arguments'] = [TRUE];
       }
     }
 
@@ -68,45 +68,45 @@ class HandlerTest extends ViewTestBase {
    */
   public function testBreakString() {
     // Check defaults.
-    $this->assertEqual((object) array('value' => array(), 'operator' => NULL), HandlerBase::breakString(''));
+    $this->assertEqual((object) ['value' => [], 'operator' => NULL], HandlerBase::breakString(''));
 
     // Test ors
     $handler = HandlerBase::breakString('word1 word2+word');
-    $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
+    $this->assertEqualValue(['word1', 'word2', 'word'], $handler);
     $this->assertEqual('or', $handler->operator);
     $handler = HandlerBase::breakString('word1+word2+word');
-    $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
+    $this->assertEqualValue(['word1', 'word2', 'word'], $handler);
     $this->assertEqual('or', $handler->operator);
     $handler = HandlerBase::breakString('word1 word2 word');
-    $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
+    $this->assertEqualValue(['word1', 'word2', 'word'], $handler);
     $this->assertEqual('or', $handler->operator);
     $handler = HandlerBase::breakString('word-1+word-2+word');
-    $this->assertEqualValue(array('word-1', 'word-2', 'word'), $handler);
+    $this->assertEqualValue(['word-1', 'word-2', 'word'], $handler);
     $this->assertEqual('or', $handler->operator);
     $handler = HandlerBase::breakString('wõrd1+wõrd2+wõrd');
-    $this->assertEqualValue(array('wõrd1', 'wõrd2', 'wõrd'), $handler);
+    $this->assertEqualValue(['wõrd1', 'wõrd2', 'wõrd'], $handler);
     $this->assertEqual('or', $handler->operator);
 
     // Test ands.
     $handler = HandlerBase::breakString('word1,word2,word');
-    $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
+    $this->assertEqualValue(['word1', 'word2', 'word'], $handler);
     $this->assertEqual('and', $handler->operator);
     $handler = HandlerBase::breakString('word1 word2,word');
-    $this->assertEqualValue(array('word1 word2', 'word'), $handler);
+    $this->assertEqualValue(['word1 word2', 'word'], $handler);
     $this->assertEqual('and', $handler->operator);
     $handler = HandlerBase::breakString('word1,word2 word');
-    $this->assertEqualValue(array('word1', 'word2 word'), $handler);
+    $this->assertEqualValue(['word1', 'word2 word'], $handler);
     $this->assertEqual('and', $handler->operator);
     $handler = HandlerBase::breakString('word-1,word-2,word');
-    $this->assertEqualValue(array('word-1', 'word-2', 'word'), $handler);
+    $this->assertEqualValue(['word-1', 'word-2', 'word'], $handler);
     $this->assertEqual('and', $handler->operator);
     $handler = HandlerBase::breakString('wõrd1,wõrd2,wõrd');
-    $this->assertEqualValue(array('wõrd1', 'wõrd2', 'wõrd'), $handler);
+    $this->assertEqualValue(['wõrd1', 'wõrd2', 'wõrd'], $handler);
     $this->assertEqual('and', $handler->operator);
 
     // Test a single word
     $handler = HandlerBase::breakString('word');
-    $this->assertEqualValue(array('word'), $handler);
+    $this->assertEqualValue(['word'], $handler);
     $this->assertEqual('and', $handler->operator);
 
     $s1 = $this->randomMachineName();
@@ -117,45 +117,45 @@ class HandlerTest extends ViewTestBase {
 
     // Test "or"s.
     $handlerBase = HandlerBase::breakString("$s1 $n2+$n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
+    $this->assertEqualValue([$s1, $n2, $n3], $handlerBase);
     $this->assertEqual('or', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$s1+$n2+$n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
+    $this->assertEqualValue([$s1, $n2, $n3], $handlerBase);
     $this->assertEqual('or', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$s1 $n2 $n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
+    $this->assertEqualValue([$s1, $n2, $n3], $handlerBase);
     $this->assertEqual('or', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$s1 $n2++$n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
+    $this->assertEqualValue([$s1, $n2, $n3], $handlerBase);
     $this->assertEqual('or', $handlerBase->operator);
 
     // Test "and"s.
     $handlerBase = HandlerBase::breakString("$s1,$n2,$n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
+    $this->assertEqualValue([$s1, $n2, $n3], $handlerBase);
     $this->assertEqual('and', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$s1,,$n2,$n3");
-    $this->assertEqualValue(array($s1, $n2, $n3), $handlerBase);
+    $this->assertEqualValue([$s1, $n2, $n3], $handlerBase);
     $this->assertEqual('and', $handlerBase->operator);
 
     // Enforce int values.
     $handlerBase = HandlerBase::breakString("$n1,$n2,$n3", TRUE);
-    $this->assertEqualValue(array($n1, $n2, $n3), $handlerBase);
+    $this->assertEqualValue([$n1, $n2, $n3], $handlerBase);
     $this->assertEqual('and', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$n1+$n2+$n3", TRUE);
-    $this->assertEqualValue(array($n1, $n2, $n3), $handlerBase);
+    $this->assertEqualValue([$n1, $n2, $n3], $handlerBase);
     $this->assertEqual('or', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$s1,$n2,$n3", TRUE);
-    $this->assertEqualValue(array((int) $s1, $n2, $n3), $handlerBase);
+    $this->assertEqualValue([(int) $s1, $n2, $n3], $handlerBase);
     $this->assertEqual('and', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$s1+$n2+$n3", TRUE);
-    $this->assertEqualValue(array((int) $s1, $n2, $n3), $handlerBase);
+    $this->assertEqualValue([(int) $s1, $n2, $n3], $handlerBase);
     $this->assertEqual('or', $handlerBase->operator);
 
     // Generate three random decimals which can be used below;
@@ -165,28 +165,28 @@ class HandlerTest extends ViewTestBase {
 
     // Test "or"s.
     $handlerBase = HandlerBase::breakString("$s1 $d1+$d2");
-    $this->assertEqualValue(array($s1, $d1, $d2), $handlerBase);
+    $this->assertEqualValue([$s1, $d1, $d2], $handlerBase);
     $this->assertEqual('or', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$s1+$d1+$d3");
-    $this->assertEqualValue(array($s1, $d1, $d3), $handlerBase);
+    $this->assertEqualValue([$s1, $d1, $d3], $handlerBase);
     $this->assertEqual('or', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$s1 $d2 $d3");
-    $this->assertEqualValue(array($s1, $d2, $d3), $handlerBase);
+    $this->assertEqualValue([$s1, $d2, $d3], $handlerBase);
     $this->assertEqual('or', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$s1 $d2++$d3");
-    $this->assertEqualValue(array($s1, $d2, $d3), $handlerBase);
+    $this->assertEqualValue([$s1, $d2, $d3], $handlerBase);
     $this->assertEqual('or', $handlerBase->operator);
 
     // Test "and"s.
     $handlerBase = HandlerBase::breakString("$s1,$d2,$d3");
-    $this->assertEqualValue(array($s1, $d2, $d3), $handlerBase);
+    $this->assertEqualValue([$s1, $d2, $d3], $handlerBase);
     $this->assertEqual('and', $handlerBase->operator);
 
     $handlerBase = HandlerBase::breakString("$s1,,$d2,$d3");
-    $this->assertEqualValue(array($s1, $d2, $d3), $handlerBase);
+    $this->assertEqualValue([$s1, $d2, $d3], $handlerBase);
     $this->assertEqual('and', $handlerBase->operator);
   }
 
@@ -194,13 +194,13 @@ class HandlerTest extends ViewTestBase {
    * Tests the order of handlers is the same before and after saving.
    */
   public function testHandlerWeights() {
-    $handler_types = array('fields', 'filters', 'sorts');
+    $handler_types = ['fields', 'filters', 'sorts'];
 
     $view = Views::getView('test_view_handler_weight');
     $view->initDisplay();
 
     // Store the order of handlers before saving the view.
-    $original_order = array();
+    $original_order = [];
     foreach ($handler_types as $type) {
       $original_order[$type] = array_keys($view->display_handler->getOption($type));
     }
@@ -233,7 +233,7 @@ class HandlerTest extends ViewTestBase {
    */
   protected function assertEqualValue($expected, $handler, $message = '', $group = 'Other') {
     if (empty($message)) {
-      $message = t('Comparing @first and @second', array('@first' => implode(',', $expected), '@second' => implode(',', $handler->value)));
+      $message = t('Comparing @first and @second', ['@first' => implode(',', $expected), '@second' => implode(',', $handler->value)]);
     }
 
     return $this->assert($expected == $handler->value, $message, $group);
@@ -243,7 +243,7 @@ class HandlerTest extends ViewTestBase {
    * Tests the relationship ui for field/filter/argument/relationship.
    */
   public function testRelationshipUI() {
-    $views_admin = $this->drupalCreateUser(array('administer views'));
+    $views_admin = $this->drupalCreateUser(['administer views']);
     $this->drupalLogin($views_admin);
 
     // Make sure the link to the field options exists.
@@ -262,18 +262,18 @@ class HandlerTest extends ViewTestBase {
     // Check for available options.
     $xpath = $this->constructFieldXpath('name', $relationship_name);
     $fields = $this->xpath($xpath);
-    $options = array();
+    $options = [];
     foreach ($fields as $field) {
       $items = $this->getAllOptions($field);
       foreach ($items as $item) {
         $options[] = $item->attributes()->value;
       }
     }
-    $expected_options = array('none', 'nid');
+    $expected_options = ['none', 'nid'];
     $this->assertEqual($options, $expected_options);
 
     // Remove the relationship and make sure no relationship option appears.
-    $this->drupalPostForm('admin/structure/views/nojs/handler/test_handler_relationships/default/relationship/nid', array(), t('Remove'));
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_handler_relationships/default/relationship/nid', [], t('Remove'));
     $this->drupalGet($handler_options_path);
     $this->assertNoFieldByName($relationship_name, NULL, 'Make sure that no relationship option is available');
 
@@ -298,9 +298,9 @@ class HandlerTest extends ViewTestBase {
     $view = Views::getView('test_handler_relationships');
     $view->setDisplay();
     // Setup a broken relationship.
-    $view->addHandler('default', 'relationship', $this->randomMachineName(), $this->randomMachineName(), array(), 'broken_relationship');
+    $view->addHandler('default', 'relationship', $this->randomMachineName(), $this->randomMachineName(), [], 'broken_relationship');
     // Setup a valid relationship.
-    $view->addHandler('default', 'relationship', 'comment_field_data', 'node', array('relationship' => 'cid'), 'valid_relationship');
+    $view->addHandler('default', 'relationship', 'comment_field_data', 'node', ['relationship' => 'cid'], 'valid_relationship');
     $view->initHandlers();
     $field = $view->field['title'];
 
@@ -377,7 +377,7 @@ class HandlerTest extends ViewTestBase {
     $view->initHandlers();
 
     foreach ($views_data['access_callback'] as $type => $info) {
-      if (!in_array($type, array('title', 'help'))) {
+      if (!in_array($type, ['title', 'help'])) {
         $this->assertTrue($view->field['access_callback'] instanceof HandlerBase, 'Make sure the user got access to the access_callback field ');
         $this->assertFalse(isset($view->field['access_callback_arguments']), 'Make sure the user got no access to the access_callback_arguments field ');
       }
@@ -391,7 +391,7 @@ class HandlerTest extends ViewTestBase {
     $view->initHandlers();
 
     foreach ($views_data['access_callback'] as $type => $info) {
-      if (!in_array($type, array('title', 'help'))) {
+      if (!in_array($type, ['title', 'help'])) {
         $this->assertFalse(isset($view->field['access_callback']), 'Make sure the user got no access to the access_callback field ');
         $this->assertTrue($view->field['access_callback_arguments'] instanceof HandlerBase, 'Make sure the user got access to the access_callback_arguments field ');
       }
diff --git a/web/core/modules/views/src/Tests/Plugin/AccessTest.php b/web/core/modules/views/src/Tests/Plugin/AccessTest.php
index 1bcf30013..7a4eb1a5b 100644
--- a/web/core/modules/views/src/Tests/Plugin/AccessTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/AccessTest.php
@@ -19,14 +19,14 @@ class AccessTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_access_none', 'test_access_static', 'test_access_dynamic');
+  public static $testViews = ['test_access_none', 'test_access_static', 'test_access_dynamic'];
 
   /**
    * Modules to enable.
    *
    * @return array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * Web user for testing.
@@ -47,12 +47,12 @@ class AccessTest extends PluginTestBase {
 
     $this->enableViewsTestModule();
 
-    ViewTestData::createTestViews(get_class($this), array('views_test_data'));
+    ViewTestData::createTestViews(get_class($this), ['views_test_data']);
 
     $this->webUser = $this->drupalCreateUser();
 
-    $normal_role = $this->drupalCreateRole(array());
-    $this->normalUser = $this->drupalCreateUser(array('views_test_data test permission'));
+    $normal_role = $this->drupalCreateRole([]);
+    $this->normalUser = $this->drupalCreateUser(['views_test_data test permission']);
     $this->normalUser->addRole($normal_role);
     // @todo when all the plugin information is cached make a reset function and
     // call it here.
@@ -61,7 +61,7 @@ class AccessTest extends PluginTestBase {
   /**
    * Tests none access plugin.
    */
-  function testAccessNone() {
+  public function testAccessNone() {
     $view = Views::getView('test_access_none');
     $view->setDisplay();
 
@@ -78,7 +78,7 @@ class AccessTest extends PluginTestBase {
    *
    * @see \Drupal\views_test\Plugin\views\access\StaticTest
    */
-  function testStaticAccessPlugin() {
+  public function testStaticAccessPlugin() {
     $view = Views::getView('test_access_static');
     $view->setDisplay();
 
diff --git a/web/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php b/web/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
index 5abc27c83..a4e82172e 100644
--- a/web/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
@@ -22,20 +22,20 @@ class ArgumentDefaultTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array(
+  public static $testViews = [
     'test_view',
     'test_argument_default_fixed',
     'test_argument_default_current_user',
     'test_argument_default_node',
     'test_argument_default_query_param',
-    );
+    ];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'views_ui', 'block');
+  public static $modules = ['node', 'views_ui', 'block'];
 
   protected function setUp() {
     parent::setUp();
@@ -52,13 +52,13 @@ class ArgumentDefaultTest extends PluginTestBase {
     $view = Views::getView('test_view');
 
     // Add a new argument and set the test plugin for the argument_default.
-    $options = array(
+    $options = [
       'default_argument_type' => 'argument_default_test',
-      'default_argument_options' => array(
+      'default_argument_options' => [
         'value' => 'John'
-      ),
+      ],
       'default_action' => 'default'
-    );
+    ];
     $id = $view->addHandler('default', 'argument', 'views_test_data', 'name', $options);
     $view->initHandlers();
     $plugin = $view->argument[$id]->getPlugin('argument_default');
@@ -70,15 +70,15 @@ class ArgumentDefaultTest extends PluginTestBase {
     // just returns John.
     $this->executeView($view);
     $this->assertEqual($view->argument[$id]->getValue(), 'John', 'The correct argument value is used.');
-    $expected_result = array(array('name' => 'John'));
-    $this->assertIdenticalResultset($view, $expected_result, array('views_test_data_name' => 'name'));
+    $expected_result = [['name' => 'John']];
+    $this->assertIdenticalResultset($view, $expected_result, ['views_test_data_name' => 'name']);
 
     // Pass in value as argument to be sure that not the default value is used.
     $view->destroy();
-    $this->executeView($view, array('George'));
+    $this->executeView($view, ['George']);
     $this->assertEqual($view->argument[$id]->getValue(), 'George', 'The correct argument value is used.');
-    $expected_result = array(array('name' => 'George'));
-    $this->assertIdenticalResultset($view, $expected_result, array('views_test_data_name' => 'name'));
+    $expected_result = [['name' => 'George']];
+    $this->assertIdenticalResultset($view, $expected_result, ['views_test_data_name' => 'name']);
   }
 
 
@@ -86,24 +86,24 @@ class ArgumentDefaultTest extends PluginTestBase {
    * Tests the use of a default argument plugin that provides no options.
    */
   public function testArgumentDefaultNoOptions() {
-    $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
     $this->drupalLogin($admin_user);
 
     // The current_user plugin has no options form, and should pass validation.
     $argument_type = 'current_user';
-    $edit = array(
+    $edit = [
       'options[default_argument_type]' => $argument_type,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/handler/test_argument_default_current_user/default/argument/uid', $edit, t('Apply'));
 
     // Note, the undefined index error has two spaces after it.
-    $error = array(
+    $error = [
       '%type' => 'Notice',
       '@message' => 'Undefined index:  ' . $argument_type,
       '%function' => 'views_handler_argument->validateOptionsForm()',
-    );
+    ];
     $message = t('%type: @message in %function', $error);
-    $this->assertNoRaw($message, format_string('Did not find error message: @message.', array('@message' => $message)));
+    $this->assertNoRaw($message, format_string('Did not find error message: @message.', ['@message' => $message]));
   }
 
   /**
@@ -122,7 +122,7 @@ class ArgumentDefaultTest extends PluginTestBase {
 
     // Make sure that a normal argument provided is used
     $random_string = $this->randomMachineName();
-    $view->executeDisplay('default', array($random_string));
+    $view->executeDisplay('default', [$random_string]);
 
     $this->assertEqual($view->args[0], $random_string, 'Provided argument should be used.');
   }
@@ -137,13 +137,13 @@ class ArgumentDefaultTest extends PluginTestBase {
    */
   public function testArgumentDefaultNode() {
     // Create a user that has permission to place a view block.
-    $permissions = array(
+    $permissions = [
       'administer views',
       'administer blocks',
       'bypass node access',
       'access user profiles',
       'view all revisions',
-      );
+      ];
     $views_admin = $this->drupalCreateUser($permissions);
     $this->drupalLogin($views_admin);
 
diff --git a/web/core/modules/views/src/Tests/Plugin/CacheTagTest.php b/web/core/modules/views/src/Tests/Plugin/CacheTagTest.php
index eaee6569d..72d94f3cf 100644
--- a/web/core/modules/views/src/Tests/Plugin/CacheTagTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/CacheTagTest.php
@@ -19,14 +19,14 @@ class CacheTagTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_tag_cache');
+  public static $testViews = ['test_tag_cache'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * The node storage.
@@ -73,17 +73,17 @@ class CacheTagTest extends PluginTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
-    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
 
     $this->nodeStorage = $this->container->get('entity.manager')->getStorage('node');
     $this->nodeViewBuilder = $this->container->get('entity.manager')->getViewBuilder('node');
     $this->userViewBuilder = $this->container->get('entity.manager')->getViewBuilder('user');
 
     for ($i = 1; $i <= 5; $i++) {
-      $this->pages[] = $this->drupalCreateNode(array('title' => "Test $i", 'type' => 'page'));
+      $this->pages[] = $this->drupalCreateNode(['title' => "Test $i", 'type' => 'page']);
     }
-    $this->article = $this->drupalCreateNode(array('title' => "Test article", 'type' => 'article'));
+    $this->article = $this->drupalCreateNode(['title' => "Test article", 'type' => 'article']);
     $this->user = $this->drupalCreateUser();
 
     // Mark the current request safe, in order to make render cache working, see
@@ -183,7 +183,7 @@ class CacheTagTest extends PluginTestBase {
     $this->assertTrue($cache_plugin->cacheGet('results'), 'Results cache found.');
     $this->assertTrue($this->getRenderCache($view), 'Output cache found.');
 
-    $this->userViewBuilder->resetCache(array($this->user));
+    $this->userViewBuilder->resetCache([$this->user]);
 
     $cache_plugin = $view->display_handler->getPlugin('cache');
     $this->assertTrue($cache_plugin->cacheGet('results'), 'Results cache found after a user is invalidated.');
diff --git a/web/core/modules/views/src/Tests/Plugin/CacheWebTest.php b/web/core/modules/views/src/Tests/Plugin/CacheWebTest.php
index f41e786e4..778660637 100644
--- a/web/core/modules/views/src/Tests/Plugin/CacheWebTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/CacheWebTest.php
@@ -21,14 +21,14 @@ class CacheWebTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_display');
+  public static $testViews = ['test_display'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   /**
    * {@inheritdoc}
@@ -46,13 +46,13 @@ class CacheWebTest extends PluginTestBase {
     $view = Views::getView('test_display');
     $view->storage->setStatus(TRUE);
     $view->setDisplay('page_1');
-    $view->display_handler->overrideOption('cache', array(
+    $view->display_handler->overrideOption('cache', [
       'type' => 'time',
-      'options' => array(
+      'options' => [
         'results_lifespan' => '3600',
         'output_lifespan' => '3600'
-      )
-    ));
+      ]
+    ]);
     $view->save();
     $this->container->get('router.builder')->rebuildIfNeeded();
 
diff --git a/web/core/modules/views/src/Tests/Plugin/ContextualFiltersBlockContextTest.php b/web/core/modules/views/src/Tests/Plugin/ContextualFiltersBlockContextTest.php
new file mode 100644
index 000000000..7fb70580a
--- /dev/null
+++ b/web/core/modules/views/src/Tests/Plugin/ContextualFiltersBlockContextTest.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Drupal\views\Tests\Plugin;
+
+use Drupal\Core\Plugin\Context\ContextDefinitionInterface;
+use Drupal\views\Tests\ViewTestData;
+use Drupal\views\Tests\ViewTestBase;
+use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+
+/**
+ * A test for contextual filters exposed as block context.
+ *
+ * @group views
+ */
+class ContextualFiltersBlockContextTest extends ViewTestBase {
+
+  use AssertPageCacheContextsAndTagsTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['block', 'block_test_views', 'views_ui', 'node'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_view_block_with_context'];
+
+  /**
+   * Test node type.
+   *
+   * @var \Drupal\node\NodeTypeInterface
+   */
+  protected $nodeType;
+
+  /**
+   * Test nodes.
+   *
+   * @var \Drupal\node\NodeInterface[]
+   */
+  protected $nodes;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    ViewTestData::createTestViews(get_class($this), ['block_test_views']);
+    $this->enableViewsTestModule();
+
+    $this->nodeType = $this->container->get('entity_type.manager')
+      ->getStorage('node_type')
+      ->create([
+        'name' => 'Test node type',
+        'type' => 'test',
+      ]);
+    $this->nodeType->save();
+
+    $this->nodes[0] = $this->container->get('entity_type.manager')
+      ->getStorage('node')
+      ->create(['type' => $this->nodeType->id(), 'title' => 'First test node']);
+    $this->nodes[0]->save();
+
+    $this->nodes[1] = $this->container->get('entity_type.manager')
+      ->getStorage('node')
+      ->create(['type' => $this->nodeType->id(), 'title' => 'Second test node']);
+    $this->nodes[1]->save();
+  }
+
+  /**
+   * Tests exposed context.
+   */
+  public function testBlockContext() {
+    $this->drupalLogin($this->drupalCreateUser(['administer views', 'administer blocks']));
+
+    // Check if context was correctly propagated to the block.
+    $definition = $this->container->get('plugin.manager.block')
+      ->getDefinition('views_block:test_view_block_with_context-block_1');
+    $this->assertTrue($definition['context']['nid'] instanceof ContextDefinitionInterface);
+    /** @var \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context */
+    $context = $definition['context']['nid'];
+    $this->assertEqual($context->getDataType(), 'entity:node', 'Context definition data type is correct.');
+    $this->assertEqual($context->getLabel(), 'Content: ID', 'Context definition label is correct.');
+    $this->assertFalse($context->isRequired(), 'Context is not required.');
+
+    // Place test block via block UI to check if contexts are correctly exposed.
+    $this->drupalGet(
+      'admin/structure/block/add/views_block:test_view_block_with_context-block_1/classy',
+      ['query' => ['region' => 'content']]
+    );
+    $edit = [
+      'settings[context_mapping][nid]' => '@node.node_route_context:node',
+    ];
+    $this->drupalPostForm(NULL, $edit, 'Save block');
+
+    // Check if mapping saved correctly.
+    /** @var \Drupal\block\BlockInterface $block */
+    $block = $this->container->get('entity_type.manager')
+      ->getStorage('block')
+      ->load('views_block__test_view_block_with_context_block_1');
+    $expected_settings = [
+      'id' => 'views_block:test_view_block_with_context-block_1',
+      'label' => '',
+      'provider' => 'views',
+      'label_display' => 'visible',
+      'views_label' => '',
+      'items_per_page' => 'none',
+      'context_mapping' => ['nid' => '@node.node_route_context:node']
+    ];
+    $this->assertEqual($block->getPlugin()->getConfiguration(), $expected_settings, 'Block settings are correct.');
+
+    // Make sure view behaves as expected.
+    $this->drupalGet('<front>');
+    $this->assertText('Test view: No results found.');
+
+    $this->drupalGet($this->nodes[0]->toUrl());
+    $this->assertText('Test view row: First test node');
+
+    $this->drupalGet($this->nodes[1]->toUrl());
+    $this->assertText('Test view row: Second test node');
+
+    // Check the second block which should expose two integer contexts, one
+    // based on the numeric plugin and the other based on numeric validation.
+    $definition = $this->container->get('plugin.manager.block')
+      ->getDefinition('views_block:test_view_block_with_context-block_2');
+    $this->assertTrue($definition['context']['created'] instanceof ContextDefinitionInterface);
+    /** @var \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context */
+    $context = $definition['context']['created'];
+    $this->assertEqual($context->getDataType(), 'integer', 'Context definition data type is correct.');
+    $this->assertEqual($context->getLabel(), 'Content: Authored on', 'Context definition label is correct.');
+    $this->assertFalse($context->isRequired(), 'Context is not required.');
+
+    $this->assertTrue($definition['context']['vid'] instanceof ContextDefinitionInterface);
+    /** @var \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context */
+    $context = $definition['context']['vid'];
+    $this->assertEqual($context->getDataType(), 'integer', 'Context definition data type is correct.');
+    $this->assertEqual($context->getLabel(), 'Content: Revision ID', 'Context definition label is correct.');
+    $this->assertFalse($context->isRequired(), 'Context is not required.');
+
+    $this->assertTrue($definition['context']['title'] instanceof ContextDefinitionInterface);
+    /** @var \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context */
+    $context = $definition['context']['title'];
+    $this->assertEqual($context->getDataType(), 'string', 'Context definition data type is correct.');
+    $this->assertEqual($context->getLabel(), 'Content: Title', 'Context definition label is correct.');
+    $this->assertFalse($context->isRequired(), 'Context is not required.');
+  }
+
+}
diff --git a/web/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php b/web/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php
index 9238dda36..cb4394691 100644
--- a/web/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/DisabledDisplayTest.php
@@ -15,14 +15,14 @@ class DisabledDisplayTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_disabled_display');
+  public static $testViews = ['test_disabled_display'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('block', 'node', 'views');
+  public static $modules = ['block', 'node', 'views'];
 
   protected function setUp() {
     parent::setUp();
@@ -31,7 +31,7 @@ class DisabledDisplayTest extends PluginTestBase {
 
     $this->drupalPlaceBlock('page_title_block');
 
-    $admin_user = $this->drupalCreateUser(array('administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($admin_user);
   }
 
@@ -44,7 +44,7 @@ class DisabledDisplayTest extends PluginTestBase {
    */
   public function testDisabledDisplays() {
     // The displays defined in this view.
-    $display_ids = array('attachment_1', 'block_1', 'embed_1', 'feed_1', 'page_2');
+    $display_ids = ['attachment_1', 'block_1', 'embed_1', 'feed_1', 'page_2'];
 
     $this->drupalCreateContentType(['type' => 'page']);
     $this->drupalCreateNode();
diff --git a/web/core/modules/views/src/Tests/Plugin/DisplayAttachmentTest.php b/web/core/modules/views/src/Tests/Plugin/DisplayAttachmentTest.php
index 88db8b1b9..16c0680b3 100644
--- a/web/core/modules/views/src/Tests/Plugin/DisplayAttachmentTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/DisplayAttachmentTest.php
@@ -17,21 +17,21 @@ class DisplayAttachmentTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_display_attachment', 'test_attached_disabled');
+  public static $testViews = ['test_display_attachment', 'test_attached_disabled'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'views');
+  public static $modules = ['node', 'views'];
 
   protected function setUp() {
     parent::setUp();
 
     $this->enableViewsTestModule();
 
-    $admin_user = $this->drupalCreateUser(array('administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($admin_user);
   }
 
diff --git a/web/core/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php b/web/core/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php
index 96d036926..ac7209c28 100644
--- a/web/core/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/DisplayEntityReferenceTest.php
@@ -24,14 +24,14 @@ class DisplayEntityReferenceTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_display_entity_reference');
+  public static $testViews = ['test_display_entity_reference'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('entity_test', 'field', 'views_ui');
+  public static $modules = ['entity_test', 'field', 'views_ui'];
 
   /**
    * The used field name in the test.
@@ -67,7 +67,7 @@ class DisplayEntityReferenceTest extends PluginTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalLogin($this->drupalCreateUser(array('administer views')));
+    $this->drupalLogin($this->drupalCreateUser(['administer views']));
 
     // Create the text field.
     $this->fieldName = 'field_test_entity_ref_display';
diff --git a/web/core/modules/views/src/Tests/Plugin/DisplayExtenderTest.php b/web/core/modules/views/src/Tests/Plugin/DisplayExtenderTest.php
index 33c3713c1..896b1348d 100644
--- a/web/core/modules/views/src/Tests/Plugin/DisplayExtenderTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/DisplayExtenderTest.php
@@ -18,7 +18,7 @@ class DisplayExtenderTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   protected function setUp() {
     parent::setUp();
@@ -30,7 +30,7 @@ class DisplayExtenderTest extends PluginTestBase {
    * Test display extenders.
    */
   public function testDisplayExtenders() {
-    $this->config('views.settings')->set('display_extenders', array('display_extender_test'))->save();
+    $this->config('views.settings')->set('display_extenders', ['display_extender_test'])->save();
     $this->assertEqual(count(Views::getEnabledDisplayExtenders()), 1, 'Make sure that there is only one enabled display extender.');
 
     $view = Views::getView('test_view');
diff --git a/web/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php b/web/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php
index d31f457bc..2a3dc4ecd 100644
--- a/web/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php
@@ -17,21 +17,21 @@ class DisplayFeedTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_display_feed', 'test_attached_disabled', 'test_feed_icon');
+  public static $testViews = ['test_display_feed', 'test_attached_disabled', 'test_feed_icon'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('block', 'node', 'views');
+  public static $modules = ['block', 'node', 'views'];
 
   protected function setUp() {
     parent::setUp();
 
     $this->enableViewsTestModule();
 
-    $admin_user = $this->drupalCreateUser(array('administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer site configuration']);
     $this->drupalLogin($admin_user);
   }
 
@@ -101,13 +101,13 @@ class DisplayFeedTest extends PluginTestBase {
 
     // Verify a title with HTML entities is properly escaped.
     $node_title = 'This "cool" & "neat" article\'s title';
-    $this->drupalCreateNode(array(
+    $this->drupalCreateNode([
       'title' => $node_title,
       'body' => [0 => [
         'value' => 'A paragraph',
         'format' => filter_default_format(),
       ]],
-    ));
+    ]);
 
     $this->drupalGet('test-feed-display-fields.xml');
     $result = $this->xpath('//title/a');
diff --git a/web/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php b/web/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
index acb3af86f..b5c853fae 100644
--- a/web/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
@@ -19,7 +19,7 @@ class DisplayPageWebTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_page_display', 'test_page_display_arguments', 'test_page_display_menu', 'test_page_display_path');
+  public static $testViews = ['test_page_display', 'test_page_display_arguments', 'test_page_display_menu', 'test_page_display_path'];
 
   /**
    * Modules to enable.
@@ -88,10 +88,10 @@ class DisplayPageWebTest extends PluginTestBase {
     // Check local tasks.
     $this->drupalGet('test_page_display_menu');
     $this->assertResponse(200);
-    $element = $this->xpath('//ul[contains(@class, :ul_class)]//a[contains(@class, :a_class)]', array(
+    $element = $this->xpath('//ul[contains(@class, :ul_class)]//a[contains(@class, :a_class)]', [
       ':ul_class' => 'tabs primary',
       ':a_class' => 'is-active',
-    ));
+    ]);
     $this->assertEqual((string) $element[0], t('Test default tab'));
     $this->assertTitle(t('Test default page | Drupal'));
 
@@ -100,10 +100,10 @@ class DisplayPageWebTest extends PluginTestBase {
 
     $this->drupalGet('test_page_display_menu/local');
     $this->assertResponse(200);
-    $element = $this->xpath('//ul[contains(@class, :ul_class)]//a[contains(@class, :a_class)]', array(
+    $element = $this->xpath('//ul[contains(@class, :ul_class)]//a[contains(@class, :a_class)]', [
       ':ul_class' => 'tabs primary',
       ':a_class' => 'is-active',
-    ));
+    ]);
     $this->assertEqual((string) $element[0], t('Test local tab'));
     $this->assertTitle(t('Test local page | Drupal'));
 
diff --git a/web/core/modules/views/src/Tests/Plugin/DisplayTest.php b/web/core/modules/views/src/Tests/Plugin/DisplayTest.php
index 3bbfd66b7..42a389cb9 100644
--- a/web/core/modules/views/src/Tests/Plugin/DisplayTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/DisplayTest.php
@@ -19,26 +19,26 @@ class DisplayTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_filter_groups', 'test_get_attach_displays', 'test_view', 'test_display_more', 'test_display_invalid', 'test_display_empty', 'test_exposed_relationship_admin_ui');
+  public static $testViews = ['test_filter_groups', 'test_get_attach_displays', 'test_view', 'test_display_more', 'test_display_invalid', 'test_display_empty', 'test_exposed_relationship_admin_ui'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'node', 'block');
+  public static $modules = ['views_ui', 'node', 'block'];
 
   protected function setUp() {
     parent::setUp();
 
     $this->enableViewsTestModule();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer views'));
+    $this->adminUser = $this->drupalCreateUser(['administer views']);
     $this->drupalLogin($this->adminUser);
 
     // Create 10 nodes.
     for ($i = 0; $i <= 10; $i++) {
-      $this->drupalCreateNode(array('promote' => TRUE));
+      $this->drupalCreateNode(['promote' => TRUE]);
     }
   }
 
@@ -59,25 +59,25 @@ class DisplayTest extends PluginTestBase {
     $this->assertTrue(isset($displays['display_test_1']), 'Added display has been assigned to "display_test_1"');
 
     // Check the display options are like expected.
-    $options = array(
-      'display_options' => array(),
+    $options = [
+      'display_options' => [],
       'display_plugin' => 'display_test',
       'id' => 'display_test_1',
       'display_title' => 'Display test',
       'position' => 1,
-    );
+    ];
     $this->assertEqual($displays['display_test_1'], $options);
 
     // Add another one to ensure that position is counted up.
     $view->storage->addDisplay('display_test');
     $displays = $view->storage->get('display');
-    $options = array(
-      'display_options' => array(),
+    $options = [
+      'display_options' => [],
       'display_plugin' => 'display_test',
       'id' => 'display_test_2',
       'display_title' => 'Display test 2',
       'position' => 2,
-    );
+    ];
     $this->assertEqual($displays['display_test_2'], $options);
 
     // Move the second display before the first one in order to test custom
@@ -120,7 +120,7 @@ class DisplayTest extends PluginTestBase {
     $this->clickLink('Test option title');
 
     $test_option = $this->randomString();
-    $this->drupalPostForm(NULL, array('test_option' => $test_option), t('Apply'));
+    $this->drupalPostForm(NULL, ['test_option' => $test_option], t('Apply'));
 
     // Check the new value has been saved by checking the UI summary text.
     $this->drupalGet('admin/structure/views/view/test_view/edit/display_test_1');
@@ -154,10 +154,10 @@ class DisplayTest extends PluginTestBase {
 
     // Both the feed_1 and the feed_2 display are attached to the page display.
     $view->setDisplay('page_1');
-    $this->assertEqual($view->display_handler->getAttachedDisplays(), array('feed_1', 'feed_2'));
+    $this->assertEqual($view->display_handler->getAttachedDisplays(), ['feed_1', 'feed_2']);
 
     $view->setDisplay('feed_1');
-    $this->assertEqual($view->display_handler->getAttachedDisplays(), array());
+    $this->assertEqual($view->display_handler->getAttachedDisplays(), []);
   }
 
   /**
@@ -179,7 +179,7 @@ class DisplayTest extends PluginTestBase {
     $output = $renderer->renderRoot($output);
 
     $this->setRawContent($output);
-    $result = $this->xpath('//a[@class=:class]', array(':class' => 'more-link'));
+    $result = $this->xpath('//a[@class=:class]', [':class' => 'more-link']);
     $this->assertEqual($result[0]->attributes()->href, \Drupal::url('view.test_display_more.page_1'), 'The right more link is shown.');
     $this->assertEqual(trim($result[0][0]), $expected_more_text, 'The right link text is shown.');
 
@@ -188,7 +188,7 @@ class DisplayTest extends PluginTestBase {
     $more_link = $view->display_handler->renderMoreLink();
     $more_link = $renderer->renderRoot($more_link);
     $this->setRawContent($more_link);
-    $result = $this->xpath('//a[@class=:class]', array(':class' => 'more-link'));
+    $result = $this->xpath('//a[@class=:class]', [':class' => 'more-link']);
     $this->assertEqual($result[0]->attributes()->href, \Drupal::url('view.test_display_more.page_1'), 'The right more link is shown.');
     $this->assertEqual(trim($result[0][0]), $expected_more_text, 'The right link text is shown.');
 
@@ -204,25 +204,25 @@ class DisplayTest extends PluginTestBase {
     $output = $view->preview();
     $output = $renderer->renderRoot($output);
     $this->setRawContent($output);
-    $result = $this->xpath('//a[@class=:class]', array(':class' => 'more-link'));
+    $result = $this->xpath('//a[@class=:class]', [':class' => 'more-link']);
     $this->assertTrue(empty($result), 'The more link is not shown.');
 
     $view = Views::getView('test_display_more');
     $view->setDisplay();
     $view->display_handler->setOption('use_more', 0);
     $view->display_handler->setOption('use_more_always', 0);
-    $view->display_handler->setOption('pager', array(
+    $view->display_handler->setOption('pager', [
       'type' => 'some',
-      'options' => array(
+      'options' => [
         'items_per_page' => 1,
         'offset' => 0,
-      ),
-    ));
+      ],
+    ]);
     $this->executeView($view);
     $output = $view->preview();
     $output = $renderer->renderRoot($output);
     $this->setRawContent($output);
-    $result = $this->xpath('//a[@class=:class]', array(':class' => 'more-link'));
+    $result = $this->xpath('//a[@class=:class]', [':class' => 'more-link']);
     $this->assertTrue(empty($result), 'The more link is not shown when view has more records.');
 
     // Test the default value of use_more_always.
@@ -286,7 +286,7 @@ class DisplayTest extends PluginTestBase {
     $config->save();
 
     // Place the block display.
-    $block = $this->drupalPlaceBlock('views_block:test_display_invalid-block_1', array('label' => 'Invalid display'));
+    $block = $this->drupalPlaceBlock('views_block:test_display_invalid-block_1', ['label' => 'Invalid display']);
 
     $this->drupalGet('<front>');
     $this->assertResponse(200);
@@ -326,8 +326,8 @@ class DisplayTest extends PluginTestBase {
     $errors = $view->validate();
     // Check that the error messages are shown.
     $this->assertTrue(count($errors['default']) == 2, 'Error messages found for required relationship');
-    $this->assertEqual($errors['default'][0], t('The %handler_type %handler uses a relationship that has been removed.', array('%handler_type' => 'field', '%handler' => 'User: Last login')));
-    $this->assertEqual($errors['default'][1], t('The %handler_type %handler uses a relationship that has been removed.', array('%handler_type' => 'field', '%handler' => 'User: Created')));
+    $this->assertEqual($errors['default'][0], t('The %handler_type %handler uses a relationship that has been removed.', ['%handler_type' => 'field', '%handler' => 'User: Last login']));
+    $this->assertEqual($errors['default'][1], t('The %handler_type %handler uses a relationship that has been removed.', ['%handler_type' => 'field', '%handler' => 'User: Created']));
   }
 
   /**
@@ -342,12 +342,12 @@ class DisplayTest extends PluginTestBase {
 
     // Add a filter, so the view result is empty.
     $view->setDisplay('default');
-    $item = array(
+    $item = [
       'table' => 'views_test_data',
       'field' => 'id',
       'id' => 'id',
-      'value' => array('value' => 7297)
-    );
+      'value' => ['value' => 7297]
+    ];
     $view->setHandler('default', 'filter', 'id', $item);
     $this->executeView($view);
     $this->assertFalse(count($view->result), 'Ensure the result of the view is empty.');
diff --git a/web/core/modules/views/src/Tests/Plugin/ExposedFormTest.php b/web/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
index 55957e591..cfb3c0a07 100644
--- a/web/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
@@ -24,23 +24,25 @@ class ExposedFormTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_exposed_form_buttons', 'test_exposed_block', 'test_exposed_form_sort_items_per_page');
+  public static $testViews = ['test_exposed_form_buttons', 'test_exposed_block', 'test_exposed_form_sort_items_per_page'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'views_ui', 'block', 'entity_test');
+  public static $modules = ['node', 'views_ui', 'block', 'entity_test'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'article'));
+    $this->enableViewsTestModule();
+
+    $this->drupalCreateContentType(['type' => 'article']);
 
     // Create some random nodes.
     for ($i = 0; $i < 5; $i++) {
-      $this->drupalCreateNode(array('type' => 'article'));
+      $this->drupalCreateNode(['type' => 'article']);
     }
   }
 
@@ -88,7 +90,7 @@ class ExposedFormTest extends ViewTestBase {
     $view = Views::getView('test_exposed_form_buttons');
     $view->setDisplay();
     $identifier = 'new_identifier';
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
       'type' => [
         'exposed' => TRUE,
         'field' => 'type',
@@ -105,9 +107,9 @@ class ExposedFormTest extends ViewTestBase {
           'description' => 'Exposed overridden description'
         ],
       ]
-    ));
+    ]);
     $view->save();
-    $this->drupalGet('test_exposed_form_buttons', array('query' => array($identifier => 'article')));
+    $this->drupalGet('test_exposed_form_buttons', ['query' => [$identifier => 'article']]);
     $this->assertFieldById(Html::getId('edit-' . $identifier), 'article', "Article type filter set with new identifier.");
 
     // Alter the identifier of the filter to a random string containing
@@ -115,7 +117,7 @@ class ExposedFormTest extends ViewTestBase {
     $view = Views::getView('test_exposed_form_buttons');
     $view->setDisplay();
     $identifier = 'bad identifier';
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
       'type' => [
         'exposed' => TRUE,
         'field' => 'type',
@@ -132,7 +134,7 @@ class ExposedFormTest extends ViewTestBase {
           'description' => 'Exposed overridden description'
         ],
       ]
-    ));
+    ]);
     $this->executeView($view);
 
     $errors = $view->validate();
@@ -151,12 +153,12 @@ class ExposedFormTest extends ViewTestBase {
     $this->drupalGet('test_exposed_form_buttons');
     $this->assertNoField('edit-reset');
 
-    $this->drupalGet('test_exposed_form_buttons', array('query' => array('type' => 'article')));
+    $this->drupalGet('test_exposed_form_buttons', ['query' => ['type' => 'article']]);
     // Test that the type has been set.
     $this->assertFieldById('edit-type', 'article', 'Article type filter set.');
 
     // Test the reset works.
-    $this->drupalGet('test_exposed_form_buttons', array('query' => array('op' => 'Reset')));
+    $this->drupalGet('test_exposed_form_buttons', ['query' => ['op' => 'Reset']]);
     $this->assertResponse(200);
     // Test the type has been reset.
     $this->assertFieldById('edit-type', 'All', 'Article type filter has been reset.');
@@ -165,7 +167,7 @@ class ExposedFormTest extends ViewTestBase {
     $this->assertNoField('edit-reset');
 
     // Test the reset works with type set.
-    $this->drupalGet('test_exposed_form_buttons', array('query' => array('type' => 'article', 'op' => 'Reset')));
+    $this->drupalGet('test_exposed_form_buttons', ['query' => ['type' => 'article', 'op' => 'Reset']]);
     $this->assertResponse(200);
     $this->assertFieldById('edit-type', 'All', 'Article type filter has been reset.');
 
@@ -183,7 +185,7 @@ class ExposedFormTest extends ViewTestBase {
     $view->save();
 
     // Look whether the reset button label changed.
-    $this->drupalGet('test_exposed_form_buttons', array('query' => array('type' => 'article')));
+    $this->drupalGet('test_exposed_form_buttons', ['query' => ['type' => 'article']]);
     $this->assertResponse(200);
 
     $this->helperButtonHasLabel('edit-reset', $expected_label);
@@ -205,7 +207,7 @@ class ExposedFormTest extends ViewTestBase {
     $expected_action = $view->display_handler->getUrlInfo()->toString();
     $this->assertFieldByXPath('//form/@action', $expected_action, 'The expected value for the action attribute was found.');
     // Make sure the description is shown.
-    $result = $this->xpath('//form//div[contains(@id, :id) and normalize-space(text())=:description]', array(':id' => 'edit-type--description', ':description' => t('Exposed description')));
+    $result = $this->xpath('//form//div[contains(@id, :id) and normalize-space(text())=:description]', [':id' => 'edit-type--description', ':description' => t('Exposed description')]);
     $this->assertEqual(count($result), 1, 'Filter description was found.');
   }
 
@@ -218,7 +220,7 @@ class ExposedFormTest extends ViewTestBase {
     $this->drupalCreateNode(['type' => 'page']);
 
     // Use a test theme to convert multi-select elements into checkboxes.
-    \Drupal::service('theme_handler')->install(array('views_test_checkboxes_theme'));
+    \Drupal::service('theme_handler')->install(['views_test_checkboxes_theme']);
     $this->config('system.theme')
       ->set('default', 'views_test_checkboxes_theme')
       ->save();
@@ -262,15 +264,15 @@ class ExposedFormTest extends ViewTestBase {
     $this->drupalGet('test_exposed_block');
 
     // Test there is an exposed form in a block.
-    $xpath = $this->buildXPathQuery('//div[@id=:id]/form/@id', array(':id' => Html::getUniqueId('block-' . $block->id())));
+    $xpath = $this->buildXPathQuery('//div[@id=:id]/form/@id', [':id' => Html::getUniqueId('block-' . $block->id())]);
     $this->assertFieldByXpath($xpath, $this->getExpectedExposedFormId($view), 'Expected form found in views block.');
 
     // Test there is not an exposed form in the view page content area.
-    $xpath = $this->buildXPathQuery('//div[@class="view-content"]/form/@id', array(':id' => Html::getUniqueId('block-' . $block->id())));
+    $xpath = $this->buildXPathQuery('//div[@class="view-content"]/form/@id', [':id' => Html::getUniqueId('block-' . $block->id())]);
     $this->assertNoFieldByXpath($xpath, $this->getExpectedExposedFormId($view), 'No exposed form found in views content region.');
 
     // Test there is only one views exposed form on the page.
-    $elements = $this->xpath('//form[@id=:id]', array(':id' => $this->getExpectedExposedFormId($view)));
+    $elements = $this->xpath('//form[@id=:id]', [':id' => $this->getExpectedExposedFormId($view)]);
     $this->assertEqual(count($elements), 1, 'One exposed form block found.');
 
     // Test that the correct option is selected after form submission.
@@ -300,7 +302,7 @@ class ExposedFormTest extends ViewTestBase {
     $rows = $this->xpath("//div[contains(@class, 'views-row')]");
     $this->assertEqual(count($rows), 0, 'No rows are displayed by default when no input is provided.');
 
-    $this->drupalGet('test_exposed_form_buttons', array('query' => array('type' => 'article')));
+    $this->drupalGet('test_exposed_form_buttons', ['query' => ['type' => 'article']]);
 
     // Ensure that results are displayed.
     $rows = $this->xpath("//div[contains(@class, 'views-row')]");
@@ -328,7 +330,7 @@ class ExposedFormTest extends ViewTestBase {
 
     // Ensure that the "on demand text" is not displayed when an exposed filter
     // is applied.
-    $this->drupalGet('test_exposed_form_buttons', array('query' => array('type' => 'article')));
+    $this->drupalGet('test_exposed_form_buttons', ['query' => ['type' => 'article']]);
     $this->assertNoText($on_demand_text);
   }
 
@@ -398,4 +400,23 @@ class ExposedFormTest extends ViewTestBase {
     return Html::cleanCssIdentifier('views-exposed-form-' . $view->storage->id() . '-' . $view->current_display);
   }
 
+  /**
+   * Tests a view which is rendered after a form with a validation error.
+   */
+  public function testFormErrorWithExposedForm() {
+    $this->drupalGet('views_test_data_error_form_page');
+    $this->assertResponse(200);
+    $form = $this->cssSelect('form.views-exposed-form');
+    $this->assertTrue($form, 'The exposed form element was found.');
+    $this->assertRaw(t('Apply'), 'Ensure the exposed form is rendered before submitting the normal form.');
+    $this->assertRaw('<div class="views-row">', 'Views result shown.');
+
+    $this->drupalPostForm(NULL, [], t('Submit'));
+    $this->assertResponse(200);
+    $form = $this->cssSelect('form.views-exposed-form');
+    $this->assertTrue($form, 'The exposed form element was found.');
+    $this->assertRaw(t('Apply'), 'Ensure the exposed form is rendered after submitting the normal form.');
+    $this->assertRaw('<div class="views-row">', 'Views result shown.');
+  }
+
 }
diff --git a/web/core/modules/views/src/Tests/Plugin/FilterTest.php b/web/core/modules/views/src/Tests/Plugin/FilterTest.php
index 5e26356b5..081835f40 100644
--- a/web/core/modules/views/src/Tests/Plugin/FilterTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/FilterTest.php
@@ -18,21 +18,21 @@ class FilterTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_filter', 'test_filter_in_operator_ui');
+  public static $testViews = ['test_filter', 'test_filter_in_operator_ui'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'node');
+  public static $modules = ['views_ui', 'node'];
 
   protected function setUp() {
     parent::setUp();
 
     $this->enableViewsTestModule();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer views'));
+    $this->adminUser = $this->drupalCreateUser(['administer views']);
     $this->drupalLogin($this->adminUser);
     $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
     $this->drupalCreateContentType(['type' => 'page', 'name' => 'Page']);
@@ -60,16 +60,16 @@ class FilterTest extends PluginTestBase {
     $view->initDisplay();
 
     // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'test_filter' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'test_filter' => [
         'id' => 'test_filter',
         'table' => 'views_test_data',
         'field' => 'name',
         'operator' => '=',
         'value' => 'John',
         'group' => 0,
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
@@ -90,23 +90,23 @@ class FilterTest extends PluginTestBase {
 
     // Check that we have a single element, as a result of applying the '= John'
     // filter.
-    $this->assertEqual(count($view->result), 1, format_string('Results were returned. @count results.', array('@count' => count($view->result))));
+    $this->assertEqual(count($view->result), 1, format_string('Results were returned. @count results.', ['@count' => count($view->result)]));
 
     $view->destroy();
 
     $view->initDisplay();
 
     // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'test_filter' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'test_filter' => [
         'id' => 'test_filter',
         'table' => 'views_test_data',
         'field' => 'name',
         'operator' => '<>',
         'value' => 'John',
         'group' => 0,
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
@@ -116,15 +116,15 @@ class FilterTest extends PluginTestBase {
 
     // Check if we have the other elements in the dataset, as a result of
     // applying the '<> John' filter.
-    $this->assertEqual(count($view->result), 4, format_string('Results were returned. @count results.', array('@count' => count($view->result))));
+    $this->assertEqual(count($view->result), 4, format_string('Results were returned. @count results.', ['@count' => count($view->result)]));
 
     $view->destroy();
     $view->initDisplay();
 
     // Set the test_enable option to FALSE. The 'where' clause should not be
     // added to the query.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'test_filter' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'test_filter' => [
         'id' => 'test_filter',
         'table' => 'views_test_data',
         'field' => 'name',
@@ -133,14 +133,14 @@ class FilterTest extends PluginTestBase {
         'group' => 0,
         // Disable this option, so nothing should be added to the query.
         'test_enable' => FALSE,
-      ),
-    ));
+      ],
+    ]);
 
     // Execute the view again.
     $this->executeView($view);
 
     // Check if we have all 5 results.
-    $this->assertEqual(count($view->result), 5, format_string('All @count results returned', array('@count' => count($view->displayHandlers))));
+    $this->assertEqual(count($view->result), 5, format_string('All @count results returned', ['@count' => count($view->displayHandlers)]));
   }
 
   /**
@@ -162,4 +162,5 @@ class FilterTest extends PluginTestBase {
     $this->drupalPostForm(NULL, [], t('Update preview'));
     $this->assertNoText('An illegal choice has been detected.');
   }
+
 }
diff --git a/web/core/modules/views/src/Tests/Plugin/MiniPagerTest.php b/web/core/modules/views/src/Tests/Plugin/MiniPagerTest.php
index 1a73b6980..7e9f57a30 100644
--- a/web/core/modules/views/src/Tests/Plugin/MiniPagerTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/MiniPagerTest.php
@@ -17,14 +17,14 @@ class MiniPagerTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_mini_pager');
+  public static $testViews = ['test_mini_pager'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   /**
    * Nodes used by the test.
@@ -36,7 +36,7 @@ class MiniPagerTest extends PluginTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     // Create a bunch of test nodes.
     for ($i = 0; $i < 20; $i++) {
       $this->nodes[] = $this->drupalCreateNode();
@@ -55,7 +55,7 @@ class MiniPagerTest extends PluginTestBase {
     $this->assertText($this->nodes[1]->label());
     $this->assertText($this->nodes[2]->label());
 
-    $this->drupalGet('test_mini_pager', array('query' => array('page' => 1)));
+    $this->drupalGet('test_mini_pager', ['query' => ['page' => 1]]);
     $this->assertText('‹‹ test', 'The previous link appears.');
     $this->assertText('Page 2', 'The current page info shows the second page.');
     $this->assertText('›› test', 'The next link appears.');
@@ -63,7 +63,7 @@ class MiniPagerTest extends PluginTestBase {
     $this->assertText($this->nodes[4]->label());
     $this->assertText($this->nodes[5]->label());
 
-    $this->drupalGet('test_mini_pager', array('query' => array('page' => 6)));
+    $this->drupalGet('test_mini_pager', ['query' => ['page' => 6]]);
     $this->assertNoText('›› test', 'The next link appears on the last page.');
     $this->assertText('Page 7', 'The current page info shows the last page.');
     $this->assertText('‹‹ test', 'The previous link does not appear on the last page.');
@@ -77,9 +77,9 @@ class MiniPagerTest extends PluginTestBase {
     $this->assertIdentical($view->get_total_rows, TRUE, 'The query was set to calculate the total number of rows.');
     $this->assertEqual(count($this->nodes), $view->total_rows, 'The total row count is equal to the number of nodes.');
 
-    $this->drupalGet('test_mini_pager_total', array('query' => array('page' => 1)));
+    $this->drupalGet('test_mini_pager_total', ['query' => ['page' => 1]]);
     $this->assertText('of ' . count($this->nodes), 'The first page shows the total row count.');
-    $this->drupalGet('test_mini_pager_total', array('query' => array('page' => 6)));
+    $this->drupalGet('test_mini_pager_total', ['query' => ['page' => 6]]);
     $this->assertText('of ' . count($this->nodes), 'The last page shows the total row count.');
 
     // Test a mini pager with just one item per page.
@@ -88,13 +88,13 @@ class MiniPagerTest extends PluginTestBase {
     $this->assertText('Page 1');
     $this->assertText($this->nodes[0]->label());
 
-    $this->drupalGet('test_mini_pager_one', array('query' => array('page' => 1)));
+    $this->drupalGet('test_mini_pager_one', ['query' => ['page' => 1]]);
     $this->assertText('‹‹');
     $this->assertText('Page 2');
     $this->assertText('››');
     $this->assertText($this->nodes[1]->label());
 
-    $this->drupalGet('test_mini_pager_one', array('query' => array('page' => 19)));
+    $this->drupalGet('test_mini_pager_one', ['query' => ['page' => 19]]);
     $this->assertNoText('››');
     $this->assertText('Page 20');
     $this->assertText('‹‹');
diff --git a/web/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php b/web/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php
index bb0632875..d463336c4 100644
--- a/web/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php
@@ -18,14 +18,14 @@ class NumericFormatPluralTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'file', 'language', 'locale');
+  public static $modules = ['views_ui', 'file', 'language', 'locale'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('numeric_test');
+  public static $testViews = ['numeric_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -37,7 +37,7 @@ class NumericFormatPluralTest extends ViewTestBase {
   /**
    * Test plural formatting setting on a numeric views handler.
    */
-  function testNumericFormatPlural() {
+  public function testNumericFormatPlural() {
     // Create a file.
     $file = $this->createFile();
 
@@ -59,7 +59,7 @@ class NumericFormatPluralTest extends ViewTestBase {
     // Assert that changing the settings will change configuration properly.
     $edit = ['options[format_plural_values][0]' => '1 time', 'options[format_plural_values][1]' => '@count times'];
     $this->drupalPostForm(NULL, $edit, t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $config = $this->config('views.view.numeric_test');
     $field_config_prefix = 'display.default.display_options.fields.count.';
@@ -103,7 +103,7 @@ class NumericFormatPluralTest extends ViewTestBase {
       'options[format_plural_values][3]' => '@count time3',
     ];
     $this->drupalPostForm(NULL, $edit, t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $config = $this->config('views.view.numeric_test');
     $field_config_prefix = 'display.default.display_options.fields.count.';
     $this->assertEqual($config->get($field_config_prefix . 'format_plural'), TRUE);
diff --git a/web/core/modules/views/src/Tests/Plugin/PagerTest.php b/web/core/modules/views/src/Tests/Plugin/PagerTest.php
index f922748e4..6ba4c069b 100644
--- a/web/core/modules/views/src/Tests/Plugin/PagerTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/PagerTest.php
@@ -20,14 +20,14 @@ class PagerTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_store_pager_settings', 'test_pager_none', 'test_pager_some', 'test_pager_full', 'test_view_pager_full_zero_items_per_page', 'test_view', 'content');
+  public static $testViews = ['test_store_pager_settings', 'test_pager_none', 'test_pager_some', 'test_pager_full', 'test_view_pager_full_zero_items_per_page', 'test_view', 'content'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'views_ui');
+  public static $modules = ['node', 'views_ui'];
 
   /**
    * String translation storage object.
@@ -45,27 +45,27 @@ class PagerTest extends PluginTestBase {
     // Show the master display so the override selection is shown.
     \Drupal::configFactory()->getEditable('views.settings')->set('ui.show.master_display', TRUE)->save();
 
-    $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
     $this->drupalLogin($admin_user);
     // Test behavior described in
     //   https://www.drupal.org/node/652712#comment-2354918.
 
     $this->drupalGet('admin/structure/views/view/test_view/edit');
 
-    $edit = array(
+    $edit = [
       'pager[type]' => 'full',
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_view/default/pager', $edit, t('Apply'));
-    $edit = array(
+    $edit = [
       'pager_options[items_per_page]' => 20,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_view/default/pager_options', $edit, t('Apply'));
     $this->assertText('20 items');
 
     // Change type and check whether the type is new type is stored.
-    $edit = array(
+    $edit = [
       'pager[type]' => 'mini',
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_view/default/pager', $edit, t('Apply'));
     $this->drupalGet('admin/structure/views/view/test_view/edit');
     $this->assertText('Mini', 'Changed pager plugin, should change some text');
@@ -78,38 +78,38 @@ class PagerTest extends PluginTestBase {
 
     $this->drupalGet('admin/structure/views/view/test_store_pager_settings/edit');
 
-    $edit = array(
+    $edit = [
       'pager[type]' => 'full',
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_store_pager_settings/default/pager', $edit, t('Apply'));
     $this->drupalGet('admin/structure/views/view/test_store_pager_settings/edit');
     $this->assertText('Full');
 
-    $edit = array(
+    $edit = [
       'pager_options[items_per_page]' => 20,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_store_pager_settings/default/pager_options', $edit, t('Apply'));
     $this->assertText('20 items');
 
     // add new display and test the settings again, by override it.
-    $edit = array( );
+    $edit = [ ];
     // Add a display and override the pager settings.
     $this->drupalPostForm('admin/structure/views/view/test_store_pager_settings/edit', $edit, t('Add Page'));
-    $edit = array(
+    $edit = [
       'override[dropdown]' => 'page_1',
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_store_pager_settings/page_1/pager', $edit, t('Apply'));
 
-    $edit = array(
+    $edit = [
       'pager[type]' => 'mini',
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_store_pager_settings/page_1/pager', $edit, t('Apply'));
     $this->drupalGet('admin/structure/views/view/test_store_pager_settings/edit/page_1');
     $this->assertText('Mini', 'Changed pager plugin, should change some text');
 
-    $edit = array(
+    $edit = [
       'pager_options[items_per_page]' => 10,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_store_pager_settings/default/pager_options', $edit, t('Apply'));
     $this->assertText('10 items', 'The default value has been changed.');
     $this->drupalGet('admin/structure/views/view/test_store_pager_settings/edit/page_1');
@@ -128,7 +128,7 @@ class PagerTest extends PluginTestBase {
   public function testNoLimit() {
     // Create 11 nodes and make sure that everyone is returned.
     // We create 11 nodes, because the default pager plugin had 10 items per page.
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
@@ -139,12 +139,12 @@ class PagerTest extends PluginTestBase {
     // Setup and test a offset.
     $view = Views::getView('test_pager_none');
     $view->setDisplay();
-    $pager = array(
+    $pager = [
       'type' => 'none',
-      'options' => array(
+      'options' => [
         'offset' => 3,
-      ),
-    );
+      ],
+    ];
     $view->display_handler->setOption('pager', $pager);
     $this->executeView($view);
 
@@ -157,7 +157,7 @@ class PagerTest extends PluginTestBase {
   }
 
   public function testViewTotalRowsWithoutPager() {
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     for ($i = 0; $i < 23; $i++) {
       $this->drupalCreateNode();
     }
@@ -175,7 +175,7 @@ class PagerTest extends PluginTestBase {
   public function testLimit() {
     // Create 11 nodes and make sure that everyone is returned.
     // We create 11 nodes, because the default pager plugin had 10 items per page.
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
@@ -187,13 +187,13 @@ class PagerTest extends PluginTestBase {
     // Setup and test a offset.
     $view = Views::getView('test_pager_some');
     $view->setDisplay();
-    $pager = array(
+    $pager = [
       'type' => 'none',
-      'options' => array(
+      'options' => [
         'offset' => 8,
         'items_per_page' => 5,
-      ),
-    );
+      ],
+    ];
     $view->display_handler->setOption('pager', $pager);
     $this->executeView($view);
     $this->assertEqual(count($view->result), 3, 'Make sure that only a certain count of items is returned');
@@ -209,7 +209,7 @@ class PagerTest extends PluginTestBase {
   public function testNormalPager() {
     // Create 11 nodes and make sure that everyone is returned.
     // We create 11 nodes, because the default pager plugin had 10 items per page.
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
@@ -221,13 +221,13 @@ class PagerTest extends PluginTestBase {
     // Setup and test a offset.
     $view = Views::getView('test_pager_full');
     $view->setDisplay();
-    $pager = array(
+    $pager = [
       'type' => 'full',
-      'options' => array(
+      'options' => [
         'offset' => 8,
         'items_per_page' => 5,
-      ),
-    );
+      ],
+    ];
     $view->display_handler->setOption('pager', $pager);
     $this->executeView($view);
     $this->assertEqual(count($view->result), 3, 'Make sure that only a certain count of items is returned');
@@ -244,13 +244,13 @@ class PagerTest extends PluginTestBase {
     // Setup and test a offset.
     $view = Views::getView('test_pager_full');
     $view->setDisplay();
-    $pager = array(
+    $pager = [
       'type' => 'full',
-      'options' => array(
+      'options' => [
         'offset' => 0,
         'items_per_page' => 0,
-      ),
-    );
+      ],
+    ];
 
     $view->display_handler->setOption('pager', $pager);
     $this->executeView($view);
@@ -268,7 +268,7 @@ class PagerTest extends PluginTestBase {
   public function testRenderNullPager() {
     // Create 11 nodes and make sure that everyone is returned.
     // We create 11 nodes, because the default pager plugin had 10 items per page.
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
@@ -285,7 +285,7 @@ class PagerTest extends PluginTestBase {
   /**
    * Test the api functions on the view object.
    */
-  function testPagerApi() {
+  public function testPagerApi() {
     $view = Views::getView('test_pager_full');
     $view->setDisplay();
     // On the first round don't initialize the pager.
@@ -348,10 +348,10 @@ class PagerTest extends PluginTestBase {
     $view->save();
 
     // Enable locale, config_translation and language module.
-    $this->container->get('module_installer')->install(array('locale', 'language', 'config_translation'));
+    $this->container->get('module_installer')->install(['locale', 'language', 'config_translation']);
     $this->resetAll();
 
-    $admin_user = $this->drupalCreateUser(array('access content overview', 'administer nodes', 'bypass node access', 'translate configuration'));
+    $admin_user = $this->drupalCreateUser(['access content overview', 'administer nodes', 'bypass node access', 'translate configuration']);
     $this->drupalLogin($admin_user);
 
     $langcode = 'nl';
@@ -362,29 +362,29 @@ class PagerTest extends PluginTestBase {
     // Add Dutch language programmatically.
     ConfigurableLanguage::createFromLangcode($langcode)->save();
 
-    $edit = array(
+    $edit = [
       'translation[config_names][views.view.content][display][default][display_options][pager][options][tags][first]' => '« Eerste',
       'translation[config_names][views.view.content][display][default][display_options][pager][options][tags][previous]' => '‹ Vorige',
       'translation[config_names][views.view.content][display][default][display_options][pager][options][tags][next]' => 'Volgende ›',
       'translation[config_names][views.view.content][display][default][display_options][pager][options][tags][last]' => 'Laatste »',
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/view/content/translate/nl/edit', $edit, t('Save translation'));
 
     // We create 11 nodes, this will give us 3 pages.
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
 
     // Go to the second page so we see both previous and next buttons.
-    $this->drupalGet('nl/admin/content', array('query' => array('page' => 1)));
+    $this->drupalGet('nl/admin/content', ['query' => ['page' => 1]]);
     // Translation mapping..
-    $labels = array(
+    $labels = [
       '« First' => '« Eerste',
       '‹ Previous' => '‹ Vorige',
       'Next ›' => 'Volgende ›',
       'Last »' => 'Laatste »',
-    );
+    ];
     foreach ($labels as $label => $translation) {
       // Check if we can find the translation.
       $this->assertRaw($translation);
@@ -396,7 +396,7 @@ class PagerTest extends PluginTestBase {
    */
   public function testPagerLocale() {
     // Enable locale and language module.
-    $this->container->get('module_installer')->install(array('locale', 'language'));
+    $this->container->get('module_installer')->install(['locale', 'language']);
     $this->resetAll();
     $langcode = 'nl';
 
@@ -407,31 +407,31 @@ class PagerTest extends PluginTestBase {
     ConfigurableLanguage::createFromLangcode($langcode)->save();
 
     // Labels that need translations.
-    $labels = array(
+    $labels = [
       '« First' => '« Eerste',
       '‹ Previous' => '‹ Vorige',
       'Next ›' => 'Volgende ›',
       'Last »' => 'Laatste »',
-    );
+    ];
     foreach ($labels as $label => $translation) {
       // Create source string.
       $source = $this->localeStorage->createString(
-        array(
+        [
           'source' => $label
-        )
+        ]
       );
       $source->save();
       $this->createTranslation($source, $translation, $langcode);
     }
 
     // We create 11 nodes, this will give us 3 pages.
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
 
     // Go to the second page so we see both previous and next buttons.
-    $this->drupalGet('nl/test_pager_full', array('query' => array('page' => 1)));
+    $this->drupalGet('nl/test_pager_full', ['query' => ['page' => 1]]);
     foreach ($labels as $label => $translation) {
       // Check if we can find the translation.
       $this->assertRaw($translation);
@@ -442,11 +442,11 @@ class PagerTest extends PluginTestBase {
    * Creates single translation for source string.
    */
   protected function createTranslation($source, $translation, $langcode) {
-    $values = array(
+    $values = [
       'lid' => $source->lid,
       'language' => $langcode,
       'translation' => $translation,
-    );
+    ];
     return $this->localeStorage->createTranslation($values)->save();
   }
 
diff --git a/web/core/modules/views/src/Tests/Plugin/StyleGridTest.php b/web/core/modules/views/src/Tests/Plugin/StyleGridTest.php
index 49bf67d43..3b8989cbd 100644
--- a/web/core/modules/views/src/Tests/Plugin/StyleGridTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/StyleGridTest.php
@@ -18,12 +18,12 @@ class StyleGridTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_grid');
+  public static $testViews = ['test_grid'];
 
   /**
    * Keeps track of which alignments have been tested.
    */
-  protected $alignmentsTested = array();
+  protected $alignmentsTested = [];
 
   /**
    * {@inheritdoc}
@@ -38,7 +38,7 @@ class StyleGridTest extends PluginTestBase {
    */
   public function testGrid() {
     $view = Views::getView('test_grid');
-    foreach (array('horizontal', 'vertical') as $alignment) {
+    foreach (['horizontal', 'vertical'] as $alignment) {
       $this->assertGrid($view, $alignment, 5);
       $this->assertGrid($view, $alignment, 4);
       $this->assertGrid($view, $alignment, 3);
@@ -73,7 +73,7 @@ class StyleGridTest extends PluginTestBase {
     $output = \Drupal::service('renderer')->renderRoot($output);
     $this->setRawContent($output);
     if (!in_array($alignment, $this->alignmentsTested)) {
-      $result = $this->xpath('//div[contains(@class, "views-view-grid") and contains(@class, :alignment) and contains(@class, :columns)]', array(':alignment' => $alignment, ':columns' => 'cols-' . $columns));
+      $result = $this->xpath('//div[contains(@class, "views-view-grid") and contains(@class, :alignment) and contains(@class, :columns)]', [':alignment' => $alignment, ':columns' => 'cols-' . $columns]);
       $this->assertTrue(count($result), ucfirst($alignment) . " grid markup detected.");
       $this->alignmentsTested[] = $alignment;
     }
@@ -86,10 +86,10 @@ class StyleGridTest extends PluginTestBase {
       case 1: $width = '100'; break;
     }
     // Ensure last column exists.
-    $result = $this->xpath('//div[contains(@class, "views-col") and contains(@class, :columns) and starts-with(@style, :width)]', array(':columns' => 'col-' . $columns, ':width' => 'width: ' . $width));
+    $result = $this->xpath('//div[contains(@class, "views-col") and contains(@class, :columns) and starts-with(@style, :width)]', [':columns' => 'col-' . $columns, ':width' => 'width: ' . $width]);
     $this->assertTrue(count($result), ucfirst($alignment) . " $columns column grid: last column exists and automatic width calculated correctly.");
     // Ensure no extra columns were generated.
-    $result = $this->xpath('//div[contains(@class, "views-col") and contains(@class, :columns)]', array(':columns' => 'col-' . ($columns + 1)));
+    $result = $this->xpath('//div[contains(@class, "views-col") and contains(@class, :columns)]', [':columns' => 'col-' . ($columns + 1)]);
     $this->assertFalse(count($result), ucfirst($alignment) . " $columns column grid: no extraneous columns exist.");
     // Ensure tokens are being replaced in custom row/column classes.
     $result = $this->xpath('//div[contains(@class, "views-col") and contains(@class, "name-John")]');
diff --git a/web/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php b/web/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php
index 1b4a53de9..4e84433dc 100644
--- a/web/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php
@@ -15,14 +15,14 @@ class StyleOpmlTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_style_opml');
+  public static $testViews = ['test_style_opml'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('aggregator');
+  public static $modules = ['aggregator'];
 
   /**
    * {@inheritdoc}
@@ -32,7 +32,7 @@ class StyleOpmlTest extends PluginTestBase {
 
     $this->enableViewsTestModule();
 
-    $admin_user = $this->drupalCreateUser(array('administer news feeds'));
+    $admin_user = $this->drupalCreateUser(['administer news feeds']);
     $this->drupalLogin($admin_user);
   }
 
@@ -41,11 +41,11 @@ class StyleOpmlTest extends PluginTestBase {
    */
   public function testOpmlOutput() {
     // Create a test feed.
-    $values = array(
+    $values = [
       'title' => $this->randomMachineName(10),
       'url' => 'http://example.com/rss.xml',
       'refresh' => '900',
-    );
+    ];
     $feed = $this->container->get('entity.manager')
       ->getStorage('aggregator_feed')
       ->create($values);
diff --git a/web/core/modules/views/src/Tests/Plugin/StyleTableTest.php b/web/core/modules/views/src/Tests/Plugin/StyleTableTest.php
index 9a3f25ef9..537839f7b 100644
--- a/web/core/modules/views/src/Tests/Plugin/StyleTableTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/StyleTableTest.php
@@ -16,7 +16,7 @@ class StyleTableTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_table');
+  public static $testViews = ['test_table'];
 
   /**
    * {@inheritdoc}
@@ -115,13 +115,13 @@ class StyleTableTest extends PluginTestBase {
     $data_set = $this->dataSet();
     $query = db_insert('views_test_data')
       ->fields(array_keys($data_set[0]));
-    $query->values(array(
+    $query->values([
       'name' => 'James McCartney',
       'age' => 0,
       'job' => 'Baby',
       'created' => gmmktime(6, 30, 10, 1, 1, 2000),
       'status' => 1,
-    ));
+    ]);
     $query->execute();
 
     $this->drupalGet('test-table');
@@ -162,11 +162,11 @@ class StyleTableTest extends PluginTestBase {
     // specific style options.
     $display = &$view->getDisplay('default');
     // Set job as the grouping field.
-    $display['display_options']['style']['options']['grouping'][0] = array(
+    $display['display_options']['style']['options']['grouping'][0] = [
       'field' => 'job',
       'rendered' => TRUE,
       'rendered_strip' => FALSE,
-    );
+    ];
     // Clear the caption text, the rendered job field will be used as a caption.
     $display['display_options']['style']['options']['caption'] = '';
     $display['display_options']['style']['options']['summary'] = '';
@@ -175,13 +175,13 @@ class StyleTableTest extends PluginTestBase {
 
     // Add a record containing unsafe markup to be sure it's filtered out.
     $unsafe_markup = '<script>alert("Rapper");</script>';
-    $unsafe_markup_data = array(
+    $unsafe_markup_data = [
       'name' => 'Marshall',
       'age' => 42,
       'job' => $unsafe_markup,
       'created' => gmmktime(0, 0, 0, 2, 15, 2001),
       'status' => 1,
-    );
+    ];
     $database = $this->container->get('database');
     $database->insert('views_test_data')
       ->fields(array_keys($unsafe_markup_data))
@@ -189,13 +189,13 @@ class StyleTableTest extends PluginTestBase {
       ->execute();
 
     $this->drupalGet('test-table');
-    $expected_captions = array(
+    $expected_captions = [
       'Job: Speaker',
       'Job: Songwriter',
       'Job: Drummer',
       'Job: Singer',
       'Job: ' . $unsafe_markup,
-    );
+    ];
 
     // Ensure that we don't find the caption containing unsafe markup.
     $this->assertNoRaw($unsafe_markup, "Didn't find caption containing unsafe markup.");
@@ -211,13 +211,13 @@ class StyleTableTest extends PluginTestBase {
     $view->save();
 
     $this->drupalGet('test-table');
-    $expected_captions = array(
+    $expected_captions = [
       'Speaker',
       'Songwriter',
       'Drummer',
       'Singer',
       $unsafe_markup,
-    );
+    ];
 
     // Ensure that we don't find the caption containing unsafe markup.
     $this->assertNoRaw($unsafe_markup, "Didn't find caption containing unsafe markup.");
diff --git a/web/core/modules/views/src/Tests/Plugin/StyleTest.php b/web/core/modules/views/src/Tests/Plugin/StyleTest.php
index 6773c83cf..e05927561 100644
--- a/web/core/modules/views/src/Tests/Plugin/StyleTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/StyleTest.php
@@ -22,7 +22,7 @@ class StyleTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Stores the SimpleXML representation of the output.
@@ -87,7 +87,7 @@ class StyleTest extends ViewTestBase {
     $this->assertTrue(strpos($output, $random_text) !== FALSE, 'Make sure that the rendering of the style plugin appears in the output of the view.');
   }
 
-  function testGrouping() {
+  public function testGrouping() {
     $this->_testGrouping(FALSE);
     $this->_testGrouping(TRUE);
   }
@@ -95,57 +95,57 @@ class StyleTest extends ViewTestBase {
   /**
    * Tests the grouping features of styles.
    */
-  function _testGrouping($stripped = FALSE) {
+  public function _testGrouping($stripped = FALSE) {
     $view = Views::getView('test_view');
     $view->setDisplay();
     // Setup grouping by the job and the age field.
     $view->initStyle();
-    $view->style_plugin->options['grouping'] = array(
-      array('field' => 'job'),
-      array('field' => 'age'),
-    );
+    $view->style_plugin->options['grouping'] = [
+      ['field' => 'job'],
+      ['field' => 'age'],
+    ];
 
     // Reduce the amount of items to make the test a bit easier.
     // Set up the pager.
-    $view->displayHandlers->get('default')->overrideOption('pager', array(
+    $view->displayHandlers->get('default')->overrideOption('pager', [
       'type' => 'some',
-      'options' => array('items_per_page' => 3),
-    ));
+      'options' => ['items_per_page' => 3],
+    ]);
 
     // Add the job and age field.
-    $fields = array(
-      'name' => array(
+    $fields = [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
         'label' => 'Name',
-      ),
-      'job' => array(
+      ],
+      'job' => [
         'id' => 'job',
         'table' => 'views_test_data',
         'field' => 'job',
         'relationship' => 'none',
         'label' => 'Job',
-      ),
-      'age' => array(
+      ],
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
         'label' => 'Age',
-      ),
-    );
+      ],
+    ];
     $view->displayHandlers->get('default')->overrideOption('fields', $fields);
 
     // Now run the query and groupby the result.
     $this->executeView($view);
 
-    $expected = array();
-    $expected['Job: Singer'] = array();
+    $expected = [];
+    $expected['Job: Singer'] = [];
     $expected['Job: Singer']['group'] = 'Job: Singer';
     $expected['Job: Singer']['level'] = 0;
-    $expected['Job: Singer']['rows']['Age: 25'] = array();
+    $expected['Job: Singer']['rows']['Age: 25'] = [];
     $expected['Job: Singer']['rows']['Age: 25']['group'] = 'Age: 25';
     $expected['Job: Singer']['rows']['Age: 25']['level'] = 1;
     $expected['Job: Singer']['rows']['Age: 25']['rows'][0] = new ResultRow(['index' => 0]);
@@ -153,7 +153,7 @@ class StyleTest extends ViewTestBase {
     $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_data_job = 'Singer';
     $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_data_age = '25';
     $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_data_id = '1';
-    $expected['Job: Singer']['rows']['Age: 27'] = array();
+    $expected['Job: Singer']['rows']['Age: 27'] = [];
     $expected['Job: Singer']['rows']['Age: 27']['group'] = 'Age: 27';
     $expected['Job: Singer']['rows']['Age: 27']['level'] = 1;
     $expected['Job: Singer']['rows']['Age: 27']['rows'][1] = new ResultRow(['index' => 1]);
@@ -161,10 +161,10 @@ class StyleTest extends ViewTestBase {
     $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_data_job = 'Singer';
     $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_data_age = '27';
     $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_data_id = '2';
-    $expected['Job: Drummer'] = array();
+    $expected['Job: Drummer'] = [];
     $expected['Job: Drummer']['group'] = 'Job: Drummer';
     $expected['Job: Drummer']['level'] = 0;
-    $expected['Job: Drummer']['rows']['Age: 28'] = array();
+    $expected['Job: Drummer']['rows']['Age: 28'] = [];
     $expected['Job: Drummer']['rows']['Age: 28']['group'] = 'Age: 28';
     $expected['Job: Drummer']['rows']['Age: 28']['level'] = 1;
     $expected['Job: Drummer']['rows']['Age: 28']['rows'][2] = new ResultRow(['index' => 2]);
@@ -190,8 +190,8 @@ class StyleTest extends ViewTestBase {
       $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_data_job = 'Drummer' . $rand3;
       $expected['Job: Drummer']['group'] = 'Job: Drummer';
 
-      $view->style_plugin->options['grouping'][0] = array('field' => 'job', 'rendered' => TRUE, 'rendered_strip' => TRUE);
-      $view->style_plugin->options['grouping'][1] = array('field' => 'age', 'rendered' => TRUE, 'rendered_strip' => TRUE);
+      $view->style_plugin->options['grouping'][0] = ['field' => 'job', 'rendered' => TRUE, 'rendered_strip' => TRUE];
+      $view->style_plugin->options['grouping'][1] = ['field' => 'age', 'rendered' => TRUE, 'rendered_strip' => TRUE];
     }
 
 
@@ -226,10 +226,10 @@ class StyleTest extends ViewTestBase {
     $view->setDisplay();
     $view->initStyle();
     $view->displayHandlers->get('default')->overrideOption('fields', $fields);
-    $view->style_plugin->options['grouping'] = array(
-      array('field' => 'job'),
-      array('field' => 'age'),
-    );
+    $view->style_plugin->options['grouping'] = [
+      ['field' => 'job'],
+      ['field' => 'age'],
+    ];
 
     $this->executeView($view);
 
@@ -237,8 +237,8 @@ class StyleTest extends ViewTestBase {
       $view->result[0]->views_test_data_job .= $rand1;
       $view->result[1]->views_test_data_job .= $rand2;
       $view->result[2]->views_test_data_job .= $rand3;
-      $view->style_plugin->options['grouping'][0] = array('field' => 'job', 'rendered' => TRUE, 'rendered_strip' => TRUE);
-      $view->style_plugin->options['grouping'][1] = array('field' => 'age', 'rendered' => TRUE, 'rendered_strip' => TRUE);
+      $view->style_plugin->options['grouping'][0] = ['field' => 'job', 'rendered' => TRUE, 'rendered_strip' => TRUE];
+      $view->style_plugin->options['grouping'][1] = ['field' => 'age', 'rendered' => TRUE, 'rendered_strip' => TRUE];
     }
 
     $sets_new_rendered = $view->style_plugin->renderGrouping($view->result, $view->style_plugin->options['grouping'], TRUE);
@@ -256,7 +256,7 @@ class StyleTest extends ViewTestBase {
   /**
    * Tests custom css classes.
    */
-  function testCustomRowClasses() {
+  public function testCustomRowClasses() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
diff --git a/web/core/modules/views/src/Tests/Plugin/ViewsBulkTest.php b/web/core/modules/views/src/Tests/Plugin/ViewsBulkTest.php
new file mode 100644
index 000000000..269f5b05b
--- /dev/null
+++ b/web/core/modules/views/src/Tests/Plugin/ViewsBulkTest.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Drupal\views\Tests\Plugin;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests views bulk operation selection.
+ *
+ * @group views
+ */
+class ViewsBulkTest extends WebTestBase {
+
+  /**
+   * An admin user
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $admin_user;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'views'];
+
+  public function setUp() {
+    parent::setUp();
+
+    $this->drupalCreateContentType(['type' => 'page']);
+    $this->admin_user = $this->createUser(['bypass node access', 'administer nodes', 'access content overview']);
+  }
+
+  /**
+   * Tests bulk selection.
+   */
+  public function testBulkSelection() {
+
+    // Create first node, set updated time to the past.
+    $node_1 = $this->drupalCreateNode([
+      'type' => 'page',
+      'title' => 'The first node',
+      'changed' => \Drupal::time()->getRequestTime() - 180
+    ]);
+
+    // Login as administrator and go to admin/content.
+    $this->drupalLogin($this->admin_user);
+    $this->drupalGet('admin/content');
+    $this->assertText($node_1->getTitle());
+
+    // Create second node now that the admin overview has been rendered.
+    $node_2 = $this->drupalCreateNode([
+      'type' => 'page',
+      'title' => 'The second node',
+      'changed' => \Drupal::time()->getRequestTime() - 120
+    ]);
+
+    // Now click 'Apply to selected items' and assert the first node is selected
+    // on the confirm form.
+    $this->drupalPostForm(NULL, ['node_bulk_form[0]' => TRUE], 'Apply to selected items');
+    $this->assertText($node_1->getTitle());
+    $this->assertNoText($node_2->getTitle());
+
+    // Change the pager limit to 2.
+    $this->config('views.view.content')->set('display.default.display_options.pager.options.items_per_page', 2)->save();
+
+    // Render the overview page again.
+    $this->drupalGet('admin/content');
+
+    // Create third node now that the admin overview has been rendered.
+    $node_3 = $this->drupalCreateNode([
+        'type' => 'page',
+        'title' => 'The third node']
+    );
+
+    // Now click 'Apply to selected items' and assert the second node is
+    // selected on the confirm form.
+    $this->drupalPostForm(NULL, ['node_bulk_form[1]' => TRUE], 'Apply to selected items');
+    $this->assertText($node_1->getTitle());
+    $this->assertNoText($node_3->getTitle());
+  }
+
+}
diff --git a/web/core/modules/views/src/Tests/Plugin/ViewsFormTest.php b/web/core/modules/views/src/Tests/Plugin/ViewsFormTest.php
index 01f7a8cff..a73018931 100644
--- a/web/core/modules/views/src/Tests/Plugin/ViewsFormTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/ViewsFormTest.php
@@ -16,7 +16,7 @@ class ViewsFormTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('action_bulk_test');
+  public static $modules = ['action_bulk_test'];
 
   /**
    * Tests the Views form wrapper.
diff --git a/web/core/modules/views/src/Tests/Plugin/ViewsSqlExceptionTest.php b/web/core/modules/views/src/Tests/Plugin/ViewsSqlExceptionTest.php
index 27504d2aa..d3c93de44 100644
--- a/web/core/modules/views/src/Tests/Plugin/ViewsSqlExceptionTest.php
+++ b/web/core/modules/views/src/Tests/Plugin/ViewsSqlExceptionTest.php
@@ -17,7 +17,7 @@ class ViewsSqlExceptionTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_filter');
+  public static $testViews = ['test_filter'];
 
   /**
    * {@inheritdoc}
@@ -46,16 +46,16 @@ class ViewsSqlExceptionTest extends PluginTestBase {
     $view->initDisplay();
 
     // Adding a filter that will result in an invalid query.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'test_filter' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'test_filter' => [
         'id' => 'test_exception_filter',
         'table' => 'views_test_data',
         'field' => 'name',
         'operator' => '=',
         'value' => 'John',
         'group' => 0,
-      ),
-    ));
+      ],
+    ]);
 
     try {
       $this->executeView($view);
diff --git a/web/core/modules/views/src/Tests/SearchIntegrationTest.php b/web/core/modules/views/src/Tests/SearchIntegrationTest.php
index e71e1594d..1b6ab8915 100644
--- a/web/core/modules/views/src/Tests/SearchIntegrationTest.php
+++ b/web/core/modules/views/src/Tests/SearchIntegrationTest.php
@@ -16,14 +16,14 @@ class SearchIntegrationTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'search');
+  public static $modules = ['node', 'search'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_search');
+  public static $testViews = ['test_search'];
 
   /**
    * Tests search integration.
@@ -36,7 +36,7 @@ class SearchIntegrationTest extends ViewTestBase {
     // "sandwich", and one containing "cola is good with pizza". Make the
     // second node link to the first.
     $node['title'] = 'pizza';
-    $node['body'] = array(array('value' => 'pizza'));
+    $node['body'] = [['value' => 'pizza']];
     $node['type'] = $type->id();
     $this->drupalCreateNode($node);
 
@@ -44,11 +44,11 @@ class SearchIntegrationTest extends ViewTestBase {
     $node_url = $this->getUrl();
 
     $node['title'] = 'sandwich';
-    $node['body'] = array(array('value' => 'sandwich with a <a href="' . $node_url . '">link to first node</a>'));
+    $node['body'] = [['value' => 'sandwich with a <a href="' . $node_url . '">link to first node</a>']];
     $this->drupalCreateNode($node);
 
     $node['title'] = 'cola';
-    $node['body'] = array(array('value' => 'cola is good with pizza'));
+    $node['body'] = [['value' => 'cola is good with pizza']];
     $node['type'] = $type->id();
     $this->drupalCreateNode($node);
 
@@ -141,8 +141,8 @@ class SearchIntegrationTest extends ViewTestBase {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertOneLink($label) {
-    $links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
-    $message = SafeMarkup::format('Link with label %label found once.', array('%label' => $label));
+    $links = $this->xpath('//a[normalize-space(text())=:label]', [':label' => $label]);
+    $message = SafeMarkup::format('Link with label %label found once.', ['%label' => $label]);
     return $this->assert(isset($links[0]) && !isset($links[1]), $message);
   }
 
diff --git a/web/core/modules/views/src/Tests/SearchMultilingualTest.php b/web/core/modules/views/src/Tests/SearchMultilingualTest.php
index 5f583f097..f53421917 100644
--- a/web/core/modules/views/src/Tests/SearchMultilingualTest.php
+++ b/web/core/modules/views/src/Tests/SearchMultilingualTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\views\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\node\NodeInterface;
 
 /**
  * Tests search integration filters with multilingual nodes.
@@ -16,14 +17,14 @@ class SearchMultilingualTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'search', 'language', 'content_translation');
+  public static $modules = ['node', 'search', 'language', 'content_translation'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_search');
+  public static $testViews = ['test_search'];
 
   /**
    * Tests search with multilingual nodes.
@@ -31,7 +32,7 @@ class SearchMultilingualTest extends ViewTestBase {
   public function testMultilingualSearchFilter() {
     // Create a user with admin for languages, content, and content types, plus
     // the ability to access content and searches.
-    $user = $this->drupalCreateUser(array('administer nodes', 'administer content types', 'administer languages', 'administer content translation', 'access content', 'search content'));
+    $user = $this->drupalCreateUser(['administer nodes', 'administer content types', 'administer languages', 'administer content translation', 'access content', 'search content']);
     $this->drupalLogin($user);
 
     // Add Spanish language programmatically.
@@ -39,28 +40,28 @@ class SearchMultilingualTest extends ViewTestBase {
 
     // Create a content type and make it translatable.
     $type = $this->drupalCreateContentType();
-    $edit = array(
+    $edit = [
       'language_configuration[language_alterable]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/types/manage/' . $type->id(), $edit, t('Save content type'));
-    $edit = array(
+    $edit = [
       'entity_types[node]' => TRUE,
       'settings[node][' . $type->id() . '][translatable]' => TRUE,
       'settings[node][' . $type->id() . '][fields][title]' => TRUE,
       'settings[node][' . $type->id() . '][fields][body]' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
     \Drupal::entityManager()->clearCachedDefinitions();
 
     // Add a node in English, with title "sandwich".
-    $values = array(
+    $values = [
       'title' => 'sandwich',
       'type' => $type->id(),
-    );
+    ];
     $node = $this->drupalCreateNode($values);
 
     // "Translate" this node into Spanish, with title "pizza".
-    $node->addTranslation('es', array('title' => 'pizza', 'status' => NODE_PUBLISHED));
+    $node->addTranslation('es', ['title' => 'pizza', 'status' => NodeInterface::PUBLISHED]);
     $node->save();
 
     // Run cron so that the search index tables are updated.
diff --git a/web/core/modules/views/src/Tests/Update/EntityViewsDataUpdateTest.php b/web/core/modules/views/src/Tests/Update/EntityViewsDataUpdateTest.php
index 1778043a6..472829cab 100644
--- a/web/core/modules/views/src/Tests/Update/EntityViewsDataUpdateTest.php
+++ b/web/core/modules/views/src/Tests/Update/EntityViewsDataUpdateTest.php
@@ -35,11 +35,11 @@ class EntityViewsDataUpdateTest extends UpdatePathTestBase {
     $view->initHandlers();
 
     // Extract the fields from the test view that were updated.
-    /** @var \Drupal\views\Plugin\views\field\Field $field */
+    /** @var \Drupal\views\Plugin\views\field\EntityField $field */
     $created = $view->field['created'];
-    /** @var \Drupal\views\Plugin\views\field\Field $field */
+    /** @var \Drupal\views\Plugin\views\field\EntityField $field */
     $created_1 = $view->field['created_1'];
-    /** @var \Drupal\views\Plugin\views\field\Field $field */
+    /** @var \Drupal\views\Plugin\views\field\EntityField $field */
     $created_2 = $view->field['created_2'];
 
     // Make sure the plugins were converted from date to field.
diff --git a/web/core/modules/views/src/Tests/ViewAjaxTest.php b/web/core/modules/views/src/Tests/ViewAjaxTest.php
index c1705a5b3..b8b2730e6 100644
--- a/web/core/modules/views/src/Tests/ViewAjaxTest.php
+++ b/web/core/modules/views/src/Tests/ViewAjaxTest.php
@@ -17,7 +17,7 @@ class ViewAjaxTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_ajax_view');
+  public static $testViews = ['test_ajax_view'];
 
   protected function setUp() {
     parent::setUp();
@@ -38,14 +38,14 @@ class ViewAjaxTest extends ViewTestBase {
     $this->assertEqual($drupal_settings['views']['ajaxViews'][$view_entry]['view_name'], 'test_ajax_view', 'The view\'s ajaxViews array entry has the correct \'view_name\' key.');
     $this->assertEqual($drupal_settings['views']['ajaxViews'][$view_entry]['view_display_id'], 'page_1', 'The view\'s ajaxViews array entry has the correct \'view_display_id\' key.');
 
-    $data = array();
+    $data = [];
     $data['view_name'] = 'test_ajax_view';
     $data['view_display_id'] = 'test_ajax_view';
 
-    $post = array(
+    $post = [
       'view_name' => 'test_ajax_view',
       'view_display_id' => 'page_1',
-    );
+    ];
     $post += $this->getAjaxPageStatePostData();
     $response = $this->drupalPost('views/ajax', '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]);
     $data = Json::decode($response);
diff --git a/web/core/modules/views/src/Tests/ViewElementTest.php b/web/core/modules/views/src/Tests/ViewElementTest.php
index 2ec2e679a..ff11dc2c7 100644
--- a/web/core/modules/views/src/Tests/ViewElementTest.php
+++ b/web/core/modules/views/src/Tests/ViewElementTest.php
@@ -16,7 +16,7 @@ class ViewElementTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view_embed');
+  public static $testViews = ['test_view_embed'];
 
   protected function setUp() {
     parent::setUp();
@@ -60,23 +60,23 @@ class ViewElementTest extends ViewTestBase {
     $this->assertEqual(count($xpath), 5);
 
     // Add an argument and save the view.
-    $view->displayHandlers->get('default')->overrideOption('arguments', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('arguments', [
+      'age' => [
         'default_action' => 'ignore',
         'title' => '',
         'default_argument_type' => 'fixed',
-        'validate' => array(
+        'validate' => [
           'type' => 'none',
           'fail' => 'not found',
-        ),
+        ],
         'break_phrase' => FALSE,
         'not' => FALSE,
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'plugin_id' => 'numeric',
-      )
-    ));
+      ]
+    ]);
     $view->save();
 
     // Test the render array again.
@@ -129,23 +129,23 @@ class ViewElementTest extends ViewTestBase {
     $this->assertEqual(count($xpath), 5);
 
     // Add an argument and save the view.
-    $view->displayHandlers->get('default')->overrideOption('arguments', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('arguments', [
+      'age' => [
         'default_action' => 'ignore',
         'title' => '',
         'default_argument_type' => 'fixed',
-        'validate' => array(
+        'validate' => [
           'type' => 'none',
           'fail' => 'not found',
-        ),
+        ],
         'break_phrase' => FALSE,
         'not' => FALSE,
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'plugin_id' => 'numeric',
-      )
-    ));
+      ]
+    ]);
     $view->save();
 
     // Test the render array again.
diff --git a/web/core/modules/views/src/Tests/ViewKernelTestBase.php b/web/core/modules/views/src/Tests/ViewKernelTestBase.php
index 3a5df3457..b39bc7473 100644
--- a/web/core/modules/views/src/Tests/ViewKernelTestBase.php
+++ b/web/core/modules/views/src/Tests/ViewKernelTestBase.php
@@ -26,7 +26,7 @@ abstract class ViewKernelTestBase extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'views', 'views_test_config', 'views_test_data', 'user');
+  public static $modules = ['system', 'views', 'views_test_config', 'views_test_data', 'user'];
 
   /**
    * {@inheritdoc}
@@ -39,11 +39,11 @@ abstract class ViewKernelTestBase extends KernelTestBase {
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
 
-    $this->installSchema('system', array('sequences'));
+    $this->installSchema('system', ['sequences']);
     $this->setUpFixtures();
 
     if ($import_test_views) {
-      ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+      ViewTestData::createTestViews(get_class($this), ['views_test_config']);
     }
   }
 
@@ -56,13 +56,13 @@ abstract class ViewKernelTestBase extends KernelTestBase {
   protected function setUpFixtures() {
     // First install the system module. Many Views have Page displays have menu
     // links, and for those to work, the system menus must already be present.
-    $this->installConfig(array('system'));
+    $this->installConfig(['system']);
 
     // Define the schema and views data variable before enabling the test module.
     \Drupal::state()->set('views_test_data_schema', $this->schemaDefinition());
     \Drupal::state()->set('views_test_data_views_data', $this->viewsData());
 
-    $this->installConfig(array('views', 'views_test_config', 'views_test_data'));
+    $this->installConfig(['views', 'views_test_config', 'views_test_data']);
     foreach ($this->schemaDefinition() as $table => $schema) {
       $this->installSchema('views_test_data', $table);
     }
@@ -113,7 +113,7 @@ abstract class ViewKernelTestBase extends KernelTestBase {
    * @param array $args
    *   (optional) An array of the view arguments to use for the view.
    */
-  protected function executeView($view, array $args = array()) {
+  protected function executeView($view, array $args = []) {
     $view->setDisplay();
     $view->preExecute($args);
     $view->execute();
diff --git a/web/core/modules/views/src/Tests/ViewRenderTest.php b/web/core/modules/views/src/Tests/ViewRenderTest.php
index 4bde8b279..0b3f0ee25 100644
--- a/web/core/modules/views/src/Tests/ViewRenderTest.php
+++ b/web/core/modules/views/src/Tests/ViewRenderTest.php
@@ -16,7 +16,7 @@ class ViewRenderTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view_render');
+  public static $testViews = ['test_view_render'];
 
   protected function setUp() {
     parent::setUp();
diff --git a/web/core/modules/views/src/Tests/ViewResultAssertionTrait.php b/web/core/modules/views/src/Tests/ViewResultAssertionTrait.php
index 62ae67ce2..00501f5f0 100644
--- a/web/core/modules/views/src/Tests/ViewResultAssertionTrait.php
+++ b/web/core/modules/views/src/Tests/ViewResultAssertionTrait.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\views\Tests;
 
-use Drupal\views\Plugin\views\field\Field;
+use Drupal\views\Plugin\views\field\EntityField;
 
 /**
  * Provides a class for assertions to check for the expected result of a View.
@@ -30,7 +30,7 @@ trait ViewResultAssertionTrait {
    * @return bool
    *   TRUE if the assertion succeeded, or FALSE otherwise.
    */
-  protected function assertIdenticalResultset($view, $expected_result, $column_map = array(), $message = NULL) {
+  protected function assertIdenticalResultset($view, $expected_result, $column_map = [], $message = NULL) {
     return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, 'assertIdentical', $message);
   }
 
@@ -53,7 +53,7 @@ trait ViewResultAssertionTrait {
    * @return bool
    *   TRUE if the assertion succeeded, or FALSE otherwise.
    */
-  protected function assertNotIdenticalResultset($view, $expected_result, $column_map = array(), $message = NULL) {
+  protected function assertNotIdenticalResultset($view, $expected_result, $column_map = [], $message = NULL) {
     return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, 'assertNotIdentical', $message);
   }
 
@@ -81,9 +81,9 @@ trait ViewResultAssertionTrait {
    */
   protected function assertIdenticalResultsetHelper($view, $expected_result, $column_map, $assert_method, $message = NULL) {
     // Convert $view->result to an array of arrays.
-    $result = array();
+    $result = [];
     foreach ($view->result as $key => $value) {
-      $row = array();
+      $row = [];
       foreach ($column_map as $view_column => $expected_column) {
         if (property_exists($value, $view_column)) {
           $row[$expected_column] = (string) $value->$view_column;
@@ -91,7 +91,7 @@ trait ViewResultAssertionTrait {
         // The comparison will be done on the string representation of the value.
         // For entity fields we don't have the raw value. Let's try to fetch it
         // using the entity itself.
-        elseif (empty($value->$view_column) && isset($view->field[$expected_column]) && ($field = $view->field[$expected_column]) && $field instanceof Field) {
+        elseif (empty($value->$view_column) && isset($view->field[$expected_column]) && ($field = $view->field[$expected_column]) && $field instanceof EntityField) {
           $column = NULL;
           if (count(explode(':', $view_column)) == 2) {
             $column = explode(':', $view_column)[1];
@@ -104,7 +104,7 @@ trait ViewResultAssertionTrait {
 
     // Remove the columns we don't need from the expected result.
     foreach ($expected_result as $key => $value) {
-      $row = array();
+      $row = [];
       foreach ($column_map as $expected_column) {
         // The comparison will be done on the string representation of the value.
         if (is_object($value)) {
@@ -136,10 +136,10 @@ trait ViewResultAssertionTrait {
     // Do the actual comparison.
     if (!isset($message)) {
       $not = (strpos($assert_method, 'Not') ? 'not' : '');
-      $message = format_string("Actual result <pre>\n@actual\n</pre> is $not identical to expected <pre>\n@expected\n</pre>", array(
+      $message = format_string("Actual result <pre>\n@actual\n</pre> is $not identical to expected <pre>\n@expected\n</pre>", [
         '@actual' => var_export($result, TRUE),
         '@expected' => var_export($expected_result, TRUE),
-      ));
+      ]);
     }
     return $this->$assert_method($result, $expected_result, $message);
   }
diff --git a/web/core/modules/views/src/Tests/ViewTestBase.php b/web/core/modules/views/src/Tests/ViewTestBase.php
index 6ce349467..720d528cd 100644
--- a/web/core/modules/views/src/Tests/ViewTestBase.php
+++ b/web/core/modules/views/src/Tests/ViewTestBase.php
@@ -25,12 +25,12 @@ abstract class ViewTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('views', 'views_test_config');
+  public static $modules = ['views', 'views_test_config'];
 
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
     if ($import_test_views) {
-      ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+      ViewTestData::createTestViews(get_class($this), ['views_test_config']);
     }
   }
 
@@ -45,7 +45,7 @@ abstract class ViewTestBase extends WebTestBase {
     \Drupal::state()->set('views_test_data_schema', $this->schemaDefinition());
     \Drupal::state()->set('views_test_data_views_data', $this->viewsData());
 
-    \Drupal::service('module_installer')->install(array('views_test_data'));
+    \Drupal::service('module_installer')->install(['views_test_data']);
     $this->resetAll();
     $this->rebuildContainer();
     $this->container->get('module_handler')->reload();
@@ -91,7 +91,7 @@ abstract class ViewTestBase extends WebTestBase {
    *
    * @param string $id
    *   The HTML ID of the button
-   * @param string $label.
+   * @param string $label
    *   The expected label for the button.
    * @param string $message
    *   (optional) A custom message to display with the assertion. If no custom
@@ -101,7 +101,7 @@ abstract class ViewTestBase extends WebTestBase {
    *   TRUE if the assertion was successful, or FALSE on failure.
    */
   protected function helperButtonHasLabel($id, $expected_label, $message = 'Label has the expected value: %label.') {
-    return $this->assertFieldById($id, $expected_label, t($message, array('%label' => $expected_label)));
+    return $this->assertFieldById($id, $expected_label, t($message, ['%label' => $expected_label]));
   }
 
   /**
@@ -112,7 +112,7 @@ abstract class ViewTestBase extends WebTestBase {
    * @param array $args
    *   (optional) An array of the view arguments to use for the view.
    */
-  protected function executeView(ViewExecutable $view, $args = array()) {
+  protected function executeView(ViewExecutable $view, $args = []) {
     // A view does not really work outside of a request scope, due to many
     // dependencies like the current user.
     $view->setDisplay();
diff --git a/web/core/modules/views/src/Tests/ViewTestData.php b/web/core/modules/views/src/Tests/ViewTestData.php
index d54902d6a..7b9bc9ebe 100644
--- a/web/core/modules/views/src/Tests/ViewTestData.php
+++ b/web/core/modules/views/src/Tests/ViewTestData.php
@@ -23,7 +23,7 @@ class ViewTestData {
    *   The module directories to look in for test views.
    */
   public static function createTestViews($class, array $modules) {
-    $views = array();
+    $views = [];
     while ($class) {
       if (property_exists($class, 'testViews')) {
         $views = array_merge($views, $class::$testViews);
@@ -60,57 +60,57 @@ class ViewTestData {
    * Returns the schema definition.
    */
   public static function schemaDefinition() {
-    $schema['views_test_data'] = array(
+    $schema['views_test_data'] = [
       'description' => 'Basic test table for Views tests.',
-      'fields' => array(
-        'id' => array(
+      'fields' => [
+        'id' => [
           'type' => 'serial',
           'unsigned' => TRUE,
           'not null' => TRUE,
-        ),
-        'name' => array(
+        ],
+        'name' => [
           'description' => "A person's name",
           'type' => 'varchar_ascii',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'age' => array(
+        ],
+        'age' => [
           'description' => "The person's age",
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
-          'default' => 0),
-        'job' => array(
+          'default' => 0],
+        'job' => [
           'description' => "The person's job",
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
           'default' => 'Undefined',
-        ),
-        'created' => array(
+        ],
+        'created' => [
           'description' => "The creation date of this record",
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'status' => array(
+        ],
+        'status' => [
           'description' => "The status of this record",
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
           'default' => 0,
-        ),
-      ),
-      'primary key' => array('id'),
-      'unique keys' => array(
-        'name' => array('name')
-      ),
-      'indexes' => array(
-        'ages' => array('age'),
-      ),
-    );
+        ],
+      ],
+      'primary key' => ['id'],
+      'unique keys' => [
+        'name' => ['name']
+      ],
+      'indexes' => [
+        'ages' => ['age'],
+      ],
+    ];
     return $schema;
   }
 
@@ -119,109 +119,109 @@ class ViewTestData {
    */
   public static function viewsData() {
     // Declaration of the base table.
-    $data['views_test_data']['table'] = array(
+    $data['views_test_data']['table'] = [
       'group' => 'Views test',
-      'base' => array(
+      'base' => [
         'field' => 'id',
         'title' => 'Views test data',
         'help' => 'Users who have created accounts on your site.',
-      ),
-    );
+      ],
+    ];
 
     // Declaration of fields.
-    $data['views_test_data']['id'] = array(
+    $data['views_test_data']['id'] = [
       'title' => 'ID',
       'help' => 'The test data ID',
-      'field' => array(
+      'field' => [
         'id' => 'numeric',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'numeric',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'numeric',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
-    $data['views_test_data']['name'] = array(
+      ],
+    ];
+    $data['views_test_data']['name'] = [
       'title' => 'Name',
       'help' => 'The name of the person',
-      'field' => array(
+      'field' => [
         'id' => 'standard',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'string',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'string',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
-    $data['views_test_data']['age'] = array(
+      ],
+    ];
+    $data['views_test_data']['age'] = [
       'title' => 'Age',
       'help' => 'The age of the person',
-      'field' => array(
+      'field' => [
         'id' => 'numeric',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'numeric',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'numeric',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
-    $data['views_test_data']['job'] = array(
+      ],
+    ];
+    $data['views_test_data']['job'] = [
       'title' => 'Job',
       'help' => 'The job of the person',
-      'field' => array(
+      'field' => [
         'id' => 'standard',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'string',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'string',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
-    $data['views_test_data']['created'] = array(
+      ],
+    ];
+    $data['views_test_data']['created'] = [
       'title' => 'Created',
       'help' => 'The creation date of this record',
-      'field' => array(
+      'field' => [
         'id' => 'date',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'id' => 'date',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'date',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'date',
-      ),
-    );
-    $data['views_test_data']['status'] = array(
+      ],
+    ];
+    $data['views_test_data']['status'] = [
       'title' => 'Status',
       'help' => 'The status of this record',
-      'field' => array(
+      'field' => [
         'id' => 'boolean',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'id' => 'boolean',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'id' => 'standard',
-      ),
-    );
+      ],
+    ];
     return $data;
   }
 
@@ -229,43 +229,43 @@ class ViewTestData {
    * Returns a very simple test dataset.
    */
   public static function dataSet() {
-    return array(
-      array(
+    return [
+      [
         'name' => 'John',
         'age' => 25,
         'job' => 'Singer',
         'created' => gmmktime(0, 0, 0, 1, 1, 2000),
         'status' => 1,
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
         'age' => 27,
         'job' => 'Singer',
         'created' => gmmktime(0, 0, 0, 1, 2, 2000),
         'status' => 0,
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
         'age' => 28,
         'job' => 'Drummer',
         'created' => gmmktime(6, 30, 30, 1, 1, 2000),
         'status' => 1,
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
         'age' => 26,
         'job' => 'Songwriter',
         'created' => gmmktime(6, 0, 0, 1, 1, 2000),
         'status' => 0,
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
         'age' => 30,
         'job' => 'Speaker',
         'created' => gmmktime(6, 30, 10, 1, 1, 2000),
         'status' => 1,
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/modules/views/src/Tests/ViewsEscapingTest.php b/web/core/modules/views/src/Tests/ViewsEscapingTest.php
index 34f51480e..1ec3a9f3d 100644
--- a/web/core/modules/views/src/Tests/ViewsEscapingTest.php
+++ b/web/core/modules/views/src/Tests/ViewsEscapingTest.php
@@ -14,7 +14,7 @@ class ViewsEscapingTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_page_display', 'test_field_header');
+  public static $testViews = ['test_page_display', 'test_field_header'];
 
   /**
    * Used by WebTestBase::setup()
@@ -25,7 +25,7 @@ class ViewsEscapingTest extends ViewTestBase {
    *
    * @see \Drupal\simpletest\WebTestBase::setup()
    */
-  public static $modules = array('views', 'theme_test');
+  public static $modules = ['views', 'theme_test'];
 
   /**
    * {@inheritdoc}
@@ -47,12 +47,12 @@ class ViewsEscapingTest extends ViewTestBase {
     $this->assertNoEscaped('<');
 
     // Install theme to test with template system.
-    \Drupal::service('theme_handler')->install(array('views_test_theme'));
+    \Drupal::service('theme_handler')->install(['views_test_theme']);
 
     // Make base theme default then test for hook invocations.
     $this->config('system.theme')
-        ->set('default', 'views_test_theme')
-        ->save();
+      ->set('default', 'views_test_theme')
+      ->save();
     $this->assertEqual($this->config('system.theme')->get('default'), 'views_test_theme');
 
     $this->drupalGet('test_page_display_200');
diff --git a/web/core/modules/views/src/Tests/ViewsTemplateTest.php b/web/core/modules/views/src/Tests/ViewsTemplateTest.php
index 2d7b206da..4a0690829 100644
--- a/web/core/modules/views/src/Tests/ViewsTemplateTest.php
+++ b/web/core/modules/views/src/Tests/ViewsTemplateTest.php
@@ -17,7 +17,7 @@ class ViewsTemplateTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view_display_template');
+  public static $testViews = ['test_view_display_template'];
 
   /**
    * {@inheritdoc}
@@ -26,7 +26,7 @@ class ViewsTemplateTest extends ViewTestBase {
     parent::setUp(FALSE);
 
     $this->enableViewsTestModule();
-    ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+    ViewTestData::createTestViews(get_class($this), ['views_test_config']);
   }
 
   /**
diff --git a/web/core/modules/views/src/Tests/ViewsThemeIntegrationTest.php b/web/core/modules/views/src/Tests/ViewsThemeIntegrationTest.php
index e9beb38d1..1fe836a82 100644
--- a/web/core/modules/views/src/Tests/ViewsThemeIntegrationTest.php
+++ b/web/core/modules/views/src/Tests/ViewsThemeIntegrationTest.php
@@ -16,7 +16,7 @@ class ViewsThemeIntegrationTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_page_display');
+  public static $testViews = ['test_page_display'];
 
 
   /**
@@ -28,7 +28,7 @@ class ViewsThemeIntegrationTest extends ViewTestBase {
    *
    * @see \Drupal\simpletest\WebTestBase::setup()
    */
-  public static $modules = array('views', 'theme_test');
+  public static $modules = ['views', 'theme_test'];
 
   /**
    * {@inheritdoc}
@@ -45,12 +45,12 @@ class ViewsThemeIntegrationTest extends ViewTestBase {
    */
   public function testThemedViewPage() {
 
-    \Drupal::service('theme_handler')->install(array('test_basetheme', 'test_subtheme'));
+    \Drupal::service('theme_handler')->install(['test_basetheme', 'test_subtheme']);
 
     // Make base theme default then test for hook invocations.
     $this->config('system.theme')
-        ->set('default', 'test_basetheme')
-        ->save();
+      ->set('default', 'test_basetheme')
+      ->save();
     $this->assertEqual($this->config('system.theme')->get('default'), 'test_basetheme');
 
     // Make sure a views rendered page is touched.
@@ -62,8 +62,8 @@ class ViewsThemeIntegrationTest extends ViewTestBase {
     // Make sub theme default to test for hook invocation
     // from both sub and base theme.
     $this->config('system.theme')
-        ->set('default', 'test_subtheme')
-        ->save();
+      ->set('default', 'test_subtheme')
+      ->save();
     $this->assertEqual($this->config('system.theme')->get('default'), 'test_subtheme');
 
     // Make sure a views rendered page is touched.
diff --git a/web/core/modules/views/src/Tests/Wizard/BasicTest.php b/web/core/modules/views/src/Tests/Wizard/BasicTest.php
index 00237d79a..7394991d2 100644
--- a/web/core/modules/views/src/Tests/Wizard/BasicTest.php
+++ b/web/core/modules/views/src/Tests/Wizard/BasicTest.php
@@ -20,16 +20,16 @@ class BasicTest extends WizardTestBase {
     $this->drupalPlaceBlock('page_title_block');
   }
 
-  function testViewsWizardAndListing() {
-    $this->drupalCreateContentType(array('type' => 'article'));
-    $this->drupalCreateContentType(array('type' => 'page'));
+  public function testViewsWizardAndListing() {
+    $this->drupalCreateContentType(['type' => 'article']);
+    $this->drupalCreateContentType(['type' => 'page']);
 
     // Check if we can access the main views admin page.
     $this->drupalGet('admin/structure/views');
     $this->assertText(t('Add view'));
 
     // Create a simple and not at all useful view.
-    $view1 = array();
+    $view1 = [];
     $view1['label'] = $this->randomMachineName(16);
     $view1['id'] = strtolower($this->randomMachineName(16));
     $view1['description'] = $this->randomMachineName(16);
@@ -51,11 +51,11 @@ class BasicTest extends WizardTestBase {
     $this->assertNoText($view1['label']);
 
     // Create two nodes.
-    $node1 = $this->drupalCreateNode(array('type' => 'page'));
-    $node2 = $this->drupalCreateNode(array('type' => 'article'));
+    $node1 = $this->drupalCreateNode(['type' => 'page']);
+    $node2 = $this->drupalCreateNode(['type' => 'article']);
 
     // Now create a page with simple node listing and an attached feed.
-    $view2 = array();
+    $view2 = [];
     $view2['label'] = $this->randomMachineName(16);
     $view2['id'] = strtolower($this->randomMachineName(16));
     $view2['description'] = $this->randomMachineName(16);
@@ -102,7 +102,7 @@ class BasicTest extends WizardTestBase {
     $this->assertNoText('View: ' . $view2['label']);
 
     // Create a view with a page and a block, and filter the listing.
-    $view3 = array();
+    $view3 = [];
     $view3['label'] = $this->randomMachineName(16);
     $view3['id'] = strtolower($this->randomMachineName(16));
     $view3['description'] = $this->randomMachineName(16);
@@ -150,7 +150,7 @@ class BasicTest extends WizardTestBase {
     $this->assertNoText('tracker', 'Default tracker view does not show on the listing page.');
 
     // Create a view with only a REST export.
-    $view4 = array();
+    $view4 = [];
     $view4['label'] = $this->randomMachineName(16);
     $view4['id'] = strtolower($this->randomMachineName(16));
     $view4['description'] = $this->randomMachineName(16);
@@ -159,7 +159,7 @@ class BasicTest extends WizardTestBase {
     $view4['rest_export[create]'] = 1;
     $view4['rest_export[path]'] = $this->randomMachineName(16);
     $this->drupalPostForm('admin/structure/views/add', $view4, t('Save and edit'));
-    $this->assertRaw(t('The view %view has been saved.', array('%view' => $view4['label'])));
+    $this->assertRaw(t('The view %view has been saved.', ['%view' => $view4['label']]));
 
     // Check that the REST export path works.
     $this->drupalGet($view4['rest_export[path]']);
@@ -178,7 +178,7 @@ class BasicTest extends WizardTestBase {
   public function testWizardDefaultValues() {
     $random_id = strtolower($this->randomMachineName(16));
     // Create a basic view.
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = $random_id;
     $view['description'] = $this->randomMachineName(16);
@@ -192,8 +192,8 @@ class BasicTest extends WizardTestBase {
     $displays = $view->storage->get('display');
 
     foreach ($displays as $display) {
-      foreach (array('query', 'exposed_form', 'pager', 'style', 'row') as $type) {
-        $this->assertFalse(empty($display['display_options'][$type]['options']), SafeMarkup::format('Default options found for @plugin.', array('@plugin' => $type)));
+      foreach (['query', 'exposed_form', 'pager', 'style', 'row'] as $type) {
+        $this->assertFalse(empty($display['display_options'][$type]['options']), SafeMarkup::format('Default options found for @plugin.', ['@plugin' => $type]));
       }
     }
   }
diff --git a/web/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php b/web/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php
index 7a2f43026..58f22a842 100644
--- a/web/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php
+++ b/web/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php
@@ -19,23 +19,23 @@ class ItemsPerPageTest extends WizardTestBase {
   /**
    * Tests the number of items per page.
    */
-  function testItemsPerPage() {
-    $this->drupalCreateContentType(array('type' => 'article'));
+  public function testItemsPerPage() {
+    $this->drupalCreateContentType(['type' => 'article']);
 
     // Create articles, each with a different creation time so that we can do a
     // meaningful sort.
-    $node1 = $this->drupalCreateNode(array('type' => 'article', 'created' => REQUEST_TIME));
-    $node2 = $this->drupalCreateNode(array('type' => 'article', 'created' => REQUEST_TIME + 1));
-    $node3 = $this->drupalCreateNode(array('type' => 'article', 'created' => REQUEST_TIME + 2));
-    $node4 = $this->drupalCreateNode(array('type' => 'article', 'created' => REQUEST_TIME + 3));
-    $node5 = $this->drupalCreateNode(array('type' => 'article', 'created' => REQUEST_TIME + 4));
+    $node1 = $this->drupalCreateNode(['type' => 'article', 'created' => REQUEST_TIME]);
+    $node2 = $this->drupalCreateNode(['type' => 'article', 'created' => REQUEST_TIME + 1]);
+    $node3 = $this->drupalCreateNode(['type' => 'article', 'created' => REQUEST_TIME + 2]);
+    $node4 = $this->drupalCreateNode(['type' => 'article', 'created' => REQUEST_TIME + 3]);
+    $node5 = $this->drupalCreateNode(['type' => 'article', 'created' => REQUEST_TIME + 4]);
 
     // Create a page. This should never appear in the view created below.
-    $page_node = $this->drupalCreateNode(array('type' => 'page', 'created' => REQUEST_TIME + 2));
+    $page_node = $this->drupalCreateNode(['type' => 'page', 'created' => REQUEST_TIME + 2]);
 
     // Create a view that sorts newest first, and shows 4 items in the page and
     // 3 in the block.
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = strtolower($this->randomMachineName(16));
     $view['description'] = $this->randomMachineName(16);
diff --git a/web/core/modules/views/src/Tests/Wizard/MenuTest.php b/web/core/modules/views/src/Tests/Wizard/MenuTest.php
index 552ff5078..0805de616 100644
--- a/web/core/modules/views/src/Tests/Wizard/MenuTest.php
+++ b/web/core/modules/views/src/Tests/Wizard/MenuTest.php
@@ -15,11 +15,11 @@ class MenuTest extends WizardTestBase {
   /**
    * Tests the menu functionality.
    */
-  function testMenus() {
+  public function testMenus() {
     $this->drupalPlaceBlock('system_menu_block:main');
 
     // Create a view with a page display and a menu link in the Main Menu.
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = strtolower($this->randomMachineName(16));
     $view['description'] = $this->randomMachineName(16);
@@ -44,9 +44,9 @@ class MenuTest extends WizardTestBase {
     /** @var \Drupal\Core\Menu\MenuLinkInterface $link */
     $link = $menu_link_manager->createInstance('views_view:views.' . $view['id'] . '.page_1');
     $url = $link->getUrlObject();
-    $this->assertEqual($url->getRouteName(), 'view.' . $view['id'] . '.page_1', SafeMarkup::format('Found a link to %path in the main menu', array('%path' => $view['page[path]'])));
+    $this->assertEqual($url->getRouteName(), 'view.' . $view['id'] . '.page_1', SafeMarkup::format('Found a link to %path in the main menu', ['%path' => $view['page[path]']]));
     $metadata = $link->getMetaData();
-    $this->assertEqual(array('view_id' => $view['id'], 'display_id' => 'page_1'), $metadata);
+    $this->assertEqual(['view_id' => $view['id'], 'display_id' => 'page_1'], $metadata);
   }
 
 }
diff --git a/web/core/modules/views/src/Tests/Wizard/NodeWizardTest.php b/web/core/modules/views/src/Tests/Wizard/NodeWizardTest.php
index 14a1766ed..dd63efe37 100644
--- a/web/core/modules/views/src/Tests/Wizard/NodeWizardTest.php
+++ b/web/core/modules/views/src/Tests/Wizard/NodeWizardTest.php
@@ -15,9 +15,9 @@ class NodeWizardTest extends WizardTestBase {
    * Tests creating a view with node titles.
    */
   public function testViewAddWithNodeTitles() {
-    $this->drupalCreateContentType(array('type' => 'article'));
+    $this->drupalCreateContentType(['type' => 'article']);
 
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = strtolower($this->randomMachineName(16));
     $view['description'] = $this->randomMachineName(16);
diff --git a/web/core/modules/views/src/Tests/Wizard/PagerTest.php b/web/core/modules/views/src/Tests/Wizard/PagerTest.php
index 1dfc21e56..2ec6d5551 100644
--- a/web/core/modules/views/src/Tests/Wizard/PagerTest.php
+++ b/web/core/modules/views/src/Tests/Wizard/PagerTest.php
@@ -15,9 +15,9 @@ class PagerTest extends WizardTestBase {
   public function testPager() {
     // Create nodes, each with a different creation time so that we have
     // conditions that are meaningful for the use of a pager.
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     for ($i = 0; $i < 12; $i++) {
-      $this->drupalCreateNode(array('created' => REQUEST_TIME - $i));
+      $this->drupalCreateNode(['created' => REQUEST_TIME - $i]);
     }
 
     // Make a View that uses a pager.
@@ -27,14 +27,14 @@ class PagerTest extends WizardTestBase {
 
     // This technique for finding the existence of a pager
     // matches that used in Drupal\views_ui\Tests\PreviewTest.php.
-    $elements = $this->xpath('//ul[contains(@class, :class)]/li', array(':class' => 'pager__items'));
+    $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
     $this->assertTrue(!empty($elements), 'Full pager found.');
 
     // Make a View that does not have a pager.
     $path_with_no_pager = 'test-view-without-pager';
     $this->createViewAtPath($path_with_no_pager, FALSE);
     $this->drupalGet($path_with_no_pager);
-    $elements = $this->xpath('//ul[contains(@class, :class)]/li', array(':class' => 'pager__items'));
+    $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
     $this->assertTrue(empty($elements), 'Full pager not found.');
   }
 
@@ -47,7 +47,7 @@ class PagerTest extends WizardTestBase {
    *   A boolean for whether the View created should use a pager.
    */
   protected function createViewAtPath($path, $pager = TRUE) {
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = strtolower($this->randomMachineName(16));
     $view['show[sort]'] = 'node_field_data-created:ASC';
diff --git a/web/core/modules/views/src/Tests/Wizard/SortingTest.php b/web/core/modules/views/src/Tests/Wizard/SortingTest.php
index 61729306b..58926aabc 100644
--- a/web/core/modules/views/src/Tests/Wizard/SortingTest.php
+++ b/web/core/modules/views/src/Tests/Wizard/SortingTest.php
@@ -18,16 +18,16 @@ class SortingTest extends WizardTestBase {
   /**
    * Tests the sorting functionality.
    */
-  function testSorting() {
+  public function testSorting() {
     // Create nodes, each with a different creation time so that we can do a
     // meaningful sort.
-    $this->drupalCreateContentType(array('type' => 'page'));
-    $node1 = $this->drupalCreateNode(array('created' => REQUEST_TIME));
-    $node2 = $this->drupalCreateNode(array('created' => REQUEST_TIME + 1));
-    $node3 = $this->drupalCreateNode(array('created' => REQUEST_TIME + 2));
+    $this->drupalCreateContentType(['type' => 'page']);
+    $node1 = $this->drupalCreateNode(['created' => REQUEST_TIME]);
+    $node2 = $this->drupalCreateNode(['created' => REQUEST_TIME + 1]);
+    $node3 = $this->drupalCreateNode(['created' => REQUEST_TIME + 2]);
 
     // Create a view that sorts oldest first.
-    $view1 = array();
+    $view1 = [];
     $view1['label'] = $this->randomMachineName(16);
     $view1['id'] = strtolower($this->randomMachineName(16));
     $view1['description'] = $this->randomMachineName(16);
@@ -52,7 +52,7 @@ class SortingTest extends WizardTestBase {
     $this->assertTrue($pos1 < $pos2 && $pos2 < $pos3, 'The nodes appear in the expected order in a view that sorts by oldest first.');
 
     // Create a view that sorts newest first.
-    $view2 = array();
+    $view2 = [];
     $view2['label'] = $this->randomMachineName(16);
     $view2['id'] = strtolower($this->randomMachineName(16));
     $view2['description'] = $this->randomMachineName(16);
diff --git a/web/core/modules/views/src/Tests/Wizard/TaggedWithTest.php b/web/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
index 939473f58..f72395041 100644
--- a/web/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
+++ b/web/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
@@ -21,7 +21,7 @@ class TaggedWithTest extends WizardTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   /**
    * Node type with an autocomplete tagging field.
@@ -83,58 +83,58 @@ class TaggedWithTest extends WizardTestBase {
     // Create the tag field itself.
     $this->tagFieldName = 'field_views_testing_tags';
 
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $this->tagVocabulary->id() => $this->tagVocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('node', $this->nodeTypeWithTags->id(), $this->tagFieldName, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
 
     entity_get_form_display('node', $this->nodeTypeWithTags->id(), 'default')
-      ->setComponent($this->tagFieldName, array(
+      ->setComponent($this->tagFieldName, [
         'type' => 'entity_reference_autocomplete_tags',
-      ))
+      ])
       ->save();
 
     entity_get_display('node', $this->nodeTypeWithTags->id(), 'default')
-      ->setComponent($this->tagFieldName, array(
+      ->setComponent($this->tagFieldName, [
         'type' => 'entity_reference_label',
         'weight' => 10,
-      ))
+      ])
       ->save();
     entity_get_display('node', $this->nodeTypeWithTags->id(), 'teaser')
-      ->setComponent('field_views_testing_tags', array(
+      ->setComponent('field_views_testing_tags', [
         'type' => 'entity_reference_label',
         'weight' => 10,
-      ))
+      ])
       ->save();
   }
 
   /**
    * Tests the "tagged with" functionality.
    */
-  function testTaggedWith() {
+  public function testTaggedWith() {
     // In this test we will only create nodes that have an instance of the tag
     // field.
     $node_add_path = 'node/add/' . $this->nodeTypeWithTags->id();
 
     // Create three nodes, with different tags.
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $node_tag1_title = $this->randomMachineName();
     $edit[$this->tagFieldName . '[target_id]'] = 'tag1';
     $this->drupalPostForm($node_add_path, $edit, t('Save'));
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $node_tag1_tag2_title = $this->randomMachineName();
     $edit[$this->tagFieldName . '[target_id]'] = 'tag1, tag2';
     $this->drupalPostForm($node_add_path, $edit, t('Save'));
-    $edit = array();
+    $edit = [];
     $edit['title[0][value]'] = $node_no_tags_title = $this->randomMachineName();
     $this->drupalPostForm($node_add_path, $edit, t('Save'));
 
     // Create a view that filters by taxonomy term "tag1". It should show only
     // the two nodes from above that are tagged with "tag1".
-    $view1 = array();
+    $view1 = [];
     // First select the node type and update the form so the correct tag field
     // is used.
     $view1['show[type]'] = $this->nodeTypeWithTags->id();
@@ -158,7 +158,7 @@ class TaggedWithTest extends WizardTestBase {
 
     // Create a view that filters by taxonomy term "tag2". It should show only
     // the one node from above that is tagged with "tag2".
-    $view2 = array();
+    $view2 = [];
     $view2['show[type]'] = $this->nodeTypeWithTags->id();
     $this->drupalPostForm('admin/structure/views/add', $view2, t('Update "of type" choice'));
     $this->assertResponse(200);
@@ -180,7 +180,7 @@ class TaggedWithTest extends WizardTestBase {
   /**
    * Tests that the "tagged with" form element only shows for node types that support it.
    */
-  function testTaggedWithByNodeType() {
+  public function testTaggedWithByNodeType() {
     // The tagging field is associated with one of our node types only. So the
     // "tagged with" form element on the view wizard should appear on the form
     // by default (when the wizard is configured to display all content) and
@@ -202,20 +202,20 @@ class TaggedWithTest extends WizardTestBase {
       'field_name' => $this->tagFieldName,
       'entity_type' => 'node',
       'bundle' => $this->nodeTypeWithoutTags->id(),
-      'settings' => array(
+      'settings' => [
         'handler' => 'default',
-        'handler_settings' => array(
-          'target_bundles' => array(
+        'handler_settings' => [
+          'target_bundles' => [
             $this->tagVocabulary->id() => $this->tagVocabulary->id(),
-          ),
+          ],
           'auto_create' => TRUE,
-        ),
-      ),
+        ],
+      ],
     ])->save();
     entity_get_form_display('node', $this->nodeTypeWithoutTags->id(), 'default')
-      ->setComponent($this->tagFieldName, array(
+      ->setComponent($this->tagFieldName, [
         'type' => 'entity_reference_autocomplete_tags',
-      ))
+      ])
       ->save();
 
     $view['show[type]'] = $this->nodeTypeWithTags->id();
diff --git a/web/core/modules/views/src/Tests/Wizard/WizardTestBase.php b/web/core/modules/views/src/Tests/Wizard/WizardTestBase.php
index e00b01827..835b9f4ed 100644
--- a/web/core/modules/views/src/Tests/Wizard/WizardTestBase.php
+++ b/web/core/modules/views/src/Tests/Wizard/WizardTestBase.php
@@ -14,13 +14,13 @@ abstract class WizardTestBase extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'views_ui', 'block', 'rest');
+  public static $modules = ['node', 'views_ui', 'block', 'rest'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create and log in a user with administer views permission.
-    $views_admin = $this->drupalCreateUser(array('administer views', 'administer blocks', 'bypass node access', 'access user profiles', 'view all revisions'));
+    $views_admin = $this->drupalCreateUser(['administer views', 'administer blocks', 'bypass node access', 'access user profiles', 'view all revisions']);
     $this->drupalLogin($views_admin);
     $this->drupalPlaceBlock('local_actions_block');
   }
diff --git a/web/core/modules/views/src/ViewExecutable.php b/web/core/modules/views/src/ViewExecutable.php
index 786b10f64..b1861f7b3 100644
--- a/web/core/modules/views/src/ViewExecutable.php
+++ b/web/core/modules/views/src/ViewExecutable.php
@@ -5,7 +5,6 @@ namespace Drupal\views;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Tags;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
-use Drupal\Core\Form\FormState;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\views\Plugin\views\display\DisplayRouterInterface;
@@ -52,14 +51,14 @@ class ViewExecutable implements \Serializable {
    *
    * @var array
    */
-  public $args = array();
+  public $args = [];
 
   /**
    * An array of build info.
    *
    * @var array
    */
-  public $build_info = array();
+  public $build_info = [];
 
   /**
    * Whether this view uses AJAX.
@@ -75,7 +74,7 @@ class ViewExecutable implements \Serializable {
    *
    * @var \Drupal\views\ResultRow[]
    */
-  public $result = array();
+  public $result = [];
 
   // May be used to override the current pager info.
 
@@ -112,21 +111,21 @@ class ViewExecutable implements \Serializable {
    *
    * @var array()
    */
-  public $attachment_before = array();
+  public $attachment_before = [];
 
   /**
    * Attachments to place after the view.
    *
    * @var array
    */
-  public $attachment_after = array();
+  public $attachment_after = [];
 
   /**
    * Feed icons attached to the view.
    *
    * @var array
    */
-  public $feedIcons = array();
+  public $feedIcons = [];
 
   // Exposed widget input
 
@@ -135,35 +134,35 @@ class ViewExecutable implements \Serializable {
    *
    * @var array
    */
-  public $exposed_data = array();
+  public $exposed_data = [];
 
   /**
    * An array of input values from exposed forms.
    *
    * @var array
    */
-  protected $exposed_input = array();
+  protected $exposed_input = [];
 
   /**
    * Exposed widget input directly from the $form_state->getValues().
    *
    * @var array
    */
-  public $exposed_raw_input = array();
+  public $exposed_raw_input = [];
 
   /**
    * Used to store views that were previously running if we recurse.
    *
    * @var \Drupal\views\ViewExecutable[]
    */
-  public $old_view = array();
+  public $old_view = [];
 
   /**
    * To avoid recursion in views embedded into areas.
    *
    * @var \Drupal\views\ViewExecutable[]
    */
-  public $parent_views = array();
+  public $parent_views = [];
 
   /**
    * Whether this view is an attachment to another view.
@@ -681,7 +680,7 @@ class ViewExecutable implements \Serializable {
 
       $this->exposed_input = \Drupal::request()->query->all();
       // unset items that are definitely not our input:
-      foreach (array('page', 'q') as $key) {
+      foreach (['page', 'q'] as $key) {
         if (isset($this->exposed_input[$key])) {
           unset($this->exposed_input[$key]);
         }
@@ -789,7 +788,7 @@ class ViewExecutable implements \Serializable {
 
     // Ensure the requested display exists.
     if (!$this->displayHandlers->has($display_id)) {
-      debug(format_string('setDisplay() called with invalid display ID "@display".', array('@display' => $display_id)));
+      debug(format_string('setDisplay() called with invalid display ID "@display".', ['@display' => $display_id]));
       return FALSE;
     }
 
@@ -957,10 +956,10 @@ class ViewExecutable implements \Serializable {
    *   An array of base tables to be used by the view.
    */
   public function getBaseTables() {
-    $base_tables = array(
+    $base_tables = [
       $this->storage->get('base_table') => TRUE,
       '#global' => TRUE,
-    );
+    ];
 
     foreach ($this->display_handler->getHandlers('relationship') as $handler) {
       $base_tables[$handler->definition['base']] = TRUE;
@@ -1055,7 +1054,7 @@ class ViewExecutable implements \Serializable {
 
     // build arguments.
     $position = -1;
-    $substitutions = array();
+    $substitutions = [];
     $status = TRUE;
 
     // Get the title.
@@ -1193,18 +1192,18 @@ class ViewExecutable implements \Serializable {
 
     // Let modules modify the view just prior to building it.
     $module_handler = \Drupal::moduleHandler();
-    $module_handler->invokeAll('views_pre_build', array($this));
+    $module_handler->invokeAll('views_pre_build', [$this]);
 
     // Attempt to load from cache.
     // @todo Load a build_info from cache.
 
     $start = microtime(TRUE);
     // If that fails, let's build!
-    $this->build_info = array(
+    $this->build_info = [
       'query' => '',
       'count_query' => '',
-      'query_args' => array(),
-    );
+      'query_args' => [],
+    ];
 
     $this->initQuery();
 
@@ -1223,7 +1222,7 @@ class ViewExecutable implements \Serializable {
       /** @var \Drupal\views\Plugin\views\exposed_form\ExposedFormPluginInterface $exposed_form */
       $exposed_form = $this->display_handler->getPlugin('exposed_form');
       $this->exposed_widgets = $exposed_form->renderExposedForm();
-      if (FormState::hasAnyErrors() || !empty($this->build_info['abort'])) {
+      if (!empty($this->build_info['abort'])) {
         $this->built = TRUE;
         // Don't execute the query, $form_state, but rendering will still be executed to display the empty text.
         $this->executed = TRUE;
@@ -1315,7 +1314,7 @@ class ViewExecutable implements \Serializable {
     $this->attachDisplays();
 
     // Let modules modify the view just after building it.
-    $module_handler->invokeAll('views_post_build', array($this));
+    $module_handler->invokeAll('views_post_build', [$this]);
 
     return TRUE;
   }
@@ -1336,7 +1335,7 @@ class ViewExecutable implements \Serializable {
     foreach ($handlers as $id => $data) {
 
       if (!empty($handlers[$id]) && is_object($handlers[$id])) {
-        $multiple_exposed_input = array(0 => NULL);
+        $multiple_exposed_input = [0 => NULL];
         if ($handlers[$id]->multipleExposedInput()) {
           $multiple_exposed_input = $handlers[$id]->groupMultipleExposedInput($this->exposed_data);
         }
@@ -1392,7 +1391,7 @@ class ViewExecutable implements \Serializable {
 
     // Let modules modify the view just prior to executing it.
     $module_handler = \Drupal::moduleHandler();
-    $module_handler->invokeAll('views_pre_execute', array($this));
+    $module_handler->invokeAll('views_pre_execute', [$this]);
 
     // Check for already-cached results.
     /** @var \Drupal\views\Plugin\views\cache\CachePluginBase $cache */
@@ -1419,7 +1418,7 @@ class ViewExecutable implements \Serializable {
     }
 
     // Let modules modify the view just after executing it.
-    $module_handler->invokeAll('views_post_execute', array($this));
+    $module_handler->invokeAll('views_post_execute', [$this]);
 
     return $this->executed = TRUE;
   }
@@ -1495,7 +1494,7 @@ class ViewExecutable implements \Serializable {
     $this->style_plugin->preRender($this->result);
 
     // Let each area handler have access to the result set.
-    $areas = array('header', 'footer');
+    $areas = ['header', 'footer'];
     // Only call preRender() on the empty handlers if the result is empty.
     if (empty($this->result)) {
       $areas[] = 'empty';
@@ -1507,7 +1506,7 @@ class ViewExecutable implements \Serializable {
     }
 
     // Let modules modify the view just prior to rendering it.
-    $module_handler->invokeAll('views_pre_render', array($this));
+    $module_handler->invokeAll('views_pre_render', [$this]);
 
     // Let the themes play too, because pre render is a very themey thing.
     foreach ($themes as $theme_name) {
@@ -1524,7 +1523,7 @@ class ViewExecutable implements \Serializable {
     $cache->postRender($this->display_handler->output);
 
     // Let modules modify the view output after it is rendered.
-    $module_handler->invokeAll('views_post_render', array($this, &$this->display_handler->output, $cache));
+    $module_handler->invokeAll('views_post_render', [$this, &$this->display_handler->output, $cache]);
 
     // Let the themes play too, because post render is a very themey thing.
     foreach ($themes as $theme_name) {
@@ -1571,7 +1570,7 @@ class ViewExecutable implements \Serializable {
    *   A renderable array with #type 'view' or NULL if the display ID was
    *   invalid.
    */
-  public function buildRenderable($display_id = NULL, $args = array(), $cache = TRUE) {
+  public function buildRenderable($display_id = NULL, $args = [], $cache = TRUE) {
     // @todo Extract that into a generic method.
     if (empty($this->current_display) || $this->current_display != $this->chooseDisplay($display_id)) {
       if (!$this->setDisplay($display_id)) {
@@ -1604,7 +1603,7 @@ class ViewExecutable implements \Serializable {
    *   A renderable array containing the view output or NULL if the display ID
    *   of the view to be executed doesn't exist.
    */
-  public function executeDisplay($display_id = NULL, $args = array()) {
+  public function executeDisplay($display_id = NULL, $args = []) {
     if (empty($this->current_display) || $this->current_display != $this->chooseDisplay($display_id)) {
       if (!$this->setDisplay($display_id)) {
         return NULL;
@@ -1636,7 +1635,7 @@ class ViewExecutable implements \Serializable {
    *   A renderable array containing the view output or NULL if the display ID
    *   of the view to be executed doesn't exist.
    */
-  public function preview($display_id = NULL, $args = array()) {
+  public function preview($display_id = NULL, $args = []) {
     if (empty($this->current_display) || ((!empty($display_id)) && $this->current_display != $display_id)) {
       if (!$this->setDisplay($display_id)) {
         return FALSE;
@@ -1658,7 +1657,7 @@ class ViewExecutable implements \Serializable {
    * @param array $args
    *   An array of arguments from the URL that can be used by the view.
    */
-  public function preExecute($args = array()) {
+  public function preExecute($args = []) {
     $this->old_view[] = views_get_current_view();
     views_set_current_view($this);
     $display_id = $this->current_display;
@@ -1670,7 +1669,7 @@ class ViewExecutable implements \Serializable {
     }
 
     // Let modules modify the view just prior to executing it.
-    \Drupal::moduleHandler()->invokeAll('views_pre_view', array($this, $display_id, &$this->args));
+    \Drupal::moduleHandler()->invokeAll('views_pre_view', [$this, $display_id, &$this->args]);
 
     // Allow hook_views_pre_view() to set the dom_id, then ensure it is set.
     $this->dom_id = !empty($this->dom_id) ? $this->dom_id : hash('sha256', $this->storage->id() . REQUEST_TIME . mt_rand());
@@ -1948,7 +1947,7 @@ class ViewExecutable implements \Serializable {
       return $display_handler->getUrlInfo();
     }
 
-    $argument_keys = isset($this->argument) ? array_keys($this->argument) : array();
+    $argument_keys = isset($this->argument) ? array_keys($this->argument) : [];
     $id = current($argument_keys);
 
     /** @var \Drupal\Core\Url $url */
@@ -2085,7 +2084,7 @@ class ViewExecutable implements \Serializable {
    *   errors.
    */
   public function validate() {
-    $errors = array();
+    $errors = [];
 
     $this->initDisplay();
     $current_display = $this->current_display;
@@ -2159,7 +2158,7 @@ class ViewExecutable implements \Serializable {
    * @return string
    *   The unique ID for this handler instance.
    */
-  public function addHandler($display_id, $type, $table, $field, $options = array(), $id = NULL) {
+  public function addHandler($display_id, $type, $table, $field, $options = [], $id = NULL) {
     $types = $this::getHandlerTypes();
     $this->setDisplay($display_id);
 
@@ -2173,11 +2172,11 @@ class ViewExecutable implements \Serializable {
     // If the desired type is not found, use the original value directly.
     $handler_type = !empty($types[$type]['type']) ? $types[$type]['type'] : $type;
 
-    $fields[$id] = array(
+    $fields[$id] = [
       'id' => $id,
       'table' => $table,
       'field' => $field,
-    ) + $options;
+    ] + $options;
 
     if (isset($data['table']['entity type'])) {
       $fields[$id]['entity_type'] = $data['table']['entity type'];
@@ -2406,7 +2405,7 @@ class ViewExecutable implements \Serializable {
    *   An array of theme hook suggestions.
    */
   public function buildThemeFunctions($hook) {
-    $themes = array();
+    $themes = [];
     $display = isset($this->display_handler) ? $this->display_handler->display : NULL;
     $id = $this->storage->id();
 
diff --git a/web/core/modules/views/src/Views.php b/web/core/modules/views/src/Views.php
index a82a670a1..9962d38d5 100644
--- a/web/core/modules/views/src/Views.php
+++ b/web/core/modules/views/src/Views.php
@@ -26,7 +26,7 @@ class Views {
    *
    * @var array
    */
-  protected static $plugins = array(
+  protected static $plugins = [
     'access' => 'plugin',
     'area' => 'handler',
     'argument' => 'handler',
@@ -46,7 +46,7 @@ class Views {
     'sort' => 'handler',
     'style' => 'plugin',
     'wizard' => 'plugin',
-  );
+  ];
 
   /**
    * Returns the views data service.
@@ -139,9 +139,9 @@ class Views {
    * @return
    *   A keyed array of in the form of 'base_table' => 'Description'.
    */
-  public static function fetchPluginNames($type, $key = NULL, array $base = array()) {
+  public static function fetchPluginNames($type, $key = NULL, array $base = []) {
     $definitions = static::pluginManager($type)->getDefinitions();
-    $plugins = array();
+    $plugins = [];
 
     foreach ($definitions as $id => $plugin) {
       // Skip plugins that don't conform to our key, if they have one.
@@ -169,7 +169,7 @@ class Views {
    *   An array of plugin definitions for all types.
    */
   public static function getPluginDefinitions() {
-    $plugins = array();
+    $plugins = [];
     foreach (ViewExecutable::getPluginTypes() as $plugin_type) {
       $plugins[$plugin_type] = static::pluginManager($plugin_type)->getDefinitions();
     }
@@ -213,13 +213,13 @@ class Views {
       }
     }
 
-    $entity_ids = \Drupal::service('entity.query')->get('view')
+    $entity_ids = \Drupal::entityQuery('view')
       ->condition('status', TRUE)
       ->condition("display.*.display_plugin", $plugin_ids, 'IN')
       ->execute();
 
-    $result = array();
-    foreach (\Drupal::entityManager()->getStorage('view')->loadMultiple($entity_ids) as $view) {
+    $result = [];
+    foreach (\Drupal::entityTypeManager()->getStorage('view')->loadMultiple($entity_ids) as $view) {
       // Check each display to see if it meets the criteria and is enabled.
 
       foreach ($view->get('display') as $id => $display) {
@@ -309,7 +309,7 @@ class Views {
         $views = call_user_func("static::get{$filter}Views");
         break;
       default:
-        return array();
+        return [];
     }
 
     // Prepare exclude view strings for comparison.
@@ -327,7 +327,7 @@ class Views {
       list($exclude_view_name, $exclude_view_display) = explode(':', "$exclude_view:");
     }
 
-    $options = array();
+    $options = [];
     foreach ($views as $view) {
       $id = $view->id();
       // Return only views.
@@ -339,10 +339,10 @@ class Views {
         foreach ($view->get('display') as $display_id => $display) {
           if (!($id == $exclude_view_name && $display_id == $exclude_view_display)) {
             if ($optgroup) {
-              $options[$id][$id . ':' . $display['id']] = t('@view : @display', array('@view' => $id, '@display' => $display['id']));
+              $options[$id][$id . ':' . $display['id']] = t('@view : @display', ['@view' => $id, '@display' => $display['id']]);
             }
             else {
-              $options[$id . ':' . $display['id']] = t('View: @view - Display: @display', array('@view' => $id, '@display' => $display['id']));
+              $options[$id . ':' . $display['id']] = t('View: @view - Display: @display', ['@view' => $id, '@display' => $display['id']]);
             }
           }
         }
@@ -368,7 +368,7 @@ class Views {
    */
   public static function pluginList() {
     $plugin_data = static::getPluginDefinitions();
-    $plugins = array();
+    $plugins = [];
     foreach (static::getEnabledViews() as $view) {
       foreach ($view->get('display') as $display) {
         foreach ($plugin_data as $type => $info) {
@@ -389,12 +389,12 @@ class Views {
           $key = $type . ':' . $name;
           // Add info for this plugin.
           if (!isset($plugins[$key])) {
-            $plugins[$key] = array(
+            $plugins[$key] = [
               'type' => $type,
               'title' => $info[$name]['title'],
               'provider' => $info[$name]['provider'],
-              'views' => array(),
-            );
+              'views' => [],
+            ];
           }
 
           // Add this view to the list for this plugin.
@@ -423,8 +423,8 @@ class Views {
     // Statically cache this so translation only occurs once per request for all
     // of these values.
     if (!isset(static::$handlerTypes)) {
-      static::$handlerTypes = array(
-        'field' => array(
+      static::$handlerTypes = [
+        'field' => [
           // title
           'title' => static::t('Fields'),
           // Lowercase title for mid-sentence.
@@ -434,60 +434,60 @@ class Views {
           // Singular lowercase title for mid sentence
           'lstitle' => static::t('field'),
           'plural' => 'fields',
-        ),
-        'argument' => array(
+        ],
+        'argument' => [
           'title' => static::t('Contextual filters'),
           'ltitle' => static::t('contextual filters'),
           'stitle' => static::t('Contextual filter'),
           'lstitle' => static::t('contextual filter'),
           'plural' => 'arguments',
-        ),
-        'sort' => array(
+        ],
+        'sort' => [
           'title' => static::t('Sort criteria'),
           'ltitle' => static::t('sort criteria'),
           'stitle' => static::t('Sort criterion'),
           'lstitle' => static::t('sort criterion'),
           'plural' => 'sorts',
-        ),
-        'filter' => array(
+        ],
+        'filter' => [
           'title' => static::t('Filter criteria'),
           'ltitle' => static::t('filter criteria'),
           'stitle' => static::t('Filter criterion'),
           'lstitle' => static::t('filter criterion'),
           'plural' => 'filters',
-        ),
-        'relationship' => array(
+        ],
+        'relationship' => [
           'title' => static::t('Relationships'),
           'ltitle' => static::t('relationships'),
           'stitle' => static::t('Relationship'),
           'lstitle' => static::t('Relationship'),
           'plural' => 'relationships',
-        ),
-        'header' => array(
+        ],
+        'header' => [
           'title' => static::t('Header'),
           'ltitle' => static::t('header'),
           'stitle' => static::t('Header'),
           'lstitle' => static::t('Header'),
           'plural' => 'header',
           'type' => 'area',
-        ),
-        'footer' => array(
+        ],
+        'footer' => [
           'title' => static::t('Footer'),
           'ltitle' => static::t('footer'),
           'stitle' => static::t('Footer'),
           'lstitle' => static::t('Footer'),
           'plural' => 'footer',
           'type' => 'area',
-        ),
-        'empty' => array(
+        ],
+        'empty' => [
           'title' => static::t('No results behavior'),
           'ltitle' => static::t('no results behavior'),
           'stitle' => static::t('No results behavior'),
           'lstitle' => static::t('No results behavior'),
           'plural' => 'empty',
           'type' => 'area',
-        ),
-      );
+        ],
+      ];
     }
 
     return static::$handlerTypes;
@@ -508,7 +508,7 @@ class Views {
       return array_keys(static::$plugins);
     }
 
-    if (!in_array($type, array('plugin', 'handler'))) {
+    if (!in_array($type, ['plugin', 'handler'])) {
       throw new \Exception('Invalid plugin type used. Valid types are "plugin" or "handler".');
     }
 
@@ -522,7 +522,7 @@ class Views {
    *
    * See the t() documentation for details.
    */
-  protected static function t($string, array $args = array(), array $options = array()) {
+  protected static function t($string, array $args = [], array $options = []) {
     if (empty(static::$translationManager)) {
       static::$translationManager = \Drupal::service('string_translation');
     }
diff --git a/web/core/modules/views/src/ViewsData.php b/web/core/modules/views/src/ViewsData.php
index 8bb6b53c2..e5281abf3 100644
--- a/web/core/modules/views/src/ViewsData.php
+++ b/web/core/modules/views/src/ViewsData.php
@@ -40,7 +40,7 @@ class ViewsData {
    *
    * @var array
    */
-  protected $storage = array();
+  protected $storage = [];
 
   /**
    * All table storage data loaded from cache.
@@ -50,7 +50,7 @@ class ViewsData {
    *
    * @var array
    */
-  protected $allStorage = array();
+  protected $allStorage = [];
 
   /**
    * Whether the data has been fully loaded in this request.
@@ -113,7 +113,7 @@ class ViewsData {
    *
    * @see https://www.drupal.org/node/2723553
    *
-   * @return array $data
+   * @return array
    *   An array of table data.
    */
   public function getAll() {
@@ -140,7 +140,7 @@ class ViewsData {
    *
    * @see https://www.drupal.org/node/2723553
    *
-   * @return array $data
+   * @return array
    *   An array of table data.
    */
   public function get($key = NULL) {
@@ -167,8 +167,8 @@ class ViewsData {
           // Write an empty cache entry if no information for that table
           // exists to avoid repeated cache get calls for this table and
           // prevent loading all tables unnecessarily.
-          $this->storage[$key] = array();
-          $this->allStorage[$key] = array();
+          $this->storage[$key] = [];
+          $this->allStorage[$key] = [];
         }
         else {
           $this->storage[$key] = $this->allStorage[$key];
@@ -208,7 +208,7 @@ class ViewsData {
    *   The data that will be cached.
    */
   protected function cacheSet($cid, $data) {
-    return $this->cacheBackend->set($this->prepareCid($cid), $data, Cache::PERMANENT, array('views_data', 'config:core.extension'));
+    return $this->cacheBackend->set($this->prepareCid($cid), $data, Cache::PERMANENT, ['views_data', 'config:core.extension']);
   }
 
   /**
@@ -274,9 +274,9 @@ class ViewsData {
       if (!empty($table_info['table']['entity type'])) {
         $entity_table = 'views_entity_' . $table_info['table']['entity type'];
 
-        $data[$entity_table]['table']['join'][$table_name] = array(
+        $data[$entity_table]['table']['join'][$table_name] = [
           'left_table' => $table_name,
-        );
+        ];
         $data[$entity_table]['table']['entity type'] = $table_info['table']['entity type'];
         // Copy over the default table group if we have none yet.
         if (!empty($table_info['table']['group']) && empty($data[$entity_table]['table']['group'])) {
@@ -297,15 +297,15 @@ class ViewsData {
    *     - weight: The weight of the base table.
    */
   public function fetchBaseTables() {
-    $tables = array();
+    $tables = [];
 
     foreach ($this->get() as $table => $info) {
       if (!empty($info['table']['base'])) {
-        $tables[$table] = array(
+        $tables[$table] = [
           'title' => $info['table']['base']['title'],
           'help' => !empty($info['table']['base']['help']) ? $info['table']['base']['help'] : '',
           'weight' => !empty($info['table']['base']['weight']) ? $info['table']['base']['weight'] : 0,
-        );
+        ];
       }
     }
 
@@ -327,10 +327,10 @@ class ViewsData {
    * Clears the class storage and cache.
    */
   public function clear() {
-    $this->storage = array();
-    $this->allStorage = array();
+    $this->storage = [];
+    $this->allStorage = [];
     $this->fullyLoaded = FALSE;
-    Cache::invalidateTags(array('views_data'));
+    Cache::invalidateTags(['views_data']);
   }
 
 }
diff --git a/web/core/modules/views/src/ViewsDataHelper.php b/web/core/modules/views/src/ViewsDataHelper.php
index 791cd37f4..32e6adae8 100644
--- a/web/core/modules/views/src/ViewsDataHelper.php
+++ b/web/core/modules/views/src/ViewsDataHelper.php
@@ -37,7 +37,7 @@ class ViewsDataHelper {
   /**
    * Fetches a list of all fields available for a given base type.
    *
-   * @param (array|string) $base
+   * @param array|string $base
    *   A list or a single base_table, for example node.
    * @param string $type
    *   The handler type, for example field or filter.
@@ -64,9 +64,9 @@ class ViewsDataHelper {
       // each field have a cheap kind of inheritance.
 
       foreach ($data as $table => $table_data) {
-        $bases = array();
-        $strings = array();
-        $skip_bases = array();
+        $bases = [];
+        $strings = [];
+        $skip_bases = [];
         foreach ($table_data as $field => $info) {
           // Collect table data from this table
           if ($field == 'table') {
@@ -78,7 +78,7 @@ class ViewsDataHelper {
             $bases[] = $table;
             continue;
           }
-          foreach (array('field', 'sort', 'filter', 'argument', 'relationship', 'area') as $key) {
+          foreach (['field', 'sort', 'filter', 'argument', 'relationship', 'area'] as $key) {
             if (!empty($info[$key])) {
               if ($grouping && !empty($info[$key]['no group by'])) {
                 continue;
@@ -96,7 +96,7 @@ class ViewsDataHelper {
                   $skip_bases[$field][$key][$base_name] = TRUE;
                 }
               }
-              foreach (array('title', 'group', 'help', 'base', 'aliases') as $string) {
+              foreach (['title', 'group', 'help', 'base', 'aliases'] as $string) {
                 // First, try the lowest possible level
                 if (!empty($info[$key][$string])) {
                   $strings[$field][$key][$string] = $info[$key][$string];
@@ -120,7 +120,7 @@ class ViewsDataHelper {
                 }
                 else {
                   if ($string != 'base') {
-                    $strings[$field][$key][$string] = SafeMarkup::format("Error: missing @component", array('@component' => $string));
+                    $strings[$field][$key][$string] = SafeMarkup::format("Error: missing @component", ['@component' => $string]);
                   }
                 }
               }
@@ -143,21 +143,21 @@ class ViewsDataHelper {
     // all and add them together. Duplicate keys will be lost and that's
     // Just Fine.
     if (is_array($base)) {
-      $strings = array();
+      $strings = [];
       foreach ($base as $base_table) {
         if (isset($this->fields[$base_table][$type])) {
           $strings += $this->fields[$base_table][$type];
         }
       }
-      uasort($strings, array('self', 'fetchedFieldSort'));
+      uasort($strings, ['self', 'fetchedFieldSort']);
       return $strings;
     }
 
     if (isset($this->fields[$base][$type])) {
-      uasort($this->fields[$base][$type], array($this, 'fetchedFieldSort'));
+      uasort($this->fields[$base][$type], [$this, 'fetchedFieldSort']);
       return $this->fields[$base][$type];
     }
-    return array();
+    return [];
   }
 
   /**
diff --git a/web/core/modules/views/tests/fixtures/update/argument-placeholder.php b/web/core/modules/views/tests/fixtures/update/argument-placeholder.php
index 2a7cf4bb2..2158eb270 100644
--- a/web/core/modules/views/tests/fixtures/update/argument-placeholder.php
+++ b/web/core/modules/views/tests/fixtures/update/argument-placeholder.php
@@ -11,9 +11,9 @@ use Drupal\Core\Serialization\Yaml;
 $connection = Database::getConnection();
 
 $connection->insert('config')
-  ->fields(array(
+  ->fields([
     'collection' => '',
     'name' => 'views.view.test_token_view',
     'data' => serialize(Yaml::decode(file_get_contents('core/modules/views/tests/modules/views_test_config/test_views/views.view.test_token_view.yml'))),
-  ))
+  ])
   ->execute();
diff --git a/web/core/modules/views/tests/fixtures/update/boolean-filter-values.php b/web/core/modules/views/tests/fixtures/update/boolean-filter-values.php
index d78a3edd7..2b8e78fb9 100644
--- a/web/core/modules/views/tests/fixtures/update/boolean-filter-values.php
+++ b/web/core/modules/views/tests/fixtures/update/boolean-filter-values.php
@@ -11,9 +11,9 @@ use Drupal\Core\Serialization\Yaml;
 $connection = Database::getConnection();
 
 $connection->insert('config')
-  ->fields(array(
+  ->fields([
     'collection' => '',
     'name' => 'views.view.test_boolean_filter_values',
     'data' => serialize(Yaml::decode(file_get_contents('core/modules/views/tests/fixtures/update/views.view.test_boolean_filter_values.yml'))),
-  ))
+  ])
   ->execute();
diff --git a/web/core/modules/views/tests/fixtures/update/duplicate-field-handler.php b/web/core/modules/views/tests/fixtures/update/duplicate-field-handler.php
index 775f75a4c..21cf164f4 100644
--- a/web/core/modules/views/tests/fixtures/update/duplicate-field-handler.php
+++ b/web/core/modules/views/tests/fixtures/update/duplicate-field-handler.php
@@ -11,9 +11,9 @@ use Drupal\Core\Serialization\Yaml;
 $connection = Database::getConnection();
 
 $connection->insert('config')
-  ->fields(array(
+  ->fields([
     'collection' => '',
     'name' => 'views.view.test_duplicate_field_handlers',
     'data' => serialize(Yaml::decode(file_get_contents('core/modules/views/tests/modules/views_test_config/test_views/views.view.test_duplicate_field_handlers.yml'))),
-  ))
+  ])
   ->execute();
diff --git a/web/core/modules/views/tests/modules/views_entity_test/views_entity_test.module b/web/core/modules/views/tests/modules/views_entity_test/views_entity_test.module
index 0506710f5..cd136538f 100644
--- a/web/core/modules/views/tests/modules/views_entity_test/views_entity_test.module
+++ b/web/core/modules/views/tests/modules/views_entity_test/views_entity_test.module
@@ -22,10 +22,10 @@ function views_entity_test_entity_base_field_info(EntityTypeInterface $entity_ty
       ->setLabel(t('Test access'))
       ->setTranslatable(FALSE)
       ->setSetting('max_length', 64)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
         'type' => 'string_textfield',
         'weight' => 10,
-      ));
+      ]);
     return $definitions;
   }
 }
diff --git a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
index db16bcb7d..d8830676a 100644
--- a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
+++ b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
@@ -31,7 +31,7 @@ display:
           field: type
           id: type
           table: node_field_data
-          plugin_id: node_type
+          plugin_id: bundle
           entity_type: node
           entity_field: type
         body_value:
@@ -76,6 +76,72 @@ display:
           plugin_id: string
           entity_type: node
           entity_field: body
+        created:
+          id: created
+          table: node_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value:
+            min: ''
+            max: ''
+            value: ''
+            type: date
+          group: 1
+          exposed: true
+          expose:
+            operator_id: created_op
+            label: 'Authored on'
+            description: null
+            use_operator: false
+            operator: created_op
+            identifier: created
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: true
+          group_info:
+            label: 'Authored on'
+            description: ''
+            identifier: created
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1:
+                title: Between
+                operator: between
+                value:
+                  type: date
+                  value: ''
+                  min: '2015-01-01'
+                  max: '2016-01-01'
+              2:
+                title: 'Not Between'
+                operator: 'not between'
+                value:
+                  type: date
+                  value: ''
+                  min: '2015-01-01'
+                  max: '2016-01-01'
+              3:
+                title: Equal
+                operator: '='
+                value:
+                  type: date
+                  value: '2016-01-01'
+                  min: ''
+                  max: ''
+          entity_type: node
+          entity_field: created
+          plugin_id: date
       pager:
         type: full
       sorts:
diff --git a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml
index 2bb82167f..6032b48f6 100644
--- a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml
+++ b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml
@@ -77,3 +77,34 @@ display:
           operator: '='
           value: 'not an existing name'
       path: test_tokens_empty
+  page_3:
+    display_plugin: page
+    id: page_3
+    display_title: Page
+    position: 1
+    display_options:
+      defaults:
+        title: false
+        pager: false
+        header: false
+      pager:
+        type: mini
+        options:
+          items_per_page: 2
+      title: 'Test token page with minipager'
+      path: test_tokens_minipager
+      display_extenders: {  }
+      header:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: false
+          tokenize: false
+          content:
+            value: "Total rows: [view:total-rows] - Page count: [view:page-count]"
+            format: basic_html
+          plugin_id: text
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Controller/ViewsTestDataController.php b/web/core/modules/views/tests/modules/views_test_data/src/Controller/ViewsTestDataController.php
new file mode 100644
index 000000000..987be3036
--- /dev/null
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Controller/ViewsTestDataController.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\views_test_data\Controller;
+
+/**
+ * Controller class for views_test_data callbacks.
+ */
+class ViewsTestDataController {
+
+  /**
+   * Renders an error form page.
+   *
+   * This contains a form that will contain an error and an embedded view with
+   * an exposed form.
+   */
+  public function errorFormPage() {
+    $build = [];
+    $build['view'] = [
+      '#type' => 'view',
+      '#name' => 'test_exposed_form_buttons',
+    ];
+    $build['error_form'] = \Drupal::formBuilder()->getForm('Drupal\views_test_data\Form\ViewsTestDataErrorForm');
+
+    return $build;
+  }
+
+}
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementEmbedForm.php b/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementEmbedForm.php
index f80092b3a..80d19d1fa 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementEmbedForm.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementEmbedForm.php
@@ -21,13 +21,13 @@ class ViewsTestDataElementEmbedForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['view'] = array(
+    $form['view'] = [
       '#type' => 'view',
       '#name' => 'test_view_embed',
       '#display_id' => 'embed_1',
-      '#arguments' => array(25),
+      '#arguments' => [25],
       '#embed' => TRUE,
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementForm.php b/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementForm.php
index ba00cacb0..78aa99800 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementForm.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataElementForm.php
@@ -21,13 +21,13 @@ class ViewsTestDataElementForm extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['view'] = array(
+    $form['view'] = [
       '#type' => 'view',
       '#name' => 'test_view_embed',
       '#display_id' => 'default',
-      '#arguments' => array(25),
+      '#arguments' => [25],
       '#embed' => FALSE,
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataErrorForm.php b/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataErrorForm.php
new file mode 100644
index 000000000..6ad0361cd
--- /dev/null
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Form/ViewsTestDataErrorForm.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\views_test_data\Form;
+
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Implements a test form that has a validation error.
+ */
+class ViewsTestDataErrorForm implements FormInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'views_test_data_error_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['text'] = [
+      '#type' => 'textfield',
+    ];
+    $form['submit'] = [
+      '#type' => 'submit',
+      '#value' => t('Submit'),
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    $form_state->setErrorByName('text', t('Form validation error'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+  }
+
+}
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php
index b2026f7c5..551598632 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/access/StaticTest.php
@@ -19,7 +19,7 @@ class StaticTest extends AccessPluginBase {
 
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['access'] = array('default' => FALSE);
+    $options['access'] = ['default' => FALSE];
 
     return $options;
   }
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/area/TestExample.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/area/TestExample.php
index 5cd26239a..74818e8bb 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/area/TestExample.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/area/TestExample.php
@@ -27,8 +27,8 @@ class TestExample extends AreaPluginBase {
    */
   public function defineOptions() {
     $options = parent::defineOptions();
-    $options['string'] = array('default' => '');
-    $options['custom_access'] = array('default' => TRUE);
+    $options['string'] = ['default' => ''];
+    $options['custom_access'] = ['default' => TRUE];
 
     return $options;
   }
@@ -46,11 +46,11 @@ class TestExample extends AreaPluginBase {
    */
   public function render($empty = FALSE) {
     if (!$empty || !empty($this->options['empty'])) {
-      return array(
+      return [
         '#markup' => $this->globalTokenReplace($this->options['string']),
-      );
+      ];
     }
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php
index 6f35ba48b..ac068e17a 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/argument_default/ArgumentDefaultTest.php
@@ -19,7 +19,7 @@ class ArgumentDefaultTest extends ArgumentDefaultPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['value'] = array('default' => '');
+    $options['value'] = ['default' => ''];
 
     return $options;
   }
@@ -28,6 +28,7 @@ class ArgumentDefaultTest extends ArgumentDefaultPluginBase {
    * {@inheritdoc}
    */
   public function getArgument() {
+    $this->view->element['#cache']['tags'][] = 'example_tag';
     return $this->options['value'];
   }
 
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php
index c149dcb01..0ff2ba81f 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display/DisplayTest.php
@@ -39,7 +39,7 @@ class DisplayTest extends DisplayPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['test_option'] = array('default' => '');
+    $options['test_option'] = ['default' => ''];
 
     return $options;
   }
@@ -50,21 +50,21 @@ class DisplayTest extends DisplayPluginBase {
   public function optionsSummary(&$categories, &$options) {
     parent::optionsSummary($categories, $options);
 
-    $categories['display_test'] = array(
+    $categories['display_test'] = [
       'title' => $this->t('Display test settings'),
       'column' => 'second',
-      'build' => array(
+      'build' => [
         '#weight' => -100,
-      ),
-    );
+      ],
+    ];
 
     $test_option = $this->getOption('test_option') ?: $this->t('Empty');
 
-    $options['test_option'] = array(
+    $options['test_option'] = [
       'category' => 'display_test',
       'title' => $this->t('Test option'),
       'value' => views_ui_truncate($test_option, 24),
-    );
+    ];
   }
 
   /**
@@ -76,12 +76,12 @@ class DisplayTest extends DisplayPluginBase {
     switch ($form_state->get('section')) {
       case 'test_option':
         $form['#title'] .= $this->t('Test option');
-        $form['test_option'] = array(
+        $form['test_option'] = [
           '#title' => $this->t('Test option'),
           '#type' => 'textfield',
           '#description' => $this->t('This is a textfield for test_option.'),
           '#default_value' => $this->getOption('test_option'),
-        );
+        ];
         break;
     }
   }
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest.php
index 8e3dbd82c..25594c358 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/display_extender/DisplayExtenderTest.php
@@ -39,19 +39,19 @@ class DisplayExtenderTest extends DisplayExtenderPluginBase {
   public function optionsSummary(&$categories, &$options) {
     parent::optionsSummary($categories, $options);
 
-    $categories['display_extender_test'] = array(
+    $categories['display_extender_test'] = [
       'title' => $this->t('Display extender test settings'),
       'column' => 'second',
-      'build' => array(
+      'build' => [
         '#weight' => -100,
-      ),
-    );
+      ],
+    ];
 
-    $options['test_extender_test_option'] = array(
+    $options['test_extender_test_option'] = [
       'category' => 'display_extender_test',
       'title' => $this->t('Test option'),
       'value' => views_ui_truncate($this->options['test_extender_test_option'], 24),
-    );
+    ];
   }
 
   /**
@@ -61,12 +61,12 @@ class DisplayExtenderTest extends DisplayExtenderPluginBase {
     switch ($form_state->get('section')) {
       case 'test_extender_test_option':
         $form['#title'] .= $this->t('Test option');
-        $form['test_extender_test_option'] = array(
+        $form['test_extender_test_option'] = [
           '#title' => $this->t('Test option'),
           '#type' => 'textfield',
           '#description' => $this->t('This is a textfield for test_option.'),
           '#default_value' => $this->options['test_extender_test_option'],
-        );
+        ];
     }
   }
 
@@ -86,7 +86,7 @@ class DisplayExtenderTest extends DisplayExtenderPluginBase {
    * {@inheritdoc}
    */
   public function defaultableSections(&$sections, $section = NULL) {
-    $sections['test_extender_test_option'] = array('test_extender_test_option');
+    $sections['test_extender_test_option'] = ['test_extender_test_option'];
   }
 
   /**
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterBooleanOperatorDefaultTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterBooleanOperatorDefaultTest.php
new file mode 100644
index 000000000..33cb5f979
--- /dev/null
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterBooleanOperatorDefaultTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Drupal\views_test_data\Plugin\views\filter;
+
+use Drupal\views\Plugin\views\filter\BooleanOperator;
+
+/**
+ * Filter to test queryOpBoolean() with default operator.
+ *
+ * @ingroup views_filter_handlers
+ *
+ * @ViewsFilter("boolean_default")
+ */
+class FilterBooleanOperatorDefaultTest extends BooleanOperator {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    $this->ensureMyTable();
+    $field = "$this->tableAlias.$this->realField";
+    $this->queryOpBoolean($field);
+  }
+
+}
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterTest.php
index 4d6cd298d..5bc7a190c 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/filter/FilterTest.php
@@ -18,7 +18,7 @@ class FilterTest extends FilterPluginBase {
   protected function defineOptions() {
     $options = parent::defineOptions();
 
-    $options['test_enable'] = array('default' => TRUE);
+    $options['test_enable'] = ['default' => TRUE];
     return $options;
   }
 
@@ -30,11 +30,11 @@ class FilterTest extends FilterPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['test_enable'] = array(
+    $form['test_enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Controls whether the filter plugin should be active'),
       '#default_value' => $this->options['test_enable'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php
index c1d04cf0c..cf430af25 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php
@@ -18,17 +18,17 @@ use Drupal\views\ViewExecutable;
  * )
  */
 class QueryTest extends QueryPluginBase {
-  protected $conditions = array();
-  protected $fields = array();
-  protected $allItems = array();
-  protected $orderBy = array();
+  protected $conditions = [];
+  protected $fields = [];
+  protected $allItems = [];
+  protected $orderBy = [];
 
   /**
    * {@inheritdoc}
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['test_setting'] = array('default' => '');
+    $options['test_setting'] = ['default' => ''];
 
     return $options;
   }
@@ -39,11 +39,11 @@ class QueryTest extends QueryPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['test_setting'] = array(
+    $form['test_setting'] = [
       '#title' => $this->t('Test setting'),
       '#type' => 'textfield',
       '#default_value' => $this->options['test_setting'],
-    );
+    ];
   }
 
   /**
@@ -57,21 +57,21 @@ class QueryTest extends QueryPluginBase {
   }
 
   public function addWhere($group, $field, $value = NULL, $operator = NULL) {
-    $this->conditions[] = array(
+    $this->conditions[] = [
       'field' => $field,
       'value' => $value,
       'operator' => $operator
-    );
+    ];
 
   }
 
-  public function addField($table, $field, $alias = '', $params = array()) {
+  public function addField($table, $field, $alias = '', $params = []) {
     $this->fields[$field] = $field;
     return $field;
   }
 
-  public function addOrderBy($table, $field = NULL, $order = 'ASC', $alias = '', $params = array()) {
-    $this->orderBy = array('field' => $field, 'order' => $order);
+  public function addOrderBy($table, $field = NULL, $order = 'ASC', $alias = '', $params = []) {
+    $this->orderBy = ['field' => $field, 'order' => $order];
   }
 
 
@@ -96,7 +96,7 @@ class QueryTest extends QueryPluginBase {
    * {@inheritdoc}
    */
   public function execute(ViewExecutable $view) {
-    $result = array();
+    $result = [];
     foreach ($this->allItems as $element) {
       // Run all conditions on the element, and add it to the result if they
       // match.
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php
index 8ca36c6ff..6af493b1e 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/row/RowTest.php
@@ -32,7 +32,7 @@ class RowTest extends RowPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['test_option'] = array('default' => '');
+    $options['test_option'] = ['default' => ''];
 
     return $options;
   }
@@ -43,12 +43,12 @@ class RowTest extends RowPluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['test_option'] = array(
+    $form['test_option'] = [
       '#title' => $this->t('Test option'),
       '#type' => 'textfield',
       '#description' => $this->t('This is a textfield for test_option.'),
       '#default_value' => $this->options['test_option'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php
index 2c655e745..3ae816a8d 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/MappingTest.php
@@ -24,26 +24,26 @@ class MappingTest extends Mapping {
    * {@inheritdoc}
    */
   protected function defineMapping() {
-    return array(
-      'title_field' => array(
+    return [
+      'title_field' => [
         '#title' => $this->t('Title field'),
         '#description' => $this->t('Choose the field with the custom title.'),
         '#toggle' => TRUE,
         '#required' => TRUE,
-      ),
-      'name_field' => array(
+      ],
+      'name_field' => [
         '#title' => $this->t('Name field'),
         '#description' => $this->t('Choose the field with the custom name.'),
-      ),
-      'numeric_field' => array(
+      ],
+      'numeric_field' => [
         '#title' => $this->t('Numeric field'),
         '#description' => $this->t('Select one or more numeric fields.'),
         '#multiple' => TRUE,
         '#toggle' => TRUE,
         '#filter' => 'filterNumericFields',
         '#required' => TRUE,
-      ),
-    );
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php
index cb66d43f7..9c0c3d707 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/style/StyleTest.php
@@ -40,7 +40,7 @@ class StyleTest extends StylePluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['test_option'] = array('default' => '');
+    $options['test_option'] = ['default' => ''];
 
     return $options;
   }
@@ -51,12 +51,12 @@ class StyleTest extends StylePluginBase {
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
 
-    $form['test_option'] = array(
+    $form['test_option'] = [
       '#title' => $this->t('Test option'),
       '#type' => 'textfield',
       '#description' => $this->t('This is a textfield for test_option.'),
       '#default_value' => $this->options['test_option'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/tests/modules/views_test_data/views_test_data.install b/web/core/modules/views/tests/modules/views_test_data/views_test_data.install
index eeb5faa84..3590440b9 100644
--- a/web/core/modules/views/tests/modules/views_test_data/views_test_data.install
+++ b/web/core/modules/views/tests/modules/views_test_data/views_test_data.install
@@ -17,7 +17,7 @@ function views_test_data_schema() {
  */
 function views_test_data_install() {
   // Add the marquee tag to possible html elements to test the field handler.
-  $values = array(
+  $values = [
     'div' => 'DIV',
     'span' => 'SPAN',
     'h1' => 'H1',
@@ -30,6 +30,6 @@ function views_test_data_install() {
     'strong' => 'STRONG',
     'em' => 'EM',
     'marquee' => 'MARQUEE'
-  );
+  ];
   \Drupal::configFactory()->getEditable('views.settings')->set('field_rewrite_elements', $values)->save();
 }
diff --git a/web/core/modules/views/tests/modules/views_test_data/views_test_data.module b/web/core/modules/views/tests/modules/views_test_data/views_test_data.module
index bd917c7ee..cdb99cc10 100644
--- a/web/core/modules/views/tests/modules/views_test_data/views_test_data.module
+++ b/web/core/modules/views/tests/modules/views_test_data/views_test_data.module
@@ -66,13 +66,13 @@ function views_test_data_preprocess_views_view_table(&$variables) {
  *   - view: The view object.
  */
 function template_preprocess_views_view_mapping_test(&$variables) {
-  $variables['element'] = array();
+  $variables['element'] = [];
 
   foreach ($variables['rows'] as $delta => $row) {
-    $fields = array();
+    $fields = [];
     foreach ($variables['options']['mapping'] as $type => $field_names) {
       if (!is_array($field_names)) {
-        $field_names = array($field_names);
+        $field_names = [$field_names];
       }
       foreach ($field_names as $field_name) {
         if ($value = $variables['view']->style_plugin->getField($delta, $field_name)) {
@@ -87,26 +87,26 @@ function template_preprocess_views_view_mapping_test(&$variables) {
     }
 
     // Build a container for the row.
-    $variables['element'][$delta] = array(
+    $variables['element'][$delta] = [
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array(
+      '#attributes' => [
+        'class' => [
           'views-row-mapping-test',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     // Add each field to the row.
     foreach ($fields as $key => $render) {
-      $variables['element'][$delta][$key] = array(
+      $variables['element'][$delta][$key] = [
         '#children' => $render,
         '#type' => 'container',
-        '#attributes' => array(
-          'class' => array(
+        '#attributes' => [
+          'class' => [
             $key,
-          ),
-        ),
-      );
+          ],
+        ],
+      ];
     }
   }
 }
diff --git a/web/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml b/web/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml
index cb0ad6379..1bf63f409 100644
--- a/web/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml
+++ b/web/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml
@@ -19,3 +19,11 @@ views_test_data.form_multiple:
     _controller: '\Drupal\views_test_data\Controller\ViewsTestFormMultipleController::testPage'
   requirements:
     _access: 'TRUE'
+
+views_test_data.error_form_page:
+  path: '/views_test_data_error_form_page'
+  defaults:
+    _title: 'Test Views Form Exposed Errors'
+    _controller: '\Drupal\views_test_data\Controller\ViewsTestDataController::errorFormPage'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/views/tests/modules/views_test_data/views_test_data.views.inc b/web/core/modules/views/tests/modules/views_test_data/views_test_data.views.inc
index ceaa8e9fe..11159412b 100644
--- a/web/core/modules/views/tests/modules/views_test_data/views_test_data.views.inc
+++ b/web/core/modules/views/tests/modules/views_test_data/views_test_data.views.inc
@@ -39,7 +39,7 @@ function views_test_data_views_data_alter() {
 function views_test_data_views_analyze(ViewExecutable $view) {
   \Drupal::state()->set('views_hook_test_views_analyze', TRUE);
 
-  $ret = array();
+  $ret = [];
 
   $ret[] = Analyzer::formatMessage(t('Test ok message'), 'ok');
   $ret[] = Analyzer::formatMessage(t('Test warning message'), 'warning');
diff --git a/web/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc b/web/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc
index d9d2a668d..dd69f4c95 100644
--- a/web/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc
+++ b/web/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc
@@ -22,10 +22,10 @@ function views_test_data_views_query_substitutions(ViewExecutable $view) {
 function views_test_data_views_form_substitutions() {
   \Drupal::state()->set('views_hook_test_views_form_substitutions', TRUE);
   $render = ['#markup' => '<em>unescaped</em>'];
-  return array(
+  return [
     '<!--will-be-escaped-->' => '<em>escaped</em>',
     '<!--will-be-not-escaped-->' => \Drupal::service('renderer')->renderPlain($render),
-  );
+  ];
 }
 
 /**
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php
index 42da7b659..3611829e8 100644
--- a/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php
@@ -42,7 +42,7 @@ class GlossaryViewTest extends JavascriptTestBase {
   protected function setUp() {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+    ViewTestData::createTestViews(get_class($this), ['views_test_config']);
 
     // Create a Content type and some test nodes with titles that start with
     // different letters.
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FieldTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FieldTest.php
index 6676daf1e..76f0ff1e2 100644
--- a/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FieldTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FieldTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\views\FunctionalJavascript\Plugin\views\Handler;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
 use Drupal\node\Entity\NodeType;
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/GroupedExposedFilterTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/GroupedExposedFilterTest.php
new file mode 100644
index 000000000..9a9b2da4a
--- /dev/null
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/GroupedExposedFilterTest.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Drupal\Tests\views\FunctionalJavascript\Plugin\views\Handler;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+use Drupal\node\Entity\NodeType;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Tests the grouped exposed filter admin UI.
+ *
+ * @group views
+ */
+class GroupedExposedFilterTest extends JavascriptTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'views', 'views_ui', 'user', 'views_test_config'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_exposed_admin_ui'];
+
+  /**
+   * The account.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $account;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    ViewTestData::createTestViews(get_class($this), ['views_test_config']);
+
+    // Disable automatic live preview to make the sequence of calls clearer.
+    \Drupal::configFactory()->getEditable('views.settings')->set('ui.always_live_preview', FALSE)->save();
+
+    $this->account = $this->drupalCreateUser(['administer views']);
+    $this->drupalLogin($this->account);
+
+    // Setup a node type that has the right fields for the test view.
+    NodeType::create([
+      'type' => 'page',
+    ])->save();
+
+    FieldConfig::create([
+      'entity_type' => 'node',
+      'field_name' => 'body',
+      'bundle' => 'page',
+    ])->save();
+  }
+
+  /**
+   * Test if the right fields are shown and the right values set.
+   */
+  public function testGroupedFilterValuesUI() {
+    $web_assert = $this->assertSession();
+
+    $this->drupalGet('/admin/structure/views/view/test_exposed_admin_ui');
+    $page = $this->getSession()->getPage();
+
+    // Open the dialog for the grouped filter.
+    $page->clickLink('Content: Authored on (grouped)');
+    $web_assert->assertWaitOnAjaxRequest();
+
+    // Test that the 'min' field is shown and that it contains the right value.
+    $between_from = $page->findField('options[group_info][group_items][1][value][min]');
+    $this->assertNotEmpty($between_from->isVisible());
+    $this->assertEquals('2015-01-01', $between_from->getValue());
+
+    // Test that the 'max' field is shown and that it contains the right value.
+    $between_to = $page->findField('options[group_info][group_items][1][value][max]');
+    $this->assertNotEmpty($between_to->isVisible());
+    $this->assertEquals('2016-01-01', $between_to->getValue());
+
+    $weight = $page->findField('options[group_info][group_items][1][weight]');
+
+    // If there are 3 items, values from -3 to 3 should be available.
+    $this->assertFalse($weight->find('named', ['option', -4]));
+    foreach (range(-3, 3) as $value) {
+      $this->assertTrue($weight->find('named', ['option', $value]));
+    }
+    $this->assertFalse($weight->find('named', ['option', 4]));
+
+    $page->pressButton("Add another item");
+    $web_assert->waitForField('options[group_info][group_items][4][title]');
+
+    // A new items was added, weight options should now be -4 to 4.
+    $this->assertFalse($weight->find('named', ['option', -5]));
+    foreach (range(-4, 4) as $value) {
+      $this->assertTrue($weight->find('named', ['option', $value]));
+    }
+    $this->assertFalse($weight->find('named', ['option', 5]));
+  }
+
+}
diff --git a/web/core/modules/views/tests/src/Kernel/BasicTest.php b/web/core/modules/views/tests/src/Kernel/BasicTest.php
index 49f4398bf..4ef22b140 100644
--- a/web/core/modules/views/tests/src/Kernel/BasicTest.php
+++ b/web/core/modules/views/tests/src/Kernel/BasicTest.php
@@ -16,7 +16,7 @@ class BasicTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view', 'test_simple_argument');
+  public static $testViews = ['test_view', 'test_simple_argument'];
 
   /**
    * Tests a trivial result set.
@@ -30,10 +30,10 @@ class BasicTest extends ViewsKernelTestBase {
 
     // Verify the result.
     $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->dataSet(), array(
+    $this->assertIdenticalResultset($view, $this->dataSet(), [
       'views_test_data_name' => 'name',
       'views_test_data_age' => 'age',
-    ));
+    ]);
   }
 
   /**
@@ -44,55 +44,55 @@ class BasicTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add a filter.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'operator' => '<',
-        'value' => array(
+        'value' => [
           'value' => '28',
           'min' => '',
           'max' => '',
-        ),
+        ],
         'group' => '0',
         'exposed' => FALSE,
-        'expose' => array(
+        'expose' => [
           'operator' => FALSE,
           'label' => '',
-        ),
+        ],
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
 
     // Execute the view.
     $this->executeView($view);
 
     // Build the expected result.
-    $dataset = array(
-      array(
+    $dataset = [
+      [
         'id' => 1,
         'name' => 'John',
         'age' => 25,
-      ),
-      array(
+      ],
+      [
         'id' => 2,
         'name' => 'George',
         'age' => 27,
-      ),
-      array(
+      ],
+      [
         'id' => 4,
         'name' => 'Paul',
         'age' => 26,
-      ),
-    );
+      ],
+    ];
 
     // Verify the result.
     $this->assertEqual(3, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultSet($view, $dataset, array(
+    $this->assertIdenticalResultSet($view, $dataset, [
       'views_test_data_name' => 'name',
       'views_test_data_age' => 'age',
-    ));
+    ]);
   }
 
   /**
@@ -101,24 +101,24 @@ class BasicTest extends ViewsKernelTestBase {
   public function testSimpleArgument() {
     // Execute with a view
     $view = Views::getView('test_simple_argument');
-    $view->setArguments(array(27));
+    $view->setArguments([27]);
     $this->executeView($view);
 
     // Build the expected result.
-    $dataset = array(
-      array(
+    $dataset = [
+      [
         'id' => 2,
         'name' => 'George',
         'age' => 27,
-      ),
-    );
+      ],
+    ];
 
     // Verify the result.
     $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultSet($view, $dataset, array(
+    $this->assertIdenticalResultSet($view, $dataset, [
       'views_test_data_name' => 'name',
       'views_test_data_age' => 'age',
-    ));
+    ]);
 
     // Test "show all" if no argument is present.
     $view = Views::getView('test_simple_argument');
@@ -128,10 +128,10 @@ class BasicTest extends ViewsKernelTestBase {
     $dataset = $this->dataSet();
 
     $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultSet($view, $dataset, array(
+    $this->assertIdenticalResultSet($view, $dataset, [
       'views_test_data_name' => 'name',
       'views_test_data_age' => 'age',
-    ));
+    ]);
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php b/web/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php
index dfcb30e20..b20f98118 100644
--- a/web/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php
@@ -27,7 +27,7 @@ class RowEntityRenderersTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_entity_row_renderers');
+  public static $testViews = ['test_entity_row_renderers'];
 
   /**
    * An array of added languages.
@@ -51,13 +51,13 @@ class RowEntityRenderersTest extends ViewsKernelTestBase {
 
     $this->installEntitySchema('node');
     $this->installEntitySchema('user');
-    $this->installSchema('node', array('node_access'));
-    $this->installConfig(array('node', 'language'));
+    $this->installSchema('node', ['node_access']);
+    $this->installConfig(['node', 'language']);
 
     // The entity.node.canonical route must exist when nodes are rendered.
     $this->container->get('router.builder')->rebuild();
 
-    $this->langcodes = array(\Drupal::languageManager()->getDefaultLanguage()->getId());
+    $this->langcodes = [\Drupal::languageManager()->getDefaultLanguage()->getId()];
     for ($i = 0; $i < 2; $i++) {
       $langcode = 'l' . $i;
       $this->langcodes[] = $langcode;
@@ -65,27 +65,27 @@ class RowEntityRenderersTest extends ViewsKernelTestBase {
     }
 
     // Make sure we do not try to render non-existing user data.
-    $node_type = NodeType::create(array('type' => 'test'));
+    $node_type = NodeType::create(['type' => 'test']);
     $node_type->setDisplaySubmitted(FALSE);
     $node_type->save();
 
-    $this->values = array();
+    $this->values = [];
     $controller = \Drupal::entityManager()->getStorage('node');
     $langcode_index = 0;
 
     for ($i = 0; $i < count($this->langcodes); $i++) {
       // Create a node with a different default language each time.
       $default_langcode = $this->langcodes[$langcode_index++];
-      $node = $controller->create(array('type' => 'test', 'uid' => 0, 'langcode' => $default_langcode));
+      $node = $controller->create(['type' => 'test', 'uid' => 0, 'langcode' => $default_langcode]);
       // Ensure the default language is processed first.
-      $langcodes = array_merge(array($default_langcode), array_diff($this->langcodes, array($default_langcode)));
+      $langcodes = array_merge([$default_langcode], array_diff($this->langcodes, [$default_langcode]));
 
       foreach ($langcodes as $langcode) {
         // Ensure we have a predictable result order.
         $this->values[$i][$langcode] = $i . '-' . $langcode . '-' . $this->randomMachineName();
 
         if ($langcode != $default_langcode) {
-          $node->addTranslation($langcode, array('title' => $this->values[$i][$langcode]));
+          $node->addTranslation($langcode, ['title' => $this->values[$i][$langcode]]);
         }
         else {
           $node->setTitle($this->values[$i][$langcode]);
@@ -121,7 +121,7 @@ class RowEntityRenderersTest extends ViewsKernelTestBase {
    *   node.
    */
   protected function checkLanguageRenderers($display, $values) {
-    $expected = array(
+    $expected = [
       $values[0]['en'],
       $values[0]['en'],
       $values[0]['en'],
@@ -131,10 +131,10 @@ class RowEntityRenderersTest extends ViewsKernelTestBase {
       $values[2]['en'],
       $values[2]['en'],
       $values[2]['en'],
-    );
+    ];
     $this->assertTranslations($display, '***LANGUAGE_language_content***', $expected, 'The current language renderer behaves as expected.');
 
-    $expected = array(
+    $expected = [
       $values[0]['en'],
       $values[0]['en'],
       $values[0]['en'],
@@ -144,10 +144,10 @@ class RowEntityRenderersTest extends ViewsKernelTestBase {
       $values[2]['l1'],
       $values[2]['l1'],
       $values[2]['l1'],
-    );
+    ];
     $this->assertTranslations($display, '***LANGUAGE_entity_default***', $expected, 'The default language renderer behaves as expected.');
 
-    $expected = array(
+    $expected = [
       $values[0]['en'],
       $values[0]['l0'],
       $values[0]['l1'],
@@ -157,10 +157,10 @@ class RowEntityRenderersTest extends ViewsKernelTestBase {
       $values[2]['en'],
       $values[2]['l0'],
       $values[2]['l1'],
-    );
+    ];
     $this->assertTranslations($display, '***LANGUAGE_entity_translation***', $expected, 'The translation language renderer behaves as expected.');
 
-    $expected = array(
+    $expected = [
       $values[0][$this->langcodes[0]],
       $values[0][$this->langcodes[0]],
       $values[0][$this->langcodes[0]],
@@ -170,10 +170,10 @@ class RowEntityRenderersTest extends ViewsKernelTestBase {
       $values[2][$this->langcodes[0]],
       $values[2][$this->langcodes[0]],
       $values[2][$this->langcodes[0]],
-    );
+    ];
     $this->assertTranslations($display, '***LANGUAGE_site_default***', $expected, 'The site default language renderer behaves as expected.');
 
-    $expected = array(
+    $expected = [
       $values[0]['l0'],
       $values[0]['l0'],
       $values[0]['l0'],
@@ -183,7 +183,7 @@ class RowEntityRenderersTest extends ViewsKernelTestBase {
       $values[2]['l0'],
       $values[2]['l0'],
       $values[2]['l0'],
-    );
+    ];
     $this->assertTranslations($display, 'l0', $expected, 'The language specific renderer behaves as expected.');
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php b/web/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php
index f97659a7f..4929c7ecf 100644
--- a/web/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php
@@ -40,14 +40,14 @@ class ViewEntityDependenciesTest extends ViewsKernelTestBase {
 
     // Install the necessary dependencies for node type creation to work.
     $this->installEntitySchema('node');
-    $this->installConfig(array('field', 'node'));
+    $this->installConfig(['field', 'node']);
 
-    $comment_type = CommentType::create(array(
+    $comment_type = CommentType::create([
       'id' => 'comment',
       'label' => 'Comment settings',
       'description' => 'Comment settings',
       'target_entity_type_id' => 'node',
-    ));
+    ]);
     $comment_type->save();
 
     $content_type = NodeType::create([
@@ -55,29 +55,29 @@ class ViewEntityDependenciesTest extends ViewsKernelTestBase {
       'name' => $this->randomString(),
     ]);
     $content_type->save();
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => Unicode::strtolower($this->randomMachineName()),
       'entity_type' => 'node',
       'type' => 'comment',
-    ));
+    ]);
     $field_storage->save();
     FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => $content_type->id(),
       'label' => $this->randomMachineName() . '_label',
       'description' => $this->randomMachineName() . '_description',
-      'settings' => array(
+      'settings' => [
         'comment_type' => $comment_type->id(),
-      ),
+      ],
     ])->save();
     FieldConfig::create([
       'field_storage' => FieldStorageConfig::loadByName('node', 'body'),
       'bundle' => $content_type->id(),
       'label' => $this->randomMachineName() . '_body',
-      'settings' => array('display_summary' => TRUE),
+      'settings' => ['display_summary' => TRUE],
     ])->save();
 
-    ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+    ViewTestData::createTestViews(get_class($this), ['views_test_config']);
   }
 
   /**
diff --git a/web/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php b/web/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
index 3c46c9edd..2319a7064 100644
--- a/web/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
+++ b/web/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
@@ -26,7 +26,7 @@ class ViewsEntitySchemaSubscriberIntegrationTest extends ViewsKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['entity_test', 'user', 'text'];
+  public static $modules = ['entity_test', 'entity_test_update', 'user', 'text'];
 
   /**
    * Views used by this test.
@@ -79,7 +79,7 @@ class ViewsEntitySchemaSubscriberIntegrationTest extends ViewsKernelTestBase {
 
     // Install every entity type's schema that wasn't installed in the parent
     // method.
-    foreach (array_diff_key($this->entityManager->getDefinitions(), array_flip(array('user', 'entity_test'))) as $entity_type_id => $entity_type) {
+    foreach (array_diff_key($this->entityManager->getDefinitions(), array_flip(['user', 'entity_test'])) as $entity_type_id => $entity_type) {
       $this->installEntitySchema($entity_type_id);
     }
   }
@@ -90,6 +90,10 @@ class ViewsEntitySchemaSubscriberIntegrationTest extends ViewsKernelTestBase {
   public function testDeleteEntityType() {
     $entity_storage = $this->entityManager->getStorage('view');
 
+    // Make the test entity type revisionable.
+    $this->updateEntityTypeToRevisionable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
     $views = $entity_storage->loadMultiple();
 
     // Ensure that all test views exists.
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
index af3d65837..a95214a78 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
@@ -2,9 +2,9 @@
 
 namespace Drupal\Tests\views\Kernel\Handler;
 
-use Drupal\block\Entity\Block;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormState;
+use Drupal\simpletest\BlockCreationTrait;
 use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
 use Drupal\views\Entity\View;
 use Drupal\views\Views;
@@ -17,6 +17,8 @@ use Drupal\views\Views;
  */
 class AreaEntityTest extends ViewsKernelTestBase {
 
+  use BlockCreationTrait;
+
   /**
    * Modules to enable.
    *
@@ -29,7 +31,7 @@ class AreaEntityTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_entity_area');
+  public static $testViews = ['test_entity_area'];
 
   /**
    * {@inheritdoc}
@@ -42,14 +44,15 @@ class AreaEntityTest extends ViewsKernelTestBase {
    * {@inheritdoc}
    */
   protected function setUpFixtures() {
+    // Install the themes used for this test.
+    $this->container->get('theme_installer')->install(['bartik']);
+    $this->container->get('config.factory')->getEditable('system.theme')->set('default', 'bartik')->save();
+
     $this->installEntitySchema('user');
     $this->installEntitySchema('entity_test');
     $this->installConfig(['entity_test']);
 
-    Block::create([
-      'id' => 'test_block',
-      'plugin' => 'system_main_block',
-    ])->save();
+    $this->placeBlock('system_main_block', ['id' => 'test_block']);
 
     parent::setUpFixtures();
   }
@@ -67,9 +70,9 @@ class AreaEntityTest extends ViewsKernelTestBase {
 
     // Test that all expected entity types have data.
     foreach (array_keys($expected_entities) as $entity) {
-      $this->assertTrue(!empty($data['entity_' . $entity]), format_string('Views entity area data found for @entity', array('@entity' => $entity)));
+      $this->assertTrue(!empty($data['entity_' . $entity]), format_string('Views entity area data found for @entity', ['@entity' => $entity]));
       // Test that entity_type is set correctly in the area data.
-      $this->assertEqual($entity, $data['entity_' . $entity]['area']['entity_type'], format_string('Correct entity_type set for @entity', array('@entity' => $entity)));
+      $this->assertEqual($entity, $data['entity_' . $entity]['area']['entity_type'], format_string('Correct entity_type set for @entity', ['@entity' => $entity]));
     }
 
     $expected_entities = array_filter($entity_types, function (EntityTypeInterface $type) {
@@ -78,7 +81,7 @@ class AreaEntityTest extends ViewsKernelTestBase {
 
     // Test that no configuration entity types have data.
     foreach (array_keys($expected_entities) as $entity) {
-      $this->assertTrue(empty($data['entity_' . $entity]), format_string('Views config entity area data not found for @entity', array('@entity' => $entity)));
+      $this->assertTrue(empty($data['entity_' . $entity]), format_string('Views config entity area data not found for @entity', ['@entity' => $entity]));
     }
   }
 
@@ -87,10 +90,10 @@ class AreaEntityTest extends ViewsKernelTestBase {
    */
   public function testEntityArea() {
     /** @var \Drupal\Core\Entity\EntityInterface[] $entities */
-    $entities = array();
+    $entities = [];
     for ($i = 0; $i < 3; $i++) {
       $random_label = $this->randomMachineName();
-      $data = array('bundle' => 'entity_test', 'name' => $random_label);
+      $data = ['bundle' => 'entity_test', 'name' => $random_label];
       $entity_test = $this->container->get('entity.manager')
         ->getStorage('entity_test')
         ->create($data);
@@ -134,7 +137,7 @@ class AreaEntityTest extends ViewsKernelTestBase {
     $this->assertTrue(strpos(trim((string) $result[0]), $entities[1]->label()) !== FALSE, 'The rendered entity appears in the footer of the view.');
     $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
 
-    $preview = $view->preview('default', array($entities[1]->id()));
+    $preview = $view->preview('default', [$entities[1]->id()]);
     $this->setRawContent($renderer->renderRoot($preview));
 
     $result = $this->xpath($header_xpath);
@@ -156,7 +159,7 @@ class AreaEntityTest extends ViewsKernelTestBase {
     $item['view_mode'] = 'test';
     $view->setHandler('default', 'header', 'entity_entity_test', $item);
 
-    $preview = $view->preview('default', array($entities[1]->id()));
+    $preview = $view->preview('default', [$entities[1]->id()]);
     $this->setRawContent($renderer->renderRoot($preview));
     $view_class = 'js-view-dom-id-' . $view->dom_id;
     $result = $this->xpath('//div[@class = "' . $view_class . '"]/header[1]');
@@ -165,14 +168,14 @@ class AreaEntityTest extends ViewsKernelTestBase {
 
     // Test entity access.
     $view = Views::getView('test_entity_area');
-    $preview = $view->preview('default', array($entities[2]->id()));
+    $preview = $view->preview('default', [$entities[2]->id()]);
     $this->setRawContent($renderer->renderRoot($preview));
     $view_class = 'js-view-dom-id-' . $view->dom_id;
     $result = $this->xpath('//div[@class = "' . $view_class . '"]/footer[1]');
     $this->assertTrue(strpos($result[0], $entities[2]->label()) === FALSE, 'The rendered entity does not appear in the footer of the view.');
 
     // Test the available view mode options.
-    $form = array();
+    $form = [];
     $form_state = (new FormState())
       ->set('type', 'header');
     $view->display_handler->getHandler('header', 'entity_entity_test')->buildOptionsForm($form, $form_state);
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaMessagesTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaMessagesTest.php
index 7e1fbb912..476551c9a 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaMessagesTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaMessagesTest.php
@@ -18,7 +18,7 @@ class AreaMessagesTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_area_messages');
+  public static $testViews = ['test_area_messages'];
 
   /**
    * Tests the messages area handler.
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaOrderTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaOrderTest.php
index 457c63579..84a66ab5c 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaOrderTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaOrderTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\views\Kernel\Handler;
 
-use Drupal\block\Entity\Block;
+use Drupal\simpletest\BlockCreationTrait;
 use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
 use Drupal\views\Views;
 
@@ -14,41 +14,41 @@ use Drupal\views\Views;
  */
 class AreaOrderTest extends ViewsKernelTestBase {
 
+  use BlockCreationTrait;
+
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('user', 'block');
+  public static $modules = ['user', 'block'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_area_order');
+  public static $testViews = ['test_area_order'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUpFixtures() {
-    Block::create(
-      [
-        'id' => 'bartik_branding',
-        'theme' => 'bartik',
-        'plugin' => 'system_branding_block',
-        'weight' => 1,
-      ]
-    )->save();
+    // Install the themes used for this test.
+    $this->container->get('theme_installer')->install(['bartik']);
 
-    Block::create(
-      [
-        'id' => 'bartik_powered',
-        'theme' => 'bartik',
-        'plugin' => 'system_powered_by_block',
-        'weight' => 2,
-      ]
-    )->save();
+    $this->placeBlock('system_branding_block', [
+      'id' => 'bartik_branding',
+      'theme' => 'bartik',
+      'plugin' => 'system_branding_block',
+      'weight' => 1,
+    ]);
+
+    $this->placeBlock('system_powered_by_block', [
+      'id' => 'bartik_powered',
+      'theme' => 'bartik',
+      'weight' => 2,
+    ]);
 
     parent::setUpFixtures();
   }
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
index 5ccacd87b..2feaaf144 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
@@ -13,19 +13,19 @@ use Drupal\views\Views;
  */
 class AreaTextTest extends ViewsKernelTestBase {
 
-  public static $modules = array('system', 'user', 'filter');
+  public static $modules = ['system', 'user', 'filter'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
 
-    $this->installConfig(array('system', 'filter'));
+    $this->installConfig(['system', 'filter']);
     $this->installEntitySchema('user');
   }
 
@@ -37,16 +37,16 @@ class AreaTextTest extends ViewsKernelTestBase {
 
     // add a text header
     $string = $this->randomMachineName();
-    $view->displayHandlers->get('default')->overrideOption('header', array(
-      'area' => array(
+    $view->displayHandlers->get('default')->overrideOption('header', [
+      'area' => [
         'id' => 'area',
         'table' => 'views',
         'field' => 'area',
-        'content' => array(
+        'content' => [
           'value' => $string,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
     // Execute the view.
     $this->executeView($view);
@@ -60,7 +60,7 @@ class AreaTextTest extends ViewsKernelTestBase {
     $this->assertEqual(check_markup($string), $renderer->renderRoot($build), 'Existent format should return something');
 
     // Empty results, and it shouldn't be displayed .
-    $this->assertEqual(array(), $view->display_handler->handlers['header']['area']->render(TRUE), 'No result should lead to no header');
+    $this->assertEqual([], $view->display_handler->handlers['header']['area']->render(TRUE), 'No result should lead to no header');
     // Empty results, and it should be displayed.
     $view->display_handler->handlers['header']['area']->options['empty'] = TRUE;
     $build = $view->display_handler->handlers['header']['area']->render(TRUE);
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaTitleTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaTitleTest.php
index f2a4151ea..8c16b6308 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaTitleTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaTitleTest.php
@@ -18,7 +18,7 @@ class AreaTitleTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_area_title');
+  public static $testViews = ['test_area_title'];
 
   /**
    * Tests the title area handler.
@@ -34,7 +34,7 @@ class AreaTitleTest extends ViewsKernelTestBase {
 
     $view->setDisplay('default');
     $this->executeView($view);
-    $view->result = array();
+    $view->result = [];
     $view->render();
     $this->assertEqual($view->getTitle(), 'test_title_empty', 'The title area should override the title if the result is empty.');
     $view->destroy();
@@ -47,7 +47,7 @@ class AreaTitleTest extends ViewsKernelTestBase {
 
     $view->setDisplay('page_1');
     $this->executeView($view);
-    $view->result = array();
+    $view->result = [];
     $view->render();
     $this->assertEqual($view->getTitle(), 'test_title_empty', 'The title area should override the title if the result is empty.');
     $view->destroy();
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php
index 89fe49e9e..6eaba132d 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php
@@ -18,14 +18,14 @@ class AreaViewTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('user');
+  public static $modules = ['user'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_simple_argument', 'test_area_view');
+  public static $testViews = ['test_simple_argument', 'test_area_view'];
 
   /**
    * Tests the view area handler.
@@ -44,7 +44,7 @@ class AreaViewTest extends ViewsKernelTestBase {
     $this->assertTrue(strpos($output, 'js-view-dom-id-' . $view->dom_id) !== FALSE, 'The test view is correctly embedded.');
     $view->destroy();
 
-    $view->setArguments(array(27));
+    $view->setArguments([27]);
     $this->executeView($view);
     $output = $view->render();
     $output = $renderer->renderRoot($output);
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php b/web/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php
index 527bd724f..db26e11a8 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php
@@ -18,16 +18,16 @@ class ArgumentDateTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_argument_date');
+  public static $testViews = ['test_argument_date'];
 
   /**
    * Stores the column map for this testCase.
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'id' => 'id',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -35,14 +35,14 @@ class ArgumentDateTest extends ViewsKernelTestBase {
   public function viewsData() {
     $data = parent::viewsData();
 
-    $date_plugins = array(
+    $date_plugins = [
       'date_fulldate',
       'date_day',
       'date_month',
       'date_week',
       'date_year',
       'date_year_month',
-    );
+    ];
     foreach ($date_plugins as $plugin_id) {
       $data['views_test_data'][$plugin_id] = $data['views_test_data']['created'];
       $data['views_test_data'][$plugin_id]['real field'] = 'created';
@@ -59,25 +59,25 @@ class ArgumentDateTest extends ViewsKernelTestBase {
   public function testCreatedFullDateHandler() {
     $view = Views::getView('test_argument_date');
     $view->setDisplay('default');
-    $this->executeView($view, array('20000102'));
-    $expected = array();
-    $expected[] = array('id' => 2);
+    $this->executeView($view, ['20000102']);
+    $expected = [];
+    $expected[] = ['id' => 2];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('default');
-    $this->executeView($view, array('20000101'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $expected[] = array('id' => 3);
-    $expected[] = array('id' => 4);
-    $expected[] = array('id' => 5);
+    $this->executeView($view, ['20000101']);
+    $expected = [];
+    $expected[] = ['id' => 1];
+    $expected[] = ['id' => 3];
+    $expected[] = ['id' => 4];
+    $expected[] = ['id' => 5];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('default');
-    $this->executeView($view, array('20001023'));
-    $expected = array();
+    $this->executeView($view, ['20001023']);
+    $expected = [];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
   }
@@ -90,25 +90,25 @@ class ArgumentDateTest extends ViewsKernelTestBase {
   public function testDayHandler() {
     $view = Views::getView('test_argument_date');
     $view->setDisplay('embed_1');
-    $this->executeView($view, array('02'));
-    $expected = array();
-    $expected[] = array('id' => 2);
+    $this->executeView($view, ['02']);
+    $expected = [];
+    $expected[] = ['id' => 2];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_1');
-    $this->executeView($view, array('01'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $expected[] = array('id' => 3);
-    $expected[] = array('id' => 4);
-    $expected[] = array('id' => 5);
+    $this->executeView($view, ['01']);
+    $expected = [];
+    $expected[] = ['id' => 1];
+    $expected[] = ['id' => 3];
+    $expected[] = ['id' => 4];
+    $expected[] = ['id' => 5];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_1');
-    $this->executeView($view, array('23'));
-    $expected = array();
+    $this->executeView($view, ['23']);
+    $expected = [];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
   }
 
@@ -120,19 +120,19 @@ class ArgumentDateTest extends ViewsKernelTestBase {
   public function testMonthHandler() {
     $view = Views::getView('test_argument_date');
     $view->setDisplay('embed_2');
-    $this->executeView($view, array('01'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $expected[] = array('id' => 2);
-    $expected[] = array('id' => 3);
-    $expected[] = array('id' => 4);
-    $expected[] = array('id' => 5);
+    $this->executeView($view, ['01']);
+    $expected = [];
+    $expected[] = ['id' => 1];
+    $expected[] = ['id' => 2];
+    $expected[] = ['id' => 3];
+    $expected[] = ['id' => 4];
+    $expected[] = ['id' => 5];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_2');
-    $this->executeView($view, array('12'));
-    $expected = array();
+    $this->executeView($view, ['12']);
+    $expected = [];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
   }
 
@@ -143,27 +143,27 @@ class ArgumentDateTest extends ViewsKernelTestBase {
    */
   public function testWeekHandler() {
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 9, 26, 2008)))
+      ->fields(['created' => gmmktime(0, 0, 0, 9, 26, 2008)])
       ->condition('id', 1)
       ->execute();
 
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 2, 29, 2004)))
+      ->fields(['created' => gmmktime(0, 0, 0, 2, 29, 2004)])
       ->condition('id', 2)
       ->execute();
 
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2000)))
+      ->fields(['created' => gmmktime(0, 0, 0, 1, 1, 2000)])
       ->condition('id', 3)
       ->execute();
 
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 10, 2000)))
+      ->fields(['created' => gmmktime(0, 0, 0, 1, 10, 2000)])
       ->condition('id', 4)
       ->execute();
 
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 2, 1, 2000)))
+      ->fields(['created' => gmmktime(0, 0, 0, 2, 1, 2000)])
       ->condition('id', 5)
       ->execute();
 
@@ -171,46 +171,46 @@ class ArgumentDateTest extends ViewsKernelTestBase {
     $view->setDisplay('embed_3');
     // Check the week calculation for a leap year.
     // @see http://wikipedia.org/wiki/ISO_week_date#Calculation
-    $this->executeView($view, array('39'));
-    $expected = array();
-    $expected[] = array('id' => 1);
+    $this->executeView($view, ['39']);
+    $expected = [];
+    $expected[] = ['id' => 1];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_3');
     // Check the week calculation for the 29th of February in a leap year.
     // @see http://wikipedia.org/wiki/ISO_week_date#Calculation
-    $this->executeView($view, array('09'));
-    $expected = array();
-    $expected[] = array('id' => 2);
+    $this->executeView($view, ['09']);
+    $expected = [];
+    $expected[] = ['id' => 2];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_3');
     // The first jan 2000 was still in the last week of the previous year.
-    $this->executeView($view, array('52'));
-    $expected = array();
-    $expected[] = array('id' => 3);
+    $this->executeView($view, ['52']);
+    $expected = [];
+    $expected[] = ['id' => 3];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_3');
-    $this->executeView($view, array('02'));
-    $expected = array();
-    $expected[] = array('id' => 4);
+    $this->executeView($view, ['02']);
+    $expected = [];
+    $expected[] = ['id' => 4];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_3');
-    $this->executeView($view, array('05'));
-    $expected = array();
-    $expected[] = array('id' => 5);
+    $this->executeView($view, ['05']);
+    $expected = [];
+    $expected[] = ['id' => 5];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_3');
-    $this->executeView($view, array('23'));
-    $expected = array();
+    $this->executeView($view, ['23']);
+    $expected = [];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
   }
 
@@ -221,47 +221,47 @@ class ArgumentDateTest extends ViewsKernelTestBase {
    */
   public function testYearHandler() {
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2001)))
+      ->fields(['created' => gmmktime(0, 0, 0, 1, 1, 2001)])
       ->condition('id', 3)
       ->execute();
 
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2002)))
+      ->fields(['created' => gmmktime(0, 0, 0, 1, 1, 2002)])
       ->condition('id', 4)
       ->execute();
 
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2002)))
+      ->fields(['created' => gmmktime(0, 0, 0, 1, 1, 2002)])
       ->condition('id', 5)
       ->execute();
 
     $view = Views::getView('test_argument_date');
     $view->setDisplay('embed_4');
-    $this->executeView($view, array('2000'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $expected[] = array('id' => 2);
+    $this->executeView($view, ['2000']);
+    $expected = [];
+    $expected[] = ['id' => 1];
+    $expected[] = ['id' => 2];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_4');
-    $this->executeView($view, array('2001'));
-    $expected = array();
-    $expected[] = array('id' => 3);
+    $this->executeView($view, ['2001']);
+    $expected = [];
+    $expected[] = ['id' => 3];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_4');
-    $this->executeView($view, array('2002'));
-    $expected = array();
-    $expected[] = array('id' => 4);
-    $expected[] = array('id' => 5);
+    $this->executeView($view, ['2002']);
+    $expected = [];
+    $expected[] = ['id' => 4];
+    $expected[] = ['id' => 5];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_4');
-    $this->executeView($view, array('23'));
-    $expected = array();
+    $this->executeView($view, ['23']);
+    $expected = [];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
   }
 
@@ -272,47 +272,47 @@ class ArgumentDateTest extends ViewsKernelTestBase {
    */
   public function testYearMonthHandler() {
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2001)))
+      ->fields(['created' => gmmktime(0, 0, 0, 1, 1, 2001)])
       ->condition('id', 3)
       ->execute();
 
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 4, 1, 2001)))
+      ->fields(['created' => gmmktime(0, 0, 0, 4, 1, 2001)])
       ->condition('id', 4)
       ->execute();
 
     $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 4, 1, 2001)))
+      ->fields(['created' => gmmktime(0, 0, 0, 4, 1, 2001)])
       ->condition('id', 5)
       ->execute();
 
     $view = Views::getView('test_argument_date');
     $view->setDisplay('embed_5');
-    $this->executeView($view, array('200001'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $expected[] = array('id' => 2);
+    $this->executeView($view, ['200001']);
+    $expected = [];
+    $expected[] = ['id' => 1];
+    $expected[] = ['id' => 2];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_5');
-    $this->executeView($view, array('200101'));
-    $expected = array();
-    $expected[] = array('id' => 3);
+    $this->executeView($view, ['200101']);
+    $expected = [];
+    $expected[] = ['id' => 3];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_5');
-    $this->executeView($view, array('200104'));
-    $expected = array();
-    $expected[] = array('id' => 4);
-    $expected[] = array('id' => 5);
+    $this->executeView($view, ['200104']);
+    $expected = [];
+    $expected[] = ['id' => 4];
+    $expected[] = ['id' => 5];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
     $view->destroy();
 
     $view->setDisplay('embed_5');
-    $this->executeView($view, array('201301'));
-    $expected = array();
+    $this->executeView($view, ['201301']);
+    $expected = [];
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php b/web/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
index e90ec8556..933a00099 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
@@ -17,9 +17,9 @@ class ArgumentNullTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
-  function viewsData() {
+  public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['id']['argument']['id'] = 'null';
 
@@ -32,13 +32,13 @@ class ArgumentNullTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add a null argument.
-    $view->displayHandlers->get('default')->overrideOption('arguments', array(
-      'null' => array(
+    $view->displayHandlers->get('default')->overrideOption('arguments', [
+      'null' => [
         'id' => 'null',
         'table' => 'views',
         'field' => 'null',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
@@ -57,15 +57,15 @@ class ArgumentNullTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add a argument, which has null as handler.
-    $view->displayHandlers->get('default')->overrideOption('arguments', array(
-      'id' => array(
+    $view->displayHandlers->get('default')->overrideOption('arguments', [
+      'id' => [
         'id' => 'id',
         'table' => 'views_test_data',
         'field' => 'id',
-      ),
-    ));
+      ],
+    ]);
 
-    $this->executeView($view, array(26));
+    $this->executeView($view, [26]);
 
     // The argument should be ignored, so every result should return.
     $this->assertEqual(5, count($view->result));
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php
index 1a5551c77..0690fc12c 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php
@@ -17,9 +17,9 @@ class FieldBooleanTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
-  function dataSet() {
+  public function dataSet() {
     // Use default dataset but remove the age from john and paul
     $data = parent::dataSet();
     $data[0]['age'] = 0;
@@ -27,7 +27,7 @@ class FieldBooleanTest extends ViewsKernelTestBase {
     return $data;
   }
 
-  function viewsData() {
+  public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['age']['field']['id'] = 'boolean';
     return $data;
@@ -37,14 +37,14 @@ class FieldBooleanTest extends ViewsKernelTestBase {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
@@ -70,7 +70,7 @@ class FieldBooleanTest extends ViewsKernelTestBase {
     $this->assertEqual('✔', $view->field['age']->advancedRender($view->result[1]));
 
     // Set a custom output format.
-    $view->field['age']->formats['test'] = array(t('Test-True'), t('Test-False'));
+    $view->field['age']->formats['test'] = [t('Test-True'), t('Test-False')];
     $view->field['age']->options['type'] = 'test';
     $this->assertEqual(t('Test-False'), $view->field['age']->advancedRender($view->result[0]));
     $this->assertEqual(t('Test-True'), $view->field['age']->advancedRender($view->result[1]));
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php
index 12f68ede7..b5c52fef7 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php
@@ -17,77 +17,77 @@ class FieldCounterTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('user');
+  public static $modules = ['user'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
-  function testSimple() {
+  public function testSimple() {
     $view = Views::getView('test_view');
     $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'counter' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'counter' => [
         'id' => 'counter',
         'table' => 'views',
         'field' => 'counter',
         'relationship' => 'none',
-      ),
-      'name' => array(
+      ],
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
     $view->preview();
 
     $counter = $view->style_plugin->getField(0, 'counter');
-    $this->assertEqual($counter, '1', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 1, '@counter' => $counter)));
+    $this->assertEqual($counter, '1', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', ['@expected' => 1, '@counter' => $counter]));
     $counter = $view->style_plugin->getField(1, 'counter');
-    $this->assertEqual($counter, '2', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 2, '@counter' => $counter)));
+    $this->assertEqual($counter, '2', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', ['@expected' => 2, '@counter' => $counter]));
     $counter = $view->style_plugin->getField(2, 'counter');
-    $this->assertEqual($counter, '3', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 3, '@counter' => $counter)));
+    $this->assertEqual($counter, '3', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', ['@expected' => 3, '@counter' => $counter]));
     $view->destroy();
     $view->storage->invalidateCaches();
 
     $view->setDisplay();
     $rand_start = rand(5, 10);
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'counter' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'counter' => [
         'id' => 'counter',
         'table' => 'views',
         'field' => 'counter',
         'relationship' => 'none',
         'counter_start' => $rand_start
-      ),
-      'name' => array(
+      ],
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
     $view->preview();
 
     $counter = $view->style_plugin->getField(0, 'counter');
     $expected_number = 0 + $rand_start;
-    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', ['@expected' => $expected_number, '@counter' => $counter]));
     $counter = $view->style_plugin->getField(1, 'counter');
     $expected_number = 1 + $rand_start;
-    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', ['@expected' => $expected_number, '@counter' => $counter]));
     $counter = $view->style_plugin->getField(2, 'counter');
     $expected_number = 2 + $rand_start;
-    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', ['@expected' => $expected_number, '@counter' => $counter]));
   }
 
   /**
    * @todo: Write tests for pager.
    */
-  function testPager() {
+  public function testPager() {
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
index af7bc1bc8..599052dcb 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
@@ -18,12 +18,12 @@ class FieldCustomTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * {@inheritdoc}
    */
-  function viewsData() {
+  public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['name']['field']['id'] = 'custom';
     return $data;
@@ -38,17 +38,17 @@ class FieldCustomTest extends ViewsKernelTestBase {
 
     // Alter the text of the field to a random string.
     $random = '<div>' . $this->randomMachineName() . '</div>';
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
-        'alter' => array(
+        'alter' => [
           'text' => $random,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
     $this->executeView($view);
 
@@ -98,17 +98,17 @@ class FieldCustomTest extends ViewsKernelTestBase {
 
     // Alter the text of the field to include XSS.
     $text = '<script>alert("kittens")</script>';
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
-        'alter' => array(
+        'alter' => [
           'text' => $text,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     $this->executeView($view);
     $this->assertEqual(Xss::filter($text), $view->style_plugin->getField(0, 'name'));
   }
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldDateTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldDateTest.php
index cb30bf7f6..833b5c99d 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldDateTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldDateTest.php
@@ -17,20 +17,20 @@ class FieldDateTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * {@inheritdoc}
    */
   public function schemaDefinition() {
     $schema = parent::schemaDefinition();
-    $schema['views_test_data']['fields']['destroyed'] = array(
+    $schema['views_test_data']['fields']['destroyed'] = [
       'description' => "The destruction date of this record",
       'type' => 'int',
       'unsigned' => TRUE,
       'not null' => FALSE,
       'default' => 0,
-    );
+    ];
     return $schema;
   }
 
@@ -40,14 +40,14 @@ class FieldDateTest extends ViewsKernelTestBase {
   public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['created']['field']['id'] = 'date';
-    $data['views_test_data']['destroyed'] = array(
+    $data['views_test_data']['destroyed'] = [
       'title' => 'Destroyed',
       'help' => 'Date in future this will be destroyed.',
-      'field' => array('id' => 'date'),
-      'argument' => array('id' => 'date'),
-      'filter' => array('id' => 'date'),
-      'sort' => array('id' => 'date'),
-    );
+      'field' => ['id' => 'date'],
+      'argument' => ['id' => 'date'],
+      'filter' => ['id' => 'date'],
+      'sort' => ['id' => 'date'],
+    ];
     return $data;
   }
 
@@ -69,36 +69,36 @@ class FieldDateTest extends ViewsKernelTestBase {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'created' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'created' => [
         'id' => 'created',
         'table' => 'views_test_data',
         'field' => 'created',
         'relationship' => 'none',
         // ISO 8601 format, see http://php.net/manual/function.date.php
         'custom_date_format' => 'c',
-      ),
-      'destroyed' => array(
+      ],
+      'destroyed' => [
         'id' => 'destroyed',
         'table' => 'views_test_data',
         'field' => 'destroyed',
         'relationship' => 'none',
         'custom_date_format' => 'c',
-      ),
-    ));
+      ],
+    ]);
     $time = gmmktime(0, 0, 0, 1, 1, 2000);
 
     $this->executeView($view);
 
-    $timezones = array(
+    $timezones = [
       NULL,
       'UTC',
       'America/New_York',
-    );
+    ];
 
     // Check each date/time in various timezones.
     foreach ($timezones as $timezone) {
-      $dates = array(
+      $dates = [
         'short' => format_date($time, 'short', '', $timezone),
         'medium' => format_date($time, 'medium', '', $timezone),
         'long' => format_date($time, 'long', '', $timezone),
@@ -111,30 +111,30 @@ class FieldDateTest extends ViewsKernelTestBase {
         'html_week' => format_date($time, 'html_week', '', $timezone),
         'html_year' => format_date($time, 'html_year', '', $timezone),
         'html_yearless_date' => format_date($time, 'html_yearless_date', '', $timezone),
-      );
+      ];
       $this->assertRenderedDatesEqual($view, $dates, $timezone);
     }
 
     // Check times in the past.
     $time_since = $this->container->get('date.formatter')->formatTimeDiffSince($time);
-    $intervals = array(
+    $intervals = [
       'raw time ago' => $time_since,
-      'time ago' => t('%time ago', array('%time' => $time_since)),
+      'time ago' => t('%time ago', ['%time' => $time_since]),
       'raw time span' => $time_since,
       'inverse time span' => "-$time_since",
-      'time span' => t('%time ago', array('%time' => $time_since)),
-    );
+      'time span' => t('%time ago', ['%time' => $time_since]),
+    ];
     $this->assertRenderedDatesEqual($view, $intervals);
 
     // Check times in the future.
     $time = gmmktime(0, 0, 0, 1, 1, 2050);
     $formatted = $this->container->get('date.formatter')->formatTimeDiffUntil($time);
-    $intervals = array(
+    $intervals = [
       'raw time span' => "-$formatted",
-      'time span' => t('%time hence', array(
+      'time span' => t('%time hence', [
         '%time' => $formatted,
-      )),
-    );
+      ]),
+    ];
     $this->assertRenderedFutureDatesEqual($view, $intervals);
   }
 
@@ -151,10 +151,10 @@ class FieldDateTest extends ViewsKernelTestBase {
   protected function assertRenderedDatesEqual($view, $map, $timezone = NULL) {
     foreach ($map as $date_format => $expected_result) {
       $view->field['created']->options['date_format'] = $date_format;
-      $t_args = array(
+      $t_args = [
         '%value' => $expected_result,
         '%format' => $date_format,
-      );
+      ];
       if (isset($timezone)) {
         $t_args['%timezone'] = $timezone;
         $message = t('Value %value in %format format for timezone %timezone matches.', $t_args);
@@ -180,11 +180,11 @@ class FieldDateTest extends ViewsKernelTestBase {
     foreach ($map as $format => $result) {
       $view->field['destroyed']->options['date_format'] = $format;
       $view_result = $view->field['destroyed']->advancedRender($view->result[0]);
-      $t_args = array(
+      $t_args = [
         '%value' => $result,
         '%format' => $format,
         '%actual' => $view_result,
-      );
+      ];
       $message = t('Value %value in %format matches %actual', $t_args);
       $this->assertEqual($view_result, $result, $message);
     }
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldEntityLinkTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldEntityLinkTest.php
index 8f53f6a36..874f03d4f 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldEntityLinkTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldEntityLinkTest.php
@@ -23,14 +23,14 @@ class FieldEntityLinkTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_entity_test_link');
+  public static $testViews = ['test_entity_test_link'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('user', 'entity_test');
+  public static $modules = ['user', 'entity_test'];
 
   /**
    * An admin user account.
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php
index 1a9df822b..1d304f53a 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php
@@ -8,7 +8,7 @@ use Drupal\entity_test\Entity\EntityTestRev;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\user\Entity\User;
-use Drupal\views\Plugin\views\field\Field;
+use Drupal\views\Plugin\views\field\EntityField;
 use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Views;
@@ -16,7 +16,7 @@ use Drupal\views\Views;
 /**
  * Provides some integration tests for the Field handler.
  *
- * @see \Drupal\views\Plugin\views\field\Field
+ * @see \Drupal\views\Plugin\views\field\EntityField
  * @group views
  */
 class FieldFieldTest extends ViewsKernelTestBase {
@@ -70,7 +70,7 @@ class FieldFieldTest extends ViewsKernelTestBase {
     $this->installEntitySchema('entity_test');
     $this->installEntitySchema('entity_test_rev');
 
-    ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+    ViewTestData::createTestViews(get_class($this), ['views_test_config']);
 
     // Bypass any field access.
     $this->adminUser = User::create(['name' => $this->randomString()]);
@@ -229,8 +229,8 @@ class FieldFieldTest extends ViewsKernelTestBase {
     $executable = Views::getView('test_field_field_test');
     $executable->execute();
 
-    $this->assertTrue($executable->field['id'] instanceof Field);
-    $this->assertTrue($executable->field['field_test'] instanceof Field);
+    $this->assertTrue($executable->field['id'] instanceof EntityField);
+    $this->assertTrue($executable->field['field_test'] instanceof EntityField);
 
     $this->assertIdenticalResultset($executable,
       [
@@ -299,9 +299,9 @@ class FieldFieldTest extends ViewsKernelTestBase {
     $executable = Views::getView('test_field_alias_test');
     $executable->execute();
 
-    $this->assertTrue($executable->field['id'] instanceof Field);
-    $this->assertTrue($executable->field['name'] instanceof Field);
-    $this->assertTrue($executable->field['name_alias'] instanceof Field);
+    $this->assertTrue($executable->field['id'] instanceof EntityField);
+    $this->assertTrue($executable->field['name'] instanceof EntityField);
+    $this->assertTrue($executable->field['name_alias'] instanceof EntityField);
 
     $this->assertIdenticalResultset($executable,
       [
@@ -348,10 +348,10 @@ class FieldFieldTest extends ViewsKernelTestBase {
       $timezones[] = $user->getTimeZone();
     }
 
-    $this->assertTrue($executable->field['field_test_multiple'] instanceof Field);
-    $this->assertTrue($executable->field['field_test_multiple_1'] instanceof Field);
-    $this->assertTrue($executable->field['field_test_multiple_2'] instanceof Field);
-    $this->assertTrue($executable->field['timezone'] instanceof Field);
+    $this->assertTrue($executable->field['field_test_multiple'] instanceof EntityField);
+    $this->assertTrue($executable->field['field_test_multiple_1'] instanceof EntityField);
+    $this->assertTrue($executable->field['field_test_multiple_2'] instanceof EntityField);
+    $this->assertTrue($executable->field['timezone'] instanceof EntityField);
 
     $this->assertIdenticalResultset($executable,
       [
@@ -421,8 +421,8 @@ class FieldFieldTest extends ViewsKernelTestBase {
     $executable = Views::getView('test_field_field_revision_test');
     $executable->execute();
 
-    $this->assertTrue($executable->field['name'] instanceof Field);
-    $this->assertTrue($executable->field['field_test'] instanceof Field);
+    $this->assertTrue($executable->field['name'] instanceof EntityField);
+    $this->assertTrue($executable->field['field_test'] instanceof EntityField);
 
     $this->assertIdenticalResultset($executable,
       [
@@ -475,12 +475,12 @@ class FieldFieldTest extends ViewsKernelTestBase {
       $timezones[] = $user->getTimeZone();
     }
 
-    $this->assertTrue($executable->field['id'] instanceof Field);
-    $this->assertTrue($executable->field['revision_id'] instanceof Field);
-    $this->assertTrue($executable->field['timezone'] instanceof Field);
-    $this->assertTrue($executable->field['field_test_multiple'] instanceof Field);
-    $this->assertTrue($executable->field['field_test_multiple_1'] instanceof Field);
-    $this->assertTrue($executable->field['field_test_multiple_2'] instanceof Field);
+    $this->assertTrue($executable->field['id'] instanceof EntityField);
+    $this->assertTrue($executable->field['revision_id'] instanceof EntityField);
+    $this->assertTrue($executable->field['timezone'] instanceof EntityField);
+    $this->assertTrue($executable->field['field_test_multiple'] instanceof EntityField);
+    $this->assertTrue($executable->field['field_test_multiple_1'] instanceof EntityField);
+    $this->assertTrue($executable->field['field_test_multiple_2'] instanceof EntityField);
 
     $this->assertIdenticalResultset($executable,
       [
@@ -551,7 +551,7 @@ class FieldFieldTest extends ViewsKernelTestBase {
   }
 
   /**
-   * Tests \Drupal\views\Plugin\views\field\Field::getValue
+   * Tests \Drupal\views\Plugin\views\field\EntityField::getValue
    */
   public function testGetValueMethod() {
     $bundle = 'test_bundle';
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldFileSizeTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldFileSizeTest.php
index 2f60e34bf..892e82fce 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldFileSizeTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldFileSizeTest.php
@@ -18,9 +18,9 @@ class FieldFileSizeTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
-  function dataSet() {
+  public function dataSet() {
     $data = parent::dataSet();
     $data[0]['age'] = 0;
     $data[1]['age'] = 10;
@@ -30,7 +30,7 @@ class FieldFileSizeTest extends ViewsKernelTestBase {
     return $data;
   }
 
-  function viewsData() {
+  public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['age']['field']['id'] = 'file_size';
 
@@ -41,13 +41,13 @@ class FieldFileSizeTest extends ViewsKernelTestBase {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
index be8a4f133..677a3f5e4 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
@@ -15,23 +15,23 @@ use Drupal\views\Views;
  */
 class FieldKernelTest extends ViewsKernelTestBase {
 
-  public static $modules = array('user');
+  public static $modules = ['user'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view', 'test_field_tokens', 'test_field_argument_tokens', 'test_field_output');
+  public static $testViews = ['test_view', 'test_field_tokens', 'test_field_argument_tokens', 'test_field_output'];
 
   /**
    * Map column names.
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'views_test_data_name' => 'name',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -73,7 +73,7 @@ class FieldKernelTest extends ViewsKernelTestBase {
     $id_field = $view->field['id'];
     $id_field->additional_fields['job'] = 'job';
     // Choose also a field alias key which doesn't match to the table field.
-    $id_field->additional_fields['created_test'] = array('table' => 'views_test_data', 'field' => 'created');
+    $id_field->additional_fields['created_test'] = ['table' => 'views_test_data', 'field' => 'created'];
     $view->build();
 
     // Make sure the field aliases have the expected value.
@@ -412,7 +412,7 @@ class FieldKernelTest extends ViewsKernelTestBase {
   /**
    * Tests everything related to empty output of a field.
    */
-  function testEmpty() {
+  public function testEmpty() {
     $this->_testHideIfEmpty();
     $this->_testEmptyText();
   }
@@ -423,7 +423,7 @@ class FieldKernelTest extends ViewsKernelTestBase {
    * This tests alters the result to get easier and less coupled results. It is
    * important that assertIdentical() is used in this test since in PHP 0 == ''.
    */
-  function _testHideIfEmpty() {
+  public function _testHideIfEmpty() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
 
@@ -704,7 +704,7 @@ class FieldKernelTest extends ViewsKernelTestBase {
   /**
    * Tests the usage of the empty text.
    */
-  function _testEmptyText() {
+  public function _testEmptyText() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
 
@@ -754,7 +754,7 @@ class FieldKernelTest extends ViewsKernelTestBase {
   /**
    * Tests views_handler_field::isValueEmpty().
    */
-  function testIsValueEmpty() {
+  public function testIsValueEmpty() {
     $view = Views::getView('test_view');
     $view->initHandlers();
     $field = $view->field['name'];
@@ -778,10 +778,10 @@ class FieldKernelTest extends ViewsKernelTestBase {
    */
   public function testClickSortable() {
     // Test that clickSortable is TRUE by default.
-    $item = array(
+    $item = [
       'table' => 'views_test_data',
       'field' => 'name',
-    );
+    ];
     $plugin = $this->container->get('plugin.manager.views.field')->getHandler($item);
     $this->assertTrue($plugin->clickSortable(), 'TRUE as a default value is correct.');
 
@@ -801,7 +801,7 @@ class FieldKernelTest extends ViewsKernelTestBase {
    */
   public function testTrimText() {
     // Test unicode. See https://www.drupal.org/node/513396#comment-2839416.
-    $text = array(
+    $text = [
       'Tuy nhiên, những hi vọng',
       'Giả sử chúng tôi có 3 Apple',
       'siêu nhỏ này là bộ xử lý',
@@ -810,12 +810,12 @@ class FieldKernelTest extends ViewsKernelTestBase {
       'của hãng bao gồm ba dòng',
       'сд асд асд ас',
       'асд асд асд ас'
-    );
+    ];
     // Just test maxlength without word boundary.
-    $alter = array(
+    $alter = [
       'max_length' => 10,
-    );
-    $expect = array(
+    ];
+    $expect = [
       'Tuy nhiên,',
       'Giả sử chú',
       'siêu nhỏ n',
@@ -824,7 +824,7 @@ class FieldKernelTest extends ViewsKernelTestBase {
       'của hãng b',
       'сд асд асд',
       'асд асд ас',
-    );
+    ];
 
     foreach ($text as $key => $line) {
       $result_text = FieldPluginBase::trimText($alter, $line);
@@ -833,7 +833,7 @@ class FieldKernelTest extends ViewsKernelTestBase {
 
     // Test also word_boundary
     $alter['word_boundary'] = TRUE;
-    $expect = array(
+    $expect = [
       'Tuy nhiên',
       'Giả sử',
       'siêu nhỏ',
@@ -842,7 +842,7 @@ class FieldKernelTest extends ViewsKernelTestBase {
       'của hãng',
       'сд асд',
       'асд асд',
-    );
+    ];
 
     foreach ($text as $key => $line) {
       $result_text = FieldPluginBase::trimText($alter, $line);
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
index bfb764d4f..0814402ca 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
@@ -13,16 +13,16 @@ use Drupal\views\Views;
  */
 class FieldUrlTest extends ViewsKernelTestBase {
 
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
-  function viewsData() {
+  public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['name']['field']['id'] = 'url';
     return $data;
@@ -32,15 +32,15 @@ class FieldUrlTest extends ViewsKernelTestBase {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
         'display_as_link' => FALSE,
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
@@ -50,14 +50,14 @@ class FieldUrlTest extends ViewsKernelTestBase {
     $view->destroy();
     $view->setDisplay();
 
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorDefaultTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorDefaultTest.php
new file mode 100644
index 000000000..7beceb9bd
--- /dev/null
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorDefaultTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the queryOpBoolean() with default operator.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\filter\BooleanOperator
+ */
+class FilterBooleanOperatorDefaultTest extends ViewsKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'views_test_data'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_view'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function viewsData() {
+    $views_data = parent::viewsData();
+
+    $views_data['views_test_data']['status']['filter']['id'] = 'boolean_default';
+
+    return $views_data;
+  }
+
+  /**
+   * Tests the queryOpBoolean() with default operator.
+   */
+  public function testFilterBooleanOperatorDefault() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'status' => [
+        'id' => 'status',
+        'field' => 'status',
+        'table' => 'views_test_data',
+        'value' => 0,
+      ],
+    ]);
+    $this->executeView($view);
+    $this->assertCount(2, $view->result);
+  }
+
+}
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
index 5bd2157af..325da5106 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
@@ -19,23 +19,23 @@ class FilterBooleanOperatorStringTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Map column names.
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'views_test_data_id' => 'id',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -43,13 +43,13 @@ class FilterBooleanOperatorStringTest extends ViewsKernelTestBase {
   protected function schemaDefinition() {
     $schema = parent::schemaDefinition();
 
-    $schema['views_test_data']['fields']['status'] = array(
+    $schema['views_test_data']['fields']['status'] = [
       'description' => 'The status of this record',
       'type' => 'varchar',
       'length' => 255,
       'not null' => TRUE,
       'default' => '',
-    );
+    ];
 
     return $schema;
   }
@@ -91,20 +91,20 @@ class FilterBooleanOperatorStringTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add a the status boolean filter.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'status' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'status' => [
         'id' => 'status',
         'field' => 'status',
         'table' => 'views_test_data',
         'value' => 0,
-      ),
-    ));
+      ],
+    ]);
     $this->executeView($view);
 
-    $expected_result = array(
-      array('id' => 2),
-      array('id' => 4),
-    );
+    $expected_result = [
+      ['id' => 2],
+      ['id' => 4],
+    ];
 
     $this->assertEqual(2, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -113,21 +113,21 @@ class FilterBooleanOperatorStringTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add the status boolean filter.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'status' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'status' => [
         'id' => 'status',
         'field' => 'status',
         'table' => 'views_test_data',
         'value' => 1,
-      ),
-    ));
+      ],
+    ]);
     $this->executeView($view);
 
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
+    $expected_result = [
+      ['id' => 1],
+      ['id' => 3],
+      ['id' => 5],
+    ];
 
     $this->assertEqual(3, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -140,32 +140,32 @@ class FilterBooleanOperatorStringTest extends ViewsKernelTestBase {
     $filters = $this->getGroupedExposedFilters();
     $view = Views::getView('test_view');
 
-    $view->setExposedInput(array('status' => 1));
+    $view->setExposedInput(['status' => 1]);
     $view->setDisplay();
     $view->displayHandlers->get('default')->overrideOption('filters', $filters);
 
     $this->executeView($view);
 
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
+    $expected_result = [
+      ['id' => 1],
+      ['id' => 3],
+      ['id' => 5],
+    ];
 
     $this->assertEqual(3, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
     $view->destroy();
 
-    $view->setExposedInput(array('status' => 2));
+    $view->setExposedInput(['status' => 2]);
     $view->setDisplay();
     $view->displayHandlers->get('default')->overrideOption('filters', $filters);
 
     $this->executeView($view);
 
-    $expected_result = array(
-      array('id' => 2),
-      array('id' => 4),
-    );
+    $expected_result = [
+      ['id' => 2],
+      ['id' => 4],
+    ];
 
     $this->assertEqual(2, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -178,38 +178,38 @@ class FilterBooleanOperatorStringTest extends ViewsKernelTestBase {
    *   Returns the filter configuration for exposed filters.
    */
   protected function getGroupedExposedFilters() {
-    $filters = array(
-      'status' => array(
+    $filters = [
+      'status' => [
         'id' => 'status',
         'table' => 'views_test_data',
         'field' => 'status',
         'relationship' => 'none',
         'exposed' => TRUE,
-        'expose' => array(
+        'expose' => [
           'operator' => 'status_op',
           'label' => 'status',
           'identifier' => 'status',
-        ),
+        ],
         'is_grouped' => TRUE,
-        'group_info' => array(
+        'group_info' => [
           'label' => 'status',
           'identifier' => 'status',
           'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
+          'group_items' => [
+            1 => [
               'title' => 'Active',
               'operator' => '=',
               'value' => '1',
-            ),
-            2 => array(
+            ],
+            2 => [
               'title' => 'Blocked',
               'operator' => '=',
               'value' => '0',
-            ),
-          ),
-        ),
-      ),
-    );
+            ],
+          ],
+        ],
+      ],
+    ];
     return $filters;
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
index 7a88066e8..7cdd41f52 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
@@ -18,23 +18,23 @@ class FilterBooleanOperatorTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Map column names.
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'views_test_data_id' => 'id',
-  );
+  ];
 
   /**
    * Tests the BooleanOperator filter.
@@ -44,20 +44,20 @@ class FilterBooleanOperatorTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add a the status boolean filter.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'status' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'status' => [
         'id' => 'status',
         'field' => 'status',
         'table' => 'views_test_data',
         'value' => 0,
-      ),
-    ));
+      ],
+    ]);
     $this->executeView($view);
 
-    $expected_result = array(
-      array('id' => 2),
-      array('id' => 4),
-    );
+    $expected_result = [
+      ['id' => 2],
+      ['id' => 4],
+    ];
 
     $this->assertEqual(2, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -66,21 +66,21 @@ class FilterBooleanOperatorTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add the status boolean filter.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'status' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'status' => [
         'id' => 'status',
         'field' => 'status',
         'table' => 'views_test_data',
         'value' => 1,
-      ),
-    ));
+      ],
+    ]);
     $this->executeView($view);
 
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
+    $expected_result = [
+      ['id' => 1],
+      ['id' => 3],
+      ['id' => 5],
+    ];
 
     $this->assertEqual(3, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -89,22 +89,22 @@ class FilterBooleanOperatorTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Testing the same scenario but using the reverse status and operation.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'status' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'status' => [
         'id' => 'status',
         'field' => 'status',
         'table' => 'views_test_data',
         'value' => 0,
         'operator' => '!=',
-      ),
-    ));
+      ],
+    ]);
     $this->executeView($view);
 
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
+    $expected_result = [
+      ['id' => 1],
+      ['id' => 3],
+      ['id' => 5],
+    ];
 
     $this->assertEqual(3, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -117,32 +117,32 @@ class FilterBooleanOperatorTest extends ViewsKernelTestBase {
     $filters = $this->getGroupedExposedFilters();
     $view = Views::getView('test_view');
 
-    $view->setExposedInput(array('status' => 1));
+    $view->setExposedInput(['status' => 1]);
     $view->setDisplay();
     $view->displayHandlers->get('default')->overrideOption('filters', $filters);
 
     $this->executeView($view);
 
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
+    $expected_result = [
+      ['id' => 1],
+      ['id' => 3],
+      ['id' => 5],
+    ];
 
     $this->assertEqual(3, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
     $view->destroy();
 
-    $view->setExposedInput(array('status' => 2));
+    $view->setExposedInput(['status' => 2]);
     $view->setDisplay();
     $view->displayHandlers->get('default')->overrideOption('filters', $filters);
 
     $this->executeView($view);
 
-    $expected_result = array(
-      array('id' => 2),
-      array('id' => 4),
-    );
+    $expected_result = [
+      ['id' => 2],
+      ['id' => 4],
+    ];
 
     $this->assertEqual(2, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -156,11 +156,11 @@ class FilterBooleanOperatorTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
+    $expected_result = [
+      ['id' => 1],
+      ['id' => 3],
+      ['id' => 5],
+    ];
 
     $this->assertEqual(3, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -172,45 +172,45 @@ class FilterBooleanOperatorTest extends ViewsKernelTestBase {
    * @return array
    */
   protected function getGroupedExposedFilters() {
-    $filters = array(
-      'status' => array(
+    $filters = [
+      'status' => [
         'id' => 'status',
         'table' => 'views_test_data',
         'field' => 'status',
         'relationship' => 'none',
         'exposed' => TRUE,
-        'expose' => array(
+        'expose' => [
           'operator' => 'status_op',
           'label' => 'status',
           'identifier' => 'status',
-        ),
+        ],
         'is_grouped' => TRUE,
-        'group_info' => array(
+        'group_info' => [
           'label' => 'status',
           'identifier' => 'status',
           'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
+          'group_items' => [
+            1 => [
               'title' => 'Active',
               'operator' => '=',
               'value' => '1',
-            ),
-            2 => array(
+            ],
+            2 => [
               'title' => 'Blocked',
               'operator' => '=',
               'value' => '0',
-            ),
+            ],
             // This group should return the same results as group 1, because it
             // is the negation of group 2.
-            3 => array(
+            3 => [
               'title' => 'Active (reverse)',
               'operator' => '!=',
               'value' => '0',
-            ),
-          ),
-        ),
-      ),
-    );
+            ],
+          ],
+        ],
+      ],
+    ];
     return $filters;
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
index 042426383..e5d37119d 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
@@ -15,24 +15,24 @@ class FilterCombineTest extends ViewsKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('entity_test');
+  public static $modules = ['entity_test'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view', 'entity_test_fields');
+  public static $testViews = ['test_view', 'entity_test_fields'];
 
   /**
    * Map column names.
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'views_test_data_name' => 'name',
     'views_test_data_job' => 'job',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -48,50 +48,50 @@ class FilterCombineTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     $fields = $view->displayHandlers->get('default')->getOption('fields');
-    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
-      'job' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', $fields + [
+      'job' => [
         'id' => 'job',
         'table' => 'views_test_data',
         'field' => 'job',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
 
     // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'combine',
         'table' => 'views',
         'field' => 'combine',
         'relationship' => 'none',
         'operator' => 'contains',
-        'fields' => array(
+        'fields' => [
           'name',
           'job',
-        ),
+        ],
         'value' => 'ing',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
         'job' => 'Singer',
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
         'job' => 'Singer',
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
         'job' => 'Drummer',
-      ),
-      array(
+      ],
+      [
         'name' => 'Ginger',
         'job' => NULL,
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -103,46 +103,46 @@ class FilterCombineTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     $fields = $view->displayHandlers->get('default')->getOption('fields');
-    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
-        'job' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', $fields + [
+        'job' => [
           'id' => 'job',
           'table' => 'views_test_data',
           'field' => 'job',
           'relationship' => 'none',
-        ),
-      ));
+        ],
+      ]);
 
     // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'combine',
         'table' => 'views',
         'field' => 'combine',
         'relationship' => 'none',
         'operator' => 'word',
-        'fields' => array(
+        'fields' => [
           'name',
           'job',
-        ),
+        ],
         'value' => 'singer ringo',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
         'job' => 'Singer',
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
         'job' => 'Singer',
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
         'job' => 'Drummer',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -154,39 +154,39 @@ class FilterCombineTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     $fields = $view->displayHandlers->get('default')->getOption('fields');
-    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
-        'job' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', $fields + [
+        'job' => [
           'id' => 'job',
           'table' => 'views_test_data',
           'field' => 'job',
           'relationship' => 'none',
-        ),
-      ));
+        ],
+      ]);
 
     // Set the filtering to allwords and simulate searching for a phrase.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'combine',
         'table' => 'views',
         'field' => 'combine',
         'relationship' => 'none',
         'operator' => 'allwords',
-        'fields' => array(
+        'fields' => [
           'name',
           'job',
           'age',
-        ),
+        ],
         'value' => '25 "john   singer"',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
         'job' => 'Singer',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -202,40 +202,40 @@ class FilterCombineTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     $fields = $view->displayHandlers->get('default')->getOption('fields');
-    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
-      'job' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', $fields + [
+      'job' => [
         'id' => 'job',
         'table' => 'views_test_data',
         'field' => 'job',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
 
     // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'combine',
         'table' => 'views',
         'field' => 'combine',
         'relationship' => 'none',
         'operator' => 'contains',
-        'fields' => array(
+        'fields' => [
           'name',
           'job',
           // Add a dummy field to the combined fields to simulate
           // a removed or deleted field.
           'dummy',
-        ),
+        ],
         'value' => 'ing',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
     // Make sure this view will not get displayed.
     $this->assertTrue($view->build_info['fail'], "View build has been marked as failed.");
     // Make sure this view does not pass validation with the right error.
     $errors = $view->validate();
-    $this->assertEquals(t('Field %field set in %filter is not set in display %display.', array('%field' => 'dummy', '%filter' => 'Global: Combine fields filter', '%display' => 'Master')), reset($errors['default']));
+    $this->assertEquals(t('Field %field set in %filter is not set in display %display.', ['%field' => 'dummy', '%filter' => 'Global: Combine fields filter', '%display' => 'Master']), reset($errors['default']));
   }
 
   /**
@@ -247,30 +247,30 @@ class FilterCombineTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Set the rows to a plugin type that doesn't support fields.
-    $view->displayHandlers->get('default')->overrideOption('row', array(
+    $view->displayHandlers->get('default')->overrideOption('row', [
       'type' => 'entity:entity_test',
-      'options' => array(
+      'options' => [
         'view_mode' => 'teaser',
-      ),
-    ));
+      ],
+    ]);
     // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'name' => [
         'id' => 'combine',
         'table' => 'views',
         'field' => 'combine',
         'relationship' => 'none',
         'operator' => 'contains',
-        'fields' => array(
+        'fields' => [
           'name',
-        ),
+        ],
         'value' => 'ing',
-      ),
-    ));
+      ],
+    ]);
     $this->executeView($view);
     $errors = $view->validate();
     // Check that the right error is shown.
-    $this->assertEquals(t('%display: %filter can only be used on displays that use fields. Set the style or row format for that display to one using fields to use the combine field filter.', array('%filter' => 'Global: Combine fields filter', '%display' => 'Master')), reset($errors['default']));
+    $this->assertEquals(t('%display: %filter can only be used on displays that use fields. Set the style or row format for that display to one using fields to use the combine field filter.', ['%filter' => 'Global: Combine fields filter', '%display' => 'Master']), reset($errors['default']));
   }
 
   /**
@@ -278,13 +278,13 @@ class FilterCombineTest extends ViewsKernelTestBase {
    */
   protected function dataSet() {
     $data_set = parent::dataSet();
-    $data_set[] = array(
+    $data_set[] = [
       'name' => 'Ginger',
       'age' => 25,
       'job' => NULL,
       'created' => gmmktime(0, 0, 0, 1, 2, 2000),
       'status' => 1,
-    );
+    ];
     return $data_set;
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php
index a4bd6c840..d78f7c92e 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php
@@ -12,52 +12,52 @@ use Drupal\views\Views;
  */
 class FilterEqualityTest extends ViewsKernelTestBase {
 
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Map column names.
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'views_test_data_name' => 'name',
-  );
+  ];
 
-  function viewsData() {
+  public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['name']['filter']['id'] = 'equality';
     return $data;
   }
 
-  function testEqual() {
+  public function testEqual() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
         'operator' => '=',
         'value' => 'Ringo',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -74,45 +74,45 @@ class FilterEqualityTest extends ViewsKernelTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testNotEqual() {
+  public function testNotEqual() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
         'operator' => '!=',
         'value' => 'Ringo',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -129,27 +129,27 @@ class FilterEqualityTest extends ViewsKernelTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
   protected function getGroupedExposedFilters() {
-    $filters = array(
-      'name' => array(
+    $filters = [
+      'name' => [
         'id' => 'name',
         'plugin_id' => 'equality',
         'table' => 'views_test_data',
@@ -157,31 +157,31 @@ class FilterEqualityTest extends ViewsKernelTestBase {
         'relationship' => 'none',
         'group' => 1,
         'exposed' => TRUE,
-        'expose' => array(
+        'expose' => [
           'operator' => 'name_op',
           'label' => 'name',
           'identifier' => 'name',
-        ),
+        ],
         'is_grouped' => TRUE,
-        'group_info' => array(
+        'group_info' => [
           'label' => 'name',
           'identifier' => 'name',
           'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
+          'group_items' => [
+            1 => [
               'title' => 'Name is equal to Ringo',
               'operator' => '=',
               'value' => 'Ringo',
-            ),
-            2 => array(
+            ],
+            2 => [
               'title' => 'Name is not equal to Ringo',
               'operator' => '!=',
               'value' => 'Ringo',
-            ),
-          ),
-        ),
-      ),
-    );
+            ],
+          ],
+        ],
+      ],
+    ];
     return $filters;
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
index 9ab08e1c4..e02a8430c 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
@@ -12,26 +12,26 @@ use Drupal\views\Views;
  */
 class FilterInOperatorTest extends ViewsKernelTestBase {
 
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Map column names.
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'views_test_data_name' => 'name',
     'views_test_data_age' => 'age',
-  );
+  ];
 
-  function viewsData() {
+  public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['age']['filter']['id'] = 'in_operator';
     return $data;
@@ -42,28 +42,28 @@ class FilterInOperatorTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add a in_operator ordering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'age',
         'field' => 'age',
         'table' => 'views_test_data',
-        'value' => array(26, 30),
+        'value' => [26, 30],
         'operator' => 'in',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
-    $expected_result = array(
-      array(
+    $expected_result = [
+      [
         'name' => 'Paul',
         'age' => 26,
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
         'age' => 30,
-      ),
-    );
+      ],
+    ];
 
     $this->assertEqual(2, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -72,32 +72,32 @@ class FilterInOperatorTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add a in_operator ordering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'age',
         'field' => 'age',
         'table' => 'views_test_data',
-        'value' => array(26, 30),
+        'value' => [26, 30],
         'operator' => 'not in',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
-    $expected_result = array(
-      array(
+    $expected_result = [
+      [
         'name' => 'John',
         'age' => 25,
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
         'age' => 27,
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
         'age' => 28,
-      ),
-    );
+      ],
+    ];
 
     $this->assertEqual(3, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -114,16 +114,16 @@ class FilterInOperatorTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $expected_result = array(
-      array(
+    $expected_result = [
+      [
         'name' => 'Paul',
         'age' => 26,
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
         'age' => 30,
-      ),
-    );
+      ],
+    ];
 
     $this->assertEqual(2, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
@@ -140,58 +140,58 @@ class FilterInOperatorTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $expected_result = array(
-      array(
+    $expected_result = [
+      [
         'name' => 'John',
         'age' => 25,
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
         'age' => 27,
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
         'age' => 28,
-      ),
-    );
+      ],
+    ];
 
     $this->assertEqual(3, count($view->result));
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
   }
 
   protected function getGroupedExposedFilters() {
-    $filters = array(
-      'age' => array(
+    $filters = [
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
         'exposed' => TRUE,
-        'expose' => array(
+        'expose' => [
           'operator' => 'age_op',
           'label' => 'age',
           'identifier' => 'age',
-        ),
+        ],
         'is_grouped' => TRUE,
-        'group_info' => array(
+        'group_info' => [
           'label' => 'age',
           'identifier' => 'age',
           'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
+          'group_items' => [
+            1 => [
               'title' => 'Age is one of 26, 30',
               'operator' => 'in',
-              'value' => array(26, 30),
-            ),
-            2 => array(
+              'value' => [26, 30],
+            ],
+            2 => [
               'title' => 'Age is not one of 26, 30',
               'operator' => 'not in',
-              'value' => array(26, 30),
-            ),
-          ),
-        ),
-      ),
-    );
+              'value' => [26, 30],
+            ],
+          ],
+        ],
+      ],
+    ];
     return $filters;
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
index c4c978a11..b154a7852 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
@@ -12,26 +12,26 @@ use Drupal\views\Views;
  */
 class FilterNumericTest extends ViewsKernelTestBase {
 
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Map column names.
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'views_test_data_name' => 'name',
     'views_test_data_age' => 'age',
-  );
+  ];
 
-  function viewsData() {
+  public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['age']['filter']['allow empty'] = TRUE;
     $data['views_test_data']['id']['filter']['allow empty'] = FALSE;
@@ -44,24 +44,24 @@ class FilterNumericTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
         'operator' => '=',
-        'value' => array('value' => 28),
-      ),
-    ));
+        'value' => ['value' => 28],
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Ringo',
         'age' => 28,
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -78,12 +78,12 @@ class FilterNumericTest extends ViewsKernelTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Ringo',
         'age' => 28,
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -92,35 +92,35 @@ class FilterNumericTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
         'operator' => 'between',
-        'value' => array(
+        'value' => [
           'min' => 26,
           'max' => 29,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'George',
         'age' => 27,
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
         'age' => 28,
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
         'age' => 26,
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
 
     // test not between
@@ -128,31 +128,31 @@ class FilterNumericTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
         'operator' => 'not between',
-        'value' => array(
+        'value' => [
           'min' => 26,
           'max' => 29,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
         'age' => 25,
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
         'age' => 30,
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -169,20 +169,20 @@ class FilterNumericTest extends ViewsKernelTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'George',
         'age' => 27,
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
         'age' => 28,
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
         'age' => 26,
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -199,16 +199,76 @@ class FilterNumericTest extends ViewsKernelTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
         'age' => 25,
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
         'age' => 30,
-      ),
-    );
+      ],
+    ];
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  /**
+   * Tests the numeric filter handler with the 'regular_expression' operator.
+   */
+  public function testFilterNumericRegularExpression() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Filtering by regular expression pattern.
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+        'operator' => 'regular_expression',
+        'value' => [
+          'value' => '2[8]',
+        ],
+      ],
+    ]);
+
+    $this->executeView($view);
+    $resultset = [
+      [
+        'name' => 'Ringo',
+        'age' => 28,
+      ],
+    ];
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  /**
+   * Tests the numeric filter handler with the 'regular_expression' operator
+   * to grouped exposed filters.
+   */
+  public function testFilterNumericExposedGroupedRegularExpression() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+    $view->newDisplay('page', 'Page', 'page_1');
+
+    // Filter: Age, Operator: regular_expression, Value: 2[7-8]
+    $filters['age']['group_info']['default_group'] = 6;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+
+    $this->executeView($view);
+    $resultset = [
+      [
+        'name' => 'George',
+        'age' => 27,
+      ],
+      [
+        'name' => 'Ringo',
+        'age' => 28,
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -217,58 +277,58 @@ class FilterNumericTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
         'operator' => 'empty',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-    );
+    $resultset = [
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
 
     $view->destroy();
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
         'operator' => 'not empty',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-    array(
+    $resultset = [
+    [
         'name' => 'John',
         'age' => 25,
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
         'age' => 27,
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
         'age' => 28,
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
         'age' => 26,
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
         'age' => 30,
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -285,8 +345,8 @@ class FilterNumericTest extends ViewsKernelTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $this->executeView($view);
-    $resultset = array(
-    );
+    $resultset = [
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -303,28 +363,28 @@ class FilterNumericTest extends ViewsKernelTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $this->executeView($view);
-    $resultset = array(
-    array(
+    $resultset = [
+    [
         'name' => 'John',
         'age' => 25,
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
         'age' => 27,
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
         'age' => 28,
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
         'age' => 26,
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
         'age' => 30,
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
@@ -332,20 +392,20 @@ class FilterNumericTest extends ViewsKernelTestBase {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'id' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'id' => [
         'id' => 'id',
         'table' => 'views_test_data',
         'field' => 'id',
         'relationship' => 'none',
-      ),
-      'age' => array(
+      ],
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
 
     $view->initHandlers();
 
@@ -359,58 +419,65 @@ class FilterNumericTest extends ViewsKernelTestBase {
   }
 
   protected function getGroupedExposedFilters() {
-    $filters = array(
-      'age' => array(
+    $filters = [
+      'age' => [
         'id' => 'age',
         'plugin_id' => 'numeric',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
         'exposed' => TRUE,
-        'expose' => array(
+        'expose' => [
           'operator' => 'age_op',
           'label' => 'age',
           'identifier' => 'age',
-        ),
+        ],
         'is_grouped' => TRUE,
-        'group_info' => array(
+        'group_info' => [
           'label' => 'age',
           'identifier' => 'age',
           'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
+          'group_items' => [
+            1 => [
               'title' => 'Age is 28',
               'operator' => '=',
-              'value' => array('value' => 28),
-            ),
-            2 => array(
+              'value' => ['value' => 28],
+            ],
+            2 => [
               'title' => 'Age is between 26 and 29',
               'operator' => 'between',
-              'value' => array(
+              'value' => [
                 'min' => 26,
                 'max' => 29,
-              ),
-            ),
-            3 => array(
+              ],
+            ],
+            3 => [
               'title' => 'Age is not between 26 and 29',
               'operator' => 'not between',
-              'value' => array(
+              'value' => [
                 'min' => 26,
                 'max' => 29,
-              ),
-            ),
-            4 => array(
+              ],
+            ],
+            4 => [
               'title' => 'Age is empty',
               'operator' => 'empty',
-            ),
-            5 => array(
+            ],
+            5 => [
               'title' => 'Age is not empty',
               'operator' => 'not empty',
-            ),
-          ),
-        ),
-      ),
-    );
+            ],
+            6 => [
+              'title' => 'Age is regexp 2[7-8]',
+              'operator' => 'regular_expression',
+              'value' => [
+                'value' => '2[7-8]',
+              ],
+            ],
+          ],
+        ],
+      ],
+    ];
     return $filters;
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
index 5dd47ecb3..c24cc6ff0 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
@@ -12,25 +12,25 @@ use Drupal\views\Views;
  */
 class FilterStringTest extends ViewsKernelTestBase {
 
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Map column names.
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'views_test_data_name' => 'name',
-  );
+  ];
 
-  function viewsData() {
+  public function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['name']['filter']['allow empty'] = TRUE;
     $data['views_test_data']['job']['filter']['allow empty'] = FALSE;
@@ -41,12 +41,12 @@ class FilterStringTest extends ViewsKernelTestBase {
 
   protected function schemaDefinition() {
     $schema = parent::schemaDefinition();
-    $schema['views_test_data']['fields']['description'] = array(
+    $schema['views_test_data']['fields']['description'] = [
       'description' => "A person's description",
       'type' => 'text',
       'not null' => FALSE,
       'size' => 'big',
-    );
+    ];
 
     return $schema;
   }
@@ -81,32 +81,32 @@ class FilterStringTest extends ViewsKernelTestBase {
     return $view;
   }
 
-  function testFilterStringEqual() {
+  public function testFilterStringEqual() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
         'operator' => '=',
         'value' => 'Ringo',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringGroupedExposedEqual() {
+  public function testFilterStringGroupedExposedEqual() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -119,50 +119,50 @@ class FilterStringTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
 
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringNotEqual() {
+  public function testFilterStringNotEqual() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
         'operator' => '!=',
         'value' => 'Ringo',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringGroupedExposedNotEqual() {
+  public function testFilterStringGroupedExposedNotEqual() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -176,51 +176,51 @@ class FilterStringTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'George',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
-      array(
+      ],
+      [
         'name' => 'Meredith',
-      ),
-    );
+      ],
+    ];
 
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringContains() {
+  public function testFilterStringContains() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
         'operator' => 'contains',
         'value' => 'ing',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
-  function testFilterStringGroupedExposedContains() {
+  public function testFilterStringGroupedExposedContains() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -233,41 +233,41 @@ class FilterStringTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
 
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
-  function testFilterStringWord() {
+  public function testFilterStringWord() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'description' => [
         'id' => 'description',
         'table' => 'views_test_data',
         'field' => 'description',
         'relationship' => 'none',
         'operator' => 'word',
         'value' => 'actor',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'George',
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
     $view->destroy();
 
@@ -275,28 +275,64 @@ class FilterStringTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'description' => [
         'id' => 'description',
         'table' => 'views_test_data',
         'field' => 'description',
         'relationship' => 'none',
         'operator' => 'allwords',
         'value' => 'Richard Starkey',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+    $view->destroy();
+
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering to a sting containing only illegal characters.
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'description' => [
+        'id' => 'description',
+        'table' => 'views_test_data',
+        'field' => 'description',
+        'relationship' => 'none',
+        'operator' => 'allwords',
+        'value' => ':-)',
+      ],
+    ]);
+
+    $this->executeView($view);
+    $resultset = [
+      [
+        'name' => 'Ringo',
+      ],
+      [
+        'name' => 'John',
+      ],
+      [
+        'name' => 'George',
+      ],
+      [
+        'name' => 'Paul',
+      ],
+      [
+        'name' => 'Meredith',
+      ],
+    ];
+    $this->assertIdenticalResultset($view, $resultset);
   }
 
 
-  function testFilterStringGroupedExposedWord() {
+  public function testFilterStringGroupedExposedWord() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -309,11 +345,11 @@ class FilterStringTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
 
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
     $view->destroy();
@@ -327,43 +363,43 @@ class FilterStringTest extends ViewsKernelTestBase {
     $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'George',
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringStarts() {
+  public function testFilterStringStarts() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'description' => [
         'id' => 'description',
         'table' => 'views_test_data',
         'field' => 'description',
         'relationship' => 'none',
         'operator' => 'starts',
         'value' => 'George',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'George',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringGroupedExposedStarts() {
+  public function testFilterStringGroupedExposedStarts() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -376,47 +412,47 @@ class FilterStringTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'George',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringNotStarts() {
+  public function testFilterStringNotStarts() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'description' => [
         'id' => 'description',
         'table' => 'views_test_data',
         'field' => 'description',
         'relationship' => 'none',
         'operator' => 'not_starts',
         'value' => 'George',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
+      ],
       // There is no Meredith returned because his description is empty
-    );
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringGroupedExposedNotStarts() {
+  public function testFilterStringGroupedExposedNotStarts() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -429,50 +465,50 @@ class FilterStringTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
+      ],
       // There is no Meredith returned because his description is empty
-    );
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringEnds() {
+  public function testFilterStringEnds() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'description' => [
         'id' => 'description',
         'table' => 'views_test_data',
         'field' => 'description',
         'relationship' => 'none',
         'operator' => 'ends',
         'value' => 'Beatles.',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'George',
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringGroupedExposedEnds() {
+  public function testFilterStringGroupedExposedEnds() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -485,47 +521,47 @@ class FilterStringTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'George',
-      ),
-      array(
+      ],
+      [
         'name' => 'Ringo',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringNotEnds() {
+  public function testFilterStringNotEnds() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'description' => [
         'id' => 'description',
         'table' => 'views_test_data',
         'field' => 'description',
         'relationship' => 'none',
         'operator' => 'not_ends',
         'value' => 'Beatles.',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
+      ],
       // There is no Meredith returned because his description is empty
-    );
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringGroupedExposedNotEnds() {
+  public function testFilterStringGroupedExposedNotEnds() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -538,49 +574,49 @@ class FilterStringTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
+      ],
       // There is no Meredith returned because his description is empty
-    );
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringNot() {
+  public function testFilterStringNot() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'description' => [
         'id' => 'description',
         'table' => 'views_test_data',
         'field' => 'description',
         'relationship' => 'none',
         'operator' => 'not',
         'value' => 'Beatles.',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
+      ],
       // There is no Meredith returned because his description is empty
-    );
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
-  function testFilterStringGroupedExposedNot() {
+  public function testFilterStringGroupedExposedNot() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -593,48 +629,48 @@ class FilterStringTest extends ViewsKernelTestBase {
 
     $this->executeView($view);
 
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
+      ],
       // There is no Meredith returned because his description is empty
-    );
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
 
   }
 
-  function testFilterStringShorter() {
+  public function testFilterStringShorter() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
         'operator' => 'shorterthan',
         'value' => 5,
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringGroupedExposedShorter() {
+  public function testFilterStringGroupedExposedShorter() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -646,43 +682,43 @@ class FilterStringTest extends ViewsKernelTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'John',
-      ),
-      array(
+      ],
+      [
         'name' => 'Paul',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringLonger() {
+  public function testFilterStringLonger() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'name' => [
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
         'operator' => 'longerthan',
         'value' => 7,
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Meredith',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringGroupedExposedLonger() {
+  public function testFilterStringGroupedExposedLonger() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -694,40 +730,40 @@ class FilterStringTest extends ViewsKernelTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Meredith',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
 
-  function testFilterStringEmpty() {
+  public function testFilterStringEmpty() {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
     // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'description' => [
         'id' => 'description',
         'table' => 'views_test_data',
         'field' => 'description',
         'relationship' => 'none',
         'operator' => 'empty',
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Meredith',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
-  function testFilterStringGroupedExposedEmpty() {
+  public function testFilterStringGroupedExposedEmpty() {
     $filters = $this->getGroupedExposedFilters();
     $view = $this->getBasicPageView();
 
@@ -739,119 +775,119 @@ class FilterStringTest extends ViewsKernelTestBase {
     $this->container->get('router.builder')->rebuild();
 
     $this->executeView($view);
-    $resultset = array(
-      array(
+    $resultset = [
+      [
         'name' => 'Meredith',
-      ),
-    );
+      ],
+    ];
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
   protected function getGroupedExposedFilters() {
-    $filters = array(
-      'name' => array(
+    $filters = [
+      'name' => [
         'id' => 'name',
         'plugin_id' => 'string',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
         'exposed' => TRUE,
-        'expose' => array(
+        'expose' => [
           'operator' => 'name_op',
           'label' => 'name',
           'identifier' => 'name',
-        ),
+        ],
         'is_grouped' => TRUE,
-        'group_info' => array(
+        'group_info' => [
           'label' => 'name',
           'identifier' => 'name',
           'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
+          'group_items' => [
+            1 => [
               'title' => 'Is Ringo',
               'operator' => '=',
               'value' => 'Ringo',
-            ),
-            2 => array(
+            ],
+            2 => [
               'title' => 'Is not Ringo',
               'operator' => '!=',
               'value' => 'Ringo',
-            ),
-            3 => array(
+            ],
+            3 => [
               'title' => 'Contains ing',
               'operator' => 'contains',
               'value' => 'ing',
-            ),
-            4 => array(
+            ],
+            4 => [
               'title' => 'Shorter than 5 letters',
               'operator' => 'shorterthan',
               'value' => 5,
-            ),
-            5 => array(
+            ],
+            5 => [
               'title' => 'Longer than 7 letters',
               'operator' => 'longerthan',
               'value' => 7,
-            ),
-          ),
-        ),
-      ),
-      'description' => array(
+            ],
+          ],
+        ],
+      ],
+      'description' => [
         'id' => 'description',
         'plugin_id' => 'string',
         'table' => 'views_test_data',
         'field' => 'description',
         'relationship' => 'none',
         'exposed' => TRUE,
-        'expose' => array(
+        'expose' => [
           'operator' => 'description_op',
           'label' => 'description',
           'identifier' => 'description',
-        ),
+        ],
         'is_grouped' => TRUE,
-        'group_info' => array(
+        'group_info' => [
           'label' => 'description',
           'identifier' => 'description',
           'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
+          'group_items' => [
+            1 => [
               'title' => 'Contains the word: Actor',
               'operator' => 'word',
               'value' => 'actor',
-            ),
-            2 => array(
+            ],
+            2 => [
               'title' => 'Starts with George',
               'operator' => 'starts',
               'value' => 'George',
-            ),
-            3 => array(
+            ],
+            3 => [
               'title' => 'Not Starts with: George',
               'operator' => 'not_starts',
               'value' => 'George',
-            ),
-            4 => array(
+            ],
+            4 => [
               'title' => 'Ends with: Beatles',
               'operator' => 'ends',
               'value' => 'Beatles.',
-            ),
-            5 => array(
+            ],
+            5 => [
               'title' => 'Not Ends with: Beatles',
               'operator' => 'not_ends',
               'value' => 'Beatles.',
-            ),
-            6 => array(
+            ],
+            6 => [
               'title' => 'Does not contain: Beatles',
               'operator' => 'not',
               'value' => 'Beatles.',
-            ),
-            7 => array(
+            ],
+            7 => [
               'title' => 'Empty description',
               'operator' => 'empty',
               'value' => '',
-            ),
-          ),
-        ),
-      ),
-    );
+            ],
+          ],
+        ],
+      ],
+    ];
     return $filters;
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php b/web/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php
index 48f4e3d49..53d25b38e 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php
@@ -12,14 +12,14 @@ use Drupal\views\Views;
  */
 class HandlerAliasTest extends ViewsKernelTestBase {
 
-  public static $modules = array('user');
+  public static $modules = ['user'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_filter', 'test_alias');
+  public static $testViews = ['test_filter', 'test_alias'];
 
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
@@ -45,16 +45,16 @@ class HandlerAliasTest extends ViewsKernelTestBase {
     $view->initDisplay();
 
     // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'test_filter' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'test_filter' => [
         'id' => 'test_filter',
         'table' => 'views_test_data_alias',
         'field' => 'name_alias',
         'operator' => '=',
         'value' => 'John',
         'group' => 0,
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php b/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
index 4a1375411..2d1a2fcc2 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
@@ -18,123 +18,123 @@ class SortDateTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   protected function expectedResultSet($granularity, $reverse = TRUE) {
-    $expected = array();
+    $expected = [];
     if (!$reverse) {
       switch ($granularity) {
         case 'second':
-          $expected = array(
-            array('name' => 'John'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-            array('name' => 'Ringo'),
-            array('name' => 'George'),
-          );
+          $expected = [
+            ['name' => 'John'],
+            ['name' => 'Paul'],
+            ['name' => 'Meredith'],
+            ['name' => 'Ringo'],
+            ['name' => 'George'],
+          ];
           break;
         case 'minute':
-          $expected = array(
-            array('name' => 'John'),
-            array('name' => 'Paul'),
-            array('name' => 'Ringo'),
-            array('name' => 'Meredith'),
-            array('name' => 'George'),
-          );
+          $expected = [
+            ['name' => 'John'],
+            ['name' => 'Paul'],
+            ['name' => 'Ringo'],
+            ['name' => 'Meredith'],
+            ['name' => 'George'],
+          ];
           break;
         case 'hour':
-          $expected = array(
-            array('name' => 'John'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-            array('name' => 'George'),
-          );
+          $expected = [
+            ['name' => 'John'],
+            ['name' => 'Ringo'],
+            ['name' => 'Paul'],
+            ['name' => 'Meredith'],
+            ['name' => 'George'],
+          ];
           break;
         case 'day':
-          $expected = array(
-            array('name' => 'John'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-            array('name' => 'George'),
-          );
+          $expected = [
+            ['name' => 'John'],
+            ['name' => 'Ringo'],
+            ['name' => 'Paul'],
+            ['name' => 'Meredith'],
+            ['name' => 'George'],
+          ];
           break;
         case 'month':
-          $expected = array(
-            array('name' => 'John'),
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-          );
+          $expected = [
+            ['name' => 'John'],
+            ['name' => 'George'],
+            ['name' => 'Ringo'],
+            ['name' => 'Paul'],
+            ['name' => 'Meredith'],
+          ];
           break;
         case 'year':
-          $expected = array(
-            array('name' => 'John'),
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-          );
+          $expected = [
+            ['name' => 'John'],
+            ['name' => 'George'],
+            ['name' => 'Ringo'],
+            ['name' => 'Paul'],
+            ['name' => 'Meredith'],
+          ];
           break;
       }
     }
     else {
       switch ($granularity) {
         case 'second':
-          $expected = array(
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Meredith'),
-            array('name' => 'Paul'),
-            array('name' => 'John'),
-          );
+          $expected = [
+            ['name' => 'George'],
+            ['name' => 'Ringo'],
+            ['name' => 'Meredith'],
+            ['name' => 'Paul'],
+            ['name' => 'John'],
+          ];
           break;
         case 'minute':
-          $expected = array(
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Meredith'),
-            array('name' => 'Paul'),
-            array('name' => 'John'),
-           );
+          $expected = [
+            ['name' => 'George'],
+            ['name' => 'Ringo'],
+            ['name' => 'Meredith'],
+            ['name' => 'Paul'],
+            ['name' => 'John'],
+           ];
           break;
         case 'hour':
-          $expected = array(
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-            array('name' => 'John'),
-          );
+          $expected = [
+            ['name' => 'George'],
+            ['name' => 'Ringo'],
+            ['name' => 'Paul'],
+            ['name' => 'Meredith'],
+            ['name' => 'John'],
+          ];
           break;
         case 'day':
-          $expected = array(
-            array('name' => 'George'),
-            array('name' => 'John'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-          );
+          $expected = [
+            ['name' => 'George'],
+            ['name' => 'John'],
+            ['name' => 'Ringo'],
+            ['name' => 'Paul'],
+            ['name' => 'Meredith'],
+          ];
           break;
         case 'month':
-          $expected = array(
-            array('name' => 'John'),
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-          );
+          $expected = [
+            ['name' => 'John'],
+            ['name' => 'George'],
+            ['name' => 'Ringo'],
+            ['name' => 'Paul'],
+            ['name' => 'Meredith'],
+          ];
           break;
         case 'year':
-          $expected = array(
-            array('name' => 'John'),
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-          );
+          $expected = [
+            ['name' => 'John'],
+            ['name' => 'George'],
+            ['name' => 'Ringo'],
+            ['name' => 'Paul'],
+            ['name' => 'Meredith'],
+          ];
           break;
       }
     }
@@ -146,54 +146,54 @@ class SortDateTest extends ViewsKernelTestBase {
    * Tests numeric ordering of the result set.
    */
   public function testDateOrdering() {
-    foreach (array('second', 'minute', 'hour', 'day', 'month', 'year') as $granularity) {
-      foreach (array(FALSE, TRUE) as $reverse) {
+    foreach (['second', 'minute', 'hour', 'day', 'month', 'year'] as $granularity) {
+      foreach ([FALSE, TRUE] as $reverse) {
         $view = Views::getView('test_view');
         $view->setDisplay();
 
         // Change the fields.
-        $view->displayHandlers->get('default')->overrideOption('fields', array(
-          'name' => array(
+        $view->displayHandlers->get('default')->overrideOption('fields', [
+          'name' => [
             'id' => 'name',
             'table' => 'views_test_data',
             'field' => 'name',
             'relationship' => 'none',
-          ),
-          'created' => array(
+          ],
+          'created' => [
             'id' => 'created',
             'table' => 'views_test_data',
             'field' => 'created',
             'relationship' => 'none',
-          ),
-        ));
+          ],
+        ]);
 
         // Change the ordering
-        $view->displayHandlers->get('default')->overrideOption('sorts', array(
-          'created' => array(
+        $view->displayHandlers->get('default')->overrideOption('sorts', [
+          'created' => [
             'id' => 'created',
             'table' => 'views_test_data',
             'field' => 'created',
             'relationship' => 'none',
             'granularity' => $granularity,
             'order' => $reverse ? 'DESC' : 'ASC',
-          ),
-          'id' => array(
+          ],
+          'id' => [
             'id' => 'id',
             'table' => 'views_test_data',
             'field' => 'id',
             'relationship' => 'none',
             'order' => 'ASC',
-          ),
-        ));
+          ],
+        ]);
 
         // Execute the view.
         $this->executeView($view);
 
         // Verify the result.
         $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-        $this->assertIdenticalResultset($view, $this->expectedResultSet($granularity, $reverse), array(
+        $this->assertIdenticalResultset($view, $this->expectedResultSet($granularity, $reverse), [
           'views_test_data_name' => 'name',
-        ), SafeMarkup::format('Result is returned correctly when ordering by granularity @granularity, @reverse.', array('@granularity' => $granularity, '@reverse' => $reverse ? 'reverse' : 'forward')));
+        ], SafeMarkup::format('Result is returned correctly when ordering by granularity @granularity, @reverse.', ['@granularity' => $granularity, '@reverse' => $reverse ? 'reverse' : 'forward']));
         $view->destroy();
         unset($view);
       }
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/SortRandomTest.php b/web/core/modules/views/tests/src/Kernel/Handler/SortRandomTest.php
index 97b270733..941ed8d9e 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/SortRandomTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/SortRandomTest.php
@@ -19,7 +19,7 @@ class SortRandomTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Add more items to the test set, to make the order tests more robust.
@@ -34,13 +34,13 @@ class SortRandomTest extends ViewsKernelTestBase {
   protected function dataSet() {
     $data = parent::dataSet();
     for ($i = 0; $i < 55; $i++) {
-      $data[] = array(
+      $data[] = [
         'name' => 'name_' . $i,
         'age' => $i,
         'job' => 'job_' . $i,
         'created' => rand(0, time()),
         'status' => 1,
-      );
+      ];
     }
     return $data;
   }
@@ -53,13 +53,13 @@ class SortRandomTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add a random ordering.
-    $view->displayHandlers->get('default')->overrideOption('sorts', array(
-      'random' => array(
+    $view->displayHandlers->get('default')->overrideOption('sorts', [
+      'random' => [
         'id' => 'random',
         'field' => 'random',
         'table' => 'views',
-      ),
-    ));
+      ],
+    ]);
 
     return $view;
   }
@@ -76,28 +76,28 @@ class SortRandomTest extends ViewsKernelTestBase {
 
     // Verify the result.
     $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->dataSet(), array(
+    $this->assertIdenticalResultset($view, $this->dataSet(), [
       'views_test_data_name' => 'name',
       'views_test_data_age' => 'age',
-    ));
+    ]);
 
     // Execute a random view, we expect the result set to be different.
     $view_random = $this->getBasicRandomView();
     $this->executeView($view_random);
     $this->assertEqual(count($this->dataSet()), count($view_random->result), 'The number of returned rows match.');
-    $this->assertNotIdenticalResultset($view_random, $view->result, array(
+    $this->assertNotIdenticalResultset($view_random, $view->result, [
       'views_test_data_name' => 'views_test_data_name',
       'views_test_data_age' => 'views_test_data_name',
-    ));
+    ]);
 
     // Execute a second random view, we expect the result set to be different again.
     $view_random_2 = $this->getBasicRandomView();
     $this->executeView($view_random_2);
     $this->assertEqual(count($this->dataSet()), count($view_random_2->result), 'The number of returned rows match.');
-    $this->assertNotIdenticalResultset($view_random, $view->result, array(
+    $this->assertNotIdenticalResultset($view_random, $view->result, [
       'views_test_data_name' => 'views_test_data_name',
       'views_test_data_age' => 'views_test_data_name',
-    ));
+    ]);
   }
 
   /**
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/SortTest.php b/web/core/modules/views/tests/src/Kernel/Handler/SortTest.php
index 38cbcd1a3..91560495f 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/SortTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/SortTest.php
@@ -17,7 +17,7 @@ class SortTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests numeric ordering of the result set.
@@ -27,49 +27,49 @@ class SortTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Change the ordering
-    $view->displayHandlers->get('default')->overrideOption('sorts', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('sorts', [
+      'age' => [
         'order' => 'ASC',
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
 
     // Execute the view.
     $this->executeView($view);
 
     // Verify the result.
     $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'age'), array(
+    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'age'), [
       'views_test_data_name' => 'name',
       'views_test_data_age' => 'age',
-    ));
+    ]);
 
     $view->destroy();
     $view->setDisplay();
 
     // Reverse the ordering
-    $view->displayHandlers->get('default')->overrideOption('sorts', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('sorts', [
+      'age' => [
         'order' => 'DESC',
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
 
     // Execute the view.
     $this->executeView($view);
 
     // Verify the result.
     $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'age', TRUE), array(
+    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'age', TRUE), [
       'views_test_data_name' => 'name',
       'views_test_data_age' => 'age',
-    ));
+    ]);
   }
 
   /**
@@ -80,49 +80,49 @@ class SortTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Change the ordering
-    $view->displayHandlers->get('default')->overrideOption('sorts', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('sorts', [
+      'name' => [
         'order' => 'ASC',
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
 
     // Execute the view.
     $this->executeView($view);
 
     // Verify the result.
     $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'name'), array(
+    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'name'), [
       'views_test_data_name' => 'name',
       'views_test_data_age' => 'age',
-    ));
+    ]);
 
     $view->destroy();
     $view->setDisplay();
 
     // Reverse the ordering
-    $view->displayHandlers->get('default')->overrideOption('sorts', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('sorts', [
+      'name' => [
         'order' => 'DESC',
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'relationship' => 'none',
-      ),
-    ));
+      ],
+    ]);
 
     // Execute the view.
     $this->executeView($view);
 
     // Verify the result.
     $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'name', TRUE), array(
+    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'name', TRUE), [
       'views_test_data_name' => 'name',
       'views_test_data_age' => 'age',
-    ));
+    ]);
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Kernel/ModuleTest.php b/web/core/modules/views/tests/src/Kernel/ModuleTest.php
index 204433dc9..68612b78f 100644
--- a/web/core/modules/views/tests/src/Kernel/ModuleTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ModuleTest.php
@@ -19,7 +19,7 @@ class ModuleTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view_status', 'test_view', 'test_argument');
+  public static $testViews = ['test_view_status', 'test_view', 'test_argument'];
 
   /**
    * Modules to enable.
@@ -43,27 +43,27 @@ class ModuleTest extends ViewsKernelTestBase {
    * @see views_get_handler()
    */
   public function testViewsGetHandler() {
-    $types = array('field', 'area', 'filter');
+    $types = ['field', 'area', 'filter'];
     foreach ($types as $type) {
-      $item = array(
+      $item = [
         'table' => $this->randomMachineName(),
         'field' => $this->randomMachineName(),
-      );
+      ];
       $handler = $this->container->get('plugin.manager.views.' . $type)->getHandler($item);
       $this->assertEqual('Drupal\views\Plugin\views\\' . $type . '\Broken', get_class($handler), new FormattableMarkup('Make sure that a broken handler of type: @type is created.', ['@type' => $type]));
     }
 
     $views_data = $this->viewsData();
-    $test_tables = array('views_test_data' => array('id', 'name'));
+    $test_tables = ['views_test_data' => ['id', 'name']];
     foreach ($test_tables as $table => $fields) {
       foreach ($fields as $field) {
         $data = $views_data[$table][$field];
-        $item = array(
+        $item = [
           'table' => $table,
           'field' => $field,
-        );
+        ];
         foreach ($data as $id => $field_data) {
-          if (!in_array($id, array('title', 'help'))) {
+          if (!in_array($id, ['title', 'help'])) {
             $handler = $this->container->get('plugin.manager.views.' . $id)->getHandler($item);
             $this->assertInstanceHandler($handler, $table, $field, $id);
           }
@@ -72,10 +72,10 @@ class ModuleTest extends ViewsKernelTestBase {
     }
 
     // Test the override handler feature.
-    $item = array(
+    $item = [
       'table' => 'views_test_data',
       'field' => 'job',
-    );
+    ];
     $handler = $this->container->get('plugin.manager.views.filter')->getHandler($item, 'standard');
     $this->assertTrue($handler instanceof Standard);
 
@@ -84,29 +84,29 @@ class ModuleTest extends ViewsKernelTestBase {
     return;
 
     // Test non-existent tables/fields.
-    set_error_handler(array($this, 'customErrorHandler'));
-    $item = array(
+    set_error_handler([$this, 'customErrorHandler']);
+    $item = [
       'table' => 'views_test_data',
       'field' => 'field_invalid',
-    );
+    ];
     $this->container->get('plugin.manager.views.field')->getHandler($item);
-    $this->assertTrue(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'views_test_data', '@field' => 'field_invalid', '@type' => 'field'))) !== FALSE, 'An invalid field name throws a debug message.');
+    $this->assertTrue(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", ['@table' => 'views_test_data', '@field' => 'field_invalid', '@type' => 'field'])) !== FALSE, 'An invalid field name throws a debug message.');
     unset($this->lastErrorMessage);
 
-    $item = array(
+    $item = [
       'table' => 'table_invalid',
       'field' => 'id',
-    );
+    ];
     $this->container->get('plugin.manager.views.filter')->getHandler($item);
-    $this->assertEqual(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'))) !== FALSE, 'An invalid table name throws a debug message.');
+    $this->assertEqual(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", ['@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'])) !== FALSE, 'An invalid table name throws a debug message.');
     unset($this->lastErrorMessage);
 
-    $item = array(
+    $item = [
       'table' => 'table_invalid',
       'field' => 'id',
-    );
+    ];
     $this->container->get('plugin.manager.views.filter')->getHandler($item);
-    $this->assertEqual(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'))) !== FALSE, 'An invalid table name throws a debug message.');
+    $this->assertEqual(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", ['@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'])) !== FALSE, 'An invalid table name throws a debug message.');
     unset($this->lastErrorMessage);
 
     restore_error_handler();
@@ -139,8 +139,8 @@ class ModuleTest extends ViewsKernelTestBase {
    * Tests the load wrapper/helper functions.
    */
   public function testLoadFunctions() {
-    $this->enableModules(array('text', 'node'));
-    $this->installConfig(array('node'));
+    $this->enableModules(['text', 'node']);
+    $this->installConfig(['node']);
     $storage = $this->container->get('entity.manager')->getStorage('view');
 
     // Test views_view_is_enabled/disabled.
@@ -172,7 +172,7 @@ class ModuleTest extends ViewsKernelTestBase {
     // Test Views::getViewsAsOptions().
     // Test the $views_only parameter.
     $this->assertIdentical(array_keys($all_views), array_keys(Views::getViewsAsOptions(TRUE)), 'Expected option keys for all views were returned.');
-    $expected_options = array();
+    $expected_options = [];
     foreach ($all_views as $id => $view) {
       $expected_options[$id] = $view->label();
     }
@@ -196,10 +196,10 @@ class ModuleTest extends ViewsKernelTestBase {
     $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', $archive->getExecutable())), 'View excluded from options based on object');
 
     // Test the $opt_group parameter.
-    $expected_opt_groups = array();
+    $expected_opt_groups = [];
     foreach ($all_views as $view) {
       foreach ($view->get('display') as $display) {
-        $expected_opt_groups[$view->id()][$view->id() . ':' . $display['id']] = (string) t('@view : @display', array('@view' => $view->id(), '@display' => $display['id']));
+        $expected_opt_groups[$view->id()][$view->id() . ':' . $display['id']] = (string) t('@view : @display', ['@view' => $view->id(), '@display' => $display['id']]);
       }
     }
     $this->assertIdentical($expected_opt_groups, $this->castSafeStrings(Views::getViewsAsOptions(FALSE, 'all', NULL, TRUE)), 'Expected option array for an option group returned.');
@@ -208,7 +208,7 @@ class ModuleTest extends ViewsKernelTestBase {
   /**
    * Tests view enable and disable procedural wrapper functions.
    */
-  function testStatusFunctions() {
+  public function testStatusFunctions() {
     $view = Views::getView('test_view_status')->storage;
 
     $this->assertFalse($view->status(), 'The view status is disabled.');
@@ -229,7 +229,7 @@ class ModuleTest extends ViewsKernelTestBase {
     // All style plugins should be returned, as we have not specified a type.
     $plugins = Views::fetchPluginNames('style');
     $definitions = $this->container->get('plugin.manager.views.style')->getDefinitions();
-    $expected = array();
+    $expected = [];
     foreach ($definitions as $id => $definition) {
       $expected[$id] = $definition['title'];
     }
@@ -239,11 +239,11 @@ class ModuleTest extends ViewsKernelTestBase {
     // Test using the 'test' style plugin type only returns the test_style and
     // mapping_test plugins.
     $plugins = Views::fetchPluginNames('style', 'test');
-    $this->assertIdentical(array_keys($plugins), array('mapping_test', 'test_style', 'test_template_style'));
+    $this->assertIdentical(array_keys($plugins), ['mapping_test', 'test_style', 'test_template_style']);
 
     // Test a non existent style plugin type returns no plugins.
     $plugins = Views::fetchPluginNames('style', $this->randomString());
-    $this->assertIdentical($plugins, array());
+    $this->assertIdentical($plugins, []);
   }
 
   /**
@@ -252,11 +252,11 @@ class ModuleTest extends ViewsKernelTestBase {
   public function testViewsPluginList() {
     $plugin_list = Views::pluginList();
     // Only plugins used by 'test_view' should be in the plugin list.
-    foreach (array('display:default', 'pager:none') as $key) {
+    foreach (['display:default', 'pager:none'] as $key) {
       list($plugin_type, $plugin_id) = explode(':', $key);
       $plugin_def = $this->container->get("plugin.manager.views.$plugin_type")->getDefinition($plugin_id);
 
-      $this->assertTrue(isset($plugin_list[$key]), SafeMarkup::format('The expected @key plugin list key was found.', array('@key' => $key)));
+      $this->assertTrue(isset($plugin_list[$key]), SafeMarkup::format('The expected @key plugin list key was found.', ['@key' => $key]));
       $plugin_details = $plugin_list[$key];
 
       $this->assertEqual($plugin_details['type'], $plugin_type, 'The expected plugin type was found.');
@@ -303,35 +303,35 @@ class ModuleTest extends ViewsKernelTestBase {
     $this->assertEqual(count($result['#view']->result), 5);
 
     $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('0' => 1));
+    $result = $view->preview('default', ['0' => 1]);
     $this->assertEqual(count($result['#view']->result), 1);
 
     $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('3' => 1));
+    $result = $view->preview('default', ['3' => 1]);
     $this->assertEqual(count($result['#view']->result), 1);
 
     $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('0' => '1,2'));
+    $result = $view->preview('default', ['0' => '1,2']);
     $this->assertEqual(count($result['#view']->result), 2);
 
     $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('3' => '1,2'));
+    $result = $view->preview('default', ['3' => '1,2']);
     $this->assertEqual(count($result['#view']->result), 2);
 
     $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('0' => '1,2', '1' => 'John'));
+    $result = $view->preview('default', ['0' => '1,2', '1' => 'John']);
     $this->assertEqual(count($result['#view']->result), 1);
 
     $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('3' => '1,2', '4' => 'John'));
+    $result = $view->preview('default', ['3' => '1,2', '4' => 'John']);
     $this->assertEqual(count($result['#view']->result), 1);
 
     $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('0' => '1,2', '1' => 'John,George'));
+    $result = $view->preview('default', ['0' => '1,2', '1' => 'John,George']);
     $this->assertEqual(count($result['#view']->result), 2);
 
     $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('3' => '1,2', '4' => 'John,George'));
+    $result = $view->preview('default', ['3' => '1,2', '4' => 'John,George']);
     $this->assertEqual(count($result['#view']->result), 2);
   }
 
@@ -345,12 +345,12 @@ class ModuleTest extends ViewsKernelTestBase {
    * @return array
    *   A formatted options array that matches the expected output.
    */
-  protected function formatViewOptions(array $views = array()) {
-    $expected_options = array();
+  protected function formatViewOptions(array $views = []) {
+    $expected_options = [];
     foreach ($views as $view) {
       foreach ($view->get('display') as $display) {
         $expected_options[$view->id() . ':' . $display['id']] = (string) t('View: @view - Display: @display',
-          array('@view' => $view->id(), '@display' => $display['id']));
+          ['@view' => $view->id(), '@display' => $display['id']]);
       }
     }
 
@@ -360,7 +360,7 @@ class ModuleTest extends ViewsKernelTestBase {
   /**
    * Ensure that a certain handler is a instance of a certain table/field.
    */
-  function assertInstanceHandler($handler, $table, $field, $id) {
+  public function assertInstanceHandler($handler, $table, $field, $id) {
     $table_data = $this->container->get('views.views_data')->get($table);
     $field_data = $table_data[$field][$id];
 
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php
index cac798555..34d426dc7 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php
@@ -20,7 +20,7 @@ class ArgumentValidatorTest extends ViewsKernelTestBase {
    */
   public static $testViews = ['test_view_argument_validate_numeric', 'test_view'];
 
-  function testArgumentValidateNumeric() {
+  public function testArgumentValidateNumeric() {
     $view = Views::getView('test_view_argument_validate_numeric');
     $view->initHandlers();
     $this->assertFalse($view->argument['null']->validateArgument($this->randomString()));
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php
index 6b5de6e6a..1a9f32eff 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php
@@ -17,14 +17,14 @@ class BlockDependenciesTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_exposed_block');
+  public static $testViews = ['test_exposed_block'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('node', 'block', 'user', 'field');
+  public static $modules = ['node', 'block', 'user', 'field'];
 
   /**
    * Tests that exposed filter blocks have the correct dependencies.
@@ -34,11 +34,11 @@ class BlockDependenciesTest extends ViewsKernelTestBase {
   public function testExposedBlock() {
     $block = $this->createBlock('views_exposed_filter_block:test_exposed_block-page_1');
     $dependencies = $block->calculateDependencies()->getDependencies();
-    $expected = array(
-      'config' => array('views.view.test_exposed_block'),
-      'module' => array('views'),
-      'theme' => array('stark')
-    );
+    $expected = [
+      'config' => ['views.view.test_exposed_block'],
+      'module' => ['views'],
+      'theme' => ['stark']
+    ];
     $this->assertIdentical($expected, $dependencies);
   }
 
@@ -50,11 +50,11 @@ class BlockDependenciesTest extends ViewsKernelTestBase {
   public function testViewsBlock() {
     $block = $this->createBlock('views_block:content_recent-block_1');
     $dependencies = $block->calculateDependencies()->getDependencies();
-    $expected = array(
-      'config' => array('views.view.content_recent'),
-      'module' => array('views'),
-      'theme' => array('stark')
-    );
+    $expected = [
+      'config' => ['views.view.content_recent'],
+      'module' => ['views'],
+      'theme' => ['stark']
+    ];
     $this->assertIdentical($expected, $dependencies);
   }
 
@@ -82,18 +82,18 @@ class BlockDependenciesTest extends ViewsKernelTestBase {
    * @return \Drupal\block\Entity\Block
    *   The block entity.
    */
-  protected function createBlock($plugin_id, array $settings = array()) {
-    $settings += array(
+  protected function createBlock($plugin_id, array $settings = []) {
+    $settings += [
       'plugin' => $plugin_id,
       'region' => 'sidebar_first',
       'id' => strtolower($this->randomMachineName(8)),
       'theme' => $this->config('system.theme')->get('default'),
       'label' => $this->randomMachineName(8),
-      'visibility' => array(),
+      'visibility' => [],
       'weight' => 0,
-    );
+    ];
     $values = [];
-    foreach (array('region', 'id', 'theme', 'plugin', 'weight', 'visibility') as $key) {
+    foreach (['region', 'id', 'theme', 'plugin', 'weight', 'visibility'] as $key) {
       $values[$key] = $settings[$key];
       // Remove extra values that do not belong in the settings array.
       unset($settings[$key]);
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
index 31805d8d8..9f6066eff 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
@@ -21,14 +21,14 @@ class CacheTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view', 'test_cache', 'test_groupwise_term_ui', 'test_display', 'test_filter');
+  public static $testViews = ['test_view', 'test_cache', 'test_groupwise_term_ui', 'test_display', 'test_filter'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('taxonomy', 'text', 'user', 'node');
+  public static $modules = ['taxonomy', 'text', 'user', 'node'];
 
   /**
    * {@inheritdoc}
@@ -70,13 +70,13 @@ class CacheTest extends ViewsKernelTestBase {
   public function testTimeResultCaching() {
     $view = Views::getView('test_cache');
     $view->setDisplay();
-    $view->display_handler->overrideOption('cache', array(
+    $view->display_handler->overrideOption('cache', [
       'type' => 'time',
-      'options' => array(
+      'options' => [
         'results_lifespan' => '3600',
         'output_lifespan' => '3600',
-      )
-    ));
+      ]
+    ]);
 
     // Test the default (non-paged) display.
     $this->executeView($view);
@@ -84,11 +84,11 @@ class CacheTest extends ViewsKernelTestBase {
     $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
 
     // Add another man to the beatles.
-    $record = array(
+    $record = [
       'name' => 'Rod Davis',
       'age' => 29,
       'job' => 'Banjo',
-    );
+    ];
     db_insert('views_test_data')->fields($record)->execute();
 
     // The result should be the same as before, because of the caching. (Note
@@ -112,25 +112,25 @@ class CacheTest extends ViewsKernelTestBase {
 
     $view = Views::getView('test_filter');
     $view->initDisplay();
-    $view->display_handler->overrideOption('cache', array(
+    $view->display_handler->overrideOption('cache', [
       'type' => 'time',
-      'options' => array(
+      'options' => [
         'results_lifespan' => '3600',
         'output_lifespan' => '3600',
-      ),
-    ));
+      ],
+    ]);
 
     // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'test_filter' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'test_filter' => [
         'id' => 'test_filter',
         'table' => 'views_test_data',
         'field' => 'name',
         'operator' => '=',
         'value' => 'John',
         'group' => 0,
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
@@ -138,29 +138,29 @@ class CacheTest extends ViewsKernelTestBase {
     $cid1 = $view->display_handler->getPlugin('cache')->generateResultsKey();
 
     // Build the expected result.
-    $dataset = array(array('name' => 'John'));
+    $dataset = [['name' => 'John']];
 
     // Verify the result.
     $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultSet($view, $dataset, array(
+    $this->assertIdenticalResultSet($view, $dataset, [
       'views_test_data_name' => 'name',
-    ));
+    ]);
 
     $view->destroy();
 
     $view->initDisplay();
 
     // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'test_filter' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'test_filter' => [
         'id' => 'test_filter',
         'table' => 'views_test_data',
         'field' => 'name',
         'operator' => '=',
         'value' => 'Ringo',
         'group' => 0,
-      ),
-    ));
+      ],
+    ]);
 
     $this->executeView($view);
 
@@ -169,13 +169,13 @@ class CacheTest extends ViewsKernelTestBase {
     $this->assertNotEqual($cid1, $cid2, "Results keys are different.");
 
     // Build the expected result.
-    $dataset = array(array('name' => 'Ringo'));
+    $dataset = [['name' => 'Ringo']];
 
     // Verify the result.
     $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultSet($view, $dataset, array(
+    $this->assertIdenticalResultSet($view, $dataset, [
       'views_test_data_name' => 'name',
-    ));
+    ]);
   }
 
   /**
@@ -184,13 +184,13 @@ class CacheTest extends ViewsKernelTestBase {
   public function testTimeResultCachingWithPager() {
     $view = Views::getView('test_cache');
     $view->setDisplay();
-    $view->display_handler->overrideOption('cache', array(
+    $view->display_handler->overrideOption('cache', [
       'type' => 'time',
-      'options' => array(
+      'options' => [
         'results_lifespan' => '3600',
         'output_lifespan' => '3600',
-      )
-    ));
+      ]
+    ]);
 
     $mapping = ['views_test_data_name' => 'name'];
 
@@ -224,34 +224,34 @@ class CacheTest extends ViewsKernelTestBase {
    *
    * @see views_plugin_cache_time
    */
-  function testNoneResultCaching() {
+  public function testNoneResultCaching() {
     // Create a basic result which just 2 results.
     $view = Views::getView('test_cache');
     $view->setDisplay();
-    $view->display_handler->overrideOption('cache', array(
+    $view->display_handler->overrideOption('cache', [
       'type' => 'none',
-      'options' => array(),
-    ));
+      'options' => [],
+    ]);
 
     $this->executeView($view);
     // Verify the result.
     $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
 
     // Add another man to the beatles.
-    $record = array(
+    $record = [
       'name' => 'Rod Davis',
       'age' => 29,
       'job' => 'Banjo',
-    );
+    ];
     db_insert('views_test_data')->fields($record)->execute();
 
     // The Result changes, because the view is not cached.
     $view = Views::getView('test_cache');
     $view->setDisplay();
-    $view->display_handler->overrideOption('cache', array(
+    $view->display_handler->overrideOption('cache', [
       'type' => 'none',
-      'options' => array(),
-    ));
+      'options' => [],
+    ]);
 
     $this->executeView($view);
     // Verify the result.
@@ -261,19 +261,19 @@ class CacheTest extends ViewsKernelTestBase {
   /**
    * Tests css/js storage and restoring mechanism.
    */
-  function testHeaderStorage() {
+  public function testHeaderStorage() {
     // Create a view with output caching enabled.
     // Some hook_views_pre_render in views_test_data.module adds the test css/js file.
     // so they should be added to the css/js storage.
     $view = Views::getView('test_view');
     $view->setDisplay();
     $view->storage->set('id', 'test_cache_header_storage');
-    $view->display_handler->overrideOption('cache', array(
+    $view->display_handler->overrideOption('cache', [
       'type' => 'time',
-      'options' => array(
+      'options' => [
         'output_lifespan' => '3600',
-      )
-    ));
+      ]
+    ]);
 
     $output = $view->buildRenderable();
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
@@ -326,13 +326,13 @@ class CacheTest extends ViewsKernelTestBase {
 
     $view = Views::getView('test_display');
     $view->setDisplay();
-    $view->display_handler->overrideOption('cache', array(
+    $view->display_handler->overrideOption('cache', [
       'type' => 'time',
-      'options' => array(
+      'options' => [
         'results_lifespan' => '3600',
         'output_lifespan' => '3600',
-      )
-    ));
+      ]
+    ]);
     $this->executeView($view);
 
     // Get the cache item.
@@ -383,4 +383,30 @@ class CacheTest extends ViewsKernelTestBase {
     $this->assertIdenticalResultset($view, [['name' => 'Paul']], $map);
   }
 
+  /**
+   * Tests that cacheability metadata is carried over from argument defaults.
+   */
+  public function testArgumentDefaultCache() {
+    $view = Views::getView('test_view');
+
+    // Add a new argument and set the test plugin for the argument_default.
+    $options = [
+      'default_argument_type' => 'argument_default_test',
+      'default_argument_options' => [
+        'value' => 'John'
+      ],
+      'default_action' => 'default'
+    ];
+    $view->addHandler('default', 'argument', 'views_test_data', 'name', $options);
+    $view->initHandlers();
+
+    $output = $view->preview();
+
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $renderer->renderPlain($output);
+    $this->assertEquals(['config:views.view.test_view', 'example_tag'], $output['#cache']['tags']);
+  }
+
 }
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/Display/ViewsMenuLinkTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/Display/ViewsMenuLinkTest.php
index 9e05ebcfb..d08adaacb 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/Display/ViewsMenuLinkTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/Display/ViewsMenuLinkTest.php
@@ -30,7 +30,7 @@ class ViewsMenuLinkTest extends ViewsKernelTestBase {
    *
    * @var \Drupal\Core\Entity\EntityManagerInterface
    */
-  protected $entityManger;
+  protected $entityManager;
 
   /**
    * The menu link manager.
@@ -52,7 +52,7 @@ class ViewsMenuLinkTest extends ViewsKernelTestBase {
   protected function setUp($import_test_views = TRUE) {
     parent::setUp($import_test_views);
 
-    $this->entityManger = $this->container->get('entity.manager');
+    $this->entityManager = $this->container->get('entity.manager');
     $this->menuLinkManager = $this->container->get('plugin.manager.menu.link');
     $this->menuLinkOverrides = $this->container->get('menu_link.static.overrides');
   }
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php
index 156b06119..69666cf34 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php
@@ -24,14 +24,14 @@ class DisplayKernelTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'node', 'field', 'user');
+  public static $modules = ['block', 'node', 'field', 'user'];
 
   /**
    * Views plugin types to test.
    *
    * @var array
    */
-  protected $pluginTypes = array(
+  protected $pluginTypes = [
     'access',
     'cache',
     'query',
@@ -39,24 +39,24 @@ class DisplayKernelTest extends ViewsKernelTestBase {
     'pager',
     'style',
     'row',
-  );
+  ];
 
   /**
    * Views handler types to test.
    *
    * @var array
    */
-  protected $handlerTypes = array(
+  protected $handlerTypes = [
     'fields',
     'sorts',
-  );
+  ];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_display_defaults');
+  public static $testViews = ['test_display_defaults'];
 
   /**
    * Tests the default display options.
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
index 5e4724a82..8aaaa2dd5 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
@@ -22,14 +22,14 @@ class DisplayPageTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_page_display', 'test_page_display_route', 'test_page_display_menu');
+  public static $testViews = ['test_page_display', 'test_page_display_route', 'test_page_display_menu'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'field');
+  public static $modules = ['system', 'user', 'field'];
 
   /**
    * The router dumper to get all routes.
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
index db0262a1d..0839fcb2c 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
@@ -21,7 +21,7 @@ class JoinTest extends RelationshipJoinTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * A plugin manager which handlers the instances of joins.
@@ -47,12 +47,12 @@ class JoinTest extends RelationshipJoinTestBase {
     $view->initDisplay();
     $view->initQuery();
 
-    $configuration = array(
+    $configuration = [
       'left_table' => 'views_test_data',
       'left_field' => 'uid',
       'table' => 'users_field_data',
       'field' => 'uid',
-    );
+    ];
     $join = $this->manager->createInstance('join_test', $configuration);
     $this->assertTrue($join instanceof JoinTestPlugin, 'The correct join class got loaded.');
 
@@ -60,7 +60,7 @@ class JoinTest extends RelationshipJoinTestBase {
     $join->setJoinValue($rand_int);
 
     $query = db_select('views_test_data');
-    $table = array('alias' => 'users_field_data');
+    $table = ['alias' => 'users_field_data'];
     $join->buildJoin($query, $table, $view->query);
 
     $tables = $query->getTables();
@@ -80,13 +80,13 @@ class JoinTest extends RelationshipJoinTestBase {
 
     // First define a simple join without an extra condition.
     // Set the various options on the join object.
-    $configuration = array(
+    $configuration = [
       'left_table' => 'views_test_data',
       'left_field' => 'uid',
       'table' => 'users_field_data',
       'field' => 'uid',
       'adjusted' => TRUE,
-    );
+    ];
     $join = $this->manager->createInstance('standard', $configuration);
     $this->assertTrue($join instanceof JoinPluginBase, 'The correct join class got loaded.');
     $this->assertNull($join->extra, 'The field extra was not overridden.');
@@ -95,7 +95,7 @@ class JoinTest extends RelationshipJoinTestBase {
     // Build the actual join values and read them back from the dbtng query
     // object.
     $query = db_select('views_test_data');
-    $table = array('alias' => 'users_field_data');
+    $table = ['alias' => 'users_field_data'];
     $join->buildJoin($query, $table, $view->query);
 
     $tables = $query->getTables();
@@ -107,7 +107,7 @@ class JoinTest extends RelationshipJoinTestBase {
 
     // Set a different alias and make sure table info is as expected.
     $join = $this->manager->createInstance('standard', $configuration);
-    $table = array('alias' => 'users1');
+    $table = ['alias' => 'users1'];
     $join->buildJoin($query, $table, $view->query);
 
     $tables = $query->getTables();
@@ -117,7 +117,7 @@ class JoinTest extends RelationshipJoinTestBase {
     // Set a different join type (INNER) and make sure it is used.
     $configuration['type'] = 'INNER';
     $join = $this->manager->createInstance('standard', $configuration);
-    $table = array('alias' => 'users2');
+    $table = ['alias' => 'users2'];
     $join->buildJoin($query, $table, $view->query);
 
     $tables = $query->getTables();
@@ -127,19 +127,19 @@ class JoinTest extends RelationshipJoinTestBase {
     // Setup addition conditions and make sure it is used.
     $random_name_1 = $this->randomMachineName();
     $random_name_2 = $this->randomMachineName();
-    $configuration['extra'] = array(
-      array(
+    $configuration['extra'] = [
+      [
         'field' => 'name',
         'value' => $random_name_1
-      ),
-      array(
+      ],
+      [
         'field' => 'name',
         'value' => $random_name_2,
         'operator' => '<>'
-      ),
-    );
+      ],
+    ];
     $join = $this->manager->createInstance('standard', $configuration);
-    $table = array('alias' => 'users3');
+    $table = ['alias' => 'users3'];
     $join->buildJoin($query, $table, $view->query);
 
     $tables = $query->getTables();
@@ -147,25 +147,25 @@ class JoinTest extends RelationshipJoinTestBase {
     $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users3.uid") !== FALSE, 'Make sure the join condition appears in the query.');
     $this->assertTrue(strpos($join_info['condition'], "users3.name = :views_join_condition_0") !== FALSE, 'Make sure the first extra join condition appears in the query and uses the first placeholder.');
     $this->assertTrue(strpos($join_info['condition'], "users3.name <> :views_join_condition_1") !== FALSE, 'Make sure the second extra join condition appears in the query and uses the second placeholder.');
-    $this->assertEqual(array_values($join_info['arguments']), array($random_name_1, $random_name_2), 'Make sure the arguments are in the right order');
+    $this->assertEqual(array_values($join_info['arguments']), [$random_name_1, $random_name_2], 'Make sure the arguments are in the right order');
 
     // Test that 'IN' conditions are properly built.
     $random_name_1 = $this->randomMachineName();
     $random_name_2 = $this->randomMachineName();
     $random_name_3 = $this->randomMachineName();
     $random_name_4 = $this->randomMachineName();
-    $configuration['extra'] = array(
-      array(
+    $configuration['extra'] = [
+      [
         'field' => 'name',
         'value' => $random_name_1
-      ),
-      array(
+      ],
+      [
         'field' => 'name',
-        'value' => array($random_name_2, $random_name_3, $random_name_4),
-      ),
-    );
+        'value' => [$random_name_2, $random_name_3, $random_name_4],
+      ],
+    ];
     $join = $this->manager->createInstance('standard', $configuration);
-    $table = array('alias' => 'users4');
+    $table = ['alias' => 'users4'];
     $join->buildJoin($query, $table, $view->query);
 
     $tables = $query->getTables();
@@ -173,26 +173,26 @@ class JoinTest extends RelationshipJoinTestBase {
     $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users4.uid") !== FALSE, 'Make sure the join condition appears in the query.');
     $this->assertTrue(strpos($join_info['condition'], "users4.name = :views_join_condition_2") !== FALSE, 'Make sure the first extra join condition appears in the query.');
     $this->assertTrue(strpos($join_info['condition'], "users4.name IN ( :views_join_condition_3[] )") !== FALSE, 'The IN condition for the join is properly formed.');
-    $this->assertEqual($join_info['arguments'][':views_join_condition_3[]'], array($random_name_2, $random_name_3, $random_name_4), 'Make sure the IN arguments are still part of an array.');
+    $this->assertEqual($join_info['arguments'][':views_join_condition_3[]'], [$random_name_2, $random_name_3, $random_name_4], 'Make sure the IN arguments are still part of an array.');
 
     // Test that all the conditions are properly built.
-    $configuration['extra'] = array(
-      array(
+    $configuration['extra'] = [
+      [
         'field' => 'langcode',
         'value' => 'en'
-      ),
-      array(
+      ],
+      [
         'left_field' => 'status',
         'value' => 0,
         'numeric' => TRUE,
-      ),
-      array(
+      ],
+      [
         'field' => 'name',
         'left_field' => 'name'
-      ),
-    );
+      ],
+    ];
     $join = $this->manager->createInstance('standard', $configuration);
-    $table = array('alias' => 'users5');
+    $table = ['alias' => 'users5'];
     $join->buildJoin($query, $table, $view->query);
 
     $tables = $query->getTables();
@@ -201,7 +201,7 @@ class JoinTest extends RelationshipJoinTestBase {
     $this->assertTrue(strpos($join_info['condition'], "users5.langcode = :views_join_condition_4") !== FALSE, 'Make sure the first extra join condition appears in the query.');
     $this->assertTrue(strpos($join_info['condition'], "views_test_data.status = :views_join_condition_5") !== FALSE, 'Make sure the second extra join condition appears in the query.');
     $this->assertTrue(strpos($join_info['condition'], "users5.name = views_test_data.name") !== FALSE, 'Make sure the third extra join condition appears in the query.');
-    $this->assertEqual(array_values($join_info['arguments']), array('en', 0), 'Make sure the arguments are in the right order');
+    $this->assertEqual(array_values($join_info['arguments']), ['en', 0], 'Make sure the arguments are in the right order');
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php
index 2422deda3..02548b25c 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php
@@ -18,7 +18,7 @@ class QueryTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   protected function viewsData() {
     $data = parent::viewsData();
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php b/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php
index cf604f935..1163297b1 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php
@@ -18,7 +18,7 @@ abstract class RelationshipJoinTestBase extends PluginKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'field');
+  public static $modules = ['system', 'user', 'field'];
 
   /**
    * @var \Drupal\user\Entity\User
@@ -30,7 +30,7 @@ abstract class RelationshipJoinTestBase extends PluginKernelTestBase {
    */
   protected function setUpFixtures() {
     $this->installEntitySchema('user');
-    $this->installConfig(array('user'));
+    $this->installConfig(['user']);
     parent::setUpFixtures();
 
     // Create a record for uid 1.
@@ -48,13 +48,13 @@ abstract class RelationshipJoinTestBase extends PluginKernelTestBase {
   protected function schemaDefinition() {
     $schema = parent::schemaDefinition();
 
-    $schema['views_test_data']['fields']['uid'] = array(
+    $schema['views_test_data']['fields']['uid'] = [
       'description' => "The {users_field_data}.uid of the author of the beatle entry.",
       'type' => 'int',
       'unsigned' => TRUE,
       'not null' => TRUE,
       'default' => 0
-    );
+    ];
 
     return $schema;
   }
@@ -66,15 +66,15 @@ abstract class RelationshipJoinTestBase extends PluginKernelTestBase {
    */
   protected function viewsData() {
     $data = parent::viewsData();
-    $data['views_test_data']['uid'] = array(
+    $data['views_test_data']['uid'] = [
       'title' => t('UID'),
       'help' => t('The test data UID'),
-      'relationship' => array(
+      'relationship' => [
         'id' => 'standard',
         'base' => 'users_field_data',
         'base field' => 'uid'
-      )
-    );
+      ]
+    ];
 
     return $data;
   }
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php
index 846da660d..802befe1c 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php
@@ -19,17 +19,17 @@ class RelationshipTest extends RelationshipJoinTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Maps between the key in the expected result and the query result.
    *
    * @var array
    */
-  protected $columnMap = array(
+  protected $columnMap = [
     'views_test_data_name' => 'name',
     'users_field_data_views_test_data_uid' => 'uid',
-  );
+  ];
 
   /**
    * Tests the query result of a view with a relationship.
@@ -42,53 +42,53 @@ class RelationshipTest extends RelationshipJoinTestBase {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
-    $view->displayHandlers->get('default')->overrideOption('relationships', array(
-      'uid' => array(
+    $view->displayHandlers->get('default')->overrideOption('relationships', [
+      'uid' => [
         'id' => 'uid',
         'table' => 'views_test_data',
         'field' => 'uid',
-      ),
-    ));
+      ],
+    ]);
 
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'uid' => array(
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'uid' => [
         'id' => 'uid',
         'table' => 'users_field_data',
         'field' => 'uid',
         'relationship' => 'uid',
-      ),
-    ));
+      ],
+    ]);
 
     $fields = $view->displayHandlers->get('default')->getOption('fields');
-    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
-      'uid' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', $fields + [
+      'uid' => [
         'id' => 'uid',
         'table' => 'users_field_data',
         'field' => 'uid',
         'relationship' => 'uid',
-      ),
-    ));
+      ],
+    ]);
 
     $view->initHandlers();
 
     // Check for all beatles created by admin.
-    $view->filter['uid']->value = array(1);
+    $view->filter['uid']->value = [1];
     $this->executeView($view);
 
-    $expected_result = array(
-      array(
+    $expected_result = [
+      [
         'name' => 'John',
         'uid' => 1
-      )
-    );
+      ]
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
     $view->destroy();
 
     // Check for all beatles created by another user, which so doesn't exist.
     $view->initHandlers();
-    $view->filter['uid']->value = array(3);
+    $view->filter['uid']->value = [3];
     $this->executeView($view);
-    $expected_result = array();
+    $expected_result = [];
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
     $view->destroy();
 
@@ -98,12 +98,12 @@ class RelationshipTest extends RelationshipJoinTestBase {
     $view->relationship['uid']->options['required'] = TRUE;
     $this->executeView($view);
 
-    $expected_result = array(
-      array(
+    $expected_result = [
+      [
         'name' => 'John',
         'uid' => 1
-      )
-    );
+      ]
+    ];
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
     $view->destroy();
 
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php
index 8d2d86632..b4ac0be83 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php
@@ -28,7 +28,7 @@ class RowEntityTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_entity_row');
+  public static $testViews = ['test_entity_row'];
 
   /**
    * {@inheritdoc}
@@ -37,7 +37,7 @@ class RowEntityTest extends ViewsKernelTestBase {
     parent::setUp();
 
     $this->installEntitySchema('taxonomy_term');
-    $this->installConfig(array('taxonomy'));
+    $this->installConfig(['taxonomy']);
     \Drupal::service('router.builder')->rebuild();
   }
 
@@ -57,7 +57,7 @@ class RowEntityTest extends ViewsKernelTestBase {
     $this->assertText($term->getName(), 'The rendered entity appears as row in the view.');
 
     // Tests the available view mode options.
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $form_state->set('view', $view->storage);
     $view->rowPlugin->buildOptionsForm($form, $form_state);
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/RowRenderCacheTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/RowRenderCacheTest.php
index ac85c77a9..223963e2d 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/RowRenderCacheTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/RowRenderCacheTest.php
@@ -24,14 +24,14 @@ class RowRenderCacheTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('user', 'node');
+  public static $modules = ['user', 'node'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_row_render_cache', 'test_row_render_cache_none');
+  public static $testViews = ['test_row_render_cache', 'test_row_render_cache_none'];
 
   /**
    * An editor user account.
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/SqlQueryTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/SqlQueryTest.php
index ca7ba5bc7..6846f7763 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/SqlQueryTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/SqlQueryTest.php
@@ -18,7 +18,7 @@ class SqlQueryTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * {@inheritdoc}
@@ -26,7 +26,7 @@ class SqlQueryTest extends ViewsKernelTestBase {
   protected function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['table']['base']['access query tag'] = 'test_tag';
-    $data['views_test_data']['table']['base']['query metadata'] = array('key1' => 'test_metadata', 'key2' => 'test_metadata2');
+    $data['views_test_data']['table']['base']['query metadata'] = ['key1' => 'test_metadata', 'key2' => 'test_metadata2'];
 
     return $data;
   }
@@ -45,7 +45,7 @@ class SqlQueryTest extends ViewsKernelTestBase {
     /** @var \Drupal\Core\Database\Query\Select $count_query */
     $count_query = $view->build_info['count_query'];
 
-    foreach (array($main_query, $count_query) as $query) {
+    foreach ([$main_query, $count_query] as $query) {
       // Check query access tags.
       $this->assertTrue($query->hasTag('test_tag'));
 
@@ -69,7 +69,7 @@ class SqlQueryTest extends ViewsKernelTestBase {
     /** @var \Drupal\Core\Database\Query\Select $count_query */
     $count_query = $view->build_info['count_query'];
 
-    foreach (array($main_query, $count_query) as $query) {
+    foreach ([$main_query, $count_query] as $query) {
       // Check query access tags.
       $this->assertFalse($query->hasTag('test_tag'));
 
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php
index f1f1fb1a6..0e99439e7 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php
@@ -18,12 +18,12 @@ class StyleHtmlListTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_style_html_list');
+  public static $testViews = ['test_style_html_list'];
 
   /**
    * Make sure that the HTML list style markup is correct.
    */
-  function testDefaultRowClasses() {
+  public function testDefaultRowClasses() {
     $view = Views::getView('test_style_html_list');
     $output = $view->preview();
     $output = \Drupal::service('renderer')->renderRoot($output);
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php
index 1cb44000f..d0683deb4 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php
@@ -11,14 +11,14 @@ use Drupal\views\Views;
  */
 class StyleMappingTest extends StyleTestBase {
 
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_style_mapping');
+  public static $testViews = ['test_style_mapping'];
 
   /**
    * Verifies that the fields were mapped correctly.
@@ -68,7 +68,7 @@ class StyleMappingTest extends StyleTestBase {
         // separated by ':'.
         $expected_result = $name . ':' . $data_set[$count][$field_id];
         $actual_result = (string) $field;
-        $this->assertIdentical($expected_result, $actual_result, format_string('The fields were mapped successfully: %name => %field_id', array('%name' => $name, '%field_id' => $field_id)));
+        $this->assertIdentical($expected_result, $actual_result, format_string('The fields were mapped successfully: %name => %field_id', ['%name' => $name, '%field_id' => $field_id]));
       }
 
       $count++;
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php
index f7ede520d..365b0c78e 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php
@@ -19,7 +19,7 @@ class StyleTableUnitTest extends PluginKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_table');
+  public static $testViews = ['test_table'];
 
   /**
    * Tests the table style.
@@ -101,7 +101,7 @@ class StyleTableUnitTest extends PluginKernelTestBase {
     $view->destroy();
 
     // Use a existing field, and sort both ascending and descending.
-    foreach (array('asc', 'desc') as $order) {
+    foreach (['asc', 'desc'] as $order) {
       $this->prepareView($view);
       $style_plugin = $view->style_plugin;
       $request->query->set('sort', $order);
@@ -133,7 +133,7 @@ class StyleTableUnitTest extends PluginKernelTestBase {
     // Render an empty result, and ensure that the area handler is rendered.
     $view->setDisplay('default');
     $view->executed = TRUE;
-    $view->result = array();
+    $view->result = [];
     $output = $view->preview();
     $output = \Drupal::service('renderer')->renderRoot($output);
 
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleTestBase.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleTestBase.php
index 00dd9f98b..91900cea2 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleTestBase.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleTestBase.php
@@ -20,7 +20,7 @@ abstract class StyleTestBase extends ViewsKernelTestBase {
   /**
    * Stores a view output in the elements.
    */
-  function storeViewPreview($output) {
+  public function storeViewPreview($output) {
     $html5 = new HTML5();
     $htmlDom = $html5->loadHTML('<html><body>' . $output . '</body></html>');
     if ($htmlDom) {
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php
index 14e589551..af58b7000 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php
@@ -16,12 +16,12 @@ class StyleUnformattedTest extends StyleTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Make sure that the default css classes works as expected.
    */
-  function testDefaultRowClasses() {
+  public function testDefaultRowClasses() {
     $view = Views::getView('test_view');
     $view->setDisplay();
     $output = $view->preview();
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
index d06ae66ba..879f6d44d 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
@@ -19,14 +19,14 @@ class ViewsBlockTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test_views');
+  public static $modules = ['block', 'block_test_views'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view_block');
+  public static $testViews = ['test_view_block'];
 
   /**
    * {@inheritdoc}
@@ -34,7 +34,7 @@ class ViewsBlockTest extends ViewsKernelTestBase {
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
 
-    ViewTestData::createTestViews(get_class($this), array('block_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['block_test_views']);
   }
 
   /**
@@ -43,11 +43,11 @@ class ViewsBlockTest extends ViewsKernelTestBase {
    * @see \Drupal\views\Plugin\Block::getmachineNameSuggestion()
    */
   public function testMachineNameSuggestion() {
-    $plugin_definition = array(
+    $plugin_definition = [
       'provider' => 'views',
-    );
+    ];
     $plugin_id = 'views_block:test_view_block-block_1';
-    $views_block = ViewsBlock::create($this->container, array(), $plugin_id, $plugin_definition);
+    $views_block = ViewsBlock::create($this->container, [], $plugin_id, $plugin_definition);
 
     $this->assertEqual($views_block->getMachineNameSuggestion(), 'views_block__test_view_block_block_1');
   }
@@ -96,8 +96,8 @@ class ViewsBlockTest extends ViewsKernelTestBase {
     $view->setDisplay();
 
     // Add a fixed argument that sets a title and save the view.
-    $view->displayHandlers->get('default')->overrideOption('arguments', array(
-      'name' => array(
+    $view->displayHandlers->get('default')->overrideOption('arguments', [
+      'name' => [
         'default_action' => 'default',
         'title_enable' => TRUE,
         'title' => 'Overridden title',
@@ -105,16 +105,16 @@ class ViewsBlockTest extends ViewsKernelTestBase {
         'default_argument_options' => [
           'argument' => 'fixed'
         ],
-        'validate' => array(
+        'validate' => [
           'type' => 'none',
           'fail' => 'not found',
-        ),
+        ],
         'id' => 'name',
         'table' => 'views_test_data',
         'field' => 'name',
         'plugin_id' => 'string',
-      )
-    ));
+      ]
+    ]);
     $view->save();
 
     $plugin_definition = [
diff --git a/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php b/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
index f5c61ee3e..b12040060 100644
--- a/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
+++ b/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
@@ -16,7 +16,7 @@ class PluginInstanceTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  protected $pluginTypes = array(
+  protected $pluginTypes = [
     'access',
     'area',
     'argument',
@@ -36,7 +36,7 @@ class PluginInstanceTest extends ViewsKernelTestBase {
     'sort',
     'style',
     'wizard',
-  );
+  ];
 
   /**
    * An array of plugin definitions, keyed by plugin type.
@@ -60,8 +60,8 @@ class PluginInstanceTest extends ViewsKernelTestBase {
 
     // Check all plugin types.
     foreach ($this->pluginTypes as $type) {
-      $this->assertTrue(array_key_exists($type, $this->definitions), format_string('Key for plugin type @type found.', array('@type' => $type)));
-      $this->assertTrue(is_array($this->definitions[$type]) && !empty($this->definitions[$type]), format_string('Plugin type @type has an array of plugins.', array('@type' => $type)));
+      $this->assertTrue(array_key_exists($type, $this->definitions), format_string('Key for plugin type @type found.', ['@type' => $type]));
+      $this->assertTrue(is_array($this->definitions[$type]) && !empty($this->definitions[$type]), format_string('Plugin type @type has an array of plugins.', ['@type' => $type]));
     }
 
     // Tests that the plugin list has not missed any types.
@@ -87,7 +87,7 @@ class PluginInstanceTest extends ViewsKernelTestBase {
           // good to check they can be created but for throwing any notices for
           // method signatures etc. too.
           $instance = $manager->createInstance($id);
-          $this->assertTrue($instance instanceof $definition['class'], format_string('Instance of @type:@id created', array('@type' => $type, '@id' => $id)));
+          $this->assertTrue($instance instanceof $definition['class'], format_string('Instance of @type:@id created', ['@type' => $type, '@id' => $id]));
         }
       }
     }
diff --git a/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php b/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
index 594bd6251..e4a088459 100644
--- a/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
+++ b/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
@@ -20,14 +20,14 @@ class QueryGroupByTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_group_by_in_filters', 'test_aggregate_count', 'test_group_by_count', 'test_group_by_count_multicardinality', 'test_group_by_field_not_within_bundle');
+  public static $testViews = ['test_group_by_in_filters', 'test_aggregate_count', 'test_group_by_count', 'test_group_by_count_multicardinality', 'test_group_by_field_not_within_bundle'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('entity_test', 'system', 'field', 'user', 'language');
+  public static $modules = ['entity_test', 'system', 'field', 'user', 'language'];
 
   /**
    * The storage for the test entity type.
@@ -63,7 +63,7 @@ class QueryGroupByTest extends ViewsKernelTestBase {
 
     $this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
 
-    $types = array();
+    $types = [];
     foreach ($view->result as $item) {
       // num_records is a alias for id.
       $types[$item->entity_test_name] = $item->num_records;
@@ -101,12 +101,12 @@ class QueryGroupByTest extends ViewsKernelTestBase {
 
     $this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
     // Group by name to identify the right count.
-    $results = array();
+    $results = [];
     foreach ($view->result as $item) {
       $results[$item->entity_test_name] = $item->id;
     }
-    $this->assertEqual($results['name1'], $values[0], format_string('Aggregation with @aggregation_function and groupby name: name1 returned the expected amount of results', array('@aggregation_function' => $aggregation_function)));
-    $this->assertEqual($results['name2'], $values[1], format_string('Aggregation with @aggregation_function and groupby name: name2 returned the expected amount of results', array('@aggregation_function' => $aggregation_function)));
+    $this->assertEqual($results['name1'], $values[0], format_string('Aggregation with @aggregation_function and groupby name: name1 returned the expected amount of results', ['@aggregation_function' => $aggregation_function]));
+    $this->assertEqual($results['name2'], $values[1], format_string('Aggregation with @aggregation_function and groupby name: name2 returned the expected amount of results', ['@aggregation_function' => $aggregation_function]));
   }
 
   /**
@@ -114,18 +114,18 @@ class QueryGroupByTest extends ViewsKernelTestBase {
    */
   protected function setupTestEntities() {
     // Create 4 entities with name1 and 3 entities with name2.
-    $entity_1 = array(
+    $entity_1 = [
       'name' => 'name1',
-    );
+    ];
 
     $this->storage->create($entity_1)->save();
     $this->storage->create($entity_1)->save();
     $this->storage->create($entity_1)->save();
     $this->storage->create($entity_1)->save();
 
-    $entity_2 = array(
+    $entity_2 = [
       'name' => 'name2',
-    );
+    ];
     $this->storage->create($entity_2)->save();
     $this->storage->create($entity_2)->save();
     $this->storage->create($entity_2)->save();
@@ -135,42 +135,42 @@ class QueryGroupByTest extends ViewsKernelTestBase {
    * Tests the count aggregation function.
    */
   public function testGroupByCount() {
-    $this->groupByTestHelper('count', array(4, 3));
+    $this->groupByTestHelper('count', [4, 3]);
   }
 
   /**
    * Tests the sum aggregation function.
    */
   public function testGroupBySum() {
-    $this->groupByTestHelper('sum', array(10, 18));
+    $this->groupByTestHelper('sum', [10, 18]);
   }
 
   /**
    * Tests the average aggregation function.
    */
   public function testGroupByAverage() {
-    $this->groupByTestHelper('avg', array(2.5, 6));
+    $this->groupByTestHelper('avg', [2.5, 6]);
   }
 
   /**
    * Tests the min aggregation function.
    */
   public function testGroupByMin() {
-    $this->groupByTestHelper('min', array(1, 5));
+    $this->groupByTestHelper('min', [1, 5]);
   }
 
   /**
    * Tests the max aggregation function.
    */
   public function testGroupByMax() {
-    $this->groupByTestHelper('max', array(4, 7));
+    $this->groupByTestHelper('max', [4, 7]);
   }
 
   /**
    * Tests aggregation with no specific function.
    */
   public function testGroupByNone() {
-    $this->groupByTestHelper(NULL, array(1, 5));
+    $this->groupByTestHelper(NULL, [1, 5]);
   }
 
   /**
@@ -181,7 +181,7 @@ class QueryGroupByTest extends ViewsKernelTestBase {
     // doesn't display SUM, COUNT, MAX, etc. functions in SELECT statement.
 
     for ($x = 0; $x < 10; $x++) {
-      $this->storage->create(array('name' => 'name1'))->save();
+      $this->storage->create(['name' => 'name1'])->save();
     }
 
     $view = Views::getView('test_group_by_in_filters');
diff --git a/web/core/modules/views/tests/src/Kernel/TestViewsTest.php b/web/core/modules/views/tests/src/Kernel/TestViewsTest.php
index f67b5e8d8..f9aa67342 100644
--- a/web/core/modules/views/tests/src/Kernel/TestViewsTest.php
+++ b/web/core/modules/views/tests/src/Kernel/TestViewsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\views\Kernel;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\config_test\TestInstallStorage;
 use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Config\TypedConfigManager;
@@ -22,7 +22,7 @@ class TestViewsTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('views_test_data');
+  public static $modules = ['views_test_data'];
 
   /**
    * Tests default configuration data type.
diff --git a/web/core/modules/views/tests/src/Kernel/TokenReplaceTest.php b/web/core/modules/views/tests/src/Kernel/TokenReplaceTest.php
index 5cf40ad58..4b1cfc362 100644
--- a/web/core/modules/views/tests/src/Kernel/TokenReplaceTest.php
+++ b/web/core/modules/views/tests/src/Kernel/TokenReplaceTest.php
@@ -12,14 +12,14 @@ use Drupal\views\Views;
  */
 class TokenReplaceTest extends ViewsKernelTestBase {
 
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_tokens', 'test_invalid_tokens');
+  public static $testViews = ['test_tokens', 'test_invalid_tokens'];
 
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
@@ -29,25 +29,27 @@ class TokenReplaceTest extends ViewsKernelTestBase {
   /**
    * Tests core token replacements generated from a view.
    */
-  function testTokenReplacement() {
+  public function testTokenReplacement() {
     $token_handler = \Drupal::token();
     $view = Views::getView('test_tokens');
     $view->setDisplay('page_1');
+    // Force the view to span more than one page to better test page_count.
+    $view->display_handler->getPlugin('pager')->setItemsPerPage(4);
     $this->executeView($view);
 
-    $expected = array(
+    $expected = [
       '[view:label]' => 'Test tokens',
       '[view:description]' => 'Test view to token replacement tests.',
       '[view:id]' => 'test_tokens',
       '[view:title]' => 'Test token page',
       '[view:url]' => $view->getUrl(NULL, 'page_1')->setAbsolute(TRUE)->toString(),
-      '[view:total-rows]' => (string) $view->total_rows,
+      '[view:total-rows]' => '5',
       '[view:base-table]' => 'views_test_data',
       '[view:base-field]' => 'id',
-      '[view:items-per-page]' => '10',
+      '[view:items-per-page]' => '4',
       '[view:current-page]' => '1',
-      '[view:page-count]' => '1',
-    );
+      '[view:page-count]' => '2',
+    ];
 
     $base_bubbleable_metadata = BubbleableMetadata::createFromObject($view->storage);
     $metadata_tests = [];
@@ -65,47 +67,84 @@ class TokenReplaceTest extends ViewsKernelTestBase {
 
     foreach ($expected as $token => $expected_output) {
       $bubbleable_metadata = new BubbleableMetadata();
-      $output = $token_handler->replace($token, array('view' => $view), [], $bubbleable_metadata);
-      $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', array('%token' => $token)));
+      $output = $token_handler->replace($token, ['view' => $view], [], $bubbleable_metadata);
+      $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', ['%token' => $token]));
       $this->assertEqual($bubbleable_metadata, $metadata_tests[$token]);
     }
   }
 
+  /**
+   * Tests core token replacements generated from a view.
+   */
+  public function testTokenReplacementWithMiniPager() {
+    $token_handler = \Drupal::token();
+    $view = Views::getView('test_tokens');
+    $view->setDisplay('page_3');
+    $this->executeView($view);
+
+    $this->assertSame(TRUE, $view->get_total_rows, 'The query was set to calculate the total number of rows.');
+
+    $expected = [
+      '[view:label]' => 'Test tokens',
+      '[view:description]' => 'Test view to token replacement tests.',
+      '[view:id]' => 'test_tokens',
+      '[view:title]' => 'Test token page with minipager',
+      '[view:url]' => $view->getUrl(NULL, 'page_3')
+        ->setAbsolute(TRUE)
+        ->toString(),
+      '[view:total-rows]' => '5',
+      '[view:base-table]' => 'views_test_data',
+      '[view:base-field]' => 'id',
+      '[view:items-per-page]' => '2',
+      '[view:current-page]' => '1',
+      '[view:page-count]' => '3',
+    ];
+
+    $base_bubbleable_metadata = BubbleableMetadata::createFromObject($view->storage);
+
+    foreach ($expected as $token => $expected_output) {
+      $bubbleable_metadata = new BubbleableMetadata();
+      $output = $token_handler->replace($token, ['view' => $view], [], $bubbleable_metadata);
+      $this->assertSame($expected_output, $output, sprintf('Token %s replaced correctly.', $token));
+      $this->assertEquals($base_bubbleable_metadata, $bubbleable_metadata);
+    }
+  }
+
   /**
    * Tests core token replacements generated from a view without results.
    */
-  function testTokenReplacementNoResults() {
+  public function testTokenReplacementNoResults() {
     $token_handler = \Drupal::token();
     $view = Views::getView('test_tokens');
     $view->setDisplay('page_2');
     $this->executeView($view);
 
-    $expected = array(
+    $expected = [
       '[view:page-count]' => '1',
-    );
+    ];
 
     foreach ($expected as $token => $expected_output) {
-      $output = $token_handler->replace($token, array('view' => $view));
-      $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', array('%token' => $token)));
+      $output = $token_handler->replace($token, ['view' => $view]);
+      $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', ['%token' => $token]));
     }
   }
 
   /**
    * Tests path token replacements generated from a view without a path.
    */
-  function testTokenReplacementNoPath() {
+  public function testTokenReplacementNoPath() {
     $token_handler = \Drupal::token();
     $view = Views::getView('test_invalid_tokens');
     $view->setDisplay('block_1');
     $this->executeView($view);
 
-    $expected = array(
+    $expected = [
       '[view:url]' => '',
-    );
+    ];
 
     foreach ($expected as $token => $expected_output) {
-      $output = $token_handler->replace($token, array('view' => $view));
-      $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', array('%token' => $token)));
+      $output = $token_handler->replace($token, ['view' => $view]);
+      $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', ['%token' => $token]));
     }
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/ViewExecutableTest.php b/web/core/modules/views/tests/src/Kernel/ViewExecutableTest.php
index 01057b476..f843892e5 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewExecutableTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewExecutableTest.php
@@ -38,14 +38,14 @@ class ViewExecutableTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_destroy', 'test_executable_displays');
+  public static $testViews = ['test_destroy', 'test_executable_displays'];
 
   /**
    * Properties that should be stored in the configuration.
    *
    * @var array
    */
-  protected $configProperties = array(
+  protected $configProperties = [
     'disabled',
     'name',
     'description',
@@ -54,14 +54,14 @@ class ViewExecutableTest extends ViewsKernelTestBase {
     'label',
     'core',
     'display',
-  );
+  ];
 
   /**
    * Properties that should be stored in the executable.
    *
    * @var array
    */
-  protected $executableProperties = array(
+  protected $executableProperties = [
     'storage',
     'built',
     'executed',
@@ -74,14 +74,14 @@ class ViewExecutableTest extends ViewsKernelTestBase {
     'exposed_raw_input',
     'old_view',
     'parent_views',
-  );
+  ];
 
   protected function setUpFixtures() {
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');
     $this->installEntitySchema('comment');
-    $this->installSchema('comment', array('comment_entity_statistics'));
-    $this->installConfig(array('system', 'field', 'node', 'comment'));
+    $this->installSchema('comment', ['comment_entity_statistics']);
+    $this->installConfig(['system', 'field', 'node', 'comment']);
 
     NodeType::create([
       'type' => 'page',
@@ -90,7 +90,7 @@ class ViewExecutableTest extends ViewsKernelTestBase {
     $this->addDefaultCommentField('node', 'page');
     parent::setUpFixtures();
 
-    $this->installConfig(array('filter'));
+    $this->installConfig(['filter']);
   }
 
   /**
@@ -123,7 +123,7 @@ class ViewExecutableTest extends ViewsKernelTestBase {
       if ($type == 'relationship') {
         continue;
       }
-      $this->assertTrue(count($view->$type), format_string('Make sure a %type instance got instantiated.', array('%type' => $type)));
+      $this->assertTrue(count($view->$type), format_string('Make sure a %type instance got instantiated.', ['%type' => $type]));
     }
 
     // initHandlers() should create display handlers automatically as well.
@@ -256,7 +256,7 @@ class ViewExecutableTest extends ViewsKernelTestBase {
     $this->assertTrue($view->rowPlugin instanceof Fields);
 
     // Test the newDisplay() method.
-    $view = $this->container->get('entity.manager')->getStorage('view')->create(array('id' => 'test_executable_displays'));
+    $view = $this->container->get('entity.manager')->getStorage('view')->create(['id' => 'test_executable_displays']);
     $executable = $view->getExecutable();
 
     $executable->newDisplay('page');
@@ -289,10 +289,10 @@ class ViewExecutableTest extends ViewsKernelTestBase {
     $this->assertNull($view->usePager());
 
     // Add a pager, initialize, and test.
-    $view->displayHandlers->get('default')->overrideOption('pager', array(
+    $view->displayHandlers->get('default')->overrideOption('pager', [
       'type' => 'full',
-      'options' => array('items_per_page' => 10),
-    ));
+      'options' => ['items_per_page' => 10],
+    ]);
     $view->initPager();
     $this->assertTrue($view->usePager());
 
@@ -302,10 +302,10 @@ class ViewExecutableTest extends ViewsKernelTestBase {
     $this->assertEqual($view->getOffset(), $rand);
 
     // Test the getBaseTable() method.
-    $expected = array(
+    $expected = [
       'views_test_data' => TRUE,
       '#global' => TRUE,
-    );
+    ];
     $this->assertIdentical($view->getBaseTables(), $expected);
 
     // Test response methods.
@@ -386,7 +386,7 @@ class ViewExecutableTest extends ViewsKernelTestBase {
    */
   public function testGetHandlerTypes() {
     $types = ViewExecutable::getHandlerTypes();
-    foreach (array('field', 'filter', 'argument', 'sort', 'header', 'footer', 'empty') as $type) {
+    foreach (['field', 'filter', 'argument', 'sort', 'header', 'footer', 'empty'] as $type) {
       $this->assertTrue(isset($types[$type]));
       // @todo The key on the display should be footers, headers and empties
       //   or something similar instead of the singular, but so long check for
@@ -430,7 +430,7 @@ class ViewExecutableTest extends ViewsKernelTestBase {
       $match = function($value) use ($display) {
         return strpos($value, $display->display['display_title']) !== FALSE;
       };
-      $this->assertTrue(array_filter($validate[$id], $match), format_string('Error message found for @id display', array('@id' => $id)));
+      $this->assertTrue(array_filter($validate[$id], $match), format_string('Error message found for @id display', ['@id' => $id]));
       $count++;
     }
 
diff --git a/web/core/modules/views/tests/src/Kernel/ViewStorageTest.php b/web/core/modules/views/tests/src/Kernel/ViewStorageTest.php
index fa264bd73..7cf953af7 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewStorageTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewStorageTest.php
@@ -21,7 +21,7 @@ class ViewStorageTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  protected $configProperties = array(
+  protected $configProperties = [
     'status',
     'module',
     'id',
@@ -31,7 +31,7 @@ class ViewStorageTest extends ViewsKernelTestBase {
     'label',
     'core',
     'display',
-  );
+  ];
 
   /**
    * The entity type definition.
@@ -52,12 +52,12 @@ class ViewStorageTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view_storage');
+  public static $testViews = ['test_view_storage'];
 
   /**
    * Tests CRUD operations.
    */
-  function testConfigurationEntityCRUD() {
+  public function testConfigurationEntityCRUD() {
     // Get the configuration entity type and controller.
     $this->entityType = \Drupal::entityManager()->getDefinition('view');
     $this->controller = $this->container->get('entity.manager')->getStorage('view');
@@ -85,11 +85,11 @@ class ViewStorageTest extends ViewsKernelTestBase {
     // expected properties.
     $this->assertTrue($view instanceof View, 'Single View instance loaded.');
     foreach ($this->configProperties as $property) {
-      $this->assertTrue($view->get($property) !== NULL, format_string('Property: @property loaded onto View.', array('@property' => $property)));
+      $this->assertTrue($view->get($property) !== NULL, format_string('Property: @property loaded onto View.', ['@property' => $property]));
     }
 
     // Check the displays have been loaded correctly from config display data.
-    $expected_displays = array('default', 'block_1', 'page_1');
+    $expected_displays = ['default', 'block_1', 'page_1'];
     $this->assertEqual(array_keys($view->get('display')), $expected_displays, 'The correct display names are present.');
 
     // Check each ViewDisplay object and confirm that it has the correct key and
@@ -101,7 +101,7 @@ class ViewStorageTest extends ViewsKernelTestBase {
       // exists.
       $original_options = $data['display'][$key];
       foreach ($original_options as $orig_key => $value) {
-        $this->assertIdentical($display[$orig_key], $value, format_string('@key is identical to saved data', array('@key' => $key)));
+        $this->assertIdentical($display[$orig_key], $value, format_string('@key is identical to saved data', ['@key' => $key]));
       }
     }
 
@@ -115,12 +115,12 @@ class ViewStorageTest extends ViewsKernelTestBase {
    */
   protected function createTests() {
     // Create a new View instance with empty values.
-    $created = $this->controller->create(array());
+    $created = $this->controller->create([]);
 
     $this->assertTrue($created instanceof View, 'Created object is a View.');
     // Check that the View contains all of the properties.
     foreach ($this->configProperties as $property) {
-      $this->assertTrue(property_exists($created, $property), format_string('Property: @property created on View.', array('@property' => $property)));
+      $this->assertTrue(property_exists($created, $property), format_string('Property: @property created on View.', ['@property' => $property]));
     }
 
     // Create a new View instance with config values.
@@ -137,8 +137,8 @@ class ViewStorageTest extends ViewsKernelTestBase {
 
     // Test all properties except displays.
     foreach ($properties as $property) {
-      $this->assertTrue($created->get($property) !== NULL, format_string('Property: @property created on View.', array('@property' => $property)));
-      $this->assertIdentical($values[$property], $created->get($property), format_string('Property value: @property matches configuration value.', array('@property' => $property)));
+      $this->assertTrue($created->get($property) !== NULL, format_string('Property: @property created on View.', ['@property' => $property]));
+      $this->assertIdentical($values[$property], $created->get($property), format_string('Property value: @property matches configuration value.', ['@property' => $property]));
     }
 
     // Check the UUID of the loaded View.
@@ -177,44 +177,44 @@ class ViewStorageTest extends ViewsKernelTestBase {
    * Tests the display related functions like getDisplaysList().
    */
   protected function displayMethodTests() {
-    $config['display'] = array(
-      'page_1' => array(
-        'display_options' => array('path' => 'test'),
+    $config['display'] = [
+      'page_1' => [
+        'display_options' => ['path' => 'test'],
         'display_plugin' => 'page',
         'id' => 'page_2',
         'display_title' => 'Page 1',
         'position' => 1
-      ),
-      'feed_1' => array(
-        'display_options' => array('path' => 'test.xml'),
+      ],
+      'feed_1' => [
+        'display_options' => ['path' => 'test.xml'],
         'display_plugin' => 'feed',
         'id' => 'feed',
         'display_title' => 'Feed',
         'position' => 2
-      ),
-      'page_2' => array(
-        'display_options' => array('path' => 'test/%/extra'),
+      ],
+      'page_2' => [
+        'display_options' => ['path' => 'test/%/extra'],
         'display_plugin' => 'page',
         'id' => 'page_2',
         'display_title' => 'Page 2',
         'position' => 3
-      )
-    );
+      ]
+    ];
     $view = $this->controller->create($config);
 
     // Tests Drupal\views\Entity\View::addDisplay()
-    $view = $this->controller->create(array());
+    $view = $this->controller->create([]);
     $random_title = $this->randomMachineName();
 
     $id = $view->addDisplay('page', $random_title);
-    $this->assertEqual($id, 'page_1', format_string('Make sure the first display (%id_new) has the expected ID (%id)', array('%id_new' => $id, '%id' => 'page_1')));
+    $this->assertEqual($id, 'page_1', format_string('Make sure the first display (%id_new) has the expected ID (%id)', ['%id_new' => $id, '%id' => 'page_1']));
     $display = $view->get('display');
     $this->assertEqual($display[$id]['display_title'], $random_title);
 
     $random_title = $this->randomMachineName();
     $id = $view->addDisplay('page', $random_title);
     $display = $view->get('display');
-    $this->assertEqual($id, 'page_2', format_string('Make sure the second display (%id_new) has the expected ID (%id)', array('%id_new' => $id, '%id' => 'page_2')));
+    $this->assertEqual($id, 'page_2', format_string('Make sure the second display (%id_new) has the expected ID (%id)', ['%id_new' => $id, '%id' => 'page_2']));
     $this->assertEqual($display[$id]['display_title'], $random_title);
 
     $id = $view->addDisplay('page');
@@ -233,7 +233,7 @@ class ViewStorageTest extends ViewsKernelTestBase {
     // Tests Drupal\views\Entity\View::generateDisplayId(). Since
     // generateDisplayId() is protected, we have to use reflection to unit-test
     // it.
-    $view = $this->controller->create(array());
+    $view = $this->controller->create([]);
     $ref_generate_display_id = new \ReflectionMethod($view, 'generateDisplayId');
     $ref_generate_display_id->setAccessible(TRUE);
     $this->assertEqual(
@@ -254,38 +254,38 @@ class ViewStorageTest extends ViewsKernelTestBase {
     );
 
     // Tests item related methods().
-    $view = $this->controller->create(array('base_table' => 'views_test_data'));
+    $view = $this->controller->create(['base_table' => 'views_test_data']);
     $view->addDisplay('default');
     $view = $view->getExecutable();
 
     $display_id = 'default';
-    $expected_items = array();
+    $expected_items = [];
     // Tests addHandler with getItem.
     // Therefore add one item without any options and one item with some
     // options.
     $id1 = $view->addHandler($display_id, 'field', 'views_test_data', 'id');
     $item1 = $view->getHandler($display_id, 'field', 'id');
-    $expected_items[$id1] = $expected_item = array(
+    $expected_items[$id1] = $expected_item = [
       'id' => 'id',
       'table' => 'views_test_data',
       'field' => 'id',
       'plugin_id' => 'numeric',
-    );
+    ];
     $this->assertEqual($item1, $expected_item);
 
-    $options = array(
-      'alter' => array(
+    $options = [
+      'alter' => [
         'text' => $this->randomMachineName()
-      )
-    );
+      ]
+    ];
     $id2 = $view->addHandler($display_id, 'field', 'views_test_data', 'name', $options);
     $item2 = $view->getHandler($display_id, 'field', 'name');
-    $expected_items[$id2] = $expected_item = array(
+    $expected_items[$id2] = $expected_item = [
       'id' => 'name',
       'table' => 'views_test_data',
       'field' => 'name',
       'plugin_id' => 'standard',
-    ) + $options;
+    ] + $options;
     $this->assertEqual($item2, $expected_item);
 
     // Tests the expected fields from the previous additions.
@@ -293,11 +293,11 @@ class ViewStorageTest extends ViewsKernelTestBase {
 
     // Alter an existing item via setItem and check the result via getItem
     // and getItems.
-    $item = array(
-      'alter' => array(
+    $item = [
+      'alter' => [
         'text' => $this->randomMachineName(),
-      )
-    ) + $item1;
+      ]
+    ] + $item1;
     $expected_items[$id1] = $item;
     $view->setHandler($display_id, 'field', $id1, $item);
     $this->assertEqual($view->getHandler($display_id, 'field', 'id'), $item);
@@ -327,24 +327,24 @@ class ViewStorageTest extends ViewsKernelTestBase {
 
     // Check the other properties.
     // @todo Create a reusable property on the base test class for these?
-    $config_properties = array(
+    $config_properties = [
       'disabled',
       'description',
       'tag',
       'base_table',
       'label',
       'core',
-    );
+    ];
 
     foreach ($config_properties as $property) {
-      $this->assertIdentical($view->storage->get($property), $copy->get($property), format_string('@property property is identical.', array('@property' => $property)));
+      $this->assertIdentical($view->storage->get($property), $copy->get($property), format_string('@property property is identical.', ['@property' => $property]));
     }
 
     // Check the displays are the same.
     $copy_display = $copy->get('display');
     foreach ($view->storage->get('display') as $id => $display) {
       // assertIdentical will not work here.
-      $this->assertEqual($display, $copy_display[$id], format_string('The @display display has been copied correctly.', array('@display' => $id)));
+      $this->assertEqual($display, $copy_display[$id], format_string('The @display display has been copied correctly.', ['@display' => $id]));
     }
   }
 
diff --git a/web/core/modules/views/tests/src/Kernel/ViewsHooksTest.php b/web/core/modules/views/tests/src/Kernel/ViewsHooksTest.php
index e04845433..aceda8f6e 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewsHooksTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewsHooksTest.php
@@ -19,14 +19,14 @@ class ViewsHooksTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * An array of available views hooks to test.
    *
    * @var array
    */
-  protected static $hooks = array (
+  protected static $hooks = [
     'views_data' => 'all',
     'views_data_alter' => 'alter',
     'views_query_substitutions' => 'view',
@@ -41,7 +41,7 @@ class ViewsHooksTest extends ViewsKernelTestBase {
     'views_post_render' => 'view',
     'views_query_alter'  => 'view',
     'views_invalidate_cache' => 'all',
-  );
+  ];
 
   /**
    * The module handler to use for invoking hooks.
@@ -65,28 +65,28 @@ class ViewsHooksTest extends ViewsKernelTestBase {
 
     // Test each hook is found in the implementations array and is invoked.
     foreach (static::$hooks as $hook => $type) {
-      $this->assertTrue($this->moduleHandler->implementsHook('views_test_data', $hook), format_string('The hook @hook was registered.', array('@hook' => $hook)));
+      $this->assertTrue($this->moduleHandler->implementsHook('views_test_data', $hook), format_string('The hook @hook was registered.', ['@hook' => $hook]));
 
       if ($hook == 'views_post_render') {
-        $this->moduleHandler->invoke('views_test_data', $hook, array($view, &$view->display_handler->output, $view->display_handler->getPlugin('cache')));
+        $this->moduleHandler->invoke('views_test_data', $hook, [$view, &$view->display_handler->output, $view->display_handler->getPlugin('cache')]);
         continue;
       }
 
       switch ($type) {
         case 'view':
-          $this->moduleHandler->invoke('views_test_data', $hook, array($view));
+          $this->moduleHandler->invoke('views_test_data', $hook, [$view]);
           break;
 
         case 'alter':
-          $data = array();
-          $this->moduleHandler->invoke('views_test_data', $hook, array($data));
+          $data = [];
+          $this->moduleHandler->invoke('views_test_data', $hook, [$data]);
           break;
 
         default:
           $this->moduleHandler->invoke('views_test_data', $hook);
       }
 
-      $this->assertTrue($this->container->get('state')->get('views_hook_test_' . $hook), format_string('The %hook hook was invoked.', array('%hook' => $hook)));
+      $this->assertTrue($this->container->get('state')->get('views_hook_test_' . $hook), format_string('The %hook hook was invoked.', ['%hook' => $hook]));
       // Reset the module implementations cache, so we ensure that the
       // .views.inc file is loaded actively.
       $this->moduleHandler->resetImplementations();
diff --git a/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php b/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
index 27f21c220..beb7b486d 100644
--- a/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
@@ -20,7 +20,7 @@ class WizardPluginBaseKernelTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('language', 'system', 'user', 'views_ui');
+  public static $modules = ['language', 'system', 'user', 'views_ui'];
 
   /**
    * Contains thw wizard plugin manager.
@@ -32,9 +32,9 @@ class WizardPluginBaseKernelTest extends ViewsKernelTestBase {
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
 
-    $this->installConfig(array('language'));
+    $this->installConfig(['language']);
 
-    $this->wizard = $this->container->get('plugin.manager.views.wizard')->createInstance('standard:views_test_data', array());
+    $this->wizard = $this->container->get('plugin.manager.views.wizard')->createInstance('standard:views_test_data', []);
   }
 
   /**
@@ -43,7 +43,7 @@ class WizardPluginBaseKernelTest extends ViewsKernelTestBase {
    * @see \Drupal\views\Plugin\views\wizard\WizardPluginBase
    */
   public function testCreateView() {
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $form = $this->wizard->buildForm($form, $form_state);
     $random_id = strtolower($this->randomMachineName());
diff --git a/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php b/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
index d6b2a1e79..f766975e4 100644
--- a/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
+++ b/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
@@ -9,6 +9,8 @@ use Drupal\views\Controller\ViewAjaxController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * @coversDefaultClass \Drupal\views\Controller\ViewAjaxController
@@ -113,18 +115,15 @@ class ViewAjaxControllerTest extends UnitTestCase {
 
   /**
    * Tests missing view_name and view_display_id
-   *
-   * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
    */
   public function testMissingViewName() {
     $request = new Request();
+    $this->setExpectedException(NotFoundHttpException::class);
     $this->viewAjaxController->ajaxView($request);
   }
 
   /**
    * Tests with view_name and view_display_id but not existing view.
-   *
-   * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
    */
   public function testMissingView() {
     $request = new Request();
@@ -136,13 +135,12 @@ class ViewAjaxControllerTest extends UnitTestCase {
       ->with('test_view')
       ->will($this->returnValue(FALSE));
 
+    $this->setExpectedException(NotFoundHttpException::class);
     $this->viewAjaxController->ajaxView($request);
   }
 
   /**
    * Tests a view without having access to it.
-   *
-   * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
    */
   public function testAccessDeniedView() {
     $request = new Request();
@@ -170,6 +168,7 @@ class ViewAjaxControllerTest extends UnitTestCase {
       ->with($view)
       ->will($this->returnValue($executable));
 
+    $this->setExpectedException(AccessDeniedHttpException::class);
     $this->viewAjaxController->ajaxView($request);
   }
 
@@ -228,7 +227,7 @@ class ViewAjaxControllerTest extends UnitTestCase {
     list($view, $executable) = $this->setupValidMocks();
     $executable->expects($this->once())
       ->method('preview')
-      ->with('page_1', array('arg1', 'arg2'));
+      ->with('page_1', ['arg1', 'arg2']);
 
     $response = $this->viewAjaxController->ajaxView($request);
     $this->assertTrue($response instanceof ViewAjaxResponse);
@@ -249,7 +248,7 @@ class ViewAjaxControllerTest extends UnitTestCase {
     list($view, $executable) = $this->setupValidMocks();
     $executable->expects($this->once())
       ->method('preview')
-      ->with('page_1', $this->identicalTo(array('arg1', NULL)));
+      ->with('page_1', $this->identicalTo(['arg1', NULL]));
 
     $response = $this->viewAjaxController->ajaxView($request);
     $this->assertTrue($response instanceof ViewAjaxResponse);
@@ -317,14 +316,14 @@ class ViewAjaxControllerTest extends UnitTestCase {
       ->will($this->returnValue(TRUE));
     $executable->expects($this->once())
       ->method('preview')
-      ->will($this->returnValue(array('#markup' => 'View result')));
+      ->will($this->returnValue(['#markup' => 'View result']));
 
     $this->executableFactory->expects($this->once())
       ->method('get')
       ->with($view)
       ->will($this->returnValue($executable));
 
-    return array($view, $executable);
+    return [$view, $executable];
   }
 
   /**
diff --git a/web/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/web/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
index 60ba8e577..195e3d4e9 100644
--- a/web/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
+++ b/web/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
@@ -87,8 +87,14 @@ class EntityViewsDataTest extends UnitTestCase {
 
     $typed_data_manager = $this->getMock(TypedDataManagerInterface::class);
     $typed_data_manager->expects($this->any())
-        ->method('createDataDefinition')
-        ->willReturn($this->getMock('Drupal\Core\TypedData\DataDefinitionInterface'));
+      ->method('createDataDefinition')
+      ->willReturn($this->getMock('Drupal\Core\TypedData\DataDefinitionInterface'));
+
+    $typed_data_manager->expects($this->any())
+      ->method('getDefinition')
+      ->with($this->equalTo('field_item:string_long'))
+      ->willReturn(['class' => '\Drupal\Core\Field\Plugin\Field\FieldType\StringLongItem']);
+
     $this->baseEntityType = new TestEntityType([
       'base_table' => 'entity_test',
       'id' => 'entity_test',
@@ -142,16 +148,16 @@ class EntityViewsDataTest extends UnitTestCase {
       ->setLabel('Description')
       ->setDescription('A description of the term.')
       ->setTranslatable(TRUE)
-      ->setDisplayOptions('view', array(
+      ->setDisplayOptions('view', [
           'label' => 'hidden',
           'type' => 'text_default',
           'weight' => 0,
-        ))
+        ])
       ->setDisplayConfigurable('view', TRUE)
-      ->setDisplayOptions('form', array(
+      ->setDisplayOptions('form', [
           'type' => 'text_textfield',
           'weight' => 0,
-        ))
+        ])
       ->setDisplayConfigurable('form', TRUE);
 
     // Add a URL field; this example is from the Comment entity.
@@ -1107,3 +1113,12 @@ if (!function_exists('t')) {
     return strtr($string, $args);
   }
 }
+
+
+namespace Drupal\Core\Entity;
+
+if (!function_exists('t')) {
+  function t($string, array $args = []) {
+    return strtr($string, $args);
+  }
+}
diff --git a/web/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/web/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
index f9d3add23..c89554a77 100644
--- a/web/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
+++ b/web/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
@@ -68,16 +68,16 @@ class RouteSubscriberTest extends UnitTestCase {
 
     $display_1->expects($this->once())
       ->method('collectRoutes')
-      ->will($this->returnValue(array('test_id.page_1' => 'views.test_id.page_1')));
+      ->will($this->returnValue(['test_id.page_1' => 'views.test_id.page_1']));
     $display_2->expects($this->once())
       ->method('collectRoutes')
-      ->will($this->returnValue(array('test_id.page_2' => 'views.test_id.page_2')));
+      ->will($this->returnValue(['test_id.page_2' => 'views.test_id.page_2']));
 
     $this->routeSubscriber->routes();
 
     $this->state->expects($this->once())
       ->method('set')
-      ->with('views.view_route_names', array('test_id.page_1' => 'views.test_id.page_1', 'test_id.page_2' => 'views.test_id.page_2'));
+      ->with('views.view_route_names', ['test_id.page_1' => 'views.test_id.page_1', 'test_id.page_2' => 'views.test_id.page_2']);
     $this->routeSubscriber->routeRebuildFinished();
   }
 
@@ -89,8 +89,8 @@ class RouteSubscriberTest extends UnitTestCase {
   public function testOnAlterRoutes() {
     $collection = new RouteCollection();
     // The first route will be overridden later.
-    $collection->add('test_route', new Route('test_route', array('_controller' => 'Drupal\Tests\Core\Controller\TestController')));
-    $route_2 = new Route('test_route/example', array('_controller' => 'Drupal\Tests\Core\Controller\TestController'));
+    $collection->add('test_route', new Route('test_route', ['_controller' => 'Drupal\Tests\Core\Controller\TestController']));
+    $route_2 = new Route('test_route/example', ['_controller' => 'Drupal\Tests\Core\Controller\TestController']);
     $collection->add('test_route_2', $route_2);
 
     $route_event = new RouteBuildEvent($collection, 'views');
@@ -128,7 +128,7 @@ class RouteSubscriberTest extends UnitTestCase {
 
     $this->state->expects($this->once())
       ->method('set')
-      ->with('views.view_route_names', array('test_id.page_1' => 'test_route', 'test_id.page_2' => 'views.test_id.page_2'));
+      ->with('views.view_route_names', ['test_id.page_1' => 'test_route', 'test_id.page_2' => 'views.test_id.page_2']);
 
     $collection = $route_event->getRouteCollection();
     $this->assertEquals(['test_route', 'test_route_2', 'views.test_id.page_2'], array_keys($collection->all()));
@@ -163,11 +163,11 @@ class RouteSubscriberTest extends UnitTestCase {
 
     $executable->expects($this->any())
       ->method('setDisplay')
-      ->will($this->returnValueMap(array(
-        array('page_1', TRUE),
-        array('page_2', TRUE),
-        array('page_3', FALSE),
-      )));
+      ->will($this->returnValueMap([
+        ['page_1', TRUE],
+        ['page_2', TRUE],
+        ['page_3', FALSE],
+      ]));
 
     // Ensure that only the first two displays are actually called.
     $display_1 = $this->getMock('Drupal\views\Plugin\views\display\DisplayRouterInterface');
@@ -178,18 +178,18 @@ class RouteSubscriberTest extends UnitTestCase {
       ->getMock();
     $display_collection->expects($this->any())
       ->method('get')
-      ->will($this->returnValueMap(array(
-        array('page_1', $display_1),
-        array('page_2', $display_2),
-      )));
+      ->will($this->returnValueMap([
+        ['page_1', $display_1],
+        ['page_2', $display_2],
+      ]));
     $executable->displayHandlers = $display_collection;
 
-    $this->routeSubscriber->applicableViews = array();
-    $this->routeSubscriber->applicableViews[] = array('test_id', 'page_1');
-    $this->routeSubscriber->applicableViews[] = array('test_id', 'page_2');
-    $this->routeSubscriber->applicableViews[] = array('test_id', 'page_3');
+    $this->routeSubscriber->applicableViews = [];
+    $this->routeSubscriber->applicableViews[] = ['test_id', 'page_1'];
+    $this->routeSubscriber->applicableViews[] = ['test_id', 'page_2'];
+    $this->routeSubscriber->applicableViews[] = ['test_id', 'page_3'];
 
-    return array($display_1, $display_2);
+    return [$display_1, $display_2];
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php b/web/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
index bf4b12266..cbe6adef8 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
@@ -6,11 +6,6 @@ use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\Block\ViewsBlock;
 
-// @todo Remove this once the constant got converted.
-if (!defined('BLOCK_LABEL_VISIBLE')) {
-  define('BLOCK_LABEL_VISIBLE', 'visible');
-}
-
 /**
  * @coversDefaultClass \Drupal\views\Plugin\block\ViewsBlock
  * @group views
@@ -67,7 +62,7 @@ class ViewsBlockTest extends UnitTestCase {
     $condition_plugin_manager = $this->getMock('Drupal\Core\Executable\ExecutableManagerInterface');
     $condition_plugin_manager->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $container = new ContainerBuilder();
     $container->set('plugin.manager.condition', $condition_plugin_manager);
     \Drupal::setContainer($container);
@@ -116,6 +111,11 @@ class ViewsBlockTest extends UnitTestCase {
     $this->displayHandler->expects($this->any())
       ->method('getPluginId')
       ->willReturn('block');
+
+    $this->displayHandler->expects($this->any())
+      ->method('getHandlers')
+      ->willReturn([]);
+
     $this->executable->display_handler = $this->displayHandler;
 
     $this->storage = $this->getMockBuilder('Drupal\Core\Config\Entity\ConfigEntityStorage')
@@ -136,15 +136,15 @@ class ViewsBlockTest extends UnitTestCase {
    */
   public function testBuild() {
     $output = $this->randomMachineName(100);
-    $build = array('view_build' => $output, '#view_id' => 'test_view', '#view_display_plugin_class' => '\Drupal\views\Plugin\views\display\Block', '#view_display_show_admin_links' => FALSE, '#view_display_plugin_id' => 'block', '#pre_rendered' => TRUE);
+    $build = ['view_build' => $output, '#view_id' => 'test_view', '#view_display_plugin_class' => '\Drupal\views\Plugin\views\display\Block', '#view_display_show_admin_links' => FALSE, '#view_display_plugin_id' => 'block', '#pre_rendered' => TRUE];
     $this->executable->expects($this->once())
       ->method('buildRenderable')
       ->with('block_1', [])
       ->willReturn($build);
 
     $block_id = 'views_block:test_view-block_1';
-    $config = array();
-    $definition = array();
+    $config = [];
+    $definition = [];
 
     $definition['provider'] = 'views';
     $plugin = new ViewsBlock($config, $block_id, $definition, $this->executableFactory, $this->storage, $this->account);
@@ -187,13 +187,13 @@ class ViewsBlockTest extends UnitTestCase {
       ->willReturn($output);
 
     $block_id = 'views_block:test_view-block_1';
-    $config = array();
-    $definition = array();
+    $config = [];
+    $definition = [];
 
     $definition['provider'] = 'views';
     $plugin = new ViewsBlock($config, $block_id, $definition, $this->executableFactory, $this->storage, $this->account);
 
-    $this->assertEquals(array(), $plugin->build());
+    $this->assertEquals([], $plugin->build());
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php b/web/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php
index af9a683f0..7ecf9ef04 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php
@@ -37,10 +37,10 @@ class ViewsLocalTaskTest extends UnitTestCase {
    */
   protected $viewStorage;
 
-  protected $baseDefinition = array(
+  protected $baseDefinition = [
     'class' => '\Drupal\views\Plugin\Menu\LocalTask\ViewsLocalTask',
     'deriver' => '\Drupal\views\Plugin\Derivative\ViewsLocalTask'
-  );
+  ];
 
   /**
    * The tested local task derivative class.
@@ -63,11 +63,11 @@ class ViewsLocalTaskTest extends UnitTestCase {
    * @see \Drupal\views\Plugin\Derivative\ViewsLocalTask::getDerivativeDefinitions()
    */
   public function testGetDerivativeDefinitionsWithoutHookMenuViews() {
-    $result = array();
+    $result = [];
     $this->localTaskDerivative->setApplicableMenuViews($result);
 
     $definitions = $this->localTaskDerivative->getDerivativeDefinitions($this->baseDefinition);
-    $this->assertEquals(array(), $definitions);
+    $this->assertEquals([], $definitions);
   }
 
   /**
@@ -78,13 +78,13 @@ class ViewsLocalTaskTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
     $display_plugin = $this->getMockBuilder('Drupal\views\Plugin\views\display\PathPluginBase')
-      ->setMethods(array('getOption'))
+      ->setMethods(['getOption'])
       ->disableOriginalConstructor()
       ->getMockForAbstractClass();
     $display_plugin->expects($this->once())
       ->method('getOption')
       ->with('menu')
-      ->will($this->returnValue(array('type' => 'normal')));
+      ->will($this->returnValue(['type' => 'normal']));
     $executable->display_handler = $display_plugin;
 
     $storage = $this->getMockBuilder('Drupal\views\Entity\View')
@@ -106,7 +106,7 @@ class ViewsLocalTaskTest extends UnitTestCase {
     $this->localTaskDerivative->setApplicableMenuViews($result);
 
     $definitions = $this->localTaskDerivative->getDerivativeDefinitions($this->baseDefinition);
-    $this->assertEquals(array(), $definitions);
+    $this->assertEquals([], $definitions);
   }
 
   /**
@@ -133,20 +133,20 @@ class ViewsLocalTaskTest extends UnitTestCase {
       ->willReturn($storage);
 
     $display_plugin = $this->getMockBuilder('Drupal\views\Plugin\views\display\PathPluginBase')
-      ->setMethods(array('getOption'))
+      ->setMethods(['getOption'])
       ->disableOriginalConstructor()
       ->getMockForAbstractClass();
     $display_plugin->expects($this->once())
       ->method('getOption')
       ->with('menu')
-      ->will($this->returnValue(array('type' => 'tab', 'weight' => 12, 'title' => 'Example title')));
+      ->will($this->returnValue(['type' => 'tab', 'weight' => 12, 'title' => 'Example title']));
     $executable->display_handler = $display_plugin;
 
     $result = [['example_view', 'page_1']];
     $this->localTaskDerivative->setApplicableMenuViews($result);
 
     // Mock the view route names state.
-    $view_route_names = array();
+    $view_route_names = [];
     $view_route_names['example_view.page_1'] = 'view.example_view.page_1';
     $this->state->expects($this->once())
       ->method('get')
@@ -186,20 +186,20 @@ class ViewsLocalTaskTest extends UnitTestCase {
       ->willReturn($storage);
 
     $display_plugin = $this->getMockBuilder('Drupal\views\Plugin\views\display\PathPluginBase')
-      ->setMethods(array('getOption'))
+      ->setMethods(['getOption'])
       ->disableOriginalConstructor()
       ->getMockForAbstractClass();
     $display_plugin->expects($this->once())
       ->method('getOption')
       ->with('menu')
-      ->will($this->returnValue(array('type' => 'tab', 'weight' => 12)));
+      ->will($this->returnValue(['type' => 'tab', 'weight' => 12]));
     $executable->display_handler = $display_plugin;
 
     $result = [['example_view', 'page_1']];
     $this->localTaskDerivative->setApplicableMenuViews($result);
 
     // Mock the view route names state.
-    $view_route_names = array();
+    $view_route_names = [];
     // Setup a view which overrides an existing route.
     $view_route_names['example_view.page_1'] = 'example_overridden_route';
     $this->state->expects($this->once())
@@ -235,20 +235,20 @@ class ViewsLocalTaskTest extends UnitTestCase {
       ->willReturn($storage);
 
     $display_plugin = $this->getMockBuilder('Drupal\views\Plugin\views\display\PathPluginBase')
-      ->setMethods(array('getOption'))
+      ->setMethods(['getOption'])
       ->disableOriginalConstructor()
       ->getMockForAbstractClass();
     $display_plugin->expects($this->exactly(2))
       ->method('getOption')
       ->with('menu')
-      ->will($this->returnValue(array('type' => 'default tab', 'weight' => 12, 'title' => 'Example title')));
+      ->will($this->returnValue(['type' => 'default tab', 'weight' => 12, 'title' => 'Example title']));
     $executable->display_handler = $display_plugin;
 
     $result = [['example_view', 'page_1']];
     $this->localTaskDerivative->setApplicableMenuViews($result);
 
     // Mock the view route names state.
-    $view_route_names = array();
+    $view_route_names = [];
     $view_route_names['example_view.page_1'] = 'view.example_view.page_1';
     $this->state->expects($this->exactly(2))
       ->method('get')
@@ -304,13 +304,13 @@ class ViewsLocalTaskTest extends UnitTestCase {
       ->willReturn($storage);
 
     $display_plugin = $this->getMockBuilder('Drupal\views\Plugin\views\display\PathPluginBase')
-      ->setMethods(array('getOption', 'getPath'))
+      ->setMethods(['getOption', 'getPath'])
       ->disableOriginalConstructor()
       ->getMockForAbstractClass();
     $display_plugin->expects($this->exactly(2))
       ->method('getOption')
       ->with('menu')
-      ->will($this->returnValue(array('type' => 'tab', 'weight' => 12, 'title' => 'Example title')));
+      ->will($this->returnValue(['type' => 'tab', 'weight' => 12, 'title' => 'Example title']));
     $display_plugin->expects($this->once())
       ->method('getPath')
       ->will($this->returnValue('path/example'));
@@ -320,7 +320,7 @@ class ViewsLocalTaskTest extends UnitTestCase {
     $this->localTaskDerivative->setApplicableMenuViews($result);
 
     // Mock the view route names state.
-    $view_route_names = array();
+    $view_route_names = [];
     $view_route_names['example_view.page_1'] = 'view.example_view.page_1';
     $this->state->expects($this->exactly(2))
       ->method('get')
@@ -336,11 +336,11 @@ class ViewsLocalTaskTest extends UnitTestCase {
       ->will($this->returnValue($route_collection));
 
     // Setup the existing local task of the test_route.
-    $definitions['test_route_tab'] = $other_tab = array(
+    $definitions['test_route_tab'] = $other_tab = [
       'route_name' => 'test_route',
       'title' => 'Test route',
       'base_route' => 'test_route',
-    );
+    ];
 
     $definitions += $this->localTaskDerivative->getDerivativeDefinitions($this->baseDefinition);
 
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/area/EntityTest.php b/web/core/modules/views/tests/src/Unit/Plugin/area/EntityTest.php
index 3b0aebf19..556aef91a 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/area/EntityTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/area/EntityTest.php
@@ -82,7 +82,7 @@ class EntityTest extends UnitTestCase {
       ->getMock();
     $this->executable->style_plugin = $this->stylePlugin;
 
-    $this->entityHandler = new Entity(array(), 'entity', array('entity_type' => 'entity_test'), $this->entityManager);
+    $this->entityHandler = new Entity([], 'entity', ['entity_type' => 'entity_test'], $this->entityManager);
 
     $this->display->expects($this->any())
       ->method('getPlugin')
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php b/web/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php
index 07dca650e..1c6728da3 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/area/MessagesTest.php
@@ -31,7 +31,7 @@ class MessagesTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $this->messagesHandler = new Messages(array(), 'result', array());
+    $this->messagesHandler = new Messages([], 'result', []);
   }
 
   /**
@@ -43,15 +43,15 @@ class MessagesTest extends UnitTestCase {
   public function testRender() {
     // The handler is configured to show with empty views by default, so should
     // appear.
-    $this->assertSame(array('#type' => 'status_messages'), $this->messagesHandler->render());
+    $this->assertSame(['#type' => 'status_messages'], $this->messagesHandler->render());
 
     // Turn empty off, and make sure it isn't rendered.
     $this->messagesHandler->options['empty'] = FALSE;
     // $empty parameter passed to render will still be FALSE, so should still
     // appear.
-    $this->assertSame(array('#type' => 'status_messages'), $this->messagesHandler->render());
+    $this->assertSame(['#type' => 'status_messages'], $this->messagesHandler->render());
     // Should now be empty as both the empty option and parameter are empty.
-    $this->assertSame(array(), $this->messagesHandler->render(TRUE));
+    $this->assertSame([], $this->messagesHandler->render(TRUE));
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php b/web/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php
index 164d4110a..a94b672af 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php
@@ -79,7 +79,7 @@ class ResultTest extends UnitTestCase {
   public function testResultArea($content, $expected, $items_per_page = 0) {
     $this->setupViewPager($items_per_page);
     $this->resultHandler->options['content'] = $content;
-    $this->assertEquals(array('#markup' => $expected), $this->resultHandler->render());
+    $this->assertEquals(['#markup' => $expected], $this->resultHandler->render());
   }
 
   /**
@@ -88,25 +88,25 @@ class ResultTest extends UnitTestCase {
    * @return array
    */
   public function providerTestResultArea() {
-    return array(
-      array('@label', 'ResultTest'),
-      array('@start', '1'),
-      array('@start', '1', 1),
-      array('@end', '100'),
-      array('@end', '1', 1),
-      array('@total', '100'),
-      array('@total', '100', 1),
-      array('@per_page', '0'),
-      array('@per_page', '1', 1),
-      array('@current_page', '1'),
-      array('@current_page', '1', 1),
-      array('@current_record_count', '100'),
-      array('@current_record_count', '1', 1),
-      array('@page_count', '1'),
-      array('@page_count', '100', 1),
-      array('@start | @end | @total', '1 | 100 | 100'),
-      array('@start | @end | @total', '1 | 1 | 100', 1),
-    );
+    return [
+      ['@label', 'ResultTest'],
+      ['@start', '1'],
+      ['@start', '1', 1],
+      ['@end', '100'],
+      ['@end', '1', 1],
+      ['@total', '100'],
+      ['@total', '100', 1],
+      ['@per_page', '0'],
+      ['@per_page', '1', 1],
+      ['@current_page', '1'],
+      ['@current_page', '1', 1],
+      ['@current_record_count', '100'],
+      ['@current_record_count', '1', 1],
+      ['@page_count', '1'],
+      ['@page_count', '100', 1],
+      ['@start | @end | @total', '1 | 100 | 100'],
+      ['@start | @end | @total', '1 | 1 | 100', 1],
+    ];
   }
 
   /**
@@ -127,7 +127,7 @@ class ResultTest extends UnitTestCase {
     $this->view->pager = $pager->reveal();
     $this->view->style_plugin = new \stdClass();
     $this->view->total_rows = 100;
-    $this->view->result = array(1, 2, 3, 4, 5);
+    $this->view->result = [1, 2, 3, 4, 5];
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php b/web/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
index f472ab284..91d52829c 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
@@ -31,7 +31,7 @@ class ViewTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
     $this->entityStorage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
-    $this->viewHandler = new ViewAreaPlugin(array(), 'view', array(), $this->entityStorage);
+    $this->viewHandler = new ViewAreaPlugin([], 'view', [], $this->entityStorage);
     $this->viewHandler->view = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
       ->getMock();
@@ -60,10 +60,10 @@ class ViewTest extends UnitTestCase {
 
 
     $this->viewHandler->options['view_to_insert'] = 'other:default';
-    $this->assertArrayEquals(array('config' => array('view.other')), $this->viewHandler->calculateDependencies());
+    $this->assertArrayEquals(['config' => ['view.other']], $this->viewHandler->calculateDependencies());
 
     $this->viewHandler->options['view_to_insert'] = 'this:default';
-    $this->assertArrayEquals(array(), $this->viewHandler->calculateDependencies());
+    $this->assertArrayEquals([], $this->viewHandler->calculateDependencies());
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php b/web/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
index 400169410..8bacd3dcd 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
@@ -28,7 +28,7 @@ class QueryParameterTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
 
-    $raw = new QueryParameter(array(), 'query_parameter', array());
+    $raw = new QueryParameter([], 'query_parameter', []);
     $raw->init($view, $display_plugin, $options);
     $this->assertEquals($expected, $raw->getArgument());
   }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php b/web/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
index 365e46943..62c89a9a8 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
@@ -39,34 +39,34 @@ class RawTest extends UnitTestCase {
 
     // Don't use aliases. Check against NULL and nonexistent path component
     // values in addition to valid ones.
-    $raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
-    $options = array(
+    $raw = new Raw([], 'raw', [], $alias_manager, $current_path);
+    $options = [
       'use_alias' => FALSE,
-    );
+    ];
     $raw->init($view, $display_plugin, $options);
     $this->assertEquals(NULL, $raw->getArgument());
 
-    $raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
-    $options = array(
+    $raw = new Raw([], 'raw', [], $alias_manager, $current_path);
+    $options = [
       'use_alias' => FALSE,
       'index' => 0,
-    );
+    ];
     $raw->init($view, $display_plugin, $options);
     $this->assertEquals('test', $raw->getArgument());
 
-    $raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
-    $options = array(
+    $raw = new Raw([], 'raw', [], $alias_manager, $current_path);
+    $options = [
       'use_alias' => FALSE,
       'index' => 1,
-    );
+    ];
     $raw->init($view, $display_plugin, $options);
     $this->assertEquals('example', $raw->getArgument());
 
-    $raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
-    $options = array(
+    $raw = new Raw([], 'raw', [], $alias_manager, $current_path);
+    $options = [
       'use_alias' => FALSE,
       'index' => 2,
-    );
+    ];
     $raw->init($view, $display_plugin, $options);
     $this->assertEquals(NULL, $raw->getArgument());
 
@@ -77,34 +77,34 @@ class RawTest extends UnitTestCase {
       ->with($this->equalTo('/test/example'))
       ->will($this->returnValue('/other/example'));
 
-    $raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
-    $options = array(
+    $raw = new Raw([], 'raw', [], $alias_manager, $current_path);
+    $options = [
       'use_alias' => TRUE,
-    );
+    ];
     $raw->init($view, $display_plugin, $options);
     $this->assertEquals(NULL, $raw->getArgument());
 
-    $raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
-    $options = array(
+    $raw = new Raw([], 'raw', [], $alias_manager, $current_path);
+    $options = [
       'use_alias' => TRUE,
       'index' => 0,
-    );
+    ];
     $raw->init($view, $display_plugin, $options);
     $this->assertEquals('other', $raw->getArgument());
 
-    $raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
-    $options = array(
+    $raw = new Raw([], 'raw', [], $alias_manager, $current_path);
+    $options = [
       'use_alias' => TRUE,
       'index' => 1,
-    );
+    ];
     $raw->init($view, $display_plugin, $options);
     $this->assertEquals('example', $raw->getArgument());
 
-    $raw = new Raw(array(), 'raw', array(), $alias_manager, $current_path);
-    $options = array(
+    $raw = new Raw([], 'raw', [], $alias_manager, $current_path);
+    $options = [
       'use_alias' => TRUE,
       'index' => 2,
-    );
+    ];
     $raw->init($view, $display_plugin, $options);
     $this->assertEquals(NULL, $raw->getArgument());
   }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php b/web/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php
index f9ca7d873..13a7bc952 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php
@@ -47,43 +47,43 @@ class EntityTest extends UnitTestCase {
 
     $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
 
-    $mock_entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(), '', FALSE, TRUE, TRUE, array('bundle', 'access'));
+    $mock_entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', [], '', FALSE, TRUE, TRUE, ['bundle', 'access']);
     $mock_entity->expects($this->any())
       ->method('bundle')
       ->will($this->returnValue('test_bundle'));
     $mock_entity->expects($this->any())
       ->method('access')
-      ->will($this->returnValueMap(array(
-        array('test_op', NULL, FALSE, TRUE),
-        array('test_op_2', NULL, FALSE, FALSE),
-        array('test_op_3', NULL, FALSE, TRUE),
-      )));
+      ->will($this->returnValueMap([
+        ['test_op', NULL, FALSE, TRUE],
+        ['test_op_2', NULL, FALSE, FALSE],
+        ['test_op_3', NULL, FALSE, TRUE],
+      ]));
 
-    $mock_entity_bundle_2 = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(), '', FALSE, TRUE, TRUE, array('bundle', 'access'));
+    $mock_entity_bundle_2 = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', [], '', FALSE, TRUE, TRUE, ['bundle', 'access']);
     $mock_entity_bundle_2->expects($this->any())
       ->method('bundle')
       ->will($this->returnValue('test_bundle_2'));
     $mock_entity_bundle_2->expects($this->any())
       ->method('access')
-      ->will($this->returnValueMap(array(
-        array('test_op', NULL, FALSE, FALSE),
-        array('test_op_2', NULL, FALSE, FALSE),
-        array('test_op_3', NULL, FALSE, TRUE),
-      )));
+      ->will($this->returnValueMap([
+        ['test_op', NULL, FALSE, FALSE],
+        ['test_op_2', NULL, FALSE, FALSE],
+        ['test_op_3', NULL, FALSE, TRUE],
+      ]));
 
 
     $storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
 
     // Setup values for IDs passed as strings or numbers.
-    $value_map = array(
-      array(array(), array()),
-      array(array(1), array(1 => $mock_entity)),
-      array(array('1'), array(1 => $mock_entity)),
-      array(array(1, 2), array(1 => $mock_entity, 2 => $mock_entity_bundle_2)),
-      array(array('1', '2'), array(1 => $mock_entity, 2 => $mock_entity_bundle_2)),
-      array(array(2), array(2 => $mock_entity_bundle_2)),
-      array(array('2'), array(2 => $mock_entity_bundle_2)),
-    );
+    $value_map = [
+      [[], []],
+      [[1], [1 => $mock_entity]],
+      [['1'], [1 => $mock_entity]],
+      [[1, 2], [1 => $mock_entity, 2 => $mock_entity_bundle_2]],
+      [['1', '2'], [1 => $mock_entity, 2 => $mock_entity_bundle_2]],
+      [[2], [2 => $mock_entity_bundle_2]],
+      [['2'], [2 => $mock_entity_bundle_2]],
+    ];
     $storage->expects($this->any())
       ->method('loadMultiple')
       ->will($this->returnValueMap($value_map));
@@ -100,11 +100,11 @@ class EntityTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
 
-    $definition = array(
+    $definition = [
       'entity_type' => 'entity_test',
-    );
+    ];
 
-    $this->argumentValidator = new Entity(array(), 'entity_test', $definition, $this->entityManager);
+    $this->argumentValidator = new Entity([], 'entity_test', $definition, $this->entityManager);
   }
 
   /**
@@ -113,9 +113,9 @@ class EntityTest extends UnitTestCase {
    * @see \Drupal\views\Plugin\views\argument_validator\Entity::validateArgument()
    */
   public function testValidateArgumentNoAccess() {
-    $options = array();
+    $options = [];
     $options['access'] = FALSE;
-    $options['bundles'] = array();
+    $options['bundles'] = [];
     $this->argumentValidator->init($this->executable, $this->display, $options);
 
     $this->assertFalse($this->argumentValidator->validateArgument(3));
@@ -132,9 +132,9 @@ class EntityTest extends UnitTestCase {
    * @see \Drupal\views\Plugin\views\argument_validator\Entity::validateArgument()
    */
   public function testValidateArgumentAccess() {
-    $options = array();
+    $options = [];
     $options['access'] = TRUE;
-    $options['bundles'] = array();
+    $options['bundles'] = [];
     $options['operation'] = 'test_op';
     $this->argumentValidator->init($this->executable, $this->display, $options);
 
@@ -143,9 +143,9 @@ class EntityTest extends UnitTestCase {
 
     $this->assertTrue($this->argumentValidator->validateArgument(1));
 
-    $options = array();
+    $options = [];
     $options['access'] = TRUE;
-    $options['bundles'] = array();
+    $options['bundles'] = [];
     $options['operation'] = 'test_op_2';
     $this->argumentValidator->init($this->executable, $this->display, $options);
 
@@ -160,9 +160,9 @@ class EntityTest extends UnitTestCase {
    * Tests the validate argument method with bundle checking.
    */
   public function testValidateArgumentBundle() {
-    $options = array();
+    $options = [];
     $options['access'] = FALSE;
-    $options['bundles'] = array('test_bundle' => 1);
+    $options['bundles'] = ['test_bundle' => 1];
     $this->argumentValidator->init($this->executable, $this->display, $options);
 
     $this->assertTrue($this->argumentValidator->validateArgument(1));
@@ -208,10 +208,10 @@ class EntityTest extends UnitTestCase {
       ->willReturn($storage);
 
     // Set up the argument validator.
-    $argumentValidator = new Entity(array(), 'entity_test', ['entity_type' => 'entity_test'], $entityManager);
-    $options = array();
+    $argumentValidator = new Entity([], 'entity_test', ['entity_type' => 'entity_test'], $entityManager);
+    $options = [];
     $options['access'] = FALSE;
-    $options['bundles'] = array('test_bundle' => 1);
+    $options['bundles'] = ['test_bundle' => 1];
     $argumentValidator->init($this->executable, $this->display, $options);
 
     $this->assertEquals(['config' => ['test_bundle']], $argumentValidator->calculateDependencies());
@@ -221,9 +221,9 @@ class EntityTest extends UnitTestCase {
    * Tests the validate argument method with multiple argument splitting.
    */
   public function testValidateArgumentMultiple() {
-    $options = array();
+    $options = [];
     $options['access'] = TRUE;
-    $options['bundles'] = array();
+    $options['bundles'] = [];
     $options['operation'] = 'test_op';
     $options['multiple'] = TRUE;
     $this->argumentValidator->init($this->executable, $this->display, $options);
@@ -234,9 +234,9 @@ class EntityTest extends UnitTestCase {
     $this->assertFalse($this->argumentValidator->validateArgument('1,2'));
     $this->assertFalse($this->argumentValidator->validateArgument('1+2'));
 
-    $options = array();
+    $options = [];
     $options['access'] = TRUE;
-    $options['bundles'] = array();
+    $options['bundles'] = [];
     $options['operation'] = 'test_op_3';
     $options['multiple'] = TRUE;
     $this->argumentValidator->init($this->executable, $this->display, $options);
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/display/PageTest.php b/web/core/modules/views/tests/src/Unit/Plugin/display/PageTest.php
index 55ead477d..f00918395 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/display/PageTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/display/PageTest.php
@@ -30,9 +30,9 @@ class PageTest extends UnitTestCase {
 
   /**
    * @covers ::buildBasicRenderable
-   * @expectedException \BadFunctionCallException
    */
   public function testBuildBasicRenderableWithMissingRoute() {
+    $this->setExpectedException(\BadFunctionCallException::class);
     Page::buildBasicRenderable('test_view', 'page_1', []);
   }
 
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php b/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
index 9241a3537..08ec780da 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
@@ -55,7 +55,7 @@ class PathPluginBaseTest extends UnitTestCase {
     $this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
     $this->state = $this->getMock('\Drupal\Core\State\StateInterface');
     $this->pathPlugin = $this->getMockBuilder('Drupal\views\Plugin\views\display\PathPluginBase')
-      ->setConstructorArgs(array(array(), 'path_base', array(), $this->routeProvider, $this->state))
+      ->setConstructorArgs([[], 'path_base', [], $this->routeProvider, $this->state])
       ->setMethods(NULL)
       ->getMock();
     $this->setupContainer();
@@ -71,12 +71,12 @@ class PathPluginBaseTest extends UnitTestCase {
     $container = new ContainerBuilder();
     $container->set('plugin.manager.views.access', $this->accessPluginManager);
 
-    $config = array(
-      'views.settings' => array(
+    $config = [
+      'views.settings' => [
         'skip_cache' => TRUE,
-        'display_extenders' => array(),
-      ),
-    );
+        'display_extenders' => [],
+      ],
+    ];
 
     $container->set('config.factory', $this->getConfigFactoryStub($config));
 
@@ -91,17 +91,17 @@ class PathPluginBaseTest extends UnitTestCase {
   public function testCollectRoutes() {
     list($view) = $this->setupViewExecutableAccessPlugin();
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_route',
-    );
+    ];
     $this->pathPlugin->initDisplay($view, $display);
 
     $collection = new RouteCollection();
     $result = $this->pathPlugin->collectRoutes($collection);
-    $this->assertEquals(array('test_id.page_1' => 'view.test_id.page_1'), $result);
+    $this->assertEquals(['test_id.page_1' => 'view.test_id.page_1'], $result);
 
     $route = $collection->get('view.test_id.page_1');
     $this->assertTrue($route instanceof Route);
@@ -119,14 +119,14 @@ class PathPluginBaseTest extends UnitTestCase {
   public function testCollectRoutesWithDisplayReturnResponse() {
     list($view) = $this->setupViewExecutableAccessPlugin();
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_route',
-    );
+    ];
     $this->pathPlugin = $this->getMockBuilder('Drupal\views\Plugin\views\display\PathPluginBase')
-      ->setConstructorArgs(array(array(), 'path_base', array('returns_response' => TRUE), $this->routeProvider, $this->state))
+      ->setConstructorArgs([[], 'path_base', ['returns_response' => TRUE], $this->routeProvider, $this->state])
       ->setMethods(NULL)
       ->getMock();
     $this->pathPlugin->initDisplay($view, $display);
@@ -146,23 +146,23 @@ class PathPluginBaseTest extends UnitTestCase {
   public function testCollectRoutesWithArguments() {
     list($view) = $this->setupViewExecutableAccessPlugin();
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_route/%/example',
-    );
+    ];
     $this->pathPlugin->initDisplay($view, $display);
 
     $collection = new RouteCollection();
     $result = $this->pathPlugin->collectRoutes($collection);
-    $this->assertEquals(array('test_id.page_1' => 'view.test_id.page_1'), $result);
+    $this->assertEquals(['test_id.page_1' => 'view.test_id.page_1'], $result);
 
     $route = $collection->get('view.test_id.page_1');
     $this->assertTrue($route instanceof Route);
     $this->assertEquals('test_id', $route->getDefault('view_id'));
     $this->assertEquals('page_1', $route->getDefault('display_id'));
-    $this->assertEquals(array('arg_0' => 'arg_0'), $route->getOption('_view_argument_map'));
+    $this->assertEquals(['arg_0' => 'arg_0'], $route->getOption('_view_argument_map'));
     $this->assertEquals('my views title', $route->getDefault('_title'));
   }
 
@@ -174,26 +174,26 @@ class PathPluginBaseTest extends UnitTestCase {
   public function testCollectRoutesWithArgumentsNotSpecifiedInPath() {
     list($view) = $this->setupViewExecutableAccessPlugin();
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_with_arguments',
-    );
-    $display['display_options']['arguments'] = array(
-      'test_id' => array(),
-    );
+    ];
+    $display['display_options']['arguments'] = [
+      'test_id' => [],
+    ];
     $this->pathPlugin->initDisplay($view, $display);
 
     $collection = new RouteCollection();
     $result = $this->pathPlugin->collectRoutes($collection);
-    $this->assertEquals(array('test_id.page_1' => 'view.test_id.page_1'), $result);
+    $this->assertEquals(['test_id.page_1' => 'view.test_id.page_1'], $result);
 
     $route = $collection->get('view.test_id.page_1');
     $this->assertTrue($route instanceof Route);
     $this->assertEquals('test_id', $route->getDefault('view_id'));
     $this->assertEquals('page_1', $route->getDefault('display_id'));
-    $this->assertEquals(array('arg_0' => 'arg_0'), $route->getOption('_view_argument_map'));
+    $this->assertEquals(['arg_0' => 'arg_0'], $route->getOption('_view_argument_map'));
     $this->assertEquals('my views title', $route->getDefault('_title'));
   }
 
@@ -203,18 +203,18 @@ class PathPluginBaseTest extends UnitTestCase {
   public function testCollectRoutesWithSpecialRouteName() {
     list($view) = $this->setupViewExecutableAccessPlugin();
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_route',
       'route_name' => 'test_route',
-    );
+    ];
     $this->pathPlugin->initDisplay($view, $display);
 
     $collection = new RouteCollection();
     $result = $this->pathPlugin->collectRoutes($collection);
-    $this->assertEquals(array('test_id.page_1' => 'test_route'), $result);
+    $this->assertEquals(['test_id.page_1' => 'test_route'], $result);
 
     $route = $collection->get('test_route');
     $this->assertTrue($route instanceof Route);
@@ -228,22 +228,22 @@ class PathPluginBaseTest extends UnitTestCase {
    */
   public function testAlterRoute() {
     $collection = new RouteCollection();
-    $collection->add('test_route', new Route('test_route', array('_controller' => 'Drupal\Tests\Core\Controller\TestController::content')));
-    $route_2 = new Route('test_route/example', array('_controller' => 'Drupal\Tests\Core\Controller\TestController::content'));
+    $collection->add('test_route', new Route('test_route', ['_controller' => 'Drupal\Tests\Core\Controller\TestController::content']));
+    $route_2 = new Route('test_route/example', ['_controller' => 'Drupal\Tests\Core\Controller\TestController::content']);
     $collection->add('test_route_2', $route_2);
 
     list($view) = $this->setupViewExecutableAccessPlugin();
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_route',
-    );
+    ];
     $this->pathPlugin->initDisplay($view, $display);
 
     $view_route_names = $this->pathPlugin->alterRoutes($collection);
-    $this->assertEquals(array('test_id.page_1' => 'test_route'), $view_route_names);
+    $this->assertEquals(['test_id.page_1' => 'test_route'], $view_route_names);
 
     // Ensure that the test_route is overridden.
     $route = $collection->get('test_route');
@@ -263,7 +263,7 @@ class PathPluginBaseTest extends UnitTestCase {
   /**
    * Tests the altering of a REST route.
    */
-  public function testAlterRestRoute() {
+  public function testAlterPostRestRoute() {
     $collection = new RouteCollection();
     $route = new Route('test_route', ['_controller' => 'Drupal\Tests\Core\Controller\TestController::content']);
     $route->setMethods(['POST']);
@@ -298,27 +298,66 @@ class PathPluginBaseTest extends UnitTestCase {
     $this->assertEquals('my views title', $route->getDefault('_title'));
   }
 
+  /**
+   * Tests the altering of a REST route.
+   */
+  public function testGetRestRoute() {
+    $collection = new RouteCollection();
+    $route = new Route('test_route', ['_controller' => 'Drupal\Tests\Core\Controller\TestController::content']);
+    $route->setMethods(['GET']);
+    $route->setRequirement('_format', 'json');
+    $collection->add('test_route', $route);
+
+    list($view) = $this->setupViewExecutableAccessPlugin();
+
+    $display = [];
+    $display['display_plugin'] = 'page';
+    $display['id'] = 'page_1';
+    $display['display_options'] = [
+      'path' => 'test_route',
+    ];
+    $this->pathPlugin->initDisplay($view, $display);
+
+    $this->pathPlugin->collectRoutes($collection);
+    $view_route_names = $this->pathPlugin->alterRoutes($collection);
+    $this->assertEquals([], $view_route_names);
+
+    // Ensure that the test_route is not overridden.
+    $this->assertCount(2, $collection);
+    $route = $collection->get('test_route');
+    $this->assertTrue($route instanceof Route);
+    $this->assertFalse($route->hasDefault('view_id'));
+    $this->assertFalse($route->hasDefault('display_id'));
+    $this->assertSame($collection->get('test_route'), $route);
+
+    $route = $collection->get('view.test_id.page_1');
+    $this->assertTrue($route instanceof Route);
+    $this->assertEquals('test_id', $route->getDefault('view_id'));
+    $this->assertEquals('page_1', $route->getDefault('display_id'));
+    $this->assertEquals('my views title', $route->getDefault('_title'));
+  }
+
   /**
    * Tests the alter route method with preexisting title callback.
    */
   public function testAlterRouteWithAlterCallback() {
     $collection = new RouteCollection();
-    $collection->add('test_route', new Route('test_route', array('_controller' => 'Drupal\Tests\Core\Controller\TestController::content', '_title_callback' => '\Drupal\Tests\views\Unit\Plugin\display\TestController::testTitle')));
-    $route_2 = new Route('test_route/example', array('_controller' => 'Drupal\Tests\Core\Controller\TestController::content'));
+    $collection->add('test_route', new Route('test_route', ['_controller' => 'Drupal\Tests\Core\Controller\TestController::content', '_title_callback' => '\Drupal\Tests\views\Unit\Plugin\display\TestController::testTitle']));
+    $route_2 = new Route('test_route/example', ['_controller' => 'Drupal\Tests\Core\Controller\TestController::content']);
     $collection->add('test_route_2', $route_2);
 
     list($view) = $this->setupViewExecutableAccessPlugin();
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_route',
-    );
+    ];
     $this->pathPlugin->initDisplay($view, $display);
 
     $view_route_names = $this->pathPlugin->alterRoutes($collection);
-    $this->assertEquals(array('test_id.page_1' => 'test_route'), $view_route_names);
+    $this->assertEquals(['test_id.page_1' => 'test_route'], $view_route_names);
 
     // Ensure that the test_route is overridden.
     $route = $collection->get('test_route');
@@ -345,22 +384,22 @@ class PathPluginBaseTest extends UnitTestCase {
     /** @var \Drupal\views\ViewExecutable|\PHPUnit_Framework_MockObject_MockObject $view */
     list($view) = $this->setupViewExecutableAccessPlugin();
 
-    $view->argument = array();
+    $view->argument = [];
     $view->argument['nid'] = $this->getMockBuilder('Drupal\views\Plugin\views\argument\ArgumentPluginBase')
       ->disableOriginalConstructor()
       ->getMock();
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_route/%node/example',
-    );
+    ];
     $this->pathPlugin->initDisplay($view, $display);
 
     $collection = new RouteCollection();
     $result = $this->pathPlugin->collectRoutes($collection);
-    $this->assertEquals(array('test_id.page_1' => 'view.test_id.page_1'), $result);
+    $this->assertEquals(['test_id.page_1' => 'view.test_id.page_1'], $result);
 
     $route = $collection->get('view.test_id.page_1');
     $this->assertTrue($route instanceof Route);
@@ -368,7 +407,7 @@ class PathPluginBaseTest extends UnitTestCase {
     $this->assertEquals('test_id', $route->getDefault('view_id'));
     $this->assertEquals('page_1', $route->getDefault('display_id'));
     $this->assertEquals('my views title', $route->getDefault('_title'));
-    $this->assertEquals(array('arg_0' => 'node'), $route->getOption('_view_argument_map'));
+    $this->assertEquals(['arg_0' => 'node'], $route->getOption('_view_argument_map'));
   }
 
   /**
@@ -376,7 +415,7 @@ class PathPluginBaseTest extends UnitTestCase {
    */
   public function testAlterRoutesWithParameters() {
     $collection = new RouteCollection();
-    $collection->add('test_route', new Route('test_route/{parameter}', array('_controller' => 'Drupal\Tests\Core\Controller\TestController::content')));
+    $collection->add('test_route', new Route('test_route/{parameter}', ['_controller' => 'Drupal\Tests\Core\Controller\TestController::content']));
 
     list($view) = $this->setupViewExecutableAccessPlugin();
 
@@ -386,16 +425,16 @@ class PathPluginBaseTest extends UnitTestCase {
       ->getMock();
     $view->argument['test_id'] = $argument;
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_route/%',
-    );
+    ];
     $this->pathPlugin->initDisplay($view, $display);
 
     $view_route_names = $this->pathPlugin->alterRoutes($collection);
-    $this->assertEquals(array('test_id.page_1' => 'test_route'), $view_route_names);
+    $this->assertEquals(['test_id.page_1' => 'test_route'], $view_route_names);
 
     // Ensure that the test_route is overridden.
     $route = $collection->get('test_route');
@@ -404,7 +443,7 @@ class PathPluginBaseTest extends UnitTestCase {
     $this->assertEquals('page_1', $route->getDefault('display_id'));
     // Ensure that the path did not changed and placeholders are respected.
     $this->assertEquals('/test_route/{parameter}', $route->getPath());
-    $this->assertEquals(array('arg_0' => 'parameter'), $route->getOption('_view_argument_map'));
+    $this->assertEquals(['arg_0' => 'parameter'], $route->getOption('_view_argument_map'));
     $this->assertEquals('my views title', $route->getDefault('_title'));
   }
 
@@ -423,7 +462,7 @@ class PathPluginBaseTest extends UnitTestCase {
       ->getMock();
     $view->argument['test_id'] = $argument;
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
     $display['display_options'] = [
@@ -451,24 +490,24 @@ class PathPluginBaseTest extends UnitTestCase {
    */
   public function testAlterRoutesWithOptionalParameters() {
     $collection = new RouteCollection();
-    $collection->add('test_route', new Route('test_route/{parameter}', array('_controller' => 'Drupal\Tests\Core\Controller\TestController::content')));
+    $collection->add('test_route', new Route('test_route/{parameter}', ['_controller' => 'Drupal\Tests\Core\Controller\TestController::content']));
 
     list($view) = $this->setupViewExecutableAccessPlugin();
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_route/%',
-    );
-    $display['display_options']['arguments'] = array(
-      'test_id' => array(),
-      'test_id2' => array(),
-    );
+    ];
+    $display['display_options']['arguments'] = [
+      'test_id' => [],
+      'test_id2' => [],
+    ];
     $this->pathPlugin->initDisplay($view, $display);
 
     $view_route_names = $this->pathPlugin->alterRoutes($collection);
-    $this->assertEquals(array('test_id.page_1' => 'test_route'), $view_route_names);
+    $this->assertEquals(['test_id.page_1' => 'test_route'], $view_route_names);
 
     // Ensure that the test_route is overridden.
     $route = $collection->get('test_route');
@@ -477,7 +516,7 @@ class PathPluginBaseTest extends UnitTestCase {
     $this->assertEquals('page_1', $route->getDefault('display_id'));
     // Ensure that the path did not changed and placeholders are respected.
     $this->assertEquals('/test_route/{parameter}/{arg_1}', $route->getPath());
-    $this->assertEquals(array('arg_0' => 'parameter'), $route->getOption('_view_argument_map'));
+    $this->assertEquals(['arg_0' => 'parameter'], $route->getOption('_view_argument_map'));
     $this->assertEquals('my views title', $route->getDefault('_title'));
   }
 
@@ -487,12 +526,12 @@ class PathPluginBaseTest extends UnitTestCase {
   public function testGetRouteName() {
     list($view) = $this->setupViewExecutableAccessPlugin();
 
-    $display = array();
+    $display = [];
     $display['display_plugin'] = 'page';
     $display['id'] = 'page_1';
-    $display['display_options'] = array(
+    $display['display_options'] = [
       'path' => 'test_route',
-    );
+    ];
     $this->pathPlugin->initDisplay($view, $display);
     $route_name = $this->pathPlugin->getRouteName();
     // Ensure that the expected routename is returned.
@@ -529,7 +568,7 @@ class PathPluginBaseTest extends UnitTestCase {
       ->method('createInstance')
       ->will($this->returnValue($access_plugin));
 
-    return array($view, $view_entity, $access_plugin);
+    return [$view, $view_entity, $access_plugin];
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php b/web/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
index e6afa89ab..4d67c00d8 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/field/CounterTest.php
@@ -41,7 +41,7 @@ class CounterTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $testData = array();
+  protected $testData = [];
 
   /**
    * The handler definition of the counter field.
@@ -57,12 +57,12 @@ class CounterTest extends UnitTestCase {
     parent::setUp();
 
     // Setup basic stuff like the view and the display.
-    $config = array();
-    $config['display']['default'] = array(
+    $config = [];
+    $config['display']['default'] = [
       'id' => 'default',
       'display_plugin' => 'default',
       'display_title' => 'Default',
-    );
+    ];
 
     $storage = new View($config, 'view');
     $user = $this->getMock('Drupal\Core\Session\AccountInterface');
@@ -70,7 +70,7 @@ class CounterTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
     $route_provider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
-    $this->view = $this->getMock('Drupal\views\ViewExecutable', NULL, array($storage, $user, $views_data, $route_provider));
+    $this->view = $this->getMock('Drupal\views\ViewExecutable', NULL, [$storage, $user, $views_data, $route_provider]);
 
     $this->display = $this->getMockBuilder('Drupal\views\Plugin\views\display\DisplayPluginBase')
       ->disableOriginalConstructor()
@@ -88,7 +88,7 @@ class CounterTest extends UnitTestCase {
       $this->testData[] = new ResultRow($set + ['index' => $index]);
     }
 
-    $this->definition = array('title' => 'counter field', 'plugin_type' => 'field');
+    $this->definition = ['title' => 'counter field', 'plugin_type' => 'field'];
   }
 
   /**
@@ -98,11 +98,11 @@ class CounterTest extends UnitTestCase {
    *   Returns an array of row index to test.
    */
   public function providerRowIndexes() {
-    return array(
-      array(0),
-      array(1),
-      array(2),
-    );
+    return [
+      [0],
+      [1],
+      [2],
+    ];
   }
 
   /**
@@ -111,8 +111,8 @@ class CounterTest extends UnitTestCase {
    * @dataProvider providerRowIndexes
    */
   public function testSimpleCounter($i) {
-    $counter_handler = new Counter(array(), 'counter', $this->definition);
-    $options = array();
+    $counter_handler = new Counter([], 'counter', $this->definition);
+    $options = [];
     $counter_handler->init($this->view, $this->display, $options);
 
     $this->view->row_index = $i;
@@ -135,10 +135,10 @@ class CounterTest extends UnitTestCase {
   public function testCounterRandomStart($i) {
     // Setup a counter field with a random start.
     $rand_start = rand(5, 10);
-    $counter_handler = new Counter(array(), 'counter', $this->definition);
-    $options = array(
+    $counter_handler = new Counter([], 'counter', $this->definition);
+    $options = [
       'counter_start' => $rand_start,
-    );
+    ];
     $counter_handler->init($this->view, $this->display, $options);
 
     $this->view->row_index = $i;
@@ -164,10 +164,10 @@ class CounterTest extends UnitTestCase {
     $this->pager->setOffset($offset);
 
     $rand_start = rand(5, 10);
-    $counter_handler = new Counter(array(), 'counter', $this->definition);
-    $options = array(
+    $counter_handler = new Counter([], 'counter', $this->definition);
+    $options = [
       'counter_start' => $rand_start,
-    );
+    ];
     $counter_handler->init($this->view, $this->display, $options);
 
     $this->view->row_index = $i;
@@ -197,10 +197,10 @@ class CounterTest extends UnitTestCase {
     $this->pager->setCurrentPage($current_page);
 
     $rand_start = rand(5, 10);
-    $counter_handler = new Counter(array(), 'counter', $this->definition);
-    $options = array(
+    $counter_handler = new Counter([], 'counter', $this->definition);
+    $options = [
       'counter_start' => $rand_start,
-    );
+    ];
     $counter_handler->init($this->view, $this->display, $options);
 
     $this->view->row_index = $i;
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php b/web/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php
index 90bd2ccb2..2b929f360 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php
@@ -10,12 +10,12 @@ namespace Drupal\Tests\views\Unit\Plugin\field;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Tests\UnitTestCase;
 use Drupal\Tests\views\Unit\Plugin\HandlerTestTrait;
-use Drupal\views\Plugin\views\field\Field;
+use Drupal\views\Plugin\views\field\EntityField;
 use Drupal\views\ResultRow;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * @coversDefaultClass \Drupal\views\Plugin\views\field\Field
+ * @coversDefaultClass \Drupal\views\Plugin\views\field\EntityField
  * @group views
  */
 class FieldTest extends UnitTestCase {
@@ -107,7 +107,7 @@ class FieldTest extends UnitTestCase {
       // provides it.
       'entity field' => 'title',
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
 
     $this->assertEquals('title', $handler->definition['field_name']);
   }
@@ -120,7 +120,7 @@ class FieldTest extends UnitTestCase {
       'entity_type' => 'test_entity',
       'field_name' => 'title'
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
 
     // Setup the entity manager to allow fetching the storage definitions.
     $title_storage = $this->getBaseFieldStorage();
@@ -149,7 +149,7 @@ class FieldTest extends UnitTestCase {
       'default_formatter' => 'test_example',
       'default_formatter_settings' => ['link_to_entity' => TRUE]
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
 
     // Setup the entity manager to allow fetching the storage definitions.
     $title_storage = $this->getBaseFieldStorage();
@@ -176,7 +176,7 @@ class FieldTest extends UnitTestCase {
       'field_name' => 'title',
       'default_formatter_settings' => ['link_to_entity' => TRUE]
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
 
     // Setup the entity manager to allow fetching the storage definitions.
     $title_storage = $this->getBaseFieldStorage();
@@ -202,7 +202,7 @@ class FieldTest extends UnitTestCase {
       'entity_type' => 'test_entity',
       'field_name' => 'title'
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
 
     $title_storage = $this->getBaseFieldStorage();
     $this->entityManager->expects($this->atLeastOnce())
@@ -224,7 +224,7 @@ class FieldTest extends UnitTestCase {
       'entity_type' => 'test_entity',
       'field_name' => 'body'
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
 
     $body_storage = $this->getConfigFieldStorage();
     $this->entityManager->expects($this->atLeastOnce())
@@ -250,7 +250,7 @@ class FieldTest extends UnitTestCase {
       'entity_type' => 'test_entity',
       'field_name' => 'title',
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
     $handler->view = $this->executable;
     $handler->setViewsData($this->viewsData);
 
@@ -301,7 +301,7 @@ class FieldTest extends UnitTestCase {
       'entity_type' => 'test_entity',
       'field_name' => 'title',
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
     $handler->view = $this->executable;
 
     $this->entityManager->expects($this->never())
@@ -323,7 +323,7 @@ class FieldTest extends UnitTestCase {
       'entity_type' => 'test_entity',
       'field_name' => 'title',
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
     $handler->view = $this->executable;
 
     $field_storage = $this->getBaseFieldStorage();
@@ -383,7 +383,7 @@ class FieldTest extends UnitTestCase {
       'entity_type' => 'test_entity',
       'field_name' => 'body',
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
     $handler->view = $this->executable;
 
     $field_storage = $this->getConfigFieldStorage();
@@ -438,7 +438,7 @@ class FieldTest extends UnitTestCase {
       'entity_type' => 'test_entity',
       'field_name' => 'title',
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
     $handler->view = $this->executable;
     $handler->view->field = [$handler];
 
@@ -500,7 +500,7 @@ class FieldTest extends UnitTestCase {
       'entity_type' => 'test_entity',
       'field_name' => 'body',
     ];
-    $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new EntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
     $handler->view = $this->executable;
     $handler->view->field = [$handler];
 
@@ -564,7 +564,7 @@ class FieldTest extends UnitTestCase {
       'entity_type' => 'test_entity',
       'field_name' => 'integer',
     ];
-    $handler = new FieldTestField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
+    $handler = new FieldTestEntityField([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer);
     $handler->view = $this->executable;
     $handler->view->field = [$handler];
 
@@ -688,12 +688,12 @@ class FieldTest extends UnitTestCase {
   /**
    * Setup the mock data needed to make language renderers work.
    *
-   * @param \Drupal\views\Plugin\views\field\Field $handler
+   * @param \Drupal\views\Plugin\views\field\EntityField $handler
    *   The field handler.
    * @param $definition
    *   An array with entity type definition data.
    */
-  protected function setupLanguageRenderer(Field $handler, $definition) {
+  protected function setupLanguageRenderer(EntityField $handler, $definition) {
     $display_handler = $this->getMockBuilder('\Drupal\views\Plugin\views\display\DisplayPluginBase')
       ->disableOriginalConstructor()
       ->getMock();
@@ -724,7 +724,7 @@ class FieldTest extends UnitTestCase {
 
 }
 
-class FieldTestField extends Field {
+class FieldTestEntityField extends EntityField {
 
   public function executePrepareItemsByDelta(array $all_values) {
     return $this->prepareItemsByDelta($all_values);
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php b/web/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
index f137105dd..555c8a404 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
@@ -35,10 +35,10 @@ class PagerPluginBaseTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
 
-    $options = array(
+    $options = [
       'items_per_page' => 5,
       'offset' => 1,
-    );
+    ];
 
     $this->pager->init($view, $display, $options);
 
@@ -183,20 +183,20 @@ class PagerPluginBaseTest extends UnitTestCase {
    * @see self::testHasMoreRecords
    */
   public function providerTestHasMoreRecords() {
-    return array(
+    return [
       // No items per page, so there can't be more available records.
-      array(0, 0, 0, FALSE),
-      array(0, 10, 0, FALSE),
+      [0, 0, 0, FALSE],
+      [0, 10, 0, FALSE],
       // The amount of total items equals the items per page, so there is no
       // next page available.
-      array(5, 5, 0, FALSE),
+      [5, 5, 0, FALSE],
       // There is one more item, and we are at the first page.
-      array(5, 6, 0, TRUE),
+      [5, 6, 0, TRUE],
       // Now we are on the second page, which has just a single one left.
-      array(5, 6, 1, FALSE),
+      [5, 6, 1, FALSE],
       // Increase the total items, so we have some available on the third page.
-      array(5, 12, 1, TRUE)
-    );
+      [5, 12, 1, TRUE]
+    ];
   }
 
   /**
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php b/web/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php
index a3e86a1f6..21af7bf3a 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php
@@ -39,7 +39,7 @@ class BlockTest extends UnitTestCase {
 
     $this->executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
-      ->setMethods(array('executeDisplay', 'setDisplay', 'setItemsPerPage'))
+      ->setMethods(['executeDisplay', 'setDisplay', 'setItemsPerPage'])
       ->getMock();
     $this->executable->expects($this->any())
       ->method('setDisplay')
@@ -67,7 +67,7 @@ class BlockTest extends UnitTestCase {
 
     $this->blockPlugin->expects($this->once())
       ->method('getConfiguration')
-      ->will($this->returnValue(array('items_per_page' => 'none')));
+      ->will($this->returnValue(['items_per_page' => 'none']));
 
     $this->blockDisplay->preBlockBuild($this->blockPlugin);
   }
@@ -82,7 +82,7 @@ class BlockTest extends UnitTestCase {
 
     $this->blockPlugin->expects($this->once())
       ->method('getConfiguration')
-      ->will($this->returnValue(array('items_per_page' => 5)));
+      ->will($this->returnValue(['items_per_page' => 5]));
 
     $this->blockDisplay->preBlockBuild($this->blockPlugin);
   }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php b/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
index 5457baa63..0900df692 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
@@ -42,11 +42,11 @@ class EntityOperationsUnitTest extends UnitTestCase {
     $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
     $this->languageManager = $this->getMock('\Drupal\Core\Language\LanguageManagerInterface');
 
-    $configuration = array();
+    $configuration = [];
     $plugin_id = $this->randomMachineName();
-    $plugin_definition = array(
+    $plugin_definition = [
       'title' => $this->randomMachineName(),
-    );
+    ];
     $this->plugin = new EntityOperations($configuration, $plugin_id, $plugin_definition, $this->entityManager, $this->languageManager);
 
     $redirect_service = $this->getMock('Drupal\Core\Routing\RedirectDestinationInterface');
@@ -93,11 +93,11 @@ class EntityOperationsUnitTest extends UnitTestCase {
       ->method('getEntityTypeId')
       ->will($this->returnValue($entity_type_id));
 
-    $operations = array(
-      'foo' => array(
+    $operations = [
+      'foo' => [
         'title' => $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
     $list_builder = $this->getMock('\Drupal\Core\Entity\EntityListBuilderInterface');
     $list_builder->expects($this->once())
       ->method('getOperations')
@@ -114,10 +114,10 @@ class EntityOperationsUnitTest extends UnitTestCase {
     $result = new ResultRow();
     $result->_entity = $entity;
 
-    $expected_build = array(
+    $expected_build = [
       '#type' => 'operations',
       '#links' => $operations
-    );
+    ];
     $expected_build['#links']['foo']['query'] = ['destination' => 'foobar'];
     $build = $this->plugin->render($result);
     $this->assertSame($expected_build, $build);
@@ -135,11 +135,11 @@ class EntityOperationsUnitTest extends UnitTestCase {
       ->method('getEntityTypeId')
       ->will($this->returnValue($entity_type_id));
 
-    $operations = array(
-      'foo' => array(
+    $operations = [
+      'foo' => [
         'title' => $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
     $list_builder = $this->getMock('\Drupal\Core\Entity\EntityListBuilderInterface');
     $list_builder->expects($this->once())
       ->method('getOperations')
@@ -156,10 +156,10 @@ class EntityOperationsUnitTest extends UnitTestCase {
     $result = new ResultRow();
     $result->_entity = $entity;
 
-    $expected_build = array(
+    $expected_build = [
       '#type' => 'operations',
       '#links' => $operations
-    );
+    ];
     $build = $this->plugin->render($result);
     $this->assertSame($expected_build, $build);
   }
diff --git a/web/core/modules/views/tests/src/Unit/PluginBaseTest.php b/web/core/modules/views/tests/src/Unit/PluginBaseTest.php
index ef19e1168..718cf44e3 100644
--- a/web/core/modules/views/tests/src/Unit/PluginBaseTest.php
+++ b/web/core/modules/views/tests/src/Unit/PluginBaseTest.php
@@ -24,7 +24,7 @@ class PluginBaseTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $this->testHelperPlugin = new TestHelperPlugin(array(), 'default', array());
+    $this->testHelperPlugin = new TestHelperPlugin([], 'default', []);
   }
 
   /**
@@ -73,148 +73,148 @@ class PluginBaseTest extends UnitTestCase {
    * @return array
    */
   public function providerTestUnpackOptions() {
-    $test_parameters = array();
+    $test_parameters = [];
     // Set a storage but no value, so the storage value should be kept.
-    $test_parameters[] = array(
-      'storage' => array(
+    $test_parameters[] = [
+      'storage' => [
         'key' => 'value',
-      ),
-      'options' => array(
-      ),
-      'definition' => array(
-        'key' => array('default' => 'value2'),
-      ),
-      'expected' => array(
+      ],
+      'options' => [
+      ],
+      'definition' => [
+        'key' => ['default' => 'value2'],
+      ],
+      'expected' => [
         'key' => 'value',
-      ),
-    );
+      ],
+    ];
     // Set a storage and a option value, so the option value should be kept.
-    $test_parameters[] = array(
-      'storage' => array(
+    $test_parameters[] = [
+      'storage' => [
         'key' => 'value',
-      ),
-      'options' => array(
+      ],
+      'options' => [
         'key' => 'value2',
-      ),
-      'definition' => array(
-        'key' => array('default' => 'value3'),
-      ),
-      'expected' => array(
+      ],
+      'definition' => [
+        'key' => ['default' => 'value3'],
+      ],
+      'expected' => [
         'key' => 'value2',
-      ),
+      ],
       ''
-    );
+    ];
     // Set no storage but an options value, so the options value should be kept.
-    $test_parameters[] = array(
-      'storage' => array(),
-      'options' => array(
+    $test_parameters[] = [
+      'storage' => [],
+      'options' => [
         'key' => 'value',
-      ),
-      'definition' => array(
-        'key' => array('default' => 'value2'),
-      ),
-      'expected' => array(
+      ],
+      'definition' => [
+        'key' => ['default' => 'value2'],
+      ],
+      'expected' => [
         'key' => 'value',
-      ),
-    );
+      ],
+    ];
     // Set additional options, which aren't part of the definition, so they
     // should be ignored if all is set.
-    $test_parameters[] = array(
-      'storage' => array(),
-      'options' => array(
+    $test_parameters[] = [
+      'storage' => [],
+      'options' => [
         'key' => 'value',
         'key2' => 'value2',
-      ),
-      'definition' => array(
-        'key' => array('default' => 'value2'),
-      ),
-      'expected' => array(
+      ],
+      'definition' => [
+        'key' => ['default' => 'value2'],
+      ],
+      'expected' => [
         'key' => 'value',
-      ),
-    );
-    $test_parameters[] = array(
-      'storage' => array(),
-      'options' => array(
+      ],
+    ];
+    $test_parameters[] = [
+      'storage' => [],
+      'options' => [
         'key' => 'value',
         'key2' => 'value2',
-      ),
-      'definition' => array(
-        'key' => array('default' => 'value2'),
-      ),
-      'expected' => array(
+      ],
+      'definition' => [
+        'key' => ['default' => 'value2'],
+      ],
+      'expected' => [
         'key' => 'value',
         'key2' => 'value2',
-      ),
+      ],
       'all' => TRUE,
-    );
+    ];
     // Provide multiple options with their corresponding definition.
-    $test_parameters[] = array(
-      'storage' => array(),
-      'options' => array(
+    $test_parameters[] = [
+      'storage' => [],
+      'options' => [
         'key' => 'value',
         'key2' => 'value2',
-      ),
-      'definition' => array(
-        'key' => array('default' => 'value2'),
-        'key2' => array('default' => 'value3'),
-      ),
-      'expected' => array(
+      ],
+      'definition' => [
+        'key' => ['default' => 'value2'],
+        'key2' => ['default' => 'value3'],
+      ],
+      'expected' => [
         'key' => 'value',
         'key2' => 'value2',
-      ),
-    );
+      ],
+    ];
     // Set a complex definition structure with a zero and a one level structure.
-    $test_parameters[] = array(
-      'storage' => array(),
-      'options' => array(
+    $test_parameters[] = [
+      'storage' => [],
+      'options' => [
         'key0' => 'value',
-        'key1' => array('key1:1' => 'value1', 'key1:2' => 'value2'),
-      ),
-      'definition' => array(
-        'key0' => array('default' => 'value0'),
-        'key1' => array('contains' => array(
-          'key1:1' => array('default' => 'value1:1'),
-        )),
-      ),
-      'expected' => array(
+        'key1' => ['key1:1' => 'value1', 'key1:2' => 'value2'],
+      ],
+      'definition' => [
+        'key0' => ['default' => 'value0'],
+        'key1' => ['contains' => [
+          'key1:1' => ['default' => 'value1:1'],
+        ]],
+      ],
+      'expected' => [
         'key0' => 'value',
-        'key1' => array('key1:1' => 'value1'),
-      ),
-    );
+        'key1' => ['key1:1' => 'value1'],
+      ],
+    ];
     // Setup a two level structure.
-    $test_parameters[] = array(
-      'storage' => array(),
-      'options' => array(
-        'key2' => array(
-          'key2:1' => array(
+    $test_parameters[] = [
+      'storage' => [],
+      'options' => [
+        'key2' => [
+          'key2:1' => [
             'key2:1:1' => 'value0',
-            'key2:1:2' => array(
+            'key2:1:2' => [
               'key2:1:2:1' => 'value1',
-            ),
-          ),
-        ),
-      ),
-      'definition' => array(
-        'key2' => array('contains' => array(
-          'key2:1' => array('contains' => array(
-            'key2:1:1' => array('default' => 'value2:1:2:1'),
-            'key2:1:2' => array('contains' => array(
-              'key2:1:2:1' => array('default' => 'value2:1:2:1'),
-            )),
-          )),
-        )),
-      ),
-      'expected' => array(
-        'key2' => array(
-          'key2:1' => array(
+            ],
+          ],
+        ],
+      ],
+      'definition' => [
+        'key2' => ['contains' => [
+          'key2:1' => ['contains' => [
+            'key2:1:1' => ['default' => 'value2:1:2:1'],
+            'key2:1:2' => ['contains' => [
+              'key2:1:2:1' => ['default' => 'value2:1:2:1'],
+            ]],
+          ]],
+        ]],
+      ],
+      'expected' => [
+        'key2' => [
+          'key2:1' => [
             'key2:1:1' => 'value0',
-            'key2:1:2' => array(
+            'key2:1:2' => [
               'key2:1:2:1' => 'value1',
-            ),
-          ),
-        ),
-      ),
-    );
+            ],
+          ],
+        ],
+      ],
+    ];
 
     return $test_parameters;
   }
@@ -225,55 +225,55 @@ class PluginBaseTest extends UnitTestCase {
    * @return array
    */
   public function providerTestSetOptionDefault() {
-    $test_parameters = array();
+    $test_parameters = [];
     // No definition should change anything on the storage.
-    $test_parameters[] = array(
-      'storage' => array(),
-      'definition' => array(),
-      'expected' => array(),
-    );
+    $test_parameters[] = [
+      'storage' => [],
+      'definition' => [],
+      'expected' => [],
+    ];
     // Set a single definition, which should be picked up.
-    $test_parameters[] = array(
-      'storage' => array(),
-      'definition' => array(
-        'key' => array('default' => 'value'),
-      ),
-      'expected' => array(
+    $test_parameters[] = [
+      'storage' => [],
+      'definition' => [
+        'key' => ['default' => 'value'],
+      ],
+      'expected' => [
         'key' => 'value',
-      ),
-    );
+      ],
+    ];
     // Set multiple keys, all should be picked up.
-    $test_parameters[] = array(
-      'storage' => array(),
-      'definition' => array(
-        'key' => array('default' => 'value'),
-        'key2' => array('default' => 'value2'),
-        'key3' => array('default' => 'value3'),
-      ),
-      'expected' => array(
+    $test_parameters[] = [
+      'storage' => [],
+      'definition' => [
+        'key' => ['default' => 'value'],
+        'key2' => ['default' => 'value2'],
+        'key3' => ['default' => 'value3'],
+      ],
+      'expected' => [
         'key' => 'value',
         'key2' => 'value2',
         'key3' => 'value3',
-      ),
-    );
+      ],
+    ];
     // Setup a definition with multiple levels.
-    $test_parameters[] = array(
-      'storage' => array(),
-      'definition' => array(
-        'key' => array('default' => 'value'),
-        'key2' => array('contains' => array(
-          'key2:1' => array('default' => 'value2:1'),
-          'key2:2' => array('default' => 'value2:2'),
-        )),
-      ),
-      'expected' => array(
+    $test_parameters[] = [
+      'storage' => [],
+      'definition' => [
+        'key' => ['default' => 'value'],
+        'key2' => ['contains' => [
+          'key2:1' => ['default' => 'value2:1'],
+          'key2:2' => ['default' => 'value2:2'],
+        ]],
+      ],
+      'expected' => [
         'key' => 'value',
-        'key2' => array(
+        'key2' => [
           'key2:1' => 'value2:1',
           'key2:2' => 'value2:2',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     return $test_parameters;
   }
diff --git a/web/core/modules/views/tests/src/Unit/PluginTypeListTest.php b/web/core/modules/views/tests/src/Unit/PluginTypeListTest.php
index 32b46d51a..29da6b3af 100644
--- a/web/core/modules/views/tests/src/Unit/PluginTypeListTest.php
+++ b/web/core/modules/views/tests/src/Unit/PluginTypeListTest.php
@@ -16,7 +16,7 @@ class PluginTypeListTest extends UnitTestCase {
    * Tests the plugins list is correct.
    */
   public function testPluginList() {
-    $plugin_list = array(
+    $plugin_list = [
       'access',
       'area',
       'argument',
@@ -36,7 +36,7 @@ class PluginTypeListTest extends UnitTestCase {
       'sort',
       'style',
       'wizard',
-    );
+    ];
 
     $diff = array_diff($plugin_list, ViewExecutable::getPluginTypes());
     $this->assertTrue(empty($diff), 'The plugin list is correct');
diff --git a/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php b/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
index 971c1c499..9242545b7 100644
--- a/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
+++ b/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
@@ -148,7 +148,7 @@ class ViewPageControllerTest extends UnitTestCase {
     $request->attributes->set('display_id', 'page_1');
     // Add the argument to the request.
     $request->attributes->set('test_entity', $this->getMock('Drupal\Core\Entity\EntityInterface'));
-    $raw_variables = new ParameterBag(array('test_entity' => 'example_id'));
+    $raw_variables = new ParameterBag(['test_entity' => 'example_id']);
     $request->attributes->set('_raw_variables', $raw_variables);
     $options = [
       '_view_argument_map' => [
diff --git a/web/core/modules/views/tests/src/Unit/ViewExecutableTest.php b/web/core/modules/views/tests/src/Unit/ViewExecutableTest.php
index fe64ec278..f30a19de6 100644
--- a/web/core/modules/views/tests/src/Unit/ViewExecutableTest.php
+++ b/web/core/modules/views/tests/src/Unit/ViewExecutableTest.php
@@ -182,8 +182,6 @@ class ViewExecutableTest extends UnitTestCase {
   }
 
   /**
-   * @expectedException \InvalidArgumentException
-   *
    * @covers ::getUrl
    */
   public function testGetUrlWithoutRouterDisplay() {
@@ -193,6 +191,7 @@ class ViewExecutableTest extends UnitTestCase {
       ->willReturn($this->displayHandler);
     $this->executable->display_handler = $this->displayHandler;
 
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->executable->getUrl();
   }
 
@@ -476,7 +475,7 @@ class ViewExecutableTest extends UnitTestCase {
    *   Returns the view executable and default display.
    */
   protected function setupBaseViewAndDisplay() {
-    $config = array(
+    $config = [
       'id' => 'test_view',
       'tag' => 'OnE, TWO, and three',
       'display' => [
@@ -486,7 +485,7 @@ class ViewExecutableTest extends UnitTestCase {
           'display_title' => 'Default',
         ],
       ],
-    );
+    ];
 
     $storage = new View($config, 'view');
     $view = new ViewExecutable($storage, $this->user, $this->viewsData, $this->routeProvider);
@@ -516,7 +515,7 @@ class ViewExecutableTest extends UnitTestCase {
       $view->$type = [];
     }
 
-    return array($view, $display);
+    return [$view, $display];
   }
 
   /**
diff --git a/web/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php b/web/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
index 97153f5ce..2289f236e 100644
--- a/web/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
+++ b/web/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
@@ -30,7 +30,7 @@ class ViewsDataHelperTest extends UnitTestCase {
     $data['views_test_data']['age']['area']['id'] = 'text';
     $data['views_test_data']['age']['area']['sub_type'] = 'header';
     $data['views_test_data']['job']['area']['id'] = 'text';
-    $data['views_test_data']['job']['area']['sub_type'] = array('header', 'footer');
+    $data['views_test_data']['job']['area']['sub_type'] = ['header', 'footer'];
 
     return $data;
   }
@@ -48,52 +48,52 @@ class ViewsDataHelperTest extends UnitTestCase {
 
     $data_helper = new ViewsDataHelper($views_data);
 
-    $expected = array(
-      'field' => array(
+    $expected = [
+      'field' => [
         'age',
         'created',
         'job',
         'name',
         'status',
-      ),
-      'argument' => array(
+      ],
+      'argument' => [
         'age',
         'created',
         'id',
         'job',
-      ),
-      'filter' => array(
+      ],
+      'filter' => [
         'created',
         'id',
         'job',
         'name',
         'status',
-      ),
-      'sort' => array(
+      ],
+      'sort' => [
         'age',
         'created',
         'id',
         'name',
         'status',
-      ),
-      'area' => array(
+      ],
+      'area' => [
         'age',
         'created',
         'job',
-      ),
-      'header' => array(
+      ],
+      'header' => [
         'age',
         'created',
         'job',
-      ),
-      'footer' => array(
+      ],
+      'footer' => [
         'age',
         'created',
         'job',
-      ),
-    );
+      ],
+    ];
 
-    $handler_types = array('field', 'argument', 'filter', 'sort', 'area');
+    $handler_types = ['field', 'argument', 'filter', 'sort', 'area'];
     foreach ($handler_types as $handler_type) {
       $fields = $data_helper->fetchFields('views_test_data', $handler_type);
       $expected_keys = $expected[$handler_type];
@@ -104,7 +104,7 @@ class ViewsDataHelperTest extends UnitTestCase {
     }
 
     // Check for subtype filtering, so header and footer.
-    foreach (array('header', 'footer') as $sub_type) {
+    foreach (['header', 'footer'] as $sub_type) {
       $fields = $data_helper->fetchFields('views_test_data', 'area', FALSE, $sub_type);
 
       $expected_keys = $expected[$sub_type];
diff --git a/web/core/modules/views/tests/src/Unit/ViewsDataTest.php b/web/core/modules/views/tests/src/Unit/ViewsDataTest.php
index 235189213..a145538a6 100644
--- a/web/core/modules/views/tests/src/Unit/ViewsDataTest.php
+++ b/web/core/modules/views/tests/src/Unit/ViewsDataTest.php
@@ -63,14 +63,14 @@ class ViewsDataTest extends UnitTestCase {
     $this->cacheBackend = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
     $this->getContainerWithCacheTagsInvalidator($this->cacheTagsInvalidator);
 
-    $configs = array();
+    $configs = [];
     $configs['views.settings']['skip_cache'] = FALSE;
     $this->configFactory = $this->getConfigFactoryStub($configs);
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $this->languageManager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue(new Language(array('id' => 'en'))));
+      ->will($this->returnValue(new Language(['id' => 'en'])));
 
     $this->viewsData = new ViewsData($this->cacheBackend, $this->configFactory, $this->moduleHandler, $this->languageManager);
   }
@@ -90,7 +90,7 @@ class ViewsDataTest extends UnitTestCase {
     $data['views_test_data']['age']['area']['id'] = 'text';
     $data['views_test_data']['age']['area']['sub_type'] = 'header';
     $data['views_test_data']['job']['area']['id'] = 'text';
-    $data['views_test_data']['job']['area']['sub_type'] = array('header', 'footer');
+    $data['views_test_data']['job']['area']['sub_type'] = ['header', 'footer'];
 
     // Duplicate the example views test data for different weight, different title,
     // and matching data.
@@ -136,7 +136,7 @@ class ViewsDataTest extends UnitTestCase {
     $this->moduleHandler->expects($this->at(0))
       ->method('getImplementations')
       ->with('views_data')
-      ->willReturn(array('views_test_data'));
+      ->willReturn(['views_test_data']);
     $this->moduleHandler->expects($this->at(1))
       ->method('invoke')
       ->with('views_test_data', 'views_data')
@@ -167,11 +167,11 @@ class ViewsDataTest extends UnitTestCase {
     }
 
     // Test the values returned for each base table.
-    $defaults = array(
+    $defaults = [
       'title' => '',
       'help' => '',
       'weight' => 0,
-    );
+    ];
     foreach ($base_tables as $base_table => $info) {
       // Merge in default values as in fetchBaseTables().
       $expected = $data[$base_table]['table']['base'] += $defaults;
@@ -215,7 +215,7 @@ class ViewsDataTest extends UnitTestCase {
     $this->moduleHandler->expects($this->at(0))
       ->method('getImplementations')
       ->with('views_data')
-      ->willReturn(array('views_test_data'));
+      ->willReturn(['views_test_data']);
     $this->moduleHandler->expects($this->at(1))
       ->method('invoke')
       ->with('views_test_data', 'views_data')
@@ -227,7 +227,7 @@ class ViewsDataTest extends UnitTestCase {
     $this->moduleHandler->expects($this->at(3))
       ->method('getImplementations')
       ->with('views_data')
-      ->willReturn(array('views_test_data'));
+      ->willReturn(['views_test_data']);
     $this->moduleHandler->expects($this->at(4))
       ->method('invoke')
       ->with('views_test_data', 'views_data')
@@ -252,7 +252,7 @@ class ViewsDataTest extends UnitTestCase {
       ->will($this->returnValue(FALSE));
     $this->cacheBackend->expects($this->at(3))
       ->method('set')
-      ->with("views_data:$random_table_name:en", array());
+      ->with("views_data:$random_table_name:en", []);
     $this->cacheTagsInvalidator->expects($this->once())
       ->method('invalidateTags')
       ->with(['views_data']);
@@ -269,7 +269,7 @@ class ViewsDataTest extends UnitTestCase {
       ->will($this->returnValue(FALSE));
     $this->cacheBackend->expects($this->at(7))
       ->method('set')
-      ->with("views_data:$random_table_name:en", array());
+      ->with("views_data:$random_table_name:en", []);
 
     $views_data = $this->viewsData->getAll();
     $this->assertSame($expected_views_data, $views_data);
@@ -283,7 +283,7 @@ class ViewsDataTest extends UnitTestCase {
     $this->assertSame($expected_views_data[$table_name_2], $views_data);
 
     $views_data = $this->viewsData->get($random_table_name);
-    $this->assertSame(array(), $views_data);
+    $this->assertSame([], $views_data);
 
     $this->viewsData->clear();
 
@@ -379,11 +379,11 @@ class ViewsDataTest extends UnitTestCase {
 
     // All views data should be requested on the first try.
     $views_data = $this->viewsData->get($random_table_name);
-    $this->assertSame(array(), $views_data, 'Make sure fetching views data for an invalid table returns an empty array.');
+    $this->assertSame([], $views_data, 'Make sure fetching views data for an invalid table returns an empty array.');
 
     // Test no data is rebuilt when requesting an invalid table again.
     $views_data = $this->viewsData->get($random_table_name);
-    $this->assertSame(array(), $views_data, 'Make sure fetching views data for an invalid table returns an empty array.');
+    $this->assertSame([], $views_data, 'Make sure fetching views data for an invalid table returns an empty array.');
   }
 
   /**
@@ -433,7 +433,7 @@ class ViewsDataTest extends UnitTestCase {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with('views_data:views_test_data:en')
-      ->will($this->returnValue((object) array('data' => $expected_views_data['views_test_data'])));
+      ->will($this->returnValue((object) ['data' => $expected_views_data['views_test_data']]));
     $this->cacheBackend->expects($this->never())
       ->method('set');
 
@@ -466,7 +466,7 @@ class ViewsDataTest extends UnitTestCase {
     $this->cacheBackend->expects($this->at(1))
       ->method('get')
       ->with('views_data:en')
-      ->will($this->returnValue((object) array('data' => $expected_views_data)));
+      ->will($this->returnValue((object) ['data' => $expected_views_data]));
     $this->cacheBackend->expects($this->at(2))
       ->method('set')
       ->with('views_data:views_test_data_2:en', $expected_views_data['views_test_data_2']);
@@ -502,10 +502,10 @@ class ViewsDataTest extends UnitTestCase {
     $this->cacheBackend->expects($this->at(1))
       ->method('get')
       ->with('views_data:en')
-      ->will($this->returnValue((object) array('data' => $expected_views_data)));
+      ->will($this->returnValue((object) ['data' => $expected_views_data]));
     $this->cacheBackend->expects($this->at(2))
       ->method('set')
-      ->with("views_data:$non_existing_table:en", array());
+      ->with("views_data:$non_existing_table:en", []);
 
     // Initialize the views data cache and request a non-existing table. This
     // will result in the same cache requests as we explicitly write an empty
@@ -514,7 +514,7 @@ class ViewsDataTest extends UnitTestCase {
     // check if the table does exist or not.
     for ($i = 0; $i < 5; $i++) {
       $views_data = $this->viewsData->get($non_existing_table);
-      $this->assertSame(array(), $views_data);
+      $this->assertSame([], $views_data);
     }
   }
 
@@ -535,7 +535,7 @@ class ViewsDataTest extends UnitTestCase {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with("views_data:$non_existing_table:en")
-      ->will($this->returnValue((object) array('data' => array())));
+      ->will($this->returnValue((object) ['data' => []]));
     $this->cacheBackend->expects($this->never())
       ->method('set');
 
@@ -546,7 +546,7 @@ class ViewsDataTest extends UnitTestCase {
     // check if the table does exist or not.
     for ($i = 0; $i < 5; $i++) {
       $views_data = $this->viewsData->get($non_existing_table);
-      $this->assertSame(array(), $views_data);
+      $this->assertSame([], $views_data);
     }
   }
 
@@ -588,7 +588,7 @@ class ViewsDataTest extends UnitTestCase {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with("views_data:en")
-      ->will($this->returnValue((object) array('data' => $expected_views_data)));
+      ->will($this->returnValue((object) ['data' => $expected_views_data]));
     $this->cacheBackend->expects($this->never())
       ->method('set');
 
@@ -618,7 +618,7 @@ class ViewsDataTest extends UnitTestCase {
     $this->cacheBackend->expects($this->at(1))
       ->method('get')
       ->with('views_data:en')
-      ->will($this->returnValue((object) array('data' => $expected_views_data)));
+      ->will($this->returnValue((object) ['data' => $expected_views_data]));
     $this->cacheBackend->expects($this->at(2))
       ->method('set')
       ->with("views_data:$table_name:en", $expected_views_data[$table_name]);
diff --git a/web/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php b/web/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php
index efbbe49e6..c181b9435 100644
--- a/web/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php
+++ b/web/core/modules/views/tests/src/Unit/ViewsHandlerManagerTest.php
@@ -48,7 +48,7 @@ class ViewsHandlerManagerTest extends UnitTestCase {
       ->getMock();
     $cache_backend = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
-    $this->handlerManager = new ViewsHandlerManager('test', new \ArrayObject(array()), $this->viewsData, $cache_backend, $this->moduleHandler);
+    $this->handlerManager = new ViewsHandlerManager('test', new \ArrayObject([]), $this->viewsData, $cache_backend, $this->moduleHandler);
   }
 
   /**
@@ -72,7 +72,7 @@ class ViewsHandlerManagerTest extends UnitTestCase {
   public function testAlterHookInvocation() {
     $this->moduleHandler->expects($this->once())
       ->method('alter')
-      ->with('views_plugins_test', array());
+      ->with('views_plugins_test', []);
 
     $this->handlerManager->getDefinitions();
   }
diff --git a/web/core/modules/views/tests/src/Unit/ViewsTest.php b/web/core/modules/views/tests/src/Unit/ViewsTest.php
index 4924154c8..00476c50d 100644
--- a/web/core/modules/views/tests/src/Unit/ViewsTest.php
+++ b/web/core/modules/views/tests/src/Unit/ViewsTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\views\Unit;
 
-use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Views;
 use Drupal\views\Entity\View;
@@ -154,12 +154,12 @@ class ViewsTest extends UnitTestCase {
       ->with(['test_view_1', 'test_view_2', 'test_view_3'])
       ->will($this->returnValue(['test_view_1' => $view_1, 'test_view_2' => $view_2, 'test_view_3' => $view_3]));
 
-    $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
-    $entity_manager->expects($this->exactly(2))
+    $entity_type_manager = $this->getMock(EntityTypeManagerInterface::class);
+    $entity_type_manager->expects($this->exactly(2))
       ->method('getStorage')
       ->with('view')
       ->will($this->returnValue($view_storage));
-    $this->container->set('entity.manager', $entity_manager);
+    $this->container->set('entity_type.manager', $entity_type_manager);
 
     $definitions = [
       'type_a' => [
@@ -178,9 +178,6 @@ class ViewsTest extends UnitTestCase {
       ->willReturn($definitions);
     $this->container->set('plugin.manager.views.display', $display_manager);
 
-    $entity_query = new QueryFactory($entity_manager);
-    $this->container->set('entity.query', $entity_query);
-
     $result = Views::getApplicableViews($applicable_type);
     $this->assertEquals($expected, $result);
   }
diff --git a/web/core/modules/views/views.api.php b/web/core/modules/views/views.api.php
index ed9f2dbff..c21b9c54e 100644
--- a/web/core/modules/views/views.api.php
+++ b/web/core/modules/views/views.api.php
@@ -93,7 +93,7 @@ use Drupal\views\ViewExecutable;
  *   to the user following analysis of the view.
  */
 function hook_views_analyze(Drupal\views\ViewExecutable $view) {
-  $messages = array();
+  $messages = [];
 
   if ($view->display_handler->options['pager']['type'] == 'none') {
     $messages[] = Drupal\views\Analyzer::formatMessage(t('This view has no pager. This could cause performance issues when the view contains many items.'), 'warning');
@@ -144,15 +144,15 @@ function hook_views_data() {
   // );
 
   // Define the return array.
-  $data = array();
+  $data = [];
 
   // The outermost keys of $data are Views table names, which should usually
   // be the same as the hook_schema() table names.
-  $data['example_table'] = array();
+  $data['example_table'] = [];
 
   // The value corresponding to key 'table' gives properties of the table
   // itself.
-  $data['example_table']['table'] = array();
+  $data['example_table']['table'] = [];
 
   // Within 'table', the value of 'group' (translated string) is used as a
   // prefix in Views UI for this table's fields, filters, etc. When adding
@@ -169,7 +169,7 @@ function hook_views_data() {
   // for views. Non-base tables can only be brought in via relationships in
   // views based on other tables. To define a table to be a base table, add
   // key 'base' to the 'table' array:
-  $data['example_table']['table']['base'] = array(
+  $data['example_table']['table']['base'] = [
     // Identifier (primary) field in this table for Views.
     'field' => 'nid',
     // Label in the UI.
@@ -177,7 +177,7 @@ function hook_views_data() {
     // Longer description in the UI. Required.
     'help' => t('Example table contains example content and can be related to nodes.'),
     'weight' => -10,
-  );
+  ];
 
   // Some tables have an implicit, automatic relationship to other tables,
   // meaning that when the other table is available in a view (either as the
@@ -196,7 +196,7 @@ function hook_views_data() {
   //   ... FROM example_table et ... JOIN node_field_data nfd
   //   ON et.nid = nfd.nid AND ('extra' clauses will be here) ...
   // although the table aliases will be different.
-  $data['example_table']['table']['join'] = array(
+  $data['example_table']['table']['join'] = [
     // Within the 'join' section, list one or more tables to automatically
     // join to. In this example, every time 'node_field_data' is available in
     // a view, 'example_table' will be too. The array keys here are the array
@@ -204,36 +204,36 @@ function hook_views_data() {
     // implementations. If the table listed here is from another module's
     // hook_views_data() implementation, make sure your module depends on that
     // other module.
-    'node_field_data' => array(
+    'node_field_data' => [
       // Primary key field in node_field_data to use in the join.
       'left_field' => 'nid',
       // Foreign key field in example_table to use in the join.
       'field' => 'nid',
       // 'extra' is an array of additional conditions on the join.
-      'extra' => array(
-        0 => array(
+      'extra' => [
+        0 => [
           // Adds AND node_field_data.published = TRUE to the join.
           'field' => 'published',
           'value' => TRUE,
-        ),
-        1 => array(
+        ],
+        1 => [
           // Adds AND example_table.numeric_field = 1 to the join.
           'left_field' => 'numeric_field',
           'value' => 1,
           // If true, the value will not be surrounded in quotes.
           'numeric' => TRUE,
-        ),
-        2 => array(
+        ],
+        2 => [
           // Adds AND example_table.boolean_field <>
           // node_field_data.published to the join.
           'field' => 'published',
           'left_field' => 'boolean_field',
           // The operator used, Defaults to "=".
           'operator' => '!=',
-        ),
-      ),
-    ),
-  );
+        ],
+      ],
+    ],
+  ];
 
   // You can also do a more complex join, where in order to get to a certain
   // base table defined in a hook_views_data() implementation, you will join
@@ -248,7 +248,7 @@ function hook_views_data() {
   //   JOIN node_field_data nfd ON (definition of the join from the foo
   //   module goes here) ...
   // although the table aliases will be different.
-  $data['example_table']['table']['join']['node_field_data'] = array(
+  $data['example_table']['table']['join']['node_field_data'] = [
     // 'node_field_data' above is the base we're joining to in Views.
     // 'left_table' is the table we're actually joining to, in order to get to
     // 'node_field_data'. It has to be something that Views knows how to join
@@ -257,16 +257,16 @@ function hook_views_data() {
     'left_field' => 'nid',
     'field' => 'nid',
     // 'extra' is an array of additional conditions on the join.
-    'extra' => array(
+    'extra' => [
       // This syntax matches additional fields in the two tables:
       // ... AND foo.langcode = example_table.langcode ...
-      array('left_field' => 'langcode', 'field' => 'langcode'),
+      ['left_field' => 'langcode', 'field' => 'langcode'],
       // This syntax adds a condition on our table. 'operator' defaults to
       // '=' for non-array values, or 'IN' for array values.
       // ... AND example_table.numeric_field > 0 ...
-      array('field' => 'numeric_field', 'value' => 0, 'numeric' => TRUE, 'operator' => '>'),
-    ),
-  );
+      ['field' => 'numeric_field', 'value' => 0, 'numeric' => TRUE, 'operator' => '>'],
+    ],
+  ];
 
   // Other array elements at the top level of your table's array describe
   // individual database table fields made available to Views. The array keys
@@ -296,7 +296,7 @@ function hook_views_data() {
 
   // Node ID field, exposed as relationship only, since it is a foreign key
   // in this table.
-  $data['example_table']['nid'] = array(
+  $data['example_table']['nid'] = [
     'title' => t('Example content'),
     'help' => t('Relate example content to the node content'),
 
@@ -306,7 +306,7 @@ function hook_views_data() {
     // - Use hook_views_data_alter() -- see the function body example on that
     //   hook for details.
     // - Use the implicit join method described above.
-    'relationship' => array(
+    'relationship' => [
       // Views name of the table to join to for the relationship.
       'base' => 'node_field_data',
       // Database field name in the other table to join on.
@@ -315,78 +315,78 @@ function hook_views_data() {
       'id' => 'standard',
       // Default label for relationship in the UI.
       'label' => t('Example node'),
-    ),
-  );
+    ],
+  ];
 
   // Plain text field, exposed as a field, sort, filter, and argument.
-  $data['example_table']['plain_text_field'] = array(
+  $data['example_table']['plain_text_field'] = [
     'title' => t('Plain text field'),
     'help' => t('Just a plain text field.'),
 
-    'field' => array(
+    'field' => [
       // ID of field handler plugin to use.
       'id' => 'standard',
-    ),
+    ],
 
-    'sort' => array(
+    'sort' => [
       // ID of sort handler plugin to use.
       'id' => 'standard',
-    ),
+    ],
 
-    'filter' => array(
+    'filter' => [
       // ID of filter handler plugin to use.
       'id' => 'string',
-    ),
+    ],
 
-    'argument' => array(
+    'argument' => [
       // ID of argument handler plugin to use.
       'id' => 'string',
-    ),
-  );
+    ],
+  ];
 
   // Numeric field, exposed as a field, sort, filter, and argument.
-  $data['example_table']['numeric_field'] = array(
+  $data['example_table']['numeric_field'] = [
     'title' => t('Numeric field'),
     'help' => t('Just a numeric field.'),
 
-    'field' => array(
+    'field' => [
       // ID of field handler plugin to use.
       'id' => 'numeric',
-    ),
+    ],
 
-    'sort' => array(
+    'sort' => [
       // ID of sort handler plugin to use.
       'id' => 'standard',
-    ),
+    ],
 
-    'filter' => array(
+    'filter' => [
       // ID of filter handler plugin to use.
       'id' => 'numeric',
-    ),
+    ],
 
-    'argument' => array(
+    'argument' => [
       // ID of argument handler plugin to use.
       'id' => 'numeric',
-    ),
-  );
+    ],
+  ];
 
   // Boolean field, exposed as a field, sort, and filter. The filter section
   // illustrates overriding various settings.
-  $data['example_table']['boolean_field'] = array(
+  $data['example_table']['boolean_field'] = [
     'title' => t('Boolean field'),
     'help' => t('Just an on/off field.'),
 
-    'field' => array(
+    'field' => [
       // ID of field handler plugin to use.
       'id' => 'boolean',
-    ),
+    ],
 
-    'sort' => array(
+    'sort' => [
       // ID of sort handler plugin to use.
       'id' => 'standard',
-    ),
+    ],
 
-    'filter' => array(
+    'filter' => [
       // ID of filter handler plugin to use.
       'id' => 'boolean',
       // Override the generic field title, so that the filter uses a different
@@ -398,43 +398,43 @@ function hook_views_data() {
       // Override the default Boolean filter handler's 'use_equal' setting, to
       // make the query use 'boolean_field = 1' instead of 'boolean_field <> 0'.
       'use_equal' => TRUE,
-    ),
-  );
+    ],
+  ];
 
   // Integer timestamp field, exposed as a field, sort, and filter.
-  $data['example_table']['timestamp_field'] = array(
+  $data['example_table']['timestamp_field'] = [
     'title' => t('Timestamp field'),
     'help' => t('Just a timestamp field.'),
 
-    'field' => array(
+    'field' => [
       // ID of field handler plugin to use.
       'id' => 'date',
-    ),
+    ],
 
-    'sort' => array(
+    'sort' => [
       // ID of sort handler plugin to use.
       'id' => 'date',
-    ),
+    ],
 
-    'filter' => array(
+    'filter' => [
       // ID of filter handler plugin to use.
       'id' => 'date',
-    ),
-  );
+    ],
+  ];
 
   // Area example. Areas are not generally associated with actual data
   // tables and fields. This example is from views_views_data(), which defines
   // the "Global" table (not really a table, but a group of Fields, Filters,
   // etc. that are grouped into section "Global" in the UI). Here's the
   // definition of the generic "Text area":
-  $data['views']['area'] = array(
+  $data['views']['area'] = [
     'title' => t('Text area'),
     'help' => t('Provide markup text for the area.'),
-    'area' => array(
+    'area' => [
       // ID of the area handler plugin to use.
       'id' => 'text',
-    ),
-  );
+    ],
+  ];
 
   return $data;
 }
@@ -453,15 +453,15 @@ function hook_views_data_alter(array &$data) {
   $data['node_field_data']['nid']['title'] = t('Node-Nid');
 
   // Add an additional field to the users_field_data table.
-  $data['users_field_data']['example_field'] = array(
+  $data['users_field_data']['example_field'] = [
     'title' => t('Example field'),
     'help' => t('Some example content that references a user'),
 
-    'field' => array(
+    'field' => [
       // ID of the field handler to use.
       'id' => 'example_field',
-    ),
-  );
+    ],
+  ];
 
   // Change the handler of the node title field, presumably to a handler plugin
   // you define in your module. Give the ID of this plugin.
@@ -479,11 +479,11 @@ function hook_views_data_alter(array &$data) {
   // rather than adding this relationship directly to the $data['foo']['fid']
   // field entry, which could overwrite an existing relationship, we define
   // a dummy field key to handle the relationship.
-  $data['foo']['unique_dummy_name'] = array(
+  $data['foo']['unique_dummy_name'] = [
     'title' => t('Title seen while adding relationship'),
     'help' => t('More information about the relationship'),
 
-    'relationship' => array(
+    'relationship' => [
       // Views name of the table being joined to from foo.
       'base' => 'example_table',
       // Database field name in example_table for the join.
@@ -494,8 +494,8 @@ function hook_views_data_alter(array &$data) {
       // ID of relationship handler plugin to use.
       'id' => 'standard',
       'label' => t('Default label for relationship'),
-    ),
-  );
+    ],
+  ];
 
   // Note that the $data array is not returned – it is modified by reference.
 }
@@ -525,12 +525,12 @@ function hook_field_views_data(\Drupal\field\FieldStorageConfigInterface $field_
   $data = views_field_default_views_data($field_storage);
   foreach ($data as $table_name => $table_data) {
     // Add the relationship only on the target_id field.
-    $data[$table_name][$field_storage->getName() . '_target_id']['relationship'] = array(
+    $data[$table_name][$field_storage->getName() . '_target_id']['relationship'] = [
       'id' => 'standard',
       'base' => 'file_managed',
       'base field' => 'target_id',
-      'label' => t('image from @field_name', array('@field_name' => $field_storage->getName())),
-    );
+      'label' => t('image from @field_name', ['@field_name' => $field_storage->getName()]),
+    ];
   }
 
   return $data;
@@ -563,9 +563,9 @@ function hook_field_views_data_alter(array &$data, \Drupal\field\FieldStorageCon
 
   list($label) = views_entity_field_label($entity_type_id, $field_name);
 
-  $data['file_managed'][$pseudo_field_name]['relationship'] = array(
-    'title' => t('@entity using @field', array('@entity' => $entity_type->getLabel(), '@field' => $label)),
-    'help' => t('Relate each @entity with a @field set to the image.', array('@entity' => $entity_type->getLabel(), '@field' => $label)),
+  $data['file_managed'][$pseudo_field_name]['relationship'] = [
+    'title' => t('@entity using @field', ['@entity' => $entity_type->getLabel(), '@field' => $label]),
+    'help' => t('Relate each @entity with a @field set to the image.', ['@entity' => $entity_type->getLabel(), '@field' => $label]),
     'id' => 'entity_reverse',
     'field_name' => $field_name,
     'entity_type' => $entity_type_id,
@@ -574,14 +574,14 @@ function hook_field_views_data_alter(array &$data, \Drupal\field\FieldStorageCon
     'base' => $entity_type->getBaseTable(),
     'base field' => $entity_type->getKey('id'),
     'label' => $field_name,
-    'join_extra' => array(
-      0 => array(
+    'join_extra' => [
+      0 => [
         'field' => 'deleted',
         'value' => 0,
         'numeric' => TRUE,
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 }
 
 /**
@@ -620,9 +620,9 @@ function hook_field_views_data_views_data_alter(array &$data, \Drupal\field\Fiel
   $table_mapping = \Drupal::entityManager()->getStorage($entity_type_id)->getTableMapping();
 
   // Views data for this field is in $data[$data_key].
-  $data[$data_key][$pseudo_field_name]['relationship'] = array(
-    'title' => t('@entity using @field', array('@entity' => $entity_type->getLabel(), '@field' => $label)),
-    'help' => t('Relate each @entity with a @field set to the term.', array('@entity' => $entity_type->getLabel(), '@field' => $label)),
+  $data[$data_key][$pseudo_field_name]['relationship'] = [
+    'title' => t('@entity using @field', ['@entity' => $entity_type->getLabel(), '@field' => $label]),
+    'help' => t('Relate each @entity with a @field set to the term.', ['@entity' => $entity_type->getLabel(), '@field' => $label]),
     'id' => 'entity_reverse',
     'field_name' => $field_name,
     'entity_type' => $entity_type_id,
@@ -631,14 +631,14 @@ function hook_field_views_data_views_data_alter(array &$data, \Drupal\field\Fiel
     'base' => $entity_type->getBaseTable(),
     'base field' => $entity_type->getKey('id'),
     'label' => $field_name,
-    'join_extra' => array(
-      0 => array(
+    'join_extra' => [
+      0 => [
         'field' => 'deleted',
         'value' => 0,
         'numeric' => TRUE,
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 }
 
 /**
@@ -659,12 +659,12 @@ function hook_field_views_data_views_data_alter(array &$data, \Drupal\field\Fiel
  */
 function hook_views_query_substitutions(ViewExecutable $view) {
   // Example from views_views_query_substitutions().
-  return array(
+  return [
     '***CURRENT_VERSION***' => \Drupal::VERSION,
     '***CURRENT_TIME***' => REQUEST_TIME,
     '***LANGUAGE_language_content***' => \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId(),
     PluginBase::VIEWS_QUERY_LANGUAGE_SITE_DEFAULT => \Drupal::languageManager()->getDefaultLanguage()->getId(),
-  );
+  ];
 }
 
 /**
@@ -676,9 +676,9 @@ function hook_views_query_substitutions(ViewExecutable $view) {
  *   is already marked safe.
  */
 function hook_views_form_substitutions() {
-  return array(
+  return [
     '<!--views-form-example-substitutions-->' => 'Example Substitution',
-  );
+  ];
 }
 
 /**
@@ -771,7 +771,7 @@ function hook_views_pre_execute(ViewExecutable $view) {
   $account = \Drupal::currentUser();
 
   if (count($view->query->tables) > 2 && $account->hasPermission('administer views')) {
-    drupal_set_message(t('The view %view may be heavy to execute.', array('%view' => $view->id())), 'warning');
+    drupal_set_message(t('The view %view may be heavy to execute.', ['%view' => $view->id()]), 'warning');
   }
 }
 
@@ -882,11 +882,11 @@ function hook_views_query_alter(ViewExecutable $view, QueryPluginBase $query) {
         // If this is the part of the query filtering on title, chang the
         // condition to filter on node ID.
         if ($condition['field'] == 'node.title') {
-          $condition = array(
+          $condition = [
             'field' => 'node.nid',
             'value' => $view->exposed_raw_input['title'],
             'operator' => '=',
-          );
+          ];
         }
       }
     }
@@ -915,10 +915,10 @@ function hook_views_query_alter(ViewExecutable $view, QueryPluginBase $query) {
 function hook_views_preview_info_alter(array &$rows, ViewExecutable $view) {
   // Adds information about the tables being queried by the view to the query
   // part of the info box.
-  $rows['query'][] = array(
+  $rows['query'][] = [
     t('<strong>Table queue</strong>'),
     count($view->query->table_queue) . ': (' . implode(', ', array_keys($view->query->table_queue)) . ')',
-  );
+  ];
 }
 
 /**
@@ -938,7 +938,7 @@ function hook_views_preview_info_alter(array &$rows, ViewExecutable $view) {
 function hook_views_ui_display_top_links_alter(array &$links, ViewExecutable $view, $display_id) {
   // Put the export link first in the list.
   if (isset($links['export'])) {
-    $links = array('export' => $links['export']) + $links;
+    $links = ['export' => $links['export']] + $links;
   }
 }
 
@@ -953,7 +953,7 @@ function hook_views_ui_display_top_links_alter(array &$links, ViewExecutable $vi
  * @see views_invalidate_cache()
  */
 function hook_views_invalidate_cache() {
-  \Drupal\Core\Cache\Cache::invalidateTags(array('views'));
+  \Drupal\Core\Cache\Cache::invalidateTags(['views']);
 }
 
 /**
@@ -1085,7 +1085,7 @@ function hook_views_plugins_join_alter(array &$plugins) {
 }
 
 /**
- * Modify the list of available views join plugins.
+ * Modify the list of available views pager plugins.
  *
  * This hook may be used to modify plugin properties after they have been
  * specified by other modules.
diff --git a/web/core/modules/views/views.install b/web/core/modules/views/views.install
index 8801a93bc..f542416b0 100644
--- a/web/core/modules/views/views.install
+++ b/web/core/modules/views/views.install
@@ -12,11 +12,6 @@ function views_install() {
   module_set_weight('views', 10);
 }
 
-/**
- * @addtogroup updates-8.0.0-beta
- * @{
- */
-
 /**
  * Update views field plugins.
  */
@@ -310,15 +305,6 @@ function _views_update_argument_map($displays) {
   return $argument_map;
 }
 
-/**
- * @} End of "addtogroup updates-8.0.0-beta".
- */
-
-/**
- * @addtogroup updates-8.0.0-rc
- * @{
- */
-
 /**
  * Clear caches to fix entity operations field.
  */
@@ -328,15 +314,6 @@ function views_update_8003() {
   // field.
 }
 
-/**
- * @} End of "addtogroup updates-8.0.0-rc".
- */
-
-/**
- * @addtogroup updates-8.0.x
- * @{
- */
-
 /**
  * Clear caches due to updated entity views data.
  */
@@ -344,15 +321,6 @@ function views_update_8004() {
   // Empty update to cause a cache flush so that views data is rebuilt.
 }
 
-/**
- * @} End of "addtogroup updates-8.0.x".
- */
-
-/**
- * @addtogroup updates-8.1.0
- * @{
- */
-
 /**
  * Clear views data cache.
  */
@@ -389,15 +357,6 @@ function views_update_8101() {
   }
 }
 
-/**
- * @} End of "addtogroup updates-8.1.0".
- */
-
-/**
- * @addtogroup updates-8.2.0
- * @{
- */
-
 /**
  * Rebuild the container to add a new container parameter.
  */
@@ -411,7 +370,3 @@ function views_update_8200() {
 function views_update_8201() {
   // Empty update to cause a cache rebuild so that config schema get refreshed.
 }
-
-/**
- * @} End of "addtogroup updates-8.2.0".
- */
diff --git a/web/core/modules/views/views.module b/web/core/modules/views/views.module
index 96e6dd3dc..f9bd09816 100644
--- a/web/core/modules/views/views.module
+++ b/web/core/modules/views/views.module
@@ -28,14 +28,14 @@ function views_help($route_name, RouteMatchInterface $route_match) {
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('The Views module provides a back end to fetch information from content, user accounts, taxonomy terms, and other entities from the database and present it to the user as a grid, HTML list, table, unformatted list, etc. The resulting displays are known generally as <em>views</em>.') . '</p>';
-      $output .= '<p>' . t('For more information, see the <a href=":views">online documentation for the Views module</a>.', array(':views' => 'https://www.drupal.org/documentation/modules/views')) . '</p>';
-      $output .= '<p>' . t('In order to create and modify your own views using the administration and configuration user interface, you will need to enable either the Views UI module in core or a contributed module that provides a user interface for Views. See the <a href=":views-ui">Views UI module help page</a> for more information.', array(':views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('help.page', array('name' => 'views_ui')) : '#')) . '</p>';
+      $output .= '<p>' . t('For more information, see the <a href=":views">online documentation for the Views module</a>.', [':views' => 'https://www.drupal.org/documentation/modules/views']) . '</p>';
+      $output .= '<p>' . t('In order to create and modify your own views using the administration and configuration user interface, you will need to enable either the Views UI module in core or a contributed module that provides a user interface for Views. See the <a href=":views-ui">Views UI module help page</a> for more information.', [':views-ui' => (\Drupal::moduleHandler()->moduleExists('views_ui')) ? \Drupal::url('help.page', ['name' => 'views_ui']) : '#']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Adding functionality to administrative pages') . '</dt>';
       $output .= '<dd>' . t('The Views module adds functionality to some core administration pages. For example, <em>admin/content</em> uses Views to filter and sort content. With Views uninstalled, <em>admin/content</em> is more limited.') . '</dd>';
       $output .= '<dt>' . t('Expanding Views functionality') . '</dt>';
-      $output .= '<dd>' . t('Contributed projects that support the Views module can be found in the <a href=":node">online documentation for Views-related contributed modules</a>.', array(':node' => 'https://www.drupal.org/documentation/modules/views/add-ons')) . '</dd>';
+      $output .= '<dd>' . t('Contributed projects that support the Views module can be found in the <a href=":node">online documentation for Views-related contributed modules</a>.', [':node' => 'https://www.drupal.org/documentation/modules/views/add-ons']) . '</dd>';
       $output .= '<dt>' . t('Improving table accessibility') . '</dt>';
       $output .= '<dd>' . t('Views tables include semantic markup to improve accessibility. Data cells are automatically associated with header cells through id and header attributes. To improve the accessibility of your tables you can add descriptive elements within the Views table settings. The <em>caption</em> element can introduce context for a table, making it easier to understand. The <em>summary</em> element can provide an overview of how the data has been organized and how to navigate the table. Both the caption and summary are visible by default and also implemented according to HTML5 guidelines.') . '</dd>';
       $output .= '<dt>' . t('Working with multilingual views') . '</dt>';
@@ -53,10 +53,10 @@ function views_help($route_name, RouteMatchInterface $route_match) {
 function views_views_pre_render($view) {
   // If using AJAX, send identifying data about this view.
   if ($view->ajaxEnabled() && empty($view->is_attachment) && empty($view->live_preview)) {
-    $view->element['#attached']['drupalSettings']['views'] = array(
+    $view->element['#attached']['drupalSettings']['views'] = [
       'ajax_path' => \Drupal::url('views.ajax'),
-      'ajaxViews' => array(
-        'views_dom_id:' . $view->dom_id => array(
+      'ajaxViews' => [
+        'views_dom_id:' . $view->dom_id => [
           'view_name' => $view->storage->id(),
           'view_display_id' => $view->current_display,
           'view_args' => Html::escape(implode('/', $view->args)),
@@ -66,9 +66,9 @@ function views_views_pre_render($view) {
           // To fit multiple views on a page, the programmer may have
           // overridden the display's pager_element.
           'pager_element' => isset($view->pager) ? $view->pager->getPagerId() : 0,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     $view->element['#attached']['library'][] = 'views/views.ajax';
   }
 
@@ -85,50 +85,50 @@ function views_theme($existing, $type, $theme, $path) {
   \Drupal::moduleHandler()->loadInclude('views', 'inc', 'views.theme');
 
   // Some quasi clever array merging here.
-  $base = array(
+  $base = [
     'file' => 'views.theme.inc',
-  );
+  ];
 
   // Our extra version of pager from pager.inc
-  $hooks['views_mini_pager'] = $base + array(
-    'variables' => array('tags' => array(), 'quantity' => 9, 'element' => 0, 'parameters' => array()),
-  );
+  $hooks['views_mini_pager'] = $base + [
+    'variables' => ['tags' => [], 'quantity' => 9, 'element' => 0, 'parameters' => []],
+  ];
 
-  $variables = array(
+  $variables = [
     // For displays, we pass in a dummy array as the first parameter, since
     // $view is an object but the core contextual_preprocess() function only
     // attaches contextual links when the primary theme argument is an array.
-    'display' => array(
-      'view_array' => array(),
+    'display' => [
+      'view_array' => [],
       'view' => NULL,
-      'rows' => array(),
-      'header' => array(),
-      'footer' => array(),
-      'empty' => array(),
-      'exposed' => array(),
-      'more' => array(),
-      'feed_icons' => array(),
-      'pager' => array(),
+      'rows' => [],
+      'header' => [],
+      'footer' => [],
+      'empty' => [],
+      'exposed' => [],
+      'more' => [],
+      'feed_icons' => [],
+      'pager' => [],
       'title' => '',
-      'attachment_before' => array(),
-      'attachment_after' => array(),
-    ),
-    'style' => array('view' => NULL, 'options' => NULL, 'rows' => NULL, 'title' => NULL),
-    'row' => array('view' => NULL, 'options' => NULL, 'row' => NULL, 'field_alias' => NULL),
-    'exposed_form' => array('view' => NULL, 'options' => NULL),
-    'pager' => array(
+      'attachment_before' => [],
+      'attachment_after' => [],
+    ],
+    'style' => ['view' => NULL, 'options' => NULL, 'rows' => NULL, 'title' => NULL],
+    'row' => ['view' => NULL, 'options' => NULL, 'row' => NULL, 'field_alias' => NULL],
+    'exposed_form' => ['view' => NULL, 'options' => NULL],
+    'pager' => [
       'view' => NULL, 'options' => NULL,
-      'tags' => array(), 'quantity' => 9, 'element' => 0, 'parameters' => array()
-    ),
-  );
+      'tags' => [], 'quantity' => 9, 'element' => 0, 'parameters' => []
+    ],
+  ];
 
   // Default view themes
-  $hooks['views_view_field'] = $base + array(
-    'variables' => array('view' => NULL, 'field' => NULL, 'row' => NULL),
-  );
-  $hooks['views_view_grouping'] = $base + array(
-    'variables' => array('view' => NULL, 'grouping' => NULL, 'grouping_level' => NULL, 'rows' => NULL, 'title' => NULL),
-  );
+  $hooks['views_view_field'] = $base + [
+    'variables' => ['view' => NULL, 'field' => NULL, 'row' => NULL],
+  ];
+  $hooks['views_view_grouping'] = $base + [
+    'variables' => ['view' => NULL, 'grouping' => NULL, 'grouping_level' => NULL, 'rows' => NULL, 'title' => NULL],
+  ];
 
   // Only display, pager, row, and style plugins can provide theme hooks.
   $plugin_types = [
@@ -138,7 +138,7 @@ function views_theme($existing, $type, $theme, $path) {
     'style',
     'exposed_form',
   ];
-  $plugins = array();
+  $plugins = [];
   foreach ($plugin_types as $plugin_type) {
     $plugins[$plugin_type] = Views::pluginManager($plugin_type)->getDefinitions();
   }
@@ -164,9 +164,9 @@ function views_theme($existing, $type, $theme, $path) {
         continue;
       }
 
-      $hooks[$def['theme']] = array(
+      $hooks[$def['theme']] = [
         'variables' => $variables[$type],
-      );
+      ];
 
       // We always use the module directory as base dir.
       $module_dir = drupal_get_path('module', $def['provider']);
@@ -175,7 +175,7 @@ function views_theme($existing, $type, $theme, $path) {
       // For the views module we ensure views.theme.inc is included.
       if ($def['provider'] == 'views') {
         if (!isset($hooks[$def['theme']]['includes'])) {
-          $hooks[$def['theme']]['includes'] = array();
+          $hooks[$def['theme']]['includes'] = [];
         }
         if (!in_array('views.theme.inc', $hooks[$def['theme']]['includes'])) {
           $hooks[$def['theme']]['includes'][] = $module_dir . '/views.theme.inc';
@@ -210,13 +210,13 @@ function views_theme($existing, $type, $theme, $path) {
     }
   }
 
-  $hooks['views_form_views_form'] = $base + array(
+  $hooks['views_form_views_form'] = $base + [
     'render element' => 'form',
-  );
+  ];
 
-  $hooks['views_exposed_form'] = $base + array(
+  $hooks['views_exposed_form'] = $base + [
     'render element' => 'form',
-  );
+  ];
 
   return $hooks;
 }
@@ -378,13 +378,13 @@ function views_add_contextual_links(&$render_element, $location, $display_id, ar
     // set 'contextual_links_locations' to, e.g., {""}.)
 
     if (!isset($plugin['contextual_links_locations'])) {
-      $plugin['contextual_links_locations'] = array('view');
+      $plugin['contextual_links_locations'] = ['view'];
     }
-    elseif ($plugin['contextual_links_locations'] == array() || $plugin['contextual_links_locations'] == array('')) {
-      $plugin['contextual_links_locations'] = array();
+    elseif ($plugin['contextual_links_locations'] == [] || $plugin['contextual_links_locations'] == ['']) {
+      $plugin['contextual_links_locations'] = [];
     }
     else {
-      $plugin += array('contextual_links_locations' => array('view'));
+      $plugin += ['contextual_links_locations' => ['view']];
     }
 
     // On exposed_forms blocks contextual links should always be visible.
@@ -392,7 +392,7 @@ function views_add_contextual_links(&$render_element, $location, $display_id, ar
     $has_links = !empty($plugin['contextual links']) && !empty($plugin['contextual_links_locations']);
     if ($has_links && in_array($location, $plugin['contextual_links_locations'])) {
       foreach ($plugin['contextual links'] as $group => $link) {
-        $args = array();
+        $args = [];
         $valid = TRUE;
         if (!empty($link['route_parameters_names'])) {
           $view_storage = \Drupal::entityManager()
@@ -416,14 +416,14 @@ function views_add_contextual_links(&$render_element, $location, $display_id, ar
         // array.
         if ($valid) {
           $render_element['#views_contextual_links'] = TRUE;
-          $render_element['#contextual_links'][$group] = array(
+          $render_element['#contextual_links'][$group] = [
             'route_parameters' => $args,
-            'metadata' => array(
+            'metadata' => [
               'location' => $location,
               'name' => $view_id,
               'display_id' => $display_id,
-            ),
-          );
+            ],
+          ];
           // If we're setting contextual links on a page, for a page view, for a
           // user that may use contextual links, attach Views' contextual links
           // JavaScript.
@@ -508,23 +508,23 @@ function &views_get_current_view() {
  * Implements hook_hook_info().
  */
 function views_hook_info() {
-  $hooks = array();
+  $hooks = [];
 
-  $hooks += array_fill_keys(array(
+  $hooks += array_fill_keys([
     'views_data',
     'views_data_alter',
     'views_analyze',
     'views_invalidate_cache',
-  ), array('group' => 'views'));
+  ], ['group' => 'views']);
 
   // Register a views_plugins alter hook for all plugin types.
   foreach (ViewExecutable::getPluginTypes() as $type) {
-    $hooks['views_plugins_' . $type . '_alter'] = array(
+    $hooks['views_plugins_' . $type . '_alter'] = [
       'group' => 'views',
-    );
+    ];
   }
 
-  $hooks += array_fill_keys(array(
+  $hooks += array_fill_keys([
     'views_query_substitutions',
     'views_form_substitutions',
     'views_pre_view',
@@ -535,14 +535,14 @@ function views_hook_info() {
     'views_pre_render',
     'views_post_render',
     'views_query_alter',
-  ), array('group' => 'views_execution'));
+  ], ['group' => 'views_execution']);
 
-  $hooks['field_views_data'] = array(
+  $hooks['field_views_data'] = [
     'group' => 'views',
-  );
-  $hooks['field_views_data_alter'] = array(
+  ];
+  $hooks['field_views_data_alter'] = [
     'group' => 'views',
-  );
+  ];
 
   return $hooks;
 }
@@ -605,8 +605,8 @@ function views_disable_view(View $view) {
  */
 function views_pre_render_views_form_views_form($element) {
   // Placeholders and their substitutions (usually rendered form elements).
-  $search = array();
-  $replace = array();
+  $search = [];
+  $replace = [];
 
   // Add in substitutions provided by the form.
   foreach ($element['#substitutions']['#value'] as $substitution) {
@@ -788,7 +788,7 @@ function views_get_view_result($name, $display_id = NULL) {
     return $view->result;
   }
   else {
-    return array();
+    return [];
   }
 }
 
diff --git a/web/core/modules/views/views.post_update.php b/web/core/modules/views/views.post_update.php
index a4da9401d..a278034c8 100644
--- a/web/core/modules/views/views.post_update.php
+++ b/web/core/modules/views/views.post_update.php
@@ -9,11 +9,6 @@ use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\views\Entity\View;
 use Drupal\views\Views;
 
-/**
- * @addtogroup updates-8.0.0-beta
- * @{
- */
-
 /**
  * Update the cacheability metadata for all views.
  */
@@ -35,15 +30,6 @@ function views_post_update_update_cacheability_metadata() {
 
 }
 
-/**
- * @} End of "addtogroup updates-8.0.0-beta".
- */
-
-/**
- * @addtogroup updates-8.0.0-rc
- * @{
- */
-
 /**
  * Update some views fields that were previously duplicated.
  */
@@ -137,15 +123,6 @@ function views_post_update_cleanup_duplicate_views_data() {
   return $message;
 }
 
-/**
- * @} End of "addtogroup updates-8.0.0-rc".
- */
-
-/**
- * @addtogroup updates-8.0.x
- * @{
- */
-
 /**
  * Include field formatter dependencies in a view when the formatter is used.
  */
@@ -156,15 +133,6 @@ function views_post_update_field_formatter_dependencies() {
   });
 }
 
-/**
- * @} End of "addtogroup updates-8.0.x".
- */
-
-/**
- * @addtogroup updates-8.1.x
- * @{
- */
-
 /**
  * Fix views with dependencies on taxonomy terms that don't exist.
  */
@@ -179,15 +147,6 @@ function views_post_update_taxonomy_index_tid() {
   });
 }
 
-/**
- * @} End of "addtogroup updates-8.1.x".
- */
-
-/**
- * @addtogroup updates-8.2.x
- * @{
- */
-
 /**
  * Fix views with serializer dependencies.
  */
@@ -237,5 +196,8 @@ function views_post_update_boolean_filter_values() {
 }
 
 /**
- * @} End of "addtogroup updates-8.2.x".
+ * Rebuild caches to ensure schema changes are read in.
  */
+function views_post_update_grouped_filters() {
+  // Empty update to cause a cache rebuild so that the schema changes are read.
+}
diff --git a/web/core/modules/views/views.services.yml b/web/core/modules/views/views.services.yml
index 1a01543c6..28f8d0d33 100644
--- a/web/core/modules/views/views.services.yml
+++ b/web/core/modules/views/views.services.yml
@@ -58,7 +58,7 @@ services:
     arguments: [wizard, '@container.namespaces', '@cache.discovery', '@module_handler']
   views.views_data:
     class: Drupal\views\ViewsData
-    arguments: ['@cache.discovery', '@config.factory', '@module_handler', '@language_manager']
+    arguments: ['@cache.default', '@config.factory', '@module_handler', '@language_manager']
   views.views_data_helper:
     class: Drupal\views\ViewsDataHelper
     arguments: ['@views.views_data']
diff --git a/web/core/modules/views/views.theme.inc b/web/core/modules/views/views.theme.inc
index 94c519e71..4866d1c22 100644
--- a/web/core/modules/views/views.theme.inc
+++ b/web/core/modules/views/views.theme.inc
@@ -90,7 +90,7 @@ function template_preprocess_views_view_fields(&$variables) {
 
   // Loop through the fields for this view.
   $previous_inline = FALSE;
-  $variables['fields'] = array(); // ensure it's at least an empty array.
+  $variables['fields'] = []; // ensure it's at least an empty array.
   /** @var \Drupal\views\ResultRow $row */
   $row = $variables['row'];
   foreach ($view->field as $id => $field) {
@@ -107,7 +107,7 @@ function template_preprocess_views_view_fields(&$variables) {
 
       $object->element_type = $object->handler->elementType(TRUE, !$variables['options']['default_field_elements'], $object->inline);
       if ($object->element_type) {
-        $attributes = array();
+        $attributes = [];
         if ($object->handler->options['element_default_classes']) {
           $attributes['class'][] = 'field-content';
         }
@@ -141,7 +141,7 @@ function template_preprocess_views_view_fields(&$variables) {
 
       // Set up field wrapper attributes if field wrapper was set.
       if ($object->wrapper_element) {
-        $attributes = array();
+        $attributes = [];
         if ($object->handler->options['element_default_classes']) {
           $attributes['class'][] = 'views-field';
           $attributes['class'][] = 'views-field-' . $object->class;
@@ -169,7 +169,7 @@ function template_preprocess_views_view_fields(&$variables) {
 
         // Set up label attributes.
         if ($object->label_element) {
-          $attributes = array();
+          $attributes = [];
           if ($object->handler->options['element_default_classes']) {
             $attributes['class'][] = 'views-label';
             $attributes['class'][] = 'views-label-' . $object->class;
@@ -241,13 +241,13 @@ function template_preprocess_views_view_summary(&$variables) {
   $view = $variables['view'];
   $argument = $view->argument[$view->build_info['summary_level']];
 
-  $url_options = array();
+  $url_options = [];
 
   if (!empty($view->exposed_raw_input)) {
     $url_options['query'] = $view->exposed_raw_input;
   }
 
-  $active_urls = array(
+  $active_urls = [
     // Force system path.
     \Drupal::url('<current>', [], ['alias' => TRUE]),
     // Force system path.
@@ -256,13 +256,13 @@ function template_preprocess_views_view_summary(&$variables) {
     \Drupal::url('<current>'),
     // Could be an alias.
     Url::fromRouteMatch(\Drupal::routeMatch())->toString(),
-  );
+  ];
   $active_urls = array_combine($active_urls, $active_urls);
 
   // Collect all arguments foreach row, to be able to alter them for example
   // by the validator. This is not done per single argument value, because this
   // could cause performance problems.
-  $row_args = array();
+  $row_args = [];
 
   foreach ($variables['rows'] as $id => $row) {
     $row_args[$id] = $argument->summaryArgument($row);
@@ -270,7 +270,7 @@ function template_preprocess_views_view_summary(&$variables) {
   $argument->processSummaryArguments($row_args);
 
   foreach ($variables['rows'] as $id => $row) {
-    $variables['rows'][$id]->attributes = array();
+    $variables['rows'][$id]->attributes = [];
     $variables['rows'][$id]->link = $argument->summaryName($row);
     $args = $view->args;
     $args[$argument->position] = $row_args[$id];
@@ -329,25 +329,25 @@ function template_preprocess_views_view_summary_unformatted(&$variables) {
   $view = $variables['view'];
   $argument = $view->argument[$view->build_info['summary_level']];
 
-  $url_options = array();
+  $url_options = [];
 
   if (!empty($view->exposed_raw_input)) {
     $url_options['query'] = $view->exposed_raw_input;
   }
 
   $count = 0;
-  $active_urls = array(
+  $active_urls = [
     // Force system path.
     \Drupal::url('<current>', [], ['alias' => TRUE]),
     // Could be an alias.
     \Drupal::url('<current>'),
-  );
+  ];
   $active_urls = array_combine($active_urls, $active_urls);
 
   // Collect all arguments for each row, to be able to alter them for example
   // by the validator. This is not done per single argument value, because
   // this could cause performance problems.
-  $row_args = array();
+  $row_args = [];
   foreach ($variables['rows'] as $id => $row) {
     $row_args[$id] = $argument->summaryArgument($row);
   }
@@ -358,7 +358,7 @@ function template_preprocess_views_view_summary_unformatted(&$variables) {
     if ($count++) {
       $variables['rows'][$id]->separator = Xss::filterAdmin($variables['options']['separator']);
     }
-    $variables['rows'][$id]->attributes = array();
+    $variables['rows'][$id]->attributes = [];
     $variables['rows'][$id]->link = $argument->summaryName($row);
     $args = $view->args;
     $args[$argument->position] = $row_args[$id];
@@ -417,8 +417,8 @@ function template_preprocess_views_view_table(&$variables) {
   // so that it can get rebuilt.
   // Store rows so that they may be used by further preprocess functions.
   $result = $variables['result'] = $variables['rows'];
-  $variables['rows'] = array();
-  $variables['header'] = array();
+  $variables['rows'] = [];
+  $variables['header'] = [];
 
   $options = $view->style_plugin->options;
   $handler = $view->style_plugin;
@@ -466,19 +466,19 @@ function template_preprocess_views_view_table(&$variables) {
           $initial = ($order == 'asc') ? 'desc' : 'asc';
         }
 
-        $title = t('sort by @s', array('@s' => $label));
+        $title = t('sort by @s', ['@s' => $label]);
         if ($active == $field) {
-          $variables['header'][$field]['sort_indicator'] = array(
+          $variables['header'][$field]['sort_indicator'] = [
             '#theme' => 'tablesort_indicator',
             '#style' => $initial,
-          );
+          ];
         }
 
         $query['order'] = $field;
         $query['sort'] = $initial;
-        $link_options = array(
+        $link_options = [
           'query' => $query,
-        );
+        ];
         $url = new Url($route_name, [], $link_options);
         $variables['header'][$field]['url'] = $url->toString();
         $variables['header'][$field]['content'] = $label;
@@ -487,7 +487,7 @@ function template_preprocess_views_view_table(&$variables) {
 
       $variables['header'][$field]['default_classes'] = $fields[$field]->options['element_default_classes'];
       // Set up the header label class.
-      $variables['header'][$field]['attributes'] = array();
+      $variables['header'][$field]['attributes'] = [];
       $class = $fields[$field]->elementLabelClasses(0);
       if ($class) {
         $variables['header'][$field]['attributes']['class'][] = $class;
@@ -543,7 +543,7 @@ function template_preprocess_views_view_table(&$variables) {
 
       // Add field classes.
       if (!isset($column_reference['attributes'])) {
-        $column_reference['attributes'] = array();
+        $column_reference['attributes'] = [];
       }
 
       if ($classes = $fields[$field]->elementClasses($num)) {
@@ -557,7 +557,7 @@ function template_preprocess_views_view_table(&$variables) {
 
       // Improves accessibility of complex tables.
       if (isset($variables['header'][$field]['attributes']['id'])) {
-        $column_reference['attributes']['headers'] = array($variables['header'][$field]['attributes']['id']);
+        $column_reference['attributes']['headers'] = [$variables['header'][$field]['attributes']['id']];
       }
 
       if (!empty($fields[$field])) {
@@ -604,11 +604,11 @@ function template_preprocess_views_view_table(&$variables) {
 
   // Hide table header if all labels are empty.
   if (!$has_header_labels) {
-    $variables['header'] = array();
+    $variables['header'] = [];
   }
 
   foreach ($variables['rows'] as $num => $row) {
-    $variables['rows'][$num]['attributes'] = array();
+    $variables['rows'][$num]['attributes'] = [];
     if ($row_class = $handler->getRowClass($num)) {
       $variables['rows'][$num]['attributes']['class'][] = $row_class;
     }
@@ -618,12 +618,12 @@ function template_preprocess_views_view_table(&$variables) {
   if (empty($variables['rows']) && !empty($options['empty_table'])) {
     $build = $view->display_handler->renderArea('empty');
     $variables['rows'][0]['columns'][0]['content'][0]['field_output'] = $build;
-    $variables['rows'][0]['attributes'] = new Attribute(array('class' => 'odd'));
+    $variables['rows'][0]['attributes'] = new Attribute(['class' => ['odd']]);
     // Calculate the amounts of rows with output.
-    $variables['rows'][0]['columns'][0]['attributes'] = new Attribute(array(
+    $variables['rows'][0]['columns'][0]['attributes'] = new Attribute([
       'colspan' => count($variables['header']),
-      'class' => 'views-empty',
-    ));
+      'class' => ['views-empty'],
+    ]);
   }
 
   $variables['sticky'] = FALSE;
@@ -678,7 +678,7 @@ function template_preprocess_views_view_grid(&$variables) {
 
   $col = 0;
   $row = 0;
-  $items = array();
+  $items = [];
   $remainders = count($variables['rows']) % $options['columns'];
   $num_rows = floor(count($variables['rows']) / $options['columns']);
 
@@ -695,7 +695,7 @@ function template_preprocess_views_view_grid(&$variables) {
 
     // Create attributes for rows.
     if (!$horizontal || ($horizontal && empty($items[$row]['attributes']))) {
-      $row_attributes = array('class' => array());
+      $row_attributes = ['class' => []];
       // Add custom row classes.
       $row_class = array_filter(explode(' ', $variables['view']->style_plugin->getCustomClass($result_index, 'row')));
       if (!empty($row_class)) {
@@ -712,7 +712,7 @@ function template_preprocess_views_view_grid(&$variables) {
 
     // Create attributes for columns.
     if ($horizontal || (!$horizontal && empty($items[$col]['attributes']))) {
-      $col_attributes = array('class' => array());
+      $col_attributes = ['class' => []];
       // Add default views column classes.
       // Add custom column classes.
       $col_class = array_filter(explode(' ', $variables['view']->style_plugin->getCustomClass($result_index, 'col')));
@@ -781,7 +781,7 @@ function template_preprocess_views_view_unformatted(&$variables) {
 
   $variables['default_row_class'] = !empty($options['default_row_class']);
   foreach ($rows as $id => $row) {
-    $variables['rows'][$id] = array();
+    $variables['rows'][$id] = [];
     $variables['rows'][$id]['content'] = $row;
     $variables['rows'][$id]['attributes'] = new Attribute();
     if ($row_class = $view->style_plugin->getRowClass($id)) {
@@ -808,7 +808,7 @@ function template_preprocess_views_view_list(&$variables) {
     $class = array_map('\Drupal\Component\Utility\Html::cleanCssIdentifier', $class);
 
     // Initialize a new attribute class for $class.
-    $variables['list']['attributes'] = new Attribute(array('class' => $class));
+    $variables['list']['attributes'] = new Attribute(['class' => $class]);
   }
 
   // Fetch wrapper classes from handler options.
@@ -864,7 +864,7 @@ function template_preprocess_views_view_rss(&$variables) {
 
   /** @var \Drupal\Core\Url $url */
   if ($url) {
-    $url_options = array('absolute' => TRUE);
+    $url_options = ['absolute' => TRUE];
     if (!empty($view->exposed_raw_input)) {
       $url_options['query'] = $view->exposed_raw_input;
     }
@@ -913,7 +913,7 @@ function template_preprocess_views_view_row_rss(&$variables) {
     $variables['description'] = (string) \Drupal::service('renderer')->render($item->description);
   }
 
-  $variables['item_elements'] = array();
+  $variables['item_elements'] = [];
   foreach ($item->elements as $element) {
     if (isset($element['attributes']) && is_array($element['attributes'])) {
       $element['attributes'] = new Attribute($element['attributes']);
@@ -1022,9 +1022,9 @@ function template_preprocess_views_mini_pager(&$variables) {
   $variables['items']['current'] = $pager_page_array[$element] + 1;
 
   if ($pager_total[$element] > 1 && $pager_page_array[$element] > 0) {
-    $options = array(
+    $options = [
       'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] - 1),
-    );
+    ];
     $variables['items']['previous']['href'] = \Drupal::url('<current>', [], $options);
     if (isset($tags[1])) {
       $variables['items']['previous']['text'] = $tags[1];
@@ -1033,9 +1033,9 @@ function template_preprocess_views_mini_pager(&$variables) {
   }
 
   if ($pager_page_array[$element] < ($pager_total[$element] - 1)) {
-    $options = array(
+    $options = [
       'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] + 1),
-    );
+    ];
     $variables['items']['next']['href'] = \Drupal::url('<current>', [], $options);
     if (isset($tags[3])) {
       $variables['items']['next']['text'] = $tags[3];
diff --git a/web/core/modules/views/views.tokens.inc b/web/core/modules/views/views.tokens.inc
index a0929552d..9bf5470a6 100644
--- a/web/core/modules/views/views.tokens.inc
+++ b/web/core/modules/views/views.tokens.inc
@@ -11,56 +11,56 @@ use Drupal\Core\Render\BubbleableMetadata;
  * Implements hook_token_info().
  */
 function views_token_info() {
-  $info['types']['view'] = array(
+  $info['types']['view'] = [
     'name' => t('View', [], ['context' => 'View entity type']),
     'description' => t('Tokens related to views.'),
     'needs-data' => 'view',
-  );
-  $info['tokens']['view']['label'] = array(
+  ];
+  $info['tokens']['view']['label'] = [
     'name' => t('Label'),
     'description' => t('The label of the view.'),
-  );
-  $info['tokens']['view']['description'] = array(
+  ];
+  $info['tokens']['view']['description'] = [
     'name' => t('Description'),
     'description' => t('The description of the view.'),
-  );
-  $info['tokens']['view']['id'] = array(
+  ];
+  $info['tokens']['view']['id'] = [
     'name' => t('ID'),
     'description' => t('The machine-readable ID of the view.'),
-  );
-  $info['tokens']['view']['title'] = array(
+  ];
+  $info['tokens']['view']['title'] = [
     'name' => t('Title'),
     'description' => t('The title of current display of the view.'),
-  );
-  $info['tokens']['view']['url'] = array(
+  ];
+  $info['tokens']['view']['url'] = [
     'name' => t('URL'),
     'description' => t('The URL of the view.'),
     'type' => 'url',
-  );
-  $info['tokens']['view']['base-table'] = array(
+  ];
+  $info['tokens']['view']['base-table'] = [
     'name' => t('Base table'),
     'description' => t('The base table used for this view.'),
-  );
-  $info['tokens']['view']['base-field'] = array(
+  ];
+  $info['tokens']['view']['base-field'] = [
     'name' => t('Base field'),
     'description' => t('The base field used for this view.'),
-  );
-  $info['tokens']['view']['total-rows'] = array(
+  ];
+  $info['tokens']['view']['total-rows'] = [
     'name' => t('Total rows'),
     'description' => t('The total amount of results returned from the view. The current display will be used.'),
-  );
-  $info['tokens']['view']['items-per-page'] = array(
+  ];
+  $info['tokens']['view']['items-per-page'] = [
     'name' => t('Items per page'),
     'description' => t('The number of items per page.'),
-  );
-  $info['tokens']['view']['current-page'] = array(
+  ];
+  $info['tokens']['view']['current-page'] = [
     'name' => t('Current page'),
     'description' => t('The current page of results the view is on.'),
-  );
-  $info['tokens']['view']['page-count'] = array(
+  ];
+  $info['tokens']['view']['page-count'] = [
     'name' => t('Page count'),
     'description' => t('The total page count.'),
-  );
+  ];
 
   return $info;
 }
@@ -69,11 +69,11 @@ function views_token_info() {
  * Implements hook_tokens().
  */
 function views_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
-  $url_options = array('absolute' => TRUE);
+  $url_options = ['absolute' => TRUE];
   if (isset($options['language'])) {
     $url_options['language'] = $options['language'];
   }
-  $replacements = array();
+  $replacements = [];
 
   if ($type == 'view' && !empty($data['view'])) {
     /** @var \Drupal\views\ViewExecutable $view */
@@ -119,7 +119,7 @@ function views_tokens($type, $tokens, array $data, array $options, BubbleableMet
           $replacements[$original] = $view->storage->get('base_field');
           break;
         case 'total-rows':
-          $replacements[$original] = count($view->result);
+          $replacements[$original] = (int) $view->total_rows;
           break;
         case 'items-per-page':
           $replacements[$original] = (int) $view->getItemsPerPage();
@@ -130,7 +130,7 @@ function views_tokens($type, $tokens, array $data, array $options, BubbleableMet
         case 'page-count':
           // If there are no items per page, set this to 1 for the division.
           $per_page = $view->getItemsPerPage() ?: 1;
-          $replacements[$original] = max(1, (int) ceil(count($view->result) / $per_page));
+          $replacements[$original] = max(1, (int) ceil($view->total_rows / $per_page));
           break;
       }
     }
diff --git a/web/core/modules/views/views.views.inc b/web/core/modules/views/views.views.inc
index 93a659cda..0bd5f2700 100644
--- a/web/core/modules/views/views.views.inc
+++ b/web/core/modules/views/views.views.inc
@@ -18,129 +18,129 @@ use Drupal\system\ActionConfigEntityInterface;
  */
 function views_views_data() {
   $data['views']['table']['group'] = t('Global');
-  $data['views']['table']['join'] = array(
+  $data['views']['table']['join'] = [
   // #global is a special flag which allows a table to appear all the time.
-  '#global' => array(),
-  );
+  '#global' => [],
+  ];
 
-  $data['views']['random'] = array(
+  $data['views']['random'] = [
   'title' => t('Random'),
   'help' => t('Randomize the display order.'),
-  'sort' => array(
+  'sort' => [
     'id' => 'random',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['null'] = array(
+  $data['views']['null'] = [
     'title' => t('Null'),
     'help' => t('Allow a contextual filter value to be ignored. The query will not be altered by this contextual filter value. Can be used when contextual filter values come from the URL, and a part of the URL needs to be ignored.'),
-    'argument' => array(
+    'argument' => [
       'id' => 'null',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['nothing'] = array(
+  $data['views']['nothing'] = [
     'title' => t('Custom text'),
     'help' => t('Provide custom text or link.'),
-    'field' => array(
+    'field' => [
       'id' => 'custom',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['counter'] = array(
+  $data['views']['counter'] = [
     'title' => t('View result counter'),
     'help' => t('Displays the actual position of the view result'),
-    'field' => array(
+    'field' => [
       'id' => 'counter',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['area'] = array(
+  $data['views']['area'] = [
     'title' => t('Text area'),
     'help' => t('Provide markup text for the area.'),
-    'area' => array(
+    'area' => [
       'id' => 'text',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['area_text_custom'] = array(
+  $data['views']['area_text_custom'] = [
     'title' => t('Unfiltered text'),
     'help' => t('Add unrestricted, custom text or markup. This is similar to the custom text field.'),
-    'area' => array(
+    'area' => [
       'id' => 'text_custom',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['title'] = array(
+  $data['views']['title'] = [
     'title' => t('Title override'),
     'help' => t('Override the default view title for this view. This is useful to display an alternative title when a view is empty.'),
-    'area' => array(
+    'area' => [
       'id' => 'title',
       'sub_type' => 'empty',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['view'] = array(
+  $data['views']['view'] = [
     'title' => t('View area'),
     'help' => t('Insert a view inside an area.'),
-    'area' => array(
+    'area' => [
       'id' => 'view',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['result'] = array(
+  $data['views']['result'] = [
     'title' => t('Result summary'),
     'help' => t('Shows result summary, for example the items per page.'),
-    'area' => array(
+    'area' => [
       'id' => 'result',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['messages'] = array(
+  $data['views']['messages'] = [
     'title' => t('Messages'),
     'help' => t('Displays messages in an area.'),
-    'area' => array(
+    'area' => [
       'id' => 'messages',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['http_status_code'] = array(
+  $data['views']['http_status_code'] = [
     'title' => t('Response status code'),
     'help' => t('Alter the HTTP response status code used by this view, mostly helpful for empty results.'),
-    'area' => array(
+    'area' => [
       'id' => 'http_status_code',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['combine'] = array(
+  $data['views']['combine'] = [
    'title' => t('Combine fields filter'),
     'help' => t('Combine multiple fields together and search by them.'),
-    'filter' => array(
+    'filter' => [
       'id' => 'combine',
-    ),
-  );
+    ],
+  ];
 
-  $data['views']['dropbutton'] = array(
+  $data['views']['dropbutton'] = [
     'title' => t('Dropbutton'),
     'help' => t('Display fields in a dropbutton.'),
-    'field' => array(
+    'field' => [
       'id' => 'dropbutton',
-    ),
-  );
+    ],
+  ];
 
   // Registers an entity area handler per entity type.
   foreach (\Drupal::entityManager()->getDefinitions() as $entity_type_id => $entity_type) {
     // Excludes entity types, which cannot be rendered.
     if ($entity_type->hasViewBuilderClass()) {
       $label = $entity_type->getLabel();
-      $data['views']['entity_' . $entity_type_id] = array(
-        'title' => t('Rendered entity - @label', array('@label' => $label)),
-        'help' => t('Displays a rendered @label entity in an area.', array('@label' => $label)),
-        'area' => array(
+      $data['views']['entity_' . $entity_type_id] = [
+        'title' => t('Rendered entity - @label', ['@label' => $label]),
+        'help' => t('Displays a rendered @label entity in an area.', ['@label' => $label]),
+        'area' => [
           'entity_type' => $entity_type_id,
           'id' => 'entity',
-        ),
-      );
+        ],
+      ];
     }
   }
 
@@ -152,13 +152,13 @@ function views_views_data() {
     if (empty($actions)) {
       continue;
     }
-    $data[$entity_info->getBaseTable()][$entity_type . '_bulk_form'] = array(
+    $data[$entity_info->getBaseTable()][$entity_type . '_bulk_form'] = [
       'title' => t('Bulk update'),
       'help' => t('Allows users to apply an action to one or more items.'),
-      'field' => array(
+      'field' => [
         'id' => 'bulk_form',
-      ),
-    );
+      ],
+    ];
   }
 
   // Registers views data for the entity itself.
@@ -180,7 +180,7 @@ function views_views_data() {
     /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
     foreach ($entity_manager->getStorage('field_storage_config')->loadMultiple() as $field_storage) {
       if (_views_field_get_entity_type_storage($field_storage)) {
-        $result = (array) $module_handler->invoke($field_storage->getTypeProvider(), 'field_views_data', array($field_storage));
+        $result = (array) $module_handler->invoke($field_storage->getTypeProvider(), 'field_views_data', [$field_storage]);
         if (empty($result)) {
           $result = views_field_default_views_data($field_storage);
         }
@@ -245,8 +245,8 @@ function _views_field_get_entity_type_storage(FieldStorageConfigInterface $field
  * Therefore it looks up in all bundles to find the most used field.
  */
 function views_entity_field_label($entity_type, $field_name) {
-  $label_counter = array();
-  $all_labels = array();
+  $label_counter = [];
+  $all_labels = [];
   // Count the amount of fields per label per field storage.
   foreach (array_keys(\Drupal::entityManager()->getBundleInfo($entity_type)) as $bundle) {
     $bundle_fields = array_filter(\Drupal::entityManager()->getFieldDefinitions($entity_type, $bundle), function ($field_definition) {
@@ -260,7 +260,7 @@ function views_entity_field_label($entity_type, $field_name) {
     }
   }
   if (empty($label_counter)) {
-    return array($field_name, $all_labels);
+    return [$field_name, $all_labels];
   }
   // Sort the field labels by it most used label and return the most used one.
   // If the counts are equal, sort by the label to ensure the result is
@@ -272,7 +272,7 @@ function views_entity_field_label($entity_type, $field_name) {
     return $label_counter[$a] > $label_counter[$b] ? -1 : 1;
   });
   $label_counter = array_keys($label_counter);
-  return array($label_counter[0], $all_labels);
+  return [$label_counter[0], $all_labels];
 }
 
 /**
@@ -285,7 +285,7 @@ function views_entity_field_label($entity_type, $field_name) {
  *   The default views data for the field.
  */
 function views_field_default_views_data(FieldStorageConfigInterface $field_storage) {
-  $data = array();
+  $data = [];
 
   // Check the field type is available.
   if (!\Drupal::service('plugin.manager.field.field_type')->hasDefinition($field_storage->getType())) {
@@ -319,7 +319,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
     // We cannot do anything if for some reason there is no base table.
     return $data;
   }
-  $entity_tables = array($base_table => $entity_type_id);
+  $entity_tables = [$base_table => $entity_type_id];
   // Some entities may not have a data table.
   $data_table = $entity_type->getDataTable();
   if ($data_table) {
@@ -339,69 +339,69 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
   // @todo Generalize this code to make it work with any table layout. See
   //   https://www.drupal.org/node/2079019.
   $table_mapping = $storage->getTableMapping();
-  $field_tables = array(
-    EntityStorageInterface::FIELD_LOAD_CURRENT => array(
+  $field_tables = [
+    EntityStorageInterface::FIELD_LOAD_CURRENT => [
       'table' => $table_mapping->getDedicatedDataTableName($field_storage),
       'alias' => "{$entity_type_id}__{$field_name}",
-    ),
-  );
+    ],
+  ];
   if ($supports_revisions) {
-    $field_tables[EntityStorageInterface::FIELD_LOAD_REVISION] = array(
+    $field_tables[EntityStorageInterface::FIELD_LOAD_REVISION] = [
       'table' => $table_mapping->getDedicatedRevisionTableName($field_storage),
       'alias' => "{$entity_type_id}_revision__{$field_name}",
-    );
+    ];
   }
 
   // Build the relationships between the field table and the entity tables.
   $table_alias = $field_tables[EntityStorageInterface::FIELD_LOAD_CURRENT]['alias'];
   if ($data_table) {
     // Tell Views how to join to the base table, via the data table.
-    $data[$table_alias]['table']['join'][$data_table] = array(
+    $data[$table_alias]['table']['join'][$data_table] = [
       'table' => $table_mapping->getDedicatedDataTableName($field_storage),
       'left_field' => $entity_type->getKey('id'),
       'field' => 'entity_id',
-      'extra' => array(
-        array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE),
-        array('left_field' => 'langcode', 'field' => 'langcode'),
-      ),
-    );
+      'extra' => [
+        ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE],
+        ['left_field' => 'langcode', 'field' => 'langcode'],
+      ],
+    ];
   }
   else {
     // If there is no data table, just join directly.
-    $data[$table_alias]['table']['join'][$base_table] = array(
+    $data[$table_alias]['table']['join'][$base_table] = [
       'table' => $table_mapping->getDedicatedDataTableName($field_storage),
       'left_field' => $entity_type->getKey('id'),
       'field' => 'entity_id',
-      'extra' => array(
-        array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE),
-      ),
-    );
+      'extra' => [
+        ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE],
+      ],
+    ];
   }
 
   if ($supports_revisions) {
     $table_alias = $field_tables[EntityStorageInterface::FIELD_LOAD_REVISION]['alias'];
     if ($entity_revision_data_table) {
       // Tell Views how to join to the revision table, via the data table.
-      $data[$table_alias]['table']['join'][$entity_revision_data_table] = array(
+      $data[$table_alias]['table']['join'][$entity_revision_data_table] = [
         'table' => $table_mapping->getDedicatedRevisionTableName($field_storage),
         'left_field' => $entity_type->getKey('revision'),
         'field' => 'revision_id',
-        'extra' => array(
-          array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE),
-          array('left_field' => 'langcode', 'field' => 'langcode'),
-        ),
-      );
+        'extra' => [
+          ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE],
+          ['left_field' => 'langcode', 'field' => 'langcode'],
+        ],
+      ];
     }
     else {
       // If there is no data table, just join directly.
-      $data[$table_alias]['table']['join'][$entity_revision_table] = array(
+      $data[$table_alias]['table']['join'][$entity_revision_table] = [
         'table' => $table_mapping->getDedicatedRevisionTableName($field_storage),
         'left_field' => $entity_type->getKey('revision'),
         'field' => 'revision_id',
-        'extra' => array(
-          array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE),
-        ),
-      );
+        'extra' => [
+          ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE],
+        ],
+      ];
     }
   }
 
@@ -409,7 +409,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
   // Get the list of bundles the field appears in.
   $bundles_names = $field_storage->getBundles();
   // Build the list of additional fields to add to queries.
-  $add_fields = array('delta', 'langcode', 'bundle');
+  $add_fields = ['delta', 'langcode', 'bundle'];
   foreach (array_keys($field_columns) as $column) {
     $add_fields[] = $table_mapping->getFieldColumnName($field_storage, $column);
   }
@@ -428,41 +428,41 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
       $field_alias = $field_name;
     }
     else {
-      $group = t('@group (historical data)', array('@group' => $group_name));
+      $group = t('@group (historical data)', ['@group' => $group_name]);
       $field_alias = $field_name . '-revision_id';
     }
 
-    $data[$table_alias][$field_alias] = array(
+    $data[$table_alias][$field_alias] = [
       'group' => $group,
       'title' => $label,
       'title short' => $label,
-      'help' => t('Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
-    );
+      'help' => t('Appears in: @bundles.', ['@bundles' => implode(', ', $bundles_names)]),
+    ];
 
     // Go through and create a list of aliases for all possible combinations of
     // entity type + name.
-    $aliases = array();
-    $also_known = array();
+    $aliases = [];
+    $also_known = [];
     foreach ($all_labels as $label_name => $true) {
       if ($type == EntityStorageInterface::FIELD_LOAD_CURRENT) {
         if ($label != $label_name) {
-          $aliases[] = array(
+          $aliases[] = [
             'base' => $base_table,
             'group' => $group_name,
             'title' => $label_name,
-            'help' => t('This is an alias of @group: @field.', array('@group' => $group_name, '@field' => $label)),
-          );
-          $also_known[] = t('@group: @field', array('@group' => $group_name, '@field' => $label_name));
+            'help' => t('This is an alias of @group: @field.', ['@group' => $group_name, '@field' => $label]),
+          ];
+          $also_known[] = t('@group: @field', ['@group' => $group_name, '@field' => $label_name]);
         }
       }
       elseif ($supports_revisions && $label != $label_name) {
-        $aliases[] = array(
+        $aliases[] = [
           'base' => $table,
-          'group' => t('@group (historical data)', array('@group' => $group_name)),
+          'group' => t('@group (historical data)', ['@group' => $group_name]),
           'title' => $label_name,
-          'help' => t('This is an alias of @group: @field.', array('@group' => $group_name, '@field' => $label)),
-        );
-        $also_known[] = t('@group (historical data): @field', array('@group' => $group_name, '@field' => $label_name));
+          'help' => t('This is an alias of @group: @field.', ['@group' => $group_name, '@field' => $label]),
+        ];
+        $also_known[] = t('@group (historical data): @field', ['@group' => $group_name, '@field' => $label_name]);
       }
     }
     if ($aliases) {
@@ -481,7 +481,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
 
     $keys = array_keys($field_columns);
     $real_field = reset($keys);
-    $data[$table_alias][$field_alias]['field'] = array(
+    $data[$table_alias][$field_alias]['field'] = [
       'table' => $table,
       'id' => 'field',
       'field_name' => $field_name,
@@ -492,7 +492,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
       // Default the element type to div, let the UI change it if necessary.
       'element type' => 'div',
       'is revision' => $type == EntityStorageInterface::FIELD_LOAD_REVISION,
-    );
+    ];
   }
 
   // Expose data for each field property individually.
@@ -527,12 +527,12 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
     }
 
     if (count($field_columns) == 1 || $column == 'value') {
-      $title = t('@label (@name)', array('@label' => $label, '@name' => $field_name));
+      $title = t('@label (@name)', ['@label' => $label, '@name' => $field_name]);
       $title_short = $label;
     }
     else {
-      $title = t('@label (@name:@column)', array('@label' => $label, '@name' => $field_name, '@column' => $column));
-      $title_short = t('@label:@column', array('@label' => $label, '@column' => $column));
+      $title = t('@label (@name:@column)', ['@label' => $label, '@name' => $field_name, '@column' => $column]);
+      $title_short = t('@label:@column', ['@label' => $label, '@column' => $column]);
     }
 
     // Expose data for the property.
@@ -544,38 +544,38 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
         $group = $group_name;
       }
       else {
-        $group = t('@group (historical data)', array('@group' => $group_name));
+        $group = t('@group (historical data)', ['@group' => $group_name]);
       }
       $column_real_name = $table_mapping->getFieldColumnName($field_storage, $column);
 
       // Load all the fields from the table by default.
       $additional_fields = $table_mapping->getAllColumns($table);
 
-      $data[$table_alias][$column_real_name] = array(
+      $data[$table_alias][$column_real_name] = [
         'group' => $group,
         'title' => $title,
         'title short' => $title_short,
-        'help' => t('Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
-      );
+        'help' => t('Appears in: @bundles.', ['@bundles' => implode(', ', $bundles_names)]),
+      ];
 
       // Go through and create a list of aliases for all possible combinations of
       // entity type + name.
-      $aliases = array();
-      $also_known = array();
+      $aliases = [];
+      $also_known = [];
       foreach ($all_labels as $label_name => $true) {
         if ($label != $label_name) {
           if (count($field_columns) == 1 || $column == 'value') {
-            $alias_title = t('@label (@name)', array('@label' => $label_name, '@name' => $field_name));
+            $alias_title = t('@label (@name)', ['@label' => $label_name, '@name' => $field_name]);
           }
           else {
-            $alias_title = t('@label (@name:@column)', array('@label' => $label_name, '@name' => $field_name, '@column' => $column));
+            $alias_title = t('@label (@name:@column)', ['@label' => $label_name, '@name' => $field_name, '@column' => $column]);
           }
-          $aliases[] = array(
+          $aliases[] = [
             'group' => $group_name,
             'title' => $alias_title,
-            'help' => t('This is an alias of @group: @field.', array('@group' => $group_name, '@field' => $title)),
-          );
-          $also_known[] = t('@group: @field', array('@group' => $group_name, '@field' => $title));
+            'help' => t('This is an alias of @group: @field.', ['@group' => $group_name, '@field' => $title]),
+          ];
+          $also_known[] = t('@group: @field', ['@group' => $group_name, '@field' => $title]);
         }
       }
       if ($aliases) {
@@ -592,7 +592,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
         $data[$table_alias][$column_real_name]['help'] = Markup::create($data[$table_alias][$column_real_name]['help'] . ' ' . t('Also known as:') . ' ' . implode(', ', $also_known));
       }
 
-      $data[$table_alias][$column_real_name]['argument'] = array(
+      $data[$table_alias][$column_real_name]['argument'] = [
         'field' => $column_real_name,
         'table' => $table,
         'id' => $argument,
@@ -600,8 +600,8 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
         'field_name' => $field_name,
         'entity_type' => $entity_type_id,
         'empty field name' => t('- No value -'),
-      );
-      $data[$table_alias][$column_real_name]['filter'] = array(
+      ];
+      $data[$table_alias][$column_real_name]['filter'] = [
         'field' => $column_real_name,
         'table' => $table,
         'id' => $filter,
@@ -609,16 +609,16 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
         'field_name' => $field_name,
         'entity_type' => $entity_type_id,
         'allow empty' => TRUE,
-      );
+      ];
       if (!empty($allow_sort)) {
-        $data[$table_alias][$column_real_name]['sort'] = array(
+        $data[$table_alias][$column_real_name]['sort'] = [
           'field' => $column_real_name,
           'table' => $table,
           'id' => $sort,
           'additional fields' => $additional_fields,
           'field_name' => $field_name,
           'entity_type' => $entity_type_id,
-        );
+        ];
       }
 
       // Set click sortable if there is a field definition.
@@ -628,19 +628,19 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
 
       // Expose additional delta column for multiple value fields.
       if ($field_storage->isMultiple()) {
-        $title_delta = t('@label (@name:delta)', array('@label' => $label, '@name' => $field_name));
-        $title_short_delta = t('@label:delta', array('@label' => $label));
+        $title_delta = t('@label (@name:delta)', ['@label' => $label, '@name' => $field_name]);
+        $title_short_delta = t('@label:delta', ['@label' => $label]);
 
-        $data[$table_alias]['delta'] = array(
+        $data[$table_alias]['delta'] = [
           'group' => $group,
           'title' => $title_delta,
           'title short' => $title_short_delta,
-          'help' => t('Delta - Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
-        );
-        $data[$table_alias]['delta']['field'] = array(
+          'help' => t('Delta - Appears in: @bundles.', ['@bundles' => implode(', ', $bundles_names)]),
+        ];
+        $data[$table_alias]['delta']['field'] = [
           'id' => 'numeric',
-        );
-        $data[$table_alias]['delta']['argument'] = array(
+        ];
+        $data[$table_alias]['delta']['argument'] = [
           'field' => 'delta',
           'table' => $table,
           'id' => 'numeric',
@@ -648,8 +648,8 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
           'empty field name' => t('- No value -'),
           'field_name' => $field_name,
           'entity_type' => $entity_type_id,
-        );
-        $data[$table_alias]['delta']['filter'] = array(
+        ];
+        $data[$table_alias]['delta']['filter'] = [
           'field' => 'delta',
           'table' => $table,
           'id' => 'numeric',
@@ -657,15 +657,15 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
           'field_name' => $field_name,
           'entity_type' => $entity_type_id,
           'allow empty' => TRUE,
-        );
-        $data[$table_alias]['delta']['sort'] = array(
+        ];
+        $data[$table_alias]['delta']['sort'] = [
           'field' => 'delta',
           'table' => $table,
           'id' => 'standard',
           'additional fields' => $additional_fields,
           'field_name' => $field_name,
           'entity_type' => $entity_type_id,
-        );
+        ];
       }
     }
   }
@@ -704,30 +704,30 @@ function core_field_views_data(FieldStorageConfigInterface $field_storage) {
 
     // Provide a relationship for the entity type with the entity reference
     // field.
-    $args = array(
+    $args = [
       '@label' => $target_entity_type->getLabel(),
       '@field_name' => $field_name,
-    );
-    $data[$table_name][$field_name]['relationship'] = array(
+    ];
+    $data[$table_name][$field_name]['relationship'] = [
       'title' => t('@label referenced from @field_name', $args),
       'label' => t('@field_name: @label', $args),
       'group' => $entity_type->getLabel(),
-      'help' => t('Appears in: @bundles.', array('@bundles' => implode(', ', $field_storage->getBundles()))),
+      'help' => t('Appears in: @bundles.', ['@bundles' => implode(', ', $field_storage->getBundles())]),
       'id' => 'standard',
       'base' => $target_base_table,
       'entity type' => $target_entity_type_id,
       'base field' => $target_entity_type->getKey('id'),
       'relationship field' => $field_name . '_target_id',
-    );
+    ];
 
     // Provide a reverse relationship for the entity type that is referenced by
     // the field.
     $args['@entity'] = $entity_type->getLabel();
     $args['@label'] = $target_entity_type->getLowercaseLabel();
     $pseudo_field_name = 'reverse__' . $entity_type_id . '__' . $field_name;
-    $data[$target_base_table][$pseudo_field_name]['relationship'] = array(
+    $data[$target_base_table][$pseudo_field_name]['relationship'] = [
       'title' => t('@entity using @field_name', $args),
-      'label' => t('@field_name', array('@field_name' => $field_name)),
+      'label' => t('@field_name', ['@field_name' => $field_name]),
       'group' => $target_entity_type->getLabel(),
       'help' => t('Relate each @entity with a @field_name set to the @label.', $args),
       'id' => 'entity_reverse',
@@ -737,14 +737,14 @@ function core_field_views_data(FieldStorageConfigInterface $field_storage) {
       'field_name' => $field_name,
       'field table' => $table_mapping->getDedicatedDataTableName($field_storage),
       'field field' => $field_name . '_target_id',
-      'join_extra' => array(
-        array(
+      'join_extra' => [
+        [
           'field' => 'deleted',
           'value' => 0,
           'numeric' => TRUE,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   return $data;
diff --git a/web/core/modules/views/views.views_execution.inc b/web/core/modules/views/views.views_execution.inc
index 91dead539..8b324a359 100644
--- a/web/core/modules/views/views.views_execution.inc
+++ b/web/core/modules/views/views.views_execution.inc
@@ -18,10 +18,10 @@ use Drupal\views\Plugin\views\PluginBase;
  *   \Drupal\views\Plugin\views\PluginBase::listLanguages().
  */
 function views_views_query_substitutions(ViewExecutable $view) {
-  $substitutions = array(
+  $substitutions = [
     '***CURRENT_VERSION***' => \Drupal::VERSION,
     '***CURRENT_TIME***' => REQUEST_TIME,
-  ) + PluginBase::queryLanguageSubstitutions();
+  ] + PluginBase::queryLanguageSubstitutions();
 
   return $substitutions;
 }
diff --git a/web/core/modules/views_ui/admin.inc b/web/core/modules/views_ui/admin.inc
index fd031d242..a2d9fedcb 100644
--- a/web/core/modules/views_ui/admin.inc
+++ b/web/core/modules/views_ui/admin.inc
@@ -41,8 +41,8 @@ use Drupal\Core\Url;
  *   array('dynamic_content', 'section') for this parameter.
  */
 function views_ui_add_ajax_trigger(&$wrapping_element, $trigger_key, $refresh_parents) {
-  $seen_ids = &drupal_static(__FUNCTION__ . ':seen_ids', array());
-  $seen_buttons = &drupal_static(__FUNCTION__ . ':seen_buttons', array());
+  $seen_ids = &drupal_static(__FUNCTION__ . ':seen_ids', []);
+  $seen_buttons = &drupal_static(__FUNCTION__ . ':seen_buttons', []);
 
   // Add the AJAX behavior to the triggering element.
   $triggering_element = &$wrapping_element[$trigger_key];
@@ -60,28 +60,28 @@ function views_ui_add_ajax_trigger(&$wrapping_element, $trigger_key, $refresh_pa
   // should be displayed next to the triggering element on the form.
   $button_key = $trigger_key . '_trigger_update';
   $element_info = \Drupal::service('element_info');
-  $wrapping_element[$button_key] = array(
+  $wrapping_element[$button_key] = [
     '#type' => 'submit',
     // Hide this button when JavaScript is enabled.
-    '#attributes' => array('class' => array('js-hide')),
-    '#submit' => array('views_ui_nojs_submit'),
+    '#attributes' => ['class' => ['js-hide']],
+    '#submit' => ['views_ui_nojs_submit'],
     // Add a process function to limit this button's validation errors to the
     // triggering element only. We have to do this in #process since until the
     // form API has added the #parents property to the triggering element for
     // us, we don't have any (easy) way to find out where its submitted values
     // will eventually appear in $form_state->getValues().
-    '#process' => array_merge(array('views_ui_add_limited_validation'), $element_info->getInfoProperty('submit', '#process', array())),
+    '#process' => array_merge(['views_ui_add_limited_validation'], $element_info->getInfoProperty('submit', '#process', [])),
     // Add an after-build function that inserts a wrapper around the region of
     // the form that needs to be refreshed by AJAX (so that the AJAX system can
     // detect and dynamically update it). This is done in #after_build because
     // it's a convenient place where we have automatic access to the complete
     // form array, but also to minimize the chance that the HTML we add will
     // get clobbered by code that runs after we have added it.
-    '#after_build' => array_merge($element_info->getInfoProperty('submit', '#after_build', array()), array('views_ui_add_ajax_wrapper')),
-  );
+    '#after_build' => array_merge($element_info->getInfoProperty('submit', '#after_build', []), ['views_ui_add_ajax_wrapper']),
+  ];
   // Copy #weight and #access from the triggering element to the button, so
   // that the two elements will be displayed together.
-  foreach (array('#weight', '#access') as $property) {
+  foreach (['#weight', '#access'] as $property) {
     if (isset($triggering_element[$property])) {
       $wrapping_element[$button_key][$property] = $triggering_element[$property];
     }
@@ -92,25 +92,25 @@ function views_ui_add_ajax_trigger(&$wrapping_element, $trigger_key, $refresh_pa
   // key and it may be a TranslatableMarkup.
   $button_title = !empty($triggering_element['#title']) ? (string) $triggering_element['#title'] : $trigger_key;
   if (empty($seen_buttons[$button_title])) {
-    $wrapping_element[$button_key]['#value'] = t('Update "@title" choice', array(
+    $wrapping_element[$button_key]['#value'] = t('Update "@title" choice', [
       '@title' => $button_title,
-    ));
+    ]);
     $seen_buttons[$button_title] = 1;
   }
   else {
-    $wrapping_element[$button_key]['#value'] = t('Update "@title" choice (@number)', array(
+    $wrapping_element[$button_key]['#value'] = t('Update "@title" choice (@number)', [
       '@title' => $button_title,
       '@number' => ++$seen_buttons[$button_title],
-    ));
+    ]);
   }
 
   // Attach custom data to the triggering element and submit button, so we can
   // use it in both the process function and AJAX callback.
-  $ajax_data = array(
+  $ajax_data = [
     'wrapper' => $triggering_element['#ajax']['wrapper'],
     'trigger_key' => $trigger_key,
     'refresh_parents' => $refresh_parents,
-  );
+  ];
   $seen_ids[$triggering_element['#ajax']['wrapper']] = TRUE;
   $triggering_element['#views_ui_ajax_data'] = $ajax_data;
   $wrapping_element[$button_key]['#views_ui_ajax_data'] = $ajax_data;
@@ -132,7 +132,7 @@ function views_ui_add_limited_validation($element, FormStateInterface $form_stat
   // Limit this button's validation to the AJAX triggering element, so it can
   // update the form for that change without requiring that the rest of the
   // form be filled out properly yet.
-  $element['#limit_validation_errors'] = array($ajax_triggering_element['#parents']);
+  $element['#limit_validation_errors'] = [$ajax_triggering_element['#parents']];
 
   // If we are in the process of a form submission and this is the button that
   // was clicked, the form API workflow in \Drupal::formBuilder()->doBuildForm()
@@ -165,10 +165,10 @@ function views_ui_add_ajax_wrapper($element, FormStateInterface $form_state) {
   // The HTML ID that AJAX expects was also stored in a property on the
   // element, so use that information to insert the wrapper <div> here.
   $id = $element['#views_ui_ajax_data']['wrapper'];
-  $refresh_element += array(
+  $refresh_element += [
     '#prefix' => '',
     '#suffix' => '',
-  );
+  ];
   $refresh_element['#prefix'] = '<div id="' . $id . '" class="views-ui-ajax-wrapper">' . $refresh_element['#prefix'];
   $refresh_element['#suffix'] .= '</div>';
 
@@ -213,16 +213,16 @@ function views_ui_standard_display_dropdown(&$form, FormStateInterface $form_sta
 
   // @todo Move this to a separate function if it's needed on any forms that
   // don't have the display dropdown.
-  $form['override'] = array(
+  $form['override'] = [
     '#prefix' => '<div class="views-override clearfix form--inline views-offset-top" data-drupal-views-offset="top">',
     '#suffix' => '</div>',
     '#weight' => -1000,
     '#tree' => TRUE,
-  );
+  ];
 
   // Add the "2 of 3" progress indicator.
   if ($form_progress = $view->getFormProgress()) {
-    $form['progress']['#markup'] = '<div id="views-progress-indicator" class="views-progress-indicator">' . t('@current of @total', array('@current' => $form_progress['current'], '@total' => $form_progress['total'])) . '</div>';
+    $form['progress']['#markup'] = '<div id="views-progress-indicator" class="views-progress-indicator">' . t('@current of @total', ['@current' => $form_progress['current'], '@total' => $form_progress['total']]) . '</div>';
     $form['progress']['#weight'] = -1001;
   }
 
@@ -247,17 +247,17 @@ function views_ui_standard_display_dropdown(&$form, FormStateInterface $form_sta
   }
 
   $display_dropdown['default'] = ($section_overrides ? t('All displays (except overridden)') : t('All displays'));
-  $display_dropdown[$display_id] = t('This @display_type (override)', array('@display_type' => $current_display->getPluginId()));
+  $display_dropdown[$display_id] = t('This @display_type (override)', ['@display_type' => $current_display->getPluginId()]);
   // Only display the revert option if we are in a overridden section.
   if (!$section_defaulted) {
     $display_dropdown['default_revert'] = t('Revert to default');
   }
 
-  $form['override']['dropdown'] = array(
+  $form['override']['dropdown'] = [
     '#type' => 'select',
     '#title' => t('For'), // @TODO: Translators may need more context than this.
     '#options' => $display_dropdown,
-  );
+  ];
   if ($current_display->isDefaulted($section)) {
     $form['override']['dropdown']['#default_value'] = 'defaults';
   }
diff --git a/web/core/modules/views_ui/css/views_ui.admin.theme.css b/web/core/modules/views_ui/css/views_ui.admin.theme.css
index 4ab55c465..460e75eaa 100644
--- a/web/core/modules/views_ui/css/views_ui.admin.theme.css
+++ b/web/core/modules/views_ui/css/views_ui.admin.theme.css
@@ -170,9 +170,9 @@ details.box-padding {
   margin-bottom: 6px;
   margin-top: 6px;
 }
-.views-ui-view-title {
+.views-ui-view-name h3 {
   font-weight: bold;
-  margin-top: 0;
+  margin: 0.25em 0;
 }
 .view-changed {
   margin-bottom: 21px;
@@ -183,22 +183,33 @@ details.box-padding {
   margin-bottom: 0;
   margin-top: 18px;
 }
+.views-ui-view-displays ul {
+  margin-left: 0; /* LTR */
+  padding-left: 0; /* LTR */
+  list-style: none;
+}
+[dir="rtl"] .views-ui-view-displays ul {
+  margin-right: 0;
+  padding-right: 0;
+  margin-left: inherit;
+  padding-left: inherit;
+}
 
 /* These header classes are ambiguous and should be scoped to th elements */
 .views-ui-name {
-  width: 18%;
+  width: 20%;
 }
 .views-ui-description {
-  width: 26%;
+  width: 30%;
 }
-.views-ui-tag {
-  width: 8%;
+.views-ui-machine-name {
+  width: 15%;
 }
-.views-ui-path {
-  width: auto;
+.views-ui-displays {
+  width: 25%;
 }
 .views-ui-operations {
-  width: 24%;
+  width: 10%;
 }
 
 /**
diff --git a/web/core/modules/views_ui/js/ajax.js b/web/core/modules/views_ui/js/ajax.js
index b044688c3..d4ff7642f 100644
--- a/web/core/modules/views_ui/js/ajax.js
+++ b/web/core/modules/views_ui/js/ajax.js
@@ -187,13 +187,12 @@
       // Bind AJAX behaviors to all items showing the class.
       $('a.views-ajax-link', context).once('views-ajax').each(function () {
         var element_settings = base_element_settings;
-        element_settings.base = base;
+        element_settings.base = $(this).attr('id');
         element_settings.element = this;
         // Set the URL to go to the anchor.
         if ($(this).attr('href')) {
           element_settings.url = $(this).attr('href');
         }
-        var base = $(this).attr('id');
         Drupal.ajax(element_settings);
       });
 
@@ -213,9 +212,8 @@
 
           element_settings.wrapper = 'views-preview-wrapper';
           element_settings.method = 'replaceWith';
-          element_settings.base = base;
+          element_settings.base = $(this).attr('id');
           element_settings.element = this;
-          var base = $(this).attr('id');
           Drupal.ajax(element_settings);
         });
 
@@ -239,10 +237,9 @@
           element_settings.wrapper = 'views-preview-wrapper';
           element_settings.method = 'replaceWith';
           element_settings.event = 'click';
-          element_settings.base = base;
+          element_settings.base = $(this).attr('id');
           element_settings.element = this;
 
-          var base = $(this).attr('id');
           Drupal.ajax(element_settings);
         });
 
diff --git a/web/core/modules/views_ui/js/views-admin.js b/web/core/modules/views_ui/js/views-admin.js
index 761185ed6..0fda80874 100644
--- a/web/core/modules/views_ui/js/views-admin.js
+++ b/web/core/modules/views_ui/js/views-admin.js
@@ -483,18 +483,18 @@
      *   An array of all the filterable options.
      */
     getOptions: function ($allOptions) {
-      var $label;
+      var $title;
       var $description;
       var $option;
       var options = [];
       var length = $allOptions.length;
       for (var i = 0; i < length; i++) {
         $option = $($allOptions[i]);
-        $label = $option.find('label');
+        $title = $option.find('.title');
         $description = $option.find('.description');
         options[i] = {
-          // Search on the lowercase version of the label text + description.
-          searchText: $label.text().toLowerCase() + ' ' + $description.text().toLowerCase(),
+          // Search on the lowercase version of the title text + description.
+          searchText: $title.text().toLowerCase() + ' ' + $description.text().toLowerCase(),
           // Maintain a reference to the jQuery object for each row, so we don't
           // have to create a new object inside the performance-sensitive keyup
           // handler.
@@ -708,6 +708,7 @@
         // When the link is clicked, dynamically click the hidden form button
         // for adding a new filter group.
         .once('views-rearrange-filter-handler')
+        .find('#views-add-group-link')
         .on('click.views-rearrange-filter-handler', $.proxy(this, 'clickAddGroupButton'));
 
       // Find each (visually hidden) button for removing a filter group and
diff --git a/web/core/modules/views_ui/src/Ajax/SetFormCommand.php b/web/core/modules/views_ui/src/Ajax/SetFormCommand.php
index ffafde6c6..3910eb219 100644
--- a/web/core/modules/views_ui/src/Ajax/SetFormCommand.php
+++ b/web/core/modules/views_ui/src/Ajax/SetFormCommand.php
@@ -32,10 +32,10 @@ class SetFormCommand implements CommandInterface {
    * {@inheritdoc}
    */
   public function render() {
-    return array(
+    return [
       'command' => 'viewsSetForm',
       'url' => $this->url,
-    );
+    ];
   }
 
 }
diff --git a/web/core/modules/views_ui/src/Controller/ViewsUIController.php b/web/core/modules/views_ui/src/Controller/ViewsUIController.php
index f36e912ad..979476207 100644
--- a/web/core/modules/views_ui/src/Controller/ViewsUIController.php
+++ b/web/core/modules/views_ui/src/Controller/ViewsUIController.php
@@ -58,7 +58,7 @@ class ViewsUIController extends ControllerBase {
 
     // Fetch all fieldapi fields which are used in views
     // Therefore search in all views, displays and handler-types.
-    $fields = array();
+    $fields = [];
     $handler_types = ViewExecutable::getHandlerTypes();
     foreach ($views as $view) {
       $executable = $view->getExecutable();
@@ -81,12 +81,12 @@ class ViewsUIController extends ControllerBase {
       }
     }
 
-    $header = array(t('Field name'), t('Used in'));
-    $rows = array();
+    $header = [t('Field name'), t('Used in')];
+    $rows = [];
     foreach ($fields as $field_name => $views) {
       $rows[$field_name]['data'][0]['data']['#plain_text'] = $field_name;
       foreach ($views as $view) {
-        $rows[$field_name]['data'][1][] = $this->l($view, new Url('entity.view.edit_form', array('view' => $view)));
+        $rows[$field_name]['data'][1][] = $this->l($view, new Url('entity.view.edit_form', ['view' => $view]));
       }
       $item_list = [
         '#theme' => 'item_list',
@@ -98,12 +98,12 @@ class ViewsUIController extends ControllerBase {
 
     // Sort rows by field name.
     ksort($rows);
-    $output = array(
+    $output = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
       '#empty' => t('No fields have been used in views yet.'),
-    );
+    ];
 
     return $output;
   }
@@ -120,7 +120,7 @@ class ViewsUIController extends ControllerBase {
       $views = [];
       // Link each view name to the view itself.
       foreach ($row['views'] as $row_name => $view) {
-        $views[] = $this->l($view, new Url('entity.view.edit_form', array('view' => $view)));
+        $views[] = $this->l($view, new Url('entity.view.edit_form', ['view' => $view]));
       }
       unset($row['views']);
       $row['views']['data'] = [
@@ -132,12 +132,12 @@ class ViewsUIController extends ControllerBase {
 
     // Sort rows by field name.
     ksort($rows);
-    return array(
+    return [
       '#type' => 'table',
-      '#header' => array(t('Type'), t('Name'), t('Provided by'), t('Used in')),
+      '#header' => [t('Type'), t('Name'), t('Provided by'), t('Used in')],
       '#rows' => $rows,
       '#empty' => t('There are no enabled views.'),
-    );
+    ];
   }
 
   /**
@@ -180,7 +180,7 @@ class ViewsUIController extends ControllerBase {
    *   A JSON response containing the autocomplete suggestions for Views tags.
    */
   public function autocompleteTag(Request $request) {
-    $matches = array();
+    $matches = [];
     $string = $request->query->get('q');
     // Get matches from default views.
     $views = $this->entityManager()->getStorage('view')->loadMultiple();
@@ -223,8 +223,8 @@ class ViewsUIController extends ControllerBase {
     }
     $build['#title'] = $name;
 
-    $build['edit'] = $this->entityFormBuilder()->getForm($view, 'edit', array('display_id' => $display_id));
-    $build['preview'] = $this->entityFormBuilder()->getForm($view, 'preview', array('display_id' => $display_id));
+    $build['edit'] = $this->entityFormBuilder()->getForm($view, 'edit', ['display_id' => $display_id]);
+    $build['preview'] = $this->entityFormBuilder()->getForm($view, 'preview', ['display_id' => $display_id]);
     return $build;
   }
 
diff --git a/web/core/modules/views_ui/src/Form/AdvancedSettingsForm.php b/web/core/modules/views_ui/src/Form/AdvancedSettingsForm.php
index 88661a775..36f34c26a 100644
--- a/web/core/modules/views_ui/src/Form/AdvancedSettingsForm.php
+++ b/web/core/modules/views_ui/src/Form/AdvancedSettingsForm.php
@@ -32,52 +32,52 @@ class AdvancedSettingsForm extends ConfigFormBase {
     $form = parent::buildForm($form, $form_state);
 
     $config = $this->config('views.settings');
-    $form['cache'] = array(
+    $form['cache'] = [
       '#type' => 'details',
       '#title' => $this->t('Caching'),
       '#open' => TRUE,
-    );
+    ];
 
-    $form['cache']['skip_cache'] = array(
+    $form['cache']['skip_cache'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Disable views data caching'),
       '#description' => $this->t("Views caches data about tables, modules and views available, to increase performance. By checking this box, Views will skip this cache and always rebuild this data when needed. This can have a serious performance impact on your site."),
       '#default_value' => $config->get('skip_cache'),
-    );
+    ];
 
-    $form['cache']['clear_cache'] = array(
+    $form['cache']['clear_cache'] = [
       '#type' => 'submit',
       '#value' => $this->t("Clear Views' cache"),
-      '#submit' => array('::cacheSubmit'),
-    );
+      '#submit' => ['::cacheSubmit'],
+    ];
 
-    $form['debug'] = array(
+    $form['debug'] = [
       '#type' => 'details',
       '#title' => $this->t('Debugging'),
       '#open' => TRUE,
-    );
+    ];
 
-    $form['debug']['sql_signature'] = array(
+    $form['debug']['sql_signature'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Add Views signature to all SQL queries'),
       '#description' => $this->t("All Views-generated queries will include the name of the views and display 'view-name:display-name' as a string at the end of the SELECT clause. This makes identifying Views queries in database server logs simpler, but should only be used when troubleshooting."),
 
       '#default_value' => $config->get('sql_signature'),
-    );
+    ];
 
     $options = Views::fetchPluginNames('display_extender');
     if (!empty($options)) {
-      $form['extenders'] = array(
+      $form['extenders'] = [
         '#type' => 'details',
         '#open' => TRUE,
-      );
-      $form['extenders']['display_extenders'] = array(
+      ];
+      $form['extenders']['display_extenders'] = [
         '#title' => $this->t('Display extenders'),
         '#default_value' => array_filter($config->get('display_extenders')),
         '#options' => $options,
         '#type' => 'checkboxes',
         '#description' => $this->t('Select extensions of the views interface.')
-      );
+      ];
     }
 
     return $form;
@@ -90,7 +90,7 @@ class AdvancedSettingsForm extends ConfigFormBase {
     $this->config('views.settings')
       ->set('skip_cache', $form_state->getValue('skip_cache'))
       ->set('sql_signature', $form_state->getValue('sql_signature'))
-      ->set('display_extenders', $form_state->getValue('display_extenders', array()))
+      ->set('display_extenders', $form_state->getValue('display_extenders', []))
       ->save();
 
     parent::submitForm($form, $form_state);
diff --git a/web/core/modules/views_ui/src/Form/Ajax/AddHandler.php b/web/core/modules/views_ui/src/Form/Ajax/AddHandler.php
index ada0ccd34..0a04000a6 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/AddHandler.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/AddHandler.php
@@ -49,16 +49,16 @@ class AddHandler extends ViewsFormBase {
     $display_id = $form_state->get('display_id');
     $type = $form_state->get('type');
 
-    $form = array(
-      'options' => array(
-        '#theme_wrappers' => array('container'),
-        '#attributes' => array('class' => array('scroll'), 'data-drupal-views-scroll' => TRUE),
-      ),
-    );
+    $form = [
+      'options' => [
+        '#theme_wrappers' => ['container'],
+        '#attributes' => ['class' => ['scroll'], 'data-drupal-views-scroll' => TRUE],
+      ],
+    ];
 
     $executable = $view->getExecutable();
     if (!$executable->setDisplay($display_id)) {
-      $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
+      $form['markup'] = ['#markup' => $this->t('Invalid display id @display', ['@display' => $display_id])];
       return $form;
     }
     $display = &$executable->displayHandlers->get($display_id);
@@ -71,7 +71,7 @@ class AddHandler extends ViewsFormBase {
       $type = $types[$type]['type'];
     }
 
-    $form['#title'] = $this->t('Add @type', array('@type' => $ltitle));
+    $form['#title'] = $this->t('Add @type', ['@type' => $ltitle]);
     $form['#section'] = $display_id . 'add-handler';
 
     // Add the display override dropdown.
@@ -82,36 +82,36 @@ class AddHandler extends ViewsFormBase {
     $options = Views::viewsDataHelper()->fetchFields(array_keys($base_tables), $type, $display->useGroupBy(), $form_state->get('type'));
 
     if (!empty($options)) {
-      $form['override']['controls'] = array(
-        '#theme_wrappers' => array('container'),
+      $form['override']['controls'] = [
+        '#theme_wrappers' => ['container'],
         '#id' => 'views-filterable-options-controls',
         '#attributes' => ['class' => ['form--inline', 'views-filterable-options-controls']],
-      );
-      $form['override']['controls']['options_search'] = array(
+      ];
+      $form['override']['controls']['options_search'] = [
         '#type' => 'textfield',
         '#title' => $this->t('Search'),
-      );
+      ];
 
-      $groups = array('all' => $this->t('- All -'));
-      $form['override']['controls']['group'] = array(
+      $groups = ['all' => $this->t('- All -')];
+      $form['override']['controls']['group'] = [
         '#type' => 'select',
         '#title' => $this->t('Category'),
-        '#options' => array(),
-      );
+        '#options' => [],
+      ];
 
-      $form['options']['name'] = array(
+      $form['options']['name'] = [
         '#prefix' => '<div class="views-radio-box form-checkboxes views-filterable-options">',
         '#suffix' => '</div>',
         '#type' => 'tableselect',
-        '#header' => array(
+        '#header' => [
           'title' => $this->t('Title'),
           'group' => $this->t('Category'),
           'help' => $this->t('Description'),
-        ),
+        ],
         '#js_select' => FALSE,
-      );
+      ];
 
-      $grouped_options = array();
+      $grouped_options = [];
       foreach ($options as $key => $option) {
         $group = preg_replace('/[^a-z0-9]/', '-', strtolower($option['group']));
         $groups[$group] = $option['group'];
@@ -136,50 +136,50 @@ class AddHandler extends ViewsFormBase {
 
       foreach ($grouped_options as $group => $group_options) {
         foreach ($group_options as $key => $option) {
-          $form['options']['name']['#options'][$key] = array(
-            '#attributes' => array(
-              'class' => array('filterable-option', $group),
-            ),
-            'title' => array(
-              'data' => array(
+          $form['options']['name']['#options'][$key] = [
+            '#attributes' => [
+              'class' => ['filterable-option', $group],
+            ],
+            'title' => [
+              'data' => [
                 '#title' => $option['title'],
                 '#plain_text' => $option['title'],
-              ),
-              'class' => array('title'),
-            ),
+              ],
+              'class' => ['title'],
+            ],
             'group' => $option['group'],
-            'help' => array(
+            'help' => [
               'data' => $option['help'],
-              'class' => array('description'),
-            ),
-          );
+              'class' => ['description'],
+            ],
+          ];
         }
       }
 
       $form['override']['controls']['group']['#options'] = $groups;
     }
     else {
-      $form['options']['markup'] = array(
-        '#markup' => '<div class="js-form-item form-item">' . $this->t('There are no @types available to add.', array('@types' => $ltitle)) . '</div>',
-      );
+      $form['options']['markup'] = [
+        '#markup' => '<div class="js-form-item form-item">' . $this->t('There are no @types available to add.', ['@types' => $ltitle]) . '</div>',
+      ];
     }
     // Add a div to show the selected items
-    $form['selected'] = array(
+    $form['selected'] = [
       '#type' => 'item',
       '#markup' => '<span class="views-ui-view-title">' . $this->t('Selected:') . '</span> ' . '<div class="views-selected-options"></div>',
-      '#theme_wrappers' => array('form_element', 'views_ui_container'),
-      '#attributes' => array(
-        'class' => array('container-inline', 'views-add-form-selected', 'views-offset-bottom'),
+      '#theme_wrappers' => ['form_element', 'views_ui_container'],
+      '#attributes' => [
+        'class' => ['container-inline', 'views-add-form-selected', 'views-offset-bottom'],
         'data-drupal-views-offset' => 'bottom',
-      ),
-    );
-    $view->getStandardButtons($form, $form_state, 'views_ui_add_handler_form', $this->t('Add and configure @types', array('@types' => $ltitle)));
+      ],
+    ];
+    $view->getStandardButtons($form, $form_state, 'views_ui_add_handler_form', $this->t('Add and configure @types', ['@types' => $ltitle]));
 
     // Remove the default submit function.
     $form['actions']['submit']['#submit'] = array_filter($form['actions']['submit']['#submit'], function($var) {
       return !(is_array($var) && isset($var[1]) && $var[1] == 'standardSubmit');
     });
-    $form['actions']['submit']['#submit'][] = array($view, 'submitItemAdd');
+    $form['actions']['submit']['#submit'][] = [$view, 'submitItemAdd'];
 
     return $form;
   }
diff --git a/web/core/modules/views_ui/src/Form/Ajax/Analyze.php b/web/core/modules/views_ui/src/Form/Ajax/Analyze.php
index 458575d37..52784d3d3 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/Analyze.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/Analyze.php
@@ -36,11 +36,11 @@ class Analyze extends ViewsFormBase {
     $analyzer = Views::analyzer();
     $messages = $analyzer->getMessages($view->getExecutable());
 
-    $form['analysis'] = array(
+    $form['analysis'] = [
       '#prefix' => '<div class="js-form-item form-item">',
       '#suffix' => '</div>',
       '#markup' => $analyzer->formatMessages($messages),
-    );
+    ];
 
     // Inform the standard button function that we want an OK button.
     $form_state->set('ok_button', TRUE);
diff --git a/web/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php b/web/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
index 819cb755b..972b4b940 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
@@ -54,17 +54,17 @@ class ConfigHandler extends ViewsFormBase {
     $type = $form_state->get('type');
     $id = $form_state->get('id');
 
-    $form = array(
-      'options' => array(
+    $form = [
+      'options' => [
         '#tree' => TRUE,
-        '#theme_wrappers' => array('container'),
-        '#attributes' => array('class' => array('scroll'), 'data-drupal-views-scroll' => TRUE),
-      ),
-    );
+        '#theme_wrappers' => ['container'],
+        '#attributes' => ['class' => ['scroll'], 'data-drupal-views-scroll' => TRUE],
+      ],
+    ];
     $executable = $view->getExecutable();
     $save_ui_cache = FALSE;
     if (!$executable->setDisplay($display_id)) {
-      $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
+      $form['markup'] = ['#markup' => $this->t('Invalid display id @display', ['@display' => $display_id])];
       return $form;
     }
     $item = $executable->getHandler($display_id, $type, $id);
@@ -72,7 +72,7 @@ class ConfigHandler extends ViewsFormBase {
     if ($item) {
       $handler = $executable->display_handler->getHandler($type, $id);
       if (empty($handler)) {
-        $form['markup'] = array('#markup' => $this->t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
+        $form['markup'] = ['#markup' => $this->t("Error: handler for @table > @field doesn't exist!", ['@table' => $item['table'], '@field' => $item['field']])];
       }
       else {
         $types = ViewExecutable::getHandlerTypes();
@@ -88,7 +88,7 @@ class ConfigHandler extends ViewsFormBase {
         // A whole bunch of code to figure out what relationships are valid for
         // this item.
         $relationships = $executable->display_handler->getOption('relationships');
-        $relationship_options = array();
+        $relationship_options = [];
 
         foreach ($relationships as $relationship) {
           // relationships can't link back to self. But also, due to ordering,
@@ -118,7 +118,7 @@ class ConfigHandler extends ViewsFormBase {
           // it to none.
           $base_fields = Views::viewsDataHelper()->fetchFields($view->get('base_table'), $type, $executable->display_handler->useGroupBy());
           if (isset($base_fields[$item['table'] . '.' . $item['field']])) {
-            $relationship_options = array_merge(array('none' => $this->t('Do not use a relationship')), $relationship_options);
+            $relationship_options = array_merge(['none' => $this->t('Do not use a relationship')], $relationship_options);
           }
           $rel = empty($item['relationship']) ? 'none' : $item['relationship'];
           if (empty($relationship_options[$rel])) {
@@ -133,30 +133,30 @@ class ConfigHandler extends ViewsFormBase {
             $handler->init($executable, $executable->display_handler, $item);
           }
 
-          $form['options']['relationship'] = array(
+          $form['options']['relationship'] = [
             '#type' => 'select',
             '#title' => $this->t('Relationship'),
             '#options' => $relationship_options,
             '#default_value' => $rel,
             '#weight' => -500,
-          );
+          ];
         }
         else {
-          $form['options']['relationship'] = array(
+          $form['options']['relationship'] = [
             '#type' => 'value',
             '#value' => 'none',
-          );
+          ];
         }
 
-        $form['#title'] = $this->t('Configure @type: @item', array('@type' => $types[$type]['lstitle'], '@item' => $handler->adminLabel()));
+        $form['#title'] = $this->t('Configure @type: @item', ['@type' => $types[$type]['lstitle'], '@item' => $handler->adminLabel()]);
 
         if (!empty($handler->definition['help'])) {
-          $form['options']['form_description'] = array(
+          $form['options']['form_description'] = [
             '#markup' => $handler->definition['help'],
-            '#theme_wrappers' => array('container'),
-            '#attributes' => array('class' => array('js-form-item form-item description')),
+            '#theme_wrappers' => ['container'],
+            '#attributes' => ['class' => ['js-form-item form-item description']],
             '#weight' => -1000,
-          );
+          ];
         }
 
         $form['#section'] = $display_id . '-' . $type . '-' . $id;
@@ -170,13 +170,13 @@ class ConfigHandler extends ViewsFormBase {
 
       $view->getStandardButtons($form, $form_state, 'views_ui_config_item_form', $name);
       // Add a 'remove' button.
-      $form['actions']['remove'] = array(
+      $form['actions']['remove'] = [
         '#type' => 'submit',
         '#value' => $this->t('Remove'),
-        '#submit' => array(array($this, 'remove')),
-        '#limit_validation_errors' => array(array('override')),
+        '#submit' => [[$this, 'remove']],
+        '#limit_validation_errors' => [['override']],
         '#button_type' => 'danger',
-      );
+      ];
     }
 
     if ($save_ui_cache) {
diff --git a/web/core/modules/views_ui/src/Form/Ajax/ConfigHandlerExtra.php b/web/core/modules/views_ui/src/Form/Ajax/ConfigHandlerExtra.php
index 0c10fb1fa..a79d03142 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/ConfigHandlerExtra.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/ConfigHandlerExtra.php
@@ -51,16 +51,16 @@ class ConfigHandlerExtra extends ViewsFormBase {
     $type = $form_state->get('type');
     $id = $form_state->get('id');
 
-    $form = array(
-      'options' => array(
+    $form = [
+      'options' => [
         '#tree' => TRUE,
-        '#theme_wrappers' => array('container'),
-        '#attributes' => array('class' => array('scroll'), 'data-drupal-views-scroll' => TRUE),
-      ),
-    );
+        '#theme_wrappers' => ['container'],
+        '#attributes' => ['class' => ['scroll'], 'data-drupal-views-scroll' => TRUE],
+      ],
+    ];
     $executable = $view->getExecutable();
     if (!$executable->setDisplay($display_id)) {
-      $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
+      $form['markup'] = ['#markup' => $this->t('Invalid display id @display', ['@display' => $display_id])];
       return $form;
     }
     $item = $executable->getHandler($display_id, $type, $id);
@@ -68,13 +68,13 @@ class ConfigHandlerExtra extends ViewsFormBase {
     if ($item) {
       $handler = $executable->display_handler->getHandler($type, $id);
       if (empty($handler)) {
-        $form['markup'] = array('#markup' => $this->t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
+        $form['markup'] = ['#markup' => $this->t("Error: handler for @table > @field doesn't exist!", ['@table' => $item['table'], '@field' => $item['field']])];
       }
       else {
         $handler->init($executable, $executable->display_handler, $item);
         $types = ViewExecutable::getHandlerTypes();
 
-        $form['#title'] = $this->t('Configure extra settings for @type %item', array('@type' => $types[$type]['lstitle'], '%item' => $handler->adminLabel()));
+        $form['#title'] = $this->t('Configure extra settings for @type %item', ['@type' => $types[$type]['lstitle'], '%item' => $handler->adminLabel()]);
 
         $form['#section'] = $display_id . '-' . $type . '-' . $id;
 
diff --git a/web/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php b/web/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php
index e7c7a8393..b4d0f136b 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php
@@ -52,16 +52,16 @@ class ConfigHandlerGroup extends ViewsFormBase {
     $type = $form_state->get('type');
     $id = $form_state->get('id');
 
-    $form = array(
-      'options' => array(
+    $form = [
+      'options' => [
         '#tree' => TRUE,
-        '#theme_wrappers' => array('container'),
-        '#attributes' => array('class' => array('scroll'), 'data-drupal-views-scroll' => TRUE),
-      ),
-    );
+        '#theme_wrappers' => ['container'],
+        '#attributes' => ['class' => ['scroll'], 'data-drupal-views-scroll' => TRUE],
+      ],
+    ];
     $executable = $view->getExecutable();
     if (!$executable->setDisplay($display_id)) {
-      $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
+      $form['markup'] = ['#markup' => $this->t('Invalid display id @display', ['@display' => $display_id])];
       return $form;
     }
 
@@ -72,13 +72,13 @@ class ConfigHandlerGroup extends ViewsFormBase {
     if ($item) {
       $handler = $executable->display_handler->getHandler($type, $id);
       if (empty($handler)) {
-        $form['markup'] = array('#markup' => $this->t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
+        $form['markup'] = ['#markup' => $this->t("Error: handler for @table > @field doesn't exist!", ['@table' => $item['table'], '@field' => $item['field']])];
       }
       else {
         $handler->init($executable, $executable->display_handler, $item);
         $types = ViewExecutable::getHandlerTypes();
 
-        $form['#title'] = $this->t('Configure aggregation settings for @type %item', array('@type' => $types[$type]['lstitle'], '%item' => $handler->adminLabel()));
+        $form['#title'] = $this->t('Configure aggregation settings for @type %item', ['@type' => $types[$type]['lstitle'], '%item' => $handler->adminLabel()]);
 
         $handler->buildGroupByForm($form['options'], $form_state);
         $form_state->set('handler', $handler);
diff --git a/web/core/modules/views_ui/src/Form/Ajax/Display.php b/web/core/modules/views_ui/src/Form/Ajax/Display.php
index bd129af1e..302d75959 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/Display.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/Display.php
@@ -60,15 +60,15 @@ class Display extends ViewsFormBase {
 
     $executable = $view->getExecutable();
     if (!$executable->setDisplay($display_id)) {
-      $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
+      $form['markup'] = ['#markup' => $this->t('Invalid display id @display', ['@display' => $display_id])];
       return $form;
     }
 
     // Get form from the handler.
-    $form['options'] = array(
-      '#theme_wrappers' => array('container'),
-      '#attributes' => array('class' => array('scroll'), 'data-drupal-views-scroll' => TRUE),
-    );
+    $form['options'] = [
+      '#theme_wrappers' => ['container'],
+      '#attributes' => ['class' => ['scroll'], 'data-drupal-views-scroll' => TRUE],
+    ];
     $executable->display_handler->buildOptionsForm($form['options'], $form_state);
 
     // The handler options form sets $form['#title'], which we need on the entire
diff --git a/web/core/modules/views_ui/src/Form/Ajax/EditDetails.php b/web/core/modules/views_ui/src/Form/Ajax/EditDetails.php
index ced404426..07b1625a8 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/EditDetails.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/EditDetails.php
@@ -33,33 +33,33 @@ class EditDetails extends ViewsFormBase {
     $form['#title'] = $this->t('Name and description');
     $form['#section'] = 'details';
 
-    $form['details'] = array(
-      '#theme_wrappers' => array('container'),
-      '#attributes' => array('class' => array('scroll'), 'data-drupal-views-scroll' => TRUE),
-    );
-    $form['details']['label'] = array(
+    $form['details'] = [
+      '#theme_wrappers' => ['container'],
+      '#attributes' => ['class' => ['scroll'], 'data-drupal-views-scroll' => TRUE],
+    ];
+    $form['details']['label'] = [
       '#type' => 'textfield',
       '#title' => t('Administrative name'),
       '#default_value' => $view->label(),
-    );
-    $form['details']['langcode'] = array(
+    ];
+    $form['details']['langcode'] = [
       '#type' => 'language_select',
       '#title' => $this->t('View language'),
       '#description' => $this->t('Language of labels and other textual elements in this view.'),
       '#default_value' => $view->get('langcode'),
-    );
-    $form['details']['description'] = array(
+    ];
+    $form['details']['description'] = [
        '#type' => 'textfield',
        '#title' => t('Administrative description'),
        '#default_value' => $view->get('description'),
-     );
-    $form['details']['tag'] = array(
+     ];
+    $form['details']['tag'] = [
       '#type' => 'textfield',
       '#title' => t('Administrative tags'),
       '#description' => t('Enter a comma-separated list of words to describe your view.'),
       '#default_value' => $view->get('tag'),
       '#autocomplete_route_name' => 'views_ui.autocomplete',
-    );
+    ];
 
     $view->getStandardButtons($form, $form_state, 'views_ui_edit_details_form');
     return $form;
diff --git a/web/core/modules/views_ui/src/Form/Ajax/Rearrange.php b/web/core/modules/views_ui/src/Form/Ajax/Rearrange.php
index 048776950..2a46120c6 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/Rearrange.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/Rearrange.php
@@ -53,11 +53,11 @@ class Rearrange extends ViewsFormBase {
     $types = ViewExecutable::getHandlerTypes();
     $executable = $view->getExecutable();
     if (!$executable->setDisplay($display_id)) {
-      $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
+      $form['markup'] = ['#markup' => $this->t('Invalid display id @display', ['@display' => $display_id])];
       return $form;
     }
     $display = &$executable->displayHandlers->get($display_id);
-    $form['#title'] = $this->t('Rearrange @type', array('@type' => $types[$type]['ltitle']));
+    $form['#title'] = $this->t('Rearrange @type', ['@type' => $types[$type]['ltitle']]);
     $form['#section'] = $display_id . 'rearrange-item';
 
     if ($display->defaultableSections($types[$type]['plural'])) {
@@ -69,31 +69,31 @@ class Rearrange extends ViewsFormBase {
     $count = 0;
 
     // Get relationship labels
-    $relationships = array();
+    $relationships = [];
     foreach ($display->getHandlers('relationship') as $id => $handler) {
       $relationships[$id] = $handler->adminLabel();
     }
 
-    $form['fields'] = array(
+    $form['fields'] = [
       '#type' => 'table',
-      '#header' => array('', $this->t('Weight'), $this->t('Remove')),
+      '#header' => ['', $this->t('Weight'), $this->t('Remove')],
       '#empty' => $this->t('No fields available.'),
-      '#tabledrag' => array(
-        array(
+      '#tabledrag' => [
+        [
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'weight',
-        )
-      ),
+        ]
+      ],
       '#tree' => TRUE,
       '#prefix' => '<div class="scroll" data-drupal-views-scroll>',
       '#suffix' => '</div>',
-    );
+    ];
 
     foreach ($display->getOption($types[$type]['plural']) as $id => $field) {
-      $form['fields'][$id] = array();
+      $form['fields'][$id] = [];
 
-      $form['fields'][$id]['#attributes'] = array('class' => array('draggable'), 'id' => 'views-row-' . $id);
+      $form['fields'][$id]['#attributes'] = ['class' => ['draggable'], 'id' => 'views-row-' . $id];
 
       $handler = $display->getHandler($type, $id);
       if ($handler) {
@@ -105,34 +105,34 @@ class Rearrange extends ViewsFormBase {
       }
       else {
         $name = $id;
-        $markup = $this->t('Broken field @id', array('@id' => $id));
+        $markup = $this->t('Broken field @id', ['@id' => $id]);
       }
-      $form['fields'][$id]['name'] = array('#markup' => $markup);
+      $form['fields'][$id]['name'] = ['#markup' => $markup];
 
-      $form['fields'][$id]['weight'] = array(
+      $form['fields'][$id]['weight'] = [
         '#type' => 'textfield',
         '#default_value' => ++$count,
-        '#attributes' => array('class' => array('weight')),
-        '#title' => t('Weight for @title', array('@title' => $name)),
+        '#attributes' => ['class' => ['weight']],
+        '#title' => t('Weight for @title', ['@title' => $name]),
         '#title_display' => 'invisible',
-      );
+      ];
 
-      $form['fields'][$id]['removed'] = array(
+      $form['fields'][$id]['removed'] = [
         '#type' => 'checkbox',
-        '#title' => t('Remove @title', array('@title' => $name)),
+        '#title' => t('Remove @title', ['@title' => $name]),
         '#title_display' => 'invisible',
         '#id' => 'views-removed-' . $id,
-        '#attributes' => array('class' => array('views-remove-checkbox')),
+        '#attributes' => ['class' => ['views-remove-checkbox']],
         '#default_value' => 0,
-        '#suffix' => \Drupal::l(SafeMarkup::format('<span>@text</span>', array('@text' => $this->t('Remove'))),
-          Url::fromRoute('<none>', array(), array('attributes' => array(
+        '#suffix' => \Drupal::l(SafeMarkup::format('<span>@text</span>', ['@text' => $this->t('Remove')]),
+          Url::fromRoute('<none>', [], ['attributes' => [
             'id' => 'views-remove-link-' . $id,
-            'class' => array('views-hidden', 'views-button-remove', 'views-remove-link'),
+            'class' => ['views-hidden', 'views-button-remove', 'views-remove-link'],
             'alt' => $this->t('Remove this item'),
-            'title' => $this->t('Remove this item')),
-          ))
+            'title' => $this->t('Remove this item')],
+          ])
         ),
-      );
+      ];
     }
 
     $view->getStandardButtons($form, $form_state, 'views_ui_rearrange_form');
@@ -152,7 +152,7 @@ class Rearrange extends ViewsFormBase {
     $display = &$view->getExecutable()->displayHandlers->get($display_id);
 
     $old_fields = $display->getOption($types[$type]['plural']);
-    $new_fields = $order = array();
+    $new_fields = $order = [];
 
     // Make an array with the weights
     foreach ($form_state->getValue('fields') as $field => $info) {
diff --git a/web/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php b/web/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
index ea2235b7b..329868105 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
@@ -43,12 +43,12 @@ class RearrangeFilter extends ViewsFormBase {
     $types = ViewExecutable::getHandlerTypes();
     $executable = $view->getExecutable();
     if (!$executable->setDisplay($display_id)) {
-      $form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
+      $form['markup'] = ['#markup' => $this->t('Invalid display id @display', ['@display' => $display_id])];
       return $form;
     }
     $display = $executable->displayHandlers->get($display_id);
     $form['#title'] = Html::escape($display->display['display_title']) . ': ';
-    $form['#title'] .= $this->t('Rearrange @type', array('@type' => $types[$type]['ltitle']));
+    $form['#title'] .= $this->t('Rearrange @type', ['@type' => $types[$type]['ltitle']]);
     $form['#section'] = $display_id . 'rearrange-item';
 
     if ($display->defaultableSections($types[$type]['plural'])) {
@@ -68,12 +68,12 @@ class RearrangeFilter extends ViewsFormBase {
     $count = 0;
 
     // Get relationship labels
-    $relationships = array();
+    $relationships = [];
     foreach ($display->getHandlers('relationship') as $id => $handler) {
       $relationships[$id] = $handler->adminLabel();
     }
 
-    $group_options = array();
+    $group_options = [];
 
     /**
      * Filter groups is an array that contains:
@@ -88,59 +88,59 @@ class RearrangeFilter extends ViewsFormBase {
     $grouping = count(array_keys($groups['groups'])) > 1;
 
     $form['filter_groups']['#tree'] = TRUE;
-    $form['filter_groups']['operator'] = array(
+    $form['filter_groups']['operator'] = [
       '#type' => 'select',
-      '#options' => array(
+      '#options' => [
         'AND' => $this->t('And'),
         'OR' => $this->t('Or'),
-      ),
+      ],
       '#default_value' => $groups['operator'],
-      '#attributes' => array(
-        'class' => array('warning-on-change'),
-      ),
+      '#attributes' => [
+        'class' => ['warning-on-change'],
+      ],
       '#title' => $this->t('Operator to use on all groups'),
       '#description' => $this->t('Either "group 0 AND group 1 AND group 2" or "group 0 OR group 1 OR group 2", etc'),
       '#access' => $grouping,
-    );
+    ];
 
     $form['remove_groups']['#tree'] = TRUE;
 
     foreach ($groups['groups'] as $id => $group) {
-      $form['filter_groups']['groups'][$id] = array(
+      $form['filter_groups']['groups'][$id] = [
         '#title' => $this->t('Operator'),
         '#type' => 'select',
-        '#options' => array(
+        '#options' => [
           'AND' => $this->t('And'),
           'OR' => $this->t('Or'),
-        ),
+        ],
         '#default_value' => $group,
-        '#attributes' => array(
-          'class' => array('warning-on-change'),
-        ),
-      );
+        '#attributes' => [
+          'class' => ['warning-on-change'],
+        ],
+      ];
 
-      $form['remove_groups'][$id] = array(); // to prevent a notice
+      $form['remove_groups'][$id] = []; // to prevent a notice
       if ($id != 1) {
-        $form['remove_groups'][$id] = array(
+        $form['remove_groups'][$id] = [
           '#type' => 'submit',
-          '#value' => $this->t('Remove group @group', array('@group' => $id)),
+          '#value' => $this->t('Remove group @group', ['@group' => $id]),
           '#id' => "views-remove-group-$id",
-          '#attributes' => array(
-            'class' => array('views-remove-group'),
-          ),
+          '#attributes' => [
+            'class' => ['views-remove-group'],
+          ],
           '#group' => $id,
           '#ajax' => ['url' => NULL],
-        );
+        ];
       }
-      $group_options[$id] = $id == 1 ? $this->t('Default group') : $this->t('Group @group', array('@group' => $id));
-      $form['#group_renders'][$id] = array();
+      $group_options[$id] = $id == 1 ? $this->t('Default group') : $this->t('Group @group', ['@group' => $id]);
+      $form['#group_renders'][$id] = [];
     }
 
     $form['#group_options'] = $group_options;
     $form['#groups'] = $groups;
     // We don't use getHandlers() because we want items without handlers to
     // appear and show up as 'broken' so that the user can see them.
-    $form['filters'] = array('#tree' => TRUE);
+    $form['filters'] = ['#tree' => TRUE];
     foreach ($handlers as $id => $field) {
       // If the group does not exist, move the filters to the default group.
       if (empty($field['group']) || empty($groups['groups'][$field['group']])) {
@@ -162,24 +162,24 @@ class RearrangeFilter extends ViewsFormBase {
       // Place this item into the proper group for rendering.
       $form['#group_renders'][$field['group']][] = $id;
 
-      $form['filters'][$id]['weight'] = array(
-        '#title' => t('Weight for @id', array('@id' => $id)),
+      $form['filters'][$id]['weight'] = [
+        '#title' => t('Weight for @id', ['@id' => $id]),
         '#title_display' => 'invisible',
         '#type' => 'textfield',
         '#default_value' => ++$count,
         '#size' => 8,
-      );
-      $form['filters'][$id]['group'] = array(
-        '#title' => t('Group for @id', array('@id' => $id)),
+      ];
+      $form['filters'][$id]['group'] = [
+        '#title' => t('Group for @id', ['@id' => $id]),
         '#title_display' => 'invisible',
         '#type' => 'select',
         '#options' => $group_options,
         '#default_value' => $field['group'],
-        '#attributes' => array(
-          'class' => array('views-region-select', 'views-region-' . $id),
-        ),
+        '#attributes' => [
+          'class' => ['views-region-select', 'views-region-' . $id],
+        ],
         '#access' => $field['group'] !== 'ungroupable',
-      );
+      ];
 
       if ($handler) {
         $name = $handler->adminLabel() . ' ' . $handler->adminSummary();
@@ -187,34 +187,34 @@ class RearrangeFilter extends ViewsFormBase {
           $name = '(' . $relationships[$field['relationship']] . ') ' . $name;
         }
 
-        $form['filters'][$id]['name'] = array(
+        $form['filters'][$id]['name'] = [
           '#markup' => $name,
-        );
+        ];
       }
       else {
-        $form['filters'][$id]['name'] = array('#markup' => $this->t('Broken field @id', array('@id' => $id)));
+        $form['filters'][$id]['name'] = ['#markup' => $this->t('Broken field @id', ['@id' => $id])];
       }
-      $form['filters'][$id]['removed'] = array(
-        '#title' => t('Remove @id', array('@id' => $id)),
+      $form['filters'][$id]['removed'] = [
+        '#title' => t('Remove @id', ['@id' => $id]),
         '#title_display' => 'invisible',
         '#type' => 'checkbox',
         '#id' => 'views-removed-' . $id,
-        '#attributes' => array('class' => array('views-remove-checkbox')),
+        '#attributes' => ['class' => ['views-remove-checkbox']],
         '#default_value' => 0,
-      );
+      ];
     }
 
     $view->getStandardButtons($form, $form_state, 'views_ui_rearrange_filter_form');
-    $form['actions']['add_group'] = array(
+    $form['actions']['add_group'] = [
       '#type' => 'submit',
       '#value' => $this->t('Create new filter group'),
       '#id' => 'views-add-group',
       '#group' => 'add',
-      '#attributes' => array(
-        'class' => array('views-add-group'),
-      ),
+      '#attributes' => [
+        'class' => ['views-add-group'],
+      ],
       '#ajax' => ['url' => NULL],
-    );
+    ];
 
     return $form;
   }
@@ -226,7 +226,7 @@ class RearrangeFilter extends ViewsFormBase {
     $types = ViewExecutable::getHandlerTypes();
     $view = $form_state->get('view');
     $display = &$view->getExecutable()->displayHandlers->get($form_state->get('display_id'));
-    $remember_groups = array();
+    $remember_groups = [];
 
     if (!empty($view->form_cache)) {
       $old_fields = $view->form_cache['handlers'];
@@ -237,7 +237,7 @@ class RearrangeFilter extends ViewsFormBase {
 
     $groups = $form_state->getValue('filter_groups');
     // Whatever button was clicked, re-calculate field information.
-    $new_fields = $order = array();
+    $new_fields = $order = [];
 
     // Make an array with the weights
     foreach ($form_state->getValue('filters') as $field => $info) {
diff --git a/web/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php b/web/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
index 7d1285f80..377a3d55c 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
@@ -40,10 +40,10 @@ class ReorderDisplays extends ViewsFormBase {
       'view' => $view->id(),
       'display_id' => $display_id,
     ]);
-    $form['view'] = array(
+    $form['view'] = [
       '#type' => 'value',
       '#value' => $view
-    );
+    ];
 
     $displays = $view->get('display');
     $count = count($displays);
@@ -56,82 +56,82 @@ class ReorderDisplays extends ViewsFormBase {
       return 0;
     });
 
-    $form['displays'] = array(
+    $form['displays'] = [
       '#type' => 'table',
       '#id' => 'reorder-displays',
-      '#header' => array($this->t('Display'), $this->t('Weight'), $this->t('Remove')),
+      '#header' => [$this->t('Display'), $this->t('Weight'), $this->t('Remove')],
       '#empty' => $this->t('No displays available.'),
-      '#tabledrag' => array(
-        array(
+      '#tabledrag' => [
+        [
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'weight',
-        )
-      ),
+        ]
+      ],
       '#tree' => TRUE,
       '#prefix' => '<div class="scroll" data-drupal-views-scroll>',
       '#suffix' => '</div>',
-    );
+    ];
 
     foreach ($displays as $id => $display) {
-      $form['displays'][$id] = array(
+      $form['displays'][$id] = [
         '#display' => $display,
-        '#attributes' => array(
+        '#attributes' => [
           'id' => 'display-row-' . $id,
-        ),
+        ],
         '#weight' => $display['position'],
-      );
+      ];
 
       // Only make row draggable if it's not the default display.
       if ($id !== 'default') {
         $form['displays'][$id]['#attributes']['class'][] = 'draggable';
       }
 
-      $form['displays'][$id]['title'] = array(
+      $form['displays'][$id]['title'] = [
         '#markup' => $display['display_title'],
-      );
+      ];
 
-      $form['displays'][$id]['weight'] = array(
+      $form['displays'][$id]['weight'] = [
         '#type' => 'weight',
         '#value' => $display['position'],
         '#delta' => $count,
-        '#title' => $this->t('Weight for @display', array('@display' => $display['display_title'])),
+        '#title' => $this->t('Weight for @display', ['@display' => $display['display_title']]),
         '#title_display' => 'invisible',
-        '#attributes' => array(
-          'class' => array('weight'),
-        ),
-      );
+        '#attributes' => [
+          'class' => ['weight'],
+        ],
+      ];
 
-      $form['displays'][$id]['removed'] = array(
-        'checkbox' => array(
-          '#title' => t('Remove @id', array('@id' => $id)),
+      $form['displays'][$id]['removed'] = [
+        'checkbox' => [
+          '#title' => t('Remove @id', ['@id' => $id]),
           '#title_display' => 'invisible',
           '#type' => 'checkbox',
           '#id' => 'display-removed-' . $id,
-          '#attributes' => array(
-            'class' => array('views-remove-checkbox'),
-          ),
+          '#attributes' => [
+            'class' => ['views-remove-checkbox'],
+          ],
           '#default_value' => !empty($display['deleted']),
-        ),
-        'link' => array(
+        ],
+        'link' => [
           '#type' => 'link',
-          '#title' => SafeMarkup::format('<span>@text</span>', array('@text' => $this->t('Remove'))),
+          '#title' => SafeMarkup::format('<span>@text</span>', ['@text' => $this->t('Remove')]),
           '#url' => Url::fromRoute('<none>'),
-          '#attributes' => array(
+          '#attributes' => [
             'id' => 'display-remove-link-' . $id,
-            'class' => array('views-button-remove', 'display-remove-link'),
+            'class' => ['views-button-remove', 'display-remove-link'],
             'alt' => $this->t('Remove this display'),
             'title' => $this->t('Remove this display'),
-          ),
-        ),
+          ],
+        ],
         '#access' => ($id !== 'default'),
-      );
+      ];
 
       if (!empty($display['deleted'])) {
-        $form['displays'][$id]['deleted'] = array(
+        $form['displays'][$id]['deleted'] = [
           '#type' => 'value',
           '#value' => TRUE,
-        );
+        ];
 
         $form['displays'][$id]['#attributes']['class'][] = 'hidden';
       }
@@ -149,7 +149,7 @@ class ReorderDisplays extends ViewsFormBase {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     /** @var $view \Drupal\views_ui\ViewUI */
     $view = $form_state->get('view');
-    $order = array();
+    $order = [];
 
     $user_input = $form_state->getUserInput();
     foreach ($user_input['displays'] as $display => $info) {
diff --git a/web/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php b/web/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
index 93bd04980..375766a4c 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
@@ -108,7 +108,7 @@ abstract class ViewsFormBase extends FormBase implements ViewsFormInterface {
       unset($view->stack[$key]);
 
       if (array_shift($top) != $identifier) {
-        $view->stack = array();
+        $view->stack = [];
       }
     }
 
@@ -138,7 +138,7 @@ abstract class ViewsFormBase extends FormBase implements ViewsFormInterface {
       $form_state = $reflection->newInstanceArgs(array_slice($top, 3, 2))->getFormState($view, $top[2], $form_state->get('ajax'));
       $form_class = get_class($form_state->getFormObject());
 
-      $form_state->setUserInput(array());
+      $form_state->setUserInput([]);
       $form_url = views_ui_build_form_url($form_state);
       if (!$form_state->get('ajax')) {
         return new RedirectResponse($form_url->setAbsolute()->toString());
@@ -234,16 +234,16 @@ abstract class ViewsFormBase extends FormBase implements ViewsFormInterface {
       $response->setAttachments($form['#attached']);
 
       $display = '';
-      $status_messages = array('#type' => 'status_messages');
+      $status_messages = ['#type' => 'status_messages'];
       if ($messages = $renderer->renderRoot($status_messages)) {
         $display = '<div class="views-messages">' . $messages . '</div>';
       }
       $display .= $output;
 
-      $options = array(
+      $options = [
         'dialogClass' => 'views-ui-dialog js-views-ui-dialog',
         'width' => '75%',
-      );
+      ];
 
       $response->addCommand(new OpenModalDialogCommand($title, $display, $options));
 
diff --git a/web/core/modules/views_ui/src/Form/BasicSettingsForm.php b/web/core/modules/views_ui/src/Form/BasicSettingsForm.php
index 615019600..bcd533662 100644
--- a/web/core/modules/views_ui/src/Form/BasicSettingsForm.php
+++ b/web/core/modules/views_ui/src/Form/BasicSettingsForm.php
@@ -65,7 +65,7 @@ class BasicSettingsForm extends ConfigFormBase {
     $form = parent::buildForm($form, $form_state);
 
     $config = $this->config('views.settings');
-    $options = array();
+    $options = [];
     foreach ($this->themeHandler->listInfo() as $name => $theme) {
       if ($theme->status) {
         $options[$name] = $theme->info['name'];
@@ -74,94 +74,94 @@ class BasicSettingsForm extends ConfigFormBase {
 
     // This is not currently a fieldset but we may want it to be later,
     // so this will make it easier to change if we do.
-    $form['basic'] = array();
+    $form['basic'] = [];
 
-    $form['basic']['ui_show_master_display'] = array(
+    $form['basic']['ui_show_master_display'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Always show the master (default) display'),
       '#default_value' => $config->get('ui.show.master_display'),
-    );
+    ];
 
-    $form['basic']['ui_show_advanced_column'] = array(
+    $form['basic']['ui_show_advanced_column'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Always show advanced display settings'),
       '#default_value' => $config->get('ui.show.advanced_column'),
-    );
+    ];
 
-    $form['basic']['ui_show_display_embed'] = array(
+    $form['basic']['ui_show_display_embed'] = [
       '#type' => 'checkbox',
       '#title' => t('Allow embedded displays'),
       '#description' => t('Embedded displays can be used in code via views_embed_view().'),
       '#default_value' => $config->get('ui.show.display_embed'),
-    );
+    ];
 
-    $form['basic']['ui_exposed_filter_any_label'] = array(
+    $form['basic']['ui_exposed_filter_any_label'] = [
       '#type' => 'select',
       '#title' => $this->t('Label for "Any" value on non-required single-select exposed filters'),
-      '#options' => array('old_any' => '<Any>', 'new_any' => $this->t('- Any -')),
+      '#options' => ['old_any' => '<Any>', 'new_any' => $this->t('- Any -')],
       '#default_value' => $config->get('ui.exposed_filter_any_label'),
-    );
+    ];
 
-    $form['live_preview'] = array(
+    $form['live_preview'] = [
       '#type' => 'details',
       '#title' => $this->t('Live preview settings'),
       '#open' => TRUE,
-    );
+    ];
 
-    $form['live_preview']['ui_always_live_preview'] = array(
+    $form['live_preview']['ui_always_live_preview'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Automatically update preview on changes'),
       '#default_value' => $config->get('ui.always_live_preview'),
-    );
+    ];
 
-    $form['live_preview']['ui_show_preview_information'] = array(
+    $form['live_preview']['ui_show_preview_information'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Show information and statistics about the view during live preview'),
       '#default_value' => $config->get('ui.show.preview_information'),
-    );
+    ];
 
-    $form['live_preview']['options'] = array(
+    $form['live_preview']['options'] = [
       '#type' => 'container',
-      '#states' => array(
-        'visible' => array(
-          ':input[name="ui_show_preview_information"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="ui_show_preview_information"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
-    $form['live_preview']['options']['ui_show_sql_query_enabled'] = array(
+    $form['live_preview']['options']['ui_show_sql_query_enabled'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Show the SQL query'),
       '#default_value' => $config->get('ui.show.sql_query.enabled'),
-    );
+    ];
 
-    $form['live_preview']['options']['ui_show_sql_query_where'] = array(
+    $form['live_preview']['options']['ui_show_sql_query_where'] = [
       '#type' => 'radios',
-      '#states' => array(
-        'visible' => array(
-          ':input[name="ui_show_sql_query_enabled"]' => array('checked' => TRUE),
-        ),
-      ),
+      '#states' => [
+        'visible' => [
+          ':input[name="ui_show_sql_query_enabled"]' => ['checked' => TRUE],
+        ],
+      ],
       '#title' => t('Show SQL query'),
-      '#options' => array(
+      '#options' => [
         'above' => $this->t('Above the preview'),
         'below' => $this->t('Below the preview'),
-      ),
+      ],
       '#default_value' => $config->get('ui.show.sql_query.where'),
-    );
+    ];
 
-    $form['live_preview']['options']['ui_show_performance_statistics'] = array(
+    $form['live_preview']['options']['ui_show_performance_statistics'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Show performance statistics'),
       '#default_value' => $config->get('ui.show.performance_statistics'),
-    );
+    ];
 
-    $form['live_preview']['options']['ui_show_additional_queries'] = array(
+    $form['live_preview']['options']['ui_show_additional_queries'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Show other queries run during render during live preview'),
       '#description' => $this->t("Drupal has the potential to run many queries while a view is being rendered. Checking this box will display every query run during view render as part of the live preview."),
       '#default_value' => $config->get('ui.show.additional_queries'),
-    );
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/views_ui/src/Form/BreakLockForm.php b/web/core/modules/views_ui/src/Form/BreakLockForm.php
index 12a3e3efb..94a626f27 100644
--- a/web/core/modules/views_ui/src/Form/BreakLockForm.php
+++ b/web/core/modules/views_ui/src/Form/BreakLockForm.php
@@ -61,7 +61,7 @@ class BreakLockForm extends EntityConfirmFormBase {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Do you want to break the lock on view %name?', array('%name' => $this->entity->id()));
+    return $this->t('Do you want to break the lock on view %name?', ['%name' => $this->entity->id()]);
   }
 
   /**
@@ -70,11 +70,11 @@ class BreakLockForm extends EntityConfirmFormBase {
   public function getDescription() {
     $locked = $this->tempStore->getMetadata($this->entity->id());
     $account = $this->entityManager->getStorage('user')->load($locked->owner);
-    $username = array(
+    $username = [
       '#theme' => 'username',
       '#account' => $account,
-    );
-    return $this->t('By breaking this lock, any unsaved changes made by @user will be lost.', array('@user' => drupal_render($username)));
+    ];
+    return $this->t('By breaking this lock, any unsaved changes made by @user will be lost.', ['@user' => drupal_render($username)]);
   }
 
   /**
@@ -96,7 +96,7 @@ class BreakLockForm extends EntityConfirmFormBase {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     if (!$this->tempStore->getMetadata($this->entity->id())) {
-      $form['message']['#markup'] = $this->t('There is no lock on view %name to break.', array('%name' => $this->entity->id()));
+      $form['message']['#markup'] = $this->t('There is no lock on view %name to break.', ['%name' => $this->entity->id()]);
       return $form;
     }
     return parent::buildForm($form, $form_state);
diff --git a/web/core/modules/views_ui/src/Tests/AnalyzeTest.php b/web/core/modules/views_ui/src/Tests/AnalyzeTest.php
index 6cc9203d0..83e25313d 100644
--- a/web/core/modules/views_ui/src/Tests/AnalyzeTest.php
+++ b/web/core/modules/views_ui/src/Tests/AnalyzeTest.php
@@ -16,14 +16,14 @@ class AnalyzeTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('views_ui');
+  public static $modules = ['views_ui'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   protected function setUp() {
     parent::setUp();
@@ -31,13 +31,13 @@ class AnalyzeTest extends ViewTestBase {
     $this->enableViewsTestModule();
 
     // Add an admin user will full rights;
-    $this->admin = $this->drupalCreateUser(array('administer views'));
+    $this->admin = $this->drupalCreateUser(['administer views']);
   }
 
   /**
    * Tests that analyze works in general.
    */
-  function testAnalyzeBasic() {
+  public function testAnalyzeBasic() {
     $this->drupalLogin($this->admin);
 
     $this->drupalGet('admin/structure/views/view/test_view/edit');
@@ -47,13 +47,13 @@ class AnalyzeTest extends ViewTestBase {
     $this->clickLink(t('Analyze view'));
     $this->assertText(t('View analysis'));
 
-    foreach (array('ok', 'warning', 'error') as $type) {
-      $xpath = $this->xpath('//div[contains(@class, :class)]', array(':class' => $type));
-      $this->assertTrue(count($xpath), format_string('Analyse messages with @type found', array('@type' => $type)));
+    foreach (['ok', 'warning', 'error'] as $type) {
+      $xpath = $this->xpath('//div[contains(@class, :class)]', [':class' => $type]);
+      $this->assertTrue(count($xpath), format_string('Analyse messages with @type found', ['@type' => $type]));
     }
 
     // This redirects the user back to the main views edit page.
-    $this->drupalPostForm(NULL, array(), t('Ok'));
+    $this->drupalPostForm(NULL, [], t('Ok'));
   }
 
 }
diff --git a/web/core/modules/views_ui/src/Tests/ArgumentValidatorTest.php b/web/core/modules/views_ui/src/Tests/ArgumentValidatorTest.php
index b62f876e5..d94e682fb 100644
--- a/web/core/modules/views_ui/src/Tests/ArgumentValidatorTest.php
+++ b/web/core/modules/views_ui/src/Tests/ArgumentValidatorTest.php
@@ -16,7 +16,7 @@ class ArgumentValidatorTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_argument');
+  public static $testViews = ['test_argument'];
 
   /**
    * Tests the 'Specify validation criteria' checkbox functionality.
@@ -46,12 +46,12 @@ class ArgumentValidatorTest extends UITestBase {
    * @param bool $specify_validation
    */
   protected function saveArgumentHandlerWithValidationOptions($specify_validation) {
-    $options = array(
+    $options = [
       'options[validate][type]' => 'entity---node',
       'options[specify_validation]' => $specify_validation,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/handler/test_argument/default/argument/id', $options, t('Apply'));
-    $this->drupalPostForm('admin/structure/views/view/test_argument', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/views/view/test_argument', [], t('Save'));
   }
 
 }
diff --git a/web/core/modules/views_ui/src/Tests/CachedDataUITest.php b/web/core/modules/views_ui/src/Tests/CachedDataUITest.php
index 1f69b196d..a605d0f29 100644
--- a/web/core/modules/views_ui/src/Tests/CachedDataUITest.php
+++ b/web/core/modules/views_ui/src/Tests/CachedDataUITest.php
@@ -14,7 +14,7 @@ class CachedDataUITest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests the user tempstore views data in the UI.
@@ -28,7 +28,7 @@ class CachedDataUITest extends UITestBase {
 
     $this->drupalGet('admin/structure/views/view/test_view/edit');
     // Make sure we have 'changes' to the view.
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/default/title', array(), t('Apply'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/default/title', [], t('Apply'));
     $this->assertText('You have unsaved changes.');
     $this->assertEqual($temp_store->getMetadata('test_view')->owner, $views_admin_user_uid, 'View cache has been saved.');
 
@@ -39,13 +39,13 @@ class CachedDataUITest extends UITestBase {
     $this->assertEqual($temp_store->getMetadata('test_view')->owner, $views_admin_user_uid, 'The view is locked.');
 
     // Cancel the view edit and make sure the cache is deleted.
-    $this->drupalPostForm(NULL, array(), t('Cancel'));
+    $this->drupalPostForm(NULL, [], t('Cancel'));
     $this->assertEqual($temp_store->getMetadata('test_view'), NULL, 'User tempstore data has been removed.');
     // Test we are redirected to the view listing page.
-    $this->assertUrl('admin/structure/views', array(), 'Redirected back to the view listing page.');
+    $this->assertUrl('admin/structure/views', [], 'Redirected back to the view listing page.');
 
     // Log in with another user and make sure the view is locked and break.
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/default/title', array(), t('Apply'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/default/title', [], t('Apply'));
     $this->drupalLogin($this->adminUser);
 
     $this->drupalGet('admin/structure/views/view/test_view/edit');
@@ -56,17 +56,17 @@ class CachedDataUITest extends UITestBase {
     $this->assertLinkByHref('admin/structure/views/view/test_view/break-lock');
     // Break the lock.
     $this->clickLink(t('break this lock'));
-    $this->drupalPostForm(NULL, array(), t('Break lock'));
+    $this->drupalPostForm(NULL, [], t('Break lock'));
     // Test that save and cancel buttons are shown.
     $this->assertFieldById('edit-actions-submit', t('Save'));
     $this->assertFieldById('edit-actions-cancel', t('Cancel'));
     // Test we can save the view.
-    $this->drupalPostForm('admin/structure/views/view/test_view/edit', array(), t('Save'));
-    $this->assertRaw(t('The view %view has been saved.', array('%view' => 'Test view')));
+    $this->drupalPostForm('admin/structure/views/view/test_view/edit', [], t('Save'));
+    $this->assertRaw(t('The view %view has been saved.', ['%view' => 'Test view']));
 
     // Test that a deleted view has no tempstore data.
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/default/title', array(), t('Apply'));
-    $this->drupalPostForm('admin/structure/views/view/test_view/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/default/title', [], t('Apply'));
+    $this->drupalPostForm('admin/structure/views/view/test_view/delete', [], t('Delete'));
     // No view tempstore data should be returned for this view after deletion.
     $this->assertEqual($temp_store->getMetadata('test_view'), NULL, 'View tempstore data has been removed after deletion.');
   }
diff --git a/web/core/modules/views_ui/src/Tests/CustomBooleanTest.php b/web/core/modules/views_ui/src/Tests/CustomBooleanTest.php
index ecde493b6..adae59ab2 100644
--- a/web/core/modules/views_ui/src/Tests/CustomBooleanTest.php
+++ b/web/core/modules/views_ui/src/Tests/CustomBooleanTest.php
@@ -18,7 +18,7 @@ class CustomBooleanTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * \Drupal\views\Tests\ViewTestBase::viewsData().
@@ -47,15 +47,15 @@ class CustomBooleanTest extends UITestBase {
     $view = Views::getView('test_view');
     $view->setDisplay();
 
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'age' => array(
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'age' => [
         'id' => 'age',
         'table' => 'views_test_data',
         'field' => 'age',
         'relationship' => 'none',
         'plugin_id' => 'boolean',
-      ),
-    ));
+      ],
+    ]);
     $view->save();
 
     $this->executeView($view);
@@ -64,35 +64,35 @@ class CustomBooleanTest extends UITestBase {
     $custom_false = 'Nay';
 
     // Set up some custom value mappings for different types.
-    $custom_values = array(
-      'plain' => array(
+    $custom_values = [
+      'plain' => [
         'true' => $custom_true,
         'false' => $custom_false,
         'test' => 'assertTrue',
-      ),
-      'allowed tag' => array(
+      ],
+      'allowed tag' => [
         'true' => '<p>' . $custom_true . '</p>',
         'false' => '<p>' . $custom_false . '</p>',
         'test' => 'assertTrue',
-      ),
-      'disallowed tag' => array(
+      ],
+      'disallowed tag' => [
         'true' => '<script>' . $custom_true . '</script>',
         'false' => '<script>' . $custom_false . '</script>',
         'test' => 'assertFalse',
-      ),
-    );
+      ],
+    ];
 
     // Run the same tests on each type.
     foreach ($custom_values as $type => $values) {
-      $options = array(
+      $options = [
         'options[type]' => 'custom',
         'options[type_custom_true]' => $values['true'],
         'options[type_custom_false]' => $values['false'],
-      );
+      ];
       $this->drupalPostForm('admin/structure/views/nojs/handler/test_view/default/field/age', $options, 'Apply');
 
       // Save the view.
-      $this->drupalPostForm('admin/structure/views/view/test_view', array(), 'Save');
+      $this->drupalPostForm('admin/structure/views/view/test_view', [], 'Save');
 
       $view = Views::getView('test_view');
       $output = $view->preview();
@@ -136,35 +136,35 @@ class CustomBooleanTest extends UITestBase {
     $custom_false = 'Nay';
 
     // Set up some custom value mappings for different types.
-    $custom_values = array(
-      'plain' => array(
+    $custom_values = [
+      'plain' => [
         'true' => $custom_true,
         'false' => $custom_false,
         'test' => 'assertTrue',
-      ),
-      'allowed tag' => array(
+      ],
+      'allowed tag' => [
         'true' => '<p>' . $custom_true . '</p>',
         'false' => '<p>' . $custom_false . '</p>',
         'test' => 'assertTrue',
-      ),
-      'disallowed tag' => array(
+      ],
+      'disallowed tag' => [
         'true' => '<script>' . $custom_true . '</script>',
         'false' => '<script>' . $custom_false . '</script>',
         'test' => 'assertFalse',
-      ),
-    );
+      ],
+    ];
 
     // Run the same tests on each type.
     foreach ($custom_values as $type => $values) {
-      $options = array(
+      $options = [
         'options[type]' => 'custom',
         'options[type_custom_true]' => $values['true'],
         'options[type_custom_false]' => $values['false'],
-      );
+      ];
       $this->drupalPostForm('admin/structure/views/nojs/handler/test_view/default/field/age', $options, 'Apply');
 
       // Save the view.
-      $this->drupalPostForm('admin/structure/views/view/test_view', array(), 'Save');
+      $this->drupalPostForm('admin/structure/views/view/test_view', [], 'Save');
 
       $view = Views::getView('test_view');
       $output = $view->preview();
diff --git a/web/core/modules/views_ui/src/Tests/DefaultViewsTest.php b/web/core/modules/views_ui/src/Tests/DefaultViewsTest.php
index 3b3f2a734..a709d1f41 100644
--- a/web/core/modules/views_ui/src/Tests/DefaultViewsTest.php
+++ b/web/core/modules/views_ui/src/Tests/DefaultViewsTest.php
@@ -18,7 +18,7 @@ class DefaultViewsTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view_status', 'test_page_display_menu', 'test_page_display_arguments');
+  public static $testViews = ['test_view_status', 'test_page_display_menu', 'test_page_display_arguments'];
 
 
   protected function setUp() {
@@ -30,7 +30,7 @@ class DefaultViewsTest extends UITestBase {
   /**
    * Tests default views.
    */
-  function testDefaultViews() {
+  public function testDefaultViews() {
     // Make sure the view starts off as disabled (does not appear on the listing
     // page).
     $edit_href = 'admin/structure/views/view/glossary';
@@ -55,16 +55,16 @@ class DefaultViewsTest extends UITestBase {
     // Edit the view and change the title. Make sure that the new title is
     // displayed.
     $new_title = $this->randomMachineName(16);
-    $edit = array('title' => $new_title);
+    $edit = ['title' => $new_title];
     $this->drupalPostForm('admin/structure/views/nojs/display/glossary/page_1/title', $edit, t('Apply'));
-    $this->drupalPostForm('admin/structure/views/view/glossary/edit/page_1', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/views/view/glossary/edit/page_1', [], t('Save'));
     $this->drupalGet('glossary');
     $this->assertResponse(200);
     $this->assertText($new_title);
 
     // Save another view in the UI.
-    $this->drupalPostForm('admin/structure/views/nojs/display/archive/page_1/title', array(), t('Apply'));
-    $this->drupalPostForm('admin/structure/views/view/archive/edit/page_1', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/archive/page_1/title', [], t('Apply'));
+    $this->drupalPostForm('admin/structure/views/view/archive/edit/page_1', [], t('Save'));
 
     // Check there is an enable link. i.e. The view has not been enabled after
     // editing.
@@ -85,19 +85,19 @@ class DefaultViewsTest extends UITestBase {
     // Duplicate the view and check that the normal schema of duplicated views is used.
     $this->drupalGet('admin/structure/views');
     $this->clickViewsOperationLink(t('Duplicate'), '/glossary');
-    $edit = array(
+    $edit = [
       'id' => 'duplicate_of_glossary',
-    );
-    $this->assertTitle(t('Duplicate of @label | @site-name', array('@label' => 'Glossary', '@site-name' => $this->config('system.site')->get('name'))));
+    ];
+    $this->assertTitle(t('Duplicate of @label | @site-name', ['@label' => 'Glossary', '@site-name' => $this->config('system.site')->get('name')]));
     $this->drupalPostForm(NULL, $edit, t('Duplicate'));
-    $this->assertUrl('admin/structure/views/view/duplicate_of_glossary', array(), 'The normal duplicating name schema is applied.');
+    $this->assertUrl('admin/structure/views/view/duplicate_of_glossary', [], 'The normal duplicating name schema is applied.');
 
     // Duplicate a view and set a custom name.
     $this->drupalGet('admin/structure/views');
     $this->clickViewsOperationLink(t('Duplicate'), '/glossary');
     $random_name = strtolower($this->randomMachineName());
-    $this->drupalPostForm(NULL, array('id' => $random_name), t('Duplicate'));
-    $this->assertUrl("admin/structure/views/view/$random_name", array(), 'The custom view name got saved.');
+    $this->drupalPostForm(NULL, ['id' => $random_name], t('Duplicate'));
+    $this->assertUrl("admin/structure/views/view/$random_name", [], 'The custom view name got saved.');
 
     // Now disable the view, and make sure it stops appearing on the main view
     // listing page but instead goes back to displaying on the disabled views
@@ -129,7 +129,7 @@ class DefaultViewsTest extends UITestBase {
     $this->drupalGet('admin/structure/views');
     $this->clickViewsOperationLink(t('Delete'), '/glossary/');
     // Submit the confirmation form.
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
     // Ensure the view is no longer listed.
     $this->assertUrl('admin/structure/views');
     $this->assertNoLinkByHref($edit_href);
@@ -142,7 +142,7 @@ class DefaultViewsTest extends UITestBase {
     $this->drupalGet('admin/structure/views');
     $this->clickViewsOperationLink(t('Delete'), 'duplicate_of_glossary');
     // Submit the confirmation form.
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
 
     $this->drupalGet('glossary');
     $this->assertResponse(200);
@@ -150,7 +150,7 @@ class DefaultViewsTest extends UITestBase {
     $this->drupalGet('admin/structure/views');
     $this->clickViewsOperationLink(t('Delete'), $random_name);
     // Submit the confirmation form.
-    $this->drupalPostForm(NULL, array(), t('Delete'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
     $this->drupalGet('glossary');
     $this->assertResponse(404);
     $this->assertText('Page not found');
@@ -159,13 +159,14 @@ class DefaultViewsTest extends UITestBase {
   /**
    * Tests that enabling views moves them to the correct table.
    */
-  function testSplitListing() {
+  public function testSplitListing() {
     // Build a re-usable xpath query.
-    $xpath = '//div[@id="views-entity-list"]/div[@class = :status]/table//tr[@title = :title]';
-    $arguments = array(
+    $xpath = '//div[@id="views-entity-list"]/div[@class = :status]/table//td/text()[contains(., :title)]';
+
+    $arguments = [
       ':status' => 'views-list-section enabled',
-      ':title' => t('Machine name: test_view_status'),
-    );
+      ':title' => 'test_view_status',
+    ];
 
     $this->drupalGet('admin/structure/views');
 
@@ -226,8 +227,8 @@ class DefaultViewsTest extends UITestBase {
    *   The page content that results from clicking on the link, or FALSE on
    *   failure. Failure also results in a failed assertion.
    */
-  function clickViewsOperationLink($label, $unique_href_part) {
-    $links = $this->xpath('//a[normalize-space(text())=:label]', array(':label' => $label));
+  public function clickViewsOperationLink($label, $unique_href_part) {
+    $links = $this->xpath('//a[normalize-space(text())=:label]', [':label' => $label]);
     foreach ($links as $link_index => $link) {
       $position = strpos($link['href'], $unique_href_part);
       if ($position !== FALSE) {
@@ -235,7 +236,7 @@ class DefaultViewsTest extends UITestBase {
         break;
       }
     }
-    $this->assertTrue(isset($index), format_string('Link to "@label" containing @part found.', array('@label' => $label, '@part' => $unique_href_part)));
+    $this->assertTrue(isset($index), format_string('Link to "@label" containing @part found.', ['@label' => $label, '@part' => $unique_href_part]));
     if (isset($index)) {
       return $this->clickLink($label, $index);
     }
diff --git a/web/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php b/web/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php
index fbacb145c..480172bb3 100644
--- a/web/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php
+++ b/web/core/modules/views_ui/src/Tests/DisplayAttachmentTest.php
@@ -17,7 +17,7 @@ class DisplayAttachmentTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_attachment_ui');
+  public static $testViews = ['test_attachment_ui'];
 
   /**
    * Tests the attachment UI.
@@ -31,31 +31,66 @@ class DisplayAttachmentTest extends UITestBase {
     // Display labels should be escaped.
     $this->assertEscaped('<em>Page</em>');
 
-    foreach (array('default', 'page-1') as $display_id) {
-      $this->assertNoFieldChecked("edit-displays-$display_id", format_string('Make sure the @display_id can be marked as attached', array('@display_id' => $display_id)));
+    foreach (['default', 'page-1'] as $display_id) {
+      $this->assertNoFieldChecked("edit-displays-$display_id", format_string('Make sure the @display_id can be marked as attached', ['@display_id' => $display_id]));
     }
 
     // Save the attachments and test the value on the view.
-    $this->drupalPostForm($attachment_display_url, array('displays[page_1]' => 1), t('Apply'));
+    $this->drupalPostForm($attachment_display_url, ['displays[page_1]' => 1], t('Apply'));
     // Options summary should be escaped.
     $this->assertEscaped('<em>Page</em>');
     $this->assertNoRaw('<em>Page</em>');
-    $result = $this->xpath('//a[@id = :id]', array(':id' => 'views-attachment-1-displays'));
+    $result = $this->xpath('//a[@id = :id]', [':id' => 'views-attachment-1-displays']);
     $this->assertEqual($result[0]->attributes()->title, t('Page'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $view = Views::getView('test_attachment_ui');
     $view->initDisplay();
-    $this->assertEqual(array_keys(array_filter($view->displayHandlers->get('attachment_1')->getOption('displays'))), array('page_1'), 'The attached displays got saved as expected');
+    $this->assertEqual(array_keys(array_filter($view->displayHandlers->get('attachment_1')->getOption('displays'))), ['page_1'], 'The attached displays got saved as expected');
 
-    $this->drupalPostForm($attachment_display_url, array('displays[default]' => 1, 'displays[page_1]' => 1), t('Apply'));
-    $result = $this->xpath('//a[@id = :id]', array(':id' => 'views-attachment-1-displays'));
+    $this->drupalPostForm($attachment_display_url, ['displays[default]' => 1, 'displays[page_1]' => 1], t('Apply'));
+    $result = $this->xpath('//a[@id = :id]', [':id' => 'views-attachment-1-displays']);
     $this->assertEqual($result[0]->attributes()->title, t('Multiple displays'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $view = Views::getView('test_attachment_ui');
     $view->initDisplay();
-    $this->assertEqual(array_keys($view->displayHandlers->get('attachment_1')->getOption('displays')), array('default', 'page_1'), 'The attached displays got saved as expected');
+    $this->assertEqual(array_keys($view->displayHandlers->get('attachment_1')->getOption('displays')), ['default', 'page_1'], 'The attached displays got saved as expected');
+  }
+
+  /**
+   * Tests the attachment working after the attached page was deleted.
+   */
+  public function testRemoveAttachedDisplay() {
+    // Create a view.
+    $view = $this->randomView();
+    $path_prefix = 'admin/structure/views/view/' . $view['id'] . '/edit';
+    $attachment_display_url = 'admin/structure/views/nojs/display/' . $view['id'] . '/attachment_1/displays';
+
+    // Open the Page display and create the attachment display.
+    $this->drupalGet($path_prefix . '/page_1');
+    $this->drupalPostForm(NULL, [], 'Add Attachment');
+    $this->assertText(t('Not defined'), 'The right text appears if there is no attachment selection yet.');
+
+    // Attach the Attachment to the Page display.
+    $this->drupalPostForm($attachment_display_url, ['displays[page_1]' => 1], t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Save'));
+
+    // Open the Page display and mark it as deleted.
+    $this->drupalGet($path_prefix . '/page_1');
+    $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'Delete Page', 'Make sure there is a delete button on the page display.');
+    $this->drupalPostForm($path_prefix . '/page_1', [], 'Delete Page');
+
+    // Open the attachment display and save it.
+    $this->drupalGet($path_prefix . '/attachment_1');
+    $this->drupalPostForm(NULL, [], t('Save'));
+
+    // Check that there is no warning for the removed page display.
+    $this->assertNoText("Plugin ID &#039;page_1&#039; was not found.");
+
+    // Check that the attachment is no longer linked to the removed display.
+    $this->assertText(t('Not defined'), 'The right text appears if there is no attachment selection yet.');
+
   }
 
 }
diff --git a/web/core/modules/views_ui/src/Tests/DisplayCRUDTest.php b/web/core/modules/views_ui/src/Tests/DisplayCRUDTest.php
index 1e060dcb7..e29f0a94e 100644
--- a/web/core/modules/views_ui/src/Tests/DisplayCRUDTest.php
+++ b/web/core/modules/views_ui/src/Tests/DisplayCRUDTest.php
@@ -16,14 +16,14 @@ class DisplayCRUDTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_display');
+  public static $testViews = ['test_display'];
 
   /**
    * Modules to enable
    *
    * @var array
    */
-  public static $modules = array('contextual');
+  public static $modules = ['contextual'];
 
   /**
    * Tests adding a display.
@@ -39,14 +39,14 @@ class DisplayCRUDTest extends UITestBase {
     $this->drupalGet($path_prefix);
 
     // Add a new display.
-    $this->drupalPostForm(NULL, array(), 'Add Page');
+    $this->drupalPostForm(NULL, [], 'Add Page');
     $this->assertLinkByHref($path_prefix . '/page_1', 0, 'Make sure after adding a display the new display appears in the UI');
 
     $this->assertNoLink('Master*', 'Make sure the master display is not marked as changed.');
     $this->assertLink('Page*', 0, 'Make sure the added display is marked as changed.');
 
-    $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/path", array('path' => 'test/path'), t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/path", ['path' => 'test/path'], t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Save'));
   }
 
   /**
@@ -63,22 +63,22 @@ class DisplayCRUDTest extends UITestBase {
     $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'Delete Page', 'Make sure there is a delete button on the page display.');
 
     // Delete the page, so we can test the undo process.
-    $this->drupalPostForm($path_prefix . '/page_1', array(), 'Delete Page');
+    $this->drupalPostForm($path_prefix . '/page_1', [], 'Delete Page');
     $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-undo-delete', 'Undo delete of Page', 'Make sure there a undo button on the page display after deleting.');
-    $element = $this->xpath('//a[contains(@href, :href) and contains(@class, :class)]', array(':href' => $path_prefix . '/page_1', ':class' => 'views-display-deleted-link'));
+    $element = $this->xpath('//a[contains(@href, :href) and contains(@class, :class)]', [':href' => $path_prefix . '/page_1', ':class' => 'views-display-deleted-link']);
     $this->assertTrue(!empty($element), 'Make sure the display link is marked as to be deleted.');
 
-    $element = $this->xpath('//a[contains(@href, :href) and contains(@class, :class)]', array(':href' => $path_prefix . '/page_1', ':class' => 'views-display-deleted-link'));
+    $element = $this->xpath('//a[contains(@href, :href) and contains(@class, :class)]', [':href' => $path_prefix . '/page_1', ':class' => 'views-display-deleted-link']);
     $this->assertTrue(!empty($element), 'Make sure the display link is marked as to be deleted.');
 
     // Undo the deleting of the display.
-    $this->drupalPostForm($path_prefix . '/page_1', array(), 'Undo delete of Page');
+    $this->drupalPostForm($path_prefix . '/page_1', [], 'Undo delete of Page');
     $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-undo-delete', 'Undo delete of Page', 'Make sure there is no undo button on the page display after reverting.');
     $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'Delete Page', 'Make sure there is a delete button on the page display after the reverting.');
 
     // Now delete again and save the view.
-    $this->drupalPostForm($path_prefix . '/page_1', array(), 'Delete Page');
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm($path_prefix . '/page_1', [], 'Delete Page');
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $this->assertNoLinkByHref($path_prefix . '/page_1', 'Make sure there is no display tab for the deleted display.');
 
@@ -86,9 +86,9 @@ class DisplayCRUDTest extends UITestBase {
     $view = $this->randomView();
     $machine_name = 'new_machine_name';
     $path_prefix = 'admin/structure/views/view/' . $view['id'] . '/edit';
-    $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/display_id", array('display_id' => $machine_name), 'Apply');
-    $this->drupalPostForm(NULL, array(), 'Delete Page');
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/display_id", ['display_id' => $machine_name], 'Apply');
+    $this->drupalPostForm(NULL, [], 'Delete Page');
+    $this->drupalPostForm(NULL, [], t('Save'));
     $this->assertResponse(200);
     $this->assertNoLinkByHref($path_prefix . '/new_machine_name', 'Make sure there is no display tab for the deleted display.');
   }
@@ -111,24 +111,24 @@ class DisplayCRUDTest extends UITestBase {
     $path = $view['page[path]'];
 
     $this->drupalGet($path_prefix);
-    $this->drupalPostForm(NULL, array(), 'Duplicate Page');
+    $this->drupalPostForm(NULL, [], 'Duplicate Page');
     $this->assertLinkByHref($path_prefix . '/page_2', 0, 'Make sure after duplicating the new display appears in the UI');
-    $this->assertUrl($path_prefix . '/page_2', array(), 'The user got redirected to the new display.');
+    $this->assertUrl($path_prefix . '/page_2', [], 'The user got redirected to the new display.');
 
     // Set the title and override the css classes.
     $random_title = $this->randomMachineName();
     $random_css = $this->randomMachineName();
-    $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_2/title", array('title' => $random_title), t('Apply'));
-    $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_2/css_class", array('override[dropdown]' => 'page_2', 'css_class' => $random_css), t('Apply'));
+    $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_2/title", ['title' => $random_title], t('Apply'));
+    $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_2/css_class", ['override[dropdown]' => 'page_2', 'css_class' => $random_css], t('Apply'));
 
     // Duplicate as a different display type.
-    $this->drupalPostForm(NULL, array(), 'Duplicate as Block');
+    $this->drupalPostForm(NULL, [], 'Duplicate as Block');
     $this->assertLinkByHref($path_prefix . '/block_1', 0, 'Make sure after duplicating the new display appears in the UI');
-    $this->assertUrl($path_prefix . '/block_1', array(), 'The user got redirected to the new display.');
+    $this->assertUrl($path_prefix . '/block_1', [], 'The user got redirected to the new display.');
     $this->assertText(t('Block settings'));
     $this->assertNoText(t('Page settings'));
 
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $view = Views::getView($view['id']);
     $view->initDisplay();
 
diff --git a/web/core/modules/views_ui/src/Tests/DisplayExtenderUITest.php b/web/core/modules/views_ui/src/Tests/DisplayExtenderUITest.php
index 7e26dffd2..e8eff0a0c 100644
--- a/web/core/modules/views_ui/src/Tests/DisplayExtenderUITest.php
+++ b/web/core/modules/views_ui/src/Tests/DisplayExtenderUITest.php
@@ -16,13 +16,13 @@ class DisplayExtenderUITest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests the display extender UI.
    */
   public function testDisplayExtenderUI() {
-    $this->config('views.settings')->set('display_extenders', array('display_extender_test'))->save();
+    $this->config('views.settings')->set('display_extenders', ['display_extender_test'])->save();
 
     $view = Views::getView('test_view');
     $view_edit_url = "admin/structure/views/view/{$view->storage->id()}/edit";
@@ -32,9 +32,9 @@ class DisplayExtenderUITest extends UITestBase {
     $this->assertLinkByHref($display_option_url, 0, 'Make sure the option defined by the test display extender appears in the UI.');
 
     $random_text = $this->randomMachineName();
-    $this->drupalPostForm($display_option_url, array('test_extender_test_option' => $random_text), t('Apply'));
+    $this->drupalPostForm($display_option_url, ['test_extender_test_option' => $random_text], t('Apply'));
     $this->assertLink($random_text);
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $view = Views::getView($view->storage->id());
     $view->initDisplay();
     $display_extender_options = $view->display_handler->getOption('display_extenders');
diff --git a/web/core/modules/views_ui/src/Tests/DisplayFeedTest.php b/web/core/modules/views_ui/src/Tests/DisplayFeedTest.php
index 4e7bf8a4c..d8d003191 100644
--- a/web/core/modules/views_ui/src/Tests/DisplayFeedTest.php
+++ b/web/core/modules/views_ui/src/Tests/DisplayFeedTest.php
@@ -15,14 +15,14 @@ class DisplayFeedTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_display_feed', 'test_style_opml');
+  public static $testViews = ['test_display_feed', 'test_style_opml'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'aggregator');
+  public static $modules = ['views_ui', 'aggregator'];
 
   /**
    * Tests feed display admin UI.
@@ -55,7 +55,7 @@ class DisplayFeedTest extends UITestBase {
 
     // Load all the options of the checkbox.
     $result = $this->xpath('//div[@id="edit-displays"]/div');
-    $options = array();
+    $options = [];
     foreach ($result as $item) {
       foreach ($item->input->attributes() as $attribute => $value) {
         if ($attribute == 'value') {
@@ -64,10 +64,10 @@ class DisplayFeedTest extends UITestBase {
       }
     }
 
-    $this->assertEqual($options, array('default', 'page'), 'Make sure all displays appears as expected.');
+    $this->assertEqual($options, ['default', 'page'], 'Make sure all displays appears as expected.');
 
     // Post and save this and check the output.
-    $this->drupalPostForm('admin/structure/views/nojs/display/' . $view_name . '/feed_1/displays', array('displays[page]' => 'page'), t('Apply'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/' . $view_name . '/feed_1/displays', ['displays[page]' => 'page'], t('Apply'));
     // Options summary should be escaped.
     $this->assertEscaped('<em>Page</em>');
     $this->assertNoRaw('<em>Page</em>');
@@ -76,7 +76,7 @@ class DisplayFeedTest extends UITestBase {
     $this->assertFieldByXpath('//*[@id="views-feed-1-displays"]', '<em>Page</em>');
 
     // Add the default display, so there should now be multiple displays.
-    $this->drupalPostForm('admin/structure/views/nojs/display/' . $view_name . '/feed_1/displays', array('displays[default]' => 'default'), t('Apply'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/' . $view_name . '/feed_1/displays', ['displays[default]' => 'default'], t('Apply'));
     $this->drupalGet('admin/structure/views/view/' . $view_name . '/edit/feed_1');
     $this->assertFieldByXpath('//*[@id="views-feed-1-displays"]', 'Multiple displays');
   }
diff --git a/web/core/modules/views_ui/src/Tests/DisplayPathTest.php b/web/core/modules/views_ui/src/Tests/DisplayPathTest.php
index 8baa50649..d1d1732ba 100644
--- a/web/core/modules/views_ui/src/Tests/DisplayPathTest.php
+++ b/web/core/modules/views_ui/src/Tests/DisplayPathTest.php
@@ -21,14 +21,14 @@ class DisplayPathTest extends UITestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('menu_ui');
+  public static $modules = ['menu_ui'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view', 'test_page_display_menu');
+  public static $testViews = ['test_view', 'test_page_display_menu'];
 
   /**
    * Runs the tests.
@@ -46,9 +46,9 @@ class DisplayPathTest extends UITestBase {
     $this->drupalGet('admin/structure/views/view/test_view');
 
     // Add a new page display and check the appearing text.
-    $this->drupalPostForm(NULL, array(), 'Add Page');
+    $this->drupalPostForm(NULL, [], 'Add Page');
     $this->assertText(t('No path is set'), 'The right text appears if no path was set.');
-    $this->assertNoLink(t('View @display', array('@display' => 'page')), 'No view page link found on the page.');
+    $this->assertNoLink(t('View @display', ['@display' => 'page']), 'No view page link found on the page.');
 
     // Save a path and make sure the summary appears as expected.
     $random_path = $this->randomMachineName();
@@ -56,7 +56,7 @@ class DisplayPathTest extends UITestBase {
     //   longer use Url::fromUri(), and this path will be able to contain ':'.
     $random_path = str_replace(':', '', $random_path);
 
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', array('path' => $random_path), t('Apply'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', ['path' => $random_path], t('Apply'));
     $this->assertText('/' . $random_path, 'The custom path appears in the summary.');
     $display_link_text = t('View @display', ['@display' => 'Page']);
     $this->assertLink($display_link_text, 0, 'view page link found on the page.');
@@ -69,13 +69,13 @@ class DisplayPathTest extends UITestBase {
    */
   public function doPathXssFilterTest() {
     $this->drupalGet('admin/structure/views/view/test_view');
-    $this->drupalPostForm(NULL, array(), 'Add Page');
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_2/path', array('path' => '<object>malformed_path</object>'), t('Apply'));
-    $this->drupalPostForm(NULL, array(), 'Add Page');
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_3/path', array('path' => '<script>alert("hello");</script>'), t('Apply'));
-    $this->drupalPostForm(NULL, array(), 'Add Page');
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_4/path', array('path' => '<script>alert("hello I have placeholders %");</script>'), t('Apply'));
-    $this->drupalPostForm('admin/structure/views/view/test_view', array(), t('Save'));
+    $this->drupalPostForm(NULL, [], 'Add Page');
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_2/path', ['path' => '<object>malformed_path</object>'], t('Apply'));
+    $this->drupalPostForm(NULL, [], 'Add Page');
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_3/path', ['path' => '<script>alert("hello");</script>'], t('Apply'));
+    $this->drupalPostForm(NULL, [], 'Add Page');
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_4/path', ['path' => '<script>alert("hello I have placeholders %");</script>'], t('Apply'));
+    $this->drupalPostForm('admin/structure/views/view/test_view', [], t('Save'));
     $this->drupalGet('admin/structure/views');
     // The anchor text should be escaped.
     $this->assertEscaped('/<object>malformed_path</object>');
@@ -92,11 +92,11 @@ class DisplayPathTest extends UITestBase {
   protected function doAdvancedPathsValidationTest() {
     $url = 'admin/structure/views/nojs/display/test_view/page_1/path';
 
-    $this->drupalPostForm($url, array('path' => '%/magrathea'), t('Apply'));
+    $this->drupalPostForm($url, ['path' => '%/magrathea'], t('Apply'));
     $this->assertUrl($url);
     $this->assertText('"%" may not be used for the first segment of a path.');
 
-    $this->drupalPostForm($url, array('path' => 'user/%1/example'), t('Apply'));
+    $this->drupalPostForm($url, ['path' => 'user/%1/example'], t('Apply'));
     $this->assertUrl($url);
     $this->assertText("Numeric placeholders may not be used. Please use plain placeholders (%).");
   }
@@ -106,51 +106,51 @@ class DisplayPathTest extends UITestBase {
    */
   public function testDeleteWithNoPath() {
     $this->drupalGet('admin/structure/views/view/test_view');
-    $this->drupalPostForm(NULL, array(), t('Add Page'));
-    $this->drupalPostForm(NULL, array(), t('Delete Page'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
-    $this->assertRaw(t('The view %view has been saved.', array('%view' => 'Test view')));
+    $this->drupalPostForm(NULL, [], t('Add Page'));
+    $this->drupalPostForm(NULL, [], t('Delete Page'));
+    $this->drupalPostForm(NULL, [], t('Save'));
+    $this->assertRaw(t('The view %view has been saved.', ['%view' => 'Test view']));
   }
 
   /**
    * Tests the menu and tab option form.
    */
   public function testMenuOptions() {
-    $this->container->get('module_installer')->install(array('menu_ui'));
+    $this->container->get('module_installer')->install(['menu_ui']);
     $this->drupalGet('admin/structure/views/view/test_view');
 
     // Add a new page display.
-    $this->drupalPostForm(NULL, array(), 'Add Page');
+    $this->drupalPostForm(NULL, [], 'Add Page');
 
     // Add an invalid path (only fragment).
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', array('path' => '#foo'), t('Apply'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', ['path' => '#foo'], t('Apply'));
     $this->assertText('Path is empty');
 
     // Add an invalid path with a query.
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', array('path' => 'foo?bar'), t('Apply'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', ['path' => 'foo?bar'], t('Apply'));
     $this->assertText('No query allowed.');
 
     // Add an invalid path with just a query.
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', array('path' => '?bar'), t('Apply'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', ['path' => '?bar'], t('Apply'));
     $this->assertText('Path is empty');
 
     // Provide a random, valid path string.
     $random_string = $this->randomMachineName();
 
     // Save a path.
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', array('path' => $random_string), t('Apply'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', ['path' => $random_string], t('Apply'));
     $this->drupalGet('admin/structure/views/view/test_view');
 
-    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/menu', array('menu[type]' => 'default tab', 'menu[title]' => 'Test tab title'), t('Apply'));
+    $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/menu', ['menu[type]' => 'default tab', 'menu[title]' => 'Test tab title'], t('Apply'));
     $this->assertResponse(200);
     $this->assertUrl('admin/structure/views/nojs/display/test_view/page_1/tab_options');
 
-    $this->drupalPostForm(NULL, array('tab_options[type]' => 'tab', 'tab_options[title]' => $this->randomString()), t('Apply'));
+    $this->drupalPostForm(NULL, ['tab_options[type]' => 'tab', 'tab_options[title]' => $this->randomString()], t('Apply'));
     $this->assertResponse(200);
     $this->assertUrl('admin/structure/views/view/test_view/edit/page_1');
 
     $this->drupalGet('admin/structure/views/view/test_view');
-    $this->assertLink(t('Tab: @title', array('@title' => 'Test tab title')));
+    $this->assertLink(t('Tab: @title', ['@title' => 'Test tab title']));
     // If it's a default tab, it should also have an additional settings link.
     $this->assertLinkByHref('admin/structure/views/nojs/display/test_view/page_1/tab_options');
 
diff --git a/web/core/modules/views_ui/src/Tests/DisplayTest.php b/web/core/modules/views_ui/src/Tests/DisplayTest.php
index 7f5f12547..afb2c7ff0 100644
--- a/web/core/modules/views_ui/src/Tests/DisplayTest.php
+++ b/web/core/modules/views_ui/src/Tests/DisplayTest.php
@@ -20,14 +20,14 @@ class DisplayTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_display');
+  public static $testViews = ['test_display'];
 
   /**
    * Modules to enable
    *
    * @var array
    */
-  public static $modules = array('contextual');
+  public static $modules = ['contextual'];
 
   /**
    * Tests adding a display.
@@ -53,9 +53,9 @@ class DisplayTest extends UITestBase {
    * Tests reordering of displays.
    */
   public function testReorderDisplay() {
-    $view = array(
+    $view = [
       'block[create]' => TRUE
-    );
+    ];
     $view = $this->randomView($view);
 
     $this->clickLink(t('Reorder displays'));
@@ -64,15 +64,15 @@ class DisplayTest extends UITestBase {
     $this->assertTrue($this->xpath('//tr[@id="display-row-block_1"]'), 'Make sure the block display appears on the reorder listing');
 
     // Ensure the view displays are in the expected order in configuration.
-    $expected_display_order = array('default', 'block_1', 'page_1');
+    $expected_display_order = ['default', 'block_1', 'page_1'];
     $this->assertEqual(array_keys(Views::getView($view['id'])->storage->get('display')), $expected_display_order, 'The correct display names are present.');
     // Put the block display in front of the page display.
-    $edit = array(
+    $edit = [
       'displays[page_1][weight]' => 2,
       'displays[block_1][weight]' => 1
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $view = Views::getView($view['id']);
     $displays = $view->storage->get('display');
@@ -92,17 +92,17 @@ class DisplayTest extends UITestBase {
     $path_prefix = 'admin/structure/views/view/' . $view['id'] . '/edit';
 
     $this->drupalGet($path_prefix);
-    $this->assertFalse($this->xpath('//div[contains(@class, :class)]', array(':class' => 'views-display-disabled')), 'Make sure the disabled display css class does not appear after initial adding of a view.');
+    $this->assertFalse($this->xpath('//div[contains(@class, :class)]', [':class' => 'views-display-disabled']), 'Make sure the disabled display css class does not appear after initial adding of a view.');
 
     $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-disable', '', 'Make sure the disable button is visible.');
     $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-enable', '', 'Make sure the enable button is not visible.');
-    $this->drupalPostForm(NULL, array(), 'Disable Page');
-    $this->assertTrue($this->xpath('//div[contains(@class, :class)]', array(':class' => 'views-display-disabled')), 'Make sure the disabled display css class appears once the display is marked as such.');
+    $this->drupalPostForm(NULL, [], 'Disable Page');
+    $this->assertTrue($this->xpath('//div[contains(@class, :class)]', [':class' => 'views-display-disabled']), 'Make sure the disabled display css class appears once the display is marked as such.');
 
     $this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-disable', '', 'Make sure the disable button is not visible.');
     $this->assertFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-enable', '', 'Make sure the enable button is visible.');
-    $this->drupalPostForm(NULL, array(), 'Enable Page');
-    $this->assertFalse($this->xpath('//div[contains(@class, :class)]', array(':class' => 'views-display-disabled')), 'Make sure the disabled display css class does not appears once the display is enabled again.');
+    $this->drupalPostForm(NULL, [], 'Enable Page');
+    $this->assertFalse($this->xpath('//div[contains(@class, :class)]', [':class' => 'views-display-disabled']), 'Make sure the disabled display css class does not appears once the display is enabled again.');
   }
 
   /**
@@ -111,10 +111,10 @@ class DisplayTest extends UITestBase {
   public function testDisplayPluginsAlter() {
     $definitions = Views::pluginManager('display')->getDefinitions();
 
-    $expected = array(
+    $expected = [
       'route_name' => 'entity.view.edit_form',
-      'route_parameters_names' => array('view' => 'id'),
-    );
+      'route_parameters_names' => ['view' => 'id'],
+    ];
 
     // Test the expected views_ui array exists on each definition.
     foreach ($definitions as $definition) {
@@ -136,16 +136,16 @@ class DisplayTest extends UITestBase {
 
     $this->drupalGet('admin/structure/views/view/test_display/edit/display_no_area_test_1');
 
-    $areas = array(
+    $areas = [
       'header',
       'footer',
       'empty',
-    );
+    ];
 
     // Assert that the expected text is found in each area category.
     foreach ($areas as $type) {
-      $element = $this->xpath('//div[contains(@class, :class)]/div', array(':class' => $type));
-      $this->assertEqual((string) $element[0], SafeMarkup::format('The selected display type does not use @type plugins', array('@type' => $type)));
+      $element = $this->xpath('//div[contains(@class, :class)]/div', [':class' => $type]);
+      $this->assertEqual((string) $element[0], SafeMarkup::format('The selected display type does not use @type plugins', ['@type' => $type]));
     }
   }
 
@@ -159,28 +159,28 @@ class DisplayTest extends UITestBase {
 
     // Test the link text displays 'None' and not 'Block 1'
     $this->drupalGet($path);
-    $result = $this->xpath("//a[contains(@href, :path)]", array(':path' => $link_display_path));
+    $result = $this->xpath("//a[contains(@href, :path)]", [':path' => $link_display_path]);
     $this->assertEqual($result[0], t('None'), 'Make sure that the link option summary shows "None" by default.');
 
     $this->drupalGet($link_display_path);
     $this->assertFieldChecked('edit-link-display-0');
 
     // Test the default radio option on the link display form.
-    $this->drupalPostForm($link_display_path, array('link_display' => 'page_1'), t('Apply'));
+    $this->drupalPostForm($link_display_path, ['link_display' => 'page_1'], t('Apply'));
     // The form redirects to the master display.
     $this->drupalGet($path);
 
-    $result = $this->xpath("//a[contains(@href, :path)]", array(':path' => $link_display_path));
+    $result = $this->xpath("//a[contains(@href, :path)]", [':path' => $link_display_path]);
     $this->assertEqual($result[0], 'Page', 'Make sure that the link option summary shows the right linked display.');
 
-    $this->drupalPostForm($link_display_path, array('link_display' => 'custom_url', 'link_url' => 'a-custom-url'), t('Apply'));
+    $this->drupalPostForm($link_display_path, ['link_display' => 'custom_url', 'link_url' => 'a-custom-url'], t('Apply'));
     // The form redirects to the master display.
     $this->drupalGet($path);
 
     $this->assertLink(t('Custom URL'), 0, 'The link option has custom URL as summary.');
 
     // Test the default link_url value for new display
-    $this->drupalPostForm(NULL, array(), t('Add Block'));
+    $this->drupalPostForm(NULL, [], t('Add Block'));
     $this->assertUrl('admin/structure/views/view/test_display/edit/block_2');
     $this->clickLink(t('Custom URL'));
     $this->assertFieldByName('link_url', 'a-custom-url');
@@ -190,7 +190,7 @@ class DisplayTest extends UITestBase {
    * Tests contextual links on Views page displays.
    */
   public function testPageContextualLinks() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer views', 'access contextual links')));
+    $this->drupalLogin($this->drupalCreateUser(['administer views', 'access contextual links']));
     $view = View::load('test_display');
     $view->enable()->save();
     $this->container->get('router.builder')->rebuildIfNeeded();
@@ -200,12 +200,12 @@ class DisplayTest extends UITestBase {
     $this->drupalGet('test-display');
     $id = 'entity.view.edit_form:view=test_display:location=page&name=test_display&display_id=page_1&langcode=en';
     // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder()
-    $this->assertRaw('<div' . new Attribute(array('data-contextual-id' => $id)) . '></div>', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
+    $this->assertRaw('<div' . new Attribute(['data-contextual-id' => $id]) . '></div>', format_string('Contextual link placeholder with id @id exists.', ['@id' => $id]));
 
     // Get server-rendered contextual links.
     // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:renderContextualLinks()
-    $post = array('ids[0]' => $id);
-    $response = $this->drupalPostWithFormat('contextual/render', 'json', $post, array('query' => array('destination' => 'test-display')));
+    $post = ['ids[0]' => $id];
+    $response = $this->drupalPostWithFormat('contextual/render', 'json', $post, ['query' => ['destination' => 'test-display']]);
     $this->assertResponse(200);
     $json = Json::decode($response);
     $this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="entityviewedit-form"><a href="' . base_path() . 'admin/structure/views/view/test_display/edit/page_1">Edit view</a></li></ul>');
@@ -217,7 +217,7 @@ class DisplayTest extends UITestBase {
     $this->drupalGet('test-display');
     $id = 'entity.view.edit_form:view=test_display:location=page&name=test_display&display_id=page_1&langcode=en';
     // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder()
-    $this->assertRaw('<div' . new Attribute(array('data-contextual-id' => $id)) . '></div>', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id)));
+    $this->assertRaw('<div' . new Attribute(['data-contextual-id' => $id]) . '></div>', format_string('Contextual link placeholder with id @id exists.', ['@id' => $id]));
   }
 
   /**
@@ -229,14 +229,14 @@ class DisplayTest extends UITestBase {
 
     // The view should initially have the enabled class on it's form wrapper.
     $this->drupalGet('admin/structure/views/view/' . $id);
-    $elements = $this->xpath('//div[contains(@class, :edit) and contains(@class, :status)]', array(':edit' => 'views-edit-view', ':status' => 'enabled'));
+    $elements = $this->xpath('//div[contains(@class, :edit) and contains(@class, :status)]', [':edit' => 'views-edit-view', ':status' => 'enabled']);
     $this->assertTrue($elements, 'The enabled class was found on the form wrapper');
 
     $view = Views::getView($id);
     $view->storage->disable()->save();
 
     $this->drupalGet('admin/structure/views/view/' . $id);
-    $elements = $this->xpath('//div[contains(@class, :edit) and contains(@class, :status)]', array(':edit' => 'views-edit-view', ':status' => 'disabled'));
+    $elements = $this->xpath('//div[contains(@class, :edit) and contains(@class, :status)]', [':edit' => 'views-edit-view', ':status' => 'disabled']);
     $this->assertTrue($elements, 'The disabled class was found on the form wrapper.');
   }
 
@@ -278,7 +278,7 @@ class DisplayTest extends UITestBase {
     $display_title = "'<test>'";
     $this->drupalGet('admin/structure/views/view/test_display');
     $display_title_path = 'admin/structure/views/nojs/display/test_display/block_1/display_title';
-    $this->drupalPostForm($display_title_path, array('display_title' => $display_title), t('Apply'));
+    $this->drupalPostForm($display_title_path, ['display_title' => $display_title], t('Apply'));
 
     // Ensure that the title is escaped as expected.
     $this->assertEscaped($display_title);
diff --git a/web/core/modules/views_ui/src/Tests/DuplicateTest.php b/web/core/modules/views_ui/src/Tests/DuplicateTest.php
index a6948f002..1096ab431 100644
--- a/web/core/modules/views_ui/src/Tests/DuplicateTest.php
+++ b/web/core/modules/views_ui/src/Tests/DuplicateTest.php
@@ -24,7 +24,7 @@ class DuplicateTest extends UITestBase {
     $random_view = $this->randomView();
 
     // Initialize array for duplicated view.
-    $view = array();
+    $view = [];
 
     // Generate random label and id for new view.
     $view['label'] = $this->randomMachineName(255);
@@ -34,7 +34,7 @@ class DuplicateTest extends UITestBase {
     $this->drupalPostForm('admin/structure/views/view/' . $random_view['id'] . '/duplicate', $view, t('Duplicate'));
 
     // Assert that the page url is correct.
-    $this->assertUrl('admin/structure/views/view/' . $view['id'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
+    $this->assertUrl('admin/structure/views/view/' . $view['id'], [], 'Make sure the view saving was successful and the browser got redirected to the edit page.');
 
     // Assert that the page title is correctly displayed.
     $this->assertText($view['label']);
diff --git a/web/core/modules/views_ui/src/Tests/ExposedFormUITest.php b/web/core/modules/views_ui/src/Tests/ExposedFormUITest.php
index 66280b1be..0aaa6ee7c 100644
--- a/web/core/modules/views_ui/src/Tests/ExposedFormUITest.php
+++ b/web/core/modules/views_ui/src/Tests/ExposedFormUITest.php
@@ -16,12 +16,12 @@ class ExposedFormUITest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_exposed_admin_ui');
+  public static $testViews = ['test_exposed_admin_ui'];
 
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('node', 'views_ui', 'block', 'taxonomy', 'field_ui', 'datetime');
+  public static $modules = ['node', 'views_ui', 'block', 'taxonomy', 'field_ui', 'datetime'];
 
   /**
    * Array of error message strings raised by the grouped form.
@@ -35,8 +35,8 @@ class ExposedFormUITest extends UITestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->drupalCreateContentType(array('type' => 'article'));
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'article']);
+    $this->drupalCreateContentType(['type' => 'page']);
 
     // Create some random nodes.
     for ($i = 0; $i < 5; $i++) {
@@ -52,8 +52,8 @@ class ExposedFormUITest extends UITestBase {
   /**
    * Tests the admin interface of exposed filter and sort items.
    */
-  function testExposedAdminUi() {
-    $edit = array();
+  public function testExposedAdminUi() {
+    $edit = [];
 
     $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
     // Be sure that the button is called exposed.
@@ -78,12 +78,12 @@ class ExposedFormUITest extends UITestBase {
     $this->assertFieldById('edit-options-value-article', '', 'Checkbox for Article exists');
 
     // Check the validations of the filter handler.
-    $edit = array();
+    $edit = [];
     $edit['options[expose][identifier]'] = '';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
     $this->assertText(t('The identifier is required if the filter is exposed.'));
 
-    $edit = array();
+    $edit = [];
     $edit['options[expose][identifier]'] = 'value';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
     $this->assertText(t('This identifier is not allowed.'));
@@ -95,7 +95,7 @@ class ExposedFormUITest extends UITestBase {
 
     // Un-expose the filter.
     $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
-    $this->drupalPostForm(NULL, array(), t('Hide filter'));
+    $this->drupalPostForm(NULL, [], t('Hide filter'));
 
     // After Un-exposing the filter, Operator and Value should be shown again.
     $this->assertFieldById('edit-options-operator-in', '', 'Operator In exists after hide filter');
@@ -104,7 +104,7 @@ class ExposedFormUITest extends UITestBase {
     $this->assertFieldById('edit-options-value-article', '', 'Checkbox for Article exists after hide filter');
 
     // Click the Expose sort button.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/sort/created', $edit, t('Expose sort'));
     // Check the label of the expose button.
     $this->helperButtonHasLabel('edit-options-expose-button-button', t('Hide sort'));
@@ -134,8 +134,8 @@ class ExposedFormUITest extends UITestBase {
   /**
    * Tests the admin interface of exposed grouped filters.
    */
-  function testGroupedFilterAdminUi() {
-    $edit = array();
+  public function testGroupedFilterAdminUi() {
+    $edit = [];
 
     $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
 
@@ -146,7 +146,7 @@ class ExposedFormUITest extends UITestBase {
 
     // Click the Grouped Filters button.
     $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
-    $this->drupalPostForm(NULL, array(), t('Grouped filters'));
+    $this->drupalPostForm(NULL, [], t('Grouped filters'));
 
     // After click on 'Grouped Filters', the standard operator and value should
     // not be displayed.
@@ -161,7 +161,7 @@ class ExposedFormUITest extends UITestBase {
 
     // Validate a single entry for a grouped filter.
     $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
-    $edit = array();
+    $edit = [];
     $edit["options[group_info][group_items][1][title]"] = 'Is Article';
     $edit["options[group_info][group_items][1][value][article]"] = 'article';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
@@ -170,7 +170,7 @@ class ExposedFormUITest extends UITestBase {
 
     // Validate multiple entries for grouped filters.
     $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
-    $edit = array();
+    $edit = [];
     $edit["options[group_info][group_items][1][title]"] = 'Is Article';
     $edit["options[group_info][group_items][1][value][article]"] = 'article';
     $edit["options[group_info][group_items][2][title]"] = 'Is Page';
@@ -179,28 +179,28 @@ class ExposedFormUITest extends UITestBase {
     $edit["options[group_info][group_items][3][value][article]"] = 'article';
     $edit["options[group_info][group_items][3][value][page]"] = 'page';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
-    $this->assertUrl('admin/structure/views/view/test_exposed_admin_ui/edit/default', array(), 'Correct validation of the node type filter.');
+    $this->assertUrl('admin/structure/views/view/test_exposed_admin_ui/edit/default', [], 'Correct validation of the node type filter.');
     $this->assertNoGroupedFilterErrors();
 
     // Validate an "is empty" filter -- title without value is valid.
     $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/body_value');
-    $edit = array();
+    $edit = [];
     $edit["options[group_info][group_items][1][title]"] = 'No body';
     $edit["options[group_info][group_items][1][operator]"] = 'empty';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
-    $this->assertUrl('admin/structure/views/view/test_exposed_admin_ui/edit/default', array(), 'The "empty" operator validates correctly.');
+    $this->assertUrl('admin/structure/views/view/test_exposed_admin_ui/edit/default', [], 'The "empty" operator validates correctly.');
     $this->assertNoGroupedFilterErrors();
 
     // Ensure the string "0" can be used as a value for numeric filters.
-    $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_exposed_admin_ui/default/filter', array('name[node_field_data.nid]' => TRUE), t('Add and configure @handler', array('@handler' => t('filter criteria'))));
-    $this->drupalPostForm(NULL, array(), t('Expose filter'));
-    $this->drupalPostForm(NULL, array(), t('Grouped filters'));
-    $edit = array();
+    $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_exposed_admin_ui/default/filter', ['name[node_field_data.nid]' => TRUE], t('Add and configure @handler', ['@handler' => t('filter criteria')]));
+    $this->drupalPostForm(NULL, [], t('Expose filter'));
+    $this->drupalPostForm(NULL, [], t('Grouped filters'));
+    $edit = [];
     $edit['options[group_info][group_items][1][title]'] = 'Testing zero';
     $edit['options[group_info][group_items][1][operator]'] = '>';
     $edit['options[group_info][group_items][1][value][value]'] = '0';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
-    $this->assertUrl('admin/structure/views/view/test_exposed_admin_ui/edit/default', array(), 'A string "0" is a valid value.');
+    $this->assertUrl('admin/structure/views/view/test_exposed_admin_ui/edit/default', [], 'A string "0" is a valid value.');
     $this->assertNoGroupedFilterErrors();
 
     // Ensure "between" filters validate correctly.
@@ -210,14 +210,14 @@ class ExposedFormUITest extends UITestBase {
     $edit['options[group_info][group_items][1][value][min]'] = '0';
     $edit['options[group_info][group_items][1][value][max]'] = '10';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
-    $this->assertUrl('admin/structure/views/view/test_exposed_admin_ui/edit/default', array(), 'The "between" filter validates correctly.');
+    $this->assertUrl('admin/structure/views/view/test_exposed_admin_ui/edit/default', [], 'The "between" filter validates correctly.');
     $this->assertNoGroupedFilterErrors();
   }
 
   public function testGroupedFilterAdminUiErrors() {
     // Select the empty operator without a title specified.
     $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/body_value');
-    $edit = array();
+    $edit = [];
     $edit["options[group_info][group_items][1][title]"] = '';
     $edit["options[group_info][group_items][1][operator]"] = 'empty';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
@@ -227,14 +227,14 @@ class ExposedFormUITest extends UITestBase {
     $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
     $this->drupalPostForm('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type', [], t('Expose filter'));
     $this->drupalPostForm('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type', [], t('Grouped filters'));
-    $edit = array();
+    $edit = [];
     $edit["options[group_info][group_items][1][title]"] = 'Is Article';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
     $this->assertText($this->groupFormUiErrors['missing_value']);
 
     // Specify a value without a title.
     $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
-    $edit = array();
+    $edit = [];
     $edit["options[group_info][group_items][1][title]"] = '';
     $edit["options[group_info][group_items][1][value][article]"] = 'article';
     $this->drupalPostForm(NULL, $edit, t('Apply'));
@@ -265,4 +265,56 @@ class ExposedFormUITest extends UITestBase {
     return TRUE;
   }
 
+  /**
+  * Tests the configuration of grouped exposed filters.
+  */
+  public function testExposedGroupedFilter() {
+    // Click the Expose filter button.
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type', [], t('Expose filter'));
+    // Select 'Grouped filters' radio button.
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type', [], t('Grouped filters'));
+    // Add 3 groupings.
+    $edit = [
+      'options[group_button][radios][radios]' => 1,
+      'options[group_info][group_items][1][title]' => '1st',
+      'options[group_info][group_items][1][value][all]' => 'all',
+      'options[group_info][group_items][2][title]' => '2nd',
+      'options[group_info][group_items][2][value][article]' => 'article',
+      'options[group_info][group_items][3][title]' => '3rd',
+      'options[group_info][group_items][3][value][page]' => 'page',
+    ];
+    // Apply the filter settings.
+    $this->drupalPostForm(NULL, $edit, t('Apply'));
+    // Check that the view is saved without errors.
+    $this->drupalPostForm(NULL, [], t('Save'));
+    $this->assertResponse(200);
+
+    // Click the Expose filter button.
+    $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_exposed_admin_ui/default/filter', ['name[node_field_data.status]' => 1], t('Add and configure filter criteria'));
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/status', [], t('Expose filter'));
+    // Select 'Grouped filters' radio button.
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/status', [], t('Grouped filters'));
+    // Add 3 groupings.
+    $edit = [
+      'options[group_button][radios][radios]' => 1,
+      'options[group_info][group_items][1][title]' => 'Any',
+      'options[group_info][group_items][1][value]' => 'All',
+      'options[group_info][group_items][2][title]' => 'Published',
+      'options[group_info][group_items][2][value]' => 1,
+      'options[group_info][group_items][3][title]' => 'Unpublished',
+      'options[group_info][group_items][3][value]' => 0,
+    ];
+    // Apply the filter settings.
+    $this->drupalPostForm(NULL, $edit, t('Apply'));
+    // Check that the view is saved without errors.
+    $this->drupalPostForm(NULL, [], t('Save'));
+    $this->assertResponse(200);
+
+    $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/status');
+    // Assert the same settings defined before still are there.
+    $this->assertFieldChecked('edit-options-group-info-group-items-1-value-all');
+    $this->assertFieldChecked('edit-options-group-info-group-items-2-value-1');
+    $this->assertFieldChecked('edit-options-group-info-group-items-3-value-0');
+  }
+
 }
diff --git a/web/core/modules/views_ui/src/Tests/FieldUITest.php b/web/core/modules/views_ui/src/Tests/FieldUITest.php
index 8c486d8b3..4e8732369 100644
--- a/web/core/modules/views_ui/src/Tests/FieldUITest.php
+++ b/web/core/modules/views_ui/src/Tests/FieldUITest.php
@@ -18,7 +18,7 @@ class FieldUITest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests the UI of field handlers.
@@ -31,7 +31,7 @@ class FieldUITest extends UITestBase {
 
     // Hides the field and check whether the hidden label is appended.
     $edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/name';
-    $this->drupalPostForm($edit_handler_url, array('options[exclude]' => TRUE), t('Apply'));
+    $this->drupalPostForm($edit_handler_url, ['options[exclude]' => TRUE], t('Apply'));
 
     $this->assertText('Views test: Name [' . t('hidden') . ']');
 
@@ -62,9 +62,9 @@ class FieldUITest extends UITestBase {
     $this->assertNoLinkByHref($edit_groupby_url, 0, 'No aggregation link found.');
 
     // Enable aggregation on the view.
-    $edit = array(
+    $edit = [
       'group_by' => TRUE,
-    );
+    ];
     $this->drupalPostForm('/admin/structure/views/nojs/display/test_view/default/group_by', $edit, t('Apply'));
 
     $this->assertLinkByHref($edit_groupby_url, 0, 'Aggregation link found.');
@@ -81,7 +81,7 @@ class FieldUITest extends UITestBase {
   public function testFieldLabel() {
     // Create a view with unformatted style and make sure the fields have no
     // labels by default.
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = strtolower($this->randomMachineName(16));
     $view['description'] = $this->randomMachineName(16);
diff --git a/web/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php b/web/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php
index 668cc4c1d..a3e58d755 100644
--- a/web/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php
+++ b/web/core/modules/views_ui/src/Tests/FilterBooleanWebTest.php
@@ -15,22 +15,22 @@ class FilterBooleanWebTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests the filter boolean UI.
    */
   public function testFilterBooleanUI() {
-    $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_view/default/filter', array('name[views_test_data.status]' => TRUE), t('Add and configure @handler', array('@handler' => t('filter criteria'))));
+    $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_view/default/filter', ['name[views_test_data.status]' => TRUE], t('Add and configure @handler', ['@handler' => t('filter criteria')]));
 
     // Check the field widget label. 'title' should be used as a fallback.
     $result = $this->cssSelect('#edit-options-value--wrapper legend span');
     $this->assertEqual((string) $result[0], 'Status');
 
-    $this->drupalPostForm(NULL, array(), t('Expose filter'));
-    $this->drupalPostForm(NULL, array(), t('Grouped filters'));
+    $this->drupalPostForm(NULL, [], t('Expose filter'));
+    $this->drupalPostForm(NULL, [], t('Grouped filters'));
 
-    $edit = array();
+    $edit = [];
     $edit['options[group_info][group_items][1][title]'] = 'Published';
     $edit['options[group_info][group_items][1][operator]'] = '=';
     $edit['options[group_info][group_items][1][value]'] = 1;
@@ -56,7 +56,7 @@ class FilterBooleanWebTest extends UITestBase {
     $this->assertEqual(count($this->cssSelect('a.views-remove-link')), 3);
 
     // Test selecting a default and removing an item.
-    $edit = array();
+    $edit = [];
     $edit['options[group_info][default_group]'] = 2;
     $edit['options[group_info][group_items][3][remove]'] = 1;
     $this->drupalPostForm(NULL, $edit, t('Apply'));
diff --git a/web/core/modules/views_ui/src/Tests/FilterNumericWebTest.php b/web/core/modules/views_ui/src/Tests/FilterNumericWebTest.php
index 9182ca9d8..104d62f54 100644
--- a/web/core/modules/views_ui/src/Tests/FilterNumericWebTest.php
+++ b/web/core/modules/views_ui/src/Tests/FilterNumericWebTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\views_ui\Tests;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 
 /**
  * Tests the numeric filter UI.
@@ -18,18 +18,18 @@ class FilterNumericWebTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests the filter numeric UI.
    */
   public function testFilterNumericUI() {
-    $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_view/default/filter', array('name[views_test_data.age]' => TRUE), t('Add and configure @handler', array('@handler' => t('filter criteria'))));
+    $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_view/default/filter', ['name[views_test_data.age]' => TRUE], t('Add and configure @handler', ['@handler' => t('filter criteria')]));
 
-    $this->drupalPostForm(NULL, array(), t('Expose filter'));
-    $this->drupalPostForm(NULL, array(), t('Grouped filters'));
+    $this->drupalPostForm(NULL, [], t('Expose filter'));
+    $this->drupalPostForm(NULL, [], t('Grouped filters'));
 
-    $edit = array();
+    $edit = [];
     $edit['options[group_info][group_items][1][title]'] = 'Old';
     $edit['options[group_info][group_items][1][operator]'] = '>';
     $edit['options[group_info][group_items][1][value][value]'] = 27;
@@ -48,17 +48,17 @@ class FilterNumericWebTest extends UITestBase {
       $this->assertFieldByName($name, $value);
     }
 
-    $this->drupalPostForm('admin/structure/views/view/test_view', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/views/view/test_view', [], t('Save'));
     $this->assertConfigSchemaByName('views.view.test_view');
 
     // Test that the exposed filter works as expected.
-    $this->drupalPostForm(NULL, array(), t('Update preview'));
+    $this->drupalPostForm(NULL, [], t('Update preview'));
     $this->assertText('John');
     $this->assertText('Paul');
     $this->assertText('Ringo');
     $this->assertText('George');
     $this->assertText('Meredith');
-    $this->drupalPostForm(NULL, array('age' => '2'), t('Update preview'));
+    $this->drupalPostForm(NULL, ['age' => '2'], t('Update preview'));
     $this->assertText('John');
     $this->assertText('Paul');
     $this->assertNoText('Ringo');
@@ -67,21 +67,21 @@ class FilterNumericWebTest extends UITestBase {
 
     // Change the filter to a single filter to test the schema when the operator
     // is not exposed.
-    $this->drupalPostForm('admin/structure/views/nojs/handler/test_view/default/filter/age', array(), t('Single filter'));
-    $edit = array();
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_view/default/filter/age', [], t('Single filter'));
+    $edit = [];
     $edit['options[value][value]'] = 25;
     $this->drupalPostForm(NULL, $edit, t('Apply'));
-    $this->drupalPostForm('admin/structure/views/view/test_view', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/views/view/test_view', [], t('Save'));
     $this->assertConfigSchemaByName('views.view.test_view');
 
     // Test that the filter works as expected.
-    $this->drupalPostForm(NULL, array(), t('Update preview'));
+    $this->drupalPostForm(NULL, [], t('Update preview'));
     $this->assertText('John');
     $this->assertNoText('Paul');
     $this->assertNoText('Ringo');
     $this->assertNoText('George');
     $this->assertNoText('Meredith');
-    $this->drupalPostForm(NULL, array('age' => '26'), t('Update preview'));
+    $this->drupalPostForm(NULL, ['age' => '26'], t('Update preview'));
     $this->assertNoText('John');
     $this->assertText('Paul');
     $this->assertNoText('Ringo');
@@ -91,17 +91,17 @@ class FilterNumericWebTest extends UITestBase {
     // Change the filter to a 'between' filter to test if the label and
     // description are set for the 'minimum' filter element.
     $this->drupalGet('admin/structure/views/nojs/handler/test_view/default/filter/age');
-    $edit = array();
+    $edit = [];
     $edit['options[expose][label]'] = 'Age between';
     $edit['options[expose][description]'] = 'Description of the exposed filter';
     $edit['options[operator]'] = 'between';
     $edit['options[value][min]'] = 26;
     $edit['options[value][max]'] = 28;
     $this->drupalPostForm(NULL, $edit, t('Apply'));
-    $this->drupalPostForm('admin/structure/views/view/test_view', array(), t('Save'));
+    $this->drupalPostForm('admin/structure/views/view/test_view', [], t('Save'));
     $this->assertConfigSchemaByName('views.view.test_view');
 
-    $this->drupalPostForm(NULL, array(), t('Update preview'));
+    $this->drupalPostForm(NULL, [], t('Update preview'));
     // Check the max field label.
     $this->assertRaw('<label for="edit-age-max">And</label>', 'Max field label found');
     $this->assertRaw('<label for="edit-age-min">Age between</label>', 'Min field label found');
diff --git a/web/core/modules/views_ui/src/Tests/FilterUITest.php b/web/core/modules/views_ui/src/Tests/FilterUITest.php
index 371800f84..1197fc6e0 100644
--- a/web/core/modules/views_ui/src/Tests/FilterUITest.php
+++ b/web/core/modules/views_ui/src/Tests/FilterUITest.php
@@ -17,21 +17,21 @@ class FilterUITest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_filter_in_operator_ui', 'test_filter_groups');
+  public static $testViews = ['test_filter_in_operator_ui', 'test_filter_groups'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'node');
+  public static $modules = ['views_ui', 'node'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     $this->enableViewsTestModule();
   }
 
@@ -39,7 +39,7 @@ class FilterUITest extends ViewTestBase {
    * Tests that an option for a filter is saved as expected from the UI.
    */
   public function testFilterInOperatorUi() {
-    $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
     $this->drupalLogin($admin_user);
 
     $path = 'admin/structure/views/nojs/handler/test_filter_in_operator_ui/default/filter/type';
@@ -48,9 +48,9 @@ class FilterUITest extends ViewTestBase {
     $this->assertFieldByName('options[expose][reduce]', FALSE);
 
     // Select "Limit list to selected items" option and apply.
-    $edit = array(
+    $edit = [
       'options[expose][reduce]' => TRUE,
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Apply'));
 
     // Verifies that the option was saved as expected.
@@ -62,7 +62,7 @@ class FilterUITest extends ViewTestBase {
    * Tests the filters from the UI.
    */
   public function testFiltersUI() {
-    $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
     $this->drupalLogin($admin_user);
 
     $this->drupalGet('admin/structure/views/view/test_filter_groups');
@@ -94,28 +94,28 @@ class FilterUITest extends ViewTestBase {
    * Tests the identifier settings and restrictions.
    */
   public function testFilterIdentifier() {
-    $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
+    $admin_user = $this->drupalCreateUser(['administer views', 'administer site configuration']);
     $this->drupalLogin($admin_user);
     $path = 'admin/structure/views/nojs/handler/test_filter_in_operator_ui/default/filter/type';
 
     // Set an empty identifier.
-    $edit = array(
+    $edit = [
       'options[expose][identifier]' => '',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Apply'));
     $this->assertText('The identifier is required if the filter is exposed.');
 
     // Set the identifier to 'value'.
-    $edit = array(
+    $edit = [
       'options[expose][identifier]' => 'value',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Apply'));
     $this->assertText('This identifier is not allowed.');
 
     // Set the identifier to a value with a restricted character.
-    $edit = array(
+    $edit = [
       'options[expose][identifier]' => 'value value',
-    );
+    ];
     $this->drupalPostForm($path, $edit, t('Apply'));
     $this->assertText('This identifier has illegal characters.');
   }
diff --git a/web/core/modules/views_ui/src/Tests/GroupByTest.php b/web/core/modules/views_ui/src/Tests/GroupByTest.php
index 8d0ae3a91..4b564c518 100644
--- a/web/core/modules/views_ui/src/Tests/GroupByTest.php
+++ b/web/core/modules/views_ui/src/Tests/GroupByTest.php
@@ -14,32 +14,32 @@ class GroupByTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_views_groupby_save');
+  public static $testViews = ['test_views_groupby_save'];
 
   /**
    * Tests whether basic saving works.
    *
    * @todo This should check the change of the settings as well.
    */
-  function testGroupBySave() {
+  public function testGroupBySave() {
     $this->drupalGet('admin/structure/views/view/test_views_groupby_save/edit');
 
     $edit_groupby_url = 'admin/structure/views/nojs/handler-group/test_views_groupby_save/default/field/id';
     $this->assertNoLinkByHref($edit_groupby_url, 0, 'No aggregation link found.');
 
     // Enable aggregation on the view.
-    $edit = array(
+    $edit = [
       'group_by' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_views_groupby_save/default/group_by', $edit, t('Apply'));
 
     $this->assertLinkByHref($edit_groupby_url, 0, 'Aggregation link found.');
 
     // Change the groupby type in the UI.
-    $this->drupalPostForm($edit_groupby_url, array('options[group_type]' => 'count'), t('Apply'));
+    $this->drupalPostForm($edit_groupby_url, ['options[group_type]' => 'count'], t('Apply'));
     $this->assertLink('COUNT(Views test: ID)', 0, 'The count setting is displayed in the UI');
 
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $view = $this->container->get('entity.manager')->getStorage('view')->load('test_views_groupby_save');
     $display = $view->getDisplay('default');
diff --git a/web/core/modules/views_ui/src/Tests/HandlerTest.php b/web/core/modules/views_ui/src/Tests/HandlerTest.php
index bc61a3705..8fb29f97c 100644
--- a/web/core/modules/views_ui/src/Tests/HandlerTest.php
+++ b/web/core/modules/views_ui/src/Tests/HandlerTest.php
@@ -19,14 +19,14 @@ class HandlerTest extends UITestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('node_test_views');
+  public static $modules = ['node_test_views'];
 
   /**
    * Views used by this test.
    *
    * @var array
    */
-  public static $testViews = array('test_view_empty', 'test_view_broken', 'node', 'test_node_view');
+  public static $testViews = ['test_view_empty', 'test_view_broken', 'node', 'test_node_view'];
 
   /**
    * {@inheritdoc}
@@ -35,7 +35,7 @@ class HandlerTest extends UITestBase {
     parent::setUp();
 
     $this->drupalPlaceBlock('page_title_block');
-    ViewTestData::createTestViews(get_class($this), array('node_test_views'));
+    ViewTestData::createTestViews(get_class($this), ['node_test_views']);
   }
 
   /**
@@ -46,13 +46,13 @@ class HandlerTest extends UITestBase {
   protected function schemaDefinition() {
     $schema = parent::schemaDefinition();
 
-    $schema['views_test_data']['fields']['uid'] = array(
+    $schema['views_test_data']['fields']['uid'] = [
       'description' => "The {users}.uid of the author of the beatle entry.",
       'type' => 'int',
       'unsigned' => TRUE,
       'not null' => TRUE,
       'default' => 0
-    );
+    ];
 
     return $schema;
   }
@@ -66,15 +66,15 @@ class HandlerTest extends UITestBase {
    */
   protected function viewsData() {
     $data = parent::viewsData();
-    $data['views_test_data']['uid'] = array(
+    $data['views_test_data']['uid'] = [
       'title' => t('UID'),
       'help' => t('The test data UID'),
-      'relationship' => array(
+      'relationship' => [
         'id' => 'standard',
         'base' => 'users_field_data',
         'base field' => 'uid'
-      )
-    );
+      ]
+    ];
 
     // Create a dummy field with no help text.
     $data['views_test_data']['no_help'] = $data['views_test_data']['name'];
@@ -95,43 +95,43 @@ class HandlerTest extends UITestBase {
       $add_handler_url = "admin/structure/views/nojs/add-handler/test_view_empty/default/$type";
 
       // Area handler types need to use a different handler.
-      if (in_array($type, array('header', 'footer', 'empty'))) {
-        $this->drupalPostForm($add_handler_url, array('name[views.area]' => TRUE), t('Add and configure @handler', array('@handler' => $type_info['ltitle'])));
+      if (in_array($type, ['header', 'footer', 'empty'])) {
+        $this->drupalPostForm($add_handler_url, ['name[views.area]' => TRUE], t('Add and configure @handler', ['@handler' => $type_info['ltitle']]));
         $id = 'area';
         $edit_handler_url = "admin/structure/views/nojs/handler/test_view_empty/default/$type/$id";
       }
       elseif ($type == 'relationship') {
-        $this->drupalPostForm($add_handler_url, array('name[views_test_data.uid]' => TRUE), t('Add and configure @handler', array('@handler' => $type_info['ltitle'])));
+        $this->drupalPostForm($add_handler_url, ['name[views_test_data.uid]' => TRUE], t('Add and configure @handler', ['@handler' => $type_info['ltitle']]));
         $id = 'uid';
         $edit_handler_url = "admin/structure/views/nojs/handler/test_view_empty/default/$type/$id";
       }
       else {
-        $this->drupalPostForm($add_handler_url, array('name[views_test_data.job]' => TRUE), t('Add and configure @handler', array('@handler' => $type_info['ltitle'])));
+        $this->drupalPostForm($add_handler_url, ['name[views_test_data.job]' => TRUE], t('Add and configure @handler', ['@handler' => $type_info['ltitle']]));
         $id = 'job';
         $edit_handler_url = "admin/structure/views/nojs/handler/test_view_empty/default/$type/$id";
       }
 
-      $this->assertUrl($edit_handler_url, array(), 'The user got redirected to the handler edit form.');
+      $this->assertUrl($edit_handler_url, [], 'The user got redirected to the handler edit form.');
       $random_label = $this->randomMachineName();
-      $this->drupalPostForm(NULL, array('options[admin_label]' => $random_label), t('Apply'));
+      $this->drupalPostForm(NULL, ['options[admin_label]' => $random_label], t('Apply'));
 
-      $this->assertUrl('admin/structure/views/view/test_view_empty/edit/default', array(), 'The user got redirected to the views edit form.');
+      $this->assertUrl('admin/structure/views/view/test_view_empty/edit/default', [], 'The user got redirected to the views edit form.');
 
       $this->assertLinkByHref($edit_handler_url, 0, 'The handler edit link appears in the UI.');
-      $links = $this->xpath('//a[starts-with(normalize-space(text()), :label)]', array(':label' => $random_label));
+      $links = $this->xpath('//a[starts-with(normalize-space(text()), :label)]', [':label' => $random_label]);
       $this->assertTrue(isset($links[0]), 'The handler edit link has the right label');
 
       // Save the view and have a look whether the handler was added as expected.
-      $this->drupalPostForm(NULL, array(), t('Save'));
+      $this->drupalPostForm(NULL, [], t('Save'));
       $view = $this->container->get('entity.manager')->getStorage('view')->load('test_view_empty');
       $display = $view->getDisplay('default');
       $this->assertTrue(isset($display['display_options'][$type_info['plural']][$id]), 'Ensure the field was added to the view itself.');
 
       // Remove the item and check that it's removed
-      $this->drupalPostForm($edit_handler_url, array(), t('Remove'));
+      $this->drupalPostForm($edit_handler_url, [], t('Remove'));
       $this->assertNoLinkByHref($edit_handler_url, 0, 'The handler edit link does not appears in the UI after removing.');
 
-      $this->drupalPostForm(NULL, array(), t('Save'));
+      $this->drupalPostForm(NULL, [], t('Save'));
       $view = $this->container->get('entity.manager')->getStorage('view')->load('test_view_empty');
       $display = $view->getDisplay('default');
       $this->assertFalse(isset($display['display_options'][$type_info['plural']][$id]), 'Ensure the field was removed from the view itself.');
@@ -140,19 +140,19 @@ class HandlerTest extends UITestBase {
     // Test adding a field of the user table using the uid relationship.
     $type_info = $handler_types['relationship'];
     $add_handler_url = "admin/structure/views/nojs/add-handler/test_view_empty/default/relationship";
-    $this->drupalPostForm($add_handler_url, array('name[views_test_data.uid]' => TRUE), t('Add and configure @handler', array('@handler' => $type_info['ltitle'])));
+    $this->drupalPostForm($add_handler_url, ['name[views_test_data.uid]' => TRUE], t('Add and configure @handler', ['@handler' => $type_info['ltitle']]));
 
     $add_handler_url = "admin/structure/views/nojs/add-handler/test_view_empty/default/field";
     $type_info = $handler_types['field'];
-    $this->drupalPostForm($add_handler_url, array('name[users_field_data.name]' => TRUE), t('Add and configure @handler', array('@handler' => $type_info['ltitle'])));
+    $this->drupalPostForm($add_handler_url, ['name[users_field_data.name]' => TRUE], t('Add and configure @handler', ['@handler' => $type_info['ltitle']]));
     $id = 'name';
     $edit_handler_url = "admin/structure/views/nojs/handler/test_view_empty/default/field/$id";
 
-    $this->assertUrl($edit_handler_url, array(), 'The user got redirected to the handler edit form.');
+    $this->assertUrl($edit_handler_url, [], 'The user got redirected to the handler edit form.');
     $this->assertFieldByName('options[relationship]', 'uid', 'Ensure the relationship select is filled with the UID relationship.');
-    $this->drupalPostForm(NULL, array(), t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Apply'));
 
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
     $view = $this->container->get('entity.manager')->getStorage('view')->load('test_view_empty');
     $display = $view->getDisplay('default');
     $this->assertTrue(isset($display['display_options'][$type_info['plural']][$id]), 'Ensure the field was added to the view itself.');
@@ -203,8 +203,8 @@ class HandlerTest extends UITestBase {
 
       $href = "admin/structure/views/nojs/handler/test_view_broken/default/$type/id_broken";
 
-      $result = $this->xpath('//a[contains(@href, :href)]', array(':href' => $href));
-      $this->assertEqual(count($result), 1, SafeMarkup::format('Handler (%type) edit link found.', array('%type' => $type)));
+      $result = $this->xpath('//a[contains(@href, :href)]', [':href' => $href]);
+      $this->assertEqual(count($result), 1, SafeMarkup::format('Handler (%type) edit link found.', ['%type' => $type]));
 
       $text = 'Broken/missing handler';
 
@@ -223,7 +223,7 @@ class HandlerTest extends UITestBase {
       ];
 
       foreach ($original_configuration as $key => $value) {
-        $this->assertText(SafeMarkup::format('@key: @value', array('@key' => $key, '@value' => $value)));
+        $this->assertText(SafeMarkup::format('@key: @value', ['@key' => $key, '@value' => $value]));
       }
     }
   }
diff --git a/web/core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php b/web/core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php
index a01e24bda..3318f0b64 100644
--- a/web/core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php
+++ b/web/core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php
@@ -16,16 +16,16 @@ class NewViewConfigSchemaTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'node', 'comment', 'file', 'taxonomy', 'dblog', 'aggregator');
+  public static $modules = ['views_ui', 'node', 'comment', 'file', 'taxonomy', 'dblog', 'aggregator'];
 
   /**
    * Tests creating brand new views.
    */
   public function testNewViews() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer views')));
+    $this->drupalLogin($this->drupalCreateUser(['administer views']));
 
     // Create views with all core Views wizards.
-    $wizards = array(
+    $wizards = [
       // Wizard with their own classes.
       'node',
       'node_revision',
@@ -37,9 +37,9 @@ class NewViewConfigSchemaTest extends WebTestBase {
       // Standard derivative classes.
       'standard:aggregator_feed',
       'standard:aggregator_item',
-    );
+    ];
     foreach ($wizards as $wizard_key) {
-      $edit = array();
+      $edit = [];
       $edit['label'] = $this->randomString();
       $edit['id'] = strtolower($this->randomMachineName());
       $edit['show[wizard_key]'] = $wizard_key;
diff --git a/web/core/modules/views_ui/src/Tests/OverrideDisplaysTest.php b/web/core/modules/views_ui/src/Tests/OverrideDisplaysTest.php
index 98576ad3b..ba4254240 100644
--- a/web/core/modules/views_ui/src/Tests/OverrideDisplaysTest.php
+++ b/web/core/modules/views_ui/src/Tests/OverrideDisplaysTest.php
@@ -18,7 +18,7 @@ class OverrideDisplaysTest extends UITestBase {
   /**
    * Tests that displays can be overridden via the UI.
    */
-  function testOverrideDisplays() {
+  public function testOverrideDisplays() {
     // Create a basic view that shows all content, with a page and a block
     // display.
     $view['label'] = $this->randomMachineName(16);
@@ -33,15 +33,15 @@ class OverrideDisplaysTest extends UITestBase {
     // same (empty) title in the views wizard, we expect the wizard to have set
     // things up so that they both inherit from the default display, and we
     // therefore only need to change that to have it take effect for both.
-    $edit = array();
+    $edit = [];
     $edit['title'] = $original_title = $this->randomMachineName(16);
     $edit['override[dropdown]'] = 'default';
     $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
-    $this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save'));
+    $this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/page_1", [], t('Save'));
 
     // Add a node that will appear in the view, so that the block will actually
     // be displayed.
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     $this->drupalCreateNode();
 
     // Make sure the title appears in the page.
@@ -63,11 +63,11 @@ class OverrideDisplaysTest extends UITestBase {
 
     // Change the title for the page display only, and make sure that the
     // original title still appears on the page.
-    $edit = array();
+    $edit = [];
     $edit['title'] = $new_title = $this->randomMachineName(16);
     $edit['override[dropdown]'] = 'page_1';
     $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
-    $this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save'));
+    $this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/page_1", [], t('Save'));
     $this->drupalGet($view_path);
     $this->assertResponse(200);
     $this->assertText($new_title);
@@ -77,7 +77,7 @@ class OverrideDisplaysTest extends UITestBase {
   /**
    * Tests that the wizard correctly sets up default and overridden displays.
    */
-  function testWizardMixedDefaultOverriddenDisplays() {
+  public function testWizardMixedDefaultOverriddenDisplays() {
     // Create a basic view with a page, block, and feed. Give the page and feed
     // identical titles, but give the block a different one, so we expect the
     // page and feed to inherit their titles from the default display, but the
@@ -95,7 +95,7 @@ class OverrideDisplaysTest extends UITestBase {
 
     // Add a node that will appear in the view, so that the block will actually
     // be displayed.
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     $this->drupalCreateNode();
 
     // Make sure that the feed, page and block all start off with the correct
@@ -117,14 +117,14 @@ class OverrideDisplaysTest extends UITestBase {
     // Put the block into the first sidebar region, and make sure it will not
     // display on the view's page display (since we will be searching for the
     // presence/absence of the view's title in both the page and the block).
-    $this->drupalPlaceBlock("views_block:{$view['id']}-block_1", array(
-      'visibility' => array(
-        'request_path' => array(
+    $this->drupalPlaceBlock("views_block:{$view['id']}-block_1", [
+      'visibility' => [
+        'request_path' => [
           'pages' => '/' . $view['page[path]'],
           'negate' => TRUE,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
     $this->drupalGet('');
     $this->assertText($view['block[title]']);
@@ -132,10 +132,10 @@ class OverrideDisplaysTest extends UITestBase {
 
     // Edit the page and change the title. This should automatically change
     // the feed's title also, but not the block.
-    $edit = array();
+    $edit = [];
     $edit['title'] = $new_default_title = $this->randomMachineName(16);
     $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
-    $this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save'));
+    $this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/page_1", [], t('Save'));
     $this->drupalGet($view['page[path]']);
     $this->assertResponse(200);
     $this->assertText($new_default_title);
@@ -153,10 +153,10 @@ class OverrideDisplaysTest extends UITestBase {
 
     // Edit the block and change the title. This should automatically change
     // the block title only, and leave the defaults alone.
-    $edit = array();
+    $edit = [];
     $edit['title'] = $new_block_title = $this->randomMachineName(16);
     $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/block_1/title", $edit, t('Apply'));
-    $this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/block_1", array(), t('Save'));
+    $this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/block_1", [], t('Save'));
     $this->drupalGet($view['page[path]']);
     $this->assertResponse(200);
     $this->assertText($new_default_title);
@@ -172,7 +172,7 @@ class OverrideDisplaysTest extends UITestBase {
   /**
    * Tests that the revert to all displays select-option works as expected.
    */
-  function testRevertAllDisplays() {
+  public function testRevertAllDisplays() {
     // Create a basic view with a page, block.
     // Because there is both a title on page and block we expect the title on
     // the block be overridden.
@@ -187,12 +187,12 @@ class OverrideDisplaysTest extends UITestBase {
 
     // Revert the title of the block to the default ones, but submit some new
     // values to be sure that the new value is not stored.
-    $edit = array();
+    $edit = [];
     $edit['title'] = $new_block_title = $this->randomMachineName();
     $edit['override[dropdown]'] = 'default_revert';
 
     $this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/block_1/title", $edit, t('Apply'));
-    $this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/block_1", array(), t('Save'));
+    $this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/block_1", [], t('Save'));
     $this->assertText($view['page[title]']);
   }
 
diff --git a/web/core/modules/views_ui/src/Tests/PreviewTest.php b/web/core/modules/views_ui/src/Tests/PreviewTest.php
index 3b4dd9bf8..95fba8c6a 100644
--- a/web/core/modules/views_ui/src/Tests/PreviewTest.php
+++ b/web/core/modules/views_ui/src/Tests/PreviewTest.php
@@ -17,23 +17,23 @@ class PreviewTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_preview', 'test_preview_error', 'test_pager_full', 'test_mini_pager', 'test_click_sort');
+  public static $testViews = ['test_preview', 'test_preview_error', 'test_pager_full', 'test_mini_pager', 'test_click_sort'];
 
   /**
    * Tests contextual links in the preview form.
    */
   public function testPreviewContextual() {
-    \Drupal::service('module_installer')->install(array('contextual'));
+    \Drupal::service('module_installer')->install(['contextual']);
     $this->resetAll();
 
     $this->drupalGet('admin/structure/views/view/test_preview/edit');
     $this->assertResponse(200);
-    $this->drupalPostForm(NULL, $edit = array(), t('Update preview'));
+    $this->drupalPostForm(NULL, $edit = [], t('Update preview'));
 
-    $elements = $this->xpath('//div[@id="views-live-preview"]//ul[contains(@class, :ul-class)]/li[contains(@class, :li-class)]', array(':ul-class' => 'contextual-links', ':li-class' => 'filter-add'));
+    $elements = $this->xpath('//div[@id="views-live-preview"]//ul[contains(@class, :ul-class)]/li[contains(@class, :li-class)]', [':ul-class' => 'contextual-links', ':li-class' => 'filter-add']);
     $this->assertEqual(count($elements), 1, 'The contextual link to add a new field is shown.');
 
-    $this->drupalPostForm(NULL, $edit = array('view_args' => '100'), t('Update preview'));
+    $this->drupalPostForm(NULL, $edit = ['view_args' => '100'], t('Update preview'));
 
     // Test that area text and exposed filters are present and rendered.
     $this->assertFieldByName('id', NULL, 'ID exposed filter field found.');
@@ -45,23 +45,23 @@ class PreviewTest extends UITestBase {
   /**
    * Tests arguments in the preview form.
    */
-  function testPreviewUI() {
+  public function testPreviewUI() {
     $this->drupalGet('admin/structure/views/view/test_preview/edit');
     $this->assertResponse(200);
 
-    $this->drupalPostForm(NULL, $edit = array(), t('Update preview'));
+    $this->drupalPostForm(NULL, $edit = [], t('Update preview'));
 
     $elements = $this->xpath('//div[@class = "view-content"]/div[contains(@class, views-row)]');
     $this->assertEqual(count($elements), 5);
 
     // Filter just the first result.
-    $this->drupalPostForm(NULL, $edit = array('view_args' => '1'), t('Update preview'));
+    $this->drupalPostForm(NULL, $edit = ['view_args' => '1'], t('Update preview'));
 
     $elements = $this->xpath('//div[@class = "view-content"]/div[contains(@class, views-row)]');
     $this->assertEqual(count($elements), 1);
 
     // Filter for no results.
-    $this->drupalPostForm(NULL, $edit = array('view_args' => '100'), t('Update preview'));
+    $this->drupalPostForm(NULL, $edit = ['view_args' => '100'], t('Update preview'));
 
     $elements = $this->xpath('//div[@class = "view-content"]/div[contains(@class, views-row)]');
     $this->assertEqual(count($elements), 0);
@@ -73,7 +73,7 @@ class PreviewTest extends UITestBase {
     $this->assertText('Test empty text', 'Rendered empty text found.');
 
     // Test feed preview.
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = strtolower($this->randomMachineName(16));
     $view['page[create]'] = 1;
@@ -83,7 +83,7 @@ class PreviewTest extends UITestBase {
     $view['page[feed_properties][path]'] = $this->randomMachineName(16);
     $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
     $this->clickLink(t('Feed'));
-    $this->drupalPostForm(NULL, array(), t('Update preview'));
+    $this->drupalPostForm(NULL, [], t('Update preview'));
     $result = $this->xpath('//div[@id="views-live-preview"]/pre');
     $this->assertTrue(strpos($result[0], '<title>' . $view['page[title]'] . '</title>'), 'The Feed RSS preview was rendered.');
 
@@ -92,7 +92,7 @@ class PreviewTest extends UITestBase {
     $settings = \Drupal::configFactory()->getEditable('views.settings');
     $settings->set('ui.show.performance_statistics', TRUE)->save();
     $this->drupalGet('admin/structure/views/view/test_preview/edit');
-    $this->drupalPostForm(NULL, $edit = array('view_args' => '100'), t('Update preview'));
+    $this->drupalPostForm(NULL, $edit = ['view_args' => '100'], t('Update preview'));
     $this->assertText(t('Query build time'));
     $this->assertText(t('Query execute time'));
     $this->assertText(t('View render time'));
@@ -100,19 +100,19 @@ class PreviewTest extends UITestBase {
 
     // Statistics and query.
     $settings->set('ui.show.sql_query.enabled', TRUE)->save();
-    $this->drupalPostForm(NULL, $edit = array('view_args' => '100'), t('Update preview'));
+    $this->drupalPostForm(NULL, $edit = ['view_args' => '100'], t('Update preview'));
     $this->assertText(t('Query build time'));
     $this->assertText(t('Query execute time'));
     $this->assertText(t('View render time'));
     $this->assertRaw('<strong>Query</strong>');
-    $this->assertText("SELECT views_test_data.name AS views_test_data_name\nFROM \n{views_test_data} views_test_data\nWHERE (( (views_test_data.id = &#039;100&#039; ) ))");
+    $this->assertText("SELECT views_test_data.name AS views_test_data_name\nFROM \n{views_test_data} views_test_data\nWHERE (views_test_data.id = &#039;100&#039; )");
 
     // Test that the statistics and query are rendered above the preview.
     $this->assertTrue(strpos($this->getRawContent(), 'views-query-info') < strpos($this->getRawContent(), 'view-test-preview'), 'Statistics shown above the preview.');
 
     // Test that statistics and query rendered below the preview.
     $settings->set('ui.show.sql_query.where', 'below')->save();
-    $this->drupalPostForm(NULL, $edit = array('view_args' => '100'), t('Update preview'));
+    $this->drupalPostForm(NULL, $edit = ['view_args' => '100'], t('Update preview'));
     $this->assertTrue(strpos($this->getRawContent(), 'view-test-preview') < strpos($this->getRawContent(), 'views-query-info'), 'Statistics shown below the preview.');
   }
 
@@ -124,7 +124,7 @@ class PreviewTest extends UITestBase {
    * @see https://www.drupal.org/node/2452659
    */
   public function testTaxonomyAJAX() {
-    \Drupal::service('module_installer')->install(array('taxonomy'));
+    \Drupal::service('module_installer')->install(['taxonomy']);
     $this->getPreviewAJAX('taxonomy_term', 'page_1', 0);
   }
 
@@ -134,7 +134,7 @@ class PreviewTest extends UITestBase {
   public function testPreviewWithPagersUI() {
 
     // Create 11 nodes and make sure that everyone is returned.
-    $this->drupalCreateContentType(array('type' => 'page'));
+    $this->drupalCreateContentType(['type' => 'page']);
     for ($i = 0; $i < 11; $i++) {
       $this->drupalCreateNode();
     }
@@ -143,7 +143,7 @@ class PreviewTest extends UITestBase {
     $this->getPreviewAJAX('test_pager_full', 'default', 5);
 
     // Test that the pager is present and rendered.
-    $elements = $this->xpath('//ul[contains(@class, :class)]/li', array(':class' => 'pager__items'));
+    $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
     $this->assertTrue(!empty($elements), 'Full pager found.');
 
     // Verify elements and links to pages.
@@ -165,11 +165,11 @@ class PreviewTest extends UITestBase {
     $this->assertTrue($elements[4]->a, 'Link to last page found.');
 
     // Navigate to next page.
-    $elements = $this->xpath('//li[contains(@class, :class)]/a', array(':class' => 'pager__item--next'));
+    $elements = $this->xpath('//li[contains(@class, :class)]/a', [':class' => 'pager__item--next']);
     $this->clickPreviewLinkAJAX($elements[0]['href'], 5);
 
     // Test that the pager is present and rendered.
-    $elements = $this->xpath('//ul[contains(@class, :class)]/li', array(':class' => 'pager__items'));
+    $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
     $this->assertTrue(!empty($elements), 'Full pager found.');
 
     // Verify elements and links to pages.
@@ -201,7 +201,7 @@ class PreviewTest extends UITestBase {
     $this->getPreviewAJAX('test_mini_pager', 'default', 3);
 
     // Test that the pager is present and rendered.
-    $elements = $this->xpath('//ul[contains(@class, :class)]/li', array(':class' => 'pager__items'));
+    $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
     $this->assertTrue(!empty($elements), 'Mini pager found.');
 
     // Verify elements and links to pages.
@@ -213,11 +213,11 @@ class PreviewTest extends UITestBase {
     $this->assertTrue($elements[1]->a, 'Link to next page found.');
 
     // Navigate to next page.
-    $elements = $this->xpath('//li[contains(@class, :class)]/a', array(':class' => 'pager__item--next'));
+    $elements = $this->xpath('//li[contains(@class, :class)]/a', [':class' => 'pager__item--next']);
     $this->clickPreviewLinkAJAX($elements[0]['href'], 3);
 
     // Test that the pager is present and rendered.
-    $elements = $this->xpath('//ul[contains(@class, :class)]/li', array(':class' => 'pager__items'));
+    $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
     $this->assertTrue(!empty($elements), 'Mini pager found.');
 
     // Verify elements and links to pages.
@@ -237,17 +237,17 @@ class PreviewTest extends UITestBase {
    * Tests the additional information query info area.
    */
   public function testPreviewAdditionalInfo() {
-    \Drupal::service('module_installer')->install(array('views_ui_test'));
+    \Drupal::service('module_installer')->install(['views_ui_test']);
     $this->resetAll();
 
     $this->drupalGet('admin/structure/views/view/test_preview/edit');
     $this->assertResponse(200);
 
-    $this->drupalPostForm(NULL, $edit = array(), t('Update preview'));
+    $this->drupalPostForm(NULL, $edit = [], t('Update preview'));
 
     // Check for implementation of hook_views_preview_info_alter().
     // @see views_ui_test.module
-    $elements = $this->xpath('//div[@id="views-live-preview"]/div[contains(@class, views-query-info)]//td[text()=:text]', array(':text' => t('Test row count')));
+    $elements = $this->xpath('//div[@id="views-live-preview"]/div[contains(@class, views-query-info)]//td[text()=:text]', [':text' => t('Test row count')]);
     $this->assertEqual(count($elements), 1, 'Views Query Preview Info area altered.');
     // Check that additional assets are attached.
     $this->assertTrue(strpos($this->getDrupalSettings()['ajaxPageState']['libraries'], 'views_ui_test/views_ui_test.test') !== FALSE, 'Attached library found.');
@@ -261,7 +261,7 @@ class PreviewTest extends UITestBase {
     $this->drupalGet('admin/structure/views/view/test_preview_error/edit');
     $this->assertResponse(200);
 
-    $this->drupalPostForm(NULL, $edit = array(), t('Update preview'));
+    $this->drupalPostForm(NULL, $edit = [], t('Update preview'));
 
     $this->assertText('Unable to preview due to validation errors.', 'Preview error text found.');
   }
@@ -275,7 +275,7 @@ class PreviewTest extends UITestBase {
     $this->getPreviewAJAX('test_click_sort', 'page_1', 0);
 
     // Test that the header label is present.
-    $elements = $this->xpath('//th[contains(@class, :class)]/a', array(':class' => 'views-field views-field-name'));
+    $elements = $this->xpath('//th[contains(@class, :class)]/a', [':class' => 'views-field views-field-name']);
     $this->assertTrue(!empty($elements), 'The header label is present.');
 
     // Verify link.
@@ -285,7 +285,7 @@ class PreviewTest extends UITestBase {
     $this->clickPreviewLinkAJAX($elements[0]['href'], 0);
 
     // Test that the header label is present.
-    $elements = $this->xpath('//th[contains(@class, :class)]/a', array(':class' => 'views-field views-field-name is-active'));
+    $elements = $this->xpath('//th[contains(@class, :class)]/a', [':class' => 'views-field views-field-name is-active']);
     $this->assertTrue(!empty($elements), 'The header label is present.');
 
     // Verify link.
@@ -304,7 +304,7 @@ class PreviewTest extends UITestBase {
    */
   protected function getPreviewAJAX($view_name, $panel_id, $row_count) {
     $this->drupalGet('admin/structure/views/view/' . $view_name . '/preview/' . $panel_id);
-    $result = $this->drupalPostAjaxForm(NULL, array(), array('op' => t('Update preview')));
+    $result = $this->drupalPostAjaxForm(NULL, [], ['op' => t('Update preview')]);
     $this->assertPreviewAJAX($result, $row_count);
   }
 
@@ -319,12 +319,12 @@ class PreviewTest extends UITestBase {
   protected function clickPreviewLinkAJAX($url, $row_count) {
     $content = $this->content;
     $drupal_settings = $this->drupalSettings;
-    $ajax_settings = array(
+    $ajax_settings = [
       'wrapper' => 'views-preview-wrapper',
       'method' => 'replaceWith',
-    );
+    ];
     $url = $this->getAbsoluteUrl($url);
-    $post = array('js' => 'true') + $this->getAjaxPageStatePostData();
+    $post = ['js' => 'true'] + $this->getAjaxPageStatePostData();
     $result = Json::decode($this->drupalPost($url, '', $post, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']]));
     if (!empty($result)) {
       $this->drupalProcessAjaxResponse($content, $result, $ajax_settings, $drupal_settings);
@@ -343,7 +343,7 @@ class PreviewTest extends UITestBase {
   protected function assertPreviewAJAX($result, $row_count) {
     // Has AJAX callback replied with an insert command? If so, we can
     // assume that the page content was updated with AJAX returned data.
-    $result_commands = array();
+    $result_commands = [];
     foreach ($result as $command) {
       $result_commands[$command['command']] = $command;
     }
diff --git a/web/core/modules/views_ui/src/Tests/QueryTest.php b/web/core/modules/views_ui/src/Tests/QueryTest.php
index 351859bbc..066be3e56 100644
--- a/web/core/modules/views_ui/src/Tests/QueryTest.php
+++ b/web/core/modules/views_ui/src/Tests/QueryTest.php
@@ -17,7 +17,7 @@ class QueryTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * {@inheritdoc}
@@ -41,8 +41,8 @@ class QueryTest extends UITestBase {
     // Save some query settings.
     $query_settings_path = "admin/structure/views/nojs/display/test_view/default/query";
     $random_value = $this->randomMachineName();
-    $this->drupalPostForm($query_settings_path, array('query[options][test_setting]' => $random_value), t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm($query_settings_path, ['query[options][test_setting]' => $random_value], t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     // Check that the settings are saved into the view itself.
     $view = Views::getView('test_view');
diff --git a/web/core/modules/views_ui/src/Tests/RearrangeFieldsTest.php b/web/core/modules/views_ui/src/Tests/RearrangeFieldsTest.php
index 35c229bf1..7d5eddf43 100644
--- a/web/core/modules/views_ui/src/Tests/RearrangeFieldsTest.php
+++ b/web/core/modules/views_ui/src/Tests/RearrangeFieldsTest.php
@@ -17,7 +17,7 @@ class RearrangeFieldsTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Gets the fields from the View.
@@ -25,7 +25,7 @@ class RearrangeFieldsTest extends UITestBase {
   protected function getViewFields($view_name = 'test_view', $display_id = 'default') {
     $view = Views::getView($view_name);
     $view->setDisplay($display_id);
-    $fields = array();
+    $fields = [];
     foreach ($view->displayHandlers->get('default')->getHandlers('field') as $field => $handler) {
       $fields[] = $field;
     }
@@ -58,13 +58,13 @@ class RearrangeFieldsTest extends UITestBase {
     $this->assertFieldOrder($view_name, $this->getViewFields($view_name));
 
     // Checks that a field is not deleted if a value is not passed back.
-    $fields = array();
+    $fields = [];
     $this->drupalPostForm('admin/structure/views/nojs/rearrange/' . $view_name . '/default/field', $fields, t('Apply'));
     $this->assertFieldOrder($view_name, $this->getViewFields($view_name));
 
     // Checks that revers the new field order is respected.
     $reversedFields = array_reverse($this->getViewFields($view_name));
-    $fields = array();
+    $fields = [];
     foreach ($reversedFields as $delta => $field) {
       $fields['fields[' . $field . '][weight]'] = $delta;
     }
diff --git a/web/core/modules/views_ui/src/Tests/RedirectTest.php b/web/core/modules/views_ui/src/Tests/RedirectTest.php
index 7a019597c..cc5d2467e 100644
--- a/web/core/modules/views_ui/src/Tests/RedirectTest.php
+++ b/web/core/modules/views_ui/src/Tests/RedirectTest.php
@@ -14,7 +14,7 @@ class RedirectTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view', 'test_redirect_view');
+  public static $testViews = ['test_view', 'test_redirect_view'];
 
   /**
    * Tests the redirecting.
@@ -25,8 +25,8 @@ class RedirectTest extends UITestBase {
     $random_destination = $this->randomMachineName();
     $edit_path = "admin/structure/views/view/$view_name/edit";
 
-    $this->drupalPostForm($edit_path, array(), t('Save'), array('query' => array('destination' => $random_destination)));
-    $this->assertUrl($random_destination, array(), 'Make sure the user got redirected to the expected page defined in the destination.');
+    $this->drupalPostForm($edit_path, [], t('Save'), ['query' => ['destination' => $random_destination]]);
+    $this->assertUrl($random_destination, [], 'Make sure the user got redirected to the expected page defined in the destination.');
 
     // Setup a view with a certain page display path. If you change the path
     // but have the old url in the destination the user should be redirected to
@@ -37,9 +37,9 @@ class RedirectTest extends UITestBase {
     $edit_path = "admin/structure/views/view/$view_name/edit";
     $path_edit_path = "admin/structure/views/nojs/display/$view_name/page_1/path";
 
-    $this->drupalPostForm($path_edit_path, array('path' => $new_path), t('Apply'));
-    $this->drupalPostForm($edit_path, array(), t('Save'), array('query' => array('destination' => 'test-redirect-view')));
-    $this->assertUrl($new_path, array(), 'Make sure the user got redirected to the expected page after changing the URL of a page display.');
+    $this->drupalPostForm($path_edit_path, ['path' => $new_path], t('Apply'));
+    $this->drupalPostForm($edit_path, [], t('Save'), ['query' => ['destination' => 'test-redirect-view']]);
+    $this->assertUrl($new_path, [], 'Make sure the user got redirected to the expected page after changing the URL of a page display.');
   }
 
 }
diff --git a/web/core/modules/views_ui/src/Tests/ReportTest.php b/web/core/modules/views_ui/src/Tests/ReportTest.php
index d7228f171..0162519c1 100644
--- a/web/core/modules/views_ui/src/Tests/ReportTest.php
+++ b/web/core/modules/views_ui/src/Tests/ReportTest.php
@@ -15,7 +15,7 @@ class ReportTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('views', 'views_ui');
+  public static $modules = ['views', 'views_ui'];
 
   /**
    * Stores an admin user used by the different tests.
@@ -26,7 +26,7 @@ class ReportTest extends WebTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $this->adminUser = $this->drupalCreateUser(array('administer views'));
+    $this->adminUser = $this->drupalCreateUser(['administer views']);
   }
 
   /**
diff --git a/web/core/modules/views_ui/src/Tests/RowUITest.php b/web/core/modules/views_ui/src/Tests/RowUITest.php
index 188e0b51a..568900978 100644
--- a/web/core/modules/views_ui/src/Tests/RowUITest.php
+++ b/web/core/modules/views_ui/src/Tests/RowUITest.php
@@ -18,7 +18,7 @@ class RowUITest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests changing the row plugin and changing some options of a row.
@@ -33,20 +33,20 @@ class RowUITest extends UITestBase {
     $this->drupalGet($row_plugin_url);
     $this->assertFieldByName('row[type]', 'fields', 'The default row plugin selected in the UI should be fields.');
 
-    $edit = array(
+    $edit = [
       'row[type]' => 'test_row'
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply'));
     $this->assertFieldByName('row_options[test_option]', NULL, 'Make sure the custom settings form from the test plugin appears.');
     $random_name = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'row_options[test_option]' => $random_name
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply'));
     $this->drupalGet($row_options_url);
     $this->assertFieldByName('row_options[test_option]', $random_name, 'Make sure the custom settings form field has the expected value stored.');
 
-    $this->drupalPostForm($view_edit_url, array(), t('Save'));
+    $this->drupalPostForm($view_edit_url, [], t('Save'));
     $this->assertLink(t('Test row plugin'), 0, 'Make sure the test row plugin is shown in the UI');
 
     $view = Views::getView($view_name);
diff --git a/web/core/modules/views_ui/src/Tests/SettingsTest.php b/web/core/modules/views_ui/src/Tests/SettingsTest.php
index 30397f404..f583185cd 100644
--- a/web/core/modules/views_ui/src/Tests/SettingsTest.php
+++ b/web/core/modules/views_ui/src/Tests/SettingsTest.php
@@ -27,7 +27,7 @@ class SettingsTest extends UITestBase {
   /**
    * Tests the settings for the edit ui.
    */
-  function testEditUI() {
+  public function testEditUI() {
     $this->drupalLogin($this->adminUser);
 
     // Test the settings tab exists.
@@ -35,16 +35,16 @@ class SettingsTest extends UITestBase {
     $this->assertLinkByHref('admin/structure/views/settings');
 
     // Test the confirmation message.
-    $this->drupalPostForm('admin/structure/views/settings', array(), t('Save configuration'));
+    $this->drupalPostForm('admin/structure/views/settings', [], t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));
 
     // Configure to always show the master display.
-    $edit = array(
+    $edit = [
       'ui_show_master_display' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/settings', $edit, t('Save configuration'));
 
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = strtolower($this->randomMachineName(16));
     $view['description'] = $this->randomMachineName(16);
@@ -56,9 +56,9 @@ class SettingsTest extends UITestBase {
     // Configure to not always show the master display.
     // If you have a view without a page or block the master display should be
     // still shown.
-    $edit = array(
+    $edit = [
       'ui_show_master_display' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/settings', $edit, t('Save configuration'));
 
     $view['page[create]'] = FALSE;
@@ -75,45 +75,45 @@ class SettingsTest extends UITestBase {
     // @todo It doesn't seem to be a way to test this as this works just on js.
 
     // Configure to show the embeddable display.
-    $edit = array(
+    $edit = [
       'ui_show_display_embed' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/settings', $edit, t('Save configuration'));
 
     $view['id'] = strtolower($this->randomMachineName());
     $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
     $this->assertFieldById('edit-displays-top-add-display-embed');
 
-    $edit = array(
+    $edit = [
       'ui_show_display_embed' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/settings', $edit, t('Save configuration'));
 
     $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
     $this->assertNoFieldById('edit-displays-top-add-display-embed');
 
     // Configure to hide/show the sql at the preview.
-    $edit = array(
+    $edit = [
       'ui_show_sql_query_enabled' => FALSE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/settings', $edit, t('Save configuration'));
 
     $view['id'] = strtolower($this->randomMachineName());
     $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
 
-    $this->drupalPostForm(NULL, array(), t('Update preview'));
+    $this->drupalPostForm(NULL, [], t('Update preview'));
     $xpath = $this->xpath('//div[@class="views-query-info"]/pre');
     $this->assertEqual(count($xpath), 0, 'The views sql is hidden.');
 
-    $edit = array(
+    $edit = [
       'ui_show_sql_query_enabled' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/settings', $edit, t('Save configuration'));
 
     $view['id'] = strtolower($this->randomMachineName());
     $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
 
-    $this->drupalPostForm(NULL, array(), t('Update preview'));
+    $this->drupalPostForm(NULL, [], t('Update preview'));
     $xpath = $this->xpath('//div[@class="views-query-info"]//pre');
     $this->assertEqual(count($xpath), 1, 'The views sql is shown.');
     $this->assertFalse(strpos($xpath[0], 'db_condition_placeholder') !== FALSE, 'No placeholders are shown in the views sql.');
@@ -122,20 +122,20 @@ class SettingsTest extends UITestBase {
     // Test the advanced settings form.
 
     // Test the confirmation message.
-    $this->drupalPostForm('admin/structure/views/settings/advanced', array(), t('Save configuration'));
+    $this->drupalPostForm('admin/structure/views/settings/advanced', [], t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));
 
-    $edit = array(
+    $edit = [
       'skip_cache' => TRUE,
       'sql_signature' => TRUE,
-    );
+    ];
     $this->drupalPostForm('admin/structure/views/settings/advanced', $edit, t('Save configuration'));
 
     $this->assertFieldChecked('edit-skip-cache', 'The skip_cache option is checked.');
     $this->assertFieldChecked('edit-sql-signature', 'The sql_signature option is checked.');
 
     // Test the "Clear Views' cache" button.
-    $this->drupalPostForm('admin/structure/views/settings/advanced', array(), t("Clear Views' cache"));
+    $this->drupalPostForm('admin/structure/views/settings/advanced', [], t("Clear Views' cache"));
     $this->assertText(t('The cache has been cleared.'));
   }
 
diff --git a/web/core/modules/views_ui/src/Tests/StorageTest.php b/web/core/modules/views_ui/src/Tests/StorageTest.php
index f01a136c6..fa33b8f00 100644
--- a/web/core/modules/views_ui/src/Tests/StorageTest.php
+++ b/web/core/modules/views_ui/src/Tests/StorageTest.php
@@ -17,14 +17,14 @@ class StorageTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'language');
+  public static $modules = ['views_ui', 'language'];
 
   /**
    * Tests changing label, description and tag.
@@ -36,20 +36,20 @@ class StorageTest extends UITestBase {
 
     ConfigurableLanguage::createFromLangcode('fr')->save();
 
-    $edit = array(
+    $edit = [
       'label' => $this->randomMachineName(),
       'tag' => $this->randomMachineName(),
       'description' => $this->randomMachineName(30),
       'langcode' => 'fr',
-    );
+    ];
 
     $this->drupalPostForm("admin/structure/views/nojs/edit-details/$view_name/default", $edit, t('Apply'));
-    $this->drupalPostForm(NULL, array(), t('Save'));
+    $this->drupalPostForm(NULL, [], t('Save'));
 
     $view = Views::getView($view_name);
 
-    foreach (array('label', 'tag', 'description', 'langcode') as $property) {
-      $this->assertEqual($view->storage->get($property), $edit[$property], format_string('Make sure the property @property got probably saved.', array('@property' => $property)));
+    foreach (['label', 'tag', 'description', 'langcode'] as $property) {
+      $this->assertEqual($view->storage->get($property), $edit[$property], format_string('Make sure the property @property got probably saved.', ['@property' => $property]));
     }
   }
 
diff --git a/web/core/modules/views_ui/src/Tests/StyleTableTest.php b/web/core/modules/views_ui/src/Tests/StyleTableTest.php
index 7eb757cb3..d6b757e99 100644
--- a/web/core/modules/views_ui/src/Tests/StyleTableTest.php
+++ b/web/core/modules/views_ui/src/Tests/StyleTableTest.php
@@ -17,7 +17,7 @@ class StyleTableTest extends UITestBase {
    */
   public function testWizard() {
     // Create a new view and check that the first field has a label.
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(16);
     $view['id'] = strtolower($this->randomMachineName(16));
     $view['show[wizard_key]'] = 'node';
diff --git a/web/core/modules/views_ui/src/Tests/StyleUITest.php b/web/core/modules/views_ui/src/Tests/StyleUITest.php
index f83cb0391..3fc2ae076 100644
--- a/web/core/modules/views_ui/src/Tests/StyleUITest.php
+++ b/web/core/modules/views_ui/src/Tests/StyleUITest.php
@@ -17,7 +17,7 @@ class StyleUITest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view');
+  public static $testViews = ['test_view'];
 
   /**
    * Tests changing the style plugin and changing some options of a style.
@@ -32,20 +32,20 @@ class StyleUITest extends UITestBase {
     $this->drupalGet($style_plugin_url);
     $this->assertFieldByName('style[type]', 'default', 'The default style plugin selected in the UI should be unformatted list.');
 
-    $edit = array(
+    $edit = [
       'style[type]' => 'test_style'
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply'));
     $this->assertFieldByName('style_options[test_option]', NULL, 'Make sure the custom settings form from the test plugin appears.');
     $random_name = $this->randomMachineName();
-    $edit = array(
+    $edit = [
       'style_options[test_option]' => $random_name
-    );
+    ];
     $this->drupalPostForm(NULL, $edit, t('Apply'));
     $this->drupalGet($style_options_url);
     $this->assertFieldByName('style_options[test_option]', $random_name, 'Make sure the custom settings form field has the expected value stored.');
 
-    $this->drupalPostForm($view_edit_url, array(), t('Save'));
+    $this->drupalPostForm($view_edit_url, [], t('Save'));
     $this->assertLink(t('Test style plugin'), 0, 'Make sure the test style plugin is shown in the UI');
 
     $view = Views::getView($view_name);
@@ -56,8 +56,8 @@ class StyleUITest extends UITestBase {
 
     // Test that fields are working correctly in the UI for style plugins when
     // a field row plugin is selected.
-    $this->drupalPostForm("admin/structure/views/view/$view_name/edit", array(), 'Add Page');
-    $this->drupalPostForm("admin/structure/views/nojs/display/$view_name/page_1/row", array('row[type]' => 'fields'), t('Apply'));
+    $this->drupalPostForm("admin/structure/views/view/$view_name/edit", [], 'Add Page');
+    $this->drupalPostForm("admin/structure/views/nojs/display/$view_name/page_1/row", ['row[type]' => 'fields'], t('Apply'));
     // If fields are being used this text will not be shown.
     $this->assertNoText(t('The selected style or row format does not use fields.'));
   }
diff --git a/web/core/modules/views_ui/src/Tests/UITestBase.php b/web/core/modules/views_ui/src/Tests/UITestBase.php
index 74b6f4ff0..0b90e04d1 100644
--- a/web/core/modules/views_ui/src/Tests/UITestBase.php
+++ b/web/core/modules/views_ui/src/Tests/UITestBase.php
@@ -28,7 +28,7 @@ abstract class UITestBase extends ViewTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'views_ui', 'block', 'taxonomy');
+  public static $modules = ['node', 'views_ui', 'block', 'taxonomy'];
 
   /**
    * {@inheritdoc}
@@ -38,24 +38,24 @@ abstract class UITestBase extends ViewTestBase {
 
     $this->enableViewsTestModule();
 
-    $this->adminUser = $this->drupalCreateUser(array('administer views'));
+    $this->adminUser = $this->drupalCreateUser(['administer views']);
 
-    $this->fullAdminUser = $this->drupalCreateUser(array('administer views',
+    $this->fullAdminUser = $this->drupalCreateUser(['administer views',
       'administer blocks',
       'bypass node access',
       'access user profiles',
       'view all revisions',
       'administer permissions',
-    ));
+    ]);
     $this->drupalLogin($this->fullAdminUser);
   }
 
   /**
    * A helper method which creates a random view.
    */
-  public function randomView(array $view = array()) {
+  public function randomView(array $view = []) {
     // Create a new view in the UI.
-    $default = array();
+    $default = [];
     $default['label'] = $this->randomMachineName(16);
     $default['id'] = strtolower($this->randomMachineName(16));
     $default['description'] = $this->randomMachineName(16);
@@ -72,7 +72,7 @@ abstract class UITestBase extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function drupalGet($path, array $options = array(), array $headers = array()) {
+  protected function drupalGet($path, array $options = [], array $headers = []) {
     $url = $this->buildUrl($path, $options);
 
     // Ensure that each nojs page is accessible via ajax as well.
diff --git a/web/core/modules/views_ui/src/Tests/UnsavedPreviewTest.php b/web/core/modules/views_ui/src/Tests/UnsavedPreviewTest.php
index 4652daca7..6418fc086 100644
--- a/web/core/modules/views_ui/src/Tests/UnsavedPreviewTest.php
+++ b/web/core/modules/views_ui/src/Tests/UnsavedPreviewTest.php
@@ -28,7 +28,7 @@ class UnsavedPreviewTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('node', 'views_ui');
+  public static $modules = ['node', 'views_ui'];
 
   /**
    * Sets up a Drupal site for running functional and integration tests.
diff --git a/web/core/modules/views_ui/src/Tests/ViewEditTest.php b/web/core/modules/views_ui/src/Tests/ViewEditTest.php
index afa21df61..08c5cfe86 100644
--- a/web/core/modules/views_ui/src/Tests/ViewEditTest.php
+++ b/web/core/modules/views_ui/src/Tests/ViewEditTest.php
@@ -17,7 +17,7 @@ class ViewEditTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view', 'test_display', 'test_groupwise_term_ui');
+  public static $testViews = ['test_view', 'test_display', 'test_groupwise_term_ui'];
 
   /**
    * Tests the delete link on a views UI.
@@ -30,8 +30,8 @@ class ViewEditTest extends UITestBase {
     $this->assertTrue($view instanceof View);
     $this->clickLink(t('Delete view'));
     $this->assertUrl('admin/structure/views/view/test_view/delete');
-    $this->drupalPostForm(NULL, array(), t('Delete'));
-    $this->assertRaw(t('The view %name has been deleted.', array('%name' => $view->label())));
+    $this->drupalPostForm(NULL, [], t('Delete'));
+    $this->assertRaw(t('The view %name has been deleted.', ['%name' => $view->label()]));
 
     $this->assertUrl('admin/structure/views');
     $view = $this->container->get('entity.manager')->getStorage('view')->load('test_view');
@@ -44,20 +44,20 @@ class ViewEditTest extends UITestBase {
   public function testOtherOptions() {
     $this->drupalGet('admin/structure/views/view/test_view');
     // Add a new attachment display.
-    $this->drupalPostForm(NULL, array(), 'Add Attachment');
+    $this->drupalPostForm(NULL, [], 'Add Attachment');
 
     // Test that a long administrative comment is truncated.
-    $edit = array('display_comment' => 'one two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen');
+    $edit = ['display_comment' => 'one two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen'];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_view/attachment_1/display_comment', $edit, 'Apply');
     $this->assertText('one two three four five six seven eight nine ten eleven twelve thirteen fourteen...');
 
     // Change the machine name for the display from page_1 to test_1.
-    $edit = array('display_id' => 'test_1');
+    $edit = ['display_id' => 'test_1'];
     $this->drupalPostForm('admin/structure/views/nojs/display/test_view/attachment_1/display_id', $edit, 'Apply');
     $this->assertLink(t('test_1'));
 
     // Save the view, and test the new ID has been saved.
-    $this->drupalPostForm(NULL, array(), 'Save');
+    $this->drupalPostForm(NULL, [], 'Save');
     $view = \Drupal::entityManager()->getStorage('view')->load('test_view');
     $displays = $view->get('display');
     $this->assertTrue(!empty($displays['test_1']), 'Display data found for new display ID key.');
@@ -72,16 +72,16 @@ class ViewEditTest extends UITestBase {
     $this->drupalGet('admin/structure/views/ajax/handler/test_view/fake_display_name/filter/title');
     $this->assertText('Invalid display id fake_display_name');
 
-    $edit = array('display_id' => 'test 1');
+    $edit = ['display_id' => 'test 1'];
     $this->drupalPostForm($machine_name_edit_url, $edit, 'Apply');
     $this->assertText($error_text);
 
-    $edit = array('display_id' => 'test_1#');
+    $edit = ['display_id' => 'test_1#'];
     $this->drupalPostForm($machine_name_edit_url, $edit, 'Apply');
     $this->assertText($error_text);
 
     // Test using an existing display ID.
-    $edit = array('display_id' => 'default');
+    $edit = ['display_id' => 'default'];
     $this->drupalPostForm($machine_name_edit_url, $edit, 'Apply');
     $this->assertText(t('Display id should be unique.'));
 
@@ -97,10 +97,10 @@ class ViewEditTest extends UITestBase {
     $fields['fields[id][removed]'] = 1;
     $fields['fields[name][removed]'] = 1;
     $this->drupalPostForm('admin/structure/views/nojs/rearrange/test_view/default/field', $fields, t('Apply'));
-    $this->drupalPostForm(NULL, array(), 'Save');
-    $this->drupalPostForm(NULL, array(), t('Cancel'));
+    $this->drupalPostForm(NULL, [], 'Save');
+    $this->drupalPostForm(NULL, [], t('Cancel'));
     $this->assertNoFieldByXpath('//div[contains(@class, "error")]', FALSE, 'No error message is displayed.');
-    $this->assertUrl('admin/structure/views', array(), 'Redirected back to the view listing page..');
+    $this->assertUrl('admin/structure/views', [], 'Redirected back to the view listing page..');
   }
 
   /**
@@ -108,21 +108,21 @@ class ViewEditTest extends UITestBase {
    */
   public function testEditFormLanguageOptions() {
     // Language options should not exist without language module.
-    $test_views = array(
+    $test_views = [
       'test_view' => 'default',
       'test_display' => 'page_1',
-    );
+    ];
     foreach ($test_views as $view_name => $display) {
       $this->drupalGet('admin/structure/views/view/' . $view_name);
       $this->assertResponse(200);
       $langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/rendering_language';
       $this->assertNoLinkByHref($langcode_url);
-      $this->assertNoLink(t('@type language selected for page', array('@type' => t('Content'))));
+      $this->assertNoLink(t('@type language selected for page', ['@type' => t('Content')]));
       $this->assertNoLink(t('Content language of view row'));
     }
 
     // Make the site multilingual and test the options again.
-    $this->container->get('module_installer')->install(array('language', 'content_translation'));
+    $this->container->get('module_installer')->install(['language', 'content_translation']);
     ConfigurableLanguage::createFromLangcode('hu')->save();
     $this->resetAll();
     $this->rebuildContainer();
@@ -134,12 +134,12 @@ class ViewEditTest extends UITestBase {
       $langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/rendering_language';
       if ($view_name == 'test_view') {
         $this->assertNoLinkByHref($langcode_url);
-        $this->assertNoLink(t('@type language selected for page', array('@type' => t('Content'))));
+        $this->assertNoLink(t('@type language selected for page', ['@type' => t('Content')]));
         $this->assertNoLink(t('Content language of view row'));
       }
       else {
         $this->assertLinkByHref($langcode_url);
-        $this->assertNoLink(t('@type language selected for page', array('@type' => t('Content'))));
+        $this->assertNoLink(t('@type language selected for page', ['@type' => t('Content')]));
         $this->assertLink(t('Content language of view row'));
       }
 
@@ -152,14 +152,14 @@ class ViewEditTest extends UITestBase {
         $this->assertFieldByName('rendering_language', '***LANGUAGE_entity_translation***');
         // Test that the order of the language list is similar to other language
         // lists, such as in the content translation settings.
-        $expected_elements = array(
+        $expected_elements = [
           '***LANGUAGE_entity_translation***',
           '***LANGUAGE_entity_default***',
           '***LANGUAGE_site_default***',
           '***LANGUAGE_language_interface***',
           'en',
           'hu',
-        );
+        ];
         $elements = $this->xpath('//select[@id="edit-rendering-language"]/option');
         // Compare values inside the option elements with expected values.
         for ($i = 0; $i < count($elements); $i++) {
@@ -202,7 +202,7 @@ class ViewEditTest extends UITestBase {
         $this->drupalGet($langcode_url);
         $this->assertResponse(200);
 
-        $expected_elements = array(
+        $expected_elements = [
           'all',
           '***LANGUAGE_site_default***',
           '***LANGUAGE_language_interface***',
@@ -211,7 +211,7 @@ class ViewEditTest extends UITestBase {
           'hu',
           'und',
           'zxx',
-        );
+        ];
         $elements = $this->xpath('//div[@id="edit-options-value"]//input');
         // Compare values inside the option elements with expected values.
         for ($i = 0; $i < count($elements); $i++) {
@@ -229,7 +229,7 @@ class ViewEditTest extends UITestBase {
     $edit["name[taxonomy_term_field_data.tid_representative]"] = TRUE;
     $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_groupwise_term_ui/default/relationship', $edit, 'Add and configure relationships');
     // Apply changes.
-    $edit = array();
+    $edit = [];
     $this->drupalPostForm('admin/structure/views/nojs/handler/test_groupwise_term_ui/default/relationship/tid_representative', $edit, 'Apply');
   }
 
diff --git a/web/core/modules/views_ui/src/Tests/ViewsListTest.php b/web/core/modules/views_ui/src/Tests/ViewsListTest.php
index 768e449d5..51786746c 100644
--- a/web/core/modules/views_ui/src/Tests/ViewsListTest.php
+++ b/web/core/modules/views_ui/src/Tests/ViewsListTest.php
@@ -18,7 +18,7 @@ class ViewsListTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'views_ui');
+  public static $modules = ['block', 'views_ui'];
 
   /**
    * A user with permission to administer views.
diff --git a/web/core/modules/views_ui/src/Tests/ViewsUITourTest.php b/web/core/modules/views_ui/src/Tests/ViewsUITourTest.php
index ccc0f296d..31748e872 100644
--- a/web/core/modules/views_ui/src/Tests/ViewsUITourTest.php
+++ b/web/core/modules/views_ui/src/Tests/ViewsUITourTest.php
@@ -31,11 +31,11 @@ class ViewsUITourTest extends TourTestBase {
    *
    * @var array
    */
-  public static $modules = array('views_ui', 'tour', 'language', 'locale');
+  public static $modules = ['views_ui', 'tour', 'language', 'locale'];
 
   protected function setUp() {
     parent::setUp();
-    $this->adminUser = $this->drupalCreateUser(array('administer views', 'access tour'));
+    $this->adminUser = $this->drupalCreateUser(['administer views', 'access tour']);
     $this->drupalLogin($this->adminUser);
   }
 
@@ -66,18 +66,18 @@ class ViewsUITourTest extends TourTestBase {
     ConfigurableLanguage::createFromLangcode($langcode)->save();
 
     // Handler titles that need translations.
-    $handler_titles = array(
+    $handler_titles = [
       'Format',
       'Fields',
       'Sort criteria',
       'Filter criteria',
-    );
+    ];
 
     foreach ($handler_titles as $handler_title) {
       // Create source string.
-      $source = $this->localeStorage->createString(array(
+      $source = $this->localeStorage->createString([
         'source' => $handler_title
-      ));
+      ]);
       $source->save();
       $this->createTranslation($source, $langcode);
     }
@@ -101,11 +101,11 @@ class ViewsUITourTest extends TourTestBase {
    * Creates single translation for source string.
    */
   public function createTranslation($source, $langcode) {
-    return $this->localeStorage->createTranslation(array(
+    return $this->localeStorage->createTranslation([
         'lid' => $source->lid,
         'language' => $langcode,
         'translation' => $this->randomMachineName(100),
-      ))->save();
+      ])->save();
   }
 
 }
diff --git a/web/core/modules/views_ui/src/Tests/WizardTest.php b/web/core/modules/views_ui/src/Tests/WizardTest.php
index 58cf97c83..4e57e8f7b 100644
--- a/web/core/modules/views_ui/src/Tests/WizardTest.php
+++ b/web/core/modules/views_ui/src/Tests/WizardTest.php
@@ -18,7 +18,7 @@ class WizardTest extends WizardTestBase {
    * Tests filling in the wizard with really long strings.
    */
   public function testWizardFieldLength() {
-    $view = array();
+    $view = [];
     $view['label'] = $this->randomMachineName(256);
     $view['id'] = strtolower($this->randomMachineName(129));
     $view['page[create]'] = TRUE;
@@ -54,7 +54,7 @@ class WizardTest extends WizardTestBase {
     $view['rest_export[path]'] = $this->randomMachineName(254);
 
     $this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
-    $this->assertUrl('admin/structure/views/view/' . $view['id'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
+    $this->assertUrl('admin/structure/views/view/' . $view['id'], [], 'Make sure the view saving was successful and the browser got redirected to the edit page.');
     // Assert that the page title is correctly truncated.
     $this->assertText(views_ui_truncate($view['page[title]'], 32));
   }
diff --git a/web/core/modules/views_ui/src/Tests/XssTest.php b/web/core/modules/views_ui/src/Tests/XssTest.php
index 8eac3a687..1c3cef62c 100644
--- a/web/core/modules/views_ui/src/Tests/XssTest.php
+++ b/web/core/modules/views_ui/src/Tests/XssTest.php
@@ -14,12 +14,9 @@ class XssTest extends UITestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'user', 'views_ui', 'views_ui_test');
+  public static $modules = ['node', 'user', 'views_ui', 'views_ui_test'];
 
   public function testViewsUi() {
-    $this->drupalGet('admin/structure/views');
-    $this->assertEscaped('<script>alert("foo");</script>, <marquee>test</marquee>', 'The view tag is properly escaped.');
-
     $this->drupalGet('admin/structure/views/view/sa_contrib_2013_035');
     $this->assertEscaped('<marquee>test</marquee>', 'Field admin label is properly escaped.');
 
diff --git a/web/core/modules/views_ui/src/ViewAddForm.php b/web/core/modules/views_ui/src/ViewAddForm.php
index c3d5c77ce..429032c84 100644
--- a/web/core/modules/views_ui/src/ViewAddForm.php
+++ b/web/core/modules/views_ui/src/ViewAddForm.php
@@ -51,83 +51,83 @@ class ViewAddForm extends ViewFormBase {
    */
   public function form(array $form, FormStateInterface $form_state) {
     $form['#attached']['library'][] = 'views_ui/views_ui.admin';
-    $form['#attributes']['class'] = array('views-admin');
+    $form['#attributes']['class'] = ['views-admin'];
 
-    $form['name'] = array(
+    $form['name'] = [
       '#type' => 'fieldset',
       '#title' => t('View basic information'),
-      '#attributes' => array('class' => array('fieldset-no-legend')),
-    );
+      '#attributes' => ['class' => ['fieldset-no-legend']],
+    ];
 
-    $form['name']['label'] = array(
+    $form['name']['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('View name'),
       '#required' => TRUE,
       '#size' => 32,
       '#default_value' => '',
       '#maxlength' => 255,
-    );
-    $form['name']['id'] = array(
+    ];
+    $form['name']['id'] = [
       '#type' => 'machine_name',
       '#maxlength' => 128,
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => '\Drupal\views\Views::getView',
-        'source' => array('name', 'label'),
-      ),
+        'source' => ['name', 'label'],
+      ],
       '#description' => $this->t('A unique machine-readable name for this View. It must only contain lowercase letters, numbers, and underscores.'),
-    );
+    ];
 
-    $form['name']['description_enable'] = array(
+    $form['name']['description_enable'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Description'),
-    );
-    $form['name']['description'] = array(
+    ];
+    $form['name']['description'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Provide description'),
       '#title_display' => 'invisible',
       '#size' => 64,
       '#default_value' => '',
-      '#states' => array(
-        'visible' => array(
-          ':input[name="description_enable"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
+      '#states' => [
+        'visible' => [
+          ':input[name="description_enable"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
 
     // Create a wrapper for the entire dynamic portion of the form. Everything
     // that can be updated by AJAX goes somewhere inside here. For example, this
     // is needed by "Show" dropdown (below); it changes the base table of the
     // view and therefore potentially requires all options on the form to be
     // dynamically updated.
-    $form['displays'] = array();
+    $form['displays'] = [];
 
     // Create the part of the form that allows the user to select the basic
     // properties of what the view will display.
-    $form['displays']['show'] = array(
+    $form['displays']['show'] = [
       '#type' => 'fieldset',
       '#title' => t('View settings'),
       '#tree' => TRUE,
-      '#attributes' => array('class' => array('container-inline')),
-    );
+      '#attributes' => ['class' => ['container-inline']],
+    ];
 
     // Create the "Show" dropdown, which allows the base table of the view to be
     // selected.
     $wizard_plugins = $this->wizardManager->getDefinitions();
-    $options = array();
+    $options = [];
     foreach ($wizard_plugins as $key => $wizard) {
       $options[$key] = $wizard['title'];
     }
-    $form['displays']['show']['wizard_key'] = array(
+    $form['displays']['show']['wizard_key'] = [
       '#type' => 'select',
       '#title' => $this->t('Show'),
       '#options' => $options,
-    );
+    ];
     $show_form = &$form['displays']['show'];
     $default_value = \Drupal::moduleHandler()->moduleExists('node') ? 'node' : 'users';
-    $show_form['wizard_key']['#default_value'] = WizardPluginBase::getSelected($form_state, array('show', 'wizard_key'), $default_value, $show_form['wizard_key']);
+    $show_form['wizard_key']['#default_value'] = WizardPluginBase::getSelected($form_state, ['show', 'wizard_key'], $default_value, $show_form['wizard_key']);
     // Changing this dropdown updates the entire content of $form['displays'] via
     // AJAX.
-    views_ui_add_ajax_trigger($show_form, 'wizard_key', array('displays'));
+    views_ui_add_ajax_trigger($show_form, 'wizard_key', ['displays']);
 
     // Build the rest of the form based on the currently selected wizard plugin.
     $wizard_key = $show_form['wizard_key']['#default_value'];
@@ -144,13 +144,13 @@ class ViewAddForm extends ViewFormBase {
     $actions = parent::actions($form, $form_state);
     $actions['submit']['#value'] = $this->t('Save and edit');
     // Remove EntityFormController::save() form the submission handlers.
-    $actions['submit']['#submit'] = array(array($this, 'submitForm'));
-    $actions['cancel'] = array(
+    $actions['submit']['#submit'] = [[$this, 'submitForm']];
+    $actions['cancel'] = [
       '#type' => 'submit',
       '#value' => $this->t('Cancel'),
-      '#submit' => array('::cancel'),
-      '#limit_validation_errors' => array(),
-    );
+      '#submit' => ['::cancel'],
+      '#limit_validation_errors' => [],
+    ];
     return $actions;
   }
 
@@ -158,7 +158,7 @@ class ViewAddForm extends ViewFormBase {
    * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
-    $wizard_type = $form_state->getValue(array('show', 'wizard_key'));
+    $wizard_type = $form_state->getValue(['show', 'wizard_key']);
     $wizard_instance = $this->wizardManager->createInstance($wizard_type);
     $form_state->set('wizard', $wizard_instance->getPluginDefinition());
     $form_state->set('wizard_instance', $wizard_instance);
@@ -187,7 +187,7 @@ class ViewAddForm extends ViewFormBase {
       return;
     }
     $this->entity->save();
-    drupal_set_message($this->t('The view %name has been saved.', array('%name' => $form_state->getValue('label'))));
+    drupal_set_message($this->t('The view %name has been saved.', ['%name' => $form_state->getValue('label')]));
     $form_state->setRedirectUrl($this->entity->urlInfo('edit-form'));
   }
 
diff --git a/web/core/modules/views_ui/src/ViewDuplicateForm.php b/web/core/modules/views_ui/src/ViewDuplicateForm.php
index 9870d8e8e..fa2db6080 100644
--- a/web/core/modules/views_ui/src/ViewDuplicateForm.php
+++ b/web/core/modules/views_ui/src/ViewDuplicateForm.php
@@ -22,26 +22,26 @@ class ViewDuplicateForm extends ViewFormBase {
   public function form(array $form, FormStateInterface $form_state) {
     parent::form($form, $form_state);
 
-    $form['#title'] = $this->t('Duplicate of @label', array('@label' => $this->entity->label()));
+    $form['#title'] = $this->t('Duplicate of @label', ['@label' => $this->entity->label()]);
 
-    $form['label'] = array(
+    $form['label'] = [
       '#type' => 'textfield',
       '#title' => $this->t('View name'),
       '#required' => TRUE,
       '#size' => 32,
       '#maxlength' => 255,
-      '#default_value' => $this->t('Duplicate of @label', array('@label' => $this->entity->label())),
-    );
-    $form['id'] = array(
+      '#default_value' => $this->t('Duplicate of @label', ['@label' => $this->entity->label()]),
+    ];
+    $form['id'] = [
       '#type' => 'machine_name',
       '#maxlength' => 128,
-      '#machine_name' => array(
+      '#machine_name' => [
         'exists' => '\Drupal\views\Views::getView',
-        'source' => array('label'),
-      ),
+        'source' => ['label'],
+      ],
       '#default_value' => '',
       '#description' => $this->t('A unique machine-readable name for this View. It must only contain lowercase letters, numbers, and underscores.'),
-    );
+    ];
 
     return $form;
   }
@@ -50,10 +50,10 @@ class ViewDuplicateForm extends ViewFormBase {
    * {@inheritdoc}
    */
   protected function actions(array $form, FormStateInterface $form_state) {
-    $actions['submit'] = array(
+    $actions['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Duplicate'),
-    );
+    ];
     return $actions;
   }
 
diff --git a/web/core/modules/views_ui/src/ViewEditForm.php b/web/core/modules/views_ui/src/ViewEditForm.php
index 106fdb8be..67d122955 100644
--- a/web/core/modules/views_ui/src/ViewEditForm.php
+++ b/web/core/modules/views_ui/src/ViewEditForm.php
@@ -98,7 +98,7 @@ class ViewEditForm extends ViewFormBase {
 
     if ($display_id) {
       if (!$view->getExecutable()->setDisplay($display_id)) {
-        $form['#markup'] = $this->t('Invalid display id @display', array('@display' => $display_id));
+        $form['#markup'] = $this->t('Invalid display id @display', ['@display' => $display_id]);
         return $form;
       }
     }
@@ -112,55 +112,55 @@ class ViewEditForm extends ViewFormBase {
     $form['#attached']['library'][] = 'views_ui/views_ui.admin';
     $form['#attached']['library'][] = 'views_ui/admin.styling';
 
-    $form += array(
+    $form += [
       '#prefix' => '',
       '#suffix' => '',
-    );
+    ];
 
     $view_status = $view->status() ? 'enabled' : 'disabled';
     $form['#prefix'] .= '<div class="views-edit-view views-admin ' . $view_status . ' clearfix">';
     $form['#suffix'] = '</div>' . $form['#suffix'];
 
-    $form['#attributes']['class'] = array('form-edit');
+    $form['#attributes']['class'] = ['form-edit'];
 
     if ($view->isLocked()) {
-      $username = array(
+      $username = [
         '#theme' => 'username',
         '#account' => $this->entityManager->getStorage('user')->load($view->lock->owner),
-      );
-      $lock_message_substitutions = array(
+      ];
+      $lock_message_substitutions = [
         '@user' => drupal_render($username),
         '@age' => $this->dateFormatter->formatTimeDiffSince($view->lock->updated),
         ':url' => $view->url('break-lock-form'),
-      );
-      $form['locked'] = array(
+      ];
+      $form['locked'] = [
         '#type' => 'container',
-        '#attributes' => array('class' => array('view-locked', 'messages', 'messages--warning')),
+        '#attributes' => ['class' => ['view-locked', 'messages', 'messages--warning']],
         '#children' => $this->t('This view is being edited by user @user, and is therefore locked from editing by others. This lock is @age old. Click here to <a href=":url">break this lock</a>.', $lock_message_substitutions),
         '#weight' => -10,
-      );
+      ];
     }
     else {
-      $form['changed'] = array(
+      $form['changed'] = [
         '#type' => 'container',
-        '#attributes' => array('class' => array('view-changed', 'messages', 'messages--warning')),
+        '#attributes' => ['class' => ['view-changed', 'messages', 'messages--warning']],
         '#children' => $this->t('You have unsaved changes.'),
         '#weight' => -10,
-      );
+      ];
       if (empty($view->changed)) {
         $form['changed']['#attributes']['class'][] = 'js-hide';
       }
     }
 
-    $form['displays'] = array(
+    $form['displays'] = [
       '#prefix' => '<h1 class="unit-title clearfix">' . $this->t('Displays') . '</h1>',
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array(
+      '#attributes' => [
+        'class' => [
           'views-displays',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
 
     $form['displays']['top'] = $this->renderDisplayTop($view);
@@ -170,13 +170,13 @@ class ViewEditForm extends ViewFormBase {
       $form_state->set('display_id', $display_id);
 
       // The part of the page where editing will take place.
-      $form['displays']['settings'] = array(
+      $form['displays']['settings'] = [
         '#type' => 'container',
         '#id' => 'edit-display-settings',
-        '#attributes' => array(
-          'class' => array('edit-display-settings'),
-        ),
-      );
+        '#attributes' => [
+          'class' => ['edit-display-settings'],
+        ],
+      ];
 
       // Add a text that the display is disabled.
       if ($view->getExecutable()->displayHandlers->has($display_id)) {
@@ -187,8 +187,8 @@ class ViewEditForm extends ViewFormBase {
 
       // Add the edit display content
       $tab_content = $this->getDisplayTab($view);
-      $tab_content['#theme_wrappers'] = array('container');
-      $tab_content['#attributes'] = array('class' => array('views-display-tab'));
+      $tab_content['#theme_wrappers'] = ['container'];
+      $tab_content['#attributes'] = ['class' => ['views-display-tab']];
       $tab_content['#id'] = 'views-tab-' . $display_id;
       // Mark deleted displays as such.
       $display = $view->get('display');
@@ -200,10 +200,10 @@ class ViewEditForm extends ViewFormBase {
       if ($view->getExecutable()->displayHandlers->has($display_id) && !$view->getExecutable()->displayHandlers->get($display_id)->isEnabled()) {
         $tab_content['#attributes']['class'][] = 'views-display-disabled';
       }
-      $form['displays']['settings']['settings_content'] = array(
+      $form['displays']['settings']['settings_content'] = [
         '#type' => 'container',
         'tab_content' => $tab_content,
-      );
+      ];
     }
 
     return $form;
@@ -216,12 +216,12 @@ class ViewEditForm extends ViewFormBase {
     $actions = parent::actions($form, $form_state);
     unset($actions['delete']);
 
-    $actions['cancel'] = array(
+    $actions['cancel'] = [
       '#type' => 'submit',
       '#value' => $this->t('Cancel'),
-      '#submit' => array('::cancel'),
-      '#limit_validation_errors' => array(),
-    );
+      '#submit' => ['::cancel'],
+      '#limit_validation_errors' => [],
+    ];
     if ($this->entity->isLocked()) {
       $actions['submit']['#access'] = FALSE;
       $actions['cancel']['#access'] = FALSE;
@@ -258,6 +258,16 @@ class ViewEditForm extends ViewFormBase {
     $displays = $view->get('display');
     foreach ($displays as $id => $display) {
       if (!empty($display['deleted'])) {
+        // Remove view display from view attachment under the attachments
+        // options.
+        $display_handler = $executable->displayHandlers->get($id);
+        if ($attachments = $display_handler->getAttachedDisplays()) {
+          foreach ($attachments as $attachment ) {
+            $attached_options = $executable->displayHandlers->get($attachment)->getOption('displays');
+            unset($attached_options[$id]);
+            $executable->displayHandlers->get($attachment)->setOption('displays', $attached_options);
+          }
+        }
         $executable->displayHandlers->remove($id);
         unset($displays[$id]);
       }
@@ -275,10 +285,10 @@ class ViewEditForm extends ViewFormBase {
         unset($displays[$id]);
 
         // Redirect the user to the renamed display to be sure that the page itself exists and doesn't throw errors.
-        $form_state->setRedirect('entity.view.edit_display_form', array(
+        $form_state->setRedirect('entity.view.edit_display_form', [
           'view' => $view->id(),
           'display_id' => $new_id,
-        ));
+        ]);
       }
     }
     $view->set('display', $displays);
@@ -310,7 +320,7 @@ class ViewEditForm extends ViewFormBase {
 
     $view->save();
 
-    drupal_set_message($this->t('The view %name has been saved.', array('%name' => $view->label())));
+    drupal_set_message($this->t('The view %name has been saved.', ['%name' => $view->label()]));
 
     // Remove this view from cache so we can edit it properly.
     $this->tempStore->delete($view->id());
@@ -335,14 +345,14 @@ class ViewEditForm extends ViewFormBase {
    * Returns a renderable array representing the edit page for one display.
    */
   public function getDisplayTab($view) {
-    $build = array();
+    $build = [];
     $display_id = $this->displayID;
     $display = $view->getExecutable()->displayHandlers->get($display_id);
     // If the plugin doesn't exist, display an error message instead of an edit
     // page.
     if (empty($display)) {
       // @TODO: Improved UX for the case where a plugin is missing.
-      $build['#markup'] = $this->t("Error: Display @display refers to a plugin named '@plugin', but that plugin is not available.", array('@display' => $display->display['id'], '@plugin' => $display->display['display_plugin']));
+      $build['#markup'] = $this->t("Error: Display @display refers to a plugin named '@plugin', but that plugin is not available.", ['@display' => $display->display['id'], '@plugin' => $display->display['display_plugin']]);
     }
     // Build the content of the edit page.
     else {
@@ -364,10 +374,10 @@ class ViewEditForm extends ViewFormBase {
    */
   public function getDisplayDetails($view, $display) {
     $display_title = $this->getDisplayLabel($view, $display['id'], FALSE);
-    $build = array(
-      '#theme_wrappers' => array('container'),
-      '#attributes' => array('id' => 'edit-display-settings-details'),
-    );
+    $build = [
+      '#theme_wrappers' => ['container'],
+      '#attributes' => ['id' => 'edit-display-settings-details'],
+    ];
 
     $is_display_deleted = !empty($display['deleted']);
     // The master display cannot be duplicated.
@@ -376,14 +386,14 @@ class ViewEditForm extends ViewFormBase {
     $is_enabled = $view->getExecutable()->displayHandlers->get($display['id'])->isEnabled();
 
     if ($display['id'] != 'default') {
-      $build['top']['#theme_wrappers'] = array('container');
+      $build['top']['#theme_wrappers'] = ['container'];
       $build['top']['#attributes']['id'] = 'edit-display-settings-top';
-      $build['top']['#attributes']['class'] = array('views-ui-display-tab-actions', 'edit-display-settings-top', 'views-ui-display-tab-bucket', 'clearfix');
+      $build['top']['#attributes']['class'] = ['views-ui-display-tab-actions', 'edit-display-settings-top', 'views-ui-display-tab-bucket', 'clearfix'];
 
       // The Delete, Duplicate and Undo Delete buttons.
-      $build['top']['actions'] = array(
-        '#theme_wrappers' => array('dropbutton_wrapper'),
-      );
+      $build['top']['actions'] = [
+        '#theme_wrappers' => ['dropbutton_wrapper'],
+      ];
 
       // Because some of the 'links' are actually submit buttons, we have to
       // manually wrap each item in <li> and the whole list in <ul>.
@@ -391,14 +401,14 @@ class ViewEditForm extends ViewFormBase {
 
       if (!$is_display_deleted) {
         if (!$is_enabled) {
-          $build['top']['actions']['enable'] = array(
+          $build['top']['actions']['enable'] = [
             '#type' => 'submit',
             '#value' => $this->t('Enable @display_title', ['@display_title' => $display_title]),
-            '#limit_validation_errors' => array(),
-            '#submit' => array('::submitDisplayEnable', '::submitDelayDestination'),
+            '#limit_validation_errors' => [],
+            '#submit' => ['::submitDisplayEnable', '::submitDelayDestination'],
             '#prefix' => '<li class="enable">',
             "#suffix" => '</li>',
-          );
+          ];
         }
         // Add a link to view the page unless the view is disabled or has no
         // path.
@@ -413,118 +423,118 @@ class ViewEditForm extends ViewFormBase {
             else {
               $url = Url::fromUri("base:$path");
             }
-            $build['top']['actions']['path'] = array(
+            $build['top']['actions']['path'] = [
               '#type' => 'link',
               '#title' => $this->t('View @display_title', ['@display_title' => $display_title]),
-              '#options' => array('alt' => array($this->t("Go to the real page for this display"))),
+              '#options' => ['alt' => [$this->t("Go to the real page for this display")]],
               '#url' => $url,
               '#prefix' => '<li class="view">',
               "#suffix" => '</li>',
-            );
+            ];
           }
         }
         if (!$is_default) {
-          $build['top']['actions']['duplicate'] = array(
+          $build['top']['actions']['duplicate'] = [
             '#type' => 'submit',
             '#value' => $this->t('Duplicate @display_title', ['@display_title' => $display_title]),
-            '#limit_validation_errors' => array(),
-            '#submit' => array('::submitDisplayDuplicate', '::submitDelayDestination'),
+            '#limit_validation_errors' => [],
+            '#submit' => ['::submitDisplayDuplicate', '::submitDelayDestination'],
             '#prefix' => '<li class="duplicate">',
             "#suffix" => '</li>',
-          );
+          ];
         }
         // Always allow a display to be deleted.
-        $build['top']['actions']['delete'] = array(
+        $build['top']['actions']['delete'] = [
           '#type' => 'submit',
           '#value' => $this->t('Delete @display_title', ['@display_title' => $display_title]),
-          '#limit_validation_errors' => array(),
-          '#submit' => array('::submitDisplayDelete', '::submitDelayDestination'),
+          '#limit_validation_errors' => [],
+          '#submit' => ['::submitDisplayDelete', '::submitDelayDestination'],
           '#prefix' => '<li class="delete">',
           "#suffix" => '</li>',
-        );
+        ];
 
-        foreach (Views::fetchPluginNames('display', NULL, array($view->get('storage')->get('base_table'))) as $type => $label) {
+        foreach (Views::fetchPluginNames('display', NULL, [$view->get('storage')->get('base_table')]) as $type => $label) {
           if ($type == $display['display_plugin']) {
             continue;
           }
 
-          $build['top']['actions']['duplicate_as'][$type] = array(
+          $build['top']['actions']['duplicate_as'][$type] = [
             '#type' => 'submit',
             '#value' => $this->t('Duplicate as @type', ['@type' => $label]),
-            '#limit_validation_errors' => array(),
-            '#submit' => array('::submitDuplicateDisplayAsType', '::submitDelayDestination'),
+            '#limit_validation_errors' => [],
+            '#submit' => ['::submitDuplicateDisplayAsType', '::submitDelayDestination'],
             '#prefix' => '<li class="duplicate">',
             '#suffix' => '</li>',
-          );
+          ];
         }
       }
       else {
-        $build['top']['actions']['undo_delete'] = array(
+        $build['top']['actions']['undo_delete'] = [
           '#type' => 'submit',
           '#value' => $this->t('Undo delete of @display_title', ['@display_title' => $display_title]),
-          '#limit_validation_errors' => array(),
-          '#submit' => array('::submitDisplayUndoDelete', '::submitDelayDestination'),
+          '#limit_validation_errors' => [],
+          '#submit' => ['::submitDisplayUndoDelete', '::submitDelayDestination'],
           '#prefix' => '<li class="undo-delete">',
           "#suffix" => '</li>',
-        );
+        ];
       }
       if ($is_enabled) {
-        $build['top']['actions']['disable'] = array(
+        $build['top']['actions']['disable'] = [
           '#type' => 'submit',
           '#value' => $this->t('Disable @display_title', ['@display_title' => $display_title]),
-          '#limit_validation_errors' => array(),
-          '#submit' => array('::submitDisplayDisable', '::submitDelayDestination'),
+          '#limit_validation_errors' => [],
+          '#submit' => ['::submitDisplayDisable', '::submitDelayDestination'],
           '#prefix' => '<li class="disable">',
           "#suffix" => '</li>',
-        );
+        ];
       }
       $build['top']['actions']['suffix']['#markup'] = '</ul>';
 
       // The area above the three columns.
-      $build['top']['display_title'] = array(
+      $build['top']['display_title'] = [
         '#theme' => 'views_ui_display_tab_setting',
         '#description' => $this->t('Display name'),
         '#link' => $view->getExecutable()->displayHandlers->get($display['id'])->optionLink($display_title, 'display_title'),
-      );
+      ];
     }
 
-    $build['columns'] = array();
-    $build['columns']['#theme_wrappers'] = array('container');
-    $build['columns']['#attributes'] = array('id' => 'edit-display-settings-main', 'class' => array('clearfix', 'views-display-columns'));
+    $build['columns'] = [];
+    $build['columns']['#theme_wrappers'] = ['container'];
+    $build['columns']['#attributes'] = ['id' => 'edit-display-settings-main', 'class' => ['clearfix', 'views-display-columns']];
 
-    $build['columns']['first']['#theme_wrappers'] = array('container');
-    $build['columns']['first']['#attributes'] = array('class' => array('views-display-column', 'first'));
+    $build['columns']['first']['#theme_wrappers'] = ['container'];
+    $build['columns']['first']['#attributes'] = ['class' => ['views-display-column', 'first']];
 
-    $build['columns']['second']['#theme_wrappers'] = array('container');
-    $build['columns']['second']['#attributes'] = array('class' => array('views-display-column', 'second'));
+    $build['columns']['second']['#theme_wrappers'] = ['container'];
+    $build['columns']['second']['#attributes'] = ['class' => ['views-display-column', 'second']];
 
-    $build['columns']['second']['settings'] = array();
-    $build['columns']['second']['header'] = array();
-    $build['columns']['second']['footer'] = array();
-    $build['columns']['second']['empty'] = array();
-    $build['columns']['second']['pager'] = array();
+    $build['columns']['second']['settings'] = [];
+    $build['columns']['second']['header'] = [];
+    $build['columns']['second']['footer'] = [];
+    $build['columns']['second']['empty'] = [];
+    $build['columns']['second']['pager'] = [];
 
     // The third column buckets are wrapped in details.
-    $build['columns']['third'] = array(
+    $build['columns']['third'] = [
       '#type' => 'details',
       '#title' => $this->t('Advanced'),
-      '#theme_wrappers' => array('details'),
-      '#attributes' => array(
-        'class' => array(
+      '#theme_wrappers' => ['details'],
+      '#attributes' => [
+        'class' => [
           'views-display-column',
           'third',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     // Collapse the details by default.
     $build['columns']['third']['#open'] = \Drupal::config('views.settings')->get('ui.show.advanced_column');
 
     // Each option (e.g. title, access, display as grid/table/list) fits into one
     // of several "buckets," or boxes (Format, Fields, Sort, and so on).
-    $buckets = array();
+    $buckets = [];
 
     // Fetch options from the display plugin, with a list of buckets they go into.
-    $options = array();
+    $options = [];
     $view->getExecutable()->displayHandlers->get($display['id'])->optionsSummary($buckets, $options);
 
     // Place each option into its bucket.
@@ -579,10 +589,10 @@ class ViewEditForm extends ViewFormBase {
     $view->cacheSet();
 
     // Redirect to the top-level edit page.
-    $form_state->setRedirect('entity.view.edit_display_form', array(
+    $form_state->setRedirect('entity.view.edit_display_form', [
       'view' => $view->id(),
       'display_id' => $id,
-    ));
+    ]);
   }
 
   /**
@@ -598,10 +608,10 @@ class ViewEditForm extends ViewFormBase {
     $view->cacheSet();
 
     // Redirect to the top-level edit page.
-    $form_state->setRedirect('entity.view.edit_display_form', array(
+    $form_state->setRedirect('entity.view.edit_display_form', [
       'view' => $view->id(),
       'display_id' => $id,
-    ));
+    ]);
   }
 
   /**
@@ -616,10 +626,10 @@ class ViewEditForm extends ViewFormBase {
     $view->cacheSet();
 
     // Redirect to the top-level edit page.
-    $form_state->setRedirect('entity.view.edit_display_form', array(
+    $form_state->setRedirect('entity.view.edit_display_form', [
       'view' => $view->id(),
       'display_id' => $id,
-    ));
+    ]);
   }
 
   /**
@@ -671,43 +681,43 @@ class ViewEditForm extends ViewFormBase {
   public function renderDisplayTop(ViewUI $view) {
     $display_id = $this->displayID;
     $element['#theme_wrappers'][] = 'views_ui_container';
-    $element['#attributes']['class'] = array('views-display-top', 'clearfix');
-    $element['#attributes']['id'] = array('views-display-top');
+    $element['#attributes']['class'] = ['views-display-top', 'clearfix'];
+    $element['#attributes']['id'] = ['views-display-top'];
 
     // Extra actions for the display
-    $element['extra_actions'] = array(
+    $element['extra_actions'] = [
       '#type' => 'dropbutton',
-      '#attributes' => array(
+      '#attributes' => [
         'id' => 'views-display-extra-actions',
-      ),
-      '#links' => array(
-        'edit-details' => array(
+      ],
+      '#links' => [
+        'edit-details' => [
           'title' => $this->t('Edit view name/description'),
           'url' => Url::fromRoute('views_ui.form_edit_details', ['js' => 'nojs', 'view' => $view->id(), 'display_id' => $display_id]),
-          'attributes' => array('class' => array('views-ajax-link')),
-        ),
-        'analyze' => array(
+          'attributes' => ['class' => ['views-ajax-link']],
+        ],
+        'analyze' => [
           'title' => $this->t('Analyze view'),
           'url' => Url::fromRoute('views_ui.form_analyze', ['js' => 'nojs', 'view' => $view->id(), 'display_id' => $display_id]),
-          'attributes' => array('class' => array('views-ajax-link')),
-        ),
-        'duplicate' => array(
+          'attributes' => ['class' => ['views-ajax-link']],
+        ],
+        'duplicate' => [
           'title' => $this->t('Duplicate view'),
           'url' => $view->urlInfo('duplicate-form'),
-        ),
-        'reorder' => array(
+        ],
+        'reorder' => [
           'title' => $this->t('Reorder displays'),
           'url' => Url::fromRoute('views_ui.form_reorder_displays', ['js' => 'nojs', 'view' => $view->id(), 'display_id' => $display_id]),
-          'attributes' => array('class' => array('views-ajax-link')),
-        ),
-      ),
-    );
+          'attributes' => ['class' => ['views-ajax-link']],
+        ],
+      ],
+    ];
 
     if ($view->access('delete')) {
-      $element['extra_actions']['#links']['delete'] = array(
+      $element['extra_actions']['#links']['delete'] = [
         'title' => $this->t('Delete view'),
         'url' => $view->urlInfo('delete-form'),
-      );
+      ];
     }
 
     // Let other modules add additional links here.
@@ -715,17 +725,17 @@ class ViewEditForm extends ViewFormBase {
 
     if (isset($view->type) && $view->type != $this->t('Default')) {
       if ($view->type == $this->t('Overridden')) {
-        $element['extra_actions']['#links']['revert'] = array(
+        $element['extra_actions']['#links']['revert'] = [
           'title' => $this->t('Revert view'),
           'href' => "admin/structure/views/view/{$view->id()}/revert",
-          'query' => array('destination' => $view->url('edit-form')),
-        );
+          'query' => ['destination' => $view->url('edit-form')],
+        ];
       }
       else {
-        $element['extra_actions']['#links']['delete'] = array(
+        $element['extra_actions']['#links']['delete'] = [
           'title' => $this->t('Delete view'),
           'url' => $view->urlInfo('delete-form'),
-        );
+        ];
       }
     }
 
@@ -740,18 +750,18 @@ class ViewEditForm extends ViewFormBase {
     }
 
     // Buttons for adding a new display.
-    foreach (Views::fetchPluginNames('display', NULL, array($view->get('base_table'))) as $type => $label) {
-      $element['add_display'][$type] = array(
+    foreach (Views::fetchPluginNames('display', NULL, [$view->get('base_table')]) as $type => $label) {
+      $element['add_display'][$type] = [
         '#type' => 'submit',
-        '#value' => $this->t('Add @display', array('@display' => $label)),
-        '#limit_validation_errors' => array(),
-        '#submit' => array('::submitDisplayAdd', '::submitDelayDestination'),
-        '#attributes' => array('class' => array('add-display')),
+        '#value' => $this->t('Add @display', ['@display' => $label]),
+        '#limit_validation_errors' => [],
+        '#submit' => ['::submitDisplayAdd', '::submitDelayDestination'],
+        '#attributes' => ['class' => ['add-display']],
         // Allow JavaScript to remove the 'Add ' prefix from the button label when
         // placing the button in a "Add" dropdown menu.
-        '#process' => array_merge(array('views_ui_form_button_was_clicked'), $this->elementInfo->getInfoProperty('submit', '#process', array())),
-        '#values' => array($this->t('Add @display', array('@display' => $label)), $label),
-      );
+        '#process' => array_merge(['views_ui_form_button_was_clicked'], $this->elementInfo->getInfoProperty('submit', '#process', [])),
+        '#values' => [$this->t('Add @display', ['@display' => $label]), $label],
+      ];
     }
 
     return $element;
@@ -814,10 +824,10 @@ class ViewEditForm extends ViewFormBase {
     $view->cacheSet();
 
     // Redirect to the new display's edit page.
-    $form_state->setRedirect('entity.view.edit_display_form', array(
+    $form_state->setRedirect('entity.view.edit_display_form', [
       'view' => $view->id(),
       'display_id' => $new_display_id,
-    ));
+    ]);
   }
 
   /**
@@ -836,10 +846,10 @@ class ViewEditForm extends ViewFormBase {
     $view->cacheSet();
 
     // Redirect to the new display's edit page.
-    $form_state->setRedirect('entity.view.edit_display_form', array(
+    $form_state->setRedirect('entity.view.edit_display_form', [
       'view' => $view->id(),
       'display_id' => $display_id,
-    ));
+    ]);
   }
 
   /**
@@ -862,10 +872,10 @@ class ViewEditForm extends ViewFormBase {
     $view->cacheSet();
 
     // Redirect to the new display's edit page.
-    $form_state->setRedirect('entity.view.edit_display_form', array(
+    $form_state->setRedirect('entity.view.edit_display_form', [
       'view' => $view->id(),
       'display_id' => $new_display_id,
-    ));
+    ]);
   }
 
   /**
@@ -875,14 +885,14 @@ class ViewEditForm extends ViewFormBase {
    * object emerges out of refactoring.
    */
   public function buildOptionForm(ViewUI $view, $id, $option, $display) {
-    $option_build = array();
+    $option_build = [];
     $option_build['#theme'] = 'views_ui_display_tab_setting';
 
     $option_build['#description'] = $option['title'];
 
     $option_build['#link'] = $view->getExecutable()->displayHandlers->get($display['id'])->optionLink($option['value'], $id, '', empty($option['desc']) ? '' : $option['desc']);
 
-    $option_build['#links'] = array();
+    $option_build['#links'] = [];
     if (!empty($option['links']) && is_array($option['links'])) {
       foreach ($option['links'] as $link_id => $link_value) {
         $option_build['#settings_links'][] = $view->getExecutable()->displayHandlers->get($display['id'])->optionLink($option['setting'], $link_id, 'views-button-configure', $link_value);
@@ -915,9 +925,9 @@ class ViewEditForm extends ViewFormBase {
 
     $types = $executable->getHandlerTypes();
 
-    $build = array(
-      '#theme_wrappers' => array('views_ui_display_tab_bucket'),
-    );
+    $build = [
+      '#theme_wrappers' => ['views_ui_display_tab_bucket'],
+    ];
 
     $build['#overridden'] = FALSE;
     $build['#defaulted'] = FALSE;
@@ -943,11 +953,11 @@ class ViewEditForm extends ViewFormBase {
         $style_plugin = $executable->style_plugin;
         $uses_fields = $style_plugin && $style_plugin->usesFields();
         if (!$uses_fields) {
-          $build['fields'][] = array(
+          $build['fields'][] = [
             '#markup' => $this->t('The selected style or row format does not use fields.'),
-            '#theme_wrappers' => array('views_ui_container'),
-            '#attributes' => array('class' => array('views-display-setting')),
-          );
+            '#theme_wrappers' => ['views_ui_container'],
+            '#attributes' => ['class' => ['views-display-setting']],
+          ];
           return $build;
         }
         break;
@@ -955,47 +965,47 @@ class ViewEditForm extends ViewFormBase {
       case 'footer':
       case 'empty':
         if (!$executable->display_handler->usesAreas()) {
-          $build[$type][] = array(
-            '#markup' => $this->t('The selected display type does not use @type plugins', array('@type' => $type)),
-            '#theme_wrappers' => array('views_ui_container'),
-            '#attributes' => array('class' => array('views-display-setting')),
-          );
+          $build[$type][] = [
+            '#markup' => $this->t('The selected display type does not use @type plugins', ['@type' => $type]),
+            '#theme_wrappers' => ['views_ui_container'],
+            '#attributes' => ['class' => ['views-display-setting']],
+          ];
           return $build;
         }
         break;
     }
 
     // Create an array of actions to pass to links template.
-    $actions = array();
+    $actions = [];
     $count_handlers = count($executable->display_handler->getHandlers($type));
 
     // Create the add text variable for the add action.
-    $add_text = $this->t('Add <span class="visually-hidden">@type</span>', array('@type' => $types[$type]['ltitle']));
+    $add_text = $this->t('Add <span class="visually-hidden">@type</span>', ['@type' => $types[$type]['ltitle']]);
 
-    $actions['add'] = array(
+    $actions['add'] = [
       'title' => $add_text,
       'url' => Url::fromRoute('views_ui.form_add_handler', ['js' => 'nojs', 'view' => $view->id(), 'display_id' => $display['id'], 'type' => $type]),
-      'attributes' => array('class' => array('icon compact add', 'views-ajax-link'), 'id' => 'views-add-' . $type),
-    );
+      'attributes' => ['class' => ['icon compact add', 'views-ajax-link'], 'id' => 'views-add-' . $type],
+    ];
     if ($count_handlers > 0) {
       // Create the rearrange text variable for the rearrange action.
-      $rearrange_text = $type == 'filter' ? $this->t('And/Or Rearrange <span class="visually-hidden">filter criteria</span>') : $this->t('Rearrange <span class="visually-hidden">@type</span>', array('@type' => $types[$type]['ltitle']));
+      $rearrange_text = $type == 'filter' ? $this->t('And/Or Rearrange <span class="visually-hidden">filter criteria</span>') : $this->t('Rearrange <span class="visually-hidden">@type</span>', ['@type' => $types[$type]['ltitle']]);
 
-      $actions['rearrange'] = array(
+      $actions['rearrange'] = [
         'title' => $rearrange_text,
         'url' => $rearrange_url,
-        'attributes' => array('class' => array($class, 'views-ajax-link'), 'id' => 'views-rearrange-' . $type),
-      );
+        'attributes' => ['class' => [$class, 'views-ajax-link'], 'id' => 'views-rearrange-' . $type],
+      ];
     }
 
     // Render the array of links
-    $build['#actions'] = array(
+    $build['#actions'] = [
       '#type' => 'dropbutton',
       '#links' => $actions,
-      '#attributes' => array(
-        'class' => array('views-ui-settings-bucket-operations'),
-      ),
-    );
+      '#attributes' => [
+        'class' => ['views-ui-settings-bucket-operations'],
+      ],
+    ];
 
     if (!$executable->display_handler->isDefaultDisplay()) {
       if (!$executable->display_handler->isDefaulted($types[$type]['plural'])) {
@@ -1009,14 +1019,14 @@ class ViewEditForm extends ViewFormBase {
     static $relationships = NULL;
     if (!isset($relationships)) {
       // Get relationship labels.
-      $relationships = array();
+      $relationships = [];
       foreach ($executable->display_handler->getHandlers('relationship') as $id => $handler) {
         $relationships[$id] = $handler->adminLabel();
       }
     }
 
     // Filters can now be grouped so we do a little bit extra:
-    $groups = array();
+    $groups = [];
     $grouping = FALSE;
     if ($type == 'filter') {
       $group_info = $executable->display_handler->getOption('filter_groups');
@@ -1025,28 +1035,28 @@ class ViewEditForm extends ViewFormBase {
       // "OR" label next to items within the group.
       if (!empty($group_info['groups']) && (count($group_info['groups']) > 1 || current($group_info['groups']) == 'OR')) {
         $grouping = TRUE;
-        $groups = array(0 => array());
+        $groups = [0 => []];
       }
     }
 
-    $build['fields'] = array();
+    $build['fields'] = [];
 
     foreach ($executable->display_handler->getOption($types[$type]['plural']) as $id => $field) {
       // Build the option link for this handler ("Node: ID = article").
-      $build['fields'][$id] = array();
+      $build['fields'][$id] = [];
       $build['fields'][$id]['#theme'] = 'views_ui_display_tab_setting';
 
       $handler = $executable->display_handler->getHandler($type, $id);
       if ($handler->broken()) {
         $build['fields'][$id]['#class'][] = 'broken';
         $field_name = $handler->adminLabel();
-        $build['fields'][$id]['#link'] = $this->l($field_name, new Url('views_ui.form_handler', array(
+        $build['fields'][$id]['#link'] = $this->l($field_name, new Url('views_ui.form_handler', [
           'js' => 'nojs',
           'view' => $view->id(),
           'display_id' => $display['id'],
           'type' => $type,
           'id' => $id,
-        ), array('attributes' => array('class' => array('views-ajax-link')))));
+        ], ['attributes' => ['class' => ['views-ajax-link']]]));
         continue;
       }
 
@@ -1057,39 +1067,39 @@ class ViewEditForm extends ViewFormBase {
 
       $description = $handler->adminSummary();
       $link_text = $field_name . (empty($description) ? '' : " ($description)");
-      $link_attributes = array('class' => array('views-ajax-link'));
+      $link_attributes = ['class' => ['views-ajax-link']];
       if (!empty($field['exclude'])) {
         $link_attributes['class'][] = 'views-field-excluded';
         // Add a [hidden] marker, if the field is excluded.
         $link_text .= ' [' . $this->t('hidden') . ']';
       }
-      $build['fields'][$id]['#link'] = $this->l($link_text, new Url('views_ui.form_handler', array(
+      $build['fields'][$id]['#link'] = $this->l($link_text, new Url('views_ui.form_handler', [
         'js' => 'nojs',
         'view' => $view->id(),
         'display_id' => $display['id'],
         'type' => $type,
         'id' => $id,
-      ), array('attributes' => $link_attributes)));
+      ], ['attributes' => $link_attributes]));
       $build['fields'][$id]['#class'][] = Html::cleanCssIdentifier($display['id'] . '-' . $type . '-' . $id);
 
       if ($executable->display_handler->useGroupBy() && $handler->usesGroupBy()) {
-        $build['fields'][$id]['#settings_links'][] = $this->l(SafeMarkup::format('<span class="label">@text</span>', array('@text' => $this->t('Aggregation settings'))), new Url('views_ui.form_handler_group', array(
+        $build['fields'][$id]['#settings_links'][] = $this->l(SafeMarkup::format('<span class="label">@text</span>', ['@text' => $this->t('Aggregation settings')]), new Url('views_ui.form_handler_group', [
           'js' => 'nojs',
           'view' => $view->id(),
           'display_id' => $display['id'],
           'type' => $type,
           'id' => $id,
-        ), array('attributes' => array('class' => array('views-button-configure', 'views-ajax-link'), 'title' => $this->t('Aggregation settings')))));
+        ], ['attributes' => ['class' => ['views-button-configure', 'views-ajax-link'], 'title' => $this->t('Aggregation settings')]]));
       }
 
       if ($handler->hasExtraOptions()) {
-        $build['fields'][$id]['#settings_links'][] = $this->l(SafeMarkup::format('<span class="label">@text</span>', array('@text' => $this->t('Settings'))), new Url('views_ui.form_handler_extra', array(
+        $build['fields'][$id]['#settings_links'][] = $this->l(SafeMarkup::format('<span class="label">@text</span>', ['@text' => $this->t('Settings')]), new Url('views_ui.form_handler_extra', [
           'js' => 'nojs',
           'view' => $view->id(),
           'display_id' => $display['id'],
           'type' => $type,
           'id' => $id,
-        ), array('attributes' => array('class' => array('views-button-configure', 'views-ajax-link'), 'title' => $this->t('Settings')))));
+        ], ['attributes' => ['class' => ['views-button-configure', 'views-ajax-link'], 'title' => $this->t('Settings')]]));
       }
 
       if ($grouping) {
@@ -1106,15 +1116,15 @@ class ViewEditForm extends ViewFormBase {
     // If using grouping, re-order fields so that they show up properly in the list.
     if ($type == 'filter' && $grouping) {
       $store = $build['fields'];
-      $build['fields'] = array();
+      $build['fields'] = [];
       foreach ($groups as $gid => $contents) {
         // Display an operator between each group.
         if (!empty($build['fields'])) {
-          $build['fields'][] = array(
+          $build['fields'][] = [
             '#theme' => 'views_ui_display_tab_setting',
-            '#class' => array('views-group-text'),
+            '#class' => ['views-group-text'],
             '#link' => ($group_info['operator'] == 'OR' ? $this->t('OR') : $this->t('AND')),
-          );
+          ];
         }
         // Display an operator between each pair of filters within the group.
         $keys = array_keys($contents);
diff --git a/web/core/modules/views_ui/src/ViewFormBase.php b/web/core/modules/views_ui/src/ViewFormBase.php
index 1533b80ca..49cdc4955 100644
--- a/web/core/modules/views_ui/src/ViewFormBase.php
+++ b/web/core/modules/views_ui/src/ViewFormBase.php
@@ -88,7 +88,7 @@ abstract class ViewFormBase extends EntityForm {
     $executable = $view->getExecutable();
     $executable->initDisplay();
     $display_id = $this->displayID;
-    $tabs = array();
+    $tabs = [];
 
     // Create a tab for each display.
     foreach ($view->get('display') as $id => $display) {
@@ -99,15 +99,15 @@ abstract class ViewFormBase extends EntityForm {
         continue;
       }
 
-      $tabs[$id] = array(
+      $tabs[$id] = [
         '#theme' => 'menu_local_task',
         '#weight' => $display['position'],
-        '#link' => array(
+        '#link' => [
           'title' => $this->getDisplayLabel($view, $id),
-          'localized_options' => array(),
+          'localized_options' => [],
           'url' => $view->urlInfo('edit-display-form')->setRouteParameter('display_id', $id),
-        ),
-      );
+        ],
+      ];
       if (!empty($display['deleted'])) {
         $tabs[$id]['#link']['localized_options']['attributes']['class'][] = 'views-display-deleted-link';
       }
diff --git a/web/core/modules/views_ui/src/ViewListBuilder.php b/web/core/modules/views_ui/src/ViewListBuilder.php
index 112e1c457..42166be1a 100644
--- a/web/core/modules/views_ui/src/ViewListBuilder.php
+++ b/web/core/modules/views_ui/src/ViewListBuilder.php
@@ -45,7 +45,7 @@ class ViewListBuilder extends ConfigEntityListBuilder {
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
    *   The entity type definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
    *   The entity storage class.
    * @param \Drupal\Component\Plugin\PluginManagerInterface $display_manager
    *   The views display plugin manager to use.
@@ -65,10 +65,10 @@ class ViewListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function load() {
-    $entities = array(
-      'enabled' => array(),
-      'disabled' => array(),
-    );
+    $entities = [
+      'enabled' => [],
+      'disabled' => [],
+    ];
     foreach (parent::load() as $entity) {
       if ($entity->status()) {
         $entities['enabled'][] = $entity;
@@ -85,67 +85,73 @@ class ViewListBuilder extends ConfigEntityListBuilder {
    */
   public function buildRow(EntityInterface $view) {
     $row = parent::buildRow($view);
-    return array(
-      'data' => array(
-        'view_name' => array(
-          'data' => array(
-            '#theme' => 'views_ui_view_info',
-            '#view' => $view,
-            '#displays' => $this->getDisplaysList($view)
-          ),
-        ),
-        'description' => array(
-          'data' => array(
+    return [
+      'data' => [
+        'view_name' => [
+          'data' => [
+            '#plain_text' => $view->label(),
+          ],
+        ],
+        'machine_name' => [
+          'data' => [
+            '#plain_text' => $view->id(),
+          ],
+        ],
+        'description' => [
+          'data' => [
             '#plain_text' => $view->get('description'),
-          ),
-          'data-drupal-selector' => 'views-table-filter-text-source',
-        ),
-        'tag' => array(
-          'data' => array(
-            '#plain_text' => $view->get('tag'),
-          ),
-          'data-drupal-selector' => 'views-table-filter-text-source',
-        ),
-        'path' => array(
-          'data' => array(
-            '#theme' => 'item_list',
-            '#items' => $this->getDisplayPaths($view),
-            '#context' => ['list_style' => 'comma-list'],
-          ),
-        ),
+          ],
+        ],
+        'displays' => [
+          'data' => [
+            '#theme' => 'views_ui_view_displays_list',
+            '#displays' => $this->getDisplaysList($view),
+          ],
+        ],
         'operations' => $row['operations'],
-      ),
-      'title' => $this->t('Machine name: @name', array('@name' => $view->id())),
-      'class' => array($view->status() ? 'views-ui-list-enabled' : 'views-ui-list-disabled'),
-    );
+      ],
+      '#attributes' => [
+        'class' => [$view->status() ? 'views-ui-list-enabled' : 'views-ui-list-disabled'],
+      ],
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildHeader() {
-    return array(
-      'view_name' => array(
+    return [
+      'view_name' => [
         'data' => $this->t('View name'),
-        'class' => array('views-ui-name'),
-      ),
-      'description' => array(
+        '#attributes' => [
+          'class' => ['views-ui-name'],
+        ],
+      ],
+      'machine_name' => [
+        'data' => $this->t('Machine name'),
+        '#attributes' => [
+          'class' => ['views-ui-machine-name'],
+        ],
+      ],
+      'description' => [
         'data' => $this->t('Description'),
-        'class' => array('views-ui-description'),
-      ),
-      'tag' => array(
-        'data' => $this->t('Tag'),
-        'class' => array('views-ui-tag'),
-      ),
-      'path' => array(
-        'data' => $this->t('Path'),
-        'class' => array('views-ui-path'),
-      ),
-      'operations' => array(
+        '#attributes' => [
+          'class' => ['views-ui-description'],
+        ],
+      ],
+      'displays' => [
+        'data' => $this->t('Displays'),
+        '#attributes' => [
+          'class' => ['views-ui-displays'],
+        ],
+      ],
+      'operations' => [
         'data' => $this->t('Operations'),
-        'class' => array('views-ui-operations'),
-      ),
-    );
+        '#attributes' => [
+          'class' => ['views-ui-operations'],
+        ],
+      ],
+    ];
   }
 
   /**
@@ -155,15 +161,15 @@ class ViewListBuilder extends ConfigEntityListBuilder {
     $operations = parent::getDefaultOperations($entity);
 
     if ($entity->hasLinkTemplate('duplicate-form')) {
-      $operations['duplicate'] = array(
+      $operations['duplicate'] = [
         'title' => $this->t('Duplicate'),
         'weight' => 15,
         'url' => $entity->urlInfo('duplicate-form'),
-      );
+      ];
     }
 
     // Add AJAX functionality to enable/disable operations.
-    foreach (array('enable', 'disable') as $op) {
+    foreach (['enable', 'disable'] as $op) {
       if (isset($operations[$op])) {
         $operations[$op]['url'] = $entity->urlInfo($op);
         // Enable and disable operations should use AJAX.
@@ -185,40 +191,37 @@ class ViewListBuilder extends ConfigEntityListBuilder {
     $list['#attached']['library'][] = 'core/drupal.ajax';
     $list['#attached']['library'][] = 'views_ui/views_ui.listing';
 
-    $form['filters'] = array(
+    $form['filters'] = [
       '#type' => 'container',
-      '#attributes' => array(
-        'class' => array('table-filter', 'js-show'),
-      ),
-    );
+      '#attributes' => [
+        'class' => ['table-filter', 'js-show'],
+      ],
+    ];
 
-    $list['filters']['text'] = array(
+    $list['filters']['text'] = [
       '#type' => 'search',
       '#title' => $this->t('Filter'),
       '#title_display' => 'invisible',
-      '#size' => 40,
-      '#placeholder' => $this->t('Filter by view name or description'),
-      '#attributes' => array(
-        'class' => array('views-filter-text'),
+      '#size' => 60,
+      '#placeholder' => $this->t('Filter by view name, machine name, description, or display path'),
+      '#attributes' => [
+        'class' => ['views-filter-text'],
         'data-table' => '.views-listing-table',
         'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the view name or description to filter by.'),
-      ),
-    );
+        'title' => $this->t('Enter a part of the view name, machine name, description, or display path to filter by.'),
+      ],
+    ];
 
-    $list['enabled']['heading']['#markup'] = '<h2>' . $this->t('Enabled', array(), array('context' => 'Plural')) . '</h2>';
-    $list['disabled']['heading']['#markup'] = '<h2>' . $this->t('Disabled', array(), array('context' => 'Plural')) . '</h2>';
-    foreach (array('enabled', 'disabled') as $status) {
+    $list['enabled']['heading']['#markup'] = '<h2>' . $this->t('Enabled', [], ['context' => 'Plural']) . '</h2>';
+    $list['disabled']['heading']['#markup'] = '<h2>' . $this->t('Disabled', [], ['context' => 'Plural']) . '</h2>';
+    foreach (['enabled', 'disabled'] as $status) {
       $list[$status]['#type'] = 'container';
-      $list[$status]['#attributes'] = array('class' => array('views-list-section', $status));
-      $list[$status]['table'] = array(
-        '#type' => 'table',
-        '#attributes' => array(
-          'class' => array('views-listing-table'),
-        ),
-        '#header' => $this->buildHeader(),
-        '#rows' => array(),
-      );
+      $list[$status]['#attributes'] = ['class' => ['views-list-section', $status]];
+      $list[$status]['table'] = [
+        '#theme' => 'views_ui_views_listing_table',
+        '#headers' => $this->buildHeader(),
+        '#attributes' => ['class' => ['views-listing-table', $status]],
+      ];
       foreach ($entities[$status] as $entity) {
         $list[$status]['table']['#rows'][$entity->id()] = $this->buildRow($entity);
       }
@@ -241,13 +244,29 @@ class ViewListBuilder extends ConfigEntityListBuilder {
    *   An array of display types that this view includes.
    */
   protected function getDisplaysList(EntityInterface $view) {
-    $displays = array();
-    foreach ($view->get('display') as $display) {
-      $definition = $this->displayManager->getDefinition($display['display_plugin']);
+    $displays = [];
+
+    $executable = $view->getExecutable();
+    $executable->initDisplay();
+    foreach ($executable->displayHandlers as $display) {
+      $rendered_path = FALSE;
+      $definition = $display->getPluginDefinition();
       if (!empty($definition['admin'])) {
-        // Cast the admin label to a string since it is an object.
-        // @see \Drupal\Core\StringTranslation\TranslatableMarkup
-        $displays[] = (string) $definition['admin'];
+        if ($display->hasPath()) {
+          $path = $display->getPath();
+          if ($view->status() && strpos($path, '%') === FALSE) {
+            // @todo Views should expect and store a leading /. See:
+            //   https://www.drupal.org/node/2423913
+            $rendered_path = \Drupal::l('/' . $path, Url::fromUserInput('/' . $path));
+          }
+          else {
+            $rendered_path = '/' . $path;
+          }
+        }
+        $displays[] = [
+          'display' => $definition['admin'],
+          'path' => $rendered_path,
+        ];
       }
     }
 
@@ -255,33 +274,4 @@ class ViewListBuilder extends ConfigEntityListBuilder {
     return $displays;
   }
 
-  /**
-   * Gets a list of paths assigned to the view.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $view
-   *   The view entity.
-   *
-   * @return array
-   *   An array of paths for this view.
-   */
-  protected function getDisplayPaths(EntityInterface $view) {
-    $all_paths = array();
-    $executable = $view->getExecutable();
-    $executable->initDisplay();
-    foreach ($executable->displayHandlers as $display) {
-      if ($display->hasPath()) {
-        $path = $display->getPath();
-        if ($view->status() && strpos($path, '%') === FALSE) {
-          // @todo Views should expect and store a leading /. See:
-          //   https://www.drupal.org/node/2423913
-          $all_paths[] = \Drupal::l('/' . $path, Url::fromUserInput('/' . $path));
-        }
-        else {
-          $all_paths[] = '/' . $path;
-        }
-      }
-    }
-    return array_unique($all_paths);
-  }
-
 }
diff --git a/web/core/modules/views_ui/src/ViewPreviewForm.php b/web/core/modules/views_ui/src/ViewPreviewForm.php
index 48e22c5b9..2cc25332e 100644
--- a/web/core/modules/views_ui/src/ViewPreviewForm.php
+++ b/web/core/modules/views_ui/src/ViewPreviewForm.php
@@ -22,43 +22,43 @@ class ViewPreviewForm extends ViewFormBase {
 
     $form_state->disableCache();
 
-    $form['controls']['#attributes'] = array('class' => array('clearfix'));
+    $form['controls']['#attributes'] = ['class' => ['clearfix']];
 
-    $form['controls']['title'] = array(
+    $form['controls']['title'] = [
       '#prefix' => '<h2 class="view-preview-form__title">',
       '#markup' => $this->t('Preview'),
       '#suffix' => '</h2>',
-    );
+    ];
 
     // Add a checkbox controlling whether or not this display auto-previews.
-    $form['controls']['live_preview'] = array(
+    $form['controls']['live_preview'] = [
       '#type' => 'checkbox',
       '#id' => 'edit-displays-live-preview',
       '#title' => $this->t('Auto preview'),
       '#default_value' => \Drupal::config('views.settings')->get('ui.always_live_preview'),
-    );
+    ];
 
     // Add the arguments textfield
-    $form['controls']['view_args'] = array(
+    $form['controls']['view_args'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Preview with contextual filters:'),
-      '#description' => $this->t('Separate contextual filter values with a "/". For example, %example.', array('%example' => '40/12/10')),
+      '#description' => $this->t('Separate contextual filter values with a "/". For example, %example.', ['%example' => '40/12/10']),
       '#id' => 'preview-args',
-    );
+    ];
 
-    $args = array();
+    $args = [];
     if (!$form_state->isValueEmpty('view_args')) {
       $args = explode('/', $form_state->getValue('view_args'));
     }
 
     $user_input = $form_state->getUserInput();
     if ($form_state->get('show_preview') || !empty($user_input['js'])) {
-      $form['preview'] = array(
+      $form['preview'] = [
         '#weight' => 110,
-        '#theme_wrappers' => array('container'),
-        '#attributes' => array('id' => 'views-live-preview', 'class' => 'views-live-preview'),
+        '#theme_wrappers' => ['container'],
+        '#attributes' => ['id' => 'views-live-preview', 'class' => ['views-live-preview']],
         'preview' => $view->renderPreview($this->displayID, $args),
-      );
+      ];
     }
     $uri = $view->urlInfo('preview-form');
     $uri->setRouteParameter('display_id', $this->displayID);
@@ -72,27 +72,27 @@ class ViewPreviewForm extends ViewFormBase {
    */
   protected function actions(array $form, FormStateInterface $form_state) {
     $view = $this->entity;
-    return array(
-      '#attributes' => array(
+    return [
+      '#attributes' => [
         'id' => 'preview-submit-wrapper',
-        'class' => array('preview-submit-wrapper')
-      ),
-      'button' => array(
+        'class' => ['preview-submit-wrapper']
+      ],
+      'button' => [
         '#type' => 'submit',
         '#value' => $this->t('Update preview'),
-        '#attributes' => array('class' => array('arguments-preview')),
-        '#submit' => array('::submitPreview'),
+        '#attributes' => ['class' => ['arguments-preview']],
+        '#submit' => ['::submitPreview'],
         '#id' => 'preview-submit',
-        '#ajax' => array(
+        '#ajax' => [
           'url' => Url::fromRoute('entity.view.preview_form', ['view' => $view->id(), 'display_id' => $this->displayID]),
           'wrapper' => 'views-preview-wrapper',
           'event' => 'click',
-          'progress' => array('type' => 'fullscreen'),
+          'progress' => ['type' => 'fullscreen'],
           'method' => 'replaceWith',
           'disable-refocus' => TRUE,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/modules/views_ui/src/ViewUI.php b/web/core/modules/views_ui/src/ViewUI.php
index cb222b0b4..b6841a84b 100644
--- a/web/core/modules/views_ui/src/ViewUI.php
+++ b/web/core/modules/views_ui/src/ViewUI.php
@@ -107,7 +107,7 @@ class ViewUI implements ViewEntityInterface {
    *
    * @var array
    */
-  public static $forms = array(
+  public static $forms = [
     'add-handler' => '\Drupal\views_ui\Form\Ajax\AddItem',
     'analyze' => '\Drupal\views_ui\Form\Ajax\Analyze',
     'handler' => '\Drupal\views_ui\Form\Ajax\ConfigHandler',
@@ -118,7 +118,7 @@ class ViewUI implements ViewEntityInterface {
     'rearrange' => '\Drupal\views_ui\Form\Ajax\Rearrange',
     'rearrange-filter' => '\Drupal\views_ui\Form\Ajax\RearrangeFilter',
     'reorder-displays' => '\Drupal\views_ui\Form\Ajax\ReorderDisplays',
-  );
+  ];
 
   /**
    * Whether the config is being created, updated or deleted through the
@@ -277,22 +277,22 @@ class ViewUI implements ViewEntityInterface {
    * docblock outdated?
    */
   public function getStandardButtons(&$form, FormStateInterface $form_state, $form_id, $name = NULL) {
-    $form['actions'] = array(
+    $form['actions'] = [
       '#type' => 'actions',
-    );
+    ];
 
     if (empty($name)) {
       $name = t('Apply');
       if (!empty($this->stack) && count($this->stack) > 1) {
         $name = t('Apply and continue');
       }
-      $names = array(t('Apply'), t('Apply and continue'));
+      $names = [t('Apply'), t('Apply and continue')];
     }
 
     // Forms that are purely informational set an ok_button flag, so we know not
     // to create an "Apply" button for them.
     if (!$form_state->get('ok_button')) {
-      $form['actions']['submit'] = array(
+      $form['actions']['submit'] = [
         '#type' => 'submit',
         '#value' => $name,
         '#id' => 'edit-submit-' . Html::getUniqueId($form_id),
@@ -301,9 +301,9 @@ class ViewUI implements ViewEntityInterface {
         // the current display. Since we have no way of knowing at this point
         // which display the user wants to update, views_ui_standard_submit will
         // take care of running the regular submit handler as appropriate.
-        '#submit' => array(array($this, 'standardSubmit')),
+        '#submit' => [[$this, 'standardSubmit']],
         '#button_type' => 'primary',
-      );
+      ];
       // Form API button click detection requires the button's #value to be the
       // same between the form build of the initial page request, and the
       // initial form build of the request processing the form submission.
@@ -315,21 +315,21 @@ class ViewUI implements ViewEntityInterface {
       // button labels.
       if (isset($names)) {
         $form['actions']['submit']['#values'] = $names;
-        $form['actions']['submit']['#process'] = array_merge(array('views_ui_form_button_was_clicked'), \Drupal::service('element_info')->getInfoProperty($form['actions']['submit']['#type'], '#process', array()));
+        $form['actions']['submit']['#process'] = array_merge(['views_ui_form_button_was_clicked'], \Drupal::service('element_info')->getInfoProperty($form['actions']['submit']['#type'], '#process', []));
       }
       // If a validation handler exists for the form, assign it to this button.
       $form['actions']['submit']['#validate'][] = [$form_state->getFormObject(), 'validateForm'];
     }
 
     // Create a "Cancel" button. For purely informational forms, label it "OK".
-    $cancel_submit = function_exists($form_id . '_cancel') ? $form_id . '_cancel' : array($this, 'standardCancel');
-    $form['actions']['cancel'] = array(
+    $cancel_submit = function_exists($form_id . '_cancel') ? $form_id . '_cancel' : [$this, 'standardCancel'];
+    $form['actions']['cancel'] = [
       '#type' => 'submit',
       '#value' => !$form_state->get('ok_button') ? t('Cancel') : t('Ok'),
-      '#submit' => array($cancel_submit),
-      '#validate' => array(),
-      '#limit_validation_errors' => array(),
-    );
+      '#submit' => [$cancel_submit],
+      '#validate' => [],
+      '#limit_validation_errors' => [],
+    ];
 
     // Compatibility, to be removed later: // TODO: When is "later"?
     // We used to set these items on the form, but now we want them on the $form_state:
@@ -348,11 +348,11 @@ class ViewUI implements ViewEntityInterface {
    */
   public function getOverrideValues($form, FormStateInterface $form_state) {
     // Make sure the dropdown exists in the first place.
-    if ($form_state->hasValue(array('override', 'dropdown'))) {
+    if ($form_state->hasValue(['override', 'dropdown'])) {
       // #default_value is used to determine whether it was the default value or not.
       // So the available options are: $display, 'default' and 'default_revert', not 'defaults'.
       $was_defaulted = ($form['override']['dropdown']['#default_value'] === 'defaults');
-      $dropdown = $form_state->getValue(array('override', 'dropdown'));
+      $dropdown = $form_state->getValue(['override', 'dropdown']);
       $is_defaulted = ($dropdown === 'default');
       $revert = ($dropdown === 'default_revert');
 
@@ -369,7 +369,7 @@ class ViewUI implements ViewEntityInterface {
       $revert = FALSE;
     }
 
-    return array($was_defaulted, $is_defaulted, $revert);
+    return [$was_defaulted, $is_defaulted, $revert];
   }
 
   /**
@@ -383,10 +383,10 @@ class ViewUI implements ViewEntityInterface {
     Html::resetSeenIds();
 
     if (empty($this->stack)) {
-      $this->stack = array();
+      $this->stack = [];
     }
 
-    $stack = array(implode('-', array_filter(array($key, $this->id(), $display_id, $type, $id))), $key, $display_id, $type, $id);
+    $stack = [implode('-', array_filter([$key, $this->id(), $display_id, $type, $id])), $key, $display_id, $type, $id];
     // If we're being asked to add this form to the bottom of the stack, no
     // special logic is required. Our work is equally easy if we were asked to add
     // to the top of the stack, but there's nothing in it yet.
@@ -463,10 +463,10 @@ class ViewUI implements ViewEntityInterface {
         if (isset($types[$type]['type'])) {
           $key = $types[$type]['type'];
         }
-        $item = array(
+        $item = [
           'table' => $table,
           'field' => $field,
-        );
+        ];
         $handler = Views::handlerManager($key)->getHandler($item);
         if ($this->getExecutable()->displayHandlers->get('default')->useGroupBy() && $handler->usesGroupBy()) {
           $this->addFormToStack('handler-group', $display_id, $type, $id);
@@ -512,7 +512,7 @@ class ViewUI implements ViewEntityInterface {
     $this->additionalQueries = $queries;
   }
 
-  public function renderPreview($display_id, $args = array()) {
+  public function renderPreview($display_id, $args = []) {
     // Save the current path so it can be restored before returning from this function.
     $request_stack = \Drupal::requestStack();
     $current_request = $request_stack->getCurrentRequest();
@@ -531,7 +531,7 @@ class ViewUI implements ViewEntityInterface {
 
     $combined = $show_query && $show_stats;
 
-    $rows = array('query' => array(), 'statistics' => array());
+    $rows = ['query' => [], 'statistics' => []];
 
     $errors = $executable->validate();
     $executable->destroy();
@@ -545,7 +545,7 @@ class ViewUI implements ViewEntityInterface {
       // have some input in the query parameters, so we merge request() and
       // query() to ensure we get it all.
       $exposed_input = array_merge(\Drupal::request()->request->all(), \Drupal::request()->query->all());
-      foreach (array('view_name', 'view_display_id', 'view_args', 'view_path', 'view_dom_id', 'pager_element', 'view_base_path', AjaxResponseSubscriber::AJAX_REQUEST_PARAMETER, 'ajax_page_state', 'form_id', 'form_build_id', 'form_token') as $key) {
+      foreach (['view_name', 'view_display_id', 'view_args', 'view_path', 'view_dom_id', 'pager_element', 'view_base_path', AjaxResponseSubscriber::AJAX_REQUEST_PARAMETER, 'ajax_page_state', 'form_id', 'form_build_id', 'form_token'] as $key) {
         if (isset($exposed_input[$key])) {
           unset($exposed_input[$key]);
         }
@@ -554,7 +554,7 @@ class ViewUI implements ViewEntityInterface {
 
       if (!$executable->setDisplay($display_id)) {
         return [
-          '#markup' => t('Invalid display id @display', array('@display' => $display_id)),
+          '#markup' => t('Invalid display id @display', ['@display' => $display_id]),
         ];
       }
 
@@ -620,76 +620,76 @@ class ViewUI implements ViewEntityInterface {
           if ($show_query) {
             $query_string = $executable->build_info['query'];
             // Only the sql default class has a method getArguments.
-            $quoted = array();
+            $quoted = [];
 
             if ($executable->query instanceof Sql) {
               $quoted = $query_string->getArguments();
               $connection = Database::getConnection();
               foreach ($quoted as $key => $val) {
                 if (is_array($val)) {
-                  $quoted[$key] = implode(', ', array_map(array($connection, 'quote'), $val));
+                  $quoted[$key] = implode(', ', array_map([$connection, 'quote'], $val));
                 }
                 else {
                   $quoted[$key] = $connection->quote($val);
                 }
               }
             }
-            $rows['query'][] = array(
-              array(
-                'data' => array(
+            $rows['query'][] = [
+              [
+                'data' => [
                   '#type' => 'inline_template',
                   '#template' => "<strong>{% trans 'Query' %}</strong>",
-                ),
-              ),
-              array(
-                'data' => array(
+                ],
+              ],
+              [
+                'data' => [
                   '#type' => 'inline_template',
                   '#template' => '<pre>{{ query }}</pre>',
-                  '#context' => array('query' => strtr($query_string, $quoted)),
-                ),
-              ),
-            );
+                  '#context' => ['query' => strtr($query_string, $quoted)],
+                ],
+              ],
+            ];
             if (!empty($this->additionalQueries)) {
-              $queries[] = array(
+              $queries[] = [
                 '#prefix' => '<strong>',
                 '#markup' => t('These queries were run during view rendering:'),
                 '#suffix' => '</strong>',
-              );
+              ];
               foreach ($this->additionalQueries as $query) {
                 $query_string = strtr($query['query'], $query['args']);
-                $queries[] = array(
+                $queries[] = [
                   '#prefix' => "\n",
-                  '#markup' => t('[@time ms] @query', array('@time' => round($query['time'] * 100000, 1) / 100000.0, '@query' => $query_string)),
-                );
+                  '#markup' => t('[@time ms] @query', ['@time' => round($query['time'] * 100000, 1) / 100000.0, '@query' => $query_string]),
+                ];
               }
 
-              $rows['query'][] = array(
-                array(
-                  'data' => array(
+              $rows['query'][] = [
+                [
+                  'data' => [
                     '#type' => 'inline_template',
                     '#template' => "<strong>{% trans 'Other queries' %}</strong>",
-                  ),
-                ),
-                array(
-                  'data' => array(
+                  ],
+                ],
+                [
+                  'data' => [
                     '#prefix' => '<pre>',
                      'queries' => $queries,
                      '#suffix' => '</pre>',
-                    ),
-                ),
-              );
+                    ],
+                ],
+              ];
             }
           }
           if ($show_info) {
-            $rows['query'][] = array(
-              array(
-                'data' => array(
+            $rows['query'][] = [
+              [
+                'data' => [
                   '#type' => 'inline_template',
                   '#template' => "<strong>{% trans 'Title' %}</strong>",
-                ),
-              ),
+                ],
+              ],
               Xss::filterAdmin($executable->getTitle()),
-            );
+            ];
             if (isset($path)) {
               // @todo Views should expect and store a leading /. See:
               //   https://www.drupal.org/node/2423913
@@ -698,51 +698,51 @@ class ViewUI implements ViewEntityInterface {
             else {
               $path = t('This display has no path.');
             }
-            $rows['query'][] = array(
-              array(
-                'data' => array(
+            $rows['query'][] = [
+              [
+                'data' => [
                   '#prefix' => '<strong>',
                   '#markup' => t('Path'),
                   '#suffix' => '</strong>',
-                ),
-              ),
-              array(
-                'data' => array(
+                ],
+              ],
+              [
+                'data' => [
                   '#markup' => $path,
-                ),
-              )
-            );
+                ],
+              ]
+            ];
           }
           if ($show_stats) {
-            $rows['statistics'][] = array(
-              array(
-                'data' => array(
+            $rows['statistics'][] = [
+              [
+                'data' => [
                   '#type' => 'inline_template',
                   '#template' => "<strong>{% trans 'Query build time' %}</strong>",
-                ),
-              ),
-              t('@time ms', array('@time' => intval($executable->build_time * 100000) / 100)),
-            );
+                ],
+              ],
+              t('@time ms', ['@time' => intval($executable->build_time * 100000) / 100]),
+            ];
 
-            $rows['statistics'][] = array(
-              array(
-                'data' => array(
+            $rows['statistics'][] = [
+              [
+                'data' => [
                   '#type' => 'inline_template',
                   '#template' => "<strong>{% trans 'Query execute time' %}</strong>",
-                ),
-              ),
-              t('@time ms', array('@time' => intval($executable->execute_time * 100000) / 100)),
-            );
+                ],
+              ],
+              t('@time ms', ['@time' => intval($executable->execute_time * 100000) / 100]),
+            ];
 
-            $rows['statistics'][] = array(
-              array(
-                'data' => array(
+            $rows['statistics'][] = [
+              [
+                'data' => [
                   '#type' => 'inline_template',
                   '#template' => "<strong>{% trans 'View render time' %}</strong>",
-                ),
-              ),
-              t('@time ms', array('@time' => intval($this->render_time * 100) / 100)),
-            );
+                ],
+              ],
+              t('@time ms', ['@time' => intval($this->render_time * 100) / 100]),
+            ];
           }
           \Drupal::moduleHandler()->alter('views_preview_info', $rows, $executable);
         }
@@ -750,36 +750,36 @@ class ViewUI implements ViewEntityInterface {
           // No query was run. Display that information in place of either the
           // query or the performance statistics, whichever comes first.
           if ($combined || ($show_location === 'above')) {
-            $rows['query'][] = array(
-              array(
-                'data' => array(
+            $rows['query'][] = [
+              [
+                'data' => [
                   '#prefix' => '<strong>',
                   '#markup' => t('Query'),
                   '#suffix' => '</strong>',
-                ),
-              ),
-              array(
-                'data' => array(
+                ],
+              ],
+              [
+                'data' => [
                   '#markup' => t('No query was run'),
-                ),
-              ),
-            );
+                ],
+              ],
+            ];
           }
           else {
-            $rows['statistics'][] = array(
-              array(
-                'data' => array(
+            $rows['statistics'][] = [
+              [
+                'data' => [
                   '#prefix' => '<strong>',
                   '#markup' => t('Query'),
                   '#suffix' => '</strong>',
-                ),
-              ),
-              array(
-                'data' => array(
+                ],
+              ],
+              [
+                'data' => [
                   '#markup' => t('No query was run'),
-                ),
-              ),
-            );
+                ],
+              ],
+            ];
           }
         }
       }
@@ -795,12 +795,12 @@ class ViewUI implements ViewEntityInterface {
 
     // Assemble the preview, the query info, and the query statistics in the
     // requested order.
-    $table = array(
+    $table = [
       '#type' => 'table',
       '#prefix' => '<div class="views-query-info">',
       '#suffix' => '</div>',
       '#rows' => array_merge($rows['query'], $rows['statistics']),
-    );
+    ];
 
     if ($show_location == 'above') {
       $output = [
@@ -843,7 +843,7 @@ class ViewUI implements ViewEntityInterface {
       $current = reset($keys) + 1;
       $total = end($keys) + 1;
       if ($total > 1) {
-        $progress = array();
+        $progress = [];
         $progress['current'] = $current;
         $progress['total'] = $total;
       }
@@ -892,7 +892,7 @@ class ViewUI implements ViewEntityInterface {
    * Passes through all unknown calls onto the storage object.
    */
   public function __call($method, $args) {
-    return call_user_func_array(array($this->storage, $method), $args);
+    return call_user_func_array([$this->storage, $method], $args);
   }
 
   /**
@@ -968,7 +968,7 @@ class ViewUI implements ViewEntityInterface {
   /**
    * {@inheritdoc}
    */
-  public static function create(array $values = array()) {
+  public static function create(array $values = []) {
     return View::create($values);
   }
 
@@ -1167,7 +1167,7 @@ class ViewUI implements ViewEntityInterface {
   /**
    * {@inheritdoc}
    */
-  public function url($rel = 'edit-form', $options = array()) {
+  public function url($rel = 'edit-form', $options = []) {
     return $this->storage->url($rel, $options);
   }
 
diff --git a/web/core/modules/views_ui/templates/views-ui-view-displays-list.html.twig b/web/core/modules/views_ui/templates/views-ui-view-displays-list.html.twig
new file mode 100644
index 000000000..1c7d62100
--- /dev/null
+++ b/web/core/modules/views_ui/templates/views-ui-view-displays-list.html.twig
@@ -0,0 +1,24 @@
+{#
+/**
+ * @file
+ * Default theme implementation for views displays on the views listing page.
+ *
+ * Available variables:
+ * - displays: Contains multiple display instances. Each display contains:
+ *   - display: Display name.
+ *   - path: Path to display, if any.
+ *
+ * @ingroup themeable
+ */
+#}
+<ul>
+  {% for display in displays %}
+    <li>
+      {% if display.path %}
+        {{ display.display }} <span data-drupal-selector="views-table-filter-text-source">({{ display.path }})</span>
+      {% else %}
+        {{ display.display }}
+      {% endif %}
+    </li>
+  {% endfor %}
+</ul>
diff --git a/web/core/modules/views_ui/templates/views-ui-views-listing-table.html.twig b/web/core/modules/views_ui/templates/views-ui-views-listing-table.html.twig
new file mode 100644
index 000000000..207462e88
--- /dev/null
+++ b/web/core/modules/views_ui/templates/views-ui-views-listing-table.html.twig
@@ -0,0 +1,49 @@
+{#
+/**
+ * @file
+ * Default theme implementation for views listing table.
+ *
+ * Available variables:
+ * - headers: Contains table headers.
+ * - rows: Contains multiple rows. Each row contains:
+ *   - view_name: The human-readable name of the view.
+ *   - machine_name: Machine name of the view.
+ *   - description: The description of the view.
+ *   - displays: List of displays attached to the view.
+ *   - operations: List of available operations.
+ *
+ * @see template_preprocess_views_ui_views_listing_table()
+ *
+ * @ingroup themeable
+ */
+#}
+<table{{ attributes.addClass('responsive-enabled') }}>
+  <thead>
+    <tr>
+      {% for header in headers %}
+        <th{{ header.attributes }}>{{ header.data }}</th>
+      {% endfor %}
+    </tr>
+  </thead>
+  <tbody>
+    {% for row in rows %}
+      <tr{{ row.attributes }}>
+        <td class="views-ui-view-name">
+          <h3 data-drupal-selector="views-table-filter-text-source">{{ row.data.view_name.data }}</h3>
+        </td>
+        <td class="views-ui-view-machine-name" data-drupal-selector="views-table-filter-text-source">
+          {{ row.data.machine_name.data }}
+        </td>
+        <td class="views-ui-view-description" data-drupal-selector="views-table-filter-text-source">
+          {{ row.data.description.data }}
+        </td>
+        <td class="views-ui-view-displays">
+          {{ row.data.displays.data }}
+        </td>
+        <td class="views-ui-view-operations">
+          {{ row.data.operations.data }}
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
diff --git a/web/core/modules/views_ui/tests/modules/views_ui_test_field/views_ui_test_field.info.yml b/web/core/modules/views_ui/tests/modules/views_ui_test_field/views_ui_test_field.info.yml
new file mode 100644
index 000000000..2a4ed8dbe
--- /dev/null
+++ b/web/core/modules/views_ui/tests/modules/views_ui_test_field/views_ui_test_field.info.yml
@@ -0,0 +1,8 @@
+name: 'Views test field'
+type: module
+description: 'Add custom global field for testing purposes.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - views_ui
diff --git a/web/core/modules/views_ui/tests/modules/views_ui_test_field/views_ui_test_field.module b/web/core/modules/views_ui/tests/modules/views_ui_test_field/views_ui_test_field.module
new file mode 100644
index 000000000..3d1ac8f6f
--- /dev/null
+++ b/web/core/modules/views_ui/tests/modules/views_ui_test_field/views_ui_test_field.module
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @file
+ * ViewsUI Test field module.
+ */
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Implements hook_form_FORM_ID_alter() for views_ui_add_handler_form.
+ *
+ * Changes the label for one of the tests fields to validate this label is not
+ * searched on.
+ */
+function views_ui_test_field_form_views_ui_add_handler_form_alter(&$form, FormStateInterface $form_state) {
+  $form['options']['name']['#options']['views.views_test_field_1']['title']['data']['#title'] .= ' FIELD_1_LABEL';
+}
diff --git a/web/core/modules/views_ui/tests/modules/views_ui_test_field/views_ui_test_field.views.inc b/web/core/modules/views_ui/tests/modules/views_ui_test_field/views_ui_test_field.views.inc
new file mode 100644
index 000000000..9f3f49f86
--- /dev/null
+++ b/web/core/modules/views_ui/tests/modules/views_ui_test_field/views_ui_test_field.views.inc
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Provide views data for testing purposes.
+ */
+
+/**
+ * Implements hook_views_data().
+ */
+function views_ui_test_field_views_data() {
+
+  $data['views']['views_test_field_1'] = [
+    'title' => t('Views test field 1 - FIELD_1_TITLE'),
+    'help' => t('Field 1 for testing purposes - FIELD_1_DESCRIPTION'),
+    'field' => [
+      'id' => 'views_test_field_1',
+    ],
+  ];
+  $data['views']['views_test_field_2'] = [
+    'title' => t('Views test field 2 - FIELD_2_TITLE'),
+    'help' => t('Field 2 for testing purposes - FIELD_2_DESCRIPTION'),
+    'field' => [
+      'id' => 'views_test_field_2',
+    ],
+  ];
+
+  return $data;
+}
diff --git a/web/core/modules/views_ui/tests/src/FunctionalJavascript/FilterOptionsTest.php b/web/core/modules/views_ui/tests/src/FunctionalJavascript/FilterOptionsTest.php
new file mode 100644
index 000000000..32b1a400c
--- /dev/null
+++ b/web/core/modules/views_ui/tests/src/FunctionalJavascript/FilterOptionsTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Drupal\Tests\views_ui\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+
+/**
+ * Tests the JavaScript filtering of options in add handler form.
+ *
+ * @group views_ui
+ */
+class FilterOptionsTest extends JavascriptTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'views', 'views_ui', 'views_ui_test_field'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    $admin_user = $this->drupalCreateUser([
+      'administer views',
+    ]);
+    $this->drupalLogin($admin_user);
+  }
+
+  /**
+   * Tests filtering options in the 'Add fields' dialog.
+   */
+  public function testFilterOptionsAddFields() {
+    $this->drupalGet('admin/structure/views/view/content');
+
+    $session = $this->getSession();
+    $web_assert = $this->assertSession();
+    $page = $session->getPage();
+
+    // Open the dialog.
+    $page->clickLink('views-add-field');
+
+    // Wait for the popup to open and the search field to be available.
+    $options_search = $web_assert->waitForField('override[controls][options_search]');
+
+    // Test that the both special fields are visible.
+    $this->assertTrue($page->findField('name[views.views_test_field_1]')->isVisible());
+    $this->assertTrue($page->findField('name[views.views_test_field_2]')->isVisible());
+
+    // Test the ".title" field in search.
+    $options_search->setValue('FIELD_1_TITLE');
+    $page->waitFor(10, function () use ($page) {
+      return !$page->findField('name[views.views_test_field_2]')->isVisible();
+    });
+    $this->assertTrue($page->findField('name[views.views_test_field_1]')->isVisible());
+    $this->assertFalse($page->findField('name[views.views_test_field_2]')->isVisible());
+
+    // Test the ".description" field in search.
+    $options_search->setValue('FIELD_2_DESCRIPTION');
+    $page->waitFor(10, function () use ($page) {
+      return !$page->findField('name[views.views_test_field_1]')->isVisible();
+    });
+    $this->assertTrue($page->findField('name[views.views_test_field_2]')->isVisible());
+    $this->assertFalse($page->findField('name[views.views_test_field_1]')->isVisible());
+
+    // Test the "label" field not in search.
+    $options_search->setValue('FIELD_1_LABEL');
+    $page->waitFor(10, function () use ($page) {
+      return !$page->findField('name[views.views_test_field_2]')->isVisible();
+    });
+    $this->assertFalse($page->findField('name[views.views_test_field_2]')->isVisible());
+    $this->assertFalse($page->findField('name[views.views_test_field_1]')->isVisible());
+  }
+
+}
diff --git a/web/core/modules/views_ui/tests/src/Kernel/TagTest.php b/web/core/modules/views_ui/tests/src/Kernel/TagTest.php
index fda2e2852..e63bf228f 100644
--- a/web/core/modules/views_ui/tests/src/Kernel/TagTest.php
+++ b/web/core/modules/views_ui/tests/src/Kernel/TagTest.php
@@ -19,7 +19,7 @@ class TagTest extends ViewsKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('views', 'views_ui', 'user');
+  public static $modules = ['views', 'views_ui', 'user'];
 
   /**
    * Tests the views_ui_autocomplete_tag function.
@@ -28,15 +28,15 @@ class TagTest extends ViewsKernelTestBase {
     \Drupal::moduleHandler()->loadInclude('views_ui', 'inc', 'admin');
 
     // Save 15 views with a tag.
-    $tags = array();
+    $tags = [];
     for ($i = 0; $i < 16; $i++) {
       $suffix = $i % 2 ? 'odd' : 'even';
       $tag = 'autocomplete_tag_test_' . $suffix . $this->randomMachineName();
       $tags[] = $tag;
-      View::create(array('tag' => $tag, 'id' => $this->randomMachineName()))->save();
+      View::create(['tag' => $tag, 'id' => $this->randomMachineName()])->save();
     }
 
-    // Make sure just ten results are returns.
+    // Make sure just ten results are returned.
     $controller = ViewsUIController::create($this->container);
     $request = $this->container->get('request_stack')->getCurrentRequest();
     $request->query->set('q', 'autocomplete_tag_test');
@@ -46,7 +46,7 @@ class TagTest extends ViewsKernelTestBase {
 
     // Make sure the returned array has the proper format.
     $suggestions = array_map(function ($tag) {
-      return array('value' => $tag, 'label' => Html::escape($tag));
+      return ['value' => $tag, 'label' => Html::escape($tag)];
     }, $tags);
     foreach ($matches as $match) {
       $this->assertTrue(in_array($match, $suggestions), 'Make sure the returned array has the proper format.');
@@ -59,7 +59,7 @@ class TagTest extends ViewsKernelTestBase {
     $matches = (array) json_decode($result->getContent(), TRUE);
     $this->assertEqual(count($matches), 8, 'Make sure that only a subset is returned.');
     foreach ($matches as $tag) {
-      $this->assertTrue(array_search($tag['value'], $tags) !== FALSE, format_string('Make sure the returned tag @tag actually exists.', array('@tag' => $tag['value'])));
+      $this->assertTrue(array_search($tag['value'], $tags) !== FALSE, format_string('Make sure the returned tag @tag actually exists.', ['@tag' => $tag['value']]));
     }
 
     // Make sure an invalid result doesn't return anything.
diff --git a/web/core/modules/views_ui/tests/src/Unit/Form/Ajax/RearrangeFilterTest.php b/web/core/modules/views_ui/tests/src/Unit/Form/Ajax/RearrangeFilterTest.php
index bb8eb7739..b2d3f96ab 100644
--- a/web/core/modules/views_ui/tests/src/Unit/Form/Ajax/RearrangeFilterTest.php
+++ b/web/core/modules/views_ui/tests/src/Unit/Form/Ajax/RearrangeFilterTest.php
@@ -17,8 +17,8 @@ class RearrangeFilterTest extends UnitTestCase {
    */
   public function testStaticMethods() {
     // Test the RearrangeFilter::arrayKeyPlus method.
-    $original = array(0 => 'one', 1 => 'two', 2 => 'three');
-    $expected = array(1 => 'one', 2 => 'two', 3 => 'three');
+    $original = [0 => 'one', 1 => 'two', 2 => 'three'];
+    $expected = [1 => 'one', 2 => 'two', 3 => 'three'];
     $this->assertSame(RearrangeFilter::arrayKeyPlus($original), $expected);
   }
 
diff --git a/web/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php b/web/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
index 215728cd5..23cc7a8e6 100644
--- a/web/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
+++ b/web/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
@@ -38,54 +38,54 @@ class ViewListBuilderTest extends UnitTestCase {
 
     $display_manager->expects($this->any())
       ->method('getDefinition')
-      ->will($this->returnValueMap(array(
-        array(
+      ->will($this->returnValueMap([
+        [
           'default',
           TRUE,
-          array(
+          [
             'id' => 'default',
             'title' => 'Master',
             'theme' => 'views_view',
             'no_ui' => TRUE,
             'admin' => '',
-          )
-        ),
-        array(
+          ]
+        ],
+        [
           'page',
           TRUE,
-          array(
+          [
             'id' => 'page',
             'title' => 'Page',
             'uses_menu_links' => TRUE,
             'uses_route' => TRUE,
-            'contextual_links_locations' => array('page'),
+            'contextual_links_locations' => ['page'],
             'theme' => 'views_view',
             'admin' => 'Page admin label',
-          )
-        ),
-        array(
+          ]
+        ],
+        [
           'embed',
           TRUE,
-          array(
+          [
             'id' => 'embed',
             'title' => 'embed',
             'theme' => 'views_view',
             'admin' => 'Embed admin label',
-          )
-        ),
-      )));
+          ]
+        ],
+      ]));
 
 
     $default_display = $this->getMock('Drupal\views\Plugin\views\display\DefaultDisplay',
-      array('initDisplay'),
-      array(array(), 'default', $display_manager->getDefinition('default'))
+      ['initDisplay'],
+      [[], 'default', $display_manager->getDefinition('default')]
     );
     $route_provider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
     $state = $this->getMock('\Drupal\Core\State\StateInterface');
     $menu_storage = $this->getMock('\Drupal\Core\Entity\EntityStorageInterface');
     $page_display = $this->getMock('Drupal\views\Plugin\views\display\Page',
-      array('initDisplay', 'getPath'),
-      array(array(), 'default', $display_manager->getDefinition('page'), $route_provider, $state, $menu_storage)
+      ['initDisplay', 'getPath'],
+      [[], 'default', $display_manager->getDefinition('page'), $route_provider, $state, $menu_storage]
     );
     $page_display->expects($this->any())
       ->method('getPath')
@@ -94,11 +94,11 @@ class ViewListBuilderTest extends UnitTestCase {
         $this->returnValue('<object>malformed_path</object>'),
         $this->returnValue('<script>alert("placeholder_page/%")</script>')));
 
-    $embed_display = $this->getMock('Drupal\views\Plugin\views\display\Embed', array('initDisplay'),
-      array(array(), 'default', $display_manager->getDefinition('embed'))
+    $embed_display = $this->getMock('Drupal\views\Plugin\views\display\Embed', ['initDisplay'],
+      [[], 'default', $display_manager->getDefinition('embed')]
     );
 
-    $values = array();
+    $values = [];
     $values['status'] = FALSE;
     $values['display']['default']['id'] = 'default';
     $values['display']['default']['display_title'] = 'Display';
@@ -125,13 +125,13 @@ class ViewListBuilderTest extends UnitTestCase {
 
     $display_manager->expects($this->any())
       ->method('createInstance')
-      ->will($this->returnValueMap(array(
-        array('default', $values['display']['default'], $default_display),
-        array('page', $values['display']['page_1'], $page_display),
-        array('page', $values['display']['page_2'], $page_display),
-        array('page', $values['display']['page_3'], $page_display),
-        array('embed', $values['display']['embed'], $embed_display),
-      )));
+      ->will($this->returnValueMap([
+        ['default', $values['display']['default'], $default_display],
+        ['page', $values['display']['page_1'], $page_display],
+        ['page', $values['display']['page_2'], $page_display],
+        ['page', $values['display']['page_3'], $page_display],
+        ['embed', $values['display']['embed'], $embed_display],
+      ]));
 
     $container = new ContainerBuilder();
     $user = $this->getMock('Drupal\Core\Session\AccountInterface');
@@ -152,21 +152,34 @@ class ViewListBuilderTest extends UnitTestCase {
     $view_list_builder = new TestViewListBuilder($entity_type, $storage, $display_manager);
     $view_list_builder->setStringTranslation($this->getStringTranslationStub());
 
+    // Create new view with test values.
     $view = new View($values, 'view');
 
+    // Get the row object created by ViewListBuilder for this test view.
     $row = $view_list_builder->buildRow($view);
 
-    $expected_displays = array(
-      'Embed admin label',
-      'Page admin label',
-      'Page admin label',
-      'Page admin label',
-    );
-    $this->assertEquals($expected_displays, $row['data']['view_name']['data']['#displays']);
+    // Expected output array for view's displays.
+    $expected_displays = [
+      '0' => [
+        'display' => 'Embed admin label',
+        'path' => FALSE,
+      ],
+      '1' => [
+        'display' => 'Page admin label',
+        'path' => '/<object>malformed_path</object>',
+      ],
+      '2' => [
+        'display' => 'Page admin label',
+        'path' => '/<script>alert("placeholder_page/%")</script>',
+      ],
+      '3' => [
+        'display' => 'Page admin label',
+        'path' => '/test_page',
+      ],
+    ];
 
-    $display_paths = $row['data']['path']['data']['#items'];
-    // These values will be escaped by Twig when rendered.
-    $this->assertEquals('/test_page, /<object>malformed_path</object>, /<script>alert("placeholder_page/%")</script>', implode(', ', $display_paths));
+    // Compare the expected and generated output.
+    $this->assertEquals($expected_displays, $row['data']['displays']['data']['#displays']);
   }
 
 }
@@ -174,7 +187,7 @@ class ViewListBuilderTest extends UnitTestCase {
 class TestViewListBuilder extends ViewListBuilder {
 
   public function buildOperations(EntityInterface $entity) {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php b/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php
index 293bfebea..f49b25a9f 100644
--- a/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php
+++ b/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php
@@ -18,14 +18,14 @@ class ViewUIObjectTest extends UnitTestCase {
    * Tests entity method decoration.
    */
   public function testEntityDecoration() {
-    $method_args = array();
-    $method_args['setOriginalId'] = array(12);
-    $method_args['setStatus'] = array(TRUE);
-    $method_args['enforceIsNew'] = array(FALSE);
-    $method_args['label'] = array(LanguageInterface::LANGCODE_NOT_SPECIFIED);
+    $method_args = [];
+    $method_args['setOriginalId'] = [12];
+    $method_args['setStatus'] = [TRUE];
+    $method_args['enforceIsNew'] = [FALSE];
+    $method_args['label'] = [LanguageInterface::LANGCODE_NOT_SPECIFIED];
 
     $reflection = new \ReflectionClass('Drupal\Core\Config\Entity\ConfigEntityInterface');
-    $interface_methods = array();
+    $interface_methods = [];
     foreach ($reflection->getMethods() as $reflection_method) {
       $interface_methods[] = $reflection_method->getName();
 
@@ -38,15 +38,15 @@ class ViewUIObjectTest extends UnitTestCase {
       // dependency management.
       if (!in_array($reflection_method->getName(), ['isNew', 'isSyncing', 'isUninstalling', 'getConfigDependencyKey', 'getConfigDependencyName', 'calculateDependencies'])) {
         if (count($reflection_method->getParameters()) == 0) {
-          $method_args[$reflection_method->getName()] = array();
+          $method_args[$reflection_method->getName()] = [];
         }
       }
     }
 
-    $storage = $this->getMock('Drupal\views\Entity\View', $interface_methods, array(array(), 'view'));
+    $storage = $this->getMock('Drupal\views\Entity\View', $interface_methods, [[], 'view']);
     $executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
-      ->setConstructorArgs(array($storage))
+      ->setConstructorArgs([$storage])
       ->getMock();
     $storage->set('executable', $executable);
 
@@ -58,7 +58,7 @@ class ViewUIObjectTest extends UnitTestCase {
       foreach ($args as $arg) {
         $method_mock->with($this->equalTo($arg));
       }
-      call_user_func_array(array($view_ui, $method), $args);
+      call_user_func_array([$view_ui, $method], $args);
     }
 
     $storage->expects($this->once())
@@ -70,10 +70,10 @@ class ViewUIObjectTest extends UnitTestCase {
    * Tests the isLocked method.
    */
   public function testIsLocked() {
-    $storage = $this->getMock('Drupal\views\Entity\View', array(), array(array(), 'view'));
+    $storage = $this->getMock('Drupal\views\Entity\View', [], [[], 'view']);
     $executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
-      ->setConstructorArgs(array($storage))
+      ->setConstructorArgs([$storage])
       ->getMock();
     $storage->set('executable', $executable);
     $account = $this->getMock('Drupal\Core\Session\AccountInterface');
@@ -91,20 +91,20 @@ class ViewUIObjectTest extends UnitTestCase {
     $this->assertFalse($view_ui->isLocked());
 
     // Set the lock object with a different owner than the mocked account above.
-    $lock = (object) array(
+    $lock = (object) [
       'owner' => 2,
-      'data' => array(),
+      'data' => [],
       'updated' => (int) $_SERVER['REQUEST_TIME'],
-    );
+    ];
     $view_ui->lock = $lock;
     $this->assertTrue($view_ui->isLocked());
 
     // Set a different lock object with the same object as the mocked account.
-    $lock = (object) array(
+    $lock = (object) [
       'owner' => 1,
-      'data' => array(),
+      'data' => [],
       'updated' => (int) $_SERVER['REQUEST_TIME'],
-    );
+    ];
     $view_ui->lock = $lock;
     $this->assertFalse($view_ui->isLocked());
   }
diff --git a/web/core/modules/views_ui/views_ui.module b/web/core/modules/views_ui/views_ui.module
index b51d2bbf1..15f85e3a0 100644
--- a/web/core/modules/views_ui/views_ui.module
+++ b/web/core/modules/views_ui/views_ui.module
@@ -19,15 +19,15 @@ function views_ui_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.views_ui':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Views UI module provides an interface for managing views for the <a href=":views">Views module</a>. For more information, see the <a href=":handbook">online documentation for the Views UI module</a>.', array(':views' => \Drupal::url('help.page', array('name' => 'views')), ':handbook' => 'https://www.drupal.org/documentation/modules/views_ui')) . '</p>';
+      $output .= '<p>' . t('The Views UI module provides an interface for managing views for the <a href=":views">Views module</a>. For more information, see the <a href=":handbook">online documentation for the Views UI module</a>.', [':views' => \Drupal::url('help.page', ['name' => 'views']), ':handbook' => 'https://www.drupal.org/documentation/modules/views_ui']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Creating and managing views') . '</dt>';
-      $output .= '<dd>' . t('Views can be created from the <a href=":list">Views list page</a> by using the "Add view" action. Existing views can be managed from the <a href=":list">Views list page</a> by locating the view in the "Enabled" or "Disabled" list and selecting the desired operation action, for example "Edit".', array(':list' => \Drupal::url('entity.view.collection', array('name' => 'views_ui')))) . '</dd>';
+      $output .= '<dd>' . t('Views can be created from the <a href=":list">Views list page</a> by using the "Add view" action. Existing views can be managed from the <a href=":list">Views list page</a> by locating the view in the "Enabled" or "Disabled" list and selecting the desired operation action, for example "Edit".', [':list' => \Drupal::url('entity.view.collection', ['name' => 'views_ui'])]) . '</dd>';
       $output .= '<dt>' . t('Enabling and disabling views') . '<dt>';
-      $output .= '<dd>' . t('Views can be enabled or disabled from the <a href=":list">Views list page</a>. To enable a view, find the view within the "Disabled" list and select the "Enable" operation. To disable a view find the view within the "Enabled" list and select the "Disable" operation.', array(':list' => \Drupal::url('entity.view.collection', array('name' => 'views_ui')))) . '</dd>';
+      $output .= '<dd>' . t('Views can be enabled or disabled from the <a href=":list">Views list page</a>. To enable a view, find the view within the "Disabled" list and select the "Enable" operation. To disable a view find the view within the "Enabled" list and select the "Disable" operation.', [':list' => \Drupal::url('entity.view.collection', ['name' => 'views_ui'])]) . '</dd>';
       $output .= '<dt>' . t('Exporting and importing views') . '</dt>';
-      $output .= '<dd>' . t('Views can be exported and imported as configuration files by using the <a href=":config">Configuration Manager module</a>.', array(':config' => (\Drupal::moduleHandler()->moduleExists('config')) ? \Drupal::url('help.page', array('name' => 'config')) : '#')) . '</dd>';
+      $output .= '<dd>' . t('Views can be exported and imported as configuration files by using the <a href=":config">Configuration Manager module</a>.', [':config' => (\Drupal::moduleHandler()->moduleExists('config')) ? \Drupal::url('help.page', ['name' => 'config']) : '#']) . '</dd>';
       $output .= '</dl>';
       return $output;
   }
@@ -61,56 +61,69 @@ function views_ui_entity_type_build(array &$entity_types) {
  * Implements hook_theme().
  */
 function views_ui_theme() {
-  return array(
+  return [
     // edit a view
-    'views_ui_display_tab_setting' => array(
-      'variables' => array('description' => '', 'link' => '', 'settings_links' => array(), 'overridden' => FALSE, 'defaulted' => FALSE, 'description_separator' => TRUE, 'class' => array()),
+    'views_ui_display_tab_setting' => [
+      'variables' => ['description' => '', 'link' => '', 'settings_links' => [], 'overridden' => FALSE, 'defaulted' => FALSE, 'description_separator' => TRUE, 'class' => []],
       'file' => 'views_ui.theme.inc',
-    ),
-    'views_ui_display_tab_bucket' => array(
+    ],
+    'views_ui_display_tab_bucket' => [
       'render element' => 'element',
       'file' => 'views_ui.theme.inc',
-    ),
-    'views_ui_rearrange_filter_form' => array(
+    ],
+    'views_ui_rearrange_filter_form' => [
       'render element' => 'form',
       'file' => 'views_ui.theme.inc',
-    ),
-    'views_ui_expose_filter_form' => array(
+    ],
+    'views_ui_expose_filter_form' => [
       'render element' => 'form',
       'file' => 'views_ui.theme.inc',
-    ),
+    ],
 
-    // list views
-    'views_ui_view_info' => array(
-      'variables' => array('view' => NULL, 'displays' => NULL),
+    // Legacy theme hook for displaying views info.
+    'views_ui_view_info' => [
+      'variables' => ['view' => NULL, 'displays' => NULL],
       'file' => 'views_ui.theme.inc',
-    ),
+    ],
+
+    // List views.
+    'views_ui_views_listing_table' => [
+      'variables' => [
+        'headers' => NULL,
+        'rows' => NULL,
+        'attributes' => [],
+      ],
+      'file' => 'views_ui.theme.inc',
+    ],
+    'views_ui_view_displays_list' => [
+      'variables' => ['displays' => []],
+    ],
 
     // Group of filters.
-    'views_ui_build_group_filter_form' => array(
+    'views_ui_build_group_filter_form' => [
       'render element' => 'form',
       'file' => 'views_ui.theme.inc',
-    ),
+    ],
 
     // On behalf of a plugin
-    'views_ui_style_plugin_table' => array(
+    'views_ui_style_plugin_table' => [
       'render element' => 'form',
       'file' => 'views_ui.theme.inc',
-    ),
+    ],
 
     // When previewing a view.
-    'views_ui_view_preview_section' => array(
-      'variables' => array('view' => NULL, 'section' => NULL, 'content' => NULL, 'links' => ''),
+    'views_ui_view_preview_section' => [
+      'variables' => ['view' => NULL, 'section' => NULL, 'content' => NULL, 'links' => ''],
       'file' => 'views_ui.theme.inc',
-    ),
+    ],
 
     // Generic container wrapper, to use instead of theme_container when an id
     // is not desired.
-    'views_ui_container' => array(
-      'variables' => array('children' => NULL, 'attributes' => array()),
+    'views_ui_container' => [
+      'variables' => ['children' => NULL, 'attributes' => []],
       'file' => 'views_ui.theme.inc',
-    ),
-  );
+    ],
+  ];
 }
 
 /**
@@ -128,16 +141,16 @@ function views_ui_preprocess_views_view(&$variables) {
 
   if (!empty($view->live_preview) && \Drupal::moduleHandler()->moduleExists('contextual')) {
     $view->setShowAdminLinks(FALSE);
-    foreach (array('title', 'header', 'exposed', 'rows', 'pager', 'more', 'footer', 'empty', 'attachment_after', 'attachment_before') as $section) {
+    foreach (['title', 'header', 'exposed', 'rows', 'pager', 'more', 'footer', 'empty', 'attachment_after', 'attachment_before'] as $section) {
       if (!empty($variables[$section])) {
-        $variables[$section] = array(
+        $variables[$section] = [
           '#theme' => 'views_ui_view_preview_section',
           '#view' => $view,
           '#section' => $section,
           '#content' => $variables[$section],
-          '#theme_wrappers' => array('views_ui_container'),
-          '#attributes' => array('class' => array('contextual-region')),
-        );
+          '#theme_wrappers' => ['views_ui_container'],
+          '#attributes' => ['class' => ['contextual-region']],
+        ];
       }
     }
   }
@@ -156,28 +169,28 @@ function views_ui_preprocess_views_view(&$variables) {
 function views_ui_view_preview_section_handler_links(ViewExecutable $view, $type, $title = FALSE) {
   $display = $view->display_handler->display;
   $handlers = $view->display_handler->getHandlers($type);
-  $links = array();
+  $links = [];
 
   $types = ViewExecutable::getHandlerTypes();
   if ($title) {
-    $links[$type . '-title'] = array(
+    $links[$type . '-title'] = [
       'title' => $types[$type]['title'],
-    );
+    ];
   }
 
   foreach ($handlers as $id => $handler) {
     $field_name = $handler->adminLabel(TRUE);
-    $links[$type . '-edit-' . $id] = array(
-      'title' => t('Edit @section', array('@section' => $field_name)),
+    $links[$type . '-edit-' . $id] = [
+      'title' => t('Edit @section', ['@section' => $field_name]),
       'url' => Url::fromRoute('views_ui.form_handler', ['js' => 'nojs', 'view' => $view->storage->id(), 'display_id' => $display['id'], 'type' => $type, 'id' => $id]),
-      'attributes' => array('class' => array('views-ajax-link')),
-    );
+      'attributes' => ['class' => ['views-ajax-link']],
+    ];
   }
-  $links[$type . '-add'] = array(
+  $links[$type . '-add'] = [
     'title' => t('Add new'),
     'url' => Url::fromRoute('views_ui.form_add_handler', ['js' => 'nojs', 'view' => $view->storage->id(), 'display_id' => $display['id'], 'type' => $type]),
-    'attributes' => array('class' => array('views-ajax-link')),
-  );
+    'attributes' => ['class' => ['views-ajax-link']],
+  ];
 
   return $links;
 }
@@ -187,13 +200,13 @@ function views_ui_view_preview_section_handler_links(ViewExecutable $view, $type
  */
 function views_ui_view_preview_section_display_category_links(ViewExecutable $view, $type, $title) {
   $display = $view->display_handler->display;
-  $links = array(
-    $type . '-edit' => array(
-      'title' => t('Edit @section', array('@section' => $title)),
+  $links = [
+    $type . '-edit' => [
+      'title' => t('Edit @section', ['@section' => $title]),
       'url' => Url::fromRoute('views_ui.form_display', ['js' => 'nojs', 'view' => $view->storage->id(), 'display_id' => $display['id'], 'type' => $type]),
-      'attributes' => array('class' => array('views-ajax-link')),
-    ),
-  );
+      'attributes' => ['class' => ['views-ajax-link']],
+    ],
+  ];
 
   return $links;
 }
@@ -202,7 +215,7 @@ function views_ui_view_preview_section_display_category_links(ViewExecutable $vi
  * Returns all contextual links for the main content part of the view.
  */
 function views_ui_view_preview_section_rows_links(ViewExecutable $view) {
-  $links = array();
+  $links = [];
   $links = array_merge($links, views_ui_view_preview_section_handler_links($view, 'filter', TRUE));
   $links = array_merge($links, views_ui_view_preview_section_handler_links($view, 'field', TRUE));
   $links = array_merge($links, views_ui_view_preview_section_handler_links($view, 'sort', TRUE));
@@ -220,10 +233,10 @@ function views_ui_views_plugins_display_alter(&$plugins) {
   // paths underneath "admin/structure/views/view/{$view->id()}" (i.e., paths
   // for editing and performing other contextual actions on the view).
   foreach ($plugins as &$display) {
-    $display['contextual links']['entity.view.edit_form'] = array(
+    $display['contextual links']['entity.view.edit_form'] = [
       'route_name' => 'entity.view.edit_form',
-      'route_parameters_names' => array('view' => 'id'),
-    );
+      'route_parameters_names' => ['view' => 'id'],
+    ];
   }
 }
 
@@ -234,7 +247,7 @@ function views_ui_contextual_links_view_alter(&$element, $items) {
   // Remove contextual links from being rendered, when so desired, such as
   // within a View preview.
   if (views_ui_contextual_links_suppress()) {
-    $element['#links'] = array();
+    $element['#links'] = [];
   }
   // Append the display ID to the Views UI edit links, so that clicking on the
   // contextual link takes you directly to the correct display tab on the edit
@@ -292,7 +305,7 @@ function views_ui_contextual_links_suppress_pop() {
  * node.views.inc as well.
  */
 function views_ui_views_analyze(ViewExecutable $view) {
-  $ret = array();
+  $ret = [];
   // Check for something other than the default display:
   if (count($view->displayHandlers) < 2) {
     $ret[] = Analyzer::formatMessage(t('This view has only a default display and therefore will not be placed anywhere on your site; perhaps you want to add a page or a block display.'), 'warning');
@@ -307,7 +320,7 @@ function views_ui_views_analyze(ViewExecutable $view) {
     if ($display->hasPath() && $path = $display->getOption('path')) {
       $normal_path = \Drupal::service('path.alias_manager')->getPathByAlias($path);
       if ($path != $normal_path) {
-        $ret[] = Analyzer::formatMessage(t('You have configured display %display with a path which is an path alias as well. This might lead to unwanted effects so better use an internal path.', array('%display' => $display->display['display_title'])), 'warning');
+        $ret[] = Analyzer::formatMessage(t('You have configured display %display with a path which is an path alias as well. This might lead to unwanted effects so better use an internal path.', ['%display' => $display->display['display_title']]), 'warning');
       }
     }
   }
diff --git a/web/core/modules/views_ui/views_ui.theme.inc b/web/core/modules/views_ui/views_ui.theme.inc
index 3b5867894..e6ef8756f 100644
--- a/web/core/modules/views_ui/views_ui.theme.inc
+++ b/web/core/modules/views_ui/views_ui.theme.inc
@@ -11,6 +11,7 @@ use Drupal\Core\Render\Element;
 use Drupal\Core\Render\Element\Checkboxes;
 use Drupal\Core\Render\Element\Radios;
 use Drupal\Core\Url;
+use Drupal\Core\Template\Attribute;
 
 /**
  * Prepares variables for Views UI display tab setting templates.
@@ -42,6 +43,31 @@ function template_preprocess_views_ui_display_tab_setting(&$variables) {
   }
 }
 
+/**
+ * Prepares variables for Views UI view listing templates.
+ *
+ * Default template: views-ui-view-listing-table.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - headers: An associative array containing the headers for the view
+ *     listing table.
+ *   - rows: An associative array containing the rows data for the view
+ *     listing table.
+ */
+function template_preprocess_views_ui_views_listing_table(&$variables) {
+  // Convert the attributes to valid attribute objects.
+  foreach ($variables['headers'] as $key => $header) {
+    $variables['headers'][$key]['attributes'] = new Attribute($header['#attributes']);
+  }
+
+  if (!empty($variables['rows'])) {
+    foreach ($variables['rows'] as $key => $row) {
+      $variables['rows'][$key]['attributes'] = new Attribute($row['#attributes']);
+    }
+  }
+}
+
 /**
  * Prepares variables for Views UI display tab bucket templates.
  *
@@ -63,7 +89,7 @@ function template_preprocess_views_ui_display_tab_bucket(&$variables) {
   $variables['overridden'] = isset($element['#overridden']) ? $element['#overridden'] : NULL;
   $variables['content'] = $element['#children'];
   $variables['title'] = $element['#title'];
-  $variables['actions'] = !empty($element['#actions']) ? $element['#actions'] : array();
+  $variables['actions'] = !empty($element['#actions']) ? $element['#actions'] : [];
 }
 
 /**
@@ -79,14 +105,14 @@ function template_preprocess_views_ui_build_group_filter_form(&$variables) {
   $form = $variables['form'];
 
   // Prepare table of options.
-  $header = array(
+  $header = [
     t('Default'),
     t('Weight'),
     t('Label'),
     t('Operator'),
     t('Value'),
     t('Operations'),
-  );
+  ];
 
   // Prepare default selectors.
   $form_state = new FormState();
@@ -94,15 +120,15 @@ function template_preprocess_views_ui_build_group_filter_form(&$variables) {
   $form['default_group_multiple'] = Checkboxes::processCheckboxes($form['default_group_multiple'], $form_state, $form);
   $form['default_group']['All']['#title'] = '';
 
-  $rows[] = array(
+  $rows[] = [
     ['data' => $form['default_group']['All']],
     '',
-    array(
+    [
       'data' => \Drupal::config('views.settings')->get('ui.exposed_filter_any_label') == 'old_any' ? t('&lt;Any&gt;') : t('- Any -'),
       'colspan' => 4,
-      'class' => array('class' => 'any-default-radios-row'),
-    ),
-  );
+      'class' => ['class' => 'any-default-radios-row'],
+    ],
+  ];
   // Remove the 'All' default_group form element because it's added to the
   // table row.
   unset($variables['form']['default_group']['All']);
@@ -135,32 +161,32 @@ function template_preprocess_views_ui_build_group_filter_form(&$variables) {
       '#title' => SafeMarkup::format('<span>@text</span>', ['@text' => t('Remove')]),
     ];
     $remove = [$form['group_items'][$group_id]['remove'], $link];
-    $data = array(
+    $data = [
       'default' => ['data' => $default],
       'weight' => ['data' => $form['group_items'][$group_id]['weight']],
       'title' => ['data' => $form['group_items'][$group_id]['title']],
       'operator' => ['data' => $form['group_items'][$group_id]['operator']],
       'value' => ['data' => $form['group_items'][$group_id]['value']],
       'remove' => ['data' => $remove],
-    );
-    $rows[] = array('data' => $data, 'id' => 'views-row-' . $group_id, 'class' => array('draggable'));
+    ];
+    $rows[] = ['data' => $data, 'id' => 'views-row-' . $group_id, 'class' => ['draggable']];
   }
-  $variables['table'] = array(
+  $variables['table'] = [
     '#type' => 'table',
     '#header' => $header,
     '#rows' => $rows,
-    '#attributes' => array(
-      'class' => array('views-filter-groups'),
+    '#attributes' => [
+      'class' => ['views-filter-groups'],
       'id' => 'views-filter-groups',
-    ),
-    '#tabledrag' => array(
-      array(
+    ],
+    '#tabledrag' => [
+      [
         'action' => 'order',
         'relationship' => 'sibling',
         'group' => 'weight',
-      )
-    ),
-  );
+      ]
+    ],
+  ];
 
   // Hide fields used in table.
   unset($variables['form']['group_items']);
@@ -177,7 +203,7 @@ function template_preprocess_views_ui_build_group_filter_form(&$variables) {
  */
 function template_preprocess_views_ui_rearrange_filter_form(&$variables) {
   $form = &$variables['form'];
-  $rows = $ungroupable_rows = array();
+  $rows = $ungroupable_rows = [];
   // Enable grouping only if > 1 group.
   $variables['grouping'] = count(array_keys($form['#group_options'])) > 1;
 
@@ -186,41 +212,41 @@ function template_preprocess_views_ui_rearrange_filter_form(&$variables) {
     if ($group_id !== 'ungroupable') {
       // Set up tabledrag so that it changes the group dropdown when rows are
       // dragged between groups.
-      $options = array(
+      $options = [
         'table_id' => 'views-rearrange-filters',
         'action' => 'match',
         'relationship' => 'sibling',
         'group' => 'views-group-select',
         'subgroup' => 'views-group-select-' . $group_id,
-      );
+      ];
       drupal_attach_tabledrag($form['override'], $options);
 
       // Title row, spanning all columns.
-      $row = array();
+      $row = [];
       // Add a cell to the first row, containing the group operator.
-      $row[] = array(
-        'class' => array('group', 'group-operator', 'container-inline'),
+      $row[] = [
+        'class' => ['group', 'group-operator', 'container-inline'],
         'data' => $form['filter_groups']['groups'][$group_id],
-        'rowspan' => max(array(2, count($contents) + 1)),
-      );
+        'rowspan' => max([2, count($contents) + 1]),
+      ];
       // Title.
-      $row[] = array(
-        'class' => array('group', 'group-title'),
-        'data' => array(
+      $row[] = [
+        'class' => ['group', 'group-title'],
+        'data' => [
           '#prefix' => '<span>',
           '#markup' => $form['#group_options'][$group_id],
           '#suffix' => '</span>',
-        ),
+        ],
         'colspan' => 4,
-      );
-      $rows[] = array(
-        'class' => array('views-group-title'),
+      ];
+      $rows[] = [
+        'class' => ['views-group-title'],
         'data' => $row,
         'id' => 'views-group-title-' . $group_id,
-      );
+      ];
 
       // Row which will only appear if the group has nothing in it.
-      $row = array();
+      $row = [];
       $class = 'group-' . (count($contents) ? 'populated' : 'empty');
       $instructions = '<span>' . t('No filters have been added.') . '</span> <span class="js-only">' . t('Drag to add filters.') . '</span>';
       // When JavaScript is enabled, the button for removing the group (if it's
@@ -229,63 +255,63 @@ function template_preprocess_views_ui_rearrange_filter_form(&$variables) {
       if (!empty($form['remove_groups'][$group_id]['#type']) && $form['remove_groups'][$group_id]['#type'] == 'submit') {
         $form['remove_groups'][$group_id]['#attributes']['class'][] = 'js-hide';
       }
-      $row[] = array(
+      $row[] = [
         'colspan' => 5,
-        'data' => array(
-          array('#markup' => $instructions),
+        'data' => [
+          ['#markup' => $instructions],
           $form['remove_groups'][$group_id],
-        ),
-      );
-      $rows[] = array(
-        'class' => array(
+        ],
+      ];
+      $rows[] = [
+        'class' => [
           'group-message',
           'group-' . $group_id . '-message',
           $class,
-        ),
+        ],
         'data' => $row,
         'id' => 'views-group-' . $group_id,
-      );
+      ];
     }
 
     foreach ($contents as $id) {
       if (isset($form['filters'][$id]['name'])) {
-        $row = array();
+        $row = [];
         $row[]['data'] = $form['filters'][$id]['name'];
-        $form['filters'][$id]['weight']['#attributes']['class'] = array('weight');
+        $form['filters'][$id]['weight']['#attributes']['class'] = ['weight'];
         $row[]['data'] = $form['filters'][$id]['weight'];
-        $form['filters'][$id]['group']['#attributes']['class'] = array('views-group-select views-group-select-' . $group_id);
+        $form['filters'][$id]['group']['#attributes']['class'] = ['views-group-select views-group-select-' . $group_id];
         $row[]['data'] = $form['filters'][$id]['group'];
         $form['filters'][$id]['removed']['#attributes']['class'][] = 'js-hide';
 
-        $remove_link = array(
+        $remove_link = [
           '#type' => 'link',
           '#url' => Url::fromRoute('<none>'),
-          '#title' => SafeMarkup::format('<span>@text</span>', array('@text' => t('Remove'))),
+          '#title' => SafeMarkup::format('<span>@text</span>', ['@text' => t('Remove')]),
           '#weight' => '1',
-          '#options' => array(
-            'attributes' => array(
+          '#options' => [
+            'attributes' => [
               'id' => 'views-remove-link-' . $id,
-              'class' => array(
+              'class' => [
                 'views-hidden',
                 'views-button-remove',
                 'views-groups-remove-link',
                 'views-remove-link',
-              ),
+              ],
               'alt' => t('Remove this item'),
               'title' => t('Remove this item'),
-            ),
-          ),
-        );
-        $row[]['data'] = array(
+            ],
+          ],
+        ];
+        $row[]['data'] = [
           $form['filters'][$id]['removed'],
           $remove_link,
-        );
+        ];
 
-        $row = array(
+        $row = [
           'data' => $row,
-          'class' => array('draggable'),
+          'class' => ['draggable'],
           'id' => 'views-row-' . $id,
-        );
+        ];
 
         if ($group_id !== 'ungroupable') {
           $rows[] = $row;
@@ -302,56 +328,56 @@ function template_preprocess_views_ui_rearrange_filter_form(&$variables) {
   }
 
   if (!empty($ungroupable_rows)) {
-    $header = array(
+    $header = [
       t('Ungroupable filters'),
       t('Weight'),
-      array(
+      [
         'data' => t('Group'),
-        'class' => array('views-hide-label'),
-      ),
-      array(
+        'class' => ['views-hide-label'],
+      ],
+      [
         'data' => t('Remove'),
-        'class' => array('views-hide-label'),
-      ),
-    );
-    $variables['ungroupable_table'] = array(
+        'class' => ['views-hide-label'],
+      ],
+    ];
+    $variables['ungroupable_table'] = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $ungroupable_rows,
-      '#attributes' => array(
+      '#attributes' => [
         'id' => 'views-rearrange-filters-ungroupable',
-        'class' => array('arrange'),
-      ),
-      '#tabledrag' => array(
-        array(
+        'class' => ['arrange'],
+      ],
+      '#tabledrag' => [
+        [
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'weight',
-        )
-      ),
-    );
+        ]
+      ],
+    ];
   }
 
   if (empty($rows)) {
-    $rows[] = array(array('data' => t('No fields available.'), 'colspan' => '2'));
+    $rows[] = [['data' => t('No fields available.'), 'colspan' => '2']];
   }
 
   // Set up tabledrag so that the weights are changed when rows are dragged.
-  $variables['table'] = array(
+  $variables['table'] = [
     '#type' => 'table',
     '#rows' => $rows,
-    '#attributes' => array(
+    '#attributes' => [
       'id' => 'views-rearrange-filters',
-      'class' => array('arrange'),
-    ),
-    '#tabledrag' => array(
-      array(
+      'class' => ['arrange'],
+    ],
+    '#tabledrag' => [
+      [
         'action' => 'order',
         'relationship' => 'sibling',
         'group' => 'weight',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
   // When JavaScript is enabled, the button for adding a new group should be
   // hidden, since it will be replaced by a link on the client side.
@@ -371,72 +397,72 @@ function template_preprocess_views_ui_rearrange_filter_form(&$variables) {
 function template_preprocess_views_ui_style_plugin_table(&$variables) {
   $form = $variables['form'];
 
-  $header = array(
+  $header = [
     t('Field'),
     t('Column'),
     t('Align'),
     t('Separator'),
-    array(
+    [
       'data' => t('Sortable'),
       'align' => 'center',
-    ),
-    array(
+    ],
+    [
       'data' => t('Default order'),
       'align' => 'center',
-    ),
-    array(
+    ],
+    [
       'data' => t('Default sort'),
       'align' => 'center',
-    ),
-    array(
+    ],
+    [
       'data' => t('Hide empty column'),
       'align' => 'center',
-    ),
-    array(
+    ],
+    [
       'data' => t('Responsive'),
       'align' => 'center',
-    ),
-  );
-  $rows = array();
+    ],
+  ];
+  $rows = [];
   foreach (Element::children($form['columns']) as $id) {
-    $row = array();
+    $row = [];
     $row[]['data'] = $form['info'][$id]['name'];
     $row[]['data'] = $form['columns'][$id];
     $row[]['data'] = $form['info'][$id]['align'];
     $row[]['data'] = $form['info'][$id]['separator'];
 
     if (!empty($form['info'][$id]['sortable'])) {
-      $row[] = array(
+      $row[] = [
         'data' => $form['info'][$id]['sortable'],
         'align' => 'center',
-      );
-      $row[] = array(
+      ];
+      $row[] = [
         'data' => $form['info'][$id]['default_sort_order'],
         'align' => 'center',
-      );
-      $row[] = array(
+      ];
+      $row[] = [
         'data' => $form['default'][$id],
         'align' => 'center',
-      );
+      ];
     }
     else {
       $row[] = '';
       $row[] = '';
       $row[] = '';
     }
-    $row[] = array(
+    $row[] = [
       'data' => $form['info'][$id]['empty_column'],
       'align' => 'center',
-    );
-    $row[] = array(
+    ];
+    $row[] = [
       'data' => $form['info'][$id]['responsive'],
       'align' => 'center',
-    );
+    ];
     $rows[] = $row;
   }
 
   // Add the special 'None' row.
-  $rows[] = array(array('data' => t('None'), 'colspan' => 6), array('align' => 'center', 'data' => $form['default'][-1]), array('colspan' => 2));
+  $rows[] = [['data' => t('None'), 'colspan' => 6], ['align' => 'center', 'data' => $form['default'][-1]], ['colspan' => 2]];
 
   // Unset elements from the form array that are used to build the table so that
   // they are not rendered twice.
@@ -444,12 +470,12 @@ function template_preprocess_views_ui_style_plugin_table(&$variables) {
   unset($form['info']);
   unset($form['columns']);
 
-  $variables['table'] = array(
+  $variables['table'] = [
     '#type' => 'table',
     '#theme' => 'table__views_ui_style_plugin_table',
     '#header' => $header,
     '#rows' => $rows,
-  );
+  ];
   $variables['form'] = $form;
 }
 
@@ -510,14 +536,14 @@ function template_preprocess_views_ui_view_preview_section(&$variables) {
   }
 
   if (isset($links)) {
-    $build = array(
+    $build = [
       '#theme' => 'links__contextual',
       '#links' => $links,
-      '#attributes' => array('class' => array('contextual-links')),
-      '#attached' => array(
-        'library' => array('contextual/drupal.contextual-links'),
-      ),
-    );
+      '#attributes' => ['class' => ['contextual-links']],
+      '#attached' => [
+        'library' => ['contextual/drupal.contextual-links'],
+      ],
+    ];
     $variables['links'] = $build;
   }
 }
@@ -526,5 +552,5 @@ function template_preprocess_views_ui_view_preview_section(&$variables) {
  * Implements hook_theme_suggestions_HOOK().
  */
 function views_ui_theme_suggestions_views_ui_view_preview_section(array $variables) {
-  return array('views_ui_view_preview_section__' . $variables['section']);
+  return ['views_ui_view_preview_section__' . $variables['section']];
 }
diff --git a/web/core/modules/workflows/config/schema/workflows.schema.yml b/web/core/modules/workflows/config/schema/workflows.schema.yml
new file mode 100644
index 000000000..e19eb6b89
--- /dev/null
+++ b/web/core/modules/workflows/config/schema/workflows.schema.yml
@@ -0,0 +1,51 @@
+workflows.workflow.*:
+  type: config_entity
+  label: 'Workflow'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    type:
+      type: string
+      label: 'Workflow type'
+    type_settings:
+      type: workflow.type_settings.[%parent.type]
+      label: 'Custom settings for workflow type'
+    states:
+      type: sequence
+      label: 'States'
+      sequence:
+        type: mapping
+        label: 'State'
+        mapping:
+          label:
+            type: label
+            label: 'Label'
+          weight:
+            type: integer
+            label: 'Weight'
+    transitions:
+      type: sequence
+      label: 'Transitions'
+      sequence:
+        type: mapping
+        label: 'Transition from state to state'
+        mapping:
+          label:
+            type: label
+            label: 'Transition label'
+          from:
+            type: sequence
+            label: 'From state IDs'
+            sequence:
+              type: string
+              label: 'From state ID'
+          to:
+            type: string
+            label: 'To state ID'
+          weight:
+            type: integer
+            label: 'Weight'
diff --git a/web/core/modules/workflows/src/Annotation/WorkflowType.php b/web/core/modules/workflows/src/Annotation/WorkflowType.php
new file mode 100644
index 000000000..6e578ed4b
--- /dev/null
+++ b/web/core/modules/workflows/src/Annotation/WorkflowType.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\workflows\Annotation;
+
+use Drupal\Component\Annotation\Plugin;
+
+/**
+ * Defines an Workflow type annotation object.
+ *
+ * Plugin Namespace: Plugin\WorkflowType
+ *
+ * For a working example, see \Drupal\content_moderation\Plugin\Workflow\ContentModerate
+ *
+ * @see \Drupal\workflows\WorkflowTypeInterface
+ * @see \Drupal\workflows\WorkflowManager
+ * @see plugin_api
+ *
+ * @Annotation
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+class WorkflowType extends Plugin {
+
+  /**
+   * The plugin ID.
+   *
+   * @var string
+   */
+  public $id;
+
+  /**
+   * The label of the workflow.
+   *
+   * Describes how the plugin is used to apply a workflow to something.
+   *
+   * @var \Drupal\Core\Annotation\Translation
+   *
+   * @ingroup plugin_translatable
+   */
+  public $label = '';
+
+  /**
+   * States required to exist.
+   *
+   * Normally supplied by WorkflowType::defaultConfiguration().
+   *
+   * @var array
+   */
+  public $required_states = [];
+
+}
diff --git a/web/core/modules/workflows/src/Entity/Workflow.php b/web/core/modules/workflows/src/Entity/Workflow.php
new file mode 100644
index 000000000..c6b1ce6a4
--- /dev/null
+++ b/web/core/modules/workflows/src/Entity/Workflow.php
@@ -0,0 +1,533 @@
+<?php
+
+namespace Drupal\workflows\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBase;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityWithPluginCollectionInterface;
+use Drupal\Core\Plugin\DefaultSingleLazyPluginCollection;
+use Drupal\workflows\Exception\RequiredStateMissingException;
+use Drupal\workflows\State;
+use Drupal\workflows\Transition;
+use Drupal\workflows\WorkflowInterface;
+
+/**
+ * Defines the workflow entity.
+ *
+ * @ConfigEntityType(
+ *   id = "workflow",
+ *   label = @Translation("Workflow"),
+ *   label_collection = @Translation("Workflows"),
+ *   handlers = {
+ *     "access" = "Drupal\workflows\WorkflowAccessControlHandler",
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\AdminHtmlRouteProvider",
+ *     },
+ *   },
+ *   config_prefix = "workflow",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "label",
+ *     "uuid" = "uuid",
+ *   },
+ *   config_export = {
+ *     "id",
+ *     "label",
+ *     "states",
+ *     "transitions",
+ *     "type",
+ *     "type_settings"
+ *   },
+ * )
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+class Workflow extends ConfigEntityBase implements WorkflowInterface, EntityWithPluginCollectionInterface {
+
+  /**
+   * The Workflow ID.
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * The Moderation state label.
+   *
+   * @var string
+   */
+  protected $label;
+
+  /**
+   * The states of the workflow.
+   *
+   * The array key is the machine name for the state. The structure of each
+   * array item is:
+   * @code
+   *   label: {translatable label}
+   *   weight: {integer value}
+   * @endcode
+   *
+   * @var array
+   */
+  protected $states = [];
+
+  /**
+   * The permitted transitions of the workflow.
+   *
+   * The array key is the machine name for the transition. The machine name is
+   * generated from the machine names of the states. The structure of each array
+   * item is:
+   * @code
+   *   from:
+   *     - {state machine name}
+   *     - {state machine name}
+   *   to: {state machine name}
+   *   label: {translatable label}
+   * @endcode
+   *
+   * @var array
+   */
+  protected $transitions = [];
+
+  /**
+   * The workflow type plugin ID.
+   *
+   * @see \Drupal\workflows\WorkflowTypeManager
+   *
+   * @var string
+   */
+  protected $type;
+
+  /**
+   * The configuration for the workflow type plugin.
+   * @var array
+   */
+  protected $type_settings = [];
+
+  /**
+   * The workflow type plugin collection.
+   *
+   * @var \Drupal\Component\Plugin\LazyPluginCollection
+   */
+  protected $pluginCollection;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    $workflow_type = $this->getTypePlugin();
+    $missing_states = array_diff($workflow_type->getRequiredStates(), array_keys($this->getStates()));
+    if (!empty($missing_states)) {
+      throw new RequiredStateMissingException(sprintf("Workflow type '{$workflow_type->label()}' requires states with the ID '%s' in workflow '{$this->id()}'", implode("', '", $missing_states)));
+    }
+    parent::preSave($storage);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addState($state_id, $label) {
+    if (isset($this->states[$state_id])) {
+      throw new \InvalidArgumentException("The state '$state_id' already exists in workflow '{$this->id()}'");
+    }
+    if (preg_match('/[^a-z0-9_]+/', $state_id)) {
+      throw new \InvalidArgumentException("The state ID '$state_id' must contain only lowercase letters, numbers, and underscores");
+    }
+    $this->states[$state_id] = [
+      'label' => $label,
+      'weight' => $this->getNextWeight($this->states),
+    ];
+    ksort($this->states);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function hasState($state_id) {
+    return isset($this->states[$state_id]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getStates($state_ids = NULL) {
+    if ($state_ids === NULL) {
+      $state_ids = array_keys($this->states);
+    }
+    /** @var \Drupal\workflows\StateInterface[] $states */
+    $states = array_combine($state_ids, array_map([$this, 'getState'], $state_ids));
+    if (count($states) > 1) {
+      // Sort states by weight and then label.
+      $weights = $labels = [];
+      foreach ($states as $id => $state) {
+        $weights[$id] = $state->weight();
+        $labels[$id] = $state->label();
+      }
+      array_multisort(
+        $weights, SORT_NUMERIC, SORT_ASC,
+        $labels, SORT_NATURAL, SORT_ASC
+      );
+      $states = array_replace($weights, $states);
+    }
+    return $states;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getState($state_id) {
+    if (!isset($this->states[$state_id])) {
+      throw new \InvalidArgumentException("The state '$state_id' does not exist in workflow '{$this->id()}'");
+    }
+    $state = new State(
+      $this,
+      $state_id,
+      $this->states[$state_id]['label'],
+      $this->states[$state_id]['weight']
+    );
+    return $this->getTypePlugin()->decorateState($state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setStateLabel($state_id, $label) {
+    if (!isset($this->states[$state_id])) {
+      throw new \InvalidArgumentException("The state '$state_id' does not exist in workflow '{$this->id()}'");
+    }
+    $this->states[$state_id]['label'] = $label;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setStateWeight($state_id, $weight) {
+    if (!isset($this->states[$state_id])) {
+      throw new \InvalidArgumentException("The state '$state_id' does not exist in workflow '{$this->id()}'");
+    }
+    $this->states[$state_id]['weight'] = $weight;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function deleteState($state_id) {
+    if (!isset($this->states[$state_id])) {
+      throw new \InvalidArgumentException("The state '$state_id' does not exist in workflow '{$this->id()}'");
+    }
+    if (count($this->states) === 1) {
+      throw new \InvalidArgumentException("The state '$state_id' can not be deleted from workflow '{$this->id()}' as it is the only state");
+    }
+
+    foreach ($this->transitions as $transition_id => $transition) {
+      $from_key = array_search($state_id, $transition['from'], TRUE);
+      if ($from_key !== FALSE) {
+        // Remove state from the from array.
+        unset($transition['from'][$from_key]);
+      }
+      if (empty($transition['from']) || $transition['to'] === $state_id) {
+        $this->deleteTransition($transition_id);
+      }
+      elseif ($from_key !== FALSE) {
+        $this->setTransitionFromStates($transition_id, $transition['from']);
+      }
+    }
+    unset($this->states[$state_id]);
+    $this->getTypePlugin()->deleteState($state_id);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInitialState() {
+    $ordered_states = $this->getStates();
+    return reset($ordered_states);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addTransition($transition_id, $label, array $from_state_ids, $to_state_id) {
+    if (isset($this->transitions[$transition_id])) {
+      throw new \InvalidArgumentException("The transition '$transition_id' already exists in workflow '{$this->id()}'");
+    }
+    if (preg_match('/[^a-z0-9_]+/', $transition_id)) {
+      throw new \InvalidArgumentException("The transition ID '$transition_id' must contain only lowercase letters, numbers, and underscores");
+    }
+
+    if (!$this->hasState($to_state_id)) {
+      throw new \InvalidArgumentException("The state '$to_state_id' does not exist in workflow '{$this->id()}'");
+    }
+    $this->transitions[$transition_id] = [
+      'label' => $label,
+      'from' => [],
+      'to' => $to_state_id,
+      // Always add to the end.
+      'weight' => $this->getNextWeight($this->transitions),
+    ];
+
+    try {
+      $this->setTransitionFromStates($transition_id, $from_state_ids);
+    }
+    catch (\InvalidArgumentException $e) {
+      unset($this->transitions[$transition_id]);
+      throw $e;
+    }
+
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTransitions(array $transition_ids = NULL) {
+    if ($transition_ids === NULL) {
+      $transition_ids = array_keys($this->transitions);
+    }
+    /** @var \Drupal\workflows\TransitionInterface[] $transitions */
+    $transitions = array_combine($transition_ids, array_map([$this, 'getTransition'], $transition_ids));
+    if (count($transitions) > 1) {
+      // Sort transitions by weights and then labels.
+      $weights = $labels = [];
+      foreach ($transitions as $id => $transition) {
+        $weights[$id] = $transition->weight();
+        $labels[$id] = $transition->label();
+      }
+      array_multisort(
+        $weights, SORT_NUMERIC, SORT_ASC,
+        $labels, SORT_NATURAL, SORT_ASC
+      );
+      $transitions = array_replace($weights, $transitions);
+    }
+    return $transitions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTransition($transition_id) {
+    if (!isset($this->transitions[$transition_id])) {
+      throw new \InvalidArgumentException("The transition '$transition_id' does not exist in workflow '{$this->id()}'");
+    }
+    $transition = new Transition(
+      $this,
+      $transition_id,
+      $this->transitions[$transition_id]['label'],
+      $this->transitions[$transition_id]['from'],
+      $this->transitions[$transition_id]['to'],
+      $this->transitions[$transition_id]['weight']
+    );
+    return $this->getTypePlugin()->decorateTransition($transition);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function hasTransition($transition_id) {
+    return isset($this->transitions[$transition_id]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTransitionsForState($state_id, $direction = 'from') {
+    $transition_ids = array_keys(array_filter($this->transitions, function ($transition) use ($state_id, $direction) {
+      return in_array($state_id, (array) $transition[$direction], TRUE);
+    }));
+    return $this->getTransitions($transition_ids);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTransitionFromStateToState($from_state_id, $to_state_id) {
+    $transition_id = $this->getTransitionIdFromStateToState($from_state_id, $to_state_id);
+    if (empty($transition_id)) {
+      throw new \InvalidArgumentException("The transition from '$from_state_id' to '$to_state_id' does not exist in workflow '{$this->id()}'");
+    }
+    return $this->getTransition($transition_id);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function hasTransitionFromStateToState($from_state_id, $to_state_id) {
+    return !empty($this->getTransitionIdFromStateToState($from_state_id, $to_state_id));
+  }
+
+  /**
+   * Gets the transition ID from state to state.
+   *
+   * @param string $from_state_id
+   *   The state ID to transition from.
+   * @param string $to_state_id
+   *   The state ID to transition to.
+   *
+   * @return string|null
+   *   The transition ID, or NULL if no transition exists.
+   */
+  protected function getTransitionIdFromStateToState($from_state_id, $to_state_id) {
+    foreach ($this->transitions as $transition_id => $transition) {
+      if (in_array($from_state_id, $transition['from'], TRUE) && $transition['to'] === $to_state_id) {
+        return $transition_id;
+      }
+    }
+    return NULL;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setTransitionLabel($transition_id, $label) {
+    if (isset($this->transitions[$transition_id])) {
+      $this->transitions[$transition_id]['label'] = $label;
+    }
+    else {
+      throw new \InvalidArgumentException("The transition '$transition_id' does not exist in workflow '{$this->id()}'");
+    }
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setTransitionWeight($transition_id, $weight) {
+    if (isset($this->transitions[$transition_id])) {
+      $this->transitions[$transition_id]['weight'] = $weight;
+    }
+    else {
+      throw new \InvalidArgumentException("The transition '$transition_id' does not exist in workflow '{$this->id()}'");
+    }
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setTransitionFromStates($transition_id, array $from_state_ids) {
+    if (!isset($this->transitions[$transition_id])) {
+      throw new \InvalidArgumentException("The transition '$transition_id' does not exist in workflow '{$this->id()}'");
+    }
+
+    // Ensure that the states exist.
+    foreach ($from_state_ids as $from_state_id) {
+      if (!$this->hasState($from_state_id)) {
+        throw new \InvalidArgumentException("The state '$from_state_id' does not exist in workflow '{$this->id()}'");
+      }
+      if ($this->hasTransitionFromStateToState($from_state_id, $this->transitions[$transition_id]['to'])) {
+        $transition = $this->getTransitionFromStateToState($from_state_id, $this->transitions[$transition_id]['to']);
+        if ($transition_id !== $transition->id()) {
+          throw new \InvalidArgumentException("The '{$transition->id()}' transition already allows '$from_state_id' to '{$this->transitions[$transition_id]['to']}' transitions in workflow '{$this->id()}'");
+        }
+      }
+    }
+
+    // Preserve the order of the state IDs in the from value and don't save any
+    // keys.
+    $from_state_ids = array_values($from_state_ids);
+    sort($from_state_ids);
+    $this->transitions[$transition_id]['from'] = $from_state_ids;
+    ksort($this->transitions);
+
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function deleteTransition($transition_id) {
+    if (isset($this->transitions[$transition_id])) {
+      unset($this->transitions[$transition_id]);
+      $this->getTypePlugin()->deleteTransition($transition_id);
+    }
+    else {
+      throw new \InvalidArgumentException("The transition '$transition_id' does not exist in workflow '{$this->id()}'");
+    }
+    return $this;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function getTypePlugin() {
+    return $this->getPluginCollection()->get($this->type);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function getPluginCollections() {
+    return ['type_settings' => $this->getPluginCollection()];
+  }
+
+  /**
+   * Encapsulates the creation of the workflow's plugin collection.
+   *
+   * @return \Drupal\Core\Plugin\DefaultSingleLazyPluginCollection
+   *   The workflow's plugin collection.
+   */
+  protected function getPluginCollection() {
+    if (!$this->pluginCollection && $this->type) {
+      $this->pluginCollection = new DefaultSingleLazyPluginCollection(\Drupal::service('plugin.manager.workflows.type'), $this->type, $this->type_settings);
+    }
+    return $this->pluginCollection;
+  }
+
+  /**
+   * Loads all workflows of the provided type.
+   *
+   * @param string $type
+   *   The workflow type to load all workflows for.
+   *
+   * @return static[]
+   *   An array of workflow objects of the provided workflow type, indexed by
+   *   their IDs.
+   *
+   *  @see \Drupal\workflows\Annotation\WorkflowType
+   */
+  public static function loadMultipleByType($type) {
+    return self::loadMultiple(\Drupal::entityQuery('workflow')->condition('type', $type)->execute());
+  }
+
+  /**
+   * Gets the weight for a new state or transition.
+   *
+   * @param array $items
+   *   An array of states or transitions information where each item has a
+   *   'weight' key with a numeric value.
+   *
+   * @return int
+   *   The weight for a new item in the array so that it has the highest weight.
+   */
+  protected function getNextWeight(array $items) {
+    return array_reduce($items, function ($carry, $item) {
+      return max($carry, $item['weight'] + 1);
+    }, 0);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function status() {
+    // In order for a workflow to be usable it must have at least one state.
+    return !empty($this->status) && !empty($this->states);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function onDependencyRemoval(array $dependencies) {
+    $changed = $this->getTypePlugin()->onDependencyRemoval($dependencies);
+    // Ensure the parent method is called in order to process dependencies that
+    // affect third party settings.
+    return parent::onDependencyRemoval($dependencies) || $changed;
+  }
+
+}
diff --git a/web/core/modules/workflows/src/Exception/RequiredStateMissingException.php b/web/core/modules/workflows/src/Exception/RequiredStateMissingException.php
new file mode 100644
index 000000000..7e88bbfe0
--- /dev/null
+++ b/web/core/modules/workflows/src/Exception/RequiredStateMissingException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Drupal\workflows\Exception;
+
+use Drupal\Core\Config\ConfigException;
+
+/**
+ * Indicates that a workflow does not contain a required state.
+ */
+class RequiredStateMissingException extends ConfigException {
+}
diff --git a/web/core/modules/workflows/src/Form/WorkflowAddForm.php b/web/core/modules/workflows/src/Form/WorkflowAddForm.php
new file mode 100644
index 000000000..56cbf6996
--- /dev/null
+++ b/web/core/modules/workflows/src/Form/WorkflowAddForm.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Drupal\workflows\Form;
+
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\workflows\Entity\Workflow;
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Form for adding workflows.
+ */
+class WorkflowAddForm extends EntityForm {
+
+  /**
+   * The workflow type plugin manager.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   */
+  protected $workflowTypePluginManager;
+
+  /**
+   * WorkflowAddForm constructor.
+   *
+   * @param \Drupal\Component\Plugin\PluginManagerInterface $workflow_type_plugin_manager
+   *   The workflow type plugin manager.
+   */
+  public function __construct(PluginManagerInterface $workflow_type_plugin_manager) {
+    $this->workflowTypePluginManager = $workflow_type_plugin_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('plugin.manager.workflows.type')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    /* @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->entity;
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => $workflow->label(),
+      '#description' => $this->t('Label for the Workflow.'),
+      '#required' => TRUE,
+    ];
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#default_value' => $workflow->id(),
+      '#machine_name' => [
+        'exists' => [Workflow::class, 'load'],
+      ],
+    ];
+
+    $workflow_types = array_map(function ($plugin_definition) {
+      return $plugin_definition['label'];
+    }, $this->workflowTypePluginManager->getDefinitions());
+    $form['workflow_type'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Workflow type'),
+      '#required' => TRUE,
+      '#options' => $workflow_types,
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    /* @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->entity;
+    // Initialize the workflow using the selected type plugin.
+    $workflow = $workflow->getTypePlugin()->initializeWorkflow($workflow);
+    $return = $workflow->save();
+    if (empty($workflow->getStates())) {
+      drupal_set_message($this->t('Created the %label Workflow. In order for the workflow to be enabled there needs to be at least one state.', [
+        '%label' => $workflow->label(),
+      ]));
+      $form_state->setRedirectUrl($workflow->toUrl('add-state-form'));
+    }
+    else {
+      drupal_set_message($this->t('Created the %label Workflow.', [
+        '%label' => $workflow->label(),
+      ]));
+      $form_state->setRedirectUrl($workflow->toUrl('edit-form'));
+    }
+    return $return;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
+    // This form can only set the workflow's ID, label and the weights for each
+    // state.
+    /** @var \Drupal\workflows\WorkflowInterface $entity */
+    $values = $form_state->getValues();
+    $entity->set('label', $values['label']);
+    $entity->set('id', $values['id']);
+    $entity->set('type', $values['workflow_type']);
+  }
+
+}
diff --git a/web/core/modules/content_moderation/src/Form/ModerationStateDeleteForm.php b/web/core/modules/workflows/src/Form/WorkflowDeleteForm.php
similarity index 64%
rename from web/core/modules/content_moderation/src/Form/ModerationStateDeleteForm.php
rename to web/core/modules/workflows/src/Form/WorkflowDeleteForm.php
index 43e2b36d9..b9b833132 100644
--- a/web/core/modules/content_moderation/src/Form/ModerationStateDeleteForm.php
+++ b/web/core/modules/workflows/src/Form/WorkflowDeleteForm.php
@@ -1,28 +1,28 @@
 <?php
 
-namespace Drupal\content_moderation\Form;
+namespace Drupal\workflows\Form;
 
 use Drupal\Core\Entity\EntityConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 
 /**
- * Builds the form to delete Moderation state entities.
+ * Builds the form to delete Workflow entities.
  */
-class ModerationStateDeleteForm extends EntityConfirmFormBase {
+class WorkflowDeleteForm extends EntityConfirmFormBase {
 
   /**
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete %name?', array('%name' => $this->entity->label()));
+    return $this->t('Are you sure you want to delete %name?', ['%name' => $this->entity->label()]);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('entity.moderation_state.collection');
+    return new Url('entity.workflow.collection');
   }
 
   /**
@@ -39,7 +39,7 @@ class ModerationStateDeleteForm extends EntityConfirmFormBase {
     $this->entity->delete();
 
     drupal_set_message($this->t(
-      'Moderation state %label deleted.',
+      'Workflow %label deleted.',
       ['%label' => $this->entity->label()]
     ));
 
diff --git a/web/core/modules/workflows/src/Form/WorkflowEditForm.php b/web/core/modules/workflows/src/Form/WorkflowEditForm.php
new file mode 100644
index 000000000..6b01920ad
--- /dev/null
+++ b/web/core/modules/workflows/src/Form/WorkflowEditForm.php
@@ -0,0 +1,215 @@
+<?php
+
+namespace Drupal\workflows\Form;
+
+use Drupal\workflows\Entity\Workflow;
+use Drupal\workflows\State;
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+
+/**
+ * The form for editing workflows.
+ */
+class WorkflowEditForm extends EntityForm {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    /* @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->entity;
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => $workflow->label(),
+      '#description' => $this->t('Label for the Workflow.'),
+      '#required' => TRUE,
+    ];
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#default_value' => $workflow->id(),
+      '#machine_name' => [
+        'exists' => [Workflow::class, 'load'],
+      ],
+      '#disabled' => TRUE,
+    ];
+
+    $header = [
+      'state' => $this->t('State'),
+      'weight' => $this->t('Weight'),
+      'operations' => $this->t('Operations')
+    ];
+    $form['states_container'] = [
+      '#type' => 'details',
+      '#title' => $this->t('States'),
+      '#open' => TRUE,
+      '#collapsible' => 'FALSE',
+    ];
+    $form['states_container']['states'] = [
+      '#type' => 'table',
+      '#header' => $header,
+      '#title' => $this->t('States'),
+      '#empty' => $this->t('There are no states yet.'),
+      '#tabledrag' => [
+        [
+          'action' => 'order',
+          'relationship' => 'sibling',
+          'group' => 'state-weight',
+        ],
+      ],
+    ];
+
+    $states = $workflow->getStates();
+
+    // Warn the user if there are no states.
+    if (empty($states)) {
+      drupal_set_message(
+        $this->t(
+          'This workflow has no states and will be disabled until there is at least one, <a href=":add-state">add a new state.</a>',
+          [':add-state' => $workflow->toUrl('add-state-form')->toString()]
+        ),
+        'warning'
+      );
+    }
+
+    foreach ($states as $state) {
+      $links = [
+        'edit' => [
+          'title' => $this->t('Edit'),
+          'url' => Url::fromRoute('entity.workflow.edit_state_form', ['workflow' => $workflow->id(), 'workflow_state' => $state->id()]),
+          'attributes' => ['aria-label' => $this->t('Edit @state state', ['@state' => $state->label()])],
+        ]
+      ];
+      if ($this->entity->access('delete-state:' . $state->id())) {
+        $links['delete'] = [
+          'title' => t('Delete'),
+          'url' => Url::fromRoute('entity.workflow.delete_state_form', [
+            'workflow' => $workflow->id(),
+            'workflow_state' => $state->id()
+          ]),
+          'attributes' => ['aria-label' => $this->t('Delete @state state', ['@state' => $state->label()])],
+        ];
+      }
+      $form['states_container']['states'][$state->id()] = [
+        '#attributes' => ['class' => ['draggable']],
+        'state' => ['#markup' => $state->label()],
+        '#weight' => $state->weight(),
+        'weight' => [
+          '#type' => 'weight',
+          '#title' => t('Weight for @title', ['@title' => $state->label()]),
+          '#title_display' => 'invisible',
+          '#default_value' => $state->weight(),
+          '#attributes' => ['class' => ['state-weight']],
+        ],
+        'operations' => [
+          '#type' => 'operations',
+          '#links' => $links,
+        ],
+      ];
+    }
+    $form['states_container']['state_add'] = [
+      '#markup' => $workflow->toLink($this->t('Add a new state'), 'add-state-form')->toString(),
+    ];
+
+    $header = [
+      'label' => $this->t('Label'),
+      'weight' => $this->t('Weight'),
+      'from' => $this->t('From'),
+      'to' => $this->t('To'),
+      'operations' => $this->t('Operations')
+    ];
+    $form['transitions_container'] = [
+      '#type' => 'details',
+      '#title' => $this->t('Transitions'),
+      '#open' => TRUE,
+    ];
+    $form['transitions_container']['transitions'] = [
+      '#type' => 'table',
+      '#header' => $header,
+      '#title' => $this->t('Transitions'),
+      '#empty' => $this->t('There are no transitions yet.'),
+      '#tabledrag' => [
+        [
+          'action' => 'order',
+          'relationship' => 'sibling',
+          'group' => 'transition-weight',
+        ],
+      ],
+    ];
+    foreach ($workflow->getTransitions() as $transition) {
+      $links['edit'] = [
+        'title' => $this->t('Edit'),
+        'url' => Url::fromRoute('entity.workflow.edit_transition_form', ['workflow' => $workflow->id(), 'workflow_transition' => $transition->id()]),
+        'attributes' => ['aria-label' => $this->t('Edit \'@transition\' transition', ['@transition' => $transition->label()])],
+      ];
+      $links['delete'] = [
+        'title' => t('Delete'),
+        'url' => Url::fromRoute('entity.workflow.delete_transition_form', ['workflow' => $workflow->id(), 'workflow_transition' => $transition->id()]),
+        'attributes' => ['aria-label' => $this->t('Delete \'@transition\' transition', ['@transition' => $transition->label()])],
+      ];
+      $form['transitions_container']['transitions'][$transition->id()] = [
+        '#attributes' => ['class' => ['draggable']],
+        'label' => ['#markup' => $transition->label()],
+        '#weight' => $transition->weight(),
+        'weight' => [
+          '#type' => 'weight',
+          '#title' => t('Weight for @title', ['@title' => $transition->label()]),
+          '#title_display' => 'invisible',
+          '#default_value' => $transition->weight(),
+          '#attributes' => ['class' => ['transition-weight']],
+        ],
+        'from' => [
+          '#theme' => 'item_list',
+          '#items' => array_map([State::class, 'labelCallback'], $transition->from()),
+          '#context' => ['list_style' => 'comma-list'],
+        ],
+        'to' => ['#markup' => $transition->to()->label()],
+        'operations' => [
+          '#type' => 'operations',
+          '#links' => $links,
+        ],
+      ];
+    }
+    $form['transitions_container']['transition_add'] = [
+      '#markup' => $workflow->toLink($this->t('Add a new transition'), 'add-transition-form')->toString(),
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    /* @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->entity;
+    $workflow->save();
+    drupal_set_message($this->t('Saved the %label Workflow.', ['%label' => $workflow->label()]));
+    $form_state->setRedirectUrl($workflow->toUrl('collection'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
+    // This form can only set the workflow's ID, label and the weights for each
+    // state.
+    /** @var \Drupal\workflows\WorkflowInterface $entity */
+    $values = $form_state->getValues();
+    $entity->set('label', $values['label']);
+    $entity->set('id', $values['id']);
+    foreach ($values['states'] as $state_id => $state_values) {
+      $entity->setStateWeight($state_id, $state_values['weight']);
+    }
+    foreach ($values['transitions'] as $transition_id => $transition_values) {
+      $entity->setTransitionWeight($transition_id, $transition_values['weight']);
+    }
+  }
+
+}
diff --git a/web/core/modules/workflows/src/Form/WorkflowStateAddForm.php b/web/core/modules/workflows/src/Form/WorkflowStateAddForm.php
new file mode 100644
index 000000000..0b368585b
--- /dev/null
+++ b/web/core/modules/workflows/src/Form/WorkflowStateAddForm.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace Drupal\workflows\Form;
+
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Class WorkflowStateAddForm.
+ */
+class WorkflowStateAddForm extends EntityForm {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'workflow_state_add_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    /* @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->getEntity();
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => '',
+      '#description' => $this->t('Label for the state.'),
+      '#required' => TRUE,
+    ];
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#machine_name' => [
+        'exists' => [$this, 'exists'],
+      ],
+    ];
+
+    // Add additional form fields from the workflow type plugin.
+    $form['type_settings'] = [
+      $workflow->get('type') => $workflow->getTypePlugin()->buildStateConfigurationForm($form_state, $workflow),
+      '#tree' => TRUE,
+    ];
+
+    return $form;
+  }
+
+  /**
+   * Determines if the workflow state already exists.
+   *
+   * @param string $state_id
+   *   The workflow state ID.
+   *
+   * @return bool
+   *   TRUE if the workflow state exists, FALSE otherwise.
+   */
+  public function exists($state_id) {
+    /** @var \Drupal\workflows\WorkflowInterface $original_workflow */
+    $original_workflow = \Drupal::entityTypeManager()->getStorage('workflow')->loadUnchanged($this->getEntity()->id());
+    return $original_workflow->hasState($state_id);
+  }
+
+  /**
+   * Copies top-level form values to entity properties
+   *
+   * This form can only change values for a state, which is part of workflow.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity the current form should operate upon.
+   * @param array $form
+   *   A nested array of form elements comprising the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\workflows\WorkflowInterface $entity */
+    $values = $form_state->getValues();
+
+    // This is fired twice so we have to check that the entity does not already
+    // have the state.
+    if (!$entity->hasState($values['id'])) {
+      $entity->addState($values['id'], $values['label']);
+      if (isset($values['type_settings'])) {
+        $configuration = $entity->getTypePlugin()->getConfiguration();
+        $configuration['states'][$values['id']] = $values['type_settings'][$entity->getTypePlugin()->getPluginId()];
+        $entity->set('type_settings', $configuration);
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->entity;
+    $workflow->save();
+    drupal_set_message($this->t('Created %label state.', [
+      '%label' => $workflow->getState($form_state->getValue('id'))->label(),
+    ]));
+    $form_state->setRedirectUrl($workflow->toUrl('edit-form'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function actions(array $form, FormStateInterface $form_state) {
+    $actions['submit'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Save'),
+      '#submit' => ['::submitForm', '::save'],
+    ];
+    return $actions;
+  }
+
+}
diff --git a/web/core/modules/workflows/src/Form/WorkflowStateDeleteForm.php b/web/core/modules/workflows/src/Form/WorkflowStateDeleteForm.php
new file mode 100644
index 000000000..c60045ca2
--- /dev/null
+++ b/web/core/modules/workflows/src/Form/WorkflowStateDeleteForm.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Drupal\workflows\Form;
+
+use Drupal\workflows\WorkflowInterface;
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Builds the form to delete states from Workflow entities.
+ */
+class WorkflowStateDeleteForm extends ConfirmFormBase {
+
+  /**
+   * The workflow entity the state being deleted belongs to.
+   *
+   * @var \Drupal\workflows\WorkflowInterface
+   */
+  protected $workflow;
+
+  /**
+   * The state being deleted.
+   *
+   * @var string
+   */
+  protected $stateId;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'workflow_state_delete_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to delete %state from %workflow?', ['%state' => $this->workflow->getState($this->stateId)->label(), '%workflow' => $this->workflow->label()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return $this->workflow->toUrl();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Delete');
+  }
+
+  /**
+   * Form constructor.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   * @param \Drupal\workflows\WorkflowInterface $workflow
+   *   The workflow entity being edited.
+   * @param string|null $workflow_state
+   *   The workflow state being deleted.
+   *
+   * @return array
+   *   The form structure.
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, WorkflowInterface $workflow = NULL, $workflow_state = NULL) {
+    if (!$workflow->hasState($workflow_state)) {
+      throw new NotFoundHttpException();
+    }
+    $this->workflow = $workflow;
+    $this->stateId = $workflow_state;
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+
+    $workflow_label = $this->workflow->getState($this->stateId)->label();
+    $this->workflow
+      ->deleteState($this->stateId)
+      ->save();
+
+    drupal_set_message($this->t(
+      'State %label deleted.',
+      ['%label' => $workflow_label]
+    ));
+
+    $form_state->setRedirectUrl($this->getCancelUrl());
+  }
+
+}
diff --git a/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php b/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php
new file mode 100644
index 000000000..f21508ff6
--- /dev/null
+++ b/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php
@@ -0,0 +1,174 @@
+<?php
+
+namespace Drupal\workflows\Form;
+
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+
+/**
+ * Class WorkflowStateEditForm.
+ */
+class WorkflowStateEditForm extends EntityForm {
+
+  /**
+   * The ID of the state that is being edited.
+   *
+   * @var string
+   */
+  protected $stateId;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'workflow_state_edit_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $workflow_state = NULL) {
+    $this->stateId = $workflow_state;
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    /* @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->getEntity();
+    $state = $workflow->getState($this->stateId);
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => $state->label(),
+      '#description' => $this->t('Label for the state.'),
+      '#required' => TRUE,
+    ];
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#default_value' => $this->stateId,
+      '#machine_name' => [
+        'exists' => [$this, 'exists'],
+      ],
+      '#disabled' => TRUE,
+    ];
+
+    // Add additional form fields from the workflow type plugin.
+    $form['type_settings'] = [
+      $workflow->get('type') => $workflow->getTypePlugin()->buildStateConfigurationForm($form_state, $workflow, $state),
+      '#tree' => TRUE,
+    ];
+
+    $header = [
+      'label' => $this->t('Transition'),
+      'state' => $this->t('To'),
+      'operations' => $this->t('Operations'),
+    ];
+    $form['transitions'] = [
+      '#type' => 'table',
+      '#header' => $header,
+      '#empty' => $this->t('There are no transitions to or from this state yet.'),
+    ];
+    foreach ($state->getTransitions() as $transition) {
+      $links['edit'] = [
+        'title' => $this->t('Edit'),
+        'url' => Url::fromRoute('entity.workflow.edit_transition_form', [
+          'workflow' => $workflow->id(),
+          'workflow_transition' => $transition->id()
+        ]),
+      ];
+      $links['delete'] = [
+        'title' => t('Delete'),
+        'url' => Url::fromRoute('entity.workflow.delete_transition_form', [
+          'workflow' => $workflow->id(),
+          'workflow_transition' => $transition->id()
+        ]),
+      ];
+      $form['transitions'][$transition->id()] = [
+        'label' => [
+          '#markup' => $transition->label(),
+        ],
+        'state' => [
+          '#markup' => $transition->to()->label(),
+        ],
+        'operations' => [
+          '#type' => 'operations',
+          '#links' => $links,
+        ],
+      ];
+    }
+
+    return $form;
+  }
+
+  /**
+   * Copies top-level form values to entity properties
+   *
+   * This form can only change values for a state, which is part of workflow.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity the current form should operate upon.
+   * @param array $form
+   *   A nested array of form elements comprising the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\workflows\WorkflowInterface $entity */
+    $values = $form_state->getValues();
+    $entity->setStateLabel($values['id'], $values['label']);
+    if (isset($values['type_settings'])) {
+      $configuration = $entity->getTypePlugin()->getConfiguration();
+      $configuration['states'][$values['id']] = $values['type_settings'][$entity->getTypePlugin()->getPluginId()];
+      $entity->set('type_settings', $configuration);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->entity;
+    $workflow->save();
+    drupal_set_message($this->t('Saved %label state.', [
+      '%label' => $workflow->getState($this->stateId)->label(),
+    ]));
+    $form_state->setRedirectUrl($workflow->toUrl('edit-form'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function actions(array $form, FormStateInterface $form_state) {
+    $actions['submit'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Save'),
+      '#submit' => ['::submitForm', '::save'],
+    ];
+
+    $actions['delete'] = [
+      '#type' => 'link',
+      '#title' => $this->t('Delete'),
+      '#access' => $this->entity->access('delete-state:' . $this->stateId),
+      '#attributes' => [
+        'class' => ['button', 'button--danger'],
+      ],
+      '#url' => Url::fromRoute('entity.workflow.delete_state_form', [
+        'workflow' => $this->entity->id(),
+        'workflow_state' => $this->stateId
+      ])
+    ];
+
+    return $actions;
+  }
+
+}
diff --git a/web/core/modules/workflows/src/Form/WorkflowTransitionAddForm.php b/web/core/modules/workflows/src/Form/WorkflowTransitionAddForm.php
new file mode 100644
index 000000000..fe3a40636
--- /dev/null
+++ b/web/core/modules/workflows/src/Form/WorkflowTransitionAddForm.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Drupal\workflows\Form;
+
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\workflows\State;
+
+/**
+ * Class WorkflowTransitionAddForm.
+ */
+class WorkflowTransitionAddForm extends EntityForm {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'workflow_transition_add_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    /* @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->getEntity();
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => '',
+      '#description' => $this->t('Label for the transition.'),
+      '#required' => TRUE,
+    ];
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#machine_name' => [
+        'exists' => [$this, 'exists'],
+      ],
+    ];
+
+    // @todo https://www.drupal.org/node/2830584 Add some ajax to ensure that
+    //   only valid transitions are selectable.
+    $states = array_map([State::class, 'labelCallback'], $workflow->getStates());
+    $form['from'] = [
+      '#type' => 'checkboxes',
+      '#title' => $this->t('From'),
+      '#required' => TRUE,
+      '#default_value' => [],
+      '#options' => $states,
+    ];
+    $form['to'] = [
+      '#type' => 'radios',
+      '#title' => $this->t('To'),
+      '#required' => TRUE,
+      '#default_value' => [],
+      '#options' => $states,
+    ];
+
+    // Add additional form fields from the workflow type plugin.
+    $form['type_settings'] = [
+      $workflow->get('type') => $workflow->getTypePlugin()->buildTransitionConfigurationForm($form_state, $workflow),
+      '#tree' => TRUE,
+    ];
+
+    return $form;
+  }
+
+  /**
+   * Determines if the workflow transition already exists.
+   *
+   * @param string $transition_id
+   *   The workflow transition ID.
+   *
+   * @return bool
+   *   TRUE if the workflow transition exists, FALSE otherwise.
+   */
+  public function exists($transition_id) {
+    /** @var \Drupal\workflows\WorkflowInterface $original_workflow */
+    $original_workflow = \Drupal::entityTypeManager()->getStorage('workflow')->loadUnchanged($this->getEntity()->id());
+    return $original_workflow->hasTransition($transition_id);
+  }
+
+  /**
+   * Copies top-level form values to entity properties
+   *
+   * This form can only change values for a state, which is part of workflow.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity the current form should operate upon.
+   * @param array $form
+   *   A nested array of form elements comprising the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
+    if (!$form_state->isValidationComplete()) {
+      // Only do something once form validation is complete.
+      return;
+    }
+    /** @var \Drupal\workflows\WorkflowInterface $entity */
+    $values = $form_state->getValues();
+    $entity->addTransition($values['id'], $values['label'], array_filter($values['from']), $values['to']);
+    if (isset($values['type_settings'])) {
+      $configuration = $entity->getTypePlugin()->getConfiguration();
+      $configuration['transitions'][$values['id']] = $values['type_settings'][$entity->getTypePlugin()->getPluginId()];
+      $entity->set('type_settings', $configuration);
+    }
+  }
+
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    /** @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->getEntity();
+    $values = $form_state->getValues();
+    foreach (array_filter($values['from']) as $from_state_id) {
+      if ($workflow->hasTransitionFromStateToState($from_state_id, $values['to'])) {
+        $form_state->setErrorByName('from][' . $from_state_id, $this->t('The transition from %from to %to already exists.', [
+          '%from' => $workflow->getState($from_state_id)->label(),
+          '%to' => $workflow->getState($values['to'])->label(),
+        ]));
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->entity;
+    $workflow->save();
+    drupal_set_message($this->t('Created %label transition.', [
+      '%label' => $form_state->getValue('label'),
+    ]));
+    $form_state->setRedirectUrl($workflow->toUrl('edit-form'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function actions(array $form, FormStateInterface $form_state) {
+    $actions['submit'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Save'),
+      '#submit' => ['::submitForm', '::save'],
+    ];
+    return $actions;
+  }
+
+}
diff --git a/web/core/modules/workflows/src/Form/WorkflowTransitionDeleteForm.php b/web/core/modules/workflows/src/Form/WorkflowTransitionDeleteForm.php
new file mode 100644
index 000000000..abcb41e66
--- /dev/null
+++ b/web/core/modules/workflows/src/Form/WorkflowTransitionDeleteForm.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Drupal\workflows\Form;
+
+use Drupal\workflows\WorkflowInterface;
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Builds the form to delete transitions from Workflow entities.
+ */
+class WorkflowTransitionDeleteForm extends ConfirmFormBase {
+
+  /**
+   * The workflow entity the transition being deleted belongs to.
+   *
+   * @var \Drupal\workflows\WorkflowInterface
+   */
+  protected $workflow;
+
+  /**
+   * The workflow transition being deleted.
+   *
+   * @var \Drupal\workflows\TransitionInterface
+   */
+  protected $transition;
+
+  /**
+   * The transition being deleted.
+   *
+   * @var string
+   */
+  protected $transitionId;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'workflow_transition_delete_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to delete %transition from %workflow?', ['%transition' => $this->transition->label(), '%workflow' => $this->workflow->label()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return $this->workflow->toUrl();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Delete');
+  }
+
+  /**
+   * Form constructor.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   * @param \Drupal\workflows\WorkflowInterface $workflow
+   *   The workflow entity being edited.
+   * @param string|null $workflow_transition
+   *   The workflow transition being deleted.
+   *
+   * @return array
+   *   The form structure.
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, WorkflowInterface $workflow = NULL, $workflow_transition = NULL) {
+    try {
+      $this->transition = $workflow->getTransition($workflow_transition);
+    }
+    catch (\InvalidArgumentException $e) {
+      throw new NotFoundHttpException();
+    }
+    $this->workflow = $workflow;
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->workflow
+      ->deleteTransition($this->transition->id())
+      ->save();
+
+    drupal_set_message($this->t('%transition transition deleted.', ['%transition' => $this->transition->label()]));
+    $form_state->setRedirectUrl($this->getCancelUrl());
+  }
+
+}
diff --git a/web/core/modules/workflows/src/Form/WorkflowTransitionEditForm.php b/web/core/modules/workflows/src/Form/WorkflowTransitionEditForm.php
new file mode 100644
index 000000000..5bbabae6f
--- /dev/null
+++ b/web/core/modules/workflows/src/Form/WorkflowTransitionEditForm.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace Drupal\workflows\Form;
+
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Drupal\workflows\State;
+
+/**
+ * Class WorkflowTransitionEditForm.
+ */
+class WorkflowTransitionEditForm extends EntityForm {
+
+  /**
+   * The ID of the transition that is being edited.
+   *
+   * @var string
+   */
+  protected $transitionId;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'workflow_transition_edit_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $workflow_transition = NULL) {
+    $this->transitionId = $workflow_transition;
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    /* @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->getEntity();
+    $transition = $workflow->getTransition($this->transitionId);
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => $transition->label(),
+      '#description' => $this->t('Label for the transition.'),
+      '#required' => TRUE,
+    ];
+
+    $form['id'] = [
+      '#type' => 'value',
+      '#value' => $this->transitionId,
+    ];
+
+    // @todo https://www.drupal.org/node/2830584 Add some ajax to ensure that
+    //   only valid transitions are selectable.
+    $states = array_map([State::class, 'labelCallback'], $workflow->getStates());
+    $form['from'] = [
+      '#type' => 'checkboxes',
+      '#title' => $this->t('From'),
+      '#required' => TRUE,
+      '#default_value' => array_keys($transition->from()),
+      '#options' => $states,
+    ];
+    $form['to'] = [
+      '#type' => 'radios',
+      '#title' => $this->t('To'),
+      '#required' => TRUE,
+      '#default_value' => $transition->to()->id(),
+      '#options' => $states,
+      '#disabled' => TRUE,
+    ];
+
+    // Add additional form fields from the workflow type plugin.
+    $form['type_settings'] = [
+      $workflow->get('type') => $workflow->getTypePlugin()->buildTransitionConfigurationForm($form_state, $workflow, $transition),
+      '#tree' => TRUE,
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    /** @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->getEntity();
+    $values = $form_state->getValues();
+    foreach (array_filter($values['from']) as $from_state_id) {
+      if ($workflow->hasTransitionFromStateToState($from_state_id, $values['to'])) {
+        $transition = $workflow->getTransitionFromStateToState($from_state_id, $values['to']);
+        if ($transition->id() !== $values['id']) {
+          $form_state->setErrorByName('from][' . $from_state_id, $this->t('The transition from %from to %to already exists.', [
+            '%from' => $workflow->getState($from_state_id)->label(),
+            '%to' => $workflow->getState($values['to'])->label(),
+          ]));
+        }
+      }
+    }
+  }
+
+  /**
+   * Copies top-level form values to entity properties
+   *
+   * This form can only change values for a state, which is part of workflow.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity the current form should operate upon.
+   * @param array $form
+   *   A nested array of form elements comprising the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
+    if (!$form_state->isValidationComplete()) {
+      // Only do something once form validation is complete.
+      return;
+    }
+    /** @var \Drupal\workflows\WorkflowInterface $entity */
+    $values = $form_state->getValues();
+    $form_state->set('created_transition', FALSE);
+    $entity->setTransitionLabel($values['id'], $values['label']);
+    $entity->setTransitionFromStates($values['id'], array_filter($values['from']));
+    if (isset($values['type_settings'])) {
+      $configuration = $entity->getTypePlugin()->getConfiguration();
+      $configuration['transitions'][$values['id']] = $values['type_settings'][$entity->getTypePlugin()->getPluginId()];
+      $entity->set('type_settings', $configuration);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $this->entity;
+    $workflow->save();
+    drupal_set_message($this->t('Saved %label transition.', [
+      '%label' => $workflow->getTransition($this->transitionId)->label(),
+    ]));
+    $form_state->setRedirectUrl($workflow->toUrl('edit-form'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function actions(array $form, FormStateInterface $form_state) {
+    $actions['submit'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Save'),
+      '#submit' => ['::submitForm', '::save'],
+    ];
+
+    $actions['delete'] = [
+      '#type' => 'link',
+      '#title' => $this->t('Delete'),
+      // Deleting a transition is editing a workflow.
+      '#access' => $this->entity->access('edit'),
+      '#attributes' => [
+        'class' => ['button', 'button--danger'],
+      ],
+      '#url' => Url::fromRoute('entity.workflow.delete_transition_form', [
+        'workflow' => $this->entity->id(),
+        'workflow_transition' => $this->transitionId
+      ])
+    ];
+
+    return $actions;
+  }
+
+}
diff --git a/web/core/modules/workflows/src/Plugin/WorkflowTypeBase.php b/web/core/modules/workflows/src/Plugin/WorkflowTypeBase.php
new file mode 100644
index 000000000..59c6b9613
--- /dev/null
+++ b/web/core/modules/workflows/src/Plugin/WorkflowTypeBase.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace Drupal\workflows\Plugin;
+
+use Drupal\Component\Plugin\PluginBase;
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\workflows\StateInterface;
+use Drupal\workflows\TransitionInterface;
+use Drupal\workflows\WorkflowInterface;
+use Drupal\workflows\WorkflowTypeInterface;
+
+/**
+ * A base class for Workflow type plugins.
+ *
+ * @see \Drupal\workflows\Annotation\WorkflowType
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+abstract class WorkflowTypeBase extends PluginBase implements WorkflowTypeInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->setConfiguration($configuration);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function initializeWorkflow(WorkflowInterface $workflow) {
+    return $workflow;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function label() {
+    $definition = $this->getPluginDefinition();
+    // The label can be an object.
+    // @see \Drupal\Core\StringTranslation\TranslatableMarkup
+    return $definition['label'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function checkWorkflowAccess(WorkflowInterface $entity, $operation, AccountInterface $account) {
+    return AccessResult::neutral();
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function decorateState(StateInterface $state) {
+    return $state;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function deleteState($state_id) {
+    unset($this->configuration['states'][$state_id]);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function decorateTransition(TransitionInterface $transition) {
+    return $transition;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function deleteTransition($transition_id) {
+    unset($this->configuration['transitions'][$transition_id]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildStateConfigurationForm(FormStateInterface $form_state, WorkflowInterface $workflow, StateInterface $state = NULL) {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildTransitionConfigurationForm(FormStateInterface $form_state, WorkflowInterface $workflow, TransitionInterface $transition = NULL) {
+    return [];
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function getConfiguration() {
+    return $this->configuration;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function setConfiguration(array $configuration) {
+    $this->configuration = NestedArray::mergeDeep(
+      $this->defaultConfiguration(),
+      $configuration
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRequiredStates() {
+    return $this->getPluginDefinition()['required_states'];
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function defaultConfiguration() {
+    return [
+      'states' => [],
+      'transitions' => [],
+    ];
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function calculateDependencies() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function onDependencyRemoval(array $dependencies) {
+    return FALSE;
+  }
+
+}
diff --git a/web/core/modules/workflows/src/State.php b/web/core/modules/workflows/src/State.php
new file mode 100644
index 000000000..f8b4faea3
--- /dev/null
+++ b/web/core/modules/workflows/src/State.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Drupal\workflows;
+
+/**
+ * A value object representing a workflow state.
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+class State implements StateInterface {
+
+  /**
+   * The workflow the state is attached to.
+   *
+   * @var \Drupal\workflows\WorkflowInterface
+   */
+  protected $workflow;
+
+  /**
+   * The state's ID.
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * The state's label.
+   *
+   * @var string
+   */
+  protected $label;
+
+  /**
+   * The state's weight.
+   *
+   * @var int
+   */
+  protected $weight;
+
+  /**
+   * State constructor.
+   *
+   * @param \Drupal\workflows\WorkflowInterface $workflow
+   *   The workflow the state is attached to.
+   * @param string $id
+   *   The state's ID.
+   * @param string $label
+   *   The state's label.
+   * @param int $weight
+   *   The state's weight.
+   */
+  public function __construct(WorkflowInterface $workflow, $id, $label, $weight = 0) {
+    $this->workflow = $workflow;
+    $this->id = $id;
+    $this->label = $label;
+    $this->weight = $weight;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function id() {
+    return $this->id;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function label() {
+    return $this->label;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function weight() {
+    return $this->weight;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function canTransitionTo($to_state_id) {
+    return $this->workflow->hasTransitionFromStateToState($this->id, $to_state_id);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTransitionTo($to_state_id) {
+    if (!$this->canTransitionTo($to_state_id)) {
+      throw new \InvalidArgumentException("Can not transition to '$to_state_id' state");
+    }
+    return $this->workflow->getTransitionFromStateToState($this->id(), $to_state_id);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTransitions() {
+    return $this->workflow->getTransitionsForState($this->id);
+  }
+
+  /**
+   * Helper method to convert a list of states to labels
+   *
+   * @param \Drupal\workflows\StateInterface $state
+   *
+   * @return string
+   *   The label of the state.
+   */
+  public static function labelCallback(StateInterface $state) {
+    return $state->label();
+  }
+
+}
diff --git a/web/core/modules/workflows/src/StateInterface.php b/web/core/modules/workflows/src/StateInterface.php
new file mode 100644
index 000000000..6aa16e9d9
--- /dev/null
+++ b/web/core/modules/workflows/src/StateInterface.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Drupal\workflows;
+
+/**
+ * An interface for state value objects.
+ *
+ * @see \Drupal\workflows\WorkflowTypeInterface::decorateState()
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+interface StateInterface {
+
+  /**
+   * Gets the state's ID.
+   *
+   * @return string
+   *   The state's ID.
+   */
+  public function id();
+
+  /**
+   * Gets the state's label.
+   *
+   * @return string
+   *   The state's label.
+   */
+  public function label();
+
+  /**
+   * Gets the state's weight.
+   *
+   * @return int
+   *   The state's weight.
+   */
+  public function weight();
+
+  /**
+   * Determines if the state can transition to the provided state ID.
+   *
+   * @param $to_state_id
+   *   The state to transition to.
+   *
+   * @return bool
+   *   TRUE if the state can transition to the provided state ID. FALSE, if not.
+   */
+  public function canTransitionTo($to_state_id);
+
+  /**
+   * Gets the Transition object for the provided state ID.
+   *
+   * @param $to_state_id
+   *   The state to transition to.
+   *
+   * @return \Drupal\workflows\TransitionInterface
+   *   The Transition object for the provided state ID.
+   *
+   * @throws \InvalidArgumentException()
+   *   Exception thrown when the provided state ID can not be transitioned to.
+   */
+  public function getTransitionTo($to_state_id);
+
+  /**
+   * Gets all the possible transition objects for the state.
+   *
+   * @return \Drupal\workflows\TransitionInterface[]
+   *   All the possible transition objects for the state.
+   */
+  public function getTransitions();
+
+}
diff --git a/web/core/modules/workflows/src/Transition.php b/web/core/modules/workflows/src/Transition.php
new file mode 100644
index 000000000..d8c21b639
--- /dev/null
+++ b/web/core/modules/workflows/src/Transition.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace Drupal\workflows;
+
+/**
+ * A transition value object that describes the transition between states.
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+class Transition implements TransitionInterface {
+
+  /**
+   * The workflow that this transition is attached to.
+   *
+   * @var \Drupal\workflows\WorkflowInterface
+   */
+  protected $workflow;
+
+  /**
+   * The transition's ID.
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * The transition's label.
+   *
+   * @var string
+   */
+  protected $label;
+
+  /**
+   * The transition's from state IDs.
+   *
+   * @var string[]
+   */
+  protected $fromStateIds;
+
+  /**
+   * The transition's to state ID.
+   *
+   * @var string
+   */
+  protected $toStateId;
+
+  /**
+   * The transition's weight.
+   *
+   * @var int
+   */
+  protected $weight;
+
+  /**
+   * Transition constructor.
+   *
+   * @param \Drupal\workflows\WorkflowInterface $workflow
+   *   The workflow the state is attached to.
+   * @param string $id
+   *   The transition's ID.
+   * @param string $label
+   *   The transition's label.
+   * @param array $from_state_ids
+   *   A list of from state IDs.
+   * @param string $to_state_id
+   *   The to state ID.
+   * @param int $weight
+   *   (optional) The transition's weight. Defaults to 0.
+   */
+  public function __construct(WorkflowInterface $workflow, $id, $label, array $from_state_ids, $to_state_id, $weight = 0) {
+    $this->workflow = $workflow;
+    $this->id = $id;
+    $this->label = $label;
+    $this->fromStateIds = $from_state_ids;
+    $this->toStateId = $to_state_id;
+    $this->weight = $weight;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function id() {
+    return $this->id;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function label() {
+    return $this->label;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function from() {
+    return $this->workflow->getStates($this->fromStateIds);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function to() {
+    return $this->workflow->getState($this->toStateId);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function weight() {
+    return $this->weight;
+  }
+
+}
diff --git a/web/core/modules/workflows/src/TransitionInterface.php b/web/core/modules/workflows/src/TransitionInterface.php
new file mode 100644
index 000000000..c178b22da
--- /dev/null
+++ b/web/core/modules/workflows/src/TransitionInterface.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\workflows;
+
+/**
+ * A transition value object that describes the transition between two states.
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+interface TransitionInterface {
+
+  /**
+   * Gets the transition's ID.
+   *
+   * @return string
+   *   The transition's ID.
+   */
+  public function id();
+
+  /**
+   * Gets the transition's label.
+   *
+   * @return string
+   *   The transition's label.
+   */
+  public function label();
+
+  /**
+   * Gets the transition's from states.
+   *
+   * @return \Drupal\workflows\StateInterface[]
+   *   The transition's from states.
+   */
+  public function from();
+
+  /**
+   * Gets the transition's to state.
+   *
+   * @return \Drupal\workflows\StateInterface
+   *   The transition's to state.
+   */
+  public function to();
+
+  /**
+   * Gets the transition's weight.
+   *
+   * @return string
+   *   The transition's weight.
+   */
+  public function weight();
+
+}
diff --git a/web/core/modules/workflows/src/WorkflowAccessControlHandler.php b/web/core/modules/workflows/src/WorkflowAccessControlHandler.php
new file mode 100644
index 000000000..156f0091c
--- /dev/null
+++ b/web/core/modules/workflows/src/WorkflowAccessControlHandler.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Drupal\workflows;
+
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Entity\EntityAccessControlHandler;
+use Drupal\Core\Entity\EntityHandlerInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Access\AccessResult;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Access controller for the Moderation State entity.
+ *
+ * @see \Drupal\workflows\Entity\Workflow.
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+class WorkflowAccessControlHandler extends EntityAccessControlHandler implements EntityHandlerInterface {
+
+  /**
+   * The workflow type plugin manager.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   */
+  protected $workflowTypeManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    return new static(
+      $entity_type,
+      $container->get('plugin.manager.workflows.type')
+    );
+  }
+
+  /**
+   * Constructs the workflow access control handler instance.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type definition.
+   * @param \Drupal\Component\Plugin\PluginManagerInterface $workflow_type_manager
+   *   The workflow type plugin manager.
+   */
+  public function __construct(EntityTypeInterface $entity_type, PluginManagerInterface $workflow_type_manager) {
+    parent::__construct($entity_type);
+    $this->workflowTypeManager = $workflow_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
+    /** @var \Drupal\workflows\Entity\Workflow $entity */
+    $workflow_type = $entity->getTypePlugin();
+    if (strpos($operation, 'delete-state') === 0) {
+      list(, $state_id) = explode(':', $operation, 2);
+      // Deleting a state is editing a workflow, but also we should forbid
+      // access if there is only one state.
+      $admin_access = AccessResult::allowedIf(count($entity->getStates()) > 1)
+        ->andIf(parent::checkAccess($entity, 'edit', $account))
+        ->andIf(AccessResult::allowedIf(!in_array($state_id, $workflow_type->getRequiredStates(), TRUE)))
+        ->addCacheableDependency($entity);
+    }
+    else {
+      $admin_access = parent::checkAccess($entity, $operation, $account);
+    }
+    return $workflow_type->checkWorkflowAccess($entity, $operation, $account)->orIf($admin_access);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
+    $workflow_types_count = count($this->workflowTypeManager->getDefinitions());
+    $admin_access = parent::checkCreateAccess($account, $context, $entity_bundle);
+    // Allow access if there is at least one workflow type. Since workflow types
+    // are provided by modules this is cacheable until extensions change.
+    return $admin_access->andIf(AccessResult::allowedIf($workflow_types_count > 0))->addCacheTags(['config:core.extension']);
+  }
+
+}
diff --git a/web/core/modules/workflows/src/WorkflowDeleteAccessCheck.php b/web/core/modules/workflows/src/WorkflowDeleteAccessCheck.php
new file mode 100644
index 000000000..df3b7dd27
--- /dev/null
+++ b/web/core/modules/workflows/src/WorkflowDeleteAccessCheck.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\workflows;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Routing\Access\AccessInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Session\AccountInterface;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Provides a access checker for deleting a workflow state.
+ */
+class WorkflowDeleteAccessCheck implements AccessInterface {
+
+  /**
+   * Checks access to deleting a workflow state for a particular route.
+   *
+   * The value of '_workflow_state_delete_access' is ignored. The route must
+   * have the parameters 'workflow' and 'workflow_state'. For example:
+   * @code
+   * pattern: '/foo/{workflow}/bar/{workflow_state}/delete'
+   * requirements:
+   *   _workflow_state_delete_access: 'true'
+   * @endcode
+   * @see \Drupal\Core\ParamConverter\EntityConverter
+   *
+   * @param \Symfony\Component\Routing\Route $route
+   *   The route to check against.
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The parametrized route
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The currently logged in account.
+   *
+   * @return \Drupal\Core\Access\AccessResultInterface
+   *   The access result.
+   */
+  public function access(Route $route, RouteMatchInterface $route_match, AccountInterface $account) {
+    // If there is valid entity of the given entity type, check its access.
+    $parameters = $route_match->getParameters();
+    if ($parameters->has('workflow') && $parameters->has('workflow_state')) {
+      $entity = $parameters->get('workflow');
+      if ($entity instanceof EntityInterface) {
+        return $entity->access('delete-state:' . $parameters->get('workflow_state'), $account, TRUE);
+      }
+    }
+    // No opinion, so other access checks should decide if access should be
+    // allowed or not.
+    return AccessResult::neutral();
+  }
+
+}
diff --git a/web/core/modules/workflows/src/WorkflowInterface.php b/web/core/modules/workflows/src/WorkflowInterface.php
new file mode 100644
index 000000000..d014ddb78
--- /dev/null
+++ b/web/core/modules/workflows/src/WorkflowInterface.php
@@ -0,0 +1,289 @@
+<?php
+
+namespace Drupal\workflows;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+/**
+ * Provides an interface for defining workflow entities.
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+interface WorkflowInterface extends ConfigEntityInterface {
+
+  /**
+   * Adds a state to the workflow.
+   *
+   * @param string $state_id
+   *   The state's ID.
+   * @param string $label
+   *   The state's label.
+   *
+   * @return \Drupal\workflows\WorkflowInterface
+   *   The workflow entity.
+   */
+  public function addState($state_id, $label);
+
+  /**
+   * Determines if the workflow has a state with the provided ID.
+   *
+   * @param string $state_id
+   *   The state's ID.
+   *
+   * @return bool
+   *   TRUE if the workflow has a state with the provided ID, FALSE if not.
+   */
+  public function hasState($state_id);
+
+  /**
+   * Gets state objects for the provided state IDs.
+   *
+   * @param string[] $state_ids
+   *   A list of state IDs to get. If NULL then all states will be returned.
+   *
+   * @return \Drupal\workflows\StateInterface[]
+   *   An array of workflow states.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if $state_ids contains a state ID that does not exist.
+   */
+  public function getStates($state_ids = NULL);
+
+  /**
+   * Gets a workflow state.
+   *
+   * @param string $state_id
+   *   The state's ID.
+   *
+   * @return \Drupal\workflows\StateInterface
+   *   The workflow state.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if $state_id does not exist.
+   */
+  public function getState($state_id);
+
+  /**
+   * Sets a state's label.
+   *
+   * @param string $state_id
+   *   The state ID to set the label for.
+   * @param string $label
+   *   The state's label.
+   *
+   * @return \Drupal\workflows\WorkflowInterface
+   *   The workflow entity.
+   */
+  public function setStateLabel($state_id, $label);
+
+  /**
+   * Sets a state's weight value.
+   *
+   * @param string $state_id
+   *   The state ID to set the weight for.
+   * @param int $weight
+   *   The state's weight.
+   *
+   * @return \Drupal\workflows\WorkflowInterface
+   *   The workflow entity.
+   */
+  public function setStateWeight($state_id, $weight);
+
+  /**
+   * Deletes a state from the workflow.
+   *
+   * @param string $state_id
+   *   The state ID to delete.
+   *
+   * @return \Drupal\workflows\WorkflowInterface
+   *   The workflow entity.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if $state_id does not exist.
+   */
+  public function deleteState($state_id);
+
+  /**
+   * Gets the initial state for the workflow.
+   *
+   * @return \Drupal\workflows\StateInterface
+   *   The initial state.
+   */
+  public function getInitialState();
+
+  /**
+   * Adds a transition to the workflow.
+   *
+   * @param string $id
+   *   The transition ID.
+   * @param string $label
+   *   The transition's label.
+   * @param array $from_state_ids
+   *   The state IDs to transition from.
+   * @param string $to_state_id
+   *   The state ID to transition to.
+   *
+   * @return \Drupal\workflows\WorkflowInterface
+   *   The workflow entity.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if either state does not exist.
+   */
+  public function addTransition($id, $label, array $from_state_ids, $to_state_id);
+
+  /**
+   * Gets a transition object for the provided transition ID.
+   *
+   * @param string $transition_id
+   *   A transition ID.
+   *
+   * @return \Drupal\workflows\TransitionInterface
+   *   The transition.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if $transition_id does not exist.
+   */
+  public function getTransition($transition_id);
+
+  /**
+   * Determines if a transition exists.
+   *
+   * @param string $transition_id
+   *   The transition ID.
+   *
+   * @return bool
+   *   TRUE if the transition exists, FALSE if not.
+   */
+  public function hasTransition($transition_id);
+
+  /**
+   * Gets transition objects for the provided transition IDs.
+   *
+   * @param string[] $transition_ids
+   *   A list of transition IDs to get. If NULL then all transitions will be
+   *   returned.
+   *
+   * @return \Drupal\workflows\TransitionInterface[]
+   *   An array of transition objects.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if $transition_ids contains a transition ID that does not exist.
+   */
+  public function getTransitions(array $transition_ids = NULL);
+
+  /**
+   * Gets the transition IDs for a state for the provided direction.
+   *
+   * @param $state_id
+   *   The state to get transitions for.
+   * @param string $direction
+   *   (optional) The direction of the transition. Defaults to 'from'. Possible
+   *   values are: 'from' and 'to'.
+   *
+   * @return array
+   *   The transition IDs for a state for the provided direction.
+   */
+  public function getTransitionsForState($state_id, $direction = 'from');
+
+  /**
+   * Gets a transition from state to state.
+   *
+   * @param string $from_state_id
+   *   The state ID to transition from.
+   * @param string $to_state_id
+   *   The state ID to transition to.
+   *
+   * @return \Drupal\workflows\TransitionInterface
+   *   The transitions.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if the transition does not exist.
+   */
+  public function getTransitionFromStateToState($from_state_id, $to_state_id);
+
+  /**
+   * Determines if a transition from state to state exists.
+   *
+   * @param string $from_state_id
+   *   The state ID to transition from.
+   * @param string $to_state_id
+   *   The state ID to transition to.
+   *
+   * @return bool
+   *   TRUE if the transition exists, FALSE if not.
+   */
+  public function hasTransitionFromStateToState($from_state_id, $to_state_id);
+
+  /**
+   * Sets a transition's label.
+   *
+   * @param string $transition_id
+   *   The transition ID.
+   * @param string $label
+   *   The transition's label.
+   *
+   * @return \Drupal\workflows\WorkflowInterface
+   *   The workflow entity.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if the transition does not exist.
+   */
+  public function setTransitionLabel($transition_id, $label);
+
+  /**
+   * Sets a transition's weight.
+   *
+   * @param string $transition_id
+   *   The transition ID.
+   * @param int $weight
+   *   The transition's weight.
+   *
+   * @return \Drupal\workflows\WorkflowInterface
+   *   The workflow entity.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if the transition does not exist.
+   */
+  public function setTransitionWeight($transition_id, $weight);
+
+  /**
+   * Sets a transition's from states.
+   *
+   * @param string $transition_id
+   *   The transition ID.
+   * @param array $from_state_ids
+   *   The state IDs to transition from.
+   *
+   * @return \Drupal\workflows\WorkflowInterface
+   *   The workflow entity.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if the transition does not exist or the states do not exist.
+   */
+  public function setTransitionFromStates($transition_id, array   $from_state_ids);
+
+  /**
+   * Deletes a transition.
+   *
+   * @param string $transition_id
+   *   The transition ID.
+   *
+   * @return \Drupal\workflows\WorkflowInterface
+   *   The workflow entity.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if the transition does not exist.
+   */
+  public function deleteTransition($transition_id);
+
+  /**
+   * Gets the workflow type plugin.
+   *
+   * @return \Drupal\workflows\WorkflowTypeInterface
+   *   The workflow type plugin.
+   */
+  public function getTypePlugin();
+
+}
diff --git a/web/core/modules/workflows/src/WorkflowListBuilder.php b/web/core/modules/workflows/src/WorkflowListBuilder.php
new file mode 100644
index 000000000..3e94103f4
--- /dev/null
+++ b/web/core/modules/workflows/src/WorkflowListBuilder.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Drupal\workflows;
+
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a listing of Workflow entities.
+ */
+class WorkflowListBuilder extends ConfigEntityListBuilder {
+
+  /**
+   * The workflow type plugin manager.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   */
+  protected $workflowTypeManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    return new static(
+      $entity_type,
+      $container->get('entity_type.manager')->getStorage($entity_type->id()),
+      $container->get('plugin.manager.workflows.type')
+    );
+  }
+
+  /**
+   * Constructs a new WorkflowListBuilder object.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type definition.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
+   *   The entity storage class.
+   * @param \Drupal\Component\Plugin\PluginManagerInterface $workflow_type_manager
+   *   The workflow type plugin manager.
+   */
+  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, PluginManagerInterface $workflow_type_manager) {
+    parent::__construct($entity_type, $storage);
+    $this->workflowTypeManager = $workflow_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'workflow_admin_overview_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    $header['label'] = $this->t('Workflow');
+    $header['type'] = $this->t('Type');
+    $header['states'] = $this->t('States');
+
+    return $header + parent::buildHeader();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    /** @var \Drupal\workflows\WorkflowInterface $entity */
+    $row['label'] = $entity->label();
+
+    $row['type']['data'] = [
+      '#markup' => $entity->getTypePlugin()->label()
+    ];
+
+    $items = array_map([State::class, 'labelCallback'], $entity->getStates());
+    $row['states']['data'] = [
+      '#theme' => 'item_list',
+      '#context' => ['list_style' => 'comma-list'],
+      '#items' => $items,
+    ];
+
+    return $row + parent::buildRow($entity);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function render() {
+    $build = parent::render();
+    $workflow_types_count = count($this->workflowTypeManager->getDefinitions());
+    if ($workflow_types_count === 0) {
+      $build['table']['#empty'] = $this->t('There are no workflow types available. In order to create workflows you need to install a module that provides a workflow type. For example, the Content Moderation module provides a workflow type that enables workflows for content entities.');
+    }
+    return $build;
+  }
+
+}
diff --git a/web/core/modules/workflows/src/WorkflowTypeInterface.php b/web/core/modules/workflows/src/WorkflowTypeInterface.php
new file mode 100644
index 000000000..0fe668547
--- /dev/null
+++ b/web/core/modules/workflows/src/WorkflowTypeInterface.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace Drupal\workflows;
+
+use Drupal\Component\Plugin\ConfigurablePluginInterface;
+use Drupal\Component\Plugin\DerivativeInspectionInterface;
+use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Session\AccountInterface;
+
+/**
+ * An interface for Workflow type plugins.
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+interface WorkflowTypeInterface extends PluginInspectionInterface, DerivativeInspectionInterface, ConfigurablePluginInterface {
+
+  /**
+   * Initializes a workflow.
+   *
+   * Used to create required states and default transitions.
+   *
+   * @param \Drupal\workflows\WorkflowInterface $workflow
+   *   The workflow to initialize.
+   *
+   * @return \Drupal\workflows\WorkflowInterface
+   *   The initialized workflow.
+   *
+   * @see \Drupal\workflows\Form\WorkflowAddForm::save()
+   */
+  public function initializeWorkflow(WorkflowInterface $workflow);
+
+  /**
+   * Gets the label for the workflow type.
+   *
+   * @return string
+   *   The workflow type label.
+   */
+  public function label();
+
+  /**
+   * Performs access checks.
+   *
+   * @param \Drupal\workflows\WorkflowInterface $entity
+   *   The workflow entity for which to check access.
+   * @param string $operation
+   *   The entity operation. Usually one of 'view', 'view label', 'update' or
+   *   'delete'.
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user for which to check access.
+   *
+   * @return \Drupal\Core\Access\AccessResultInterface
+   *   The access result.
+   */
+  public function checkWorkflowAccess(WorkflowInterface $entity, $operation, AccountInterface $account);
+
+  /**
+   * Decorates states so the WorkflowType can add additional information.
+   *
+   * @param \Drupal\workflows\StateInterface $state
+   *   The state object to decorate.
+   *
+   * @return \Drupal\workflows\StateInterface
+   *   The decorated state object.
+   */
+  public function decorateState(StateInterface $state);
+
+  /**
+   * React to the removal of a state from a workflow.
+   *
+   * @param string $state_id
+   *   The state ID of the state that is being removed.
+   */
+  public function deleteState($state_id);
+
+  /**
+   * Decorates transitions so the WorkflowType can add additional information.
+   * @param \Drupal\workflows\TransitionInterface $transition
+   *   The transition object to decorate.
+   *
+   * @return \Drupal\workflows\TransitionInterface
+   *   The decorated transition object.
+   */
+  public function decorateTransition(TransitionInterface $transition);
+
+  /**
+   * React to the removal of a transition from a workflow.
+   *
+   * @param string $transition_id
+   *   The transition ID of the transition that is being removed.
+   */
+  public function deleteTransition($transition_id);
+
+  /**
+   * Builds a form to be added to the Workflow state edit form.
+   *
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The form state.
+   * @param \Drupal\workflows\WorkflowInterface $workflow
+   *   The workflow the state is attached to.
+   * @param \Drupal\workflows\StateInterface|null $state
+   *   The workflow state being edited. If NULL, a new state is being added.
+   *
+   * @return array
+   *   Form elements to add to a workflow state form for customisations to the
+   *   workflow.
+   *
+   * @see \Drupal\workflows\Form\WorkflowStateAddForm::form()
+   * @see \Drupal\workflows\Form\WorkflowStateEditForm::form()
+   */
+  public function buildStateConfigurationForm(FormStateInterface $form_state, WorkflowInterface $workflow, StateInterface $state = NULL);
+
+  /**
+   * Builds a form to be added to the Workflow transition edit form.
+   *
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The form state.
+   * @param \Drupal\workflows\WorkflowInterface $workflow
+   *   The workflow the state is attached to.
+   * @param \Drupal\workflows\TransitionInterface|null $transition
+   *   The workflow transition being edited. If NULL, a new transition is being
+   *   added.
+   *
+   * @return array
+   *   Form elements to add to a workflow transition form for customisations to
+   *   the workflow.
+   *
+   * @see \Drupal\workflows\Form\WorkflowTransitionAddForm::form()
+   * @see \Drupal\workflows\Form\WorkflowTransitionEditForm::form()
+   */
+  public function buildTransitionConfigurationForm(FormStateInterface $form_state, WorkflowInterface $workflow, TransitionInterface $transition = NULL);
+
+  /**
+   * Gets the required states of workflow type.
+   *
+   * This are usually configured in the workflow type annotation.
+   *
+   * @return array[]
+   *   The required states.
+   *
+   * @see \Drupal\workflows\Annotation\WorkflowType
+   */
+  public function getRequiredStates();
+
+  /**
+   * Informs the plugin that a dependency of the workflow will be deleted.
+   *
+   * @param array $dependencies
+   *   An array of dependencies that will be deleted keyed by dependency type.
+   *
+   * @return bool
+   *   TRUE if the workflow settings have been changed, FALSE if not.
+   *
+   * @see \Drupal\Core\Config\ConfigEntityInterface::onDependencyRemoval()
+   *
+   * @todo https://www.drupal.org/node/2579743 make part of a generic interface.
+   */
+  public function onDependencyRemoval(array $dependencies);
+
+}
diff --git a/web/core/modules/workflows/src/WorkflowTypeManager.php b/web/core/modules/workflows/src/WorkflowTypeManager.php
new file mode 100644
index 000000000..b2eafa863
--- /dev/null
+++ b/web/core/modules/workflows/src/WorkflowTypeManager.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\workflows;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
+use Drupal\workflows\Annotation\WorkflowType;
+
+/**
+ * Provides a Workflow type plugin manager.
+ *
+ * @see \Drupal\workflows\Annotation\WorkflowType
+ * @see \Drupal\workflows\WorkflowTypeInterface
+ * @see plugin_api
+ *
+ * @internal
+ *   The workflow system is currently experimental and should only be leveraged
+ *   by experimental modules and development releases of contributed modules.
+ */
+class WorkflowTypeManager extends DefaultPluginManager {
+
+  /**
+   * Constructs a new class instance.
+   *
+   * @param \Traversable $namespaces
+   *   An object that implements \Traversable which contains the root paths
+   *   keyed by the corresponding namespace to look for plugin implementations.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   Cache backend instance to use.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler to invoke the alter hook with.
+   */
+  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
+    parent::__construct('Plugin/WorkflowType', $namespaces, $module_handler, WorkflowTypeInterface::class, WorkflowType::class);
+    $this->alterInfo('workflow_type_info');
+    $this->setCacheBackend($cache_backend, 'workflow_type_info');
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/modules/workflow_third_party_settings_test/config/schema/workflow_third_party_settings_test.schema.yml b/web/core/modules/workflows/tests/modules/workflow_third_party_settings_test/config/schema/workflow_third_party_settings_test.schema.yml
new file mode 100644
index 000000000..d1a2b4eea
--- /dev/null
+++ b/web/core/modules/workflows/tests/modules/workflow_third_party_settings_test/config/schema/workflow_third_party_settings_test.schema.yml
@@ -0,0 +1,2 @@
+workflows.workflow.*.third_party.workflow_third_party_settings_test:
+  type: ignore
diff --git a/web/core/modules/workflows/tests/modules/workflow_third_party_settings_test/workflow_third_party_settings_test.info.yml b/web/core/modules/workflows/tests/modules/workflow_third_party_settings_test/workflow_third_party_settings_test.info.yml
new file mode 100644
index 000000000..5b152f7be
--- /dev/null
+++ b/web/core/modules/workflows/tests/modules/workflow_third_party_settings_test/workflow_third_party_settings_test.info.yml
@@ -0,0 +1,8 @@
+name: 'Workflow Third Party Settings Test'
+type: module
+description: 'Allows third party settings on workflows to be tested.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - workflows
diff --git a/web/core/modules/workflows/tests/modules/workflow_type_test/config/schema/workflow_type_test.schema.yml b/web/core/modules/workflows/tests/modules/workflow_type_test/config/schema/workflow_type_test.schema.yml
new file mode 100644
index 000000000..84e7a4169
--- /dev/null
+++ b/web/core/modules/workflows/tests/modules/workflow_type_test/config/schema/workflow_type_test.schema.yml
@@ -0,0 +1,42 @@
+workflow.type_settings.workflow_type_test:
+  type: mapping
+  label: 'Workflow test type settings'
+  mapping:
+    states:
+      type: sequence
+      sequence:
+        type: ignore
+
+workflow.type_settings.workflow_type_required_state_test:
+  type: mapping
+  label: 'Workflow test type settings'
+  mapping:
+    states:
+      type: sequence
+      sequence:
+        type: ignore
+
+workflow.type_settings.workflow_type_complex_test:
+  type: mapping
+  label: 'Workflow complex test type settings'
+  mapping:
+    states:
+      type: sequence
+      label: 'Additional state configuration'
+      sequence:
+        type: mapping
+        label: 'States'
+        mapping:
+          extra:
+            type: string
+            label: 'Extra information'
+    transitions:
+      type: sequence
+      label: 'Additional transition configuration'
+      sequence:
+        type: mapping
+        label: 'Transitions'
+        mapping:
+          extra:
+            type: string
+            label: 'Extra information'
diff --git a/web/core/modules/workflows/tests/modules/workflow_type_test/src/DecoratedState.php b/web/core/modules/workflows/tests/modules/workflow_type_test/src/DecoratedState.php
new file mode 100644
index 000000000..793e8993a
--- /dev/null
+++ b/web/core/modules/workflows/tests/modules/workflow_type_test/src/DecoratedState.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Drupal\workflow_type_test;
+
+use Drupal\workflows\StateInterface;
+
+/**
+ * A value object representing a workflow state.
+ */
+class DecoratedState implements StateInterface {
+
+  /**
+   * The vanilla state object from the Workflow module.
+   *
+   * @var \Drupal\workflows\StateInterface
+   */
+  protected $state;
+
+  /**
+   * Extra information added to state.
+   *
+   * @var string
+   */
+  protected $extra;
+
+  /**
+   * DecoratedState constructor.
+   *
+   * @param \Drupal\workflows\StateInterface $state
+   *   The vanilla state object from the Workflow module.
+   * @param string $extra
+   *   (optional) Extra information stored on the state. Defaults to ''.
+   */
+  public function __construct(StateInterface $state, $extra = '') {
+    $this->state = $state;
+    $this->extra = $extra;
+  }
+
+  /**
+   * Gets the extra information stored on the state.
+   *
+   * @return string
+   */
+  public function getExtra() {
+    return $this->extra;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function id() {
+    return $this->state->id();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function label() {
+    return $this->state->label();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function weight() {
+    return $this->state->weight();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function canTransitionTo($to_state_id) {
+    return $this->state->canTransitionTo($to_state_id);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTransitionTo($to_state_id) {
+    return $this->state->getTransitionTo($to_state_id);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTransitions() {
+    return $this->state->getTransitions();
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/modules/workflow_type_test/src/DecoratedTransition.php b/web/core/modules/workflows/tests/modules/workflow_type_test/src/DecoratedTransition.php
new file mode 100644
index 000000000..d7690d519
--- /dev/null
+++ b/web/core/modules/workflows/tests/modules/workflow_type_test/src/DecoratedTransition.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Drupal\workflow_type_test;
+
+use Drupal\workflows\TransitionInterface;
+
+/**
+ * A value object representing a workflow transition.
+ */
+class DecoratedTransition implements TransitionInterface {
+
+  /**
+   * The vanilla transition object from the Workflow module.
+   *
+   * @var \Drupal\workflows\TransitionInterface
+   */
+  protected $transition;
+
+  /**
+   * Extra information added to transition.
+   *
+   * @var string
+   */
+  protected $extra;
+
+  /**
+   * DecoratedTransition constructor.
+   *
+   * @param \Drupal\workflows\TransitionInterface $transition
+   *   The vanilla transition object from the Workflow module.
+   * @param string $extra
+   *   (optional) Extra information stored on the transition. Defaults to ''.
+   */
+  public function __construct(TransitionInterface $transition, $extra = '') {
+    $this->transition = $transition;
+    $this->extra = $extra;
+  }
+
+  /**
+   * Gets the extra information stored on the transition.
+   *
+   * @return string
+   */
+  public function getExtra() {
+    return $this->extra;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function id() {
+    return $this->transition->id();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function label() {
+    return $this->transition->label();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function from() {
+    return $this->transition->from();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function to() {
+    return $this->transition->to();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function weight() {
+    return $this->transition->weight();
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/ComplexTestType.php b/web/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/ComplexTestType.php
new file mode 100644
index 000000000..a254a4f31
--- /dev/null
+++ b/web/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/ComplexTestType.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Drupal\workflow_type_test\Plugin\WorkflowType;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\workflows\Plugin\WorkflowTypeBase;
+use Drupal\workflows\StateInterface;
+use Drupal\workflows\TransitionInterface;
+use Drupal\workflows\WorkflowInterface;
+use Drupal\workflow_type_test\DecoratedState;
+use Drupal\workflow_type_test\DecoratedTransition;
+
+/**
+ * Test workflow type.
+ *
+ * @WorkflowType(
+ *   id = "workflow_type_complex_test",
+ *   label = @Translation("Workflow Type Complex Test"),
+ * )
+ */
+class ComplexTestType extends WorkflowTypeBase {
+
+  use StringTranslationTrait;
+
+  /**
+   * {@inheritDoc}
+   */
+  public function decorateState(StateInterface $state) {
+    if (isset($this->configuration['states'][$state->id()])) {
+      $state = new DecoratedState($state, $this->configuration['states'][$state->id()]['extra']);
+    }
+    else {
+      $state = new DecoratedState($state);
+    }
+    return $state;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function decorateTransition(TransitionInterface $transition) {
+    if (isset($this->configuration['transitions'][$transition->id()])) {
+      $transition = new DecoratedTransition($transition, $this->configuration['transitions'][$transition->id()]['extra']);
+    }
+    else {
+      $transition = new DecoratedTransition($transition);
+    }
+    return $transition;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildStateConfigurationForm(FormStateInterface $form_state, WorkflowInterface $workflow, StateInterface $state = NULL) {
+    /** @var \Drupal\workflow_type_test\DecoratedState $state */
+    $form = [];
+    $form['extra'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Extra'),
+      '#description' => $this->t('Extra information added to state'),
+      '#default_value' => isset($state) ? $state->getExtra() : FALSE,
+    ];
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildTransitionConfigurationForm(FormStateInterface $form_state, WorkflowInterface $workflow, TransitionInterface $transition = NULL) {
+    /** @var \Drupal\workflow_type_test\DecoratedTransition $transition */
+    $form = [];
+    $form['extra'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Extra'),
+      '#description' => $this->t('Extra information added to transition'),
+      '#default_value' => isset($transition) ? $transition->getExtra() : FALSE,
+    ];
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function onDependencyRemoval(array $dependencies) {
+    // Always return TRUE to allow the logic in
+    // \Drupal\workflows\Entity\Workflow::onDependencyRemoval() to be tested.
+    return TRUE;
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/RequiredStateTestType.php b/web/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/RequiredStateTestType.php
new file mode 100644
index 000000000..493355715
--- /dev/null
+++ b/web/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/RequiredStateTestType.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Drupal\workflow_type_test\Plugin\WorkflowType;
+
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\workflows\Plugin\WorkflowTypeBase;
+use Drupal\workflows\WorkflowInterface;
+
+/**
+ * Test workflow type.
+ *
+ * @WorkflowType(
+ *   id = "workflow_type_required_state_test",
+ *   label = @Translation("Required State Type Test"),
+ *   required_states = {
+ *     "fresh",
+ *     "rotten",
+ *   }
+ * )
+ */
+class RequiredStateTestType extends WorkflowTypeBase {
+
+  use StringTranslationTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function initializeWorkflow(WorkflowInterface $workflow) {
+    $workflow
+      ->addState('fresh', $this->t('Fresh'))
+      ->setStateWeight('fresh', -5)
+      ->addState('rotten', $this->t('Rotten'))
+      ->addTransition('rot', $this->t('Rot'), ['fresh'], 'rotten');
+    return $workflow;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function defaultConfiguration() {
+    // No configuration is stored for the test type.
+    return [];
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/TestType.php b/web/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/TestType.php
new file mode 100644
index 000000000..2ff68a84a
--- /dev/null
+++ b/web/core/modules/workflows/tests/modules/workflow_type_test/src/Plugin/WorkflowType/TestType.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\workflow_type_test\Plugin\WorkflowType;
+
+use Drupal\workflows\Plugin\WorkflowTypeBase;
+
+/**
+ * Test workflow type.
+ *
+ * @WorkflowType(
+ *   id = "workflow_type_test",
+ *   label = @Translation("Workflow Type Test"),
+ * )
+ */
+class TestType extends WorkflowTypeBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function defaultConfiguration() {
+    // No configuration is stored for the test type.
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRequiredStates() {
+    // Normally this is obtained from the annotation but we get from state to
+    // allow dynamic testing.
+    return \Drupal::state()->get('workflow_type_test.required_states', []);
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/modules/workflow_type_test/workflow_type_test.info.yml b/web/core/modules/workflows/tests/modules/workflow_type_test/workflow_type_test.info.yml
new file mode 100644
index 000000000..80a8c8916
--- /dev/null
+++ b/web/core/modules/workflows/tests/modules/workflow_type_test/workflow_type_test.info.yml
@@ -0,0 +1,8 @@
+name: 'Workflow Type Test'
+type: module
+description: 'Provides a workflow type plugin for testing.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - workflows
diff --git a/web/core/modules/workflows/tests/src/Functional/WorkflowUiNoTypeTest.php b/web/core/modules/workflows/tests/src/Functional/WorkflowUiNoTypeTest.php
new file mode 100644
index 000000000..c0c7de6f5
--- /dev/null
+++ b/web/core/modules/workflows/tests/src/Functional/WorkflowUiNoTypeTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\Tests\workflows\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests workflow UI when there are no types.
+ *
+ * @group workflows
+ */
+class WorkflowUiNoTypeTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['workflows', 'block'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    // We're testing local actions.
+    $this->drupalPlaceBlock('local_actions_block');
+  }
+
+  /**
+   * Tests the creation of a workflow through the UI.
+   */
+  public function testWorkflowUiWithNoType() {
+    $this->drupalLogin($this->createUser(['access administration pages', 'administer workflows']));
+    $this->drupalGet('admin/config/workflow/workflows/add');
+    // There are no workflow types so this should be a 403.
+    $this->assertSession()->statusCodeEquals(403);
+
+    $this->drupalGet('admin/config/workflow/workflows');
+    $this->assertSession()->pageTextContains('There are no workflow types available. In order to create workflows you need to install a module that provides a workflow type. For example, the Content Moderation module provides a workflow type that enables workflows for content entities.');
+    $this->assertSession()->pageTextNotContains('Add workflow');
+
+    $this->container->get('module_installer')->install(['workflow_type_test']);
+    // The render cache needs to be cleared because although the cache tags are
+    // correctly set the render cache does not pick it up.
+    \Drupal::cache('render')->deleteAll();
+
+    $this->drupalGet('admin/config/workflow/workflows');
+    $this->assertSession()->pageTextNotContains('There are no workflow types available. In order to create workflows you need to install a module that provides a workflow type. For example, the Content Moderation module provides a workflow type that enables workflows for content entities.');
+    $this->assertSession()->linkExists('Add workflow');
+    $this->assertSession()->pageTextContains('There is no Workflow yet.');
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php b/web/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php
new file mode 100644
index 000000000..91c69b73f
--- /dev/null
+++ b/web/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php
@@ -0,0 +1,302 @@
+<?php
+
+namespace Drupal\Tests\workflows\Functional;
+
+use Drupal\Core\Url;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Tests workflow creation UI.
+ *
+ * @group workflows
+ */
+class WorkflowUiTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['workflows', 'workflow_type_test', 'block'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    // We're testing local actions.
+    $this->drupalPlaceBlock('local_actions_block');
+  }
+
+  /**
+   * Tests route access/permissions.
+   */
+  public function testAccess() {
+    // Create a minimal workflow for testing.
+    $workflow = Workflow::create(['id' => 'test', 'type' => 'workflow_type_test']);
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addTransition('publish', 'Publish', ['draft', 'published'], 'published')
+      ->save();
+
+    $paths = [
+      'admin/config/workflow/workflows',
+      'admin/config/workflow/workflows/add',
+      'admin/config/workflow/workflows/manage/test',
+      'admin/config/workflow/workflows/manage/test/delete',
+      'admin/config/workflow/workflows/manage/test/add_state',
+      'admin/config/workflow/workflows/manage/test/state/published',
+      'admin/config/workflow/workflows/manage/test/state/published/delete',
+      'admin/config/workflow/workflows/manage/test/add_transition',
+      'admin/config/workflow/workflows/manage/test/transition/publish',
+      'admin/config/workflow/workflows/manage/test/transition/publish/delete',
+    ];
+
+    foreach ($paths as $path) {
+      $this->drupalGet($path);
+      // No access.
+      $this->assertSession()->statusCodeEquals(403);
+    }
+    $this->drupalLogin($this->createUser(['administer workflows']));
+    foreach ($paths as $path) {
+      $this->drupalGet($path);
+      // User has access.
+      $this->assertSession()->statusCodeEquals(200);
+    }
+
+    // Ensure that default states can not be deleted.
+    \Drupal::state()->set('workflow_type_test.required_states', ['published']);
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/state/published/delete');
+    $this->assertSession()->statusCodeEquals(403);
+    \Drupal::state()->set('workflow_type_test.required_states', []);
+
+    // Delete one of the states and ensure the other test cannot be deleted.
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/state/published/delete');
+    $this->submitForm([], 'Delete');
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/state/draft/delete');
+    $this->assertSession()->statusCodeEquals(403);
+  }
+
+  /**
+   * Tests the creation of a workflow through the UI.
+   */
+  public function testWorkflowCreation() {
+    $workflow_storage = $this->container->get('entity_type.manager')->getStorage('workflow');
+    /** @var \Drupal\workflows\WorkflowInterface $workflow */
+    $this->drupalLogin($this->createUser(['access administration pages', 'administer workflows']));
+    $this->drupalGet('admin/config/workflow');
+    $this->assertSession()->linkByHrefExists('admin/config/workflow/workflows');
+    $this->clickLink('Workflows');
+    $this->assertSession()->pageTextContains('Workflows');
+    $this->assertSession()->pageTextContains('There is no Workflow yet.');
+    $this->clickLink('Add workflow');
+    $this->submitForm(['label' => 'Test', 'id' => 'test', 'workflow_type' => 'workflow_type_test'], 'Save');
+    $this->assertSession()->pageTextContains('Created the Test Workflow.');
+    $this->assertSession()->addressEquals('admin/config/workflow/workflows/manage/test/add_state');
+    $this->drupalGet('/admin/config/workflow/workflows/manage/test');
+    $this->assertSession()->pageTextContains('This workflow has no states and will be disabled until there is at least one, add a new state.');
+    $this->assertSession()->pageTextContains('There are no states yet.');
+    $this->clickLink('Add a new state');
+    $this->submitForm(['label' => 'Published', 'id' => 'published'], 'Save');
+    $this->assertSession()->pageTextContains('Created Published state.');
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertFalse($workflow->getState('published')->canTransitionTo('published'), 'No default transition from published to published exists.');
+
+    $this->clickLink('Add a new state');
+    // Don't create a draft to draft transition by default.
+    $this->submitForm(['label' => 'Draft', 'id' => 'draft'], 'Save');
+    $this->assertSession()->pageTextContains('Created Draft state.');
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertFalse($workflow->getState('draft')->canTransitionTo('draft'), 'Can not transition from draft to draft');
+
+    $this->clickLink('Add a new transition');
+    $this->submitForm(['id' => 'publish', 'label' => 'Publish', 'from[draft]' => 'draft', 'to' => 'published'], 'Save');
+    $this->assertSession()->pageTextContains('Created Publish transition.');
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertTrue($workflow->getState('draft')->canTransitionTo('published'), 'Can transition from draft to published');
+
+    $this->clickLink('Add a new transition');
+    $this->submitForm(['id' => 'create_new_draft', 'label' => 'Create new draft', 'from[draft]' => 'draft', 'to' => 'draft'], 'Save');
+    $this->assertSession()->pageTextContains('Created Create new draft transition.');
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertTrue($workflow->getState('draft')->canTransitionTo('draft'), 'Can transition from draft to draft');
+
+    // The fist state to edit on the page should be published.
+    $this->clickLink('Edit');
+    $this->assertSession()->fieldValueEquals('label', 'Published');
+    // Change the label.
+    $this->submitForm(['label' => 'Live'], 'Save');
+    $this->assertSession()->pageTextContains('Saved Live state.');
+
+    // Allow published to draft.
+    $this->clickLink('Edit', 3);
+    $this->submitForm(['from[published]' => 'published'], 'Save');
+    $this->assertSession()->pageTextContains('Saved Create new draft transition.');
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertTrue($workflow->getState('published')->canTransitionTo('draft'), 'Can transition from published to draft');
+
+    // Try creating a duplicate transition.
+    $this->clickLink('Add a new transition');
+    $this->submitForm(['id' => 'create_new_draft', 'label' => 'Create new draft', 'from[published]' => 'published', 'to' => 'draft'], 'Save');
+    $this->assertSession()->pageTextContains('The machine-readable name is already in use. It must be unique.');
+    // Try creating a transition which duplicates the states of another.
+    $this->submitForm(['id' => 'create_new_draft2', 'label' => 'Create new draft again', 'from[published]' => 'published', 'to' => 'draft'], 'Save');
+    $this->assertSession()->pageTextContains('The transition from Live to Draft already exists.');
+
+    // Create a new transition.
+    $this->submitForm(['id' => 'save_and_publish', 'label' => 'Save and publish', 'from[published]' => 'published', 'to' => 'published'], 'Save');
+    $this->assertSession()->pageTextContains('Created Save and publish transition.');
+    // Edit the new transition and try to add an existing transition.
+    $this->clickLink('Edit', 4);
+    $this->submitForm(['from[draft]' => 'draft'], 'Save');
+    $this->assertSession()->pageTextContains('The transition from Draft to Live already exists.');
+
+    // Delete the transition.
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertTrue($workflow->hasTransitionFromStateToState('published', 'published'), 'Can transition from published to published');
+    $this->clickLink('Delete');
+    $this->assertSession()->pageTextContains('Are you sure you want to delete Save and publish from Test?');
+    $this->submitForm([], 'Delete');
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertFalse($workflow->hasTransitionFromStateToState('published', 'published'), 'Cannot transition from published to published');
+
+    // Try creating a duplicate state.
+    $this->drupalGet('admin/config/workflow/workflows/manage/test');
+    $this->clickLink('Add a new state');
+    $this->submitForm(['label' => 'Draft', 'id' => 'draft'], 'Save');
+    $this->assertSession()->pageTextContains('The machine-readable name is already in use. It must be unique.');
+
+    // Ensure that weight changes the state ordering.
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertEquals('published', $workflow->getInitialState()->id());
+    $this->drupalGet('admin/config/workflow/workflows/manage/test');
+    $this->submitForm(['states[draft][weight]' => '-1'], 'Save');
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertEquals('draft', $workflow->getInitialState()->id());
+
+    // This will take us to the list of workflows, so we need to edit the
+    // workflow again.
+    $this->clickLink('Edit');
+
+    // Ensure that weight changes the transition ordering.
+    $this->assertEquals(['publish', 'create_new_draft'], array_keys($workflow->getTransitions()));
+    $this->drupalGet('admin/config/workflow/workflows/manage/test');
+    $this->submitForm(['transitions[create_new_draft][weight]' => '-1'], 'Save');
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertEquals(['create_new_draft', 'publish'], array_keys($workflow->getTransitions()));
+
+    // This will take us to the list of workflows, so we need to edit the
+    // workflow again.
+    $this->clickLink('Edit');
+
+    // Ensure that a delete link for the published state exists before deleting
+    // the draft state.
+    $published_delete_link = Url::fromRoute('entity.workflow.delete_state_form', [
+      'workflow' => $workflow->id(),
+      'workflow_state' => 'published',
+    ])->toString();
+    $draft_delete_link = Url::fromRoute('entity.workflow.delete_state_form', [
+      'workflow' => $workflow->id(),
+      'workflow_state' => 'draft',
+    ])->toString();
+    $this->assertSession()->elementContains('css', 'tr[data-drupal-selector="edit-states-published"]', 'Delete');
+    $this->assertSession()->linkByHrefExists($published_delete_link);
+    $this->assertSession()->linkByHrefExists($draft_delete_link);
+
+    // Make the published state a default state and ensure it is no longer
+    // linked.
+    \Drupal::state()->set('workflow_type_test.required_states', ['published']);
+    $this->getSession()->reload();
+    $this->assertSession()->linkByHrefNotExists($published_delete_link);
+    $this->assertSession()->linkByHrefExists($draft_delete_link);
+    $this->assertSession()->elementNotContains('css', 'tr[data-drupal-selector="edit-states-published"]', 'Delete');
+    \Drupal::state()->set('workflow_type_test.required_states', []);
+    $this->getSession()->reload();
+    $this->assertSession()->elementContains('css', 'tr[data-drupal-selector="edit-states-published"]', 'Delete');
+    $this->assertSession()->linkByHrefExists($published_delete_link);
+    $this->assertSession()->linkByHrefExists($draft_delete_link);
+
+    // Delete the Draft state.
+    $this->clickLink('Delete');
+    $this->assertSession()->pageTextContains('Are you sure you want to delete Draft from Test?');
+    $this->submitForm([], 'Delete');
+    $this->assertSession()->pageTextContains('State Draft deleted.');
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertFalse($workflow->hasState('draft'), 'Draft state deleted');
+    $this->assertTrue($workflow->hasState('published'), 'Workflow still has published state');
+
+    // The last state cannot be deleted so the only delete link on the page will
+    // be for the workflow.
+    $this->assertSession()->linkByHrefNotExists($published_delete_link);
+    $this->clickLink('Delete');
+    $this->assertSession()->pageTextContains('Are you sure you want to delete Test?');
+    $this->submitForm([], 'Delete');
+    $this->assertSession()->pageTextContains('Workflow Test deleted.');
+    $this->assertSession()->pageTextContains('There is no Workflow yet.');
+    $this->assertNull($workflow_storage->loadUnchanged('test'), 'The test workflow has been deleted');
+
+    // Ensure that workflow types that implement
+    // \Drupal\workflows\WorkflowTypeInterface::initializeWorkflow() are
+    // initialized correctly.
+    $this->drupalGet('admin/config/workflow/workflows');
+    $this->clickLink('Add workflow');
+    $this->submitForm(['label' => 'Test 2', 'id' => 'test2', 'workflow_type' => 'workflow_type_required_state_test'], 'Save');
+    $this->assertSession()->addressEquals('admin/config/workflow/workflows/manage/test2');
+    $workflow = $workflow_storage->loadUnchanged('test2');
+    $this->assertTrue($workflow->hasState('fresh'), 'The workflow has the "fresh" state');
+    $this->assertTrue($workflow->hasState('rotten'), 'The workflow has the "rotten" state');
+    $this->assertTrue($workflow->hasTransition('rot'), 'The workflow has the "rot" transition');
+    $this->assertSession()->pageTextContains('Fresh');
+    $this->assertSession()->pageTextContains('Rotten');
+  }
+
+  /**
+   * Tests that workflow types can add form fields to states and transitions.
+   */
+  public function testWorkflowDecoration() {
+    // Create a minimal workflow for testing.
+    $workflow = Workflow::create(['id' => 'test', 'type' => 'workflow_type_complex_test']);
+    $workflow
+      ->addState('published', 'Published')
+      ->addTransition('publish', 'Publish', ['published'], 'published')
+      ->save();
+
+    $this->assertEquals('', $workflow->getState('published')->getExtra());
+    $this->assertEquals('', $workflow->getTransition('publish')->getExtra());
+
+    $this->drupalLogin($this->createUser(['administer workflows']));
+
+    // Add additional state information when editing.
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/state/published');
+    $this->assertSession()->pageTextContains('Extra information added to state');
+    $this->submitForm(['type_settings[workflow_type_complex_test][extra]' => 'Extra state information'], 'Save');
+
+    // Add additional transition information when editing.
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/transition/publish');
+    $this->assertSession()->pageTextContains('Extra information added to transition');
+    $this->submitForm(['type_settings[workflow_type_complex_test][extra]' => 'Extra transition information'], 'Save');
+
+    $workflow_storage = $this->container->get('entity_type.manager')->getStorage('workflow');
+    /** @var \Drupal\workflows\WorkflowInterface $workflow */
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertEquals('Extra state information', $workflow->getState('published')->getExtra());
+    $this->assertEquals('Extra transition information', $workflow->getTransition('publish')->getExtra());
+
+    // Add additional state information when adding.
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/add_state');
+    $this->assertSession()->pageTextContains('Extra information added to state');
+    $this->submitForm(['label' => 'Draft', 'id' => 'draft', 'type_settings[workflow_type_complex_test][extra]' => 'Extra state information on add'], 'Save');
+
+    // Add additional transition information when adding.
+    $this->drupalGet('admin/config/workflow/workflows/manage/test/add_transition');
+    $this->assertSession()->pageTextContains('Extra information added to transition');
+    $this->submitForm(['id' => 'draft_published', 'label' => 'Publish', 'from[draft]' => 'draft', 'to' => 'published', 'type_settings[workflow_type_complex_test][extra]' => 'Extra transition information on add'], 'Save');
+
+    $workflow = $workflow_storage->loadUnchanged('test');
+    $this->assertEquals('Extra state information on add', $workflow->getState('draft')->getExtra());
+    $this->assertEquals('Extra transition information on add', $workflow->getTransition('draft_published')->getExtra());
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/src/Kernel/ComplexWorkflowTypeTest.php b/web/core/modules/workflows/tests/src/Kernel/ComplexWorkflowTypeTest.php
new file mode 100644
index 000000000..2ff1c2adf
--- /dev/null
+++ b/web/core/modules/workflows/tests/src/Kernel/ComplexWorkflowTypeTest.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Drupal\Tests\workflows\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\workflows\Entity\Workflow;
+use Drupal\workflow_type_test\DecoratedState;
+use Drupal\workflow_type_test\DecoratedTransition;
+
+/**
+ * Workflow entity tests that require modules or storage.
+ *
+ * @coversDefaultClass \Drupal\workflows\Entity\Workflow
+ *
+ * @group workflows
+ */
+class ComplexWorkflowTypeTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['workflows', 'workflow_type_test'];
+
+  /**
+   * Tests a workflow type that decorates transitions and states.
+   *
+   * @covers ::getState
+   * @covers ::getTransition
+   */
+  public function testComplexType() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'workflow_type_complex_test'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addTransition('create_new_draft', 'Create new draft', ['draft'], 'draft');
+    $this->assertInstanceOf(DecoratedState::class, $workflow->getState('draft'));
+    $this->assertInstanceOf(DecoratedTransition::class, $workflow->getTransition('create_new_draft'));
+  }
+
+  /**
+   * @covers ::loadMultipleByType
+   */
+  public function testLoadMultipleByType() {
+    $workflow1 = new Workflow(['id' => 'test1', 'type' => 'workflow_type_complex_test'], 'workflow');
+    $workflow1->save();
+    $workflow2 = new Workflow(['id' => 'test2', 'type' => 'workflow_type_complex_test'], 'workflow');
+    $workflow2->save();
+    $workflow3 = new Workflow(['id' => 'test3', 'type' => 'workflow_type_test'], 'workflow');
+    $workflow3->save();
+
+    $this->assertEquals(['test1', 'test2'], array_keys(Workflow::loadMultipleByType('workflow_type_complex_test')));
+    $this->assertEquals(['test3'], array_keys(Workflow::loadMultipleByType('workflow_type_test')));
+    $this->assertEquals([], Workflow::loadMultipleByType('a_type_that_does_not_exist'));
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/src/Kernel/RequiredStatesTest.php b/web/core/modules/workflows/tests/src/Kernel/RequiredStatesTest.php
new file mode 100644
index 000000000..c9ef7151d
--- /dev/null
+++ b/web/core/modules/workflows/tests/src/Kernel/RequiredStatesTest.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Drupal\Tests\workflows\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\workflows\Entity\Workflow;
+use Drupal\workflows\Exception\RequiredStateMissingException;
+
+/**
+ * Tests Workflow type's required states and configuration initialization.
+ *
+ * @coversDefaultClass \Drupal\workflows\Plugin\WorkflowTypeBase
+ *
+ * @group workflows
+ */
+class RequiredStatesTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['workflows', 'workflow_type_test'];
+
+  /**
+   * @covers ::getRequiredStates
+   * @covers ::initializeWorkflow
+   * @covers ::__construct
+   */
+  public function testGetRequiredStates() {
+    $workflow = new Workflow([
+      'id' => 'test',
+      'type' => 'workflow_type_required_state_test',
+    ], 'workflow');
+    $workflow = $workflow->getTypePlugin()->initializeWorkflow($workflow);
+    $workflow->save();
+    $this->assertEquals(['fresh', 'rotten'], $workflow->getTypePlugin()
+      ->getRequiredStates());
+
+    // Ensure that the workflow has the default configuration.
+    $this->assertTrue($workflow->hasState('rotten'));
+    $this->assertTrue($workflow->hasState('fresh'));
+    $this->assertTrue($workflow->hasTransitionFromStateToState('fresh', 'rotten'));
+  }
+
+  /**
+   * @covers \Drupal\workflows\Entity\Workflow::preSave
+   */
+  public function testDeleteRequiredStateAPI() {
+    $workflow = new Workflow([
+      'id' => 'test',
+      'type' => 'workflow_type_required_state_test',
+    ], 'workflow');
+    $workflow = $workflow->getTypePlugin()->initializeWorkflow($workflow);
+    $workflow->save();
+    // Ensure that required states can't be deleted.
+    $this->setExpectedException(RequiredStateMissingException::class, "Required State Type Test' requires states with the ID 'fresh' in workflow 'test'");
+    $workflow->deleteState('fresh')->save();
+  }
+
+  /**
+   * @covers \Drupal\workflows\Entity\Workflow::preSave
+   */
+  public function testNoStatesRequiredStateAPI() {
+    $workflow = new Workflow([
+      'id' => 'test',
+      'type' => 'workflow_type_required_state_test',
+    ], 'workflow');
+    $this->setExpectedException(RequiredStateMissingException::class, "Required State Type Test' requires states with the ID 'fresh', 'rotten' in workflow 'test'");
+    $workflow->save();
+  }
+
+  /**
+   * Ensures that initialized configuration can be changed.
+   */
+  public function testChangeRequiredStateAPI() {
+    $workflow = new Workflow([
+      'id' => 'test',
+      'type' => 'workflow_type_required_state_test',
+    ], 'workflow');
+    $workflow = $workflow->getTypePlugin()->initializeWorkflow($workflow);
+    $workflow->save();
+
+    // Ensure states added by default configuration can be changed.
+    $this->assertEquals('Fresh', $workflow->getState('fresh')->label());
+    $workflow
+      ->setStateLabel('fresh', 'Fresher')
+      ->save();
+    $this->assertEquals('Fresher', $workflow->getState('fresh')->label());
+
+    // Ensure transitions can be altered.
+    $workflow
+      ->addState('cooked', 'Cooked')
+      ->setTransitionFromStates('rot', ['fresh', 'cooked'])
+      ->save();
+    $this->assertTrue($workflow->hasTransitionFromStateToState('fresh', 'rotten'));
+    $this->assertTrue($workflow->hasTransitionFromStateToState('cooked', 'rotten'));
+
+    $workflow
+      ->setTransitionFromStates('rot', ['cooked'])
+      ->save();
+    $this->assertFalse($workflow->hasTransitionFromStateToState('fresh', 'rotten'));
+    $this->assertTrue($workflow->hasTransitionFromStateToState('cooked', 'rotten'));
+
+    // Ensure the default configuration does not cause ordering issues.
+    $workflow->addTransition('cook', 'Cook', ['fresh'], 'cooked')->save();
+    $this->assertSame([
+      'cooked',
+      'fresh',
+      'rotten',
+    ], array_keys($workflow->get('states')));
+    $this->assertSame([
+      'cook',
+      'rot',
+    ], array_keys($workflow->get('transitions')));
+
+    // Ensure that transitions can be deleted.
+    $workflow->deleteTransition('rot')->save();
+    $this->assertFalse($workflow->hasTransition('rot'));
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/src/Kernel/WorkflowDependenciesTest.php b/web/core/modules/workflows/tests/src/Kernel/WorkflowDependenciesTest.php
new file mode 100644
index 000000000..e9ce62c0b
--- /dev/null
+++ b/web/core/modules/workflows/tests/src/Kernel/WorkflowDependenciesTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\Tests\workflows\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Tests configuration dependencies in workflows.
+ *
+ * @coversDefaultClass \Drupal\workflows\Entity\Workflow
+ *
+ * @group workflows
+ */
+class WorkflowDependenciesTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'workflows', 'workflow_type_test', 'workflow_third_party_settings_test'];
+
+  /**
+   * Tests \Drupal\workflows\Entity\Workflow::onDependencyRemoval().
+   */
+  public function testOnDependencyRemoval() {
+    // Create a workflow that has a dependency on a third party setting.
+    $workflow = Workflow::create(['id' => 'test3', 'type' => 'workflow_type_complex_test']);
+    $workflow->setThirdPartySetting('workflow_third_party_settings_test', 'key', 'value');
+    $workflow->save();
+    $this->assertSame(['workflow_third_party_settings_test', 'workflow_type_test'], $workflow->getDependencies()['module']);
+
+    // Uninstall workflow_third_party_settings_test to ensure
+    // \Drupal\workflows\Entity\Workflow::onDependencyRemoval() works as
+    // expected.
+    \Drupal::service('module_installer')->uninstall(['node', 'workflow_third_party_settings_test']);
+    $workflow = \Drupal::entityTypeManager()->getStorage('workflow')->loadUnchanged($workflow->id());
+    $this->assertSame(['workflow_type_test'], $workflow->getDependencies()['module']);
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/src/Unit/StateTest.php b/web/core/modules/workflows/tests/src/Unit/StateTest.php
new file mode 100644
index 000000000..82feca346
--- /dev/null
+++ b/web/core/modules/workflows/tests/src/Unit/StateTest.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Drupal\Tests\workflows\Unit;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Tests\UnitTestCase;
+use Drupal\workflows\Entity\Workflow;
+use Drupal\workflows\State;
+use Drupal\workflows\WorkflowInterface;
+use Drupal\workflows\WorkflowTypeInterface;
+use Drupal\workflows\WorkflowTypeManager;
+use Prophecy\Argument;
+
+/**
+ * @coversDefaultClass \Drupal\workflows\State
+ *
+ * @group workflows
+ */
+class StateTest extends UnitTestCase {
+
+  /**
+   * Sets up the Workflow Type manager so that workflow entities can be used.
+   */
+  protected function setUp() {
+    parent::setUp();
+    // Create a container so that the plugin manager and workflow type can be
+    // mocked.
+    $container = new ContainerBuilder();
+    $workflow_type = $this->prophesize(WorkflowTypeInterface::class);
+    $workflow_type->decorateState(Argument::any())->willReturnArgument(0);
+    $workflow_type->decorateTransition(Argument::any())->willReturnArgument(0);
+    $workflow_type->deleteState(Argument::any())->willReturn(NULL);
+    $workflow_type->deleteTransition(Argument::any())->willReturn(NULL);
+    $workflow_manager = $this->prophesize(WorkflowTypeManager::class);
+    $workflow_manager->createInstance('test_type', Argument::any())->willReturn($workflow_type->reveal());
+    $container->set('plugin.manager.workflows.type', $workflow_manager->reveal());
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * @covers ::__construct
+   * @covers ::id
+   * @covers ::label
+   * @covers ::weight
+   */
+  public function testGetters() {
+    $state = new State(
+      $this->prophesize(WorkflowInterface::class)->reveal(),
+      'draft',
+      'Draft',
+      3
+    );
+    $this->assertEquals('draft', $state->id());
+    $this->assertEquals('Draft', $state->label());
+    $this->assertEquals(3, $state->weight());
+  }
+
+  /**
+   * @covers ::canTransitionTo
+   */
+  public function testCanTransitionTo() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addTransition('publish', 'Publish', ['draft'], 'published');
+    $state = $workflow->getState('draft');
+    $this->assertTrue($state->canTransitionTo('published'));
+    $this->assertFalse($state->canTransitionTo('some_other_state'));
+
+    $workflow->deleteTransition('publish');
+    $this->assertFalse($state->canTransitionTo('published'));
+  }
+
+  /**
+   * @covers ::getTransitionTo
+   */
+  public function testGetTransitionTo() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addTransition('publish', 'Publish', ['draft'], 'published');
+    $state = $workflow->getState('draft');
+    $transition = $state->getTransitionTo('published');
+    $this->assertEquals('Publish', $transition->label());
+  }
+
+  /**
+   * @covers ::getTransitionTo
+   */
+  public function testGetTransitionToException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "Can not transition to 'published' state");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('draft', 'Draft');
+    $state = $workflow->getState('draft');
+    $state->getTransitionTo('published');
+  }
+
+  /**
+   * @covers ::getTransitions
+   */
+  public function testGetTransitions() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addState('archived', 'Archived')
+      ->addTransition('create_new_draft', 'Create new draft', ['draft'], 'draft')
+      ->addTransition('publish', 'Publish', ['draft'], 'published')
+      ->addTransition('archive', 'Archive', ['published'], 'archived');
+    $state = $workflow->getState('draft');
+    $transitions = $state->getTransitions();
+    $this->assertCount(2, $transitions);
+    $this->assertEquals('Create new draft', $transitions['create_new_draft']->label());
+    $this->assertEquals('Publish', $transitions['publish']->label());
+  }
+
+  /**
+   * @covers ::labelCallback
+   */
+  public function testLabelCallback() {
+    $workflow = $this->prophesize(WorkflowInterface::class)->reveal();
+    $states = [
+      new State($workflow, 'draft', 'Draft'),
+      new State($workflow, 'published', 'Published'),
+    ];
+    $this->assertEquals(['Draft', 'Published'], array_map([State::class, 'labelCallback'], $states));
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/src/Unit/TransitionTest.php b/web/core/modules/workflows/tests/src/Unit/TransitionTest.php
new file mode 100644
index 000000000..3202e8a46
--- /dev/null
+++ b/web/core/modules/workflows/tests/src/Unit/TransitionTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Drupal\Tests\workflows\Unit;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Tests\UnitTestCase;
+use Drupal\workflows\Entity\Workflow;
+use Drupal\workflows\Transition;
+use Drupal\workflows\WorkflowInterface;
+use Drupal\workflows\WorkflowTypeInterface;
+use Drupal\workflows\WorkflowTypeManager;
+use Prophecy\Argument;
+
+/**
+ * @coversDefaultClass \Drupal\workflows\Transition
+ *
+ * @group workflows
+ */
+class TransitionTest extends UnitTestCase {
+
+  /**
+   * Sets up the Workflow Type manager so that workflow entities can be used.
+   */
+  protected function setUp() {
+    parent::setUp();
+    // Create a container so that the plugin manager and workflow type can be
+    // mocked.
+    $container = new ContainerBuilder();
+    $workflow_type = $this->prophesize(WorkflowTypeInterface::class);
+    $workflow_type->decorateState(Argument::any())->willReturnArgument(0);
+    $workflow_type->decorateTransition(Argument::any())->willReturnArgument(0);
+    $workflow_manager = $this->prophesize(WorkflowTypeManager::class);
+    $workflow_manager->createInstance('test_type', Argument::any())->willReturn($workflow_type->reveal());
+    $container->set('plugin.manager.workflows.type', $workflow_manager->reveal());
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * @covers ::__construct
+   * @covers ::id
+   * @covers ::label
+   */
+  public function testGetters() {
+    $state = new Transition(
+      $this->prophesize(WorkflowInterface::class)->reveal(),
+      'draft_published',
+      'Publish',
+      ['draft'],
+      'published'
+    );
+    $this->assertEquals('draft_published', $state->id());
+    $this->assertEquals('Publish', $state->label());
+  }
+
+  /**
+   * @covers ::from
+   * @covers ::to
+   */
+  public function testFromAndTo() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addTransition('publish', 'Publish', ['draft'], 'published');
+    $state = $workflow->getState('draft');
+    $transition = $state->getTransitionTo('published');
+    $this->assertEquals($state, $transition->from()['draft']);
+    $this->assertEquals($workflow->getState('published'), $transition->to());
+  }
+
+}
diff --git a/web/core/modules/workflows/tests/src/Unit/WorkflowTest.php b/web/core/modules/workflows/tests/src/Unit/WorkflowTest.php
new file mode 100644
index 000000000..89ee31f6b
--- /dev/null
+++ b/web/core/modules/workflows/tests/src/Unit/WorkflowTest.php
@@ -0,0 +1,679 @@
+<?php
+
+namespace Drupal\Tests\workflows\Unit;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Tests\UnitTestCase;
+use Drupal\workflows\Entity\Workflow;
+use Drupal\workflows\State;
+use Drupal\workflows\Transition;
+use Drupal\workflows\WorkflowTypeInterface;
+use Drupal\workflows\WorkflowTypeManager;
+use Prophecy\Argument;
+
+/**
+ * @coversDefaultClass \Drupal\workflows\Entity\Workflow
+ *
+ * @group workflows
+ */
+class WorkflowTest extends UnitTestCase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    // Create a container so that the plugin manager and workflow type can be
+    // mocked.
+    $container = new ContainerBuilder();
+    $workflow_type = $this->prophesize(WorkflowTypeInterface::class);
+    $workflow_type->decorateState(Argument::any())->willReturnArgument(0);
+    $workflow_type->decorateTransition(Argument::any())->willReturnArgument(0);
+    $workflow_manager = $this->prophesize(WorkflowTypeManager::class);
+    $workflow_manager->createInstance('test_type', Argument::any())->willReturn($workflow_type->reveal());
+    $container->set('plugin.manager.workflows.type', $workflow_manager->reveal());
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * @covers ::addState
+   * @covers ::hasState
+   */
+  public function testAddAndHasState() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $this->assertFalse($workflow->hasState('draft'));
+
+    // By default states are ordered in the order added.
+    $workflow->addState('draft', 'Draft');
+    $this->assertTrue($workflow->hasState('draft'));
+    $this->assertFalse($workflow->hasState('published'));
+    $this->assertEquals(0, $workflow->getState('draft')->weight());
+    // Adding a state does not set up a transition to itself.
+    $this->assertFalse($workflow->hasTransitionFromStateToState('draft', 'draft'));
+
+    // New states are added with a new weight 1 more than the current highest
+    // weight.
+    $workflow->addState('published', 'Published');
+    $this->assertEquals(1, $workflow->getState('published')->weight());
+  }
+
+  /**
+   * @covers ::addState
+   */
+  public function testAddStateException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state 'draft' already exists in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('draft', 'Draft');
+    $workflow->addState('draft', 'Draft');
+  }
+
+  /**
+   * @covers ::addState
+   */
+  public function testAddStateInvalidIdException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state ID 'draft-draft' must contain only lowercase letters, numbers, and underscores");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('draft-draft', 'Draft');
+  }
+
+  /**
+   * @covers ::getStates
+   */
+  public function testGetStates() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+
+    // Getting states works when there are none.
+    $this->assertArrayEquals([], array_keys($workflow->getStates()));
+    $this->assertArrayEquals([], array_keys($workflow->getStates([])));
+
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addState('archived', 'Archived');
+
+    // States are stored in alphabetical key order.
+    $this->assertArrayEquals([
+      'archived',
+      'draft',
+      'published',
+    ], array_keys($workflow->get('states')));
+
+    // Ensure we're returning state objects.
+    $this->assertInstanceOf(State::class, $workflow->getStates()['draft']);
+
+    // Passing in no IDs returns all states.
+    $this->assertArrayEquals(['draft', 'published', 'archived'], array_keys($workflow->getStates()));
+
+    // The order of states is by weight.
+    $workflow->setStateWeight('published', -1);
+    $this->assertArrayEquals(['published', 'draft', 'archived'], array_keys($workflow->getStates()));
+
+    // The label is also used for sorting if weights are equal.
+    $workflow->setStateWeight('archived', 0);
+    $this->assertArrayEquals(['published', 'archived', 'draft'], array_keys($workflow->getStates()));
+
+    // You can limit the states returned by passing in states IDs.
+    $this->assertArrayEquals(['archived', 'draft'], array_keys($workflow->getStates(['draft', 'archived'])));
+
+    // An empty array does not load all states.
+    $this->assertArrayEquals([], array_keys($workflow->getStates([])));
+  }
+
+  /**
+   * @covers ::getStates
+   */
+  public function testGetStatesException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state 'state_that_does_not_exist' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->getStates(['state_that_does_not_exist']);
+  }
+
+  /**
+   * @covers ::getState
+   */
+  public function testGetState() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    // By default states are ordered in the order added.
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addState('archived', 'Archived')
+      ->addTransition('create_new_draft', 'Create new draft', ['draft'], 'draft')
+      ->addTransition('publish', 'Publish', ['draft'], 'published');
+
+    // Ensure we're returning state objects and they are set up correctly
+    $this->assertInstanceOf(State::class, $workflow->getState('draft'));
+    $this->assertEquals('archived', $workflow->getState('archived')->id());
+    $this->assertEquals('Archived', $workflow->getState('archived')->label());
+
+    $draft = $workflow->getState('draft');
+    $this->assertTrue($draft->canTransitionTo('draft'));
+    $this->assertTrue($draft->canTransitionTo('published'));
+    $this->assertFalse($draft->canTransitionTo('archived'));
+    $this->assertEquals('Publish', $draft->getTransitionTo('published')->label());
+    $this->assertEquals(0, $draft->weight());
+    $this->assertEquals(1, $workflow->getState('published')->weight());
+    $this->assertEquals(2, $workflow->getState('archived')->weight());
+  }
+
+  /**
+   * @covers ::getState
+   */
+  public function testGetStateException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state 'state_that_does_not_exist' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->getState('state_that_does_not_exist');
+  }
+
+  /**
+   * @covers ::setStateLabel
+   */
+  public function testSetStateLabel() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('draft', 'Draft');
+    $this->assertEquals('Draft', $workflow->getState('draft')->label());
+    $workflow->setStateLabel('draft', 'Unpublished');
+    $this->assertEquals('Unpublished', $workflow->getState('draft')->label());
+  }
+
+  /**
+   * @covers ::setStateLabel
+   */
+  public function testSetStateLabelException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state 'draft' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->setStateLabel('draft', 'Draft');
+  }
+
+  /**
+   * @covers ::setStateWeight
+   */
+  public function testSetStateWeight() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('draft', 'Draft');
+    $this->assertEquals(0, $workflow->getState('draft')->weight());
+    $workflow->setStateWeight('draft', -10);
+    $this->assertEquals(-10, $workflow->getState('draft')->weight());
+  }
+
+  /**
+   * @covers ::setStateWeight
+   */
+  public function testSetStateWeightException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state 'draft' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->setStateWeight('draft', 10);
+  }
+
+  /**
+   * @covers ::deleteState
+   */
+  public function testDeleteState() {
+    // Create a container so that the plugin manager and workflow type can be
+    // mocked and test that
+    // \Drupal\workflows\WorkflowTypeInterface::deleteState() is called
+    // correctly.
+    $container = new ContainerBuilder();
+    $workflow_type = $this->prophesize(WorkflowTypeInterface::class);
+    $workflow_type->decorateState(Argument::any())->willReturnArgument(0);
+    $workflow_type->decorateTransition(Argument::any())->willReturnArgument(0);
+    $workflow_type->deleteState('draft')->shouldBeCalled();
+    $workflow_type->deleteTransition('create_new_draft')->shouldBeCalled();
+    $workflow_manager = $this->prophesize(WorkflowTypeManager::class);
+    $workflow_manager->createInstance('test_type', Argument::any())->willReturn($workflow_type->reveal());
+    $container->set('plugin.manager.workflows.type', $workflow_manager->reveal());
+    \Drupal::setContainer($container);
+
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addTransition('publish', 'Publish', ['draft', 'published'], 'published')
+      ->addTransition('create_new_draft', 'Create new draft', ['draft', 'published'], 'draft');
+    $this->assertCount(2, $workflow->getStates());
+    $this->assertCount(2, $workflow->getState('published')->getTransitions());
+    $workflow->deleteState('draft');
+    $this->assertFalse($workflow->hasState('draft'));
+    $this->assertCount(1, $workflow->getStates());
+    $this->assertCount(1, $workflow->getState('published')->getTransitions());
+  }
+
+  /**
+   * @covers ::deleteState
+   */
+  public function testDeleteStateException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state 'draft' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->deleteState('draft');
+  }
+
+  /**
+   * @covers ::deleteState
+   */
+  public function testDeleteOnlyStateException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state 'draft' can not be deleted from workflow 'test' as it is the only state");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('draft', 'Draft');
+    $workflow->deleteState('draft');
+  }
+
+  /**
+   * @covers ::getInitialState
+   */
+  public function testGetInitialState() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+
+    // By default states are ordered in the order added.
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addState('archived', 'Archived');
+
+    $this->assertEquals('draft', $workflow->getInitialState()->id());
+
+    // Make published the first state.
+    $workflow->setStateWeight('published', -1);
+    $this->assertEquals('published', $workflow->getInitialState()->id());
+  }
+
+  /**
+   * @covers ::addTransition
+   * @covers ::hasTransition
+   */
+  public function testAddTransition() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+
+    // By default states are ordered in the order added.
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published');
+
+    $this->assertFalse($workflow->getState('draft')->canTransitionTo('published'));
+    $workflow->addTransition('publish', 'Publish', ['draft'], 'published');
+    $this->assertTrue($workflow->getState('draft')->canTransitionTo('published'));
+    $this->assertEquals(0, $workflow->getTransition('publish')->weight());
+    $this->assertTrue($workflow->hasTransition('publish'));
+    $this->assertFalse($workflow->hasTransition('draft'));
+
+    $workflow->addTransition('save_publish', 'Save', ['published'], 'published');
+    $this->assertEquals(1, $workflow->getTransition('save_publish')->weight());
+  }
+
+  /**
+   * @covers ::addTransition
+   */
+  public function testAddTransitionDuplicateException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The transition 'publish' already exists in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('published', 'Published');
+    $workflow->addTransition('publish', 'Publish', ['published'], 'published');
+    $workflow->addTransition('publish', 'Publish', ['published'], 'published');
+  }
+
+  /**
+   * @covers ::addTransition
+   */
+  public function testAddTransitionInvalidIdException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The transition ID 'publish-publish' must contain only lowercase letters, numbers, and underscores");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('published', 'Published');
+    $workflow->addTransition('publish-publish', 'Publish', ['published'], 'published');
+  }
+
+  /**
+   * @covers ::addTransition
+   */
+  public function testAddTransitionMissingFromException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state 'draft' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('published', 'Published');
+    $workflow->addTransition('publish', 'Publish', ['draft'], 'published');
+  }
+
+  /**
+   * @covers ::addTransition
+   */
+  public function testAddTransitionDuplicateTransitionStatesException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The 'publish' transition already allows 'draft' to 'published' transitions in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published');
+    $workflow->addTransition('publish', 'Publish', ['draft', 'published'], 'published');
+    $workflow->addTransition('draft_to_published', 'Publish a draft', ['draft'], 'published');
+  }
+
+  /**
+   * @covers ::addTransition
+   */
+  public function testAddTransitionConsistentAfterFromCatch() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('published', 'Published');
+    try {
+      $workflow->addTransition('publish', 'Publish', ['draft'], 'published');
+    }
+    catch (\InvalidArgumentException $e) {
+    }
+    // Ensure that the workflow is not left in an inconsistent state after an
+    // exception is thrown from Workflow::setTransitionFromStates() whilst
+    // calling Workflow::addTransition().
+    $this->assertFalse($workflow->hasTransition('publish'));
+  }
+
+  /**
+   * @covers ::addTransition
+   */
+  public function testAddTransitionMissingToException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state 'published' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('draft', 'Draft');
+    $workflow->addTransition('publish', 'Publish', ['draft'], 'published');
+  }
+
+  /**
+   * @covers ::getTransitions
+   * @covers ::setTransitionWeight
+   */
+  public function testGetTransitions() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+
+    // Getting transitions works when there are none.
+    $this->assertArrayEquals([], array_keys($workflow->getTransitions()));
+    $this->assertArrayEquals([], array_keys($workflow->getTransitions([])));
+
+    // By default states are ordered in the order added.
+    $workflow
+      ->addState('a', 'A')
+      ->addState('b', 'B')
+      ->addTransition('a_b', 'A to B', ['a'], 'b')
+      ->addTransition('a_a', 'A to A', ['a'], 'a');
+
+    // Transitions are stored in alphabetical key order in configuration.
+    $this->assertArrayEquals(['a_a', 'a_b'], array_keys($workflow->get('transitions')));
+
+    // Ensure we're returning transition objects.
+    $this->assertInstanceOf(Transition::class, $workflow->getTransitions()['a_a']);
+
+    // Passing in no IDs returns all transitions.
+    $this->assertArrayEquals(['a_b', 'a_a'], array_keys($workflow->getTransitions()));
+
+    // The order of states is by weight.
+    $workflow->setTransitionWeight('a_a', -1);
+    $this->assertArrayEquals(['a_a', 'a_b'], array_keys($workflow->getTransitions()));
+
+    // If all weights are equal it will fallback to labels.
+    $workflow->setTransitionWeight('a_a', 0);
+    $this->assertArrayEquals(['a_a', 'a_b'], array_keys($workflow->getTransitions()));
+    $workflow->setTransitionLabel('a_b', 'A B');
+    $this->assertArrayEquals(['a_b', 'a_a'], array_keys($workflow->getTransitions()));
+
+    // You can limit the states returned by passing in states IDs.
+    $this->assertArrayEquals(['a_a'], array_keys($workflow->getTransitions(['a_a'])));
+
+    // An empty array does not load all states.
+    $this->assertArrayEquals([], array_keys($workflow->getTransitions([])));
+  }
+
+
+  /**
+   * @covers ::getTransition
+   */
+  public function testGetTransition() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    // By default states are ordered in the order added.
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addState('archived', 'Archived')
+      ->addTransition('create_new_draft', 'Create new draft', ['draft'], 'draft')
+      ->addTransition('publish', 'Publish', ['draft'], 'published');
+
+    // Ensure we're returning state objects and they are set up correctly
+    $this->assertInstanceOf(Transition::class, $workflow->getTransition('create_new_draft'));
+    $this->assertEquals('publish', $workflow->getTransition('publish')->id());
+    $this->assertEquals('Publish', $workflow->getTransition('publish')->label());
+
+    $transition = $workflow->getTransition('publish');
+    $this->assertEquals($workflow->getState('draft'), $transition->from()['draft']);
+    $this->assertEquals($workflow->getState('published'), $transition->to());
+  }
+
+  /**
+   * @covers ::getTransition
+   */
+  public function testGetTransitionException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The transition 'transition_that_does_not_exist' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->getTransition('transition_that_does_not_exist');
+  }
+
+  /**
+   * @covers ::getTransitionsForState
+   */
+  public function testGetTransitionsForState() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    // By default states are ordered in the order added.
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addState('archived', 'Archived')
+      ->addTransition('create_new_draft', 'Create new draft', ['archived', 'draft'], 'draft')
+      ->addTransition('publish', 'Publish', ['draft', 'published'], 'published')
+      ->addTransition('archive', 'Archive', ['published'], 'archived');
+
+    $this->assertEquals(['create_new_draft', 'publish'], array_keys($workflow->getTransitionsForState('draft')));
+    $this->assertEquals(['create_new_draft'], array_keys($workflow->getTransitionsForState('draft', 'to')));
+    $this->assertEquals(['publish', 'archive'], array_keys($workflow->getTransitionsForState('published')));
+    $this->assertEquals(['publish'], array_keys($workflow->getTransitionsForState('published', 'to')));
+    $this->assertEquals(['create_new_draft'], array_keys($workflow->getTransitionsForState('archived', 'from')));
+    $this->assertEquals(['archive'], array_keys($workflow->getTransitionsForState('archived', 'to')));
+  }
+
+
+  /**
+   * @covers ::getTransitionFromStateToState
+   * @covers ::hasTransitionFromStateToState
+   */
+  public function testGetTransitionFromStateToState() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    // By default states are ordered in the order added.
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addState('archived', 'Archived')
+      ->addTransition('create_new_draft', 'Create new draft', ['archived', 'draft'], 'draft')
+      ->addTransition('publish', 'Publish', ['draft', 'published'], 'published')
+      ->addTransition('archive', 'Archive', ['published'], 'archived');
+
+    $this->assertTrue($workflow->hasTransitionFromStateToState('draft', 'published'));
+    $this->assertFalse($workflow->hasTransitionFromStateToState('archived', 'archived'));
+    $transition = $workflow->getTransitionFromStateToState('published', 'archived');
+    $this->assertEquals('Archive', $transition->label());
+  }
+
+  /**
+   * @covers ::getTransitionFromStateToState
+   */
+  public function testGetTransitionFromStateToStateException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The transition from 'archived' to 'archived' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    // By default states are ordered in the order added.
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addState('archived', 'Archived')
+      ->addTransition('create_new_draft', 'Create new draft', ['archived', 'draft'], 'draft')
+      ->addTransition('publish', 'Publish', ['draft', 'published'], 'published')
+      ->addTransition('archive', 'Archive', ['published'], 'archived');
+
+    $workflow->getTransitionFromStateToState('archived', 'archived');
+  }
+
+  /**
+   * @covers ::setTransitionLabel
+   */
+  public function testSetTransitionLabel() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addTransition('publish', 'Publish', ['draft'], 'published');
+    $this->assertEquals('Publish', $workflow->getTransition('publish')->label());
+    $workflow->setTransitionLabel('publish', 'Publish!');
+    $this->assertEquals('Publish!', $workflow->getTransition('publish')->label());
+  }
+
+  /**
+   * @covers ::setTransitionLabel
+   */
+  public function testSetTransitionLabelException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The transition 'draft-published' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('published', 'Published');
+    $workflow->setTransitionLabel('draft-published', 'Publish');
+  }
+
+  /**
+   * @covers ::setTransitionWeight
+   */
+  public function testSetTransitionWeight() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addTransition('publish', 'Publish', ['draft'], 'published');
+    $this->assertEquals(0, $workflow->getTransition('publish')->weight());
+    $workflow->setTransitionWeight('publish', 10);
+    $this->assertEquals(10, $workflow->getTransition('publish')->weight());
+  }
+
+  /**
+   * @covers ::setTransitionWeight
+   */
+  public function testSetTransitionWeightException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The transition 'draft-published' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('published', 'Published');
+    $workflow->setTransitionWeight('draft-published', 10);
+  }
+
+  /**
+   * @covers ::setTransitionFromStates
+   */
+  public function testSetTransitionFromStates() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addState('archived', 'Archived')
+      ->addTransition('test', 'Test', ['draft'], 'draft');
+
+    $this->assertTrue($workflow->hasTransitionFromStateToState('draft', 'draft'));
+    $this->assertFalse($workflow->hasTransitionFromStateToState('published', 'draft'));
+    $this->assertFalse($workflow->hasTransitionFromStateToState('archived', 'draft'));
+    $workflow->setTransitionFromStates('test', ['draft', 'published', 'archived']);
+    $this->assertTrue($workflow->hasTransitionFromStateToState('draft', 'draft'));
+    $this->assertTrue($workflow->hasTransitionFromStateToState('published', 'draft'));
+    $this->assertTrue($workflow->hasTransitionFromStateToState('archived', 'draft'));
+    $workflow->setTransitionFromStates('test', ['published', 'archived']);
+    $this->assertFalse($workflow->hasTransitionFromStateToState('draft', 'draft'));
+    $this->assertTrue($workflow->hasTransitionFromStateToState('published', 'draft'));
+    $this->assertTrue($workflow->hasTransitionFromStateToState('archived', 'draft'));
+  }
+
+  /**
+   * @covers ::setTransitionFromStates
+   */
+  public function testSetTransitionFromStatesMissingTransition() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The transition 'test' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addState('archived', 'Archived')
+      ->addTransition('create_new_draft', 'Create new draft', ['draft'], 'draft');
+
+    $workflow->setTransitionFromStates('test', ['draft', 'published', 'archived']);
+  }
+
+  /**
+   * @covers ::setTransitionFromStates
+   */
+  public function testSetTransitionFromStatesMissingState() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The state 'published' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('archived', 'Archived')
+      ->addTransition('create_new_draft', 'Create new draft', ['draft'], 'draft');
+
+    $workflow->setTransitionFromStates('create_new_draft', ['draft', 'published', 'archived']);
+  }
+
+  /**
+   * @covers ::setTransitionFromStates
+   */
+  public function testSetTransitionFromStatesAlreadyExists() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The 'create_new_draft' transition already allows 'draft' to 'draft' transitions in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('archived', 'Archived')
+      ->addState('needs_review', 'Needs Review')
+      ->addTransition('create_new_draft', 'Create new draft', ['draft'], 'draft')
+      ->addTransition('needs_review', 'Needs review', ['needs_review'], 'draft');
+
+    $workflow->setTransitionFromStates('needs_review', ['draft']);
+  }
+
+  /**
+   * @covers ::deleteTransition
+   */
+  public function testDeleteTransition() {
+    // Create a container so that the plugin manager and workflow type can be
+    // mocked and test that
+    // \Drupal\workflows\WorkflowTypeInterface::deleteState() is called
+    // correctly.
+    $container = new ContainerBuilder();
+    $workflow_type = $this->prophesize(WorkflowTypeInterface::class);
+    $workflow_type->decorateState(Argument::any())->willReturnArgument(0);
+    $workflow_type->decorateTransition(Argument::any())->willReturnArgument(0);
+    $workflow_type->deleteTransition('publish')->shouldBeCalled();
+    $workflow_manager = $this->prophesize(WorkflowTypeManager::class);
+    $workflow_manager->createInstance('test_type', Argument::any())->willReturn($workflow_type->reveal());
+    $container->set('plugin.manager.workflows.type', $workflow_manager->reveal());
+    \Drupal::setContainer($container);
+
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow
+      ->addState('draft', 'Draft')
+      ->addState('published', 'Published')
+      ->addTransition('create_new_draft', 'Create new draft', ['draft'], 'draft')
+      ->addTransition('publish', 'Publish', ['draft'], 'published');
+    $this->assertTrue($workflow->getState('draft')->canTransitionTo('published'));
+    $workflow->deleteTransition('publish');
+    $this->assertFalse($workflow->getState('draft')->canTransitionTo('published'));
+    $this->assertTrue($workflow->getState('draft')->canTransitionTo('draft'));
+  }
+
+  /**
+   * @covers ::deleteTransition
+   */
+  public function testDeleteTransitionException() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The transition 'draft-published' does not exist in workflow 'test'");
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $workflow->addState('published', 'Published');
+    $workflow->deleteTransition('draft-published');
+  }
+
+  /**
+   * @covers ::status
+   */
+  public function testStatus() {
+    $workflow = new Workflow(['id' => 'test', 'type' => 'test_type'], 'workflow');
+    $this->assertFalse($workflow->status());
+    $workflow->addState('published', 'Published');
+    $this->assertTrue($workflow->status());
+  }
+
+}
diff --git a/web/core/modules/workflows/workflows.info.yml b/web/core/modules/workflows/workflows.info.yml
new file mode 100644
index 000000000..0089a123d
--- /dev/null
+++ b/web/core/modules/workflows/workflows.info.yml
@@ -0,0 +1,7 @@
+name: 'Workflows'
+type: module
+description: 'Provides UI and API for managing workflows. This module can be used with the Content moderation module to add highly customisable workflows to content.'
+version: VERSION
+core: 8.x
+package: Core (Experimental)
+configure: entity.workflow.collection
diff --git a/web/core/modules/workflows/workflows.links.action.yml b/web/core/modules/workflows/workflows.links.action.yml
new file mode 100644
index 000000000..e3a80f777
--- /dev/null
+++ b/web/core/modules/workflows/workflows.links.action.yml
@@ -0,0 +1,5 @@
+entity.workflow.add_form:
+  route_name: 'entity.workflow.add_form'
+  title: 'Add workflow'
+  appears_on:
+    - entity.workflow.collection
diff --git a/web/core/modules/workflows/workflows.links.menu.yml b/web/core/modules/workflows/workflows.links.menu.yml
new file mode 100644
index 000000000..a6ac51298
--- /dev/null
+++ b/web/core/modules/workflows/workflows.links.menu.yml
@@ -0,0 +1,7 @@
+# Workflow menu items definition
+entity.workflow.collection:
+  title: 'Workflows'
+  route_name: entity.workflow.collection
+  description: 'Configure workflows.'
+  parent: system.admin_config_workflow
+
diff --git a/web/core/modules/workflows/workflows.module b/web/core/modules/workflows/workflows.module
new file mode 100644
index 000000000..26f72b4b5
--- /dev/null
+++ b/web/core/modules/workflows/workflows.module
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Provides hook implementations for the Workflow UI module.
+ */
+
+use Drupal\Core\Routing\RouteMatchInterface;
+
+use Drupal\workflows\Form\WorkflowAddForm;
+use Drupal\workflows\Form\WorkflowEditForm;
+use Drupal\workflows\Form\WorkflowDeleteForm;
+use Drupal\workflows\Form\WorkflowStateAddForm;
+use Drupal\workflows\Form\WorkflowStateEditForm;
+use Drupal\workflows\Form\WorkflowStateDeleteForm;
+use Drupal\workflows\Form\WorkflowTransitionAddForm;
+use Drupal\workflows\Form\WorkflowTransitionEditForm;
+use Drupal\workflows\Form\WorkflowTransitionDeleteForm;
+use Drupal\workflows\WorkflowListBuilder;
+
+/**
+ * Implements hook_help().
+ */
+function workflows_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    // Main module help for the Workflow UI module.
+    case 'help.page.workflows':
+      $output = '';
+      $output .= '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('The Workflows module provides a UI and an API for creating workflows content. This lets site admins define workflows and their states, and then define transitions between those states. For more information, see the <a href=":workflow">online documentation for the Workflows module</a>.', [':workflow' => 'https://www.drupal.org/documentation/modules/workflows']) . '</p>';
+      return $output;
+  }
+}
+
+/**
+ * Implements hook_entity_type_build().
+ */
+function workflows_entity_type_build(array &$entity_types) {
+  /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */
+  $entity_types['workflow']
+    ->setFormClass('add', WorkflowAddForm::class)
+    ->setFormClass('edit', WorkflowEditForm::class)
+    ->setFormClass('delete', WorkflowDeleteForm::class)
+    ->setFormClass('add-state', WorkflowStateAddForm::class)
+    ->setFormClass('edit-state', WorkflowStateEditForm::class)
+    ->setFormClass('delete-state', WorkflowStateDeleteForm::class)
+    ->setFormClass('add-transition', WorkflowTransitionAddForm::class)
+    ->setFormClass('edit-transition', WorkflowTransitionEditForm::class)
+    ->setFormClass('delete-transition', WorkflowTransitionDeleteForm::class)
+    ->setListBuilderClass(WorkflowListBuilder::class)
+    ->set('admin_permission', 'administer workflows')
+    ->setLinkTemplate('add-form', '/admin/config/workflow/workflows/add')
+    ->setLinkTemplate('edit-form', '/admin/config/workflow/workflows/manage/{workflow}')
+    ->setLinkTemplate('delete-form', '/admin/config/workflow/workflows/manage/{workflow}/delete')
+    ->setLinkTemplate('add-state-form', '/admin/config/workflow/workflows/manage/{workflow}/add_state')
+    ->setLinkTemplate('add-transition-form', '/admin/config/workflow/workflows/manage/{workflow}/add_transition')
+    ->setLinkTemplate('collection', '/admin/config/workflow/workflows');
+}
diff --git a/web/core/modules/workflows/workflows.permissions.yml b/web/core/modules/workflows/workflows.permissions.yml
new file mode 100644
index 000000000..88573b6bb
--- /dev/null
+++ b/web/core/modules/workflows/workflows.permissions.yml
@@ -0,0 +1,4 @@
+'administer workflows':
+  title: 'Administer workflows'
+  description: 'Create and edit workflows.'
+  'restrict access': TRUE
diff --git a/web/core/modules/workflows/workflows.routing.yml b/web/core/modules/workflows/workflows.routing.yml
new file mode 100644
index 000000000..329ed10c4
--- /dev/null
+++ b/web/core/modules/workflows/workflows.routing.yml
@@ -0,0 +1,47 @@
+entity.workflow.add_state_form:
+  path: '/admin/config/workflow/workflows/manage/{workflow}/add_state'
+  defaults:
+    _entity_form: 'workflow.add-state'
+    _title: 'Add state'
+  requirements:
+    _entity_access: 'workflow.edit'
+
+entity.workflow.edit_state_form:
+  path: '/admin/config/workflow/workflows/manage/{workflow}/state/{workflow_state}'
+  defaults:
+    _entity_form: 'workflow.edit-state'
+    _title: 'Edit state'
+  requirements:
+    _entity_access: 'workflow.edit'
+
+entity.workflow.delete_state_form:
+  path: '/admin/config/workflow/workflows/manage/{workflow}/state/{workflow_state}/delete'
+  defaults:
+    _form: '\Drupal\workflows\Form\WorkflowStateDeleteForm'
+    _title: 'Delete state'
+  requirements:
+    _workflow_state_delete_access: 'true'
+
+entity.workflow.add_transition_form:
+  path: '/admin/config/workflow/workflows/manage/{workflow}/add_transition'
+  defaults:
+    _entity_form: 'workflow.add-transition'
+    _title: 'Add transition'
+  requirements:
+    _entity_access: 'workflow.edit'
+
+entity.workflow.edit_transition_form:
+  path: '/admin/config/workflow/workflows/manage/{workflow}/transition/{workflow_transition}'
+  defaults:
+    _entity_form: 'workflow.edit-transition'
+    _title: 'Edit transition'
+  requirements:
+    _entity_access: 'workflow.edit'
+
+entity.workflow.delete_transition_form:
+  path: '/admin/config/workflow/workflows/manage/{workflow}/transition/{workflow_transition}/delete'
+  defaults:
+    _form: '\Drupal\workflows\Form\WorkflowTransitionDeleteForm'
+    _title: 'Delete transition'
+  requirements:
+    _entity_access: 'workflow.edit'
diff --git a/web/core/modules/workflows/workflows.services.yml b/web/core/modules/workflows/workflows.services.yml
new file mode 100644
index 000000000..7d3242024
--- /dev/null
+++ b/web/core/modules/workflows/workflows.services.yml
@@ -0,0 +1,10 @@
+services:
+  plugin.manager.workflows.type:
+    class: Drupal\workflows\WorkflowTypeManager
+    parent: default_plugin_manager
+    tags:
+      - { name: plugin_manager_cache_clear }
+  workflows.access_check.delete_state:
+    class: \Drupal\workflows\WorkflowDeleteAccessCheck
+    tags:
+      - { name: access_check, applies_to: _workflow_state_delete_access }
diff --git a/web/core/package.json b/web/core/package.json
new file mode 100644
index 000000000..b168cb374
--- /dev/null
+++ b/web/core/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "Drupal",
+  "description": "Drupal is an open source content management platform powering millions of websites and applications.",
+  "license": "GPL-2.0",
+  "private": true,
+  "scripts": {
+    "build:js": "node ./scripts/js/babel-es6-build.js",
+    "watch:js": "node ./scripts/js/babel-es6-watch.js",
+    "lint:js": "eslint . || exit 0"
+  },
+  "devDependencies": {
+    "babel-core": "6.17.0",
+    "babel-preset-es2015": "6.16.0",
+    "chokidar": "1.6.0",
+    "eslint": "3.8.1",
+    "glob": "^7.1.1"
+  },
+  "babel": {
+    "presets": [
+      "es2015"
+    ]
+  }
+}
diff --git a/web/core/phpcs.xml.dist b/web/core/phpcs.xml.dist
index e82c85a08..be8c46eab 100644
--- a/web/core/phpcs.xml.dist
+++ b/web/core/phpcs.xml.dist
@@ -55,8 +55,14 @@
     <exclude name="Drupal.Commenting.FunctionComment.MissingReturnComment"/>
     <exclude name="Drupal.Commenting.FunctionComment.MissingReturnType"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentFullStop"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ParamCommentIndentation"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ParamCommentNewLine"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentNotCapital"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ParamMissingDefinition"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamNameNoMatch"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ParamTypeSpaces"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ReturnCommentIndentation"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ReturnTypeSpaces"/>
     <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
   </rule>
   <rule ref="Drupal.ControlStructures.ElseIf"/>
@@ -72,6 +78,7 @@
   <rule ref="Drupal.InfoFiles.ClassFiles"/>
   <rule ref="Drupal.InfoFiles.DuplicateEntry"/>
   <rule ref="Drupal.InfoFiles.Required"/>
+  <rule ref="Drupal.Scope.MethodScope"/>
   <rule ref="Drupal.Semantics.EmptyInstall"/>
   <rule ref="Drupal.Semantics.FunctionT">
     <exclude name="Drupal.Semantics.FunctionT.BackslashSingleQuote"/>
@@ -91,6 +98,9 @@
   <rule ref="Drupal.WhiteSpace.OperatorSpacing"/>
   <rule ref="Drupal.WhiteSpace.ScopeIndent"/>
 
+  <!-- Drupal Practice sniffs -->
+  <rule ref="DrupalPractice.Commenting.ExpectedException"/>
+
   <!-- Generic sniffs -->
   <rule ref="Generic.Files.LineEndings"/>
   <rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
@@ -99,6 +109,7 @@
   <rule ref="Generic.PHP.DisallowShortOpenTag"/>
   <rule ref="Generic.PHP.UpperCaseConstant"/>
   <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
+  <rule ref="Generic.Arrays.DisallowLongArraySyntax" />
 
   <!-- PSR-2 sniffs -->
   <rule ref="PSR2.Classes.PropertyDeclaration">
diff --git a/web/core/profiles/minimal/src/Tests/MinimalTest.php b/web/core/profiles/minimal/src/Tests/MinimalTest.php
index 056565e71..c7e3228b0 100644
--- a/web/core/profiles/minimal/src/Tests/MinimalTest.php
+++ b/web/core/profiles/minimal/src/Tests/MinimalTest.php
@@ -16,7 +16,7 @@ class MinimalTest extends WebTestBase {
   /**
    * Tests Minimal installation profile.
    */
-  function testMinimal() {
+  public function testMinimal() {
     $this->drupalGet('');
     // Check the login block is present.
     $this->assertLink(t('Create new account'));
@@ -24,7 +24,7 @@ class MinimalTest extends WebTestBase {
 
     // Create a user to test tools and navigation blocks for logged in users
     // with appropriate permissions.
-    $user = $this->drupalCreateUser(array('access administration pages', 'administer content types'));
+    $user = $this->drupalCreateUser(['access administration pages', 'administer content types']);
     $this->drupalLogin($user);
     $this->drupalGet('');
     $this->assertText(t('Tools'));
diff --git a/web/core/profiles/standard/config/install/core.entity_form_display.block_content.basic.default.yml b/web/core/profiles/standard/config/install/core.entity_form_display.block_content.basic.default.yml
index ee0c1384d..7ccb5b0ad 100644
--- a/web/core/profiles/standard/config/install/core.entity_form_display.block_content.basic.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_form_display.block_content.basic.default.yml
@@ -14,6 +14,7 @@ content:
   body:
     type: text_textarea_with_summary
     weight: -4
+    region: content
     settings:
       rows: 9
       summary_rows: 3
@@ -22,6 +23,7 @@ content:
   info:
     type: string_textfield
     weight: -5
+    region: content
     settings:
       size: 60
       placeholder: ''
diff --git a/web/core/profiles/standard/config/install/core.entity_form_display.comment.comment.default.yml b/web/core/profiles/standard/config/install/core.entity_form_display.comment.comment.default.yml
index fa5d834ce..1010be292 100644
--- a/web/core/profiles/standard/config/install/core.entity_form_display.comment.comment.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_form_display.comment.comment.default.yml
@@ -13,9 +13,11 @@ mode: default
 content:
   author:
     weight: -2
+    region: content
   comment_body:
     type: text_textarea
     weight: 11
+    region: content
     settings:
       rows: 5
       placeholder: ''
@@ -23,6 +25,7 @@ content:
   subject:
     type: string_textfield
     weight: 10
+    region: content
     settings:
       size: 60
       placeholder: ''
diff --git a/web/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml b/web/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml
index 79156b2e8..c94e36e38 100644
--- a/web/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml
@@ -21,6 +21,7 @@ content:
   body:
     type: text_textarea_with_summary
     weight: 1
+    region: content
     settings:
       rows: 9
       summary_rows: 3
@@ -29,16 +30,19 @@ content:
   comment:
     type: comment_default
     weight: 20
+    region: content
     settings: {  }
     third_party_settings: {  }
   created:
     type: datetime_timestamp
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
   field_image:
     type: image_image
     weight: 4
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
@@ -46,11 +50,13 @@ content:
   field_tags:
     type: entity_reference_autocomplete_tags
     weight: 3
+    region: content
     settings: {  }
     third_party_settings: {  }
   path:
     type: path
     weight: 30
+    region: content
     settings: {  }
     third_party_settings: {  }
   promote:
@@ -58,16 +64,19 @@ content:
     settings:
       display_label: true
     weight: 15
+    region: content
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 16
+    region: content
     third_party_settings: {  }
   title:
     type: string_textfield
     weight: 0
+    region: content
     settings:
       size: 60
       placeholder: ''
@@ -75,6 +84,7 @@ content:
   uid:
     type: entity_reference_autocomplete
     weight: 5
+    region: content
     settings:
       match_operator: CONTAINS
       size: 60
diff --git a/web/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml b/web/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml
index 1fef06d1e..0b7ffd133 100644
--- a/web/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_form_display.node.page.default.yml
@@ -15,6 +15,7 @@ content:
   body:
     type: text_textarea_with_summary
     weight: 31
+    region: content
     settings:
       rows: 9
       summary_rows: 3
@@ -23,11 +24,13 @@ content:
   created:
     type: datetime_timestamp
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
   path:
     type: path
     weight: 30
+    region: content
     settings: {  }
     third_party_settings: {  }
   promote:
@@ -35,16 +38,19 @@ content:
     settings:
       display_label: true
     weight: 15
+    region: content
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
     settings:
       display_label: true
     weight: 16
+    region: content
     third_party_settings: {  }
   title:
     type: string_textfield
     weight: -5
+    region: content
     settings:
       size: 60
       placeholder: ''
@@ -52,6 +58,7 @@ content:
   uid:
     type: entity_reference_autocomplete
     weight: 5
+    region: content
     settings:
       match_operator: CONTAINS
       size: 60
diff --git a/web/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml b/web/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml
index 466b6e0b3..683222926 100644
--- a/web/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_form_display.user.user.default.yml
@@ -14,12 +14,16 @@ mode: default
 content:
   account:
     weight: -10
+    region: content
   contact:
     weight: 5
+    region: content
   language:
     weight: 0
+    region: content
   timezone:
     weight: 6
+    region: content
   user_picture:
     type: image_image
     settings:
@@ -27,4 +31,5 @@ content:
       preview_image_style: thumbnail
     third_party_settings: {  }
     weight: -1
+    region: content
 hidden: {  }
diff --git a/web/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml b/web/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml
index bd52f7750..e494882d4 100644
--- a/web/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_view_display.block_content.basic.default.yml
@@ -15,6 +15,7 @@ content:
     label: hidden
     type: text_default
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
 hidden: {  }
diff --git a/web/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml b/web/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml
index 1ed49ce2f..6ae213d3e 100644
--- a/web/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_view_display.comment.comment.default.yml
@@ -15,8 +15,10 @@ content:
     label: hidden
     type: text_default
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
   links:
     weight: 100
+    region: content
 hidden: {  }
diff --git a/web/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml b/web/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml
index 98a2de8ab..5c432527b 100644
--- a/web/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_view_display.node.article.default.yml
@@ -22,12 +22,14 @@ content:
   body:
     type: text_default
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
     label: hidden
   comment:
     type: comment_default
     weight: 110
+    region: content
     label: above
     settings:
       view_mode: default
@@ -36,6 +38,7 @@ content:
   field_image:
     type: image
     weight: -1
+    region: content
     settings:
       image_style: large
       image_link: ''
@@ -44,12 +47,14 @@ content:
   field_tags:
     type: entity_reference_label
     weight: 10
+    region: content
     label: above
     settings:
       link: true
     third_party_settings: {  }
   links:
     weight: 100
+    region: content
 hidden:
   field_image: true
   field_tags: true
diff --git a/web/core/profiles/standard/config/install/core.entity_view_display.node.article.rss.yml b/web/core/profiles/standard/config/install/core.entity_view_display.node.article.rss.yml
index 75a14a3fb..84660b6d2 100644
--- a/web/core/profiles/standard/config/install/core.entity_view_display.node.article.rss.yml
+++ b/web/core/profiles/standard/config/install/core.entity_view_display.node.article.rss.yml
@@ -17,6 +17,7 @@ mode: rss
 content:
   links:
     weight: 100
+    region: content
 hidden:
   body: true
   comment: true
diff --git a/web/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml b/web/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml
index 43ee079e1..7b96908be 100644
--- a/web/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml
+++ b/web/core/profiles/standard/config/install/core.entity_view_display.node.article.teaser.yml
@@ -21,6 +21,7 @@ content:
   body:
     type: text_summary_or_trimmed
     weight: 0
+    region: content
     settings:
       trim_length: 600
     third_party_settings: {  }
@@ -28,6 +29,7 @@ content:
   field_image:
     type: image
     weight: -1
+    region: content
     settings:
       image_style: medium
       image_link: content
@@ -36,12 +38,14 @@ content:
   field_tags:
     type: entity_reference_label
     weight: 10
+    region: content
     settings:
       link: true
     third_party_settings: {  }
     label: above
   links:
     weight: 100
+    region: content
 hidden:
   comment: true
   field_image: true
diff --git a/web/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml b/web/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml
index dcb2d3ece..8afd9423e 100644
--- a/web/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_view_display.node.page.default.yml
@@ -16,8 +16,10 @@ content:
     label: hidden
     type: text_default
     weight: 100
+    region: content
     settings: {  }
     third_party_settings: {  }
   links:
     weight: 101
+    region: content
 hidden: {  }
diff --git a/web/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml b/web/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml
index f235a10ed..bc7a68c5b 100644
--- a/web/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml
+++ b/web/core/profiles/standard/config/install/core.entity_view_display.node.page.teaser.yml
@@ -17,9 +17,11 @@ content:
     label: hidden
     type: text_summary_or_trimmed
     weight: 100
+    region: content
     settings:
       trim_length: 600
     third_party_settings: {  }
   links:
     weight: 101
+    region: content
 hidden: {  }
diff --git a/web/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml b/web/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml
index 4c1379244..2ff13ad10 100644
--- a/web/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml
+++ b/web/core/profiles/standard/config/install/core.entity_view_display.user.user.compact.yml
@@ -16,6 +16,7 @@ content:
   user_picture:
     type: image
     weight: 0
+    region: content
     settings:
       image_style: thumbnail
       image_link: content
diff --git a/web/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml b/web/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml
index 9e4621d5e..ef1fdd79c 100644
--- a/web/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_view_display.user.user.default.yml
@@ -14,9 +14,11 @@ mode: default
 content:
   member_for:
     weight: 5
+    region: content
   user_picture:
     type: image
     weight: 0
+    region: content
     settings:
       image_style: thumbnail
       image_link: content
diff --git a/web/core/profiles/standard/config/install/system.cron.yml b/web/core/profiles/standard/config/install/system.cron.yml
index e6f30d3d2..c27b41dbb 100644
--- a/web/core/profiles/standard/config/install/system.cron.yml
+++ b/web/core/profiles/standard/config/install/system.cron.yml
@@ -1,3 +1,4 @@
 threshold:
   requirements_warning: 172800
   requirements_error: 1209600
+logging: 1
diff --git a/web/core/profiles/standard/standard.install b/web/core/profiles/standard/standard.install
index 0a40ce6cd..2f567abb4 100644
--- a/web/core/profiles/standard/standard.install
+++ b/web/core/profiles/standard/standard.install
@@ -25,8 +25,8 @@ function standard_install() {
   $user_settings->set('register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)->save(TRUE);
 
   // Enable default permissions for system roles.
-  user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access comments'));
-  user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('access comments', 'post comments', 'skip comment approval'));
+  user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access comments']);
+  user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['access comments', 'post comments', 'skip comment approval']);
 
   // Assign user 1 the "administrator" role.
   $user = User::load(1);
@@ -40,34 +40,34 @@ function standard_install() {
   // Enable the Contact link in the footer menu.
   /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
   $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-  $menu_link_manager->updateDefinition('contact.site_page', array('enabled' => TRUE));
+  $menu_link_manager->updateDefinition('contact.site_page', ['enabled' => TRUE]);
 
-  user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access site-wide contact form'));
-  user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('access site-wide contact form'));
+  user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
+  user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['access site-wide contact form']);
 
   // Allow authenticated users to use shortcuts.
-  user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('access shortcuts'));
+  user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['access shortcuts']);
 
   // Populate the default shortcut set.
-  $shortcut = Shortcut::create(array(
+  $shortcut = Shortcut::create([
     'shortcut_set' => 'default',
     'title' => t('Add content'),
     'weight' => -20,
-    'link' => array('uri' => 'internal:/node/add'),
-  ));
+    'link' => ['uri' => 'internal:/node/add'],
+  ]);
   $shortcut->save();
 
-  $shortcut = Shortcut::create(array(
+  $shortcut = Shortcut::create([
     'shortcut_set' => 'default',
     'title' => t('All content'),
     'weight' => -19,
-    'link' => array('uri' => 'internal:/admin/content'),
-  ));
+    'link' => ['uri' => 'internal:/admin/content'],
+  ]);
   $shortcut->save();
 
   // Allow all users to use search.
-  user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('search content'));
-  user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('search content'));
+  user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['search content']);
+  user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['search content']);
 
   // Enable the admin theme.
   \Drupal::configFactory()->getEditable('node.settings')->set('use_admin_theme', TRUE)->save(TRUE);
diff --git a/web/core/profiles/standard/tests/src/Functional/StandardTest.php b/web/core/profiles/standard/tests/src/Functional/StandardTest.php
index 4f9e756f2..f449c10a1 100644
--- a/web/core/profiles/standard/tests/src/Functional/StandardTest.php
+++ b/web/core/profiles/standard/tests/src/Functional/StandardTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\standard\Functional;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\contact\Entity\ContactForm;
 use Drupal\Core\Url;
 use Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber;
@@ -31,27 +31,27 @@ class StandardTest extends BrowserTestBase {
   /**
    * Tests Standard installation profile.
    */
-  function testStandard() {
+  public function testStandard() {
     $this->drupalGet('');
     $this->assertLink(t('Contact'));
     $this->clickLink(t('Contact'));
     $this->assertResponse(200);
 
     // Test anonymous user can access 'Main navigation' block.
-    $this->adminUser = $this->drupalCreateUser(array(
+    $this->adminUser = $this->drupalCreateUser([
       'administer blocks',
       'post comments',
       'skip comment approval',
       'create article content',
       'create page content',
-    ));
+    ]);
     $this->drupalLogin($this->adminUser);
     // Configure the block.
     $this->drupalGet('admin/structure/block/add/system_menu_block:main/bartik');
-    $this->drupalPostForm(NULL, array(
+    $this->drupalPostForm(NULL, [
       'region' => 'sidebar_first',
       'id' => 'main_navigation',
-    ), t('Save block'));
+    ], t('Save block'));
     // Verify admin user can see the block.
     $this->drupalGet('');
     $this->assertText('Main navigation');
@@ -59,18 +59,18 @@ class StandardTest extends BrowserTestBase {
     // Verify we have role = aria on system_powered_by and help_block
     // blocks.
     $this->drupalGet('admin/structure/block');
-    $elements = $this->xpath('//div[@role=:role and @id=:id]', array(
+    $elements = $this->xpath('//div[@role=:role and @id=:id]', [
       ':role' => 'complementary',
       ':id' => 'block-bartik-help',
-    ));
+    ]);
 
     $this->assertEqual(count($elements), 1, 'Found complementary role on help block.');
 
     $this->drupalGet('');
-    $elements = $this->xpath('//div[@role=:role and @id=:id]', array(
+    $elements = $this->xpath('//div[@role=:role and @id=:id]', [
       ':role' => 'complementary',
       ':id' => 'block-bartik-powered',
-    ));
+    ]);
     $this->assertEqual(count($elements), 1, 'Found complementary role on powered by block.');
 
     // Verify anonymous user can see the block.
@@ -79,22 +79,22 @@ class StandardTest extends BrowserTestBase {
 
     // Ensure comments don't show in the front page RSS feed.
     // Create an article.
-    $this->drupalCreateNode(array(
+    $this->drupalCreateNode([
       'type' => 'article',
       'title' => 'Foobar',
       'promote' => 1,
       'status' => 1,
-      'body' => array(array('value' => 'Then she picked out two somebodies,<br />Sally and me', 'format' => 'basic_html')),
-    ));
+      'body' => [['value' => 'Then she picked out two somebodies,<br />Sally and me', 'format' => 'basic_html']],
+    ]);
 
     // Add a comment.
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('node/1');
     $this->assertRaw('Then she picked out two somebodies,<br />Sally and me', 'Found a line break.');
-    $this->drupalPostForm(NULL, array(
+    $this->drupalPostForm(NULL, [
       'subject[0][value]' => 'Barfoo',
       'comment_body[0][value]' => 'Then she picked out two somebodies, Sally and me',
-    ), t('Save'));
+    ], t('Save'));
     // Fetch the feed.
     $this->drupalGet('rss.xml');
     $this->assertText('Foobar');
@@ -131,9 +131,9 @@ class StandardTest extends BrowserTestBase {
       $filter->removeFilter('editor_file_reference');
       $filter->save();
     }
-    \Drupal::service('module_installer')->uninstall(array('editor', 'ckeditor'));
+    \Drupal::service('module_installer')->uninstall(['editor', 'ckeditor']);
     $this->rebuildContainer();
-    \Drupal::service('module_installer')->install(array('editor'));
+    \Drupal::service('module_installer')->install(['editor']);
     /** @var \Drupal\contact\ContactFormInterface $contact_form */
     $contact_form = ContactForm::load('feedback');
     $recipients = $contact_form->getRecipients();
@@ -167,7 +167,7 @@ class StandardTest extends BrowserTestBase {
 
     // Make sure the optional image styles are installed after enabling
     // the responsive_image module.
-    \Drupal::service('module_installer')->install(array('responsive_image'));
+    \Drupal::service('module_installer')->install(['responsive_image']);
     $this->rebuildContainer();
     $this->drupalGet('admin/config/media/image-styles');
     $this->assertText('Max 325x325');
diff --git a/web/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php b/web/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php
index 332b00081..7df92f260 100644
--- a/web/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php
+++ b/web/core/profiles/testing/modules/drupal_system_listing_compatible_test/src/Tests/SystemListingCompatibleTest.php
@@ -20,7 +20,7 @@ class SystemListingCompatibleTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('drupal_system_listing_compatible_test');
+  public static $modules = ['drupal_system_listing_compatible_test'];
 
   /**
    * Use the Minimal profile.
@@ -35,7 +35,7 @@ class SystemListingCompatibleTest extends WebTestBase {
   /**
    * Non-empty test* method required to executed the test case class.
    */
-  function testSystemListing() {
+  public function testSystemListing() {
     $this->pass(__CLASS__ . ' test executed.');
   }
 
diff --git a/web/core/profiles/testing_config_overrides/config/install/system.cron.yml b/web/core/profiles/testing_config_overrides/config/install/system.cron.yml
index e9c97bc4a..f3cdb47cb 100644
--- a/web/core/profiles/testing_config_overrides/config/install/system.cron.yml
+++ b/web/core/profiles/testing_config_overrides/config/install/system.cron.yml
@@ -1,3 +1,4 @@
 threshold:
   requirements_warning: 259200
   requirements_error: 1209600
+logging: 1
diff --git a/web/core/rebuild.php b/web/core/rebuild.php
index 4e69eabf6..689540bc4 100644
--- a/web/core/rebuild.php
+++ b/web/core/rebuild.php
@@ -42,10 +42,14 @@ if (Settings::get('rebuild_access', FALSE) ||
     ((REQUEST_TIME - $request->query->get('timestamp')) < 300) &&
     Crypt::hashEquals(Crypt::hmacBase64($request->query->get('timestamp'), Settings::get('hash_salt')), $request->query->get('token'))
   )) {
-  // Clear the APCu cache to ensure APCu class loader is reset.
-  if (function_exists('apcu_clear_cache')) {
-    apcu_clear_cache();
-  }
+  // Clear user cache for all major platforms.
+  $user_caches = [
+    'apcu_clear_cache',
+    'wincache_ucache_clear',
+    'xcache_clear_cache',
+  ];
+  array_map('call_user_func', array_filter($user_caches, 'is_callable'));
+
   drupal_rebuild($autoloader, $request);
   drupal_set_message('Cache rebuild complete.');
 }
diff --git a/web/core/scripts/js/.eslintrc.json b/web/core/scripts/js/.eslintrc.json
new file mode 100644
index 000000000..4152517e2
--- /dev/null
+++ b/web/core/scripts/js/.eslintrc.json
@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "strict": [2, "global"]
+  }
+}
diff --git a/web/core/scripts/js/babel-es6-build.js b/web/core/scripts/js/babel-es6-build.js
new file mode 100644
index 000000000..e073f6a43
--- /dev/null
+++ b/web/core/scripts/js/babel-es6-build.js
@@ -0,0 +1,54 @@
+/**
+ * @file
+ *
+ * Compile *.es6.js files to ES5.
+ *
+ * @internal This file is part of the core javascript build process and is only
+ * meant to be used in that context.
+ */
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const babel = require('babel-core');
+const glob = require('glob');
+
+// Logging human-readable timestamp.
+const log = function (message) {
+  // eslint-disable-next-line no-console
+  console.log(`[${new Date().toTimeString().slice(0, 8)}] ${message}`);
+};
+
+function addSourceMappingUrl(code, loc) {
+  return code + '\n\n//# sourceMappingURL=' + path.basename(loc);
+}
+
+const changedOrAdded = (filePath) => {
+  babel.transformFile(filePath, {
+    sourceMaps: true,
+    comments: false
+  }, function (err, result) {
+    const fileName = filePath.slice(0, -7);
+    // we've requested for a sourcemap to be written to disk
+    let mapLoc = `${fileName}.js.map`;
+
+    fs.writeFile(mapLoc, JSON.stringify(result.map));
+    fs.writeFile(`${fileName}.js`, addSourceMappingUrl(result.code, mapLoc));
+
+    log(`'${filePath}' is being processed.`);
+  });
+};
+
+const fileMatch = './**/*.es6.js';
+const globOptions = {
+  ignore: 'node_modules/**'
+};
+const processFiles = (error, filePaths) => {
+  if (error) {
+    process.exitCode = 1;
+  }
+  filePaths.forEach(changedOrAdded);
+};
+glob(fileMatch, globOptions, processFiles);
+process.exitCode = 0;
diff --git a/web/core/scripts/js/babel-es6-watch.js b/web/core/scripts/js/babel-es6-watch.js
new file mode 100644
index 000000000..d614774f2
--- /dev/null
+++ b/web/core/scripts/js/babel-es6-watch.js
@@ -0,0 +1,67 @@
+/**
+ * @file
+ *
+ * Watch changes to *.es6.js files and compile them to ES5 during development.
+ *
+ * @internal This file is part of the core javascript build process and is only
+ * meant to be used in that context.
+ */
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const babel = require('babel-core');
+const chokidar = require('chokidar');
+
+// Logging human-readable timestamp.
+const log = function log(message) {
+  // eslint-disable-next-line no-console
+  console.log(`[${new Date().toTimeString().slice(0, 8)}] ${message}`);
+};
+
+function addSourceMappingUrl(code, loc) {
+  return `${code}\n\n//# sourceMappingURL=${path.basename(loc)}`;
+}
+
+const fileMatch = './**/*.es6.js';
+const watcher = chokidar.watch(fileMatch, {
+  ignoreInitial: true,
+  ignored: 'node_modules/**'
+});
+
+const changedOrAdded = (filePath) => {
+  babel.transformFile(filePath, {
+    sourceMaps: true,
+    comments: false
+  }, (err, result) => {
+    const fileName = filePath.slice(0, -7);
+    // we've requested for a sourcemap to be written to disk
+    const mapLoc = `${fileName}.js.map`;
+
+    fs.writeFileSync(mapLoc, JSON.stringify(result.map));
+    fs.writeFileSync(`${fileName}.js`, addSourceMappingUrl(result.code, mapLoc));
+
+    log(`'${filePath}' has been changed.`);
+  });
+};
+
+const unlinkHandler = (err) => {
+  if (err) {
+    log(err);
+  }
+};
+
+watcher
+  .on('add', filePath => changedOrAdded(filePath))
+  .on('change', filePath => changedOrAdded(filePath))
+  .on('unlink', (filePath) => {
+    const fileName = filePath.slice(0, -7);
+    fs.stat(`${fileName}.js`, () => {
+      fs.unlink(`${fileName}.js`, unlinkHandler);
+    });
+    fs.stat(`${fileName}.js.map`, () => {
+      fs.unlink(`${fileName}.js.map`, unlinkHandler);
+    });
+  })
+  .on('ready', () => log(`Watching '${fileMatch}' for changes.`));
diff --git a/web/core/scripts/js/rename-js-files-to-es6.sh b/web/core/scripts/js/rename-js-files-to-es6.sh
new file mode 100644
index 000000000..5ae2a8901
--- /dev/null
+++ b/web/core/scripts/js/rename-js-files-to-es6.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Rename *.js files in *.es6.js. Only need to be run once.
+# Should be removed after *.es6.js files are committed to core.
+#
+# @internal This file is part of the core javascript build process and is only
+# meant to be used in that context.
+
+for js in `find ./{misc,modules,themes} -name '*.js'`;
+do
+   mv ${js} ${js%???}.es6.js;
+done
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php
index 10aa88e92..bf2643da6 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php
@@ -27,9 +27,9 @@ class MachineNameTest extends JavascriptTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $account = $this->drupalCreateUser(array(
+    $account = $this->drupalCreateUser([
       'access content',
-    ));
+    ]);
     $this->drupalLogin($account);
   }
 
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php
index a116c6fde..511dee6e3 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php
@@ -52,9 +52,9 @@ class EntityReferenceAutocompleteWidgetTest extends JavascriptTestBase {
     entity_get_form_display('node', 'page', 'default')
       ->setComponent($field_name, [
         'type' => 'entity_reference_autocomplete',
-        'settings' => array(
+        'settings' => [
           'match_operator' => 'CONTAINS',
-        ),
+        ],
       ])
       ->save();
 
@@ -78,9 +78,9 @@ class EntityReferenceAutocompleteWidgetTest extends JavascriptTestBase {
     entity_get_form_display('node', 'page', 'default')
       ->setComponent($field_name, [
         'type' => 'entity_reference_autocomplete',
-        'settings' => array(
+        'settings' => [
           'match_operator' => 'STARTS_WITH',
-        ),
+        ],
       ])
       ->save();
 
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php b/web/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php
index 815a26b54..81d379f91 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php
@@ -113,7 +113,7 @@ JS;
    *   The page element node if found, NULL if not.
    */
   public function waitForButton($locator, $timeout = 10000) {
-    return $this->waitForElement('named', array('button', $locator), $timeout);
+    return $this->waitForElement('named', ['button', $locator], $timeout);
   }
 
   /**
@@ -128,7 +128,7 @@ JS;
    *   The page element node if found, NULL if not.
    */
   public function waitForLink($locator, $timeout = 10000) {
-    return $this->waitForElement('named', array('link', $locator), $timeout);
+    return $this->waitForElement('named', ['link', $locator], $timeout);
   }
 
   /**
@@ -143,7 +143,7 @@ JS;
    *   The page element node if found, NULL if not.
    */
   public function waitForField($locator, $timeout = 10000) {
-    return $this->waitForElement('named', array('field', $locator), $timeout);
+    return $this->waitForElement('named', ['field', $locator], $timeout);
   }
 
   /**
@@ -158,7 +158,7 @@ JS;
    *   The page element node if found, NULL if not.
    */
   public function waitForId($id, $timeout = 10000) {
-    return $this->waitForElement('named', array('id', $id), $timeout);
+    return $this->waitForElement('named', ['id', $id], $timeout);
   }
 
   /**
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php
index 7930a909d..36f6340f7 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php
@@ -80,7 +80,7 @@ class JSWebAssertTest extends JavascriptTestBase {
     $result = $page->findButton('Added WaitForElementVisible');
     $this->assertEmpty($result);
     $test_wait_on_element_visible->click();
-    $result = $assert_session->waitForElementVisible('named', array('button', 'Added WaitForElementVisible'));
+    $result = $assert_session->waitForElementVisible('named', ['button', 'Added WaitForElementVisible']);
     $this->assertNotEmpty($result);
     $this->assertTrue($result instanceof NodeElement);
     $this->assertEquals(TRUE, $result->isVisible());
diff --git a/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php b/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
index 81ab2c16e..c88949df7 100644
--- a/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
+++ b/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
@@ -2,6 +2,9 @@
 
 namespace Drupal\FunctionalTests;
 
+use Behat\Mink\Exception\ElementNotFoundException;
+use Behat\Mink\Exception\ExpectationException;
+use Behat\Mink\Selector\Xpath\Escaper;
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\KernelTests\AssertLegacyTrait as BaseAssertLegacyTrait;
@@ -227,24 +230,27 @@ trait AssertLegacyTrait {
   }
 
   /**
-   * Asserts that a field exists with the given name and value.
+   * Asserts that a field does not exist with the given name and value.
    *
    * @param string $name
    *   Name of field to assert.
    * @param string $value
-   *   (optional) Value of the field to assert. You may pass in NULL (default)
-   *   to skip checking the actual value, while still checking that the field
-   *   exists.
+   *   (optional) Value for the field, to assert that the field's value on the
+   *   page does not match it. You may pass in NULL to skip checking the
+   *   value, while still checking that the field does not exist. However, the
+   *   default value ('') asserts that the field value is not an empty string.
    *
    * @deprecated Scheduled for removal in Drupal 9.0.0.
    *   Use $this->assertSession()->fieldNotExists() or
    *   $this->assertSession()->fieldValueNotEquals() instead.
    */
-  protected function assertNoFieldByName($name, $value = NULL) {
-    $this->assertSession()->fieldNotExists($name);
-    if ($value !== NULL) {
+  protected function assertNoFieldByName($name, $value = '') {
+    if ($this->getSession()->getPage()->findField($name) && isset($value)) {
       $this->assertSession()->fieldValueNotEquals($name, (string) $value);
     }
+    else {
+      $this->assertSession()->fieldNotExists($name);
+    }
   }
 
   /**
@@ -258,12 +264,23 @@ trait AssertLegacyTrait {
    *   However, the default value ('') asserts that the field value is an empty
    *   string.
    *
+   * @throws \Behat\Mink\Exception\ElementNotFoundException
+   *
    * @deprecated Scheduled for removal in Drupal 9.0.0.
    *   Use $this->assertSession()->fieldExists() or
    *   $this->assertSession()->fieldValueEquals() instead.
    */
-  protected function assertFieldById($id, $value = NULL) {
-    $this->assertFieldByName($id, $value);
+  protected function assertFieldById($id, $value = '') {
+    $xpath = $this->assertSession()->buildXPathQuery('//textarea[@id=:value]|//input[@id=:value]|//select[@id=:value]', [':value' => $id]);
+    $field = $this->getSession()->getPage()->find('xpath', $xpath);
+
+    if (empty($field)) {
+      throw new ElementNotFoundException($this->getSession()->getDriver(), 'form field', 'id', $field);
+    }
+
+    if ($value !== NULL) {
+      $this->assertEquals($value, $field->getValue());
+    }
   }
 
   /**
@@ -376,7 +393,7 @@ trait AssertLegacyTrait {
    *   Link position counting from zero.
    *
    * @deprecated Scheduled for removal in Drupal 9.0.0.
-   *   Use $this->assertSession()->linkByHref() instead.
+   *   Use $this->assertSession()->linkByHrefExists() instead.
    */
   protected function assertLinkByHref($href, $index = 0) {
     $this->assertSession()->linkByHrefExists($href, $index);
@@ -406,16 +423,26 @@ trait AssertLegacyTrait {
    *   while still checking that the field doesn't exist. However, the default
    *   value ('') asserts that the field value is not an empty string.
    *
+   * @throws \Behat\Mink\Exception\ExpectationException
+   *
    * @deprecated Scheduled for removal in Drupal 9.0.0.
    *   Use $this->assertSession()->fieldNotExists() or
    *   $this->assertSession()->fieldValueNotEquals() instead.
    */
   protected function assertNoFieldById($id, $value = '') {
-    if ($this->getSession()->getPage()->findField($id)) {
-      $this->assertSession()->fieldValueNotEquals($id, (string) $value);
+    $xpath = $this->assertSession()->buildXPathQuery('//textarea[@id=:value]|//input[@id=:value]|//select[@id=:value]', [':value' => $id]);
+    $field = $this->getSession()->getPage()->find('xpath', $xpath);
+
+    // Return early if the field could not be found as expected.
+    if ($field === NULL) {
+      return;
     }
-    else {
-      $this->assertSession()->fieldNotExists($id);
+
+    if (!isset($value)) {
+      throw new ExpectationException(sprintf('Id "%s" appears on this page, but it should not.', $id), $this->getSession()->getDriver());
+    }
+    elseif ($value === $field->getValue()) {
+      throw new ExpectationException(sprintf('Failed asserting that %s is not equal to %s', $field->getValue(), $value), $this->getSession()->getDriver());
     }
   }
 
@@ -447,6 +474,21 @@ trait AssertLegacyTrait {
     return $this->assertSession()->optionExists($id, $option);
   }
 
+  /**
+   * Asserts that a select option with the visible text exists.
+   *
+   * @param string $id
+   *   The ID of the select field to assert.
+   * @param string $text
+   *   The text for the option tag to assert.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->optionExists() instead.
+   */
+  protected function assertOptionByText($id, $text) {
+    return $this->assertSession()->optionExists($id, $text);
+  }
+
   /**
    * Asserts that a select option does NOT exist in the current page.
    *
@@ -509,6 +551,102 @@ trait AssertLegacyTrait {
     $this->assertSession()->checkboxNotChecked($id);
   }
 
+  /**
+   * Asserts that a field exists in the current page by the given XPath.
+   *
+   * @param string $xpath
+   *   XPath used to find the field.
+   * @param string $value
+   *   (optional) Value of the field to assert. You may pass in NULL (default)
+   *   to skip checking the actual value, while still checking that the field
+   *   exists.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages with t().
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->xpath() instead and check the values directly in the test.
+   */
+  protected function assertFieldByXPath($xpath, $value = NULL, $message = '') {
+    $fields = $this->xpath($xpath);
+
+    $this->assertFieldsByValue($fields, $value, $message);
+  }
+
+  /**
+   * Asserts that a field does not exist or its value does not match, by XPath.
+   *
+   * @param string $xpath
+   *   XPath used to find the field.
+   * @param string $value
+   *   (optional) Value of the field, to assert that the field's value on the
+   *   page does not match it.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages with t().
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->xpath() instead and assert that the result is empty.
+   */
+  protected function assertNoFieldByXPath($xpath, $value = NULL, $message = '') {
+    $fields = $this->xpath($xpath);
+
+    // If value specified then check array for match.
+    $found = TRUE;
+    if (isset($value)) {
+      $found = FALSE;
+      if ($fields) {
+        foreach ($fields as $field) {
+          if ($field->getAttribute('value') == $value) {
+            $found = TRUE;
+          }
+        }
+      }
+    }
+    return $this->assertFalse($fields && $found, $message);
+  }
+
+  /**
+   * Asserts that a field exists in the current page with a given Xpath result.
+   *
+   * @param \Behat\Mink\Element\NodeElement[] $fields
+   *   Xml elements.
+   * @param string $value
+   *   (optional) Value of the field to assert. You may pass in NULL (default) to skip
+   *   checking the actual value, while still checking that the field exists.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages with t().
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Iterate over the fields yourself instead and directly check the values in
+   *   the test.
+   */
+  protected function assertFieldsByValue($fields, $value = NULL, $message = '') {
+    // If value specified then check array for match.
+    $found = TRUE;
+    if (isset($value)) {
+      $found = FALSE;
+      if ($fields) {
+        foreach ($fields as $field) {
+          if ($field->getAttribute('value') == $value) {
+            // Input element with correct value.
+            $found = TRUE;
+          }
+          elseif ($field->find('xpath', '//option[@value = ' . (new Escaper())->escapeLiteral($value) . ' and @selected = "selected"]')) {
+            // Select element with an option.
+            $found = TRUE;
+          }
+          elseif ($field->getText() == $value) {
+            // Text area with correct text.
+            $found = TRUE;
+          }
+        }
+      }
+    }
+    $this->assertTrue($fields && $found, $message);
+  }
+
   /**
    * Passes if the raw text IS found escaped on the loaded page, fail otherwise.
    *
@@ -552,6 +690,22 @@ trait AssertLegacyTrait {
     $this->assertSession()->responseMatches($pattern);
   }
 
+  /**
+   * Triggers a pass if the Perl regex pattern is not found in the raw content.
+   *
+   * @param string $pattern
+   *   Perl regex to look for including the regex delimiters.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->responseNotMatches() instead.
+   *
+   * @see https://www.drupal.org/node/2864262
+   */
+  protected function assertNoPattern($pattern) {
+    @trigger_error('assertNoPattern() is deprecated and scheduled for removal in Drupal 9.0.0. Use $this->assertSession()->responseNotMatches($pattern) instead. See https://www.drupal.org/node/2864262.', E_USER_DEPRECATED);
+    $this->assertSession()->responseNotMatches($pattern);
+  }
+
   /**
    * Asserts whether an expected cache tag was present in the last response.
    *
@@ -565,6 +719,21 @@ trait AssertLegacyTrait {
     $this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', $expected_cache_tag);
   }
 
+  /**
+   * Checks that current response header equals value.
+   *
+   * @param string $name
+   *   Name of header to assert.
+   * @param string $value
+   *   Value of the header to assert
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->assertSession()->responseHeaderEquals() instead.
+   */
+  protected function assertHeader($name, $value) {
+    $this->assertSession()->responseHeaderEquals($name, $value);
+  }
+
   /**
    * Returns WebAssert object.
    *
@@ -599,8 +768,19 @@ trait AssertLegacyTrait {
    * @deprecated Scheduled for removal in Drupal 9.0.0.
    *   Use $this->assertSession()->buildXPathQuery() instead.
    */
-  protected function buildXPathQuery($xpath, array $args = array()) {
+  protected function buildXPathQuery($xpath, array $args = []) {
     return $this->assertSession()->buildXPathQuery($xpath, $args);
   }
 
+  /**
+   * Gets the current raw content.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->getSession()->getPage()->getContent() instead.
+   */
+  protected function getRawContent() {
+    @trigger_error('AssertLegacyTrait::getRawContent() is scheduled for removal in Drupal 9.0.0. Use $this->getSession()->getPage()->getContent() instead.', E_USER_DEPRECATED);
+    return $this->getSession()->getPage()->getContent();
+  }
+
 }
diff --git a/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index d0a424936..993180423 100644
--- a/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -2,9 +2,11 @@
 
 namespace Drupal\FunctionalTests;
 
+use Behat\Mink\Exception\ExpectationException;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Url;
 use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\Traits\Core\CronRunTrait;
 
 /**
  * Tests BrowserTestBase functionality.
@@ -13,12 +15,14 @@ use Drupal\Tests\BrowserTestBase;
  */
 class BrowserTestBaseTest extends BrowserTestBase {
 
+  use CronRunTrait;
+
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = array('test_page_test', 'form_test', 'system_test');
+  public static $modules = ['test_page_test', 'form_test', 'system_test'];
 
   /**
    * Tests basic page test.
@@ -40,7 +44,7 @@ class BrowserTestBaseTest extends BrowserTestBase {
     $this->assertNotContains('</html>', $text);
 
     // Response includes cache tags that we can assert.
-    $this->assertSession()->responseHeaderEquals('X-Drupal-Cache-Tags', 'rendered');
+    $this->assertSession()->responseHeaderEquals('X-Drupal-Cache-Tags', 'http_response rendered');
 
     // Test that we can read the JS settings.
     $js_settings = $this->getDrupalSettings();
@@ -55,9 +59,9 @@ class BrowserTestBaseTest extends BrowserTestBase {
     $this->assertSession()->pageTextContains('Hello Drupal');
 
     // Test that setting headers with drupalGet() works.
-    $this->drupalGet('system-test/header', array(), array(
+    $this->drupalGet('system-test/header', [], [
       'Test-Header' => 'header value',
-    ));
+    ]);
     $returned_header = $this->getSession()->getResponseHeader('Test-Header');
     $this->assertSame('header value', $returned_header);
   }
@@ -74,12 +78,33 @@ class BrowserTestBaseTest extends BrowserTestBase {
     $this->assertSession()->elementExists('css', 'form#form-test-form-test-object');
     $this->assertSession()->fieldExists('bananas');
 
+    // Check that the hidden field exists and has a specific value.
+    $this->assertSession()->hiddenFieldExists('strawberry');
+    $this->assertSession()->hiddenFieldExists('red');
+    $this->assertSession()->hiddenFieldExists('redstrawberryhiddenfield');
+    $this->assertSession()->hiddenFieldValueNotEquals('strawberry', 'brown');
+    $this->assertSession()->hiddenFieldValueEquals('strawberry', 'red');
+
+    // Check that a hidden field does not exist.
+    $this->assertSession()->hiddenFieldNotExists('bananas');
+    $this->assertSession()->hiddenFieldNotExists('pineapple');
+
     $edit = ['bananas' => 'green'];
     $this->submitForm($edit, 'Save', 'form-test-form-test-object');
 
     $config_factory = $this->container->get('config.factory');
     $value = $config_factory->get('form_test.object')->get('bananas');
     $this->assertSame('green', $value);
+
+    // Test drupalPostForm().
+    $edit = ['bananas' => 'red'];
+    $this->drupalPostForm('form-test/object-builder', $edit, 'Save');
+    $value = $config_factory->get('form_test.object')->get('bananas');
+    $this->assertSame('red', $value);
+
+    $this->drupalPostForm('form-test/object-builder', NULL, 'Save');
+    $value = $config_factory->get('form_test.object')->get('bananas');
+    $this->assertSame('', $value);
   }
 
   /**
@@ -103,14 +128,157 @@ class BrowserTestBaseTest extends BrowserTestBase {
   }
 
   /**
-   * Tests legacy asserts.
+   * Tests linkExists() with pipe character (|) in locator.
+   *
+   * @see \Drupal\Tests\WebAssert::linkExists()
    */
-  public function testLegacyAsserts() {
+  public function testPipeCharInLocator() {
+    $this->drupalGet('test-pipe-char');
+    $this->assertSession()->linkExists('foo|bar|baz');
+  }
+
+  /**
+   * Tests legacy text asserts.
+   */
+  public function testLegacyTextAsserts() {
     $this->drupalGet('test-encoded');
     $dangerous = 'Bad html <script>alert(123);</script>';
     $sanitized = Html::escape($dangerous);
     $this->assertNoText($dangerous);
     $this->assertText($sanitized);
+
+    // Test getRawContent().
+    $this->assertSame($this->getSession()->getPage()->getContent(), $this->getRawContent());
+  }
+
+  /**
+   * Tests legacy field asserts.
+   */
+  public function testLegacyFieldAsserts() {
+    $this->drupalGet('test-field-xpath');
+    $this->assertFieldsByValue($this->xpath("//h1[@class = 'page-title']"), NULL);
+    $this->assertFieldsByValue($this->xpath('//table/tbody/tr[2]/td[1]'), 'one');
+    $this->assertFieldByXPath('//table/tbody/tr[2]/td[1]', 'one');
+
+    $this->assertFieldsByValue($this->xpath("//input[@id = 'edit-name']"), 'Test name');
+    $this->assertFieldByXPath("//input[@id = 'edit-name']", 'Test name');
+    $this->assertFieldsByValue($this->xpath("//select[@id = 'edit-options']"), '2');
+    $this->assertFieldByXPath("//select[@id = 'edit-options']", '2');
+
+    $this->assertNoFieldByXPath('//notexisting');
+    $this->assertNoFieldByXPath("//input[@id = 'edit-name']", 'wrong value');
+
+    $this->assertNoFieldById('name');
+    $this->assertNoFieldById('name', 'not the value');
+    $this->assertNoFieldById('notexisting');
+    $this->assertNoFieldById('notexisting', NULL);
+
+    // Test that the assertion fails correctly if no value is passed in.
+    try {
+      $this->assertNoFieldById('edit-description');
+      $this->fail('The "description" field, with no value was not found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('The "description" field, with no value was found.');
+    }
+
+    // Test that the assertion fails correctly if a NULL value is passed in.
+    try {
+      $this->assertNoFieldById('edit-name', NULL);
+      $this->fail('The "name" field was not found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('The "name" field was found.');
+    }
+
+    $this->assertFieldById('edit-name', NULL);
+    $this->assertFieldById('edit-name', 'Test name');
+    $this->assertFieldById('edit-description', NULL);
+    $this->assertFieldById('edit-description');
+
+    // Test that the assertion fails correctly if no value is passed in.
+    try {
+      $this->assertFieldById('edit-name');
+      $this->fail('The "edit-name" field with no value was found.');
+    }
+    catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+      $this->pass('The "edit-name" field with no value was not found.');
+    }
+
+    // Test that the assertion fails correctly if NULL is passed in.
+    try {
+      $this->assertFieldById('name', NULL);
+      $this->fail('The "name" field was found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('The "name" field was not found.');
+    }
+
+    $this->assertNoFieldByName('name');
+    $this->assertNoFieldByName('name', 'not the value');
+    $this->assertNoFieldByName('notexisting');
+    $this->assertNoFieldByName('notexisting', NULL);
+
+    // Test that the assertion fails correctly if no value is passed in.
+    try {
+      $this->assertNoFieldByName('description');
+      $this->fail('The "description" field, with no value was not found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('The "description" field, with no value was found.');
+    }
+
+    // Test that the assertion fails correctly if a NULL value is passed in.
+    try {
+      $this->assertNoFieldByName('name', NULL);
+      $this->fail('The "name" field was not found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass('The "name" field was found.');
+    }
+
+    $this->assertOptionByText('options', 'one');
+    try {
+      $this->assertOptionByText('options', 'four');
+      $this->fail('The select option "four" was found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass($e->getMessage());
+    }
+
+    $this->assertFieldById('edit-save', NULL);
+    // Test that the assertion fails correctly if the field value is passed in
+    // rather than the id.
+    try {
+      $this->assertFieldById('Save', NULL);
+      $this->fail('The field with id of "Save" was found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass($e->getMessage());
+    }
+
+    $this->assertNoFieldById('Save', NULL);
+    // Test that the assertion fails correctly if the id of an actual field is
+    // passed in.
+    try {
+      $this->assertNoFieldById('edit-save', NULL);
+      $this->fail('The field with id of "edit-save" was not found.');
+    }
+    catch (ExpectationException $e) {
+      $this->pass($e->getMessage());
+    }
+  }
+
+  /**
+   * Tests the ::cronRun() method.
+   */
+  public function testCronRun() {
+    $last_cron_time = \Drupal::state()->get('system.cron_last');
+    $this->cronRun();
+    $this->assertSession()->statusCodeEquals(204);
+    $next_cron_time = \Drupal::state()->get('system.cron_last');
+
+    $this->assertGreaterThan($last_cron_time, $next_cron_time);
   }
 
   /**
diff --git a/web/core/tests/Drupal/FunctionalTests/Core/Config/SchemaConfigListenerTest.php b/web/core/tests/Drupal/FunctionalTests/Core/Config/SchemaConfigListenerTest.php
index 7138c5e80..698a7d1a0 100644
--- a/web/core/tests/Drupal/FunctionalTests/Core/Config/SchemaConfigListenerTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Core/Config/SchemaConfigListenerTest.php
@@ -17,6 +17,6 @@ class SchemaConfigListenerTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
 }
diff --git a/web/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php b/web/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php
new file mode 100644
index 000000000..8faf8c6c9
--- /dev/null
+++ b/web/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace Drupal\FunctionalTests\Datetime;
+
+use Drupal\Core\Datetime\DrupalDateTime;
+use Drupal\Core\Datetime\Entity\DateFormat;
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the functionality of Timestamp core field UI.
+ *
+ * @group field
+ */
+class TimestampTest extends BrowserTestBase {
+
+  /**
+   * An array of display options to pass to entity_get_display().
+   *
+   * @var array
+   */
+  protected $displayOptions;
+
+  /**
+   * A field storage to use in this test class.
+   *
+   * @var \Drupal\field\Entity\FieldStorageConfig
+   */
+  protected $fieldStorage;
+
+  /**
+   * The field used in this test class.
+   *
+   * @var \Drupal\field\Entity\FieldConfig
+   */
+  protected $field;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'entity_test', 'field_ui'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $web_user = $this->drupalCreateUser([
+      'access content',
+      'view test entity',
+      'administer entity_test content',
+      'administer entity_test form display',
+      'administer content types',
+      'administer node fields',
+    ]);
+
+    $this->drupalLogin($web_user);
+    $field_name = 'field_timestamp';
+    $type = 'timestamp';
+    $widget_type = 'datetime_timestamp';
+    $formatter_type = 'timestamp';
+
+    $this->fieldStorage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => $type,
+    ]);
+    $this->fieldStorage->save();
+    $this->field = FieldConfig::create([
+      'field_storage' => $this->fieldStorage,
+      'bundle' => 'entity_test',
+      'required' => TRUE,
+    ]);
+    $this->field->save();
+
+    EntityFormDisplay::load('entity_test.entity_test.default')
+      ->setComponent($field_name, ['type' => $widget_type])
+      ->save();
+
+    $this->displayOptions = [
+      'type' => $formatter_type,
+      'label' => 'hidden',
+    ];
+
+    EntityViewDisplay::create([
+      'targetEntityType' => $this->field->getTargetEntityTypeId(),
+      'bundle' => $this->field->getTargetBundle(),
+      'mode' => 'full',
+      'status' => TRUE,
+    ])->setComponent($field_name, $this->displayOptions)
+      ->save();
+  }
+
+  /**
+   * Tests the "datetime_timestamp" widget.
+   */
+  public function testWidget() {
+    // Build up a date in the UTC timezone.
+    $value = '2012-12-31 00:00:00';
+    $date = new DrupalDateTime($value, 'UTC');
+
+    // Update the timezone to the system default.
+    $date->setTimezone(timezone_open(drupal_get_user_timezone()));
+
+    // Display creation form.
+    $this->drupalGet('entity_test/add');
+
+    // Make sure the "datetime_timestamp" widget is on the page.
+    $fields = $this->xpath('//div[contains(@class, "field--widget-datetime-timestamp") and @id="edit-field-timestamp-wrapper"]');
+    $this->assertEquals(1, count($fields));
+
+    // Look for the widget elements and make sure they are empty.
+    $this->assertSession()->fieldExists('field_timestamp[0][value][date]');
+    $this->assertSession()->fieldValueEquals('field_timestamp[0][value][date]', '');
+    $this->assertSession()->fieldExists('field_timestamp[0][value][time]');
+    $this->assertSession()->fieldValueEquals('field_timestamp[0][value][time]', '');
+
+    // Submit the date.
+    $date_format = DateFormat::load('html_date')->getPattern();
+    $time_format = DateFormat::load('html_time')->getPattern();
+
+    $edit = [
+      'field_timestamp[0][value][date]' => $date->format($date_format),
+      'field_timestamp[0][value][time]' => $date->format($time_format),
+    ];
+    $this->drupalPostForm(NULL, $edit, 'Save');
+
+    // Make sure the submitted date is set as the default in the widget.
+    $this->assertSession()->fieldExists('field_timestamp[0][value][date]');
+    $this->assertSession()->fieldValueEquals('field_timestamp[0][value][date]', $date->format($date_format));
+    $this->assertSession()->fieldExists('field_timestamp[0][value][time]');
+    $this->assertSession()->fieldValueEquals('field_timestamp[0][value][time]', $date->format($time_format));
+
+    // Make sure the entity was saved.
+    preg_match('|entity_test/manage/(\d+)|', $this->getSession()->getCurrentUrl(), $match);
+    $id = $match[1];
+    $this->assertSession()->pageTextContains(sprintf('entity_test %s has been created.', $id));
+
+    // Make sure the timestamp is output properly with the default formatter.
+    $medium = DateFormat::load('medium')->getPattern();
+    $this->drupalGet('entity_test/' . $id);
+    $this->assertSession()->pageTextContains($date->format($medium));
+  }
+
+}
diff --git a/web/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php b/web/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
index 9f1468ba6..ba30da948 100644
--- a/web/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
@@ -2,8 +2,6 @@
 
 namespace Drupal\FunctionalTests\Entity;
 
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\ContentEntityStorageInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -14,7 +12,7 @@ use Drupal\Tests\BrowserTestBase;
  *
  * @group Entity
  */
-class ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest extends BrowserTestBase  {
+class ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest extends BrowserTestBase {
 
   /**
    * The ID of the type of the entity under test.
@@ -86,10 +84,10 @@ class ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest extends B
     $this->drupalGet($this->entityTypeId . '/manage/' . $entity->id() . '/edit');
 
     // Rearrange the field items.
-    $edit = array(
+    $edit = [
       "$this->fieldName[0][_weight]" => 0,
       "$this->fieldName[1][_weight]" => -1,
-    );
+    ];
     // Executing an ajax call is important before saving as it will trigger
     // form state caching and so if for any reasons the form is rebuilt with
     // the entity built based on the user submitted values with already
diff --git a/web/core/tests/Drupal/FunctionalTests/GetTestMethodCallerExtendsTest.php b/web/core/tests/Drupal/FunctionalTests/GetTestMethodCallerExtendsTest.php
new file mode 100644
index 000000000..81ebb813c
--- /dev/null
+++ b/web/core/tests/Drupal/FunctionalTests/GetTestMethodCallerExtendsTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\FunctionalTests;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Test for BrowserTestBase::getTestMethodCaller() in child classes.
+ *
+ * @group browsertestbase
+ */
+class GetTestMethodCallerExtendsTest extends GetTestMethodCallerTest {
+
+  /**
+   * A test method that is not present in the parent class.
+   */
+  public function testGetTestMethodCallerChildClass() {
+    $method_caller = $this->getTestMethodCaller();
+    $expected = [
+      'file' => __FILE__,
+      'line' => 18,
+      'function' => __CLASS__ . '->' . __FUNCTION__ . '()',
+      'class' => BrowserTestBase::class,
+      'object' => $this,
+      'type' => '->',
+      'args' => [],
+    ];
+    $this->assertEquals($expected, $method_caller);
+  }
+
+}
diff --git a/web/core/tests/Drupal/FunctionalTests/GetTestMethodCallerTest.php b/web/core/tests/Drupal/FunctionalTests/GetTestMethodCallerTest.php
new file mode 100644
index 000000000..f40ff20e9
--- /dev/null
+++ b/web/core/tests/Drupal/FunctionalTests/GetTestMethodCallerTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\FunctionalTests;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Explicit test for BrowserTestBase::getTestMethodCaller().
+ *
+ * @group browsertestbase
+ */
+class GetTestMethodCallerTest extends BrowserTestBase {
+
+  /**
+   * Tests BrowserTestBase::getTestMethodCaller().
+   */
+  public function testGetTestMethodCaller() {
+    $method_caller = $this->getTestMethodCaller();
+    $expected = [
+      'file' => __FILE__,
+      'line' => 18,
+      'function' => __CLASS__ . '->' . __FUNCTION__ . '()',
+      'class' => BrowserTestBase::class,
+      'object' => $this,
+      'type' => '->',
+      'args' => [],
+    ];
+    $this->assertEquals($expected, $method_caller);
+  }
+
+}
diff --git a/web/core/tests/Drupal/FunctionalTests/Routing/CaseInsensitivePathTest.php b/web/core/tests/Drupal/FunctionalTests/Routing/CaseInsensitivePathTest.php
new file mode 100644
index 000000000..3aaac143e
--- /dev/null
+++ b/web/core/tests/Drupal/FunctionalTests/Routing/CaseInsensitivePathTest.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Drupal\FunctionalTests\Routing;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests incoming path case insensitivity.
+ *
+ * @group routing
+ */
+class CaseInsensitivePathTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'views', 'node', 'system_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    \Drupal::state()->set('system_test.module_hidden', FALSE);
+    $this->createContentType(['type' => 'page']);
+  }
+
+  /**
+   * Tests mixed case paths.
+   */
+  public function testMixedCasePaths() {
+    // Tests paths defined by routes from standard modules as anonymous.
+    $this->drupalGet('user/login');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextMatches('/Log in/');
+    $this->drupalGet('User/Login');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextMatches('/Log in/');
+
+    // Tests paths defined by routes from the Views module.
+    $admin = $this->drupalCreateUser(['access administration pages', 'administer nodes', 'access content overview']);
+    $this->drupalLogin($admin);
+
+    $this->drupalGet('admin/content');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextMatches('/Content/');
+    $this->drupalGet('Admin/Content');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextMatches('/Content/');
+
+    // Tests paths with query arguments.
+
+    // Make sure our node title doesn't exist.
+    $this->drupalGet('admin/content');
+    $this->assertSession()->linkNotExists('FooBarBaz');
+    $this->assertSession()->linkNotExists('foobarbaz');
+
+    // Create a node, and make sure it shows up on admin/content.
+    $node = $this->createNode([
+      'title' => 'FooBarBaz',
+      'type' => 'page',
+    ]);
+
+    $this->drupalGet('admin/content', [
+      'query' => [
+        'title' => 'FooBarBaz'
+      ]
+    ]);
+
+    $this->assertSession()->linkExists('FooBarBaz');
+    $this->assertSession()->linkByHrefExists($node->toUrl()->toString());
+
+    // Make sure the path is case-insensitive, and query case is preserved.
+
+    $this->drupalGet('Admin/Content', [
+      'query' => [
+        'title' => 'FooBarBaz'
+      ]
+    ]);
+
+    $this->assertSession()->linkExists('FooBarBaz');
+    $this->assertSession()->linkByHrefExists($node->toUrl()->toString());
+    $this->assertSession()->fieldValueEquals('edit-title', 'FooBarBaz');
+    // Check that we can access the node with a mixed case path.
+    $this->drupalGet('NOdE/' . $node->id());
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextMatches('/FooBarBaz/');
+  }
+
+  /**
+   * Tests paths with slugs.
+   */
+  public function testPathsWithArguments() {
+    $this->drupalGet('system-test/echo/foobarbaz');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextMatches('/foobarbaz/');
+    $this->assertSession()->pageTextNotMatches('/FooBarBaz/');
+
+    $this->drupalGet('system-test/echo/FooBarBaz');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextMatches('/FooBarBaz/');
+    $this->assertSession()->pageTextNotMatches('/foobarbaz/');
+
+    // Test utf-8 characters in the route path.
+    $this->drupalGet('/system-test/Ȅchȏ/meΦω/ABc123');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextMatches('/ABc123/');
+    $this->drupalGet('/system-test/ȅchȎ/MEΦΩ/ABc123');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->pageTextMatches('/ABc123/');
+  }
+
+}
diff --git a/web/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php b/web/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php
new file mode 100644
index 000000000..a8aee8971
--- /dev/null
+++ b/web/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\FunctionalTests\Routing;
+
+use Drupal\Core\Url;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests url generation and routing for route paths with encoded characters.
+ *
+ * @group routing
+ */
+class PathEncodedTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'path_encoded_test'];
+
+  public function testGetEncoded() {
+    $route_paths = [
+      'path_encoded_test.colon' => '/hi/llamma:party',
+      'path_encoded_test.atsign' => '/bloggy/@Dries',
+      'path_encoded_test.parens' => '/cat(box)',
+    ];
+    foreach ($route_paths as $route_name => $path) {
+      $this->drupalGet(Url::fromRoute($route_name));
+      $this->assertSession()->pageTextContains('PathEncodedTestController works');
+    }
+  }
+
+  public function testAliasToEncoded() {
+    $route_paths = [
+      'path_encoded_test.colon' => '/hi/llamma:party',
+      'path_encoded_test.atsign' => '/bloggy/@Dries',
+      'path_encoded_test.parens' => '/cat(box)',
+    ];
+    /** @var \Drupal\Core\Path\AliasStorageInterface $alias_storage */
+    $alias_storage = $this->container->get('path.alias_storage');
+    $aliases = [];
+    foreach ($route_paths as $route_name => $path) {
+      $aliases[$route_name] = $this->randomMachineName();
+      $alias_storage->save($path, '/' . $aliases[$route_name]);
+    }
+    foreach ($route_paths as $route_name => $path) {
+      // The alias may be only a suffix of the generated path when the test is
+      // run with Drupal installed in a subdirectory.
+      $this->assertRegExp('@/' . rawurlencode($aliases[$route_name]) . '$@', Url::fromRoute($route_name)->toString());
+      $this->drupalGet(Url::fromRoute($route_name));
+      $this->assertSession()->pageTextContains('PathEncodedTestController works');
+    }
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php b/web/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
index cd42ad1b7..8fab30727 100644
--- a/web/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
+++ b/web/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
@@ -107,10 +107,10 @@ class SafeMarkupKernelTest extends KernelTestBase {
 
   /**
    * @dataProvider providerTestSafeMarkupUriWithException
-   * @expectedException \InvalidArgumentException
    */
   public function testSafeMarkupUriWithExceptionUri($string, $uri) {
     // Should throw an \InvalidArgumentException, due to Uri::toString().
+    $this->setExpectedException(\InvalidArgumentException::class);
     $args = self::getSafeMarkupUriArgs($uri);
 
     SafeMarkup::format($string, $args);
diff --git a/web/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php b/web/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
index 7b84b5979..6abb5cce9 100644
--- a/web/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
+++ b/web/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
@@ -6,6 +6,7 @@ use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\KernelTests\AssertConfigTrait;
+use Drupal\KernelTests\FileSystemModuleDiscoveryDataProviderTrait;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
@@ -16,6 +17,7 @@ use Drupal\KernelTests\KernelTestBase;
 class DefaultConfigTest extends KernelTestBase {
 
   use AssertConfigTrait;
+  use FileSystemModuleDiscoveryDataProviderTrait;
 
   /**
    * {@inheritdoc}
@@ -30,7 +32,7 @@ class DefaultConfigTest extends KernelTestBase {
   /**
    * The following config entries are changed on module install.
    *
-   * Compare them does not make sense.
+   * Comparing them does not make sense.
    *
    * @todo Figure out why simpletest.settings is not installed.
    *
@@ -61,7 +63,7 @@ class DefaultConfigTest extends KernelTestBase {
   /**
    * Tests if installed config is equal to the exported config.
    *
-   * @dataProvider providerTestModuleConfig
+   * @dataProvider coreModuleListDataProvider
    */
   public function testModuleConfig($module) {
     // System and user are required in order to be able to install some of the
@@ -86,7 +88,7 @@ class DefaultConfigTest extends KernelTestBase {
     }
 
     // Work out any additional modules and themes that need installing to create
-    // and optional config.
+    // an optional config.
     $optional_config_storage = new FileStorage($module_path . InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION);
     $modules_to_install = [$module];
     $themes_to_install = [];
@@ -142,24 +144,4 @@ class DefaultConfigTest extends KernelTestBase {
     }
   }
 
-  /**
-   * Test data provider for ::testModuleConfig().
-   *
-   * @return array
-   *   An array of module names to test.
-   */
-  public function providerTestModuleConfig() {
-    $module_dirs = array_keys(iterator_to_array(new \FilesystemIterator(__DIR__ . '/../../../../modules/')));
-    $module_names = array_map(function($path) {
-      return str_replace(__DIR__ . '/../../../../modules/', '', $path);
-    }, $module_dirs);
-    $modules_keyed = array_combine($module_names, $module_names);
-
-    $data = array_map(function ($module) {
-      return [$module];
-    }, $modules_keyed);
-
-    return $data;
-  }
-
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php b/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
index 72e7b6f8f..fa409afc8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
@@ -39,7 +39,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('language', 'simpletest', 'common_test', 'system');
+  public static $modules = ['language', 'simpletest', 'common_test', 'system'];
 
   /**
    * {@inheritdoc}
@@ -55,18 +55,18 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests that default CSS and JavaScript is empty.
    */
-  function testDefault() {
+  public function testDefault() {
     $assets = new AttachedAssets();
-    $this->assertEqual(array(), $this->assetResolver->getCssAssets($assets, FALSE), 'Default CSS is empty.');
+    $this->assertEqual([], $this->assetResolver->getCssAssets($assets, FALSE), 'Default CSS is empty.');
     list($js_assets_header, $js_assets_footer) = $this->assetResolver->getJsAssets($assets, FALSE);
-    $this->assertEqual(array(), $js_assets_header, 'Default header JavaScript is empty.');
-    $this->assertEqual(array(), $js_assets_footer, 'Default footer JavaScript is empty.');
+    $this->assertEqual([], $js_assets_header, 'Default header JavaScript is empty.');
+    $this->assertEqual([], $js_assets_footer, 'Default footer JavaScript is empty.');
   }
 
   /**
    * Tests non-existing libraries.
    */
-  function testLibraryUnknown() {
+  public function testLibraryUnknown() {
     $build['#attached']['library'][] = 'core/unknown';
     $assets = AttachedAssets::createFromRenderArray($build);
 
@@ -76,7 +76,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests adding a CSS and a JavaScript file.
    */
-  function testAddFiles() {
+  public function testAddFiles() {
     $build['#attached']['library'][] = 'common_test/files';
     $assets = AttachedAssets::createFromRenderArray($build);
 
@@ -97,7 +97,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests adding JavaScript settings.
    */
-  function testAddJsSettings() {
+  public function testAddJsSettings() {
     // Add a file in order to test default settings.
     $build['#attached']['library'][] = 'core/drupalSettings';
     $assets = AttachedAssets::createFromRenderArray($build);
@@ -116,7 +116,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests adding external CSS and JavaScript files.
    */
-  function testAddExternalFiles() {
+  public function testAddExternalFiles() {
     $build['#attached']['library'][] = 'common_test/external';
     $assets = AttachedAssets::createFromRenderArray($build);
 
@@ -136,7 +136,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests adding JavaScript files with additional attributes.
    */
-  function testAttributes() {
+  public function testAttributes() {
     $build['#attached']['library'][] = 'common_test/js-attributes';
     $assets = AttachedAssets::createFromRenderArray($build);
 
@@ -152,7 +152,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests that attributes are maintained when JS aggregation is enabled.
    */
-  function testAggregatedAttributes() {
+  public function testAggregatedAttributes() {
     $build['#attached']['library'][] = 'common_test/js-attributes';
     $assets = AttachedAssets::createFromRenderArray($build);
 
@@ -168,7 +168,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Integration test for CSS/JS aggregation.
    */
-  function testAggregation() {
+  public function testAggregation() {
     $build['#attached']['library'][] = 'core/drupal.timezone';
     $build['#attached']['library'][] = 'core/drupal.vertical-tabs';
     $assets = AttachedAssets::createFromRenderArray($build);
@@ -186,8 +186,8 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests JavaScript settings.
    */
-  function testSettings() {
-    $build = array();
+  public function testSettings() {
+    $build = [];
     $build['#attached']['library'][] = 'core/drupalSettings';
     // Nonsensical value to verify if it's possible to override path settings.
     $build['#attached']['drupalSettings']['path']['pathPrefix'] = 'yarhar';
@@ -226,7 +226,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests JS assets depending on the 'core/<head>' virtual library.
    */
-  function testHeaderHTML() {
+  public function testHeaderHTML() {
     $build['#attached']['library'][] = 'common_test/js-header';
     $assets = AttachedAssets::createFromRenderArray($build);
 
@@ -242,7 +242,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests that for assets with cache = FALSE, Drupal sets preprocess = FALSE.
    */
-  function testNoCache() {
+  public function testNoCache() {
     $build['#attached']['library'][] = 'common_test/no-cache';
     $assets = AttachedAssets::createFromRenderArray($build);
 
@@ -255,7 +255,7 @@ class AttachedAssetsTest extends KernelTestBase {
    *
    * @see \Drupal\Core\Render\Element\HtmlTag::preRenderConditionalComments()
    */
-  function testBrowserConditionalComments() {
+  public function testBrowserConditionalComments() {
     $default_query_string = $this->container->get('state')->get('system.css_js_query_string') ?: '0';
 
     $build['#attached']['library'][] = 'common_test/browsers';
@@ -274,7 +274,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests JavaScript versioning.
    */
-  function testVersionQueryString() {
+  public function testVersionQueryString() {
     $build['#attached']['library'][] = 'core/backbone';
     $build['#attached']['library'][] = 'core/domready';
     $assets = AttachedAssets::createFromRenderArray($build);
@@ -289,7 +289,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests JavaScript and CSS asset ordering.
    */
-  function testRenderOrder() {
+  public function testRenderOrder() {
     $build['#attached']['library'][] = 'common_test/order';
     $assets = AttachedAssets::createFromRenderArray($build);
 
@@ -311,12 +311,12 @@ class AttachedAssetsTest extends KernelTestBase {
     $js = $this->assetResolver->getJsAssets($assets, FALSE)[1];
     $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
     $rendered_js = $this->renderer->renderPlain($js_render_array);
-    $matches = array();
+    $matches = [];
     if (preg_match_all('/weight_([-0-9]+_[0-9]+)/', $rendered_js, $matches)) {
       $result = $matches[1];
     }
     else {
-      $result = array();
+      $result = [];
     }
     $this->assertIdentical($result, $expected_order_js, 'JavaScript is added in the expected weight order.');
 
@@ -353,12 +353,12 @@ class AttachedAssetsTest extends KernelTestBase {
     $css = $this->assetResolver->getCssAssets($assets, FALSE);
     $css_render_array = \Drupal::service('asset.css.collection_renderer')->render($css);
     $rendered_css = $this->renderer->renderPlain($css_render_array);
-    $matches = array();
+    $matches = [];
     if (preg_match_all('/([a-z]+)_weight_([-0-9]+_[0-9]+)/', $rendered_css, $matches)) {
       $result = $matches[0];
     }
     else {
-      $result = array();
+      $result = [];
     }
     $this->assertIdentical($result, $expected_order_css, 'CSS is added in the expected weight order.');
   }
@@ -366,7 +366,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests rendering the JavaScript with a file's weight above jQuery's.
    */
-  function testRenderDifferentWeight() {
+  public function testRenderDifferentWeight() {
     // If a library contains assets A and B, and A is listed first, then B can
     // still make itself appear first by defining a lower weight.
     $build['#attached']['library'][] = 'core/jquery';
@@ -386,7 +386,7 @@ class AttachedAssetsTest extends KernelTestBase {
    *
    * @see simpletest_js_alter()
    */
-  function testAlter() {
+  public function testAlter() {
     // Add both tableselect.js and simpletest.js.
     $build['#attached']['library'][] = 'core/drupal.tableselect';
     $build['#attached']['library'][] = 'simpletest/drupal.simpletest';
@@ -406,7 +406,7 @@ class AttachedAssetsTest extends KernelTestBase {
    *
    * @see common_test_library_info_alter()
    */
-  function testLibraryAlter() {
+  public function testLibraryAlter() {
     // Verify that common_test altered the title of Farbtastic.
     /** @var \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery */
     $library_discovery = \Drupal::service('library.discovery');
@@ -425,7 +425,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Dynamically defines an asset library and alters it.
    */
-  function testDynamicLibrary() {
+  public function testDynamicLibrary() {
     /** @var \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery */
     $library_discovery = \Drupal::service('library.discovery');
     // Retrieve a dynamic library definition.
@@ -449,7 +449,7 @@ class AttachedAssetsTest extends KernelTestBase {
    *
    * @see common_test.library.yml
    */
-  function testLibraryNameConflicts() {
+  public function testLibraryNameConflicts() {
     /** @var \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery */
     $library_discovery = \Drupal::service('library.discovery');
     $farbtastic = $library_discovery->getLibraryByName('common_test', 'jquery.farbtastic');
@@ -459,7 +459,7 @@ class AttachedAssetsTest extends KernelTestBase {
   /**
    * Tests JavaScript files that have querystrings attached get added right.
    */
-  function testAddJsFileWithQueryString() {
+  public function testAddJsFileWithQueryString() {
     $build['#attached']['library'][] = 'common_test/querystring';
     $assets = AttachedAssets::createFromRenderArray($build);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Bootstrap/GetFilenameTest.php b/web/core/tests/Drupal/KernelTests/Core/Bootstrap/GetFilenameTest.php
index 6cdc4b39e..4c5448718 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Bootstrap/GetFilenameTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Bootstrap/GetFilenameTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\KernelTests\Core\Bootstrap;
 
+use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
@@ -16,15 +17,19 @@ class GetFilenameTest extends KernelTestBase {
    */
   public static $modules = ['system'];
 
+  /**
+   * {@inheritdoc}
+   */
+  public function register(ContainerBuilder $container) {
+    parent::register($container);
+    // Use the testing install profile.
+    $container->setParameter('install_profile', 'testing');
+  }
+
   /**
    * Tests that drupal_get_filename() works when the file is not in database.
    */
-  function testDrupalGetFilename() {
-    // drupal_get_profile() is using obtaining the profile from state if the
-    // install_state global is not set.
-    global $install_state;
-    $install_state['parameters']['profile'] = 'testing';
-
+  public function testDrupalGetFilename() {
     // Rebuild system.module.files state data.
     // @todo Remove as part of https://www.drupal.org/node/2186491
     drupal_static_reset('system_rebuild_module_data');
@@ -34,7 +39,7 @@ class GetFilenameTest extends KernelTestBase {
     $this->assertIdentical(drupal_get_filename('module', 'system'), 'core/modules/system/system.info.yml');
 
     // Retrieving the location of a theme.
-    \Drupal::service('theme_handler')->install(array('stark'));
+    \Drupal::service('theme_handler')->install(['stark']);
     $this->assertIdentical(drupal_get_filename('theme', 'stark'), 'core/themes/stark/stark.info.yml');
 
     // Retrieving the location of a theme engine.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Bootstrap/ResettableStaticTest.php b/web/core/tests/Drupal/KernelTests/Core/Bootstrap/ResettableStaticTest.php
index 7b90ec116..a2a7a85b8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Bootstrap/ResettableStaticTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Bootstrap/ResettableStaticTest.php
@@ -17,7 +17,7 @@ class ResettableStaticTest extends KernelTestBase {
    * Tests that a variable reference returned by drupal_static() gets reset when
    * drupal_static_reset() is called.
    */
-  function testDrupalStatic() {
+  public function testDrupalStatic() {
     $name = __CLASS__ . '_' . __METHOD__;
     $var = &drupal_static($name, 'foo');
     $this->assertEqual($var, 'foo', 'Variable returned by drupal_static() was set to its default.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/BackendChainTest.php b/web/core/tests/Drupal/KernelTests/Core/Cache/BackendChainTest.php
index 02821803f..72c0de99f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/BackendChainTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/BackendChainTest.php
@@ -17,9 +17,9 @@ class BackendChainTest extends GenericCacheBackendUnitTestBase {
 
     // We need to create some various backends in the chain.
     $chain
-      ->appendBackend(new MemoryBackend('foo'))
-      ->prependBackend(new MemoryBackend('bar'))
-      ->appendBackend(new MemoryBackend('baz'));
+      ->appendBackend(new MemoryBackend())
+      ->prependBackend(new MemoryBackend())
+      ->appendBackend(new MemoryBackend());
 
     \Drupal::service('cache_tags.invalidator')->addInvalidator($chain);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTagTest.php b/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTagTest.php
index 484ee9cc9..0fefc390f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTagTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTagTest.php
@@ -19,7 +19,7 @@ class DatabaseBackendTagTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * {@inheritdoc}
@@ -30,21 +30,21 @@ class DatabaseBackendTagTest extends KernelTestBase {
     $container
       ->register('cache_factory', 'Drupal\Core\Cache\CacheFactory')
       ->addArgument(new Reference('settings'))
-      ->addMethodCall('setContainer', array(new Reference('service_container')));
+      ->addMethodCall('setContainer', [new Reference('service_container')]);
   }
 
   public function testTagInvalidations() {
     // Create cache entry in multiple bins.
-    $tags = array('test_tag:1', 'test_tag:2', 'test_tag:3');
-    $bins = array('data', 'bootstrap', 'render');
+    $tags = ['test_tag:1', 'test_tag:2', 'test_tag:3'];
+    $bins = ['data', 'bootstrap', 'render'];
     foreach ($bins as $bin) {
       $bin = \Drupal::cache($bin);
       $bin->set('test', 'value', Cache::PERMANENT, $tags);
       $this->assertTrue($bin->get('test'), 'Cache item was set in bin.');
     }
 
-    $invalidations_before = intval(db_select('cachetags')->fields('cachetags', array('invalidations'))->condition('tag', 'test_tag:2')->execute()->fetchField());
-    Cache::invalidateTags(array('test_tag:2'));
+    $invalidations_before = intval(db_select('cachetags')->fields('cachetags', ['invalidations'])->condition('tag', 'test_tag:2')->execute()->fetchField());
+    Cache::invalidateTags(['test_tag:2']);
 
     // Test that cache entry has been invalidated in multiple bins.
     foreach ($bins as $bin) {
@@ -53,7 +53,7 @@ class DatabaseBackendTagTest extends KernelTestBase {
     }
 
     // Test that only one tag invalidation has occurred.
-    $invalidations_after = intval(db_select('cachetags')->fields('cachetags', array('invalidations'))->condition('tag', 'test_tag:2')->execute()->fetchField());
+    $invalidations_after = intval(db_select('cachetags')->fields('cachetags', ['invalidations'])->condition('tag', 'test_tag:2')->execute()->fetchField());
     $this->assertEqual($invalidations_after, $invalidations_before + 1, 'Only one addition cache tag invalidation has occurred after invalidating a tag used in multiple bins.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTest.php b/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTest.php
index fd1c94235..de8bbda55 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTest.php
@@ -16,7 +16,7 @@ class DatabaseBackendTest extends GenericCacheBackendUnitTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Creates a new instance of DatabaseBackend.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php
index d5f3e9572..4e57a71f6 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php
@@ -102,7 +102,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
   }
 
   protected function setUp() {
-    $this->cachebackends = array();
+    $this->cachebackends = [];
     $this->defaultValue = $this->randomMachineName(10);
 
     parent::setUp();
@@ -131,7 +131,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $backend = $this->getCacheBackend();
 
     $this->assertIdentical(FALSE, $backend->get('test1'), "Backend does not contain data for cache id test1.");
-    $with_backslash = array('foo' => '\Drupal\foo\Bar');
+    $with_backslash = ['foo' => '\Drupal\foo\Bar'];
     $backend->set('test1', $with_backslash);
     $cached = $backend->get('test1');
     $this->assert(is_object($cached), "Backend returned an object for cache id test1.");
@@ -142,10 +142,10 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertEqual($cached->expire, Cache::PERMANENT, 'Expire time is correct.');
 
     $this->assertIdentical(FALSE, $backend->get('test2'), "Backend does not contain data for cache id test2.");
-    $backend->set('test2', array('value' => 3), REQUEST_TIME + 3);
+    $backend->set('test2', ['value' => 3], REQUEST_TIME + 3);
     $cached = $backend->get('test2');
     $this->assert(is_object($cached), "Backend returned an object for cache id test2.");
-    $this->assertIdentical(array('value' => 3), $cached->data);
+    $this->assertIdentical(['value' => 3], $cached->data);
     $this->assertTrue($cached->valid, 'Item is marked as valid.');
     $this->assertTrue($cached->created >= REQUEST_TIME && $cached->created <= round(microtime(TRUE), 3), 'Created time is correct.');
     $this->assertEqual($cached->expire, REQUEST_TIME + 3, 'Expire time is correct.');
@@ -159,7 +159,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertEqual($cached->expire, REQUEST_TIME - 3, 'Expire time is correct.');
 
     $this->assertIdentical(FALSE, $backend->get('test4'), "Backend does not contain data for cache id test4.");
-    $with_eof = array('foo' => "\nEOF\ndata");
+    $with_eof = ['foo' => "\nEOF\ndata"];
     $backend->set('test4', $with_eof);
     $cached = $backend->get('test4');
     $this->assert(is_object($cached), "Backend returned an object for cache id test4.");
@@ -169,7 +169,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertEqual($cached->expire, Cache::PERMANENT, 'Expire time is correct.');
 
     $this->assertIdentical(FALSE, $backend->get('test5'), "Backend does not contain data for cache id test5.");
-    $with_eof_and_semicolon = array('foo' => "\nEOF;\ndata");
+    $with_eof_and_semicolon = ['foo' => "\nEOF;\ndata"];
     $backend->set('test5', $with_eof_and_semicolon);
     $cached = $backend->get('test5');
     $this->assert(is_object($cached), "Backend returned an object for cache id test5.");
@@ -178,7 +178,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertTrue($cached->created >= REQUEST_TIME && $cached->created <= round(microtime(TRUE), 3), 'Created time is correct.');
     $this->assertEqual($cached->expire, Cache::PERMANENT, 'Expire time is correct.');
 
-    $with_variable = array('foo' => '$bar');
+    $with_variable = ['foo' => '$bar'];
     $backend->set('test6', $with_variable);
     $cached = $backend->get('test6');
     $this->assert(is_object($cached), "Backend returned an object for cache id test6.");
@@ -257,14 +257,14 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
   public function testValueTypeIsKept() {
     $backend = $this->getCacheBackend();
 
-    $variables = array(
+    $variables = [
       'test1' => 1,
       'test2' => '0',
       'test3' => '',
       'test4' => 12.64,
       'test5' => FALSE,
-      'test6' => array(1, 2, 3),
-    );
+      'test6' => [1, 2, 3],
+    ];
 
     // Create cache entries.
     foreach ($variables as $cid => $data) {
@@ -297,14 +297,14 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $backend->set($long_cid, 300);
 
     // Mismatch order for harder testing.
-    $reference = array(
+    $reference = [
       'test3',
       'test7',
       'test21', // Cid does not exist.
       'test6',
       'test19', // Cid does not exist until added before second getMultiple().
       'test2',
-    );
+    ];
 
     $cids = $reference;
     $ret = $backend->getMultiple($cids);
@@ -364,7 +364,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertFalse(in_array('test19', $cids), "Added cache id test19 is not in cids array.");
 
     // Test with a long $cid and non-numeric array key.
-    $cids = array('key:key' => $long_cid);
+    $cids = ['key:key' => $long_cid];
     $return = $backend->getMultiple($cids);
     $this->assertEqual(300, $return[$long_cid]->data);
     $this->assertTrue(empty($cids));
@@ -380,13 +380,13 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
 
     // Set multiple testing keys.
     $backend->set('cid_1', 'Some other value');
-    $items = array(
-      'cid_1' => array('data' => 1),
-      'cid_2' => array('data' => 2),
-      'cid_3' => array('data' => array(1, 2)),
-      'cid_4' => array('data' => 1, 'expire' => $future_expiration),
-      'cid_5' => array('data' => 1, 'tags' => array('test:a', 'test:b')),
-    );
+    $items = [
+      'cid_1' => ['data' => 1],
+      'cid_2' => ['data' => 2],
+      'cid_3' => ['data' => [1, 2]],
+      'cid_4' => ['data' => 1, 'expire' => $future_expiration],
+      'cid_5' => ['data' => 1, 'tags' => ['test:a', 'test:b']],
+    ];
     $backend->setMultiple($items);
     $cids = array_keys($items);
     $cached = $backend->getMultiple($cids);
@@ -411,9 +411,9 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     // assertion.
     try {
       $items = [
-        'exception_test_1' => array('data' => 1, 'tags' => []),
-        'exception_test_2' => array('data' => 2, 'tags' => ['valid']),
-        'exception_test_3' => array('data' => 3, 'tags' => ['node' => [3, 5, 7]]),
+        'exception_test_1' => ['data' => 1, 'tags' => []],
+        'exception_test_2' => ['data' => 2, 'tags' => ['valid']],
+        'exception_test_3' => ['data' => 3, 'tags' => ['node' => [3, 5, 7]]],
       ];
       $backend->setMultiple($items);
       $this->fail('::setMultiple() was called with invalid cache tags, runtime assertion did not fail.');
@@ -441,13 +441,13 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
 
     $backend->delete('test1');
     $backend->delete('test23'); // Nonexistent key should not cause an error.
-    $backend->deleteMultiple(array(
+    $backend->deleteMultiple([
       'test3',
       'test5',
       'test7',
       'test19', // Nonexistent key should not cause an error.
       'test21', // Nonexistent key should not cause an error.
-    ));
+    ]);
 
     // Test if expected keys have been deleted.
     $this->assertIdentical(FALSE, $backend->get('test1'), "Cache id test1 deleted.");
@@ -465,7 +465,7 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
     $this->assertIdentical(FALSE, $backend->get('test21'), "Cache id test21 does not exist.");
 
     // Calling deleteMultiple() with an empty array should not cause an error.
-    $this->assertFalse($backend->deleteMultiple(array()));
+    $this->assertFalse($backend->deleteMultiple([]));
   }
 
   /**
@@ -491,21 +491,21 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
    * Test Drupal\Core\Cache\CacheBackendInterface::invalidate() and
    * Drupal\Core\Cache\CacheBackendInterface::invalidateMultiple().
    */
-  function testInvalidate() {
+  public function testInvalidate() {
     $backend = $this->getCacheBackend();
     $backend->set('test1', 1);
     $backend->set('test2', 2);
     $backend->set('test3', 2);
     $backend->set('test4', 2);
 
-    $reference = array('test1', 'test2', 'test3', 'test4');
+    $reference = ['test1', 'test2', 'test3', 'test4'];
 
     $cids = $reference;
     $ret = $backend->getMultiple($cids);
     $this->assertEqual(count($ret), 4, 'Four items returned.');
 
     $backend->invalidate('test1');
-    $backend->invalidateMultiple(array('test2', 'test3'));
+    $backend->invalidateMultiple(['test2', 'test3']);
 
     $cids = $reference;
     $ret = $backend->getMultiple($cids);
@@ -517,55 +517,55 @@ abstract class GenericCacheBackendUnitTestBase extends KernelTestBase {
 
     // Calling invalidateMultiple() with an empty array should not cause an
     // error.
-    $this->assertFalse($backend->invalidateMultiple(array()));
+    $this->assertFalse($backend->invalidateMultiple([]));
   }
 
   /**
    * Tests Drupal\Core\Cache\CacheBackendInterface::invalidateTags().
    */
-  function testInvalidateTags() {
+  public function testInvalidateTags() {
     $backend = $this->getCacheBackend();
 
     // Create two cache entries with the same tag and tag value.
-    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, array('test_tag:2'));
-    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, array('test_tag:2'));
+    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, ['test_tag:2']);
+    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, ['test_tag:2']);
     $this->assertTrue($backend->get('test_cid_invalidate1') && $backend->get('test_cid_invalidate2'), 'Two cache items were created.');
 
     // Invalidate test_tag of value 1. This should invalidate both entries.
-    Cache::invalidateTags(array('test_tag:2'));
+    Cache::invalidateTags(['test_tag:2']);
     $this->assertFalse($backend->get('test_cid_invalidate1') || $backend->get('test_cid_invalidate2'), 'Two cache items invalidated after invalidating a cache tag.');
     $this->assertTrue($backend->get('test_cid_invalidate1', TRUE) && $backend->get('test_cid_invalidate2', TRUE), 'Cache items not deleted after invalidating a cache tag.');
 
     // Create two cache entries with the same tag and an array tag value.
-    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, array('test_tag:1'));
-    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, array('test_tag:1'));
+    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, ['test_tag:1']);
+    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, ['test_tag:1']);
     $this->assertTrue($backend->get('test_cid_invalidate1') && $backend->get('test_cid_invalidate2'), 'Two cache items were created.');
 
     // Invalidate test_tag of value 1. This should invalidate both entries.
-    Cache::invalidateTags(array('test_tag:1'));
+    Cache::invalidateTags(['test_tag:1']);
     $this->assertFalse($backend->get('test_cid_invalidate1') || $backend->get('test_cid_invalidate2'), 'Two caches removed after invalidating a cache tag.');
     $this->assertTrue($backend->get('test_cid_invalidate1', TRUE) && $backend->get('test_cid_invalidate2', TRUE), 'Cache items not deleted after invalidating a cache tag.');
 
     // Create three cache entries with a mix of tags and tag values.
-    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, array('test_tag:1'));
-    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, array('test_tag:2'));
-    $backend->set('test_cid_invalidate3', $this->defaultValue, Cache::PERMANENT, array('test_tag_foo:3'));
+    $backend->set('test_cid_invalidate1', $this->defaultValue, Cache::PERMANENT, ['test_tag:1']);
+    $backend->set('test_cid_invalidate2', $this->defaultValue, Cache::PERMANENT, ['test_tag:2']);
+    $backend->set('test_cid_invalidate3', $this->defaultValue, Cache::PERMANENT, ['test_tag_foo:3']);
     $this->assertTrue($backend->get('test_cid_invalidate1') && $backend->get('test_cid_invalidate2') && $backend->get('test_cid_invalidate3'), 'Three cached items were created.');
-    Cache::invalidateTags(array('test_tag_foo:3'));
+    Cache::invalidateTags(['test_tag_foo:3']);
     $this->assertTrue($backend->get('test_cid_invalidate1') && $backend->get('test_cid_invalidate2'), 'Cache items not matching the tag were not invalidated.');
     $this->assertFalse($backend->get('test_cid_invalidated3'), 'Cached item matching the tag was removed.');
 
     // Create cache entry in multiple bins. Two cache entries
     // (test_cid_invalidate1 and test_cid_invalidate2) still exist from previous
     // tests.
-    $tags = array('test_tag:1', 'test_tag:2', 'test_tag:3');
-    $bins = array('path', 'bootstrap', 'page');
+    $tags = ['test_tag:1', 'test_tag:2', 'test_tag:3'];
+    $bins = ['path', 'bootstrap', 'page'];
     foreach ($bins as $bin) {
       $this->getCacheBackend($bin)->set('test', $this->defaultValue, Cache::PERMANENT, $tags);
       $this->assertTrue($this->getCacheBackend($bin)->get('test'), 'Cache item was set in bin.');
     }
 
-    Cache::invalidateTags(array('test_tag:2'));
+    Cache::invalidateTags(['test_tag:2']);
 
     // Test that the cache entry has been invalidated in multiple bins.
     foreach ($bins as $bin) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/MemoryBackendTest.php b/web/core/tests/Drupal/KernelTests/Core/Cache/MemoryBackendTest.php
index c1fb9f742..4518532cf 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/MemoryBackendTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/MemoryBackendTest.php
@@ -18,7 +18,7 @@ class MemoryBackendTest extends GenericCacheBackendUnitTestBase {
    *   A new MemoryBackend object.
    */
   protected function createCacheBackend($bin) {
-    $backend = new MemoryBackend($bin);
+    $backend = new MemoryBackend();
     \Drupal::service('cache_tags.invalidator')->addInvalidator($backend);
     return $backend;
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Common/SizeTest.php b/web/core/tests/Drupal/KernelTests/Core/Common/SizeTest.php
index 2bcee7539..9829b266d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Common/SizeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Common/SizeTest.php
@@ -18,7 +18,7 @@ class SizeTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
     $kb = Bytes::KILOBYTE;
-    $this->exactTestCases = array(
+    $this->exactTestCases = [
       '1 byte' => 1,
       '1 KB'   => $kb,
       '1 MB'   => $kb * $kb,
@@ -28,21 +28,21 @@ class SizeTest extends KernelTestBase {
       '1 EB'   => $kb * $kb * $kb * $kb * $kb * $kb,
       '1 ZB'   => $kb * $kb * $kb * $kb * $kb * $kb * $kb,
       '1 YB'   => $kb * $kb * $kb * $kb * $kb * $kb * $kb * $kb,
-    );
-    $this->roundedTestCases = array(
+    ];
+    $this->roundedTestCases = [
       '2 bytes' => 2,
       '1 MB' => ($kb * $kb) - 1, // rounded to 1 MB (not 1000 or 1024 kilobyte!)
       round(3623651 / ($this->exactTestCases['1 MB']), 2) . ' MB' => 3623651, // megabytes
       round(67234178751368124 / ($this->exactTestCases['1 PB']), 2) . ' PB' => 67234178751368124, // petabytes
       round(235346823821125814962843827 / ($this->exactTestCases['1 YB']), 2) . ' YB' => 235346823821125814962843827, // yottabytes
-    );
+    ];
   }
 
   /**
    * Checks that format_size() returns the expected string.
    */
-  function testCommonFormatSize() {
-    foreach (array($this->exactTestCases, $this->roundedTestCases) as $test_cases) {
+  public function testCommonFormatSize() {
+    foreach ([$this->exactTestCases, $this->roundedTestCases] as $test_cases) {
       foreach ($test_cases as $expected => $input) {
         $this->assertEqual(
           ($result = format_size($input, NULL)),
@@ -56,7 +56,7 @@ class SizeTest extends KernelTestBase {
   /**
    * Cross-tests Bytes::toInt() and format_size().
    */
-  function testCommonParseSizeFormatSize() {
+  public function testCommonParseSizeFormatSize() {
     foreach ($this->exactTestCases as $size) {
       $this->assertEqual(
         $size,
diff --git a/web/core/tests/Drupal/KernelTests/Core/Common/XssUnitTest.php b/web/core/tests/Drupal/KernelTests/Core/Common/XssUnitTest.php
index 7c68ed455..23754879e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Common/XssUnitTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Common/XssUnitTest.php
@@ -18,29 +18,29 @@ class XssUnitTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'system');
+  public static $modules = ['filter', 'system'];
 
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('system'));
+    $this->installConfig(['system']);
   }
 
   /**
    * Tests t() functionality.
    */
-  function testT() {
+  public function testT() {
     $text = t('Simple text');
     $this->assertEqual($text, 'Simple text', 't leaves simple text alone.');
-    $text = t('Escaped text: @value', array('@value' => '<script>'));
+    $text = t('Escaped text: @value', ['@value' => '<script>']);
     $this->assertEqual($text, 'Escaped text: &lt;script&gt;', 't replaces and escapes string.');
-    $text = t('Placeholder text: %value', array('%value' => '<script>'));
+    $text = t('Placeholder text: %value', ['%value' => '<script>']);
     $this->assertEqual($text, 'Placeholder text: <em class="placeholder">&lt;script&gt;</em>', 't replaces, escapes and themes string.');
   }
 
   /**
    * Checks that harmful protocols are stripped.
    */
-  function testBadProtocolStripping() {
+  public function testBadProtocolStripping() {
     // Ensure that check_url() strips out harmful protocols, and encodes for
     // HTML.
     // Ensure \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols() can
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
index 4664eeb7d..a94b1b8c1 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
@@ -21,7 +21,7 @@ class ConfigCRUDTest extends KernelTestBase {
   /**
    * Exempt from strict schema checking.
    *
-   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
    *
    * @var bool
    */
@@ -32,12 +32,12 @@ class ConfigCRUDTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Tests CRUD operations.
    */
-  function testCRUD() {
+  public function testCRUD() {
     $storage = $this->container->get('config.storage');
     $config_factory = $this->container->get('config.factory');
     $name = 'config_test.crud';
@@ -52,7 +52,7 @@ class ConfigCRUDTest extends KernelTestBase {
 
     // Verify the active configuration contains the saved value.
     $actual_data = $storage->read($name);
-    $this->assertIdentical($actual_data, array('value' => 'initial'));
+    $this->assertIdentical($actual_data, ['value' => 'initial']);
 
     // Update the configuration object instance.
     $config->set('value', 'instance-update');
@@ -61,7 +61,7 @@ class ConfigCRUDTest extends KernelTestBase {
 
     // Verify the active configuration contains the updated value.
     $actual_data = $storage->read($name);
-    $this->assertIdentical($actual_data, array('value' => 'instance-update'));
+    $this->assertIdentical($actual_data, ['value' => 'instance-update']);
 
     // Verify a call to $this->config() immediately returns the updated value.
     $new_config = $this->config($name);
@@ -75,7 +75,7 @@ class ConfigCRUDTest extends KernelTestBase {
     $config->delete();
 
     // Verify the configuration object is empty.
-    $this->assertIdentical($config->get(), array());
+    $this->assertIdentical($config->get(), []);
     $this->assertIdentical($config->isNew(), TRUE);
 
     // Verify that all copies of the configuration has been removed from the
@@ -98,7 +98,7 @@ class ConfigCRUDTest extends KernelTestBase {
 
     // Verify the active configuration contains the updated value.
     $actual_data = $storage->read($name);
-    $this->assertIdentical($actual_data, array('value' => 're-created'));
+    $this->assertIdentical($actual_data, ['value' => 're-created']);
 
     // Verify a call to $this->config() immediately returns the updated value.
     $new_config = $this->config($name);
@@ -115,7 +115,7 @@ class ConfigCRUDTest extends KernelTestBase {
     // Ensure that the old configuration object is removed from both the cache
     // and the configuration storage.
     $config = $this->config($name);
-    $this->assertIdentical($config->get(), array());
+    $this->assertIdentical($config->get(), []);
     $this->assertIdentical($config->isNew(), TRUE);
 
     // Test renaming when config.factory does not have the object in its static
@@ -138,10 +138,10 @@ class ConfigCRUDTest extends KernelTestBase {
 
     // Merge data into the configuration object.
     $new_config = $this->config($new_name);
-    $expected_values = array(
+    $expected_values = [
       'value' => 'herp',
       '404' => 'derp',
-    );
+    ];
     $new_config->merge($expected_values);
     $new_config->save();
     $this->assertIdentical($new_config->get('value'), $expected_values['value']);
@@ -157,7 +157,7 @@ class ConfigCRUDTest extends KernelTestBase {
   /**
    * Tests the validation of configuration object names.
    */
-  function testNameValidation() {
+  public function testNameValidation() {
     // Verify that an object name without namespace causes an exception.
     $name = 'nonamespace';
     $message = 'Expected ConfigNameException was thrown for a name without a namespace.';
@@ -181,7 +181,7 @@ class ConfigCRUDTest extends KernelTestBase {
     }
 
     // Verify that disallowed characters in the name cause an exception.
-    $characters = $test_characters = array(':', '?', '*', '<', '>', '"', '\'', '/', '\\');
+    $characters = $test_characters = [':', '?', '*', '<', '>', '"', '\'', '/', '\\'];
     foreach ($test_characters as $i => $c) {
       try {
         $name = 'namespace.object' . $c;
@@ -192,9 +192,9 @@ class ConfigCRUDTest extends KernelTestBase {
         unset($test_characters[$i]);
       }
     }
-    $this->assertTrue(empty($test_characters), format_string('Expected ConfigNameException was thrown for all invalid name characters: @characters', array(
+    $this->assertTrue(empty($test_characters), format_string('Expected ConfigNameException was thrown for all invalid name characters: @characters', [
       '@characters' => implode(' ', $characters),
-    )));
+    ]));
 
     // Verify that a valid config object name can be saved.
     $name = 'namespace.object';
@@ -213,11 +213,11 @@ class ConfigCRUDTest extends KernelTestBase {
   /**
    * Tests the validation of configuration object values.
    */
-  function testValueValidation() {
+  public function testValueValidation() {
     // Verify that setData() will catch dotted keys.
     $message = 'Expected ConfigValueException was thrown from setData() for value with dotted keys.';
     try {
-      $this->config('namespace.object')->setData(array('key.value' => 12))->save();
+      $this->config('namespace.object')->setData(['key.value' => 12])->save();
       $this->fail($message);
     }
     catch (ConfigValueException $e) {
@@ -227,7 +227,7 @@ class ConfigCRUDTest extends KernelTestBase {
     // Verify that set() will catch dotted keys.
     $message = 'Expected ConfigValueException was thrown from set() for value with dotted keys.';
     try {
-      $this->config('namespace.object')->set('foo', array('key.value' => 12))->save();
+      $this->config('namespace.object')->set('foo', ['key.value' => 12])->save();
       $this->fail($message);
     }
     catch (ConfigValueException $e) {
@@ -239,7 +239,7 @@ class ConfigCRUDTest extends KernelTestBase {
    * Tests data type handling.
    */
   public function testDataTypes() {
-    \Drupal::service('module_installer')->install(array('config_test'));
+    \Drupal::service('module_installer')->install(['config_test']);
     $storage = new DatabaseStorage($this->container->get('database'), 'config');
     $name = 'config_test.types';
     $config = $this->config($name);
@@ -247,8 +247,8 @@ class ConfigCRUDTest extends KernelTestBase {
     $this->verbose('<pre>' . $original_content . "\n" . var_export($storage->read($name), TRUE));
 
     // Verify variable data types are intact.
-    $data = array(
-      'array' => array(),
+    $data = [
+      'array' => [],
       'boolean' => TRUE,
       'exp' => 1.2e+34,
       'float' => 3.14159,
@@ -258,7 +258,7 @@ class ConfigCRUDTest extends KernelTestBase {
       'octal' => 0775,
       'string' => 'string',
       'string_int' => '1',
-    );
+    ];
     $data['_core']['default_config_hash'] = Crypt::hashBase64(serialize($data));
     $this->assertIdentical($config->get(), $data);
 
@@ -292,9 +292,9 @@ class ConfigCRUDTest extends KernelTestBase {
       $this->fail('No Exception thrown upon saving invalid data type.');
     }
     catch (UnsupportedDataTypeConfigException $e) {
-      $this->pass(SafeMarkup::format('%class thrown upon saving invalid data type.', array(
+      $this->pass(SafeMarkup::format('%class thrown upon saving invalid data type.', [
         '%class' => get_class($e),
-      )));
+      ]));
     }
 
     // Test that setting an unsupported type for a config object with no schema
@@ -309,9 +309,9 @@ class ConfigCRUDTest extends KernelTestBase {
       $this->fail('No Exception thrown upon saving invalid data type.');
     }
     catch (UnsupportedDataTypeConfigException $e) {
-      $this->pass(SafeMarkup::format('%class thrown upon saving invalid data type.', array(
+      $this->pass(SafeMarkup::format('%class thrown upon saving invalid data type.', [
         '%class' => get_class($e),
-      )));
+      ]));
     }
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
index 1c26774a6..79b01cba5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
@@ -21,20 +21,20 @@ class ConfigDependencyTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test', 'entity_test', 'user');
+  public static $modules = ['config_test', 'entity_test', 'user'];
 
   /**
    * Tests that calculating dependencies for system module.
    */
   public function testNonEntity() {
-    $this->installConfig(array('system'));
+    $this->installConfig(['system']);
     $config_manager = \Drupal::service('config.manager');
-    $dependents = $config_manager->findConfigEntityDependents('module', array('system'));
+    $dependents = $config_manager->findConfigEntityDependents('module', ['system']);
     $this->assertTrue(isset($dependents['system.site']), 'Simple configuration system.site has a UUID key even though it is not a configuration entity and therefore is found when looking for dependencies of the System module.');
     // Ensure that calling
     // \Drupal\Core\Config\ConfigManager::findConfigEntityDependentsAsEntities()
     // does not try to load system.site as an entity.
-    $config_manager->findConfigEntityDependentsAsEntities('module', array('system'));
+    $config_manager->findConfigEntityDependentsAsEntities('module', ['system']);
   }
 
   /**
@@ -46,22 +46,22 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     $storage = $this->container->get('entity.manager')->getStorage('config_test');
     // Test dependencies between modules.
     $entity1 = $storage->create(
-      array(
+      [
         'id' => 'entity1',
-        'dependencies' => array(
-          'enforced' => array(
-            'module' => array('node')
-          )
-        )
-      )
+        'dependencies' => [
+          'enforced' => [
+            'module' => ['node']
+          ]
+        ]
+      ]
     );
     $entity1->save();
 
-    $dependents = $config_manager->findConfigEntityDependents('module', array('node'));
+    $dependents = $config_manager->findConfigEntityDependents('module', ['node']);
     $this->assertTrue(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 has a dependency on the Node module.');
-    $dependents = $config_manager->findConfigEntityDependents('module', array('config_test'));
+    $dependents = $config_manager->findConfigEntityDependents('module', ['config_test']);
     $this->assertTrue(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 has a dependency on the config_test module.');
-    $dependents = $config_manager->findConfigEntityDependents('module', array('views'));
+    $dependents = $config_manager->findConfigEntityDependents('module', ['views']);
     $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the Views module.');
     // Ensure that the provider of the config entity is not actually written to
     // the dependencies array.
@@ -70,22 +70,22 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     $this->assertTrue(empty($root_module_dependencies), 'Node module is not written to the root dependencies array as it is enforced.');
 
     // Create additional entities to test dependencies on config entities.
-    $entity2 = $storage->create(array('id' => 'entity2', 'dependencies' => array('enforced' => array('config' => array($entity1->getConfigDependencyName())))));
+    $entity2 = $storage->create(['id' => 'entity2', 'dependencies' => ['enforced' => ['config' => [$entity1->getConfigDependencyName()]]]]);
     $entity2->save();
-    $entity3 = $storage->create(array('id' => 'entity3', 'dependencies' => array('enforced' => array('config' => array($entity2->getConfigDependencyName())))));
+    $entity3 = $storage->create(['id' => 'entity3', 'dependencies' => ['enforced' => ['config' => [$entity2->getConfigDependencyName()]]]]);
     $entity3->save();
-    $entity4 = $storage->create(array('id' => 'entity4', 'dependencies' => array('enforced' => array('config' => array($entity3->getConfigDependencyName())))));
+    $entity4 = $storage->create(['id' => 'entity4', 'dependencies' => ['enforced' => ['config' => [$entity3->getConfigDependencyName()]]]]);
     $entity4->save();
 
     // Test getting $entity1's dependencies as configuration dependency objects.
-    $dependents = $config_manager->findConfigEntityDependents('config', array($entity1->getConfigDependencyName()));
+    $dependents = $config_manager->findConfigEntityDependents('config', [$entity1->getConfigDependencyName()]);
     $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on itself.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on config_test.dynamic.entity1.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity1.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity1.');
 
     // Test getting $entity2's dependencies as entities.
-    $dependents = $config_manager->findConfigEntityDependentsAsEntities('config', array($entity2->getConfigDependencyName()));
+    $dependents = $config_manager->findConfigEntityDependentsAsEntities('config', [$entity2->getConfigDependencyName()]);
     $dependent_ids = $this->getDependentIds($dependents);
     $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on config_test.dynamic.entity1.');
     $this->assertFalse(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 does not have a dependency on itself.');
@@ -94,7 +94,7 @@ class ConfigDependencyTest extends EntityKernelTestBase {
 
     // Test getting node module's dependencies as configuration dependency
     // objects.
-    $dependents = $config_manager->findConfigEntityDependents('module', array('node'));
+    $dependents = $config_manager->findConfigEntityDependents('module', ['node']);
     $this->assertTrue(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 has a dependency on the Node module.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on the Node module.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the Node module.');
@@ -105,20 +105,20 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     // no longer depend on node module.
     $entity1->setEnforcedDependencies([])->save();
     $entity3->setEnforcedDependencies(['module' => ['node'], 'config' => [$entity2->getConfigDependencyName()]])->save();
-    $dependents = $config_manager->findConfigEntityDependents('module', array('node'));
+    $dependents = $config_manager->findConfigEntityDependents('module', ['node']);
     $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the Node module.');
     $this->assertFalse(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 does not have a dependency on the Node module.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the Node module.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on the Node module.');
 
     // Test dependency on a content entity.
-    $entity_test = EntityTest::create(array(
+    $entity_test = EntityTest::create([
       'name' => $this->randomString(),
       'type' => 'entity_test',
-    ));
+    ]);
     $entity_test->save();
     $entity2->setEnforcedDependencies(['config' => [$entity1->getConfigDependencyName()], 'content' => [$entity_test->getConfigDependencyName()]])->save();;
-    $dependents = $config_manager->findConfigEntityDependents('content', array($entity_test->getConfigDependencyName()));
+    $dependents = $config_manager->findConfigEntityDependents('content', [$entity_test->getConfigDependencyName()]);
     $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the content entity.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on the content entity.');
     $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the content entity (via entity2).');
@@ -127,10 +127,10 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     // Create a configuration entity of a different type with the same ID as one
     // of the entities already created.
     $alt_storage = $this->container->get('entity.manager')->getStorage('config_query_test');
-    $alt_storage->create(array('id' => 'entity1', 'dependencies' => array('enforced' => array('config' => array($entity1->getConfigDependencyName())))))->save();
-    $alt_storage->create(array('id' => 'entity2', 'dependencies' => array('enforced' => array('module' => array('views')))))->save();
+    $alt_storage->create(['id' => 'entity1', 'dependencies' => ['enforced' => ['config' => [$entity1->getConfigDependencyName()]]]])->save();
+    $alt_storage->create(['id' => 'entity2', 'dependencies' => ['enforced' => ['module' => ['views']]]])->save();
 
-    $dependents = $config_manager->findConfigEntityDependentsAsEntities('config', array($entity1->getConfigDependencyName()));
+    $dependents = $config_manager->findConfigEntityDependentsAsEntities('config', [$entity1->getConfigDependencyName()]);
     $dependent_ids = $this->getDependentIds($dependents);
     $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on itself.');
     $this->assertTrue(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 has a dependency on config_test.dynamic.entity1.');
@@ -139,7 +139,7 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     $this->assertTrue(in_array('config_query_test:entity1', $dependent_ids), 'config_query_test.dynamic.entity1 has a dependency on config_test.dynamic.entity1.');
     $this->assertFalse(in_array('config_query_test:entity2', $dependent_ids), 'config_query_test.dynamic.entity2 does not have a dependency on config_test.dynamic.entity1.');
 
-    $dependents = $config_manager->findConfigEntityDependentsAsEntities('module', array('node', 'views'));
+    $dependents = $config_manager->findConfigEntityDependentsAsEntities('module', ['node', 'views']);
     $dependent_ids = $this->getDependentIds($dependents);
     $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on Views or Node.');
     $this->assertFalse(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 does not have a dependency on Views or Node.');
@@ -148,7 +148,7 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     $this->assertFalse(in_array('config_query_test:entity1', $dependent_ids), 'config_test.query.entity1 does not have a dependency on Views or Node.');
     $this->assertTrue(in_array('config_query_test:entity2', $dependent_ids), 'config_test.query.entity2 has a dependency on Views or Node.');
 
-    $dependents = $config_manager->findConfigEntityDependentsAsEntities('module', array('config_test'));
+    $dependents = $config_manager->findConfigEntityDependentsAsEntities('module', ['config_test']);
     $dependent_ids = $this->getDependentIds($dependents);
     $this->assertTrue(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 has a dependency on config_test module.');
     $this->assertTrue(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 has a dependency on config_test module.');
@@ -194,25 +194,25 @@ class ConfigDependencyTest extends EntityKernelTestBase {
       ->getStorage('config_test');
     // Test dependencies between modules.
     $entity1 = $storage->create(
-      array(
+      [
         'id' => 'entity1',
-        'dependencies' => array(
-          'enforced' => array(
-            'module' => array('node', 'config_test')
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'module' => ['node', 'config_test']
+          ],
+        ],
+      ]
     );
     $entity1->save();
     $entity2 = $storage->create(
-      array(
+      [
         'id' => 'entity2',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity1->getConfigDependencyName()],
+          ],
+        ],
+      ]
     );
     $entity2->save();
     // Perform a module rebuild so we can know where the node module is located
@@ -258,14 +258,14 @@ class ConfigDependencyTest extends EntityKernelTestBase {
       ->getStorage('config_test');
     // Entity 1 will be deleted because it depends on node.
     $entity_1 = $storage->create(
-      array(
+      [
         'id' => 'entity_' . $entity_id_suffixes[0],
-        'dependencies' => array(
-          'enforced' => array(
-            'module' => array('node', 'config_test')
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'module' => ['node', 'config_test']
+          ],
+        ],
+      ]
     );
     $entity_1->save();
 
@@ -273,14 +273,14 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     // \Drupal\config_test\Entity::onDependencyRemoval() will remove the
     // dependency before config entities are deleted.
     $entity_2 = $storage->create(
-      array(
+      [
         'id' => 'entity_' . $entity_id_suffixes[1],
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity_1->getConfigDependencyName()),
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity_1->getConfigDependencyName()],
+          ],
+        ],
+      ]
     );
     $entity_2->save();
 
@@ -288,34 +288,34 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     // be fixed. The ConfigEntityInterface::onDependencyRemoval() method will
     // not be called for this entity.
     $entity_3 = $storage->create(
-      array(
+      [
         'id' => 'entity_' . $entity_id_suffixes[2],
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity_2->getConfigDependencyName()),
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity_2->getConfigDependencyName()],
+          ],
+        ],
+      ]
     );
     $entity_3->save();
 
     // Entity 4's config dependency will be fixed but it will still be deleted
     // because it also depends on the node module.
     $entity_4 = $storage->create(
-      array(
+      [
         'id' => 'entity_' . $entity_id_suffixes[3],
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity_1->getConfigDependencyName()),
-            'module' => array('node', 'config_test')
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity_1->getConfigDependencyName()],
+            'module' => ['node', 'config_test']
+          ],
+        ],
+      ]
     );
     $entity_4->save();
 
     // Set a more complicated test where dependencies will be fixed.
-    \Drupal::state()->set('config_test.fix_dependencies', array($entity_1->getConfigDependencyName()));
+    \Drupal::state()->set('config_test.fix_dependencies', [$entity_1->getConfigDependencyName()]);
     \Drupal::state()->set('config_test.on_dependency_removal_called', []);
 
     // Do a dry run using
@@ -341,7 +341,7 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     $this->assertFalse($storage->load($entity_1->id()), 'Entity 1 deleted');
     $entity_2 = $storage->load($entity_2->id());
     $this->assertTrue($entity_2, 'Entity 2 not deleted');
-    $this->assertEqual($entity_2->calculateDependencies()->getDependencies()['config'], array(), 'Entity 2 dependencies updated to remove dependency on entity 1.');
+    $this->assertEqual($entity_2->calculateDependencies()->getDependencies()['config'], [], 'Entity 2 dependencies updated to remove dependency on entity 1.');
     $entity_3 = $storage->load($entity_3->id());
     $this->assertTrue($entity_3, 'Entity 3 not deleted');
     $this->assertEqual($entity_3->calculateDependencies()->getDependencies()['config'], [$entity_2->getConfigDependencyName()], 'Entity 3 still depends on entity 2.');
@@ -475,20 +475,20 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     $storage = $this->container->get('entity.manager')->getStorage('config_test');
     // Test dependencies between configuration entities.
     $entity1 = $storage->create(
-      array(
+      [
         'id' => 'entity1'
-      )
+      ]
     );
     $entity1->save();
     $entity2 = $storage->create(
-      array(
+      [
         'id' => 'entity2',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity1->getConfigDependencyName()],
+          ],
+        ],
+      ]
     );
     $entity2->save();
 
@@ -506,13 +506,13 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     $this->assertFalse($storage->load('entity2'), 'Entity 2 deleted');
 
     // Set a more complicated test where dependencies will be fixed.
-    \Drupal::state()->set('config_test.fix_dependencies', array($entity1->getConfigDependencyName()));
+    \Drupal::state()->set('config_test.fix_dependencies', [$entity1->getConfigDependencyName()]);
 
     // Entity1 will be deleted by the test.
     $entity1 = $storage->create(
-      array(
+      [
         'id' => 'entity1',
-      )
+      ]
     );
     $entity1->save();
 
@@ -520,28 +520,28 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     // \Drupal\config_test\Entity::onDependencyRemoval() will remove the
     // dependency before config entities are deleted.
     $entity2 = $storage->create(
-      array(
+      [
         'id' => 'entity2',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity1->getConfigDependencyName()],
+          ],
+        ],
+      ]
     );
     $entity2->save();
 
     // Entity3 will be unchanged because it is dependent on Entity2 which can
     // be fixed.
     $entity3 = $storage->create(
-      array(
+      [
         'id' => 'entity3',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity2->getConfigDependencyName()),
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity2->getConfigDependencyName()],
+          ],
+        ],
+      ]
     );
     $entity3->save();
 
@@ -559,7 +559,7 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
     $entity2 = $storage->load('entity2');
     $this->assertTrue($entity2, 'Entity 2 not deleted');
-    $this->assertEqual($entity2->calculateDependencies()->getDependencies()['config'], array(), 'Entity 2 dependencies updated to remove dependency on Entity1.');
+    $this->assertEqual($entity2->calculateDependencies()->getDependencies()['config'], [], 'Entity 2 dependencies updated to remove dependency on Entity1.');
     $entity3 = $storage->load('entity3');
     $this->assertTrue($entity3, 'Entity 3 not deleted');
     $this->assertEqual($entity3->calculateDependencies()->getDependencies()['config'], [$entity2->getConfigDependencyName()], 'Entity 3 still depends on Entity 2.');
@@ -585,30 +585,30 @@ class ConfigDependencyTest extends EntityKernelTestBase {
     /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
     $storage = $this->container->get('entity.manager')->getStorage('config_test');
     $entity1 = $storage->create(
-      array(
+      [
         'id' => 'entity1',
-        'dependencies' => array(
-          'enforced' => array(
-            'content' => array($content_entity->getConfigDependencyName())
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'content' => [$content_entity->getConfigDependencyName()]
+          ],
+        ],
+      ]
     );
     $entity1->save();
     $entity2 = $storage->create(
-      array(
+      [
         'id' => 'entity2',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName())
-          ),
-        ),
-      )
+        'dependencies' => [
+          'enforced' => [
+            'config' => [$entity1->getConfigDependencyName()]
+          ],
+        ],
+      ]
     );
     $entity2->save();
 
     // Create a configuration entity that is not in the dependency chain.
-    $entity3 = $storage->create(array('id' => 'entity3'));
+    $entity3 = $storage->create(['id' => 'entity3']);
     $entity3->save();
 
     $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('content', [$content_entity->getConfigDependencyName()]);
@@ -628,7 +628,7 @@ class ConfigDependencyTest extends EntityKernelTestBase {
    *   An array with values of entity_type_id:ID
    */
   protected function getDependentIds(array $dependents) {
-    $dependent_ids = array();
+    $dependent_ids = [];
     foreach ($dependents as $dependent) {
       $dependent_ids[] = $dependent->getEntityTypeId() . ':' . $dependent->id();
     }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
index 409b7948e..b69735ea9 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
@@ -16,12 +16,12 @@ class ConfigDiffTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test', 'system');
+  public static $modules = ['config_test', 'system'];
 
   /**
    * Tests calculating the difference between two sets of configuration.
    */
-  function testDiff() {
+  public function testDiff() {
     $active = $this->container->get('config.storage');
     $sync = $this->container->get('config.storage.sync');
     $config_name = 'config_test.system';
@@ -32,7 +32,7 @@ class ConfigDiffTest extends KernelTestBase {
     $change_data = 'foobar';
 
     // Install the default config.
-    $this->installConfig(array('config_test'));
+    $this->installConfig(['config_test']);
     $original_data = \Drupal::config($config_name)->get();
 
     // Change a configuration value in sync.
@@ -75,10 +75,10 @@ class ConfigDiffTest extends KernelTestBase {
 
     // Test diffing a renamed config entity.
     $test_entity_id = $this->randomMachineName();
-    $test_entity = entity_create('config_test', array(
+    $test_entity = entity_create('config_test', [
       'id' => $test_entity_id,
       'label' => $this->randomMachineName(),
-    ));
+    ]);
     $test_entity->save();
     $data = $active->read('config_test.dynamic.' . $test_entity_id);
     $sync->write('config_test.dynamic.' . $test_entity_id, $data);
@@ -108,7 +108,7 @@ class ConfigDiffTest extends KernelTestBase {
   /**
    * Tests calculating the difference between two sets of config collections.
    */
-  function testCollectionDiff() {
+  public function testCollectionDiff() {
     /** @var \Drupal\Core\Config\StorageInterface $active */
     $active = $this->container->get('config.storage');
     /** @var \Drupal\Core\Config\StorageInterface $sync */
@@ -117,12 +117,12 @@ class ConfigDiffTest extends KernelTestBase {
     $sync_test_collection = $sync->createCollection('test');
 
     $config_name = 'config_test.test';
-    $data = array('foo' => 'bar');
+    $data = ['foo' => 'bar'];
 
     $active->write($config_name, $data);
     $sync->write($config_name, $data);
     $active_test_collection->write($config_name, $data);
-    $sync_test_collection->write($config_name, array('foo' => 'baz'));
+    $sync_test_collection->write($config_name, ['foo' => 'baz']);
 
     // Test the fields match in the default collection diff.
     $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
index bfa823383..5a137b9f4 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
@@ -16,7 +16,7 @@ class ConfigEntityNormalizeTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -24,15 +24,15 @@ class ConfigEntityNormalizeTest extends KernelTestBase {
   }
 
   public function testNormalize() {
-    $config_entity = entity_create('config_test', array('id' => 'system', 'label' => 'foobar', 'weight' => 1));
+    $config_entity = entity_create('config_test', ['id' => 'system', 'label' => 'foobar', 'weight' => 1]);
     $config_entity->save();
 
     // Modify stored config entity, this is comparable with a schema change.
     $config = $this->config('config_test.dynamic.system');
-    $data = array(
+    $data = [
       'label' => 'foobar',
       'additional_key' => TRUE
-    ) + $config->getRawData();
+    ] + $config->getRawData();
     $config->setData($data)->save();
     $this->assertNotIdentical($config_entity->toArray(), $config->getRawData(), 'Stored config entity is not is equivalent to config schema.');
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStaticCacheTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStaticCacheTest.php
index 6733415f4..3c3f70b65 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStaticCacheTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStaticCacheTest.php
@@ -17,7 +17,7 @@ class ConfigEntityStaticCacheTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test', 'config_entity_static_cache_test');
+  public static $modules = ['config_test', 'config_entity_static_cache_test'];
 
   /**
    * The type ID of the entity under test.
@@ -42,7 +42,7 @@ class ConfigEntityStaticCacheTest extends KernelTestBase {
     $this->entityId = 'test_1';
     $this->container->get('entity_type.manager')
       ->getStorage($this->entityTypeId)
-      ->create(array('id' => $this->entityId, 'label' => 'Original label'))
+      ->create(['id' => $this->entityId, 'label' => 'Original label'])
       ->save();
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php
index 14765ef52..021136de6 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php
@@ -16,15 +16,15 @@ class ConfigEntityStatusTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
    * Tests the enabling/disabling of entities.
    */
-  function testCRUD() {
-    $entity = entity_create('config_test', array(
+  public function testCRUD() {
+    $entity = entity_create('config_test', [
       'id' => strtolower($this->randomMachineName()),
-    ));
+    ]);
     $this->assertTrue($entity->status(), 'Default status is enabled.');
     $entity->save();
     $this->assertTrue($entity->status(), 'Status is enabled after saving.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php
index 5b7022a4d..bf41e1de5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php
@@ -18,7 +18,7 @@ class ConfigEntityStorageTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
    * Tests creating configuration entities with changed UUIDs.
@@ -43,7 +43,7 @@ class ConfigEntityStorageTest extends KernelTestBase {
       $this->fail('Exception thrown when attempting to save a configuration entity with a UUID that does not match the existing UUID.');
     }
     catch (ConfigDuplicateUUIDException $e) {
-      $this->pass(format_string('Exception thrown when attempting to save a configuration entity with a UUID that does not match existing data: %e.', array('%e' => $e)));
+      $this->pass(format_string('Exception thrown when attempting to save a configuration entity with a UUID that does not match existing data: %e.', ['%e' => $e]));
     }
 
     // Ensure that the config entity was not corrupted.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
index 23251cc37..0010da786 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
@@ -14,7 +14,7 @@ class ConfigEntityUnitTest extends KernelTestBase {
   /**
    * Exempt from strict schema checking.
    *
-   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
    *
    * @var bool
    */
@@ -25,7 +25,7 @@ class ConfigEntityUnitTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
    * The config_test entity storage.
@@ -57,19 +57,19 @@ class ConfigEntityUnitTest extends KernelTestBase {
     // Create three entities, two with the same style.
     $style = $this->randomMachineName(8);
     for ($i = 0; $i < 2; $i++) {
-      $entity = $this->storage->create(array(
+      $entity = $this->storage->create([
         'id' => $this->randomMachineName(),
         'label' => $this->randomString(),
         'style' => $style,
-      ));
+      ]);
       $entity->save();
     }
-    $entity = $this->storage->create(array(
+    $entity = $this->storage->create([
       'id' => $this->randomMachineName(),
       'label' => $this->randomString(),
       // Use a different length for the entity to ensure uniqueness.
       'style' => $this->randomMachineName(9),
-    ));
+    ]);
     $entity->save();
 
     // Ensure that the configuration entity can be loaded by UUID.
@@ -85,7 +85,7 @@ class ConfigEntityUnitTest extends KernelTestBase {
     $entities = $this->storage->loadByProperties();
     $this->assertEqual(count($entities), 3, 'Three entities are loaded when no properties are specified.');
 
-    $entities = $this->storage->loadByProperties(array('style' => $style));
+    $entities = $this->storage->loadByProperties(['style' => $style]);
     $this->assertEqual(count($entities), 2, 'Two entities are loaded when the style property is specified.');
 
     // Assert that both returned entities have a matching style property.
@@ -94,11 +94,11 @@ class ConfigEntityUnitTest extends KernelTestBase {
     }
 
     // Test that schema type enforcement can be overridden by trusting the data.
-    $entity = $this->storage->create(array(
+    $entity = $this->storage->create([
       'id' => $this->randomMachineName(),
       'label' => $this->randomString(),
       'style' => 999
-    ));
+    ]);
     $entity->save();
     $this->assertIdentical('999', $entity->style);
     $entity->style = 999;
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEventsTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEventsTest.php
index 7c0680589..74bb7984e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEventsTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEventsTest.php
@@ -18,64 +18,64 @@ class ConfigEventsTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_events_test');
+  public static $modules = ['config_events_test'];
 
   /**
    * Tests configuration events.
    */
-  function testConfigEvents() {
+  public function testConfigEvents() {
     $name = 'config_events_test.test';
 
     $config = new Config($name, \Drupal::service('config.storage'), \Drupal::service('event_dispatcher'), \Drupal::service('config.typed'));
     $config->set('key', 'initial');
-    $this->assertIdentical(\Drupal::state()->get('config_events_test.event', array()), array(), 'No events fired by creating a new configuration object');
+    $this->assertIdentical(\Drupal::state()->get('config_events_test.event', []), [], 'No events fired by creating a new configuration object');
     $config->save();
 
-    $event = \Drupal::state()->get('config_events_test.event', array());
+    $event = \Drupal::state()->get('config_events_test.event', []);
     $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'initial'));
-    $this->assertIdentical($event['raw_config_data'], array('key' => 'initial'));
-    $this->assertIdentical($event['original_config_data'], array());
+    $this->assertIdentical($event['current_config_data'], ['key' => 'initial']);
+    $this->assertIdentical($event['raw_config_data'], ['key' => 'initial']);
+    $this->assertIdentical($event['original_config_data'], []);
 
     $config->set('key', 'updated')->save();
-    $event = \Drupal::state()->get('config_events_test.event', array());
+    $event = \Drupal::state()->get('config_events_test.event', []);
     $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'updated'));
-    $this->assertIdentical($event['raw_config_data'], array('key' => 'updated'));
-    $this->assertIdentical($event['original_config_data'], array('key' => 'initial'));
+    $this->assertIdentical($event['current_config_data'], ['key' => 'updated']);
+    $this->assertIdentical($event['raw_config_data'], ['key' => 'updated']);
+    $this->assertIdentical($event['original_config_data'], ['key' => 'initial']);
 
     $config->delete();
-    $event = \Drupal::state()->get('config_events_test.event', array());
+    $event = \Drupal::state()->get('config_events_test.event', []);
     $this->assertIdentical($event['event_name'], ConfigEvents::DELETE);
-    $this->assertIdentical($event['current_config_data'], array());
-    $this->assertIdentical($event['raw_config_data'], array());
-    $this->assertIdentical($event['original_config_data'], array('key' => 'updated'));
+    $this->assertIdentical($event['current_config_data'], []);
+    $this->assertIdentical($event['raw_config_data'], []);
+    $this->assertIdentical($event['original_config_data'], ['key' => 'updated']);
   }
 
   /**
    * Tests configuration rename event that is fired from the ConfigFactory.
    */
-  function testConfigRenameEvent() {
+  public function testConfigRenameEvent() {
     $name = 'config_events_test.test';
     $new_name = 'config_events_test.test_rename';
-    $GLOBALS['config'][$name] = array('key' => 'overridden');
-    $GLOBALS['config'][$new_name] = array('key' => 'new overridden');
+    $GLOBALS['config'][$name] = ['key' => 'overridden'];
+    $GLOBALS['config'][$new_name] = ['key' => 'new overridden'];
 
     $config = $this->config($name);
     $config->set('key', 'initial')->save();
-    $event = \Drupal::state()->get('config_events_test.event', array());
+    $event = \Drupal::state()->get('config_events_test.event', []);
     $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'initial'));
+    $this->assertIdentical($event['current_config_data'], ['key' => 'initial']);
 
     // Override applies when getting runtime config.
     $this->assertEqual($GLOBALS['config'][$name], \Drupal::config($name)->get());
 
     \Drupal::configFactory()->rename($name, $new_name);
-    $event = \Drupal::state()->get('config_events_test.event', array());
+    $event = \Drupal::state()->get('config_events_test.event', []);
     $this->assertIdentical($event['event_name'], ConfigEvents::RENAME);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'new overridden'));
-    $this->assertIdentical($event['raw_config_data'], array('key' => 'initial'));
-    $this->assertIdentical($event['original_config_data'], array('key' => 'new overridden'));
+    $this->assertIdentical($event['current_config_data'], ['key' => 'new overridden']);
+    $this->assertIdentical($event['raw_config_data'], ['key' => 'initial']);
+    $this->assertIdentical($event['original_config_data'], ['key' => 'new overridden']);
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
index c440c0391..536662921 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
@@ -15,7 +15,7 @@ class ConfigFileContentTest extends KernelTestBase {
   /**
    * Exempt from strict schema checking.
    *
-   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
    *
    * @var bool
    */
@@ -24,7 +24,7 @@ class ConfigFileContentTest extends KernelTestBase {
   /**
    * Tests setting, writing, and reading of a configuration setting.
    */
-  function testReadWriteConfig() {
+  public function testReadWriteConfig() {
     $storage = $this->container->get('config.storage');
 
     $name = 'foo.bar';
@@ -33,19 +33,19 @@ class ConfigFileContentTest extends KernelTestBase {
     $nested_key = 'biff.bang';
     $nested_value = 'pow';
     $array_key = 'array';
-    $array_value = array(
+    $array_value = [
       'foo' => 'bar',
-      'biff' => array(
+      'biff' => [
         'bang' => 'pow',
-      ),
-    );
+      ],
+    ];
     $casting_array_key = 'casting_array';
     $casting_array_false_value_key = 'casting_array.cast.false';
-    $casting_array_value = array(
-      'cast' => array(
+    $casting_array_value = [
+      'cast' => [
         'false' => FALSE,
-      ),
-    );
+      ],
+    ];
     $nested_array_key = 'nested.array';
     $true_key = 'true';
     $false_key = 'false';
@@ -58,7 +58,7 @@ class ConfigFileContentTest extends KernelTestBase {
     $this->assertTrue($config, 'Config object created.');
 
     // Verify the configuration object is empty.
-    $this->assertEqual($config->get(), array(), 'New config object is empty.');
+    $this->assertEqual($config->get(), [], 'New config object is empty.');
 
     // Verify nothing was saved.
     $data = $storage->read($name);
@@ -173,7 +173,7 @@ class ConfigFileContentTest extends KernelTestBase {
     // Get file listing for all files starting with 'bar'. Should return
     // an empty array.
     $files = $storage->listAll('bar');
-    $this->assertEqual($files, array(), 'No files listed with the prefix \'bar\'.');
+    $this->assertEqual($files, [], 'No files listed with the prefix \'bar\'.');
 
     // Delete the configuration.
     $config = $this->config($name);
@@ -187,22 +187,22 @@ class ConfigFileContentTest extends KernelTestBase {
   /**
    * Tests serialization of configuration to file.
    */
-  function testSerialization() {
+  public function testSerialization() {
     $name = $this->randomMachineName(10) . '.' . $this->randomMachineName(10);
-    $config_data = array(
+    $config_data = [
       // Indexed arrays; the order of elements is essential.
-      'numeric keys' => array('i', 'n', 'd', 'e', 'x', 'e', 'd'),
+      'numeric keys' => ['i', 'n', 'd', 'e', 'x', 'e', 'd'],
       // Infinitely nested keys using arbitrary element names.
-      'nested keys' => array(
+      'nested keys' => [
         // HTML/XML in values.
         'HTML' => '<strong> <bold> <em> <blockquote>',
         // UTF-8 in values.
         'UTF-8' => 'FrançAIS is ÜBER-åwesome',
         // Unicode in keys and values.
         'ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ' => 'αβγδεζηθικλμνξοσὠ',
-      ),
+      ],
       'invalid xml' => '</title><script type="text/javascript">alert("Title XSS!");</script> & < > " \' ',
-    );
+    ];
 
     // Encode and write, and reload and decode the configuration data.
     $filestorage = new FileStorage(config_get_config_directory(CONFIG_SYNC_DIRECTORY));
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
index 570ca4c1b..0523ee85b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
@@ -33,7 +33,7 @@ class ConfigImportRecreateTest extends KernelTestBase {
     parent::setUp();
 
     $this->installEntitySchema('node');
-    $this->installConfig(array('field', 'node'));
+    $this->installConfig(['field', 'node']);
 
     $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
index 48b9c4675..e755d5fd8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
@@ -40,7 +40,7 @@ class ConfigImportRenameValidationTest extends KernelTestBase {
 
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');
-    $this->installConfig(array('field'));
+    $this->installConfig(['field']);
 
     // Set up the ConfigImporter object for testing.
     $storage_comparer = new StorageComparer(
@@ -67,10 +67,10 @@ class ConfigImportRenameValidationTest extends KernelTestBase {
   public function testRenameValidation() {
     // Create a test entity.
     $test_entity_id = $this->randomMachineName();
-    $test_entity = entity_create('config_test', array(
+    $test_entity = entity_create('config_test', [
       'id' => $test_entity_id,
       'label' => $this->randomMachineName(),
-    ));
+    ]);
     $test_entity->save();
     $uuid = $test_entity->uuid();
 
@@ -91,9 +91,9 @@ class ConfigImportRenameValidationTest extends KernelTestBase {
     // Confirm that the staged configuration is detected as a rename since the
     // UUIDs match.
     $this->configImporter->reset();
-    $expected = array(
+    $expected = [
       'node.type.' . $content_type->id() . '::config_test.dynamic.' . $test_entity_id,
-    );
+    ];
     $renames = $this->configImporter->getUnprocessedConfiguration('rename');
     $this->assertIdentical($expected, $renames);
 
@@ -105,9 +105,9 @@ class ConfigImportRenameValidationTest extends KernelTestBase {
     }
     catch (ConfigImporterException $e) {
       $this->pass('Expected ConfigImporterException thrown when a renamed configuration entity does not match the existing entity type.');
-      $expected = array(
-        SafeMarkup::format('Entity type mismatch on rename. @old_type not equal to @new_type for existing configuration @old_name and staged configuration @new_name.', array('@old_type' => 'node_type', '@new_type' => 'config_test', '@old_name' => 'node.type.' . $content_type->id(), '@new_name' => 'config_test.dynamic.' . $test_entity_id))
-      );
+      $expected = [
+        SafeMarkup::format('Entity type mismatch on rename. @old_type not equal to @new_type for existing configuration @old_name and staged configuration @new_name.', ['@old_type' => 'node_type', '@new_type' => 'config_test', '@old_name' => 'node.type.' . $content_type->id(), '@new_name' => 'config_test.dynamic.' . $test_entity_id])
+      ];
       $this->assertEqual($expected, $this->configImporter->getErrors());
     }
   }
@@ -134,9 +134,9 @@ class ConfigImportRenameValidationTest extends KernelTestBase {
     // Confirm that the staged configuration is detected as a rename since the
     // UUIDs match.
     $this->configImporter->reset();
-    $expected = array(
+    $expected = [
       'config_test.old::config_test.new'
-    );
+    ];
     $renames = $this->configImporter->getUnprocessedConfiguration('rename');
     $this->assertIdentical($expected, $renames);
 
@@ -148,9 +148,9 @@ class ConfigImportRenameValidationTest extends KernelTestBase {
     }
     catch (ConfigImporterException $e) {
       $this->pass('Expected ConfigImporterException thrown when simple configuration is renamed.');
-      $expected = array(
-        SafeMarkup::format('Rename operation for simple configuration. Existing configuration @old_name and staged configuration @new_name.', array('@old_name' => 'config_test.old', '@new_name' => 'config_test.new'))
-      );
+      $expected = [
+        SafeMarkup::format('Rename operation for simple configuration. Existing configuration @old_name and staged configuration @new_name.', ['@old_name' => 'config_test.old', '@new_name' => 'config_test.new'])
+      ];
       $this->assertEqual($expected, $this->configImporter->getErrors());
     }
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
index 55f64814f..59f9cb2ed 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
@@ -26,14 +26,14 @@ class ConfigImporterMissingContentTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'entity_test', 'config_test', 'config_import_test');
+  public static $modules = ['system', 'user', 'entity_test', 'config_test', 'config_import_test'];
 
   protected function setUp() {
     parent::setUp();
     $this->installSchema('system', 'sequences');
     $this->installEntitySchema('entity_test');
     $this->installEntitySchema('user');
-    $this->installConfig(array('config_test'));
+    $this->installConfig(['config_test']);
     // Installing config_test's default configuration pollutes the global
     // variable being used for recording hook invocations by this test already,
     // so it has to be cleared out manually.
@@ -66,16 +66,16 @@ class ConfigImporterMissingContentTest extends KernelTestBase {
    * @see \Drupal\Core\Config\ConfigImporter::processMissingContent()
    * @see \Drupal\config_import_test\EventSubscriber
    */
-  function testMissingContent() {
+  public function testMissingContent() {
     \Drupal::state()->set('config_import_test.config_import_missing_content', TRUE);
 
     // Update a configuration entity in the sync directory to have a dependency
     // on two content entities that do not exist.
     $storage = $this->container->get('config.storage');
     $sync = $this->container->get('config.storage.sync');
-    $entity_one = EntityTest::create(array('name' => 'one'));
-    $entity_two = EntityTest::create(array('name' => 'two'));
-    $entity_three = EntityTest::create(array('name' => 'three'));
+    $entity_one = EntityTest::create(['name' => 'one']);
+    $entity_two = EntityTest::create(['name' => 'two']);
+    $entity_three = EntityTest::create(['name' => 'three']);
     $dynamic_name = 'config_test.dynamic.dotted.default';
     $original_dynamic_data = $storage->read($dynamic_name);
     // Entity one will be resolved by
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
index 945e994e3..0ecc38c18 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
@@ -28,12 +28,12 @@ class ConfigImporterTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test', 'system', 'config_import_test');
+  public static $modules = ['config_test', 'system', 'config_import_test'];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->installConfig(array('config_test'));
+    $this->installConfig(['config_test']);
     // Installing config_test's default configuration pollutes the global
     // variable being used for recording hook invocations by this test already,
     // so it has to be cleared out manually.
@@ -63,7 +63,7 @@ class ConfigImporterTest extends KernelTestBase {
   /**
    * Tests omission of module APIs for bare configuration operations.
    */
-  function testNoImport() {
+  public function testNoImport() {
     $dynamic_name = 'config_test.dynamic.dotted.default';
 
     // Verify the default configuration values exist.
@@ -78,7 +78,7 @@ class ConfigImporterTest extends KernelTestBase {
    * Tests that trying to import from an empty sync configuration directory
    * fails.
    */
-  function testEmptyImportFails() {
+  public function testEmptyImportFails() {
     try {
       $this->container->get('config.storage.sync')->deleteAll();
       $this->configImporter->reset()->import();
@@ -92,7 +92,7 @@ class ConfigImporterTest extends KernelTestBase {
   /**
    * Tests verification of site UUID before importing configuration.
    */
-  function testSiteUuidValidate() {
+  public function testSiteUuidValidate() {
     $sync = \Drupal::service('config.storage.sync');
     // Create updated configuration object.
     $config_data = $this->config('system.site')->get();
@@ -106,7 +106,7 @@ class ConfigImporterTest extends KernelTestBase {
     catch (ConfigImporterException $e) {
       $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
       $error_log = $this->configImporter->getErrors();
-      $expected = array('Site UUID in source storage does not match the target storage.');
+      $expected = ['Site UUID in source storage does not match the target storage.'];
       $this->assertEqual($expected, $error_log);
     }
   }
@@ -114,7 +114,7 @@ class ConfigImporterTest extends KernelTestBase {
   /**
    * Tests deletion of configuration during import.
    */
-  function testDeleted() {
+  public function testDeleted() {
     $dynamic_name = 'config_test.dynamic.dotted.default';
     $storage = $this->container->get('config.storage');
     $sync = $this->container->get('config.storage.sync');
@@ -151,7 +151,7 @@ class ConfigImporterTest extends KernelTestBase {
   /**
    * Tests creation of configuration during import.
    */
-  function testNew() {
+  public function testNew() {
     $dynamic_name = 'config_test.dynamic.new';
     $storage = $this->container->get('config.storage');
     $sync = $this->container->get('config.storage.sync');
@@ -160,11 +160,11 @@ class ConfigImporterTest extends KernelTestBase {
     $this->assertIdentical($storage->exists($dynamic_name), FALSE, $dynamic_name . ' not found.');
 
     // Create new config entity.
-    $original_dynamic_data = array(
+    $original_dynamic_data = [
       'uuid' => '30df59bd-7b03-4cf7-bb35-d42fc49f0651',
       'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
       'status' => TRUE,
-      'dependencies' => array(),
+      'dependencies' => [],
       'id' => 'new',
       'label' => 'New',
       'weight' => 0,
@@ -172,7 +172,7 @@ class ConfigImporterTest extends KernelTestBase {
       'size' => '',
       'size_value' => '',
       'protected_property' => '',
-    );
+    ];
     $sync->write($dynamic_name, $original_dynamic_data);
 
     $this->assertIdentical($sync->exists($dynamic_name), TRUE, $dynamic_name . ' found.');
@@ -205,29 +205,29 @@ class ConfigImporterTest extends KernelTestBase {
   /**
    * Tests that secondary writes are overwritten.
    */
-  function testSecondaryWritePrimaryFirst() {
+  public function testSecondaryWritePrimaryFirst() {
     $name_primary = 'config_test.dynamic.primary';
     $name_secondary = 'config_test.dynamic.secondary';
     $sync = $this->container->get('config.storage.sync');
     $uuid = $this->container->get('uuid');
 
-    $values_primary = array(
+    $values_primary = [
       'id' => 'primary',
       'label' => 'Primary',
       'weight' => 0,
       'uuid' => $uuid->generate(),
-    );
+    ];
     $sync->write($name_primary, $values_primary);
-    $values_secondary = array(
+    $values_secondary = [
       'id' => 'secondary',
       'label' => 'Secondary Sync',
       'weight' => 0,
       'uuid' => $uuid->generate(),
       // Add a dependency on primary, to ensure that is synced first.
-      'dependencies' => array(
-        'config' => array($name_primary),
-      )
-    );
+      'dependencies' => [
+        'config' => [$name_primary],
+      ]
+    ];
     $sync->write($name_secondary, $values_secondary);
 
     // Import.
@@ -245,35 +245,35 @@ class ConfigImporterTest extends KernelTestBase {
 
     $logs = $this->configImporter->getErrors();
     $this->assertEqual(count($logs), 1);
-    $this->assertEqual($logs[0], SafeMarkup::format('Deleted and replaced configuration entity "@name"', array('@name' => $name_secondary)));
+    $this->assertEqual($logs[0], SafeMarkup::format('Deleted and replaced configuration entity "@name"', ['@name' => $name_secondary]));
   }
 
   /**
    * Tests that secondary writes are overwritten.
    */
-  function testSecondaryWriteSecondaryFirst() {
+  public function testSecondaryWriteSecondaryFirst() {
     $name_primary = 'config_test.dynamic.primary';
     $name_secondary = 'config_test.dynamic.secondary';
     $sync = $this->container->get('config.storage.sync');
     $uuid = $this->container->get('uuid');
 
-    $values_primary = array(
+    $values_primary = [
       'id' => 'primary',
       'label' => 'Primary',
       'weight' => 0,
       'uuid' => $uuid->generate(),
       // Add a dependency on secondary, so that is synced first.
-      'dependencies' => array(
-        'config' => array($name_secondary),
-      )
-    );
+      'dependencies' => [
+        'config' => [$name_secondary],
+      ]
+    ];
     $sync->write($name_primary, $values_primary);
-    $values_secondary = array(
+    $values_secondary = [
       'id' => 'secondary',
       'label' => 'Secondary Sync',
       'weight' => 0,
       'uuid' => $uuid->generate(),
-    );
+    ];
     $sync->write($name_secondary, $values_secondary);
 
     // Import.
@@ -297,7 +297,7 @@ class ConfigImporterTest extends KernelTestBase {
   /**
    * Tests that secondary updates for deleted files work as expected.
    */
-  function testSecondaryUpdateDeletedDeleterFirst() {
+  public function testSecondaryUpdateDeletedDeleterFirst() {
     $name_deleter = 'config_test.dynamic.deleter';
     $name_deletee = 'config_test.dynamic.deletee';
     $name_other = 'config_test.dynamic.other';
@@ -305,52 +305,52 @@ class ConfigImporterTest extends KernelTestBase {
     $sync = $this->container->get('config.storage.sync');
     $uuid = $this->container->get('uuid');
 
-    $values_deleter = array(
+    $values_deleter = [
       'id' => 'deleter',
       'label' => 'Deleter',
       'weight' => 0,
       'uuid' => $uuid->generate(),
-    );
+    ];
     $storage->write($name_deleter, $values_deleter);
     $values_deleter['label'] = 'Updated Deleter';
     $sync->write($name_deleter, $values_deleter);
-    $values_deletee = array(
+    $values_deletee = [
       'id' => 'deletee',
       'label' => 'Deletee',
       'weight' => 0,
       'uuid' => $uuid->generate(),
       // Add a dependency on deleter, to make sure that is synced first.
-      'dependencies' => array(
-        'config' => array($name_deleter),
-      )
-    );
+      'dependencies' => [
+        'config' => [$name_deleter],
+      ]
+    ];
     $storage->write($name_deletee, $values_deletee);
     $values_deletee['label'] = 'Updated Deletee';
     $sync->write($name_deletee, $values_deletee);
 
     // Ensure that import will continue after the error.
-    $values_other = array(
+    $values_other = [
       'id' => 'other',
       'label' => 'Other',
       'weight' => 0,
       'uuid' => $uuid->generate(),
       // Add a dependency on deleter, to make sure that is synced first. This
       // will also be synced after the deletee due to alphabetical ordering.
-      'dependencies' => array(
-        'config' => array($name_deleter),
-      )
-    );
+      'dependencies' => [
+        'config' => [$name_deleter],
+      ]
+    ];
     $storage->write($name_other, $values_other);
     $values_other['label'] = 'Updated other';
     $sync->write($name_other, $values_other);
 
     // Check update changelist order.
     $updates = $this->configImporter->reset()->getStorageComparer()->getChangelist('update');
-    $expected = array(
+    $expected = [
       $name_deleter,
       $name_deletee,
       $name_other,
-    );
+    ];
     $this->assertIdentical($expected, $updates);
 
     // Import.
@@ -373,7 +373,7 @@ class ConfigImporterTest extends KernelTestBase {
 
     $logs = $this->configImporter->getErrors();
     $this->assertEqual(count($logs), 1);
-    $this->assertEqual($logs[0], SafeMarkup::format('Update target "@name" is missing.', array('@name' => $name_deletee)));
+    $this->assertEqual($logs[0], SafeMarkup::format('Update target "@name" is missing.', ['@name' => $name_deletee]));
   }
 
   /**
@@ -383,32 +383,32 @@ class ConfigImporterTest extends KernelTestBase {
    * configuration tree imports. Therefore, any configuration updates that cause
    * secondary deletes should be reflected already in the staged configuration.
    */
-  function testSecondaryUpdateDeletedDeleteeFirst() {
+  public function testSecondaryUpdateDeletedDeleteeFirst() {
     $name_deleter = 'config_test.dynamic.deleter';
     $name_deletee = 'config_test.dynamic.deletee';
     $storage = $this->container->get('config.storage');
     $sync = $this->container->get('config.storage.sync');
     $uuid = $this->container->get('uuid');
 
-    $values_deleter = array(
+    $values_deleter = [
       'id' => 'deleter',
       'label' => 'Deleter',
       'weight' => 0,
       'uuid' => $uuid->generate(),
       // Add a dependency on deletee, to make sure that is synced first.
-      'dependencies' => array(
-        'config' => array($name_deletee),
-      ),
-    );
+      'dependencies' => [
+        'config' => [$name_deletee],
+      ],
+    ];
     $storage->write($name_deleter, $values_deleter);
     $values_deleter['label'] = 'Updated Deleter';
     $sync->write($name_deleter, $values_deleter);
-    $values_deletee = array(
+    $values_deletee = [
       'id' => 'deletee',
       'label' => 'Deletee',
       'weight' => 0,
       'uuid' => $uuid->generate(),
-    );
+    ];
     $storage->write($name_deletee, $values_deletee);
     $values_deletee['label'] = 'Updated Deletee';
     $sync->write($name_deletee, $values_deletee);
@@ -429,30 +429,30 @@ class ConfigImporterTest extends KernelTestBase {
   /**
    * Tests that secondary deletes for deleted files work as expected.
    */
-  function testSecondaryDeletedDeleteeSecond() {
+  public function testSecondaryDeletedDeleteeSecond() {
     $name_deleter = 'config_test.dynamic.deleter';
     $name_deletee = 'config_test.dynamic.deletee';
     $storage = $this->container->get('config.storage');
 
     $uuid = $this->container->get('uuid');
 
-    $values_deleter = array(
+    $values_deleter = [
       'id' => 'deleter',
       'label' => 'Deleter',
       'weight' => 0,
       'uuid' => $uuid->generate(),
       // Add a dependency on deletee, to make sure this delete is synced first.
-      'dependencies' => array(
-        'config' => array($name_deletee),
-      ),
-    );
+      'dependencies' => [
+        'config' => [$name_deletee],
+      ],
+    ];
     $storage->write($name_deleter, $values_deleter);
-    $values_deletee = array(
+    $values_deletee = [
       'id' => 'deletee',
       'label' => 'Deletee',
       'weight' => 0,
       'uuid' => $uuid->generate(),
-    );
+    ];
     $storage->write($name_deletee, $values_deletee);
 
     // Import.
@@ -471,7 +471,7 @@ class ConfigImporterTest extends KernelTestBase {
   /**
    * Tests updating of configuration during import.
    */
-  function testUpdated() {
+  public function testUpdated() {
     $name = 'config_test.system';
     $dynamic_name = 'config_test.dynamic.dotted.default';
     $storage = $this->container->get('config.storage');
@@ -483,9 +483,9 @@ class ConfigImporterTest extends KernelTestBase {
 
     // Replace the file content of the existing configuration objects in the
     // sync directory.
-    $original_name_data = array(
+    $original_name_data = [
       'foo' => 'beer',
-    );
+    ];
     $sync->write($name, $original_name_data);
     $original_dynamic_data = $storage->read($dynamic_name);
     $original_dynamic_data['label'] = 'Updated';
@@ -528,11 +528,11 @@ class ConfigImporterTest extends KernelTestBase {
   /**
    * Tests the isInstallable method()
    */
-  function testIsInstallable() {
+  public function testIsInstallable() {
     $config_name = 'config_test.dynamic.isinstallable';
     $this->assertFalse($this->container->get('config.storage')->exists($config_name));
     \Drupal::state()->set('config_test.isinstallable', TRUE);
-    $this->installConfig(array('config_test'));
+    $this->installConfig(['config_test']);
     $this->assertTrue($this->container->get('config.storage')->exists($config_name));
   }
 
@@ -668,6 +668,34 @@ class ConfigImporterTest extends KernelTestBase {
     }
   }
 
+  /**
+   * Tests install profile validation during configuration import.
+   *
+   * @see \Drupal\Core\EventSubscriber\ConfigImportSubscriber
+   */
+  public function testInstallProfileMisMatch() {
+    $sync = $this->container->get('config.storage.sync');
+
+    $extensions = $sync->read('core.extension');
+    // Change the install profile.
+    $extensions['profile'] = 'this_will_not_work';
+    $sync->write('core.extension', $extensions);
+
+    try {
+      $this->configImporter->reset()->import();
+      $this->fail('ConfigImporterException not thrown; an invalid import was not stopped due to missing dependencies.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
+      $error_log = $this->configImporter->getErrors();
+      // Install profiles can not be changed. Note that KernelTestBase currently
+      // does not use an install profile. This situation should be impossible
+      // to get in but site's can removed the install profile setting from
+      // settings.php so the test is valid.
+      $this->assertEqual(['Cannot change the install profile from <em class="placeholder">this_will_not_work</em> to <em class="placeholder"></em> once Drupal is installed.'], $error_log);
+    }
+  }
+
   /**
    * Tests config_get_config_directory().
    */
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
index f8d76c810..8203b311d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
@@ -34,7 +34,7 @@ class ConfigInstallTest extends KernelTestBase {
   /**
    * Tests module installation.
    */
-  function testModuleInstallation() {
+  public function testModuleInstallation() {
     $default_config = 'config_test.system';
     $default_configuration_entity = 'config_test.dynamic.dotted.default';
 
@@ -49,7 +49,7 @@ class ConfigInstallTest extends KernelTestBase {
     $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema does not exist.');
 
     // Install the test module.
-    $this->installModules(array('config_test'));
+    $this->installModules(['config_test']);
 
     // Verify that default module config exists.
     \Drupal::configFactory()->reset($default_config);
@@ -69,14 +69,14 @@ class ConfigInstallTest extends KernelTestBase {
     $this->assertFalse(isset($GLOBALS['hook_config_test']['delete']));
 
     // Install the schema test module.
-    $this->enableModules(array('config_schema_test'));
-    $this->installConfig(array('config_schema_test'));
+    $this->enableModules(['config_schema_test']);
+    $this->installConfig(['config_schema_test']);
 
     // After module installation the new schema should exist.
     $this->assertTrue(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema exists.');
 
     // Test that uninstalling configuration removes configuration schema.
-    $this->config('core.extension')->set('module', array())->save();
+    $this->config('core.extension')->set('module', [])->save();
     \Drupal::service('config.manager')->uninstall('module', 'config_test');
     $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema does not exist.');
   }
@@ -86,28 +86,28 @@ class ConfigInstallTest extends KernelTestBase {
    */
   public function testCollectionInstallationNoCollections() {
     // Install the test module.
-    $this->enableModules(array('config_collection_install_test'));
-    $this->installConfig(array('config_collection_install_test'));
+    $this->enableModules(['config_collection_install_test']);
+    $this->installConfig(['config_collection_install_test']);
     /** @var \Drupal\Core\Config\StorageInterface $active_storage */
     $active_storage = \Drupal::service('config.storage');
-    $this->assertEqual(array(), $active_storage->getAllCollectionNames());
+    $this->assertEqual([], $active_storage->getAllCollectionNames());
   }
 
   /**
    * Tests config objects in collections are installed as expected.
    */
   public function testCollectionInstallationCollections() {
-    $collections = array(
+    $collections = [
       'another_collection',
       'collection.test1',
       'collection.test2',
-    );
+    ];
     // Set the event listener to return three possible collections.
     // @see \Drupal\config_collection_install_test\EventSubscriber
     \Drupal::state()->set('config_collection_install_test.collection_names', $collections);
     // Install the test module.
-    $this->enableModules(array('config_collection_install_test'));
-    $this->installConfig(array('config_collection_install_test'));
+    $this->enableModules(['config_collection_install_test']);
+    $this->installConfig(['config_collection_install_test']);
     /** @var \Drupal\Core\Config\StorageInterface $active_storage */
     $active_storage = \Drupal::service('config.storage');
     $this->assertEqual($collections, $active_storage->getAllCollectionNames());
@@ -140,20 +140,20 @@ class ConfigInstallTest extends KernelTestBase {
     // is not enabled.
     $this->assertEqual($collections, $active_storage->getAllCollectionNames());
     // Enable the 'config_test' module and try again.
-    $this->enableModules(array('config_test'));
+    $this->enableModules(['config_test']);
     \Drupal::service('config.installer')->installCollectionDefaultConfig('entity');
     $collections[] = 'entity';
     $this->assertEqual($collections, $active_storage->getAllCollectionNames());
     $collection_storage = $active_storage->createCollection('entity');
     $data = $collection_storage->read('config_test.dynamic.dotted.default');
-    $this->assertIdentical(array('label' => 'entity'), $data);
+    $this->assertIdentical(['label' => 'entity'], $data);
 
     // Test that the config manager uninstalls configuration from collections
     // as expected.
     \Drupal::service('config.manager')->uninstall('module', 'config_collection_install_test');
-    $this->assertEqual(array('entity'), $active_storage->getAllCollectionNames());
+    $this->assertEqual(['entity'], $active_storage->getAllCollectionNames());
     \Drupal::service('config.manager')->uninstall('module', 'config_test');
-    $this->assertEqual(array(), $active_storage->getAllCollectionNames());
+    $this->assertEqual([], $active_storage->getAllCollectionNames());
   }
 
   /**
@@ -165,12 +165,12 @@ class ConfigInstallTest extends KernelTestBase {
    * using simple configuration.
    */
   public function testCollectionInstallationCollectionConfigEntity() {
-    $collections = array(
+    $collections = [
       'entity',
-    );
+    ];
     \Drupal::state()->set('config_collection_install_test.collection_names', $collections);
     // Install the test module.
-    $this->installModules(array('config_test', 'config_collection_install_test'));
+    $this->installModules(['config_test', 'config_collection_install_test']);
     /** @var \Drupal\Core\Config\StorageInterface $active_storage */
     $active_storage = \Drupal::service('config.storage');
     $this->assertEqual($collections, $active_storage->getAllCollectionNames());
@@ -185,7 +185,7 @@ class ConfigInstallTest extends KernelTestBase {
     $data = $active_storage->read($name);
     $this->assertTrue(isset($data['uuid']));
     $data = $collection_storage->read($name);
-    $this->assertIdentical(array('label' => 'entity'), $data);
+    $this->assertIdentical(['label' => 'entity'], $data);
   }
 
   /**
@@ -199,8 +199,18 @@ class ConfigInstallTest extends KernelTestBase {
     }
     catch (UnmetDependenciesException $e) {
       $this->assertEqual($e->getExtension(), 'config_install_dependency_test');
-      $this->assertEqual($e->getConfigObjects(), ['config_other_module_config_test.weird_simple_config', 'config_test.dynamic.other_module_test_with_dependency']);
-      $this->assertEqual($e->getMessage(), 'Configuration objects (config_other_module_config_test.weird_simple_config, config_test.dynamic.other_module_test_with_dependency) provided by config_install_dependency_test have unmet dependencies');
+      $this->assertEqual($e->getConfigObjects(), ['config_test.dynamic.other_module_test_with_dependency' => ['config_other_module_config_test', 'config_test.dynamic.dotted.english']]);
+      $this->assertEqual($e->getMessage(), 'Configuration objects provided by <em class="placeholder">config_install_dependency_test</em> have unmet dependencies: <em class="placeholder">config_test.dynamic.other_module_test_with_dependency (config_other_module_config_test, config_test.dynamic.dotted.english)</em>');
+    }
+    $this->installModules(['config_test_language']);
+    try {
+      $this->installModules(['config_install_dependency_test']);
+      $this->fail('Expected UnmetDependenciesException not thrown.');
+    }
+    catch (UnmetDependenciesException $e) {
+      $this->assertEqual($e->getExtension(), 'config_install_dependency_test');
+      $this->assertEqual($e->getConfigObjects(), ['config_test.dynamic.other_module_test_with_dependency' => ['config_other_module_config_test']]);
+      $this->assertEqual($e->getMessage(), 'Configuration objects provided by <em class="placeholder">config_install_dependency_test</em> have unmet dependencies: <em class="placeholder">config_test.dynamic.other_module_test_with_dependency (config_other_module_config_test)</em>');
     }
     $this->installModules(['config_other_module_config_test']);
     $this->installModules(['config_install_dependency_test']);
@@ -214,7 +224,7 @@ class ConfigInstallTest extends KernelTestBase {
   /**
    * Tests imported configuration entities with and without language information.
    */
-  function testLanguage() {
+  public function testLanguage() {
     $this->installModules(['config_test_language']);
     // Test imported configuration with implicit language code.
     $storage = new InstallStorage();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php
index 994406c2a..5bf6f0ec4 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php
@@ -17,20 +17,20 @@ class ConfigLanguageOverrideTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('user', 'language', 'config_test', 'system', 'field');
+  public static $modules = ['user', 'language', 'config_test', 'system', 'field'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('config_test'));
+    $this->installConfig(['config_test']);
   }
 
   /**
    * Tests locale override based on language.
    */
-  function testConfigLanguageOverride() {
+  public function testConfigLanguageOverride() {
     // The language module implements a config factory override object that
     // overrides configuration when the Language module is enabled. This test ensures that
     // English overrides work.
@@ -68,40 +68,40 @@ class ConfigLanguageOverrideTest extends KernelTestBase {
     // Test how overrides react to base configuration changes. Set up some base
     // values.
     \Drupal::configFactory()->getEditable('config_test.foo')
-      ->set('value', array('key' => 'original'))
+      ->set('value', ['key' => 'original'])
       ->set('label', 'Original')
       ->save();
     \Drupal::languageManager()
       ->getLanguageConfigOverride('de', 'config_test.foo')
-      ->set('value', array('key' => 'override'))
+      ->set('value', ['key' => 'override'])
       ->set('label', 'Override')
       ->save();
     \Drupal::languageManager()
       ->getLanguageConfigOverride('fr', 'config_test.foo')
-      ->set('value', array('key' => 'override'))
+      ->set('value', ['key' => 'override'])
       ->save();
     \Drupal::configFactory()->clearStaticCache();
     $config = \Drupal::config('config_test.foo');
-    $this->assertIdentical($config->get('value'), array('key' => 'override'));
+    $this->assertIdentical($config->get('value'), ['key' => 'override']);
 
     // Ensure renaming the config will rename the override.
     \Drupal::languageManager()->setConfigOverrideLanguage(\Drupal::languageManager()->getLanguage('en'));
     \Drupal::configFactory()->rename('config_test.foo', 'config_test.bar');
     $config = \Drupal::config('config_test.bar');
-    $this->assertEqual($config->get('value'), array('key' => 'original'));
+    $this->assertEqual($config->get('value'), ['key' => 'original']);
     $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.foo');
     $this->assertTrue($override->isNew());
     $this->assertEqual($override->get('value'), NULL);
     $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
     $this->assertFalse($override->isNew());
-    $this->assertEqual($override->get('value'), array('key' => 'override'));
+    $this->assertEqual($override->get('value'), ['key' => 'override']);
     $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.bar');
     $this->assertFalse($override->isNew());
-    $this->assertEqual($override->get('value'), array('key' => 'override'));
+    $this->assertEqual($override->get('value'), ['key' => 'override']);
 
     // Ensure changing data in the config will update the overrides.
     $config = \Drupal::configFactory()->getEditable('config_test.bar')->clear('value.key')->save();
-    $this->assertEqual($config->get('value'), array());
+    $this->assertEqual($config->get('value'), []);
     $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
     $this->assertFalse($override->isNew());
     $this->assertEqual($override->get('value'), NULL);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php
index 1310cb32f..a94123d4c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php
@@ -16,7 +16,7 @@ class ConfigModuleOverridesTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'config', 'config_override_test');
+  public static $modules = ['system', 'config', 'config_override_test'];
 
   public function testSimpleModuleOverrides() {
     $GLOBALS['config_test_run_module_overrides'] = TRUE;
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php
index 914adcf10..b2ddaa396 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php
@@ -16,7 +16,7 @@ class ConfigOverrideTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'config_test');
+  public static $modules = ['system', 'config_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -26,12 +26,12 @@ class ConfigOverrideTest extends KernelTestBase {
   /**
    * Tests configuration override.
    */
-  function testConfOverride() {
-    $expected_original_data = array(
+  public function testConfOverride() {
+    $expected_original_data = [
       'foo' => 'bar',
       'baz' => NULL,
       '404' => 'herp',
-    );
+    ];
 
     // Set globals before installing to prove that the installed file does not
     // contain these values.
@@ -40,7 +40,7 @@ class ConfigOverrideTest extends KernelTestBase {
     $overrides['config_test.system']['404'] = 'derp';
     $GLOBALS['config'] = $overrides;
 
-    $this->installConfig(array('config_test'));
+    $this->installConfig(['config_test']);
 
     // Verify that the original configuration data exists. Have to read storage
     // directly otherwise overrides will apply.
@@ -90,10 +90,10 @@ class ConfigOverrideTest extends KernelTestBase {
 
     // Write file to sync.
     $sync = $this->container->get('config.storage.sync');
-    $expected_new_data = array(
+    $expected_new_data = [
       'foo' => 'barbar',
       '404' => 'herpderp',
-    );
+    ];
     $sync->write('config_test.system', $expected_new_data);
 
     // Import changed data from sync to active.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
index f18bf3c87..6c568b841 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
@@ -18,7 +18,7 @@ class ConfigOverridesPriorityTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'config', 'config_override_test', 'language');
+  public static $modules = ['system', 'config', 'config_override_test', 'language'];
 
   public function testOverridePriorities() {
     $GLOBALS['config_test_run_module_overrides'] = FALSE;
@@ -50,10 +50,10 @@ class ConfigOverridesPriorityTest extends KernelTestBase {
     $this->assertEqual(50, $config_factory->get('system.site')->get('weight_select_max'));
 
     // Override using language.
-    $language = new Language(array(
+    $language = new Language([
       'name' => 'French',
       'id' => 'fr',
-    ));
+    ]);
     \Drupal::languageManager()->setConfigOverrideLanguage($language);
     \Drupal::languageManager()
       ->getLanguageConfigOverride($language->getId(), 'system.site')
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
index ae3abdd87..1cd141436 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
@@ -5,6 +5,10 @@ namespace Drupal\KernelTests\Core\Config;
 use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Config\Schema\ConfigSchemaAlterException;
+use Drupal\Core\Config\Schema\Ignore;
+use Drupal\Core\Config\Schema\Mapping;
+use Drupal\Core\Config\Schema\Undefined;
+use Drupal\Core\TypedData\Plugin\DataType\StringData;
 use Drupal\Core\TypedData\Type\IntegerInterface;
 use Drupal\Core\TypedData\Type\StringInterface;
 use Drupal\KernelTests\KernelTestBase;
@@ -21,26 +25,26 @@ class ConfigSchemaTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'language', 'field', 'image', 'config_test', 'config_schema_test');
+  public static $modules = ['system', 'language', 'field', 'image', 'config_test', 'config_schema_test'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('system', 'image', 'config_schema_test'));
+    $this->installConfig(['system', 'image', 'config_schema_test']);
   }
 
   /**
    * Tests the basic metadata retrieval layer.
    */
-  function testSchemaMapping() {
+  public function testSchemaMapping() {
     // Nonexistent configuration key will have Undefined as metadata.
     $this->assertIdentical(FALSE, \Drupal::service('config.typed')->hasConfigSchema('config_schema_test.no_such_key'));
     $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.no_such_key');
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Undefined';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
+    $expected['class'] = Undefined::class;
     $expected['type'] = 'undefined';
     $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
     $this->assertEqual($definition, $expected, 'Retrieved the right metadata for nonexistent configuration.');
@@ -53,14 +57,14 @@ class ConfigSchemaTest extends KernelTestBase {
     // Configuration file with only some schema.
     $this->assertIdentical(TRUE, \Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'));
     $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema');
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Schema test data';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['class'] = Mapping::class;
     $expected['mapping']['langcode']['type'] = 'string';
     $expected['mapping']['langcode']['label'] = 'Language code';
     $expected['mapping']['_core']['type'] = '_core_config_info';
-    $expected['mapping']['testitem'] = array('label' => 'Test item');
-    $expected['mapping']['testlist'] = array('label' => 'Test list');
+    $expected['mapping']['testitem'] = ['label' => 'Test item'];
+    $expected['mapping']['testlist'] = ['label' => 'Test list'];
     $expected['type'] = 'config_schema_test.someschema';
     $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
     $this->assertEqual($definition, $expected, 'Retrieved the right metadata for configuration with only some schema.');
@@ -68,40 +72,40 @@ class ConfigSchemaTest extends KernelTestBase {
     // Check type detection on elements with undefined types.
     $config = \Drupal::service('config.typed')->get('config_schema_test.someschema');
     $definition = $config->get('testitem')->getDataDefinition()->toArray();
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Test item';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
+    $expected['class'] = Undefined::class;
     $expected['type'] = 'undefined';
     $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
     $this->assertEqual($definition, $expected, 'Automatic type detected for a scalar is undefined.');
     $definition = $config->get('testlist')->getDataDefinition()->toArray();
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Test list';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
+    $expected['class'] = Undefined::class;
     $expected['type'] = 'undefined';
     $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
     $this->assertEqual($definition, $expected, 'Automatic type detected for a list is undefined.');
     $definition = $config->get('testnoschema')->getDataDefinition()->toArray();
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Undefined';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
+    $expected['class'] = Undefined::class;
     $expected['type'] = 'undefined';
     $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
     $this->assertEqual($definition, $expected, 'Automatic type detected for an undefined integer is undefined.');
 
     // Simple case, straight metadata.
     $definition = \Drupal::service('config.typed')->getDefinition('system.maintenance');
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Maintenance mode';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
-    $expected['mapping']['message'] = array(
+    $expected['class'] = Mapping::class;
+    $expected['mapping']['message'] = [
       'label' => 'Message to display when in maintenance mode',
       'type' => 'text',
-    );
-    $expected['mapping']['langcode'] = array(
+    ];
+    $expected['mapping']['langcode'] = [
       'label' => 'Language code',
       'type' => 'string',
-    );
+    ];
     $expected['mapping']['_core']['type'] = '_core_config_info';
     $expected['type'] = 'system.maintenance';
     $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
@@ -109,41 +113,41 @@ class ConfigSchemaTest extends KernelTestBase {
 
     // Mixed schema with ignore elements.
     $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.ignore');
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Ignore test';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['class'] = Mapping::class;
     $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
-    $expected['mapping']['langcode'] = array(
+    $expected['mapping']['langcode'] = [
       'type' => 'string',
       'label' => 'Language code',
-    );
+    ];
     $expected['mapping']['_core']['type'] = '_core_config_info';
-    $expected['mapping']['label'] = array(
+    $expected['mapping']['label'] = [
       'label' => 'Label',
       'type' => 'label',
-    );
-    $expected['mapping']['irrelevant'] = array(
+    ];
+    $expected['mapping']['irrelevant'] = [
       'label' => 'Irrelevant',
       'type' => 'ignore',
-    );
-    $expected['mapping']['indescribable'] = array(
+    ];
+    $expected['mapping']['indescribable'] = [
       'label' => 'Indescribable',
       'type' => 'ignore',
-    );
-    $expected['mapping']['weight'] = array(
+    ];
+    $expected['mapping']['weight'] = [
       'label' => 'Weight',
       'type' => 'integer',
-    );
+    ];
     $expected['type'] = 'config_schema_test.ignore';
 
     $this->assertEqual($definition, $expected);
 
     // The ignore elements themselves.
     $definition = \Drupal::service('config.typed')->get('config_schema_test.ignore')->get('irrelevant')->getDataDefinition()->toArray();
-    $expected = array();
+    $expected = [];
     $expected['type'] = 'ignore';
     $expected['label'] = 'Irrelevant';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Ignore';
+    $expected['class'] = Ignore::class;
     $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
     $this->assertEqual($definition, $expected);
     $definition = \Drupal::service('config.typed')->get('config_schema_test.ignore')->get('indescribable')->getDataDefinition()->toArray();
@@ -152,9 +156,9 @@ class ConfigSchemaTest extends KernelTestBase {
 
     // More complex case, generic type. Metadata for image style.
     $definition = \Drupal::service('config.typed')->getDefinition('image.style.large');
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Image style';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['class'] = Mapping::class;
     $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
     $expected['mapping']['name']['type'] = 'string';
     $expected['mapping']['uuid']['type'] = 'string';
@@ -185,9 +189,9 @@ class ConfigSchemaTest extends KernelTestBase {
     // More complex, type based on a complex one.
     $definition = \Drupal::service('config.typed')->getDefinition('image.effect.image_scale');
     // This should be the schema for image.effect.image_scale.
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Image scale';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['class'] = Mapping::class;
     $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
     $expected['mapping']['width']['type'] = 'integer';
     $expected['mapping']['width']['label'] = 'Width';
@@ -211,10 +215,10 @@ class ConfigSchemaTest extends KernelTestBase {
     $a = \Drupal::config('config_test.dynamic.third_party');
     $test = \Drupal::service('config.typed')->get('config_test.dynamic.third_party')->get('third_party_settings.config_schema_test');
     $definition = $test->getDataDefinition()->toArray();
-    $expected = array();
+    $expected = [];
     $expected['type'] = 'config_test.dynamic.*.third_party.config_schema_test';
     $expected['label'] = 'Mapping';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['class'] = Mapping::class;
     $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
     $expected['mapping'] = [
       'integer' => ['type' => 'integer'],
@@ -225,9 +229,9 @@ class ConfigSchemaTest extends KernelTestBase {
     // More complex, several level deep test.
     $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema.somemodule.section_one.subsection');
     // This should be the schema of config_schema_test.someschema.somemodule.*.*.
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Schema multiple filesystem marker test';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['class'] = Mapping::class;
     $expected['mapping']['langcode']['type'] = 'string';
     $expected['mapping']['langcode']['label'] = 'Language code';
     $expected['mapping']['_core']['type'] = '_core_config_info';
@@ -248,47 +252,47 @@ class ConfigSchemaTest extends KernelTestBase {
   /**
    * Tests metadata retrieval with several levels of %parent indirection.
    */
-  function testSchemaMappingWithParents() {
+  public function testSchemaMappingWithParents() {
     $config_data = \Drupal::service('config.typed')->get('config_schema_test.someschema.with_parents');
 
     // Test fetching parent one level up.
     $entry = $config_data->get('one_level');
     $definition = $entry->get('testitem')->getDataDefinition()->toArray();
-    $expected = array(
+    $expected = [
       'type' => 'config_schema_test.someschema.with_parents.key_1',
       'label' => 'Test item nested one level',
-      'class' => '\Drupal\Core\TypedData\Plugin\DataType\StringData',
+      'class' => StringData::class,
       'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
-    );
+    ];
     $this->assertEqual($definition, $expected);
 
     // Test fetching parent two levels up.
     $entry = $config_data->get('two_levels');
     $definition = $entry->get('wrapper')->get('testitem')->getDataDefinition()->toArray();
-    $expected = array(
+    $expected = [
       'type' => 'config_schema_test.someschema.with_parents.key_2',
       'label' => 'Test item nested two levels',
-      'class' => '\Drupal\Core\TypedData\Plugin\DataType\StringData',
+      'class' => StringData::class,
       'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
-    );
+    ];
     $this->assertEqual($definition, $expected);
 
     // Test fetching parent three levels up.
     $entry = $config_data->get('three_levels');
     $definition = $entry->get('wrapper_1')->get('wrapper_2')->get('testitem')->getDataDefinition()->toArray();
-    $expected = array(
+    $expected = [
       'type' => 'config_schema_test.someschema.with_parents.key_3',
       'label' => 'Test item nested three levels',
-      'class' => '\Drupal\Core\TypedData\Plugin\DataType\StringData',
+      'class' => StringData::class,
       'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
-    );
+    ];
     $this->assertEqual($definition, $expected);
   }
 
   /**
    * Tests metadata applied to configuration objects.
    */
-  function testSchemaData() {
+  public function testSchemaData() {
     // Try a simple property.
     $meta = \Drupal::service('config.typed')->get('system.site');
     $property = $meta->get('page')->get('front');
@@ -324,7 +328,7 @@ class ConfigSchemaTest extends KernelTestBase {
    * Test configuration value data type enforcement using schemas.
    */
   public function testConfigSaveWithSchema() {
-    $untyped_values = array(
+    $untyped_values = [
       'string' => 1,
       'empty_string' => '',
       'null_string' => NULL,
@@ -333,22 +337,22 @@ class ConfigSchemaTest extends KernelTestBase {
       'boolean' => 1,
       // If the config schema doesn't have a type it shouldn't be casted.
       'no_type' => 1,
-      'mapping' => array(
+      'mapping' => [
         'string' => 1
-      ),
+      ],
       'float' => '3.14',
       'null_float' => '',
-      'sequence' => array (1, 0, 1),
-      'sequence_bc' => array(1, 0, 1),
+      'sequence' => [1, 0, 1],
+      'sequence_bc' => [1, 0, 1],
       // Not in schema and therefore should be left untouched.
       'not_present_in_schema' => TRUE,
       // Test a custom type.
       'config_schema_test_integer' => '1',
       'config_schema_test_integer_empty_string' => '',
-    );
+    ];
     $untyped_to_typed = $untyped_values;
 
-    $typed_values = array(
+    $typed_values = [
       'string' => '1',
       'empty_string' => '',
       'null_string' => NULL,
@@ -356,17 +360,17 @@ class ConfigSchemaTest extends KernelTestBase {
       'null_integer' => NULL,
       'boolean' => TRUE,
       'no_type' => 1,
-      'mapping' => array(
+      'mapping' => [
         'string' => '1'
-      ),
+      ],
       'float' => 3.14,
       'null_float' => NULL,
-      'sequence' => array (TRUE, FALSE, TRUE),
-      'sequence_bc' => array(TRUE, FALSE, TRUE),
+      'sequence' => [TRUE, FALSE, TRUE],
+      'sequence_bc' => [TRUE, FALSE, TRUE],
       'not_present_in_schema' => TRUE,
       'config_schema_test_integer' => 1,
       'config_schema_test_integer_empty_string' => NULL,
-    );
+    ];
 
     // Save config which has a schema that enforces types.
     $this->config('config_schema_test.schema_data_types')
@@ -394,12 +398,12 @@ class ConfigSchemaTest extends KernelTestBase {
   /**
    * Tests fallback to a greedy wildcard.
    */
-  function testSchemaFallback() {
+  public function testSchemaFallback() {
     $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.wildcard_fallback.something');
     // This should be the schema of config_schema_test.wildcard_fallback.*.
-    $expected = array();
+    $expected = [];
     $expected['label'] = 'Schema wildcard fallback test';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['class'] = Mapping::class;
     $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
     $expected['mapping']['langcode']['type'] = 'string';
     $expected['mapping']['langcode']['label'] = 'Language code';
@@ -423,7 +427,7 @@ class ConfigSchemaTest extends KernelTestBase {
    *
    * @see \Drupal\Core\Config\TypedConfigManager::getFallbackName()
    */
-  function testColonsInSchemaTypeDetermination() {
+  public function testColonsInSchemaTypeDetermination() {
     $tests = \Drupal::service('config.typed')->get('config_schema_test.plugin_types')->get('tests')->getElements();
     $definition = $tests[0]->getDataDefinition()->toArray();
     $this->assertEqual($definition['type'], 'test.plugin_types.boolean');
@@ -631,6 +635,27 @@ class ConfigSchemaTest extends KernelTestBase {
     $this->assertEqual($definition['type'], 'wrapping.test.double_brackets.*||test.double_brackets.cat.dog');
     $definition = $tests[1]->getDataDefinition()->toArray();
     $this->assertEqual($definition['type'], 'wrapping.test.double_brackets.*||test.double_brackets.turtle.horse');
+
+    $typed_values = [
+      'tests' => [
+        [
+          'id' => 'cat:persion.dog',
+          'foo' => 'cat',
+          'bar' => 'dog',
+          'breed' => 'persion',
+        ],
+      ],
+    ];
+
+    \Drupal::configFactory()->getEditable('wrapping.config_schema_test.other_double_brackets')
+      ->setData($typed_values)
+      ->save();
+    $tests = \Drupal::service('config.typed')->get('wrapping.config_schema_test.other_double_brackets')->get('tests')->getElements();
+    $definition = $tests[0]->getDataDefinition()->toArray();
+    // Check that definition type is a merge of the expected types.
+    $this->assertEqual($definition['type'], 'wrapping.test.other_double_brackets.*||test.double_brackets.cat:*.*');
+    // Check that breed was inherited from parent definition.
+    $this->assertEqual($definition['mapping']['breed'], ['type' => 'string']);
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSnapshotTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSnapshotTest.php
index efac2dd12..62eff04d4 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSnapshotTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSnapshotTest.php
@@ -17,7 +17,7 @@ class ConfigSnapshotTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test', 'system');
+  public static $modules = ['config_test', 'system'];
 
   /**
    * {@inheritdoc}
@@ -33,7 +33,7 @@ class ConfigSnapshotTest extends KernelTestBase {
   /**
    * Tests config snapshot creation and updating.
    */
-  function testSnapshot() {
+  public function testSnapshot() {
     $active = $this->container->get('config.storage');
     $sync = $this->container->get('config.storage.sync');
     $snapshot = $this->container->get('config.storage.snapshot');
@@ -50,7 +50,7 @@ class ConfigSnapshotTest extends KernelTestBase {
     $this->assertFalse($active_snapshot_comparer->createChangelist()->hasChanges());
 
     // Install the default config.
-    $this->installConfig(array('config_test'));
+    $this->installConfig(['config_test']);
     // Although we have imported config this has not affected the snapshot.
     $this->assertTrue($active_snapshot_comparer->reset()->hasChanges());
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php
index a8f9ef5da..f06806cad 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\KernelTests\Core\Config;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\config_test\TestInstallStorage;
 use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
@@ -23,7 +23,7 @@ class DefaultConfigTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'config_test');
+  public static $modules = ['system', 'config_test'];
 
   /**
    * Themes which provide default configuration and need enabling.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
index 15aecaaaf..68a8962e5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
@@ -27,14 +27,14 @@ class SchemaCheckTraitTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test', 'config_schema_test');
+  public static $modules = ['config_test', 'config_schema_test'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('config_test', 'config_schema_test'));
+    $this->installConfig(['config_test', 'config_schema_test']);
     $this->typedConfig = \Drupal::service('config.typed');
   }
 
@@ -53,14 +53,14 @@ class SchemaCheckTraitTest extends KernelTestBase {
 
     // Add a new key, a new array and overwrite boolean with array to test the
     // error messages.
-    $config_data = array('new_key' => 'new_value', 'new_array' => array()) + $config_data;
-    $config_data['boolean'] = array();
+    $config_data = ['new_key' => 'new_value', 'new_array' => []] + $config_data;
+    $config_data['boolean'] = [];
     $ret = $this->checkConfigSchema($this->typedConfig, 'config_test.types', $config_data);
-    $expected = array(
+    $expected = [
       'config_test.types:new_key' => 'missing schema',
       'config_test.types:new_array' => 'missing schema',
       'config_test.types:boolean' => 'non-scalar value but not defined as an array (such as mapping or sequence)',
-    );
+    ];
     $this->assertEqual($ret, $expected);
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/SchemaConfigListenerTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/SchemaConfigListenerTest.php
index f07802127..2674a3c6d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/SchemaConfigListenerTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/SchemaConfigListenerTest.php
@@ -17,7 +17,7 @@ class SchemaConfigListenerTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php
index 163cca711..236647810 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php
@@ -37,7 +37,7 @@ class CachedStorageTest extends ConfigStorageTestBase {
     $this->storage = new CachedStorage($this->fileStorage, \Drupal::service('cache.config'));
     $this->cache = \Drupal::service('cache_factory')->get('config');
     // ::listAll() verifications require other configuration data to exist.
-    $this->storage->write('system.performance', array());
+    $this->storage->write('system.performance', []);
   }
 
   /**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php
index 1863dab2f..54d016417 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php
@@ -33,7 +33,7 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
    *
    * @todo Coverage: Trigger PDOExceptions / Database exceptions.
    */
-  function testCRUD() {
+  public function testCRUD() {
     $name = 'config_test.storage';
 
     // Checking whether a non-existing name exists returns FALSE.
@@ -44,7 +44,7 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
     $this->assertIdentical($data, FALSE);
 
     // Writing data returns TRUE and the data has been written.
-    $data = array('foo' => 'bar');
+    $data = ['foo' => 'bar'];
     $result = $this->storage->write($name, $data);
     $this->assertIdentical($result, TRUE);
 
@@ -86,11 +86,11 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
 
     // Deleting all names with prefix deletes the appropriate data and returns
     // TRUE.
-    $files = array(
+    $files = [
       'config_test.test.biff',
       'config_test.test.bang',
       'config_test.test.pow',
-    );
+    ];
     foreach ($files as $name) {
       $this->storage->write($name, $data);
     }
@@ -98,7 +98,7 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
     $result = $this->storage->deleteAll('config_test.');
     $names = $this->storage->listAll('config_test.');
     $this->assertIdentical($result, TRUE);
-    $this->assertIdentical($names, array());
+    $this->assertIdentical($names, []);
 
     // Test renaming an object that does not exist throws an exception.
     try {
@@ -127,7 +127,7 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
 
     // Write something to the valid storage to prove that the storages do not
     // pollute one another.
-    $data = array('foo' => 'bar');
+    $data = ['foo' => 'bar'];
     $result = $this->storage->write($name, $data);
     $this->assertIdentical($result, TRUE);
 
@@ -150,20 +150,20 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
 
     // Listing on a non-existing storage bin returns an empty array.
     $result = $this->invalidStorage->listAll();
-    $this->assertIdentical($result, array());
+    $this->assertIdentical($result, []);
     // Writing to a non-existing storage bin creates the bin.
-    $this->invalidStorage->write($name, array('foo' => 'bar'));
+    $this->invalidStorage->write($name, ['foo' => 'bar']);
     $result = $this->invalidStorage->read($name);
-    $this->assertIdentical($result, array('foo' => 'bar'));
+    $this->assertIdentical($result, ['foo' => 'bar']);
   }
 
   /**
    * Tests storage writing and reading data preserving data type.
    */
-  function testDataTypes() {
+  public function testDataTypes() {
     $name = 'config_test.types';
-    $data = array(
-      'array' => array(),
+    $data = [
+      'array' => [],
       'boolean' => TRUE,
       'exp' => 1.2e+34,
       'float' => 3.14159,
@@ -172,7 +172,7 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
       'octal' => 0775,
       'string' => 'string',
       'string_int' => '1',
-    );
+    ];
 
     $result = $this->storage->write($name, $data);
     $this->assertIdentical($result, TRUE);
@@ -186,7 +186,7 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
    */
   public function testCollection() {
     $name = 'config_test.storage';
-    $data = array('foo' => 'bar');
+    $data = ['foo' => 'bar'];
     $result = $this->storage->write($name, $data);
     $this->assertIdentical($result, TRUE);
     $this->assertIdentical($data, $this->storage->read($name));
@@ -194,13 +194,13 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
     // Create configuration in a new collection.
     $new_storage = $this->storage->createCollection('collection.sub.new');
     $this->assertFalse($new_storage->exists($name));
-    $this->assertEqual(array(), $new_storage->listAll());
+    $this->assertEqual([], $new_storage->listAll());
     $new_storage->write($name, $data);
     $this->assertIdentical($result, TRUE);
     $this->assertIdentical($data, $new_storage->read($name));
-    $this->assertEqual(array($name), $new_storage->listAll());
+    $this->assertEqual([$name], $new_storage->listAll());
     $this->assertTrue($new_storage->exists($name));
-    $new_data = array('foo' => 'baz');
+    $new_data = ['foo' => 'baz'];
     $new_storage->write($name, $new_data);
     $this->assertIdentical($result, TRUE);
     $this->assertIdentical($new_data, $new_storage->read($name));
@@ -208,11 +208,11 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
     // Create configuration in another collection.
     $another_storage = $this->storage->createCollection('collection.sub.another');
     $this->assertFalse($another_storage->exists($name));
-    $this->assertEqual(array(), $another_storage->listAll());
+    $this->assertEqual([], $another_storage->listAll());
     $another_storage->write($name, $new_data);
     $this->assertIdentical($result, TRUE);
     $this->assertIdentical($new_data, $another_storage->read($name));
-    $this->assertEqual(array($name), $another_storage->listAll());
+    $this->assertEqual([$name], $another_storage->listAll());
     $this->assertTrue($another_storage->exists($name));
 
     // Create configuration in yet another collection.
@@ -226,33 +226,33 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
     $this->assertIdentical($data, $this->storage->read($name));
 
     // Check that the getAllCollectionNames() method works.
-    $this->assertIdentical(array('alternate', 'collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
+    $this->assertIdentical(['alternate', 'collection.sub.another', 'collection.sub.new'], $this->storage->getAllCollectionNames());
 
     // Check that the collections are removed when they are empty.
     $alt_storage->delete($name);
-    $this->assertIdentical(array('collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
+    $this->assertIdentical(['collection.sub.another', 'collection.sub.new'], $this->storage->getAllCollectionNames());
 
     // Create configuration in collection called 'collection'. This ensures that
     // FileStorage's collection storage works regardless of its use of
     // subdirectories.
     $parent_storage = $this->storage->createCollection('collection');
     $this->assertFalse($parent_storage->exists($name));
-    $this->assertEqual(array(), $parent_storage->listAll());
+    $this->assertEqual([], $parent_storage->listAll());
     $parent_storage->write($name, $new_data);
     $this->assertIdentical($result, TRUE);
     $this->assertIdentical($new_data, $parent_storage->read($name));
-    $this->assertEqual(array($name), $parent_storage->listAll());
+    $this->assertEqual([$name], $parent_storage->listAll());
     $this->assertTrue($parent_storage->exists($name));
-    $this->assertIdentical(array('collection', 'collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
+    $this->assertIdentical(['collection', 'collection.sub.another', 'collection.sub.new'], $this->storage->getAllCollectionNames());
     $parent_storage->deleteAll();
-    $this->assertIdentical(array('collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
+    $this->assertIdentical(['collection.sub.another', 'collection.sub.new'], $this->storage->getAllCollectionNames());
 
     // Check that the having an empty collection-less storage does not break
     // anything. Before deleting check that the previous delete did not affect
     // data in another collection.
     $this->assertIdentical($data, $this->storage->read($name));
     $this->storage->delete($name);
-    $this->assertIdentical(array('collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
+    $this->assertIdentical(['collection.sub.another', 'collection.sub.new'], $this->storage->getAllCollectionNames());
   }
 
   abstract protected function read($name);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/DatabaseStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/DatabaseStorageTest.php
index 6f09a829d..0aecc72b8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/DatabaseStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/DatabaseStorageTest.php
@@ -21,20 +21,20 @@ class DatabaseStorageTest extends ConfigStorageTestBase {
     $this->invalidStorage = new DatabaseStorage($this->container->get('database'), 'invalid');
 
     // ::listAll() verifications require other configuration data to exist.
-    $this->storage->write('system.performance', array());
+    $this->storage->write('system.performance', []);
   }
 
   protected function read($name) {
-    $data = db_query('SELECT data FROM {config} WHERE name = :name', array(':name' => $name))->fetchField();
+    $data = db_query('SELECT data FROM {config} WHERE name = :name', [':name' => $name])->fetchField();
     return unserialize($data);
   }
 
   protected function insert($name, $data) {
-    db_insert('config')->fields(array('name' => $name, 'data' => $data))->execute();
+    db_insert('config')->fields(['name' => $name, 'data' => $data])->execute();
   }
 
   protected function update($name, $data) {
-    db_update('config')->fields(array('data' => $data))->condition('name', $name)->execute();
+    db_update('config')->fields(['data' => $data])->condition('name', $name)->execute();
   }
 
   protected function delete($name) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php
index fa10a0974..23bd5ea62 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php
@@ -33,7 +33,7 @@ class FileStorageTest extends ConfigStorageTestBase {
 
     // FileStorage::listAll() requires other configuration data to exist.
     $this->storage->write('system.performance', $this->config('system.performance')->get());
-    $this->storage->write('core.extension', array('module' => array()));
+    $this->storage->write('core.extension', ['module' => []]);
   }
 
   protected function read($name) {
@@ -57,10 +57,10 @@ class FileStorageTest extends ConfigStorageTestBase {
    * Tests the FileStorage::listAll method with a relative and absolute path.
    */
   public function testlistAll() {
-    $expected_files = array(
+    $expected_files = [
       'core.extension',
       'system.performance',
-    );
+    ];
 
     $config_files = $this->storage->listAll();
     $this->assertIdentical($config_files, $expected_files, 'Relative path, two config files found.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/StorageReplaceDataWrapperTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/StorageReplaceDataWrapperTest.php
index 84b4f564c..44ce4958f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/StorageReplaceDataWrapperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/StorageReplaceDataWrapperTest.php
@@ -19,8 +19,8 @@ class StorageReplaceDataWrapperTest extends ConfigStorageTestBase {
     parent::setUp();
     $this->storage = new StorageReplaceDataWrapper($this->container->get('config.storage'));
     // ::listAll() verifications require other configuration data to exist.
-    $this->storage->write('system.performance', array());
-    $this->storage->replaceData('system.performance', array('foo' => 'bar'));
+    $this->storage->write('system.performance', []);
+    $this->storage->replaceData('system.performance', ['foo' => 'bar']);
   }
 
   /**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php
index c5f9e9f4c..e2a6589d7 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php
@@ -13,7 +13,7 @@ class AlterTest extends DatabaseTestBase {
   /**
    * Tests that we can do basic alters.
    */
-  function testSimpleAlter() {
+  public function testSimpleAlter() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
@@ -27,7 +27,7 @@ class AlterTest extends DatabaseTestBase {
   /**
    * Tests that we can alter the joins on a query.
    */
-  function testAlterWithJoin() {
+  public function testAlterWithJoin() {
     $query = db_select('test_task');
     $tid_field = $query->addField('test_task', 'tid');
     $task_field = $query->addField('test_task', 'task');
@@ -51,7 +51,7 @@ class AlterTest extends DatabaseTestBase {
   /**
    * Tests that we can alter a query's conditionals.
    */
-  function testAlterChangeConditional() {
+  public function testAlterChangeConditional() {
     $query = db_select('test_task');
     $tid_field = $query->addField('test_task', 'tid');
     $pid_field = $query->addField('test_task', 'pid');
@@ -76,7 +76,7 @@ class AlterTest extends DatabaseTestBase {
   /**
    * Tests that we can alter the fields of a query.
    */
-  function testAlterChangeFields() {
+  public function testAlterChangeFields() {
     $query = db_select('test');
     $name_field = $query->addField('test', 'name');
     $age_field = $query->addField('test', 'age', 'age');
@@ -91,7 +91,7 @@ class AlterTest extends DatabaseTestBase {
   /**
    * Tests that we can alter expressions in the query.
    */
-  function testAlterExpression() {
+  public function testAlterExpression() {
     $query = db_select('test');
     $name_field = $query->addField('test', 'name');
     $age_field = $query->addExpression("age*2", 'double_age');
@@ -111,7 +111,7 @@ class AlterTest extends DatabaseTestBase {
    *
    * This also tests hook_query_TAG_alter().
    */
-  function testAlterRemoveRange() {
+  public function testAlterRemoveRange() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
@@ -126,7 +126,7 @@ class AlterTest extends DatabaseTestBase {
   /**
    * Tests that we can do basic alters on subqueries.
    */
-  function testSimpleAlterSubquery() {
+  public function testSimpleAlterSubquery() {
     // Create a sub-query with an alter tag.
     $subquery = db_select('test', 'p');
     $subquery->addField('p', 'name');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/BasicSyntaxTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/BasicSyntaxTest.php
index eaf50e50f..53a87b7db 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/BasicSyntaxTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/BasicSyntaxTest.php
@@ -15,63 +15,63 @@ class BasicSyntaxTest extends DatabaseTestBase {
   /**
    * Tests string concatenation.
    */
-  function testConcatLiterals() {
-    $result = db_query('SELECT CONCAT(:a1, CONCAT(:a2, CONCAT(:a3, CONCAT(:a4, :a5))))', array(
+  public function testConcatLiterals() {
+    $result = db_query('SELECT CONCAT(:a1, CONCAT(:a2, CONCAT(:a3, CONCAT(:a4, :a5))))', [
       ':a1' => 'This',
       ':a2' => ' ',
       ':a3' => 'is',
       ':a4' => ' a ',
       ':a5' => 'test.',
-    ));
+    ]);
     $this->assertIdentical($result->fetchField(), 'This is a test.', 'Basic CONCAT works.');
   }
 
   /**
    * Tests string concatenation with field values.
    */
-  function testConcatFields() {
-    $result = db_query('SELECT CONCAT(:a1, CONCAT(name, CONCAT(:a2, CONCAT(age, :a3)))) FROM {test} WHERE age = :age', array(
+  public function testConcatFields() {
+    $result = db_query('SELECT CONCAT(:a1, CONCAT(name, CONCAT(:a2, CONCAT(age, :a3)))) FROM {test} WHERE age = :age', [
       ':a1' => 'The age of ',
       ':a2' => ' is ',
       ':a3' => '.',
       ':age' => 25,
-    ));
+    ]);
     $this->assertIdentical($result->fetchField(), 'The age of John is 25.', 'Field CONCAT works.');
   }
 
   /**
    * Tests string concatenation with separator.
    */
-  function testConcatWsLiterals() {
-    $result = db_query("SELECT CONCAT_WS(', ', :a1, NULL, :a2, :a3, :a4)", array(
+  public function testConcatWsLiterals() {
+    $result = db_query("SELECT CONCAT_WS(', ', :a1, NULL, :a2, :a3, :a4)", [
       ':a1' => 'Hello',
       ':a2' => NULL,
       ':a3' => '',
       ':a4' => 'world.',
-    ));
+    ]);
     $this->assertIdentical($result->fetchField(), 'Hello, , world.');
   }
 
   /**
    * Tests string concatenation with separator, with field values.
    */
-  function testConcatWsFields() {
-    $result = db_query("SELECT CONCAT_WS('-', :a1, name, :a2, age) FROM {test} WHERE age = :age", array(
+  public function testConcatWsFields() {
+    $result = db_query("SELECT CONCAT_WS('-', :a1, name, :a2, age) FROM {test} WHERE age = :age", [
       ':a1' => 'name',
       ':a2' => 'age',
       ':age' => 25,
-    ));
+    ]);
     $this->assertIdentical($result->fetchField(), 'name-John-age-25');
   }
 
   /**
    * Tests escaping of LIKE wildcards.
    */
-  function testLikeEscape() {
+  public function testLikeEscape() {
     db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'Ring_',
-      ))
+      ])
       ->execute();
 
     // Match both "Ringo" and "Ring_".
@@ -93,15 +93,15 @@ class BasicSyntaxTest extends DatabaseTestBase {
   /**
    * Tests a LIKE query containing a backslash.
    */
-  function testLikeBackslash() {
+  public function testLikeBackslash() {
     db_insert('test')
-      ->fields(array('name'))
-      ->values(array(
+      ->fields(['name'])
+      ->values([
         'name' => 'abcde\f',
-      ))
-      ->values(array(
+      ])
+      ->values([
         'name' => 'abc%\_',
-      ))
+      ])
       ->execute();
 
     // Match both rows using a LIKE expression with two wildcards and a verbatim
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/CaseSensitivityTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/CaseSensitivityTest.php
index 35fdb4d91..c3e766fab 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/CaseSensitivityTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/CaseSensitivityTest.php
@@ -11,20 +11,20 @@ class CaseSensitivityTest extends DatabaseTestBase {
   /**
    * Tests BINARY collation in MySQL.
    */
-  function testCaseSensitiveInsert() {
+  public function testCaseSensitiveInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
 
     db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'john', // <- A record already exists with name 'John'.
         'age' => 2,
         'job' => 'Baby',
-      ))
+      ])
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
     $this->assertIdentical($num_records_before + 1, (int) $num_records_after, 'Record inserts correctly.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'john'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'john'])->fetchField();
     $this->assertIdentical($saved_age, '2', 'Can retrieve after inserting.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
index 0cc3627fb..e95afe038 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
@@ -15,7 +15,7 @@ class ConnectionTest extends DatabaseTestBase {
   /**
    * Tests that connections return appropriate connection objects.
    */
-  function testConnectionRouting() {
+  public function testConnectionRouting() {
     // Clone the primary credentials to a replica connection.
     // Note this will result in two independent connection objects that happen
     // to point to the same place.
@@ -49,7 +49,7 @@ class ConnectionTest extends DatabaseTestBase {
   /**
    * Tests that connections return appropriate connection objects.
    */
-  function testConnectionRoutingOverride() {
+  public function testConnectionRoutingOverride() {
     // Clone the primary credentials to a replica connection.
     // Note this will result in two independent connection objects that happen
     // to point to the same place.
@@ -67,7 +67,7 @@ class ConnectionTest extends DatabaseTestBase {
   /**
    * Tests the closing of a database connection.
    */
-  function testConnectionClosing() {
+  public function testConnectionClosing() {
     // Open the default target so we have an object to compare.
     $db1 = Database::getConnection('default', 'default');
 
@@ -82,7 +82,7 @@ class ConnectionTest extends DatabaseTestBase {
   /**
    * Tests the connection options of the active database.
    */
-  function testConnectionOptions() {
+  public function testConnectionOptions() {
     $connection_info = Database::getConnectionInfo('default');
 
     // Be sure we're connected to the default database.
@@ -168,9 +168,9 @@ class ConnectionTest extends DatabaseTestBase {
     $stmt->execute();
     foreach ($stmt->fetchAllAssoc('word') as $word => $row) {
       $expected = '"' . $word . '"';
-      $this->assertIdentical($db->escapeTable($word), $expected, format_string('The reserved word %word was correctly escaped when used as a table name.', array('%word' => $word)));
-      $this->assertIdentical($db->escapeField($word), $expected, format_string('The reserved word %word was correctly escaped when used as a column name.', array('%word' => $word)));
-      $this->assertIdentical($db->escapeAlias($word), $expected, format_string('The reserved word %word was correctly escaped when used as an alias.', array('%word' => $word)));
+      $this->assertIdentical($db->escapeTable($word), $expected, format_string('The reserved word %word was correctly escaped when used as a table name.', ['%word' => $word]));
+      $this->assertIdentical($db->escapeField($word), $expected, format_string('The reserved word %word was correctly escaped when used as a column name.', ['%word' => $word]));
+      $this->assertIdentical($db->escapeAlias($word), $expected, format_string('The reserved word %word was correctly escaped when used as an alias.', ['%word' => $word]));
     }
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php
index e315f9651..6edcef821 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php
@@ -75,7 +75,7 @@ class ConnectionUnitTest extends KernelTestBase {
    */
   protected function assertConnection($id) {
     $list = $this->monitor->query('SHOW PROCESSLIST')->fetchAllKeyed(0, 0);
-    return $this->assertTrue(isset($list[$id]), format_string('Connection ID @id found.', array('@id' => $id)));
+    return $this->assertTrue(isset($list[$id]), format_string('Connection ID @id found.', ['@id' => $id]));
   }
 
   /**
@@ -86,7 +86,7 @@ class ConnectionUnitTest extends KernelTestBase {
    */
   protected function assertNoConnection($id) {
     $list = $this->monitor->query('SHOW PROCESSLIST')->fetchAllKeyed(0, 0);
-    return $this->assertFalse(isset($list[$id]), format_string('Connection ID @id not found.', array('@id' => $id)));
+    return $this->assertFalse(isset($list[$id]), format_string('Connection ID @id not found.', ['@id' => $id]));
   }
 
   /**
@@ -94,7 +94,7 @@ class ConnectionUnitTest extends KernelTestBase {
    *
    * @todo getConnectionID() executes a query.
    */
-  function testOpenClose() {
+  public function testOpenClose() {
     if ($this->skipTest) {
       return;
     }
@@ -118,7 +118,7 @@ class ConnectionUnitTest extends KernelTestBase {
   /**
    * Tests Database::closeConnection() with a query.
    */
-  function testOpenQueryClose() {
+  public function testOpenQueryClose() {
     if ($this->skipTest) {
       return;
     }
@@ -145,7 +145,7 @@ class ConnectionUnitTest extends KernelTestBase {
   /**
    * Tests Database::closeConnection() with a query and custom prefetch method.
    */
-  function testOpenQueryPrefetchClose() {
+  public function testOpenQueryPrefetchClose() {
     if ($this->skipTest) {
       return;
     }
@@ -172,7 +172,7 @@ class ConnectionUnitTest extends KernelTestBase {
   /**
    * Tests Database::closeConnection() with a select query.
    */
-  function testOpenSelectQueryClose() {
+  public function testOpenSelectQueryClose() {
     if ($this->skipTest) {
       return;
     }
@@ -186,18 +186,18 @@ class ConnectionUnitTest extends KernelTestBase {
 
     // Create a table.
     $name = 'foo';
-    Database::getConnection($this->target, $this->key)->schema()->createTable($name, array(
-      'fields' => array(
-        'name' => array(
+    Database::getConnection($this->target, $this->key)->schema()->createTable($name, [
+      'fields' => [
+        'name' => [
           'type' => 'varchar',
           'length' => 255,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
     // Execute a query.
     Database::getConnection($this->target, $this->key)->select('foo', 'f')
-      ->fields('f', array('name'))
+      ->fields('f', ['name'])
       ->execute()
       ->fetchAll();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
index f8c8c3dca..6fcfaa44a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
@@ -12,11 +12,11 @@ use Drupal\KernelTests\KernelTestBase;
  */
 abstract class DatabaseTestBase extends KernelTestBase {
 
-  public static $modules = array('database_test');
+  public static $modules = ['database_test'];
 
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('database_test', array(
+    $this->installSchema('database_test', [
       'test',
       'test_people',
       'test_people_copy',
@@ -27,120 +27,120 @@ abstract class DatabaseTestBase extends KernelTestBase {
       'test_serialized',
       'test_special_columns',
       'TEST_UPPERCASE',
-    ));
+    ]);
     self::addSampleData();
   }
 
   /**
    * Sets up tables for NULL handling.
    */
-  function ensureSampleDataNull() {
+  public function ensureSampleDataNull() {
     db_insert('test_null')
-      ->fields(array('name', 'age'))
-      ->values(array(
+      ->fields(['name', 'age'])
+      ->values([
       'name' => 'Kermit',
       'age' => 25,
-    ))
-      ->values(array(
+    ])
+      ->values([
       'name' => 'Fozzie',
       'age' => NULL,
-    ))
-      ->values(array(
+    ])
+      ->values([
       'name' => 'Gonzo',
       'age' => 27,
-    ))
+    ])
       ->execute();
   }
 
   /**
    * Sets up our sample data.
    */
-  static function addSampleData() {
+  public static function addSampleData() {
     // We need the IDs, so we can't use a multi-insert here.
     $john = db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'John',
         'age' => 25,
         'job' => 'Singer',
-      ))
+      ])
       ->execute();
 
     $george = db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'George',
         'age' => 27,
         'job' => 'Singer',
-      ))
+      ])
       ->execute();
 
     db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'Ringo',
         'age' => 28,
         'job' => 'Drummer',
-      ))
+      ])
       ->execute();
 
     $paul = db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'Paul',
         'age' => 26,
         'job' => 'Songwriter',
-      ))
+      ])
       ->execute();
 
     db_insert('test_people')
-      ->fields(array(
+      ->fields([
         'name' => 'Meredith',
         'age' => 30,
         'job' => 'Speaker',
-      ))
+      ])
       ->execute();
 
     db_insert('test_task')
-      ->fields(array('pid', 'task', 'priority'))
-      ->values(array(
+      ->fields(['pid', 'task', 'priority'])
+      ->values([
         'pid' => $john,
         'task' => 'eat',
         'priority' => 3,
-      ))
-      ->values(array(
+      ])
+      ->values([
         'pid' => $john,
         'task' => 'sleep',
         'priority' => 4,
-      ))
-      ->values(array(
+      ])
+      ->values([
         'pid' => $john,
         'task' => 'code',
         'priority' => 1,
-      ))
-      ->values(array(
+      ])
+      ->values([
         'pid' => $george,
         'task' => 'sing',
         'priority' => 2,
-      ))
-      ->values(array(
+      ])
+      ->values([
         'pid' => $george,
         'task' => 'sleep',
         'priority' => 2,
-      ))
-      ->values(array(
+      ])
+      ->values([
         'pid' => $paul,
         'task' => 'found new band',
         'priority' => 1,
-      ))
-      ->values(array(
+      ])
+      ->values([
         'pid' => $paul,
         'task' => 'perform at superbowl',
         'priority' => 3,
-      ))
+      ])
       ->execute();
 
     db_insert('test_special_columns')
-      ->fields(array(
+      ->fields([
         'id' => 1,
         'offset' => 'Offset value 1',
-      ))
+      ])
       ->execute();
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php
index 1545dd9dd..8d736613c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php
@@ -20,13 +20,13 @@ class DeleteTruncateTest extends DatabaseTestBase {
   /**
    * Confirms that we can use a subselect in a delete successfully.
    */
-  function testSubselectDelete() {
+  public function testSubselectDelete() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_task}')->fetchField();
     $pid_to_delete = db_query("SELECT * FROM {test_task} WHERE task = 'sleep'")->fetchField();
 
     $subquery = db_select('test', 't')
-      ->fields('t', array('id'))
-      ->condition('t.id', array($pid_to_delete), 'IN');
+      ->fields('t', ['id'])
+      ->condition('t.id', [$pid_to_delete], 'IN');
     $delete = db_delete('test_task')
       ->condition('task', 'sleep')
       ->condition('pid', $subquery, 'IN');
@@ -41,7 +41,7 @@ class DeleteTruncateTest extends DatabaseTestBase {
   /**
    * Confirms that we can delete a single record successfully.
    */
-  function testSimpleDelete() {
+  public function testSimpleDelete() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
 
     $num_deleted = db_delete('test')
@@ -56,7 +56,7 @@ class DeleteTruncateTest extends DatabaseTestBase {
   /**
    * Confirms that we can truncate a whole table successfully.
    */
-  function testTruncate() {
+  public function testTruncate() {
     $num_records_before = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
     $this->assertTrue($num_records_before > 0, 'The table is not empty.');
 
@@ -69,7 +69,7 @@ class DeleteTruncateTest extends DatabaseTestBase {
   /**
    * Confirms that we can delete a single special column name record successfully.
    */
-  function testSpecialColumnDelete() {
+  public function testSpecialColumnDelete() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_special_columns}')->fetchField();
 
     $num_deleted = db_delete('test_special_columns')
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php
index e4f4d6704..e55590e7e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php
@@ -18,9 +18,9 @@ class FetchTest extends DatabaseTestBase {
   /**
    * Confirms that we can fetch a record properly in default object mode.
    */
-  function testQueryFetchDefault() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25));
+  public function testQueryFetchDefault() {
+    $records = [];
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', [':age' => 25]);
     $this->assertTrue($result instanceof StatementInterface, 'Result set is a Drupal statement object.');
     foreach ($result as $record) {
       $records[] = $record;
@@ -34,9 +34,9 @@ class FetchTest extends DatabaseTestBase {
   /**
    * Confirms that we can fetch a record to an object explicitly.
    */
-  function testQueryFetchObject() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_OBJ));
+  public function testQueryFetchObject() {
+    $records = [];
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', [':age' => 25], ['fetch' => \PDO::FETCH_OBJ]);
     foreach ($result as $record) {
       $records[] = $record;
       $this->assertTrue(is_object($record), 'Record is an object.');
@@ -49,9 +49,9 @@ class FetchTest extends DatabaseTestBase {
   /**
    * Confirms that we can fetch a record to an associative array explicitly.
    */
-  function testQueryFetchArray() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_ASSOC));
+  public function testQueryFetchArray() {
+    $records = [];
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', [':age' => 25], ['fetch' => \PDO::FETCH_ASSOC]);
     foreach ($result as $record) {
       $records[] = $record;
       if ($this->assertTrue(is_array($record), 'Record is an array.')) {
@@ -67,9 +67,9 @@ class FetchTest extends DatabaseTestBase {
    *
    * @see \Drupal\system\Tests\Database\FakeRecord
    */
-  function testQueryFetchClass() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => 'Drupal\system\Tests\Database\FakeRecord'));
+  public function testQueryFetchClass() {
+    $records = [];
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', [':age' => 25], ['fetch' => 'Drupal\system\Tests\Database\FakeRecord']);
     foreach ($result as $record) {
       $records[] = $record;
       if ($this->assertTrue($record instanceof FakeRecord, 'Record is an object of class FakeRecord.')) {
@@ -83,9 +83,9 @@ class FetchTest extends DatabaseTestBase {
   /**
    * Confirms that we can fetch a record into an indexed array explicitly.
    */
-  function testQueryFetchNum() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_NUM));
+  public function testQueryFetchNum() {
+    $records = [];
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', [':age' => 25], ['fetch' => \PDO::FETCH_NUM]);
     foreach ($result as $record) {
       $records[] = $record;
       if ($this->assertTrue(is_array($record), 'Record is an array.')) {
@@ -99,9 +99,9 @@ class FetchTest extends DatabaseTestBase {
   /**
    * Confirms that we can fetch a record into a doubly-keyed array explicitly.
    */
-  function testQueryFetchBoth() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_BOTH));
+  public function testQueryFetchBoth() {
+    $records = [];
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', [':age' => 25], ['fetch' => \PDO::FETCH_BOTH]);
     foreach ($result as $record) {
       $records[] = $record;
       if ($this->assertTrue(is_array($record), 'Record is an array.')) {
@@ -129,12 +129,12 @@ class FetchTest extends DatabaseTestBase {
   /**
    * Confirms that we can fetch an entire column of a result set at once.
    */
-  function testQueryFetchCol() {
-    $result = db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25));
+  public function testQueryFetchCol() {
+    $result = db_query('SELECT name FROM {test} WHERE age > :age', [':age' => 25]);
     $column = $result->fetchCol();
     $this->assertIdentical(count($column), 3, 'fetchCol() returns the right number of records.');
 
-    $result = db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25));
+    $result = db_query('SELECT name FROM {test} WHERE age > :age', [':age' => 25]);
     $i = 0;
     foreach ($result as $record) {
       $this->assertIdentical($record->name, $column[$i++], 'Column matches direct access.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php
index 6e0363aeb..5b6c03e92 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php
@@ -14,20 +14,20 @@ class InsertDefaultsTest extends DatabaseTestBase {
   /**
    * Tests that we can run a query that uses default values for everything.
    */
-  function testDefaultInsert() {
-    $query = db_insert('test')->useDefaults(array('job'));
+  public function testDefaultInsert() {
+    $query = db_insert('test')->useDefaults(['job']);
     $id = $query->execute();
 
     $schema = drupal_get_module_schema('database_test', 'test');
 
-    $job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
+    $job = db_query('SELECT job FROM {test} WHERE id = :id', [':id' => $id])->fetchField();
     $this->assertEqual($job, $schema['fields']['job']['default'], 'Default field value is set.');
   }
 
   /**
    * Tests that no action will be preformed if no fields are specified.
    */
-  function testDefaultEmptyInsert() {
+  public function testDefaultEmptyInsert() {
     $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
 
     try {
@@ -46,15 +46,15 @@ class InsertDefaultsTest extends DatabaseTestBase {
   /**
    * Tests that we can insert fields with values and defaults in the same query.
    */
-  function testDefaultInsertWithFields() {
+  public function testDefaultInsertWithFields() {
     $query = db_insert('test')
-      ->fields(array('name' => 'Bob'))
-      ->useDefaults(array('job'));
+      ->fields(['name' => 'Bob'])
+      ->useDefaults(['job']);
     $id = $query->execute();
 
     $schema = drupal_get_module_schema('database_test', 'test');
 
-    $job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
+    $job = db_query('SELECT job FROM {test} WHERE id = :id', [':id' => $id])->fetchField();
     $this->assertEqual($job, $schema['fields']['job']['default'], 'Default field value is set.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/InsertLobTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/InsertLobTest.php
index cb41dc039..e7a3107a8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/InsertLobTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/InsertLobTest.php
@@ -12,27 +12,27 @@ class InsertLobTest extends DatabaseTestBase {
   /**
    * Tests that we can insert a single blob field successfully.
    */
-  function testInsertOneBlob() {
+  public function testInsertOneBlob() {
     $data = "This is\000a test.";
     $this->assertTrue(strlen($data) === 15, 'Test data contains a NULL.');
     $id = db_insert('test_one_blob')
-      ->fields(array('blob1' => $data))
+      ->fields(['blob1' => $data])
       ->execute();
-    $r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', array(':id' => $id))->fetchAssoc();
-    $this->assertTrue($r['blob1'] === $data, format_string('Can insert a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
+    $r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', [':id' => $id])->fetchAssoc();
+    $this->assertTrue($r['blob1'] === $data, format_string('Can insert a blob: id @id, @data.', ['@id' => $id, '@data' => serialize($r)]));
   }
 
   /**
    * Tests that we can insert multiple blob fields in the same query.
    */
-  function testInsertMultipleBlob() {
+  public function testInsertMultipleBlob() {
     $id = db_insert('test_two_blobs')
-      ->fields(array(
+      ->fields([
         'blob1' => 'This is',
         'blob2' => 'a test',
-      ))
+      ])
       ->execute();
-    $r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', array(':id' => $id))->fetchAssoc();
+    $r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', [':id' => $id])->fetchAssoc();
     $this->assertTrue($r['blob1'] === 'This is' && $r['blob2'] === 'a test', 'Can insert multiple blobs per row.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/InsertTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/InsertTest.php
index d703f9d31..1c2c21df8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/InsertTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/InsertTest.php
@@ -12,14 +12,14 @@ class InsertTest extends DatabaseTestBase {
   /**
    * Tests very basic insert functionality.
    */
-  function testSimpleInsert() {
+  public function testSimpleInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
 
     $query = db_insert('test');
-    $query->fields(array(
+    $query->fields([
       'name' => 'Yoko',
       'age' => '29',
-    ));
+    ]);
 
     // Check how many records are queued for insertion.
     $this->assertIdentical($query->count(), 1, 'One record is queued for insertion.');
@@ -27,34 +27,34 @@ class InsertTest extends DatabaseTestBase {
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
     $this->assertIdentical($num_records_before + 1, (int) $num_records_after, 'Record inserts correctly.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Yoko'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Yoko'])->fetchField();
     $this->assertIdentical($saved_age, '29', 'Can retrieve after inserting.');
   }
 
   /**
    * Tests that we can insert multiple records in one query object.
    */
-  function testMultiInsert() {
+  public function testMultiInsert() {
     $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
 
     $query = db_insert('test');
-    $query->fields(array(
+    $query->fields([
       'name' => 'Larry',
       'age' => '30',
-    ));
+    ]);
 
     // We should be able to specify values in any order if named.
-    $query->values(array(
+    $query->values([
       'age' => '31',
       'name' => 'Curly',
-    ));
+    ]);
 
     // Check how many records are queued for insertion.
     $this->assertIdentical($query->count(), 2, 'Two records are queued for insertion.');
 
     // We should be able to say "use the field order".
     // This is not the recommended mechanism for most cases, but it should work.
-    $query->values(array('Moe', '32'));
+    $query->values(['Moe', '32']);
 
     // Check how many records are queued for insertion.
     $this->assertIdentical($query->count(), 3, 'Three records are queued for insertion.');
@@ -62,41 +62,41 @@ class InsertTest extends DatabaseTestBase {
 
     $num_records_after = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
     $this->assertIdentical($num_records_before + 3, $num_records_after, 'Record inserts correctly.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Larry'])->fetchField();
     $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Curly'])->fetchField();
     $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Moe'])->fetchField();
     $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
   }
 
   /**
    * Tests that an insert object can be reused with new data after it executes.
    */
-  function testRepeatedInsert() {
+  public function testRepeatedInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
 
     $query = db_insert('test');
 
-    $query->fields(array(
+    $query->fields([
       'name' => 'Larry',
       'age' => '30',
-    ));
+    ]);
     // Check how many records are queued for insertion.
     $this->assertIdentical($query->count(), 1, 'One record is queued for insertion.');
     $query->execute();  // This should run the insert, but leave the fields intact.
 
     // We should be able to specify values in any order if named.
-    $query->values(array(
+    $query->values([
       'age' => '31',
       'name' => 'Curly',
-    ));
+    ]);
     // Check how many records are queued for insertion.
     $this->assertIdentical($query->count(), 1, 'One record is queued for insertion.');
     $query->execute();
 
     // We should be able to say "use the field order".
-    $query->values(array('Moe', '32'));
+    $query->values(['Moe', '32']);
 
     // Check how many records are queued for insertion.
     $this->assertIdentical($query->count(), 1, 'One record is queued for insertion.');
@@ -104,43 +104,43 @@ class InsertTest extends DatabaseTestBase {
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
     $this->assertIdentical((int) $num_records_before + 3, (int) $num_records_after, 'Record inserts correctly.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Larry'])->fetchField();
     $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Curly'])->fetchField();
     $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Moe'])->fetchField();
     $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
   }
 
   /**
    * Tests that we can specify fields without values and specify values later.
    */
-  function testInsertFieldOnlyDefinition() {
+  public function testInsertFieldOnlyDefinition() {
     // This is useful for importers, when we want to create a query and define
     // its fields once, then loop over a multi-insert execution.
     db_insert('test')
-      ->fields(array('name', 'age'))
-      ->values(array('Larry', '30'))
-      ->values(array('Curly', '31'))
-      ->values(array('Moe', '32'))
+      ->fields(['name', 'age'])
+      ->values(['Larry', '30'])
+      ->values(['Curly', '31'])
+      ->values(['Moe', '32'])
       ->execute();
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Larry'])->fetchField();
     $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Curly'])->fetchField();
     $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Moe'])->fetchField();
     $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
   }
 
   /**
    * Tests that inserts return the proper auto-increment ID.
    */
-  function testInsertLastInsertID() {
+  public function testInsertLastInsertID() {
     $id = db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'Larry',
         'age' => '30',
-      ))
+      ])
       ->execute();
 
     $this->assertIdentical($id, '5', 'Auto-increment ID returned successfully.');
@@ -149,14 +149,14 @@ class InsertTest extends DatabaseTestBase {
   /**
    * Tests that the INSERT INTO ... SELECT (fields) ... syntax works.
    */
-  function testInsertSelectFields() {
+  public function testInsertSelectFields() {
     $query = db_select('test_people', 'tp');
     // The query builder will always append expressions after fields.
     // Add the expression first to test that the insert fields are correctly
     // re-ordered.
     $query->addExpression('tp.age', 'age');
     $query
-      ->fields('tp', array('name', 'job'))
+      ->fields('tp', ['name', 'job'])
       ->condition('tp.name', 'Meredith');
 
     // The resulting query should be equivalent to:
@@ -168,14 +168,14 @@ class InsertTest extends DatabaseTestBase {
       ->from($query)
       ->execute();
 
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Meredith'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Meredith'])->fetchField();
     $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
   }
 
   /**
    * Tests that the INSERT INTO ... SELECT * ... syntax works.
    */
-  function testInsertSelectAll() {
+  public function testInsertSelectAll() {
     $query = db_select('test_people', 'tp')
       ->fields('tp')
       ->condition('tp.name', 'Meredith');
@@ -189,21 +189,21 @@ class InsertTest extends DatabaseTestBase {
       ->from($query)
       ->execute();
 
-    $saved_age = db_query('SELECT age FROM {test_people_copy} WHERE name = :name', array(':name' => 'Meredith'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test_people_copy} WHERE name = :name', [':name' => 'Meredith'])->fetchField();
     $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
   }
 
   /**
    * Tests that we can INSERT INTO a special named column.
    */
-  function testSpecialColumnInsert() {
+  public function testSpecialColumnInsert() {
     $id = db_insert('test_special_columns')
-      ->fields(array(
+      ->fields([
         'id' => 2,
         'offset' => 'Offset value 2',
-      ))
+      ])
       ->execute();
-    $saved_value = db_query('SELECT "offset" FROM {test_special_columns} WHERE id = :id', array(':id' => 2))->fetchField();
+    $saved_value = db_query('SELECT "offset" FROM {test_special_columns} WHERE id = :id', [':id' => 2])->fetchField();
     $this->assertIdentical($saved_value, 'Offset value 2', 'Can retrieve special column name value after inserting.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/InvalidDataTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/InvalidDataTest.php
index 774a20b8b..7b08b4047 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/InvalidDataTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/InvalidDataTest.php
@@ -14,31 +14,31 @@ class InvalidDataTest extends DatabaseTestBase {
   /**
    * Tests aborting of traditional SQL database systems with invalid data.
    */
-  function testInsertDuplicateData() {
+  public function testInsertDuplicateData() {
     // Try to insert multiple records where at least one has bad data.
     try {
       db_insert('test')
-        ->fields(array('name', 'age', 'job'))
-        ->values(array(
+        ->fields(['name', 'age', 'job'])
+        ->values([
           'name' => 'Elvis',
           'age' => 63,
           'job' => 'Singer',
-        ))->values(array(
+        ])->values([
           'name' => 'John', // <-- Duplicate value on unique field.
           'age' => 17,
           'job' => 'Consultant',
-        ))
-        ->values(array(
+        ])
+        ->values([
           'name' => 'Frank',
           'age' => 75,
           'job' => 'Singer',
-        ))
+        ])
         ->execute();
       $this->fail('Insert succeeded when it should not have.');
     }
     catch (IntegrityConstraintViolationException $e) {
       // Check if the first record was inserted.
-      $name = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 63))->fetchField();
+      $name = db_query('SELECT name FROM {test} WHERE age = :age', [':age' => 63])->fetchField();
 
       if ($name == 'Elvis') {
         if (!Database::getConnection()->supportsTransactions()) {
@@ -58,8 +58,8 @@ class InvalidDataTest extends DatabaseTestBase {
 
       // Ensure the other values were not inserted.
       $record = db_select('test')
-        ->fields('test', array('name', 'age'))
-        ->condition('age', array(17, 75), 'IN')
+        ->fields('test', ['name', 'age'])
+        ->condition('age', [17, 75], 'IN')
         ->execute()->fetchObject();
 
       $this->assertFalse($record, 'The rest of the insert aborted as expected.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
index 4b24ebefb..a93d1fc80 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
@@ -16,7 +16,7 @@ class LargeQueryTest extends DatabaseTestBase {
   /**
    * Tests truncation of messages when max_allowed_packet exception occurs.
    */
-  function testMaxAllowedPacketQueryTruncating() {
+  public function testMaxAllowedPacketQueryTruncating() {
     // This test only makes sense if we are running on a MySQL database.
     // Test if we are.
     $database = Database::getConnectionInfo('default');
@@ -29,7 +29,7 @@ class LargeQueryTest extends DatabaseTestBase {
       if (Environment::checkMemoryLimit($max_allowed_packet + (16 * 1024 * 1024))) {
         $long_name = str_repeat('a', $max_allowed_packet + 1);
         try {
-          db_query('SELECT name FROM {test} WHERE name = :name', array(':name' => $long_name));
+          db_query('SELECT name FROM {test} WHERE name = :name', [':name' => $long_name]);
           $this->fail("An exception should be thrown for queries larger than 'max_allowed_packet'");
         }
         catch (DatabaseException $e) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
index c354c8292..0216d3ed5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
@@ -14,14 +14,14 @@ class LoggingTest extends DatabaseTestBase {
   /**
    * Tests that we can log the existence of a query.
    */
-  function testEnableLogging() {
+  public function testEnableLogging() {
     Database::startLog('testing');
 
-    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchCol();
+    db_query('SELECT name FROM {test} WHERE age > :age', [':age' => 25])->fetchCol();
+    db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'])->fetchCol();
 
     // Trigger a call that does not have file in the backtrace.
-    call_user_func_array('db_query', array('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo')))->fetchCol();
+    call_user_func_array('db_query', ['SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo']])->fetchCol();
 
     $queries = Database::getLog('testing', 'default');
 
@@ -35,14 +35,14 @@ class LoggingTest extends DatabaseTestBase {
   /**
    * Tests that we can run two logs in parallel.
    */
-  function testEnableMultiLogging() {
+  public function testEnableMultiLogging() {
     Database::startLog('testing1');
 
-    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
+    db_query('SELECT name FROM {test} WHERE age > :age', [':age' => 25])->fetchCol();
 
     Database::startLog('testing2');
 
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchCol();
+    db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'])->fetchCol();
 
     $queries1 = Database::getLog('testing1');
     $queries2 = Database::getLog('testing2');
@@ -54,7 +54,7 @@ class LoggingTest extends DatabaseTestBase {
   /**
    * Tests logging queries against multiple targets on the same connection.
    */
-  function testEnableTargetLogging() {
+  public function testEnableTargetLogging() {
     // Clone the primary credentials to a replica connection and to another fake
     // connection.
     $connection_info = Database::getConnectionInfo('default');
@@ -62,9 +62,9 @@ class LoggingTest extends DatabaseTestBase {
 
     Database::startLog('testing1');
 
-    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
+    db_query('SELECT name FROM {test} WHERE age > :age', [':age' => 25])->fetchCol();
 
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'replica'));//->fetchCol();
+    db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'], ['target' => 'replica']);//->fetchCol();
 
     $queries1 = Database::getLog('testing1');
 
@@ -80,17 +80,17 @@ class LoggingTest extends DatabaseTestBase {
    * a fake target so the query should fall back to running on the default
    * target.
    */
-  function testEnableTargetLoggingNoTarget() {
+  public function testEnableTargetLoggingNoTarget() {
     Database::startLog('testing1');
 
-    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
+    db_query('SELECT name FROM {test} WHERE age > :age', [':age' => 25])->fetchCol();
 
     // We use "fake" here as a target because any non-existent target will do.
     // However, because all of the tests in this class share a single page
     // request there is likely to be a target of "replica" from one of the other
     // unit tests, so we use a target here that we know with absolute certainty
     // does not exist.
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'fake'))->fetchCol();
+    db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'], ['target' => 'fake'])->fetchCol();
 
     $queries1 = Database::getLog('testing1');
 
@@ -102,7 +102,7 @@ class LoggingTest extends DatabaseTestBase {
   /**
    * Tests that we can log queries separately on different connections.
    */
-  function testEnableMultiConnectionLogging() {
+  public function testEnableMultiConnectionLogging() {
     // Clone the primary credentials to a fake connection.
     // That both connections point to the same physical database is irrelevant.
     $connection_info = Database::getConnectionInfo('default');
@@ -111,11 +111,11 @@ class LoggingTest extends DatabaseTestBase {
     Database::startLog('testing1');
     Database::startLog('testing1', 'test2');
 
-    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
+    db_query('SELECT name FROM {test} WHERE age > :age', [':age' => 25])->fetchCol();
 
     $old_key = db_set_active('test2');
 
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'replica'))->fetchCol();
+    db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'], ['target' => 'replica'])->fetchCol();
 
     db_set_active($old_key);
 
@@ -129,7 +129,7 @@ class LoggingTest extends DatabaseTestBase {
   /**
    * Tests that getLog with a wrong key return an empty array.
    */
-  function testGetLoggingWrongKey() {
+  public function testGetLoggingWrongKey() {
     $result = Database::getLog('wrong');
 
     $this->assertEqual($result, [], 'The function getLog with a wrong key returns an empty array.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/MergeTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/MergeTest.php
index 34b81d0f2..9a5688c5d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/MergeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/MergeTest.php
@@ -15,15 +15,15 @@ class MergeTest extends DatabaseTestBase {
   /**
    * Confirms that we can merge-insert a record successfully.
    */
-  function testMergeInsert() {
+  public function testMergeInsert() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
 
     $result = db_merge('test_people')
       ->key('job', 'Presenter')
-      ->fields(array(
+      ->fields([
         'age' => 31,
         'name' => 'Tiffany',
-      ))
+      ])
       ->execute();
 
     $this->assertEqual($result, Merge::STATUS_INSERT, 'Insert status returned.');
@@ -31,7 +31,7 @@ class MergeTest extends DatabaseTestBase {
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
     $this->assertEqual($num_records_before + 1, $num_records_after, 'Merge inserted properly.');
 
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', [':job' => 'Presenter'])->fetch();
     $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
     $this->assertEqual($person->age, 31, 'Age set correctly.');
     $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
@@ -40,15 +40,15 @@ class MergeTest extends DatabaseTestBase {
   /**
    * Confirms that we can merge-update a record successfully.
    */
-  function testMergeUpdate() {
+  public function testMergeUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
 
     $result = db_merge('test_people')
       ->key('job', 'Speaker')
-      ->fields(array(
+      ->fields([
         'age' => 31,
         'name' => 'Tiffany',
-      ))
+      ])
       ->execute();
 
     $this->assertEqual($result, Merge::STATUS_UPDATE, 'Update status returned.');
@@ -56,7 +56,7 @@ class MergeTest extends DatabaseTestBase {
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
     $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
 
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', [':job' => 'Speaker'])->fetch();
     $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
     $this->assertEqual($person->age, 31, 'Age set correctly.');
     $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
@@ -68,19 +68,19 @@ class MergeTest extends DatabaseTestBase {
    * This test varies from the previous test because it manually defines which
    * fields are inserted, and which fields are updated.
    */
-  function testMergeUpdateExcept() {
+  public function testMergeUpdateExcept() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
 
     db_merge('test_people')
       ->key('job', 'Speaker')
-      ->insertFields(array('age' => 31))
-      ->updateFields(array('name' => 'Tiffany'))
+      ->insertFields(['age' => 31])
+      ->updateFields(['name' => 'Tiffany'])
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
     $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
 
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', [':job' => 'Speaker'])->fetch();
     $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
     $this->assertEqual($person->age, 30, 'Age skipped correctly.');
     $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
@@ -89,24 +89,24 @@ class MergeTest extends DatabaseTestBase {
   /**
    * Confirms that we can merge-update a record, with alternate replacement.
    */
-  function testMergeUpdateExplicit() {
+  public function testMergeUpdateExplicit() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
 
     db_merge('test_people')
       ->key('job', 'Speaker')
-      ->insertFields(array(
+      ->insertFields([
         'age' => 31,
         'name' => 'Tiffany',
-      ))
-      ->updateFields(array(
+      ])
+      ->updateFields([
         'name' => 'Joe',
-      ))
+      ])
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
     $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
 
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', [':job' => 'Speaker'])->fetch();
     $this->assertEqual($person->name, 'Joe', 'Name set correctly.');
     $this->assertEqual($person->age, 30, 'Age skipped correctly.');
     $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
@@ -115,10 +115,10 @@ class MergeTest extends DatabaseTestBase {
   /**
    * Confirms that we can merge-update a record successfully, with expressions.
    */
-  function testMergeUpdateExpression() {
+  public function testMergeUpdateExpression() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
 
-    $age_before = db_query('SELECT age FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetchField();
+    $age_before = db_query('SELECT age FROM {test_people} WHERE job = :job', [':job' => 'Speaker'])->fetchField();
 
     // This is a very contrived example, as I have no idea why you'd want to
     // change age this way, but that's beside the point.
@@ -127,15 +127,15 @@ class MergeTest extends DatabaseTestBase {
     // which is what is supposed to happen.
     db_merge('test_people')
       ->key('job', 'Speaker')
-      ->fields(array('name' => 'Tiffany'))
-      ->insertFields(array('age' => 31))
-      ->expression('age', 'age + :age', array(':age' => 4))
+      ->fields(['name' => 'Tiffany'])
+      ->insertFields(['age' => 31])
+      ->expression('age', 'age + :age', [':age' => 4])
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
     $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
 
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', [':job' => 'Speaker'])->fetch();
     $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
     $this->assertEqual($person->age, $age_before + 4, 'Age updated correctly.');
     $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
@@ -144,7 +144,7 @@ class MergeTest extends DatabaseTestBase {
   /**
    * Tests that we can merge-insert without any update fields.
    */
-  function testMergeInsertWithoutUpdate() {
+  public function testMergeInsertWithoutUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
 
     db_merge('test_people')
@@ -154,7 +154,7 @@ class MergeTest extends DatabaseTestBase {
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
     $this->assertEqual($num_records_before + 1, $num_records_after, 'Merge inserted properly.');
 
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', [':job' => 'Presenter'])->fetch();
     $this->assertEqual($person->name, '', 'Name set correctly.');
     $this->assertEqual($person->age, 0, 'Age set correctly.');
     $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
@@ -163,7 +163,7 @@ class MergeTest extends DatabaseTestBase {
   /**
    * Confirms that we can merge-update without any update fields.
    */
-  function testMergeUpdateWithoutUpdate() {
+  public function testMergeUpdateWithoutUpdate() {
     $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
 
     db_merge('test_people')
@@ -173,20 +173,20 @@ class MergeTest extends DatabaseTestBase {
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
     $this->assertEqual($num_records_before, $num_records_after, 'Merge skipped properly.');
 
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', [':job' => 'Speaker'])->fetch();
     $this->assertEqual($person->name, 'Meredith', 'Name skipped correctly.');
     $this->assertEqual($person->age, 30, 'Age skipped correctly.');
     $this->assertEqual($person->job, 'Speaker', 'Job skipped correctly.');
 
     db_merge('test_people')
       ->key('job', 'Speaker')
-      ->insertFields(array('age' => 31))
+      ->insertFields(['age' => 31])
       ->execute();
 
     $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
     $this->assertEqual($num_records_before, $num_records_after, 'Merge skipped properly.');
 
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', [':job' => 'Speaker'])->fetch();
     $this->assertEqual($person->name, 'Meredith', 'Name skipped correctly.');
     $this->assertEqual($person->age, 30, 'Age skipped correctly.');
     $this->assertEqual($person->job, 'Speaker', 'Job skipped correctly.');
@@ -195,17 +195,17 @@ class MergeTest extends DatabaseTestBase {
   /**
    * Tests that an invalid merge query throws an exception.
    */
-  function testInvalidMerge() {
+  public function testInvalidMerge() {
     try {
       // This query will fail because there is no key field specified.
       // Normally it would throw an exception but we are suppressing it with
       // the throw_exception option.
       $options['throw_exception'] = FALSE;
       db_merge('test_people', $options)
-        ->fields(array(
+        ->fields([
           'age' => 31,
           'name' => 'Tiffany',
-        ))
+        ])
         ->execute();
       $this->pass('$options[\'throw_exception\'] is FALSE, no InvalidMergeQueryException thrown.');
     }
@@ -217,10 +217,10 @@ class MergeTest extends DatabaseTestBase {
     try {
       // This query will fail because there is no key field specified.
       db_merge('test_people')
-        ->fields(array(
+        ->fields([
           'age' => 31,
           'name' => 'Tiffany',
-        ))
+        ])
         ->execute();
     }
     catch (InvalidMergeQueryException $e) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php
index b0cdc857f..129d50ba0 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php
@@ -15,7 +15,7 @@ class NextIdTest extends KernelTestBase {
    * The modules to enable.
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   protected function setUp() {
     parent::setUp();
@@ -25,7 +25,7 @@ class NextIdTest extends KernelTestBase {
   /**
    * Tests that the sequences API works.
    */
-  function testDbNextId() {
+  public function testDbNextId() {
     $first = db_next_id();
     $second = db_next_id();
     // We can test for exact increase in here because we know there is no
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/PrefixInfoTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/PrefixInfoTest.php
index 131fb7adf..16fd05336 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/PrefixInfoTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/PrefixInfoTest.php
@@ -20,7 +20,7 @@ class PrefixInfoTest extends DatabaseTestBase {
    * The other two by Drupal core supported databases do not have this variable
    * set in the return array.
    */
-  function testGetPrefixInfo() {
+  public function testGetPrefixInfo() {
     $connection_info = Database::getConnectionInfo('default');
     if ($connection_info['default']['driver'] == 'mysql') {
       // Copy the default connection info to the 'extra' key.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
index f84a9c860..04ba8ad13 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
@@ -12,20 +12,20 @@ class QueryTest extends DatabaseTestBase {
   /**
    * Tests that we can pass an array of values directly in the query.
    */
-  function testArraySubstitution() {
-    $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', array(':ages[]' => array(25, 26, 27)))->fetchAll();
+  public function testArraySubstitution() {
+    $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', [':ages[]' => [25, 26, 27]])->fetchAll();
     $this->assertEqual(count($names), 3, 'Correct number of names returned');
 
-    $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', array(':ages[]' => array(25)))->fetchAll();
+    $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', [':ages[]' => [25]])->fetchAll();
     $this->assertEqual(count($names), 1, 'Correct number of names returned');
   }
 
   /**
    * Tests that we can not pass a scalar value when an array is expected.
    */
-  function testScalarSubstitution() {
+  public function testScalarSubstitution() {
     try {
-      $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', array(':ages[]' => 25))->fetchAll();
+      $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', [':ages[]' => 25])->fetchAll();
       $this->fail('Array placeholder with scalar argument should result in an exception.');
     }
     catch (\InvalidArgumentException $e) {
@@ -39,12 +39,12 @@ class QueryTest extends DatabaseTestBase {
    */
   public function testArrayArgumentsSQLInjection() {
     // Attempt SQL injection and verify that it does not work.
-    $condition = array(
+    $condition = [
       "1 ;INSERT INTO {test} (name) VALUES ('test12345678'); -- " => '',
       '1' => '',
-    );
+    ];
     try {
-      db_query("SELECT * FROM {test} WHERE name = :name", array(':name' => $condition))->fetchObject();
+      db_query("SELECT * FROM {test} WHERE name = :name", [':name' => $condition])->fetchObject();
       $this->fail('SQL injection attempt via array arguments should result in a database exception.');
     }
     catch (\InvalidArgumentException $e) {
@@ -101,7 +101,7 @@ class QueryTest extends DatabaseTestBase {
 
     try {
       $result = db_select('test', 't')
-        ->fields('t', array('name', 'name'))
+        ->fields('t', ['name', 'name'])
         ->condition('name', 1, $injection)
         ->execute();
       $this->fail('Should not be able to attempt SQL injection via operator.');
@@ -118,7 +118,7 @@ class QueryTest extends DatabaseTestBase {
 
     try {
       $result = db_select('test', 't')
-        ->fields('t', array('name'))
+        ->fields('t', ['name'])
         ->condition('name', 1, $injection)
         ->execute();
       $this->fail('Should not be able to attempt SQL injection via operator.');
@@ -139,9 +139,9 @@ class QueryTest extends DatabaseTestBase {
     $count = db_query('SELECT COUNT(*) >= 3 FROM {test}')->fetchField();
     $this->assertEqual((bool) $count, TRUE);
 
-    $count = db_query('SELECT COUNT(*) >= :count FROM {test}', array(
+    $count = db_query('SELECT COUNT(*) >= :count FROM {test}', [
       ':count' => 3,
-    ))->fetchField();
+    ])->fetchField();
     $this->assertEqual((bool) $count, TRUE);
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php
index 33f315b7c..b51316b62 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php
@@ -9,17 +9,10 @@ namespace Drupal\KernelTests\Core\Database;
  */
 class RangeQueryTest extends DatabaseTestBase {
 
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('database_test');
-
   /**
    * Confirms that range queries work and return the correct result.
    */
-  function testRangeQuery() {
+  public function testRangeQuery() {
     // Test if return correct number of rows.
     $range_rows = db_query_range("SELECT name FROM {test} ORDER BY name", 1, 3)->fetchAll();
     $this->assertEqual(count($range_rows), 3, 'Range query work and return correct number of rows.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/RegressionTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/RegressionTest.php
index e13bcfe55..db4c7deda 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/RegressionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/RegressionTest.php
@@ -14,29 +14,29 @@ class RegressionTest extends DatabaseTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'user');
+  public static $modules = ['node', 'user'];
 
   /**
    * Ensures that non-ASCII UTF-8 data is stored in the database properly.
    */
-  function testRegression_310447() {
+  public function testRegression_310447() {
     // That's a 255 character UTF-8 string.
     $job = str_repeat("é", 255);
     db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => $this->randomMachineName(),
         'age' => 20,
         'job' => $job,
-      ))->execute();
+      ])->execute();
 
-    $from_database = db_query('SELECT job FROM {test} WHERE job = :job', array(':job' => $job))->fetchField();
+    $from_database = db_query('SELECT job FROM {test} WHERE job = :job', [':job' => $job])->fetchField();
     $this->assertIdentical($job, $from_database, 'The database handles UTF-8 characters cleanly.');
   }
 
   /**
    * Tests the db_table_exists() function.
    */
-  function testDBTableExists() {
+  public function testDBTableExists() {
     $this->assertIdentical(TRUE, db_table_exists('test'), 'Returns true for existent table.');
     $this->assertIdentical(FALSE, db_table_exists('nosuchtable'), 'Returns false for nonexistent table.');
   }
@@ -44,7 +44,7 @@ class RegressionTest extends DatabaseTestBase {
   /**
    * Tests the db_field_exists() function.
    */
-  function testDBFieldExists() {
+  public function testDBFieldExists() {
     $this->assertIdentical(TRUE, db_field_exists('test', 'name'), 'Returns true for existent column.');
     $this->assertIdentical(FALSE, db_field_exists('test', 'nosuchcolumn'), 'Returns false for nonexistent column.');
   }
@@ -52,7 +52,7 @@ class RegressionTest extends DatabaseTestBase {
   /**
    * Tests the db_index_exists() function.
    */
-  function testDBIndexExists() {
+  public function testDBIndexExists() {
     $this->assertIdentical(TRUE, db_index_exists('test', 'ages'), 'Returns true for existent index.');
     $this->assertIdentical(FALSE, db_index_exists('test', 'nosuchindex'), 'Returns false for nonexistent index.');
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
index 8641fd3c9..e23909871 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
@@ -24,34 +24,34 @@ class SchemaTest extends KernelTestBase {
   /**
    * Tests database interactions.
    */
-  function testSchema() {
+  public function testSchema() {
     // Try creating a table.
-    $table_specification = array(
+    $table_specification = [
       'description' => 'Schema table description may contain "quotes" and could be long—very long indeed.',
-      'fields' => array(
-        'id'  => array(
+      'fields' => [
+        'id'  => [
           'type' => 'int',
           'default' => NULL,
-        ),
-        'test_field'  => array(
+        ],
+        'test_field'  => [
           'type' => 'int',
           'not null' => TRUE,
           'description' => 'Schema table description may contain "quotes" and could be long—very long indeed. There could be "multiple quoted regions".',
-        ),
-        'test_field_string'  => array(
+        ],
+        'test_field_string'  => [
           'type' => 'varchar',
           'length' => 20,
           'not null' => TRUE,
           'default' => "'\"funky default'\"",
           'description' => 'Schema column description for string.',
-        ),
-        'test_field_string_ascii'  => array(
+        ],
+        'test_field_string_ascii'  => [
           'type' => 'varchar_ascii',
           'length' => 255,
           'description' => 'Schema column description for ASCII string.',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     db_create_table('test_table', $table_specification);
 
     // Assert that the table exists.
@@ -95,7 +95,7 @@ class SchemaTest extends KernelTestBase {
     $index_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field');
     $this->assertIdentical($index_exists, FALSE, 'Fake index does not exists');
     // Add index.
-    db_add_index('test_table', 'test_field', array('test_field'), $table_specification);
+    db_add_index('test_table', 'test_field', ['test_field'], $table_specification);
     // Test for created index and test for the boolean result of indexExists().
     $index_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field');
     $this->assertIdentical($index_exists, TRUE, 'Index created.');
@@ -123,13 +123,13 @@ class SchemaTest extends KernelTestBase {
     // Recreate the table.
     db_create_table('test_table', $table_specification);
     db_field_set_default('test_table', 'test_field', 0);
-    db_add_field('test_table', 'test_serial', array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'description' => 'Added column description.'));
+    db_add_field('test_table', 'test_serial', ['type' => 'int', 'not null' => TRUE, 'default' => 0, 'description' => 'Added column description.']);
 
     // Assert that the column comment has been set.
     $this->checkSchemaComment('Added column description.', 'test_table', 'test_serial');
 
     // Change the new field to a serial column.
-    db_change_field('test_table', 'test_serial', 'test_serial', array('type' => 'serial', 'not null' => TRUE, 'description' => 'Changed column description.'), array('primary key' => array('test_serial')));
+    db_change_field('test_table', 'test_serial', 'test_serial', ['type' => 'serial', 'not null' => TRUE, 'description' => 'Changed column description.'], ['primary key' => ['test_serial']]);
 
     // Assert that the column comment has been set.
     $this->checkSchemaComment('Changed column description.', 'test_table', 'test_serial');
@@ -143,24 +143,46 @@ class SchemaTest extends KernelTestBase {
     $count = db_query('SELECT COUNT(*) FROM {test_table}')->fetchField();
     $this->assertEqual($count, 2, 'There were two rows.');
 
+    // Test adding a serial field to an existing table.
+    db_drop_table('test_table');
+    db_create_table('test_table', $table_specification);
+    db_field_set_default('test_table', 'test_field', 0);
+    db_add_field('test_table', 'test_serial', ['type' => 'serial', 'not null' => TRUE], ['primary key' => ['test_serial']]);
+
+    $this->assertPrimaryKeyColumns('test_table', ['test_serial']);
+
+    $this->assertTrue($this->tryInsert(), 'Insert with a serial succeeded.');
+    $max1 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField();
+    $this->assertTrue($this->tryInsert(), 'Insert with a serial succeeded.');
+    $max2 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField();
+    $this->assertTrue($max2 > $max1, 'The serial is monotone.');
+
+    $count = db_query('SELECT COUNT(*) FROM {test_table}')->fetchField();
+    $this->assertEqual($count, 2, 'There were two rows.');
+
+    // Test adding a new column and form a composite primary key with it.
+    db_add_field('test_table', 'test_composite_primary_key', ['type' => 'int', 'not null' => TRUE, 'default' => 0], ['primary key' => ['test_serial', 'test_composite_primary_key']]);
+
+    $this->assertPrimaryKeyColumns('test_table', ['test_serial', 'test_composite_primary_key']);
+
     // Test renaming of keys and constraints.
     db_drop_table('test_table');
-    $table_specification = array(
-      'fields' => array(
-        'id'  => array(
+    $table_specification = [
+      'fields' => [
+        'id'  => [
           'type' => 'serial',
           'not null' => TRUE,
-        ),
-        'test_field'  => array(
+        ],
+        'test_field'  => [
           'type' => 'int',
           'default' => 0,
-        ),
-      ),
-      'primary key' => array('id'),
-      'unique keys' => array(
-        'test_field' => array('test_field'),
-      ),
-    );
+        ],
+      ],
+      'primary key' => ['id'],
+      'unique keys' => [
+        'test_field' => ['test_field'],
+      ],
+    ];
     db_create_table('test_table', $table_specification);
 
     // Tests for indexes are Database specific.
@@ -215,18 +237,18 @@ class SchemaTest extends KernelTestBase {
     }
 
     // Use database specific data type and ensure that table is created.
-    $table_specification = array(
+    $table_specification = [
       'description' => 'Schema table description.',
-      'fields' => array(
-        'timestamp'  => array(
+      'fields' => [
+        'timestamp'  => [
           'mysql_type' => 'timestamp',
           'pgsql_type' => 'timestamp',
           'sqlite_type' => 'datetime',
           'not null' => FALSE,
           'default' => NULL,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     try {
       db_create_table('test_timestamp', $table_specification);
     }
@@ -240,56 +262,56 @@ class SchemaTest extends KernelTestBase {
    *
    * @see \Drupal\Core\Database\Driver\mysql\Schema::getNormalizedIndexes()
    */
-  function testIndexLength() {
+  public function testIndexLength() {
     if (Database::getConnection()->databaseType() != 'mysql') {
       return;
     }
-    $table_specification = array(
-      'fields' => array(
-        'id'  => array(
+    $table_specification = [
+      'fields' => [
+        'id'  => [
           'type' => 'int',
           'default' => NULL,
-        ),
-        'test_field_text'  => array(
+        ],
+        'test_field_text'  => [
           'type' => 'text',
           'not null' => TRUE,
-        ),
-        'test_field_string_long'  => array(
+        ],
+        'test_field_string_long'  => [
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
-        ),
-        'test_field_string_ascii_long'  => array(
+        ],
+        'test_field_string_ascii_long'  => [
           'type' => 'varchar_ascii',
           'length' => 255,
-        ),
-        'test_field_string_short'  => array(
+        ],
+        'test_field_string_short'  => [
           'type' => 'varchar',
           'length' => 128,
           'not null' => TRUE,
-        ),
-      ),
-      'indexes' => array(
-        'test_regular' => array(
+        ],
+      ],
+      'indexes' => [
+        'test_regular' => [
           'test_field_text',
           'test_field_string_long',
           'test_field_string_ascii_long',
           'test_field_string_short',
-        ),
-        'test_length' => array(
-          array('test_field_text', 128),
-          array('test_field_string_long', 128),
-          array('test_field_string_ascii_long', 128),
-          array('test_field_string_short', 128),
-        ),
-        'test_mixed' => array(
-          array('test_field_text', 200),
+        ],
+        'test_length' => [
+          ['test_field_text', 128],
+          ['test_field_string_long', 128],
+          ['test_field_string_ascii_long', 128],
+          ['test_field_string_short', 128],
+        ],
+        'test_mixed' => [
+          ['test_field_text', 200],
           'test_field_string_long',
-          array('test_field_string_ascii_long', 200),
+          ['test_field_string_ascii_long', 200],
           'test_field_string_short',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     db_create_table('test_table_index_length', $table_specification);
 
     $schema_object = Database::getConnection()->schema();
@@ -331,29 +353,29 @@ class SchemaTest extends KernelTestBase {
 
     // Get index information.
     $results = db_query('SHOW INDEX FROM {test_table_index_length}');
-    $expected_lengths = array(
-      'test_regular' => array(
+    $expected_lengths = [
+      'test_regular' => [
         'test_field_text' => 191,
         'test_field_string_long' => 191,
         'test_field_string_ascii_long' => NULL,
         'test_field_string_short' => NULL,
-      ),
-      'test_length' => array(
+      ],
+      'test_length' => [
         'test_field_text' => 128,
         'test_field_string_long' => 128,
         'test_field_string_ascii_long' => 128,
         'test_field_string_short' => NULL,
-      ),
-      'test_mixed' => array(
+      ],
+      'test_mixed' => [
         'test_field_text' => 191,
         'test_field_string_long' => 191,
         'test_field_string_ascii_long' => 200,
         'test_field_string_short' => NULL,
-      ),
-      'test_separate' => array(
+      ],
+      'test_separate' => [
         'test_field_text' => 191,
-      ),
-    );
+      ],
+    ];
 
     // Count the number of columns defined in the indexes.
     $column_count = 0;
@@ -379,10 +401,10 @@ class SchemaTest extends KernelTestBase {
    * @return
    *   TRUE if the insert succeeded, FALSE otherwise.
    */
-  function tryInsert($table = 'test_table') {
+  public function tryInsert($table = 'test_table') {
     try {
       db_insert($table)
-        ->fields(array('id' => mt_rand(10, 20)))
+        ->fields(['id' => mt_rand(10, 20)])
         ->execute();
       return TRUE;
     }
@@ -401,7 +423,7 @@ class SchemaTest extends KernelTestBase {
    * @param $column
    *   Optional column to test.
    */
-  function checkSchemaComment($description, $table, $column = NULL) {
+  public function checkSchemaComment($description, $table, $column = NULL) {
     if (method_exists(Database::getConnection()->schema(), 'getComment')) {
       $comment = Database::getConnection()->schema()->getComment($table, $column);
       // The schema comment truncation for mysql is different.
@@ -416,21 +438,21 @@ class SchemaTest extends KernelTestBase {
   /**
    * Tests creating unsigned columns and data integrity thereof.
    */
-  function testUnsignedColumns() {
+  public function testUnsignedColumns() {
     // First create the table with just a serial column.
     $table_name = 'unsigned_table';
-    $table_spec = array(
-      'fields' => array('serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE)),
-      'primary key' => array('serial_column'),
-    );
+    $table_spec = [
+      'fields' => ['serial_column' => ['type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE]],
+      'primary key' => ['serial_column'],
+    ];
     db_create_table($table_name, $table_spec);
 
     // Now set up columns for the other types.
-    $types = array('int', 'float', 'numeric');
+    $types = ['int', 'float', 'numeric'];
     foreach ($types as $type) {
-      $column_spec = array('type' => $type, 'unsigned' => TRUE);
+      $column_spec = ['type' => $type, 'unsigned' => TRUE];
       if ($type == 'numeric') {
-        $column_spec += array('precision' => 10, 'scale' => 0);
+        $column_spec += ['precision' => 10, 'scale' => 0];
       }
       $column_name = $type . '_column';
       $table_spec['fields'][$column_name] = $column_spec;
@@ -439,8 +461,8 @@ class SchemaTest extends KernelTestBase {
 
     // Finally, check each column and try to insert invalid values into them.
     foreach ($table_spec['fields'] as $column_name => $column_spec) {
-      $this->assertTrue(db_field_exists($table_name, $column_name), format_string('Unsigned @type column was created.', array('@type' => $column_spec['type'])));
-      $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), format_string('Unsigned @type column rejected a negative value.', array('@type' => $column_spec['type'])));
+      $this->assertTrue(db_field_exists($table_name, $column_name), format_string('Unsigned @type column was created.', ['@type' => $column_spec['type']]));
+      $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), format_string('Unsigned @type column rejected a negative value.', ['@type' => $column_spec['type']]));
     }
   }
 
@@ -455,10 +477,10 @@ class SchemaTest extends KernelTestBase {
    * @return
    *   TRUE if the insert succeeded, FALSE otherwise.
    */
-  function tryUnsignedInsert($table_name, $column_name) {
+  public function tryUnsignedInsert($table_name, $column_name) {
     try {
       db_insert($table_name)
-        ->fields(array($column_name => -1))
+        ->fields([$column_name => -1])
         ->execute();
       return TRUE;
     }
@@ -470,22 +492,22 @@ class SchemaTest extends KernelTestBase {
   /**
    * Tests adding columns to an existing table.
    */
-  function testSchemaAddField() {
+  public function testSchemaAddField() {
     // Test varchar types.
-    foreach (array(1, 32, 128, 256, 512) as $length) {
-      $base_field_spec = array(
+    foreach ([1, 32, 128, 256, 512] as $length) {
+      $base_field_spec = [
         'type' => 'varchar',
         'length' => $length,
-      );
-      $variations = array(
-        array('not null' => FALSE),
-        array('not null' => FALSE, 'default' => '7'),
-        array('not null' => FALSE, 'default' => substr('"thing"', 0, $length)),
-        array('not null' => FALSE, 'default' => substr("\"'hing", 0, $length)),
-        array('not null' => TRUE, 'initial' => 'd'),
-        array('not null' => FALSE, 'default' => NULL),
-        array('not null' => TRUE, 'initial' => 'd', 'default' => '7'),
-      );
+      ];
+      $variations = [
+        ['not null' => FALSE],
+        ['not null' => FALSE, 'default' => '7'],
+        ['not null' => FALSE, 'default' => substr('"thing"', 0, $length)],
+        ['not null' => FALSE, 'default' => substr("\"'hing", 0, $length)],
+        ['not null' => TRUE, 'initial' => 'd'],
+        ['not null' => FALSE, 'default' => NULL],
+        ['not null' => TRUE, 'initial' => 'd', 'default' => '7'],
+      ];
 
       foreach ($variations as $variation) {
         $field_spec = $variation + $base_field_spec;
@@ -494,19 +516,19 @@ class SchemaTest extends KernelTestBase {
     }
 
     // Test int and float types.
-    foreach (array('int', 'float') as $type) {
-      foreach (array('tiny', 'small', 'medium', 'normal', 'big') as $size) {
-        $base_field_spec = array(
+    foreach (['int', 'float'] as $type) {
+      foreach (['tiny', 'small', 'medium', 'normal', 'big'] as $size) {
+        $base_field_spec = [
           'type' => $type,
           'size' => $size,
-        );
-        $variations = array(
-          array('not null' => FALSE),
-          array('not null' => FALSE, 'default' => 7),
-          array('not null' => TRUE, 'initial' => 1),
-          array('not null' => TRUE, 'initial' => 1, 'default' => 7),
-          array('not null' => TRUE, 'initial_from_field' => 'serial_column'),
-        );
+        ];
+        $variations = [
+          ['not null' => FALSE],
+          ['not null' => FALSE, 'default' => 7],
+          ['not null' => TRUE, 'initial' => 1],
+          ['not null' => TRUE, 'initial' => 1, 'default' => 7],
+          ['not null' => TRUE, 'initial_from_field' => 'serial_column'],
+        ];
 
         foreach ($variations as $variation) {
           $field_spec = $variation + $base_field_spec;
@@ -516,25 +538,25 @@ class SchemaTest extends KernelTestBase {
     }
 
     // Test numeric types.
-    foreach (array(1, 5, 10, 40, 65) as $precision) {
-      foreach (array(0, 2, 10, 30) as $scale) {
+    foreach ([1, 5, 10, 40, 65] as $precision) {
+      foreach ([0, 2, 10, 30] as $scale) {
         // Skip combinations where precision is smaller than scale.
         if ($precision <= $scale) {
           continue;
         }
 
-        $base_field_spec = array(
+        $base_field_spec = [
           'type' => 'numeric',
           'scale' => $scale,
           'precision' => $precision,
-        );
-        $variations = array(
-          array('not null' => FALSE),
-          array('not null' => FALSE, 'default' => 7),
-          array('not null' => TRUE, 'initial' => 1),
-          array('not null' => TRUE, 'initial' => 1, 'default' => 7),
-          array('not null' => TRUE, 'initial_from_field' => 'serial_column'),
-        );
+        ];
+        $variations = [
+          ['not null' => FALSE],
+          ['not null' => FALSE, 'default' => 7],
+          ['not null' => TRUE, 'initial' => 1],
+          ['not null' => TRUE, 'initial' => 1, 'default' => 7],
+          ['not null' => TRUE, 'initial_from_field' => 'serial_column'],
+        ];
 
         foreach ($variations as $variation) {
           $field_spec = $variation + $base_field_spec;
@@ -556,15 +578,15 @@ class SchemaTest extends KernelTestBase {
   protected function assertFieldAdditionRemoval($field_spec) {
     // Try creating the field on a new table.
     $table_name = 'test_table_' . ($this->counter++);
-    $table_spec = array(
-      'fields' => array(
-        'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+    $table_spec = [
+      'fields' => [
+        'serial_column' => ['type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE],
         'test_field' => $field_spec,
-      ),
-      'primary key' => array('serial_column'),
-    );
+      ],
+      'primary key' => ['serial_column'],
+    ];
     db_create_table($table_name, $table_spec);
-    $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
+    $this->pass(format_string('Table %table created.', ['%table' => $table_name]));
 
     // Check the characteristics of the field.
     $this->assertFieldCharacteristics($table_name, 'test_field', $field_spec);
@@ -574,24 +596,24 @@ class SchemaTest extends KernelTestBase {
 
     // Try adding a field to an existing table.
     $table_name = 'test_table_' . ($this->counter++);
-    $table_spec = array(
-      'fields' => array(
-        'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
-      ),
-      'primary key' => array('serial_column'),
-    );
+    $table_spec = [
+      'fields' => [
+        'serial_column' => ['type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE],
+      ],
+      'primary key' => ['serial_column'],
+    ];
     db_create_table($table_name, $table_spec);
-    $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
+    $this->pass(format_string('Table %table created.', ['%table' => $table_name]));
 
     // Insert some rows to the table to test the handling of initial values.
     for ($i = 0; $i < 3; $i++) {
       db_insert($table_name)
-        ->useDefaults(array('serial_column'))
+        ->useDefaults(['serial_column'])
         ->execute();
     }
 
     db_add_field($table_name, 'test_field', $field_spec);
-    $this->pass(format_string('Column %column created.', array('%column' => 'test_field')));
+    $this->pass(format_string('Column %column created.', ['%column' => 'test_field']));
 
     // Check the characteristics of the field.
     $this->assertFieldCharacteristics($table_name, 'test_field', $field_spec);
@@ -614,7 +636,7 @@ class SchemaTest extends KernelTestBase {
     if (isset($field_spec['initial'])) {
       // There should be no row with a value different then $field_spec['initial'].
       $count = db_select($table_name)
-        ->fields($table_name, array('serial_column'))
+        ->fields($table_name, ['serial_column'])
         ->condition($field_name, $field_spec['initial'], '<>')
         ->countQuery()
         ->execute()
@@ -627,7 +649,7 @@ class SchemaTest extends KernelTestBase {
       // There should be no row with a value different than
       // $field_spec['initial_from_field'].
       $count = db_select($table_name)
-        ->fields($table_name, array('serial_column'))
+        ->fields($table_name, ['serial_column'])
         ->where($table_name . '.' . $field_spec['initial_from_field'] . ' <> ' . $table_name . '.' . $field_name)
         ->countQuery()
         ->execute()
@@ -639,10 +661,10 @@ class SchemaTest extends KernelTestBase {
     if (isset($field_spec['default'])) {
       // Try inserting a row, and check the resulting value of the new column.
       $id = db_insert($table_name)
-        ->useDefaults(array('serial_column'))
+        ->useDefaults(['serial_column'])
         ->execute();
       $field_value = db_select($table_name)
-        ->fields($table_name, array($field_name))
+        ->fields($table_name, [$field_name])
         ->condition('serial_column', $id)
         ->execute()
         ->fetchField();
@@ -653,15 +675,15 @@ class SchemaTest extends KernelTestBase {
   /**
    * Tests changing columns between types.
    */
-  function testSchemaChangeField() {
-    $field_specs = array(
-      array('type' => 'int', 'size' => 'normal', 'not null' => FALSE),
-      array('type' => 'int', 'size' => 'normal', 'not null' => TRUE, 'initial' => 1, 'default' => 17),
-      array('type' => 'float', 'size' => 'normal', 'not null' => FALSE),
-      array('type' => 'float', 'size' => 'normal', 'not null' => TRUE, 'initial' => 1, 'default' => 7.3),
-      array('type' => 'numeric', 'scale' => 2, 'precision' => 10, 'not null' => FALSE),
-      array('type' => 'numeric', 'scale' => 2, 'precision' => 10, 'not null' => TRUE, 'initial' => 1, 'default' => 7),
-    );
+  public function testSchemaChangeField() {
+    $field_specs = [
+      ['type' => 'int', 'size' => 'normal', 'not null' => FALSE],
+      ['type' => 'int', 'size' => 'normal', 'not null' => TRUE, 'initial' => 1, 'default' => 17],
+      ['type' => 'float', 'size' => 'normal', 'not null' => FALSE],
+      ['type' => 'float', 'size' => 'normal', 'not null' => TRUE, 'initial' => 1, 'default' => 7.3],
+      ['type' => 'numeric', 'scale' => 2, 'precision' => 10, 'not null' => FALSE],
+      ['type' => 'numeric', 'scale' => 2, 'precision' => 10, 'not null' => TRUE, 'initial' => 1, 'default' => 7],
+    ];
 
     foreach ($field_specs as $i => $old_spec) {
       foreach ($field_specs as $j => $new_spec) {
@@ -673,12 +695,12 @@ class SchemaTest extends KernelTestBase {
       }
     }
 
-    $field_specs = array(
-      array('type' => 'varchar_ascii', 'length' => '255'),
-      array('type' => 'varchar', 'length' => '255'),
-      array('type' => 'text'),
-      array('type' => 'blob', 'size' => 'big'),
-    );
+    $field_specs = [
+      ['type' => 'varchar_ascii', 'length' => '255'],
+      ['type' => 'varchar', 'length' => '255'],
+      ['type' => 'text'],
+      ['type' => 'blob', 'size' => 'big'],
+    ];
 
     foreach ($field_specs as $i => $old_spec) {
       foreach ($field_specs as $j => $new_spec) {
@@ -705,15 +727,15 @@ class SchemaTest extends KernelTestBase {
    */
   protected function assertFieldChange($old_spec, $new_spec, $test_data = NULL) {
     $table_name = 'test_table_' . ($this->counter++);
-    $table_spec = array(
-      'fields' => array(
-        'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+    $table_spec = [
+      'fields' => [
+        'serial_column' => ['type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE],
         'test_field' => $old_spec,
-      ),
-      'primary key' => array('serial_column'),
-    );
+      ],
+      'primary key' => ['serial_column'],
+    ];
     db_create_table($table_name, $table_spec);
-    $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
+    $this->pass(format_string('Table %table created.', ['%table' => $table_name]));
 
     // Check the characteristics of the field.
     $this->assertFieldCharacteristics($table_name, 'test_field', $old_spec);
@@ -804,4 +826,46 @@ class SchemaTest extends KernelTestBase {
     Database::setActiveConnection('default');
   }
 
+  /**
+   * Tests the primary keys of a table.
+   *
+   * @param string $table_name
+   *   The name of the table to check.
+   * @param array $primary_key
+   *   The expected key column specifier for a table's primary key.
+   */
+  protected function assertPrimaryKeyColumns($table_name, array $primary_key = []) {
+    $db_type = Database::getConnection()->databaseType();
+
+    switch ($db_type) {
+      case 'mysql':
+        $result = Database::getConnection()->query("SHOW KEYS FROM {" . $table_name . "} WHERE Key_name = 'PRIMARY'")->fetchAllAssoc('Column_name');
+        $this->assertSame($primary_key, array_keys($result));
+
+        break;
+      case 'pgsql':
+        $result = Database::getConnection()->query("SELECT a.attname, format_type(a.atttypid, a.atttypmod) AS data_type
+          FROM pg_index i
+          JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey)
+          WHERE i.indrelid = '{" . $table_name . "}'::regclass AND i.indisprimary")
+          ->fetchAllAssoc('attname');
+        $this->assertSame($primary_key, array_keys($result));
+
+        break;
+      case 'sqlite':
+        // For SQLite we need access to the protected
+        // \Drupal\Core\Database\Driver\sqlite\Schema::introspectSchema() method
+        // because we have no other way of getting the table prefixes needed for
+        // running a straight PRAGMA query.
+        $schema_object = Database::getConnection()->schema();
+        $reflection = new \ReflectionMethod($schema_object, 'introspectSchema');
+        $reflection->setAccessible(TRUE);
+
+        $table_info = $reflection->invoke($schema_object, $table_name);
+        $this->assertSame($primary_key, $table_info['primary key']);
+
+        break;
+    }
+  }
+
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SelectCloneTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SelectCloneTest.php
index 64e95d0b6..30a4f1b94 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SelectCloneTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SelectCloneTest.php
@@ -12,7 +12,7 @@ class SelectCloneTest extends DatabaseTestBase {
   /**
    * Test that subqueries as value within conditions are cloned properly.
    */
-  function testSelectConditionSubQueryCloning() {
+  public function testSelectConditionSubQueryCloning() {
     $subquery = db_select('test', 't');
     $subquery->addField('t', 'id', 'id');
     $subquery->condition('age', 28, '<');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
index d6da25482..34ca74c69 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
@@ -18,12 +18,12 @@ class SelectComplexTest extends DatabaseTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'node_access_test', 'field');
+  public static $modules = ['system', 'user', 'node_access_test', 'field'];
 
   /**
    * Tests simple JOIN statements.
    */
-  function testDefaultJoin() {
+  public function testDefaultJoin() {
     $query = db_select('test_task', 't');
     $people_alias = $query->join('test', 'p', 't.pid = p.id');
     $name_field = $query->addField($people_alias, 'name', 'name');
@@ -48,7 +48,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests LEFT OUTER joins.
    */
-  function testLeftOuterJoin() {
+  public function testLeftOuterJoin() {
     $query = db_select('test', 'p');
     $people_alias = $query->leftJoin('test_task', 't', 't.pid = p.id');
     $name_field = $query->addField('p', 'name', 'name');
@@ -72,7 +72,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests GROUP BY clauses.
    */
-  function testGroupBy() {
+  public function testGroupBy() {
     $query = db_select('test_task', 't');
     $count_field = $query->addExpression('COUNT(task)', 'num');
     $task_field = $query->addField('t', 'task');
@@ -82,7 +82,7 @@ class SelectComplexTest extends DatabaseTestBase {
 
     $num_records = 0;
     $last_count = 0;
-    $records = array();
+    $records = [];
     foreach ($result as $record) {
       $num_records++;
       $this->assertTrue($record->$count_field >= $last_count, 'Results returned in correct order.');
@@ -90,16 +90,16 @@ class SelectComplexTest extends DatabaseTestBase {
       $records[$record->$task_field] = $record->$count_field;
     }
 
-    $correct_results = array(
+    $correct_results = [
       'eat' => 1,
       'sleep' => 2,
       'code' => 1,
       'found new band' => 1,
       'perform at superbowl' => 1,
-    );
+    ];
 
     foreach ($correct_results as $task => $count) {
-      $this->assertEqual($records[$task], $count, format_string("Correct number of '@task' records found.", array('@task' => $task)));
+      $this->assertEqual($records[$task], $count, format_string("Correct number of '@task' records found.", ['@task' => $task]));
     }
 
     $this->assertEqual($num_records, 6, 'Returned the correct number of total rows.');
@@ -108,7 +108,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests GROUP BY and HAVING clauses together.
    */
-  function testGroupByAndHaving() {
+  public function testGroupByAndHaving() {
     $query = db_select('test_task', 't');
     $count_field = $query->addExpression('COUNT(task)', 'num');
     $task_field = $query->addField('t', 'task');
@@ -119,7 +119,7 @@ class SelectComplexTest extends DatabaseTestBase {
 
     $num_records = 0;
     $last_count = 0;
-    $records = array();
+    $records = [];
     foreach ($result as $record) {
       $num_records++;
       $this->assertTrue($record->$count_field >= 2, 'Record has the minimum count.');
@@ -128,12 +128,12 @@ class SelectComplexTest extends DatabaseTestBase {
       $records[$record->$task_field] = $record->$count_field;
     }
 
-    $correct_results = array(
+    $correct_results = [
       'sleep' => 2,
-    );
+    ];
 
     foreach ($correct_results as $task => $count) {
-      $this->assertEqual($records[$task], $count, format_string("Correct number of '@task' records found.", array('@task' => $task)));
+      $this->assertEqual($records[$task], $count, format_string("Correct number of '@task' records found.", ['@task' => $task]));
     }
 
     $this->assertEqual($num_records, 1, 'Returned the correct number of total rows.');
@@ -144,7 +144,7 @@ class SelectComplexTest extends DatabaseTestBase {
    *
    * The SQL clause varies with the database.
    */
-  function testRange() {
+  public function testRange() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
@@ -157,7 +157,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Test whether the range property of a select clause can be undone.
    */
-  function testRangeUndo() {
+  public function testRangeUndo() {
     $query = db_select('test');
     $name_field = $query->addField('test', 'name');
     $age_field = $query->addField('test', 'age', 'age');
@@ -171,7 +171,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests distinct queries.
    */
-  function testDistinct() {
+  public function testDistinct() {
     $query = db_select('test_task');
     $query->addField('test_task', 'task');
     $query->distinct();
@@ -183,7 +183,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests that we can generate a count query from a built query.
    */
-  function testCountQuery() {
+  public function testCountQuery() {
     $query = db_select('test');
     $name_field = $query->addField('test', 'name');
     $age_field = $query->addField('test', 'age', 'age');
@@ -203,7 +203,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests having queries.
    */
-  function testHavingCountQuery() {
+  public function testHavingCountQuery() {
     $query = db_select('test')
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
       ->groupBy('age')
@@ -217,7 +217,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests that countQuery removes 'all_fields' statements and ordering clauses.
    */
-  function testCountQueryRemovals() {
+  public function testCountQueryRemovals() {
     $query = db_select('test');
     $query->fields('test');
     $query->orderBy('name');
@@ -248,14 +248,14 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests that countQuery properly removes fields and expressions.
    */
-  function testCountQueryFieldRemovals() {
+  public function testCountQueryFieldRemovals() {
     // countQuery should remove all fields and expressions, so this can be
     // tested by adding a non-existent field and expression: if it ends
     // up in the query, an error will be thrown. If not, it will return the
     // number of records, which in this case happens to be 4 (there are four
     // records in the {test} table).
     $query = db_select('test');
-    $query->fields('test', array('fail'));
+    $query->fields('test', ['fail']);
     $this->assertEqual(4, $query->countQuery()->execute()->fetchField(), 'Count Query removed fields');
 
     $query = db_select('test');
@@ -266,7 +266,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests that we can generate a count query from a query with distinct.
    */
-  function testCountQueryDistinct() {
+  public function testCountQueryDistinct() {
     $query = db_select('test_task');
     $query->addField('test_task', 'task');
     $query->distinct();
@@ -279,7 +279,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests that we can generate a count query from a query with GROUP BY.
    */
-  function testCountQueryGroupBy() {
+  public function testCountQueryGroupBy() {
     $query = db_select('test_task');
     $query->addField('test_task', 'pid');
     $query->groupBy('pid');
@@ -304,7 +304,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Confirms that we can properly nest conditional clauses.
    */
-  function testNestedConditions() {
+  public function testNestedConditions() {
     // This query should translate to:
     // "SELECT job FROM {test} WHERE name = 'Paul' AND (age = 26 OR age = 27)"
     // That should find only one record. Yes it's a non-optimal way of writing
@@ -321,7 +321,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Confirms we can join on a single table twice with a dynamic alias.
    */
-  function testJoinTwice() {
+  public function testJoinTwice() {
     $query = db_select('test')->fields('test');
     $alias = $query->join('test', 'test', 'test.job = %alias.job');
     $query->addField($alias, 'name', 'othername');
@@ -335,7 +335,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests that we can join on a query.
    */
-  function testJoinSubquery() {
+  public function testJoinSubquery() {
     $this->installSchema('system', 'sequences');
 
     $account = User::create([
@@ -343,7 +343,7 @@ class SelectComplexTest extends DatabaseTestBase {
       'mail' => $this->randomMachineName() . '@example.com',
     ]);
 
-    $query = db_select('test_task', 'tt', array('target' => 'replica'));
+    $query = db_select('test_task', 'tt', ['target' => 'replica']);
     $query->addExpression('tt.pid + 1', 'abc');
     $query->condition('priority', 1, '>');
     $query->condition('priority', 100, '<');
@@ -375,7 +375,7 @@ class SelectComplexTest extends DatabaseTestBase {
   /**
    * Tests that rowCount() throws exception on SELECT query.
    */
-  function testSelectWithRowCount() {
+  public function testSelectWithRowCount() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $result = $query->execute();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SelectOrderedTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SelectOrderedTest.php
index c9e199be9..5e81e0898 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SelectOrderedTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SelectOrderedTest.php
@@ -12,7 +12,7 @@ class SelectOrderedTest extends DatabaseTestBase {
   /**
    * Tests basic ORDER BY.
    */
-  function testSimpleSelectOrdered() {
+  public function testSimpleSelectOrdered() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $age_field = $query->addField('test', 'age', 'age');
@@ -33,7 +33,7 @@ class SelectOrderedTest extends DatabaseTestBase {
   /**
    * Tests multiple ORDER BY.
    */
-  function testSimpleSelectMultiOrdered() {
+  public function testSimpleSelectMultiOrdered() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $age_field = $query->addField('test', 'age', 'age');
@@ -43,12 +43,12 @@ class SelectOrderedTest extends DatabaseTestBase {
     $result = $query->execute();
 
     $num_records = 0;
-    $expected = array(
-      array('Ringo', 28, 'Drummer'),
-      array('John', 25, 'Singer'),
-      array('George', 27, 'Singer'),
-      array('Paul', 26, 'Songwriter'),
-    );
+    $expected = [
+      ['Ringo', 28, 'Drummer'],
+      ['John', 25, 'Singer'],
+      ['George', 27, 'Singer'],
+      ['Paul', 26, 'Songwriter'],
+    ];
     $results = $result->fetchAll(\PDO::FETCH_NUM);
     foreach ($expected as $k => $record) {
       $num_records++;
@@ -64,7 +64,7 @@ class SelectOrderedTest extends DatabaseTestBase {
   /**
    * Tests ORDER BY descending.
    */
-  function testSimpleSelectOrderedDesc() {
+  public function testSimpleSelectOrderedDesc() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $age_field = $query->addField('test', 'age', 'age');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
index 4877ca2f7..58a66289e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
@@ -12,7 +12,7 @@ class SelectSubqueryTest extends DatabaseTestBase {
   /**
    * Tests that we can use a subquery in a FROM clause.
    */
-  function testFromSubquerySelect() {
+  public function testFromSubquerySelect() {
     // Create a subquery, which is just a normal query object.
     $subquery = db_select('test_task', 'tt');
     $subquery->addField('tt', 'pid', 'pid');
@@ -39,14 +39,14 @@ class SelectSubqueryTest extends DatabaseTestBase {
       // WHERE tt.task = 'code'
       $people = $select->execute()->fetchCol();
 
-      $this->assertEqual(count($people), 1, 'Returned the correct number of rows.');
+      $this->assertCount(1, $people, 'Returned the correct number of rows.');
     }
   }
 
   /**
    * Tests that we can use a subquery in a FROM clause with a LIMIT.
    */
-  function testFromSubquerySelectWithLimit() {
+  public function testFromSubquerySelectWithLimit() {
     // Create a subquery, which is just a normal query object.
     $subquery = db_select('test_task', 'tt');
     $subquery->addField('tt', 'pid', 'pid');
@@ -66,13 +66,13 @@ class SelectSubqueryTest extends DatabaseTestBase {
     //   INNER JOIN test t ON t.id=tt.pid
     $people = $select->execute()->fetchCol();
 
-    $this->assertEqual(count($people), 1, 'Returned the correct number of rows.');
+    $this->assertCount(1, $people, 'Returned the correct number of rows.');
   }
 
   /**
-   * Tests that we can use a subquery in a WHERE clause.
+   * Tests that we can use a subquery with an IN operator in a WHERE clause.
    */
-  function testConditionSubquerySelect() {
+  public function testConditionSubquerySelect() {
     // Create a subquery, which is just a normal query object.
     $subquery = db_select('test_task', 'tt');
     $subquery->addField('tt', 'pid', 'pid');
@@ -89,13 +89,98 @@ class SelectSubqueryTest extends DatabaseTestBase {
     // FROM test tt2
     // WHERE tt2.pid IN (SELECT tt.pid AS pid FROM test_task tt WHERE tt.priority=1)
     $people = $select->execute()->fetchCol();
-    $this->assertEqual(count($people), 5, 'Returned the correct number of rows.');
+    $this->assertCount(5, $people, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Test that we can use a subquery with a relational operator in a WHERE clause.
+   */
+  public function testConditionSubquerySelect2() {
+    // Create a subquery, which is just a normal query object.
+    $subquery = db_select('test', 't2');
+    $subquery->addExpression('AVG(t2.age)');
+
+    // Create another query that adds a clause using the subquery.
+    $select = db_select('test', 't');
+    $select->addField('t', 'name');
+    $select->condition('t.age', $subquery, '<');
+
+    // The resulting query should be equivalent to:
+    // SELECT t.name
+    // FROM test t
+    // WHERE t.age < (SELECT AVG(t2.age) FROM test t2)
+    $people = $select->execute()->fetchCol();
+    $this->assertEquals(['John', 'Paul'], $people, 'Returned Paul and John.', 0.0, 10, TRUE);
+  }
+
+  /**
+   * Test that we can use 2 subqueries with a relational operator in a WHERE clause.
+   */
+  public function testConditionSubquerySelect3() {
+    // Create subquery 1, which is just a normal query object.
+    $subquery1 = db_select('test_task', 'tt');
+    $subquery1->addExpression('AVG(tt.priority)');
+    $subquery1->where('tt.pid = t.id');
+
+    // Create subquery 2, which is just a normal query object.
+    $subquery2 = db_select('test_task', 'tt2');
+    $subquery2->addExpression('AVG(tt2.priority)');
+
+    // Create another query that adds a clause using the subqueries.
+    $select = db_select('test', 't');
+    $select->addField('t', 'name');
+    $select->condition($subquery1, $subquery2, '>');
+
+    // The resulting query should be equivalent to:
+    // SELECT t.name
+    // FROM test t
+    // WHERE (SELECT AVG(tt.priority) FROM test_task tt WHERE tt.pid = t.id) > (SELECT AVG(tt2.priority) FROM test_task tt2)
+    $people = $select->execute()->fetchCol();
+    $this->assertEquals(['John'], $people, 'Returned John.', 0.0, 10, TRUE);
+  }
+
+  /**
+   * Test that we can use multiple subqueries.
+   *
+   * This test uses a subquery at the left hand side and multiple subqueries at
+   * the right hand side. The test query may not be that logical but that's due
+   * to the limited amount of data and tables. 'Valid' use cases do exist :)
+   */
+  public function testConditionSubquerySelect4() {
+    // Create subquery 1, which is just a normal query object.
+    $subquery1 = db_select('test_task', 'tt');
+    $subquery1->addExpression('AVG(tt.priority)');
+    $subquery1->where('tt.pid = t.id');
+
+    // Create subquery 2, which is just a normal query object.
+    $subquery2 = db_select('test_task', 'tt2');
+    $subquery2->addExpression('MIN(tt2.priority)');
+    $subquery2->where('tt2.pid <> t.id');
+
+    // Create subquery 3, which is just a normal query object.
+    $subquery3 = db_select('test_task', 'tt3');
+    $subquery3->addExpression('AVG(tt3.priority)');
+    $subquery3->where('tt3.pid <> t.id');
+
+    // Create another query that adds a clause using the subqueries.
+    $select = db_select('test', 't');
+    $select->addField('t', 'name');
+    $select->condition($subquery1, [$subquery2, $subquery3], 'BETWEEN');
+
+    // The resulting query should be equivalent to:
+    // SELECT t.name AS name
+    // FROM {test} t
+    // WHERE (SELECT AVG(tt.priority) AS expression FROM {test_task} tt WHERE (tt.pid = t.id))
+    //   BETWEEN (SELECT MIN(tt2.priority) AS expression FROM {test_task} tt2 WHERE (tt2.pid <> t.id))
+    //       AND (SELECT AVG(tt3.priority) AS expression FROM {test_task} tt3 WHERE (tt3.pid <> t.id));
+    $people = $select->execute()->fetchCol();
+    $this->assertEquals(['George', 'Paul'], $people, 'Returned George and Paul.', 0.0, 10, TRUE);
   }
 
   /**
    * Tests that we can use a subquery in a JOIN clause.
    */
-  function testJoinSubquerySelect() {
+  public function testJoinSubquerySelect() {
     // Create a subquery, which is just a normal query object.
     $subquery = db_select('test_task', 'tt');
     $subquery->addField('tt', 'pid', 'pid');
@@ -113,7 +198,7 @@ class SelectSubqueryTest extends DatabaseTestBase {
     //   INNER JOIN (SELECT tt.pid AS pid FROM test_task tt WHERE priority=1) tt ON t.id=tt.pid
     $people = $select->execute()->fetchCol();
 
-    $this->assertEqual(count($people), 2, 'Returned the correct number of rows.');
+    $this->assertCount(2, $people, 'Returned the correct number of rows.');
   }
 
   /**
@@ -122,28 +207,28 @@ class SelectSubqueryTest extends DatabaseTestBase {
    * We essentially select all rows from the {test} table that have matching
    * rows in the {test_people} table based on the shared name column.
    */
-  function testExistsSubquerySelect() {
+  public function testExistsSubquerySelect() {
     // Put George into {test_people}.
     db_insert('test_people')
-      ->fields(array(
+      ->fields([
         'name' => 'George',
         'age' => 27,
         'job' => 'Singer',
-      ))
+      ])
       ->execute();
     // Base query to {test}.
     $query = db_select('test', 't')
-      ->fields('t', array('name'));
+      ->fields('t', ['name']);
     // Subquery to {test_people}.
     $subquery = db_select('test_people', 'tp')
-      ->fields('tp', array('name'))
+      ->fields('tp', ['name'])
       ->where('tp.name = t.name');
     $query->exists($subquery);
     $result = $query->execute();
 
     // Ensure that we got the right record.
     $record = $result->fetch();
-    $this->assertEqual($record->name, 'George', 'Fetched name is correct using EXISTS query.');
+    $this->assertEquals('George', $record->name, 'Fetched name is correct using EXISTS query.');
   }
 
   /**
@@ -152,28 +237,28 @@ class SelectSubqueryTest extends DatabaseTestBase {
    * We essentially select all rows from the {test} table that don't have
    * matching rows in the {test_people} table based on the shared name column.
    */
-  function testNotExistsSubquerySelect() {
+  public function testNotExistsSubquerySelect() {
     // Put George into {test_people}.
     db_insert('test_people')
-      ->fields(array(
+      ->fields([
         'name' => 'George',
         'age' => 27,
         'job' => 'Singer',
-      ))
+      ])
       ->execute();
 
     // Base query to {test}.
     $query = db_select('test', 't')
-      ->fields('t', array('name'));
+      ->fields('t', ['name']);
     // Subquery to {test_people}.
     $subquery = db_select('test_people', 'tp')
-      ->fields('tp', array('name'))
+      ->fields('tp', ['name'])
       ->where('tp.name = t.name');
     $query->notExists($subquery);
 
     // Ensure that we got the right number of records.
     $people = $query->execute()->fetchCol();
-    $this->assertEqual(count($people), 3, 'NOT EXISTS query returned the correct results.');
+    $this->assertCount(3, $people, 'NOT EXISTS query returned the correct results.');
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
index cc857a277..0d332d031 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
@@ -14,7 +14,7 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests rudimentary SELECT statements.
    */
-  function testSimpleSelect() {
+  public function testSimpleSelect() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
@@ -26,7 +26,7 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests rudimentary SELECT statement with a COMMENT.
    */
-  function testSimpleComment() {
+  public function testSimpleComment() {
     $query = db_select('test')->comment('Testing query comments');
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
@@ -44,7 +44,7 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests query COMMENT system against vulnerabilities.
    */
-  function testVulnerableComment() {
+  public function testVulnerableComment() {
     $query = db_select('test')->comment('Testing query comments */ SELECT nid FROM {node}; --');
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
@@ -68,7 +68,7 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Provides expected and input values for testVulnerableComment().
    */
-  function makeCommentsProvider() {
+  public function makeCommentsProvider() {
     return [
       [
         '/*  */ ',
@@ -99,7 +99,7 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests basic conditionals on SELECT statements.
    */
-  function testSimpleSelectConditional() {
+  public function testSimpleSelectConditional() {
     $query = db_select('test');
     $name_field = $query->addField('test', 'name');
     $age_field = $query->addField('test', 'age', 'age');
@@ -119,7 +119,7 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests SELECT statements with expressions.
    */
-  function testSimpleSelectExpression() {
+  public function testSimpleSelectExpression() {
     $query = db_select('test');
     $name_field = $query->addField('test', 'name');
     $age_field = $query->addExpression("age*2", 'double_age');
@@ -139,7 +139,7 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests SELECT statements with multiple expressions.
    */
-  function testSimpleSelectExpressionMultiple() {
+  public function testSimpleSelectExpressionMultiple() {
     $query = db_select('test');
     $name_field = $query->addField('test', 'name');
     $age_double_field = $query->addExpression("age*2");
@@ -161,9 +161,9 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests adding multiple fields to a SELECT statement at the same time.
    */
-  function testSimpleSelectMultipleFields() {
+  public function testSimpleSelectMultipleFields() {
     $record = db_select('test')
-      ->fields('test', array('id', 'name', 'age', 'job'))
+      ->fields('test', ['id', 'name', 'age', 'job'])
       ->condition('age', 27)
       ->execute()->fetchObject();
 
@@ -184,7 +184,7 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests adding all fields from a given table to a SELECT statement.
    */
-  function testSimpleSelectAllFields() {
+  public function testSimpleSelectAllFields() {
     $record = db_select('test')
       ->fields('test')
       ->condition('age', 27)
@@ -207,11 +207,11 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests that a comparison with NULL is always FALSE.
    */
-  function testNullCondition() {
+  public function testNullCondition() {
     $this->ensureSampleDataNull();
 
     $names = db_select('test_null', 'tn')
-      ->fields('tn', array('name'))
+      ->fields('tn', ['name'])
       ->condition('age', NULL)
       ->execute()->fetchCol();
 
@@ -221,11 +221,11 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests that we can find a record with a NULL value.
    */
-  function testIsNullCondition() {
+  public function testIsNullCondition() {
     $this->ensureSampleDataNull();
 
     $names = db_select('test_null', 'tn')
-      ->fields('tn', array('name'))
+      ->fields('tn', ['name'])
       ->isNull('age')
       ->execute()->fetchCol();
 
@@ -236,11 +236,11 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests that we can find a record without a NULL value.
    */
-  function testIsNotNullCondition() {
+  public function testIsNotNullCondition() {
     $this->ensureSampleDataNull();
 
     $names = db_select('test_null', 'tn')
-      ->fields('tn', array('name'))
+      ->fields('tn', ['name'])
       ->isNotNull('tn.age')
       ->orderBy('name')
       ->execute()->fetchCol();
@@ -256,13 +256,13 @@ class SelectTest extends DatabaseTestBase {
    * This is semantically equal to UNION DISTINCT, so we don't explicitly test
    * that.
    */
-  function testUnion() {
+  public function testUnion() {
     $query_1 = db_select('test', 't')
-      ->fields('t', array('name'))
-      ->condition('age', array(27, 28), 'IN');
+      ->fields('t', ['name'])
+      ->condition('age', [27, 28], 'IN');
 
     $query_2 = db_select('test', 't')
-      ->fields('t', array('name'))
+      ->fields('t', ['name'])
       ->condition('age', 28);
 
     $query_1->union($query_2);
@@ -279,13 +279,13 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests that we can UNION ALL multiple SELECT queries together.
    */
-  function testUnionAll() {
+  public function testUnionAll() {
     $query_1 = db_select('test', 't')
-      ->fields('t', array('name'))
-      ->condition('age', array(27, 28), 'IN');
+      ->fields('t', ['name'])
+      ->condition('age', [27, 28], 'IN');
 
     $query_2 = db_select('test', 't')
-      ->fields('t', array('name'))
+      ->fields('t', ['name'])
       ->condition('age', 28);
 
     $query_1->union($query_2, 'ALL');
@@ -303,13 +303,13 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests that we can get a count query for a UNION Select query.
    */
-  function testUnionCount() {
+  public function testUnionCount() {
     $query_1 = db_select('test', 't')
-      ->fields('t', array('name', 'age'))
-      ->condition('age', array(27, 28), 'IN');
+      ->fields('t', ['name', 'age'])
+      ->condition('age', [27, 28], 'IN');
 
     $query_2 = db_select('test', 't')
-      ->fields('t', array('name', 'age'))
+      ->fields('t', ['name', 'age'])
       ->condition('age', 28);
 
     $query_1->union($query_2, 'ALL');
@@ -325,15 +325,15 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests that we can UNION multiple Select queries together and set the ORDER.
    */
-  function testUnionOrder() {
+  public function testUnionOrder() {
     // This gives George and Ringo.
     $query_1 = db_select('test', 't')
-      ->fields('t', array('name'))
-      ->condition('age', array(27, 28), 'IN');
+      ->fields('t', ['name'])
+      ->condition('age', [27, 28], 'IN');
 
     // This gives Paul.
     $query_2 = db_select('test', 't')
-      ->fields('t', array('name'))
+      ->fields('t', ['name'])
       ->condition('age', 26);
 
     $query_1->union($query_2);
@@ -354,15 +354,15 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests that we can UNION multiple Select queries together with and a LIMIT.
    */
-  function testUnionOrderLimit() {
+  public function testUnionOrderLimit() {
     // This gives George and Ringo.
     $query_1 = db_select('test', 't')
-      ->fields('t', array('name'))
-      ->condition('age', array(27, 28), 'IN');
+      ->fields('t', ['name'])
+      ->condition('age', [27, 28], 'IN');
 
     // This gives Paul.
     $query_2 = db_select('test', 't')
-      ->fields('t', array('name'))
+      ->fields('t', ['name'])
       ->condition('age', 26);
 
     $query_1->union($query_2);
@@ -395,19 +395,19 @@ class SelectTest extends DatabaseTestBase {
    * order each time, the only way this could happen is if we have successfully
    * triggered the database's random ordering functionality.
    */
-  function testRandomOrder() {
+  public function testRandomOrder() {
     // Use 52 items, so the chance that this test fails by accident will be the
     // same as the chance that a deck of cards will come out in the same order
     // after shuffling it (in other words, nearly impossible).
     $number_of_items = 52;
     while (db_query("SELECT MAX(id) FROM {test}")->fetchField() < $number_of_items) {
-      db_insert('test')->fields(array('name' => $this->randomMachineName()))->execute();
+      db_insert('test')->fields(['name' => $this->randomMachineName()])->execute();
     }
 
     // First select the items in order and make sure we get an ordered list.
     $expected_ids = range(1, $number_of_items);
     $ordered_ids = db_select('test', 't')
-      ->fields('t', array('id'))
+      ->fields('t', ['id'])
       ->range(0, $number_of_items)
       ->orderBy('id')
       ->execute()
@@ -418,7 +418,7 @@ class SelectTest extends DatabaseTestBase {
     // expect this to contain a differently ordered version of the original
     // result.
     $randomized_ids = db_select('test', 't')
-      ->fields('t', array('id'))
+      ->fields('t', ['id'])
       ->range(0, $number_of_items)
       ->orderRandom()
       ->execute()
@@ -431,7 +431,7 @@ class SelectTest extends DatabaseTestBase {
     // Now perform the exact same query again, and make sure the order is
     // different.
     $randomized_ids_second_set = db_select('test', 't')
-      ->fields('t', array('id'))
+      ->fields('t', ['id'])
       ->range(0, $number_of_items)
       ->orderRandom()
       ->execute()
@@ -447,24 +447,24 @@ class SelectTest extends DatabaseTestBase {
    */
   public function testRegexCondition() {
 
-    $test_groups[] = array(
+    $test_groups[] = [
       'regex' => 'hn$',
-      'expected' => array(
+      'expected' => [
         'John',
-      ),
-    );
-    $test_groups[] = array(
+      ],
+    ];
+    $test_groups[] = [
       'regex' => '^Pau',
-      'expected' => array(
+      'expected' => [
         'Paul',
-      ),
-    );
-    $test_groups[] = array(
+      ],
+    ];
+    $test_groups[] = [
       'regex' => 'Ringo|George',
-      'expected' => array(
+      'expected' => [
         'Ringo', 'George',
-      ),
-    );
+      ],
+    ];
 
 
     $database = $this->container->get('database');
@@ -480,25 +480,25 @@ class SelectTest extends DatabaseTestBase {
 
     // Ensure that filter by "#" still works due to the quoting.
     $database->insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'Pete',
         'age' => 26,
         'job' => '#Drummer',
-      ))
+      ])
       ->execute();
 
-    $test_groups = array();
-    $test_groups[] = array(
+    $test_groups = [];
+    $test_groups[] = [
       'regex' => '#Drummer',
-      'expected' => array(
+      'expected' => [
         'Pete',
-      ),
-    );
-    $test_groups[] = array(
+      ],
+    ];
+    $test_groups[] = [
       'regex' => '#Singer',
-      'expected' => array(
-      ),
-    );
+      'expected' => [
+      ],
+    ];
 
     foreach ($test_groups as $test_group) {
       $query = $database->select('test', 't');
@@ -509,12 +509,19 @@ class SelectTest extends DatabaseTestBase {
       $this->assertEqual(count($result), count($test_group['expected']), 'Returns the expected number of rows.');
       $this->assertEqual(sort($result), sort($test_group['expected']), 'Returns the expected rows.');
     }
+
+    // Ensure that REGEXP filter still works with no-string type field.
+    $query = $database->select('test', 't');
+    $query->addField('t', 'age');
+    $query->condition('t.age', '2[6]', 'REGEXP');
+    $result = $query->execute()->fetchField();
+    $this->assertEquals($result, '26', 'Regexp with number type.');
   }
 
   /**
    * Tests that aliases are renamed when they are duplicates.
    */
-  function testSelectDuplicateAlias() {
+  public function testSelectDuplicateAlias() {
     $query = db_select('test', 't');
     $alias1 = $query->addField('t', 'name', 'the_alias');
     $alias2 = $query->addField('t', 'age', 'the_alias');
@@ -524,7 +531,7 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests that an invalid merge query throws an exception.
    */
-  function testInvalidSelectCount() {
+  public function testInvalidSelectCount() {
     try {
       // This query will fail because the table does not exist.
       // Normally it would throw an exception but we are suppressing
@@ -559,11 +566,11 @@ class SelectTest extends DatabaseTestBase {
   /**
    * Tests thrown exception for IN query conditions with an empty array.
    */
-  function testEmptyInCondition() {
+  public function testEmptyInCondition() {
     try {
       db_select('test', 't')
         ->fields('t')
-        ->condition('age', array(), 'IN')
+        ->condition('age', [], 'IN')
         ->execute();
 
       $this->fail('Expected exception not thrown');
@@ -575,7 +582,7 @@ class SelectTest extends DatabaseTestBase {
     try {
       db_select('test', 't')
         ->fields('t')
-        ->condition('age', array(), 'NOT IN')
+        ->condition('age', [], 'NOT IN')
         ->execute();
 
       $this->fail('Expected exception not thrown');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SerializeQueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SerializeQueryTest.php
index 6505484f8..357b39feb 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SerializeQueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SerializeQueryTest.php
@@ -11,7 +11,7 @@ class SerializeQueryTest extends DatabaseTestBase {
   /**
    * Confirms that a query can be serialized and unserialized.
    */
-  function testSerializeQuery() {
+  public function testSerializeQuery() {
     $query = db_select('test');
     $query->addField('test', 'age');
     $query->condition('name', 'Ringo');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/TaggingTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/TaggingTest.php
index 611b2460b..cab91381f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/TaggingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/TaggingTest.php
@@ -15,7 +15,7 @@ class TaggingTest extends DatabaseTestBase {
   /**
    * Confirms that a query has a tag added to it.
    */
-  function testHasTag() {
+  public function testHasTag() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
@@ -29,7 +29,7 @@ class TaggingTest extends DatabaseTestBase {
   /**
    * Tests query tagging "has all of these tags" functionality.
    */
-  function testHasAllTags() {
+  public function testHasAllTags() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
@@ -44,7 +44,7 @@ class TaggingTest extends DatabaseTestBase {
   /**
    * Tests query tagging "has at least one of these tags" functionality.
    */
-  function testHasAnyTag() {
+  public function testHasAnyTag() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
@@ -58,7 +58,7 @@ class TaggingTest extends DatabaseTestBase {
   /**
    * Confirms that an extended query has a tag added to it.
    */
-  function testExtenderHasTag() {
+  public function testExtenderHasTag() {
     $query = db_select('test')
       ->extend('Drupal\Core\Database\Query\SelectExtender');
     $query->addField('test', 'name');
@@ -73,7 +73,7 @@ class TaggingTest extends DatabaseTestBase {
   /**
    * Tests extended query tagging "has all of these tags" functionality.
    */
-  function testExtenderHasAllTags() {
+  public function testExtenderHasAllTags() {
     $query = db_select('test')
       ->extend('Drupal\Core\Database\Query\SelectExtender');
     $query->addField('test', 'name');
@@ -89,7 +89,7 @@ class TaggingTest extends DatabaseTestBase {
   /**
    * Tests extended query tagging "has at least one of these tags" functionality.
    */
-  function testExtenderHasAnyTag() {
+  public function testExtenderHasAnyTag() {
     $query = db_select('test')
       ->extend('Drupal\Core\Database\Query\SelectExtender');
     $query->addField('test', 'name');
@@ -106,15 +106,15 @@ class TaggingTest extends DatabaseTestBase {
    *
    * This is how we pass additional context to alter hooks.
    */
-  function testMetaData() {
+  public function testMetaData() {
     $query = db_select('test');
     $query->addField('test', 'name');
     $query->addField('test', 'age', 'age');
 
-    $data = array(
+    $data = [
       'a' => 'A',
       'b' => 'B',
-    );
+    ];
 
     $query->addMetaData('test', $data);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/TransactionTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/TransactionTest.php
index fe7de483e..a07045dd5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/TransactionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/TransactionTest.php
@@ -58,10 +58,10 @@ class TransactionTest extends DatabaseTestBase {
 
     // Insert a single row into the testing table.
     db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'David' . $suffix,
         'age' => '24',
-      ))
+      ])
       ->execute();
 
     $this->assertTrue($connection->inTransaction(), 'In transaction before calling nested transaction.');
@@ -75,8 +75,8 @@ class TransactionTest extends DatabaseTestBase {
     if ($rollback) {
       // Roll back the transaction, if requested.
       // This rollback should propagate to the last savepoint.
-      $txn->rollback();
-      $this->assertTrue(($connection->transactionDepth() == $depth), 'Transaction has rolled back to the last savepoint after calling rollback().');
+      $txn->rollBack();
+      $this->assertTrue(($connection->transactionDepth() == $depth), 'Transaction has rolled back to the last savepoint after calling rollBack().');
     }
   }
 
@@ -108,25 +108,25 @@ class TransactionTest extends DatabaseTestBase {
 
     // Insert a single row into the testing table.
     db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'Daniel' . $suffix,
         'age' => '19',
-      ))
+      ])
       ->execute();
 
     $this->assertTrue($connection->inTransaction(), 'In transaction inside nested transaction.');
 
     if ($ddl_statement) {
-      $table = array(
-        'fields' => array(
-          'id' => array(
+      $table = [
+        'fields' => [
+          'id' => [
             'type' => 'serial',
             'unsigned' => TRUE,
             'not null' => TRUE,
-          ),
-        ),
-        'primary key' => array('id'),
-      );
+          ],
+        ],
+        'primary key' => ['id'],
+      ];
       db_create_table('database_test_1', $table);
 
       $this->assertTrue($connection->inTransaction(), 'In transaction inside nested transaction.');
@@ -135,8 +135,8 @@ class TransactionTest extends DatabaseTestBase {
     if ($rollback) {
       // Roll back the transaction, if requested.
       // This rollback should propagate to the last savepoint.
-      $txn->rollback();
-      $this->assertTrue(($connection->transactionDepth() == $depth), 'Transaction has rolled back to the last savepoint after calling rollback().');
+      $txn->rollBack();
+      $this->assertTrue(($connection->transactionDepth() == $depth), 'Transaction has rolled back to the last savepoint after calling rollBack().');
     }
   }
 
@@ -146,7 +146,7 @@ class TransactionTest extends DatabaseTestBase {
    * If the active connection does not support transactions, this test does
    * nothing.
    */
-  function testTransactionRollBackSupported() {
+  public function testTransactionRollBackSupported() {
     // This test won't work right if transactions are not supported.
     if (!Database::getConnection()->supportsTransactions()) {
       return;
@@ -157,9 +157,9 @@ class TransactionTest extends DatabaseTestBase {
 
       // Neither of the rows we inserted in the two transaction layers
       // should be present in the tables post-rollback.
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidB'))->fetchField();
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'DavidB'])->fetchField();
       $this->assertNotIdentical($saved_age, '24', 'Cannot retrieve DavidB row after commit.');
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielB'))->fetchField();
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'DanielB'])->fetchField();
       $this->assertNotIdentical($saved_age, '19', 'Cannot retrieve DanielB row after commit.');
     }
     catch (\Exception $e) {
@@ -172,7 +172,7 @@ class TransactionTest extends DatabaseTestBase {
    *
    * If the active driver supports transactions, this test does nothing.
    */
-  function testTransactionRollBackNotSupported() {
+  public function testTransactionRollBackNotSupported() {
     // This test won't work right if transactions are supported.
     if (Database::getConnection()->supportsTransactions()) {
       return;
@@ -183,9 +183,9 @@ class TransactionTest extends DatabaseTestBase {
 
       // Because our current database claims to not support transactions,
       // the inserted rows should be present despite the attempt to roll back.
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidB'))->fetchField();
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'DavidB'])->fetchField();
       $this->assertIdentical($saved_age, '24', 'DavidB not rolled back, since transactions are not supported.');
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielB'))->fetchField();
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'DanielB'])->fetchField();
       $this->assertIdentical($saved_age, '19', 'DanielB not rolled back, since transactions are not supported.');
     }
     catch (\Exception $e) {
@@ -199,15 +199,15 @@ class TransactionTest extends DatabaseTestBase {
    * The behavior of this test should be identical for connections that support
    * transactions and those that do not.
    */
-  function testCommittedTransaction() {
+  public function testCommittedTransaction() {
     try {
       // Create two nested transactions. The changes should be committed.
       $this->transactionOuterLayer('A');
 
       // Because we committed, both of the inserted rows should be present.
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidA'))->fetchField();
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'DavidA'])->fetchField();
       $this->assertIdentical($saved_age, '24', 'Can retrieve DavidA row after commit.');
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielA'))->fetchField();
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'DanielA'])->fetchField();
       $this->assertIdentical($saved_age, '19', 'Can retrieve DanielA row after commit.');
     }
     catch (\Exception $e) {
@@ -218,7 +218,7 @@ class TransactionTest extends DatabaseTestBase {
   /**
    * Tests the compatibility of transactions with DDL statements.
    */
-  function testTransactionWithDdlStatement() {
+  public function testTransactionWithDdlStatement() {
     // First, test that a commit works normally, even with DDL statements.
     $transaction = db_transaction();
     $this->insertRow('row');
@@ -254,7 +254,7 @@ class TransactionTest extends DatabaseTestBase {
     unset($transaction2);
     $transaction3 = db_transaction();
     $this->insertRow('row');
-    $transaction3->rollback();
+    $transaction3->rollBack();
     unset($transaction3);
     unset($transaction);
     $this->assertRowAbsent('row');
@@ -267,7 +267,7 @@ class TransactionTest extends DatabaseTestBase {
       $transaction = db_transaction();
       $this->insertRow('row');
       $this->executeDDLStatement();
-      $transaction->rollback();
+      $transaction->rollBack();
       unset($transaction);
       $this->assertRowAbsent('row');
 
@@ -280,7 +280,7 @@ class TransactionTest extends DatabaseTestBase {
       $transaction3 = db_transaction();
       $this->insertRow('row');
       unset($transaction3);
-      $transaction->rollback();
+      $transaction->rollBack();
       unset($transaction);
       $this->assertRowAbsent('row');
     }
@@ -293,7 +293,7 @@ class TransactionTest extends DatabaseTestBase {
       $this->executeDDLStatement();
       // Rollback the outer transaction.
       try {
-        $transaction->rollback();
+        $transaction->rollBack();
         unset($transaction);
         // @TODO: an exception should be triggered here, but is not, because
         // "ROLLBACK" fails silently in MySQL if there is no transaction active.
@@ -311,9 +311,9 @@ class TransactionTest extends DatabaseTestBase {
    */
   protected function insertRow($name) {
     db_insert('test')
-      ->fields(array(
+      ->fields([
         'name' => $name,
-      ))
+      ])
       ->execute();
   }
 
@@ -322,16 +322,16 @@ class TransactionTest extends DatabaseTestBase {
    */
   protected function executeDDLStatement() {
     static $count = 0;
-    $table = array(
-      'fields' => array(
-        'id' => array(
+    $table = [
+      'fields' => [
+        'id' => [
           'type' => 'serial',
           'unsigned' => TRUE,
           'not null' => TRUE,
-        ),
-      ),
-      'primary key' => array('id'),
-    );
+        ],
+      ],
+      'primary key' => ['id'],
+    ];
     db_create_table('database_test_' . ++$count, $table);
   }
 
@@ -351,11 +351,11 @@ class TransactionTest extends DatabaseTestBase {
    * @param $message
    *   The message to log for the assertion.
    */
-  function assertRowPresent($name, $message = NULL) {
+  public function assertRowPresent($name, $message = NULL) {
     if (!isset($message)) {
-      $message = format_string('Row %name is present.', array('%name' => $name));
+      $message = format_string('Row %name is present.', ['%name' => $name]);
     }
-    $present = (boolean) db_query('SELECT 1 FROM {test} WHERE name = :name', array(':name' => $name))->fetchField();
+    $present = (boolean) db_query('SELECT 1 FROM {test} WHERE name = :name', [':name' => $name])->fetchField();
     return $this->assertTrue($present, $message);
   }
 
@@ -367,18 +367,18 @@ class TransactionTest extends DatabaseTestBase {
    * @param $message
    *   The message to log for the assertion.
    */
-  function assertRowAbsent($name, $message = NULL) {
+  public function assertRowAbsent($name, $message = NULL) {
     if (!isset($message)) {
-      $message = format_string('Row %name is absent.', array('%name' => $name));
+      $message = format_string('Row %name is absent.', ['%name' => $name]);
     }
-    $present = (boolean) db_query('SELECT 1 FROM {test} WHERE name = :name', array(':name' => $name))->fetchField();
+    $present = (boolean) db_query('SELECT 1 FROM {test} WHERE name = :name', [':name' => $name])->fetchField();
     return $this->assertFalse($present, $message);
   }
 
   /**
    * Tests transaction stacking, commit, and rollback.
    */
-  function testTransactionStacking() {
+  public function testTransactionStacking() {
     // This test won't work right if transactions are not supported.
     if (!Database::getConnection()->supportsTransactions()) {
       return;
@@ -424,7 +424,7 @@ class TransactionTest extends DatabaseTestBase {
     $transaction2 = db_transaction();
     $this->insertRow('inner');
     // Now rollback the inner transaction.
-    $transaction2->rollback();
+    $transaction2->rollBack();
     unset($transaction2);
     $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
     // Pop the outer transaction, it should commit.
@@ -445,7 +445,7 @@ class TransactionTest extends DatabaseTestBase {
     unset($transaction);
     $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
     // Now rollback the inner transaction, it should rollback.
-    $transaction2->rollback();
+    $transaction2->rollBack();
     unset($transaction2);
     $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the inner transaction');
     $this->assertRowPresent('outer');
@@ -463,7 +463,7 @@ class TransactionTest extends DatabaseTestBase {
     $this->insertRow('inner2');
     // Rollback the outer transaction.
     try {
-      $transaction->rollback();
+      $transaction->rollBack();
       unset($transaction);
       $this->fail('Rolling back the outer transaction while the inner transaction is active resulted in an exception.');
     }
@@ -476,7 +476,7 @@ class TransactionTest extends DatabaseTestBase {
     $this->pass('Trying to commit an inner transaction resulted in an exception.');
     // Try to rollback one inner transaction.
     try {
-      $transaction->rollback();
+      $transaction->rollBack();
       unset($transaction2);
       $this->fail('Trying to commit an inner transaction resulted in an exception.');
     }
@@ -498,7 +498,7 @@ class TransactionTest extends DatabaseTestBase {
 
     // Test a failed query using the query() method.
     try {
-      $connection->query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'David'))->fetchField();
+      $connection->query('SELECT age FROM {test} WHERE name = :name', [':name' => 'David'])->fetchField();
       $this->fail('Using the query method failed.');
     }
     catch (\Exception $e) {
@@ -594,16 +594,16 @@ class TransactionTest extends DatabaseTestBase {
     // Create the missing schema and insert a row.
     $this->installSchema('database_test', ['test']);
     $connection->insert('test')
-      ->fields(array(
+      ->fields([
         'name' => 'David',
         'age' => '24',
-      ))
+      ])
       ->execute();
 
     // Commit the transaction.
     unset($transaction);
 
-    $saved_age = $connection->query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'David'))->fetchField();
+    $saved_age = $connection->query('SELECT age FROM {test} WHERE name = :name', [':name' => 'David'])->fetchField();
     $this->assertEqual('24', $saved_age);
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/UpdateComplexTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/UpdateComplexTest.php
index 74eb0f1f0..3920826de 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/UpdateComplexTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/UpdateComplexTest.php
@@ -12,9 +12,9 @@ class UpdateComplexTest extends DatabaseTestBase {
   /**
    * Tests updates with OR conditionals.
    */
-  function testOrConditionUpdate() {
+  public function testOrConditionUpdate() {
     $update = db_update('test')
-      ->fields(array('job' => 'Musician'))
+      ->fields(['job' => 'Musician'])
       ->condition(db_or()
         ->condition('name', 'John')
         ->condition('name', 'Paul')
@@ -22,112 +22,110 @@ class UpdateComplexTest extends DatabaseTestBase {
     $num_updated = $update->execute();
     $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
 
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', [':job' => 'Musician'])->fetchField();
     $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
   }
 
   /**
    * Tests WHERE IN clauses.
    */
-  function testInConditionUpdate() {
+  public function testInConditionUpdate() {
     $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->condition('name', array('John', 'Paul'), 'IN')
+      ->fields(['job' => 'Musician'])
+      ->condition('name', ['John', 'Paul'], 'IN')
       ->execute();
     $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
 
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', [':job' => 'Musician'])->fetchField();
     $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
   }
 
   /**
    * Tests WHERE NOT IN clauses.
    */
-  function testNotInConditionUpdate() {
+  public function testNotInConditionUpdate() {
     // The o is lowercase in the 'NoT IN' operator, to make sure the operators
     // work in mixed case.
     $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->condition('name', array('John', 'Paul', 'George'), 'NoT IN')
+      ->fields(['job' => 'Musician'])
+      ->condition('name', ['John', 'Paul', 'George'], 'NoT IN')
       ->execute();
     $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
 
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', [':job' => 'Musician'])->fetchField();
     $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
   }
 
   /**
    * Tests BETWEEN conditional clauses.
    */
-  function testBetweenConditionUpdate() {
+  public function testBetweenConditionUpdate() {
     $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->condition('age', array(25, 26), 'BETWEEN')
+      ->fields(['job' => 'Musician'])
+      ->condition('age', [25, 26], 'BETWEEN')
       ->execute();
     $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
 
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', [':job' => 'Musician'])->fetchField();
     $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
   }
 
   /**
    * Tests LIKE conditionals.
    */
-  function testLikeConditionUpdate() {
+  public function testLikeConditionUpdate() {
     $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
+      ->fields(['job' => 'Musician'])
       ->condition('name', '%ge%', 'LIKE')
       ->execute();
     $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
 
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', [':job' => 'Musician'])->fetchField();
     $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
   }
 
   /**
    * Tests UPDATE with expression values.
    */
-  function testUpdateExpression() {
-    $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
-    $GLOBALS['larry_test'] = 1;
+  public function testUpdateExpression() {
+    $before_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'])->fetchField();
     $num_updated = db_update('test')
       ->condition('name', 'Ringo')
-      ->fields(array('job' => 'Musician'))
-      ->expression('age', 'age + :age', array(':age' => 4))
+      ->fields(['job' => 'Musician'])
+      ->expression('age', 'age + :age', [':age' => 4])
       ->execute();
     $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
 
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', [':job' => 'Musician'])->fetchField();
     $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
 
-    $person = db_query('SELECT * FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetch();
+    $person = db_query('SELECT * FROM {test} WHERE name = :name', [':name' => 'Ringo'])->fetch();
     $this->assertEqual($person->name, 'Ringo', 'Name set correctly.');
     $this->assertEqual($person->age, $before_age + 4, 'Age set correctly.');
     $this->assertEqual($person->job, 'Musician', 'Job set correctly.');
-    $GLOBALS['larry_test'] = 0;
   }
 
   /**
    * Tests UPDATE with only expression values.
    */
-  function testUpdateOnlyExpression() {
-    $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
+  public function testUpdateOnlyExpression() {
+    $before_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'])->fetchField();
     $num_updated = db_update('test')
       ->condition('name', 'Ringo')
-      ->expression('age', 'age + :age', array(':age' => 4))
+      ->expression('age', 'age + :age', [':age' => 4])
       ->execute();
     $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
 
-    $after_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
+    $after_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'])->fetchField();
     $this->assertEqual($before_age + 4, $after_age, 'Age updated correctly');
   }
 
   /**
    * Test UPDATE with a subselect value.
    */
-  function testSubSelectUpdate() {
+  public function testSubSelectUpdate() {
     $subselect = db_select('test_task', 't');
-    $subselect->addExpression('MAX(priority) + :increment', 'max_priority', array(':increment' => 30));
+    $subselect->addExpression('MAX(priority) + :increment', 'max_priority', [':increment' => 30]);
     // Clone this to make sure we are running a different query when
     // asserting.
     $select = clone $subselect;
@@ -136,7 +134,7 @@ class UpdateComplexTest extends DatabaseTestBase {
       ->condition('name', 'Ringo');
     // Save the number of rows that updated for assertion later.
     $num_updated = $query->execute();
-    $after_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
+    $after_age = db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'])->fetchField();
     $expected_age = $select->execute()->fetchField();
     $this->assertEqual($after_age, $expected_age);
     $this->assertEqual(1, $num_updated, t('Expected 1 row to be updated in subselect update query.'));
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/UpdateLobTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/UpdateLobTest.php
index 57a141835..501f91831 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/UpdateLobTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/UpdateLobTest.php
@@ -12,40 +12,40 @@ class UpdateLobTest extends DatabaseTestBase {
   /**
    * Confirms that we can update a blob column.
    */
-  function testUpdateOneBlob() {
+  public function testUpdateOneBlob() {
     $data = "This is\000a test.";
     $this->assertTrue(strlen($data) === 15, 'Test data contains a NULL.');
     $id = db_insert('test_one_blob')
-      ->fields(array('blob1' => $data))
+      ->fields(['blob1' => $data])
       ->execute();
 
     $data .= $data;
     db_update('test_one_blob')
       ->condition('id', $id)
-      ->fields(array('blob1' => $data))
+      ->fields(['blob1' => $data])
       ->execute();
 
-    $r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', array(':id' => $id))->fetchAssoc();
-    $this->assertTrue($r['blob1'] === $data, format_string('Can update a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
+    $r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', [':id' => $id])->fetchAssoc();
+    $this->assertTrue($r['blob1'] === $data, format_string('Can update a blob: id @id, @data.', ['@id' => $id, '@data' => serialize($r)]));
   }
 
   /**
    * Confirms that we can update two blob columns in the same table.
    */
-  function testUpdateMultipleBlob() {
+  public function testUpdateMultipleBlob() {
     $id = db_insert('test_two_blobs')
-      ->fields(array(
+      ->fields([
         'blob1' => 'This is',
         'blob2' => 'a test',
-      ))
+      ])
       ->execute();
 
     db_update('test_two_blobs')
       ->condition('id', $id)
-      ->fields(array('blob1' => 'and so', 'blob2' => 'is this'))
+      ->fields(['blob1' => 'and so', 'blob2' => 'is this'])
       ->execute();
 
-    $r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', array(':id' => $id))->fetchAssoc();
+    $r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', [':id' => $id])->fetchAssoc();
     $this->assertTrue($r['blob1'] === 'and so' && $r['blob2'] === 'is this', 'Can update multiple blobs per row.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/UpdateTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/UpdateTest.php
index 25ad3cbac..6bc91316f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/UpdateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/UpdateTest.php
@@ -12,93 +12,93 @@ class UpdateTest extends DatabaseTestBase {
   /**
    * Confirms that we can update a single record successfully.
    */
-  function testSimpleUpdate() {
+  public function testSimpleUpdate() {
     $num_updated = db_update('test')
-      ->fields(array('name' => 'Tiffany'))
+      ->fields(['name' => 'Tiffany'])
       ->condition('id', 1)
       ->execute();
     $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
 
-    $saved_name = db_query('SELECT name FROM {test} WHERE id = :id', array(':id' => 1))->fetchField();
+    $saved_name = db_query('SELECT name FROM {test} WHERE id = :id', [':id' => 1])->fetchField();
     $this->assertIdentical($saved_name, 'Tiffany', 'Updated name successfully.');
   }
 
   /**
    * Confirms updating to NULL.
    */
-  function testSimpleNullUpdate() {
+  public function testSimpleNullUpdate() {
     $this->ensureSampleDataNull();
     $num_updated = db_update('test_null')
-      ->fields(array('age' => NULL))
+      ->fields(['age' => NULL])
       ->condition('name', 'Kermit')
       ->execute();
     $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
 
-    $saved_age = db_query('SELECT age FROM {test_null} WHERE name = :name', array(':name' => 'Kermit'))->fetchField();
+    $saved_age = db_query('SELECT age FROM {test_null} WHERE name = :name', [':name' => 'Kermit'])->fetchField();
     $this->assertNull($saved_age, 'Updated name successfully.');
   }
 
   /**
    * Confirms that we can update multiple records successfully.
    */
-  function testMultiUpdate() {
+  public function testMultiUpdate() {
     $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
+      ->fields(['job' => 'Musician'])
       ->condition('job', 'Singer')
       ->execute();
     $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
 
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', [':job' => 'Musician'])->fetchField();
     $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
   }
 
   /**
    * Confirms that we can update multiple records with a non-equality condition.
    */
-  function testMultiGTUpdate() {
+  public function testMultiGTUpdate() {
     $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
+      ->fields(['job' => 'Musician'])
       ->condition('age', 26, '>')
       ->execute();
     $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
 
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', [':job' => 'Musician'])->fetchField();
     $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
   }
 
   /**
    * Confirms that we can update multiple records with a where call.
    */
-  function testWhereUpdate() {
+  public function testWhereUpdate() {
     $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->where('age > :age', array(':age' => 26))
+      ->fields(['job' => 'Musician'])
+      ->where('age > :age', [':age' => 26])
       ->execute();
     $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
 
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', [':job' => 'Musician'])->fetchField();
     $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
   }
 
   /**
    * Confirms that we can stack condition and where calls.
    */
-  function testWhereAndConditionUpdate() {
+  public function testWhereAndConditionUpdate() {
     $update = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->where('age > :age', array(':age' => 26))
+      ->fields(['job' => 'Musician'])
+      ->where('age > :age', [':age' => 26])
       ->condition('name', 'Ringo');
     $num_updated = $update->execute();
     $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
 
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', [':job' => 'Musician'])->fetchField();
     $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
   }
 
   /**
    * Tests updating with expressions.
    */
-  function testExpressionUpdate() {
+  public function testExpressionUpdate() {
     // Ensure that expressions are handled properly. This should set every
     // record's age to a square of itself.
     $num_rows = db_update('test')
@@ -106,14 +106,14 @@ class UpdateTest extends DatabaseTestBase {
       ->execute();
     $this->assertIdentical($num_rows, 4, 'Updated 4 records.');
 
-    $saved_name = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => pow(26, 2)))->fetchField();
+    $saved_name = db_query('SELECT name FROM {test} WHERE age = :age', [':age' => pow(26, 2)])->fetchField();
     $this->assertIdentical($saved_name, 'Paul', 'Successfully updated values using an algebraic expression.');
   }
 
   /**
    * Tests return value on update.
    */
-  function testUpdateAffectedRows() {
+  public function testUpdateAffectedRows() {
     // At 5am in the morning, all band members but those with a priority 1 task
     // are sleeping. So we set their tasks to 'sleep'. 5 records match the
     // condition and therefore are affected by the query, even though two of
@@ -122,7 +122,7 @@ class UpdateTest extends DatabaseTestBase {
     // because that's cross-db expected behavior.
     $num_rows = db_update('test_task')
       ->condition('priority', 1, '<>')
-      ->fields(array('task' => 'sleep'))
+      ->fields(['task' => 'sleep'])
       ->execute();
     $this->assertIdentical($num_rows, 5, 'Correctly returned 5 affected rows.');
   }
@@ -130,28 +130,28 @@ class UpdateTest extends DatabaseTestBase {
   /**
    * Confirm that we can update the primary key of a record successfully.
    */
-  function testPrimaryKeyUpdate() {
+  public function testPrimaryKeyUpdate() {
     $num_updated = db_update('test')
-      ->fields(array('id' => 42, 'name' => 'John'))
+      ->fields(['id' => 42, 'name' => 'John'])
       ->condition('id', 1)
       ->execute();
     $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
 
-    $saved_name = db_query('SELECT name FROM {test} WHERE id = :id', array(':id' => 42))->fetchField();
+    $saved_name = db_query('SELECT name FROM {test} WHERE id = :id', [':id' => 42])->fetchField();
     $this->assertIdentical($saved_name, 'John', 'Updated primary key successfully.');
   }
 
   /**
    * Confirm that we can update values in a column with special name.
    */
-  function testSpecialColumnUpdate() {
+  public function testSpecialColumnUpdate() {
     $num_updated = db_update('test_special_columns')
-      ->fields(array('offset' => 'New offset value'))
+      ->fields(['offset' => 'New offset value'])
       ->condition('id', 1)
       ->execute();
     $this->assertIdentical($num_updated, 1, 'Updated 1 special column record.');
 
-    $saved_value = db_query('SELECT "offset" FROM {test_special_columns} WHERE id = :id', array(':id' => 1))->fetchField();
+    $saved_value = db_query('SELECT "offset" FROM {test_special_columns} WHERE id = :id', [':id' => 1])->fetchField();
     $this->assertIdentical($saved_value, 'New offset value', 'Updated special column name value successfully.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/UpsertTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/UpsertTest.php
index 9b8e167eb..5c62f87f6 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/UpsertTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/UpsertTest.php
@@ -42,12 +42,12 @@ class UpsertTest extends DatabaseTestBase {
     $num_records_after = $connection->query('SELECT COUNT(*) FROM {test_people}')->fetchField();
     $this->assertEqual($num_records_before + 1, $num_records_after, 'Rows were inserted and updated properly.');
 
-    $person = $connection->query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
+    $person = $connection->query('SELECT * FROM {test_people} WHERE job = :job', [':job' => 'Presenter'])->fetch();
     $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
     $this->assertEqual($person->age, 31, 'Age set correctly.');
     $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
 
-    $person = $connection->query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $person = $connection->query('SELECT * FROM {test_people} WHERE job = :job', [':job' => 'Speaker'])->fetch();
     $this->assertEqual($person->job, 'Speaker', 'Job was not changed.');
     $this->assertEqual($person->age, 32, 'Age updated correctly.');
     $this->assertEqual($person->name, 'Meredith', 'Name was not changed.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Datetime/FormatDateTest.php b/web/core/tests/Drupal/KernelTests/Core/Datetime/FormatDateTest.php
index 5fbb4dff0..036b385ae 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Datetime/FormatDateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Datetime/FormatDateTest.php
@@ -51,6 +51,8 @@ class FormatDateTest extends KernelTestBase {
   public function testFormatDate() {
     /** @var \Drupal\Core\Datetime\DateFormatterInterface $formatter */
     $formatter = $this->container->get('date.formatter');
+    /** @var \Drupal\Core\Language\LanguageManagerInterface $language_manager */
+    $language_manager = $this->container->get('language_manager');
 
     $timestamp = strtotime('2007-03-26T00:00:00+00:00');
     $this->assertSame('Sunday, 25-Mar-07 17:00:00 PDT', $formatter->format($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Test all parameters.');
@@ -59,6 +61,14 @@ class FormatDateTest extends KernelTestBase {
     $this->assertSame('\\domingo, 25-Mar-07 17:00:00 PDT', $formatter->format($timestamp, 'custom', '\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'Test format containing backslash character.');
     $this->assertSame('\\l, 25-Mar-07 17:00:00 PDT', $formatter->format($timestamp, 'custom', '\\\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'Test format containing backslash followed by escaped format string.');
     $this->assertSame('Monday, 26-Mar-07 01:00:00 BST', $formatter->format($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London', 'en'), 'Test a different time zone.');
+    $this->assertSame('Thu, 01/01/1970 - 00:00', $formatter->format(0, 'custom', '', 'UTC', 'en'), 'Test custom format with empty string.');
+
+    // Make sure we didn't change the configuration override language.
+    $this->assertSame('en', $language_manager->getConfigOverrideLanguage()->getId(), 'Configuration override language not disturbed,');
+
+    // Test bad format string will use the fallback format.
+    $this->assertSame($formatter->format($timestamp, 'fallback'), $formatter->format($timestamp, 'bad_format_string'), 'Test fallback format.');
+    $this->assertSame('en', $language_manager->getConfigOverrideLanguage()->getId(), 'Configuration override language not disturbed,');
 
     // Change the default language and timezone.
     $this->config('system.site')->set('default_langcode', static::LANGCODE)->save();
@@ -66,7 +76,8 @@ class FormatDateTest extends KernelTestBase {
 
     // Reset the language manager so new negotiations attempts will fall back on
     // on the new language.
-    $this->container->get('language_manager')->reset();
+    $language_manager->reset();
+    $this->assertSame('en', $language_manager->getConfigOverrideLanguage()->getId(), 'Configuration override language not disturbed,');
 
     $this->assertSame('Sunday, 25-Mar-07 17:00:00 PDT', $formatter->format($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Test a different language.');
     $this->assertSame('Monday, 26-Mar-07 01:00:00 BST', $formatter->format($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London'), 'Test a different time zone.');
@@ -84,6 +95,13 @@ class FormatDateTest extends KernelTestBase {
     $this->assertSame('2007-03', $formatter->format($timestamp, 'html_month'), 'Test html_month date format.');
     $this->assertSame('2007', $formatter->format($timestamp, 'html_year'), 'Test html_year date format.');
 
+    // Make sure we didn't change the configuration override language.
+    $this->assertSame('en', $language_manager->getConfigOverrideLanguage()->getId(), 'Configuration override language not disturbed,');
+
+    // Test bad format string will use the fallback format.
+    $this->assertSame($formatter->format($timestamp, 'fallback'), $formatter->format($timestamp, 'bad_format_string'), 'Test fallback format.');
+    $this->assertSame('en', $language_manager->getConfigOverrideLanguage()->getId(), 'Configuration override language not disturbed,');
+
     // HTML is not escaped by the date formatter, it must be escaped later.
     $this->assertSame("<script>alert('2007');</script>", $formatter->format($timestamp, 'custom', '\<\s\c\r\i\p\t\>\a\l\e\r\t\(\'Y\'\)\;\<\/\s\c\r\i\p\t\>'), 'Script tags not removed from dates.');
     $this->assertSame('<em>2007</em>', $formatter->format($timestamp, 'custom', '\<\e\m\>Y\<\/\e\m\>'), 'Em tags are not removed from dates.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php b/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
index 7778a5a45..737049181 100644
--- a/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
@@ -60,10 +60,10 @@ class DrupalKernelTest extends KernelTestBase {
    */
   public function testCompileDIC() {
     // @todo: write a memory based storage backend for testing.
-    $modules_enabled = array(
+    $modules_enabled = [
       'system' => 'system',
       'user' => 'user',
-    );
+    ];
 
     $request = Request::createFromGlobals();
     $this->getTestKernel($request, $modules_enabled);
@@ -128,11 +128,11 @@ class DrupalKernelTest extends KernelTestBase {
 
     // Check that the location of the new module is registered.
     $modules = $container->getParameter('container.modules');
-    $this->assertEqual($modules['service_provider_test'], array(
+    $this->assertEqual($modules['service_provider_test'], [
       'type' => 'module',
       'pathname' => drupal_get_filename('module', 'service_provider_test'),
       'filename' => NULL,
-    ));
+    ]);
 
     // Check that the container itself is not among the persist IDs because it
     // does not make sense to persist the container itself.
@@ -169,10 +169,10 @@ class DrupalKernelTest extends KernelTestBase {
    */
   public function testPreventChangeOfSitePath() {
     // @todo: write a memory based storage backend for testing.
-    $modules_enabled = array(
+    $modules_enabled = [
       'system' => 'system',
       'user' => 'user',
-    );
+    ];
 
     $request = Request::createFromGlobals();
     $kernel = $this->getTestKernel($request, $modules_enabled);
diff --git a/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/ServiceDestructionTest.php b/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/ServiceDestructionTest.php
index f4fe09450..1716280d5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/ServiceDestructionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/ServiceDestructionTest.php
@@ -17,7 +17,7 @@ class ServiceDestructionTest extends KernelTestBase {
    */
   public function testDestructionUsed() {
     // Enable the test module to add it to the container.
-    $this->enableModules(array('service_provider_test'));
+    $this->enableModules(['service_provider_test']);
 
     $request = $this->container->get('request_stack')->getCurrentRequest();
     $kernel = $this->container->get('kernel');
@@ -39,7 +39,7 @@ class ServiceDestructionTest extends KernelTestBase {
    */
   public function testDestructionUnused() {
     // Enable the test module to add it to the container.
-    $this->enableModules(array('service_provider_test'));
+    $this->enableModules(['service_provider_test']);
 
     $request = $this->container->get('request_stack')->getCurrentRequest();
     $kernel = $this->container->get('kernel');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Element/PathElementFormTest.php b/web/core/tests/Drupal/KernelTests/Core/Element/PathElementFormTest.php
index ca4e5015c..b5b9ffd5e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Element/PathElementFormTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Element/PathElementFormTest.php
@@ -30,7 +30,7 @@ class PathElementFormTest extends KernelTestBase implements FormInterface {
    *
    * @var array
    */
-  public static $modules = array('system', 'user');
+  public static $modules = ['system', 'user'];
 
   /**
    * Sets up the test.
@@ -41,16 +41,16 @@ class PathElementFormTest extends KernelTestBase implements FormInterface {
     $this->installEntitySchema('user');
     \Drupal::service('router.builder')->rebuild();
     /** @var \Drupal\user\RoleInterface $role */
-    $role = Role::create(array(
+    $role = Role::create([
       'id' => 'admin',
       'label' => 'admin',
-    ));
+    ]);
     $role->grantPermission('link to any page');
     $role->save();
-    $this->testUser = User::create(array(
+    $this->testUser = User::create([
       'name' => 'foobar',
       'mail' => 'foobar@example.com',
-    ));
+    ]);
     $this->testUser->addRole($role->id());
     $this->testUser->save();
     \Drupal::service('current_user')->setAccount($this->testUser);
@@ -68,57 +68,57 @@ class PathElementFormTest extends KernelTestBase implements FormInterface {
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     // A required validated path.
-    $form['required_validate'] = array(
+    $form['required_validate'] = [
       '#type' => 'path',
       '#required' => TRUE,
       '#title' => 'required_validate',
       '#convert_path' => PathElement::CONVERT_NONE,
-    );
+    ];
 
     // A non validated required path.
-    $form['required_non_validate'] = array(
+    $form['required_non_validate'] = [
       '#type' => 'path',
       '#required' => TRUE,
       '#title' => 'required_non_validate',
       '#convert_path' => PathElement::CONVERT_NONE,
       '#validate_path' => FALSE,
-    );
+    ];
 
     // A non required validated path.
-    $form['optional_validate'] = array(
+    $form['optional_validate'] = [
       '#type' => 'path',
       '#required' => FALSE,
       '#title' => 'optional_validate',
       '#convert_path' => PathElement::CONVERT_NONE,
-    );
+    ];
 
     // A non required converted path.
-    $form['optional_validate'] = array(
+    $form['optional_validate'] = [
       '#type' => 'path',
       '#required' => FALSE,
       '#title' => 'optional_validate',
       '#convert_path' => PathElement::CONVERT_ROUTE,
-    );
+    ];
 
     // A converted required validated path.
-    $form['required_validate_route'] = array(
+    $form['required_validate_route'] = [
       '#type' => 'path',
       '#required' => TRUE,
       '#title' => 'required_validate_route',
-    );
+    ];
 
     // A converted required validated path.
-    $form['required_validate_url'] = array(
+    $form['required_validate_url'] = [
       '#type' => 'path',
       '#required' => TRUE,
       '#title' => 'required_validate_url',
       '#convert_path' => PathElement::CONVERT_URL,
-    );
+    ];
 
-    $form['submit'] = array(
+    $form['submit'] = [
       '#type' => 'submit',
       '#value' => t('Submit'),
-    );
+    ];
 
     return $form;
   }
@@ -154,19 +154,19 @@ class PathElementFormTest extends KernelTestBase implements FormInterface {
 
     // Valid form state.
     $this->assertEqual(count($form_state->getErrors()), 0);
-    $this->assertEqual($form_state->getValue('required_validate_route'), array(
+    $this->assertEqual($form_state->getValue('required_validate_route'), [
       'route_name' => 'entity.user.canonical',
-      'route_parameters' => array(
+      'route_parameters' => [
         'user' => $this->testUser->id(),
-      ),
-    ));
+      ],
+    ]);
     /** @var \Drupal\Core\Url $url */
     $url = $form_state->getValue('required_validate_url');
     $this->assertTrue($url instanceof Url);
     $this->assertEqual($url->getRouteName(), 'entity.user.canonical');
-    $this->assertEqual($url->getRouteParameters(), array(
+    $this->assertEqual($url->getRouteParameters(), [
       'user' => $this->testUser->id(),
-    ));
+    ]);
 
     // Test #required.
     $form_state = (new FormState())
@@ -179,7 +179,7 @@ class PathElementFormTest extends KernelTestBase implements FormInterface {
     $errors = $form_state->getErrors();
     // Should be missing 'required_validate' field.
     $this->assertEqual(count($errors), 1);
-    $this->assertEqual($errors, array('required_validate' => t('@name field is required.', array('@name' => 'required_validate'))));
+    $this->assertEqual($errors, ['required_validate' => t('@name field is required.', ['@name' => 'required_validate'])]);
 
     // Test invalid parameters.
     $form_state = (new FormState())
@@ -195,11 +195,11 @@ class PathElementFormTest extends KernelTestBase implements FormInterface {
     // Valid form state.
     $errors = $form_state->getErrors();
     $this->assertEqual(count($errors), 3);
-    $this->assertEqual($errors, array(
-      'required_validate' => t('This path does not exist or you do not have permission to link to %path.', array('%path' => 'user/74')),
-      'required_validate_route' => t('This path does not exist or you do not have permission to link to %path.', array('%path' => 'user/74')),
-      'required_validate_url' => t('This path does not exist or you do not have permission to link to %path.', array('%path' => 'user/74')),
-    ));
+    $this->assertEqual($errors, [
+      'required_validate' => t('This path does not exist or you do not have permission to link to %path.', ['%path' => 'user/74']),
+      'required_validate_route' => t('This path does not exist or you do not have permission to link to %path.', ['%path' => 'user/74']),
+      'required_validate_url' => t('This path does not exist or you do not have permission to link to %path.', ['%path' => 'user/74']),
+    ]);
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php
index 2219487d7..613ba4e17 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php
@@ -19,7 +19,7 @@ class BundleConstraintValidatorTest extends KernelTestBase {
    */
   protected $typedData;
 
-  public static $modules = array('node', 'field', 'text', 'user');
+  public static $modules = ['node', 'field', 'text', 'user'];
 
   protected function setUp() {
     parent::setUp();
@@ -32,7 +32,7 @@ class BundleConstraintValidatorTest extends KernelTestBase {
    */
   public function testValidation() {
     // Test with multiple values.
-    $this->assertValidation(array('foo', 'bar'));
+    $this->assertValidation(['foo', 'bar']);
     // Test with a single string value as well.
     $this->assertValidation('foo');
   }
@@ -49,14 +49,14 @@ class BundleConstraintValidatorTest extends KernelTestBase {
       ->addConstraint('Bundle', $bundle);
 
     // Test the validation.
-    $node = $this->container->get('entity.manager')->getStorage('node')->create(array('type' => 'foo'));
+    $node = $this->container->get('entity.manager')->getStorage('node')->create(['type' => 'foo']);
 
     $typed_data = $this->typedData->create($definition, $node);
     $violations = $typed_data->validate();
     $this->assertEqual($violations->count(), 0, 'Validation passed for correct value.');
 
     // Test the validation when an invalid value is passed.
-    $page_node = $this->container->get('entity.manager')->getStorage('node')->create(array('type' => 'baz'));
+    $page_node = $this->container->get('entity.manager')->getStorage('node')->create(['type' => 'baz']);
 
     $typed_data = $this->typedData->create($definition, $page_node);
     $violations = $typed_data->validate();
@@ -64,7 +64,7 @@ class BundleConstraintValidatorTest extends KernelTestBase {
 
     // Make sure the information provided by a violation is correct.
     $violation = $violations[0];
-    $this->assertEqual($violation->getMessage(), t('The entity must be of bundle %bundle.', array('%bundle' => implode(', ', (array) $bundle))), 'The message for invalid value is correct.');
+    $this->assertEqual($violation->getMessage(), t('The entity must be of bundle %bundle.', ['%bundle' => implode(', ', (array) $bundle)]), 'The message for invalid value is correct.');
     $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
     $this->assertEqual($violation->getInvalidValue(), $page_node, 'The invalid value is set correctly in the violation.');
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
index 22cae65fe..87ba10480 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
@@ -19,7 +19,7 @@ class ConfigEntityQueryTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('config_test');
+  public static $modules = ['config_test'];
 
   /**
    * Stores the search results for alter comparison.
@@ -45,7 +45,7 @@ class ConfigEntityQueryTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->entities = array();
+    $this->entities = [];
     $this->factory = $this->container->get('entity.query');
 
     // These two are here to make sure that matchArray needs to go over several
@@ -54,56 +54,56 @@ class ConfigEntityQueryTest extends KernelTestBase {
     $array['level1a']['level2'] = 9;
     // The tests match array.level1.level2.
     $array['level1']['level2'] = 1;
-    $entity = ConfigQueryTest::create(array(
+    $entity = ConfigQueryTest::create([
       'label' => $this->randomMachineName(),
       'id' => '1',
       'number' => 31,
       'array' => $array,
-    ));
+    ]);
     $this->entities[] = $entity;
     $entity->enforceIsNew();
     $entity->save();
 
     $array['level1']['level2'] = 2;
-    $entity = ConfigQueryTest::create(array(
+    $entity = ConfigQueryTest::create([
       'label' => $this->randomMachineName(),
       'id' => '2',
       'number' => 41,
       'array' => $array,
-    ));
+    ]);
     $this->entities[] = $entity;
     $entity->enforceIsNew();
     $entity->save();
 
     $array['level1']['level2'] = 1;
-    $entity = ConfigQueryTest::create(array(
+    $entity = ConfigQueryTest::create([
       'label' => 'test_prefix_' . $this->randomMachineName(),
       'id' => '3',
       'number' => 59,
       'array' => $array,
-    ));
+    ]);
     $this->entities[] = $entity;
     $entity->enforceIsNew();
     $entity->save();
 
     $array['level1']['level2'] = 2;
-    $entity = ConfigQueryTest::create(array(
+    $entity = ConfigQueryTest::create([
       'label' => $this->randomMachineName() . '_test_suffix',
       'id' => '4',
       'number' => 26,
       'array' => $array,
-    ));
+    ]);
     $this->entities[] = $entity;
     $entity->enforceIsNew();
     $entity->save();
 
     $array['level1']['level2'] = 3;
-    $entity = ConfigQueryTest::create(array(
+    $entity = ConfigQueryTest::create([
       'label' => $this->randomMachineName() . '_TEST_contains_' . $this->randomMachineName(),
       'id' => '5',
       'number' => 53,
       'array' => $array,
-    ));
+    ]);
     $this->entities[] = $entity;
     $entity->enforceIsNew();
     $entity->save();
@@ -116,84 +116,84 @@ class ConfigEntityQueryTest extends KernelTestBase {
     // Run a test without any condition.
     $this->queryResults = $this->factory->get('config_query_test')
       ->execute();
-    $this->assertResults(array('1', '2', '3', '4', '5'));
+    $this->assertResults(['1', '2', '3', '4', '5']);
     // No conditions, OR.
     $this->queryResults = $this->factory->get('config_query_test', 'OR')
       ->execute();
-    $this->assertResults(array('1', '2', '3', '4', '5'));
+    $this->assertResults(['1', '2', '3', '4', '5']);
 
     // Filter by ID with equality.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', '3')
       ->execute();
-    $this->assertResults(array('3'));
+    $this->assertResults(['3']);
 
     // Filter by label with a known prefix.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('label', 'test_prefix', 'STARTS_WITH')
       ->execute();
-    $this->assertResults(array('3'));
+    $this->assertResults(['3']);
 
     // Filter by label with a known suffix.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('label', 'test_suffix', 'ENDS_WITH')
       ->execute();
-    $this->assertResults(array('4'));
+    $this->assertResults(['4']);
 
     // Filter by label with a known containing word.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('label', 'test_contains', 'CONTAINS')
       ->execute();
-    $this->assertResults(array('5'));
+    $this->assertResults(['5']);
 
     // Filter by ID with the IN operator.
     $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', array('2', '3'), 'IN')
+      ->condition('id', ['2', '3'], 'IN')
       ->execute();
-    $this->assertResults(array('2', '3'));
+    $this->assertResults(['2', '3']);
 
     // Filter by ID with the implicit IN operator.
     $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', array('2', '3'))
+      ->condition('id', ['2', '3'])
       ->execute();
-    $this->assertResults(array('2', '3'));
+    $this->assertResults(['2', '3']);
 
     // Filter by ID with the > operator.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', '3', '>')
       ->execute();
-    $this->assertResults(array('4', '5'));
+    $this->assertResults(['4', '5']);
 
     // Filter by ID with the >= operator.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', '3', '>=')
       ->execute();
-    $this->assertResults(array('3', '4', '5'));
+    $this->assertResults(['3', '4', '5']);
 
     // Filter by ID with the <> operator.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', '3', '<>')
       ->execute();
-    $this->assertResults(array('1', '2', '4', '5'));
+    $this->assertResults(['1', '2', '4', '5']);
 
     // Filter by ID with the < operator.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', '3', '<')
       ->execute();
-    $this->assertResults(array('1', '2'));
+    $this->assertResults(['1', '2']);
 
     // Filter by ID with the <= operator.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', '3', '<=')
       ->execute();
-    $this->assertResults(array('1', '2', '3'));
+    $this->assertResults(['1', '2', '3']);
 
     // Filter by two conditions on the same field.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('label', 'test_pref', 'STARTS_WITH')
       ->condition('label', 'test_prefix', 'STARTS_WITH')
       ->execute();
-    $this->assertResults(array('3'));
+    $this->assertResults(['3']);
 
     // Filter by two conditions on different fields. The first query matches for
     // a different ID, so the result is empty.
@@ -201,7 +201,7 @@ class ConfigEntityQueryTest extends KernelTestBase {
       ->condition('label', 'test_prefix', 'STARTS_WITH')
       ->condition('id', '5')
       ->execute();
-    $this->assertResults(array());
+    $this->assertResults([]);
 
     // Filter by two different conditions on different fields. This time the
     // first condition matches on one item, but the second one does as well.
@@ -209,7 +209,7 @@ class ConfigEntityQueryTest extends KernelTestBase {
       ->condition('label', 'test_prefix', 'STARTS_WITH')
       ->condition('id', '3')
       ->execute();
-    $this->assertResults(array('3'));
+    $this->assertResults(['3']);
 
     // Filter by two different conditions, of which the first one matches for
     // every entry, the second one as well, but just the third one filters so
@@ -219,37 +219,37 @@ class ConfigEntityQueryTest extends KernelTestBase {
       ->condition('number', 10, '>=')
       ->condition('number', 50, '>=')
       ->execute();
-    $this->assertResults(array('3', '5'));
+    $this->assertResults(['3', '5']);
 
     // Filter with an OR condition group.
     $this->queryResults = $this->factory->get('config_query_test', 'OR')
       ->condition('id', 1)
       ->condition('id', '2')
       ->execute();
-    $this->assertResults(array('1', '2'));
+    $this->assertResults(['1', '2']);
 
     // Simplify it with IN.
     $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', array('1', '2'))
+      ->condition('id', ['1', '2'])
       ->execute();
-    $this->assertResults(array('1', '2'));
+    $this->assertResults(['1', '2']);
     // Try explicit IN.
     $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', array('1', '2'), 'IN')
+      ->condition('id', ['1', '2'], 'IN')
       ->execute();
-    $this->assertResults(array('1', '2'));
+    $this->assertResults(['1', '2']);
     // Try not IN.
     $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', array('1', '2'), 'NOT IN')
+      ->condition('id', ['1', '2'], 'NOT IN')
       ->execute();
-    $this->assertResults(array('3', '4', '5'));
+    $this->assertResults(['3', '4', '5']);
 
     // Filter with an OR condition group on different fields.
     $this->queryResults = $this->factory->get('config_query_test', 'OR')
       ->condition('id', 1)
       ->condition('number', 41)
       ->execute();
-    $this->assertResults(array('1', '2'));
+    $this->assertResults(['1', '2']);
 
     // Filter with an OR condition group on different fields but matching on the
     // same entity.
@@ -257,7 +257,7 @@ class ConfigEntityQueryTest extends KernelTestBase {
       ->condition('id', 1)
       ->condition('number', 31)
       ->execute();
-    $this->assertResults(array('1'));
+    $this->assertResults(['1']);
 
     // NO simple conditions, YES complex conditions, 'AND'.
     $query = $this->factory->get('config_query_test', 'AND');
@@ -271,7 +271,7 @@ class ConfigEntityQueryTest extends KernelTestBase {
       ->condition($and_condition_1)
       ->condition($and_condition_2)
       ->execute();
-    $this->assertResults(array('1'));
+    $this->assertResults(['1']);
 
     // NO simple conditions, YES complex conditions, 'OR'.
     $query = $this->factory->get('config_query_test', 'OR');
@@ -285,7 +285,7 @@ class ConfigEntityQueryTest extends KernelTestBase {
       ->condition($and_condition_1)
       ->condition($and_condition_2)
       ->execute();
-    $this->assertResults(array('1', '2'));
+    $this->assertResults(['1', '2']);
 
     // YES simple conditions, YES complex conditions, 'AND'.
     $query = $this->factory->get('config_query_test', 'AND');
@@ -300,7 +300,7 @@ class ConfigEntityQueryTest extends KernelTestBase {
       ->condition($and_condition_1)
       ->condition($and_condition_2)
       ->execute();
-    $this->assertResults(array('1'));
+    $this->assertResults(['1']);
 
     // YES simple conditions, YES complex conditions, 'OR'.
     $query = $this->factory->get('config_query_test', 'OR');
@@ -315,28 +315,28 @@ class ConfigEntityQueryTest extends KernelTestBase {
       ->condition($and_condition_1)
       ->condition($and_condition_2)
       ->execute();
-    $this->assertResults(array('1', '2', '4', '5'));
+    $this->assertResults(['1', '2', '4', '5']);
 
     // Test the exists and notExists conditions.
     $this->queryResults = $this->factory->get('config_query_test')
       ->exists('id')
       ->execute();
-    $this->assertResults(array('1', '2', '3', '4', '5'));
+    $this->assertResults(['1', '2', '3', '4', '5']);
 
     $this->queryResults = $this->factory->get('config_query_test')
       ->exists('non-existent')
       ->execute();
-    $this->assertResults(array());
+    $this->assertResults([]);
 
     $this->queryResults = $this->factory->get('config_query_test')
       ->notExists('id')
       ->execute();
-    $this->assertResults(array());
+    $this->assertResults([]);
 
     $this->queryResults = $this->factory->get('config_query_test')
       ->notExists('non-existent')
       ->execute();
-    $this->assertResults(array('1', '2', '3', '4', '5'));
+    $this->assertResults(['1', '2', '3', '4', '5']);
   }
 
   /**
@@ -344,10 +344,10 @@ class ConfigEntityQueryTest extends KernelTestBase {
    */
   public function testStringIdConditions() {
     // We need an entity with a non-numeric ID.
-    $entity = ConfigQueryTest::create(array(
+    $entity = ConfigQueryTest::create([
       'label' => $this->randomMachineName(),
       'id' => 'foo.bar',
-    ));
+    ]);
     $this->entities[] = $entity;
     $entity->enforceIsNew();
     $entity->save();
@@ -356,43 +356,43 @@ class ConfigEntityQueryTest extends KernelTestBase {
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', 'foo.bar', 'STARTS_WITH')
       ->execute();
-    $this->assertResults(array('foo.bar'));
+    $this->assertResults(['foo.bar']);
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', 'f', 'STARTS_WITH')
       ->execute();
-    $this->assertResults(array('foo.bar'));
+    $this->assertResults(['foo.bar']);
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', 'miss', 'STARTS_WITH')
       ->execute();
-    $this->assertResults(array());
+    $this->assertResults([]);
 
     // Test 'CONTAINS' condition.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', 'foo.bar', 'CONTAINS')
       ->execute();
-    $this->assertResults(array('foo.bar'));
+    $this->assertResults(['foo.bar']);
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', 'oo.ba', 'CONTAINS')
       ->execute();
-    $this->assertResults(array('foo.bar'));
+    $this->assertResults(['foo.bar']);
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', 'miss', 'CONTAINS')
       ->execute();
-    $this->assertResults(array());
+    $this->assertResults([]);
 
     // Test 'ENDS_WITH' condition.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', 'foo.bar', 'ENDS_WITH')
       ->execute();
-    $this->assertResults(array('foo.bar'));
+    $this->assertResults(['foo.bar']);
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', 'r', 'ENDS_WITH')
       ->execute();
-    $this->assertResults(array('foo.bar'));
+    $this->assertResults(['foo.bar']);
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', 'miss', 'ENDS_WITH')
       ->execute();
-    $this->assertResults(array());
+    $this->assertResults([]);
   }
 
   /**
@@ -429,62 +429,62 @@ class ConfigEntityQueryTest extends KernelTestBase {
     $this->queryResults = $this->factory->get('config_query_test')
       ->sort('number', 'DESC')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('3', '5', '2', '1', '4'));
+    $this->assertIdentical(array_values($this->queryResults), ['3', '5', '2', '1', '4']);
 
     $this->queryResults = $this->factory->get('config_query_test')
       ->sort('number', 'ASC')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('4', '1', '2', '5', '3'));
+    $this->assertIdentical(array_values($this->queryResults), ['4', '1', '2', '5', '3']);
 
     // Apply some filters and sort.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', '3', '>')
       ->sort('number', 'DESC')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('5', '4'));
+    $this->assertIdentical(array_values($this->queryResults), ['5', '4']);
 
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('id', '3', '>')
       ->sort('number', 'ASC')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('4', '5'));
+    $this->assertIdentical(array_values($this->queryResults), ['4', '5']);
 
     // Apply a pager and sort.
     $this->queryResults = $this->factory->get('config_query_test')
       ->sort('number', 'DESC')
       ->range('2', '2')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('2', '1'));
+    $this->assertIdentical(array_values($this->queryResults), ['2', '1']);
 
     $this->queryResults = $this->factory->get('config_query_test')
       ->sort('number', 'ASC')
       ->range('2', '2')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('2', '5'));
+    $this->assertIdentical(array_values($this->queryResults), ['2', '5']);
 
     // Add a range to a query without a start parameter.
     $this->queryResults = $this->factory->get('config_query_test')
       ->range(0, '3')
       ->sort('id', 'ASC')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3'));
+    $this->assertIdentical(array_values($this->queryResults), ['1', '2', '3']);
 
     // Apply a pager with limit 4.
     $this->queryResults = $this->factory->get('config_query_test')
       ->pager('4', 0)
       ->sort('id', 'ASC')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3', '4'));
+    $this->assertIdentical(array_values($this->queryResults), ['1', '2', '3', '4']);
   }
 
   /**
    * Tests sorting with tableSort on config entity queries.
    */
   public function testTableSort() {
-    $header = array(
-      array('data' => t('ID'), 'specifier' => 'id'),
-      array('data' => t('Number'), 'specifier' => 'number'),
-    );
+    $header = [
+      ['data' => t('ID'), 'specifier' => 'id'],
+      ['data' => t('Number'), 'specifier' => 'number'],
+    ];
 
     // Sort key: id
     // Sorting with 'DESC' upper case
@@ -492,28 +492,28 @@ class ConfigEntityQueryTest extends KernelTestBase {
       ->tableSort($header)
       ->sort('id', 'DESC')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('5', '4', '3', '2', '1'));
+    $this->assertIdentical(array_values($this->queryResults), ['5', '4', '3', '2', '1']);
 
     // Sorting with 'ASC' upper case
     $this->queryResults = $this->factory->get('config_query_test')
       ->tableSort($header)
       ->sort('id', 'ASC')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3', '4', '5'));
+    $this->assertIdentical(array_values($this->queryResults), ['1', '2', '3', '4', '5']);
 
     // Sorting with 'desc' lower case
     $this->queryResults = $this->factory->get('config_query_test')
       ->tableSort($header)
       ->sort('id', 'desc')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('5', '4', '3', '2', '1'));
+    $this->assertIdentical(array_values($this->queryResults), ['5', '4', '3', '2', '1']);
 
     // Sorting with 'asc' lower case
     $this->queryResults = $this->factory->get('config_query_test')
       ->tableSort($header)
       ->sort('id', 'asc')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3', '4', '5'));
+    $this->assertIdentical(array_values($this->queryResults), ['1', '2', '3', '4', '5']);
 
     // Sort key: number
     // Sorting with 'DeSc' mixed upper and lower case
@@ -521,28 +521,28 @@ class ConfigEntityQueryTest extends KernelTestBase {
       ->tableSort($header)
       ->sort('number', 'DeSc')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('3', '5', '2', '1', '4'));
+    $this->assertIdentical(array_values($this->queryResults), ['3', '5', '2', '1', '4']);
 
     // Sorting with 'AsC' mixed upper and lower case
     $this->queryResults = $this->factory->get('config_query_test')
       ->tableSort($header)
       ->sort('number', 'AsC')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('4', '1', '2', '5', '3'));
+    $this->assertIdentical(array_values($this->queryResults), ['4', '1', '2', '5', '3']);
 
     // Sorting with 'dEsC' mixed upper and lower case
     $this->queryResults = $this->factory->get('config_query_test')
       ->tableSort($header)
       ->sort('number', 'dEsC')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('3', '5', '2', '1', '4'));
+    $this->assertIdentical(array_values($this->queryResults), ['3', '5', '2', '1', '4']);
 
     // Sorting with 'aSc' mixed upper and lower case
     $this->queryResults = $this->factory->get('config_query_test')
       ->tableSort($header)
       ->sort('number', 'aSc')
       ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('4', '1', '2', '5', '3'));
+    $this->assertIdentical(array_values($this->queryResults), ['4', '1', '2', '5', '3']);
   }
 
   /**
@@ -552,26 +552,26 @@ class ConfigEntityQueryTest extends KernelTestBase {
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('array.level1.*', 1)
       ->execute();
-    $this->assertResults(array('1', '3'));
+    $this->assertResults(['1', '3']);
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('*.level1.level2', 2)
       ->execute();
-    $this->assertResults(array('2', '4'));
+    $this->assertResults(['2', '4']);
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('array.level1.*', 3)
       ->execute();
-    $this->assertResults(array('5'));
+    $this->assertResults(['5']);
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('array.level1.level2', 3)
       ->execute();
-    $this->assertResults(array('5'));
+    $this->assertResults(['5']);
     // Make sure that values on the wildcard level do not match if there are
     // sub-keys defined. This must not find anything even if entity 2 has a
     // top-level key number with value 41.
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('*.level1.level2', 41)
       ->execute();
-    $this->assertResults(array());
+    $this->assertResults([]);
   }
 
   /**
@@ -582,12 +582,12 @@ class ConfigEntityQueryTest extends KernelTestBase {
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('label', 'TEST', 'CONTAINS')
       ->execute();
-    $this->assertResults(array('3', '4', '5'));
+    $this->assertResults(['3', '4', '5']);
 
     $this->queryResults = $this->factory->get('config_query_test')
       ->condition('label', 'test', 'CONTAINS')
       ->execute();
-    $this->assertResults(array('3', '4', '5'));
+    $this->assertResults(['3', '4', '5']);
   }
 
   /**
@@ -599,11 +599,11 @@ class ConfigEntityQueryTest extends KernelTestBase {
     $key_value = $this->container->get('keyvalue')->get(QueryFactory::CONFIG_LOOKUP_PREFIX . 'config_test');
 
     $test_entities = [];
-    $entity = entity_create('config_test', array(
+    $entity = entity_create('config_test', [
       'label' => $this->randomMachineName(),
       'id' => '1',
       'style' => 'test',
-    ));
+    ]);
     $test_entities[$entity->getConfigDependencyName()] = $entity;
     $entity->enforceIsNew();
     $entity->save();
@@ -612,22 +612,22 @@ class ConfigEntityQueryTest extends KernelTestBase {
     $expected[] = $entity->getConfigDependencyName();
     $this->assertEqual($expected, $key_value->get('style:test'));
 
-    $entity = entity_create('config_test', array(
+    $entity = entity_create('config_test', [
       'label' => $this->randomMachineName(),
       'id' => '2',
       'style' => 'test',
-    ));
+    ]);
     $test_entities[$entity->getConfigDependencyName()] = $entity;
     $entity->enforceIsNew();
     $entity->save();
     $expected[] = $entity->getConfigDependencyName();
     $this->assertEqual($expected, $key_value->get('style:test'));
 
-    $entity = entity_create('config_test', array(
+    $entity = entity_create('config_test', [
       'label' => $this->randomMachineName(),
       'id' => '3',
       'style' => 'blah',
-    ));
+    ]);
     $entity->enforceIsNew();
     $entity->save();
     // Do not add this entity to the list of expected result as it has a
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
index 51a204f9f..66e1abb2c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
@@ -59,11 +59,12 @@ class ContentEntityChangedTest extends EntityKernelTestBase {
     $user2 = $this->createUser();
 
     // Create a test entity.
-    $entity = EntityTestMulChanged::create(array(
+    $entity = EntityTestMulChanged::create([
       'name' => $this->randomString(),
+      'not_translatable' => $this->randomString(),
       'user_id' => $user1->id(),
       'language' => 'en',
-    ));
+    ]);
     $entity->save();
 
     $this->assertTrue(
@@ -122,6 +123,25 @@ class ContentEntityChangedTest extends EntityKernelTestBase {
       'Changed time of the German translation did not change.'
     );
 
+    // Update a non-translatable field to make sure that the changed timestamp
+    // is updated for all translations.
+    $entity->set('not_translatable', $this->randomString())->save();
+
+    $this->assertTrue(
+      $entity->getChangedTime() > $changed_en,
+      'Changed time of original language did change.'
+    );
+
+    $this->assertTrue(
+      $german->getChangedTime() > $changed_de,
+      'Changed time of the German translation did change.'
+    );
+
+    $this->assertEquals($entity->getChangedTime(), $german->getChangedTime(), 'When editing a non-translatable field the updated changed time is equal across all translations.');
+
+    $changed_en = $entity->getChangedTime();
+    $changed_de = $german->getChangedTime();
+
     $entity->setOwner($user2);
 
     $entity->save();
@@ -269,11 +289,11 @@ class ContentEntityChangedTest extends EntityKernelTestBase {
     $user2 = $this->createUser();
 
     // Create a test entity.
-    $entity = EntityTestMulRevChanged::create(array(
+    $entity = EntityTestMulRevChanged::create([
       'name' => $this->randomString(),
       'user_id' => $user1->id(),
       'language' => 'en',
-    ));
+    ]);
     $entity->save();
 
     $this->assertTrue(
@@ -491,6 +511,10 @@ class ContentEntityChangedTest extends EntityKernelTestBase {
       'Changed flag of French translation is set when adding the translation and a new revision.'
     );
 
+    // Since above a clone of the entity was saved and then this entity is saved
+    // again, we have to update the revision ID to the current one.
+    $german->set('revision_id', $form_entity_builder_clone->getRevisionId());
+    $german->updateLoadedRevisionId();
     $german->setOwner($user1);
     $german->setRevisionTranslationAffected(FALSE);
     $entity->save();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php
index cca7eb129..245a3336a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php
@@ -2,7 +2,9 @@
 
 namespace Drupal\KernelTests\Core\Entity;
 
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\entity_test\Entity\EntityTestMul;
+use Drupal\entity_test\Entity\EntityTestMulRev;
 use Drupal\language\Entity\ConfigurableLanguage;
 
 /**
@@ -27,6 +29,7 @@ class ContentEntityCloneTest extends EntityKernelTestBase {
     ConfigurableLanguage::createFromLangcode('de')->save();
 
     $this->installEntitySchema('entity_test_mul');
+    $this->installEntitySchema('entity_test_mulrev');
   }
 
   /**
@@ -41,8 +44,15 @@ class ContentEntityCloneTest extends EntityKernelTestBase {
       'user_id' => $user->id(),
       'language' => 'en',
     ]);
+    $translation = $entity->addTranslation('de');
 
-    $clone = clone $entity->addTranslation('de');
+    // Initialize the fields on the translation objects in order to check that
+    // they are properly cloned and have a reference to the cloned entity
+    // object and not to the original one.
+    $entity->getFields();
+    $translation->getFields();
+
+    $clone = clone $translation;
 
     $this->assertEqual($entity->getTranslationLanguages(), $clone->getTranslationLanguages(), 'The entity and its clone have the same translation languages.');
 
@@ -53,10 +63,12 @@ class ContentEntityCloneTest extends EntityKernelTestBase {
         if ($field->getFieldDefinition()->isTranslatable()) {
           $args = ['%field_name' => $field_name, '%langcode' => $langcode];
           $this->assertEqual($langcode, $field->getEntity()->language()->getId(), format_string('Translatable field %field_name on translation %langcode has correct entity reference in translation %langcode after cloning.', $args));
+          $this->assertSame($translation, $field->getEntity(), new FormattableMarkup('Translatable field %field_name on translation %langcode has correct reference to the cloned entity object.', $args));
         }
         else {
           $args = ['%field_name' => $field_name, '%langcode' => $langcode, '%default_langcode' => $default_langcode];
           $this->assertEqual($default_langcode, $field->getEntity()->language()->getId(), format_string('Non translatable field %field_name on translation %langcode has correct entity reference in the default translation %default_langcode after cloning.', $args));
+          $this->assertSame($translation->getUntranslated(), $field->getEntity(), new FormattableMarkup('Non translatable field %field_name on translation %langcode has correct reference to the cloned entity object in the default translation %default_langcode.', $args));
         }
       }
     }
@@ -78,15 +90,165 @@ class ContentEntityCloneTest extends EntityKernelTestBase {
     // The entity is not new anymore.
     $this->assertFalse($entity_translation->isNew());
 
-    // The clone should not be new as well.
+    // The clone should not be new either.
     $clone = clone $entity_translation;
     $this->assertFalse($clone->isNew());
 
-    // After enforcing the clone to be new only it should be flagged as new,
-    // but the original entity should not be flagged as new.
+    // After forcing the clone to be new only it should be flagged as new, but
+    // the original entity should not.
     $clone->enforceIsNew();
     $this->assertTrue($clone->isNew());
     $this->assertFalse($entity_translation->isNew());
   }
 
+  /**
+   * Tests if the entity fields are properly cloned.
+   */
+  public function testClonedEntityFields() {
+    $user = $this->createUser();
+
+    // Create a test entity.
+    $entity = EntityTestMul::create([
+      'name' => $this->randomString(),
+      'user_id' => $user->id(),
+      'language' => 'en',
+    ]);
+
+    $entity->addTranslation('de');
+    $entity->save();
+    $fields = array_keys($entity->getFieldDefinitions());
+
+    // Reload the entity, clone it and check that both entity objects reference
+    // different field instances.
+    $entity = $this->reloadEntity($entity);
+    $clone = clone $entity;
+
+    $different_references = TRUE;
+    foreach ($fields as $field_name) {
+      if ($entity->get($field_name) === $clone->get($field_name)) {
+        $different_references = FALSE;
+      }
+    }
+    $this->assertTrue($different_references, 'The entity object and the cloned entity object reference different field item list objects.');
+
+
+    // Reload the entity, initialize one translation, clone it and check that
+    // both entity objects reference different field instances.
+    $entity = $this->reloadEntity($entity);
+    $entity->getTranslation('de');
+    $clone = clone $entity;
+
+    $different_references = TRUE;
+    foreach ($fields as $field_name) {
+      if ($entity->get($field_name) === $clone->get($field_name)) {
+        $different_references = FALSE;
+      }
+    }
+    $this->assertTrue($different_references, 'The entity object and the cloned entity object reference different field item list objects if the entity is cloned after an entity translation has been initialized.');
+  }
+
+  /**
+   * Tests that the flag for enforcing a new revision is not shared.
+   */
+  public function testNewRevisionOnCloneEntityTranslation() {
+    // Create a test entity.
+    $entity = EntityTestMulRev::create([
+      'name' => $this->randomString(),
+      'language' => 'en',
+    ]);
+    $entity->save();
+    $entity->addTranslation('de');
+    $entity->save();
+
+    // Reload the entity as ContentEntityBase::postCreate() forces the entity to
+    // be a new revision.
+    $entity = EntityTestMulRev::load($entity->id());
+    $entity_translation = $entity->getTranslation('de');
+
+    // The entity is not set to be a new revision.
+    $this->assertFalse($entity_translation->isNewRevision());
+
+    // The clone should not be set to be a new revision either.
+    $clone = clone $entity_translation;
+    $this->assertFalse($clone->isNewRevision());
+
+    // After forcing the clone to be a new revision only it should be flagged
+    // as a new revision, but the original entity should not.
+    $clone->setNewRevision();
+    $this->assertTrue($clone->isNewRevision());
+    $this->assertFalse($entity_translation->isNewRevision());
+  }
+
+  /**
+   * Tests modifications on entity keys of a cloned entity object.
+   */
+  public function testEntityKeysModifications() {
+    // Create a test entity with a translation, which will internally trigger
+    // entity cloning for the new translation and create references for some of
+    // the entity properties.
+    $entity = EntityTestMulRev::create([
+      'name' => 'original-name',
+      'uuid' => 'original-uuid',
+      'language' => 'en',
+    ]);
+    $entity->addTranslation('de');
+    $entity->save();
+
+    // Clone the entity.
+    $clone = clone $entity;
+
+    // Alter a non-translatable and a translatable entity key fields of the
+    // cloned entity and assert that retrieving the value through the entity
+    // keys local cache will be different for the cloned and the original
+    // entity.
+    // We first have to call the ::uuid() and ::label() method on the original
+    // entity as it is going to cache the field values into the $entityKeys and
+    // $translatableEntityKeys properties of the entity object and we want to
+    // check that the cloned and the original entity aren't sharing the same
+    // reference to those local cache properties.
+    $uuid_field_name = $entity->getEntityType()->getKey('uuid');
+    $this->assertFalse($entity->getFieldDefinition($uuid_field_name)->isTranslatable());
+    $clone->$uuid_field_name->value = 'clone-uuid';
+    $this->assertEquals('original-uuid', $entity->uuid());
+    $this->assertEquals('clone-uuid', $clone->uuid());
+
+    $label_field_name = $entity->getEntityType()->getKey('label');
+    $this->assertTrue($entity->getFieldDefinition($label_field_name)->isTranslatable());
+    $clone->$label_field_name->value = 'clone-name';
+    $this->assertEquals('original-name', $entity->label());
+    $this->assertEquals('clone-name', $clone->label());
+  }
+
+  /**
+   * Tests the field values after serializing an entity and its clone.
+   */
+  public function testFieldValuesAfterSerialize() {
+    // Create a test entity with a translation, which will internally trigger
+    // entity cloning for the new translation and create references for some of
+    // the entity properties.
+    $entity = EntityTestMulRev::create([
+      'name' => 'original',
+      'language' => 'en',
+    ]);
+    $entity->addTranslation('de');
+    $entity->save();
+
+    // Clone the entity.
+    $clone = clone $entity;
+
+    // Alter the name field value of the cloned entity object.
+    $clone->setName('clone');
+
+    // Serialize the entity and the cloned object in order to destroy the field
+    // objects and put the field values into the entity property $values, so
+    // that on accessing a field again it will be newly created with the value
+    // from the $values property.
+    serialize($entity);
+    serialize($clone);
+
+    // Assert that the original and the cloned entity both have different names.
+    $this->assertEquals('original', $entity->getName());
+    $this->assertEquals('clone', $clone->getName());
+  }
+
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityHasChangesTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityHasChangesTest.php
new file mode 100644
index 000000000..687ceb74c
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityHasChangesTest.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * Tests ContentEntityBase::hasTranslationChanges().
+ *
+ * @group Entity
+ */
+class ContentEntityHasChangesTest extends KernelTestBase {
+
+  /**
+   * Bundle of entity.
+   *
+   * @var string
+   */
+  protected $bundle = 'test';
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'user', 'entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('entity_test_mulrev_chnged_revlog');
+    $this->installSchema('system', 'sequences');
+  }
+
+  /**
+   * Tests the correct functionality of the hasTranslationChanges() function.
+   */
+  public function testHasTranslationChanges() {
+    $user1 = User::create([
+      'name' => 'username1',
+      'status' => 1,
+    ]);
+    $user1->save();
+
+    $user2 = User::create([
+      'name' => 'username2',
+      'status' => 1,
+    ]);
+    $user2->save();
+
+    /** @var \Drupal\Core\Entity\EntityStorageInterface $storage */
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage('entity_test_mulrev_chnged_revlog');
+    /** @var \Drupal\entity_test\Entity\EntityTestMulRevChangedWithRevisionLog $entity */
+    $entity = $storage->create([
+      'name' => $this->randomString(),
+    ]);
+    $entity->setRevisionUserId($user1->id());
+    $entity->save();
+
+    $this->assertFalse($entity->hasTranslationChanges(), 'ContentEntityBase::hasTranslationChanges() found no changes after the entity has been saved.');
+
+    // Update the revision metadata fields and the changed field, which should
+    // be skipped from checking for changes in
+    // ContentEntityBase::hasTranslationChanges().
+    $entity_previous_rev_id = $entity->getRevisionId();
+    // Revision metadata field revision_timestamp.
+    $entity->setRevisionCreationTime(time() + 1);
+    // Revision metadata field revision_uid.
+    $entity->setRevisionUserId($user2->id());
+    // Revision metadata field revision_log.
+    $entity->setRevisionLogMessage('test');
+    // Revision metadata field revision_translation_affected.
+    $entity->setRevisionTranslationAffected(TRUE);
+    // Changed field.
+    $entity->setChangedTime(time() + 1);
+
+    // Check that the revision metadata fields and the changed field have been
+    // skipped when comparing same revisions.
+    $this->assertFalse($entity->hasTranslationChanges(), 'ContentEntityBase::hasTranslationChanges() found no changes when comparing different revisions.');
+
+    // Check that the revision metadata fields and the changed field have been
+    // skipped when comparing same revisions with enforced new revision to be
+    // created on save.
+    $entity->setNewRevision(TRUE);
+    $this->assertFalse($entity->hasTranslationChanges(), 'ContentEntityBase::hasTranslationChanges() found no changes when comparing different revisions.');
+
+    // Save the entity in new revision with changes on the revision metadata
+    // fields.
+    $entity->save();
+
+    // Check that the revision metadata fields and the changed field have been
+    // skipped when comparing different revisions.
+    $entity = $storage->loadRevision($entity_previous_rev_id);
+    $this->assertFalse($entity->hasTranslationChanges(), 'ContentEntityBase::hasTranslationChanges() found no changes when comparing different revisions.');
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNonRevisionableFieldTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNonRevisionableFieldTest.php
index 73684e9f7..99c99b068 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNonRevisionableFieldTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNonRevisionableFieldTest.php
@@ -57,21 +57,21 @@ class ContentEntityNonRevisionableFieldTest extends EntityKernelTestBase {
     $user2 = $this->createUser();
 
     // Create a test entity.
-    $entity = EntityTestMulRev::create(array(
+    $entity = EntityTestMulRev::create([
       'name' => $this->randomString(),
       'user_id' => $user1->id(),
       'language' => 'en',
       'non_rev_field' => 'Huron',
-    ));
+    ]);
     $entity->save();
 
     // Create a test entity.
-    $entity2 = EntityTestMulRev::create(array(
+    $entity2 = EntityTestMulRev::create([
       'name' => $this->randomString(),
       'user_id' => $user1->id(),
       'language' => 'en',
       'non_rev_field' => 'Michigan',
-    ));
+    ]);
     $entity2->save();
 
     $this->assertEquals('Huron', $entity->get('non_rev_field')->value, 'Huron found on entity 1');
@@ -123,19 +123,19 @@ class ContentEntityNonRevisionableFieldTest extends EntityKernelTestBase {
     $user2 = $this->createUser();
 
     // Create a test entity.
-    $entity = EntityTestRev::create(array(
+    $entity = EntityTestRev::create([
       'name' => $this->randomString(),
       'user_id' => $user1->id(),
       'non_rev_field' => 'Superior',
-    ));
+    ]);
     $entity->save();
 
     // Create a test entity.
-    $entity2 = EntityTestRev::create(array(
+    $entity2 = EntityTestRev::create([
       'name' => $this->randomString(),
       'user_id' => $user1->id(),
       'non_rev_field' => 'Ontario',
-    ));
+    ]);
     $entity2->save();
 
     $this->assertEquals('Superior', $entity->get('non_rev_field')->value, 'Superior found on entity 1');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php
index 51162fcd6..697f1be15 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php
@@ -22,7 +22,7 @@ class ContentEntityNullStorageTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'contact', 'user');
+  public static $modules = ['system', 'contact', 'user'];
 
   /**
    * Tests using entity query with ContentEntityNullStorage.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
index c2d737bfb..5d7ea0eb8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
@@ -50,23 +50,23 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
     $this->installEntitySchema('entity_test_string_id');
     \Drupal::service('router.builder')->rebuild();
 
-    $this->testUser = User::create(array(
+    $this->testUser = User::create([
       'name' => 'foobar1',
       'mail' => 'foobar1@example.com',
-    ));
+    ]);
     $this->testUser->save();
     \Drupal::service('current_user')->setAccount($this->testUser);
 
-    $this->testAutocreateUser = User::create(array(
+    $this->testAutocreateUser = User::create([
       'name' => 'foobar2',
       'mail' => 'foobar2@example.com',
-    ));
+    ]);
     $this->testAutocreateUser->save();
 
     for ($i = 1; $i < 3; $i++) {
-      $entity = EntityTest::create(array(
+      $entity = EntityTest::create([
         'name' => $this->randomMachineName()
-      ));
+      ]);
       $entity->save();
       $this->referencedEntities[] = $entity;
     }
@@ -94,84 +94,84 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['single'] = array(
+    $form['single'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test',
-    );
-    $form['single_autocreate'] = array(
+    ];
+    $form['single_autocreate'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test',
-      '#autocreate' => array(
+      '#autocreate' => [
         'bundle' => 'entity_test',
-      ),
-    );
-    $form['single_autocreate_specific_uid'] = array(
+      ],
+    ];
+    $form['single_autocreate_specific_uid'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test',
-      '#autocreate' => array(
+      '#autocreate' => [
         'bundle' => 'entity_test',
         'uid' => $this->testAutocreateUser->id(),
-      ),
-    );
+      ],
+    ];
 
-    $form['tags'] = array(
+    $form['tags'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test',
       '#tags' => TRUE,
-    );
-    $form['tags_autocreate'] = array(
+    ];
+    $form['tags_autocreate'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test',
       '#tags' => TRUE,
-      '#autocreate' => array(
+      '#autocreate' => [
         'bundle' => 'entity_test',
-      ),
-    );
-    $form['tags_autocreate_specific_uid'] = array(
+      ],
+    ];
+    $form['tags_autocreate_specific_uid'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test',
       '#tags' => TRUE,
-      '#autocreate' => array(
+      '#autocreate' => [
         'bundle' => 'entity_test',
         'uid' => $this->testAutocreateUser->id(),
-      ),
-    );
+      ],
+    ];
 
-    $form['single_no_validate'] = array(
+    $form['single_no_validate'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test',
       '#validate_reference' => FALSE,
-    );
-    $form['single_autocreate_no_validate'] = array(
+    ];
+    $form['single_autocreate_no_validate'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test',
       '#validate_reference' => FALSE,
-      '#autocreate' => array(
+      '#autocreate' => [
         'bundle' => 'entity_test',
-      ),
-    );
+      ],
+    ];
 
-    $form['single_access'] = array(
+    $form['single_access'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test',
       '#default_value' => $this->referencedEntities[0],
-    );
-    $form['tags_access'] = array(
+    ];
+    $form['tags_access'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test',
       '#tags' => TRUE,
-      '#default_value' => array($this->referencedEntities[0], $this->referencedEntities[1]),
-    );
+      '#default_value' => [$this->referencedEntities[0], $this->referencedEntities[1]],
+    ];
 
-    $form['single_string_id'] = array(
+    $form['single_string_id'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test_string_id',
-    );
-    $form['tags_string_id'] = array(
+    ];
+    $form['tags_string_id'] = [
       '#type' => 'entity_autocomplete',
       '#target_type' => 'entity_test_string_id',
       '#tags' => TRUE,
-    );
+    ];
 
     return $form;
   }
@@ -229,10 +229,10 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
     $this->assertEqual($value['entity']->getOwnerId(), $this->testAutocreateUser->id());
 
     // Test the 'tags' element.
-    $expected = array(
-      array('target_id' => $this->referencedEntities[0]->id()),
-      array('target_id' => $this->referencedEntities[1]->id()),
-    );
+    $expected = [
+      ['target_id' => $this->referencedEntities[0]->id()],
+      ['target_id' => $this->referencedEntities[1]->id()],
+    ];
     $this->assertEqual($form_state->getValue('tags'), $expected);
 
     // Test the 'single_autocreate' element.
@@ -281,7 +281,7 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
       ]);
     $form_builder->submitForm($this, $form_state);
     $this->assertEqual(count($form_state->getErrors()), 1);
-    $this->assertEqual($form_state->getErrors()['single'], t('There are no entities matching "%value".', array('%value' => 'single - non-existent label')));
+    $this->assertEqual($form_state->getErrors()['single'], t('There are no entities matching "%value".', ['%value' => 'single - non-existent label']));
 
     // Test 'single' with a entity ID that doesn't exist.
     $form_state = (new FormState())
@@ -290,7 +290,7 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
       ]);
     $form_builder->submitForm($this, $form_state);
     $this->assertEqual(count($form_state->getErrors()), 1);
-    $this->assertEqual($form_state->getErrors()['single'], t('The referenced entity (%type: %id) does not exist.', array('%type' => 'entity_test', '%id' => 42)));
+    $this->assertEqual($form_state->getErrors()['single'], t('The referenced entity (%type: %id) does not exist.', ['%type' => 'entity_test', '%id' => 42]));
 
     // Do the same tests as above but on an element with '#validate_reference'
     // set to FALSE.
@@ -304,7 +304,7 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
     // The element without 'autocreate' support still has to emit a warning when
     // the input doesn't end with an entity ID enclosed in parentheses.
     $this->assertEqual(count($form_state->getErrors()), 1);
-    $this->assertEqual($form_state->getErrors()['single_no_validate'], t('There are no entities matching "%value".', array('%value' => 'single - non-existent label')));
+    $this->assertEqual($form_state->getErrors()['single_no_validate'], t('There are no entities matching "%value".', ['%value' => 'single - non-existent label']));
 
     $form_state = (new FormState())
       ->setValues([
@@ -333,7 +333,7 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
     $this->assertEqual($form['tags_access']['#value'], $expected);
 
     // Set up a non-admin user that is *not* allowed to view test entities.
-    \Drupal::currentUser()->setAccount($this->createUser(array(), array()));
+    \Drupal::currentUser()->setAccount($this->createUser([], []));
 
     // Rebuild the form.
     $form = $form_builder->getForm($this);
@@ -381,7 +381,7 @@ class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements
    *   A string that can be used as a value for EntityAutocomplete elements.
    */
   protected function getAutocompleteInput(EntityInterface $entity) {
-    return EntityAutocomplete::getEntityLabels(array($entity));
+    return EntityAutocomplete::getEntityLabels([$entity]);
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
index 77210d5c4..d7644b205 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
@@ -23,12 +23,12 @@ class EntityAccessControlHandlerTest extends EntityLanguageTestBase {
   /**
    * Asserts entity access correctly grants or denies access.
    */
-  function assertEntityAccess($ops, AccessibleInterface $object, AccountInterface $account = NULL) {
+  public function assertEntityAccess($ops, AccessibleInterface $object, AccountInterface $account = NULL) {
     foreach ($ops as $op => $result) {
-      $message = format_string("Entity access returns @result with operation '@op'.", array(
+      $message = format_string("Entity access returns @result with operation '@op'.", [
         '@result' => !isset($result) ? 'null' : ($result ? 'true' : 'false'),
         '@op' => $op,
-      ));
+      ]);
 
       $this->assertEqual($result, $object->access($op, $account), $message);
     }
@@ -45,44 +45,44 @@ class EntityAccessControlHandlerTest extends EntityLanguageTestBase {
     $user = $this->createUser();
 
     // The current user is allowed to view the anonymous user label.
-    $this->assertEntityAccess(array(
+    $this->assertEntityAccess([
       'create' => FALSE,
       'update' => FALSE,
       'delete' => FALSE,
       'view' => FALSE,
       'view label' => TRUE,
-    ), $anonymous_user);
+    ], $anonymous_user);
 
     // The current user is allowed to view user labels.
-    $this->assertEntityAccess(array(
+    $this->assertEntityAccess([
       'create' => FALSE,
       'update' => FALSE,
       'delete' => FALSE,
       'view' => FALSE,
       'view label' => TRUE,
-    ), $user);
+    ], $user);
 
     // Switch to a anonymous user account.
     $account_switcher = \Drupal::service('account_switcher');
     $account_switcher->switchTo(new AnonymousUserSession());
 
     // The anonymous user is allowed to view the anonymous user label.
-    $this->assertEntityAccess(array(
+    $this->assertEntityAccess([
       'create' => FALSE,
       'update' => FALSE,
       'delete' => FALSE,
       'view' => FALSE,
       'view label' => TRUE,
-    ), $anonymous_user);
+    ], $anonymous_user);
 
     // The anonymous user is allowed to view user labels.
-    $this->assertEntityAccess(array(
+    $this->assertEntityAccess([
       'create' => FALSE,
       'update' => FALSE,
       'delete' => FALSE,
       'view' => FALSE,
       'view label' => TRUE,
-    ), $user);
+    ], $user);
 
     // Restore user account.
     $account_switcher->switchBack();
@@ -91,35 +91,35 @@ class EntityAccessControlHandlerTest extends EntityLanguageTestBase {
   /**
    * Ensures entity access is properly working.
    */
-  function testEntityAccess() {
+  public function testEntityAccess() {
     // Set up a non-admin user that is allowed to view test entities.
-    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2), array('view test entity')));
+    \Drupal::currentUser()->setAccount($this->createUser(['uid' => 2], ['view test entity']));
 
     // Use the 'entity_test_label' entity type in order to test the 'view label'
     // access operation.
-    $entity = EntityTestLabel::create(array(
+    $entity = EntityTestLabel::create([
       'name' => 'test',
-    ));
+    ]);
 
     // The current user is allowed to view entities.
-    $this->assertEntityAccess(array(
+    $this->assertEntityAccess([
       'create' => FALSE,
       'update' => FALSE,
       'delete' => FALSE,
       'view' => TRUE,
       'view label' => TRUE,
-    ), $entity);
+    ], $entity);
 
     // The custom user is not allowed to perform any operation on test entities,
     // except for viewing their label.
     $custom_user = $this->createUser();
-    $this->assertEntityAccess(array(
+    $this->assertEntityAccess([
       'create' => FALSE,
       'update' => FALSE,
       'delete' => FALSE,
       'view' => FALSE,
       'view label' => TRUE,
-    ), $entity, $custom_user);
+    ], $entity, $custom_user);
   }
 
   /**
@@ -134,28 +134,28 @@ class EntityAccessControlHandlerTest extends EntityLanguageTestBase {
    * @see \Drupal\entity_test\EntityTestAccessControlHandler::checkAccess()
    * @see entity_test_entity_access()
    */
-  function testDefaultEntityAccess() {
+  public function testDefaultEntityAccess() {
     // Set up a non-admin user that is allowed to view test entities.
-    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2), array('view test entity')));
-    $entity = EntityTest::create(array(
+    \Drupal::currentUser()->setAccount($this->createUser(['uid' => 2], ['view test entity']));
+    $entity = EntityTest::create([
         'name' => 'forbid_access',
-      ));
+      ]);
 
     // The user is denied access to the entity.
-    $this->assertEntityAccess(array(
+    $this->assertEntityAccess([
         'create' => FALSE,
         'update' => FALSE,
         'delete' => FALSE,
         'view' => FALSE,
-      ), $entity);
+      ], $entity);
   }
 
   /**
    * Ensures that the default handler is used as a fallback.
    */
-  function testEntityAccessDefaultController() {
+  public function testEntityAccessDefaultController() {
     // The implementation requires that the global user id can be loaded.
-    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2)));
+    \Drupal::currentUser()->setAccount($this->createUser(['uid' => 2]));
 
     // Check that the default access control handler is used for entities that don't
     // have a specific access control handler defined.
@@ -163,40 +163,40 @@ class EntityAccessControlHandlerTest extends EntityLanguageTestBase {
     $this->assertTrue($handler instanceof EntityAccessControlHandler, 'The default entity handler is used for the entity_test_default_access entity type.');
 
     $entity = EntityTestDefaultAccess::create();
-    $this->assertEntityAccess(array(
+    $this->assertEntityAccess([
       'create' => FALSE,
       'update' => FALSE,
       'delete' => FALSE,
       'view' => FALSE,
-    ), $entity);
+    ], $entity);
   }
 
   /**
    * Ensures entity access for entity translations is properly working.
    */
-  function testEntityTranslationAccess() {
+  public function testEntityTranslationAccess() {
 
     // Set up a non-admin user that is allowed to view test entity translations.
-    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2), array('view test entity translations')));
+    \Drupal::currentUser()->setAccount($this->createUser(['uid' => 2], ['view test entity translations']));
 
     // Create two test languages.
-    foreach (array('foo', 'bar') as $langcode) {
-      ConfigurableLanguage::create(array(
+    foreach (['foo', 'bar'] as $langcode) {
+      ConfigurableLanguage::create([
         'id' => $langcode,
         'label' => $this->randomString(),
-      ))->save();
+      ])->save();
     }
 
-    $entity = EntityTest::create(array(
+    $entity = EntityTest::create([
       'name' => 'test',
       'langcode' => 'foo',
-    ));
+    ]);
     $entity->save();
 
     $translation = $entity->addTranslation('bar');
-    $this->assertEntityAccess(array(
+    $this->assertEntityAccess([
       'view' => TRUE,
-    ), $translation);
+    ], $translation);
   }
 
   /**
@@ -204,9 +204,9 @@ class EntityAccessControlHandlerTest extends EntityLanguageTestBase {
    */
   public function testHooks() {
     $state = $this->container->get('state');
-    $entity = EntityTest::create(array(
+    $entity = EntityTest::create([
       'name' => 'test',
-    ));
+    ]);
 
     // Test hook_entity_create_access() and hook_ENTITY_TYPE_create_access().
     $entity->access('create');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php
index 31cdaec78..744121e76 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php
@@ -49,15 +49,15 @@ class EntityApiTest extends EntityKernelTestBase {
     // Create some test entities.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('name' => 'test', 'user_id' => $user1->id()));
+      ->create(['name' => 'test', 'user_id' => $user1->id()]);
     $entity->save();
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('name' => 'test2', 'user_id' => $user1->id()));
+      ->create(['name' => 'test2', 'user_id' => $user1->id()]);
     $entity->save();
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('name' => 'test', 'user_id' => NULL));
+      ->create(['name' => 'test', 'user_id' => NULL]);
     $entity->save();
 
     /** @var \Drupal\Core\Entity\EntityStorageInterface $storage */
@@ -65,32 +65,32 @@ class EntityApiTest extends EntityKernelTestBase {
       ->getStorage($entity_type);
 
     $entities = array_values($storage->loadByProperties(['name' => 'test']));
-    $this->assertEqual($entities[0]->name->value, 'test', format_string('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entities[1]->name->value, 'test', format_string('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entities[0]->name->value, 'test', format_string('%entity_type: Created and loaded entity', ['%entity_type' => $entity_type]));
+    $this->assertEqual($entities[1]->name->value, 'test', format_string('%entity_type: Created and loaded entity', ['%entity_type' => $entity_type]));
 
     // Test loading a single entity.
     $loaded_entity = $storage->load($entity->id());
-    $this->assertEqual($loaded_entity->id(), $entity->id(), format_string('%entity_type: Loaded a single entity by id.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($loaded_entity->id(), $entity->id(), format_string('%entity_type: Loaded a single entity by id.', ['%entity_type' => $entity_type]));
 
     // Test deleting an entity.
     $entities = array_values($storage->loadByProperties(['name' => 'test2']));
     $entities[0]->delete();
     $entities = array_values($storage->loadByProperties(['name' => 'test2']));
-    $this->assertEqual($entities, array(), format_string('%entity_type: Entity deleted.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entities, [], format_string('%entity_type: Entity deleted.', ['%entity_type' => $entity_type]));
 
     // Test updating an entity.
     $entities = array_values($storage->loadByProperties(['name' => 'test']));
     $entities[0]->name->value = 'test3';
     $entities[0]->save();
     $entity = $storage->load($entities[0]->id());
-    $this->assertEqual($entity->name->value, 'test3', format_string('%entity_type: Entity updated.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->name->value, 'test3', format_string('%entity_type: Entity updated.', ['%entity_type' => $entity_type]));
 
     // Try deleting multiple test entities by deleting all.
     $ids = array_keys($storage->loadMultiple());
     entity_delete_multiple($entity_type, $ids);
 
     $all = $storage->loadMultiple();
-    $this->assertTrue(empty($all), format_string('%entity_type: Deleted all entities.', array('%entity_type' => $entity_type)));
+    $this->assertTrue(empty($all), format_string('%entity_type: Deleted all entities.', ['%entity_type' => $entity_type]));
 
     // Verify that all data got deleted.
     $definition = \Drupal::entityManager()->getDefinition($entity_type);
@@ -103,11 +103,11 @@ class EntityApiTest extends EntityKernelTestBase {
     }
 
     // Test deleting a list of entities not indexed by entity id.
-    $entities = array();
-    $entity = entity_create($entity_type, array('name' => 'test', 'user_id' => $user1->id()));
+    $entities = [];
+    $entity = entity_create($entity_type, ['name' => 'test', 'user_id' => $user1->id()]);
     $entity->save();
     $entities['test'] = $entity;
-    $entity = entity_create($entity_type, array('name' => 'test2', 'user_id' => $user1->id()));
+    $entity = entity_create($entity_type, ['name' => 'test2', 'user_id' => $user1->id()]);
     $entity->save();
     $entities['test2'] = $entity;
     $controller = \Drupal::entityManager()->getStorage($entity_type);
@@ -115,7 +115,7 @@ class EntityApiTest extends EntityKernelTestBase {
 
     // Verify that entities got deleted.
     $all = $storage->loadMultiple();
-    $this->assertTrue(empty($all), format_string('%entity_type: Deleted all entities.', array('%entity_type' => $entity_type)));
+    $this->assertTrue(empty($all), format_string('%entity_type: Deleted all entities.', ['%entity_type' => $entity_type]));
 
     // Verify that all data got deleted from the tables.
     $definition = \Drupal::entityManager()->getDefinition($entity_type);
@@ -132,7 +132,7 @@ class EntityApiTest extends EntityKernelTestBase {
    * Tests that exceptions are thrown when saving or deleting an entity.
    */
   public function testEntityStorageExceptionHandling() {
-    $entity = EntityTest::create(array('name' => 'test'));
+    $entity = EntityTest::create(['name' => 'test']);
     try {
       $GLOBALS['entity_test_throw_exception'] = TRUE;
       $entity->save();
@@ -142,7 +142,7 @@ class EntityApiTest extends EntityKernelTestBase {
       $this->assertEqual($e->getcode(), 1, 'Entity presave EntityStorageException caught.');
     }
 
-    $entity = EntityTest::create(array('name' => 'test2'));
+    $entity = EntityTest::create(['name' => 'test2']);
     try {
       unset($GLOBALS['entity_test_throw_exception']);
       $entity->save();
@@ -152,7 +152,7 @@ class EntityApiTest extends EntityKernelTestBase {
       $this->assertNotEqual($e->getCode(), 1, 'Entity presave EntityStorageException caught.');
     }
 
-    $entity = EntityTest::create(array('name' => 'test3'));
+    $entity = EntityTest::create(['name' => 'test3']);
     $entity->save();
     try {
       $GLOBALS['entity_test_throw_exception'] = TRUE;
@@ -164,7 +164,7 @@ class EntityApiTest extends EntityKernelTestBase {
     }
 
     unset($GLOBALS['entity_test_throw_exception']);
-    $entity = EntityTest::create(array('name' => 'test4'));
+    $entity = EntityTest::create(['name' => 'test4']);
     $entity->save();
     try {
       $entity->delete();
@@ -175,4 +175,38 @@ class EntityApiTest extends EntityKernelTestBase {
     }
   }
 
+  /**
+   * Tests that resaving a revision with a different revision ID throws an exception.
+   */
+  public function testUpdateWithRevisionId() {
+    $storage = \Drupal::entityTypeManager()->getStorage('entity_test_mulrev');
+
+    // Create a new entity.
+    /** @var \Drupal\entity_test\Entity\EntityTestMulRev $entity */
+    $entity = $storage->create(['name' => 'revision_test']);
+    $entity->save();
+
+    $this->setExpectedException(EntityStorageException::class, "Update existing 'entity_test_mulrev' entity revision while changing the revision ID is not supported.");
+
+    $entity->revision_id = 60;
+    $entity->save();
+  }
+
+  /**
+   * Tests that resaving an entity with a different entity ID throws an exception.
+   */
+  public function testUpdateWithId() {
+    $storage = \Drupal::entityTypeManager()->getStorage('entity_test_mulrev');
+
+    // Create a new entity.
+    /** @var \Drupal\entity_test\Entity\EntityTestMulRev $entity */
+    $entity = $storage->create(['name' => 'revision_test']);
+    $entity->save();
+
+    $this->setExpectedException(EntityStorageException::class, "Update existing 'entity_test_mulrev' entity while changing the ID is not supported.");
+
+    $entity->id = 60;
+    $entity->save();
+  }
+
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php
index ae4925ce0..ca65eb832 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php
@@ -43,23 +43,23 @@ class EntityAutocompleteTest extends EntityKernelTestBase {
   /**
    * Tests autocompletion edge cases with slashes in the names.
    */
-  function testEntityReferenceAutocompletion() {
+  public function testEntityReferenceAutocompletion() {
     // Add an entity with a slash in its name.
     $entity_1 = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('name' => '10/16/2011'));
+      ->create(['name' => '10/16/2011']);
     $entity_1->save();
 
     // Add another entity that differs after the slash character.
     $entity_2 = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('name' => '10/17/2011'));
+      ->create(['name' => '10/17/2011']);
     $entity_2->save();
 
     // Add another entity that has both a comma, a slash and markup.
     $entity_3 = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('name' => 'label with, and / test'));
+      ->create(['name' => 'label with, and / test']);
     $entity_3->save();
 
     // Try to autocomplete a entity label that matches both entities.
@@ -73,10 +73,10 @@ class EntityAutocompleteTest extends EntityKernelTestBase {
     // We should only get the first entity in a JSON encoded string.
     $input = '10/16';
     $data = $this->getAutocompleteResult($input);
-    $target = array(
+    $target = [
       'value' => $entity_1->name->value . ' (1)',
       'label' => Html::escape($entity_1->name->value),
-    );
+    ];
     $this->assertIdentical(reset($data), $target, 'Autocomplete returns only the expected matching entity.');
 
     // Try to autocomplete a entity label that matches the second entity, and
@@ -91,10 +91,10 @@ class EntityAutocompleteTest extends EntityKernelTestBase {
     $n = $entity_3->name->value . ' (3)';
     // Entity labels containing commas or quotes must be wrapped in quotes.
     $n = Tags::encode($n);
-    $target = array(
+    $target = [
       'value' => $n,
       'label' => Html::escape($entity_3->name->value),
-    );
+    ];
     $this->assertIdentical(reset($data), $target, 'Autocomplete returns an entity label containing a comma and a slash.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityBundleFieldTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityBundleFieldTest.php
index ec8fd1cfe..ed30d4b56 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityBundleFieldTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityBundleFieldTest.php
@@ -14,7 +14,7 @@ class EntityBundleFieldTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('entity_schema_test');
+  public static $modules = ['entity_schema_test'];
 
   /**
    * The module handler.
@@ -35,7 +35,7 @@ class EntityBundleFieldTest extends EntityKernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('user', array('users_data'));
+    $this->installSchema('user', ['users_data']);
     $this->moduleHandler = $this->container->get('module_handler');
     $this->database = $this->container->get('database');
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
index 935fd7a2a..9b279a5e1 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
@@ -40,17 +40,17 @@ class EntityCrudHookTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test', 'entity_crud_hook_test', 'file', 'taxonomy', 'node', 'comment');
+  public static $modules = ['block', 'block_test', 'entity_crud_hook_test', 'file', 'taxonomy', 'node', 'comment'];
 
-  protected $ids = array();
+  protected $ids = [];
 
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('user', array('users_data'));
-    $this->installSchema('file', array('file_usage'));
-    $this->installSchema('node', array('node_access'));
-    $this->installSchema('comment', array('comment_entity_statistics'));
+    $this->installSchema('user', ['users_data']);
+    $this->installSchema('file', ['file_usage']);
+    $this->installSchema('node', ['node_access']);
+    $this->installSchema('comment', ['comment_entity_statistics']);
     $this->installConfig(['node', 'comment']);
   }
 
@@ -64,7 +64,7 @@ class EntityCrudHookTest extends EntityKernelTestBase {
    *   An array of plain-text messages in the order they should appear.
    */
   protected function assertHookMessageOrder($messages) {
-    $positions = array();
+    $positions = [];
     foreach ($messages as $message) {
       // Verify that each message is found and record its position.
       $position = array_search($message, $GLOBALS['entity_crud_hook_test']);
@@ -83,55 +83,55 @@ class EntityCrudHookTest extends EntityKernelTestBase {
    * Tests hook invocations for CRUD operations on blocks.
    */
   public function testBlockHooks() {
-    $entity = Block::create(array(
+    $entity = Block::create([
       'id' => 'stark_test_html',
       'plugin' => 'test_html',
       'theme' => 'stark',
-    ));
+    ]);
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_block_create called',
       'entity_crud_hook_test_entity_create called for type block',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $entity->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_block_presave called',
       'entity_crud_hook_test_entity_presave called for type block',
       'entity_crud_hook_test_block_insert called',
       'entity_crud_hook_test_entity_insert called for type block',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $entity = Block::load($entity->id());
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_entity_load called for type block',
       'entity_crud_hook_test_block_load called',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $entity->label = 'New label';
     $entity->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_block_presave called',
       'entity_crud_hook_test_entity_presave called for type block',
       'entity_crud_hook_test_block_update called',
       'entity_crud_hook_test_entity_update called for type block',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $entity->delete();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_block_predelete called',
       'entity_crud_hook_test_entity_predelete called for type block',
       'entity_crud_hook_test_block_delete called',
       'entity_crud_hook_test_entity_delete called for type block',
-    ));
+    ]);
   }
 
   /**
@@ -158,9 +158,9 @@ class EntityCrudHookTest extends EntityKernelTestBase {
     ]);
     $node->save();
     $nid = $node->id();
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
 
-    $comment = Comment::create(array(
+    $comment = Comment::create([
       'cid' => NULL,
       'pid' => 0,
       'entity_id' => $nid,
@@ -172,51 +172,51 @@ class EntityCrudHookTest extends EntityKernelTestBase {
       'changed' => REQUEST_TIME,
       'status' => 1,
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_comment_create called',
       'entity_crud_hook_test_entity_create called for type comment',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $comment->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_comment_presave called',
       'entity_crud_hook_test_entity_presave called for type comment',
       'entity_crud_hook_test_comment_insert called',
       'entity_crud_hook_test_entity_insert called for type comment',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $comment = Comment::load($comment->id());
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_entity_load called for type comment',
       'entity_crud_hook_test_comment_load called',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $comment->setSubject('New subject');
     $comment->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_comment_presave called',
       'entity_crud_hook_test_entity_presave called for type comment',
       'entity_crud_hook_test_comment_update called',
       'entity_crud_hook_test_entity_update called for type comment',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $comment->delete();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_comment_predelete called',
       'entity_crud_hook_test_entity_predelete called for type comment',
       'entity_crud_hook_test_comment_delete called',
       'entity_crud_hook_test_entity_delete called for type comment',
-    ));
+    ]);
   }
 
   /**
@@ -239,49 +239,49 @@ class EntityCrudHookTest extends EntityKernelTestBase {
       'changed' => REQUEST_TIME,
     ]);
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_file_create called',
       'entity_crud_hook_test_entity_create called for type file',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $file->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_file_presave called',
       'entity_crud_hook_test_entity_presave called for type file',
       'entity_crud_hook_test_file_insert called',
       'entity_crud_hook_test_entity_insert called for type file',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $file = File::load($file->id());
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_entity_load called for type file',
       'entity_crud_hook_test_file_load called',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $file->setFilename('new.entity_crud_hook_test.file');
     $file->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_file_presave called',
       'entity_crud_hook_test_entity_presave called for type file',
       'entity_crud_hook_test_file_update called',
       'entity_crud_hook_test_entity_update called for type file',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $file->delete();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_file_predelete called',
       'entity_crud_hook_test_entity_predelete called for type file',
       'entity_crud_hook_test_file_delete called',
       'entity_crud_hook_test_entity_delete called for type file',
-    ));
+    ]);
   }
 
   /**
@@ -302,49 +302,49 @@ class EntityCrudHookTest extends EntityKernelTestBase {
       'changed' => REQUEST_TIME,
     ]);
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_node_create called',
       'entity_crud_hook_test_entity_create called for type node',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $node->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_node_presave called',
       'entity_crud_hook_test_entity_presave called for type node',
       'entity_crud_hook_test_node_insert called',
       'entity_crud_hook_test_entity_insert called for type node',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $node = Node::load($node->id());
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_entity_load called for type node',
       'entity_crud_hook_test_node_load called',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $node->title = 'New title';
     $node->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_node_presave called',
       'entity_crud_hook_test_entity_presave called for type node',
       'entity_crud_hook_test_node_update called',
       'entity_crud_hook_test_entity_update called for type node',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $node->delete();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_node_predelete called',
       'entity_crud_hook_test_entity_predelete called for type node',
       'entity_crud_hook_test_node_delete called',
       'entity_crud_hook_test_entity_delete called for type node',
-    ));
+    ]);
   }
 
   /**
@@ -361,7 +361,7 @@ class EntityCrudHookTest extends EntityKernelTestBase {
       'module' => 'entity_crud_hook_test',
     ]);
     $vocabulary->save();
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
 
     $term = Term::create([
       'vid' => $vocabulary->id(),
@@ -371,49 +371,49 @@ class EntityCrudHookTest extends EntityKernelTestBase {
       'format' => 1,
     ]);
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_taxonomy_term_create called',
       'entity_crud_hook_test_entity_create called for type taxonomy_term',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $term->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_taxonomy_term_presave called',
       'entity_crud_hook_test_entity_presave called for type taxonomy_term',
       'entity_crud_hook_test_taxonomy_term_insert called',
       'entity_crud_hook_test_entity_insert called for type taxonomy_term',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $term = Term::load($term->id());
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_entity_load called for type taxonomy_term',
       'entity_crud_hook_test_taxonomy_term_load called',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $term->setName('New name');
     $term->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_taxonomy_term_presave called',
       'entity_crud_hook_test_entity_presave called for type taxonomy_term',
       'entity_crud_hook_test_taxonomy_term_update called',
       'entity_crud_hook_test_entity_update called for type taxonomy_term',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $term->delete();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_taxonomy_term_predelete called',
       'entity_crud_hook_test_entity_predelete called for type taxonomy_term',
       'entity_crud_hook_test_taxonomy_term_delete called',
       'entity_crud_hook_test_entity_delete called for type taxonomy_term',
-    ));
+    ]);
   }
 
   /**
@@ -430,49 +430,49 @@ class EntityCrudHookTest extends EntityKernelTestBase {
       'module' => 'entity_crud_hook_test',
     ]);
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_taxonomy_vocabulary_create called',
       'entity_crud_hook_test_entity_create called for type taxonomy_vocabulary',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $vocabulary->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_taxonomy_vocabulary_presave called',
       'entity_crud_hook_test_entity_presave called for type taxonomy_vocabulary',
       'entity_crud_hook_test_taxonomy_vocabulary_insert called',
       'entity_crud_hook_test_entity_insert called for type taxonomy_vocabulary',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $vocabulary = Vocabulary::load($vocabulary->id());
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_entity_load called for type taxonomy_vocabulary',
       'entity_crud_hook_test_taxonomy_vocabulary_load called',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $vocabulary->set('name', 'New name');
     $vocabulary->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_taxonomy_vocabulary_presave called',
       'entity_crud_hook_test_entity_presave called for type taxonomy_vocabulary',
       'entity_crud_hook_test_taxonomy_vocabulary_update called',
       'entity_crud_hook_test_entity_update called for type taxonomy_vocabulary',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $vocabulary->delete();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_taxonomy_vocabulary_predelete called',
       'entity_crud_hook_test_entity_predelete called for type taxonomy_vocabulary',
       'entity_crud_hook_test_taxonomy_vocabulary_delete called',
       'entity_crud_hook_test_entity_delete called for type taxonomy_vocabulary',
-    ));
+    ]);
   }
 
   /**
@@ -487,58 +487,58 @@ class EntityCrudHookTest extends EntityKernelTestBase {
       'language' => 'en',
     ]);
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_user_create called',
       'entity_crud_hook_test_entity_create called for type user',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $account->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_user_presave called',
       'entity_crud_hook_test_entity_presave called for type user',
       'entity_crud_hook_test_user_insert called',
       'entity_crud_hook_test_entity_insert called for type user',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     User::load($account->id());
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_entity_load called for type user',
       'entity_crud_hook_test_user_load called',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     $account->name = 'New name';
     $account->save();
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_user_presave called',
       'entity_crud_hook_test_entity_presave called for type user',
       'entity_crud_hook_test_user_update called',
       'entity_crud_hook_test_entity_update called for type user',
-    ));
+    ]);
 
-    $GLOBALS['entity_crud_hook_test'] = array();
+    $GLOBALS['entity_crud_hook_test'] = [];
     user_delete($account->id());
 
-    $this->assertHookMessageOrder(array(
+    $this->assertHookMessageOrder([
       'entity_crud_hook_test_user_predelete called',
       'entity_crud_hook_test_entity_predelete called for type user',
       'entity_crud_hook_test_user_delete called',
       'entity_crud_hook_test_entity_delete called for type user',
-    ));
+    ]);
   }
 
   /**
    * Tests rollback from failed entity save.
    */
-  function testEntityRollback() {
+  public function testEntityRollback() {
     // Create a block.
     try {
-      EntityTest::create(array('name' => 'fail_insert'))->save();
+      EntityTest::create(['name' => 'fail_insert'])->save();
       $this->fail('Expected exception has not been thrown.');
     }
     catch (\Exception $e) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
index 23cf0340c..646ad2e7f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
@@ -13,7 +13,7 @@ use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Field\FieldStorageDefinitionEvents;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\entity_test\Entity\EntityTestUpdate;
+use Drupal\entity_test_update\Entity\EntityTestUpdate;
 use Drupal\system\Tests\Entity\EntityDefinitionTestTrait;
 
 /**
@@ -39,6 +39,13 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
    */
   protected $database;
 
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['entity_test_update'];
+
   /**
    * {@inheritdoc}
    */
@@ -49,7 +56,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
 
     // Install every entity type's schema that wasn't installed in the parent
     // method.
-    foreach (array_diff_key($this->entityManager->getDefinitions(), array_flip(array('user', 'entity_test'))) as $entity_type_id => $entity_type) {
+    foreach (array_diff_key($this->entityManager->getDefinitions(), array_flip(['user', 'entity_test'])) as $entity_type_id => $entity_type) {
       $this->installEntitySchema($entity_type_id);
     }
   }
@@ -80,7 +87,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
   public function testNoUpdates() {
     // Ensure that the definition update manager reports no updates.
     $this->assertFalse($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that no updates are needed.');
-    $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), array(), 'EntityDefinitionUpdateManager reports an empty change summary.');
+    $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), [], 'EntityDefinitionUpdateManager reports an empty change summary.');
 
     // Ensure that applyUpdates() runs without error (it's not expected to do
     // anything when there aren't updates).
@@ -99,11 +106,14 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // reports that an update is needed.
     $this->updateEntityTypeToRevisionable();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
+    $expected = [
+      'entity_test_update' => [
         t('The %entity_type entity type needs to be updated.', ['%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel()]),
-      ),
-    );
+        // The revision key is now defined, so the revision field needs to be
+        // created.
+        t('The %field_name field needs to be installed.', ['%field_name' => 'Revision ID']),
+      ],
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected); //, 'EntityDefinitionUpdateManager reports the expected change summary.');
 
     // Run the update and ensure the revision table is created.
@@ -138,11 +148,11 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // creates its schema.
     $this->addBaseField();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
+    $expected = [
+      'entity_test_update' => [
         t('The %field_name field needs to be installed.', ['%field_name' => t('A new base field')]),
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
     $this->entityDefinitionUpdateManager->applyUpdates();
     $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), 'Column created in shared table for new_base_field.');
@@ -151,11 +161,11 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // and the update creates it.
     $this->addBaseFieldIndex();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
+    $expected = [
+      'entity_test_update' => [
         t('The %field_name field needs to be updated.', ['%field_name' => t('A new base field')]),
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
     $this->entityDefinitionUpdateManager->applyUpdates();
     $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), 'Index created.');
@@ -164,11 +174,11 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // update deletes it.
     $this->removeBaseFieldIndex();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
+    $expected = [
+      'entity_test_update' => [
         t('The %field_name field needs to be updated.', ['%field_name' => t('A new base field')]),
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
     $this->entityDefinitionUpdateManager->applyUpdates();
     $this->assertFalse($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), 'Index deleted.');
@@ -178,11 +188,11 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // accordingly.
     $this->modifyBaseField();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
+    $expected = [
+      'entity_test_update' => [
         t('The %field_name field needs to be updated.', ['%field_name' => t('A new base field')]),
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
     $this->entityDefinitionUpdateManager->applyUpdates();
     $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), 'Original column deleted in shared table for new_base_field.');
@@ -193,11 +203,11 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // update deletes the schema.
     $this->removeBaseField();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
+    $expected = [
+      'entity_test_update' => [
         t('The %field_name field needs to be uninstalled.', ['%field_name' => t('A new base field')]),
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
     $this->entityDefinitionUpdateManager->applyUpdates();
     $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field_value'), 'Value column deleted from shared table for new_base_field.');
@@ -212,11 +222,11 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // creates its schema.
     $this->addBundleField();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
+    $expected = [
+      'entity_test_update' => [
         t('The %field_name field needs to be installed.', ['%field_name' => t('A new bundle field')]),
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
     $this->entityDefinitionUpdateManager->applyUpdates();
     $this->assertTrue($this->database->schema()->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table created for new_bundle_field.');
@@ -226,11 +236,11 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // accordingly.
     $this->modifyBundleField();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
+    $expected = [
       'entity_test_update' => [
         t('The %field_name field needs to be updated.', ['%field_name' => t('A new bundle field')]),
       ],
-    );
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
     $this->entityDefinitionUpdateManager->applyUpdates();
     $this->assertTrue($this->database->schema()->fieldExists('entity_test_update__new_bundle_field', 'new_bundle_field_format'), 'Format column created in dedicated table for new_base_field.');
@@ -239,11 +249,11 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // update deletes the schema.
     $this->removeBundleField();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
+    $expected = [
+      'entity_test_update' => [
         t('The %field_name field needs to be uninstalled.', ['%field_name' => t('A new bundle field')]),
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
     $this->entityDefinitionUpdateManager->applyUpdates();
     $this->assertFalse($this->database->schema()->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table deleted for new_bundle_field.');
@@ -261,7 +271,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // Save an entity.
     $name = $this->randomString();
     $storage = $this->entityManager->getStorage('entity_test_update');
-    $entity = $storage->create(array('name' => $name));
+    $entity = $storage->create(['name' => $name]);
     $entity->save();
 
     // Add a base field and run the update. Ensure the base field's column is
@@ -301,7 +311,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     $this->entityDefinitionUpdateManager->applyUpdates();
     $assert = $schema_handler->fieldExists('entity_test_update', 'new_base_field__shape') && $schema_handler->fieldExists('entity_test_update', 'new_base_field__color');
     $this->assertTrue($assert, 'Columns created again in shared table for new_base_field.');
-    $entity = $storage->create(array('name' => $name));
+    $entity = $storage->create(['name' => $name]);
     $entity->save();
     $this->pass('The new_base_field columns are still nullable');
   }
@@ -318,7 +328,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // Save an entity.
     $name = $this->randomString();
     $storage = $this->entityManager->getStorage('entity_test_update');
-    $entity = $storage->create(array('name' => $name));
+    $entity = $storage->create(['name' => $name]);
     $entity->save();
 
     // Add a bundle field and run the update. Ensure the bundle field's table
@@ -342,7 +352,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     $this->addBundleField('shape_required');
     $this->entityDefinitionUpdateManager->applyUpdates();
     $message = 'The new_bundle_field_shape column is not nullable.';
-    $values = array(
+    $values = [
       'bundle' => $entity->bundle(),
       'deleted' => 0,
       'entity_id' => $entity->id(),
@@ -350,7 +360,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'delta' => 0,
       'new_bundle_field_color' => $this->randomString(),
-    );
+    ];
     try {
       // Try to insert a record without providing a value for the 'not null'
       // column. This should fail.
@@ -385,7 +395,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     $this->entityDefinitionUpdateManager->applyUpdates();
 
     // Save an entity with the base field populated.
-    $this->entityManager->getStorage('entity_test_update')->create(array('new_base_field' => 'foo'))->save();
+    $this->entityManager->getStorage('entity_test_update')->create(['new_base_field' => 'foo'])->save();
 
     // Remove the base field and apply updates. It's expected to throw an
     // exception.
@@ -411,7 +421,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
 
     // Save an entity with the bundle field populated.
     entity_test_create_bundle('custom');
-    $this->entityManager->getStorage('entity_test_update')->create(array('type' => 'test_bundle', 'new_bundle_field' => 'foo'))->save();
+    $this->entityManager->getStorage('entity_test_update')->create(['type' => 'test_bundle', 'new_bundle_field' => 'foo'])->save();
 
     // Remove the bundle field and apply updates. It's expected to throw an
     // exception.
@@ -436,7 +446,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     $this->entityDefinitionUpdateManager->applyUpdates();
 
     // Save an entity with the base field populated.
-    $this->entityManager->getStorage('entity_test_update')->create(array('new_base_field' => 'foo'))->save();
+    $this->entityManager->getStorage('entity_test_update')->create(['new_base_field' => 'foo'])->save();
 
     // Change the field's field type and apply updates. It's expected to
     // throw an exception.
@@ -460,7 +470,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
 
     // Save an entity with the bundle field populated.
     entity_test_create_bundle('custom');
-    $this->entityManager->getStorage('entity_test_update')->create(array('type' => 'test_bundle', 'new_bundle_field' => 'foo'))->save();
+    $this->entityManager->getStorage('entity_test_update')->create(['type' => 'test_bundle', 'new_bundle_field' => 'foo'])->save();
 
     // Change the field's field type and apply updates. It's expected to
     // throw an exception.
@@ -482,11 +492,11 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // update to the entity type.
     $this->addEntityIndex();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
+    $expected = [
+      'entity_test_update' => [
         t('The %entity_type entity type needs to be updated.', ['%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel()]),
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
 
     // Run the update and ensure the new index is created.
@@ -497,11 +507,11 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // update to the entity type.
     $this->removeEntityIndex();
     $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
+    $expected = [
+      'entity_test_update' => [
         t('The %entity_type entity type needs to be updated.', ['%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel()]),
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
 
     // Run the update and ensure the index is deleted.
@@ -527,7 +537,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
   public function testEntityIndexCreateWithData() {
     // Save an entity.
     $name = $this->randomString();
-    $entity = $this->entityManager->getStorage('entity_test_update')->create(array('name' => $name));
+    $entity = $this->entityManager->getStorage('entity_test_update')->create(['name' => $name]);
     $entity->save();
 
     // Add an entity index, run the update. Ensure that the index is created
@@ -729,13 +739,13 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
     // Save an entity.
     $name = $this->randomString();
     $storage = $this->entityManager->getStorage('entity_test_update');
-    $entity = $storage->create(array('name' => $name));
+    $entity = $storage->create(['name' => $name]);
     $entity->save();
 
     // Create an index.
-    $indexes = array(
-      'entity_test_update__type_index' => array('type'),
-    );
+    $indexes = [
+      'entity_test_update__type_index' => ['type'],
+    ];
     $this->state->set('entity_test_update.additional_entity_indexes', $indexes);
     $this->entityDefinitionUpdateManager->applyUpdates();
     $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__type_index'), "New index 'entity_test_update__type_index' has been created on the 'entity_test_update' table.");
@@ -797,7 +807,7 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase {
   /**
    * Check that field schema is correctly handled with long-named fields.
    */
-  function testLongNameFieldIndexes() {
+  public function testLongNameFieldIndexes() {
     $this->addLongNameBaseField();
     $entity_type_id = 'entity_test_update';
     $entity_type = $this->entityManager->getDefinition($entity_type_id);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayBaseTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayBaseTest.php
index 2294a9185..ec1a55cbb 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayBaseTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayBaseTest.php
@@ -20,6 +20,43 @@ class EntityDisplayBaseTest extends KernelTestBase {
    */
   public static $modules = ['entity_test', 'entity_test_third_party', 'field', 'system', 'comment'];
 
+  /**
+   * @covers ::preSave
+   */
+  public function testPreSave() {
+    $entity_display = EntityViewDisplay::create([
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+      'status' => TRUE,
+      'content' => [
+        'foo' => ['type' => 'visible'],
+        'bar' => ['type' => 'hidden'],
+        'name' => ['type' => 'hidden', 'region' => 'content'],
+      ],
+    ]);
+
+    // Ensure that no region is set on the component.
+    $this->assertArrayNotHasKey('region', $entity_display->getComponent('foo'));
+    $this->assertArrayNotHasKey('region', $entity_display->getComponent('bar'));
+
+    // Ensure that a region is set on the component after saving.
+    $entity_display->save();
+
+    // The component with a visible type has been assigned a region.
+    $component = $entity_display->getComponent('foo');
+    $this->assertArrayHasKey('region', $component);
+    $this->assertSame('content', $component['region']);
+
+    // The component with a hidden type has been removed.
+    $this->assertNull($entity_display->getComponent('bar'));
+
+    // The component with a valid region and hidden type is unchanged.
+    $component = $entity_display->getComponent('name');
+    $this->assertArrayHasKey('region', $component);
+    $this->assertSame('content', $component['region']);
+  }
+
   /**
    * @covers ::onDependencyRemoval
    */
@@ -67,7 +104,7 @@ class EntityDisplayBaseTest extends KernelTestBase {
       'mode' => 'default',
       'status' => TRUE,
       'content' => [
-        'test_field' => ['type' => 'comment_default', 'settings' => ['view_mode' => 'default'], 'label' => 'hidden', 'third_party_settings' => []],
+        'test_field' => ['type' => 'comment_default', 'region' => 'content', 'settings' => ['view_mode' => 'default'], 'label' => 'hidden', 'third_party_settings' => []],
       ],
       'third_party_settings' => [
         'entity_test_third_party' => [
@@ -79,6 +116,7 @@ class EntityDisplayBaseTest extends KernelTestBase {
 
     $expected_component = [
       'type' => 'comment_default',
+      'region' => 'content',
       'settings' => ['view_mode' => 'default'],
       'label' => 'hidden',
       'third_party_settings' => [],
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayFormBaseTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayFormBaseTest.php
new file mode 100644
index 000000000..11aeede83
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayFormBaseTest.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\Entity\Display\EntityDisplayInterface;
+use Drupal\Core\Form\FormState;
+use Drupal\field_ui\Form\EntityViewDisplayEditForm;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\field_ui\Form\EntityDisplayFormBase
+ *
+ * @group Entity
+ */
+class EntityDisplayFormBaseTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test'];
+
+  /**
+   * @covers ::copyFormValuesToEntity
+   */
+  public function testCopyFormValuesToEntity() {
+    $field_values = [];
+    $entity = $this->prophesize(EntityDisplayInterface::class);
+    $entity->getPluginCollections()->willReturn([]);
+    $entity->getTargetEntityTypeId()->willReturn('entity_test_with_bundle');
+    $entity->getTargetBundle()->willReturn('target_bundle');
+
+    // An initially hidden field, with a submitted region change.
+    $entity->getComponent('new_field_mismatch_type_visible')->willReturn([]);
+    $field_values['new_field_mismatch_type_visible'] = [
+      'weight' => 0,
+      'type' => 'textfield',
+      'region' => 'hidden',
+    ];
+    $entity->removeComponent('new_field_mismatch_type_visible')
+      ->will(function ($args) {
+        // On subsequent calls, getComponent() will return an empty array.
+        $this->getComponent($args[0])->willReturn([]);
+      })
+      ->shouldBeCalled();
+
+    // An initially visible field, with identical submitted values.
+    $entity->getComponent('field_visible_no_changes')
+      ->willReturn([
+        'weight' => 0,
+        'type' => 'textfield',
+        'region' => 'content',
+      ]);
+    $field_values['field_visible_no_changes'] = [
+      'weight' => 0,
+      'type' => 'textfield',
+      'region' => 'content',
+    ];
+    $entity
+      ->setComponent('field_visible_no_changes', [
+        'weight' => 0,
+        'type' => 'textfield',
+        'region' => 'content',
+      ])
+      ->shouldBeCalled();
+
+
+    // An initially visible field, with a submitted region change.
+    $entity->getComponent('field_start_visible_change_region')
+      ->willReturn([
+        'weight' => 0,
+        'type' => 'textfield',
+        'region' => 'content',
+      ]);
+    $field_values['field_start_visible_change_region'] = [
+      'weight' => 0,
+      'type' => 'textfield',
+      'region' => 'hidden',
+    ];
+    $entity->removeComponent('field_start_visible_change_region')
+      ->will(function ($args) {
+        // On subsequent calls, getComponent() will return an empty array.
+        $this->getComponent($args[0])->willReturn([]);
+      })
+      ->shouldBeCalled();
+
+    // A field that is flagged for plugin settings update on the second build.
+    $entity->getComponent('field_plugin_settings_update')
+      ->willReturn([
+        'weight' => 0,
+        'type' => 'textfield',
+        'region' => 'content',
+      ]);
+    $field_values['field_plugin_settings_update'] = [
+      'weight' => 0,
+      'type' => 'textfield',
+      'region' => 'content',
+      'settings_edit_form' => [
+        'third_party_settings' => [
+          'foo' => 'bar',
+        ],
+      ],
+    ];
+    $entity
+      ->setComponent('field_plugin_settings_update', [
+        'weight' => 0,
+        'type' => 'textfield',
+        'region' => 'content',
+      ])
+      ->will(function ($args) {
+        // On subsequent calls, getComponent() will return the newly set values.
+        $this->getComponent($args[0])->willReturn($args[1]);
+        $args[1] += [
+          'settings' => [],
+          'third_party_settings' => [
+            'foo' => 'bar',
+          ],
+        ];
+        $this->setComponent($args[0], $args[1])->shouldBeCalled();
+      })
+      ->shouldBeCalled();
+
+    $form_object = new EntityViewDisplayEditForm($this->container->get('plugin.manager.field.field_type'), $this->container->get('plugin.manager.field.formatter'));
+    $form_object->setEntityManager($this->container->get('entity.manager'));
+    $form_object->setEntity($entity->reveal());
+
+    $form = [
+      '#fields' => array_keys($field_values),
+      '#extra' => [],
+    ];
+    $form_state = new FormState();
+    $form_state->setValues(['fields' => $field_values]);
+    $form_state->setProcessInput();
+
+    $form_object->buildEntity($form, $form_state);
+    $form_state->setSubmitted();
+
+    // Flag one field for updating plugin settings.
+    $form_state->set('plugin_settings_update', 'field_plugin_settings_update');
+    // During form submission, buildEntity() will be called twice. Simulate that
+    // here to prove copyFormValuesToEntity() is idempotent.
+    $form_object->buildEntity($form, $form_state);
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDuplicateTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDuplicateTest.php
new file mode 100644
index 000000000..e2c1af472
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDuplicateTest.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\entity_test\Entity\EntityTestRev;
+
+/**
+ * Test entity duplication.
+ *
+ * @group Entity
+ */
+class EntityDuplicateTest extends EntityKernelTestBase {
+
+  /**
+   * @var \Drupal\Core\Entity\ContentEntityStorageInterface
+   */
+  protected $entityTestRevStorage;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('entity_test_rev');
+    $this->entityTestRevStorage = $this->container->get('entity_type.manager')->getStorage('entity_test_rev');
+  }
+
+  /**
+   * Test duplicating a non-default revision.
+   */
+  public function testDuplicateNonDefaultRevision() {
+    $entity = EntityTestRev::create([
+      'name' => 'First Revision',
+    ]);
+    $entity->save();
+    $first_revision_id = $entity->getRevisionId();
+
+    $entity->setNewRevision(TRUE);
+    $entity->name = 'Second Revision';
+    $entity->save();
+
+    $duplicate_first_revision = $this->entityTestRevStorage->loadRevision($first_revision_id)->createDuplicate();
+    $this->assertTrue($duplicate_first_revision->isDefaultRevision(), 'Duplicating a non-default revision creates a default revision.');
+    $this->assertEquals($duplicate_first_revision->label(), 'First Revision');
+    $duplicate_first_revision->save();
+
+    $duplicate_first_revision->name = 'Updated name';
+    $duplicate_first_revision->save();
+
+    $this->entityTestRevStorage->resetCache();
+    $duplicate_first_revision = EntityTestRev::load($duplicate_first_revision->id());
+    $this->assertEquals('Updated name', $duplicate_first_revision->label());
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php
index c806409f5..c300b48e4 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php
@@ -47,9 +47,9 @@ class EntityFieldDefaultValueTest extends EntityKernelTestBase {
       ->create();
     $definition = $this->entityManager->getDefinition($entity_type_id);
     $langcode_key = $definition->getKey('langcode');
-    $this->assertEqual($entity->{$langcode_key}->value, 'en', SafeMarkup::format('%entity_type: Default language', array('%entity_type' => $entity_type_id)));
-    $this->assertTrue(Uuid::isValid($entity->uuid->value), SafeMarkup::format('%entity_type: Default UUID', array('%entity_type' => $entity_type_id)));
-    $this->assertEqual($entity->name->getValue(), array(), 'Field has one empty value by default.');
+    $this->assertEqual($entity->{$langcode_key}->value, 'en', SafeMarkup::format('%entity_type: Default language', ['%entity_type' => $entity_type_id]));
+    $this->assertTrue(Uuid::isValid($entity->uuid->value), SafeMarkup::format('%entity_type: Default UUID', ['%entity_type' => $entity_type_id]));
+    $this->assertEqual($entity->name->getValue(), [], 'Field has one empty value by default.');
   }
 
   /**
@@ -60,16 +60,16 @@ class EntityFieldDefaultValueTest extends EntityKernelTestBase {
     // The description field has a default value callback for testing, see
     // entity_test_field_default_value().
     $string = 'description_' . $entity->language()->getId();
-    $expected = array(
-      array(
+    $expected = [
+      [
         'shape' => "shape:0:$string",
         'color' => "color:0:$string",
-      ),
-      array(
+      ],
+      [
         'shape' => "shape:1:$string",
         'color' => "color:1:$string",
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($entity->description->getValue(), $expected);
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
index 56af88810..e0bf6551f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\KernelTests\Core\Entity;
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\RevisionLogInterface;
 use Drupal\Core\Entity\TypedData\EntityDataDefinition;
 use Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -30,7 +31,7 @@ class EntityFieldTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'text', 'node', 'user', 'field_test');
+  public static $modules = ['filter', 'text', 'node', 'user', 'field_test'];
 
   /**
    * @var string
@@ -62,7 +63,7 @@ class EntityFieldTest extends EntityKernelTestBase {
     entity_test_install();
 
     // Install required default configuration for filter module.
-    $this->installConfig(array('system', 'filter'));
+    $this->installConfig(['system', 'filter']);
   }
 
   /**
@@ -111,108 +112,108 @@ class EntityFieldTest extends EntityKernelTestBase {
     $langcode = 'en';
 
     // Access the name field.
-    $this->assertTrue($entity->name instanceof FieldItemListInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
-    $this->assertTrue($entity->name[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity->name instanceof FieldItemListInterface, format_string('%entity_type: Field implements interface', ['%entity_type' => $entity_type]));
+    $this->assertTrue($entity->name[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', ['%entity_type' => $entity_type]));
 
-    $this->assertEqual($this->entityName, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityName, $entity->name[0]->value, format_string('%entity_type: Name value can be read through list access.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $this->entityName)), format_string('%entity_type: Plain field value returned.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($this->entityName, $entity->name->value, format_string('%entity_type: Name value can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($this->entityName, $entity->name[0]->value, format_string('%entity_type: Name value can be read through list access.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($entity->name->getValue(), [0 => ['value' => $this->entityName]], format_string('%entity_type: Plain field value returned.', ['%entity_type' => $entity_type]));
 
     // Change the name.
     $new_name = $this->randomMachineName();
     $entity->name->value = $new_name;
-    $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $new_name)), format_string('%entity_type: Plain field value reflects the update.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($entity->name->getValue(), [0 => ['value' => $new_name]], format_string('%entity_type: Plain field value reflects the update.', ['%entity_type' => $entity_type]));
 
     $new_name = $this->randomMachineName();
     $entity->name[0]->value = $new_name;
-    $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read through list access.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read through list access.', ['%entity_type' => $entity_type]));
 
     // Access the user field.
-    $this->assertTrue($entity->user_id instanceof FieldItemListInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
-    $this->assertTrue($entity->user_id[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity->user_id instanceof FieldItemListInterface, format_string('%entity_type: Field implements interface', ['%entity_type' => $entity_type]));
+    $this->assertTrue($entity->user_id[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', ['%entity_type' => $entity_type]));
 
-    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', ['%entity_type' => $entity_type]));
 
     // Change the assigned user by entity.
     $new_user1 = $this->createUser();
     $entity->user_id->entity = $new_user1;
-    $this->assertEqual($new_user1->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($new_user1->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated username value can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_user1->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($new_user1->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated username value can be read.', ['%entity_type' => $entity_type]));
 
     // Change the assigned user by id.
     $new_user2 = $this->createUser();
     $entity->user_id->target_id = $new_user2->id();
-    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated username value can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated username value can be read.', ['%entity_type' => $entity_type]));
 
     // Try unsetting a field property.
     $entity->name->value = NULL;
     $entity->user_id->target_id = NULL;
-    $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', array('%entity_type' => $entity_type)));
-    $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type)));
-    $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type)));
+    $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', ['%entity_type' => $entity_type]));
+    $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', ['%entity_type' => $entity_type]));
+    $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', ['%entity_type' => $entity_type]));
 
     // Test setting the values via the typed data API works as well.
     // Change the assigned user by entity.
     $entity->user_id->first()->get('entity')->setValue($new_user2);
-    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', ['%entity_type' => $entity_type]));
 
     // Change the assigned user by id.
     $entity->user_id->first()->get('target_id')->setValue($new_user2->id());
-    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', ['%entity_type' => $entity_type]));
 
     // Try unsetting a field.
     $entity->name->first()->get('value')->setValue(NULL);
     $entity->user_id->first()->get('target_id')->setValue(NULL);
-    $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', array('%entity_type' => $entity_type)));
-    $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type)));
-    $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type)));
+    $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', ['%entity_type' => $entity_type]));
+    $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', ['%entity_type' => $entity_type]));
+    $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', ['%entity_type' => $entity_type]));
 
     // Create a fresh entity so target_id does not get its property object
     // instantiated, then verify setting a new value via typed data API works.
     $entity2 = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
-        'user_id' => array('target_id' => $new_user1->id()),
-      ));
+      ->create([
+        'user_id' => ['target_id' => $new_user1->id()],
+      ]);
     // Access the property object, and set a value.
     $entity2->user_id->first()->get('target_id')->setValue($new_user2->id());
-    $this->assertEqual($new_user2->id(), $entity2->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($new_user2->name->value, $entity2->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_user2->id(), $entity2->user_id->target_id, format_string('%entity_type: Updated user id can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($new_user2->name->value, $entity2->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', ['%entity_type' => $entity_type]));
 
     // Test using isset(), empty() and unset().
     $entity->name->value = 'test unset';
     unset($entity->name->value);
-    $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
-    $this->assertTrue(empty($entity->name->value), format_string('%entity_type: Name is empty.', array('%entity_type' => $entity_type)));
-    $this->assertTrue(empty($entity->name[0]->value), format_string('%entity_type: Name is empty.', array('%entity_type' => $entity_type)));
+    $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', ['%entity_type' => $entity_type]));
+    $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', ['%entity_type' => $entity_type]));
+    $this->assertTrue(empty($entity->name->value), format_string('%entity_type: Name is empty.', ['%entity_type' => $entity_type]));
+    $this->assertTrue(empty($entity->name[0]->value), format_string('%entity_type: Name is empty.', ['%entity_type' => $entity_type]));
 
     $entity->name->value = 'a value';
-    $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
-    $this->assertTrue(isset($entity->name[0]->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(empty($entity->name->value), format_string('%entity_type: Name is not empty.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(empty($entity->name[0]->value), format_string('%entity_type: Name is not empty.', array('%entity_type' => $entity_type)));
-    $this->assertTrue(isset($entity->name[0]), format_string('%entity_type: Name string item is set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(isset($entity->name[1]), format_string('%entity_type: Second name string item is not set as it does not exist', array('%entity_type' => $entity_type)));
-    $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(isset($entity->nameInvalid), format_string('%entity_type: Not existing field is not set.', array('%entity_type' => $entity_type)));
+    $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', ['%entity_type' => $entity_type]));
+    $this->assertTrue(isset($entity->name[0]->value), format_string('%entity_type: Name is set.', ['%entity_type' => $entity_type]));
+    $this->assertFalse(empty($entity->name->value), format_string('%entity_type: Name is not empty.', ['%entity_type' => $entity_type]));
+    $this->assertFalse(empty($entity->name[0]->value), format_string('%entity_type: Name is not empty.', ['%entity_type' => $entity_type]));
+    $this->assertTrue(isset($entity->name[0]), format_string('%entity_type: Name string item is set.', ['%entity_type' => $entity_type]));
+    $this->assertFalse(isset($entity->name[1]), format_string('%entity_type: Second name string item is not set as it does not exist', ['%entity_type' => $entity_type]));
+    $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', ['%entity_type' => $entity_type]));
+    $this->assertFalse(isset($entity->nameInvalid), format_string('%entity_type: Not existing field is not set.', ['%entity_type' => $entity_type]));
 
     unset($entity->name[0]);
-    $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
+    $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', ['%entity_type' => $entity_type]));
+    $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', ['%entity_type' => $entity_type]));
+    $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', ['%entity_type' => $entity_type]));
 
     // Test emptying a field by assigning an empty value. NULL and array()
     // behave the same.
-    foreach ([NULL, array(), 'unset'] as $empty) {
+    foreach ([NULL, [], 'unset'] as $empty) {
       // Make sure a value is present
       $entity->name->value = 'a value';
-      $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
+      $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', ['%entity_type' => $entity_type]));
       // Now, empty the field.
       if ($empty === 'unset') {
         unset($entity->name);
@@ -220,36 +221,36 @@ class EntityFieldTest extends EntityKernelTestBase {
       else {
         $entity->name = $empty;
       }
-      $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
-      $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
-      $this->assertIdentical(count($entity->name), 0, format_string('%entity_type: Name field contains no items.', array('%entity_type' => $entity_type)));
-      $this->assertIdentical($entity->name->getValue(), array(), format_string('%entity_type: Name field value is an empty array.', array('%entity_type' => $entity_type)));
-      $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type)));
-      $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: First name item value is not set.', array('%entity_type' => $entity_type)));
-      $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name value is not set.', array('%entity_type' => $entity_type)));
+      $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', ['%entity_type' => $entity_type]));
+      $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is set.', ['%entity_type' => $entity_type]));
+      $this->assertIdentical(count($entity->name), 0, format_string('%entity_type: Name field contains no items.', ['%entity_type' => $entity_type]));
+      $this->assertIdentical($entity->name->getValue(), [], format_string('%entity_type: Name field value is an empty array.', ['%entity_type' => $entity_type]));
+      $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', ['%entity_type' => $entity_type]));
+      $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: First name item value is not set.', ['%entity_type' => $entity_type]));
+      $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name value is not set.', ['%entity_type' => $entity_type]));
     }
 
     // Access the language field.
     $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
-    $this->assertEqual($langcode, $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(\Drupal::languageManager()->getLanguage($langcode), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($langcode, $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual(\Drupal::languageManager()->getLanguage($langcode), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', ['%entity_type' => $entity_type]));
 
     // Change the language by code.
     $entity->{$langcode_key}->value = \Drupal::languageManager()->getDefaultLanguage()->getId();
-    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', ['%entity_type' => $entity_type]));
 
     // Revert language by code then try setting it by language object.
     $entity->{$langcode_key}->value = $langcode;
     $entity->{$langcode_key}->language = \Drupal::languageManager()->getDefaultLanguage();
-    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', ['%entity_type' => $entity_type]));
 
     // Access the text field and test updating.
-    $this->assertEqual($entity->field_test_text->value, $this->entityFieldText, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->field_test_text->value, $this->entityFieldText, format_string('%entity_type: Text field can be read.', ['%entity_type' => $entity_type]));
     $new_text = $this->randomMachineName();
     $entity->field_test_text->value = $new_text;
-    $this->assertEqual($entity->field_test_text->value, $new_text, format_string('%entity_type: Updated text field can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->field_test_text->value, $new_text, format_string('%entity_type: Updated text field can be read.', ['%entity_type' => $entity_type]));
 
     // Test creating the entity by passing in plain values.
     $this->entityName = $this->randomMachineName();
@@ -261,98 +262,98 @@ class EntityFieldTest extends EntityKernelTestBase {
 
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         'name' => $name_item,
         'user_id' => $user_item,
         'field_test_text' => $text_item,
-      ));
-    $this->assertEqual($this->entityName, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityFieldText, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
+      ]);
+    $this->assertEqual($this->entityName, $entity->name->value, format_string('%entity_type: Name value can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($this->entityFieldText, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', ['%entity_type' => $entity_type]));
 
     // Tests copying field values by assigning the TypedData objects.
     $entity2 = $this->createTestEntity($entity_type);
     $entity2->name = $entity->name;
     $entity2->user_id = $entity->user_id;
     $entity2->field_test_text = $entity->field_test_text;
-    $this->assertFalse($entity->name === $entity2->name, format_string('%entity_type: Copying properties results in a different field object.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name->value, $entity2->name->value, format_string('%entity_type: Name field copied.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->user_id->target_id, $entity2->user_id->target_id, format_string('%entity_type: User id field copied.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->field_test_text->value, $entity2->field_test_text->value, format_string('%entity_type: Text field copied.', array('%entity_type' => $entity_type)));
+    $this->assertFalse($entity->name === $entity2->name, format_string('%entity_type: Copying properties results in a different field object.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($entity->name->value, $entity2->name->value, format_string('%entity_type: Name field copied.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($entity->user_id->target_id, $entity2->user_id->target_id, format_string('%entity_type: User id field copied.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($entity->field_test_text->value, $entity2->field_test_text->value, format_string('%entity_type: Text field copied.', ['%entity_type' => $entity_type]));
 
     // Tests that assigning TypedData objects to non-field properties keeps the
     // assigned value as is.
     $entity2 = $this->createTestEntity($entity_type);
     $entity2->_not_a_field = $entity->name;
-    $this->assertTrue($entity2->_not_a_field === $entity->name, format_string('%entity_type: Typed data objects can be copied to non-field properties as is.', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity2->_not_a_field === $entity->name, format_string('%entity_type: Typed data objects can be copied to non-field properties as is.', ['%entity_type' => $entity_type]));
 
     // Tests adding a value to a field item list.
     $entity->name[] = 'Another name';
-    $this->assertEqual($entity->name[1]->value, 'Another name', format_string('%entity_type: List item added via [] and the first property.', array('%entity_type' => $entity_type)));
-    $entity->name[] = array('value' => 'Third name');
-    $this->assertEqual($entity->name[2]->value, 'Third name', format_string('%entity_type: List item added via [] and an array of properties.', array('%entity_type' => $entity_type)));
-    $entity->name[3] = array('value' => 'Fourth name');
-    $this->assertEqual($entity->name[3]->value, 'Fourth name', format_string('%entity_type: List item added via offset and an array of properties.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->name[1]->value, 'Another name', format_string('%entity_type: List item added via [] and the first property.', ['%entity_type' => $entity_type]));
+    $entity->name[] = ['value' => 'Third name'];
+    $this->assertEqual($entity->name[2]->value, 'Third name', format_string('%entity_type: List item added via [] and an array of properties.', ['%entity_type' => $entity_type]));
+    $entity->name[3] = ['value' => 'Fourth name'];
+    $this->assertEqual($entity->name[3]->value, 'Fourth name', format_string('%entity_type: List item added via offset and an array of properties.', ['%entity_type' => $entity_type]));
     unset($entity->name[3]);
 
     // Test removing and empty-ing list items.
-    $this->assertEqual(count($entity->name), 3, format_string('%entity_type: List has 3 items.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entity->name), 3, format_string('%entity_type: List has 3 items.', ['%entity_type' => $entity_type]));
     unset($entity->name[1]);
-    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Second list item has been removed.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name[1]->value, 'Third name', format_string('%entity_type: The subsequent items have been shifted up.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name[1]->getName(), 1, format_string('%entity_type: The items names have been updated to their new delta.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Second list item has been removed.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($entity->name[1]->value, 'Third name', format_string('%entity_type: The subsequent items have been shifted up.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($entity->name[1]->getName(), 1, format_string('%entity_type: The items names have been updated to their new delta.', ['%entity_type' => $entity_type]));
     $entity->name[1] = NULL;
-    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Assigning NULL does not reduce array count.', array('%entity_type' => $entity_type)));
-    $this->assertTrue($entity->name[1]->isEmpty(), format_string('%entity_type: Assigning NULL empties the item.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Assigning NULL does not reduce array count.', ['%entity_type' => $entity_type]));
+    $this->assertTrue($entity->name[1]->isEmpty(), format_string('%entity_type: Assigning NULL empties the item.', ['%entity_type' => $entity_type]));
 
     // Test using isEmpty().
     unset($entity->name[1]);
-    $this->assertFalse($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is not empty.', array('%entity_type' => $entity_type)));
+    $this->assertFalse($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is not empty.', ['%entity_type' => $entity_type]));
     $entity->name->value = NULL;
-    $this->assertTrue($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is empty.', array('%entity_type' => $entity_type)));
-    $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is empty.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(count($entity->name), 1, format_string('%entity_type: Empty item is considered when counting.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(count(iterator_to_array($entity->name->getIterator())), count($entity->name), format_string('%entity_type: Count matches iterator count.', array('%entity_type' => $entity_type)));
-    $this->assertTrue($entity->name->getValue() === array(0 => array('value' => NULL)), format_string('%entity_type: Name field value contains a NULL value.', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is empty.', ['%entity_type' => $entity_type]));
+    $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is empty.', ['%entity_type' => $entity_type]));
+    $this->assertEqual(count($entity->name), 1, format_string('%entity_type: Empty item is considered when counting.', ['%entity_type' => $entity_type]));
+    $this->assertEqual(count(iterator_to_array($entity->name->getIterator())), count($entity->name), format_string('%entity_type: Count matches iterator count.', ['%entity_type' => $entity_type]));
+    $this->assertTrue($entity->name->getValue() === [0 => ['value' => NULL]], format_string('%entity_type: Name field value contains a NULL value.', ['%entity_type' => $entity_type]));
 
     // Test using filterEmptyItems().
-    $entity->name = array(NULL, 'foo');
-    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: List has 2 items.', array('%entity_type' => $entity_type)));
+    $entity->name = [NULL, 'foo'];
+    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: List has 2 items.', ['%entity_type' => $entity_type]));
     $entity->name->filterEmptyItems();
-    $this->assertEqual(count($entity->name), 1, format_string('%entity_type: The empty item was removed.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name[0]->value, 'foo', format_string('%entity_type: The items were renumbered.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name[0]->getName(), 0, format_string('%entity_type: The deltas were updated in the items.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entity->name), 1, format_string('%entity_type: The empty item was removed.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($entity->name[0]->value, 'foo', format_string('%entity_type: The items were renumbered.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($entity->name[0]->getName(), 0, format_string('%entity_type: The deltas were updated in the items.', ['%entity_type' => $entity_type]));
 
     // Test get and set field values.
     $entity->name = 'foo';
-    $this->assertEqual($entity->name[0]->toArray(), array('value' => 'foo'), format_string('%entity_type: Field value has been retrieved via toArray()', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->name[0]->toArray(), ['value' => 'foo'], format_string('%entity_type: Field value has been retrieved via toArray()', ['%entity_type' => $entity_type]));
 
     $values = $entity->toArray();
-    $this->assertEqual($values['name'], array(0 => array('value' => 'foo')), format_string('%entity_type: Field value has been retrieved via toArray() from an entity.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($values['name'], [0 => ['value' => 'foo']], format_string('%entity_type: Field value has been retrieved via toArray() from an entity.', ['%entity_type' => $entity_type]));
 
     // Make sure the user id can be set to zero.
     $user_item[0]['target_id'] = 0;
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         'name' => $name_item,
         'user_id' => $user_item,
         'field_test_text' => $text_item,
-      ));
-    $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', array('%entity_type' => $entity_type)));
-    $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type)));
+      ]);
+    $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', ['%entity_type' => $entity_type]));
+    $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', ['%entity_type' => $entity_type]));
 
     // Test setting the ID with the value only.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         'name' => $name_item,
         'user_id' => 0,
         'field_test_text' => $text_item,
-      ));
-    $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', array('%entity_type' => $entity_type)));
-    $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type)));
+      ]);
+    $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', ['%entity_type' => $entity_type]));
+    $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', ['%entity_type' => $entity_type]));
   }
 
   /**
@@ -375,21 +376,21 @@ class EntityFieldTest extends EntityKernelTestBase {
     $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
     $entity = $this->createTestEntity($entity_type);
     $entity->save();
-    $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity has received an id.', array('%entity_type' => $entity_type)));
+    $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity has received an id.', ['%entity_type' => $entity_type]));
 
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
       ->load($entity->id());
-    $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity loaded.', array('%entity_type' => $entity_type)));
+    $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity loaded.', ['%entity_type' => $entity_type]));
 
     // Access the name field.
-    $this->assertEqual(1, $entity->id->value, format_string('%entity_type: ID value can be read.', array('%entity_type' => $entity_type)));
-    $this->assertTrue(is_string($entity->uuid->value), format_string('%entity_type: UUID value can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual('en', $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(\Drupal::languageManager()->getLanguage('en'), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityFieldText, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(1, $entity->id->value, format_string('%entity_type: ID value can be read.', ['%entity_type' => $entity_type]));
+    $this->assertTrue(is_string($entity->uuid->value), format_string('%entity_type: UUID value can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual('en', $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual(\Drupal::languageManager()->getLanguage('en'), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($this->entityFieldText, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', ['%entity_type' => $entity_type]));
   }
 
   /**
@@ -531,8 +532,8 @@ class EntityFieldTest extends EntityKernelTestBase {
     }
 
     $fields = $entity->getFields();
-    $this->assertEqual(array_keys($fields), array_keys($entity->getTypedData()->getDataDefinition()->getPropertyDefinitions()), format_string('%entity_type: All fields returned.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($fields, iterator_to_array($entity->getIterator()), format_string('%entity_type: Entity iterator iterates over all fields.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(array_keys($fields), array_keys($entity->getTypedData()->getDataDefinition()->getPropertyDefinitions()), format_string('%entity_type: All fields returned.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($fields, iterator_to_array($entity->getIterator()), format_string('%entity_type: Entity iterator iterates over all fields.', ['%entity_type' => $entity_type]));
   }
 
   /**
@@ -557,12 +558,12 @@ class EntityFieldTest extends EntityKernelTestBase {
     // Test using the whole tree of typed data by navigating through the tree of
     // contained properties and getting all contained strings, limited by a
     // certain depth.
-    $strings = array();
+    $strings = [];
     $this->getContainedStrings($entity->getTypedData(), 0, $strings);
 
     // @todo: Once the user entity has defined properties this should contain
     // the user name and other user entity strings as well.
-    $target_strings = array(
+    $target_strings = [
       $entity->uuid->value,
       'en',
       $this->entityName,
@@ -571,10 +572,16 @@ class EntityFieldTest extends EntityKernelTestBase {
       $this->entityFieldText,
       // Field format.
       NULL,
-    );
+    ];
+
+    if ($entity instanceof RevisionLogInterface) {
+      // Adding empty string for revision message.
+      $target_strings[] = '';
+    }
+
     asort($strings);
     asort($target_strings);
-    $this->assertEqual(array_values($strings), array_values($target_strings), format_string('%entity_type: All contained strings found.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(array_values($strings), array_values($target_strings), format_string('%entity_type: All contained strings found.', ['%entity_type' => $entity_type]));
   }
 
   /**
@@ -622,10 +629,10 @@ class EntityFieldTest extends EntityKernelTestBase {
    * @see entity_test_entity_base_field_info_alter()
    */
   public function testBaseFieldNonExistingBaseField() {
-    $this->entityManager->getStorage('node_type')->create(array(
+    $this->entityManager->getStorage('node_type')->create([
       'type' => 'page',
       'name' => 'page',
-    ))->save();
+    ])->save();
     $this->entityManager->clearCachedFieldDefinitions();
     $fields = $this->entityManager->getFieldDefinitions('node', 'page');
     $override = $fields['status']->getConfig('page');
@@ -679,7 +686,7 @@ class EntityFieldTest extends EntityKernelTestBase {
       ->setLabel('Test entity')
       ->setSetting('target_type', 'entity_test');
     $reference_field = \Drupal::typedDataManager()->create($definition);
-    $reference = $reference_field->appendItem(array('entity' => $entity))->get('entity');
+    $reference = $reference_field->appendItem(['entity' => $entity])->get('entity');
 
     // Test validation the typed data object.
     $violations = $reference->validate();
@@ -698,14 +705,14 @@ class EntityFieldTest extends EntityKernelTestBase {
     $this->assertEqual($violations->count(), 1);
 
     // Test bundle validation.
-    NodeType::create(array('type' => 'article'))
+    NodeType::create(['type' => 'article'])
       ->save();
     $definition = BaseFieldDefinition::create('entity_reference')
       ->setLabel('Test entity')
       ->setSetting('target_type', 'node')
       ->setSetting('handler_settings', ['target_bundles' => ['article' => 'article']]);
     $reference_field = \Drupal::TypedDataManager()->create($definition);
-    $reference_field->appendItem(array('entity' => $node));
+    $reference_field->appendItem(['entity' => $node]);
     $violations = $reference_field->validate();
     $this->assertEqual($violations->count(), 1);
 
@@ -742,14 +749,14 @@ class EntityFieldTest extends EntityKernelTestBase {
     $entity->field_test_text->format = filter_default_format();
 
     $target = "<p>The &lt;strong&gt;text&lt;/strong&gt; text to filter.</p>\n";
-    $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', ['%entity_type' => $entity_type]));
 
     // Save and load entity and make sure it still works.
     $entity->save();
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
       ->load($entity->id());
-    $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', ['%entity_type' => $entity_type]));
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
index 4b08a56f8..f7108d53b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
@@ -31,7 +31,7 @@ abstract class EntityKernelTestBase extends KernelTestBase {
    *
    * @var array
    */
-  protected $generatedIds = array();
+  protected $generatedIds = [];
 
   /**
    * The state service.
@@ -62,7 +62,7 @@ abstract class EntityKernelTestBase extends KernelTestBase {
         // Only check the modules, if the $modules property was not inherited.
         $rp = new \ReflectionProperty($class, 'modules');
         if ($rp->class == $class) {
-          foreach (array_intersect(array('node', 'comment'), $class::$modules) as $module) {
+          foreach (array_intersect(['node', 'comment'], $class::$modules) as $module) {
             $this->installEntitySchema($module);
           }
           if (in_array('forum', $class::$modules, TRUE)) {
@@ -79,7 +79,7 @@ abstract class EntityKernelTestBase extends KernelTestBase {
       $class = get_parent_class($class);
     }
 
-    $this->installConfig(array('field'));
+    $this->installConfig(['field']);
   }
 
   /**
@@ -93,22 +93,22 @@ abstract class EntityKernelTestBase extends KernelTestBase {
    * @return \Drupal\user\Entity\User
    *   The created user entity.
    */
-  protected function createUser($values = array(), $permissions = array()) {
+  protected function createUser($values = [], $permissions = []) {
     if ($permissions) {
       // Create a new role and apply permissions to it.
-      $role = Role::create(array(
+      $role = Role::create([
         'id' => strtolower($this->randomMachineName(8)),
         'label' => $this->randomMachineName(8),
-      ));
+      ]);
       $role->save();
       user_role_grant_permissions($role->id(), $permissions);
       $values['roles'][] = $role->id();
     }
 
-    $account = User::create($values + array(
+    $account = User::create($values + [
       'name' => $this->randomMachineName(),
       'status' => 1,
-    ));
+    ]);
     $account->enforceIsNew();
     $account->save();
     return $account;
@@ -125,7 +125,7 @@ abstract class EntityKernelTestBase extends KernelTestBase {
    */
   protected function reloadEntity(EntityInterface $entity) {
     $controller = $this->entityManager->getStorage($entity->getEntityTypeId());
-    $controller->resetCache(array($entity->id()));
+    $controller->resetCache([$entity->id()]);
     return $controller->load($entity->id());
   }
 
@@ -138,7 +138,7 @@ abstract class EntityKernelTestBase extends KernelTestBase {
   protected function getHooksInfo() {
     $key = 'entity_test.hooks';
     $hooks = $this->state->get($key);
-    $this->state->set($key, array());
+    $this->state->set($key, []);
     return $hooks;
   }
 
@@ -149,7 +149,7 @@ abstract class EntityKernelTestBase extends KernelTestBase {
    *   The module to install.
    */
   protected function installModule($module) {
-    $this->enableModules(array($module));
+    $this->enableModules([$module]);
     $this->refreshServices();
   }
 
@@ -160,7 +160,7 @@ abstract class EntityKernelTestBase extends KernelTestBase {
    *   The module to uninstall.
    */
   protected function uninstallModule($module) {
-    $this->disableModules(array($module));
+    $this->disableModules([$module]);
     $this->refreshServices();
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php
index 59510bac2..570aa9844 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php
@@ -40,7 +40,7 @@ abstract class EntityLanguageTestBase extends EntityKernelTestBase {
    */
   protected $untranslatableFieldName;
 
-  public static $modules = array('language', 'entity_test');
+  public static $modules = ['language', 'entity_test'];
 
   protected function setUp() {
     parent::setUp();
@@ -54,7 +54,7 @@ abstract class EntityLanguageTestBase extends EntityKernelTestBase {
       }
     }
 
-    $this->installConfig(array('language'));
+    $this->installConfig(['language']);
 
     // Create the test field.
     module_load_install('entity_test');
@@ -71,12 +71,12 @@ abstract class EntityLanguageTestBase extends EntityKernelTestBase {
 
     // Create field fields in all entity variations.
     foreach (entity_test_entity_types() as $entity_type) {
-      FieldStorageConfig::create(array(
+      FieldStorageConfig::create([
         'field_name' => $this->fieldName,
         'entity_type' => $entity_type,
         'type' => 'text',
         'cardinality' => 4,
-      ))->save();
+      ])->save();
       FieldConfig::create([
         'field_name' => $this->fieldName,
         'entity_type' => $entity_type,
@@ -84,12 +84,12 @@ abstract class EntityLanguageTestBase extends EntityKernelTestBase {
         'translatable' => TRUE,
       ])->save();
 
-      FieldStorageConfig::create(array(
+      FieldStorageConfig::create([
         'field_name' => $this->untranslatableFieldName,
         'entity_type' => $entity_type,
         'type' => 'text',
         'cardinality' => 4,
-      ))->save();
+      ])->save();
       FieldConfig::create([
         'field_name' => $this->untranslatableFieldName,
         'entity_type' => $entity_type,
@@ -99,16 +99,16 @@ abstract class EntityLanguageTestBase extends EntityKernelTestBase {
     }
 
     // Create the default languages.
-    $this->installConfig(array('language'));
+    $this->installConfig(['language']);
 
     // Create test languages.
-    $this->langcodes = array();
+    $this->langcodes = [];
     for ($i = 0; $i < 3; ++$i) {
-      $language = ConfigurableLanguage::create(array(
+      $language = ConfigurableLanguage::create([
         'id' => 'l' . $i,
         'label' => $this->randomString(),
         'weight' => $i,
-      ));
+      ]);
       $this->langcodes[$i] = $language->getId();
       $language->save();
     }
@@ -121,7 +121,7 @@ abstract class EntityLanguageTestBase extends EntityKernelTestBase {
    *   The type of the entity fields are attached to.
    */
   protected function toggleFieldTranslatability($entity_type, $bundle) {
-    $fields = array($this->fieldName, $this->untranslatableFieldName);
+    $fields = [$this->fieldName, $this->untranslatableFieldName];
     foreach ($fields as $field_name) {
       $field = FieldConfig::loadByName($entity_type, $bundle, $field_name);
       $translatable = !$field->isTranslatable();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLoadedRevisionTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLoadedRevisionTest.php
new file mode 100644
index 000000000..a3b99fe0c
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLoadedRevisionTest.php
@@ -0,0 +1,170 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\entity_test\Entity\EntityTestMulRev;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests the loaded Revision of an entity.
+ *
+ * @group entity
+ */
+class EntityLoadedRevisionTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'system',
+    'entity_test',
+    'language',
+    'content_translation',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_mulrev');
+  }
+
+  /**
+   * Test getLoadedRevisionId() returns the correct ID throughout the process.
+   */
+  public function testLoadedRevisionId() {
+    // Create a basic EntityTestMulRev entity and save it.
+    $entity = EntityTestMulRev::create();
+    $entity->save();
+
+    // Load the created entity and create a new revision.
+    $loaded = EntityTestMulRev::load($entity->id());
+    $loaded->setNewRevision(TRUE);
+
+    // Before saving, the loaded Revision ID should be the same as the created
+    // entity, not the same as the loaded entity (which does not have a revision
+    // ID yet).
+    $this->assertEquals($entity->getRevisionId(), $loaded->getLoadedRevisionId());
+    $this->assertNotEquals($loaded->getRevisionId(), $loaded->getLoadedRevisionId());
+    $this->assertSame(NULL, $loaded->getRevisionId());
+
+    // After updating the loaded Revision ID the result should be the same.
+    $loaded->updateLoadedRevisionId();
+    $this->assertEquals($entity->getRevisionId(), $loaded->getLoadedRevisionId());
+    $this->assertNotEquals($loaded->getRevisionId(), $loaded->getLoadedRevisionId());
+    $this->assertSame(NULL, $loaded->getRevisionId());
+
+    $loaded->save();
+
+    // In entity_test_entity_update() the loaded Revision ID was stored in
+    // state. This should be the same as we had before calling $loaded->save().
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $loaded_original */
+    $loadedRevisionId = \Drupal::state()->get('entity_test.loadedRevisionId');
+    $this->assertEquals($entity->getRevisionId(), $loadedRevisionId);
+    $this->assertNotEquals($loaded->getRevisionId(), $loadedRevisionId);
+
+    // The revision ID and loaded Revision ID should be different for the two
+    // versions of the entity, but the same for a saved entity.
+    $this->assertNotEquals($loaded->getRevisionId(), $entity->getRevisionId());
+    $this->assertNotEquals($loaded->getLoadedRevisionId(), $entity->getLoadedRevisionId());
+    $this->assertEquals($entity->getRevisionId(), $entity->getLoadedRevisionId());
+    $this->assertEquals($loaded->getRevisionId(), $loaded->getLoadedRevisionId());
+  }
+
+  /**
+   * Tests the loaded revision ID after an entity re-save, clone and duplicate.
+   */
+  public function testLoadedRevisionIdWithNoNewRevision() {
+    // Create a basic EntityTestMulRev entity and save it.
+    $entity = EntityTestMulRev::create();
+    $entity->save();
+
+    // Load the created entity and create a new revision.
+    $loaded = EntityTestMulRev::load($entity->id());
+    $loaded->setNewRevision(TRUE);
+    $loaded->save();
+
+    // Make a change to the loaded entity.
+    $loaded->set('name', 'dublin');
+
+    // The revision id and loaded Revision id should still be the same.
+    $this->assertEquals($loaded->getRevisionId(), $loaded->getLoadedRevisionId());
+
+    $loaded->save();
+
+    // After saving, the loaded Revision id set in entity_test_entity_update()
+    // and returned from the entity should be the same as the entity's revision
+    // id because a new revision wasn't created, the existing revision was
+    // updated.
+    $loadedRevisionId = \Drupal::state()->get('entity_test.loadedRevisionId');
+    $this->assertEquals($loaded->getRevisionId(), $loadedRevisionId);
+    $this->assertEquals($loaded->getRevisionId(), $loaded->getLoadedRevisionId());
+
+    // Creating a clone should keep the loaded Revision ID.
+    $clone = clone $loaded;
+    $this->assertSame($loaded->getLoadedRevisionId(), $clone->getLoadedRevisionId());
+
+    // Creating a duplicate should set a NULL loaded Revision ID.
+    $duplicate = $loaded->createDuplicate();
+    $this->assertSame(NULL, $duplicate->getLoadedRevisionId());
+  }
+
+  /**
+   * Tests the loaded revision ID for translatable entities.
+   */
+  public function testTranslatedLoadedRevisionId() {
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+
+    // Create a basic EntityTestMulRev entity and save it.
+    $entity = EntityTestMulRev::create();
+    $entity->save();
+
+    // Load the created entity and create a new revision.
+    $loaded = EntityTestMulRev::load($entity->id());
+    $loaded->setNewRevision(TRUE);
+    $loaded->save();
+
+    // Check it all works with translations.
+    $french = $loaded->addTranslation('fr');
+    // Adding a revision should return the same for each language.
+    $this->assertEquals($french->getRevisionId(), $french->getLoadedRevisionId());
+    $this->assertEquals($loaded->getRevisionId(), $french->getLoadedRevisionId());
+    $this->assertEquals($loaded->getLoadedRevisionId(), $french->getLoadedRevisionId());
+    $french->save();
+    // After saving nothing should change.
+    $this->assertEquals($french->getRevisionId(), $french->getLoadedRevisionId());
+    $this->assertEquals($loaded->getRevisionId(), $french->getLoadedRevisionId());
+    $this->assertEquals($loaded->getLoadedRevisionId(), $french->getLoadedRevisionId());
+    $first_revision_id = $french->getRevisionId();
+    $french->setNewRevision();
+    // Setting a new revision will reset the loaded Revision ID.
+    $this->assertEquals($first_revision_id, $french->getLoadedRevisionId());
+    $this->assertEquals($first_revision_id, $loaded->getLoadedRevisionId());
+    $this->assertNotEquals($french->getRevisionId(), $french->getLoadedRevisionId());
+    $this->assertGreaterThan($french->getRevisionId(), $french->getLoadedRevisionId());
+    $this->assertNotEquals($loaded->getRevisionId(), $loaded->getLoadedRevisionId());
+    $this->assertGreaterThan($loaded->getRevisionId(), $loaded->getLoadedRevisionId());
+    $french->save();
+    // Saving the new revision will reset the origin revision ID again.
+    $this->assertEquals($french->getRevisionId(), $french->getLoadedRevisionId());
+    $this->assertEquals($loaded->getRevisionId(), $loaded->getLoadedRevisionId());
+  }
+
+  /**
+   * Tests re-saving the entity in entity_test_entity_insert().
+   */
+  public function testSaveInHookEntityInsert() {
+    // Create an entity which will be saved again in entity_test_entity_insert().
+    $entity = EntityTestMulRev::create(['name' => 'EntityLoadedRevisionTest']);
+    $entity->save();
+    $loadedRevisionId = \Drupal::state()->get('entity_test.loadedRevisionId');
+    $this->assertEquals($entity->getLoadedRevisionId(), $loadedRevisionId);
+    $this->assertEquals($entity->getRevisionId(), $entity->getLoadedRevisionId());
+
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php
index da6ec6644..7e6d0093b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php
@@ -14,7 +14,7 @@ class EntityNonRevisionableTranslatableFieldTest extends EntityKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('entity_test', 'language', 'content_translation');
+  public static $modules = ['entity_test', 'language', 'content_translation'];
 
   protected function setUp() {
     parent::setUp();
@@ -28,7 +28,7 @@ class EntityNonRevisionableTranslatableFieldTest extends EntityKernelTestBase {
   /**
    * Tests translating a non-revisionable field.
    */
-  function testTranslatingNonRevisionableField() {
+  public function testTranslatingNonRevisionableField() {
     /** @var \Drupal\Core\Entity\ContentEntityBase $entity */
     $entity = EntityTestMulRev::create();
     $entity->set('non_rev_field', 'Hello');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
index 819445d15..b6362fbca 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
@@ -18,7 +18,7 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array();
+  public static $modules = [];
 
   /**
    * The entity_test storage to create the test entities.
@@ -50,12 +50,12 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
     // Add some fieldapi fields to be used in the test.
     for ($i = 1; $i <= 2; $i++) {
       $field_name = 'field_test_' . $i;
-      FieldStorageConfig::create(array(
+      FieldStorageConfig::create([
         'field_name' => $field_name,
         'entity_type' => 'entity_test',
         'type' => 'integer',
         'cardinality' => 2,
-      ))->save();
+      ])->save();
       FieldConfig::create([
         'field_name' => $field_name,
         'entity_type' => 'entity_test',
@@ -63,53 +63,53 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ])->save();
     }
 
-    $entity = $this->entityStorage->create(array(
+    $entity = $this->entityStorage->create([
       'id' => 1,
       'user_id' => 1,
       'field_test_1' => 1,
       'field_test_2' => 2,
-    ));
+    ]);
     $entity->enforceIsNew();
     $entity->save();
 
-    $entity = $this->entityStorage->create(array(
+    $entity = $this->entityStorage->create([
       'id' => 2,
       'user_id' => 2,
       'field_test_1' => 1,
       'field_test_2' => 7,
-    ));
+    ]);
     $entity->enforceIsNew();
     $entity->save();
-    $entity = $this->entityStorage->create(array(
+    $entity = $this->entityStorage->create([
       'id' => 3,
       'user_id' => 2,
       'field_test_1' => 2,
       'field_test_2' => 1,
-    ));
+    ]);
     $entity->enforceIsNew();
     $entity->save();
-    $entity = $this->entityStorage->create(array(
+    $entity = $this->entityStorage->create([
       'id' => 4,
       'user_id' => 2,
       'field_test_1' => 2,
       'field_test_2' => 8,
-    ));
+    ]);
     $entity->enforceIsNew();
     $entity->save();
-    $entity = $this->entityStorage->create(array(
+    $entity = $this->entityStorage->create([
       'id' => 5,
       'user_id' => 3,
       'field_test_1' => 2,
       'field_test_2' => 2,
-    ));
+    ]);
     $entity->enforceIsNew();
     $entity->save();
-    $entity = $this->entityStorage->create(array(
+    $entity = $this->entityStorage->create([
       'id' => 6,
       'user_id' => 3,
       'field_test_1' => 3,
       'field_test_2' => 8,
-    ));
+    ]);
     $entity->enforceIsNew();
     $entity->save();
 
@@ -124,18 +124,18 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->groupBy('user_id')
       ->execute();
 
-    $this->assertResults(array(
-      array('user_id' => 1),
-      array('user_id' => 2),
-      array('user_id' => 3),
-    ));
+    $this->assertResults([
+      ['user_id' => 1],
+      ['user_id' => 2],
+      ['user_id' => 3],
+    ]);
 
-    $function_expected = array();
-    $function_expected['count'] = array(array('id_count' => 6));
-    $function_expected['min'] = array(array('id_min' => 1));
-    $function_expected['max'] = array(array('id_max' => 6));
-    $function_expected['sum'] = array(array('id_sum' => 21));
-    $function_expected['avg'] = array(array('id_avg' => (21.0 / 6.0)));
+    $function_expected = [];
+    $function_expected['count'] = [['id_count' => 6]];
+    $function_expected['min'] = [['id_min' => 1]];
+    $function_expected['max'] = [['id_max' => 6]];
+    $function_expected['sum'] = [['id_sum' => 21]];
+    $function_expected['avg'] = [['id_avg' => (21.0 / 6.0)]];
 
     // Apply a simple aggregation for different aggregation functions.
     foreach ($function_expected as $aggregation_function => $expected) {
@@ -150,11 +150,11 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->aggregate('id', 'COUNT')
       ->groupBy('user_id')
       ->execute();
-    $this->assertResults(array(
-      array('user_id' => 1, 'id_count' => 1),
-      array('user_id' => 2, 'id_count' => 3),
-      array('user_id' => 3, 'id_count' => 2),
-    ));
+    $this->assertResults([
+      ['user_id' => 1, 'id_count' => 1],
+      ['user_id' => 2, 'id_count' => 3],
+      ['user_id' => 3, 'id_count' => 2],
+    ]);
 
     // Apply aggregation and a condition which matches.
     $this->queryResult = $this->factory->getAggregate('entity_test')
@@ -162,14 +162,14 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->groupBy('id')
       ->conditionAggregate('id', 'COUNT', 8)
       ->execute();
-    $this->assertResults(array());
+    $this->assertResults([]);
 
     // Don't call aggregate to test the implicit aggregate call.
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->groupBy('id')
       ->conditionAggregate('id', 'COUNT', 8)
       ->execute();
-    $this->assertResults(array());
+    $this->assertResults([]);
 
     // Apply aggregation and a condition which matches.
     $this->queryResult = $this->factory->getAggregate('entity_test')
@@ -177,7 +177,7 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->groupBy('id')
       ->conditionAggregate('id', 'COUNT', 6)
       ->execute();
-    $this->assertResults(array(array('id_count' => 6)));
+    $this->assertResults([['id_count' => 6]]);
 
     // Apply aggregation, a groupby and a condition which matches partially via
     // the operator '='.
@@ -186,7 +186,7 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->conditionAggregate('id', 'count', 2)
       ->groupBy('user_id')
       ->execute();
-    $this->assertResults(array(array('id_count' => 2, 'user_id' => 3)));
+    $this->assertResults([['id_count' => 2, 'user_id' => 3]]);
 
     // Apply aggregation, a groupby and a condition which matches partially via
     // the operator '>'.
@@ -195,10 +195,10 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->conditionAggregate('id', 'COUNT', 1, '>')
       ->groupBy('user_id')
       ->execute();
-    $this->assertResults(array(
-      array('id_count' => 2, 'user_id' => 3),
-      array('id_count' => 3, 'user_id' => 2),
-    ));
+    $this->assertResults([
+      ['id_count' => 2, 'user_id' => 3],
+      ['id_count' => 3, 'user_id' => 2],
+    ]);
 
     // Apply aggregation and a sort. This might not be useful, but have a proper
     // test coverage.
@@ -206,13 +206,13 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->aggregate('id', 'COUNT')
       ->sortAggregate('id', 'COUNT')
       ->execute();
-    $this->assertSortedResults(array(array('id_count' => 6)));
+    $this->assertSortedResults([['id_count' => 6]]);
 
     // Don't call aggregate to test the implicit aggregate call.
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->sortAggregate('id', 'COUNT')
       ->execute();
-    $this->assertSortedResults(array(array('id_count' => 6)));
+    $this->assertSortedResults([['id_count' => 6]]);
 
     // Apply aggregation, groupby and a sort descending.
     $this->queryResult = $this->factory->getAggregate('entity_test')
@@ -220,11 +220,11 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->groupBy('user_id')
       ->sortAggregate('id', 'COUNT', 'DESC')
       ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 2, 'id_count' => 3),
-      array('user_id' => 3, 'id_count' => 2),
-      array('user_id' => 1, 'id_count' => 1),
-    ));
+    $this->assertSortedResults([
+      ['user_id' => 2, 'id_count' => 3],
+      ['user_id' => 3, 'id_count' => 2],
+      ['user_id' => 1, 'id_count' => 1],
+    ]);
 
     // Apply aggregation, groupby and a sort ascending.
     $this->queryResult = $this->factory->getAggregate('entity_test')
@@ -232,11 +232,11 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->groupBy('user_id')
       ->sortAggregate('id', 'COUNT', 'ASC')
       ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 1, 'id_count' => 1),
-      array('user_id' => 3, 'id_count' => 2),
-      array('user_id' => 2, 'id_count' => 3),
-    ));
+    $this->assertSortedResults([
+      ['user_id' => 1, 'id_count' => 1],
+      ['user_id' => 3, 'id_count' => 2],
+      ['user_id' => 2, 'id_count' => 3],
+    ]);
 
     // Apply aggregation, groupby, an aggregation condition and a sort with the
     // operator '='.
@@ -246,7 +246,7 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->sortAggregate('id', 'COUNT')
       ->conditionAggregate('id', 'COUNT', 2)
       ->execute();
-    $this->assertSortedResults(array(array('id_count' => 2, 'user_id' => 3)));
+    $this->assertSortedResults([['id_count' => 2, 'user_id' => 3]]);
 
     // Apply aggregation, groupby, an aggregation condition and a sort with the
     // operator '<' and order ASC.
@@ -256,10 +256,10 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->sortAggregate('id', 'COUNT', 'ASC')
       ->conditionAggregate('id', 'COUNT', 3, '<')
       ->execute();
-    $this->assertSortedResults(array(
-      array('id_count' => 1, 'user_id' => 1),
-      array('id_count' => 2, 'user_id' => 3),
-    ));
+    $this->assertSortedResults([
+      ['id_count' => 1, 'user_id' => 1],
+      ['id_count' => 2, 'user_id' => 3],
+    ]);
 
     // Apply aggregation, groupby, an aggregation condition and a sort with the
     // operator '<' and order DESC.
@@ -269,10 +269,10 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->sortAggregate('id', 'COUNT', 'DESC')
       ->conditionAggregate('id', 'COUNT', 3, '<')
       ->execute();
-    $this->assertSortedResults(array(
-      array('id_count' => 2, 'user_id' => 3),
-      array('id_count' => 1, 'user_id' => 1),
-    ));
+    $this->assertSortedResults([
+      ['id_count' => 2, 'user_id' => 3],
+      ['id_count' => 1, 'user_id' => 1],
+    ]);
 
     // Test aggregation/groupby support for fieldapi fields.
 
@@ -280,11 +280,11 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->groupBy('field_test_1')
       ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1),
-      array('field_test_1' => 2),
-      array('field_test_1' => 3),
-    ));
+    $this->assertResults([
+      ['field_test_1' => 1],
+      ['field_test_1' => 2],
+      ['field_test_1' => 3],
+    ]);
 
     // Group by a fieldapi field and aggregate a normal property.
     $this->queryResult = $this->factory->getAggregate('entity_test')
@@ -292,11 +292,11 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->groupBy('field_test_1')
       ->execute();
 
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'user_id_count' => 2),
-      array('field_test_1' => 2, 'user_id_count' => 3),
-      array('field_test_1' => 3, 'user_id_count' => 1),
-    ));
+    $this->assertResults([
+      ['field_test_1' => 1, 'user_id_count' => 2],
+      ['field_test_1' => 2, 'user_id_count' => 3],
+      ['field_test_1' => 3, 'user_id_count' => 1],
+    ]);
 
     // Group by a normal property and aggregate a fieldapi field.
     $this->queryResult = $this->factory->getAggregate('entity_test')
@@ -304,21 +304,21 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->groupBy('user_id')
       ->execute();
 
-    $this->assertResults(array(
-      array('user_id' => 1, 'field_test_1_count' => 1),
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-    ));
+    $this->assertResults([
+      ['user_id' => 1, 'field_test_1_count' => 1],
+      ['user_id' => 2, 'field_test_1_count' => 3],
+      ['user_id' => 3, 'field_test_1_count' => 2],
+    ]);
 
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->aggregate('field_test_1', 'SUM')
       ->groupBy('user_id')
       ->execute();
-    $this->assertResults(array(
-      array('user_id' => 1, 'field_test_1_sum' => 1),
-      array('user_id' => 2, 'field_test_1_sum' => 5),
-      array('user_id' => 3, 'field_test_1_sum' => 5),
-    ));
+    $this->assertResults([
+      ['user_id' => 1, 'field_test_1_sum' => 1],
+      ['user_id' => 2, 'field_test_1_sum' => 5],
+      ['user_id' => 3, 'field_test_1_sum' => 5],
+    ]);
 
     // Aggregate by two different fieldapi fields.
     $this->queryResult = $this->factory->getAggregate('entity_test')
@@ -326,11 +326,11 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->aggregate('field_test_2', 'SUM')
       ->groupBy('user_id')
       ->execute();
-    $this->assertResults(array(
-      array('user_id' => 1, 'field_test_1_sum' => 1, 'field_test_2_sum' => 2),
-      array('user_id' => 2, 'field_test_1_sum' => 5, 'field_test_2_sum' => 16),
-      array('user_id' => 3, 'field_test_1_sum' => 5, 'field_test_2_sum' => 10),
-    ));
+    $this->assertResults([
+      ['user_id' => 1, 'field_test_1_sum' => 1, 'field_test_2_sum' => 2],
+      ['user_id' => 2, 'field_test_1_sum' => 5, 'field_test_2_sum' => 16],
+      ['user_id' => 3, 'field_test_1_sum' => 5, 'field_test_2_sum' => 10],
+    ]);
 
     // This time aggregate the same field twice.
     $this->queryResult = $this->factory->getAggregate('entity_test')
@@ -338,22 +338,22 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->aggregate('field_test_1', 'COUNT')
       ->groupBy('user_id')
       ->execute();
-    $this->assertResults(array(
-      array('user_id' => 1, 'field_test_1_sum' => 1, 'field_test_1_count' => 1),
-      array('user_id' => 2, 'field_test_1_sum' => 5, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_sum' => 5, 'field_test_1_count' => 2),
-    ));
+    $this->assertResults([
+      ['user_id' => 1, 'field_test_1_sum' => 1, 'field_test_1_count' => 1],
+      ['user_id' => 2, 'field_test_1_sum' => 5, 'field_test_1_count' => 3],
+      ['user_id' => 3, 'field_test_1_sum' => 5, 'field_test_1_count' => 2],
+    ]);
 
     // Group by and aggregate by a fieldapi field.
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->groupBy('field_test_1')
       ->aggregate('field_test_2', 'COUNT')
       ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-      array('field_test_1' => 3, 'field_test_2_count' => 1),
-    ));
+    $this->assertResults([
+      ['field_test_1' => 1, 'field_test_2_count' => 2],
+      ['field_test_1' => 2, 'field_test_2_count' => 3],
+      ['field_test_1' => 3, 'field_test_2_count' => 1],
+    ]);
 
     // Group by and aggregate by a fieldapi field and use multiple aggregate
     // functions.
@@ -362,11 +362,11 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->aggregate('field_test_2', 'COUNT')
       ->aggregate('field_test_2', 'SUM')
       ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2, 'field_test_2_sum' => 9),
-      array('field_test_1' => 2, 'field_test_2_count' => 3, 'field_test_2_sum' => 11),
-      array('field_test_1' => 3, 'field_test_2_count' => 1, 'field_test_2_sum' => 8),
-    ));
+    $this->assertResults([
+      ['field_test_1' => 1, 'field_test_2_count' => 2, 'field_test_2_sum' => 9],
+      ['field_test_1' => 2, 'field_test_2_count' => 3, 'field_test_2_sum' => 11],
+      ['field_test_1' => 3, 'field_test_2_count' => 1, 'field_test_2_sum' => 8],
+    ]);
 
     // Apply an aggregate condition for a fieldapi field and group by a simple
     // property.
@@ -374,20 +374,20 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->conditionAggregate('field_test_1', 'COUNT', 3)
       ->groupBy('user_id')
       ->execute();
-    $this->assertResults(array(
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-    ));
+    $this->assertResults([
+      ['user_id' => 2, 'field_test_1_count' => 3],
+      ['user_id' => 3, 'field_test_1_count' => 2],
+    ]);
 
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->aggregate('field_test_1', 'SUM')
       ->conditionAggregate('field_test_1', 'COUNT', 2, '>')
       ->groupBy('user_id')
       ->execute();
-    $this->assertResults(array(
-      array('user_id' => 2, 'field_test_1_sum' => 5, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_sum' => 5, 'field_test_1_count' => 2),
-    ));
+    $this->assertResults([
+      ['user_id' => 2, 'field_test_1_sum' => 5, 'field_test_1_count' => 3],
+      ['user_id' => 3, 'field_test_1_sum' => 5, 'field_test_1_count' => 2],
+    ]);
 
     // Apply an aggregate condition for a simple property and a group by a
     // fieldapi field.
@@ -395,35 +395,35 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->conditionAggregate('user_id', 'COUNT', 2)
       ->groupBy('field_test_1')
       ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'user_id_count' => 2),
-    ));
+    $this->assertResults([
+      ['field_test_1' => 1, 'user_id_count' => 2],
+    ]);
 
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->conditionAggregate('user_id', 'COUNT', 2, '>')
       ->groupBy('field_test_1')
       ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'user_id_count' => 2),
-      array('field_test_1' => 2, 'user_id_count' => 3),
-    ));
+    $this->assertResults([
+      ['field_test_1' => 1, 'user_id_count' => 2],
+      ['field_test_1' => 2, 'user_id_count' => 3],
+    ]);
 
     // Apply an aggregate condition and a group by fieldapi fields.
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->groupBy('field_test_1')
       ->conditionAggregate('field_test_2', 'COUNT', 2)
       ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-    ));
+    $this->assertResults([
+      ['field_test_1' => 1, 'field_test_2_count' => 2],
+    ]);
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->groupBy('field_test_1')
       ->conditionAggregate('field_test_2', 'COUNT', 2, '>')
       ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-    ));
+    $this->assertResults([
+      ['field_test_1' => 1, 'field_test_2_count' => 2],
+      ['field_test_1' => 2, 'field_test_2_count' => 3],
+    ]);
 
     // Apply an aggregate condition and a group by fieldapi fields with multiple
     // conditions via AND.
@@ -432,7 +432,7 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->conditionAggregate('field_test_2', 'COUNT', 2)
       ->conditionAggregate('field_test_2', 'SUM', 8)
       ->execute();
-    $this->assertResults(array());
+    $this->assertResults([]);
 
     // Apply an aggregate condition and a group by fieldapi fields with multiple
     // conditions via OR.
@@ -441,10 +441,10 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->conditionAggregate('field_test_2', 'COUNT', 2)
       ->conditionAggregate('field_test_2', 'SUM', 8)
       ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2, 'field_test_2_sum' => 9),
-      array('field_test_1' => 3, 'field_test_2_count' => 1, 'field_test_2_sum' => 8),
-    ));
+    $this->assertResults([
+      ['field_test_1' => 1, 'field_test_2_count' => 2, 'field_test_2_sum' => 9],
+      ['field_test_1' => 3, 'field_test_2_count' => 1, 'field_test_2_sum' => 8],
+    ]);
 
     // Group by a normal property and aggregate a fieldapi field and sort by the
     // groupby field.
@@ -453,32 +453,32 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->groupBy('user_id')
       ->sort('user_id', 'DESC')
       ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 3, 'field_test_1_count' => 2),
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 1, 'field_test_1_count' => 1),
-    ));
+    $this->assertSortedResults([
+      ['user_id' => 3, 'field_test_1_count' => 2],
+      ['user_id' => 2, 'field_test_1_count' => 3],
+      ['user_id' => 1, 'field_test_1_count' => 1],
+    ]);
 
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->aggregate('field_test_1', 'COUNT')
       ->groupBy('user_id')
       ->sort('user_id', 'ASC')
       ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 1, 'field_test_1_count' => 1),
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-    ));
+    $this->assertSortedResults([
+      ['user_id' => 1, 'field_test_1_count' => 1],
+      ['user_id' => 2, 'field_test_1_count' => 3],
+      ['user_id' => 3, 'field_test_1_count' => 2],
+    ]);
 
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->conditionAggregate('field_test_1', 'COUNT', 2, '>')
       ->groupBy('user_id')
       ->sort('user_id', 'ASC')
       ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-    ));
+    $this->assertSortedResults([
+      ['user_id' => 2, 'field_test_1_count' => 3],
+      ['user_id' => 3, 'field_test_1_count' => 2],
+    ]);
 
     // Group by a normal property, aggregate a fieldapi field, and sort by the
     // aggregated field.
@@ -486,21 +486,21 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->sortAggregate('field_test_1', 'COUNT', 'DESC')
       ->groupBy('user_id')
       ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-      array('user_id' => 1, 'field_test_1_count' => 1),
-    ));
+    $this->assertSortedResults([
+      ['user_id' => 2, 'field_test_1_count' => 3],
+      ['user_id' => 3, 'field_test_1_count' => 2],
+      ['user_id' => 1, 'field_test_1_count' => 1],
+    ]);
 
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->sortAggregate('field_test_1', 'COUNT', 'ASC')
       ->groupBy('user_id')
       ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 1, 'field_test_1_count' => 1),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-      array('user_id' => 2, 'field_test_1_count' => 3),
-    ));
+    $this->assertSortedResults([
+      ['user_id' => 1, 'field_test_1_count' => 1],
+      ['user_id' => 3, 'field_test_1_count' => 2],
+      ['user_id' => 2, 'field_test_1_count' => 3],
+    ]);
 
     // Group by and aggregate by fieldapi field, and sort by the groupby field.
     $this->queryResult = $this->factory->getAggregate('entity_test')
@@ -508,22 +508,22 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->aggregate('field_test_2', 'COUNT')
       ->sort('field_test_1', 'ASC')
       ->execute();
-    $this->assertSortedResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-      array('field_test_1' => 3, 'field_test_2_count' => 1),
-    ));
+    $this->assertSortedResults([
+      ['field_test_1' => 1, 'field_test_2_count' => 2],
+      ['field_test_1' => 2, 'field_test_2_count' => 3],
+      ['field_test_1' => 3, 'field_test_2_count' => 1],
+    ]);
 
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->groupBy('field_test_1')
       ->aggregate('field_test_2', 'COUNT')
       ->sort('field_test_1', 'DESC')
       ->execute();
-    $this->assertSortedResults(array(
-      array('field_test_1' => 3, 'field_test_2_count' => 1),
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-    ));
+    $this->assertSortedResults([
+      ['field_test_1' => 3, 'field_test_2_count' => 1],
+      ['field_test_1' => 2, 'field_test_2_count' => 3],
+      ['field_test_1' => 1, 'field_test_2_count' => 2],
+    ]);
 
     // Groupby and aggregate by fieldapi field, and sort by the aggregated
     // field.
@@ -531,21 +531,21 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       ->groupBy('field_test_1')
       ->sortAggregate('field_test_2', 'COUNT', 'DESC')
       ->execute();
-    $this->assertSortedResults(array(
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-      array('field_test_1' => 3, 'field_test_2_count' => 1),
-    ));
+    $this->assertSortedResults([
+      ['field_test_1' => 2, 'field_test_2_count' => 3],
+      ['field_test_1' => 1, 'field_test_2_count' => 2],
+      ['field_test_1' => 3, 'field_test_2_count' => 1],
+    ]);
 
     $this->queryResult = $this->factory->getAggregate('entity_test')
       ->groupBy('field_test_1')
       ->sortAggregate('field_test_2', 'COUNT', 'ASC')
       ->execute();
-    $this->assertSortedResults(array(
-      array('field_test_1' => 3, 'field_test_2_count' => 1),
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-    ));
+    $this->assertSortedResults([
+      ['field_test_1' => 3, 'field_test_2_count' => 1],
+      ['field_test_1' => 1, 'field_test_2_count' => 2],
+      ['field_test_1' => 2, 'field_test_2_count' => 3],
+    ]);
 
   }
 
@@ -559,7 +559,7 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
     $found = TRUE;
     $expected_keys = array_keys($expected);
     foreach ($this->queryResult as $key => $row) {
-      $keys = $sorted ? array($key) : $expected_keys;
+      $keys = $sorted ? [$key] : $expected_keys;
       foreach ($keys as $key) {
         $expected_row = $expected[$key];
         if (!array_diff_assoc($row, $expected_row) && !array_diff_assoc($expected_row, $row)) {
@@ -569,7 +569,7 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
       $found = FALSE;
       break;
     }
-    return $this->assertTrue($found, strtr('!expected expected, !found found', array('!expected' => print_r($expected, TRUE), '!found' => print_r($this->queryResult, TRUE))));
+    return $this->assertTrue($found, strtr('!expected expected, !found found', ['!expected' => print_r($expected, TRUE), '!found' => print_r($this->queryResult, TRUE)]));
   }
 
   /**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
index 60dc13c67..0bb5b16c3 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
@@ -23,7 +23,7 @@ class EntityQueryRelationshipTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('taxonomy');
+  public static $modules = ['taxonomy'];
 
   /**
    * @var \Drupal\Core\Entity\Query\QueryFactory
@@ -80,12 +80,12 @@ class EntityQueryRelationshipTest extends EntityKernelTestBase {
     // Second, create the field.
     entity_test_create_bundle('test_bundle');
     $this->fieldName = strtolower($this->randomMachineName());
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $vocabulary->id() => $vocabulary->id(),
-       ),
+       ],
       'auto_create' => TRUE,
-    );
+    ];
     $this->createEntityReferenceField('entity_test', 'test_bundle', $this->fieldName, NULL, 'taxonomy_term', 'default', $handler_settings);
 
     // Create two terms and also two accounts.
@@ -102,7 +102,7 @@ class EntityQueryRelationshipTest extends EntityKernelTestBase {
     // 0th account and 0th term, the 1st and 2nd entity will point to the
     // 1st account and 1st term.
     for ($i = 0; $i <= 2; $i++) {
-      $entity = EntityTest::create(array('type' => 'test_bundle'));
+      $entity = EntityTest::create(['type' => 'test_bundle']);
       $entity->name->value = $this->randomMachineName();
       $index = $i ? 1 : 0;
       $entity->user_id->target_id = $this->accounts[$index]->id();
@@ -122,18 +122,18 @@ class EntityQueryRelationshipTest extends EntityKernelTestBase {
     $this->queryResults = $this->factory->get('entity_test')
       ->condition("user_id.entity.name", $this->accounts[0]->getUsername())
       ->execute();
-    $this->assertResults(array(0));
+    $this->assertResults([0]);
     // This returns the 1st and 2nd entity as those point to the 1st account.
     $this->queryResults = $this->factory->get('entity_test')
       ->condition("user_id.entity.name", $this->accounts[0]->getUsername(), '<>')
       ->execute();
-    $this->assertResults(array(1, 2));
+    $this->assertResults([1, 2]);
     // This returns all three entities because all of them point to an
     // account.
     $this->queryResults = $this->factory->get('entity_test')
       ->exists("user_id.entity.name")
       ->execute();
-    $this->assertResults(array(0, 1, 2));
+    $this->assertResults([0, 1, 2]);
     // This returns no entities because all of them point to an account.
     $this->queryResults = $this->factory->get('entity_test')
       ->notExists("user_id.entity.name")
@@ -144,35 +144,35 @@ class EntityQueryRelationshipTest extends EntityKernelTestBase {
     $this->queryResults = $this->factory->get('entity_test')
       ->condition("$this->fieldName.entity.name", $this->terms[0]->name->value)
       ->execute();
-    $this->assertResults(array(0));
+    $this->assertResults([0]);
     // This returns the 0th entity as that's only one pointing to the 0th
     // term (test with specifying the column name).
     $this->queryResults = $this->factory->get('entity_test')
       ->condition("$this->fieldName.target_id.entity.name", $this->terms[0]->name->value)
       ->execute();
-    $this->assertResults(array(0));
+    $this->assertResults([0]);
     // This returns the 1st and 2nd entity as those point to the 1st term.
     $this->queryResults = $this->factory->get('entity_test')
       ->condition("$this->fieldName.entity.name", $this->terms[0]->name->value, '<>')
       ->execute();
-    $this->assertResults(array(1, 2));
+    $this->assertResults([1, 2]);
     // This returns the 0th entity as that's only one pointing to the 0th
     // account.
     $this->queryResults = $this->factory->get('entity_test')
       ->condition("user_id.entity:user.name", $this->accounts[0]->getUsername())
       ->execute();
-    $this->assertResults(array(0));
+    $this->assertResults([0]);
     // This returns the 1st and 2nd entity as those point to the 1st account.
     $this->queryResults = $this->factory->get('entity_test')
       ->condition("user_id.entity:user.name", $this->accounts[0]->getUsername(), '<>')
       ->execute();
-    $this->assertResults(array(1, 2));
+    $this->assertResults([1, 2]);
     // This returns all three entities because all of them point to an
     // account.
     $this->queryResults = $this->factory->get('entity_test')
       ->exists("user_id.entity:user.name")
       ->execute();
-    $this->assertResults(array(0, 1, 2));
+    $this->assertResults([0, 1, 2]);
     // This returns no entities because all of them point to an account.
     $this->queryResults = $this->factory->get('entity_test')
       ->notExists("user_id.entity:user.name")
@@ -183,18 +183,18 @@ class EntityQueryRelationshipTest extends EntityKernelTestBase {
     $this->queryResults = $this->factory->get('entity_test')
       ->condition("$this->fieldName.entity:taxonomy_term.name", $this->terms[0]->name->value)
       ->execute();
-    $this->assertResults(array(0));
+    $this->assertResults([0]);
     // This returns the 0th entity as that's only one pointing to the 0th
     // term (test with specifying the column name).
     $this->queryResults = $this->factory->get('entity_test')
       ->condition("$this->fieldName.target_id.entity:taxonomy_term.name", $this->terms[0]->name->value)
       ->execute();
-    $this->assertResults(array(0));
+    $this->assertResults([0]);
     // This returns the 1st and 2nd entity as those point to the 1st term.
     $this->queryResults = $this->factory->get('entity_test')
       ->condition("$this->fieldName.entity:taxonomy_term.name", $this->terms[0]->name->value, '<>')
       ->execute();
-    $this->assertResults(array(1, 2));
+    $this->assertResults([1, 2]);
   }
 
   /**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
index 8c79c5c63..5c7e51cbc 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
@@ -24,7 +24,7 @@ class EntityQueryTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field_test', 'language');
+  public static $modules = ['field_test', 'language'];
 
   /**
    * @var array
@@ -62,21 +62,21 @@ class EntityQueryTest extends EntityKernelTestBase {
 
     $this->installEntitySchema('entity_test_mulrev');
 
-    $this->installConfig(array('language'));
+    $this->installConfig(['language']);
 
     $figures = Unicode::strtolower($this->randomMachineName());
     $greetings = Unicode::strtolower($this->randomMachineName());
-    foreach (array($figures => 'shape', $greetings => 'text') as $field_name => $field_type) {
-      $field_storage = FieldStorageConfig::create(array(
+    foreach ([$figures => 'shape', $greetings => 'text'] as $field_name => $field_type) {
+      $field_storage = FieldStorageConfig::create([
         'field_name' => $field_name,
         'entity_type' => 'entity_test_mulrev',
         'type' => $field_type,
         'cardinality' => 2,
-      ));
+      ]);
       $field_storage->save();
       $field_storages[] = $field_storage;
     }
-    $bundles = array();
+    $bundles = [];
     for ($i = 0; $i < 2; $i++) {
       // For the sake of tablesort, make sure the second bundle is higher than
       // the first one. Beware: MySQL is not case sensitive.
@@ -93,24 +93,24 @@ class EntityQueryTest extends EntityKernelTestBase {
       $bundles[] = $bundle;
     }
     // Each unit is a list of field name, langcode and a column-value array.
-    $units[] = array($figures, 'en', array(
+    $units[] = [$figures, 'en', [
       'color' => 'red',
       'shape' => 'triangle',
-    ));
-    $units[] = array($figures, 'en', array(
+    ]];
+    $units[] = [$figures, 'en', [
       'color' => 'blue',
       'shape' => 'circle',
-    ));
+    ]];
     // To make it easier to test sorting, the greetings get formats according
     // to their langcode.
-    $units[] = array($greetings, 'tr', array(
+    $units[] = [$greetings, 'tr', [
       'value' => 'merhaba',
       'format' => 'format-tr'
-    ));
-    $units[] = array($greetings, 'pl', array(
+    ]];
+    $units[] = [$greetings, 'pl', [
       'value' => 'siema',
       'format' => 'format-pl'
-    ));
+    ]];
     // Make these languages available to the greetings field.
     ConfigurableLanguage::createFromLangcode('tr')->save();
     ConfigurableLanguage::createFromLangcode('pl')->save();
@@ -119,13 +119,13 @@ class EntityQueryTest extends EntityKernelTestBase {
     // decimal 13 is binary 1101 so unit 3,2 and 0 will be added to the
     // entity.
     for ($i = 1; $i <= 15; $i++) {
-      $entity = EntityTestMulRev::create(array(
+      $entity = EntityTestMulRev::create([
         'type' => $bundles[$i & 1],
         'name' => $this->randomMachineName(),
         'langcode' => 'en',
-      ));
+      ]);
       // Make sure the name is set for every language that we might create.
-      foreach (array('tr', 'pl') as $langcode) {
+      foreach (['tr', 'pl'] as $langcode) {
         $entity->addTranslation($langcode)->name = $this->randomMachineName();
       }
       foreach (array_reverse(str_split(decbin($i))) as $key => $bit) {
@@ -145,7 +145,7 @@ class EntityQueryTest extends EntityKernelTestBase {
   /**
    * Test basic functionality.
    */
-  function testEntityQuery() {
+  public function testEntityQuery() {
     $greetings = $this->greetings;
     $figures = $this->figures;
     $this->queryResults = $this->factory->get('entity_test_mulrev')
@@ -216,8 +216,8 @@ class EntityQueryTest extends EntityKernelTestBase {
 
     // Do the same test but with IN operator.
     $query = $this->factory->get('entity_test_mulrev');
-    $group_blue = $query->andConditionGroup()->condition("$figures.color", array('blue'), 'IN');
-    $group_red = $query->andConditionGroup()->condition("$figures.color", array('red'), 'IN');
+    $group_blue = $query->andConditionGroup()->condition("$figures.color", ['blue'], 'IN');
+    $group_red = $query->andConditionGroup()->condition("$figures.color", ['red'], 'IN');
     $this->queryResults = $query
       ->condition($group_blue)
       ->condition($group_red)
@@ -228,7 +228,7 @@ class EntityQueryTest extends EntityKernelTestBase {
 
     // An entity might have either red or blue figure.
     $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("$figures.color", array('blue', 'red'), 'IN')
+      ->condition("$figures.color", ['blue', 'red'], 'IN')
       ->sort('id')
       ->execute();
     // Bit 0 or 1 is on.
@@ -267,7 +267,7 @@ class EntityQueryTest extends EntityKernelTestBase {
       ->allRevisions()
       ->sort('revision_id')
       ->execute();
-    $this->assertRevisionResult(array($first_entity->id()), array($first_entity->id()));
+    $this->assertRevisionResult([$first_entity->id()], [$first_entity->id()]);
     // When querying current revisions, this string is no longer found.
     $this->queryResults = $this->factory->get('entity_test_mulrev')
       ->condition("$greetings.value", 'merhaba')
@@ -279,14 +279,14 @@ class EntityQueryTest extends EntityKernelTestBase {
       ->sort('revision_id')
       ->execute();
     // The query only matches the original revisions.
-    $this->assertRevisionResult(array(4, 5, 6, 7, 12, 13, 14, 15), array(4, 5, 6, 7, 12, 13, 14, 15));
+    $this->assertRevisionResult([4, 5, 6, 7, 12, 13, 14, 15], [4, 5, 6, 7, 12, 13, 14, 15]);
     $results = $this->factory->get('entity_test_mulrev')
       ->condition("$greetings.value", 'siema', 'CONTAINS')
       ->sort('id')
       ->execute();
     // This matches both the original and new current revisions, multiple
     // revisions are returned for some entities.
-    $assert = array(16 => '4', 17 => '5', 18 => '6', 19 => '7', 8 => '8', 9 => '9', 10 => '10', 11 => '11', 20 => '12', 21 => '13', 22 => '14', 23 => '15');
+    $assert = [16 => '4', 17 => '5', 18 => '6', 19 => '7', 8 => '8', 9 => '9', 10 => '10', 11 => '11', 20 => '12', 21 => '13', 22 => '14', 23 => '15'];
     $this->assertIdentical($results, $assert);
     $results = $this->factory->get('entity_test_mulrev')
       ->condition("$greetings.value", 'siema', 'STARTS_WITH')
@@ -309,7 +309,7 @@ class EntityQueryTest extends EntityKernelTestBase {
       ->sort('revision_id')
       ->execute();
     // Now we get everything.
-    $assert = array(4 => '4', 5 => '5', 6 => '6', 7 => '7', 8 => '8', 9 => '9', 10 => '10', 11 => '11', 12 => '12', 20 => '12', 13 => '13', 21 => '13', 14 => '14', 22 => '14', 15 => '15', 23 => '15');
+    $assert = [4 => '4', 5 => '5', 6 => '6', 7 => '7', 8 => '8', 9 => '9', 10 => '10', 11 => '11', 12 => '12', 20 => '12', 13 => '13', 21 => '13', 14 => '14', 22 => '14', 15 => '15', 23 => '15'];
     $this->assertIdentical($results, $assert);
   }
 
@@ -318,7 +318,7 @@ class EntityQueryTest extends EntityKernelTestBase {
    *
    * Warning: this is complicated.
    */
-  function testSort() {
+  public function testSort() {
     $greetings = $this->greetings;
     $figures = $this->figures;
     // Order up and down on a number.
@@ -376,9 +376,9 @@ class EntityQueryTest extends EntityKernelTestBase {
     // Test the pager by setting element #1 to page 2 with a page size of 4.
     // Results will be #8-12 from above.
     $request = Request::createFromGlobals();
-    $request->query->replace(array(
+    $request->query->replace([
       'page' => '0,2',
-    ));
+    ]);
     \Drupal::getContainer()->get('request_stack')->push($request);
     $this->queryResults = $this->factory->get('entity_test_mulrev')
       ->sort("$figures.color")
@@ -407,40 +407,40 @@ class EntityQueryTest extends EntityKernelTestBase {
     // assert that all entities from one bundle are after the other as the
     // order dictates.
     $request = Request::createFromGlobals();
-    $request->query->replace(array(
+    $request->query->replace([
       'sort' => 'asc',
       'order' => 'Type',
-    ));
+    ]);
     \Drupal::getContainer()->get('request_stack')->push($request);
 
-    $header = array(
-      'id' => array('data' => 'Id', 'specifier' => 'id'),
-      'type' => array('data' => 'Type', 'specifier' => 'type'),
-    );
+    $header = [
+      'id' => ['data' => 'Id', 'specifier' => 'id'],
+      'type' => ['data' => 'Type', 'specifier' => 'type'],
+    ];
 
     $this->queryResults = array_values($this->factory->get('entity_test_mulrev')
       ->tableSort($header)
       ->execute());
     $this->assertBundleOrder('asc');
 
-    $request->query->add(array(
+    $request->query->add([
       'sort' => 'desc',
-    ));
+    ]);
     \Drupal::getContainer()->get('request_stack')->push($request);
 
-    $header = array(
-      'id' => array('data' => 'Id', 'specifier' => 'id'),
-      'type' => array('data' => 'Type', 'specifier' => 'type'),
-    );
+    $header = [
+      'id' => ['data' => 'Id', 'specifier' => 'id'],
+      'type' => ['data' => 'Type', 'specifier' => 'type'],
+    ];
     $this->queryResults = array_values($this->factory->get('entity_test_mulrev')
       ->tableSort($header)
       ->execute());
     $this->assertBundleOrder('desc');
 
     // Ordering on ID is definite, however.
-    $request->query->add(array(
+    $request->query->add([
       'order' => 'Id',
-    ));
+    ]);
     \Drupal::getContainer()->get('request_stack')->push($request);
     $this->queryResults = $this->factory->get('entity_test_mulrev')
       ->tableSort($header)
@@ -454,13 +454,13 @@ class EntityQueryTest extends EntityKernelTestBase {
   public function testCount() {
     // Create a field with the same name in a different entity type.
     $field_name = $this->figures;
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'shape',
       'cardinality' => 2,
       'translatable' => TRUE,
-    ));
+    ]);
     $field_storage->save();
     $bundle = $this->randomMachineName();
     FieldConfig::create([
@@ -468,10 +468,10 @@ class EntityQueryTest extends EntityKernelTestBase {
       'bundle' => $bundle,
     ])->save();
 
-    $entity = EntityTest::create(array(
+    $entity = EntityTest::create([
       'id' => 1,
       'type' => $bundle,
-    ));
+    ]);
     $entity->enforceIsNew();
     $entity->save();
 
@@ -545,8 +545,8 @@ class EntityQueryTest extends EntityKernelTestBase {
 
     // Test the delta range condition.
     $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("$figures.%delta.color", array('blue', 'red'), 'IN')
-      ->condition("$figures.%delta", array(0, 1), 'IN')
+      ->condition("$figures.%delta.color", ['blue', 'red'], 'IN')
+      ->condition("$figures.%delta", [0, 1], 'IN')
       ->sort('id')
       ->execute();
     // Figure delta 0 or 1 can be blue or red, this matches a lot of entities.
@@ -563,12 +563,12 @@ class EntityQueryTest extends EntityKernelTestBase {
     // Numeric delta on single value base field should return results only if
     // the first item is being targeted.
     $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("id.0.value", array(1, 3, 5), 'IN')
+      ->condition("id.0.value", [1, 3, 5], 'IN')
       ->sort('id')
       ->execute();
     $this->assertResult(1, 3, 5);
     $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("id.1.value", array(1, 3, 5), 'IN')
+      ->condition("id.1.value", [1, 3, 5], 'IN')
       ->sort('id')
       ->execute();
     $this->assertResult();
@@ -576,18 +576,18 @@ class EntityQueryTest extends EntityKernelTestBase {
     // Delta range condition on single value base field should return results
     // only if just the field value is targeted.
     $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("id.%delta.value", array(1, 3, 5), 'IN')
+      ->condition("id.%delta.value", [1, 3, 5], 'IN')
       ->sort('id')
       ->execute();
     $this->assertResult(1, 3, 5);
     $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("id.%delta.value", array(1, 3, 5), 'IN')
+      ->condition("id.%delta.value", [1, 3, 5], 'IN')
       ->condition("id.%delta", 0, '=')
       ->sort('id')
       ->execute();
     $this->assertResult(1, 3, 5);
     $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("id.%delta.value", array(1, 3, 5), 'IN')
+      ->condition("id.%delta.value", [1, 3, 5], 'IN')
       ->condition("id.%delta", 1, '=')
       ->sort('id')
       ->execute();
@@ -596,7 +596,7 @@ class EntityQueryTest extends EntityKernelTestBase {
   }
 
   protected function assertResult() {
-    $assert = array();
+    $assert = [];
     $expected = func_get_args();
     if ($expected && is_array($expected[0])) {
       $expected = $expected[0];
@@ -608,7 +608,7 @@ class EntityQueryTest extends EntityKernelTestBase {
   }
 
   protected function assertRevisionResult($keys, $expected) {
-    $assert = array();
+    $assert = [];
     foreach ($expected as $key => $binary) {
       $assert[$keys[$key]] = strval($binary);
     }
@@ -659,41 +659,41 @@ class EntityQueryTest extends EntityKernelTestBase {
   public function testCaseSensitivity() {
     $bundle = $this->randomMachineName();
 
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_ci',
       'entity_type' => 'entity_test_mulrev',
       'type' => 'string',
       'cardinality' => 1,
       'translatable' => FALSE,
-      'settings' => array(
+      'settings' => [
         'case_sensitive' => FALSE,
-      )
-    ));
+      ]
+    ]);
     $field_storage->save();
 
-    FieldConfig::create(array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => $bundle,
-    ))->save();
+    ])->save();
 
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'field_cs',
       'entity_type' => 'entity_test_mulrev',
       'type' => 'string',
       'cardinality' => 1,
       'translatable' => FALSE,
-      'settings' => array(
+      'settings' => [
         'case_sensitive' => TRUE,
-      ),
-    ));
+      ],
+    ]);
     $field_storage->save();
 
-    FieldConfig::create(array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => $bundle,
-    ))->save();
+    ])->save();
 
-    $fixtures = array();
+    $fixtures = [];
 
     for ($i = 0; $i < 2; $i++) {
       // If the last 4 of the string are all numbers, then there is no
@@ -701,20 +701,20 @@ class EntityQueryTest extends EntityKernelTestBase {
       // test will fail. Ensure that can not happen by appending a non-numeric
       // character. See https://www.drupal.org/node/2397297.
       $string = $this->randomMachineName(7) . 'a';
-      $fixtures[] = array(
+      $fixtures[] = [
         'original' => $string,
         'uppercase' => Unicode::strtoupper($string),
         'lowercase' => Unicode::strtolower($string),
-      );
+      ];
     }
 
-    EntityTestMulRev::create(array(
+    EntityTestMulRev::create([
       'type' => $bundle,
       'name' => $this->randomMachineName(),
       'langcode' => 'en',
       'field_ci' => $fixtures[0]['uppercase'] . $fixtures[1]['lowercase'],
       'field_cs' => $fixtures[0]['uppercase'] . $fixtures[1]['lowercase']
-    ))->save();
+    ])->save();
 
     // Check the case insensitive field, = operator.
     $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
@@ -750,33 +750,33 @@ class EntityQueryTest extends EntityKernelTestBase {
 
     // Check the case insensitive field, IN operator.
     $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', array($fixtures[0]['lowercase'] . $fixtures[1]['lowercase']), 'IN'
+      'field_ci', [$fixtures[0]['lowercase'] . $fixtures[1]['lowercase']], 'IN'
     )->execute();
     $this->assertIdentical(count($result), 1, 'Case insensitive, lowercase');
 
     $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', array($fixtures[0]['uppercase'] . $fixtures[1]['uppercase']), 'IN'
+      'field_ci', [$fixtures[0]['uppercase'] . $fixtures[1]['uppercase']], 'IN'
     )->execute();
     $this->assertIdentical(count($result), 1, 'Case insensitive, uppercase');
 
     $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', array($fixtures[0]['uppercase'] . $fixtures[1]['lowercase']), 'IN'
+      'field_ci', [$fixtures[0]['uppercase'] . $fixtures[1]['lowercase']], 'IN'
     )->execute();
     $this->assertIdentical(count($result), 1, 'Case insensitive, mixed');
 
     // Check the case sensitive field, IN operator.
     $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', array($fixtures[0]['lowercase'] . $fixtures[1]['lowercase']), 'IN'
+      'field_cs', [$fixtures[0]['lowercase'] . $fixtures[1]['lowercase']], 'IN'
     )->execute();
     $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase');
 
     $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', array($fixtures[0]['uppercase'] . $fixtures[1]['uppercase']), 'IN'
+      'field_cs', [$fixtures[0]['uppercase'] . $fixtures[1]['uppercase']], 'IN'
     )->execute();
     $this->assertIdentical(count($result), 0, 'Case sensitive, uppercase');
 
     $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', array($fixtures[0]['uppercase'] . $fixtures[1]['lowercase']), 'IN'
+      'field_cs', [$fixtures[0]['uppercase'] . $fixtures[1]['lowercase']], 'IN'
     )->execute();
     $this->assertIdentical(count($result), 1, 'Case sensitive, mixed');
 
@@ -863,19 +863,19 @@ class EntityQueryTest extends EntityKernelTestBase {
     $term1 = Term::create([
       'name' => $this->randomMachineName(),
       'vid' => 'tags',
-      'description' => array(
+      'description' => [
         'value' => $this->randomString(),
         'format' => 'format1',
-      )]);
+      ]]);
     $term1->save();
 
     $term2 = Term::create([
       'name' => $this->randomMachineName(),
       'vid' => 'tags',
-      'description' => array(
+      'description' => [
         'value' => $this->randomString(),
         'format' => 'format2',
-      )]);
+      ]]);
     $term2->save();
 
     $ids = \Drupal::entityQuery('taxonomy_term')
@@ -936,7 +936,7 @@ class EntityQueryTest extends EntityKernelTestBase {
   public function testInjectionInCondition() {
     try {
       $this->queryResults = $this->factory->get('entity_test_mulrev')
-        ->condition('1 ; -- ', array(0, 1), 'IN')
+        ->condition('1 ; -- ', [0, 1], 'IN')
         ->sort('id')
         ->execute();
       $this->fail('SQL Injection attempt in Entity Query condition in operator should result in an exception.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceFieldTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceFieldTest.php
index 8f2239db1..b43087260 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceFieldTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceFieldTest.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\KernelTests\Core\Entity;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageException;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -59,7 +59,7 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('entity_reference_test');
+  public static $modules = ['entity_reference_test', 'entity_test_update'];
 
   /**
    * {@inheritdoc}
@@ -77,7 +77,7 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
       'Field test',
       $this->referencedEntityType,
       'default',
-      array('target_bundles' => array($this->bundle)),
+      ['target_bundles' => [$this->bundle]],
       FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED
     );
 
@@ -90,12 +90,12 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
     // Test a valid reference.
     $referenced_entity = $this->container->get('entity_type.manager')
       ->getStorage($this->referencedEntityType)
-      ->create(array('type' => $this->bundle));
+      ->create(['type' => $this->bundle]);
     $referenced_entity->save();
 
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('type' => $this->bundle));
+      ->create(['type' => $this->bundle]);
     $entity->{$this->fieldName}->target_id = $referenced_entity->id();
     $violations = $entity->{$this->fieldName}->validate();
     $this->assertEqual($violations->count(), 0, 'Validation passes.');
@@ -104,16 +104,16 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
     $entity->{$this->fieldName}->target_id = 9999;
     $violations = $entity->{$this->fieldName}->validate();
     $this->assertEqual($violations->count(), 1, 'Validation throws a violation.');
-    $this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%type: %id) does not exist.', array('%type' => $this->referencedEntityType, '%id' => 9999)));
+    $this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%type: %id) does not exist.', ['%type' => $this->referencedEntityType, '%id' => 9999]));
 
     // Test a non-referenceable bundle.
     entity_test_create_bundle('non_referenceable', NULL, $this->referencedEntityType);
-    $referenced_entity = entity_create($this->referencedEntityType, array('type' => 'non_referenceable'));
+    $referenced_entity = entity_create($this->referencedEntityType, ['type' => 'non_referenceable']);
     $referenced_entity->save();
     $entity->{$this->fieldName}->target_id = $referenced_entity->id();
     $violations = $entity->{$this->fieldName}->validate();
     $this->assertEqual($violations->count(), 1, 'Validation throws a violation.');
-    $this->assertEqual($violations[0]->getMessage(), t('This entity (%type: %id) cannot be referenced.', array('%type' => $this->referencedEntityType, '%id' => $referenced_entity->id())));
+    $this->assertEqual($violations[0]->getMessage(), t('This entity (%type: %id) cannot be referenced.', ['%type' => $this->referencedEntityType, '%id' => $referenced_entity->id()]));
   }
 
   /**
@@ -123,15 +123,15 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
     // Create the parent entity.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('type' => $this->bundle));
+      ->create(['type' => $this->bundle]);
 
     // Create three target entities and attach them to parent field.
-    $target_entities = array();
-    $reference_field = array();
+    $target_entities = [];
+    $reference_field = [];
     for ($i = 0; $i < 3; $i++) {
       $target_entity = $this->container->get('entity_type.manager')
         ->getStorage($this->referencedEntityType)
-        ->create(array('type' => $this->bundle));
+        ->create(['type' => $this->bundle]);
       $target_entity->save();
       $target_entities[] = $target_entity;
       $reference_field[]['target_id'] = $target_entity->id();
@@ -154,7 +154,7 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
     // "autocreate" feature.
     $target_entity_unsaved = $this->container->get('entity_type.manager')
       ->getStorage($this->referencedEntityType)
-      ->create(array('type' => $this->bundle, 'name' => $this->randomString()));
+      ->create(['type' => $this->bundle, 'name' => $this->randomString()]);
     $reference_field[6]['entity'] = $target_entity_unsaved;
     $target_entities[6] = $target_entity_unsaved;
 
@@ -201,13 +201,13 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
       'Field test',
       'entity_test_string_id',
       'default',
-      array('target_bundles' => array($this->bundle)),
+      ['target_bundles' => [$this->bundle]],
       FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED
     );
     // Create the parent entity.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('type' => $this->bundle));
+      ->create(['type' => $this->bundle]);
 
     // Create the default target entity.
     $target_entity = EntityTestStringId::create([
@@ -217,7 +217,7 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
     $target_entity->save();
 
     // Set the field value.
-    $entity->{$field_name}->setValue(array(array('target_id' => $target_entity->id())));
+    $entity->{$field_name}->setValue([['target_id' => $target_entity->id()]]);
 
     // Load the target entities using EntityReferenceField::referencedEntities().
     $entities = $entity->{$field_name}->referencedEntities();
@@ -233,7 +233,7 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
     // Test that the default value works.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($this->entityType)
-      ->create(array('type' => $this->bundle));
+      ->create(['type' => $this->bundle]);
     $entities = $entity->{$field_name}->referencedEntities();
     $this->assertEqual($entities[0]->id(), $target_entity->id());
   }
@@ -241,10 +241,10 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
   /**
    * Tests all the possible ways to autocreate an entity via the API.
    */
-  function testAutocreateApi() {
+  public function testAutocreateApi() {
     $entity = $this->entityManager
       ->getStorage($this->entityType)
-      ->create(array('name' => $this->randomString()));
+      ->create(['name' => $this->randomString()]);
 
     // Test content entity autocreation.
     $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
@@ -260,13 +260,13 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
       $entity->user_id[0]->get('entity')->setValue($user);
     });
     $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
-      $entity->user_id->setValue(array('entity' => $user, 'target_id' => NULL));
+      $entity->user_id->setValue(['entity' => $user, 'target_id' => NULL]);
     });
     try {
       $message = 'Setting both the entity and an invalid target_id property fails.';
       $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
         $user->save();
-        $entity->user_id->setValue(array('entity' => $user, 'target_id' => $this->generateRandomEntityId()));
+        $entity->user_id->setValue(['entity' => $user, 'target_id' => $this->generateRandomEntityId()]);
       });
       $this->fail($message);
     }
@@ -294,13 +294,13 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
       $entity->user_role[0]->get('entity')->setValue($role);
     });
     $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
-      $entity->user_role->setValue(array('entity' => $role, 'target_id' => NULL));
+      $entity->user_role->setValue(['entity' => $role, 'target_id' => NULL]);
     });
     try {
       $message = 'Setting both the entity and an invalid target_id property fails.';
       $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
         $role->save();
-        $entity->user_role->setValue(array('entity' => $role, 'target_id' => $this->generateRandomEntityId(TRUE)));
+        $entity->user_role->setValue(['entity' => $role, 'target_id' => $this->generateRandomEntityId(TRUE)]);
       });
       $this->fail($message);
     }
@@ -317,7 +317,7 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
     // Test target entity saving after setting it as new.
     $storage = $this->entityManager->getStorage('user');
     $user_id = $this->generateRandomEntityId();
-    $user = $storage->create(array('uid' => $user_id, 'name' => $this->randomString()));
+    $user = $storage->create(['uid' => $user_id, 'name' => $this->randomString()]);
     $entity->user_id = $user;
     $user->save();
     $entity->save();
@@ -338,7 +338,7 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
   protected function assertUserAutocreate(EntityInterface $entity, $setter_callback) {
     $storage = $this->entityManager->getStorage('user');
     $user_id = $this->generateRandomEntityId();
-    $user = $storage->create(array('uid' => $user_id, 'name' => $this->randomString()));
+    $user = $storage->create(['uid' => $user_id, 'name' => $this->randomString()]);
     $setter_callback($entity, $user);
     $entity->save();
     $storage->resetCache();
@@ -360,7 +360,7 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
   protected function assertUserRoleAutocreate(EntityInterface $entity, $setter_callback) {
     $storage = $this->entityManager->getStorage('user_role');
     $role_id = $this->generateRandomEntityId(TRUE);
-    $role = $storage->create(array('id' => $role_id, 'label' => $this->randomString()));
+    $role = $storage->create(['id' => $role_id, 'label' => $this->randomString()]);
     $setter_callback($entity, $role);
     $entity->save();
     $storage->resetCache();
@@ -378,11 +378,11 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
     $entity_type = clone $this->entityManager->getDefinition('entity_test_update');
     $entity_type->setHandlerClass('storage', '\Drupal\entity_test\EntityTestNoLoadStorage');
     $this->state->set('entity_test_update.entity_type', $entity_type);
-    $definitions = array(
+    $definitions = [
       'target_reference' => BaseFieldDefinition::create('entity_reference')
         ->setSetting('target_type', $entity_type->id())
         ->setSetting('handler', 'default')
-    );
+    ];
     $this->state->set('entity_test_update.additional_base_field_definitions', $definitions);
     $this->entityManager->clearCachedDefinitions();
     $this->installEntitySchema($entity_type->id());
@@ -390,7 +390,7 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
     // Create the target entity.
     $storage = $this->entityManager->getStorage($entity_type->id());
     $target_id = $this->generateRandomEntityId();
-    $target = $storage->create(array('id' => $target_id, 'name' => $this->randomString()));
+    $target = $storage->create(['id' => $target_id, 'name' => $this->randomString()]);
     $target->save();
     $this->assertEqual($target_id, $target->id(), 'The target entity has a random identifier.');
 
@@ -400,7 +400,7 @@ class EntityReferenceFieldTest extends EntityKernelTestBase {
     try {
       $entity = $this->entityManager
         ->getStorage($entity_type->id())
-        ->create(array('name' => $this->randomString()));
+        ->create(['name' => $this->randomString()]);
       $entity->target_reference = $target_id;
       $this->pass($message);
     }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
index f51c8ea3d..eb13d0e49 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
@@ -21,19 +21,19 @@ class EntityReferenceSelectionSortTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('node');
+  public static $modules = ['node'];
 
   protected function setUp() {
     parent::setUp();
 
     // Create an Article node type.
-    $article = NodeType::create(array(
+    $article = NodeType::create([
       'type' => 'article',
-    ));
+    ]);
     $article->save();
 
     // Test as a non-admin.
-    $normal_user = $this->createUser(array(), array('access content'));
+    $normal_user = $this->createUser([], ['access content']);
     \Drupal::currentUser()->setAccount($normal_user);
   }
 
@@ -42,50 +42,50 @@ class EntityReferenceSelectionSortTest extends EntityKernelTestBase {
    */
   public function testSort() {
     // Add text field to entity, to sort by.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_text',
       'entity_type' => 'node',
       'type' => 'text',
-      'entity_types' => array('node'),
-    ))->save();
+      'entity_types' => ['node'],
+    ])->save();
 
     FieldConfig::create([
       'label' => 'Text Field',
       'field_name' => 'field_text',
       'entity_type' => 'node',
       'bundle' => 'article',
-      'settings' => array(),
+      'settings' => [],
       'required' => FALSE,
     ])->save();
 
     // Build a set of test data.
-    $node_values = array(
-      'published1' => array(
+    $node_values = [
+      'published1' => [
         'type' => 'article',
         'status' => 1,
         'title' => 'Node published1 (<&>)',
         'uid' => 1,
-        'field_text' => array(
-          array(
+        'field_text' => [
+          [
             'value' => 1,
-          ),
-        ),
-      ),
-      'published2' => array(
+          ],
+        ],
+      ],
+      'published2' => [
         'type' => 'article',
         'status' => 1,
         'title' => 'Node published2 (<&>)',
         'uid' => 1,
-        'field_text' => array(
-          array(
+        'field_text' => [
+          [
             'value' => 2,
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
 
-    $nodes = array();
-    $node_labels = array();
+    $nodes = [];
+    $node_labels = [];
     foreach ($node_values as $key => $values) {
       $node = Node::create($values);
       $node->save();
@@ -93,40 +93,40 @@ class EntityReferenceSelectionSortTest extends EntityKernelTestBase {
       $node_labels[$key] = Html::escape($node->label());
     }
 
-    $selection_options = array(
+    $selection_options = [
       'target_type' => 'node',
       'handler' => 'default',
-      'handler_settings' => array(
+      'handler_settings' => [
         'target_bundles' => NULL,
         // Add sorting.
-        'sort' => array(
+        'sort' => [
           'field' => 'field_text.value',
           'direction' => 'DESC',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     $handler = $this->container->get('plugin.manager.entity_reference_selection')->getInstance($selection_options);
 
     // Not only assert the result, but make sure the keys are sorted as
     // expected.
     $result = $handler->getReferenceableEntities();
-    $expected_result = array(
+    $expected_result = [
       $nodes['published2']->id() => $node_labels['published2'],
       $nodes['published1']->id() => $node_labels['published1'],
-    );
+    ];
     $this->assertIdentical($result['article'], $expected_result, 'Query sorted by field returned expected values.');
 
     // Assert sort by base field.
-    $selection_options['handler_settings']['sort'] = array(
+    $selection_options['handler_settings']['sort'] = [
       'field' => 'nid',
       'direction' => 'ASC',
-    );
+    ];
     $handler = $this->container->get('plugin.manager.entity_reference_selection')->getInstance($selection_options);
     $result = $handler->getReferenceableEntities();
-    $expected_result = array(
+    $expected_result = [
       $nodes['published1']->id() => $node_labels['published1'],
       $nodes['published2']->id() => $node_labels['published2'],
-    );
+    ];
     $this->assertIdentical($result['article'], $expected_result, 'Query sorted by property returned expected values.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php
index fdf72df4a..3e285ff69 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php
@@ -23,7 +23,7 @@ class EntitySchemaTest extends EntityKernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('user', array('users_data'));
+    $this->installSchema('user', ['users_data']);
     $this->database = $this->container->get('database');
   }
 
@@ -80,33 +80,33 @@ class EntitySchemaTest extends EntityKernelTestBase {
     $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_base_field']);
     $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_bundle_field']);
     $schema_handler = $this->database->schema();
-    $tables = array('entity_test', 'entity_test_revision', 'entity_test_field_data', 'entity_test_field_revision');
-    $dedicated_tables = array('entity_test__custom_bundle_field', 'entity_test_revision__custom_bundle_field');
+    $tables = ['entity_test', 'entity_test_revision', 'entity_test_field_data', 'entity_test_field_revision'];
+    $dedicated_tables = ['entity_test__custom_bundle_field', 'entity_test_revision__custom_bundle_field'];
 
     // Initially only the base table and the dedicated field data table should
     // exist.
     foreach ($tables as $index => $table) {
-      $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
+      $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', ['@table' => $table]));
     }
-    $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
+    $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', ['@table' => $table]));
 
     // Update the entity type definition and check that the entity schema now
     // supports translations and revisions.
     $this->updateEntityType(TRUE);
     foreach ($tables as $table) {
-      $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
+      $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Entity schema correct for the @table table.', ['@table' => $table]));
     }
     foreach ($dedicated_tables as $table) {
-      $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
+      $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Field schema correct for the @table table.', ['@table' => $table]));
     }
 
     // Revert changes and check that the entity schema now does not support
     // neither translations nor revisions.
     $this->updateEntityType(FALSE);
     foreach ($tables as $index => $table) {
-      $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
+      $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', ['@table' => $table]));
     }
-    $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
+    $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', ['@table' => $table]));
   }
 
   /**
@@ -167,7 +167,7 @@ class EntitySchemaTest extends EntityKernelTestBase {
     $this->assertNotEqual($entity_type_id_count, 0, 'There are storage definitions provided by the entity_test module in the schema.');
 
     // Uninstall the entity_test module.
-    $this->container->get('module_installer')->uninstall(array('entity_test'));
+    $this->container->get('module_installer')->uninstall(['entity_test']);
 
     // Get a list of all the entities in the schema.
     $key_value_store = \Drupal::keyValue('entity.storage_schema.sql');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
index b247662a8..fe8bcc015 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
@@ -4,6 +4,7 @@ namespace Drupal\KernelTests\Core\Entity;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\TypedData\TranslationStatusInterface;
 use Drupal\entity_test\Entity\EntityTestMulRev;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -36,28 +37,28 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         'name' => 'test',
         'user_id' => $this->container->get('current_user')->id(),
-      ));
-    $this->assertEqual($entity->language()->getId(), $this->languageManager->getDefaultLanguage()->getId(), format_string('%entity_type: Entity created with API has default language.', array('%entity_type' => $entity_type)));
+      ]);
+    $this->assertEqual($entity->language()->getId(), $this->languageManager->getDefaultLanguage()->getId(), format_string('%entity_type: Entity created with API has default language.', ['%entity_type' => $entity_type]));
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         'name' => 'test',
         'user_id' => \Drupal::currentUser()->id(),
         $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      ));
+      ]);
 
-    $this->assertEqual($entity->language()->getId(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity language not specified.', array('%entity_type' => $entity_type)));
-    $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->language()->getId(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity language not specified.', ['%entity_type' => $entity_type]));
+    $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', ['%entity_type' => $entity_type]));
 
     // Set the value in default language.
-    $entity->set($this->fieldName, array(0 => array('value' => 'default value')));
+    $entity->set($this->fieldName, [0 => ['value' => 'default value']]);
     // Get the value.
     $field = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get($this->fieldName);
-    $this->assertEqual($field->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($field->getLangcode(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($field->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($field->getLangcode(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Field object has the expected langcode.', ['%entity_type' => $entity_type]));
 
     // Try to get add a translation to language neutral entity.
     $message = 'Adding a translation to a language-neutral entity results in an error.';
@@ -73,22 +74,22 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     // translating it.
     $default_langcode = $this->langcodes[0];
     $entity->{$langcode_key}->value = $default_langcode;
-    $entity->{$this->fieldName} = array();
-    $this->assertEqual($entity->language(), \Drupal::languageManager()->getLanguage($this->langcodes[0]), format_string('%entity_type: Entity language retrieved.', array('%entity_type' => $entity_type)));
-    $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
+    $entity->{$this->fieldName} = [];
+    $this->assertEqual($entity->language(), \Drupal::languageManager()->getLanguage($this->langcodes[0]), format_string('%entity_type: Entity language retrieved.', ['%entity_type' => $entity_type]));
+    $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', ['%entity_type' => $entity_type]));
 
     // Set the value in default language.
-    $entity->set($this->fieldName, array(0 => array('value' => 'default value')));
+    $entity->set($this->fieldName, [0 => ['value' => 'default value']]);
     // Get the value.
     $field = $entity->get($this->fieldName);
-    $this->assertEqual($field->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($field->getLangcode(), $default_langcode, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($field->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($field->getLangcode(), $default_langcode, format_string('%entity_type: Field object has the expected langcode.', ['%entity_type' => $entity_type]));
 
     // Set a translation.
-    $entity->addTranslation($this->langcodes[1])->set($this->fieldName, array(0 => array('value' => 'translation 1')));
+    $entity->addTranslation($this->langcodes[1])->set($this->fieldName, [0 => ['value' => 'translation 1']]);
     $field = $entity->getTranslation($this->langcodes[1])->{$this->fieldName};
-    $this->assertEqual($field->value, 'translation 1', format_string('%entity_type: Translated value set.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($field->getLangcode(), $this->langcodes[1], format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($field->value, 'translation 1', format_string('%entity_type: Translated value set.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($field->getLangcode(), $this->langcodes[1], format_string('%entity_type: Field object has the expected langcode.', ['%entity_type' => $entity_type]));
 
     // Make sure the untranslated value stays.
     $field = $entity->get($this->fieldName);
@@ -109,7 +110,7 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     }
 
     // Try to get a not available translation.
-    $this->assertNull($entity->addTranslation($this->langcodes[2])->get($this->fieldName)->value, format_string('%entity_type: A translation that is not available is NULL.', array('%entity_type' => $entity_type)));
+    $this->assertNull($entity->addTranslation($this->langcodes[2])->get($this->fieldName)->value, format_string('%entity_type: A translation that is not available is NULL.', ['%entity_type' => $entity_type]));
 
     // Try to get a value using an invalid language code.
     $message = 'Getting an invalid translation results in an error.';
@@ -124,19 +125,19 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     // Try to set a value using an invalid language code.
     try {
       $entity->getTranslation('invalid')->set($this->fieldName, NULL);
-      $this->fail(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type)));
+      $this->fail(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', ['%entity_type' => $entity_type]));
     }
     catch (\InvalidArgumentException $e) {
-      $this->pass(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type)));
+      $this->pass(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', ['%entity_type' => $entity_type]));
     }
 
     // Set the value in default language.
     $field_name = 'field_test_text';
-    $entity->getTranslation($this->langcodes[1])->set($field_name, array(0 => array('value' => 'default value2')));
+    $entity->getTranslation($this->langcodes[1])->set($field_name, [0 => ['value' => 'default value2']]);
     // Get the value.
     $field = $entity->get($field_name);
-    $this->assertEqual($field->value, 'default value2', format_string('%entity_type: Untranslated value set into a translation in non-strict mode.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($field->getLangcode(), $default_langcode, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($field->value, 'default value2', format_string('%entity_type: Untranslated value set into a translation in non-strict mode.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($field->getLangcode(), $default_langcode, format_string('%entity_type: Field object has the expected langcode.', ['%entity_type' => $entity_type]));
   }
 
   /**
@@ -170,51 +171,51 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     $entity->save();
     $entity = $storage->load($entity->id());
     $default_langcode = $entity->language()->getId();
-    $this->assertEqual($default_langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity created as language neutral.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($default_langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity created as language neutral.', ['%entity_type' => $entity_type]));
     $field = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get('name');
-    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name has been correctly stored as language neutral.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($uid, $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as language neutral.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name has been correctly stored as language neutral.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($uid, $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as language neutral.', ['%entity_type' => $entity_type]));
 
     $translation = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT);
     $field = $translation->get('name');
-    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name defaults to neutral language.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($uid, $translation->get('user_id')->target_id, format_string('%entity_type: The entity author defaults to neutral language.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name defaults to neutral language.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($uid, $translation->get('user_id')->target_id, format_string('%entity_type: The entity author defaults to neutral language.', ['%entity_type' => $entity_type]));
     $field = $entity->get('name');
-    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($uid, $entity->get('user_id')->target_id, format_string('%entity_type: The entity author can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name can be retrieved without specifying a language.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($uid, $entity->get('user_id')->target_id, format_string('%entity_type: The entity author can be retrieved without specifying a language.', ['%entity_type' => $entity_type]));
 
     // Create a language-aware entity and check that properties are stored
     // as language-aware.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('name' => $name, 'user_id' => $uid, $langcode_key => $langcode));
+      ->create(['name' => $name, 'user_id' => $uid, $langcode_key => $langcode]);
     $entity->save();
     $entity = $storage->load($entity->id());
     $default_langcode = $entity->language()->getId();
-    $this->assertEqual($default_langcode, $langcode, format_string('%entity_type: Entity created as language specific.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($default_langcode, $langcode, format_string('%entity_type: Entity created as language specific.', ['%entity_type' => $entity_type]));
     $field = $entity->getTranslation($langcode)->get('name');
-    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name has been correctly stored as a language-aware property.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', ['%entity_type' => $entity_type]));
+    $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as a language-aware property.', ['%entity_type' => $entity_type]));
 
     // Create property translations.
-    $properties = array();
+    $properties = [];
     $default_langcode = $langcode;
     foreach ($this->langcodes as $langcode) {
       if ($langcode != $default_langcode) {
-        $properties[$langcode] = array(
-          'name' => array(0 => $this->randomMachineName()),
-          'user_id' => array(0 => mt_rand(128, 256)),
-        );
+        $properties[$langcode] = [
+          'name' => [0 => $this->randomMachineName()],
+          'user_id' => [0 => mt_rand(128, 256)],
+        ];
       }
       else {
-        $properties[$langcode] = array(
-          'name' => array(0 => $name),
-          'user_id' => array(0 => $uid),
-        );
+        $properties[$langcode] = [
+          'name' => [0 => $name],
+          'user_id' => [0 => $uid],
+        ];
       }
       $translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $entity->addTranslation($langcode);
       foreach ($properties[$langcode] as $field_name => $values) {
@@ -226,10 +227,10 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     // Check that property translation were correctly stored.
     $entity = $storage->load($entity->id());
     foreach ($this->langcodes as $langcode) {
-      $args = array(
+      $args = [
         '%entity_type' => $entity_type,
         '%langcode' => $langcode,
-      );
+      ];
       $field = $entity->getTranslation($langcode)->get('name');
       $this->assertEqual($properties[$langcode]['name'][0], $field->value, format_string('%entity_type: The entity name has been correctly stored for language %langcode.', $args));
       $field_langcode = ($langcode == $entity->language()->getId()) ? $default_langcode : $langcode;
@@ -253,24 +254,24 @@ class EntityTranslationTest extends EntityLanguageTestBase {
       ->save();
 
     $entities = $storage->loadMultiple();
-    $this->assertEqual(count($entities), 3, format_string('%entity_type: Three entities were created.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entities), 3, format_string('%entity_type: Three entities were created.', ['%entity_type' => $entity_type]));
     $entities = $storage->loadMultiple([$translated_id]);
-    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by id.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by id.', ['%entity_type' => $entity_type]));
     $entities = $storage->loadByProperties(['name' => $name]);
-    $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities correctly loaded by name.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities correctly loaded by name.', ['%entity_type' => $entity_type]));
     // @todo The default language condition should go away in favor of an
     // explicit parameter.
     $entities = $storage->loadByProperties(['name' => $properties[$langcode]['name'][0], $default_langcode_key => 0]);
-    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name translation.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name translation.', ['%entity_type' => $entity_type]));
     $entities = $storage->loadByProperties([$langcode_key => $default_langcode, 'name' => $name]);
-    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name and language.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name and language.', ['%entity_type' => $entity_type]));
 
     $entities = $storage->loadByProperties([$langcode_key => $langcode, 'name' => $properties[$langcode]['name'][0]]);
-    $this->assertEqual(count($entities), 0, format_string('%entity_type: No entity loaded by name translation specifying the translation language.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entities), 0, format_string('%entity_type: No entity loaded by name translation specifying the translation language.', ['%entity_type' => $entity_type]));
     $entities = $storage->loadByProperties([$langcode_key => $langcode, 'name' => $properties[$langcode]['name'][0], $default_langcode_key => 0]);
-    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity loaded by name translation and language specifying to look for translations.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity loaded by name translation and language specifying to look for translations.', ['%entity_type' => $entity_type]));
     $entities = $storage->loadByProperties(['user_id' => $properties[$langcode]['user_id'][0], $default_langcode_key => NULL]);
-    $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities loaded by uid without caring about property translatability.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities loaded by uid without caring about property translatability.', ['%entity_type' => $entity_type]));
 
     // Test property conditions and orders with multiple languages in the same
     // query.
@@ -282,13 +283,13 @@ class EntityTranslationTest extends EntityLanguageTestBase {
       ->condition($group)
       ->condition('name', $properties[$langcode]['name'][0], '=', $langcode)
       ->execute();
-    $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name and uid using different language meta conditions.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name and uid using different language meta conditions.', ['%entity_type' => $entity_type]));
 
     // Test mixed property and field conditions.
     $storage->resetCache($result);
     $entity = $storage->load(reset($result));
     $field_value = $this->randomString();
-    $entity->getTranslation($langcode)->set($this->fieldName, array(array('value' => $field_value)));
+    $entity->getTranslation($langcode)->set($this->fieldName, [['value' => $field_value]]);
     $entity->save();
     $query = \Drupal::entityQuery($entity_type);
     $default_langcode_group = $query->andConditionGroup()
@@ -302,13 +303,13 @@ class EntityTranslationTest extends EntityLanguageTestBase {
       ->condition($default_langcode_group)
       ->condition($langcode_group)
       ->execute();
-    $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name, uid and field value using different language meta conditions.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name, uid and field value using different language meta conditions.', ['%entity_type' => $entity_type]));
   }
 
   /**
    * Tests the Entity Translation API behavior.
    */
-  function testEntityTranslationAPI() {
+  public function testEntityTranslationAPI() {
     // Test all entity variations with data table support.
     foreach (entity_test_entity_types(ENTITY_TEST_TYPES_MULTILINGUAL) as $entity_type) {
       $this->doTestEntityTranslationAPI($entity_type);
@@ -330,7 +331,7 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $this->entityManager
       ->getStorage($entity_type)
-      ->create(array('name' => $this->randomMachineName(), $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED));
+      ->create(['name' => $this->randomMachineName(), $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED]);
 
     $entity->save();
     $hooks = $this->getHooksInfo();
@@ -461,8 +462,8 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     $entity = $this->reloadEntity($entity);
     $translation = $entity->getTranslation($langcode2);
     $entity->removeTranslation($langcode2);
-    foreach (array('get', 'set', '__get', '__set', 'createDuplicate') as $method) {
-      $message = format_string('The @method method raises an exception when trying to manipulate a removed translation.', array('@method' => $method));
+    foreach (['get', 'set', '__get', '__set', 'createDuplicate'] as $method) {
+      $message = format_string('The @method method raises an exception when trying to manipulate a removed translation.', ['@method' => $method]);
       try {
         $translation->{$method}('name', $this->randomMachineName());
         $this->fail($message);
@@ -483,8 +484,8 @@ class EntityTranslationTest extends EntityLanguageTestBase {
 
     // Check that removing an invalid translation causes an exception to be
     // thrown.
-    foreach (array($default_langcode, LanguageInterface::LANGCODE_DEFAULT, $this->randomMachineName()) as $invalid_langcode) {
-      $message = format_string('Removing an invalid translation (@langcode) causes an exception to be thrown.', array('@langcode' => $invalid_langcode));
+    foreach ([$default_langcode, LanguageInterface::LANGCODE_DEFAULT, $this->randomMachineName()] as $invalid_langcode) {
+      $message = format_string('Removing an invalid translation (@langcode) causes an exception to be thrown.', ['@langcode' => $invalid_langcode]);
       try {
         $entity->removeTranslation($invalid_langcode);
         $this->fail($message);
@@ -565,16 +566,16 @@ class EntityTranslationTest extends EntityLanguageTestBase {
       ->getStorage('entity_test_mul_default_value')
       ->create(['name' => $this->randomMachineName(), 'langcode' => $langcode]);
     $translation = $entity->addTranslation($langcode2);
-    $expected = array(
-      array(
+    $expected = [
+      [
         'shape' => "shape:0:description_$langcode2",
         'color' => "color:0:description_$langcode2",
-      ),
-      array(
+      ],
+      [
         'shape' => "shape:1:description_$langcode2",
         'color' => "color:1:description_$langcode2",
-      ),
-    );
+      ],
+    ];
     $this->assertEqual($translation->description->getValue(), $expected, 'Language-aware default values correctly populated.');
     $this->assertEqual($translation->description->getLangcode(), $langcode2, 'Field object has the expected langcode.');
 
@@ -585,7 +586,7 @@ class EntityTranslationTest extends EntityLanguageTestBase {
   /**
    * Tests language fallback applied to field and entity translations.
    */
-  function testLanguageFallback() {
+  public function testLanguageFallback() {
     // Test all entity variations with data table support.
     foreach (entity_test_entity_types(ENTITY_TEST_TYPES_MULTILINGUAL) as $entity_type) {
       $this->doTestLanguageFallback($entity_type);
@@ -605,7 +606,7 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     $current_langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
     $this->langcodes[] = $current_langcode;
 
-    $values = array();
+    $values = [];
     foreach ($this->langcodes as $langcode) {
       $values[$langcode]['name'] = $this->randomMachineName();
       $values[$langcode]['user_id'] = mt_rand(0, 127);
@@ -622,7 +623,7 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     $this->languageManager->reset();
 
     $controller = $this->entityManager->getStorage($entity_type);
-    $entity = $controller->create(array($langcode_key => $default_langcode) + $values[$default_langcode]);
+    $entity = $controller->create([$langcode_key => $default_langcode] + $values[$default_langcode]);
     $entity->save();
 
     $entity->addTranslation($langcode, $values[$langcode]);
@@ -648,7 +649,7 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     $this->assertEqual($current_langcode, $translation->language()->getId(), 'The current translation language matches the current language.');
 
     // Check that if the entity has no translation no fallback is applied.
-    $entity2 = $controller->create(array($langcode_key => $default_langcode));
+    $entity2 = $controller->create([$langcode_key => $default_langcode]);
     // Get an view builder.
     $controller = $this->entityManager->getViewBuilder($entity_type);
     $entity2_build = $controller->view($entity2);
@@ -681,16 +682,16 @@ class EntityTranslationTest extends EntityLanguageTestBase {
   /**
    * Check that field translatability is handled properly.
    */
-  function testFieldDefinitions() {
+  public function testFieldDefinitions() {
     // Check that field translatability can be altered to be enabled or disabled
     // in field definitions.
     $entity_type = 'entity_test_mulrev';
-    $this->state->set('entity_test.field_definitions.translatable', array('name' => FALSE));
+    $this->state->set('entity_test.field_definitions.translatable', ['name' => FALSE]);
     $this->entityManager->clearCachedFieldDefinitions();
     $definitions = $this->entityManager->getBaseFieldDefinitions($entity_type);
     $this->assertFalse($definitions['name']->isTranslatable(), 'Field translatability can be disabled programmatically.');
 
-    $this->state->set('entity_test.field_definitions.translatable', array('name' => TRUE));
+    $this->state->set('entity_test.field_definitions.translatable', ['name' => TRUE]);
     $this->entityManager->clearCachedFieldDefinitions();
     $definitions = $this->entityManager->getBaseFieldDefinitions($entity_type);
     $this->assertTrue($definitions['name']->isTranslatable(), 'Field translatability can be enabled programmatically.');
@@ -701,17 +702,17 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     $this->assertFalse($definitions['id']->isTranslatable(), 'Field translatability is disabled by default.');
 
     // Check that entity id keys have the expect translatability.
-    $translatable_fields = array(
+    $translatable_fields = [
       'id' => TRUE,
       'uuid' => TRUE,
       'revision_id' => TRUE,
       'type' => TRUE,
       'langcode' => FALSE,
-    );
+    ];
     foreach ($translatable_fields as $name => $translatable) {
-      $this->state->set('entity_test.field_definitions.translatable', array($name => $translatable));
+      $this->state->set('entity_test.field_definitions.translatable', [$name => $translatable]);
       $this->entityManager->clearCachedFieldDefinitions();
-      $message = format_string('Field %field cannot be translatable.', array('%field' => $name));
+      $message = format_string('Field %field cannot be translatable.', ['%field' => $name]);
 
       try {
         $this->entityManager->getBaseFieldDefinitions($entity_type);
@@ -746,13 +747,13 @@ class EntityTranslationTest extends EntityLanguageTestBase {
 
     // check that field languages match entity language regardless of field
     // translatability.
-    $values = array(
+    $values = [
       $langcode_key => $langcode,
       $this->fieldName => $this->randomMachineName(),
       $this->untranslatableFieldName => $this->randomMachineName(),
-    );
+    ];
     $entity = $controller->create($values);
-    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
+    foreach ([$this->fieldName, $this->untranslatableFieldName] as $field_name) {
       $this->assertEqual($entity->get($field_name)->getLangcode(), $langcode, 'Field language works as expected.');
     }
 
@@ -760,16 +761,16 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     // changing it.
     $langcode = $this->langcodes[1];
     $entity->{$langcode_key}->value = $langcode;
-    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
+    foreach ([$this->fieldName, $this->untranslatableFieldName] as $field_name) {
       $this->assertEqual($entity->get($field_name)->getLangcode(), $langcode, 'Field language works as expected after changing entity language.');
     }
 
     // Check that entity translation does not affect the language of original
     // field values and untranslatable ones.
     $langcode = $this->langcodes[0];
-    $entity->addTranslation($this->langcodes[2], array($this->fieldName => $this->randomMachineName()));
+    $entity->addTranslation($this->langcodes[2], [$this->fieldName => $this->randomMachineName()]);
     $entity->{$langcode_key}->value = $langcode;
-    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
+    foreach ([$this->fieldName, $this->untranslatableFieldName] as $field_name) {
       $this->assertEqual($entity->get($field_name)->getLangcode(), $langcode, 'Field language works as expected after translating the entity and changing language.');
     }
 
@@ -788,24 +789,24 @@ class EntityTranslationTest extends EntityLanguageTestBase {
   /**
    * Tests how entity adapters work with translations.
    */
-  function testEntityAdapter() {
+  public function testEntityAdapter() {
     $entity_type = 'entity_test';
     $default_langcode = 'en';
-    $values[$default_langcode] = array('name' => $this->randomString());
+    $values[$default_langcode] = ['name' => $this->randomString()];
     $controller = $this->entityManager->getStorage($entity_type);
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $controller->create($values[$default_langcode]);
 
     foreach ($this->langcodes as $langcode) {
-      $values[$langcode] = array('name' => $this->randomString());
+      $values[$langcode] = ['name' => $this->randomString()];
       $entity->addTranslation($langcode, $values[$langcode]);
     }
 
-    $langcodes = array_merge(array($default_langcode), $this->langcodes);
+    $langcodes = array_merge([$default_langcode], $this->langcodes);
     foreach ($langcodes as $langcode) {
       $adapter = $entity->getTranslation($langcode)->getTypedData();
       $name = $adapter->get('name')->value;
-      $this->assertEqual($name, $values[$langcode]['name'], SafeMarkup::format('Name correctly retrieved from "@langcode" adapter', array('@langcode' => $langcode)));
+      $this->assertEqual($name, $values[$langcode]['name'], SafeMarkup::format('Name correctly retrieved from "@langcode" adapter', ['@langcode' => $langcode]));
     }
   }
 
@@ -878,11 +879,11 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     $field->save();
 
     // Create an entity with both translatable and untranslatable test fields.
-    $values = array(
+    $values = [
       'name' => $this->randomString(),
       'translatable_test_field' => $this->randomString(),
       'untranslatable_test_field' => $this->randomString(),
-    );
+    ];
 
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $controller->create($values);
@@ -931,4 +932,85 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     $this->assertEqual($actual, $expected_untranslatable);
   }
 
+  /**
+   * Tests the getTranslationStatus method.
+   */
+  public function testTranslationStatus() {
+    $entity_type = 'entity_test_mul';
+    $storage = $this->entityManager->getStorage($entity_type);
+
+    // Create an entity with both translatable and untranslatable test fields.
+    $values = [
+      'name' => $this->randomString(),
+      'translatable_test_field' => $this->randomString(),
+      'untranslatable_test_field' => $this->randomString(),
+    ];
+
+    /** @var \Drupal\Core\Entity\ContentEntityInterface|\Drupal\Core\TypedData\TranslationStatusInterface $entity */
+    // Test that newly created entity has the translation status
+    // TRANSLATION_CREATED.
+    $entity = $storage->create($values);
+    $this->assertEquals(TranslationStatusInterface::TRANSLATION_CREATED, $entity->getTranslationStatus($entity->language()->getId()));
+
+    // Test that after saving a newly created entity it has the translation
+    // status TRANSLATION_EXISTING.
+    $entity->save();
+    $this->assertEquals(TranslationStatusInterface::TRANSLATION_EXISTING, $entity->getTranslationStatus($entity->language()->getId()));
+
+    // Test that after loading an existing entity it has the translation status
+    // TRANSLATION_EXISTING.
+    $storage->resetCache();
+    $entity = $storage->load($entity->id());
+    $this->assertEquals(TranslationStatusInterface::TRANSLATION_EXISTING, $entity->getTranslationStatus($entity->language()->getId()));
+
+    foreach ($this->langcodes as $key => $langcode) {
+      // Test that after adding a new translation it has the translation status
+      // TRANSLATION_CREATED.
+      $entity->addTranslation($langcode, $values);
+      $this->assertEquals(TranslationStatusInterface::TRANSLATION_CREATED, $entity->getTranslationStatus($langcode));
+
+      // Test that after removing a newly added and not yet saved translation
+      // it does not have any translation status for the removed translation.
+      $entity->removeTranslation($langcode);
+      $this->assertEquals(NULL, $entity->getTranslationStatus($langcode));
+
+      // Test that after adding a new translation and saving the entity it has
+      // the translation status TRANSLATION_EXISTING.
+      $entity->addTranslation($langcode, $values)
+        ->save();
+      $this->assertEquals(TranslationStatusInterface::TRANSLATION_EXISTING, $entity->getTranslationStatus($langcode));
+
+      // Test that after removing an existing translation its translation
+      // status has changed to TRANSLATION_REMOVED.
+      $entity->removeTranslation($langcode);
+      $this->assertEquals(TranslationStatusInterface::TRANSLATION_REMOVED, $entity->getTranslationStatus($langcode));
+
+      // Test that after removing an existing translation and adding it again
+      // its translation status has changed back to TRANSLATION_EXISTING.
+      $entity->addTranslation($langcode, $values);
+      $this->assertEquals(TranslationStatusInterface::TRANSLATION_EXISTING, $entity->getTranslationStatus($langcode));
+
+      // Test that after removing an existing translation and saving the entity
+      // it does not have any translation status for the removed translation.
+      $entity->removeTranslation($langcode);
+      $entity->save();
+      $this->assertEquals(NULL, $entity->getTranslationStatus($langcode));
+
+      // Tests that after removing an existing translation, saving the entity,
+      // adding the translation again, the translation status of this
+      // translation is TRANSLATION_CREATED.
+      $entity->addTranslation($langcode, $values);
+      $this->assertEquals(TranslationStatusInterface::TRANSLATION_CREATED, $entity->getTranslationStatus($langcode));
+      $entity->save();
+    }
+
+    // Test that after loading an existing entity it has the translation status
+    // TRANSLATION_EXISTING for all of its translations.
+    $storage->resetCache();
+    $entity = $storage->load($entity->id());
+    foreach (array_keys($entity->getTranslationLanguages()) as $langcode) {
+      $this->assertEquals(TranslationStatusInterface::TRANSLATION_EXISTING, $entity->getTranslationStatus($langcode));
+    }
+  }
+
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php
index 87d76b484..3671d6d40 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php
@@ -18,7 +18,7 @@ class EntityTypeConstraintValidatorTest extends EntityKernelTestBase {
    */
   protected $typedData;
 
-  public static $modules = array('node', 'field', 'user');
+  public static $modules = ['node', 'field', 'user'];
 
   protected function setUp() {
     parent::setUp();
@@ -32,13 +32,13 @@ class EntityTypeConstraintValidatorTest extends EntityKernelTestBase {
     // Create a typed data definition with an EntityType constraint.
     $entity_type = 'node';
     $definition = DataDefinition::create('entity_reference')
-      ->setConstraints(array(
+      ->setConstraints([
         'EntityType' => $entity_type,
-      )
+      ]
     );
 
     // Test the validation.
-    $node = $this->container->get('entity.manager')->getStorage('node')->create(array('type' => 'page'));
+    $node = $this->container->get('entity.manager')->getStorage('node')->create(['type' => 'page']);
     $typed_data = $this->typedData->create($definition, $node);
     $violations = $typed_data->validate();
     $this->assertEqual($violations->count(), 0, 'Validation passed for correct value.');
@@ -53,7 +53,7 @@ class EntityTypeConstraintValidatorTest extends EntityKernelTestBase {
 
     // Make sure the information provided by a violation is correct.
     $violation = $violations[0];
-    $this->assertEqual($violation->getMessage(), t('The entity must be of type %type.', array('%type' => $entity_type)), 'The message for invalid value is correct.');
+    $this->assertEqual($violation->getMessage(), t('The entity must be of type %type.', ['%type' => $entity_type]), 'The message for invalid value is correct.');
     $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
     $this->assertEqual($violation->getInvalidValue(), $account, 'The invalid value is set correctly in the violation.');
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
index b61a6dd41..9d5095d14 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
@@ -31,7 +31,7 @@ class EntityTypedDataDefinitionTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'text', 'node', 'user');
+  public static $modules = ['filter', 'text', 'node', 'user'];
 
   protected function setUp() {
     parent::setup();
@@ -51,14 +51,14 @@ class EntityTypedDataDefinitionTest extends KernelTestBase {
     $this->assertTrue($field_item_definition instanceof ComplexDataDefinitionInterface);
 
     // Derive metadata about field item properties.
-    $this->assertEqual(array_keys($field_item_definition->getPropertyDefinitions()), array('value'));
+    $this->assertEqual(array_keys($field_item_definition->getPropertyDefinitions()), ['value']);
     $this->assertEqual($field_item_definition->getPropertyDefinition('value')->getDataType(), 'integer');
     $this->assertEqual($field_item_definition->getMainPropertyName(), 'value');
     $this->assertNull($field_item_definition->getPropertyDefinition('invalid'));
 
     // Test accessing field item property metadata via the field definition.
     $this->assertTrue($field_definition instanceof FieldDefinitionInterface);
-    $this->assertEqual(array_keys($field_definition->getPropertyDefinitions()), array('value'));
+    $this->assertEqual(array_keys($field_definition->getPropertyDefinitions()), ['value']);
     $this->assertEqual($field_definition->getPropertyDefinition('value')->getDataType(), 'integer');
     $this->assertEqual($field_definition->getMainPropertyName(), 'value');
     $this->assertNull($field_definition->getPropertyDefinition('invalid'));
@@ -106,7 +106,7 @@ class EntityTypedDataDefinitionTest extends KernelTestBase {
 
     // Config entities don't support typed data.
     $entity_definition = EntityDataDefinition::create('node_type');
-    $this->assertEqual(array(), $entity_definition->getPropertyDefinitions());
+    $this->assertEqual([], $entity_definition->getPropertyDefinitions());
   }
 
   /**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
index ae26ec590..a3466a496 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
@@ -23,7 +23,7 @@ class EntityUUIDTest extends EntityKernelTestBase {
   /**
    * Tests UUID generation in entity CRUD operations.
    */
-  function testCRUD() {
+  public function testCRUD() {
     // All entity variations have to have the same results.
     foreach (entity_test_entity_types() as $entity_type) {
       $this->assertCRUD($entity_type);
@@ -42,10 +42,10 @@ class EntityUUIDTest extends EntityKernelTestBase {
     $uuid = $uuid_service->generate();
     $custom_entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         'name' => $this->randomMachineName(),
         'uuid' => $uuid,
-      ));
+      ]);
     $this->assertIdentical($custom_entity->uuid(), $uuid);
     // Save this entity, so we have more than one later.
     $custom_entity->save();
@@ -53,7 +53,7 @@ class EntityUUIDTest extends EntityKernelTestBase {
     // Verify that a new UUID is generated upon creating an entity.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('name' => $this->randomMachineName()));
+      ->create(['name' => $this->randomMachineName()]);
     $uuid = $entity->uuid();
     $this->assertTrue($uuid);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php
index dc7d94f06..bf2a147e0 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php
@@ -16,7 +16,7 @@ class EntityValidationTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('filter', 'text');
+  public static $modules = ['filter', 'text'];
 
   /**
    * @var string
@@ -44,7 +44,7 @@ class EntityValidationTest extends EntityKernelTestBase {
     entity_test_install();
 
     // Install required default configuration for filter module.
-    $this->installConfig(array('system', 'filter'));
+    $this->installConfig(['system', 'filter']);
   }
 
   /**
@@ -123,13 +123,13 @@ class EntityValidationTest extends EntityKernelTestBase {
     $test_entity->id->value = -1;
     $violations = $test_entity->validate();
     $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('%name: The integer must be larger or equal to %min.', array('%name' => 'ID', '%min' => 0)));
+    $this->assertEqual($violations[0]->getMessage(), t('%name: The integer must be larger or equal to %min.', ['%name' => 'ID', '%min' => 0]));
 
     $test_entity = clone $entity;
     $test_entity->uuid->value = $this->randomString(129);
     $violations = $test_entity->validate();
     $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => 'UUID', '@max' => 128)));
+    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', ['%name' => 'UUID', '@max' => 128]));
 
     $test_entity = clone $entity;
     $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
@@ -137,7 +137,7 @@ class EntityValidationTest extends EntityKernelTestBase {
     $violations = $test_entity->validate();
     // This should fail on AllowedValues and Length constraints.
     $this->assertEqual($violations->count(), 2, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('This value is too long. It should have %limit characters or less.', array('%limit' => '12')));
+    $this->assertEqual($violations[0]->getMessage(), t('This value is too long. It should have %limit characters or less.', ['%limit' => '12']));
     $this->assertEqual($violations[1]->getMessage(), t('The value you selected is not a valid choice.'));
 
     $test_entity = clone $entity;
@@ -150,7 +150,7 @@ class EntityValidationTest extends EntityKernelTestBase {
     $test_entity->name->value = $this->randomString(33);
     $violations = $test_entity->validate();
     $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => 'Name', '@max' => 32)));
+    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', ['%name' => 'Name', '@max' => 32]));
 
     // Make sure the information provided by a violation is correct.
     $violation = $violations[0];
@@ -162,7 +162,7 @@ class EntityValidationTest extends EntityKernelTestBase {
     $test_entity->set('user_id', 9999);
     $violations = $test_entity->validate();
     $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%type: %id) does not exist.', array('%type' => 'user', '%id' => 9999)));
+    $this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%type: %id) does not exist.', ['%type' => 'user', '%id' => 9999]));
 
     $test_entity = clone $entity;
     $test_entity->field_test_text->format = $this->randomString(33);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
index 0143128f1..e1537bc80 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
@@ -23,7 +23,7 @@ class EntityViewBuilderTest extends EntityKernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('user', 'entity_test'));
+    $this->installConfig(['user', 'entity_test']);
 
     // Give anonymous users permission to view test entities.
     Role::load(RoleInterface::ANONYMOUS_ID)
@@ -182,7 +182,7 @@ class EntityViewBuilderTest extends EntityKernelTestBase {
 
     // Set a weight for the label component.
     entity_get_display('entity_test', 'entity_test', 'full')
-      ->setComponent('label', array('weight' => 20))
+      ->setComponent('label', ['weight' => 20])
       ->save();
 
     // Create and build a test entity.
@@ -204,10 +204,10 @@ class EntityViewBuilderTest extends EntityKernelTestBase {
    *   The created entity.
    */
   protected function createTestEntity($entity_type) {
-    $data = array(
+    $data = [
       'bundle' => $entity_type,
       'name' => $this->randomMachineName(),
-    );
+    ];
     return $this->container->get('entity.manager')->getStorage($entity_type)->create($data);
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
index 449f3f238..884ee8995 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
@@ -23,7 +23,7 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field', 'field_test', 'text', 'entity_test');
+  public static $modules = ['field', 'field_test', 'text', 'entity_test'];
 
   /**
    * The name of the created field.
@@ -80,12 +80,12 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
 
     $this->fieldName = strtolower($this->randomMachineName());
     $this->fieldCardinality = 4;
-    $this->fieldStorage = FieldStorageConfig::create(array(
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => $entity_type,
       'type' => 'test_field',
       'cardinality' => $this->fieldCardinality,
-    ));
+    ]);
     $this->fieldStorage->save();
     $this->field = FieldConfig::create([
       'field_storage' => $this->fieldStorage,
@@ -103,14 +103,14 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
   /**
    * Tests field loading works correctly by inserting directly in the tables.
    */
-  function testFieldLoad() {
+  public function testFieldLoad() {
     $entity_type = $bundle = 'entity_test_rev';
     $storage = $this->container->get('entity.manager')->getStorage($entity_type);
 
-    $columns = array('bundle', 'deleted', 'entity_id', 'revision_id', 'delta', 'langcode', $this->tableMapping->getFieldColumnName($this->fieldStorage, 'value'));
+    $columns = ['bundle', 'deleted', 'entity_id', 'revision_id', 'delta', 'langcode', $this->tableMapping->getFieldColumnName($this->fieldStorage, 'value')];
 
     // Create an entity with four revisions.
-    $revision_ids = array();
+    $revision_ids = [];
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
       ->create();
@@ -123,20 +123,20 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     }
 
     // Generate values and insert them directly in the storage tables.
-    $values = array();
+    $values = [];
     $query = db_insert($this->revisionTable)->fields($columns);
     foreach ($revision_ids as $revision_id) {
       // Put one value too many.
       for ($delta = 0; $delta <= $this->fieldCardinality; $delta++) {
         $value = mt_rand(1, 127);
         $values[$revision_id][] = $value;
-        $query->values(array($bundle, 0, $entity->id(), $revision_id, $delta, $entity->language()->getId(), $value));
+        $query->values([$bundle, 0, $entity->id(), $revision_id, $delta, $entity->language()->getId(), $value]);
       }
       $query->execute();
     }
     $query = db_insert($this->table)->fields($columns);
     foreach ($values[$revision_id] as $delta => $value) {
-      $query->values(array($bundle, 0, $entity->id(), $revision_id, $delta, $entity->language()->getId(), $value));
+      $query->values([$bundle, 0, $entity->id(), $revision_id, $delta, $entity->language()->getId(), $value]);
     }
     $query->execute();
 
@@ -167,7 +167,7 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     // Add a translation in an unavailable language code and verify it is not
     // loaded.
     $unavailable_langcode = 'xx';
-    $values = array($bundle, 0, $entity->id(), $entity->getRevisionId(), 0, $unavailable_langcode, mt_rand(1, 127));
+    $values = [$bundle, 0, $entity->id(), $entity->getRevisionId(), 0, $unavailable_langcode, mt_rand(1, 127)];
     db_insert($this->table)->fields($columns)->values($values)->execute();
     db_insert($this->revisionTable)->fields($columns)->values($values)->execute();
     $entity = $storage->load($entity->id());
@@ -177,16 +177,16 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
   /**
    * Tests field saving works correctly by reading directly from the tables.
    */
-  function testFieldWrite() {
+  public function testFieldWrite() {
     $entity_type = $bundle = 'entity_test_rev';
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
       ->create();
 
-    $revision_values = array();
+    $revision_values = [];
 
     // Check insert. Add one value too many.
-    $values = array();
+    $values = [];
     for ($delta = 0; $delta <= $this->fieldCardinality; $delta++) {
       $values[$delta]['value'] = mt_rand(1, 127);
     }
@@ -197,7 +197,7 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
     $this->assertEqual(count($rows), $this->fieldCardinality);
     foreach ($rows as $delta => $row) {
-      $expected = array(
+      $expected = [
         'bundle' => $bundle,
         'deleted' => 0,
         'entity_id' => $entity->id(),
@@ -205,13 +205,13 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
         'langcode' => $entity->language()->getId(),
         'delta' => $delta,
         $this->fieldName . '_value' => $values[$delta]['value'],
-      );
+      ];
       $this->assertEqual($row, $expected, "Row $delta was stored as expected.");
     }
 
     // Test update. Add less values and check that the previous values did not
     // persist.
-    $values = array();
+    $values = [];
     for ($delta = 0; $delta <= $this->fieldCardinality - 2; $delta++) {
       $values[$delta]['value'] = mt_rand(1, 127);
     }
@@ -220,7 +220,7 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
     $this->assertEqual(count($rows), count($values));
     foreach ($rows as $delta => $row) {
-      $expected = array(
+      $expected = [
         'bundle' => $bundle,
         'deleted' => 0,
         'entity_id' => $entity->id(),
@@ -228,13 +228,13 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
         'langcode' => $entity->language()->getId(),
         'delta' => $delta,
         $this->fieldName . '_value' => $values[$delta]['value'],
-      );
+      ];
       $this->assertEqual($row, $expected, "Row $delta was stored as expected.");
     }
 
     // Create a new revision.
     $revision_values[$entity->getRevisionId()] = $values;
-    $values = array();
+    $values = [];
     for ($delta = 0; $delta < $this->fieldCardinality; $delta++) {
       $values[$delta]['value'] = mt_rand(1, 127);
     }
@@ -248,7 +248,7 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
       $rows = db_select($this->revisionTable, 't')->fields('t')->condition('revision_id', $revision_id)->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
       $this->assertEqual(count($rows), min(count($values), $this->fieldCardinality));
       foreach ($rows as $delta => $row) {
-        $expected = array(
+        $expected = [
           'bundle' => $bundle,
           'deleted' => 0,
           'entity_id' => $entity->id(),
@@ -256,7 +256,7 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
           'langcode' => $entity->language()->getId(),
           'delta' => $delta,
           $this->fieldName . '_value' => $values[$delta]['value'],
-        );
+        ];
         $this->assertEqual($row, $expected, "Row $delta was stored as expected.");
       }
     }
@@ -271,7 +271,7 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
   /**
    * Tests that long entity type and field names do not break.
    */
-  function testLongNames() {
+  public function testLongNames() {
     // Use one of the longest entity_type names in core.
     $entity_type = $bundle = 'entity_test_label_callback';
     $this->installEntitySchema('entity_test_label_callback');
@@ -279,15 +279,15 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
 
     // Create two fields and generate random values.
     $name_base = Unicode::strtolower($this->randomMachineName(FieldStorageConfig::NAME_MAX_LENGTH - 1));
-    $field_names = array();
-    $values = array();
+    $field_names = [];
+    $values = [];
     for ($i = 0; $i < 2; $i++) {
       $field_names[$i] = $name_base . $i;
-      FieldStorageConfig::create(array(
+      FieldStorageConfig::create([
         'field_name' => $field_names[$i],
         'entity_type' => $entity_type,
         'type' => 'test_field',
-      ))->save();
+      ])->save();
       FieldConfig::create([
         'field_name' => $field_names[$i],
         'entity_type' => $entity_type,
@@ -312,15 +312,15 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
   /**
    * Test trying to update a field with data.
    */
-  function testUpdateFieldSchemaWithData() {
+  public function testUpdateFieldSchemaWithData() {
     $entity_type = 'entity_test_rev';
     // Create a decimal 5.2 field and add some data.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'decimal52',
       'entity_type' => $entity_type,
       'type' => 'decimal',
-      'settings' => array('precision' => 5, 'scale' => 2),
-    ));
+      'settings' => ['precision' => 5, 'scale' => 2],
+    ]);
     $field_storage->save();
     $field = FieldConfig::create([
       'field_storage' => $field_storage,
@@ -329,10 +329,10 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     $field->save();
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         'id' => 0,
         'revision_id' => 0,
-      ));
+      ]);
     $entity->decimal52->value = '1.235';
     $entity->save();
 
@@ -350,14 +350,14 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
   /**
    * Test that failure to create fields is handled gracefully.
    */
-  function testFieldUpdateFailure() {
+  public function testFieldUpdateFailure() {
     // Create a text field.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => 'test_text',
       'entity_type' => 'entity_test_rev',
       'type' => 'text',
-      'settings' => array('max_length' => 255),
-    ));
+      'settings' => ['max_length' => 255],
+    ]);
     $field_storage->save();
 
     // Attempt to update the field in a way that would break the storage. The
@@ -376,48 +376,48 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     }
 
     // Ensure that the field tables are still there.
-    $tables = array(
+    $tables = [
       $this->tableMapping->getDedicatedDataTableName($prior_field_storage),
       $this->tableMapping->getDedicatedRevisionTableName($prior_field_storage),
-    );
+    ];
     foreach ($tables as $table_name) {
-      $this->assertTrue(db_table_exists($table_name), t('Table %table exists.', array('%table' => $table_name)));
+      $this->assertTrue(db_table_exists($table_name), t('Table %table exists.', ['%table' => $table_name]));
     }
   }
 
   /**
    * Test adding and removing indexes while data is present.
    */
-  function testFieldUpdateIndexesWithData() {
+  public function testFieldUpdateIndexesWithData() {
     // Create a decimal field.
     $field_name = 'testfield';
     $entity_type = 'entity_test_rev';
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => $entity_type,
       'type' => 'text',
-    ));
+    ]);
     $field_storage->save();
     $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => $entity_type,
     ]);
     $field->save();
-    $tables = array($this->tableMapping->getDedicatedDataTableName($field_storage), $this->tableMapping->getDedicatedRevisionTableName($field_storage));
+    $tables = [$this->tableMapping->getDedicatedDataTableName($field_storage), $this->tableMapping->getDedicatedRevisionTableName($field_storage)];
 
     // Verify the indexes we will create do not exist yet.
     foreach ($tables as $table) {
-      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, 'value'), t("No index named value exists in @table", array('@table' => $table)));
-      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, 'value_format'), t("No index named value_format exists in @table", array('@table' => $table)));
+      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, 'value'), t("No index named value exists in @table", ['@table' => $table]));
+      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, 'value_format'), t("No index named value_format exists in @table", ['@table' => $table]));
     }
 
     // Add data so the table cannot be dropped.
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array(
+      ->create([
         'id' => 1,
         'revision_id' => 1,
-      ));
+      ]);
     $entity->$field_name->value = 'field data';
     $entity->enforceIsNew();
     $entity->save();
@@ -426,15 +426,15 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     $field_storage->setIndexes(['value' => [['value', 255]]]);
     $field_storage->save();
     foreach ($tables as $table) {
-      $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), t("Index on value created in @table", array('@table' => $table)));
+      $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), t("Index on value created in @table", ['@table' => $table]));
     }
 
     // Add a different index, removing the existing custom one.
     $field_storage->setIndexes(['value_format' => [['value', 127], ['format', 127]]]);
     $field_storage->save();
     foreach ($tables as $table) {
-      $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value_format"), t("Index on value_format created in @table", array('@table' => $table)));
-      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), t("Index on value removed in @table", array('@table' => $table)));
+      $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value_format"), t("Index on value_format created in @table", ['@table' => $table]));
+      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), t("Index on value removed in @table", ['@table' => $table]));
     }
 
     // Verify that the tables were not dropped in the process.
@@ -445,17 +445,17 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
   /**
    * Test foreign key support.
    */
-  function testFieldSqlStorageForeignKeys() {
+  public function testFieldSqlStorageForeignKeys() {
     // Create a 'shape' field, with a configurable foreign key (see
     // field_test_field_schema()).
     $field_name = 'testfield';
     $foreign_key_name = 'shape';
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'shape',
-      'settings' => array('foreign_key_name' => $foreign_key_name),
-    ));
+      'settings' => ['foreign_key_name' => $foreign_key_name],
+    ]);
     $field_storage->save();
     // Get the field schema.
     $schema = $field_storage->getSchema();
@@ -487,11 +487,11 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     // Short entity type and field name.
     $entity_type = 'short_entity_type';
     $field_name = 'short_field_name';
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'entity_type' => $entity_type,
       'field_name' => $field_name,
       'type' => 'test_field',
-    ));
+    ]);
     $expected = 'short_entity_type__short_field_name';
     $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
     $expected = 'short_entity_type_revision__short_field_name';
@@ -500,11 +500,11 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     // Short entity type, long field name
     $entity_type = 'short_entity_type';
     $field_name = 'long_field_name_abcdefghijklmnopqrstuvwxyz';
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'entity_type' => $entity_type,
       'field_name' => $field_name,
       'type' => 'test_field',
-    ));
+    ]);
     $expected = 'short_entity_type__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
     $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
     $expected = 'short_entity_type_r__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
@@ -513,11 +513,11 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     // Long entity type, short field name
     $entity_type = 'long_entity_type_abcdefghijklmnopqrstuvwxyz';
     $field_name = 'short_field_name';
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'entity_type' => $entity_type,
       'field_name' => $field_name,
       'type' => 'test_field',
-    ));
+    ]);
     $expected = 'long_entity_type_abcdefghijklmnopq__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
     $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
     $expected = 'long_entity_type_abcdefghijklmnopq_r__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
@@ -526,31 +526,31 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
     // Long entity type and field name.
     $entity_type = 'long_entity_type_abcdefghijklmnopqrstuvwxyz';
     $field_name = 'long_field_name_abcdefghijklmnopqrstuvwxyz';
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'entity_type' => $entity_type,
       'field_name' => $field_name,
       'type' => 'test_field',
-    ));
+    ]);
     $expected = 'long_entity_type_abcdefghijklmnopq__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
     $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
     $expected = 'long_entity_type_abcdefghijklmnopq_r__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
     $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $expected);
     // Try creating a second field and check there are no clashes.
-    $field_storage2 = FieldStorageConfig::create(array(
+    $field_storage2 = FieldStorageConfig::create([
       'entity_type' => $entity_type,
       'field_name' => $field_name . '2',
       'type' => 'test_field',
-    ));
+    ]);
     $this->assertNotEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $this->tableMapping->getDedicatedDataTableName($field_storage2));
     $this->assertNotEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $this->tableMapping->getDedicatedRevisionTableName($field_storage2));
 
     // Deleted field.
-    $field_storage = FieldStorageConfig::create(array(
+    $field_storage = FieldStorageConfig::create([
       'entity_type' => 'some_entity_type',
       'field_name' => 'some_field_name',
       'type' => 'test_field',
       'deleted' => TRUE,
-    ));
+    ]);
     $expected = 'field_deleted_data_' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
     $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage, TRUE), $expected);
     $expected = 'field_deleted_revision_' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldTranslationSqlStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldTranslationSqlStorageTest.php
index b301c64f5..c398732f3 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldTranslationSqlStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldTranslationSqlStorageTest.php
@@ -20,10 +20,10 @@ class FieldTranslationSqlStorageTest extends EntityLanguageTestBase {
     $entity_type = 'entity_test_mul';
 
     $controller = $this->entityManager->getStorage($entity_type);
-    $values = array(
+    $values = [
       $this->fieldName => $this->randomMachineName(),
       $this->untranslatableFieldName => $this->randomMachineName(),
-    );
+    ];
     $entity = $controller->create($values);
     $entity->save();
 
@@ -45,7 +45,7 @@ class FieldTranslationSqlStorageTest extends EntityLanguageTestBase {
     // before.
     $this->toggleFieldTranslatability($entity_type, $entity_type);
     $entity = $this->reloadEntity($entity);
-    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
+    foreach ([$this->fieldName, $this->untranslatableFieldName] as $field_name) {
       $this->assertEqual($entity->get($field_name)->value, $values[$field_name], 'Field language works as expected after switching translatability.');
     }
 
@@ -76,7 +76,7 @@ class FieldTranslationSqlStorageTest extends EntityLanguageTestBase {
     $entity_type = $entity->getEntityTypeId();
     $id = $entity->id();
     $langcode = $entity->getUntranslated()->language()->getId();
-    $fields = array($this->fieldName, $this->untranslatableFieldName);
+    $fields = [$this->fieldName, $this->untranslatableFieldName];
     /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
     $table_mapping = \Drupal::entityManager()->getStorage($entity_type)->getTableMapping();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php
index 50d173bc2..5ae824b71 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php
@@ -15,7 +15,7 @@ use Drupal\KernelTests\KernelTestBase;
  */
 class FieldWidgetConstraintValidatorTest extends KernelTestBase {
 
-  public static $modules = array('entity_test', 'field', 'user', 'system');
+  public static $modules = ['entity_test', 'field', 'user', 'system'];
 
   /**
    * {@inheritdoc}
@@ -37,9 +37,9 @@ class FieldWidgetConstraintValidatorTest extends KernelTestBase {
     $entity_type = 'entity_test_constraint_violation';
     $entity = $this->container->get('entity_type.manager')
       ->getStorage($entity_type)
-      ->create(array('id' => 1, 'revision_id' => 1));
+      ->create(['id' => 1, 'revision_id' => 1]);
     $display = entity_get_form_display($entity_type, $entity_type, 'default');
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $display->buildForm($entity, $form, $form_state);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/ValidReferenceConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/ValidReferenceConstraintValidatorTest.php
index 64bb933dd..a365ea580 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/ValidReferenceConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/ValidReferenceConstraintValidatorTest.php
@@ -21,14 +21,14 @@ class ValidReferenceConstraintValidatorTest extends EntityKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('field', 'user');
+  public static $modules = ['field', 'user'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('user', array('users_data'));
+    $this->installSchema('user', ['users_data']);
     $this->typedData = $this->container->get('typed_data_manager');
   }
 
@@ -40,18 +40,18 @@ class ValidReferenceConstraintValidatorTest extends EntityKernelTestBase {
     $entity = $this->createUser();
     // By default entity references already have the ValidReference constraint.
     $definition = BaseFieldDefinition::create('entity_reference')
-      ->setSettings(array('target_type' => 'user'));
+      ->setSettings(['target_type' => 'user']);
 
-    $typed_data = $this->typedData->create($definition, array('target_id' => $entity->id()));
+    $typed_data = $this->typedData->create($definition, ['target_id' => $entity->id()]);
     $violations = $typed_data->validate();
     $this->assertFalse($violations->count(), 'Validation passed for correct value.');
 
     // NULL is also considered a valid reference.
-    $typed_data = $this->typedData->create($definition, array('target_id' => NULL));
+    $typed_data = $this->typedData->create($definition, ['target_id' => NULL]);
     $violations = $typed_data->validate();
     $this->assertFalse($violations->count(), 'Validation passed for correct value.');
 
-    $typed_data = $this->typedData->create($definition, array('target_id' => $entity->id()));
+    $typed_data = $this->typedData->create($definition, ['target_id' => $entity->id()]);
     // Delete the referenced entity.
     $entity->delete();
     $violations = $typed_data->validate();
@@ -59,10 +59,10 @@ class ValidReferenceConstraintValidatorTest extends EntityKernelTestBase {
 
     // Make sure the information provided by a violation is correct.
     $violation = $violations[0];
-    $this->assertEqual($violation->getMessage(), t('The referenced entity (%type: %id) does not exist.', array(
+    $this->assertEqual($violation->getMessage(), t('The referenced entity (%type: %id) does not exist.', [
       '%type' => 'user',
       '%id' => $entity->id(),
-    )), 'The message for invalid value is correct.');
+    ]), 'The message for invalid value is correct.');
     $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/EventSubscriber/IgnoreReplicaSubscriberTest.php b/web/core/tests/Drupal/KernelTests/Core/EventSubscriber/IgnoreReplicaSubscriberTest.php
index 51315372f..4206ceab8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/EventSubscriber/IgnoreReplicaSubscriberTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/EventSubscriber/IgnoreReplicaSubscriberTest.php
@@ -20,7 +20,7 @@ class IgnoreReplicaSubscriberTest extends KernelTestBase {
   /**
    * Tests \Drupal\Core\EventSubscriber\ReplicaDatabaseIgnoreSubscriber::checkReplicaServer().
    */
-  function testSystemInitIgnoresSecondaries() {
+  public function testSystemInitIgnoresSecondaries() {
     // Clone the master credentials to a replica connection.
     // Note this will result in two independent connection objects that happen
     // to point to the same place.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php b/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php
new file mode 100644
index 000000000..96e469a84
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Extension;
+
+use Drupal\KernelTests\FileSystemModuleDiscoveryDataProviderTrait;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the configure route for core modules.
+ *
+ * @group Module
+ */
+class ModuleConfigureRouteTest extends KernelTestBase {
+
+  use FileSystemModuleDiscoveryDataProviderTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'user'];
+
+  /**
+   * @var \Drupal\Core\Routing\RouteProviderInterface
+   */
+  protected $routeProvider;
+
+  /**
+   * An array of module info.
+   *
+   * @var array
+   */
+  protected $moduleInfo;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->routeProvider = \Drupal::service('router.route_provider');
+    $this->moduleInfo = system_rebuild_module_data();
+  }
+
+  /**
+   * Test the module configure routes exist.
+   *
+   * @dataProvider coreModuleListDataProvider
+   */
+  public function testModuleConfigureRoutes($module) {
+    $module_info = $this->moduleInfo[$module]->info;
+    if (isset($module_info['configure'])) {
+      $this->container->get('module_installer')->install([$module]);
+      $route = $this->routeProvider->getRouteByName($module_info['configure']);
+      $this->assertNotEmpty($route, sprintf('The configure route for the "%s" module was found.', $module));
+    }
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php b/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php
index f55d744f7..7d29a2612 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php
@@ -22,7 +22,7 @@ class ModuleImplementsAlterTest extends KernelTestBase {
    * @see \Drupal\Core\Extension\ModuleHandler::buildImplementationInfo()
    * @see module_test_module_implements_alter()
    */
-  function testModuleImplementsAlter() {
+  public function testModuleImplementsAlter() {
 
     // Get an instance of the module handler, to observe how it is going to be
     // replaced.
@@ -32,7 +32,7 @@ class ModuleImplementsAlterTest extends KernelTestBase {
       'Module handler instance is still the same.');
 
     // Install the module_test module.
-    \Drupal::service('module_installer')->install(array('module_test'));
+    \Drupal::service('module_installer')->install(['module_test']);
 
     // Assert that the \Drupal::moduleHandler() instance has been replaced.
     $this->assertFalse($module_handler === \Drupal::moduleHandler(),
@@ -73,10 +73,10 @@ class ModuleImplementsAlterTest extends KernelTestBase {
    * @see \Drupal\Core\Extension\ModuleHandler::buildImplementationInfo()
    * @see module_test_module_implements_alter()
    */
-  function testModuleImplementsAlterNonExistingImplementation() {
+  public function testModuleImplementsAlterNonExistingImplementation() {
 
     // Install the module_test module.
-    \Drupal::service('module_installer')->install(array('module_test'));
+    \Drupal::service('module_installer')->install(['module_test']);
 
     try {
       // Trigger hook discovery.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php b/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
index 5a59a2357..f273029bf 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
@@ -34,7 +34,7 @@ class FieldAccessTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
     // Install field configuration.
-    $this->installConfig(array('field'));
+    $this->installConfig(['field']);
     // The users table is needed for creating dummy user accounts.
     $this->installEntitySchema('user');
     // Register entity_test text field.
@@ -48,19 +48,19 @@ class FieldAccessTest extends KernelTestBase {
    * @see entity_test_entity_field_access()
    * @see entity_test_entity_field_access_alter()
    */
-  function testFieldAccess() {
-    $values = array(
+  public function testFieldAccess() {
+    $values = [
       'name' => $this->randomMachineName(),
       'user_id' => 1,
-      'field_test_text' => array(
+      'field_test_text' => [
         'value' => 'no access value',
         'format' => 'full_html',
-      ),
-    );
+      ],
+    ];
     $entity = EntityTest::create($values);
 
     // Create a dummy user account for testing access with.
-    $values = array('name' => 'test');
+    $values = ['name' => 'test'];
     $account = User::create($values);
 
     $this->assertFalse($entity->field_test_text->access('view', $account), 'Access to the field was denied.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php
index af2fb07e2..b9d545e29 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php
@@ -73,7 +73,7 @@ class FieldModuleUninstallValidatorTest extends EntityKernelTestBase {
 
     try {
       $message = 'Module uninstallation fails as the module provides a base field which has content.';
-      $this->getModuleInstaller()->uninstall(array('entity_test_extra'));
+      $this->getModuleInstaller()->uninstall(['entity_test_extra']);
       $this->fail($message);
     }
     catch (ModuleUninstallValidatorException $e) {
@@ -93,7 +93,7 @@ class FieldModuleUninstallValidatorTest extends EntityKernelTestBase {
     ]);
     $entity->save();
     try {
-      $this->getModuleInstaller()->uninstall(array('entity_test_extra'));
+      $this->getModuleInstaller()->uninstall(['entity_test_extra']);
       $this->fail('Module uninstallation fails as the module provides a bundle field which has content.');
     }
     catch (ModuleUninstallValidatorException $e) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php b/web/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php
index a55888f61..583e55b7c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php
@@ -19,7 +19,7 @@ class FieldSettingsTest extends EntityKernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('field', 'field_test');
+  public static $modules = ['field', 'field_test'];
 
   /**
    * @covers \Drupal\Core\Field\BaseFieldDefinition::getSettings
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
index d7e7c382f..4e3582169 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
@@ -14,7 +14,7 @@ class DirectoryTest extends FileTestBase {
   /**
    * Test local directory handling functions.
    */
-  function testFileCheckLocalDirectoryHandling() {
+  public function testFileCheckLocalDirectoryHandling() {
     $site_path = $this->container->get('site.path');
     $directory = $site_path . '/files';
 
@@ -53,7 +53,7 @@ class DirectoryTest extends FileTestBase {
   /**
    * Test directory handling functions.
    */
-  function testFileCheckDirectoryHandling() {
+  public function testFileCheckDirectoryHandling() {
     // A directory to operate on.
     $directory = file_default_scheme() . '://' . $this->randomMachineName() . '/' . $this->randomMachineName();
     $this->assertFalse(is_dir($directory), 'Directory does not exist prior to testing.');
@@ -99,21 +99,21 @@ class DirectoryTest extends FileTestBase {
    * This will take a directory and path, and find a valid filepath that is not
    * taken by another file.
    */
-  function testFileCreateNewFilepath() {
+  public function testFileCreateNewFilepath() {
     // First we test against an imaginary file that does not exist in a
     // directory.
     $basename = 'xyz.txt';
     $directory = 'core/misc';
     $original = $directory . '/' . $basename;
     $path = file_create_filename($basename, $directory);
-    $this->assertEqual($path, $original, format_string('New filepath %new equals %original.', array('%new' => $path, '%original' => $original)), 'File');
+    $this->assertEqual($path, $original, format_string('New filepath %new equals %original.', ['%new' => $path, '%original' => $original]), 'File');
 
     // Then we test against a file that already exists within that directory.
     $basename = 'druplicon.png';
     $original = $directory . '/' . $basename;
     $expected = $directory . '/druplicon_0.png';
     $path = file_create_filename($basename, $directory);
-    $this->assertEqual($path, $expected, format_string('Creating a new filepath from %original equals %new (expected %expected).', array('%new' => $path, '%original' => $original, '%expected' => $expected)), 'File');
+    $this->assertEqual($path, $expected, format_string('Creating a new filepath from %original equals %new (expected %expected).', ['%new' => $path, '%original' => $original, '%expected' => $expected]), 'File');
 
     // @TODO: Finally we copy a file into a directory several times, to ensure a properly iterating filename suffix.
   }
@@ -130,7 +130,7 @@ class DirectoryTest extends FileTestBase {
    * If the file doesn't currently exist, then it will simply return the
    * filepath.
    */
-  function testFileDestination() {
+  public function testFileDestination() {
     // First test for non-existent file.
     $destination = 'core/misc/xyz.txt';
     $path = file_destination($destination, FILE_EXISTS_REPLACE);
@@ -152,7 +152,7 @@ class DirectoryTest extends FileTestBase {
   /**
    * Ensure that the file_directory_temp() function always returns a value.
    */
-  function testFileDirectoryTemp() {
+  public function testFileDirectoryTemp() {
     // Start with an empty variable to ensure we have a clean slate.
     $config = $this->config('system.file');
     $config->set('path.temporary', '')->save();
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php b/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
index 548d1bcf9..92612ae7f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
@@ -16,7 +16,7 @@ abstract class FileTestBase extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * A stream wrapper scheme to register for the test.
@@ -37,7 +37,11 @@ abstract class FileTestBase extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-
+    // \Drupal\KernelTests\KernelTestBase::bootKernel() sets a global override
+    // for the default scheme because core relies on it in
+    // file_default_scheme(). As we are creating the configuration here remove
+    // the global override.
+    unset($GLOBALS['config']['system.file']);
     \Drupal::configFactory()->getEditable('system.file')->set('default_scheme', 'public')->save();
   }
 
@@ -70,9 +74,9 @@ abstract class FileTestBase extends KernelTestBase {
 
     $this->setSetting('file_public_path', $public_file_directory);
 
-    $GLOBALS['config_directories'] = array(
+    $GLOBALS['config_directories'] = [
       CONFIG_SYNC_DIRECTORY => $this->siteDirectory . '/files/config/sync',
-    );
+    ];
   }
 
   /**
@@ -85,7 +89,7 @@ abstract class FileTestBase extends KernelTestBase {
    * @param $message
    *   Optional message.
    */
-  function assertFilePermissions($filepath, $expected_mode, $message = NULL) {
+  public function assertFilePermissions($filepath, $expected_mode, $message = NULL) {
     // Clear out PHP's file stat cache to be sure we see the current value.
     clearstatcache(TRUE, $filepath);
 
@@ -105,7 +109,7 @@ abstract class FileTestBase extends KernelTestBase {
     }
 
     if (!isset($message)) {
-      $message = t('Expected file permission to be %expected, actually were %actual.', array('%actual' => decoct($actual_mode), '%expected' => decoct($expected_mode)));
+      $message = t('Expected file permission to be %expected, actually were %actual.', ['%actual' => decoct($actual_mode), '%expected' => decoct($expected_mode)]);
     }
     $this->assertEqual($actual_mode, $expected_mode, $message);
   }
@@ -120,7 +124,7 @@ abstract class FileTestBase extends KernelTestBase {
    * @param $message
    *   Optional message.
    */
-  function assertDirectoryPermissions($directory, $expected_mode, $message = NULL) {
+  public function assertDirectoryPermissions($directory, $expected_mode, $message = NULL) {
     // Clear out PHP's file stat cache to be sure we see the current value.
     clearstatcache(TRUE, $directory);
 
@@ -141,7 +145,7 @@ abstract class FileTestBase extends KernelTestBase {
     }
 
     if (!isset($message)) {
-      $message = t('Expected directory permission to be %expected, actually were %actual.', array('%actual' => decoct($actual_mode), '%expected' => decoct($expected_mode)));
+      $message = t('Expected directory permission to be %expected, actually were %actual.', ['%actual' => decoct($actual_mode), '%expected' => decoct($expected_mode)]);
     }
     $this->assertEqual($actual_mode, $expected_mode, $message);
   }
@@ -155,7 +159,7 @@ abstract class FileTestBase extends KernelTestBase {
    * @return
    *   The path to the directory.
    */
-  function createDirectory($path = NULL) {
+  public function createDirectory($path = NULL) {
     // A directory to operate on.
     if (!isset($path)) {
       $path = file_default_scheme() . '://' . $this->randomMachineName();
@@ -179,7 +183,7 @@ abstract class FileTestBase extends KernelTestBase {
    * @return
    *   File URI.
    */
-  function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
+  public function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
     if (!isset($filepath)) {
       // Prefix with non-latin characters to ensure that all file-related
       // tests work with international filenames.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/HtaccessTest.php b/web/core/tests/Drupal/KernelTests/Core/File/HtaccessTest.php
index 0ef507802..0c4c1eb7d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/HtaccessTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/HtaccessTest.php
@@ -16,7 +16,7 @@ class HtaccessTest extends KernelTestBase {
   /**
    * Tests file_save_htaccess().
    */
-  function testHtaccessSave() {
+  public function testHtaccessSave() {
     // Prepare test directories.
     $public = Settings::get('file_public_path') . '/test/public';
     $private = Settings::get('file_public_path') . '/test/private';
@@ -82,11 +82,11 @@ class HtaccessTest extends KernelTestBase {
    */
   protected function assertFilePermissions($uri, $expected) {
     $actual = fileperms($uri) & 0777;
-    return $this->assertIdentical($actual, $expected, SafeMarkup::format('@uri file permissions @actual are identical to @expected.', array(
+    return $this->assertIdentical($actual, $expected, SafeMarkup::format('@uri file permissions @actual are identical to @expected.', [
       '@uri' => $uri,
       '@actual' => 0 . decoct($actual),
       '@expected' => 0 . decoct($expected),
-    )));
+    ]));
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php b/web/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php
index 9bfe68154..05ac7c255 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php
@@ -14,7 +14,7 @@ class MimeTypeTest extends FileTestBase {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * Test mapping of mimetypes from filenames.
@@ -22,7 +22,7 @@ class MimeTypeTest extends FileTestBase {
   public function testFileMimeTypeDetection() {
     $prefixes = ['public://', 'private://', 'temporary://', 'dummy-remote://'];
 
-    $test_case = array(
+    $test_case = [
       'test.jar' => 'application/java-archive',
       'test.jpeg' => 'image/jpeg',
       'test.JPEG' => 'image/jpeg',
@@ -37,7 +37,7 @@ class MimeTypeTest extends FileTestBase {
       'foo.file_test_2' => 'madeup/file_test_2',
       'foo.doc' => 'madeup/doc',
       'test.ogg' => 'audio/ogg',
-    );
+    ];
 
     $guesser = $this->container->get('file.mime_type.guesser');
     // Test using default mappings.
@@ -45,27 +45,27 @@ class MimeTypeTest extends FileTestBase {
       // Test stream [URI].
       foreach ($prefixes as $prefix) {
         $output = $guesser->guess($prefix . $input);
-        $this->assertIdentical($output, $expected, format_string('Mimetype for %input is %output (expected: %expected).', array('%input' => $prefix . $input, '%output' => $output, '%expected' => $expected)));
+        $this->assertIdentical($output, $expected, format_string('Mimetype for %input is %output (expected: %expected).', ['%input' => $prefix . $input, '%output' => $output, '%expected' => $expected]));
       }
 
       // Test normal path equivalent
       $output = $guesser->guess($input);
-      $this->assertIdentical($output, $expected, format_string('Mimetype (using default mappings) for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
+      $this->assertIdentical($output, $expected, format_string('Mimetype (using default mappings) for %input is %output (expected: %expected).', ['%input' => $input, '%output' => $output, '%expected' => $expected]));
     }
 
     // Now test the extension gusser by passing in a custom mapping.
-    $mapping = array(
-      'mimetypes' => array(
+    $mapping = [
+      'mimetypes' => [
         0 => 'application/java-archive',
         1 => 'image/jpeg',
-      ),
-      'extensions' => array(
+      ],
+      'extensions' => [
          'jar' => 0,
          'jpg' => 1,
-      )
-    );
+      ]
+    ];
 
-    $test_case = array(
+    $test_case = [
       'test.jar' => 'application/java-archive',
       'test.jpeg' => 'application/octet-stream',
       'test.jpg' => 'image/jpeg',
@@ -79,13 +79,13 @@ class MimeTypeTest extends FileTestBase {
       'foo.file_test_2' => 'application/octet-stream',
       'foo.doc' => 'application/octet-stream',
       'test.ogg' => 'application/octet-stream',
-    );
+    ];
     $extension_guesser = $this->container->get('file.mime_type.guesser.extension');
     $extension_guesser->setMapping($mapping);
 
     foreach ($test_case as $input => $expected) {
       $output = $extension_guesser->guess($input);
-      $this->assertIdentical($output, $expected, format_string('Mimetype (using passed-in mappings) for %input is %output (expected: %expected).', array('%input' => $input, '%output' => $output, '%expected' => $expected)));
+      $this->assertIdentical($output, $expected, format_string('Mimetype (using passed-in mappings) for %input is %output (expected: %expected).', ['%input' => $input, '%output' => $output, '%expected' => $expected]));
     }
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php b/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
index 1fff41e2f..422f294a3 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
@@ -34,19 +34,19 @@ class NameMungingTest extends FileTestBase {
   /**
    * Create a file and munge/unmunge the name.
    */
-  function testMunging() {
+  public function testMunging() {
     // Disable insecure uploads.
     $this->config('system.file')->set('allow_insecure_uploads', 0)->save();
     $munged_name = file_munge_filename($this->name, '', TRUE);
     $messages = drupal_get_messages();
-    $this->assertTrue(in_array(strtr('For security reasons, your upload has been renamed to <em class="placeholder">%filename</em>.', array('%filename' => $munged_name)), $messages['status']), 'Alert properly set when a file is renamed.');
-    $this->assertNotEqual($munged_name, $this->name, format_string('The new filename (%munged) has been modified from the original (%original)', array('%munged' => $munged_name, '%original' => $this->name)));
+    $this->assertTrue(in_array(strtr('For security reasons, your upload has been renamed to <em class="placeholder">%filename</em>.', ['%filename' => $munged_name]), $messages['status']), 'Alert properly set when a file is renamed.');
+    $this->assertNotEqual($munged_name, $this->name, format_string('The new filename (%munged) has been modified from the original (%original)', ['%munged' => $munged_name, '%original' => $this->name]));
   }
 
   /**
    * Tests munging with a null byte in the filename.
    */
-  function testMungeNullByte() {
+  public function testMungeNullByte() {
     $prefix = $this->randomMachineName();
     $filename = $prefix . '.' . $this->badExtension . "\0.txt";
     $this->assertEqual(file_munge_filename($filename, ''), $prefix . '.' . $this->badExtension . '_.txt', 'A filename with a null byte is correctly munged to remove the null byte.');
@@ -56,32 +56,32 @@ class NameMungingTest extends FileTestBase {
    * If the system.file.allow_insecure_uploads setting evaluates to true, the file should
    * come out untouched, no matter how evil the filename.
    */
-  function testMungeIgnoreInsecure() {
+  public function testMungeIgnoreInsecure() {
     $this->config('system.file')->set('allow_insecure_uploads', 1)->save();
     $munged_name = file_munge_filename($this->name, '');
-    $this->assertIdentical($munged_name, $this->name, format_string('The original filename (%original) matches the munged filename (%munged) when insecure uploads are enabled.', array('%munged' => $munged_name, '%original' => $this->name)));
+    $this->assertIdentical($munged_name, $this->name, format_string('The original filename (%original) matches the munged filename (%munged) when insecure uploads are enabled.', ['%munged' => $munged_name, '%original' => $this->name]));
   }
 
   /**
    * White listed extensions are ignored by file_munge_filename().
    */
-  function testMungeIgnoreWhitelisted() {
+  public function testMungeIgnoreWhitelisted() {
     // Declare our extension as whitelisted. The declared extensions should
     // be case insensitive so test using one with a different case.
     $munged_name = file_munge_filename($this->nameWithUcExt, $this->badExtension);
-    $this->assertIdentical($munged_name, $this->nameWithUcExt, format_string('The new filename (%munged) matches the original (%original) once the extension has been whitelisted.', array('%munged' => $munged_name, '%original' => $this->nameWithUcExt)));
+    $this->assertIdentical($munged_name, $this->nameWithUcExt, format_string('The new filename (%munged) matches the original (%original) once the extension has been whitelisted.', ['%munged' => $munged_name, '%original' => $this->nameWithUcExt]));
     // The allowed extensions should also be normalized.
     $munged_name = file_munge_filename($this->name, strtoupper($this->badExtension));
-    $this->assertIdentical($munged_name, $this->name, format_string('The new filename (%munged) matches the original (%original) also when the whitelisted extension is in uppercase.', array('%munged' => $munged_name, '%original' => $this->name)));
+    $this->assertIdentical($munged_name, $this->name, format_string('The new filename (%munged) matches the original (%original) also when the whitelisted extension is in uppercase.', ['%munged' => $munged_name, '%original' => $this->name]));
   }
 
   /**
    * Ensure that unmunge gets your name back.
    */
-  function testUnMunge() {
+  public function testUnMunge() {
     $munged_name = file_munge_filename($this->name, '', FALSE);
     $unmunged_name = file_unmunge_filename($munged_name);
-    $this->assertIdentical($unmunged_name, $this->name, format_string('The unmunged (%unmunged) filename matches the original (%original)', array('%unmunged' => $unmunged_name, '%original' => $this->name)));
+    $this->assertIdentical($unmunged_name, $this->name, format_string('The unmunged (%unmunged) filename matches the original (%original)', ['%unmunged' => $unmunged_name, '%original' => $this->name]));
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php b/web/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php
index ae19e0216..00dfa0b8d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php
@@ -29,7 +29,7 @@ class ReadOnlyStreamWrapperTest extends FileTestBase {
   /**
    * Test read-only specific behavior.
    */
-  function testReadOnlyBehavior() {
+  public function testReadOnlyBehavior() {
     $type = DummyReadOnlyStreamWrapper::getType();
     // Checks that the stream wrapper type is not declared as writable.
     $this->assertSame(0, $type & StreamWrapperInterface::WRITE);
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php
index 3265562b9..e41fb74e2 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php
@@ -14,7 +14,7 @@ class RemoteFileDirectoryTest extends DirectoryTest {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * A stream wrapper scheme to register for the test.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php
index 3d872bce2..e3c68a72f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php
@@ -14,7 +14,7 @@ class RemoteFileScanDirectoryTest extends ScanDirectoryTest {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * A stream wrapper scheme to register for the test.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php
index 8be67268d..b13b92cba 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php
@@ -14,7 +14,7 @@ class RemoteFileUnmanagedCopyTest extends UnmanagedCopyTest {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * A stream wrapper scheme to register for the test.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteRecursiveTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteRecursiveTest.php
index 06f0e1aa2..6be98df4a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteRecursiveTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteRecursiveTest.php
@@ -14,7 +14,7 @@ class RemoteFileUnmanagedDeleteRecursiveTest extends UnmanagedDeleteRecursiveTes
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * A stream wrapper scheme to register for the test.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteTest.php
index fe0ad6edb..f826d4dd2 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteTest.php
@@ -14,7 +14,7 @@ class RemoteFileUnmanagedDeleteTest extends UnmanagedDeleteTest {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * A stream wrapper scheme to register for the test.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedMoveTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedMoveTest.php
index 47b66f237..e41f87e69 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedMoveTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedMoveTest.php
@@ -14,7 +14,7 @@ class RemoteFileUnmanagedMoveTest extends UnmanagedMoveTest {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * A stream wrapper scheme to register for the test.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedSaveDataTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedSaveDataTest.php
index 15b592958..817da2828 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedSaveDataTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedSaveDataTest.php
@@ -14,7 +14,7 @@ class RemoteFileUnmanagedSaveDataTest extends UnmanagedSaveDataTest {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * A stream wrapper scheme to register for the test.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php
index 8362c041a..0bd546bbe 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php
@@ -14,7 +14,7 @@ class ScanDirectoryTest extends FileTestBase {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * @var string
@@ -33,7 +33,7 @@ class ScanDirectoryTest extends FileTestBase {
   /**
    * Check the format of the returned values.
    */
-  function testReturn() {
+  public function testReturn() {
     // Grab a listing of all the JavaScript files and check that they're
     // passed to the callback.
     $all_files = file_scan_directory($this->path, '/^javascript-/');
@@ -58,10 +58,10 @@ class ScanDirectoryTest extends FileTestBase {
   /**
    * Check that the callback function is called correctly.
    */
-  function testOptionCallback() {
+  public function testOptionCallback() {
 
     // When nothing is matched nothing should be passed to the callback.
-    $all_files = file_scan_directory($this->path, '/^NONEXISTINGFILENAME/', array('callback' => 'file_test_file_scan_callback'));
+    $all_files = file_scan_directory($this->path, '/^NONEXISTINGFILENAME/', ['callback' => 'file_test_file_scan_callback']);
     $this->assertEqual(0, count($all_files), 'No files were found.');
     $results = file_test_file_scan_callback();
     file_test_file_scan_callback_reset();
@@ -69,7 +69,7 @@ class ScanDirectoryTest extends FileTestBase {
 
     // Grab a listing of all the JavaScript files and check that they're
     // passed to the callback.
-    $all_files = file_scan_directory($this->path, '/^javascript-/', array('callback' => 'file_test_file_scan_callback'));
+    $all_files = file_scan_directory($this->path, '/^javascript-/', ['callback' => 'file_test_file_scan_callback']);
     $this->assertEqual(2, count($all_files), 'Found two, expected javascript files.');
     $results = file_test_file_scan_callback();
     file_test_file_scan_callback_reset();
@@ -79,41 +79,41 @@ class ScanDirectoryTest extends FileTestBase {
   /**
    * Check that the no-mask parameter is honored.
    */
-  function testOptionNoMask() {
+  public function testOptionNoMask() {
     // Grab a listing of all the JavaScript files.
     $all_files = file_scan_directory($this->path, '/^javascript-/');
     $this->assertEqual(2, count($all_files), 'Found two, expected javascript files.');
 
     // Now use the nomask parameter to filter out the .script file.
-    $filtered_files = file_scan_directory($this->path, '/^javascript-/', array('nomask' => '/.script$/'));
+    $filtered_files = file_scan_directory($this->path, '/^javascript-/', ['nomask' => '/.script$/']);
     $this->assertEqual(1, count($filtered_files), 'Filtered correctly.');
   }
 
   /**
    * Check that key parameter sets the return value's key.
    */
-  function testOptionKey() {
+  public function testOptionKey() {
     // "filename", for the path starting with $dir.
-    $expected = array($this->path . '/javascript-1.txt', $this->path . '/javascript-2.script');
-    $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'filepath')));
+    $expected = [$this->path . '/javascript-1.txt', $this->path . '/javascript-2.script'];
+    $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', ['key' => 'filepath']));
     sort($actual);
     $this->assertEqual($expected, $actual, 'Returned the correct values for the filename key.');
 
     // "basename", for the basename of the file.
-    $expected = array('javascript-1.txt', 'javascript-2.script');
-    $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'filename')));
+    $expected = ['javascript-1.txt', 'javascript-2.script'];
+    $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', ['key' => 'filename']));
     sort($actual);
     $this->assertEqual($expected, $actual, 'Returned the correct values for the basename key.');
 
     // "name" for the name of the file without an extension.
-    $expected = array('javascript-1', 'javascript-2');
-    $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'name')));
+    $expected = ['javascript-1', 'javascript-2'];
+    $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', ['key' => 'name']));
     sort($actual);
     $this->assertEqual($expected, $actual, 'Returned the correct values for the name key.');
 
     // Invalid option that should default back to "filename".
-    $expected = array($this->path . '/javascript-1.txt', $this->path . '/javascript-2.script');
-    $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', array('key' => 'INVALID')));
+    $expected = [$this->path . '/javascript-1.txt', $this->path . '/javascript-2.script'];
+    $actual = array_keys(file_scan_directory($this->path, '/^javascript-/', ['key' => 'INVALID']));
     sort($actual);
     $this->assertEqual($expected, $actual, 'An invalid key defaulted back to the default.');
   }
@@ -121,11 +121,11 @@ class ScanDirectoryTest extends FileTestBase {
   /**
    * Check that the recurse option descends into subdirectories.
    */
-  function testOptionRecurse() {
-    $files = file_scan_directory($this->path . '/..', '/^javascript-/', array('recurse' => FALSE));
+  public function testOptionRecurse() {
+    $files = file_scan_directory($this->path . '/..', '/^javascript-/', ['recurse' => FALSE]);
     $this->assertTrue(empty($files), "Without recursion couldn't find javascript files.");
 
-    $files = file_scan_directory($this->path . '/..', '/^javascript-/', array('recurse' => TRUE));
+    $files = file_scan_directory($this->path . '/..', '/^javascript-/', ['recurse' => TRUE]);
     $this->assertEqual(2, count($files), 'With recursion we found the expected javascript files.');
   }
 
@@ -134,11 +134,11 @@ class ScanDirectoryTest extends FileTestBase {
    * Check that the min_depth options lets us ignore files in the starting
    * directory.
    */
-  function testOptionMinDepth() {
-    $files = file_scan_directory($this->path, '/^javascript-/', array('min_depth' => 0));
+  public function testOptionMinDepth() {
+    $files = file_scan_directory($this->path, '/^javascript-/', ['min_depth' => 0]);
     $this->assertEqual(2, count($files), 'No minimum-depth gets files in current directory.');
 
-    $files = file_scan_directory($this->path, '/^javascript-/', array('min_depth' => 1));
+    $files = file_scan_directory($this->path, '/^javascript-/', ['min_depth' => 1]);
     $this->assertTrue(empty($files), 'Minimum-depth of 1 successfully excludes files from current directory.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php b/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
index e9c86424b..6c18b6654 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
@@ -19,7 +19,7 @@ class StreamWrapperTest extends FileTestBase {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * A stream wrapper scheme to register for the test.
@@ -35,7 +35,7 @@ class StreamWrapperTest extends FileTestBase {
    */
   protected $classname = 'Drupal\file_test\StreamWrapper\DummyStreamWrapper';
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
 
     // Add file_private_path setting.
@@ -47,7 +47,7 @@ class StreamWrapperTest extends FileTestBase {
   /**
    * Test the getClassName() function.
    */
-  function testGetClassName() {
+  public function testGetClassName() {
     // Check the dummy scheme.
     $this->assertEqual($this->classname, \Drupal::service('stream_wrapper_manager')->getClass($this->scheme), 'Got correct class name for dummy scheme.');
     // Check core's scheme.
@@ -57,7 +57,7 @@ class StreamWrapperTest extends FileTestBase {
   /**
    * Test the getViaScheme() method.
    */
-  function testGetInstanceByScheme() {
+  public function testGetInstanceByScheme() {
     $instance = \Drupal::service('stream_wrapper_manager')->getViaScheme($this->scheme);
     $this->assertEqual($this->classname, get_class($instance), 'Got correct class type for dummy scheme.');
 
@@ -68,7 +68,7 @@ class StreamWrapperTest extends FileTestBase {
   /**
    * Test the getViaUri() and getViaScheme() methods and target functions.
    */
-  function testUriFunctions() {
+  public function testUriFunctions() {
     $config = $this->config('system.file');
 
     $instance = \Drupal::service('stream_wrapper_manager')->getViaUri($this->scheme . '://foo');
@@ -104,7 +104,7 @@ class StreamWrapperTest extends FileTestBase {
   /**
    * Test some file handle functions.
    */
-  function testFileFunctions() {
+  public function testFileFunctions() {
     $filename = 'public://' . $this->randomMachineName();
     file_put_contents($filename, str_repeat('d', 1000));
 
@@ -119,7 +119,7 @@ class StreamWrapperTest extends FileTestBase {
     $this->assertEqual(-1 /*EOF*/, @stream_set_write_buffer($handle, 512), 'Unable to set write buffer using a local stream wrapper.');
 
     // This will test stream_cast().
-    $read = array($handle);
+    $read = [$handle];
     $write = NULL;
     $except = NULL;
     $this->assertEqual(1, stream_select($read, $write, $except, 0), 'Able to cast a stream via stream_select.');
@@ -136,7 +136,7 @@ class StreamWrapperTest extends FileTestBase {
   /**
    * Test the scheme functions.
    */
-  function testGetValidStreamScheme() {
+  public function testGetValidStreamScheme() {
     $this->assertEqual('foo', file_uri_scheme('foo://pork//chops'), 'Got the correct scheme from foo://asdf');
     $this->assertEqual('data', file_uri_scheme('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=='), 'Got the correct scheme from a data URI.');
     $this->assertFalse(file_uri_scheme('foo/bar.txt'), 'foo/bar.txt is not a valid stream.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedCopyTest.php b/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedCopyTest.php
index 6b2fbed25..6e4ca2aeb 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedCopyTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedCopyTest.php
@@ -14,7 +14,7 @@ class UnmanagedCopyTest extends FileTestBase {
   /**
    * Copy a normal file.
    */
-  function testNormal() {
+  public function testNormal() {
     // Create a file for testing
     $uri = $this->createUri();
 
@@ -44,7 +44,7 @@ class UnmanagedCopyTest extends FileTestBase {
   /**
    * Copy a non-existent file.
    */
-  function testNonExistent() {
+  public function testNonExistent() {
     // Copy non-existent file
     $desired_filepath = $this->randomMachineName();
     $this->assertFalse(file_exists($desired_filepath), "Randomly named file doesn't exists.");
@@ -55,7 +55,7 @@ class UnmanagedCopyTest extends FileTestBase {
   /**
    * Copy a file onto itself.
    */
-  function testOverwriteSelf() {
+  public function testOverwriteSelf() {
     // Create a file for testing
     $uri = $this->createUri();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteRecursiveTest.php b/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteRecursiveTest.php
index feed31b53..64045fea7 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteRecursiveTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteRecursiveTest.php
@@ -11,7 +11,7 @@ class UnmanagedDeleteRecursiveTest extends FileTestBase {
   /**
    * Delete a normal file.
    */
-  function testSingleFile() {
+  public function testSingleFile() {
     // Create a file for testing
     $filepath = file_default_scheme() . '://' . $this->randomMachineName();
     file_put_contents($filepath, '');
@@ -24,7 +24,7 @@ class UnmanagedDeleteRecursiveTest extends FileTestBase {
   /**
    * Try deleting an empty directory.
    */
-  function testEmptyDirectory() {
+  public function testEmptyDirectory() {
     // A directory to operate on.
     $directory = $this->createDirectory();
 
@@ -36,7 +36,7 @@ class UnmanagedDeleteRecursiveTest extends FileTestBase {
   /**
    * Try deleting a directory with some files.
    */
-  function testDirectory() {
+  public function testDirectory() {
     // A directory to operate on.
     $directory = $this->createDirectory();
     $filepathA = $directory . '/A';
@@ -54,7 +54,7 @@ class UnmanagedDeleteRecursiveTest extends FileTestBase {
   /**
    * Try deleting subdirectories with some files.
    */
-  function testSubDirectory() {
+  public function testSubDirectory() {
     // A directory to operate on.
     $directory = $this->createDirectory();
     $subdirectory = $this->createDirectory($directory . '/sub');
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteTest.php b/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteTest.php
index 55e45360d..d1cfb2e7d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteTest.php
@@ -11,7 +11,7 @@ class UnmanagedDeleteTest extends FileTestBase {
   /**
    * Delete a normal file.
    */
-  function testNormal() {
+  public function testNormal() {
     // Create a file for testing
     $uri = $this->createUri();
 
@@ -23,7 +23,7 @@ class UnmanagedDeleteTest extends FileTestBase {
   /**
    * Try deleting a missing file.
    */
-  function testMissing() {
+  public function testMissing() {
     // Try to delete a non-existing file
     $this->assertTrue(file_unmanaged_delete(file_default_scheme() . '/' . $this->randomMachineName()), 'Returns true when deleting a non-existent file.');
   }
@@ -31,7 +31,7 @@ class UnmanagedDeleteTest extends FileTestBase {
   /**
    * Try deleting a directory.
    */
-  function testDirectory() {
+  public function testDirectory() {
     // A directory to operate on.
     $directory = $this->createDirectory();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedMoveTest.php b/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedMoveTest.php
index 87a29f4a2..8619a1507 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedMoveTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedMoveTest.php
@@ -14,7 +14,7 @@ class UnmanagedMoveTest extends FileTestBase {
   /**
    * Move a normal file.
    */
-  function testNormal() {
+  public function testNormal() {
     // Create a file for testing
     $uri = $this->createUri();
 
@@ -45,7 +45,7 @@ class UnmanagedMoveTest extends FileTestBase {
   /**
    * Try to move a missing file.
    */
-  function testMissing() {
+  public function testMissing() {
     // Move non-existent file.
     $new_filepath = file_unmanaged_move($this->randomMachineName(), $this->randomMachineName());
     $this->assertFalse($new_filepath, 'Moving a missing file fails.');
@@ -54,7 +54,7 @@ class UnmanagedMoveTest extends FileTestBase {
   /**
    * Try to move a file onto itself.
    */
-  function testOverwriteSelf() {
+  public function testOverwriteSelf() {
     // Create a file for testing.
     $uri = $this->createUri();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedSaveDataTest.php b/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedSaveDataTest.php
index dc06d2cb8..549332338 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedSaveDataTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/UnmanagedSaveDataTest.php
@@ -11,7 +11,7 @@ class UnmanagedSaveDataTest extends FileTestBase {
   /**
    * Test the file_unmanaged_save_data() function.
    */
-  function testFileSaveData() {
+  public function testFileSaveData() {
     $contents = $this->randomMachineName(8);
     $this->setSetting('file_chmod_file', 0777);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php b/web/core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php
index 5494975af..35d2ca024 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php
@@ -16,12 +16,12 @@ class UrlRewritingTest extends FileTestBase {
    *
    * @var array
    */
-  public static $modules = array('file_test');
+  public static $modules = ['file_test'];
 
   /**
    * Tests the rewriting of shipped file URLs by hook_file_url_alter().
    */
-  function testShippedFileURL()  {
+  public function testShippedFileURL()  {
     // Test generating a URL to a shipped file (i.e. a file that is part of
     // Drupal core, a module or a theme, for example a JavaScript file).
 
@@ -68,7 +68,7 @@ class UrlRewritingTest extends FileTestBase {
   /**
    * Tests the rewriting of public managed file URLs by hook_file_url_alter().
    */
-  function testPublicManagedFileURL() {
+  public function testPublicManagedFileURL() {
     // Test generating a URL to a managed file.
 
     // Test alteration of file URLs to use a CDN.
@@ -94,7 +94,7 @@ class UrlRewritingTest extends FileTestBase {
   /**
    * Test file_url_transform_relative().
    */
-  function testRelativeFileURL() {
+  public function testRelativeFileURL() {
     // Disable file_test.module's hook_file_url_alter() implementation.
     \Drupal::state()->set('file_test.hook_file_url_alter', NULL);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php b/web/core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php
index fa86bee14..6425a3099 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php
@@ -20,7 +20,7 @@ class FormCacheTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user');
+  public static $modules = ['system', 'user'];
 
   /**
    * @var string
@@ -39,12 +39,12 @@ class FormCacheTest extends KernelTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('system', array('key_value_expire'));
+    $this->installSchema('system', ['key_value_expire']);
 
     $this->formBuildId = $this->randomMachineName();
-    $this->form = array(
+    $this->form = [
       '#property' => $this->randomMachineName(),
-    );
+    ];
     $this->formState = new FormState();
     $this->formState->set('example', $this->randomMachineName());
   }
@@ -52,8 +52,8 @@ class FormCacheTest extends KernelTestBase {
   /**
    * Tests the form cache with a logged-in user.
    */
-  function testCacheToken() {
-    \Drupal::currentUser()->setAccount(new UserSession(array('uid' => 1)));
+  public function testCacheToken() {
+    \Drupal::currentUser()->setAccount(new UserSession(['uid' => 1]));
     \Drupal::formBuilder()->setCache($this->formBuildId, $this->form, $this->formState);
 
     $cached_form_state = new FormState();
@@ -83,7 +83,7 @@ class FormCacheTest extends KernelTestBase {
   /**
    * Tests the form cache without a logged-in user.
    */
-  function testNoCacheToken() {
+  public function testNoCacheToken() {
     // Switch to a anonymous user account.
     $account_switcher = \Drupal::service('account_switcher');
     $account_switcher->switchTo(new AnonymousUserSession());
diff --git a/web/core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php b/web/core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php
index 7f046e9d7..6d79f17cf 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php
@@ -19,7 +19,7 @@ class FormDefaultHandlersTest extends KernelTestBase implements FormInterface {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * {@inheritdoc}
@@ -42,7 +42,7 @@ class FormDefaultHandlersTest extends KernelTestBase implements FormInterface {
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form['#validate'][] = '::customValidateForm';
     $form['#submit'][] = '::customSubmitForm';
-    $form['submit'] = array('#type' => 'submit', '#value' => 'Save');
+    $form['submit'] = ['#type' => 'submit', '#value' => 'Save'];
     return $form;
   }
 
@@ -85,7 +85,7 @@ class FormDefaultHandlersTest extends KernelTestBase implements FormInterface {
   /**
    * Tests that default handlers are added even if custom are specified.
    */
-  function testDefaultAndCustomHandlers() {
+  public function testDefaultAndCustomHandlers() {
     $form_state = new FormState();
     $form_builder = $this->container->get('form_builder');
     $form_builder->submitForm($this, $form_state);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Form/TriggeringElementProgrammedTest.php b/web/core/tests/Drupal/KernelTests/Core/Form/TriggeringElementProgrammedTest.php
index c24d47e01..b2552c8cc 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Form/TriggeringElementProgrammedTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Form/TriggeringElementProgrammedTest.php
@@ -25,27 +25,27 @@ class TriggeringElementProgrammedTest extends KernelTestBase implements FormInte
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['one'] = array(
+    $form['one'] = [
       '#type' => 'textfield',
       '#title' => 'One',
       '#required' => TRUE,
-    );
-    $form['two'] = array(
+    ];
+    $form['two'] = [
       '#type' => 'textfield',
       '#title' => 'Two',
       '#required' => TRUE,
-    );
-    $form['actions'] = array('#type' => 'actions');
+    ];
+    $form['actions'] = ['#type' => 'actions'];
     $user_input = $form_state->getUserInput();
-    $form['actions']['submit'] = array(
+    $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => 'Save',
-      '#limit_validation_errors' => array(
-        array($user_input['section']),
-      ),
+      '#limit_validation_errors' => [
+        [$user_input['section']],
+      ],
       // Required for #limit_validation_errors.
-      '#submit' => array(array($this, 'submitForm')),
-    );
+      '#submit' => [[$this, 'submitForm']],
+    ];
     return $form;
   }
 
@@ -66,7 +66,7 @@ class TriggeringElementProgrammedTest extends KernelTestBase implements FormInte
   /**
    * Tests that #limit_validation_errors of the only submit button takes effect.
    */
-  function testLimitValidationErrors() {
+  public function testLimitValidationErrors() {
     // Programmatically submit the form.
     $form_state = new FormState();
     $form_state->setValue('section', 'one');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Http/LinkRelationsTest.php b/web/core/tests/Drupal/KernelTests/Core/Http/LinkRelationsTest.php
new file mode 100644
index 000000000..d01537b7b
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Http/LinkRelationsTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Http;
+
+use Drupal\Core\Http\LinkRelationType;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests link relationships in Drupal.
+ *
+ * @group HTTP
+ */
+class LinkRelationsTest extends KernelTestBase {
+
+  /**
+   * Tests correct Link Relations are returned from the Link Relation Type Manager.
+   */
+  public function testAvailableLinkRelationships() {
+    /** @var \Drupal\Core\Http\LinkRelationTypeManager $link_relation_type_manager */
+    $link_relation_type_manager = $this->container->get('plugin.manager.link_relation_type');
+
+    // An link relation type of the "registered" kind.
+    /** @var \Drupal\Core\Http\LinkRelationTypeInterface $canonical */
+    $canonical = $link_relation_type_manager->createInstance('canonical');
+    $this->assertInstanceOf(LinkRelationType::class, $canonical);
+    $this->assertTrue($canonical->isRegistered());
+    $this->assertFalse($canonical->isExtension());
+    $this->assertSame('canonical', $canonical->getRegisteredName());
+    $this->assertNull($canonical->getExtensionUri());
+    $this->assertEquals('[RFC6596]', $canonical->getReference());
+    $this->assertEquals('Designates the preferred version of a resource (the IRI and its contents).', $canonical->getDescription());
+    $this->assertEquals('', $canonical->getNotes());
+
+    // An link relation type of the "extension" kind.
+    /** @var \Drupal\Core\Http\LinkRelationTypeInterface $canonical */
+    $add_form = $link_relation_type_manager->createInstance('add-form');
+    $this->assertInstanceOf(LinkRelationType::class, $add_form);
+    $this->assertFalse($add_form->isRegistered());
+    $this->assertTrue($add_form->isExtension());
+    $this->assertNull($add_form->getRegisteredName());
+    $this->assertSame('https://drupal.org/link-relations/add-form', $add_form->getExtensionUri());
+    $this->assertEquals('', $add_form->getReference());
+    $this->assertEquals('A form where a resource of this type can be created.', $add_form->getDescription());
+    $this->assertEquals('', $add_form->getNotes());
+
+    // Test a couple of examples.
+    $this->assertContains('about', array_keys($link_relation_type_manager->getDefinitions()));
+    $this->assertContains('original', array_keys($link_relation_type_manager->getDefinitions()));
+    $this->assertContains('type', array_keys($link_relation_type_manager->getDefinitions()));
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/HttpKernel/StackKernelIntegrationTest.php b/web/core/tests/Drupal/KernelTests/Core/HttpKernel/StackKernelIntegrationTest.php
index 166ec244c..29bbcff9a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/HttpKernel/StackKernelIntegrationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/HttpKernel/StackKernelIntegrationTest.php
@@ -19,7 +19,7 @@ class StackKernelIntegrationTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('httpkernel_test', 'system');
+  public static $modules = ['httpkernel_test', 'system'];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php b/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
index fe36c3dc8..bb2e48110 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
@@ -23,16 +23,16 @@ class ToolkitGdTest extends KernelTestBase {
   protected $imageFactory;
 
   // Colors that are used in testing.
-  protected $black       = array(0, 0, 0, 0);
-  protected $red         = array(255, 0, 0, 0);
-  protected $green       = array(0, 255, 0, 0);
-  protected $blue        = array(0, 0, 255, 0);
-  protected $yellow      = array(255, 255, 0, 0);
-  protected $white       = array(255, 255, 255, 0);
-  protected $transparent = array(0, 0, 0, 127);
+  protected $black       = [0, 0, 0, 0];
+  protected $red         = [255, 0, 0, 0];
+  protected $green       = [0, 255, 0, 0];
+  protected $blue        = [0, 0, 255, 0];
+  protected $yellow      = [255, 255, 0, 0];
+  protected $white       = [255, 255, 255, 0];
+  protected $transparent = [0, 0, 0, 127];
   // Used as rotate background colors.
-  protected $fuchsia            = array(255, 0, 255, 0);
-  protected $rotateTransparent = array(255, 255, 255, 127);
+  protected $fuchsia            = [255, 0, 255, 0];
+  protected $rotateTransparent = [255, 255, 255, 127];
 
   protected $width = 40;
   protected $height = 20;
@@ -42,7 +42,7 @@ class ToolkitGdTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'simpletest');
+  public static $modules = ['system', 'simpletest'];
 
   /**
    * {@inheritdoc}
@@ -57,9 +57,9 @@ class ToolkitGdTest extends KernelTestBase {
   protected function checkRequirements() {
     // GD2 support is available.
     if (!function_exists('imagegd2')) {
-      return array(
+      return [
         'Image manipulations for the GD toolkit cannot run because the GD toolkit is not available.',
-      );
+      ];
     }
     return parent::checkRequirements();
   }
@@ -67,7 +67,7 @@ class ToolkitGdTest extends KernelTestBase {
   /**
    * Function to compare two colors by RGBa.
    */
-  function colorsAreEqual($color_a, $color_b) {
+  public function colorsAreEqual($color_a, $color_b) {
     // Fully transparent pixels are equal, regardless of RGB.
     if ($color_a[3] == 127 && $color_b[3] == 127) {
       return TRUE;
@@ -85,13 +85,13 @@ class ToolkitGdTest extends KernelTestBase {
   /**
    * Function for finding a pixel's RGBa values.
    */
-  function getPixelColor(ImageInterface $image, $x, $y) {
+  public function getPixelColor(ImageInterface $image, $x, $y) {
     $toolkit = $image->getToolkit();
     $color_index = imagecolorat($toolkit->getResource(), $x, $y);
 
     $transparent_index = imagecolortransparent($toolkit->getResource());
     if ($color_index == $transparent_index) {
-      return array(0, 0, 0, 127);
+      return [0, 0, 0, 127];
     }
 
     return array_values(imagecolorsforindex($toolkit->getResource(), $color_index));
@@ -102,7 +102,7 @@ class ToolkitGdTest extends KernelTestBase {
    * properly, build a list of expected color values for each of the corners and
    * the expected height and widths for the final images.
    */
-  function testManipulations() {
+  public function testManipulations() {
 
     // Test that the image factory is set to use the GD toolkit.
     $this->assertEqual($this->imageFactory->getToolkitId(), 'gd', 'The image factory is set to use the \'gd\' image toolkit.');
@@ -129,143 +129,143 @@ class ToolkitGdTest extends KernelTestBase {
 
     // Typically the corner colors will be unchanged. These colors are in the
     // order of top-left, top-right, bottom-right, bottom-left.
-    $default_corners = array($this->red, $this->green, $this->blue, $this->transparent);
+    $default_corners = [$this->red, $this->green, $this->blue, $this->transparent];
 
     // A list of files that will be tested.
-    $files = array(
+    $files = [
       'image-test.png',
       'image-test.gif',
       'image-test-no-transparency.gif',
       'image-test.jpg',
-    );
+    ];
 
     // Setup a list of tests to perform on each type.
-    $operations = array(
-      'resize' => array(
+    $operations = [
+      'resize' => [
         'function' => 'resize',
-        'arguments' => array('width' => 20, 'height' => 10),
+        'arguments' => ['width' => 20, 'height' => 10],
         'width' => 20,
         'height' => 10,
         'corners' => $default_corners,
-      ),
-      'scale_x' => array(
+      ],
+      'scale_x' => [
         'function' => 'scale',
-        'arguments' => array('width' => 20),
+        'arguments' => ['width' => 20],
         'width' => 20,
         'height' => 10,
         'corners' => $default_corners,
-      ),
-      'scale_y' => array(
+      ],
+      'scale_y' => [
         'function' => 'scale',
-        'arguments' => array('height' => 10),
+        'arguments' => ['height' => 10],
         'width' => 20,
         'height' => 10,
         'corners' => $default_corners,
-      ),
-      'upscale_x' => array(
+      ],
+      'upscale_x' => [
         'function' => 'scale',
-        'arguments' => array('width' => 80, 'upscale' => TRUE),
+        'arguments' => ['width' => 80, 'upscale' => TRUE],
         'width' => 80,
         'height' => 40,
         'corners' => $default_corners,
-      ),
-      'upscale_y' => array(
+      ],
+      'upscale_y' => [
         'function' => 'scale',
-        'arguments' => array('height' => 40, 'upscale' => TRUE),
+        'arguments' => ['height' => 40, 'upscale' => TRUE],
         'width' => 80,
         'height' => 40,
         'corners' => $default_corners,
-      ),
-      'crop' => array(
+      ],
+      'crop' => [
         'function' => 'crop',
-        'arguments' => array('x' => 12, 'y' => 4, 'width' => 16, 'height' => 12),
+        'arguments' => ['x' => 12, 'y' => 4, 'width' => 16, 'height' => 12],
         'width' => 16,
         'height' => 12,
         'corners' => array_fill(0, 4, $this->white),
-      ),
-      'scale_and_crop' => array(
+      ],
+      'scale_and_crop' => [
         'function' => 'scale_and_crop',
-        'arguments' => array('width' => 10, 'height' => 8),
+        'arguments' => ['width' => 10, 'height' => 8],
         'width' => 10,
         'height' => 8,
         'corners' => array_fill(0, 4, $this->black),
-      ),
-      'convert_jpg' => array(
+      ],
+      'convert_jpg' => [
         'function' => 'convert',
         'width' => 40,
         'height' => 20,
-        'arguments' => array('extension' => 'jpeg'),
+        'arguments' => ['extension' => 'jpeg'],
         'corners' => $default_corners,
-      ),
-      'convert_gif' => array(
+      ],
+      'convert_gif' => [
         'function' => 'convert',
         'width' => 40,
         'height' => 20,
-        'arguments' => array('extension' => 'gif'),
+        'arguments' => ['extension' => 'gif'],
         'corners' => $default_corners,
-      ),
-      'convert_png' => array(
+      ],
+      'convert_png' => [
         'function' => 'convert',
         'width' => 40,
         'height' => 20,
-        'arguments' => array('extension' => 'png'),
+        'arguments' => ['extension' => 'png'],
         'corners' => $default_corners,
-      ),
-    );
+      ],
+    ];
 
     // Systems using non-bundled GD2 don't have imagerotate. Test if available.
     if (function_exists('imagerotate')) {
-      $operations += array(
-        'rotate_5' => array(
+      $operations += [
+        'rotate_5' => [
           'function' => 'rotate',
-          'arguments' => array('degrees' => 5, 'background' => '#FF00FF'), // Fuchsia background.
+          'arguments' => ['degrees' => 5, 'background' => '#FF00FF'], // Fuchsia background.
           'width' => 41,
           'height' => 23,
           'corners' => array_fill(0, 4, $this->fuchsia),
-        ),
-        'rotate_90' => array(
+        ],
+        'rotate_90' => [
           'function' => 'rotate',
-          'arguments' => array('degrees' => 90, 'background' => '#FF00FF'), // Fuchsia background.
+          'arguments' => ['degrees' => 90, 'background' => '#FF00FF'], // Fuchsia background.
           'width' => 20,
           'height' => 40,
-          'corners' => array($this->transparent, $this->red, $this->green, $this->blue),
-        ),
-        'rotate_transparent_5' => array(
+          'corners' => [$this->transparent, $this->red, $this->green, $this->blue],
+        ],
+        'rotate_transparent_5' => [
           'function' => 'rotate',
-          'arguments' => array('degrees' => 5),
+          'arguments' => ['degrees' => 5],
           'width' => 41,
           'height' => 23,
           'corners' => array_fill(0, 4, $this->rotateTransparent),
-        ),
-        'rotate_transparent_90' => array(
+        ],
+        'rotate_transparent_90' => [
           'function' => 'rotate',
-          'arguments' => array('degrees' => 90),
+          'arguments' => ['degrees' => 90],
           'width' => 20,
           'height' => 40,
-          'corners' => array($this->transparent, $this->red, $this->green, $this->blue),
-        ),
-      );
+          'corners' => [$this->transparent, $this->red, $this->green, $this->blue],
+        ],
+      ];
     }
 
     // Systems using non-bundled GD2 don't have imagefilter. Test if available.
     if (function_exists('imagefilter')) {
-      $operations += array(
-        'desaturate' => array(
+      $operations += [
+        'desaturate' => [
           'function' => 'desaturate',
-          'arguments' => array(),
+          'arguments' => [],
           'height' => 20,
           'width' => 40,
           // Grayscale corners are a bit funky. Each of the corners are a shade of
           // gray. The values of these were determined simply by looking at the
           // final image to see what desaturated colors end up being.
-          'corners' => array(
-            array_fill(0, 3, 76) + array(3 => 0),
-            array_fill(0, 3, 149) + array(3 => 0),
-            array_fill(0, 3, 29) + array(3 => 0),
-            array_fill(0, 3, 225) + array(3 => 127)
-          ),
-        ),
-      );
+          'corners' => [
+            array_fill(0, 3, 76) + [3 => 0],
+            array_fill(0, 3, 149) + [3 => 0],
+            array_fill(0, 3, 29) + [3 => 0],
+            array_fill(0, 3, 225) + [3 => 127]
+          ],
+        ],
+      ];
     }
 
     // Prepare a directory for test file results.
@@ -278,14 +278,14 @@ class ToolkitGdTest extends KernelTestBase {
         $image = $this->imageFactory->get(drupal_get_path('module', 'simpletest') . '/files/' . $file);
         $toolkit = $image->getToolkit();
         if (!$image->isValid()) {
-          $this->fail(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
+          $this->fail(SafeMarkup::format('Could not load image %file.', ['%file' => $file]));
           continue 2;
         }
         $image_original_type = $image->getToolkit()->getType();
 
         // All images should be converted to truecolor when loaded.
         $image_truecolor = imageistruecolor($toolkit->getResource());
-        $this->assertTrue($image_truecolor, SafeMarkup::format('Image %file after load is a truecolor image.', array('%file' => $file)));
+        $this->assertTrue($image_truecolor, SafeMarkup::format('Image %file after load is a truecolor image.', ['%file' => $file]));
 
         // Store the original GD resource.
         $old_res = $toolkit->getResource();
@@ -317,8 +317,8 @@ class ToolkitGdTest extends KernelTestBase {
         $file_path = $directory . '/' . $op . image_type_to_extension($image->getToolkit()->getType());
         $image->save($file_path);
 
-        $this->assertTrue($correct_dimensions_real, SafeMarkup::format('Image %file after %action action has proper dimensions.', array('%file' => $file, '%action' => $op)));
-        $this->assertTrue($correct_dimensions_object, SafeMarkup::format('Image %file object after %action action is reporting the proper height and width values.', array('%file' => $file, '%action' => $op)));
+        $this->assertTrue($correct_dimensions_real, SafeMarkup::format('Image %file after %action action has proper dimensions.', ['%file' => $file, '%action' => $op]));
+        $this->assertTrue($correct_dimensions_object, SafeMarkup::format('Image %file object after %action action is reporting the proper height and width values.', ['%file' => $file, '%action' => $op]));
 
         // JPEG colors will always be messed up due to compression. So we skip
         // these tests if the original or the result is in jpeg format.
@@ -365,7 +365,7 @@ class ToolkitGdTest extends KernelTestBase {
             if ($image->getToolkit()->getType() == $image_original_type || $corner != $this->transparent) {
               $correct_colors = $this->colorsAreEqual($color, $corner);
               $this->assertTrue($correct_colors, SafeMarkup::format('Image %file object after %action action has the correct color placement at corner %corner.',
-                array('%file'   => $file, '%action' => $op, '%corner' => $key)));
+                ['%file'   => $file, '%action' => $op, '%corner' => $key]));
             }
           }
         }
@@ -377,30 +377,30 @@ class ToolkitGdTest extends KernelTestBase {
     }
 
     // Test creation of image from scratch, and saving to storage.
-    foreach (array(IMAGETYPE_PNG, IMAGETYPE_GIF, IMAGETYPE_JPEG) as $type) {
+    foreach ([IMAGETYPE_PNG, IMAGETYPE_GIF, IMAGETYPE_JPEG] as $type) {
       $image = $this->imageFactory->get();
       $image->createNew(50, 20, image_type_to_extension($type, FALSE), '#ffff00');
       $file = 'from_null' . image_type_to_extension($type);
       $file_path = $directory . '/' . $file ;
-      $this->assertEqual(50, $image->getWidth(), SafeMarkup::format('Image file %file has the correct width.', array('%file' => $file)));
-      $this->assertEqual(20, $image->getHeight(), SafeMarkup::format('Image file %file has the correct height.', array('%file' => $file)));
-      $this->assertEqual(image_type_to_mime_type($type), $image->getMimeType(), SafeMarkup::format('Image file %file has the correct MIME type.', array('%file' => $file)));
-      $this->assertTrue($image->save($file_path), SafeMarkup::format('Image %file created anew from a null image was saved.', array('%file' => $file)));
+      $this->assertEqual(50, $image->getWidth(), SafeMarkup::format('Image file %file has the correct width.', ['%file' => $file]));
+      $this->assertEqual(20, $image->getHeight(), SafeMarkup::format('Image file %file has the correct height.', ['%file' => $file]));
+      $this->assertEqual(image_type_to_mime_type($type), $image->getMimeType(), SafeMarkup::format('Image file %file has the correct MIME type.', ['%file' => $file]));
+      $this->assertTrue($image->save($file_path), SafeMarkup::format('Image %file created anew from a null image was saved.', ['%file' => $file]));
 
       // Reload saved image.
       $image_reloaded = $this->imageFactory->get($file_path);
       if (!$image_reloaded->isValid()) {
-        $this->fail(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
+        $this->fail(SafeMarkup::format('Could not load image %file.', ['%file' => $file]));
         continue;
       }
-      $this->assertEqual(50, $image_reloaded->getWidth(), SafeMarkup::format('Image file %file has the correct width.', array('%file' => $file)));
-      $this->assertEqual(20, $image_reloaded->getHeight(), SafeMarkup::format('Image file %file has the correct height.', array('%file' => $file)));
-      $this->assertEqual(image_type_to_mime_type($type), $image_reloaded->getMimeType(), SafeMarkup::format('Image file %file has the correct MIME type.', array('%file' => $file)));
+      $this->assertEqual(50, $image_reloaded->getWidth(), SafeMarkup::format('Image file %file has the correct width.', ['%file' => $file]));
+      $this->assertEqual(20, $image_reloaded->getHeight(), SafeMarkup::format('Image file %file has the correct height.', ['%file' => $file]));
+      $this->assertEqual(image_type_to_mime_type($type), $image_reloaded->getMimeType(), SafeMarkup::format('Image file %file has the correct MIME type.', ['%file' => $file]));
       if ($image_reloaded->getToolkit()->getType() == IMAGETYPE_GIF) {
-        $this->assertEqual('#ffff00', $image_reloaded->getToolkit()->getTransparentColor(), SafeMarkup::format('Image file %file has the correct transparent color channel set.', array('%file' => $file)));
+        $this->assertEqual('#ffff00', $image_reloaded->getToolkit()->getTransparentColor(), SafeMarkup::format('Image file %file has the correct transparent color channel set.', ['%file' => $file]));
       }
       else {
-        $this->assertEqual(NULL, $image_reloaded->getToolkit()->getTransparentColor(), SafeMarkup::format('Image file %file has no color channel set.', array('%file' => $file)));
+        $this->assertEqual(NULL, $image_reloaded->getToolkit()->getTransparentColor(), SafeMarkup::format('Image file %file has no color channel set.', ['%file' => $file]));
       }
     }
 
@@ -443,7 +443,7 @@ class ToolkitGdTest extends KernelTestBase {
   /**
    * Tests for GIF images with transparency.
    */
-  function testGifTransparentImages() {
+  public function testGifTransparentImages() {
     // Prepare a directory for test file results.
     $directory = Settings::get('file_public_path') . '/imagetest';
     file_prepare_directory($directory, FILE_CREATE_DIRECTORY);
@@ -496,19 +496,19 @@ class ToolkitGdTest extends KernelTestBase {
     $toolkit = $image->getToolkit();
 
     if (!$image->isValid()) {
-      $this->fail(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
+      $this->fail(SafeMarkup::format('Could not load image %file.', ['%file' => $file]));
     }
     else {
       // All images should be converted to truecolor when loaded.
       $image_truecolor = imageistruecolor($toolkit->getResource());
-      $this->assertTrue($image_truecolor, SafeMarkup::format('Image %file after load is a truecolor image.', array('%file' => $file)));
+      $this->assertTrue($image_truecolor, SafeMarkup::format('Image %file after load is a truecolor image.', ['%file' => $file]));
     }
   }
 
   /**
    * Tests calling a missing image operation plugin.
    */
-  function testMissingOperation() {
+  public function testMissingOperation() {
 
     // Test that the image factory is set to use the GD toolkit.
     $this->assertEqual($this->imageFactory->getToolkitId(), 'gd', 'The image factory is set to use the \'gd\' image toolkit.');
@@ -519,11 +519,11 @@ class ToolkitGdTest extends KernelTestBase {
     // Load up a fresh image.
     $image = $this->imageFactory->get(drupal_get_path('module', 'simpletest') . '/files/' . $file);
     if (!$image->isValid()) {
-      $this->fail(SafeMarkup::format('Could not load image %file.', array('%file' => $file)));
+      $this->fail(SafeMarkup::format('Could not load image %file.', ['%file' => $file]));
     }
 
     // Try perform a missing toolkit operation.
-    $this->assertFalse($image->apply('missing_op', array()), 'Calling a missing image toolkit operation plugin fails.');
+    $this->assertFalse($image->apply('missing_op', []), 'Calling a missing image toolkit operation plugin fails.');
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerLanguageTest.php b/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerLanguageTest.php
index 060ee46f5..3f911938f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerLanguageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerLanguageTest.php
@@ -15,24 +15,24 @@ class InstallerLanguageTest extends KernelTestBase {
   /**
    * Tests that the installer can find translation files.
    */
-  function testInstallerTranslationFiles() {
+  public function testInstallerTranslationFiles() {
     // Different translation files would be found depending on which language
     // we are looking for.
-    $expected_translation_files = array(
-      NULL => array('drupal-8.0.0-beta2.hu.po', 'drupal-8.0.0.de.po'),
-      'de' => array('drupal-8.0.0.de.po'),
-      'hu' => array('drupal-8.0.0-beta2.hu.po'),
-      'it' => array(),
-    );
+    $expected_translation_files = [
+      NULL => ['drupal-8.0.0-beta2.hu.po', 'drupal-8.0.0.de.po'],
+      'de' => ['drupal-8.0.0.de.po'],
+      'hu' => ['drupal-8.0.0-beta2.hu.po'],
+      'it' => [],
+    ];
 
     // Hardcode the simpletest module location as we don't yet know where it is.
     // @todo Remove as part of https://www.drupal.org/node/2186491
     $file_translation = new FileTranslation('core/modules/simpletest/files/translations');
     foreach ($expected_translation_files as $langcode => $files_expected) {
       $files_found = $file_translation->findTranslationFiles($langcode);
-      $this->assertTrue(count($files_found) == count($files_expected), format_string('@count installer languages found.', array('@count' => count($files_expected))));
+      $this->assertTrue(count($files_found) == count($files_expected), format_string('@count installer languages found.', ['@count' => count($files_expected)]));
       foreach ($files_found as $file) {
-        $this->assertTrue(in_array($file->filename, $files_expected), format_string('@file found.', array('@file' => $file->filename)));
+        $this->assertTrue(in_array($file->filename, $files_expected), format_string('@file found.', ['@file' => $file->filename]));
       }
     }
   }
@@ -40,7 +40,7 @@ class InstallerLanguageTest extends KernelTestBase {
   /**
    * Tests profile info caching in non-English languages.
    */
-  function testInstallerTranslationCache() {
+  public function testInstallerTranslationCache() {
     require_once 'core/includes/install.inc';
 
     // Prime the drupal_get_filename() static cache with the location of the
diff --git a/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerRedirectTraitTest.php b/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerRedirectTraitTest.php
new file mode 100644
index 000000000..1a24edaff
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerRedirectTraitTest.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Installer;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\DatabaseExceptionWrapper;
+use Drupal\Core\Database\DatabaseNotFoundException;
+use Drupal\Core\Database\Schema;
+use Drupal\Core\Installer\InstallerRedirectTrait;
+use Drupal\KernelTests\KernelTestBase;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Installer\InstallerRedirectTrait
+ *
+ * @group Installer
+ */
+class InstallerRedirectTraitTest extends KernelTestBase {
+
+  /**
+   * Data provider for testShouldRedirectToInstaller().
+   *
+   * @return array
+   *   - Expected result from shouldRedirectToInstaller().
+   *   - Exceptions to be handled by shouldRedirectToInstaller()
+   *   - Whether or not there is a database connection.
+   *   - Whether or not there is database connection info.
+   *   - Whether or not there exists a sessions table in the database.
+   */
+  public function providerShouldRedirectToInstaller() {
+    return [
+      [TRUE, DatabaseNotFoundException::class, FALSE, FALSE],
+      [TRUE, DatabaseNotFoundException::class, TRUE, FALSE],
+      [TRUE, DatabaseNotFoundException::class, FALSE, TRUE],
+      [TRUE, DatabaseNotFoundException::class, TRUE, TRUE],
+      [TRUE, DatabaseNotFoundException::class, TRUE, TRUE, FALSE],
+
+      [TRUE, \PDOException::class, FALSE, FALSE],
+      [TRUE, \PDOException::class, TRUE, FALSE],
+      [FALSE, \PDOException::class, FALSE, TRUE],
+      [FALSE, \PDOException::class, TRUE, TRUE],
+      [TRUE, \PDOException::class, TRUE, TRUE, FALSE],
+
+      [TRUE, DatabaseExceptionWrapper::class, FALSE, FALSE],
+      [TRUE, DatabaseExceptionWrapper::class, TRUE, FALSE],
+      [FALSE, DatabaseExceptionWrapper::class, FALSE, TRUE],
+      [FALSE, DatabaseExceptionWrapper::class, TRUE, TRUE],
+      [TRUE, DatabaseExceptionWrapper::class, TRUE, TRUE, FALSE],
+
+      [TRUE, NotFoundHttpException::class, FALSE, FALSE],
+      [TRUE, NotFoundHttpException::class, TRUE, FALSE],
+      [FALSE, NotFoundHttpException::class, FALSE, TRUE],
+      [FALSE, NotFoundHttpException::class, TRUE, TRUE],
+      [TRUE, NotFoundHttpException::class, TRUE, TRUE, FALSE],
+
+      [FALSE, \Exception::class, FALSE, FALSE],
+      [FALSE, \Exception::class, TRUE, FALSE],
+      [FALSE, \Exception::class, FALSE, TRUE],
+      [FALSE, \Exception::class, TRUE, TRUE],
+      [FALSE, \Exception::class, TRUE, TRUE, FALSE],
+    ];
+  }
+
+  /**
+   * @covers ::shouldRedirectToInstaller
+   * @dataProvider providerShouldRedirectToInstaller
+   */
+  public function testShouldRedirectToInstaller($expected, $exception, $connection, $connection_info, $session_table_exists = TRUE) {
+    try {
+      throw new $exception();
+    }
+    catch (\Exception $e) {
+      // Mock the trait.
+      $trait = $this->getMockBuilder(InstallerRedirectTrait::class)
+        ->setMethods(['isCli'])
+        ->getMockForTrait();
+
+      // Make sure that the method thinks we are not using the cli.
+      $trait->expects($this->any())
+        ->method('isCli')
+        ->willReturn(FALSE);
+
+      // Un-protect the method using reflection.
+      $method_ref = new \ReflectionMethod($trait, 'shouldRedirectToInstaller');
+      $method_ref->setAccessible(TRUE);
+
+      // Mock the database connection info.
+      $db = $this->getMockForAbstractClass(Database::class);
+      $property_ref = new \ReflectionProperty($db, 'databaseInfo');
+      $property_ref->setAccessible(TRUE);
+      $property_ref->setValue($db, ['default' => $connection_info]);
+
+      if ($connection) {
+        // Mock the database connection.
+        $connection = $this->getMockBuilder(Connection::class)
+          ->disableOriginalConstructor()
+          ->setMethods(['schema'])
+          ->getMockForAbstractClass();
+
+        if ($connection_info) {
+          // Mock the database schema class.
+          $schema = $this->getMockBuilder(Schema::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['tableExists'])
+            ->getMockForAbstractClass();
+
+          $schema->expects($this->any())
+            ->method('tableExists')
+            ->with('sessions')
+            ->willReturn($session_table_exists);
+
+          $connection->expects($this->any())
+            ->method('schema')
+            ->willReturn($schema);
+        }
+      }
+      else {
+        // Set the database connection if there is none.
+        $connection = NULL;
+      }
+
+      // Call shouldRedirectToInstaller.
+      $this->assertSame($expected, $method_ref->invoke($trait, $e, $connection));
+    }
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
index 163150106..2d543cbf0 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
@@ -17,12 +17,12 @@ class DatabaseStorageExpirableTest extends StorageTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   protected function setUp() {
     parent::setUp();
     $this->factory = 'keyvalue.expirable';
-    $this->installSchema('system', array('key_value_expire'));
+    $this->installSchema('system', ['key_value_expire']);
   }
 
   /**
@@ -60,12 +60,12 @@ class DatabaseStorageExpirableTest extends StorageTestBase {
     $this->assertIdenticalObject($this->objects[2], $stores[1]->get('foo'));
 
     // Verify that multiple items can be stored with setMultipleWithExpire().
-    $values = array(
+    $values = [
       'foo' => $this->objects[3],
       'bar' => $this->objects[4],
-    );
+    ];
     $stores[0]->setMultipleWithExpire($values, rand(500, 100000));
-    $result = $stores[0]->getMultiple(array('foo', 'bar'));
+    $result = $stores[0]->getMultiple(['foo', 'bar']);
     foreach ($values as $j => $value) {
       $this->assertIdenticalObject($value, $result[$j]);
     }
@@ -85,13 +85,13 @@ class DatabaseStorageExpirableTest extends StorageTestBase {
     }
     // Verify that all items in the other collection are different.
     $result = $stores[1]->getAll();
-    $this->assertEqual($result, array('foo' => $this->objects[5]));
+    $this->assertEqual($result, ['foo' => $this->objects[5]]);
 
     // Verify that multiple items can be deleted.
     $stores[0]->deleteMultiple(array_keys($values));
     $this->assertFalse($stores[0]->get('foo'));
     $this->assertFalse($stores[0]->get('bar'));
-    $this->assertFalse($stores[0]->getMultiple(array('foo', 'bar')));
+    $this->assertFalse($stores[0]->getMultiple(['foo', 'bar']));
     // Verify that the item in the other collection still exists.
     $this->assertIdenticalObject($this->objects[5], $stores[1]->get('foo'));
 
@@ -132,16 +132,16 @@ class DatabaseStorageExpirableTest extends StorageTestBase {
     $this->assertFalse($stores[0]->get('yesterday'));
     $this->assertTrue($stores[0]->has('troubles'));
     $this->assertIdentical($stores[0]->get('troubles'), 'here to stay');
-    $this->assertIdentical(count($stores[0]->getMultiple(array('yesterday', 'troubles'))), 1);
+    $this->assertIdentical(count($stores[0]->getMultiple(['yesterday', 'troubles'])), 1);
 
     // Store items set to expire in the past in various ways.
     $stores[0]->setWithExpire($this->randomMachineName(), $this->objects[0], -7 * $day);
     $stores[0]->setWithExpireIfNotExists($this->randomMachineName(), $this->objects[1], -5 * $day);
     $stores[0]->setMultipleWithExpire(
-      array(
+      [
         $this->randomMachineName() => $this->objects[2],
         $this->randomMachineName() => $this->objects[3],
-      ),
+      ],
       -3 * $day
     );
     $stores[0]->setWithExpireIfNotExists('yesterday', "you'd forgiven me", -1 * $day);
@@ -150,7 +150,7 @@ class DatabaseStorageExpirableTest extends StorageTestBase {
     // Ensure only non-expired items are retrieved.
     $all = $stores[0]->getAll();
     $this->assertIdentical(count($all), 2);
-    foreach (array('troubles', 'still') as $key) {
+    foreach (['troubles', 'still'] as $key) {
       $this->assertTrue(!empty($all[$key]));
     }
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageTest.php
index 676ab1084..5852da143 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageTest.php
@@ -17,11 +17,11 @@ class DatabaseStorageTest extends StorageTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('system', array('key_value'));
+    $this->installSchema('system', ['key_value']);
   }
 
   /**
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php
index 4dc9b47f5..e0badd88d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php
@@ -19,13 +19,13 @@ class GarbageCollectionTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   protected function setUp() {
     parent::setUp();
 
     // These additional tables are necessary due to the call to system_cron().
-    $this->installSchema('system', array('key_value_expire'));
+    $this->installSchema('system', ['key_value_expire']);
   }
 
   /**
@@ -44,13 +44,13 @@ class GarbageCollectionTest extends KernelTestBase {
     // Manually expire the data.
     for ($i = 0; $i <= 3; $i++) {
       db_merge('key_value_expire')
-        ->keys(array(
+        ->keys([
             'name' => 'key_' . $i,
             'collection' => $collection,
-          ))
-        ->fields(array(
+          ])
+        ->fields([
             'expire' => REQUEST_TIME - 1,
-          ))
+          ])
         ->execute();
     }
 
@@ -62,9 +62,9 @@ class GarbageCollectionTest extends KernelTestBase {
     // Query the database and confirm that the stale records were deleted.
     $result = db_query(
       'SELECT name, value FROM {key_value_expire} WHERE collection = :collection',
-      array(
+      [
         ':collection' => $collection,
-      ))->fetchAll();
+      ])->fetchAll();
     $this->assertIdentical(count($result), 1, 'Only one item remains after garbage collection');
 
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
index 068216b34..31300dbcd 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
@@ -19,7 +19,7 @@ class KeyValueContentEntityStorageTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('user', 'entity_test', 'keyvalue_test');
+  public static $modules = ['user', 'entity_test', 'keyvalue_test'];
 
   /**
    * {@inheritdoc}
@@ -32,7 +32,7 @@ class KeyValueContentEntityStorageTest extends KernelTestBase {
   /**
    * Tests CRUD operations.
    */
-  function testCRUD() {
+  public function testCRUD() {
     $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
     // Verify default properties on a newly created empty entity.
     $empty = EntityTestLabel::create();
@@ -69,9 +69,9 @@ class KeyValueContentEntityStorageTest extends KernelTestBase {
     }
 
     // Verify that an entity with an empty ID string is considered empty, too.
-    $empty_id = EntityTestLabel::create(array(
+    $empty_id = EntityTestLabel::create([
       'id' => '',
-    ));
+    ]);
     $this->assertIdentical($empty_id->isNew(), TRUE);
     try {
       $empty_id->save();
@@ -82,10 +82,10 @@ class KeyValueContentEntityStorageTest extends KernelTestBase {
     }
 
     // Verify properties on a newly created entity.
-    $entity_test = EntityTestLabel::create($expected = array(
+    $entity_test = EntityTestLabel::create($expected = [
       'id' => $this->randomMachineName(),
       'name' => $this->randomString(),
-    ));
+    ]);
     $this->assertIdentical($entity_test->id->value, $expected['id']);
     $this->assertTrue($entity_test->uuid->value);
     $this->assertNotEqual($entity_test->uuid->value, $empty->uuid->value);
@@ -125,9 +125,9 @@ class KeyValueContentEntityStorageTest extends KernelTestBase {
 
     // Ensure that creating an entity with the same id as an existing one is not
     // possible.
-    $same_id = EntityTestLabel::create(array(
+    $same_id = EntityTestLabel::create([
       'id' => $entity_test->id(),
-    ));
+    ]);
     $this->assertIdentical($same_id->isNew(), TRUE);
     try {
       $same_id->save();
@@ -138,7 +138,7 @@ class KeyValueContentEntityStorageTest extends KernelTestBase {
     }
 
     // Verify that renaming the ID returns correct status and properties.
-    $ids = array($expected['id'], 'second_' . $this->randomMachineName(4), 'third_' . $this->randomMachineName(4));
+    $ids = [$expected['id'], 'second_' . $this->randomMachineName(4), 'third_' . $this->randomMachineName(4)];
     for ($i = 1; $i < 3; $i++) {
       $old_id = $ids[$i - 1];
       $new_id = $ids[$i];
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
index 48e047dfc..765123426 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
@@ -14,14 +14,14 @@ abstract class StorageTestBase extends KernelTestBase {
    *
    * @var array
    */
-  protected $objects = array();
+  protected $objects = [];
 
   /**
    * An array of data collection labels.
    *
    * @var array
    */
-  protected $collections = array();
+  protected $collections = [];
 
   /**
    * Whether we are using an expirable key/value store.
@@ -34,7 +34,7 @@ abstract class StorageTestBase extends KernelTestBase {
     parent::setUp();
 
     // Define two data collections,
-    $this->collections = array(0 => 'zero', 1 => 'one');
+    $this->collections = [0 => 'zero', 1 => 'one'];
 
     // Create several objects for testing.
     for ($i = 0; $i <= 5; $i++) {
@@ -82,14 +82,14 @@ abstract class StorageTestBase extends KernelTestBase {
     $this->assertFalse($stores[1]->get('foo'));
 
     // Verify that multiple items can be stored.
-    $values = array(
+    $values = [
       'foo' => $this->objects[3],
       'bar' => $this->objects[4],
-    );
+    ];
     $stores[0]->setMultiple($values);
 
     // Verify that multiple items can be retrieved.
-    $result = $stores[0]->getMultiple(array('foo', 'bar'));
+    $result = $stores[0]->getMultiple(['foo', 'bar']);
     foreach ($values as $j => $value) {
       $this->assertIdenticalObject($value, $result[$j]);
     }
@@ -109,15 +109,15 @@ abstract class StorageTestBase extends KernelTestBase {
     }
     // Verify that all items in the other collection are different.
     $result = $stores[1]->getAll();
-    $this->assertEqual($result, array('foo' => $this->objects[5]));
+    $this->assertEqual($result, ['foo' => $this->objects[5]]);
 
     // Verify that multiple items can be deleted.
     $stores[0]->deleteMultiple(array_keys($values));
     $this->assertFalse($stores[0]->get('foo'));
     $this->assertFalse($stores[0]->get('bar'));
-    $this->assertFalse($stores[0]->getMultiple(array('foo', 'bar')));
+    $this->assertFalse($stores[0]->getMultiple(['foo', 'bar']));
     // Verify that deleting no items does not cause an error.
-    $stores[0]->deleteMultiple(array());
+    $stores[0]->deleteMultiple([]);
     // Verify that the item in the other collection still exists.
     $this->assertIdenticalObject($this->objects[5], $stores[1]->get('foo'));
 
@@ -146,7 +146,7 @@ abstract class StorageTestBase extends KernelTestBase {
 
     // Verify that a non-existing key is not returned when getting multiple keys.
     $stores[0]->set('bar', 'baz');
-    $values = $stores[0]->getMultiple(array('foo', 'bar'));
+    $values = $stores[0]->getMultiple(['foo', 'bar']);
     $this->assertFalse(isset($values['foo']), "Key 'foo' not found.");
     $this->assertIdentical($values['bar'], 'baz');
   }
@@ -204,7 +204,7 @@ abstract class StorageTestBase extends KernelTestBase {
    * @see \Drupal\Core\KeyValueStore\DatabaseStorageExpirable::garbageCollection()
    */
   protected function createStorage() {
-    $stores = array();
+    $stores = [];
     foreach ($this->collections as $i => $collection) {
       $stores[$i] = $this->container->get($this->factory)->get($collection);
     }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkDefaultIntegrationTest.php b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkDefaultIntegrationTest.php
index b99988737..d0da9130a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkDefaultIntegrationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkDefaultIntegrationTest.php
@@ -17,9 +17,9 @@ class MenuLinkDefaultIntegrationTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'menu_test',
-  );
+  ];
 
   /**
    * Tests moving a static menu link without a specified menu to the root.
@@ -39,7 +39,7 @@ class MenuLinkDefaultIntegrationTest extends KernelTestBase {
     $this->assertEqual($tree['menu_test.parent']->subtree['menu_test.child']->link->getPluginId(), 'menu_test.child');
 
     // Ensure that the menu name is not forgotten.
-    $menu_link_manager->updateDefinition('menu_test.child', array('parent' => ''));
+    $menu_link_manager->updateDefinition('menu_test.child', ['parent' => '']);
     $menu_link = $menu_link_manager->getDefinition('menu_test.child');
 
     $this->assertEqual($menu_link['parent'], '');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php
index 1efb14bc0..033451ac0 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php
@@ -35,13 +35,13 @@ class MenuLinkTreeTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array(
+  public static $modules = [
     'system',
     'menu_test',
     'menu_link_content',
     'field',
     'link',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -59,12 +59,12 @@ class MenuLinkTreeTest extends KernelTestBase {
    * Tests deleting all the links in a menu.
    */
   public function testDeleteLinksInMenu() {
-    \Drupal::entityManager()->getStorage('menu')->create(array('id' => 'menu1'))->save();
-    \Drupal::entityManager()->getStorage('menu')->create(array('id' => 'menu2'))->save();
+    \Drupal::entityManager()->getStorage('menu')->create(['id' => 'menu1'])->save();
+    \Drupal::entityManager()->getStorage('menu')->create(['id' => 'menu2'])->save();
 
-    \Drupal::entityManager()->getStorage('menu_link_content')->create(array('link' => ['uri' => 'internal:/menu_name_test'], 'menu_name' => 'menu1', 'bundle' => 'menu_link_content'))->save();
-    \Drupal::entityManager()->getStorage('menu_link_content')->create(array('link' => ['uri' => 'internal:/menu_name_test'], 'menu_name' => 'menu1', 'bundle' => 'menu_link_content'))->save();
-    \Drupal::entityManager()->getStorage('menu_link_content')->create(array('link' => ['uri' => 'internal:/menu_name_test'], 'menu_name' => 'menu2', 'bundle' => 'menu_link_content'))->save();
+    \Drupal::entityManager()->getStorage('menu_link_content')->create(['link' => ['uri' => 'internal:/menu_name_test'], 'menu_name' => 'menu1', 'bundle' => 'menu_link_content'])->save();
+    \Drupal::entityManager()->getStorage('menu_link_content')->create(['link' => ['uri' => 'internal:/menu_name_test'], 'menu_name' => 'menu1', 'bundle' => 'menu_link_content'])->save();
+    \Drupal::entityManager()->getStorage('menu_link_content')->create(['link' => ['uri' => 'internal:/menu_name_test'], 'menu_name' => 'menu2', 'bundle' => 'menu_link_content'])->save();
 
     $output = $this->linkTree->load('menu1', new MenuTreeParameters());
     $this->assertEqual(count($output), 2);
@@ -95,16 +95,16 @@ class MenuLinkTreeTest extends KernelTestBase {
     // - 8
     // With link 6 being the only external link.
 
-    $links = array(
-      1 => MenuLinkMock::create(array('id' => 'test.example1', 'route_name' => 'example1', 'title' => 'foo', 'parent' => '')),
-      2 => MenuLinkMock::create(array('id' => 'test.example2', 'route_name' => 'example2', 'title' => 'bar', 'parent' => 'test.example1', 'route_parameters' => array('foo' => 'bar'))),
-      3 => MenuLinkMock::create(array('id' => 'test.example3', 'route_name' => 'example3', 'title' => 'baz', 'parent' => 'test.example2', 'route_parameters' => array('baz' => 'qux'))),
-      4 => MenuLinkMock::create(array('id' => 'test.example4', 'route_name' => 'example4', 'title' => 'qux', 'parent' => 'test.example3')),
-      5 => MenuLinkMock::create(array('id' => 'test.example5', 'route_name' => 'example5', 'title' => 'foofoo', 'parent' => '')),
-      6 => MenuLinkMock::create(array('id' => 'test.example6', 'route_name' => '', 'url' => 'https://www.drupal.org/', 'title' => 'barbar', 'parent' => '')),
-      7 => MenuLinkMock::create(array('id' => 'test.example7', 'route_name' => 'example7', 'title' => 'bazbaz', 'parent' => '')),
-      8 => MenuLinkMock::create(array('id' => 'test.example8', 'route_name' => 'example8', 'title' => 'quxqux', 'parent' => '')),
-    );
+    $links = [
+      1 => MenuLinkMock::create(['id' => 'test.example1', 'route_name' => 'example1', 'title' => 'foo', 'parent' => '']),
+      2 => MenuLinkMock::create(['id' => 'test.example2', 'route_name' => 'example2', 'title' => 'bar', 'parent' => 'test.example1', 'route_parameters' => ['foo' => 'bar']]),
+      3 => MenuLinkMock::create(['id' => 'test.example3', 'route_name' => 'example3', 'title' => 'baz', 'parent' => 'test.example2', 'route_parameters' => ['baz' => 'qux']]),
+      4 => MenuLinkMock::create(['id' => 'test.example4', 'route_name' => 'example4', 'title' => 'qux', 'parent' => 'test.example3']),
+      5 => MenuLinkMock::create(['id' => 'test.example5', 'route_name' => 'example5', 'title' => 'foofoo', 'parent' => '']),
+      6 => MenuLinkMock::create(['id' => 'test.example6', 'route_name' => '', 'url' => 'https://www.drupal.org/', 'title' => 'barbar', 'parent' => '']),
+      7 => MenuLinkMock::create(['id' => 'test.example7', 'route_name' => 'example7', 'title' => 'bazbaz', 'parent' => '']),
+      8 => MenuLinkMock::create(['id' => 'test.example8', 'route_name' => 'example8', 'title' => 'quxqux', 'parent' => '']),
+    ];
     foreach ($links as $instance) {
       $this->menuLinkManager->addDefinition($instance->getPluginId(), $instance->getPluginDefinition());
     }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuTreeStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuTreeStorageTest.php
index cb1d74d96..ad3f04d0a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuTreeStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuTreeStorageTest.php
@@ -77,16 +77,16 @@ class MenuTreeStorageTest extends KernelTestBase {
     // -- test2
     // --- test3
     $this->addMenuLink('test1', '');
-    $this->assertMenuLink('test1', array('has_children' => 0, 'depth' => 1));
+    $this->assertMenuLink('test1', ['has_children' => 0, 'depth' => 1]);
 
     $this->addMenuLink('test2', 'test1');
-    $this->assertMenuLink('test1', array('has_children' => 1, 'depth' => 1), array(), array('test2'));
-    $this->assertMenuLink('test2', array('has_children' => 0, 'depth' => 2), array('test1'));
+    $this->assertMenuLink('test1', ['has_children' => 1, 'depth' => 1], [], ['test2']);
+    $this->assertMenuLink('test2', ['has_children' => 0, 'depth' => 2], ['test1']);
 
     $this->addMenuLink('test3', 'test2');
-    $this->assertMenuLink('test1', array('has_children' => 1, 'depth' => 1), array(), array('test2', 'test3'));
-    $this->assertMenuLink('test2', array('has_children' => 1, 'depth' => 2), array('test1'), array('test3'));
-    $this->assertMenuLink('test3', array('has_children' => 0, 'depth' => 3), array('test2', 'test1'));
+    $this->assertMenuLink('test1', ['has_children' => 1, 'depth' => 1], [], ['test2', 'test3']);
+    $this->assertMenuLink('test2', ['has_children' => 1, 'depth' => 2], ['test1'], ['test3']);
+    $this->assertMenuLink('test3', ['has_children' => 0, 'depth' => 3], ['test2', 'test1']);
   }
 
   /**
@@ -109,11 +109,11 @@ class MenuTreeStorageTest extends KernelTestBase {
     $this->addMenuLink('test5', 'test4');
     $this->addMenuLink('test6', 'test5');
 
-    $this->assertMenuLink('test1', array('has_children' => 1, 'depth' => 1), array(), array('test2', 'test3'));
-    $this->assertMenuLink('test2', array('has_children' => 1, 'depth' => 2), array('test1'), array('test3'));
-    $this->assertMenuLink('test4', array('has_children' => 1, 'depth' => 1), array(), array('test5', 'test6'));
-    $this->assertMenuLink('test5', array('has_children' => 1, 'depth' => 2), array('test4'), array('test6'));
-    $this->assertMenuLink('test6', array('has_children' => 0, 'depth' => 3), array('test5', 'test4'));
+    $this->assertMenuLink('test1', ['has_children' => 1, 'depth' => 1], [], ['test2', 'test3']);
+    $this->assertMenuLink('test2', ['has_children' => 1, 'depth' => 2], ['test1'], ['test3']);
+    $this->assertMenuLink('test4', ['has_children' => 1, 'depth' => 1], [], ['test5', 'test6']);
+    $this->assertMenuLink('test5', ['has_children' => 1, 'depth' => 2], ['test4'], ['test6']);
+    $this->assertMenuLink('test6', ['has_children' => 0, 'depth' => 3], ['test5', 'test4']);
 
     $this->moveMenuLink('test2', 'test5');
     // After the 1st move.
@@ -125,12 +125,12 @@ class MenuTreeStorageTest extends KernelTestBase {
     // ---- test3
     // --- test6
 
-    $this->assertMenuLink('test1', array('has_children' => 0, 'depth' => 1));
-    $this->assertMenuLink('test2', array('has_children' => 1, 'depth' => 3), array('test5', 'test4'), array('test3'));
-    $this->assertMenuLink('test3', array('has_children' => 0, 'depth' => 4), array('test2', 'test5', 'test4'));
-    $this->assertMenuLink('test4', array('has_children' => 1, 'depth' => 1), array(), array('test5', 'test2', 'test3', 'test6'));
-    $this->assertMenuLink('test5', array('has_children' => 1, 'depth' => 2), array('test4'), array('test2', 'test3', 'test6'));
-    $this->assertMenuLink('test6', array('has_children' => 0, 'depth' => 3), array('test5', 'test4'));
+    $this->assertMenuLink('test1', ['has_children' => 0, 'depth' => 1]);
+    $this->assertMenuLink('test2', ['has_children' => 1, 'depth' => 3], ['test5', 'test4'], ['test3']);
+    $this->assertMenuLink('test3', ['has_children' => 0, 'depth' => 4], ['test2', 'test5', 'test4']);
+    $this->assertMenuLink('test4', ['has_children' => 1, 'depth' => 1], [], ['test5', 'test2', 'test3', 'test6']);
+    $this->assertMenuLink('test5', ['has_children' => 1, 'depth' => 2], ['test4'], ['test2', 'test3', 'test6']);
+    $this->assertMenuLink('test6', ['has_children' => 0, 'depth' => 3], ['test5', 'test4']);
 
     $this->moveMenuLink('test4', 'test1');
     $this->moveMenuLink('test3', 'test1');
@@ -143,12 +143,12 @@ class MenuTreeStorageTest extends KernelTestBase {
     // ---- test2
     // ---- test6
 
-    $this->assertMenuLink('test1', array('has_children' => 1, 'depth' => 1), array(), array('test4', 'test5', 'test2', 'test3', 'test6'));
-    $this->assertMenuLink('test2', array('has_children' => 0, 'depth' => 4), array('test5', 'test4', 'test1'));
-    $this->assertMenuLink('test3', array('has_children' => 0, 'depth' => 2), array('test1'));
-    $this->assertMenuLink('test4', array('has_children' => 1, 'depth' => 2), array('test1'), array('test2', 'test5', 'test6'));
-    $this->assertMenuLink('test5', array('has_children' => 1, 'depth' => 3), array('test4', 'test1'), array('test2', 'test6'));
-    $this->assertMenuLink('test6', array('has_children' => 0, 'depth' => 4), array('test5', 'test4', 'test1'));
+    $this->assertMenuLink('test1', ['has_children' => 1, 'depth' => 1], [], ['test4', 'test5', 'test2', 'test3', 'test6']);
+    $this->assertMenuLink('test2', ['has_children' => 0, 'depth' => 4], ['test5', 'test4', 'test1']);
+    $this->assertMenuLink('test3', ['has_children' => 0, 'depth' => 2], ['test1']);
+    $this->assertMenuLink('test4', ['has_children' => 1, 'depth' => 2], ['test1'], ['test2', 'test5', 'test6']);
+    $this->assertMenuLink('test5', ['has_children' => 1, 'depth' => 3], ['test4', 'test1'], ['test2', 'test6']);
+    $this->assertMenuLink('test6', ['has_children' => 0, 'depth' => 4], ['test5', 'test4', 'test1']);
 
     // Deleting a link in the middle should re-attach child links to the parent.
     $this->treeStorage->delete('test4');
@@ -159,12 +159,12 @@ class MenuTreeStorageTest extends KernelTestBase {
     // -- test5
     // --- test2
     // --- test6
-    $this->assertMenuLink('test1', array('has_children' => 1, 'depth' => 1), array(), array('test5', 'test2', 'test3', 'test6'));
-    $this->assertMenuLink('test2', array('has_children' => 0, 'depth' => 3), array('test5', 'test1'));
-    $this->assertMenuLink('test3', array('has_children' => 0, 'depth' => 2), array('test1'));
+    $this->assertMenuLink('test1', ['has_children' => 1, 'depth' => 1], [], ['test5', 'test2', 'test3', 'test6']);
+    $this->assertMenuLink('test2', ['has_children' => 0, 'depth' => 3], ['test5', 'test1']);
+    $this->assertMenuLink('test3', ['has_children' => 0, 'depth' => 2], ['test1']);
     $this->assertFalse($this->treeStorage->load('test4'));
-    $this->assertMenuLink('test5', array('has_children' => 1, 'depth' => 2), array('test1'), array('test2', 'test6'));
-    $this->assertMenuLink('test6', array('has_children' => 0, 'depth' => 3), array('test5', 'test1'));
+    $this->assertMenuLink('test5', ['has_children' => 1, 'depth' => 2], ['test1'], ['test2', 'test6']);
+    $this->assertMenuLink('test6', ['has_children' => 0, 'depth' => 3], ['test5', 'test1']);
   }
 
   /**
@@ -177,12 +177,12 @@ class MenuTreeStorageTest extends KernelTestBase {
     // -- test2 (disabled)
 
     $this->addMenuLink('test1', '');
-    $this->assertMenuLink('test1', array('has_children' => 0, 'depth' => 1));
+    $this->assertMenuLink('test1', ['has_children' => 0, 'depth' => 1]);
 
-    $this->addMenuLink('test2', 'test1', '<front>', array(), 'tools', array('enabled' => 0));
+    $this->addMenuLink('test2', 'test1', '<front>', [], 'tools', ['enabled' => 0]);
     // The 1st link does not have any visible children, so has_children is 0.
-    $this->assertMenuLink('test1', array('has_children' => 0, 'depth' => 1));
-    $this->assertMenuLink('test2', array('has_children' => 0, 'depth' => 2, 'enabled' => 0), array('test1'));
+    $this->assertMenuLink('test1', ['has_children' => 0, 'depth' => 1]);
+    $this->assertMenuLink('test2', ['has_children' => 0, 'depth' => 2, 'enabled' => 0], ['test1']);
 
     // Add more links with parent on the previous one.
     // <footer>
@@ -198,8 +198,8 @@ class MenuTreeStorageTest extends KernelTestBase {
     // ------- test7
     // -------- test8
     // --------- test9
-    $this->addMenuLink('footerA', '', '<front>', array(), 'footer');
-    $visible_children = array();
+    $this->addMenuLink('footerA', '', '<front>', [], 'footer');
+    $visible_children = [];
     for ($i = 3; $i <= $this->treeStorage->maxDepth(); $i++) {
       $parent = $i - 1;
       $this->addMenuLink("test$i", "test$parent");
@@ -207,7 +207,7 @@ class MenuTreeStorageTest extends KernelTestBase {
     }
     // The 1st link does not have any visible children, so has_children is still
     // 0. However, it has visible links below it that will be found.
-    $this->assertMenuLink('test1', array('has_children' => 0, 'depth' => 1), array(), $visible_children);
+    $this->assertMenuLink('test1', ['has_children' => 0, 'depth' => 1], [], $visible_children);
     // This should fail since test9 would end up at greater than max depth.
     try {
       $this->moveMenuLink('test1', 'footerA');
@@ -219,7 +219,7 @@ class MenuTreeStorageTest extends KernelTestBase {
     // The opposite move should work, and change the has_children flag.
     $this->moveMenuLink('footerA', 'test1');
     $visible_children[] = 'footerA';
-    $this->assertMenuLink('test1', array('has_children' => 1, 'depth' => 1), array(), $visible_children);
+    $this->assertMenuLink('test1', ['has_children' => 1, 'depth' => 1], [], $visible_children);
   }
 
   /**
@@ -241,7 +241,7 @@ class MenuTreeStorageTest extends KernelTestBase {
     $this->assertEqual(count($tree['test4']['subtree']['test5']['subtree']), 0);
 
     $parameters = new MenuTreeParameters();
-    $parameters->setActiveTrail(array('test4', 'test5'));
+    $parameters->setActiveTrail(['test4', 'test5']);
     $data = $this->treeStorage->loadTreeData('tools', $parameters);
     $tree = $data['tree'];
     $this->assertEqual(count($tree['test1']['subtree']), 1);
@@ -342,10 +342,10 @@ class MenuTreeStorageTest extends KernelTestBase {
    * Tests MenuTreeStorage::loadByProperties().
    */
   public function testLoadByProperties() {
-    $tests = array(
-      array('foo' => 'bar'),
-      array(0 => 'wrong'),
-    );
+    $tests = [
+      ['foo' => 'bar'],
+      [0 => 'wrong'],
+    ];
     $message = 'An invalid property name throws an exception.';
     foreach ($tests as $properties) {
       try {
@@ -357,8 +357,8 @@ class MenuTreeStorageTest extends KernelTestBase {
         $this->pass($message);
       }
     }
-    $this->addMenuLink('test_link.1', '', 'test', array(), 'menu1');
-    $properties = array('menu_name' => 'menu1');
+    $this->addMenuLink('test_link.1', '', 'test', [], 'menu1');
+    $properties = ['menu_name' => 'menu1'];
     $links = $this->treeStorage->loadByProperties($properties);
     $this->assertEqual('menu1', $links['test_link.1']['menu_name']);
     $this->assertEqual('test', $links['test_link.1']['route_name']);
@@ -367,17 +367,17 @@ class MenuTreeStorageTest extends KernelTestBase {
   /**
    * Adds a link with the given ID and supply defaults.
    */
-  protected function addMenuLink($id, $parent = '', $route_name = 'test', $route_parameters = array(), $menu_name = 'tools', $extra = array()) {
-    $link = array(
+  protected function addMenuLink($id, $parent = '', $route_name = 'test', $route_parameters = [], $menu_name = 'tools', $extra = []) {
+    $link = [
       'id' => $id,
       'menu_name' => $menu_name,
       'route_name' => $route_name,
       'route_parameters' => $route_parameters,
       'title' => 'test',
       'parent' => $parent,
-      'options' => array(),
-      'metadata' => array(),
-    ) + $extra;
+      'options' => [],
+      'metadata' => [],
+    ] + $extra;
     $this->treeStorage->save($link);
   }
 
@@ -407,7 +407,7 @@ class MenuTreeStorageTest extends KernelTestBase {
    * @param array $children
    *   Array of child IDs that are visible (enabled == 1).
    */
-  protected function assertMenuLink($id, array $expected_properties, array $parents = array(), array $children = array()) {
+  protected function assertMenuLink($id, array $expected_properties, array $parents = [], array $children = []) {
     $query = $this->connection->select('menu_tree');
     $query->fields('menu_tree');
     $query->condition('id', $id);
@@ -422,7 +422,7 @@ class MenuTreeStorageTest extends KernelTestBase {
     array_unshift($parents, $raw['id']);
 
     $query = $this->connection->select('menu_tree');
-    $query->fields('menu_tree', array('id', 'mlid'));
+    $query->fields('menu_tree', ['id', 'mlid']);
     $query->condition('id', $parents, 'IN');
     $found_parents = $query->execute()->fetchAllKeyed(0, 1);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Path/AliasTest.php b/web/core/tests/Drupal/KernelTests/Core/Path/AliasTest.php
index 5eb2ace6f..9436115ff 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Path/AliasTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Path/AliasTest.php
@@ -15,7 +15,7 @@ use Drupal\Core\Path\AliasWhitelist;
  */
 class AliasTest extends PathUnitTestBase {
 
-  function testCRUD() {
+  public function testCRUD() {
     //Prepare database table.
     $connection = Database::getConnection();
     $this->fixtures->createTables($connection);
@@ -29,10 +29,10 @@ class AliasTest extends PathUnitTestBase {
     foreach ($aliases as $idx => $alias) {
       $aliasStorage->save($alias['source'], $alias['alias'], $alias['langcode']);
 
-      $result = $connection->query('SELECT * FROM {url_alias} WHERE source = :source AND alias= :alias AND langcode = :langcode', array(':source' => $alias['source'], ':alias' => $alias['alias'], ':langcode' => $alias['langcode']));
+      $result = $connection->query('SELECT * FROM {url_alias} WHERE source = :source AND alias= :alias AND langcode = :langcode', [':source' => $alias['source'], ':alias' => $alias['alias'], ':langcode' => $alias['langcode']]);
       $rows = $result->fetchAll();
 
-      $this->assertEqual(count($rows), 1, format_string('Created an entry for %alias.', array('%alias' => $alias['alias'])));
+      $this->assertEqual(count($rows), 1, format_string('Created an entry for %alias.', ['%alias' => $alias['alias']]));
 
       //Cache the pid for further tests.
       $aliases[$idx]['pid'] = $rows[0]->pid;
@@ -41,12 +41,12 @@ class AliasTest extends PathUnitTestBase {
     //Load a few aliases
     foreach ($aliases as $alias) {
       $pid = $alias['pid'];
-      $loadedAlias = $aliasStorage->load(array('pid' => $pid));
-      $this->assertEqual($loadedAlias, $alias, format_string('Loaded the expected path with pid %pid.', array('%pid' => $pid)));
+      $loadedAlias = $aliasStorage->load(['pid' => $pid]);
+      $this->assertEqual($loadedAlias, $alias, format_string('Loaded the expected path with pid %pid.', ['%pid' => $pid]));
     }
 
     // Load alias by source path.
-    $loadedAlias = $aliasStorage->load(array('source' => '/node/1'));
+    $loadedAlias = $aliasStorage->load(['source' => '/node/1']);
     $this->assertEqual($loadedAlias['alias'], '/alias_for_node_1_und', 'The last created alias loaded by default.');
 
     //Update a few aliases
@@ -55,25 +55,25 @@ class AliasTest extends PathUnitTestBase {
 
       $this->assertEqual($alias['alias'], $fields['original']['alias']);
 
-      $result = $connection->query('SELECT pid FROM {url_alias} WHERE source = :source AND alias= :alias AND langcode = :langcode', array(':source' => $alias['source'], ':alias' => $alias['alias'] . '_updated', ':langcode' => $alias['langcode']));
+      $result = $connection->query('SELECT pid FROM {url_alias} WHERE source = :source AND alias= :alias AND langcode = :langcode', [':source' => $alias['source'], ':alias' => $alias['alias'] . '_updated', ':langcode' => $alias['langcode']]);
       $pid = $result->fetchField();
 
-      $this->assertEqual($pid, $alias['pid'], format_string('Updated entry for pid %pid.', array('%pid' => $pid)));
+      $this->assertEqual($pid, $alias['pid'], format_string('Updated entry for pid %pid.', ['%pid' => $pid]));
     }
 
     //Delete a few aliases
     foreach ($aliases as $alias) {
       $pid = $alias['pid'];
-      $aliasStorage->delete(array('pid' => $pid));
+      $aliasStorage->delete(['pid' => $pid]);
 
-      $result = $connection->query('SELECT * FROM {url_alias} WHERE pid = :pid', array(':pid' => $pid));
+      $result = $connection->query('SELECT * FROM {url_alias} WHERE pid = :pid', [':pid' => $pid]);
       $rows = $result->fetchAll();
 
-      $this->assertEqual(count($rows), 0, format_string('Deleted entry with pid %pid.', array('%pid' => $pid)));
+      $this->assertEqual(count($rows), 0, format_string('Deleted entry with pid %pid.', ['%pid' => $pid]));
     }
   }
 
-  function testLookupPath() {
+  public function testLookupPath() {
     //Prepare database table.
     $connection = Database::getConnection();
     $this->fixtures->createTables($connection);
@@ -84,21 +84,21 @@ class AliasTest extends PathUnitTestBase {
 
     // Test the situation where the source is the same for multiple aliases.
     // Start with a language-neutral alias, which we will override.
-    $path = array(
+    $path = [
       'source' => "/user/1",
       'alias' => '/foo',
-    );
+    ];
 
     $aliasStorage->save($path['source'], $path['alias']);
     $this->assertEqual($aliasManager->getAliasByPath($path['source']), $path['alias'], 'Basic alias lookup works.');
     $this->assertEqual($aliasManager->getPathByAlias($path['alias']), $path['source'], 'Basic source lookup works.');
 
     // Create a language specific alias for the default language (English).
-    $path = array(
+    $path = [
       'source' => "/user/1",
       'alias' => "/users/Dries",
       'langcode' => 'en',
-    );
+    ];
     $aliasStorage->save($path['source'], $path['alias'], $path['langcode']);
     // Hook that clears cache is not executed with unit tests.
     \Drupal::service('path.alias_manager')->cacheClear();
@@ -106,19 +106,19 @@ class AliasTest extends PathUnitTestBase {
     $this->assertEqual($aliasManager->getPathByAlias($path['alias']), $path['source'], 'English source overrides language-neutral source.');
 
     // Create a language-neutral alias for the same path, again.
-    $path = array(
+    $path = [
       'source' => "/user/1",
       'alias' => '/bar',
-    );
+    ];
     $aliasStorage->save($path['source'], $path['alias']);
     $this->assertEqual($aliasManager->getAliasByPath($path['source']), "/users/Dries", 'English alias still returned after entering a language-neutral alias.');
 
     // Create a language-specific (xx-lolspeak) alias for the same path.
-    $path = array(
+    $path = [
       'source' => "/user/1",
       'alias' => '/LOL',
       'langcode' => 'xx-lolspeak',
-    );
+    ];
     $aliasStorage->save($path['source'], $path['alias'], $path['langcode']);
     $this->assertEqual($aliasManager->getAliasByPath($path['source']), "/users/Dries", 'English alias still returned after entering a LOLspeak alias.');
     // The LOLspeak alias should be returned if we really want LOLspeak.
@@ -126,11 +126,11 @@ class AliasTest extends PathUnitTestBase {
 
     // Create a new alias for this path in English, which should override the
     // previous alias for "user/1".
-    $path = array(
+    $path = [
       'source' => "/user/1",
       'alias' => '/users/my-new-path',
       'langcode' => 'en',
-    );
+    ];
     $aliasStorage->save($path['source'], $path['alias'], $path['langcode']);
     // Hook that clears cache is not executed with unit tests.
     $aliasManager->cacheClear();
@@ -139,7 +139,7 @@ class AliasTest extends PathUnitTestBase {
 
     // Remove the English aliases, which should cause a fallback to the most
     // recently created language-neutral alias, 'bar'.
-    $aliasStorage->delete(array('langcode' => 'en'));
+    $aliasStorage->delete(['langcode' => 'en']);
     // Hook that clears cache is not executed with unit tests.
     $aliasManager->cacheClear();
     $this->assertEqual($aliasManager->getAliasByPath($path['source']), '/bar', 'Path lookup falls back to recently created language-neutral alias.');
@@ -155,12 +155,12 @@ class AliasTest extends PathUnitTestBase {
   /**
    * Tests the alias whitelist.
    */
-  function testWhitelist() {
+  public function testWhitelist() {
     // Prepare database table.
     $connection = Database::getConnection();
     $this->fixtures->createTables($connection);
 
-    $memoryCounterBackend = new MemoryCounterBackend('default');
+    $memoryCounterBackend = new MemoryCounterBackend();
 
     // Create AliasManager and Path object.
     $aliasStorage = new AliasStorage($connection, $this->container->get('module_handler'));
@@ -190,7 +190,7 @@ class AliasTest extends PathUnitTestBase {
     $this->assertNull($whitelist->get($this->randomMachineName()));
 
     // Remove the user alias again, whitelist entry should be removed.
-    $aliasStorage->delete(array('source' => '/user/1'));
+    $aliasStorage->delete(['source' => '/user/1']);
     $aliasManager->cacheClear();
     $this->assertNull($whitelist->get('user'));
     $this->assertTrue($whitelist->get('admin'));
diff --git a/web/core/tests/Drupal/KernelTests/Core/Path/PathUnitTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Path/PathUnitTestBase.php
index 9c50f9a45..671dbc479 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Path/PathUnitTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Path/PathUnitTestBase.php
@@ -21,7 +21,7 @@ abstract class PathUnitTestBase extends KernelTestBase {
     $this->fixtures = new UrlAliasFixtures();
     // The alias whitelist expects that the menu path roots are set by a
     // menu router rebuild.
-    \Drupal::state()->set('router.path_roots', array('user', 'admin'));
+    \Drupal::state()->set('router.path_roots', ['user', 'admin']);
   }
 
   protected function tearDown() {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Path/PathValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/Path/PathValidatorTest.php
new file mode 100644
index 000000000..3463dce77
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Path/PathValidatorTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Path;
+
+use Drupal\Core\Routing\RequestContext;
+use Drupal\Core\Url;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the path validator.
+ *
+ * @group Path
+ *
+ * @see \Drupal\Core\Path\PathValidator
+ */
+class PathValidatorTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['path', 'entity_test', 'user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('entity_test');
+  }
+
+  public function testGetUrlIfValidWithoutAccessCheck() {
+    $requestContext = \Drupal::service('router.request_context');
+    $pathValidator = \Drupal::service('path.validator');
+
+    $entity = EntityTest::create([
+      'name' => 'test',
+    ]);
+    $entity->save();
+
+    $methods = [
+      'POST',
+      'GET',
+      'PUT',
+      'PATCH',
+      'DELETE',
+      NULL, // Used in CLI context.
+      FALSE, // If no request was even pushed onto the request stack, and hence
+    ];
+    foreach ($methods as $method) {
+      if ($method === FALSE) {
+        $request_stack = $this->container->get('request_stack');
+        while ($request_stack->getCurrentRequest()) {
+          $request_stack->pop();
+        }
+        $this->container->set('router.request_context', new RequestContext());
+      }
+
+      $requestContext->setMethod($method);
+      /** @var \Drupal\Core\Url $url */
+      $url = $pathValidator->getUrlIfValidWithoutAccessCheck($entity->toUrl()->toString(TRUE)->getGeneratedUrl());
+      $this->assertEquals($method, $requestContext->getMethod());
+      $this->assertInstanceOf(Url::class, $url);
+      $this->assertSame($url->getRouteParameters(), ['entity_test' => $entity->id()]);
+    }
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Path/UrlAlterTest.php b/web/core/tests/Drupal/KernelTests/Core/Path/UrlAlterTest.php
new file mode 100644
index 000000000..37ac65ae8
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Path/UrlAlterTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Path;
+
+use Drupal\Core\Url;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the capability to alter URLs.
+ *
+ * @group Path
+ *
+ * @see \Drupal\Core\Routing\UrlGenerator::processPath
+ */
+class UrlAlterTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['path', 'url_alter_test', 'user'];
+
+  public function testUrlWithQueryString() {
+    // Test outbound query string altering.
+    $url = Url::fromRoute('user.login');
+    $this->assertEquals(\Drupal::request()->getBaseUrl() . '/user/login?foo=bar', $url->toString());
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/CurrentThemeConditionTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/CurrentThemeConditionTest.php
index d9a7cb354..7a69d2eb0 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/CurrentThemeConditionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/CurrentThemeConditionTest.php
@@ -15,31 +15,31 @@ class CurrentThemeConditionTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('system', 'theme_test');
+  public static $modules = ['system', 'theme_test'];
 
   /**
    * Tests the current theme condition.
    */
   public function testCurrentTheme() {
-    \Drupal::service('theme_handler')->install(array('test_theme'));
+    \Drupal::service('theme_handler')->install(['test_theme']);
 
     $manager = \Drupal::service('plugin.manager.condition');
     /** @var $condition \Drupal\Core\Condition\ConditionInterface */
     $condition = $manager->createInstance('current_theme');
-    $condition->setConfiguration(array('theme' => 'test_theme'));
+    $condition->setConfiguration(['theme' => 'test_theme']);
     /** @var $condition_negated \Drupal\Core\Condition\ConditionInterface */
     $condition_negated = $manager->createInstance('current_theme');
-    $condition_negated->setConfiguration(array('theme' => 'test_theme', 'negate' => TRUE));
+    $condition_negated->setConfiguration(['theme' => 'test_theme', 'negate' => TRUE]);
 
-    $this->assertEqual($condition->summary(), SafeMarkup::format('The current theme is @theme', array('@theme' => 'test_theme')));
-    $this->assertEqual($condition_negated->summary(), SafeMarkup::format('The current theme is not @theme', array('@theme' => 'test_theme')));
+    $this->assertEqual($condition->summary(), SafeMarkup::format('The current theme is @theme', ['@theme' => 'test_theme']));
+    $this->assertEqual($condition_negated->summary(), SafeMarkup::format('The current theme is not @theme', ['@theme' => 'test_theme']));
 
     // The expected theme has not been set up yet.
     $this->assertFalse($condition->execute());
     $this->assertTrue($condition_negated->execute());
 
     // Set the expected theme to be used.
-    \Drupal::service('theme_handler')->setDefault('test_theme');
+    $this->config('system.theme')->set('default', 'test_theme')->save();
     \Drupal::theme()->resetActiveTheme();
 
     $this->assertTrue($condition->execute());
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php
index 02f2a5de2..68b6eb770 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php
@@ -42,7 +42,7 @@ class RequestPathTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'field', 'path');
+  public static $modules = ['system', 'user', 'field', 'path'];
 
   /**
    * The current path.
@@ -57,7 +57,7 @@ class RequestPathTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', array('sequences'));
+    $this->installSchema('system', ['sequences']);
 
     $this->pluginManager = $this->container->get('plugin.manager.condition');
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php
index 3c25184ab..bd3bba53d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php
@@ -17,12 +17,12 @@ use Drupal\user\Entity\User;
  */
 class ContextPluginTest extends KernelTestBase {
 
-  public static $modules = array('system', 'user', 'node', 'field', 'filter', 'text');
+  public static $modules = ['system', 'user', 'node', 'field', 'filter', 'text'];
 
   /**
    * Tests basic context definition and value getters and setters.
    */
-  function testContext() {
+  public function testContext() {
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');
     $this->installEntitySchema('node_type');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/DerivativeTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/DerivativeTest.php
index 7a834afcd..251abbf47 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/DerivativeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/DerivativeTest.php
@@ -12,7 +12,7 @@ class DerivativeTest extends PluginTestBase {
   /**
    * Tests getDefinitions() and getDefinition() with a derivativeDecorator.
    */
-  function testDerivativeDecorator() {
+  public function testDerivativeDecorator() {
     // Ensure that getDefinitions() returns the expected definitions.
     $this->assertEqual($this->mockBlockManager->getDefinitions(), $this->mockBlockExpectedDefinitions);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/AnnotatedClassDiscoveryTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
index 9a714c433..9003713f5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
@@ -13,69 +13,69 @@ class AnnotatedClassDiscoveryTest extends DiscoveryTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $this->expectedDefinitions = array(
-      'apple' => array(
+    $this->expectedDefinitions = [
+      'apple' => [
         'id' => 'apple',
         'label' => 'Apple',
         'color' => 'green',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Apple',
         'provider' => 'plugin_test',
-      ),
-      'banana' => array(
+      ],
+      'banana' => [
         'id' => 'banana',
         'label' => 'Banana',
         'color' => 'yellow',
-        'uses' => array(
+        'uses' => [
           'bread' => t('Banana bread'),
-          'loaf' => array(
+          'loaf' => [
             'singular' => '@count loaf',
             'plural' => '@count loaves',
             'context' => NULL,
-          ),
-        ),
+          ],
+        ],
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Banana',
         'provider' => 'plugin_test',
-      ),
-      'cherry' => array(
+      ],
+      'cherry' => [
         'id' => 'cherry',
         'label' => 'Cherry',
         'color' => 'red',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry',
         'provider' => 'plugin_test',
-      ),
-      'kale' => array(
+      ],
+      'kale' => [
         'id' => 'kale',
         'label' => 'Kale',
         'color' => 'green',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Kale',
         'provider' => 'plugin_test',
-      ),
-      'orange' => array(
+      ],
+      'orange' => [
         'id' => 'orange',
         'label' => 'Orange',
         'color' => 'orange',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Orange',
         'provider' => 'plugin_test',
-      ),
-      'big_apple' => array(
+      ],
+      'big_apple' => [
         'id' => 'big_apple',
         'label' => 'Big Apple',
         'color' => 'green',
         'class' => 'Drupal\plugin_test_extended\Plugin\plugin_test\fruit\BigApple',
         'provider' => 'plugin_test_extended',
-      ),
-      'extending_non_installed_class' => array(
+      ],
+      'extending_non_installed_class' => [
         'id' => 'extending_non_installed_class',
         'label' => 'A plugin whose class is extending from a non-installed module class',
         'color' => 'pink',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\ExtendingNonInstalledClass',
         'provider' => 'plugin_test',
-      ),
-    );
+      ],
+    ];
 
     $base_directory = \Drupal::root() . '/core/modules/system/tests/modules/plugin_test/src';
     $base_directory2 = \Drupal::root() . '/core/modules/system/tests/modules/plugin_test_extended/src';
-    $namespaces = new \ArrayObject(array('Drupal\plugin_test' => $base_directory, 'Drupal\plugin_test_extended' => $base_directory2));
+    $namespaces = new \ArrayObject(['Drupal\plugin_test' => $base_directory, 'Drupal\plugin_test_extended' => $base_directory2]);
 
     $annotation_namespaces = ['Drupal\plugin_test\Plugin\Annotation', 'Drupal\plugin_test_extended\Plugin\Annotation'];
     $this->discovery = new AnnotatedClassDiscovery('Plugin/plugin_test/fruit', $namespaces, 'Drupal\Component\Annotation\Plugin', $annotation_namespaces);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
index 5cd8f756e..3ae576cfd 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
@@ -15,23 +15,23 @@ class CustomAnnotationClassDiscoveryTest extends DiscoveryTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->expectedDefinitions = array(
-      'example_1' => array(
+    $this->expectedDefinitions = [
+      'example_1' => [
         'id' => 'example_1',
         'custom' => 'John',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\custom_annotation\Example1',
         'provider' => 'plugin_test',
-      ),
-      'example_2' => array(
+      ],
+      'example_2' => [
         'id' => 'example_2',
         'custom' => 'Paul',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\custom_annotation\Example2',
         'provider' => 'plugin_test',
-      ),
-    );
+      ],
+    ];
 
     $base_directory = \Drupal::root() . '/core/modules/system/tests/modules/plugin_test/src';
-    $root_namespaces = new \ArrayObject(array('Drupal\plugin_test' => $base_directory));
+    $root_namespaces = new \ArrayObject(['Drupal\plugin_test' => $base_directory]);
 
     $this->discovery = new AnnotatedClassDiscovery('Plugin/plugin_test/custom_annotation', $root_namespaces, 'Drupal\plugin_test\Plugin\Annotation\PluginExample');
     $this->emptyDiscovery = new AnnotatedClassDiscovery('Plugin/non_existing_module/non_existing_plugin_type', $root_namespaces, 'Drupal\plugin_test\Plugin\Annotation\PluginExample');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
index a9fbf799e..a6ae259bc 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
@@ -15,73 +15,73 @@ class CustomDirectoryAnnotatedClassDiscoveryTest extends DiscoveryTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->expectedDefinitions = array(
-      'custom_example_1' => array(
+    $this->expectedDefinitions = [
+      'custom_example_1' => [
         'id' => 'custom_example_1',
         'custom' => 'Tim',
         'class' => 'Drupal\plugin_test\CustomDirectoryExample1',
         'provider' => 'plugin_test',
-      ),
-      'custom_example_2' => array(
+      ],
+      'custom_example_2' => [
         'id' => 'custom_example_2',
         'custom' => 'Meghan',
         'class' => 'Drupal\plugin_test\CustomDirectoryExample2',
         'provider' => 'plugin_test',
-      ),
-      'apple' => array(
+      ],
+      'apple' => [
         'id' => 'apple',
         'label' => 'Apple',
         'color' => 'green',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Apple',
         'provider' => 'plugin_test',
-      ),
-      'banana' => array(
+      ],
+      'banana' => [
         'id' => 'banana',
         'label' => 'Banana',
         'color' => 'yellow',
-        'uses' => array(
+        'uses' => [
           'bread' => t('Banana bread'),
-          'loaf' => array(
+          'loaf' => [
             'singular' => '@count loaf',
             'plural' => '@count loaves',
             'context' => NULL,
-          ),
-        ),
+          ],
+        ],
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Banana',
         'provider' => 'plugin_test',
-      ),
-      'cherry' => array(
+      ],
+      'cherry' => [
         'id' => 'cherry',
         'label' => 'Cherry',
         'color' => 'red',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry',
         'provider' => 'plugin_test',
-      ),
-      'kale' => array(
+      ],
+      'kale' => [
         'id' => 'kale',
         'label' => 'Kale',
         'color' => 'green',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Kale',
         'provider' => 'plugin_test',
-      ),
-      'orange' => array(
+      ],
+      'orange' => [
         'id' => 'orange',
         'label' => 'Orange',
         'color' => 'orange',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Orange',
         'provider' => 'plugin_test',
-      ),
-      'extending_non_installed_class' => array(
+      ],
+      'extending_non_installed_class' => [
         'id' => 'extending_non_installed_class',
         'label' => 'A plugin whose class is extending from a non-installed module class',
         'color' => 'pink',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\ExtendingNonInstalledClass',
         'provider' => 'plugin_test',
-      ),
-    );
+      ],
+    ];
 
     $base_directory = \Drupal::root() . '/core/modules/system/tests/modules/plugin_test/src';
-    $namespaces = new \ArrayObject(array('Drupal\plugin_test' => $base_directory));
+    $namespaces = new \ArrayObject(['Drupal\plugin_test' => $base_directory]);
 
     $this->discovery = new AnnotatedClassDiscovery('', $namespaces);
     $empty_namespaces = new \ArrayObject();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/DiscoveryTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/DiscoveryTestBase.php
index bbe207359..a3492ed22 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/DiscoveryTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/DiscoveryTestBase.php
@@ -37,7 +37,7 @@ abstract class DiscoveryTestBase extends KernelTestBase {
   /**
    * Tests getDefinitions() and getDefinition().
    */
-  function testDiscoveryInterface() {
+  public function testDiscoveryInterface() {
     // Ensure that getDefinitions() returns the expected definitions.
     // For the arrays to be identical (instead of only equal), they must be
     // sorted equally, which seems unnecessary here.
@@ -51,7 +51,7 @@ abstract class DiscoveryTestBase extends KernelTestBase {
     }
 
     // Ensure that an empty array is returned if no plugin definitions are found.
-    $this->assertIdentical($this->emptyDiscovery->getDefinitions(), array(), 'array() returned if no plugin definitions are found.');
+    $this->assertIdentical($this->emptyDiscovery->getDefinitions(), [], 'array() returned if no plugin definitions are found.');
 
     // Ensure that NULL is returned as the definition of a non-existing plugin.
     $this->assertIdentical($this->emptyDiscovery->getDefinition('non_existing', FALSE), NULL, 'NULL returned as the definition of a non-existing plugin.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/StaticDiscoveryTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/StaticDiscoveryTest.php
index bd0c31722..fb9eb3a9f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/StaticDiscoveryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/StaticDiscoveryTest.php
@@ -13,20 +13,20 @@ class StaticDiscoveryTest extends DiscoveryTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $this->expectedDefinitions = array(
-      'apple' => array(
+    $this->expectedDefinitions = [
+      'apple' => [
         'label' => 'Apple',
         'color' => 'green',
-      ),
-      'cherry' => array(
+      ],
+      'cherry' => [
         'label' => 'Cherry',
         'color' => 'red',
-      ),
-      'orange' => array(
+      ],
+      'orange' => [
         'label' => 'Orange',
         'color' => 'orange',
-      ),
-    );
+      ],
+    ];
     // Instead of registering the empty discovery component first and then
     // setting the plugin definitions, we set them first and then delete them
     // again. This implicitly tests StaticDiscovery::deleteDefinition() (in
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/FactoryTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/FactoryTest.php
index 47609902d..50da5cfa2 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/FactoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/FactoryTest.php
@@ -14,9 +14,9 @@ class FactoryTest extends PluginTestBase {
   /**
    * Test that DefaultFactory can create a plugin instance.
    */
-  function testDefaultFactory() {
+  public function testDefaultFactory() {
     // Ensure a non-derivative plugin can be instantiated.
-    $plugin = $this->testPluginManager->createInstance('user_login', array('title' => 'Please enter your login name and password'));
+    $plugin = $this->testPluginManager->createInstance('user_login', ['title' => 'Please enter your login name and password']);
     $this->assertIdentical(get_class($plugin), 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserLoginBlock', 'Correct plugin class instantiated with default factory.');
     $this->assertIdentical($plugin->getTitle(), 'Please enter your login name and password', 'Plugin instance correctly configured.');
 
@@ -44,21 +44,21 @@ class FactoryTest extends PluginTestBase {
    * reflection factory and it provides some additional variety in plugin
    * object creation.
    */
-  function testReflectionFactory() {
+  public function testReflectionFactory() {
     // Ensure a non-derivative plugin can be instantiated.
-    $plugin = $this->mockBlockManager->createInstance('user_login', array('title' => 'Please enter your login name and password'));
+    $plugin = $this->mockBlockManager->createInstance('user_login', ['title' => 'Please enter your login name and password']);
     $this->assertIdentical(get_class($plugin), 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserLoginBlock', 'Correct plugin class instantiated.');
     $this->assertIdentical($plugin->getTitle(), 'Please enter your login name and password', 'Plugin instance correctly configured.');
 
     // Ensure a derivative plugin can be instantiated.
-    $plugin = $this->mockBlockManager->createInstance('menu:main_menu', array('depth' => 2));
+    $plugin = $this->mockBlockManager->createInstance('menu:main_menu', ['depth' => 2]);
     $this->assertIdentical($plugin->getContent(), '<ul><li>1<ul><li>1.1</li></ul></li></ul>', 'Derived plugin instance correctly instantiated and configured.');
 
     // Ensure that attempting to instantiate non-existing plugins throws a
     // PluginException. Test this for a non-existing base plugin, a non-existing
     // derivative plugin, and a base plugin that may not be used without
     // deriving.
-    foreach (array('non_existing', 'menu:non_existing', 'menu') as $invalid_id) {
+    foreach (['non_existing', 'menu:non_existing', 'menu'] as $invalid_id) {
       try {
         $this->mockBlockManager->createInstance($invalid_id);
         $this->fail('Drupal\Component\Plugin\Exception\ExceptionInterface expected');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/InspectionTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/InspectionTest.php
index 4ff9573c8..454165d46 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/InspectionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/InspectionTest.php
@@ -12,8 +12,8 @@ class InspectionTest extends PluginTestBase {
   /**
    * Ensure the test plugins correctly implement getPluginId() and getPluginDefinition().
    */
-  function testInspection() {
-    foreach (array('user_login') as $id) {
+  public function testInspection() {
+    foreach (['user_login'] as $id) {
       $plugin = $this->testPluginManager->createInstance($id);
       $expected_definition = $this->testPluginExpectedDefinitions[$id];
       $this->assertIdentical($plugin->getPluginId(), $id);
@@ -22,7 +22,7 @@ class InspectionTest extends PluginTestBase {
     }
     // Skip the 'menu' derived blocks, because MockMenuBlock does not implement
     // PluginInspectionInterface. The others do by extending PluginBase.
-    foreach (array('user_login', 'layout') as $id) {
+    foreach (['user_login', 'layout'] as $id) {
       $plugin = $this->mockBlockManager->createInstance($id);
       $expected_definition = $this->mockBlockExpectedDefinitions[$id];
       $this->assertIdentical($plugin->getPluginId(), $id);
@@ -30,7 +30,7 @@ class InspectionTest extends PluginTestBase {
       $this->assertIdentical($this->castSafeStrings($plugin->getPluginDefinition()), $expected_definition);
     }
     // Test a plugin manager that provides defaults.
-    foreach (array('test_block1', 'test_block2') as $id) {
+    foreach (['test_block1', 'test_block2'] as $id) {
       $plugin = $this->defaultsTestPluginManager->createInstance($id);
       $expected_definition = $this->defaultsTestPluginExpectedDefinitions[$id];
       $this->assertIdentical($plugin->getPluginId(), $id);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
index 2b70ed49f..ccc82369a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
@@ -20,7 +20,7 @@ abstract class PluginTestBase extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('plugin_test');
+  public static $modules = ['plugin_test'];
 
   protected $testPluginManager;
   protected $testPluginExpectedDefinitions;
@@ -42,7 +42,7 @@ abstract class PluginTestBase extends KernelTestBase {
     //   as derivatives and ReflectionFactory.
     $this->testPluginManager = new TestPluginManager();
     $this->mockBlockManager = new MockBlockManager();
-    $module_handler = new ModuleHandler(\Drupal::root(), array(), new MemoryBackend('plugin'), $this->container->get('event_dispatcher'));
+    $module_handler = new ModuleHandler(\Drupal::root(), [], new MemoryBackend(), $this->container->get('event_dispatcher'));
     $this->defaultsTestPluginManager = new DefaultsTestPluginManager($module_handler);
 
     // The expected plugin definitions within each manager. Several tests assert
@@ -50,81 +50,91 @@ abstract class PluginTestBase extends KernelTestBase {
     // necessary API functions.
     // @see TestPluginManager::_construct().
     // @see MockBlockManager::_construct().
-    $this->testPluginExpectedDefinitions = array(
-      'user_login' => array(
+    $this->testPluginExpectedDefinitions = [
+      'user_login' => [
         'label' => 'User login',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserLoginBlock',
-      ),
-    );
-    $this->mockBlockExpectedDefinitions = array(
-      'user_login' => array(
+      ],
+    ];
+    $this->mockBlockExpectedDefinitions = [
+      'user_login' => [
+        'id' => 'user_login',
         'label' => 'User login',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserLoginBlock',
-      ),
-      'menu:main_menu' => array(
+      ],
+      'menu:main_menu' => [
+        'id' => 'menu',
         'label' => 'Main menu',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlock',
-      ),
-      'menu:navigation' => array(
+      ],
+      'menu:navigation' => [
+        'id' => 'menu',
         'label' => 'Navigation',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlock',
-      ),
-      'menu:foo' => array(
+      ],
+      'menu:foo' => [
+        'id' => 'menu',
         'label' => 'Base label',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlock',
         'setting' => 'default',
-      ),
-      'layout' => array(
+      ],
+      'layout' => [
+        'id' => 'layout',
         'label' => 'Layout',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockLayoutBlock',
-      ),
-      'layout:foo' => array(
+      ],
+      'layout:foo' => [
+        'id' => 'layout',
         'label' => 'Layout Foo',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockLayoutBlock',
-      ),
-      'user_name' => array(
+      ],
+      'user_name' => [
+        'id' => 'user_name',
         'label' => 'User name',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserNameBlock',
-        'context' => array(
+        'context' => [
           'user' => new ContextDefinition('entity:user', 'User'),
-        ),
-      ),
-      'user_name_optional' => array(
+        ],
+      ],
+      'user_name_optional' => [
+        'id' => 'user_name_optional',
         'label' => 'User name optional',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserNameBlock',
-        'context' => array(
+        'context' => [
           'user' => new ContextDefinition('entity:user', 'User', FALSE),
-        ),
-      ),
-      'string_context' => array(
+        ],
+      ],
+      'string_context' => [
+        'id' => 'string_context',
         'label' => 'String typed data',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\TypedDataStringBlock',
-      ),
-      'complex_context' => array(
+      ],
+      'complex_context' => [
+        'id' => 'complex_context',
         'label' => 'Complex context',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockComplexContextBlock',
-        'context' => array(
+        'context' => [
           'user' => new ContextDefinition('entity:user', 'User'),
           'node' => new ContextDefinition('entity:node', 'Node'),
-        ),
-      ),
-    );
-    $this->defaultsTestPluginExpectedDefinitions = array(
-      'test_block1' => array(
-        'metadata' => array(
+        ],
+      ],
+    ];
+    $this->defaultsTestPluginExpectedDefinitions = [
+      'test_block1' => [
+        'metadata' => [
           'default' => TRUE,
           'custom' => TRUE,
-        ),
+        ],
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockTestBlock',
-      ),
-      'test_block2' => array(
-        'metadata' => array(
+      ],
+      'test_block2' => [
+        'metadata' => [
           'default' => FALSE,
           'custom' => TRUE,
-        ),
+        ],
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockTestBlock',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php b/web/core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php
index 3ea4c66ea..b4e122b4b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php
@@ -30,7 +30,7 @@ class QueueSerializationTest extends KernelTestBase implements FormInterface {
    *
    * @var array
    */
-  public static $modules = array('system', 'user', 'aggregator');
+  public static $modules = ['system', 'user', 'aggregator'];
 
   /**
    * {@inheritdoc}
@@ -80,10 +80,10 @@ class QueueSerializationTest extends KernelTestBase implements FormInterface {
     $this->installSchema('system', ['key_value_expire', 'sequences']);
     $this->installEntitySchema('user');
     $this->queue = \Drupal::service('queue.database')->get('aggregator_refresh');
-    $test_user = User::create(array(
+    $test_user = User::create([
       'name' => 'foobar',
       'mail' => 'foobar@example.com',
-    ));
+    ]);
     $test_user->save();
     \Drupal::service('current_user')->setAccount($test_user);
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Queue/QueueTest.php b/web/core/tests/Drupal/KernelTests/Core/Queue/QueueTest.php
index 1a2af7d41..8bf48340a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Queue/QueueTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Queue/QueueTest.php
@@ -50,9 +50,9 @@ class QueueTest extends KernelTestBase {
    */
   protected function queueTest($queue1, $queue2) {
     // Create four items.
-    $data = array();
+    $data = [];
     for ($i = 0; $i < 4; $i++) {
-      $data[] = array($this->randomMachineName() => $this->randomMachineName());
+      $data[] = [$this->randomMachineName() => $this->randomMachineName()];
     }
 
     // Queue items 1 and 2 in the queue1.
@@ -60,8 +60,8 @@ class QueueTest extends KernelTestBase {
     $queue1->createItem($data[1]);
 
     // Retrieve two items from queue1.
-    $items = array();
-    $new_items = array();
+    $items = [];
+    $new_items = [];
 
     $items[] = $item = $queue1->claimItem();
     $new_items[] = $item->data;
diff --git a/web/core/tests/Drupal/KernelTests/Core/Render/Element/ActionsTest.php b/web/core/tests/Drupal/KernelTests/Core/Render/Element/ActionsTest.php
new file mode 100644
index 000000000..135c7aabb
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Render/Element/ActionsTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Render\Element;
+
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Render\Element\Actions
+ * @group Render
+ */
+class ActionsTest extends KernelTestBase implements FormInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['key'] = [
+      '#type' => 'submit',
+      '#value' => 'Key',
+      '#dropbutton' => 'submit',
+      '#cache' => [
+        'tags' => ['foo'],
+      ],
+      '#attached' => [
+        'library' => [
+          'system/base',
+        ],
+      ],
+    ];
+    $form['actions']['submit'] = [
+      '#type' => 'submit',
+      '#value' => 'Save',
+    ];
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+  }
+
+  public function testDropbuttonWithBubbleableMetadata() {
+    $result = \Drupal::formBuilder()->getForm($this);
+    \Drupal::service('renderer')->renderRoot($result);
+    $this->assertEquals(['system/base', 'core/drupal.dropbutton'], $result['#attached']['library']);
+    $this->assertEquals(['foo'], $result['#cache']['tags']);
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php b/web/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php
index 3e11695af..906e74bb6 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php
@@ -18,11 +18,11 @@ class RenderElementTypesTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'router_test');
+  public static $modules = ['system', 'router_test'];
 
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('system'));
+    $this->installConfig(['system']);
     \Drupal::service('router.builder')->rebuild();
   }
 
@@ -51,141 +51,141 @@ class RenderElementTypesTest extends KernelTestBase {
   /**
    * Tests system #type 'container'.
    */
-  function testContainer() {
+  public function testContainer() {
     // Basic container with no attributes.
-    $this->assertElements(array(
+    $this->assertElements([
       '#type' => 'container',
       '#markup' => 'foo',
-    ), "<div>foo</div>\n", "#type 'container' with no HTML attributes");
+    ], "<div>foo</div>\n", "#type 'container' with no HTML attributes");
 
     // Container with a class.
-    $this->assertElements(array(
+    $this->assertElements([
       '#type' => 'container',
       '#markup' => 'foo',
-      '#attributes' => array(
-        'class' => array('bar'),
-      ),
-    ), '<div class="bar">foo</div>' . "\n", "#type 'container' with a class HTML attribute");
+      '#attributes' => [
+        'class' => ['bar'],
+      ],
+    ], '<div class="bar">foo</div>' . "\n", "#type 'container' with a class HTML attribute");
 
     // Container with children.
-    $this->assertElements(array(
+    $this->assertElements([
       '#type' => 'container',
-      'child' => array(
+      'child' => [
         '#markup' => 'foo',
-      ),
-    ), "<div>foo</div>\n", "#type 'container' with child elements");
+      ],
+    ], "<div>foo</div>\n", "#type 'container' with child elements");
   }
 
   /**
    * Tests system #type 'html_tag'.
    */
-  function testHtmlTag() {
+  public function testHtmlTag() {
     // Test void element.
-    $this->assertElements(array(
+    $this->assertElements([
       '#type' => 'html_tag',
       '#tag' => 'meta',
       '#value' => 'ignored',
-      '#attributes' => array(
+      '#attributes' => [
         'name' => 'description',
         'content' => 'Drupal test',
-      ),
-    ), '<meta name="description" content="Drupal test" />' . "\n", "#type 'html_tag', void element renders properly");
+      ],
+    ], '<meta name="description" content="Drupal test" />' . "\n", "#type 'html_tag', void element renders properly");
 
     // Test non-void element.
-    $this->assertElements(array(
+    $this->assertElements([
       '#type' => 'html_tag',
       '#tag' => 'section',
       '#value' => 'value',
-      '#attributes' => array(
-        'class' => array('unicorns'),
-      ),
-    ), '<section class="unicorns">value</section>' . "\n", "#type 'html_tag', non-void element renders properly");
+      '#attributes' => [
+        'class' => ['unicorns'],
+      ],
+    ], '<section class="unicorns">value</section>' . "\n", "#type 'html_tag', non-void element renders properly");
 
     // Test empty void element tag.
-    $this->assertElements(array(
+    $this->assertElements([
       '#type' => 'html_tag',
       '#tag' => 'link',
-    ), "<link />\n", "#type 'html_tag' empty void element renders properly");
+    ], "<link />\n", "#type 'html_tag' empty void element renders properly");
 
     // Test empty non-void element tag.
-    $this->assertElements(array(
+    $this->assertElements([
       '#type' => 'html_tag',
       '#tag' => 'section',
-    ), "<section></section>\n", "#type 'html_tag' empty non-void element renders properly");
+    ], "<section></section>\n", "#type 'html_tag' empty non-void element renders properly");
   }
 
   /**
    * Tests system #type 'more_link'.
    */
-  function testMoreLink() {
-    $elements = array(
-      array(
+  public function testMoreLink() {
+    $elements = [
+      [
         'name' => "#type 'more_link' anchor tag generation without extra classes",
-        'value' => array(
+        'value' => [
           '#type' => 'more_link',
           '#url' => Url::fromUri('https://www.drupal.org'),
-        ),
+        ],
         'expected' => '//div[@class="more-link"]/a[@href="https://www.drupal.org" and text()="More"]',
-      ),
-      array(
+      ],
+      [
         'name' => "#type 'more_link' anchor tag generation with different link text",
-        'value' => array(
+        'value' => [
           '#type' => 'more_link',
           '#url' => Url::fromUri('https://www.drupal.org'),
           '#title' => 'More Titles',
-        ),
+        ],
         'expected' => '//div[@class="more-link"]/a[@href="https://www.drupal.org" and text()="More Titles"]',
-      ),
-      array(
+      ],
+      [
         'name' => "#type 'more_link' anchor tag generation with attributes on wrapper",
-        'value' => array(
+        'value' => [
           '#type' => 'more_link',
           '#url' => Url::fromUri('https://www.drupal.org'),
-          '#theme_wrappers' => array(
-            'container' => array(
-              '#attributes' => array(
+          '#theme_wrappers' => [
+            'container' => [
+              '#attributes' => [
                 'title' => 'description',
-                'class' => array('more-link', 'drupal', 'test'),
-              ),
-            ),
-          ),
-        ),
+                'class' => ['more-link', 'drupal', 'test'],
+              ],
+            ],
+          ],
+        ],
         'expected' => '//div[@title="description" and contains(@class, "more-link") and contains(@class, "drupal") and contains(@class, "test")]/a[@href="https://www.drupal.org" and text()="More"]',
-      ),
-      array(
+      ],
+      [
         'name' => "#type 'more_link' anchor tag with a relative path",
-        'value' => array(
+        'value' => [
           '#type' => 'more_link',
           '#url' => Url::fromRoute('router_test.1'),
-        ),
+        ],
         'expected' => '//div[@class="more-link"]/a[@href="' . Url::fromRoute('router_test.1')->toString() . '" and text()="More"]',
-      ),
-      array(
+      ],
+      [
         'name' => "#type 'more_link' anchor tag with a route",
-        'value' => array(
+        'value' => [
           '#type' => 'more_link',
           '#url' => Url::fromRoute('router_test.1'),
-        ),
+        ],
         'expected' => '//div[@class="more-link"]/a[@href="' . \Drupal::urlGenerator()->generate('router_test.1') . '" and text()="More"]',
-      ),
-      array(
+      ],
+      [
         'name' => "#type 'more_link' anchor tag with an absolute path",
-        'value' => array(
+        'value' => [
           '#type' => 'more_link',
           '#url' => Url::fromRoute('system.admin_content'),
-          '#options' => array('absolute' => TRUE),
-        ),
+          '#options' => ['absolute' => TRUE],
+        ],
         'expected' => '//div[@class="more-link"]/a[@href="' . Url::fromRoute('system.admin_content')->setAbsolute()->toString() . '" and text()="More"]',
-      ),
-      array(
+      ],
+      [
         'name' => "#type 'more_link' anchor tag to the front page",
-        'value' => array(
+        'value' => [
           '#type' => 'more_link',
           '#url' => Url::fromRoute('<front>'),
-        ),
+        ],
         'expected' => '//div[@class="more-link"]/a[@href="' . Url::fromRoute('<front>')->toString() . '" and text()="More"]',
-      ),
-    );
+      ],
+    ];
 
     foreach ($elements as $element) {
       $xml = new \SimpleXMLElement(\Drupal::service('renderer')->renderRoot($element['value']));
@@ -197,26 +197,26 @@ class RenderElementTypesTest extends KernelTestBase {
   /**
    * Tests system #type 'system_compact_link'.
    */
-  function testSystemCompactLink() {
-    $elements = array(
-      array(
+  public function testSystemCompactLink() {
+    $elements = [
+      [
         'name' => "#type 'system_compact_link' when admin compact mode is off",
-        'value' => array(
+        'value' => [
           '#type' => 'system_compact_link',
-        ),
+        ],
         'expected' => '//div[@class="compact-link"]/a[contains(@href, "admin/compact/on?") and text()="Hide descriptions"]',
-      ),
-      array(
+      ],
+      [
         'name' => "#type 'system_compact_link' when adding extra attributes",
-        'value' => array(
+        'value' => [
           '#type' => 'system_compact_link',
-          '#attributes' => array(
-            'class' => array('kittens-rule'),
-          ),
-        ),
+          '#attributes' => [
+            'class' => ['kittens-rule'],
+          ],
+        ],
         'expected' => '//div[@class="compact-link"]/a[contains(@href, "admin/compact/on?") and @class="kittens-rule" and text()="Hide descriptions"]',
-      ),
-    );
+      ],
+    ];
 
     foreach ($elements as $element) {
       $xml = new \SimpleXMLElement(\Drupal::service('renderer')->renderRoot($element['value']));
@@ -227,13 +227,13 @@ class RenderElementTypesTest extends KernelTestBase {
     // Set admin compact mode on for additional tests.
     \Drupal::request()->cookies->set('Drupal_visitor_admin_compact_mode', TRUE);
 
-    $element = array(
+    $element = [
       'name' => "#type 'system_compact_link' when admin compact mode is on",
-      'value' => array(
+      'value' => [
         '#type' => 'system_compact_link',
-      ),
+      ],
       'expected' => '//div[@class="compact-link"]/a[contains(@href, "admin/compact?") and text()="Show descriptions"]',
-    );
+    ];
 
     $xml = new \SimpleXMLElement(\Drupal::service('renderer')->renderRoot($element['value']));
     $result = $xml->xpath($element['expected']);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableSortExtenderTest.php b/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableSortExtenderTest.php
index a77d52e51..4291179f4 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableSortExtenderTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableSortExtenderTest.php
@@ -16,125 +16,125 @@ class TableSortExtenderTest extends KernelTestBase {
   /**
    * Tests tablesort_init().
    */
-  function testTableSortInit() {
+  public function testTableSortInit() {
 
     // Test simple table headers.
 
-    $headers = array('foo', 'bar', 'baz');
+    $headers = ['foo', 'bar', 'baz'];
     // Reset $request->query to prevent parameters from Simpletest and Batch API
     // ending up in $ts['query'].
-    $expected_ts = array(
+    $expected_ts = [
       'name' => 'foo',
       'sql' => '',
       'sort' => 'asc',
-      'query' => array(),
-    );
+      'query' => [],
+    ];
     $request = Request::createFromGlobals();
-    $request->query->replace(array());
+    $request->query->replace([]);
     \Drupal::getContainer()->get('request_stack')->push($request);
     $ts = tablesort_init($headers);
-    $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => Html::escape(var_export($ts, TRUE)))));
+    $this->verbose(strtr('$ts: <pre>!ts</pre>', ['!ts' => Html::escape(var_export($ts, TRUE))]));
     $this->assertEqual($ts, $expected_ts, 'Simple table headers sorted correctly.');
 
     // Test with simple table headers plus $_GET parameters that should _not_
     // override the default.
     $request = Request::createFromGlobals();
-    $request->query->replace(array(
+    $request->query->replace([
       // This should not override the table order because only complex
       // headers are overridable.
       'order' => 'bar',
-    ));
+    ]);
     \Drupal::getContainer()->get('request_stack')->push($request);
     $ts = tablesort_init($headers);
-    $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => Html::escape(var_export($ts, TRUE)))));
+    $this->verbose(strtr('$ts: <pre>!ts</pre>', ['!ts' => Html::escape(var_export($ts, TRUE))]));
     $this->assertEqual($ts, $expected_ts, 'Simple table headers plus non-overriding $_GET parameters sorted correctly.');
 
     // Test with simple table headers plus $_GET parameters that _should_
     // override the default.
     $request = Request::createFromGlobals();
-    $request->query->replace(array(
+    $request->query->replace([
       'sort' => 'DESC',
       // Add an unrelated parameter to ensure that tablesort will include
       // it in the links that it creates.
       'alpha' => 'beta',
-    ));
+    ]);
     \Drupal::getContainer()->get('request_stack')->push($request);
     $expected_ts['sort'] = 'desc';
-    $expected_ts['query'] = array('alpha' => 'beta');
+    $expected_ts['query'] = ['alpha' => 'beta'];
     $ts = tablesort_init($headers);
-    $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => Html::escape(var_export($ts, TRUE)))));
+    $this->verbose(strtr('$ts: <pre>!ts</pre>', ['!ts' => Html::escape(var_export($ts, TRUE))]));
     $this->assertEqual($ts, $expected_ts, 'Simple table headers plus $_GET parameters sorted correctly.');
 
     // Test complex table headers.
 
-    $headers = array(
+    $headers = [
       'foo',
-      array(
+      [
         'data' => '1',
         'field' => 'one',
         'sort' => 'asc',
         'colspan' => 1,
-      ),
-      array(
+      ],
+      [
         'data' => '2',
         'field' => 'two',
         'sort' => 'desc',
-      ),
-    );
+      ],
+    ];
     // Reset $_GET from previous assertion.
     $request = Request::createFromGlobals();
-    $request->query->replace(array(
+    $request->query->replace([
       'order' => '2',
-    ));
+    ]);
     \Drupal::getContainer()->get('request_stack')->push($request);
     $ts = tablesort_init($headers);
-    $expected_ts = array(
+    $expected_ts = [
       'name' => '2',
       'sql' => 'two',
       'sort' => 'desc',
-      'query' => array(),
-    );
-    $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => Html::escape(var_export($ts, TRUE)))));
+      'query' => [],
+    ];
+    $this->verbose(strtr('$ts: <pre>!ts</pre>', ['!ts' => Html::escape(var_export($ts, TRUE))]));
     $this->assertEqual($ts, $expected_ts, 'Complex table headers sorted correctly.');
 
     // Test complex table headers plus $_GET parameters that should _not_
     // override the default.
     $request = Request::createFromGlobals();
-    $request->query->replace(array(
+    $request->query->replace([
       // This should not override the table order because this header does not
       // exist.
       'order' => 'bar',
-    ));
+    ]);
     \Drupal::getContainer()->get('request_stack')->push($request);
     $ts = tablesort_init($headers);
-    $expected_ts = array(
+    $expected_ts = [
       'name' => '1',
       'sql' => 'one',
       'sort' => 'asc',
-      'query' => array(),
-    );
-    $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => Html::escape(var_export($ts, TRUE)))));
+      'query' => [],
+    ];
+    $this->verbose(strtr('$ts: <pre>!ts</pre>', ['!ts' => Html::escape(var_export($ts, TRUE))]));
     $this->assertEqual($ts, $expected_ts, 'Complex table headers plus non-overriding $_GET parameters sorted correctly.');
 
     // Test complex table headers plus $_GET parameters that _should_
     // override the default.
     $request = Request::createFromGlobals();
-    $request->query->replace(array(
+    $request->query->replace([
       'order' => '1',
       'sort' => 'ASC',
       // Add an unrelated parameter to ensure that tablesort will include
       // it in the links that it creates.
       'alpha' => 'beta',
-    ));
+    ]);
     \Drupal::getContainer()->get('request_stack')->push($request);
-    $expected_ts = array(
+    $expected_ts = [
       'name' => '1',
       'sql' => 'one',
       'sort' => 'asc',
-      'query' => array('alpha' => 'beta'),
-    );
+      'query' => ['alpha' => 'beta'],
+    ];
     $ts = tablesort_init($headers);
-    $this->verbose(strtr('$ts: <pre>!ts</pre>', array('!ts' => Html::escape(var_export($ts, TRUE)))));
+    $this->verbose(strtr('$ts: <pre>!ts</pre>', ['!ts' => Html::escape(var_export($ts, TRUE))]));
     $this->assertEqual($ts, $expected_ts, 'Complex table headers plus $_GET parameters sorted correctly.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php b/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php
index 34cbfc031..5966eaa74 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php
@@ -21,15 +21,15 @@ class TableTest extends KernelTestBase {
   /**
    * Tableheader.js provides 'sticky' table headers, and is included by default.
    */
-  function testThemeTableStickyHeaders() {
-    $header = array('one', 'two', 'three');
-    $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9));
-    $table = array(
+  public function testThemeTableStickyHeaders() {
+    $header = ['one', 'two', 'three'];
+    $rows = [[1, 2, 3], [4, 5, 6], [7, 8, 9]];
+    $table = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
       '#sticky' => TRUE,
-    );
+    ];
     $this->render($table);
     // Make sure tableheader.js was attached.
     $tableheader = $this->xpath("//script[contains(@src, 'tableheader.js')]");
@@ -40,13 +40,13 @@ class TableTest extends KernelTestBase {
   /**
    * If $sticky is FALSE, no tableheader.js should be included.
    */
-  function testThemeTableNoStickyHeaders() {
-    $header = array('one', 'two', 'three');
-    $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9));
-    $attributes = array();
+  public function testThemeTableNoStickyHeaders() {
+    $header = ['one', 'two', 'three'];
+    $rows = [[1, 2, 3], [4, 5, 6], [7, 8, 9]];
+    $attributes = [];
     $caption = NULL;
-    $colgroups = array();
-    $table = array(
+    $colgroups = [];
+    $table = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
@@ -54,7 +54,7 @@ class TableTest extends KernelTestBase {
       '#caption' => $caption,
       '#colgroups' => $colgroups,
       '#sticky' => FALSE,
-    );
+    ];
     $this->render($table);
     // Make sure tableheader.js was not attached.
     $tableheader = $this->xpath("//script[contains(@src, 'tableheader.js')]");
@@ -66,24 +66,24 @@ class TableTest extends KernelTestBase {
    * Tests that the table header is printed correctly even if there are no rows,
    * and that the empty text is displayed correctly.
    */
-  function testThemeTableWithEmptyMessage() {
-    $header = array(
+  public function testThemeTableWithEmptyMessage() {
+    $header = [
       'Header 1',
-      array(
+      [
         'data' => 'Header 2',
         'colspan' => 2,
-      ),
-    );
-    $table = array(
+      ],
+    ];
+    $table = [
       '#type' => 'table',
       '#header' => $header,
-      '#rows' => array(),
+      '#rows' => [],
       '#empty' => 'Empty row.',
-    );
+    ];
 
     // Enable the Classy theme.
     \Drupal::service('theme_handler')->install(['classy']);
-    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->config('system.theme')->set('default', 'classy')->save();
 
     $this->render($table);
     $this->removeWhiteSpace();
@@ -94,17 +94,17 @@ class TableTest extends KernelTestBase {
   /**
    * Tests that the 'no_striping' option works correctly.
    */
-  function testThemeTableWithNoStriping() {
-    $rows = array(
-      array(
-        'data' => array(1),
+  public function testThemeTableWithNoStriping() {
+    $rows = [
+      [
+        'data' => [1],
         'no_striping' => TRUE,
-      ),
-    );
-    $table = array(
+      ],
+    ];
+    $table = [
       '#type' => 'table',
       '#rows' => $rows,
-    );
+    ];
     $this->render($table);
     $this->assertNoRaw('class="odd"', 'Odd/even classes were not added because $no_striping = TRUE.');
     $this->assertNoRaw('no_striping', 'No invalid no_striping HTML attribute was printed.');
@@ -113,19 +113,19 @@ class TableTest extends KernelTestBase {
   /**
    * Test that the 'footer' option works correctly.
    */
-  function testThemeTableFooter() {
-    $footer = array(
-      array(
-        'data' => array(1),
-      ),
-      array('Foo'),
-    );
+  public function testThemeTableFooter() {
+    $footer = [
+      [
+        'data' => [1],
+      ],
+      ['Foo'],
+    ];
 
-    $table = array(
+    $table = [
       '#type' => 'table',
-      '#rows' => array(),
+      '#rows' => [],
       '#footer' => $footer,
-    );
+    ];
 
     $this->render($table);
     $this->removeWhiteSpace();
@@ -135,18 +135,18 @@ class TableTest extends KernelTestBase {
   /**
    * Tests that the 'header' option in cells works correctly.
    */
-  function testThemeTableHeaderCellOption() {
-    $rows = array(
-      array(
-        array('data' => 1, 'header' => TRUE),
-        array('data' => 1, 'header' => FALSE),
-        array('data' => 1),
-      ),
-    );
-    $table = array(
+  public function testThemeTableHeaderCellOption() {
+    $rows = [
+      [
+        ['data' => 1, 'header' => TRUE],
+        ['data' => 1, 'header' => FALSE],
+        ['data' => 1],
+      ],
+    ];
+    $table = [
       '#type' => 'table',
       '#rows' => $rows,
-    );
+    ];
     $this->render($table);
     $this->removeWhiteSpace();
     $this->assertRaw('<th>1</th><td>1</td><td>1</td>', 'The th and td tags was printed correctly.');
@@ -156,14 +156,14 @@ class TableTest extends KernelTestBase {
    * Tests that the 'responsive-table' class is applied correctly.
    */
   public function testThemeTableResponsive() {
-    $header = array('one', 'two', 'three');
-    $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9));
-    $table = array(
+    $header = ['one', 'two', 'three'];
+    $rows = [[1, 2, 3], [4, 5, 6], [7, 8, 9]];
+    $table = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
       '#responsive' => TRUE,
-    );
+    ];
     $this->render($table);
     $this->assertRaw('responsive-enabled', 'The responsive-enabled class was printed correctly.');
   }
@@ -172,12 +172,12 @@ class TableTest extends KernelTestBase {
    * Tests that the 'responsive-table' class is not applied without headers.
    */
   public function testThemeTableNotResponsiveHeaders() {
-    $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9));
-    $table = array(
+    $rows = [[1, 2, 3], [4, 5, 6], [7, 8, 9]];
+    $table = [
       '#type' => 'table',
       '#rows' => $rows,
       '#responsive' => TRUE,
-    );
+    ];
     $this->render($table);
     $this->assertNoRaw('responsive-enabled', 'The responsive-enabled class is not applied without table headers.');
   }
@@ -186,14 +186,14 @@ class TableTest extends KernelTestBase {
    * Tests that 'responsive-table' class only applied when responsive is TRUE.
    */
   public function testThemeTableNotResponsiveProperty() {
-    $header = array('one', 'two', 'three');
-    $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9));
-    $table = array(
+    $header = ['one', 'two', 'three'];
+    $rows = [[1, 2, 3], [4, 5, 6], [7, 8, 9]];
+    $table = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
       '#responsive' => FALSE,
-    );
+    ];
     $this->render($table);
     $this->assertNoRaw('responsive-enabled', 'The responsive-enabled class is not applied without the "responsive" property set to TRUE.');
   }
@@ -202,21 +202,21 @@ class TableTest extends KernelTestBase {
    * Tests 'priority-medium' and 'priority-low' classes.
    */
   public function testThemeTableResponsivePriority() {
-    $header = array(
+    $header = [
       // Test associative header indices.
-      'associative_key' => array('data' => 1, 'class' => array(RESPONSIVE_PRIORITY_MEDIUM)),
+      'associative_key' => ['data' => 1, 'class' => [RESPONSIVE_PRIORITY_MEDIUM]],
       // Test non-associative header indices.
-      array('data' => 2, 'class' => array(RESPONSIVE_PRIORITY_LOW)),
+      ['data' => 2, 'class' => [RESPONSIVE_PRIORITY_LOW]],
       // Test no responsive priorities.
-      array('data' => 3),
-    );
-    $rows = array(array(4, 5, 6));
-    $table = array(
+      ['data' => 3],
+    ];
+    $rows = [[4, 5, 6]];
+    $table = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
       '#responsive' => TRUE,
-    );
+    ];
     $this->render($table);
     $this->assertRaw('<th class="priority-medium">1</th>', 'Header 1: the priority-medium class was applied correctly.');
     $this->assertRaw('<th class="priority-low">2</th>', 'Header 2: the priority-low class was applied correctly.');
@@ -230,28 +230,28 @@ class TableTest extends KernelTestBase {
    * Tests header elements with a mix of string and render array values.
    */
   public function testThemeTableHeaderRenderArray() {
-    $header = array(
-      array (
-        'data' => array(
+    $header = [
+       [
+        'data' => [
           '#markup' => 'one',
-        ),
-      ),
+        ],
+      ],
       'two',
-      array (
-        'data' => array(
+       [
+        'data' => [
           '#type' => 'html_tag',
           '#tag' => 'b',
           '#value' => 'three',
-        ),
-      ),
-    );
-    $rows = array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9));
-    $table = array(
+        ],
+      ],
+    ];
+    $rows = [[1, 2, 3], [4, 5, 6], [7, 8, 9]];
+    $table = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
       '#responsive' => FALSE,
-    );
+    ];
     $this->render($table);
     $this->removeWhiteSpace();
     $this->assertRaw('<thead><tr><th>one</th><th>two</th><th><b>three</b></th></tr>', 'Table header found.');
@@ -261,37 +261,37 @@ class TableTest extends KernelTestBase {
    * Tests row elements with a mix of string and render array values.
    */
   public function testThemeTableRowRenderArray() {
-    $header = array('one', 'two', 'three');
-    $rows = array(
-      array(
+    $header = ['one', 'two', 'three'];
+    $rows = [
+      [
         '1-one',
-        array(
+        [
           'data' => '1-two'
-        ),
+        ],
         '1-three',
-      ),
-      array(
-        array (
-          'data' => array(
+      ],
+      [
+         [
+          'data' => [
             '#markup' => '2-one',
-          ),
-        ),
+          ],
+        ],
         '2-two',
-        array (
-          'data' => array(
+         [
+          'data' => [
             '#type' => 'html_tag',
             '#tag' => 'b',
             '#value' => '2-three',
-          ),
-        ),
-      ),
-    );
-    $table = array(
+          ],
+        ],
+      ],
+    ];
+    $table = [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
       '#responsive' => FALSE,
-    );
+    ];
     $this->render($table);
     $this->removeWhiteSpace();
     $this->assertRaw('<tbody><tr><td>1-one</td><td>1-two</td><td>1-three</td></tr>', 'Table row 1 found.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Render/RenderTest.php b/web/core/tests/Drupal/KernelTests/Core/Render/RenderTest.php
index 8860c19a1..a64b553a1 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Render/RenderTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Render/RenderTest.php
@@ -16,12 +16,12 @@ class RenderTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'common_test');
+  public static $modules = ['system', 'common_test'];
 
   /**
    * Tests theme preprocess functions being able to attach assets.
    */
-  function testDrupalRenderThemePreprocessAttached() {
+  public function testDrupalRenderThemePreprocessAttached() {
     \Drupal::state()->set('theme_preprocess_attached_test', TRUE);
 
     $test_element = [
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php
index 812e4378b..052e74f35 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php
@@ -36,7 +36,7 @@ class ContentNegotiationRoutingTest extends KernelTestBase {
   /**
    * Tests the content negotiation aspect of routing.
    */
-  function testContentRouting() {
+  public function testContentRouting() {
     /** @var \Drupal\Core\Path\AliasStorageInterface $path_alias_storage */
     $path_alias_storage = $this->container->get('path.alias_storage');
     // Alias with extension pointing to no extension/constant content-type.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php
index 7c06df0b8..1428fde95 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php
@@ -2,7 +2,9 @@
 
 namespace Drupal\KernelTests\Core\Routing;
 
+use Drupal\Core\Cache\MemoryBackend;
 use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
+use Drupal\Core\Lock\NullLockBackend;
 use Drupal\Core\State\State;
 use Drupal\KernelTests\KernelTestBase;
 use Symfony\Component\Routing\Route;
@@ -36,13 +38,13 @@ class MatcherDumperTest extends KernelTestBase {
     parent::setUp();
 
     $this->fixtures = new RoutingFixtures();
-    $this->state = new State(new KeyValueMemoryFactory());
+    $this->state = new State(new KeyValueMemoryFactory(), new MemoryBackend('test'), new NullLockBackend());
   }
 
   /**
    * Confirms that the dumper can be instantiated successfully.
    */
-  function testCreate() {
+  public function testCreate() {
     $connection = Database::getConnection();
     $dumper = new MatcherDumper($connection, $this->state);
 
@@ -53,7 +55,7 @@ class MatcherDumperTest extends KernelTestBase {
   /**
    * Confirms that we can add routes to the dumper.
    */
-  function testAddRoutes() {
+  public function testAddRoutes() {
     $connection = Database::getConnection();
     $dumper = new MatcherDumper($connection, $this->state);
 
@@ -74,7 +76,7 @@ class MatcherDumperTest extends KernelTestBase {
   /**
    * Confirms that we can add routes to the dumper when it already has some.
    */
-  function testAddAdditionalRoutes() {
+  public function testAddAdditionalRoutes() {
     $connection = Database::getConnection();
     $dumper = new MatcherDumper($connection, $this->state);
 
@@ -123,9 +125,9 @@ class MatcherDumperTest extends KernelTestBase {
 
     $this->fixtures->createTables($connection);
 
-    $dumper->dump(array('provider' => 'test'));
+    $dumper->dump(['provider' => 'test']);
 
-    $record = $connection->query("SELECT * FROM {test_routes} WHERE name= :name", array(':name' => 'test_route'))->fetchObject();
+    $record = $connection->query("SELECT * FROM {test_routes} WHERE name= :name", [':name' => 'test_route'])->fetchObject();
 
     $loaded_route = unserialize($record->route);
 
@@ -153,15 +155,15 @@ class MatcherDumperTest extends KernelTestBase {
 
     $this->fixtures->createTables($connection);
 
-    $dumper->dump(array('provider' => 'test'));
+    $dumper->dump(['provider' => 'test']);
     // Using binary for readability, we expect a 0 at any wildcard slug. They
     // should be ordered from longest to shortest.
-    $expected = array(
+    $expected = [
       bindec('1011111'),
       bindec('10111'),
       bindec('111'),
       bindec('101'),
-    );
+    ];
     $this->assertEqual($this->state->get('routing.menu_masks.test_routes'), $expected);
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
index d28ca5e7c..ed59f2f0f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
@@ -7,10 +7,12 @@
 
 namespace Drupal\KernelTests\Core\Routing;
 
+use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Cache\MemoryBackend;
 use Drupal\Core\Database\Database;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
+use Drupal\Core\Lock\NullLockBackend;
 use Drupal\Core\Path\CurrentPathStack;
 use Drupal\Core\Routing\MatcherDumper;
 use Drupal\Core\Routing\RouteProvider;
@@ -81,9 +83,9 @@ class RouteProviderTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
     $this->fixtures = new RoutingFixtures();
-    $this->state = new State(new KeyValueMemoryFactory());
+    $this->state = new State(new KeyValueMemoryFactory(), new MemoryBackend('test'), new NullLockBackend());
     $this->currentPath = new CurrentPathStack(new RequestStack());
-    $this->cache = new MemoryBackend('data');
+    $this->cache = new MemoryBackend();
     $this->pathProcessor = \Drupal::service('path_processor_manager');
     $this->cacheTagsInvalidator = \Drupal::service('cache_tags.invalidator');
   }
@@ -115,7 +117,7 @@ class RouteProviderTest extends KernelTestBase {
     $connection = Database::getConnection();
     $provider = new TestRouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
 
-    $parts = array('node', '5', 'edit');
+    $parts = ['node', '5', 'edit'];
 
     $candidates = $provider->getCandidateOutlines($parts);
 
@@ -143,7 +145,7 @@ class RouteProviderTest extends KernelTestBase {
   /**
    * Confirms that we can find routes with the exact incoming path.
    */
-  function testExactPathMatch() {
+  public function testExactPathMatch() {
     $connection = Database::getConnection();
     $provider = new RouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
 
@@ -167,7 +169,7 @@ class RouteProviderTest extends KernelTestBase {
   /**
    * Confirms that we can find routes whose pattern would match the request.
    */
-  function testOutlinePathMatch() {
+  public function testOutlinePathMatch() {
     $connection = Database::getConnection();
     $provider = new RouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
 
@@ -194,9 +196,110 @@ class RouteProviderTest extends KernelTestBase {
   }
 
   /**
-   * Confirms that a trailing slash on the request doesn't result in a 404.
+   * Data provider for testMixedCasePaths()
    */
-  function testOutlinePathMatchTrailingSlash() {
+  public function providerMixedCaseRoutePaths() {
+    return [
+      ['/path/one', 'route_a'],
+      ['/path/two', NULL],
+      ['/PATH/one', 'route_a'],
+      ['/path/2/one', 'route_b', 'PUT'],
+      ['/paTH/3/one', 'route_b', 'PUT'],
+      // There should be no lower case of a Hebrew letter.
+      ['/somewhere/4/over/the/קainbow', 'route_c'],
+      ['/Somewhere/5/over/the/קainboW', 'route_c'],
+      ['/another/llama/aboUT/22', 'route_d'],
+      ['/another/llama/about/22', 'route_d'],
+      ['/place/meΦω', 'route_e', 'HEAD'],
+      ['/place/meφΩ', 'route_e', 'HEAD'],
+    ];
+  }
+
+  /**
+   * Confirms that we find routes using a case-insensitive path match.
+   *
+   * @dataProvider providerMixedCaseRoutePaths
+   */
+  public function testMixedCasePaths($path, $expected_route_name, $method = 'GET') {
+    // The case-insensitive behavior for higher UTF-8 characters depends on
+    // \Drupal\Component\Utility\Unicode::strtolower() using mb_strtolower()
+    // but kernel tests do not currently run the check that enables it.
+    // @todo remove this when https://www.drupal.org/node/2849669 is fixed.
+    Unicode::check();
+
+    $connection = Database::getConnection();
+    $provider = new RouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
+
+    $this->fixtures->createTables($connection);
+
+    $dumper = new MatcherDumper($connection, $this->state, 'test_routes');
+    $dumper->addRoutes($this->fixtures->mixedCaseRouteCollection());
+    $dumper->dump();
+
+    $request = Request::create($path, $method);
+
+    $routes = $provider->getRouteCollectionForRequest($request);
+
+    if ($expected_route_name) {
+      $this->assertEquals(1, count($routes), 'The correct number of routes was found.');
+      $this->assertNotNull($routes->get($expected_route_name), 'The first matching route was found.');
+    }
+    else {
+      $this->assertEquals(0, count($routes), 'No routes matched.');
+    }
+  }
+
+  /**
+   * Data provider for testMixedCasePaths()
+   */
+  public function providerDuplicateRoutePaths() {
+    // When matching routes with the same fit the route with the lowest-sorting
+    // name should end up first in the resulting route collection.
+    return [
+      ['/path/one', 3, 'route_a'],
+      ['/PATH/one', 3, 'route_a'],
+      ['/path/two', 1, 'route_d'],
+      ['/PATH/three', 0],
+      ['/place/meΦω', 2, 'route_e'],
+      ['/placE/meφΩ', 2, 'route_e'],
+    ];
+  }
+
+  /**
+   * Confirms that we find all routes with the same path.
+   *
+   * @dataProvider providerDuplicateRoutePaths
+   */
+  public function testDuplicateRoutePaths($path, $number, $expected_route_name = NULL) {
+
+    // The case-insensitive behavior for higher UTF-8 characters depends on
+    // \Drupal\Component\Utility\Unicode::strtolower() using mb_strtolower()
+    // but kernel tests do not currently run the check that enables it.
+    // @todo remove this when https://www.drupal.org/node/2849669 is fixed.
+    Unicode::check();
+
+    $connection = Database::getConnection();
+    $provider = new RouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
+
+    $this->fixtures->createTables($connection);
+
+    $dumper = new MatcherDumper($connection, $this->state, 'test_routes');
+    $dumper->addRoutes($this->fixtures->duplicatePathsRouteCollection());
+    $dumper->dump();
+
+    $request = Request::create($path);
+    $routes = $provider->getRouteCollectionForRequest($request);
+    $this->assertEquals($number, count($routes), 'The correct number of routes was found.');
+    if ($expected_route_name) {
+      $route_name = key(current($routes));
+      $this->assertEquals($expected_route_name, $route_name, 'The expected route name was found.');
+    }
+  }
+
+  /**
+   * Confirms that a trailing slash on the request does not result in a 404.
+   */
+  public function testOutlinePathMatchTrailingSlash() {
     $connection = Database::getConnection();
     $provider = new RouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
 
@@ -225,16 +328,16 @@ class RouteProviderTest extends KernelTestBase {
   /**
    * Confirms that we can find routes whose pattern would match the request.
    */
-  function testOutlinePathMatchDefaults() {
+  public function testOutlinePathMatchDefaults() {
     $connection = Database::getConnection();
     $provider = new RouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
 
     $this->fixtures->createTables($connection);
 
     $collection = new RouteCollection();
-    $collection->add('poink', new Route('/some/path/{value}', array(
+    $collection->add('poink', new Route('/some/path/{value}', [
       'value' => 'poink',
-    )));
+    ]));
 
     $dumper = new MatcherDumper($connection, $this->state, 'test_routes');
     $dumper->addRoutes($collection);
@@ -263,16 +366,16 @@ class RouteProviderTest extends KernelTestBase {
   /**
    * Confirms that we can find routes whose pattern would match the request.
    */
-  function testOutlinePathMatchDefaultsCollision() {
+  public function testOutlinePathMatchDefaultsCollision() {
     $connection = Database::getConnection();
     $provider = new RouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
 
     $this->fixtures->createTables($connection);
 
     $collection = new RouteCollection();
-    $collection->add('poink', new Route('/some/path/{value}', array(
+    $collection->add('poink', new Route('/some/path/{value}', [
       'value' => 'poink',
-    )));
+    ]));
     $collection->add('narf', new Route('/some/path/here'));
 
     $dumper = new MatcherDumper($connection, $this->state, 'test_routes');
@@ -302,16 +405,16 @@ class RouteProviderTest extends KernelTestBase {
   /**
    * Confirms that we can find routes whose pattern would match the request.
    */
-  function testOutlinePathMatchDefaultsCollision2() {
+  public function testOutlinePathMatchDefaultsCollision2() {
     $connection = Database::getConnection();
     $provider = new RouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
 
     $this->fixtures->createTables($connection);
 
     $collection = new RouteCollection();
-    $collection->add('poink', new Route('/some/path/{value}', array(
+    $collection->add('poink', new Route('/some/path/{value}', [
       'value' => 'poink',
-    )));
+    ]));
     $collection->add('narf', new Route('/some/path/here'));
     $collection->add('eep', new Route('/something/completely/different'));
 
@@ -328,7 +431,7 @@ class RouteProviderTest extends KernelTestBase {
       $routes_array = $routes->all();
 
       $this->assertEqual(count($routes), 2, 'The correct number of routes was found.');
-      $this->assertEqual(array('narf', 'poink'), array_keys($routes_array), 'Ensure the fitness was taken into account.');
+      $this->assertEqual(['narf', 'poink'], array_keys($routes_array), 'Ensure the fitness was taken into account.');
       $this->assertNotNull($routes->get('narf'), 'The first matching route was found.');
       $this->assertNotNull($routes->get('poink'), 'The second matching route was found.');
       $this->assertNull($routes->get('eep'), 'Non-matching route was not found.');
@@ -341,7 +444,7 @@ class RouteProviderTest extends KernelTestBase {
   /**
    * Confirms that we can find multiple routes that match the request equally.
    */
-  function testOutlinePathMatchDefaultsCollision3() {
+  public function testOutlinePathMatchDefaultsCollision3() {
     $connection = Database::getConnection();
     $provider = new RouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
 
@@ -367,7 +470,7 @@ class RouteProviderTest extends KernelTestBase {
       $routes_array = $routes->all();
 
       $this->assertEqual(count($routes), 2, 'The correct number of routes was found.');
-      $this->assertEqual(array('poink', 'poink2'), array_keys($routes_array), 'Ensure the fitness and name were taken into account in the sort.');
+      $this->assertEqual(['poink', 'poink2'], array_keys($routes_array), 'Ensure the fitness and name were taken into account in the sort.');
       $this->assertNotNull($routes->get('poink'), 'The first matching route was found.');
       $this->assertNotNull($routes->get('poink2'), 'The second matching route was found.');
       $this->assertNull($routes->get('eep'), 'Non-matching route was not found.');
@@ -415,7 +518,7 @@ class RouteProviderTest extends KernelTestBase {
   /**
    * Confirms that an exception is thrown when no matching path is found.
    */
-  function testOutlinePathNoMatch() {
+  public function testOutlinePathNoMatch() {
     $connection = Database::getConnection();
     $provider = new RouteProvider($connection, $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
 
@@ -528,7 +631,7 @@ class RouteProviderTest extends KernelTestBase {
     }
     $this->assertTrue($exception_thrown, 'Random route was not found.');
 
-    $routes = $provider->getRoutesByNames(array('route_c', 'route_d', $this->randomMachineName()));
+    $routes = $provider->getRoutesByNames(['route_c', 'route_d', $this->randomMachineName()]);
     $this->assertEqual(count($routes), 2, 'Only two valid routes found.');
     $this->assertEqual($routes['route_c']->getPath(), '/path/two');
     $this->assertEqual($routes['route_d']->getPath(), '/path/three');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/UrlIntegrationTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/UrlIntegrationTest.php
index a70cc1fa3..053db792c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/UrlIntegrationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/UrlIntegrationTest.php
@@ -19,7 +19,7 @@ class UrlIntegrationTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('user', 'router_test', 'system');
+  public static $modules = ['user', 'router_test', 'system'];
 
   /**
    * Ensures that the access() method on \Drupal\Core\Url objects works.
diff --git a/web/core/tests/Drupal/KernelTests/Core/ServiceProvider/ServiceProviderTest.php b/web/core/tests/Drupal/KernelTests/Core/ServiceProvider/ServiceProviderTest.php
index 2995c973e..970ea0486 100644
--- a/web/core/tests/Drupal/KernelTests/Core/ServiceProvider/ServiceProviderTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/ServiceProvider/ServiceProviderTest.php
@@ -16,12 +16,12 @@ class ServiceProviderTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('file', 'service_provider_test', 'system');
+  public static $modules = ['file', 'service_provider_test', 'system'];
 
   /**
    * Tests that services provided by module service providers get registered to the DIC.
    */
-  function testServiceProviderRegistration() {
+  public function testServiceProviderRegistration() {
     $definition = $this->container->getDefinition('file.usage');
     $this->assertTrue($definition->getClass() == 'Drupal\\service_provider_test\\TestFileUsage', 'Class has been changed');
     $this->assertTrue(\Drupal::hasService('service_provider_test_class'), 'The service_provider_test_class service has been registered to the DIC');
@@ -30,13 +30,13 @@ class ServiceProviderTest extends KernelTestBase {
   /**
    * Tests that the DIC keeps up with module enable/disable in the same request.
    */
-  function testServiceProviderRegistrationDynamic() {
+  public function testServiceProviderRegistrationDynamic() {
     // Uninstall the module and ensure the service provider's service is not registered.
-    \Drupal::service('module_installer')->uninstall(array('service_provider_test'));
+    \Drupal::service('module_installer')->uninstall(['service_provider_test']);
     $this->assertFalse(\Drupal::hasService('service_provider_test_class'), 'The service_provider_test_class service does not exist in the DIC.');
 
     // Install the module and ensure the service provider's service is registered.
-    \Drupal::service('module_installer')->install(array('service_provider_test'));
+    \Drupal::service('module_installer')->install(['service_provider_test']);
     $this->assertTrue(\Drupal::hasService('service_provider_test_class'), 'The service_provider_test_class service exists in the DIC.');
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Session/AccountSwitcherTest.php b/web/core/tests/Drupal/KernelTests/Core/Session/AccountSwitcherTest.php
index 0e6fa8a77..0492d7734 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Session/AccountSwitcherTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Session/AccountSwitcherTest.php
@@ -20,7 +20,7 @@ class AccountSwitcherTest extends KernelTestBase {
     $original_session_saving = $session_handler->isSessionWritable();
 
     // Switch to user with uid 2.
-    $switcher->switchTo(new UserSession(array('uid' => 2)));
+    $switcher->switchTo(new UserSession(['uid' => 2]));
 
     // Verify that the active user has changed, and that session saving is
     // disabled.
@@ -28,7 +28,7 @@ class AccountSwitcherTest extends KernelTestBase {
     $this->assertFalse($session_handler->isSessionWritable(), 'Session saving is disabled.');
 
     // Perform a second (nested) user account switch.
-    $switcher->switchTo(new UserSession(array('uid' => 3)));
+    $switcher->switchTo(new UserSession(['uid' => 3]));
     $this->assertEqual($user->id(), 3, 'Switched to user 3.');
 
     // Revert to the user session that was active between the first and second
diff --git a/web/core/tests/Drupal/KernelTests/Core/Site/SettingsRewriteTest.php b/web/core/tests/Drupal/KernelTests/Core/Site/SettingsRewriteTest.php
index 948236bc4..ef593751b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Site/SettingsRewriteTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Site/SettingsRewriteTest.php
@@ -15,86 +15,86 @@ class SettingsRewriteTest extends KernelTestBase {
   /**
    * Tests the drupal_rewrite_settings() function.
    */
-  function testDrupalRewriteSettings() {
+  public function testDrupalRewriteSettings() {
     include_once \Drupal::root() . '/core/includes/install.inc';
     $site_path = $this->container->get('site.path');
-    $tests = array(
-      array(
+    $tests = [
+      [
         'original' => '$no_index_value_scalar = TRUE;',
-        'settings' => array(
-          'no_index_value_scalar' => (object) array(
+        'settings' => [
+          'no_index_value_scalar' => (object) [
             'value' => FALSE,
             'comment' => 'comment',
-          ),
-        ),
+          ],
+        ],
         'expected' => '$no_index_value_scalar = false; // comment',
-      ),
-      array(
+      ],
+      [
         'original' => '$no_index_value_scalar = TRUE;',
-        'settings' => array(
-          'no_index_value_foo' => array(
-            'foo' => array(
-              'value' => (object) array(
+        'settings' => [
+          'no_index_value_foo' => [
+            'foo' => [
+              'value' => (object) [
                 'value' => NULL,
                 'required' => TRUE,
                 'comment' => 'comment',
-              ),
-            ),
-          ),
-        ),
+              ],
+            ],
+          ],
+        ],
         'expected' => <<<'EXPECTED'
 $no_index_value_scalar = TRUE;
 $no_index_value_foo['foo']['value'] = NULL; // comment
 EXPECTED
-      ),
-      array(
+      ],
+      [
         'original' => '$no_index_value_array = array("old" => "value");',
-        'settings' => array(
-          'no_index_value_array' => (object) array(
+        'settings' => [
+          'no_index_value_array' => (object) [
             'value' => FALSE,
             'required' => TRUE,
             'comment' => 'comment',
-          ),
-        ),
+          ],
+        ],
         'expected' => '$no_index_value_array = array("old" => "value");
 $no_index_value_array = false; // comment',
-      ),
-      array(
+      ],
+      [
         'original' => '$has_index_value_scalar["foo"]["bar"] = NULL;',
-        'settings' => array(
-          'has_index_value_scalar' => array(
-            'foo' => array(
-              'bar' => (object) array(
+        'settings' => [
+          'has_index_value_scalar' => [
+            'foo' => [
+              'bar' => (object) [
                 'value' => FALSE,
                 'required' => TRUE,
                 'comment' => 'comment',
-              ),
-            ),
-          ),
-        ),
+              ],
+            ],
+          ],
+        ],
         'expected' => '$has_index_value_scalar["foo"]["bar"] = false; // comment',
-      ),
-      array(
+      ],
+      [
         'original' => '$has_index_value_scalar["foo"]["bar"] = "foo";',
-        'settings' => array(
-          'has_index_value_scalar' => array(
-            'foo' => array(
-              'value' => (object) array(
-                'value' => array('value' => 2),
+        'settings' => [
+          'has_index_value_scalar' => [
+            'foo' => [
+              'value' => (object) [
+                'value' => ['value' => 2],
                 'required' => TRUE,
                 'comment' => 'comment',
-              ),
-            ),
-          ),
-        ),
+              ],
+            ],
+          ],
+        ],
         'expected' => <<<'EXPECTED'
 $has_index_value_scalar["foo"]["bar"] = "foo";
 $has_index_value_scalar['foo']['value'] = array (
   'value' => 2,
 ); // comment
 EXPECTED
-      ),
-    );
+      ],
+    ];
     foreach ($tests as $test) {
       $filename = Settings::get('file_public_path', $site_path . '/files') . '/mock_settings.php';
       file_put_contents($filename, "<?php\n" . $test['original'] . "\n");
@@ -104,15 +104,15 @@ EXPECTED
 
     // Test that <?php gets added to the start of an empty settings file.
     // Set the array of settings that will be written to the file.
-    $test = array(
-      'settings' => array(
-        'no_index' => (object) array(
+    $test = [
+      'settings' => [
+        'no_index' => (object) [
           'value' => TRUE,
           'required' => TRUE,
-        ),
-      ),
+        ],
+      ],
       'expected' => '$no_index = true;'
-    );
+    ];
     // Make an empty file.
     $filename = Settings::get('file_public_path', $site_path . '/files') . '/mock_settings.php';
     file_put_contents($filename, "");
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php
index 51608ebdc..72cecce22 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php
@@ -17,7 +17,7 @@ class ImageTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /*
    * The images to test with.
@@ -36,19 +36,19 @@ class ImageTest extends KernelTestBase {
     $this->container = \Drupal::service('kernel')->getContainer();
     $this->container->get('request_stack')->push($request);
 
-    $this->testImages = array(
+    $this->testImages = [
       'core/misc/druplicon.png',
       'core/misc/loading.gif',
-    );
+    ];
   }
 
   /**
    * Tests that an image with the sizes attribute is output correctly.
    */
-  function testThemeImageWithSizes() {
+  public function testThemeImageWithSizes() {
     // Test with multipliers.
     $sizes = '(max-width: ' . rand(10, 30) . 'em) 100vw, (max-width: ' . rand(30, 50) . 'em) 50vw, 30vw';
-    $image = array(
+    $image = [
       '#theme' => 'image',
       '#sizes' => $sizes,
       '#uri' => reset($this->testImages),
@@ -56,7 +56,7 @@ class ImageTest extends KernelTestBase {
       '#height' => rand(0, 500) . 'px',
       '#alt' => $this->randomMachineName(),
       '#title' => $this->randomMachineName(),
-    );
+    ];
     $this->render($image);
 
     // Make sure sizes is set.
@@ -66,16 +66,16 @@ class ImageTest extends KernelTestBase {
   /**
    * Tests that an image with the src attribute is output correctly.
    */
-  function testThemeImageWithSrc() {
+  public function testThemeImageWithSrc() {
 
-    $image = array(
+    $image = [
       '#theme' => 'image',
       '#uri' => reset($this->testImages),
       '#width' => rand(0, 1000) . 'px',
       '#height' => rand(0, 500) . 'px',
       '#alt' => $this->randomMachineName(),
       '#title' => $this->randomMachineName(),
-    );
+    ];
     $this->render($image);
 
     // Make sure the src attribute has the correct value.
@@ -85,25 +85,25 @@ class ImageTest extends KernelTestBase {
   /**
    * Tests that an image with the srcset and multipliers is output correctly.
    */
-  function testThemeImageWithSrcsetMultiplier() {
+  public function testThemeImageWithSrcsetMultiplier() {
     // Test with multipliers.
-    $image = array(
+    $image = [
       '#theme' => 'image',
-      '#srcset' => array(
-        array(
+      '#srcset' => [
+        [
           'uri' => $this->testImages[0],
           'multiplier' => '1x',
-        ),
-        array(
+        ],
+        [
           'uri' => $this->testImages[1],
           'multiplier' => '2x',
-        ),
-      ),
+        ],
+      ],
       '#width' => rand(0, 1000) . 'px',
       '#height' => rand(0, 500) . 'px',
       '#alt' => $this->randomMachineName(),
       '#title' => $this->randomMachineName(),
-    );
+    ];
     $this->render($image);
 
     // Make sure the srcset attribute has the correct value.
@@ -113,29 +113,29 @@ class ImageTest extends KernelTestBase {
   /**
    * Tests that an image with the srcset and widths is output correctly.
    */
-  function testThemeImageWithSrcsetWidth() {
+  public function testThemeImageWithSrcsetWidth() {
     // Test with multipliers.
-    $widths = array(
+    $widths = [
       rand(0, 500) . 'w',
       rand(500, 1000) . 'w',
-    );
-    $image = array(
+    ];
+    $image = [
       '#theme' => 'image',
-      '#srcset' => array(
-        array(
+      '#srcset' => [
+        [
           'uri' => $this->testImages[0],
           'width' => $widths[0],
-        ),
-        array(
+        ],
+        [
           'uri' => $this->testImages[1],
           'width' => $widths[1],
-        ),
-      ),
+        ],
+      ],
       '#width' => rand(0, 1000) . 'px',
       '#height' => rand(0, 500) . 'px',
       '#alt' => $this->randomMachineName(),
       '#title' => $this->randomMachineName(),
-    );
+    ];
     $this->render($image);
 
     // Make sure the srcset attribute has the correct value.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php
index 76e14e9f0..294c8dce8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php
@@ -14,21 +14,21 @@ class MessageTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Tests setting messages output.
    */
-  function testMessages() {
+  public function testMessages() {
     // Enable the Classy theme.
     \Drupal::service('theme_handler')->install(['classy']);
-    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->config('system.theme')->set('default', 'classy')->save();
 
     drupal_set_message('An error occurred', 'error');
     drupal_set_message('But then something nice happened');
-    $messages = array(
+    $messages = [
       '#type' => 'status_messages',
-    );
+    ];
     $this->render($messages);
     $this->assertRaw('messages messages--error');
     $this->assertRaw('messages messages--status');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
index 93e931b84..a962fecc5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\KernelTests\Core\Theme;
 
+use Drupal\Core\Path\CurrentPathStack;
+use Drupal\Core\Path\PathMatcherInterface;
 use Drupal\Core\Theme\Registry;
 use Drupal\Core\Utility\ThemeRegistry;
 use Drupal\KernelTests\KernelTestBase;
@@ -18,14 +20,14 @@ class RegistryTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('theme_test', 'system');
+  public static $modules = ['theme_test', 'system'];
 
   protected $profile = 'testing';
 
   /**
    * Tests the behavior of the theme registry class.
    */
-  function testRaceCondition() {
+  public function testRaceCondition() {
     // The theme registry is not marked as persistable in case we don't have a
     // proper request.
     \Drupal::request()->setMethod('GET');
@@ -35,7 +37,7 @@ class RegistryTest extends KernelTestBase {
     // entry to be written in __construct().
     $cache = \Drupal::cache();
     $lock_backend = \Drupal::lock();
-    $registry = new ThemeRegistry($cid, $cache, $lock_backend, array('theme_registry'), $this->container->get('module_handler')->isLoaded());
+    $registry = new ThemeRegistry($cid, $cache, $lock_backend, ['theme_registry'], $this->container->get('module_handler')->isLoaded());
 
     $this->assertTrue(\Drupal::cache()->get($cid), 'Cache entry was created.');
 
@@ -55,7 +57,7 @@ class RegistryTest extends KernelTestBase {
     // Create a new instance of the class. Confirm that both the offset
     // requested previously, and one that has not yet been requested are both
     // available.
-    $registry = new ThemeRegistry($cid, $cache, $lock_backend, array('theme_registry'), $this->container->get('module_handler')->isLoaded());
+    $registry = new ThemeRegistry($cid, $cache, $lock_backend, ['theme_registry'], $this->container->get('module_handler')->isLoaded());
     $this->assertTrue($registry->get('theme_test_template_test'), 'Offset was returned correctly from the theme registry');
     $this->assertTrue($registry->get('theme_test_template_test_2'), 'Offset was returned correctly from the theme registry');
   }
@@ -150,11 +152,44 @@ class RegistryTest extends KernelTestBase {
     /** @var \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler */
     $theme_handler = \Drupal::service('theme_handler');
     $theme_handler->install(['test_theme']);
-    $theme_handler->setDefault('test_theme');
+    $this->config('system.theme')->set('default', 'test_theme')->save();
 
     $registry = new Registry(\Drupal::root(), \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_theme');
     $registry->setThemeManager(\Drupal::theme());
     $this->assertEqual('value', $registry->get()['theme_test_template_test']['variables']['additional']);
   }
 
+  /**
+   * Tests front node theme suggestion generation.
+   */
+  public function testThemeSuggestions() {
+    // Mock the current page as the front page.
+    /** @var PathMatcherInterface $path_matcher */
+    $path_matcher = $this->prophesize(PathMatcherInterface::class);
+    $path_matcher->isFrontPage()->willReturn(TRUE);
+    $this->container->set('path.matcher', $path_matcher->reveal());
+    /** @var CurrentPathStack $path_matcher */
+    $path_current = $this->prophesize(CurrentPathStack::class);
+    $path_current->getPath()->willReturn('/node/1');
+    $this->container->set('path.current', $path_current->reveal());
+
+    // Check suggestions provided through hook_theme_suggestions_html().
+    $suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_html', [[]]);
+    $this->assertSame([
+      'html__node',
+      'html__node__%',
+      'html__node__1',
+      'html__front',
+    ], $suggestions, 'Found expected html node suggestions.');
+
+    // Check suggestions provided through hook_theme_suggestions_page().
+    $suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_page', [[]]);
+    $this->assertSame([
+      'page__node',
+      'page__node__%',
+      'page__node__1',
+      'page__front',
+    ], $suggestions, 'Found expected page node suggestions.');
+  }
+
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/StableThemeTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/StableThemeTest.php
index da585d08f..8a79a9eff 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/StableThemeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/StableThemeTest.php
@@ -47,7 +47,7 @@ class StableThemeTest extends KernelTestBase {
    */
   public function testStableIsDefault() {
     $this->themeHandler->install(['test_stable']);
-    $this->themeHandler->setDefault('test_stable');
+    $this->config('system.theme')->set('default', 'test_stable')->save();
     $theme = $this->themeManager->getActiveTheme();
     /** @var \Drupal\Core\Theme\ActiveTheme $base_theme */
     $base_themes = $theme->getBaseThemes();
@@ -60,7 +60,7 @@ class StableThemeTest extends KernelTestBase {
    */
   public function testWildWest() {
     $this->themeHandler->install(['test_wild_west']);
-    $this->themeHandler->setDefault('test_wild_west');
+    $this->config('system.theme')->set('default', 'test_wild_west')->save();
     $theme = $this->themeManager->getActiveTheme();
     /** @var \Drupal\Core\Theme\ActiveTheme $base_theme */
     $base_themes = $theme->getBaseThemes();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
index b82978cd4..61f647528 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
@@ -18,7 +18,7 @@ class ThemeInstallerTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * {@inheritdoc}
@@ -33,13 +33,13 @@ class ThemeInstallerTest extends KernelTestBase {
 
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('system'));
+    $this->installConfig(['system']);
   }
 
   /**
    * Verifies that no themes are installed by default.
    */
-  function testEmpty() {
+  public function testEmpty() {
     $this->assertFalse($this->extensionConfig()->get('theme'));
 
     $this->assertFalse(array_keys($this->themeHandler()->listInfo()));
@@ -55,13 +55,13 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests installing a theme.
    */
-  function testInstall() {
+  public function testInstall() {
     $name = 'test_basetheme';
 
     $themes = $this->themeHandler()->listInfo();
     $this->assertFalse(isset($themes[$name]));
 
-    $this->themeInstaller()->install(array($name));
+    $this->themeInstaller()->install([$name]);
 
     $this->assertIdentical($this->extensionConfig()->get("theme.$name"), 0);
 
@@ -80,20 +80,20 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests installing a sub-theme.
    */
-  function testInstallSubTheme() {
+  public function testInstallSubTheme() {
     $name = 'test_subtheme';
     $base_name = 'test_basetheme';
 
     $themes = $this->themeHandler()->listInfo();
     $this->assertFalse(array_keys($themes));
 
-    $this->themeInstaller()->install(array($name));
+    $this->themeInstaller()->install([$name]);
 
     $themes = $this->themeHandler()->listInfo();
     $this->assertTrue(isset($themes[$name]));
     $this->assertTrue(isset($themes[$base_name]));
 
-    $this->themeInstaller()->uninstall(array($name));
+    $this->themeInstaller()->uninstall([$name]);
 
     $themes = $this->themeHandler()->listInfo();
     $this->assertFalse(isset($themes[$name]));
@@ -103,7 +103,7 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests installing a non-existing theme.
    */
-  function testInstallNonExisting() {
+  public function testInstallNonExisting() {
     $name = 'non_existing_theme';
 
     $themes = $this->themeHandler()->listInfo();
@@ -111,7 +111,7 @@ class ThemeInstallerTest extends KernelTestBase {
 
     try {
       $message = 'ThemeHandler::install() throws InvalidArgumentException upon installing a non-existing theme.';
-      $this->themeInstaller()->install(array($name));
+      $this->themeInstaller()->install([$name]);
       $this->fail($message);
     }
     catch (\InvalidArgumentException $e) {
@@ -125,12 +125,12 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests installing a theme with a too long name.
    */
-  function testInstallNameTooLong() {
+  public function testInstallNameTooLong() {
     $name = 'test_theme_having_veery_long_name_which_is_too_long';
 
     try {
       $message = 'ThemeHandler::install() throws ExtensionNameLengthException upon installing a theme with a too long name.';
-      $this->themeInstaller()->install(array($name));
+      $this->themeInstaller()->install([$name]);
       $this->fail($message);
     }
     catch (ExtensionNameLengthException $e) {
@@ -141,11 +141,11 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests uninstalling the default theme.
    */
-  function testUninstallDefault() {
+  public function testUninstallDefault() {
     $name = 'stark';
     $other_name = 'bartik';
-    $this->themeInstaller()->install(array($name, $other_name));
-    $this->themeHandler()->setDefault($name);
+    $this->themeInstaller()->install([$name, $other_name]);
+    $this->config('system.theme')->set('default', $name)->save();
 
     $themes = $this->themeHandler()->listInfo();
     $this->assertTrue(isset($themes[$name]));
@@ -153,7 +153,7 @@ class ThemeInstallerTest extends KernelTestBase {
 
     try {
       $message = 'ThemeHandler::uninstall() throws InvalidArgumentException upon disabling default theme.';
-      $this->themeHandler()->uninstall(array($name));
+      $this->themeHandler()->uninstall([$name]);
       $this->fail($message);
     }
     catch (\InvalidArgumentException $e) {
@@ -168,10 +168,10 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests uninstalling the admin theme.
    */
-  function testUninstallAdmin() {
+  public function testUninstallAdmin() {
     $name = 'stark';
     $other_name = 'bartik';
-    $this->themeInstaller()->install(array($name, $other_name));
+    $this->themeInstaller()->install([$name, $other_name]);
     $this->config('system.theme')->set('admin', $name)->save();
 
     $themes = $this->themeHandler()->listInfo();
@@ -180,7 +180,7 @@ class ThemeInstallerTest extends KernelTestBase {
 
     try {
       $message = 'ThemeHandler::uninstall() throws InvalidArgumentException upon disabling admin theme.';
-      $this->themeHandler()->uninstall(array($name));
+      $this->themeHandler()->uninstall([$name]);
       $this->fail($message);
     }
     catch (\InvalidArgumentException $e) {
@@ -195,12 +195,12 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests uninstalling a sub-theme.
    */
-  function testUninstallSubTheme() {
+  public function testUninstallSubTheme() {
     $name = 'test_subtheme';
     $base_name = 'test_basetheme';
 
-    $this->themeInstaller()->install(array($name));
-    $this->themeInstaller()->uninstall(array($name));
+    $this->themeInstaller()->install([$name]);
+    $this->themeInstaller()->uninstall([$name]);
 
     $themes = $this->themeHandler()->listInfo();
     $this->assertFalse(isset($themes[$name]));
@@ -210,15 +210,15 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests uninstalling a base theme before its sub-theme.
    */
-  function testUninstallBaseBeforeSubTheme() {
+  public function testUninstallBaseBeforeSubTheme() {
     $name = 'test_basetheme';
     $sub_name = 'test_subtheme';
 
-    $this->themeInstaller()->install(array($sub_name));
+    $this->themeInstaller()->install([$sub_name]);
 
     try {
       $message = 'ThemeHandler::install() throws InvalidArgumentException upon uninstalling base theme before sub theme.';
-      $this->themeInstaller()->uninstall(array($name));
+      $this->themeInstaller()->uninstall([$name]);
       $this->fail($message);
     }
     catch (\InvalidArgumentException $e) {
@@ -230,7 +230,7 @@ class ThemeInstallerTest extends KernelTestBase {
     $this->assertTrue(isset($themes[$sub_name]));
 
     // Verify that uninstalling both at the same time works.
-    $this->themeInstaller()->uninstall(array($name, $sub_name));
+    $this->themeInstaller()->uninstall([$name, $sub_name]);
 
     $themes = $this->themeHandler()->listInfo();
     $this->assertFalse(isset($themes[$name]));
@@ -240,7 +240,7 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests uninstalling a non-existing theme.
    */
-  function testUninstallNonExisting() {
+  public function testUninstallNonExisting() {
     $name = 'non_existing_theme';
 
     $themes = $this->themeHandler()->listInfo();
@@ -248,7 +248,7 @@ class ThemeInstallerTest extends KernelTestBase {
 
     try {
       $message = 'ThemeHandler::uninstall() throws InvalidArgumentException upon uninstalling a non-existing theme.';
-      $this->themeInstaller()->uninstall(array($name));
+      $this->themeInstaller()->uninstall([$name]);
       $this->fail($message);
     }
     catch (\InvalidArgumentException $e) {
@@ -262,13 +262,13 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests uninstalling a theme.
    */
-  function testUninstall() {
+  public function testUninstall() {
     $name = 'test_basetheme';
 
-    $this->themeInstaller()->install(array($name));
+    $this->themeInstaller()->install([$name]);
     $this->assertTrue($this->config("$name.settings")->get());
 
-    $this->themeInstaller()->uninstall(array($name));
+    $this->themeInstaller()->uninstall([$name]);
 
     $this->assertFalse(array_keys($this->themeHandler()->listInfo()));
     $this->assertFalse(array_keys(system_list('theme')));
@@ -276,7 +276,7 @@ class ThemeInstallerTest extends KernelTestBase {
     $this->assertFalse($this->config("$name.settings")->get());
 
     // Ensure that the uninstalled theme can be installed again.
-    $this->themeInstaller()->install(array($name));
+    $this->themeInstaller()->install([$name]);
     $themes = $this->themeHandler()->listInfo();
     $this->assertTrue(isset($themes[$name]));
     $this->assertEqual($themes[$name]->getName(), $name);
@@ -287,12 +287,12 @@ class ThemeInstallerTest extends KernelTestBase {
   /**
    * Tests uninstalling a theme that is not installed.
    */
-  function testUninstallNotInstalled() {
+  public function testUninstallNotInstalled() {
     $name = 'test_basetheme';
 
     try {
       $message = 'ThemeHandler::uninstall() throws InvalidArgumentException upon uninstalling a theme that is not installed.';
-      $this->themeInstaller()->uninstall(array($name));
+      $this->themeInstaller()->uninstall([$name]);
       $this->fail($message);
     }
     catch (\InvalidArgumentException $e) {
@@ -305,11 +305,11 @@ class ThemeInstallerTest extends KernelTestBase {
    *
    * @see module_test_system_info_alter()
    */
-  function testThemeInfoAlter() {
+  public function testThemeInfoAlter() {
     $name = 'seven';
     $this->container->get('state')->set('module_test.hook_system_info_alter', TRUE);
 
-    $this->themeInstaller()->install(array($name));
+    $this->themeInstaller()->install([$name]);
 
     $themes = $this->themeHandler()->listInfo();
     $this->assertFalse(isset($themes[$name]->info['regions']['test_region']));
@@ -317,7 +317,7 @@ class ThemeInstallerTest extends KernelTestBase {
     // Rebuild module data so we know where module_test is located.
     // @todo Remove as part of https://www.drupal.org/node/2186491
     system_rebuild_module_data();
-    $this->moduleInstaller()->install(array('module_test'), FALSE);
+    $this->moduleInstaller()->install(['module_test'], FALSE);
     $this->assertTrue($this->moduleHandler()->moduleExists('module_test'));
 
     $themes = $this->themeHandler()->listInfo();
@@ -333,7 +333,7 @@ class ThemeInstallerTest extends KernelTestBase {
     $system_list = system_list('theme');
     $this->assertTrue(isset($system_list[$name]->info['regions']['test_region']));
 
-    $this->moduleInstaller()->uninstall(array('module_test'));
+    $this->moduleInstaller()->uninstall(['module_test']);
     $this->assertFalse($this->moduleHandler()->moduleExists('module_test'));
 
     $themes = $this->themeHandler()->listInfo();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php
index 98423ca07..627b903cb 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php
@@ -82,10 +82,9 @@ class ThemeRenderAndAutoescapeTest extends KernelTestBase {
 
   /**
    * Ensures invalid content is handled correctly.
-   *
-   * @expectedException \Exception
    */
   public function testThemeEscapeAndRenderNotPrintable() {
+    $this->setExpectedException(\Exception::class);
     theme_render_and_autoescape(new NonPrintable());
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
index 6c2dfb39f..a077c25a8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
@@ -18,7 +18,7 @@ class ThemeSettingsTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * List of discovered themes.
@@ -30,7 +30,7 @@ class ThemeSettingsTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
     // Theme settings rely on System module's system.theme.global configuration.
-    $this->installConfig(array('system'));
+    $this->installConfig(['system']);
 
     if (!isset($this->availableThemes)) {
       $discovery = new ExtensionDiscovery(\Drupal::root());
@@ -41,22 +41,22 @@ class ThemeSettingsTest extends KernelTestBase {
   /**
    * Tests that $theme.settings are imported and used as default theme settings.
    */
-  function testDefaultConfig() {
+  public function testDefaultConfig() {
     $name = 'test_basetheme';
     $path = $this->availableThemes[$name]->getPath();
     $this->assertTrue(file_exists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml"));
-    $this->container->get('theme_handler')->install(array($name));
+    $this->container->get('theme_handler')->install([$name]);
     $this->assertIdentical(theme_get_setting('base', $name), 'only');
   }
 
   /**
    * Tests that the $theme.settings default config file is optional.
    */
-  function testNoDefaultConfig() {
+  public function testNoDefaultConfig() {
     $name = 'stark';
     $path = $this->availableThemes[$name]->getPath();
     $this->assertFalse(file_exists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml"));
-    $this->container->get('theme_handler')->install(array($name));
+    $this->container->get('theme_handler')->install([$name]);
     $this->assertNotNull(theme_get_setting('features.favicon', $name));
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php
index deaf03345..5d6f61f20 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php
@@ -2,8 +2,10 @@
 
 namespace Drupal\KernelTests\Core\Theme;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Site\Settings;
+use Drupal\Core\Template\TwigPhpStorageCache;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
@@ -19,7 +21,7 @@ class TwigEnvironmentTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system');
+  public static $modules = ['system'];
 
   /**
    * Tests inline templates.
@@ -30,15 +32,15 @@ class TwigEnvironmentTest extends KernelTestBase {
     /** @var \Drupal\Core\Template\TwigEnvironment $environment */
     $environment = \Drupal::service('twig');
     $this->assertEqual($environment->renderInline('test-no-context'), 'test-no-context');
-    $this->assertEqual($environment->renderInline('test-with-context {{ llama }}', array('llama' => 'muuh')), 'test-with-context muuh');
+    $this->assertEqual($environment->renderInline('test-with-context {{ llama }}', ['llama' => 'muuh']), 'test-with-context muuh');
 
-    $element = array();
+    $element = [];
     $unsafe_string = '<script>alert(\'Danger! High voltage!\');</script>';
-    $element['test'] = array(
+    $element['test'] = [
       '#type' => 'inline_template',
       '#template' => 'test-with-context <label>{{ unsafe_content }}</label>',
-      '#context' => array('unsafe_content' => $unsafe_string),
-    );
+      '#context' => ['unsafe_content' => $unsafe_string],
+    ];
     $this->assertEqual($renderer->renderRoot($element), 'test-with-context <label>' . Html::escape($unsafe_string) . '</label>');
 
     // Enable twig_auto_reload and twig_debug.
@@ -50,12 +52,12 @@ class TwigEnvironmentTest extends KernelTestBase {
     $this->container = \Drupal::service('kernel')->rebuildContainer();
     \Drupal::setContainer($this->container);
 
-    $element = array();
-    $element['test'] = array(
+    $element = [];
+    $element['test'] = [
       '#type' => 'inline_template',
       '#template' => 'test-with-context {{ llama }}',
-      '#context' => array('llama' => 'muuh'),
-    );
+      '#context' => ['llama' => 'muuh'],
+    ];
     $element_copy = $element;
     // Render it twice so that twig caching is triggered.
     $this->assertEqual($renderer->renderRoot($element), 'test-with-context muuh');
@@ -83,11 +85,11 @@ class TwigEnvironmentTest extends KernelTestBase {
     $this->assertEqual($renderer->renderRoot($element_copy), $expected);
 
     $name = '{# inline_template_start #}' . $element['test']['#template'];
-    $hash = $this->container->getParameter('twig_extension_hash');
+    $prefix = $environment->getTwigCachePrefix();
 
     $cache = $environment->getCache();
     $class = $environment->getTemplateClass($name);
-    $expected = $hash . '_inline-template' . '_' . hash('sha256', $class);
+    $expected = $prefix . '_inline-template_' . substr(Crypt::hashBase64($class), 0, TwigPhpStorageCache::SUFFIX_SUBSTRING_LENGTH);
     $this->assertEqual($expected, $cache->generateKey($name, $class));
   }
 
@@ -99,7 +101,7 @@ class TwigEnvironmentTest extends KernelTestBase {
     $environment = \Drupal::service('twig');
 
     try {
-      $environment->loadTemplate('this-template-does-not-exist.html.twig')->render(array());
+      $environment->loadTemplate('this-template-does-not-exist.html.twig')->render([]);
       $this->fail('Did not throw an exception as expected.');
     }
     catch (\Twig_Error_Loader $e) {
@@ -116,6 +118,20 @@ class TwigEnvironmentTest extends KernelTestBase {
     // static cache.
     $environment = \Drupal::service('twig');
 
+    // A template basename greater than the constant
+    // TwigPhpStorageCache::SUFFIX_SUBSTRING_LENGTH should get truncated.
+    $cache = $environment->getCache();
+    $long_name = 'core/modules/system/templates/block--system-messages-block.html.twig';
+    $this->assertGreaterThan(TwigPhpStorageCache::SUFFIX_SUBSTRING_LENGTH, strlen(basename($long_name)));
+    $class = $environment->getTemplateClass($long_name);
+    $key = $cache->generateKey($long_name, $class);
+    $prefix = $environment->getTwigCachePrefix();
+    // The key should consist of the prefix, an underscore, and two strings
+    // each truncated to length TwigPhpStorageCache::SUFFIX_SUBSTRING_LENGTH
+    // separated by an underscore.
+    $expected = strlen($prefix) + 2 + 2 * TwigPhpStorageCache::SUFFIX_SUBSTRING_LENGTH;
+    $this->assertEquals($expected, strlen($key));
+
     $original_filename = $environment->getCacheFilename('core/modules/system/templates/container.html.twig');
     \Drupal::getContainer()->set('twig', NULL);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php
index 2e6e5a402..d30d2de13 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php
@@ -90,7 +90,7 @@ class TwigMarkupInterfaceTest extends KernelTestBase {
       $elements = [
         '#type' => 'inline_template',
         '#template' => '{%- if variable is not empty -%}<span>{{ variable }}</span>{%- endif -%}',
-        '#context' => array('variable' => $variable),
+        '#context' => ['variable' => $variable],
       ];
       return $renderer->render($elements);
     });
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php
index 41984d665..f0bbb82a8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php
@@ -42,7 +42,7 @@ class TwigWhiteListTest extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('system', array('sequences'));
+    $this->installSchema('system', ['sequences']);
     $this->installEntitySchema('node');
     $this->installEntitySchema('user');
     $this->installEntitySchema('taxonomy_term');
@@ -71,38 +71,38 @@ class TwigWhiteListTest extends KernelTestBase {
     $this->term->save();
 
     // Create a field.
-    $handler_settings = array(
-      'target_bundles' => array(
+    $handler_settings = [
+      'target_bundles' => [
         $vocabulary->id() => $vocabulary->id(),
-      ),
+      ],
       'auto_create' => TRUE,
-    );
+    ];
     // Add the term field.
-    FieldStorageConfig::create(array(
+    FieldStorageConfig::create([
       'field_name' => 'field_term',
       'type' => 'entity_reference',
       'entity_type' => 'node',
       'cardinality' => 1,
-      'settings' => array(
+      'settings' => [
         'target_type' => 'taxonomy_term',
-      ),
-    ))->save();
-    FieldConfig::create(array(
+      ],
+    ])->save();
+    FieldConfig::create([
       'field_name' => 'field_term',
       'entity_type' => 'node',
       'bundle' => 'page',
       'label' => 'Terms',
-      'settings' => array(
+      'settings' => [
         'handler' => 'default',
         'handler_settings' => $handler_settings,
-      ),
-    ))->save();
+      ],
+    ])->save();
 
     // Show on default display and teaser.
     entity_get_display('node', 'page', 'default')
-      ->setComponent('field_term', array(
+      ->setComponent('field_term', [
         'type' => 'entity_reference_label',
-      ))
+      ])
       ->save();
     // Boot twig environment.
     $this->twig = \Drupal::service('twig');
diff --git a/web/core/tests/Drupal/KernelTests/Core/TypedData/AllowedValuesConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/TypedData/AllowedValuesConstraintValidatorTest.php
index 4a23fbbc9..05a36ba2e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TypedData/AllowedValuesConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TypedData/AllowedValuesConstraintValidatorTest.php
@@ -32,7 +32,7 @@ class AllowedValuesConstraintValidatorTest extends KernelTestBase {
   public function testValidation() {
     // Create a definition that specifies some AllowedValues.
     $definition = DataDefinition::create('integer')
-      ->addConstraint('AllowedValues', array(1, 2, 3));
+      ->addConstraint('AllowedValues', [1, 2, 3]);
 
     // Test the validation.
     $typed_data = $this->typedData->create($definition, 1);
diff --git a/web/core/tests/Drupal/KernelTests/Core/TypedData/ComplexDataConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/TypedData/ComplexDataConstraintValidatorTest.php
index 078cb7a79..bbdf10992 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TypedData/ComplexDataConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TypedData/ComplexDataConstraintValidatorTest.php
@@ -35,19 +35,19 @@ class ComplexDataConstraintValidatorTest extends KernelTestBase {
     // Create a definition that specifies some ComplexData constraint.
     $definition = MapDataDefinition::create()
       ->setPropertyDefinition('key', DataDefinition::create('integer'))
-      ->addConstraint('ComplexData', array(
-        'key' => array(
-          'AllowedValues' => array(1, 2, 3)
-        ),
-      ));
+      ->addConstraint('ComplexData', [
+        'key' => [
+          'AllowedValues' => [1, 2, 3]
+        ],
+      ]);
 
     // Test the validation.
-    $typed_data = $this->typedData->create($definition, array('key' => 1));
+    $typed_data = $this->typedData->create($definition, ['key' => 1]);
     $violations = $typed_data->validate();
     $this->assertEqual($violations->count(), 0, 'Validation passed for correct value.');
 
     // Test the validation when an invalid value is passed.
-    $typed_data = $this->typedData->create($definition, array('key' => 4));
+    $typed_data = $this->typedData->create($definition, ['key' => 4]);
     $violations = $typed_data->validate();
     $this->assertEqual($violations->count(), 1, 'Validation failed for incorrect value.');
 
@@ -59,19 +59,19 @@ class ComplexDataConstraintValidatorTest extends KernelTestBase {
 
     // Test using the constraint with a map without the specified key. This
     // should be ignored as long as there is no NotNull or NotBlank constraint.
-    $typed_data = $this->typedData->create($definition, array('foo' => 'bar'));
+    $typed_data = $this->typedData->create($definition, ['foo' => 'bar']);
     $violations = $typed_data->validate();
     $this->assertEqual($violations->count(), 0, 'Constraint on non-existing key is ignored.');
 
     $definition = MapDataDefinition::create()
       ->setPropertyDefinition('key', DataDefinition::create('integer'))
-      ->addConstraint('ComplexData', array(
-        'key' => array(
-          'NotNull' => array()
-        ),
-      ));
+      ->addConstraint('ComplexData', [
+        'key' => [
+          'NotNull' => []
+        ],
+      ]);
 
-    $typed_data = $this->typedData->create($definition, array('foo' => 'bar'));
+    $typed_data = $this->typedData->create($definition, ['foo' => 'bar']);
     $violations = $typed_data->validate();
     $this->assertEqual($violations->count(), 1, 'Key is required.');
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php
index 4ff9ff6da..8aeab575e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php
@@ -66,7 +66,7 @@ class TypedDataDefinitionTest extends KernelTestBase {
     $this->assertTrue($map_definition instanceof ComplexDataDefinitionInterface);
 
     // Test retrieving metadata about contained properties.
-    $this->assertEqual(array_keys($map_definition->getPropertyDefinitions()), array('one', 'two', 'three'));
+    $this->assertEqual(array_keys($map_definition->getPropertyDefinitions()), ['one', 'two', 'three']);
     $this->assertEqual($map_definition->getPropertyDefinition('one')->getDataType(), 'string');
     $this->assertNull($map_definition->getMainPropertyName());
     $this->assertNull($map_definition->getPropertyDefinition('invalid'));
diff --git a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
index 08f27b368..c79f2cfc9 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
@@ -38,7 +38,7 @@ class TypedDataTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'field', 'file', 'user');
+  public static $modules = ['system', 'field', 'file', 'user'];
 
   protected function setUp() {
     parent::setup();
@@ -66,7 +66,7 @@ class TypedDataTest extends KernelTestBase {
    */
   public function testGetAndSet() {
     // Boolean type.
-    $typed_data = $this->createTypedData(array('type' => 'boolean'), TRUE);
+    $typed_data = $this->createTypedData(['type' => 'boolean'], TRUE);
     $this->assertTrue($typed_data instanceof BooleanInterface, 'Typed data object is an instance of BooleanInterface.');
     $this->assertTrue($typed_data->getValue() === TRUE, 'Boolean value was fetched.');
     $this->assertEqual($typed_data->validate()->count(), 0);
@@ -82,7 +82,7 @@ class TypedDataTest extends KernelTestBase {
 
     // String type.
     $value = $this->randomString();
-    $typed_data = $this->createTypedData(array('type' => 'string'), $value);
+    $typed_data = $this->createTypedData(['type' => 'string'], $value);
     $this->assertTrue($typed_data instanceof StringInterface, 'Typed data object is an instance of StringInterface.');
     $this->assertTrue($typed_data->getValue() === $value, 'String value was fetched.');
     $this->assertEqual($typed_data->validate()->count(), 0);
@@ -95,12 +95,12 @@ class TypedDataTest extends KernelTestBase {
     $typed_data->setValue(NULL);
     $this->assertNull($typed_data->getValue(), 'String wrapper is null-able.');
     $this->assertEqual($typed_data->validate()->count(), 0);
-    $typed_data->setValue(array('no string'));
+    $typed_data->setValue(['no string']);
     $this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
 
     // Integer type.
     $value = rand();
-    $typed_data = $this->createTypedData(array('type' => 'integer'), $value);
+    $typed_data = $this->createTypedData(['type' => 'integer'], $value);
     $this->assertTrue($typed_data instanceof IntegerInterface, 'Typed data object is an instance of IntegerInterface.');
     $this->assertTrue($typed_data->getValue() === $value, 'Integer value was fetched.');
     $this->assertEqual($typed_data->validate()->count(), 0);
@@ -117,7 +117,7 @@ class TypedDataTest extends KernelTestBase {
 
     // Float type.
     $value = 123.45;
-    $typed_data = $this->createTypedData(array('type' => 'float'), $value);
+    $typed_data = $this->createTypedData(['type' => 'float'], $value);
     $this->assertTrue($typed_data instanceof FloatInterface, 'Typed data object is an instance of FloatInterface.');
     $this->assertTrue($typed_data->getValue() === $value, 'Float value was fetched.');
     $this->assertEqual($typed_data->validate()->count(), 0);
@@ -134,7 +134,7 @@ class TypedDataTest extends KernelTestBase {
 
     // Date Time type.
     $value = '2014-01-01T20:00:00+00:00';
-    $typed_data = $this->createTypedData(array('type' => 'datetime_iso8601'), $value);
+    $typed_data = $this->createTypedData(['type' => 'datetime_iso8601'], $value);
     $this->assertTrue($typed_data instanceof DateTimeInterface, 'Typed data object is an instance of DateTimeInterface.');
     $this->assertTrue($typed_data->getValue() == $value, 'Date value was fetched.');
     $this->assertEqual($typed_data->getValue(), $typed_data->getDateTime()->format('c'), 'Value representation of a date is ISO 8601');
@@ -151,7 +151,7 @@ class TypedDataTest extends KernelTestBase {
     $typed_data->setValue('invalid');
     $this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
     // Check implementation of DateTimeInterface.
-    $typed_data = $this->createTypedData(array('type' => 'datetime_iso8601'), '2014-01-01T20:00:00+00:00');
+    $typed_data = $this->createTypedData(['type' => 'datetime_iso8601'], '2014-01-01T20:00:00+00:00');
     $this->assertTrue($typed_data->getDateTime() instanceof DrupalDateTime);
     $typed_data->setDateTime(new DrupalDateTime('2014-01-02T20:00:00+00:00'));
     $this->assertEqual($typed_data->getValue(), '2014-01-02T20:00:00+00:00');
@@ -160,7 +160,7 @@ class TypedDataTest extends KernelTestBase {
 
     // Timestamp type.
     $value = REQUEST_TIME;
-    $typed_data = $this->createTypedData(array('type' => 'timestamp'), $value);
+    $typed_data = $this->createTypedData(['type' => 'timestamp'], $value);
     $this->assertTrue($typed_data instanceof DateTimeInterface, 'Typed data object is an instance of DateTimeInterface.');
     $this->assertTrue($typed_data->getValue() == $value, 'Timestamp value was fetched.');
     $this->assertEqual($typed_data->validate()->count(), 0);
@@ -174,7 +174,7 @@ class TypedDataTest extends KernelTestBase {
     $typed_data->setValue('invalid');
     $this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
     // Check implementation of DateTimeInterface.
-    $typed_data = $this->createTypedData(array('type' => 'timestamp'), REQUEST_TIME);
+    $typed_data = $this->createTypedData(['type' => 'timestamp'], REQUEST_TIME);
     $this->assertTrue($typed_data->getDateTime() instanceof DrupalDateTime);
     $typed_data->setDateTime(DrupalDateTime::createFromTimestamp(REQUEST_TIME + 1));
     $this->assertEqual($typed_data->getValue(), REQUEST_TIME + 1);
@@ -183,7 +183,7 @@ class TypedDataTest extends KernelTestBase {
 
     // DurationIso8601 type.
     $value = 'PT20S';
-    $typed_data = $this->createTypedData(array('type' => 'duration_iso8601'), $value);
+    $typed_data = $this->createTypedData(['type' => 'duration_iso8601'], $value);
     $this->assertTrue($typed_data instanceof DurationInterface, 'Typed data object is an instance of DurationInterface.');
     $this->assertIdentical($typed_data->getValue(), $value, 'DurationIso8601 value was fetched.');
     $this->assertEqual($typed_data->validate()->count(), 0);
@@ -197,7 +197,7 @@ class TypedDataTest extends KernelTestBase {
     $typed_data->setValue('invalid');
     $this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
     // Check implementation of DurationInterface.
-    $typed_data = $this->createTypedData(array('type' => 'duration_iso8601'), 'PT20S');
+    $typed_data = $this->createTypedData(['type' => 'duration_iso8601'], 'PT20S');
     $this->assertTrue($typed_data->getDuration() instanceof \DateInterval);
     $typed_data->setDuration(new \DateInterval('P40D'));
     // @todo: Should we make this "nicer"?
@@ -207,7 +207,7 @@ class TypedDataTest extends KernelTestBase {
 
     // Time span type.
     $value = 20;
-    $typed_data = $this->createTypedData(array('type' => 'timespan'), $value);
+    $typed_data = $this->createTypedData(['type' => 'timespan'], $value);
     $this->assertTrue($typed_data instanceof DurationInterface, 'Typed data object is an instance of DurationInterface.');
     $this->assertIdentical($typed_data->getValue(), $value, 'Time span value was fetched.');
     $this->assertEqual($typed_data->validate()->count(), 0);
@@ -221,7 +221,7 @@ class TypedDataTest extends KernelTestBase {
     $typed_data->setValue('invalid');
     $this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
     // Check implementation of DurationInterface.
-    $typed_data = $this->createTypedData(array('type' => 'timespan'), 20);
+    $typed_data = $this->createTypedData(['type' => 'timespan'], 20);
     $this->assertTrue($typed_data->getDuration() instanceof \DateInterval);
     $typed_data->setDuration(new \DateInterval('PT4H'));
     $this->assertEqual($typed_data->getValue(), 60 * 60 * 4);
@@ -230,7 +230,7 @@ class TypedDataTest extends KernelTestBase {
 
     // URI type.
     $uri = 'http://example.com/foo/';
-    $typed_data = $this->createTypedData(array('type' => 'uri'), $uri);
+    $typed_data = $this->createTypedData(['type' => 'uri'], $uri);
     $this->assertTrue($typed_data instanceof UriInterface, 'Typed data object is an instance of UriInterface.');
     $this->assertTrue($typed_data->getValue() === $uri, 'URI value was fetched.');
     $this->assertEqual($typed_data->validate()->count(), 0);
@@ -247,7 +247,7 @@ class TypedDataTest extends KernelTestBase {
     $this->assertEqual($typed_data->validate()->count(), 0, 'Filename with spaces is valid.');
 
     // Generate some files that will be used to test the binary data type.
-    $files = array();
+    $files = [];
     for ($i = 0; $i < 3; $i++) {
       $path = "public://example_$i.png";
       file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', $path);
@@ -258,7 +258,7 @@ class TypedDataTest extends KernelTestBase {
 
     // Email type.
     $value = $this->randomString();
-    $typed_data = $this->createTypedData(array('type' => 'email'), $value);
+    $typed_data = $this->createTypedData(['type' => 'email'], $value);
     $this->assertTrue($typed_data instanceof StringInterface, 'Typed data object is an instance of StringInterface.');
     $this->assertIdentical($typed_data->getValue(), $value, 'Email value was fetched.');
     $new_value = 'test@example.com';
@@ -273,7 +273,7 @@ class TypedDataTest extends KernelTestBase {
     $this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
 
     // Binary type.
-    $typed_data = $this->createTypedData(array('type' => 'binary'), $files[0]->getFileUri());
+    $typed_data = $this->createTypedData(['type' => 'binary'], $files[0]->getFileUri());
     $this->assertTrue($typed_data instanceof BinaryInterface, 'Typed data object is an instance of BinaryInterface.');
     $this->assertTrue(is_resource($typed_data->getValue()), 'Binary value was fetched.');
     $this->assertEqual($typed_data->validate()->count(), 0);
@@ -294,8 +294,8 @@ class TypedDataTest extends KernelTestBase {
     $this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
 
     // Any type.
-    $value = array('foo');
-    $typed_data = $this->createTypedData(array('type' => 'any'), $value);
+    $value = ['foo'];
+    $typed_data = $this->createTypedData(['type' => 'any'], $value);
     $this->assertIdentical($typed_data->getValue(), $value, 'Any value was fetched.');
     $new_value = 'test@example.com';
     $typed_data->setValue($new_value);
@@ -307,9 +307,9 @@ class TypedDataTest extends KernelTestBase {
     $this->assertEqual($typed_data->validate()->count(), 0);
     // We cannot test invalid values as everything is valid for the any type,
     // but make sure an array or object value passes validation also.
-    $typed_data->setValue(array('entry'));
+    $typed_data->setValue(['entry']);
     $this->assertEqual($typed_data->validate()->count(), 0);
-    $typed_data->setValue((object) array('entry'));
+    $typed_data->setValue((object) ['entry']);
     $this->assertEqual($typed_data->validate()->count(), 0);
   }
 
@@ -318,7 +318,7 @@ class TypedDataTest extends KernelTestBase {
    */
   public function testTypedDataLists() {
     // Test working with an existing list of strings.
-    $value = array('one', 'two', 'three');
+    $value = ['one', 'two', 'three'];
     $typed_data = $this->createTypedData(ListDataDefinition::create('string'), $value);
     $this->assertEqual($typed_data->getValue(), $value, 'List value has been set.');
     // Test iterating.
@@ -347,14 +347,14 @@ class TypedDataTest extends KernelTestBase {
     $clone = clone $typed_data;
     $this->assertTrue($typed_data->getValue() === $clone->getValue());
     $this->assertTrue($typed_data[0] !== $clone[0]);
-    $clone->setValue(array());
+    $clone->setValue([]);
     $this->assertTrue($clone->isEmpty());
 
     // Make sure that resetting the value using NULL results in an empty array.
-    $clone->setValue(array());
+    $clone->setValue([]);
     $typed_data->setValue(NULL);
-    $this->assertIdentical($typed_data->getValue(), array());
-    $this->assertIdentical($clone->getValue(), array());
+    $this->assertIdentical($typed_data->getValue(), []);
+    $this->assertIdentical($clone->getValue(), []);
 
     // Test dealing with NULL items.
     $typed_data[] = NULL;
@@ -367,7 +367,7 @@ class TypedDataTest extends KernelTestBase {
     $this->assertFalse($typed_data->isEmpty());
     $this->assertEqual(count($typed_data), 3);
 
-    $this->assertEqual($typed_data->getValue(), array(NULL, '', 'three'));
+    $this->assertEqual($typed_data->getValue(), [NULL, '', 'three']);
     // Test unsetting.
     unset($typed_data[1]);
     $this->assertEqual(count($typed_data), 2);
@@ -379,7 +379,7 @@ class TypedDataTest extends KernelTestBase {
     $this->assertEqual(count($typed_data), 2);
 
     // Test setting the list with less values.
-    $typed_data->setValue(array('one'));
+    $typed_data->setValue(['one']);
     $this->assertEqual($typed_data->count(), 1);
 
     // Test setting invalid values.
@@ -397,7 +397,7 @@ class TypedDataTest extends KernelTestBase {
    */
   public function testTypedDataListsFilter() {
     // Check that an all-pass filter leaves the list untouched.
-    $value = array('zero', 'one');
+    $value = ['zero', 'one'];
     $typed_data = $this->createTypedData(ListDataDefinition::create('string'), $value);
     $typed_data->filter(function(TypedDataInterface $item) {
       return TRUE;
@@ -409,7 +409,7 @@ class TypedDataTest extends KernelTestBase {
     $this->assertEqual($typed_data[1]->getName(), 1);
 
     // Check that a none-pass filter empties the list.
-    $value = array('zero', 'one');
+    $value = ['zero', 'one'];
     $typed_data = $this->createTypedData(ListDataDefinition::create('string'), $value);
     $typed_data->filter(function(TypedDataInterface $item) {
       return FALSE;
@@ -417,7 +417,7 @@ class TypedDataTest extends KernelTestBase {
     $this->assertEqual($typed_data->count(), 0);
 
     // Check that filtering correctly renumbers elements.
-    $value = array('zero', 'one', 'two');
+    $value = ['zero', 'one', 'two'];
     $typed_data = $this->createTypedData(ListDataDefinition::create('string'), $value);
     $typed_data->filter(function(TypedDataInterface $item) {
       return $item->getValue() !== 'one';
@@ -434,11 +434,11 @@ class TypedDataTest extends KernelTestBase {
    */
   public function testTypedDataMaps() {
     // Test working with a simple map.
-    $value = array(
+    $value = [
       'one' => 'eins',
       'two' => 'zwei',
       'three' => 'drei',
-    );
+    ];
     $definition = MapDataDefinition::create()
       ->setPropertyDefinition('one', DataDefinition::create('string'))
       ->setPropertyDefinition('two', DataDefinition::create('string'))
@@ -467,11 +467,11 @@ class TypedDataTest extends KernelTestBase {
     $this->assertEqual($typed_data->get('one')->getValue(), 'uno');
     // Make sure the update is reflected in the value of the map also.
     $value = $typed_data->getValue();
-    $this->assertEqual($value, array(
+    $this->assertEqual($value, [
       'one' => 'uno',
       'two' => 'zwei',
       'three' => 'drei'
-    ));
+    ]);
 
     $properties = $typed_data->getProperties();
     $this->assertEqual(array_keys($properties), array_keys($value));
@@ -479,12 +479,12 @@ class TypedDataTest extends KernelTestBase {
 
     // Test setting a not defined property. It shouldn't show up in the
     // properties, but be kept in the values.
-    $typed_data->setValue(array('foo' => 'bar'));
-    $this->assertEqual(array_keys($typed_data->getProperties()), array('one', 'two', 'three'));
-    $this->assertEqual(array_keys($typed_data->getValue()), array('foo', 'one', 'two', 'three'));
+    $typed_data->setValue(['foo' => 'bar']);
+    $this->assertEqual(array_keys($typed_data->getProperties()), ['one', 'two', 'three']);
+    $this->assertEqual(array_keys($typed_data->getValue()), ['foo', 'one', 'two', 'three']);
 
     // Test getting the string representation.
-    $typed_data->setValue(array('one' => 'eins', 'two' => '', 'three' => 'drei'));
+    $typed_data->setValue(['one' => 'eins', 'two' => '', 'three' => 'drei']);
     $this->assertEqual($typed_data->getString(), 'eins, drei');
 
     // Test isEmpty and cloning.
@@ -492,14 +492,14 @@ class TypedDataTest extends KernelTestBase {
     $clone = clone $typed_data;
     $this->assertTrue($typed_data->getValue() === $clone->getValue());
     $this->assertTrue($typed_data->get('one') !== $clone->get('one'));
-    $clone->setValue(array());
+    $clone->setValue([]);
     $this->assertTrue($clone->isEmpty());
 
     // Make sure the difference between NULL (not set) and an empty array is
     // kept.
     $typed_data->setValue(NULL);
     $this->assertNull($typed_data->getValue());
-    $typed_data->setValue(array());
+    $typed_data->setValue([]);
     $value = $typed_data->getValue();
     $this->assertTrue(isset($value) && is_array($value));
 
@@ -535,9 +535,9 @@ class TypedDataTest extends KernelTestBase {
    */
   public function testTypedDataValidation() {
     $definition = DataDefinition::create('integer')
-      ->setConstraints(array(
-        'Range' => array('min' => 5),
-      ));
+      ->setConstraints([
+        'Range' => ['min' => 5],
+      ]);
     $violations = $this->typedDataManager->create($definition, 10)->validate();
     $this->assertEqual($violations->count(), 0);
 
@@ -546,27 +546,27 @@ class TypedDataTest extends KernelTestBase {
     $this->assertEqual($violations->count(), 1);
 
     // Test translating violation messages.
-    $message = t('This value should be %limit or more.', array('%limit' => 5));
+    $message = t('This value should be %limit or more.', ['%limit' => 5]);
     $this->assertEqual($violations[0]->getMessage(), $message, 'Translated violation message retrieved.');
     $this->assertEqual($violations[0]->getPropertyPath(), '');
     $this->assertIdentical($violations[0]->getRoot(), $integer, 'Root object returned.');
 
     // Test translating violation messages when pluralization is used.
     $definition = DataDefinition::create('string')
-      ->setConstraints(array(
-        'Length' => array('min' => 10),
-      ));
+      ->setConstraints([
+        'Length' => ['min' => 10],
+      ]);
     $violations = $this->typedDataManager->create($definition, "short")->validate();
     $this->assertEqual($violations->count(), 1);
-    $message = t('This value is too short. It should have %limit characters or more.', array('%limit' => 10));
+    $message = t('This value is too short. It should have %limit characters or more.', ['%limit' => 10]);
     $this->assertEqual($violations[0]->getMessage(), $message, 'Translated violation message retrieved.');
 
     // Test having multiple violations.
     $definition = DataDefinition::create('integer')
-      ->setConstraints(array(
-        'Range' => array('min' => 5),
-        'Null' => array(),
-      ));
+      ->setConstraints([
+        'Range' => ['min' => 5],
+        'Null' => [],
+      ]);
     $violations = $this->typedDataManager->create($definition, 10)->validate();
     $this->assertEqual($violations->count(), 1);
     $violations = $this->typedDataManager->create($definition, 1)->validate();
@@ -575,12 +575,12 @@ class TypedDataTest extends KernelTestBase {
     // Test validating property containers and make sure the NotNull and Null
     // constraints work with typed data containers.
     $definition = BaseFieldDefinition::create('integer')
-      ->setConstraints(array('NotNull' => array()));
-    $field_item = $this->typedDataManager->create($definition, array('value' => 10));
+      ->setConstraints(['NotNull' => []]);
+    $field_item = $this->typedDataManager->create($definition, ['value' => 10]);
     $violations = $field_item->validate();
     $this->assertEqual($violations->count(), 0);
 
-    $field_item = $this->typedDataManager->create($definition, array('value' => 'no integer'));
+    $field_item = $this->typedDataManager->create($definition, ['value' => 'no integer']);
     $violations = $field_item->validate();
     $this->assertEqual($violations->count(), 1);
     $this->assertEqual($violations[0]->getPropertyPath(), '0.value');
@@ -592,8 +592,8 @@ class TypedDataTest extends KernelTestBase {
 
     // Test the Null constraint with typed data containers.
     $definition = BaseFieldDefinition::create('float')
-      ->setConstraints(array('Null' => array()));
-    $field_item = $this->typedDataManager->create($definition, array('value' => 11.5));
+      ->setConstraints(['Null' => []]);
+    $field_item = $this->typedDataManager->create($definition, ['value' => 11.5]);
     $violations = $field_item->validate();
     $this->assertEqual($violations->count(), 1);
     $field_item = $this->typedDataManager->create($definition);
@@ -622,9 +622,9 @@ class TypedDataTest extends KernelTestBase {
     // Test validating a list of a values and make sure property paths starting
     // with "0" are created.
     $definition = BaseFieldDefinition::create('integer');
-    $violations = $this->typedDataManager->create($definition, array(array('value' => 10)))->validate();
+    $violations = $this->typedDataManager->create($definition, [['value' => 10]])->validate();
     $this->assertEqual($violations->count(), 0);
-    $violations = $this->typedDataManager->create($definition, array(array('value' => 'string')))->validate();
+    $violations = $this->typedDataManager->create($definition, [['value' => 'string']])->validate();
     $this->assertEqual($violations->count(), 1);
 
     $this->assertEqual($violations[0]->getInvalidValue(), 'string');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Update/CompatibilityFixTest.php b/web/core/tests/Drupal/KernelTests/Core/Update/CompatibilityFixTest.php
index ee1b6e177..a724623ec 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Update/CompatibilityFixTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Update/CompatibilityFixTest.php
@@ -21,7 +21,7 @@ class CompatibilityFixTest extends KernelTestBase {
     require_once \Drupal::root() . '/core/includes/update.inc';
   }
 
-  function testFixCompatibility() {
+  public function testFixCompatibility() {
     $extension_config = \Drupal::configFactory()->getEditable('core.extension');
 
     // Add an incompatible/non-existent module to the config.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Url/LinkGenerationTest.php b/web/core/tests/Drupal/KernelTests/Core/Url/LinkGenerationTest.php
index 3d7ce5ecf..16452d011 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Url/LinkGenerationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Url/LinkGenerationTest.php
@@ -19,7 +19,7 @@ class LinkGenerationTest extends KernelTestBase {
   /**
    * Tests how hook_link_alter() can affect escaping of the link text.
    */
-  function testHookLinkAlter() {
+  public function testHookLinkAlter() {
     $url = Url::fromUri('http://example.com');
     $renderer = \Drupal::service('renderer');
 
diff --git a/web/core/tests/Drupal/KernelTests/FileSystemModuleDiscoveryDataProviderTrait.php b/web/core/tests/Drupal/KernelTests/FileSystemModuleDiscoveryDataProviderTrait.php
new file mode 100644
index 000000000..0b627c57a
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/FileSystemModuleDiscoveryDataProviderTrait.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\KernelTests;
+
+/**
+ * A trait used in testing for providing a list of modules in a dataProvider.
+ */
+trait FileSystemModuleDiscoveryDataProviderTrait {
+
+  /**
+   * A data provider that lists every module in core.
+   *
+   * @return array
+   *   An array of module names to test.
+   */
+  public function coreModuleListDataProvider() {
+    $module_dirs = array_keys(iterator_to_array(new \FilesystemIterator(__DIR__ . '/../../../modules/')));
+    $module_names = array_map(function($path) {
+      return str_replace(__DIR__ . '/../../../modules/', '', $path);
+    }, $module_dirs);
+    $modules_keyed = array_combine($module_names, $module_names);
+
+    $data = array_map(function ($module) {
+      return [$module];
+    }, $modules_keyed);
+
+    return $data;
+  }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/KernelTestBase.php b/web/core/tests/Drupal/KernelTests/KernelTestBase.php
index 4da96ba3b..04926e03d 100644
--- a/web/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -7,6 +7,7 @@ use Drupal\Component\FileCache\FileCache;
 use Drupal\Component\FileCache\FileCacheFactory;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Config\Development\ConfigSchemaChecker;
 use Drupal\Core\Database\Database;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\ServiceProviderInterface;
@@ -146,7 +147,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
    *
    * @var array
    */
-  protected static $modules = array();
+  protected static $modules = [];
 
   /**
    * The virtual filesystem root directory.
@@ -181,7 +182,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
   /**
    * Set to TRUE to strict check all configuration saved.
    *
-   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   * @see \Drupal\Core\Config\Development\ConfigSchemaChecker
    *
    * @var bool
    */
@@ -192,7 +193,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
    *
    * @var string[]
    */
-  protected static $configSchemaCheckerExclusions = array(
+  protected static $configSchemaCheckerExclusions = [
     // Following are used to test lack of or partial schema. Where partial
     // schema is provided, that is explicitly tested in specific tests.
     'config_schema_test.noschema',
@@ -201,7 +202,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
     'config_schema_test.no_schema_data_types',
     // Used to test application of schema to filtering of configuration.
     'config_test.dynamic.system',
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -244,7 +245,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
    * @internal
    */
   protected function bootEnvironment() {
-    $this->streamWrappers = array();
+    $this->streamWrappers = [];
     \Drupal::unsetContainer();
 
     $this->classLoader = require $this->root . '/autoload.php';
@@ -262,13 +263,13 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
     $this->databasePrefix = $test_db->getDatabasePrefix();
     drupal_valid_test_ua($this->databasePrefix);
 
-    $settings = array(
+    $settings = [
       'hash_salt' => get_class($this),
       'file_public_path' => $this->siteDirectory . '/files',
       // Disable Twig template caching/dumping.
       'twig_cache' => FALSE,
       // @see \Drupal\KernelTests\KernelTestBase::register()
-    );
+    ];
     new Settings($settings);
 
     $this->setUpFilesystem();
@@ -297,9 +298,9 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
     $settings['file_public_path'] = $this->siteDirectory . '/files';
     new Settings($settings);
 
-    $GLOBALS['config_directories'] = array(
+    $GLOBALS['config_directories'] = [
       CONFIG_SYNC_DIRECTORY => $this->siteDirectory . '/files/config/sync',
-    );
+    ];
   }
 
   /**
@@ -388,10 +389,11 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
 
     // Write the core.extension configuration.
     // Required for ConfigInstaller::installDefaultConfig() to work.
-    $this->container->get('config.storage')->write('core.extension', array(
+    $this->container->get('config.storage')->write('core.extension', [
       'module' => array_fill_keys($modules, 0),
-      'theme' => array(),
-    ));
+      'theme' => [],
+      'profile' => '',
+    ]);
 
     $settings = Settings::getAll();
     $settings['php_storage']['default'] = [
@@ -404,6 +406,11 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
     // While this should be enforced via settings.php prior to installation,
     // some tests expect to be able to test mail system implementations.
     $GLOBALS['config']['system.mail']['interface']['default'] = 'test_mail_collector';
+
+    // Manually configure the default file scheme so that modules that use file
+    // functions don't have to install system and its configuration.
+    // @see file_default_scheme()
+    $GLOBALS['config']['system.file']['default_scheme'] = 'public';
   }
 
   /**
@@ -454,9 +461,9 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
       foreach ($connection_info as $target => $value) {
         // Replace the full table prefix definition to ensure that no table
         // prefixes of the test runner leak into the test.
-        $connection_info[$target]['prefix'] = array(
+        $connection_info[$target]['prefix'] = [
           'default' => $value['prefix']['default'] . $this->databasePrefix,
-        );
+        ];
       }
     }
     return $connection_info;
@@ -561,9 +568,9 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
    * @see \Drupal\Core\Extension\ModuleHandler::add()
    */
   private function getExtensionsForModules(array $modules) {
-    $extensions = array();
+    $extensions = [];
     $discovery = new ExtensionDiscovery($this->root);
-    $discovery->setProfileDirectories(array());
+    $discovery->setProfileDirectories([]);
     $list = $discovery->scan('module');
     foreach ($modules as $name) {
       if (!isset($list[$name])) {
@@ -608,7 +615,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
 
     if ($this->strictConfigSchema) {
       $container
-        ->register('simpletest.config_schema_checker', 'Drupal\Core\Config\Testing\ConfigSchemaChecker')
+        ->register('simpletest.config_schema_checker', ConfigSchemaChecker::class)
         ->addArgument(new Reference('config.typed'))
         ->addArgument($this->getConfigSchemaExclusions())
         ->addTag('event_subscriber');
@@ -626,7 +633,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
 
     if ($container->hasDefinition('password')) {
       $container->getDefinition('password')
-        ->setArguments(array(1));
+        ->setArguments([1]);
     }
     TestServiceProvider::addRouteProvider($container);
   }
@@ -704,7 +711,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
     // Free up memory: Custom test class properties.
     // Note: Private properties cannot be cleaned up.
     $rc = new \ReflectionClass(__CLASS__);
-    $blacklist = array();
+    $blacklist = [];
     foreach ($rc->getProperties() as $property) {
       $blacklist[$property->name] = $property->getDeclaringClass()->name;
     }
@@ -724,7 +731,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
     }
     \Drupal::unsetContainer();
     $this->container = NULL;
-    new Settings(array());
+    new Settings([]);
 
     parent::tearDown();
   }
@@ -827,18 +834,18 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
       $all_tables_exist = TRUE;
       foreach ($tables as $table) {
         if (!$db_schema->tableExists($table)) {
-          $this->fail(SafeMarkup::format('Installed entity type table for the %entity_type entity type: %table', array(
+          $this->fail(SafeMarkup::format('Installed entity type table for the %entity_type entity type: %table', [
             '%entity_type' => $entity_type_id,
             '%table' => $table,
-          )));
+          ]));
           $all_tables_exist = FALSE;
         }
       }
       if ($all_tables_exist) {
-        $this->pass(SafeMarkup::format('Installed entity type tables for the %entity_type entity type: %tables', array(
+        $this->pass(SafeMarkup::format('Installed entity type tables for the %entity_type entity type: %tables', [
           '%entity_type' => $entity_type_id,
           '%tables' => '{' . implode('}, {', $tables) . '}',
-        )));
+        ]));
       }
     }
   }
@@ -1025,7 +1032,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
    * @return array
    */
   private static function getModulesToEnable($class) {
-    $modules = array();
+    $modules = [];
     while ($class) {
       if (property_exists($class, 'modules')) {
         // Only add the modules, if the $modules property was not inherited.
@@ -1057,11 +1064,11 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
     // @see /core/tests/bootstrap.php
     $bootstrap_globals .= '$namespaces = ' . var_export($GLOBALS['namespaces'], TRUE) . ";\n";
 
-    $template->setVar(array(
+    $template->setVar([
       'constants' => '',
       'included_files' => '',
       'globals' => $bootstrap_globals,
-    ));
+    ]);
   }
 
   /**
@@ -1084,12 +1091,12 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
    * @deprecated in Drupal 8.0.x, will be removed before Drupal 8.2.0.
    */
   public function __get($name) {
-    if (in_array($name, array(
+    if (in_array($name, [
       'public_files_directory',
       'private_files_directory',
       'temp_files_directory',
       'translation_files_directory',
-    ))) {
+    ])) {
       // @comment it in again.
       trigger_error(sprintf("KernelTestBase::\$%s no longer exists. Use the regular API method to retrieve it instead (e.g., Settings).", $name), E_USER_DEPRECATED);
       switch ($name) {
@@ -1109,12 +1116,12 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
 
     if ($name === 'configDirectories') {
       trigger_error(sprintf("KernelTestBase::\$%s no longer exists. Use config_get_config_directory() directly instead.", $name), E_USER_DEPRECATED);
-      return array(
+      return [
         CONFIG_SYNC_DIRECTORY => config_get_config_directory(CONFIG_SYNC_DIRECTORY),
-      );
+      ];
     }
 
-    $denied = array(
+    $denied = [
       // @see \Drupal\simpletest\TestBase
       'testId',
       'timeLimit',
@@ -1132,7 +1139,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
       'generatedTestFiles',
       // Properties from the old KernelTestBase class that has been removed.
       'keyValueFactory',
-    );
+    ];
     if (in_array($name, $denied) || strpos($name, 'original') === 0) {
       throw new \RuntimeException(sprintf('TestBase::$%s property no longer exists', $name));
     }
diff --git a/web/core/tests/Drupal/KernelTests/KernelTestBaseTest.php b/web/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
index 469debed2..5c6eab745 100644
--- a/web/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
+++ b/web/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
@@ -27,21 +27,21 @@ class KernelTestBaseTest extends KernelTestBase {
   public function testBootEnvironment() {
     $this->assertRegExp('/^test\d{8}$/', $this->databasePrefix);
     $this->assertStringStartsWith('vfs://root/sites/simpletest/', $this->siteDirectory);
-    $this->assertEquals(array(
-      'root' => array(
-        'sites' => array(
-          'simpletest' => array(
-            substr($this->databasePrefix, 4) => array(
-              'files' => array(
-                'config' => array(
-                  'sync' => array(),
-                ),
-              ),
-            ),
-          ),
-        ),
-      ),
-    ), vfsStream::inspect(new vfsStreamStructureVisitor())->getStructure());
+    $this->assertEquals([
+      'root' => [
+        'sites' => [
+          'simpletest' => [
+            substr($this->databasePrefix, 4) => [
+              'files' => [
+                'config' => [
+                  'sync' => [],
+                ],
+              ],
+            ],
+          ],
+        ],
+      ],
+    ], vfsStream::inspect(new vfsStreamStructureVisitor())->getStructure());
   }
 
   /**
@@ -70,15 +70,15 @@ class KernelTestBaseTest extends KernelTestBase {
     $this->assertArrayHasKey('destroy-me', $GLOBALS);
 
     $database = $this->container->get('database');
-    $database->schema()->createTable('foo', array(
-      'fields' => array(
-        'number' => array(
+    $database->schema()->createTable('foo', [
+      'fields' => [
+        'number' => [
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     $this->assertTrue($database->schema()->tableExists('foo'));
 
     // Ensure that the database tasks have been run during set up. Neither MySQL
@@ -120,7 +120,7 @@ class KernelTestBaseTest extends KernelTestBase {
     $this->assertSame($request, \Drupal::request());
 
     // Trigger a container rebuild.
-    $this->enableModules(array('system'));
+    $this->enableModules(['system']);
 
     // Verify that this container is identical to the actual container.
     $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerInterface', $this->container);
@@ -165,16 +165,16 @@ class KernelTestBaseTest extends KernelTestBase {
     $element_info = $this->container->get('element_info');
     $this->assertSame(['#defaults_loaded' => TRUE], $element_info->getInfo($type));
 
-    $this->enableModules(array('filter'));
+    $this->enableModules(['filter']);
 
     $this->assertNotSame($element_info, $this->container->get('element_info'));
     $this->assertNotEmpty($this->container->get('element_info')->getInfo($type));
 
-    $build = array(
+    $build = [
       '#type' => 'html_tag',
       '#tag' => 'h3',
       '#value' => 'Inner',
-    );
+    ];
     $expected = "<h3>Inner</h3>\n";
 
     $this->assertEquals('core', \Drupal::theme()->getActiveTheme()->getName());
@@ -189,12 +189,12 @@ class KernelTestBaseTest extends KernelTestBase {
    * @covers ::render
    */
   public function testRenderWithTheme() {
-    $this->enableModules(array('system'));
+    $this->enableModules(['system']);
 
-    $build = array(
+    $build = [
       '#type' => 'textfield',
       '#name' => 'test',
-    );
+    ];
     $expected = '/' . preg_quote('<input type="text" name="test"', '/') . '/';
 
     $this->assertArrayNotHasKey('theme', $GLOBALS);
@@ -205,6 +205,14 @@ class KernelTestBaseTest extends KernelTestBase {
     $this->assertRegExp($expected, (string) $output);
   }
 
+  /**
+   * @covers ::bootKernel
+   */
+  public function testFileDefaultScheme() {
+    $this->assertEquals('public', file_default_scheme());
+    $this->assertEquals('public', \Drupal::config('system.file')->get('default_scheme'));
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -220,11 +228,11 @@ class KernelTestBaseTest extends KernelTestBase {
       $this->assertTrue(empty($tables), 'All test tables have been removed.');
     }
     else {
-      $result = $connection->query("SELECT name FROM " . $this->databasePrefix . ".sqlite_master WHERE type = :type AND name LIKE :table_name AND name NOT LIKE :pattern", array(
+      $result = $connection->query("SELECT name FROM " . $this->databasePrefix . ".sqlite_master WHERE type = :type AND name LIKE :table_name AND name NOT LIKE :pattern", [
         ':type' => 'table',
         ':table_name' => '%',
         ':pattern' => 'sqlite_%',
-      ))->fetchAllKeyed(0, 0);
+      ])->fetchAllKeyed(0, 0);
 
       $this->assertTrue(empty($result), 'All test tables have been removed.');
     }
diff --git a/web/core/tests/Drupal/Tests/BrowserTestBase.php b/web/core/tests/Drupal/Tests/BrowserTestBase.php
index d38db65b3..754f9d983 100644
--- a/web/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/web/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -5,25 +5,22 @@ namespace Drupal\Tests;
 use Behat\Mink\Driver\GoutteDriver;
 use Behat\Mink\Element\Element;
 use Behat\Mink\Mink;
+use Behat\Mink\Selector\SelectorsHandler;
 use Behat\Mink\Session;
-use Drupal\Component\FileCache\FileCacheFactory;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\UrlHelper;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Config\Testing\ConfigSchemaChecker;
 use Drupal\Core\Database\Database;
-use Drupal\Core\DrupalKernel;
-use Drupal\Core\Serialization\Yaml;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Session\AnonymousUserSession;
-use Drupal\Core\Session\UserSession;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
+use Drupal\Core\Test\FunctionalTestSetupTrait;
 use Drupal\Core\Test\TestRunnerKernel;
+use Drupal\Core\Test\TestSetupTrait;
 use Drupal\Core\Url;
-use Drupal\Core\Test\TestDatabase;
+use Drupal\Core\Utility\Error;
 use Drupal\FunctionalTests\AssertLegacyTrait;
 use Drupal\simpletest\AssertHelperTrait;
 use Drupal\simpletest\ContentTypeCreationTrait;
@@ -32,6 +29,8 @@ use Drupal\simpletest\NodeCreationTrait;
 use Drupal\simpletest\UserCreationTrait;
 use Symfony\Component\CssSelector\CssSelectorConverter;
 use Symfony\Component\HttpFoundation\Request;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Provides a test case for functional Drupal tests.
@@ -43,6 +42,9 @@ use Symfony\Component\HttpFoundation\Request;
  * @ingroup testing
  */
 abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
+
+  use FunctionalTestSetupTrait;
+  use TestSetupTrait;
   use AssertHelperTrait;
   use BlockCreationTrait {
     placeBlock as drupalPlaceBlock;
@@ -62,20 +64,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     createRole as drupalCreateRole;
     createUser as drupalCreateUser;
   }
-
-  /**
-   * Class loader.
-   *
-   * @var object
-   */
-  protected $classLoader;
-
-  /**
-   * The site directory of this test run.
-   *
-   * @var string
-   */
-  protected $siteDirectory;
+  use XdebugRequestTrait;
 
   /**
    * The database prefix of this test run.
@@ -84,13 +73,6 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    */
   protected $databasePrefix;
 
-  /**
-   * The site directory of the original parent site.
-   *
-   * @var string
-   */
-  protected $originalSiteDirectory;
-
   /**
    * Time limit in seconds for the test.
    *
@@ -98,37 +80,6 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    */
   protected $timeLimit = 500;
 
-  /**
-   * The public file directory for the test environment.
-   *
-   * This is set in BrowserTestBase::prepareEnvironment().
-   *
-   * @var string
-   */
-  protected $publicFilesDirectory;
-
-  /**
-   * The private file directory for the test environment.
-   *
-   * This is set in BrowserTestBase::prepareEnvironment().
-   *
-   * @var string
-   */
-  protected $privateFilesDirectory;
-
-  /**
-   * The temp file directory for the test environment.
-   *
-   * This is set in BrowserTestBase::prepareEnvironment(). This value has to
-   * match the temporary directory created in install_base_system() for test
-   * installs.
-   *
-   * @see install_base_system()
-   *
-   * @var string
-   */
-  protected $tempFilesDirectory;
-
   /**
    * The translation file directory for the test environment.
    *
@@ -138,20 +89,6 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    */
   protected $translationFilesDirectory;
 
-  /**
-   * The DrupalKernel instance used in the test.
-   *
-   * @var \Drupal\Core\DrupalKernel
-   */
-  protected $kernel;
-
-  /**
-   * The dependency injection container used in the test.
-   *
-   * @var \Symfony\Component\DependencyInjection\ContainerInterface
-   */
-  protected $container;
-
   /**
    * The config importer that can be used in a test.
    *
@@ -159,15 +96,6 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    */
   protected $configImporter;
 
-  /**
-   * Set to TRUE to strict check all configuration saved.
-   *
-   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
-   *
-   * @var bool
-   */
-  protected $strictConfigSchema = TRUE;
-
   /**
    * Modules to enable.
    *
@@ -181,22 +109,6 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    */
   protected static $modules = [];
 
-  /**
-   * An array of config object names that are excluded from schema checking.
-   *
-   * @var string[]
-   */
-  protected static $configSchemaCheckerExclusions = array(
-    // Following are used to test lack of or partial schema. Where partial
-    // schema is provided, that is explicitly tested in specific tests.
-    'config_schema_test.noschema',
-    'config_schema_test.someschema',
-    'config_schema_test.schema_data_types',
-    'config_schema_test.no_schema_data_types',
-    // Used to test application of schema to filtering of configuration.
-    'config_test.dynamic.system',
-  );
-
   /**
    * The profile to install as a basis for testing.
    *
@@ -211,20 +123,6 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    */
   protected $loggedInUser = FALSE;
 
-  /**
-   * The root user.
-   *
-   * @var \Drupal\Core\Session\UserSession
-   */
-  protected $rootUser;
-
-  /**
-   * The config directories used in this test.
-   *
-   * @var array
-   */
-  protected $configDirectories = array();
-
   /**
    * An array of custom translations suitable for drupal_rewrite_settings().
    *
@@ -356,13 +254,26 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
 
     if ($driver instanceof GoutteDriver) {
       // Turn off curl timeout. Having a timeout is not a problem in a normal
-      // test running, but it is a problem when debugging.
+      // test running, but it is a problem when debugging. Also, disable SSL
+      // peer verification so that testing under HTTPS always works.
       /** @var \GuzzleHttp\Client $client */
-      $client = $this->container->get('http_client_factory')->fromOptions(['timeout' => NULL]);
+      $client = $this->container->get('http_client_factory')->fromOptions([
+        'timeout' => NULL,
+        'verify' => FALSE,
+      ]);
+
+      // Inject a Guzzle middleware to generate debug output for every request
+      // performed in the test.
+      $handler_stack = $client->getConfig('handler');
+      $handler_stack->push($this->getResponseLogHandler());
+
       $driver->getClient()->setClient($client);
     }
 
-    $session = new Session($driver);
+    $selectors_handler = new SelectorsHandler([
+      'hidden_field_selector' => new HiddenFieldSelector()
+    ]);
+    $session = new Session($driver, $selectors_handler);
     $this->mink = new Mink();
     $this->mink->registerSession('default', $session);
     $this->mink->setDefaultSessionName('default');
@@ -418,6 +329,43 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     return $driver;
   }
 
+  /**
+   * Provides a Guzzle middleware handler to log every response received.
+   *
+   * @return callable
+   *   The callable handler that will do the logging.
+   */
+  protected function getResponseLogHandler() {
+    return function (callable $handler) {
+      return function (RequestInterface $request, array $options) use ($handler) {
+        return $handler($request, $options)
+          ->then(function (ResponseInterface $response) use ($request) {
+            if ($this->htmlOutputEnabled) {
+
+              $caller = $this->getTestMethodCaller();
+              $html_output = 'Called from ' . $caller['function'] . ' line ' . $caller['line'];
+              $html_output .= '<hr />' . $request->getMethod() . ' request to: ' . $request->getUri();
+
+              // On redirect responses (status code starting with '3') we need
+              // to remove the meta tag that would do a browser refresh. We
+              // don't want to redirect developers away when they look at the
+              // debug output file in their browser.
+              $body = $response->getBody();
+              $status_code = (string) $response->getStatusCode();
+              if ($status_code[0] === '3') {
+                $body = preg_replace('#<meta http-equiv="refresh" content=.+/>#', '', $body, 1);
+              }
+              $html_output .= '<hr />' . $body;
+              $html_output .= $this->formatHtmlOutputHeaders($response->getHeaders());
+
+              $this->htmlOutput($html_output);
+            }
+            return $response;
+          });
+      };
+    };
+  }
+
   /**
    * Registers additional Mink sessions.
    *
@@ -482,29 +430,10 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     // Setup Mink.
     $session = $this->initMink();
 
-    // In order to debug web tests you need to either set a cookie, have the
-    // Xdebug session in the URL or set an environment variable in case of CLI
-    // requests. If the developer listens to connection when running tests, by
-    // default the cookie is not forwarded to the client side, so you cannot
-    // debug the code running on the test site. In order to make debuggers work
-    // this bit of information is forwarded. Make sure that the debugger listens
-    // to at least three external connections.
-    $request = \Drupal::request();
-    $cookie_params = $request->cookies;
-    if ($cookie_params->has('XDEBUG_SESSION')) {
-      $session->setCookie('XDEBUG_SESSION', $cookie_params->get('XDEBUG_SESSION'));
-    }
-    // For CLI requests, the information is stored in $_SERVER.
-    $server = $request->server;
-    if ($server->has('XDEBUG_CONFIG')) {
-      // $_SERVER['XDEBUG_CONFIG'] has the form "key1=value1 key2=value2 ...".
-      $pairs = explode(' ', $server->get('XDEBUG_CONFIG'));
-      foreach ($pairs as $pair) {
-        list($key, $value) = explode('=', $pair);
-        // Account for key-value pairs being separated by multiple spaces.
-        if (trim($key) == 'idekey') {
-          $session->setCookie('XDEBUG_SESSION', trim($value));
-        }
+    $cookies = $this->extractCookiesFromRequest(\Drupal::request());
+    foreach ($cookies as $cookie_name => $values) {
+      foreach ($values as $value) {
+        $session->setCookie($cookie_name, $value);
       }
     }
 
@@ -564,7 +493,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     }
 
     // Delete test site directory.
-    file_unmanaged_delete_recursive($this->siteDirectory, array($this, 'filePreDeleteCallback'));
+    file_unmanaged_delete_recursive($this->siteDirectory, [$this, 'filePreDeleteCallback']);
   }
 
   /**
@@ -643,7 +572,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    * @return string
    *   An absolute URL stsring.
    */
-  protected function buildUrl($path, array $options = array()) {
+  protected function buildUrl($path, array $options = []) {
     if ($path instanceof Url) {
       $url_options = $path->getOptions();
       $options = $url_options + $options;
@@ -691,7 +620,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    * @return string
    *   The retrieved HTML string, also available as $this->getRawContent()
    */
-  protected function drupalGet($path, array $options = array(), array $headers = array()) {
+  protected function drupalGet($path, array $options = [], array $headers = []) {
     $options['absolute'] = TRUE;
     $url = $this->buildUrl($path, $options);
 
@@ -708,7 +637,9 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     // Ensure that any changes to variables in the other thread are picked up.
     $this->refreshVariables();
 
-    if ($this->htmlOutputEnabled) {
+    // Log only for JavascriptTestBase tests because for Goutte we log with
+    // ::getResponseLogHandler.
+    if ($this->htmlOutputEnabled && !($this->getSession()->getDriver() instanceof GoutteDriver)) {
       $html_output = 'GET request to: ' . $url .
         '<hr />Ending URL: ' . $this->getSession()->getCurrentUrl();
       $html_output .= '<hr />' . $out;
@@ -782,16 +713,16 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
       $this->drupalLogout();
     }
 
-    $this->drupalGet('user');
+    $this->drupalGet('user/login');
     $this->assertSession()->statusCodeEquals(200);
-    $this->submitForm(array(
+    $this->submitForm([
       'name' => $account->getUsername(),
       'pass' => $account->passRaw,
-    ), t('Log in'));
+    ], t('Log in'));
 
     // @see BrowserTestBase::drupalUserIsLoggedIn()
     $account->sessionId = $this->getSession()->getCookie($this->getSessionName());
-    $this->assertTrue($this->drupalUserIsLoggedIn($account), SafeMarkup::format('User %name successfully logged in.', array('name' => $account->getUsername())));
+    $this->assertTrue($this->drupalUserIsLoggedIn($account), new FormattableMarkup('User %name successfully logged in.', ['%name' => $account->getAccountName()]));
 
     $this->loggedInUser = $account;
     $this->container->get('current_user')->setAccount($account);
@@ -807,7 +738,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     // idea being if you were properly logged out you should be seeing a login
     // screen.
     $assert_session = $this->assertSession();
-    $this->drupalGet('user/logout', array('query' => array('destination' => 'user')));
+    $this->drupalGet('user/logout', ['query' => ['destination' => 'user']]);
     $assert_session->statusCodeEquals(200);
     $assert_session->fieldExists('name');
     $assert_session->fieldExists('pass');
@@ -878,7 +809,10 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
 
     // Ensure that any changes to variables in the other thread are picked up.
     $this->refreshVariables();
-    if ($this->htmlOutputEnabled) {
+
+    // Log only for JavascriptTestBase tests because for Goutte we log with
+    // ::getResponseLogHandler.
+    if ($this->htmlOutputEnabled && !($this->getSession()->getDriver() instanceof GoutteDriver)) {
       $out = $this->getSession()->getPage()->getContent();
       $html_output = 'POST request to: ' . $action .
         '<hr />Ending URL: ' . $this->getSession()->getCurrentUrl();
@@ -886,6 +820,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
       $html_output .= $this->getHtmlOutputHeaders();
       $this->htmlOutput($html_output);
     }
+
   }
 
   /**
@@ -931,6 +866,8 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    *   $edit = array();
    *   $edit['name[]'] = array('value1', 'value2');
    *   @endcode
+   *   @todo change $edit to disallow NULL as a value for Drupal 9.
+   *     https://www.drupal.org/node/2802401
    * @param string $submit
    *   Value of the submit button whose click is to be emulated. For example,
    *   t('Save'). The processing of the request depends on this value. For
@@ -956,11 +893,14 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    * @param array $options
    *   Options to be forwarded to the url generator.
    */
-  protected function drupalPostForm($path, array $edit, $submit, array $options = array()) {
+  protected function drupalPostForm($path, $edit, $submit, array $options = []) {
     if (is_object($submit)) {
       // Cast MarkupInterface objects to string.
       $submit = (string) $submit;
     }
+    if ($edit === NULL) {
+      $edit = [];
+    }
     if (is_array($edit)) {
       $edit = $this->castSafeStrings($edit);
     }
@@ -1001,157 +941,14 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    * Installs Drupal into the Simpletest site.
    */
   public function installDrupal() {
-    // Define information about the user 1 account.
-    $this->rootUser = new UserSession(array(
-      'uid' => 1,
-      'name' => 'admin',
-      'mail' => 'admin@example.com',
-      'passRaw' => $this->randomMachineName(),
-    ));
-
-    // The child site derives its session name from the database prefix when
-    // running web tests.
-    $this->generateSessionName($this->databasePrefix);
-
-    // Get parameters for install_drupal() before removing global variables.
-    $parameters = $this->installParameters();
-
-    // Prepare installer settings that are not install_drupal() parameters.
-    // Copy and prepare an actual settings.php, so as to resemble a regular
-    // installation.
-    // Not using File API; a potential error must trigger a PHP warning.
-    $directory = DRUPAL_ROOT . '/' . $this->siteDirectory;
-    copy(DRUPAL_ROOT . '/sites/default/default.settings.php', $directory . '/settings.php');
-
-    // The public file system path is created during installation. Additionally,
-    // during tests:
-    // - The temporary directory is set and created by install_base_system().
-    // - The private file directory is created post install by this method.
-    // @see system_requirements()
-    // @see TestBase::prepareEnvironment()
-    // @see install_base_system()
-    $settings['settings']['file_public_path'] = (object) array(
-      'value' => $this->publicFilesDirectory,
-      'required' => TRUE,
-    );
-    $settings['settings']['file_private_path'] = (object) [
-      'value' => $this->privateFilesDirectory,
-      'required' => TRUE,
-    ];
-    $this->writeSettings($settings);
-    // Allow for test-specific overrides.
-    $settings_testing_file = DRUPAL_ROOT . '/' . $this->originalSiteDirectory . '/settings.testing.php';
-    if (file_exists($settings_testing_file)) {
-      // Copy the testing-specific settings.php overrides in place.
-      copy($settings_testing_file, $directory . '/settings.testing.php');
-      // Add the name of the testing class to settings.php and include the
-      // testing specific overrides.
-      file_put_contents($directory . '/settings.php', "\n\$test_class = '" . get_class($this) . "';\n" . 'include DRUPAL_ROOT . \'/\' . $site_path . \'/settings.testing.php\';' . "\n", FILE_APPEND);
-    }
-
-    $settings_services_file = DRUPAL_ROOT . '/' . $this->originalSiteDirectory . '/testing.services.yml';
-    if (!file_exists($settings_services_file)) {
-      // Otherwise, use the default services as a starting point for overrides.
-      $settings_services_file = DRUPAL_ROOT . '/sites/default/default.services.yml';
-    }
-    // Copy the testing-specific service overrides in place.
-    copy($settings_services_file, $directory . '/services.yml');
-    if ($this->strictConfigSchema) {
-      // Add a listener to validate configuration schema on save.
-      $content = file_get_contents($directory . '/services.yml');
-      $services = Yaml::decode($content);
-      $services['services']['simpletest.config_schema_checker'] = [
-        'class' => ConfigSchemaChecker::class,
-        'arguments' => ['@config.typed', $this->getConfigSchemaExclusions()],
-        'tags' => [['name' => 'event_subscriber']]
-      ];
-      file_put_contents($directory . '/services.yml', Yaml::encode($services));
-    }
-
-    // Since Drupal is bootstrapped already, install_begin_request() will not
-    // bootstrap into DRUPAL_BOOTSTRAP_CONFIGURATION (again). Hence, we have to
-    // reload the newly written custom settings.php manually.
-    Settings::initialize(DRUPAL_ROOT, $directory, $this->classLoader);
-
-    // Execute the non-interactive installer.
-    require_once DRUPAL_ROOT . '/core/includes/install.core.inc';
-    install_drupal($parameters);
-
-    // Import new settings.php written by the installer.
-    Settings::initialize(DRUPAL_ROOT, $directory, $this->classLoader);
-    foreach ($GLOBALS['config_directories'] as $type => $path) {
-      $this->configDirectories[$type] = $path;
-    }
-
-    // After writing settings.php, the installer removes write permissions from
-    // the site directory. To allow drupal_generate_test_ua() to write a file
-    // containing the private key for drupal_valid_test_ua(), the site directory
-    // has to be writable.
-    // TestBase::restoreEnvironment() will delete the entire site directory. Not
-    // using File API; a potential error must trigger a PHP warning.
-    chmod($directory, 0777);
-
-    // During tests, cacheable responses should get the debugging cacheability
-    // headers by default.
-    $this->setContainerParameter('http.response.debug_cacheability_headers', TRUE);
-
-    $request = \Drupal::request();
-    $this->kernel = DrupalKernel::createFromRequest($request, $this->classLoader, 'prod', TRUE);
-    $this->kernel->prepareLegacyRequest($request);
-    // Force the container to be built from scratch instead of loaded from the
-    // disk. This forces us to not accidentally load the parent site.
-    $container = $this->kernel->rebuildContainer();
-
-    $config = $container->get('config.factory');
-
-    // Manually create the private directory.
-    file_prepare_directory($this->privateFilesDirectory, FILE_CREATE_DIRECTORY);
-
-    // Manually configure the test mail collector implementation to prevent
-    // tests from sending out emails and collect them in state instead.
-    // While this should be enforced via settings.php prior to installation,
-    // some tests expect to be able to test mail system implementations.
-    $config->getEditable('system.mail')
-      ->set('interface.default', 'test_mail_collector')
-      ->save();
-
-    // By default, verbosely display all errors and disable all production
-    // environment optimizations for all tests to avoid needless overhead and
-    // ensure a sane default experience for test authors.
-    // @see https://www.drupal.org/node/2259167
-    $config->getEditable('system.logging')
-      ->set('error_level', 'verbose')
-      ->save();
-    $config->getEditable('system.performance')
-      ->set('css.preprocess', FALSE)
-      ->set('js.preprocess', FALSE)
-      ->save();
-
-    // Collect modules to install.
-    $class = get_class($this);
-    $modules = array();
-    while ($class) {
-      if (property_exists($class, 'modules')) {
-        $modules = array_merge($modules, $class::$modules);
-      }
-      $class = get_parent_class($class);
-    }
-    if ($modules) {
-      $modules = array_unique($modules);
-      $success = $container->get('module_installer')->install($modules, TRUE);
-      $this->assertTrue($success, SafeMarkup::format('Enabled modules: %modules', array('%modules' => implode(', ', $modules))));
-      $this->rebuildContainer();
-    }
-
-    // Reset/rebuild all data structures after enabling the modules, primarily
-    // to synchronize all data structures and caches between the test runner and
-    // the child site.
-    // Affects e.g. StreamWrapperManagerInterface::getWrappers().
-    // @see \Drupal\Core\DrupalKernel::bootCode()
-    // @todo Test-specific setUp() methods may set up further fixtures; find a
-    //   way to execute this after setUp() is done, or to eliminate it entirely.
-    $this->resetAll();
-    $this->kernel->prepareLegacyRequest($request);
+    $this->initUserSession();
+    $this->prepareSettings();
+    $this->doInstall();
+    $this->initSettings();
+    $container = $this->initKernel(\Drupal::request());
+    $this->initConfig($container);
+    $this->installModulesFromClassProperty($container);
+    $this->rebuildAll();
   }
 
   /**
@@ -1168,99 +965,38 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     unset($connection_info['default']['namespace']);
     unset($connection_info['default']['pdo']);
     unset($connection_info['default']['init_commands']);
-    $parameters = array(
+    $parameters = [
       'interactive' => FALSE,
-      'parameters' => array(
+      'parameters' => [
         'profile' => $this->profile,
         'langcode' => 'en',
-      ),
-      'forms' => array(
-        'install_settings_form' => array(
+      ],
+      'forms' => [
+        'install_settings_form' => [
           'driver' => $driver,
           $driver => $connection_info['default'],
-        ),
-        'install_configure_form' => array(
+        ],
+        'install_configure_form' => [
           'site_name' => 'Drupal',
           'site_mail' => 'simpletest@example.com',
-          'account' => array(
+          'account' => [
             'name' => $this->rootUser->name,
             'mail' => $this->rootUser->getEmail(),
-            'pass' => array(
-              'pass1' => $this->rootUser->passRaw,
-              'pass2' => $this->rootUser->passRaw,
-            ),
-          ),
+            'pass' => [
+              'pass1' => $this->rootUser->pass_raw,
+              'pass2' => $this->rootUser->pass_raw,
+            ],
+          ],
           // form_type_checkboxes_value() requires NULL instead of FALSE values
           // for programmatic form submissions to disable a checkbox.
-          'update_status_module' => array(
-            1 => NULL,
-            2 => NULL,
-          ),
-        ),
-      ),
-    );
+          'enable_update_status_module' => NULL,
+          'enable_update_status_emails' => NULL,
+        ],
+      ],
+    ];
     return $parameters;
   }
 
-  /**
-   * Generates a database prefix for running tests.
-   *
-   * The database prefix is used by prepareEnvironment() to setup a public files
-   * directory for the test to be run, which also contains the PHP error log,
-   * which is written to in case of a fatal error. Since that directory is based
-   * on the database prefix, all tests (even unit tests) need to have one, in
-   * order to access and read the error log.
-   *
-   * The generated database table prefix is used for the Drupal installation
-   * being performed for the test. It is also used by the cookie value of
-   * SIMPLETEST_USER_AGENT by the Mink controlled browser. During early Drupal
-   * bootstrap, the cookie is parsed, and if it matches, all database queries
-   * use the database table prefix that has been generated here.
-   *
-   * @see drupal_valid_test_ua()
-   * @see BrowserTestBase::prepareEnvironment()
-   */
-  private function prepareDatabasePrefix() {
-    $test_db = new TestDatabase();
-    $this->siteDirectory = $test_db->getTestSitePath();
-    $this->databasePrefix = $test_db->getDatabasePrefix();
-  }
-
-  /**
-   * Changes the database connection to the prefixed one.
-   *
-   * @see BrowserTestBase::prepareEnvironment()
-   */
-  private function changeDatabasePrefix() {
-    if (empty($this->databasePrefix)) {
-      $this->prepareDatabasePrefix();
-    }
-
-    // If the test is run with argument dburl then use it.
-    $db_url = getenv('SIMPLETEST_DB');
-    if (!empty($db_url)) {
-      $database = Database::convertDbUrlToConnectionInfo($db_url, DRUPAL_ROOT);
-      Database::addConnectionInfo('default', 'default', $database);
-    }
-
-    // Clone the current connection and replace the current prefix.
-    $connection_info = Database::getConnectionInfo('default');
-    if (is_null($connection_info)) {
-      throw new \InvalidArgumentException('There is no database connection so no tests can be run. You must provide a SIMPLETEST_DB environment variable to run PHPUnit based functional tests outside of run-tests.sh.');
-    }
-    else {
-      Database::renameConnection('default', 'simpletest_original_default');
-      foreach ($connection_info as $target => $value) {
-        // Replace the full table prefix definition to ensure that no table
-        // prefixes of the test runner leak into the test.
-        $connection_info[$target]['prefix'] = array(
-          'default' => $value['prefix']['default'] . $this->databasePrefix,
-        );
-      }
-      Database::addConnectionInfo('default', 'default', $connection_info['default']);
-    }
-  }
-
   /**
    * Prepares the current environment for running the test.
    *
@@ -1282,7 +1018,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     $kernel->prepareLegacyRequest($request);
     $this->prepareDatabasePrefix();
 
-    $this->originalSiteDirectory = $kernel->findSitePath($request);
+    $this->originalSite = $kernel->findSitePath($request);
 
     // Create test directory ahead of installation so fatal errors and debug
     // information can be logged during installation process.
@@ -1327,10 +1063,10 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     drupal_valid_test_ua($this->databasePrefix);
 
     // Reset settings.
-    new Settings(array(
+    new Settings([
       // For performance, simply use the database prefix as hash salt.
       'hash_salt' => $this->databasePrefix,
-    ));
+    ]);
 
     drupal_set_time_limit($this->timeLimit);
 
@@ -1343,163 +1079,6 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     $callbacks = [];
   }
 
-  /**
-   * Returns the database connection to the site running Simpletest.
-   *
-   * @return \Drupal\Core\Database\Connection
-   *   The database connection to use for inserting assertions.
-   */
-  public static function getDatabaseConnection() {
-    return TestDatabase::getConnection();
-  }
-
-  /**
-   * Rewrites the settings.php file of the test site.
-   *
-   * @param array $settings
-   *   An array of settings to write out, in the format expected by
-   *   drupal_rewrite_settings().
-   *
-   * @see drupal_rewrite_settings()
-   */
-  protected function writeSettings(array $settings) {
-    include_once DRUPAL_ROOT . '/core/includes/install.inc';
-    $filename = $this->siteDirectory . '/settings.php';
-
-    // system_requirements() removes write permissions from settings.php
-    // whenever it is invoked.
-    // Not using File API; a potential error must trigger a PHP warning.
-    chmod($filename, 0666);
-    drupal_rewrite_settings($settings, $filename);
-  }
-
-  /**
-   * Rebuilds \Drupal::getContainer().
-   *
-   * Use this to build a new kernel and service container. For example, when the
-   * list of enabled modules is changed via the Mink controlled browser, in
-   * which case the test process still contains an old kernel and service
-   * container with an old module list.
-   *
-   * @see BrowserTestBase::prepareEnvironment()
-   * @see BrowserTestBase::restoreEnvironment()
-   *
-   * @todo Fix https://www.drupal.org/node/2021959 so that module enable/disable
-   *   changes are immediately reflected in \Drupal::getContainer(). Until then,
-   *   tests can invoke this workaround when requiring services from newly
-   *   enabled modules to be immediately available in the same request.
-   */
-  protected function rebuildContainer() {
-    // Rebuild the kernel and bring it back to a fully bootstrapped state.
-    $this->container = $this->kernel->rebuildContainer();
-
-    // Make sure the url generator has a request object, otherwise calls to
-    // $this->drupalGet() will fail.
-    $this->prepareRequestForGenerator();
-  }
-
-  /**
-   * Creates a mock request and sets it on the generator.
-   *
-   * This is used to manipulate how the generator generates paths during tests.
-   * It also ensures that calls to $this->drupalGet() will work when running
-   * from run-tests.sh because the url generator no longer looks at the global
-   * variables that are set there but relies on getting this information from a
-   * request object.
-   *
-   * @param bool $clean_urls
-   *   Whether to mock the request using clean urls.
-   * @param array $override_server_vars
-   *   An array of server variables to override.
-   *
-   * @return Request
-   *   The mocked request object.
-   */
-  protected function prepareRequestForGenerator($clean_urls = TRUE, $override_server_vars = array()) {
-    $request = Request::createFromGlobals();
-    $server = $request->server->all();
-    if (basename($server['SCRIPT_FILENAME']) != basename($server['SCRIPT_NAME'])) {
-      // We need this for when the test is executed by run-tests.sh.
-      // @todo Remove this once run-tests.sh has been converted to use a Request
-      //   object.
-      $cwd = getcwd();
-      $server['SCRIPT_FILENAME'] = $cwd . '/' . basename($server['SCRIPT_NAME']);
-      $base_path = rtrim($server['REQUEST_URI'], '/');
-    }
-    else {
-      $base_path = $request->getBasePath();
-    }
-    if ($clean_urls) {
-      $request_path = $base_path ? $base_path . '/user' : 'user';
-    }
-    else {
-      $request_path = $base_path ? $base_path . '/index.php/user' : '/index.php/user';
-    }
-    $server = array_merge($server, $override_server_vars);
-
-    $request = Request::create($request_path, 'GET', array(), array(), array(), $server);
-    // Ensure the request time is REQUEST_TIME to ensure that API calls
-    // in the test use the right timestamp.
-    $request->server->set('REQUEST_TIME', REQUEST_TIME);
-    $this->container->get('request_stack')->push($request);
-
-    // The request context is normally set by the router_listener from within
-    // its KernelEvents::REQUEST listener. In the Simpletest parent site this
-    // event is not fired, therefore it is necessary to updated the request
-    // context manually here.
-    $this->container->get('router.request_context')->fromRequest($request);
-
-    return $request;
-  }
-
-  /**
-   * Resets all data structures after having enabled new modules.
-   *
-   * This method is called by \Drupal\simpletest\BrowserTestBase::setUp() after
-   * enabling the requested modules. It must be called again when additional
-   * modules are enabled later.
-   */
-  protected function resetAll() {
-    // Clear all database and static caches and rebuild data structures.
-    drupal_flush_all_caches();
-    $this->container = \Drupal::getContainer();
-
-    // Reset static variables and reload permissions.
-    $this->refreshVariables();
-  }
-
-  /**
-   * Refreshes in-memory configuration and state information.
-   *
-   * Useful after a page request is made that changes configuration or state in
-   * a different thread.
-   *
-   * In other words calling a settings page with $this->submitForm() with a
-   * changed value would update configuration to reflect that change, but in the
-   * thread that made the call (thread running the test) the changed values
-   * would not be picked up.
-   *
-   * This method clears the cache and loads a fresh copy.
-   */
-  protected function refreshVariables() {
-    // Clear the tag cache.
-    $this->container->get('cache_tags.invalidator')->resetChecksums();
-    // @todo Replace drupal_static() usage within classes and provide a
-    //   proper interface for invoking reset() on a cache backend:
-    //   https://www.drupal.org/node/2311945.
-    drupal_static_reset('Drupal\Core\Cache\CacheBackendInterface::tagCache');
-    drupal_static_reset('Drupal\Core\Cache\DatabaseBackend::deletedTags');
-    drupal_static_reset('Drupal\Core\Cache\DatabaseBackend::invalidatedTags');
-    foreach (Cache::getBins() as $backend) {
-      if (is_callable(array($backend, 'reset'))) {
-        $backend->reset();
-      }
-    }
-
-    $this->container->get('config.factory')->reset();
-    $this->container->get('state')->resetCache();
-  }
-
   /**
    * Returns whether a given user account is logged in.
    *
@@ -1576,15 +1155,28 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    *   HTML output headers.
    */
   protected function getHtmlOutputHeaders() {
-    $headers = array_map(function($headers) {
-      if (is_array($headers)) {
-        return implode(';', array_map('trim', $headers));
+    return $this->formatHtmlOutputHeaders($this->getSession()->getResponseHeaders());
+  }
+
+  /**
+   * Formats HTTP headers as string for HTML output logging.
+   *
+   * @param array[] $headers
+   *   Headers that should be formatted.
+   *
+   * @return string
+   *   The formatted HTML string.
+   */
+  protected function formatHtmlOutputHeaders(array $headers) {
+    $flattened_headers = array_map(function($header) {
+      if (is_array($header)) {
+        return implode(';', array_map('trim', $header));
       }
       else {
-        return $headers;
+        return $header;
       }
-    }, $this->getSession()->getResponseHeaders());
-    return '<hr />Headers: <pre>' . Html::escape(var_export($headers, TRUE)) . '</pre>';
+    }, $headers);
+    return '<hr />Headers: <pre>' . Html::escape(var_export($flattened_headers, TRUE)) . '</pre>';
   }
 
   /**
@@ -1680,6 +1272,19 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     return $this->container->get('config.factory')->getEditable($name);
   }
 
+  /**
+   * Returns all response headers.
+   *
+   * @return array
+   *   The HTTP headers values.
+   *
+   * @deprecated Scheduled for removal in Drupal 9.0.0.
+   *   Use $this->getSession()->getResponseHeaders() instead.
+   */
+  protected function drupalGetHeaders() {
+    return $this->getSession()->getResponseHeaders();
+  }
+
   /**
    * Gets the value of an HTTP response header.
    *
@@ -1734,43 +1339,34 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
   }
 
   /**
-   * Changes parameters in the services.yml file.
+   * Retrieves the current calling line in the class under test.
    *
-   * @param string $name
-   *   The name of the parameter.
-   * @param mixed $value
-   *   The value of the parameter.
+   * @return array
+   *   An associative array with keys 'file', 'line' and 'function'.
    */
-  protected function setContainerParameter($name, $value) {
-    $filename = $this->siteDirectory . '/services.yml';
-    chmod($filename, 0666);
-
-    $services = Yaml::decode(file_get_contents($filename));
-    $services['parameters'][$name] = $value;
-    file_put_contents($filename, Yaml::encode($services));
-
-    // Ensure that the cache is deleted for the yaml file loader.
-    $file_cache = FileCacheFactory::get('container_yaml_loader');
-    $file_cache->delete($filename);
-  }
-
-  /**
-   * Gets the config schema exclusions for this test.
-   *
-   * @return string[]
-   *   An array of config object names that are excluded from schema checking.
-   */
-  protected function getConfigSchemaExclusions() {
-    $class = get_class($this);
-    $exceptions = [];
-    while ($class) {
-      if (property_exists($class, 'configSchemaCheckerExclusions')) {
-        $exceptions = array_merge($exceptions, $class::$configSchemaCheckerExclusions);
+  protected function getTestMethodCaller() {
+    $backtrace = debug_backtrace();
+    // Find the test class that has the test method.
+    while ($caller = Error::getLastCaller($backtrace)) {
+      if (isset($caller['class']) && $caller['class'] === get_class($this)) {
+        break;
       }
-      $class = get_parent_class($class);
+      // If the test method is implemented by a test class's parent then the
+      // class name of $this will not be part of the backtrace.
+      // In that case we process the backtrace until the caller is not a
+      // subclass of $this and return the previous caller.
+      if (isset($last_caller) && (!isset($caller['class']) || !is_subclass_of($this, $caller['class']))) {
+        // Return the last caller since that has to be the test class.
+        $caller = $last_caller;
+        break;
+      }
+      // Otherwise we have not reached our test class yet: save the last caller
+      // and remove an element from to backtrace to process the next call.
+      $last_caller = $caller;
+      array_shift($backtrace);
     }
-    // Filter out any duplicates.
-    return array_unique($exceptions);
+
+    return $caller;
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Annotation/Plugin/Discovery/AnnotationBridgeDecoratorTest.php b/web/core/tests/Drupal/Tests/Component/Annotation/Plugin/Discovery/AnnotationBridgeDecoratorTest.php
new file mode 100644
index 000000000..c1e231eb0
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Component/Annotation/Plugin/Discovery/AnnotationBridgeDecoratorTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\Tests\Component\Annotation\Plugin\Discovery;
+
+use Drupal\Component\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin\Discovery\AnnotationBridgeDecorator;
+use Drupal\Component\Plugin\Definition\PluginDefinition;
+use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Component\Annotation\Plugin\Discovery\AnnotationBridgeDecorator
+ * @group Plugin
+ */
+class AnnotationBridgeDecoratorTest extends UnitTestCase {
+
+  /**
+   * @covers ::getDefinitions
+   */
+  public function testGetDefinitions() {
+    $definitions = [];
+    $definitions['object'] = new ObjectDefinition(['id' => 'foo']);
+    $definitions['array'] = ['id' => 'bar'];
+    $discovery = $this->prophesize(DiscoveryInterface::class);
+    $discovery->getDefinitions()->willReturn($definitions);
+
+    $decorator = new AnnotationBridgeDecorator($discovery->reveal(), TestAnnotation::class);
+
+    $expected = [
+      'object' => new ObjectDefinition(['id' => 'foo']),
+      'array' => new ObjectDefinition(['id' => 'bar']),
+    ];
+    $this->assertEquals($expected, $decorator->getDefinitions());
+  }
+
+}
+
+class TestAnnotation extends Plugin {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function get() {
+    return new ObjectDefinition($this->definition);
+  }
+
+}
+class ObjectDefinition extends PluginDefinition {
+
+  /**
+   * ObjectDefinition constructor.
+   *
+   * @param array $definition
+   */
+  public function __construct(array $definition) {
+    foreach ($definition as $property => $value) {
+      $this->{$property} = $value;
+    }
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Component/Bridge/ZfExtensionManagerSfContainerTest.php b/web/core/tests/Drupal/Tests/Component/Bridge/ZfExtensionManagerSfContainerTest.php
index 9efbf4ecc..c14bdfb3e 100644
--- a/web/core/tests/Drupal/Tests/Component/Bridge/ZfExtensionManagerSfContainerTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Bridge/ZfExtensionManagerSfContainerTest.php
@@ -80,41 +80,41 @@ class ZfExtensionManagerSfContainerTest extends UnitTestCase {
    *   array('-' => '', '_' => '', ' ' => '', '\\' => '', '/' => '')
    */
   public function canonicalizeNameProvider() {
-    return array(
-      array(
+    return [
+      [
         'foobar',
         'foobar',
-      ),
-      array(
+      ],
+      [
         'foo-bar',
         'foobar',
-      ),
-      array(
+      ],
+      [
         'foo_bar',
         'foobar',
-      ),
-      array(
+      ],
+      [
         'foo bar',
         'foobar',
-      ),
-      array(
+      ],
+      [
         'foo\\bar',
         'foobar',
-      ),
-      array(
+      ],
+      [
         'foo/bar',
         'foobar',
-      ),
+      ],
       // There is also a strtolower in canonicalizeName.
-      array(
+      [
         'Foo/bAr',
         'foobar',
-      ),
-      array(
+      ],
+      [
         'foo/-_\\ bar',
         'foobar',
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php b/web/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
index b8be130c3..f120007d4 100644
--- a/web/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
@@ -98,11 +98,13 @@ class DateTimePlusTest extends UnitTestCase {
    *   Input argument for DateTimePlus.
    * @param string $timezone
    *   Timezone argument for DateTimePlus.
+   * @param string $class
+   *   The Exception subclass to expect to be thrown.
    *
    * @dataProvider providerTestInvalidDateArrays
-   * @expectedException \Exception
    */
-  public function testInvalidDateArrays($input, $timezone) {
+  public function testInvalidDateArrays($input, $timezone, $class) {
+    $this->setExpectedException($class);
     $this->assertInstanceOf(
       '\Drupal\Component\DateTimePlus',
       DateTimePlus::createFromArray($input, $timezone)
@@ -234,11 +236,13 @@ class DateTimePlusTest extends UnitTestCase {
    *   Format argument for DateTimePlus.
    * @param string $message
    *   Message to print if no errors are thrown by the invalid dates.
+   * @param string $class
+   *   The Exception subclass to expect to be thrown.
    *
    * @dataProvider providerTestInvalidDates
-   * @expectedException \Exception
    */
-  public function testInvalidDates($input, $timezone, $format, $message) {
+  public function testInvalidDates($input, $timezone, $format, $message, $class) {
+    $this->setExpectedException($class);
     DateTimePlus::createFromFormat($format, $input, $timezone);
   }
 
@@ -289,21 +293,21 @@ class DateTimePlusTest extends UnitTestCase {
    * @see DateTimePlusTest::testDates()
    */
   public function providerTestDates() {
-    return array(
+    return [
       // String input.
       // Create date object from datetime string.
-      array('2009-03-07 10:30', 'America/Chicago', '2009-03-07T10:30:00-06:00'),
+      ['2009-03-07 10:30', 'America/Chicago', '2009-03-07T10:30:00-06:00'],
       // Same during daylight savings time.
-      array('2009-06-07 10:30', 'America/Chicago', '2009-06-07T10:30:00-05:00'),
+      ['2009-06-07 10:30', 'America/Chicago', '2009-06-07T10:30:00-05:00'],
       // Create date object from date string.
-      array('2009-03-07', 'America/Chicago', '2009-03-07T00:00:00-06:00'),
+      ['2009-03-07', 'America/Chicago', '2009-03-07T00:00:00-06:00'],
       // Same during daylight savings time.
-      array('2009-06-07', 'America/Chicago', '2009-06-07T00:00:00-05:00'),
+      ['2009-06-07', 'America/Chicago', '2009-06-07T00:00:00-05:00'],
       // Create date object from date string.
-      array('2009-03-07 10:30', 'Australia/Canberra', '2009-03-07T10:30:00+11:00'),
+      ['2009-03-07 10:30', 'Australia/Canberra', '2009-03-07T10:30:00+11:00'],
       // Same during daylight savings time.
-      array('2009-06-07 10:30', 'Australia/Canberra', '2009-06-07T10:30:00+10:00'),
-    );
+      ['2009-06-07 10:30', 'Australia/Canberra', '2009-06-07T10:30:00+10:00'],
+    ];
   }
 
   /**
@@ -316,17 +320,17 @@ class DateTimePlusTest extends UnitTestCase {
    * @see DateTimePlusTest::testDates()
    */
   public function providerTestDateArrays() {
-    return array(
+    return [
       // Array input.
       // Create date object from date array, date only.
-      array(array('year' => 2010, 'month' => 2, 'day' => 28), 'America/Chicago', '2010-02-28T00:00:00-06:00'),
+      [['year' => 2010, 'month' => 2, 'day' => 28], 'America/Chicago', '2010-02-28T00:00:00-06:00'],
       // Create date object from date array with hour.
-      array(array('year' => 2010, 'month' => 2, 'day' => 28, 'hour' => 10), 'America/Chicago', '2010-02-28T10:00:00-06:00'),
+      [['year' => 2010, 'month' => 2, 'day' => 28, 'hour' => 10], 'America/Chicago', '2010-02-28T10:00:00-06:00'],
       // Create date object from date array, date only.
-      array(array('year' => 2010, 'month' => 2, 'day' => 28), 'Europe/Berlin', '2010-02-28T00:00:00+01:00'),
+      [['year' => 2010, 'month' => 2, 'day' => 28], 'Europe/Berlin', '2010-02-28T00:00:00+01:00'],
       // Create date object from date array with hour.
-      array(array('year' => 2010, 'month' => 2, 'day' => 28, 'hour' => 10), 'Europe/Berlin', '2010-02-28T10:00:00+01:00'),
-    );
+      [['year' => 2010, 'month' => 2, 'day' => 28, 'hour' => 10], 'Europe/Berlin', '2010-02-28T10:00:00+01:00'],
+    ];
   }
 
   /**
@@ -343,16 +347,16 @@ class DateTimePlusTest extends UnitTestCase {
    * @see testDateFormats()
    */
   public function providerTestDateFormat() {
-    return array(
+    return [
       // Create a year-only date.
-      array('2009', NULL, 'Y', 'Y', '2009'),
+      ['2009', NULL, 'Y', 'Y', '2009'],
       // Create a month and year-only date.
-      array('2009-10', NULL, 'Y-m', 'Y-m', '2009-10'),
+      ['2009-10', NULL, 'Y-m', 'Y-m', '2009-10'],
       // Create a time-only date.
-      array('T10:30:00', NULL, '\TH:i:s', 'H:i:s', '10:30:00'),
+      ['T10:30:00', NULL, '\TH:i:s', 'H:i:s', '10:30:00'],
       // Create a time-only date.
-      array('10:30:00', NULL, 'H:i:s', 'H:i:s', '10:30:00'),
-    );
+      ['10:30:00', NULL, 'H:i:s', 'H:i:s', '10:30:00'],
+    ];
   }
 
   /**
@@ -368,20 +372,20 @@ class DateTimePlusTest extends UnitTestCase {
    * @see testInvalidDates
    */
   public function providerTestInvalidDates() {
-    return array(
+    return [
       // Test for invalid month names when we are using a short version
       // of the month.
-      array('23 abc 2012', NULL, 'd M Y', "23 abc 2012 contains an invalid month name and did not produce errors."),
+      ['23 abc 2012', NULL, 'd M Y', "23 abc 2012 contains an invalid month name and did not produce errors.", \InvalidArgumentException::class],
       // Test for invalid hour.
-      array('0000-00-00T45:30:00', NULL, 'Y-m-d\TH:i:s', "0000-00-00T45:30:00 contains an invalid hour and did not produce errors."),
+      ['0000-00-00T45:30:00', NULL, 'Y-m-d\TH:i:s', "0000-00-00T45:30:00 contains an invalid hour and did not produce errors.", \UnexpectedValueException::class],
       // Test for invalid day.
-      array('0000-00-99T05:30:00', NULL, 'Y-m-d\TH:i:s', "0000-00-99T05:30:00 contains an invalid day and did not produce errors."),
+      ['0000-00-99T05:30:00', NULL, 'Y-m-d\TH:i:s', "0000-00-99T05:30:00 contains an invalid day and did not produce errors.", \UnexpectedValueException::class],
       // Test for invalid month.
-      array('0000-75-00T15:30:00', NULL, 'Y-m-d\TH:i:s', "0000-75-00T15:30:00 contains an invalid month and did not produce errors."),
+      ['0000-75-00T15:30:00', NULL, 'Y-m-d\TH:i:s', "0000-75-00T15:30:00 contains an invalid month and did not produce errors.", \UnexpectedValueException::class],
       // Test for invalid year.
-      array('11-08-01T15:30:00', NULL, 'Y-m-d\TH:i:s', "11-08-01T15:30:00 contains an invalid year and did not produce errors."),
+      ['11-08-01T15:30:00', NULL, 'Y-m-d\TH:i:s', "11-08-01T15:30:00 contains an invalid year and did not produce errors.", \UnexpectedValueException::class],
 
-    );
+    ];
   }
 
   /**
@@ -395,20 +399,20 @@ class DateTimePlusTest extends UnitTestCase {
    * @see testInvalidDateArrays
    */
   public function providerTestInvalidDateArrays() {
-    return array(
+    return [
       // One year larger than the documented upper limit of checkdate().
-      array(array('year' => 32768, 'month' => 1, 'day' => 8, 'hour' => 8, 'minute' => 0, 'second' => 0), 'America/Chicago'),
+      [['year' => 32768, 'month' => 1, 'day' => 8, 'hour' => 8, 'minute' => 0, 'second' => 0], 'America/Chicago', \InvalidArgumentException::class],
       // One year smaller than the documented lower limit of checkdate().
-      array(array('year' => 0, 'month' => 1, 'day' => 8, 'hour' => 8, 'minute' => 0, 'second' => 0), 'America/Chicago'),
+      [['year' => 0, 'month' => 1, 'day' => 8, 'hour' => 8, 'minute' => 0, 'second' => 0], 'America/Chicago', \InvalidArgumentException::class],
       // Test for invalid month from date array.
-      array(array('year' => 2010, 'month' => 27, 'day' => 8, 'hour' => 8, 'minute' => 0, 'second' => 0), 'America/Chicago'),
+      [['year' => 2010, 'month' => 27, 'day' => 8, 'hour' => 8, 'minute' => 0, 'second' => 0], 'America/Chicago', \InvalidArgumentException::class],
       // Test for invalid hour from date array.
-      array(array('year' => 2010, 'month' => 2, 'day' => 28, 'hour' => 80, 'minute' => 0, 'second' => 0), 'America/Chicago'),
+      [['year' => 2010, 'month' => 2, 'day' => 28, 'hour' => 80, 'minute' => 0, 'second' => 0], 'America/Chicago', \InvalidArgumentException::class],
       // Test for invalid minute from date array.
-      array(array('year' => 2010, 'month' => 7, 'day' => 8, 'hour' => 8, 'minute' => 88, 'second' => 0), 'America/Chicago'),
+      [['year' => 2010, 'month' => 7, 'day' => 8, 'hour' => 8, 'minute' => 88, 'second' => 0], 'America/Chicago', \InvalidArgumentException::class],
       // Regression test for https://www.drupal.org/node/2084455.
-      array(array('hour' => 59, 'minute' => 1, 'second' => 1), 'America/Chicago'),
-    );
+      [['hour' => 59, 'minute' => 1, 'second' => 1], 'America/Chicago', \InvalidArgumentException::class],
+    ];
   }
 
   /**
@@ -430,17 +434,17 @@ class DateTimePlusTest extends UnitTestCase {
     // Detect the system timezone.
     $system_timezone = date_default_timezone_get();
 
-    return array(
+    return [
       // Create a date object with an unspecified timezone, which should
       // end up using the system timezone.
-      array($date_string, NULL, $system_timezone, 'DateTimePlus uses the system timezone when there is no site timezone.'),
+      [$date_string, NULL, $system_timezone, 'DateTimePlus uses the system timezone when there is no site timezone.'],
       // Create a date object with a specified timezone name.
-      array($date_string, 'America/Yellowknife', 'America/Yellowknife', 'DateTimePlus uses the specified timezone if provided.'),
+      [$date_string, 'America/Yellowknife', 'America/Yellowknife', 'DateTimePlus uses the specified timezone if provided.'],
       // Create a date object with a timezone object.
-      array($date_string, new \DateTimeZone('Australia/Canberra'), 'Australia/Canberra', 'DateTimePlus uses the specified timezone if provided.'),
+      [$date_string, new \DateTimeZone('Australia/Canberra'), 'Australia/Canberra', 'DateTimePlus uses the specified timezone if provided.'],
       // Create a date object with another date object.
-      array(new DateTimePlus('now', 'Pacific/Midway'), NULL, 'Pacific/Midway', 'DateTimePlus uses the specified timezone if provided.'),
-    );
+      [new DateTimePlus('now', 'Pacific/Midway'), NULL, 'Pacific/Midway', 'DateTimePlus uses the specified timezone if provided.'],
+    ];
   }
 
   /**
@@ -453,46 +457,46 @@ class DateTimePlusTest extends UnitTestCase {
    * @see testTimestamp()
    */
   public function providerTestTimestamp() {
-    return array(
+    return [
       // Create date object from a unix timestamp and display it in
       // local time.
-      array(
+      [
         'input' => 0,
-        'initial' => array(
+        'initial' => [
           'timezone' => 'UTC',
           'format' => 'c',
           'expected_date' => '1970-01-01T00:00:00+00:00',
           'expected_timezone' => 'UTC',
           'expected_offset' => 0,
-        ),
-        'transform' => array(
+        ],
+        'transform' => [
           'timezone' => 'America/Los_Angeles',
           'format' => 'c',
           'expected_date' => '1969-12-31T16:00:00-08:00',
           'expected_timezone' => 'America/Los_Angeles',
           'expected_offset' => '-28800',
-        ),
-      ),
+        ],
+      ],
       // Create a date using the timestamp of zero, then display its
       // value both in UTC and the local timezone.
-      array(
+      [
         'input' => 0,
-        'initial' => array(
+        'initial' => [
           'timezone' => 'America/Los_Angeles',
           'format' => 'c',
           'expected_date' => '1969-12-31T16:00:00-08:00',
           'expected_timezone' => 'America/Los_Angeles',
           'expected_offset' => '-28800',
-        ),
-        'transform' => array(
+        ],
+        'transform' => [
           'timezone' => 'UTC',
           'format' => 'c',
           'expected_date' => '1970-01-01T00:00:00+00:00',
           'expected_timezone' => 'UTC',
           'expected_offset' => 0,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -505,63 +509,63 @@ class DateTimePlusTest extends UnitTestCase {
    * @see testDateTimestamp()
    */
   public function providerTestDateTimestamp() {
-    return array(
+    return [
       // Create date object from datetime string in UTC, and convert
       // it to a local date.
-      array(
+      [
         'input' => '1970-01-01 00:00:00',
-        'initial' => array(
+        'initial' => [
           'timezone' => 'UTC',
           'format' => 'c',
           'expected_date' => '1970-01-01T00:00:00+00:00',
           'expected_timezone' => 'UTC',
           'expected_offset' => 0,
-        ),
-        'transform' => array(
+        ],
+        'transform' => [
           'timezone' => 'America/Los_Angeles',
           'format' => 'c',
           'expected_date' => '1969-12-31T16:00:00-08:00',
           'expected_timezone' => 'America/Los_Angeles',
           'expected_offset' => '-28800',
-        ),
-      ),
+        ],
+      ],
       // Convert the local time to UTC using string input.
-      array(
+      [
         'input' => '1969-12-31 16:00:00',
-        'initial' => array(
+        'initial' => [
           'timezone' => 'America/Los_Angeles',
           'format' => 'c',
           'expected_date' => '1969-12-31T16:00:00-08:00',
           'expected_timezone' => 'America/Los_Angeles',
           'expected_offset' => '-28800',
-        ),
-        'transform' => array(
+        ],
+        'transform' => [
           'timezone' => 'UTC',
           'format' => 'c',
           'expected_date' => '1970-01-01T00:00:00+00:00',
           'expected_timezone' => 'UTC',
           'expected_offset' => 0,
-        ),
-      ),
+        ],
+      ],
       // Convert the local time to UTC using string input.
-      array(
+      [
         'input' => '1969-12-31 16:00:00',
-        'initial' => array(
+        'initial' => [
           'timezone' => 'Europe/Warsaw',
           'format' => 'c',
           'expected_date' => '1969-12-31T16:00:00+01:00',
           'expected_timezone' => 'Europe/Warsaw',
           'expected_offset' => '+3600',
-        ),
-        'transform' => array(
+        ],
+        'transform' => [
           'timezone' => 'UTC',
           'format' => 'c',
           'expected_date' => '1969-12-31T15:00:00+00:00',
           'expected_timezone' => 'UTC',
           'expected_offset' => 0,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -586,60 +590,60 @@ class DateTimePlusTest extends UnitTestCase {
     $negative_1_hour = new \DateInterval('PT1H');
     $negative_1_hour->invert = 1;
 
-    return array(
+    return [
       // There should be a 19 hour time interval between
       // new years in Sydney and new years in LA in year 2000.
-      array(
+      [
         'input2' => DateTimePlus::createFromFormat('Y-m-d H:i:s', '2000-01-01 00:00:00', new \DateTimeZone('Australia/Sydney')),
         'input1' => DateTimePlus::createFromFormat('Y-m-d H:i:s', '2000-01-01 00:00:00', new \DateTimeZone('America/Los_Angeles')),
         'absolute' => FALSE,
         'expected' => $positive_19_hours,
-      ),
+      ],
       // In 1970 Sydney did not observe daylight savings time
       // So there is only a 18 hour time interval.
-      array(
+      [
         'input2' => DateTimePlus::createFromFormat('Y-m-d H:i:s', '1970-01-01 00:00:00', new \DateTimeZone('Australia/Sydney')),
         'input1' => DateTimePlus::createFromFormat('Y-m-d H:i:s', '1970-01-01 00:00:00', new \DateTimeZone('America/Los_Angeles')),
         'absolute' => FALSE,
         'expected' => $positive_18_hours,
-      ),
-      array(
+      ],
+      [
         'input1' => DateTimePlus::createFromFormat('U', 3600, new \DateTimeZone('America/Los_Angeles')),
         'input2' => DateTimePlus::createFromFormat('U', 0, new \DateTimeZone('UTC')),
         'absolute' => FALSE,
         'expected' => $negative_1_hour,
-      ),
-      array(
+      ],
+      [
         'input1' => DateTimePlus::createFromFormat('U', 3600),
         'input2' => DateTimePlus::createFromFormat('U', 0),
         'absolute' => FALSE,
         'expected' => $negative_1_hour,
-      ),
-      array(
+      ],
+      [
         'input1' => DateTimePlus::createFromFormat('U', 3600),
         'input2' => \DateTime::createFromFormat('U', 0),
         'absolute' => FALSE,
         'expected' => $negative_1_hour,
-      ),
-      array(
+      ],
+      [
         'input1' => DateTimePlus::createFromFormat('U', 3600),
         'input2' => DateTimePlus::createFromFormat('U', 0),
         'absolute' => TRUE,
         'expected' => $positive_1_hour,
-      ),
-      array(
+      ],
+      [
         'input1' => DateTimePlus::createFromFormat('U', 3600),
         'input2' => \DateTime::createFromFormat('U', 0),
         'absolute' => TRUE,
         'expected' => $positive_1_hour,
-      ),
-      array(
+      ],
+      [
         'input1' => DateTimePlus::createFromFormat('U', 0),
         'input2' => DateTimePlus::createFromFormat('U', 0),
         'absolute' => FALSE,
         'expected' => $empty_interval,
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -652,18 +656,126 @@ class DateTimePlusTest extends UnitTestCase {
    * @see DateTimePlusTest::testInvalidDateDiff()
    */
   public function providerTestInvalidDateDiff() {
-    return array(
-      array(
+    return [
+      [
         'input1' => DateTimePlus::createFromFormat('U', 3600),
         'input2' => '1970-01-01 00:00:00',
         'absolute' => FALSE,
-      ),
-      array(
+      ],
+      [
         'input1' => DateTimePlus::createFromFormat('U', 3600),
         'input2' => NULL,
         'absolute' => FALSE,
-      ),
-    );
+      ],
+    ];
+  }
+
+  /**
+   * Tests invalid values passed to constructor.
+   *
+   * @param string $time
+   *   A date/time string.
+   * @param string[] $errors
+   *   An array of error messages.
+   *
+   * @covers ::__construct
+   *
+   * @dataProvider providerTestInvalidConstructor
+   */
+  public function testInvalidConstructor($time, array $errors) {
+    $date = new DateTimePlus($time);
+
+    $this->assertEquals(TRUE, $date->hasErrors());
+    $this->assertEquals($errors, $date->getErrors());
+  }
+
+  /**
+   * Provider for testInvalidConstructor().
+   *
+   * @return array
+   *   An array of invalid date/time strings, and corresponding error messages.
+   */
+  public function providerTestInvalidConstructor() {
+    return [
+      [
+        'YYYY-MM-DD',
+        [
+          'The timezone could not be found in the database',
+          'Unexpected character',
+          'Double timezone specification',
+        ],
+      ],
+      [
+        '2017-MM-DD',
+        [
+          'Unexpected character',
+          'The timezone could not be found in the database',
+        ],
+      ],
+      [
+        'YYYY-03-DD',
+        [
+          'The timezone could not be found in the database',
+          'Unexpected character',
+          'Double timezone specification',
+        ],
+      ],
+      [
+        'YYYY-MM-07',
+        [
+          'The timezone could not be found in the database',
+          'Unexpected character',
+          'Double timezone specification',
+        ],
+      ],
+      [
+        '2017-13-55',
+        [
+          'Unexpected character',
+        ],
+      ],
+      [
+        'YYYY-MM-DD hh:mm:ss',
+        [
+          'The timezone could not be found in the database',
+          'Unexpected character',
+          'Double timezone specification',
+        ],
+      ],
+      [
+        '2017-03-07 25:70:80',
+        [
+          'Unexpected character',
+          'Double time specification',
+        ],
+      ],
+      [
+        'lorem ipsum dolor sit amet',
+        [
+          'The timezone could not be found in the database',
+          'Double timezone specification',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * Tests the $settings['validate_format'] parameter in ::createFromFormat().
+   */
+  public function testValidateFormat() {
+    // Check that an input that does not strictly follow the input format will
+    // produce the desired date. In this case the year string '11' doesn't
+    // precisely match the 'Y' formater parameter, but PHP will parse it
+    // regardless. However, when formatted with the same string, the year will
+    // be output with four digits. With the ['validate_format' => FALSE]
+    // $settings, this will not thrown an exception.
+    $date = DateTimePlus::createFromFormat('Y-m-d H:i:s', '11-03-31 17:44:00', 'UTC', ['validate_format' => FALSE]);
+    $this->assertEquals('0011-03-31 17:44:00', $date->format('Y-m-d H:i:s'));
+
+    // Parse the same date with ['validate_format' => TRUE] and make sure we
+    // get the expected exception.
+    $this->setExpectedException(\UnexpectedValueException::class);
+    $date = DateTimePlus::createFromFormat('Y-m-d H:i:s', '11-03-31 17:44:00', 'UTC', ['validate_format' => TRUE]);
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Datetime/TimeTest.php b/web/core/tests/Drupal/Tests/Component/Datetime/TimeTest.php
new file mode 100644
index 000000000..0553451de
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Component/Datetime/TimeTest.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Drupal\Tests\Component\Datetime;
+
+use Drupal\Component\Datetime\Time;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @coversDefaultClass \Drupal\Component\Datetime\Time
+ * @group Datetime
+ *
+ * Isolate the tests to prevent side effects from altering system time.
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class TimeTest extends UnitTestCase {
+
+  /**
+   * The mocked request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $requestStack;
+
+  /**
+   * The mocked time class.
+   *
+   * @var \Drupal\Component\Datetime\Time
+   */
+  protected $time;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
+
+    $this->time = new Time($this->requestStack);
+  }
+
+  /**
+   * Tests the getRequestTime method.
+   *
+   * @covers ::getRequestTime
+   */
+  public function testGetRequestTime() {
+    $expected = 12345678;
+
+    $request = Request::createFromGlobals();
+    $request->server->set('REQUEST_TIME', $expected);
+
+    // Mocks a the request stack getting the current request.
+    $this->requestStack->expects($this->any())
+      ->method('getCurrentRequest')
+      ->willReturn($request);
+
+    $this->assertEquals($expected, $this->time->getRequestTime());
+  }
+
+  /**
+   * Tests the getRequestMicroTime method.
+   *
+   * @covers ::getRequestMicroTime
+   */
+  public function testGetRequestMicroTime() {
+    $expected = 1234567.89;
+
+    $request = Request::createFromGlobals();
+    $request->server->set('REQUEST_TIME_FLOAT', $expected);
+
+    // Mocks a the request stack getting the current request.
+    $this->requestStack->expects($this->any())
+      ->method('getCurrentRequest')
+      ->willReturn($request);
+
+    $this->assertEquals($expected, $this->time->getRequestMicroTime());
+  }
+
+  /**
+   * Tests the getCurrentTime method.
+   *
+   * @covers ::getCurrentTime
+   */
+  public function testGetCurrentTime() {
+    $expected = 12345678;
+    $this->assertEquals($expected, $this->time->getCurrentTime());
+  }
+
+  /**
+   * Tests the getCurrentMicroTime method.
+   *
+   * @covers ::getCurrentMicroTime
+   */
+  public function testGetCurrentMicroTime() {
+    $expected = 1234567.89;
+    $this->assertEquals($expected, $this->time->getCurrentMicroTime());
+  }
+
+}
+
+namespace Drupal\Component\Datetime;
+
+/**
+ * Shadow time() system call.
+ *
+ * @returns int
+ */
+function time() {
+  return 12345678;
+}
+
+/**
+ * Shadow microtime system call.
+ *
+ * @returns float
+ */
+function microtime() {
+  return 1234567.89;
+}
diff --git a/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
index 3c89804d9..6cd557596 100644
--- a/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
+++ b/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
@@ -7,8 +7,14 @@
 
 namespace Drupal\Tests\Component\DependencyInjection;
 
+use Drupal\Component\Utility\Crypt;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Prophecy\Argument;
 
 /**
@@ -59,12 +65,11 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * Tests that passing a non-supported format throws an InvalidArgumentException.
    *
    * @covers ::__construct
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
    */
   public function testConstruct() {
     $container_definition = $this->getMockContainerDefinition();
     $container_definition['machine_format'] = !$this->machineFormat;
+    $this->setExpectedException(InvalidArgumentException::class);
     $container = new $this->containerClass($container_definition);
   }
 
@@ -85,10 +90,9 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * @covers ::getParameter
    * @covers ::getParameterAlternatives
    * @covers ::getAlternatives
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException
    */
   public function testGetParameterIfNotFound() {
+    $this->setExpectedException(ParameterNotFoundException::class);
     $this->container->getParameter('parameter_that_does_not_exist');
   }
 
@@ -96,10 +100,9 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * Tests that Container::getParameter() works properly for NULL parameters.
    *
    * @covers ::getParameter
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException
    */
   public function testGetParameterIfNotFoundBecauseNull() {
+    $this->setExpectedException(ParameterNotFoundException::class);
     $this->container->getParameter(NULL);
   }
 
@@ -130,11 +133,10 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * Tests that Container::setParameter() in a frozen case works properly.
    *
    * @covers ::setParameter
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
    */
   public function testSetParameterWithFrozenContainer() {
     $this->container = new $this->containerClass($this->containerDefinition);
+    $this->setExpectedException(LogicException::class);
     $this->container->setParameter('some_config', 'new_value');
   }
 
@@ -235,11 +237,11 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
 
   /**
    * Tests that Container::get() for circular dependencies works properly.
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
    * @covers ::get
    * @covers ::createService
    */
   public function testGetForCircularServices() {
+    $this->setExpectedException(ServiceCircularReferenceException::class);
     $this->container->get('circular_dependency');
   }
 
@@ -250,10 +252,9 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * @covers ::createService
    * @covers ::getAlternatives
    * @covers ::getServiceAlternatives
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
    */
   public function testGetForNonExistantService() {
+    $this->setExpectedException(ServiceNotFoundException::class);
     $this->container->get('service_not_exists');
   }
 
@@ -295,8 +296,6 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * @covers ::get
    * @covers ::createService
    * @covers ::resolveServicesAndParameters
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
    */
   public function testGetForParameterDependencyWithExceptionOnSecondCall() {
     $service = $this->container->get('service_parameter_not_exists', ContainerInterface::NULL_ON_INVALID_REFERENCE);
@@ -304,6 +303,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
 
     // Reset the service.
     $this->container->set('service_parameter_not_exists', NULL);
+    $this->setExpectedException(InvalidArgumentException::class);
     $this->container->get('service_parameter_not_exists');
   }
 
@@ -313,10 +313,9 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * @covers ::get
    * @covers ::createService
    * @covers ::resolveServicesAndParameters
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
    */
   public function testGetForNonExistantParameterDependencyWithException() {
+    $this->setExpectedException(InvalidArgumentException::class);
     $this->container->get('service_parameter_not_exists');
   }
 
@@ -339,10 +338,9 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * @covers ::createService
    * @covers ::resolveServicesAndParameters
    * @covers ::getAlternatives
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
    */
   public function testGetForNonExistantServiceDependencyWithException() {
+    $this->setExpectedException(ServiceNotFoundException::class);
     $this->container->get('service_dependency_not_exists');
   }
 
@@ -360,10 +358,9 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * Tests that Container::get() for NULL service works properly.
    * @covers ::get
    * @covers ::createService
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
    */
   public function testGetForNonExistantNULLService() {
+    $this->setExpectedException(ServiceNotFoundException::class);
     $this->container->get(NULL);
   }
 
@@ -386,11 +383,10 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * @covers ::get
    * @covers ::createService
    * @covers ::getAlternatives
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
    */
   public function testGetForNonExistantServiceWithExceptionOnSecondCall() {
     $this->assertNull($this->container->get('service_not_exists', ContainerInterface::NULL_ON_INVALID_REFERENCE), 'Not found service does nto throw exception.');
+    $this->setExpectedException(ServiceNotFoundException::class);
     $this->container->get('service_not_exists');
   }
 
@@ -424,10 +420,9 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    *
    * @covers ::get
    * @covers ::createService
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
    */
   public function testGetForSyntheticServiceWithException() {
+    $this->setExpectedException(RuntimeException::class);
     $this->container->get('synthetic');
   }
 
@@ -451,7 +446,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * @covers ::resolveServicesAndParameters
    */
   public function testGetForInstantiationWithVariousArgumentLengths() {
-    $args = array();
+    $args = [];
     for ($i = 0; $i < 12; $i++) {
       $instantiation_service = $this->container->get('service_test_instantiation_' . $i);
       $this->assertEquals($args, $instantiation_service->getArguments());
@@ -464,10 +459,9 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    *
    * @covers ::get
    * @covers ::createService
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
    */
   public function testGetForWrongFactory() {
+    $this->setExpectedException(RuntimeException::class);
     $this->container->get('wrong_factory');
   }
 
@@ -503,10 +497,9 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    *
    * @covers ::get
    * @covers ::createService
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
    */
   public function testGetForConfiguratorWithException() {
+    $this->setExpectedException(InvalidArgumentException::class);
     $this->container->get('configurable_service_exception');
   }
 
@@ -602,10 +595,9 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * @covers ::get
    * @covers ::createService
    * @covers ::resolveServicesAndParameters
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
    */
   public function testResolveServicesAndParametersForInvalidArgument() {
+    $this->setExpectedException(InvalidArgumentException::class);
     $this->container->get('invalid_argument_service');
   }
 
@@ -615,12 +607,11 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * @covers ::get
    * @covers ::createService
    * @covers ::resolveServicesAndParameters
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
    */
   public function testResolveServicesAndParametersForInvalidArguments() {
     // In case the machine-optimized format is not used, we need to simulate the
     // test failure.
+    $this->setExpectedException(InvalidArgumentException::class);
     if (!$this->machineFormat) {
       throw new InvalidArgumentException('Simulating the test failure.');
     }
@@ -671,16 +662,15 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    * @covers ::hasScope
    * @covers ::isScopeActive
    *
-   * @expectedException \BadMethodCallException
-   *
    * @dataProvider scopeExceptionTestProvider
    */
   public function testScopeFunctionsWithException($method, $argument) {
-    $callable = array(
+    $callable = [
       $this->container,
       $method,
-    );
+    ];
 
+    $this->setExpectedException(\BadMethodCallException::class);
     $callable($argument);
   }
 
@@ -694,13 +684,13 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    */
   public function scopeExceptionTestProvider() {
     $scope = $this->prophesize('\Symfony\Component\DependencyInjection\ScopeInterface')->reveal();
-    return array(
-      array('enterScope', 'test_scope'),
-      array('leaveScope', 'test_scope'),
-      array('hasScope', 'test_scope'),
-      array('isScopeActive', 'test_scope'),
-      array('addScope', $scope),
-    );
+    return [
+      ['enterScope', 'test_scope'],
+      ['leaveScope', 'test_scope'],
+      ['hasScope', 'test_scope'],
+      ['isScopeActive', 'test_scope'],
+      ['addScope', $scope],
+    ];
   }
 
   /**
@@ -728,7 +718,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    */
   protected function getMockContainerDefinition() {
     $fake_service = new \stdClass();
-    $parameters = array();
+    $parameters = [];
     $parameters['some_parameter_class'] = get_class($fake_service);
     $parameters['some_private_config'] = 'really_private_lama';
     $parameters['some_config'] = 'foo';
@@ -737,262 +727,262 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
     // Also test alias resolving.
     $parameters['service_from_parameter'] = $this->getServiceCall('service.provider_alias');
 
-    $services = array();
-    $services['service_container'] = array(
+    $services = [];
+    $services['service_container'] = [
       'class' => '\Drupal\service_container\DependencyInjection\Container',
-    );
-    $services['other.service'] = array(
+    ];
+    $services['other.service'] = [
       'class' => get_class($fake_service),
-    );
+    ];
 
-    $services['non_shared_service'] = array(
+    $services['non_shared_service'] = [
       'class' => get_class($fake_service),
       'shared' => FALSE,
-    );
+    ];
 
-    $services['other.service_class_from_parameter'] = array(
+    $services['other.service_class_from_parameter'] = [
       'class' => $this->getParameterCall('some_parameter_class'),
-    );
-    $services['late.service'] = array(
+    ];
+    $services['late.service'] = [
       'class' => get_class($fake_service),
-    );
-    $services['service.provider'] = array(
+    ];
+    $services['service.provider'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getServiceCall('other.service'),
         $this->getParameterCall('some_config'),
-      )),
-      'properties' => $this->getCollection(array('_someProperty' => 'foo')),
-      'calls' => array(
-        array('setContainer', $this->getCollection(array(
+      ]),
+      'properties' => $this->getCollection(['_someProperty' => 'foo']),
+      'calls' => [
+        ['setContainer', $this->getCollection([
           $this->getServiceCall('service_container'),
-        ))),
-        array('setOtherConfigParameter', $this->getCollection(array(
+        ])],
+        ['setOtherConfigParameter', $this->getCollection([
           $this->getParameterCall('some_other_config'),
-        ))),
-      ),
+        ])],
+      ],
       'priority' => 0,
-    );
+    ];
 
     // Test private services.
-    $private_service = array(
+    $private_service = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getServiceCall('other.service'),
         $this->getParameterCall('some_private_config'),
-      )),
+      ]),
       'public' => FALSE,
-    );
+    ];
 
-    $services['service_using_private'] = array(
+    $services['service_using_private'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getPrivateServiceCall(NULL, $private_service),
         $this->getParameterCall('some_config'),
-      )),
-    );
-    $services['another_service_using_private'] = array(
+      ]),
+    ];
+    $services['another_service_using_private'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getPrivateServiceCall(NULL, $private_service),
         $this->getParameterCall('some_config'),
-      )),
-    );
+      ]),
+    ];
 
     // Test shared private services.
     $id = 'private_service_shared_1';
 
-    $services['service_using_shared_private'] = array(
+    $services['service_using_shared_private'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getPrivateServiceCall($id, $private_service, TRUE),
         $this->getParameterCall('some_config'),
-      )),
-    );
-    $services['another_service_using_shared_private'] = array(
+      ]),
+    ];
+    $services['another_service_using_shared_private'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getPrivateServiceCall($id, $private_service, TRUE),
         $this->getParameterCall('some_config'),
-      )),
-    );
+      ]),
+    ];
 
     // Tests service with invalid argument.
-    $services['invalid_argument_service'] = array(
+    $services['invalid_argument_service'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         1, // Test passing non-strings, too.
-        (object) array(
+        (object) [
           'type' => 'invalid',
-        ),
-      )),
-    );
+        ],
+      ]),
+    ];
 
-    $services['invalid_arguments_service'] = array(
+    $services['invalid_arguments_service'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => (object) array(
+      'arguments' => (object) [
         'type' => 'invalid',
-      ),
-    );
+      ],
+    ];
 
     // Test service that needs deep-traversal.
-    $services['service_using_array'] = array(
+    $services['service_using_array'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
-        $this->getCollection(array(
+      'arguments' => $this->getCollection([
+        $this->getCollection([
           $this->getServiceCall('other.service'),
-        )),
+        ]),
         $this->getParameterCall('some_private_config'),
-      )),
-    );
+      ]),
+    ];
 
-    $services['service_with_optional_dependency'] = array(
+    $services['service_with_optional_dependency'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getServiceCall('service.does_not_exist', ContainerInterface::NULL_ON_INVALID_REFERENCE),
         $this->getParameterCall('some_private_config'),
-      )),
+      ]),
 
-    );
+    ];
 
-    $services['factory_service'] = array(
+    $services['factory_service'] = [
       'class' => '\Drupal\service_container\ServiceContainer\ControllerInterface',
-      'factory' => array(
+      'factory' => [
         $this->getServiceCall('service.provider'),
         'getFactoryMethod',
-      ),
-      'arguments' => $this->getCollection(array(
+      ],
+      'arguments' => $this->getCollection([
         $this->getParameterCall('factory_service_class'),
-      )),
-    );
-    $services['factory_class'] = array(
+      ]),
+    ];
+    $services['factory_class'] = [
       'class' => '\Drupal\service_container\ServiceContainer\ControllerInterface',
       'factory' => '\Drupal\Tests\Component\DependencyInjection\MockService::getFactoryMethod',
-      'arguments' => array(
+      'arguments' => [
         '\Drupal\Tests\Component\DependencyInjection\MockService',
-        array(NULL, 'bar'),
-      ),
-      'calls' => array(
-        array('setContainer', $this->getCollection(array(
+        [NULL, 'bar'],
+      ],
+      'calls' => [
+        ['setContainer', $this->getCollection([
           $this->getServiceCall('service_container'),
-        ))),
-      ),
-    );
+        ])],
+      ],
+    ];
 
-    $services['wrong_factory'] = array(
+    $services['wrong_factory'] = [
       'class' => '\Drupal\service_container\ServiceContainer\ControllerInterface',
-      'factory' => (object) array('I am not a factory, but I pretend to be.'),
-    );
+      'factory' => (object) ['I am not a factory, but I pretend to be.'],
+    ];
 
-    $services['circular_dependency'] = array(
+    $services['circular_dependency'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getServiceCall('circular_dependency'),
-      )),
-    );
-    $services['synthetic'] = array(
+      ]),
+    ];
+    $services['synthetic'] = [
       'synthetic' => TRUE,
-    );
+    ];
     // The file could have been named as a .php file. The reason it is a .data
     // file is that SimpleTest tries to load it. SimpleTest does not like such
     // fixtures and hence we use a neutral name like .data.
-    $services['container_test_file_service_test'] = array(
+    $services['container_test_file_service_test'] = [
       'class' => '\stdClass',
       'file' => __DIR__ . '/Fixture/container_test_file_service_test_service_function.data',
-    );
+    ];
 
     // Test multiple arguments.
-    $args = array();
+    $args = [];
     for ($i = 0; $i < 12; $i++) {
-      $services['service_test_instantiation_' . $i] = array(
+      $services['service_test_instantiation_' . $i] = [
         'class' => '\Drupal\Tests\Component\DependencyInjection\MockInstantiationService',
         // Also test a collection that does not need resolving.
         'arguments' => $this->getCollection($args, FALSE),
-      );
+      ];
       $args[] = 'arg_' . $i;
     }
 
-    $services['service_parameter_not_exists'] = array(
+    $services['service_parameter_not_exists'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getServiceCall('service.provider'),
         $this->getParameterCall('not_exists'),
-      )),
-    );
-    $services['service_dependency_not_exists'] = array(
+      ]),
+    ];
+    $services['service_dependency_not_exists'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getServiceCall('service_not_exists'),
         $this->getParameterCall('some_config'),
-      )),
-    );
+      ]),
+    ];
 
-    $services['service_with_parameter_service'] = array(
+    $services['service_with_parameter_service'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => $this->getCollection(array(
+      'arguments' => $this->getCollection([
         $this->getParameterCall('service_from_parameter'),
         // Also test deep collections that don't need resolving.
-        $this->getCollection(array(
+        $this->getCollection([
           1,
-        ), FALSE),
-      )),
-    );
+        ], FALSE),
+      ]),
+    ];
 
     // To ensure getAlternatives() finds something.
-    $services['service_not_exists_similar'] = array(
+    $services['service_not_exists_similar'] = [
       'synthetic' => TRUE,
-    );
+    ];
 
     // Test configurator.
-    $services['configurator'] = array(
+    $services['configurator'] = [
       'synthetic' => TRUE,
-    );
-    $services['configurable_service'] = array(
+    ];
+    $services['configurable_service'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => array(),
-      'configurator' => array(
+      'arguments' => [],
+      'configurator' => [
         $this->getServiceCall('configurator'),
         'configureService'
-      ),
-    );
-    $services['configurable_service_exception'] = array(
+      ],
+    ];
+    $services['configurable_service_exception'] = [
       'class' => '\Drupal\Tests\Component\DependencyInjection\MockService',
-      'arguments' => array(),
+      'arguments' => [],
       'configurator' => 'configurator_service_test_does_not_exist',
-    );
+    ];
 
-    $aliases = array();
+    $aliases = [];
     $aliases['service.provider_alias'] = 'service.provider';
     $aliases['late.service_alias'] = 'late.service';
 
-    return array(
+    return [
       'aliases' => $aliases,
       'parameters' => $parameters,
       'services' => $services,
       'frozen' => TRUE,
       'machine_format' => $this->machineFormat,
-    );
+    ];
   }
 
   /**
    * Helper function to return a service definition.
    */
   protected function getServiceCall($id, $invalid_behavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE) {
-    return (object) array(
+    return (object) [
       'type' => 'service',
       'id' => $id,
       'invalidBehavior' => $invalid_behavior,
-    );
+    ];
   }
 
   /**
    * Helper function to return a service definition.
    */
   protected function getParameterCall($name) {
-    return (object) array(
+    return (object) [
       'type' => 'parameter',
       'name' => $name,
-    );
+    ];
   }
 
   /**
@@ -1000,26 +990,26 @@ class ContainerTest extends \PHPUnit_Framework_TestCase {
    */
   protected function getPrivateServiceCall($id, $service_definition, $shared = FALSE) {
     if (!$id) {
-      $hash = sha1(serialize($service_definition));
+      $hash = Crypt::hashBase64(serialize($service_definition));
       $id = 'private__' . $hash;
     }
-    return (object) array(
+    return (object) [
       'type' => 'private_service',
       'id' => $id,
       'value' => $service_definition,
       'shared' => $shared,
-    );
+    ];
   }
 
   /**
    * Helper function to return a machine-optimized collection.
    */
   protected function getCollection($collection, $resolve = TRUE) {
-    return (object) array(
+    return (object) [
       'type' => 'collection',
       'value' => $collection,
       'resolve' => $resolve,
-    );
+    ];
   }
 
 }
@@ -1188,7 +1178,7 @@ class MockService {
    * @return object
    *   The instantiated service object.
    */
-  public static function getFactoryMethod($class, $arguments = array()) {
+  public static function getFactoryMethod($class, $arguments = []) {
     $r = new \ReflectionClass($class);
     $service = ($r->getConstructor() === NULL) ? $r->newInstance() : $r->newInstanceArgs($arguments);
 
diff --git a/web/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/web/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
index 49b65565d..9da4c27bc 100644
--- a/web/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
+++ b/web/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
@@ -7,12 +7,15 @@
 
 namespace Drupal\Tests\Component\DependencyInjection\Dumper {
 
+  use Drupal\Component\Utility\Crypt;
   use Symfony\Component\DependencyInjection\Definition;
   use Symfony\Component\DependencyInjection\Reference;
   use Symfony\Component\DependencyInjection\Parameter;
   use Symfony\Component\ExpressionLanguage\Expression;
   use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
   use Symfony\Component\DependencyInjection\ContainerInterface;
+  use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+  use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
   /**
    * @coversDefaultClass \Drupal\Component\DependencyInjection\Dumper\OptimizedPhpArrayDumper
@@ -61,15 +64,15 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
     protected function setUp() {
       // Setup a mock container builder.
       $this->containerBuilder = $this->prophesize('\Symfony\Component\DependencyInjection\ContainerBuilder');
-      $this->containerBuilder->getAliases()->willReturn(array());
+      $this->containerBuilder->getAliases()->willReturn([]);
       $this->containerBuilder->getParameterBag()->willReturn(new ParameterBag());
       $this->containerBuilder->getDefinitions()->willReturn(NULL);
       $this->containerBuilder->isFrozen()->willReturn(TRUE);
 
-      $definition = array();
-      $definition['aliases'] = array();
-      $definition['parameters'] = array();
-      $definition['services'] = array();
+      $definition = [];
+      $definition['aliases'] = [];
+      $definition['parameters'] = [];
+      $definition['services'] = [];
       $definition['frozen'] = TRUE;
       $definition['machine_format'] = $this->machineFormat;
 
@@ -113,17 +116,17 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
      *     - aliases as expected in the container definition.
      */
     public function getAliasesDataProvider() {
-      return array(
-        array(array(), array()),
-        array(
-          array('foo' => 'foo.alias'),
-          array('foo' => 'foo.alias'),
-        ),
-        array(
-          array('foo' => 'foo.alias', 'foo.alias' => 'foo.alias.alias'),
-          array('foo' => 'foo.alias.alias', 'foo.alias' => 'foo.alias.alias'),
-        ),
-      );
+      return [
+        [[], []],
+        [
+          ['foo' => 'foo.alias'],
+          ['foo' => 'foo.alias'],
+        ],
+        [
+          ['foo' => 'foo.alias', 'foo.alias' => 'foo.alias.alias'],
+          ['foo' => 'foo.alias.alias', 'foo.alias' => 'foo.alias.alias'],
+        ],
+      ];
     }
 
     /**
@@ -163,34 +166,34 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
      *     - frozen value
      */
     public function getParametersDataProvider() {
-      return array(
-        array(array(), array(), TRUE),
-        array(
-          array('foo' => 'value_foo'),
-          array('foo' => 'value_foo'),
+      return [
+        [[], [], TRUE],
+        [
+          ['foo' => 'value_foo'],
+          ['foo' => 'value_foo'],
           TRUE,
-        ),
-        array(
-          array('foo' => array('llama' => 'yes')),
-          array('foo' => array('llama' => 'yes')),
+        ],
+        [
+          ['foo' => ['llama' => 'yes']],
+          ['foo' => ['llama' => 'yes']],
           TRUE,
-        ),
-        array(
-          array('foo' => '%llama%', 'llama' => 'yes'),
-          array('foo' => '%%llama%%', 'llama' => 'yes'),
+        ],
+        [
+          ['foo' => '%llama%', 'llama' => 'yes'],
+          ['foo' => '%%llama%%', 'llama' => 'yes'],
           TRUE,
-        ),
-        array(
-          array('foo' => '%llama%', 'llama' => 'yes'),
-          array('foo' => '%llama%', 'llama' => 'yes'),
+        ],
+        [
+          ['foo' => '%llama%', 'llama' => 'yes'],
+          ['foo' => '%llama%', 'llama' => 'yes'],
           FALSE,
-        ),
-        array(
-          array('reference' => new Reference('referenced_service')),
-          array('reference' => $this->getServiceCall('referenced_service')),
+        ],
+        [
+          ['reference' => new Reference('referenced_service')],
+          ['reference' => $this->getServiceCall('referenced_service')],
           TRUE,
-        ),
-      );
+        ],
+      ];
     }
 
     /**
@@ -235,164 +238,164 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
      *     - frozen value
      */
     public function getDefinitionsDataProvider() {
-      $base_service_definition = array(
+      $base_service_definition = [
         'class' => '\stdClass',
         'public' => TRUE,
         'file' => FALSE,
         'synthetic' => FALSE,
         'lazy' => FALSE,
-        'arguments' => array(),
+        'arguments' => [],
         'arguments_count' => 0,
-        'properties' => array(),
-        'calls' => array(),
+        'properties' => [],
+        'calls' => [],
         'scope' => ContainerInterface::SCOPE_CONTAINER,
         'shared' => TRUE,
         'factory' => FALSE,
         'configurator' => FALSE,
-      );
+      ];
 
       // Test basic flags.
-      $service_definitions[] = array() + $base_service_definition;
+      $service_definitions[] = [] + $base_service_definition;
 
-      $service_definitions[] = array(
+      $service_definitions[] = [
         'public' => FALSE,
-      ) + $base_service_definition;
+      ] + $base_service_definition;
 
-      $service_definitions[] = array(
+      $service_definitions[] = [
         'file' => 'test_include.php',
-      ) + $base_service_definition;
+      ] + $base_service_definition;
 
-      $service_definitions[] = array(
+      $service_definitions[] = [
         'synthetic' => TRUE,
-      ) + $base_service_definition;
+      ] + $base_service_definition;
 
-      $service_definitions[] = array(
+      $service_definitions[] = [
         'shared' => FALSE,
-      ) + $base_service_definition;
+      ] + $base_service_definition;
 
-      $service_definitions[] = array(
+      $service_definitions[] = [
         'lazy' => TRUE,
-      ) + $base_service_definition;
+      ] + $base_service_definition;
 
       // Test a basic public Reference.
-      $service_definitions[] = array(
-        'arguments' => array('foo', new Reference('bar')),
+      $service_definitions[] = [
+        'arguments' => ['foo', new Reference('bar')],
         'arguments_count' => 2,
-        'arguments_expected' => $this->getCollection(array('foo', $this->getServiceCall('bar'))),
-      ) + $base_service_definition;
+        'arguments_expected' => $this->getCollection(['foo', $this->getServiceCall('bar')]),
+      ] + $base_service_definition;
 
       // Test a public reference that should not throw an Exception.
       $reference = new Reference('bar', ContainerInterface::NULL_ON_INVALID_REFERENCE);
-      $service_definitions[] = array(
-        'arguments' => array($reference),
+      $service_definitions[] = [
+        'arguments' => [$reference],
         'arguments_count' => 1,
-        'arguments_expected' => $this->getCollection(array($this->getServiceCall('bar', ContainerInterface::NULL_ON_INVALID_REFERENCE))),
-      ) + $base_service_definition;
+        'arguments_expected' => $this->getCollection([$this->getServiceCall('bar', ContainerInterface::NULL_ON_INVALID_REFERENCE)]),
+      ] + $base_service_definition;
 
       // Test a private shared service, denoted by having a Reference.
-      $private_definition = array(
+      $private_definition = [
         'class' => '\stdClass',
         'public' => FALSE,
         'arguments_count' => 0,
-      );
+      ];
 
-      $service_definitions[] = array(
-        'arguments' => array('foo', new Reference('private_definition')),
+      $service_definitions[] = [
+        'arguments' => ['foo', new Reference('private_definition')],
         'arguments_count' => 2,
-        'arguments_expected' => $this->getCollection(array(
+        'arguments_expected' => $this->getCollection([
           'foo',
           $this->getPrivateServiceCall('private_definition', $private_definition, TRUE),
-        )),
-      ) + $base_service_definition;
+        ]),
+      ] + $base_service_definition;
 
       // Test a private non-shared service, denoted by having a Definition.
       $private_definition_object = new Definition('\stdClass');
       $private_definition_object->setPublic(FALSE);
 
-      $service_definitions[] = array(
-        'arguments' => array('foo', $private_definition_object),
+      $service_definitions[] = [
+        'arguments' => ['foo', $private_definition_object],
         'arguments_count' => 2,
-        'arguments_expected' => $this->getCollection(array(
+        'arguments_expected' => $this->getCollection([
           'foo',
           $this->getPrivateServiceCall(NULL, $private_definition),
-        )),
-      ) + $base_service_definition;
+        ]),
+      ] + $base_service_definition;
 
       // Test a deep collection without a reference.
-      $service_definitions[] = array(
-        'arguments' => array(array(array('foo'))),
+      $service_definitions[] = [
+        'arguments' => [[['foo']]],
         'arguments_count' => 1,
-      ) + $base_service_definition;
+      ] + $base_service_definition;
 
       // Test a deep collection with a reference to resolve.
-      $service_definitions[] = array(
-        'arguments' => array(array(new Reference('bar'))),
+      $service_definitions[] = [
+        'arguments' => [[new Reference('bar')]],
         'arguments_count' => 1,
-        'arguments_expected' => $this->getCollection(array($this->getCollection(array($this->getServiceCall('bar'))))),
-      ) + $base_service_definition;
+        'arguments_expected' => $this->getCollection([$this->getCollection([$this->getServiceCall('bar')])]),
+      ] + $base_service_definition;
 
       // Test a collection with a variable to resolve.
-      $service_definitions[] = array(
-        'arguments' => array(new Parameter('llama_parameter')),
+      $service_definitions[] = [
+        'arguments' => [new Parameter('llama_parameter')],
         'arguments_count' => 1,
-        'arguments_expected' => $this->getCollection(array($this->getParameterCall('llama_parameter'))),
-      ) + $base_service_definition;
+        'arguments_expected' => $this->getCollection([$this->getParameterCall('llama_parameter')]),
+      ] + $base_service_definition;
 
       // Test objects that have _serviceId property.
       $drupal_service = new \stdClass();
       $drupal_service->_serviceId = 'bar';
 
-      $service_definitions[] = array(
-        'arguments' => array($drupal_service),
+      $service_definitions[] = [
+        'arguments' => [$drupal_service],
         'arguments_count' => 1,
-        'arguments_expected' => $this->getCollection(array($this->getServiceCall('bar'))),
-      ) + $base_service_definition;
+        'arguments_expected' => $this->getCollection([$this->getServiceCall('bar')]),
+      ] + $base_service_definition;
 
       // Test getMethodCalls.
-      $calls = array(
-        array('method', $this->getCollection(array())),
-        array('method2', $this->getCollection(array())),
-      );
-      $service_definitions[] = array(
+      $calls = [
+        ['method', $this->getCollection([])],
+        ['method2', $this->getCollection([])],
+      ];
+      $service_definitions[] = [
         'calls' => $calls,
-      ) + $base_service_definition;
+      ] + $base_service_definition;
 
-      $service_definitions[] = array(
+      $service_definitions[] = [
         'scope' => ContainerInterface::SCOPE_PROTOTYPE,
         'shared' => FALSE,
-      ) + $base_service_definition;
+      ] + $base_service_definition;
 
-      $service_definitions[] = array(
+      $service_definitions[] = [
           'shared' => FALSE,
-        ) + $base_service_definition;
+        ] + $base_service_definition;
 
       // Test factory.
-      $service_definitions[] = array(
-        'factory' => array(new Reference('bar'), 'factoryMethod'),
-        'factory_expected' => array($this->getServiceCall('bar'), 'factoryMethod'),
-      ) + $base_service_definition;
+      $service_definitions[] = [
+        'factory' => [new Reference('bar'), 'factoryMethod'],
+        'factory_expected' => [$this->getServiceCall('bar'), 'factoryMethod'],
+      ] + $base_service_definition;
 
       // Test invalid factory - needed to test deep dumpValue().
-      $service_definitions[] = array(
-        'factory' => array(array('foo', 'llama'), 'factoryMethod'),
-      ) + $base_service_definition;
+      $service_definitions[] = [
+        'factory' => [['foo', 'llama'], 'factoryMethod'],
+      ] + $base_service_definition;
 
       // Test properties.
-      $service_definitions[] = array(
-        'properties' => array('_value' => 'llama'),
-      ) + $base_service_definition;
+      $service_definitions[] = [
+        'properties' => ['_value' => 'llama'],
+      ] + $base_service_definition;
 
       // Test configurator.
-      $service_definitions[] = array(
-        'configurator' => array(new Reference('bar'), 'configureService'),
-        'configurator_expected' => array($this->getServiceCall('bar'), 'configureService'),
-      ) + $base_service_definition;
+      $service_definitions[] = [
+        'configurator' => [new Reference('bar'), 'configureService'],
+        'configurator_expected' => [$this->getServiceCall('bar'), 'configureService'],
+      ] + $base_service_definition;
 
-      $services_provided = array();
-      $services_provided[] = array(
-        array(),
-        array(),
-      );
+      $services_provided = [];
+      $services_provided[] = [
+        [],
+        [],
+      ];
 
       foreach ($service_definitions as $service_definition) {
         $definition = $this->prophesize('\Symfony\Component\DependencyInjection\Definition');
@@ -411,7 +414,7 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
         $definition->getConfigurator()->willReturn($service_definition['configurator']);
 
         // Preserve order.
-        $filtered_service_definition = array();
+        $filtered_service_definition = [];
         foreach ($base_service_definition as $key => $value) {
           $filtered_service_definition[$key] = $service_definition[$key];
           unset($service_definition[$key]);
@@ -429,7 +432,7 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
         $filtered_service_definition += $service_definition;
 
         // Allow to set _expected values.
-        foreach (array('arguments', 'factory', 'configurator') as $key) {
+        foreach (['arguments', 'factory', 'configurator'] as $key) {
           $expected = $key . '_expected';
           if (isset($filtered_service_definition[$expected])) {
             $filtered_service_definition[$key] = $filtered_service_definition[$expected];
@@ -441,17 +444,17 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
         unset($filtered_service_definition['scope']);
 
         if (isset($filtered_service_definition['public']) && $filtered_service_definition['public'] === FALSE) {
-          $services_provided[] = array(
-            array('foo_service' => $definition->reveal()),
-            array(),
-          );
+          $services_provided[] = [
+            ['foo_service' => $definition->reveal()],
+            [],
+          ];
           continue;
         }
 
-        $services_provided[] = array(
-          array('foo_service' => $definition->reveal()),
-          array('foo_service' => $this->serializeDefinition($filtered_service_definition)),
-        );
+        $services_provided[] = [
+          ['foo_service' => $definition->reveal()],
+          ['foo_service' => $this->serializeDefinition($filtered_service_definition)],
+        ];
       }
 
       return $services_provided;
@@ -470,19 +473,17 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
      * Helper function to return a service definition.
      */
     protected function getServiceCall($id, $invalid_behavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE) {
-      return (object) array(
+      return (object) [
         'type' => 'service',
         'id' => $id,
         'invalidBehavior' => $invalid_behavior,
-      );
+      ];
     }
 
     /**
      * Tests that the correct InvalidArgumentException is thrown for getScope().
      *
      * @covers ::getServiceDefinition
-     *
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
      */
     public function testGetServiceDefinitionWithInvalidScope() {
       $bar_definition = new Definition('\stdClass');
@@ -490,6 +491,7 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
       $services['bar'] = $bar_definition;
 
       $this->containerBuilder->getDefinitions()->willReturn($services);
+      $this->setExpectedException(InvalidArgumentException::class);
       $this->dumper->getArray();
     }
 
@@ -502,9 +504,9 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
      */
     public function testGetServiceDefinitionWithReferenceToAlias($public) {
       $bar_definition = new Definition('\stdClass');
-      $bar_definition_php_array = array(
+      $bar_definition_php_array = [
         'class' => '\stdClass',
-      );
+      ];
       if (!$public) {
         $bar_definition->setPublic(FALSE);
         $bar_definition_php_array['public'] = FALSE;
@@ -530,21 +532,21 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
       else {
         $service_definition = $this->getPrivateServiceCall('bar', $bar_definition_php_array, TRUE);
       }
-      $data = array(
+      $data = [
          'class' => '\stdClass',
-         'arguments' => $this->getCollection(array(
+         'arguments' => $this->getCollection([
            $service_definition,
-         )),
+         ]),
          'arguments_count' => 1,
-      );
+      ];
       $this->assertEquals($this->serializeDefinition($data), $dump['services']['foo'], 'Expected definition matches dump.');
     }
 
     public function publicPrivateDataProvider() {
-      return array(
-        array(TRUE),
-        array(FALSE),
-      );
+      return [
+        [TRUE],
+        [FALSE],
+      ];
     }
 
     /**
@@ -554,8 +556,6 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
      * getDecoratedService().
      *
      * @covers ::getServiceDefinition
-     *
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
      */
     public function testGetServiceDefinitionForDecoratedService() {
       $bar_definition = new Definition('\stdClass');
@@ -563,6 +563,7 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
       $services['bar'] = $bar_definition;
 
       $this->containerBuilder->getDefinitions()->willReturn($services);
+      $this->setExpectedException(InvalidArgumentException::class);
       $this->dumper->getArray();
     }
 
@@ -570,8 +571,6 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
      * Tests that the correct RuntimeException is thrown for expressions.
      *
      * @covers ::dumpValue
-     *
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
      */
     public function testGetServiceDefinitionForExpression() {
       $expression = new Expression();
@@ -581,6 +580,7 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
       $services['bar'] = $bar_definition;
 
       $this->containerBuilder->getDefinitions()->willReturn($services);
+      $this->setExpectedException(RuntimeException::class);
       $this->dumper->getArray();
     }
 
@@ -588,8 +588,6 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
      * Tests that the correct RuntimeException is thrown for dumping an object.
      *
      * @covers ::dumpValue
-     *
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
      */
     public function testGetServiceDefinitionForObject() {
       $service = new \stdClass();
@@ -599,6 +597,7 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
       $services['bar'] = $bar_definition;
 
       $this->containerBuilder->getDefinitions()->willReturn($services);
+      $this->setExpectedException(RuntimeException::class);
       $this->dumper->getArray();
     }
 
@@ -606,8 +605,6 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
      * Tests that the correct RuntimeException is thrown for dumping a resource.
      *
      * @covers ::dumpValue
-     *
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
      */
     public function testGetServiceDefinitionForResource() {
       $resource = fopen('php://memory', 'r');
@@ -617,6 +614,7 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
       $services['bar'] = $bar_definition;
 
       $this->containerBuilder->getDefinitions()->willReturn($services);
+      $this->setExpectedException(RuntimeException::class);
       $this->dumper->getArray();
     }
 
@@ -625,36 +623,36 @@ namespace Drupal\Tests\Component\DependencyInjection\Dumper {
      */
     protected function getPrivateServiceCall($id, $service_definition, $shared = FALSE) {
       if (!$id) {
-        $hash = sha1(serialize($service_definition));
+        $hash = Crypt::hashBase64(serialize($service_definition));
         $id = 'private__' . $hash;
       }
-      return (object) array(
+      return (object) [
         'type' => 'private_service',
         'id' => $id,
         'value' => $service_definition,
         'shared' => $shared,
-      );
+      ];
     }
 
     /**
      * Helper function to return a machine-optimized collection.
      */
     protected function getCollection($collection, $resolve = TRUE) {
-      return (object) array(
+      return (object) [
         'type' => 'collection',
         'value' => $collection,
         'resolve' => $resolve,
-      );
+      ];
     }
 
     /**
      * Helper function to return a parameter definition.
      */
     protected function getParameterCall($name) {
-      return (object) array(
+      return (object) [
         'type' => 'parameter',
         'name' => $name,
-      );
+      ];
     }
 
   }
diff --git a/web/core/tests/Drupal/Tests/Component/Discovery/YamlDiscoveryTest.php b/web/core/tests/Drupal/Tests/Component/Discovery/YamlDiscoveryTest.php
index 68b16eeb4..897a78898 100644
--- a/web/core/tests/Drupal/Tests/Component/Discovery/YamlDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Discovery/YamlDiscoveryTest.php
@@ -34,12 +34,12 @@ class YamlDiscoveryTest extends UnitTestCase {
     file_put_contents($url . '/test_2/test_4.test.yml', '');
 
     // Set up the directories to search.
-    $directories = array(
+    $directories = [
       'test_1' => $url . '/test_1',
       'test_2' => $url . '/test_1',
       'test_3' => $url . '/test_2',
       'test_4' => $url . '/test_2',
-    );
+    ];
 
     $discovery = new YamlDiscovery('test', $directories);
     $data = $discovery->findAll();
@@ -50,12 +50,12 @@ class YamlDiscoveryTest extends UnitTestCase {
     $this->assertArrayHasKey('test_3', $data);
     $this->assertArrayHasKey('test_4', $data);
 
-    foreach (array('test_1', 'test_2', 'test_3') as $key) {
+    foreach (['test_1', 'test_2', 'test_3'] as $key) {
       $this->assertArrayHasKey('name', $data[$key]);
       $this->assertEquals($data[$key]['name'], 'test');
     }
 
-    $this->assertSame(array(), $data['test_4']);
+    $this->assertSame([], $data['test_4']);
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/DrupalComponentTest.php b/web/core/tests/Drupal/Tests/Component/DrupalComponentTest.php
index 11ce86f08..7e746d737 100644
--- a/web/core/tests/Drupal/Tests/Component/DrupalComponentTest.php
+++ b/web/core/tests/Drupal/Tests/Component/DrupalComponentTest.php
@@ -42,7 +42,7 @@ class DrupalComponentTest extends UnitTestCase {
    *   An array of class paths.
    */
   protected function findPhpClasses($dir) {
-    $classes = array();
+    $classes = [];
     foreach (new \DirectoryIterator($dir) as $file) {
       if ($file->isDir() && !$file->isDot()) {
         $classes = array_merge($classes, $this->findPhpClasses($file->getPathname()));
@@ -80,26 +80,26 @@ class DrupalComponentTest extends UnitTestCase {
    *   - File data as a string. This will be used as a virtual file.
    */
   public function providerAssertNoCoreUseage() {
-    return array(
-      array(
+    return [
+      [
         TRUE,
         '@see \\Drupal\\Core\\Something',
-      ),
-      array(
+      ],
+      [
         FALSE,
         '\\Drupal\\Core\\Something',
-      ),
-      array(
+      ],
+      [
         FALSE,
         "@see \\Drupal\\Core\\Something\n" .
         '\\Drupal\\Core\\Something',
-      ),
-      array(
+      ],
+      [
         FALSE,
         "\\Drupal\\Core\\Something\n" .
         '@see \\Drupal\\Core\\Something',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php b/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
index b4d8de9cc..1ed036ee8 100644
--- a/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
+++ b/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
@@ -55,12 +55,10 @@ class FileCacheFactoryTest extends UnitTestCase {
 
   /**
    * @covers ::get
-   *
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage Required prefix configuration is missing
    */
   public function testGetNoPrefix() {
     FileCacheFactory::setPrefix(NULL);
+    $this->setExpectedException(\InvalidArgumentException::class, 'Required prefix configuration is missing');
     FileCacheFactory::get('test_foo_settings', []);
   }
 
@@ -101,8 +99,8 @@ class FileCacheFactoryTest extends UnitTestCase {
 
     // Get a unique FileCache class.
     $file_cache = $this->getMockBuilder(FileCache::class)
-       ->disableOriginalConstructor()
-       ->getMock();
+      ->disableOriginalConstructor()
+      ->getMock();
     $class = get_class($file_cache);
 
     // Test fallback configuration.
diff --git a/web/core/tests/Drupal/Tests/Component/Gettext/PoHeaderTest.php b/web/core/tests/Drupal/Tests/Component/Gettext/PoHeaderTest.php
index eab85b385..113f6cdea 100644
--- a/web/core/tests/Drupal/Tests/Component/Gettext/PoHeaderTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Gettext/PoHeaderTest.php
@@ -48,22 +48,22 @@ class PoHeaderTest extends UnitTestCase {
    *   value.
    */
   public function providerTestPluralsFormula() {
-    return array(
-      array(
+    return [
+      [
         'nplurals=1; plural=0;',
-        array('default' => 0),
-      ),
-      array(
+        ['default' => 0],
+      ],
+      [
         'nplurals=2; plural=(n > 1);',
-        array(0 => 0, 1 => 0, 'default' => 1),
-      ),
-      array(
+        [0 => 0, 1 => 0, 'default' => 1],
+      ],
+      [
         'nplurals=2; plural=(n!=1);',
-        array(1 => 0, 'default' => 1),
-      ),
-      array(
+        [1 => 0, 'default' => 1],
+      ],
+      [
         'nplurals=2; plural=(((n==1)||((n%10)==1))?(0):1);',
-        array(
+        [
           1 => 0,
           11 => 0,
           21 => 0,
@@ -85,11 +85,11 @@ class PoHeaderTest extends UnitTestCase {
           181 => 0,
           191 => 0,
           'default' => 1,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'nplurals=3; plural=((((n%10)==1)&&((n%100)!=11))?(0):(((((n%10)>=2)&&((n%10)<=4))&&(((n%100)<10)||((n%100)>=20)))?(1):2));',
-        array(
+        [
           1 => 0,
           2 => 1,
           3 => 1,
@@ -163,21 +163,21 @@ class PoHeaderTest extends UnitTestCase {
           193 => 1,
           194 => 1,
           'default' => 2,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'nplurals=3; plural=((n==1)?(0):(((n>=2)&&(n<=4))?(1):2));',
-        array(
+        [
           1 => 0,
           2 => 1,
           3 => 1,
           4 => 1,
           'default' => 2,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'nplurals=3; plural=((n==1)?(0):(((n==0)||(((n%100)>0)&&((n%100)<20)))?(1):2));',
-        array(
+        [
           0 => 1,
           1 => 0,
           2 => 1,
@@ -218,11 +218,11 @@ class PoHeaderTest extends UnitTestCase {
           118 => 1,
           119 => 1,
           'default' => 2,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'nplurals=3; plural=((n==1)?(0):(((((n%10)>=2)&&((n%10)<=4))&&(((n%100)<10)||((n%100)>=20)))?(1):2));',
-        array(
+        [
           1 => 0,
           2 => 1,
           3 => 1,
@@ -279,10 +279,10 @@ class PoHeaderTest extends UnitTestCase {
           193 => 1,
           194 => 1,
           'default' => 2,
-        ),),
-      array(
+        ], ],
+      [
         'nplurals=4; plural=(((n==1)||(n==11))?(0):(((n==2)||(n==12))?(1):(((n>2)&&(n<20))?(2):3)));',
-        array(
+        [
           1 => 0,
           2 => 1,
           3 => 2,
@@ -303,11 +303,11 @@ class PoHeaderTest extends UnitTestCase {
           18 => 2,
           19 => 2,
           'default' => 3,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'nplurals=4; plural=(((n%100)==1)?(0):(((n%100)==2)?(1):((((n%100)==3)||((n%100)==4))?(2):3)));',
-        array(
+        [
           1 => 0,
           2 => 1,
           3 => 2,
@@ -317,11 +317,11 @@ class PoHeaderTest extends UnitTestCase {
           103 => 2,
           104 => 2,
           'default' => 3,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'nplurals=5; plural=((n==1)?(0):((n==2)?(1):((n<7)?(2):((n<11)?(3):4))));',
-        array(
+        [
           0 => 2,
           1 => 0,
           2 => 1,
@@ -334,11 +334,11 @@ class PoHeaderTest extends UnitTestCase {
           9 => 3,
           10 => 3,
           'default' => 4,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'nplurals=6; plural=((n==1)?(0):((n==0)?(1):((n==2)?(2):((((n%100)>=3)&&((n%100)<=10))?(3):((((n%100)>=11)&&((n%100)<=99))?(4):5)))));',
-        array(
+        [
           0 => 1,
           1 => 0,
           2 => 2,
@@ -362,9 +362,9 @@ class PoHeaderTest extends UnitTestCase {
           109 => 3,
           110 => 3,
           'default' => 4,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Graph/GraphTest.php b/web/core/tests/Drupal/Tests/Component/Graph/GraphTest.php
index e17c7ff03..9c4a7a528 100644
--- a/web/core/tests/Drupal/Tests/Component/Graph/GraphTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Graph/GraphTest.php
@@ -21,59 +21,59 @@ class GraphTest extends UnitTestCase {
     //       |     |     |
     //       |     |     |
     //       +---> 4 <-- 7      8 ---> 9
-    $graph = $this->normalizeGraph(array(
-      1 => array(2),
-      2 => array(3, 4),
-      3 => array(),
-      4 => array(3),
-      5 => array(6),
-      7 => array(4, 5),
-      8 => array(9),
-      9 => array(),
-    ));
+    $graph = $this->normalizeGraph([
+      1 => [2],
+      2 => [3, 4],
+      3 => [],
+      4 => [3],
+      5 => [6],
+      7 => [4, 5],
+      8 => [9],
+      9 => [],
+    ]);
     $graph_object = new Graph($graph);
     $graph = $graph_object->searchAndSort();
 
-    $expected_paths = array(
-      1 => array(2, 3, 4),
-      2 => array(3, 4),
-      3 => array(),
-      4 => array(3),
-      5 => array(6),
-      7 => array(4, 3, 5, 6),
-      8 => array(9),
-      9 => array(),
-    );
+    $expected_paths = [
+      1 => [2, 3, 4],
+      2 => [3, 4],
+      3 => [],
+      4 => [3],
+      5 => [6],
+      7 => [4, 3, 5, 6],
+      8 => [9],
+      9 => [],
+    ];
     $this->assertPaths($graph, $expected_paths);
 
-    $expected_reverse_paths = array(
-      1 => array(),
-      2 => array(1),
-      3 => array(2, 1, 4, 7),
-      4 => array(2, 1, 7),
-      5 => array(7),
-      7 => array(),
-      8 => array(),
-      9 => array(8),
-    );
+    $expected_reverse_paths = [
+      1 => [],
+      2 => [1],
+      3 => [2, 1, 4, 7],
+      4 => [2, 1, 7],
+      5 => [7],
+      7 => [],
+      8 => [],
+      9 => [8],
+    ];
     $this->assertReversePaths($graph, $expected_reverse_paths);
 
     // Assert that DFS didn't created "missing" vertexes automatically.
     $this->assertFalse(isset($graph[6]), 'Vertex 6 has not been created');
 
-    $expected_components = array(
-      array(1, 2, 3, 4, 5, 7),
-      array(8, 9),
-    );
+    $expected_components = [
+      [1, 2, 3, 4, 5, 7],
+      [8, 9],
+    ];
     $this->assertComponents($graph, $expected_components);
 
-    $expected_weights = array(
-      array(1, 2, 3),
-      array(2, 4, 3),
-      array(7, 4, 3),
-      array(7, 5),
-      array(8, 9),
-    );
+    $expected_weights = [
+      [1, 2, 3],
+      [2, 4, 3],
+      [7, 4, 3],
+      [7, 5],
+      [8, 9],
+    ];
     $this->assertWeights($graph, $expected_weights);
   }
 
@@ -87,10 +87,10 @@ class GraphTest extends UnitTestCase {
    *   The normalized version of a graph.
    */
   protected function normalizeGraph($graph) {
-    $normalized_graph = array();
+    $normalized_graph = [];
     foreach ($graph as $vertex => $edges) {
       // Create vertex even if it hasn't any edges.
-      $normalized_graph[$vertex] = array();
+      $normalized_graph[$vertex] = [];
       foreach ($edges as $edge) {
         $normalized_graph[$vertex]['edges'][$edge] = TRUE;
       }
@@ -110,7 +110,7 @@ class GraphTest extends UnitTestCase {
     foreach ($expected_paths as $vertex => $paths) {
       // Build an array with keys = $paths and values = TRUE.
       $expected = array_fill_keys($paths, TRUE);
-      $result = isset($graph[$vertex]['paths']) ? $graph[$vertex]['paths'] : array();
+      $result = isset($graph[$vertex]['paths']) ? $graph[$vertex]['paths'] : [];
       $this->assertEquals($expected, $result, sprintf('Expected paths for vertex %s: %s, got %s', $vertex, $this->displayArray($expected, TRUE), $this->displayArray($result, TRUE)));
     }
   }
@@ -128,7 +128,7 @@ class GraphTest extends UnitTestCase {
     foreach ($expected_reverse_paths as $vertex => $paths) {
       // Build an array with keys = $paths and values = TRUE.
       $expected = array_fill_keys($paths, TRUE);
-      $result = isset($graph[$vertex]['reverse_paths']) ? $graph[$vertex]['reverse_paths'] : array();
+      $result = isset($graph[$vertex]['reverse_paths']) ? $graph[$vertex]['reverse_paths'] : [];
       $this->assertEquals($expected, $result, sprintf('Expected reverse paths for vertex %s: %s, got %s', $vertex, $this->displayArray($expected, TRUE), $this->displayArray($result, TRUE)));
     }
   }
@@ -144,14 +144,14 @@ class GraphTest extends UnitTestCase {
   protected function assertComponents($graph, $expected_components) {
     $unassigned_vertices = array_fill_keys(array_keys($graph), TRUE);
     foreach ($expected_components as $component) {
-      $result_components = array();
+      $result_components = [];
       foreach ($component as $vertex) {
         $result_components[] = $graph[$vertex]['component'];
         unset($unassigned_vertices[$vertex]);
       }
       $this->assertEquals(1, count(array_unique($result_components)), sprintf('Expected one unique component for vertices %s, got %s', $this->displayArray($component), $this->displayArray($result_components)));
     }
-    $this->assertEquals(array(), $unassigned_vertices, sprintf('Vertices not assigned to a component: %s', $this->displayArray($unassigned_vertices, TRUE)));
+    $this->assertEquals([], $unassigned_vertices, sprintf('Vertices not assigned to a component: %s', $this->displayArray($unassigned_vertices, TRUE)));
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php b/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php
index eca12416d..8b8c95acd 100644
--- a/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php
+++ b/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php
@@ -33,15 +33,15 @@ class FileStorageReadOnlyTest extends PhpStorageTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->standardSettings = array(
+    $this->standardSettings = [
       'directory' => $this->directory,
       'bin' => 'test',
-    );
-    $this->readonlyStorage = array(
+    ];
+    $this->readonlyStorage = [
       'directory' => $this->directory,
       // Let this read from the bin where the other instance is writing.
       'bin' => 'test',
-    );
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php b/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php
index 25a0ed00a..a1a11ec38 100644
--- a/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php
@@ -24,10 +24,10 @@ class FileStorageTest extends PhpStorageTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->standardSettings = array(
+    $this->standardSettings = [
       'directory' => $this->directory,
       'bin' => 'test',
-    );
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php b/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php
index 726cd1c76..577241d47 100644
--- a/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFastFileStorageTest.php
@@ -19,7 +19,7 @@ class MTimeProtectedFastFileStorageTest extends MTimeProtectedFileStorageBase {
    * include the hacked file on the first try but the second test will change
    * the directory mtime and so on the second try the file will not be included.
    */
-  protected $expected = array(TRUE, FALSE);
+  protected $expected = [TRUE, FALSE];
 
   /**
    * The PHP storage class to test.
diff --git a/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php b/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
index 64d17eb25..c36453c32 100644
--- a/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
+++ b/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\Component\PhpStorage;
 
+use Drupal\Component\Utility\Crypt;
+
 /**
  * Base test class for MTime protected storage.
  */
@@ -36,11 +38,11 @@ abstract class MTimeProtectedFileStorageBase extends PhpStorageTestBase {
 
     $this->secret = $this->randomMachineName();
 
-    $this->settings = array(
+    $this->settings = [
       'directory' => $this->directory,
       'bin' => 'test',
       'secret' => $this->secret,
-    );
+    ];
   }
 
   /**
@@ -77,7 +79,7 @@ abstract class MTimeProtectedFileStorageBase extends PhpStorageTestBase {
       $expected_directory = $expected_root_directory . '/' . $name;
     }
     $directory_mtime = filemtime($expected_directory);
-    $expected_filename = $expected_directory . '/' . hash_hmac('sha256', $name, $this->secret . $directory_mtime) . '.php';
+    $expected_filename = $expected_directory . '/' . Crypt::hmacBase64($name, $this->secret . $directory_mtime) . '.php';
 
     // Ensure the file exists and that it and the containing directory have
     // minimal permissions. fileperms() can return high bits unrelated to
@@ -88,7 +90,7 @@ abstract class MTimeProtectedFileStorageBase extends PhpStorageTestBase {
 
     // Ensure the root directory for the bin has a .htaccess file denying web
     // access.
-    $this->assertSame(file_get_contents($expected_root_directory . '/.htaccess'), call_user_func(array($this->storageClass, 'htaccessLines')));
+    $this->assertSame(file_get_contents($expected_root_directory . '/.htaccess'), call_user_func([$this->storageClass, 'htaccessLines']));
 
     // Ensure that if the file is replaced with an untrusted one (due to another
     // script's file upload vulnerability), it does not get loaded. Since mtime
diff --git a/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php b/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php
index 15b75e723..bc88c3345 100644
--- a/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageTest.php
@@ -18,7 +18,7 @@ class MTimeProtectedFileStorageTest extends MTimeProtectedFileStorageBase {
    * The default implementation protects against even the filemtime change so
    * both iterations will return FALSE.
    */
-  protected $expected = array(FALSE, FALSE);
+  protected $expected = [FALSE, FALSE];
 
   /**
    * The PHP storage class to test.
diff --git a/web/core/tests/Drupal/Tests/Component/Plugin/Context/ContextTest.php b/web/core/tests/Drupal/Tests/Component/Plugin/Context/ContextTest.php
index 917379e4d..f320c5544 100644
--- a/web/core/tests/Drupal/Tests/Component/Plugin/Context/ContextTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Plugin/Context/ContextTest.php
@@ -30,7 +30,7 @@ class ContextTest extends UnitTestCase {
     // Mock a Context object.
     $mock_context = $this->getMockBuilder('Drupal\Component\Plugin\Context\Context')
       ->disableOriginalConstructor()
-      ->setMethods(array('getContextDefinition'))
+      ->setMethods(['getContextDefinition'])
       ->getMock();
 
     // If the context value exists, getContextValue() behaves like a normal
@@ -49,7 +49,7 @@ class ContextTest extends UnitTestCase {
     else {
       // Create a mock definition.
       $mock_definition = $this->getMockBuilder('Drupal\Component\Plugin\Context\ContextDefinitionInterface')
-        ->setMethods(array('isRequired', 'getDataType'))
+        ->setMethods(['isRequired', 'getDataType'])
         ->getMockForAbstractClass();
 
       // Set expectation for isRequired().
@@ -87,7 +87,7 @@ class ContextTest extends UnitTestCase {
    */
   public function testDefaultValue() {
     $mock_definition = $this->getMockBuilder('Drupal\Component\Plugin\Context\ContextDefinitionInterface')
-      ->setMethods(array('getDefaultValue'))
+      ->setMethods(['getDefaultValue'])
       ->getMockForAbstractClass();
 
     $mock_definition->expects($this->once())
diff --git a/web/core/tests/Drupal/Tests/Component/Plugin/DefaultFactoryTest.php b/web/core/tests/Drupal/Tests/Component/Plugin/DefaultFactoryTest.php
index 1fc805bfe..28a48f6c1 100644
--- a/web/core/tests/Drupal/Tests/Component/Plugin/DefaultFactoryTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Plugin/DefaultFactoryTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\Component\Plugin;
 
 use Drupal\Component\Plugin\Definition\PluginDefinitionInterface;
+use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
 use Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry;
 use Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface;
@@ -47,11 +48,9 @@ class DefaultFactoryTest extends UnitTestCase {
    * Tests getPluginClass() with a missing class definition.
    *
    * @covers ::getPluginClass
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginException
-   * @expectedExceptionMessage The plugin (cherry) did not specify an instance class.
    */
   public function testGetPluginClassWithMissingClassWithArrayPluginDefinition() {
+    $this->setExpectedException(PluginException::class, 'The plugin (cherry) did not specify an instance class.');
     DefaultFactory::getPluginClass('cherry', []);
   }
 
@@ -59,12 +58,10 @@ class DefaultFactoryTest extends UnitTestCase {
    * Tests getPluginClass() with a missing class definition.
    *
    * @covers ::getPluginClass
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginException
-   * @expectedExceptionMessage The plugin (cherry) did not specify an instance class.
    */
   public function testGetPluginClassWithMissingClassWithObjectPluginDefinition() {
     $plugin_definition = $this->getMock(PluginDefinitionInterface::class);
+    $this->setExpectedException(PluginException::class, 'The plugin (cherry) did not specify an instance class.');
     DefaultFactory::getPluginClass('cherry', $plugin_definition);
   }
 
@@ -72,11 +69,9 @@ class DefaultFactoryTest extends UnitTestCase {
    * Tests getPluginClass() with a not existing class definition.
    *
    * @covers ::getPluginClass
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginException
-   * @expectedExceptionMessage Plugin (kiwifruit) instance class "\Drupal\plugin_test\Plugin\plugin_test\fruit\Kiwifruit" does not exist.
    */
   public function testGetPluginClassWithNotExistingClassWithArrayPluginDefinition() {
+    $this->setExpectedException(PluginException::class, 'Plugin (kiwifruit) instance class "\Drupal\plugin_test\Plugin\plugin_test\fruit\Kiwifruit" does not exist.');
     DefaultFactory::getPluginClass('kiwifruit', ['class' => '\Drupal\plugin_test\Plugin\plugin_test\fruit\Kiwifruit']);
   }
 
@@ -84,8 +79,6 @@ class DefaultFactoryTest extends UnitTestCase {
    * Tests getPluginClass() with a not existing class definition.
    *
    * @covers ::getPluginClass
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginException
    */
   public function testGetPluginClassWithNotExistingClassWithObjectPluginDefinition() {
     $plugin_class = '\Drupal\plugin_test\Plugin\plugin_test\fruit\Kiwifruit';
@@ -93,6 +86,7 @@ class DefaultFactoryTest extends UnitTestCase {
     $plugin_definition->expects($this->atLeastOnce())
       ->method('getClass')
       ->willReturn($plugin_class);
+    $this->setExpectedException(PluginException::class);
     DefaultFactory::getPluginClass('kiwifruit', $plugin_definition);
   }
 
@@ -128,12 +122,10 @@ class DefaultFactoryTest extends UnitTestCase {
    * Tests getPluginClass() with a required interface but no implementation.
    *
    * @covers ::getPluginClass
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginException
-   * @expectedExceptionMessage Plugin "cherry" (Drupal\plugin_test\Plugin\plugin_test\fruit\Kale) must implement interface Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface.
    */
   public function testGetPluginClassWithInterfaceAndInvalidClassWithArrayPluginDefinition() {
     $plugin_class = Kale::class;
+    $this->setExpectedException(PluginException::class, 'Plugin "cherry" (Drupal\plugin_test\Plugin\plugin_test\fruit\Kale) must implement interface Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface.');
     DefaultFactory::getPluginClass('cherry', ['class' => $plugin_class, 'provider' => 'core'], FruitInterface::class);
   }
 
@@ -141,8 +133,6 @@ class DefaultFactoryTest extends UnitTestCase {
    * Tests getPluginClass() with a required interface but no implementation.
    *
    * @covers ::getPluginClass
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginException
    */
   public function testGetPluginClassWithInterfaceAndInvalidClassWithObjectPluginDefinition() {
     $plugin_class = Kale::class;
@@ -150,6 +140,7 @@ class DefaultFactoryTest extends UnitTestCase {
     $plugin_definition->expects($this->atLeastOnce())
       ->method('getClass')
       ->willReturn($plugin_class);
+    $this->setExpectedException(PluginException::class);
     DefaultFactory::getPluginClass('cherry', $plugin_definition, FruitInterface::class);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryCachedTraitTest.php b/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryCachedTraitTest.php
index 5218ec2a7..0f112fb2e 100644
--- a/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryCachedTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryCachedTraitTest.php
@@ -21,11 +21,11 @@ class DiscoveryCachedTraitTest extends UnitTestCase {
    *   - Plugin name to query for.
    */
   public function providerGetDefinition() {
-    return array(
+    return [
       ['definition', [], ['plugin_name' => 'definition'], 'plugin_name'],
       ['definition', ['plugin_name' => 'definition'], [], 'plugin_name'],
       [NULL, ['plugin_name' => 'definition'], [], 'bad_plugin_name'],
-    );
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryTraitTest.php b/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryTraitTest.php
index 9f747f91b..b0f58c929 100644
--- a/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/DiscoveryTraitTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\Component\Plugin\Discovery;
 
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -19,10 +20,10 @@ class DiscoveryTraitTest extends UnitTestCase {
    *   - Plugin ID to get, passed to doGetDefinition().
    */
   public function providerDoGetDefinition() {
-    return array(
+    return [
       ['definition', ['plugin_name' => 'definition'], 'plugin_name'],
       [NULL, ['plugin_name' => 'definition'], 'bad_plugin_name'],
-    );
+    ];
   }
 
   /**
@@ -51,14 +52,13 @@ class DiscoveryTraitTest extends UnitTestCase {
    *   - Plugin ID to get, passed to doGetDefinition().
    */
   public function providerDoGetDefinitionException() {
-    return array(
+    return [
       [FALSE, ['plugin_name' => 'definition'], 'bad_plugin_name'],
-    );
+    ];
   }
 
   /**
    * @covers ::doGetDefinition
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginNotFoundException
    * @dataProvider providerDoGetDefinitionException
    * @uses \Drupal\Component\Plugin\Exception\PluginNotFoundException
    */
@@ -69,10 +69,8 @@ class DiscoveryTraitTest extends UnitTestCase {
     $method_ref = new \ReflectionMethod($trait, 'doGetDefinition');
     $method_ref->setAccessible(TRUE);
     // Call doGetDefinition, with $exception_on_invalid always TRUE.
-    $this->assertSame(
-      $expected,
-      $method_ref->invoke($trait, $definitions, $plugin_id, TRUE)
-    );
+    $this->setExpectedException(PluginNotFoundException::class);
+    $method_ref->invoke($trait, $definitions, $plugin_id, TRUE);
   }
 
   /**
@@ -96,7 +94,6 @@ class DiscoveryTraitTest extends UnitTestCase {
 
   /**
    * @covers ::getDefinition
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginNotFoundException
    * @dataProvider providerDoGetDefinitionException
    * @uses \Drupal\Component\Plugin\Exception\PluginNotFoundException
    */
@@ -109,10 +106,8 @@ class DiscoveryTraitTest extends UnitTestCase {
       ->method('getDefinitions')
       ->willReturn($definitions);
     // Call getDefinition(), with $exception_on_invalid always TRUE.
-    $this->assertSame(
-      $expected,
-      $trait->getDefinition($plugin_id, TRUE)
-    );
+    $this->setExpectedException(PluginNotFoundException::class);
+    $trait->getDefinition($plugin_id, TRUE);
   }
 
   /**
@@ -123,10 +118,10 @@ class DiscoveryTraitTest extends UnitTestCase {
    *   - Plugin ID to look for.
    */
   public function providerHasDefinition() {
-    return array(
+    return [
       [TRUE, 'valid'],
       [FALSE, 'not_valid'],
-    );
+    ];
   }
 
   /**
@@ -135,16 +130,16 @@ class DiscoveryTraitTest extends UnitTestCase {
    */
   public function testHasDefinition($expected, $plugin_id) {
     $trait = $this->getMockBuilder('Drupal\Component\Plugin\Discovery\DiscoveryTrait')
-      ->setMethods(array('getDefinition'))
+      ->setMethods(['getDefinition'])
       ->getMockForTrait();
     // Set up our mocked getDefinition() to return TRUE for 'valid' and FALSE
     // for 'not_valid'.
     $trait->expects($this->once())
       ->method('getDefinition')
-      ->will($this->returnValueMap(array(
+      ->will($this->returnValueMap([
         ['valid', FALSE, TRUE],
         ['not_valid', FALSE, FALSE],
-      )));
+      ]));
     // Call hasDefinition().
     $this->assertSame(
       $expected,
diff --git a/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/StaticDiscoveryDecoratorTest.php b/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/StaticDiscoveryDecoratorTest.php
index bdab19c7e..1828d73f3 100644
--- a/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/StaticDiscoveryDecoratorTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Plugin/Discovery/StaticDiscoveryDecoratorTest.php
@@ -23,7 +23,7 @@ class StaticDiscoveryDecoratorTest extends UnitTestCase {
    */
   public function getRegisterDefinitionsCallback() {
     $mock_callable = $this->getMockBuilder('\stdClass')
-      ->setMethods(array('registerDefinitionsCallback'))
+      ->setMethods(['registerDefinitionsCallback'])
       ->getMock();
     // Set expectations for the callback method.
     $mock_callable->expects($this->once())
@@ -62,7 +62,7 @@ class StaticDiscoveryDecoratorTest extends UnitTestCase {
     // Mock our StaticDiscoveryDecorator.
     $mock_decorator = $this->getMockBuilder('Drupal\Component\Plugin\Discovery\StaticDiscoveryDecorator')
       ->disableOriginalConstructor()
-      ->setMethods(array('registeredDefintionCallback'))
+      ->setMethods(['registeredDefintionCallback'])
       ->getMock();
 
     // Set up the ::$registerDefinitions property.
@@ -72,7 +72,7 @@ class StaticDiscoveryDecoratorTest extends UnitTestCase {
       // Set the callback object on the mocked decorator.
       $ref_register_definitions->setValue(
         $mock_decorator,
-        array($this->getRegisterDefinitionsCallback(), 'registerDefinitionsCallback')
+        [$this->getRegisterDefinitionsCallback(), 'registerDefinitionsCallback']
       );
     }
     else {
@@ -83,11 +83,11 @@ class StaticDiscoveryDecoratorTest extends UnitTestCase {
     // Set up ::$definitions to an empty array.
     $ref_definitions = new \ReflectionProperty($mock_decorator, 'definitions');
     $ref_definitions->setAccessible(TRUE);
-    $ref_definitions->setValue($mock_decorator, array());
+    $ref_definitions->setValue($mock_decorator, []);
 
     // Mock a decorated object.
     $mock_decorated = $this->getMockBuilder('Drupal\Component\Plugin\Discovery\DiscoveryInterface')
-      ->setMethods(array('getDefinitions'))
+      ->setMethods(['getDefinitions'])
       ->getMockForAbstractClass();
     // Return our definitions from getDefinitions().
     $mock_decorated->expects($this->once())
@@ -132,7 +132,7 @@ class StaticDiscoveryDecoratorTest extends UnitTestCase {
     // Mock our StaticDiscoveryDecorator.
     $mock_decorator = $this->getMockBuilder('Drupal\Component\Plugin\Discovery\StaticDiscoveryDecorator')
       ->disableOriginalConstructor()
-      ->setMethods(array('registeredDefintionCallback'))
+      ->setMethods(['registeredDefintionCallback'])
       ->getMock();
 
     // Set up the ::$registerDefinitions property.
@@ -142,7 +142,7 @@ class StaticDiscoveryDecoratorTest extends UnitTestCase {
       // Set the callback object on the mocked decorator.
       $ref_register_definitions->setValue(
         $mock_decorator,
-        array($this->getRegisterDefinitionsCallback(), 'registerDefinitionsCallback')
+        [$this->getRegisterDefinitionsCallback(), 'registerDefinitionsCallback']
       );
     }
     else {
@@ -153,11 +153,11 @@ class StaticDiscoveryDecoratorTest extends UnitTestCase {
     // Set up ::$definitions to an empty array.
     $ref_definitions = new \ReflectionProperty($mock_decorator, 'definitions');
     $ref_definitions->setAccessible(TRUE);
-    $ref_definitions->setValue($mock_decorator, array());
+    $ref_definitions->setValue($mock_decorator, []);
 
     // Mock a decorated object.
     $mock_decorated = $this->getMockBuilder('Drupal\Component\Plugin\Discovery\DiscoveryInterface')
-      ->setMethods(array('getDefinitions'))
+      ->setMethods(['getDefinitions'])
       ->getMockForAbstractClass();
     // Our mocked method will return any arguments sent to it.
     $mock_decorated->expects($this->once())
@@ -199,7 +199,7 @@ class StaticDiscoveryDecoratorTest extends UnitTestCase {
   public function testCall($method, $args) {
     // Mock a decorated object.
     $mock_decorated = $this->getMockBuilder('Drupal\Component\Plugin\Discovery\DiscoveryInterface')
-      ->setMethods(array($method))
+      ->setMethods([$method])
       ->getMockForAbstractClass();
     // Our mocked method will return any arguments sent to it.
     $mock_decorated->expects($this->once())
@@ -222,7 +222,7 @@ class StaticDiscoveryDecoratorTest extends UnitTestCase {
     // Exercise __call.
     $this->assertArrayEquals(
       $args,
-      \call_user_func_array(array($mock_decorated, $method), $args)
+      \call_user_func_array([$mock_decorated, $method], $args)
     );
   }
 
diff --git a/web/core/tests/Drupal/Tests/Component/Plugin/Factory/ReflectionFactoryTest.php b/web/core/tests/Drupal/Tests/Component/Plugin/Factory/ReflectionFactoryTest.php
index 8130b2df2..c6a0adf85 100644
--- a/web/core/tests/Drupal/Tests/Component/Plugin/Factory/ReflectionFactoryTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Plugin/Factory/ReflectionFactoryTest.php
@@ -88,7 +88,7 @@ class ReflectionFactoryTest extends UnitTestCase {
   public function testCreateInstance($expected, $reflector_name, $plugin_id, $plugin_definition, $configuration) {
     // Create a mock DiscoveryInterface which can return our plugin definition.
     $mock_discovery = $this->getMockBuilder('Drupal\Component\Plugin\Discovery\DiscoveryInterface')
-      ->setMethods(array('getDefinition', 'getDefinitions', 'hasDefinition'))
+      ->setMethods(['getDefinition', 'getDefinitions', 'hasDefinition'])
       ->getMock();
     $mock_discovery->expects($this->never())->method('getDefinitions');
     $mock_discovery->expects($this->never())->method('hasDefinition');
diff --git a/web/core/tests/Drupal/Tests/Component/Plugin/PluginBaseTest.php b/web/core/tests/Drupal/Tests/Component/Plugin/PluginBaseTest.php
index 600993205..0ef8451ab 100644
--- a/web/core/tests/Drupal/Tests/Component/Plugin/PluginBaseTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Plugin/PluginBaseTest.php
@@ -15,11 +15,11 @@ class PluginBaseTest extends UnitTestCase {
    * @covers ::getPluginId
    */
   public function testGetPluginId($plugin_id, $expected) {
-    $plugin_base = $this->getMockForAbstractClass('Drupal\Component\Plugin\PluginBase', array(
-      array(),
+    $plugin_base = $this->getMockForAbstractClass('Drupal\Component\Plugin\PluginBase', [
+      [],
       $plugin_id,
-      array(),
-    ));
+      [],
+    ]);
 
     $this->assertEquals($expected, $plugin_base->getPluginId());
   }
@@ -30,10 +30,10 @@ class PluginBaseTest extends UnitTestCase {
    * @return array
    */
   public function providerTestGetPluginId() {
-    return array(
-      array('base_id', 'base_id'),
-      array('base_id:derivative', 'base_id:derivative'),
-    );
+    return [
+      ['base_id', 'base_id'],
+      ['base_id:derivative', 'base_id:derivative'],
+    ];
   }
 
   /**
@@ -42,11 +42,11 @@ class PluginBaseTest extends UnitTestCase {
    */
   public function testGetBaseId($plugin_id, $expected) {
     /** @var \Drupal\Component\Plugin\PluginBase|\PHPUnit_Framework_MockObject_MockObject $plugin_base */
-    $plugin_base = $this->getMockForAbstractClass('Drupal\Component\Plugin\PluginBase', array(
-      array(),
+    $plugin_base = $this->getMockForAbstractClass('Drupal\Component\Plugin\PluginBase', [
+      [],
       $plugin_id,
-      array(),
-    ));
+      [],
+    ]);
 
     $this->assertEquals($expected, $plugin_base->getBaseId());
   }
@@ -57,10 +57,10 @@ class PluginBaseTest extends UnitTestCase {
    * @return array
    */
   public function providerTestGetBaseId() {
-    return array(
-      array('base_id', 'base_id'),
-      array('base_id:derivative', 'base_id'),
-    );
+    return [
+      ['base_id', 'base_id'],
+      ['base_id:derivative', 'base_id'],
+    ];
   }
 
 
@@ -70,11 +70,11 @@ class PluginBaseTest extends UnitTestCase {
    */
   public function testGetDerivativeId($plugin_id = NULL, $expected = NULL) {
     /** @var \Drupal\Component\Plugin\PluginBase|\PHPUnit_Framework_MockObject_MockObject $plugin_base */
-    $plugin_base = $this->getMockForAbstractClass('Drupal\Component\Plugin\PluginBase', array(
-      array(),
+    $plugin_base = $this->getMockForAbstractClass('Drupal\Component\Plugin\PluginBase', [
+      [],
       $plugin_id,
-      array(),
-    ));
+      [],
+    ]);
 
     $this->assertEquals($expected, $plugin_base->getDerivativeId());
   }
@@ -85,23 +85,23 @@ class PluginBaseTest extends UnitTestCase {
    * @return array
    */
   public function providerTestGetDerivativeId() {
-    return array(
-      array('base_id', NULL),
-      array('base_id:derivative', 'derivative'),
-    );
+    return [
+      ['base_id', NULL],
+      ['base_id:derivative', 'derivative'],
+    ];
   }
 
   /**
    * @covers ::getPluginDefinition
    */
   public function testGetPluginDefinition() {
-    $plugin_base = $this->getMockForAbstractClass('Drupal\Component\Plugin\PluginBase', array(
-      array(),
+    $plugin_base = $this->getMockForAbstractClass('Drupal\Component\Plugin\PluginBase', [
+      [],
       'plugin_id',
-      array('value', array('key' => 'value')),
-    ));
+      ['value', ['key' => 'value']],
+    ]);
 
-    $this->assertEquals(array('value', array('key' => 'value')), $plugin_base->getPluginDefinition());
+    $this->assertEquals(['value', ['key' => 'value']], $plugin_base->getPluginDefinition());
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Plugin/PluginManagerBaseTest.php b/web/core/tests/Drupal/Tests/Component/Plugin/PluginManagerBaseTest.php
index 608479a94..24a7b089e 100644
--- a/web/core/tests/Drupal/Tests/Component/Plugin/PluginManagerBaseTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Plugin/PluginManagerBaseTest.php
@@ -21,10 +21,10 @@ class PluginManagerBaseTest extends UnitTestCase {
     if ('invalid' == $plugin_id) {
       throw new PluginNotFoundException($plugin_id);
     }
-    return array(
+    return [
       'plugin_id' => $plugin_id,
       'configuration' => $configuration,
-    );
+    ];
   }
 
   /**
@@ -32,11 +32,11 @@ class PluginManagerBaseTest extends UnitTestCase {
    */
   public function getMockFactoryInterface($expects_count) {
     $mock_factory = $this->getMockBuilder('Drupal\Component\Plugin\Factory\FactoryInterface')
-      ->setMethods(array('createInstance'))
+      ->setMethods(['createInstance'])
       ->getMockForAbstractClass();
     $mock_factory->expects($this->exactly($expects_count))
       ->method('createInstance')
-      ->willReturnCallback(array($this, 'createInstanceCallback'));
+      ->willReturnCallback([$this, 'createInstanceCallback']);
     return $mock_factory;
   }
 
@@ -55,7 +55,7 @@ class PluginManagerBaseTest extends UnitTestCase {
     $factory_ref->setValue($manager, $this->getMockFactoryInterface(1));
 
     // Finally the test.
-    $configuration_array = array('config' => 'something');
+    $configuration_array = ['config' => 'something'];
     $result = $manager->createInstance('valid', $configuration_array);
     $this->assertEquals('valid', $result['plugin_id']);
     $this->assertArrayEquals($configuration_array, $result['configuration']);
@@ -75,7 +75,7 @@ class PluginManagerBaseTest extends UnitTestCase {
     $factory_ref->setAccessible(TRUE);
 
     // Set up the configuration array.
-    $configuration_array = array('config' => 'something');
+    $configuration_array = ['config' => 'something'];
 
     // Test with fallback interface and valid plugin_id.
     $factory_ref->setValue($manager, $this->getMockFactoryInterface(1));
diff --git a/web/core/tests/Drupal/Tests/Component/Plugin/StubFallbackPluginManager.php b/web/core/tests/Drupal/Tests/Component/Plugin/StubFallbackPluginManager.php
index 8dc4f0875..50283c661 100644
--- a/web/core/tests/Drupal/Tests/Component/Plugin/StubFallbackPluginManager.php
+++ b/web/core/tests/Drupal/Tests/Component/Plugin/StubFallbackPluginManager.php
@@ -20,7 +20,7 @@ class StubFallbackPluginManager extends PluginManagerBase implements FallbackPlu
   /**
    * {@inheritdoc}
    */
-  public function getFallbackPluginId($plugin_id, array $configuration = array()) {
+  public function getFallbackPluginId($plugin_id, array $configuration = []) {
     // Minimally implement getFallbackPluginId so that we can test it.
     return $plugin_id . '_fallback';
   }
diff --git a/web/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php b/web/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php
index f81ca0da4..30bf31050 100644
--- a/web/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php
@@ -381,7 +381,7 @@ class TestServiceMethodWithParameter {
 
 class TestServiceComplexMethod {
 
-  public function complexMethod($parameter, callable $function, TestServiceNoMethod $test_service = NULL, array &$elements = array()) {
+  public function complexMethod($parameter, callable $function, TestServiceNoMethod $test_service = NULL, array &$elements = []) {
 
   }
 
diff --git a/web/core/tests/Drupal/Tests/Component/Render/HtmlEscapedTextTest.php b/web/core/tests/Drupal/Tests/Component/Render/HtmlEscapedTextTest.php
index fa6c325d0..c064e2c2a 100644
--- a/web/core/tests/Drupal/Tests/Component/Render/HtmlEscapedTextTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Render/HtmlEscapedTextTest.php
@@ -31,23 +31,23 @@ class HtmlEscapedTextTest extends UnitTestCase {
    *
    * @see testToString()
    */
-  function providerToString() {
+  public function providerToString() {
     // Checks that invalid multi-byte sequences are escaped.
-    $tests[] = array("Foo\xC0barbaz", 'Foo�barbaz', 'Escapes invalid sequence "Foo\xC0barbaz"');
-    $tests[] = array("\xc2\"", '�&quot;', 'Escapes invalid sequence "\xc2\""');
-    $tests[] = array("Fooÿñ", "Fooÿñ", 'Does not escape valid sequence "Fooÿñ"');
+    $tests[] = ["Foo\xC0barbaz", 'Foo�barbaz', 'Escapes invalid sequence "Foo\xC0barbaz"'];
+    $tests[] = ["\xc2\"", '�&quot;', 'Escapes invalid sequence "\xc2\""'];
+    $tests[] = ["Fooÿñ", "Fooÿñ", 'Does not escape valid sequence "Fooÿñ"'];
 
     // Checks that special characters are escaped.
     $script_tag = $this->prophesize(MarkupInterface::class);
     $script_tag->__toString()->willReturn('<script>');
     $script_tag = $script_tag->reveal();
-    $tests[] = array($script_tag, '&lt;script&gt;', 'Escapes &lt;script&gt; even inside an object that implements MarkupInterface.');
-    $tests[] = array("<script>", '&lt;script&gt;', 'Escapes &lt;script&gt;');
-    $tests[] = array('<>&"\'', '&lt;&gt;&amp;&quot;&#039;', 'Escapes reserved HTML characters.');
+    $tests[] = [$script_tag, '&lt;script&gt;', 'Escapes &lt;script&gt; even inside an object that implements MarkupInterface.'];
+    $tests[] = ["<script>", '&lt;script&gt;', 'Escapes &lt;script&gt;'];
+    $tests[] = ['<>&"\'', '&lt;&gt;&amp;&quot;&#039;', 'Escapes reserved HTML characters.'];
     $specialchars = $this->prophesize(MarkupInterface::class);
     $specialchars->__toString()->willReturn('<>&"\'');
     $specialchars = $specialchars->reveal();
-    $tests[] = array($specialchars, '&lt;&gt;&amp;&quot;&#039;', 'Escapes reserved HTML characters even inside an object that implements MarkupInterface.');
+    $tests[] = [$specialchars, '&lt;&gt;&amp;&quot;&#039;', 'Escapes reserved HTML characters even inside an object that implements MarkupInterface.'];
 
     return $tests;
   }
diff --git a/web/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php b/web/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php
index 9898a5fb9..65552cf51 100644
--- a/web/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php
@@ -48,9 +48,9 @@ class JsonTest extends UnitTestCase {
 
     // Characters that must be escaped.
     // We check for unescaped " separately.
-    $this->htmlUnsafe = array('<', '>', '\'', '&');
+    $this->htmlUnsafe = ['<', '>', '\'', '&'];
     // The following are the encoded forms of: < > ' & "
-    $this->htmlUnsafeEscaped = array('\u003C', '\u003E', '\u0027', '\u0026', '\u0022');
+    $this->htmlUnsafeEscaped = ['\u003C', '\u003E', '\u0027', '\u0026', '\u0022'];
   }
 
   /**
@@ -100,7 +100,7 @@ class JsonTest extends UnitTestCase {
   public function testStructuredReversibility() {
     // Verify reversibility for structured data. Also verify that necessary
     // characters are escaped.
-    $source = array(TRUE, FALSE, 0, 1, '0', '1', $this->string, array('key1' => $this->string, 'key2' => array('nested' => TRUE)));
+    $source = [TRUE, FALSE, 0, 1, '0', '1', $this->string, ['key1' => $this->string, 'key2' => ['nested' => TRUE]]];
     $json = Json::encode($source);
     foreach ($this->htmlUnsafe as $char) {
       $this->assertTrue(strpos($json, $char) === FALSE, sprintf('A JSON encoded string does not contain %s.', $char));
diff --git a/web/core/tests/Drupal/Tests/Component/Serialization/YamlPeclTest.php b/web/core/tests/Drupal/Tests/Component/Serialization/YamlPeclTest.php
index ef0d7fbbf..38840310d 100644
--- a/web/core/tests/Drupal/Tests/Component/Serialization/YamlPeclTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Serialization/YamlPeclTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\Component\Serialization;
 
+use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
 use Drupal\Component\Serialization\YamlPecl;
 
 /**
@@ -74,9 +75,9 @@ foo:
    * Tests that invalid YAML throws an exception.
    *
    * @covers ::errorHandler
-   * @expectedException \Drupal\Component\Serialization\Exception\InvalidDataTypeException
    */
   public function testError() {
+    $this->setExpectedException(InvalidDataTypeException::class);
     YamlPecl::decode('foo: [ads');
   }
 
diff --git a/web/core/tests/Drupal/Tests/Component/Serialization/YamlSymfonyTest.php b/web/core/tests/Drupal/Tests/Component/Serialization/YamlSymfonyTest.php
index 3101efeab..f9c2fb9d9 100644
--- a/web/core/tests/Drupal/Tests/Component/Serialization/YamlSymfonyTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Serialization/YamlSymfonyTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\Component\Serialization;
 
+use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
 use Drupal\Component\Serialization\YamlSymfony;
 
 /**
@@ -56,9 +57,9 @@ class YamlSymfonyTest extends YamlTestBase {
    * Tests that invalid YAML throws an exception.
    *
    * @covers ::decode
-   * @expectedException \Drupal\Component\Serialization\Exception\InvalidDataTypeException
    */
   public function testError() {
+    $this->setExpectedException(InvalidDataTypeException::class);
     YamlSymfony::decode('foo: [ads');
   }
 
diff --git a/web/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php b/web/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php
index a3c534aea..243fcfd20 100644
--- a/web/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php
@@ -40,32 +40,32 @@ class PhpTransliterationTest extends UnitTestCase {
    *   self::testRemoveDiacritics().
    */
   public function providerTestPhpTransliterationRemoveDiacritics() {
-    return array(
+    return [
       // Test all characters in the Unicode range 0x00bf to 0x017f.
-      array('ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ', 'AAAAAAÆCEEEEIIII'),
-      array('ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß', 'ÐNOOOOO×OUUUUYÞß'),
-      array('àáâãäåæçèéêëìíîï', 'aaaaaaæceeeeiiii'),
-      array('ðñòóôõö÷øùúûüýþÿ', 'ðnooooo÷ouuuuyþy'),
-      array('ĀāĂ㥹ĆćĈĉĊċČčĎď', 'AaAaAaCcCcCcCcDd'),
-      array('ĐđĒēĔĕĖėĘęĚěĜĝĞğ', 'DdEeEeEeEeEeGgGg'),
-      array('ĠġĢģĤĥĦħĨĩĪīĬĭĮį', 'GgGgHhHhIiIiIiIi'),
-      array('İıIJijĴĵĶķĸĹĺĻļĽľĿ', 'IiIJijJjKkĸLlLlLlL'),
-      array('ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ', 'lLlNnNnNnʼnŊŋOoOo'),
-      array('ŐőŒœŔŕŖŗŘřŚśŜŝŞş', 'OoŒœRrRrRrSsSsSs'),
-      array('ŠšŢţŤťŦŧŨũŪūŬŭŮů', 'SsTtTtTtUuUuUuUu'),
-      array('ŰűŲųŴŵŶŷŸŹźŻżŽž', 'UuUuWwYyYZzZzZz'),
+      ['ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ', 'AAAAAAÆCEEEEIIII'],
+      ['ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß', 'ÐNOOOOO×OUUUUYÞß'],
+      ['àáâãäåæçèéêëìíîï', 'aaaaaaæceeeeiiii'],
+      ['ðñòóôõö÷øùúûüýþÿ', 'ðnooooo÷ouuuuyþy'],
+      ['ĀāĂ㥹ĆćĈĉĊċČčĎď', 'AaAaAaCcCcCcCcDd'],
+      ['ĐđĒēĔĕĖėĘęĚěĜĝĞğ', 'DdEeEeEeEeEeGgGg'],
+      ['ĠġĢģĤĥĦħĨĩĪīĬĭĮį', 'GgGgHhHhIiIiIiIi'],
+      ['İıIJijĴĵĶķĸĹĺĻļĽľĿ', 'IiIJijJjKkĸLlLlLlL'],
+      ['ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ', 'lLlNnNnNnʼnŊŋOoOo'],
+      ['ŐőŒœŔŕŖŗŘřŚśŜŝŞş', 'OoŒœRrRrRrSsSsSs'],
+      ['ŠšŢţŤťŦŧŨũŪūŬŭŮů', 'SsTtTtTtUuUuUuUu'],
+      ['ŰűŲųŴŵŶŷŸŹźŻżŽž', 'UuUuWwYyYZzZzZz'],
 
       // Test all characters in the Unicode range 0x01CD to 0x024F.
-      array('ǍǎǏ', 'AaI'),
-      array('ǐǑǒǓǔǕǖǗǘǙǚǛǜǝǞǟ', 'iOoUuUuUuUuUuǝAa'),
-      array('ǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯ', 'AaǢǣGgGgKkOoOoǮǯ'),
-      array('ǰDZDzdzǴǵǶǷǸǹǺǻǼǽǾǿ', 'jDZDzdzGgǶǷNnAaǼǽOo'),
-      array('ȀȁȂȃȄȅȆȇȈȉȊȋȌȍȎȏ', 'AaAaEeEeIiIiOoOo'),
-      array('ȐȑȒȓȔȕȖȗȘșȚțȜȝȞȟ', 'RrRrUuUuSsTtȜȝHh'),
-      array('ȠȡȢȣȤȥȦȧȨȩȪȫȬȭȮȯ', 'ȠȡȢȣZzAaEeOoOoOo'),
-      array('ȰȱȲȳȴȵȶȷȸȹȺȻȼȽȾȿ', 'OoYylntjȸȹACcLTs'),
-      array('ɀɁɂɃɄɅɆɇɈɉɊɋɌɍɎɏ', 'zɁɂBUɅEeJjQqRrYy'),
-    );
+      ['ǍǎǏ', 'AaI'],
+      ['ǐǑǒǓǔǕǖǗǘǙǚǛǜǝǞǟ', 'iOoUuUuUuUuUuǝAa'],
+      ['ǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯ', 'AaǢǣGgGgKkOoOoǮǯ'],
+      ['ǰDZDzdzǴǵǶǷǸǹǺǻǼǽǾǿ', 'jDZDzdzGgǶǷNnAaǼǽOo'],
+      ['ȀȁȂȃȄȅȆȇȈȉȊȋȌȍȎȏ', 'AaAaEeEeIiIiOoOo'],
+      ['ȐȑȒȓȔȕȖȗȘșȚțȜȝȞȟ', 'RrRrUuUuSsTtȜȝHh'],
+      ['ȠȡȢȣȤȥȦȧȨȩȪȫȬȭȮȯ', 'ȠȡȢȣZzAaEeOoOoOo'],
+      ['ȰȱȲȳȴȵȶȷȸȹȺȻȼȽȾȿ', 'OoYylntjȸȹACcLTs'],
+      ['ɀɁɂɃɄɅɆɇɈɉɊɋɌɍɎɏ', 'zɁɂBUɅEeJjQqRrYy'],
+    ];
   }
 
   /**
@@ -117,36 +117,36 @@ class PhpTransliterationTest extends UnitTestCase {
     // They are not in our tables, but should at least give us '?' (unknown).
     $five_byte = html_entity_decode('&#x10330;&#x10338;', ENT_NOQUOTES, 'UTF-8');
 
-    return array(
+    return [
       // Each test case is (language code, input, output).
       // Test ASCII in English.
-      array('en', $random, $random),
+      ['en', $random, $random],
       // Test ASCII in some other language with no overrides.
-      array('fr', $random, $random),
+      ['fr', $random, $random],
       // Test 3 and 4-byte characters in a language without overrides.
       // Note: if the data tables change, these will need to change too! They
       // are set up to test that data table loading works, so values come
       // directly from the data files.
-      array('fr', $three_byte, 'c'),
-      array('fr', $four_byte, 'wii'),
+      ['fr', $three_byte, 'c'],
+      ['fr', $four_byte, 'wii'],
       // Test 5-byte characters.
-      array('en', $five_byte, '??'),
+      ['en', $five_byte, '??'],
       // Test a language with no overrides.
-      array('en', $two_byte, 'A O U A O aouaohello'),
+      ['en', $two_byte, 'A O U A O aouaohello'],
       // Test language overrides provided by core.
-      array('de', $two_byte, 'Ae Oe Ue A O aeoeueaohello'),
-      array('de', $random, $random),
-      array('dk', $two_byte, 'A O U Aa Oe aouaaoehello'),
-      array('dk', $random, $random),
-      array('kg', $three_byte, 'ts'),
+      ['de', $two_byte, 'Ae Oe Ue A O aeoeueaohello'],
+      ['de', $random, $random],
+      ['dk', $two_byte, 'A O U Aa Oe aouaaoehello'],
+      ['dk', $random, $random],
+      ['kg', $three_byte, 'ts'],
       // Test strings in some other languages.
       // Turkish, provided by drupal.org user Kartagis.
-      array('tr', 'Abayı serdiler bize. Söyleyeceğim yüzlerine. Sanırım hepimiz aynı şeyi düşünüyoruz.', 'Abayi serdiler bize. Soyleyecegim yuzlerine. Sanirim hepimiz ayni seyi dusunuyoruz.'),
+      ['tr', 'Abayı serdiler bize. Söyleyeceğim yüzlerine. Sanırım hepimiz aynı şeyi düşünüyoruz.', 'Abayi serdiler bize. Soyleyecegim yuzlerine. Sanirim hepimiz ayni seyi dusunuyoruz.'],
       // Illegal/unknown unicode.
-      array('en', chr(0xF8) . chr(0x80) . chr(0x80) . chr(0x80) . chr(0x80), '?'),
+      ['en', chr(0xF8) . chr(0x80) . chr(0x80) . chr(0x80) . chr(0x80), '?'],
       // Max length.
-      array('de', $two_byte, 'Ae Oe', '?', 5),
-    );
+      ['de', $two_byte, 'Ae Oe', '?', 5],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php b/web/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php
index 878bbfd6d..171060906 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/ArgumentsResolverTest.php
@@ -121,9 +121,6 @@ class ArgumentsResolverTest extends UnitTestCase {
    * Tests getArgument() with a wildcard parameter with no typehint.
    *
    * Without the typehint, the wildcard object will not be passed to the callable.
-   *
-   * @expectedException \RuntimeException
-   * @expectedExceptionMessage requires a value for the "$route" argument.
    */
   public function testGetWildcardArgumentNoTypehint() {
     $a = $this->getMock('\Drupal\Tests\Component\Utility\TestInterface1');
@@ -131,8 +128,8 @@ class ArgumentsResolverTest extends UnitTestCase {
     $resolver = new ArgumentsResolver([], [], $wildcards);
 
     $callable = function($route) {};
-    $arguments = $resolver->getArguments($callable);
-    $this->assertNull($arguments);
+    $this->setExpectedException(\RuntimeException::class, 'requires a value for the "$route" argument.');
+    $resolver->getArguments($callable);
   }
 
   /**
@@ -152,9 +149,6 @@ class ArgumentsResolverTest extends UnitTestCase {
 
   /**
    * Tests handleUnresolvedArgument() for a scalar argument.
-   *
-   * @expectedException \RuntimeException
-   * @expectedExceptionMessage requires a value for the "$foo" argument.
    */
   public function testHandleNotUpcastedArgument() {
     $objects = ['foo' => 'bar'];
@@ -162,22 +156,19 @@ class ArgumentsResolverTest extends UnitTestCase {
     $resolver = new ArgumentsResolver($scalars, $objects, []);
 
     $callable = function(\stdClass $foo) {};
-    $arguments = $resolver->getArguments($callable);
-    $this->assertNull($arguments);
+    $this->setExpectedException(\RuntimeException::class, 'requires a value for the "$foo" argument.');
+    $resolver->getArguments($callable);
   }
 
   /**
    * Tests handleUnresolvedArgument() for missing arguments.
    *
-   * @expectedException \RuntimeException
-   * @expectedExceptionMessage requires a value for the "$foo" argument.
-   *
    * @dataProvider providerTestHandleUnresolvedArgument
    */
   public function testHandleUnresolvedArgument($callable) {
     $resolver = new ArgumentsResolver([], [], []);
-    $arguments = $resolver->getArguments($callable);
-    $this->assertNull($arguments);
+    $this->setExpectedException(\RuntimeException::class, 'requires a value for the "$foo" argument.');
+    $resolver->getArguments($callable);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/BytesTest.php b/web/core/tests/Drupal/Tests/Component/Utility/BytesTest.php
index f4ebf0e67..35872ac4b 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/BytesTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/BytesTest.php
@@ -40,21 +40,21 @@ class BytesTest extends UnitTestCase {
    *   value.
    */
   public function providerTestToInt() {
-    return array(
-      array('1', 1),
-      array('1 byte', 1),
-      array('1 KB'  , Bytes::KILOBYTE),
-      array('1 MB'  , pow(Bytes::KILOBYTE, 2)),
-      array('1 GB'  , pow(Bytes::KILOBYTE, 3)),
-      array('1 TB'  , pow(Bytes::KILOBYTE, 4)),
-      array('1 PB'  , pow(Bytes::KILOBYTE, 5)),
-      array('1 EB'  , pow(Bytes::KILOBYTE, 6)),
-      array('1 ZB'  , pow(Bytes::KILOBYTE, 7)),
-      array('1 YB'  , pow(Bytes::KILOBYTE, 8)),
-      array('23476892 bytes', 23476892),
-      array('76MRandomStringThatShouldBeIgnoredByParseSize.', 79691776), // 76 MB
-      array('76.24 Giggabyte', 81862076662), // 76.24 GB (with typo)
-    );
+    return [
+      ['1', 1],
+      ['1 byte', 1],
+      ['1 KB'  , Bytes::KILOBYTE],
+      ['1 MB'  , pow(Bytes::KILOBYTE, 2)],
+      ['1 GB'  , pow(Bytes::KILOBYTE, 3)],
+      ['1 TB'  , pow(Bytes::KILOBYTE, 4)],
+      ['1 PB'  , pow(Bytes::KILOBYTE, 5)],
+      ['1 EB'  , pow(Bytes::KILOBYTE, 6)],
+      ['1 ZB'  , pow(Bytes::KILOBYTE, 7)],
+      ['1 YB'  , pow(Bytes::KILOBYTE, 8)],
+      ['23476892 bytes', 23476892],
+      ['76MRandomStringThatShouldBeIgnoredByParseSize.', 79691776], // 76 MB
+      ['76.24 Giggabyte', 81862076662], // 76.24 GB (with typo)
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/ColorTest.php b/web/core/tests/Drupal/Tests/Component/Utility/ColorTest.php
index c65bf55a0..e2f162919 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/ColorTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/ColorTest.php
@@ -43,35 +43,35 @@ class ColorTest extends UnitTestCase {
    *     - (optional) Boolean indicating invalid status. Defaults to FALSE.
    */
   public function providerTestHexToRgb() {
-    $invalid = array();
+    $invalid = [];
     // Any invalid arguments should throw an exception.
-    foreach (array('', '-1', '1', '12', '12345', '1234567', '123456789', '123456789a', 'foo') as $value) {
-      $invalid[] = array($value, '', TRUE);
+    foreach (['', '-1', '1', '12', '12345', '1234567', '123456789', '123456789a', 'foo'] as $value) {
+      $invalid[] = [$value, '', TRUE];
     }
     // Duplicate all invalid value tests with additional '#' prefix.
     // The '#' prefix inherently turns the data type into a string.
     foreach ($invalid as $value) {
-      $invalid[] = array('#' . $value[0], '', TRUE);
+      $invalid[] = ['#' . $value[0], '', TRUE];
     }
     // Add invalid data types (hex value must be a string).
-    foreach (array(
+    foreach ([
       1, 12, 1234, 12345, 123456, 1234567, 12345678, 123456789, 123456789,
       -1, PHP_INT_MAX, PHP_INT_MAX + 1, -PHP_INT_MAX, 0x0, 0x010
-    ) as $value) {
-      $invalid[] = array($value, '', TRUE);
+    ] as $value) {
+      $invalid[] = [$value, '', TRUE];
     }
     // And some valid values.
-    $valid = array(
+    $valid = [
       // Shorthands without alpha.
-      array('hex' => '#000', 'rgb' => array('red' => 0, 'green' => 0, 'blue' => 0)),
-      array('hex' => '#fff', 'rgb' => array('red' => 255, 'green' => 255, 'blue' => 255)),
-      array('hex' => '#abc', 'rgb' => array('red' => 170, 'green' => 187, 'blue' => 204)),
-      array('hex' => 'cba', 'rgb' => array('red' => 204, 'green' => 187, 'blue' => 170)),
+      ['hex' => '#000', 'rgb' => ['red' => 0, 'green' => 0, 'blue' => 0]],
+      ['hex' => '#fff', 'rgb' => ['red' => 255, 'green' => 255, 'blue' => 255]],
+      ['hex' => '#abc', 'rgb' => ['red' => 170, 'green' => 187, 'blue' => 204]],
+      ['hex' => 'cba', 'rgb' => ['red' => 204, 'green' => 187, 'blue' => 170]],
       // Full without alpha.
-      array('hex' => '#000000', 'rgb' => array('red' => 0, 'green' => 0, 'blue' => 0)),
-      array('hex' => '#ffffff', 'rgb' => array('red' => 255, 'green' => 255, 'blue' => 255)),
-      array('hex' => '#010203', 'rgb' => array('red' => 1, 'green' => 2, 'blue' => 3)),
-    );
+      ['hex' => '#000000', 'rgb' => ['red' => 0, 'green' => 0, 'blue' => 0]],
+      ['hex' => '#ffffff', 'rgb' => ['red' => 255, 'green' => 255, 'blue' => 255]],
+      ['hex' => '#010203', 'rgb' => ['red' => 1, 'green' => 2, 'blue' => 3]],
+    ];
     return array_merge($invalid, $valid);
   }
 
@@ -101,19 +101,19 @@ class ColorTest extends UnitTestCase {
    */
   public function providerTestRbgToHex() {
     // Input using named RGB array (e.g., as returned by Color::hexToRgb()).
-    $tests = array(
-      array(array('red' => 0, 'green' => 0, 'blue' => 0), '#000000'),
-      array(array('red' => 255, 'green' => 255, 'blue' => 255), '#ffffff'),
-      array(array('red' => 119, 'green' => 119, 'blue' => 119), '#777777'),
-      array(array('red' => 1, 'green' => 2, 'blue' => 3), '#010203'),
-    );
+    $tests = [
+      [['red' => 0, 'green' => 0, 'blue' => 0], '#000000'],
+      [['red' => 255, 'green' => 255, 'blue' => 255], '#ffffff'],
+      [['red' => 119, 'green' => 119, 'blue' => 119], '#777777'],
+      [['red' => 1, 'green' => 2, 'blue' => 3], '#010203'],
+    ];
     // Input using indexed RGB array (e.g.: array(10, 10, 10)).
     foreach ($tests as $test) {
-      $tests[] = array(array_values($test[0]), $test[1]);
+      $tests[] = [array_values($test[0]), $test[1]];
     }
     // Input using CSS RGB string notation (e.g.: 10, 10, 10).
     foreach ($tests as $test) {
-      $tests[] = array(implode(', ', $test[0]), $test[1]);
+      $tests[] = [implode(', ', $test[0]), $test[1]];
     }
     return $tests;
   }
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/CryptRandomFallbackTest.php b/web/core/tests/Drupal/Tests/Component/Utility/CryptRandomFallbackTest.php
new file mode 100644
index 000000000..de00da6a4
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Component/Utility/CryptRandomFallbackTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Drupal\Tests\Component\Utility;
+
+use Drupal\Tests\UnitTestCase;
+use Drupal\Component\Utility\Crypt;
+
+/**
+ * Tests random byte generation fallback exception situations.
+ *
+ * @group Utility
+ *
+ * @runTestsInSeparateProcesses
+ *
+ * @coversDefaultClass \Drupal\Component\Utility\Crypt
+ */
+class CryptRandomFallbackTest extends UnitTestCase {
+
+  static protected $functionCalled = 0;
+
+  /**
+   * Allows the test to confirm that the namespaced random_bytes() was called.
+   */
+  public static function functionCalled() {
+    static::$functionCalled++;
+  }
+
+  /**
+   * Tests random byte generation using the fallback generator.
+   *
+   * If the call to random_bytes() throws an exception, Crypt::random_bytes()
+   * should still return a useful string of random bytes.
+   *
+   * @covers ::randomBytes
+   *
+   * @see \Drupal\Tests\Component\Utility\CryptTest::testRandomBytes()
+   */
+  public function testRandomBytesFallback() {
+    // This loop is a copy of
+    // \Drupal\Tests\Component\Utility\CryptTest::testRandomBytes().
+    for ($i = 0; $i < 10; $i++) {
+      $count = rand(10, 10000);
+      // Check that different values are being generated.
+      $this->assertNotEquals(Crypt::randomBytes($count), Crypt::randomBytes($count));
+      // Check the length.
+      $this->assertEquals($count, strlen(Crypt::randomBytes($count)));
+    }
+    $this->assertEquals(30, static::$functionCalled, 'The namespaced function was called the expected number of times.');
+  }
+
+}
+
+namespace Drupal\Component\Utility;
+
+use  \Drupal\Tests\Component\Utility\CryptRandomFallbackTest;
+
+/**
+ * Defines a function in same namespace as Drupal\Component\Utility\Crypt.
+ *
+ * Forces throwing an exception in this test environment because the function
+ * in the namespace is used in preference to the global function.
+ *
+ * @param int $count
+ *   Matches the global function definition.
+ *
+ * @throws \Exception
+ */
+function random_bytes($count) {
+  CryptRandomFallbackTest::functionCalled();
+  throw new \Exception($count);
+}
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/CryptTest.php b/web/core/tests/Drupal/Tests/Component/Utility/CryptTest.php
index ff1e6ccfb..38743dfd5 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/CryptTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/CryptTest.php
@@ -18,6 +18,8 @@ class CryptTest extends UnitTestCase {
    * Tests random byte generation.
    *
    * @covers ::randomBytes
+   *
+   * @see \Drupal\Tests\Component\Utility\CryptRandomFallbackTest::testRandomBytesFallback
    */
   public function testRandomBytes() {
     for ($i = 1; $i < 10; $i++) {
@@ -67,7 +69,6 @@ class CryptTest extends UnitTestCase {
    * Tests the hmacBase64 method with invalid parameters.
    *
    * @dataProvider providerTestHmacBase64Invalid
-   * @expectedException InvalidArgumentException
    * @covers ::hmacBase64
    *
    * @param string $data
@@ -76,6 +77,7 @@ class CryptTest extends UnitTestCase {
    *   Key to use in hashing process.
    */
   public function testHmacBase64Invalid($data, $key) {
+    $this->setExpectedException(\InvalidArgumentException::class);
     Crypt::hmacBase64($data, $key);
   }
 
@@ -85,16 +87,16 @@ class CryptTest extends UnitTestCase {
    * @return array Test data.
    */
   public function providerTestHashBase64() {
-    return array(
-      array(
+    return [
+      [
         'data' => 'The SHA (Secure Hash Algorithm) is one of a number of cryptographic hash functions. A cryptographic hash is like a signature for a text or a data file. SHA-256 algorithm generates an almost-unique, fixed size 256-bit (32-byte) hash. Hash is a one way function – it cannot be decrypted back. This makes it suitable for password validation, challenge hash authentication, anti-tamper, digital signatures.',
         'expectedHash' => '034rT6smZAVRxpq8O98cFFNLIVx_Ph1EwLZQKcmRR_s',
-      ),
-      array(
+      ],
+      [
         'data' => 'SHA-256 is one of the successor hash functions to SHA-1, and is one of the strongest hash functions available.',
         'expected_hash' => 'yuqkDDYqprL71k4xIb6K6D7n76xldO4jseRhEkEE6SI',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -103,13 +105,13 @@ class CryptTest extends UnitTestCase {
    * @return array Test data.
    */
   public function providerTestHmacBase64() {
-    return array(
-      array(
+    return [
+      [
         'data' => 'Calculates a base-64 encoded, URL-safe sha-256 hmac.',
         'key' => 'secret-key',
         'expected_hmac' => '2AaH63zwjhekWZlEpAiufyfhAHIzbQhl9Hd9oCi3_c8',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -118,33 +120,33 @@ class CryptTest extends UnitTestCase {
    * @return array Test data.
    */
   public function providerTestHmacBase64Invalid() {
-    return array(
-      array(new \stdClass(), new \stdClass()),
-      array(new \stdClass(), 'string'),
-      array(new \stdClass(), 1),
-      array(new \stdClass(), 0),
-      array(NULL, new \stdClass()),
-      array('string', new \stdClass()),
-      array(1, new \stdClass()),
-      array(0, new \stdClass()),
-      array(array(), array()),
-      array(array(), NULL),
-      array(array(), 'string'),
-      array(array(), 1),
-      array(array(), 0),
-      array(NULL, array()),
-      array(1, array()),
-      array(0, array()),
-      array('string', array()),
-      array(array(), NULL),
-      array(NULL, NULL),
-      array(NULL, 'string'),
-      array(NULL, 1),
-      array(NULL, 0),
-      array(1, NULL),
-      array(0, NULL),
-      array('string', NULL),
-    );
+    return [
+      [new \stdClass(), new \stdClass()],
+      [new \stdClass(), 'string'],
+      [new \stdClass(), 1],
+      [new \stdClass(), 0],
+      [NULL, new \stdClass()],
+      ['string', new \stdClass()],
+      [1, new \stdClass()],
+      [0, new \stdClass()],
+      [[], []],
+      [[], NULL],
+      [[], 'string'],
+      [[], 1],
+      [[], 0],
+      [NULL, []],
+      [1, []],
+      [0, []],
+      ['string', []],
+      [[], NULL],
+      [NULL, NULL],
+      [NULL, 'string'],
+      [NULL, 1],
+      [NULL, 0],
+      [1, NULL],
+      [0, NULL],
+      ['string', NULL],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/EnvironmentTest.php b/web/core/tests/Drupal/Tests/Component/Utility/EnvironmentTest.php
index b240e4e0d..708eee9ab 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/EnvironmentTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/EnvironmentTest.php
@@ -47,16 +47,16 @@ class EnvironmentTest extends UnitTestCase {
     $memory_limit = ini_get('memory_limit');
     $twice_avail_memory = ($memory_limit * 2) . 'MB';
 
-    return array(
+    return [
       // Minimal amount of memory should be available.
-      array('30MB', NULL, TRUE),
+      ['30MB', NULL, TRUE],
       // Exceed a custom (unlimited) memory limit.
-      array($twice_avail_memory, -1, TRUE),
+      [$twice_avail_memory, -1, TRUE],
       // Exceed a custom memory limit.
-      array('30MB', '16MB', FALSE),
+      ['30MB', '16MB', FALSE],
       // Available = required.
-      array('30MB', '30MB', TRUE),
-    );
+      ['30MB', '30MB', TRUE],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/web/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
index 6a106c7b9..593ebc5c4 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
@@ -59,25 +59,25 @@ class HtmlTest extends UnitTestCase {
     $id1 = 'abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789';
     $id2 = '¡¢£¤¥';
     $id3 = 'css__identifier__with__double__underscores';
-    return array(
+    return [
       // Verify that no valid ASCII characters are stripped from the identifier.
-      array($id1, $id1, array()),
+      [$id1, $id1, []],
       // Verify that valid UTF-8 characters are not stripped from the identifier.
-      array($id2, $id2, array()),
+      [$id2, $id2, []],
       // Verify that invalid characters (including non-breaking space) are stripped from the identifier.
-      array($id3, $id3),
+      [$id3, $id3],
       // Verify that double underscores are not stripped from the identifier.
-      array('invalididentifier', 'invalid !"#$%&\'()*+,./:;<=>?@[\\]^`{|}~ identifier', array()),
+      ['invalididentifier', 'invalid !"#$%&\'()*+,./:;<=>?@[\\]^`{|}~ identifier', []],
       // Verify that an identifier starting with a digit is replaced.
-      array('_cssidentifier', '1cssidentifier', array()),
+      ['_cssidentifier', '1cssidentifier', []],
       // Verify that an identifier starting with a hyphen followed by a digit is
       // replaced.
-      array('__cssidentifier', '-1cssidentifier', array()),
+      ['__cssidentifier', '-1cssidentifier', []],
       // Verify that an identifier starting with two hyphens is replaced.
-      array('__cssidentifier', '--cssidentifier', array()),
+      ['__cssidentifier', '--cssidentifier', []],
       // Verify that passing double underscores as a filter is processed.
-      array('_cssidentifier', '__cssidentifier', array('__' => '_')),
-    );
+      ['_cssidentifier', '__cssidentifier', ['__' => '_']],
+    ];
   }
 
   /**
@@ -119,18 +119,18 @@ class HtmlTest extends UnitTestCase {
    */
   public function providerTestHtmlGetUniqueId() {
     $id = 'abcdefghijklmnopqrstuvwxyz-0123456789';
-    return array(
+    return [
       // Verify that letters, digits, and hyphens are not stripped from the ID.
-      array($id, $id),
+      [$id, $id],
       // Verify that invalid characters are stripped from the ID.
-      array('invalididentifier', 'invalid,./:@\\^`{Üidentifier'),
+      ['invalididentifier', 'invalid,./:@\\^`{Üidentifier'],
       // Verify Drupal coding standards are enforced.
-      array('id-name-1', 'ID NAME_[1]'),
+      ['id-name-1', 'ID NAME_[1]'],
       // Verify that a repeated ID is made unique.
-      array('test-unique-id', 'test-unique-id', TRUE),
-      array('test-unique-id--2', 'test-unique-id'),
-      array('test-unique-id--3', 'test-unique-id'),
-    );
+      ['test-unique-id', 'test-unique-id', TRUE],
+      ['test-unique-id--2', 'test-unique-id'],
+      ['test-unique-id--3', 'test-unique-id'],
+    ];
   }
 
   /**
@@ -168,13 +168,13 @@ class HtmlTest extends UnitTestCase {
    *   Test data.
    */
   public function providerTestHtmlGetUniqueIdWithAjaxIds() {
-    return array(
-      array('test-unique-id1--', 'test-unique-id1'),
+    return [
+      ['test-unique-id1--', 'test-unique-id1'],
       // Note, we truncate two hyphens at the end.
       // @see \Drupal\Component\Utility\Html::getId()
-      array('test-unique-id1---', 'test-unique-id1--'),
-      array('test-unique-id2--', 'test-unique-id2'),
-    );
+      ['test-unique-id1---', 'test-unique-id1--'],
+      ['test-unique-id2--', 'test-unique-id2'],
+    ];
   }
 
   /**
@@ -202,17 +202,17 @@ class HtmlTest extends UnitTestCase {
    */
   public function providerTestHtmlGetId() {
     $id = 'abcdefghijklmnopqrstuvwxyz-0123456789';
-    return array(
+    return [
       // Verify that letters, digits, and hyphens are not stripped from the ID.
-      array($id, $id),
+      [$id, $id],
       // Verify that invalid characters are stripped from the ID.
-      array('invalididentifier', 'invalid,./:@\\^`{Üidentifier'),
+      ['invalididentifier', 'invalid,./:@\\^`{Üidentifier'],
       // Verify Drupal coding standards are enforced.
-      array('id-name-1', 'ID NAME_[1]'),
+      ['id-name-1', 'ID NAME_[1]'],
       // Verify that a repeated ID is made unique.
-      array('test-unique-id', 'test-unique-id'),
-      array('test-unique-id', 'test-unique-id'),
-    );
+      ['test-unique-id', 'test-unique-id'],
+      ['test-unique-id', 'test-unique-id'],
+    ];
   }
 
   /**
@@ -231,29 +231,29 @@ class HtmlTest extends UnitTestCase {
    * @see testDecodeEntities()
    */
   public function providerDecodeEntities() {
-    return array(
-      array('Drupal', 'Drupal'),
-      array('<script>', '<script>'),
-      array('&lt;script&gt;', '<script>'),
-      array('&#60;script&#62;', '<script>'),
-      array('&amp;lt;script&amp;gt;', '&lt;script&gt;'),
-      array('"', '"'),
-      array('&#34;', '"'),
-      array('&amp;#34;', '&#34;'),
-      array('&quot;', '"'),
-      array('&amp;quot;', '&quot;'),
-      array("'", "'"),
-      array('&#39;', "'"),
-      array('&amp;#39;', '&#39;'),
-      array('©', '©'),
-      array('&copy;', '©'),
-      array('&#169;', '©'),
-      array('→', '→'),
-      array('&#8594;', '→'),
-      array('➼', '➼'),
-      array('&#10172;', '➼'),
-      array('&euro;', '€'),
-    );
+    return [
+      ['Drupal', 'Drupal'],
+      ['<script>', '<script>'],
+      ['&lt;script&gt;', '<script>'],
+      ['&#60;script&#62;', '<script>'],
+      ['&amp;lt;script&amp;gt;', '&lt;script&gt;'],
+      ['"', '"'],
+      ['&#34;', '"'],
+      ['&amp;#34;', '&#34;'],
+      ['&quot;', '"'],
+      ['&amp;quot;', '&quot;'],
+      ["'", "'"],
+      ['&#39;', "'"],
+      ['&amp;#39;', '&#39;'],
+      ['©', '©'],
+      ['&copy;', '©'],
+      ['&#169;', '©'],
+      ['→', '→'],
+      ['&#8594;', '→'],
+      ['➼', '➼'],
+      ['&#10172;', '➼'],
+      ['&euro;', '€'],
+    ];
   }
 
   /**
@@ -272,21 +272,21 @@ class HtmlTest extends UnitTestCase {
    * @see testEscape()
    */
   public function providerEscape() {
-    return array(
-      array('Drupal', 'Drupal'),
-      array('&lt;script&gt;', '<script>'),
-      array('&amp;lt;script&amp;gt;', '&lt;script&gt;'),
-      array('&amp;#34;', '&#34;'),
-      array('&quot;', '"'),
-      array('&amp;quot;', '&quot;'),
-      array('&#039;', "'"),
-      array('&amp;#039;', '&#039;'),
-      array('©', '©'),
-      array('→', '→'),
-      array('➼', '➼'),
-      array('€', '€'),
-      array('Drup�al', "Drup\x80al"),
-    );
+    return [
+      ['Drupal', 'Drupal'],
+      ['&lt;script&gt;', '<script>'],
+      ['&amp;lt;script&amp;gt;', '&lt;script&gt;'],
+      ['&amp;#34;', '&#34;'],
+      ['&quot;', '"'],
+      ['&amp;quot;', '&quot;'],
+      ['&#039;', "'"],
+      ['&amp;#039;', '&#039;'],
+      ['©', '©'],
+      ['→', '→'],
+      ['➼', '➼'],
+      ['€', '€'],
+      ['Drup�al', "Drup\x80al"],
+    ];
   }
 
   /**
@@ -332,9 +332,9 @@ class HtmlTest extends UnitTestCase {
   /**
    * @covers ::transformRootRelativeUrlsToAbsolute
    * @dataProvider providerTestTransformRootRelativeUrlsToAbsoluteAssertion
-   * @expectedException \AssertionError
    */
   public function testTransformRootRelativeUrlsToAbsoluteAssertion($scheme_and_host) {
+    $this->setExpectedException(\AssertionError::class);
     Html::transformRootRelativeUrlsToAbsolute('', $scheme_and_host);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/ImageTest.php b/web/core/tests/Drupal/Tests/Component/Utility/ImageTest.php
index 7c3a5ac12..eec1375ea 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/ImageTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/ImageTest.php
@@ -44,113 +44,113 @@ class ImageTest extends UnitTestCase {
    */
   public function providerTestScaleDimensions() {
     // Define input / output datasets to test different branch conditions.
-    $tests = array();
+    $tests = [];
 
     // Test branch conditions:
     // - No height.
     // - Upscale, don't need to upscale.
-    $tests[] = array(
-      'input' => array(
-        'dimensions' => array(
+    $tests[] = [
+      'input' => [
+        'dimensions' => [
           'width' => 1000,
           'height' => 2000,
-        ),
+        ],
         'width' => 200,
         'height' => NULL,
         'upscale' => TRUE,
-      ),
-      'output' => array(
-        'dimensions' => array(
+      ],
+      'output' => [
+        'dimensions' => [
           'width' => 200,
           'height' => 400,
-        ),
+        ],
         'return_value' => TRUE,
-      ),
-    );
+      ],
+    ];
 
     // Test branch conditions:
     // - No width.
     // - Don't upscale, don't need to upscale.
-    $tests[] = array(
-      'input' => array(
-        'dimensions' => array(
+    $tests[] = [
+      'input' => [
+        'dimensions' => [
           'width' => 1000,
           'height' => 800,
-        ),
+        ],
         'width' => NULL,
         'height' => 140,
         'upscale' => FALSE,
-      ),
-      'output' => array(
-        'dimensions' => array(
+      ],
+      'output' => [
+        'dimensions' => [
           'width' => 175,
           'height' => 140,
-        ),
+        ],
         'return_value' => TRUE,
-      ),
-    );
+      ],
+    ];
 
     // Test branch conditions:
     // - Source aspect ratio greater than target.
     // - Upscale, need to upscale.
-    $tests[] = array(
-      'input' => array(
-        'dimensions' => array(
+    $tests[] = [
+      'input' => [
+        'dimensions' => [
           'width' => 8,
           'height' => 20,
-        ),
+        ],
         'width' => 200,
         'height' => 140,
         'upscale' => TRUE,
-      ),
-      'output' => array(
-        'dimensions' => array(
+      ],
+      'output' => [
+        'dimensions' => [
           'width' => 56,
           'height' => 140,
-        ),
+        ],
         'return_value' => TRUE,
-      ),
-    );
+      ],
+    ];
 
     // Test branch condition: target aspect ratio greater than source.
-    $tests[] = array(
-      'input' => array(
-        'dimensions' => array(
+    $tests[] = [
+      'input' => [
+        'dimensions' => [
           'width' => 2000,
           'height' => 800,
-        ),
+        ],
         'width' => 200,
         'height' => 140,
         'upscale' => FALSE,
-      ),
-      'output' => array(
-        'dimensions' => array(
+      ],
+      'output' => [
+        'dimensions' => [
           'width' => 200,
           'height' => 80,
-        ),
+        ],
         'return_value' => TRUE,
-      ),
-    );
+      ],
+    ];
 
     // Test branch condition: don't upscale, need to upscale.
-    $tests[] = array(
-      'input' => array(
-        'dimensions' => array(
+    $tests[] = [
+      'input' => [
+        'dimensions' => [
           'width' => 100,
           'height' => 50,
-        ),
+        ],
         'width' => 200,
         'height' => 140,
         'upscale' => FALSE,
-      ),
-      'output' => array(
-        'dimensions' => array(
+      ],
+      'output' => [
+        'dimensions' => [
           'width' => 100,
           'height' => 50,
-        ),
+        ],
         'return_value' => FALSE,
-      ),
-    );
+      ],
+    ];
 
     return $tests;
   }
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php b/web/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php
index 92db2ac8a..0371ebb35 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php
@@ -32,12 +32,12 @@ class NestedArrayTest extends UnitTestCase {
     parent::setUp();
 
     // Create a form structure with a nested element.
-    $this->form['details']['element'] = array(
+    $this->form['details']['element'] = [
      '#value' => 'Nested element',
-    );
+    ];
 
     // Set up parent array.
-    $this->parents = array('details', 'element');
+    $this->parents = ['details', 'element'];
   }
 
   /**
@@ -76,10 +76,10 @@ class NestedArrayTest extends UnitTestCase {
    * @covers ::setValue
    */
   public function testSetValue() {
-    $new_value = array(
+    $new_value = [
       '#value' => 'New value',
       '#required' => TRUE,
-    );
+    ];
 
     // Verify setting the value of a nested element.
     NestedArray::setValue($this->form, $this->parents, $new_value);
@@ -93,11 +93,11 @@ class NestedArrayTest extends UnitTestCase {
    * @covers ::setValue
    */
   public function testSetValueForce() {
-    $new_value = array(
+    $new_value = [
       'one',
-    );
+    ];
     $this->form['details']['non-array-parent'] = 'string';
-    $parents = array('details', 'non-array-parent', 'child');
+    $parents = ['details', 'non-array-parent', 'child'];
     NestedArray::setValue($this->form, $parents, $new_value, TRUE);
     $this->assertSame($new_value, $this->form['details']['non-array-parent']['child'], 'The nested element was not forced to the new value.');
   }
@@ -144,23 +144,23 @@ class NestedArrayTest extends UnitTestCase {
    * @covers ::mergeDeepArray
    */
   public function testMergeDeepArray() {
-    $link_options_1 = array(
+    $link_options_1 = [
       'fragment' => 'x',
-      'attributes' => array('title' => 'X', 'class' => array('a', 'b')),
+      'attributes' => ['title' => 'X', 'class' => ['a', 'b']],
       'language' => 'en',
-    );
-    $link_options_2 = array(
+    ];
+    $link_options_2 = [
       'fragment' => 'y',
-      'attributes' => array('title' => 'Y', 'class' => array('c', 'd')),
+      'attributes' => ['title' => 'Y', 'class' => ['c', 'd']],
       'absolute' => TRUE,
-    );
-    $expected = array(
+    ];
+    $expected = [
       'fragment' => 'y',
-      'attributes' => array('title' => 'Y', 'class' => array('a', 'b', 'c', 'd')),
+      'attributes' => ['title' => 'Y', 'class' => ['a', 'b', 'c', 'd']],
       'language' => 'en',
       'absolute' => TRUE,
-    );
-    $this->assertSame($expected, NestedArray::mergeDeepArray(array($link_options_1, $link_options_2)), 'NestedArray::mergeDeepArray() returned a properly merged array.');
+    ];
+    $this->assertSame($expected, NestedArray::mergeDeepArray([$link_options_1, $link_options_2]), 'NestedArray::mergeDeepArray() returned a properly merged array.');
     // Test wrapper function, NestedArray::mergeDeep().
     $this->assertSame($expected, NestedArray::mergeDeep($link_options_1, $link_options_2), 'NestedArray::mergeDeep() returned a properly merged array.');
   }
@@ -171,18 +171,18 @@ class NestedArrayTest extends UnitTestCase {
    * @covers ::mergeDeepArray
    */
   public function testMergeImplicitKeys() {
-    $a = array(
-      'subkey' => array('X', 'Y'),
-    );
-    $b = array(
-      'subkey' => array('X'),
-    );
+    $a = [
+      'subkey' => ['X', 'Y'],
+    ];
+    $b = [
+      'subkey' => ['X'],
+    ];
 
     // Drupal core behavior.
-    $expected = array(
-      'subkey' => array('X', 'Y', 'X'),
-    );
-    $actual = NestedArray::mergeDeepArray(array($a, $b));
+    $expected = [
+      'subkey' => ['X', 'Y', 'X'],
+    ];
+    $actual = NestedArray::mergeDeepArray([$a, $b]);
     $this->assertSame($expected, $actual, 'drupal_array_merge_deep() creates new numeric keys in the implicit sequence.');
   }
 
@@ -192,29 +192,29 @@ class NestedArrayTest extends UnitTestCase {
    * @covers ::mergeDeepArray
    */
   public function testMergeExplicitKeys() {
-    $a = array(
-      'subkey' => array(
+    $a = [
+      'subkey' => [
         0 => 'A',
         1 => 'B',
-      ),
-    );
-    $b = array(
-      'subkey' => array(
+      ],
+    ];
+    $b = [
+      'subkey' => [
         0 => 'C',
         1 => 'D',
-      ),
-    );
+      ],
+    ];
 
     // Drupal core behavior.
-    $expected = array(
-      'subkey' => array(
+    $expected = [
+      'subkey' => [
         0 => 'A',
         1 => 'B',
         2 => 'C',
         3 => 'D',
-      ),
-    );
-    $actual = NestedArray::mergeDeepArray(array($a, $b));
+      ],
+    ];
+    $actual = NestedArray::mergeDeepArray([$a, $b]);
     $this->assertSame($expected, $actual, 'drupal_array_merge_deep() creates new numeric keys in the explicit sequence.');
   }
 
@@ -228,29 +228,29 @@ class NestedArrayTest extends UnitTestCase {
    * @covers ::mergeDeepArray
    */
   public function testMergeOutOfSequenceKeys() {
-    $a = array(
-      'subkey' => array(
+    $a = [
+      'subkey' => [
         10 => 'A',
         30 => 'B',
-      ),
-    );
-    $b = array(
-      'subkey' => array(
+      ],
+    ];
+    $b = [
+      'subkey' => [
         20 => 'C',
         0 => 'D',
-      ),
-    );
+      ],
+    ];
 
     // Drupal core behavior.
-    $expected = array(
-      'subkey' => array(
+    $expected = [
+      'subkey' => [
         0 => 'A',
         1 => 'B',
         2 => 'C',
         3 => 'D',
-      ),
-    );
-    $actual = NestedArray::mergeDeepArray(array($a, $b));
+      ],
+    ];
+    $actual = NestedArray::mergeDeepArray([$a, $b]);
     $this->assertSame($expected, $actual, 'drupal_array_merge_deep() ignores numeric key order when merging.');
   }
 
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/NumberTest.php b/web/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
index 3e3262966..8d415de92 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
@@ -60,36 +60,36 @@ class NumberTest extends UnitTestCase {
    * @see \Drupal\Tests\Component\Utility\Number::testValidStep
    */
   public static function providerTestValidStep() {
-    return array(
+    return [
       // Value and step equal.
-      array(10.3, 10.3, TRUE),
+      [10.3, 10.3, TRUE],
 
       // Valid integer steps.
-      array(42, 21, TRUE),
-      array(42, 3, TRUE),
+      [42, 21, TRUE],
+      [42, 3, TRUE],
 
       // Valid float steps.
-      array(42, 10.5, TRUE),
-      array(1, 1 / 3, TRUE),
-      array(-100, 100 / 7, TRUE),
-      array(1000, -10, TRUE),
+      [42, 10.5, TRUE],
+      [1, 1 / 3, TRUE],
+      [-100, 100 / 7, TRUE],
+      [1000, -10, TRUE],
 
       // Valid and very small float steps.
-      array(1000.12345, 1e-10, TRUE),
-      array(3.9999999999999, 1e-13, TRUE),
+      [1000.12345, 1e-10, TRUE],
+      [3.9999999999999, 1e-13, TRUE],
 
       // Invalid integer steps.
-      array(100, 30, FALSE),
-      array(-10, 4, FALSE),
+      [100, 30, FALSE],
+      [-10, 4, FALSE],
 
       // Invalid float steps.
-      array(6, 5 / 7, FALSE),
-      array(10.3, 10.25, FALSE),
+      [6, 5 / 7, FALSE],
+      [10.3, 10.25, FALSE],
 
       // Step mismatches very close to being valid.
-      array(70 + 9e-7, 10 + 9e-7, FALSE),
-      array(1936.5, 3e-8, FALSE),
-    );
+      [70 + 9e-7, 10 + 9e-7, FALSE],
+      [1936.5, 3e-8, FALSE],
+    ];
   }
 
   /**
@@ -98,22 +98,22 @@ class NumberTest extends UnitTestCase {
    * @see \Drupal\Test\Component\Utility\NumberTest::testValidStepOffset()
    */
   public static function providerTestValidStepOffset() {
-    return array(
+    return [
       // Try obvious fits.
-      array(11.3, 10.3, 1, TRUE),
-      array(100, 10, 50, TRUE),
-      array(-100, 90 / 7, -10, TRUE),
-      array(2 / 7 + 5 / 9, 1 / 7, 5 / 9, TRUE),
+      [11.3, 10.3, 1, TRUE],
+      [100, 10, 50, TRUE],
+      [-100, 90 / 7, -10, TRUE],
+      [2 / 7 + 5 / 9, 1 / 7, 5 / 9, TRUE],
 
       // Ensure a small offset is still invalid.
-      array(10.3, 10.3, 0.0001, FALSE),
-      array(1 / 5, 1 / 7, 1 / 11, FALSE),
+      [10.3, 10.3, 0.0001, FALSE],
+      [1 / 5, 1 / 7, 1 / 11, FALSE],
 
       // Try negative values and offsets.
-      array(1000, 10, -5, FALSE),
-      array(-10, 4, 0, FALSE),
-      array(-10, 4, -4, FALSE),
-    );
+      [1000, 10, -5, FALSE],
+      [-10, 4, 0, FALSE],
+      [-10, 4, -4, FALSE],
+    ];
   }
 
   /**
@@ -144,15 +144,15 @@ class NumberTest extends UnitTestCase {
    *     - The alphadecimal value.
    */
   public function providerTestConversions() {
-    return array(
-      array(0, '00'),
-      array(1, '01'),
-      array(10, '0a'),
-      array(20, '0k'),
-      array(35, '0z'),
-      array(36, '110'),
-      array(100, '12s'),
-    );
+    return [
+      [0, '00'],
+      [1, '01'],
+      [10, '0a'],
+      [20, '0k'],
+      [35, '0z'],
+      [36, '110'],
+      [100, '12s'],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/RandomTest.php b/web/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
index b67758526..b122c3aff 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
@@ -29,7 +29,7 @@ class RandomTest extends UnitTestCase {
    * @covers ::string
    */
   public function testRandomStringUniqueness() {
-    $strings = array();
+    $strings = [];
     $random = new Random();
     for ($i = 0; $i <= 50; $i++) {
       $str = $random->string(1, TRUE);
@@ -44,7 +44,7 @@ class RandomTest extends UnitTestCase {
    * @covers ::name
    */
   public function testRandomNamesUniqueness() {
-    $names = array();
+    $names = [];
     $random = new Random();
     for ($i = 0; $i <= 10; $i++) {
       $str = $random->name(1, TRUE);
@@ -57,12 +57,12 @@ class RandomTest extends UnitTestCase {
    * Tests infinite loop prevention whilst generating random names.
    *
    * @covers ::name
-   * @expectedException \RuntimeException
    */
   public function testRandomNameException() {
     // There are fewer than 100 possibilities so an exception should occur to
     // prevent infinite loops.
     $random = new Random();
+    $this->setExpectedException(\RuntimeException::class);
     for ($i = 0; $i <= 100; $i++) {
       $str = $random->name(1, TRUE);
       $names[$str] = TRUE;
@@ -73,12 +73,12 @@ class RandomTest extends UnitTestCase {
    * Tests infinite loop prevention whilst generating random strings.
    *
    * @covers ::string
-   * @expectedException \RuntimeException
    */
   public function testRandomStringException() {
     // There are fewer than 100 possibilities so an exception should occur to
     // prevent infinite loops.
     $random = new Random();
+    $this->setExpectedException(\RuntimeException::class);
     for ($i = 0; $i <= 100; $i++) {
       $str = $random->string(1, TRUE);
       $names[$str] = TRUE;
@@ -138,7 +138,7 @@ class RandomTest extends UnitTestCase {
   public function testRandomStringValidator() {
     $random = new Random();
     $this->firstStringGenerated = '';
-    $str = $random->string(1, TRUE, array($this, '_RandomStringValidate'));
+    $str = $random->string(1, TRUE, [$this, '_RandomStringValidate']);
     $this->assertNotEquals($this->firstStringGenerated, $str);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php b/web/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php
index 0aa29a6b3..1f7394a05 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php
@@ -15,10 +15,9 @@ class RectangleTest extends UnitTestCase {
    * Tests wrong rectangle width.
    *
    * @covers ::rotate
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testWrongWidth() {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $rect = new Rectangle(-40, 20);
   }
 
@@ -26,10 +25,9 @@ class RectangleTest extends UnitTestCase {
    * Tests wrong rectangle height.
    *
    * @covers ::rotate
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testWrongHeight() {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $rect = new Rectangle(40, 0);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/web/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
index 8c1fdcec1..0a7fc77d8 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
@@ -56,7 +56,7 @@ class SafeMarkupTest extends UnitTestCase {
    * @param string $message
    *   The message to provide as output for the test.
    */
-  function testCheckPlain($text, $expected, $message) {
+  public function testCheckPlain($text, $expected, $message) {
     $result = SafeMarkup::checkPlain($text);
     $this->assertTrue($result instanceof HtmlEscapedText);
     $this->assertEquals($expected, $result, $message);
@@ -77,7 +77,7 @@ class SafeMarkupTest extends UnitTestCase {
    * @param string $message
    *   The message to provide as output for the test.
    */
-  function testHtmlEscapedText($text, $expected, $message) {
+  public function testHtmlEscapedText($text, $expected, $message) {
     $result = new HtmlEscapedText($text);
     $this->assertEquals($expected, $result, $message);
   }
@@ -87,17 +87,17 @@ class SafeMarkupTest extends UnitTestCase {
    *
    * @see testCheckPlain()
    */
-  function providerCheckPlain() {
+  public function providerCheckPlain() {
     // Checks that invalid multi-byte sequences are escaped.
-    $tests[] = array("Foo\xC0barbaz", 'Foo�barbaz', 'Escapes invalid sequence "Foo\xC0barbaz"');
-    $tests[] = array("\xc2\"", '�&quot;', 'Escapes invalid sequence "\xc2\""');
-    $tests[] = array("Fooÿñ", "Fooÿñ", 'Does not escape valid sequence "Fooÿñ"');
+    $tests[] = ["Foo\xC0barbaz", 'Foo�barbaz', 'Escapes invalid sequence "Foo\xC0barbaz"'];
+    $tests[] = ["\xc2\"", '�&quot;', 'Escapes invalid sequence "\xc2\""'];
+    $tests[] = ["Fooÿñ", "Fooÿñ", 'Does not escape valid sequence "Fooÿñ"'];
 
     // Checks that special characters are escaped.
-    $tests[] = array(SafeMarkupTestMarkup::create("<script>"), '&lt;script&gt;', 'Escapes &lt;script&gt; even inside an object that implements MarkupInterface.');
-    $tests[] = array("<script>", '&lt;script&gt;', 'Escapes &lt;script&gt;');
-    $tests[] = array('<>&"\'', '&lt;&gt;&amp;&quot;&#039;', 'Escapes reserved HTML characters.');
-    $tests[] = array(SafeMarkupTestMarkup::create('<>&"\''), '&lt;&gt;&amp;&quot;&#039;', 'Escapes reserved HTML characters even inside an object that implements MarkupInterface.');
+    $tests[] = [SafeMarkupTestMarkup::create("<script>"), '&lt;script&gt;', 'Escapes &lt;script&gt; even inside an object that implements MarkupInterface.'];
+    $tests[] = ["<script>", '&lt;script&gt;', 'Escapes &lt;script&gt;'];
+    $tests[] = ['<>&"\'', '&lt;&gt;&amp;&quot;&#039;', 'Escapes reserved HTML characters.'];
+    $tests[] = [SafeMarkupTestMarkup::create('<>&"\''), '&lt;&gt;&amp;&quot;&#039;', 'Escapes reserved HTML characters even inside an object that implements MarkupInterface.'];
 
     return $tests;
   }
@@ -136,12 +136,12 @@ class SafeMarkupTest extends UnitTestCase {
    *
    * @see testFormat()
    */
-  function providerFormat() {
-    $tests[] = array('Simple text', array(), 'Simple text', 'SafeMarkup::format leaves simple text alone.', TRUE);
-    $tests[] = array('Escaped text: @value', array('@value' => '<script>'), 'Escaped text: &lt;script&gt;', 'SafeMarkup::format replaces and escapes string.', TRUE);
-    $tests[] = array('Escaped text: @value', array('@value' => SafeMarkupTestMarkup::create('<span>Safe HTML</span>')), 'Escaped text: <span>Safe HTML</span>', 'SafeMarkup::format does not escape an already safe string.', TRUE);
-    $tests[] = array('Placeholder text: %value', array('%value' => '<script>'), 'Placeholder text: <em class="placeholder">&lt;script&gt;</em>', 'SafeMarkup::format replaces, escapes and themes string.', TRUE);
-    $tests[] = array('Placeholder text: %value', array('%value' => SafeMarkupTestMarkup::create('<span>Safe HTML</span>')), 'Placeholder text: <em class="placeholder"><span>Safe HTML</span></em>', 'SafeMarkup::format does not escape an already safe string themed as a placeholder.', TRUE);
+  public function providerFormat() {
+    $tests[] = ['Simple text', [], 'Simple text', 'SafeMarkup::format leaves simple text alone.', TRUE];
+    $tests[] = ['Escaped text: @value', ['@value' => '<script>'], 'Escaped text: &lt;script&gt;', 'SafeMarkup::format replaces and escapes string.', TRUE];
+    $tests[] = ['Escaped text: @value', ['@value' => SafeMarkupTestMarkup::create('<span>Safe HTML</span>')], 'Escaped text: <span>Safe HTML</span>', 'SafeMarkup::format does not escape an already safe string.', TRUE];
+    $tests[] = ['Placeholder text: %value', ['%value' => '<script>'], 'Placeholder text: <em class="placeholder">&lt;script&gt;</em>', 'SafeMarkup::format replaces, escapes and themes string.', TRUE];
+    $tests[] = ['Placeholder text: %value', ['%value' => SafeMarkupTestMarkup::create('<span>Safe HTML</span>')], 'Placeholder text: <em class="placeholder"><span>Safe HTML</span></em>', 'SafeMarkup::format does not escape an already safe string themed as a placeholder.', TRUE];
 
     $tests['javascript-protocol-url'] = ['Simple text <a href=":url">giraffe</a>', [':url' => 'javascript://example.com?foo&bar'], 'Simple text <a href="//example.com?foo&amp;bar">giraffe</a>', 'Support for filtering bad protocols', TRUE];
     $tests['external-url'] = ['Simple text <a href=":url">giraffe</a>', [':url' => 'http://example.com?foo&bar'], 'Simple text <a href="http://example.com?foo&amp;bar">giraffe</a>', 'Support for filtering bad protocols', TRUE];
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php b/web/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php
index 3ff7ed1cf..890d17171 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php
@@ -43,49 +43,49 @@ class SortArrayTest extends UnitTestCase {
    * @see \Drupal\Tests\Component\Utility\SortArrayTest::testSortByWeightElement()
    */
   public function providerSortByWeightElement() {
-    $tests = array();
+    $tests = [];
 
     // Weights set and equal.
-    $tests[] = array(
-      array('weight' => 1),
-      array('weight' => 1),
+    $tests[] = [
+      ['weight' => 1],
+      ['weight' => 1],
       0
-    );
+    ];
 
     // Weights set and $a is less (lighter) than $b.
-    $tests[] = array(
-      array('weight' => 1),
-      array('weight' => 2),
+    $tests[] = [
+      ['weight' => 1],
+      ['weight' => 2],
       -1
-    );
+    ];
 
     // Weights set and $a is greater (heavier) than $b.
-    $tests[] = array(
-      array('weight' => 2),
-      array('weight' => 1),
+    $tests[] = [
+      ['weight' => 2],
+      ['weight' => 1],
       1
-    );
+    ];
 
     // Weights not set.
-    $tests[] = array(
-      array(),
-      array(),
+    $tests[] = [
+      [],
+      [],
       0
-    );
+    ];
 
     // Weights for $b not set.
-    $tests[] = array(
-      array('weight' => 1),
-      array(),
+    $tests[] = [
+      ['weight' => 1],
+      [],
       1
-    );
+    ];
 
     // Weights for $a not set.
-    $tests[] = array(
-      array(),
-      array('weight' => 1),
+    $tests[] = [
+      [],
+      ['weight' => 1],
       -1
-    );
+    ];
 
     return $tests;
   }
@@ -119,49 +119,49 @@ class SortArrayTest extends UnitTestCase {
    * @see \Drupal\Tests\Component\Utility\SortArrayTest::testSortByWeightProperty()
    */
   public function providerSortByWeightProperty() {
-    $tests = array();
+    $tests = [];
 
     // Weights set and equal.
-    $tests[] = array(
-      array('#weight' => 1),
-      array('#weight' => 1),
+    $tests[] = [
+      ['#weight' => 1],
+      ['#weight' => 1],
       0
-    );
+    ];
 
     // Weights set and $a is less (lighter) than $b.
-    $tests[] = array(
-      array('#weight' => 1),
-      array('#weight' => 2),
+    $tests[] = [
+      ['#weight' => 1],
+      ['#weight' => 2],
       -1
-    );
+    ];
 
     // Weights set and $a is greater (heavier) than $b.
-    $tests[] = array(
-      array('#weight' => 2),
-      array('#weight' => 1),
+    $tests[] = [
+      ['#weight' => 2],
+      ['#weight' => 1],
       1
-    );
+    ];
 
     // Weights not set.
-    $tests[] = array(
-      array(),
-      array(),
+    $tests[] = [
+      [],
+      [],
       0
-    );
+    ];
 
     // Weights for $b not set.
-    $tests[] = array(
-      array('#weight' => 1),
-      array(),
+    $tests[] = [
+      ['#weight' => 1],
+      [],
       1
-    );
+    ];
 
     // Weights for $a not set.
-    $tests[] = array(
-      array(),
-      array('#weight' => 1),
+    $tests[] = [
+      [],
+      ['#weight' => 1],
       -1
-    );
+    ];
 
     return $tests;
   }
@@ -195,42 +195,42 @@ class SortArrayTest extends UnitTestCase {
    * @see \Drupal\Tests\Component\Utility\SortArrayTest::testSortByTitleElement()
    */
   public function providerSortByTitleElement() {
-    $tests = array();
+    $tests = [];
 
     // Titles set and equal.
-    $tests[] = array(
-      array('title' => 'test'),
-      array('title' => 'test'),
+    $tests[] = [
+      ['title' => 'test'],
+      ['title' => 'test'],
       0
-    );
+    ];
 
     // Title $a not set.
-    $tests[] = array(
-      array(),
-      array('title' => 'test'),
+    $tests[] = [
+      [],
+      ['title' => 'test'],
       -4
-    );
+    ];
 
     // Title $b not set.
-    $tests[] = array(
-      array('title' => 'test'),
-      array(),
+    $tests[] = [
+      ['title' => 'test'],
+      [],
       4
-    );
+    ];
 
     // Titles set but not equal.
-    $tests[] = array(
-      array('title' => 'test'),
-      array('title' => 'testing'),
+    $tests[] = [
+      ['title' => 'test'],
+      ['title' => 'testing'],
       -1
-    );
+    ];
 
     // Titles set but not equal.
-    $tests[] = array(
-      array('title' => 'testing'),
-      array('title' => 'test'),
+    $tests[] = [
+      ['title' => 'testing'],
+      ['title' => 'test'],
       1
-    );
+    ];
 
     return $tests;
   }
@@ -264,42 +264,42 @@ class SortArrayTest extends UnitTestCase {
    * @see \Drupal\Tests\Component\Utility\SortArrayTest::testSortByTitleProperty()
    */
   public function providerSortByTitleProperty() {
-    $tests = array();
+    $tests = [];
 
     // Titles set and equal.
-    $tests[] = array(
-      array('#title' => 'test'),
-      array('#title' => 'test'),
+    $tests[] = [
+      ['#title' => 'test'],
+      ['#title' => 'test'],
       0
-    );
+    ];
 
     // Title $a not set.
-    $tests[] = array(
-      array(),
-      array('#title' => 'test'),
+    $tests[] = [
+      [],
+      ['#title' => 'test'],
       -4
-    );
+    ];
 
     // Title $b not set.
-    $tests[] = array(
-      array('#title' => 'test'),
-      array(),
+    $tests[] = [
+      ['#title' => 'test'],
+      [],
       4
-    );
+    ];
 
     // Titles set but not equal.
-    $tests[] = array(
-      array('#title' => 'test'),
-      array('#title' => 'testing'),
+    $tests[] = [
+      ['#title' => 'test'],
+      ['#title' => 'testing'],
       -1
-    );
+    ];
 
     // Titles set but not equal.
-    $tests[] = array(
-      array('#title' => 'testing'),
-      array('#title' => 'test'),
+    $tests[] = [
+      ['#title' => 'testing'],
+      ['#title' => 'test'],
       1
-    );
+    ];
 
     return $tests;
   }
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php b/web/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
index 39759b51c..b834d2bbe 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
@@ -51,15 +51,15 @@ class UnicodeTest extends UnitTestCase {
    *     - (optional) Boolean indicating invalid status. Defaults to FALSE.
    */
   public function providerTestStatus() {
-    return array(
-      array(Unicode::STATUS_SINGLEBYTE, Unicode::STATUS_SINGLEBYTE),
-      array(rand(10, 100), Unicode::STATUS_SINGLEBYTE, TRUE),
-      array(rand(10, 100), Unicode::STATUS_SINGLEBYTE, TRUE),
-      array(Unicode::STATUS_MULTIBYTE, Unicode::STATUS_MULTIBYTE),
-      array(rand(10, 100), Unicode::STATUS_MULTIBYTE, TRUE),
-      array(Unicode::STATUS_ERROR, Unicode::STATUS_ERROR),
-      array(Unicode::STATUS_MULTIBYTE, Unicode::STATUS_MULTIBYTE),
-    );
+    return [
+      [Unicode::STATUS_SINGLEBYTE, Unicode::STATUS_SINGLEBYTE],
+      [rand(10, 100), Unicode::STATUS_SINGLEBYTE, TRUE],
+      [rand(10, 100), Unicode::STATUS_SINGLEBYTE, TRUE],
+      [Unicode::STATUS_MULTIBYTE, Unicode::STATUS_MULTIBYTE],
+      [rand(10, 100), Unicode::STATUS_MULTIBYTE, TRUE],
+      [Unicode::STATUS_ERROR, Unicode::STATUS_ERROR],
+      [Unicode::STATUS_MULTIBYTE, Unicode::STATUS_MULTIBYTE],
+    ];
   }
 
   /**
@@ -83,11 +83,11 @@ class UnicodeTest extends UnitTestCase {
    *   An array containing a string and its encoded value.
    */
   public function providerTestMimeHeader() {
-    return array(
-      array('tést.txt', '=?UTF-8?B?dMOpc3QudHh0?='),
+    return [
+      ['tést.txt', '=?UTF-8?B?dMOpc3QudHh0?='],
       // Simple ASCII characters.
-      array('ASCII', 'ASCII'),
-    );
+      ['ASCII', 'ASCII'],
+    ];
   }
 
   /**
@@ -113,17 +113,17 @@ class UnicodeTest extends UnitTestCase {
    *   be processed as multibyte.
    */
   public function providerStrtolower() {
-    $cases = array(
-      array('tHe QUIcK bRoWn', 'the quick brown'),
-      array('FrançAIS is ÜBER-åwesome', 'français is über-åwesome'),
-    );
+    $cases = [
+      ['tHe QUIcK bRoWn', 'the quick brown'],
+      ['FrançAIS is ÜBER-åwesome', 'français is über-åwesome'],
+    ];
     foreach ($cases as $case) {
       // Test the same string both in multibyte and singlebyte conditions.
       array_push($case, TRUE);
       $cases[] = $case;
     }
     // Add a multibyte string.
-    $cases[] = array('ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ', 'αβγδεζηθικλμνξοσὠ', TRUE);
+    $cases[] = ['ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ', 'αβγδεζηθικλμνξοσὠ', TRUE];
     return $cases;
   }
 
@@ -150,17 +150,17 @@ class UnicodeTest extends UnitTestCase {
    *   be processed as multibyte.
    */
   public function providerStrtoupper() {
-    $cases = array(
-      array('tHe QUIcK bRoWn', 'THE QUICK BROWN'),
-      array('FrançAIS is ÜBER-åwesome', 'FRANÇAIS IS ÜBER-ÅWESOME'),
-    );
+    $cases = [
+      ['tHe QUIcK bRoWn', 'THE QUICK BROWN'],
+      ['FrançAIS is ÜBER-åwesome', 'FRANÇAIS IS ÜBER-ÅWESOME'],
+    ];
     foreach ($cases as $case) {
       // Test the same string both in multibyte and singlebyte conditions.
       array_push($case, TRUE);
       $cases[] = $case;
     }
     // Add a multibyte string.
-    $cases[] = array('αβγδεζηθικλμνξοσὠ', 'ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ', TRUE);
+    $cases[] = ['αβγδεζηθικλμνξοσὠ', 'ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ', TRUE];
     return $cases;
   }
 
@@ -183,14 +183,14 @@ class UnicodeTest extends UnitTestCase {
    *   An array containing a string and its uppercase first version.
    */
   public function providerUcfirst() {
-    return array(
-      array('tHe QUIcK bRoWn', 'THe QUIcK bRoWn'),
-      array('françAIS', 'FrançAIS'),
-      array('über', 'Über'),
-      array('åwesome', 'Åwesome'),
+    return [
+      ['tHe QUIcK bRoWn', 'THe QUIcK bRoWn'],
+      ['françAIS', 'FrançAIS'],
+      ['über', 'Über'],
+      ['åwesome', 'Åwesome'],
       // A multibyte string.
-      array('σion', 'Σion'),
-    );
+      ['σion', 'Σion'],
+    ];
   }
 
   /**
@@ -215,14 +215,14 @@ class UnicodeTest extends UnitTestCase {
    *   be processed as multibyte.
    */
   public function providerLcfirst() {
-    return array(
-      array('tHe QUIcK bRoWn', 'tHe QUIcK bRoWn'),
-      array('FrançAIS is ÜBER-åwesome', 'françAIS is ÜBER-åwesome'),
-      array('Über', 'über'),
-      array('Åwesome', 'åwesome'),
+    return [
+      ['tHe QUIcK bRoWn', 'tHe QUIcK bRoWn'],
+      ['FrançAIS is ÜBER-åwesome', 'françAIS is ÜBER-åwesome'],
+      ['Über', 'über'],
+      ['Åwesome', 'åwesome'],
       // Add a multibyte string.
-      array('ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ', 'αΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ', TRUE),
-    );
+      ['ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ', 'αΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ', TRUE],
+    ];
   }
 
   /**
@@ -247,16 +247,16 @@ class UnicodeTest extends UnitTestCase {
    *   be processed as multibyte.
    */
   public function providerUcwords() {
-    return array(
-      array('tHe QUIcK bRoWn', 'THe QUIcK BRoWn'),
-      array('françAIS', 'FrançAIS'),
-      array('über', 'Über'),
-      array('åwesome', 'Åwesome'),
+    return [
+      ['tHe QUIcK bRoWn', 'THe QUIcK BRoWn'],
+      ['françAIS', 'FrançAIS'],
+      ['über', 'Über'],
+      ['åwesome', 'Åwesome'],
       // Make sure we don't mangle extra spaces.
-      array('frànçAIS is  über-åwesome', 'FrànçAIS Is  Über-Åwesome'),
+      ['frànçAIS is  über-åwesome', 'FrànçAIS Is  Über-Åwesome'],
       // Add a multibyte string.
-      array('σion', 'Σion', TRUE),
-    );
+      ['σion', 'Σion', TRUE],
+    ];
   }
 
   /**
@@ -283,11 +283,11 @@ class UnicodeTest extends UnitTestCase {
    *   An array containing a string and its length.
    */
   public function providerStrlen() {
-    return array(
-      array('tHe QUIcK bRoWn', 15),
-      array('ÜBER-åwesome', 12),
-      array('以呂波耳・ほへとち。リヌルヲ。', 15),
-    );
+    return [
+      ['tHe QUIcK bRoWn', 15],
+      ['ÜBER-åwesome', 12],
+      ['以呂波耳・ほへとち。リヌルヲ。', 15],
+    ];
   }
 
   /**
@@ -318,33 +318,33 @@ class UnicodeTest extends UnitTestCase {
    *     - The expected string result.
    */
   public function providerSubstr() {
-    return array(
-      array('frànçAIS is über-åwesome', 0, NULL, 'frànçAIS is über-åwesome'),
-      array('frànçAIS is über-åwesome', 0, 0, ''),
-      array('frànçAIS is über-åwesome', 0, 1, 'f'),
-      array('frànçAIS is über-åwesome', 0, 8, 'frànçAIS'),
-      array('frànçAIS is über-åwesome', 0, 23, 'frànçAIS is über-åwesom'),
-      array('frànçAIS is über-åwesome', 0, 24, 'frànçAIS is über-åwesome'),
-      array('frànçAIS is über-åwesome', 0, 25, 'frànçAIS is über-åwesome'),
-      array('frànçAIS is über-åwesome', 0, 100, 'frànçAIS is über-åwesome'),
-      array('frànçAIS is über-åwesome', 4, 4, 'çAIS'),
-      array('frànçAIS is über-åwesome', 1, 0, ''),
-      array('frànçAIS is über-åwesome', 100, 0, ''),
-      array('frànçAIS is über-åwesome', -4, 2, 'so'),
-      array('frànçAIS is über-åwesome', -4, 3, 'som'),
-      array('frànçAIS is über-åwesome', -4, 4, 'some'),
-      array('frànçAIS is über-åwesome', -4, 5, 'some'),
-      array('frànçAIS is über-åwesome', -7, 10, 'åwesome'),
-      array('frànçAIS is über-åwesome', 5, -10, 'AIS is üb'),
-      array('frànçAIS is über-åwesome', 0, -10, 'frànçAIS is üb'),
-      array('frànçAIS is über-åwesome', 0, -1, 'frànçAIS is über-åwesom'),
-      array('frànçAIS is über-åwesome', -7, -2, 'åweso'),
-      array('frànçAIS is über-åwesome', -7, -6, 'å'),
-      array('frànçAIS is über-åwesome', -7, -7, ''),
-      array('frànçAIS is über-åwesome', -7, -8, ''),
-      array('...', 0, 2, '..'),
-      array('以呂波耳・ほへとち。リヌルヲ。', 1, 3, '呂波耳'),
-    );
+    return [
+      ['frànçAIS is über-åwesome', 0, NULL, 'frànçAIS is über-åwesome'],
+      ['frànçAIS is über-åwesome', 0, 0, ''],
+      ['frànçAIS is über-åwesome', 0, 1, 'f'],
+      ['frànçAIS is über-åwesome', 0, 8, 'frànçAIS'],
+      ['frànçAIS is über-åwesome', 0, 23, 'frànçAIS is über-åwesom'],
+      ['frànçAIS is über-åwesome', 0, 24, 'frànçAIS is über-åwesome'],
+      ['frànçAIS is über-åwesome', 0, 25, 'frànçAIS is über-åwesome'],
+      ['frànçAIS is über-åwesome', 0, 100, 'frànçAIS is über-åwesome'],
+      ['frànçAIS is über-åwesome', 4, 4, 'çAIS'],
+      ['frànçAIS is über-åwesome', 1, 0, ''],
+      ['frànçAIS is über-åwesome', 100, 0, ''],
+      ['frànçAIS is über-åwesome', -4, 2, 'so'],
+      ['frànçAIS is über-åwesome', -4, 3, 'som'],
+      ['frànçAIS is über-åwesome', -4, 4, 'some'],
+      ['frànçAIS is über-åwesome', -4, 5, 'some'],
+      ['frànçAIS is über-åwesome', -7, 10, 'åwesome'],
+      ['frànçAIS is über-åwesome', 5, -10, 'AIS is üb'],
+      ['frànçAIS is über-åwesome', 0, -10, 'frànçAIS is üb'],
+      ['frànçAIS is über-åwesome', 0, -1, 'frànçAIS is über-åwesom'],
+      ['frànçAIS is über-åwesome', -7, -2, 'åweso'],
+      ['frànçAIS is über-åwesome', -7, -6, 'å'],
+      ['frànçAIS is über-åwesome', -7, -7, ''],
+      ['frànçAIS is über-åwesome', -7, -8, ''],
+      ['...', 0, 2, '..'],
+      ['以呂波耳・ほへとち。リヌルヲ。', 1, 3, '呂波耳'],
+    ];
   }
 
   /**
@@ -371,52 +371,52 @@ class UnicodeTest extends UnitTestCase {
    *     - (optional) Boolean for the $add_ellipsis flag. Defaults to FALSE.
    */
   public function providerTruncate() {
-    return array(
-      array('frànçAIS is über-åwesome', 24, 'frànçAIS is über-åwesome'),
-      array('frànçAIS is über-åwesome', 23, 'frànçAIS is über-åwesom'),
-      array('frànçAIS is über-åwesome', 17, 'frànçAIS is über-'),
-      array('以呂波耳・ほへとち。リヌルヲ。', 6, '以呂波耳・ほ'),
-      array('frànçAIS is über-åwesome', 24, 'frànçAIS is über-åwesome', FALSE, TRUE),
-      array('frànçAIS is über-åwesome', 23, 'frànçAIS is über-åweso…', FALSE, TRUE),
-      array('frànçAIS is über-åwesome', 17, 'frànçAIS is über…', FALSE, TRUE),
-      array('123', 1, '…', TRUE, TRUE),
-      array('123', 2, '1…', TRUE, TRUE),
-      array('123', 3, '123', TRUE, TRUE),
-      array('1234', 3, '12…', TRUE, TRUE),
-      array('1234567890', 10, '1234567890', TRUE, TRUE),
-      array('12345678901', 10, '123456789…', TRUE, TRUE),
-      array('12345678901', 11, '12345678901', TRUE, TRUE),
-      array('123456789012', 11, '1234567890…', TRUE, TRUE),
-      array('12345 7890', 10, '12345 7890', TRUE, TRUE),
-      array('12345 7890', 9, '12345…', TRUE, TRUE),
-      array('123 567 90', 10, '123 567 90', TRUE, TRUE),
-      array('123 567 901', 10, '123 567…', TRUE, TRUE),
-      array('Stop. Hammertime.', 17, 'Stop. Hammertime.', TRUE, TRUE),
-      array('Stop. Hammertime.', 16, 'Stop…', TRUE, TRUE),
-      array('frànçAIS is über-åwesome', 24, 'frànçAIS is über-åwesome', TRUE, TRUE),
-      array('frànçAIS is über-åwesome', 23, 'frànçAIS is über…', TRUE, TRUE),
-      array('frànçAIS is über-åwesome', 17, 'frànçAIS is über…', TRUE, TRUE),
-      array('¿Dónde está el niño?', 20, '¿Dónde está el niño?', TRUE, TRUE),
-      array('¿Dónde está el niño?', 19, '¿Dónde está el…', TRUE, TRUE),
-      array('¿Dónde está el niño?', 13, '¿Dónde está…', TRUE, TRUE),
-      array('¿Dónde está el niño?', 10, '¿Dónde…', TRUE, TRUE),
-      array('Help! Help! Help!', 17, 'Help! Help! Help!', TRUE, TRUE),
-      array('Help! Help! Help!', 16, 'Help! Help!…', TRUE, TRUE),
-      array('Help! Help! Help!', 15, 'Help! Help!…', TRUE, TRUE),
-      array('Help! Help! Help!', 14, 'Help! Help!…', TRUE, TRUE),
-      array('Help! Help! Help!', 13, 'Help! Help!…', TRUE, TRUE),
-      array('Help! Help! Help!', 12, 'Help! Help!…', TRUE, TRUE),
-      array('Help! Help! Help!', 11, 'Help! Help…', TRUE, TRUE),
-      array('Help! Help! Help!', 10, 'Help!…', TRUE, TRUE),
-      array('Help! Help! Help!', 9, 'Help!…', TRUE, TRUE),
-      array('Help! Help! Help!', 8, 'Help!…', TRUE, TRUE),
-      array('Help! Help! Help!', 7, 'Help!…', TRUE, TRUE),
-      array('Help! Help! Help!', 6, 'Help!…', TRUE, TRUE),
-      array('Help! Help! Help!', 5, 'Help…', TRUE, TRUE),
-      array('Help! Help! Help!', 4, 'Hel…', TRUE, TRUE),
-      array('Help! Help! Help!', 3, 'He…', TRUE, TRUE),
-      array('Help! Help! Help!', 2, 'H…', TRUE, TRUE),
-    );
+    return [
+      ['frànçAIS is über-åwesome', 24, 'frànçAIS is über-åwesome'],
+      ['frànçAIS is über-åwesome', 23, 'frànçAIS is über-åwesom'],
+      ['frànçAIS is über-åwesome', 17, 'frànçAIS is über-'],
+      ['以呂波耳・ほへとち。リヌルヲ。', 6, '以呂波耳・ほ'],
+      ['frànçAIS is über-åwesome', 24, 'frànçAIS is über-åwesome', FALSE, TRUE],
+      ['frànçAIS is über-åwesome', 23, 'frànçAIS is über-åweso…', FALSE, TRUE],
+      ['frànçAIS is über-åwesome', 17, 'frànçAIS is über…', FALSE, TRUE],
+      ['123', 1, '…', TRUE, TRUE],
+      ['123', 2, '1…', TRUE, TRUE],
+      ['123', 3, '123', TRUE, TRUE],
+      ['1234', 3, '12…', TRUE, TRUE],
+      ['1234567890', 10, '1234567890', TRUE, TRUE],
+      ['12345678901', 10, '123456789…', TRUE, TRUE],
+      ['12345678901', 11, '12345678901', TRUE, TRUE],
+      ['123456789012', 11, '1234567890…', TRUE, TRUE],
+      ['12345 7890', 10, '12345 7890', TRUE, TRUE],
+      ['12345 7890', 9, '12345…', TRUE, TRUE],
+      ['123 567 90', 10, '123 567 90', TRUE, TRUE],
+      ['123 567 901', 10, '123 567…', TRUE, TRUE],
+      ['Stop. Hammertime.', 17, 'Stop. Hammertime.', TRUE, TRUE],
+      ['Stop. Hammertime.', 16, 'Stop…', TRUE, TRUE],
+      ['frànçAIS is über-åwesome', 24, 'frànçAIS is über-åwesome', TRUE, TRUE],
+      ['frànçAIS is über-åwesome', 23, 'frànçAIS is über…', TRUE, TRUE],
+      ['frànçAIS is über-åwesome', 17, 'frànçAIS is über…', TRUE, TRUE],
+      ['¿Dónde está el niño?', 20, '¿Dónde está el niño?', TRUE, TRUE],
+      ['¿Dónde está el niño?', 19, '¿Dónde está el…', TRUE, TRUE],
+      ['¿Dónde está el niño?', 13, '¿Dónde está…', TRUE, TRUE],
+      ['¿Dónde está el niño?', 10, '¿Dónde…', TRUE, TRUE],
+      ['Help! Help! Help!', 17, 'Help! Help! Help!', TRUE, TRUE],
+      ['Help! Help! Help!', 16, 'Help! Help!…', TRUE, TRUE],
+      ['Help! Help! Help!', 15, 'Help! Help!…', TRUE, TRUE],
+      ['Help! Help! Help!', 14, 'Help! Help!…', TRUE, TRUE],
+      ['Help! Help! Help!', 13, 'Help! Help!…', TRUE, TRUE],
+      ['Help! Help! Help!', 12, 'Help! Help!…', TRUE, TRUE],
+      ['Help! Help! Help!', 11, 'Help! Help…', TRUE, TRUE],
+      ['Help! Help! Help!', 10, 'Help!…', TRUE, TRUE],
+      ['Help! Help! Help!', 9, 'Help!…', TRUE, TRUE],
+      ['Help! Help! Help!', 8, 'Help!…', TRUE, TRUE],
+      ['Help! Help! Help!', 7, 'Help!…', TRUE, TRUE],
+      ['Help! Help! Help!', 6, 'Help!…', TRUE, TRUE],
+      ['Help! Help! Help!', 5, 'Help…', TRUE, TRUE],
+      ['Help! Help! Help!', 4, 'Hel…', TRUE, TRUE],
+      ['Help! Help! Help!', 3, 'He…', TRUE, TRUE],
+      ['Help! Help! Help!', 2, 'H…', TRUE, TRUE],
+    ];
   }
 
   /**
@@ -444,14 +444,14 @@ class UnicodeTest extends UnitTestCase {
    *   self::testTruncateBytes().
    */
   public function providerTestTruncateBytes() {
-    return array(
+    return [
       // String shorter than max length.
-      array('Short string', 42, 'Short string'),
+      ['Short string', 42, 'Short string'],
       // Simple string longer than max length.
-      array('Longer string than previous.', 10, 'Longer str'),
+      ['Longer string than previous.', 10, 'Longer str'],
       // Unicode.
-      array('以呂波耳・ほへとち。リヌルヲ。', 10, '以呂波'),
-    );
+      ['以呂波耳・ほへとち。リヌルヲ。', 10, '以呂波'],
+    ];
   }
 
   /**
@@ -481,16 +481,16 @@ class UnicodeTest extends UnitTestCase {
    *   self::testValidateUtf8().
    */
   public function providerTestValidateUtf8() {
-    return array(
+    return [
       // Empty string.
-      array('', TRUE, 'An empty string did not validate.'),
+      ['', TRUE, 'An empty string did not validate.'],
       // Simple text string.
-      array('Simple text.', TRUE, 'A simple ASCII text string did not validate.'),
+      ['Simple text.', TRUE, 'A simple ASCII text string did not validate.'],
       // Invalid UTF-8, overlong 5 byte encoding.
-      array(chr(0xF8) . chr(0x80) . chr(0x80) . chr(0x80) . chr(0x80), FALSE, 'Invalid UTF-8 was validated.'),
+      [chr(0xF8) . chr(0x80) . chr(0x80) . chr(0x80) . chr(0x80), FALSE, 'Invalid UTF-8 was validated.'],
       // High code-point without trailing characters.
-      array(chr(0xD0) . chr(0x01), FALSE, 'Invalid UTF-8 was validated.'),
-    );
+      [chr(0xD0) . chr(0x01), FALSE, 'Invalid UTF-8 was validated.'],
+    ];
   }
 
   /**
@@ -518,11 +518,11 @@ class UnicodeTest extends UnitTestCase {
    *   self::testConvertUtf8().  }
    */
   public function providerTestConvertToUtf8() {
-    return array(
-      array(chr(0x97), 'Windows-1252', '—'),
-      array(chr(0x99), 'Windows-1252', '™'),
-      array(chr(0x80), 'Windows-1252', '€'),
-    );
+    return [
+      [chr(0x97), 'Windows-1252', '—'],
+      [chr(0x99), 'Windows-1252', '™'],
+      [chr(0x80), 'Windows-1252', '€'],
+    ];
   }
 
   /**
@@ -553,18 +553,18 @@ class UnicodeTest extends UnitTestCase {
    *     - The expected integer/FALSE result.
    */
   public function providerStrpos() {
-    return array(
-      array('frànçAIS is über-åwesome', 'frànçAIS is über-åwesome', 0, 0),
-      array('frànçAIS is über-åwesome', 'rànçAIS is über-åwesome', 0, 1),
-      array('frànçAIS is über-åwesome', 'not in string', 0, FALSE),
-      array('frànçAIS is über-åwesome', 'r', 0, 1),
-      array('frànçAIS is über-åwesome', 'nçAIS', 0, 3),
-      array('frànçAIS is über-åwesome', 'nçAIS', 2, 3),
-      array('frànçAIS is über-åwesome', 'nçAIS', 3, 3),
-      array('以呂波耳・ほへとち。リヌルヲ。', '波耳', 0, 2),
-      array('以呂波耳・ほへとち。リヌルヲ。', '波耳', 1, 2),
-      array('以呂波耳・ほへとち。リヌルヲ。', '波耳', 2, 2),
-    );
+    return [
+      ['frànçAIS is über-åwesome', 'frànçAIS is über-åwesome', 0, 0],
+      ['frànçAIS is über-åwesome', 'rànçAIS is über-åwesome', 0, 1],
+      ['frànçAIS is über-åwesome', 'not in string', 0, FALSE],
+      ['frànçAIS is über-åwesome', 'r', 0, 1],
+      ['frànçAIS is über-åwesome', 'nçAIS', 0, 3],
+      ['frànçAIS is über-åwesome', 'nçAIS', 2, 3],
+      ['frànçAIS is über-åwesome', 'nçAIS', 3, 3],
+      ['以呂波耳・ほへとち。リヌルヲ。', '波耳', 0, 2],
+      ['以呂波耳・ほへとち。リヌルヲ。', '波耳', 1, 2],
+      ['以呂波耳・ほへとち。リヌルヲ。', '波耳', 2, 2],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
index 87ab75f09..41d173926 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -18,13 +18,13 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public function providerTestBuildQuery() {
-    return array(
-      array(array('a' => ' &#//+%20@۞'), 'a=%20%26%23//%2B%2520%40%DB%9E', 'Value was properly encoded.'),
-      array(array(' &#//+%20@۞' => 'a'), '%20%26%23%2F%2F%2B%2520%40%DB%9E=a', 'Key was properly encoded.'),
-      array(array('a' => '1', 'b' => '2', 'c' => '3'), 'a=1&b=2&c=3', 'Multiple values were properly concatenated.'),
-      array(array('a' => array('b' => '2', 'c' => '3'), 'd' => 'foo'), 'a[b]=2&a[c]=3&d=foo', 'Nested array was properly encoded.'),
-      array(array('foo' => NULL), 'foo', 'Simple parameters are properly added.'),
-    );
+    return [
+      [['a' => ' &#//+%20@۞'], 'a=%20%26%23//%2B%2520%40%DB%9E', 'Value was properly encoded.'],
+      [[' &#//+%20@۞' => 'a'], '%20%26%23%2F%2F%2B%2520%40%DB%9E=a', 'Key was properly encoded.'],
+      [['a' => '1', 'b' => '2', 'c' => '3'], 'a=1&b=2&c=3', 'Multiple values were properly concatenated.'],
+      [['a' => ['b' => '2', 'c' => '3'], 'd' => 'foo'], 'a[b]=2&a[c]=3&d=foo', 'Nested array was properly encoded.'],
+      [['foo' => NULL], 'foo', 'Simple parameters are properly added.'],
+    ];
   }
 
   /**
@@ -50,7 +50,7 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public function providerTestValidAbsoluteData() {
-    $urls = array(
+    $urls = [
       'example.com',
       'www.example.com',
       'ex-ample.com',
@@ -69,7 +69,7 @@ class UrlHelperTest extends UnitTestCase {
       'example.org/~,$\'*;',
       'caf%C3%A9.example.org',
       '[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html',
-    );
+    ];
 
     return $this->dataEnhanceWithScheme($urls);
   }
@@ -97,11 +97,11 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public function providerTestInvalidAbsolute() {
-    $data = array(
+    $data = [
       '',
       'ex!ample.com',
       'ex%ample.com',
-    );
+    ];
     return $this->dataEnhanceWithScheme($data);
   }
 
@@ -128,13 +128,13 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public function providerTestValidRelativeData() {
-    $data = array(
+    $data = [
       'paren(the)sis',
       'index.html#pagetop',
       'index.php/node',
       'index.php/node?param=false',
       'login.php?do=login&style=%23#pagetop',
-    );
+    ];
 
     return $this->dataEnhanceWithPrefix($data);
   }
@@ -162,11 +162,11 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public function providerTestInvalidRelativeData() {
-    $data = array(
+    $data = [
       'ex^mple',
       'example<>',
       'ex%ample',
-    );
+    ];
     return $this->dataEnhanceWithPrefix($data);
   }
 
@@ -212,20 +212,20 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public static function providerTestFilterQueryParameters() {
-    return array(
+    return [
       // Test without an exclude filter.
-      array(
-        'query' => array('a' => array('b' => 'c')),
-        'exclude' => array(),
-        'expected' => array('a' => array('b' => 'c')),
-      ),
+      [
+        'query' => ['a' => ['b' => 'c']],
+        'exclude' => [],
+        'expected' => ['a' => ['b' => 'c']],
+      ],
       // Exclude the 'b' element.
-      array(
-        'query' => array('a' => array('b' => 'c', 'd' => 'e')),
-        'exclude' => array('a[b]'),
-        'expected' => array('a' => array('d' => 'e')),
-      ),
-    );
+      [
+        'query' => ['a' => ['b' => 'c', 'd' => 'e']],
+        'exclude' => ['a[b]'],
+        'expected' => ['a' => ['d' => 'e']],
+      ],
+    ];
   }
 
   /**
@@ -250,52 +250,52 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public static function providerTestParse() {
-    return array(
-      array(
+    return [
+      [
         'http://www.example.com/my/path',
-        array(
+        [
           'path' => 'http://www.example.com/my/path',
-          'query' => array(),
+          'query' => [],
           'fragment' => '',
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'http://www.example.com/my/path?destination=home#footer',
-        array(
+        [
           'path' => 'http://www.example.com/my/path',
-          'query' => array(
+          'query' => [
             'destination' => 'home',
-          ),
+          ],
           'fragment' => 'footer',
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'http://',
-        array(
+        [
           'path' => '',
-          'query' => array(),
+          'query' => [],
           'fragment' => '',
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         'https://',
-        array(
+        [
           'path' => '',
-          'query' => array(),
+          'query' => [],
           'fragment' => '',
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         '/my/path?destination=home#footer',
-        array(
+        [
           'path' => '/my/path',
-          'query' => array(
+          'query' => [
             'destination' => 'home',
-          ),
+          ],
           'fragment' => 'footer',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -320,10 +320,10 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public static function providerTestEncodePath() {
-    return array(
-      array('unencoded path with spaces', 'unencoded%20path%20with%20spaces'),
-      array('slashes/should/be/preserved', 'slashes/should/be/preserved'),
-    );
+    return [
+      ['unencoded path with spaces', 'unencoded%20path%20with%20spaces'],
+      ['slashes/should/be/preserved', 'slashes/should/be/preserved'],
+    ];
   }
 
   /**
@@ -348,39 +348,39 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public static function providerTestIsExternal() {
-    return array(
-      array('/internal/path', FALSE),
-      array('https://example.com/external/path', TRUE),
-      array('javascript://fake-external-path', FALSE),
+    return [
+      ['/internal/path', FALSE],
+      ['https://example.com/external/path', TRUE],
+      ['javascript://fake-external-path', FALSE],
       // External URL without an explicit protocol.
-      array('//www.drupal.org/foo/bar?foo=bar&bar=baz&baz#foo', TRUE),
+      ['//www.drupal.org/foo/bar?foo=bar&bar=baz&baz#foo', TRUE],
       // Internal URL starting with a slash.
-      array('/www.drupal.org', FALSE),
+      ['/www.drupal.org', FALSE],
       // Simple external URLs.
-      array('http://example.com', TRUE),
-      array('https://example.com', TRUE),
-      array('http://drupal.org/foo/bar?foo=bar&bar=baz&baz#foo', TRUE),
-      array('//drupal.org', TRUE),
+      ['http://example.com', TRUE],
+      ['https://example.com', TRUE],
+      ['http://drupal.org/foo/bar?foo=bar&bar=baz&baz#foo', TRUE],
+      ['//drupal.org', TRUE],
       // Some browsers ignore or strip leading control characters.
-      array("\x00//www.example.com", TRUE),
-      array("\x08//www.example.com", TRUE),
-      array("\x1F//www.example.com", TRUE),
-      array("\n//www.example.com", TRUE),
+      ["\x00//www.example.com", TRUE],
+      ["\x08//www.example.com", TRUE],
+      ["\x1F//www.example.com", TRUE],
+      ["\n//www.example.com", TRUE],
       // JSON supports decoding directly from UTF-8 code points.
-      array(json_decode('"\u00AD"') . "//www.example.com", TRUE),
-      array(json_decode('"\u200E"') . "//www.example.com", TRUE),
-      array(json_decode('"\uE0020"') . "//www.example.com", TRUE),
-      array(json_decode('"\uE000"') . "//www.example.com", TRUE),
+      [json_decode('"\u00AD"') . "//www.example.com", TRUE],
+      [json_decode('"\u200E"') . "//www.example.com", TRUE],
+      [json_decode('"\uE0020"') . "//www.example.com", TRUE],
+      [json_decode('"\uE000"') . "//www.example.com", TRUE],
       // Backslashes should be normalized to forward.
-      array('\\\\example.com', TRUE),
+      ['\\\\example.com', TRUE],
       // Local URLs.
-      array('node', FALSE),
-      array('/system/ajax', FALSE),
-      array('?q=foo:bar', FALSE),
-      array('node/edit:me', FALSE),
-      array('/drupal.org', FALSE),
-      array('<front>', FALSE),
-    );
+      ['node', FALSE],
+      ['/system/ajax', FALSE],
+      ['?q=foo:bar', FALSE],
+      ['node/edit:me', FALSE],
+      ['/drupal.org', FALSE],
+      ['<front>', FALSE],
+    ];
   }
 
   /**
@@ -411,15 +411,15 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public static function providerTestFilterBadProtocol() {
-    return array(
-      array('javascript://example.com?foo&bar', '//example.com?foo&amp;bar', array('http', 'https')),
+    return [
+      ['javascript://example.com?foo&bar', '//example.com?foo&amp;bar', ['http', 'https']],
       // Test custom protocols.
-      array('http://example.com?foo&bar', '//example.com?foo&amp;bar', array('https')),
+      ['http://example.com?foo&bar', '//example.com?foo&amp;bar', ['https']],
       // Valid protocol.
-      array('http://example.com?foo&bar', 'http://example.com?foo&amp;bar', array('https', 'http')),
+      ['http://example.com?foo&bar', 'http://example.com?foo&amp;bar', ['https', 'http']],
       // Colon not part of the URL scheme.
-      array('/test:8888?foo&bar', '/test:8888?foo&amp;bar', array('http')),
-    );
+      ['/test:8888?foo&bar', '/test:8888?foo&amp;bar', ['http']],
+    ];
   }
 
   /**
@@ -448,15 +448,15 @@ class UrlHelperTest extends UnitTestCase {
    * @return array
    */
   public static function providerTestStripDangerousProtocols() {
-    return array(
-      array('javascript://example.com', '//example.com', array('http', 'https')),
+    return [
+      ['javascript://example.com', '//example.com', ['http', 'https']],
       // Test custom protocols.
-      array('http://example.com', '//example.com', array('https')),
+      ['http://example.com', '//example.com', ['https']],
       // Valid protocol.
-      array('http://example.com', 'http://example.com', array('https', 'http')),
+      ['http://example.com', 'http://example.com', ['https', 'http']],
       // Colon not part of the URL scheme.
-      array('/test:8888', '/test:8888', array('http')),
-    );
+      ['/test:8888', '/test:8888', ['http']],
+    ];
   }
 
   /**
@@ -469,11 +469,11 @@ class UrlHelperTest extends UnitTestCase {
    *   A list of provider data with schemes.
    */
   protected function dataEnhanceWithScheme(array $urls) {
-    $url_schemes = array('http', 'https', 'ftp');
-    $data = array();
+    $url_schemes = ['http', 'https', 'ftp'];
+    $data = [];
     foreach ($url_schemes as $scheme) {
       foreach ($urls as $url) {
-        $data[] = array($url, $scheme);
+        $data[] = [$url, $scheme];
       }
     }
     return $data;
@@ -489,11 +489,11 @@ class UrlHelperTest extends UnitTestCase {
    *   A list of provider data with prefixes.
    */
   protected function dataEnhanceWithPrefix(array $urls) {
-    $prefixes = array('', '/');
-    $data = array();
+    $prefixes = ['', '/'];
+    $data = [];
     foreach ($prefixes as $prefix) {
       foreach ($urls as $url) {
-        $data[] = array($url, $prefix);
+        $data[] = [$url, $prefix];
       }
     }
     return $data;
@@ -523,31 +523,31 @@ class UrlHelperTest extends UnitTestCase {
    * @see \Drupal\Tests\Component\Utility\UrlHelperTest::testExternalIsLocal()
    */
   public function providerTestExternalIsLocal() {
-    return array(
+    return [
       // Different mixes of trailing slash.
-      array('http://example.com', 'http://example.com', TRUE),
-      array('http://example.com/', 'http://example.com', TRUE),
-      array('http://example.com', 'http://example.com/', TRUE),
-      array('http://example.com/', 'http://example.com/', TRUE),
+      ['http://example.com', 'http://example.com', TRUE],
+      ['http://example.com/', 'http://example.com', TRUE],
+      ['http://example.com', 'http://example.com/', TRUE],
+      ['http://example.com/', 'http://example.com/', TRUE],
       // Sub directory of site.
-      array('http://example.com/foo', 'http://example.com/', TRUE),
-      array('http://example.com/foo/bar', 'http://example.com/foo', TRUE),
-      array('http://example.com/foo/bar', 'http://example.com/foo/', TRUE),
+      ['http://example.com/foo', 'http://example.com/', TRUE],
+      ['http://example.com/foo/bar', 'http://example.com/foo', TRUE],
+      ['http://example.com/foo/bar', 'http://example.com/foo/', TRUE],
       // Different sub-domain.
-      array('http://example.com', 'http://www.example.com/', FALSE),
-      array('http://example.com/', 'http://www.example.com/', FALSE),
-      array('http://example.com/foo', 'http://www.example.com/', FALSE),
+      ['http://example.com', 'http://www.example.com/', FALSE],
+      ['http://example.com/', 'http://www.example.com/', FALSE],
+      ['http://example.com/foo', 'http://www.example.com/', FALSE],
       // Different TLD.
-      array('http://example.com', 'http://example.ca', FALSE),
-      array('http://example.com', 'http://example.ca/', FALSE),
-      array('http://example.com/', 'http://example.ca/', FALSE),
-      array('http://example.com/foo', 'http://example.ca', FALSE),
-      array('http://example.com/foo', 'http://example.ca/', FALSE),
+      ['http://example.com', 'http://example.ca', FALSE],
+      ['http://example.com', 'http://example.ca/', FALSE],
+      ['http://example.com/', 'http://example.ca/', FALSE],
+      ['http://example.com/foo', 'http://example.ca', FALSE],
+      ['http://example.com/foo', 'http://example.ca/', FALSE],
       // Different site path.
-      array('http://example.com/foo', 'http://example.com/bar', FALSE),
-      array('http://example.com', 'http://example.com/bar', FALSE),
-      array('http://example.com/bar', 'http://example.com/bar/', FALSE),
-    );
+      ['http://example.com/foo', 'http://example.com/bar', FALSE],
+      ['http://example.com', 'http://example.com/bar', FALSE],
+      ['http://example.com/bar', 'http://example.com/bar/', FALSE],
+    ];
   }
 
   /**
@@ -560,9 +560,9 @@ class UrlHelperTest extends UnitTestCase {
    *
    * @covers ::externalIsLocal
    * @dataProvider providerTestExternalIsLocalInvalid
-   * @expectedException \InvalidArgumentException
    */
   public function testExternalIsLocalInvalid($url, $base_url) {
+    $this->setExpectedException(\InvalidArgumentException::class);
     UrlHelper::externalIsLocal($url, $base_url);
   }
 
@@ -572,17 +572,17 @@ class UrlHelperTest extends UnitTestCase {
    * @see \Drupal\Tests\Component\Utility\UrlHelperTest::testExternalIsLocalInvalid()
    */
   public function providerTestExternalIsLocalInvalid() {
-    return array(
-      array('http://example.com/foo', ''),
-      array('http://example.com/foo', 'bar'),
-      array('http://example.com/foo', 'http://'),
+    return [
+      ['http://example.com/foo', ''],
+      ['http://example.com/foo', 'bar'],
+      ['http://example.com/foo', 'http://'],
       // Invalid destination urls.
-      array('', 'http://example.com/foo'),
-      array('bar', 'http://example.com/foo'),
-      array('/bar', 'http://example.com/foo'),
-      array('bar/', 'http://example.com/foo'),
-      array('http://', 'http://example.com/foo'),
-    );
+      ['', 'http://example.com/foo'],
+      ['bar', 'http://example.com/foo'],
+      ['/bar', 'http://example.com/foo'],
+      ['bar/', 'http://example.com/foo'],
+      ['http://', 'http://example.com/foo'],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php b/web/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php
index 67fa940ec..d804e1aab 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/UserAgentTest.php
@@ -21,7 +21,7 @@ class UserAgentTest extends UnitTestCase {
    *   Language codes, ordered by priority.
    */
   protected function getLanguages() {
-    return array(
+    return [
       // In our test case, 'en' has priority over 'en-US'.
       'en',
       'en-US',
@@ -39,7 +39,7 @@ class UserAgentTest extends UnitTestCase {
       'zh-hans',
       'zh-hant',
       'zh-hant-tw',
-    );
+    ];
   }
 
   /**
@@ -49,7 +49,7 @@ class UserAgentTest extends UnitTestCase {
    *   Language mappings.
    */
   protected function getMappings() {
-    return array(
+    return [
       'no' => 'nb',
       'pt' => 'pt-pt',
       'zh' => 'zh-hans',
@@ -60,7 +60,7 @@ class UserAgentTest extends UnitTestCase {
       'zh-cn' => 'zh-hans',
       'zh-sg' => 'zh-hans',
       'zh-chs' => 'zh-hans',
-    );
+    ];
   }
 
   /**
@@ -82,86 +82,86 @@ class UserAgentTest extends UnitTestCase {
    *   - Expected best matching language code.
    */
   public function providerTestGetBestMatchingLangcode() {
-    return array(
+    return [
       // Equal qvalue for each language, choose the site preferred one.
-      array('en,en-US,fr-CA,fr,es-MX', 'en'),
-      array('en-US,en,fr-CA,fr,es-MX', 'en'),
-      array('fr,en', 'en'),
-      array('en,fr', 'en'),
-      array('en-US,fr', 'en-US'),
-      array('fr,en-US', 'en-US'),
-      array('fr,fr-CA', 'fr-CA'),
-      array('fr-CA,fr', 'fr-CA'),
-      array('fr', 'fr-CA'),
-      array('fr;q=1', 'fr-CA'),
-      array('fr,es-MX', 'fr-CA'),
-      array('fr,es', 'fr-CA'),
-      array('es,fr', 'fr-CA'),
-      array('es-MX,de', 'es-MX'),
-      array('de,es-MX', 'es-MX'),
+      ['en,en-US,fr-CA,fr,es-MX', 'en'],
+      ['en-US,en,fr-CA,fr,es-MX', 'en'],
+      ['fr,en', 'en'],
+      ['en,fr', 'en'],
+      ['en-US,fr', 'en-US'],
+      ['fr,en-US', 'en-US'],
+      ['fr,fr-CA', 'fr-CA'],
+      ['fr-CA,fr', 'fr-CA'],
+      ['fr', 'fr-CA'],
+      ['fr;q=1', 'fr-CA'],
+      ['fr,es-MX', 'fr-CA'],
+      ['fr,es', 'fr-CA'],
+      ['es,fr', 'fr-CA'],
+      ['es-MX,de', 'es-MX'],
+      ['de,es-MX', 'es-MX'],
 
       // Different cases and whitespace.
-      array('en', 'en'),
-      array('En', 'en'),
-      array('EN', 'en'),
-      array(' en', 'en'),
-      array('en ', 'en'),
-      array('en, fr', 'en'),
+      ['en', 'en'],
+      ['En', 'en'],
+      ['EN', 'en'],
+      [' en', 'en'],
+      ['en ', 'en'],
+      ['en, fr', 'en'],
 
       // A less specific language from the browser matches a more specific one
       // from the website, and the other way around for compatibility with
       // some versions of Internet Explorer.
-      array('es', 'es-MX'),
-      array('es-MX', 'es-MX'),
-      array('pt', 'pt'),
-      array('pt-PT', 'pt'),
-      array('pt-PT;q=0.5,pt-BR;q=1,en;q=0.7', 'en'),
-      array('pt-PT;q=1,pt-BR;q=0.5,en;q=0.7', 'en'),
-      array('pt-PT;q=0.4,pt-BR;q=0.1,en;q=0.7', 'en'),
-      array('pt-PT;q=0.1,pt-BR;q=0.4,en;q=0.7', 'en'),
+      ['es', 'es-MX'],
+      ['es-MX', 'es-MX'],
+      ['pt', 'pt'],
+      ['pt-PT', 'pt'],
+      ['pt-PT;q=0.5,pt-BR;q=1,en;q=0.7', 'en'],
+      ['pt-PT;q=1,pt-BR;q=0.5,en;q=0.7', 'en'],
+      ['pt-PT;q=0.4,pt-BR;q=0.1,en;q=0.7', 'en'],
+      ['pt-PT;q=0.1,pt-BR;q=0.4,en;q=0.7', 'en'],
 
       // Language code with several dashes are valid. The less specific language
       // from the browser matches the more specific one from the website.
-      array('eh-oh-laa-laa', 'eh-oh-laa-laa'),
-      array('eh-oh-laa', 'eh-oh-laa-laa'),
-      array('eh-oh', 'eh-oh-laa-laa'),
-      array('eh', 'eh-oh-laa-laa'),
+      ['eh-oh-laa-laa', 'eh-oh-laa-laa'],
+      ['eh-oh-laa', 'eh-oh-laa-laa'],
+      ['eh-oh', 'eh-oh-laa-laa'],
+      ['eh', 'eh-oh-laa-laa'],
 
       // Different qvalues.
-      array('fr,en;q=0.5', 'fr-CA'),
-      array('fr,en;q=0.5,fr-CA;q=0.25', 'fr'),
+      ['fr,en;q=0.5', 'fr-CA'],
+      ['fr,en;q=0.5,fr-CA;q=0.25', 'fr'],
 
       // Silly wildcards are also valid.
-      array('*,fr-CA;q=0.5', 'en'),
-      array('*,en;q=0.25', 'fr-CA'),
-      array('en,en-US;q=0.5,fr;q=0.25', 'en'),
-      array('en-US,en;q=0.5,fr;q=0.25', 'en-US'),
+      ['*,fr-CA;q=0.5', 'en'],
+      ['*,en;q=0.25', 'fr-CA'],
+      ['en,en-US;q=0.5,fr;q=0.25', 'en'],
+      ['en-US,en;q=0.5,fr;q=0.25', 'en-US'],
 
       // Unresolvable cases.
-      array('', FALSE),
-      array('de,pl', FALSE),
-      array('iecRswK4eh', FALSE),
-      array($this->randomMachineName(10), FALSE),
+      ['', FALSE],
+      ['de,pl', FALSE],
+      ['iecRswK4eh', FALSE],
+      [$this->randomMachineName(10), FALSE],
 
       // Chinese langcodes.
-      array('zh-cn, en-us;q=0.90, en;q=0.80, zh;q=0.70', 'zh-hans'),
-      array('zh-tw, en-us;q=0.90, en;q=0.80, zh;q=0.70', 'zh-hant'),
-      array('zh-hant, en-us;q=0.90, en;q=0.80, zh;q=0.70', 'zh-hant'),
-      array('zh-hans, en-us;q=0.90, en;q=0.80, zh;q=0.70', 'zh-hans'),
+      ['zh-cn, en-us;q=0.90, en;q=0.80, zh;q=0.70', 'zh-hans'],
+      ['zh-tw, en-us;q=0.90, en;q=0.80, zh;q=0.70', 'zh-hant'],
+      ['zh-hant, en-us;q=0.90, en;q=0.80, zh;q=0.70', 'zh-hant'],
+      ['zh-hans, en-us;q=0.90, en;q=0.80, zh;q=0.70', 'zh-hans'],
       // @todo: This is copied from RFC4647 but our regex skips the numbers so
       // they where removed. Our code should be updated so private1-private2 is
       // valid. http://tools.ietf.org/html/rfc4647#section-3.4
-      array('zh-hant-CN-x-private-private, en-us;q=0.90, en;q=0.80, zh;q=0.70', 'zh-hant'),
-      array('zh-cn', 'zh-hans'),
-      array('zh-sg', 'zh-hans'),
-      array('zh-tw', 'zh-hant'),
-      array('zh-hk', 'zh-hant'),
-      array('zh-mo', 'zh-hant'),
-      array('zh-hans', 'zh-hans'),
-      array('zh-hant', 'zh-hant'),
-      array('zh-chs', 'zh-hans'),
-      array('zh-cht', 'zh-hant'),
-    );
+      ['zh-hant-CN-x-private-private, en-us;q=0.90, en;q=0.80, zh;q=0.70', 'zh-hant'],
+      ['zh-cn', 'zh-hans'],
+      ['zh-sg', 'zh-hans'],
+      ['zh-tw', 'zh-hant'],
+      ['zh-hk', 'zh-hant'],
+      ['zh-mo', 'zh-hant'],
+      ['zh-hans', 'zh-hans'],
+      ['zh-hant', 'zh-hant'],
+      ['zh-chs', 'zh-hans'],
+      ['zh-cht', 'zh-hant'],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/VariableTest.php b/web/core/tests/Drupal/Tests/Component/Utility/VariableTest.php
index 0aef6d068..9096f87bf 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/VariableTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/VariableTest.php
@@ -29,72 +29,72 @@ class VariableTest extends UnitTestCase {
    *     - The variable to export.
    */
   public function providerTestExport() {
-    return array(
+    return [
       // Array.
-      array(
+      [
         'array()',
-        array(),
-      ),
-      array(
+        [],
+      ],
+      [
         // non-associative.
         "array(\n  1,\n  2,\n  3,\n  4,\n)",
-        array(1, 2, 3, 4),
-      ),
-      array(
+        [1, 2, 3, 4],
+      ],
+      [
         // associative.
         "array(\n  'a' => 1,\n)",
-        array('a' => 1),
-      ),
+        ['a' => 1],
+      ],
       // Bool.
-      array(
+      [
         'TRUE',
         TRUE,
-      ),
-      array(
+      ],
+      [
         'FALSE',
         FALSE,
-      ),
+      ],
       // Strings.
-      array(
+      [
         "'string'",
         'string',
-      ),
-      array(
+      ],
+      [
         '"\n\r\t"',
         "\n\r\t",
-      ),
-      array(
+      ],
+      [
         // 2 backslashes. \\
         "'\\'",
         '\\',
-      ),
-      array(
+      ],
+      [
         // Double-quote "
         "'\"'",
         "\"",
-      ),
-      array(
+      ],
+      [
         // Single-quote '
         '"\'"',
         "'",
-      ),
-      array(
+      ],
+      [
         // Quotes with $ symbols.
         '"\$settings[\'foo\']"',
         '$settings[\'foo\']',
-      ),
+      ],
       // Object.
-      array(
+      [
         // A stdClass object.
         '(object) array()',
         new \stdClass(),
-      ),
-      array(
+      ],
+      [
         // A not-stdClass object.
         "Drupal\Tests\Component\Utility\StubVariableTestClass::__set_state(array(\n))",
         new StubVariableTestClass(),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php b/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php
index 0b2f51e1f..e7832a31f 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php
@@ -28,7 +28,7 @@ class XssTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $allowed_protocols = array(
+    $allowed_protocols = [
       'http',
       'https',
       'ftp',
@@ -41,7 +41,7 @@ class XssTest extends UnitTestCase {
       'sftp',
       'webcal',
       'rtsp',
-    );
+    ];
     UrlHelper::setAllowedProtocols($allowed_protocols);
   }
 
@@ -86,30 +86,30 @@ class XssTest extends UnitTestCase {
    *       \Drupal\Component\Utility\Xss::filter().
    */
   public function providerTestFilterXssNormalized() {
-    return array(
-      array(
+    return [
+      [
         "Who&#039;s Online",
         "who's online",
         'HTML filter -- html entity number',
-      ),
-      array(
+      ],
+      [
         "Who&amp;#039;s Online",
         "who&#039;s online",
         'HTML filter -- encoded html entity number',
-      ),
-      array(
+      ],
+      [
         "Who&amp;amp;#039; Online",
         "who&amp;#039; online",
         'HTML filter -- double encoded html entity number',
-      ),
+      ],
       // Custom elements with dashes in the tag name.
-      array(
+      [
         "<test-element></test-element>",
         "<test-element></test-element>",
         'Custom element with dashes in tag name.',
-        array('test-element'),
-      ),
-    );
+        ['test-element'],
+      ],
+    ];
   }
 
   /**
@@ -153,289 +153,289 @@ class XssTest extends UnitTestCase {
    *       \Drupal\Component\Utility\Xss::filter().
    */
   public function providerTestFilterXssNotNormalized() {
-    $cases = array(
+    $cases = [
       // Tag stripping, different ways to work around removal of HTML tags.
-      array(
+      [
         '<script>alert(0)</script>',
         'script',
         'HTML tag stripping -- simple script without special characters.',
-      ),
-      array(
+      ],
+      [
         '<script src="http://www.example.com" />',
         'script',
         'HTML tag stripping -- empty script with source.',
-      ),
-      array(
+      ],
+      [
         '<ScRipt sRc=http://www.example.com/>',
         'script',
         'HTML tag stripping evasion -- varying case.',
-      ),
-      array(
+      ],
+      [
         "<script\nsrc\n=\nhttp://www.example.com/\n>",
         'script',
         'HTML tag stripping evasion -- multiline tag.',
-      ),
-      array(
+      ],
+      [
         '<script/a src=http://www.example.com/a.js></script>',
         'script',
         'HTML tag stripping evasion -- non whitespace character after tag name.',
-      ),
-      array(
+      ],
+      [
         '<script/src=http://www.example.com/a.js></script>',
         'script',
         'HTML tag stripping evasion -- no space between tag and attribute.',
-      ),
+      ],
       // Null between < and tag name works at least with IE6.
-      array(
+      [
         "<\0scr\0ipt>alert(0)</script>",
         'ipt',
         'HTML tag stripping evasion -- breaking HTML with nulls.',
-      ),
-      array(
+      ],
+      [
         "<scrscriptipt src=http://www.example.com/a.js>",
         'script',
         'HTML tag stripping evasion -- filter just removing "script".',
-      ),
-      array(
+      ],
+      [
         '<<script>alert(0);//<</script>',
         'script',
         'HTML tag stripping evasion -- double opening brackets.',
-      ),
-      array(
+      ],
+      [
         '<script src=http://www.example.com/a.js?<b>',
         'script',
         'HTML tag stripping evasion -- no closing tag.',
-      ),
+      ],
       // DRUPAL-SA-2008-047: This doesn't seem exploitable, but the filter should
       // work consistently.
-      array(
+      [
         '<script>>',
         'script',
         'HTML tag stripping evasion -- double closing tag.',
-      ),
-      array(
+      ],
+      [
         '<script src=//www.example.com/.a>',
         'script',
         'HTML tag stripping evasion -- no scheme or ending slash.',
-      ),
-      array(
+      ],
+      [
         '<script src=http://www.example.com/.a',
         'script',
         'HTML tag stripping evasion -- no closing bracket.',
-      ),
-      array(
+      ],
+      [
         '<script src=http://www.example.com/ <',
         'script',
         'HTML tag stripping evasion -- opening instead of closing bracket.',
-      ),
-      array(
+      ],
+      [
         '<nosuchtag attribute="newScriptInjectionVector">',
         'nosuchtag',
         'HTML tag stripping evasion -- unknown tag.',
-      ),
-      array(
+      ],
+      [
         '<t:set attributeName="innerHTML" to="&lt;script defer&gt;alert(0)&lt;/script&gt;">',
         't:set',
         'HTML tag stripping evasion -- colon in the tag name (namespaces\' tricks).',
-      ),
-      array(
+      ],
+      [
         '<img """><script>alert(0)</script>',
         'script',
         'HTML tag stripping evasion -- a malformed image tag.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<blockquote><script>alert(0)</script></blockquote>',
         'script',
         'HTML tag stripping evasion -- script in a blockqoute.',
-        array('blockquote'),
-      ),
-      array(
+        ['blockquote'],
+      ],
+      [
         "<!--[if true]><script>alert(0)</script><![endif]-->",
         'script',
         'HTML tag stripping evasion -- script within a comment.',
-      ),
+      ],
       // Dangerous attributes removal.
-      array(
+      [
         '<p onmouseover="http://www.example.com/">',
         'onmouseover',
         'HTML filter attributes removal -- events, no evasion.',
-        array('p'),
-      ),
-      array(
+        ['p'],
+      ],
+      [
         '<li style="list-style-image: url(javascript:alert(0))">',
         'style',
         'HTML filter attributes removal -- style, no evasion.',
-        array('li'),
-      ),
-      array(
+        ['li'],
+      ],
+      [
         '<img onerror   =alert(0)>',
         'onerror',
         'HTML filter attributes removal evasion -- spaces before equals sign.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img onabort!#$%&()*~+-_.,:;?@[/|\]^`=alert(0)>',
         'onabort',
         'HTML filter attributes removal evasion -- non alphanumeric characters before equals sign.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img oNmediAError=alert(0)>',
         'onmediaerror',
         'HTML filter attributes removal evasion -- varying case.',
-        array('img'),
-      ),
+        ['img'],
+      ],
       // Works at least with IE6.
-      array(
+      [
         "<img o\0nfocus\0=alert(0)>",
         'focus',
         'HTML filter attributes removal evasion -- breaking with nulls.',
-        array('img'),
-      ),
+        ['img'],
+      ],
       // Only whitelisted scheme names allowed in attributes.
-      array(
+      [
         '<img src="javascript:alert(0)">',
         'javascript',
         'HTML scheme clearing -- no evasion.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img src=javascript:alert(0)>',
         'javascript',
         'HTML scheme clearing evasion -- no quotes.',
-        array('img'),
-      ),
+        ['img'],
+      ],
       // A bit like CVE-2006-0070.
-      array(
+      [
         '<img src="javascript:confirm(0)">',
         'javascript',
         'HTML scheme clearing evasion -- no alert ;)',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img src=`javascript:alert(0)`>',
         'javascript',
         'HTML scheme clearing evasion -- grave accents.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img dynsrc="javascript:alert(0)">',
         'javascript',
         'HTML scheme clearing -- rare attribute.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<table background="javascript:alert(0)">',
         'javascript',
         'HTML scheme clearing -- another tag.',
-        array('table'),
-      ),
-      array(
+        ['table'],
+      ],
+      [
         '<base href="javascript:alert(0);//">',
         'javascript',
         'HTML scheme clearing -- one more attribute and tag.',
-        array('base'),
-      ),
-      array(
+        ['base'],
+      ],
+      [
         '<img src="jaVaSCriPt:alert(0)">',
         'javascript',
         'HTML scheme clearing evasion -- varying case.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img src=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#48;&#41;>',
         'javascript',
         'HTML scheme clearing evasion -- UTF-8 decimal encoding.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img src=&#00000106&#0000097&#00000118&#0000097&#00000115&#0000099&#00000114&#00000105&#00000112&#00000116&#0000058&#0000097&#00000108&#00000101&#00000114&#00000116&#0000040&#0000048&#0000041>',
         'javascript',
         'HTML scheme clearing evasion -- long UTF-8 encoding.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img src=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x30&#x29>',
         'javascript',
         'HTML scheme clearing evasion -- UTF-8 hex encoding.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         "<img src=\"jav\tascript:alert(0)\">",
         'script',
         'HTML scheme clearing evasion -- an embedded tab.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img src="jav&#x09;ascript:alert(0)">',
         'script',
         'HTML scheme clearing evasion -- an encoded, embedded tab.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img src="jav&#x000000A;ascript:alert(0)">',
         'script',
         'HTML scheme clearing evasion -- an encoded, embedded newline.',
-        array('img'),
-      ),
+        ['img'],
+      ],
       // With &#xD; this test would fail, but the entity gets turned into
       // &amp;#xD;, so it's OK.
-      array(
+      [
         '<img src="jav&#x0D;ascript:alert(0)">',
         'script',
         'HTML scheme clearing evasion -- an encoded, embedded carriage return.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         "<img src=\"\n\n\nj\na\nva\ns\ncript:alert(0)\">",
         'cript',
         'HTML scheme clearing evasion -- broken into many lines.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         "<img src=\"jav\0a\0\0cript:alert(0)\">",
         'cript',
         'HTML scheme clearing evasion -- embedded nulls.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img src="vbscript:msgbox(0)">',
         'vbscript',
         'HTML scheme clearing evasion -- another scheme.',
-        array('img'),
-      ),
-      array(
+        ['img'],
+      ],
+      [
         '<img src="nosuchscheme:notice(0)">',
         'nosuchscheme',
         'HTML scheme clearing evasion -- unknown scheme.',
-        array('img'),
-      ),
+        ['img'],
+      ],
       // Netscape 4.x javascript entities.
-      array(
+      [
         '<br size="&{alert(0)}">',
         'alert',
         'Netscape 4.x javascript entities.',
-        array('br'),
-      ),
+        ['br'],
+      ],
       // DRUPAL-SA-2008-006: Invalid UTF-8, these only work as reflected XSS with
       // Internet Explorer 6.
-      array(
+      [
         "<p arg=\"\xe0\">\" style=\"background-image: url(javascript:alert(0));\"\xe0<p>",
         'style',
         'HTML filter -- invalid UTF-8.',
-        array('p'),
-      ),
-    );
+        ['p'],
+      ],
+    ];
     // @fixme This dataset currently fails under 5.4 because of
     //   https://www.drupal.org/node/1210798. Restore after its fixed.
     if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-      $cases[] = array(
+      $cases[] = [
         '<img src=" &#14;  javascript:alert(0)">',
         'javascript',
         'HTML scheme clearing evasion -- spaces and metacharacters before scheme.',
-        array('img'),
-      );
+        ['img'],
+      ];
     }
     return $cases;
   }
@@ -468,11 +468,11 @@ class XssTest extends UnitTestCase {
    *     - The assertion message.
    */
   public function providerTestInvalidMultiByte() {
-    return array(
-      array("Foo\xC0barbaz", '', 'Xss::filter() accepted invalid sequence "Foo\xC0barbaz"'),
-      array("Fooÿñ", "Fooÿñ", 'Xss::filter() rejects valid sequence Fooÿñ"'),
-      array("\xc0aaa", '', 'HTML filter -- overlong UTF-8 sequences.'),
-    );
+    return [
+      ["Foo\xC0barbaz", '', 'Xss::filter() accepted invalid sequence "Foo\xC0barbaz"'],
+      ["Fooÿñ", "Fooÿñ", 'Xss::filter() rejects valid sequence Fooÿñ"'],
+      ["\xc0aaa", '', 'HTML filter -- overlong UTF-8 sequences.'],
+    ];
   }
 
   /**
@@ -498,38 +498,38 @@ class XssTest extends UnitTestCase {
    * Data provider for testFilterXssAdminNotNormalized().
    */
   public function providerTestAttributes() {
-    return array(
-      array(
+    return [
+      [
         '<img src="http://example.com/foo.jpg" title="Example: title" alt="Example: alt">',
         '<img src="http://example.com/foo.jpg" title="Example: title" alt="Example: alt">',
         'Image tag with alt and title attribute',
-        array('img')
-      ),
-      array(
+        ['img']
+      ],
+      [
         '<a href="https://www.drupal.org/" rel="dc:publisher">Drupal</a>',
         '<a href="https://www.drupal.org/" rel="dc:publisher">Drupal</a>',
         'Link tag with rel attribute',
-        array('a')
-      ),
-      array(
+        ['a']
+      ],
+      [
         '<span property="dc:subject">Drupal 8: The best release ever.</span>',
         '<span property="dc:subject">Drupal 8: The best release ever.</span>',
         'Span tag with property attribute',
-        array('span')
-      ),
-      array(
+        ['span']
+      ],
+      [
         '<img src="http://example.com/foo.jpg" data-caption="Drupal 8: The best release ever.">',
         '<img src="http://example.com/foo.jpg" data-caption="Drupal 8: The best release ever.">',
         'Image tag with data attribute',
-        array('img')
-      ),
-      array(
+        ['img']
+      ],
+      [
         '<a data-a2a-url="foo"></a>',
         '<a data-a2a-url="foo"></a>',
         'Link tag with numeric data attribute',
-        array('a')
-      ),
-    );
+        ['a']
+      ],
+    ];
   }
 
   /**
@@ -568,11 +568,11 @@ class XssTest extends UnitTestCase {
    *     - The assertion message.
    */
   public function providerTestFilterXssAdminNotNormalized() {
-    return array(
+    return [
       // DRUPAL-SA-2008-044
-      array('<object />', 'object', 'Admin HTML filter -- should not allow object tag.'),
-      array('<script />', 'script', 'Admin HTML filter -- should not allow script tag.'),
-    );
+      ['<object />', 'object', 'Admin HTML filter -- should not allow object tag.'],
+      ['<script />', 'script', 'Admin HTML filter -- should not allow script tag.'],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php b/web/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
index a393bfb27..a93dd0981 100644
--- a/web/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
@@ -41,7 +41,7 @@ class UuidTest extends UnitTestCase {
    */
   public function providerUuidInstances() {
 
-    $instances = array();
+    $instances = [];
     $instances[][] = new Php();
 
     // If valid PECL extensions exists add to list.
@@ -83,15 +83,15 @@ class UuidTest extends UnitTestCase {
    *   - Failure message.
    */
   public function providerTestValidation() {
-    return array(
+    return [
       // These valid UUIDs.
-      array('6ba7b810-9dad-11d1-80b4-00c04fd430c8', TRUE, 'Basic FQDN UUID did not validate'),
-      array('00000000-0000-0000-0000-000000000000', TRUE, 'Minimum UUID did not validate'),
-      array('ffffffff-ffff-ffff-ffff-ffffffffffff', TRUE, 'Maximum UUID did not validate'),
+      ['6ba7b810-9dad-11d1-80b4-00c04fd430c8', TRUE, 'Basic FQDN UUID did not validate'],
+      ['00000000-0000-0000-0000-000000000000', TRUE, 'Minimum UUID did not validate'],
+      ['ffffffff-ffff-ffff-ffff-ffffffffffff', TRUE, 'Maximum UUID did not validate'],
       // These are invalid UUIDs.
-      array('0ab26e6b-f074-4e44-9da-601205fa0e976', FALSE, 'Invalid format was validated'),
-      array('0ab26e6b-f074-4e44-9daf-1205fa0e9761f', FALSE, 'Invalid length was validated'),
-    );
+      ['0ab26e6b-f074-4e44-9da-601205fa0e976', FALSE, 'Invalid format was validated'],
+      ['0ab26e6b-f074-4e44-9daf-1205fa0e9761f', FALSE, 'Invalid length was validated'],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php b/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
index eee526059..231f80906 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\Core\Access;
 
 use Drupal\Core\Access\AccessCheckInterface;
+use Drupal\Core\Access\AccessException;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Access\CheckProvider;
 use Drupal\Core\Cache\Context\CacheContextsManager;
@@ -100,25 +101,25 @@ class AccessManagerTest extends UnitTestCase {
 
     $this->routeCollection = new RouteCollection();
     $this->routeCollection->add('test_route_1', new Route('/test-route-1'));
-    $this->routeCollection->add('test_route_2', new Route('/test-route-2', array(), array('_access' => 'TRUE')));
-    $this->routeCollection->add('test_route_3', new Route('/test-route-3', array(), array('_access' => 'FALSE')));
-    $this->routeCollection->add('test_route_4', new Route('/test-route-4/{value}', array(), array('_access' => 'TRUE')));
+    $this->routeCollection->add('test_route_2', new Route('/test-route-2', [], ['_access' => 'TRUE']));
+    $this->routeCollection->add('test_route_3', new Route('/test-route-3', [], ['_access' => 'FALSE']));
+    $this->routeCollection->add('test_route_4', new Route('/test-route-4/{value}', [], ['_access' => 'TRUE']));
 
     $this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
-    $map = array();
+    $map = [];
     foreach ($this->routeCollection->all() as $name => $route) {
-      $map[] = array($name, array(), $route);
+      $map[] = [$name, [], $route];
     }
-    $map[] = array('test_route_4', array('value' => 'example'), $this->routeCollection->get('test_route_4'));
+    $map[] = ['test_route_4', ['value' => 'example'], $this->routeCollection->get('test_route_4')];
     $this->routeProvider->expects($this->any())
       ->method('getRouteByName')
       ->will($this->returnValueMap($map));
 
-    $map = array();
-    $map[] = array('test_route_1', array(), '/test-route-1');
-    $map[] = array('test_route_2', array(), '/test-route-2');
-    $map[] = array('test_route_3', array(), '/test-route-3');
-    $map[] = array('test_route_4', array('value' => 'example'), '/test-route-4/example');
+    $map = [];
+    $map[] = ['test_route_1', [], '/test-route-1'];
+    $map[] = ['test_route_2', [], '/test-route-2'];
+    $map[] = ['test_route_3', [], '/test-route-3'];
+    $map[] = ['test_route_4', ['value' => 'example'], '/test-route-4/example'];
 
     $this->paramConverter = $this->getMock('Drupal\Core\ParamConverter\ParamConverterManagerInterface');
 
@@ -147,8 +148,8 @@ class AccessManagerTest extends UnitTestCase {
     $this->checkProvider->setChecks($this->routeCollection);
 
     $this->assertEquals($this->routeCollection->get('test_route_1')->getOption('_access_checks'), NULL);
-    $this->assertEquals($this->routeCollection->get('test_route_2')->getOption('_access_checks'), array('test_access_default'));
-    $this->assertEquals($this->routeCollection->get('test_route_3')->getOption('_access_checks'), array('test_access_default'));
+    $this->assertEquals($this->routeCollection->get('test_route_2')->getOption('_access_checks'), ['test_access_default']);
+    $this->assertEquals($this->routeCollection->get('test_route_3')->getOption('_access_checks'), ['test_access_default']);
   }
 
   /**
@@ -163,8 +164,8 @@ class AccessManagerTest extends UnitTestCase {
     $this->container->set('test_access', $access_check);
     $this->checkProvider->addCheckService('test_access', 'access');
 
-    $route = new Route('/test-path', array(), array('_foo' => '1', '_bar' => '1'));
-    $route2 = new Route('/test-path', array(), array('_foo' => '1', '_bar' => '2'));
+    $route = new Route('/test-path', [], ['_foo' => '1', '_bar' => '1']);
+    $route2 = new Route('/test-path', [], ['_foo' => '1', '_bar' => '2']);
     $collection = new RouteCollection();
     $collection->add('test_route', $route);
     $collection->add('test_route2', $route2);
@@ -178,7 +179,7 @@ class AccessManagerTest extends UnitTestCase {
 
     $this->checkProvider->setChecks($collection);
     $this->assertEmpty($route->getOption('_access_checks'));
-    $this->assertEquals(array('test_access'), $route2->getOption('_access_checks'));
+    $this->assertEquals(['test_access'], $route2->getOption('_access_checks'));
   }
 
   /**
@@ -254,43 +255,43 @@ class AccessManagerTest extends UnitTestCase {
     $access_deny = AccessResult::neutral();
     $access_kill = AccessResult::forbidden();
 
-    $access_configurations = array();
-    $access_configurations[] = array(
+    $access_configurations = [];
+    $access_configurations[] = [
       'name' => 'test_route_4',
       'condition_one' => 'TRUE',
       'condition_two' => 'FALSE',
       'expected' => $access_kill,
-    );
-    $access_configurations[] = array(
+    ];
+    $access_configurations[] = [
       'name' => 'test_route_5',
       'condition_one' => 'TRUE',
       'condition_two' => 'NULL',
       'expected' => $access_deny,
-    );
-    $access_configurations[] = array(
+    ];
+    $access_configurations[] = [
       'name' => 'test_route_6',
       'condition_one' => 'FALSE',
       'condition_two' => 'NULL',
       'expected' => $access_kill,
-    );
-    $access_configurations[] = array(
+    ];
+    $access_configurations[] = [
       'name' => 'test_route_7',
       'condition_one' => 'TRUE',
       'condition_two' => 'TRUE',
       'expected' => $access_allow,
-    );
-    $access_configurations[] = array(
+    ];
+    $access_configurations[] = [
       'name' => 'test_route_8',
       'condition_one' => 'FALSE',
       'condition_two' => 'FALSE',
       'expected' => $access_kill,
-    );
-    $access_configurations[] = array(
+    ];
+    $access_configurations[] = [
       'name' => 'test_route_9',
       'condition_one' => 'NULL',
       'condition_two' => 'NULL',
       'expected' => $access_deny,
-    );
+    ];
 
     return $access_configurations;
   }
@@ -304,21 +305,21 @@ class AccessManagerTest extends UnitTestCase {
     $this->setupAccessChecker();
     $access_check = new DefinedTestAccessCheck();
     $this->container->register('test_access_defined', $access_check);
-    $this->checkProvider->addCheckService('test_access_defined', 'access', array('_test_access'));
+    $this->checkProvider->addCheckService('test_access_defined', 'access', ['_test_access']);
 
     $route_collection = new RouteCollection();
     // Setup a test route for each access configuration.
-    $requirements = array(
+    $requirements = [
       '_access' => $condition_one,
       '_test_access' => $condition_two,
-    );
-    $route = new Route($name, array(), $requirements);
+    ];
+    $route = new Route($name, [], $requirements);
     $route_collection->add($name, $route);
 
     $this->checkProvider->setChecks($route_collection);
     $this->setupAccessArgumentsResolverFactory();
 
-    $route_match = new RouteMatch($name, $route, array(), array());
+    $route_match = new RouteMatch($name, $route, [], []);
     $this->assertEquals($expected_access->isAllowed(), $this->accessManager->check($route_match, $this->account));
     $this->assertEquals($expected_access, $this->accessManager->check($route_match, $this->account, NULL, TRUE));
   }
@@ -335,27 +336,27 @@ class AccessManagerTest extends UnitTestCase {
 
     $this->paramConverter->expects($this->at(0))
       ->method('convert')
-      ->with(array(RouteObjectInterface::ROUTE_NAME => 'test_route_2', RouteObjectInterface::ROUTE_OBJECT => $this->routeCollection->get('test_route_2')))
-      ->will($this->returnValue(array()));
+      ->with([RouteObjectInterface::ROUTE_NAME => 'test_route_2', RouteObjectInterface::ROUTE_OBJECT => $this->routeCollection->get('test_route_2')])
+      ->will($this->returnValue([]));
     $this->paramConverter->expects($this->at(1))
       ->method('convert')
-      ->with(array(RouteObjectInterface::ROUTE_NAME => 'test_route_2', RouteObjectInterface::ROUTE_OBJECT => $this->routeCollection->get('test_route_2')))
-      ->will($this->returnValue(array()));
+      ->with([RouteObjectInterface::ROUTE_NAME => 'test_route_2', RouteObjectInterface::ROUTE_OBJECT => $this->routeCollection->get('test_route_2')])
+      ->will($this->returnValue([]));
 
     $this->paramConverter->expects($this->at(2))
       ->method('convert')
-      ->with(array('value' => 'example', RouteObjectInterface::ROUTE_NAME => 'test_route_4', RouteObjectInterface::ROUTE_OBJECT => $this->routeCollection->get('test_route_4')))
-      ->will($this->returnValue(array('value' => 'example')));
+      ->with(['value' => 'example', RouteObjectInterface::ROUTE_NAME => 'test_route_4', RouteObjectInterface::ROUTE_OBJECT => $this->routeCollection->get('test_route_4')])
+      ->will($this->returnValue(['value' => 'example']));
     $this->paramConverter->expects($this->at(3))
       ->method('convert')
-      ->with(array('value' => 'example', RouteObjectInterface::ROUTE_NAME => 'test_route_4', RouteObjectInterface::ROUTE_OBJECT => $this->routeCollection->get('test_route_4')))
-      ->will($this->returnValue(array('value' => 'example')));
+      ->with(['value' => 'example', RouteObjectInterface::ROUTE_NAME => 'test_route_4', RouteObjectInterface::ROUTE_OBJECT => $this->routeCollection->get('test_route_4')])
+      ->will($this->returnValue(['value' => 'example']));
 
     // Tests the access with routes with parameters without given request.
-    $this->assertEquals(TRUE, $this->accessManager->checkNamedRoute('test_route_2', array(), $this->account));
-    $this->assertEquals(AccessResult::allowed(), $this->accessManager->checkNamedRoute('test_route_2', array(), $this->account, TRUE));
-    $this->assertEquals(TRUE, $this->accessManager->checkNamedRoute('test_route_4', array('value' => 'example'), $this->account));
-    $this->assertEquals(AccessResult::allowed(), $this->accessManager->checkNamedRoute('test_route_4', array('value' => 'example'), $this->account, TRUE));
+    $this->assertEquals(TRUE, $this->accessManager->checkNamedRoute('test_route_2', [], $this->account));
+    $this->assertEquals(AccessResult::allowed(), $this->accessManager->checkNamedRoute('test_route_2', [], $this->account, TRUE));
+    $this->assertEquals(TRUE, $this->accessManager->checkNamedRoute('test_route_4', ['value' => 'example'], $this->account));
+    $this->assertEquals(AccessResult::allowed(), $this->accessManager->checkNamedRoute('test_route_4', ['value' => 'example'], $this->account, TRUE));
   }
 
   /**
@@ -365,23 +366,23 @@ class AccessManagerTest extends UnitTestCase {
    */
   public function testCheckNamedRouteWithUpcastedValues() {
     $this->routeCollection = new RouteCollection();
-    $route = new Route('/test-route-1/{value}', array(), array('_test_access' => 'TRUE'));
+    $route = new Route('/test-route-1/{value}', [], ['_test_access' => 'TRUE']);
     $this->routeCollection->add('test_route_1', $route);
 
     $this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
     $this->routeProvider->expects($this->any())
       ->method('getRouteByName')
-      ->with('test_route_1', array('value' => 'example'))
+      ->with('test_route_1', ['value' => 'example'])
       ->will($this->returnValue($route));
 
-    $map = array();
-    $map[] = array('test_route_1', array('value' => 'example'), '/test-route-1/example');
+    $map = [];
+    $map[] = ['test_route_1', ['value' => 'example'], '/test-route-1/example'];
 
     $this->paramConverter = $this->getMock('Drupal\Core\ParamConverter\ParamConverterManagerInterface');
     $this->paramConverter->expects($this->atLeastOnce())
       ->method('convert')
-      ->with(array('value' => 'example', RouteObjectInterface::ROUTE_NAME => 'test_route_1', RouteObjectInterface::ROUTE_OBJECT => $route))
-      ->will($this->returnValue(array('value' => 'upcasted_value')));
+      ->with(['value' => 'example', RouteObjectInterface::ROUTE_NAME => 'test_route_1', RouteObjectInterface::ROUTE_OBJECT => $route])
+      ->will($this->returnValue(['value' => 'upcasted_value']));
 
     $this->setupAccessArgumentsResolverFactory($this->exactly(2))
       ->with($this->callback(function ($route_match) {
@@ -403,8 +404,8 @@ class AccessManagerTest extends UnitTestCase {
     $this->checkProvider->addCheckService('test_access', 'access');
     $this->checkProvider->setChecks($this->routeCollection);
 
-    $this->assertEquals(FALSE, $this->accessManager->checkNamedRoute('test_route_1', array('value' => 'example'), $this->account));
-    $this->assertEquals(AccessResult::forbidden(), $this->accessManager->checkNamedRoute('test_route_1', array('value' => 'example'), $this->account, TRUE));
+    $this->assertEquals(FALSE, $this->accessManager->checkNamedRoute('test_route_1', ['value' => 'example'], $this->account));
+    $this->assertEquals(AccessResult::forbidden(), $this->accessManager->checkNamedRoute('test_route_1', ['value' => 'example'], $this->account, TRUE));
   }
 
   /**
@@ -414,23 +415,23 @@ class AccessManagerTest extends UnitTestCase {
    */
   public function testCheckNamedRouteWithDefaultValue() {
     $this->routeCollection = new RouteCollection();
-    $route = new Route('/test-route-1/{value}', array('value' => 'example'), array('_test_access' => 'TRUE'));
+    $route = new Route('/test-route-1/{value}', ['value' => 'example'], ['_test_access' => 'TRUE']);
     $this->routeCollection->add('test_route_1', $route);
 
     $this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
     $this->routeProvider->expects($this->any())
       ->method('getRouteByName')
-      ->with('test_route_1', array())
+      ->with('test_route_1', [])
       ->will($this->returnValue($route));
 
-    $map = array();
-    $map[] = array('test_route_1', array('value' => 'example'), '/test-route-1/example');
+    $map = [];
+    $map[] = ['test_route_1', ['value' => 'example'], '/test-route-1/example'];
 
     $this->paramConverter = $this->getMock('Drupal\Core\ParamConverter\ParamConverterManagerInterface');
     $this->paramConverter->expects($this->atLeastOnce())
       ->method('convert')
-      ->with(array('value' => 'example', RouteObjectInterface::ROUTE_NAME => 'test_route_1', RouteObjectInterface::ROUTE_OBJECT => $route))
-      ->will($this->returnValue(array('value' => 'upcasted_value')));
+      ->with(['value' => 'example', RouteObjectInterface::ROUTE_NAME => 'test_route_1', RouteObjectInterface::ROUTE_OBJECT => $route])
+      ->will($this->returnValue(['value' => 'upcasted_value']));
 
     $this->setupAccessArgumentsResolverFactory($this->exactly(2))
       ->with($this->callback(function ($route_match) {
@@ -452,8 +453,8 @@ class AccessManagerTest extends UnitTestCase {
     $this->checkProvider->addCheckService('test_access', 'access');
     $this->checkProvider->setChecks($this->routeCollection);
 
-    $this->assertEquals(FALSE, $this->accessManager->checkNamedRoute('test_route_1', array(), $this->account));
-    $this->assertEquals(AccessResult::forbidden(), $this->accessManager->checkNamedRoute('test_route_1', array(), $this->account, TRUE));
+    $this->assertEquals(FALSE, $this->accessManager->checkNamedRoute('test_route_1', [], $this->account));
+    $this->assertEquals(AccessResult::forbidden(), $this->accessManager->checkNamedRoute('test_route_1', [], $this->account, TRUE));
   }
 
   /**
@@ -466,30 +467,28 @@ class AccessManagerTest extends UnitTestCase {
 
     $this->setupAccessChecker();
 
-    $this->assertEquals(FALSE, $this->accessManager->checkNamedRoute('test_route_1', array(), $this->account), 'A non existing route lead to access.');
-    $this->assertEquals(AccessResult::forbidden()->addCacheTags(['config:core.extension']), $this->accessManager->checkNamedRoute('test_route_1', array(), $this->account, TRUE), 'A non existing route lead to access.');
+    $this->assertEquals(FALSE, $this->accessManager->checkNamedRoute('test_route_1', [], $this->account), 'A non existing route lead to access.');
+    $this->assertEquals(AccessResult::forbidden()->addCacheTags(['config:core.extension']), $this->accessManager->checkNamedRoute('test_route_1', [], $this->account, TRUE), 'A non existing route lead to access.');
   }
 
   /**
    * Tests that an access checker throws an exception for not allowed values.
    *
    * @dataProvider providerCheckException
-   *
-   * @expectedException \Drupal\Core\Access\AccessException
    */
   public function testCheckException($return_value) {
     $route_provider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
 
     // Setup a test route for each access configuration.
-    $requirements = array(
+    $requirements = [
       '_test_incorrect_value' => 'TRUE',
-    );
-    $options = array(
-      '_access_checks' => array(
+    ];
+    $options = [
+      '_access_checks' => [
         'test_incorrect_value',
-      ),
-    );
-    $route = new Route('', array(), $requirements, $options);
+      ],
+    ];
+    $route = new Route('', [], $requirements, $options);
 
     $route_provider->expects($this->any())
       ->method('getRouteByName')
@@ -498,7 +497,7 @@ class AccessManagerTest extends UnitTestCase {
     $this->paramConverter = $this->getMock('Drupal\Core\ParamConverter\ParamConverterManagerInterface');
     $this->paramConverter->expects($this->any())
       ->method('convert')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $this->setupAccessArgumentsResolverFactory();
 
@@ -515,7 +514,8 @@ class AccessManagerTest extends UnitTestCase {
     $this->checkProvider->setContainer($container);
     $this->checkProvider->addCheckService('test_incorrect_value', 'access');
 
-    $access_manager->checkNamedRoute('test_incorrect_value', array(), $this->account);
+    $this->setExpectedException(AccessException::class);
+    $access_manager->checkNamedRoute('test_incorrect_value', [], $this->account);
   }
 
   /**
@@ -524,12 +524,12 @@ class AccessManagerTest extends UnitTestCase {
    * @return array
    */
   public function providerCheckException() {
-    return array(
-      array(array(1)),
-      array('string'),
-      array(0),
-      array(1),
-    );
+    return [
+      [[1]],
+      ['string'],
+      [0],
+      [1],
+    ];
   }
 
   /**
@@ -538,7 +538,7 @@ class AccessManagerTest extends UnitTestCase {
   protected function setupAccessChecker() {
     $access_check = new DefaultAccessCheck();
     $this->container->register('test_access_default', $access_check);
-    $this->checkProvider->addCheckService('test_access_default', 'access', array('_access'));
+    $this->checkProvider->addCheckService('test_access_default', 'access', ['_access']);
   }
 
   /**
@@ -555,7 +555,7 @@ class AccessManagerTest extends UnitTestCase {
         $resolver->expects($this->any())
           ->method('getArguments')
           ->will($this->returnCallback(function ($callable) use ($route_match) {
-            return array($route_match->getRouteObject());
+            return [$route_match->getRouteObject()];
           }));
         return $resolver;
       }));
diff --git a/web/core/tests/Drupal/Tests/Core/Access/AccessResultNeutralTest.php b/web/core/tests/Drupal/Tests/Core/Access/AccessResultNeutralTest.php
new file mode 100644
index 000000000..5b96b199d
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Access/AccessResultNeutralTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Drupal\Tests\Core\Access;
+
+use Drupal\Core\Access\AccessResultNeutral;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Access\AccessResultNeutral
+ * @group Access
+ */
+class AccessResultNeutralTest extends UnitTestCase {
+
+  /**
+   * Tests the construction of an AccessResultForbidden object.
+   *
+   * @covers ::__construct
+   * @covers ::getReason
+   */
+  public function testConstruction() {
+    $a = new AccessResultNeutral();
+    $this->assertNull($a->getReason());
+
+    $reason = $this->getRandomGenerator()->string();
+    $b = new AccessResultNeutral($reason);
+    $this->assertEquals($reason, $b->getReason());
+  }
+
+  /**
+   * Test setReason()
+   *
+   * @covers ::setReason
+   */
+  public function testSetReason() {
+    $a = new AccessResultNeutral();
+
+    $reason = $this->getRandomGenerator()->string();
+    $return = $a->setReason($reason);
+
+    $this->assertSame($reason, $a->getReason());
+    $this->assertSame($a, $return);
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php b/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
index ca262c7e1..647da6125 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
@@ -174,9 +174,9 @@ class AccessResultTest extends UnitTestCase {
    * @covers ::andIf
    */
   public function testAndIf() {
-    $neutral = AccessResult::neutral();
+    $neutral = AccessResult::neutral('neutral message');
     $allowed = AccessResult::allowed();
-    $forbidden = AccessResult::forbidden();
+    $forbidden = AccessResult::forbidden('forbidden message');
     $unused_access_result_due_to_lazy_evaluation = $this->getMock('\Drupal\Core\Access\AccessResultInterface');
     $unused_access_result_due_to_lazy_evaluation->expects($this->never())
       ->method($this->anything());
@@ -193,6 +193,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertFalse($access->isForbidden());
     $this->assertTrue($access->isNeutral());
+    $this->assertEquals('neutral message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // ALLOWED && FORBIDDEN === FORBIDDEN.
@@ -200,6 +201,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // NEUTRAL && ALLOW == NEUTRAL
@@ -207,6 +209,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertFalse($access->isForbidden());
     $this->assertTrue($access->isNeutral());
+    $this->assertEquals('neutral message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // NEUTRAL && NEUTRAL === NEUTRAL.
@@ -214,6 +217,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertFalse($access->isForbidden());
     $this->assertTrue($access->isNeutral());
+    $this->assertEquals('neutral message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // NEUTRAL && FORBIDDEN === FORBIDDEN.
@@ -221,6 +225,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // FORBIDDEN && ALLOWED = FORBIDDEN
@@ -228,6 +233,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // FORBIDDEN && NEUTRAL = FORBIDDEN
@@ -235,6 +241,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // FORBIDDEN && FORBIDDEN = FORBIDDEN
@@ -242,6 +249,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // FORBIDDEN && * === FORBIDDEN: lazy evaluation verification.
@@ -249,6 +257,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
   }
 
@@ -256,9 +265,9 @@ class AccessResultTest extends UnitTestCase {
    * @covers ::orIf
    */
   public function testOrIf() {
-    $neutral = AccessResult::neutral();
+    $neutral = AccessResult::neutral('neutral message');
     $allowed = AccessResult::allowed();
-    $forbidden = AccessResult::forbidden();
+    $forbidden = AccessResult::forbidden('forbidden message');
     $unused_access_result_due_to_lazy_evaluation = $this->getMock('\Drupal\Core\Access\AccessResultInterface');
     $unused_access_result_due_to_lazy_evaluation->expects($this->never())
       ->method($this->anything());
@@ -282,6 +291,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // NEUTRAL || NEUTRAL === NEUTRAL.
@@ -289,6 +299,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertFalse($access->isForbidden());
     $this->assertTrue($access->isNeutral());
+    $this->assertEquals('neutral message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // NEUTRAL || ALLOWED === ALLOWED.
@@ -303,6 +314,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // FORBIDDEN || ALLOWED === FORBIDDEN.
@@ -310,6 +322,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // FORBIDDEN || NEUTRAL === FORBIDDEN.
@@ -317,6 +330,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // FORBIDDEN || FORBIDDEN === FORBIDDEN.
@@ -324,6 +338,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
 
     // FORBIDDEN || * === FORBIDDEN.
@@ -331,6 +346,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertFalse($access->isAllowed());
     $this->assertTrue($access->isForbidden());
     $this->assertFalse($access->isNeutral());
+    $this->assertEquals('forbidden message', $access->getReason());
     $this->assertDefaultCacheability($access);
   }
 
@@ -381,7 +397,7 @@ class AccessResultTest extends UnitTestCase {
     $verify($access, ['bar', 'foo']);
 
     // ::cachePerPermissions() convenience method.
-    $contexts = array('user.permissions');
+    $contexts = ['user.permissions'];
     $a = AccessResult::neutral()->addCacheContexts($contexts);
     $verify($a, $contexts);
     $b = AccessResult::neutral()->cachePerPermissions();
@@ -389,7 +405,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertEquals($a, $b);
 
     // ::cachePerUser() convenience method.
-    $contexts = array('user');
+    $contexts = ['user'];
     $a = AccessResult::neutral()->addCacheContexts($contexts);
     $verify($a, $contexts);
     $b = AccessResult::neutral()->cachePerUser();
@@ -397,7 +413,7 @@ class AccessResultTest extends UnitTestCase {
     $this->assertEquals($a, $b);
 
     // Both.
-    $contexts = array('user', 'user.permissions');
+    $contexts = ['user', 'user.permissions'];
     $a = AccessResult::neutral()->addCacheContexts($contexts);
     $verify($a, $contexts);
     $b = AccessResult::neutral()->cachePerPermissions()->cachePerUser();
@@ -413,7 +429,7 @@ class AccessResultTest extends UnitTestCase {
       ->method('hasPermission')
       ->with('may herd llamas')
       ->will($this->returnValue(FALSE));
-    $contexts = array('user.permissions');
+    $contexts = ['user.permissions'];
 
     // Verify the object when using the ::allowedIfHasPermission() convenience
     // static method.
@@ -464,14 +480,14 @@ class AccessResultTest extends UnitTestCase {
     $node = $this->getMock('\Drupal\node\NodeInterface');
     $node->expects($this->any())
       ->method('getCacheTags')
-      ->will($this->returnValue(array('node:20011988')));
+      ->will($this->returnValue(['node:20011988']));
     $node->expects($this->any())
       ->method('getCacheMaxAge')
       ->willReturn(600);
     $node->expects($this->any())
       ->method('getCacheContexts')
       ->willReturn(['user']);
-    $tags = array('node:20011988');
+    $tags = ['node:20011988'];
     $a = AccessResult::neutral()->addCacheTags($tags);
     $verify($a, $tags);
     $b = AccessResult::neutral()->addCacheableDependency($node);
@@ -901,18 +917,31 @@ class AccessResultTest extends UnitTestCase {
    * @return array
    */
   public function providerTestAllowedIfHasPermissions() {
-    return [
-      [[], 'AND', AccessResult::allowedIf(FALSE)],
-      [[], 'OR', AccessResult::allowedIf(FALSE)],
-      [['allowed'], 'OR', AccessResult::allowedIf(TRUE)],
-      [['allowed'], 'AND', AccessResult::allowedIf(TRUE)],
-      [['denied'], 'OR', AccessResult::allowedIf(FALSE)],
-      [['denied'], 'AND', AccessResult::allowedIf(FALSE)],
-      [['allowed', 'denied'], 'OR', AccessResult::allowedIf(TRUE)],
-      [['denied', 'allowed'], 'OR', AccessResult::allowedIf(TRUE)],
-      [['allowed', 'denied', 'other'], 'OR', AccessResult::allowedIf(TRUE)],
-      [['allowed', 'denied'], 'AND', AccessResult::allowedIf(FALSE)],
-    ];
+    $access_result = AccessResult::allowedIf(FALSE);
+    $data[] = [[], 'AND', $access_result];
+    $data[] = [[], 'OR', $access_result];
+
+    $access_result = AccessResult::allowedIf(TRUE);
+    $data[] = [['allowed'], 'OR', $access_result];
+    $data[] = [['allowed'], 'AND', $access_result];
+
+    $access_result = AccessResult::allowedIf(FALSE);
+    $access_result->setReason("The 'denied' permission is required.");
+    $data[] = [['denied'], 'OR', $access_result];
+    $data[] = [['denied'], 'AND', $access_result];
+
+    $access_result = AccessResult::allowedIf(TRUE);
+    $data[] = [['allowed', 'denied'], 'OR', $access_result];
+    $data[] = [['denied', 'allowed'], 'OR', $access_result];
+
+    $access_result = AccessResult::allowedIf(TRUE);
+    $data[] = [['allowed', 'denied', 'other'], 'OR', $access_result];
+
+    $access_result = AccessResult::allowedIf(FALSE);
+    $access_result->setReason("The following permissions are required: 'allowed' AND 'denied'.");
+    $data[] = [['allowed', 'denied'], 'AND', $access_result];
+
+    return $data;
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
index 3ed4e840d..edbbfba21 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
@@ -56,18 +56,18 @@ class CsrfAccessCheckTest extends UnitTestCase {
 
     $this->routeMatch->expects($this->once())
       ->method('getRawParameters')
-      ->will($this->returnValue(array('node' => 42)));
+      ->will($this->returnValue(['node' => 42]));
 
-    $route = new Route('/test-path/{node}', array(), array('_csrf_token' => 'TRUE'));
+    $route = new Route('/test-path/{node}', [], ['_csrf_token' => 'TRUE']);
     $request = Request::create('/test-path/42?token=test_query');
 
     $this->assertEquals(AccessResult::allowed()->setCacheMaxAge(0), $this->accessCheck->access($route, $request, $this->routeMatch));
   }
 
   /**
-   * Tests the access() method with an invalid token.
+   * @covers ::access
    */
-  public function testAccessTokenFail() {
+  public function testCsrfTokenInvalid() {
     $this->csrfToken->expects($this->once())
       ->method('validate')
       ->with('test_query', 'test-path')
@@ -75,12 +75,30 @@ class CsrfAccessCheckTest extends UnitTestCase {
 
     $this->routeMatch->expects($this->once())
       ->method('getRawParameters')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
-    $route = new Route('/test-path', array(), array('_csrf_token' => 'TRUE'));
+    $route = new Route('/test-path', [], ['_csrf_token' => 'TRUE']);
     $request = Request::create('/test-path?token=test_query');
 
-    $this->assertEquals(AccessResult::forbidden()->setCacheMaxAge(0), $this->accessCheck->access($route, $request, $this->routeMatch));
+    $this->assertEquals(AccessResult::forbidden("'csrf_token' URL query argument is invalid.")->setCacheMaxAge(0), $this->accessCheck->access($route, $request, $this->routeMatch));
+  }
+
+  /**
+   * @covers ::access
+   */
+  public function testCsrfTokenMissing() {
+    $this->csrfToken->expects($this->once())
+      ->method('validate')
+      ->with('', 'test-path')
+      ->will($this->returnValue(FALSE));
+
+    $this->routeMatch->expects($this->once())
+      ->method('getRawParameters')
+      ->will($this->returnValue([]));
+
+    $route = new Route('/test-path', [], ['_csrf_token' => 'TRUE']);
+    $request = Request::create('/test-path');
+    $this->assertEquals(AccessResult::forbidden("'csrf_token' URL query argument is missing.")->setCacheMaxAge(0), $this->accessCheck->access($route, $request, $this->routeMatch));
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
index 6eabd37cb..52ed59cc4 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
@@ -44,16 +44,16 @@ class CsrfTokenGeneratorTest extends UnitTestCase {
 
     $this->privateKey = $this->getMockBuilder('Drupal\Core\PrivateKey')
       ->disableOriginalConstructor()
-      ->setMethods(array('get'))
+      ->setMethods(['get'])
       ->getMock();
 
     $this->sessionMetadata = $this->getMockBuilder('Drupal\Core\Session\MetadataBag')
       ->disableOriginalConstructor()
       ->getMock();
 
-    $settings = array(
+    $settings = [
       'hash_salt' => $this->randomMachineName(),
-    );
+    ];
 
     new Settings($settings);
 
@@ -154,11 +154,11 @@ class CsrfTokenGeneratorTest extends UnitTestCase {
    *   An array of data used by the test.
    */
   public function providerTestValidateParameterTypes() {
-    return array(
-      array(array(), ''),
-      array(TRUE, 'foo'),
-      array(0, 'foo'),
-    );
+    return [
+      [[], ''],
+      [TRUE, 'foo'],
+      [0, 'foo'],
+    ];
   }
 
   /**
@@ -171,11 +171,11 @@ class CsrfTokenGeneratorTest extends UnitTestCase {
    *
    * @covers ::validate
    * @dataProvider providerTestInvalidParameterTypes
-   * @expectedException InvalidArgumentException
    */
   public function testInvalidParameterTypes($token, $value = '') {
     $this->setupDefaultExpectations();
 
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->generator->validate($token, $value);
   }
 
@@ -186,24 +186,24 @@ class CsrfTokenGeneratorTest extends UnitTestCase {
    *   An array of data used by the test.
    */
   public function providerTestInvalidParameterTypes() {
-    return array(
-      array(NULL, new \stdClass()),
-      array(0, array()),
-      array('', array()),
-      array(array(), array()),
-    );
+    return [
+      [NULL, new \stdClass()],
+      [0, []],
+      ['', []],
+      [[], []],
+    ];
   }
 
   /**
    * Tests the exception thrown when no 'hash_salt' is provided in settings.
    *
    * @covers ::get
-   * @expectedException \RuntimeException
    */
   public function testGetWithNoHashSalt() {
     // Update settings with no hash salt.
-    new Settings(array());
+    new Settings([]);
     $generator = new CsrfTokenGenerator($this->privateKey, $this->sessionMetadata);
+    $this->setExpectedException(\RuntimeException::class);
     $generator->get();
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php
index 36d330de3..9f0c2c9db 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php
@@ -59,12 +59,12 @@ class CustomAccessCheckTest extends UnitTestCase {
     $this->controllerResolver->expects($this->at(0))
       ->method('getControllerFromDefinition')
       ->with('\Drupal\Tests\Core\Access\TestController::accessDeny')
-      ->will($this->returnValue(array(new TestController(), 'accessDeny')));
+      ->will($this->returnValue([new TestController(), 'accessDeny']));
 
     $resolver0 = $this->getMock('Drupal\Component\Utility\ArgumentsResolverInterface');
     $resolver0->expects($this->once())
       ->method('getArguments')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->argumentsResolverFactory->expects($this->at(0))
       ->method('getArgumentsResolver')
       ->will($this->returnValue($resolver0));
@@ -72,12 +72,12 @@ class CustomAccessCheckTest extends UnitTestCase {
     $this->controllerResolver->expects($this->at(1))
       ->method('getControllerFromDefinition')
       ->with('\Drupal\Tests\Core\Access\TestController::accessAllow')
-      ->will($this->returnValue(array(new TestController(), 'accessAllow')));
+      ->will($this->returnValue([new TestController(), 'accessAllow']));
 
     $resolver1 = $this->getMock('Drupal\Component\Utility\ArgumentsResolverInterface');
     $resolver1->expects($this->once())
       ->method('getArguments')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->argumentsResolverFactory->expects($this->at(1))
       ->method('getArgumentsResolver')
       ->will($this->returnValue($resolver1));
@@ -85,24 +85,24 @@ class CustomAccessCheckTest extends UnitTestCase {
     $this->controllerResolver->expects($this->at(2))
       ->method('getControllerFromDefinition')
       ->with('\Drupal\Tests\Core\Access\TestController::accessParameter')
-      ->will($this->returnValue(array(new TestController(), 'accessParameter')));
+      ->will($this->returnValue([new TestController(), 'accessParameter']));
 
     $resolver2 = $this->getMock('Drupal\Component\Utility\ArgumentsResolverInterface');
     $resolver2->expects($this->once())
       ->method('getArguments')
-      ->will($this->returnValue(array('parameter' => 'TRUE')));
+      ->will($this->returnValue(['parameter' => 'TRUE']));
     $this->argumentsResolverFactory->expects($this->at(2))
       ->method('getArgumentsResolver')
       ->will($this->returnValue($resolver2));
 
-    $route = new Route('/test-route', array(), array('_custom_access' => '\Drupal\Tests\Core\Access\TestController::accessDeny'));
+    $route = new Route('/test-route', [], ['_custom_access' => '\Drupal\Tests\Core\Access\TestController::accessDeny']);
     $account = $this->getMock('Drupal\Core\Session\AccountInterface');
     $this->assertEquals(AccessResult::neutral(), $this->accessChecker->access($route, $route_match, $account));
 
-    $route = new Route('/test-route', array(), array('_custom_access' => '\Drupal\Tests\Core\Access\TestController::accessAllow'));
+    $route = new Route('/test-route', [], ['_custom_access' => '\Drupal\Tests\Core\Access\TestController::accessAllow']);
     $this->assertEquals(AccessResult::allowed(), $this->accessChecker->access($route, $route_match, $account));
 
-    $route = new Route('/test-route', array('parameter' => 'TRUE'), array('_custom_access' => '\Drupal\Tests\Core\Access\TestController::accessParameter'));
+    $route = new Route('/test-route', ['parameter' => 'TRUE'], ['_custom_access' => '\Drupal\Tests\Core\Access\TestController::accessParameter']);
     $this->assertEquals(AccessResult::allowed(), $this->accessChecker->access($route, $route_match, $account));
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php
index ad447f8b1..e46585844 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/DefaultAccessCheckTest.php
@@ -42,15 +42,15 @@ class DefaultAccessCheckTest extends UnitTestCase {
    * Test the access method.
    */
   public function testAccess() {
-    $request = new Request(array());
+    $request = new Request([]);
 
-    $route = new Route('/test-route', array(), array('_access' => 'NULL'));
+    $route = new Route('/test-route', [], ['_access' => 'NULL']);
     $this->assertEquals(AccessResult::neutral(), $this->accessChecker->access($route, $request, $this->account));
 
-    $route = new Route('/test-route', array(), array('_access' => 'FALSE'));
+    $route = new Route('/test-route', [], ['_access' => 'FALSE']);
     $this->assertEquals(AccessResult::forbidden(), $this->accessChecker->access($route, $request, $this->account));
 
-    $route = new Route('/test-route', array(), array('_access' => 'TRUE'));
+    $route = new Route('/test-route', [], ['_access' => 'TRUE']);
     $this->assertEquals(AccessResult::allowed(), $this->accessChecker->access($route, $request, $this->account));
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php b/web/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php
index d1f8f9e1f..2fef35f3d 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\Core\Access;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Access\RouteProcessorCsrf;
@@ -43,7 +44,7 @@ class RouteProcessorCsrfTest extends UnitTestCase {
       ->method('get');
 
     $route = new Route('/test-path');
-    $parameters = array();
+    $parameters = [];
 
     $bubbleable_metadata = new BubbleableMetadata();
     $this->processor->processOutbound('test', $route, $parameters, $bubbleable_metadata);
@@ -58,8 +59,8 @@ class RouteProcessorCsrfTest extends UnitTestCase {
    * Tests the processOutbound() method with a _csrf_token route requirement.
    */
   public function testProcessOutbound() {
-    $route = new Route('/test-path', array(), array('_csrf_token' => 'TRUE'));
-    $parameters = array();
+    $route = new Route('/test-path', [], ['_csrf_token' => 'TRUE']);
+    $parameters = [];
 
     $bubbleable_metadata = new BubbleableMetadata();
     $this->processor->processOutbound('test', $route, $parameters, $bubbleable_metadata);
@@ -68,7 +69,7 @@ class RouteProcessorCsrfTest extends UnitTestCase {
     // Bubbleable metadata of routes with a _csrf_token route requirement is a
     // placeholder.
     $path = 'test-path';
-    $placeholder = hash('sha1', $path);
+    $placeholder = Crypt::hashBase64($path);
     $placeholder_render_array = [
       '#lazy_builder' => ['route_processor_csrf:renderPlaceholderCsrfToken', [$path]],
     ];
@@ -80,15 +81,15 @@ class RouteProcessorCsrfTest extends UnitTestCase {
    * Tests the processOutbound() method with a dynamic path and one replacement.
    */
   public function testProcessOutboundDynamicOne() {
-    $route = new Route('/test-path/{slug}', array(), array('_csrf_token' => 'TRUE'));
-    $parameters = array('slug' => 100);
+    $route = new Route('/test-path/{slug}', [], ['_csrf_token' => 'TRUE']);
+    $parameters = ['slug' => 100];
 
     $bubbleable_metadata = new BubbleableMetadata();
     $this->processor->processOutbound('test', $route, $parameters, $bubbleable_metadata);
     // Bubbleable metadata of routes with a _csrf_token route requirement is a
     // placeholder.
     $path = 'test-path/100';
-    $placeholder = hash('sha1', $path);
+    $placeholder = Crypt::hashBase64($path);
     $placeholder_render_array = [
       '#lazy_builder' => ['route_processor_csrf:renderPlaceholderCsrfToken', [$path]],
     ];
@@ -99,15 +100,15 @@ class RouteProcessorCsrfTest extends UnitTestCase {
    * Tests the processOutbound() method with two parameter replacements.
    */
   public function testProcessOutboundDynamicTwo() {
-    $route = new Route('{slug_1}/test-path/{slug_2}', array(), array('_csrf_token' => 'TRUE'));
-    $parameters = array('slug_1' => 100, 'slug_2' => 'test');
+    $route = new Route('{slug_1}/test-path/{slug_2}', [], ['_csrf_token' => 'TRUE']);
+    $parameters = ['slug_1' => 100, 'slug_2' => 'test'];
 
     $bubbleable_metadata = new BubbleableMetadata();
     $this->processor->processOutbound('test', $route, $parameters, $bubbleable_metadata);
     // Bubbleable metadata of routes with a _csrf_token route requirement is a
     // placeholder.
     $path = '100/test-path/test';
-    $placeholder = hash('sha1', $path);
+    $placeholder = Crypt::hashBase64($path);
     $placeholder_render_array = [
       '#lazy_builder' => ['route_processor_csrf:renderPlaceholderCsrfToken', [$path]],
     ];
diff --git a/web/core/tests/Drupal/Tests/Core/Ajax/AjaxCommandsTest.php b/web/core/tests/Drupal/Tests/Core/Ajax/AjaxCommandsTest.php
index a076e545f..215d9224d 100644
--- a/web/core/tests/Drupal/Tests/Core/Ajax/AjaxCommandsTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Ajax/AjaxCommandsTest.php
@@ -38,10 +38,10 @@ class AjaxCommandsTest extends UnitTestCase {
   public function testAddCssCommand() {
     $command = new AddCssCommand('p{ text-decoration:blink; }');
 
-    $expected = array(
+    $expected = [
       'command' => 'add_css',
       'data' => 'p{ text-decoration:blink; }',
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -50,15 +50,15 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\AfterCommand
    */
   public function testAfterCommand() {
-    $command = new AfterCommand('#page-title', '<p>New Text!</p>', array('my-setting' => 'setting'));
+    $command = new AfterCommand('#page-title', '<p>New Text!</p>', ['my-setting' => 'setting']);
 
-    $expected = array(
+    $expected = [
       'command' => 'insert',
       'method' => 'after',
       'selector' => '#page-title',
       'data' => '<p>New Text!</p>',
-      'settings' => array('my-setting' => 'setting'),
-    );
+      'settings' => ['my-setting' => 'setting'],
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -68,10 +68,10 @@ class AjaxCommandsTest extends UnitTestCase {
    */
   public function testAlertCommand() {
     $command = new AlertCommand('Set condition 1 throughout the ship!');
-    $expected = array(
+    $expected = [
       'command' => 'alert',
       'text' => 'Set condition 1 throughout the ship!',
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -80,15 +80,15 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\AppendCommand
    */
   public function testAppendCommand() {
-    $command = new AppendCommand('#page-title', '<p>New Text!</p>', array('my-setting' => 'setting'));
+    $command = new AppendCommand('#page-title', '<p>New Text!</p>', ['my-setting' => 'setting']);
 
-    $expected = array(
+    $expected = [
       'command' => 'insert',
       'method' => 'append',
       'selector' => '#page-title',
       'data' => '<p>New Text!</p>',
-      'settings' => array('my-setting' => 'setting'),
-    );
+      'settings' => ['my-setting' => 'setting'],
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -97,15 +97,15 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\BeforeCommand
    */
   public function testBeforeCommand() {
-    $command = new BeforeCommand('#page-title', '<p>New Text!</p>', array('my-setting' => 'setting'));
+    $command = new BeforeCommand('#page-title', '<p>New Text!</p>', ['my-setting' => 'setting']);
 
-    $expected = array(
+    $expected = [
       'command' => 'insert',
       'method' => 'before',
       'selector' => '#page-title',
       'data' => '<p>New Text!</p>',
-      'settings' => array('my-setting' => 'setting'),
-    );
+      'settings' => ['my-setting' => 'setting'],
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -116,11 +116,11 @@ class AjaxCommandsTest extends UnitTestCase {
   public function testChangedCommand() {
     $command = new ChangedCommand('#page-title', '#page-title-changed');
 
-    $expected = array(
+    $expected = [
       'command' => 'changed',
       'selector' => '#page-title',
       'asterisk' => '#page-title-changed',
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -129,18 +129,18 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\CssCommand
    */
   public function testCssCommand() {
-    $command = new CssCommand('#page-title', array('text-decoration' => 'blink'));
+    $command = new CssCommand('#page-title', ['text-decoration' => 'blink']);
     $command->setProperty('font-size', '40px')->setProperty('font-weight', 'bold');
 
-    $expected = array(
+    $expected = [
       'command' => 'css',
       'selector' => '#page-title',
-      'argument' => array(
+      'argument' => [
         'text-decoration' => 'blink',
         'font-size' => '40px',
         'font-weight' => 'bold',
-      ),
-    );
+      ],
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -149,14 +149,14 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\DataCommand
    */
   public function testDataCommand() {
-    $command = new DataCommand('#page-title', 'my-data', array('key' => 'value'));
+    $command = new DataCommand('#page-title', 'my-data', ['key' => 'value']);
 
-    $expected = array(
+    $expected = [
       'command' => 'data',
       'selector' => '#page-title',
       'name' => 'my-data',
-      'value' => array('key' => 'value'),
-    );
+      'value' => ['key' => 'value'],
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -165,15 +165,15 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\HtmlCommand
    */
   public function testHtmlCommand() {
-    $command = new HtmlCommand('#page-title', '<p>New Text!</p>', array('my-setting' => 'setting'));
+    $command = new HtmlCommand('#page-title', '<p>New Text!</p>', ['my-setting' => 'setting']);
 
-    $expected = array(
+    $expected = [
       'command' => 'insert',
       'method' => 'html',
       'selector' => '#page-title',
       'data' => '<p>New Text!</p>',
-      'settings' => array('my-setting' => 'setting'),
-    );
+      'settings' => ['my-setting' => 'setting'],
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -182,15 +182,15 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\InsertCommand
    */
   public function testInsertCommand() {
-    $command = new InsertCommand('#page-title', '<p>New Text!</p>', array('my-setting' => 'setting'));
+    $command = new InsertCommand('#page-title', '<p>New Text!</p>', ['my-setting' => 'setting']);
 
-    $expected = array(
+    $expected = [
       'command' => 'insert',
       'method' => NULL,
       'selector' => '#page-title',
       'data' => '<p>New Text!</p>',
-      'settings' => array('my-setting' => 'setting'),
-    );
+      'settings' => ['my-setting' => 'setting'],
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -199,14 +199,14 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\InvokeCommand
    */
   public function testInvokeCommand() {
-    $command = new InvokeCommand('#page-title', 'myMethod', array('var1', 'var2'));
+    $command = new InvokeCommand('#page-title', 'myMethod', ['var1', 'var2']);
 
-    $expected = array(
+    $expected = [
       'command' => 'invoke',
       'selector' => '#page-title',
       'method' => 'myMethod',
-      'args' => array('var1', 'var2'),
-    );
+      'args' => ['var1', 'var2'],
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -215,15 +215,15 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\PrependCommand
    */
   public function testPrependCommand() {
-    $command = new PrependCommand('#page-title', '<p>New Text!</p>', array('my-setting' => 'setting'));
+    $command = new PrependCommand('#page-title', '<p>New Text!</p>', ['my-setting' => 'setting']);
 
-    $expected = array(
+    $expected = [
       'command' => 'insert',
       'method' => 'prepend',
       'selector' => '#page-title',
       'data' => '<p>New Text!</p>',
-      'settings' => array('my-setting' => 'setting'),
-    );
+      'settings' => ['my-setting' => 'setting'],
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -234,10 +234,10 @@ class AjaxCommandsTest extends UnitTestCase {
   public function testRemoveCommand() {
     $command = new RemoveCommand('#page-title');
 
-    $expected = array(
+    $expected = [
       'command' => 'remove',
       'selector' => '#page-title',
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -246,15 +246,15 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\ReplaceCommand
    */
   public function testReplaceCommand() {
-    $command = new ReplaceCommand('#page-title', '<p>New Text!</p>', array('my-setting' => 'setting'));
+    $command = new ReplaceCommand('#page-title', '<p>New Text!</p>', ['my-setting' => 'setting']);
 
-    $expected = array(
+    $expected = [
       'command' => 'insert',
       'method' => 'replaceWith',
       'selector' => '#page-title',
       'data' => '<p>New Text!</p>',
-      'settings' => array('my-setting' => 'setting'),
-    );
+      'settings' => ['my-setting' => 'setting'],
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -265,10 +265,10 @@ class AjaxCommandsTest extends UnitTestCase {
   public function testRestripeCommand() {
     $command = new RestripeCommand('#page-title');
 
-    $expected = array(
+    $expected = [
       'command' => 'restripe',
       'selector' => '#page-title',
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -277,13 +277,13 @@ class AjaxCommandsTest extends UnitTestCase {
    * @covers \Drupal\Core\Ajax\SettingsCommand
    */
   public function testSettingsCommand() {
-    $command = new SettingsCommand(array('key' => 'value'), TRUE);
+    $command = new SettingsCommand(['key' => 'value'], TRUE);
 
-    $expected = array(
+    $expected = [
       'command' => 'settings',
-      'settings' => array('key' => 'value'),
+      'settings' => ['key' => 'value'],
       'merge' => TRUE,
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -293,13 +293,13 @@ class AjaxCommandsTest extends UnitTestCase {
    */
   public function testOpenDialogCommand() {
     $command = $this->getMockBuilder('Drupal\Core\Ajax\OpenDialogCommand')
-      ->setConstructorArgs(array(
-        '#some-dialog', 'Title', '<p>Text!</p>', array(
+      ->setConstructorArgs([
+        '#some-dialog', 'Title', '<p>Text!</p>', [
           'url' => FALSE,
           'width' => 500,
-        ),
-      ))
-      ->setMethods(array('getRenderedContent'))
+        ],
+      ])
+      ->setMethods(['getRenderedContent'])
       ->getMock();
 
     // This method calls the render service, which isn't available. We want it
@@ -308,18 +308,18 @@ class AjaxCommandsTest extends UnitTestCase {
       ->method('getRenderedContent')
       ->willReturn('rendered content');
 
-    $expected = array(
+    $expected = [
       'command' => 'openDialog',
       'selector' => '#some-dialog',
       'settings' => NULL,
       'data' => 'rendered content',
-      'dialogOptions' => array(
+      'dialogOptions' => [
         'url' => FALSE,
         'width' => 500,
         'title' => 'Title',
         'modal' => FALSE,
-      ),
-    );
+      ],
+    ];
     $this->assertEquals($expected, $command->render());
   }
 
@@ -328,13 +328,13 @@ class AjaxCommandsTest extends UnitTestCase {
    */
   public function testOpenModalDialogCommand() {
     $command = $this->getMockBuilder('Drupal\Core\Ajax\OpenModalDialogCommand')
-      ->setConstructorArgs(array(
-        'Title', '<p>Text!</p>', array(
+      ->setConstructorArgs([
+        'Title', '<p>Text!</p>', [
           'url' => 'example',
           'width' => 500,
-        ),
-      ))
-      ->setMethods(array('getRenderedContent'))
+        ],
+      ])
+      ->setMethods(['getRenderedContent'])
       ->getMock();
 
     // This method calls the render service, which isn't available. We want it
@@ -343,18 +343,18 @@ class AjaxCommandsTest extends UnitTestCase {
       ->method('getRenderedContent')
       ->willReturn('rendered content');
 
-    $expected = array(
+    $expected = [
       'command' => 'openDialog',
       'selector' => '#drupal-modal',
       'settings' => NULL,
       'data' => 'rendered content',
-      'dialogOptions' => array(
+      'dialogOptions' => [
         'url' => 'example',
         'width' => 500,
         'title' => 'Title',
         'modal' => TRUE,
-      ),
-    );
+      ],
+    ];
     $this->assertEquals($expected, $command->render());
   }
 
@@ -363,11 +363,11 @@ class AjaxCommandsTest extends UnitTestCase {
    */
   public function testCloseModalDialogCommand() {
     $command = new CloseModalDialogCommand();
-    $expected = array(
+    $expected = [
       'command' => 'closeDialog',
       'selector' => '#drupal-modal',
       'persist' => FALSE,
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -377,11 +377,11 @@ class AjaxCommandsTest extends UnitTestCase {
    */
   public function testCloseDialogCommand() {
     $command = new CloseDialogCommand('#some-dialog', TRUE);
-    $expected = array(
+    $expected = [
       'command' => 'closeDialog',
       'selector' => '#some-dialog',
       'persist' => TRUE,
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -391,12 +391,12 @@ class AjaxCommandsTest extends UnitTestCase {
    */
   public function testSetDialogOptionCommand() {
     $command = new SetDialogOptionCommand('#some-dialog', 'width', '500');
-    $expected = array(
+    $expected = [
       'command' => 'setDialogOption',
       'selector' => '#some-dialog',
       'optionName' => 'width',
       'optionValue' => '500',
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -406,12 +406,12 @@ class AjaxCommandsTest extends UnitTestCase {
    */
   public function testSetDialogTitleCommand() {
     $command = new SetDialogTitleCommand('#some-dialog', 'Example');
-    $expected = array(
+    $expected = [
       'command' => 'setDialogOption',
       'selector' => '#some-dialog',
       'optionName' => 'title',
       'optionValue' => 'Example',
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
@@ -421,10 +421,10 @@ class AjaxCommandsTest extends UnitTestCase {
    */
   public function testRedirectCommand() {
     $command = new RedirectCommand('http://example.com');
-    $expected = array(
+    $expected = [
       'command' => 'redirect',
       'url' => 'http://example.com',
-    );
+    ];
 
     $this->assertEquals($expected, $command->render());
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php b/web/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php
index fcfa41392..880aaecf2 100644
--- a/web/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php
@@ -36,15 +36,15 @@ class AjaxResponseTest extends UnitTestCase {
     $command_one = $this->getMock('Drupal\Core\Ajax\CommandInterface');
     $command_one->expects($this->once())
       ->method('render')
-      ->will($this->returnValue(array('command' => 'one')));
+      ->will($this->returnValue(['command' => 'one']));
     $command_two = $this->getMock('Drupal\Core\Ajax\CommandInterface');
     $command_two->expects($this->once())
       ->method('render')
-      ->will($this->returnValue(array('command' => 'two')));
+      ->will($this->returnValue(['command' => 'two']));
     $command_three = $this->getMock('Drupal\Core\Ajax\CommandInterface');
     $command_three->expects($this->once())
       ->method('render')
-      ->will($this->returnValue(array('command' => 'three')));
+      ->will($this->returnValue(['command' => 'three']));
 
     $this->ajaxResponse->addCommand($command_one);
     $this->ajaxResponse->addCommand($command_two);
@@ -52,9 +52,9 @@ class AjaxResponseTest extends UnitTestCase {
 
     // Ensure that the added commands are in the right order.
     $commands =& $this->ajaxResponse->getCommands();
-    $this->assertSame($commands[1], array('command' => 'one'));
-    $this->assertSame($commands[2], array('command' => 'two'));
-    $this->assertSame($commands[0], array('command' => 'three'));
+    $this->assertSame($commands[1], ['command' => 'one']);
+    $this->assertSame($commands[2], ['command' => 'two']);
+    $this->assertSame($commands[0], ['command' => 'three']);
 
     // Remove one and change one element from commands and ensure the reference
     // worked as expected.
@@ -62,9 +62,9 @@ class AjaxResponseTest extends UnitTestCase {
     $commands[0]['class'] = 'test-class';
 
     $commands = $this->ajaxResponse->getCommands();
-    $this->assertSame($commands[1], array('command' => 'one'));
+    $this->assertSame($commands[1], ['command' => 'one']);
     $this->assertFalse(isset($commands[2]));
-    $this->assertSame($commands[0], array('command' => 'three', 'class' => 'test-class'));
+    $this->assertSame($commands[0], ['command' => 'three', 'class' => 'test-class']);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php b/web/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php
index ead56ae42..7be87f593 100644
--- a/web/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Annotation/TranslationTest.php
@@ -36,10 +36,10 @@ class TranslationTest extends UnitTestCase {
     $container->set('string_translation', $this->translationManager);
     \Drupal::setContainer($container);
 
-    $arguments = isset($values['arguments']) ? $values['arguments'] : array();
-    $options = isset($values['context']) ? array(
+    $arguments = isset($values['arguments']) ? $values['arguments'] : [];
+    $options = isset($values['context']) ? [
       'context' => $values['context'],
-    ) : array();
+    ] : [];
 
     $annotation = new Translation($values);
 
@@ -50,27 +50,27 @@ class TranslationTest extends UnitTestCase {
    * Provides data to self::testGet().
    */
   public function providerTestGet() {
-    $data = array();
-    $data[] = array(
-      array(
+    $data = [];
+    $data[] = [
+      [
         'value' => 'Foo',
-      ),
+      ],
       'Foo'
-    );
+    ];
     $random = $this->randomMachineName();
     $random_html_entity = '&' . $random;
-    $data[] = array(
-      array(
+    $data[] = [
+      [
         'value' => 'Foo @bar @baz %qux',
-        'arguments' => array(
+        'arguments' => [
           '@bar' => $random,
           '@baz' => $random_html_entity,
           '%qux' => $random_html_entity,
-        ),
+        ],
         'context' => $this->randomMachineName(),
-      ),
+      ],
       'Foo ' . $random . ' &amp;' . $random . ' <em class="placeholder">&amp;' . $random . '</em>',
-    );
+    ];
 
     return $data;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php b/web/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
index 00dbdf508..d2d7b855b 100644
--- a/web/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
@@ -153,6 +153,17 @@ class AssertLegacyTraitTest extends UnitTestCase {
     $this->assertOptionSelected('myselect', 'two');
   }
 
+  /**
+   * @covers ::assertNoPattern
+   */
+  public function testAssertNoPattern() {
+    $this->webAssert
+      ->responseNotMatches('/.*foo$/')
+      ->shouldBeCalled();
+
+    $this->assertNoPattern('/.*foo$/');
+  }
+
   /**
    * Returns a mocked behat session object.
    *
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php b/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php
index 107cb2e2b..6ed63aa95 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php
@@ -106,7 +106,7 @@ class AssetResolverTest extends UnitTestCase {
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
       ->will($this->onConsecutiveCalls($english, $english, $japanese, $japanese));
-    $this->cache = new TestMemoryBackend('llama');
+    $this->cache = new TestMemoryBackend();
 
     $this->assetResolver = new AssetResolver($this->libraryDiscovery, $this->libraryDependencyResolver, $this->moduleHandler, $this->themeManager, $this->languageManager, $this->cache);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php b/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
index 1e380c861..b5e6bc8a4 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
@@ -28,79 +28,79 @@ class CssCollectionGrouperUnitTest extends UnitTestCase {
   /**
    * Tests \Drupal\Core\Asset\CssCollectionGrouper.
    */
-  function testGrouper() {
-    $css_assets = array(
-      'system.base.css' => array(
+  public function testGrouper() {
+    $css_assets = [
+      'system.base.css' => [
         'group' => -100,
         'type' => 'file',
         'weight' => 0.012,
         'media' => 'all',
         'preprocess' => TRUE,
         'data' => 'core/modules/system/system.base.css',
-        'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+        'browsers' => ['IE' => TRUE, '!IE' => TRUE],
         'basename' => 'system.base.css',
-      ),
-      'js.module.css' => array(
+      ],
+      'js.module.css' => [
         'group' => -100,
         'type' => 'file',
         'weight' => 0.013,
         'media' => 'all',
         'preprocess' => TRUE,
         'data' => 'core/modules/system/js.module.css',
-        'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+        'browsers' => ['IE' => TRUE, '!IE' => TRUE],
         'basename' => 'js.module.css',
-      ),
-      'jquery.ui.core.css' => array(
+      ],
+      'jquery.ui.core.css' => [
         'group' => -100,
         'type' => 'file',
         'weight' => 0.004,
         'media' => 'all',
         'preprocess' => TRUE,
         'data' => 'core/misc/ui/themes/base/jquery.ui.core.css',
-        'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+        'browsers' => ['IE' => TRUE, '!IE' => TRUE],
         'basename' => 'jquery.ui.core.css',
-      ),
-      'field.css' => array(
+      ],
+      'field.css' => [
         'group' => 0,
         'type' => 'file',
         'weight' => 0.011,
         'media' => 'all',
         'preprocess' => TRUE,
         'data' => 'core/modules/field/theme/field.css',
-        'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+        'browsers' => ['IE' => TRUE, '!IE' => TRUE],
         'basename' => 'field.css',
-      ),
-      'external.css' => array(
+      ],
+      'external.css' => [
         'group' => 0,
         'type' => 'external',
         'weight' => 0.009,
         'media' => 'all',
         'preprocess' => TRUE,
         'data' => 'http://example.com/external.css',
-        'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+        'browsers' => ['IE' => TRUE, '!IE' => TRUE],
         'basename' => 'external.css',
-      ),
-      'elements.css' => array(
+      ],
+      'elements.css' => [
         'group' => 100,
         'media' => 'all',
         'type' => 'file',
         'weight' => 0.001,
         'preprocess' => TRUE,
         'data' => 'core/themes/bartik/css/base/elements.css',
-        'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+        'browsers' => ['IE' => TRUE, '!IE' => TRUE],
         'basename' => 'elements.css',
-      ),
-      'print.css' => array(
+      ],
+      'print.css' => [
         'group' => 100,
         'media' => 'print',
         'type' => 'file',
         'weight' => 0.003,
         'preprocess' => TRUE,
         'data' => 'core/themes/bartik/css/print.css',
-        'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+        'browsers' => ['IE' => TRUE, '!IE' => TRUE],
         'basename' => 'print.css',
-      ),
-    );
+      ],
+    ];
 
     $groups = $this->grouper->group($css_assets);
 
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php b/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
index 860266105..c7f1f3d56 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
@@ -39,35 +39,35 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
     $this->state = $this->getMock('Drupal\Core\State\StateInterface');
 
     $this->renderer = new CssCollectionRenderer($this->state);
-    $this->fileCssGroup = array(
+    $this->fileCssGroup = [
       'group' => -100,
       'type' => 'file',
       'media' => 'all',
       'preprocess' => TRUE,
-      'browsers' => array('IE' => TRUE, '!IE' => TRUE),
-      'items' => array(
-        0 => array(
+      'browsers' => ['IE' => TRUE, '!IE' => TRUE],
+      'items' => [
+        0 => [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.012,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => 'tests/Drupal/Tests/Core/Asset/foo.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'foo.css',
-        ),
-        1 => array(
+        ],
+        1 => [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.013,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => 'tests/Drupal/Tests/Core/Asset/bar.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'bar.css',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -75,60 +75,60 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
    *
    * @see testRender
    */
-  function providerTestRender() {
-    $create_link_element = function($href, $media = 'all', $browsers = array()) {
-      return array(
+  public function providerTestRender() {
+    $create_link_element = function($href, $media = 'all', $browsers = []) {
+      return [
         '#type' => 'html_tag',
         '#tag' => 'link',
-        '#attributes' => array(
+        '#attributes' => [
           'rel' => 'stylesheet',
           'href' => $href,
           'media' => $media,
-        ),
+        ],
         '#browsers' => $browsers,
-      );
+      ];
     };
-    $create_style_element = function($value, $media, $browsers = array()) {
-      $style_element = array(
+    $create_style_element = function($value, $media, $browsers = []) {
+      $style_element = [
         '#type' => 'html_tag',
         '#tag' => 'style',
         '#value' => $value,
-        '#attributes' => array(
+        '#attributes' => [
           'media' => $media
-        ),
+        ],
         '#browsers' => $browsers,
-      );
+      ];
       return $style_element;
     };
 
     $create_file_css_asset = function($data, $media = 'all', $preprocess = TRUE) {
-      return array('group' => 0, 'type' => 'file', 'media' => $media, 'preprocess' => $preprocess, 'data' => $data, 'browsers' => array());
+      return ['group' => 0, 'type' => 'file', 'media' => $media, 'preprocess' => $preprocess, 'data' => $data, 'browsers' => []];
     };
 
-    return array(
+    return [
       // Single external CSS asset.
-      0 => array(
+      0 => [
         // CSS assets.
-        array(
-          0 => array('group' => 0, 'type' => 'external', 'media' => 'all', 'preprocess' => TRUE, 'data' => 'http://example.com/popular.js', 'browsers' => array()),
-        ),
+        [
+          0 => ['group' => 0, 'type' => 'external', 'media' => 'all', 'preprocess' => TRUE, 'data' => 'http://example.com/popular.js', 'browsers' => []],
+        ],
         // Render elements.
-        array(
+        [
           0 => $create_link_element('http://example.com/popular.js', 'all'),
-        ),
-      ),
+        ],
+      ],
       // Single file CSS asset.
-      2 => array(
-        array(
-          0 => array('group' => 0, 'type' => 'file', 'media' => 'all', 'preprocess' => TRUE, 'data' => 'public://css/file-all', 'browsers' => array()),
-        ),
-        array(
+      2 => [
+        [
+          0 => ['group' => 0, 'type' => 'file', 'media' => 'all', 'preprocess' => TRUE, 'data' => 'public://css/file-all', 'browsers' => []],
+        ],
+        [
           0 => $create_link_element(file_url_transform_relative(file_create_url('public://css/file-all')) . '?0', 'all'),
-        ),
-      ),
+        ],
+      ],
       // 31 file CSS assets: expect 31 link elements.
-      3 => array(
-        array(
+      3 => [
+        [
           0 => $create_file_css_asset('public://css/1.css'),
           1 => $create_file_css_asset('public://css/2.css'),
           2 => $create_file_css_asset('public://css/3.css'),
@@ -160,8 +160,8 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
           28 => $create_file_css_asset('public://css/29.css'),
           29 => $create_file_css_asset('public://css/30.css'),
           30 => $create_file_css_asset('public://css/31.css'),
-        ),
-        array(
+        ],
+        [
           0 => $create_link_element(file_url_transform_relative(file_create_url('public://css/1.css')) . '?0'),
           1 => $create_link_element(file_url_transform_relative(file_create_url('public://css/2.css')) . '?0'),
           2 => $create_link_element(file_url_transform_relative(file_create_url('public://css/3.css')) . '?0'),
@@ -193,11 +193,11 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
           28 => $create_link_element(file_url_transform_relative(file_create_url('public://css/29.css')) . '?0'),
           29 => $create_link_element(file_url_transform_relative(file_create_url('public://css/30.css')) . '?0'),
           30 => $create_link_element(file_url_transform_relative(file_create_url('public://css/31.css')) . '?0'),
-        ),
-      ),
+        ],
+      ],
       // 32 file CSS assets with the same properties: expect 2 style elements.
-      4 => array(
-        array(
+      4 => [
+        [
           0 => $create_file_css_asset('public://css/1.css'),
           1 => $create_file_css_asset('public://css/2.css'),
           2 => $create_file_css_asset('public://css/3.css'),
@@ -230,8 +230,8 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
           29 => $create_file_css_asset('public://css/30.css'),
           30 => $create_file_css_asset('public://css/31.css'),
           31 => $create_file_css_asset('public://css/32.css'),
-        ),
-        array(
+        ],
+        [
           0 => $create_style_element('
 @import url("' . file_url_transform_relative(file_create_url('public://css/1.css')) . '?0");
 @import url("' . file_url_transform_relative(file_create_url('public://css/2.css')) . '?0");
@@ -268,13 +268,13 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
           1 => $create_style_element('
 @import url("' . file_url_transform_relative(file_create_url('public://css/32.css')) . '?0");
 ', 'all'),
-        ),
-      ),
+        ],
+      ],
       // 32 file CSS assets with the same properties, except for the 10th and
       // 20th files, they have different 'media' properties. Expect 5 style
       // elements.
-      5 => array(
-        array(
+      5 => [
+        [
           0 => $create_file_css_asset('public://css/1.css'),
           1 => $create_file_css_asset('public://css/2.css'),
           2 => $create_file_css_asset('public://css/3.css'),
@@ -307,8 +307,8 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
           29 => $create_file_css_asset('public://css/30.css'),
           30 => $create_file_css_asset('public://css/31.css'),
           31 => $create_file_css_asset('public://css/32.css'),
-        ),
-        array(
+        ],
+        [
           0 => $create_style_element('
 @import url("' . file_url_transform_relative(file_create_url('public://css/1.css')) . '?0");
 @import url("' . file_url_transform_relative(file_create_url('public://css/2.css')) . '?0");
@@ -351,12 +351,12 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
 @import url("' . file_url_transform_relative(file_create_url('public://css/31.css')) . '?0");
 @import url("' . file_url_transform_relative(file_create_url('public://css/32.css')) . '?0");
 ', 'all'),
-        ),
-      ),
+        ],
+      ],
       // 32 file CSS assets with the same properties, except for the 15th, which
       // has 'preprocess' = FALSE. Expect 1 link element and 2 style elements.
-      6 => array(
-        array(
+      6 => [
+        [
           0 => $create_file_css_asset('public://css/1.css'),
           1 => $create_file_css_asset('public://css/2.css'),
           2 => $create_file_css_asset('public://css/3.css'),
@@ -389,8 +389,8 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
           29 => $create_file_css_asset('public://css/30.css'),
           30 => $create_file_css_asset('public://css/31.css'),
           31 => $create_file_css_asset('public://css/32.css'),
-        ),
-        array(
+        ],
+        [
           0 => $create_style_element('
 @import url("' . file_url_transform_relative(file_create_url('public://css/1.css')) . '?0");
 @import url("' . file_url_transform_relative(file_create_url('public://css/2.css')) . '?0");
@@ -427,9 +427,9 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
 @import url("' . file_url_transform_relative(file_create_url('public://css/31.css')) . '?0");
 @import url("' . file_url_transform_relative(file_create_url('public://css/32.css')) . '?0");
 ', 'all'),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -437,7 +437,7 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
    *
    * @dataProvider providerTestRender
    */
-  function testRender(array $css_assets, array $render_elements) {
+  public function testRender(array $css_assets, array $render_elements) {
     $this->state->expects($this->once())
       ->method('get')
       ->with('system.css_js_query_string')
@@ -448,21 +448,21 @@ class CssCollectionRendererUnitTest extends UnitTestCase {
   /**
    * Tests a CSS asset group with the invalid 'type' => 'internal'.
    */
-  function testRenderInvalidType() {
+  public function testRenderInvalidType() {
     $this->state->expects($this->once())
       ->method('get')
       ->with('system.css_js_query_string')
       ->will($this->returnValue(NULL));
     $this->setExpectedException('Exception', 'Invalid CSS asset type.');
 
-    $css_group = array(
+    $css_group = [
       'group' => 0,
       'type' => 'internal',
       'media' => 'all',
       'preprocess' => TRUE,
-      'browsers' => array(),
+      'browsers' => [],
       'data' => 'http://example.com/popular.js'
-    );
+    ];
     $this->renderer->render($css_group);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php b/web/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
index 23ff2ad79..59ddca0e0 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
@@ -33,27 +33,27 @@ class CssOptimizerUnitTest extends UnitTestCase {
   /**
    * Provides data for the CSS asset optimizing test.
    */
-  function providerTestOptimize() {
+  public function providerTestOptimize() {
     $path = 'core/tests/Drupal/Tests/Core/Asset/css_test_files/';
     $absolute_path = dirname(__FILE__) . '/css_test_files/';
-    return array(
+    return [
       // File. Tests:
       // - Stripped comments and white-space.
       // - Retain white-space in selectors. (https://www.drupal.org/node/472820)
       // - Retain pseudo-selectors. (https://www.drupal.org/node/460448)
-      array(
-        array(
+      [
+        [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.012,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => $path . 'css_input_without_import.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'css_input_without_import.css',
-        ),
+        ],
         file_get_contents($absolute_path . 'css_input_without_import.css.optimized.css'),
-      ),
+      ],
       // File. Tests:
       // - Proper URLs in imported files. (https://www.drupal.org/node/265719)
       // - A background image with relative paths, which must be rewritten.
@@ -61,133 +61,146 @@ class CssOptimizerUnitTest extends UnitTestCase {
       //   file_create_url(). (https://www.drupal.org/node/1961340)
       // - Imported files that are external (protocol-relative URL or not)
       //   should not be expanded. (https://www.drupal.org/node/2014851)
-      array(
-        array(
+      [
+        [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.013,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => $path . 'css_input_with_import.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'css_input_with_import.css',
-        ),
+        ],
         str_replace('url(images/icon.png)', 'url(' . file_url_transform_relative(file_create_url($path . 'images/icon.png')) . ')', file_get_contents($absolute_path . 'css_input_with_import.css.optimized.css')),
-      ),
+      ],
       // File. Tests:
       // - Retain comment hacks.
-      array(
-        array(
+      [
+        [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.013,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => $path . 'comment_hacks.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'comment_hacks.css',
-        ),
+        ],
         file_get_contents($absolute_path . 'comment_hacks.css.optimized.css'),
-      ),
+      ],
       // File in subfolder. Tests:
       // - CSS import path is properly interpreted.
       //   (https://www.drupal.org/node/1198904)
       // - Don't adjust data URIs (https://www.drupal.org/node/2142441)
-      array(
-        array(
+      [
+        [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.013,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => $path . 'css_subfolder/css_input_with_import.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'css_input_with_import.css',
-        ),
+        ],
         str_replace('url(../images/icon.png)', 'url(' . file_url_transform_relative(file_create_url($path . 'images/icon.png')) . ')', file_get_contents($absolute_path . 'css_subfolder/css_input_with_import.css.optimized.css')),
-      ),
+      ],
       // File. Tests:
       // - Any @charaset declaration at the beginning of a file should be
       //   removed without breaking subsequent CSS.
-      array(
-        array(
+      [
+        [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.013,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => $path . 'charset_sameline.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'charset_sameline.css',
-        ),
+        ],
         file_get_contents($absolute_path . 'charset.css.optimized.css'),
-      ),
-      array(
-        array(
+      ],
+      [
+        [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.013,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => $path . 'charset_newline.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'charset_newline.css',
-        ),
+        ],
         file_get_contents($absolute_path . 'charset.css.optimized.css'),
-      ),
-      array(
-        array(
+      ],
+      [
+        [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.013,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => $path . 'css_input_with_bom.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'css_input_with_bom.css',
-        ),
+        ],
         '.byte-order-mark-test{content:"☃";}' . "\n",
-      ),
-      array(
-        array(
+      ],
+      [
+        [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.013,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => $path . 'css_input_with_charset.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'css_input_with_charset.css',
-        ),
+        ],
         '.charset-test{content:"€";}' . "\n",
-      ),
-      array(
-        array(
+      ],
+      [
+        [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.013,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => $path . 'css_input_with_bom_and_charset.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'css_input_with_bom_and_charset.css',
-        ),
+        ],
         '.byte-order-mark-charset-test{content:"☃";}' . "\n",
-      ),
-      array(
-        array(
+      ],
+      [
+        [
           'group' => -100,
           'type' => 'file',
           'weight' => 0.013,
           'media' => 'all',
           'preprocess' => TRUE,
           'data' => $path . 'css_input_with_utf16_bom.css',
-          'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
           'basename' => 'css_input_with_utf16_bom.css',
-        ),
+        ],
         '.utf16-byte-order-mark-test{content:"☃";}' . "\n",
-      ),
-    );
+      ],
+      [
+        [
+          'group' => -100,
+          'type' => 'file',
+          'weight' => 0.013,
+          'media' => 'all',
+          'preprocess' => TRUE,
+          'data' => $path . 'quotes.css',
+          'browsers' => ['IE' => TRUE, '!IE' => TRUE],
+          'basename' => 'quotes.css',
+        ],
+        file_get_contents($absolute_path . 'quotes.css.optimized.css'),
+      ],
+    ];
   }
 
   /**
@@ -195,7 +208,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
    *
    * @dataProvider providerTestOptimize
    */
-  function testOptimize($css_asset, $expected) {
+  public function testOptimize($css_asset, $expected) {
     global $base_path;
     $original_base_path = $base_path;
     $base_path = '/';
@@ -213,10 +226,10 @@ class CssOptimizerUnitTest extends UnitTestCase {
   /**
    * Tests a file CSS asset with preprocessing disabled.
    */
-  function testTypeFilePreprocessingDisabled() {
+  public function testTypeFilePreprocessingDisabled() {
     $this->setExpectedException('Exception', 'Only file CSS assets with preprocessing enabled can be optimized.');
 
-    $css_asset = array(
+    $css_asset = [
       'group' => -100,
       'type' => 'file',
       'weight' => 0.012,
@@ -224,19 +237,19 @@ class CssOptimizerUnitTest extends UnitTestCase {
       // Preprocessing disabled.
       'preprocess' => FALSE,
       'data' => 'tests/Drupal/Tests/Core/Asset/foo.css',
-      'browsers' => array('IE' => TRUE, '!IE' => TRUE),
+      'browsers' => ['IE' => TRUE, '!IE' => TRUE],
       'basename' => 'foo.css',
-    );
+    ];
     $this->optimizer->optimize($css_asset);
   }
 
   /**
    * Tests a CSS asset with 'type' => 'external'.
    */
-  function testTypeExternal() {
+  public function testTypeExternal() {
     $this->setExpectedException('Exception', 'Only file CSS assets can be optimized.');
 
-    $css_asset = array(
+    $css_asset = [
       'group' => -100,
       // Type external.
       'type' => 'external',
@@ -244,8 +257,8 @@ class CssOptimizerUnitTest extends UnitTestCase {
       'media' => 'all',
       'preprocess' => TRUE,
       'data' => 'http://example.com/foo.js',
-      'browsers' => array('IE' => TRUE, '!IE' => TRUE),
-    );
+      'browsers' => ['IE' => TRUE, '!IE' => TRUE],
+    ];
     $this->optimizer->optimize($css_asset);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php b/web/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php
index df71c220d..39a4d00f6 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php
@@ -36,34 +36,34 @@ class JsOptimizerUnitTest extends UnitTestCase {
    * @returns array
    *   An array of test data.
    */
-  function providerTestClean() {
+  public function providerTestClean() {
     $path = dirname(__FILE__) . '/js_test_files/';
-    return array(
+    return [
       // File. Tests:
       // - Stripped sourceMappingURL with comment # syntax.
-      0 => array(
+      0 => [
         file_get_contents($path . 'source_mapping_url.min.js'),
         file_get_contents($path . 'source_mapping_url.min.js.optimized.js'),
-      ),
+      ],
       // File. Tests:
       // - Stripped sourceMappingURL with comment @ syntax.
-      1 => array(
+      1 => [
         file_get_contents($path . 'source_mapping_url_old.min.js'),
         file_get_contents($path . 'source_mapping_url_old.min.js.optimized.js'),
-      ),
+      ],
       // File. Tests:
       // - Stripped sourceURL with comment # syntax.
-      2 => array(
+      2 => [
         file_get_contents($path . 'source_url.min.js'),
         file_get_contents($path . 'source_url.min.js.optimized.js'),
-      ),
+      ],
       // File. Tests:
       // - Stripped sourceURL with comment @ syntax.
-      3 => array(
+      3 => [
         file_get_contents($path . 'source_url_old.min.js'),
         file_get_contents($path . 'source_url_old.min.js.optimized.js'),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -71,7 +71,7 @@ class JsOptimizerUnitTest extends UnitTestCase {
    *
    * @dataProvider providerTestClean
    */
-  function testClean($js_asset, $expected) {
+  public function testClean($js_asset, $expected) {
     $this->assertEquals($expected, $this->optimizer->clean($js_asset));
   }
 
@@ -83,35 +83,35 @@ class JsOptimizerUnitTest extends UnitTestCase {
    * @returns array
    *   An array of test data.
    */
-  function providerTestOptimize() {
+  public function providerTestOptimize() {
     $path = dirname(__FILE__) . '/js_test_files/';
-    return array(
-      0 => array(
-        array(
+    return [
+      0 => [
+        [
           'type' => 'file',
           'preprocess' => TRUE,
           'data' => $path . 'utf8_bom.js',
-        ),
+        ],
         file_get_contents($path . 'utf8_bom.js.optimized.js'),
-      ),
-      1 => array(
-        array(
+      ],
+      1 => [
+        [
           'type' => 'file',
           'preprocess' => TRUE,
           'data' => $path . 'utf16_bom.js',
-        ),
+        ],
         file_get_contents($path . 'utf16_bom.js.optimized.js'),
-      ),
-      2 => array(
-        array(
+      ],
+      2 => [
+        [
           'type' => 'file',
           'preprocess' => TRUE,
           'data' => $path . 'latin_9.js',
-          'attributes' => array('charset' => 'ISO-8859-15'),
-        ),
+          'attributes' => ['charset' => 'ISO-8859-15'],
+        ],
         file_get_contents($path . 'latin_9.js.optimized.js'),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -119,7 +119,7 @@ class JsOptimizerUnitTest extends UnitTestCase {
    *
    * @dataProvider providerTestOptimize
    */
-  function testOptimize($js_asset, $expected) {
+  public function testOptimize($js_asset, $expected) {
     $this->assertEquals($expected, $this->optimizer->optimize($js_asset));
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php
index a7a026a82..40e182108 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php
@@ -37,7 +37,7 @@ class LibraryDependencyResolverTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $libraryData = array(
+  protected $libraryData = [
     'no_deps_a' => ['js' => [], 'css' => []],
     'no_deps_b' => ['js' => [], 'css' => []],
     'no_deps_c' => ['js' => [], 'css' => []],
@@ -47,7 +47,7 @@ class LibraryDependencyResolverTest extends UnitTestCase {
     'nested_deps_a' => ['js' => [], 'css' => [], 'dependencies' => ['test/deps_a']],
     'nested_deps_b' => ['js' => [], 'css' => [], 'dependencies' => ['test/nested_deps_a']],
     'nested_deps_c' => ['js' => [], 'css' => [], 'dependencies' => ['test/nested_deps_b']],
-  );
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
index 0d82bfbe6..2eb34d33f 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
@@ -52,16 +52,16 @@ class LibraryDiscoveryCollectorTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $libraryData = array(
-    'test_1' => array(
-      'js' => array(),
-      'css' => array(),
-    ),
-    'test_2' => array(
-      'js' => array(),
-      'css' => array(),
-    ),
-  );
+  protected $libraryData = [
+    'test_1' => [
+      'js' => [],
+      'css' => [],
+    ],
+    'test_2' => [
+      'js' => [],
+      'css' => [],
+    ],
+  ];
 
   protected $activeTheme;
 
@@ -140,7 +140,7 @@ class LibraryDiscoveryCollectorTest extends UnitTestCase {
       ->willReturn(FALSE);
     $this->cache->expects($this->once())
       ->method('set')
-      ->with('library_info:kitten_theme', array('test' => $this->libraryData), Cache::PERMANENT, ['library_info']);
+      ->with('library_info:kitten_theme', ['test' => $this->libraryData], Cache::PERMANENT, ['library_info']);
     $this->lock->expects($this->once())
       ->method('release')
       ->with($lock_key);
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
index 121aebc95..f65d93233 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
@@ -7,6 +7,9 @@
 
 namespace Drupal\Tests\Core\Asset;
 
+use Drupal\Core\Asset\Exception\IncompleteLibraryDefinitionException;
+use Drupal\Core\Asset\Exception\InvalidLibraryFileException;
+use Drupal\Core\Asset\Exception\LibraryDefinitionMissingLicenseException;
 use Drupal\Core\Asset\LibraryDiscoveryParser;
 use Drupal\Tests\UnitTestCase;
 
@@ -137,14 +140,12 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
     $path = substr($path, strlen($this->root) + 1);
     $this->libraryDiscoveryParser->setPaths('module', 'example_module', $path);
 
-    $this->assertSame($this->libraryDiscoveryParser->buildByExtension('example_module'), array());
+    $this->assertSame($this->libraryDiscoveryParser->buildByExtension('example_module'), []);
   }
 
   /**
    * Tests that an exception is thrown when a libraries file couldn't be parsed.
    *
-   * @expectedException \Drupal\Core\Asset\Exception\InvalidLibraryFileException
-   *
    * @covers ::buildByExtension
    */
   public function testInvalidLibrariesFile() {
@@ -157,15 +158,13 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
     $path = substr($path, strlen($this->root) + 1);
     $this->libraryDiscoveryParser->setPaths('module', 'invalid_file', $path);
 
+    $this->setExpectedException(InvalidLibraryFileException::class);
     $this->libraryDiscoveryParser->buildByExtension('invalid_file');
   }
 
   /**
    * Tests that an exception is thrown when no CSS/JS/setting is specified.
    *
-   * @expectedException \Drupal\Core\Asset\Exception\IncompleteLibraryDefinitionException
-   * @expectedExceptionMessage Incomplete library definition for definition 'example' in extension 'example_module_missing_information'
-   *
    * @covers ::buildByExtension
    */
   public function testBuildByExtensionWithMissingInformation() {
@@ -178,6 +177,7 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
     $path = substr($path, strlen($this->root) + 1);
     $this->libraryDiscoveryParser->setPaths('module', 'example_module_missing_information', $path);
 
+    $this->setExpectedException(IncompleteLibraryDefinitionException::class, "Incomplete library definition for definition 'example' in extension 'example_module_missing_information'");
     $this->libraryDiscoveryParser->buildByExtension('example_module_missing_information');
   }
 
@@ -276,8 +276,6 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
   /**
    * Ensures that you cannot provide positive weights for JavaScript libraries.
    *
-   * @expectedException \UnexpectedValueException
-   *
    * @covers ::buildByExtension
    */
   public function testJsWithPositiveWeight() {
@@ -290,6 +288,7 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
     $path = substr($path, strlen($this->root) + 1);
     $this->libraryDiscoveryParser->setPaths('module', 'js_positive_weight', $path);
 
+    $this->setExpectedException(\UnexpectedValueException::class);
     $this->libraryDiscoveryParser->buildByExtension('js_positive_weight');
   }
 
@@ -320,7 +319,7 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
     $this->assertEquals('file', $library['css'][0]['type']);
     $this->assertEquals($path . '/css/base.css', $library['css'][0]['data']);
 
-    $this->assertEquals(array('key' => 'value'), $library['drupalSettings']);
+    $this->assertEquals(['key' => 'value'], $library['drupalSettings']);
   }
 
   /**
@@ -403,9 +402,6 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
   /**
    * Tests that an exception is thrown when license is missing when 3rd party.
    *
-   * @expectedException \Drupal\Core\Asset\Exception\LibraryDefinitionMissingLicenseException
-   * @expectedExceptionMessage Missing license information in library definition for definition 'no-license-info-but-remote' extension 'licenses_missing_information': it has a remote, but no license.
-   *
    * @covers ::buildByExtension
    */
   public function testLibraryThirdPartyWithMissingLicense() {
@@ -418,6 +414,7 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
     $path = substr($path, strlen($this->root) + 1);
     $this->libraryDiscoveryParser->setPaths('module', 'licenses_missing_information', $path);
 
+    $this->setExpectedException(LibraryDefinitionMissingLicenseException::class, "Missing license information in library definition for definition 'no-license-info-but-remote' extension 'licenses_missing_information': it has a remote, but no license.");
     $this->libraryDiscoveryParser->buildByExtension('licenses_missing_information');
   }
 
@@ -443,65 +440,65 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
     $this->assertCount(1, $library['css']);
     $this->assertCount(1, $library['js']);
     $this->assertTrue(isset($library['license']));
-    $default_license = array(
+    $default_license = [
       'name' => 'GNU-GPL-2.0-or-later',
       'url' => 'https://www.drupal.org/licensing/faq',
       'gpl-compatible' => TRUE,
-    );
+    ];
     $this->assertEquals($library['license'], $default_license);
 
     // GPL2-licensed libraries.
     $library = $libraries['gpl2'];
     $this->assertCount(1, $library['css']);
     $this->assertCount(1, $library['js']);
-    $expected_license = array(
+    $expected_license = [
       'name' => 'gpl2',
       'url' => 'https://url-to-gpl2-license',
       'gpl-compatible' => TRUE,
-    );
+    ];
     $this->assertEquals($library['license'], $expected_license);
 
     // MIT-licensed libraries.
     $library = $libraries['mit'];
     $this->assertCount(1, $library['css']);
     $this->assertCount(1, $library['js']);
-    $expected_license = array(
+    $expected_license = [
       'name' => 'MIT',
       'url' => 'https://url-to-mit-license',
       'gpl-compatible' => TRUE,
-    );
+    ];
     $this->assertEquals($library['license'], $expected_license);
 
     // Libraries in the Public Domain.
     $library = $libraries['public-domain'];
     $this->assertCount(1, $library['css']);
     $this->assertCount(1, $library['js']);
-    $expected_license = array(
+    $expected_license = [
       'name' => 'Public Domain',
       'url' => 'https://url-to-public-domain-license',
       'gpl-compatible' => TRUE,
-    );
+    ];
     $this->assertEquals($library['license'], $expected_license);
 
     // Apache-licensed libraries.
     $library = $libraries['apache'];
     $this->assertCount(1, $library['css']);
     $this->assertCount(1, $library['js']);
-    $expected_license = array(
+    $expected_license = [
       'name' => 'apache',
       'url' => 'https://url-to-apache-license',
       'gpl-compatible' => FALSE,
-    );
+    ];
     $this->assertEquals($library['license'], $expected_license);
 
     // Copyrighted libraries.
     $library = $libraries['copyright'];
     $this->assertCount(1, $library['css']);
     $this->assertCount(1, $library['js']);
-    $expected_license = array(
+    $expected_license = [
       'name' => '© Some company',
       'gpl-compatible' => FALSE,
-    );
+    ];
     $this->assertEquals($library['license'], $expected_license);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/css_test_files/quotes.css b/web/core/tests/Drupal/Tests/Core/Asset/css_test_files/quotes.css
new file mode 100644
index 000000000..3fe0f7d50
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Asset/css_test_files/quotes.css
@@ -0,0 +1,31 @@
+/* Example from https://www.w3.org/TR/CSS2/syndata.html#rule-sets */
+q[example="public class foo\
+{\
+    private int x;\
+\
+    foo(int x) {\
+        this.x = x;\
+    }\
+\
+}"] { color: red }
+
+/* A pseudo selector with essential whitespace wrapped in quotes. */
+q[style*="quotes: none"] {
+    quotes: none;
+}
+
+q[style*='quotes: none'] {
+    quotes: none;
+}
+
+q:after {
+    content: ": colon & escaped double \" quotes \".";
+}
+
+q:after {
+    content: ' (brackets & escaped single \' quotes \') ';
+}
+
+q:after {
+    content: "I'm Quote";
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/css_test_files/quotes.css.optimized.css b/web/core/tests/Drupal/Tests/Core/Asset/css_test_files/quotes.css.optimized.css
new file mode 100644
index 000000000..716cef729
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Asset/css_test_files/quotes.css.optimized.css
@@ -0,0 +1,9 @@
+q[example="public class foo\
+{\
+    private int x;\
+\
+    foo(int x) {\
+        this.x = x;\
+    }\
+\
+}"]{color:red}q[style*="quotes: none"]{quotes:none;}q[style*='quotes: none']{quotes:none;}q:after{content:": colon & escaped double \" quotes \".";}q:after{content:' (brackets & escaped single \' quotes \') ';}q:after{content:"I'm Quote";}
diff --git a/web/core/tests/Drupal/Tests/Core/Batch/PercentagesTest.php b/web/core/tests/Drupal/Tests/Core/Batch/PercentagesTest.php
index d2e0c1317..0c905e6d9 100644
--- a/web/core/tests/Drupal/Tests/Core/Batch/PercentagesTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Batch/PercentagesTest.php
@@ -13,7 +13,7 @@ use Drupal\Tests\UnitTestCase;
  * in all cases.
  */
 class PercentagesTest extends UnitTestCase {
-  protected $testCases = array();
+  protected $testCases = [];
 
   /**
    * @dataProvider providerTestPercentages
@@ -31,39 +31,39 @@ class PercentagesTest extends UnitTestCase {
    */
   public function providerTestPercentages() {
     // Set up an array of test cases.
-    return array(
+    return [
       // array(total, current, expected).
       // 1/2 is 50%.
-      array(2, 1, '50'),
+      [2, 1, '50'],
       // Though we should never encounter a case where the current set is set
       // 0, if we did, we should get 0%.
-      array(3, 0, '0'),
+      [3, 0, '0'],
       // 1/3 is closer to 33% than to 34%.
-      array(3, 1, '33'),
+      [3, 1, '33'],
       // 2/3 is closer to 67% than to 66%.
-      array(3, 2, '67'),
+      [3, 2, '67'],
       // 1/199 should round up to 1%.
-      array(199, 1, '1'),
+      [199, 1, '1'],
       // 198/199 should round down to 99%.
-      array(199, 198, '99'),
+      [199, 198, '99'],
       // 199/200 would have rounded up to 100%, which would give the false
       // impression of being finished, so we add another digit and should get
       // 99.5%.
-      array(200, 199, '99.5'),
+      [200, 199, '99.5'],
       // The same logic holds for 1/200: we should get 0.5%.
-      array(200, 1, '0.5'),
+      [200, 1, '0.5'],
       // Numbers that come out evenly, such as 50/200, should be forced to have
       // extra digits for consistency.
-      array(200, 50, '25.0'),
+      [200, 50, '25.0'],
       // Regardless of number of digits we're using, 100% should always just be
       // 100%.
-      array(200, 200, '100'),
+      [200, 200, '100'],
       // 1998/1999 should similarly round down to 99.9%.
-      array(1999, 1998, '99.9'),
+      [1999, 1998, '99.9'],
       // 1999/2000 should add another digit and go to 99.95%.
-      array(2000, 1999, '99.95'),
+      [2000, 1999, '99.95'],
       // 19999/20000 should add yet another digit and go to 99.995%.
-      array(20000, 19999, '99.995'),
+      [20000, 19999, '99.995'],
       // The next five test cases simulate a batch with a single operation
       // ('total' equals 1) that takes several steps to complete. Within the
       // operation, we imagine that there are 501 items to process, and 100 are
@@ -72,12 +72,12 @@ class PercentagesTest extends UnitTestCase {
       // but for the last pass through, when 500 out of 501 items have been
       // processed, we do not want to round up to 100%, since that would
       // erroneously indicate that the processing is complete.
-      array('total' => 1, 'current' => 100 / 501, '20'),
-      array('total' => 1, 'current' => 200 / 501, '40'),
-      array('total' => 1, 'current' => 300 / 501, '60'),
-      array('total' => 1, 'current' => 400 / 501, '80'),
-      array('total' => 1, 'current' => 500 / 501, '99.8'),
-    );
+      ['total' => 1, 'current' => 100 / 501, '20'],
+      ['total' => 1, 'current' => 200 / 501, '40'],
+      ['total' => 1, 'current' => 300 / 501, '60'],
+      ['total' => 1, 'current' => 400 / 501, '80'],
+      ['total' => 1, 'current' => 500 / 501, '99.8'],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Block/BlockBaseTest.php b/web/core/tests/Drupal/Tests/Core/Block/BlockBaseTest.php
index 541c0c186..70bc7f22d 100644
--- a/web/core/tests/Drupal/Tests/Core/Block/BlockBaseTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Block/BlockBaseTest.php
@@ -19,24 +19,24 @@ class BlockBaseTest extends UnitTestCase {
   public function testGetMachineNameSuggestion() {
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $transliteration = $this->getMockBuilder('Drupal\Core\Transliteration\PhpTransliteration')
-      ->setConstructorArgs(array(NULL, $module_handler))
-      ->setMethods(array('readLanguageOverrides'))
+      ->setConstructorArgs([NULL, $module_handler])
+      ->setMethods(['readLanguageOverrides'])
       ->getMock();
 
-    $config = array();
-    $definition = array(
+    $config = [];
+    $definition = [
       'admin_label' => 'Admin label',
       'provider' => 'block_test',
-    );
+    ];
     $block_base = new TestBlockInstantiation($config, 'test_block_instantiation', $definition);
     $block_base->setTransliteration($transliteration);
     $this->assertEquals('adminlabel', $block_base->getMachineNameSuggestion());
 
     // Test with more unicodes.
-    $definition = array(
+    $definition = [
       'admin_label' => 'über åwesome',
       'provider' => 'block_test',
-    );
+    ];
     $block_base = new TestBlockInstantiation($config, 'test_block_instantiation', $definition);
     $block_base->setTransliteration($transliteration);
     $this->assertEquals('uberawesome', $block_base->getMachineNameSuggestion());
diff --git a/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php b/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php
index 32ea0d017..aed60a696 100644
--- a/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php
@@ -80,7 +80,7 @@ class BreadcrumbManagerTest extends UnitTestCase {
    */
   public function testBuildWithSingleBuilder() {
     $builder = $this->getMock('Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface');
-    $links = array('<a href="/example">Test</a>');
+    $links = ['<a href="/example">Test</a>'];
     $this->breadcrumb->setLinks($links);
     $this->breadcrumb->addCacheContexts(['foo'])->addCacheTags(['bar']);
 
@@ -95,7 +95,7 @@ class BreadcrumbManagerTest extends UnitTestCase {
     $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface');
     $this->moduleHandler->expects($this->once())
       ->method('alter')
-      ->with('system_breadcrumb', $this->breadcrumb, $route_match, array('builder' => $builder));
+      ->with('system_breadcrumb', $this->breadcrumb, $route_match, ['builder' => $builder]);
 
     $this->breadcrumbManager->addBuilder($builder, 0);
 
@@ -117,7 +117,7 @@ class BreadcrumbManagerTest extends UnitTestCase {
       ->method('build');
 
     $builder2 = $this->getMock('Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface');
-    $links2 = array('<a href="/example2">Test2</a>');
+    $links2 = ['<a href="/example2">Test2</a>'];
     $this->breadcrumb->setLinks($links2);
     $this->breadcrumb->addCacheContexts(['baz'])->addCacheTags(['qux']);
     $builder2->expects($this->once())
@@ -131,7 +131,7 @@ class BreadcrumbManagerTest extends UnitTestCase {
 
     $this->moduleHandler->expects($this->once())
       ->method('alter')
-      ->with('system_breadcrumb', $this->breadcrumb, $route_match, array('builder' => $builder2));
+      ->with('system_breadcrumb', $this->breadcrumb, $route_match, ['builder' => $builder2]);
 
     $this->breadcrumbManager->addBuilder($builder1, 0);
     $this->breadcrumbManager->addBuilder($builder2, 10);
@@ -169,7 +169,7 @@ class BreadcrumbManagerTest extends UnitTestCase {
 
     $this->moduleHandler->expects($this->once())
       ->method('alter')
-      ->with('system_breadcrumb', $this->breadcrumb, $route_match, array('builder' => $builder2));
+      ->with('system_breadcrumb', $this->breadcrumb, $route_match, ['builder' => $builder2]);
 
     $this->breadcrumbManager->addBuilder($builder1, 10);
     $this->breadcrumbManager->addBuilder($builder2, 0);
@@ -183,8 +183,6 @@ class BreadcrumbManagerTest extends UnitTestCase {
 
   /**
    * Tests a breadcrumb builder with a bad return value.
-   *
-   * @expectedException \UnexpectedValueException
    */
   public function testBuildWithInvalidBreadcrumbResult() {
     $builder = $this->getMock('Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface');
@@ -196,6 +194,7 @@ class BreadcrumbManagerTest extends UnitTestCase {
       ->will($this->returnValue('invalid_result'));
 
     $this->breadcrumbManager->addBuilder($builder, 0);
+    $this->setExpectedException(\UnexpectedValueException::class);
     $this->breadcrumbManager->build($this->getMock('Drupal\Core\Routing\RouteMatchInterface'));
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbTest.php b/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbTest.php
index ca8acfc74..67c7d9820 100644
--- a/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbTest.php
@@ -15,12 +15,11 @@ class BreadcrumbTest extends UnitTestCase {
 
   /**
    * @covers ::setLinks
-   * @expectedException \LogicException
-   * @expectedExceptionMessage Once breadcrumb links are set, only additional breadcrumb links can be added.
    */
   public function testSetLinks() {
     $breadcrumb = new Breadcrumb();
     $breadcrumb->setLinks([new Link('Home', Url::fromRoute('<front>'))]);
+    $this->setExpectedException(\LogicException::class, 'Once breadcrumb links are set, only additional breadcrumb links can be added.');
     $breadcrumb->setLinks([new Link('None', Url::fromRoute('<none>'))]);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php b/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
index 32f76a1c2..ad51768da 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
@@ -46,9 +46,9 @@ class BackendChainImplementationUnitTest extends UnitTestCase {
     parent::setUp();
 
     // Set up three memory backends to be used in the chain.
-    $this->firstBackend = new MemoryBackend('foo');
-    $this->secondBackend = new MemoryBackend('bar');
-    $this->thirdBackend = new MemoryBackend('baz');
+    $this->firstBackend = new MemoryBackend();
+    $this->secondBackend = new MemoryBackend();
+    $this->thirdBackend = new MemoryBackend();
 
     // Set an initial fixed dataset for all testing. The next three data
     // collections will test two edge cases (last backend has the data, and
@@ -100,7 +100,7 @@ class BackendChainImplementationUnitTest extends UnitTestCase {
    * Test the get multiple feature.
    */
   public function testGetMultiple() {
-    $cids = array('t123', 't23', 't3', 't4');
+    $cids = ['t123', 't23', 't3', 't4'];
 
     $ret = $this->chain->getMultiple($cids);
     $this->assertSame($ret['t123']->data, 1231, 'Got key 123 and value is from the first backend');
@@ -175,7 +175,7 @@ class BackendChainImplementationUnitTest extends UnitTestCase {
    * Ensure get multiple values propagation to previous backends.
    */
   public function testGetMultipleHasPropagated() {
-    $cids = array('t3', 't23');
+    $cids = ['t3', 't23'];
     $this->chain->getMultiple($cids);
 
     $cached = $this->firstBackend->get('t3');
@@ -213,8 +213,8 @@ class BackendChainImplementationUnitTest extends UnitTestCase {
    */
   public function testDeleteTagsPropagation() {
     // Create two cache entries with the same tag and tag value.
-    $this->chain->set('test_cid_clear1', 'foo', Cache::PERMANENT, array('test_tag:2'));
-    $this->chain->set('test_cid_clear2', 'foo', Cache::PERMANENT, array('test_tag:2'));
+    $this->chain->set('test_cid_clear1', 'foo', Cache::PERMANENT, ['test_tag:2']);
+    $this->chain->set('test_cid_clear2', 'foo', Cache::PERMANENT, ['test_tag:2']);
     $this->assertNotSame(FALSE, $this->firstBackend->get('test_cid_clear1')
       && $this->firstBackend->get('test_cid_clear2')
       && $this->secondBackend->get('test_cid_clear1')
@@ -224,7 +224,7 @@ class BackendChainImplementationUnitTest extends UnitTestCase {
       'Two cache items were created in all backends.');
 
     // Invalidate test_tag of value 1. This should invalidate both entries.
-    $this->chain->invalidateTags(array('test_tag:2'));
+    $this->chain->invalidateTags(['test_tag:2']);
     $this->assertSame(FALSE, $this->firstBackend->get('test_cid_clear1')
       && $this->firstBackend->get('test_cid_clear2')
       && $this->secondBackend->get('test_cid_clear1')
@@ -234,8 +234,8 @@ class BackendChainImplementationUnitTest extends UnitTestCase {
       'Two caches removed from all backends after clearing a cache tag.');
 
     // Create two cache entries with the same tag and an array tag value.
-    $this->chain->set('test_cid_clear1', 'foo', Cache::PERMANENT, array('test_tag:1'));
-    $this->chain->set('test_cid_clear2', 'foo', Cache::PERMANENT, array('test_tag:1'));
+    $this->chain->set('test_cid_clear1', 'foo', Cache::PERMANENT, ['test_tag:1']);
+    $this->chain->set('test_cid_clear2', 'foo', Cache::PERMANENT, ['test_tag:1']);
     $this->assertNotSame(FALSE, $this->firstBackend->get('test_cid_clear1')
       && $this->firstBackend->get('test_cid_clear2')
       && $this->secondBackend->get('test_cid_clear1')
@@ -245,7 +245,7 @@ class BackendChainImplementationUnitTest extends UnitTestCase {
       'Two cache items were created in all backends.');
 
     // Invalidate test_tag of value 1. This should invalidate both entries.
-    $this->chain->invalidateTags(array('test_tag:1'));
+    $this->chain->invalidateTags(['test_tag:1']);
     $this->assertSame(FALSE, $this->firstBackend->get('test_cid_clear1')
       && $this->firstBackend->get('test_cid_clear2')
       && $this->secondBackend->get('test_cid_clear1')
@@ -255,9 +255,9 @@ class BackendChainImplementationUnitTest extends UnitTestCase {
       'Two caches removed from all backends after clearing a cache tag.');
 
     // Create three cache entries with a mix of tags and tag values.
-    $this->chain->set('test_cid_clear1', 'foo', Cache::PERMANENT, array('test_tag:1'));
-    $this->chain->set('test_cid_clear2', 'foo', Cache::PERMANENT, array('test_tag:2'));
-    $this->chain->set('test_cid_clear3', 'foo', Cache::PERMANENT, array('test_tag_foo:3'));
+    $this->chain->set('test_cid_clear1', 'foo', Cache::PERMANENT, ['test_tag:1']);
+    $this->chain->set('test_cid_clear2', 'foo', Cache::PERMANENT, ['test_tag:2']);
+    $this->chain->set('test_cid_clear3', 'foo', Cache::PERMANENT, ['test_tag_foo:3']);
     $this->assertNotSame(FALSE, $this->firstBackend->get('test_cid_clear1')
       && $this->firstBackend->get('test_cid_clear2')
       && $this->firstBackend->get('test_cid_clear3')
@@ -269,7 +269,7 @@ class BackendChainImplementationUnitTest extends UnitTestCase {
       && $this->thirdBackend->get('test_cid_clear3'),
       'Three cached items were created in all backends.');
 
-    $this->chain->invalidateTags(array('test_tag_foo:3'));
+    $this->chain->invalidateTags(['test_tag_foo:3']);
     $this->assertNotSame(FALSE, $this->firstBackend->get('test_cid_clear1')
       && $this->firstBackend->get('test_cid_clear2')
       && $this->secondBackend->get('test_cid_clear1')
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorHelper.php b/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorHelper.php
index 238911b42..a44e8d4ac 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorHelper.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorHelper.php
@@ -13,7 +13,7 @@ class CacheCollectorHelper extends CacheCollector {
    * Contains data to return on a cache miss.
    * @var array
    */
-  protected $cacheMissData = array();
+  protected $cacheMissData = [];
 
   /**
    * Number of calls to \Drupal\Core\Cache\CacheCollector::resolveCacheMiss().
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php b/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php
index e0eeac72d..1ff662939 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php
@@ -114,10 +114,10 @@ class CacheCollectorTest extends UnitTestCase {
     $key = $this->randomMachineName();
     $value = $this->randomMachineName();
 
-    $cache = (object) array(
-      'data' => array($key => $value),
+    $cache = (object) [
+      'data' => [$key => $value],
       'created' => (int) $_SERVER['REQUEST_TIME'],
-    );
+    ];
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with($this->cid)
@@ -183,7 +183,7 @@ class CacheCollectorTest extends UnitTestCase {
       ->with($this->cid, FALSE);
     $this->cacheBackend->expects($this->once())
       ->method('set')
-      ->with($this->cid, array($key => $value), Cache::PERMANENT, array());
+      ->with($this->cid, [$key => $value], Cache::PERMANENT, []);
     $this->lock->expects($this->once())
       ->method('release')
       ->with($this->cid . ':Drupal\Core\Cache\CacheCollector');
@@ -222,10 +222,10 @@ class CacheCollectorTest extends UnitTestCase {
     $key = $this->randomMachineName();
     $value = $this->randomMachineName();
 
-    $cache = (object) array(
-      'data' => array($key => $value),
+    $cache = (object) [
+      'data' => [$key => $value],
       'created' => (int) $_SERVER['REQUEST_TIME'],
-    );
+    ];
     $this->cacheBackend->expects($this->at(0))
       ->method('get')
       ->with($this->cid)
@@ -243,10 +243,10 @@ class CacheCollectorTest extends UnitTestCase {
       ->method('acquire')
       ->with($this->cid . ':Drupal\Core\Cache\CacheCollector')
       ->will($this->returnValue(TRUE));
-    $cache = (object) array(
-      'data' => array($key => $value),
+    $cache = (object) [
+      'data' => [$key => $value],
       'created' => (int) $_SERVER['REQUEST_TIME'] + 1,
-    );
+    ];
     $this->cacheBackend->expects($this->at(0))
       ->method('get')
       ->with($this->cid)
@@ -279,17 +279,17 @@ class CacheCollectorTest extends UnitTestCase {
       ->method('acquire')
       ->with($this->cid . ':Drupal\Core\Cache\CacheCollector')
       ->will($this->returnValue(TRUE));
-    $cache = (object) array(
-      'data' => array('other key' => 'other value'),
+    $cache = (object) [
+      'data' => ['other key' => 'other value'],
       'created' => (int) $_SERVER['REQUEST_TIME'] + 1,
-    );
+    ];
     $this->cacheBackend->expects($this->at(0))
       ->method('get')
       ->with($this->cid)
       ->will($this->returnValue($cache));
     $this->cacheBackend->expects($this->once())
       ->method('set')
-      ->with($this->cid, array('other key' => 'other value', $key => $value), Cache::PERMANENT, array());
+      ->with($this->cid, ['other key' => 'other value', $key => $value], Cache::PERMANENT, []);
     $this->lock->expects($this->once())
       ->method('release')
       ->with($this->cid . ':Drupal\Core\Cache\CacheCollector');
@@ -305,10 +305,10 @@ class CacheCollectorTest extends UnitTestCase {
     $key = $this->randomMachineName();
     $value = $this->randomMachineName();
 
-    $cache = (object) array(
-      'data' => array($key => $value),
+    $cache = (object) [
+      'data' => [$key => $value],
       'created' => (int) $_SERVER['REQUEST_TIME'],
-    );
+    ];
     $this->cacheBackend->expects($this->at(0))
       ->method('get')
       ->with($this->cid)
@@ -330,7 +330,7 @@ class CacheCollectorTest extends UnitTestCase {
       ->with($this->cid, TRUE);
     $this->cacheBackend->expects($this->once())
       ->method('set')
-      ->with($this->cid, array(), Cache::PERMANENT, array());
+      ->with($this->cid, [], Cache::PERMANENT, []);
     $this->lock->expects($this->once())
       ->method('release')
       ->with($this->cid . ':Drupal\Core\Cache\CacheCollector');
@@ -392,7 +392,7 @@ class CacheCollectorTest extends UnitTestCase {
   public function testUpdateCacheClearTags() {
     $key = $this->randomMachineName();
     $value = $this->randomMachineName();
-    $tags = array($this->randomMachineName());
+    $tags = [$this->randomMachineName()];
     $this->collector = new CacheCollectorHelper($this->cid, $this->cacheBackend, $this->lock, $tags);
 
     // Set the data and request it.
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php b/web/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php
index be0fbdfbb..0c43bb220 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php
@@ -20,7 +20,7 @@ class CacheFactoryTest extends UnitTestCase {
    * @covers ::get
    */
   public function testCacheFactoryWithDefaultSettings() {
-    $settings = new Settings(array());
+    $settings = new Settings([]);
     $cache_factory = new CacheFactory($settings);
 
     $container = new ContainerBuilder();
@@ -46,11 +46,11 @@ class CacheFactoryTest extends UnitTestCase {
    * @covers ::get
    */
   public function testCacheFactoryWithCustomizedDefaultBackend() {
-    $settings = new Settings(array(
-      'cache' => array(
+    $settings = new Settings([
+      'cache' => [
         'default' => 'cache.backend.custom',
-      ),
-    ));
+      ],
+    ]);
     $cache_factory = new CacheFactory($settings);
 
     $container = new ContainerBuilder();
@@ -77,11 +77,11 @@ class CacheFactoryTest extends UnitTestCase {
    */
   public function testCacheFactoryWithDefaultBinBackend() {
     // Ensure the default bin backends are used before the configured default.
-    $settings = new Settings(array(
-      'cache' => array(
+    $settings = new Settings([
+      'cache' => [
         'default' => 'cache.backend.unused',
-      ),
-    ));
+      ],
+    ]);
 
     $default_bin_backends = [
       'render' => 'cache.backend.custom',
@@ -114,14 +114,14 @@ class CacheFactoryTest extends UnitTestCase {
   public function testCacheFactoryWithSpecifiedPerBinBackend() {
     // Ensure the per-bin configuration is used before the configured default
     // and per-bin defaults.
-    $settings = new Settings(array(
-      'cache' => array(
+    $settings = new Settings([
+      'cache' => [
         'default' => 'cache.backend.unused',
-        'bins' => array(
+        'bins' => [
           'render' => 'cache.backend.custom',
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
     $default_bin_backends = [
       'render' => 'cache.backend.unused',
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/CacheTagsInvalidatorTest.php b/web/core/tests/Drupal/Tests/Core/Cache/CacheTagsInvalidatorTest.php
index edb220a99..5466a098a 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/CacheTagsInvalidatorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/CacheTagsInvalidatorTest.php
@@ -14,11 +14,10 @@ class CacheTagsInvalidatorTest extends UnitTestCase {
 
   /**
    * @covers ::invalidateTags
-   *
-   * @expectedException \AssertionError
    */
   public function testInvalidateTagsWithInvalidTags() {
     $cache_tags_invalidator = new CacheTagsInvalidator();
+    $this->setExpectedException(\AssertionError::class);
     $cache_tags_invalidator->invalidateTags(['node' => [2, 3, 5, 8, 13]]);
   }
 
@@ -35,7 +34,7 @@ class CacheTagsInvalidatorTest extends UnitTestCase {
     $invalidator_cache_bin = $this->getMock('\Drupal\Core\Cache\CacheTagsInvalidator');
     $invalidator_cache_bin->expects($this->once())
       ->method('invalidateTags')
-      ->with(array('node:1'));
+      ->with(['node:1']);
 
     // We do not have to define that invalidateTags() is never called as the
     // interface does not define that method, trying to call it would result in
@@ -45,17 +44,17 @@ class CacheTagsInvalidatorTest extends UnitTestCase {
     $container = new Container();
     $container->set('cache.invalidator_cache_bin', $invalidator_cache_bin);
     $container->set('cache.non_invalidator_cache_bin', $non_invalidator_cache_bin);
-    $container->setParameter('cache_bins', array('cache.invalidator_cache_bin' => 'invalidator_cache_bin', 'cache.non_invalidator_cache_bin' => 'non_invalidator_cache_bin'));
+    $container->setParameter('cache_bins', ['cache.invalidator_cache_bin' => 'invalidator_cache_bin', 'cache.non_invalidator_cache_bin' => 'non_invalidator_cache_bin']);
     $cache_tags_invalidator->setContainer($container);
 
     $invalidator = $this->getMock('\Drupal\Core\Cache\CacheTagsInvalidator');
     $invalidator->expects($this->once())
       ->method('invalidateTags')
-      ->with(array('node:1'));
+      ->with(['node:1']);
 
     $cache_tags_invalidator->addInvalidator($invalidator);
 
-    $cache_tags_invalidator->invalidateTags(array('node:1'));
+    $cache_tags_invalidator->invalidateTags(['node:1']);
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php b/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
index 956c18d12..52f185174 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
@@ -40,14 +40,14 @@ class ChainedFastBackendTest extends UnitTestCase {
     $consistent_cache = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
     $timestamp_cid = ChainedFastBackend::LAST_WRITE_TIMESTAMP_PREFIX . 'cache_foo';
     // Use the request time because that is what we will be comparing against.
-    $timestamp_item = (object) array('cid' => $timestamp_cid, 'data' => (int) $_SERVER['REQUEST_TIME'] - 60);
+    $timestamp_item = (object) ['cid' => $timestamp_cid, 'data' => (int) $_SERVER['REQUEST_TIME'] - 60];
     $consistent_cache->expects($this->once())
       ->method('get')->with($timestamp_cid)
       ->will($this->returnValue($timestamp_item));
     $consistent_cache->expects($this->never())
       ->method('getMultiple');
 
-    $fast_cache = new MemoryBackend('foo');
+    $fast_cache = new MemoryBackend();
     $fast_cache->set('foo', 'baz');
 
     $chained_fast_backend = new ChainedFastBackend(
@@ -62,17 +62,17 @@ class ChainedFastBackendTest extends UnitTestCase {
    * Tests a fast cache miss gets data from the consistent cache backend.
    */
   public function testFallThroughToConsistentCache() {
-    $timestamp_item = (object) array(
+    $timestamp_item = (object) [
       'cid' => ChainedFastBackend::LAST_WRITE_TIMESTAMP_PREFIX . 'cache_foo',
       'data' => time() + 60, // Time travel is easy.
-    );
-    $cache_item = (object) array(
+    ];
+    $cache_item = (object) [
       'cid' => 'foo',
       'data' => 'baz',
       'created' => time(),
       'expire' => time() + 3600,
       'tags' => ['tag'],
-    );
+    ];
 
     $consistent_cache = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
     $fast_cache = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
@@ -86,14 +86,14 @@ class ChainedFastBackendTest extends UnitTestCase {
     // We should get a call for the cache item on the consistent backend.
     $consistent_cache->expects($this->once())
       ->method('getMultiple')
-      ->with(array($cache_item->cid))
-      ->will($this->returnValue(array($cache_item->cid => $cache_item)));
+      ->with([$cache_item->cid])
+      ->will($this->returnValue([$cache_item->cid => $cache_item]));
 
     // We should get a call for the cache item on the fast backend.
     $fast_cache->expects($this->once())
       ->method('getMultiple')
-      ->with(array($cache_item->cid))
-      ->will($this->returnValue(array($cache_item->cid => $cache_item)));
+      ->with([$cache_item->cid])
+      ->will($this->returnValue([$cache_item->cid => $cache_item]));
 
     // We should get a call to set the cache item on the fast backend.
     $fast_cache->expects($this->once())
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php b/web/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
index 0bc9d7f1b..f89e639cc 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
@@ -105,27 +105,25 @@ class CacheContextsManagerTest extends UnitTestCase {
 
   /**
    * @covers ::convertTokensToKeys
-   *
-   * @expectedException \AssertionError
    */
   public function testInvalidContext() {
     $container = $this->getMockContainer();
     $cache_contexts_manager = new CacheContextsManager($container, $this->getContextsFixture());
 
+    $this->setExpectedException(\AssertionError::class);
     $cache_contexts_manager->convertTokensToKeys(["non-cache-context"]);
   }
 
   /**
    * @covers ::convertTokensToKeys
    *
-   * @expectedException \Exception
-   *
    * @dataProvider providerTestInvalidCalculatedContext
    */
   public function testInvalidCalculatedContext($context_token) {
     $container = $this->getMockContainer();
     $cache_contexts_manager = new CacheContextsManager($container, $this->getContextsFixture());
 
+    $this->setExpectedException(\Exception::class);
     $cache_contexts_manager->convertTokensToKeys([$context_token]);
   }
 
@@ -142,19 +140,19 @@ class CacheContextsManagerTest extends UnitTestCase {
   public function testAvailableContextStrings() {
     $cache_contexts_manager = new CacheContextsManager($this->getMockContainer(), $this->getContextsFixture());
     $contexts = $cache_contexts_manager->getAll();
-    $this->assertEquals(array("foo", "baz"), $contexts);
+    $this->assertEquals(["foo", "baz"], $contexts);
   }
 
   public function testAvailableContextLabels() {
     $container = $this->getMockContainer();
     $cache_contexts_manager = new CacheContextsManager($container, $this->getContextsFixture());
     $labels = $cache_contexts_manager->getLabels();
-    $expected = array("foo" => "Foo");
+    $expected = ["foo" => "Foo"];
     $this->assertEquals($expected, $labels);
   }
 
   protected function getContextsFixture() {
-    return array('foo', 'baz');
+    return ['foo', 'baz'];
   }
 
   protected function getMockContainer() {
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/Context/IsFrontPathCacheContextTest.php b/web/core/tests/Drupal/Tests/Core/Cache/Context/IsFrontPathCacheContextTest.php
new file mode 100644
index 000000000..5ccb18566
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Cache/Context/IsFrontPathCacheContextTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\Tests\Core\Cache\Context;
+
+use Drupal\Core\Cache\Context\IsFrontPathCacheContext;
+use Drupal\Core\Path\PathMatcherInterface;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Cache\Context\IsFrontPathCacheContext
+ * @group Cache
+ */
+class IsFrontPathCacheContextTest extends UnitTestCase {
+
+  /**
+   * @covers ::getContext
+   */
+  public function testGetContextFront() {
+    $cache_context = new IsFrontPathCacheContext($this->createPathMatcher(TRUE)->reveal());
+    $this->assertSame('is_front.1', $cache_context->getContext());
+  }
+
+  /**
+   * @covers ::getContext
+   */
+  public function testGetContextNotFront() {
+    $cache_context = new IsFrontPathCacheContext($this->createPathMatcher(FALSE)->reveal());
+    $this->assertSame('is_front.0', $cache_context->getContext());
+  }
+
+  /**
+   * Creates a PathMatcherInterface prophecy.
+   *
+   * @param bool $is_front
+   *
+   * @return \Prophecy\Prophecy\ObjectProphecy
+   */
+  protected function createPathMatcher($is_front) {
+    $path_matcher = $this->prophesize(PathMatcherInterface::class);
+    $path_matcher->isFrontPage()
+      ->willReturn($is_front);
+
+    return $path_matcher;
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php b/web/core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php
index cd2481748..bf79f7090 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/NullBackendTest.php
@@ -15,7 +15,7 @@ class NullBackendTest extends UnitTestCase {
   /**
    * Tests that the NullBackend does not actually store variables.
    */
-  function testNullBackend() {
+  public function testNullBackend() {
     $null_cache = new NullBackend('test');
 
     $key = $this->randomMachineName();
diff --git a/web/core/tests/Drupal/Tests/Core/Common/AttributesTest.php b/web/core/tests/Drupal/Tests/Core/Common/AttributesTest.php
index 39d7fc1de..d06c678bc 100644
--- a/web/core/tests/Drupal/Tests/Core/Common/AttributesTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Common/AttributesTest.php
@@ -18,31 +18,31 @@ class AttributesTest extends UnitTestCase {
    * @return array
    */
   public function providerTestAttributeData() {
-    return array(
+    return [
       // Verify that special characters are HTML encoded.
-      array(array('&"\'<>' => 'value'), ' &amp;&quot;&#039;&lt;&gt;="value"', 'HTML encode attribute names.'),
-      array(array('title' => '&"\'<>'), ' title="&amp;&quot;&#039;&lt;&gt;"', 'HTML encode attribute values.'),
+      [['&"\'<>' => 'value'], ' &amp;&quot;&#039;&lt;&gt;="value"', 'HTML encode attribute names.'],
+      [['title' => '&"\'<>'], ' title="&amp;&quot;&#039;&lt;&gt;"', 'HTML encode attribute values.'],
       // Verify multi-value attributes are concatenated with spaces.
-      array(array('class' => array('first', 'last')), ' class="first last"', 'Concatenate multi-value attributes.'),
+      [['class' => ['first', 'last']], ' class="first last"', 'Concatenate multi-value attributes.'],
       // Verify boolean attribute values are rendered correctly.
-      array(array('disabled' => TRUE), ' disabled', 'Boolean attribute is rendered.'),
-      array(array('disabled' => FALSE), '', 'Boolean attribute is not rendered.'),
+      [['disabled' => TRUE], ' disabled', 'Boolean attribute is rendered.'],
+      [['disabled' => FALSE], '', 'Boolean attribute is not rendered.'],
       // Verify empty attribute values are rendered.
-      array(array('alt' => ''), ' alt=""', 'Empty attribute value #1.'),
-      array(array('alt' => NULL), '', 'Null attribute value #2.'),
+      [['alt' => ''], ' alt=""', 'Empty attribute value #1.'],
+      [['alt' => NULL], '', 'Null attribute value #2.'],
       // Verify multiple attributes are rendered.
-      array(
-        array(
+      [
+        [
           'id' => 'id-test',
-          'class' => array('first', 'last'),
+          'class' => ['first', 'last'],
           'alt' => 'Alternate',
-        ),
+        ],
         ' id="id-test" class="first last" alt="Alternate"',
         'Multiple attributes.'
-      ),
+      ],
       // Verify empty attributes array is rendered.
-      array(array(), '', 'Empty attributes array.'),
-    );
+      [[], '', 'Empty attributes array.'],
+    ];
   }
 
   /**
@@ -52,7 +52,7 @@ class AttributesTest extends UnitTestCase {
    *
    * @dataProvider providerTestAttributeData
    */
-  function testDrupalAttributes($attributes, $expected, $message) {
+  public function testDrupalAttributes($attributes, $expected, $message) {
     $this->assertSame($expected, (string) new Attribute($attributes), $message);
   }
 
@@ -60,7 +60,7 @@ class AttributesTest extends UnitTestCase {
    * Test attribute iteration
    */
   public function testAttributeIteration() {
-    $attribute = new Attribute(array('key1' => 'value1'));
+    $attribute = new Attribute(['key1' => 'value1']);
     foreach ($attribute as $value) {
       $this->assertSame((string) $value, 'value1', 'Iterate over attribute.');
     }
diff --git a/web/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php b/web/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php
index 4112eaeb1..2493ab511 100644
--- a/web/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php
@@ -29,42 +29,42 @@ class DiffArrayTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $this->array1 = array(
+    $this->array1 = [
       'same' => 'yes',
       'different' => 'no',
-      'array_empty_diff' => array(),
+      'array_empty_diff' => [],
       'null' => NULL,
       'int_diff' => 1,
-      'array_diff' => array('same' => 'same', 'array' => array('same' => 'same')),
-      'array_compared_to_string' => array('value'),
+      'array_diff' => ['same' => 'same', 'array' => ['same' => 'same']],
+      'array_compared_to_string' => ['value'],
       'string_compared_to_array' => 'value',
       'new' => 'new',
-    );
-    $this->array2 = array(
+    ];
+    $this->array2 = [
       'same' => 'yes',
       'different' => 'yes',
-      'array_empty_diff' => array(),
+      'array_empty_diff' => [],
       'null' => NULL,
       'int_diff' => '1',
-      'array_diff' => array('same' => 'different', 'array' => array('same' => 'same')),
+      'array_diff' => ['same' => 'different', 'array' => ['same' => 'same']],
       'array_compared_to_string' => 'value',
-      'string_compared_to_array' => array('value'),
-    );
+      'string_compared_to_array' => ['value'],
+    ];
   }
 
   /**
    * Tests DiffArray::diffAssocRecursive().
    */
   public function testDiffAssocRecursive() {
-    $expected = array(
+    $expected = [
       'different' => 'no',
       'int_diff' => 1,
       // The 'array' key should not be returned, as it's the same.
-      'array_diff' => array('same' => 'same'),
-      'array_compared_to_string' => array('value'),
+      'array_diff' => ['same' => 'same'],
+      'array_compared_to_string' => ['value'],
       'string_compared_to_array' => 'value',
       'new' => 'new',
-    );
+    ];
 
     $this->assertSame(DiffArray::diffAssocRecursive($this->array1, $this->array2), $expected);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Common/TagsTest.php b/web/core/tests/Drupal/Tests/Core/Common/TagsTest.php
index 48d788a8f..3c3058f96 100644
--- a/web/core/tests/Drupal/Tests/Core/Common/TagsTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Common/TagsTest.php
@@ -12,12 +12,12 @@ use Drupal\Tests\UnitTestCase;
  */
 class TagsTest extends UnitTestCase {
 
-  protected $validTags = array(
+  protected $validTags = [
     'Drupal' => 'Drupal',
     'Drupal with some spaces' => 'Drupal with some spaces',
     '"Legendary Drupal mascot of doom: ""Druplicon"""' => 'Legendary Drupal mascot of doom: "Druplicon"',
     '"Drupal, although it rhymes with sloopal, is as awesome as a troopal!"' => 'Drupal, although it rhymes with sloopal, is as awesome as a troopal!',
-  );
+  ];
 
   /**
    * Explodes a series of tags.
diff --git a/web/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php b/web/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php
index 241ea38c0..f0da23140 100644
--- a/web/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php
@@ -29,7 +29,7 @@ class ConditionAccessResolverTraitTest extends UnitTestCase {
   }
 
   public function providerTestResolveConditions() {
-    $data = array();
+    $data = [];
 
     $condition_true = $this->getMock('Drupal\Core\Condition\ConditionInterface');
     $condition_true->expects($this->any())
@@ -54,49 +54,49 @@ class ConditionAccessResolverTraitTest extends UnitTestCase {
       ->method('isNegated')
       ->will($this->returnValue(TRUE));
 
-    $conditions = array();
-    $data[] = array($conditions, 'and', TRUE);
-    $data[] = array($conditions, 'or', FALSE);
+    $conditions = [];
+    $data[] = [$conditions, 'and', TRUE];
+    $data[] = [$conditions, 'or', FALSE];
 
-    $conditions = array($condition_false);
-    $data[] = array($conditions, 'or', FALSE);
-    $data[] = array($conditions, 'and', FALSE);
+    $conditions = [$condition_false];
+    $data[] = [$conditions, 'or', FALSE];
+    $data[] = [$conditions, 'and', FALSE];
 
-    $conditions = array($condition_true);
-    $data[] = array($conditions, 'or', TRUE);
-    $data[] = array($conditions, 'and', TRUE);
+    $conditions = [$condition_true];
+    $data[] = [$conditions, 'or', TRUE];
+    $data[] = [$conditions, 'and', TRUE];
 
-    $conditions = array($condition_true, $condition_false);
-    $data[] = array($conditions, 'or', TRUE);
-    $data[] = array($conditions, 'and', FALSE);
+    $conditions = [$condition_true, $condition_false];
+    $data[] = [$conditions, 'or', TRUE];
+    $data[] = [$conditions, 'and', FALSE];
 
-    $conditions = array($condition_exception);
-    $data[] = array($conditions, 'or', FALSE);
-    $data[] = array($conditions, 'and', FALSE);
+    $conditions = [$condition_exception];
+    $data[] = [$conditions, 'or', FALSE];
+    $data[] = [$conditions, 'and', FALSE];
 
-    $conditions = array($condition_true, $condition_exception);
-    $data[] = array($conditions, 'or', TRUE);
-    $data[] = array($conditions, 'and', FALSE);
+    $conditions = [$condition_true, $condition_exception];
+    $data[] = [$conditions, 'or', TRUE];
+    $data[] = [$conditions, 'and', FALSE];
 
-    $conditions = array($condition_exception, $condition_true);
-    $data[] = array($conditions, 'or', TRUE);
-    $data[] = array($conditions, 'and', FALSE);
+    $conditions = [$condition_exception, $condition_true];
+    $data[] = [$conditions, 'or', TRUE];
+    $data[] = [$conditions, 'and', FALSE];
 
-    $conditions = array($condition_false, $condition_exception);
-    $data[] = array($conditions, 'or', FALSE);
-    $data[] = array($conditions, 'and', FALSE);
+    $conditions = [$condition_false, $condition_exception];
+    $data[] = [$conditions, 'or', FALSE];
+    $data[] = [$conditions, 'and', FALSE];
 
-    $conditions = array($condition_exception, $condition_false);
-    $data[] = array($conditions, 'or', FALSE);
-    $data[] = array($conditions, 'and', FALSE);
+    $conditions = [$condition_exception, $condition_false];
+    $data[] = [$conditions, 'or', FALSE];
+    $data[] = [$conditions, 'and', FALSE];
 
-    $conditions = array($condition_negated);
-    $data[] = array($conditions, 'or', TRUE);
-    $data[] = array($conditions, 'and', TRUE);
+    $conditions = [$condition_negated];
+    $data[] = [$conditions, 'or', TRUE];
+    $data[] = [$conditions, 'and', TRUE];
 
-    $conditions = array($condition_negated, $condition_negated);
-    $data[] = array($conditions, 'or', TRUE);
-    $data[] = array($conditions, 'and', TRUE);
+    $conditions = [$condition_negated, $condition_negated];
+    $data[] = [$conditions, 'or', TRUE];
+    $data[] = [$conditions, 'and', TRUE];
     return $data;
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php b/web/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php
index 1a4c2db4a..c39efd624 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php
@@ -25,7 +25,7 @@ class CachedStorageTest extends UnitTestCase {
     $prefix = __FUNCTION__;
     $storage = $this->getMock('Drupal\Core\Config\StorageInterface');
 
-    $response = array("$prefix." . $this->randomMachineName(), "$prefix." . $this->randomMachineName());
+    $response = ["$prefix." . $this->randomMachineName(), "$prefix." . $this->randomMachineName()];
     $storage->expects($this->once())
       ->method('listAll')
       ->with($prefix)
diff --git a/web/core/tests/Drupal/Tests/Core/Config/ConfigTest.php b/web/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
index 223d8903e..41c3e93c9 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
@@ -6,6 +6,7 @@ use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Render\Markup;
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Config\Config;
+use Drupal\Core\Config\ConfigValueException;
 
 /**
  * Tests the Config.
@@ -87,16 +88,16 @@ class ConfigTest extends UnitTestCase {
    * @see \Drupal\Tests\Core\Config\ConfigTest::testSetName()
    */
   public function setNameProvider() {
-    return array(
+    return [
       // Valid name with dot.
-      array(
+      [
         'test.name',
-      ),
+      ],
       // Maximum length.
-      array(
+      [
         'test.' . str_repeat('a', Config::MAX_NAME_LENGTH - 5),
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -230,21 +231,21 @@ class ConfigTest extends UnitTestCase {
 
   /**
    * @covers ::set
-   * @expectedException \Drupal\Core\Config\ConfigValueException
    */
   public function testSetValidation() {
-    $this->config->set('testData', array('dot.key' => 1));
+    $this->setExpectedException(ConfigValueException::class);
+    $this->config->set('testData', ['dot.key' => 1]);
   }
 
   /**
    * @covers ::set
-   * @expectedException PHPUnit_Framework_Error_Warning
    */
   public function testSetIllegalOffsetValue() {
     // Set a single value.
     $this->config->set('testData', 1);
 
     // Attempt to treat the single value as a nested item.
+    $this->setExpectedException(\PHPUnit_Framework_Error_Warning::class);
     $this->config->set('testData.illegalOffset', 1);
   }
 
@@ -369,21 +370,20 @@ class ConfigTest extends UnitTestCase {
    * @see \Drupal\Tests\Core\Config\ConfigTest::testMerge()
    */
   public function mergeDataProvider() {
-    return array(
-      array(
+    return [
+      [
         // Data.
-        array('a' => 1, 'b' => 2, 'c' => array('d' => 3)),
+        ['a' => 1, 'b' => 2, 'c' => ['d' => 3]],
         // Data to merge.
-        array('a' => 2, 'e' => 4, 'c' => array('f' => 5)),
+        ['a' => 2, 'e' => 4, 'c' => ['f' => 5]],
         // Data merged.
-        array('a' => 2, 'b' => 2, 'c' => array('d' => 3, 'f' => 5), 'e' => 4),
-      ),
-    );
+        ['a' => 2, 'b' => 2, 'c' => ['d' => 3, 'f' => 5], 'e' => 4],
+      ],
+    ];
   }
 
   /**
    * @covers ::validateName
-   * @expectedException \Drupal\Core\Config\ConfigNameException
    * @dataProvider validateNameProvider
    */
   public function testValidateNameException($name, $exception_message) {
@@ -404,25 +404,25 @@ class ConfigTest extends UnitTestCase {
    * @see \Drupal\Tests\Core\Config\ConfigTest::testValidateNameException()
    */
   public function validateNameProvider() {
-    $return = array(
+    $return = [
       // Name missing namespace (dot).
-      array(
+      [
         'MissingNamespace',
         'Missing namespace in Config object name MissingNamespace.',
-      ),
+      ],
       // Exceeds length (max length plus an extra dot).
-      array(
+      [
         str_repeat('a', Config::MAX_NAME_LENGTH) . ".",
         'Config object name ' . str_repeat('a', Config::MAX_NAME_LENGTH) . '. exceeds maximum allowed length of ' . Config::MAX_NAME_LENGTH . ' characters.',
-      ),
-    );
+      ],
+    ];
     // Name must not contain : ? * < > " ' / \
-    foreach (array(':', '?', '*', '<', '>', '"', "'", '/', '\\') as $char) {
+    foreach ([':', '?', '*', '<', '>', '"', "'", '/', '\\'] as $char) {
       $name = 'name.' . $char;
-      $return[] = array(
+      $return[] = [
         $name,
         "Invalid character in Config object name $name.",
-      );
+      ];
     }
     return $return;
   }
@@ -434,22 +434,22 @@ class ConfigTest extends UnitTestCase {
    * @see \Drupal\Tests\Core\Config\ConfigTest::testDelete()
    */
   public function overrideDataProvider() {
-    return array(
-      array(
+    return [
+      [
         // Original data.
-        array(
+        [
           'a' => 'originalValue',
-        ),
+        ],
         // Module overrides.
-        array(
+        [
           'a' => 'moduleValue',
-        ),
+        ],
         // Setting overrides.
-        array(
+        [
           'a' => 'settingValue',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -458,15 +458,15 @@ class ConfigTest extends UnitTestCase {
    * @see \Drupal\Tests\Core\Config\ConfigTest::testClear()
    */
   public function simpleDataProvider() {
-    return array(
-      array(
-        array(
+    return [
+      [
+        [
           'a' => '1',
           'b' => '2',
           'c' => '3',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -479,21 +479,21 @@ class ConfigTest extends UnitTestCase {
    * @see \Drupal\Tests\Core\Config\ConfigTest::testNestedClear()
    */
   public function nestedDataProvider() {
-    return array(
-      array(
-        array(
-          'a' => array(
+    return [
+      [
+        [
+          'a' => [
             'd' => 1,
-          ),
-          'b' => array(
+          ],
+          'b' => [
             'e' => 2,
-          ),
-          'c' => array(
+          ],
+          'c' => [
             'f' => 3,
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigDependencyManagerTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigDependencyManagerTest.php
index 0c3f14dbd..9f058d56f 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigDependencyManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigDependencyManagerTest.php
@@ -19,11 +19,11 @@ class ConfigDependencyManagerTest extends UnitTestCase {
 
   public function testNoConfigEntities() {
     $dep_manger = new ConfigDependencyManager();
-    $dep_manger->setData(array(
-      'simple.config' => array(
+    $dep_manger->setData([
+      'simple.config' => [
         'key' => 'value',
-      ),
-    ));
+      ],
+    ]);
     $this->assertEmpty($dep_manger->getDependentEntities('config', 'config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'));
 
     // Configuration is always dependent on its provider.
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
index 4710765dd..0a5d3d3e3 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\Core\Config\Entity;
 
 use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Config\Schema\SchemaIncompleteException;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Plugin\DefaultLazyPluginCollection;
@@ -96,11 +97,11 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
    */
   protected function setUp() {
     $this->id = $this->randomMachineName();
-    $values = array(
+    $values = [
       'id' => $this->id,
       'langcode' => 'en',
       'uuid' => '3bb9ee60-bea5-4622-b89b-a63319d10b3a',
-    );
+    ];
     $this->entityTypeId = $this->randomMachineName();
     $this->provider = $this->randomMachineName();
     $this->entityType = $this->getMock('\Drupal\Core\Config\Entity\ConfigEntityTypeInterface');
@@ -123,7 +124,7 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
     $this->languageManager->expects($this->any())
       ->method('getLanguage')
       ->with('en')
-      ->will($this->returnValue(new Language(array('id' => 'en'))));
+      ->will($this->returnValue(new Language(['id' => 'en'])));
 
     $this->cacheTagsInvalidator = $this->getMock('Drupal\Core\Cache\CacheTagsInvalidatorInterface');
 
@@ -137,7 +138,7 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
     $container->set('config.typed', $this->typedConfigManager);
     \Drupal::setContainer($container);
 
-    $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Config\Entity\ConfigEntityBase', array($values, $this->entityTypeId));
+    $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Config\Entity\ConfigEntityBase', [$values, $this->entityTypeId]);
   }
 
   /**
@@ -146,12 +147,12 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
    */
   public function testCalculateDependencies() {
     // Calculating dependencies will reset the dependencies array.
-    $this->entity->set('dependencies', array('module' => array('node')));
+    $this->entity->set('dependencies', ['module' => ['node']]);
     $this->assertEmpty($this->entity->calculateDependencies()->getDependencies());
 
     // Calculating dependencies will reset the dependencies array using enforced
     // dependencies.
-    $this->entity->set('dependencies', array('module' => array('node'), 'enforced' => array('module' => 'views')));
+    $this->entity->set('dependencies', ['module' => ['node'], 'enforced' => ['module' => 'views']]);
     $dependencies = $this->entity->calculateDependencies()->getDependencies();
     $this->assertContains('views', $dependencies['module']);
     $this->assertNotContains('node', $dependencies['module']);
@@ -166,7 +167,7 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
 
     $query->expects($this->any())
       ->method('execute')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $query->expects($this->any())
       ->method('condition')
       ->will($this->returnValue($query));
@@ -179,12 +180,12 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
 
     // Saving an entity will not reset the dependencies array during config
     // synchronization.
-    $this->entity->set('dependencies', array('module' => array('node')));
+    $this->entity->set('dependencies', ['module' => ['node']]);
     $this->entity->preSave($storage);
     $this->assertEmpty($this->entity->getDependencies());
 
     $this->entity->setSyncing(TRUE);
-    $this->entity->set('dependencies', array('module' => array('node')));
+    $this->entity->set('dependencies', ['module' => ['node']]);
     $this->entity->preSave($storage);
     $dependencies = $this->entity->getDependencies();
     $this->assertContains('node', $dependencies['module']);
@@ -207,12 +208,12 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
     // Test sorting of dependencies.
     $method->invoke($this->entity, 'module', 'action');
     $dependencies = $this->entity->getDependencies();
-    $this->assertEquals(array('action', 'node'), $dependencies['module']);
+    $this->assertEquals(['action', 'node'], $dependencies['module']);
 
     // Test sorting of dependency types.
     $method->invoke($this->entity, 'entity', 'system.action.id');
     $dependencies = $this->entity->getDependencies();
-    $this->assertEquals(array('entity', 'module'), array_keys($dependencies));
+    $this->assertEquals(['entity', 'module'], array_keys($dependencies));
   }
 
   /**
@@ -222,20 +223,20 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
    * @dataProvider providerCalculateDependenciesWithPluginCollections
    */
   public function testCalculateDependenciesWithPluginCollections($definition, $expected_dependencies) {
-    $values = array();
+    $values = [];
     $this->entity = $this->getMockBuilder('\Drupal\Tests\Core\Config\Entity\Fixtures\ConfigEntityBaseWithPluginCollections')
-      ->setConstructorArgs(array($values, $this->entityTypeId))
-      ->setMethods(array('getPluginCollections'))
+      ->setConstructorArgs([$values, $this->entityTypeId])
+      ->setMethods(['getPluginCollections'])
       ->getMock();
 
     // Create a configurable plugin that would add a dependency.
     $instance_id = $this->randomMachineName();
-    $instance = new TestConfigurablePlugin(array(), $instance_id, $definition);
+    $instance = new TestConfigurablePlugin([], $instance_id, $definition);
 
     // Create a plugin collection to contain the instance.
     $pluginCollection = $this->getMockBuilder('\Drupal\Core\Plugin\DefaultLazyPluginCollection')
       ->disableOriginalConstructor()
-      ->setMethods(array('get'))
+      ->setMethods(['get'])
       ->getMock();
     $pluginCollection->expects($this->atLeastOnce())
       ->method('get')
@@ -246,7 +247,7 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
     // Return the mocked plugin collection.
     $this->entity->expects($this->once())
       ->method('getPluginCollections')
-      ->will($this->returnValue(array($pluginCollection)));
+      ->will($this->returnValue([$pluginCollection]));
 
     $this->assertEquals($expected_dependencies, $this->entity->calculateDependencies()->getDependencies());
   }
@@ -261,34 +262,34 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
     $instance_dependency_1 = 'a' . $this->randomMachineName(10);
     $instance_dependency_2 = 'a' . $this->randomMachineName(11);
 
-    return array(
+    return [
       // Tests that the plugin provider is a module dependency.
-      array(
-        array('provider' => 'test'),
-        array('module' => array('test')),
-      ),
+      [
+        ['provider' => 'test'],
+        ['module' => ['test']],
+      ],
       // Tests that a plugin that is provided by the same module as the config
       // entity is not added to the dependencies array.
-      array(
-        array('provider' => $this->provider),
-        array('module' => array(NULL)),
-      ),
+      [
+        ['provider' => $this->provider],
+        ['module' => [NULL]],
+      ],
       // Tests that a config entity that has a plugin which provides config
       // dependencies in its definition has them.
-      array(
-        array(
+      [
+        [
           'provider' => 'test',
-          'config_dependencies' => array(
-            'config' => array($instance_dependency_1),
-            'module' => array($instance_dependency_2),
-          )
-        ),
-        array(
-          'config' => array($instance_dependency_1),
-          'module' => array($instance_dependency_2, 'test')
-        )
-      )
-    );
+          'config_dependencies' => [
+            'config' => [$instance_dependency_1],
+            'module' => [$instance_dependency_2],
+          ]
+        ],
+        [
+          'config' => [$instance_dependency_1],
+          'module' => [$instance_dependency_2, 'test']
+        ]
+      ]
+    ];
   }
 
   /**
@@ -297,17 +298,17 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
    * @covers ::onDependencyRemoval
    */
   public function testCalculateDependenciesWithThirdPartySettings() {
-    $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Config\Entity\ConfigEntityBase', array(array(), $this->entityTypeId));
+    $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Config\Entity\ConfigEntityBase', [[], $this->entityTypeId]);
     $this->entity->setThirdPartySetting('test_provider', 'test', 'test');
     $this->entity->setThirdPartySetting('test_provider2', 'test', 'test');
     $this->entity->setThirdPartySetting($this->provider, 'test', 'test');
 
-    $this->assertEquals(array('test_provider', 'test_provider2'), $this->entity->calculateDependencies()->getDependencies()['module']);
+    $this->assertEquals(['test_provider', 'test_provider2'], $this->entity->calculateDependencies()->getDependencies()['module']);
     $changed = $this->entity->onDependencyRemoval(['module' => ['test_provider2']]);
     $this->assertTrue($changed, 'Calling onDependencyRemoval with an existing third party dependency provider returns TRUE.');
     $changed = $this->entity->onDependencyRemoval(['module' => ['test_provider3']]);
     $this->assertFalse($changed, 'Calling onDependencyRemoval with a non-existing third party dependency provider returns FALSE.');
-    $this->assertEquals(array('test_provider'), $this->entity->calculateDependencies()->getDependencies()['module']);
+    $this->assertEquals(['test_provider'], $this->entity->calculateDependencies()->getDependencies()['module']);
   }
 
   /**
@@ -470,11 +471,11 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
     $this->entityManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue(array(
-        'entity_keys' => array(
+      ->will($this->returnValue([
+        'entity_keys' => [
           'label' => 'label',
-        ),
-      )));
+        ],
+      ]));
 
     $entity_a = $this->getMock('\Drupal\Core\Config\Entity\ConfigEntityInterface');
     $entity_a->expects($this->atLeastOnce())
@@ -486,12 +487,12 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
       ->willReturn('bar');
 
     // Test sorting by label.
-    $list = array($entity_a, $entity_b);
+    $list = [$entity_a, $entity_b];
     // Suppress errors because of https://bugs.php.net/bug.php?id=50688.
     @usort($list, '\Drupal\Core\Config\Entity\ConfigEntityBase::sort');
     $this->assertSame($entity_b, $list[0]);
 
-    $list = array($entity_b, $entity_a);
+    $list = [$entity_b, $entity_a];
     // Suppress errors because of https://bugs.php.net/bug.php?id=50688.
     @usort($list, '\Drupal\Core\Config\Entity\ConfigEntityBase::sort');
     $this->assertSame($entity_b, $list[0]);
@@ -499,12 +500,12 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
     // Test sorting by weight.
     $entity_a->weight = 0;
     $entity_b->weight = 1;
-    $list = array($entity_b, $entity_a);
+    $list = [$entity_b, $entity_a];
     // Suppress errors because of https://bugs.php.net/bug.php?id=50688.
     @usort($list, '\Drupal\Core\Config\Entity\ConfigEntityBase::sort');
     $this->assertSame($entity_a, $list[0]);
 
-    $list = array($entity_a, $entity_b);
+    $list = [$entity_a, $entity_b];
     // Suppress errors because of https://bugs.php.net/bug.php?id=50688.
     @usort($list, '\Drupal\Core\Config\Entity\ConfigEntityBase::sort');
     $this->assertSame($entity_a, $list[0]);
@@ -521,7 +522,7 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
       ->willReturn(['id' => 'configId', 'dependencies' => 'dependencies']);
     $properties = $this->entity->toArray();
     $this->assertInternalType('array', $properties);
-    $this->assertEquals(array('configId' => $this->entity->id(), 'dependencies' => array()), $properties);
+    $this->assertEquals(['configId' => $this->entity->id(), 'dependencies' => []], $properties);
   }
 
   /**
@@ -556,24 +557,23 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
   public function testToArraySchemaFallback() {
     $this->typedConfigManager->expects($this->once())
       ->method('getDefinition')
-      ->will($this->returnValue(array('mapping' => array('id' => '', 'dependencies' => ''))));
+      ->will($this->returnValue(['mapping' => ['id' => '', 'dependencies' => '']]));
     $this->entityType->expects($this->any())
       ->method('getPropertiesToExport')
       ->willReturn([]);
     $properties = $this->entity->toArray();
     $this->assertInternalType('array', $properties);
-    $this->assertEquals(array('id' => $this->entity->id(), 'dependencies' => array()), $properties);
+    $this->assertEquals(['id' => $this->entity->id(), 'dependencies' => []], $properties);
   }
 
   /**
    * @covers ::toArray
-   *
-   * @expectedException \Drupal\Core\Config\Schema\SchemaIncompleteException
    */
   public function testToArrayFallback() {
     $this->entityType->expects($this->any())
       ->method('getPropertiesToExport')
       ->willReturn([]);
+    $this->setExpectedException(SchemaIncompleteException::class);
     $this->entity->toArray();
   }
 
@@ -600,15 +600,15 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
 
     // Test getThirdPartySettings().
     $this->entity->setThirdPartySetting($third_party, 'test2', 'value2');
-    $this->assertEquals(array($key => $value, 'test2' => 'value2'), $this->entity->getThirdPartySettings($third_party));
+    $this->assertEquals([$key => $value, 'test2' => 'value2'], $this->entity->getThirdPartySettings($third_party));
 
     // Test getThirdPartyProviders().
     $this->entity->setThirdPartySetting('test_provider2', $key, $value);
-    $this->assertEquals(array($third_party, 'test_provider2'), $this->entity->getThirdPartyProviders());
+    $this->assertEquals([$third_party, 'test_provider2'], $this->entity->getThirdPartyProviders());
 
     // Test unsetThirdPartyProviders().
     $this->entity->unsetThirdPartySetting('test_provider2', $key);
-    $this->assertEquals(array($third_party), $this->entity->getThirdPartyProviders());
+    $this->assertEquals([$third_party], $this->entity->getThirdPartyProviders());
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityDependencyTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityDependencyTest.php
index 5d617ce0c..7bcbc97cc 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityDependencyTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityDependencyTest.php
@@ -13,34 +13,34 @@ use Drupal\Core\Config\Entity\ConfigEntityDependency;
 class ConfigEntityDependencyTest extends UnitTestCase {
 
   public function testEmptyDependencies() {
-    $dep = new ConfigEntityDependency('config_test.dynamic.entity_id', array());
+    $dep = new ConfigEntityDependency('config_test.dynamic.entity_id', []);
 
     $this->assertEquals('config_test.dynamic.entity_id', $dep->getConfigDependencyName());
-    $this->assertEquals(array(), $dep->getDependencies('theme'));
-    $this->assertEquals(array(), $dep->getDependencies('config'));
-    $this->assertEquals(array('config_test'), $dep->getDependencies('module'));
+    $this->assertEquals([], $dep->getDependencies('theme'));
+    $this->assertEquals([], $dep->getDependencies('config'));
+    $this->assertEquals(['config_test'], $dep->getDependencies('module'));
     $this->assertTrue($dep->hasDependency('module', 'config_test'));
     $this->assertFalse($dep->hasDependency('module', 'views'));
   }
 
   public function testWithDependencies() {
-    $values = array(
+    $values = [
       'uuid' => '60db47f4-54fb-4c86-a439-5769fbda4bd1',
-      'dependencies' => array(
-        'module' => array(
+      'dependencies' => [
+        'module' => [
           'node',
           'views'
-        ),
-        'config' => array(
+        ],
+        'config' => [
           'config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
     $dep = new ConfigEntityDependency('config_test.dynamic.entity_id', $values);
 
-    $this->assertEquals(array(), $dep->getDependencies('theme'));
-    $this->assertEquals(array('config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'), $dep->getDependencies('config'));
-    $this->assertEquals(array('node', 'views', 'config_test'), $dep->getDependencies('module'));
+    $this->assertEquals([], $dep->getDependencies('theme'));
+    $this->assertEquals(['config_test.dynamic.entity_id:745b0ce0-aece-42dd-a800-ade5b8455e84'], $dep->getDependencies('config'));
+    $this->assertEquals(['node', 'views', 'config_test'], $dep->getDependencies('module'));
     $this->assertTrue($dep->hasDependency('module', 'config_test'));
     $this->assertTrue($dep->hasDependency('module', 'views'));
     $this->assertTrue($dep->hasDependency('module', 'node'));
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index 62310a190..c4540e177 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -6,6 +6,7 @@ use Drupal\Component\Uuid\UuidInterface;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
 use Drupal\Core\Config\Config;
+use Drupal\Core\Config\ConfigDuplicateUUIDException;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\ConfigManagerInterface;
 use Drupal\Core\Config\Entity\ConfigEntityBase;
@@ -15,7 +16,9 @@ use Drupal\Core\Config\Entity\ConfigEntityType;
 use Drupal\Core\Config\ImmutableConfig;
 use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityMalformedException;
 use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityStorageException;
 use Drupal\Core\Entity\Query\QueryFactoryInterface;
 use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
@@ -177,7 +180,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
 
     $this->uuidService->generate()->shouldNotBeCalled();
 
-    $entity = $this->entityStorage->create(array('id' => 'foo', 'uuid' => 'baz'));
+    $entity = $this->entityStorage->create(['id' => 'foo', 'uuid' => 'baz']);
     $this->assertInstanceOf(EntityInterface::class, $entity);
     $this->assertSame('foo', $entity->id());
     $this->assertSame('baz', $entity->uuid());
@@ -206,7 +209,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
 
     $this->uuidService->generate()->willReturn('bar');
 
-    $entity = $this->entityStorage->create(array('id' => 'foo'));
+    $entity = $this->entityStorage->create(['id' => 'foo']);
     $this->assertInstanceOf(EntityInterface::class, $entity);
     $this->assertSame('foo', $entity->id());
     $this->assertSame('bar', $entity->uuid());
@@ -220,7 +223,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
   public function testCreateWithCurrentLanguage() {
     $this->languageManager->getLanguage('hu')->willReturn(new Language(['id' => 'hu']));
 
-    $entity = $this->entityStorage->create(array('id' => 'foo'));
+    $entity = $this->entityStorage->create(['id' => 'foo']);
     $this->assertSame('hu', $entity->language()->getId());
   }
 
@@ -231,7 +234,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
   public function testCreateWithExplicitLanguage() {
     $this->languageManager->getLanguage('en')->willReturn(new Language(['id' => 'en']));
 
-    $entity = $this->entityStorage->create(array('id' => 'foo', 'langcode' => 'en'));
+    $entity = $this->entityStorage->create(['id' => 'foo', 'langcode' => 'en']);
     $this->assertSame('en', $entity->language()->getId());
   }
 
@@ -376,23 +379,19 @@ class ConfigEntityStorageTest extends UnitTestCase {
 
   /**
    * @covers ::save
-   *
-   * @expectedException \Drupal\Core\Entity\EntityMalformedException
-   * @expectedExceptionMessage The entity does not have an ID.
    */
   public function testSaveInvalid() {
     $this->cacheTagsInvalidator->invalidateTags(Argument::cetera())
       ->shouldNotBeCalled();
 
     $entity = $this->getMockEntity();
+    $this->setExpectedException(EntityMalformedException::class, 'The entity does not have an ID.');
     $this->entityStorage->save($entity);
   }
 
   /**
    * @covers ::save
    * @covers ::doSave
-   *
-   * @expectedException \Drupal\Core\Entity\EntityStorageException
    */
   public function testSaveDuplicate() {
     $config_object = $this->prophesize(ImmutableConfig::class);
@@ -404,18 +403,16 @@ class ConfigEntityStorageTest extends UnitTestCase {
     $this->configFactory->get('the_provider.the_config_prefix.foo')
       ->willReturn($config_object->reveal());
 
-    $entity = $this->getMockEntity(array('id' => 'foo'));
+    $entity = $this->getMockEntity(['id' => 'foo']);
     $entity->enforceIsNew();
 
+    $this->setExpectedException(EntityStorageException::class);
     $this->entityStorage->save($entity);
   }
 
   /**
    * @covers ::save
    * @covers ::doSave
-   *
-   * @expectedException \Drupal\Core\Config\ConfigDuplicateUUIDException
-   * @expectedExceptionMessage when this UUID is already used for
    */
   public function testSaveMismatch() {
     $config_object = $this->prophesize(ImmutableConfig::class);
@@ -430,7 +427,8 @@ class ConfigEntityStorageTest extends UnitTestCase {
     $this->entityQuery->condition('uuid', NULL)->willReturn($this->entityQuery);
     $this->entityQuery->execute()->willReturn(['baz']);
 
-    $entity = $this->getMockEntity(array('id' => 'foo'));
+    $entity = $this->getMockEntity(['id' => 'foo']);
+    $this->setExpectedException(ConfigDuplicateUUIDException::class, 'when this UUID is already used for');
     $this->entityStorage->save($entity);
   }
 
@@ -463,7 +461,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
     $this->entityQuery->condition('uuid', NULL)->willReturn($this->entityQuery);
     $this->entityQuery->execute()->willReturn(['baz']);
 
-    $entity = $this->getMockEntity(array('id' => 'foo'));
+    $entity = $this->getMockEntity(['id' => 'foo']);
     $entity->setOriginalId('baz');
     $entity->enforceIsNew();
     $this->entityStorage->save($entity);
@@ -472,9 +470,6 @@ class ConfigEntityStorageTest extends UnitTestCase {
   /**
    * @covers ::save
    * @covers ::doSave
-   *
-   * @expectedException \Drupal\Core\Config\ConfigDuplicateUUIDException
-   * @expectedExceptionMessage when this entity already exists with UUID
    */
   public function testSaveChangedUuid() {
     $config_object = $this->prophesize(ImmutableConfig::class);
@@ -501,9 +496,10 @@ class ConfigEntityStorageTest extends UnitTestCase {
     $this->entityQuery->condition('uuid', 'baz')->willReturn($this->entityQuery);
     $this->entityQuery->execute()->willReturn(['foo']);
 
-    $entity = $this->getMockEntity(array('id' => 'foo'));
+    $entity = $this->getMockEntity(['id' => 'foo']);
 
     $entity->set('uuid', 'baz');
+    $this->setExpectedException(ConfigDuplicateUUIDException::class, 'when this entity already exists with UUID');
     $this->entityStorage->save($entity);
   }
 
@@ -595,7 +591,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
     $this->moduleHandler->getImplementations('entity_load')->willReturn([]);
     $this->moduleHandler->getImplementations('test_entity_type_load')->willReturn([]);
 
-    $entities = $this->entityStorage->loadMultiple(array('foo'));
+    $entities = $this->entityStorage->loadMultiple(['foo']);
     $this->assertContainsOnlyInstancesOf(EntityInterface::class, $entities);
     foreach ($entities as $id => $entity) {
       $this->assertSame($id, $entity->id());
@@ -633,9 +629,9 @@ class ConfigEntityStorageTest extends UnitTestCase {
       ->getConfigEntitiesToChangeOnDependencyRemoval('config', ['the_provider.the_config_prefix.bar'], FALSE)
       ->willReturn(['update' => [], 'delete' => [], 'unchanged' => []]);
 
-    $entities = array();
-    foreach (array('foo', 'bar') as $id) {
-      $entity = $this->getMockEntity(array('id' => $id));
+    $entities = [];
+    foreach (['foo', 'bar'] as $id) {
+      $entity = $this->getMockEntity(['id' => $id]);
       $entities[] = $entity;
 
       $config_object = $this->prophesize(Config::class);
@@ -674,7 +670,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
 
     $this->cacheTagsInvalidator->invalidateTags(Argument::cetera())->shouldNotBeCalled();
 
-    $this->entityStorage->delete(array());
+    $this->entityStorage->delete([]);
   }
 
   /**
@@ -687,7 +683,7 @@ class ConfigEntityStorageTest extends UnitTestCase {
    *
    * @return \Drupal\Core\Entity\EntityInterface|\PHPUnit_Framework_MockObject_MockObject
    */
-  public function getMockEntity(array $values = array(), $methods = array()) {
+  public function getMockEntity(array $values = [], $methods = []) {
     return $this->getMockForAbstractClass(ConfigEntityBase::class, [$values, 'test_entity_type'], '', TRUE, TRUE, TRUE, $methods);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
index b131b26a1..914d4f6fe 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\Core\Config\Entity;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Config\Entity\ConfigEntityType;
+use Drupal\Core\Config\Entity\Exception\ConfigEntityStorageClassException;
 
 /**
  * @coversDefaultClass \Drupal\Core\Config\Entity\ConfigEntityType
@@ -21,9 +22,9 @@ class ConfigEntityTypeTest extends UnitTestCase {
    */
   protected function setUpConfigEntityType($definition) {
     if (!isset($definition['id'])) {
-      $definition += array(
+      $definition += [
         'id' => 'example_config_entity_type',
-      );
+      ];
     }
     return new ConfigEntityType($definition);
   }
@@ -37,10 +38,10 @@ class ConfigEntityTypeTest extends UnitTestCase {
   public function testConfigPrefixLengthExceeds() {
     // A provider length of 24 and config_prefix length of 59 (+1 for the .)
     // results in a config length of 84, which is too long.
-    $definition = array(
+    $definition = [
       'provider' => $this->randomMachineName(24),
       'config_prefix' => $this->randomMachineName(59),
-    );
+    ];
     $config_entity = $this->setUpConfigEntityType($definition);
     $this->setExpectedException(
       '\Drupal\Core\Config\ConfigPrefixLengthException',
@@ -58,10 +59,10 @@ class ConfigEntityTypeTest extends UnitTestCase {
   public function testConfigPrefixLengthValid() {
     // A provider length of 24 and config_prefix length of 58 (+1 for the .)
     // results in a config length of 83, which is right at the limit.
-    $definition = array(
+    $definition = [
       'provider' => $this->randomMachineName(24),
       'config_prefix' => $this->randomMachineName(58),
-    );
+    ];
     $config_entity = $this->setUpConfigEntityType($definition);
     $expected_prefix = $definition['provider'] . '.' . $definition['config_prefix'];
     $this->assertEquals($expected_prefix, $config_entity->getConfigPrefix());
@@ -79,11 +80,9 @@ class ConfigEntityTypeTest extends UnitTestCase {
 
   /**
    * @covers ::__construct
-   *
-   * @expectedException \Drupal\Core\Config\Entity\Exception\ConfigEntityStorageClassException
-   * @expectedExceptionMessage \Drupal\Core\Entity\KeyValueStore\KeyValueEntityStorage is not \Drupal\Core\Config\Entity\ConfigEntityStorage or it does not extend it
    */
   public function testConstructBadStorage() {
+    $this->setExpectedException(ConfigEntityStorageClassException::class, '\Drupal\Core\Entity\KeyValueStore\KeyValueEntityStorage is not \Drupal\Core\Config\Entity\ConfigEntityStorage or it does not extend it');
     new ConfigEntityType([
       'id' => 'example_config_entity_type',
       'handlers' => ['storage' => '\Drupal\Core\Entity\KeyValueStore\KeyValueEntityStorage']
@@ -92,12 +91,10 @@ class ConfigEntityTypeTest extends UnitTestCase {
 
   /**
    * @covers ::setStorageClass
-   *
-   * @expectedException \Drupal\Core\Config\Entity\Exception\ConfigEntityStorageClassException
-   * @expectedExceptionMessage \Drupal\Core\Entity\KeyValueStore\KeyValueEntityStorage is not \Drupal\Core\Config\Entity\ConfigEntityStorage or it does not extend it
    */
   public function testSetStorageClass() {
     $config_entity = $this->setUpConfigEntityType([]);
+    $this->setExpectedException(ConfigEntityStorageClassException::class, '\Drupal\Core\Entity\KeyValueStore\KeyValueEntityStorage is not \Drupal\Core\Config\Entity\ConfigEntityStorage or it does not extend it');
     $config_entity->setStorageClass('\Drupal\Core\Entity\KeyValueStore\KeyValueEntityStorage');
   }
 
@@ -117,10 +114,10 @@ class ConfigEntityTypeTest extends UnitTestCase {
    * Provides test data.
    */
   public function providerTestGetConfigPrefix() {
-    return array(
-      array(array('provider' => 'node', 'id' => 'node_type', 'config_prefix' => 'type'), 'node.type'),
-      array(array('provider' => 'views', 'id' => 'view'), 'views.view'),
-    );
+    return [
+      [['provider' => 'node', 'id' => 'node_type', 'config_prefix' => 'type'], 'node.type'],
+      [['provider' => 'views', 'id' => 'view'], 'views.view'],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php
index 2a0b126da..728fdca45 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php
@@ -77,7 +77,7 @@ class EntityDisplayModeBaseUnitTest extends UnitTestCase {
     $target_entity_type->expects($this->any())
       ->method('getProvider')
       ->will($this->returnValue('test_module'));
-    $values = array('targetEntityType' => $target_entity_type_id);
+    $values = ['targetEntityType' => $target_entity_type_id];
 
     $this->entityManager->expects($this->at(0))
       ->method('getDefinition')
@@ -89,8 +89,8 @@ class EntityDisplayModeBaseUnitTest extends UnitTestCase {
       ->will($this->returnValue($this->entityInfo));
 
     $this->entity = $this->getMockBuilder('\Drupal\Core\Entity\EntityDisplayModeBase')
-      ->setConstructorArgs(array($values, $this->entityType))
-      ->setMethods(array('getFilterFormat'))
+      ->setConstructorArgs([$values, $this->entityType])
+      ->setMethods(['getFilterFormat'])
       ->getMock();
 
     $dependencies = $this->entity->calculateDependencies()->getDependencies();
@@ -105,7 +105,7 @@ class EntityDisplayModeBaseUnitTest extends UnitTestCase {
     $mock = $this->getMock(
       'Drupal\Core\Entity\EntityDisplayModeBase',
       NULL,
-      array(array('something' => 'nothing'), 'test_type')
+      [['something' => 'nothing'], 'test_type']
     );
 
     // Some test values.
@@ -134,7 +134,7 @@ class EntityDisplayModeBaseUnitTest extends UnitTestCase {
     $mock = $this->getMock(
       'Drupal\Core\Entity\EntityDisplayModeBase',
       NULL,
-      array(array('something' => 'nothing'), 'test_type')
+      [['something' => 'nothing'], 'test_type']
     );
 
     // A test value.
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/Query/QueryFactoryTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/Query/QueryFactoryTest.php
index 75fe62534..f3c882cec 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/Query/QueryFactoryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/Query/QueryFactoryTest.php
@@ -96,8 +96,8 @@ class QueryFactoryTest extends UnitTestCase {
   }
 
   /**
-   * @expectedException \LogicException
-   * @expectedExceptionMessage test_config_entity_type lookup key test.* ends with a wildcard this can not be used as a lookup
+   * @covers ::getKeys
+   * @covers ::getValues
    */
   public function testGetKeysWildCardEnd() {
     $config_factory = $this->getMock('Drupal\Core\Config\ConfigFactoryInterface');
@@ -111,6 +111,7 @@ class QueryFactoryTest extends UnitTestCase {
 
     $method = new \ReflectionMethod($query_factory, 'getKeys');
     $method->setAccessible(TRUE);
+    $this->setExpectedException(\LogicException::class, 'test_config_entity_type lookup key test.* ends with a wildcard this can not be used as a lookup');
     $method->invoke($query_factory, $this->getConfigObject('test'), 'test.*', 'get', $config_entity_type);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php b/web/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php
index 5b5c498cd..0ac82999c 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\Core\Config;
 
 use Drupal\Core\Config\ImmutableConfig;
+use Drupal\Core\Config\ImmutableConfigException;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -28,37 +29,33 @@ class ImmutableConfigTest extends UnitTestCase {
 
   /**
    * @covers ::set
-   * @expectedException \Drupal\Core\Config\ImmutableConfigException
-   * @expectedExceptionMessage Can not set values on immutable configuration test:name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object
    */
   public function testSet() {
+    $this->setExpectedException(ImmutableConfigException::class, 'Can not set values on immutable configuration test:name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object');
     $this->config->set('name', 'value');
   }
 
   /**
    * @covers ::clear
-   * @expectedException \Drupal\Core\Config\ImmutableConfigException
-   * @expectedExceptionMessage Can not clear name key in immutable configuration test. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object
    */
   public function testClear() {
+    $this->setExpectedException(ImmutableConfigException::class, 'Can not clear name key in immutable configuration test. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object');
     $this->config->clear('name');
   }
 
   /**
    * @covers ::save
-   * @expectedException \Drupal\Core\Config\ImmutableConfigException
-   * @expectedExceptionMessage Can not save immutable configuration test. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object
    */
   public function testSave() {
+    $this->setExpectedException(ImmutableConfigException::class, 'Can not save immutable configuration test. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object');
     $this->config->save();
   }
 
   /**
    * @covers ::delete
-   * @expectedException \Drupal\Core\Config\ImmutableConfigException
-   * @expectedExceptionMessage Can not delete immutable configuration test. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object
    */
   public function testDelete() {
+    $this->setExpectedException(ImmutableConfigException::class, 'Can not delete immutable configuration test. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object');
     $this->config->delete();
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php b/web/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
index e339af7b8..fc0d63bed 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
@@ -51,48 +51,48 @@ class StorageComparerTest extends UnitTestCase {
   protected function getConfigData() {
     $uuid = new Php();
     // Mock data using minimal data to use ConfigDependencyManger.
-    $this->configData = array(
+    $this->configData = [
       // Simple config that controls configuration sync.
-      'system.site' => array(
+      'system.site' => [
         'title' => 'Drupal',
         'uuid' => $uuid->generate(),
-      ),
+      ],
       // Config entity which requires another config entity.
-      'field.field.node.article.body' => array(
+      'field.field.node.article.body' => [
         'id' => 'node.article.body',
         'uuid' => $uuid->generate(),
-        'dependencies' => array(
-          'config' => array(
+        'dependencies' => [
+          'config' => [
             'field.storage.node.body'
-          ),
-        ),
-      ),
+          ],
+        ],
+      ],
       // Config entity which is required by another config entity.
-      'field.storage.node.body' => array(
+      'field.storage.node.body' => [
         'id' => 'node.body',
         'uuid' => $uuid->generate(),
-        'dependencies' => array(
-          'module' => array(
+        'dependencies' => [
+          'module' => [
             'text',
-          ),
-        ),
-      ),
+          ],
+        ],
+      ],
       // Config entity not which has no dependencies on configuration.
-      'views.view.test_view' => array(
+      'views.view.test_view' => [
         'id' => 'test_view',
         'uuid' => $uuid->generate(),
-        'dependencies' => array(
-          'module' => array(
+        'dependencies' => [
+          'module' => [
             'node',
-          ),
-        ),
-      ),
+          ],
+        ],
+      ],
       // Simple config.
-      'system.performance' => array(
+      'system.performance' => [
         'stale_file_threshold' => 2592000
-      ),
+      ],
 
-    );
+    ];
     return $this->configData;
   }
 
@@ -116,10 +116,10 @@ class StorageComparerTest extends UnitTestCase {
       ->will($this->returnValue($config_data));
     $this->sourceStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->targetStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $this->storageComparer->createChangelist();
     $this->assertEmpty($this->storageComparer->getChangelist('create'));
@@ -150,17 +150,17 @@ class StorageComparerTest extends UnitTestCase {
       ->will($this->returnValue($target_data));
     $this->sourceStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->targetStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $this->storageComparer->createChangelist();
-    $expected = array(
+    $expected = [
       'field.storage.node.body',
       'field.field.node.article.body',
       'views.view.test_view',
-    );
+    ];
     $this->assertEquals($expected, $this->storageComparer->getChangelist('create'));
     $this->assertEmpty($this->storageComparer->getChangelist('delete'));
     $this->assertEmpty($this->storageComparer->getChangelist('update'));
@@ -189,17 +189,17 @@ class StorageComparerTest extends UnitTestCase {
       ->will($this->returnValue($target_data));
     $this->sourceStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->targetStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $this->storageComparer->createChangelist();
-    $expected = array(
+    $expected = [
       'views.view.test_view',
       'field.field.node.article.body',
       'field.storage.node.body',
-    );
+    ];
     $this->assertEquals($expected, $this->storageComparer->getChangelist('delete'));
     $this->assertEmpty($this->storageComparer->getChangelist('create'));
     $this->assertEmpty($this->storageComparer->getChangelist('update'));
@@ -228,17 +228,17 @@ class StorageComparerTest extends UnitTestCase {
       ->will($this->returnValue($target_data));
     $this->sourceStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->targetStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $this->storageComparer->createChangelist();
-    $expected = array(
+    $expected = [
       'field.storage.node.body',
       'field.field.node.article.body',
       'system.site',
-    );
+    ];
     $this->assertEquals($expected, $this->storageComparer->getChangelist('update'));
     $this->assertEmpty($this->storageComparer->getChangelist('create'));
     $this->assertEmpty($this->storageComparer->getChangelist('delete'));
diff --git a/web/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php b/web/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php
index 9dfc690df..3d42dec4a 100644
--- a/web/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Controller/AjaxRendererTest.php
@@ -42,7 +42,7 @@ class AjaxRendererTest extends UnitTestCase {
       ->with('ajax')
       ->willReturn([
         '#header' => TRUE,
-        '#commands' => array(),
+        '#commands' => [],
         '#error' => NULL,
       ]);
     $this->ajaxRenderer = new TestAjaxRenderer($element_info_manager);
diff --git a/web/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php b/web/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php
index 9bcb6b524..3f55f1510 100644
--- a/web/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php
@@ -26,14 +26,14 @@ class ControllerBaseTest extends UnitTestCase {
    * Tests the config method.
    */
   public function testGetConfig() {
-    $config_factory = $this->getConfigFactoryStub(array(
-      'config_name' => array(
+    $config_factory = $this->getConfigFactoryStub([
+      'config_name' => [
         'key' => 'value',
-      ),
-      'config_name2' => array(
+      ],
+      'config_name2' => [
         'key2' => 'value2',
-      ),
-    ));
+      ],
+    ]);
 
     $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
     $container->expects($this->once())
diff --git a/web/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php b/web/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
index 98a18a354..28040a603 100644
--- a/web/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
@@ -78,11 +78,11 @@ class ControllerResolverTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
     $mock_account = $this->getMock('Drupal\Core\Session\AccountInterface');
-    $request = new Request(array(), array(), array(
+    $request = new Request([], [], [
       'entity' => $mock_entity,
       'user' => $mock_account,
-      '_raw_variables' => new ParameterBag(array('entity' => 1, 'user' => 1)),
-    ), array(), array(), array('HTTP_HOST' => 'drupal.org'));
+      '_raw_variables' => new ParameterBag(['entity' => 1, 'user' => 1]),
+    ], [], [], ['HTTP_HOST' => 'drupal.org']);
     $arguments = $this->controllerResolver->getArguments($request, $controller);
 
     $this->assertEquals($mock_entity, $arguments[0]);
@@ -106,33 +106,31 @@ class ControllerResolverTest extends UnitTestCase {
    * Provides test data for testCreateController().
    */
   public function providerTestCreateController() {
-    return array(
+    return [
       // Tests class::method.
-      array('Drupal\Tests\Core\Controller\MockController::getResult', 'Drupal\Tests\Core\Controller\MockController', 'This is a regular controller.'),
+      ['Drupal\Tests\Core\Controller\MockController::getResult', 'Drupal\Tests\Core\Controller\MockController', 'This is a regular controller.'],
       // Tests service:method.
-      array('some_service:getResult', 'Drupal\Tests\Core\Controller\MockController', 'This is a regular controller.'),
+      ['some_service:getResult', 'Drupal\Tests\Core\Controller\MockController', 'This is a regular controller.'],
       // Tests a class with injection.
-      array('Drupal\Tests\Core\Controller\MockContainerInjection::getResult', 'Drupal\Tests\Core\Controller\MockContainerInjection', 'This used injection.'),
+      ['Drupal\Tests\Core\Controller\MockContainerInjection::getResult', 'Drupal\Tests\Core\Controller\MockContainerInjection', 'This used injection.'],
       // Tests a ContainerAware class.
-      array('Drupal\Tests\Core\Controller\MockContainerAware::getResult', 'Drupal\Tests\Core\Controller\MockContainerAware', 'This is container aware.'),
-    );
+      ['Drupal\Tests\Core\Controller\MockContainerAware::getResult', 'Drupal\Tests\Core\Controller\MockContainerAware', 'This is container aware.'],
+    ];
   }
 
   /**
    * Tests createController() with a non-existent class.
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testCreateControllerNonExistentClass() {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->controllerResolver->getControllerFromDefinition('Class::method');
   }
 
   /**
    * Tests createController() with an invalid name.
-   *
-   * @expectedException \LogicException
    */
   public function testCreateControllerInvalidName() {
+    $this->setExpectedException(\LogicException::class);
     $this->controllerResolver->getControllerFromDefinition('ClassWithoutMethod');
   }
 
@@ -142,7 +140,7 @@ class ControllerResolverTest extends UnitTestCase {
    * @dataProvider providerTestGetController
    */
   public function testGetController($attributes, $class, $output = NULL) {
-    $request = new Request(array(), array(), $attributes);
+    $request = new Request([], [], $attributes);
     $result = $this->controllerResolver->getController($request);
     if ($class) {
       $this->assertCallableController($result, $class, $output);
@@ -156,12 +154,12 @@ class ControllerResolverTest extends UnitTestCase {
    * Provides test data for testGetController().
    */
   public function providerTestGetController() {
-    return array(
+    return [
       // Tests passing a controller via the request.
-      array(array('_controller' => 'Drupal\Tests\Core\Controller\MockContainerAware::getResult'), 'Drupal\Tests\Core\Controller\MockContainerAware', 'This is container aware.'),
+      [['_controller' => 'Drupal\Tests\Core\Controller\MockContainerAware::getResult'], 'Drupal\Tests\Core\Controller\MockContainerAware', 'This is container aware.'],
       // Tests a request with no controller specified.
-      array(array(), FALSE)
-    );
+      [[], FALSE]
+    ];
   }
 
   /**
@@ -178,23 +176,22 @@ class ControllerResolverTest extends UnitTestCase {
    * Provides test data for testGetControllerFromDefinition().
    */
   public function providerTestGetControllerFromDefinition() {
-    return array(
+    return [
       // Tests a method on an object.
-      array(array(new MockController(), 'getResult'), 'This is a regular controller.'),
+      [[new MockController(), 'getResult'], 'This is a regular controller.'],
       // Tests a function.
-      array('phpversion', phpversion()),
+      ['phpversion', phpversion()],
       // Tests an object using __invoke().
-      array(new MockInvokeController(), 'This used __invoke().'),
+      [new MockInvokeController(), 'This used __invoke().'],
       // Tests a class using __invoke().
-      array('Drupal\Tests\Core\Controller\MockInvokeController', 'This used __invoke().'),
-    );
+      ['Drupal\Tests\Core\Controller\MockInvokeController', 'This used __invoke().'],
+    ];
   }
   /**
    * Tests getControllerFromDefinition() without a callable.
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testGetControllerFromDefinitionNotCallable() {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->controllerResolver->getControllerFromDefinition('Drupal\Tests\Core\Controller\MockController::bananas');
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php b/web/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
index e2fca4b8f..7633f78a1 100644
--- a/web/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
@@ -55,8 +55,8 @@ class TitleResolverTest extends UnitTestCase {
    */
   public function testStaticTitle() {
     $request = new Request();
-    $route = new Route('/test-route', array('_title' => 'static title'));
-    $this->assertEquals(new TranslatableMarkup('static title', array(), array(), $this->translationManager), $this->titleResolver->getTitle($request, $route));
+    $route = new Route('/test-route', ['_title' => 'static title']);
+    $this->assertEquals(new TranslatableMarkup('static title', [], [], $this->translationManager), $this->titleResolver->getTitle($request, $route));
   }
 
   /**
@@ -66,8 +66,8 @@ class TitleResolverTest extends UnitTestCase {
    */
   public function testStaticTitleWithContext() {
     $request = new Request();
-    $route = new Route('/test-route', array('_title' => 'static title', '_title_context' => 'context'));
-    $this->assertEquals(new TranslatableMarkup('static title', array(), array('context' => 'context'), $this->translationManager), $this->titleResolver->getTitle($request, $route));
+    $route = new Route('/test-route', ['_title' => 'static title', '_title_context' => 'context']);
+    $this->assertEquals(new TranslatableMarkup('static title', [], ['context' => 'context'], $this->translationManager), $this->titleResolver->getTitle($request, $route));
   }
 
   /**
@@ -78,20 +78,20 @@ class TitleResolverTest extends UnitTestCase {
    * @dataProvider providerTestStaticTitleWithParameter
    */
   public function testStaticTitleWithParameter($title, $expected_title) {
-    $raw_variables = new ParameterBag(array('test' => 'value', 'test2' => 'value2'));
+    $raw_variables = new ParameterBag(['test' => 'value', 'test2' => 'value2']);
     $request = new Request();
     $request->attributes->set('_raw_variables', $raw_variables);
 
-    $route = new Route('/test-route', array('_title' => $title));
+    $route = new Route('/test-route', ['_title' => $title]);
     $this->assertEquals($expected_title, $this->titleResolver->getTitle($request, $route));
   }
 
   public function providerTestStaticTitleWithParameter() {
     $translation_manager = $this->getMock('\Drupal\Core\StringTranslation\TranslationInterface');
-    return array(
-      array('static title @test', new TranslatableMarkup('static title @test', ['@test' => 'value', '%test' => 'value', '@test2' => 'value2', '%test2' => 'value2'], array(), $translation_manager)),
-      array('static title %test', new TranslatableMarkup('static title %test', ['@test' => 'value', '%test' => 'value', '@test2' => 'value2', '%test2' => 'value2'], array(), $translation_manager)),
-    );
+    return [
+      ['static title @test', new TranslatableMarkup('static title @test', ['@test' => 'value', '%test' => 'value', '@test2' => 'value2', '%test2' => 'value2'], [], $translation_manager)],
+      ['static title %test', new TranslatableMarkup('static title %test', ['@test' => 'value', '%test' => 'value', '@test2' => 'value2', '%test2' => 'value2'], [], $translation_manager)],
+    ];
   }
 
   /**
@@ -101,9 +101,9 @@ class TitleResolverTest extends UnitTestCase {
    */
   public function testDynamicTitle() {
     $request = new Request();
-    $route = new Route('/test-route', array('_title' => 'static title', '_title_callback' => 'Drupal\Tests\Core\Controller\TitleCallback::example'));
+    $route = new Route('/test-route', ['_title' => 'static title', '_title_callback' => 'Drupal\Tests\Core\Controller\TitleCallback::example']);
 
-    $callable = array(new TitleCallback(), 'example');
+    $callable = [new TitleCallback(), 'example'];
     $this->controllerResolver->expects($this->once())
       ->method('getControllerFromDefinition')
       ->with('Drupal\Tests\Core\Controller\TitleCallback::example')
@@ -111,7 +111,7 @@ class TitleResolverTest extends UnitTestCase {
     $this->controllerResolver->expects($this->once())
       ->method('getArguments')
       ->with($request, $callable)
-      ->will($this->returnValue(array('example')));
+      ->will($this->returnValue(['example']));
 
     $this->assertEquals('test example', $this->titleResolver->getTitle($request, $route));
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Database/ConditionTest.php b/web/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
index fde028b9b..13b629342 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
@@ -16,11 +16,26 @@ use Prophecy\Argument;
 class ConditionTest extends UnitTestCase {
 
   /**
-   * @covers ::compile
+   * Provides a list of known operations and the expected output.
+   *
+   * @return array
+   *   - Expected result for the string version of the condition.
+   *   - The field name to input in the condition.
    */
-  public function testSimpleCondition() {
+  public function providerSimpleCondition() {
+    return [
+      ['name = :db_condition_placeholder_0', 'name'],
+      ['name123 = :db_condition_placeholder_0', 'name-123'],
+    ];
+  }
+
+  /**
+   * @covers ::compile
+   * @dataProvider providerSimpleCondition()
+   */
+  public function testSimpleCondition($expected, $field_name) {
     $connection = $this->prophesize(Connection::class);
-    $connection->escapeField('name')->will(function ($args) {
+    $connection->escapeField($field_name)->will(function ($args) {
       return preg_replace('/[^A-Za-z0-9_.]+/', '', $args[0]);
     });
     $connection->mapConditionOperator('=')->willReturn(['operator' => '=']);
@@ -36,10 +51,10 @@ class ConditionTest extends UnitTestCase {
     $query_placeholder = $query_placeholder->reveal();
 
     $condition = new Condition('AND');
-    $condition->condition('name', ['value']);
+    $condition->condition($field_name, ['value']);
     $condition->compile($connection, $query_placeholder);
 
-    $this->assertEquals(' (name = :db_condition_placeholder_0) ', $condition->__toString());
+    $this->assertEquals($expected, $condition->__toString());
     $this->assertEquals([':db_condition_placeholder_0' => 'value'], $condition->arguments());
   }
 
@@ -96,28 +111,28 @@ class ConditionTest extends UnitTestCase {
     // aren't directly supported by core, but instead need manual handling with
     // prefix/suffix at the moment.
     $data = [];
-    $data[] = [' (name = :db_condition_placeholder_0) ', 'name', 'value', '='];
-    $data[] = [' (name != :db_condition_placeholder_0) ', 'name', 'value', '!='];
-    $data[] = [' (name <> :db_condition_placeholder_0) ', 'name', 'value', '<>'];
-    $data[] = [' (name >= :db_condition_placeholder_0) ', 'name', 'value', '>='];
-    $data[] = [' (name > :db_condition_placeholder_0) ', 'name', 'value', '>'];
-    $data[] = [' (name <= :db_condition_placeholder_0) ', 'name', 'value', '<='];
-    $data[] = [' (name < :db_condition_placeholder_0) ', 'name', 'value', '<'];
-    // $data[] = [' ( GREATEST (1, 2, 3) ) ', '', [1, 2, 3], 'GREATEST'];
-    $data[] = [' (name IN  (:db_condition_placeholder_0, :db_condition_placeholder_1, :db_condition_placeholder_2)) ', 'name', ['1', '2', '3'], 'IN'];
-    $data[] = [' (name NOT IN  (:db_condition_placeholder_0, :db_condition_placeholder_1, :db_condition_placeholder_2)) ', 'name', ['1', '2', '3'], 'NOT IN'];
-    // $data[] = [' ( INTERVAL (1, 2, 3) ) ', '', [1, 2, 3], 'INTERVAL'];
-    $data[] = [' (name IS NULL ) ', 'name', NULL, 'IS NULL'];
-    $data[] = [' (name IS NOT NULL ) ', 'name', NULL, 'IS NOT NULL'];
-    $data[] = [' (name IS :db_condition_placeholder_0) ', 'name', 'TRUE', 'IS'];
-    // $data[] = [' ( LEAST (1, 2, 3) ) ', '', [1, 2, 3], 'LEAST'];
-    $data[] = [" (name LIKE :db_condition_placeholder_0 ESCAPE '\\\\') ", 'name', '%muh%', 'LIKE', [':db_condition_placeholder_0' => '%muh%']];
-    $data[] = [" (name NOT LIKE :db_condition_placeholder_0 ESCAPE '\\\\') ", 'name', '%muh%', 'NOT LIKE', [':db_condition_placeholder_0' => '%muh%']];
-    $data[] = [" (name BETWEEN :db_condition_placeholder_0 AND :db_condition_placeholder_1) ", 'name', [1, 2], 'BETWEEN', [':db_condition_placeholder_0' => 1, ':db_condition_placeholder_1' => 2]];
-    $data[] = [" (name NOT BETWEEN :db_condition_placeholder_0 AND :db_condition_placeholder_1) ", 'name', [1, 2], 'NOT BETWEEN', [':db_condition_placeholder_0' => 1, ':db_condition_placeholder_1' => 2]];
-    // $data[] = [' ( STRCMP (name, :db_condition_placeholder_0) ) ', '', ['test-string'], 'STRCMP', [':db_condition_placeholder_0' => 'test-string']];
-    // $data[] = [' (EXISTS ) ', '', NULL, 'EXISTS'];
-    // $data[] = [' (name NOT EXISTS ) ', 'name', NULL, 'NOT EXISTS'];
+    $data[] = ['name = :db_condition_placeholder_0', 'name', 'value', '='];
+    $data[] = ['name != :db_condition_placeholder_0', 'name', 'value', '!='];
+    $data[] = ['name <> :db_condition_placeholder_0', 'name', 'value', '<>'];
+    $data[] = ['name >= :db_condition_placeholder_0', 'name', 'value', '>='];
+    $data[] = ['name > :db_condition_placeholder_0', 'name', 'value', '>'];
+    $data[] = ['name <= :db_condition_placeholder_0', 'name', 'value', '<='];
+    $data[] = ['name < :db_condition_placeholder_0', 'name', 'value', '<'];
+    // $data[] = ['GREATEST (1, 2, 3)', '', [1, 2, 3], 'GREATEST'];
+    $data[] = ['name IN (:db_condition_placeholder_0, :db_condition_placeholder_1, :db_condition_placeholder_2)', 'name', ['1', '2', '3'], 'IN'];
+    $data[] = ['name NOT IN (:db_condition_placeholder_0, :db_condition_placeholder_1, :db_condition_placeholder_2)', 'name', ['1', '2', '3'], 'NOT IN'];
+    // $data[] = ['INTERVAL (1, 2, 3)', '', [1, 2, 3], 'INTERVAL'];
+    $data[] = ['name IS NULL', 'name', NULL, 'IS NULL'];
+    $data[] = ['name IS NOT NULL', 'name', NULL, 'IS NOT NULL'];
+    $data[] = ['name IS :db_condition_placeholder_0', 'name', 'TRUE', 'IS'];
+    // $data[] = ['LEAST (1, 2, 3)', '', [1, 2, 3], 'LEAST'];
+    $data[] = ["name LIKE :db_condition_placeholder_0 ESCAPE '\\\\'", 'name', '%muh%', 'LIKE', [':db_condition_placeholder_0' => '%muh%']];
+    $data[] = ["name NOT LIKE :db_condition_placeholder_0 ESCAPE '\\\\'", 'name', '%muh%', 'NOT LIKE', [':db_condition_placeholder_0' => '%muh%']];
+    $data[] = ["name BETWEEN :db_condition_placeholder_0 AND :db_condition_placeholder_1", 'name', [1, 2], 'BETWEEN', [':db_condition_placeholder_0' => 1, ':db_condition_placeholder_1' => 2]];
+    $data[] = ["name NOT BETWEEN :db_condition_placeholder_0 AND :db_condition_placeholder_1", 'name', [1, 2], 'NOT BETWEEN', [':db_condition_placeholder_0' => 1, ':db_condition_placeholder_1' => 2]];
+    // $data[] = ['STRCMP (name, :db_condition_placeholder_0)', '', ['test-string'], 'STRCMP', [':db_condition_placeholder_0' => 'test-string']];
+    // $data[] = ['EXISTS', '', NULL, 'EXISTS'];
+    // $data[] = ['name NOT EXISTS', 'name', NULL, 'NOT EXISTS'];
 
     return $data;
   }
@@ -125,7 +140,6 @@ class ConditionTest extends UnitTestCase {
   /**
    * @covers ::compile
    *
-   * @expectedException \PHPUnit_Framework_Error
    * @dataProvider providerTestCompileWithSqlInjectionForOperator
    */
   public function testCompileWithSqlInjectionForOperator($operator) {
@@ -147,6 +161,7 @@ class ConditionTest extends UnitTestCase {
 
     $condition = new Condition('AND');
     $condition->condition('name', 'value', $operator);
+    $this->setExpectedException(\PHPUnit_Framework_Error::class);
     $condition->compile($connection, $query_placeholder);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php b/web/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
index 8f4aa7ae2..e45584702 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
@@ -21,22 +21,22 @@ class ConnectionTest extends UnitTestCase {
    *   - Expected result from Connection::tablePrefix().
    */
   public function providerPrefixRoundTrip() {
-    return array(
-      array(
-        array('' => 'test_'),
+    return [
+      [
+        ['' => 'test_'],
         'test_',
-      ),
-      array(
-        array(
+      ],
+      [
+        [
           'fooTable' => 'foo_',
           'barTable' => 'bar_',
-        ),
-        array(
+        ],
+        [
           'fooTable' => 'foo_',
           'barTable' => 'bar_',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -46,7 +46,7 @@ class ConnectionTest extends UnitTestCase {
    */
   public function testPrefixRoundTrip($expected, $prefix_info) {
     $mock_pdo = $this->getMock('Drupal\Tests\Core\Database\Stub\StubPDO');
-    $connection = new StubConnection($mock_pdo, array());
+    $connection = new StubConnection($mock_pdo, []);
 
     // setPrefix() is protected, so we make it accessible with reflection.
     $reflection = new \ReflectionClass('Drupal\Tests\Core\Database\Stub\StubConnection');
@@ -54,7 +54,7 @@ class ConnectionTest extends UnitTestCase {
     $set_prefix->setAccessible(TRUE);
 
     // Set the prefix data.
-    $set_prefix->invokeArgs($connection, array($prefix_info));
+    $set_prefix->invokeArgs($connection, [$prefix_info]);
     // Check the round-trip.
     foreach ($expected as $table => $prefix) {
       $this->assertEquals($prefix, $connection->tablePrefix($table));
@@ -71,21 +71,21 @@ class ConnectionTest extends UnitTestCase {
    *   - Query to be prefixed.
    */
   public function providerTestPrefixTables() {
-    return array(
-      array(
+    return [
+      [
         'SELECT * FROM test_table',
         'test_',
         'SELECT * FROM {table}',
-      ),
-      array(
+      ],
+      [
         'SELECT * FROM first_table JOIN second_thingie',
-        array(
+        [
           'table' => 'first_',
           'thingie' => 'second_',
-        ),
+        ],
         'SELECT * FROM {table} JOIN {thingie}',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -95,7 +95,7 @@ class ConnectionTest extends UnitTestCase {
    */
   public function testPrefixTables($expected, $prefix_info, $query) {
     $mock_pdo = $this->getMock('Drupal\Tests\Core\Database\Stub\StubPDO');
-    $connection = new StubConnection($mock_pdo, array('prefix' => $prefix_info));
+    $connection = new StubConnection($mock_pdo, ['prefix' => $prefix_info]);
     $this->assertEquals($expected, $connection->prefixTables($query));
   }
 
@@ -108,14 +108,14 @@ class ConnectionTest extends UnitTestCase {
    *   - String to escape.
    */
   public function providerEscapeMethods() {
-    return array(
-      array('thing', 'thing'),
-      array('_item', '_item'),
-      array('item_', 'item_'),
-      array('_item_', '_item_'),
-      array('', '!@#$%^&*()-=+'),
-      array('123', '!1@2#3'),
-    );
+    return [
+      ['thing', 'thing'],
+      ['_item', '_item'],
+      ['item_', 'item_'],
+      ['_item_', '_item_'],
+      ['', '!@#$%^&*()-=+'],
+      ['123', '!1@2#3'],
+    ];
   }
 
   /**
@@ -129,7 +129,7 @@ class ConnectionTest extends UnitTestCase {
    */
   public function testEscapeMethods($expected, $name) {
     $mock_pdo = $this->getMock('Drupal\Tests\Core\Database\Stub\StubPDO');
-    $connection = new StubConnection($mock_pdo, array());
+    $connection = new StubConnection($mock_pdo, []);
     $this->assertEquals($expected, $connection->escapeDatabase($name));
     $this->assertEquals($expected, $connection->escapeTable($name));
     $this->assertEquals($expected, $connection->escapeField($name));
@@ -147,23 +147,23 @@ class ConnectionTest extends UnitTestCase {
    *   - Class name without namespace.
    */
   public function providerGetDriverClass() {
-    return array(
-      array(
+    return [
+      [
         'nonexistent_class',
         '\\',
         'nonexistent_class',
-      ),
-      array(
+      ],
+      [
         'Drupal\Tests\Core\Database\Stub\Select',
         NULL,
         'Select',
-      ),
-      array(
+      ],
+      [
         'Drupal\\Tests\\Core\\Database\\Stub\\Driver\\Schema',
         'Drupal\\Tests\\Core\\Database\\Stub\\Driver',
         'Schema',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -173,7 +173,7 @@ class ConnectionTest extends UnitTestCase {
    */
   public function testGetDriverClass($expected, $namespace, $class) {
     $mock_pdo = $this->getMock('Drupal\Tests\Core\Database\Stub\StubPDO');
-    $connection = new StubConnection($mock_pdo, array('namespace' => $namespace));
+    $connection = new StubConnection($mock_pdo, ['namespace' => $namespace]);
     // Set the driver using our stub class' public property.
     $this->assertEquals($expected, $connection->getDriverClass($class));
   }
@@ -188,13 +188,13 @@ class ConnectionTest extends UnitTestCase {
    *   - Namespace for connection.
    */
   public function providerSchema() {
-    return array(
-      array(
+    return [
+      [
         'Drupal\\Tests\\Core\\Database\\Stub\\Driver\\Schema',
         'stub',
         'Drupal\\Tests\\Core\\Database\\Stub\\Driver',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -204,7 +204,7 @@ class ConnectionTest extends UnitTestCase {
    */
   public function testSchema($expected, $driver, $namespace) {
     $mock_pdo = $this->getMock('Drupal\Tests\Core\Database\Stub\StubPDO');
-    $connection = new StubConnection($mock_pdo, array('namespace' => $namespace));
+    $connection = new StubConnection($mock_pdo, ['namespace' => $namespace]);
     $connection->driver = $driver;
     $this->assertInstanceOf($expected, $connection->schema());
   }
@@ -218,7 +218,7 @@ class ConnectionTest extends UnitTestCase {
     $connection = $this->getMock(
       'Drupal\Tests\Core\Database\Stub\StubConnection',
       NULL,
-      array($mock_pdo, array('namespace' => 'Drupal\\Tests\\Core\\Database\\Stub\\Driver'))
+      [$mock_pdo, ['namespace' => 'Drupal\\Tests\\Core\\Database\\Stub\\Driver']]
     );
     // Generate a schema object in order to verify that we've NULLed it later.
     $this->assertInstanceOf(
@@ -238,20 +238,20 @@ class ConnectionTest extends UnitTestCase {
    *   - Arguments for Connection::makeComment().
    */
   public function providerMakeComments() {
-    return array(
-      array(
+    return [
+      [
         '/*  */ ',
-        array(''),
-      ),
-      array(
+        [''],
+      ],
+      [
         '/* Exploit  *  / DROP TABLE node. -- */ ',
-        array('Exploit * / DROP TABLE node; --'),
-      ),
-      array(
+        ['Exploit * / DROP TABLE node; --'],
+      ],
+      [
         '/* Exploit  *  / DROP TABLE node. --. another comment */ ',
-        array('Exploit * / DROP TABLE node; --', 'another comment'),
-      ),
-    );
+        ['Exploit * / DROP TABLE node; --', 'another comment'],
+      ],
+    ];
   }
 
   /**
@@ -261,7 +261,7 @@ class ConnectionTest extends UnitTestCase {
    */
   public function testMakeComments($expected, $comment_array) {
     $mock_pdo = $this->getMock('Drupal\Tests\Core\Database\Stub\StubPDO');
-    $connection = new StubConnection($mock_pdo, array());
+    $connection = new StubConnection($mock_pdo, []);
     $this->assertEquals($expected, $connection->makeComment($comment_array));
   }
 
@@ -274,11 +274,11 @@ class ConnectionTest extends UnitTestCase {
    *   - Comment to filter.
    */
   public function providerFilterComments() {
-    return array(
-      array('', ''),
-      array('Exploit  *  / DROP TABLE node. --', 'Exploit * / DROP TABLE node; --'),
-      array('Exploit  * / DROP TABLE node. --', 'Exploit */ DROP TABLE node; --'),
-    );
+    return [
+      ['', ''],
+      ['Exploit  *  / DROP TABLE node. --', 'Exploit * / DROP TABLE node; --'],
+      ['Exploit  * / DROP TABLE node. --', 'Exploit */ DROP TABLE node; --'],
+    ];
   }
 
   /**
@@ -288,7 +288,7 @@ class ConnectionTest extends UnitTestCase {
    */
   public function testFilterComments($expected, $comment) {
     $mock_pdo = $this->getMock('Drupal\Tests\Core\Database\Stub\StubPDO');
-    $connection = new StubConnection($mock_pdo, array());
+    $connection = new StubConnection($mock_pdo, []);
 
     // filterComment() is protected, so we make it accessible with reflection.
     $reflection = new \ReflectionClass('Drupal\Tests\Core\Database\Stub\StubConnection');
@@ -297,7 +297,7 @@ class ConnectionTest extends UnitTestCase {
 
     $this->assertEquals(
       $expected,
-      $filter_comment->invokeArgs($connection, array($comment))
+      $filter_comment->invokeArgs($connection, [$comment])
     );
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php b/web/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php
index 883f851d9..b55ddbb85 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php
@@ -29,61 +29,61 @@ class PostgresqlConnectionTest extends UnitTestCase {
   /**
    * Data provider for testEscapeTable.
    *
-   * @return []
+   * @return array
    *   An indexed array of where each value is an array of arguments to pass to
    *   testEscapeField. The first value is the expected value, and the second
    *   value is the value to test.
    */
   public function providerEscapeTables() {
-    return array(
-      array('nocase', 'nocase'),
-      array('"camelCase"', 'camelCase'),
-      array('"camelCase"', '"camelCase"'),
-      array('"camelCase"', 'camel/Case'),
+    return [
+      ['nocase', 'nocase'],
+      ['"camelCase"', 'camelCase'],
+      ['"camelCase"', '"camelCase"'],
+      ['"camelCase"', 'camel/Case'],
       // Sometimes, table names are following the pattern database.schema.table.
-      array('"camelCase".nocase.nocase', 'camelCase.nocase.nocase'),
-      array('nocase."camelCase".nocase', 'nocase.camelCase.nocase'),
-      array('nocase.nocase."camelCase"', 'nocase.nocase.camelCase'),
-      array('"camelCase"."camelCase"."camelCase"', 'camelCase.camelCase.camelCase'),
-    );
+      ['"camelCase".nocase.nocase', 'camelCase.nocase.nocase'],
+      ['nocase."camelCase".nocase', 'nocase.camelCase.nocase'],
+      ['nocase.nocase."camelCase"', 'nocase.nocase.camelCase'],
+      ['"camelCase"."camelCase"."camelCase"', 'camelCase.camelCase.camelCase'],
+    ];
   }
 
   /**
    * Data provider for testEscapeAlias.
    *
-   * @return []
+   * @return array
    *   Array of arrays with the following elements:
    *   - Expected escaped string.
    *   - String to escape.
    */
   public function providerEscapeAlias() {
-    return array(
-      array('nocase', 'nocase'),
-      array('"camelCase"', '"camelCase"'),
-      array('"camelCase"', 'camelCase'),
-      array('"camelCase"', 'camel.Case'),
-    );
+    return [
+      ['nocase', 'nocase'],
+      ['"camelCase"', '"camelCase"'],
+      ['"camelCase"', 'camelCase'],
+      ['"camelCase"', 'camel.Case'],
+    ];
   }
 
   /**
    * Data provider for testEscapeField.
    *
-   * @return []
+   * @return array
    *   Array of arrays with the following elements:
    *   - Expected escaped string.
    *   - String to escape.
    */
   public function providerEscapeFields() {
-    return array(
-      array('title', 'title'),
-      array('"isDefaultRevision"', 'isDefaultRevision'),
-      array('"isDefaultRevision"', '"isDefaultRevision"'),
-      array('entity_test."isDefaultRevision"', 'entity_test.isDefaultRevision'),
-      array('entity_test."isDefaultRevision"', '"entity_test"."isDefaultRevision"'),
-      array('"entityTest"."isDefaultRevision"', '"entityTest"."isDefaultRevision"'),
-      array('"entityTest"."isDefaultRevision"', 'entityTest.isDefaultRevision'),
-      array('entity_test."isDefaultRevision"', 'entity_test.is.Default.Revision'),
-    );
+    return [
+      ['title', 'title'],
+      ['"isDefaultRevision"', 'isDefaultRevision'],
+      ['"isDefaultRevision"', '"isDefaultRevision"'],
+      ['entity_test."isDefaultRevision"', 'entity_test.isDefaultRevision'],
+      ['entity_test."isDefaultRevision"', '"entity_test"."isDefaultRevision"'],
+      ['"entityTest"."isDefaultRevision"', '"entityTest"."isDefaultRevision"'],
+      ['"entityTest"."isDefaultRevision"', 'entityTest.isDefaultRevision'],
+      ['entity_test."isDefaultRevision"', 'entity_test.is.Default.Revision'],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php b/web/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
index 46b1cd750..19548cd79 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
@@ -15,7 +15,7 @@ class EmptyStatementTest extends UnitTestCase {
   /**
    * Tests that the empty result set behaves as empty.
    */
-  function testEmpty() {
+  public function testEmpty() {
     $result = new StatementEmpty();
 
     $this->assertTrue($result instanceof StatementInterface, 'Class implements expected interface');
@@ -25,7 +25,7 @@ class EmptyStatementTest extends UnitTestCase {
   /**
    * Tests that the empty result set iterates safely.
    */
-  function testEmptyIteration() {
+  public function testEmptyIteration() {
     $result = new StatementEmpty();
     $this->assertSame(0, iterator_count($result), 'Empty result set should not iterate.');
   }
@@ -33,10 +33,10 @@ class EmptyStatementTest extends UnitTestCase {
   /**
    * Tests that the empty result set mass-fetches in an expected way.
    */
-  function testEmptyFetchAll() {
+  public function testEmptyFetchAll() {
     $result = new StatementEmpty();
 
-    $this->assertEquals($result->fetchAll(), array(), 'Empty array returned from empty result set.');
+    $this->assertEquals($result->fetchAll(), [], 'Empty array returned from empty result set.');
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php b/web/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
index 7c9349740..4692dffb8 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
@@ -23,14 +23,14 @@ class StubConnection extends Connection {
   /**
    * {@inheritdoc}
    */
-  public function queryRange($query, $from, $count, array $args = array(), array $options = array()) {
+  public function queryRange($query, $from, $count, array $args = [], array $options = []) {
     return new StatementEmpty();
   }
 
   /**
    * {@inheritdoc}
    */
-  public function queryTemporary($query, array $args = array(), array $options = array()) {
+  public function queryTemporary($query, array $args = [], array $options = []) {
     return '';
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Datetime/DateTest.php b/web/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
index edf6d714e..7dd8e193c 100644
--- a/web/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
@@ -114,33 +114,33 @@ class DateTest extends UnitTestCase {
    * Provides some test data for the format interval test.
    */
   public function providerTestFormatInterval() {
-    $data = array(
+    $data = [
       // Checks for basic seconds.
-      array(1, 1, '1 sec'),
-      array(1, 2, '1 sec'),
-      array(2, 1, '2 sec'),
-      array(2, 2, '2 sec'),
+      [1, 1, '1 sec'],
+      [1, 2, '1 sec'],
+      [2, 1, '2 sec'],
+      [2, 2, '2 sec'],
       // Checks for minutes with seconds.
-      array(61, 1, '1 min'),
-      array(61, 2, '1 min 1 sec'),
-      array(62, 2, '1 min 2 sec'),
-      array(121, 1, '2 min'),
-      array(121, 2, '2 min 1 sec'),
+      [61, 1, '1 min'],
+      [61, 2, '1 min 1 sec'],
+      [62, 2, '1 min 2 sec'],
+      [121, 1, '2 min'],
+      [121, 2, '2 min 1 sec'],
       // Check for hours with minutes and seconds.
-      array(3601, 1, '1 hour'),
-      array(3601, 2, '1 hour'),
+      [3601, 1, '1 hour'],
+      [3601, 2, '1 hour'],
       // Check for higher units.
-      array(86401, 1, '1 day'),
-      array(604800, 1, '1 week'),
-      array(2592000 * 2, 1, '2 months'),
-      array(31536000 * 2, 1, '2 years'),
+      [86401, 1, '1 day'],
+      [604800, 1, '1 week'],
+      [2592000 * 2, 1, '2 months'],
+      [31536000 * 2, 1, '2 years'],
       // Check for a complicated one with months weeks and days.
-      array(2592000 * 2 + 604800 * 3 + 86400 * 4, 3, '2 months 3 weeks 4 days'),
+      [2592000 * 2 + 604800 * 3 + 86400 * 4, 3, '2 months 3 weeks 4 days'],
       // Check for the langcode.
-      array(61, 1, '1 min', 'xxx-lolspeak'),
+      [61, 1, '1 min', 'xxx-lolspeak'],
       // Check with an unspecified granularity.
-      array(61, NULL, '1 min 1 sec'),
-    );
+      [61, NULL, '1 min 1 sec'],
+    ];
 
     return $data;
   }
@@ -150,7 +150,7 @@ class DateTest extends UnitTestCase {
    */
   public function testFormatIntervalZeroSecond() {
     $result = $this->dateFormatter->formatInterval(0, 1, 'xxx-lolspeak');
-    $this->assertEquals(new TranslatableMarkup('0 sec', array(), array('langcode' => 'xxx-lolspeak'), $this->stringTranslation), $result);
+    $this->assertEquals(new TranslatableMarkup('0 sec', [], ['langcode' => 'xxx-lolspeak'], $this->stringTranslation), $result);
   }
 
   /**
@@ -181,7 +181,7 @@ class DateTest extends UnitTestCase {
     $expected = '1 second';
     $request_time = $this->createTimestamp('2013-12-11 10:09:08');
     $timestamp = $this->createTimestamp('2013-12-11 10:09:09');
-    $options = array();
+    $options = [];
 
     // Mocks the formatDiff function of the dateformatter object.
     $this->dateFormatterStub
@@ -218,7 +218,7 @@ class DateTest extends UnitTestCase {
     $expected = '1 second';
     $timestamp = $this->createTimestamp('2013-12-11 10:09:07');
     $request_time = $this->createTimestamp('2013-12-11 10:09:08');
-    $options = array();
+    $options = [];
 
     // Mocks the formatDiff function of the dateformatter object.
     $this->dateFormatterStub
@@ -253,7 +253,7 @@ class DateTest extends UnitTestCase {
    *
    * @covers ::formatDiff
    */
-  public function testformatDiff($expected, $max_age, $timestamp1, $timestamp2, $options = array()) {
+  public function testformatDiff($expected, $max_age, $timestamp1, $timestamp2, $options = []) {
     // Mocks a simple translateString implementation.
     $this->stringTranslation->expects($this->any())
       ->method('translateString')
@@ -281,114 +281,114 @@ class DateTest extends UnitTestCase {
     // This is the fixed request time in the test.
     $request_time = $this->createTimestamp('2013-12-11 10:09:08');
 
-    $granularity_3 = array('granularity' => 3);
-    $granularity_4 = array('granularity' => 4);
+    $granularity_3 = ['granularity' => 3];
+    $granularity_4 = ['granularity' => 4];
 
-    $langcode_en = array('langcode' => 'en');
-    $langcode_lolspeak = array('langcode' => 'xxx-lolspeak');
+    $langcode_en = ['langcode' => 'en'];
+    $langcode_lolspeak = ['langcode' => 'xxx-lolspeak'];
 
-    $non_strict = array('strict' => FALSE);
+    $non_strict = ['strict' => FALSE];
 
-    $data = array(
+    $data = [
       // Checks for equal timestamps.
-      array('0 seconds', 0, $request_time, $request_time),
+      ['0 seconds', 0, $request_time, $request_time],
 
       // Checks for seconds only.
-      array('1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time),
-      array('1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time),
-      array('1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_3 + $langcode_en),
-      array('1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_4 + $langcode_lolspeak),
-      array('2 seconds', 1, $this->createTimestamp('2013-12-11 10:09:06'), $request_time),
-      array('59 seconds', 1, $this->createTimestamp('2013-12-11 10:08:09'), $request_time),
-      array('59 seconds', 1, $this->createTimestamp('2013-12-11 10:08:09'), $request_time),
+      ['1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time],
+      ['1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time],
+      ['1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_3 + $langcode_en],
+      ['1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_4 + $langcode_lolspeak],
+      ['2 seconds', 1, $this->createTimestamp('2013-12-11 10:09:06'), $request_time],
+      ['59 seconds', 1, $this->createTimestamp('2013-12-11 10:08:09'), $request_time],
+      ['59 seconds', 1, $this->createTimestamp('2013-12-11 10:08:09'), $request_time],
 
       // Checks for minutes and possibly seconds.
-      array('1 minute', 60, $this->createTimestamp('2013-12-11 10:08:08'), $request_time),
-      array('1 minute', 60, $this->createTimestamp('2013-12-11 10:08:08'), $request_time),
-      array('1 minute 1 second', 1, $this->createTimestamp('2013-12-11 10:08:07'), $request_time),
-      array('1 minute 59 seconds', 1, $this->createTimestamp('2013-12-11 10:07:09'), $request_time),
-      array('2 minutes', 60, $this->createTimestamp('2013-12-11 10:07:08'), $request_time),
-      array('2 minutes 1 second', 1, $this->createTimestamp('2013-12-11 10:07:07'), $request_time),
-      array('2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time),
-      array('2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_3),
-      array('2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_4),
-      array('30 minutes', 60, $this->createTimestamp('2013-12-11 09:39:08'), $request_time),
-      array('59 minutes 59 seconds', 1, $this->createTimestamp('2013-12-11 09:09:09'), $request_time),
-      array('59 minutes 59 seconds', 1, $this->createTimestamp('2013-12-11 09:09:09'), $request_time),
+      ['1 minute', 60, $this->createTimestamp('2013-12-11 10:08:08'), $request_time],
+      ['1 minute', 60, $this->createTimestamp('2013-12-11 10:08:08'), $request_time],
+      ['1 minute 1 second', 1, $this->createTimestamp('2013-12-11 10:08:07'), $request_time],
+      ['1 minute 59 seconds', 1, $this->createTimestamp('2013-12-11 10:07:09'), $request_time],
+      ['2 minutes', 60, $this->createTimestamp('2013-12-11 10:07:08'), $request_time],
+      ['2 minutes 1 second', 1, $this->createTimestamp('2013-12-11 10:07:07'), $request_time],
+      ['2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time],
+      ['2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_3],
+      ['2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_4],
+      ['30 minutes', 60, $this->createTimestamp('2013-12-11 09:39:08'), $request_time],
+      ['59 minutes 59 seconds', 1, $this->createTimestamp('2013-12-11 09:09:09'), $request_time],
+      ['59 minutes 59 seconds', 1, $this->createTimestamp('2013-12-11 09:09:09'), $request_time],
 
       // Checks for hours and possibly minutes or seconds.
-      array('1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:08'), $request_time),
-      array('1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:08'), $request_time),
-      array('1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:07'), $request_time),
-      array('1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:06'), $request_time),
-      array('1 hour 1 minute', 60, $this->createTimestamp('2013-12-11 09:08:08'), $request_time),
-      array('1 hour 1 minute 1 second', 1, $this->createTimestamp('2013-12-11 09:08:07'), $request_time, $granularity_3),
-      array('1 hour 1 minute 2 seconds', 1, $this->createTimestamp('2013-12-11 09:08:06'), $request_time, $granularity_4),
-      array('1 hour 30 minutes', 60, $this->createTimestamp('2013-12-11 08:39:08'), $request_time),
-      array('2 hours', 3600, $this->createTimestamp('2013-12-11 08:09:08'), $request_time),
-      array('23 hours 59 minutes', 60, $this->createTimestamp('2013-12-10 10:10:08'), $request_time),
+      ['1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:08'), $request_time],
+      ['1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:08'), $request_time],
+      ['1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:07'), $request_time],
+      ['1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:06'), $request_time],
+      ['1 hour 1 minute', 60, $this->createTimestamp('2013-12-11 09:08:08'), $request_time],
+      ['1 hour 1 minute 1 second', 1, $this->createTimestamp('2013-12-11 09:08:07'), $request_time, $granularity_3],
+      ['1 hour 1 minute 2 seconds', 1, $this->createTimestamp('2013-12-11 09:08:06'), $request_time, $granularity_4],
+      ['1 hour 30 minutes', 60, $this->createTimestamp('2013-12-11 08:39:08'), $request_time],
+      ['2 hours', 3600, $this->createTimestamp('2013-12-11 08:09:08'), $request_time],
+      ['23 hours 59 minutes', 60, $this->createTimestamp('2013-12-10 10:10:08'), $request_time],
 
       // Checks for days and possibly hours, minutes or seconds.
-      array('1 day', 86400, $this->createTimestamp('2013-12-10 10:09:08'), $request_time),
-      array('1 day', 86400, $this->createTimestamp('2013-12-10 10:09:07'), $request_time),
-      array('1 day 1 hour', 3600, $this->createTimestamp('2013-12-10 09:09:08'), $request_time),
-      array('1 day 1 hour 1 minute', 60, $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_3 + $langcode_en),
-      array('1 day 1 hour 1 minute 1 second', 1, $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_4 + $langcode_lolspeak),
-      array('1 day 2 hours 2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-10 08:07:06'), $request_time, $granularity_4),
-      array('2 days', 86400, $this->createTimestamp('2013-12-09 10:09:08'), $request_time),
-      array('2 days', 86400, $this->createTimestamp('2013-12-09 10:07:08'), $request_time),
-      array('2 days 2 hours', 3600, $this->createTimestamp('2013-12-09 08:09:08'), $request_time),
-      array('2 days 2 hours 2 minutes', 60, $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_3 + $langcode_en),
-      array('2 days 2 hours 2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_4 + $langcode_lolspeak),
+      ['1 day', 86400, $this->createTimestamp('2013-12-10 10:09:08'), $request_time],
+      ['1 day', 86400, $this->createTimestamp('2013-12-10 10:09:07'), $request_time],
+      ['1 day 1 hour', 3600, $this->createTimestamp('2013-12-10 09:09:08'), $request_time],
+      ['1 day 1 hour 1 minute', 60, $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_3 + $langcode_en],
+      ['1 day 1 hour 1 minute 1 second', 1, $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_4 + $langcode_lolspeak],
+      ['1 day 2 hours 2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-10 08:07:06'), $request_time, $granularity_4],
+      ['2 days', 86400, $this->createTimestamp('2013-12-09 10:09:08'), $request_time],
+      ['2 days', 86400, $this->createTimestamp('2013-12-09 10:07:08'), $request_time],
+      ['2 days 2 hours', 3600, $this->createTimestamp('2013-12-09 08:09:08'), $request_time],
+      ['2 days 2 hours 2 minutes', 60, $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_3 + $langcode_en],
+      ['2 days 2 hours 2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_4 + $langcode_lolspeak],
 
       // Checks for weeks and possibly days, hours, minutes or seconds.
-      array('1 week', 7 * 86400, $this->createTimestamp('2013-12-04 10:09:08'), $request_time),
-      array('1 week 1 day', 86400, $this->createTimestamp('2013-12-03 10:09:08'), $request_time),
-      array('2 weeks', 7 * 86400, $this->createTimestamp('2013-11-27 10:09:08'), $request_time),
-      array('2 weeks 2 days', 86400, $this->createTimestamp('2013-11-25 08:07:08'), $request_time),
-      array('2 weeks 2 days 2 hours 2 minutes', 60, $this->createTimestamp('2013-11-25 08:07:08'), $request_time, $granularity_4),
-      array('4 weeks', 7 * 86400, $this->createTimestamp('2013-11-13 10:09:08'), $request_time),
-      array('4 weeks 1 day', 86400, $this->createTimestamp('2013-11-12 10:09:08'), $request_time),
+      ['1 week', 7 * 86400, $this->createTimestamp('2013-12-04 10:09:08'), $request_time],
+      ['1 week 1 day', 86400, $this->createTimestamp('2013-12-03 10:09:08'), $request_time],
+      ['2 weeks', 7 * 86400, $this->createTimestamp('2013-11-27 10:09:08'), $request_time],
+      ['2 weeks 2 days', 86400, $this->createTimestamp('2013-11-25 08:07:08'), $request_time],
+      ['2 weeks 2 days 2 hours 2 minutes', 60, $this->createTimestamp('2013-11-25 08:07:08'), $request_time, $granularity_4],
+      ['4 weeks', 7 * 86400, $this->createTimestamp('2013-11-13 10:09:08'), $request_time],
+      ['4 weeks 1 day', 86400, $this->createTimestamp('2013-11-12 10:09:08'), $request_time],
 
       // Checks for months and possibly days, hours, minutes or seconds.
-      array('1 month', 30 * 86400, $this->createTimestamp('2013-11-11 10:09:08'), $request_time),
-      array('1 month', 30 * 86400, $this->createTimestamp('2013-11-11 10:09:07'), $request_time),
-      array('1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:09:08'), $request_time),
-      array('1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_3),
-      array('1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_4),
-      array('1 month 4 weeks', 7 * 86400, $this->createTimestamp('2013-10-13 10:09:08'), $request_time),
-      array('1 month 4 weeks 1 day', 86400, $this->createTimestamp('2013-10-13 10:09:08'), $request_time, $granularity_3),
-      array('1 month 4 weeks', 7 * 86400, $this->createTimestamp('2013-10-12 10:09:08'), $request_time),
-      array('1 month 4 weeks 2 days', 86400, $this->createTimestamp('2013-10-12 10:09:08'), $request_time, $granularity_3),
-      array('2 months', 30 * 86400, $this->createTimestamp('2013-10-11 10:09:08'), $request_time),
-      array('2 months', 30 * 86400, $this->createTimestamp('2013-10-10 10:09:08'), $request_time),
-      array('2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time),
-      array('2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_3),
-      array('2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_4),
-      array('6 months', 30 * 86400, $this->createTimestamp('2013-06-09 10:09:08'), $request_time),
-      array('11 months', 30 * 86400, $this->createTimestamp('2013-01-11 07:09:08'), $request_time),
-      array('11 months 4 weeks', 7 * 86400, $this->createTimestamp('2012-12-12 10:09:08'), $request_time),
-      array('11 months 4 weeks 2 days', 86400, $this->createTimestamp('2012-12-12 10:09:08'), $request_time, $granularity_3),
+      ['1 month', 30 * 86400, $this->createTimestamp('2013-11-11 10:09:08'), $request_time],
+      ['1 month', 30 * 86400, $this->createTimestamp('2013-11-11 10:09:07'), $request_time],
+      ['1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:09:08'), $request_time],
+      ['1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_3],
+      ['1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_4],
+      ['1 month 4 weeks', 7 * 86400, $this->createTimestamp('2013-10-13 10:09:08'), $request_time],
+      ['1 month 4 weeks 1 day', 86400, $this->createTimestamp('2013-10-13 10:09:08'), $request_time, $granularity_3],
+      ['1 month 4 weeks', 7 * 86400, $this->createTimestamp('2013-10-12 10:09:08'), $request_time],
+      ['1 month 4 weeks 2 days', 86400, $this->createTimestamp('2013-10-12 10:09:08'), $request_time, $granularity_3],
+      ['2 months', 30 * 86400, $this->createTimestamp('2013-10-11 10:09:08'), $request_time],
+      ['2 months', 30 * 86400, $this->createTimestamp('2013-10-10 10:09:08'), $request_time],
+      ['2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time],
+      ['2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_3],
+      ['2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_4],
+      ['6 months', 30 * 86400, $this->createTimestamp('2013-06-09 10:09:08'), $request_time],
+      ['11 months', 30 * 86400, $this->createTimestamp('2013-01-11 07:09:08'), $request_time],
+      ['11 months 4 weeks', 7 * 86400, $this->createTimestamp('2012-12-12 10:09:08'), $request_time],
+      ['11 months 4 weeks 2 days', 86400, $this->createTimestamp('2012-12-12 10:09:08'), $request_time, $granularity_3],
 
       // Checks for years and possibly months, days, hours, minutes or seconds.
-      array('1 year', 365 * 86400, $this->createTimestamp('2012-12-11 10:09:08'), $request_time),
-      array('1 year', 365 * 86400, $this->createTimestamp('2012-12-11 10:08:08'), $request_time),
-      array('1 year', 365 * 86400, $this->createTimestamp('2012-12-10 10:09:08'), $request_time),
-      array('2 years', 365 * 86400, $this->createTimestamp('2011-12-11 10:09:08'), $request_time),
-      array('2 years', 365 * 86400, $this->createTimestamp('2011-12-11 10:07:08'), $request_time),
-      array('2 years', 365 * 86400, $this->createTimestamp('2011-12-09 10:09:08'), $request_time),
-      array('2 years 2 months', 30 * 86400, $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_3),
-      array('2 years 2 months', 30 * 86400, $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_4),
-      array('10 years', 365 * 86400, $this->createTimestamp('2003-12-11 10:09:08'), $request_time),
-      array('100 years', 365 * 86400, $this->createTimestamp('1913-12-11 10:09:08'), $request_time),
+      ['1 year', 365 * 86400, $this->createTimestamp('2012-12-11 10:09:08'), $request_time],
+      ['1 year', 365 * 86400, $this->createTimestamp('2012-12-11 10:08:08'), $request_time],
+      ['1 year', 365 * 86400, $this->createTimestamp('2012-12-10 10:09:08'), $request_time],
+      ['2 years', 365 * 86400, $this->createTimestamp('2011-12-11 10:09:08'), $request_time],
+      ['2 years', 365 * 86400, $this->createTimestamp('2011-12-11 10:07:08'), $request_time],
+      ['2 years', 365 * 86400, $this->createTimestamp('2011-12-09 10:09:08'), $request_time],
+      ['2 years 2 months', 30 * 86400, $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_3],
+      ['2 years 2 months', 30 * 86400, $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_4],
+      ['10 years', 365 * 86400, $this->createTimestamp('2003-12-11 10:09:08'), $request_time],
+      ['100 years', 365 * 86400, $this->createTimestamp('1913-12-11 10:09:08'), $request_time],
 
       // Checks the non-strict option vs. strict (default).
-      array('1 second', 1, $this->createTimestamp('2013-12-11 10:09:08'), $this->createTimestamp('2013-12-11 10:09:07'), $non_strict),
-      array('0 seconds', 0, $this->createTimestamp('2013-12-11 10:09:08'), $this->createTimestamp('2013-12-11 10:09:07')),
+      ['1 second', 1, $this->createTimestamp('2013-12-11 10:09:08'), $this->createTimestamp('2013-12-11 10:09:07'), $non_strict],
+      ['0 seconds', 0, $this->createTimestamp('2013-12-11 10:09:08'), $this->createTimestamp('2013-12-11 10:09:07')],
 
       // Checks granularity limit.
-      array('2 years 3 months 1 week', 7 * 86400, $this->createTimestamp('2011-08-30 11:15:57'), $request_time, $granularity_3),
-    );
+      ['2 years 3 months 1 week', 7 * 86400, $this->createTimestamp('2011-08-30 11:15:57'), $request_time, $granularity_3],
+    ];
 
     return $data;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Datetime/DrupalDateTimeTest.php b/web/core/tests/Drupal/Tests/Core/Datetime/DrupalDateTimeTest.php
index e77542bc7..eff9f7729 100644
--- a/web/core/tests/Drupal/Tests/Core/Datetime/DrupalDateTimeTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Datetime/DrupalDateTimeTest.php
@@ -73,61 +73,61 @@ class DrupalDateTimeTest extends UnitTestCase {
     $negative_1_hour = new \DateInterval('PT1H');
     $negative_1_hour->invert = 1;
 
-    return array(
+    return [
 
       // There should be a 19 hour time interval between
       // new years in Sydney and new years in LA in year 2000.
-      array(
+      [
         'input2' => DrupalDateTime::createFromFormat('Y-m-d H:i:s', '2000-01-01 00:00:00', new \DateTimeZone('Australia/Sydney'), $settings),
         'input1' => DrupalDateTime::createFromFormat('Y-m-d H:i:s', '2000-01-01 00:00:00', new \DateTimeZone('America/Los_Angeles'), $settings),
         'absolute' => FALSE,
         'expected' => $positive_19_hours,
-      ),
+      ],
       // In 1970 Sydney did not observe daylight savings time
       // So there is only a 18 hour time interval.
-      array(
+      [
         'input2' => DrupalDateTime::createFromFormat('Y-m-d H:i:s', '1970-01-01 00:00:00', new \DateTimeZone('Australia/Sydney'), $settings),
         'input1' => DrupalDateTime::createFromFormat('Y-m-d H:i:s', '1970-01-01 00:00:00', new \DateTimeZone('America/Los_Angeles'), $settings),
         'absolute' => FALSE,
         'expected' => $positive_18_hours,
-      ),
-      array(
+      ],
+      [
         'input1' => DrupalDateTime::createFromFormat('U', 3600, new \DateTimeZone('America/Los_Angeles'), $settings),
         'input2' => DrupalDateTime::createFromFormat('U', 0, $utc_tz, $settings),
         'absolute' => FALSE,
         'expected' => $negative_1_hour,
-      ),
-      array(
+      ],
+      [
         'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
         'input2' => DrupalDateTime::createFromFormat('U', 0, $utc_tz, $settings),
         'absolute' => FALSE,
         'expected' => $negative_1_hour,
-      ),
-      array(
+      ],
+      [
         'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
         'input2' => \DateTime::createFromFormat('U', 0),
         'absolute' => FALSE,
         'expected' => $negative_1_hour,
-      ),
-      array(
+      ],
+      [
         'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
         'input2' => DrupalDateTime::createFromFormat('U', 0, $utc_tz, $settings),
         'absolute' => TRUE,
         'expected' => $positive_1_hour,
-      ),
-      array(
+      ],
+      [
         'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
         'input2' => \DateTime::createFromFormat('U', 0),
         'absolute' => TRUE,
         'expected' => $positive_1_hour,
-      ),
-      array(
+      ],
+      [
         'input1' => DrupalDateTime::createFromFormat('U', 0, $utc_tz, $settings),
         'input2' => DrupalDateTime::createFromFormat('U', 0, $utc_tz, $settings),
         'absolute' => FALSE,
         'expected' => $empty_interval,
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -142,18 +142,18 @@ class DrupalDateTimeTest extends UnitTestCase {
   public function providerTestInvalidDateDiff() {
     $settings = ['langcode' => 'en'];
     $utc_tz = new \DateTimeZone('UTC');
-    return array(
-      array(
+    return [
+      [
         'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
         'input2' => '1970-01-01 00:00:00',
         'absolute' => FALSE,
-      ),
-      array(
+      ],
+      [
         'input1' => DrupalDateTime::createFromFormat('U', 3600, $utc_tz, $settings),
         'input2' => NULL,
         'absolute' => FALSE,
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
index ee13b934a..3f8ca09bf 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
@@ -57,18 +57,18 @@ class BackendCompilerPassTest extends UnitTestCase {
    * @return array
    */
   public function providerTestProcess() {
-    $data = array();
+    $data = [];
     // Add a container with no set default_backend.
     $prefix = __NAMESPACE__ . '\\ServiceClass';
     $service = (new Definition($prefix . 'Default'))->addTag('backend_overridable');
     $container = $this->getMysqlContainer($service);
 
-    $data[] = array($prefix . 'Default', $container);
+    $data[] = [$prefix . 'Default', $container];
 
     // Set the default_backend so the mysql service should be used.
     $container = $this->getMysqlContainer($service);
     $container->setParameter('default_backend', 'mysql');
-    $data[] = array($prefix . 'Mysql', $container);
+    $data[] = [$prefix . 'Mysql', $container];
 
     // Configure a manual alias for the service, so ensure that it is not
     // overridden by the default backend.
@@ -76,16 +76,16 @@ class BackendCompilerPassTest extends UnitTestCase {
     $container->setParameter('default_backend', 'mysql');
     $container->setDefinition('mariadb.service', new Definition($prefix . 'MariaDb'));
     $container->setAlias('service', new Alias('mariadb.service'));
-    $data[] = array($prefix . 'MariaDb', $container);
+    $data[] = [$prefix . 'MariaDb', $container];
 
     // Check the database driver is the default.
     $container = $this->getSqliteContainer($service);
-    $data[] = array($prefix . 'Sqlite', $container);
+    $data[] = [$prefix . 'Sqlite', $container];
 
     // Test the opt out.
     $container = $this->getSqliteContainer($service);
     $container->setParameter('default_backend', '');
-    $data[] = array($prefix . 'Default', $container);
+    $data[] = [$prefix . 'Default', $container];
 
     return $data;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
index b43971d5b..aea2524eb 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\Core\DependencyInjection\Compiler;
 use Drupal\Core\DependencyInjection\Compiler\ProxyServicesPass;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
 /**
  * @coversDefaultClass \Drupal\Core\DependencyInjection\Compiler\ProxyServicesPass
@@ -64,14 +65,13 @@ class ProxyServicesPassTest extends UnitTestCase {
 
   /**
    * @covers ::process
-   *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
    */
   public function testContainerWithLazyServicesWithoutProxyClass() {
     $container = new ContainerBuilder();
     $container->register('alias_whitelist', 'Drupal\Core\Path\AliasWhitelist')
       ->setLazy(TRUE);
 
+    $this->setExpectedException(InvalidArgumentException::class);
     $this->proxyServicesPass->process($container);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php
index 2eeb603b4..7e7381f92 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php
@@ -10,6 +10,7 @@ namespace Drupal\Tests\Core\DependencyInjection\Compiler;
 use Drupal\Core\DependencyInjection\Compiler\TaggedHandlersPass;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
@@ -44,36 +45,37 @@ class TaggedHandlersPassTest extends UnitTestCase {
   /**
    * Tests a required consumer with no handlers.
    *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
-   * @expectedExceptionMessage At least one service tagged with 'consumer_id' is required.
    * @covers ::process
    */
   public function testProcessRequiredHandlers() {
     $container = $this->buildContainer();
     $container
       ->register('consumer_id', __NAMESPACE__ . '\ValidConsumer')
-      ->addTag('service_collector', array(
+      ->addTag('service_collector', [
         'required' => TRUE,
-      ));
+      ]);
 
     $handler_pass = new TaggedHandlersPass();
+    $this->setExpectedException(LogicException::class, "At least one service tagged with 'consumer_id' is required.");
     $handler_pass->process($container);
   }
 
   /**
    * Tests consumer with missing interface in non-production environment.
    *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
-   * @expectedExceptionMessage Service consumer 'consumer_id' class method Drupal\Tests\Core\DependencyInjection\Compiler\InvalidConsumer::addHandler() has to type-hint an interface.
    * @covers ::process
    */
   public function testProcessMissingInterface() {
     $container = $this->buildContainer();
     $container
-      ->register('consumer_id', __NAMESPACE__ . '\InvalidConsumer')
+      ->register('consumer_id0', __NAMESPACE__ . '\ValidConsumer')
+      ->addTag('service_collector');
+    $container
+      ->register('consumer_id1', __NAMESPACE__ . '\InvalidConsumer')
       ->addTag('service_collector');
 
     $handler_pass = new TaggedHandlersPass();
+    $this->setExpectedException(LogicException::class, "Service consumer 'consumer_id1' class method Drupal\Tests\Core\DependencyInjection\Compiler\InvalidConsumer::addHandler() has to type-hint an interface.");
     $handler_pass->process($container);
   }
 
@@ -118,9 +120,9 @@ class TaggedHandlersPassTest extends UnitTestCase {
       ->addTag('consumer_id');
     $container
       ->register('handler2', __NAMESPACE__ . '\ValidHandler')
-      ->addTag('consumer_id', array(
+      ->addTag('consumer_id', [
         'priority' => 10,
-      ));
+      ]);
 
     $handler_pass = new TaggedHandlersPass();
     $handler_pass->process($container);
@@ -142,18 +144,18 @@ class TaggedHandlersPassTest extends UnitTestCase {
     $container = $this->buildContainer();
     $container
       ->register('consumer_id', __NAMESPACE__ . '\ValidConsumer')
-      ->addTag('service_collector', array(
+      ->addTag('service_collector', [
         'call' => 'addNoPriority',
-      ));
+      ]);
 
     $container
       ->register('handler1', __NAMESPACE__ . '\ValidHandler')
       ->addTag('consumer_id');
     $container
       ->register('handler2', __NAMESPACE__ . '\ValidHandler')
-      ->addTag('consumer_id', array(
+      ->addTag('consumer_id', [
         'priority' => 10,
-      ));
+      ]);
 
     $handler_pass = new TaggedHandlersPass();
     $handler_pass->process($container);
@@ -175,18 +177,18 @@ class TaggedHandlersPassTest extends UnitTestCase {
     $container = $this->buildContainer();
     $container
       ->register('consumer_id', __NAMESPACE__ . '\ValidConsumer')
-      ->addTag('service_collector', array(
+      ->addTag('service_collector', [
         'call' => 'addWithId',
-      ));
+      ]);
 
     $container
       ->register('handler1', __NAMESPACE__ . '\ValidHandler')
       ->addTag('consumer_id');
     $container
       ->register('handler2', __NAMESPACE__ . '\ValidHandler')
-      ->addTag('consumer_id', array(
+      ->addTag('consumer_id', [
         'priority' => 10,
-      ));
+      ]);
 
     $handler_pass = new TaggedHandlersPass();
     $handler_pass->process($container);
@@ -204,7 +206,6 @@ class TaggedHandlersPassTest extends UnitTestCase {
   /**
    * Tests interface validation in non-production environment.
    *
-   * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
    * @covers ::process
    */
   public function testProcessInterfaceMismatch() {
@@ -218,11 +219,12 @@ class TaggedHandlersPassTest extends UnitTestCase {
       ->addTag('consumer_id');
     $container
       ->register('handler2', __NAMESPACE__ . '\ValidHandler')
-      ->addTag('consumer_id', array(
+      ->addTag('consumer_id', [
         'priority' => 10,
-      ));
+      ]);
 
     $handler_pass = new TaggedHandlersPass();
+    $this->setExpectedException(LogicException::class);
     $handler_pass->process($container);
   }
 
@@ -240,10 +242,10 @@ class TaggedHandlersPassTest extends UnitTestCase {
 
     $container
       ->register('handler1', __NAMESPACE__ . '\ValidHandler')
-      ->addTag('consumer_id', array(
+      ->addTag('consumer_id', [
           'extra1' => 'extra1',
           'extra2' => 'extra2',
-        ));
+        ]);
 
     $handler_pass = new TaggedHandlersPass();
     $handler_pass->process($container);
@@ -266,15 +268,15 @@ class TaggedHandlersPassTest extends UnitTestCase {
 
     $container
       ->register('consumer_id', __NAMESPACE__ . '\ValidConsumerWithExtraArguments')
-      ->addTag('service_collector', array(
+      ->addTag('service_collector', [
         'call' => 'addNoPriority'
-      ));
+      ]);
 
     $container
       ->register('handler1', __NAMESPACE__ . '\ValidHandler')
-      ->addTag('consumer_id', array(
+      ->addTag('consumer_id', [
         'extra' => 'extra',
-      ));
+      ]);
 
     $handler_pass = new TaggedHandlersPass();
     $handler_pass->process($container);
@@ -295,15 +297,15 @@ class TaggedHandlersPassTest extends UnitTestCase {
 
     $container
       ->register('consumer_id', __NAMESPACE__ . '\ValidConsumerWithExtraArguments')
-      ->addTag('service_collector', array(
+      ->addTag('service_collector', [
         'call' => 'addWithId'
-      ));
+      ]);
 
     $container
       ->register('handler1', __NAMESPACE__ . '\ValidHandler')
-      ->addTag('consumer_id', array(
+      ->addTag('consumer_id', [
         'extra1' => 'extra1',
-      ));
+      ]);
 
     $handler_pass = new TaggedHandlersPass();
     $handler_pass->process($container);
@@ -327,17 +329,17 @@ class TaggedHandlersPassTest extends UnitTestCase {
 
     $container
       ->register('consumer_id', __NAMESPACE__ . '\ValidConsumerWithExtraArguments')
-      ->addTag('service_collector', array(
+      ->addTag('service_collector', [
         'call' => 'addWithDifferentOrder'
-      ));
+      ]);
 
     $container
       ->register('handler1', __NAMESPACE__ . '\ValidHandler')
-      ->addTag('consumer_id', array(
+      ->addTag('consumer_id', [
         'priority' => 0,
         'extra1' => 'extra1',
         'extra3' => 'extra3'
-      ));
+      ]);
 
     $handler_pass = new TaggedHandlersPass();
     $handler_pass->process($container);
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
index 4a6eae7b3..026154da7 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
@@ -35,43 +35,38 @@ class ContainerBuilderTest extends UnitTestCase {
 
   /**
    * @covers ::set
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage Service ID names must be lowercase: Bar
    */
   public function testSetException() {
     $container = new ContainerBuilder();
     $class = new BarClass();
+    $this->setExpectedException(\InvalidArgumentException::class, 'Service ID names must be lowercase: Bar');
     $container->set('Bar', $class);
-    $this->assertNotEquals('bar', $class->_serviceId);
   }
 
   /**
    * @covers ::setParameter
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage Parameter names must be lowercase: Buzz
    */
   public function testSetParameterException() {
     $container = new ContainerBuilder();
+    $this->setExpectedException(\InvalidArgumentException::class, 'Parameter names must be lowercase: Buzz');
     $container->setParameter('Buzz', 'buzz');
   }
 
   /**
    * @covers ::register
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage Service ID names must be lowercase: Bar
    */
   public function testRegisterException() {
     $container = new ContainerBuilder();
+    $this->setExpectedException(\InvalidArgumentException::class, 'Service ID names must be lowercase: Bar');
     $container->register('Bar');
   }
 
   /**
    * Tests serialization.
-   *
-   * @expectedException \AssertionError
    */
   public function testSerialize() {
     $container = new ContainerBuilder();
+    $this->setExpectedException(\AssertionError::class);
     serialize($container);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php
index 0ae5dd559..46f00bd2a 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php
@@ -14,11 +14,10 @@ class ContainerTest extends UnitTestCase {
 
   /**
    * Tests serialization.
-   *
-   * @expectedException \AssertionError
    */
   public function testSerialize() {
     $container = new Container();
+    $this->setExpectedException(\AssertionError::class);
     serialize($container);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Display/DisplayVariantTest.php b/web/core/tests/Drupal/Tests/Core/Display/DisplayVariantTest.php
index 2a5472559..3729d7eae 100644
--- a/web/core/tests/Drupal/Tests/Core/Display/DisplayVariantTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Display/DisplayVariantTest.php
@@ -22,10 +22,10 @@ class DisplayVariantTest extends UnitTestCase {
    * @return \Drupal\Core\Display\VariantBase|\PHPUnit_Framework_MockObject_MockObject
    *   A mocked display variant plugin.
    */
-  public function setUpDisplayVariant($configuration = array(), $definition = array()) {
+  public function setUpDisplayVariant($configuration = [], $definition = []) {
     return $this->getMockBuilder('Drupal\Core\Display\VariantBase')
-      ->setConstructorArgs(array($configuration, 'test', $definition))
-      ->setMethods(array('build'))
+      ->setConstructorArgs([$configuration, 'test', $definition])
+      ->setMethods(['build'])
       ->getMock();
   }
 
@@ -35,7 +35,7 @@ class DisplayVariantTest extends UnitTestCase {
    * @covers ::label
    */
   public function testLabel() {
-    $display_variant = $this->setUpDisplayVariant(array('label' => 'foo'));
+    $display_variant = $this->setUpDisplayVariant(['label' => 'foo']);
     $this->assertSame('foo', $display_variant->label());
   }
 
@@ -55,7 +55,7 @@ class DisplayVariantTest extends UnitTestCase {
    * @covers ::getWeight
    */
   public function testGetWeight() {
-    $display_variant = $this->setUpDisplayVariant(array('weight' => 5));
+    $display_variant = $this->setUpDisplayVariant(['weight' => 5]);
     $this->assertSame(5, $display_variant->getWeight());
   }
 
@@ -86,34 +86,34 @@ class DisplayVariantTest extends UnitTestCase {
    * Provides test data for testGetConfiguration().
    */
   public function providerTestGetConfiguration() {
-    $data = array();
-    $data[] = array(
-      array(),
-      array(
+    $data = [];
+    $data[] = [
+      [],
+      [
         'id' => 'test',
         'label' => '',
         'uuid' => '',
         'weight' => 0,
-      ),
-    );
-    $data[] = array(
-      array('label' => 'Test'),
-      array(
+      ],
+    ];
+    $data[] = [
+      ['label' => 'Test'],
+      [
         'id' => 'test',
         'label' => 'Test',
         'uuid' => '',
         'weight' => 0,
-      ),
-    );
-    $data[] = array(
-      array('id' => 'foo'),
-      array(
+      ],
+    ];
+    $data[] = [
+      ['id' => 'foo'],
+      [
         'id' => 'test',
         'label' => '',
         'uuid' => '',
         'weight' => 0,
-      ),
-    );
+      ],
+    ];
     return $data;
   }
 
@@ -136,7 +136,7 @@ class DisplayVariantTest extends UnitTestCase {
     $display_variant = $this->setUpDisplayVariant();
     $this->assertSame('', $display_variant->label());
 
-    $form = array();
+    $form = [];
     $label = $this->randomMachineName();
     $form_state = new FormState();
     $form_state->setValue('label', $label);
diff --git a/web/core/tests/Drupal/Tests/Core/DrupalKernel/DiscoverServiceProvidersTest.php b/web/core/tests/Drupal/Tests/Core/DrupalKernel/DiscoverServiceProvidersTest.php
index 164da9d95..8983c8d76 100644
--- a/web/core/tests/Drupal/Tests/Core/DrupalKernel/DiscoverServiceProvidersTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DrupalKernel/DiscoverServiceProvidersTest.php
@@ -19,23 +19,23 @@ class DiscoverServiceProvidersTest extends UnitTestCase {
    * @covers ::discoverServiceProviders
    */
   public function testDiscoverServiceCustom() {
-    new Settings(array(
-      'container_yamls' => array(
+    new Settings([
+      'container_yamls' => [
         __DIR__ . '/fixtures/custom.yml'
-      ),
-    ));
+      ],
+    ]);
 
     $kernel = new DrupalKernel('prod', new ClassLoader());
     $kernel->discoverServiceProviders();
 
-    $expect = array(
-      'app' => array(
+    $expect = [
+      'app' => [
         'core' => 'core/core.services.yml',
-      ),
-      'site' => array(
+      ],
+      'site' => [
         __DIR__ . '/fixtures/custom.yml',
-      ),
-    );
+      ],
+    ];
 
     $this->assertAttributeSame($expect, 'serviceYamls', $kernel);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php b/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
index 81f181816..7278fd6a9 100644
--- a/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
@@ -206,14 +206,14 @@ EOD;
      *   Whether to prepend the autoloader or not
      */
     public function register($prepend = FALSE) {
-      spl_autoload_register(array($this, 'loadClass'), TRUE, $prepend);
+      spl_autoload_register([$this, 'loadClass'], TRUE, $prepend);
     }
 
     /**
      * Unregisters this instance as an autoloader.
      */
     public function unregister() {
-      spl_autoload_unregister(array($this, 'loadClass'));
+      spl_autoload_unregister([$this, 'loadClass']);
     }
 
     /**
diff --git a/web/core/tests/Drupal/Tests/Core/DrupalTest.php b/web/core/tests/Drupal/Tests/Core/DrupalTest.php
index d4e3565ae..2ff6ebf66 100644
--- a/web/core/tests/Drupal/Tests/Core/DrupalTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DrupalTest.php
@@ -2,6 +2,11 @@
 
 namespace Drupal\Tests\Core;
 
+use Drupal\Core\DependencyInjection\ContainerNotInitializedException;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\Query\QueryAggregateInterface;
+use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Url;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -27,7 +32,7 @@ class DrupalTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
     $this->container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
-      ->setMethods(array('get'))
+      ->setMethods(['get'])
       ->getMock();
   }
 
@@ -43,11 +48,9 @@ class DrupalTest extends UnitTestCase {
 
   /**
    * @covers ::getContainer
-   *
-   * @expectedException \Drupal\Core\DependencyInjection\ContainerNotInitializedException
-   * @expectedExceptionMessage \Drupal::$container is not initialized yet. \Drupal::setContainer() must be called with a real container.
    */
   public function testGetContainerException() {
+    $this->setExpectedException(ContainerNotInitializedException::class, '\Drupal::$container is not initialized yet. \Drupal::setContainer() must be called with a real container.');
     \Drupal::getContainer();
   }
 
@@ -102,7 +105,7 @@ class DrupalTest extends UnitTestCase {
   }
 
   /**
-   * Tests the service() method.
+   * Tests the cache() method.
    *
    * @covers ::cache
    */
@@ -111,6 +114,16 @@ class DrupalTest extends UnitTestCase {
     $this->assertNotNull(\Drupal::cache('test'));
   }
 
+  /**
+   * Tests the classResolver method.
+   *
+   * @covers ::classResolver
+   */
+  public function testClassResolver() {
+    $this->setMockContainerService('class_resolver');
+    $this->assertNotNull(\Drupal::classResolver());
+  }
+
   /**
    * Tests the keyValueExpirable() method.
    *
@@ -230,16 +243,24 @@ class DrupalTest extends UnitTestCase {
    * @covers ::entityQuery
    */
   public function testEntityQuery() {
-    $query = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryFactory')
-      ->disableOriginalConstructor()
-      ->getMock();
-    $query->expects($this->once())
-      ->method('get')
-      ->with('test_entity', 'OR')
-      ->will($this->returnValue(TRUE));
-    $this->setMockContainerService('entity.query', $query);
+    $query = $this->getMock(QueryInterface::class);
+    $storage = $this->getMock(EntityStorageInterface::class);
+    $storage
+      ->expects($this->once())
+      ->method('getQuery')
+      ->with('OR')
+      ->willReturn($query);
 
-    $this->assertNotNull(\Drupal::entityQuery('test_entity', 'OR'));
+    $entity_type_manager = $this->getMock(EntityTypeManagerInterface::class);
+    $entity_type_manager
+      ->expects($this->once())
+      ->method('getStorage')
+      ->with('test_entity')
+      ->willReturn($storage);
+
+    $this->setMockContainerService('entity_type.manager', $entity_type_manager);
+
+    $this->assertInstanceOf(QueryInterface::class, \Drupal::entityQuery('test_entity', 'OR'));
   }
 
   /**
@@ -248,16 +269,24 @@ class DrupalTest extends UnitTestCase {
    * @covers ::entityQueryAggregate
    */
   public function testEntityQueryAggregate() {
-    $query = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryFactory')
-      ->disableOriginalConstructor()
-      ->getMock();
-    $query->expects($this->once())
-      ->method('getAggregate')
-      ->with('test_entity', 'OR')
-      ->will($this->returnValue(TRUE));
-    $this->setMockContainerService('entity.query', $query);
+    $query = $this->getMock(QueryAggregateInterface::class);
+    $storage = $this->getMock(EntityStorageInterface::class);
+    $storage
+      ->expects($this->once())
+      ->method('getAggregateQuery')
+      ->with('OR')
+      ->willReturn($query);
 
-    $this->assertNotNull(\Drupal::entityQueryAggregate('test_entity', 'OR'));
+    $entity_type_manager = $this->getMock(EntityTypeManagerInterface::class);
+    $entity_type_manager
+      ->expects($this->once())
+      ->method('getStorage')
+      ->with('test_entity')
+      ->willReturn($storage);
+
+    $this->setMockContainerService('entity_type.manager', $entity_type_manager);
+
+    $this->assertInstanceOf(QueryAggregateInterface::class, \Drupal::entityQueryAggregate('test_entity', 'OR'));
   }
 
   /**
@@ -317,8 +346,8 @@ class DrupalTest extends UnitTestCase {
    * @see \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute()
    */
   public function testUrl() {
-    $route_parameters = array('test_parameter' => 'test');
-    $options = array('test_option' => 'test');
+    $route_parameters = ['test_parameter' => 'test'];
+    $options = ['test_option' => 'test'];
     $generator = $this->getMock('Drupal\Core\Routing\UrlGeneratorInterface');
     $generator->expects($this->once())
       ->method('generateFromRoute')
@@ -346,8 +375,8 @@ class DrupalTest extends UnitTestCase {
    * @see \Drupal\Core\Utility\LinkGeneratorInterface::generate()
    */
   public function testL() {
-    $route_parameters = array('test_parameter' => 'test');
-    $options = array('test_option' => 'test');
+    $route_parameters = ['test_parameter' => 'test'];
+    $options = ['test_option' => 'test'];
     $generator = $this->getMock('Drupal\Core\Utility\LinkGeneratorInterface');
     $url = new Url('test_route', $route_parameters, $options);
     $generator->expects($this->once())
diff --git a/web/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php b/web/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php
index 104ca8cf1..064cedf97 100644
--- a/web/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php
@@ -41,14 +41,14 @@ class ParamConversionEnhancerTest extends UnitTestCase {
   public function testEnhance() {
     $route = new Route('/test/{id}/{literal}/{null}');
 
-    $raw_variables = array(
+    $raw_variables = [
       'id' => 1,
       'literal' => 'this is a literal',
       'null' => NULL,
-    );
-    $defaults = array(
+    ];
+    $defaults = [
       RouteObjectInterface::ROUTE_OBJECT => $route,
-    ) + $raw_variables;
+    ] + $raw_variables;
 
     $expected = $defaults;
     $expected['id'] = 'something_better!';
@@ -75,10 +75,10 @@ class ParamConversionEnhancerTest extends UnitTestCase {
    */
   public function testCopyRawVariables() {
     $route = new Route('/test/{id}');
-    $defaults = array(
+    $defaults = [
       RouteObjectInterface::ROUTE_OBJECT => $route,
       'id' => '1',
-    );
+    ];
     // Set one default to mirror another by reference.
     $defaults['bar'] = &$defaults['id'];
     $this->paramConverterManager->expects($this->any())
@@ -89,7 +89,7 @@ class ParamConversionEnhancerTest extends UnitTestCase {
         $defaults['bar'] = '2';
         return $defaults;
       }));
-    $expected = new ParameterBag(array('id' => 1));
+    $expected = new ParameterBag(['id' => 1]);
     $result = $this->paramConversionEnhancer->enhance($defaults, new Request());
     $this->assertEquals($result['_raw_variables'], $expected);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php b/web/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php
index dbd50e795..341ed9cf8 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php
@@ -38,19 +38,19 @@ class BaseFieldDefinitionTest extends UnitTestCase {
     $field_type_manager = $this->getMock('Drupal\Core\Field\FieldTypePluginManagerInterface');
 
     $this->fieldType = $this->randomMachineName();
-    $this->fieldTypeDefinition = array(
+    $this->fieldTypeDefinition = [
       'id' => $this->fieldType,
-      'storage_settings' => array(
+      'storage_settings' => [
         'some_setting' => 'value 1'
-      ),
-      'field_settings' => array(
+      ],
+      'field_settings' => [
         'some_instance_setting' => 'value 2',
-      ),
-    );
+      ],
+    ];
 
     $field_type_manager->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue(array($this->fieldType => $this->fieldTypeDefinition)));
+      ->will($this->returnValue([$this->fieldType => $this->fieldTypeDefinition]));
     $field_type_manager->expects($this->any())
       ->method('getDefinition')
       ->with($this->fieldType)
@@ -129,7 +129,7 @@ class BaseFieldDefinitionTest extends UnitTestCase {
     $definition->setSetting($setting, $value);
     $this->assertEquals($value, $definition->getSetting($setting));
     $default_settings = $this->fieldTypeDefinition['storage_settings'] + $this->fieldTypeDefinition['field_settings'];
-    $this->assertEquals(array($setting => $value) + $default_settings, $definition->getSettings());
+    $this->assertEquals([$setting => $value] + $default_settings, $definition->getSettings());
   }
 
   /**
@@ -156,10 +156,10 @@ class BaseFieldDefinitionTest extends UnitTestCase {
    */
   public function testFieldDefaultValue() {
     $definition = BaseFieldDefinition::create($this->fieldType);
-    $default_value = array(
+    $default_value = [
       'value' => $this->randomMachineName(),
-    );
-    $expected_default_value = array($default_value);
+    ];
+    $expected_default_value = [$default_value];
     $definition->setDefaultValue($default_value);
     $entity = $this->getMockBuilder('Drupal\Core\Entity\ContentEntityBase')
       ->disableOriginalConstructor()
@@ -186,8 +186,8 @@ class BaseFieldDefinitionTest extends UnitTestCase {
     $this->assertEquals($expected_default_value, $definition->getDefaultValue($entity));
 
     // Set default value with an empty array.
-    $definition->setDefaultValue(array());
-    $this->assertEquals(array(), $definition->getDefaultValue($entity));
+    $definition->setDefaultValue([]);
+    $this->assertEquals([], $definition->getDefaultValue($entity));
 
     // Set default value with NULL.
     $definition->setDefaultValue(NULL);
@@ -254,6 +254,21 @@ class BaseFieldDefinitionTest extends UnitTestCase {
     $this->assertFalse($definition->isRequired());
   }
 
+  /**
+   * Tests storage required.
+   *
+   * @covers ::isStorageRequired
+   * @covers ::setStorageRequired
+   */
+  public function testFieldStorageRequired() {
+    $definition = BaseFieldDefinition::create($this->fieldType);
+    $this->assertFalse($definition->isStorageRequired());
+    $definition->setStorageRequired(TRUE);
+    $this->assertTrue($definition->isStorageRequired());
+    $definition->setStorageRequired(FALSE);
+    $this->assertFalse($definition->isStorageRequired());
+  }
+
   /**
    * Tests provider.
    *
@@ -298,14 +313,12 @@ class BaseFieldDefinitionTest extends UnitTestCase {
    * Tests invalid default value callbacks.
    *
    * @covers ::setDefaultValueCallback
-   * @expectedException \InvalidArgumentException
    */
   public function testInvalidDefaultValueCallback() {
     $definition = BaseFieldDefinition::create($this->fieldType);
     // setDefaultValueCallback returns $this.
-    $this->assertSame($definition,
-      $definition->setDefaultValueCallback([get_class($this), 'mockDefaultValueCallback'])
-    );
+    $this->setExpectedException(\InvalidArgumentException::class);
+    $definition->setDefaultValueCallback([get_class($this), 'mockDefaultValueCallback']);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php b/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
index cb7353376..8ab7950f0 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
@@ -107,21 +107,21 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
    */
   protected function setUp() {
     $this->id = 1;
-    $values = array(
+    $values = [
       'id' => $this->id,
       'uuid' => '3bb9ee60-bea5-4622-b89b-a63319d10b3a',
-      'defaultLangcode' => array(LanguageInterface::LANGCODE_DEFAULT => 'en'),
-    );
+      'defaultLangcode' => [LanguageInterface::LANGCODE_DEFAULT => 'en'],
+    ];
     $this->entityTypeId = $this->randomMachineName();
     $this->bundle = $this->randomMachineName();
 
     $this->entityType = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getKeys')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         'id' => 'id',
         'uuid' => 'uuid',
-    )));
+    ]));
 
     $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
     $this->entityManager->expects($this->any())
@@ -137,12 +137,12 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
       ->with('entity')
       ->will($this->returnValue(['class' => '\Drupal\Core\Entity\Plugin\DataType\EntityAdapter']));
 
-    $english = new Language(array('id' => 'en'));
-    $not_specified = new Language(array('id' => LanguageInterface::LANGCODE_NOT_SPECIFIED, 'locked' => TRUE));
+    $english = new Language(['id' => 'en']);
+    $not_specified = new Language(['id' => LanguageInterface::LANGCODE_NOT_SPECIFIED, 'locked' => TRUE]);
     $this->languageManager = $this->getMock('\Drupal\Core\Language\LanguageManagerInterface');
     $this->languageManager->expects($this->any())
       ->method('getLanguages')
-      ->will($this->returnValue(array('en' => $english, LanguageInterface::LANGCODE_NOT_SPECIFIED => $not_specified)));
+      ->will($this->returnValue(['en' => $english, LanguageInterface::LANGCODE_NOT_SPECIFIED => $not_specified]));
     $this->languageManager->expects($this->any())
       ->method('getLanguage')
       ->with('en')
@@ -157,10 +157,10 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
       ->getMock();
     $this->fieldTypePluginManager->expects($this->any())
       ->method('getDefaultStorageSettings')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->fieldTypePluginManager->expects($this->any())
       ->method('getDefaultFieldSettings')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->fieldTypePluginManager->expects($this->any())
       ->method('createFieldItemList')
       ->will($this->returnValue($this->getMock('Drupal\Core\Field\FieldItemListInterface')));
@@ -173,19 +173,19 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
     $container->set('plugin.manager.field.field_type', $this->fieldTypePluginManager);
     \Drupal::setContainer($container);
 
-    $this->fieldDefinitions = array(
+    $this->fieldDefinitions = [
       'id' => BaseFieldDefinition::create('integer'),
       'revision_id' => BaseFieldDefinition::create('integer'),
-    );
+    ];
 
     $this->entityManager->expects($this->any())
       ->method('getFieldDefinitions')
       ->with($this->entityTypeId, $this->bundle)
       ->will($this->returnValue($this->fieldDefinitions));
-    $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Entity\ContentEntityBase', array($values, $this->entityTypeId, $this->bundle));
 
-    $values['defaultLangcode'] = array(LanguageInterface::LANGCODE_DEFAULT => LanguageInterface::LANGCODE_NOT_SPECIFIED);
-    $this->entityUnd = $this->getMockForAbstractClass('\Drupal\Core\Entity\ContentEntityBase', array($values, $this->entityTypeId, $this->bundle));
+    $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Entity\ContentEntityBase', [$values, $this->entityTypeId, $this->bundle], '', TRUE, TRUE, TRUE, ['isNew']);
+    $values['defaultLangcode'] = [LanguageInterface::LANGCODE_DEFAULT => LanguageInterface::LANGCODE_NOT_SPECIFIED];
+    $this->entityUnd = $this->getMockForAbstractClass('\Drupal\Core\Entity\ContentEntityBase', [$values, $this->entityTypeId, $this->bundle]);
   }
 
   /**
@@ -237,7 +237,7 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
     $this->assertFalse($this->entity->isNewRevision());
     $this->assertTrue($this->entity->isNewRevision());
     $this->entity->setNewRevision(TRUE);
-    $this->assertTRUE($this->entity->isNewRevision());
+    $this->assertTrue($this->entity->isNewRevision());
   }
 
   /**
@@ -262,6 +262,12 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
     $this->assertTrue($this->entity->isDefaultRevision(FALSE));
     // The last call changed the return value for this call.
     $this->assertFalse($this->entity->isDefaultRevision());
+    // The revision for a new entity should always be the default revision.
+    $this->entity->expects($this->any())
+      ->method('isNew')
+      ->will($this->returnValue(TRUE));
+    $this->entity->isDefaultRevision(FALSE);
+    $this->assertTrue($this->entity->isDefaultRevision());
   }
 
   /**
@@ -279,11 +285,11 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
     $this->entityManager->expects($this->any())
       ->method('getBundleInfo')
       ->with($this->entityTypeId)
-      ->will($this->returnValue(array(
-        $this->bundle => array(
+      ->will($this->returnValue([
+        $this->bundle => [
           'translatable' => TRUE,
-        ),
-      )));
+        ],
+      ]));
     $this->languageManager->expects($this->any())
       ->method('isMultilingual')
       ->will($this->returnValue(TRUE));
@@ -352,9 +358,6 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
    * @covers ::setValidationRequired
    * @covers ::save
    * @covers ::preSave
-   *
-   * @expectedException \LogicException
-   * @expectedExceptionMessage Entity validation was skipped.
    */
   public function testRequiredValidation() {
     $validator = $this->getMock('\Symfony\Component\Validator\ValidatorInterface');
@@ -399,6 +402,7 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
     // that trying to save a non-validated entity when validation is required
     // results in an exception.
     $this->assertTrue($this->entity->isValidationRequired());
+    $this->setExpectedException(\LogicException::class, 'Entity validation was skipped.');
     $this->entity->save();
   }
 
@@ -452,7 +456,7 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
       ->will($this->returnValue($callback_label));
     $this->entityType->expects($this->once())
       ->method('getLabelCallback')
-      ->will($this->returnValue(array($callback_container, __FUNCTION__)));
+      ->will($this->returnValue([$callback_container, __FUNCTION__]));
 
     $this->assertSame($callback_label, $this->entity->label());
   }
@@ -485,7 +489,7 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
     // Mock ContentEntityBase.
     $mock_base = $this->getMockBuilder('Drupal\Core\Entity\ContentEntityBase')
       ->disableOriginalConstructor()
-      ->setMethods(array('getTranslatedField'))
+      ->setMethods(['getTranslatedField'])
       ->getMockForAbstractClass();
 
     // Set up expectations for getTranslatedField() method. In get(),
@@ -547,14 +551,14 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
     // Mock ContentEntityBase.
     $mock_base = $this->getMockBuilder('Drupal\Core\Entity\ContentEntityBase')
       ->disableOriginalConstructor()
-      ->setMethods(array('getFieldDefinitions', 'get'))
+      ->setMethods(['getFieldDefinitions', 'get'])
       ->getMockForAbstractClass();
 
     // Mock field definition objects for each element of $field_definitions.
-    $mocked_field_definitions = array();
+    $mocked_field_definitions = [];
     foreach ($field_definitions as $name) {
       $mock_definition = $this->getMockBuilder('Drupal\Core\Field\FieldDefinitionInterface')
-        ->setMethods(array('isComputed'))
+        ->setMethods(['isComputed'])
         ->getMockForAbstractClass();
       // Set expectations for isComputed(). isComputed() gets called whenever
       // $include_computed is FALSE, but not otherwise. It returns the value of
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php
index 2794603c3..1b6525a93 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php
@@ -23,7 +23,7 @@ class EntityRouteEnhancerTest extends UnitTestCase {
 
     // Set a controller to ensure it is not overridden.
     $request = new Request();
-    $defaults = array();
+    $defaults = [];
     $defaults['_controller'] = 'Drupal\Tests\Core\Controller\TestController::content';
     $defaults['_entity_form'] = 'entity_test.default';
     $new_defaults = $route_enhancer->enhance($defaults, $request);
@@ -31,13 +31,13 @@ class EntityRouteEnhancerTest extends UnitTestCase {
     $this->assertEquals($defaults['_controller'], $new_defaults['_controller'], '_controller did not get overridden.');
 
     // Set _entity_form and ensure that the form is set.
-    $defaults = array();
+    $defaults = [];
     $defaults['_entity_form'] = 'entity_test.default';
     $new_defaults = $route_enhancer->enhance($defaults, $request);
     $this->assertEquals('controller.entity_form:getContentResult', $new_defaults['_controller']);
 
     // Set _entity_list and ensure that the entity list controller is set.
-    $defaults = array();
+    $defaults = [];
     $defaults['_entity_list'] = 'entity_test.default';
     $new_defaults = $route_enhancer->enhance($defaults, $request);
     $this->assertEquals('\Drupal\Core\Entity\Controller\EntityListController::listing', $new_defaults['_controller'], 'The entity list controller was not set.');
@@ -45,7 +45,7 @@ class EntityRouteEnhancerTest extends UnitTestCase {
     $this->assertFalse(isset($new_defaults['_entity_list']));
 
     // Set _entity_view and ensure that the entity view controller is set.
-    $defaults = array();
+    $defaults = [];
     $defaults['_entity_view'] = 'entity_test.full';
     $defaults['entity_test'] = 'Mock entity';
     $defaults = $route_enhancer->enhance($defaults, $request);
@@ -56,11 +56,11 @@ class EntityRouteEnhancerTest extends UnitTestCase {
 
     // Set _entity_view and ensure that the entity view controller is set using
     // a converter.
-    $defaults = array();
+    $defaults = [];
     $defaults['_entity_view'] = 'entity_test.full';
     $defaults['foo'] = 'Mock entity';
     // Add a converter.
-    $options['parameters']['foo'] = array('type' => 'entity:entity_test');
+    $options['parameters']['foo'] = ['type' => 'entity:entity_test'];
     // Set the route.
     $route = $this->getMockBuilder('Symfony\Component\Routing\Route')
       ->disableOriginalConstructor()
@@ -78,7 +78,7 @@ class EntityRouteEnhancerTest extends UnitTestCase {
     $this->assertFalse(isset($defaults['_entity_view']));
 
     // Set _entity_view without a view mode.
-    $defaults = array();
+    $defaults = [];
     $defaults['_entity_view'] = 'entity_test';
     $defaults['entity_test'] = 'Mock entity';
     $defaults = $route_enhancer->enhance($defaults, $request);
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
index f99160bbf..70468ea11 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
@@ -9,8 +9,10 @@ use Drupal\Core\Session\AccountInterface;
 use Drupal\node\NodeInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\Routing\Route;
+use Drupal\Core\Access\AccessibleInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityAccessCheck;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -70,13 +72,54 @@ class EntityAccessCheckTest extends UnitTestCase {
     $node = $node->reveal();
 
     /** @var \Drupal\Core\Routing\RouteMatchInterface|\Prophecy\Prophecy\ObjectProphecy $route_match */
-    $route_match = $this->prophesize(RouteMatchInterface::class);
-    $route_match->getRawParameters()->willReturn(new ParameterBag(['entity_type' => 'node', 'var_name' => 1]));
-    $route_match->getParameters()->willReturn(new ParameterBag(['entity_type' => 'node', 'var_name' => $node]));
-    $route_match = $route_match->reveal();
+    $route_match = $this->createRouteMatchForObject($node);
 
     $access_check = new EntityAccessCheck();
     $this->assertEquals(AccessResult::allowed(), $access_check->access($route, $route_match, $account));
   }
 
+  /**
+   * @covers ::access
+   */
+  public function testAccessWithDifferentRouteParameters() {
+    $route = new Route(
+      '/foo/{var_name}',
+      [],
+      ['_entity_access' => 'var_name.update'],
+      ['parameters' => ['var_name' => ['type' => 'entity:node']]]
+    );
+    /** @var \Drupal\Core\Session\AccountInterface $account */
+    $account = $this->prophesize(AccountInterface::class)->reveal();
+    $access_check = new EntityAccessCheck();
+
+    // Confirm an EntityInterface route parameter's ::access() is called.
+    /** @var \Drupal\Core\Entity\EntityInterface|\Prophecy\Prophecy\ObjectProphecy $node */
+    $node = $this->prophesize(EntityInterface::class);
+    $node->access('update', $account, TRUE)->willReturn(AccessResult::allowed());
+    $route_match = $this->createRouteMatchForObject($node->reveal());
+    $this->assertEquals(AccessResult::allowed(), $access_check->access($route, $route_match, $account));
+
+    // AccessibleInterface is not entity-like: ::access() should not be called.
+    /** @var \Drupal\Core\Access\AccessibleInterface|\Prophecy\Prophecy\ObjectProphecy $node */
+    $node = $this->prophesize(AccessibleInterface::class);
+    $node->access('update', $account, TRUE)->willReturn(AccessResult::allowed());
+    $route_match = $this->createRouteMatchForObject($node->reveal());
+    $this->assertEquals(AccessResult::neutral(), $access_check->access($route, $route_match, $account));
+  }
+
+  /**
+   * Wrap any object with a route match, and return that.
+   *
+   * @param \stdClass $object
+   *   Any object, including prophesized mocks based on interfaces.
+   * @return RouteMatchInterface
+   *   A prophesized RouteMatchInterface.
+   */
+  private function createRouteMatchForObject(\stdClass $object) {
+    $route_match = $this->prophesize(RouteMatchInterface::class);
+    $route_match->getRawParameters()->willReturn(new ParameterBag(['entity_type' => 'node', 'var_name' => 1]));
+    $route_match->getParameters()->willReturn(new ParameterBag(['entity_type' => 'node', 'var_name' => $object]));
+    return $route_match->reveal();
+  }
+
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php
index 5430fee62..2c3d132cf 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php
@@ -47,18 +47,18 @@ class EntityCreateAccessCheckTest extends UnitTestCase {
     $no_access = FALSE;
     $access = TRUE;
 
-    return array(
-      array('', 'entity_test', $no_access, $no_access),
-      array('', 'entity_test', $access, $access),
-      array('test_entity', 'entity_test:test_entity', $access, $access),
-      array('test_entity', 'entity_test:test_entity', $no_access, $no_access),
-      array('test_entity', 'entity_test:{bundle_argument}', $access, $access),
-      array('test_entity', 'entity_test:{bundle_argument}', $no_access, $no_access),
-      array('', 'entity_test:{bundle_argument}', $no_access, $no_access, FALSE),
+    return [
+      ['', 'entity_test', $no_access, $no_access],
+      ['', 'entity_test', $access, $access],
+      ['test_entity', 'entity_test:test_entity', $access, $access],
+      ['test_entity', 'entity_test:test_entity', $no_access, $no_access],
+      ['test_entity', 'entity_test:{bundle_argument}', $access, $access],
+      ['test_entity', 'entity_test:{bundle_argument}', $no_access, $no_access],
+      ['', 'entity_test:{bundle_argument}', $no_access, $no_access, FALSE],
       // When the bundle is not provided, access should be denied even if the
       // access control handler would allow access.
-      array('', 'entity_test:{bundle_argument}', $access, $no_access, FALSE),
-    );
+      ['', 'entity_test:{bundle_argument}', $access, $no_access, FALSE],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php
index 7cad93c2d..4985470de 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php
@@ -310,9 +310,6 @@ class EntityFieldManagerTest extends UnitTestCase {
    * @covers ::getBaseFieldDefinitions
    * @covers ::buildBaseFieldDefinitions
    *
-   * @expectedException \LogicException
-   * @expectedExceptionMessage The Test entity type cannot be translatable as it does not define a translatable "langcode" field.
-   *
    * @dataProvider providerTestGetBaseFieldDefinitionsTranslatableEntityTypeLangcode
    */
   public function testGetBaseFieldDefinitionsTranslatableEntityTypeLangcode($provide_key, $provide_field, $translatable) {
@@ -333,6 +330,7 @@ class EntityFieldManagerTest extends UnitTestCase {
     $this->entityType->isTranslatable()->willReturn(TRUE);
     $this->entityType->getLabel()->willReturn('Test');
 
+    $this->setExpectedException(\LogicException::class, 'The Test entity type cannot be translatable as it does not define a translatable "langcode" field.');
     $this->entityFieldManager->getBaseFieldDefinitions('test_entity_type');
   }
 
@@ -452,8 +450,6 @@ class EntityFieldManagerTest extends UnitTestCase {
    *
    * @covers ::getBaseFieldDefinitions
    * @covers ::buildBaseFieldDefinitions
-   *
-   * @expectedException \LogicException
    */
   public function testGetBaseFieldDefinitionsInvalidDefinition() {
     $this->setUpEntityWithFieldDefinition(FALSE, 'langcode', ['langcode' => 'langcode']);
@@ -461,6 +457,7 @@ class EntityFieldManagerTest extends UnitTestCase {
     $this->entityType->isTranslatable()->willReturn(TRUE);
     $this->entityType->getLabel()->willReturn('the_label');
 
+    $this->setExpectedException(\LogicException::class);
     $this->entityFieldManager->getBaseFieldDefinitions('test_entity_type');
   }
 
@@ -543,7 +540,7 @@ class EntityFieldManagerTest extends UnitTestCase {
 
     $this->entityType->getClass()->willReturn($entity_class);
     $this->entityType->getKeys()->willReturn($entity_keys + ['default_langcode' => 'default_langcode']);
-    $this->entityType->isSubclassOf(FieldableEntityInterface::class)->willReturn(TRUE);
+    $this->entityType->entityClassImplements(FieldableEntityInterface::class)->willReturn(TRUE);
     $this->entityType->isTranslatable()->willReturn(FALSE);
     $this->entityType->getProvider()->willReturn('the_provider');
     $this->entityType->id()->willReturn('the_entity_id');
@@ -570,7 +567,7 @@ class EntityFieldManagerTest extends UnitTestCase {
   /**
    * @covers ::getExtraFields
    */
-  function testGetExtraFields() {
+  public function testGetExtraFields() {
     $this->setUpEntityTypeDefinitions();
 
     $entity_type_id = $this->randomMachineName();
@@ -652,13 +649,13 @@ class EntityFieldManagerTest extends UnitTestCase {
 
     $entity_type->getClass()->willReturn($entity_class);
     $entity_type->getKeys()->willReturn(['default_langcode' => 'default_langcode']);
-    $entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(TRUE);
+    $entity_type->entityClassImplements(FieldableEntityInterface::class)->willReturn(TRUE);
     $entity_type->isTranslatable()->shouldBeCalled();
     $entity_type->getProvider()->shouldBeCalled();
 
-    $non_content_entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
+    $non_content_entity_type->entityClassImplements(FieldableEntityInterface::class)->willReturn(FALSE);
 
-    $override_entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
+    $override_entity_type->entityClassImplements(FieldableEntityInterface::class)->willReturn(FALSE);
 
     // Set up the entity type bundle info to return two bundles for the
     // fieldable entity type.
@@ -753,11 +750,11 @@ class EntityFieldManagerTest extends UnitTestCase {
 
     $entity_type->getClass()->willReturn($entity_class)->shouldBeCalled();
     $entity_type->getKeys()->willReturn(['default_langcode' => 'default_langcode'])->shouldBeCalled();
-    $entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(TRUE)->shouldBeCalled();
+    $entity_type->entityClassImplements(FieldableEntityInterface::class)->willReturn(TRUE)->shouldBeCalled();
     $entity_type->isTranslatable()->shouldBeCalled();
     $entity_type->getProvider()->shouldBeCalled();
 
-    $override_entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE)->shouldBeCalled();
+    $override_entity_type->entityClassImplements(FieldableEntityInterface::class)->willReturn(FALSE)->shouldBeCalled();
 
     $integerFields = $this->entityFieldManager->getFieldMapByFieldType('integer');
     $this->assertCount(1, $integerFields['test_entity_type']);
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
index 15fd23459..4bed37da5 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
@@ -52,7 +52,7 @@ class EntityFormTest extends UnitTestCase {
   public function testFormId($expected, $definition) {
     $this->entityType->set('entity_keys', ['bundle' => $definition['bundle']]);
 
-    $entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(array(), $definition['entity_type']), '', TRUE, TRUE, TRUE, array('getEntityType', 'bundle'));
+    $entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', [[], $definition['entity_type']], '', TRUE, TRUE, TRUE, ['getEntityType', 'bundle']);
 
     $entity->expects($this->any())
       ->method('getEntityType')
@@ -71,33 +71,33 @@ class EntityFormTest extends UnitTestCase {
    * Provides test data for testFormId().
    */
   public function providerTestFormIds() {
-    return array(
-      array('node_article_form', array(
+    return [
+      ['node_article_form', [
         'entity_type' => 'node',
         'bundle' => 'article',
         'operation' => 'default',
-      )),
-      array('node_article_delete_form', array(
+      ]],
+      ['node_article_delete_form', [
         'entity_type' => 'node',
         'bundle' => 'article',
         'operation' => 'delete',
-      )),
-      array('user_user_form', array(
+      ]],
+      ['user_user_form', [
         'entity_type' => 'user',
         'bundle' => 'user',
         'operation' => 'default',
-      )),
-      array('user_form', array(
+      ]],
+      ['user_form', [
         'entity_type' => 'user',
         'bundle' => '',
         'operation' => 'default',
-      )),
-      array('user_delete_form', array(
+      ]],
+      ['user_delete_form', [
         'entity_type' => 'user',
         'bundle' => '',
         'operation' => 'delete',
-      )),
-    );
+      ]],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
index f5c12649b..44e771cea 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
@@ -90,14 +90,14 @@ class EntityListBuilderTest extends UnitTestCase {
    */
   public function testGetOperations() {
     $operation_name = $this->randomMachineName();
-    $operations = array(
-      $operation_name => array(
+    $operations = [
+      $operation_name => [
         'title' => $this->randomMachineName(),
-      ),
-    );
+      ],
+    ];
     $this->moduleHandler->expects($this->once())
       ->method('invokeAll')
-      ->with('entity_operation', array($this->role))
+      ->with('entity_operation', [$this->role])
       ->will($this->returnValue($operations));
     $this->moduleHandler->expects($this->once())
       ->method('alter')
@@ -116,7 +116,7 @@ class EntityListBuilderTest extends UnitTestCase {
       ->getMock();
     $url->expects($this->any())
       ->method('toArray')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->role->expects($this->any())
       ->method('urlInfo')
       ->will($this->returnValue($url));
@@ -141,7 +141,7 @@ class EntityListBuilderTest extends UnitTestCase {
 
 class TestEntityListBuilder extends EntityTestListBuilder {
   public function buildOperations(EntityInterface $entity) {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityRepositoryTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityRepositoryTest.php
index 83692483e..688dd75b9 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityRepositoryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityRepositoryTest.php
@@ -63,7 +63,7 @@ class EntityRepositoryTest extends UnitTestCase {
     $this->languageManager->getFallbackCandidates(Argument::type('array'))
       ->will(function ($args) {
         $context = $args[0];
-        $candidates = array();
+        $candidates = [];
         if (!empty($context['langcode'])) {
           $candidates[$context['langcode']] = $context['langcode'];
         }
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
index 6e164708b..d2e5eae31 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
@@ -74,9 +74,9 @@ class EntityResolverManagerTest extends UnitTestCase {
    * @dataProvider providerTestSetRouteOptionsWithStandardRoute
    */
   public function testSetRouteOptionsWithStandardRoute($controller) {
-    $route = new Route('/example', array(
+    $route = new Route('/example', [
       '_controller' => $controller,
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
@@ -88,10 +88,10 @@ class EntityResolverManagerTest extends UnitTestCase {
    * Data provider for testSetRouteOptionsWithStandardRoute.
    */
   public function providerTestSetRouteOptionsWithStandardRoute() {
-    return array(
-      array('Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerMethod'),
-      array('Drupal\Tests\Core\Entity\test_function_controller'),
-    );
+    return [
+      ['Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerMethod'],
+      ['Drupal\Tests\Core\Entity\test_function_controller'],
+    ];
   }
 
   /**
@@ -103,10 +103,10 @@ class EntityResolverManagerTest extends UnitTestCase {
    * @dataProvider providerTestSetRouteOptionsWithStandardRouteWithArgument
    */
   public function testSetRouteOptionsWithStandardRouteWithArgument($controller) {
-    $route = new Route('/example/{argument}', array(
+    $route = new Route('/example/{argument}', [
       '_controller' => $controller,
       'argument' => 'test',
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
@@ -118,10 +118,10 @@ class EntityResolverManagerTest extends UnitTestCase {
    * Data provider for testSetRouteOptionsWithStandardRouteWithArgument.
    */
   public function providerTestSetRouteOptionsWithStandardRouteWithArgument() {
-    return array(
-      array('Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerMethodWithArgument'),
-      array('Drupal\Tests\Core\Entity\test_function_controller_with_argument'),
-    );
+    return [
+      ['Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerMethodWithArgument'],
+      ['Drupal\Tests\Core\Entity\test_function_controller_with_argument'],
+    ];
   }
 
   /**
@@ -133,10 +133,10 @@ class EntityResolverManagerTest extends UnitTestCase {
    * @dataProvider providerTestSetRouteOptionsWithContentController
    */
   public function testSetRouteOptionsWithContentController($controller) {
-    $route = new Route('/example/{argument}', array(
+    $route = new Route('/example/{argument}', [
       '_controller' => $controller,
       'argument' => 'test',
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
@@ -148,10 +148,10 @@ class EntityResolverManagerTest extends UnitTestCase {
    * Data provider for testSetRouteOptionsWithContentController.
    */
   public function providerTestSetRouteOptionsWithContentController() {
-    return array(
-      array('Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerMethodWithArgument'),
-      array('Drupal\Tests\Core\Entity\test_function_controller_with_argument'),
-    );
+    return [
+      ['Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerMethodWithArgument'],
+      ['Drupal\Tests\Core\Entity\test_function_controller_with_argument'],
+    ];
   }
 
   /**
@@ -167,9 +167,9 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function testSetRouteOptionsWithEntityTypeNoUpcasting($controller) {
     $this->setupEntityTypes();
 
-    $route = new Route('/example/{entity_test}', array(
+    $route = new Route('/example/{entity_test}', [
       '_controller' => $controller,
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
@@ -181,10 +181,10 @@ class EntityResolverManagerTest extends UnitTestCase {
    * Data provider for testSetRouteOptionsWithEntityTypeNoUpcasting.
    */
   public function providerTestSetRouteOptionsWithEntityTypeNoUpcasting() {
-    return array(
-      array('Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerWithEntityNoUpcasting'),
-      array('Drupal\Tests\Core\Entity\test_function_controller_no_upcasting'),
-    );
+    return [
+      ['Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerWithEntityNoUpcasting'],
+      ['Drupal\Tests\Core\Entity\test_function_controller_no_upcasting'],
+    ];
   }
 
   /**
@@ -200,25 +200,25 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function testSetRouteOptionsWithEntityTypeUpcasting($controller) {
     $this->setupEntityTypes();
 
-    $route = new Route('/example/{entity_test}', array(
+    $route = new Route('/example/{entity_test}', [
       '_controller' => $controller,
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
     $this->assertEquals($defaults, $route->getDefaults());
     $parameters = $route->getOption('parameters');
-    $this->assertEquals(array('entity_test' => array('type' => 'entity:entity_test')), $parameters);
+    $this->assertEquals(['entity_test' => ['type' => 'entity:entity_test']], $parameters);
   }
 
   /**
    * Data provider for testSetRouteOptionsWithEntityTypeUpcasting.
    */
   public function providerTestSetRouteOptionsWithEntityTypeUpcasting() {
-    return array(
-      array('Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerWithEntityUpcasting'),
-      array('Drupal\Tests\Core\Entity\test_function_controller_entity_upcasting'),
-    );
+    return [
+      ['Drupal\Tests\Core\Entity\BasicControllerClass::exampleControllerWithEntityUpcasting'],
+      ['Drupal\Tests\Core\Entity\test_function_controller_entity_upcasting'],
+    ];
   }
 
   /**
@@ -232,15 +232,15 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function testSetRouteOptionsWithEntityFormUpcasting() {
     $this->setupEntityTypes();
 
-    $route = new Route('/example/{entity_test}', array(
+    $route = new Route('/example/{entity_test}', [
       '_form' => 'Drupal\Tests\Core\Entity\BasicForm',
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
     $this->assertEquals($defaults, $route->getDefaults());
     $parameters = $route->getOption('parameters');
-    $this->assertEquals(array('entity_test' => array('type' => 'entity:entity_test')), $parameters);
+    $this->assertEquals(['entity_test' => ['type' => 'entity:entity_test']], $parameters);
   }
 
   /**
@@ -254,15 +254,15 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function testSetRouteOptionsWithEntityUpcastingNoCreate() {
     $this->setupEntityTypes();
 
-    $route = new Route('/example/{entity_test}', array(
+    $route = new Route('/example/{entity_test}', [
       '_form' => 'Drupal\Tests\Core\Entity\BasicFormNoContainerInjectionInterface',
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
     $this->assertEquals($defaults, $route->getDefaults());
     $parameters = $route->getOption('parameters');
-    $this->assertEquals(array('entity_test' => array('type' => 'entity:entity_test')), $parameters);
+    $this->assertEquals(['entity_test' => ['type' => 'entity:entity_test']], $parameters);
   }
 
   /**
@@ -276,9 +276,9 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function testSetRouteOptionsWithEntityFormNoUpcasting() {
     $this->setupEntityTypes();
 
-    $route = new Route('/example/{entity_test}', array(
+    $route = new Route('/example/{entity_test}', [
       '_form' => 'Drupal\Tests\Core\Entity\BasicFormNoUpcasting',
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
@@ -298,24 +298,24 @@ class EntityResolverManagerTest extends UnitTestCase {
   public function testSetRouteOptionsWithEntityViewRouteAndManualParameters() {
     $this->setupEntityTypes();
     $route = new Route('/example/{foo}',
-      array(
+      [
         '_entity_view' => 'entity_test.view',
-      ),
-      array(),
-      array(
-        'parameters' => array(
-          'foo' => array(
+      ],
+      [],
+      [
+        'parameters' => [
+          'foo' => [
             'type' => 'entity:entity_test',
-          ),
-        ),
-      )
+          ],
+        ],
+      ]
     );
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
     $this->assertEquals($defaults, $route->getDefaults());
     $parameters = $route->getOption('parameters');
-    $this->assertEquals(array('foo' => array('type' => 'entity:entity_test')), $parameters);
+    $this->assertEquals(['foo' => ['type' => 'entity:entity_test']], $parameters);
   }
 
   /**
@@ -329,15 +329,15 @@ class EntityResolverManagerTest extends UnitTestCase {
    */
   public function testSetRouteOptionsWithEntityViewRoute() {
     $this->setupEntityTypes();
-    $route = new Route('/example/{entity_test}', array(
+    $route = new Route('/example/{entity_test}', [
       '_entity_view' => 'entity_test.view',
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
     $this->assertEquals($defaults, $route->getDefaults());
     $parameters = $route->getOption('parameters');
-    $this->assertEquals(array('entity_test' => array('type' => 'entity:entity_test')), $parameters);
+    $this->assertEquals(['entity_test' => ['type' => 'entity:entity_test']], $parameters);
   }
 
   /**
@@ -351,9 +351,9 @@ class EntityResolverManagerTest extends UnitTestCase {
    */
   public function testSetRouteOptionsWithEntityListRoute() {
     $this->setupEntityTypes();
-    $route = new Route('/example/{entity_test}', array(
+    $route = new Route('/example/{entity_test}', [
       '_entity_list' => 'entity_test',
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
@@ -373,15 +373,15 @@ class EntityResolverManagerTest extends UnitTestCase {
    */
   public function testSetRouteOptionsWithEntityFormRoute() {
     $this->setupEntityTypes();
-    $route = new Route('/example/{entity_test}', array(
+    $route = new Route('/example/{entity_test}', [
       '_entity_form' => 'entity_test.edit',
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
     $this->assertEquals($defaults, $route->getDefaults());
     $parameters = $route->getOption('parameters');
-    $this->assertEquals(array('entity_test' => array('type' => 'entity:entity_test')), $parameters);
+    $this->assertEquals(['entity_test' => ['type' => 'entity:entity_test']], $parameters);
   }
 
   /**
@@ -427,9 +427,9 @@ class EntityResolverManagerTest extends UnitTestCase {
    */
   public function testSetRouteOptionsWithEntityAddFormRoute() {
     $this->setupEntityTypes();
-    $route = new Route('/example/add', array(
+    $route = new Route('/example/add', [
       '_entity_form' => 'entity_test.add',
-    ));
+    ]);
 
     $defaults = $route->getDefaults();
     $this->entityResolverManager->setRouteOptions($route);
@@ -447,9 +447,9 @@ class EntityResolverManagerTest extends UnitTestCase {
       ->will($this->returnValue('Drupal\Tests\Core\Entity\SimpleTestEntity'));
     $this->entityManager->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         'entity_test' => $definition,
-      )));
+      ]));
     $this->entityManager->expects($this->any())
       ->method('getDefinition')
       ->will($this->returnCallback(function ($entity_type) use ($definition) {
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
index c2325d423..4e2a79f19 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\Core\Entity;
 
 use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
+use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
@@ -17,6 +18,7 @@ use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\Exception\InvalidLinkTemplateException;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\Tests\UnitTestCase;
@@ -98,6 +100,7 @@ class EntityTypeManagerTest extends UnitTestCase {
 
       // Give the entity type a legitimate class to return.
       $entity_type->getClass()->willReturn($class);
+      $entity_type->setClass($class)->willReturn($entity_type->reveal());
 
       $definitions[$key] = $entity_type->reveal();
     }
@@ -248,14 +251,13 @@ class EntityTypeManagerTest extends UnitTestCase {
    * Tests the getFormObject() method with an invalid operation.
    *
    * @covers ::getFormObject
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    */
   public function testGetFormObjectInvalidOperation() {
     $entity = $this->prophesize(EntityTypeInterface::class);
     $entity->getFormClass('edit')->willReturn('');
     $this->setUpEntityTypeDefinitions(['test_entity_type' => $entity]);
 
+    $this->setExpectedException(InvalidPluginDefinitionException::class);
     $this->entityTypeManager->getFormObject('test_entity_type', 'edit');
   }
 
@@ -283,13 +285,12 @@ class EntityTypeManagerTest extends UnitTestCase {
    * Tests the getHandler() method when no controller is defined.
    *
    * @covers ::getHandler
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    */
   public function testGetHandlerMissingHandler() {
     $entity = $this->prophesize(EntityTypeInterface::class);
     $entity->getHandlerClass('storage')->willReturn('');
     $this->setUpEntityTypeDefinitions(['test_entity_type' => $entity]);
+    $this->setExpectedException(InvalidPluginDefinitionException::class);
     $this->entityTypeManager->getHandler('test_entity_type', 'storage');
   }
 
@@ -314,9 +315,6 @@ class EntityTypeManagerTest extends UnitTestCase {
    * Tests the processDefinition() method.
    *
    * @covers ::processDefinition
-   *
-   * @expectedException \Drupal\Core\Entity\Exception\InvalidLinkTemplateException
-   * @expectedExceptionMessage Link template 'canonical' for entity type 'apple' must start with a leading slash, the current link template is 'path/to/apple'
    */
   public function testProcessDefinition() {
     $apple = $this->prophesize(EntityTypeInterface::class);
@@ -325,6 +323,7 @@ class EntityTypeManagerTest extends UnitTestCase {
     $apple->getLinkTemplates()->willReturn(['canonical' => 'path/to/apple']);
 
     $definition = $apple->reveal();
+    $this->setExpectedException(InvalidLinkTemplateException::class, "Link template 'canonical' for entity type 'apple' must start with a leading slash, the current link template is 'path/to/apple'");
     $this->entityTypeManager->processDefinition($definition, 'apple');
   }
 
@@ -370,13 +369,11 @@ class EntityTypeManagerTest extends UnitTestCase {
    * Tests the getDefinition() method with an invalid definition.
    *
    * @covers ::getDefinition
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginNotFoundException
-   * @expectedExceptionMessage The "pear" entity type does not exist.
    */
   public function testGetDefinitionInvalidException() {
     $this->setUpEntityTypeDefinitions();
 
+    $this->setExpectedException(PluginNotFoundException::class, 'The "pear" entity type does not exist.');
     $this->entityTypeManager->getDefinition('pear', TRUE);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php
index 3761e0d83..5b3729121 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php
@@ -7,6 +7,8 @@ use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\EntityTypeRepository;
+use Drupal\Core\Entity\Exception\AmbiguousEntityClassException;
+use Drupal\Core\Entity\Exception\NoCorrespondingEntityClassException;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
 
@@ -130,9 +132,6 @@ class EntityTypeRepositoryTest extends UnitTestCase {
 
   /**
    * @covers ::getEntityTypeFromClass
-   *
-   * @expectedException \Drupal\Core\Entity\Exception\NoCorrespondingEntityClassException
-   * @expectedExceptionMessage The \Drupal\pear\Entity\Pear class does not correspond to an entity type.
    */
   public function testGetEntityTypeFromClassNoMatch() {
     $apple = $this->prophesize(EntityTypeInterface::class);
@@ -146,14 +145,12 @@ class EntityTypeRepositoryTest extends UnitTestCase {
     $apple->getOriginalClass()->willReturn('\Drupal\apple\Entity\Apple');
     $banana->getOriginalClass()->willReturn('\Drupal\banana\Entity\Banana');
 
+    $this->setExpectedException(NoCorrespondingEntityClassException::class, 'The \Drupal\pear\Entity\Pear class does not correspond to an entity type.');
     $this->entityTypeRepository->getEntityTypeFromClass('\Drupal\pear\Entity\Pear');
   }
 
   /**
    * @covers ::getEntityTypeFromClass
-   *
-   * @expectedException \Drupal\Core\Entity\Exception\AmbiguousEntityClassException
-   * @expectedExceptionMessage Multiple entity types found for \Drupal\apple\Entity\Apple.
    */
   public function testGetEntityTypeFromClassAmbiguous() {
     $boskoop = $this->prophesize(EntityTypeInterface::class);
@@ -169,6 +166,7 @@ class EntityTypeRepositoryTest extends UnitTestCase {
       'gala' => $gala,
     ]);
 
+    $this->setExpectedException(AmbiguousEntityClassException::class, 'Multiple entity types found for \Drupal\apple\Entity\Apple.');
     $this->entityTypeRepository->getEntityTypeFromClass('\Drupal\apple\Entity\Apple');
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
index d633afc95..d1045f5ff 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
@@ -22,9 +22,9 @@ class EntityTypeTest extends UnitTestCase {
    * @return \Drupal\Core\Entity\EntityTypeInterface
    */
   protected function setUpEntityType($definition) {
-    $definition += array(
+    $definition += [
       'id' => 'example_entity_type',
-    );
+    ];
     return new EntityType($definition);
   }
 
@@ -57,7 +57,7 @@ class EntityTypeTest extends UnitTestCase {
    * @dataProvider providerTestGetKeys
    */
   public function testGetKeys($entity_keys, $expected) {
-    $entity_type = $this->setUpEntityType(array('entity_keys' => $entity_keys));
+    $entity_type = $this->setUpEntityType(['entity_keys' => $entity_keys]);
     $this->assertSame($expected + ['default_langcode' => 'default_langcode'], $entity_type->getKeys());
   }
 
@@ -67,7 +67,7 @@ class EntityTypeTest extends UnitTestCase {
    * @dataProvider providerTestGetKeys
    */
   public function testGetKey($entity_keys, $expected) {
-    $entity_type = $this->setUpEntityType(array('entity_keys' => $entity_keys));
+    $entity_type = $this->setUpEntityType(['entity_keys' => $entity_keys]);
     $this->assertSame($expected['bundle'], $entity_type->getKey('bundle'));
     $this->assertSame(FALSE, $entity_type->getKey('bananas'));
   }
@@ -78,7 +78,7 @@ class EntityTypeTest extends UnitTestCase {
    * @dataProvider providerTestGetKeys
    */
   public function testHasKey($entity_keys, $expected) {
-    $entity_type = $this->setUpEntityType(array('entity_keys' => $entity_keys));
+    $entity_type = $this->setUpEntityType(['entity_keys' => $entity_keys]);
     $this->assertSame(!empty($expected['bundle']), $entity_type->hasKey('bundle'));
     $this->assertSame(!empty($expected['id']), $entity_type->hasKey('id'));
     $this->assertSame(FALSE, $entity_type->hasKey('bananas'));
@@ -116,22 +116,22 @@ class EntityTypeTest extends UnitTestCase {
    * Provides test data.
    */
   public function providerTestGetKeys() {
-    return array(
-      array(array(), array('revision' => '', 'bundle' => '', 'langcode' => '')),
-      array(array('id' => 'id'), array('id' => 'id', 'revision' => '', 'bundle' => '', 'langcode' => '')),
-      array(array('bundle' => 'bundle'), array('bundle' => 'bundle', 'revision' => '', 'langcode' => '')),
-    );
+    return [
+      [[], ['revision' => '', 'bundle' => '', 'langcode' => '']],
+      [['id' => 'id'], ['id' => 'id', 'revision' => '', 'bundle' => '', 'langcode' => '']],
+      [['bundle' => 'bundle'], ['bundle' => 'bundle', 'revision' => '', 'langcode' => '']],
+    ];
   }
 
   /**
    * Tests the isRevisionable() method.
    */
   public function testIsRevisionable() {
-    $entity_type = $this->setUpEntityType(array('entity_keys' => array('id' => 'id')));
+    $entity_type = $this->setUpEntityType(['entity_keys' => ['id' => 'id']]);
     $this->assertFalse($entity_type->isRevisionable());
-    $entity_type = $this->setUpEntityType(array('entity_keys' => array('id' => 'id', 'revision' => FALSE)));
+    $entity_type = $this->setUpEntityType(['entity_keys' => ['id' => 'id', 'revision' => FALSE]]);
     $this->assertFalse($entity_type->isRevisionable());
-    $entity_type = $this->setUpEntityType(array('entity_keys' => array('id' => 'id', 'revision' => TRUE)));
+    $entity_type = $this->setUpEntityType(['entity_keys' => ['id' => 'id', 'revision' => TRUE]]);
     $this->assertTrue($entity_type->isRevisionable());
   }
 
@@ -140,14 +140,14 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testGetHandler() {
     $controller = $this->getTestHandlerClass();
-    $entity_type = $this->setUpEntityType(array(
-      'handlers' => array(
+    $entity_type = $this->setUpEntityType([
+      'handlers' => [
         'storage' => $controller,
-        'form' => array(
+        'form' => [
           'default' => $controller,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     $this->assertSame($controller, $entity_type->getHandlerClass('storage'));
     $this->assertSame($controller, $entity_type->getHandlerClass('form', 'default'));
   }
@@ -157,11 +157,11 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testGetStorageClass() {
     $controller = $this->getTestHandlerClass();
-    $entity_type = $this->setUpEntityType(array(
-      'handlers' => array(
+    $entity_type = $this->setUpEntityType([
+      'handlers' => [
         'storage' => $controller,
-      ),
-    ));
+      ],
+    ]);
     $this->assertSame($controller, $entity_type->getStorageClass());
   }
 
@@ -170,7 +170,7 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testSetStorageClass() {
     $controller = $this->getTestHandlerClass();
-    $entity_type = $this->setUpEntityType(array());
+    $entity_type = $this->setUpEntityType([]);
     $this->assertSame($entity_type, $entity_type->setStorageClass($controller));
   }
 
@@ -179,11 +179,11 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testGetListBuilderClass() {
     $controller = $this->getTestHandlerClass();
-    $entity_type = $this->setUpEntityType(array(
-      'handlers' => array(
+    $entity_type = $this->setUpEntityType([
+      'handlers' => [
         'list_builder' => $controller,
-      ),
-    ));
+      ],
+    ]);
     $this->assertSame($controller, $entity_type->getListBuilderClass());
   }
 
@@ -192,11 +192,11 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testGetAccessControlClass() {
     $controller = $this->getTestHandlerClass();
-    $entity_type = $this->setUpEntityType(array(
-      'handlers' => array(
+    $entity_type = $this->setUpEntityType([
+      'handlers' => [
         'access' => $controller,
-      ),
-    ));
+      ],
+    ]);
     $this->assertSame($controller, $entity_type->getAccessControlClass());
   }
 
@@ -206,13 +206,13 @@ class EntityTypeTest extends UnitTestCase {
   public function testGetFormClass() {
     $controller = $this->getTestHandlerClass();
     $operation = 'default';
-    $entity_type = $this->setUpEntityType(array(
-      'handlers' => array(
-        'form' => array(
+    $entity_type = $this->setUpEntityType([
+      'handlers' => [
+        'form' => [
           $operation => $controller,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     $this->assertSame($controller, $entity_type->getFormClass($operation));
   }
 
@@ -222,16 +222,16 @@ class EntityTypeTest extends UnitTestCase {
   public function testHasFormClasses() {
     $controller = $this->getTestHandlerClass();
     $operation = 'default';
-    $entity_type1 = $this->setUpEntityType(array(
-      'handlers' => array(
-        'form' => array(
+    $entity_type1 = $this->setUpEntityType([
+      'handlers' => [
+        'form' => [
           $operation => $controller,
-        ),
-      ),
-    ));
-    $entity_type2 = $this->setUpEntityType(array(
-      'handlers' => array(),
-    ));
+        ],
+      ],
+    ]);
+    $entity_type2 = $this->setUpEntityType([
+      'handlers' => [],
+    ]);
     $this->assertTrue($entity_type1->hasFormClasses());
     $this->assertFalse($entity_type2->hasFormClasses());
   }
@@ -241,11 +241,11 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testGetViewBuilderClass() {
     $controller = $this->getTestHandlerClass();
-    $entity_type = $this->setUpEntityType(array(
-      'handlers' => array(
+    $entity_type = $this->setUpEntityType([
+      'handlers' => [
         'view_builder' => $controller,
-      ),
-    ));
+      ],
+    ]);
     $this->assertSame($controller, $entity_type->getViewBuilderClass());
   }
 
@@ -256,7 +256,7 @@ class EntityTypeTest extends UnitTestCase {
     $id = $this->randomMachineName(33);
     $message = 'Attempt to create an entity type with an ID longer than 32 characters: ' . $id;
     $this->setExpectedException('Drupal\Core\Entity\Exception\EntityTypeIdLengthException', $message);
-    $this->setUpEntityType(array('id' => $id));
+    $this->setUpEntityType(['id' => $id]);
   }
 
   /**
@@ -264,7 +264,7 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testgetOriginalClassUnchanged() {
     $class = $this->randomMachineName();
-    $entity_type = $this->setUpEntityType(array('class' => $class));
+    $entity_type = $this->setUpEntityType(['class' => $class]);
     $this->assertEquals($class, $entity_type->getOriginalClass());
   }
 
@@ -274,7 +274,7 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testgetOriginalClassChanged() {
     $class = $this->randomMachineName();
-    $entity_type = $this->setUpEntityType(array('class' => $class));
+    $entity_type = $this->setUpEntityType(['class' => $class]);
     $entity_type->setClass($this->randomMachineName());
     $this->assertEquals($class, $entity_type->getOriginalClass());
   }
@@ -284,7 +284,7 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testId() {
     $id = $this->randomMachineName(32);
-    $entity_type = $this->setUpEntityType(array('id' => $id));
+    $entity_type = $this->setUpEntityType(['id' => $id]);
     $this->assertEquals($id, $entity_type->id());
   }
 
@@ -293,11 +293,11 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testGetLabel() {
     $translatable_label = new TranslatableMarkup($this->randomMachineName());
-    $entity_type = $this->setUpEntityType(array('label' => $translatable_label));
+    $entity_type = $this->setUpEntityType(['label' => $translatable_label]);
     $this->assertSame($translatable_label, $entity_type->getLabel());
 
     $label = $this->randomMachineName();
-    $entity_type = $this->setUpEntityType(array('label' => $label));
+    $entity_type = $this->setUpEntityType(['label' => $label]);
     $this->assertSame($label, $entity_type->getLabel());
   }
 
@@ -306,18 +306,28 @@ class EntityTypeTest extends UnitTestCase {
    */
   public function testGetGroupLabel() {
     $translatable_group_label = new TranslatableMarkup($this->randomMachineName());
-    $entity_type = $this->setUpEntityType(array('group_label' => $translatable_group_label));
+    $entity_type = $this->setUpEntityType(['group_label' => $translatable_group_label]);
     $this->assertSame($translatable_group_label, $entity_type->getGroupLabel());
 
     $default_label = $this->randomMachineName();
-    $entity_type = $this->setUpEntityType(array('group_label' => $default_label));
+    $entity_type = $this->setUpEntityType(['group_label' => $default_label]);
     $this->assertSame($default_label, $entity_type->getGroupLabel());
 
-    $default_label = new TranslatableMarkup('Other', array(), array('context' => 'Entity type group'));
-    $entity_type = $this->setUpEntityType(array('group_label' => $default_label));
+    $default_label = new TranslatableMarkup('Other', [], ['context' => 'Entity type group']);
+    $entity_type = $this->setUpEntityType(['group_label' => $default_label]);
     $this->assertSame($default_label, $entity_type->getGroupLabel());
   }
 
+  /**
+   * @covers ::getCollectionLabel
+   */
+  public function testGetCollectionLabel() {
+    $translatable_label = new TranslatableMarkup('Entity test collection', [], [], $this->getStringTranslationStub());
+    $entity_type = $this->setUpEntityType(['label_collection' => $translatable_label]);
+    $entity_type->setStringTranslation($this->getStringTranslationStub());
+    $this->assertEquals('Entity test collection', $entity_type->getCollectionLabel());
+  }
+
   /**
    * @covers ::getSingularLabel
    */
@@ -390,11 +400,10 @@ class EntityTypeTest extends UnitTestCase {
 
   /**
    * @covers ::setLinkTemplate
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testSetLinkTemplateWithInvalidPath() {
     $entity_type = $this->setUpEntityType(['id' => $this->randomMachineName()]);
+    $this->setExpectedException(\InvalidArgumentException::class);
     $entity_type->setLinkTemplate('test', 'invalid-path');
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
index f150e4fea..ad9e49c61 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
@@ -82,17 +82,17 @@ class EntityUnitTest extends UnitTestCase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->values = array(
+    $this->values = [
       'id' => 1,
       'langcode' => 'en',
       'uuid' => '3bb9ee60-bea5-4622-b89b-a63319d10b3a',
-    );
+    ];
     $this->entityTypeId = $this->randomMachineName();
 
     $this->entityType = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getListCacheTags')
-      ->willReturn(array($this->entityTypeId . '_list'));
+      ->willReturn([$this->entityTypeId . '_list']);
 
     $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
     $this->entityManager->expects($this->any())
@@ -106,7 +106,7 @@ class EntityUnitTest extends UnitTestCase {
     $this->languageManager->expects($this->any())
       ->method('getLanguage')
       ->with('en')
-      ->will($this->returnValue(new Language(array('id' => 'en'))));
+      ->will($this->returnValue(new Language(['id' => 'en'])));
 
     $this->cacheTagsInvalidator = $this->getMock('Drupal\Core\Cache\CacheTagsInvalidator');
 
@@ -117,7 +117,7 @@ class EntityUnitTest extends UnitTestCase {
     $container->set('cache_tags.invalidator', $this->cacheTagsInvalidator);
     \Drupal::setContainer($container);
 
-    $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Entity\Entity', array($this->values, $this->entityTypeId));
+    $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Entity\Entity', [$this->values, $this->entityTypeId]);
   }
 
   /**
@@ -175,7 +175,7 @@ class EntityUnitTest extends UnitTestCase {
       ->will($this->returnValue($callback_label));
     $this->entityType->expects($this->at(0))
       ->method('getLabelCallback')
-      ->will($this->returnValue(array($callback_container, __FUNCTION__)));
+      ->will($this->returnValue([$callback_container, __FUNCTION__]));
     $this->entityType->expects($this->at(1))
       ->method('getLabelCallback')
       ->will($this->returnValue(NULL));
@@ -189,11 +189,11 @@ class EntityUnitTest extends UnitTestCase {
     $this->entityManager->expects($this->at(1))
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue(array(
-        'entity_keys' => array(
+      ->will($this->returnValue([
+        'entity_keys' => [
           'label' => 'label',
-        ),
-      )));
+        ],
+      ]));
     $this->entity->label = $property_label;
 
     $this->assertSame($callback_label, $this->entity->label());
@@ -226,16 +226,16 @@ class EntityUnitTest extends UnitTestCase {
   public function testLanguage() {
     $this->entityType->expects($this->any())
       ->method('getKey')
-      ->will($this->returnValueMap(array(
-        array('langcode', 'langcode'),
-      )));
+      ->will($this->returnValueMap([
+        ['langcode', 'langcode'],
+      ]));
     $this->assertSame('en', $this->entity->language()->getId());
   }
 
   /**
    * Setup for the tests of the ::load() method.
    */
-  function setupTestLoad() {
+  public function setupTestLoad() {
     // Base our mocked entity on a real entity class so we can test if calling
     // Entity::load() on the base class will bubble up to an actual entity.
     $this->entityTypeId = 'entity_test_mul';
@@ -298,8 +298,8 @@ class EntityUnitTest extends UnitTestCase {
     $storage = $this->getMock('\Drupal\Core\Entity\EntityStorageInterface');
     $storage->expects($this->once())
       ->method('loadMultiple')
-      ->with(array(1))
-      ->will($this->returnValue(array(1 => $this->entity)));
+      ->with([1])
+      ->will($this->returnValue([1 => $this->entity]));
     $this->entityManager->expects($this->once())
       ->method('getStorage')
       ->with($this->entityTypeId)
@@ -307,7 +307,7 @@ class EntityUnitTest extends UnitTestCase {
 
     // Call Entity::loadMultiple statically and check that it returns the mock
     // entity.
-    $this->assertSame(array(1 => $this->entity), $class_name::loadMultiple(array(1)));
+    $this->assertSame([1 => $this->entity], $class_name::loadMultiple([1]));
   }
 
   /**
@@ -325,7 +325,7 @@ class EntityUnitTest extends UnitTestCase {
     $storage = $this->getMock('\Drupal\Core\Entity\EntityStorageInterface');
     $storage->expects($this->once())
       ->method('create')
-      ->with(array())
+      ->with([])
       ->will($this->returnValue($this->entity));
     $this->entityManager->expects($this->once())
       ->method('getStorage')
@@ -334,7 +334,7 @@ class EntityUnitTest extends UnitTestCase {
 
     // Call Entity::create() statically and check that it returns the mock
     // entity.
-    $this->assertSame($this->entity, $class_name::create(array()));
+    $this->assertSame($this->entity, $class_name::create([]));
   }
 
   /**
@@ -391,15 +391,15 @@ class EntityUnitTest extends UnitTestCase {
   public function testPostSave() {
     $this->cacheTagsInvalidator->expects($this->at(0))
       ->method('invalidateTags')
-      ->with(array(
+      ->with([
         $this->entityTypeId . '_list', // List cache tag.
-      ));
+      ]);
     $this->cacheTagsInvalidator->expects($this->at(1))
       ->method('invalidateTags')
-      ->with(array(
+      ->with([
         $this->entityTypeId . ':' . $this->values['id'], // Own cache tag.
         $this->entityTypeId . '_list', // List cache tag.
-      ));
+      ]);
 
     // This method is internal, so check for errors on calling it only.
     $storage = $this->getMock('\Drupal\Core\Entity\EntityStorageInterface');
@@ -417,7 +417,7 @@ class EntityUnitTest extends UnitTestCase {
   public function testPreCreate() {
     // This method is internal, so check for errors on calling it only.
     $storage = $this->getMock('\Drupal\Core\Entity\EntityStorageInterface');
-    $values = array();
+    $values = [];
     // Our mocked entity->preCreate() returns NULL, so assert that.
     $this->assertNull($this->entity->preCreate($storage, $values));
   }
@@ -439,7 +439,7 @@ class EntityUnitTest extends UnitTestCase {
     // This method is internal, so check for errors on calling it only.
     $storage = $this->getMock('\Drupal\Core\Entity\EntityStorageInterface');
     // Our mocked entity->preDelete() returns NULL, so assert that.
-    $this->assertNull($this->entity->preDelete($storage, array($this->entity)));
+    $this->assertNull($this->entity->preDelete($storage, [$this->entity]));
   }
 
   /**
@@ -448,16 +448,16 @@ class EntityUnitTest extends UnitTestCase {
   public function testPostDelete() {
     $this->cacheTagsInvalidator->expects($this->once())
       ->method('invalidateTags')
-      ->with(array(
+      ->with([
         $this->entityTypeId . ':' . $this->values['id'],
         $this->entityTypeId . '_list',
-      ));
+      ]);
     $storage = $this->getMock('\Drupal\Core\Entity\EntityStorageInterface');
     $storage->expects($this->once())
       ->method('getEntityType')
       ->willReturn($this->entityType);
 
-    $entities = array($this->values['id'] => $this->entity);
+    $entities = [$this->values['id'] => $this->entity];
     $this->entity->postDelete($storage, $entities);
   }
 
@@ -467,7 +467,7 @@ class EntityUnitTest extends UnitTestCase {
   public function testPostLoad() {
     // This method is internal, so check for errors on calling it only.
     $storage = $this->getMock('\Drupal\Core\Entity\EntityStorageInterface');
-    $entities = array($this->entity);
+    $entities = [$this->entity];
     // Our mocked entity->postLoad() returns NULL, so assert that.
     $this->assertNull($this->entity->postLoad($storage, $entities));
   }
@@ -476,7 +476,7 @@ class EntityUnitTest extends UnitTestCase {
    * @covers ::referencedEntities
    */
   public function testReferencedEntities() {
-    $this->assertSame(array(), $this->entity->referencedEntities());
+    $this->assertSame([], $this->entity->referencedEntities());
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php b/web/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
index 4fbdba396..6f20444a7 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
@@ -5,6 +5,8 @@ namespace Drupal\Tests\Core\Entity\KeyValueStore;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityMalformedException;
+use Drupal\Core\Entity\EntityStorageException;
 use Drupal\Core\Language\Language;
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Entity\KeyValueStore\KeyValueEntityStorage;
@@ -88,17 +90,17 @@ class KeyValueEntityStorageTest extends UnitTestCase {
   protected function setUpKeyValueEntityStorage($uuid_key = 'uuid') {
     $this->entityType->expects($this->atLeastOnce())
       ->method('getKey')
-      ->will($this->returnValueMap(array(
-        array('id', 'id'),
-        array('uuid', $uuid_key),
-        array('langcode', 'langcode'),
-      )));
+      ->will($this->returnValueMap([
+        ['id', 'id'],
+        ['uuid', $uuid_key],
+        ['langcode', 'langcode'],
+      ]));
     $this->entityType->expects($this->atLeastOnce())
       ->method('id')
       ->will($this->returnValue('test_entity_type'));
     $this->entityType->expects($this->any())
       ->method('getListCacheTags')
-      ->willReturn(array('test_entity_type_list'));
+      ->willReturn(['test_entity_type_list']);
 
     $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
     $this->entityManager->expects($this->any())
@@ -112,7 +114,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $this->uuidService = $this->getMock('Drupal\Component\Uuid\UuidInterface');
     $this->languageManager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
-    $language = new Language(array('langcode' => 'en'));
+    $language = new Language(['langcode' => 'en']);
     $this->languageManager->expects($this->any())
       ->method('getDefaultLanguage')
       ->will($this->returnValue($language));
@@ -149,7 +151,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
     $this->uuidService->expects($this->never())
       ->method('generate');
 
-    $entity = $this->entityStorage->create(array('id' => 'foo', 'uuid' => 'baz'));
+    $entity = $this->entityStorage->create(['id' => 'foo', 'uuid' => 'baz']);
     $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
     $this->assertSame('foo', $entity->id());
     $this->assertSame('baz', $entity->uuid());
@@ -175,7 +177,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
     $this->uuidService->expects($this->never())
       ->method('generate');
 
-    $entity = $this->entityStorage->create(array('id' => 'foo', 'uuid' => 'baz'));
+    $entity = $this->entityStorage->create(['id' => 'foo', 'uuid' => 'baz']);
     $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
     $this->assertSame('foo', $entity->id());
     $this->assertSame('baz', $entity->uuid());
@@ -188,7 +190,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
    * @return \Drupal\Core\Entity\EntityInterface
    */
   public function testCreate() {
-    $entity = $this->getMockEntity('Drupal\Core\Entity\Entity', array(), array('toArray'));
+    $entity = $this->getMockEntity('Drupal\Core\Entity\Entity', [], ['toArray']);
     $this->entityType->expects($this->once())
       ->method('getClass')
       ->will($this->returnValue(get_class($entity)));
@@ -204,7 +206,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
       ->method('generate')
       ->will($this->returnValue('bar'));
 
-    $entity = $this->entityStorage->create(array('id' => 'foo'));
+    $entity = $this->entityStorage->create(['id' => 'foo']);
     $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
     $this->assertSame('foo', $entity->id());
     $this->assertSame('bar', $entity->uuid());
@@ -227,7 +229,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
       ->will($this->returnValue(get_class($entity)));
     $this->setUpKeyValueEntityStorage();
 
-    $expected = array('id' => 'foo');
+    $expected = ['id' => 'foo'];
     $this->keyValueStore->expects($this->exactly(2))
       ->method('has')
       ->with('foo')
@@ -277,26 +279,26 @@ class KeyValueEntityStorageTest extends UnitTestCase {
       ->will($this->returnValue(get_class($entity)));
     $this->setUpKeyValueEntityStorage();
 
-    $expected = array('id' => 'foo');
+    $expected = ['id' => 'foo'];
     $this->keyValueStore->expects($this->exactly(2))
       ->method('has')
       ->with('foo')
       ->will($this->returnValue(TRUE));
     $this->keyValueStore->expects($this->once())
       ->method('getMultiple')
-      ->with(array('foo'))
-      ->will($this->returnValue(array(array('id' => 'foo'))));
+      ->with(['foo'])
+      ->will($this->returnValue([['id' => 'foo']]));
     $this->keyValueStore->expects($this->never())
       ->method('delete');
 
     $this->moduleHandler->expects($this->at(0))
       ->method('getImplementations')
       ->with('entity_load')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->moduleHandler->expects($this->at(1))
       ->method('getImplementations')
       ->with('test_entity_type_load')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->moduleHandler->expects($this->at(2))
       ->method('invokeAll')
       ->with('test_entity_type_presave');
@@ -324,15 +326,15 @@ class KeyValueEntityStorageTest extends UnitTestCase {
   public function testSaveConfigEntity() {
     $this->setUpKeyValueEntityStorage();
 
-    $entity = $this->getMockEntity('Drupal\Core\Config\Entity\ConfigEntityBase', array(array('id' => 'foo')), array(
+    $entity = $this->getMockEntity('Drupal\Core\Config\Entity\ConfigEntityBase', [['id' => 'foo']], [
       'toArray',
       'preSave',
-    ));
+    ]);
     $entity->enforceIsNew();
     // When creating a new entity, the ID is tracked as the original ID.
     $this->assertSame('foo', $entity->getOriginalId());
 
-    $expected = array('id' => 'foo');
+    $expected = ['id' => 'foo'];
     $entity->expects($this->once())
       ->method('toArray')
       ->will($this->returnValue($expected));
@@ -367,12 +369,12 @@ class KeyValueEntityStorageTest extends UnitTestCase {
     $this->moduleHandler->expects($this->at(0))
       ->method('getImplementations')
       ->with('entity_load')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->moduleHandler->expects($this->at(1))
       ->method('getImplementations')
       ->with('test_entity_type_load')
-      ->will($this->returnValue(array()));
-    $expected = array('id' => 'foo');
+      ->will($this->returnValue([]));
+    $expected = ['id' => 'foo'];
     $entity->expects($this->once())
       ->method('toArray')
       ->will($this->returnValue($expected));
@@ -382,8 +384,8 @@ class KeyValueEntityStorageTest extends UnitTestCase {
       ->will($this->returnValue(TRUE));
     $this->keyValueStore->expects($this->once())
       ->method('getMultiple')
-      ->with(array('foo'))
-      ->will($this->returnValue(array(array('id' => 'foo'))));
+      ->with(['foo'])
+      ->will($this->returnValue([['id' => 'foo']]));
     $this->keyValueStore->expects($this->once())
       ->method('delete')
       ->with('foo');
@@ -408,12 +410,12 @@ class KeyValueEntityStorageTest extends UnitTestCase {
   public function testSaveContentEntity() {
     $this->entityType->expects($this->any())
       ->method('getKeys')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         'id' => 'id',
-      )));
+      ]));
     $this->setUpKeyValueEntityStorage();
 
-    $expected = array('id' => 'foo');
+    $expected = ['id' => 'foo'];
     $this->keyValueStore->expects($this->exactly(2))
       ->method('has')
       ->with('foo')
@@ -423,10 +425,10 @@ class KeyValueEntityStorageTest extends UnitTestCase {
       ->with('foo', $expected);
     $this->keyValueStore->expects($this->never())
       ->method('delete');
-    $entity = $this->getMockEntity('Drupal\Core\Entity\ContentEntityBase', array(), array(
+    $entity = $this->getMockEntity('Drupal\Core\Entity\ContentEntityBase', [], [
       'toArray',
       'id',
-    ));
+    ]);
     $entity->expects($this->atLeastOnce())
       ->method('id')
       ->will($this->returnValue('foo'));
@@ -439,34 +441,29 @@ class KeyValueEntityStorageTest extends UnitTestCase {
   /**
    * @covers ::save
    * @covers ::doSave
-   *
-   * @expectedException \Drupal\Core\Entity\EntityMalformedException
-   * @expectedExceptionMessage The entity does not have an ID.
    */
   public function testSaveInvalid() {
     $this->setUpKeyValueEntityStorage();
 
     $entity = $this->getMockEntity('Drupal\Core\Config\Entity\ConfigEntityBase');
-    $this->entityStorage->save($entity);
     $this->keyValueStore->expects($this->never())
       ->method('has');
     $this->keyValueStore->expects($this->never())
       ->method('set');
     $this->keyValueStore->expects($this->never())
       ->method('delete');
+    $this->setExpectedException(EntityMalformedException::class, 'The entity does not have an ID.');
+    $this->entityStorage->save($entity);
   }
 
   /**
    * @covers ::save
    * @covers ::doSave
-   *
-   * @expectedException \Drupal\Core\Entity\EntityStorageException
-   * @expectedExceptionMessage 'test_entity_type' entity with ID 'foo' already exists
    */
   public function testSaveDuplicate() {
     $this->setUpKeyValueEntityStorage();
 
-    $entity = $this->getMockEntity('Drupal\Core\Entity\Entity', array(array('id' => 'foo')));
+    $entity = $this->getMockEntity('Drupal\Core\Entity\Entity', [['id' => 'foo']]);
     $entity->enforceIsNew();
     $this->keyValueStore->expects($this->once())
       ->method('has')
@@ -475,6 +472,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
       ->method('set');
     $this->keyValueStore->expects($this->never())
       ->method('delete');
+    $this->setExpectedException(EntityStorageException::class, "'test_entity_type' entity with ID 'foo' already exists");
     $this->entityStorage->save($entity);
   }
 
@@ -491,16 +489,16 @@ class KeyValueEntityStorageTest extends UnitTestCase {
 
     $this->keyValueStore->expects($this->once())
       ->method('getMultiple')
-      ->with(array('foo'))
-      ->will($this->returnValue(array(array('id' => 'foo'))));
+      ->with(['foo'])
+      ->will($this->returnValue([['id' => 'foo']]));
     $this->moduleHandler->expects($this->at(0))
       ->method('getImplementations')
       ->with('entity_load')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->moduleHandler->expects($this->at(1))
       ->method('getImplementations')
       ->with('test_entity_type_load')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $entity = $this->entityStorage->load('foo');
     $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
     $this->assertSame('foo', $entity->id());
@@ -516,8 +514,8 @@ class KeyValueEntityStorageTest extends UnitTestCase {
 
     $this->keyValueStore->expects($this->once())
       ->method('getMultiple')
-      ->with(array('foo'))
-      ->will($this->returnValue(array()));
+      ->with(['foo'])
+      ->will($this->returnValue([]));
     $this->moduleHandler->expects($this->never())
       ->method('getImplementations');
     $entity = $this->entityStorage->load('foo');
@@ -531,8 +529,8 @@ class KeyValueEntityStorageTest extends UnitTestCase {
    * @covers ::doLoadMultiple
    */
   public function testLoadMultipleAll() {
-    $expected['foo'] = $this->getMockEntity('Drupal\Core\Entity\Entity', array(array('id' => 'foo')));
-    $expected['bar'] = $this->getMockEntity('Drupal\Core\Entity\Entity', array(array('id' => 'bar')));
+    $expected['foo'] = $this->getMockEntity('Drupal\Core\Entity\Entity', [['id' => 'foo']]);
+    $expected['bar'] = $this->getMockEntity('Drupal\Core\Entity\Entity', [['id' => 'bar']]);
     $this->entityType->expects($this->once())
       ->method('getClass')
       ->will($this->returnValue(get_class(reset($expected))));
@@ -540,15 +538,15 @@ class KeyValueEntityStorageTest extends UnitTestCase {
 
     $this->keyValueStore->expects($this->once())
       ->method('getAll')
-      ->will($this->returnValue(array(array('id' => 'foo'), array('id' => 'bar'))));
+      ->will($this->returnValue([['id' => 'foo'], ['id' => 'bar']]));
     $this->moduleHandler->expects($this->at(0))
       ->method('getImplementations')
       ->with('entity_load')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->moduleHandler->expects($this->at(1))
       ->method('getImplementations')
       ->with('test_entity_type_load')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $entities = $this->entityStorage->loadMultiple();
     foreach ($entities as $id => $entity) {
       $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
@@ -564,7 +562,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
    * @covers ::doLoadMultiple
    */
   public function testLoadMultipleIds() {
-    $entity = $this->getMockEntity('Drupal\Core\Entity\Entity', array(array('id' => 'foo')));
+    $entity = $this->getMockEntity('Drupal\Core\Entity\Entity', [['id' => 'foo']]);
     $this->entityType->expects($this->once())
       ->method('getClass')
       ->will($this->returnValue(get_class($entity)));
@@ -573,17 +571,17 @@ class KeyValueEntityStorageTest extends UnitTestCase {
     $expected[] = $entity;
     $this->keyValueStore->expects($this->once())
       ->method('getMultiple')
-      ->with(array('foo'))
-      ->will($this->returnValue(array(array('id' => 'foo'))));
+      ->with(['foo'])
+      ->will($this->returnValue([['id' => 'foo']]));
     $this->moduleHandler->expects($this->at(0))
       ->method('getImplementations')
       ->with('entity_load')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->moduleHandler->expects($this->at(1))
       ->method('getImplementations')
       ->with('test_entity_type_load')
-      ->will($this->returnValue(array()));
-    $entities = $this->entityStorage->loadMultiple(array('foo'));
+      ->will($this->returnValue([]));
+    $entities = $this->entityStorage->loadMultiple(['foo']);
     foreach ($entities as $id => $entity) {
       $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
       $this->assertSame($id, $entity->id());
@@ -613,8 +611,8 @@ class KeyValueEntityStorageTest extends UnitTestCase {
    * @covers ::doDelete
    */
   public function testDelete() {
-    $entities['foo'] = $this->getMockEntity('Drupal\Core\Entity\Entity', array(array('id' => 'foo')));
-    $entities['bar'] = $this->getMockEntity('Drupal\Core\Entity\Entity', array(array('id' => 'bar')));
+    $entities['foo'] = $this->getMockEntity('Drupal\Core\Entity\Entity', [['id' => 'foo']]);
+    $entities['bar'] = $this->getMockEntity('Drupal\Core\Entity\Entity', [['id' => 'bar']]);
     $this->entityType->expects($this->once())
       ->method('getClass')
       ->will($this->returnValue(get_class(reset($entities))));
@@ -647,7 +645,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
 
     $this->keyValueStore->expects($this->once())
       ->method('deleteMultiple')
-      ->with(array('foo', 'bar'));
+      ->with(['foo', 'bar']);
     $this->entityStorage->delete($entities);
   }
 
@@ -665,7 +663,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
     $this->keyValueStore->expects($this->never())
       ->method('deleteMultiple');
 
-    $this->entityStorage->delete(array());
+    $this->entityStorage->delete([]);
   }
 
   /**
@@ -682,11 +680,11 @@ class KeyValueEntityStorageTest extends UnitTestCase {
    *
    * @return \Drupal\Core\Entity\EntityInterface|\PHPUnit_Framework_MockObject_MockObject
    */
-  public function getMockEntity($class = 'Drupal\Core\Entity\Entity', array $arguments = array(), $methods = array()) {
+  public function getMockEntity($class = 'Drupal\Core\Entity\Entity', array $arguments = [], $methods = []) {
     // Ensure the entity is passed at least an array of values and an entity
     // type ID
     if (!isset($arguments[0])) {
-      $arguments[0] = array();
+      $arguments[0] = [];
     }
     if (!isset($arguments[1])) {
       $arguments[1] = 'test_entity_type';
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Query/Sql/QueryTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Query/Sql/QueryTest.php
index 22c606d62..850e4b411 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Query/Sql/QueryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Query/Sql/QueryTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\Core\Entity\Query\Sql;
 
 use Drupal\Core\Entity\EntityType;
 use Drupal\Tests\UnitTestCase;
+use Drupal\Core\Entity\Query\QueryException;
 use Drupal\Core\Entity\Query\Sql\Query;
 
 /**
@@ -36,11 +37,9 @@ class QueryTest extends UnitTestCase {
    * Tests entity query for entity type without base table.
    *
    * @covers ::prepare
-   *
-   * @expectedException \Drupal\Core\Entity\Query\QueryException
-   * @expectedExceptionMessage No base table for example_entity_query, invalid query.
    */
   public function testNoBaseTable() {
+    $this->setExpectedException(QueryException::class, 'No base table for example_entity_query, invalid query.');
     $this->query->execute();
   }
 
@@ -48,11 +47,9 @@ class QueryTest extends UnitTestCase {
    * Tests revision entity query for entity type without revision table.
    *
    * @covers ::prepare
-   *
-   * @expectedException \Drupal\Core\Entity\Query\QueryException
-   * @expectedExceptionMessage No revision table for example_entity_query, invalid query.
    */
   public function testNoRevisionTable() {
+    $this->setExpectedException(QueryException::class, 'No revision table for example_entity_query, invalid query.');
     $this->query->allRevisions()->execute();
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php
index a6675ec06..7e853bca2 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php
@@ -14,6 +14,7 @@ use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -159,7 +160,7 @@ class DefaultHtmlRouteProviderTest extends UnitTestCase {
     $entity_type5->getBundleEntityType()->willReturn('the_bundle_entity_type_id');
     $entity_type5->getLinkTemplate('add-form')->willReturn('/the/add/form/link/template/{the_bundle_entity_type_id}');
     $bundle_entity_type = $this->getEntityType();
-    $bundle_entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
+    $bundle_entity_type->entityClassImplements(FieldableEntityInterface::class)->willReturn(FALSE);
     $route->setPath('/the/add/form/link/template/{the_bundle_entity_type_id}');
     $route
       ->setDefault('bundle_parameter', 'the_bundle_entity_type_id')
@@ -171,7 +172,7 @@ class DefaultHtmlRouteProviderTest extends UnitTestCase {
 
     $entity_type6 = $this->getEntityType($entity_type5);
     $bundle_entity_type = $this->getEntityType();
-    $bundle_entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(TRUE);
+    $bundle_entity_type->entityClassImplements(FieldableEntityInterface::class)->willReturn(TRUE);
     $field_storage_definition = $this->prophesize(FieldStorageDefinitionInterface::class);
     $field_storage_definition->getType()->willReturn('integer');
     $route->setRequirement('the_entity_type_id', '\d+');
@@ -179,7 +180,7 @@ class DefaultHtmlRouteProviderTest extends UnitTestCase {
 
     $entity_type7 = $this->getEntityType($entity_type6);
     $bundle_entity_type = $this->prophesize(ConfigEntityTypeInterface::class);
-    $bundle_entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
+    $bundle_entity_type->entityClassImplements(FieldableEntityInterface::class)->willReturn(FALSE);
     $field_storage_definition = $this->prophesize(FieldStorageDefinitionInterface::class);
     $route
       // Unset the 'the_entity_type_id' requirement.
@@ -223,7 +224,7 @@ class DefaultHtmlRouteProviderTest extends UnitTestCase {
     $entity_type3->hasViewBuilderClass()->willReturn(TRUE);
     $entity_type3->id()->willReturn('the_entity_type_id');
     $entity_type3->getLinkTemplate('canonical')->willReturn('/the/canonical/link/template');
-    $entity_type3->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
+    $entity_type3->entityClassImplements(FieldableEntityInterface::class)->willReturn(FALSE);
     $route = (new Route('/the/canonical/link/template'))
       ->setDefaults([
         '_entity_view' => 'the_entity_type_id.full',
@@ -242,7 +243,7 @@ class DefaultHtmlRouteProviderTest extends UnitTestCase {
     $data['id_key_type_null'] = [clone $route, $entity_type3->reveal()];
 
     $entity_type4 = $this->getEntityType($entity_type3);
-    $entity_type4->isSubclassOf(FieldableEntityInterface::class)->willReturn(TRUE);
+    $entity_type4->entityClassImplements(FieldableEntityInterface::class)->willReturn(TRUE);
     $entity_type4->getKey('id')->willReturn('id');
     $route->setRequirement('the_entity_type_id', '\d+');
     $field_storage_definition = $this->prophesize(FieldStorageDefinitionInterface::class);
@@ -282,13 +283,15 @@ class DefaultHtmlRouteProviderTest extends UnitTestCase {
     $entity_type4->getAdminPermission()->willReturn('administer the entity type');
     $entity_type4->id()->willReturn('the_entity_type_id');
     $entity_type4->getLabel()->willReturn('The entity type');
+    $entity_type4->getCollectionLabel()->willReturn(new TranslatableMarkup('Test entities'));
     $entity_type4->getLinkTemplate('collection')->willReturn('/the/collection/link/template');
-    $entity_type4->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
+    $entity_type4->entityClassImplements(FieldableEntityInterface::class)->willReturn(FALSE);
     $route = (new Route('/the/collection/link/template'))
       ->setDefaults([
         '_entity_list' => 'the_entity_type_id',
-        '_title' => '@label entities',
-        '_title_arguments' => ['@label' => 'The entity type'],
+        '_title' => 'Test entities',
+        '_title_arguments' => [],
+        '_title_context' => '',
       ])
       ->setRequirements([
         '_permission' => 'administer the entity type',
@@ -303,7 +306,7 @@ class DefaultHtmlRouteProviderTest extends UnitTestCase {
    */
   public function testGetEntityTypeIdKeyType() {
     $entity_type = $this->prophesize(EntityTypeInterface::class);
-    $entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(TRUE);
+    $entity_type->entityClassImplements(FieldableEntityInterface::class)->willReturn(TRUE);
     $entity_type->id()->willReturn('the_entity_type_id');
     $entity_type->getKey('id')->willReturn('id');
 
@@ -320,7 +323,7 @@ class DefaultHtmlRouteProviderTest extends UnitTestCase {
    */
   public function testGetEntityTypeIdKeyTypeNotFieldable() {
     $entity_type = $this->prophesize(EntityTypeInterface::class);
-    $entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
+    $entity_type->entityClassImplements(FieldableEntityInterface::class)->willReturn(FALSE);
     $this->entityFieldManager->getFieldStorageDefinitions(Argument::any())->shouldNotBeCalled();
 
     $type = $this->routeProvider->getEntityTypeIdKeyType($entity_type->reveal());
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
index 8ce420bdc..39c9a053c 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\Core\Entity\Sql;
 
 use Drupal\Core\Entity\Sql\DefaultTableMapping;
+use Drupal\Core\Entity\Sql\SqlContentEntityStorageException;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -294,9 +295,6 @@ class DefaultTableMappingTest extends UnitTestCase {
    * @param string $column
    *   The name of the column to be processed.
    *
-   * @expectedException \Drupal\Core\Entity\Sql\SqlContentEntityStorageException
-   * @expectedExceptionMessage Column information not available for the 'test' field.
-   *
    * @covers ::getFieldColumnName
    *
    * @dataProvider providerTestGetFieldColumnName
@@ -310,6 +308,7 @@ class DefaultTableMappingTest extends UnitTestCase {
       ->willReturn(TRUE);
 
     $table_mapping = new DefaultTableMapping($this->entityType, $definitions);
+    $this->setExpectedException(SqlContentEntityStorageException::class, "Column information not available for the 'test' field.");
     $table_mapping->getFieldColumnName($definitions['test'], $column);
   }
 
@@ -440,13 +439,11 @@ class DefaultTableMappingTest extends UnitTestCase {
   /**
    * Tests DefaultTableMapping::getFieldTableName() with an invalid parameter.
    *
-   * @expectedException \Drupal\Core\Entity\Sql\SqlContentEntityStorageException
-   * @expectedExceptionMessage Table information not available for the 'invalid_field_name' field.
-   *
    * @covers ::getFieldTableName
    */
   public function testGetFieldTableNameInvalid() {
     $table_mapping = new DefaultTableMapping($this->entityType, []);
+    $this->setExpectedException(SqlContentEntityStorageException::class, "Table information not available for the 'invalid_field_name' field.");
     $table_mapping->getFieldTableName('invalid_field_name');
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
index 1ce87c540..aecc3e436 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
@@ -70,13 +70,13 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
 
     // Add an ID field. This also acts as a test for a simple, single-column
     // field.
-    $this->setUpStorageDefinition('id', array(
-      'columns' => array(
-        'value' => array(
+    $this->setUpStorageDefinition('id', [
+      'columns' => [
+        'value' => [
           'type' => 'int',
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
   }
 
   /**
@@ -95,277 +95,277 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
    * @covers ::processIdentifierSchema
    */
   public function testGetSchemaBase() {
-    $this->entityType = new ContentEntityType(array(
+    $this->entityType = new ContentEntityType([
       'id' => 'entity_test',
-      'entity_keys' => array('id' => 'id'),
-    ));
+      'entity_keys' => ['id' => 'id'],
+    ]);
 
     // Add a field with a 'length' constraint.
-    $this->setUpStorageDefinition('name', array(
-      'columns' => array(
-        'value' => array(
+    $this->setUpStorageDefinition('name', [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
           'length' => 255,
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     // Add a multi-column field.
-    $this->setUpStorageDefinition('description', array(
-      'columns' => array(
-        'value' => array(
+    $this->setUpStorageDefinition('description', [
+      'columns' => [
+        'value' => [
           'type' => 'text',
-        ),
-        'format' => array(
+        ],
+        'format' => [
           'type' => 'varchar',
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
     // Add a field with a unique key.
-    $this->setUpStorageDefinition('uuid', array(
-      'columns' => array(
-        'value' => array(
+    $this->setUpStorageDefinition('uuid', [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
           'length' => 128,
-        ),
-      ),
-      'unique keys' => array(
-        'value' => array('value'),
-      ),
-    ));
+        ],
+      ],
+      'unique keys' => [
+        'value' => ['value'],
+      ],
+    ]);
     // Add a field with a unique key, specified as column name and length.
-    $this->setUpStorageDefinition('hash', array(
-      'columns' => array(
-        'value' => array(
+    $this->setUpStorageDefinition('hash', [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
           'length' => 20,
-        ),
-      ),
-      'unique keys' => array(
-        'value' => array(array('value', 10)),
-      ),
-    ));
+        ],
+      ],
+      'unique keys' => [
+        'value' => [['value', 10]],
+      ],
+    ]);
     // Add a field with a multi-column unique key.
-    $this->setUpStorageDefinition('email', array(
-      'columns' => array(
-        'username' => array(
+    $this->setUpStorageDefinition('email', [
+      'columns' => [
+        'username' => [
           'type' => 'varchar',
-        ),
-        'hostname' => array(
+        ],
+        'hostname' => [
           'type' => 'varchar',
-        ),
-        'domain' => array(
+        ],
+        'domain' => [
           'type' => 'varchar',
-        )
-      ),
-      'unique keys' => array(
-        'email' => array('username', 'hostname', array('domain', 3)),
-      ),
-    ));
+        ]
+      ],
+      'unique keys' => [
+        'email' => ['username', 'hostname', ['domain', 3]],
+      ],
+    ]);
     // Add a field with an index.
-    $this->setUpStorageDefinition('owner', array(
-      'columns' => array(
-        'target_id' => array(
+    $this->setUpStorageDefinition('owner', [
+      'columns' => [
+        'target_id' => [
           'type' => 'int',
-        ),
-      ),
-      'indexes' => array(
-        'target_id' => array('target_id'),
-      ),
-    ));
+        ],
+      ],
+      'indexes' => [
+        'target_id' => ['target_id'],
+      ],
+    ]);
     // Add a field with an index, specified as column name and length.
-    $this->setUpStorageDefinition('translator', array(
-      'columns' => array(
-        'target_id' => array(
+    $this->setUpStorageDefinition('translator', [
+      'columns' => [
+        'target_id' => [
           'type' => 'int',
-        ),
-      ),
-      'indexes' => array(
-        'target_id' => array(array('target_id', 10)),
-      ),
-    ));
+        ],
+      ],
+      'indexes' => [
+        'target_id' => [['target_id', 10]],
+      ],
+    ]);
     // Add a field with a multi-column index.
-    $this->setUpStorageDefinition('location', array(
-      'columns' => array(
-        'country' => array(
+    $this->setUpStorageDefinition('location', [
+      'columns' => [
+        'country' => [
           'type' => 'varchar',
-        ),
-        'state' => array(
+        ],
+        'state' => [
           'type' => 'varchar',
-        ),
-        'city' => array(
+        ],
+        'city' => [
           'type' => 'varchar',
-        )
-      ),
-      'indexes' => array(
-        'country_state_city' => array('country', 'state', array('city', 10)),
-      ),
-    ));
+        ]
+      ],
+      'indexes' => [
+        'country_state_city' => ['country', 'state', ['city', 10]],
+      ],
+    ]);
     // Add a field with a foreign key.
-    $this->setUpStorageDefinition('editor', array(
-      'columns' => array(
-        'target_id' => array(
+    $this->setUpStorageDefinition('editor', [
+      'columns' => [
+        'target_id' => [
           'type' => 'int',
-        ),
-      ),
-      'foreign keys' => array(
-        'user_id' => array(
+        ],
+      ],
+      'foreign keys' => [
+        'user_id' => [
           'table' => 'users',
-          'columns' => array('target_id' => 'uid'),
-        ),
-      ),
-    ));
+          'columns' => ['target_id' => 'uid'],
+        ],
+      ],
+    ]);
     // Add a multi-column field with a foreign key.
-    $this->setUpStorageDefinition('editor_revision', array(
-      'columns' => array(
-        'target_id' => array(
+    $this->setUpStorageDefinition('editor_revision', [
+      'columns' => [
+        'target_id' => [
           'type' => 'int',
-        ),
-        'target_revision_id' => array(
+        ],
+        'target_revision_id' => [
           'type' => 'int',
-        ),
-      ),
-      'foreign keys' => array(
-        'user_id' => array(
+        ],
+      ],
+      'foreign keys' => [
+        'user_id' => [
           'table' => 'users',
-          'columns' => array('target_id' => 'uid'),
-        ),
-      ),
-    ));
+          'columns' => ['target_id' => 'uid'],
+        ],
+      ],
+    ]);
     // Add a field with a really long index.
-    $this->setUpStorageDefinition('long_index_name', array(
-      'columns' => array(
-        'long_index_name' => array(
+    $this->setUpStorageDefinition('long_index_name', [
+      'columns' => [
+        'long_index_name' => [
           'type' => 'int',
-        ),
-      ),
-      'indexes' => array(
-        'long_index_name_really_long_long_name' => array(array('long_index_name', 10)),
-      ),
-    ));
+        ],
+      ],
+      'indexes' => [
+        'long_index_name_really_long_long_name' => [['long_index_name', 10]],
+      ],
+    ]);
 
-    $expected = array(
-      'entity_test' => array(
+    $expected = [
+      'entity_test' => [
         'description' => 'The base table for entity_test entities.',
-        'fields' => array(
-          'id' => array(
+        'fields' => [
+          'id' => [
             'type' => 'serial',
             'not null' => TRUE,
-          ),
-          'name' => array(
+          ],
+          'name' => [
             'type' => 'varchar',
             'length' => 255,
             'not null' => FALSE,
-          ),
-          'description__value' => array(
+          ],
+          'description__value' => [
             'type' => 'text',
             'not null' => FALSE,
-          ),
-          'description__format' => array(
+          ],
+          'description__format' => [
             'type' => 'varchar',
             'not null' => FALSE,
-          ),
-          'uuid' => array(
+          ],
+          'uuid' => [
             'type' => 'varchar',
             'length' => 128,
             'not null' => FALSE,
-          ),
-          'hash' => array(
+          ],
+          'hash' => [
             'type' => 'varchar',
             'length' => 20,
             'not null' => FALSE,
-          ),
-          'email__username' => array(
+          ],
+          'email__username' => [
             'type' => 'varchar',
             'not null' => FALSE,
-          ),
-          'email__hostname' => array(
+          ],
+          'email__hostname' => [
             'type' => 'varchar',
             'not null' => FALSE,
-          ),
-          'email__domain' => array(
+          ],
+          'email__domain' => [
             'type' => 'varchar',
             'not null' => FALSE,
-          ),
-          'owner' => array(
+          ],
+          'owner' => [
             'type' => 'int',
             'not null' => FALSE,
-          ),
-          'translator' => array(
+          ],
+          'translator' => [
             'type' => 'int',
             'not null' => FALSE,
-          ),
-          'location__country' => array(
+          ],
+          'location__country' => [
             'type' => 'varchar',
             'not null' => FALSE,
-          ),
-          'location__state' => array(
+          ],
+          'location__state' => [
             'type' => 'varchar',
             'not null' => FALSE,
-          ),
-          'location__city' => array(
+          ],
+          'location__city' => [
             'type' => 'varchar',
             'not null' => FALSE,
-          ),
-          'editor' => array(
+          ],
+          'editor' => [
             'type' => 'int',
             'not null' => FALSE,
-          ),
-          'editor_revision__target_id' => array(
+          ],
+          'editor_revision__target_id' => [
             'type' => 'int',
             'not null' => FALSE,
-          ),
-          'editor_revision__target_revision_id' => array(
+          ],
+          'editor_revision__target_revision_id' => [
             'type' => 'int',
             'not null' => FALSE,
-          ),
-          'long_index_name' => array(
+          ],
+          'long_index_name' => [
             'type' => 'int',
             'not null' => FALSE,
-          ),
-        ),
-        'primary key' => array('id'),
-        'unique keys' => array(
-          'entity_test_field__uuid__value' => array('uuid'),
-          'entity_test_field__hash__value' => array(array('hash', 10)),
-          'entity_test_field__email__email' => array(
+          ],
+        ],
+        'primary key' => ['id'],
+        'unique keys' => [
+          'entity_test_field__uuid__value' => ['uuid'],
+          'entity_test_field__hash__value' => [['hash', 10]],
+          'entity_test_field__email__email' => [
             'email__username',
             'email__hostname',
-            array('email__domain', 3),
-          ),
-        ),
-        'indexes' => array(
-          'entity_test_field__owner__target_id' => array('owner'),
-          'entity_test_field__translator__target_id' => array(
-            array('translator', 10),
-          ),
-          'entity_test_field__location__country_state_city' => array(
+            ['email__domain', 3],
+          ],
+        ],
+        'indexes' => [
+          'entity_test_field__owner__target_id' => ['owner'],
+          'entity_test_field__translator__target_id' => [
+            ['translator', 10],
+          ],
+          'entity_test_field__location__country_state_city' => [
             'location__country',
             'location__state',
-            array('location__city', 10),
-          ),
-          'entity_test__b588603cb9' => array(
-            array('long_index_name', 10),
-          ),
+            ['location__city', 10],
+          ],
+          'entity_test__b588603cb9' => [
+            ['long_index_name', 10],
+          ],
 
-        ),
-        'foreign keys' => array(
-          'entity_test_field__editor__user_id' => array(
+        ],
+        'foreign keys' => [
+          'entity_test_field__editor__user_id' => [
             'table' => 'users',
-            'columns' => array('editor' => 'uid'),
-          ),
-          'entity_test_field__editor_revision__user_id' => array(
+            'columns' => ['editor' => 'uid'],
+          ],
+          'entity_test_field__editor_revision__user_id' => [
             'table' => 'users',
-            'columns' => array('editor_revision__target_id' => 'uid'),
-          ),
-        ),
-      ),
-    );
+            'columns' => ['editor_revision__target_id' => 'uid'],
+          ],
+        ],
+      ],
+    ];
 
     $this->setUpStorageSchema($expected);
 
     $table_mapping = new DefaultTableMapping($this->entityType, $this->storageDefinitions);
     $table_mapping->setFieldNames('entity_test', array_keys($this->storageDefinitions));
-    $table_mapping->setExtraColumns('entity_test', array('default_langcode'));
+    $table_mapping->setExtraColumns('entity_test', ['default_langcode']);
 
     $this->storage->expects($this->any())
       ->method('getTableMapping')
@@ -389,76 +389,76 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
    * @covers ::processIdentifierSchema
    */
   public function testGetSchemaRevisionable() {
-    $this->entityType = new ContentEntityType(array(
+    $this->entityType = new ContentEntityType([
       'id' => 'entity_test',
-      'entity_keys' => array(
+      'entity_keys' => [
         'id' => 'id',
         'revision' => 'revision_id',
-      ),
-    ));
+      ],
+    ]);
 
     $this->storage->expects($this->exactly(2))
       ->method('getRevisionTable')
       ->will($this->returnValue('entity_test_revision'));
 
-    $this->setUpStorageDefinition('revision_id', array(
-      'columns' => array(
-        'value' => array(
+    $this->setUpStorageDefinition('revision_id', [
+      'columns' => [
+        'value' => [
           'type' => 'int',
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
-    $expected = array(
-      'entity_test' => array(
+    $expected = [
+      'entity_test' => [
         'description' => 'The base table for entity_test entities.',
-        'fields' => array(
-          'id' => array(
+        'fields' => [
+          'id' => [
             'type' => 'serial',
             'not null' => TRUE,
-          ),
-          'revision_id' => array(
+          ],
+          'revision_id' => [
             'type' => 'int',
             'not null' => FALSE,
-          )
-        ),
-        'primary key' => array('id'),
-        'unique keys' => array(
-          'entity_test__revision_id' => array('revision_id'),
-        ),
-        'indexes' => array(),
-        'foreign keys' => array(
-          'entity_test__revision' => array(
+          ]
+        ],
+        'primary key' => ['id'],
+        'unique keys' => [
+          'entity_test__revision_id' => ['revision_id'],
+        ],
+        'indexes' => [],
+        'foreign keys' => [
+          'entity_test__revision' => [
             'table' => 'entity_test_revision',
-            'columns' => array('revision_id' => 'revision_id'),
-          )
-        ),
-      ),
-      'entity_test_revision' => array(
+            'columns' => ['revision_id' => 'revision_id'],
+          ]
+        ],
+      ],
+      'entity_test_revision' => [
         'description' => 'The revision table for entity_test entities.',
-        'fields' => array(
-          'id' => array(
+        'fields' => [
+          'id' => [
             'type' => 'int',
             'not null' => TRUE,
-          ),
-          'revision_id' => array(
+          ],
+          'revision_id' => [
             'type' => 'serial',
             'not null' => TRUE,
-          ),
-        ),
-        'primary key' => array('revision_id'),
-        'unique keys' => array(),
-        'indexes' => array(
-          'entity_test__id' => array('id'),
-        ),
-        'foreign keys' => array(
-          'entity_test__revisioned' => array(
+          ],
+        ],
+        'primary key' => ['revision_id'],
+        'unique keys' => [],
+        'indexes' => [
+          'entity_test__id' => ['id'],
+        ],
+        'foreign keys' => [
+          'entity_test__revisioned' => [
             'table' => 'entity_test',
-            'columns' => array('id' => 'id'),
-          ),
-        ),
-      ),
-    );
+            'columns' => ['id' => 'id'],
+          ],
+        ],
+      ],
+    ];
 
     $this->setUpStorageSchema($expected);
 
@@ -484,87 +484,87 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
    * @covers ::processDataTable
    */
   public function testGetSchemaTranslatable() {
-    $this->entityType = new ContentEntityType(array(
+    $this->entityType = new ContentEntityType([
       'id' => 'entity_test',
-      'entity_keys' => array(
+      'entity_keys' => [
         'id' => 'id',
         'langcode' => 'langcode',
-      ),
-    ));
+      ],
+    ]);
 
     $this->storage->expects($this->any())
       ->method('getDataTable')
       ->will($this->returnValue('entity_test_field_data'));
 
-    $this->setUpStorageDefinition('langcode', array(
-      'columns' => array(
-        'value' => array(
+    $this->setUpStorageDefinition('langcode', [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
-    $this->setUpStorageDefinition('default_langcode', array(
-      'columns' => array(
-        'value' => array(
+    $this->setUpStorageDefinition('default_langcode', [
+      'columns' => [
+        'value' => [
           'type' => 'int',
           'size' => 'tiny',
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
-    $expected = array(
-      'entity_test' => array(
+    $expected = [
+      'entity_test' => [
         'description' => 'The base table for entity_test entities.',
-        'fields' => array(
-          'id' => array(
+        'fields' => [
+          'id' => [
             'type' => 'serial',
             'not null' => TRUE,
-          ),
-          'langcode' => array(
+          ],
+          'langcode' => [
             'type' => 'varchar',
             'not null' => TRUE,
-          )
-        ),
-        'primary key' => array('id'),
-        'unique keys' => array(),
-        'indexes' => array(),
-        'foreign keys' => array(),
-      ),
-      'entity_test_field_data' => array(
+          ]
+        ],
+        'primary key' => ['id'],
+        'unique keys' => [],
+        'indexes' => [],
+        'foreign keys' => [],
+      ],
+      'entity_test_field_data' => [
         'description' => 'The data table for entity_test entities.',
-        'fields' => array(
-          'id' => array(
+        'fields' => [
+          'id' => [
             'type' => 'int',
             'not null' => TRUE,
-          ),
-          'langcode' => array(
+          ],
+          'langcode' => [
             'type' => 'varchar',
             'not null' => TRUE,
-          ),
-          'default_langcode' => array(
+          ],
+          'default_langcode' => [
             'type' => 'int',
             'size' => 'tiny',
             'not null' => TRUE,
-          ),
-        ),
-        'primary key' => array('id', 'langcode'),
-        'unique keys' => array(),
-        'indexes' => array(
-          'entity_test__id__default_langcode__langcode' => array(
+          ],
+        ],
+        'primary key' => ['id', 'langcode'],
+        'unique keys' => [],
+        'indexes' => [
+          'entity_test__id__default_langcode__langcode' => [
             0 => 'id',
             1 => 'default_langcode',
             2 => 'langcode',
-          ),
-        ),
-        'foreign keys' => array(
-          'entity_test' => array(
+          ],
+        ],
+        'foreign keys' => [
+          'entity_test' => [
             'table' => 'entity_test',
-            'columns' => array('id' => 'id'),
-          ),
-        ),
-      ),
-    );
+            'columns' => ['id' => 'id'],
+          ],
+        ],
+      ],
+    ];
 
     $this->setUpStorageSchema($expected);
 
@@ -595,14 +595,14 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
    * @covers ::processRevisionDataTable
    */
   public function testGetSchemaRevisionableTranslatable() {
-    $this->entityType = new ContentEntityType(array(
+    $this->entityType = new ContentEntityType([
       'id' => 'entity_test',
-      'entity_keys' => array(
+      'entity_keys' => [
         'id' => 'id',
         'revision' => 'revision_id',
         'langcode' => 'langcode',
-      ),
-    ));
+      ],
+    ]);
 
     $this->storage->expects($this->exactly(3))
       ->method('getRevisionTable')
@@ -614,166 +614,166 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
       ->method('getRevisionDataTable')
       ->will($this->returnValue('entity_test_revision_field_data'));
 
-    $this->setUpStorageDefinition('revision_id', array(
-      'columns' => array(
-        'value' => array(
+    $this->setUpStorageDefinition('revision_id', [
+      'columns' => [
+        'value' => [
           'type' => 'int',
-        ),
-      ),
-    ));
-    $this->setUpStorageDefinition('langcode', array(
-      'columns' => array(
-        'value' => array(
+        ],
+      ],
+    ]);
+    $this->setUpStorageDefinition('langcode', [
+      'columns' => [
+        'value' => [
           'type' => 'varchar',
-        ),
-      ),
-    ));
-    $this->setUpStorageDefinition('default_langcode', array(
-      'columns' => array(
-        'value' => array(
+        ],
+      ],
+    ]);
+    $this->setUpStorageDefinition('default_langcode', [
+      'columns' => [
+        'value' => [
           'type' => 'int',
           'size' => 'tiny',
-        ),
-      ),
-    ));
+        ],
+      ],
+    ]);
 
-    $expected = array(
-      'entity_test' => array(
+    $expected = [
+      'entity_test' => [
         'description' => 'The base table for entity_test entities.',
-        'fields' => array(
-          'id' => array(
+        'fields' => [
+          'id' => [
             'type' => 'serial',
             'not null' => TRUE,
-          ),
-          'revision_id' => array(
+          ],
+          'revision_id' => [
             'type' => 'int',
             'not null' => FALSE,
-          ),
-          'langcode' => array(
+          ],
+          'langcode' => [
             'type' => 'varchar',
             'not null' => TRUE,
-          )
-        ),
-        'primary key' => array('id'),
-        'unique keys' => array(
-          'entity_test__revision_id' => array('revision_id'),
-        ),
-        'indexes' => array(),
-        'foreign keys' => array(
-          'entity_test__revision' => array(
+          ]
+        ],
+        'primary key' => ['id'],
+        'unique keys' => [
+          'entity_test__revision_id' => ['revision_id'],
+        ],
+        'indexes' => [],
+        'foreign keys' => [
+          'entity_test__revision' => [
             'table' => 'entity_test_revision',
-            'columns' => array('revision_id' => 'revision_id'),
-          ),
-        ),
-      ),
-      'entity_test_revision' => array(
+            'columns' => ['revision_id' => 'revision_id'],
+          ],
+        ],
+      ],
+      'entity_test_revision' => [
         'description' => 'The revision table for entity_test entities.',
-        'fields' => array(
-          'id' => array(
+        'fields' => [
+          'id' => [
             'type' => 'int',
             'not null' => TRUE,
-          ),
-          'revision_id' => array(
+          ],
+          'revision_id' => [
             'type' => 'serial',
             'not null' => TRUE,
-          ),
-          'langcode' => array(
+          ],
+          'langcode' => [
             'type' => 'varchar',
             'not null' => TRUE,
-          ),
-        ),
-        'primary key' => array('revision_id'),
-        'unique keys' => array(),
-        'indexes' => array(
-          'entity_test__id' => array('id'),
-        ),
-        'foreign keys' => array(
-          'entity_test__revisioned' => array(
+          ],
+        ],
+        'primary key' => ['revision_id'],
+        'unique keys' => [],
+        'indexes' => [
+          'entity_test__id' => ['id'],
+        ],
+        'foreign keys' => [
+          'entity_test__revisioned' => [
             'table' => 'entity_test',
-            'columns' => array('id' => 'id'),
-          ),
-        ),
-      ),
-      'entity_test_field_data' => array(
+            'columns' => ['id' => 'id'],
+          ],
+        ],
+      ],
+      'entity_test_field_data' => [
         'description' => 'The data table for entity_test entities.',
-        'fields' => array(
-          'id' => array(
+        'fields' => [
+          'id' => [
             'type' => 'int',
             'not null' => TRUE,
-          ),
-          'revision_id' => array(
+          ],
+          'revision_id' => [
             'type' => 'int',
             'not null' => TRUE,
-          ),
-          'langcode' => array(
+          ],
+          'langcode' => [
             'type' => 'varchar',
             'not null' => TRUE,
-          ),
-          'default_langcode' => array(
+          ],
+          'default_langcode' => [
             'type' => 'int',
             'size' => 'tiny',
             'not null' => TRUE,
-          ),
-        ),
-        'primary key' => array('id', 'langcode'),
-        'unique keys' => array(),
-        'indexes' => array(
-          'entity_test__revision_id' => array('revision_id'),
-          'entity_test__id__default_langcode__langcode' => array(
+          ],
+        ],
+        'primary key' => ['id', 'langcode'],
+        'unique keys' => [],
+        'indexes' => [
+          'entity_test__revision_id' => ['revision_id'],
+          'entity_test__id__default_langcode__langcode' => [
             0 => 'id',
             1 => 'default_langcode',
             2 => 'langcode',
-          ),
-        ),
-        'foreign keys' => array(
-          'entity_test' => array(
+          ],
+        ],
+        'foreign keys' => [
+          'entity_test' => [
             'table' => 'entity_test',
-            'columns' => array('id' => 'id'),
-          ),
-        ),
-      ),
-      'entity_test_revision_field_data' => array(
+            'columns' => ['id' => 'id'],
+          ],
+        ],
+      ],
+      'entity_test_revision_field_data' => [
         'description' => 'The revision data table for entity_test entities.',
-        'fields' => array(
-          'id' => array(
+        'fields' => [
+          'id' => [
             'type' => 'int',
             'not null' => TRUE,
-          ),
-          'revision_id' => array(
+          ],
+          'revision_id' => [
             'type' => 'int',
             'not null' => TRUE,
-          ),
-          'langcode' => array(
+          ],
+          'langcode' => [
             'type' => 'varchar',
             'not null' => TRUE,
-          ),
-          'default_langcode' => array(
+          ],
+          'default_langcode' => [
             'type' => 'int',
             'size' => 'tiny',
             'not null' => TRUE,
-          ),
-        ),
-        'primary key' => array('revision_id', 'langcode'),
-        'unique keys' => array(),
-        'indexes' => array(
-          'entity_test__id__default_langcode__langcode' => array(
+          ],
+        ],
+        'primary key' => ['revision_id', 'langcode'],
+        'unique keys' => [],
+        'indexes' => [
+          'entity_test__id__default_langcode__langcode' => [
             0 => 'id',
             1 => 'default_langcode',
             2 => 'langcode',
-          ),
-        ),
-        'foreign keys' => array(
-          'entity_test' => array(
+          ],
+        ],
+        'foreign keys' => [
+          'entity_test' => [
             'table' => 'entity_test',
-            'columns' => array('id' => 'id'),
-          ),
-          'entity_test__revision' => array(
+            'columns' => ['id' => 'id'],
+          ],
+          'entity_test__revision' => [
             'table' => 'entity_test_revision',
-            'columns' => array('revision_id' => 'revision_id'),
-          ),
-        ),
-      ),
-    );
+            'columns' => ['revision_id' => 'revision_id'],
+          ],
+        ],
+      ],
+    ];
 
     $this->setUpStorageSchema($expected);
 
@@ -801,53 +801,53 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
    */
   public function testDedicatedTableSchema() {
     $entity_type_id = 'entity_test';
-    $this->entityType = new ContentEntityType(array(
+    $this->entityType = new ContentEntityType([
       'id' => 'entity_test',
-      'entity_keys' => array('id' => 'id'),
-    ));
+      'entity_keys' => ['id' => 'id'],
+    ]);
 
     // Setup a field having a dedicated schema.
     $field_name = $this->getRandomGenerator()->name();
-    $this->setUpStorageDefinition($field_name, array(
-      'columns' => array(
-        'shape' => array(
+    $this->setUpStorageDefinition($field_name, [
+      'columns' => [
+        'shape' => [
           'type' => 'varchar',
           'length' => 32,
           'not null' => FALSE,
-        ),
-        'color' => array(
+        ],
+        'color' => [
           'type' => 'varchar',
           'length' => 32,
           'not null' => FALSE,
-        ),
-        'area' => array(
+        ],
+        'area' => [
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
-        ),
-        'depth' => array(
+        ],
+        'depth' => [
           'type' => 'int',
           'unsigned' => TRUE,
           'not null' => TRUE,
-        ),
-      ),
-      'foreign keys' => array(
-        'color' => array(
+        ],
+      ],
+      'foreign keys' => [
+        'color' => [
           'table' => 'color',
-          'columns' => array(
+          'columns' => [
             'color' => 'id'
-          ),
-        ),
-      ),
-      'unique keys' => array(
-        'area' => array('area'),
-        'shape' => array(array('shape', 10)),
-      ),
-      'indexes' => array(
-        'depth' => array('depth'),
-        'color' => array(array('color', 3)),
-      ),
-    ));
+          ],
+        ],
+      ],
+      'unique keys' => [
+        'area' => ['area'],
+        'shape' => [['shape', 10]],
+      ],
+      'indexes' => [
+        'depth' => ['depth'],
+        'color' => [['color', 3]],
+      ],
+    ]);
 
     $field_storage = $this->storageDefinitions[$field_name];
     $field_storage
@@ -868,97 +868,97 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
       ->method('getType')
       ->will($this->returnValue('integer'));
 
-    $expected = array(
-      $entity_type_id . '__' . $field_name => array(
+    $expected = [
+      $entity_type_id . '__' . $field_name => [
         'description' => "Data storage for $entity_type_id field $field_name.",
-        'fields' => array(
-          'bundle' => array(
+        'fields' => [
+          'bundle' => [
             'type' => 'varchar_ascii',
             'length' => 128,
             'not null' => TRUE,
             'default' => '',
             'description' => 'The field instance bundle to which this row belongs, used when deleting a field instance',
-          ),
-          'deleted' => array(
+          ],
+          'deleted' => [
             'type' => 'int',
             'size' => 'tiny',
             'not null' => TRUE,
             'default' => 0,
             'description' => 'A boolean indicating whether this data item has been deleted',
-          ),
-          'entity_id' => array(
+          ],
+          'entity_id' => [
             'type' => 'int',
             'unsigned' => TRUE,
             'not null' => TRUE,
             'description' => 'The entity id this data is attached to',
-          ),
-          'revision_id' => array(
+          ],
+          'revision_id' => [
             'type' => 'int',
             'unsigned' => TRUE,
             'not null' => TRUE,
             'description' => 'The entity revision id this data is attached to, which for an unversioned entity type is the same as the entity id',
-          ),
-          'langcode' => array(
+          ],
+          'langcode' => [
             'type' => 'varchar_ascii',
             'length' => 32,
             'not null' => TRUE,
             'default' => '',
             'description' => 'The language code for this data item.',
-          ),
-          'delta' => array(
+          ],
+          'delta' => [
             'type' => 'int',
             'unsigned' => TRUE,
             'not null' => TRUE,
             'description' => 'The sequence number for this data item, used for multi-value fields',
-          ),
-          $field_name . '_shape' => array(
+          ],
+          $field_name . '_shape' => [
             'type' => 'varchar',
             'length' => 32,
             'not null' => FALSE,
-          ),
-          $field_name . '_color' => array(
+          ],
+          $field_name . '_color' => [
             'type' => 'varchar',
             'length' => 32,
             'not null' => FALSE,
-          ),
-          $field_name . '_area' => array(
+          ],
+          $field_name . '_area' => [
             'type' => 'int',
             'unsigned' => TRUE,
             'not null' => TRUE,
-          ),
-          $field_name . '_depth' => array(
+          ],
+          $field_name . '_depth' => [
             'type' => 'int',
             'unsigned' => TRUE,
             'not null' => TRUE,
-          ),
-        ),
-        'primary key' => array('entity_id', 'deleted', 'delta', 'langcode'),
-        'indexes' => array(
-          'bundle' => array('bundle'),
-          'revision_id' => array('revision_id'),
-          $field_name . '_depth' => array($field_name . '_depth'),
-          $field_name . '_color' => array(array($field_name . '_color', 3)),
-        ),
-        'unique keys' => array(
-           $field_name . '_area' => array($field_name . '_area'),
-           $field_name . '_shape' => array(array($field_name . '_shape', 10)),
-        ),
-        'foreign keys' => array(
-          $field_name . '_color' => array(
+          ],
+        ],
+        'primary key' => ['entity_id', 'deleted', 'delta', 'langcode'],
+        'indexes' => [
+          'bundle' => ['bundle'],
+          'revision_id' => ['revision_id'],
+          $field_name . '_depth' => [$field_name . '_depth'],
+          $field_name . '_color' => [[$field_name . '_color', 3]],
+        ],
+        'unique keys' => [
+           $field_name . '_area' => [$field_name . '_area'],
+           $field_name . '_shape' => [[$field_name . '_shape', 10]],
+        ],
+        'foreign keys' => [
+          $field_name . '_color' => [
             'table' => 'color',
-            'columns' => array(
+            'columns' => [
               $field_name . '_color' => 'id',
-            ),
-          ),
-        ),
-      ),
-    );
+            ],
+          ],
+        ],
+      ],
+    ];
 
     $this->setUpStorageSchema($expected);
 
     $table_mapping = new DefaultTableMapping($this->entityType, $this->storageDefinitions);
     $table_mapping->setFieldNames($entity_type_id, array_keys($this->storageDefinitions));
-    $table_mapping->setExtraColumns($entity_type_id, array('default_langcode'));
+    $table_mapping->setExtraColumns($entity_type_id, ['default_langcode']);
 
     $this->storage->expects($this->any())
       ->method('getTableMapping')
@@ -978,37 +978,37 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
    */
   public function testDedicatedTableSchemaForEntityWithStringIdentifier() {
     $entity_type_id = 'entity_test';
-    $this->entityType = new ContentEntityType(array(
+    $this->entityType = new ContentEntityType([
       'id' => 'entity_test',
-      'entity_keys' => array('id' => 'id'),
-    ));
+      'entity_keys' => ['id' => 'id'],
+    ]);
 
     // Setup a field having a dedicated schema.
     $field_name = $this->getRandomGenerator()->name();
-    $this->setUpStorageDefinition($field_name, array(
-      'columns' => array(
-        'shape' => array(
+    $this->setUpStorageDefinition($field_name, [
+      'columns' => [
+        'shape' => [
           'type' => 'varchar',
           'length' => 32,
           'not null' => FALSE,
-        ),
-        'color' => array(
+        ],
+        'color' => [
           'type' => 'varchar',
           'length' => 32,
           'not null' => FALSE,
-        ),
-      ),
-      'foreign keys' => array(
-        'color' => array(
+        ],
+      ],
+      'foreign keys' => [
+        'color' => [
           'table' => 'color',
-          'columns' => array(
+          'columns' => [
             'color' => 'id'
-          ),
-        ),
-      ),
-      'unique keys' => array(),
-      'indexes' => array(),
-    ));
+          ],
+        ],
+      ],
+      'unique keys' => [],
+      'indexes' => [],
+    ]);
 
     $field_storage = $this->storageDefinitions[$field_name];
     $field_storage
@@ -1029,81 +1029,81 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
       ->method('getType')
       ->will($this->returnValue('string'));
 
-    $expected = array(
-      $entity_type_id . '__' . $field_name => array(
+    $expected = [
+      $entity_type_id . '__' . $field_name => [
         'description' => "Data storage for $entity_type_id field $field_name.",
-        'fields' => array(
-          'bundle' => array(
+        'fields' => [
+          'bundle' => [
             'type' => 'varchar_ascii',
             'length' => 128,
             'not null' => TRUE,
             'default' => '',
             'description' => 'The field instance bundle to which this row belongs, used when deleting a field instance',
-          ),
-          'deleted' => array(
+          ],
+          'deleted' => [
             'type' => 'int',
             'size' => 'tiny',
             'not null' => TRUE,
             'default' => 0,
             'description' => 'A boolean indicating whether this data item has been deleted',
-          ),
-          'entity_id' => array(
+          ],
+          'entity_id' => [
             'type' => 'varchar_ascii',
             'length' => 128,
             'not null' => TRUE,
             'description' => 'The entity id this data is attached to',
-          ),
-          'revision_id' => array(
+          ],
+          'revision_id' => [
             'type' => 'varchar_ascii',
             'length' => 128,
             'not null' => TRUE,
             'description' => 'The entity revision id this data is attached to, which for an unversioned entity type is the same as the entity id',
-          ),
-          'langcode' => array(
+          ],
+          'langcode' => [
             'type' => 'varchar_ascii',
             'length' => 32,
             'not null' => TRUE,
             'default' => '',
             'description' => 'The language code for this data item.',
-          ),
-          'delta' => array(
+          ],
+          'delta' => [
             'type' => 'int',
             'unsigned' => TRUE,
             'not null' => TRUE,
             'description' => 'The sequence number for this data item, used for multi-value fields',
-          ),
-          $field_name . '_shape' => array(
+          ],
+          $field_name . '_shape' => [
             'type' => 'varchar',
             'length' => 32,
             'not null' => FALSE,
-          ),
-          $field_name . '_color' => array(
+          ],
+          $field_name . '_color' => [
             'type' => 'varchar',
             'length' => 32,
             'not null' => FALSE,
-          ),
-        ),
-        'primary key' => array('entity_id', 'deleted', 'delta', 'langcode'),
-        'indexes' => array(
-          'bundle' => array('bundle'),
-          'revision_id' => array('revision_id'),
-        ),
-        'foreign keys' => array(
-          $field_name . '_color' => array(
+          ],
+        ],
+        'primary key' => ['entity_id', 'deleted', 'delta', 'langcode'],
+        'indexes' => [
+          'bundle' => ['bundle'],
+          'revision_id' => ['revision_id'],
+        ],
+        'foreign keys' => [
+          $field_name . '_color' => [
             'table' => 'color',
-            'columns' => array(
+            'columns' => [
               $field_name . '_color' => 'id',
-            ),
-          ),
-        ),
-      ),
-    );
+            ],
+          ],
+        ],
+      ],
+    ];
 
     $this->setUpStorageSchema($expected);
 
     $table_mapping = new DefaultTableMapping($this->entityType, $this->storageDefinitions);
     $table_mapping->setFieldNames($entity_type_id, array_keys($this->storageDefinitions));
-    $table_mapping->setExtraColumns($entity_type_id, array('default_langcode'));
+    $table_mapping->setExtraColumns($entity_type_id, ['default_langcode']);
 
     $this->storage->expects($this->any())
       ->method('getTableMapping')
@@ -1162,10 +1162,10 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
    * @dataProvider providerTestRequiresEntityDataMigration
    */
   public function testRequiresEntityDataMigration($updated_entity_type_definition, $original_entity_type_definition, $original_storage_has_data, $shared_table_structure_changed, $migration_required) {
-    $this->entityType = new ContentEntityType(array(
+    $this->entityType = new ContentEntityType([
       'id' => 'entity_test',
-      'entity_keys' => array('id' => 'id'),
-    ));
+      'entity_keys' => ['id' => 'id'],
+    ]);
 
     $original_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage')
       ->disableOriginalConstructor()
@@ -1188,8 +1188,8 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
       ->willReturn($original_storage);
 
     $this->storageSchema = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema')
-      ->setConstructorArgs(array($this->entityManager, $this->entityType, $this->storage, $connection))
-      ->setMethods(array('installedStorageSchema', 'hasSharedTableStructureChange'))
+      ->setConstructorArgs([$this->entityManager, $this->entityType, $this->storage, $connection])
+      ->setMethods(['installedStorageSchema', 'hasSharedTableStructureChange'])
       ->getMock();
 
     $this->storageSchema->expects($this->any())
@@ -1273,15 +1273,15 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
    */
   public function testRequiresEntityStorageSchemaChanges(ContentEntityTypeInterface $updated, ContentEntityTypeInterface $original, $requires_change, $change_schema, $change_shared_table) {
 
-    $this->entityType = new ContentEntityType(array(
+    $this->entityType = new ContentEntityType([
       'id' => 'entity_test',
-      'entity_keys' => array('id' => 'id'),
-    ));
+      'entity_keys' => ['id' => 'id'],
+    ]);
 
     $this->setUpStorageSchema();
     $table_mapping = new DefaultTableMapping($this->entityType, $this->storageDefinitions);
     $table_mapping->setFieldNames('entity_test', array_keys($this->storageDefinitions));
-    $table_mapping->setExtraColumns('entity_test', array('default_langcode'));
+    $table_mapping->setExtraColumns('entity_test', ['default_langcode']);
     $this->storage->expects($this->any())
       ->method('getTableMapping')
       ->will($this->returnValue($table_mapping));
@@ -1290,7 +1290,7 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
     if ($change_schema) {
       $this->storageSchema->expects($this->once())
         ->method('loadEntitySchemaData')
-        ->willReturn(array());
+        ->willReturn([]);
     }
     else {
       $expected = [
@@ -1321,7 +1321,7 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
    *   (optional) An associative array describing the expected entity schema to
    *   be created. Defaults to expecting nothing.
    */
-  protected function setUpStorageSchema(array $expected = array()) {
+  protected function setUpStorageSchema(array $expected = []) {
     $this->entityManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityType->id())
@@ -1365,8 +1365,8 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
 
     $key_value = $this->getMock('Drupal\Core\KeyValueStore\KeyValueStoreInterface');
     $this->storageSchema = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema')
-      ->setConstructorArgs(array($this->entityManager, $this->entityType, $this->storage, $connection))
-      ->setMethods(array('installedStorageSchema', 'loadEntitySchemaData', 'hasSharedTableNameChanges', 'isTableEmpty'))
+      ->setConstructorArgs([$this->entityManager, $this->entityType, $this->storage, $connection])
+      ->setMethods(['installedStorageSchema', 'loadEntitySchemaData', 'hasSharedTableNameChanges', 'isTableEmpty'])
       ->getMock();
     $this->storageSchema
       ->expects($this->any())
@@ -1405,7 +1405,7 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
       ->will($this->returnValue($schema['columns']));
     // Add property definitions.
     if (!empty($schema['columns'])) {
-      $property_definitions = array();
+      $property_definitions = [];
       foreach ($schema['columns'] as $column => $info) {
         $property_definitions[$column] = $this->getMock('Drupal\Core\TypedData\DataDefinitionInterface');
         $property_definitions[$column]->expects($this->any())
@@ -1422,49 +1422,49 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
    * ::onEntityTypeUpdate
    */
   public function testonEntityTypeUpdateWithNewIndex() {
-    $this->entityType = $original_entity_type = new ContentEntityType(array(
+    $this->entityType = $original_entity_type = new ContentEntityType([
       'id' => 'entity_test',
-      'entity_keys' => array('id' => 'id'),
-    ));
+      'entity_keys' => ['id' => 'id'],
+    ]);
 
     // Add a field with a really long index.
-    $this->setUpStorageDefinition('long_index_name', array(
-      'columns' => array(
-        'long_index_name' => array(
+    $this->setUpStorageDefinition('long_index_name', [
+      'columns' => [
+        'long_index_name' => [
           'type' => 'int',
-        ),
-      ),
-      'indexes' => array(
-        'long_index_name_really_long_long_name' => array(array('long_index_name', 10)),
-      ),
-    ));
+        ],
+      ],
+      'indexes' => [
+        'long_index_name_really_long_long_name' => [['long_index_name', 10]],
+      ],
+    ]);
 
-    $expected = array(
-      'entity_test' => array(
+    $expected = [
+      'entity_test' => [
         'description' => 'The base table for entity_test entities.',
-        'fields' => array(
-          'id' => array(
+        'fields' => [
+          'id' => [
             'type' => 'serial',
             'not null' => TRUE,
-          ),
-          'long_index_name' => array(
+          ],
+          'long_index_name' => [
             'type' => 'int',
             'not null' => FALSE,
-          ),
-        ),
-        'indexes' => array(
-          'entity_test__b588603cb9' => array(
-            array('long_index_name', 10),
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+        'indexes' => [
+          'entity_test__b588603cb9' => [
+            ['long_index_name', 10],
+          ],
+        ],
+      ],
+    ];
 
     $this->setUpStorageSchema($expected);
 
     $table_mapping = new DefaultTableMapping($this->entityType, $this->storageDefinitions);
     $table_mapping->setFieldNames('entity_test', array_keys($this->storageDefinitions));
-    $table_mapping->setExtraColumns('entity_test', array('default_langcode'));
+    $table_mapping->setExtraColumns('entity_test', ['default_langcode']);
 
     $this->storage->expects($this->any())
       ->method('getTableMapping')
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
index 56b4b007e..27d515425 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
@@ -10,6 +10,7 @@ namespace Drupal\Tests\Core\Entity\Sql;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\Query\QueryFactoryInterface;
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
 use Drupal\Core\Language\Language;
 use Drupal\Tests\UnitTestCase;
@@ -40,7 +41,7 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    *
    * @var \Drupal\Core\Field\BaseFieldDefinition[]|\PHPUnit_Framework_MockObject_MockObject[]
    */
-  protected $fieldDefinitions = array();
+  protected $fieldDefinitions = [];
 
   /**
    * The mocked entity manager used in this test.
@@ -109,7 +110,7 @@ class SqlContentEntityStorageTest extends UnitTestCase {
     $this->languageManager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
     $this->languageManager->expects($this->any())
       ->method('getDefaultLanguage')
-      ->will($this->returnValue(new Language(array('langcode' => 'en'))));
+      ->will($this->returnValue(new Language(['langcode' => 'en'])));
     $this->connection = $this->getMockBuilder('Drupal\Core\Database\Connection')
       ->disableOriginalConstructor()
       ->getMock();
@@ -149,12 +150,12 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    *   value.
    */
   public function providerTestGetBaseTable() {
-    return array(
+    return [
       // Test that the entity type's base table is used, if provided.
-      array('entity_test', 'entity_test'),
+      ['entity_test', 'entity_test'],
       // Test that the storage falls back to the entity type ID.
-      array(NULL, 'entity_test'),
-    );
+      [NULL, 'entity_test'],
+    ];
   }
 
   /**
@@ -194,13 +195,13 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    *   second value.
    */
   public function providerTestGetRevisionTable() {
-    return array(
+    return [
       // Test that the entity type's revision table is used, if provided.
-      array('entity_test_revision', 'entity_test_revision'),
+      ['entity_test_revision', 'entity_test_revision'],
       // Test that the storage falls back to the entity type ID with a
       // '_revision' suffix.
-      array(NULL, 'entity_test_revision'),
-    );
+      [NULL, 'entity_test_revision'],
+    ];
   }
 
   /**
@@ -266,13 +267,13 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    *   the second value.
    */
   public function providerTestGetRevisionDataTable() {
-    return array(
+    return [
       // Test that the entity type's revision data table is used, if provided.
-      array('entity_test_field_revision', 'entity_test_field_revision'),
+      ['entity_test_field_revision', 'entity_test_field_revision'],
       // Test that the storage falls back to the entity type ID with a
       // '_field_revision' suffix.
-      array(NULL, 'entity_test_field_revision'),
-    );
+      [NULL, 'entity_test_field_revision'],
+    ];
   }
 
   /**
@@ -283,52 +284,52 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    * @covers ::getTableMapping
    */
   public function testOnEntityTypeCreate() {
-    $columns = array(
-      'value' => array(
+    $columns = [
+      'value' => [
         'type' => 'int',
-      ),
-    );
+      ],
+    ];
 
-    $this->fieldDefinitions = $this->mockFieldDefinitions(array('id'));
+    $this->fieldDefinitions = $this->mockFieldDefinitions(['id']);
     $this->fieldDefinitions['id']->expects($this->any())
       ->method('getColumns')
       ->will($this->returnValue($columns));
     $this->fieldDefinitions['id']->expects($this->once())
       ->method('getSchema')
-      ->will($this->returnValue(array('columns' => $columns)));
+      ->will($this->returnValue(['columns' => $columns]));
 
     $this->entityType->expects($this->once())
       ->method('getKeys')
-      ->will($this->returnValue(array('id' => 'id')));
+      ->will($this->returnValue(['id' => 'id']));
     $this->entityType->expects($this->any())
       ->method('getKey')
-      ->will($this->returnValueMap(array(
+      ->will($this->returnValueMap([
         // EntityStorageBase::__construct()
-        array('id', 'id'),
+        ['id', 'id'],
         // ContentEntityStorageBase::__construct()
-        array('uuid', NULL),
-        array('bundle', NULL),
+        ['uuid', NULL],
+        ['bundle', NULL],
         // SqlContentEntityStorageSchema::initializeBaseTable()
-        array('id' => 'id'),
+        ['id' => 'id'],
         // SqlContentEntityStorageSchema::processBaseTable()
-        array('id' => 'id'),
-      )));
+        ['id' => 'id'],
+      ]));
 
     $this->setUpEntityStorage();
 
-    $expected = array(
+    $expected = [
       'description' => 'The base table for entity_test entities.',
-      'fields' => array(
-        'id' => array(
+      'fields' => [
+        'id' => [
           'type' => 'serial',
           'not null' => TRUE,
-        ),
-      ),
-      'primary key' => array('id'),
-      'unique keys' => array(),
-      'indexes' => array(),
-      'foreign keys' => array(),
-    );
+        ],
+      ],
+      'primary key' => ['id'],
+      'unique keys' => [],
+      'indexes' => [],
+      'foreign keys' => [],
+    ];
 
     $schema_handler = $this->getMockBuilder('Drupal\Core\Database\Schema')
       ->disableOriginalConstructor()
@@ -342,14 +343,14 @@ class SqlContentEntityStorageTest extends UnitTestCase {
       ->will($this->returnValue($schema_handler));
 
     $storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage')
-      ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager))
-      ->setMethods(array('getStorageSchema'))
+      ->setConstructorArgs([$this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager])
+      ->setMethods(['getStorageSchema'])
       ->getMock();
 
     $key_value = $this->getMock('Drupal\Core\KeyValueStore\KeyValueStoreInterface');
     $schema_handler = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema')
-      ->setConstructorArgs(array($this->entityManager, $this->entityType, $storage, $this->connection))
-      ->setMethods(array('installedStorageSchema', 'createSharedTableSchema'))
+      ->setConstructorArgs([$this->entityManager, $this->entityType, $storage, $this->connection])
+      ->setMethods(['installedStorageSchema', 'createSharedTableSchema'])
       ->getMock();
     $schema_handler
       ->expects($this->any())
@@ -374,9 +375,9 @@ class SqlContentEntityStorageTest extends UnitTestCase {
     $this->setUpEntityStorage();
 
     $mapping = $this->entityStorage->getTableMapping();
-    $this->assertSame(array('entity_test'), $mapping->getTableNames());
-    $this->assertSame(array(), $mapping->getFieldNames('entity_test'));
-    $this->assertSame(array(), $mapping->getExtraColumns('entity_test'));
+    $this->assertSame(['entity_test'], $mapping->getTableNames());
+    $this->assertSame([], $mapping->getFieldNames('entity_test'));
+    $this->assertSame([], $mapping->getExtraColumns('entity_test'));
   }
 
   /**
@@ -393,22 +394,22 @@ class SqlContentEntityStorageTest extends UnitTestCase {
   public function testGetTableMappingSimple(array $entity_keys) {
     $this->entityType->expects($this->any())
       ->method('getKey')
-      ->will($this->returnValueMap(array(
-        array('id', $entity_keys['id']),
-        array('uuid', $entity_keys['uuid']),
-        array('bundle', $entity_keys['bundle']),
-      )));
+      ->will($this->returnValueMap([
+        ['id', $entity_keys['id']],
+        ['uuid', $entity_keys['uuid']],
+        ['bundle', $entity_keys['bundle']],
+      ]));
 
     $this->setUpEntityStorage();
 
     $mapping = $this->entityStorage->getTableMapping();
 
-    $this->assertEquals(array('entity_test'), $mapping->getTableNames());
+    $this->assertEquals(['entity_test'], $mapping->getTableNames());
 
     $expected = array_values(array_filter($entity_keys));
     $this->assertEquals($expected, $mapping->getFieldNames('entity_test'));
 
-    $this->assertEquals(array(), $mapping->getExtraColumns('entity_test'));
+    $this->assertEquals([], $mapping->getExtraColumns('entity_test'));
   }
 
   /**
@@ -423,15 +424,15 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    * @dataProvider providerTestGetTableMappingSimple()
    */
   public function testGetTableMappingSimpleWithFields(array $entity_keys) {
-    $base_field_names = array('title', 'description', 'owner');
+    $base_field_names = ['title', 'description', 'owner'];
     $field_names = array_merge(array_values(array_filter($entity_keys)), $base_field_names);
     $this->fieldDefinitions = $this->mockFieldDefinitions($field_names);
     $this->setUpEntityStorage();
 
     $mapping = $this->entityStorage->getTableMapping();
-    $this->assertEquals(array('entity_test'), $mapping->getTableNames());
+    $this->assertEquals(['entity_test'], $mapping->getTableNames());
     $this->assertEquals($field_names, $mapping->getFieldNames('entity_test'));
-    $this->assertEquals(array(), $mapping->getExtraColumns('entity_test'));
+    $this->assertEquals([], $mapping->getExtraColumns('entity_test'));
   }
 
   /**
@@ -442,28 +443,28 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    *   entity keys to use for the mocked entity type.
    */
   public function providerTestGetTableMappingSimple() {
-    return array(
-      array(array(
+    return [
+      [[
         'id' => 'test_id',
         'bundle' => NULL,
         'uuid' => NULL,
-      )),
-      array(array(
+      ]],
+      [[
         'id' => 'test_id',
         'bundle' => 'test_bundle',
         'uuid' => NULL,
-      )),
-      array(array(
+      ]],
+      [[
         'id' => 'test_id',
         'bundle' => NULL,
         'uuid' => 'test_uuid',
-      )),
-      array(array(
+      ]],
+      [[
         'id' => 'test_id',
         'bundle' => 'test_bundle',
         'uuid' => 'test_uuid',
-      )),
-    );
+      ]],
+    ];
   }
 
   /**
@@ -491,14 +492,14 @@ class SqlContentEntityStorageTest extends UnitTestCase {
     $this->assertEquals(['entity_test', 'entity_test__multi_valued_base_field'], $mapping->getTableNames());
     $this->assertEquals($base_field_names, $mapping->getFieldNames('entity_test__multi_valued_base_field'));
 
-    $extra_columns = array(
+    $extra_columns = [
       'bundle',
       'deleted',
       'entity_id',
       'revision_id',
       'langcode',
       'delta',
-    );
+    ];
     $this->assertEquals($extra_columns, $mapping->getExtraColumns('entity_test__multi_valued_base_field'));
   }
 
@@ -515,39 +516,39 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    */
   public function testGetTableMappingRevisionable(array $entity_keys) {
     // This allows to re-use the data provider.
-    $entity_keys = array(
+    $entity_keys = [
       'id' => $entity_keys['id'],
       'revision' => 'test_revision',
       'bundle' => $entity_keys['bundle'],
       'uuid' => $entity_keys['uuid'],
-    );
+    ];
 
     $this->entityType->expects($this->exactly(2))
       ->method('isRevisionable')
       ->will($this->returnValue(TRUE));
     $this->entityType->expects($this->any())
       ->method('getKey')
-      ->will($this->returnValueMap(array(
-        array('id', $entity_keys['id']),
-        array('uuid', $entity_keys['uuid']),
-        array('bundle', $entity_keys['bundle']),
-        array('revision', $entity_keys['revision']),
-      )));
+      ->will($this->returnValueMap([
+        ['id', $entity_keys['id']],
+        ['uuid', $entity_keys['uuid']],
+        ['bundle', $entity_keys['bundle']],
+        ['revision', $entity_keys['revision']],
+      ]));
 
     $this->setUpEntityStorage();
 
     $mapping = $this->entityStorage->getTableMapping();
 
-    $expected = array('entity_test', 'entity_test_revision');
+    $expected = ['entity_test', 'entity_test_revision'];
     $this->assertEquals($expected, $mapping->getTableNames());
 
     $expected = array_values(array_filter($entity_keys));
     $this->assertEquals($expected, $mapping->getFieldNames('entity_test'));
-    $expected = array($entity_keys['id'], $entity_keys['revision']);
+    $expected = [$entity_keys['id'], $entity_keys['revision']];
     $this->assertEquals($expected, $mapping->getFieldNames('entity_test_revision'));
 
-    $this->assertEquals(array(), $mapping->getExtraColumns('entity_test'));
-    $this->assertEquals(array(), $mapping->getExtraColumns('entity_test_revision'));
+    $this->assertEquals([], $mapping->getExtraColumns('entity_test'));
+    $this->assertEquals([], $mapping->getExtraColumns('entity_test_revision'));
   }
 
   /**
@@ -563,64 +564,64 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    */
   public function testGetTableMappingRevisionableWithFields(array $entity_keys) {
     // This allows to re-use the data provider.
-    $entity_keys = array(
+    $entity_keys = [
       'id' => $entity_keys['id'],
       'revision' => 'test_revision',
       'bundle' => $entity_keys['bundle'],
       'uuid' => $entity_keys['uuid'],
-    );
+    ];
 
     // PHPUnit does not allow for multiple data providers.
-    $test_cases = array(
-      array(),
-      array('revision_timestamp'),
-      array('revision_uid'),
-      array('revision_log'),
-      array('revision_timestamp', 'revision_uid'),
-      array('revision_timestamp', 'revision_log'),
-      array('revision_uid', 'revision_log'),
-      array('revision_timestamp', 'revision_uid', 'revision_log'),
-    );
+    $test_cases = [
+      [],
+      ['revision_timestamp'],
+      ['revision_uid'],
+      ['revision_log'],
+      ['revision_timestamp', 'revision_uid'],
+      ['revision_timestamp', 'revision_log'],
+      ['revision_uid', 'revision_log'],
+      ['revision_timestamp', 'revision_uid', 'revision_log'],
+    ];
     foreach ($test_cases as $revision_metadata_field_names) {
       $this->setUp();
 
-      $base_field_names = array('title');
+      $base_field_names = ['title'];
       $field_names = array_merge(array_values(array_filter($entity_keys)), $base_field_names);
       $this->fieldDefinitions = $this->mockFieldDefinitions($field_names);
 
-      $revisionable_field_names = array('description', 'owner');
+      $revisionable_field_names = ['description', 'owner'];
       $field_names = array_merge($field_names, $revisionable_field_names);
-      $this->fieldDefinitions += $this->mockFieldDefinitions(array_merge($revisionable_field_names, $revision_metadata_field_names), array('isRevisionable' => TRUE));
+      $this->fieldDefinitions += $this->mockFieldDefinitions(array_merge($revisionable_field_names, $revision_metadata_field_names), ['isRevisionable' => TRUE]);
 
       $this->entityType->expects($this->exactly(2))
         ->method('isRevisionable')
         ->will($this->returnValue(TRUE));
       $this->entityType->expects($this->any())
         ->method('getKey')
-        ->will($this->returnValueMap(array(
-          array('id', $entity_keys['id']),
-          array('uuid', $entity_keys['uuid']),
-          array('bundle', $entity_keys['bundle']),
-          array('revision', $entity_keys['revision']),
-        )));
+        ->will($this->returnValueMap([
+          ['id', $entity_keys['id']],
+          ['uuid', $entity_keys['uuid']],
+          ['bundle', $entity_keys['bundle']],
+          ['revision', $entity_keys['revision']],
+        ]));
 
       $this->setUpEntityStorage();
 
       $mapping = $this->entityStorage->getTableMapping();
 
-      $expected = array('entity_test', 'entity_test_revision');
+      $expected = ['entity_test', 'entity_test_revision'];
       $this->assertEquals($expected, $mapping->getTableNames());
 
       $this->assertEquals($field_names, $mapping->getFieldNames('entity_test'));
       $expected = array_merge(
-        array($entity_keys['id'], $entity_keys['revision']),
+        [$entity_keys['id'], $entity_keys['revision']],
         $revisionable_field_names,
         $revision_metadata_field_names
       );
       $this->assertEquals($expected, $mapping->getFieldNames('entity_test_revision'));
 
-      $this->assertEquals(array(), $mapping->getExtraColumns('entity_test'));
-      $this->assertEquals(array(), $mapping->getExtraColumns('entity_test_revision'));
+      $this->assertEquals([], $mapping->getExtraColumns('entity_test'));
+      $this->assertEquals([], $mapping->getExtraColumns('entity_test_revision'));
     }
   }
 
@@ -647,33 +648,33 @@ class SqlContentEntityStorageTest extends UnitTestCase {
       ->will($this->returnValue('entity_test_field_data'));
     $this->entityType->expects($this->any())
       ->method('getKey')
-      ->will($this->returnValueMap(array(
-        array('id', $entity_keys['id']),
-        array('uuid', $entity_keys['uuid']),
-        array('bundle', $entity_keys['bundle']),
-        array('langcode', $entity_keys['langcode']),
-      )));
+      ->will($this->returnValueMap([
+        ['id', $entity_keys['id']],
+        ['uuid', $entity_keys['uuid']],
+        ['bundle', $entity_keys['bundle']],
+        ['langcode', $entity_keys['langcode']],
+      ]));
 
     $this->setUpEntityStorage();
 
     $mapping = $this->entityStorage->getTableMapping();
 
-    $expected = array('entity_test', 'entity_test_field_data');
+    $expected = ['entity_test', 'entity_test_field_data'];
     $this->assertEquals($expected, $mapping->getTableNames());
 
     $expected = array_values(array_filter($entity_keys));
     $actual = $mapping->getFieldNames('entity_test');
     $this->assertEquals($expected, $actual);
     // The UUID is not stored on the data table.
-    $expected = array_values(array_filter(array(
+    $expected = array_values(array_filter([
       $entity_keys['id'],
       $entity_keys['bundle'],
       $entity_keys['langcode'],
-    )));
+    ]));
     $actual = $mapping->getFieldNames('entity_test_field_data');
     $this->assertEquals($expected, $actual);
 
-    $expected = array();
+    $expected = [];
     $actual = $mapping->getExtraColumns('entity_test');
     $this->assertEquals($expected, $actual);
     $actual = $mapping->getExtraColumns('entity_test_field_data');
@@ -695,7 +696,7 @@ class SqlContentEntityStorageTest extends UnitTestCase {
     // This allows to re-use the data provider.
     $entity_keys['langcode'] = 'langcode';
 
-    $base_field_names = array('title', 'description', 'owner');
+    $base_field_names = ['title', 'description', 'owner'];
     $field_names = array_merge(array_values(array_filter($entity_keys)), $base_field_names);
     $this->fieldDefinitions = $this->mockFieldDefinitions($field_names);
 
@@ -707,33 +708,33 @@ class SqlContentEntityStorageTest extends UnitTestCase {
       ->will($this->returnValue('entity_test_field_data'));
     $this->entityType->expects($this->any())
       ->method('getKey')
-      ->will($this->returnValueMap(array(
-        array('id', $entity_keys['id']),
-        array('uuid', $entity_keys['uuid']),
-        array('bundle', $entity_keys['bundle']),
-        array('langcode', $entity_keys['langcode']),
-      )));
+      ->will($this->returnValueMap([
+        ['id', $entity_keys['id']],
+        ['uuid', $entity_keys['uuid']],
+        ['bundle', $entity_keys['bundle']],
+        ['langcode', $entity_keys['langcode']],
+      ]));
 
     $this->setUpEntityStorage();
 
     $mapping = $this->entityStorage->getTableMapping();
 
-    $expected = array('entity_test', 'entity_test_field_data');
+    $expected = ['entity_test', 'entity_test_field_data'];
     $this->assertEquals($expected, $mapping->getTableNames());
 
     $expected = array_values(array_filter($entity_keys));
     $actual = $mapping->getFieldNames('entity_test');
     $this->assertEquals($expected, $actual);
     // The UUID is not stored on the data table.
-    $expected = array_merge(array_filter(array(
+    $expected = array_merge(array_filter([
       $entity_keys['id'],
       $entity_keys['bundle'],
       $entity_keys['langcode'],
-    )), $base_field_names);
+    ]), $base_field_names);
     $actual = $mapping->getFieldNames('entity_test_field_data');
     $this->assertEquals($expected, $actual);
 
-    $expected = array();
+    $expected = [];
     $actual = $mapping->getExtraColumns('entity_test');
     $this->assertEquals($expected, $actual);
     $actual = $mapping->getExtraColumns('entity_test_field_data');
@@ -753,13 +754,13 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    */
   public function testGetTableMappingRevisionableTranslatable(array $entity_keys) {
     // This allows to re-use the data provider.
-    $entity_keys = array(
+    $entity_keys = [
       'id' => $entity_keys['id'],
       'revision' => 'test_revision',
       'bundle' => $entity_keys['bundle'],
       'uuid' => $entity_keys['uuid'],
       'langcode' => 'langcode',
-    );
+    ];
 
     $this->entityType->expects($this->atLeastOnce())
       ->method('isRevisionable')
@@ -772,64 +773,64 @@ class SqlContentEntityStorageTest extends UnitTestCase {
       ->will($this->returnValue('entity_test_field_data'));
     $this->entityType->expects($this->any())
       ->method('getKey')
-      ->will($this->returnValueMap(array(
-        array('id', $entity_keys['id']),
-        array('uuid', $entity_keys['uuid']),
-        array('bundle', $entity_keys['bundle']),
-        array('revision', $entity_keys['revision']),
-        array('langcode', $entity_keys['langcode']),
-      )));
+      ->will($this->returnValueMap([
+        ['id', $entity_keys['id']],
+        ['uuid', $entity_keys['uuid']],
+        ['bundle', $entity_keys['bundle']],
+        ['revision', $entity_keys['revision']],
+        ['langcode', $entity_keys['langcode']],
+      ]));
 
     $this->setUpEntityStorage();
 
     $mapping = $this->entityStorage->getTableMapping();
 
-    $expected = array(
+    $expected = [
       'entity_test',
       'entity_test_field_data',
       'entity_test_revision',
       'entity_test_field_revision',
-    );
+    ];
     $this->assertEquals($expected, $mapping->getTableNames());
 
     // The default language code is stored on the base table.
-    $expected = array_values(array_filter(array(
+    $expected = array_values(array_filter([
       $entity_keys['id'],
       $entity_keys['revision'],
       $entity_keys['bundle'],
       $entity_keys['uuid'],
       $entity_keys['langcode'],
-    )));
+    ]));
     $actual = $mapping->getFieldNames('entity_test');
     $this->assertEquals($expected, $actual);
     // The revision table on the other hand does not store the bundle and the
     // UUID.
-    $expected = array_values(array_filter(array(
+    $expected = array_values(array_filter([
       $entity_keys['id'],
       $entity_keys['revision'],
       $entity_keys['langcode'],
-    )));
+    ]));
     $actual = $mapping->getFieldNames('entity_test_revision');
     $this->assertEquals($expected, $actual);
     // The UUID is not stored on the data table.
-    $expected = array_values(array_filter(array(
+    $expected = array_values(array_filter([
       $entity_keys['id'],
       $entity_keys['revision'],
       $entity_keys['bundle'],
       $entity_keys['langcode'],
-    )));
+    ]));
     $actual = $mapping->getFieldNames('entity_test_field_data');
     $this->assertEquals($expected, $actual);
     // The data revision also does not store the bundle.
-    $expected = array_values(array_filter(array(
+    $expected = array_values(array_filter([
       $entity_keys['id'],
       $entity_keys['revision'],
       $entity_keys['langcode'],
-    )));
+    ]));
     $actual = $mapping->getFieldNames('entity_test_field_revision');
     $this->assertEquals($expected, $actual);
 
-    $expected = array();
+    $expected = [];
     $actual = $mapping->getExtraColumns('entity_test');
     $this->assertEquals($expected, $actual);
     $actual = $mapping->getExtraColumns('entity_test_revision');
@@ -853,34 +854,34 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    */
   public function testGetTableMappingRevisionableTranslatableWithFields(array $entity_keys) {
     // This allows to re-use the data provider.
-    $entity_keys = array(
+    $entity_keys = [
       'id' => $entity_keys['id'],
       'revision' => 'test_revision',
       'bundle' => $entity_keys['bundle'],
       'uuid' => $entity_keys['uuid'],
       'langcode' => 'langcode',
-    );
+    ];
 
     // PHPUnit does not allow for multiple data providers.
-    $test_cases = array(
-      array(),
-      array('revision_timestamp'),
-      array('revision_uid'),
-      array('revision_log'),
-      array('revision_timestamp', 'revision_uid'),
-      array('revision_timestamp', 'revision_log'),
-      array('revision_uid', 'revision_log'),
-      array('revision_timestamp', 'revision_uid', 'revision_log'),
-    );
+    $test_cases = [
+      [],
+      ['revision_timestamp'],
+      ['revision_uid'],
+      ['revision_log'],
+      ['revision_timestamp', 'revision_uid'],
+      ['revision_timestamp', 'revision_log'],
+      ['revision_uid', 'revision_log'],
+      ['revision_timestamp', 'revision_uid', 'revision_log'],
+    ];
     foreach ($test_cases as $revision_metadata_field_names) {
       $this->setUp();
 
-      $base_field_names = array('title');
+      $base_field_names = ['title'];
       $field_names = array_merge(array_values(array_filter($entity_keys)), $base_field_names);
       $this->fieldDefinitions = $this->mockFieldDefinitions($field_names);
 
-      $revisionable_field_names = array('description', 'owner');
-      $this->fieldDefinitions += $this->mockFieldDefinitions(array_merge($revisionable_field_names, $revision_metadata_field_names), array('isRevisionable' => TRUE));
+      $revisionable_field_names = ['description', 'owner'];
+      $this->fieldDefinitions += $this->mockFieldDefinitions(array_merge($revisionable_field_names, $revision_metadata_field_names), ['isRevisionable' => TRUE]);
 
       $this->entityType->expects($this->atLeastOnce())
         ->method('isRevisionable')
@@ -893,72 +894,72 @@ class SqlContentEntityStorageTest extends UnitTestCase {
         ->will($this->returnValue('entity_test_field_data'));
       $this->entityType->expects($this->any())
         ->method('getKey')
-        ->will($this->returnValueMap(array(
-          array('id', $entity_keys['id']),
-          array('uuid', $entity_keys['uuid']),
-          array('bundle', $entity_keys['bundle']),
-          array('revision', $entity_keys['revision']),
-          array('langcode', $entity_keys['langcode']),
-        )));
+        ->will($this->returnValueMap([
+          ['id', $entity_keys['id']],
+          ['uuid', $entity_keys['uuid']],
+          ['bundle', $entity_keys['bundle']],
+          ['revision', $entity_keys['revision']],
+          ['langcode', $entity_keys['langcode']],
+        ]));
 
       $this->setUpEntityStorage();
 
       $mapping = $this->entityStorage->getTableMapping();
 
-      $expected = array(
+      $expected = [
         'entity_test',
         'entity_test_field_data',
         'entity_test_revision',
         'entity_test_field_revision',
-      );
+      ];
       $this->assertEquals($expected, $mapping->getTableNames());
 
-      $expected = array(
+      $expected = [
         'entity_test',
         'entity_test_field_data',
         'entity_test_revision',
         'entity_test_field_revision',
-      );
+      ];
       $this->assertEquals($expected, $mapping->getTableNames());
 
       // The default language code is not stored on the base table.
-      $expected = array_values(array_filter(array(
+      $expected = array_values(array_filter([
         $entity_keys['id'],
         $entity_keys['revision'],
         $entity_keys['bundle'],
         $entity_keys['uuid'],
         $entity_keys['langcode'],
-      )));
+      ]));
       $actual = $mapping->getFieldNames('entity_test');
       $this->assertEquals($expected, $actual);
       // The revision table on the other hand does not store the bundle and the
       // UUID.
-      $expected = array_merge(array_filter(array(
+      $expected = array_merge(array_filter([
         $entity_keys['id'],
         $entity_keys['revision'],
         $entity_keys['langcode'],
-      )), $revision_metadata_field_names);
+      ]), $revision_metadata_field_names);
       $actual = $mapping->getFieldNames('entity_test_revision');
       $this->assertEquals($expected, $actual);
       // The UUID is not stored on the data table.
-      $expected = array_merge(array_filter(array(
+      $expected = array_merge(array_filter([
         $entity_keys['id'],
         $entity_keys['revision'],
         $entity_keys['bundle'],
         $entity_keys['langcode'],
-      )), $base_field_names, $revisionable_field_names);
+      ]), $base_field_names, $revisionable_field_names);
       $actual = $mapping->getFieldNames('entity_test_field_data');
       $this->assertEquals($expected, $actual);
       // The data revision also does not store the bundle.
-      $expected = array_merge(array_filter(array(
+      $expected = array_merge(array_filter([
         $entity_keys['id'],
         $entity_keys['revision'],
         $entity_keys['langcode'],
-      )), $revisionable_field_names);
+      ]), $revisionable_field_names);
       $actual = $mapping->getFieldNames('entity_test_field_revision');
       $this->assertEquals($expected, $actual);
 
-      $expected = array();
+      $expected = [];
       $actual = $mapping->getExtraColumns('entity_test');
       $this->assertEquals($expected, $actual);
       $actual = $mapping->getExtraColumns('entity_test_revision');
@@ -976,7 +977,7 @@ class SqlContentEntityStorageTest extends UnitTestCase {
   public function testCreate() {
     $language_manager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
 
-    $language = new Language(array('id' => 'en'));
+    $language = new Language(['id' => 'en']);
     $language_manager->expects($this->any())
       ->method('getCurrentLanguage')
       ->will($this->returnValue($language));
@@ -987,7 +988,7 @@ class SqlContentEntityStorageTest extends UnitTestCase {
 
     $entity = $this->getMockBuilder('Drupal\Core\Entity\ContentEntityBase')
       ->disableOriginalConstructor()
-      ->setMethods(array('id'))
+      ->setMethods(['id'])
       ->getMockForAbstractClass();
 
     $this->entityType->expects($this->atLeastOnce())
@@ -998,13 +999,13 @@ class SqlContentEntityStorageTest extends UnitTestCase {
       ->will($this->returnValue(get_class($entity)));
     $this->entityType->expects($this->atLeastOnce())
       ->method('getKeys')
-      ->will($this->returnValue(array('id' => 'id')));
+      ->will($this->returnValue(['id' => 'id']));
 
     // ContentEntityStorageBase iterates over the entity which calls this method
     // internally in ContentEntityBase::getProperties().
     $this->entityManager->expects($this->once())
       ->method('getFieldDefinitions')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $this->entityType->expects($this->atLeastOnce())
       ->method('isRevisionable')
@@ -1038,14 +1039,14 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    * @return \Drupal\Tests\Core\Field\TestBaseFieldDefinitionInterface[]|\PHPUnit_Framework_MockObject_MockObject[]
    *   An array of mock base field definitions.
    */
-  protected function mockFieldDefinitions(array $field_names, $methods = array()) {
-    $field_definitions = array();
+  protected function mockFieldDefinitions(array $field_names, $methods = []) {
+    $field_definitions = [];
     $definition = $this->getMock('Drupal\Tests\Core\Field\TestBaseFieldDefinitionInterface');
 
     // Assign common method return values.
-    $methods += array(
+    $methods += [
       'isBaseField' => TRUE,
-    );
+    ];
     foreach ($methods as $method => $result) {
       $definition
         ->expects($this->any())
@@ -1116,15 +1117,15 @@ class SqlContentEntityStorageTest extends UnitTestCase {
 
     $this->cache->expects($this->once())
       ->method('getMultiple')
-      ->with(array($key))
-      ->will($this->returnValue(array($key => (object) array(
+      ->with([$key])
+      ->will($this->returnValue([$key => (object) [
           'data' => $entity,
-        ))));
+        ]]));
     $this->cache->expects($this->never())
       ->method('set');
 
     $this->setUpEntityStorage();
-    $entities = $this->entityStorage->loadMultiple(array($id));
+    $entities = $this->entityStorage->loadMultiple([$id]);
     $this->assertEquals($entity, $entities[$id]);
   }
 
@@ -1162,17 +1163,17 @@ class SqlContentEntityStorageTest extends UnitTestCase {
       ->method('set');
 
     $entity_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage')
-      ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager))
-      ->setMethods(array('getFromStorage', 'invokeStorageLoadHook'))
+      ->setConstructorArgs([$this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager])
+      ->setMethods(['getFromStorage', 'invokeStorageLoadHook'])
       ->getMock();
     $entity_storage->method('invokeStorageLoadHook')
       ->willReturn(NULL);
     $entity_storage->expects($this->once())
       ->method('getFromStorage')
-      ->with(array($id))
-      ->will($this->returnValue(array($id => $entity)));
+      ->with([$id])
+      ->will($this->returnValue([$id => $entity]));
 
-    $entities = $entity_storage->loadMultiple(array($id));
+    $entities = $entity_storage->loadMultiple([$id]);
     $this->assertEquals($entity, $entities[$id]);
   }
 
@@ -1207,24 +1208,24 @@ class SqlContentEntityStorageTest extends UnitTestCase {
     $key = 'values:' . $this->entityTypeId . ':1';
     $this->cache->expects($this->once())
       ->method('getMultiple')
-      ->with(array($key))
-      ->will($this->returnValue(array()));
+      ->with([$key])
+      ->will($this->returnValue([]));
     $this->cache->expects($this->once())
       ->method('set')
-      ->with($key, $entity, CacheBackendInterface::CACHE_PERMANENT, array($this->entityTypeId . '_values', 'entity_field_info'));
+      ->with($key, $entity, CacheBackendInterface::CACHE_PERMANENT, [$this->entityTypeId . '_values', 'entity_field_info']);
 
     $entity_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage')
-      ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager))
-      ->setMethods(array('getFromStorage', 'invokeStorageLoadHook'))
+      ->setConstructorArgs([$this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager])
+      ->setMethods(['getFromStorage', 'invokeStorageLoadHook'])
       ->getMock();
     $entity_storage->method('invokeStorageLoadHook')
       ->willReturn(NULL);
     $entity_storage->expects($this->once())
       ->method('getFromStorage')
-      ->with(array($id))
-      ->will($this->returnValue(array($id => $entity)));
+      ->with([$id])
+      ->will($this->returnValue([$id => $entity]));
 
-    $entities = $entity_storage->loadMultiple(array($id));
+    $entities = $entity_storage->loadMultiple([$id]);
     $this->assertEquals($entity, $entities[$id]);
   }
 
@@ -1243,11 +1244,9 @@ class SqlContentEntityStorageTest extends UnitTestCase {
       ->willReturn($query);
     $query->expects(($this->once()))
       ->method('execute')
-      ->willReturn(array(5));
+      ->willReturn([5]);
 
-    $factory = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryFactory')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $factory = $this->getMock(QueryFactoryInterface::class);
     $factory->expects($this->once())
       ->method('get')
       ->with($this->entityType, 'AND')
@@ -1282,7 +1281,7 @@ class SqlContentEntityStorageTest extends UnitTestCase {
    * Tests entity ID sanitization.
    */
   public function testCleanIds() {
-    $valid_ids = array(
+    $valid_ids = [
       -1,
       0,
       1,
@@ -1310,9 +1309,9 @@ class SqlContentEntityStorageTest extends UnitTestCase {
       0.00,
       1.00,
       10.00,
-    );
+    ];
 
-    $this->fieldDefinitions = $this->mockFieldDefinitions(array('id'));
+    $this->fieldDefinitions = $this->mockFieldDefinitions(['id']);
     $this->fieldDefinitions['id']->expects($this->any())
       ->method('getType')
       ->will($this->returnValue('integer'));
@@ -1322,14 +1321,14 @@ class SqlContentEntityStorageTest extends UnitTestCase {
     $this->entityType->expects($this->any())
       ->method('getKey')
       ->will($this->returnValueMap(
-        array(array('id', 'id'))
+        [['id', 'id']]
       ));
 
     $method = new \ReflectionMethod($this->entityStorage, 'cleanIds');
     $method->setAccessible(TRUE);
     $this->assertEquals($valid_ids, $method->invoke($this->entityStorage, $valid_ids));
 
-    $invalid_ids = array(
+    $invalid_ids = [
       '--1',
       '-0x1A',
       '0x1AFC',
@@ -1342,8 +1341,8 @@ class SqlContentEntityStorageTest extends UnitTestCase {
       '32acb',
       123.123,
       123.678,
-    );
-    $this->assertEquals(array(), $method->invoke($this->entityStorage, $invalid_ids));
+    ];
+    $this->assertEquals([], $method->invoke($this->entityStorage, $invalid_ids));
 
   }
 
@@ -1353,10 +1352,10 @@ class SqlContentEntityStorageTest extends UnitTestCase {
   protected function setUpModuleHandlerNoImplementations() {
     $this->moduleHandler->expects($this->any())
       ->method('getImplementations')
-      ->will($this->returnValueMap(array(
-        array('entity_load', array()),
-        array($this->entityTypeId . '_load', array())
-      )));
+      ->will($this->returnValueMap([
+        ['entity_load', []],
+        [$this->entityTypeId . '_load', []]
+      ]));
 
     $this->container->set('module_handler', $this->moduleHandler);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php b/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
index 646f17a3a..953daac88 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
@@ -6,6 +6,7 @@ use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Entity\Plugin\DataType\EntityAdapter;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\TypedData\Exception\MissingDataException;
 use Drupal\Core\TypedData\TypedDataManagerInterface;
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Language\Language;
@@ -113,21 +114,21 @@ class EntityAdapterUnitTest extends UnitTestCase {
    */
   protected function setUp() {
     $this->id = 1;
-    $values = array(
+    $values = [
       'id' => $this->id,
       'uuid' => '3bb9ee60-bea5-4622-b89b-a63319d10b3a',
-      'defaultLangcode' => array(LanguageInterface::LANGCODE_DEFAULT => 'en'),
-    );
+      'defaultLangcode' => [LanguageInterface::LANGCODE_DEFAULT => 'en'],
+    ];
     $this->entityTypeId = $this->randomMachineName();
     $this->bundle = $this->randomMachineName();
 
     $this->entityType = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getKeys')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         'id' => 'id',
         'uuid' => 'uuid',
-    )));
+    ]));
 
     $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
     $this->entityManager->expects($this->any())
@@ -156,11 +157,11 @@ class EntityAdapterUnitTest extends UnitTestCase {
       ->method('getValidationConstraintManager')
       ->willReturn($validation_constraint_manager);
 
-    $not_specified = new Language(array('id' => LanguageInterface::LANGCODE_NOT_SPECIFIED, 'locked' => TRUE));
+    $not_specified = new Language(['id' => LanguageInterface::LANGCODE_NOT_SPECIFIED, 'locked' => TRUE]);
     $this->languageManager = $this->getMock('\Drupal\Core\Language\LanguageManagerInterface');
     $this->languageManager->expects($this->any())
       ->method('getLanguages')
-      ->will($this->returnValue(array(LanguageInterface::LANGCODE_NOT_SPECIFIED => $not_specified)));
+      ->will($this->returnValue([LanguageInterface::LANGCODE_NOT_SPECIFIED => $not_specified]));
 
     $this->languageManager->expects($this->any())
       ->method('getLanguage')
@@ -172,10 +173,10 @@ class EntityAdapterUnitTest extends UnitTestCase {
       ->getMock();
     $this->fieldTypePluginManager->expects($this->any())
       ->method('getDefaultStorageSettings')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $this->fieldTypePluginManager->expects($this->any())
       ->method('getDefaultFieldSettings')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $this->fieldItemList = $this->getMock('\Drupal\Core\Field\FieldItemListInterface');
     $this->fieldTypePluginManager->expects($this->any())
@@ -190,16 +191,16 @@ class EntityAdapterUnitTest extends UnitTestCase {
     $container->set('plugin.manager.field.field_type', $this->fieldTypePluginManager);
     \Drupal::setContainer($container);
 
-    $this->fieldDefinitions = array(
+    $this->fieldDefinitions = [
       'id' => BaseFieldDefinition::create('integer'),
       'revision_id' => BaseFieldDefinition::create('integer'),
-    );
+    ];
 
     $this->entityManager->expects($this->any())
       ->method('getFieldDefinitions')
       ->with($this->entityTypeId, $this->bundle)
       ->will($this->returnValue($this->fieldDefinitions));
-    $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Entity\ContentEntityBase', array($values, $this->entityTypeId, $this->bundle));
+    $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Entity\ContentEntityBase', [$values, $this->entityTypeId, $this->bundle]);
 
     $this->entityAdapter = EntityAdapter::createFromEntity($this->entity);
   }
@@ -275,18 +276,18 @@ class EntityAdapterUnitTest extends UnitTestCase {
 
   /**
    * @covers ::get
-   * @expectedException \InvalidArgumentException
    */
   public function testGetInvalidField() {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->entityAdapter->get('invalid');
   }
 
   /**
    * @covers ::get
-   * @expectedException \Drupal\Core\TypedData\Exception\MissingDataException
    */
   public function testGetWithoutData() {
     $this->entityAdapter->setValue(NULL);
+    $this->setExpectedException(MissingDataException::class);
     $this->entityAdapter->get('id');
   }
 
@@ -294,7 +295,7 @@ class EntityAdapterUnitTest extends UnitTestCase {
    * @covers ::set
    */
   public function testSet() {
-    $id_items = [ array('value' => $this->id + 1) ];
+    $id_items = [ ['value' => $this->id + 1] ];
 
     $this->fieldItemList->expects($this->once())
       ->method('setValue')
@@ -305,11 +306,11 @@ class EntityAdapterUnitTest extends UnitTestCase {
 
   /**
    * @covers ::set
-   * @expectedException \Drupal\Core\TypedData\Exception\MissingDataException
    */
   public function testSetWithoutData() {
     $this->entityAdapter->setValue(NULL);
-    $id_items = [ array('value' => $this->id + 1) ];
+    $id_items = [ ['value' => $this->id + 1] ];
+    $this->setExpectedException(MissingDataException::class);
     $this->entityAdapter->set('id', $id_items);
   }
 
@@ -335,10 +336,10 @@ class EntityAdapterUnitTest extends UnitTestCase {
 
   /**
    * @covers ::toArray
-   * @expectedException \Drupal\Core\TypedData\Exception\MissingDataException
    */
   public function testToArrayWithoutData() {
     $this->entityAdapter->setValue(NULL);
+    $this->setExpectedException(MissingDataException::class);
     $this->entityAdapter->toArray();
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php
index 0597e8c9a..f60fe6867 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/ActiveLinkResponseFilterTest.php
@@ -28,24 +28,24 @@ class ActiveLinkResponseFilterTest extends UnitTestCase {
   <track kind="captions" src="foo.en.vtt" srclang="en" label="English">
   <track kind="captions" src="foo.sv.vtt" srclang="sv" label="Svenska">
 </audio>';
-    $html = array(
+    $html = [
       // Simple HTML.
-      0 => array('prefix' => '<div><p>', 'suffix' => '</p></div>'),
+      0 => ['prefix' => '<div><p>', 'suffix' => '</p></div>'],
       // Tricky HTML5 example that's unsupported by PHP <=5.4's DOMDocument:
       // https://www.drupal.org/comment/7938201#comment-7938201.
-      1 => array('prefix' => '<div><p>', 'suffix' => '</p>' . $edge_case_html5 . '</div>'),
+      1 => ['prefix' => '<div><p>', 'suffix' => '</p>' . $edge_case_html5 . '</div>'],
       // Multi-byte content *before* the HTML that needs the "is-active" class.
-      2 => array('prefix' => '<div><p>αβγδεζηθικλμνξοσὠ</p><p>', 'suffix' => '</p></div>'),
-    );
-    $tags = array(
+      2 => ['prefix' => '<div><p>αβγδεζηθικλμνξοσὠ</p><p>', 'suffix' => '</p></div>'],
+    ];
+    $tags = [
       // Of course, it must work on anchors.
       'a',
       // Unfortunately, it must also work on list items.
       'li',
       // … and therefor, on *any* tag, really.
       'foo',
-    );
-    $contents = array(
+    ];
+    $contents = [
       // Regular content.
       'test',
       // Mix of UTF-8 and HTML entities, both must be retained.
@@ -55,191 +55,191 @@ class ActiveLinkResponseFilterTest extends UnitTestCase {
       // Text that closely approximates an important attribute, but should be
       // ignored.
       'data-drupal-link-system-path=&quot;&lt;front&gt;&quot;',
-    );
+    ];
 
     // Define all variations that *do* affect whether or not an "is-active"
     // class is set: all possible situations that can be encountered.
-    $situations = array();
+    $situations = [];
 
     // Situations with context: front page, English, no query.
-    $context = array(
+    $context = [
       'path' => 'myfrontpage',
       'front' => TRUE,
       'language' => 'en',
-      'query' => array(),
-    );
+      'query' => [],
+    ];
     // Nothing to do.
     $markup = '<foo>bar</foo>';
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => array());
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => []];
     // Matching path, plus all matching variations.
-    $attributes = array(
+    $attributes = [
       'data-drupal-link-system-path' => 'myfrontpage',
-    );
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes);
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes + array('hreflang' => 'en'));
+    ];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes + ['hreflang' => 'en']];
     // Matching path, plus all non-matching variations.
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => '{"foo":"bar"}'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => TRUE));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en', 'data-drupal-link-query' => '{"foo":"bar"}'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en', 'data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en', 'data-drupal-link-query' => TRUE));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => '{"foo":"bar"}']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => TRUE]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => '{"foo":"bar"}']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => TRUE]];
     // Special matching path, plus all variations.
-    $attributes = array(
+    $attributes = [
       'data-drupal-link-system-path' => '<front>',
-    );
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes);
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes + array('hreflang' => 'en'));
+    ];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes + ['hreflang' => 'en']];
     // Special matching path, plus all non-matching variations.
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => '{"foo":"bar"}'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => TRUE));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en', 'data-drupal-link-query' => '{"foo":"bar"}'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en', 'data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en', 'data-drupal-link-query' => TRUE));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => '{"foo":"bar"}']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => TRUE]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => '{"foo":"bar"}']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => TRUE]];
 
     // Situations with context: non-front page, Dutch, no query.
-    $context = array(
+    $context = [
       'path' => 'llama',
       'front' => FALSE,
       'language' => 'nl',
-      'query' => array(),
-    );
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => array());
+      'query' => [],
+    ];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => []];
     // Matching path, plus all matching variations.
-    $attributes = array(
+    $attributes = [
       'data-drupal-link-system-path' => 'llama',
-    );
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes);
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes + array('hreflang' => 'nl'));
+    ];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes + ['hreflang' => 'nl']];
     // Matching path, plus all non-matching variations.
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => '{"foo":"bar"}'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => TRUE));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => '{"foo":"bar"}'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => TRUE));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => '{"foo":"bar"}']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => TRUE]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => '{"foo":"bar"}']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => TRUE]];
     // Special non-matching path, plus all variations.
-    $attributes = array(
+    $attributes = [
       'data-drupal-link-system-path' => '<front>',
-    );
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes);
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => '{"foo":"bar"}'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => TRUE));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => '{"foo":"bar"}'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => TRUE));
+    ];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => '{"foo":"bar"}']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => TRUE]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => '{"foo":"bar"}']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => TRUE]];
 
     // Situations with context: non-front page, Dutch, with query.
-    $context = array(
+    $context = [
       'path' => 'llama',
       'front' => FALSE,
       'language' => 'nl',
-      'query' => array('foo' => 'bar'),
-    );
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => array());
+      'query' => ['foo' => 'bar'],
+    ];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => []];
     // Matching path, plus all matching variations.
-    $attributes = array(
+    $attributes = [
       'data-drupal-link-system-path' => 'llama',
-      'data-drupal-link-query' => Json::encode(array('foo' => 'bar')),
-    );
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes);
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes + array('hreflang' => 'nl'));
+      'data-drupal-link-query' => Json::encode(['foo' => 'bar']),
+    ];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes + ['hreflang' => 'nl']];
     // Matching path, plus all non-matching variations.
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en'));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en']];
     unset($attributes['data-drupal-link-query']);
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => TRUE));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => TRUE]];
     // Special non-matching path, plus all variations.
-    $attributes = array(
+    $attributes = [
       'data-drupal-link-system-path' => '<front>',
-    );
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes);
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en'));
+    ];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en']];
     unset($attributes['data-drupal-link-query']);
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => TRUE));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => TRUE]];
 
     // Situations with context: non-front page, Dutch, with query.
-    $context = array(
+    $context = [
       'path' => 'llama',
       'front' => FALSE,
       'language' => 'nl',
-      'query' => array('foo' => 'bar'),
-    );
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => array());
+      'query' => ['foo' => 'bar'],
+    ];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => []];
     // Matching path, plus all matching variations.
-    $attributes = array(
+    $attributes = [
       'data-drupal-link-system-path' => 'llama',
-      'data-drupal-link-query' => Json::encode(array('foo' => 'bar')),
-    );
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes);
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes + array('hreflang' => 'nl'));
+      'data-drupal-link-query' => Json::encode(['foo' => 'bar']),
+    ];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes + ['hreflang' => 'nl']];
     // Matching path, plus all non-matching variations.
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en'));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en']];
     unset($attributes['data-drupal-link-query']);
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => TRUE));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => TRUE));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => TRUE]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => TRUE]];
     // Special non-matching path, plus all variations.
-    $attributes = array(
+    $attributes = [
       'data-drupal-link-system-path' => '<front>',
-    );
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes);
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl'));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en'));
+    ];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl']];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en']];
     unset($attributes['data-drupal-link-query']);
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => TRUE));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl', 'data-drupal-link-query' => TRUE));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => TRUE]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl', 'data-drupal-link-query' => TRUE]];
 
     // Situations with context: front page, English, query.
-    $context = array(
+    $context = [
       'path' => 'myfrontpage',
       'front' => TRUE,
       'language' => 'en',
-      'query' => array('foo' => 'bar'),
-    );
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => array());
+      'query' => ['foo' => 'bar'],
+    ];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => []];
     // Matching path, plus all matching variations.
-    $attributes = array(
+    $attributes = [
       'data-drupal-link-system-path' => 'myfrontpage',
-      'data-drupal-link-query' => Json::encode(array('foo' => 'bar')),
-    );
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes);
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes + array('hreflang' => 'en'));
+      'data-drupal-link-query' => Json::encode(['foo' => 'bar']),
+    ];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes + ['hreflang' => 'en']];
     // Matching path, plus all non-matching variations.
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl'));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl']];
     unset($attributes['data-drupal-link-query']);
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => TRUE));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en', 'data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en', 'data-drupal-link-query' => TRUE));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => TRUE]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => TRUE]];
     // Special matching path, plus all variations.
-    $attributes = array(
+    $attributes = [
       'data-drupal-link-system-path' => '<front>',
-      'data-drupal-link-query' => Json::encode(array('foo' => 'bar')),
-    );
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes);
-    $situations[] = array('context' => $context, 'is active' => TRUE, 'attributes' => $attributes + array('hreflang' => 'en'));
+      'data-drupal-link-query' => Json::encode(['foo' => 'bar']),
+    ];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes];
+    $situations[] = ['context' => $context, 'is active' => TRUE, 'attributes' => $attributes + ['hreflang' => 'en']];
     // Special matching path, plus all non-matching variations.
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'nl'));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'nl']];
     unset($attributes['data-drupal-link-query']);
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('data-drupal-link-query' => TRUE));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en', 'data-drupal-link-query' => ""));
-    $situations[] = array('context' => $context, 'is active' => FALSE, 'attributes' => $attributes + array('hreflang' => 'en', 'data-drupal-link-query' => TRUE));
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['data-drupal-link-query' => TRUE]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => ""]];
+    $situations[] = ['context' => $context, 'is active' => FALSE, 'attributes' => $attributes + ['hreflang' => 'en', 'data-drupal-link-query' => TRUE]];
 
     // Loop over the surrounding HTML variations.
-    $data = array();
+    $data = [];
     for ($h = 0; $h < count($html); $h++) {
       $html_prefix = $html[$h]['prefix'];
       $html_suffix = $html[$h]['suffix'];
@@ -272,13 +272,13 @@ class ActiveLinkResponseFilterTest extends UnitTestCase {
             else {
               $active_attributes = $situation['attributes'];
               if (!isset($active_attributes['class'])) {
-                $active_attributes['class'] = array();
+                $active_attributes['class'] = [];
               }
               $active_attributes['class'][] = 'is-active';
               $target_markup = $create_markup(new Attribute($active_attributes));
             }
 
-            $data[] = array($source_markup, $situation['context']['path'], $situation['context']['front'], $situation['context']['language'], $situation['context']['query'], $target_markup);
+            $data[] = [$source_markup, $situation['context']['path'], $situation['context']['front'], $situation['context']['language'], $situation['context']['query'], $target_markup];
           }
         }
       }
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
index 81e7cc6a1..38cc28cc9 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
@@ -126,7 +126,7 @@ class CustomPageExceptionHtmlSubscriberTest extends UnitTestCase {
    * Tests onHandleException with a POST request.
    */
   public function testHandleWithPostRequest() {
-    $request = Request::create('/test', 'POST', array('name' => 'druplicon', 'pass' => '12345'));
+    $request = Request::create('/test', 'POST', ['name' => 'druplicon', 'pass' => '12345']);
 
     $request_context = new RequestContext();
     $request_context->fromRequest($request);
@@ -152,7 +152,7 @@ class CustomPageExceptionHtmlSubscriberTest extends UnitTestCase {
    * Tests onHandleException with a GET request.
    */
   public function testHandleWithGetRequest() {
-    $request = Request::create('/test', 'GET', array('name' => 'druplicon', 'pass' => '12345'));
+    $request = Request::create('/test', 'GET', ['name' => 'druplicon', 'pass' => '12345']);
     $request->attributes->set(AccessAwareRouterInterface::ACCESS_RESULT, AccessResult::forbidden()->addCacheTags(['druplicon']));
 
     $request_context = new RequestContext();
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/DefaultExceptionSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/DefaultExceptionSubscriberTest.php
index 541d13636..6582500ee 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/DefaultExceptionSubscriberTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/DefaultExceptionSubscriberTest.php
@@ -23,10 +23,9 @@ class DefaultExceptionSubscriberTest extends UnitTestCase {
   public function testOnExceptionWithUnknownFormat() {
     $config_factory = $this->getConfigFactoryStub();
 
-    // Format 'bananas' requested, yet only 'json' allowed.
     $kernel = $this->prophesize(HttpKernelInterface::class);
     $request = Request::create('/test?_format=bananas');
-    $e = new MethodNotAllowedHttpException(['json'], 'test message');
+    $e = new MethodNotAllowedHttpException(['POST', 'PUT'], 'test message');
     $event = new GetResponseForExceptionEvent($kernel->reveal(), $request, 'GET', $e);
     $subscriber = new DefaultExceptionSubscriber($config_factory);
     $subscriber->onException($event);
@@ -35,6 +34,9 @@ class DefaultExceptionSubscriberTest extends UnitTestCase {
     $this->assertInstanceOf(Response::class, $response);
     $this->assertEquals('test message', $response->getContent());
     $this->assertEquals(405, $response->getStatusCode());
+    $this->assertEquals('POST, PUT', $response->headers->get('Allow'));
+    // Also check that that text/plain content type was added.
+    $this->assertEquals('text/plain', $response->headers->get('Content-Type'));
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/ExceptionJsonSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/ExceptionJsonSubscriberTest.php
new file mode 100644
index 000000000..86c6d86bf
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/ExceptionJsonSubscriberTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\Tests\Core\EventSubscriber;
+
+use Drupal\Core\EventSubscriber\ExceptionJsonSubscriber;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * @coversDefaultClass \Drupal\Core\EventSubscriber\ExceptionJsonSubscriber
+ * @group EventSubscriber
+ */
+class ExceptionJsonSubscriberTest extends UnitTestCase {
+
+  /**
+   * @covers ::on4xx
+   */
+  public function testOn4xx() {
+    $kernel = $this->prophesize(HttpKernelInterface::class);
+    $request = Request::create('/test');
+    $e = new MethodNotAllowedHttpException(['POST', 'PUT'], 'test message');
+    $event = new GetResponseForExceptionEvent($kernel->reveal(), $request, 'GET', $e);
+    $subscriber = new ExceptionJsonSubscriber();
+    $subscriber->on4xx($event);
+    $response = $event->getResponse();
+
+    $this->assertInstanceOf(JsonResponse::class, $response);
+    $this->assertEquals('{"message":"test message"}', $response->getContent());
+    $this->assertEquals(405, $response->getStatusCode());
+    $this->assertEquals('POST, PUT', $response->headers->get('Allow'));
+    $this->assertEquals('application/json', $response->headers->get('Content-Type'));
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
index a3e5a8e93..6528d7327 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
@@ -24,10 +24,10 @@ class ModuleRouteSubscriberTest extends UnitTestCase {
   protected function setUp() {
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
 
-    $value_map = array(
-      array('enabled', TRUE),
-      array('disabled', FALSE),
-    );
+    $value_map = [
+      ['enabled', TRUE],
+      ['disabled', FALSE],
+    ];
 
     $this->moduleHandler->expects($this->any())
       ->method('moduleExists')
@@ -49,7 +49,7 @@ class ModuleRouteSubscriberTest extends UnitTestCase {
    */
   public function testRemoveRoute($route_name, array $requirements, $removed) {
     $collection = new RouteCollection();
-    $route = new Route('', array(), $requirements);
+    $route = new Route('', [], $requirements);
     $collection->add($route_name, $route);
 
     $event = new RouteBuildEvent($collection, 'test');
@@ -68,18 +68,18 @@ class ModuleRouteSubscriberTest extends UnitTestCase {
    * Data provider for testRemoveRoute().
    */
   public function providerTestRemoveRoute() {
-    return array(
-      array('enabled', array('_module_dependencies' => 'enabled'), FALSE),
-      array('disabled', array('_module_dependencies' => 'disabled'), TRUE),
-      array('enabled_or', array('_module_dependencies' => 'disabled,enabled'), FALSE),
-      array('enabled_or', array('_module_dependencies' => 'enabled,disabled'), FALSE),
-      array('disabled_or', array('_module_dependencies' => 'disabled,disabled'), TRUE),
-      array('enabled_and', array('_module_dependencies' => 'enabled+enabled'), FALSE),
-      array('enabled_and', array('_module_dependencies' => 'enabled+disabled'), TRUE),
-      array('enabled_and', array('_module_dependencies' => 'disabled+enabled'), TRUE),
-      array('disabled_and', array('_module_dependencies' => 'disabled+disabled'), TRUE),
-      array('no_dependencies', array(), FALSE),
-    );
+    return [
+      ['enabled', ['_module_dependencies' => 'enabled'], FALSE],
+      ['disabled', ['_module_dependencies' => 'disabled'], TRUE],
+      ['enabled_or', ['_module_dependencies' => 'disabled,enabled'], FALSE],
+      ['enabled_or', ['_module_dependencies' => 'enabled,disabled'], FALSE],
+      ['disabled_or', ['_module_dependencies' => 'disabled,disabled'], TRUE],
+      ['enabled_and', ['_module_dependencies' => 'enabled+enabled'], FALSE],
+      ['enabled_and', ['_module_dependencies' => 'enabled+disabled'], TRUE],
+      ['enabled_and', ['_module_dependencies' => 'disabled+enabled'], TRUE],
+      ['disabled_and', ['_module_dependencies' => 'disabled+disabled'], TRUE],
+      ['no_dependencies', [], FALSE],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
index 96a922829..ea4ec9f8d 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/PathRootsSubscriberTest.php
@@ -66,7 +66,7 @@ class PathRootsSubscriberTest extends UnitTestCase {
 
     $this->state->expects($this->once())
       ->method('set')
-      ->with('router.path_roots', array('test', 'test2', 'test1'));
+      ->with('router.path_roots', ['test', 'test2', 'test1']);
 
     $this->pathRootsSubscriber->onRouteFinished();
   }
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php
index b945b141f..08c1a6cc9 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php
@@ -82,7 +82,7 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
     $request->headers->set('HOST', 'example.com');
 
     $listener = new RedirectResponseSubscriber($this->urlAssembler, $this->requestContext);
-    $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'checkRedirectUrl'));
+    $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'checkRedirectUrl']);
     $event = new FilterResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST, $response);
     $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
 
@@ -101,22 +101,20 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
    * @see \Drupal\Tests\Core\EventSubscriber\RedirectResponseSubscriberTest::testDestinationRedirect()
    */
   public static function providerTestDestinationRedirect() {
-    return array(
-      array(new Request(), FALSE),
-      array(new Request(array('destination' => 'test')), 'http://example.com/drupal/test'),
-      array(new Request(array('destination' => '/drupal/test')), 'http://example.com/drupal/test'),
-      array(new Request(array('destination' => 'example.com')), 'http://example.com/drupal/example.com'),
-      array(new Request(array('destination' => 'example:com')), 'http://example.com/drupal/example:com'),
-      array(new Request(array('destination' => 'javascript:alert(0)')), 'http://example.com/drupal/javascript:alert(0)'),
-      array(new Request(array('destination' => 'http://example.com/drupal/')), 'http://example.com/drupal/'),
-      array(new Request(array('destination' => 'http://example.com/drupal/test')), 'http://example.com/drupal/test'),
-    );
+    return [
+      [new Request(), FALSE],
+      [new Request(['destination' => 'test']), 'http://example.com/drupal/test'],
+      [new Request(['destination' => '/drupal/test']), 'http://example.com/drupal/test'],
+      [new Request(['destination' => 'example.com']), 'http://example.com/drupal/example.com'],
+      [new Request(['destination' => 'example:com']), 'http://example.com/drupal/example:com'],
+      [new Request(['destination' => 'javascript:alert(0)']), 'http://example.com/drupal/javascript:alert(0)'],
+      [new Request(['destination' => 'http://example.com/drupal/']), 'http://example.com/drupal/'],
+      [new Request(['destination' => 'http://example.com/drupal/test']), 'http://example.com/drupal/test'],
+    ];
   }
 
   /**
    * @dataProvider providerTestDestinationRedirectToExternalUrl
-   *
-   * @expectedException \PHPUnit_Framework_Error
    */
   public function testDestinationRedirectToExternalUrl($request, $expected) {
     $dispatcher = new EventDispatcher();
@@ -124,11 +122,10 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
     $response = new RedirectResponse('http://other-example.com');
 
     $listener = new RedirectResponseSubscriber($this->urlAssembler, $this->requestContext);
-    $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'checkRedirectUrl'));
+    $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'checkRedirectUrl']);
     $event = new FilterResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST, $response);
+    $this->setExpectedException(\PHPUnit_Framework_Error::class);
     $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
-
-    $this->assertEquals(400, $event->getResponse()->getStatusCode());
   }
 
   /**
@@ -142,7 +139,7 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
     $request->headers->set('HOST', 'example.com');
 
     $listener = new RedirectResponseSubscriber($this->urlAssembler, $this->requestContext);
-    $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'checkRedirectUrl'));
+    $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'checkRedirectUrl']);
     $event = new FilterResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST, $response);
     $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
 
@@ -165,8 +162,6 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
   }
 
   /**
-   * @expectedException \PHPUnit_Framework_Error
-   *
    * @dataProvider providerTestDestinationRedirectWithInvalidUrl
    */
   public function testDestinationRedirectWithInvalidUrl(Request $request) {
@@ -175,11 +170,10 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
     $response = new RedirectResponse('http://example.com/drupal');
 
     $listener = new RedirectResponseSubscriber($this->urlAssembler, $this->requestContext);
-    $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'checkRedirectUrl'));
+    $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'checkRedirectUrl']);
     $event = new FilterResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST, $response);
+    $this->setExpectedException(\PHPUnit_Framework_Error::class);
     $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
-
-    $this->assertEquals(400, $event->getResponse()->getStatusCode());
   }
 
   /**
@@ -187,8 +181,8 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
    */
   public function providerTestDestinationRedirectWithInvalidUrl() {
     $data = [];
-    $data[] = [new Request(array('destination' => '//example:com'))];
-    $data[] = [new Request(array('destination' => '//example:com/test'))];
+    $data[] = [new Request(['destination' => '//example:com'])];
+    $data[] = [new Request(['destination' => '//example:com/test'])];
     $data['absolute external url'] = [new Request(['destination' => 'http://example.com'])];
     $data['absolute external url with folder'] = [new Request(['destination' => 'http://example.ca/drupal'])];
     $data['path without drupal basepath'] = [new Request(['destination' => '/test'])];
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php
index 55db07ed2..01a6f3650 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/SpecialAttributesRouteSubscriberTest.php
@@ -89,9 +89,6 @@ class SpecialAttributesRouteSubscriberTest extends UnitTestCase {
    *   The route to check.
    *
    * @dataProvider providerTestOnRouteBuildingInvalidVariables
-   * @expectedException \PHPUnit_Framework_Error_Warning
-   * @expectedExceptionMessage uses reserved variable names
-   *
    * @covers ::onAlterRoutes
    */
   public function testOnRouteBuildingInvalidVariables(Route $route) {
@@ -100,6 +97,7 @@ class SpecialAttributesRouteSubscriberTest extends UnitTestCase {
 
     $event = new RouteBuildEvent($route_collection, 'test');
     $subscriber = new SpecialAttributesRouteSubscriber();
+    $this->setExpectedException(\PHPUnit_Framework_Error_Warning::class, 'uses reserved variable names');
     $subscriber->onAlterRoutes($event);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/DefaultConfigTest.php b/web/core/tests/Drupal/Tests/Core/Extension/DefaultConfigTest.php
index 879e7a002..29677b2c6 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/DefaultConfigTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Extension/DefaultConfigTest.php
@@ -24,10 +24,11 @@ class DefaultConfigTest extends UnitTestCase {
    */
   public function testConfigIsEmpty() {
     $config = Yaml::parse(file_get_contents($this->root . '/core/config/install/core.extension.yml'));
-    $expected = array(
-      'module' => array(),
-      'theme' => array(),
-    );
+    $expected = [
+      'module' => [],
+      'theme' => [],
+      'profile' => '',
+    ];
     $this->assertEquals($expected, $config);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php b/web/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php
index 74a7649f1..796a916db 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php
@@ -50,9 +50,6 @@ class InfoParserUnitTest extends UnitTestCase {
    * Test if correct exception is thrown for a broken info file.
    *
    * @covers ::parse
-   *
-   * @expectedException \Drupal\Core\Extension\InfoParserException
-   * @expectedExceptionMessageRegExp #broken\.info\.txt#
    */
   public function testInfoParserBroken() {
     $broken_info = <<<BROKEN_INFO
@@ -74,6 +71,7 @@ BROKEN_INFO;
       ],
     ]);
     $filename = vfsStream::url('modules/fixtures/broken.info.txt');
+    $this->setExpectedException('\Drupal\Core\Extension\InfoParserException', 'broken.info.txt');
     $this->infoParser->parse($filename);
   }
 
@@ -81,9 +79,6 @@ BROKEN_INFO;
    * Tests that missing required keys are detected.
    *
    * @covers ::parse
-   *
-   * @expectedException \Drupal\Core\Extension\InfoParserException
-   * @expectedExceptionMessageRegExp #Missing required keys \(type, core, name\) in .+?missing_keys\.info\.txt#
    */
   public function testInfoParserMissingKeys() {
     $missing_keys = <<<MISSINGKEYS
@@ -101,6 +96,7 @@ MISSINGKEYS;
       ],
     ]);
     $filename = vfsStream::url('modules/fixtures/missing_keys.info.txt');
+    $this->setExpectedException('\Drupal\Core\Extension\InfoParserException', 'Missing required keys (type, core, name) in vfs://modules/fixtures/missing_keys.info.txt');
     $this->infoParser->parse($filename);
   }
 
@@ -108,9 +104,6 @@ MISSINGKEYS;
    * Tests that missing required key is detected.
    *
    * @covers ::parse
-   *
-   * @expectedException \Drupal\Core\Extension\InfoParserException
-   * @expectedExceptionMessageRegExp #Missing required keys \(type\) in .+?missing_key\.info\.txt#
    */
   public function testInfoParserMissingKey() {
     $missing_key = <<<MISSINGKEY
@@ -131,6 +124,7 @@ MISSINGKEY;
       ],
     ]);
     $filename = vfsStream::url('modules/fixtures/missing_key.info.txt');
+    $this->setExpectedException('\Drupal\Core\Extension\InfoParserException', 'Missing required keys (type) in vfs://modules/fixtures/missing_key.info.txt');
     $this->infoParser->parse($filename);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php b/web/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
index aa45b3b70..1bde890b0 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
@@ -35,13 +35,13 @@ class ModuleHandlerTest extends UnitTestCase {
     parent::setUp();
 
     $this->cacheBackend = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
-    $this->moduleHandler = new ModuleHandler($this->root, array(
-      'module_handler_test' => array(
+    $this->moduleHandler = new ModuleHandler($this->root, [
+      'module_handler_test' => [
         'type' => 'module',
         'pathname' => 'core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.info.yml',
         'filename' => 'module_handler_test.module',
-      )
-    ), $this->cacheBackend);
+      ]
+    ], $this->cacheBackend);
   }
 
   /**
@@ -85,17 +85,17 @@ class ModuleHandlerTest extends UnitTestCase {
    */
   public function testModuleReloading() {
     $module_handler = $this->getMockBuilder('Drupal\Core\Extension\ModuleHandler')
-      ->setConstructorArgs(array(
+      ->setConstructorArgs([
         $this->root,
-        array(
-          'module_handler_test' => array(
+        [
+          'module_handler_test' => [
             'type' => 'module',
             'pathname' => 'core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.info.yml',
             'filename' => 'module_handler_test.module',
-          )
-        ), $this->cacheBackend
-      ))
-      ->setMethods(array('load'))
+          ]
+        ], $this->cacheBackend
+      ])
+      ->setMethods(['load'])
       ->getMock();
     // First reload.
     $module_handler->expects($this->at(0))
@@ -130,9 +130,9 @@ class ModuleHandlerTest extends UnitTestCase {
    * @covers ::getModuleList
    */
   public function testGetModuleList() {
-    $this->assertEquals($this->moduleHandler->getModuleList(), array(
+    $this->assertEquals($this->moduleHandler->getModuleList(), [
       'module_handler_test' => new Extension($this->root, 'module', 'core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.info.yml', 'module_handler_test.module'),
-    ));
+    ]);
   }
 
   /**
@@ -146,10 +146,9 @@ class ModuleHandlerTest extends UnitTestCase {
 
   /**
    * @covers ::getModule
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testGetModuleWithNonExistingModule() {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->moduleHandler->getModule('claire_alice_watch_my_little_pony_module_that_does_not_exist');
   }
 
@@ -160,17 +159,17 @@ class ModuleHandlerTest extends UnitTestCase {
    */
   public function testSetModuleList() {
     $module_handler = $this->getMockBuilder('Drupal\Core\Extension\ModuleHandler')
-      ->setConstructorArgs(array(
-        $this->root, array(), $this->cacheBackend
-      ))
-      ->setMethods(array('resetImplementations'))
+      ->setConstructorArgs([
+        $this->root, [], $this->cacheBackend
+      ])
+      ->setMethods(['resetImplementations'])
       ->getMock();
 
     // Ensure we reset implementations when settings a new modules list.
     $module_handler->expects($this->once())->method('resetImplementations');
 
     // Make sure we're starting empty.
-    $this->assertEquals($module_handler->getModuleList(), array());
+    $this->assertEquals($module_handler->getModuleList(), []);
 
     // Replace the list with a prebuilt list.
     $module_handler->setModuleList($this->moduleHandler->getModuleList());
@@ -188,10 +187,10 @@ class ModuleHandlerTest extends UnitTestCase {
   public function testAddModule() {
 
     $module_handler = $this->getMockBuilder('Drupal\Core\Extension\ModuleHandler')
-      ->setConstructorArgs(array(
-        $this->root, array(), $this->cacheBackend
-      ))
-      ->setMethods(array('resetImplementations'))
+      ->setConstructorArgs([
+        $this->root, [], $this->cacheBackend
+      ])
+      ->setMethods(['resetImplementations'])
       ->getMock();
 
     // Ensure we reset implementations when settings a new modules list.
@@ -210,10 +209,10 @@ class ModuleHandlerTest extends UnitTestCase {
   public function testAddProfile() {
 
     $module_handler = $this->getMockBuilder('Drupal\Core\Extension\ModuleHandler')
-      ->setConstructorArgs(array(
-        $this->root, array(), $this->cacheBackend
-      ))
-      ->setMethods(array('resetImplementations'))
+      ->setConstructorArgs([
+        $this->root, [], $this->cacheBackend
+      ])
+      ->setMethods(['resetImplementations'])
       ->getMock();
 
     // Ensure we reset implementations when settings a new modules list.
@@ -240,17 +239,17 @@ class ModuleHandlerTest extends UnitTestCase {
   public function testLoadAllIncludes() {
     $this->assertTrue(TRUE);
     $module_handler = $this->getMockBuilder('Drupal\Core\Extension\ModuleHandler')
-      ->setConstructorArgs(array(
+      ->setConstructorArgs([
         $this->root,
-        array(
-          'module_handler_test' => array(
+        [
+          'module_handler_test' => [
             'type' => 'module',
             'pathname' => 'core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.info.yml',
             'filename' => 'module_handler_test.module',
-          )
-        ), $this->cacheBackend
-      ))
-      ->setMethods(array('loadInclude'))
+          ]
+        ], $this->cacheBackend
+      ])
+      ->setMethods(['loadInclude'])
       ->getMock();
 
     // Ensure we reset implementations when settings a new modules list.
@@ -280,9 +279,9 @@ class ModuleHandlerTest extends UnitTestCase {
    * @covers ::invoke
    */
   public function testInvokeModuleEnabled() {
-    $this->assertTrue($this->moduleHandler->invoke('module_handler_test', 'hook', array(TRUE)), 'Installed module runs hook.');
-    $this->assertFalse($this->moduleHandler->invoke('module_handler_test', 'hook', array(FALSE)), 'Installed module runs hook.');
-    $this->assertNull($this->moduleHandler->invoke('module_handler_test_fake', 'hook', array(FALSE)), 'Installed module runs hook.');
+    $this->assertTrue($this->moduleHandler->invoke('module_handler_test', 'hook', [TRUE]), 'Installed module runs hook.');
+    $this->assertFalse($this->moduleHandler->invoke('module_handler_test', 'hook', [FALSE]), 'Installed module runs hook.');
+    $this->assertNull($this->moduleHandler->invoke('module_handler_test_fake', 'hook', [FALSE]), 'Installed module runs hook.');
   }
 
   /**
@@ -298,7 +297,7 @@ class ModuleHandlerTest extends UnitTestCase {
     $this->assertTrue($this->moduleHandler->implementsHook('module_handler_test_added', 'hook'), 'Runtime added module with implementation in include found.');
 
     $this->moduleHandler->addModule('module_handler_test_no_hook', 'core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added');
-    $this->assertFalse($this->moduleHandler->implementsHook('module_handler_test_no_hook', 'hook', array(TRUE)), 'Missing implementation not found.');
+    $this->assertFalse($this->moduleHandler->implementsHook('module_handler_test_no_hook', 'hook', [TRUE]), 'Missing implementation not found.');
   }
 
   /**
@@ -309,7 +308,7 @@ class ModuleHandlerTest extends UnitTestCase {
    * @covers ::buildImplementationInfo
    */
   public function testGetImplementations() {
-    $this->assertEquals(array('module_handler_test'), $this->moduleHandler->getImplementations('hook'));
+    $this->assertEquals(['module_handler_test'], $this->moduleHandler->getImplementations('hook'));
   }
 
   /**
@@ -322,26 +321,26 @@ class ModuleHandlerTest extends UnitTestCase {
     $this->cacheBackend->expects($this->exactly(1))
       ->method('get')
       ->will($this->onConsecutiveCalls(
-        (object) array('data' => array('hook' => array('module_handler_test' => 'test')))
+        (object) ['data' => ['hook' => ['module_handler_test' => 'test']]]
       ));
 
     // Ensure buildImplementationInfo doesn't get called and that we work off cached results.
     $module_handler = $this->getMockBuilder('Drupal\Core\Extension\ModuleHandler')
-      ->setConstructorArgs(array(
-        $this->root, array(
-          'module_handler_test' => array(
+      ->setConstructorArgs([
+        $this->root, [
+          'module_handler_test' => [
             'type' => 'module',
             'pathname' => 'core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.info.yml',
             'filename' => 'module_handler_test.module',
-          )
-        ), $this->cacheBackend
-      ))
-      ->setMethods(array('buildImplementationInfo', 'loadInclude'))
+          ]
+        ], $this->cacheBackend
+      ])
+      ->setMethods(['buildImplementationInfo', 'loadInclude'])
       ->getMock();
 
     $module_handler->expects($this->never())->method('buildImplementationInfo');
     $module_handler->expects($this->once())->method('loadInclude');
-    $this->assertEquals(array('module_handler_test'), $module_handler->getImplementations('hook'));
+    $this->assertEquals(['module_handler_test'], $module_handler->getImplementations('hook'));
   }
 
   /**
@@ -354,28 +353,28 @@ class ModuleHandlerTest extends UnitTestCase {
     $this->cacheBackend->expects($this->exactly(1))
       ->method('get')
       ->will($this->onConsecutiveCalls(
-        (object) array('data' => array('hook' => array(
-          'module_handler_test' => array(),
-          'module_handler_test_missing' => array(),
-        )))
+        (object) ['data' => ['hook' => [
+          'module_handler_test' => [],
+          'module_handler_test_missing' => [],
+        ]]]
       ));
 
     // Ensure buildImplementationInfo doesn't get called and that we work off cached results.
     $module_handler = $this->getMockBuilder('Drupal\Core\Extension\ModuleHandler')
-      ->setConstructorArgs(array(
-        $this->root, array(
-          'module_handler_test' => array(
+      ->setConstructorArgs([
+        $this->root, [
+          'module_handler_test' => [
             'type' => 'module',
             'pathname' => 'core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.info.yml',
             'filename' => 'module_handler_test.module',
-          )
-        ), $this->cacheBackend
-      ))
-      ->setMethods(array('buildImplementationInfo'))
+          ]
+        ], $this->cacheBackend
+      ])
+      ->setMethods(['buildImplementationInfo'])
       ->getMock();
 
     $module_handler->expects($this->never())->method('buildImplementationInfo');
-    $this->assertEquals(array('module_handler_test'), $module_handler->getImplementations('hook'));
+    $this->assertEquals(['module_handler_test'], $module_handler->getImplementations('hook'));
   }
 
   /**
@@ -386,7 +385,7 @@ class ModuleHandlerTest extends UnitTestCase {
   public function testInvokeAll() {
     $this->moduleHandler->addModule('module_handler_test_all1', 'core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1');
     $this->moduleHandler->addModule('module_handler_test_all2', 'core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2');
-    $this->assertEquals(array(TRUE, TRUE, TRUE), $this->moduleHandler->invokeAll('hook', array(TRUE)));
+    $this->assertEquals([TRUE, TRUE, TRUE], $this->moduleHandler->invokeAll('hook', [TRUE]));
   }
 
   /**
@@ -398,11 +397,11 @@ class ModuleHandlerTest extends UnitTestCase {
     $this->cacheBackend
       ->expects($this->exactly(2))
       ->method('get')
-        ->will($this->returnValue(NULL));
+      ->will($this->returnValue(NULL));
     $this->cacheBackend
       ->expects($this->exactly(2))
       ->method('set')
-        ->with($this->logicalOr('module_implements', 'hook_info'));
+      ->with($this->logicalOr('module_implements', 'hook_info'));
     $this->moduleHandler->getImplementations('hook');
     $this->moduleHandler->writeCache();
   }
@@ -421,20 +420,20 @@ class ModuleHandlerTest extends UnitTestCase {
       ->method('get')
       ->will($this->onConsecutiveCalls(
         NULL,
-        (object) array('data' =>
-          array('hook_foo' => array('group' => 'hook'))))
+        (object) ['data' =>
+          ['hook_foo' => ['group' => 'hook']]])
       );
 
     // Results from building from mocked environment.
-    $this->assertEquals(array(
-      'hook' => array('group' => 'hook'),
-    ), $this->moduleHandler->getHookInfo());
+    $this->assertEquals([
+      'hook' => ['group' => 'hook'],
+    ], $this->moduleHandler->getHookInfo());
 
     // Reset local cache so we get our synthetic result from the cache handler.
     $this->moduleHandler->resetImplementations();
-    $this->assertEquals(array(
-      'hook_foo' => array('group' => 'hook'),
-    ), $this->moduleHandler->getHookInfo());
+    $this->assertEquals([
+      'hook_foo' => ['group' => 'hook'],
+    ], $this->moduleHandler->getHookInfo());
   }
 
   /**
@@ -483,33 +482,33 @@ class ModuleHandlerTest extends UnitTestCase {
    * Provider for testing dependency parsing.
    */
   public function dependencyProvider() {
-    return array(
-      array('system', array('name' => 'system')),
-      array('taxonomy', array('name' => 'taxonomy')),
-      array('views', array('name' => 'views')),
-      array('views_ui(8.x-1.0)', array('name' => 'views_ui', 'original_version' => ' (8.x-1.0)', 'versions' => array(array('op' => '=', 'version' => '1.0')))),
+    return [
+      ['system', ['name' => 'system']],
+      ['taxonomy', ['name' => 'taxonomy']],
+      ['views', ['name' => 'views']],
+      ['views_ui(8.x-1.0)', ['name' => 'views_ui', 'original_version' => ' (8.x-1.0)', 'versions' => [['op' => '=', 'version' => '1.0']]]],
       // Not supported?.
       // array('views_ui(8.x-1.1-beta)', array('name' => 'views_ui', 'original_version' => ' (8.x-1.1-beta)', 'versions' => array(array('op' => '=', 'version' => '1.1-beta')))),
-      array('views_ui(8.x-1.1-alpha12)', array('name' => 'views_ui', 'original_version' => ' (8.x-1.1-alpha12)', 'versions' => array(array('op' => '=', 'version' => '1.1-alpha12')))),
-      array('views_ui(8.x-1.1-beta8)', array('name' => 'views_ui', 'original_version' => ' (8.x-1.1-beta8)', 'versions' => array(array('op' => '=', 'version' => '1.1-beta8')))),
-      array('views_ui(8.x-1.1-rc11)', array('name' => 'views_ui', 'original_version' => ' (8.x-1.1-rc11)', 'versions' => array(array('op' => '=', 'version' => '1.1-rc11')))),
-      array('views_ui(8.x-1.12)', array('name' => 'views_ui', 'original_version' => ' (8.x-1.12)', 'versions' => array(array('op' => '=', 'version' => '1.12')))),
-      array('views_ui(8.x-1.x)', array('name' => 'views_ui', 'original_version' => ' (8.x-1.x)', 'versions' => array(array('op' => '<', 'version' => '2.x'), array('op' => '>=', 'version' => '1.x')))),
-      array('views_ui( <= 8.x-1.x)', array('name' => 'views_ui', 'original_version' => ' ( <= 8.x-1.x)', 'versions' => array(array('op' => '<=', 'version' => '2.x')))),
-      array('views_ui(<= 8.x-1.x)', array('name' => 'views_ui', 'original_version' => ' (<= 8.x-1.x)', 'versions' => array(array('op' => '<=', 'version' => '2.x')))),
-      array('views_ui( <=8.x-1.x)', array('name' => 'views_ui', 'original_version' => ' ( <=8.x-1.x)', 'versions' => array(array('op' => '<=', 'version' => '2.x')))),
-      array('views_ui(>8.x-1.x)', array('name' => 'views_ui', 'original_version' => ' (>8.x-1.x)', 'versions' => array(array('op' => '>', 'version' => '2.x')))),
-      array('drupal:views_ui(>8.x-1.x)', array('project' => 'drupal', 'name' => 'views_ui', 'original_version' => ' (>8.x-1.x)', 'versions' => array(array('op' => '>', 'version' => '2.x')))),
-    );
+      ['views_ui(8.x-1.1-alpha12)', ['name' => 'views_ui', 'original_version' => ' (8.x-1.1-alpha12)', 'versions' => [['op' => '=', 'version' => '1.1-alpha12']]]],
+      ['views_ui(8.x-1.1-beta8)', ['name' => 'views_ui', 'original_version' => ' (8.x-1.1-beta8)', 'versions' => [['op' => '=', 'version' => '1.1-beta8']]]],
+      ['views_ui(8.x-1.1-rc11)', ['name' => 'views_ui', 'original_version' => ' (8.x-1.1-rc11)', 'versions' => [['op' => '=', 'version' => '1.1-rc11']]]],
+      ['views_ui(8.x-1.12)', ['name' => 'views_ui', 'original_version' => ' (8.x-1.12)', 'versions' => [['op' => '=', 'version' => '1.12']]]],
+      ['views_ui(8.x-1.x)', ['name' => 'views_ui', 'original_version' => ' (8.x-1.x)', 'versions' => [['op' => '<', 'version' => '2.x'], ['op' => '>=', 'version' => '1.x']]]],
+      ['views_ui( <= 8.x-1.x)', ['name' => 'views_ui', 'original_version' => ' ( <= 8.x-1.x)', 'versions' => [['op' => '<=', 'version' => '2.x']]]],
+      ['views_ui(<= 8.x-1.x)', ['name' => 'views_ui', 'original_version' => ' (<= 8.x-1.x)', 'versions' => [['op' => '<=', 'version' => '2.x']]]],
+      ['views_ui( <=8.x-1.x)', ['name' => 'views_ui', 'original_version' => ' ( <=8.x-1.x)', 'versions' => [['op' => '<=', 'version' => '2.x']]]],
+      ['views_ui(>8.x-1.x)', ['name' => 'views_ui', 'original_version' => ' (>8.x-1.x)', 'versions' => [['op' => '>', 'version' => '2.x']]]],
+      ['drupal:views_ui(>8.x-1.x)', ['project' => 'drupal', 'name' => 'views_ui', 'original_version' => ' (>8.x-1.x)', 'versions' => [['op' => '>', 'version' => '2.x']]]],
+    ];
   }
 
   /**
    * @covers ::getModuleDirectories
    */
   public function testGetModuleDirectories() {
-    $this->moduleHandler->setModuleList(array());
+    $this->moduleHandler->setModuleList([]);
     $this->moduleHandler->addModule('module', 'place');
-    $this->assertEquals(array('module' => $this->root . '/place'), $this->moduleHandler->getModuleDirectories());
+    $this->assertEquals(['module' => $this->root . '/place'], $this->moduleHandler->getModuleDirectories());
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php b/web/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
index 27a9702c6..8c105f25a 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
@@ -7,10 +7,12 @@
 
 namespace Drupal\Tests\Core\Extension;
 
+use Drupal\Core\Cache\MemoryBackend;
 use Drupal\Core\Extension\Extension;
 use Drupal\Core\Extension\InfoParser;
 use Drupal\Core\Extension\ThemeHandler;
 use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
+use Drupal\Core\Lock\NullLockBackend;
 use Drupal\Core\State\State;
 use Drupal\Tests\UnitTestCase;
 
@@ -68,17 +70,17 @@ class ThemeHandlerTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $this->configFactory = $this->getConfigFactoryStub(array(
-      'core.extension' => array(
-        'module' => array(),
-        'theme' => array(),
-        'disabled' => array(
-          'theme' => array(),
-        ),
-      ),
-    ));
+    $this->configFactory = $this->getConfigFactoryStub([
+      'core.extension' => [
+        'module' => [],
+        'theme' => [],
+        'disabled' => [
+          'theme' => [],
+        ],
+      ],
+    ]);
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
-    $this->state = new State(new KeyValueMemoryFactory());
+    $this->state = new State(new KeyValueMemoryFactory(), new MemoryBackend('test'), new NullLockBackend());
     $this->infoParser = $this->getMock('Drupal\Core\Extension\InfoParserInterface');
     $this->extensionDiscovery = $this->getMockBuilder('Drupal\Core\Extension\ExtensionDiscovery')
       ->disableOriginalConstructor()
@@ -98,15 +100,15 @@ class ThemeHandlerTest extends UnitTestCase {
     $this->extensionDiscovery->expects($this->at(0))
       ->method('scan')
       ->with('theme')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         'seven' => new Extension($this->root, 'theme', $this->root . '/core/themes/seven/seven.info.yml', 'seven.theme'),
-      )));
+      ]));
     $this->extensionDiscovery->expects($this->at(1))
       ->method('scan')
       ->with('theme_engine')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         'twig' => new Extension($this->root, 'theme_engine', $this->root . '/core/themes/engines/twig/twig.info.yml', 'twig.engine'),
-      )));
+      ]));
     $this->infoParser->expects($this->once())
       ->method('parse')
       ->with($this->root . '/core/themes/seven/seven.info.yml')
@@ -134,7 +136,7 @@ class ThemeHandlerTest extends UnitTestCase {
     $this->assertEquals('twig', $info->prefix);
 
     $this->assertEquals('twig', $info->info['engine']);
-    $this->assertEquals(array('seven/global-styling'), $info->info['libraries']);
+    $this->assertEquals(['seven/global-styling'], $info->info['libraries']);
   }
 
   /**
@@ -158,16 +160,16 @@ class ThemeHandlerTest extends UnitTestCase {
     $this->extensionDiscovery->expects($this->at(0))
       ->method('scan')
       ->with('theme')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         'test_subtheme' => new Extension($this->root, 'theme', $this->root . '/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml', 'test_subtheme.info.yml'),
         'test_basetheme' => new Extension($this->root, 'theme', $this->root . '/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml', 'test_basetheme.info.yml'),
-      )));
+      ]));
     $this->extensionDiscovery->expects($this->at(1))
       ->method('scan')
       ->with('theme_engine')
-      ->will($this->returnValue(array(
+      ->will($this->returnValue([
         'twig' => new Extension($this->root, 'theme_engine', $this->root . '/core/themes/engines/twig/twig.info.yml', 'twig.engine'),
-      )));
+      ]));
     $this->infoParser->expects($this->at(0))
       ->method('parse')
       ->with($this->root . '/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml')
@@ -200,7 +202,7 @@ class ThemeHandlerTest extends UnitTestCase {
 
     // Test the parent/child-theme properties.
     $info_subtheme->info['base theme'] = 'test_basetheme';
-    $info_basetheme->sub_themes = array('test_subtheme');
+    $info_basetheme->sub_themes = ['test_subtheme'];
 
     $this->assertEquals($this->root . '/core/themes/engines/twig/twig.engine', $info_basetheme->owner);
     $this->assertEquals('twig', $info_basetheme->prefix);
@@ -232,73 +234,73 @@ class ThemeHandlerTest extends UnitTestCase {
    *   An array of theme test data.
    */
   public function providerTestGetBaseThemes() {
-    $data = array();
+    $data = [];
 
     // Tests a theme without any base theme.
-    $themes = array();
-    $themes['test_1'] = (object) array(
+    $themes = [];
+    $themes['test_1'] = (object) [
       'name' => 'test_1',
-      'info' => array(
+      'info' => [
         'name' => 'test_1',
-      ),
-    );
-    $data[] = array($themes, 'test_1', array());
+      ],
+    ];
+    $data[] = [$themes, 'test_1', []];
 
     // Tests a theme with a non existing base theme.
-    $themes = array();
-    $themes['test_1'] = (object) array(
+    $themes = [];
+    $themes['test_1'] = (object) [
       'name' => 'test_1',
-      'info' => array(
+      'info' => [
         'name' => 'test_1',
         'base theme' => 'test_2',
-      ),
-    );
-    $data[] = array($themes, 'test_1', array('test_2' => NULL));
+      ],
+    ];
+    $data[] = [$themes, 'test_1', ['test_2' => NULL]];
 
     // Tests a theme with a single existing base theme.
-    $themes = array();
-    $themes['test_1'] = (object) array(
+    $themes = [];
+    $themes['test_1'] = (object) [
       'name' => 'test_1',
-      'info' => array(
+      'info' => [
         'name' => 'test_1',
         'base theme' => 'test_2',
-      ),
-    );
-    $themes['test_2'] = (object) array(
+      ],
+    ];
+    $themes['test_2'] = (object) [
       'name' => 'test_2',
-      'info' => array(
+      'info' => [
         'name' => 'test_2',
-      ),
-    );
-    $data[] = array($themes, 'test_1', array('test_2' => 'test_2'));
+      ],
+    ];
+    $data[] = [$themes, 'test_1', ['test_2' => 'test_2']];
 
     // Tests a theme with multiple base themes.
-    $themes = array();
-    $themes['test_1'] = (object) array(
+    $themes = [];
+    $themes['test_1'] = (object) [
       'name' => 'test_1',
-      'info' => array(
+      'info' => [
         'name' => 'test_1',
         'base theme' => 'test_2',
-      ),
-    );
-    $themes['test_2'] = (object) array(
+      ],
+    ];
+    $themes['test_2'] = (object) [
       'name' => 'test_2',
-      'info' => array(
+      'info' => [
         'name' => 'test_2',
         'base theme' => 'test_3',
-      ),
-    );
-    $themes['test_3'] = (object) array(
+      ],
+    ];
+    $themes['test_3'] = (object) [
       'name' => 'test_3',
-      'info' => array(
+      'info' => [
         'name' => 'test_3',
-      ),
-    );
-    $data[] = array(
+      ],
+    ];
+    $data[] = [
       $themes,
       'test_1',
-      array('test_2' => 'test_2', 'test_3' => 'test_3'),
-    );
+      ['test_2' => 'test_2', 'test_3' => 'test_3'],
+    ];
 
     return $data;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
index 00c781d5a..da3a9c249 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
+++ b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
@@ -5,4 +5,7 @@
  * Include file for test module.
  */
 
+/**
+ * Test hook.
+ */
 function module_handler_test_hook_include() {}
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module
index 18bf23c35..3e0d59c68 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module
+++ b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module
@@ -9,9 +9,9 @@
  * Implements hook_hook_info().
  */
 function module_handler_test_hook_info() {
-  return array(
-    'hook' => array('group' => 'hook'),
-  );
+  return [
+    'hook' => ['group' => 'hook'],
+  ];
 }
 
 function module_handler_test_hook($arg) { return $arg; }
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc
index 718791b3c..88e00574b 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc
+++ b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc
@@ -5,4 +5,9 @@
  * Include file for test module.
  */
 
-function module_handler_test_added_hook($arg) { return $arg; }
+/**
+ * Test function.
+ */
+function module_handler_test_added_hook($arg) {
+  return $arg;
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module
index 0a46c3301..09e54197e 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module
+++ b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module
@@ -5,4 +5,9 @@
  * Test module.
  */
 
-function module_handler_test_added_helper($arg) { return $arg; }
+/**
+ * Test function.
+ */
+function module_handler_test_added_helper($arg) {
+  return $arg;
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module
index 4689c02ce..563b7a5c2 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module
+++ b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module
@@ -8,4 +8,4 @@
 /**
  * Returns an array to test nested merge in invoke all.
  */
-function module_handler_test_all1_hook($arg) { return array($arg); }
+function module_handler_test_all1_hook($arg) { return [$arg]; }
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module
index 9275ce366..6915a52a8 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module
+++ b/web/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module
@@ -5,4 +5,9 @@
  * Test module.
  */
 
-function module_handler_test_all2_hook($arg) { return $arg; }
+/**
+ * Test function.
+ */
+function module_handler_test_all2_hook($arg) {
+  return $arg;
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php b/web/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php
index 9ee719edd..01d0bb268 100644
--- a/web/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php
@@ -77,7 +77,7 @@ class FieldDefinitionListenerTest extends UnitTestCase {
    * @param \Drupal\Core\Entity\EntityTypeInterface[]|\Prophecy\Prophecy\ProphecyInterface[] $definitions
    *   (optional) An array of entity type definitions.
    */
-  protected function setUpEntityManager($definitions = array()) {
+  protected function setUpEntityManager($definitions = []) {
     $class = $this->getMockClass(EntityInterface::class);
     foreach ($definitions as $key => $entity_type) {
       // \Drupal\Core\Entity\EntityTypeInterface::getLinkTemplates() is called
diff --git a/web/core/tests/Drupal/Tests/Core/Form/ConfigFormBaseTraitTest.php b/web/core/tests/Drupal/Tests/Core/Form/ConfigFormBaseTraitTest.php
index 18d270e33..14e03cb56 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/ConfigFormBaseTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/ConfigFormBaseTraitTest.php
@@ -41,8 +41,6 @@ class ConfigFormBaseTraitTest extends UnitTestCase {
 
   /**
    * @covers ::config
-   * @expectedException \LogicException
-   * @expectedExceptionMessage No config factory available for ConfigFormBaseTrait
    */
   public function testConfigFactoryException() {
     $trait = $this->getMockForTrait('Drupal\Core\Form\ConfigFormBaseTrait');
@@ -50,13 +48,12 @@ class ConfigFormBaseTraitTest extends UnitTestCase {
     $config_method->setAccessible(TRUE);
 
     // There is no config factory available this should result in an exception.
+    $this->setExpectedException(\LogicException::class, 'No config factory available for ConfigFormBaseTrait');
     $config_method->invoke($trait, 'editable.config');
   }
 
   /**
    * @covers ::config
-   * @expectedException \LogicException
-   * @expectedExceptionMessage No config factory available for ConfigFormBaseTrait
    */
   public function testConfigFactoryExceptionInvalidProperty() {
     $trait = $this->getMockForTrait('Drupal\Core\Form\ConfigFormBaseTrait');
@@ -65,6 +62,7 @@ class ConfigFormBaseTraitTest extends UnitTestCase {
     $config_method->setAccessible(TRUE);
 
     // There is no config factory available this should result in an exception.
+    $this->setExpectedException(\LogicException::class, 'No config factory available for ConfigFormBaseTrait');
     $config_method->invoke($trait, 'editable.config');
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Form/ConfirmFormHelperTest.php b/web/core/tests/Drupal/Tests/Core/Form/ConfirmFormHelperTest.php
index 9440d08fa..15f52a6dc 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/ConfirmFormHelperTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/ConfirmFormHelperTest.php
@@ -71,12 +71,12 @@ class ConfirmFormHelperTest extends UnitTestCase {
    */
   public function testCancelLinkRouteWithUrl() {
     $cancel_route = new Url(
-      'foo_bar.baz', array(
+      'foo_bar.baz', [
         'baz' => 'banana',
-      ),
-      array(
+      ],
+      [
         'absolute' => TRUE,
-      )
+      ]
     );
     $form = $this->getMock('Drupal\Core\Form\ConfirmFormInterface');
     $form->expects($this->any())
@@ -95,7 +95,7 @@ class ConfirmFormHelperTest extends UnitTestCase {
    * @dataProvider providerTestCancelLinkDestination
    */
   public function testCancelLinkDestination($destination) {
-    $query = array('destination' => $destination);
+    $query = ['destination' => $destination];
     $form = $this->getMock('Drupal\Core\Form\ConfirmFormInterface');
 
     $path_validator = $this->getMock('Drupal\Core\Path\PathValidatorInterface');
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php
index 067ba4757..177504c13 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormAjaxResponseBuilderTest.php
@@ -9,6 +9,7 @@ use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 /**
  * @coversDefaultClass \Drupal\Core\Form\FormAjaxResponseBuilder
@@ -43,8 +44,6 @@ class FormAjaxResponseBuilderTest extends UnitTestCase {
 
   /**
    * @covers ::buildResponse
-   *
-   * @expectedException \Symfony\Component\HttpKernel\Exception\HttpException
    */
   public function testBuildResponseNoTriggeringElement() {
     $this->renderer->expects($this->never())
@@ -56,13 +55,12 @@ class FormAjaxResponseBuilderTest extends UnitTestCase {
     $commands = [];
 
     $expected = [];
-    $this->assertSame($expected, $this->formAjaxResponseBuilder->buildResponse($request, $form, $form_state, $commands));
+    $this->setExpectedException(HttpException::class);
+    $this->formAjaxResponseBuilder->buildResponse($request, $form, $form_state, $commands);
   }
 
   /**
    * @covers ::buildResponse
-   *
-   * @expectedException \Symfony\Component\HttpKernel\Exception\HttpException
    */
   public function testBuildResponseNoCallable() {
     $this->renderer->expects($this->never())
@@ -76,7 +74,8 @@ class FormAjaxResponseBuilderTest extends UnitTestCase {
     $commands = [];
 
     $expected = [];
-    $this->assertSame($expected, $this->formAjaxResponseBuilder->buildResponse($request, $form, $form_state, $commands));
+    $this->setExpectedException(HttpException::class);
+    $this->formAjaxResponseBuilder->buildResponse($request, $form, $form_state, $commands);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
index dfbf843a0..aa3739c94 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
@@ -13,6 +13,7 @@ use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Cache\Context\CacheContextsManager;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Form\EnforcedResponseException;
+use Drupal\Core\Form\Exception\BrokenPostRequestException;
 use Drupal\Core\Form\FormBuilder;
 use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Form\FormInterface;
@@ -52,19 +53,12 @@ class FormBuilderTest extends FormTestBase {
 
   /**
    * Tests the getFormId() method with a string based form ID.
-   *
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage The form argument foo is not a valid form.
    */
   public function testGetFormIdWithString() {
     $form_arg = 'foo';
-
-    $clean_form_state = new FormState();
     $form_state = new FormState();
-    $form_id = $this->formBuilder->getFormId($form_arg, $form_state);
-
-    $this->assertSame($form_arg, $form_id);
-    $this->assertSame($clean_form_state, $form_state);
+    $this->setExpectedException(\InvalidArgumentException::class, 'The form argument foo is not a valid form.');
+    $this->formBuilder->getFormId($form_arg, $form_state);
   }
 
   /**
@@ -171,10 +165,10 @@ class FormBuilderTest extends FormTestBase {
    * Provides test data for testHandleFormStateResponse().
    */
   public function formStateResponseProvider() {
-    return array(
-      array('Symfony\Component\HttpFoundation\Response', 'response'),
-      array('Symfony\Component\HttpFoundation\RedirectResponse', 'redirect'),
-    );
+    return [
+      ['Symfony\Component\HttpFoundation\Response', 'response'],
+      ['Symfony\Component\HttpFoundation\RedirectResponse', 'redirect'],
+    ];
   }
 
   /**
@@ -218,17 +212,11 @@ class FormBuilderTest extends FormTestBase {
 
   /**
    * Tests the getForm() method with a string based form ID.
-   *
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage The form argument test_form_id is not a valid form.
    */
   public function testGetFormWithString() {
     $form_id = 'test_form_id';
-    $expected_form = $form_id();
-
-    $form = $this->formBuilder->getForm($form_id);
-    $this->assertFormElement($expected_form, $form, 'test');
-    $this->assertSame('test-form-id', $form['#id']);
+    $this->setExpectedException(\InvalidArgumentException::class, 'The form argument test_form_id is not a valid form.');
+    $this->formBuilder->getForm($form_id);
   }
 
   /**
@@ -251,7 +239,7 @@ class FormBuilderTest extends FormTestBase {
   public function testGetFormWithClassString() {
     $form_id = '\Drupal\Tests\Core\Form\TestForm';
     $object = new TestForm();
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $expected_form = $object->buildForm($form, $form_state);
 
@@ -262,17 +250,11 @@ class FormBuilderTest extends FormTestBase {
 
   /**
    * Tests the buildForm() method with a string based form ID.
-   *
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage The form argument test_form_id is not a valid form.
    */
   public function testBuildFormWithString() {
     $form_id = 'test_form_id';
-    $expected_form = $form_id();
-
-    $form = $this->formBuilder->getForm($form_id);
-    $this->assertFormElement($expected_form, $form, 'test');
-    $this->assertArrayHasKey('#id', $form);
+    $this->setExpectedException(\InvalidArgumentException::class, 'The form argument test_form_id is not a valid form.');
+    $this->formBuilder->getForm($form_id);
   }
 
   /**
@@ -281,7 +263,7 @@ class FormBuilderTest extends FormTestBase {
   public function testBuildFormWithClassString() {
     $form_id = '\Drupal\Tests\Core\Form\TestForm';
     $object = new TestForm();
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $expected_form = $object->buildForm($form, $form_state);
 
@@ -547,8 +529,6 @@ class FormBuilderTest extends FormTestBase {
 
   /**
    * @covers ::buildForm
-   *
-   * @expectedException \Drupal\Core\Form\Exception\BrokenPostRequestException
    */
   public function testExceededFileSize() {
     $request = new Request([FormBuilderInterface::AJAX_FORM_REQUEST => TRUE]);
@@ -565,6 +545,7 @@ class FormBuilderTest extends FormTestBase {
     $form_arg = $this->getMockForm('test_form_id');
     $form_state = new FormState();
 
+    $this->setExpectedException(BrokenPostRequestException::class);
     $this->formBuilder->buildForm($form_arg, $form_state);
   }
 
@@ -886,7 +867,7 @@ class FormBuilderTest extends FormTestBase {
    *
    * @return array
    */
-  function providerTestFormTokenCacheability() {
+  public function providerTestFormTokenCacheability() {
     return [
       'token:none,authenticated:true' => [NULL, TRUE, ['contexts' => ['user.roles:authenticated']], ['max-age' => 0], 'post'],
       'token:none,authenticated:false' => [NULL, FALSE, ['contexts' => ['user.roles:authenticated']], NULL, 'post'],
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormErrorHandlerTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormErrorHandlerTest.php
index 81d029697..8e2fc0d2b 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormErrorHandlerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormErrorHandlerTest.php
@@ -41,37 +41,44 @@ class FormErrorHandlerTest extends UnitTestCase {
 
     $form = [
       '#parents' => [],
+      '#array_parents' => [],
     ];
     $form['test1'] = [
       '#type' => 'textfield',
       '#title' => 'Test 1',
       '#parents' => ['test1'],
+      '#array_parents' => ['test1'],
       '#id' => 'edit-test1',
     ];
     $form['test2'] = [
       '#type' => 'textfield',
       '#title' => 'Test 2 & a half',
       '#parents' => ['test2'],
+      '#array_parents' => ['test2'],
       '#id' => 'edit-test2',
     ];
     $form['fieldset'] = [
       '#parents' => ['fieldset'],
+      '#array_parents' => ['fieldset'],
       'test3' => [
         '#type' => 'textfield',
         '#title' => 'Test 3',
         '#parents' => ['fieldset', 'test3'],
+        '#array_parents' => ['fieldset', 'test3'],
         '#id' => 'edit-test3',
       ],
     ];
     $form['test5'] = [
       '#type' => 'textfield',
       '#parents' => ['test5'],
+      '#array_parents' => ['test5'],
       '#id' => 'edit-test5',
     ];
     $form['test6'] = [
       '#type' => 'value',
       '#title' => 'Test 6',
       '#parents' => ['test6'],
+      '#array_parents' => ['test6'],
       '#id' => 'edit-test6',
     ];
     $form_state = new FormState();
@@ -96,17 +103,91 @@ class FormErrorHandlerTest extends UnitTestCase {
 
     $form = [
       '#parents' => [],
+      '#array_parents' => [],
     ];
     $form['test'] = [
       '#type' => 'textfield',
       '#title' => 'Test',
       '#parents' => ['test'],
+      '#array_parents' => ['test'],
       '#id' => 'edit-test',
     ];
+    $form['details'] = [
+      '#type' => 'details',
+      '#title' => 'Details grouping test',
+      '#parents' => ['details'],
+      '#array_parents' => ['details'],
+      '#id' => 'edit-details',
+    ];
+    $form['grouping_test'] = [
+      '#type' => 'textfield',
+      '#title' => 'Grouping test',
+      '#parents' => ['grouping_test'],
+      '#array_parents' => ['grouping_test'],
+      '#id' => 'edit-grouping-test',
+      '#group' => 'details',
+    ];
+    $form['grouping_test2'] = [
+      '#type' => 'textfield',
+      '#title' => 'Grouping test 2',
+      '#parents' => ['grouping_test2'],
+      '#array_parents' => ['grouping_test2'],
+      '#id' => 'edit-grouping-test2',
+      '#group' => 'details',
+    ];
+    $form['details2'] = [
+      '#type' => 'details',
+      '#title' => 'Details grouping test 2',
+      '#parents' => ['details2'],
+      '#array_parents' => ['details2'],
+      '#id' => 'edit-details2',
+    ];
+    $form['grouping_test3'] = [
+      '#type' => 'textfield',
+      '#title' => 'Grouping test 3',
+      '#parents' => ['grouping_test3'],
+      '#array_parents' => ['grouping_test3'],
+      '#id' => 'edit-grouping-test3',
+      '#group' => 'details2',
+    ];
+    $form['fieldset'] = [
+      '#type' => 'fieldset',
+      '#parents' => ['fieldset'],
+      '#array_parents' => ['fieldset'],
+      '#id' => 'edit-fieldset',
+      'nested_test' => [
+        '#type' => 'textfield',
+        '#title' => 'Nested test',
+        '#parents' => ['fieldset', 'nested_test'],
+        '#array_parents' => ['fieldset', 'nested_test'],
+        '#id' => 'edit-nested_test',
+      ],
+      'nested_test2' => [
+        '#type' => 'textfield',
+        '#title' => 'Nested test2',
+        '#parents' => ['fieldset', 'nested_test2'],
+        '#array_parents' => ['fieldset', 'nested_test2'],
+        '#id' => 'edit-nested_test2',
+      ],
+    ];
     $form_state = new FormState();
     $form_state->setErrorByName('test', 'invalid');
+    $form_state->setErrorByName('grouping_test', 'invalid');
+    $form_state->setErrorByName('grouping_test2', 'invalid');
+    $form_state->setErrorByName('fieldset][nested_test', 'invalid');
+    $form_state->setErrorByName('fieldset][nested_test2', 'invalid2');
     $form_error_handler->handleFormErrors($form, $form_state);
     $this->assertSame('invalid', $form['test']['#errors']);
+    $this->assertSame([
+      'grouping_test' => 'invalid',
+      'grouping_test2' => 'invalid',
+    ], $form['details']['#children_errors']);
+    $this->assertSame([
+      'fieldset][nested_test' => 'invalid',
+      'fieldset][nested_test2' => 'invalid2',
+    ], $form['fieldset']['#children_errors']);
+    $this->assertEmpty($form['details2']['#children_errors'], 'Children errors are empty for grouping element.');
+    $this->assertCount(5, $form['#children_errors']);
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormHelperTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormHelperTest.php
index 1ef17e9e9..556aab8f4 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormHelperTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormHelperTest.php
@@ -16,68 +16,68 @@ class FormHelperTest extends UnitTestCase {
    *
    * @covers ::rewriteStatesSelector
    */
-  function testRewriteStatesSelector() {
+  public function testRewriteStatesSelector() {
 
     // Simple selectors.
-    $value = array('value' => 'medium');
-    $form['foo']['#states'] = array(
-      'visible' => array(
+    $value = ['value' => 'medium'];
+    $form['foo']['#states'] = [
+      'visible' => [
         'select[name="fields[foo-id][settings_edit_form][settings][image_style]"]' => $value,
-      ),
-    );
+      ],
+    ];
     FormHelper::rewriteStatesSelector($form, 'fields[foo-id][settings_edit_form]', 'options');
     $expected_selector = 'select[name="options[settings][image_style]"]';
     $this->assertSame($form['foo']['#states']['visible'][$expected_selector], $value, 'The #states selector was not properly rewritten.');
 
     // Complex selectors.
-    $form = array();
-    $form['bar']['#states'] = array(
-      'visible' => array(
-        array(
-          ':input[name="menu[type]"]' => array('value' => 'normal'),
-        ),
-        array(
-          ':input[name="menu[type]"]' => array('value' => 'tab'),
-        ),
-        ':input[name="menu[type]"]' => array('value' => 'default tab'),
-      ),
+    $form = [];
+    $form['bar']['#states'] = [
+      'visible' => [
+        [
+          ':input[name="menu[type]"]' => ['value' => 'normal'],
+        ],
+        [
+          ':input[name="menu[type]"]' => ['value' => 'tab'],
+        ],
+        ':input[name="menu[type]"]' => ['value' => 'default tab'],
+      ],
       // Example from https://www.drupal.org/node/1464758
-      'disabled' => array(
-        '[name="menu[options][dependee_1]"]' => array('value' => 'ON'),
-        array(
-          array('[name="menu[options][dependee_2]"]' => array('value' => 'ON')),
-          array('[name="menu[options][dependee_3]"]' => array('value' => 'ON')),
-        ),
-        array(
-          array('[name="menu[options][dependee_4]"]' => array('value' => 'ON')),
+      'disabled' => [
+        '[name="menu[options][dependee_1]"]' => ['value' => 'ON'],
+        [
+          ['[name="menu[options][dependee_2]"]' => ['value' => 'ON']],
+          ['[name="menu[options][dependee_3]"]' => ['value' => 'ON']],
+        ],
+        [
+          ['[name="menu[options][dependee_4]"]' => ['value' => 'ON']],
           'xor',
-          array('[name="menu[options][dependee_5]"]' => array('value' => 'ON')),
-        ),
-      ),
-    );
-    $expected['bar']['#states'] = array(
-      'visible' => array(
-        array(
-          ':input[name="options[type]"]' => array('value' => 'normal'),
-        ),
-        array(
-          ':input[name="options[type]"]' => array('value' => 'tab'),
-        ),
-        ':input[name="options[type]"]' => array('value' => 'default tab'),
-      ),
-      'disabled' => array(
-        '[name="options[options][dependee_1]"]' => array('value' => 'ON'),
-        array(
-          array('[name="options[options][dependee_2]"]' => array('value' => 'ON')),
-          array('[name="options[options][dependee_3]"]' => array('value' => 'ON')),
-        ),
-        array(
-          array('[name="options[options][dependee_4]"]' => array('value' => 'ON')),
+          ['[name="menu[options][dependee_5]"]' => ['value' => 'ON']],
+        ],
+      ],
+    ];
+    $expected['bar']['#states'] = [
+      'visible' => [
+        [
+          ':input[name="options[type]"]' => ['value' => 'normal'],
+        ],
+        [
+          ':input[name="options[type]"]' => ['value' => 'tab'],
+        ],
+        ':input[name="options[type]"]' => ['value' => 'default tab'],
+      ],
+      'disabled' => [
+        '[name="options[options][dependee_1]"]' => ['value' => 'ON'],
+        [
+          ['[name="options[options][dependee_2]"]' => ['value' => 'ON']],
+          ['[name="options[options][dependee_3]"]' => ['value' => 'ON']],
+        ],
+        [
+          ['[name="options[options][dependee_4]"]' => ['value' => 'ON']],
           'xor',
-          array('[name="options[options][dependee_5]"]' => array('value' => 'ON')),
-        ),
-      ),
-    );
+          ['[name="options[options][dependee_5]"]' => ['value' => 'ON']],
+        ],
+      ],
+    ];
     FormHelper::rewriteStatesSelector($form, 'menu', 'options');
     $this->assertSame($expected, $form, 'The #states selectors were properly rewritten.');
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormStateDecoratorBaseTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormStateDecoratorBaseTest.php
index 67e7a8616..351788c6e 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormStateDecoratorBaseTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormStateDecoratorBaseTest.php
@@ -158,14 +158,12 @@ class FormStateDecoratorBaseTest extends UnitTestCase {
    * @dataProvider providerSingleBooleanArgument
    *
    * @param bool $cache
-   *
-   * @expectedException \LogicException
    */
   public function testSetCachedWithLogicException($cache) {
     $this->decoratedFormState->setCached($cache)
       ->willThrow(\LogicException::class);
-
-    $this->assertSame($this->formStateDecoratorBase, $this->formStateDecoratorBase->setCached($cache));
+    $this->setExpectedException(\LogicException::class);
+    $this->formStateDecoratorBase->setCached($cache);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormStateTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
index 69118a8f7..40179044d 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
@@ -41,17 +41,17 @@ class FormStateTest extends UnitTestCase {
    *   Returns some test data.
    */
   public function providerTestGetRedirect() {
-    $data = array();
-    $data[] = array(array(), NULL);
+    $data = [];
+    $data[] = [[], NULL];
 
     $redirect = new RedirectResponse('/example');
-    $data[] = array(array('redirect' => $redirect), $redirect);
+    $data[] = [['redirect' => $redirect], $redirect];
 
-    $data[] = array(array('redirect' => new Url('test_route_b', array('key' => 'value'))), new Url('test_route_b', array('key' => 'value')));
+    $data[] = [['redirect' => new Url('test_route_b', ['key' => 'value'])], new Url('test_route_b', ['key' => 'value'])];
 
-    $data[] = array(array('programmed' => TRUE), NULL);
-    $data[] = array(array('rebuild' => TRUE), NULL);
-    $data[] = array(array('no_redirect' => TRUE), NULL);
+    $data[] = [['programmed' => TRUE], NULL];
+    $data[] = [['rebuild' => TRUE], NULL];
+    $data[] = [['no_redirect' => TRUE], NULL];
 
     return $data;
   }
@@ -63,7 +63,7 @@ class FormStateTest extends UnitTestCase {
    */
   public function testSetError() {
     $form_state = new FormState();
-    $element['#parents'] = array('foo', 'bar');
+    $element['#parents'] = ['foo', 'bar'];
     $form_state->setError($element, 'Fail');
     $this->assertSame(['foo][bar' => 'Fail'], $form_state->getErrors());
   }
@@ -84,18 +84,18 @@ class FormStateTest extends UnitTestCase {
   }
 
   public function providerTestGetError() {
-    return array(
-      array(array(), array('foo')),
-      array(array('foo][bar' => 'Fail'), array()),
-      array(array('foo][bar' => 'Fail'), array('foo')),
-      array(array('foo][bar' => 'Fail'), array('bar')),
-      array(array('foo][bar' => 'Fail'), array('baz')),
-      array(array('foo][bar' => 'Fail'), array('foo', 'bar'), 'Fail'),
-      array(array('foo][bar' => 'Fail'), array('foo', 'bar', 'baz'), 'Fail'),
-      array(array('foo][bar' => 'Fail 2'), array('foo')),
-      array(array('foo' => 'Fail 1', 'foo][bar' => 'Fail 2'), array('foo'), 'Fail 1'),
-      array(array('foo' => 'Fail 1', 'foo][bar' => 'Fail 2'), array('foo', 'bar'), 'Fail 1'),
-    );
+    return [
+      [[], ['foo']],
+      [['foo][bar' => 'Fail'], []],
+      [['foo][bar' => 'Fail'], ['foo']],
+      [['foo][bar' => 'Fail'], ['bar']],
+      [['foo][bar' => 'Fail'], ['baz']],
+      [['foo][bar' => 'Fail'], ['foo', 'bar'], 'Fail'],
+      [['foo][bar' => 'Fail'], ['foo', 'bar', 'baz'], 'Fail'],
+      [['foo][bar' => 'Fail 2'], ['foo']],
+      [['foo' => 'Fail 1', 'foo][bar' => 'Fail 2'], ['foo'], 'Fail 1'],
+      [['foo' => 'Fail 1', 'foo][bar' => 'Fail 2'], ['foo', 'bar'], 'Fail 1'],
+    ];
   }
 
   /**
@@ -117,28 +117,26 @@ class FormStateTest extends UnitTestCase {
   }
 
   public function providerTestSetErrorByName() {
-    return array(
+    return [
       // Only validate the 'options' element.
-      array(array(array('options')), array('options' => '')),
+      [[['options']], ['options' => '']],
       // Do not limit an validation, and, ensuring the first error is returned
       // for the 'test' element.
       [NULL, ['test' => 'Fail 1', 'options' => '']],
       // Limit all validation.
-      array(array(), array()),
-    );
+      [[], []],
+    ];
   }
 
   /**
    * Tests that form errors during submission throw an exception.
    *
    * @covers ::setErrorByName
-   *
-   * @expectedException \LogicException
-   * @expectedExceptionMessage Form errors cannot be set after form validation has finished.
    */
   public function testFormErrorsDuringSubmission() {
     $form_state = new FormState();
     $form_state->setValidationComplete();
+    $this->setExpectedException(\LogicException::class, 'Form errors cannot be set after form validation has finished.');
     $form_state->setErrorByName('test', 'message');
   }
 
@@ -182,7 +180,7 @@ class FormStateTest extends UnitTestCase {
     $module = 'some_module';
     $name = 'some_name';
     $form_state = $this->getMockBuilder('Drupal\Core\Form\FormState')
-      ->setMethods(array('moduleLoadInclude'))
+      ->setMethods(['moduleLoadInclude'])
       ->getMock();
     $form_state->expects($this->once())
       ->method('moduleLoadInclude')
@@ -198,7 +196,7 @@ class FormStateTest extends UnitTestCase {
     $type = 'some_type';
     $module = 'some_module';
     $form_state = $this->getMockBuilder('Drupal\Core\Form\FormState')
-      ->setMethods(array('moduleLoadInclude'))
+      ->setMethods(['moduleLoadInclude'])
       ->getMock();
     $form_state->expects($this->once())
       ->method('moduleLoadInclude')
@@ -214,7 +212,7 @@ class FormStateTest extends UnitTestCase {
     $type = 'some_type';
     $module = 'some_module';
     $form_state = $this->getMockBuilder('Drupal\Core\Form\FormState')
-      ->setMethods(array('moduleLoadInclude'))
+      ->setMethods(['moduleLoadInclude'])
       ->getMock();
     $form_state->expects($this->once())
       ->method('moduleLoadInclude')
@@ -231,7 +229,7 @@ class FormStateTest extends UnitTestCase {
     $module = 'some_module';
     $name = 'some_name';
     $form_state = $this->getMockBuilder('Drupal\Core\Form\FormState')
-      ->setMethods(array('moduleLoadInclude'))
+      ->setMethods(['moduleLoadInclude'])
       ->getMock();
 
     $form_state->addBuildInfo('files', [
@@ -315,13 +313,11 @@ class FormStateTest extends UnitTestCase {
 
   /**
    * @covers ::setCached
-   *
-   * @expectedException \LogicException
-   * @expectedExceptionMessage Form state caching on GET requests is not allowed.
    */
   public function testSetCachedGet() {
     $form_state = new FormState();
     $form_state->setRequestMethod('GET');
+    $this->setExpectedException(\LogicException::class, 'Form state caching on GET requests is not allowed.');
     $form_state->setCached();
   }
 
@@ -376,9 +372,9 @@ class FormStateTest extends UnitTestCase {
     $form_state->setTemporaryValue('rainbow_sparkles', 'yes please');
     $this->assertSame($form_state->getTemporaryValue('rainbow_sparkles'), 'yes please');
     $this->assertTrue($form_state->hasTemporaryValue('rainbow_sparkles'), TRUE);
-    $form_state->setTemporaryValue(array('rainbow_sparkles', 'magic_ponies'), 'yes please');
-    $this->assertSame($form_state->getTemporaryValue(array('rainbow_sparkles', 'magic_ponies')), 'yes please');
-    $this->assertTrue($form_state->hasTemporaryValue(array('rainbow_sparkles', 'magic_ponies')), TRUE);
+    $form_state->setTemporaryValue(['rainbow_sparkles', 'magic_ponies'], 'yes please');
+    $this->assertSame($form_state->getTemporaryValue(['rainbow_sparkles', 'magic_ponies']), 'yes please');
+    $this->assertTrue($form_state->hasTemporaryValue(['rainbow_sparkles', 'magic_ponies']), TRUE);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php
index 6c8a6ebe6..15df6f65e 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php
@@ -46,7 +46,7 @@ class FormSubmitterTest extends UnitTestCase {
    */
   public function testHandleFormSubmissionNotSubmitted() {
     $form_submitter = $this->getFormSubmitter();
-    $form = array();
+    $form = [];
     $form_state = new FormState();
 
     $return = $form_submitter->doSubmitForm($form, $form_state);
@@ -59,7 +59,7 @@ class FormSubmitterTest extends UnitTestCase {
    */
   public function testHandleFormSubmissionNoRedirect() {
     $form_submitter = $this->getFormSubmitter();
-    $form = array();
+    $form = [];
     $form_state = (new FormState())
       ->setSubmitted()
       ->disableRedirect();
@@ -87,17 +87,17 @@ class FormSubmitterTest extends UnitTestCase {
       ->setFormState([$form_state_key => $response]);
 
     $form_submitter = $this->getFormSubmitter();
-    $form = array();
+    $form = [];
     $return = $form_submitter->doSubmitForm($form, $form_state);
 
     $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $return);
   }
 
   public function providerTestHandleFormSubmissionWithResponses() {
-    return array(
-      array('Symfony\Component\HttpFoundation\Response', 'response'),
-      array('Symfony\Component\HttpFoundation\RedirectResponse', 'redirect'),
-    );
+    return [
+      ['Symfony\Component\HttpFoundation\Response', 'response'],
+      ['Symfony\Component\HttpFoundation\RedirectResponse', 'redirect'],
+    ];
   }
 
   /**
@@ -138,10 +138,10 @@ class FormSubmitterTest extends UnitTestCase {
     $form_submitter = $this->getFormSubmitter();
     $this->urlGenerator->expects($this->once())
       ->method('generateFromRoute')
-      ->will($this->returnValueMap(array(
-          array('test_route_a', array(), array('absolute' => TRUE), FALSE, 'test-route'),
-          array('test_route_b', array('key' => 'value'), array('absolute' => TRUE), FALSE, 'test-route/value'),
-        ))
+      ->will($this->returnValueMap([
+          ['test_route_a', [], ['absolute' => TRUE], FALSE, 'test-route'],
+          ['test_route_b', ['key' => 'value'], ['absolute' => TRUE], FALSE, 'test-route/value'],
+        ])
       );
 
     $form_state = $this->getMock('Drupal\Core\Form\FormStateInterface');
@@ -160,10 +160,10 @@ class FormSubmitterTest extends UnitTestCase {
    *   Returns some test data.
    */
   public function providerTestRedirectWithUrl() {
-    return array(
-      array(new Url('test_route_a', array(), array('absolute' => TRUE)), 'test-route'),
-      array(new Url('test_route_b', array('key' => 'value'), array('absolute' => TRUE)), 'test-route/value'),
-    );
+    return [
+      [new Url('test_route_a', [], ['absolute' => TRUE]), 'test-route'],
+      [new Url('test_route_b', ['key' => 'value'], ['absolute' => TRUE]), 'test-route/value'],
+    ];
   }
 
   /**
@@ -223,11 +223,11 @@ class FormSubmitterTest extends UnitTestCase {
       ->method('simple_string_submit')
       ->with($this->isType('array'), $this->isInstanceOf('Drupal\Core\Form\FormStateInterface'));
 
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $form_submitter->executeSubmitHandlers($form, $form_state);
 
-    $form['#submit'][] = array($mock, 'hash_submit');
+    $form['#submit'][] = [$mock, 'hash_submit'];
     $form_submitter->executeSubmitHandlers($form, $form_state);
 
     // $form_state submit handlers will supersede $form handlers.
@@ -248,8 +248,8 @@ class FormSubmitterTest extends UnitTestCase {
     $request_stack = new RequestStack();
     $request_stack->push(Request::create('/test-path'));
     return $this->getMockBuilder('Drupal\Core\Form\FormSubmitter')
-      ->setConstructorArgs(array($request_stack, $this->urlGenerator))
-      ->setMethods(array('batchGet', 'drupalInstallationAttempted'))
+      ->setConstructorArgs([$request_stack, $this->urlGenerator])
+      ->setMethods(['batchGet', 'drupalInstallationAttempted'])
       ->getMock();
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormTestBase.php b/web/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
index 078d30ed9..ef08ab77e 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
@@ -163,7 +163,7 @@ abstract class FormTestBase extends UnitTestCase {
       ->getMock();
     $this->elementInfo->expects($this->any())
       ->method('getInfo')
-      ->will($this->returnCallback(array($this, 'getInfo')));
+      ->will($this->returnCallback([$this, 'getInfo']));
 
     $this->csrfToken = $this->getMockBuilder('Drupal\Core\Access\CsrfTokenGenerator')
       ->disableOriginalConstructor()
@@ -184,8 +184,8 @@ abstract class FormTestBase extends UnitTestCase {
       ->setMethods(NULL)
       ->getMock();
     $this->formSubmitter = $this->getMockBuilder('Drupal\Core\Form\FormSubmitter')
-      ->setConstructorArgs(array($this->requestStack, $this->urlGenerator))
-      ->setMethods(array('batchGet', 'drupalInstallationAttempted'))
+      ->setConstructorArgs([$this->requestStack, $this->urlGenerator])
+      ->setMethods(['batchGet', 'drupalInstallationAttempted'])
       ->getMock();
     $this->root = dirname(dirname(substr(__DIR__, 0, -strlen(__NAMESPACE__))));
 
@@ -290,25 +290,25 @@ abstract class FormTestBase extends UnitTestCase {
     $types['hidden'] = [
       '#input' => TRUE,
     ];
-    $types['token'] = array(
+    $types['token'] = [
       '#input' => TRUE,
-    );
-    $types['value'] = array(
+    ];
+    $types['value'] = [
       '#input' => TRUE,
-    );
-    $types['radios'] = array(
+    ];
+    $types['radios'] = [
       '#input' => TRUE,
-    );
-    $types['textfield'] = array(
+    ];
+    $types['textfield'] = [
       '#input' => TRUE,
-    );
-    $types['submit'] = array(
+    ];
+    $types['submit'] = [
       '#input' => TRUE,
       '#name' => 'op',
       '#is_button' => TRUE,
-    );
+    ];
     if (!isset($types[$type])) {
-      $types[$type] = array();
+      $types[$type] = [];
     }
     return $types[$type];
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
index e172e05fe..18f0be287 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
@@ -58,7 +58,7 @@ class FormValidatorTest extends UnitTestCase {
       ->setMethods(NULL)
       ->getMock();
 
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $this->assertFalse($form_state->isValidationComplete());
     $form_validator->validateForm('test_form_id', $form, $form_state);
@@ -73,12 +73,12 @@ class FormValidatorTest extends UnitTestCase {
   public function testPreventDuplicateValidation() {
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs([new RequestStack(), $this->getStringTranslationStub(), $this->csrfToken, $this->logger, $this->formErrorHandler])
-      ->setMethods(array('doValidateForm'))
+      ->setMethods(['doValidateForm'])
       ->getMock();
     $form_validator->expects($this->never())
       ->method('doValidateForm');
 
-    $form = array();
+    $form = [];
     $form_state = (new FormState())
       ->setValidationComplete();
     $form_validator->validateForm('test_form_id', $form, $form_state);
@@ -93,14 +93,14 @@ class FormValidatorTest extends UnitTestCase {
   public function testMustValidate() {
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs([new RequestStack(), $this->getStringTranslationStub(), $this->csrfToken, $this->logger, $this->formErrorHandler])
-      ->setMethods(array('doValidateForm'))
+      ->setMethods(['doValidateForm'])
       ->getMock();
     $form_validator->expects($this->once())
       ->method('doValidateForm');
     $this->formErrorHandler->expects($this->once())
       ->method('handleFormErrors');
 
-    $form = array();
+    $form = [];
     $form_state = (new FormState())
       ->setValidationComplete()
       ->setValidationEnforced();
@@ -112,7 +112,7 @@ class FormValidatorTest extends UnitTestCase {
    */
   public function testValidateInvalidFormToken() {
     $request_stack = new RequestStack();
-    $request = new Request(array(), array(), array(), array(), array(), array('REQUEST_URI' => '/test/example?foo=bar'));
+    $request = new Request([], [], [], [], [], ['REQUEST_URI' => '/test/example?foo=bar']);
     $request_stack->push($request);
     $this->csrfToken->expects($this->once())
       ->method('validate')
@@ -120,14 +120,14 @@ class FormValidatorTest extends UnitTestCase {
 
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs([$request_stack, $this->getStringTranslationStub(), $this->csrfToken, $this->logger, $this->formErrorHandler])
-      ->setMethods(array('doValidateForm'))
+      ->setMethods(['doValidateForm'])
       ->getMock();
     $form_validator->expects($this->never())
       ->method('doValidateForm');
 
     $form['#token'] = 'test_form_id';
     $form_state = $this->getMockBuilder('Drupal\Core\Form\FormState')
-      ->setMethods(array('setErrorByName'))
+      ->setMethods(['setErrorByName'])
       ->getMock();
     $form_state->expects($this->once())
       ->method('setErrorByName')
@@ -148,14 +148,14 @@ class FormValidatorTest extends UnitTestCase {
 
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs([$request_stack, $this->getStringTranslationStub(), $this->csrfToken, $this->logger, $this->formErrorHandler])
-      ->setMethods(array('doValidateForm'))
+      ->setMethods(['doValidateForm'])
       ->getMock();
     $form_validator->expects($this->once())
       ->method('doValidateForm');
 
     $form['#token'] = 'test_form_id';
     $form_state = $this->getMockBuilder('Drupal\Core\Form\FormState')
-      ->setMethods(array('setErrorByName'))
+      ->setMethods(['setErrorByName'])
       ->getMock();
     $form_state->expects($this->never())
       ->method('setErrorByName');
@@ -176,7 +176,7 @@ class FormValidatorTest extends UnitTestCase {
       ->getMock();
 
     $triggering_element['#limit_validation_errors'] = $sections;
-    $form = array();
+    $form = [];
     $form_state = (new FormState())
       ->setValues($values)
       ->setTriggeringElement($triggering_element);
@@ -186,80 +186,80 @@ class FormValidatorTest extends UnitTestCase {
   }
 
   public function providerTestHandleErrorsWithLimitedValidation() {
-    return array(
+    return [
       // Test with a non-existent section.
-      array(
-        array(array('test1'), array('test3')),
-        array(),
-        array(
+      [
+        [['test1'], ['test3']],
+        [],
+        [
           'test1' => 'foo',
           'test2' => 'bar',
-        ),
-        array(
+        ],
+        [
           'test1' => 'foo',
-        ),
-      ),
+        ],
+      ],
       // Test with buttons in a non-validated section.
-      array(
-        array(array('test1')),
-        array(
+      [
+        [['test1']],
+        [
           '#is_button' => TRUE,
           '#value' => 'baz',
           '#name' => 'op',
-          '#parents' => array('submit'),
-        ),
-        array(
+          '#parents' => ['submit'],
+        ],
+        [
           'test1' => 'foo',
           'test2' => 'bar',
           'op' => 'baz',
           'submit' => 'baz',
-        ),
-        array(
+        ],
+        [
           'test1' => 'foo',
           'submit' => 'baz',
           'op' => 'baz',
-        ),
-      ),
+        ],
+      ],
       // Test with a matching button #value and $form_state value.
-      array(
-        array(array('submit')),
-        array(
+      [
+        [['submit']],
+        [
           '#is_button' => TRUE,
           '#value' => 'baz',
           '#name' => 'op',
-          '#parents' => array('submit'),
-        ),
-        array(
+          '#parents' => ['submit'],
+        ],
+        [
           'test1' => 'foo',
           'test2' => 'bar',
           'op' => 'baz',
           'submit' => 'baz',
-        ),
-        array(
+        ],
+        [
           'submit' => 'baz',
           'op' => 'baz',
-        ),
-      ),
+        ],
+      ],
       // Test with a mismatched button #value and $form_state value.
-      array(
-        array(array('submit')),
-        array(
+      [
+        [['submit']],
+        [
           '#is_button' => TRUE,
           '#value' => 'bar',
           '#name' => 'op',
-          '#parents' => array('submit'),
-        ),
-        array(
+          '#parents' => ['submit'],
+        ],
+        [
           'test1' => 'foo',
           'test2' => 'bar',
           'op' => 'baz',
           'submit' => 'baz',
-        ),
-        array(
+        ],
+        [
           'submit' => 'baz',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
   /**
@@ -270,7 +270,7 @@ class FormValidatorTest extends UnitTestCase {
       ->setConstructorArgs([new RequestStack(), $this->getStringTranslationStub(), $this->csrfToken, $this->logger, $this->formErrorHandler])
       ->setMethods(NULL)
       ->getMock();
-    $mock = $this->getMock('stdClass', array('validate_handler', 'hash_validate'));
+    $mock = $this->getMock('stdClass', ['validate_handler', 'hash_validate']);
     $mock->expects($this->once())
       ->method('validate_handler')
       ->with($this->isType('array'), $this->isInstanceOf('Drupal\Core\Form\FormStateInterface'));
@@ -278,11 +278,11 @@ class FormValidatorTest extends UnitTestCase {
       ->method('hash_validate')
       ->with($this->isType('array'), $this->isInstanceOf('Drupal\Core\Form\FormStateInterface'));
 
-    $form = array();
+    $form = [];
     $form_state = new FormState();
     $form_validator->executeValidateHandlers($form, $form_state);
 
-    $form['#validate'][] = array($mock, 'hash_validate');
+    $form['#validate'][] = [$mock, 'hash_validate'];
     $form_validator->executeValidateHandlers($form, $form_state);
 
     // $form_state validate handlers will supersede $form handlers.
@@ -299,21 +299,21 @@ class FormValidatorTest extends UnitTestCase {
   public function testRequiredErrorMessage($element, $expected_message) {
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs([new RequestStack(), $this->getStringTranslationStub(), $this->csrfToken, $this->logger, $this->formErrorHandler])
-      ->setMethods(array('executeValidateHandlers'))
+      ->setMethods(['executeValidateHandlers'])
       ->getMock();
     $form_validator->expects($this->once())
       ->method('executeValidateHandlers');
 
-    $form = array();
-    $form['test'] = $element + array(
+    $form = [];
+    $form['test'] = $element + [
       '#type' => 'textfield',
       '#value' => '',
       '#needs_validation' => TRUE,
       '#required' => TRUE,
-      '#parents' => array('test'),
-    );
+      '#parents' => ['test'],
+    ];
     $form_state = $this->getMockBuilder('Drupal\Core\Form\FormState')
-      ->setMethods(array('setError'))
+      ->setMethods(['setError'])
       ->getMock();
     $form_state->expects($this->once())
       ->method('setError')
@@ -322,23 +322,23 @@ class FormValidatorTest extends UnitTestCase {
   }
 
   public function providerTestRequiredErrorMessage() {
-    return array(
-      array(
+    return [
+      [
         // Use the default message with a title.
-        array('#title' => 'Test'),
+        ['#title' => 'Test'],
         'Test field is required.',
-      ),
+      ],
       // Use a custom message.
-      array(
-        array('#required_error' => 'FAIL'),
+      [
+        ['#required_error' => 'FAIL'],
         'FAIL',
-      ),
+      ],
       // No title or custom message.
-      array(
-        array(),
+      [
+        [],
         '',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -347,22 +347,22 @@ class FormValidatorTest extends UnitTestCase {
   public function testElementValidate() {
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs([new RequestStack(), $this->getStringTranslationStub(), $this->csrfToken, $this->logger, $this->formErrorHandler])
-      ->setMethods(array('executeValidateHandlers'))
+      ->setMethods(['executeValidateHandlers'])
       ->getMock();
     $form_validator->expects($this->once())
       ->method('executeValidateHandlers');
-    $mock = $this->getMock('stdClass', array('element_validate'));
+    $mock = $this->getMock('stdClass', ['element_validate']);
     $mock->expects($this->once())
       ->method('element_validate')
       ->with($this->isType('array'), $this->isInstanceOf('Drupal\Core\Form\FormStateInterface'), NULL);
 
-    $form = array();
-    $form['test'] = array(
+    $form = [];
+    $form['test'] = [
       '#type' => 'textfield',
       '#title' => 'Test',
-      '#parents' => array('test'),
-      '#element_validate' => array(array($mock, 'element_validate')),
-    );
+      '#parents' => ['test'],
+      '#element_validate' => [[$mock, 'element_validate']],
+    ];
     $form_state = new FormState();
     $form_validator->validateForm('test_form_id', $form, $form_state);
   }
@@ -375,7 +375,7 @@ class FormValidatorTest extends UnitTestCase {
   public function testPerformRequiredValidation($element, $expected_message, $call_watchdog) {
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs([new RequestStack(), $this->getStringTranslationStub(), $this->csrfToken, $this->logger, $this->formErrorHandler])
-      ->setMethods(array('setError'))
+      ->setMethods(['setError'])
       ->getMock();
 
     if ($call_watchdog) {
@@ -384,15 +384,15 @@ class FormValidatorTest extends UnitTestCase {
         ->with($this->isType('string'), $this->isType('array'));
     }
 
-    $form = array();
-    $form['test'] = $element + array(
+    $form = [];
+    $form['test'] = $element + [
       '#title' => 'Test',
       '#needs_validation' => TRUE,
       '#required' => FALSE,
-      '#parents' => array('test'),
-    );
+      '#parents' => ['test'],
+    ];
     $form_state = $this->getMockBuilder('Drupal\Core\Form\FormState')
-      ->setMethods(array('setError'))
+      ->setMethods(['setError'])
       ->getMock();
     $form_state->expects($this->once())
       ->method('setError')
@@ -401,71 +401,71 @@ class FormValidatorTest extends UnitTestCase {
   }
 
   public function providerTestPerformRequiredValidation() {
-    return array(
-      array(
-        array(
+    return [
+      [
+        [
           '#type' => 'select',
-          '#options' => array(
+          '#options' => [
             'foo' => 'Foo',
             'bar' => 'Bar',
-          ),
+          ],
           '#required' => TRUE,
           '#value' => 'baz',
           '#empty_value' => 'baz',
           '#multiple' => FALSE,
-        ),
+        ],
         'Test field is required.',
         FALSE,
-      ),
-      array(
-        array(
+      ],
+      [
+        [
           '#type' => 'select',
-          '#options' => array(
+          '#options' => [
             'foo' => 'Foo',
             'bar' => 'Bar',
-          ),
+          ],
           '#value' => 'baz',
           '#multiple' => FALSE,
-        ),
+        ],
         'An illegal choice has been detected. Please contact the site administrator.',
         TRUE,
-      ),
-      array(
-        array(
+      ],
+      [
+        [
           '#type' => 'checkboxes',
-          '#options' => array(
+          '#options' => [
             'foo' => 'Foo',
             'bar' => 'Bar',
-          ),
-          '#value' => array('baz'),
+          ],
+          '#value' => ['baz'],
           '#multiple' => TRUE,
-        ),
+        ],
         'An illegal choice has been detected. Please contact the site administrator.',
         TRUE,
-      ),
-      array(
-        array(
+      ],
+      [
+        [
           '#type' => 'select',
-          '#options' => array(
+          '#options' => [
             'foo' => 'Foo',
             'bar' => 'Bar',
-          ),
-          '#value' => array('baz'),
+          ],
+          '#value' => ['baz'],
           '#multiple' => TRUE,
-        ),
+        ],
         'An illegal choice has been detected. Please contact the site administrator.',
         TRUE,
-      ),
-      array(
-        array(
+      ],
+      [
+        [
           '#type' => 'textfield',
           '#maxlength' => 7,
           '#value' => $this->randomMachineName(8),
-        ),
+        ],
         'Test cannot be longer than <em class="placeholder">7</em> characters but is currently <em class="placeholder">8</em> characters long.',
         FALSE,
-      ),
-    );
+      ],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Form/OptGroupTest.php b/web/core/tests/Drupal/Tests/Core/Form/OptGroupTest.php
index 1d3a8fc02..b38f33670 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/OptGroupTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/OptGroupTest.php
@@ -17,7 +17,7 @@ class OptGroupTest extends UnitTestCase {
    * @dataProvider providerTestFlattenOptions
    */
   public function testFlattenOptions($options) {
-    $this->assertSame(array('foo' => 'foo'), OptGroup::flattenOptions($options));
+    $this->assertSame(['foo' => 'foo'], OptGroup::flattenOptions($options));
   }
 
   /**
@@ -27,18 +27,18 @@ class OptGroupTest extends UnitTestCase {
    */
   public function providerTestFlattenOptions() {
     $object1 = new \stdClass();
-    $object1->option = array('foo' => 'foo');
+    $object1->option = ['foo' => 'foo'];
     $object2 = new \stdClass();
-    $object2->option = array(array('foo' => 'foo'), array('foo' => 'foo'));
+    $object2->option = [['foo' => 'foo'], ['foo' => 'foo']];
     $object3 = new \stdClass();
-    return array(
-      array(array('foo' => 'foo')),
-      array(array(array('foo' => 'foo'))),
-      array(array($object1)),
-      array(array($object2)),
-      array(array($object1, $object2)),
-      array(array('foo' => $object3, $object1, array('foo' => 'foo'))),
-    );
+    return [
+      [['foo' => 'foo']],
+      [[['foo' => 'foo']]],
+      [[$object1]],
+      [[$object2]],
+      [[$object1, $object2]],
+      [['foo' => $object3, $object1, ['foo' => 'foo']]],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Form/SubformStateTest.php b/web/core/tests/Drupal/Tests/Core/Form/SubformStateTest.php
index ec2ac8bb2..50124d01f 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/SubformStateTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/SubformStateTest.php
@@ -97,12 +97,11 @@ class SubformStateTest extends UnitTestCase {
    *
    * @dataProvider providerGetValuesBroken
    *
-   * @expectedException \UnexpectedValueException
-   *
    * @param string[] $parents
    * @param string $expected
    */
   public function testGetValuesBroken(array $parents, $expected) {
+    $this->setExpectedException(\UnexpectedValueException::class);
     $this->testGetValues($parents, $expected);
   }
 
@@ -161,10 +160,9 @@ class SubformStateTest extends UnitTestCase {
    * @covers ::getValue
    *
    * @dataProvider providerTestGetValueBroken
-   *
-   * @expectedException \UnexpectedValueException
    */
   public function testGetValueBroken(array $parents, $key, $expected, $default = NULL) {
+    $this->setExpectedException(\UnexpectedValueException::class);
     $this->testGetValue($parents, $key, $expected, $default);
   }
 
@@ -217,10 +215,9 @@ class SubformStateTest extends UnitTestCase {
    * @covers ::setValues
    *
    * @dataProvider providerTestSetValuesBroken
-   *
-   * @expectedException \UnexpectedValueException
    */
   public function testSetValuesBroken($parents, $new_values, $expected) {
+    $this->setExpectedException(\UnexpectedValueException::class);
     $this->testSetValues($parents, $new_values, $expected);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Form/fixtures/form_base_test.inc b/web/core/tests/Drupal/Tests/Core/Form/fixtures/form_base_test.inc
index cd833946f..b7623f768 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/fixtures/form_base_test.inc
+++ b/web/core/tests/Drupal/Tests/Core/Form/fixtures/form_base_test.inc
@@ -12,27 +12,27 @@
  *   The form array
  */
 function test_form_id() {
-  $form['test'] = array(
+  $form['test'] = [
     '#type' => 'textfield',
     '#title' => 'Test',
-  );
-  $form['options'] = array(
+  ];
+  $form['options'] = [
     '#type' => 'radios',
-    '#options' => array(
+    '#options' => [
       'foo' => 'foo',
       'bar' => 'bar',
-    ),
-  );
-  $form['value'] = array(
+    ],
+  ];
+  $form['value'] = [
     '#type' => 'value',
     '#value' => 'bananas',
-  );
-  $form['actions'] = array(
+  ];
+  $form['actions'] = [
     '#type' => 'actions',
-  );
-  $form['actions']['submit'] = array(
+  ];
+  $form['actions']['submit'] = [
     '#type' => 'submit',
     '#value' => 'Submit',
-  );
+  ];
   return $form;
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index 312bbdaf2..6b35f8655 100644
--- a/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -58,9 +58,9 @@ class ImageTest extends UnitTestCase {
    *
    * @return \PHPUnit_Framework_MockObject_MockObject
    */
-  protected function getToolkitMock(array $stubs = array()) {
+  protected function getToolkitMock(array $stubs = []) {
     $mock_builder = $this->getMockBuilder('Drupal\system\Plugin\ImageToolkit\GDToolkit');
-    $stubs = array_merge(array('getPluginId', 'save'), $stubs);
+    $stubs = array_merge(['getPluginId', 'save'], $stubs);
     return $mock_builder
       ->disableOriginalConstructor()
       ->setMethods($stubs)
@@ -81,8 +81,8 @@ class ImageTest extends UnitTestCase {
     $mock_builder = $this->getMockBuilder('Drupal\system\Plugin\ImageToolkit\Operation\gd\\' . $class_name);
     $logger = $this->getMock('Psr\Log\LoggerInterface');
     return $mock_builder
-      ->setMethods(array('execute'))
-      ->setConstructorArgs(array(array(), '', array(), $toolkit, $logger))
+      ->setMethods(['execute'])
+      ->setConstructorArgs([[], '', [], $toolkit, $logger])
       ->getMock();
   }
 
@@ -98,9 +98,9 @@ class ImageTest extends UnitTestCase {
    * @return \Drupal\Core\Image\Image
    *   An image object.
    */
-  protected function getTestImage($load_expected = TRUE, array $stubs = array()) {
+  protected function getTestImage($load_expected = TRUE, array $stubs = []) {
     if (!$load_expected && !in_array('load', $stubs)) {
-      $stubs = array_merge(array('load'), $stubs);
+      $stubs = array_merge(['load'], $stubs);
     }
 
     $this->toolkit = $this->getToolkitMock($stubs);
@@ -127,7 +127,7 @@ class ImageTest extends UnitTestCase {
    *   An image object.
    */
   protected function getTestImageForOperation($class_name) {
-    $this->toolkit = $this->getToolkitMock(array('getToolkitOperation'));
+    $this->toolkit = $this->getToolkitMock(['getToolkitOperation']);
     $this->toolkitOperation = $this->getToolkitOperationMock($class_name, $this->toolkit);
 
     $this->toolkit->expects($this->any())
@@ -209,7 +209,7 @@ class ImageTest extends UnitTestCase {
       ->method('save')
       ->will($this->returnValue(TRUE));
 
-    $image = $this->getMock('Drupal\Core\Image\Image', array('chmod'), array($toolkit, $this->image->getSource()));
+    $image = $this->getMock('Drupal\Core\Image\Image', ['chmod'], [$toolkit, $this->image->getSource()]);
     $image->expects($this->any())
       ->method('chmod')
       ->will($this->returnValue(TRUE));
@@ -241,7 +241,7 @@ class ImageTest extends UnitTestCase {
       ->method('save')
       ->will($this->returnValue(TRUE));
 
-    $image = $this->getMock('Drupal\Core\Image\Image', array('chmod'), array($toolkit, $this->image->getSource()));
+    $image = $this->getMock('Drupal\Core\Image\Image', ['chmod'], [$toolkit, $this->image->getSource()]);
     $image->expects($this->any())
       ->method('chmod')
       ->will($this->returnValue(FALSE));
diff --git a/web/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php b/web/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
index eaaf5a332..aefcbb0c0 100644
--- a/web/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
@@ -19,7 +19,7 @@ class LanguageUnitTest extends UnitTestCase {
     $name = $this->randomMachineName();
     $language_code = $this->randomMachineName(2);
     $uuid = $this->randomMachineName();
-    $language = new Language(array('id' => $language_code, 'name' => $name, 'uuid' => $uuid));
+    $language = new Language(['id' => $language_code, 'name' => $name, 'uuid' => $uuid]);
     // Test that nonexistent properties are not added to the language object.
     $this->assertTrue(property_exists($language, 'id'));
     $this->assertTrue(property_exists($language, 'name'));
@@ -32,7 +32,7 @@ class LanguageUnitTest extends UnitTestCase {
   public function testGetName() {
     $name = $this->randomMachineName();
     $language_code = $this->randomMachineName(2);
-    $language = new Language(array('id' => $language_code, 'name' => $name));
+    $language = new Language(['id' => $language_code, 'name' => $name]);
     $this->assertSame($name, $language->getName());
   }
 
@@ -41,7 +41,7 @@ class LanguageUnitTest extends UnitTestCase {
    */
   public function testGetLangcode() {
     $language_code = $this->randomMachineName(2);
-    $language = new Language(array('id' => $language_code));
+    $language = new Language(['id' => $language_code]);
     $this->assertSame($language_code, $language->getId());
   }
 
@@ -50,7 +50,7 @@ class LanguageUnitTest extends UnitTestCase {
    */
   public function testGetDirection() {
     $language_code = $this->randomMachineName(2);
-    $language = new Language(array('id' => $language_code, 'direction' => LanguageInterface::DIRECTION_RTL));
+    $language = new Language(['id' => $language_code, 'direction' => LanguageInterface::DIRECTION_RTL]);
     $this->assertSame(LanguageInterface::DIRECTION_RTL, $language->getDirection());
   }
 
@@ -66,14 +66,14 @@ class LanguageUnitTest extends UnitTestCase {
       ->will($this->returnValue($language_default));
     \Drupal::setContainer($container);
 
-    $language = new Language(array('id' => $this->randomMachineName(2)));
+    $language = new Language(['id' => $this->randomMachineName(2)]);
     // Set up the LanguageDefault to return different default languages on
     // consecutive calls.
     $language_default->expects($this->any())
       ->method('get')
       ->willReturnOnConsecutiveCalls(
         $language,
-        new Language(array('id' => $this->randomMachineName(2)))
+        new Language(['id' => $this->randomMachineName(2)])
       );
 
     $this->assertTrue($language->isDefault());
@@ -104,58 +104,58 @@ class LanguageUnitTest extends UnitTestCase {
    *   An array of test data.
    */
   public function providerTestSortArrayOfLanguages() {
-    $language9A = new Language(array('id' => 'dd', 'name' => 'A', 'weight' => 9));
-    $language10A = new Language(array('id' => 'ee', 'name' => 'A', 'weight' => 10));
-    $language10B = new Language(array('id' => 'ff', 'name' => 'B', 'weight' => 10));
+    $language9A = new Language(['id' => 'dd', 'name' => 'A', 'weight' => 9]);
+    $language10A = new Language(['id' => 'ee', 'name' => 'A', 'weight' => 10]);
+    $language10B = new Language(['id' => 'ff', 'name' => 'B', 'weight' => 10]);
 
-    return array(
+    return [
       // Set up data set #0, already ordered by weight.
-      array(
+      [
         // Set the data.
-        array(
+        [
           $language9A->getId() => $language9A,
           $language10B->getId() => $language10B,
-        ),
+        ],
         // Set the expected key order.
-        array(
+        [
           $language9A->getId(),
           $language10B->getId(),
-        ),
-      ),
+        ],
+      ],
       // Set up data set #1, out of order by weight.
-      array(
-        array(
+      [
+        [
           $language10B->getId() => $language10B,
           $language9A->getId() => $language9A,
-        ),
-        array(
+        ],
+        [
           $language9A->getId(),
           $language10B->getId(),
-        ),
-      ),
+        ],
+      ],
       // Set up data set #2, tied by weight, already ordered by name.
-      array(
-        array(
+      [
+        [
           $language10A->getId() => $language10A,
           $language10B->getId() => $language10B,
-        ),
-        array(
+        ],
+        [
           $language10A->getId(),
           $language10B->getId(),
-        ),
-      ),
+        ],
+      ],
       // Set up data set #3, tied by weight, out of order by name.
-      array(
-        array(
+      [
+        [
           $language10B->getId() => $language10B,
           $language10A->getId() => $language10A,
-        ),
-        array(
+        ],
+        [
           $language10A->getId(),
           $language10B->getId(),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Layout/LayoutDefaultTest.php b/web/core/tests/Drupal/Tests/Core/Layout/LayoutDefaultTest.php
new file mode 100644
index 000000000..91aadb7d9
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Layout/LayoutDefaultTest.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Drupal\Tests\Core\Layout;
+
+use Drupal\Core\Layout\LayoutDefault;
+use Drupal\Core\Layout\LayoutDefinition;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Layout\LayoutDefault
+ * @group Layout
+ */
+class LayoutDefaultTest extends UnitTestCase {
+
+  /**
+   * @covers ::build
+   * @dataProvider providerTestBuild
+   */
+  public function testBuild($regions, $expected) {
+    $definition = new LayoutDefinition([
+      'theme_hook' => 'layout',
+      'library' => 'core/drupal',
+      'regions' => [
+        'left' => [
+          'label' => 'Left',
+        ],
+        'right' => [
+          'label' => 'Right',
+        ],
+      ],
+    ]);
+    $expected += [
+      '#settings' => [],
+      '#layout' => $definition,
+      '#theme' => 'layout',
+      '#attached' => [
+        'library' => [
+          'core/drupal',
+        ],
+      ],
+    ];
+
+    $layout = new LayoutDefault([], '', $definition);
+    $this->assertSame($expected, $layout->build($regions));
+  }
+
+  /**
+   * Provides test data for ::testBuild().
+   */
+  public function providerTestBuild() {
+    $data = [];
+    // Empty regions are not added.
+    $data['right_only'] = [
+      [
+        'right' => [
+          'foo' => 'bar',
+        ],
+      ],
+      [
+        'right' => [
+          'foo' => 'bar',
+        ],
+      ],
+    ];
+    // Regions will be in the order defined by the layout.
+    $data['switched_order'] = [
+      [
+        'right' => [
+          'foo' => 'bar',
+        ],
+        'left' => [
+          'foo' => 'baz',
+        ],
+      ],
+      [
+        'left' => [
+          'foo' => 'baz',
+        ],
+        'right' => [
+          'foo' => 'bar',
+        ],
+      ],
+    ];
+    return $data;
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php b/web/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php
new file mode 100644
index 000000000..2d8985914
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php
@@ -0,0 +1,390 @@
+<?php
+
+namespace Drupal\Tests\Core\Layout;
+
+use Drupal\Component\Plugin\Derivative\DeriverBase;
+use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Extension\Extension;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Extension\ThemeHandlerInterface;
+use Drupal\Core\Layout\LayoutDefault;
+use Drupal\Core\Layout\LayoutDefinition;
+use Drupal\Core\Layout\LayoutPluginManager;
+use Drupal\Tests\UnitTestCase;
+use org\bovigo\vfs\vfsStream;
+use Prophecy\Argument;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Layout\LayoutPluginManager
+ * @group Layout
+ */
+class LayoutPluginManagerTest extends UnitTestCase {
+
+  /**
+   * The module handler.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * The theme handler.
+   *
+   * @var \Drupal\Core\Extension\ThemeHandlerInterface
+   */
+  protected $themeHandler;
+
+  /**
+   * Cache backend instance.
+   *
+   * @var \Drupal\Core\Cache\CacheBackendInterface
+   */
+  protected $cacheBackend;
+
+  /**
+   * The layout plugin manager.
+   *
+   * @var \Drupal\Core\Layout\LayoutPluginManagerInterface
+   */
+  protected $layoutPluginManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->setUpFilesystem();
+
+    $container = new ContainerBuilder();
+    $container->set('string_translation', $this->getStringTranslationStub());
+    \Drupal::setContainer($container);
+
+    $this->moduleHandler = $this->prophesize(ModuleHandlerInterface::class);
+
+    $this->moduleHandler->moduleExists('module_a')->willReturn(TRUE);
+    $this->moduleHandler->moduleExists('theme_a')->willReturn(FALSE);
+    $this->moduleHandler->moduleExists('core')->willReturn(FALSE);
+    $this->moduleHandler->moduleExists('invalid_provider')->willReturn(FALSE);
+
+    $module_a = new Extension('/', 'module', vfsStream::url('root/modules/module_a/module_a.layouts.yml'));
+    $this->moduleHandler->getModule('module_a')->willReturn($module_a);
+    $this->moduleHandler->getModuleDirectories()->willReturn(['module_a' => vfsStream::url('root/modules/module_a')]);
+    $this->moduleHandler->alter('layout', Argument::type('array'))->shouldBeCalled();
+
+    $this->themeHandler = $this->prophesize(ThemeHandlerInterface::class);
+
+    $this->themeHandler->themeExists('theme_a')->willReturn(TRUE);
+    $this->themeHandler->themeExists('core')->willReturn(FALSE);
+    $this->themeHandler->themeExists('invalid_provider')->willReturn(FALSE);
+
+    $theme_a = new Extension('/', 'theme', vfsStream::url('root/themes/theme_a/theme_a.layouts.yml'));
+    $this->themeHandler->getTheme('theme_a')->willReturn($theme_a);
+    $this->themeHandler->getThemeDirectories()->willReturn(['theme_a' => vfsStream::url('root/themes/theme_a')]);
+
+    $this->cacheBackend = $this->prophesize(CacheBackendInterface::class);
+
+    $namespaces = new \ArrayObject(['Drupal\Core' => vfsStream::url('root/core/lib/Drupal/Core')]);
+    $this->layoutPluginManager = new LayoutPluginManager($namespaces, $this->cacheBackend->reveal(), $this->moduleHandler->reveal(), $this->themeHandler->reveal(), $this->getStringTranslationStub());
+  }
+
+  /**
+   * @covers ::getDefinitions
+   * @covers ::providerExists
+   */
+  public function testGetDefinitions() {
+    $expected = [
+      'module_a_provided_layout',
+      'theme_a_provided_layout',
+      'plugin_provided_layout',
+    ];
+
+    $layout_definitions = $this->layoutPluginManager->getDefinitions();
+    $this->assertEquals($expected, array_keys($layout_definitions));
+    $this->assertContainsOnlyInstancesOf(LayoutDefinition::class, $layout_definitions);
+  }
+
+  /**
+   * @covers ::getDefinition
+   * @covers ::processDefinition
+   */
+  public function testGetDefinition() {
+    $theme_a_path = vfsStream::url('root/themes/theme_a');
+    $layout_definition = $this->layoutPluginManager->getDefinition('theme_a_provided_layout');
+    $this->assertSame('theme_a_provided_layout', $layout_definition->id());
+    $this->assertSame('2 column layout', $layout_definition->getLabel());
+    $this->assertSame('Columns: 2', $layout_definition->getCategory());
+    $this->assertSame('twocol', $layout_definition->getTemplate());
+    $this->assertSame("$theme_a_path/templates", $layout_definition->getPath());
+    $this->assertSame('theme_a/twocol', $layout_definition->getLibrary());
+    $this->assertSame('twocol', $layout_definition->getThemeHook());
+    $this->assertSame("$theme_a_path/templates", $layout_definition->getTemplatePath());
+    $this->assertSame('theme_a', $layout_definition->getProvider());
+    $this->assertSame('right', $layout_definition->getDefaultRegion());
+    $this->assertSame(LayoutDefault::class, $layout_definition->getClass());
+    $expected_regions = [
+      'left' => [
+        'label' => 'Left region',
+      ],
+      'right' => [
+        'label' => 'Right region',
+      ],
+    ];
+    $this->assertSame($expected_regions, $layout_definition->getRegions());
+
+    $module_a_path = vfsStream::url('root/modules/module_a');
+    $layout_definition = $this->layoutPluginManager->getDefinition('module_a_provided_layout');
+    $this->assertSame('module_a_provided_layout', $layout_definition->id());
+    $this->assertSame('1 column layout', $layout_definition->getLabel());
+    $this->assertSame('Columns: 1', $layout_definition->getCategory());
+    $this->assertSame(NULL, $layout_definition->getTemplate());
+    $this->assertSame("$module_a_path/layouts", $layout_definition->getPath());
+    $this->assertSame('module_a/onecol', $layout_definition->getLibrary());
+    $this->assertSame('onecol', $layout_definition->getThemeHook());
+    $this->assertSame(NULL, $layout_definition->getTemplatePath());
+    $this->assertSame('module_a', $layout_definition->getProvider());
+    $this->assertSame('top', $layout_definition->getDefaultRegion());
+    $this->assertSame(LayoutDefault::class, $layout_definition->getClass());
+    $expected_regions = [
+      'top' => [
+        'label' => 'Top region',
+      ],
+      'bottom' => [
+        'label' => 'Bottom region',
+      ],
+    ];
+    $this->assertSame($expected_regions, $layout_definition->getRegions());
+
+    $core_path = '/core/lib/Drupal/Core';
+    $layout_definition = $this->layoutPluginManager->getDefinition('plugin_provided_layout');
+    $this->assertSame('plugin_provided_layout', $layout_definition->id());
+    $this->assertEquals('Layout plugin', $layout_definition->getLabel());
+    $this->assertEquals('Columns: 1', $layout_definition->getCategory());
+    $this->assertSame('plugin-provided-layout', $layout_definition->getTemplate());
+    $this->assertSame($core_path, $layout_definition->getPath());
+    $this->assertSame(NULL, $layout_definition->getLibrary());
+    $this->assertSame('plugin_provided_layout', $layout_definition->getThemeHook());
+    $this->assertSame("$core_path/templates", $layout_definition->getTemplatePath());
+    $this->assertSame('core', $layout_definition->getProvider());
+    $this->assertSame('main', $layout_definition->getDefaultRegion());
+    $this->assertSame('Drupal\Core\Plugin\Layout\TestLayout', $layout_definition->getClass());
+    $expected_regions = [
+      'main' => [
+        'label' => 'Main Region',
+      ],
+    ];
+    $this->assertEquals($expected_regions, $layout_definition->getRegions());
+  }
+
+  /**
+   * @covers ::processDefinition
+   */
+  public function testProcessDefinition() {
+    $this->moduleHandler->alter('layout', Argument::type('array'))->shouldNotBeCalled();
+    $this->setExpectedException(InvalidPluginDefinitionException::class, 'The "module_a_derived_layout:array_based" layout definition must extend ' . LayoutDefinition::class);
+    $module_a_provided_layout = <<<'EOS'
+module_a_derived_layout:
+  deriver: \Drupal\Tests\Core\Layout\LayoutDeriver
+  array_based: true
+EOS;
+    vfsStream::create([
+      'modules' => [
+        'module_a' => [
+          'module_a.layouts.yml' => $module_a_provided_layout,
+        ],
+      ],
+    ]);
+    $this->layoutPluginManager->getDefinitions();
+  }
+
+  /**
+   * @covers ::getThemeImplementations
+   */
+  public function testGetThemeImplementations() {
+    $core_path = '/core/lib/Drupal/Core';
+    $theme_a_path = vfsStream::url('root/themes/theme_a');
+    $expected = [
+      'layout' => [
+        'render element' => 'content',
+      ],
+      'twocol' => [
+        'render element' => 'content',
+        'base hook' => 'layout',
+        'template' => 'twocol',
+        'path' => "$theme_a_path/templates",
+      ],
+      'plugin_provided_layout' => [
+        'render element' => 'content',
+        'base hook' => 'layout',
+        'template' => 'plugin-provided-layout',
+        'path' => "$core_path/templates",
+      ],
+    ];
+    $theme_implementations = $this->layoutPluginManager->getThemeImplementations();
+    $this->assertEquals($expected, $theme_implementations);
+  }
+
+  /**
+   * @covers ::getCategories
+   */
+  public function testGetCategories() {
+    $expected = [
+      'Columns: 1',
+      'Columns: 2',
+    ];
+    $categories = $this->layoutPluginManager->getCategories();
+    $this->assertEquals($expected, $categories);
+  }
+
+  /**
+   * @covers ::getSortedDefinitions
+   */
+  public function testGetSortedDefinitions() {
+    $expected = [
+      'module_a_provided_layout',
+      'plugin_provided_layout',
+      'theme_a_provided_layout',
+    ];
+
+    $layout_definitions = $this->layoutPluginManager->getSortedDefinitions();
+    $this->assertEquals($expected, array_keys($layout_definitions));
+    $this->assertContainsOnlyInstancesOf(LayoutDefinition::class, $layout_definitions);
+  }
+
+  /**
+   * @covers ::getGroupedDefinitions
+   */
+  public function testGetGroupedDefinitions() {
+    $category_expected = [
+      'Columns: 1' => [
+        'module_a_provided_layout',
+        'plugin_provided_layout',
+      ],
+      'Columns: 2' => [
+        'theme_a_provided_layout',
+      ],
+    ];
+
+    $definitions = $this->layoutPluginManager->getGroupedDefinitions();
+    $this->assertEquals(array_keys($category_expected), array_keys($definitions));
+    foreach ($category_expected as $category => $expected) {
+      $this->assertArrayHasKey($category, $definitions);
+      $this->assertEquals($expected, array_keys($definitions[$category]));
+      $this->assertContainsOnlyInstancesOf(LayoutDefinition::class, $definitions[$category]);
+    }
+  }
+
+  /**
+   * Sets up the filesystem with YAML files and annotated plugins.
+   */
+  protected function setUpFilesystem() {
+    $module_a_provided_layout = <<<'EOS'
+module_a_provided_layout:
+  label: 1 column layout
+  category: 'Columns: 1'
+  theme_hook: onecol
+  path: layouts
+  library: module_a/onecol
+  regions:
+    top:
+      label: Top region
+    bottom:
+      label: Bottom region
+module_a_derived_layout:
+  deriver: \Drupal\Tests\Core\Layout\LayoutDeriver
+  invalid_provider: true
+EOS;
+    $theme_a_provided_layout = <<<'EOS'
+theme_a_provided_layout:
+  class: '\Drupal\Core\Layout\LayoutDefault'
+  label: 2 column layout
+  category: 'Columns: 2'
+  template: twocol
+  path: templates
+  library: theme_a/twocol
+  default_region: right
+  regions:
+    left:
+      label: Left region
+    right:
+      label: Right region
+EOS;
+    $plugin_provided_layout = <<<'EOS'
+<?php
+namespace Drupal\Core\Plugin\Layout;
+use Drupal\Core\Layout\LayoutDefault;
+/**
+ * @Layout(
+ *   id = "plugin_provided_layout",
+ *   label = @Translation("Layout plugin"),
+ *   category = @Translation("Columns: 1"),
+ *   description = @Translation("Test layout"),
+ *   path = "core/lib/Drupal/Core",
+ *   template = "templates/plugin-provided-layout",
+ *   regions = {
+ *     "main" = {
+ *       "label" = @Translation("Main Region")
+ *     }
+ *   }
+ * )
+ */
+class TestLayout extends LayoutDefault {}
+EOS;
+    vfsStream::setup('root');
+    vfsStream::create([
+      'modules' => [
+        'module_a' => [
+          'module_a.layouts.yml' => $module_a_provided_layout,
+        ],
+      ],
+    ]);
+    vfsStream::create([
+      'themes' => [
+        'theme_a' => [
+          'theme_a.layouts.yml' => $theme_a_provided_layout,
+        ],
+      ],
+    ]);
+    vfsStream::create([
+      'core' => [
+        'lib' => [
+          'Drupal' => [
+            'Core' => [
+              'Plugin' => [
+                'Layout' => [
+                  'TestLayout.php' => $plugin_provided_layout,
+                ],
+              ],
+            ],
+          ],
+        ],
+      ],
+    ]);
+  }
+
+}
+
+/**
+ * Provides a dynamic layout deriver for the test.
+ */
+class LayoutDeriver extends DeriverBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    if ($base_plugin_definition->get('array_based')) {
+      $this->derivatives['array_based'] = [];
+    }
+    if ($base_plugin_definition->get('invalid_provider')) {
+      $this->derivatives['invalid_provider'] = new LayoutDefinition([
+        'id' => 'invalid_provider',
+        'provider' => 'invalid_provider',
+      ]);
+    }
+    return $this->derivatives;
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Logger/LogMessageParserTest.php b/web/core/tests/Drupal/Tests/Core/Logger/LogMessageParserTest.php
index 112abf13d..395517f51 100644
--- a/web/core/tests/Drupal/Tests/Core/Logger/LogMessageParserTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Logger/LogMessageParserTest.php
@@ -37,33 +37,33 @@ class LogMessageParserTest extends UnitTestCase {
    * Data provider for testParseMessagePlaceholders().
    */
   public function providerTestParseMessagePlaceholders() {
-    return array(
+    return [
       // PSR3 only message.
-      array(
-        array('message' => 'User {username} created', 'context' => array('username' => 'Dries')),
-        array('message' => 'User @username created', 'context' => array('@username' => 'Dries')),
-      ),
+      [
+        ['message' => 'User {username} created', 'context' => ['username' => 'Dries']],
+        ['message' => 'User @username created', 'context' => ['@username' => 'Dries']],
+      ],
       // PSR3 style mixed in a format_string style message.
-      array(
-        array('message' => 'User {username} created @time', 'context' => array('username' => 'Dries', '@time' => 'now')),
-        array('message' => 'User @username created @time', 'context' => array('@username' => 'Dries', '@time' => 'now')),
-      ),
+      [
+        ['message' => 'User {username} created @time', 'context' => ['username' => 'Dries', '@time' => 'now']],
+        ['message' => 'User @username created @time', 'context' => ['@username' => 'Dries', '@time' => 'now']],
+      ],
       // format_string style message only.
-      array(
-        array('message' => 'User @username created', 'context' => array('@username' => 'Dries')),
-        array('message' => 'User @username created', 'context' => array('@username' => 'Dries')),
-      ),
+      [
+        ['message' => 'User @username created', 'context' => ['@username' => 'Dries']],
+        ['message' => 'User @username created', 'context' => ['@username' => 'Dries']],
+      ],
       // Message without placeholders but wildcard characters.
-      array(
-        array('message' => 'User W-\\};~{&! created @', 'context' => array('' => '')),
-        array('message' => 'User W-\\};~{&! created @', 'context' => array()),
-      ),
+      [
+        ['message' => 'User W-\\};~{&! created @', 'context' => ['' => '']],
+        ['message' => 'User W-\\};~{&! created @', 'context' => []],
+      ],
       // Message with double PSR3 style messages.
-      array(
-        array('message' => 'Test {with} two {encapsuled} strings', 'context' => array('with' => 'together', 'encapsuled' => 'awesome')),
-        array('message' => 'Test @with two @encapsuled strings', 'context' => array('@with' => 'together', '@encapsuled' => 'awesome')),
-      ),
-    );
+      [
+        ['message' => 'Test {with} two {encapsuled} strings', 'context' => ['with' => 'together', 'encapsuled' => 'awesome']],
+        ['message' => 'Test @with two @encapsuled strings', 'context' => ['@with' => 'together', '@encapsuled' => 'awesome']],
+      ],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php b/web/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
index 932edb727..d2b283adb 100644
--- a/web/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
@@ -113,35 +113,35 @@ class LoggerChannelTest extends UnitTestCase {
     $request_mock->headers = $this->getMock('Symfony\Component\HttpFoundation\ParameterBag');
 
     // No request or account.
-    $cases [] = array(
+    $cases [] = [
       function ($context) {
         return $context['channel'] == 'test' && empty($context['uid']) && empty($context['ip']);
       },
-    );
+    ];
     // With account but not request. Since the request is not available the
     // current user should not be used.
-    $cases [] = array(
+    $cases [] = [
       function ($context) {
         return $context['uid'] === 0 && empty($context['ip']);
       },
       NULL,
       $account_mock,
-    );
+    ];
     // With request but not account.
-    $cases [] = array(
+    $cases [] = [
       function ($context) {
         return $context['ip'] === '127.0.0.1' && empty($context['uid']);
       },
       $request_mock,
-    );
+    ];
     // Both request and account.
-    $cases [] = array(
+    $cases [] = [
       function ($context) {
         return $context['ip'] === '127.0.0.1' && $context['uid'] === 1;
       },
       $request_mock,
       $account_mock,
-    );
+    ];
     return $cases;
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php b/web/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php
index d802374f3..9ba2fb52b 100644
--- a/web/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php
@@ -66,16 +66,16 @@ class MailManagerTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $definitions = array(
-    'php_mail' => array(
+  protected $definitions = [
+    'php_mail' => [
       'id' => 'php_mail',
       'class' => 'Drupal\Core\Mail\Plugin\Mail\PhpMail',
-    ),
-    'test_mail_collector' => array(
+    ],
+    'test_mail_collector' => [
       'id' => 'test_mail_collector',
       'class' => 'Drupal\Core\Mail\Plugin\Mail\TestMailCollector',
-    ),
-  );
+    ],
+  ];
 
   /**
    * {@inheritdoc}
@@ -97,13 +97,13 @@ class MailManagerTest extends UnitTestCase {
   /**
    * Sets up the mail manager for testing.
    */
-  protected function setUpMailManager($interface = array()) {
+  protected function setUpMailManager($interface = []) {
     // Use the provided config for system.mail.interface settings.
-    $this->configFactory = $this->getConfigFactoryStub(array(
-      'system.mail' => array(
+    $this->configFactory = $this->getConfigFactoryStub([
+      'system.mail' => [
         'interface' => $interface,
-      ),
-    ));
+      ],
+    ]);
     $logger_factory = $this->getMock('\Drupal\Core\Logger\LoggerChannelFactoryInterface');
     $string_translation = $this->getStringTranslationStub();
     $this->renderer = $this->getMock(RendererInterface::class);
@@ -118,19 +118,19 @@ class MailManagerTest extends UnitTestCase {
    * @covers ::getInstance
    */
   public function testGetInstance() {
-    $interface = array(
+    $interface = [
       'default' => 'php_mail',
       'default' => 'test_mail_collector',
-    );
+    ];
     $this->setUpMailManager($interface);
 
     // Test that an unmatched message_id returns the default plugin instance.
-    $options = array('module' => 'foo', 'key' => 'bar');
+    $options = ['module' => 'foo', 'key' => 'bar'];
     $instance = $this->mailManager->getInstance($options);
     $this->assertInstanceOf('Drupal\Core\Mail\Plugin\Mail\PhpMail', $instance);
 
     // Test that a matching message_id returns the specified plugin instance.
-    $options = array('module' => 'example', 'key' => 'testkey');
+    $options = ['module' => 'example', 'key' => 'testkey'];
     $instance = $this->mailManager->getInstance($options);
     $this->assertInstanceOf('Drupal\Core\Mail\Plugin\Mail\TestMailCollector', $instance);
   }
@@ -142,10 +142,10 @@ class MailManagerTest extends UnitTestCase {
    * @covers ::mail
    */
   public function testMailInRenderContext() {
-    $interface = array(
+    $interface = [
       'default' => 'php_mail',
       'example_testkey' => 'test_mail_collector',
-    );
+    ];
     $this->setUpMailManager($interface);
 
     $this->renderer->expects($this->exactly(1))
@@ -176,9 +176,9 @@ class TestMailManager extends MailManager {
   /**
    * {@inheritdoc}
    */
-  public function doMail($module, $key, $to, $langcode, $params = array(), $reply = NULL, $send = TRUE) {
+  public function doMail($module, $key, $to, $langcode, $params = [], $reply = NULL, $send = TRUE) {
     // Build a simplified message array and return it.
-    $message = array(
+    $message = [
       'id' => $module . '_' . $key,
       'module' => $module,
       'key' => $key,
@@ -189,8 +189,8 @@ class TestMailManager extends MailManager {
       'params' => $params,
       'send' => TRUE,
       'subject' => '',
-      'body' => array(),
-    );
+      'body' => [],
+    ];
 
     return $message;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php b/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
index 970997fc6..a956d8346 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
@@ -25,7 +25,7 @@ class ContextualLinkDefaultTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $config = array();
+  protected $config = [];
 
   /**
    * The used plugin ID.
@@ -39,9 +39,9 @@ class ContextualLinkDefaultTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $pluginDefinition = array(
+  protected $pluginDefinition = [
     'id' => 'contextual_link_default',
-  );
+  ];
 
   /**
    * The mocked translator.
@@ -80,7 +80,7 @@ class ContextualLinkDefaultTest extends UnitTestCase {
    */
   public function testGetTitleWithContext() {
     $title = 'Example';
-    $this->pluginDefinition['title'] = (new TranslatableMarkup($title, array(), array('context' => 'context'), $this->stringTranslation));
+    $this->pluginDefinition['title'] = (new TranslatableMarkup($title, [], ['context' => 'context'], $this->stringTranslation));
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
@@ -95,7 +95,7 @@ class ContextualLinkDefaultTest extends UnitTestCase {
    */
   public function testGetTitleWithTitleArguments() {
     $title = 'Example @test';
-    $this->pluginDefinition['title'] = (new TranslatableMarkup($title, array('@test' => 'value'), [], $this->stringTranslation));
+    $this->pluginDefinition['title'] = (new TranslatableMarkup($title, ['@test' => 'value'], [], $this->stringTranslation));
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
@@ -129,7 +129,7 @@ class ContextualLinkDefaultTest extends UnitTestCase {
   /**
    * @covers ::getOptions
    */
-  public function testGetOptions($options = array('key' => 'value')) {
+  public function testGetOptions($options = ['key' => 'value']) {
     $this->pluginDefinition['options'] = $options;
     $this->setupContextualLinkDefault();
 
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php b/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php
index b3f01517f..bebc935bb 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php
@@ -2,8 +2,10 @@
 
 namespace Drupal\Tests\Core\Menu;
 
+use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Language\Language;
+use Drupal\Core\Menu\ContextualLinkDefault;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -111,7 +113,7 @@ class ContextualLinkManagerTest extends UnitTestCase {
     $language_manager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
     $language_manager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue(new Language(array('id' => 'en'))));
+      ->will($this->returnValue(new Language(['id' => 'en'])));
 
     $request_stack = new RequestStack();
     $property = new \ReflectionProperty('Drupal\Core\Menu\ContextualLinkManager', 'requestStack');
@@ -131,26 +133,26 @@ class ContextualLinkManagerTest extends UnitTestCase {
    * @see \Drupal\Core\Menu\ContextualLinkManager::getContextualLinkPluginsByGroup()
    */
   public function testGetContextualLinkPluginsByGroup() {
-    $definitions = array(
-      'test_plugin1' => array(
+    $definitions = [
+      'test_plugin1' => [
         'id' => 'test_plugin1',
         'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
         'group' => 'group1',
         'route_name' => 'test_route',
-      ),
-      'test_plugin2' => array(
+      ],
+      'test_plugin2' => [
         'id' => 'test_plugin2',
         'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
         'group' => 'group1',
         'route_name' => 'test_route2',
-      ),
-      'test_plugin3' => array(
+      ],
+      'test_plugin3' => [
         'id' => 'test_plugin3',
         'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
         'group' => 'group2',
         'route_name' => 'test_router3',
-      ),
-    );
+      ],
+    ];
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
       ->will($this->returnValue($definitions));
@@ -160,35 +162,35 @@ class ContextualLinkManagerTest extends UnitTestCase {
     $this->assertEmpty($result);
 
     $result = $this->contextualLinkManager->getContextualLinkPluginsByGroup('group1');
-    $this->assertEquals(array('test_plugin1', 'test_plugin2'), array_keys($result));
+    $this->assertEquals(['test_plugin1', 'test_plugin2'], array_keys($result));
 
     $result = $this->contextualLinkManager->getContextualLinkPluginsByGroup('group2');
-    $this->assertEquals(array('test_plugin3'), array_keys($result));
+    $this->assertEquals(['test_plugin3'], array_keys($result));
   }
 
   /**
    * Tests the getContextualLinkPluginsByGroup method with a prefilled cache.
    */
   public function testGetContextualLinkPluginsByGroupWithCache() {
-    $definitions = array(
-      'test_plugin1' => array(
+    $definitions = [
+      'test_plugin1' => [
         'id' => 'test_plugin1',
         'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
         'group' => 'group1',
         'route_name' => 'test_route',
-      ),
-      'test_plugin2' => array(
+      ],
+      'test_plugin2' => [
         'id' => 'test_plugin2',
         'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
         'group' => 'group1',
         'route_name' => 'test_route2',
-      ),
-    );
+      ],
+    ];
 
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with('contextual_links_plugins:en:group1')
-      ->will($this->returnValue((object) array('data' => $definitions)));
+      ->will($this->returnValue((object) ['data' => $definitions]));
 
     $result = $this->contextualLinkManager->getContextualLinkPluginsByGroup('group1');
     $this->assertEquals($definitions, $result);
@@ -203,15 +205,14 @@ class ContextualLinkManagerTest extends UnitTestCase {
    * Tests processDefinition() by passing a plugin definition without a route.
    *
    * @see \Drupal\Core\Menu\ContextualLinkManager::processDefinition()
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginException
    */
   public function testProcessDefinitionWithoutRoute() {
-    $definition = array(
+    $definition = [
       'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
       'group' => 'example',
       'id' => 'test_plugin',
-    );
+    ];
+    $this->setExpectedException(PluginException::class);
     $this->contextualLinkManager->processDefinition($definition, 'test_plugin');
   }
 
@@ -219,15 +220,14 @@ class ContextualLinkManagerTest extends UnitTestCase {
    * Tests processDefinition() by passing a plugin definition without a group.
    *
    * @see \Drupal\Core\Menu\ContextualLinkManager::processDefinition()
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginException
    */
   public function testProcessDefinitionWithoutGroup() {
-    $definition = array(
+    $definition = [
       'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
       'route_name' => 'example',
       'id' => 'test_plugin',
-    );
+    ];
+    $this->setExpectedException(PluginException::class);
     $this->contextualLinkManager->processDefinition($definition, 'test_plugin');
   }
 
@@ -237,35 +237,35 @@ class ContextualLinkManagerTest extends UnitTestCase {
    * @see \Drupal\Core\Menu\ContextualLinkManager::getContextualLinksArrayByGroup()
    */
   public function testGetContextualLinksArrayByGroup() {
-    $definitions = array(
-      'test_plugin1' => array(
+    $definitions = [
+      'test_plugin1' => [
         'id' => 'test_plugin1',
         'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
         'title' => 'Plugin 1',
         'weight' => 0,
         'group' => 'group1',
         'route_name' => 'test_route',
-        'options' => array(),
-      ),
-      'test_plugin2' => array(
+        'options' => [],
+      ],
+      'test_plugin2' => [
         'id' => 'test_plugin2',
         'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
         'title' => 'Plugin 2',
         'weight' => 2,
         'group' => 'group1',
         'route_name' => 'test_route2',
-        'options' => array('key' => 'value'),
-      ),
-      'test_plugin3' => array(
+        'options' => ['key' => 'value'],
+      ],
+      'test_plugin3' => [
         'id' => 'test_plugin3',
         'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
         'title' => 'Plugin 3',
         'weight' => 5,
         'group' => 'group2',
         'route_name' => 'test_router3',
-        'options' => array(),
-      ),
-    );
+        'options' => [],
+      ],
+    ];
 
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
@@ -276,7 +276,7 @@ class ContextualLinkManagerTest extends UnitTestCase {
       ->will($this->returnValue(AccessResult::allowed()));
 
     // Set up mocking of the plugin factory.
-    $map = array();
+    $map = [];
     foreach ($definitions as $plugin_id => $definition) {
       $plugin = $this->getMock('Drupal\Core\Menu\ContextualLinkInterface');
       $plugin->expects($this->any())
@@ -291,7 +291,7 @@ class ContextualLinkManagerTest extends UnitTestCase {
       $plugin->expects($this->any())
         ->method('getOptions')
         ->will($this->returnValue($definition['options']));
-      $map[] = array($plugin_id, array(), $plugin);
+      $map[] = [$plugin_id, [], $plugin];
     }
     $this->factory->expects($this->any())
       ->method('createInstance')
@@ -299,11 +299,11 @@ class ContextualLinkManagerTest extends UnitTestCase {
 
     $this->moduleHandler->expects($this->at(1))
       ->method('alter')
-      ->with($this->equalTo('contextual_links'), new \PHPUnit_Framework_Constraint_Count(2), $this->equalTo('group1'), $this->equalTo(array('key' => 'value')));
+      ->with($this->equalTo('contextual_links'), new \PHPUnit_Framework_Constraint_Count(2), $this->equalTo('group1'), $this->equalTo(['key' => 'value']));
 
-    $result = $this->contextualLinkManager->getContextualLinksArrayByGroup('group1', array('key' => 'value'));
+    $result = $this->contextualLinkManager->getContextualLinksArrayByGroup('group1', ['key' => 'value']);
     $this->assertCount(2, $result);
-    foreach (array('test_plugin1', 'test_plugin2') as $plugin_id) {
+    foreach (['test_plugin1', 'test_plugin2'] as $plugin_id) {
       $definition = $definitions[$plugin_id];
       $this->assertEquals($definition['weight'], $result[$plugin_id]['weight']);
       $this->assertEquals($definition['title'], $result[$plugin_id]['title']);
@@ -317,26 +317,26 @@ class ContextualLinkManagerTest extends UnitTestCase {
    * @see \Drupal\Core\Menu\ContextualLinkManager::getContextualLinksArrayByGroup()
    */
   public function testGetContextualLinksArrayByGroupAccessCheck() {
-    $definitions = array(
-      'test_plugin1' => array(
+    $definitions = [
+      'test_plugin1' => [
         'id' => 'test_plugin1',
         'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
         'title' => 'Plugin 1',
         'weight' => 0,
         'group' => 'group1',
         'route_name' => 'test_route',
-        'options' => array(),
-      ),
-      'test_plugin2' => array(
+        'options' => [],
+      ],
+      'test_plugin2' => [
         'id' => 'test_plugin2',
         'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
         'title' => 'Plugin 2',
         'weight' => 2,
         'group' => 'group1',
         'route_name' => 'test_route2',
-        'options' => array('key' => 'value'),
-      ),
-    );
+        'options' => ['key' => 'value'],
+      ],
+    ];
 
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
@@ -344,13 +344,13 @@ class ContextualLinkManagerTest extends UnitTestCase {
 
     $this->accessManager->expects($this->any())
       ->method('checkNamedRoute')
-      ->will($this->returnValueMap(array(
-        array('test_route', array('key' => 'value'), $this->account, FALSE, TRUE),
-        array('test_route2', array('key' => 'value'), $this->account, FALSE, FALSE),
-      )));
+      ->will($this->returnValueMap([
+        ['test_route', ['key' => 'value'], $this->account, FALSE, TRUE],
+        ['test_route2', ['key' => 'value'], $this->account, FALSE, FALSE],
+      ]));
 
     // Set up mocking of the plugin factory.
-    $map = array();
+    $map = [];
     foreach ($definitions as $plugin_id => $definition) {
       $plugin = $this->getMock('Drupal\Core\Menu\ContextualLinkInterface');
       $plugin->expects($this->any())
@@ -365,13 +365,13 @@ class ContextualLinkManagerTest extends UnitTestCase {
       $plugin->expects($this->any())
         ->method('getOptions')
         ->will($this->returnValue($definition['options']));
-      $map[] = array($plugin_id, array(), $plugin);
+      $map[] = [$plugin_id, [], $plugin];
     }
     $this->factory->expects($this->any())
       ->method('createInstance')
       ->will($this->returnValueMap($map));
 
-    $result = $this->contextualLinkManager->getContextualLinksArrayByGroup('group1', array('key' => 'value'));
+    $result = $this->contextualLinkManager->getContextualLinksArrayByGroup('group1', ['key' => 'value']);
 
     // Ensure that access checking was respected.
     $this->assertTrue(isset($result['test_plugin1']));
@@ -382,15 +382,15 @@ class ContextualLinkManagerTest extends UnitTestCase {
    * Tests the plugins alter hook.
    */
   public function testPluginDefinitionAlter() {
-    $definitions['test_plugin'] = array(
+    $definitions['test_plugin'] = [
       'id' => 'test_plugin',
-      'class' => '\Drupal\Core\Menu\ContextualLinkDefault',
+      'class' => ContextualLinkDefault::class,
       'title' => 'Plugin',
       'weight' => 2,
       'group' => 'group1',
       'route_name' => 'test_route',
-      'options' => array('key' => 'value'),
-    );
+      'options' => ['key' => 'value'],
+    ];
 
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php b/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
index 2000fe606..beb78287f 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
@@ -5,9 +5,12 @@ namespace Drupal\Tests\Core\Menu;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Cache\Context\CacheContextsManager;
 use Drupal\Core\DependencyInjection\Container;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Menu\DefaultMenuLinkTreeManipulators;
 use Drupal\Core\Menu\MenuLinkTreeElement;
 use Drupal\Tests\UnitTestCase;
+use Drupal\node\NodeInterface;
 
 /**
  * Tests the default menu link tree manipulators.
@@ -33,11 +36,11 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase {
   protected $currentUser;
 
   /**
-   * The mocked query factory.
+   * The mocked entity type manager.
    *
-   * @var \Drupal\Core\Entity\Query\QueryFactory|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface|\PHPUnit_Framework_MockObject_MockObject
    */
-  protected $queryFactory;
+  protected $entityTypeManager;
 
   /**
    * The default menu link tree manipulators.
@@ -51,14 +54,14 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase {
    *
    * @var \Drupal\Core\Menu\MenuLinkTreeElement[]
    */
-  protected $originalTree = array();
+  protected $originalTree = [];
 
   /**
    * Array of menu link instances
    *
    * @var \Drupal\Core\Menu\MenuLinkInterface[]
    */
-  protected $links = array();
+  protected $links = [];
 
   /**
    * {@inheritdoc}
@@ -70,11 +73,9 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase {
     $this->currentUser = $this->getMock('Drupal\Core\Session\AccountInterface');
     $this->currentUser->method('isAuthenticated')
       ->willReturn(TRUE);
-    $this->queryFactory = $this->getMockBuilder('Drupal\Core\Entity\Query\QueryFactory')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $this->entityTypeManager = $this->getMock(EntityTypeManagerInterface::class);
 
-    $this->defaultMenuTreeManipulators = new DefaultMenuLinkTreeManipulators($this->accessManager, $this->currentUser, $this->queryFactory);
+    $this->defaultMenuTreeManipulators = new DefaultMenuLinkTreeManipulators($this->accessManager, $this->currentUser, $this->entityTypeManager);
 
     $cache_contexts_manager = $this->prophesize(CacheContextsManager::class);
     $cache_contexts_manager->assertValidTokens()->willReturn(TRUE);
@@ -102,30 +103,30 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase {
    * With link 6 being the only external link.
    */
   protected function mockTree() {
-    $this->links = array(
-      1 => MenuLinkMock::create(array('id' => 'test.example1', 'route_name' => 'example1', 'title' => 'foo', 'parent' => '')),
-      2 => MenuLinkMock::create(array('id' => 'test.example2', 'route_name' => 'example2', 'title' => 'bar', 'parent' => 'test.example1', 'route_parameters' => array('foo' => 'bar'))),
-      3 => MenuLinkMock::create(array('id' => 'test.example3', 'route_name' => 'example3', 'title' => 'baz', 'parent' => 'test.example2', 'route_parameters' => array('baz' => 'qux'))),
-      4 => MenuLinkMock::create(array('id' => 'test.example4', 'route_name' => 'example4', 'title' => 'qux', 'parent' => 'test.example3')),
-      5 => MenuLinkMock::create(array('id' => 'test.example5', 'route_name' => 'example5', 'title' => 'foofoo', 'parent' => '')),
-      6 => MenuLinkMock::create(array('id' => 'test.example6', 'route_name' => '', 'url' => 'https://www.drupal.org/', 'title' => 'barbar', 'parent' => '')),
-      7 => MenuLinkMock::create(array('id' => 'test.example7', 'route_name' => 'example7', 'title' => 'bazbaz', 'parent' => '')),
-      8 => MenuLinkMock::create(array('id' => 'test.example8', 'route_name' => 'example8', 'title' => 'quxqux', 'parent' => '')),
-      9 => DynamicMenuLinkMock::create(array('id' => 'test.example9', 'parent' => ''))->setCurrentUser($this->currentUser),
-    );
-    $this->originalTree = array();
-    $this->originalTree[1] = new MenuLinkTreeElement($this->links[1], FALSE, 1, FALSE, array());
-    $this->originalTree[2] = new MenuLinkTreeElement($this->links[2], TRUE, 1, FALSE, array(
-      3 => new MenuLinkTreeElement($this->links[3], TRUE, 2, FALSE, array(
-        4 => new MenuLinkTreeElement($this->links[4], FALSE, 3, FALSE, array()),
-      )),
-    ));
-    $this->originalTree[5] = new MenuLinkTreeElement($this->links[5], TRUE, 1, FALSE, array(
-      7 => new MenuLinkTreeElement($this->links[7], FALSE, 2, FALSE, array()),
-    ));
-    $this->originalTree[6] = new MenuLinkTreeElement($this->links[6], FALSE, 1, FALSE, array());
-    $this->originalTree[8] = new MenuLinkTreeElement($this->links[8], FALSE, 1, FALSE, array());
-    $this->originalTree[9] = new MenuLinkTreeElement($this->links[9], FALSE, 1, FALSE, array());
+    $this->links = [
+      1 => MenuLinkMock::create(['id' => 'test.example1', 'route_name' => 'example1', 'title' => 'foo', 'parent' => '']),
+      2 => MenuLinkMock::create(['id' => 'test.example2', 'route_name' => 'example2', 'title' => 'bar', 'parent' => 'test.example1', 'route_parameters' => ['foo' => 'bar']]),
+      3 => MenuLinkMock::create(['id' => 'test.example3', 'route_name' => 'example3', 'title' => 'baz', 'parent' => 'test.example2', 'route_parameters' => ['baz' => 'qux']]),
+      4 => MenuLinkMock::create(['id' => 'test.example4', 'route_name' => 'example4', 'title' => 'qux', 'parent' => 'test.example3']),
+      5 => MenuLinkMock::create(['id' => 'test.example5', 'route_name' => 'example5', 'title' => 'foofoo', 'parent' => '']),
+      6 => MenuLinkMock::create(['id' => 'test.example6', 'route_name' => '', 'url' => 'https://www.drupal.org/', 'title' => 'barbar', 'parent' => '']),
+      7 => MenuLinkMock::create(['id' => 'test.example7', 'route_name' => 'example7', 'title' => 'bazbaz', 'parent' => '']),
+      8 => MenuLinkMock::create(['id' => 'test.example8', 'route_name' => 'example8', 'title' => 'quxqux', 'parent' => '']),
+      9 => DynamicMenuLinkMock::create(['id' => 'test.example9', 'parent' => ''])->setCurrentUser($this->currentUser),
+    ];
+    $this->originalTree = [];
+    $this->originalTree[1] = new MenuLinkTreeElement($this->links[1], FALSE, 1, FALSE, []);
+    $this->originalTree[2] = new MenuLinkTreeElement($this->links[2], TRUE, 1, FALSE, [
+      3 => new MenuLinkTreeElement($this->links[3], TRUE, 2, FALSE, [
+        4 => new MenuLinkTreeElement($this->links[4], FALSE, 3, FALSE, []),
+      ]),
+    ]);
+    $this->originalTree[5] = new MenuLinkTreeElement($this->links[5], TRUE, 1, FALSE, [
+      7 => new MenuLinkTreeElement($this->links[7], FALSE, 2, FALSE, []),
+    ]);
+    $this->originalTree[6] = new MenuLinkTreeElement($this->links[6], FALSE, 1, FALSE, []);
+    $this->originalTree[8] = new MenuLinkTreeElement($this->links[8], FALSE, 1, FALSE, []);
+    $this->originalTree[9] = new MenuLinkTreeElement($this->links[9], FALSE, 1, FALSE, []);
   }
 
   /**
@@ -164,13 +165,13 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase {
     // calls will be made.
     $this->accessManager->expects($this->exactly(5))
       ->method('checkNamedRoute')
-      ->will($this->returnValueMap(array(
-        array('example1', array(), $this->currentUser, TRUE, AccessResult::forbidden()),
-        array('example2', array('foo' => 'bar'), $this->currentUser, TRUE, AccessResult::allowed()->cachePerPermissions()),
-        array('example3', array('baz' => 'qux'), $this->currentUser, TRUE, AccessResult::neutral()),
-        array('example5', array(), $this->currentUser, TRUE, AccessResult::allowed()),
-        array('user.logout', array(), $this->currentUser, TRUE, AccessResult::allowed()),
-      )));
+      ->will($this->returnValueMap([
+        ['example1', [], $this->currentUser, TRUE, AccessResult::forbidden()],
+        ['example2', ['foo' => 'bar'], $this->currentUser, TRUE, AccessResult::allowed()->cachePerPermissions()],
+        ['example3', ['baz' => 'qux'], $this->currentUser, TRUE, AccessResult::neutral()],
+        ['example5', [], $this->currentUser, TRUE, AccessResult::allowed()],
+        ['user.logout', [], $this->currentUser, TRUE, AccessResult::allowed()],
+      ]));
 
     $this->mockTree();
     $this->originalTree[5]->subtree[7]->access = AccessResult::neutral();
@@ -258,8 +259,8 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase {
   public function testFlatten() {
     $this->mockTree();
     $tree = $this->defaultMenuTreeManipulators->flatten($this->originalTree);
-    $this->assertEquals(array(1, 2, 5, 6, 8, 9), array_keys($this->originalTree));
-    $this->assertEquals(array(1, 2, 5, 6, 8, 9, 3, 4, 7), array_keys($tree));
+    $this->assertEquals([1, 2, 5, 6, 8, 9], array_keys($this->originalTree));
+    $this->assertEquals([1, 2, 5, 6, 8, 9, 3, 4, 7], array_keys($tree));
   }
 
   /**
@@ -270,39 +271,43 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase {
    * @covers ::checkAccess
    */
   public function testCheckNodeAccess() {
-    $links = array(
-      1 => MenuLinkMock::create(array('id' => 'node.1', 'route_name' => 'entity.node.canonical', 'title' => 'foo', 'parent' => '', 'route_parameters' => array('node' => 1))),
-      2 => MenuLinkMock::create(array('id' => 'node.2', 'route_name' => 'entity.node.canonical', 'title' => 'bar', 'parent' => '', 'route_parameters' => array('node' => 2))),
-      3 => MenuLinkMock::create(array('id' => 'node.3', 'route_name' => 'entity.node.canonical', 'title' => 'baz', 'parent' => 'node.2', 'route_parameters' => array('node' => 3))),
-      4 => MenuLinkMock::create(array('id' => 'node.4', 'route_name' => 'entity.node.canonical', 'title' => 'qux', 'parent' => 'node.3', 'route_parameters' => array('node' => 4))),
-      5 => MenuLinkMock::create(array('id' => 'test.1', 'route_name' => 'test_route', 'title' => 'qux', 'parent' => '')),
-      6 => MenuLinkMock::create(array('id' => 'test.2', 'route_name' => 'test_route', 'title' => 'qux', 'parent' => 'test.1')),
-    );
-    $tree = array();
-    $tree[1] = new MenuLinkTreeElement($links[1], FALSE, 1, FALSE, array());
-    $tree[2] = new MenuLinkTreeElement($links[2], TRUE, 1, FALSE, array(
-      3 => new MenuLinkTreeElement($links[3], TRUE, 2, FALSE, array(
-        4 => new MenuLinkTreeElement($links[4], FALSE, 3, FALSE, array()),
-      )),
-    ));
-    $tree[5] = new MenuLinkTreeElement($links[5], TRUE, 1, FALSE, array(
-      6 => new MenuLinkTreeElement($links[6], FALSE, 2, FALSE, array()),
-    ));
+    $links = [
+      1 => MenuLinkMock::create(['id' => 'node.1', 'route_name' => 'entity.node.canonical', 'title' => 'foo', 'parent' => '', 'route_parameters' => ['node' => 1]]),
+      2 => MenuLinkMock::create(['id' => 'node.2', 'route_name' => 'entity.node.canonical', 'title' => 'bar', 'parent' => '', 'route_parameters' => ['node' => 2]]),
+      3 => MenuLinkMock::create(['id' => 'node.3', 'route_name' => 'entity.node.canonical', 'title' => 'baz', 'parent' => 'node.2', 'route_parameters' => ['node' => 3]]),
+      4 => MenuLinkMock::create(['id' => 'node.4', 'route_name' => 'entity.node.canonical', 'title' => 'qux', 'parent' => 'node.3', 'route_parameters' => ['node' => 4]]),
+      5 => MenuLinkMock::create(['id' => 'test.1', 'route_name' => 'test_route', 'title' => 'qux', 'parent' => '']),
+      6 => MenuLinkMock::create(['id' => 'test.2', 'route_name' => 'test_route', 'title' => 'qux', 'parent' => 'test.1']),
+    ];
+    $tree = [];
+    $tree[1] = new MenuLinkTreeElement($links[1], FALSE, 1, FALSE, []);
+    $tree[2] = new MenuLinkTreeElement($links[2], TRUE, 1, FALSE, [
+      3 => new MenuLinkTreeElement($links[3], TRUE, 2, FALSE, [
+        4 => new MenuLinkTreeElement($links[4], FALSE, 3, FALSE, []),
+      ]),
+    ]);
+    $tree[5] = new MenuLinkTreeElement($links[5], TRUE, 1, FALSE, [
+      6 => new MenuLinkTreeElement($links[6], FALSE, 2, FALSE, []),
+    ]);
 
     $query = $this->getMock('Drupal\Core\Entity\Query\QueryInterface');
     $query->expects($this->at(0))
       ->method('condition')
-      ->with('nid', array(1, 2, 3, 4));
+      ->with('nid', [1, 2, 3, 4]);
     $query->expects($this->at(1))
       ->method('condition')
-      ->with('status', NODE_PUBLISHED);
+      ->with('status', NodeInterface::PUBLISHED);
     $query->expects($this->once())
       ->method('execute')
-      ->willReturn(array(1, 2, 4));
-    $this->queryFactory->expects($this->once())
-      ->method('get')
-      ->with('node')
+      ->willReturn([1, 2, 4]);
+    $storage = $this->getMock(EntityStorageInterface::class);
+    $storage->expects($this->once())
+      ->method('getQuery')
       ->willReturn($query);
+    $this->entityTypeManager->expects($this->once())
+      ->method('getStorage')
+      ->with('node')
+      ->willReturn($storage);
 
     $node_access_result = AccessResult::allowed()->cachePerPermissions()->addCacheContexts(['user.node_grants:view']);
 
@@ -338,7 +343,3 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase {
   }
 
 }
-
-if (!defined('NODE_PUBLISHED')) {
-  define('NODE_PUBLISHED', 1);
-}
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php b/web/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php
index 2f0c1a8d7..b026fb062 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php
@@ -25,7 +25,7 @@ class LocalActionDefaultTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $config = array();
+  protected $config = [];
 
   /**
    * The used plugin ID.
@@ -39,9 +39,9 @@ class LocalActionDefaultTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $pluginDefinition = array(
+  protected $pluginDefinition = [
     'id' => 'local_action_default',
-  );
+  ];
 
   /**
    * The mocked translator.
@@ -93,7 +93,7 @@ class LocalActionDefaultTest extends UnitTestCase {
    * @see \Drupal\Core\Menu\LocalTaskDefault::getTitle()
    */
   public function testGetTitleWithContext() {
-    $this->pluginDefinition['title'] = (new TranslatableMarkup('Example', array(), array('context' => 'context'), $this->stringTranslation));
+    $this->pluginDefinition['title'] = (new TranslatableMarkup('Example', [], ['context' => 'context'], $this->stringTranslation));
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
@@ -107,7 +107,7 @@ class LocalActionDefaultTest extends UnitTestCase {
    * Tests the getTitle method with title arguments.
    */
   public function testGetTitleWithTitleArguments() {
-    $this->pluginDefinition['title'] = (new TranslatableMarkup('Example @test', array('@test' => 'value'), [], $this->stringTranslation));
+    $this->pluginDefinition['title'] = (new TranslatableMarkup('Example @test', ['@test' => 'value'], [], $this->stringTranslation));
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php b/web/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
index 92ce48e33..0f1f848c9 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
@@ -134,8 +134,8 @@ class LocalActionManagerTest extends UnitTestCase {
 
     $this->controllerResolver->expects($this->once())
       ->method('getArguments')
-      ->with($this->request, array($local_action, 'getTitle'))
-      ->will($this->returnValue(array('test')));
+      ->with($this->request, [$local_action, 'getTitle'])
+      ->will($this->returnValue(['test']));
 
     $this->localActionManager->getTitle($local_action);
   }
@@ -149,7 +149,7 @@ class LocalActionManagerTest extends UnitTestCase {
     $this->discovery->expects($this->any())
       ->method('getDefinitions')
       ->will($this->returnValue($plugin_definitions));
-    $map = array();
+    $map = [];
     foreach ($plugin_definitions as $plugin_id => $plugin_definition) {
       $plugin = $this->getMock('Drupal\Core\Menu\LocalActionInterface');
       $plugin->expects($this->any())
@@ -157,23 +157,23 @@ class LocalActionManagerTest extends UnitTestCase {
         ->will($this->returnValue($plugin_definition['route_name']));
       $plugin->expects($this->any())
         ->method('getRouteParameters')
-        ->will($this->returnValue(isset($plugin_definition['route_parameters']) ? $plugin_definition['route_parameters'] : array()));
+        ->will($this->returnValue(isset($plugin_definition['route_parameters']) ? $plugin_definition['route_parameters'] : []));
       $plugin->expects($this->any())
         ->method('getTitle')
         ->will($this->returnValue($plugin_definition['title']));
       $this->controllerResolver->expects($this->any())
         ->method('getArguments')
-        ->with($this->request, array($plugin, 'getTitle'))
-        ->will($this->returnValue(array()));
+        ->with($this->request, [$plugin, 'getTitle'])
+        ->will($this->returnValue([]));
 
       $plugin->expects($this->any())
         ->method('getWeight')
         ->will($this->returnValue($plugin_definition['weight']));
       $this->controllerResolver->expects($this->any())
         ->method('getArguments')
-        ->with($this->request, array($plugin, 'getTitle'))
-        ->will($this->returnValue(array()));
-      $map[] = array($plugin_id, array(), $plugin);
+        ->with($this->request, [$plugin, 'getTitle'])
+        ->will($this->returnValue([]));
+      $map[] = [$plugin_id, [], $plugin];
     }
     $this->factory->expects($this->any())
       ->method('createInstance')
@@ -184,199 +184,199 @@ class LocalActionManagerTest extends UnitTestCase {
 
   public function getActionsForRouteProvider() {
     // Single available and single expected plugins.
-    $data[] = array(
+    $data[] = [
       'test_route',
-      array(
-        'plugin_id_1' => array(
-          'appears_on' => array(
+      [
+        'plugin_id_1' => [
+          'appears_on' => [
             'test_route',
-          ),
+          ],
           'route_name' => 'test_route_2',
           'title' => 'Plugin ID 1',
           'weight' => 0,
-        ),
-      ),
-      array(
-        '#cache' => array(
-          'contexts' => array('route'),
-        ),
-        'plugin_id_1' => array(
+        ],
+      ],
+      [
+        '#cache' => [
+          'contexts' => ['route'],
+        ],
+        'plugin_id_1' => [
           '#theme' => 'menu_local_action',
-          '#link' => array(
+          '#link' => [
             'title' => 'Plugin ID 1',
             'url' => Url::fromRoute('test_route_2'),
             'localized_options' => '',
-          ),
+          ],
           '#access' => AccessResult::forbidden(),
           '#weight' => 0,
-          '#cache' => array(
-            'contexts' => array(),
-            'tags' => array(),
+          '#cache' => [
+            'contexts' => [],
+            'tags' => [],
             'max-age' => 0,
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
     // Multiple available and single expected plugins.
-    $data[] = array(
+    $data[] = [
       'test_route',
-      array(
-        'plugin_id_1' => array(
-          'appears_on' => array(
+      [
+        'plugin_id_1' => [
+          'appears_on' => [
             'test_route',
-          ),
+          ],
           'route_name' => 'test_route_2',
           'title' => 'Plugin ID 1',
           'weight' => 0,
-        ),
-        'plugin_id_2' => array(
-          'appears_on' => array(
+        ],
+        'plugin_id_2' => [
+          'appears_on' => [
             'test_route2',
-          ),
+          ],
           'route_name' => 'test_route_3',
           'title' => 'Plugin ID 2',
           'weight' => 0,
-        ),
-      ),
-      array(
-        '#cache' => array(
-          'contexts' => array('route'),
-        ),
-        'plugin_id_1' => array(
+        ],
+      ],
+      [
+        '#cache' => [
+          'contexts' => ['route'],
+        ],
+        'plugin_id_1' => [
           '#theme' => 'menu_local_action',
-          '#link' => array(
+          '#link' => [
             'title' => 'Plugin ID 1',
             'url' => Url::fromRoute('test_route_2'),
             'localized_options' => '',
-          ),
+          ],
           '#access' => AccessResult::forbidden(),
           '#weight' => 0,
-          '#cache' => array(
-            'contexts' => array(),
-            'tags' => array(),
+          '#cache' => [
+            'contexts' => [],
+            'tags' => [],
             'max-age' => 0,
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
 
     // Multiple available and multiple expected plugins and specified weight.
-    $data[] = array(
+    $data[] = [
       'test_route',
-      array(
-        'plugin_id_1' => array(
-          'appears_on' => array(
+      [
+        'plugin_id_1' => [
+          'appears_on' => [
             'test_route',
-          ),
+          ],
           'route_name' => 'test_route_2',
           'title' => 'Plugin ID 1',
           'weight' => 1,
-        ),
-        'plugin_id_2' => array(
-          'appears_on' => array(
+        ],
+        'plugin_id_2' => [
+          'appears_on' => [
             'test_route',
-          ),
+          ],
           'route_name' => 'test_route_3',
           'title' => 'Plugin ID 2',
           'weight' => 0,
-        ),
-      ),
-      array(
-        '#cache' => array(
-          'contexts' => array('route'),
-        ),
-        'plugin_id_1' => array(
+        ],
+      ],
+      [
+        '#cache' => [
+          'contexts' => ['route'],
+        ],
+        'plugin_id_1' => [
           '#theme' => 'menu_local_action',
-          '#link' => array(
+          '#link' => [
             'title' => 'Plugin ID 1',
             'url' => Url::fromRoute('test_route_2'),
             'localized_options' => '',
-          ),
+          ],
           '#access' => AccessResult::forbidden(),
           '#weight' => 1,
-          '#cache' => array(
-            'contexts' => array(),
-            'tags' => array(),
+          '#cache' => [
+            'contexts' => [],
+            'tags' => [],
             'max-age' => 0,
-          ),
-        ),
-        'plugin_id_2' => array(
+          ],
+        ],
+        'plugin_id_2' => [
           '#theme' => 'menu_local_action',
-          '#link' => array(
+          '#link' => [
             'title' => 'Plugin ID 2',
             'url' => Url::fromRoute('test_route_3'),
             'localized_options' => '',
-          ),
+          ],
           '#access' => AccessResult::forbidden(),
           '#weight' => 0,
-          '#cache' => array(
-            'contexts' => array(),
-            'tags' => array(),
+          '#cache' => [
+            'contexts' => [],
+            'tags' => [],
             'max-age' => 0,
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
 
     // Two plugins with the same route name but different route parameters.
-    $data[] = array(
+    $data[] = [
       'test_route',
-      array(
-        'plugin_id_1' => array(
-          'appears_on' => array(
+      [
+        'plugin_id_1' => [
+          'appears_on' => [
             'test_route',
-          ),
+          ],
           'route_name' => 'test_route_2',
-          'route_parameters' => array('test1'),
+          'route_parameters' => ['test1'],
           'title' => 'Plugin ID 1',
           'weight' => 1,
-        ),
-        'plugin_id_2' => array(
-          'appears_on' => array(
+        ],
+        'plugin_id_2' => [
+          'appears_on' => [
             'test_route',
-          ),
+          ],
           'route_name' => 'test_route_2',
-          'route_parameters' => array('test2'),
+          'route_parameters' => ['test2'],
           'title' => 'Plugin ID 2',
           'weight' => 0,
-        ),
-      ),
-      array(
-        '#cache' => array(
-          'contexts' => array('route'),
-        ),
-        'plugin_id_1' => array(
+        ],
+      ],
+      [
+        '#cache' => [
+          'contexts' => ['route'],
+        ],
+        'plugin_id_1' => [
           '#theme' => 'menu_local_action',
-          '#link' => array(
+          '#link' => [
             'title' => 'Plugin ID 1',
             'url' => Url::fromRoute('test_route_2', ['test1']),
             'localized_options' => '',
-          ),
+          ],
           '#access' => AccessResult::forbidden(),
           '#weight' => 1,
-          '#cache' => array(
-            'contexts' => array(),
-            'tags' => array(),
+          '#cache' => [
+            'contexts' => [],
+            'tags' => [],
             'max-age' => 0,
-          ),
-        ),
-        'plugin_id_2' => array(
+          ],
+        ],
+        'plugin_id_2' => [
           '#theme' => 'menu_local_action',
-          '#link' => array(
+          '#link' => [
             'title' => 'Plugin ID 2',
             'url' => Url::fromRoute('test_route_2', ['test2']),
             'localized_options' => '',
-          ),
+          ],
           '#access' => AccessResult::forbidden(),
           '#weight' => 0,
-          '#cache' => array(
-            'contexts' => array(),
-            'tags' => array(),
+          '#cache' => [
+            'contexts' => [],
+            'tags' => [],
             'max-age' => 0,
-          ),
-        ),
-      ),
-    );
+          ],
+        ],
+      ],
+    ];
 
     return $data;
   }
@@ -397,7 +397,7 @@ class TestLocalActionManager extends LocalActionManager {
     $this->routeMatch = $route_match;
     $this->moduleHandler = $module_handler;
     $this->alterInfo('menu_local_actions');
-    $this->setCacheBackend($cache_backend, 'local_action_plugins', array('local_action'));
+    $this->setCacheBackend($cache_backend, 'local_action_plugins', ['local_action']);
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
index 1e7ec1ed8..84b91afe9 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
@@ -32,7 +32,7 @@ class LocalTaskDefaultTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $config = array();
+  protected $config = [];
 
   /**
    * The used plugin ID.
@@ -46,9 +46,9 @@ class LocalTaskDefaultTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $pluginDefinition = array(
+  protected $pluginDefinition = [
     'id' => 'local_task_default',
-  );
+  ];
 
   /**
    * The mocked translator.
@@ -84,9 +84,9 @@ class LocalTaskDefaultTest extends UnitTestCase {
    * @covers ::getRouteParameters
    */
   public function testGetRouteParametersForStaticRoute() {
-    $this->pluginDefinition = array(
+    $this->pluginDefinition = [
       'route_name' => 'test_route'
-    );
+    ];
 
     $this->routeProvider->expects($this->once())
       ->method('getRouteByName')
@@ -96,17 +96,17 @@ class LocalTaskDefaultTest extends UnitTestCase {
     $this->setupLocalTaskDefault();
 
     $route_match = new RouteMatch('', new Route('/'));
-    $this->assertEquals(array(), $this->localTaskBase->getRouteParameters($route_match));
+    $this->assertEquals([], $this->localTaskBase->getRouteParameters($route_match));
   }
 
   /**
    * @covers ::getRouteParameters
    */
   public function testGetRouteParametersInPluginDefinitions() {
-    $this->pluginDefinition = array(
+    $this->pluginDefinition = [
       'route_name' => 'test_route',
-      'route_parameters' => array('parameter' => 'example')
-    );
+      'route_parameters' => ['parameter' => 'example']
+    ];
 
     $this->routeProvider->expects($this->once())
       ->method('getRouteByName')
@@ -116,16 +116,16 @@ class LocalTaskDefaultTest extends UnitTestCase {
     $this->setupLocalTaskDefault();
 
     $route_match = new RouteMatch('', new Route('/'));
-    $this->assertEquals(array('parameter' => 'example'), $this->localTaskBase->getRouteParameters($route_match));
+    $this->assertEquals(['parameter' => 'example'], $this->localTaskBase->getRouteParameters($route_match));
   }
 
   /**
    * @covers ::getRouteParameters
    */
   public function testGetRouteParametersForDynamicRouteWithNonUpcastedParameters() {
-    $this->pluginDefinition = array(
+    $this->pluginDefinition = [
       'route_name' => 'test_route'
-    );
+    ];
 
     $route = new Route('/test-route/{parameter}');
     $this->routeProvider->expects($this->once())
@@ -135,9 +135,9 @@ class LocalTaskDefaultTest extends UnitTestCase {
 
     $this->setupLocalTaskDefault();
 
-    $route_match = new RouteMatch('', $route, array(), array('parameter' => 'example'));
+    $route_match = new RouteMatch('', $route, [], ['parameter' => 'example']);
 
-    $this->assertEquals(array('parameter' => 'example'), $this->localTaskBase->getRouteParameters($route_match));
+    $this->assertEquals(['parameter' => 'example'], $this->localTaskBase->getRouteParameters($route_match));
   }
 
   /**
@@ -146,9 +146,9 @@ class LocalTaskDefaultTest extends UnitTestCase {
    * @covers ::getRouteParameters
    */
   public function testGetRouteParametersForDynamicRouteWithUpcastedParameters() {
-    $this->pluginDefinition = array(
+    $this->pluginDefinition = [
       'route_name' => 'test_route'
-    );
+    ];
 
     $route = new Route('/test-route/{parameter}');
     $this->routeProvider->expects($this->once())
@@ -158,8 +158,8 @@ class LocalTaskDefaultTest extends UnitTestCase {
 
     $this->setupLocalTaskDefault();
 
-    $route_match = new RouteMatch('', $route, array('parameter' => (object) 'example2'), array('parameter' => 'example'));
-    $this->assertEquals(array('parameter' => 'example'), $this->localTaskBase->getRouteParameters($route_match));
+    $route_match = new RouteMatch('', $route, ['parameter' => (object) 'example2'], ['parameter' => 'example']);
+    $this->assertEquals(['parameter' => 'example'], $this->localTaskBase->getRouteParameters($route_match));
   }
 
   /**
@@ -169,40 +169,40 @@ class LocalTaskDefaultTest extends UnitTestCase {
    *   A list or test plugin definition and expected weight.
    */
   public function providerTestGetWeight() {
-    return array(
+    return [
       // Manually specify a weight, so this is used.
-      array(array('weight' => 314), 'test_id', 314),
+      [['weight' => 314], 'test_id', 314],
       // Ensure that a default tab gets a lower weight.
-      array(
-        array(
+      [
+        [
           'base_route' => 'local_task_default',
           'route_name' => 'local_task_default',
           'id' => 'local_task_default'
-        ),
+        ],
         'local_task_default',
         -10
-      ),
+      ],
       // If the base route is different from the route of the tab, ignore it.
-      array(
-        array(
+      [
+        [
           'base_route' => 'local_task_example',
           'route_name' => 'local_task_other',
           'id' => 'local_task_default'
-        ),
+        ],
         'local_task_default',
         0,
-      ),
+      ],
       // Ensure that a default tab of a derivative gets the default value.
-      array(
-        array(
+      [
+        [
           'base_route' => 'local_task_example',
           'id' => 'local_task_derivative_default:example_id',
           'route_name' => 'local_task_example',
-        ),
+        ],
         'local_task_derivative_default:example_id',
         -10,
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -248,7 +248,7 @@ class LocalTaskDefaultTest extends UnitTestCase {
    */
   public function testGetTitleWithContext() {
     $title = 'Example';
-    $this->pluginDefinition['title'] = (new TranslatableMarkup($title, array(), array('context' => 'context'), $this->stringTranslation));
+    $this->pluginDefinition['title'] = (new TranslatableMarkup($title, [], ['context' => 'context'], $this->stringTranslation));
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
@@ -262,7 +262,7 @@ class LocalTaskDefaultTest extends UnitTestCase {
    * @covers ::getTitle
    */
   public function testGetTitleWithTitleArguments() {
-    $this->pluginDefinition['title'] = (new TranslatableMarkup('Example @test', array('@test' => 'value'), [], $this->stringTranslation));
+    $this->pluginDefinition['title'] = (new TranslatableMarkup('Example @test', ['@test' => 'value'], [], $this->stringTranslation));
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
@@ -276,9 +276,9 @@ class LocalTaskDefaultTest extends UnitTestCase {
    * @covers ::getOptions
    */
   public function testGetOptions() {
-    $this->pluginDefinition['options'] = array(
-      'attributes' => array('class' => array('example')),
-    );
+    $this->pluginDefinition['options'] = [
+      'attributes' => ['class' => ['example']],
+    ];
 
     $this->setupLocalTaskDefault();
 
@@ -287,14 +287,14 @@ class LocalTaskDefaultTest extends UnitTestCase {
 
     $this->localTaskBase->setActive(TRUE);
 
-    $this->assertEquals(array(
-      'attributes' => array(
-        'class' => array(
+    $this->assertEquals([
+      'attributes' => [
+        'class' => [
           'example',
           'is-active'
-        )
-      )
-    ), $this->localTaskBase->getOptions($route_match));
+        ]
+      ]
+    ], $this->localTaskBase->getOptions($route_match));
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
index 5537046cb..8ac0bbf53 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
@@ -44,7 +44,7 @@ abstract class LocalTaskIntegrationTestBase extends UnitTestCase {
     parent::setUp();
 
     $container = new ContainerBuilder();
-    $config_factory = $this->getConfigFactoryStub(array());
+    $config_factory = $this->getConfigFactoryStub([]);
     $container->set('config.factory', $config_factory);
     $container->set('app.root', $this->root);
     \Drupal::setContainer($container);
@@ -115,7 +115,7 @@ abstract class LocalTaskIntegrationTestBase extends UnitTestCase {
     $property->setValue($manager, $factory);
 
     $cache_backend = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
-    $manager->setCacheBackend($cache_backend, 'local_task.en', array('local_task'));
+    $manager->setCacheBackend($cache_backend, 'local_task.en', ['local_task']);
 
     return $manager;
   }
@@ -130,9 +130,9 @@ abstract class LocalTaskIntegrationTestBase extends UnitTestCase {
    * @param array $route_params
    *   (optional) a list of route parameters used to resolve tasks.
    */
-  protected function assertLocalTasks($route_name, $expected_tasks, $route_params = array()) {
+  protected function assertLocalTasks($route_name, $expected_tasks, $route_params = []) {
 
-    $directory_list = array();
+    $directory_list = [];
     foreach ($this->directoryList as $key => $value) {
       $directory_list[$key] = $this->root . '/' . $value;
     }
@@ -148,7 +148,7 @@ abstract class LocalTaskIntegrationTestBase extends UnitTestCase {
     // using the DefaultPluginManager base means we get into dependency soup
     // because its factories create method and pulling services off the \Drupal
     // container.
-    $tasks = array();
+    $tasks = [];
     foreach ($tmp_tasks as $level => $level_tasks) {
       $tasks[$level] = array_keys($level_tasks);
     }
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
index 5fc65ad97..f3b156e13 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
@@ -194,7 +194,7 @@ class LocalTaskManagerTest extends UnitTestCase {
 
     $this->cacheBackend->expects($this->at(3))
       ->method('set')
-      ->with('local_task_plugins:en:menu_local_task_test_tasks_view', $expected_set, Cache::PERMANENT, array('local_task'));
+      ->with('local_task_plugins:en:menu_local_task_test_tasks_view', $expected_set, Cache::PERMANENT, ['local_task']);
 
     $local_tasks = $this->manager->getLocalTasksForRoute('menu_local_task_test_tasks_view');
     $this->assertEquals($result, $local_tasks);
@@ -217,7 +217,7 @@ class LocalTaskManagerTest extends UnitTestCase {
     $this->cacheBackend->expects($this->at(0))
       ->method('get')
       ->with('local_task_plugins:en:menu_local_task_test_tasks_view')
-      ->will($this->returnValue((object) array('data' => $result)));
+      ->will($this->returnValue((object) ['data' => $result]));
 
     $this->cacheBackend->expects($this->never())
       ->method('set');
@@ -239,8 +239,8 @@ class LocalTaskManagerTest extends UnitTestCase {
 
     $this->controllerResolver->expects($this->once())
       ->method('getArguments')
-      ->with($this->request, array($menu_local_task, 'getTitle'))
-      ->will($this->returnValue(array()));
+      ->with($this->request, [$menu_local_task, 'getTitle'])
+      ->will($this->returnValue([]));
 
     $this->manager->getTitle($menu_local_task);
   }
@@ -254,11 +254,11 @@ class LocalTaskManagerTest extends UnitTestCase {
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $module_handler->expects($this->any())
       ->method('getModuleDirectories')
-      ->willReturn(array());
+      ->willReturn([]);
     $language_manager = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
     $language_manager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue(new Language(array('id' => 'en'))));
+      ->will($this->returnValue(new Language(['id' => 'en'])));
 
     $this->manager = new LocalTaskManager($this->controllerResolver, $request_stack, $this->routeMatch, $this->routeProvider, $module_handler, $this->cacheBackend, $language_manager, $this->accessManager, $this->account);
 
@@ -279,51 +279,51 @@ class LocalTaskManagerTest extends UnitTestCase {
    *   An array of plugin definition keyed by plugin ID.
    */
   protected function getLocalTaskFixtures() {
-    $definitions = array();
-    $definitions['menu_local_task_test_tasks_settings'] = array(
+    $definitions = [];
+    $definitions['menu_local_task_test_tasks_settings'] = [
       'route_name' => 'menu_local_task_test_tasks_settings',
       'title' => 'Settings',
       'base_route' => 'menu_local_task_test_tasks_view',
-    );
-    $definitions['menu_local_task_test_tasks_edit'] = array(
+    ];
+    $definitions['menu_local_task_test_tasks_edit'] = [
       'route_name' => 'menu_local_task_test_tasks_edit',
       'title' => 'Settings',
       'base_route' => 'menu_local_task_test_tasks_view',
       'weight' => 20,
-    );
+    ];
     // Make this ID different from the route name to catch code that
     // confuses them.
-    $definitions['menu_local_task_test_tasks_view.tab'] = array(
+    $definitions['menu_local_task_test_tasks_view.tab'] = [
       'route_name' => 'menu_local_task_test_tasks_view',
       'title' => 'Settings',
       'base_route' => 'menu_local_task_test_tasks_view',
-    );
+    ];
 
-    $definitions['menu_local_task_test_tasks_view_child1'] = array(
+    $definitions['menu_local_task_test_tasks_view_child1'] = [
       'route_name' => 'menu_local_task_test_tasks_child1_page',
       'title' => 'Settings child #1',
       'parent_id' => 'menu_local_task_test_tasks_view.tab',
-    );
-    $definitions['menu_local_task_test_tasks_view_child2'] = array(
+    ];
+    $definitions['menu_local_task_test_tasks_view_child2'] = [
       'route_name' => 'menu_local_task_test_tasks_child2_page',
       'title' => 'Settings child #2',
       'parent_id' => 'menu_local_task_test_tasks_view.tab',
       'base_route' => 'this_should_be_replaced',
-    );
+    ];
     // Add the ID and defaults from the LocalTaskManager.
     foreach ($definitions as $id => &$info) {
       $info['id'] = $id;
-      $info += array(
+      $info += [
         'id' => '',
         'route_name' => '',
-        'route_parameters' => array(),
+        'route_parameters' => [],
         'title' => '',
         'base_route' => '',
         'parent_id' => NULL,
         'weight' => 0,
-        'options' => array(),
+        'options' => [],
         'class' => 'Drupal\Core\Menu\LocalTaskDefault',
-      );
+      ];
     }
     return $definitions;
   }
@@ -335,9 +335,9 @@ class LocalTaskManagerTest extends UnitTestCase {
    *   The mock plugin.
    */
   protected function setupFactory($mock_plugin) {
-    $map = array();
+    $map = [];
     foreach ($this->getLocalTaskFixtures() as $info) {
-      $map[] = array($info['id'], array(), $mock_plugin);
+      $map[] = [$info['id'], [], $mock_plugin];
     }
     $this->factory->expects($this->any())
       ->method('createInstance')
@@ -354,17 +354,17 @@ class LocalTaskManagerTest extends UnitTestCase {
    *   The expected result, keyed by local task level.
    */
   protected function getLocalTasksForRouteResult($mock_plugin) {
-    $result = array(
-      0 => array(
+    $result = [
+      0 => [
         'menu_local_task_test_tasks_settings' => $mock_plugin,
         'menu_local_task_test_tasks_view.tab' => $mock_plugin,
         'menu_local_task_test_tasks_edit' => $mock_plugin,
-      ),
-      1 => array(
+      ],
+      1 => [
         'menu_local_task_test_tasks_view_child1' => $mock_plugin,
         'menu_local_task_test_tasks_view_child2' => $mock_plugin,
-      ),
-    );
+      ],
+    ];
     return $result;
   }
 
@@ -375,26 +375,26 @@ class LocalTaskManagerTest extends UnitTestCase {
    */
   protected function getLocalTasksCache() {
     $local_task_fixtures = $this->getLocalTaskFixtures();
-    $local_tasks = array(
-      'base_routes' => array(
+    $local_tasks = [
+      'base_routes' => [
         'menu_local_task_test_tasks_view' => 'menu_local_task_test_tasks_view',
-      ),
-      'parents' => array(
+      ],
+      'parents' => [
         'menu_local_task_test_tasks_view.tab' => TRUE,
-      ),
-      'children' => array(
-        '> menu_local_task_test_tasks_view' => array(
+      ],
+      'children' => [
+        '> menu_local_task_test_tasks_view' => [
           'menu_local_task_test_tasks_settings' => $local_task_fixtures['menu_local_task_test_tasks_settings'],
           'menu_local_task_test_tasks_edit' => $local_task_fixtures['menu_local_task_test_tasks_edit'],
           'menu_local_task_test_tasks_view.tab' => $local_task_fixtures['menu_local_task_test_tasks_view.tab'],
-        ),
-        'menu_local_task_test_tasks_view.tab' => array(
+        ],
+        'menu_local_task_test_tasks_view.tab' => [
           // The manager will fill in the base_route before caching.
-          'menu_local_task_test_tasks_view_child1' => array('base_route' => 'menu_local_task_test_tasks_view') + $local_task_fixtures['menu_local_task_test_tasks_view_child1'],
-          'menu_local_task_test_tasks_view_child2' => array('base_route' => 'menu_local_task_test_tasks_view') + $local_task_fixtures['menu_local_task_test_tasks_view_child2'],
-        ),
-      ),
-    );
+          'menu_local_task_test_tasks_view_child1' => ['base_route' => 'menu_local_task_test_tasks_view'] + $local_task_fixtures['menu_local_task_test_tasks_view_child1'],
+          'menu_local_task_test_tasks_view_child2' => ['base_route' => 'menu_local_task_test_tasks_view'] + $local_task_fixtures['menu_local_task_test_tasks_view_child2'],
+        ],
+      ],
+    ];
     $local_tasks['children']['> menu_local_task_test_tasks_view']['menu_local_task_test_tasks_settings']['weight'] = 0;
     $local_tasks['children']['> menu_local_task_test_tasks_view']['menu_local_task_test_tasks_edit']['weight'] = 20 + 1e-6;
     $local_tasks['children']['> menu_local_task_test_tasks_view']['menu_local_task_test_tasks_view.tab']['weight'] = 2e-6;
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php b/web/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
index a1d21bd2f..c7639388f 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
@@ -94,41 +94,41 @@ class MenuActiveTrailTest extends UnitTestCase {
    *     - expected_link: The expected active link for the given menu.
    */
   public function provider() {
-    $data = array();
+    $data = [];
 
     $mock_route = new Route('');
 
     $request = new Request();
     $request->attributes->set(RouteObjectInterface::ROUTE_NAME, 'baby_llama');
     $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, $mock_route);
-    $request->attributes->set('_raw_variables', new ParameterBag(array()));
+    $request->attributes->set('_raw_variables', new ParameterBag([]));
 
-    $link_1 = MenuLinkMock::create(array('id' => 'baby_llama_link_1', 'route_name' => 'baby_llama', 'title' => 'Baby llama', 'parent' => 'mama_llama_link'));
-    $link_2 = MenuLinkMock::create(array('id' => 'baby_llama_link_2', 'route_name' => 'baby_llama', 'title' => 'Baby llama', 'parent' => 'papa_llama_link'));
+    $link_1 = MenuLinkMock::create(['id' => 'baby_llama_link_1', 'route_name' => 'baby_llama', 'title' => 'Baby llama', 'parent' => 'mama_llama_link']);
+    $link_2 = MenuLinkMock::create(['id' => 'baby_llama_link_2', 'route_name' => 'baby_llama', 'title' => 'Baby llama', 'parent' => 'papa_llama_link']);
 
     // @see \Drupal\Core\Menu\MenuLinkManagerInterface::getParentIds()
-    $link_1_parent_ids = array('baby_llama_link_1', 'mama_llama_link', '');
-    $empty_active_trail = array('');
+    $link_1_parent_ids = ['baby_llama_link_1', 'mama_llama_link', ''];
+    $empty_active_trail = [''];
 
     // No active link is returned when zero links match the current route.
-    $data[] = array($request, array(), $this->randomMachineName(), NULL, $empty_active_trail);
+    $data[] = [$request, [], $this->randomMachineName(), NULL, $empty_active_trail];
 
     // The first (and only) matching link is returned when one link matches the
     // current route.
-    $data[] = array($request, array('baby_llama_link_1' => $link_1), $this->randomMachineName(), $link_1, $link_1_parent_ids);
+    $data[] = [$request, ['baby_llama_link_1' => $link_1], $this->randomMachineName(), $link_1, $link_1_parent_ids];
 
     // The first of multiple matching links is returned when multiple links
     // match the current route, where "first" is determined by sorting by key.
-    $data[] = array($request, array('baby_llama_link_1' => $link_1, 'baby_llama_link_2' => $link_2), $this->randomMachineName(), $link_1, $link_1_parent_ids);
+    $data[] = [$request, ['baby_llama_link_1' => $link_1, 'baby_llama_link_2' => $link_2], $this->randomMachineName(), $link_1, $link_1_parent_ids];
 
     // No active link is returned in case of a 403.
     $request = new Request();
     $request->attributes->set('_exception_statuscode', 403);
-    $data[] = array($request, FALSE, $this->randomMachineName(), NULL, $empty_active_trail);
+    $data[] = [$request, FALSE, $this->randomMachineName(), NULL, $empty_active_trail];
 
     // No active link is returned when the route name is missing.
     $request = new Request();
-    $data[] = array($request, FALSE, $this->randomMachineName(), NULL, $empty_active_trail);
+    $data[] = [$request, FALSE, $this->randomMachineName(), NULL, $empty_active_trail];
 
     return $data;
   }
@@ -173,9 +173,9 @@ class MenuActiveTrailTest extends UnitTestCase {
       if ($expected_link !== NULL) {
         $this->menuLinkManager->expects($this->exactly(2))
           ->method('getParentIds')
-          ->will($this->returnValueMap(array(
-            array($expected_link->getPluginId(), $expected_trail_ids),
-          )));
+          ->will($this->returnValueMap([
+            [$expected_link->getPluginId(), $expected_trail_ids],
+          ]));
       }
     }
 
@@ -213,9 +213,9 @@ class MenuActiveTrailTest extends UnitTestCase {
 
     $this->menuLinkManager->expects($this->any())
       ->method('getParentIds')
-      ->will($this->returnValueMap(array(
-        array($expected_link->getPluginId(), $expected_trail_ids),
-      )));
+      ->will($this->returnValueMap([
+        [$expected_link->getPluginId(), $expected_trail_ids],
+      ]));
 
     $this->assertSame($expected_trail_ids, $this->menuActiveTrail->getActiveTrailIds($data[2]));
 
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php b/web/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php
index 14c621ea2..5c3905c6b 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/MenuLinkMock.php
@@ -10,18 +10,18 @@ use Drupal\Core\Menu\MenuLinkBase;
  */
 class MenuLinkMock extends MenuLinkBase {
 
-  protected static $defaults = array(
+  protected static $defaults = [
     'menu_name' => 'mock',
     'route_name' => 'MUST BE PROVIDED',
-    'route_parameters' => array(),
+    'route_parameters' => [],
     'url' => '',
     'title' => 'MUST BE PROVIDED',
-    'title_arguments' => array(),
+    'title_arguments' => [],
     'title_context' => '',
     'description' => '',
     'parent' => 'MUST BE PROVIDED',
     'weight' => '0',
-    'options' => array(),
+    'options' => [],
     'expanded' => '0',
     'enabled' => '1',
     'provider' => 'simpletest',
@@ -33,13 +33,13 @@ class MenuLinkMock extends MenuLinkBase {
     'class' => 'Drupal\\Tests\\Core\Menu\\MenuLinkMock',
     'form_class' => 'Drupal\\Core\\Menu\\Form\\MenuLinkDefaultForm',
     'id' => 'MUST BE PROVIDED',
-  );
+  ];
 
   /**
    * Create an instance from a definition with at least id, title, route_name.
    */
   public static function create($definition) {
-    return new static(array(), $definition['id'], $definition + static::$defaults);
+    return new static([], $definition['id'], $definition + static::$defaults);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/MenuLinkTreeElementTest.php b/web/core/tests/Drupal/Tests/Core/Menu/MenuLinkTreeElementTest.php
index 0ea100703..a18cf8cf7 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/MenuLinkTreeElementTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/MenuLinkTreeElementTest.php
@@ -20,13 +20,13 @@ class MenuLinkTreeElementTest extends UnitTestCase {
    * @covers ::__construct
    */
   public function testConstruction() {
-    $link = MenuLinkMock::create(array('id' => 'test'));
-    $item = new MenuLinkTreeElement($link, FALSE, 3, FALSE, array());
+    $link = MenuLinkMock::create(['id' => 'test']);
+    $item = new MenuLinkTreeElement($link, FALSE, 3, FALSE, []);
     $this->assertSame($link, $item->link);
     $this->assertSame(FALSE, $item->hasChildren);
     $this->assertSame(3, $item->depth);
     $this->assertSame(FALSE, $item->inActiveTrail);
-    $this->assertSame(array(), $item->subtree);
+    $this->assertSame([], $item->subtree);
   }
 
   /**
@@ -35,10 +35,10 @@ class MenuLinkTreeElementTest extends UnitTestCase {
    * @covers ::count
    */
   public function testCount() {
-    $link_1 = MenuLinkMock::create(array('id' => 'test_1'));
-    $link_2 = MenuLinkMock::create(array('id' => 'test_2'));
-    $child_item = new MenuLinkTreeElement($link_2, FALSE, 2, FALSE, array());
-    $parent_item = new MenuLinkTreeElement($link_1, FALSE, 2, FALSE, array($child_item));
+    $link_1 = MenuLinkMock::create(['id' => 'test_1']);
+    $link_2 = MenuLinkMock::create(['id' => 'test_2']);
+    $child_item = new MenuLinkTreeElement($link_2, FALSE, 2, FALSE, []);
+    $parent_item = new MenuLinkTreeElement($link_1, FALSE, 2, FALSE, [$child_item]);
     $this->assertSame(1, $child_item->count());
     $this->assertSame(2, $parent_item->count());
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/MenuTreeParametersTest.php b/web/core/tests/Drupal/Tests/Core/Menu/MenuTreeParametersTest.php
index e9d664e98..ccaf3b9c7 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/MenuTreeParametersTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/MenuTreeParametersTest.php
@@ -18,22 +18,22 @@ class MenuTreeParametersTest extends UnitTestCase {
    * Provides test data for testSetMinDepth().
    */
   public function providerTestSetMinDepth() {
-    $data = array();
+    $data = [];
 
     // Valid values at the extremes and in the middle.
-    $data[] = array(1, 1);
-    $data[] = array(2, 2);
-    $data[] = array(9, 9);
+    $data[] = [1, 1];
+    $data[] = [2, 2];
+    $data[] = [9, 9];
 
     // Invalid values are mapped to the closest valid value.
-    $data[] = array(-10000, 1);
-    $data[] = array(0, 1);
+    $data[] = [-10000, 1];
+    $data[] = [0, 1];
     // … except for those invalid values that reach beyond the maximum depth,
     // because MenuTreeParameters is a value object and hence cannot depend
     // on anything; to know the actual maximum depth, it'd have to depend on the
     // MenuTreeStorage service.
-    $data[] = array(10, 10);
-    $data[] = array(100000, 100000);
+    $data[] = [10, 10];
+    $data[] = [100000, 100000];
 
     return $data;
   }
@@ -59,21 +59,21 @@ class MenuTreeParametersTest extends UnitTestCase {
     $parameters = new MenuTreeParameters();
 
     // Verify default value.
-    $this->assertEquals(array(), $parameters->expandedParents);
+    $this->assertEquals([], $parameters->expandedParents);
 
     // Add actual menu link plugin IDs to be expanded.
-    $parameters->addExpandedParents(array('foo', 'bar', 'baz'));
-    $this->assertEquals(array('foo', 'bar', 'baz'), $parameters->expandedParents);
+    $parameters->addExpandedParents(['foo', 'bar', 'baz']);
+    $this->assertEquals(['foo', 'bar', 'baz'], $parameters->expandedParents);
 
     // Add additional menu link plugin IDs; they should be merged, not replacing
     // the old ones.
-    $parameters->addExpandedParents(array('qux', 'quux'));
-    $this->assertEquals(array('foo', 'bar', 'baz', 'qux', 'quux'), $parameters->expandedParents);
+    $parameters->addExpandedParents(['qux', 'quux']);
+    $this->assertEquals(['foo', 'bar', 'baz', 'qux', 'quux'], $parameters->expandedParents);
 
     // Add pre-existing menu link plugin IDs; they should not be added again;
     // this is a set.
-    $parameters->addExpandedParents(array('bar', 'quux'));
-    $this->assertEquals(array('foo', 'bar', 'baz', 'qux', 'quux'), $parameters->expandedParents);
+    $parameters->addExpandedParents(['bar', 'quux']);
+    $this->assertEquals(['foo', 'bar', 'baz', 'qux', 'quux'], $parameters->expandedParents);
   }
 
   /**
@@ -85,28 +85,28 @@ class MenuTreeParametersTest extends UnitTestCase {
     $parameters = new MenuTreeParameters();
 
     // Verify default value.
-    $this->assertEquals(array(), $parameters->conditions);
+    $this->assertEquals([], $parameters->conditions);
 
     // Add a condition.
     $parameters->addCondition('expanded', 1);
-    $this->assertEquals(array('expanded' => 1), $parameters->conditions);
+    $this->assertEquals(['expanded' => 1], $parameters->conditions);
 
     // Add another condition.
     $parameters->addCondition('has_children', 0);
-    $this->assertEquals(array('expanded' => 1, 'has_children' => 0), $parameters->conditions);
+    $this->assertEquals(['expanded' => 1, 'has_children' => 0], $parameters->conditions);
 
     // Add a condition with an operator.
-    $parameters->addCondition('provider', array('module1', 'module2'), 'IN');
-    $this->assertEquals(array('expanded' => 1, 'has_children' => 0, 'provider' => array(array('module1', 'module2'), 'IN')), $parameters->conditions);
+    $parameters->addCondition('provider', ['module1', 'module2'], 'IN');
+    $this->assertEquals(['expanded' => 1, 'has_children' => 0, 'provider' => [['module1', 'module2'], 'IN']], $parameters->conditions);
 
     // Add another condition with an operator.
     $parameters->addCondition('id', 1337, '<');
-    $this->assertEquals(array('expanded' => 1, 'has_children' => 0, 'provider' => array(array('module1', 'module2'), 'IN'), 'id' => array(1337, '<')), $parameters->conditions);
+    $this->assertEquals(['expanded' => 1, 'has_children' => 0, 'provider' => [['module1', 'module2'], 'IN'], 'id' => [1337, '<']], $parameters->conditions);
 
     // It's impossible to add two conditions on the same field; in that case,
     // the old condition will be overwritten.
     $parameters->addCondition('provider', 'other_module');
-    $this->assertEquals(array('expanded' => 1, 'has_children' => 0, 'provider' => 'other_module', 'id' => array(1337, '<')), $parameters->conditions);
+    $this->assertEquals(['expanded' => 1, 'has_children' => 0, 'provider' => 'other_module', 'id' => [1337, '<']], $parameters->conditions);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php b/web/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php
index e09a56e81..98a122ca2 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php
@@ -17,7 +17,7 @@ class StaticMenuLinkOverridesTest extends UnitTestCase {
    * @covers ::__construct
    */
   public function testConstruct() {
-    $config_factory = $this->getConfigFactoryStub(array('core.menu.static_menu_link_overrides' => array()));
+    $config_factory = $this->getConfigFactoryStub(['core.menu.static_menu_link_overrides' => []]);
     $static_override = new StaticMenuLinkOverrides($config_factory);
 
     $this->assertAttributeEquals($config_factory, 'configFactory', $static_override);
@@ -48,7 +48,7 @@ class StaticMenuLinkOverridesTest extends UnitTestCase {
    * @covers ::getConfig
    */
   public function testLoadOverride($overrides, $id, $expected) {
-    $config_factory = $this->getConfigFactoryStub(array('core.menu.static_menu_link_overrides' => array('definitions' => $overrides)));
+    $config_factory = $this->getConfigFactoryStub(['core.menu.static_menu_link_overrides' => ['definitions' => $overrides]]);
     $static_override = new StaticMenuLinkOverrides($config_factory);
 
     $this->assertEquals($expected, $static_override->loadOverride($id));
@@ -58,15 +58,15 @@ class StaticMenuLinkOverridesTest extends UnitTestCase {
    * Provides test data for testLoadOverride.
    */
   public function providerTestLoadOverride() {
-    $data = array();
+    $data = [];
     // No specified ID.
-    $data[] = array(array('test1' => array('parent' => 'test0')), NULL, array());
+    $data[] = [['test1' => ['parent' => 'test0']], NULL, []];
     // Valid ID.
-    $data[] = array(array('test1' => array('parent' => 'test0')), 'test1', array('parent' => 'test0'));
+    $data[] = [['test1' => ['parent' => 'test0']], 'test1', ['parent' => 'test0']];
     // Non existing ID.
-    $data[] = array(array('test1' => array('parent' => 'test0')), 'test2', array());
+    $data[] = [['test1' => ['parent' => 'test0']], 'test2', []];
     // Ensure that the ID is encoded properly
-    $data[] = array(array('test1__la___ma' => array('parent' => 'test0')), 'test1.la__ma', array('parent' => 'test0'));
+    $data[] = [['test1__la___ma' => ['parent' => 'test0']], 'test1.la__ma', ['parent' => 'test0']];
 
     return $data;
   }
@@ -78,15 +78,15 @@ class StaticMenuLinkOverridesTest extends UnitTestCase {
    * @covers ::getConfig
    */
   public function testLoadMultipleOverrides() {
-    $overrides = array();
-    $overrides['test1'] = array('parent' => 'test0');
-    $overrides['test2'] = array('parent' => 'test1');
-    $overrides['test1__la___ma'] = array('parent' => 'test2');
+    $overrides = [];
+    $overrides['test1'] = ['parent' => 'test0'];
+    $overrides['test2'] = ['parent' => 'test1'];
+    $overrides['test1__la___ma'] = ['parent' => 'test2'];
 
-    $config_factory = $this->getConfigFactoryStub(array('core.menu.static_menu_link_overrides' => array('definitions' => $overrides)));
+    $config_factory = $this->getConfigFactoryStub(['core.menu.static_menu_link_overrides' => ['definitions' => $overrides]]);
     $static_override = new StaticMenuLinkOverrides($config_factory);
 
-    $this->assertEquals(array('test1' => array('parent' => 'test0'), 'test1.la__ma' => array('parent' => 'test2')), $static_override->loadMultipleOverrides(array('test1', 'test1.la__ma')));
+    $this->assertEquals(['test1' => ['parent' => 'test0'], 'test1.la__ma' => ['parent' => 'test2']], $static_override->loadMultipleOverrides(['test1', 'test1.la__ma']));
   }
 
   /**
@@ -103,23 +103,23 @@ class StaticMenuLinkOverridesTest extends UnitTestCase {
     $config->expects($this->at(0))
       ->method('get')
       ->with('definitions')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
     $config->expects($this->at(1))
       ->method('get')
       ->with('definitions')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
-    $definition_save_1 = array(
-      'definitions' => array(
-        'test1' => array('parent' => 'test0', 'menu_name' => '', 'weight' => 0, 'expanded' => FALSE, 'enabled' => FALSE)
-      )
-    );
-    $definitions_save_2 = array(
-      'definitions' => array(
-        'test1' => array('parent' => 'test0', 'menu_name' => '', 'weight' => 0, 'expanded' => FALSE, 'enabled' => FALSE),
-        'test1__la___ma' => array('parent' => 'test1', 'menu_name' => '', 'weight' => 0, 'expanded' => FALSE, 'enabled' => FALSE)
-      )
-    );
+    $definition_save_1 = [
+      'definitions' => [
+        'test1' => ['parent' => 'test0', 'menu_name' => '', 'weight' => 0, 'expanded' => FALSE, 'enabled' => FALSE]
+      ]
+    ];
+    $definitions_save_2 = [
+      'definitions' => [
+        'test1' => ['parent' => 'test0', 'menu_name' => '', 'weight' => 0, 'expanded' => FALSE, 'enabled' => FALSE],
+        'test1__la___ma' => ['parent' => 'test1', 'menu_name' => '', 'weight' => 0, 'expanded' => FALSE, 'enabled' => FALSE]
+      ]
+    ];
     $config->expects($this->at(2))
       ->method('set')
       ->with('definitions', $definition_save_1['definitions'])
@@ -148,8 +148,8 @@ class StaticMenuLinkOverridesTest extends UnitTestCase {
 
     $static_override = new StaticMenuLinkOverrides($config_factory);
 
-    $static_override->saveOverride('test1', array('parent' => 'test0'));
-    $static_override->saveOverride('test1.la__ma', array('parent' => 'test1'));
+    $static_override->saveOverride('test1', ['parent' => 'test0']);
+    $static_override->saveOverride('test1.la__ma', ['parent' => 'test1']);
   }
 
   /**
@@ -202,15 +202,15 @@ class StaticMenuLinkOverridesTest extends UnitTestCase {
    * Provides test data for testDeleteOverrides.
    */
   public function providerTestDeleteOverrides() {
-    $data = array();
+    $data = [];
     // Delete a non existing ID.
-    $data[] = array('test0', array(), array());
+    $data[] = ['test0', [], []];
     // Delete an existing ID.
-    $data[] = array('test1', array('test1' => array('parent' => 'test0')), array());
+    $data[] = ['test1', ['test1' => ['parent' => 'test0']], []];
     // Delete an existing ID with a special ID.
-    $data[] = array('test1.la__ma', array('test1__la___ma' => array('parent' => 'test0')), array());
+    $data[] = ['test1.la__ma', ['test1__la___ma' => ['parent' => 'test0']], []];
     // Delete multiple IDs.
-    $data[] = array(array('test1.la__ma', 'test1'), array('test1' => array('parent' => 'test0'), 'test1__la___ma' => array('parent' => 'test0')), array());
+    $data[] = [['test1.la__ma', 'test1'], ['test1' => ['parent' => 'test0'], 'test1__la___ma' => ['parent' => 'test0']], []];
 
     return $data;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php b/web/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php
index 82a658180..67e99de46 100644
--- a/web/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php
@@ -63,7 +63,6 @@ class ChainRequestPolicyTest extends UnitTestCase {
   /**
    * Asserts that check() throws an exception if a rule returns an invalid value.
    *
-   * @expectedException \UnexpectedValueException
    * @dataProvider providerChainExceptionOnInvalidReturnValue
    * @covers ::check
    */
@@ -76,6 +75,7 @@ class ChainRequestPolicyTest extends UnitTestCase {
 
     $this->policy->addPolicy($rule);
 
+    $this->setExpectedException(\UnexpectedValueException::class);
     $this->policy->check($this->request);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php b/web/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php
index 1575ac167..8de3a5c91 100644
--- a/web/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php
@@ -72,7 +72,6 @@ class ChainResponsePolicyTest extends UnitTestCase {
   /**
    * Asserts that check() throws an exception if a rule returns an invalid value.
    *
-   * @expectedException \UnexpectedValueException
    * @dataProvider providerChainExceptionOnInvalidReturnValue
    * @covers ::check
    */
@@ -85,8 +84,8 @@ class ChainResponsePolicyTest extends UnitTestCase {
 
     $this->policy->addPolicy($rule);
 
-    $actual_result = $this->policy->check($this->response, $this->request);
-    $this->assertSame(NULL, $actual_result);
+    $this->setExpectedException(\UnexpectedValueException::class);
+    $this->policy->check($this->response, $this->request);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php b/web/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php
index 2f62f1e8e..46f78c637 100644
--- a/web/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php
@@ -22,7 +22,7 @@ class CommandLineOrUnsafeMethodTest extends UnitTestCase {
   protected function setUp() {
     // Note that it is necessary to partially mock the class under test in
     // order to disable the isCli-check.
-    $this->policy = $this->getMock('Drupal\Core\PageCache\RequestPolicy\CommandLineOrUnsafeMethod', array('isCli'));
+    $this->policy = $this->getMock('Drupal\Core\PageCache\RequestPolicy\CommandLineOrUnsafeMethod', ['isCli']);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/ParamConverter/EntityConverterTest.php b/web/core/tests/Drupal/Tests/Core/ParamConverter/EntityConverterTest.php
index ebafab0c9..67decbed0 100644
--- a/web/core/tests/Drupal/Tests/Core/ParamConverter/EntityConverterTest.php
+++ b/web/core/tests/Drupal/Tests/Core/ParamConverter/EntityConverterTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\Core\ParamConverter;
 
 use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
 use Drupal\Core\ParamConverter\EntityConverter;
+use Drupal\Core\ParamConverter\ParamNotConvertedException;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\Routing\Route;
 
@@ -110,8 +111,6 @@ class EntityConverterTest extends UnitTestCase {
 
   /**
    * Tests the convert() method with an invalid entity type.
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    */
   public function testConvertWithInvalidEntityType() {
     $this->entityManager->expects($this->once())
@@ -119,16 +118,15 @@ class EntityConverterTest extends UnitTestCase {
       ->with('invalid_id')
       ->willThrowException(new InvalidPluginDefinitionException('invalid_id'));
 
+    $this->setExpectedException(InvalidPluginDefinitionException::class);
     $this->entityConverter->convert('id', ['type' => 'entity:invalid_id'], 'foo', ['foo' => 'id']);
   }
 
   /**
    * Tests the convert() method with an invalid dynamic entity type.
-   *
-   * @expectedException \Drupal\Core\ParamConverter\ParamNotConvertedException
-   * @expectedExceptionMessage The "foo" parameter was not converted because the "invalid_id" parameter is missing
    */
   public function testConvertWithInvalidDynamicEntityType() {
+    $this->setExpectedException(ParamNotConvertedException::class, 'The "foo" parameter was not converted because the "invalid_id" parameter is missing');
     $this->entityConverter->convert('id', ['type' => 'entity:{invalid_id}'], 'foo', ['foo' => 'id']);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php b/web/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
index cc248b0b4..6d60e1d4e 100644
--- a/web/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\Core\ParamConverter;
 
 use Drupal\Core\ParamConverter\ParamConverterManager;
+use Drupal\Core\ParamConverter\ParamNotConvertedException;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\Routing\Route;
@@ -51,10 +52,9 @@ class ParamConverterManagerTest extends UnitTestCase {
    * Tests \Drupal\Core\ParamConverter\ParamConverterManager::getConverter().
    *
    * @covers ::getConverter
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testGetConverterException() {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->manager->getConverter('undefined.converter');
   }
 
@@ -68,35 +68,35 @@ class ParamConverterManagerTest extends UnitTestCase {
    * @see ParamConverterManagerTest::testAddConverter()
    */
   public function providerTestAddConverter() {
-    $converters[0]['unsorted'] = array(
-      array('name' => 'strawberry'),
-      array('name' => 'raspberry'),
-      array('name' => 'pear'),
-      array('name' => 'peach'),
-      array('name' => 'pineapple'),
-      array('name' => 'banana'),
-      array('name' => 'apple'),
-    );
+    $converters[0]['unsorted'] = [
+      ['name' => 'strawberry'],
+      ['name' => 'raspberry'],
+      ['name' => 'pear'],
+      ['name' => 'peach'],
+      ['name' => 'pineapple'],
+      ['name' => 'banana'],
+      ['name' => 'apple'],
+    ];
 
-    $converters[0]['sorted'] = array(
+    $converters[0]['sorted'] = [
       'strawberry', 'raspberry', 'pear', 'peach',
       'pineapple', 'banana', 'apple'
-    );
+    ];
 
-    $converters[1]['unsorted'] = array(
-      array('name' => 'giraffe'),
-      array('name' => 'zebra'),
-      array('name' => 'eagle'),
-      array('name' => 'ape'),
-      array('name' => 'cat'),
-      array('name' => 'puppy'),
-      array('name' => 'llama'),
-    );
+    $converters[1]['unsorted'] = [
+      ['name' => 'giraffe'],
+      ['name' => 'zebra'],
+      ['name' => 'eagle'],
+      ['name' => 'ape'],
+      ['name' => 'cat'],
+      ['name' => 'puppy'],
+      ['name' => 'llama'],
+    ];
 
-    $converters[1]['sorted'] = array(
+    $converters[1]['sorted'] = [
       'giraffe', 'zebra', 'eagle', 'ape',
       'cat', 'puppy', 'llama'
-    );
+    ];
 
     return $converters;
   }
@@ -111,15 +111,15 @@ class ParamConverterManagerTest extends UnitTestCase {
    * @see ParamConverterManagerTest::testGetConverter()
    */
   public function providerTestGetConverter() {
-    return array(
-      array('ape', 'ApeConverterClass'),
-      array('cat', 'CatConverterClass'),
-      array('puppy', 'PuppyConverterClass'),
-      array('llama', 'LlamaConverterClass'),
-      array('giraffe', 'GiraffeConverterClass'),
-      array('zebra', 'ZebraConverterClass'),
-      array('eagle', 'EagleConverterClass'),
-    );
+    return [
+      ['ape', 'ApeConverterClass'],
+      ['cat', 'CatConverterClass'],
+      ['puppy', 'PuppyConverterClass'],
+      ['llama', 'LlamaConverterClass'],
+      ['giraffe', 'GiraffeConverterClass'],
+      ['zebra', 'ZebraConverterClass'],
+      ['eagle', 'EagleConverterClass'],
+    ];
   }
 
   /**
@@ -158,11 +158,11 @@ class ParamConverterManagerTest extends UnitTestCase {
    * Provides data for testSetRouteParameterConverters().
    */
   public function providerTestSetRouteParameterConverters() {
-    return array(
-      array('/test'),
-      array('/test/{id}', array('id' => array()), 'applied'),
-      array('/test/{id}', array('id' => array('converter' => 'predefined')), 'predefined'),
-    );
+    return [
+      ['/test'],
+      ['/test/{id}', ['id' => []], 'applied'],
+      ['/test/{id}', ['id' => ['converter' => 'predefined']], 'predefined'],
+    ];
   }
 
   /**
@@ -170,22 +170,22 @@ class ParamConverterManagerTest extends UnitTestCase {
    */
   public function testConvert() {
     $route = new Route('/test/{id}/{literal}/{null}');
-    $parameters = array(
-      'id' => array(
+    $parameters = [
+      'id' => [
         'converter' => 'test_convert',
-      ),
-      'literal' => array(),
-      'null' => array(),
-    );
+      ],
+      'literal' => [],
+      'null' => [],
+    ];
     $route->setOption('parameters', $parameters);
 
-    $defaults = array(
+    $defaults = [
       RouteObjectInterface::ROUTE_OBJECT => $route,
       RouteObjectInterface::ROUTE_NAME => 'test_route',
       'id' => 1,
       'literal' => 'this is a literal',
       'null' => NULL,
-    );
+    ];
 
     $expected = $defaults;
     $expected['id'] = 'something_better!';
@@ -207,10 +207,10 @@ class ParamConverterManagerTest extends UnitTestCase {
    */
   public function testConvertNoConverting() {
     $route = new Route('/test');
-    $defaults = array(
+    $defaults = [
       RouteObjectInterface::ROUTE_OBJECT => $route,
       RouteObjectInterface::ROUTE_NAME => 'test_route',
-    );
+    ];
 
     $expected = $defaults;
 
@@ -220,24 +220,21 @@ class ParamConverterManagerTest extends UnitTestCase {
 
   /**
    * @covers ::convert
-   *
-   * @expectedException \Drupal\Core\ParamConverter\ParamNotConvertedException
-   * @expectedExceptionMessage The "id" parameter was not converted for the path "/test/{id}" (route name: "test_route")
    */
   public function testConvertMissingParam() {
     $route = new Route('/test/{id}');
-    $parameters = array(
-      'id' => array(
+    $parameters = [
+      'id' => [
         'converter' => 'test_convert',
-      ),
-    );
+      ],
+    ];
     $route->setOption('parameters', $parameters);
 
-    $defaults = array(
+    $defaults = [
       RouteObjectInterface::ROUTE_OBJECT => $route,
       RouteObjectInterface::ROUTE_NAME => 'test_route',
       'id' => 1,
-    );
+    ];
 
     $converter = $this->getMock('Drupal\Core\ParamConverter\ParamConverterInterface');
     $converter->expects($this->any())
@@ -246,6 +243,7 @@ class ParamConverterManagerTest extends UnitTestCase {
       ->will($this->returnValue(NULL));
     $this->manager->addConverter($converter, 'test_convert');
 
+    $this->setExpectedException(ParamNotConvertedException::class, 'The "id" parameter was not converted for the path "/test/{id}" (route name: "test_route")');
     $this->manager->convert($defaults);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php b/web/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php
index 5c378ed62..d237ffa15 100644
--- a/web/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Password/PasswordHashingTest.php
@@ -152,21 +152,21 @@ class PasswordHashingTest extends UnitTestCase {
    */
   public function providerLongPasswords() {
     // '512 byte long password is allowed.'
-    $passwords['allowed'] = array(str_repeat('x', PasswordInterface::PASSWORD_MAX_LENGTH), TRUE);
+    $passwords['allowed'] = [str_repeat('x', PasswordInterface::PASSWORD_MAX_LENGTH), TRUE];
     // 513 byte long password is not allowed.
-    $passwords['too_long'] = array(str_repeat('x', PasswordInterface::PASSWORD_MAX_LENGTH + 1), FALSE);
+    $passwords['too_long'] = [str_repeat('x', PasswordInterface::PASSWORD_MAX_LENGTH + 1), FALSE];
 
     // Check a string of 3-byte UTF-8 characters, 510 byte long password is
     // allowed.
     $len = floor(PasswordInterface::PASSWORD_MAX_LENGTH / 3);
     $diff = PasswordInterface::PASSWORD_MAX_LENGTH % 3;
-    $passwords['utf8'] = array(str_repeat('€', $len), TRUE);
+    $passwords['utf8'] = [str_repeat('€', $len), TRUE];
     // 512 byte long password is allowed.
-    $passwords['ut8_extended'] = array($passwords['utf8'][0] . str_repeat('x', $diff), TRUE);
+    $passwords['ut8_extended'] = [$passwords['utf8'][0] . str_repeat('x', $diff), TRUE];
 
     // Check a string of 3-byte UTF-8 characters, 513 byte long password is
     // allowed.
-    $passwords['utf8_too_long'] = array(str_repeat('€', $len + 1), FALSE);
+    $passwords['utf8_too_long'] = [str_repeat('€', $len + 1), FALSE];
     return $passwords;
   }
 
@@ -177,7 +177,7 @@ class PasswordHashingTest extends UnitTestCase {
  */
 class FakePhpassHashedPassword extends PhpassHashedPassword {
 
-  function __construct() {
+  public function __construct() {
     // Noop.
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Path/AliasManagerTest.php b/web/core/tests/Drupal/Tests/Core/Path/AliasManagerTest.php
index 569f394ba..ffd52dc4a 100644
--- a/web/core/tests/Drupal/Tests/Core/Path/AliasManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Path/AliasManagerTest.php
@@ -85,7 +85,7 @@ class AliasManagerTest extends UnitTestCase {
   public function testGetPathByAliasNoMatch() {
     $alias = '/' . $this->randomMachineName();
 
-    $language = new Language(array('id' => 'en'));
+    $language = new Language(['id' => 'en']);
 
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
@@ -202,7 +202,7 @@ class AliasManagerTest extends UnitTestCase {
     // This needs to write out the cache.
     $this->cache->expects($this->once())
       ->method('set')
-      ->with($this->cacheKey, array($language->getId() => array($path)), (int) $_SERVER['REQUEST_TIME'] + (60 * 60 * 24));
+      ->with($this->cacheKey, [$language->getId() => [$path]], (int) $_SERVER['REQUEST_TIME'] + (60 * 60 * 24));
 
     $this->aliasManager->writeCache();
   }
@@ -240,7 +240,7 @@ class AliasManagerTest extends UnitTestCase {
     // This needs to write out the cache.
     $this->cache->expects($this->once())
       ->method('set')
-      ->with($this->cacheKey, array($language->getId() => array($path)), (int) $_SERVER['REQUEST_TIME'] + (60 * 60 * 24));
+      ->with($this->cacheKey, [$language->getId() => [$path]], (int) $_SERVER['REQUEST_TIME'] + (60 * 60 * 24));
 
     $this->aliasManager->writeCache();
   }
@@ -259,11 +259,11 @@ class AliasManagerTest extends UnitTestCase {
 
     $language = $this->setUpCurrentLanguage();
 
-    $cached_paths = array($language->getId() => array($path));
+    $cached_paths = [$language->getId() => [$path]];
     $this->cache->expects($this->once())
       ->method('get')
       ->with($this->cacheKey)
-      ->will($this->returnValue((object) array('data' => $cached_paths)));
+      ->will($this->returnValue((object) ['data' => $cached_paths]));
 
     // Simulate a request so that the preloaded paths are fetched.
     $this->aliasManager->setCacheKey($this->path);
@@ -276,7 +276,7 @@ class AliasManagerTest extends UnitTestCase {
     $this->aliasStorage->expects($this->once())
       ->method('preloadPathAlias')
       ->with($cached_paths[$language->getId()], $language->getId())
-      ->will($this->returnValue(array($path => $alias)));
+      ->will($this->returnValue([$path => $alias]));
 
     // LookupPathAlias should not be called.
     $this->aliasStorage->expects($this->never())
@@ -305,13 +305,13 @@ class AliasManagerTest extends UnitTestCase {
     $alias = $this->randomMachineName();
 
     $language = $this->setUpCurrentLanguage();
-    $cached_language = new Language(array('id' => 'de'));
+    $cached_language = new Language(['id' => 'de']);
 
-    $cached_paths = array($cached_language->getId() => array($path));
+    $cached_paths = [$cached_language->getId() => [$path]];
     $this->cache->expects($this->once())
       ->method('get')
       ->with($this->cacheKey)
-      ->will($this->returnValue((object) array('data' => $cached_paths)));
+      ->will($this->returnValue((object) ['data' => $cached_paths]));
 
     // Simulate a request so that the preloaded paths are fetched.
     $this->aliasManager->setCacheKey($this->path);
@@ -356,11 +356,11 @@ class AliasManagerTest extends UnitTestCase {
 
     $language = $this->setUpCurrentLanguage();
 
-    $cached_paths = array($language->getId() => array($cached_path, $path));
+    $cached_paths = [$language->getId() => [$cached_path, $path]];
     $this->cache->expects($this->once())
       ->method('get')
       ->with($this->cacheKey)
-      ->will($this->returnValue((object) array('data' => $cached_paths)));
+      ->will($this->returnValue((object) ['data' => $cached_paths]));
 
     // Simulate a request so that the preloaded paths are fetched.
     $this->aliasManager->setCacheKey($this->path);
@@ -373,7 +373,7 @@ class AliasManagerTest extends UnitTestCase {
     $this->aliasStorage->expects($this->once())
       ->method('preloadPathAlias')
       ->with($cached_paths[$language->getId()], $language->getId())
-      ->will($this->returnValue(array($cached_path => $cached_alias)));
+      ->will($this->returnValue([$cached_path => $cached_alias]));
 
     // LookupPathAlias() should not be called.
     $this->aliasStorage->expects($this->never())
@@ -404,11 +404,11 @@ class AliasManagerTest extends UnitTestCase {
 
     $language = $this->setUpCurrentLanguage();
 
-    $cached_paths = array($language->getId() => array($cached_path));
+    $cached_paths = [$language->getId() => [$cached_path]];
     $this->cache->expects($this->once())
       ->method('get')
       ->with($this->cacheKey)
-      ->will($this->returnValue((object) array('data' => $cached_paths)));
+      ->will($this->returnValue((object) ['data' => $cached_paths]));
 
     // Simulate a request so that the preloaded paths are fetched.
     $this->aliasManager->setCacheKey($this->path);
@@ -421,7 +421,7 @@ class AliasManagerTest extends UnitTestCase {
     $this->aliasStorage->expects($this->once())
       ->method('preloadPathAlias')
       ->with($cached_paths[$language->getId()], $language->getId())
-      ->will($this->returnValue(array($cached_path => $cached_alias)));
+      ->will($this->returnValue([$cached_path => $cached_alias]));
 
     $this->aliasStorage->expects($this->once())
       ->method('lookupPathAlias')
@@ -493,11 +493,11 @@ class AliasManagerTest extends UnitTestCase {
 
     $language = $this->setUpCurrentLanguage();
 
-    $cached_paths = array($language->getId() => array($cached_path, $cached_no_alias_path));
+    $cached_paths = [$language->getId() => [$cached_path, $cached_no_alias_path]];
     $this->cache->expects($this->once())
       ->method('get')
       ->with($this->cacheKey)
-      ->will($this->returnValue((object) array('data' => $cached_paths)));
+      ->will($this->returnValue((object) ['data' => $cached_paths]));
 
     // Simulate a request so that the preloaded paths are fetched.
     $this->aliasManager->setCacheKey($this->path);
@@ -510,7 +510,7 @@ class AliasManagerTest extends UnitTestCase {
     $this->aliasStorage->expects($this->once())
       ->method('preloadPathAlias')
       ->with($cached_paths[$language->getId()], $language->getId())
-      ->will($this->returnValue(array($cached_path => $cached_alias)));
+      ->will($this->returnValue([$cached_path => $cached_alias]));
 
     $this->aliasStorage->expects($this->once())
       ->method('lookupPathAlias')
@@ -535,7 +535,7 @@ class AliasManagerTest extends UnitTestCase {
    *   The current language object.
    */
   protected function setUpCurrentLanguage() {
-    $language = new Language(array('id' => 'en'));
+    $language = new Language(['id' => 'en']);
 
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
diff --git a/web/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php b/web/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
index b45665495..7089121d5 100644
--- a/web/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Path/PathMatcherTest.php
@@ -25,11 +25,11 @@ class PathMatcherTest extends UnitTestCase {
     // Create a stub config factory with all config settings that will be
     // checked during this test.
     $config_factory_stub = $this->getConfigFactoryStub(
-      array(
-        'system.site' => array(
+      [
+        'system.site' => [
           'page.front' => '/dummy',
-        ),
-      )
+        ],
+      ]
     );
     $route_match = $this->getMock('Drupal\Core\Routing\RouteMatchInterface');
     $this->pathMatcher = new PathMatcher($config_factory_stub, $route_match);
@@ -54,76 +54,76 @@ class PathMatcherTest extends UnitTestCase {
    *   A nested array of pattern arrays and path arrays.
    */
   public function getMatchPathData() {
-    return array(
-      array(
+    return [
+      [
         // Single absolute paths.
         '/example/1',
-        array(
+        [
           '/example/1' => TRUE,
           '/example/2' => FALSE,
           '/test' => FALSE,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         // Single paths with wildcards.
         '/example/*',
-        array(
+        [
           '/example/1' => TRUE,
           '/example/2' => TRUE,
           '/example/3/edit' => TRUE,
           '/example/' => TRUE,
           '/example' => FALSE,
           '/test' => FALSE,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         // Single paths with multiple wildcards.
         '/node/*/revisions/*',
-        array(
+        [
           '/node/1/revisions/3' => TRUE,
           '/node/345/revisions/test' => TRUE,
           '/node/23/edit' => FALSE,
           '/test' => FALSE,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         // Single paths with '<front>'.
         "<front>",
-        array(
+        [
           '/dummy' => TRUE,
           "/dummy/" => FALSE,
           "/dummy/edit" => FALSE,
           '/node' => FALSE,
           '' => FALSE,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         // Paths with both '<front>' and wildcards (should not work).
         "<front>/*",
-        array(
+        [
           '/dummy' => FALSE,
           '/dummy/' => FALSE,
           '/dummy/edit' => FALSE,
           '/node/12' => FALSE,
           '/' => FALSE,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         // Multiple paths with the \n delimiter.
         "/node/*\n/node/*/edit",
-        array(
+        [
           '/node/1' => TRUE,
           '/node/view' => TRUE,
           '/node/32/edit' => TRUE,
           '/node/delete/edit' => TRUE,
           '/node/50/delete' => TRUE,
           '/test/example' => FALSE,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         // Multiple paths with the \r delimiter.
         "/user/*\r/example/*",
-        array(
+        [
           '/user/1' => TRUE,
           '/example/1' => TRUE,
           '/user/1/example/1' => TRUE,
@@ -131,26 +131,26 @@ class PathMatcherTest extends UnitTestCase {
           '/test/example' => FALSE,
           '/user' => FALSE,
           '/example' => FALSE,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         // Multiple paths with the \r\n delimiter.
         "/test\r\n<front>",
-        array(
+        [
           '/test' => TRUE,
           '/dummy' => TRUE,
           '/example' => FALSE,
-        ),
-      ),
-      array(
+        ],
+      ],
+      [
         // Test existing regular expressions (should be escaped).
         '[^/]+?/[0-9]',
-        array(
+        [
           '/test/1' => FALSE,
           '[^/]+?/[0-9]' => TRUE,
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorAliasTest.php b/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorAliasTest.php
index 713a53866..0473d79d7 100644
--- a/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorAliasTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorAliasTest.php
@@ -41,10 +41,10 @@ class PathProcessorAliasTest extends UnitTestCase {
   public function testProcessInbound() {
     $this->aliasManager->expects($this->exactly(2))
       ->method('getPathByAlias')
-      ->will($this->returnValueMap(array(
-        array('urlalias', NULL, 'internal-url'),
-        array('url', NULL, 'url'),
-      )));
+      ->will($this->returnValueMap([
+        ['urlalias', NULL, 'internal-url'],
+        ['url', NULL, 'url'],
+      ]));
 
     $request = Request::create('/urlalias');
     $this->assertEquals('internal-url', $this->pathProcessor->processInbound('urlalias', $request));
@@ -60,10 +60,10 @@ class PathProcessorAliasTest extends UnitTestCase {
   public function testProcessOutbound($path, array $options, $expected_path) {
     $this->aliasManager->expects($this->any())
       ->method('getAliasByPath')
-      ->will($this->returnValueMap(array(
-        array('internal-url', NULL, 'urlalias'),
-        array('url', NULL, 'url'),
-      )));
+      ->will($this->returnValueMap([
+        ['internal-url', NULL, 'urlalias'],
+        ['url', NULL, 'url'],
+      ]));
 
     $bubbleable_metadata = new BubbleableMetadata();
     $this->assertEquals($expected_path, $this->pathProcessor->processOutbound($path, $options, NULL, $bubbleable_metadata));
diff --git a/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorFrontTest.php b/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorFrontTest.php
index 4076f1e05..586259dcd 100644
--- a/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorFrontTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorFrontTest.php
@@ -7,6 +7,7 @@ use Drupal\Core\Config\ImmutableConfig;
 use Drupal\Core\PathProcessor\PathProcessorFront;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Test front page path processing.
@@ -47,7 +48,6 @@ class PathProcessorFrontTest extends UnitTestCase {
    * Test inbound failure with broken config.
    *
    * @covers ::processInbound
-   * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
    */
   public function testProcessInboundBadConfig() {
     $config_factory = $this->prophesize(ConfigFactoryInterface::class);
@@ -57,6 +57,7 @@ class PathProcessorFrontTest extends UnitTestCase {
     $config->get('page.front')
       ->willReturn('');
     $processor = new PathProcessorFront($config_factory->reveal());
+    $this->setExpectedException(NotFoundHttpException::class);
     $processor->processInbound('/', new Request());
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php b/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
index 1134eccab..57dfbfa16 100644
--- a/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
@@ -38,28 +38,28 @@ class PathProcessorTest extends UnitTestCase {
   protected function setUp() {
 
     // Set up some languages to be used by the language-based path processor.
-    $languages = array();
-    foreach (array('en', 'fr') as $langcode) {
-      $language = new Language(array('id' => $langcode));
+    $languages = [];
+    foreach (['en', 'fr'] as $langcode) {
+      $language = new Language(['id' => $langcode]);
       $languages[$langcode] = $language;
     }
     $this->languages = $languages;
 
     // Create a stub configuration.
     $language_prefixes = array_keys($this->languages);
-    $config = array(
-      'url' => array(
+    $config = [
+      'url' => [
         'prefixes' => array_combine($language_prefixes, $language_prefixes)
-      )
-    );
+      ]
+    ];
 
     // Create a URL-based language negotiation method definition.
-    $method_definitions = array(
-      LanguageNegotiationUrl::METHOD_ID => array(
+    $method_definitions = [
+      LanguageNegotiationUrl::METHOD_ID => [
         'class' => '\Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl',
         'weight' => 9,
-      ),
-    );
+      ],
+    ];
 
     // Create a URL-based language negotiation method.
     $method_instance = new LanguageNegotiationUrl($config);
@@ -75,7 +75,7 @@ class PathProcessorTest extends UnitTestCase {
       ->will($this->returnValue($this->languages));
     $language_manager->expects($this->any())
       ->method('getLanguageTypes')
-      ->will($this->returnValue(array(LanguageInterface::TYPE_INTERFACE)));
+      ->will($this->returnValue([LanguageInterface::TYPE_INTERFACE]));
     $language_manager->expects($this->any())
       ->method('getNegotiationMethods')
       ->will($this->returnValue($method_definitions));
@@ -90,21 +90,21 @@ class PathProcessorTest extends UnitTestCase {
   /**
    * Tests resolving the inbound path to the system path.
    */
-  function testProcessInbound() {
+  public function testProcessInbound() {
 
     // Create an alias manager stub.
     $alias_manager = $this->getMockBuilder('Drupal\Core\Path\AliasManager')
       ->disableOriginalConstructor()
       ->getMock();
 
-    $system_path_map = array(
+    $system_path_map = [
       // Set up one proper alias that can be resolved to a system path.
-      array('/foo', NULL, '/user/1'),
+      ['/foo', NULL, '/user/1'],
       // Passing in anything else should return the same string.
-      array('/fr/foo', NULL, '/fr/foo'),
-      array('/fr', NULL, '/fr'),
-      array('/user/login', NULL, '/user/login'),
-    );
+      ['/fr/foo', NULL, '/fr/foo'],
+      ['/fr', NULL, '/fr'],
+      ['/user/login', NULL, '/user/login'],
+    ];
 
     $alias_manager->expects($this->any())
       ->method('getPathByAlias')
@@ -113,16 +113,17 @@ class PathProcessorTest extends UnitTestCase {
     // Create a stub config factory with all config settings that will be checked
     // during this test.
     $config_factory_stub = $this->getConfigFactoryStub(
-      array(
-        'system.site' => array(
+      [
+        'system.site' => [
           'page.front' => '/user/login'
-        ),
-        'language.negotiation' => array(
-          'url' => array(
-            'prefixes' => array('fr' => 'fr'),
-          ),
-        ),
-      )
+        ],
+        'language.negotiation' => [
+          'url' => [
+            'prefixes' => ['fr' => 'fr'],
+            'source' => LanguageNegotiationUrl::CONFIG_PATH_PREFIX,
+          ],
+        ],
+      ]
     );
 
     // Create a language negotiator stub.
@@ -130,10 +131,10 @@ class PathProcessorTest extends UnitTestCase {
       ->getMock();
     $negotiator->expects($this->any())
       ->method('getNegotiationMethods')
-      ->will($this->returnValue(array(LanguageNegotiationUrl::METHOD_ID => array(
+      ->will($this->returnValue([LanguageNegotiationUrl::METHOD_ID => [
         'class' => 'Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl',
         'weight' => 9,
-        ))));
+        ]]));
     $method = new LanguageNegotiationUrl();
     $method->setConfig($config_factory_stub);
     $method->setLanguageManager($this->languageManager);
@@ -159,12 +160,12 @@ class PathProcessorTest extends UnitTestCase {
     // First, test the processor manager with the processors in the incorrect
     // order. The alias processor will run before the language processor, meaning
     // aliases will not be found.
-    $priorities = array(
+    $priorities = [
       1000 => $alias_processor,
       500 => $decode_processor,
       300 => $front_processor,
       200 => $language_processor,
-    );
+    ];
 
     // Create the processor manager and add the processors.
     $processor_manager = new PathProcessorManager();
@@ -187,12 +188,12 @@ class PathProcessorTest extends UnitTestCase {
     // Now create a new processor manager and add the processors, this time in
     // the correct order.
     $processor_manager = new PathProcessorManager();
-    $priorities = array(
+    $priorities = [
       1000 => $decode_processor,
       500 => $language_processor,
       300 => $front_processor,
       200 => $alias_processor,
-    );
+    ];
     foreach ($priorities as $priority => $processor) {
       $processor_manager->addInbound($processor, $priority);
     }
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionTest.php
index fb1a44229..6eda2e364 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextDefinitionTest.php
@@ -19,10 +19,10 @@ class ContextDefinitionTest extends UnitTestCase {
    * Very simple data provider.
    */
   public function providerGetDataDefinition() {
-    return array(
-      array(TRUE),
-      array(FALSE),
-    );
+    return [
+      [TRUE],
+      [FALSE],
+    ];
   }
 
   /**
@@ -33,13 +33,13 @@ class ContextDefinitionTest extends UnitTestCase {
   public function testGetDataDefinition($is_multiple) {
     $data_type = 'valid';
     $mock_data_definition = $this->getMockBuilder('\Drupal\Core\TypedData\ListDataDefinitionInterface')
-      ->setMethods(array(
+      ->setMethods([
         'setLabel',
         'setDescription',
         'setRequired',
         'getConstraints',
         'setConstraints',
-      ))
+      ])
       ->getMockForAbstractClass();
     $mock_data_definition->expects($this->once())
       ->method('setLabel')
@@ -52,7 +52,7 @@ class ContextDefinitionTest extends UnitTestCase {
       ->willReturnSelf();
     $mock_data_definition->expects($this->once())
       ->method('getConstraints')
-      ->willReturn(array());
+      ->willReturn([]);
     $mock_data_definition->expects($this->once())
       ->method('setConstraints')
       ->willReturn(NULL);
@@ -67,16 +67,16 @@ class ContextDefinitionTest extends UnitTestCase {
     // valid data type.
     $mock_data_manager->expects($this->once())
       ->method($create_definition_method)
-      ->willReturnMap(array(
-        array('not_valid', NULL),
-        array('valid', $mock_data_definition),
-      ));
+      ->willReturnMap([
+        ['not_valid', NULL],
+        ['valid', $mock_data_definition],
+      ]);
 
     // Mock a ContextDefinition object, setting up expectations for many of the
     // methods.
     $mock_context_definition = $this->getMockBuilder('Drupal\Core\Plugin\Context\ContextDefinition')
       ->disableOriginalConstructor()
-      ->setMethods(array(
+      ->setMethods([
         'isMultiple',
         'getTypedDataManager',
         'getDataType',
@@ -85,7 +85,7 @@ class ContextDefinitionTest extends UnitTestCase {
         'isRequired',
         'getConstraints',
         'setConstraints',
-      ))
+      ])
       ->getMock();
     $mock_context_definition->expects($this->once())
       ->method('isMultiple')
@@ -98,7 +98,7 @@ class ContextDefinitionTest extends UnitTestCase {
       ->willReturn($data_type);
     $mock_context_definition->expects($this->once())
       ->method('getConstraints')
-      ->willReturn(array());
+      ->willReturn([]);
 
     $this->assertSame(
       $mock_data_definition,
@@ -107,7 +107,6 @@ class ContextDefinitionTest extends UnitTestCase {
   }
 
   /**
-   * @expectedException \Exception
    * @dataProvider providerGetDataDefinition
    * @covers ::getDataDefinition
    * @uses \Drupal
@@ -130,20 +129,20 @@ class ContextDefinitionTest extends UnitTestCase {
     // will eventually cause getDataDefinition() to throw an exception.
     $mock_data_manager->expects($this->once())
       ->method($create_definition_method)
-      ->willReturnMap(array(
-        array('not_valid', NULL),
-        array('valid', $mock_data_definition),
-      ));
+      ->willReturnMap([
+        ['not_valid', NULL],
+        ['valid', $mock_data_definition],
+      ]);
 
     // Mock a ContextDefinition object with expectations for only the methods
     // that will be called before the expected exception.
     $mock_context_definition = $this->getMockBuilder('Drupal\Core\Plugin\Context\ContextDefinition')
       ->disableOriginalConstructor()
-      ->setMethods(array(
+      ->setMethods([
         'isMultiple',
         'getTypedDataManager',
         'getDataType',
-      ))
+      ])
       ->getMock();
     $mock_context_definition->expects($this->once())
       ->method('isMultiple')
@@ -155,26 +154,24 @@ class ContextDefinitionTest extends UnitTestCase {
       ->method('getDataType')
       ->willReturn($data_type);
 
-    $this->assertSame(
-      $mock_data_definition,
-      $mock_context_definition->getDataDefinition()
-    );
+    $this->setExpectedException(\Exception::class);
+    $mock_context_definition->getDataDefinition();
   }
 
   /**
    * Data provider for testGetConstraint
    */
   public function providerGetConstraint() {
-    return array(
-      array(NULL, array(), 'nonexistent_constraint_name'),
-      array(
+    return [
+      [NULL, [], 'nonexistent_constraint_name'],
+      [
         'not_null',
-        array(
+        [
           'constraint_name' => 'not_null',
-        ),
+        ],
         'constraint_name',
-      ),
-    );
+      ],
+    ];
   }
 
   /**
@@ -185,9 +182,9 @@ class ContextDefinitionTest extends UnitTestCase {
   public function testGetConstraint($expected, $constraint_array, $constraint) {
     $mock_context_definition = $this->getMockBuilder('Drupal\Core\Plugin\Context\ContextDefinition')
       ->disableOriginalConstructor()
-      ->setMethods(array(
+      ->setMethods([
         'getConstraints',
-      ))
+      ])
       ->getMock();
     $mock_context_definition->expects($this->once())
       ->method('getConstraints')
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php
index c0d750e0e..e9b596438 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php
@@ -89,7 +89,7 @@ class ContextTest extends UnitTestCase {
   public function testSetContextValueTypedData() {
 
     $this->contextDefinition = $this->getMockBuilder('Drupal\Core\Plugin\Context\ContextDefinitionInterface')
-      ->setMethods(array('getDefaultValue', 'getDataDefinition'))
+      ->setMethods(['getDefaultValue', 'getDataDefinition'])
       ->getMockForAbstractClass();
 
     $typed_data = $this->getMock('Drupal\Core\TypedData\TypedDataInterface');
@@ -144,7 +144,7 @@ class ContextTest extends UnitTestCase {
     $mock_data_definition = $this->getMock('Drupal\Core\TypedData\DataDefinitionInterface');
 
     $this->contextDefinition = $this->getMockBuilder('Drupal\Core\Plugin\Context\ContextDefinitionInterface')
-      ->setMethods(array('getDefaultValue', 'getDataDefinition'))
+      ->setMethods(['getDefaultValue', 'getDataDefinition'])
       ->getMockForAbstractClass();
 
     $this->contextDefinition->expects($this->once())
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTypedDataTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTypedDataTest.php
index dfc936128..aac6efc0e 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTypedDataTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTypedDataTest.php
@@ -38,7 +38,7 @@ class ContextTypedDataTest extends UnitTestCase {
     $typed_data_manager = $this->getMock(TypedDataManagerInterface::class);
     $typed_data_manager->expects($this->once())
       ->method('getCanonicalRepresentation')
-      ->will($this->returnCallback(array($this, 'getCanonicalRepresentation')));
+      ->will($this->returnCallback([$this, 'getCanonicalRepresentation']));
     $container = new ContainerBuilder();
     $container->set('typed_data_manager', $typed_data_manager);
     \Drupal::setContainer($container);
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php
index 02fea3277..6fe21c18e 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php
@@ -66,11 +66,10 @@ class LazyContextRepositoryTest extends UnitTestCase {
 
   /**
    * @covers ::getRuntimeContexts
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage You must provide the context IDs in the @{service_id}:{unqualified_context_id} format.
    */
   public function testInvalidContextId() {
     $lazy_context_repository = new LazyContextRepository($this->container, ['test_provider']);
+    $this->setExpectedException(\InvalidArgumentException::class, 'You must provide the context IDs in the @{service_id}:{unqualified_context_id} format.');
     $lazy_context_repository->getRuntimeContexts(['test_context', '@test_provider:test_context1']);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
index 981f4c228..4ed5e6eb6 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\Core\Plugin;
 
 use Drupal\Component\Plugin\ConfigurablePluginInterface;
+use Drupal\Component\Plugin\Exception\ContextException;
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\Core\Plugin\Context\ContextHandler;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
@@ -62,7 +63,7 @@ class ContextHandlerTest extends UnitTestCase {
       ->will($this->returnValue(new ContextDefinition('empty')));
 
     $requirement_specific = new ContextDefinition('specific');
-    $requirement_specific->setConstraints(array('bar' => 'baz'));
+    $requirement_specific->setConstraints(['bar' => 'baz']);
 
     $context_constraint_mismatch = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_constraint_mismatch->expects($this->atLeastOnce())
@@ -74,21 +75,21 @@ class ContextHandlerTest extends UnitTestCase {
       ->will($this->returnValue(new ContextDefinition('fuzzy')));
 
     $context_definition_specific = new ContextDefinition('specific');
-    $context_definition_specific->setConstraints(array('bar' => 'baz'));
+    $context_definition_specific->setConstraints(['bar' => 'baz']);
     $context_specific = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_specific->expects($this->atLeastOnce())
       ->method('getContextDefinition')
       ->will($this->returnValue($context_definition_specific));
 
-    $data = array();
-    $data[] = array(array(), array(), TRUE);
-    $data[] = array(array(), array($requirement_any), FALSE);
-    $data[] = array(array(), array($requirement_optional), TRUE);
-    $data[] = array(array(), array($requirement_any, $requirement_optional), FALSE);
-    $data[] = array(array($context_any), array($requirement_any), TRUE);
-    $data[] = array(array($context_constraint_mismatch), array($requirement_specific), FALSE);
-    $data[] = array(array($context_datatype_mismatch), array($requirement_specific), FALSE);
-    $data[] = array(array($context_specific), array($requirement_specific), TRUE);
+    $data = [];
+    $data[] = [[], [], TRUE];
+    $data[] = [[], [$requirement_any], FALSE];
+    $data[] = [[], [$requirement_optional], TRUE];
+    $data[] = [[], [$requirement_any, $requirement_optional], FALSE];
+    $data[] = [[$context_any], [$requirement_any], TRUE];
+    $data[] = [[$context_constraint_mismatch], [$requirement_specific], FALSE];
+    $data[] = [[$context_datatype_mismatch], [$requirement_specific], FALSE];
+    $data[] = [[$context_specific], [$requirement_specific], TRUE];
 
     return $data;
   }
@@ -112,7 +113,7 @@ class ContextHandlerTest extends UnitTestCase {
     $requirement_any = new ContextDefinition();
 
     $requirement_specific = new ContextDefinition('specific');
-    $requirement_specific->setConstraints(array('bar' => 'baz'));
+    $requirement_specific->setConstraints(['bar' => 'baz']);
 
     $context_any = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_any->expects($this->atLeastOnce())
@@ -127,24 +128,24 @@ class ContextHandlerTest extends UnitTestCase {
       ->method('getContextDefinition')
       ->will($this->returnValue(new ContextDefinition('fuzzy')));
     $context_definition_specific = new ContextDefinition('specific');
-    $context_definition_specific->setConstraints(array('bar' => 'baz'));
+    $context_definition_specific->setConstraints(['bar' => 'baz']);
     $context_specific = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_specific->expects($this->atLeastOnce())
       ->method('getContextDefinition')
       ->will($this->returnValue($context_definition_specific));
 
-    $data = array();
+    $data = [];
     // No context will return no valid contexts.
-    $data[] = array(array(), $requirement_any);
+    $data[] = [[], $requirement_any];
     // A context with a generic matching requirement is valid.
-    $data[] = array(array($context_any), $requirement_any);
+    $data[] = [[$context_any], $requirement_any];
     // A context with a specific matching requirement is valid.
-    $data[] = array(array($context_specific), $requirement_specific);
+    $data[] = [[$context_specific], $requirement_specific];
 
     // A context with a mismatched constraint is invalid.
-    $data[] = array(array($context_constraint_mismatch), $requirement_specific, array());
+    $data[] = [[$context_constraint_mismatch], $requirement_specific, []];
     // A context with a mismatched datatype is invalid.
-    $data[] = array(array($context_datatype_mismatch), $requirement_specific, array());
+    $data[] = [[$context_datatype_mismatch], $requirement_specific, []];
 
     return $data;
   }
@@ -157,14 +158,14 @@ class ContextHandlerTest extends UnitTestCase {
   public function testFilterPluginDefinitionsByContexts($has_context, $definitions, $expected) {
     if ($has_context) {
       $context = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
-      $expected_context_definition = (new ContextDefinition('expected_data_type'))->setConstraints(array('expected_constraint_name' => 'expected_constraint_value'));
+      $expected_context_definition = (new ContextDefinition('expected_data_type'))->setConstraints(['expected_constraint_name' => 'expected_constraint_value']);
       $context->expects($this->atLeastOnce())
         ->method('getContextDefinition')
         ->will($this->returnValue($expected_context_definition));
-      $contexts = array($context);
+      $contexts = [$context];
     }
     else {
-      $contexts = array();
+      $contexts = [];
     }
 
     $this->assertSame($expected, $this->contextHandler->filterPluginDefinitionsByContexts($contexts, $definitions));
@@ -174,55 +175,55 @@ class ContextHandlerTest extends UnitTestCase {
    * Provides data for testFilterPluginDefinitionsByContexts().
    */
   public function providerTestFilterPluginDefinitionsByContexts() {
-    $data = array();
+    $data = [];
 
-    $plugins = array();
+    $plugins = [];
     // No context and no plugins, no plugins available.
-    $data[] = array(FALSE, $plugins, array());
+    $data[] = [FALSE, $plugins, []];
 
-    $plugins = array('expected_plugin' => array());
+    $plugins = ['expected_plugin' => []];
     // No context, all plugins available.
-    $data[] = array(FALSE, $plugins, $plugins);
+    $data[] = [FALSE, $plugins, $plugins];
 
-    $plugins = array('expected_plugin' => array('context' => array()));
+    $plugins = ['expected_plugin' => ['context' => []]];
     // No context, all plugins available.
-    $data[] = array(FALSE, $plugins, $plugins);
+    $data[] = [FALSE, $plugins, $plugins];
 
-    $plugins = array('expected_plugin' => array('context' => array('context1' => new ContextDefinition('expected_data_type'))));
+    $plugins = ['expected_plugin' => ['context' => ['context1' => new ContextDefinition('expected_data_type')]]];
     // Missing context, no plugins available.
-    $data[] = array(FALSE, $plugins, array());
+    $data[] = [FALSE, $plugins, []];
     // Satisfied context, all plugins available.
-    $data[] = array(TRUE, $plugins, $plugins);
+    $data[] = [TRUE, $plugins, $plugins];
 
-    $mismatched_context_definition = (new ContextDefinition('expected_data_type'))->setConstraints(array('mismatched_constraint_name' => 'mismatched_constraint_value'));
-    $plugins = array('expected_plugin' => array('context' => array('context1' => $mismatched_context_definition)));
+    $mismatched_context_definition = (new ContextDefinition('expected_data_type'))->setConstraints(['mismatched_constraint_name' => 'mismatched_constraint_value']);
+    $plugins = ['expected_plugin' => ['context' => ['context1' => $mismatched_context_definition]]];
     // Mismatched constraints, no plugins available.
-    $data[] = array(TRUE, $plugins, array());
+    $data[] = [TRUE, $plugins, []];
 
     $optional_mismatched_context_definition = clone $mismatched_context_definition;
     $optional_mismatched_context_definition->setRequired(FALSE);
-    $plugins = array('expected_plugin' => array('context' => array('context1' => $optional_mismatched_context_definition)));
+    $plugins = ['expected_plugin' => ['context' => ['context1' => $optional_mismatched_context_definition]]];
     // Optional mismatched constraint, all plugins available.
-    $data[] = array(FALSE, $plugins, $plugins);
+    $data[] = [FALSE, $plugins, $plugins];
 
-    $expected_context_definition = (new ContextDefinition('expected_data_type'))->setConstraints(array('expected_constraint_name' => 'expected_constraint_value'));
-    $plugins = array('expected_plugin' => array('context' => array('context1' => $expected_context_definition)));
+    $expected_context_definition = (new ContextDefinition('expected_data_type'))->setConstraints(['expected_constraint_name' => 'expected_constraint_value']);
+    $plugins = ['expected_plugin' => ['context' => ['context1' => $expected_context_definition]]];
     // Satisfied context with constraint, all plugins available.
-    $data[] = array(TRUE, $plugins, $plugins);
+    $data[] = [TRUE, $plugins, $plugins];
 
     $optional_expected_context_definition = clone $expected_context_definition;
     $optional_expected_context_definition->setRequired(FALSE);
-    $plugins = array('expected_plugin' => array('context' => array('context1' => $optional_expected_context_definition)));
+    $plugins = ['expected_plugin' => ['context' => ['context1' => $optional_expected_context_definition]]];
     // Optional unsatisfied context, all plugins available.
-    $data[] = array(FALSE, $plugins, $plugins);
+    $data[] = [FALSE, $plugins, $plugins];
 
-    $unexpected_context_definition = (new ContextDefinition('unexpected_data_type'))->setConstraints(array('mismatched_constraint_name' => 'mismatched_constraint_value'));
-    $plugins = array(
-      'unexpected_plugin' => array('context' => array('context1' => $unexpected_context_definition)),
-      'expected_plugin' => array('context' => array('context2' => new ContextDefinition('expected_data_type'))),
-    );
+    $unexpected_context_definition = (new ContextDefinition('unexpected_data_type'))->setConstraints(['mismatched_constraint_name' => 'mismatched_constraint_value']);
+    $plugins = [
+      'unexpected_plugin' => ['context' => ['context1' => $unexpected_context_definition]],
+      'expected_plugin' => ['context' => ['context2' => new ContextDefinition('expected_data_type')]],
+    ];
     // Context only satisfies one plugin.
-    $data[] = array(TRUE, $plugins, array('expected_plugin' => $plugins['expected_plugin']));
+    $data[] = [TRUE, $plugins, ['expected_plugin' => $plugins['expected_plugin']]];
 
     return $data;
   }
@@ -246,10 +247,10 @@ class ContextHandlerTest extends UnitTestCase {
     $context_miss->expects($this->never())
       ->method('getContextData');
 
-    $contexts = array(
+    $contexts = [
       'hit' => $context_hit,
       'miss' => $context_miss,
-    );
+    ];
 
     $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
 
@@ -259,7 +260,7 @@ class ContextHandlerTest extends UnitTestCase {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('hit' => $context_definition)));
+      ->will($this->returnValue(['hit' => $context_definition]));
     $plugin->expects($this->once())
       ->method('setContextValue')
       ->with('hit', $context_hit_data);
@@ -279,18 +280,15 @@ class ContextHandlerTest extends UnitTestCase {
 
   /**
    * @covers ::applyContextMapping
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\ContextException
-   * @expectedExceptionMessage Required contexts without a value: hit.
    */
   public function testApplyContextMappingMissingRequired() {
     $context = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context->expects($this->never())
       ->method('getContextValue');
 
-    $contexts = array(
+    $contexts = [
       'name' => $context,
-    );
+    ];
 
     $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
     $context_definition->expects($this->atLeastOnce())
@@ -303,7 +301,7 @@ class ContextHandlerTest extends UnitTestCase {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('hit' => $context_definition)));
+      ->will($this->returnValue(['hit' => $context_definition]));
     $plugin->expects($this->never())
       ->method('setContextValue');
 
@@ -311,6 +309,7 @@ class ContextHandlerTest extends UnitTestCase {
     $plugin->expects($this->never())
       ->method('getContext');
 
+    $this->setExpectedException(ContextException::class, 'Required contexts without a value: hit.');
     $this->contextHandler->applyContextMapping($plugin, $contexts);
   }
 
@@ -322,9 +321,9 @@ class ContextHandlerTest extends UnitTestCase {
     $context->expects($this->never())
       ->method('getContextValue');
 
-    $contexts = array(
+    $contexts = [
       'name' => $context,
-    );
+    ];
 
     $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
     $context_definition->expects($this->atLeastOnce())
@@ -337,7 +336,7 @@ class ContextHandlerTest extends UnitTestCase {
       ->willReturn(['optional' => 'missing']);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('optional' => $context_definition)));
+      ->will($this->returnValue(['optional' => $context_definition]));
     $plugin->expects($this->never())
       ->method('setContextValue');
 
@@ -350,9 +349,6 @@ class ContextHandlerTest extends UnitTestCase {
 
   /**
    * @covers ::applyContextMapping
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\ContextException
-   * @expectedExceptionMessage Required contexts without a value: hit.
    */
   public function testApplyContextMappingNoValueRequired() {
     $context = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
@@ -362,9 +358,9 @@ class ContextHandlerTest extends UnitTestCase {
       ->method('hasContextValue')
       ->willReturn(FALSE);
 
-    $contexts = array(
+    $contexts = [
       'hit' => $context,
-    );
+    ];
 
     $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
     $context_definition->expects($this->atLeastOnce())
@@ -377,10 +373,11 @@ class ContextHandlerTest extends UnitTestCase {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('hit' => $context_definition)));
+      ->will($this->returnValue(['hit' => $context_definition]));
     $plugin->expects($this->never())
       ->method('setContextValue');
 
+    $this->setExpectedException(ContextException::class, 'Required contexts without a value: hit.');
     $this->contextHandler->applyContextMapping($plugin, $contexts);
   }
 
@@ -396,9 +393,9 @@ class ContextHandlerTest extends UnitTestCase {
       ->method('hasContextValue')
       ->willReturn(FALSE);
 
-    $contexts = array(
+    $contexts = [
       'hit' => $context,
-    );
+    ];
 
     $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
     $context_definition->expects($this->atLeastOnce())
@@ -411,7 +408,7 @@ class ContextHandlerTest extends UnitTestCase {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('hit' => $context_definition)));
+      ->will($this->returnValue(['hit' => $context_definition]));
     $plugin->expects($this->never())
       ->method('setContextValue');
 
@@ -432,9 +429,9 @@ class ContextHandlerTest extends UnitTestCase {
       ->method('hasContextValue')
       ->willReturn(TRUE);
 
-    $contexts = array(
+    $contexts = [
       'name' => $context,
-    );
+    ];
 
     $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
 
@@ -444,7 +441,7 @@ class ContextHandlerTest extends UnitTestCase {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('hit' => $context_definition)));
+      ->will($this->returnValue(['hit' => $context_definition]));
     $plugin->expects($this->once())
       ->method('setContextValue')
       ->with('hit', $context_data);
@@ -464,18 +461,15 @@ class ContextHandlerTest extends UnitTestCase {
 
   /**
    * @covers ::applyContextMapping
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\ContextException
-   * @expectedExceptionMessage Assigned contexts were not satisfied: miss
    */
   public function testApplyContextMappingConfigurableAssignedMiss() {
     $context = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context->expects($this->never())
       ->method('getContextValue');
 
-    $contexts = array(
+    $contexts = [
       'name' => $context,
-    );
+    ];
 
     $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
 
@@ -485,10 +479,11 @@ class ContextHandlerTest extends UnitTestCase {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('hit' => $context_definition)));
+      ->will($this->returnValue(['hit' => $context_definition]));
     $plugin->expects($this->never())
       ->method('setContextValue');
 
+    $this->setExpectedException(ContextException::class, 'Assigned contexts were not satisfied: miss');
     $this->contextHandler->applyContextMapping($plugin, $contexts, ['miss' => 'name']);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/DefaultLazyPluginCollectionTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/DefaultLazyPluginCollectionTest.php
index fbd6bc29f..01b7cd1cc 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/DefaultLazyPluginCollectionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/DefaultLazyPluginCollectionTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\Core\Plugin;
 
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Tests\Core\Plugin\Fixtures\TestConfigurablePlugin;
 
 /**
@@ -43,11 +44,10 @@ class DefaultLazyPluginCollectionTest extends LazyPluginCollectionTestBase {
 
   /**
    * @covers ::get
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginNotFoundException
-   * @expectedExceptionMessage Plugin ID 'pear' was not found.
    */
   public function testGetNotExistingPlugin() {
     $this->setupPluginCollection();
+    $this->setExpectedException(PluginNotFoundException::class, "Plugin ID 'pear' was not found.");
     $this->defaultPluginCollection->get('pear');
   }
 
@@ -58,12 +58,12 @@ class DefaultLazyPluginCollectionTest extends LazyPluginCollectionTestBase {
    *   The test data.
    */
   public function providerTestSortHelper() {
-    return array(
-      array('apple', 'apple', 0),
-      array('apple', 'cherry', -1),
-      array('cherry', 'apple', 1),
-      array('cherry', 'banana', 1),
-    );
+    return [
+      ['apple', 'apple', 0],
+      ['apple', 'cherry', -1],
+      ['cherry', 'apple', 1],
+      ['cherry', 'banana', 1],
+    ];
   }
 
   /**
@@ -91,7 +91,7 @@ class DefaultLazyPluginCollectionTest extends LazyPluginCollectionTestBase {
   public function testGetConfiguration() {
     $this->setupPluginCollection($this->exactly(3));
     // The expected order matches $this->config.
-    $expected = array('banana', 'cherry', 'apple');
+    $expected = ['banana', 'cherry', 'apple'];
 
     $config = $this->defaultPluginCollection->getConfiguration();
     $this->assertSame($expected, array_keys($config), 'The order of the configuration is unchanged.');
@@ -113,21 +113,21 @@ class DefaultLazyPluginCollectionTest extends LazyPluginCollectionTestBase {
    */
   public function testAddInstanceId() {
     $this->setupPluginCollection($this->exactly(4));
-    $expected = array(
+    $expected = [
       'banana' => 'banana',
       'cherry' => 'cherry',
       'apple' => 'apple',
-    );
+    ];
     $this->defaultPluginCollection->addInstanceId('apple');
     $result = $this->defaultPluginCollection->getInstanceIds();
     $this->assertSame($expected, $result);
     $this->assertSame($expected, array_intersect_key($result, $this->defaultPluginCollection->getConfiguration()));
 
-    $expected = array(
+    $expected = [
       'cherry' => 'cherry',
       'apple' => 'apple',
       'banana' => 'banana',
-    );
+    ];
     $this->defaultPluginCollection->removeInstanceId('banana');
     $this->defaultPluginCollection->addInstanceId('banana', $this->config['banana']);
 
@@ -151,11 +151,11 @@ class DefaultLazyPluginCollectionTest extends LazyPluginCollectionTestBase {
    */
   public function testSetInstanceConfiguration() {
     $this->setupPluginCollection($this->exactly(3));
-    $expected = array(
+    $expected = [
       'id' => 'cherry',
       'key' => 'value',
       'custom' => 'bananas',
-    );
+    ];
     $this->defaultPluginCollection->setInstanceConfiguration('cherry', $expected);
     $config = $this->defaultPluginCollection->getConfiguration();
     $this->assertSame($expected, $config['cherry']);
@@ -189,12 +189,12 @@ class DefaultLazyPluginCollectionTest extends LazyPluginCollectionTestBase {
     $this->defaultPluginCollection->set('cherry2', $instance);
     $this->defaultPluginCollection->setInstanceConfiguration('cherry2', $this->config['cherry']);
 
-    $expected = array(
+    $expected = [
       'banana',
       'cherry',
       'apple',
       'cherry2',
-    );
+    ];
     $config = $this->defaultPluginCollection->getConfiguration();
     $this->assertSame($expected, array_keys($config));
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
index ffdac5a37..c65de3572 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\Core\Plugin;
 
+use Drupal\Component\Plugin\Definition\PluginDefinition;
+use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\PluginFormInterface;
@@ -34,27 +36,27 @@ class DefaultPluginManagerTest extends UnitTestCase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->expectedDefinitions = array(
-      'apple' => array(
+    $this->expectedDefinitions = [
+      'apple' => [
         'id' => 'apple',
         'label' => 'Apple',
         'color' => 'green',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Apple',
-      ),
-      'banana' => array(
+      ],
+      'banana' => [
         'id' => 'banana',
         'label' => 'Banana',
         'color' => 'yellow',
-        'uses' => array(
+        'uses' => [
           'bread' => 'Banana bread',
-          'loaf' => array(
+          'loaf' => [
             'singular' => '@count loaf',
             'plural' => '@count loaves',
-          ),
-        ),
+          ],
+        ],
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Banana',
-      ),
-    );
+      ],
+    ];
 
     $this->namespaces = new \ArrayObject();
     $this->namespaces['Drupal\plugin_test'] = $this->root . '/core/modules/system/tests/modules/plugin_test/src';
@@ -64,14 +66,14 @@ class DefaultPluginManagerTest extends UnitTestCase {
    * Tests the plugin manager with a plugin that extends a non-installed class.
    */
   public function testDefaultPluginManagerWithPluginExtendingNonInstalledClass() {
-    $definitions = array();
-    $definitions['extending_non_installed_class'] = array(
+    $definitions = [];
+    $definitions['extending_non_installed_class'] = [
       'id' => 'extending_non_installed_class',
       'label' => 'A plugin whose class is extending from a non-installed module class',
       'color' => 'pink',
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\ExtendingNonInstalledClass',
       'provider' => 'plugin_test',
-    );
+    ];
 
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $plugin_manager = new TestPluginManager($this->namespaces, $definitions, $module_handler, 'test_alter_hook', '\Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface');
@@ -84,13 +86,13 @@ class DefaultPluginManagerTest extends UnitTestCase {
    */
   public function testDefaultPluginManagerWithDisabledModule() {
     $definitions = $this->expectedDefinitions;
-    $definitions['cherry'] = array(
+    $definitions['cherry'] = [
       'id' => 'cherry',
       'label' => 'Cherry',
       'color' => 'red',
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry',
       'provider' => 'disabled_module',
-    );
+    ];
 
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
 
@@ -109,13 +111,13 @@ class DefaultPluginManagerTest extends UnitTestCase {
    */
   public function testDefaultPluginManagerWithObjects() {
     $definitions = $this->expectedDefinitions;
-    $definitions['cherry'] = (object) array(
+    $definitions['cherry'] = (object) [
       'id' => 'cherry',
       'label' => 'Cherry',
       'color' => 'red',
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry',
       'provider' => 'disabled_module',
-    );
+    ];
 
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
 
@@ -195,7 +197,7 @@ class DefaultPluginManagerTest extends UnitTestCase {
       ->expects($this->once())
       ->method('get')
       ->with($cid)
-      ->will($this->returnValue((object) array('data' => $this->expectedDefinitions)));
+      ->will($this->returnValue((object) ['data' => $this->expectedDefinitions]));
     $cache_backend
       ->expects($this->never())
       ->method('set');
@@ -240,7 +242,7 @@ class DefaultPluginManagerTest extends UnitTestCase {
     $cache_tags_invalidator
       ->expects($this->once())
       ->method('invalidateTags')
-      ->with(array('tag'));
+      ->with(['tag']);
     $cache_backend
       ->expects($this->never())
       ->method('deleteMultiple');
@@ -248,7 +250,7 @@ class DefaultPluginManagerTest extends UnitTestCase {
     $this->getContainerWithCacheTagsInvalidator($cache_tags_invalidator);
 
     $plugin_manager = new TestPluginManager($this->namespaces, $this->expectedDefinitions, NULL, NULL, '\Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface');
-    $plugin_manager->setCacheBackend($cache_backend, $cid, array('tag'));
+    $plugin_manager->setCacheBackend($cache_backend, $cid, ['tag']);
 
     $plugin_manager->clearCachedDefinitions();
   }
@@ -270,9 +272,6 @@ class DefaultPluginManagerTest extends UnitTestCase {
    * Tests plugins without the proper interface.
    *
    * @covers ::createInstance
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginException
-   * @expectedExceptionMessage Plugin "kale" (Drupal\plugin_test\Plugin\plugin_test\fruit\Kale) must implement interface \Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface
    */
   public function testCreateInstanceWithInvalidInterfaces() {
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
@@ -282,17 +281,18 @@ class DefaultPluginManagerTest extends UnitTestCase {
       ->with('plugin_test')
       ->willReturn(TRUE);
 
-    $this->expectedDefinitions['kale'] = array(
+    $this->expectedDefinitions['kale'] = [
       'id' => 'kale',
       'label' => 'Kale',
       'color' => 'green',
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Kale',
       'provider' => 'plugin_test',
-    );
+    ];
     $this->expectedDefinitions['apple']['provider'] = 'plugin_test';
     $this->expectedDefinitions['banana']['provider'] = 'plugin_test';
 
     $plugin_manager = new TestPluginManager($this->namespaces, $this->expectedDefinitions, $module_handler, NULL, '\Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface');
+    $this->setExpectedException(PluginException::class, 'Plugin "kale" (Drupal\plugin_test\Plugin\plugin_test\fruit\Kale) must implement interface \Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface');
     $plugin_manager->createInstance('kale');
   }
 
@@ -309,13 +309,13 @@ class DefaultPluginManagerTest extends UnitTestCase {
       ->with('plugin_test')
       ->willReturn(FALSE);
 
-    $this->expectedDefinitions['kale'] = array(
+    $this->expectedDefinitions['kale'] = [
       'id' => 'kale',
       'label' => 'Kale',
       'color' => 'green',
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Kale',
       'provider' => 'plugin_test',
-    );
+    ];
     $this->expectedDefinitions['apple']['provider'] = 'plugin_test';
     $this->expectedDefinitions['banana']['provider'] = 'plugin_test';
 
@@ -359,6 +359,32 @@ class DefaultPluginManagerTest extends UnitTestCase {
     $this->assertInternalType('int', $cache_max_age);
   }
 
+  /**
+   * @covers ::findDefinitions
+   * @covers ::extractProviderFromDefinition
+   */
+  public function testProviderExists() {
+    $definitions = [];
+    $definitions['array_based_found'] = ['provider' => 'module_found'];
+    $definitions['array_based_missing'] = ['provider' => 'module_missing'];
+    $definitions['stdclass_based_found'] = (object) ['provider' => 'module_found'];
+    $definitions['stdclass_based_missing'] = (object) ['provider' => 'module_missing'];
+    $definitions['classed_object_found'] = new ObjectDefinition(['provider' => 'module_found']);
+    $definitions['classed_object_missing'] = new ObjectDefinition(['provider' => 'module_missing']);
+
+    $expected = [];
+    $expected['array_based_found'] = $definitions['array_based_found'];
+    $expected['stdclass_based_found'] = $definitions['stdclass_based_found'];
+    $expected['classed_object_found'] = $definitions['classed_object_found'];
+
+    $module_handler = $this->prophesize(ModuleHandlerInterface::class);
+    $module_handler->moduleExists('module_found')->willReturn(TRUE)->shouldBeCalled();
+    $module_handler->moduleExists('module_missing')->willReturn(FALSE)->shouldBeCalled();
+    $plugin_manager = new TestPluginManager($this->namespaces, $definitions, $module_handler->reveal());
+    $result = $plugin_manager->getDefinitions();
+    $this->assertEquals($expected, $result);
+  }
+
   /**
    * @covers ::processDefinition
    * @dataProvider providerTestProcessDefinition
@@ -411,6 +437,17 @@ class DefaultPluginManagerTest extends UnitTestCase {
       'forms' => ['configure' => 'stdClass'],
       'foo' => ['bar' => ['baz']],
     ];
+
+    $data['class_with_slashes'][] = [
+      'class' => '\Drupal\Tests\Core\Plugin\TestPluginForm',
+    ];
+    $data['class_with_slashes'][] = [
+      'class' => 'Drupal\Tests\Core\Plugin\TestPluginForm',
+      'foo' => ['bar' => ['baz']],
+    ];
+
+    $data['object_with_class_with_slashes'][] = (new PluginDefinition())->setClass('\Drupal\Tests\Core\Plugin\TestPluginForm');
+    $data['object_with_class_with_slashes'][] = (new PluginDefinition())->setClass('Drupal\Tests\Core\Plugin\TestPluginForm');
     return $data;
   }
 
@@ -453,3 +490,17 @@ class TestPluginForm implements PluginFormInterface {
   }
 
 }
+class ObjectDefinition extends PluginDefinition {
+
+  /**
+   * ObjectDefinition constructor.
+   *
+   * @param array $definition
+   */
+  public function __construct(array $definition) {
+    foreach ($definition as $property => $value) {
+      $this->{$property} = $value;
+    }
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/DefaultSingleLazyPluginCollectionTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/DefaultSingleLazyPluginCollectionTest.php
index 22ecd3c4d..22f3a880e 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/DefaultSingleLazyPluginCollectionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/DefaultSingleLazyPluginCollectionTest.php
@@ -27,7 +27,7 @@ class DefaultSingleLazyPluginCollectionTest extends LazyPluginCollectionTestBase
         return $this->pluginInstances[$id];
       });
 
-    $this->defaultPluginCollection = new DefaultSingleLazyPluginCollection($this->pluginManager, 'apple', array('id' => 'apple', 'key' => 'value'));
+    $this->defaultPluginCollection = new DefaultSingleLazyPluginCollection($this->pluginManager, 'apple', ['id' => 'apple', 'key' => 'value']);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php
index 480e11511..508fdc61e 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php
@@ -17,7 +17,7 @@ class ContainerDerivativeDiscoveryDecoratorTest extends UnitTestCase {
   public function testGetDefinitions() {
     $example_service = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
     $example_container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
-      ->setMethods(array('get'))
+      ->setMethods(['get'])
       ->getMock();
     $example_container->expects($this->once())
       ->method('get')
@@ -26,15 +26,15 @@ class ContainerDerivativeDiscoveryDecoratorTest extends UnitTestCase {
 
     \Drupal::setContainer($example_container);
 
-    $definitions = array();
-    $definitions['container_aware_discovery'] = array(
+    $definitions = [];
+    $definitions['container_aware_discovery'] = [
       'id' => 'container_aware_discovery',
       'deriver' => '\Drupal\Tests\Core\Plugin\Discovery\TestContainerDerivativeDiscovery',
-    );
-    $definitions['non_container_aware_discovery'] = array(
+    ];
+    $definitions['non_container_aware_discovery'] = [
       'id' => 'non_container_aware_discovery',
       'deriver' => '\Drupal\Tests\Core\Plugin\Discovery\TestDerivativeDiscovery',
-    );
+    ];
 
     $discovery_main = $this->getMock('Drupal\Component\Plugin\Discovery\DiscoveryInterface');
     $discovery_main->expects($this->any())
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
index d81360f0b..e4ea6450c 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
@@ -2,12 +2,16 @@
 
 namespace Drupal\Tests\Core\Plugin\Discovery;
 
+use Drupal\Component\Plugin\Definition\DerivablePluginDefinitionInterface;
 use Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator;
+use Drupal\Component\Plugin\Exception\InvalidDeriverException;
 use Drupal\Tests\UnitTestCase;
 
 /**
  * Unit tests for the derivative discovery decorator.
  *
+ * @coversDefaultClass \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator
+ *
  * @group Plugin
  */
 class DerivativeDiscoveryDecoratorTest extends UnitTestCase {
@@ -32,11 +36,11 @@ class DerivativeDiscoveryDecoratorTest extends UnitTestCase {
    * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator::getDerivativeFetcher()
    */
   public function testGetDerivativeFetcher() {
-    $definitions = array();
-    $definitions['non_container_aware_discovery'] = array(
+    $definitions = [];
+    $definitions['non_container_aware_discovery'] = [
       'id' => 'non_container_aware_discovery',
       'deriver' => '\Drupal\Tests\Core\Plugin\Discovery\TestDerivativeDiscovery',
-    );
+    ];
 
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
@@ -58,11 +62,11 @@ class DerivativeDiscoveryDecoratorTest extends UnitTestCase {
    * Tests the getDerivativeFetcher method with objects instead of arrays.
    */
   public function testGetDerivativeFetcherWithAnnotationObjects() {
-    $definitions = array();
-    $definitions['non_container_aware_discovery'] = (object) array(
+    $definitions = [];
+    $definitions['non_container_aware_discovery'] = (object) [
       'id' => 'non_container_aware_discovery',
       'deriver' => '\Drupal\Tests\Core\Plugin\Discovery\TestDerivativeDiscoveryWithObject',
-    );
+    ];
 
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
@@ -83,25 +87,67 @@ class DerivativeDiscoveryDecoratorTest extends UnitTestCase {
   }
 
   /**
-   * Tests the getDerivativeFetcher method with a non-existent class.
+   * Tests getDeriverClass with classed objects instead of arrays.
    *
-   * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator::getDeriver().\
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\InvalidDeriverException
-   * @expectedExceptionMessage Plugin (non_existent_discovery) deriver "\Drupal\system\Tests\Plugin\NonExistentDeriver" does not exist.
+   * @covers ::getDeriverClass
    */
-  public function testNonExistentDerivativeFetcher() {
-    $definitions = array();
-    // Do this with a class that doesn't exist.
-    $definitions['non_existent_discovery'] = array(
-      'id' => 'non_existent_discovery',
-      'deriver' => '\Drupal\system\Tests\Plugin\NonExistentDeriver',
-    );
+  public function testGetDeriverClassWithClassedDefinitions() {
+    $definitions = [];
+    $definition = $this->prophesize(DerivablePluginDefinitionInterface::class);
+    $definition->id()->willReturn('non_container_aware_discovery');
+    $definition->getDeriver()->willReturn(TestDerivativeDiscoveryWithObject::class);
+    $definitions['non_container_aware_discovery'] = $definition->reveal();
+
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
       ->will($this->returnValue($definitions));
 
     $discovery = new DerivativeDiscoveryDecorator($this->discoveryMain);
+    $definitions = $discovery->getDefinitions();
+
+    // Ensure that both test derivatives got added.
+    $this->assertContainsOnlyInstancesOf(DerivablePluginDefinitionInterface::class, $definitions);
+    $this->assertEquals(['non_container_aware_discovery:test_discovery_0', 'non_container_aware_discovery:test_discovery_1'], array_keys($definitions));
+  }
+
+  /**
+   * @covers ::getDeriverClass
+   */
+  public function testGetDeriverClassWithInvalidClassedDefinitions() {
+    $definition = $this->prophesize(DerivablePluginDefinitionInterface::class);
+    $definition->id()->willReturn('non_existent_discovery');
+    $definition->getDeriver()->willReturn('\Drupal\system\Tests\Plugin\NonExistentDeriver');
+
+    $definitions['non_existent_discovery'] = $definition->reveal();
+
+    $this->discoveryMain->expects($this->any())
+      ->method('getDefinitions')
+      ->willReturn($definitions);
+
+    $discovery = new DerivativeDiscoveryDecorator($this->discoveryMain);
+
+    $this->setExpectedException(InvalidDeriverException::class, 'Plugin (non_existent_discovery) deriver "\Drupal\system\Tests\Plugin\NonExistentDeriver" does not exist.');
+    $discovery->getDefinitions();
+  }
+
+  /**
+   * Tests the getDerivativeFetcher method with a non-existent class.
+   *
+   * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator::getDeriver().\
+   */
+  public function testNonExistentDerivativeFetcher() {
+    $definitions = [];
+    // Do this with a class that doesn't exist.
+    $definitions['non_existent_discovery'] = [
+      'id' => 'non_existent_discovery',
+      'deriver' => '\Drupal\system\Tests\Plugin\NonExistentDeriver',
+    ];
+    $this->discoveryMain->expects($this->any())
+      ->method('getDefinitions')
+      ->will($this->returnValue($definitions));
+
+    $discovery = new DerivativeDiscoveryDecorator($this->discoveryMain);
+    $this->setExpectedException(InvalidDeriverException::class, 'Plugin (non_existent_discovery) deriver "\Drupal\system\Tests\Plugin\NonExistentDeriver" does not exist.');
     $discovery->getDefinitions();
   }
 
@@ -109,22 +155,20 @@ class DerivativeDiscoveryDecoratorTest extends UnitTestCase {
    * Tests the getDerivativeFetcher method with an invalid class.
    *
    * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator::getDeriver().\
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\InvalidDeriverException
-   * @expectedExceptionMessage Plugin (invalid_discovery) deriver "\Drupal\KernelTests\Core\Plugin\DerivativeTest" must implement \Drupal\Component\Plugin\Derivative\DeriverInterface.
    */
   public function testInvalidDerivativeFetcher() {
-    $definitions = array();
+    $definitions = [];
     // Do this with a class that doesn't implement the interface.
-    $definitions['invalid_discovery'] = array(
+    $definitions['invalid_discovery'] = [
       'id' => 'invalid_discovery',
       'deriver' => '\Drupal\KernelTests\Core\Plugin\DerivativeTest',
-    );
+    ];
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
       ->will($this->returnValue($definitions));
 
     $discovery = new DerivativeDiscoveryDecorator($this->discoveryMain);
+    $this->setExpectedException(InvalidDeriverException::class, 'Plugin (invalid_discovery) deriver "\Drupal\KernelTests\Core\Plugin\DerivativeTest" must implement \Drupal\Component\Plugin\Derivative\DeriverInterface.');
     $discovery->getDefinitions();
   }
 
@@ -132,26 +176,26 @@ class DerivativeDiscoveryDecoratorTest extends UnitTestCase {
    * Tests derivative definitions when a definition already exists.
    */
   public function testExistingDerivative() {
-    $definitions = array();
-    $definitions['non_container_aware_discovery'] = array(
+    $definitions = [];
+    $definitions['non_container_aware_discovery'] = [
       'id' => 'non_container_aware_discovery',
       'deriver' => '\Drupal\Tests\Core\Plugin\Discovery\TestDerivativeDiscovery',
       'string' => 'string',
       'empty_string' => 'not_empty',
-      'array' => array('one', 'two'),
-      'empty_array' => array('three'),
+      'array' => ['one', 'two'],
+      'empty_array' => ['three'],
       'null_value' => TRUE,
-    );
+    ];
     // This will clash with a derivative id.
     // @see \Drupal\Tests\Core\Plugin\Discovery\TestDerivativeDiscovery
-    $definitions['non_container_aware_discovery:test_discovery_1'] = array(
+    $definitions['non_container_aware_discovery:test_discovery_1'] = [
       'id' => 'non_container_aware_discovery:test_discovery_1',
       'string' => 'string',
       'empty_string' => '',
-      'array' => array('one', 'two'),
-      'empty_array' => array(),
+      'array' => ['one', 'two'],
+      'empty_array' => [],
       'null_value' => NULL,
-    );
+    ];
 
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
@@ -172,25 +216,25 @@ class DerivativeDiscoveryDecoratorTest extends UnitTestCase {
    * Tests a single definition when a derivative already exists.
    */
   public function testSingleExistingDerivative() {
-    $base_definition = array(
+    $base_definition = [
       'id' => 'non_container_aware_discovery',
       'deriver' => '\Drupal\Tests\Core\Plugin\Discovery\TestDerivativeDiscovery',
       'string' => 'string',
       'empty_string' => 'not_empty',
-      'array' => array('one', 'two'),
-      'empty_array' => array('three'),
+      'array' => ['one', 'two'],
+      'empty_array' => ['three'],
       'null_value' => TRUE,
-    );
+    ];
     // This will clash with a derivative id.
     // @see \Drupal\Tests\Core\Plugin\Discovery\TestDerivativeDiscovery
-    $derivative_definition = array(
+    $derivative_definition = [
       'id' => 'non_container_aware_discovery:test_discovery_1',
       'string' => 'string',
       'empty_string' => '',
-      'array' => array('one', 'two'),
-      'empty_array' => array(),
+      'array' => ['one', 'two'],
+      'empty_array' => [],
       'null_value' => NULL,
-    );
+    ];
 
     $this->discoveryMain->expects($this->at(0))
       ->method('getDefinition')
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
index 1472dc0c4..9f4eb95df 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\Core\Plugin\Discovery;
 
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Plugin\Discovery\HookDiscovery;
 use Drupal\Tests\UnitTestCase;
 
@@ -42,7 +43,7 @@ class HookDiscoveryTest extends UnitTestCase {
     $this->moduleHandler->expects($this->once())
       ->method('getImplementations')
       ->with('test_plugin')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $this->assertCount(0, $this->hookDiscovery->getDefinitions());
   }
@@ -56,7 +57,7 @@ class HookDiscoveryTest extends UnitTestCase {
     $this->moduleHandler->expects($this->once())
       ->method('getImplementations')
       ->with('test_plugin')
-      ->will($this->returnValue(array('hook_discovery_test', 'hook_discovery_test2')));
+      ->will($this->returnValue(['hook_discovery_test', 'hook_discovery_test2']));
 
     $this->moduleHandler->expects($this->at(1))
       ->method('invoke')
@@ -89,14 +90,14 @@ class HookDiscoveryTest extends UnitTestCase {
     $this->moduleHandler->expects($this->exactly(4))
       ->method('getImplementations')
       ->with('test_plugin')
-      ->will($this->returnValue(array('hook_discovery_test', 'hook_discovery_test2')));
+      ->will($this->returnValue(['hook_discovery_test', 'hook_discovery_test2']));
 
     $this->moduleHandler->expects($this->any())
       ->method('invoke')
-      ->will($this->returnValueMap(array(
-          array('hook_discovery_test', 'test_plugin', array(), $this->hookDiscoveryTestTestPlugin()),
-          array('hook_discovery_test2', 'test_plugin', array(), $this->hookDiscoveryTest2TestPlugin()),
-        )
+      ->will($this->returnValueMap([
+          ['hook_discovery_test', 'test_plugin', [], $this->hookDiscoveryTestTestPlugin()],
+          ['hook_discovery_test2', 'test_plugin', [], $this->hookDiscoveryTest2TestPlugin()],
+        ]
       ));
 
     $this->assertNull($this->hookDiscovery->getDefinition('test_non_existant', FALSE));
@@ -118,27 +119,26 @@ class HookDiscoveryTest extends UnitTestCase {
    * Tests the getDefinition method with an unknown plugin ID.
    *
    * @see \Drupal\Core\Plugin\Discovery::getDefinition()
-   *
-   * @expectedException \Drupal\Component\Plugin\Exception\PluginNotFoundException
    */
   public function testGetDefinitionWithUnknownID() {
     $this->moduleHandler->expects($this->once())
       ->method('getImplementations')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
+    $this->setExpectedException(PluginNotFoundException::class);
     $this->hookDiscovery->getDefinition('test_non_existant', TRUE);
   }
 
   protected function hookDiscoveryTestTestPlugin() {
-    return array(
-      'test_id_1' => array('class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Apple'),
-      'test_id_2' => array('class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Orange'),
-    );
+    return [
+      'test_id_1' => ['class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Apple'],
+      'test_id_2' => ['class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Orange'],
+    ];
   }
   protected function hookDiscoveryTest2TestPlugin() {
-    return array(
-      'test_id_3' => array('class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry'),
-    );
+    return [
+      'test_id_3' => ['class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry'],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscovery.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscovery.php
index 2fb2f5ded..63f50d64c 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscovery.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscovery.php
@@ -21,7 +21,7 @@ class TestDerivativeDiscovery implements DeriverInterface {
    * {@inheritdoc}
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    $plugins = array();
+    $plugins = [];
     for ($i = 0; $i < 2; $i++) {
       $plugins['test_discovery_' . $i] = $base_plugin_definition;
     }
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
index 656415d6c..353b21d48 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/TestDerivativeDiscoveryWithObject.php
@@ -26,7 +26,7 @@ class TestDerivativeDiscoveryWithObject implements DeriverInterface {
    * @return array
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
-    $plugins = array();
+    $plugins = [];
     for ($i = 0; $i < 2; $i++) {
       $plugins['test_discovery_' . $i] = $base_plugin_definition;
     }
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php
index 265374a67..a2c000e1f 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php
@@ -56,7 +56,7 @@ class YamlDirectoryDiscoveryTest extends UnitTestCase {
     $this->assertCount(4, $definitions);
 
     foreach ($definitions as $id => $definition) {
-      foreach (array('id', 'provider', ComponentYamlDirectoryDiscovery::FILE_KEY) as $key) {
+      foreach (['id', 'provider', ComponentYamlDirectoryDiscovery::FILE_KEY] as $key) {
         $this->assertArrayHasKey($key, $definition);
       }
       $this->assertEquals($id, $definition['id']);
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php
index ee48654d9..ea1936856 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php
@@ -24,37 +24,37 @@ class YamlDiscoveryDecoratorTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $expectedKeys = array(
+  protected $expectedKeys = [
     'test_1' => 'test_1_a',
     'another_provider_1' => 'test_1_b',
     'another_provider_2' => 'test_2_a',
     'test_2' => 'test_2_b',
     'decorated_1' => 'decorated_test_1',
     'decorated_2' => 'decorated_test_2',
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
 
     $base_path = __DIR__ . '/Fixtures';
     // Set up the directories to search.
-    $directories = array(
+    $directories = [
       'test_1' => $base_path . '/test_1',
       'test_2' => $base_path . '/test_2',
-    );
+    ];
 
-    $definitions = array(
-      'decorated_test_1' => array(
+    $definitions = [
+      'decorated_test_1' => [
         'id' => 'decorated_test_1',
         'name' => 'Decorated test 1',
         'provider' => 'decorated_1',
-      ),
-      'decorated_test_2' => array(
+      ],
+      'decorated_test_2' => [
         'id' => 'decorated_test_2',
         'name' => 'Decorated test 1',
         'provider' => 'decorated_2',
-      ),
-    );
+      ],
+    ];
 
     $decorated = $this->getMock('Drupal\Component\Plugin\Discovery\DiscoveryInterface');
     $decorated->expects($this->once())
@@ -78,7 +78,7 @@ class YamlDiscoveryDecoratorTest extends UnitTestCase {
     }
 
     foreach ($definitions as $id => $definition) {
-      foreach (array('name', 'id', 'provider') as $key) {
+      foreach (['name', 'id', 'provider'] as $key) {
         $this->assertArrayHasKey($key, $definition);
       }
       $this->assertEquals($id, $definition['id']);
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
index 0335145ce..096c33fc7 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
@@ -25,22 +25,22 @@ class YamlDiscoveryTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $expectedKeys = array(
+  protected $expectedKeys = [
     'test_1' => 'test_1_a',
     'another_provider_1' => 'test_1_b',
     'another_provider_2' => 'test_2_a',
     'test_2' => 'test_2_b',
-  );
+  ];
 
   protected function setUp() {
     parent::setUp();
 
     $base_path = __DIR__ . '/Fixtures';
     // Set up the directories to search.
-    $directories = array(
+    $directories = [
       'test_1' => $base_path . '/test_1',
       'test_2' => $base_path . '/test_2',
-    );
+    ];
 
     $this->discovery = new YamlDiscovery('test', $directories);
   }
@@ -59,7 +59,7 @@ class YamlDiscoveryTest extends UnitTestCase {
     }
 
     foreach ($definitions as $id => $definition) {
-      foreach (array('name', 'id', 'provider') as $key) {
+      foreach (['name', 'id', 'provider'] as $key) {
         $this->assertArrayHasKey($key, $definition);
       }
       $this->assertEquals($id, $definition['id']);
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Fixtures/TestConfigurablePlugin.php b/web/core/tests/Drupal/Tests/Core/Plugin/Fixtures/TestConfigurablePlugin.php
index 30b3e45e2..383b4d2bb 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Fixtures/TestConfigurablePlugin.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Fixtures/TestConfigurablePlugin.php
@@ -25,14 +25,14 @@ class TestConfigurablePlugin extends PluginBase implements ConfigurablePluginInt
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
-    return array();
+    return [];
   }
 
   /**
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    return array();
+    return [];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php b/web/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php
index 8e92ef0e8..1974e4a5a 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php
@@ -36,11 +36,11 @@ abstract class LazyPluginCollectionTestBase extends UnitTestCase {
    *
    * @var array
    */
-  protected $config = array(
-    'banana' => array('id' => 'banana', 'key' => 'value'),
-    'cherry' => array('id' => 'cherry', 'key' => 'value'),
-    'apple' => array('id' => 'apple', 'key' => 'value'),
-  );
+  protected $config = [
+    'banana' => ['id' => 'banana', 'key' => 'value'],
+    'cherry' => ['id' => 'cherry', 'key' => 'value'],
+    'apple' => ['id' => 'apple', 'key' => 'value'],
+  ];
 
   protected function setUp() {
     $this->pluginManager = $this->getMock('Drupal\Component\Plugin\PluginManagerInterface');
@@ -59,18 +59,18 @@ abstract class LazyPluginCollectionTestBase extends UnitTestCase {
    *   Defaults to $this->never().
    */
   protected function setupPluginCollection(\PHPUnit_Framework_MockObject_Matcher_InvokedRecorder $create_count = NULL) {
-    $this->pluginInstances = array();
-    $map = array();
+    $this->pluginInstances = [];
+    $map = [];
     foreach ($this->getPluginDefinitions() as $plugin_id => $definition) {
       // Create a mock plugin instance.
       $this->pluginInstances[$plugin_id] = $this->getPluginMock($plugin_id, $definition);
 
-      $map[] = array($plugin_id, $this->config[$plugin_id], $this->pluginInstances[$plugin_id]);
+      $map[] = [$plugin_id, $this->config[$plugin_id], $this->pluginInstances[$plugin_id]];
     }
     $create_count = $create_count ?: $this->never();
     $this->pluginManager->expects($create_count)
       ->method('createInstance')
-      ->will($this->returnCallback(array($this, 'returnPluginMap')));
+      ->will($this->returnCallback([$this, 'returnPluginMap']));
 
     $this->defaultPluginCollection = new DefaultLazyPluginCollection($this->pluginManager, $this->config);
   }
@@ -116,32 +116,32 @@ abstract class LazyPluginCollectionTestBase extends UnitTestCase {
    *   The example plugin definitions.
    */
   protected function getPluginDefinitions() {
-    $definitions = array(
-      'apple' => array(
+    $definitions = [
+      'apple' => [
         'id' => 'apple',
         'label' => 'Apple',
         'color' => 'green',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Apple',
         'provider' => 'plugin_test',
-      ),
-      'banana' => array(
+      ],
+      'banana' => [
         'id' => 'banana',
         'label' => 'Banana',
         'color' => 'yellow',
-        'uses' => array(
+        'uses' => [
           'bread' => 'Banana bread',
-        ),
+        ],
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Banana',
         'provider' => 'plugin_test',
-      ),
-      'cherry' => array(
+      ],
+      'cherry' => [
         'id' => 'cherry',
         'label' => 'Cherry',
         'color' => 'red',
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry',
         'provider' => 'plugin_test',
-      ),
-    );
+      ],
+    ];
     return $definitions;
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php
new file mode 100644
index 000000000..844c8152d
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Drupal\Tests\Core\Plugin;
+
+use Drupal\Component\Plugin\Definition\PluginDefinitionInterface;
+use Drupal\Component\Plugin\DependentPluginInterface;
+use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\Core\Plugin\Definition\DependentPluginDefinitionInterface;
+use Drupal\Core\Plugin\PluginDependencyTrait;
+use Drupal\Tests\UnitTestCase;
+use Prophecy\Prophecy\ProphecyInterface;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Plugin\PluginDependencyTrait
+ * @group Plugin
+ */
+class PluginDependencyTraitTest extends UnitTestCase {
+
+  /**
+   * @covers ::calculatePluginDependencies
+   *
+   * @dataProvider providerTestCalculatePluginDependencies
+   *
+   * @param \Prophecy\Prophecy\ProphecyInterface $plugin
+   *   A prophecy of a plugin instance.
+   * @param mixed $definition
+   *   A plugin definition.
+   * @param array $expected
+   *   The expected dependencies.
+   */
+  public function testCalculatePluginDependencies(ProphecyInterface $plugin, $definition, array $expected) {
+    $test_class = new TestPluginDependency();
+
+    $plugin->getPluginDefinition()->willReturn($definition);
+
+    $test_class->calculatePluginDependencies($plugin->reveal());
+    $this->assertEquals($expected, $test_class->getDependencies());
+  }
+
+  /**
+   * Provides test data for ::testCalculatePluginDependencies().
+   */
+  public function providerTestCalculatePluginDependencies() {
+    $data = [];
+
+    $plugin = $this->prophesize(PluginInspectionInterface::class);
+
+    $dependent_plugin = $this->prophesize(PluginInspectionInterface::class)->willImplement(DependentPluginInterface::class);
+    $dependent_plugin->calculateDependencies()->willReturn([
+      'module' => ['test_module2'],
+    ]);
+
+    $data['dependent_plugin'] = [
+      $dependent_plugin,
+      ['provider' => 'test_module1'],
+      [
+        'module' => [
+          'test_module1',
+          'test_module2',
+        ],
+      ],
+    ];
+
+    $data['array_with_config_dependencies'] = [
+      $plugin,
+      [
+        'provider' => 'test_module1',
+        'config_dependencies' => [
+          'module' => ['test_module2'],
+        ],
+      ],
+      [
+        'module' => [
+          'test_module1',
+          'test_module2',
+        ],
+      ],
+    ];
+
+    $definition = $this->prophesize(PluginDefinitionInterface::class);
+    $definition->getProvider()->willReturn('test_module1');
+    $data['object_definition'] = [
+      $plugin,
+      $definition->reveal(),
+      [
+        'module' => [
+          'test_module1',
+        ],
+      ],
+    ];
+
+    $dependent_definition = $this->prophesize(PluginDefinitionInterface::class)->willImplement(DependentPluginDefinitionInterface::class);
+    $dependent_definition->getProvider()->willReturn('test_module1');
+    $dependent_definition->getConfigDependencies()->willReturn(['module' => ['test_module2']]);
+    $data['dependent_object_definition'] = [
+      $plugin,
+      $dependent_definition->reveal(),
+      [
+        'module' => [
+          'test_module1',
+          'test_module2',
+        ],
+      ],
+    ];
+    return $data;
+  }
+
+}
+
+class TestPluginDependency {
+
+  use PluginDependencyTrait {
+    calculatePluginDependencies as public;
+  }
+
+  /**
+   * @return array[]
+   */
+  public function getDependencies() {
+    return $this->dependencies;
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php b/web/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php
index 0e883951a..5f0779e33 100644
--- a/web/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php
@@ -165,7 +165,7 @@ class TestServiceNoMethod {
 
 class TestServiceComplexMethod {
 
-  public function complexMethod($parameter, callable $function, TestServiceNoMethod $test_service = NULL, array &$elements = array()) {
+  public function complexMethod($parameter, callable $function, TestServiceNoMethod $test_service = NULL, array &$elements = []) {
 
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php b/web/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
index 8e639f904..9dac5dd62 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
@@ -240,103 +240,103 @@ class BubbleableMetadataTest extends UnitTestCase {
    *
    * @covers ::mergeAttachments
    */
-  function testMergeAttachmentsLibraryMerging() {
-    $a['#attached'] = array(
-      'library' => array(
+  public function testMergeAttachmentsLibraryMerging() {
+    $a['#attached'] = [
+      'library' => [
         'core/drupal',
         'core/drupalSettings',
-      ),
+      ],
       'drupalSettings' => [
         'foo' => ['d'],
       ],
-    );
-    $b['#attached'] = array(
-      'library' => array(
+    ];
+    $b['#attached'] = [
+      'library' => [
         'core/jquery',
-      ),
+      ],
       'drupalSettings' => [
         'bar' => ['a', 'b', 'c'],
       ],
-    );
-    $expected['#attached'] = array(
-      'library' => array(
+    ];
+    $expected['#attached'] = [
+      'library' => [
         'core/drupal',
         'core/drupalSettings',
         'core/jquery',
-      ),
+      ],
       'drupalSettings' => [
         'foo' => ['d'],
         'bar' => ['a', 'b', 'c'],
       ],
-    );
+    ];
     $this->assertSame($expected['#attached'], BubbleableMetadata::mergeAttachments($a['#attached'], $b['#attached']), 'Attachments merged correctly.');
 
     // Merging in the opposite direction yields the opposite library order.
-    $expected['#attached'] = array(
-      'library' => array(
+    $expected['#attached'] = [
+      'library' => [
         'core/jquery',
         'core/drupal',
         'core/drupalSettings',
-      ),
+      ],
       'drupalSettings' => [
         'bar' => ['a', 'b', 'c'],
         'foo' => ['d'],
       ],
-    );
+    ];
     $this->assertSame($expected['#attached'], BubbleableMetadata::mergeAttachments($b['#attached'], $a['#attached']), 'Attachments merged correctly; opposite merging yields opposite order.');
 
     // Merging with duplicates: duplicates are simply retained, it's up to the
     // rest of the system to handle duplicates.
     $b['#attached']['library'][] = 'core/drupalSettings';
-    $expected['#attached'] = array(
-      'library' => array(
+    $expected['#attached'] = [
+      'library' => [
         'core/drupal',
         'core/drupalSettings',
         'core/jquery',
         'core/drupalSettings',
-      ),
+      ],
       'drupalSettings' => [
         'foo' => ['d'],
         'bar' => ['a', 'b', 'c'],
       ],
-    );
+    ];
     $this->assertSame($expected['#attached'], BubbleableMetadata::mergeAttachments($a['#attached'], $b['#attached']), 'Attachments merged correctly; duplicates are retained.');
 
     // Merging with duplicates (simple case).
     $b['#attached']['drupalSettings']['foo'] = ['a', 'b', 'c'];
-    $expected['#attached'] = array(
-      'library' => array(
+    $expected['#attached'] = [
+      'library' => [
         'core/drupal',
         'core/drupalSettings',
         'core/jquery',
         'core/drupalSettings',
-      ),
+      ],
       'drupalSettings' => [
         'foo' => ['a', 'b', 'c'],
         'bar' => ['a', 'b', 'c'],
       ],
-    );
+    ];
     $this->assertSame($expected['#attached'], BubbleableMetadata::mergeAttachments($a['#attached'], $b['#attached']));
 
     // Merging with duplicates (simple case) in the opposite direction yields
     // the opposite JS setting asset order, but also opposite overriding order.
-    $expected['#attached'] = array(
-      'library' => array(
+    $expected['#attached'] = [
+      'library' => [
         'core/jquery',
         'core/drupalSettings',
         'core/drupal',
         'core/drupalSettings',
-      ),
+      ],
       'drupalSettings' => [
         'bar' => ['a', 'b', 'c'],
         'foo' => ['d', 'b', 'c'],
       ],
-    );
+    ];
     $this->assertSame($expected['#attached'], BubbleableMetadata::mergeAttachments($b['#attached'], $a['#attached']));
 
     // Merging with duplicates: complex case.
     // Only the second of these two entries should appear in drupalSettings.
-    $build = array();
+    $build = [];
     $build['a']['#attached']['drupalSettings']['commonTest'] = 'firstValue';
     $build['b']['#attached']['drupalSettings']['commonTest'] = 'secondValue';
     // Only the second of these entries should appear in drupalSettings.
@@ -348,12 +348,12 @@ class BubbleableMetadataTest extends UnitTestCase {
     // Real world test case: multiple elements in a render array are adding the
     // same (or nearly the same) JavaScript settings. When merged, they should
     // contain all settings and not duplicate some settings.
-    $settings_one = array('moduleName' => array('ui' => array('button A', 'button B'), 'magical flag' => 3.14159265359));
+    $settings_one = ['moduleName' => ['ui' => ['button A', 'button B'], 'magical flag' => 3.14159265359]];
     $build['a']['#attached']['drupalSettings']['commonTestRealWorldIdentical'] = $settings_one;
     $build['b']['#attached']['drupalSettings']['commonTestRealWorldIdentical'] = $settings_one;
-    $settings_two_a = array('moduleName' => array('ui' => array('button A', 'button B', 'button C'), 'magical flag' => 3.14159265359, 'thingiesOnPage' => array('id1' => array())));
+    $settings_two_a = ['moduleName' => ['ui' => ['button A', 'button B', 'button C'], 'magical flag' => 3.14159265359, 'thingiesOnPage' => ['id1' => []]]];
     $build['a']['#attached']['drupalSettings']['commonTestRealWorldAlmostIdentical'] = $settings_two_a;
-    $settings_two_b = array('moduleName' => array('ui' => array('button D', 'button E'), 'magical flag' => 3.14, 'thingiesOnPage' => array('id2' => array())));
+    $settings_two_b = ['moduleName' => ['ui' => ['button D', 'button E'], 'magical flag' => 3.14, 'thingiesOnPage' => ['id2' => []]]];
     $build['b']['#attached']['drupalSettings']['commonTestRealWorldAlmostIdentical'] = $settings_two_b;
 
     $merged = BubbleableMetadata::mergeAttachments($build['a']['#attached'], $build['b']['#attached']);
@@ -373,7 +373,7 @@ class BubbleableMetadataTest extends UnitTestCase {
     // adds the exact same settings twice and hence tests idempotency, the
     // second adds *almost* the same settings twice: the second time, some
     // values are altered, and some key-value pairs are added.
-    $settings_two['moduleName']['thingiesOnPage']['id1'] = array();
+    $settings_two['moduleName']['thingiesOnPage']['id1'] = [];
     $this->assertSame($settings_one, $merged['drupalSettings']['commonTestRealWorldIdentical']);
     $expected_settings_two = $settings_two_a;
     $expected_settings_two['moduleName']['ui'][0] = 'button D';
@@ -391,7 +391,7 @@ class BubbleableMetadataTest extends UnitTestCase {
    *
    * @dataProvider providerTestMergeAttachmentsFeedMerging
    */
-  function testMergeAttachmentsFeedMerging($a, $b, $expected) {
+  public function testMergeAttachmentsFeedMerging($a, $b, $expected) {
     $this->assertSame($expected, BubbleableMetadata::mergeAttachments($a, $b));
   }
 
@@ -450,7 +450,7 @@ class BubbleableMetadataTest extends UnitTestCase {
    *
    * @dataProvider providerTestMergeAttachmentsHtmlHeadMerging
    */
-  function testMergeAttachmentsHtmlHeadMerging($a, $b, $expected) {
+  public function testMergeAttachmentsHtmlHeadMerging($a, $b, $expected) {
     $this->assertSame($expected, BubbleableMetadata::mergeAttachments($a, $b));
   }
 
@@ -523,7 +523,7 @@ class BubbleableMetadataTest extends UnitTestCase {
    *
    * @dataProvider providerTestMergeAttachmentsHtmlHeadLinkMerging
    */
-  function testMergeAttachmentsHtmlHeadLinkMerging($a, $b, $expected) {
+  public function testMergeAttachmentsHtmlHeadLinkMerging($a, $b, $expected) {
     $this->assertSame($expected, BubbleableMetadata::mergeAttachments($a, $b));
   }
 
@@ -589,7 +589,7 @@ class BubbleableMetadataTest extends UnitTestCase {
    *
    * @dataProvider providerTestMergeAttachmentsHttpHeaderMerging
    */
-  function testMergeAttachmentsHttpHeaderMerging($a, $b, $expected) {
+  public function testMergeAttachmentsHttpHeaderMerging($a, $b, $expected) {
     $this->assertSame($expected, BubbleableMetadata::mergeAttachments($a, $b));
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php b/web/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
index bef5ceff2..46dd91a87 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
@@ -16,7 +16,7 @@ class HtmlTagTest extends UnitTestCase {
    * @covers ::getInfo
    */
   public function testGetInfo() {
-    $htmlTag = new HtmlTag(array(), 'test', 'test');
+    $htmlTag = new HtmlTag([], 'test', 'test');
     $info = $htmlTag->getInfo();
     $this->assertArrayHasKey('#pre_render', $info);
     $this->assertArrayHasKey('#attributes', $info);
@@ -37,60 +37,60 @@ class HtmlTagTest extends UnitTestCase {
    * Data provider for preRenderHtmlTag test.
    */
   public function providerPreRenderHtmlTag() {
-    $tags = array();
+    $tags = [];
 
     // Value prefix/suffix.
-    $element = array(
+    $element = [
       '#value' => 'value',
       '#tag' => 'p',
-    );
-    $tags[] = array($element, '<p>value</p>' . "\n");
+    ];
+    $tags[] = [$element, '<p>value</p>' . "\n"];
 
     // Normal element without a value should not result in a void element.
-    $element = array(
+    $element = [
       '#tag' => 'p',
       '#value' => NULL,
-    );
-    $tags[] = array($element, "<p></p>\n");
+    ];
+    $tags[] = [$element, "<p></p>\n"];
 
     // A void element.
-    $element = array(
+    $element = [
       '#tag' => 'br',
-    );
-    $tags[] = array($element, "<br />\n");
+    ];
+    $tags[] = [$element, "<br />\n"];
 
     // Attributes.
-    $element = array(
+    $element = [
       '#tag' => 'div',
-      '#attributes' => array('class' => 'test', 'id' => 'id'),
+      '#attributes' => ['class' => 'test', 'id' => 'id'],
       '#value' => 'value',
-    );
-    $tags[] = array($element, '<div class="test" id="id">value</div>' . "\n");
+    ];
+    $tags[] = [$element, '<div class="test" id="id">value</div>' . "\n"];
 
     // No script tags.
     $element['#noscript'] = TRUE;
-    $tags[] = array($element, '<noscript><div class="test" id="id">value</div>' . "\n" . '</noscript>');
+    $tags[] = [$element, '<noscript><div class="test" id="id">value</div>' . "\n" . '</noscript>'];
 
     // Ensure that #tag is sanitised.
-    $element = array(
+    $element = [
       '#tag' => 'p><script>alert()</script><p',
       '#value' => 'value',
-    );
-    $tags[] = array($element, "<p&gt;&lt;script&gt;alert()&lt;/script&gt;&lt;p>value</p&gt;&lt;script&gt;alert()&lt;/script&gt;&lt;p>\n");
+    ];
+    $tags[] = [$element, "<p&gt;&lt;script&gt;alert()&lt;/script&gt;&lt;p>value</p&gt;&lt;script&gt;alert()&lt;/script&gt;&lt;p>\n"];
 
     // Ensure that #value is not filtered if it is marked as safe.
-    $element = array(
+    $element = [
       '#tag' => 'p',
       '#value' => Markup::create('<script>value</script>'),
-    );
-    $tags[] = array($element, "<p><script>value</script></p>\n");
+    ];
+    $tags[] = [$element, "<p><script>value</script></p>\n"];
 
     // Ensure that #value is filtered if it is not safe.
-    $element = array(
+    $element = [
       '#tag' => 'p',
       '#value' => '<script>value</script>',
-    );
-    $tags[] = array($element, "<p>value</p>\n");
+    ];
+    $tags[] = [$element, "<p>value</p>\n"];
 
     return $tags;
   }
@@ -112,74 +112,74 @@ class HtmlTagTest extends UnitTestCase {
    */
   public function providerPreRenderConditionalComments() {
     // No browser specification.
-    $element = array(
+    $element = [
       '#tag' => 'link',
-    );
-    $tags[] = array($element, $element);
+    ];
+    $tags[] = [$element, $element];
 
     // Specify all browsers.
-    $element['#browsers'] = array(
+    $element['#browsers'] = [
       'IE' => TRUE,
       '!IE' => TRUE,
-    );
-    $tags[] = array($element, $element);
+    ];
+    $tags[] = [$element, $element];
 
     // All IE.
-    $element = array(
+    $element = [
       '#tag' => 'link',
-      '#browsers' => array(
+      '#browsers' => [
         'IE' => TRUE,
         '!IE' => FALSE,
-      ),
-    );
+      ],
+    ];
     $expected = $element;
     $expected['#prefix'] = "\n<!--[if IE]>\n";
     $expected['#suffix'] = "<![endif]-->\n";
-    $tags[] = array($element, $expected);
+    $tags[] = [$element, $expected];
 
     // Exclude IE.
-    $element = array(
+    $element = [
       '#tag' => 'link',
-      '#browsers' => array(
+      '#browsers' => [
         'IE' => FALSE,
-      ),
-    );
+      ],
+    ];
     $expected = $element;
     $expected['#prefix'] = "\n<!--[if !IE]><!-->\n";
     $expected['#suffix'] = "<!--<![endif]-->\n";
-    $tags[] = array($element, $expected);
+    $tags[] = [$element, $expected];
 
     // IE gt 8
-    $element = array(
+    $element = [
       '#tag' => 'link',
-      '#browsers' => array(
+      '#browsers' => [
         'IE' => 'gt IE 8',
-      ),
-    );
+      ],
+    ];
     $expected = $element;
     $expected['#prefix'] = "\n<!--[if gt IE 8]><!-->\n";
     $expected['#suffix'] = "<!--<![endif]-->\n";
-    $tags[] = array($element, $expected);
+    $tags[] = [$element, $expected];
 
     // Prefix and suffix filtering if not safe.
-    $element = array(
+    $element = [
       '#tag' => 'link',
-      '#browsers' => array(
+      '#browsers' => [
         'IE' => FALSE,
-      ),
+      ],
       '#prefix' => '<blink>prefix</blink>',
       '#suffix' => '<blink>suffix</blink>',
-    );
+    ];
     $expected = $element;
     $expected['#prefix'] = "\n<!--[if !IE]><!-->\nprefix";
     $expected['#suffix'] = "suffix<!--<![endif]-->\n";
-    $tags[] = array($element, $expected);
+    $tags[] = [$element, $expected];
 
     // Prefix and suffix filtering if marked as safe. This has to come after the
     // previous test case.
     $expected['#prefix'] = "\n<!--[if !IE]><!-->\n<blink>prefix</blink>";
     $expected['#suffix'] = "<blink>suffix</blink><!--<![endif]-->\n";
-    $tags[] = array($element, $expected, TRUE);
+    $tags[] = [$element, $expected, TRUE];
 
     return $tags;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Render/ElementInfoManagerTest.php b/web/core/tests/Drupal/Tests/Core/Render/ElementInfoManagerTest.php
index 0d5aec69c..c3058300d 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/ElementInfoManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/ElementInfoManagerTest.php
@@ -85,13 +85,13 @@ class ElementInfoManagerTest extends UnitTestCase {
     $plugin = $this->getMock($plugin_class);
     $plugin->expects($this->once())
       ->method('getInfo')
-      ->willReturn(array(
+      ->willReturn([
         '#theme' => 'page',
-      ));
+      ]);
 
     $element_info = $this->getMockBuilder('Drupal\Core\Render\ElementInfoManager')
-      ->setConstructorArgs(array(new \ArrayObject(), $this->cache, $this->cacheTagsInvalidator, $this->moduleHandler, $this->themeManager))
-      ->setMethods(array('getDefinitions', 'createInstance'))
+      ->setConstructorArgs([new \ArrayObject(), $this->cache, $this->cacheTagsInvalidator, $this->moduleHandler, $this->themeManager])
+      ->setMethods(['getDefinitions', 'createInstance'])
       ->getMock();
 
     $this->themeManager->expects($this->any())
@@ -104,9 +104,9 @@ class ElementInfoManagerTest extends UnitTestCase {
       ->willReturn($plugin);
     $element_info->expects($this->once())
       ->method('getDefinitions')
-      ->willReturn(array(
-        'page' => array('class' => 'TestElementPlugin'),
-      ));
+      ->willReturn([
+        'page' => ['class' => 'TestElementPlugin'],
+      ]);
 
     $this->assertEquals($expected_info, $element_info->getInfo('page'));
   }
@@ -117,26 +117,26 @@ class ElementInfoManagerTest extends UnitTestCase {
    * @return array
    */
   public function providerTestGetInfoElementPlugin() {
-    $data = array();
-    $data[] = array(
+    $data = [];
+    $data[] = [
       'Drupal\Core\Render\Element\ElementInterface',
-      array(
+      [
         '#type' => 'page',
         '#theme' => 'page',
         '#defaults_loaded' => TRUE,
-      ),
-    );
+      ],
+    ];
 
-    $data[] = array(
+    $data[] = [
       'Drupal\Core\Render\Element\FormElementInterface',
-      array(
+      [
         '#type' => 'page',
         '#theme' => 'page',
         '#input' => TRUE,
-        '#value_callback' => array('TestElementPlugin', 'valueCallback'),
+        '#value_callback' => ['TestElementPlugin', 'valueCallback'],
         '#defaults_loaded' => TRUE,
-      ),
-    );
+      ],
+    ];
     return $data;
   }
 
@@ -164,12 +164,12 @@ class TestElementInfoManager extends ElementInfoManager {
   /**
    * {@inheritdoc}
    */
-  protected $elementInfo = array(
-    'test' => array(
-      'foo' => array(
+  protected $elementInfo = [
+    'test' => [
+      'foo' => [
         '#bar' => 'baz',
-      ),
-    ),
-  );
+      ],
+    ],
+  ];
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Render/ElementTest.php b/web/core/tests/Drupal/Tests/Core/Render/ElementTest.php
index 604d391d8..d168f741e 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/ElementTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/ElementTest.php
@@ -25,11 +25,11 @@ class ElementTest extends UnitTestCase {
    * Tests the properties() method.
    */
   public function testProperties() {
-    $element = array(
+    $element = [
       '#property1' => 'property1',
       '#property2' => 'property2',
       'property3' => 'property3'
-    );
+    ];
 
     $properties = Element::properties($element);
 
@@ -51,64 +51,62 @@ class ElementTest extends UnitTestCase {
    * Tests the children() method.
    */
   public function testChildren() {
-    $element = array(
-      'child2' => array('#weight' => 10),
-      'child1' => array('#weight' => 0),
-      'child3' => array('#weight' => 20),
+    $element = [
+      'child2' => ['#weight' => 10],
+      'child1' => ['#weight' => 0],
+      'child3' => ['#weight' => 20],
       '#property' => 'property',
-    );
+    ];
 
-    $expected = array('child2', 'child1', 'child3');
+    $expected = ['child2', 'child1', 'child3'];
     $element_copy = $element;
     $this->assertSame($expected, Element::children($element_copy));
 
     // If #sorted is already set, no sorting should happen.
     $element_copy = $element;
     $element_copy['#sorted'] = TRUE;
-    $expected = array('child2', 'child1', 'child3');
+    $expected = ['child2', 'child1', 'child3'];
     $this->assertSame($expected, Element::children($element_copy, TRUE));
 
     // Test with weight sorting, #sorted property should be added.
-    $expected = array('child1', 'child2', 'child3');
+    $expected = ['child1', 'child2', 'child3'];
     $element_copy = $element;
     $this->assertSame($expected, Element::children($element_copy, TRUE));
     $this->assertArrayHasKey('#sorted', $element_copy);
     $this->assertTrue($element_copy['#sorted']);
 
     // The order should stay the same if no weights present.
-    $element_no_weight = array(
-      'child2' => array(),
-      'child1' => array(),
-      'child3' => array(),
+    $element_no_weight = [
+      'child2' => [],
+      'child1' => [],
+      'child3' => [],
       '#property' => 'property',
-    );
+    ];
 
-    $expected = array('child2', 'child1', 'child3');
+    $expected = ['child2', 'child1', 'child3'];
     $this->assertSame($expected, Element::children($element_no_weight, TRUE));
 
     // The order of children with same weight should be preserved.
-    $element_mixed_weight = array(
-      'child5' => array('#weight' => 10),
-      'child3' => array('#weight' => -10),
-      'child1' => array(),
-      'child4' => array('#weight' => 10),
-      'child2' => array(),
-    );
+    $element_mixed_weight = [
+      'child5' => ['#weight' => 10],
+      'child3' => ['#weight' => -10],
+      'child1' => [],
+      'child4' => ['#weight' => 10],
+      'child2' => [],
+    ];
 
-    $expected = array('child3', 'child1', 'child2', 'child5', 'child4');
+    $expected = ['child3', 'child1', 'child2', 'child5', 'child4'];
     $this->assertSame($expected, Element::children($element_mixed_weight, TRUE));
   }
 
   /**
    * Tests the children() method with an invalid key.
-   *
-   * @expectedException \PHPUnit_Framework_Error
-   * @expectedExceptionMessage "foo" is an invalid render array key
    */
   public function testInvalidChildren() {
-    $element = array(
+    $element = [
       'foo' => 'bar',
-    );
+    ];
+    $this->setExpectedException(\PHPUnit_Framework_Error::class, '"foo" is an invalid render array key');
     Element::children($element);
   }
 
@@ -116,10 +114,10 @@ class ElementTest extends UnitTestCase {
    * Tests the children() method with an ignored key/value pair.
    */
   public function testIgnoredChildren() {
-    $element = array(
+    $element = [
       'foo' => NULL,
-    );
-    $this->assertSame(array(), Element::children($element));
+    ];
+    $this->assertSame([], Element::children($element));
   }
 
   /**
@@ -142,17 +140,17 @@ class ElementTest extends UnitTestCase {
    * @return array
    */
   public function providerVisibleChildren() {
-    return array(
-      array(array('#property1' => '', '#property2' => array()), array()),
-      array(array('#property1' => '', 'child1' => array()), array('child1')),
-      array(array('#property1' => '', 'child1' => array(), 'child2' => array('#access' => TRUE)), array('child1', 'child2')),
-      array(array('#property1' => '', 'child1' => array(), 'child2' => array('#access' => FALSE)), array('child1')),
-      'access_result_object_allowed' => array(array('#property1' => '', 'child1' => array(), 'child2' => array('#access' => AccessResult::allowed())), array('child1', 'child2')),
-      'access_result_object_forbidden' => array(array('#property1' => '', 'child1' => array(), 'child2' => array('#access' => AccessResult::forbidden())), array('child1')),
-      array(array('#property1' => '', 'child1' => array(), 'child2' => array('#type' => 'textfield')), array('child1', 'child2')),
-      array(array('#property1' => '', 'child1' => array(), 'child2' => array('#type' => 'value')), array('child1')),
-      array(array('#property1' => '', 'child1' => array(), 'child2' => array('#type' => 'hidden')), array('child1')),
-    );
+    return [
+      [['#property1' => '', '#property2' => []], []],
+      [['#property1' => '', 'child1' => []], ['child1']],
+      [['#property1' => '', 'child1' => [], 'child2' => ['#access' => TRUE]], ['child1', 'child2']],
+      [['#property1' => '', 'child1' => [], 'child2' => ['#access' => FALSE]], ['child1']],
+      'access_result_object_allowed' => [['#property1' => '', 'child1' => [], 'child2' => ['#access' => AccessResult::allowed()]], ['child1', 'child2']],
+      'access_result_object_forbidden' => [['#property1' => '', 'child1' => [], 'child2' => ['#access' => AccessResult::forbidden()]], ['child1']],
+      [['#property1' => '', 'child1' => [], 'child2' => ['#type' => 'textfield']], ['child1', 'child2']],
+      [['#property1' => '', 'child1' => [], 'child2' => ['#type' => 'value']], ['child1']],
+      [['#property1' => '', 'child1' => [], 'child2' => ['#type' => 'hidden']], ['child1']],
+    ];
   }
 
   /**
@@ -169,12 +167,12 @@ class ElementTest extends UnitTestCase {
    * Data provider for testSetAttributes().
    */
   public function providerTestSetAttributes() {
-    $base = array('#id' => 'id', '#class' => array());
-    return array(
-      array($base, array(), $base),
-      array($base, array('id', 'class'), $base + array('#attributes' => array('id' => 'id', 'class' => array()))),
-      array($base + array('#attributes' => array('id' => 'id-not-overwritten')), array('id', 'class'), $base + array('#attributes' => array('id' => 'id-not-overwritten', 'class' => array()))),
-    );
+    $base = ['#id' => 'id', '#class' => []];
+    return [
+      [$base, [], $base],
+      [$base, ['id', 'class'], $base + ['#attributes' => ['id' => 'id', 'class' => []]]],
+      [$base + ['#attributes' => ['id' => 'id-not-overwritten']], ['id', 'class'], $base + ['#attributes' => ['id' => 'id-not-overwritten', 'class' => []]]],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Render/Placeholder/ChainedPlaceholderStrategyTest.php b/web/core/tests/Drupal/Tests/Core/Render/Placeholder/ChainedPlaceholderStrategyTest.php
index fc90e5da5..776b79446 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/Placeholder/ChainedPlaceholderStrategyTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/Placeholder/ChainedPlaceholderStrategyTest.php
@@ -120,9 +120,6 @@ class ChainedPlaceholderStrategyTest extends UnitTestCase {
 
   /**
    * @covers ::processPlaceholders
-   *
-   * @expectedException \AssertionError
-   * @expectedExceptionMessage At least one placeholder strategy must be present; by default the fallback strategy \Drupal\Core\Render\Placeholder\SingleFlushStrategy is always present.
    */
   public function testProcessPlaceholdersNoStrategies() {
     // Placeholders but no strategies defined.
@@ -131,14 +128,12 @@ class ChainedPlaceholderStrategyTest extends UnitTestCase {
     ];
 
     $chained_placeholder_strategy = new ChainedPlaceholderStrategy();
+    $this->setExpectedException(\AssertionError::class, 'At least one placeholder strategy must be present; by default the fallback strategy \Drupal\Core\Render\Placeholder\SingleFlushStrategy is always present.');
     $chained_placeholder_strategy->processPlaceholders($placeholders);
   }
 
   /**
    * @covers ::processPlaceholders
-   *
-   * @expectedException \AssertionError
-   * @expectedExceptionMessage Processed placeholders must be a subset of all placeholders.
    */
   public function testProcessPlaceholdersWithRoguePlaceholderStrategy() {
     // Placeholders but no strategies defined.
@@ -157,6 +152,7 @@ class ChainedPlaceholderStrategyTest extends UnitTestCase {
 
     $chained_placeholder_strategy = new ChainedPlaceholderStrategy();
     $chained_placeholder_strategy->addPlaceholderStrategy($rogue_strategy);
+    $this->setExpectedException(\AssertionError::class, 'Processed placeholders must be a subset of all placeholders.');
     $chained_placeholder_strategy->processPlaceholders($placeholders);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/web/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
index 5a8ae9683..3e1ee407e 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
@@ -9,6 +9,7 @@ namespace Drupal\Tests\Core\Render;
 
 use Drupal\Core\Cache\MemoryBackend;
 use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
+use Drupal\Core\Lock\NullLockBackend;
 use Drupal\Core\State\State;
 use Drupal\Core\Cache\Cache;
 
@@ -79,8 +80,8 @@ class RendererBubblingTest extends RendererTestBase {
     $bin = $this->randomMachineName();
 
     $this->setUpRequest();
-    $this->memoryCache = new MemoryBackend('render');
-    $custom_cache = new MemoryBackend($bin);
+    $this->memoryCache = new MemoryBackend();
+    $custom_cache = new MemoryBackend();
 
     $this->cacheFactory->expects($this->atLeastOnce())
       ->method('get')
@@ -502,7 +503,7 @@ class RendererBubblingTest extends RendererTestBase {
     $this->setupMemoryCache();
 
     // Mock the State service.
-    $memory_state = new State(new KeyValueMemoryFactory());;
+    $memory_state = new State(new KeyValueMemoryFactory(), new MemoryBackend('test'), new NullLockBackend());
     \Drupal::getContainer()->set('state', $memory_state);
     $this->controllerResolver->expects($this->any())
       ->method('getControllerFromDefinition')
@@ -570,9 +571,6 @@ class RendererBubblingTest extends RendererTestBase {
 
   /**
    * Tests that an element's cache keys cannot be changed during its rendering.
-   *
-   * @expectedException \LogicException
-   * @expectedExceptionMessage Cache keys may not be changed after initial setup. Use the contexts property instead to bubble additional metadata.
    */
   public function testOverWriteCacheKeys() {
     $this->setUpRequest();
@@ -585,6 +583,7 @@ class RendererBubblingTest extends RendererTestBase {
        ],
       '#pre_render' => [__NAMESPACE__ . '\\BubblingTest::bubblingCacheOverwritePrerender'],
     ];
+    $this->setExpectedException(\LogicException::class, 'Cache keys may not be changed after initial setup. Use the contexts property instead to bubble additional metadata.');
     $this->renderer->renderRoot($data);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/web/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
index 530f603f1..00426c252 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Tests\Core\Render;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Render\Markup;
@@ -71,7 +72,7 @@ class RendererPlaceholdersTest extends RendererTestBase {
       if (is_array($cache_keys)) {
         $token_render_array['#cache']['keys'] = $cache_keys;
       }
-      $token = hash('crc32b', serialize($token_render_array));
+      $token = Crypt::hashBase64(serialize($token_render_array));
       // \Drupal\Core\Render\Markup::create() is necessary as the render
       // system would mangle this markup. As this is exactly what happens at
       // runtime this is a valid use-case.
@@ -618,7 +619,7 @@ class RendererPlaceholdersTest extends RendererTestBase {
 
     $this->setUpRequest('GET');
 
-    $token = hash('crc32b', serialize($expected_placeholder_render_array));
+    $token = Crypt::hashBase64(serialize($expected_placeholder_render_array));
     $placeholder_callback = $expected_placeholder_render_array['#lazy_builder'][0];
     $expected_placeholder_markup = '<drupal-render-placeholder callback="' . $placeholder_callback . '" arguments="0=' . $args[0] . '" token="' . $token . '"></drupal-render-placeholder>';
     $this->assertSame($expected_placeholder_markup, Html::normalize($expected_placeholder_markup), 'Placeholder unaltered by Html::normalize() which is used by FilterHtmlCorrector.');
@@ -846,28 +847,24 @@ class RendererPlaceholdersTest extends RendererTestBase {
   /**
    * @covers ::render
    * @covers ::doRender
-   *
-   * @expectedException \DomainException
-   * @expectedExceptionMessage The #lazy_builder property must have an array as a value.
    */
   public function testInvalidLazyBuilder() {
     $element = [];
     $element['#lazy_builder'] = '\Drupal\Tests\Core\Render\PlaceholdersTest::callback';
 
+    $this->setExpectedException(\DomainException::class, 'The #lazy_builder property must have an array as a value.');
     $this->renderer->renderRoot($element);
   }
 
   /**
    * @covers ::render
    * @covers ::doRender
-   *
-   * @expectedException \DomainException
-   * @expectedExceptionMessage The #lazy_builder property must have an array as a value, containing two values: the callback, and the arguments for the callback.
    */
   public function testInvalidLazyBuilderArguments() {
     $element = [];
     $element['#lazy_builder'] = ['\Drupal\Tests\Core\Render\PlaceholdersTest::callback', 'arg1', 'arg2'];
 
+    $this->setExpectedException(\DomainException::class, 'The #lazy_builder property must have an array as a value, containing two values: the callback, and the arguments for the callback.');
     $this->renderer->renderRoot($element);
   }
 
@@ -895,9 +892,6 @@ class RendererPlaceholdersTest extends RendererTestBase {
   /**
    * @covers ::render
    * @covers ::doRender
-   *
-   * @expectedException \DomainException
-   * @expectedExceptionMessage A #lazy_builder callback's context may only contain scalar values or NULL.
    */
   public function testNonScalarLazybuilderCallbackContext() {
     $element = [];
@@ -911,15 +905,13 @@ class RendererPlaceholdersTest extends RendererTestBase {
       'array' => ['hi!'],
     ]];
 
+    $this->setExpectedException(\DomainException::class, "A #lazy_builder callback's context may only contain scalar values or NULL.");
     $this->renderer->renderRoot($element);
   }
 
   /**
    * @covers ::render
    * @covers ::doRender
-   *
-   * @expectedException \DomainException
-   * @expectedExceptionMessage When a #lazy_builder callback is specified, no children can exist; all children must be generated by the #lazy_builder callback. You specified the following children: child_a, child_b.
    */
   public function testChildrenPlusBuilder() {
     $element = [];
@@ -927,15 +919,13 @@ class RendererPlaceholdersTest extends RendererTestBase {
     $element['child_a']['#markup'] = 'Oh hai!';
     $element['child_b']['#markup'] = 'kthxbai';
 
+    $this->setExpectedException(\DomainException::class, 'When a #lazy_builder callback is specified, no children can exist; all children must be generated by the #lazy_builder callback. You specified the following children: child_a, child_b.');
     $this->renderer->renderRoot($element);
   }
 
   /**
    * @covers ::render
    * @covers ::doRender
-   *
-   * @expectedException \DomainException
-   * @expectedExceptionMessage When a #lazy_builder callback is specified, no properties can exist; all properties must be generated by the #lazy_builder callback. You specified the following properties: #llama, #piglet.
    */
   public function testPropertiesPlusBuilder() {
     $element = [];
@@ -943,20 +933,19 @@ class RendererPlaceholdersTest extends RendererTestBase {
     $element['#llama'] = '#awesome';
     $element['#piglet'] = '#cute';
 
+    $this->setExpectedException(\DomainException::class, 'When a #lazy_builder callback is specified, no properties can exist; all properties must be generated by the #lazy_builder callback. You specified the following properties: #llama, #piglet.');
     $this->renderer->renderRoot($element);
   }
 
   /**
    * @covers ::render
    * @covers ::doRender
-   *
-   * @expectedException \LogicException
-   * @expectedExceptionMessage When #create_placeholder is set, a #lazy_builder callback must be present as well.
    */
   public function testCreatePlaceholderPropertyWithoutLazyBuilder() {
     $element = [];
     $element['#create_placeholder'] = TRUE;
 
+    $this->setExpectedException(\LogicException::class, 'When #create_placeholder is set, a #lazy_builder callback must be present as well.');
     $this->renderer->renderRoot($element);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php b/web/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
index bffbd221b..76f9d48b2 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
@@ -31,8 +31,6 @@ class RendererRecursionTest extends RendererTestBase {
    * @covers ::renderRoot
    * @covers ::render
    * @covers ::doRender
-   *
-   * @expectedException \LogicException
    */
   public function testRenderRecursionWithNestedRenderRoot() {
     list($complex_child_markup, $parent_markup, $complex_child_template) = $this->setUpRenderRecursionComplexElements();
@@ -41,6 +39,7 @@ class RendererRecursionTest extends RendererTestBase {
 
     $complex_child = $complex_child_template;
     $callable = function () use ($renderer, $complex_child) {
+      $this->setExpectedException(\LogicException::class);
       $renderer->renderRoot($complex_child);
     };
 
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php b/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php
index 51cfde8b9..962ba1e22 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php
@@ -151,7 +151,7 @@ class RendererTest extends RendererTestBase {
     // Test #allowed_tags in combination with #markup and #pre_render.
     $data[] = [[
       '#markup' => 'foo',
-      '#allowed_tags' => array('script'),
+      '#allowed_tags' => ['script'],
       '#pre_render' => [function($elements) {
         $elements['#markup'] .= '<script>alert("bar");</script>';
         return $elements;
@@ -408,17 +408,17 @@ class RendererTest extends RendererTestBase {
     $first = $this->randomMachineName();
     $second = $this->randomMachineName();
     // The same array structure again, but with #sorted set to TRUE.
-    $elements = array(
-      'second' => array(
+    $elements = [
+      'second' => [
         '#weight' => 10,
         '#markup' => $second,
-      ),
-      'first' => array(
+      ],
+      'first' => [
         '#weight' => 0,
         '#markup' => $first,
-      ),
+      ],
       '#sorted' => TRUE,
-    );
+    ];
     $output = $this->renderer->renderRoot($elements);
 
     // The elements should appear in output in the same order as the array.
@@ -597,9 +597,9 @@ class RendererTest extends RendererTestBase {
    * @covers ::doRender
    */
   public function testRenderWithoutThemeArguments() {
-    $element = array(
+    $element = [
       '#theme' => 'common_test_foo',
-    );
+    ];
 
     $this->themeManager->expects($this->once())
       ->method('render')
@@ -615,11 +615,11 @@ class RendererTest extends RendererTestBase {
    * @covers ::doRender
    */
   public function testRenderWithThemeArguments() {
-    $element = array(
+    $element = [
       '#theme' => 'common_test_foo',
       '#foo' => $this->randomMachineName(),
       '#bar' => $this->randomMachineName(),
-    );
+    ];
 
     $this->themeManager->expects($this->once())
       ->method('render')
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index 7c5e8557d..964898cb3 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -208,7 +208,7 @@ abstract class RendererTestBase extends UnitTestCase {
    * Sets up a memory-based render cache back-end.
    */
   protected function setupMemoryCache() {
-    $this->memoryCache = $this->memoryCache ?: new MemoryBackend('render');
+    $this->memoryCache = $this->memoryCache ?: new MemoryBackend();
 
     $this->cacheFactory->expects($this->atLeastOnce())
       ->method('get')
diff --git a/web/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php
index dadf612f0..96a01b431 100644
--- a/web/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Route/RoleAccessCheckTest.php
@@ -27,54 +27,54 @@ class RoleAccessCheckTest extends UnitTestCase {
   protected function getTestRouteCollection() {
     $route_collection = new RouteCollection();
     $route_collection->add('role_test_1', new Route('/role_test_1',
-      array(
+      [
         '_controller' => '\Drupal\router_test\TestControllers::test1',
-      ),
-      array(
+      ],
+      [
         '_role' => 'role_test_1',
-      )
+      ]
     ));
     $route_collection->add('role_test_2', new Route('/role_test_2',
-      array(
+      [
         '_controller' => '\Drupal\router_test\TestControllers::test1',
-      ),
-      array(
+      ],
+      [
         '_role' => 'role_test_2',
-      )
+      ]
     ));
     $route_collection->add('role_test_3', new Route('/role_test_3',
-      array(
+      [
         '_controller' => '\Drupal\router_test\TestControllers::test1',
-      ),
-      array(
+      ],
+      [
         '_role' => 'role_test_1,role_test_2',
-      )
+      ]
     ));
     // Ensure that trimming the values works on "OR" conjunctions.
     $route_collection->add('role_test_4', new Route('/role_test_4',
-      array(
+      [
         '_controller' => '\Drupal\router_test\TestControllers::test1',
-      ),
-      array(
+      ],
+      [
         '_role' => 'role_test_1 , role_test_2',
-      )
+      ]
     ));
     $route_collection->add('role_test_5', new Route('/role_test_5',
-      array(
+      [
         '_controller' => '\Drupal\router_test\TestControllers::test1',
-      ),
-      array(
+      ],
+      [
         '_role' => 'role_test_1+role_test_2',
-      )
+      ]
     ));
     // Ensure that trimming the values works on "AND" conjunctions.
     $route_collection->add('role_test_6', new Route('/role_test_6',
-      array(
+      [
         '_controller' => '\Drupal\router_test\TestControllers::test1',
-      ),
-      array(
+      ],
+      [
         '_role' => 'role_test_1 + role_test_2',
-      )
+      ]
     ));
 
     return $route_collection;
@@ -93,35 +93,35 @@ class RoleAccessCheckTest extends UnitTestCase {
     // Setup one user with the first role, one with the second, one with both
     // and one final without any of these two roles.
 
-    $account_1 = new UserSession(array(
+    $account_1 = new UserSession([
       'uid' => 1,
-      'roles' => array($rid_1),
-    ));
+      'roles' => [$rid_1],
+    ]);
 
-    $account_2 = new UserSession(array(
+    $account_2 = new UserSession([
       'uid' => 2,
-      'roles' => array($rid_2),
-    ));
+      'roles' => [$rid_2],
+    ]);
 
-    $account_12 = new UserSession(array(
+    $account_12 = new UserSession([
       'uid' => 3,
-      'roles' => array($rid_1, $rid_2),
-    ));
+      'roles' => [$rid_1, $rid_2],
+    ]);
 
-    $account_none = new UserSession(array(
+    $account_none = new UserSession([
       'uid' => 1,
-      'roles' => array(),
-    ));
+      'roles' => [],
+    ]);
 
     // Setup expected values; specify which paths can be accessed by which user.
-    return array(
-      array('role_test_1', array($account_1, $account_12), array($account_2, $account_none)),
-      array('role_test_2', array($account_2, $account_12), array($account_1, $account_none)),
-      array('role_test_3', array($account_12), array($account_1, $account_2, $account_none)),
-      array('role_test_4', array($account_12), array($account_1, $account_2, $account_none)),
-      array('role_test_5', array($account_1, $account_2, $account_12), array()),
-      array('role_test_6', array($account_1, $account_2, $account_12), array()),
-    );
+    return [
+      ['role_test_1', [$account_1, $account_12], [$account_2, $account_none]],
+      ['role_test_2', [$account_2, $account_12], [$account_1, $account_none]],
+      ['role_test_3', [$account_12], [$account_1, $account_2, $account_none]],
+      ['role_test_4', [$account_12], [$account_1, $account_2, $account_none]],
+      ['role_test_5', [$account_1, $account_2, $account_12], []],
+      ['role_test_6', [$account_1, $account_2, $account_12], []],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php b/web/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php
index 5bc2be0fa..1de17456e 100644
--- a/web/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php
@@ -30,14 +30,14 @@ class RouteProcessorManagerTest extends UnitTestCase {
    */
   public function testRouteProcessorManager() {
     $route = new Route('');
-    $parameters = array('test' => 'test');
+    $parameters = ['test' => 'test'];
     $route_name = 'test_name';
 
-    $processors = array(
+    $processors = [
       10 => $this->getMockProcessor($route_name, $route, $parameters),
       5 => $this->getMockProcessor($route_name, $route, $parameters),
       0 => $this->getMockProcessor($route_name, $route, $parameters),
-    );
+    ];
 
     // Add the processors in reverse order.
     foreach ($processors as $priority => $processor) {
diff --git a/web/core/modules/system/tests/modules/accept_header_routing_test/tests/Unit/AcceptHeaderMatcherTest.php b/web/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php
similarity index 89%
rename from web/core/modules/system/tests/modules/accept_header_routing_test/tests/Unit/AcceptHeaderMatcherTest.php
rename to web/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php
index 16bb08f4a..8d6bf8138 100644
--- a/web/core/modules/system/tests/modules/accept_header_routing_test/tests/Unit/AcceptHeaderMatcherTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\Tests\accept_header_routing_teste\Unit\Routing;
+namespace Drupal\Tests\Core\Routing;
 
 use Drupal\accept_header_routing_test\Routing\AcceptHeaderMatcher;
-use Drupal\Tests\Core\Routing\RoutingFixtures;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
 
 /**
  * Confirm that the mime types partial matcher is functioning properly.
@@ -86,9 +86,6 @@ class AcceptHeaderMatcherTest extends UnitTestCase {
 
   /**
    * Confirms that the AcceptHeaderMatcher throws an exception for no-route.
-   *
-   * @expectedException \Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException
-   * @expectedExceptionMessage No route found for the specified formats application/json text/xml.
    */
   public function testNoRouteFound() {
     // Remove the sample routes that would match any method.
@@ -101,9 +98,8 @@ class AcceptHeaderMatcherTest extends UnitTestCase {
     $request = Request::create('path/two', 'GET');
     $request->headers->set('Accept', 'application/json, text/xml;q=0.9');
     $request->setRequestFormat('json');
+    $this->setExpectedException(NotAcceptableHttpException::class, 'No route found for the specified formats application/json text/xml');
     $this->matcher->filter($routes, $request);
-    $this->matcher->filter($routes, $request);
-    $this->fail('No exception was thrown.');
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php b/web/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
index 0b7bcc673..53405f115 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
@@ -61,7 +61,7 @@ class AccessAwareRouterTest extends UnitTestCase {
       ->getMock();
     $this->chainRouter->expects($this->once())
       ->method('matchRequest')
-      ->will($this->returnValue(array(RouteObjectInterface::ROUTE_OBJECT => $this->route)));
+      ->will($this->returnValue([RouteObjectInterface::ROUTE_OBJECT => $this->route]));
     $this->router = new AccessAwareRouter($this->chainRouter, $this->accessManager, $this->currentUser);
   }
 
@@ -87,8 +87,6 @@ class AccessAwareRouterTest extends UnitTestCase {
 
   /**
    * Tests the matchRequest() function for access denied.
-   *
-   * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
    */
   public function testMatchRequestDenied() {
     $this->setupRouter();
@@ -98,12 +96,8 @@ class AccessAwareRouterTest extends UnitTestCase {
       ->method('checkRequest')
       ->with($request)
       ->willReturn($access_result);
-    $parameters = $this->router->matchRequest($request);
-    $expected = [
-      AccessAwareRouterInterface::ACCESS_RESULT => $access_result,
-    ];
-    $this->assertSame($expected, $request->attributes->all());
-    $this->assertSame($expected, $parameters);
+    $this->setExpectedException(AccessDeniedHttpException::class);
+    $this->router->matchRequest($request);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RedirectDestinationTest.php b/web/core/tests/Drupal/Tests/Core/Routing/RedirectDestinationTest.php
index fd99e9907..2d733c3da 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RedirectDestinationTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RedirectDestinationTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\Core\Routing;
 
+use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Routing\RedirectDestination;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
@@ -51,7 +52,7 @@ class RedirectDestinationTest extends UnitTestCase {
       ->willReturnCallback(function($route, $parameters, $options) {
         $query_string = '';
         if (!empty($options['query'])) {
-          $query_string = '?' . $options['query'];
+          $query_string = '?' . UrlHelper::buildQuery($options['query']);
         }
 
         return '/current-path' . $query_string;
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RequestFormatRouteFilterTest.php b/web/core/tests/Drupal/Tests/Core/Routing/RequestFormatRouteFilterTest.php
index 39a960b54..4a9e0c6b5 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RequestFormatRouteFilterTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RequestFormatRouteFilterTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\Core\Routing;
 use Drupal\Core\Routing\RequestFormatRouteFilter;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
@@ -35,10 +36,20 @@ class RequestFormatRouteFilterTest extends UnitTestCase {
 
   /**
    * @covers ::filter
+   * @dataProvider filterProvider
    */
-  public function testFilter() {
+  public function testFilter(RouteCollection $collection, $request_format, array $expected_filtered_collection) {
     $route_filter = new RequestFormatRouteFilter();
 
+    $request = new Request();
+    $request->setRequestFormat($request_format);
+    $collection = $route_filter->filter($collection, $request);
+
+    $this->assertCount(count($expected_filtered_collection), $collection);
+    $this->assertSame($expected_filtered_collection, array_keys($collection->all()));
+  }
+
+  public function filterProvider() {
     $route_without_format = new Route('/test');
     $route_with_format = $route = new Route('/test');
     $route_with_format->setRequirement('_format', 'json');
@@ -50,19 +61,20 @@ class RequestFormatRouteFilterTest extends UnitTestCase {
     $collection->add('test_1', $route_with_format);
     $collection->add('test_2', $route_with_multiple_formats);
 
-    $request = new Request();
-    $request->setRequestFormat('xml');
-    $collection = $route_filter->filter($collection, $request);
+    $sole_route_match_single_format = new RouteCollection();
+    $sole_route_match_single_format->add('sole_route_single_format', $route_with_format);
 
-    $this->assertCount(2, $collection);
-    $this->assertEquals(array_keys($collection->all())[0], 'test_2');
-    $this->assertEquals(array_keys($collection->all())[1], 'test_0');
+    return [
+      'xml requested' => [clone $collection, 'xml', ['test_2', 'test_0']],
+      'json requested' => [clone $collection, 'json', ['test_1', 'test_2', 'test_0']],
+      'html format requested' => [clone $collection, 'html', ['test_0']],
+      'no format requested, defaults to html' => [clone $collection, NULL, ['test_0']],
+      'no format requested, single route match with single format, defaults to that format' => [clone $sole_route_match_single_format, NULL, ['sole_route_single_format']],
+    ];
   }
 
   /**
    * @covers ::filter
-   * @expectedException \Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException
-   * @expectedExceptionMessage No route found for the specified format xml.
    */
   public function testNoRouteFound() {
     $collection = new RouteCollection();
@@ -74,6 +86,23 @@ class RequestFormatRouteFilterTest extends UnitTestCase {
     $request = Request::create('test?_format=xml', 'GET');
     $request->setRequestFormat('xml');
     $route_filter = new RequestFormatRouteFilter();
+    $this->setExpectedException(NotAcceptableHttpException::class, 'No route found for the specified format xml.');
+    $route_filter->filter($collection, $request);
+  }
+
+  /**
+   * @covers ::filter
+   */
+  public function testNoRouteFoundWhenNoRequestFormatAndSingleRouteWithMultipleFormats() {
+    $this->setExpectedException(NotAcceptableHttpException::class, 'No route found for the specified format html.');
+
+    $collection = new RouteCollection();
+    $route_with_format = $route = new Route('/test');
+    $route_with_format->setRequirement('_format', 'json|xml');
+    $collection->add('sole_route_multiple_formats', $route_with_format);
+
+    $request = Request::create('test', 'GET');
+    $route_filter = new RequestFormatRouteFilter();
     $route_filter->filter($collection, $request);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
index a1095cd2e..d07593410 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
@@ -106,7 +106,7 @@ class RouteBuilderTest extends UnitTestCase {
 
     $this->yamlDiscovery->expects($this->any())
       ->method('findAll')
-      ->will($this->returnValue(array()));
+      ->will($this->returnValue([]));
 
     $this->assertTrue($this->routeBuilder->rebuild());
   }
@@ -149,7 +149,7 @@ class RouteBuilderTest extends UnitTestCase {
 
     $this->yamlDiscovery->expects($this->once())
       ->method('findAll')
-      ->will($this->returnValue(array('test_module' => $routes)));
+      ->will($this->returnValue(['test_module' => $routes]));
 
     $route_collection = $routing_fixtures->sampleRouteCollection();
     $route_build_event = new RouteBuildEvent($route_collection);
@@ -192,14 +192,14 @@ class RouteBuilderTest extends UnitTestCase {
 
     $this->yamlDiscovery->expects($this->once())
       ->method('findAll')
-      ->will($this->returnValue(array(
-        'test_module' => array(
-          'route_callbacks' => array(
+      ->will($this->returnValue([
+        'test_module' => [
+          'route_callbacks' => [
             '\Drupal\Tests\Core\Routing\TestRouteSubscriber::routesFromArray',
             'test_module.route_service:routesFromCollection',
-          ),
-        ),
-      )));
+          ],
+        ],
+      ]));
 
     $container = new ContainerBuilder();
     $container->set('test_module.route_service', new TestRouteSubscriber());
@@ -215,7 +215,7 @@ class RouteBuilderTest extends UnitTestCase {
           list($class, $method) = explode('::', $controller, 2);
           $object = new $class();
         }
-        return array($object, $method);
+        return [$object, $method];
       }));
 
     $route_collection_filled = new RouteCollection();
@@ -262,8 +262,8 @@ class RouteBuilderTest extends UnitTestCase {
       ->with('router_rebuild');
 
     $this->yamlDiscovery->expects($this->any())
-                        ->method('findAll')
-                        ->will($this->returnValue(array()));
+      ->method('findAll')
+      ->will($this->returnValue([]));
 
     $this->routeBuilder->setRebuildNeeded();
 
@@ -312,9 +312,9 @@ class TestRouteBuilder extends RouteBuilder {
  */
 class TestRouteSubscriber {
   public function routesFromArray() {
-    return array(
+    return [
       'test_route.1' => new Route('/test-route/1'),
-    );
+    ];
   }
   public function routesFromCollection() {
     $collection = new RouteCollection();
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RouteCompilerTest.php b/web/core/tests/Drupal/Tests/Core/Routing/RouteCompilerTest.php
index 271e313e2..2ddfdcaed 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RouteCompilerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RouteCompilerTest.php
@@ -38,15 +38,15 @@ class RouteCompilerTest extends UnitTestCase {
    *   value.
    */
   public function providerTestGetFit() {
-    return array(
-      array('test', 1),
-      array('/testwithleadingslash', 1),
-      array('testwithtrailingslash/', 1),
-      array('/testwithslashes/', 1),
-      array('test/with/multiple/parts', 15),
-      array('test/with/{some}/slugs', 13),
-      array('test/very/long/path/that/drupal/7/could/not/have/handled', 2047),
-    );
+    return [
+      ['test', 1],
+      ['/testwithleadingslash', 1],
+      ['testwithtrailingslash/', 1],
+      ['/testwithslashes/', 1],
+      ['test/with/multiple/parts', 15],
+      ['test/with/{some}/slugs', 13],
+      ['test/very/long/path/that/drupal/7/could/not/have/handled', 2047],
+    ];
   }
 
   /**
@@ -67,9 +67,9 @@ class RouteCompilerTest extends UnitTestCase {
   public function testCompilationDefaultValue() {
     // Because "here" has a default value, it should not factor into the outline
     // or the fitness.
-    $route = new Route('/test/{something}/more/{here}', array(
+    $route = new Route('/test/{something}/more/{here}', [
       'here' => 'there',
-    ));
+    ]);
     $route->setOption('compiler_class', 'Drupal\Core\Routing\RouteCompiler');
     $compiled = $route->compile();
 
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php b/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php
index 22055c9f2..0a3c65cbe 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTest.php
@@ -32,9 +32,9 @@ class RouteMatchTest extends RouteMatchTestBase {
     $route_match = RouteMatch::createFromRequest($request);
     $this->assertNull($route_match->getRouteName());
     $this->assertNull($route_match->getRouteObject());
-    $this->assertSame(array(), $route_match->getParameters()->all());
+    $this->assertSame([], $route_match->getParameters()->all());
     $this->assertNull($route_match->getParameter('foo'));
-    $this->assertSame(array(), $route_match->getRawParameters()->all());
+    $this->assertSame([], $route_match->getRawParameters()->all());
     $this->assertNull($route_match->getRawParameter('foo'));
 
     // A routed request without parameter upcasting.
@@ -45,17 +45,17 @@ class RouteMatchTest extends RouteMatchTestBase {
     $route_match = RouteMatch::createFromRequest($request);
     $this->assertSame('test_route', $route_match->getRouteName());
     $this->assertSame($route, $route_match->getRouteObject());
-    $this->assertSame(array('foo' => '1'), $route_match->getParameters()->all());
-    $this->assertSame(array(), $route_match->getRawParameters()->all());
+    $this->assertSame(['foo' => '1'], $route_match->getParameters()->all());
+    $this->assertSame([], $route_match->getRawParameters()->all());
 
     // A routed request with parameter upcasting.
     $foo = new \stdClass();
     $foo->value = 1;
     $request->attributes->set('foo', $foo);
-    $request->attributes->set('_raw_variables', new ParameterBag(array('foo' => '1')));
+    $request->attributes->set('_raw_variables', new ParameterBag(['foo' => '1']));
     $route_match = RouteMatch::createFromRequest($request);
-    $this->assertSame(array('foo' => $foo), $route_match->getParameters()->all());
-    $this->assertSame(array('foo' => '1'), $route_match->getRawParameters()->all());
+    $this->assertSame(['foo' => $foo], $route_match->getParameters()->all());
+    $this->assertSame(['foo' => '1'], $route_match->getRawParameters()->all());
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php b/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
index 6af83970c..2678fd326 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RouteMatchTestBase.php
@@ -31,46 +31,46 @@ abstract class RouteMatchTestBase extends UnitTestCase {
    * Provide sets of parameters and expected parameters for parameter tests.
    */
   public function routeMatchProvider() {
-    $base_data = array(
-      array(
+    $base_data = [
+      [
         new Route(
           '/test-route/{param_without_leading_underscore}/{_param_with_leading_underscore}',
-          array(
+          [
             'default_without_leading_underscore' => NULL,
             '_default_with_leading_underscore' => NULL,
-          )
+          ]
         ),
-        array(
+        [
           'param_without_leading_underscore' => 'value',
           '_param_with_leading_underscore' => 'value',
           'default_without_leading_underscore' => 'value',
           '_default_with_leading_underscore' => 'value',
           'foo' => 'value',
-        ),
+        ],
         // Parameters should be filtered to only those defined by the route.
         // Specifically:
         // - Path parameters, regardless of name.
         // - Defaults that are not path parameters only if they do not start with
         //   an underscore.
-        array(
+        [
           'param_without_leading_underscore' => 'value',
           '_param_with_leading_underscore' => 'value',
           'default_without_leading_underscore' => 'value',
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
-    $data = array();
+    $data = [];
     foreach ($base_data as $entry) {
       $route = $entry[0];
       $params = $entry[1];
       $expected_params = $entry[2];
-      $data[] = array(
+      $data[] = [
         $this->getRouteMatch('test_route', $route, $params, $params),
         $route,
         $params,
         $expected_params,
-      );
+      ];
     }
 
     return $data;
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php b/web/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php
index 4db429729..90b4a9ddb 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php
@@ -61,15 +61,15 @@ class RoutePreloaderTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
     $route_collection = new RouteCollection();
-    $route_collection->add('test', new Route('/admin/foo', array('_controller' => 'Drupal\ExampleController')));
-    $route_collection->add('test2', new Route('/admin/bar', array('_controller' => 'Drupal\ExampleController')));
+    $route_collection->add('test', new Route('/admin/foo', ['_controller' => 'Drupal\ExampleController']));
+    $route_collection->add('test2', new Route('/admin/bar', ['_controller' => 'Drupal\ExampleController']));
     $event->expects($this->once())
       ->method('getRouteCollection')
       ->will($this->returnValue($route_collection));
 
     $this->state->expects($this->once())
       ->method('set')
-      ->with('routing.non_admin_routes', array());
+      ->with('routing.non_admin_routes', []);
     $this->preloader->onAlterRoutes($event);
     $this->preloader->onFinishedRoutes(new Event());
   }
@@ -82,17 +82,17 @@ class RoutePreloaderTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
     $route_collection = new RouteCollection();
-    $route_collection->add('test', new Route('/foo/admin/foo', array('_controller' => 'Drupal\ExampleController')));
-    $route_collection->add('test2', new Route('/bar/admin/bar', array('_controller' => 'Drupal\ExampleController')));
-    $route_collection->add('test3', new Route('/administrator/a', array('_controller' => 'Drupal\ExampleController')));
-    $route_collection->add('test4', new Route('/admin', array('_controller' => 'Drupal\ExampleController')));
+    $route_collection->add('test', new Route('/foo/admin/foo', ['_controller' => 'Drupal\ExampleController']));
+    $route_collection->add('test2', new Route('/bar/admin/bar', ['_controller' => 'Drupal\ExampleController']));
+    $route_collection->add('test3', new Route('/administrator/a', ['_controller' => 'Drupal\ExampleController']));
+    $route_collection->add('test4', new Route('/admin', ['_controller' => 'Drupal\ExampleController']));
     $event->expects($this->once())
       ->method('getRouteCollection')
       ->will($this->returnValue($route_collection));
 
     $this->state->expects($this->once())
       ->method('set')
-      ->with('routing.non_admin_routes', array('test', 'test2', 'test3'));
+      ->with('routing.non_admin_routes', ['test', 'test2', 'test3']);
     $this->preloader->onAlterRoutes($event);
     $this->preloader->onFinishedRoutes(new Event());
   }
@@ -106,17 +106,17 @@ class RoutePreloaderTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
     $route_collection = new RouteCollection();
-    $route_collection->add('test', new Route('/admin/foo', array('_controller' => 'Drupal\ExampleController')));
-    $route_collection->add('test2', new Route('/bar', array('_controller' => 'Drupal\ExampleController')));
+    $route_collection->add('test', new Route('/admin/foo', ['_controller' => 'Drupal\ExampleController']));
+    $route_collection->add('test2', new Route('/bar', ['_controller' => 'Drupal\ExampleController']));
     // Non content routes, like ajax callbacks should be ignored.
-    $route_collection->add('test3', new Route('/bar', array('_controller' => 'Drupal\ExampleController')));
+    $route_collection->add('test3', new Route('/bar', ['_controller' => 'Drupal\ExampleController']));
     $event->expects($this->once())
       ->method('getRouteCollection')
       ->will($this->returnValue($route_collection));
 
     $this->state->expects($this->once())
       ->method('set')
-      ->with('routing.non_admin_routes', array('test2', 'test3'));
+      ->with('routing.non_admin_routes', ['test2', 'test3']);
     $this->preloader->onAlterRoutes($event);
     $this->preloader->onFinishedRoutes(new Event());
   }
@@ -161,7 +161,7 @@ class RoutePreloaderTest extends UnitTestCase {
     $this->state->expects($this->once())
       ->method('get')
       ->with('routing.non_admin_routes')
-      ->will($this->returnValue(array('test2')));
+      ->will($this->returnValue(['test2']));
 
     $this->preloader->onRequest($event);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php b/web/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
index d1826ed45..38278ab08 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RoutingFixtures.php
@@ -47,32 +47,32 @@ class RoutingFixtures {
    * Returns a static version of the routes.
    */
   public function staticSampleRouteCollection() {
-    $routes = array();
-    $routes['route_a'] = array(
+    $routes = [];
+    $routes['route_a'] = [
       'path' => '/path/one',
-      'methods' => array('GET'),
-    );
-    $routes['route_b'] = array(
+      'methods' => ['GET'],
+    ];
+    $routes['route_b'] = [
       'path' => '/path/one',
-      'methods' => array('PUT'),
-    );
-    $routes['route_c'] = array(
+      'methods' => ['PUT'],
+    ];
+    $routes['route_c'] = [
       'path' => '/path/two',
-      'methods' => array('GET'),
-      'requirements' => array(
+      'methods' => ['GET'],
+      'requirements' => [
         '_format' => 'json'
-      ),
-    );
-    $routes['route_d'] = array(
+      ],
+    ];
+    $routes['route_d'] = [
       'path' => '/path/three',
-    );
-    $routes['route_e'] = array(
+    ];
+    $routes['route_e'] = [
       'path' => '/path/two',
-      'methods' => array('GET', 'HEAD'),
-      'requirements' => array(
+      'methods' => ['GET', 'HEAD'],
+      'requirements' => [
         '_format' => 'html'
-      ),
-    );
+      ],
+    ];
 
     return $routes;
   }
@@ -139,6 +139,74 @@ class RoutingFixtures {
     return $collection;
   }
 
+  /**
+   * Returns a complex set of routes for testing.
+   *
+   * @return \Symfony\Component\Routing\RouteCollection
+   */
+  public function mixedCaseRouteCollection() {
+    $collection = new RouteCollection();
+
+    $route = new Route('/path/one');
+    $route->setMethods(['GET']);
+    $collection->add('route_a', $route);
+
+    $route = new Route('/path/{thing}/one');
+    $route->setMethods(['PUT']);
+    $collection->add('route_b', $route);
+
+    // Uses Hebrew letter QOF (U+05E7)
+    $route = new Route('/somewhere/{item}/over/the/קainbow');
+    $route->setMethods(['GET']);
+    $collection->add('route_c', $route);
+
+    $route = new Route('/another/{thing}/aboUT/{item}');
+    $collection->add('route_d', $route);
+
+    // Greek letters lower case phi (U+03C6) and lower case omega (U+03C9)
+    $route = new Route('/place/meφω');
+    $route->setMethods(['GET', 'HEAD']);
+    $collection->add('route_e', $route);
+
+    return $collection;
+  }
+
+  /**
+   * Returns a complex set of routes for testing.
+   *
+   * @return \Symfony\Component\Routing\RouteCollection
+   */
+  public function duplicatePathsRouteCollection() {
+    $collection = new RouteCollection();
+
+    $route = new Route('/path/one');
+    $route->setMethods(['GET']);
+    $collection->add('route_b', $route);
+
+    // Add the routes not in order by route name.
+    $route = new Route('/path/one');
+    $route->setMethods(['GET']);
+    $collection->add('route_a', $route);
+
+    $route = new Route('/path/one');
+    $route->setMethods(['GET']);
+    $collection->add('route_c', $route);
+
+    $route = new Route('/path/TWO');
+    $route->setMethods(['GET']);
+    $collection->add('route_d', $route);
+
+    // Greek letters lower case phi (U+03C6) and lower case omega (U+03C9)
+    $route = new Route('/place/meφω');
+    $route->setMethods(['GET', 'HEAD']);
+    $collection->add('route_f', $route);
+
+    $route = new Route('/PLACE/meφω');
+    $collection->add('route_e', $route);
+
+    return $collection;
+  }
+
   /**
    * Returns a Content-type restricted set of routes for testing.
    *
@@ -167,74 +235,74 @@ class RoutingFixtures {
    */
   public function routingTableDefinition() {
 
-    $tables['test_routes'] = array(
+    $tables['test_routes'] = [
       'description' => 'Maps paths to various callbacks (access, page and title)',
-      'fields' => array(
-        'name' => array(
+      'fields' => [
+        'name' => [
           'description' => 'Primary Key: Machine name of this route',
           'type' => 'varchar_ascii',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'path' => array(
+        ],
+        'path' => [
           'description' => 'The path for this URI',
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'pattern_outline' => array(
+        ],
+        'pattern_outline' => [
           'description' => 'The pattern',
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'provider' => array(
+        ],
+        'provider' => [
           'description' => 'The provider grouping to which a route belongs.',
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'access_callback' => array(
+        ],
+        'access_callback' => [
           'description' => 'The callback which determines the access to this router path. Defaults to \Drupal\Core\Session\AccountInterface::hasPermission.',
           'type' => 'varchar',
           'length' => 255,
           'not null' => TRUE,
           'default' => '',
-        ),
-        'access_arguments' => array(
+        ],
+        'access_arguments' => [
           'description' => 'A serialized array of arguments for the access callback.',
           'type' => 'blob',
           'not null' => FALSE,
-        ),
-        'fit' => array(
+        ],
+        'fit' => [
           'description' => 'A numeric representation of how specific the path is.',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
-        ),
-        'number_parts' => array(
+        ],
+        'number_parts' => [
           'description' => 'Number of parts in this router path.',
           'type' => 'int',
           'not null' => TRUE,
           'default' => 0,
           'size' => 'small',
-        ),
-        'route' => array(
+        ],
+        'route' => [
           'description' => 'A serialized Route object',
           'type' => 'text',
-        ),
-      ),
-      'indexes' => array(
-        'fit' => array('fit'),
-        'pattern_outline' => array('pattern_outline'),
-        'provider' => array('provider'),
-      ),
-      'primary key' => array('name'),
-    );
+        ],
+      ],
+      'indexes' => [
+        'fit' => ['fit'],
+        'pattern_outline' => ['pattern_outline'],
+        'provider' => ['provider'],
+      ],
+      'primary key' => ['name'],
+    ];
 
     return $tables;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php b/web/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php
index 0cfbad56a..ded951b2d 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php
@@ -29,7 +29,6 @@ class TrustedRedirectResponseTest extends UnitTestCase {
 
   /**
    * @covers ::setTargetUrl
-   * @expectedException \InvalidArgumentException
    */
   public function testSetTargetUrlWithUntrustedUrl() {
     $request_context = new RequestContext();
@@ -40,6 +39,7 @@ class TrustedRedirectResponseTest extends UnitTestCase {
 
     $redirect_response = new TrustedRedirectResponse('/example');
 
+    $this->setExpectedException(\InvalidArgumentException::class);
     $redirect_response->setTargetUrl('http://evil-url.com/example');
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index 06e8c177f..6c6d768a4 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -68,6 +68,13 @@ class UrlGeneratorTest extends UnitTestCase {
    */
   protected $context;
 
+  /**
+   * The path processor.
+   *
+   * @var \Drupal\Core\PathProcessor\PathProcessorManager
+   */
+  protected $processorManager;
+
   /**
    * {@inheritdoc}
    */
@@ -100,8 +107,8 @@ class UrlGeneratorTest extends UnitTestCase {
     // We need to set up return value maps for both the getRouteByName() and the
     // getRoutesByNames() method calls on the route provider. The parameters
     // are not passed in and default to an empty array.
-    $route_name_return_map = $routes_names_return_map = array();
-    $return_map_values = array(
+    $route_name_return_map = $routes_names_return_map = [];
+    $return_map_values = [
       [
         'route_name' => 'test_1',
         'return' => $first_route,
@@ -122,10 +129,10 @@ class UrlGeneratorTest extends UnitTestCase {
         'route_name' => '<none>',
         'return' => $none_route,
       ],
-    );
+    ];
     foreach ($return_map_values as $values) {
-      $route_name_return_map[] = array($values['route_name'], $values['return']);
-      $routes_names_return_map[] = array(array($values['route_name']), $values['return']);
+      $route_name_return_map[] = [$values['route_name'], $values['return']];
+      $routes_names_return_map[] = [[$values['route_name']], $values['return']];
     }
     $this->provider = $provider;
     $this->provider->expects($this->any())
@@ -142,7 +149,7 @@ class UrlGeneratorTest extends UnitTestCase {
 
     $alias_manager->expects($this->any())
       ->method('getAliasByPath')
-      ->will($this->returnCallback(array($this, 'aliasManagerCallback')));
+      ->will($this->returnCallback([$this, 'aliasManagerCallback']));
 
     $this->aliasManager = $alias_manager;
 
@@ -156,6 +163,7 @@ class UrlGeneratorTest extends UnitTestCase {
     $processor = new PathProcessorAlias($this->aliasManager);
     $processor_manager = new PathProcessorManager();
     $processor_manager->addOutbound($processor, 1000);
+    $this->processorManager = $processor_manager;
 
     $this->routeProcessorManager = $this->getMockBuilder('Drupal\Core\RouteProcessor\RouteProcessorManager')
       ->disableOriginalConstructor()
@@ -215,7 +223,7 @@ class UrlGeneratorTest extends UnitTestCase {
    * Confirms that generated routes will have aliased paths using interface constants.
    */
   public function testAliasGenerationUsingInterfaceConstants() {
-    $url = $this->generator->generate('test_1', array(), UrlGenerator::ABSOLUTE_PATH);
+    $url = $this->generator->generate('test_1', [], UrlGenerator::ABSOLUTE_PATH);
     $this->assertEquals('/hello/world', $url);
     // No cacheability to test; UrlGenerator::generate() doesn't support
     // collecting cacheability metadata.
@@ -295,7 +303,7 @@ class UrlGeneratorTest extends UnitTestCase {
    * Confirms that generated routes will have aliased paths.
    */
   public function testAliasGenerationWithParameters() {
-    $url = $this->generator->generate('test_2', array('narf' => '5'));
+    $url = $this->generator->generate('test_2', ['narf' => '5']);
     $this->assertEquals('/goodbye/cruel/world', $url);
     // No cacheability to test; UrlGenerator::generate() doesn't support
     // collecting cacheability metadata.
@@ -304,17 +312,17 @@ class UrlGeneratorTest extends UnitTestCase {
       ->method('processOutbound')
       ->with($this->anything());
 
-    $options = array('fragment' => 'top');
+    $options = ['fragment' => 'top'];
     // Extra parameters should appear in the query string.
     $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, '/hello/world?zoo=5#top', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
-    $options = array('query' => array('page' => '1'), 'fragment' => 'bottom');
+    $options = ['query' => ['page' => '1'], 'fragment' => 'bottom'];
     $this->assertGenerateFromRoute('test_2', ['narf' => 5], $options, '/goodbye/cruel/world?page=1#bottom', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
     // Changing the parameters, the route still matches but there is no alias.
     $this->assertGenerateFromRoute('test_2', ['narf' => 7], $options, '/test/two/7?page=1#bottom', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
-    $path = $this->generator->getPathFromRoute('test_2', array('narf' => '5'));
+    $path = $this->generator->getPathFromRoute('test_2', ['narf' => '5']);
     $this->assertEquals('test/two/5', $path);
 
     // Specify a query parameter with NULL.
@@ -363,6 +371,13 @@ class UrlGeneratorTest extends UnitTestCase {
       ['query' => ['page' => '1/2'], 'fragment' => 'bottom'],
       '/test/two/7?page=1/2#bottom',
     ];
+    // A NULL query string.
+    $data['query-with-NULL'] = [
+      'test_2',
+      ['narf' => '7'],
+      ['query' => NULL, 'fragment' => 'bottom'],
+      '/test/two/7#bottom',
+    ];
     return $data;
   }
 
@@ -381,7 +396,7 @@ class UrlGeneratorTest extends UnitTestCase {
    * Confirms that absolute URLs work with generated routes.
    */
   public function testAbsoluteURLGeneration() {
-    $url = $this->generator->generate('test_1', array(), TRUE);
+    $url = $this->generator->generate('test_1', [], TRUE);
     $this->assertEquals('http://localhost/hello/world', $url);
     // No cacheability to test; UrlGenerator::generate() doesn't support
     // collecting cacheability metadata.
@@ -390,7 +405,7 @@ class UrlGeneratorTest extends UnitTestCase {
       ->method('processOutbound')
       ->with($this->anything());
 
-    $options = array('absolute' => TRUE, 'fragment' => 'top');
+    $options = ['absolute' => TRUE, 'fragment' => 'top'];
     // Extra parameters should appear in the query string.
     $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, 'http://localhost/hello/world?zoo=5#top', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT)->setCacheContexts(['url.site']));
   }
@@ -399,7 +414,7 @@ class UrlGeneratorTest extends UnitTestCase {
    * Confirms that absolute URLs work with generated routes using interface constants.
    */
   public function testAbsoluteURLGenerationUsingInterfaceConstants() {
-    $url = $this->generator->generate('test_1', array(), UrlGenerator::ABSOLUTE_URL);
+    $url = $this->generator->generate('test_1', [], UrlGenerator::ABSOLUTE_URL);
     $this->assertEquals('http://localhost/hello/world', $url);
     // No cacheability to test; UrlGenerator::generate() doesn't support
     // collecting cacheability metadata.
@@ -408,7 +423,7 @@ class UrlGeneratorTest extends UnitTestCase {
       ->method('processOutbound')
       ->with($this->anything());
 
-    $options = array('absolute' => TRUE, 'fragment' => 'top');
+    $options = ['absolute' => TRUE, 'fragment' => 'top'];
     // Extra parameters should appear in the query string.
     $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, 'http://localhost/hello/world?zoo=5#top', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT)->setCacheContexts(['url.site']));
   }
@@ -417,20 +432,20 @@ class UrlGeneratorTest extends UnitTestCase {
    * Confirms that explicitly setting the base_url works with generated routes
    */
   public function testBaseURLGeneration() {
-    $options = array('base_url' => 'http://www.example.com:8888');
+    $options = ['base_url' => 'http://www.example.com:8888'];
     $this->assertGenerateFromRoute('test_1', [], $options, 'http://www.example.com:8888/hello/world', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
-    $options = array('base_url' => 'http://www.example.com:8888', 'https' => TRUE);
+    $options = ['base_url' => 'http://www.example.com:8888', 'https' => TRUE];
     $this->assertGenerateFromRoute('test_1', [], $options, 'https://www.example.com:8888/hello/world', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
-    $options = array('base_url' => 'https://www.example.com:8888', 'https' => FALSE);
+    $options = ['base_url' => 'https://www.example.com:8888', 'https' => FALSE];
     $this->assertGenerateFromRoute('test_1', [], $options, 'http://www.example.com:8888/hello/world', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
     $this->routeProcessorManager->expects($this->exactly(2))
       ->method('processOutbound')
       ->with($this->anything());
 
-    $options = array('base_url' => 'http://www.example.com:8888', 'fragment' => 'top');
+    $options = ['base_url' => 'http://www.example.com:8888', 'fragment' => 'top'];
     // Extra parameters should appear in the query string.
     $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, 'http://www.example.com:8888/hello/world?zoo=5#top', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
   }
@@ -439,7 +454,7 @@ class UrlGeneratorTest extends UnitTestCase {
    * Test that the 'scheme' route requirement is respected during url generation.
    */
   public function testUrlGenerationWithHttpsRequirement() {
-    $url = $this->generator->generate('test_4', array(), TRUE);
+    $url = $this->generator->generate('test_4', [], TRUE);
     $this->assertEquals('https://localhost/test/four', $url);
     // No cacheability to test; UrlGenerator::generate() doesn't support
     // collecting cacheability metadata.
@@ -448,7 +463,7 @@ class UrlGeneratorTest extends UnitTestCase {
       ->method('processOutbound')
       ->with($this->anything());
 
-    $options = array('absolute' => TRUE, 'https' => TRUE);
+    $options = ['absolute' => TRUE, 'https' => TRUE];
     $this->assertGenerateFromRoute('test_1', [], $options, 'https://localhost/hello/world', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT)->setCacheContexts(['url.site']));
   }
 
@@ -489,6 +504,26 @@ class UrlGeneratorTest extends UnitTestCase {
     ];
   }
 
+  /**
+   * @covers \Drupal\Core\Routing\UrlGenerator::generateFromRoute
+   *
+   * Note: We use absolute covers to let
+   * \Drupal\Tests\Core\Render\MetadataBubblingUrlGeneratorTest work.
+   */
+  public function testGenerateWithPathProcessorChangingQueryParameter() {
+    $path_processor = $this->getMock(OutboundPathProcessorInterface::CLASS);
+    $path_processor->expects($this->atLeastOnce())
+      ->method('processOutbound')
+      ->willReturnCallback(function ($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+        $options['query'] = ['zoo' => 5];
+        return $path;
+      });
+    $this->processorManager->addOutbound($path_processor);
+
+    $options = [];
+    $this->assertGenerateFromRoute('test_2', ['narf' => 5], $options, '/goodbye/cruel/world?zoo=5', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+  }
+
   /**
    * Asserts \Drupal\Core\Routing\UrlGenerator::generateFromRoute()'s output.
    *
diff --git a/web/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php b/web/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php
new file mode 100644
index 000000000..0e575a07e
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Session/AccountProxyTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\Tests\Core\Session;
+
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Tests\UnitTestCase;
+use Drupal\Core\Session\AccountProxy;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Session\AccountProxy
+ * @group Session
+ */
+class AccountProxyTest extends UnitTestCase {
+
+  /**
+   * @covers ::id
+   * @covers ::setInitialAccountId
+   */
+  public function testId() {
+    $account_proxy = new AccountProxy();
+    $this->assertSame(0, $account_proxy->id());
+    $account_proxy->setInitialAccountId(1);
+    $this->assertFalse(\Drupal::hasContainer());
+    // If the following call loaded the user entity it would call
+    // AccountProxy::loadUserEntity() which would fail because the container
+    // does not exist.
+    $this->assertSame(1, $account_proxy->id());
+    $current_user = $this->prophesize(AccountInterface::class);
+    $current_user->id()->willReturn(2);
+    $account_proxy->setAccount($current_user->reveal());
+    $this->assertSame(2, $account_proxy->id());
+  }
+
+  /**
+   * @covers ::setInitialAccountId
+   */
+  public function testSetInitialAccountIdException() {
+    $this->setExpectedException(\LogicException::class);
+    $account_proxy = new AccountProxy();
+    $current_user = $this->prophesize(AccountInterface::class);
+    $account_proxy->setAccount($current_user->reveal());
+    $account_proxy->setInitialAccountId(1);
+  }
+
+}
+
+namespace Drupal\Core\Session;
+
+if (!function_exists('drupal_get_user_timezone')) {
+  function drupal_get_user_timezone() {
+    return date_default_timezone_get();
+  }
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Session/AnonymousUserSessionTest.php b/web/core/tests/Drupal/Tests/Core/Session/AnonymousUserSessionTest.php
index 0840e0000..031de8244 100644
--- a/web/core/tests/Drupal/Tests/Core/Session/AnonymousUserSessionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Session/AnonymousUserSessionTest.php
@@ -20,8 +20,8 @@ class AnonymousUserSessionTest extends UnitTestCase {
    */
   public function testUserGetRoles() {
     $anonymous_user = new AnonymousUserSession();
-    $this->assertEquals(array(RoleInterface::ANONYMOUS_ID), $anonymous_user->getRoles());
-    $this->assertEquals(array(), $anonymous_user->getRoles(TRUE));
+    $this->assertEquals([RoleInterface::ANONYMOUS_ID], $anonymous_user->getRoles());
+    $this->assertEquals([], $anonymous_user->getRoles(TRUE));
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php
index d5e8c32d8..aa980f8c9 100644
--- a/web/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php
@@ -75,12 +75,12 @@ class PermissionsHashGeneratorTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    new Settings(array('hash_salt' => 'test'));
+    new Settings(['hash_salt' => 'test']);
 
     // The mocked super user account, with the same roles as Account 2.
     $this->account1 = $this->getMockBuilder('Drupal\user\Entity\User')
       ->disableOriginalConstructor()
-      ->setMethods(array('getRoles', 'id'))
+      ->setMethods(['getRoles', 'id'])
       ->getMock();
     $this->account1->expects($this->any())
       ->method('id')
@@ -89,10 +89,10 @@ class PermissionsHashGeneratorTest extends UnitTestCase {
       ->method('getRoles');
 
     // Account 2: 'administrator' and 'authenticated' roles.
-    $roles_1 = array('administrator', 'authenticated');
+    $roles_1 = ['administrator', 'authenticated'];
     $this->account2 = $this->getMockBuilder('Drupal\user\Entity\User')
       ->disableOriginalConstructor()
-      ->setMethods(array('getRoles', 'id'))
+      ->setMethods(['getRoles', 'id'])
       ->getMock();
     $this->account2->expects($this->any())
       ->method('getRoles')
@@ -102,10 +102,10 @@ class PermissionsHashGeneratorTest extends UnitTestCase {
       ->willReturn(2);
 
     // Account 3: 'authenticated' and 'administrator' roles (different order).
-    $roles_3 = array('authenticated', 'administrator');
+    $roles_3 = ['authenticated', 'administrator'];
     $this->account3 = $this->getMockBuilder('Drupal\user\Entity\User')
       ->disableOriginalConstructor()
-      ->setMethods(array('getRoles', 'id'))
+      ->setMethods(['getRoles', 'id'])
       ->getMock();
     $this->account3->expects($this->any())
       ->method('getRoles')
@@ -115,10 +115,10 @@ class PermissionsHashGeneratorTest extends UnitTestCase {
       ->willReturn(3);
 
     // Updated account 2: now also 'editor' role.
-    $roles_2_updated = array('editor', 'administrator', 'authenticated');
+    $roles_2_updated = ['editor', 'administrator', 'authenticated'];
     $this->account2Updated = $this->getMockBuilder('Drupal\user\Entity\User')
       ->disableOriginalConstructor()
-      ->setMethods(array('getRoles', 'id'))
+      ->setMethods(['getRoles', 'id'])
       ->getMock();
     $this->account2Updated->expects($this->any())
       ->method('getRoles')
@@ -131,7 +131,7 @@ class PermissionsHashGeneratorTest extends UnitTestCase {
     $random = Crypt::randomBytesBase64(55);
     $this->privateKey = $this->getMockBuilder('Drupal\Core\PrivateKey')
       ->disableOriginalConstructor()
-      ->setMethods(array('get'))
+      ->setMethods(['get'])
       ->getMock();
     $this->privateKey->expects($this->any())
       ->method('get')
@@ -251,9 +251,9 @@ namespace Drupal\Core\Session;
 // @todo remove once user_role_permissions() can be injected.
 if (!function_exists('user_role_permissions')) {
   function user_role_permissions(array $roles) {
-    $role_permissions = array();
+    $role_permissions = [];
     foreach ($roles as $rid) {
-      $role_permissions[$rid] = array();
+      $role_permissions[$rid] = [];
     }
     return $role_permissions;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php b/web/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
index 52969e03e..85fe1bbf3 100644
--- a/web/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
@@ -18,7 +18,7 @@ class UserSessionTest extends UnitTestCase {
    *
    * @var \Drupal\Core\Session\AccountInterface[]
    */
-  protected $users = array();
+  protected $users = [];
 
   /**
    * Provides test data for getHasPermission().
@@ -26,10 +26,10 @@ class UserSessionTest extends UnitTestCase {
    * @return array
    */
   public function providerTestHasPermission() {
-    $data = array();
-    $data[] = array('example permission', array('user_one', 'user_two'), array('user_last'));
-    $data[] = array('another example permission', array('user_two'), array('user_one', 'user_last'));
-    $data[] = array('final example permission', array(), array('user_one', 'user_two', 'user_last'));
+    $data = [];
+    $data[] = ['example permission', ['user_one', 'user_two'], ['user_last']];
+    $data[] = ['another example permission', ['user_two'], ['user_one', 'user_last']];
+    $data[] = ['final example permission', [], ['user_one', 'user_two', 'user_last']];
 
     return $data;
   }
@@ -45,9 +45,9 @@ class UserSessionTest extends UnitTestCase {
    * @return \Drupal\Core\Session\AccountInterface
    *   The created user session.
    */
-  protected function createUserSession(array $rids = array(), $authenticated = FALSE) {
+  protected function createUserSession(array $rids = [], $authenticated = FALSE) {
     array_unshift($rids, $authenticated ? RoleInterface::AUTHENTICATED_ID : RoleInterface::ANONYMOUS_ID);
-    return new UserSession(array('roles' => $rids));
+    return new UserSession(['roles' => $rids]);
   }
 
   /**
@@ -56,57 +56,57 @@ class UserSessionTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $roles = array();
+    $roles = [];
     $roles['role_one'] = $this->getMockBuilder('Drupal\user\Entity\Role')
       ->disableOriginalConstructor()
-      ->setMethods(array('hasPermission'))
+      ->setMethods(['hasPermission'])
       ->getMock();
     $roles['role_one']->expects($this->any())
       ->method('hasPermission')
-      ->will($this->returnValueMap(array(
-        array('example permission', TRUE),
-        array('another example permission', FALSE),
-        array('last example permission', FALSE),
-      )));
+      ->will($this->returnValueMap([
+        ['example permission', TRUE],
+        ['another example permission', FALSE],
+        ['last example permission', FALSE],
+      ]));
 
     $roles['role_two'] = $this->getMockBuilder('Drupal\user\Entity\Role')
       ->disableOriginalConstructor()
-      ->setMethods(array('hasPermission'))
+      ->setMethods(['hasPermission'])
       ->getMock();
     $roles['role_two']->expects($this->any())
       ->method('hasPermission')
-      ->will($this->returnValueMap(array(
-        array('example permission', TRUE),
-        array('another example permission', TRUE),
-        array('last example permission', FALSE),
-      )));
+      ->will($this->returnValueMap([
+        ['example permission', TRUE],
+        ['another example permission', TRUE],
+        ['last example permission', FALSE],
+      ]));
 
     $roles['anonymous'] = $this->getMockBuilder('Drupal\user\Entity\Role')
       ->disableOriginalConstructor()
-      ->setMethods(array('hasPermission'))
+      ->setMethods(['hasPermission'])
       ->getMock();
     $roles['anonymous']->expects($this->any())
       ->method('hasPermission')
-      ->will($this->returnValueMap(array(
-        array('example permission', FALSE),
-        array('another example permission', FALSE),
-        array('last example permission', FALSE),
-      )));
+      ->will($this->returnValueMap([
+        ['example permission', FALSE],
+        ['another example permission', FALSE],
+        ['last example permission', FALSE],
+      ]));
 
     $role_storage = $this->getMockBuilder('Drupal\user\RoleStorage')
       ->disableOriginalConstructor()
-      ->setMethods(array('loadMultiple'))
+      ->setMethods(['loadMultiple'])
       ->getMock();
     $role_storage->expects($this->any())
       ->method('loadMultiple')
-      ->will($this->returnValueMap(array(
-        array(array(), array()),
-        array(NULL, $roles),
-        array(array('anonymous'), array($roles['anonymous'])),
-        array(array('anonymous', 'role_one'), array($roles['role_one'])),
-        array(array('anonymous', 'role_two'), array($roles['role_two'])),
-        array(array('anonymous', 'role_one', 'role_two'), array($roles['role_one'], $roles['role_two'])),
-      )));
+      ->will($this->returnValueMap([
+        [[], []],
+        [NULL, $roles],
+        [['anonymous'], [$roles['anonymous']]],
+        [['anonymous', 'role_one'], [$roles['role_one']]],
+        [['anonymous', 'role_two'], [$roles['role_two']]],
+        [['anonymous', 'role_one', 'role_two'], [$roles['role_one'], $roles['role_two']]],
+      ]));
 
     $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
     $entity_manager->expects($this->any())
@@ -117,9 +117,9 @@ class UserSessionTest extends UnitTestCase {
     $container->set('entity.manager', $entity_manager);
     \Drupal::setContainer($container);
 
-    $this->users['user_one'] = $this->createUserSession(array('role_one'));
-    $this->users['user_two'] = $this->createUserSession(array('role_one', 'role_two'));
-    $this->users['user_three'] = $this->createUserSession(array('role_two'), TRUE);
+    $this->users['user_one'] = $this->createUserSession(['role_one']);
+    $this->users['user_two'] = $this->createUserSession(['role_one', 'role_two']);
+    $this->users['user_three'] = $this->createUserSession(['role_two'], TRUE);
     $this->users['user_last'] = $this->createUserSession();
   }
 
@@ -153,8 +153,8 @@ class UserSessionTest extends UnitTestCase {
    * @todo Move roles constants to a class/interface
    */
   public function testUserGetRoles() {
-    $this->assertEquals(array(RoleInterface::AUTHENTICATED_ID, 'role_two'), $this->users['user_three']->getRoles());
-    $this->assertEquals(array('role_two'), $this->users['user_three']->getRoles(TRUE));
+    $this->assertEquals([RoleInterface::AUTHENTICATED_ID, 'role_two'], $this->users['user_three']->getRoles());
+    $this->assertEquals(['role_two'], $this->users['user_three']->getRoles(TRUE));
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Site/SettingsTest.php b/web/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
index 3cf50fc26..4d34b3069 100644
--- a/web/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
@@ -16,7 +16,7 @@ class SettingsTest extends UnitTestCase {
    *
    * @var array
    */
-  protected $config = array();
+  protected $config = [];
 
   /**
    * The class under test.
@@ -29,11 +29,11 @@ class SettingsTest extends UnitTestCase {
    * @covers ::__construct
    */
   protected function setUp(){
-    $this->config = array(
+    $this->config = [
       'one' => '1',
       'two' => '2',
       'hash_salt' => $this->randomMachineName(),
-    );
+    ];
     $this->settings = new Settings($this->config);
   }
 
@@ -80,12 +80,11 @@ class SettingsTest extends UnitTestCase {
    * @covers ::getHashSalt
    *
    * @dataProvider providerTestGetHashSaltEmpty
-   *
-   * @expectedException \RuntimeException
    */
   public function testGetHashSaltEmpty(array $config) {
     // Re-create settings with no 'hash_salt' key.
     $settings = new Settings($config);
+    $this->setExpectedException(\RuntimeException::class);
     $settings->getHashSalt();
   }
 
@@ -95,21 +94,20 @@ class SettingsTest extends UnitTestCase {
    * @return array
    */
   public function providerTestGetHashSaltEmpty() {
-    return array(
-      array(array()),
-      array(array('hash_salt' => '')),
-      array(array('hash_salt' => NULL)),
-    );
+    return [
+      [[]],
+      [['hash_salt' => '']],
+      [['hash_salt' => NULL]],
+    ];
   }
 
   /**
    * Ensures settings cannot be serialized.
    *
    * @covers ::__sleep
-   *
-   * @expectedException \LogicException
    */
   public function testSerialize() {
+    $this->setExpectedException(\LogicException::class);
     serialize(new Settings([]));
   }
 
@@ -119,11 +117,28 @@ class SettingsTest extends UnitTestCase {
    * @covers ::getApcuPrefix
    */
   public function testGetApcuPrefix() {
-    $settings = new Settings(array('hash_salt' => 123));
+    $settings = new Settings(['hash_salt' => 123]);
     $this->assertNotEquals($settings::getApcuPrefix('cache_test', '/test/a'), $settings::getApcuPrefix('cache_test', '/test/b'));
 
-    $settings = new Settings(array('hash_salt' => 123, 'apcu_ensure_unique_prefix' => FALSE));
+    $settings = new Settings(['hash_salt' => 123, 'apcu_ensure_unique_prefix' => FALSE]);
     $this->assertNotEquals($settings::getApcuPrefix('cache_test', '/test/a'), $settings::getApcuPrefix('cache_test', '/test/b'));
   }
 
+  /**
+   * Tests that an exception is thrown when settings are not initialized yet.
+   *
+   * @covers ::getInstance
+   */
+  public function testGetInstanceReflection() {
+    $settings = new Settings([]);
+
+    $class = new \ReflectionClass(Settings::class);
+    $instace_property = $class->getProperty("instance");
+    $instace_property->setAccessible(TRUE);
+    $instace_property->setValue(NULL);
+
+    $this->setExpectedException(\BadMethodCallException::class);
+    $settings->getInstance();
+  }
+
 }
diff --git a/web/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php b/web/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php
index 585c4b975..b7a784d48 100644
--- a/web/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php
+++ b/web/core/tests/Drupal/Tests/Core/StackMiddleware/ReverseProxyMiddlewareTest.php
@@ -30,12 +30,12 @@ class ReverseProxyMiddlewareTest extends UnitTestCase {
    * Tests that subscriber does not act when reverse proxy is not set.
    */
   public function testNoProxy() {
-    $settings = new Settings(array());
+    $settings = new Settings([]);
     $this->assertEquals(0, $settings->get('reverse_proxy'));
 
     $middleware = new ReverseProxyMiddleware($this->mockHttpKernel, $settings);
     // Mock a request object.
-    $request = $this->getMock('Symfony\Component\HttpFoundation\Request', array('setTrustedHeaderName', 'setTrustedProxies'));
+    $request = $this->getMock('Symfony\Component\HttpFoundation\Request', ['setTrustedHeaderName', 'setTrustedProxies']);
     // setTrustedHeaderName() should never fire.
     $request->expects($this->never())
       ->method('setTrustedHeaderName');
@@ -50,7 +50,7 @@ class ReverseProxyMiddlewareTest extends UnitTestCase {
    */
   public function testReverseProxyEnabled($provided_settings) {
     // Enable reverse proxy and add test values.
-    $settings = new Settings(array('reverse_proxy' => 1) + $provided_settings);
+    $settings = new Settings(['reverse_proxy' => 1] + $provided_settings);
     $this->trustedHeadersAreSet($settings);
   }
 
@@ -58,18 +58,18 @@ class ReverseProxyMiddlewareTest extends UnitTestCase {
    * Data provider for testReverseProxyEnabled.
    */
   public function reverseProxyEnabledProvider() {
-    return array(
-      array(
-        array(
+    return [
+      [
+        [
           'reverse_proxy_header' => 'X_FORWARDED_FOR_CUSTOMIZED',
           'reverse_proxy_proto_header' => 'X_FORWARDED_PROTO_CUSTOMIZED',
           'reverse_proxy_host_header' => 'X_FORWARDED_HOST_CUSTOMIZED',
           'reverse_proxy_port_header' => 'X_FORWARDED_PORT_CUSTOMIZED',
           'reverse_proxy_forwarded_header' => 'FORWARDED_CUSTOMIZED',
-          'reverse_proxy_addresses' => array('127.0.0.2', '127.0.0.3'),
-        ),
-      ),
-    );
+          'reverse_proxy_addresses' => ['127.0.0.2', '127.0.0.3'],
+        ],
+      ],
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/StringTranslation/TranslatableMarkupTest.php b/web/core/tests/Drupal/Tests/Core/StringTranslation/TranslatableMarkupTest.php
index 3ed2b3de6..e48c61035 100644
--- a/web/core/tests/Drupal/Tests/Core/StringTranslation/TranslatableMarkupTest.php
+++ b/web/core/tests/Drupal/Tests/Core/StringTranslation/TranslatableMarkupTest.php
@@ -82,25 +82,20 @@ class TranslatableMarkupTest extends UnitTestCase {
   }
 
   /**
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage $string ("foo") must be a string.
-   *
    * @covers ::__construct
    */
   public function testIsStringAssertion() {
     $translation = $this->getStringTranslationStub();
+    $this->setExpectedException(\InvalidArgumentException::class, '$string ("foo") must be a string.');
     new TranslatableMarkup(new TranslatableMarkup('foo', [], [], $translation));
   }
 
   /**
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage $string ("foo") must be a string.
-   *
    * @covers ::__construct
    */
   public function testIsStringAssertionWithFormattableMarkup() {
-    $translation = $this->getStringTranslationStub();
     $formattable_string = new FormattableMarkup('@bar', ['@bar' => 'foo']);
+    $this->setExpectedException(\InvalidArgumentException::class, '$string ("foo") must be a string.');
     new TranslatableMarkup($formattable_string);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php b/web/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
index 8ab6874e7..2cd750bf1 100644
--- a/web/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
@@ -36,21 +36,21 @@ class TranslationManagerTest extends UnitTestCase {
    * @return array
    */
   public function providerTestFormatPlural() {
-    return array(
-      [1, 'Singular', '@count plural', array(), array(), 'Singular'],
-      [2, 'Singular', '@count plural', array(), array(), '2 plural'],
+    return [
+      [1, 'Singular', '@count plural', [], [], 'Singular'],
+      [2, 'Singular', '@count plural', [], [], '2 plural'],
       // @todo support locale_get_plural
-      [2, 'Singular', '@count @arg', array('@arg' => '<script>'), array(), '2 &lt;script&gt;'],
-      [2, 'Singular', '@count %arg', array('%arg' => '<script>'), array(), '2 <em class="placeholder">&lt;script&gt;</em>'],
-      [1, 'Singular', '@count plural', array(), array('langcode' => NULL), 'Singular'],
-      [1, 'Singular', '@count plural', array(), array('langcode' => 'es'), 'Singular'],
-    );
+      [2, 'Singular', '@count @arg', ['@arg' => '<script>'], [], '2 &lt;script&gt;'],
+      [2, 'Singular', '@count %arg', ['%arg' => '<script>'], [], '2 <em class="placeholder">&lt;script&gt;</em>'],
+      [1, 'Singular', '@count plural', [], ['langcode' => NULL], 'Singular'],
+      [1, 'Singular', '@count plural', [], ['langcode' => 'es'], 'Singular'],
+    ];
   }
 
   /**
    * @dataProvider providerTestFormatPlural
    */
-  public function testFormatPlural($count, $singular, $plural, array $args = array(), array $options = array(), $expected) {
+  public function testFormatPlural($count, $singular, $plural, array $args = [], array $options = [], $expected) {
     $langcode = empty($options['langcode']) ? 'fr' : $options['langcode'];
     $translator = $this->getMock('\Drupal\Core\StringTranslation\Translator\TranslatorInterface');
     $translator->expects($this->once())
@@ -78,7 +78,7 @@ class TranslationManagerTest extends UnitTestCase {
    *
    * @dataProvider providerTestTranslatePlaceholder
    */
-  public function testTranslatePlaceholder($string, array $args = array(), $expected_string) {
+  public function testTranslatePlaceholder($string, array $args = [], $expected_string) {
     $actual = $this->translationManager->translate($string, $args);
     $this->assertInstanceOf(MarkupInterface::class, $actual);
     $this->assertEquals($expected_string, (string) $actual);
diff --git a/web/core/tests/Drupal/Tests/Core/Template/AttributeTest.php b/web/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
index 09ec9894d..b9dc671fa 100644
--- a/web/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
@@ -20,9 +20,9 @@ class AttributeTest extends UnitTestCase {
    * Tests the constructor of the attribute class.
    */
   public function testConstructor() {
-    $attribute = new Attribute(array('class' => array('example-class')));
+    $attribute = new Attribute(['class' => ['example-class']]);
     $this->assertTrue(isset($attribute['class']));
-    $this->assertEquals(new AttributeArray('class', array('example-class')), $attribute['class']);
+    $this->assertEquals(new AttributeArray('class', ['example-class']), $attribute['class']);
 
     // Test adding boolean attributes through the constructor.
     $attribute = new Attribute(['selected' => TRUE, 'checked' => FALSE]);
@@ -30,16 +30,16 @@ class AttributeTest extends UnitTestCase {
     $this->assertFalse($attribute['checked']->value());
 
     // Test that non-array values with name "class" are cast to array.
-    $attribute = new Attribute(array('class' => 'example-class'));
+    $attribute = new Attribute(['class' => 'example-class']);
     $this->assertTrue(isset($attribute['class']));
-    $this->assertEquals(new AttributeArray('class', array('example-class')), $attribute['class']);
+    $this->assertEquals(new AttributeArray('class', ['example-class']), $attribute['class']);
 
     // Test that safe string objects work correctly.
     $safe_string = $this->prophesize(MarkupInterface::class);
     $safe_string->__toString()->willReturn('example-class');
-    $attribute = new Attribute(array('class' => $safe_string->reveal()));
+    $attribute = new Attribute(['class' => $safe_string->reveal()]);
     $this->assertTrue(isset($attribute['class']));
-    $this->assertEquals(new AttributeArray('class', array('example-class')), $attribute['class']);
+    $this->assertEquals(new AttributeArray('class', ['example-class']), $attribute['class']);
   }
 
   /**
@@ -47,27 +47,27 @@ class AttributeTest extends UnitTestCase {
    */
   public function testSet() {
     $attribute = new Attribute();
-    $attribute['class'] = array('example-class');
+    $attribute['class'] = ['example-class'];
 
     $this->assertTrue(isset($attribute['class']));
-    $this->assertEquals(new AttributeArray('class', array('example-class')), $attribute['class']);
+    $this->assertEquals(new AttributeArray('class', ['example-class']), $attribute['class']);
   }
 
   /**
    * Tests adding new values to an existing part of the attribute.
    */
   public function testAdd() {
-    $attribute = new Attribute(array('class' => array('example-class')));
+    $attribute = new Attribute(['class' => ['example-class']]);
 
     $attribute['class'][] = 'other-class';
-    $this->assertEquals(new AttributeArray('class', array('example-class', 'other-class')), $attribute['class']);
+    $this->assertEquals(new AttributeArray('class', ['example-class', 'other-class']), $attribute['class']);
   }
 
   /**
    * Tests removing of values.
    */
   public function testRemove() {
-    $attribute = new Attribute(array('class' => array('example-class')));
+    $attribute = new Attribute(['class' => ['example-class']]);
     unset($attribute['class']);
     $this->assertFalse(isset($attribute['class']));
   }
@@ -152,7 +152,7 @@ class AttributeTest extends UnitTestCase {
     $this->assertEmpty($attribute['class']);
 
     // Test various permutations of adding values to empty Attribute objects.
-    foreach (array(NULL, FALSE, '', []) as $value) {
+    foreach ([NULL, FALSE, '', []] as $value) {
       // Single value.
       $attribute->addClass($value);
       $this->assertEmpty((string) $attribute);
@@ -172,22 +172,22 @@ class AttributeTest extends UnitTestCase {
 
     // Add one class on empty attribute.
     $attribute->addClass('banana');
-    $this->assertArrayEquals(array('banana'), $attribute['class']->value());
+    $this->assertArrayEquals(['banana'], $attribute['class']->value());
 
     // Add one class.
     $attribute->addClass('aa');
-    $this->assertArrayEquals(array('banana', 'aa'), $attribute['class']->value());
+    $this->assertArrayEquals(['banana', 'aa'], $attribute['class']->value());
 
     // Add multiple classes.
     $attribute->addClass('xx', 'yy');
-    $this->assertArrayEquals(array('banana', 'aa', 'xx', 'yy'), $attribute['class']->value());
+    $this->assertArrayEquals(['banana', 'aa', 'xx', 'yy'], $attribute['class']->value());
 
     // Add an array of classes.
-    $attribute->addClass(array('red', 'green', 'blue'));
-    $this->assertArrayEquals(array('banana', 'aa', 'xx', 'yy', 'red', 'green', 'blue'), $attribute['class']->value());
+    $attribute->addClass(['red', 'green', 'blue']);
+    $this->assertArrayEquals(['banana', 'aa', 'xx', 'yy', 'red', 'green', 'blue'], $attribute['class']->value());
 
     // Add an array of duplicate classes.
-    $attribute->addClass(array('red', 'green', 'blue'), array('aa', 'aa', 'banana'), 'yy');
+    $attribute->addClass(['red', 'green', 'blue'], ['aa', 'aa', 'banana'], 'yy');
     $this->assertEquals('banana aa xx yy red green blue', (string) $attribute['class']);
   }
 
@@ -197,8 +197,8 @@ class AttributeTest extends UnitTestCase {
    */
   public function testRemoveClasses() {
     // Add duplicate class to ensure that both duplicates are removed.
-    $classes = array('example-class', 'aa', 'xx', 'yy', 'red', 'green', 'blue', 'red');
-    $attribute = new Attribute(array('class' => $classes));
+    $classes = ['example-class', 'aa', 'xx', 'yy', 'red', 'green', 'blue', 'red'];
+    $attribute = new Attribute(['class' => $classes]);
 
     // Remove one class.
     $attribute->removeClass('example-class');
@@ -206,17 +206,17 @@ class AttributeTest extends UnitTestCase {
 
     // Remove multiple classes.
     $attribute->removeClass('xx', 'yy');
-    $this->assertNotContains(array('xx', 'yy'), $attribute['class']->value());
+    $this->assertNotContains(['xx', 'yy'], $attribute['class']->value());
 
     // Remove an array of classes.
-    $attribute->removeClass(array('red', 'green', 'blue'));
-    $this->assertNotContains(array('red', 'green', 'blue'), $attribute['class']->value());
+    $attribute->removeClass(['red', 'green', 'blue']);
+    $this->assertNotContains(['red', 'green', 'blue'], $attribute['class']->value());
 
     // Remove a class that does not exist.
     $attribute->removeClass('gg');
-    $this->assertNotContains(array('gg'), $attribute['class']->value());
+    $this->assertNotContains(['gg'], $attribute['class']->value());
     // Test that the array index remains sequential.
-    $this->assertArrayEquals(array('aa'), $attribute['class']->value());
+    $this->assertArrayEquals(['aa'], $attribute['class']->value());
 
     $attribute->removeClass('aa');
     $this->assertEmpty((string) $attribute);
@@ -244,14 +244,14 @@ class AttributeTest extends UnitTestCase {
    */
   public function testChainAddRemoveClasses() {
     $attribute = new Attribute(
-      array('class' => array('example-class', 'red', 'green', 'blue'))
+      ['class' => ['example-class', 'red', 'green', 'blue']]
     );
 
     $attribute
-      ->removeClass(array('red', 'green', 'pink'))
-      ->addClass(array('apple', 'lime', 'grapefruit'))
-      ->addClass(array('banana'));
-    $expected = array('example-class', 'blue', 'apple', 'lime', 'grapefruit', 'banana');
+      ->removeClass(['red', 'green', 'pink'])
+      ->addClass(['apple', 'lime', 'grapefruit'])
+      ->addClass(['banana']);
+    $expected = ['example-class', 'blue', 'apple', 'lime', 'grapefruit', 'banana'];
     $this->assertArrayEquals($expected, $attribute['class']->value(), 'Attributes chained');
   }
 
@@ -262,10 +262,10 @@ class AttributeTest extends UnitTestCase {
    * @covers ::removeClass
    * @covers ::addClass
    */
-  public function testTwigAddRemoveClasses($template, $expected, $seed_attributes = array()) {
+  public function testTwigAddRemoveClasses($template, $expected, $seed_attributes = []) {
     $loader = new \Twig_Loader_String();
     $twig = new \Twig_Environment($loader);
-    $data = array('attributes' => new Attribute($seed_attributes));
+    $data = ['attributes' => new Attribute($seed_attributes)];
     $result = $twig->render($template, $data);
     $this->assertEquals($expected, $result);
   }
@@ -278,52 +278,52 @@ class AttributeTest extends UnitTestCase {
    *   a resulting string of classes and an optional array of attributes.
    */
   public function providerTestAttributeClassHelpers() {
-    return array(
-      array("{{ attributes.class }}", ''),
-      array("{{ attributes.addClass('everest').class }}", 'everest'),
-      array("{{ attributes.addClass(['k2', 'kangchenjunga']).class }}", 'k2 kangchenjunga'),
-      array("{{ attributes.addClass('lhotse', 'makalu', 'cho-oyu').class }}", 'lhotse makalu cho-oyu'),
-      array(
+    return [
+      ["{{ attributes.class }}", ''],
+      ["{{ attributes.addClass('everest').class }}", 'everest'],
+      ["{{ attributes.addClass(['k2', 'kangchenjunga']).class }}", 'k2 kangchenjunga'],
+      ["{{ attributes.addClass('lhotse', 'makalu', 'cho-oyu').class }}", 'lhotse makalu cho-oyu'],
+      [
         "{{ attributes.addClass('nanga-parbat').class }}",
         'dhaulagiri manaslu nanga-parbat',
-        array('class' => array('dhaulagiri', 'manaslu')),
-      ),
-      array(
+        ['class' => ['dhaulagiri', 'manaslu']],
+      ],
+      [
         "{{ attributes.removeClass('annapurna').class }}",
         'gasherbrum-i',
-        array('class' => array('annapurna', 'gasherbrum-i')),
-      ),
-      array(
+        ['class' => ['annapurna', 'gasherbrum-i']],
+      ],
+      [
         "{{ attributes.removeClass(['broad peak']).class }}",
         'gasherbrum-ii',
-        array('class' => array('broad peak', 'gasherbrum-ii')),
-      ),
-      array(
+        ['class' => ['broad peak', 'gasherbrum-ii']],
+      ],
+      [
         "{{ attributes.removeClass('gyachung-kang', 'shishapangma').class }}",
         '',
-        array('class' => array('shishapangma', 'gyachung-kang')),
-      ),
-      array(
+        ['class' => ['shishapangma', 'gyachung-kang']],
+      ],
+      [
         "{{ attributes.removeClass('nuptse').addClass('annapurna-ii').class }}",
         'himalchuli annapurna-ii',
-        array('class' => array('himalchuli', 'nuptse')),
-      ),
+        ['class' => ['himalchuli', 'nuptse']],
+      ],
       // Test for the removal of an empty class name.
-      array("{{ attributes.addClass('rakaposhi', '').class }}", 'rakaposhi'),
-    );
+      ["{{ attributes.addClass('rakaposhi', '').class }}", 'rakaposhi'],
+    ];
   }
 
   /**
    * Tests iterating on the values of the attribute.
    */
   public function testIterate() {
-    $attribute = new Attribute(array('class' => array('example-class'), 'id' => 'example-id'));
+    $attribute = new Attribute(['class' => ['example-class'], 'id' => 'example-id']);
 
     $counter = 0;
     foreach ($attribute as $key => $value) {
       if ($counter == 0) {
         $this->assertEquals('class', $key);
-        $this->assertEquals(new AttributeArray('class', array('example-class')), $value);
+        $this->assertEquals(new AttributeArray('class', ['example-class']), $value);
       }
       if ($counter == 1) {
         $this->assertEquals('id', $key);
@@ -337,7 +337,7 @@ class AttributeTest extends UnitTestCase {
    * Tests printing of an attribute.
    */
   public function testPrint() {
-    $attribute = new Attribute(array('class' => array('example-class'), 'id' => 'example-id', 'enabled' => TRUE));
+    $attribute = new Attribute(['class' => ['example-class'], 'id' => 'example-id', 'enabled' => TRUE]);
 
     $content = $this->randomMachineName();
     $html = '<div' . (string) $attribute . '>' . $content . '</div>';
@@ -446,9 +446,9 @@ class AttributeTest extends UnitTestCase {
    * Tests the storage method.
    */
   public function testStorage() {
-    $attribute = new Attribute(array('class' => array('example-class')));
+    $attribute = new Attribute(['class' => ['example-class']]);
 
-    $this->assertEquals(array('class' => new AttributeArray('class', array('example-class'))), $attribute->storage());
+    $this->assertEquals(['class' => new AttributeArray('class', ['example-class'])], $attribute->storage());
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/web/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
index ea93703aa..c4805bc38 100644
--- a/web/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
@@ -1,20 +1,14 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\Core\Template\TwigExtensionTest.
- */
-
 namespace Drupal\Tests\Core\Template;
 
 use Drupal\Core\GeneratedLink;
 use Drupal\Core\Render\RenderableInterface;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\Template\Loader\StringLoader;
 use Drupal\Core\Template\TwigEnvironment;
 use Drupal\Core\Template\TwigExtension;
+use Drupal\Core\Url;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -26,26 +20,74 @@ use Drupal\Tests\UnitTestCase;
  */
 class TwigExtensionTest extends UnitTestCase {
 
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $renderer;
+
+  /**
+   * The url generator.
+   *
+   * @var \Drupal\Core\Routing\UrlGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $urlGenerator;
+
+  /**
+   * The theme manager.
+   *
+   * @var \Drupal\Core\Theme\ThemeManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $themeManager;
+
+  /**
+   * The date formatter.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $dateFormatter;
+
+  /**
+   * The system under test.
+   *
+   * @var \Drupal\Core\Template\TwigExtension
+   */
+  protected $systemUnderTest;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    $this->renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
+    $this->urlGenerator = $this->getMock('\Drupal\Core\Routing\UrlGeneratorInterface');
+    $this->themeManager = $this->getMock('\Drupal\Core\Theme\ThemeManagerInterface');
+    $this->dateFormatter = $this->getMock('\Drupal\Core\Datetime\DateFormatterInterface');
+
+    $this->systemUnderTest = new TwigExtension($this->renderer, $this->urlGenerator, $this->themeManager, $this->dateFormatter);
+  }
+
   /**
    * Tests the escaping
    *
    * @dataProvider providerTestEscaping
    */
   public function testEscaping($template, $expected) {
-    $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
-    $twig = new \Twig_Environment(NULL, array(
+    $twig = new \Twig_Environment(NULL, [
       'debug' => TRUE,
       'cache' => FALSE,
       'autoescape' => 'html',
-      'optimizations' => 0
-    ));
-    $twig->addExtension((new TwigExtension($renderer))->setUrlGenerator($this->getMock('Drupal\Core\Routing\UrlGeneratorInterface')));
+      'optimizations' => 0,
+    ]);
+    $twig->addExtension($this->systemUnderTest);
 
     $nodes = $twig->parse($twig->tokenize($template));
 
     $this->assertSame($expected, $nodes->getNode('body')
-        ->getNode(0)
-        ->getNode('expr') instanceof \Twig_Node_Expression_Filter);
+      ->getNode(0)
+      ->getNode('expr') instanceof \Twig_Node_Expression_Filter);
   }
 
   /**
@@ -56,52 +98,46 @@ class TwigExtensionTest extends UnitTestCase {
    *   a boolean expecting whether the path will be safe.
    */
   public function providerTestEscaping() {
-    return array(
-      array('{{ path("foo") }}', FALSE),
-      array('{{ path("foo", {}) }}', FALSE),
-      array('{{ path("foo", { foo: "foo" }) }}', FALSE),
-      array('{{ path("foo", foo) }}', TRUE),
-      array('{{ path("foo", { foo: foo }) }}', TRUE),
-      array('{{ path("foo", { foo: ["foo", "bar"] }) }}', TRUE),
-      array('{{ path("foo", { foo: "foo", bar: "bar" }) }}', TRUE),
-      array('{{ path(name = "foo", parameters = {}) }}', FALSE),
-      array('{{ path(name = "foo", parameters = { foo: "foo" }) }}', FALSE),
-      array('{{ path(name = "foo", parameters = foo) }}', TRUE),
-      array(
+    return [
+      ['{{ path("foo") }}', FALSE],
+      ['{{ path("foo", {}) }}', FALSE],
+      ['{{ path("foo", { foo: "foo" }) }}', FALSE],
+      ['{{ path("foo", foo) }}', TRUE],
+      ['{{ path("foo", { foo: foo }) }}', TRUE],
+      ['{{ path("foo", { foo: ["foo", "bar"] }) }}', TRUE],
+      ['{{ path("foo", { foo: "foo", bar: "bar" }) }}', TRUE],
+      ['{{ path(name = "foo", parameters = {}) }}', FALSE],
+      ['{{ path(name = "foo", parameters = { foo: "foo" }) }}', FALSE],
+      ['{{ path(name = "foo", parameters = foo) }}', TRUE],
+      [
         '{{ path(name = "foo", parameters = { foo: ["foo", "bar"] }) }}',
         TRUE
-      ),
-      array('{{ path(name = "foo", parameters = { foo: foo }) }}', TRUE),
-      array(
+      ],
+      ['{{ path(name = "foo", parameters = { foo: foo }) }}', TRUE],
+      [
         '{{ path(name = "foo", parameters = { foo: "foo", bar: "bar" }) }}',
         TRUE
-      ),
-    );
+      ],
+    ];
   }
 
   /**
    * Tests the active_theme function.
    */
   public function testActiveTheme() {
-    $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
-    $extension = new TwigExtension($renderer);
-    $theme_manager = $this->getMock('\Drupal\Core\Theme\ThemeManagerInterface');
     $active_theme = $this->getMockBuilder('\Drupal\Core\Theme\ActiveTheme')
       ->disableOriginalConstructor()
       ->getMock();
-    $active_theme
-      ->expects($this->once())
+    $active_theme->expects($this->once())
       ->method('getName')
       ->willReturn('test_theme');
-    $theme_manager
-      ->expects($this->once())
+    $this->themeManager->expects($this->once())
       ->method('getActiveTheme')
       ->willReturn($active_theme);
-    $extension->setThemeManager($theme_manager);
 
     $loader = new \Twig_Loader_String();
     $twig = new \Twig_Environment($loader);
-    $twig->addExtension($extension);
+    $twig->addExtension($this->systemUnderTest);
     $result = $twig->render('{{ active_theme() }}');
     $this->assertEquals('test_theme', $result);
   }
@@ -110,30 +146,21 @@ class TwigExtensionTest extends UnitTestCase {
    * Tests the format_date filter.
    */
   public function testFormatDate() {
-    $date_formatter = $this->getMockBuilder('\Drupal\Core\Datetime\DateFormatter')
-      ->disableOriginalConstructor()
-      ->getMock();
-    $date_formatter->expects($this->exactly(2))
+    $this->dateFormatter->expects($this->exactly(2))
       ->method('format')
       ->willReturn('1978-11-19');
-    $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
-    $extension = new TwigExtension($renderer);
-    $extension->setDateFormatter($date_formatter);
 
     $loader = new StringLoader();
     $twig = new \Twig_Environment($loader);
-    $twig->addExtension($extension);
+    $twig->addExtension($this->systemUnderTest);
     $result = $twig->render('{{ time|format_date("html_date") }}');
-    $this->assertEquals($date_formatter->format('html_date'), $result);
+    $this->assertEquals($this->dateFormatter->format('html_date'), $result);
   }
 
   /**
    * Tests the active_theme_path function.
    */
   public function testActiveThemePath() {
-    $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
-    $extension = new TwigExtension($renderer);
-    $theme_manager = $this->getMock('\Drupal\Core\Theme\ThemeManagerInterface');
     $active_theme = $this->getMockBuilder('\Drupal\Core\Theme\ActiveTheme')
       ->disableOriginalConstructor()
       ->getMock();
@@ -141,15 +168,13 @@ class TwigExtensionTest extends UnitTestCase {
       ->expects($this->once())
       ->method('getPath')
       ->willReturn('foo/bar');
-    $theme_manager
-      ->expects($this->once())
+    $this->themeManager->expects($this->once())
       ->method('getActiveTheme')
       ->willReturn($active_theme);
-    $extension->setThemeManager($theme_manager);
 
     $loader = new \Twig_Loader_String();
     $twig = new \Twig_Environment($loader);
-    $twig->addExtension($extension);
+    $twig->addExtension($this->systemUnderTest);
     $result = $twig->render('{{ active_theme_path() }}');
     $this->assertEquals('foo/bar', $result);
   }
@@ -160,34 +185,32 @@ class TwigExtensionTest extends UnitTestCase {
    * @covers ::escapeFilter
    */
   public function testSafeStringEscaping() {
-    $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
-    $twig = new \Twig_Environment(NULL, array(
+    $twig = new \Twig_Environment(NULL, [
       'debug' => TRUE,
       'cache' => FALSE,
       'autoescape' => 'html',
-      'optimizations' => 0
-    ));
-    $twig_extension = new TwigExtension($renderer);
+      'optimizations' => 0,
+    ]);
 
     // By default, TwigExtension will attempt to cast objects to strings.
     // Ensure objects that implement MarkupInterface are unchanged.
     $safe_string = $this->getMock('\Drupal\Component\Render\MarkupInterface');
-    $this->assertSame($safe_string, $twig_extension->escapeFilter($twig, $safe_string, 'html', 'UTF-8', TRUE));
+    $this->assertSame($safe_string, $this->systemUnderTest->escapeFilter($twig, $safe_string, 'html', 'UTF-8', TRUE));
 
     // Ensure objects that do not implement MarkupInterface are escaped.
     $string_object = new TwigExtensionTestString("<script>alert('here');</script>");
-    $this->assertSame('&lt;script&gt;alert(&#039;here&#039;);&lt;/script&gt;', $twig_extension->escapeFilter($twig, $string_object, 'html', 'UTF-8', TRUE));
+    $this->assertSame('&lt;script&gt;alert(&#039;here&#039;);&lt;/script&gt;', $this->systemUnderTest->escapeFilter($twig, $string_object, 'html', 'UTF-8', TRUE));
   }
 
   /**
    * @covers ::safeJoin
    */
   public function testSafeJoin() {
-    $renderer = $this->prophesize(RendererInterface::class);
-    $renderer->render(['#markup' => '<strong>will be rendered</strong>', '#printed' => FALSE])->willReturn('<strong>will be rendered</strong>');
-    $renderer = $renderer->reveal();
+    $this->renderer->expects($this->any())
+      ->method('render')
+      ->with(['#markup' => '<strong>will be rendered</strong>', '#printed' => FALSE])
+      ->willReturn('<strong>will be rendered</strong>');
 
-    $twig_extension = new TwigExtension($renderer);
     $twig_environment = $this->prophesize(TwigEnvironment::class)->reveal();
 
     // Simulate t().
@@ -198,9 +221,9 @@ class TwigExtensionTest extends UnitTestCase {
     $items = [
       '<em>will be escaped</em>',
       $markup,
-      ['#markup' => '<strong>will be rendered</strong>']
+      ['#markup' => '<strong>will be rendered</strong>'],
     ];
-    $result = $twig_extension->safeJoin($twig_environment, $items, '<br/>');
+    $result = $this->systemUnderTest->safeJoin($twig_environment, $items, '<br/>');
     $this->assertEquals('&lt;em&gt;will be escaped&lt;/em&gt;<br/><em>will be markup</em><br/><strong>will be rendered</strong>', $result);
 
     // Ensure safe_join Twig filter supports Traversable variables.
@@ -209,12 +232,12 @@ class TwigExtensionTest extends UnitTestCase {
       $markup,
       ['#markup' => '<strong>will be rendered</strong>'],
     ]);
-    $result = $twig_extension->safeJoin($twig_environment, $items, ', ');
+    $result = $this->systemUnderTest->safeJoin($twig_environment, $items, ', ');
     $this->assertEquals('&lt;em&gt;will be escaped&lt;/em&gt;, <em>will be markup</em>, <strong>will be rendered</strong>', $result);
 
     // Ensure safe_join Twig filter supports empty variables.
     $items = NULL;
-    $result = $twig_extension->safeJoin($twig_environment, $items, '<br>');
+    $result = $this->systemUnderTest->safeJoin($twig_environment, $items, '<br>');
     $this->assertEmpty($result);
   }
 
@@ -222,13 +245,12 @@ class TwigExtensionTest extends UnitTestCase {
    * @dataProvider providerTestRenderVar
    */
   public function testRenderVar($result, $input) {
-    $renderer = $this->prophesize(RendererInterface::class);
-    $renderer->render($result += ['#printed' => FALSE])->willReturn('Rendered output');
+    $this->renderer->expects($this->any())
+      ->method('render')
+      ->with($result += ['#printed' => FALSE])
+      ->willReturn('Rendered output');
 
-    $renderer = $renderer->reveal();
-    $twig_extension = new TwigExtension($renderer);
-
-    $this->assertEquals('Rendered output', $twig_extension->renderVar($input));
+    $this->assertEquals('Rendered output', $this->systemUnderTest->renderVar($input));
   }
 
   public function providerTestRenderVar() {
@@ -247,7 +269,6 @@ class TwigExtensionTest extends UnitTestCase {
    * @covers ::bubbleArgMetadata
    */
   public function testEscapeWithGeneratedLink() {
-    $renderer = $this->prophesize(RendererInterface::class);
     $twig = new \Twig_Environment(NULL, [
         'debug' => TRUE,
         'cache' => FALSE,
@@ -256,22 +277,23 @@ class TwigExtensionTest extends UnitTestCase {
       ]
     );
 
-    $twig_extension = new TwigExtension($renderer->reveal());
-    $twig->addExtension($twig_extension->setUrlGenerator($this->prophesize(UrlGeneratorInterface::class)->reveal()));
+    $twig->addExtension($this->systemUnderTest);
     $link = new GeneratedLink();
     $link->setGeneratedLink('<a href="http://example.com"></a>');
     $link->addCacheTags(['foo']);
     $link->addAttachments(['library' => ['system/base']]);
 
-    $result = $twig_extension->escapeFilter($twig, $link, 'html', NULL, TRUE);
-    $renderer->render([
-      "#cache" => [
-        "contexts" => [],
-        "tags" => ["foo"],
-        "max-age" => -1
-      ],
-      "#attached" => ['library' => ['system/base']],
-    ])->shouldHaveBeenCalled();
+    $this->renderer->expects($this->atLeastOnce())
+      ->method('render')
+      ->with([
+        "#cache" => [
+          "contexts" => [],
+          "tags" => ["foo"],
+          "max-age" => -1,
+        ],
+        "#attached" => ['library' => ['system/base']],
+      ]);
+    $result = $this->systemUnderTest->escapeFilter($twig, $link, 'html', NULL, TRUE);
     $this->assertEquals('<a href="http://example.com"></a>', $result);
   }
 
@@ -280,25 +302,61 @@ class TwigExtensionTest extends UnitTestCase {
    * @covers ::bubbleArgMetadata
    */
   public function testRenderVarWithGeneratedLink() {
-    $renderer = $this->prophesize(RendererInterface::class);
-    $twig_extension = new TwigExtension($renderer->reveal());
     $link = new GeneratedLink();
     $link->setGeneratedLink('<a href="http://example.com"></a>');
     $link->addCacheTags(['foo']);
     $link->addAttachments(['library' => ['system/base']]);
 
-    $result = $twig_extension->renderVar($link);
-    $renderer->render([
-      "#cache" => [
-        "contexts" => [],
-        "tags" => ["foo"],
-        "max-age" => -1
-      ],
-      "#attached" => ['library' => ['system/base']],
-    ])->shouldHaveBeenCalled();
+    $this->renderer->expects($this->atLeastOnce())
+      ->method('render')
+      ->with([
+        "#cache" => [
+          "contexts" => [],
+          "tags" => ["foo"],
+          "max-age" => -1,
+        ],
+        "#attached" => ['library' => ['system/base']],
+      ]);
+    $result = $this->systemUnderTest->renderVar($link);
     $this->assertEquals('<a href="http://example.com"></a>', $result);
   }
 
+  /**
+   * Tests creating attributes within a Twig template.
+   *
+   * @covers ::createAttribute
+   */
+  public function testCreateAttribute() {
+    $loader = new StringLoader();
+    $twig = new \Twig_Environment($loader);
+    $twig->addExtension($this->systemUnderTest);
+
+    $iterations = [
+      ['class' => ['kittens'], 'data-toggle' => 'modal', 'data-lang' => 'es'],
+      ['id' => 'puppies', 'data-value' => 'foo', 'data-lang' => 'en'],
+      [],
+    ];
+    $result = $twig->render("{% for iteration in iterations %}<div{{ create_attribute(iteration) }}></div>{% endfor %}", ['iterations' => $iterations]);
+    $expected = '<div class="kittens" data-toggle="modal" data-lang="es"></div><div id="puppies" data-value="foo" data-lang="en"></div><div></div>';
+    $this->assertEquals($expected, $result);
+
+    // Test default creation of empty attribute object and using its method.
+    $result = $twig->render("<div{{ create_attribute().addClass('meow') }}></div>");
+    $expected = '<div class="meow"></div>';
+    $this->assertEquals($expected, $result);
+  }
+
+  /**
+   * @covers ::getLink
+   */
+  public function testLinkWithOverriddenAttributes() {
+    $url = Url::fromRoute('<front>', [], ['attributes' => ['class' => ['foo']]]);
+
+    $build = $this->systemUnderTest->getLink('test', $url, ['class' => ['bar']]);
+
+    $this->assertEquals(['foo', 'bar'], $build['#url']->getOption('attributes')['class']);
+  }
+
 }
 
 class TwigExtensionTestString {
diff --git a/web/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php b/web/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php
index 7a3dd3ae4..e59946348 100644
--- a/web/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php
@@ -45,10 +45,10 @@ class TwigSandboxTest extends UnitTestCase {
    * Tests that dangerous methods cannot be called in entity objects.
    *
    * @dataProvider getTwigEntityDangerousMethods
-   * @expectedException \Twig_Sandbox_SecurityError
    */
   public function testEntityDangerousMethods($template) {
     $entity = $this->getMock('Drupal\Core\Entity\EntityInterface');
+    $this->setExpectedException(\Twig_Sandbox_SecurityError::class);
     $this->twig->render($template, ['entity' => $entity]);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php b/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
index 1243118f5..f2cd22ea9 100644
--- a/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
@@ -66,6 +66,13 @@ class RegistryTest extends UnitTestCase {
    */
   protected $themeManager;
 
+  /**
+   * The list of functions that get_defined_functions() should provide.
+   *
+   * @var array
+   */
+  public static $functions = [];
+
   /**
    * {@inheritdoc}
    */
@@ -82,6 +89,14 @@ class RegistryTest extends UnitTestCase {
     $this->setupTheme();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function tearDown() {
+    parent::tearDown();
+    static::$functions = [];
+  }
+
   /**
    * Tests getting the theme registry defined by a module.
    */
@@ -122,7 +137,7 @@ class RegistryTest extends UnitTestCase {
     $this->moduleHandler->expects($this->exactly(2))
       ->method('getImplementations')
       ->with('theme')
-      ->will($this->returnValue(array('theme_test')));
+      ->will($this->returnValue(['theme_test']));
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('getModuleList')
       ->willReturn([]);
@@ -149,7 +164,7 @@ class RegistryTest extends UnitTestCase {
     $this->assertEquals('module', $info['type']);
     $this->assertEquals('core/modules/system/tests/modules/theme_test', $info['theme path']);
     $this->assertEquals('theme_theme_test_function_suggestions', $info['function']);
-    $this->assertEquals(array(), $info['variables']);
+    $this->assertEquals([], $info['variables']);
 
     // The second call will initialize with the second theme. Ensure that this
     // returns a different object and the discovery for the second theme's
@@ -159,6 +174,317 @@ class RegistryTest extends UnitTestCase {
     $this->assertTrue(in_array('test_stable_preprocess_theme_test_render_element', $other_registry['theme_test_render_element']['preprocess functions']));
   }
 
+  /**
+   * @covers ::postProcessExtension
+   * @covers ::completeSuggestion
+   * @covers ::mergePreprocessFunctions
+   *
+   * @dataProvider providerTestPostProcessExtension
+   *
+   * @param array $defined_functions
+   *   An array of functions to be used in place of get_defined_functions().
+   * @param array $hooks
+   *   An array of theme hooks to process.
+   * @param array $expected
+   *   The expected results.
+   */
+  public function testPostProcessExtension($defined_functions, $hooks, $expected) {
+    static::$functions['user'] = $defined_functions;
+
+    $theme = $this->prophesize(ActiveTheme::class);
+    $theme->getBaseThemes()->willReturn([]);
+    $theme->getName()->willReturn('test');
+    $theme->getEngine()->willReturn('twig');
+
+    $this->moduleHandler->expects($this->atLeastOnce())
+      ->method('getModuleList')
+      ->willReturn([]);
+
+    $class = new \ReflectionClass(TestRegistry::class);
+    $reflection_method = $class->getMethod('postProcessExtension');
+    $reflection_method->setAccessible(TRUE);
+    $reflection_method->invokeArgs($this->registry, [&$hooks, $theme->reveal()]);
+
+    $this->assertArrayEquals($expected, $hooks);
+  }
+
+  /**
+   * Provides test data to ::testPostProcessExtension().
+   */
+  public function providerTestPostProcessExtension() {
+    // This is test data for unit testing
+    // \Drupal\Core\Theme\Registry::postProcessExtension(), not what happens
+    // before it. Therefore, for all test data:
+    // - Explicitly defined hooks also come with explicitly defined preprocess
+    //   functions, because those are collected in
+    //   \Drupal\Core\Theme\Registry::processExtension().
+    // - Explicitly defined hooks that set a 'base hook' also have
+    //   'incomplete preprocess functions' set to TRUE, since that is done in
+    //   \Drupal\Core\Theme\Registry::processExtension().
+    $data = [];
+
+    // Test the discovery of suggestions via the presence of preprocess
+    // functions that follow the "__" naming pattern.
+    $data['base_hook_with_autodiscovered_suggestions'] = [
+      'defined_functions' => [
+        'test_preprocess_test_hook__suggestion',
+        'test_preprocess_test_hook__suggestion__another',
+      ],
+      'hooks' => [
+        'test_hook' => [
+          'preprocess functions' => ['explicit_preprocess_test_hook'],
+        ],
+      ],
+      'expected' => [
+        'test_hook' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+          ],
+        ],
+        'test_hook__suggestion' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+            'test_preprocess_test_hook__suggestion',
+          ],
+          'base hook' => 'test_hook',
+        ],
+        'test_hook__suggestion__another' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+            'test_preprocess_test_hook__suggestion',
+            'test_preprocess_test_hook__suggestion__another',
+          ],
+          'base hook' => 'test_hook',
+        ],
+      ],
+    ];
+
+    // Test that suggestions following the "__" naming pattern can also be
+    // explicitly defined in hook_theme(), such as 'field__node__title' defined
+    // in node_theme().
+    $data['base_hook_with_explicit_suggestions'] = [
+      'defined_functions' => [],
+      'hooks' => [
+        'test_hook' => [
+          'preprocess functions' => ['explicit_preprocess_test_hook'],
+        ],
+        'test_hook__suggestion__another' => [
+          'base hook' => 'test_hook',
+          'preprocess functions' => ['explicit_preprocess_test_hook__suggestion__another'],
+          'incomplete preprocess functions' => TRUE,
+        ],
+      ],
+      'expected' => [
+        'test_hook' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+          ],
+        ],
+        'test_hook__suggestion__another' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+            'explicit_preprocess_test_hook__suggestion__another',
+          ],
+          'base hook' => 'test_hook',
+        ],
+      ],
+    ];
+
+    // Same as above, but also test that a preprocess function for an
+    // intermediary suggestion level gets discovered.
+    $data['base_hook_with_explicit_suggestions_and_intermediary_preprocess_function'] = [
+      'defined_functions' => [
+        'test_preprocess_test_hook__suggestion',
+      ],
+      'hooks' => [
+        'test_hook' => [
+          'preprocess functions' => ['explicit_preprocess_test_hook'],
+        ],
+        'test_hook__suggestion__another' => [
+          'base hook' => 'test_hook',
+          'preprocess functions' => ['explicit_preprocess_test_hook__suggestion__another'],
+          'incomplete preprocess functions' => TRUE,
+        ],
+      ],
+      'expected' => [
+        'test_hook' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+          ],
+        ],
+        'test_hook__suggestion' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+            'test_preprocess_test_hook__suggestion',
+          ],
+          'base hook' => 'test_hook',
+        ],
+        'test_hook__suggestion__another' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+            'test_preprocess_test_hook__suggestion',
+            'explicit_preprocess_test_hook__suggestion__another',
+          ],
+          'base hook' => 'test_hook',
+        ],
+      ],
+    ];
+
+    // Test that hooks not following the "__" naming pattern can explicitly
+    // specify a base hook, such as is done in
+    // \Drupal\Core\Layout\LayoutPluginManager::getThemeImplementations().
+    $data['child_hook_without_magic_naming'] = [
+      'defined_functions' => [],
+      'hooks' => [
+        'test_hook' => [
+          'preprocess functions' => ['explicit_preprocess_test_hook'],
+        ],
+        'child_hook' => [
+          'base hook' => 'test_hook',
+          'preprocess functions' => ['explicit_preprocess_child_hook'],
+          'incomplete preprocess functions' => TRUE,
+        ],
+      ],
+      'expected' => [
+        'test_hook' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+          ],
+        ],
+        'child_hook' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+            'explicit_preprocess_child_hook',
+          ],
+          'base hook' => 'test_hook',
+        ],
+      ],
+    ];
+
+    // Same as above, but also test that such child hooks can also be extended
+    // with magically named suggestions.
+    $data['child_hook_with_suggestions'] = [
+      'defined_functions' => [
+        'test_preprocess_child_hook__suggestion',
+        'test_preprocess_child_hook__suggestion__another',
+      ],
+      'hooks' => [
+        'test_hook' => [
+          'preprocess functions' => ['explicit_preprocess_test_hook'],
+        ],
+        'child_hook' => [
+          'base hook' => 'test_hook',
+          'preprocess functions' => ['explicit_preprocess_child_hook'],
+          'incomplete preprocess functions' => TRUE,
+        ],
+      ],
+      'expected' => [
+        'test_hook' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+          ],
+        ],
+        'child_hook' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+            'explicit_preprocess_child_hook',
+          ],
+          'base hook' => 'test_hook',
+        ],
+        'child_hook__suggestion' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+            'explicit_preprocess_child_hook',
+            'test_preprocess_child_hook__suggestion',
+          ],
+          'base hook' => 'test_hook',
+        ],
+        'child_hook__suggestion__another' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+            'explicit_preprocess_child_hook',
+            'test_preprocess_child_hook__suggestion',
+            'test_preprocess_child_hook__suggestion__another',
+          ],
+          'base hook' => 'test_hook',
+        ],
+      ],
+    ];
+
+    // Test that a suggestion following the "__" naming pattern can specify a
+    // different base hook than what is implied by that pattern. Ensure that
+    // preprocess functions from both the naming pattern and from 'base hook'
+    // are collected.
+    $data['suggestion_with_alternate_base_hook'] = [
+      'defined_functions' => [
+        'test_preprocess_test_hook__suggestion',
+      ],
+      'hooks' => [
+        'test_hook' => [
+          'preprocess functions' => ['explicit_preprocess_test_hook'],
+        ],
+        'alternate_base_hook' => [
+          'preprocess functions' => ['explicit_preprocess_alternate_base_hook'],
+        ],
+        'test_hook__suggestion__another' => [
+          'base hook' => 'alternate_base_hook',
+          'preprocess functions' => ['explicit_preprocess_test_hook__suggestion__another'],
+          'incomplete preprocess functions' => TRUE,
+        ],
+      ],
+      'expected' => [
+        'test_hook' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+          ],
+        ],
+        'alternate_base_hook' => [
+          'preprocess functions' => [
+            'explicit_preprocess_alternate_base_hook',
+          ],
+        ],
+        'test_hook__suggestion' => [
+          'preprocess functions' => [
+            'explicit_preprocess_test_hook',
+            'test_preprocess_test_hook__suggestion',
+          ],
+          'base hook' => 'test_hook',
+        ],
+        'test_hook__suggestion__another' => [
+          'preprocess functions' => [
+            'explicit_preprocess_alternate_base_hook',
+            'explicit_preprocess_test_hook',
+            'test_preprocess_test_hook__suggestion',
+            'explicit_preprocess_test_hook__suggestion__another',
+          ],
+          'base hook' => 'alternate_base_hook',
+        ],
+      ],
+    ];
+
+    // Test when a base hook is missing.
+    $data['missing_base_hook'] = [
+      'defined_functions' => [],
+      'hooks' => [
+        'child_hook' => [
+          'base hook' => 'test_hook',
+          'preprocess functions' => ['explicit_preprocess_child_hook'],
+          'incomplete preprocess functions' => TRUE,
+        ],
+      ],
+      'expected' => [
+        'child_hook' => [
+          'preprocess functions' => [
+            'explicit_preprocess_child_hook',
+          ],
+          'base hook' => 'test_hook',
+        ],
+      ],
+    ];
+
+    return $data;
+  }
+
   protected function setupTheme() {
     $this->registry = new TestRegistry($this->root, $this->cache, $this->lock, $this->moduleHandler, $this->themeHandler, $this->themeInitialization);
     $this->registry->setThemeManager($this->themeManager);
@@ -175,3 +501,14 @@ class TestRegistry extends Registry {
   }
 
 }
+
+namespace Drupal\Core\Theme;
+
+use Drupal\Tests\Core\Theme\RegistryTest;
+
+/**
+ * Overrides get_defined_functions() with a configurable mock.
+ */
+function get_defined_functions() {
+  return RegistryTest::$functions ?: \get_defined_functions();
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php b/web/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
index 958a5454d..4b33fcbfc 100644
--- a/web/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
@@ -61,7 +61,7 @@ class ThemeNegotiatorTest extends UnitTestCase {
       ->method('checkAccess')
       ->will($this->returnValue(TRUE));
 
-    $route_match = new RouteMatch('test_route', new Route('/test-route'), array(), array());
+    $route_match = new RouteMatch('test_route', new Route('/test-route'), [], []);
     $theme = $this->themeNegotiator->determineActiveTheme($route_match);
 
     $this->assertEquals('example_test', $theme);
@@ -95,7 +95,7 @@ class ThemeNegotiatorTest extends UnitTestCase {
       ->method('checkAccess')
       ->will($this->returnValue(TRUE));
 
-    $route_match = new RouteMatch('test_route', new Route('/test-route'), array(), array());
+    $route_match = new RouteMatch('test_route', new Route('/test-route'), [], []);
     $theme = $this->themeNegotiator->determineActiveTheme($route_match);
 
     $this->assertEquals('example_test', $theme);
@@ -137,7 +137,7 @@ class ThemeNegotiatorTest extends UnitTestCase {
       ->with('example_test2')
       ->will($this->returnValue(TRUE));
 
-    $route_match = new RouteMatch('test_route', new Route('/test-route'), array(), array());
+    $route_match = new RouteMatch('test_route', new Route('/test-route'), [], []);
     $theme = $this->themeNegotiator->determineActiveTheme($route_match);
 
     $this->assertEquals('example_test2', $theme);
@@ -172,7 +172,7 @@ class ThemeNegotiatorTest extends UnitTestCase {
       ->method('checkAccess')
       ->will($this->returnValue(TRUE));
 
-    $route_match = new RouteMatch('test_route', new Route('/test-route'), array(), array());
+    $route_match = new RouteMatch('test_route', new Route('/test-route'), [], []);
     $theme = $this->themeNegotiator->determineActiveTheme($route_match);
 
     $this->assertEquals('example_test2', $theme);
diff --git a/web/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php b/web/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
index 0a3388f1e..ac19ffadf 100644
--- a/web/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
@@ -74,13 +74,13 @@ class PhpTransliterationTest extends UnitTestCase {
     // Five-byte characters do not work in MySQL, so make a printable version.
     $five_byte_printable = '&#x10330;&#x10338;';
 
-    $cases = array(
+    $cases = [
       // Test the language override hook in the test module, which changes
       // the transliteration of Ä to Z and provides for the 5-byte characters.
-      array('zz', $two_byte, 'Z O U A O aouaohello'),
-      array('zz', $random, $random),
-      array('zz', $five_byte, 'ATh', $five_byte_printable),
-    );
+      ['zz', $two_byte, 'Z O U A O aouaohello'],
+      ['zz', $random, $random],
+      ['zz', $five_byte, 'ATh', $five_byte_printable],
+    ];
 
     return $cases;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php b/web/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php
index 5e3558e1b..08b811703 100644
--- a/web/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php
@@ -95,10 +95,9 @@ class RecursiveContextualValidatorTest extends UnitTestCase {
    * Ensures that passing an explicit group is not supported.
    *
    * @covers ::validate
-   *
-   * @expectedException \LogicException
    */
   public function testValidateWithGroups() {
+    $this->setExpectedException(\LogicException::class);
     $this->recursiveValidator->validate('test', NULL, 'test group');
   }
 
@@ -106,10 +105,9 @@ class RecursiveContextualValidatorTest extends UnitTestCase {
    * Ensures that passing a non typed data value is not supported.
    *
    * @covers ::validate
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testValidateWithoutTypedData() {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->recursiveValidator->validate('test');
   }
 
@@ -228,8 +226,6 @@ class RecursiveContextualValidatorTest extends UnitTestCase {
 
   /**
    * @covers ::validateProperty
-   *
-   * @expectedException \LogicException
    */
   public function testValidatePropertyWithCustomGroup() {
     $tree = [
@@ -239,6 +235,7 @@ class RecursiveContextualValidatorTest extends UnitTestCase {
       ],
     ];
     $typed_data = $this->setupTypedData($tree, 'test_name');
+    $this->setExpectedException(\LogicException::class);
     $this->recursiveValidator->validateProperty($typed_data, 'key1', 'test group');
   }
 
@@ -246,10 +243,9 @@ class RecursiveContextualValidatorTest extends UnitTestCase {
    * @covers ::validateProperty
    *
    * @dataProvider providerTestValidatePropertyWithInvalidObjects
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testValidatePropertyWithInvalidObjects($object) {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->recursiveValidator->validateProperty($object, 'key1', NULL);
   }
 
@@ -289,10 +285,9 @@ class RecursiveContextualValidatorTest extends UnitTestCase {
    * @covers ::validatePropertyValue
    *
    * @dataProvider providerTestValidatePropertyWithInvalidObjects
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testValidatePropertyValueWithInvalidObjects($object) {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->recursiveValidator->validatePropertyValue($object, 'key1', [], NULL);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php b/web/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
index ef6dd2525..680e2fde1 100644
--- a/web/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
+++ b/web/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
@@ -102,9 +102,9 @@ class UnroutedUrlTest extends UnitTestCase {
    *
    * @covers ::fromUri
    * @dataProvider providerFromInvalidUri
-   * @expectedException \InvalidArgumentException
    */
   public function testFromInvalidUri($uri) {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $url = Url::fromUri($uri);
   }
 
@@ -133,8 +133,6 @@ class UnroutedUrlTest extends UnitTestCase {
    * Tests the createFromRequest method.
    *
    * @covers ::createFromRequest
-   *
-   * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
    */
   public function testCreateFromRequest() {
     $request = Request::create('/test-path');
@@ -144,7 +142,8 @@ class UnroutedUrlTest extends UnitTestCase {
       ->with($request)
       ->will($this->throwException(new ResourceNotFoundException()));
 
-    $this->assertNull(Url::createFromRequest($request));
+    $this->setExpectedException(ResourceNotFoundException::class);
+    Url::createFromRequest($request);
   }
 
   /**
@@ -179,12 +178,11 @@ class UnroutedUrlTest extends UnitTestCase {
    * @depends testFromUri
    * @dataProvider providerFromUri
    *
-   * @expectedException \UnexpectedValueException
-   *
    * @covers ::getRouteName
    */
   public function testGetRouteName($uri) {
     $url = Url::fromUri($uri);
+    $this->setExpectedException(\UnexpectedValueException::class);
     $url->getRouteName();
   }
 
@@ -194,12 +192,11 @@ class UnroutedUrlTest extends UnitTestCase {
    * @depends testFromUri
    * @dataProvider providerFromUri
    *
-   * @expectedException \UnexpectedValueException
-   *
    * @covers ::getRouteParameters
    */
   public function testGetRouteParameters($uri) {
     $url = Url::fromUri($uri);
+    $this->setExpectedException(\UnexpectedValueException::class);
     $url->getRouteParameters();
   }
 
@@ -210,12 +207,11 @@ class UnroutedUrlTest extends UnitTestCase {
    * @dataProvider providerFromUri
    *
    * @covers ::getInternalPath
-   *
-   * @expectedException \Exception
    */
   public function testGetInternalPath($uri) {
     $url = Url::fromUri($uri);
-    $this->assertNull($url->getInternalPath());
+    $this->setExpectedException(\Exception::class);
+    $url->getInternalPath();
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/UrlTest.php b/web/core/tests/Drupal/Tests/Core/UrlTest.php
index 5324c2640..b2e0976b0 100644
--- a/web/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/web/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -73,21 +73,21 @@ class UrlTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $map = array();
-    $map[] = array('view.frontpage.page_1', array(), array(), FALSE, '/node');
-    $map[] = array('node_view', array('node' => '1'), array(), FALSE, '/node/1');
-    $map[] = array('node_edit', array('node' => '2'), array(), FALSE, '/node/2/edit');
+    $map = [];
+    $map[] = ['view.frontpage.page_1', [], [], FALSE, '/node'];
+    $map[] = ['node_view', ['node' => '1'], [], FALSE, '/node/1'];
+    $map[] = ['node_edit', ['node' => '2'], [], FALSE, '/node/2/edit'];
     $this->map = $map;
 
-    $alias_map = array(
+    $alias_map = [
       // Set up one proper alias that can be resolved to a system path.
-      array('node-alias-test', NULL, FALSE, 'node'),
+      ['node-alias-test', NULL, FALSE, 'node'],
       // Passing in anything else should return the same string.
-      array('node', NULL, FALSE, 'node'),
-      array('node/1', NULL, FALSE, 'node/1'),
-      array('node/2/edit', NULL, FALSE, 'node/2/edit'),
-      array('non-existent', NULL, FALSE, 'non-existent'),
-    );
+      ['node', NULL, FALSE, 'node'],
+      ['node/1', NULL, FALSE, 'node/1'],
+      ['node/2/edit', NULL, FALSE, 'node/2/edit'],
+      ['non-existent', NULL, FALSE, 'non-existent'],
+    ];
 
     // $this->map has $collect_bubbleable_metadata = FALSE; also generate the
     // $collect_bubbleable_metadata = TRUE case for ::generateFromRoute().
@@ -143,7 +143,7 @@ class UrlTest extends UnitTestCase {
         '_raw_variables' => new ParameterBag(['node' => '2']),
       ]);
 
-    $urls = array();
+    $urls = [];
     foreach ($this->map as $index => $values) {
       $path = array_pop($values);
       $url = Url::createFromRequest(Request::create("$path"));
@@ -215,10 +215,10 @@ class UrlTest extends UnitTestCase {
    * Tests the fromUserInput method with invalid paths.
    *
    * @covers ::fromUserInput
-   * @expectedException \InvalidArgumentException
    * @dataProvider providerFromInvalidInternalUri
    */
   public function testFromInvalidUserInput($path) {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $url = Url::fromUserInput($path);
   }
 
@@ -258,13 +258,13 @@ class UrlTest extends UnitTestCase {
    * @covers ::createFromRequest
    */
   public function testCreateFromRequest() {
-    $attributes = array(
-      '_raw_variables' => new ParameterBag(array(
+    $attributes = [
+      '_raw_variables' => new ParameterBag([
         'color' => 'chartreuse',
-      )),
+      ]),
       RouteObjectInterface::ROUTE_NAME => 'the_route_name',
-    );
-    $request = new Request(array(), array(), $attributes);
+    ];
+    $request = new Request([], [], $attributes);
 
     $this->router->expects($this->once())
       ->method('matchRequest')
@@ -272,7 +272,7 @@ class UrlTest extends UnitTestCase {
       ->will($this->returnValue($attributes));
 
     $url = Url::createFromRequest($request);
-    $expected = new Url('the_route_name', array('color' => 'chartreuse'));
+    $expected = new Url('the_route_name', ['color' => 'chartreuse']);
     $this->assertEquals($expected, $url);
   }
 
@@ -280,8 +280,6 @@ class UrlTest extends UnitTestCase {
    * Tests that an invalid request will thrown an exception.
    *
    * @covers ::createFromRequest
-   *
-   * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
    */
   public function testUrlFromRequestInvalid() {
     $request = Request::create('/test-path');
@@ -291,7 +289,8 @@ class UrlTest extends UnitTestCase {
       ->with($request)
       ->will($this->throwException(new ResourceNotFoundException()));
 
-    $this->assertNull(Url::createFromRequest($request));
+    $this->setExpectedException(ResourceNotFoundException::class);
+    Url::createFromRequest($request);
   }
 
   /**
@@ -315,11 +314,10 @@ class UrlTest extends UnitTestCase {
    *
    * @depends testUrlFromRequest
    *
-   * @expectedException \UnexpectedValueException
-   *
    * @covers ::getUri
    */
   public function testGetUriForInternalUrl($urls) {
+    $this->setExpectedException(\UnexpectedValueException::class);
     foreach ($urls as $url) {
       $url->getUri();
     }
@@ -418,10 +416,10 @@ class UrlTest extends UnitTestCase {
    * Tests the getRouteName() with an external URL.
    *
    * @covers ::getRouteName
-   * @expectedException \UnexpectedValueException
    */
   public function testGetRouteNameWithExternalUrl() {
     $url = Url::fromUri('http://example.com');
+    $this->setExpectedException(\UnexpectedValueException::class);
     $url->getRouteName();
   }
 
@@ -445,10 +443,10 @@ class UrlTest extends UnitTestCase {
    * Tests the getRouteParameters() with an external URL.
    *
    * @covers ::getRouteParameters
-   * @expectedException \UnexpectedValueException
    */
   public function testGetRouteParametersWithExternalUrl() {
     $url = Url::fromUri('http://example.com');
+    $this->setExpectedException(\UnexpectedValueException::class);
     $url->getRouteParameters();
   }
 
@@ -468,6 +466,31 @@ class UrlTest extends UnitTestCase {
     }
   }
 
+  /**
+   * Tests the setOptions() method.
+   *
+   * @covers ::setOptions
+   */
+  public function testSetOptions() {
+    $url = Url::fromRoute('test_route', []);
+    $this->assertEquals([], $url->getOptions());
+    $url->setOptions(['foo' => 'bar']);
+    $this->assertEquals(['foo' => 'bar'], $url->getOptions());
+    $url->setOptions([]);
+    $this->assertEquals([], $url->getOptions());
+  }
+
+  /**
+   * Tests the mergeOptions() method.
+   *
+   * @covers ::mergeOptions
+   */
+  public function testMergeOptions() {
+    $url = Url::fromRoute('test_route', [], ['foo' => 'bar', 'bar' => ['key' => 'value']]);
+    $url->mergeOptions(['bar' => ['key' => 'value1', 'key2' => 'value2']]);
+    $this->assertEquals(['foo' => 'bar', 'bar' => ['key' => 'value1', 'key2' => 'value2']], $url->getOptions());
+  }
+
   /**
    * Tests the access() method for routed URLs.
    *
@@ -508,9 +531,9 @@ class UrlTest extends UnitTestCase {
    * @dataProvider accessProvider
    */
   public function testRenderAccess($access) {
-    $element = array(
+    $element = [
       '#url' => Url::fromRoute('entity.node.canonical', ['node' => 3]),
-    );
+    ];
     $this->container->set('current_user', $this->getMock('Drupal\Core\Session\AccountInterface'));
     $this->container->set('access_manager', $this->getMockAccessManager($access));
     $this->assertEquals($access, TestUrl::renderAccess($element));
@@ -605,7 +628,6 @@ class UrlTest extends UnitTestCase {
    * Tests the fromUri() method with an invalid entity: URI.
    *
    * @covers ::fromUri
-   * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
    */
   public function testInvalidEntityUriParameter() {
     // Make the mocked URL generator behave like the actual one.
@@ -614,6 +636,7 @@ class UrlTest extends UnitTestCase {
       ->with('entity.test_entity.canonical', ['test_entity' => '1/blah'])
       ->willThrowException(new InvalidParameterException('Parameter "test_entity" for route "/test_entity/{test_entity}" must match "[^/]++" ("1/blah" given) to generate a corresponding URL..'));
 
+    $this->setExpectedException(InvalidParameterException::class);
     Url::fromUri('entity:test_entity/1/blah')->toString();
   }
 
@@ -728,10 +751,10 @@ class UrlTest extends UnitTestCase {
    * Tests the fromUri() method with an invalid internal: URI.
    *
    * @covers ::fromUri
-   * @expectedException \InvalidArgumentException
    * @dataProvider providerFromInvalidInternalUri
    */
   public function testFromInvalidInternalUri($path) {
+    $this->setExpectedException(\InvalidArgumentException::class);
     Url::fromUri('internal:' . $path);
   }
 
@@ -800,10 +823,10 @@ class UrlTest extends UnitTestCase {
   }
 
   /**
-   * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage The route URI 'route:' is invalid.
+   * @covers ::fromUri
    */
   public function testFromRouteUriWithMissingRouteName() {
+    $this->setExpectedException(\InvalidArgumentException::class, "The route URI 'route:' is invalid.");
     Url::fromUri('route:');
   }
 
@@ -828,10 +851,10 @@ class UrlTest extends UnitTestCase {
    * Data provider for the access test methods.
    */
   public function accessProvider() {
-    return array(
-      array(TRUE),
-      array(FALSE),
-    );
+    return [
+      [TRUE],
+      [FALSE],
+    ];
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Utility/ErrorTest.php b/web/core/tests/Drupal/Tests/Core/Utility/ErrorTest.php
index 6c0960011..e89f21d10 100644
--- a/web/core/tests/Drupal/Tests/Core/Utility/ErrorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Utility/ErrorTest.php
@@ -32,29 +32,29 @@ class ErrorTest extends UnitTestCase {
    *   An array of parameter data.
    */
   public function providerTestGetLastCaller() {
-    $data = array();
+    $data = [];
 
     // Test with just one item. This should default to the function being
     // main().
-    $single_item = array($this->createBacktraceItem());
-    $data[] = array($single_item, $this->createBacktraceItem('main()'));
+    $single_item = [$this->createBacktraceItem()];
+    $data[] = [$single_item, $this->createBacktraceItem('main()')];
 
     // Add a second item, without a class.
     $two_items = $single_item;
     $two_items[] = $this->createBacktraceItem('test_function_two');
-    $data[] = array($two_items, $this->createBacktraceItem('test_function_two()'));
+    $data[] = [$two_items, $this->createBacktraceItem('test_function_two()')];
 
     // Add a second item, with a class.
     $two_items = $single_item;
     $two_items[] = $this->createBacktraceItem('test_function_two', 'TestClass');
-    $data[] = array($two_items, $this->createBacktraceItem('TestClass->test_function_two()'));
+    $data[] = [$two_items, $this->createBacktraceItem('TestClass->test_function_two()')];
 
     // Add blacklist functions to backtrace. They should get removed.
-    foreach (array('debug', '_drupal_error_handler', '_drupal_exception_handler') as $function) {
+    foreach (['debug', '_drupal_error_handler', '_drupal_exception_handler'] as $function) {
       $two_items = $single_item;
       // Push to the start of the backtrace.
       array_unshift($two_items, $this->createBacktraceItem($function));
-      $data[] = array($single_item, $this->createBacktraceItem('main()'));
+      $data[] = [$single_item, $this->createBacktraceItem('main()')];
     }
 
     return $data;
@@ -80,31 +80,31 @@ class ErrorTest extends UnitTestCase {
    * @return array
    */
   public function providerTestFormatBacktrace() {
-    $data = array();
+    $data = [];
 
     // Test with no function, main should be in the backtrace.
-    $data[] = array(array($this->createBacktraceItem(NULL, NULL)), "main() (Line: 10)\n");
+    $data[] = [[$this->createBacktraceItem(NULL, NULL)], "main() (Line: 10)\n"];
 
-    $base = array($this->createBacktraceItem());
-    $data[] = array($base, "test_function() (Line: 10)\n");
+    $base = [$this->createBacktraceItem()];
+    $data[] = [$base, "test_function() (Line: 10)\n"];
 
     // Add a second item.
     $second_item = $base;
     $second_item[] = $this->createBacktraceItem('test_function_2');
 
-    $data[] = array($second_item, "test_function() (Line: 10)\ntest_function_2() (Line: 10)\n");
+    $data[] = [$second_item, "test_function() (Line: 10)\ntest_function_2() (Line: 10)\n"];
 
     // Add a second item, with a class.
     $second_item_class = $base;
     $second_item_class[] = $this->createBacktraceItem('test_function_2', 'TestClass');
 
-    $data[] = array($second_item_class, "test_function() (Line: 10)\nTestClass->test_function_2() (Line: 10)\n");
+    $data[] = [$second_item_class, "test_function() (Line: 10)\nTestClass->test_function_2() (Line: 10)\n"];
 
     // Add a second item, with a class.
     $second_item_args = $base;
-    $second_item_args[] = $this->createBacktraceItem('test_function_2', NULL, array('string', 10, new \stdClass()));
+    $second_item_args[] = $this->createBacktraceItem('test_function_2', NULL, ['string', 10, new \stdClass()]);
 
-    $data[] = array($second_item_args, "test_function() (Line: 10)\ntest_function_2('string', 10, Object) (Line: 10)\n");
+    $data[] = [$second_item_args, "test_function() (Line: 10)\ntest_function_2('string', 10, Object) (Line: 10)\n"];
 
     return $data;
   }
@@ -124,13 +124,13 @@ class ErrorTest extends UnitTestCase {
    * @return array
    *   A backtrace array item.
    */
-  protected function createBacktraceItem($function = 'test_function', $class = NULL, array $args = array(), $line = 10) {
-    $backtrace = array(
+  protected function createBacktraceItem($function = 'test_function', $class = NULL, array $args = [], $line = 10) {
+    $backtrace = [
       'file' => 'test_file',
       'line' => $line,
       'function' => $function,
-      'args' => array(),
-    );
+      'args' => [],
+    ];
 
     if (isset($class)) {
       $backtrace['class'] = $class;
diff --git a/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index f4dc2dfa8..50795b31f 100644
--- a/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -57,12 +57,12 @@ class LinkGeneratorTest extends UnitTestCase {
   /**
    * Contains the LinkGenerator default options.
    */
-  protected $defaultOptions = array(
-    'query' => array(),
+  protected $defaultOptions = [
+    'query' => [],
     'language' => NULL,
     'set_active_class' => FALSE,
     'absolute' => FALSE,
-  );
+  ];
 
   /**
    * {@inheritdoc}
@@ -88,14 +88,14 @@ class LinkGeneratorTest extends UnitTestCase {
    *   Returns some test data.
    */
   public function providerTestGenerateHrefs() {
-    return array(
+    return [
       // Test that the url returned by the URL generator is used.
-      array('test_route_1', array(), FALSE, '/test-route-1'),
+      ['test_route_1', [], FALSE, '/test-route-1'],
         // Test that $parameters is passed to the URL generator.
-      array('test_route_2', array('value' => 'example'), FALSE, '/test-route-2/example'),
+      ['test_route_2', ['value' => 'example'], FALSE, '/test-route-2/example'],
         // Test that the 'absolute' option is passed to the URL generator.
-      array('test_route_3', array(), TRUE, 'http://example.com/test-route-3'),
-    );
+      ['test_route_3', [], TRUE, 'http://example.com/test-route-3'],
+    ];
   }
 
   /**
@@ -109,17 +109,17 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateHrefs($route_name, array $parameters, $absolute, $expected_url) {
     $this->urlGenerator->expects($this->once())
       ->method('generateFromRoute')
-      ->with($route_name, $parameters, array('absolute' => $absolute) + $this->defaultOptions)
+      ->with($route_name, $parameters, ['absolute' => $absolute] + $this->defaultOptions)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl($expected_url));
     $this->moduleHandler->expects($this->once())
       ->method('alter');
 
-    $url = new Url($route_name, $parameters, array('absolute' => $absolute));
+    $url = new Url($route_name, $parameters, ['absolute' => $absolute]);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array('href' => $expected_url),
-      ), $result);
+    $this->assertLink([
+      'attributes' => ['href' => $expected_url],
+      ], $result);
   }
 
   /**
@@ -130,23 +130,23 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerate() {
     $this->urlGenerator->expects($this->once())
       ->method('generateFromRoute')
-      ->with('test_route_1', array(), array('fragment' => 'the-fragment') + $this->defaultOptions)
+      ->with('test_route_1', [], ['fragment' => 'the-fragment'] + $this->defaultOptions)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl('/test-route-1#the-fragment'));
 
     $this->moduleHandler->expects($this->once())
       ->method('alter')
       ->with('link', $this->isType('array'));
 
-    $url = new Url('test_route_1', array(), array('fragment' => 'the-fragment'));
+    $url = new Url('test_route_1', [], ['fragment' => 'the-fragment']);
     $url->setUrlGenerator($this->urlGenerator);
 
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'href' => '/test-route-1#the-fragment',
-      ),
+      ],
       'content' => 'Test',
-    ), $result);
+    ], $result);
   }
 
   /**
@@ -180,7 +180,7 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateExternal() {
     $this->urlAssembler->expects($this->once())
       ->method('assemble')
-      ->with('https://www.drupal.org', array('set_active_class' => TRUE, 'external' => TRUE) + $this->defaultOptions)
+      ->with('https://www.drupal.org', ['set_active_class' => TRUE, 'external' => TRUE] + $this->defaultOptions)
       ->will($this->returnArgument(0));
 
     $this->moduleHandler->expects($this->once())
@@ -189,7 +189,7 @@ class LinkGeneratorTest extends UnitTestCase {
 
     $this->urlAssembler->expects($this->once())
       ->method('assemble')
-      ->with('https://www.drupal.org', array('set_active_class' => TRUE, 'external' => TRUE) + $this->defaultOptions)
+      ->with('https://www.drupal.org', ['set_active_class' => TRUE, 'external' => TRUE] + $this->defaultOptions)
       ->willReturnArgument(0);
 
     $url = Url::fromUri('https://www.drupal.org');
@@ -198,12 +198,12 @@ class LinkGeneratorTest extends UnitTestCase {
     $url->setOption('set_active_class', TRUE);
 
     $result = $this->linkGenerator->generate('Drupal', $url);
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'href' => 'https://www.drupal.org',
-      ),
+      ],
       'content' => 'Drupal',
-    ), $result);
+    ], $result);
   }
 
   /**
@@ -214,7 +214,7 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateUrlWithQuotes() {
     $this->urlAssembler->expects($this->once())
       ->method('assemble')
-      ->with('base:example', array('query' => array('foo' => '"bar"', 'zoo' => 'baz')) + $this->defaultOptions)
+      ->with('base:example', ['query' => ['foo' => '"bar"', 'zoo' => 'baz']] + $this->defaultOptions)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl('/example?foo=%22bar%22&zoo=baz'));
 
     $path_validator = $this->getMock('Drupal\Core\Path\PathValidatorInterface');
@@ -229,12 +229,12 @@ class LinkGeneratorTest extends UnitTestCase {
 
     $result = $this->linkGenerator->generate('Drupal', $url);
 
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'href' => '/example?foo=%22bar%22&zoo=baz',
-      ),
+      ],
       'content' => 'Drupal',
-    ), $result, 1);
+    ], $result, 1);
   }
 
   /**
@@ -245,21 +245,21 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateAttributes() {
     $this->urlGenerator->expects($this->once())
       ->method('generateFromRoute')
-      ->with('test_route_1', array(), $this->defaultOptions)
+      ->with('test_route_1', [], $this->defaultOptions)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl('/test-route-1'));
 
     // Test that HTML attributes are added to the anchor.
-    $url = new Url('test_route_1', array(), array(
-      'attributes' => array('title' => 'Tooltip'),
-    ));
+    $url = new Url('test_route_1', [], [
+      'attributes' => ['title' => 'Tooltip'],
+    ]);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'href' => '/test-route-1',
         'title' => 'Tooltip',
-      ),
-    ), $result);
+      ],
+    ], $result);
   }
 
   /**
@@ -270,19 +270,19 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateQuery() {
     $this->urlGenerator->expects($this->once())
       ->method('generateFromRoute')
-      ->with('test_route_1', array(), array('query' => array('test' => 'value')) + $this->defaultOptions)
+      ->with('test_route_1', [], ['query' => ['test' => 'value']] + $this->defaultOptions)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl('/test-route-1?test=value'));
 
-    $url = new Url('test_route_1', array(), array(
-      'query' => array('test' => 'value'),
-    ));
+    $url = new Url('test_route_1', [], [
+      'query' => ['test' => 'value'],
+    ]);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'href' => '/test-route-1?test=value',
-      ),
-    ), $result);
+      ],
+    ], $result);
   }
 
   /**
@@ -293,17 +293,17 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateParametersAsQuery() {
     $this->urlGenerator->expects($this->once())
       ->method('generateFromRoute')
-      ->with('test_route_1', array('test' => 'value'), $this->defaultOptions)
+      ->with('test_route_1', ['test' => 'value'], $this->defaultOptions)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl('/test-route-1?test=value'));
 
-    $url = new Url('test_route_1', array('test' => 'value'), array());
+    $url = new Url('test_route_1', ['test' => 'value'], []);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'href' => '/test-route-1?test=value',
-      ),
-    ), $result);
+      ],
+    ], $result);
   }
 
   /**
@@ -314,18 +314,18 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateOptions() {
     $this->urlGenerator->expects($this->once())
       ->method('generateFromRoute')
-      ->with('test_route_1', array(), array('key' => 'value') + $this->defaultOptions)
+      ->with('test_route_1', [], ['key' => 'value'] + $this->defaultOptions)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl('/test-route-1?test=value'));
-    $url = new Url('test_route_1', array(), array(
+    $url = new Url('test_route_1', [], [
       'key' => 'value',
-    ));
+    ]);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'href' => '/test-route-1?test=value',
-      ),
-    ), $result);
+      ],
+    ], $result);
   }
 
   /**
@@ -336,7 +336,7 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateXss() {
     $this->urlGenerator->expects($this->once())
       ->method('generateFromRoute')
-      ->with('test_route_4', array(), $this->defaultOptions)
+      ->with('test_route_4', [], $this->defaultOptions)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl('/test-route-4'));
 
     // Test that HTML link text is escaped by default.
@@ -354,38 +354,38 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateWithHtml() {
     $this->urlGenerator->expects($this->at(0))
       ->method('generateFromRoute')
-      ->with('test_route_5', array(), $this->defaultOptions)
+      ->with('test_route_5', [], $this->defaultOptions)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl('/test-route-5'));
     $this->urlGenerator->expects($this->at(1))
       ->method('generateFromRoute')
-      ->with('test_route_5', array(), $this->defaultOptions)
+      ->with('test_route_5', [], $this->defaultOptions)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl('/test-route-5'));
 
     // Test that HTML tags are stripped from the 'title' attribute.
-    $url = new Url('test_route_5', array(), array(
-      'attributes' => array('title' => '<em>HTML Tooltip</em>'),
-    ));
+    $url = new Url('test_route_5', [], [
+      'attributes' => ['title' => '<em>HTML Tooltip</em>'],
+    ]);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'href' => '/test-route-5',
         'title' => 'HTML Tooltip',
-      ),
-    ), $result);
+      ],
+    ], $result);
 
     // Test that safe HTML is output inside the anchor tag unescaped. The
     // Markup::create() call is an intentional unit test for the interaction
     // between MarkupInterface and the LinkGenerator.
-    $url = new Url('test_route_5', array());
+    $url = new Url('test_route_5', []);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate(Markup::create('<em>HTML output</em>'), $url);
-    $this->assertLink(array(
-      'attributes' => array('href' => '/test-route-5'),
-      'child' => array(
+    $this->assertLink([
+      'attributes' => ['href' => '/test-route-5'],
+      'child' => [
         'tag' => 'em',
-      ),
-    ), $result);
+      ],
+    ], $result);
     $this->assertTrue(strpos($result, '<em>HTML output</em>') !== FALSE);
   }
 
@@ -397,7 +397,7 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateActive() {
     $this->urlGenerator->expects($this->exactly(5))
       ->method('generateFromRoute')
-      ->willReturnCallback(function($name, $parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE) {
+      ->willReturnCallback(function($name, $parameters = [], $options = [], $collect_bubbleable_metadata = FALSE) {
         switch ($name) {
           case 'test_route_1':
             return (new GeneratedUrl())->setGeneratedUrl('/test-route-1');
@@ -412,70 +412,70 @@ class LinkGeneratorTest extends UnitTestCase {
 
     $this->urlGenerator->expects($this->exactly(4))
       ->method('getPathFromRoute')
-      ->will($this->returnValueMap(array(
-        array('test_route_1', array(), 'test-route-1'),
-        array('test_route_3', array(), 'test-route-3'),
-        array('test_route_4', array('object' => '1'), 'test-route-4/1'),
-      )));
+      ->will($this->returnValueMap([
+        ['test_route_1', [], 'test-route-1'],
+        ['test_route_3', [], 'test-route-3'],
+        ['test_route_4', ['object' => '1'], 'test-route-4/1'],
+      ]));
 
     $this->moduleHandler->expects($this->exactly(5))
       ->method('alter');
 
     // Render a link.
-    $url = new Url('test_route_1', array(), array('set_active_class' => TRUE));
+    $url = new Url('test_route_1', [], ['set_active_class' => TRUE]);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array('data-drupal-link-system-path' => 'test-route-1'),
-    ), $result);
+    $this->assertLink([
+      'attributes' => ['data-drupal-link-system-path' => 'test-route-1'],
+    ], $result);
 
     // Render a link with the set_active_class option disabled.
-    $url = new Url('test_route_1', array(), array('set_active_class' => FALSE));
+    $url = new Url('test_route_1', [], ['set_active_class' => FALSE]);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
     $this->assertNoXPathResults('//a[@data-drupal-link-system-path="test-route-1"]', $result);
 
     // Render a link with an associated language.
-    $url = new Url('test_route_1', array(), array(
-      'language' => new Language(array('id' => 'de')),
+    $url = new Url('test_route_1', [], [
+      'language' => new Language(['id' => 'de']),
       'set_active_class' => TRUE,
-    ));
+    ]);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'data-drupal-link-system-path' => 'test-route-1',
         'hreflang' => 'de',
-      ),
-    ), $result);
+      ],
+    ], $result);
 
     // Render a link with a query parameter.
-    $url = new Url('test_route_3', array(), array(
-      'query' => array('value' => 'example_1'),
+    $url = new Url('test_route_3', [], [
+      'query' => ['value' => 'example_1'],
       'set_active_class' => TRUE,
-    ));
+    ]);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'data-drupal-link-system-path' => 'test-route-3',
         'data-drupal-link-query' => '{"value":"example_1"}',
-      ),
-    ), $result);
+      ],
+    ], $result);
 
     // Render a link with route parameters and a query parameter.
-    $url = new Url('test_route_4', array('object' => '1'), array(
-      'query' => array('value' => 'example_1'),
+    $url = new Url('test_route_4', ['object' => '1'], [
+      'query' => ['value' => 'example_1'],
       'set_active_class' => TRUE,
-    ));
+    ]);
     $url->setUrlGenerator($this->urlGenerator);
     $result = $this->linkGenerator->generate('Test', $url);
-    $this->assertLink(array(
-      'attributes' => array(
+    $this->assertLink([
+      'attributes' => [
         'data-drupal-link-system-path' => 'test-route-4/1',
         'data-drupal-link-query' => '{"value":"example_1"}',
-      ),
-    ), $result);
+      ],
+    ], $result);
   }
 
   /**
@@ -537,6 +537,25 @@ class LinkGeneratorTest extends UnitTestCase {
     $this->assertEquals($expected_link_markup, (string) $this->linkGenerator->generate('Test', $url)->getGeneratedLink());
   }
 
+  /**
+   * Tests whether rendering the same link twice works.
+   *
+   * This is a regression test for https://www.drupal.org/node/2842399.
+   */
+  public function testGenerateTwice() {
+    $this->urlGenerator->expects($this->any())
+      ->method('generateFromRoute')
+      ->will($this->returnValue((new GeneratedUrl())->setGeneratedUrl('/')));
+
+    $url = Url::fromRoute('<front>', [], ['attributes' => ['class' => ['foo', 'bar']]]);
+    $url->setUrlGenerator($this->urlGenerator);
+
+    $link = Link::fromTextAndUrl('text', $url);
+    $link->setLinkGenerator($this->linkGenerator);
+    $output = $link->toString() . $link->toString();
+    $this->assertEquals('<a href="/" class="foo bar">text</a><a href="/" class="foo bar">text</a>', $output);
+  }
+
   /**
    * Checks that a link with certain properties exists in a given HTML snippet.
    *
@@ -551,13 +570,13 @@ class LinkGeneratorTest extends UnitTestCase {
    */
   public static function assertLink(array $properties, MarkupInterface $html, $count = 1) {
     // Provide default values.
-    $properties += array('attributes' => array());
+    $properties += ['attributes' => []];
 
     // Create an XPath query that selects a link element.
     $query = '//a';
 
     // Append XPath predicates for the attributes and content text.
-    $predicates = array();
+    $predicates = [];
     foreach ($properties['attributes'] as $attribute => $value) {
       $predicates[] = "@$attribute='$value'";
     }
diff --git a/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php b/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
index 04a2b8f62..91620e615 100644
--- a/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
@@ -104,13 +104,13 @@ class TokenTest extends UnitTestCase {
    * @covers ::getInfo
    */
   public function testGetInfo() {
-    $token_info = array(
-      'types' => array(
-        'foo' => array(
+    $token_info = [
+      'types' => [
+        'foo' => [
           'name' => $this->randomMachineName(),
-        ),
-      ),
-    );
+        ],
+      ],
+    ];
 
     $this->language->expects($this->atLeastOnce())
       ->method('getId')
diff --git a/web/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php b/web/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
index b2d7700e0..01b16ad43 100644
--- a/web/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
@@ -56,17 +56,17 @@ class UnroutedUrlAssemblerTest extends UnitTestCase {
 
   /**
    * @covers ::assemble
-   * @expectedException \InvalidArgumentException
    */
   public function testAssembleWithNeitherExternalNorDomainLocalUri() {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->unroutedUrlAssembler->assemble('wrong-url');
   }
 
   /**
    * @covers ::assemble
-   * @expectedException \InvalidArgumentException
    */
   public function testAssembleWithLeadingSlash() {
+    $this->setExpectedException(\InvalidArgumentException::class);
     $this->unroutedUrlAssembler->assemble('/drupal.org');
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php b/web/core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php
index 12f36eac2..6647e5fa7 100644
--- a/web/core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php
@@ -13,6 +13,7 @@ use Drupal\Core\Validation\Plugin\Validation\Constraint\PrimitiveTypeConstraint;
 use Drupal\Core\Validation\Plugin\Validation\Constraint\PrimitiveTypeConstraintValidator;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Tests\UnitTestCase;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @coversDefaultClass \Drupal\Core\Validation\Plugin\Validation\Constraint\PrimitiveTypeConstraintValidator
@@ -26,7 +27,7 @@ class PrimitiveTypeConstraintValidatorTest extends UnitTestCase {
    * @dataProvider provideTestValidate
    */
   public function testValidate(PrimitiveInterface $typed_data, $value, $valid) {
-    $context = $this->getMock('\Symfony\Component\Validator\Context\ExecutionContextInterface');
+    $context = $this->getMock(ExecutionContextInterface::class);
     $context->expects($this->any())
       ->method('getObject')
       ->willReturn($typed_data);
diff --git a/web/core/tests/Drupal/Tests/HiddenFieldSelector.php b/web/core/tests/Drupal/Tests/HiddenFieldSelector.php
new file mode 100644
index 000000000..b445c4873
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/HiddenFieldSelector.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Drupal\Tests;
+
+use Behat\Mink\Selector\PartialNamedSelector;
+
+/**
+ * Extends PartialNamedSelector to allow retrieval of hidden fields.
+ *
+ * @see \Behat\Mink\Selector\PartialNamedSelector
+ */
+class HiddenFieldSelector extends PartialNamedSelector {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct() {
+    $xpath = ".//input[%lowercaseType% = 'hidden' and (%idOrNameMatch% or %valueMatch%)]";
+    $this->registerNamedXpath('hidden_field', $xpath);
+    parent::__construct();
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Listeners/SimpletestUiPrinter.php b/web/core/tests/Drupal/Tests/Listeners/SimpletestUiPrinter.php
new file mode 100644
index 000000000..bfb91d7b9
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Listeners/SimpletestUiPrinter.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\Tests\Listeners;
+
+use Drupal\Component\Utility\Html;
+
+/**
+ * Defines a class for providing html output links in the Simpletest UI.
+ */
+class SimpletestUiPrinter extends HtmlOutputPrinter {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function write($buffer) {
+    $buffer = Html::escape($buffer);
+    // Turn HTML output URLs into clickable link <a> tags.
+    $url_pattern = '@https?://[^\s]+@';
+    $buffer = preg_replace($url_pattern, '<a href="$0" target="_blank" title="$0">$0</a>', $buffer);
+    // Make the output readable in HTML by breaking up lines properly.
+    $buffer = nl2br($buffer);
+
+    print $buffer;
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/RandomGeneratorTrait.php b/web/core/tests/Drupal/Tests/RandomGeneratorTrait.php
index 4fdd89a88..3cac5d293 100644
--- a/web/core/tests/Drupal/Tests/RandomGeneratorTrait.php
+++ b/web/core/tests/Drupal/Tests/RandomGeneratorTrait.php
@@ -36,7 +36,7 @@ trait RandomGeneratorTrait {
    */
   public function randomString($length = 8) {
     if ($length < 4) {
-      return $this->getRandomGenerator()->string($length, TRUE, array($this, 'randomStringValidate'));
+      return $this->getRandomGenerator()->string($length, TRUE, [$this, 'randomStringValidate']);
     }
 
     // To prevent the introduction of random test failures, ensure that the
@@ -45,7 +45,7 @@ trait RandomGeneratorTrait {
     $replacement_pos = floor($length / 2);
     // Remove 2 from the length to account for the ampersand and greater than
     // characters.
-    $string = $this->getRandomGenerator()->string($length - 2, TRUE, array($this, 'randomStringValidate'));
+    $string = $this->getRandomGenerator()->string($length - 2, TRUE, [$this, 'randomStringValidate']);
     return substr_replace($string, '>&', $replacement_pos, 0);
   }
 
diff --git a/web/core/tests/Drupal/Tests/SchemaCheckTestTrait.php b/web/core/tests/Drupal/Tests/SchemaCheckTestTrait.php
new file mode 100644
index 000000000..0d4dd4bd5
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/SchemaCheckTestTrait.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\Tests;
+
+use Drupal\Core\Config\TypedConfigManagerInterface;
+use Drupal\Core\Config\Schema\SchemaCheckTrait;
+use Drupal\Component\Utility\SafeMarkup;
+
+/**
+ * Provides a class for checking configuration schema.
+ */
+trait SchemaCheckTestTrait {
+
+  use SchemaCheckTrait;
+
+  /**
+   * Asserts the TypedConfigManager has a valid schema for the configuration.
+   *
+   * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config
+   *   The TypedConfigManager.
+   * @param string $config_name
+   *   The configuration name.
+   * @param array $config_data
+   *   The configuration data.
+   */
+  public function assertConfigSchema(TypedConfigManagerInterface $typed_config, $config_name, $config_data) {
+    $errors = $this->checkConfigSchema($typed_config, $config_name, $config_data);
+    if ($errors === FALSE) {
+      // @todo Since the use of this trait is under TestBase, it works.
+      //   Can be fixed as part of https://www.drupal.org/node/2260053.
+      $this->fail(SafeMarkup::format('No schema for @config_name', ['@config_name' => $config_name]));
+      return;
+    }
+    elseif ($errors === TRUE) {
+      // @todo Since the use of this trait is under TestBase, it works.
+      //   Can be fixed as part of https://www.drupal.org/node/2260053.
+      $this->pass(SafeMarkup::format('Schema found for @config_name and values comply with schema.', ['@config_name' => $config_name]));
+    }
+    else {
+      foreach ($errors as $key => $error) {
+        // @todo Since the use of this trait is under TestBase, it works.
+        //   Can be fixed as part of https://www.drupal.org/node/2260053.
+        $this->fail(SafeMarkup::format('Schema key @key failed with: @error', ['@key' => $key, '@error' => $error]));
+      }
+    }
+  }
+
+  /**
+   * Asserts configuration, specified by name, has a valid schema.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   */
+  public function assertConfigSchemaByName($config_name) {
+    $config = $this->config($config_name);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), $config->getName(), $config->get());
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Traits/Core/Config/SchemaConfigListenerTestTrait.php b/web/core/tests/Drupal/Tests/Traits/Core/Config/SchemaConfigListenerTestTrait.php
index 02931e457..e2cc00cf4 100644
--- a/web/core/tests/Drupal/Tests/Traits/Core/Config/SchemaConfigListenerTestTrait.php
+++ b/web/core/tests/Drupal/Tests/Traits/Core/Config/SchemaConfigListenerTestTrait.php
@@ -10,7 +10,7 @@ use \Drupal\Core\Config\Schema\SchemaIncompleteException;
 trait SchemaConfigListenerTestTrait {
 
   /**
-   * Tests \Drupal\Core\Config\Testing\ConfigSchemaChecker.
+   * Tests \Drupal\Core\Config\Development\ConfigSchemaChecker.
    */
   public function testConfigSchemaChecker() {
     // Test a non-existing schema.
diff --git a/web/core/tests/Drupal/Tests/Traits/Core/CronRunTrait.php b/web/core/tests/Drupal/Tests/Traits/Core/CronRunTrait.php
new file mode 100644
index 000000000..17ca9fcdb
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Traits/Core/CronRunTrait.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Drupal\Tests\Traits\Core;
+
+/**
+ * Adds ability to run cron from tests.
+ */
+trait CronRunTrait {
+
+  /**
+   * Runs cron on the test site.
+   */
+  protected function cronRun() {
+    $this->drupalGet('cron/' . \Drupal::state()->get('system.cron_key'));
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/UnitTestCase.php b/web/core/tests/Drupal/Tests/UnitTestCase.php
index 0a3b41a7b..f96b5109e 100644
--- a/web/core/tests/Drupal/Tests/UnitTestCase.php
+++ b/web/core/tests/Drupal/Tests/UnitTestCase.php
@@ -104,18 +104,18 @@ abstract class UnitTestCase extends \PHPUnit_Framework_TestCase {
    * @return \PHPUnit_Framework_MockObject_MockBuilder
    *   A MockBuilder object for the ConfigFactory with the desired return values.
    */
-  public function getConfigFactoryStub(array $configs = array()) {
-    $config_get_map = array();
-    $config_editable_map = array();
+  public function getConfigFactoryStub(array $configs = []) {
+    $config_get_map = [];
+    $config_editable_map = [];
     // Construct the desired configuration object stubs, each with its own
     // desired return map.
     foreach ($configs as $config_name => $config_values) {
-      $map = array();
+      $map = [];
       foreach ($config_values as $key => $value) {
-        $map[] = array($key, $value);
+        $map[] = [$key, $value];
       }
       // Also allow to pass in no argument.
-      $map[] = array('', $config_values);
+      $map[] = ['', $config_values];
 
       $immutable_config_object = $this->getMockBuilder('Drupal\Core\Config\ImmutableConfig')
         ->disableOriginalConstructor()
@@ -123,7 +123,7 @@ abstract class UnitTestCase extends \PHPUnit_Framework_TestCase {
       $immutable_config_object->expects($this->any())
         ->method('get')
         ->will($this->returnValueMap($map));
-      $config_get_map[] = array($config_name, $immutable_config_object);
+      $config_get_map[] = [$config_name, $immutable_config_object];
 
       $mutable_config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
         ->disableOriginalConstructor()
@@ -131,7 +131,7 @@ abstract class UnitTestCase extends \PHPUnit_Framework_TestCase {
       $mutable_config_object->expects($this->any())
         ->method('get')
         ->will($this->returnValueMap($map));
-      $config_editable_map[] = array($config_name, $mutable_config_object);
+      $config_editable_map[] = [$config_name, $mutable_config_object];
     }
     // Construct a config factory with the array of configuration object stubs
     // as its return map.
@@ -207,7 +207,7 @@ abstract class UnitTestCase extends \PHPUnit_Framework_TestCase {
     $translation = $this->getMock('Drupal\Core\StringTranslation\TranslationInterface');
     $translation->expects($this->any())
       ->method('translate')
-      ->willReturnCallback(function ($string, array $args = array(), array $options = array()) use ($translation) {
+      ->willReturnCallback(function ($string, array $args = [], array $options = []) use ($translation) {
         return new TranslatableMarkup($string, $args, $options, $translation);
       });
     $translation->expects($this->any())
diff --git a/web/core/tests/Drupal/Tests/WebAssert.php b/web/core/tests/Drupal/Tests/WebAssert.php
index 6156dda8c..ea4251781 100644
--- a/web/core/tests/Drupal/Tests/WebAssert.php
+++ b/web/core/tests/Drupal/Tests/WebAssert.php
@@ -113,10 +113,10 @@ class WebAssert extends MinkWebAssert {
    */
   public function selectExists($select, TraversableElement $container = NULL) {
     $container = $container ?: $this->session->getPage();
-    $node = $container->find('named', array(
+    $node = $container->find('named', [
       'select',
       $this->session->getSelectorsHandler()->xpathLiteral($select),
-    ));
+    ]);
 
     if ($node === NULL) {
       throw new ElementNotFoundException($this->session, 'select', 'id|name|label|value', $select);
@@ -143,16 +143,16 @@ class WebAssert extends MinkWebAssert {
    */
   public function optionExists($select, $option, TraversableElement $container = NULL) {
     $container = $container ?: $this->session->getPage();
-    $select_field = $container->find('named', array(
+    $select_field = $container->find('named', [
       'select',
       $this->session->getSelectorsHandler()->xpathLiteral($select),
-    ));
+    ]);
 
     if ($select_field === NULL) {
       throw new ElementNotFoundException($this->session, 'select', 'id|name|label|value', $select);
     }
 
-    $option_field = $select_field->find('named', array('option', $option));
+    $option_field = $select_field->find('named', ['option', $option]);
 
     if ($option_field === NULL) {
       throw new ElementNotFoundException($this->session, 'select', 'id|name|label|value', $option);
@@ -176,16 +176,16 @@ class WebAssert extends MinkWebAssert {
    */
   public function optionNotExists($select, $option, TraversableElement $container = NULL) {
     $container = $container ?: $this->session->getPage();
-    $select_field = $container->find('named', array(
+    $select_field = $container->find('named', [
       'select',
       $this->session->getSelectorsHandler()->xpathLiteral($select),
-    ));
+    ]);
 
     if ($select_field === NULL) {
       throw new ElementNotFoundException($this->session, 'select', 'id|name|label|value', $select);
     }
 
-    $option_field = $select_field->find('named', array('option', $option));
+    $option_field = $select_field->find('named', ['option', $option]);
 
     $this->assert($option_field === NULL, sprintf('An option "%s" exists in select "%s", but it should not.', $option, $select));
   }
@@ -247,7 +247,7 @@ class WebAssert extends MinkWebAssert {
    *   Thrown when element doesn't exist, or the link label is a different one.
    */
   public function linkNotExists($label, $message = '') {
-    $message = ($message ? $message : strtr('Link with label %label found.', ['%label' => $label]));
+    $message = ($message ? $message : strtr('Link with label %label not found.', ['%label' => $label]));
     $links = $this->session->getPage()->findAll('named', ['link', $label]);
     $this->assert(empty($links), $message);
   }
@@ -291,7 +291,7 @@ class WebAssert extends MinkWebAssert {
    */
   public function linkByHrefNotExists($href, $message = '') {
     $xpath = $this->buildXPathQuery('//a[contains(@href, :href)]', [':href' => $href]);
-    $message = ($message ? $message : strtr('Link containing href %href found.', ['%href' => $href]));
+    $message = ($message ? $message : strtr('No link containing href %href found.', ['%href' => $href]));
     $links = $this->session->getPage()->findAll('xpath', $xpath);
     $this->assert(empty($links), $message);
   }
@@ -316,11 +316,11 @@ class WebAssert extends MinkWebAssert {
    * @return string
    *   An XPath query with arguments replaced.
    */
-  public function buildXPathQuery($xpath, array $args = array()) {
+  public function buildXPathQuery($xpath, array $args = []) {
     // Replace placeholders.
     foreach ($args as $placeholder => $value) {
       if (is_object($value)) {
-        throw new \InvalidArgumentException('Just pass in scalar values.');
+        throw new \InvalidArgumentException('Just pass in scalar values for $args and remove all t() calls from your test.');
       }
       // XPath 1.0 doesn't support a way to escape single or double quotes in a
       // string literal. We split double quotes out of the string, and encode
@@ -422,4 +422,83 @@ class WebAssert extends MinkWebAssert {
     return $node;
   }
 
+  /**
+   * Checks that specific hidden field exists.
+   *
+   * @param string $field
+   *   One of id|name|value for the hidden field.
+   * @param \Behat\Mink\Element\TraversableElement $container
+   *   (optional) The document to check against. Defaults to the current page.
+   *
+   * @return \Behat\Mink\Element\NodeElement
+   *   The matching element.
+   *
+   * @throws \Behat\Mink\Exception\ElementNotFoundException
+   */
+  public function hiddenFieldExists($field, TraversableElement $container = NULL) {
+    $container = $container ?: $this->session->getPage();
+    if ($node = $container->find('hidden_field_selector', ['hidden_field', $field])) {
+      return $node;
+    }
+    throw new ElementNotFoundException($this->session->getDriver(), 'form hidden field', 'id|name|value', $field);
+  }
+
+  /**
+   * Checks that specific hidden field does not exists.
+   *
+   * @param string $field
+   *   One of id|name|value for the hidden field.
+   * @param \Behat\Mink\Element\TraversableElement $container
+   *   (optional) The document to check against. Defaults to the current page.
+   *
+   * @throws \Behat\Mink\Exception\ExpectationException
+   */
+  public function hiddenFieldNotExists($field, TraversableElement $container = NULL) {
+    $container = $container ?: $this->session->getPage();
+    $node = $container->find('hidden_field_selector', ['hidden_field', $field]);
+    $this->assert($node === NULL, "A hidden field '$field' exists on this page, but it should not.");
+  }
+
+  /**
+   * Checks that specific hidden field have provided value.
+   *
+   * @param string $field
+   *   One of id|name|value for the hidden field.
+   * @param string $value
+   *   The hidden field value that needs to be checked.
+   * @param \Behat\Mink\Element\TraversableElement $container
+   *   (optional) The document to check against. Defaults to the current page.
+   *
+   * @throws \Behat\Mink\Exception\ElementNotFoundException
+   * @throws \Behat\Mink\Exception\ExpectationException
+   */
+  public function hiddenFieldValueEquals($field, $value, TraversableElement $container = NULL) {
+    $node = $this->hiddenFieldExists($field, $container);
+    $actual = $node->getValue();
+    $regex = '/^' . preg_quote($value, '/') . '$/ui';
+    $message = "The hidden field '$field' value is '$actual', but '$value' expected.";
+    $this->assert((bool) preg_match($regex, $actual), $message);
+  }
+
+  /**
+   * Checks that specific hidden field doesn't have the provided value.
+   *
+   * @param string $field
+   *   One of id|name|value for the hidden field.
+   * @param string $value
+   *   The hidden field value that needs to be checked.
+   * @param \Behat\Mink\Element\TraversableElement $container
+   *   (optional) The document to check against. Defaults to the current page.
+   *
+   * @throws \Behat\Mink\Exception\ElementNotFoundException
+   * @throws \Behat\Mink\Exception\ExpectationException
+   */
+  public function hiddenFieldValueNotEquals($field, $value, TraversableElement $container = NULL) {
+    $node = $this->hiddenFieldExists($field, $container);
+    $actual = $node->getValue();
+    $regex = '/^' . preg_quote($value, '/') . '$/ui';
+    $message = "The hidden field '$field' value is '$actual', but it should not be.";
+    $this->assert(!preg_match($regex, $actual), $message);
+  }
+
 }
diff --git a/web/core/tests/Drupal/Tests/XdebugRequestTrait.php b/web/core/tests/Drupal/Tests/XdebugRequestTrait.php
new file mode 100644
index 000000000..5da86a51b
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/XdebugRequestTrait.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\Tests;
+
+use Symfony\Component\HttpFoundation\Request;
+
+trait XdebugRequestTrait {
+
+  /**
+   * Adds xdebug cookies, from request setup.
+   *
+   * In order to debug web tests you need to either set a cookie, have the
+   * Xdebug session in the URL or set an environment variable in case of CLI
+   * requests. If the developer listens to connection on the parent site, by
+   * default the cookie is not forwarded to the client side, so you cannot
+   * debug the code running on the child site. In order to make debuggers work
+   * this bit of information is forwarded. Make sure that the debugger listens
+   * to at least three external connections.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The request.
+   *
+   * @return array
+   *   The extracted cookies.
+   */
+  protected function extractCookiesFromRequest(Request $request) {
+    $cookie_params = $request->cookies;
+    $cookies = [];
+    if ($cookie_params->has('XDEBUG_SESSION')) {
+      $cookies['XDEBUG_SESSION'][] = $cookie_params->get('XDEBUG_SESSION');
+    }
+    // For CLI requests, the information is stored in $_SERVER.
+    $server = $request->server;
+    if ($server->has('XDEBUG_CONFIG')) {
+      // $_SERVER['XDEBUG_CONFIG'] has the form "key1=value1 key2=value2 ...".
+      $pairs = explode(' ', $server->get('XDEBUG_CONFIG'));
+      foreach ($pairs as $pair) {
+        list($key, $value) = explode('=', $pair);
+        // Account for key-value pairs being separated by multiple spaces.
+        if (trim($key, ' ') == 'idekey') {
+          $cookies['XDEBUG_SESSION'][] = trim($value, ' ');
+        }
+      }
+    }
+    return $cookies;
+  }
+
+}
diff --git a/web/core/tests/TestSuites/TestSuiteBase.php b/web/core/tests/TestSuites/TestSuiteBase.php
index bd047e83c..581ea3671 100644
--- a/web/core/tests/TestSuites/TestSuiteBase.php
+++ b/web/core/tests/TestSuites/TestSuiteBase.php
@@ -23,7 +23,7 @@ abstract class TestSuiteBase extends \PHPUnit_Framework_TestSuite {
     $extension_roots = \drupal_phpunit_contrib_extension_directory_roots($root);
 
     $extension_directories = array_map('drupal_phpunit_find_extension_directories', $extension_roots);
-    return array_reduce($extension_directories, 'array_merge', array());
+    return array_reduce($extension_directories, 'array_merge', []);
   }
 
   /**
diff --git a/web/core/tests/bootstrap.php b/web/core/tests/bootstrap.php
index 9aeb1d79f..f78b69ff0 100644
--- a/web/core/tests/bootstrap.php
+++ b/web/core/tests/bootstrap.php
@@ -19,7 +19,7 @@ use Drupal\Component\Assertion\Handle;
  *   directory, keyed by extension name.
  */
 function drupal_phpunit_find_extension_directories($scan_directory) {
-  $extensions = array();
+  $extensions = [];
   $dirs = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($scan_directory, \RecursiveDirectoryIterator::FOLLOW_SYMLINKS));
   foreach ($dirs as $dir) {
     if (strpos($dir->getPathname(), '.info.yml') !== FALSE) {
@@ -46,13 +46,13 @@ function drupal_phpunit_contrib_extension_directory_roots($root = NULL) {
   if ($root === NULL) {
     $root = dirname(dirname(__DIR__));
   }
-  $paths = array(
+  $paths = [
     $root . '/core/modules',
     $root . '/core/profiles',
     $root . '/modules',
     $root . '/profiles',
     $root . '/themes',
-  );
+  ];
   $sites_path = $root . '/sites';
   // Note this also checks sites/../modules and sites/../profiles.
   foreach (scandir($sites_path) as $site) {
@@ -77,15 +77,28 @@ function drupal_phpunit_contrib_extension_directory_roots($root = NULL) {
  *   An associative array of extension directories, keyed by their namespace.
  */
 function drupal_phpunit_get_extension_namespaces($dirs) {
-  $namespaces = array();
+  $suite_names = ['Unit', 'Kernel', 'Functional', 'FunctionalJavascript'];
+  $namespaces = [];
   foreach ($dirs as $extension => $dir) {
     if (is_dir($dir . '/src')) {
       // Register the PSR-4 directory for module-provided classes.
       $namespaces['Drupal\\' . $extension . '\\'][] = $dir . '/src';
     }
-    if (is_dir($dir . '/tests/src')) {
-      // Register the PSR-4 directory for PHPUnit test classes.
-      $namespaces['Drupal\\Tests\\' . $extension . '\\'][] = $dir . '/tests/src';
+    $test_dir = $dir . '/tests/src';
+    if (is_dir($test_dir)) {
+      foreach ($suite_names as $suite_name) {
+        $suite_dir = $test_dir . '/' . $suite_name;
+        if (is_dir($suite_dir)) {
+          // Register the PSR-4 directory for PHPUnit-based suites.
+          $namespaces['Drupal\\Tests\\' . $extension . '\\' . $suite_name . '\\'][] = $suite_dir;
+        }
+      }
+      // Extensions can have a \Drupal\extension\Traits namespace for
+      // cross-suite trait code.
+      $trait_dir = $test_dir . '/Traits';
+      if (is_dir($trait_dir)) {
+        $namespaces['Drupal\\Tests\\' . $extension . '\\Traits\\'][] = $trait_dir;
+      }
     }
   }
   return $namespaces;
@@ -123,7 +136,7 @@ function drupal_phpunit_populate_class_loader() {
     $extension_roots = drupal_phpunit_contrib_extension_directory_roots();
 
     $dirs = array_map('drupal_phpunit_find_extension_directories', $extension_roots);
-    $dirs = array_reduce($dirs, 'array_merge', array());
+    $dirs = array_reduce($dirs, 'array_merge', []);
     $GLOBALS['namespaces'] = drupal_phpunit_get_extension_namespaces($dirs);
   }
   foreach ($GLOBALS['namespaces'] as $prefix => $paths) {
diff --git a/web/core/themes/bartik/bartik.theme b/web/core/themes/bartik/bartik.theme
index b1b330826..1c408cf3c 100644
--- a/web/core/themes/bartik/bartik.theme
+++ b/web/core/themes/bartik/bartik.theme
@@ -45,14 +45,14 @@ function bartik_preprocess_page_title(&$variables) {
   if (!empty($variables['title_suffix']['add_or_remove_shortcut']) && $variables['title']) {
     // Add a wrapper div using the title_prefix and title_suffix render
     // elements.
-    $variables['title_prefix']['shortcut_wrapper'] = array(
+    $variables['title_prefix']['shortcut_wrapper'] = [
       '#markup' => '<div class="shortcut-wrapper clearfix">',
       '#weight' => 100,
-    );
-    $variables['title_suffix']['shortcut_wrapper'] = array(
+    ];
+    $variables['title_suffix']['shortcut_wrapper'] = [
       '#markup' => '</div>',
       '#weight' => -99,
-    );
+    ];
     // Make sure the shortcut link is the first item in title_suffix.
     $variables['title_suffix']['add_or_remove_shortcut']['#weight'] = -100;
   }
diff --git a/web/core/themes/bartik/color/color.inc b/web/core/themes/bartik/color/color.inc
index 4f42620d9..55464f240 100644
--- a/web/core/themes/bartik/color/color.inc
+++ b/web/core/themes/bartik/color/color.inc
@@ -5,9 +5,9 @@
  * Lists available colors and color schemes for the Bartik theme.
  */
 
-$info = array(
+$info = [
   // Available colors and color labels used in theme.
-  'fields' => array(
+  'fields' => [
     'top' => t('Header background top'),
     'bottom' => t('Header background bottom'),
     'bg' => t('Main background'),
@@ -17,12 +17,12 @@ $info = array(
     'titleslogan' => t('Title and slogan'),
     'text' => t('Text color'),
     'link' => t('Link color'),
-  ),
+  ],
   // Pre-defined color schemes.
-  'schemes' => array(
-    'default' => array(
+  'schemes' => [
+    'default' => [
       'title' => t('Blue Lagoon (default)'),
-      'colors' => array(
+      'colors' => [
         'top' => '#055a8e',
         'bottom' => '#1d84c3',
         'bg' => '#ffffff',
@@ -32,11 +32,11 @@ $info = array(
         'titleslogan' => '#fffeff',
         'text' => '#3b3b3b',
         'link' => '#0071B3',
-      ),
-    ),
-    'firehouse' => array(
+      ],
+    ],
+    'firehouse' => [
       'title' => t('Firehouse'),
-      'colors' => array(
+      'colors' => [
         'top' => '#cd2d2d',
         'bottom' => '#d64e4e',
         'bg' => '#ffffff',
@@ -46,11 +46,11 @@ $info = array(
         'titleslogan' => '#fffeff',
         'text' => '#888888',
         'link' => '#d6121f',
-      ),
-    ),
-    'ice' => array(
+      ],
+    ],
+    'ice' => [
       'title' => t('Ice'),
-      'colors' => array(
+      'colors' => [
         'top' => '#d0d0d0',
         'bottom' => '#c2c4c5',
         'bg' => '#ffffff',
@@ -60,11 +60,11 @@ $info = array(
         'titleslogan' => '#000000',
         'text' => '#4a4a4a',
         'link' => '#019dbf',
-      ),
-    ),
-    'plum' => array(
+      ],
+    ],
+    'plum' => [
       'title' => t('Plum'),
-      'colors' => array(
+      'colors' => [
         'top' => '#4c1c58',
         'bottom' => '#593662',
         'bg' => '#fffdf7',
@@ -74,11 +74,11 @@ $info = array(
         'titleslogan' => '#ffffff',
         'text' => '#301313',
         'link' => '#9d408d',
-      ),
-    ),
-    'slate' => array(
+      ],
+    ],
+    'slate' => [
       'title' => t('Slate'),
-      'colors' => array(
+      'colors' => [
         'top' => '#4a4a4a',
         'bottom' => '#4e4e4e',
         'bg' => '#ffffff',
@@ -88,31 +88,31 @@ $info = array(
         'titleslogan' => '#ffffff',
         'text' => '#3b3b3b',
         'link' => '#0073b6',
-      ),
-    ),
-  ),
+      ],
+    ],
+  ],
 
   // CSS files (excluding @import) to rewrite with new color scheme.
-  'css' => array(
+  'css' => [
     'css/colors.css',
-  ),
+  ],
 
   // Files to copy.
-  'copy' => array(
+  'copy' => [
     'logo.svg',
-  ),
+  ],
 
   // Gradient definitions.
-  'gradients' => array(
-    array(
+  'gradients' => [
+    [
       // (x, y, width, height).
-      'dimension' => array(0, 0, 0, 0),
+      'dimension' => [0, 0, 0, 0],
       // Direction of gradient ('vertical' or 'horizontal').
       'direction' => 'vertical',
       // Keys of colors to use for the gradient.
-      'colors' => array('top', 'bottom'),
-    ),
-  ),
+      'colors' => ['top', 'bottom'],
+    ],
+  ],
 
   // Preview files.
   'preview_library' => 'bartik/color.preview',
@@ -127,4 +127,4 @@ $info = array(
       ],
     ],
   ],
-);
+];
diff --git a/web/core/themes/classy/README.txt b/web/core/themes/classy/README.txt
index a5181239f..52bf17a6b 100644
--- a/web/core/themes/classy/README.txt
+++ b/web/core/themes/classy/README.txt
@@ -8,10 +8,11 @@ To use Classy as your base theme, set the 'base theme' in your theme's .info.yml
 file to "classy":
   base theme: classy
 
-See https://www.drupal.org/theme-guide/8/classy for more information on using
-the Classy theme.
+See https://www.drupal.org/docs/8/theming-drupal-8/using-classy-as-a-base-theme
+for more information on using the Classy theme.
 
 ABOUT DRUPAL THEMING
 --------------------
 
-See https://www.drupal.org/theme-guide/8 for more information on Drupal theming.
+See https://www.drupal.org/docs/8/theming for more information on Drupal
+theming.
diff --git a/web/core/themes/classy/classy.info.yml b/web/core/themes/classy/classy.info.yml
index 34b07b574..05ef0d798 100644
--- a/web/core/themes/classy/classy.info.yml
+++ b/web/core/themes/classy/classy.info.yml
@@ -1,6 +1,6 @@
 name: Classy
 type: theme
-description: 'A base theme with sensible default CSS classes added. Learn how to use Classy as a base theme in the <a href="https://www.drupal.org/theme-guide/8">Drupal 8 Theming Guide</a>.'
+description: 'A base theme with sensible default CSS classes added. Learn how to use Classy as a base theme in the <a href="https://www.drupal.org/docs/8/theming">Drupal 8 Theming Guide</a>.'
 package: Core
 version: VERSION
 core: 8.x
diff --git a/web/core/themes/classy/classy.libraries.yml b/web/core/themes/classy/classy.libraries.yml
index eb5e0b254..f970f86b1 100644
--- a/web/core/themes/classy/classy.libraries.yml
+++ b/web/core/themes/classy/classy.libraries.yml
@@ -56,6 +56,12 @@ forum:
     component:
       css/components/forum.css: { weight: -10 }
 
+image-widget:
+  version: VERSION
+  css:
+    component:
+      css/components/image-widget.css: {}
+
 indented:
   version: VERSION
   css:
diff --git a/web/core/themes/classy/css/components/image-widget.css b/web/core/themes/classy/css/components/image-widget.css
index 3da51ef85..56777c41e 100644
--- a/web/core/themes/classy/css/components/image-widget.css
+++ b/web/core/themes/classy/css/components/image-widget.css
@@ -1,7 +1,19 @@
-
 /**
+ * @file
  * Image upload widget.
+ *
+ * This CSS file is not used in this theme (Classy). It was intended to be used,
+ * but due to a bug, Drupal 8 shipped with it not being used. To not break
+ * backwards compatibility, we continue to not load it in Classy. Every
+ * subtheme of Classy is encouraged to use it, by attaching the
+ * classy/image-widget asset library in their image-widget.html.twig file.
+ *
+ * @see core/themes/seven/templates/content-edit/image-widget.html.twig.
+ *
+ * @todo In Drupal 9, let core/themes/classy/templates/content-edit/image-widget.html.twig
+ * attach the classy/image-widget asset library.
  */
+
 .image-preview {
   float: left; /* LTR */
   padding: 0 10px 10px 0; /* LTR */
diff --git a/web/core/themes/classy/templates/content-edit/image-widget.html.twig b/web/core/themes/classy/templates/content-edit/image-widget.html.twig
index 5e8033ffa..dac3a227b 100644
--- a/web/core/themes/classy/templates/content-edit/image-widget.html.twig
+++ b/web/core/themes/classy/templates/content-edit/image-widget.html.twig
@@ -10,7 +10,6 @@
  * @see template_preprocess_image_widget()
  */
 #}
-{{ attach_library('classy/image-widget') }}
 <div{{ attributes }}>
   {% if data.preview %}
     <div class="image-preview">
diff --git a/web/core/themes/classy/templates/form/datetime-wrapper.html.twig b/web/core/themes/classy/templates/form/datetime-wrapper.html.twig
index 3f6aa59d8..5b52f2daa 100644
--- a/web/core/themes/classy/templates/form/datetime-wrapper.html.twig
+++ b/web/core/themes/classy/templates/form/datetime-wrapper.html.twig
@@ -30,5 +30,7 @@
   </div>
 {% endif %}
 {% if description %}
-  <div class="description">{{ description }}</div>
+  <div{{ description_attributes.addClass('description') }}>
+    {{ description }}
+  </div>
 {% endif %}
diff --git a/web/core/themes/classy/templates/views/views-view-opml.html.twig b/web/core/themes/classy/templates/views/views-view-opml.html.twig
index a48843aea..4165ccf4d 100644
--- a/web/core/themes/classy/templates/views/views-view-opml.html.twig
+++ b/web/core/themes/classy/templates/views/views-view-opml.html.twig
@@ -11,7 +11,7 @@
  * @see template_preprocess_views_view_opml()
  */
 #}
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <opml version="2.0">
   <head>
     <title>{{ title }}</title>
diff --git a/web/core/themes/classy/templates/views/views-view-rss.html.twig b/web/core/themes/classy/templates/views/views-view-rss.html.twig
index f772d6370..0800237e3 100644
--- a/web/core/themes/classy/templates/views/views-view-rss.html.twig
+++ b/web/core/themes/classy/templates/views/views-view-rss.html.twig
@@ -15,7 +15,7 @@
  * @see template_preprocess_views_view_rss()
  */
 #}
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0" xml:base="{{ link }}"{{ namespaces }}>
   <channel>
     <title>{{ title }}</title>
diff --git a/web/core/themes/engines/twig/twig.engine b/web/core/themes/engines/twig/twig.engine
index c8f8f491d..791f9083b 100644
--- a/web/core/themes/engines/twig/twig.engine
+++ b/web/core/themes/engines/twig/twig.engine
@@ -13,7 +13,7 @@ use Drupal\Core\Extension\Extension;
  * Implements hook_theme().
  */
 function twig_theme($existing, $type, $theme, $path) {
-  $templates = drupal_find_theme_functions($existing, array($theme));
+  $templates = drupal_find_theme_functions($existing, [$theme]);
   $templates += drupal_find_theme_templates($existing, '.html.twig', $path);
   return $templates;
 }
diff --git a/web/core/themes/seven/css/components/system-status-counter.css b/web/core/themes/seven/css/components/system-status-counter.css
new file mode 100644
index 000000000..c3e0f30e5
--- /dev/null
+++ b/web/core/themes/seven/css/components/system-status-counter.css
@@ -0,0 +1,87 @@
+/**
+ * @file
+ * Styles for the system status counter component.
+ */
+
+.system-status-counter {
+  box-sizing: border-box;
+  overflow-y: hidden;
+  border: 1px solid #e6e4df;
+  border-radius: 3px;
+  display: inline-block;
+  width: 100%;
+  white-space: nowrap;
+  background: #FCFCFA;
+}
+.system-status-counter__status-icon {
+  display: inline-block;
+  height: 60px;
+  width: 60px;
+  vertical-align: middle;
+  border-right: 1px solid #e6e4df; /* LTR */
+  border-left: 0; /* LTR */
+  background-color: #faf9f5;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, .1) inset;
+}
+[dir="rtl"] .system-status-counter__status-icon {
+  border-right: 0;
+  border-left: 1px solid #e6e4df;
+  box-shadow: 0 1px 1px rgba(0, 0, 0, .1) inset;
+}
+.system-status-counter__status-icon:before {
+  content: "";
+  background-size: 25px;
+  background-position: 50% center;
+  background-repeat: no-repeat;
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+
+.system-status-counter__status-icon--error:before {
+  background-image: url(../../../stable/images/core/icons/e32700/error.svg);
+}
+.system-status-counter__status-icon--warning:before {
+  background-image: url(../../../stable/images/core/icons/e29700/warning.svg);
+}
+.system-status-counter__status-icon--checked:before {
+  background-image: url(../../../stable/images/core/icons/73b355/check.svg);
+}
+
+.system-status-counter__status-title {
+  display: inline-block;
+  vertical-align: middle;
+  text-transform: uppercase;
+  padding: 0 6px;
+  font-size: 1rem;
+  line-height: 1em;
+  font-weight: bold;
+}
+.system-status-counter__title-count {
+  display: block;
+  margin-bottom: 2px;
+}
+.system-status-counter__details {
+  font-size: 12px;
+  font-weight: normal;
+  text-transform: none;
+  display: block;
+  line-height: 1.5;
+}
+
+@media screen and (min-width: 61em) {
+  .system-status-counter__status-icon,
+  .system-status-counter  {
+    height: 65px;
+  }
+  .system-status-counter__status-icon {
+    width: 65px;
+  }
+  .system-status-counter__status-title {
+    font-size: 16px;
+    padding: 10px 3%;
+  }
+  .system-status-counter__status-icon:before {
+    background-size: 35px;
+  }
+}
diff --git a/web/core/themes/seven/css/components/system-status-report-counters.css b/web/core/themes/seven/css/components/system-status-report-counters.css
new file mode 100644
index 000000000..a8e6db322
--- /dev/null
+++ b/web/core/themes/seven/css/components/system-status-report-counters.css
@@ -0,0 +1,26 @@
+/**
+ * @file
+ * Styles for the system status report counters.
+ */
+
+.system-status-report-counters__item {
+  margin: 10px 0;
+  width: 100%;
+}
+
+@media screen and (min-width: 60em) {
+  .system-status-report-counters__item {
+    margin-bottom: 20px;
+  }
+  .system-status-report-counters {
+    flex-wrap: wrap;
+    display: flex;
+    justify-content: space-between;
+  }
+  .system-status-report-counters__item--half-width {
+    width: 49%;
+  }
+  .system-status-report-counters__item--third-width {
+    width: 32%;
+  }
+}
diff --git a/web/core/themes/seven/css/components/system-status-report-general-info.css b/web/core/themes/seven/css/components/system-status-report-general-info.css
new file mode 100644
index 000000000..08ee97748
--- /dev/null
+++ b/web/core/themes/seven/css/components/system-status-report-general-info.css
@@ -0,0 +1,161 @@
+/**
+ * @file
+ * Seven styles for the System Status general info.
+ */
+
+.system-status-general-info {
+  border: 1px solid #ccc;
+  border-radius: 3px;
+}
+
+.system-status-general-info__header {
+  background-color: #f5f5f2;
+  padding: 10px;
+  margin: 0;
+  overflow: hidden;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  font-size: 14px;
+  text-transform: uppercase;
+}
+
+.system-status-general-info__item {
+  background: #fcfcfa;
+  border-top: 1px solid #ccc;
+  padding: 10px 10px 20px;
+  box-sizing: border-box;
+  overflow-x: auto;
+}
+
+.system-status-general-info__item-icon {
+  display: inline-block;
+  height: 45px;
+  width: 45px;
+  vertical-align: top;
+}
+.system-status-general-info__item-icon:before {
+  content: "";
+  background-size: 35px;
+  background-position: 50% center;
+  background-repeat: no-repeat;
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+.system-status-general-info__item-icon--d8:before {
+  background-image: url(../../images/icons/cccccc/d8-logo.svg);
+}
+.system-status-general-info__item-icon--clock:before {
+  background-image: url(../../images/icons/cccccc/clock.svg);
+}
+.system-status-general-info__item-icon--server:before {
+  background-image: url(../../images/icons/cccccc/server.svg);
+}
+.system-status-general-info__item-icon--php:before {
+  background-image: url(../../images/icons/cccccc/php-logo.svg);
+  background-size: 45px;
+}
+.system-status-general-info__item-icon--database:before {
+  background-image: url(../../images/icons/cccccc/database.svg);
+  background-size: 30px;
+}
+
+.system-status-general-info__item-details {
+  box-sizing: border-box;
+  display: inline-block;
+  width: calc(100% - 60px);
+  padding-left: 10px; /* LTR */
+  position: relative;
+}
+[dir="rtl"] .system-status-general-info__item-details {
+  padding-right: 10px;
+  padding-left: 0;
+}
+
+.system-status-general-info__item-title {
+  margin-bottom: 0;
+}
+
+.system-status-general-info__sub-item-title {
+  margin: 0;
+}
+
+.system-status-general-info__sub-item__title {
+  font-weight: bold;
+}
+.system-status-general-info__sub-item__value {
+  display: block;
+}
+
+.system-status-general-info__run-cron {
+  margin: 1em 0 0;
+}
+
+@media screen and (min-width: 48em) {
+  .system-status-general-info__items {
+    display: flex;
+    flex-wrap: wrap;
+    overflow-x: hidden;
+  }
+
+  .system-status-general-info__item {
+    flex: 1;
+    flex-basis: 33%;
+    width: 33%;
+  }
+  .system-status-general-info__item:nth-child(2) {
+    flex: 2;
+    flex-basis: 66%;
+  }
+  .system-status-general-info__item:nth-child(2),
+  .system-status-general-info__item:nth-child(4),
+  .system-status-general-info__item:nth-child(5) {
+    border-left: 1px solid #ccc; /* LTR */
+  }
+  [dir="rtl"] .system-status-general-info__item:nth-child(1),
+  [dir="rtl"] .system-status-general-info__item:nth-child(3) {
+    border-left: 1px solid #ccc;
+  }
+  [dir="rtl"] .system-status-general-info__item:nth-child(2),
+  [dir="rtl"] .system-status-general-info__item:nth-child(5) {
+    border-left: 0;
+  }
+
+  .system-status-general-info__run-cron {
+    margin: 15px 0 5px;
+  }
+}
+
+@media screen and (min-width: 60em) {
+  .system-status-general-info__item-icon {
+    width: 55px;
+    height: 55px;
+  }
+  .system-status-general-info__item-icon:before {
+    background-size: 35px;
+  }
+  .system-status-general-info__item-icon--php:before {
+    background-size: 55px;
+  }
+
+  .system-status-general-info__run-cron {
+    position: absolute;
+    top: 1em;
+    right: 1em; /* LTR */
+    margin-top: 0;
+  }
+  [dir="rtl"] .system-status-general-info__run-cron {
+    left: 1em;
+    right: auto;
+  }
+}
+
+@media screen and (max-width: 48em) {
+  .system-status-general-info__header {
+    display: none;
+  }
+  .system-status-general-info {
+    border-top: 0;
+    margin-top: 25px;
+  }
+}
diff --git a/web/core/themes/seven/css/components/system-status-report.css b/web/core/themes/seven/css/components/system-status-report.css
index aeac1d3e6..bfcd75cfe 100644
--- a/web/core/themes/seven/css/components/system-status-report.css
+++ b/web/core/themes/seven/css/components/system-status-report.css
@@ -3,13 +3,151 @@
  * Seven styles for the System Status Report.
  */
 
+.system-status-report__requirements-group {
+  padding-top: 20px;
+}
 .system-status-report__entry {
+  border: 0;
   border-top: 1px solid #ccc;
-  border-bottom: inherit;
+  margin: 0;
+  width: 100%;
+  overflow: auto;
 }
-.system-status-report__entry:first-child {
-  border-top: 1px solid #bebfb9;
-}
-.system-status-report__entry:last-child {
+.system-status-report__entry:last-of-type {
   border-bottom: 1px solid #bebfb9;
 }
+.system-status-report__entry--error {
+  background-color: transparent;
+}
+.system-status-report__entry--warning {
+  background-color: transparent;
+}
+  /* Account for native and poly-filled details element */
+.system-status-report__status-title {
+  position: relative;
+  padding: 1em 1em 1em 3em; /* LTR */
+  box-sizing: border-box;
+  width: 100%;
+  font-weight: bold;
+}
+.system-status-report__status-title .details-title {
+  color: inherit;
+  text-transform: none;
+}
+html:not(.details) .system-status-report__status-title {
+  padding-left: 0;
+}
+.system-status-report__status-title .details-title {
+  padding-left: 3em; /* LTR */
+}
+[dir="rtl"] .system-status-report__status-title .details-title {
+  padding-right: 3em;
+  padding-left: 0;
+}
+[dir="rtl"].details .system-status-report__status-title {
+  padding: 1em 3em 1em 1em;
+}
+.collapse-processed > .system-status-report__status-title:before {
+  float: right; /* LTR */
+}
+.system-status-report__status-title::-webkit-details-marker {
+  float: right; /* LTR */
+}
+[dir="rtl"] .collapse-processed > .system-status-report__status-title:before {
+  float: left;
+}
+[dir="rtl"] .system-status-report__status-title::-webkit-details-marker {
+  float: left;
+}
+
+/* Make poly-filled details and summary elements behave correctly. */
+.system-status-report summary:first-child ~ * {
+  display: none;
+}
+.system-status-report details[open] > *,
+.system-status-report details > summary:first-child {
+  display: block;
+}
+
+.system-status-report__status-title .details-title:before,
+.details .system-status-report__status-icon:before {
+  content: "";
+  background-repeat: no-repeat;
+  background-size: contain;
+  background-position: top center;
+  height: 16px;
+  width: 16px;
+  position: absolute;
+  left: 10px; /* LTR */
+  top: 1em;
+  display: inline-block;
+  vertical-align: top;
+  margin-right: 10px; /* LTR */
+}
+[dir="rtl"] .system-status-report__status-title .details-title:before,
+[dir="rtl"].details .system-status-report__status-title:before {
+  left: auto;
+  right: 10px;
+  margin-right: 0;
+}
+.system-status-report__status-icon--error .details-title:before,
+.details .system-status-report__status-icon--error:before {
+  background-image: url(../../../stable/images/core/icons/e32700/error.svg);
+}
+.system-status-report__status-icon--warning .details-title:before,
+.details .system-status-report__status-icon--warning:before {
+  background-image: url(../../../stable/images/core/icons/e29700/warning.svg);
+}
+
+.system-status-report__entry__value {
+  box-sizing: border-box;
+  padding: 0 1em 1em 3em; /* LTR */
+}
+[dir="rtl"] .system-status-report__entry__value {
+  padding-right: 3em;
+  padding-left: 1em;
+}
+
+@media screen and (max-width: 48em) {
+  .system-status-report {
+    word-wrap: break-word;
+  }
+}
+
+@media screen and (min-width: 48em) {
+  .system-status-report__entry::after {
+    display: table;
+    content: '';
+    clear: both;
+  }
+  .system-status-report__status-title {
+    width: 18rem;
+    float: left; /* LTR */
+    cursor: default;
+  }
+  .system-status-report__status-title:hover,
+  .system-status-report__status-title:focus {
+    text-decoration: none;
+  }
+  [dir="rtl"] .system-status-report__status-title {
+    float: right;
+  }
+  .system-status-report__status-title::-webkit-details-marker {
+    display: none;
+  }
+  .collapse-processed > .system-status-report__status-title:before {
+    position: relative;
+    top: 3px;
+  }
+  .system-status-report__entry__value {
+    width: calc(100% - 23em);
+    float: right;
+    display: block;
+    padding-left: 0; /* LTR */
+    padding-top: 1em;
+  }
+  [dir="rtl"] .system-status-report__entry__value {
+    padding-left: 0;
+    padding-right: 3em;
+  }
+}
diff --git a/web/core/themes/seven/css/components/tables.css b/web/core/themes/seven/css/components/tables.css
index 913e21a42..816df9e90 100644
--- a/web/core/themes/seven/css/components/tables.css
+++ b/web/core/themes/seven/css/components/tables.css
@@ -38,7 +38,6 @@ tbody tr:hover,
 tbody tr:focus {
   background: #f7fcff;
 }
-
 /* See colors.css */
 tbody tr.color-warning:hover,
 tbody tr.color-warning:focus {
@@ -48,6 +47,7 @@ tbody tr.color-error:hover,
 tbody tr.color-error:focus {
   background: #fcf4f2;
 }
+
 td,
 th {
   vertical-align: middle;
diff --git a/web/core/themes/seven/css/theme/maintenance-page.css b/web/core/themes/seven/css/theme/maintenance-page.css
index 3725ac64d..f067a3685 100644
--- a/web/core/themes/seven/css/theme/maintenance-page.css
+++ b/web/core/themes/seven/css/theme/maintenance-page.css
@@ -2,6 +2,7 @@
  * @file
  * Maintenance theming.
  */
+
 .maintenance-page {
   background-color: #e0e0d8;
   background-image: -webkit-radial-gradient(hsl(203, 2%, 90%), hsl(203, 2%, 95%));
@@ -51,7 +52,6 @@
   .task-list {
     margin-left: 0; /* LTR */
     list-style-type: none;
-    list-style-image: none;
     padding-left: 0; /* LTR */
     padding-bottom: 1em;
   }
@@ -142,8 +142,8 @@
   }
   .layout-container {
     margin: 0 auto;
-    max-width: 770px;
     width: 75%;
+    max-width: 770px;
     border-radius: 5px;
     box-shadow: 0 6px 12px rgba(0, 0, 0, 0.15);
     padding: 20px 0 40px 0;
@@ -181,3 +181,21 @@
     margin: 0.75em 1.9em;
   }
 }
+
+/**
+ * Status report customization for install and update page.
+ */
+.system-status-report__status-title {
+  float: none;
+  width: 100%;
+}
+.system-status-report__entry__value {
+  float: none;
+  width: 100%;
+  padding-left: 3em; /* LTR */
+  padding-top: 0;
+}
+[dir="rtl"] .system-status-report__entry__value {
+  padding-left: 1em;
+  padding-right: 3em;
+}
diff --git a/web/core/themes/seven/images/icons/cccccc/clock.svg b/web/core/themes/seven/images/icons/cccccc/clock.svg
new file mode 100644
index 000000000..e51d3e01f
--- /dev/null
+++ b/web/core/themes/seven/images/icons/cccccc/clock.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="42.659" height="46.603" viewBox="0 0 42.659 46.603">
+  <path fill="#CCC" d="M24.15 3.73V0h-8v3.915C6.15 6.13 0 14.717 0 24.978 0 36.92 9.975 46.603 21.918 46.603s20.74-9.682 20.74-21.625c0-10.576-8.507-19.372-18.507-21.25zm7 24.072H17.83V11h5v12.802h8.32v4z"/>
+</svg>
diff --git a/web/core/themes/seven/images/icons/cccccc/d8-logo.svg b/web/core/themes/seven/images/icons/cccccc/d8-logo.svg
new file mode 100644
index 000000000..035119bc7
--- /dev/null
+++ b/web/core/themes/seven/images/icons/cccccc/d8-logo.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="47.411" height="53.531" viewBox="0 0 47.411 53.531">
+  <circle fill="#CCC" cx="22.308" cy="41.593" r="8.449"/>
+  <path fill="#CCC" d="M32.813 31.532c2.503 2.614 4.044 6.156 4.044 10.06 0 4.945-2.47 9.31-6.24 11.94 6.97-2.15 12.733-7.388 15.314-13.73 3.57-8.776.247-15.38-5.33-21.37.17.776.264 1.58.264 2.406 0 5.078-3.405 9.36-8.05 10.694z"/>
+  <circle fill="#CCC" cx="29.735" cy="20.838" r="6.463"/>
+  <path fill="#CCC" d="M11.178 50.96c-2.134-2.53-3.42-5.798-3.42-9.368 0-7.448 5.598-13.584 12.814-14.442-1.238-1.794-1.965-3.968-1.965-6.312 0-6.145 4.982-11.128 11.13-11.128.507 0 1.006.037 1.495.103C27.59 6.67 23.957 3.483 21.09 0 22.553 15.257 7.192 9.713 1.514 23.773c-3.81 9.433-.376 21.095 9.663 27.188z"/>
+</svg>
diff --git a/web/core/themes/seven/images/icons/cccccc/database.svg b/web/core/themes/seven/images/icons/cccccc/database.svg
new file mode 100644
index 000000000..3351212de
--- /dev/null
+++ b/web/core/themes/seven/images/icons/cccccc/database.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="38.847" height="44.262" viewBox="0 0 38.847 44.262">
+  <path fill="#CCC" d="M19.745 0c5.74.123 12.272.953 16.9 4.668 1.865 1.498 2.786 3.91 1.597 6.126-1.255 2.34-4.13 3.733-6.518 4.6-5.63 2.04-12.113 2.38-18.014 1.573-2.92-.4-5.91-1.103-8.58-2.374C2.94 13.553.39 11.788.037 9.19c-.532-3.925 4.23-6.23 7.264-7.3C11.287.482 15.54.037 19.745 0c4.302.092-3.334.03 0 0z"/>
+  <path fill="#CCC" d="M6.76 17.5c3.702 1.427 7.65 1.972 11.6 2.09 4.058.12 8.107-.424 12.023-1.523 4.227-1.186 7.227-3.624 8.463-6.145v5.965c-.076.524-.197 1.028-.384 1.5-.718 1.81-2.594 2.974-4.235 3.848-4.293 2.286-9.5 3.04-14.31 3.083-4.803.043-9.902-.542-14.3-2.575-1.906-.88-3.9-2.02-4.988-3.887-.66-1.135-.626-2.21-.626-3.486v-4.38c1.232 2.64 3.94 4.422 6.757 5.51z"/>
+  <path fill="#CCC" d="M6.76 26.436c3.702 1.428 7.65 1.973 11.6 2.09 4.058.12 8.107-.423 12.023-1.522 4.227-1.186 7.227-3.624 8.463-6.145v5.964c-.076.524-.197 1.028-.384 1.5-.718 1.81-2.594 2.974-4.235 3.848-4.293 2.286-9.5 3.04-14.31 3.083-4.803.043-9.902-.542-14.3-2.575-1.906-.88-3.9-2.02-4.988-3.887-.66-1.135-.626-2.21-.626-3.486v-4.38c1.232 2.64 3.94 4.422 6.757 5.51z"/>
+  <path fill="#CCC" d="M6.76 35.374c3.702 1.428 7.65 1.973 11.6 2.09 4.058.12 8.107-.423 12.023-1.522 4.227-1.186 7.227-3.624 8.463-6.145v5.965c-.076.524-.197 1.028-.384 1.5-.718 1.81-2.594 2.974-4.235 3.848-4.293 2.286-9.5 3.04-14.31 3.083-4.803.043-9.902-.542-14.3-2.575-1.906-.88-3.9-2.02-4.988-3.887-.66-1.134-.626-2.21-.626-3.485v-4.38c1.232 2.64 3.94 4.422 6.757 5.51z"/>
+</svg>
diff --git a/web/core/themes/seven/images/icons/cccccc/php-logo.svg b/web/core/themes/seven/images/icons/cccccc/php-logo.svg
new file mode 100644
index 000000000..b039d2428
--- /dev/null
+++ b/web/core/themes/seven/images/icons/cccccc/php-logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="66" height="33.447" viewBox="0 0 66 33.447">
+  <g fill="#CCC">
+    <path d="M49.5 12.255h-2.7l-1.473 7h2.4c1.59 0 2.773-.342 3.55-.94.78-.6 1.304-1.62 1.577-3.023.26-1.345.142-1.975-.357-2.528-.5-.553-1.498-.51-2.996-.51z"/>
+    <path d="M33 0C14.775 0 0 7.488 0 16.724s14.775 16.724 33 16.724 33-7.488 33-16.724S51.225 0 33 0zm-9.328 19.982c-.787.737-1.662 1.376-2.625 1.69-.963.313-2.19.583-3.68.583H13.99l-.935 5H9.11l3.52-18h7.584c2.28 0 3.946.34 4.992 1.537 1.046 1.197 1.36 2.74.944 4.885-.172.884-.462 1.628-.87 2.36-.413.732-.947 1.338-1.608 1.945zm11.51 2.273l1.558-8.124c.177-.91.112-1.29-.196-1.62-.308-.33-.962-.255-1.963-.255h-3.126l-2.016 10h-3.913l3.52-18h3.912l-.935 5h3.486c2.193 0 3.706.124 4.54.888.832.765 1.08 1.99.748 3.703l-1.637 8.41h-3.977zm21.747-6.708c-.173.884-.463 1.692-.872 2.424-.41.734-.944 1.404-1.605 2.01-.787.738-1.662 1.377-2.625 1.69-.963.314-2.19.584-3.68.584h-3.377l-.934 5h-3.944l3.518-18h7.584c2.282 0 3.946.34 4.992 1.537 1.046 1.2 1.36 2.61.943 4.757z"/>
+    <path d="M18.72 12.255h-2.703l-1.473 7h2.4c1.59 0 2.773-.342 3.552-.94.778-.6 1.303-1.62 1.576-3.023.26-1.345.142-1.975-.357-2.528-.5-.553-1.497-.51-2.996-.51z"/>
+  </g>
+</svg>
diff --git a/web/core/themes/seven/images/icons/cccccc/server.svg b/web/core/themes/seven/images/icons/cccccc/server.svg
new file mode 100644
index 000000000..1576b390d
--- /dev/null
+++ b/web/core/themes/seven/images/icons/cccccc/server.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="44" height="34" viewBox="0 0 44 34">
+  <path fill="#CCC" d="M29.98 7.018H7.17c-1.208 0-2.197-.748-2.197-2s.99-2 2.2-2h22.81c1.208 0 2.198.748 2.198 2s-.99 2-2.2 2zM37.61 7c-1.104 0-2-.895-2-2s.896-2 2-2 2 .895 2 2-.894 2-2 2zM0 0v10h44V0H0zM29.98 31.018H7.17c-1.208 0-2.197-.748-2.197-2s.99-2 2.2-2h22.81c1.208 0 2.198.748 2.198 2s-.99 2-2.2 2zM37.61 31c-1.104 0-2-.895-2-2s.896-2 2-2 2 .895 2 2-.894 2-2 2zM0 24v10h44V24H0zM29.98 19.018H7.17c-1.208 0-2.197-.748-2.197-2s.99-2 2.2-2h22.81c1.208 0 2.198.748 2.198 2s-.99 2-2.2 2zM37.61 19c-1.104 0-2-.895-2-2s.896-2 2-2 2 .895 2 2-.894 2-2 2zM0 12v10h44V12H0z"/>
+</svg>
diff --git a/web/core/themes/seven/js/responsive-details.js b/web/core/themes/seven/js/responsive-details.js
new file mode 100644
index 000000000..8fdb4530f
--- /dev/null
+++ b/web/core/themes/seven/js/responsive-details.js
@@ -0,0 +1,57 @@
+/**
+ * @file
+ * Provides responsive behaviors to HTML details elements.
+ */
+
+(function ($, Drupal) {
+
+  'use strict';
+
+  /**
+   * Initializes the responsive behaviors for details elements.
+   *
+   * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches the responsive behavior to status report specific details elements.
+   */
+  Drupal.behaviors.responsiveDetails = {
+    attach: function (context) {
+      var $details = $(context).find('details').once('responsive-details');
+
+      if (!$details.length) {
+        return;
+      }
+
+      function detailsToggle(matches) {
+        if (matches) {
+          $details.attr('open', true);
+          $summaries.attr('aria-expanded', true);
+          $summaries.on('click.details-open', false);
+        }
+        else {
+          // If user explicitly opened one, leave it alone.
+          var $notPressed = $details
+            .find('> summary[aria-pressed!=true]')
+            .attr('aria-expanded', false);
+          $notPressed
+            .parent('details')
+            .attr('open', false);
+          // After resize, allow user to close previously opened details.
+          $summaries.off('.details-open');
+        }
+      }
+
+      function handleDetailsMQ(event) {
+        detailsToggle(event.matches);
+      }
+
+      var $summaries = $details.find('> summary');
+      var mql = window.matchMedia('(min-width:48em)');
+      mql.addListener(handleDetailsMQ);
+      detailsToggle(mql.matches);
+    }
+  };
+
+
+})(jQuery, Drupal);
diff --git a/web/core/themes/seven/seven.info.yml b/web/core/themes/seven/seven.info.yml
index 369515ef4..3f0e43c02 100644
--- a/web/core/themes/seven/seven.info.yml
+++ b/web/core/themes/seven/seven.info.yml
@@ -22,6 +22,12 @@ core: 8.x
 libraries:
  - seven/global-styling
 libraries-override:
+  system/base:
+    css:
+      component:
+        /core/themes/stable/css/system/components/system-status-counter.css: css/components/system-status-counter.css
+        /core/themes/stable/css/system/components/system-status-report-counters.css: css/components/system-status-report-counters.css
+        /core/themes/stable/css/system/components/system-status-report-general-info.css: css/components/system-status-report-general-info.css
   core/drupal.vertical-tabs:
     css:
       component:
diff --git a/web/core/themes/seven/seven.libraries.yml b/web/core/themes/seven/seven.libraries.yml
index e68b75a91..424e7f5dd 100644
--- a/web/core/themes/seven/seven.libraries.yml
+++ b/web/core/themes/seven/seven.libraries.yml
@@ -27,7 +27,10 @@ global-styling:
       css/components/tables.css: {}
       css/components/search-admin-settings.css: {}
       css/components/tablesort-indicator.css: {}
+      css/components/system-status-report-general-info.css: {}
       css/components/system-status-report.css: {}
+      css/components/system-status-report-counters.css: {}
+      css/components/system-status-counter.css: {}
       css/components/tabs.css: {}
       css/components/views-ui.css: {}
     layout:
@@ -74,6 +77,18 @@ drupal.nav-tabs:
     - core/drupal
     - core/jquery.once
     - core/drupal.debounce
+    - core/collapse
+
+drupal.responsive-detail:
+  version: VERSION
+  js:
+    js/responsive-details.js: {}
+  dependencies:
+    - core/matchmedia
+    - core/matchmedia.addListener
+    - core/jquery
+    - core/jquery.once
+    - core/collapse
 
 vertical-tabs:
   version: VERSION
diff --git a/web/core/themes/seven/seven.theme b/web/core/themes/seven/seven.theme
index 5ace6b83c..91c03e631 100644
--- a/web/core/themes/seven/seven.theme
+++ b/web/core/themes/seven/seven.theme
@@ -31,18 +31,18 @@ function seven_preprocess_html(&$variables) {
  */
 function seven_preprocess_menu_local_tasks(&$variables) {
   if (!empty($variables['primary'])) {
-    $variables['primary']['#attached'] = array(
-      'library' => array(
+    $variables['primary']['#attached'] = [
+      'library' => [
         'seven/drupal.nav-tabs',
-      ),
-    );
+      ],
+    ];
   }
   elseif (!empty($variables['secondary'])) {
-    $variables['secondary']['#attached'] = array(
-      'library' => array(
+    $variables['secondary']['#attached'] = [
+      'library' => [
         'seven/drupal.nav-tabs',
-      ),
-    );
+      ],
+    ];
   }
 }
 
@@ -61,7 +61,7 @@ function seven_preprocess_node_add_list(&$variables) {
     /** @var \Drupal\node\NodeTypeInterface $type */
     foreach ($variables['content'] as $type) {
       $variables['types'][$type->id()]['label'] = $type->label();
-      $variables['types'][$type->id()]['url'] = \Drupal::url('node.add', array('node_type' => $type->id()));
+      $variables['types'][$type->id()]['url'] = \Drupal::url('node.add', ['node_type' => $type->id()]);
     }
   }
 }
@@ -76,8 +76,8 @@ function seven_preprocess_block_content_add_list(&$variables) {
   if (!empty($variables['content'])) {
     foreach ($variables['content'] as $type) {
       $variables['types'][$type->id()]['label'] = $type->label();
-      $options = array('query' => \Drupal::request()->query->all());
-      $variables['types'][$type->id()]['url'] = \Drupal::url('block_content.add_form', array('block_content_type' => $type->id()), $options);
+      $options = ['query' => \Drupal::request()->query->all()];
+      $variables['types'][$type->id()]['url'] = \Drupal::url('block_content.add_form', ['block_content_type' => $type->id()], $options);
     }
   }
 }
@@ -153,36 +153,36 @@ function seven_form_node_form_alter(&$form, FormStateInterface $form_state) {
   /** @var \Drupal\node\NodeInterface $node */
   $node = $form_state->getFormObject()->getEntity();
 
-  $form['#theme'] = array('node_edit_form');
+  $form['#theme'] = ['node_edit_form'];
   $form['#attached']['library'][] = 'seven/node-form';
 
   $form['advanced']['#type'] = 'container';
   $is_new = !$node->isNew() ? format_date($node->getChangedTime(), 'short') : t('Not saved yet');
-  $form['meta'] = array(
-    '#attributes' => array('class' => array('entity-meta__header')),
+  $form['meta'] = [
+    '#attributes' => ['class' => ['entity-meta__header']],
     '#type' => 'container',
     '#group' => 'advanced',
     '#weight' => -100,
-    'published' => array(
+    'published' => [
       '#type' => 'html_tag',
       '#tag' => 'h3',
       '#value' => $node->isPublished() ? t('Published') : t('Not published'),
       '#access' => !$node->isNew(),
-      '#attributes' => array(
-        'class' => 'entity-meta__title',
-      ),
-    ),
-    'changed' => array(
+      '#attributes' => [
+        'class' => ['entity-meta__title'],
+      ],
+    ],
+    'changed' => [
       '#type' => 'item',
-      '#wrapper_attributes' => array('class' => array('entity-meta__last-saved', 'container-inline')),
+      '#wrapper_attributes' => ['class' => ['entity-meta__last-saved', 'container-inline']],
       '#markup' => '<h4 class="label inline">' . t('Last saved') . '</h4> ' . $is_new,
-    ),
-    'author' => array(
+    ],
+    'author' => [
       '#type' => 'item',
-      '#wrapper_attributes' => array('class' => array('author', 'container-inline')),
+      '#wrapper_attributes' => ['class' => ['author', 'container-inline']],
       '#markup' => '<h4 class="label inline">' . t('Author') . '</h4> ' . $node->getOwner()->getUsername(),
-    ),
-  );
+    ],
+  ];
   $form['revision_information']['#type'] = 'container';
   $form['revision_information']['#group'] = 'meta';
 }
diff --git a/web/core/themes/seven/templates/image-widget.html.twig b/web/core/themes/seven/templates/image-widget.html.twig
new file mode 100644
index 000000000..a7cf3ad48
--- /dev/null
+++ b/web/core/themes/seven/templates/image-widget.html.twig
@@ -0,0 +1,12 @@
+{#
+/**
+ * @file
+ * Theme override for an image field widget.
+ *
+ * Included from Classy theme.
+ *
+ * @see template_preprocess_image_widget()
+ */
+#}
+{% include '@classy/content-edit/image-widget.html.twig' %}
+{{ attach_library('classy/image-widget') }}
diff --git a/web/core/themes/seven/templates/status-report-counter.html.twig b/web/core/themes/seven/templates/status-report-counter.html.twig
new file mode 100644
index 000000000..13ab8a84d
--- /dev/null
+++ b/web/core/themes/seven/templates/status-report-counter.html.twig
@@ -0,0 +1,26 @@
+{#
+/**
+ * @file
+ * Theme override for status report counter.
+ *
+ * Available variables:
+ * - amount: The number shown on counter.
+ * - text: The text shown on counter.
+ * - severity: The severity of the counter.
+ *
+ * @ingroup themable
+ */
+#}
+{%
+  set classes = [
+    'system-status-counter',
+    'system-status-counter--' ~ severity,
+  ]
+%}
+<span{{ attributes.addClass(classes) }}>
+  <span class="system-status-counter__status-icon system-status-counter__status-icon--{{ severity }}"></span>
+  <span class="system-status-counter__status-title">
+    <span class="system-status-counter__title-count">{{ amount }} {{ text }}</span>
+    <span class="system-status-counter__details"><a href="#{{ severity }}" ><span class="visually-hidden">{{ text }} </span>Details</a></span>
+  </span>
+</span>
diff --git a/web/core/themes/seven/templates/status-report-general-info.html.twig b/web/core/themes/seven/templates/status-report-general-info.html.twig
new file mode 100644
index 000000000..a5d6ce7ba
--- /dev/null
+++ b/web/core/themes/seven/templates/status-report-general-info.html.twig
@@ -0,0 +1,99 @@
+{#
+/**
+ * @file
+ * Theme override for status report general info.
+ *
+ * Available variables:
+ * - drupal: The status of Drupal installation:
+ *   - value: The current status of Drupal installation.
+ *   - description: The description for current status of Drupal installation.
+ * - cron: The status of cron:
+ *   - value: The current status of cron.
+ *   - description: The description for current status of cron.
+ *   - cron.run_cron: An array to render a button for running cron.
+ * - database_system: The status of database system:
+ *   - value: The current status of database sytem.
+ *   - description: The description for current status of cron.
+ * - database_system_version: The info about current database version:
+ *   - value: The current version of database.
+ *   - description: The description for current version of database.
+ * - php: The current version of PHP:
+ *   - value: The status of currently installed PHP version.
+ *   - description: The description for current installed PHP version.
+ * - php_memory_limit: The info about current PHP memory limit:
+ *   - value: The status of currently set PHP memory limit.
+ *   - description: The description for currently set PHP memory limit.
+ * - webserver: The info about currently installed web server:
+ *   - value: The status of currently installed web server.
+ *   - description: The description for the status of currently installed web
+ *     server.
+ */
+#}
+<div class="system-status-general-info">
+  <h2 class="system-status-general-info__header">{{ 'General System Information'|t }}</h2>
+  <div class="system-status-general-info__items">
+    <div class="system-status-general-info__item">
+      <span class="system-status-general-info__item-icon system-status-general-info__item-icon--d8"></span>
+      <div class="system-status-general-info__item-details">
+        <h3 class="system-status-general-info__item-title">{{ 'Drupal Version'|t }}</h3>
+        {{ drupal.value }}
+        {% if drupal.description %}
+          <div class="description">{{ drupal.description }}</div>
+        {% endif %}
+      </div>
+    </div>
+    <div class="system-status-general-info__item">
+      <span class="system-status-general-info__item-icon system-status-general-info__item-icon--clock"></span>
+      <div class="system-status-general-info__item-details">
+        <h3 class="system-status-general-info__item-title">{{ 'Last Cron Run'|t }}</h3>
+        {{ cron.value }}
+        {% if cron.run_cron %}
+          <div class="system-status-general-info__run-cron">{{ cron.run_cron }}</div>
+        {% endif %}
+        {% if cron.description %}
+          <div class="system-status-general-info__description">{{ cron.description }}</div>
+        {% endif %}
+      </div>
+    </div>
+    <div class="system-status-general-info__item">
+      <span class="system-status-general-info__item-icon system-status-general-info__item-icon--server"></span>
+      <div class="system-status-general-info__item-details">
+        <h3 class="system-status-general-info__item-title">{{ 'Web Server'|t }}</h3>
+        {{ webserver.value }}
+        {% if webserver.description %}
+          <div class="description">{{ webserver.description }}</div>
+        {% endif %}
+      </div>
+    </div>
+    <div class="system-status-general-info__item">
+      <span class="system-status-general-info__item-icon system-status-general-info__item-icon--php"></span>
+      <div class="system-status-general-info__item-details">
+        <h3 class="system-status-general-info__item-title">{{ 'PHP'|t }}</h3>
+        <h4 class="system-status-general-info__sub-item-title">{{ 'Version'|t }}</h4>{{ php.value }}
+        {% if php.description %}
+          <div class="description">{{ php.description }}</div>
+        {% endif %}
+
+        <h4 class="system-status-general-info__sub-item-title">{{ 'Memory limit'|t }}</h4>{{ php_memory_limit.value }}
+        {% if php_memory_limit.description %}
+          <div class="description">{{ php_memory_limit.description }}</div>
+        {% endif %}
+      </div>
+    </div>
+    <div class="system-status-general-info__item">
+      <span class="system-status-general-info__item-icon system-status-general-info__item-icon--database"></span>
+      <div class="system-status-general-info__item-details">
+        <h3 class="system-status-general-info__item-title">{{ 'Database'|t }}</h3>
+        <h4 class="system-status-general-info__sub-item-title">{{ 'Version'|t }}</h4>{{ database_system_version.value }}
+        {% if database_system_version.description %}
+          <div class="description">{{ database_system_version.description }}</div>
+        {% endif %}
+
+        <h4 class="system-status-general-info__sub-item-title">{{ 'System'|t }}</h4>{{ database_system.value }}
+        {% if database_system.description %}
+          <div class="description">{{ database_system.description }}</div>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/web/core/themes/seven/templates/status-report-grouped.html.twig b/web/core/themes/seven/templates/status-report-grouped.html.twig
new file mode 100644
index 000000000..c5d6303f5
--- /dev/null
+++ b/web/core/themes/seven/templates/status-report-grouped.html.twig
@@ -0,0 +1,50 @@
+{#
+/**
+ * @file
+ * Theme override to display status report.
+ *
+ * - grouped_requirements: Contains grouped requirements.
+ *   Each group contains:
+ *   - title: The title of the group.
+ *   - type: The severity of the group.
+ *   - items: The requirement instances.
+ *     Each requirement item contains:
+ *     - title: The title of the requirement.
+ *     - value: (optional) The requirement's status.
+ *     - description: (optional) The requirement's description.
+ *     - severity_title: The title of the severity.
+ *     - severity_status: Indicates the severity status.
+ */
+#}
+{{ attach_library('core/drupal.collapse') }}
+{{ attach_library('seven/drupal.responsive-detail') }}
+
+<div class="system-status-report">
+  {% for group in grouped_requirements %}
+    <div class="system-status-report__requirements-group">
+      <h3 id="{{ group.type }}">{{ group.title }}</h3>
+      {% for requirement in group.items %}
+        <details class="system-status-report__entry system-status-report__entry--{{ group.type }} color-{{ group.type }}">
+          {%
+            set summary_classes = [
+              'system-status-report__status-title',
+              group.type in ['warning', 'error'] ? 'system-status-report__status-icon system-status-report__status-icon--' ~ group.type
+            ]
+          %}
+          <summary{{ create_attribute({'class': summary_classes}) }} role="button">
+            {% if requirement.severity_title  %}
+              <span class="visually-hidden">{{ requirement.severity_title }}</span>
+            {% endif %}
+            {{ requirement.title }}
+          </summary>
+          <div class="system-status-report__entry__value">
+            {{ requirement.value }}
+            {% if requirement.description %}
+              <div class="description">{{ requirement.description }}</div>
+            {% endif %}
+          </div>
+        </details>
+      {% endfor %}
+    </div>
+  {% endfor %}
+</div>
diff --git a/web/core/themes/seven/templates/status-report-page.html.twig b/web/core/themes/seven/templates/status-report-page.html.twig
new file mode 100644
index 000000000..27e0d1576
--- /dev/null
+++ b/web/core/themes/seven/templates/status-report-page.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme override for the status report page.
+ *
+ * Available variables:
+ * - counters: The list of counter elements.
+ * - general_info: A render array to create general info element.
+ * - requirements: A render array to create requirements table.
+ *
+ * @see template_preprocess_status_report()
+ */
+#}
+{% if counters|length == 3 %}
+  {% set element_width_class = ' system-status-report-counters__item--third-width' %}
+{% elseif counters|length == 2 %}
+  {% set element_width_class = ' system-status-report-counters__item--half-width' %}
+{% endif %}
+<div class="system-status-report-counters">
+  {% for counter in counters %}
+    <div class="system-status-report-counters__item{{ element_width_class }}">
+      {{ counter }}
+    </div>
+  {% endfor %}
+</div>
+
+{{ general_info }}
+{{ requirements }}
diff --git a/web/core/themes/stable/README.txt b/web/core/themes/stable/README.txt
index a8687a0dd..0539730cb 100644
--- a/web/core/themes/stable/README.txt
+++ b/web/core/themes/stable/README.txt
@@ -23,4 +23,4 @@ ABOUT DRUPAL THEMING
 --------------------
 
 For more information, see Drupal.org's theming guide.
-https://www.drupal.org/theme-guide/8
+https://www.drupal.org/docs/8/theming
diff --git a/web/core/themes/stable/css/image/editors/image.css b/web/core/themes/stable/css/image/editors/image.css
new file mode 100644
index 000000000..08bb6792e
--- /dev/null
+++ b/web/core/themes/stable/css/image/editors/image.css
@@ -0,0 +1,52 @@
+/**
+ * @file
+ * Functional styles for the Image module's in-place editor.
+ */
+
+/**
+ * A minimum width/height is required so that users can drag and drop files
+ * onto small images.
+ */
+.quickedit-image-element {
+  min-width: 200px;
+  min-height: 200px;
+}
+
+.quickedit-image-dropzone {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.quickedit-image-icon {
+  display: block;
+  width: 50px;
+  height: 50px;
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+
+.quickedit-image-field-info {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+.quickedit-image-text {
+  display: block;
+}
+
+/**
+ * If we do not prevent pointer-events for child elements, our drag+drop events
+ * will not fire properly. This can lead to unintentional redirects if a file
+ * is dropped on a child element when a user intended to upload it.
+ */
+.quickedit-image-dropzone * {
+  pointer-events: none;
+}
diff --git a/web/core/themes/stable/css/image/editors/image.theme.css b/web/core/themes/stable/css/image/editors/image.theme.css
new file mode 100644
index 000000000..5520758a7
--- /dev/null
+++ b/web/core/themes/stable/css/image/editors/image.theme.css
@@ -0,0 +1,100 @@
+/**
+ * @file
+ * Theme styles for the Image module's in-place editor.
+ */
+
+.quickedit-image-dropzone {
+  background: rgba(116, 183, 255, 0.8);
+  transition: background .2s;
+}
+
+.quickedit-image-icon {
+  margin: 0 0 10px 0;
+  transition: margin .5s;
+}
+
+.quickedit-image-dropzone.hover {
+  background: rgba(116, 183, 255, 0.9);
+}
+
+.quickedit-image-dropzone.error {
+  background: rgba(255, 52, 27, 0.81);
+}
+
+.quickedit-image-dropzone.upload .quickedit-image-icon {
+  background-image: url('../../../images/image/upload.svg');
+}
+
+.quickedit-image-dropzone.error .quickedit-image-icon {
+  background-image: url('../../../images/image/error.svg');
+}
+
+.quickedit-image-dropzone.loading .quickedit-image-icon {
+  margin: -10px 0 20px 0;
+}
+
+.quickedit-image-dropzone.loading .quickedit-image-icon::after {
+  display: block;
+  content: "";
+  margin-left: -10px;
+  margin-top: -5px;
+  animation-duration: 2s;
+  animation-name: quickedit-image-spin;
+  animation-iteration-count: infinite;
+  animation-timing-function: linear;
+  width: 60px;
+  height: 60px;
+  border-style: solid;
+  border-radius: 35px;
+  border-width: 5px;
+  border-color: white transparent transparent transparent;
+}
+
+@keyframes quickedit-image-spin {
+  0% {transform: rotate(0deg);}
+  50% {transform: rotate(180deg);}
+  100% {transform: rotate(360deg);}
+}
+
+.quickedit-image-text {
+  text-align: center;
+  color: white;
+  font-family: "Droid sans", "Lucida Grande", sans-serif;
+  font-size: 16px;
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+}
+
+.quickedit-image-field-info {
+  background: rgba(0, 0, 0, 0.05);
+  border-top: 1px solid #c5c5c5;
+  padding: 5px;
+}
+
+.quickedit-image-field-info div {
+  margin-right: 10px; /* LTR */
+}
+
+.quickedit-image-field-info div:last-child {
+  margin-right: 0; /* LTR */
+}
+
+[dir="rtl"] .quickedit-image-field-info div {
+  margin-left: 10px;
+  margin-right: 0;
+}
+
+[dir="rtl"] .quickedit-image-field-info div:last-child {
+  margin-left: 0;
+}
+
+.quickedit-image-errors .messages__wrapper {
+  margin: 0;
+  padding: 0;
+}
+
+.quickedit-image-errors .messages--error {
+  box-shadow: none;
+}
diff --git a/web/core/themes/stable/css/system/components/system-status-counter.css b/web/core/themes/stable/css/system/components/system-status-counter.css
new file mode 100644
index 000000000..8d3ad76d1
--- /dev/null
+++ b/web/core/themes/stable/css/system/components/system-status-counter.css
@@ -0,0 +1,28 @@
+/**
+ * @file
+ * Styles for the system status counter component.
+ */
+
+.system-status-counter__status-icon {
+  display: inline-block;
+  height: 25px;
+  width: 25px;
+  vertical-align: middle;
+}
+.system-status-counter__status-icon:before {
+  content: "";
+  background-size: 20px;
+  background-position: center 2px;
+  background-repeat: no-repeat;
+  display: block;
+}
+
+.system-status-counter__status-icon--error:before {
+  background-image: url(../../../images/core/icons/e32700/error.svg);
+}
+.system-status-counter__status-icon--warning:before {
+  background-image: url(../../../images/core/icons/e29700/warning.svg);
+}
+.system-status-counter__status-icon--checked:before {
+  background-image: url(../../../images/core/icons/73b355/check.svg);
+}
diff --git a/web/core/themes/stable/css/system/components/system-status-report-counters.css b/web/core/themes/stable/css/system/components/system-status-report-counters.css
new file mode 100644
index 000000000..1a4e2400f
--- /dev/null
+++ b/web/core/themes/stable/css/system/components/system-status-report-counters.css
@@ -0,0 +1,27 @@
+/**
+ * @file
+ * Styles for the system status report counters.
+ */
+
+.system-status-report-counters__item {
+  width: 100%;
+  padding: .5em 0;
+  text-align: center;
+  white-space: nowrap;
+  background-color: rgba(0, 0, 0, 0.063);
+  margin-bottom: .5em;
+}
+
+@media screen and (min-width: 60em) {
+  .system-status-report-counters {
+    flex-wrap: wrap;
+    display: flex;
+    justify-content: space-between;
+  }
+  .system-status-report-counters__item--half-width {
+    width: 49%;
+  }
+  .system-status-report-counters__item--third-width {
+    width: 33%;
+  }
+}
diff --git a/web/core/themes/stable/css/system/components/system-status-report-general-info.css b/web/core/themes/stable/css/system/components/system-status-report-general-info.css
new file mode 100644
index 000000000..8334d4d19
--- /dev/null
+++ b/web/core/themes/stable/css/system/components/system-status-report-general-info.css
@@ -0,0 +1,14 @@
+/**
+ * @file
+ * Default styles for the System Status general info.
+ */
+
+.system-status-general-info__item {
+  border: 1px solid #ccc;
+  margin-top: 1em;
+  padding: 0 1em 1em;
+}
+
+.system-status-general-info__item-title {
+  border-bottom: 1px solid #ccc;
+}
diff --git a/web/core/themes/stable/css/system/system.admin.css b/web/core/themes/stable/css/system/system.admin.css
index c8e20cf78..cd92b1ad0 100644
--- a/web/core/themes/stable/css/system/system.admin.css
+++ b/web/core/themes/stable/css/system/system.admin.css
@@ -204,10 +204,11 @@ small .admin-link:after {
 .system-status-report__status-title {
   position: relative;
   vertical-align: top;
-  width: 25%;
+  width: 100%;
   padding: 10px 6px 10px 40px; /* LTR */
   box-sizing: border-box;
   font-weight: normal;
+  background-color: transparent;
 }
 [dir="rtl"] .system-status-report__status-title {
     padding: 10px 40px 10px 6px;
@@ -232,6 +233,9 @@ small .admin-link:after {
 .system-status-report__status-icon--warning:before {
   background-image: url(../../images/core/icons/e29700/warning.svg);
 }
+.system-status-report__entry__value {
+  padding: 1em .5em;
+}
 
 /**
  * Appearance page.
@@ -387,3 +391,6 @@ small .admin-link:after {
 [dir="rtl"] .system-themes-admin-form {
   clear: right;
 }
+.cron-description__run-cron {
+  display: block;
+}
diff --git a/web/core/themes/stable/css/views_ui/views_ui.admin.theme.css b/web/core/themes/stable/css/views_ui/views_ui.admin.theme.css
index 3bf3290c8..e4ac1e4f3 100644
--- a/web/core/themes/stable/css/views_ui/views_ui.admin.theme.css
+++ b/web/core/themes/stable/css/views_ui/views_ui.admin.theme.css
@@ -170,9 +170,9 @@ details.box-padding {
   margin-bottom: 6px;
   margin-top: 6px;
 }
-.views-ui-view-title {
+.views-ui-view-name h3 {
   font-weight: bold;
-  margin-top: 0;
+  margin: 0.25em 0;
 }
 .view-changed {
   margin-bottom: 21px;
@@ -183,22 +183,33 @@ details.box-padding {
   margin-bottom: 0;
   margin-top: 18px;
 }
+.views-ui-view-displays ul {
+  margin-left: 0; /* LTR */
+  padding-left: 0; /* LTR */
+  list-style: none;
+}
+[dir="rtl"] .views-ui-view-displays ul {
+  margin-right: 0;
+  padding-right: 0;
+  margin-left: inherit;
+  padding-left: inherit;
+}
 
 /* These header classes are ambiguous and should be scoped to th elements */
 .views-ui-name {
-  width: 18%;
+  width: 20%;
 }
 .views-ui-description {
-  width: 26%;
+  width: 30%;
 }
-.views-ui-tag {
-  width: 8%;
+.views-ui-machine-name {
+  width: 15%;
 }
-.views-ui-path {
-  width: auto;
+.views-ui-displays {
+  width: 25%;
 }
 .views-ui-operations {
-  width: 24%;
+  width: 10%;
 }
 
 /**
@@ -604,7 +615,7 @@ td.group-title {
   margin: 0;
   padding: 6px 16px;
 }
-.views-ui-dialog .views-override {
+.views-ui-dialog .views-override:not(:empty) {
   background-color: #f3f4ee;
   padding: 8px 13px;
 }
diff --git a/web/core/themes/stable/images/image/error.svg b/web/core/themes/stable/images/image/error.svg
new file mode 100644
index 000000000..1932ea402
--- /dev/null
+++ b/web/core/themes/stable/images/image/error.svg
@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"/>
+</svg>
diff --git a/web/core/themes/stable/images/image/upload.svg b/web/core/themes/stable/images/image/upload.svg
new file mode 100644
index 000000000..168bc43e6
--- /dev/null
+++ b/web/core/themes/stable/images/image/upload.svg
@@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M9 16h6v-6h4l-7-7-7 7h4zm-4 2h14v2H5z"/>
+</svg>
diff --git a/web/core/themes/stable/stable.info.yml b/web/core/themes/stable/stable.info.yml
index 34768334b..251ecbd53 100644
--- a/web/core/themes/stable/stable.info.yml
+++ b/web/core/themes/stable/stable.info.yml
@@ -98,6 +98,12 @@ libraries-override:
     css:
       theme:
         css/image.admin.css: css/image/image.admin.css
+  image/quickedit.inPlaceEditor.image:
+    css:
+      component:
+        css/editors/image.css: css/image/editors/image.css
+      theme:
+        css/editors/image.theme.css: css/image/editors/image.theme.css
 
   language/drupal.language.admin:
     css:
@@ -169,6 +175,9 @@ libraries-override:
         css/components/reset-appearance.module.css: css/system/components/reset-appearance.module.css
         css/components/resize.module.css: css/system/components/resize.module.css
         css/components/sticky-header.module.css: css/system/components/sticky-header.module.css
+        css/components/system-status-counter.css: css/system/components/system-status-counter.css
+        css/components/system-status-report-counters.css: css/system/components/system-status-report-counters.css
+        css/components/system-status-report-general-info.css: css/system/components/system-status-report-general-info.css
         css/components/tabledrag.module.css: css/system/components/tabledrag.module.css
         css/components/tablesort.module.css: css/system/components/tablesort.module.css
         css/components/tree-child.module.css: css/system/components/tree-child.module.css
diff --git a/web/core/themes/stable/templates/admin/status-report-counter.html.twig b/web/core/themes/stable/templates/admin/status-report-counter.html.twig
new file mode 100644
index 000000000..b0f7bd5cb
--- /dev/null
+++ b/web/core/themes/stable/templates/admin/status-report-counter.html.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * @file
+ * Theme override for the status report counter.
+ *
+ * Available variables:
+ * - amount: The number shown on counter.
+ * - text: The text shown on counter.
+ * - severity: The severity of the counter.
+ *
+ * @ingroup themable
+ */
+#}
+{{ amount }} {{ text }}
+<a href="#{{ severity }}"><span class="visually-hidden">{{ text }} </span>Details</a>
diff --git a/web/core/themes/stable/templates/admin/status-report-general-info.html.twig b/web/core/themes/stable/templates/admin/status-report-general-info.html.twig
new file mode 100644
index 000000000..c71d83965
--- /dev/null
+++ b/web/core/themes/stable/templates/admin/status-report-general-info.html.twig
@@ -0,0 +1,81 @@
+{#
+/**
+ * @file
+ * Theme override for the status report general info.
+ *
+ * Available variables:
+ * - drupal: The status of Drupal installation:
+ *   - value: The current status of Drupal installation.
+ *   - description: The description for current status of Drupal installation.
+ * - cron: The status of cron:
+ *   - value: The current status of cron.
+ *   - description: The description for current status of cron.
+ *   - cron.run_cron: An array to render a button for running cron.
+ * - database_system: The status of database system:
+ *   - value: The current status of database sytem.
+ *   - description: The description for current status of cron.
+ * - database_system_version: The info about current database version:
+ *   - value: The current version of database.
+ *   - description: The description for current version of database.
+ * - php: The current version of PHP:
+ *   - value: The status of currently installed PHP version.
+ *   - description: The description for current installed PHP version.
+ * - php_memory_limit: The info about current PHP memory limit:
+ *   - value: The status of currently set PHP memory limit.
+ *   - description: The description for currently set PHP memory limit.
+ * - webserver: The info about currently installed web server:
+ *   - value: The status of currently installed web server.
+ *   - description: The description for the status of currently installed web
+ *     server.
+ */
+#}
+
+<h2>{{ 'General System Information'|t }}</h2>
+<div class="system-status-general-info__item">
+  <h3 class="system-status-general-info__item-title">{{ 'Drupal Version'|t }}</h3>
+  {{ drupal.value }}
+  {% if drupal.description %}
+    {{ drupal.description }}
+  {% endif %}
+</div>
+<div class="system-status-general-info__item">
+  <h3 class="system-status-general-info__item-title">{{ 'Last Cron Run'|t }}</h3>
+  {{ cron.value }}
+  {% if cron.run_cron %}
+    {{ cron.run_cron }}
+  {% endif %}
+  {% if cron.description %}
+    {{ cron.description }}
+  {% endif %}
+</div>
+<div class="system-status-general-info__item">
+  <h3 class="system-status-general-info__item-title">{{ 'Web Server'|t }}</h3>
+  {{ webserver.value }}
+  {% if webserver.description %}
+    {{ webserver.description }}
+  {% endif %}
+</div>
+<div class="system-status-general-info__item">
+  <h3 class="system-status-general-info__item-title">{{ 'PHP'|t }}</h3>
+  <h4>{{ 'Version'|t }}</h4>{{ php.value }}
+  {% if php.description %}
+    {{ php.description }}
+  {% endif %}
+
+  <h4>{{ 'Memory limit'|t }}</h4>{{ php_memory_limit.value }}
+  {% if php_memory_limit.description %}
+    {{ php_memory_limit.description }}
+  {% endif %}
+</div>
+<div class="system-status-general-info__item">
+  <h3 class="system-status-general-info__item-title">{{ 'Database'|t }}</h3>
+  <h4>{{ 'Version'|t }}</h4>{{ database_system_version.value }}
+  {% if database_system_version.description %}
+    {{ database_system_version.description }}
+  {% endif %}
+
+  <h4>{{ 'System'|t }}</h4>{{ database_system.value }}
+  {% if database_system.description %}
+    {{ database_system.description }}
+  {% endif %}
+</div>
diff --git a/web/core/themes/stable/templates/admin/status-report-grouped.html.twig b/web/core/themes/stable/templates/admin/status-report-grouped.html.twig
new file mode 100644
index 000000000..bbeaa47a0
--- /dev/null
+++ b/web/core/themes/stable/templates/admin/status-report-grouped.html.twig
@@ -0,0 +1,49 @@
+{#
+/**
+ * @file
+ * Theme override of grouped status report requirements.
+ *
+ * - grouped_requirements: Contains grouped requirements.
+ *   Each group contains:
+ *   - title: The title of the group.
+ *   - type: The severity of the group.
+ *   - items: The requirement instances.
+ *     Each requirement item contains:
+ *     - title: The title of the requirement.
+ *     - value: (optional) The requirement's status.
+ *     - description: (optional) The requirement's description.
+ *     - severity_title: The title of the severity.
+ *     - severity_status: Indicates the severity status.
+ */
+#}
+{{ attach_library('core/drupal.collapse') }}
+
+<div>
+  {% for group in grouped_requirements %}
+    <div>
+      <h3 id="{{ group.type }}">{{ group.title }}</h3>
+      {% for requirement in group.items %}
+        <details class="system-status-report__entry">
+          {%
+            set summary_classes = [
+              'system-status-report__status-title',
+              group.type in ['warning', 'error'] ? 'system-status-report__status-icon system-status-report__status-icon--' ~ group.type
+            ]
+          %}
+          <summary{{ create_attribute({'class': summary_classes}) }} role="button">
+            {% if requirement.severity_title  %}
+              <span class="visually-hidden">{{ requirement.severity_title }}</span>
+            {% endif %}
+            {{ requirement.title }}
+          </summary>
+          <div class="system-status-report__entry__value">
+            {{ requirement.value }}
+            {% if requirement.description %}
+              <div class="description">{{ requirement.description }}</div>
+            {% endif %}
+          </div>
+        </details>
+      {% endfor %}
+    </div>
+  {% endfor %}
+</div>
diff --git a/web/core/themes/stable/templates/admin/status-report-page.html.twig b/web/core/themes/stable/templates/admin/status-report-page.html.twig
new file mode 100644
index 000000000..27e0d1576
--- /dev/null
+++ b/web/core/themes/stable/templates/admin/status-report-page.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme override for the status report page.
+ *
+ * Available variables:
+ * - counters: The list of counter elements.
+ * - general_info: A render array to create general info element.
+ * - requirements: A render array to create requirements table.
+ *
+ * @see template_preprocess_status_report()
+ */
+#}
+{% if counters|length == 3 %}
+  {% set element_width_class = ' system-status-report-counters__item--third-width' %}
+{% elseif counters|length == 2 %}
+  {% set element_width_class = ' system-status-report-counters__item--half-width' %}
+{% endif %}
+<div class="system-status-report-counters">
+  {% for counter in counters %}
+    <div class="system-status-report-counters__item{{ element_width_class }}">
+      {{ counter }}
+    </div>
+  {% endfor %}
+</div>
+
+{{ general_info }}
+{{ requirements }}
diff --git a/web/core/themes/stable/templates/admin/views-ui-view-displays-list.html.twig b/web/core/themes/stable/templates/admin/views-ui-view-displays-list.html.twig
new file mode 100644
index 000000000..e6e5b0212
--- /dev/null
+++ b/web/core/themes/stable/templates/admin/views-ui-view-displays-list.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for views displays on the views listing page.
+ *
+ * Available variables:
+ * - displays: Contains multiple display instances. Each display contains:
+ *   - display: Display name.
+ *   - path: Path to display, if any.
+ */
+#}
+<ul>
+  {% for display in displays %}
+    <li>
+      {% if display.path %}
+        {{ display.display }} <span data-drupal-selector="views-table-filter-text-source">({{ display.path }})</span>
+      {% else %}
+        {{ display.display }}
+      {% endif %}
+    </li>
+  {% endfor %}
+</ul>
diff --git a/web/core/themes/stable/templates/admin/views-ui-views-listing-table.html.twig b/web/core/themes/stable/templates/admin/views-ui-views-listing-table.html.twig
new file mode 100644
index 000000000..bc12a0a6e
--- /dev/null
+++ b/web/core/themes/stable/templates/admin/views-ui-views-listing-table.html.twig
@@ -0,0 +1,47 @@
+{#
+/**
+ * @file
+ * Theme override for views listing table.
+ *
+ * Available variables:
+ * - headers: Contains table headers.
+ * - rows: Contains multiple rows. Each row contains:
+ *   - view_name: The human-readable name of the view.
+ *   - machine_name: Machine name of the view.
+ *   - description: The description of the view.
+ *   - displays: List of displays attached to the view.
+ *   - operations: List of available operations.
+ *
+ * @see template_preprocess_views_ui_views_listing_table()
+ */
+#}
+<table{{ attributes.addClass('responsive-enabled') }}>
+  <thead>
+    <tr>
+      {% for header in headers %}
+        <th{{ header.attributes }}>{{ header.data }}</th>
+      {% endfor %}
+    </tr>
+  </thead>
+  <tbody>
+    {% for row in rows %}
+      <tr{{ row.attributes }}>
+        <td class="views-ui-view-name">
+          <h3 data-drupal-selector="views-table-filter-text-source">{{ row.data.view_name.data }}</h3>
+        </td>
+        <td class="views-ui-view-machine-name" data-drupal-selector="views-table-filter-text-source">
+          {{ row.data.machine_name.data }}
+        </td>
+        <td class="views-ui-view-description" data-drupal-selector="views-table-filter-text-source">
+          {{ row.data.description.data }}
+        </td>
+        <td class="views-ui-view-displays">
+          {{ row.data.displays.data }}
+        </td>
+        <td class="views-ui-view-operations">
+          {{ row.data.operations.data }}
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
diff --git a/web/core/themes/stable/templates/views/views-view-opml.html.twig b/web/core/themes/stable/templates/views/views-view-opml.html.twig
index a48843aea..4165ccf4d 100644
--- a/web/core/themes/stable/templates/views/views-view-opml.html.twig
+++ b/web/core/themes/stable/templates/views/views-view-opml.html.twig
@@ -11,7 +11,7 @@
  * @see template_preprocess_views_view_opml()
  */
 #}
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <opml version="2.0">
   <head>
     <title>{{ title }}</title>
diff --git a/web/core/themes/stable/templates/views/views-view-rss.html.twig b/web/core/themes/stable/templates/views/views-view-rss.html.twig
index f772d6370..0800237e3 100644
--- a/web/core/themes/stable/templates/views/views-view-rss.html.twig
+++ b/web/core/themes/stable/templates/views/views-view-rss.html.twig
@@ -15,7 +15,7 @@
  * @see template_preprocess_views_view_rss()
  */
 #}
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0" xml:base="{{ link }}"{{ namespaces }}>
   <channel>
     <title>{{ title }}</title>
diff --git a/web/core/themes/stark/README.txt b/web/core/themes/stark/README.txt
index 552261ab5..62bf058a9 100644
--- a/web/core/themes/stark/README.txt
+++ b/web/core/themes/stark/README.txt
@@ -17,7 +17,7 @@ ABOUT DRUPAL THEMING
 --------------------
 
 To learn how to build your own custom theme and override Drupal's default code,
-see the Theming Guide: https://www.drupal.org/theme-guide
+see the Theming Guide: https://www.drupal.org/docs/8/theming
 
 See the themes/README.txt for more information on where to place your
 custom themes to ensure easy maintenance and upgrades.
diff --git a/web/core/themes/stark/stark.info.yml b/web/core/themes/stark/stark.info.yml
index f6c9ba5ea..fde798295 100644
--- a/web/core/themes/stark/stark.info.yml
+++ b/web/core/themes/stark/stark.info.yml
@@ -1,6 +1,6 @@
 name: Stark
 type: theme
-description: 'An intentionally plain theme with no styling to demonstrate default Drupal’s HTML and CSS. Learn how to build a custom theme from Stark in the <a href="https://www.drupal.org/theme-guide">Theming Guide</a>.'
+description: 'An intentionally plain theme with no styling to demonstrate default Drupal’s HTML and CSS. Learn how to build a custom theme from Stark in the <a href="https://www.drupal.org/docs/8/theming">Theming Guide</a>.'
 package: Core
 version: VERSION
 core: 8.x
diff --git a/web/sites/default/default.services.yml b/web/sites/default/default.services.yml
new file mode 100644
index 000000000..e1bbbc7e2
--- /dev/null
+++ b/web/sites/default/default.services.yml
@@ -0,0 +1,174 @@
+parameters:
+  session.storage.options:
+    # Default ini options for sessions.
+    #
+    # Some distributions of Linux (most notably Debian) ship their PHP
+    # installations with garbage collection (gc) disabled. Since Drupal depends
+    # on PHP's garbage collection for clearing sessions, ensure that garbage
+    # collection occurs by using the most common settings.
+    # @default 1
+    gc_probability: 1
+    # @default 100
+    gc_divisor: 100
+    #
+    # Set session lifetime (in seconds), i.e. the time from the user's last
+    # visit to the active session may be deleted by the session garbage
+    # collector. When a session is deleted, authenticated users are logged out,
+    # and the contents of the user's $_SESSION variable is discarded.
+    # @default 200000
+    gc_maxlifetime: 200000
+    #
+    # Set session cookie lifetime (in seconds), i.e. the time from the session
+    # is created to the cookie expires, i.e. when the browser is expected to
+    # discard the cookie. The value 0 means "until the browser is closed".
+    # @default 2000000
+    cookie_lifetime: 2000000
+    #
+    # Drupal automatically generates a unique session cookie name based on the
+    # full domain name used to access the site. This mechanism is sufficient
+    # for most use-cases, including multi-site deployments. However, if it is
+    # desired that a session can be reused across different subdomains, the
+    # cookie domain needs to be set to the shared base domain. Doing so assures
+    # that users remain logged in as they cross between various subdomains.
+    # To maximize compatibility and normalize the behavior across user agents,
+    # the cookie domain should start with a dot.
+    #
+    # @default none
+    # cookie_domain: '.example.com'
+    #
+  twig.config:
+    # Twig debugging:
+    #
+    # When debugging is enabled:
+    # - The markup of each Twig template is surrounded by HTML comments that
+    #   contain theming information, such as template file name suggestions.
+    # - Note that this debugging markup will cause automated tests that directly
+    #   check rendered HTML to fail. When running automated tests, 'debug'
+    #   should be set to FALSE.
+    # - The dump() function can be used in Twig templates to output information
+    #   about template variables.
+    # - Twig templates are automatically recompiled whenever the source code
+    #   changes (see auto_reload below).
+    #
+    # For more information about debugging Twig templates, see
+    # https://www.drupal.org/node/1906392.
+    #
+    # Not recommended in production environments
+    # @default false
+    debug: false
+    # Twig auto-reload:
+    #
+    # Automatically recompile Twig templates whenever the source code changes.
+    # If you don't provide a value for auto_reload, it will be determined
+    # based on the value of debug.
+    #
+    # Not recommended in production environments
+    # @default null
+    auto_reload: null
+    # Twig cache:
+    #
+    # By default, Twig templates will be compiled and stored in the filesystem
+    # to increase performance. Disabling the Twig cache will recompile the
+    # templates from source each time they are used. In most cases the
+    # auto_reload setting above should be enabled rather than disabling the
+    # Twig cache.
+    #
+    # Not recommended in production environments
+    # @default true
+    cache: true
+  renderer.config:
+    # Renderer required cache contexts:
+    #
+    # The Renderer will automatically associate these cache contexts with every
+    # render array, hence varying every render array by these cache contexts.
+    #
+    # @default ['languages:language_interface', 'theme', 'user.permissions']
+    required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions']
+    # Renderer automatic placeholdering conditions:
+    #
+    # Drupal allows portions of the page to be automatically deferred when
+    # rendering to improve cache performance. That is especially helpful for
+    # cache contexts that vary widely, such as the active user. On some sites
+    # those may be different, however, such as sites with only a handful of
+    # users. If you know what the high-cardinality cache contexts are for your
+    # site, specify those here. If you're not sure, the defaults are fairly safe
+    # in general.
+    #
+    # For more information about rendering optimizations see
+    # https://www.drupal.org/developing/api/8/render/arrays/cacheability#optimizing
+    auto_placeholder_conditions:
+      # Max-age at or below which caching is not considered worthwhile.
+      #
+      # Disable by setting to -1.
+      #
+      # @default 0
+      max-age: 0
+      # Cache contexts with a high cardinality.
+      #
+      # Disable by setting to [].
+      #
+      # @default ['session', 'user']
+      contexts: ['session', 'user']
+      # Tags with a high invalidation frequency.
+      #
+      # Disable by setting to [].
+      #
+      # @default []
+      tags: []
+  # Cacheability debugging:
+  #
+  # Responses with cacheability metadata (CacheableResponseInterface instances)
+  # get X-Drupal-Cache-Tags and X-Drupal-Cache-Contexts headers.
+  #
+  # For more information about debugging cacheable responses, see
+  # https://www.drupal.org/developing/api/8/response/cacheable-response-interface
+  #
+  # Not recommended in production environments
+  # @default false
+  http.response.debug_cacheability_headers: false
+  factory.keyvalue:
+    {}
+    # Default key/value storage service to use.
+    # @default keyvalue.database
+    # default: keyvalue.database
+    # Collection-specific overrides.
+    # state: keyvalue.database
+  factory.keyvalue.expirable:
+    {}
+    # Default key/value expirable storage service to use.
+    # @default keyvalue.database.expirable
+    # default: keyvalue.database.expirable
+  # Allowed protocols for URL generation.
+  filter_protocols:
+    - http
+    - https
+    - ftp
+    - news
+    - nntp
+    - tel
+    - telnet
+    - mailto
+    - irc
+    - ssh
+    - sftp
+    - webcal
+    - rtsp
+
+   # Configure Cross-Site HTTP requests (CORS).
+   # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
+   # for more information about the topic in general.
+   # Note: By default the configuration is disabled.
+  cors.config:
+    enabled: false
+    # Specify allowed headers, like 'x-allowed-header'.
+    allowedHeaders: []
+    # Specify allowed request methods, specify ['*'] to allow all possible ones.
+    allowedMethods: []
+    # Configure requests allowed from specific origins.
+    allowedOrigins: ['*']
+    # Sets the Access-Control-Expose-Headers header.
+    exposedHeaders: false
+    # Sets the Access-Control-Max-Age header.
+    maxAge: false
+    # Sets the Access-Control-Allow-Credentials header.
+    supportsCredentials: false
diff --git a/web/sites/default/default.settings.php b/web/sites/default/default.settings.php
index 52b6fde7f..25d498e6f 100644
--- a/web/sites/default/default.settings.php
+++ b/web/sites/default/default.settings.php
@@ -144,6 +144,11 @@
  * @code
  *   'prefix' => 'main_',
  * @endcode
+ *
+ * Per-table prefixes are deprecated as of Drupal 8.2, and will be removed in
+ * Drupal 9.0. After that, only a single prefix for all tables will be
+ * supported.
+ *
  * To provide prefixes for specific tables, set 'prefix' as an array.
  * The array's keys are the table names and the values are the prefixes.
  * The 'default' element is mandatory and holds the prefix for any tables
@@ -265,6 +270,11 @@ $config_directories = array();
  * by the user.
  *
  * @see install_select_profile()
+ *
+ * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. The
+ *   install profile is written to the core.extension configuration. If a
+ *   service requires the install profile use the 'install_profile' container
+ *   parameter. Functional code can use \Drupal::installProfile().
  */
 # $settings['install_profile'] = '';
 
@@ -739,19 +749,6 @@ $settings['file_scan_ignore_directories'] = [
   'bower_components',
 ];
 
-/**
- * Include the Pantheon-specific settings file.
- *
- * n.b. The settings.pantheon.php file makes some changes
- *      that affect all envrionments that this site
- *      exists in.  Always include this file, even in
- *      a local development environment, to insure that
- *      the site settings remain consistent.
- */
-if (file_exists(__DIR__ . '/settings.pantheon.php')) {
-  include __DIR__ . "/settings.pantheon.php";
-}
-
 /**
  * Load local development override configuration, if available.
  *
diff --git a/web/sites/example.settings.local.php b/web/sites/example.settings.local.php
index c3347ad39..b1f73dd8a 100644
--- a/web/sites/example.settings.local.php
+++ b/web/sites/example.settings.local.php
@@ -66,6 +66,14 @@ $config['system.performance']['js']['preprocess'] = FALSE;
  */
 # $settings['cache']['bins']['render'] = 'cache.backend.null';
 
+/**
+ * Disable caching for migrations.
+ *
+ * Uncomment the code below to only store migrations in memory and not in the
+ * database. This makes it easier to develop custom migrations.
+ */
+# $settings['cache']['bins']['discovery_migration'] = 'cache.backend.memory';
+
 /**
  * Disable Dynamic Page Cache.
  *
diff --git a/web/vendor/asm89/stack-cors/.gitignore b/web/vendor/asm89/stack-cors/.gitignore
deleted file mode 100644
index 8844fdc45..000000000
--- a/web/vendor/asm89/stack-cors/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-phpunit.xml
-composer.lock
-composer.phar
-/vendor/
diff --git a/web/vendor/asm89/stack-cors/.travis.yml b/web/vendor/asm89/stack-cors/.travis.yml
deleted file mode 100644
index 7eb55a913..000000000
--- a/web/vendor/asm89/stack-cors/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-before_script: composer install --dev
-
-script: phpunit
diff --git a/web/vendor/asm89/stack-cors/LICENSE b/web/vendor/asm89/stack-cors/LICENSE
new file mode 100644
index 000000000..d9f2067d6
--- /dev/null
+++ b/web/vendor/asm89/stack-cors/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2013-2017 Alexander <iam.asm89@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/web/vendor/asm89/stack-cors/README.md b/web/vendor/asm89/stack-cors/README.md
index dea18a8e7..904ac936d 100644
--- a/web/vendor/asm89/stack-cors/README.md
+++ b/web/vendor/asm89/stack-cors/README.md
@@ -2,12 +2,11 @@
 
 Library and middleware enabling cross-origin resource sharing for your
 http-{foundation,kernel} using application. It attempts to implement the
-[W3C Candidate Recommendation] for cross-origin resource sharing.
+[W3C Recommendation] for cross-origin resource sharing.
 
-[W3C Candidate Recommendation]: http://www.w3.org/TR/cors/
+[W3C Recommendation]: http://www.w3.org/TR/cors/
 
 Master [![Build Status](https://secure.travis-ci.org/asm89/stack-cors.png?branch=master)](http://travis-ci.org/asm89/stack-cors)
-Develop [![Build Status](https://secure.travis-ci.org/asm89/stack-cors.png?branch=develop)](http://travis-ci.org/asm89/stack-cors)
 
 ## Installation
 
@@ -15,27 +14,11 @@ Require `asm89/stack-cors` using composer.
 
 ## Usage
 
-Stack middleware:
+This package can be used as a library or as [stack middleware].
 
-```php
-<?php
+[stack middleware]: http://stackphp.com/
 
-use Asm89\Stack\Cors;
-
-$app = new Cors($app, array(
-    // you can use array('*') to allow any headers
-    'allowedHeaders'      => array('x-allowed-header', 'x-other-allowed-header'),
-    // you can use array('*') to allow any methods
-    'allowedMethods'      => array('DELETE', 'GET', 'POST', 'PUT'),
-    // you can use array('*') to allow requests from any origin
-    'allowedOrigins'      => array('localhost'),
-    'exposedHeaders'      => false,
-    'maxAge'              => false,
-    'supportsCredentials' => false,
-));
-```
-
-Or use the library:
+### Example: using the library
 
 ```php
 <?php
@@ -57,3 +40,23 @@ $cors->isActualRequestAllowed(Request $request);
 $cors->isCorsRequest(Request $request);
 $cors->isPreflightRequest(Request $request);
 ```
+
+## Example: using the stack middleware
+
+```php
+<?php
+
+use Asm89\Stack\Cors;
+
+$app = new Cors($app, array(
+    // you can use array('*') to allow any headers
+    'allowedHeaders'      => array('x-allowed-header', 'x-other-allowed-header'),
+    // you can use array('*') to allow any methods
+    'allowedMethods'      => array('DELETE', 'GET', 'POST', 'PUT'),
+    // you can use array('*') to allow requests from any origin
+    'allowedOrigins'      => array('localhost'),
+    'exposedHeaders'      => false,
+    'maxAge'              => false,
+    'supportsCredentials' => false,
+));
+```
diff --git a/web/vendor/asm89/stack-cors/composer.json b/web/vendor/asm89/stack-cors/composer.json
index 02296c616..18e96c6e7 100644
--- a/web/vendor/asm89/stack-cors/composer.json
+++ b/web/vendor/asm89/stack-cors/composer.json
@@ -12,11 +12,32 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2",
-        "symfony/http-foundation": "~2.1|~3.0",
-        "symfony/http-kernel": "~2.1|~3.0"
+        "php": ">=5.5.9",
+        "symfony/http-foundation": "~2.7|~3.0",
+        "symfony/http-kernel": "~2.7|~3.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.0 || ^4.8.10",
+        "squizlabs/php_codesniffer": "^2.3"
     },
     "autoload": {
-        "psr-0": { "Asm89\\Stack": "src/" }
+        "psr-4": {
+            "Asm89\\Stack\\": "src/Asm89/Stack/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Asm89\\Stack\\": "test/Asm89/Stack/"
+        }
+    },
+    "scripts": {
+        "test": "phpunit",
+        "check-style": "phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src",
+        "fix-style": "phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1-dev"
+        }
     }
 }
diff --git a/web/vendor/asm89/stack-cors/phpunit.xml.dist b/web/vendor/asm89/stack-cors/phpunit.xml.dist
deleted file mode 100644
index 1959e537e..000000000
--- a/web/vendor/asm89/stack-cors/phpunit.xml.dist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="test/bootstrap.php"
->
-  <testsuites>
-    <testsuite name="Stack Cors Test Suite">
-      <directory>./test/Asm89/</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory suffix=".php">./src/</directory>
-    </whitelist>
-  </filter>
-
-</phpunit>
diff --git a/web/vendor/asm89/stack-cors/src/Asm89/Stack/Cors.php b/web/vendor/asm89/stack-cors/src/Asm89/Stack/Cors.php
old mode 100755
new mode 100644
index a5e81ce21..99f297366
--- a/web/vendor/asm89/stack-cors/src/Asm89/Stack/Cors.php
+++ b/web/vendor/asm89/stack-cors/src/Asm89/Stack/Cors.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of asm89/stack-cors.
+ *
+ * (c) Alexander <iam.asm89@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Asm89\Stack;
 
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -31,12 +40,11 @@ class Cors implements HttpKernelInterface
     {
         $this->app  = $app;
         $this->cors = new CorsService(array_merge($this->defaultOptions, $options));
-
     }
 
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
-        if ( ! $this->cors->isCorsRequest($request)) {
+        if (!$this->cors->isCorsRequest($request)) {
             return $this->app->handle($request, $type, $catch);
         }
 
@@ -44,7 +52,7 @@ class Cors implements HttpKernelInterface
             return $this->cors->handlePreflightRequest($request);
         }
 
-        if ( ! $this->cors->isActualRequestAllowed($request)) {
+        if (!$this->cors->isActualRequestAllowed($request)) {
             return new Response('Not allowed.', 403);
         }
 
diff --git a/web/vendor/asm89/stack-cors/src/Asm89/Stack/CorsService.php b/web/vendor/asm89/stack-cors/src/Asm89/Stack/CorsService.php
old mode 100755
new mode 100644
index 339256b3c..09dc44b7b
--- a/web/vendor/asm89/stack-cors/src/Asm89/Stack/CorsService.php
+++ b/web/vendor/asm89/stack-cors/src/Asm89/Stack/CorsService.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of asm89/stack-cors.
+ *
+ * (c) Alexander <iam.asm89@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Asm89\Stack;
 
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -17,7 +26,6 @@ class CorsService
 
     private function normalizeOptions(array $options = array())
     {
-
         $options += array(
             'allowedOrigins' => array(),
             'supportsCredentials' => false,
@@ -29,18 +37,18 @@ class CorsService
 
         // normalize array('*') to true
         if (in_array('*', $options['allowedOrigins'])) {
-          $options['allowedOrigins'] = true;
+            $options['allowedOrigins'] = true;
         }
         if (in_array('*', $options['allowedHeaders'])) {
-          $options['allowedHeaders'] = true;
+            $options['allowedHeaders'] = true;
         } else {
-          $options['allowedHeaders'] = array_map('strtolower', $options['allowedHeaders']);
+            $options['allowedHeaders'] = array_map('strtolower', $options['allowedHeaders']);
         }
 
         if (in_array('*', $options['allowedMethods'])) {
-          $options['allowedMethods'] = true;
+            $options['allowedMethods'] = true;
         } else {
-          $options['allowedMethods'] = array_map('strtoupper', $options['allowedMethods']);
+            $options['allowedMethods'] = array_map('strtoupper', $options['allowedMethods']);
         }
 
         return $options;
@@ -53,25 +61,25 @@ class CorsService
 
     public function isCorsRequest(Request $request)
     {
-        return $request->headers->has('Origin');
+        return $request->headers->has('Origin') && !$this->isSameHost($request);
     }
 
     public function isPreflightRequest(Request $request)
     {
         return $this->isCorsRequest($request)
-            &&$request->getMethod() === 'OPTIONS'
+            && $request->getMethod() === 'OPTIONS'
             && $request->headers->has('Access-Control-Request-Method');
     }
 
     public function addActualRequestHeaders(Response $response, Request $request)
     {
-        if ( ! $this->checkOrigin($request)) {
+        if (!$this->checkOrigin($request)) {
             return $response;
         }
 
         $response->headers->set('Access-Control-Allow-Origin', $request->headers->get('Origin'));
 
-        if ( ! $response->headers->has('Vary')) {
+        if (!$response->headers->has('Vary')) {
             $response->headers->set('Vary', 'Origin');
         } else {
             $response->headers->set('Vary', $response->headers->get('Vary') . ', Origin');
@@ -126,11 +134,11 @@ class CorsService
 
     private function checkPreflightRequestConditions(Request $request)
     {
-        if ( ! $this->checkOrigin($request)) {
+        if (!$this->checkOrigin($request)) {
             return $this->createBadRequestResponse(403, 'Origin not allowed');
         }
 
-        if ( ! $this->checkMethod($request)) {
+        if (!$this->checkMethod($request)) {
             return $this->createBadRequestResponse(405, 'Method not allowed');
         }
 
@@ -138,10 +146,10 @@ class CorsService
         // if allowedHeaders has been set to true ('*' allow all flag) just skip this check
         if ($this->options['allowedHeaders'] !== true && $request->headers->has('Access-Control-Request-Headers')) {
             $headers        = strtolower($request->headers->get('Access-Control-Request-Headers'));
-            $requestHeaders = explode(',', $headers);
+            $requestHeaders = array_filter(explode(',', $headers));
 
             foreach ($requestHeaders as $header) {
-                if ( ! in_array(trim($header), $this->options['allowedHeaders'])) {
+                if (!in_array(trim($header), $this->options['allowedHeaders'])) {
                     return $this->createBadRequestResponse(403, 'Header not allowed');
                 }
             }
@@ -155,7 +163,13 @@ class CorsService
         return new Response($reason, $code);
     }
 
-    private function checkOrigin(Request $request) {
+    private function isSameHost(Request $request)
+    {
+        return $request->headers->get('Origin') === $request->getSchemeAndHttpHost();
+    }
+
+    private function checkOrigin(Request $request)
+    {
         if ($this->options['allowedOrigins'] === true) {
             // allow all '*' flag
             return true;
@@ -165,7 +179,8 @@ class CorsService
         return in_array($origin, $this->options['allowedOrigins']);
     }
 
-    private function checkMethod(Request $request) {
+    private function checkMethod(Request $request)
+    {
         if ($this->options['allowedMethods'] === true) {
             // allow all '*' flag
             return true;
@@ -174,5 +189,4 @@ class CorsService
         $requestMethod = strtoupper($request->headers->get('Access-Control-Request-Method'));
         return in_array($requestMethod, $this->options['allowedMethods']);
     }
-
 }
diff --git a/web/vendor/asm89/stack-cors/test/Asm89/Stack/CorsTest.php b/web/vendor/asm89/stack-cors/test/Asm89/Stack/CorsTest.php
deleted file mode 100755
index 1493c46c5..000000000
--- a/web/vendor/asm89/stack-cors/test/Asm89/Stack/CorsTest.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-
-namespace Asm89\Stack;
-
-use PHPUnit_Framework_TestCase;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-class CorsTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @test
-     */
-    public function it_does_not_modify_on_a_request_without_origin()
-    {
-        $app                = $this->createStackedApp();
-        $unmodifiedResponse = new Response();
-
-        $response = $app->handle(new Request());
-
-        $this->assertEquals($unmodifiedResponse->headers, $response->headers);
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_403_on_valid_actual_request_with_origin_not_allowed()
-    {
-        $app      = $this->createStackedApp(array('allowedOrigins' => array('notlocalhost')));
-        $request  = $this->createValidActualRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertEquals(403, $response->getStatusCode());
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_allow_origin_header_on_valid_actual_request()
-    {
-        $app      = $this->createStackedApp();
-        $request  = $this->createValidActualRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Access-Control-Allow-Origin'));
-        $this->assertEquals('localhost', $response->headers->get('Access-Control-Allow-Origin'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_allow_origin_header_on_allow_all_origin_request()
-    {
-        $app      = $this->createStackedApp(array('allowedOrigins' => array('*')));
-        $request  = new Request();
-        $request->headers->set('Origin', 'http://localhost');
-
-        $response = $app->handle($request);
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertTrue($response->headers->has('Access-Control-Allow-Origin'));
-        $this->assertEquals('http://localhost', $response->headers->get('Access-Control-Allow-Origin'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_allow_headers_header_on_allow_all_headers_request()
-    {
-        $app     = $this->createStackedApp(array('allowedHeaders' => array('*')));
-        $request = $this->createValidPreflightRequest();
-        $request->headers->set('Access-Control-Request-Headers', 'Foo, BAR');
-
-        $response = $app->handle($request);
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals('FOO, BAR', $response->headers->get('Access-Control-Allow-Headers'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_does_not_return_allow_origin_header_on_valid_actual_request_with_origin_not_allowed()
-    {
-        $app      = $this->createStackedApp(array('allowedOrigins' => array('notlocalhost')));
-        $request  = $this->createValidActualRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertFalse($response->headers->has('Access-Control-Allow-Origin'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_sets_allow_credentials_header_when_flag_is_set_on_valid_actual_request()
-    {
-        $app     = $this->createStackedApp(array('supportsCredentials' => true));
-        $request = $this->createValidActualRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Access-Control-Allow-Credentials'));
-        $this->assertEquals('true', $response->headers->get('Access-Control-Allow-Credentials'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_does_not_set_allow_credentials_header_when_flag_is_not_set_on_valid_actual_request()
-    {
-        $app     = $this->createStackedApp();
-        $request = $this->createValidActualRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertFalse($response->headers->has('Access-Control-Allow-Credentials'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_sets_exposed_headers_when_configured_on_actual_request()
-    {
-        $app     = $this->createStackedApp(array('exposedHeaders' => array('x-exposed-header', 'x-another-exposed-header')));
-        $request = $this->createValidActualRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Access-Control-Expose-Headers'));
-        $this->assertEquals('x-exposed-header, x-another-exposed-header', $response->headers->get('Access-Control-Expose-Headers'));
-    }
-
-    /**
-     * @test
-     * @see http://www.w3.org/TR/cors/index.html#resource-implementation
-     */
-    public function it_adds_a_vary_header()
-    {
-        $app      = $this->createStackedApp();
-        $request  = $this->createValidActualRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Vary'));
-        $this->assertEquals('Origin', $response->headers->get('Vary'));
-    }
-
-    /**
-     * @test
-     * @see http://www.w3.org/TR/cors/index.html#resource-implementation
-     */
-    public function it_appends_an_existing_vary_header()
-    {
-        $app      = $this->createStackedApp(array(), array('Vary' => 'Content-Type'));
-        $request  = $this->createValidActualRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Vary'));
-        $this->assertEquals('Content-Type, Origin', $response->headers->get('Vary'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_access_control_headers_on_cors_request()
-    {
-        $app      = $this->createStackedApp();
-        $request  = new Request();
-        $request->headers->set('Origin', 'localhost');
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Access-Control-Allow-Origin'));
-        $this->assertEquals('localhost', $response->headers->get('Access-Control-Allow-Origin'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_access_control_headers_on_valid_preflight_request()
-    {
-        $app     = $this->createStackedApp();
-        $request = $this->createValidPreflightRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Access-Control-Allow-Origin'));
-        $this->assertEquals('localhost', $response->headers->get('Access-Control-Allow-Origin'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_403_on_valid_preflight_request_with_origin_not_allowed()
-    {
-        $app     = $this->createStackedApp(array('allowedOrigins' => array('notlocalhost')));
-        $request = $this->createValidPreflightRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertEquals(403, $response->getStatusCode());
-    }
-
-    /**
-     * @test
-     */
-    public function it_does_not_modify_request_with_origin_not_allowed()
-    {
-        $passedOptions = array(
-          'allowedOrigins' => array('notlocalhost'),
-        );
-
-        $service  = new CorsService($passedOptions);
-        $request  = $this->createValidActualRequest();
-        $response = new Response();
-        $service->addActualRequestHeaders($response, $request);
-
-        $this->assertEquals($response, new Response());
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_405_on_valid_preflight_request_with_method_not_allowed()
-    {
-        $app     = $this->createStackedApp(array('allowedMethods' => array('put')));
-        $request = $this->createValidPreflightRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertEquals(405, $response->getStatusCode());
-    }
-
-    /**
-     * @test
-     */
-    public function it_allow_methods_on_valid_preflight_request()
-    {
-        $app     = $this->createStackedApp(array('allowedMethods' => array('get', 'put')));
-        $request = $this->createValidPreflightRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Access-Control-Allow-Methods'));
-        // it will uppercase the methods
-        $this->assertEquals('GET, PUT', $response->headers->get('Access-Control-Allow-Methods'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_valid_preflight_request_with_allow_methods_all()
-    {
-        $app     = $this->createStackedApp(array('allowedMethods' => array('*')));
-        $request = $this->createValidPreflightRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Access-Control-Allow-Methods'));
-        // it will return the Access-Control-Request-Method pass in the request
-        $this->assertEquals('GET', $response->headers->get('Access-Control-Allow-Methods'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_403_on_valid_preflight_request_with_one_of_the_requested_headers_not_allowed()
-    {
-        $app     = $this->createStackedApp();
-        $request = $this->createValidPreflightRequest();
-        $request->headers->set('Access-Control-Request-Headers', 'x-not-allowed-header');
-
-        $response = $app->handle($request);
-
-        $this->assertEquals(403, $response->getStatusCode());
-    }
-
-    /**
-     * @test
-     */
-    public function it_returns_ok_on_valid_preflight_request_with_requested_headers_allowed()
-    {
-        $app            = $this->createStackedApp();
-        $requestHeaders = 'X-Allowed-Header, x-other-allowed-header';
-        $request        = $this->createValidPreflightRequest();
-        $request->headers->set('Access-Control-Request-Headers', $requestHeaders);
-
-        $response = $app->handle($request);
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $this->assertTrue($response->headers->has('Access-Control-Allow-Headers'));
-        // the response will have the "allowedHeaders" value passed to Cors rather than the request one
-        $this->assertEquals('x-allowed-header, x-other-allowed-header', $response->headers->get('Access-Control-Allow-Headers'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_sets_allow_credentials_header_when_flag_is_set_on_valid_preflight_request()
-    {
-        $app     = $this->createStackedApp(array('supportsCredentials' => true));
-        $request = $this->createValidPreflightRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Access-Control-Allow-Credentials'));
-        $this->assertEquals('true', $response->headers->get('Access-Control-Allow-Credentials'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_does_not_set_allow_credentials_header_when_flag_is_not_set_on_valid_preflight_request()
-    {
-        $app     = $this->createStackedApp();
-        $request = $this->createValidPreflightRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertFalse($response->headers->has('Access-Control-Allow-Credentials'));
-    }
-
-    /**
-     * @test
-     */
-    public function it_sets_max_age_when_set()
-    {
-        $app     = $this->createStackedApp(array('maxAge' => 42));
-        $request = $this->createValidPreflightRequest();
-
-        $response = $app->handle($request);
-
-        $this->assertTrue($response->headers->has('Access-Control-Max-Age'));
-        $this->assertEquals(42, $response->headers->get('Access-Control-Max-Age'));
-    }
-
-    private function createValidActualRequest()
-    {
-        $request  = new Request();
-        $request->headers->set('Origin', 'localhost');
-
-        return $request;
-    }
-
-    private function createValidPreflightRequest()
-    {
-        $request  = new Request();
-        $request->headers->set('Origin', 'localhost');
-        $request->headers->set('Access-Control-Request-Method', 'get');
-        $request->setMethod('OPTIONS');
-
-        return $request;
-    }
-
-    private function createStackedApp(array $options = array(), array $responseHeaders = array())
-    {
-        $passedOptions = array_merge(array(
-                'allowedHeaders'      => array('x-allowed-header', 'x-other-allowed-header'),
-                'allowedMethods'      => array('delete', 'get', 'post', 'put'),
-                'allowedOrigins'      => array('localhost'),
-                'exposedHeaders'      => false,
-                'maxAge'              => false,
-                'supportsCredentials' => false,
-            ),
-            $options
-        );
-
-        return new Cors(new MockApp($responseHeaders), $passedOptions);
-    }
-}
-
-class MockApp implements HttpKernelInterface
-{
-    private $responseHeaders;
-
-    public function __construct(array $responseHeaders)
-    {
-        $this->responseHeaders = $responseHeaders;
-    }
-
-    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
-    {
-        $response = new Response();
-
-        $response->headers->add($this->responseHeaders);
-
-        return $response;
-    }
-}
diff --git a/web/vendor/asm89/stack-cors/test/bootstrap.php b/web/vendor/asm89/stack-cors/test/bootstrap.php
deleted file mode 100644
index deb617fb8..000000000
--- a/web/vendor/asm89/stack-cors/test/bootstrap.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if (file_exists($file = __DIR__.'/../vendor/autoload.php')) {
-    $loader = require_once $file;
-    $loader->add('Asm89\Stack', __DIR__);
-    $loader->add('Asm89\Stack', __DIR__ . '/../src');
-} else {
-    throw new RuntimeException('Install dependencies to run test suite.');
-}
-
diff --git a/web/vendor/composer/autoload_classmap.php b/web/vendor/composer/autoload_classmap.php
index a1dc5016a..53ecc23ff 100644
--- a/web/vendor/composer/autoload_classmap.php
+++ b/web/vendor/composer/autoload_classmap.php
@@ -449,13 +449,5 @@ return array(
     'SebastianBergmann\\RecursionContext\\InvalidArgumentException' => $vendorDir . '/sebastian/recursion-context/src/InvalidArgumentException.php',
     'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
     'SessionHandlerInterface' => $vendorDir . '/symfony/polyfill-php54/Resources/stubs/SessionHandlerInterface.php',
-    'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/FileBag.php',
-    'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/HeaderBag.php',
-    'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/ParameterBag.php',
-    'Symfony\\Component\\HttpFoundation\\Request' => $vendorDir . '/symfony/http-foundation/Request.php',
-    'Symfony\\Component\\HttpFoundation\\ServerBag' => $vendorDir . '/symfony/http-foundation/ServerBag.php',
-    'Symfony\\Component\\HttpKernel\\HttpKernel' => $vendorDir . '/symfony/http-kernel/HttpKernel.php',
-    'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => $vendorDir . '/symfony/http-kernel/HttpKernelInterface.php',
-    'Symfony\\Component\\HttpKernel\\TerminableInterface' => $vendorDir . '/symfony/http-kernel/TerminableInterface.php',
     'Text_Template' => $vendorDir . '/phpunit/php-text-template/src/Template.php',
 );
diff --git a/web/vendor/composer/autoload_files.php b/web/vendor/composer/autoload_files.php
index 38c57fb76..b939e245b 100644
--- a/web/vendor/composer/autoload_files.php
+++ b/web/vendor/composer/autoload_files.php
@@ -11,9 +11,9 @@ return array(
     'edc6464955a37aa4d5fbf39d40fb6ee7' => $vendorDir . '/symfony/polyfill-php55/bootstrap.php',
     '3e2471375464aac821502deb0ac64275' => $vendorDir . '/symfony/polyfill-php54/bootstrap.php',
     '32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
-    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
     'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
+    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
     '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
-    '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
     'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
+    '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
 );
diff --git a/web/vendor/composer/autoload_namespaces.php b/web/vendor/composer/autoload_namespaces.php
index 5df820a47..89bcd7b25 100644
--- a/web/vendor/composer/autoload_namespaces.php
+++ b/web/vendor/composer/autoload_namespaces.php
@@ -10,16 +10,12 @@ return array(
     'org\\bovigo\\vfs\\' => array($vendorDir . '/mikey179/vfsStream/src/main/php'),
     'Twig_' => array($vendorDir . '/twig/twig/lib'),
     'Stack' => array($vendorDir . '/stack/builder/src'),
-    'Psr\\Log\\' => array($vendorDir . '/psr/log'),
     'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src'),
     'Egulias\\' => array($vendorDir . '/egulias/email-validator/src'),
     'EasyRdf_' => array($vendorDir . '/easyrdf/easyrdf/lib'),
     'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
     'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib'),
     'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'),
-    'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib'),
     'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib'),
-    'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib'),
     'Composer\\Installers\\' => array($vendorDir . '/composer/installers/src'),
-    'Asm89\\Stack' => array($vendorDir . '/asm89/stack-cors/src'),
 );
diff --git a/web/vendor/composer/autoload_psr4.php b/web/vendor/composer/autoload_psr4.php
index 414b44143..bff35119b 100644
--- a/web/vendor/composer/autoload_psr4.php
+++ b/web/vendor/composer/autoload_psr4.php
@@ -9,7 +9,6 @@ return array(
     'Zumba\\Mink\\Driver\\' => array($vendorDir . '/jcalderonzumba/mink-phantomjs-driver/src'),
     'Zumba\\GastonJS\\' => array($vendorDir . '/jcalderonzumba/gastonjs/src'),
     'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib/src'),
-    'Zend\\Hydrator\\' => array($vendorDir . '/zendframework/zend-hydrator/src'),
     'Zend\\Feed\\' => array($vendorDir . '/zendframework/zend-feed/src'),
     'Zend\\Escaper\\' => array($vendorDir . '/zendframework/zend-escaper/src'),
     'Zend\\Diactoros\\' => array($vendorDir . '/zendframework/zend-diactoros/src'),
@@ -36,19 +35,23 @@ return array(
     'Symfony\\Component\\BrowserKit\\' => array($vendorDir . '/symfony/browser-kit'),
     'Symfony\\Cmf\\Component\\Routing\\' => array($vendorDir . '/symfony-cmf/routing'),
     'Symfony\\Bridge\\PsrHttpMessage\\' => array($vendorDir . '/symfony/psr-http-message-bridge'),
+    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
     'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),
     'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
     'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
     'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
     'Goutte\\' => array($vendorDir . '/fabpot/goutte/Goutte'),
-    'Drupal\\Driver\\' => array($baseDir . '/drivers/lib/Drupal/Driver', $baseDir . '/drivers/lib/Drupal/Driver'),
+    'Drupal\\Driver\\' => array($baseDir . '/drivers/lib/Drupal/Driver'),
     'Drupal\\Core\\Composer\\' => array($baseDir . '/core/lib/Drupal/Core/Composer'),
-    'Drupal\\Core\\' => array($baseDir . '/core/lib/Drupal/Core', $baseDir . '/core/lib/Drupal/Core'),
-    'Drupal\\Component\\' => array($baseDir . '/core/lib/Drupal/Component', $baseDir . '/core/lib/Drupal/Component'),
+    'Drupal\\Core\\' => array($baseDir . '/core/lib/Drupal/Core'),
+    'Drupal\\Component\\' => array($baseDir . '/core/lib/Drupal/Component'),
     'DrupalComposer\\DrupalScaffold\\' => array($vendorDir . '/drupal-composer/drupal-scaffold/src'),
     'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
+    'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache'),
+    'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib/Doctrine/Common'),
     'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),
     'Behat\\Mink\\Driver\\' => array($vendorDir . '/behat/mink-browserkit-driver/src', $vendorDir . '/behat/mink-goutte-driver/src'),
     'Behat\\Mink\\' => array($vendorDir . '/behat/mink/src'),
+    'Asm89\\Stack\\' => array($vendorDir . '/asm89/stack-cors/src/Asm89/Stack'),
 );
diff --git a/web/vendor/composer/autoload_static.php b/web/vendor/composer/autoload_static.php
index 386576769..0aa37ce7d 100644
--- a/web/vendor/composer/autoload_static.php
+++ b/web/vendor/composer/autoload_static.php
@@ -12,11 +12,11 @@ class ComposerStaticInitDrupal8
         'edc6464955a37aa4d5fbf39d40fb6ee7' => __DIR__ . '/..' . '/symfony/polyfill-php55/bootstrap.php',
         '3e2471375464aac821502deb0ac64275' => __DIR__ . '/..' . '/symfony/polyfill-php54/bootstrap.php',
         '32dcc8afd4335739640db7d200c1971d' => __DIR__ . '/..' . '/symfony/polyfill-apcu/bootstrap.php',
-        'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
         'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
+        'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
         '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
-        '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
         'def43f6c87e4f8dfd0c9e1b1bab14fe8' => __DIR__ . '/..' . '/symfony/polyfill-iconv/bootstrap.php',
+        '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
     );
 
     public static $prefixLengthsPsr4 = array (
@@ -25,7 +25,6 @@ class ComposerStaticInitDrupal8
             'Zumba\\Mink\\Driver\\' => 18,
             'Zumba\\GastonJS\\' => 15,
             'Zend\\Stdlib\\' => 12,
-            'Zend\\Hydrator\\' => 14,
             'Zend\\Feed\\' => 10,
             'Zend\\Escaper\\' => 13,
             'Zend\\Diactoros\\' => 15,
@@ -61,6 +60,7 @@ class ComposerStaticInitDrupal8
         ),
         'P' => 
         array (
+            'Psr\\Log\\' => 8,
             'Psr\\Http\\Message\\' => 17,
         ),
         'M' => 
@@ -82,6 +82,8 @@ class ComposerStaticInitDrupal8
             'Drupal\\Component\\' => 17,
             'DrupalComposer\\DrupalScaffold\\' => 30,
             'Doctrine\\Instantiator\\' => 22,
+            'Doctrine\\Common\\Cache\\' => 22,
+            'Doctrine\\Common\\' => 16,
         ),
         'C' => 
         array (
@@ -92,6 +94,10 @@ class ComposerStaticInitDrupal8
             'Behat\\Mink\\Driver\\' => 18,
             'Behat\\Mink\\' => 11,
         ),
+        'A' => 
+        array (
+            'Asm89\\Stack\\' => 12,
+        ),
     );
 
     public static $prefixDirsPsr4 = array (
@@ -107,10 +113,6 @@ class ComposerStaticInitDrupal8
         array (
             0 => __DIR__ . '/..' . '/zendframework/zend-stdlib/src',
         ),
-        'Zend\\Hydrator\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/zendframework/zend-hydrator/src',
-        ),
         'Zend\\Feed\\' => 
         array (
             0 => __DIR__ . '/..' . '/zendframework/zend-feed/src',
@@ -215,6 +217,10 @@ class ComposerStaticInitDrupal8
         array (
             0 => __DIR__ . '/..' . '/symfony/psr-http-message-bridge',
         ),
+        'Psr\\Log\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
+        ),
         'Psr\\Http\\Message\\' => 
         array (
             0 => __DIR__ . '/..' . '/psr/http-message/src',
@@ -242,7 +248,6 @@ class ComposerStaticInitDrupal8
         'Drupal\\Driver\\' => 
         array (
             0 => __DIR__ . '/../..' . '/drivers/lib/Drupal/Driver',
-            1 => __DIR__ . '/../..' . '/drivers/lib/Drupal/Driver',
         ),
         'Drupal\\Core\\Composer\\' => 
         array (
@@ -251,12 +256,10 @@ class ComposerStaticInitDrupal8
         'Drupal\\Core\\' => 
         array (
             0 => __DIR__ . '/../..' . '/core/lib/Drupal/Core',
-            1 => __DIR__ . '/../..' . '/core/lib/Drupal/Core',
         ),
         'Drupal\\Component\\' => 
         array (
             0 => __DIR__ . '/../..' . '/core/lib/Drupal/Component',
-            1 => __DIR__ . '/../..' . '/core/lib/Drupal/Component',
         ),
         'DrupalComposer\\DrupalScaffold\\' => 
         array (
@@ -266,6 +269,14 @@ class ComposerStaticInitDrupal8
         array (
             0 => __DIR__ . '/..' . '/doctrine/instantiator/src/Doctrine/Instantiator',
         ),
+        'Doctrine\\Common\\Cache\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache',
+        ),
+        'Doctrine\\Common\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common',
+        ),
         'Composer\\Semver\\' => 
         array (
             0 => __DIR__ . '/..' . '/composer/semver/src',
@@ -279,6 +290,10 @@ class ComposerStaticInitDrupal8
         array (
             0 => __DIR__ . '/..' . '/behat/mink/src',
         ),
+        'Asm89\\Stack\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/asm89/stack-cors/src/Asm89/Stack',
+        ),
     );
 
     public static $prefixesPsr0 = array (
@@ -312,10 +327,6 @@ class ComposerStaticInitDrupal8
         ),
         'P' => 
         array (
-            'Psr\\Log\\' => 
-            array (
-                0 => __DIR__ . '/..' . '/psr/log',
-            ),
             'Prophecy\\' => 
             array (
                 0 => __DIR__ . '/..' . '/phpspec/prophecy/src',
@@ -346,18 +357,10 @@ class ComposerStaticInitDrupal8
             array (
                 0 => __DIR__ . '/..' . '/doctrine/collections/lib',
             ),
-            'Doctrine\\Common\\Cache\\' => 
-            array (
-                0 => __DIR__ . '/..' . '/doctrine/cache/lib',
-            ),
             'Doctrine\\Common\\Annotations\\' => 
             array (
                 0 => __DIR__ . '/..' . '/doctrine/annotations/lib',
             ),
-            'Doctrine\\Common\\' => 
-            array (
-                0 => __DIR__ . '/..' . '/doctrine/common/lib',
-            ),
         ),
         'C' => 
         array (
@@ -366,13 +369,6 @@ class ComposerStaticInitDrupal8
                 0 => __DIR__ . '/..' . '/composer/installers/src',
             ),
         ),
-        'A' => 
-        array (
-            'Asm89\\Stack' => 
-            array (
-                0 => __DIR__ . '/..' . '/asm89/stack-cors/src',
-            ),
-        ),
     );
 
     public static $classMap = array (
@@ -819,14 +815,6 @@ class ComposerStaticInitDrupal8
         'SebastianBergmann\\RecursionContext\\InvalidArgumentException' => __DIR__ . '/..' . '/sebastian/recursion-context/src/InvalidArgumentException.php',
         'SebastianBergmann\\Version' => __DIR__ . '/..' . '/sebastian/version/src/Version.php',
         'SessionHandlerInterface' => __DIR__ . '/..' . '/symfony/polyfill-php54/Resources/stubs/SessionHandlerInterface.php',
-        'Symfony\\Component\\HttpFoundation\\FileBag' => __DIR__ . '/..' . '/symfony/http-foundation/FileBag.php',
-        'Symfony\\Component\\HttpFoundation\\HeaderBag' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderBag.php',
-        'Symfony\\Component\\HttpFoundation\\ParameterBag' => __DIR__ . '/..' . '/symfony/http-foundation/ParameterBag.php',
-        'Symfony\\Component\\HttpFoundation\\Request' => __DIR__ . '/..' . '/symfony/http-foundation/Request.php',
-        'Symfony\\Component\\HttpFoundation\\ServerBag' => __DIR__ . '/..' . '/symfony/http-foundation/ServerBag.php',
-        'Symfony\\Component\\HttpKernel\\HttpKernel' => __DIR__ . '/..' . '/symfony/http-kernel/HttpKernel.php',
-        'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => __DIR__ . '/..' . '/symfony/http-kernel/HttpKernelInterface.php',
-        'Symfony\\Component\\HttpKernel\\TerminableInterface' => __DIR__ . '/..' . '/symfony/http-kernel/TerminableInterface.php',
         'Text_Template' => __DIR__ . '/..' . '/phpunit/php-text-template/src/Template.php',
     );
 
diff --git a/web/vendor/composer/installed.json b/web/vendor/composer/installed.json
index 9fb5e4cee..d9034186b 100644
--- a/web/vendor/composer/installed.json
+++ b/web/vendor/composer/installed.json
@@ -370,416 +370,6 @@
             "shim"
         ]
     },
-    {
-        "name": "symfony/http-foundation",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/http-foundation.git",
-            "reference": "464cdde6757a40701d758112cc7ff2c6adf6e82f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/http-foundation/zipball/464cdde6757a40701d758112cc7ff2c6adf6e82f",
-            "reference": "464cdde6757a40701d758112cc7ff2c6adf6e82f",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "symfony/polyfill-mbstring": "~1.1",
-            "symfony/polyfill-php54": "~1.0",
-            "symfony/polyfill-php55": "~1.0"
-        },
-        "require-dev": {
-            "symfony/expression-language": "~2.4|~3.0.0"
-        },
-        "time": "2017-01-08T20:43:03+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\HttpFoundation\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony HttpFoundation Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/event-dispatcher",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/event-dispatcher.git",
-            "reference": "74877977f90fb9c3e46378d5764217c55f32df34"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/74877977f90fb9c3e46378d5764217c55f32df34",
-            "reference": "74877977f90fb9c3e46378d5764217c55f32df34",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "require-dev": {
-            "psr/log": "~1.0",
-            "symfony/config": "~2.0,>=2.0.5|~3.0.0",
-            "symfony/dependency-injection": "~2.6|~3.0.0",
-            "symfony/expression-language": "~2.6|~3.0.0",
-            "symfony/stopwatch": "~2.3|~3.0.0"
-        },
-        "suggest": {
-            "symfony/dependency-injection": "",
-            "symfony/http-kernel": ""
-        },
-        "time": "2017-01-02T20:30:24+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\EventDispatcher\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony EventDispatcher Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "psr/log",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/log.git",
-            "reference": "1.0.0"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/1.0.0",
-            "reference": "1.0.0",
-            "shasum": ""
-        },
-        "time": "2012-12-21T11:40:51+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Psr\\Log\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for logging libraries",
-        "keywords": [
-            "log",
-            "psr",
-            "psr-3"
-        ]
-    },
-    {
-        "name": "symfony/debug",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/debug.git",
-            "reference": "567681e2c4e5431704e884e4be25a95fd900770f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/debug/zipball/567681e2c4e5431704e884e4be25a95fd900770f",
-            "reference": "567681e2c4e5431704e884e4be25a95fd900770f",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "psr/log": "~1.0"
-        },
-        "conflict": {
-            "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-        },
-        "require-dev": {
-            "symfony/class-loader": "~2.2|~3.0.0",
-            "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0"
-        },
-        "time": "2017-01-02T20:30:24+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Debug\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Debug Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/http-kernel",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/http-kernel.git",
-            "reference": "1097eb4ce0a7bdcd030f110c123682fed89a137c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1097eb4ce0a7bdcd030f110c123682fed89a137c",
-            "reference": "1097eb4ce0a7bdcd030f110c123682fed89a137c",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "psr/log": "~1.0",
-            "symfony/debug": "~2.6,>=2.6.2",
-            "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0",
-            "symfony/http-foundation": "~2.7.20|~2.8.13|~3.1.6"
-        },
-        "conflict": {
-            "symfony/config": "<2.7"
-        },
-        "require-dev": {
-            "symfony/browser-kit": "~2.3|~3.0.0",
-            "symfony/class-loader": "~2.1|~3.0.0",
-            "symfony/config": "~2.8",
-            "symfony/console": "~2.3|~3.0.0",
-            "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
-            "symfony/dependency-injection": "~2.8|~3.0.0",
-            "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
-            "symfony/expression-language": "~2.4|~3.0.0",
-            "symfony/finder": "~2.0,>=2.0.5|~3.0.0",
-            "symfony/process": "~2.0,>=2.0.5|~3.0.0",
-            "symfony/routing": "~2.8|~3.0.0",
-            "symfony/stopwatch": "~2.3|~3.0.0",
-            "symfony/templating": "~2.2|~3.0.0",
-            "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
-            "symfony/var-dumper": "~2.6|~3.0.0"
-        },
-        "suggest": {
-            "symfony/browser-kit": "",
-            "symfony/class-loader": "",
-            "symfony/config": "",
-            "symfony/console": "",
-            "symfony/dependency-injection": "",
-            "symfony/finder": "",
-            "symfony/var-dumper": ""
-        },
-        "time": "2017-01-12T20:27:24+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\HttpKernel\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony HttpKernel Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "asm89/stack-cors",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/asm89/stack-cors.git",
-            "reference": "3ae8ef219bb4c9a6caf857421719aa07fa7776cc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/asm89/stack-cors/zipball/3ae8ef219bb4c9a6caf857421719aa07fa7776cc",
-            "reference": "3ae8ef219bb4c9a6caf857421719aa07fa7776cc",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2",
-            "symfony/http-foundation": "~2.1|~3.0",
-            "symfony/http-kernel": "~2.1|~3.0"
-        },
-        "time": "2016-08-01T12:05:04+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Asm89\\Stack": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Alexander",
-                "email": "iam.asm89@gmail.com"
-            }
-        ],
-        "description": "Cross-origin resource sharing library and stack middleware",
-        "homepage": "https://github.com/asm89/stack-cors",
-        "keywords": [
-            "cors",
-            "stack"
-        ]
-    },
-    {
-        "name": "composer/semver",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/composer/semver.git",
-            "reference": "d0e1ccc6d44ab318b758d709e19176037da6b1ba"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/composer/semver/zipball/d0e1ccc6d44ab318b758d709e19176037da6b1ba",
-            "reference": "d0e1ccc6d44ab318b758d709e19176037da6b1ba",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.5",
-            "phpunit/phpunit-mock-objects": "~2.3"
-        },
-        "time": "2015-09-21T09:42:36+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "0.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Composer\\Semver\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Rob Bast",
-                "email": "rob.bast@gmail.com"
-            },
-            {
-                "name": "Nils Adermann",
-                "email": "naderman@naderman.de",
-                "homepage": "http://www.naderman.de"
-            },
-            {
-                "name": "Jordi Boggiano",
-                "email": "j.boggiano@seld.be",
-                "homepage": "http://seld.be"
-            }
-        ],
-        "description": "Semver library that offers utilities, version constraint parsing and validation.",
-        "keywords": [
-            "semantic",
-            "semver",
-            "validation",
-            "versioning"
-        ]
-    },
     {
         "name": "doctrine/lexer",
         "version": "v1.0.1",
@@ -836,215 +426,6 @@
             "parser"
         ]
     },
-    {
-        "name": "doctrine/inflector",
-        "version": "v1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/inflector.git",
-            "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/inflector/zipball/0bcb2e79d8571787f18b7eb036ed3d004908e604",
-            "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "4.*"
-        },
-        "time": "2014-12-20T21:24:13+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\Inflector\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com"
-            },
-            {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com"
-            }
-        ],
-        "description": "Common String Manipulations with regard to casing and singular/plural rules.",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "inflection",
-            "pluralize",
-            "singularize",
-            "string"
-        ]
-    },
-    {
-        "name": "doctrine/collections",
-        "version": "v1.3.0",
-        "version_normalized": "1.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/collections.git",
-            "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
-            "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2015-04-14T22:21:58+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\Collections\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com"
-            },
-            {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com"
-            }
-        ],
-        "description": "Collections Abstraction library",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "array",
-            "collections",
-            "iterator"
-        ]
-    },
-    {
-        "name": "doctrine/cache",
-        "version": "v1.4.2",
-        "version_normalized": "1.4.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/cache.git",
-            "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca",
-            "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "conflict": {
-            "doctrine/common": ">2.2,<2.4"
-        },
-        "require-dev": {
-            "phpunit/phpunit": ">=3.7",
-            "predis/predis": "~1.0",
-            "satooshi/php-coveralls": "~0.6"
-        },
-        "time": "2015-08-31T12:36:41+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.5.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\Cache\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com"
-            },
-            {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com"
-            }
-        ],
-        "description": "Caching library offering an object-oriented API for many cache backends",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "cache",
-            "caching"
-        ]
-    },
     {
         "name": "doctrine/annotations",
         "version": "v1.2.7",
@@ -1115,81 +496,6 @@
             "parser"
         ]
     },
-    {
-        "name": "doctrine/common",
-        "version": "v2.5.1",
-        "version_normalized": "2.5.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/common.git",
-            "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9",
-            "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9",
-            "shasum": ""
-        },
-        "require": {
-            "doctrine/annotations": "1.*",
-            "doctrine/cache": "1.*",
-            "doctrine/collections": "1.*",
-            "doctrine/inflector": "1.*",
-            "doctrine/lexer": "1.*",
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~3.7"
-        },
-        "time": "2015-08-31T13:00:22+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.6.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com"
-            },
-            {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com"
-            }
-        ],
-        "description": "Common Library for Doctrine projects",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "annotations",
-            "collections",
-            "eventmanager",
-            "persistence",
-            "spl"
-        ]
-    },
     {
         "name": "easyrdf/easyrdf",
         "version": "0.9.1",
@@ -1254,342 +560,6 @@
             "sparql"
         ]
     },
-    {
-        "name": "egulias/email-validator",
-        "version": "1.2.9",
-        "version_normalized": "1.2.9.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/egulias/EmailValidator.git",
-            "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/af864423f50ea59f96c87bb1eae147a70bcf67a1",
-            "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1",
-            "shasum": ""
-        },
-        "require": {
-            "doctrine/lexer": "~1.0,>=1.0.1",
-            "php": ">= 5.3.3"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.4",
-            "satooshi/php-coveralls": "dev-master"
-        },
-        "time": "2015-06-22T21:07:51+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Egulias\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Eduardo Gulias Davis"
-            }
-        ],
-        "description": "A library for validating emails",
-        "homepage": "https://github.com/egulias/EmailValidator",
-        "keywords": [
-            "email",
-            "emailvalidation",
-            "emailvalidator",
-            "validation",
-            "validator"
-        ]
-    },
-    {
-        "name": "guzzlehttp/promises",
-        "version": "1.2.0",
-        "version_normalized": "1.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/promises.git",
-            "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579",
-            "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2016-05-18T16:56:05+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Promise\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Guzzle promises library",
-        "keywords": [
-            "promise"
-        ]
-    },
-    {
-        "name": "psr/http-message",
-        "version": "1.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-message.git",
-            "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
-            "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2015-05-04T20:22:00+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Message\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP messages",
-        "keywords": [
-            "http",
-            "http-message",
-            "psr",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "guzzlehttp/psr7",
-        "version": "1.3.1",
-        "version_normalized": "1.3.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/psr7.git",
-            "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
-            "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0",
-            "psr/http-message": "~1.0"
-        },
-        "provide": {
-            "psr/http-message-implementation": "1.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2016-06-24T23:00:38+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.4-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Psr7\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "PSR-7 message implementation",
-        "keywords": [
-            "http",
-            "message",
-            "stream",
-            "uri"
-        ]
-    },
-    {
-        "name": "masterminds/html5",
-        "version": "2.2.1",
-        "version_normalized": "2.2.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/Masterminds/html5-php.git",
-            "reference": "170aa5cb35b29fccafbf5ea63487c013f396fdc9"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/170aa5cb35b29fccafbf5ea63487c013f396fdc9",
-            "reference": "170aa5cb35b29fccafbf5ea63487c013f396fdc9",
-            "shasum": ""
-        },
-        "require": {
-            "ext-libxml": "*",
-            "php": ">=5.3.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "4.*",
-            "sami/sami": "~2.0",
-            "satooshi/php-coveralls": "1.0.*"
-        },
-        "time": "2016-05-10T14:11:45+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Masterminds\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Matt Butcher",
-                "email": "technosophos@gmail.com"
-            },
-            {
-                "name": "Asmir Mustafic",
-                "email": "goetas@gmail.com"
-            },
-            {
-                "name": "Matt Farina",
-                "email": "matt@mattfarina.com"
-            }
-        ],
-        "description": "An HTML5 parser and serializer.",
-        "homepage": "http://masterminds.github.io/html5-php",
-        "keywords": [
-            "HTML5",
-            "dom",
-            "html",
-            "parser",
-            "querypath",
-            "serializer",
-            "xml"
-        ]
-    },
-    {
-        "name": "paragonie/random_compat",
-        "version": "1.1.1",
-        "version_normalized": "1.1.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/paragonie/random_compat.git",
-            "reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a208865a5aeffc2dbbef2a5b3409887272d93f32",
-            "reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.2.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "4.*|5.*"
-        },
-        "suggest": {
-            "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-        },
-        "time": "2015-12-01T02:52:15+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "lib/random.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Paragon Initiative Enterprises",
-                "email": "security@paragonie.com",
-                "homepage": "https://paragonie.com"
-            }
-        ],
-        "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-        "keywords": [
-            "csprng",
-            "pseudorandom",
-            "random"
-        ]
-    },
     {
         "name": "stack/builder",
         "version": "v1.0.4",
@@ -1641,83 +611,6 @@
             "stack"
         ]
     },
-    {
-        "name": "symfony/routing",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/routing.git",
-            "reference": "2a7e3e02bbfb0a4f722e6a3154489e4ac8b3a97f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/routing/zipball/2a7e3e02bbfb0a4f722e6a3154489e4ac8b3a97f",
-            "reference": "2a7e3e02bbfb0a4f722e6a3154489e4ac8b3a97f",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "conflict": {
-            "symfony/config": "<2.7"
-        },
-        "require-dev": {
-            "doctrine/annotations": "~1.0",
-            "doctrine/common": "~2.2",
-            "psr/log": "~1.0",
-            "symfony/config": "~2.7|~3.0.0",
-            "symfony/expression-language": "~2.4|~3.0.0",
-            "symfony/http-foundation": "~2.3|~3.0.0",
-            "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
-        },
-        "suggest": {
-            "doctrine/annotations": "For using the annotation loader",
-            "symfony/config": "For using the all-in-one router or any loader",
-            "symfony/dependency-injection": "For loading routes from a service",
-            "symfony/expression-language": "For using expression matching",
-            "symfony/http-foundation": "For using a Symfony Request object",
-            "symfony/yaml": "For using the YAML loader"
-        },
-        "time": "2017-01-02T20:30:24+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Routing\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Routing Component",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "router",
-            "routing",
-            "uri",
-            "url"
-        ]
-    },
     {
         "name": "symfony-cmf/routing",
         "version": "1.4.0",
@@ -1834,189 +727,6 @@
             "shim"
         ]
     },
-    {
-        "name": "symfony/class-loader",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/class-loader.git",
-            "reference": "7c46951128f7169cbece2c303fba4a9eb35cbe68"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/class-loader/zipball/7c46951128f7169cbece2c303fba4a9eb35cbe68",
-            "reference": "7c46951128f7169cbece2c303fba4a9eb35cbe68",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "symfony/polyfill-apcu": "~1.1"
-        },
-        "require-dev": {
-            "symfony/finder": "~2.0,>=2.0.5|~3.0.0"
-        },
-        "time": "2017-01-10T14:03:07+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\ClassLoader\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony ClassLoader Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/console",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/console.git",
-            "reference": "2e18b8903d9c498ba02e1dfa73f64d4894bb6912"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/console/zipball/2e18b8903d9c498ba02e1dfa73f64d4894bb6912",
-            "reference": "2e18b8903d9c498ba02e1dfa73f64d4894bb6912",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "symfony/debug": "~2.7,>=2.7.2|~3.0.0",
-            "symfony/polyfill-mbstring": "~1.0"
-        },
-        "require-dev": {
-            "psr/log": "~1.0",
-            "symfony/event-dispatcher": "~2.1|~3.0.0",
-            "symfony/process": "~2.1|~3.0.0"
-        },
-        "suggest": {
-            "psr/log": "For using the console logger",
-            "symfony/event-dispatcher": "",
-            "symfony/process": ""
-        },
-        "time": "2017-01-08T20:43:03+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Console\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Console Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/dependency-injection",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/dependency-injection.git",
-            "reference": "b75356611675364607d697f314850d9d870a84aa"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b75356611675364607d697f314850d9d870a84aa",
-            "reference": "b75356611675364607d697f314850d9d870a84aa",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "conflict": {
-            "symfony/expression-language": "<2.6"
-        },
-        "require-dev": {
-            "symfony/config": "~2.2|~3.0.0",
-            "symfony/expression-language": "~2.6|~3.0.0",
-            "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.7"
-        },
-        "suggest": {
-            "symfony/config": "",
-            "symfony/expression-language": "For using expressions in service container configuration",
-            "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-            "symfony/yaml": ""
-        },
-        "time": "2017-01-10T14:27:01+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\DependencyInjection\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony DependencyInjection Component",
-        "homepage": "https://symfony.com"
-    },
     {
         "name": "symfony/polyfill-iconv",
         "version": "v1.3.0",
@@ -2078,655 +788,6 @@
             "shim"
         ]
     },
-    {
-        "name": "symfony/process",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/process.git",
-            "reference": "ebb3c2abe0940a703f08e0cbe373f62d97d40231"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/process/zipball/ebb3c2abe0940a703f08e0cbe373f62d97d40231",
-            "reference": "ebb3c2abe0940a703f08e0cbe373f62d97d40231",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "time": "2017-01-02T20:30:24+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Process\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Process Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/psr-http-message-bridge",
-        "version": "v0.2",
-        "version_normalized": "0.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/psr-http-message-bridge.git",
-            "reference": "dc7e308e1dc2898a46776e2221a643cb08315453"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/dc7e308e1dc2898a46776e2221a643cb08315453",
-            "reference": "dc7e308e1dc2898a46776e2221a643cb08315453",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3",
-            "psr/http-message": "~1.0",
-            "symfony/http-foundation": "~2.3|~3.0"
-        },
-        "require-dev": {
-            "symfony/phpunit-bridge": "~2.7|~3.0"
-        },
-        "suggest": {
-            "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
-        },
-        "time": "2015-05-29T17:57:12+00:00",
-        "type": "symfony-bridge",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Bridge\\PsrHttpMessage\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
-            },
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            }
-        ],
-        "description": "PSR HTTP message bridge",
-        "homepage": "http://symfony.com",
-        "keywords": [
-            "http",
-            "http-message",
-            "psr-7"
-        ]
-    },
-    {
-        "name": "symfony/serializer",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/serializer.git",
-            "reference": "3a5337e3daaabb9ada73d60f3271adb6bfa56a1a"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/serializer/zipball/3a5337e3daaabb9ada73d60f3271adb6bfa56a1a",
-            "reference": "3a5337e3daaabb9ada73d60f3271adb6bfa56a1a",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "symfony/polyfill-php55": "~1.0"
-        },
-        "require-dev": {
-            "doctrine/annotations": "~1.0",
-            "doctrine/cache": "~1.0",
-            "symfony/config": "~2.2|~3.0.0",
-            "symfony/property-access": "~2.3|~3.0.0",
-            "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
-        },
-        "suggest": {
-            "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-            "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
-            "symfony/config": "For using the XML mapping loader.",
-            "symfony/property-access": "For using the ObjectNormalizer.",
-            "symfony/yaml": "For using the default YAML mapping loader."
-        },
-        "time": "2017-01-02T20:30:24+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Serializer\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Serializer Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/translation",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/translation.git",
-            "reference": "b4ac4a393f6970cc157fba17be537380de396a86"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/translation/zipball/b4ac4a393f6970cc157fba17be537380de396a86",
-            "reference": "b4ac4a393f6970cc157fba17be537380de396a86",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "symfony/polyfill-mbstring": "~1.0"
-        },
-        "conflict": {
-            "symfony/config": "<2.7"
-        },
-        "require-dev": {
-            "psr/log": "~1.0",
-            "symfony/config": "~2.8",
-            "symfony/intl": "~2.4|~3.0.0",
-            "symfony/yaml": "~2.2|~3.0.0"
-        },
-        "suggest": {
-            "psr/log": "To use logging capability in translator",
-            "symfony/config": "",
-            "symfony/yaml": ""
-        },
-        "time": "2017-01-02T20:30:24+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Translation\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Translation Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/validator",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/validator.git",
-            "reference": "3b1a3188efea75ec7c0419a2568b6e5f82031811"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/validator/zipball/3b1a3188efea75ec7c0419a2568b6e5f82031811",
-            "reference": "3b1a3188efea75ec7c0419a2568b6e5f82031811",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "symfony/polyfill-mbstring": "~1.0",
-            "symfony/translation": "~2.4|~3.0.0"
-        },
-        "require-dev": {
-            "doctrine/annotations": "~1.0",
-            "doctrine/cache": "~1.0",
-            "egulias/email-validator": "~1.2,>=1.2.1",
-            "symfony/config": "~2.2|~3.0.0",
-            "symfony/expression-language": "~2.4|~3.0.0",
-            "symfony/http-foundation": "~2.3|~3.0.0",
-            "symfony/intl": "~2.7.4|~2.8|~3.0.0",
-            "symfony/property-access": "~2.3|~3.0.0",
-            "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
-        },
-        "suggest": {
-            "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-            "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
-            "egulias/email-validator": "Strict (RFC compliant) email validation",
-            "symfony/config": "",
-            "symfony/expression-language": "For using the 2.4 Expression validator",
-            "symfony/http-foundation": "",
-            "symfony/intl": "",
-            "symfony/property-access": "For using the 2.4 Validator API",
-            "symfony/yaml": ""
-        },
-        "time": "2017-01-12T19:24:25+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Validator\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Validator Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "zendframework/zend-diactoros",
-        "version": "1.1.3",
-        "version_normalized": "1.1.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/zendframework/zend-diactoros.git",
-            "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/e2f5c12916c74da384058d0dfbc7fbc0b03d1181",
-            "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4",
-            "psr/http-message": "~1.0"
-        },
-        "provide": {
-            "psr/http-message-implementation": "~1.0.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.6",
-            "squizlabs/php_codesniffer": "^2.3.1"
-        },
-        "time": "2015-08-10T20:04:20+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev",
-                "dev-develop": "1.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zend\\Diactoros\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-2-Clause"
-        ],
-        "description": "PSR HTTP Message implementations",
-        "homepage": "https://github.com/zendframework/zend-diactoros",
-        "keywords": [
-            "http",
-            "psr",
-            "psr-7"
-        ]
-    },
-    {
-        "name": "zendframework/zend-stdlib",
-        "version": "2.7.3",
-        "version_normalized": "2.7.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/zendframework/zend-stdlib.git",
-            "reference": "8ac0c77ff567fcf49b58689ee3bfa7595be102bc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8ac0c77ff567fcf49b58689ee3bfa7595be102bc",
-            "reference": "8ac0c77ff567fcf49b58689ee3bfa7595be102bc",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5",
-            "zendframework/zend-hydrator": "~1.0"
-        },
-        "require-dev": {
-            "athletic/athletic": "~0.1",
-            "fabpot/php-cs-fixer": "1.7.*",
-            "phpunit/phpunit": "~4.0",
-            "zendframework/zend-config": "~2.5",
-            "zendframework/zend-eventmanager": "~2.5",
-            "zendframework/zend-filter": "~2.5",
-            "zendframework/zend-inputfilter": "~2.5",
-            "zendframework/zend-serializer": "~2.5",
-            "zendframework/zend-servicemanager": "~2.5"
-        },
-        "suggest": {
-            "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-            "zendframework/zend-filter": "To support naming strategy hydrator usage",
-            "zendframework/zend-serializer": "Zend\\Serializer component",
-            "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
-        },
-        "time": "2015-09-25T04:06:33+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev",
-                "dev-develop": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zend\\Stdlib\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "homepage": "https://github.com/zendframework/zend-stdlib",
-        "keywords": [
-            "stdlib",
-            "zf2"
-        ]
-    },
-    {
-        "name": "zendframework/zend-hydrator",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/zendframework/zend-hydrator.git",
-            "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/f3ed8b833355140350bbed98d8a7b8b66875903f",
-            "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5",
-            "zendframework/zend-stdlib": "^2.5.1"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0",
-            "squizlabs/php_codesniffer": "^2.0@dev",
-            "zendframework/zend-eventmanager": "^2.5.1",
-            "zendframework/zend-filter": "^2.5.1",
-            "zendframework/zend-inputfilter": "^2.5.1",
-            "zendframework/zend-serializer": "^2.5.1",
-            "zendframework/zend-servicemanager": "^2.5.1"
-        },
-        "suggest": {
-            "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage",
-            "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage",
-            "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy",
-            "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage"
-        },
-        "time": "2015-09-17T14:06:43+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev",
-                "dev-develop": "1.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zend\\Hydrator\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "homepage": "https://github.com/zendframework/zend-hydrator",
-        "keywords": [
-            "hydrator",
-            "zf2"
-        ]
-    },
-    {
-        "name": "zendframework/zend-escaper",
-        "version": "2.5.1",
-        "version_normalized": "2.5.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/zendframework/zend-escaper.git",
-            "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73",
-            "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.23"
-        },
-        "require-dev": {
-            "fabpot/php-cs-fixer": "1.7.*",
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2015-06-03T14:05:37+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.5-dev",
-                "dev-develop": "2.6-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zend\\Escaper\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "homepage": "https://github.com/zendframework/zend-escaper",
-        "keywords": [
-            "escaper",
-            "zf2"
-        ]
-    },
-    {
-        "name": "zendframework/zend-feed",
-        "version": "2.5.2",
-        "version_normalized": "2.5.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/zendframework/zend-feed.git",
-            "reference": "0661345b82b51428619e05d3aadd3de65b57fa54"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0661345b82b51428619e05d3aadd3de65b57fa54",
-            "reference": "0661345b82b51428619e05d3aadd3de65b57fa54",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5",
-            "zendframework/zend-escaper": "~2.5",
-            "zendframework/zend-stdlib": "~2.5"
-        },
-        "require-dev": {
-            "fabpot/php-cs-fixer": "1.7.*",
-            "phpunit/phpunit": "~4.0",
-            "zendframework/zend-cache": "~2.5",
-            "zendframework/zend-db": "~2.5",
-            "zendframework/zend-http": "~2.5",
-            "zendframework/zend-servicemanager": "~2.5",
-            "zendframework/zend-validator": "~2.5"
-        },
-        "suggest": {
-            "zendframework/zend-cache": "Zend\\Cache component",
-            "zendframework/zend-db": "Zend\\Db component",
-            "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
-            "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
-            "zendframework/zend-validator": "Zend\\Validator component"
-        },
-        "time": "2015-08-04T21:39:18+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.5-dev",
-                "dev-develop": "2.6-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zend\\Feed\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "description": "provides functionality for consuming RSS and Atom feeds",
-        "homepage": "https://github.com/zendframework/zend-feed",
-        "keywords": [
-            "feed",
-            "zf2"
-        ]
-    },
-    {
-        "name": "symfony/dom-crawler",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/dom-crawler.git",
-            "reference": "52cc211afa9458c0a54c478010a55f44892c1c02"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/52cc211afa9458c0a54c478010a55f44892c1c02",
-            "reference": "52cc211afa9458c0a54c478010a55f44892c1c02",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "symfony/polyfill-mbstring": "~1.0"
-        },
-        "require-dev": {
-            "symfony/css-selector": "~2.8|~3.0.0"
-        },
-        "suggest": {
-            "symfony/css-selector": ""
-        },
-        "time": "2017-01-02T20:30:24+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\DomCrawler\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony DomCrawler Component",
-        "homepage": "https://symfony.com"
-    },
     {
         "name": "symfony/css-selector",
         "version": "v2.8.16",
@@ -2841,70 +902,6 @@
         "description": "Symfony BrowserKit Component",
         "homepage": "https://symfony.com"
     },
-    {
-        "name": "guzzlehttp/guzzle",
-        "version": "6.2.1",
-        "version_normalized": "6.2.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/guzzle.git",
-            "reference": "3f808fba627f2c5b69e2501217bf31af349c1427"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/3f808fba627f2c5b69e2501217bf31af349c1427",
-            "reference": "3f808fba627f2c5b69e2501217bf31af349c1427",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/promises": "^1.0",
-            "guzzlehttp/psr7": "^1.3.1",
-            "php": ">=5.5"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "phpunit/phpunit": "^4.0",
-            "psr/log": "^1.0"
-        },
-        "time": "2016-07-15T17:22:37+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "6.2-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "src/functions_include.php"
-            ],
-            "psr-4": {
-                "GuzzleHttp\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Guzzle is a PHP HTTP client library",
-        "homepage": "http://guzzlephp.org/",
-        "keywords": [
-            "client",
-            "curl",
-            "framework",
-            "http",
-            "http client",
-            "rest",
-            "web service"
-        ]
-    },
     {
         "name": "fabpot/goutte",
         "version": "v3.1.2",
@@ -3131,69 +1128,6 @@
             "testing"
         ]
     },
-    {
-        "name": "twig/twig",
-        "version": "v1.24.0",
-        "version_normalized": "1.24.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/twigphp/Twig.git",
-            "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
-            "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.2.7"
-        },
-        "require-dev": {
-            "symfony/debug": "~2.7",
-            "symfony/phpunit-bridge": "~2.7"
-        },
-        "time": "2016-01-25T21:22:18+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.24-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Twig_": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com",
-                "homepage": "http://fabien.potencier.org",
-                "role": "Lead Developer"
-            },
-            {
-                "name": "Armin Ronacher",
-                "email": "armin.ronacher@active-4.com",
-                "role": "Project Founder"
-            },
-            {
-                "name": "Twig Team",
-                "homepage": "http://twig.sensiolabs.org/contributors",
-                "role": "Contributors"
-            }
-        ],
-        "description": "Twig, the flexible, fast, and secure template language for PHP",
-        "homepage": "http://twig.sensiolabs.org",
-        "keywords": [
-            "templating"
-        ]
-    },
     {
         "name": "jcalderonzumba/gastonjs",
         "version": "v1.0.2",
@@ -3466,57 +1400,6 @@
             "tokenizer"
         ]
     },
-    {
-        "name": "symfony/yaml",
-        "version": "v2.8.16",
-        "version_normalized": "2.8.16.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/yaml.git",
-            "reference": "dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/yaml/zipball/dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2",
-            "reference": "dbe61fed9cd4a44c5b1d14e5e7b1a8640cfb2bf2",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "time": "2017-01-03T13:49:52+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Yaml\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Yaml Component",
-        "homepage": "https://symfony.com"
-    },
     {
         "name": "sebastian/version",
         "version": "1.0.6",
@@ -4320,185 +2203,6 @@
         ],
         "description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core"
     },
-    {
-        "name": "drupal/core",
-        "version": "8.2.7",
-        "version_normalized": "8.2.7.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/drupal-composer/drupal-core.git",
-            "reference": "5d3fb8a93514f23198ac6848b2679ef1026d2326"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/drupal-composer/drupal-core/zipball/5d3fb8a93514f23198ac6848b2679ef1026d2326",
-            "reference": "5d3fb8a93514f23198ac6848b2679ef1026d2326",
-            "shasum": ""
-        },
-        "require": {
-            "asm89/stack-cors": "~1.0",
-            "composer/semver": "~1.0",
-            "doctrine/annotations": "1.2.*",
-            "doctrine/common": "2.5.*",
-            "easyrdf/easyrdf": "0.9.*",
-            "egulias/email-validator": "1.2.*",
-            "guzzlehttp/guzzle": "^6.2.1",
-            "masterminds/html5": "~2.1",
-            "paragonie/random_compat": "^1|^2",
-            "php": ">=5.5.9",
-            "stack/builder": "1.0.*",
-            "symfony-cmf/routing": "~1.4",
-            "symfony/class-loader": "~2.8",
-            "symfony/console": "~2.8",
-            "symfony/dependency-injection": "~2.8",
-            "symfony/event-dispatcher": "~2.8",
-            "symfony/http-foundation": "~2.8",
-            "symfony/http-kernel": "~2.8",
-            "symfony/polyfill-iconv": "~1.0",
-            "symfony/process": "~2.8",
-            "symfony/psr-http-message-bridge": "v0.2",
-            "symfony/routing": "~2.8",
-            "symfony/serializer": "~2.8",
-            "symfony/translation": "~2.8",
-            "symfony/validator": "~2.8",
-            "symfony/yaml": "~2.8",
-            "twig/twig": "^1.23.1",
-            "zendframework/zend-diactoros": "~1.1",
-            "zendframework/zend-feed": "~2.4"
-        },
-        "replace": {
-            "drupal/action": "self.version",
-            "drupal/aggregator": "self.version",
-            "drupal/automated_cron": "self.version",
-            "drupal/ban": "self.version",
-            "drupal/bartik": "self.version",
-            "drupal/basic_auth": "self.version",
-            "drupal/big_pipe": "self.version",
-            "drupal/block": "self.version",
-            "drupal/block_content": "self.version",
-            "drupal/block_place": "self.version",
-            "drupal/book": "self.version",
-            "drupal/breakpoint": "self.version",
-            "drupal/ckeditor": "self.version",
-            "drupal/classy": "self.version",
-            "drupal/color": "self.version",
-            "drupal/comment": "self.version",
-            "drupal/config": "self.version",
-            "drupal/config_translation": "self.version",
-            "drupal/contact": "self.version",
-            "drupal/content_moderation": "self.version",
-            "drupal/content_translation": "self.version",
-            "drupal/contextual": "self.version",
-            "drupal/core-annotation": "self.version",
-            "drupal/core-assertion": "self.version",
-            "drupal/core-bridge": "self.version",
-            "drupal/core-datetime": "self.version",
-            "drupal/core-dependency-injection": "self.version",
-            "drupal/core-diff": "self.version",
-            "drupal/core-discovery": "self.version",
-            "drupal/core-event-dispatcher": "self.version",
-            "drupal/core-file-cache": "self.version",
-            "drupal/core-filesystem": "self.version",
-            "drupal/core-gettext": "self.version",
-            "drupal/core-graph": "self.version",
-            "drupal/core-http-foundation": "self.version",
-            "drupal/core-php-storage": "self.version",
-            "drupal/core-plugin": "self.version",
-            "drupal/core-proxy-builder": "self.version",
-            "drupal/core-render": "self.version",
-            "drupal/core-serialization": "self.version",
-            "drupal/core-transliteration": "self.version",
-            "drupal/core-utility": "self.version",
-            "drupal/core-uuid": "self.version",
-            "drupal/datetime": "self.version",
-            "drupal/datetime_range": "self.version",
-            "drupal/dblog": "self.version",
-            "drupal/dynamic_page_cache": "self.version",
-            "drupal/editor": "self.version",
-            "drupal/entity_reference": "self.version",
-            "drupal/field": "self.version",
-            "drupal/field_ui": "self.version",
-            "drupal/file": "self.version",
-            "drupal/filter": "self.version",
-            "drupal/forum": "self.version",
-            "drupal/hal": "self.version",
-            "drupal/help": "self.version",
-            "drupal/history": "self.version",
-            "drupal/image": "self.version",
-            "drupal/inline_form_errors": "self.version",
-            "drupal/language": "self.version",
-            "drupal/link": "self.version",
-            "drupal/locale": "self.version",
-            "drupal/menu_link_content": "self.version",
-            "drupal/menu_ui": "self.version",
-            "drupal/migrate": "self.version",
-            "drupal/migrate_drupal": "self.version",
-            "drupal/migrate_drupal_ui": "self.version",
-            "drupal/minimal": "self.version",
-            "drupal/node": "self.version",
-            "drupal/options": "self.version",
-            "drupal/outside_in": "self.version",
-            "drupal/page_cache": "self.version",
-            "drupal/path": "self.version",
-            "drupal/quickedit": "self.version",
-            "drupal/rdf": "self.version",
-            "drupal/responsive_image": "self.version",
-            "drupal/rest": "self.version",
-            "drupal/search": "self.version",
-            "drupal/serialization": "self.version",
-            "drupal/seven": "self.version",
-            "drupal/shortcut": "self.version",
-            "drupal/simpletest": "self.version",
-            "drupal/standard": "self.version",
-            "drupal/stark": "self.version",
-            "drupal/statistics": "self.version",
-            "drupal/syslog": "self.version",
-            "drupal/system": "self.version",
-            "drupal/taxonomy": "self.version",
-            "drupal/telephone": "self.version",
-            "drupal/text": "self.version",
-            "drupal/toolbar": "self.version",
-            "drupal/tour": "self.version",
-            "drupal/tracker": "self.version",
-            "drupal/update": "self.version",
-            "drupal/user": "self.version",
-            "drupal/views": "self.version",
-            "drupal/views_ui": "self.version"
-        },
-        "require-dev": {
-            "behat/mink": "~1.7",
-            "behat/mink-goutte-driver": "~1.2",
-            "jcalderonzumba/gastonjs": "~1.0.2",
-            "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
-            "mikey179/vfsstream": "~1.2",
-            "phpunit/phpunit": ">=4.8.28 <5",
-            "symfony/css-selector": "~2.8"
-        },
-        "time": "2017-03-15T20:19:51+00:00",
-        "type": "drupal-core",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Drupal\\Core\\": "lib/Drupal/Core",
-                "Drupal\\Component\\": "lib/Drupal/Component",
-                "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
-            },
-            "classmap": [
-                "lib/Drupal.php",
-                "lib/Drupal/Component/Utility/Timer.php",
-                "lib/Drupal/Component/Utility/Unicode.php",
-                "lib/Drupal/Core/Database/Database.php",
-                "lib/Drupal/Core/DrupalKernel.php",
-                "lib/Drupal/Core/DrupalKernelInterface.php",
-                "lib/Drupal/Core/Site/Settings.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "GPL-2.0+"
-        ],
-        "description": "Drupal is an open source content management platform powering millions of websites and applications."
-    },
     {
         "name": "phpunit/phpunit",
         "version": "4.8.28",
@@ -4572,5 +2276,2273 @@
             "testing",
             "xunit"
         ]
+    },
+    {
+        "name": "zendframework/zend-stdlib",
+        "version": "3.1.0",
+        "version_normalized": "3.1.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/zendframework/zend-stdlib.git",
+            "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78",
+            "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.6 || ^7.0"
+        },
+        "require-dev": {
+            "athletic/athletic": "~0.1",
+            "phpunit/phpunit": "~4.0",
+            "squizlabs/php_codesniffer": "^2.6.2"
+        },
+        "time": "2016-09-13T14:38:50+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.1-dev",
+                "dev-develop": "3.2-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Zend\\Stdlib\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "homepage": "https://github.com/zendframework/zend-stdlib",
+        "keywords": [
+            "stdlib",
+            "zf2"
+        ]
+    },
+    {
+        "name": "zendframework/zend-escaper",
+        "version": "2.5.2",
+        "version_normalized": "2.5.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/zendframework/zend-escaper.git",
+            "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+            "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.5"
+        },
+        "require-dev": {
+            "fabpot/php-cs-fixer": "1.7.*",
+            "phpunit/phpunit": "~4.0"
+        },
+        "time": "2016-06-30T19:48:38+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.5-dev",
+                "dev-develop": "2.6-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Zend\\Escaper\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "homepage": "https://github.com/zendframework/zend-escaper",
+        "keywords": [
+            "escaper",
+            "zf2"
+        ]
+    },
+    {
+        "name": "zendframework/zend-feed",
+        "version": "2.8.0",
+        "version_normalized": "2.8.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/zendframework/zend-feed.git",
+            "reference": "94579e805dd108683209fe14b3b5d4276de3de6e"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/94579e805dd108683209fe14b3b5d4276de3de6e",
+            "reference": "94579e805dd108683209fe14b3b5d4276de3de6e",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.6 || ^7.0",
+            "zendframework/zend-escaper": "^2.5",
+            "zendframework/zend-stdlib": "^2.7 || ^3.1"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+            "psr/http-message": "^1.0",
+            "zendframework/zend-cache": "^2.6",
+            "zendframework/zend-coding-standard": "~1.0.0",
+            "zendframework/zend-db": "^2.7",
+            "zendframework/zend-http": "^2.5.4",
+            "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+            "zendframework/zend-validator": "^2.6"
+        },
+        "suggest": {
+            "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
+            "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
+            "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
+            "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
+            "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
+            "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries ehen using the Writer subcomponent"
+        },
+        "time": "2017-04-01T15:03:14+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev",
+                "dev-develop": "2.9-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Zend\\Feed\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "description": "provides functionality for consuming RSS and Atom feeds",
+        "homepage": "https://github.com/zendframework/zend-feed",
+        "keywords": [
+            "feed",
+            "zf2"
+        ]
+    },
+    {
+        "name": "psr/http-message",
+        "version": "1.0.1",
+        "version_normalized": "1.0.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/http-message.git",
+            "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+            "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "time": "2016-08-06T14:39:51+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Psr\\Http\\Message\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interface for HTTP messages",
+        "homepage": "https://github.com/php-fig/http-message",
+        "keywords": [
+            "http",
+            "http-message",
+            "psr",
+            "psr-7",
+            "request",
+            "response"
+        ]
+    },
+    {
+        "name": "zendframework/zend-diactoros",
+        "version": "1.4.0",
+        "version_normalized": "1.4.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/zendframework/zend-diactoros.git",
+            "reference": "b03f285a333f51e58c95cce54109a4a9ed691436"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/b03f285a333f51e58c95cce54109a4a9ed691436",
+            "reference": "b03f285a333f51e58c95cce54109a4a9ed691436",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.4 || ^7.0",
+            "psr/http-message": "~1.0"
+        },
+        "provide": {
+            "psr/http-message-implementation": "1.0"
+        },
+        "require-dev": {
+            "ext-dom": "*",
+            "ext-libxml": "*",
+            "phpunit/phpunit": "^4.6 || ^5.5",
+            "zendframework/zend-coding-standard": "~1.0.0"
+        },
+        "time": "2017-04-06T16:18:34+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.4-dev",
+                "dev-develop": "1.5-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Zend\\Diactoros\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-2-Clause"
+        ],
+        "description": "PSR HTTP Message implementations",
+        "homepage": "https://github.com/zendframework/zend-diactoros",
+        "keywords": [
+            "http",
+            "psr",
+            "psr-7"
+        ]
+    },
+    {
+        "name": "twig/twig",
+        "version": "v1.33.0",
+        "version_normalized": "1.33.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/twigphp/Twig.git",
+            "reference": "05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/twigphp/Twig/zipball/05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a",
+            "reference": "05cf49921b13f6f01d3cfdf9018cfa7a8086fd5a",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.2.7"
+        },
+        "require-dev": {
+            "psr/container": "^1.0",
+            "symfony/debug": "~2.7",
+            "symfony/phpunit-bridge": "~3.3@dev"
+        },
+        "time": "2017-03-22T15:40:09+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.33-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Twig_": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com",
+                "homepage": "http://fabien.potencier.org",
+                "role": "Lead Developer"
+            },
+            {
+                "name": "Armin Ronacher",
+                "email": "armin.ronacher@active-4.com",
+                "role": "Project Founder"
+            },
+            {
+                "name": "Twig Team",
+                "homepage": "http://twig.sensiolabs.org/contributors",
+                "role": "Contributors"
+            }
+        ],
+        "description": "Twig, the flexible, fast, and secure template language for PHP",
+        "homepage": "http://twig.sensiolabs.org",
+        "keywords": [
+            "templating"
+        ]
+    },
+    {
+        "name": "symfony/yaml",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/yaml.git",
+            "reference": "286d84891690b0e2515874717e49360d1c98a703"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/yaml/zipball/286d84891690b0e2515874717e49360d1c98a703",
+            "reference": "286d84891690b0e2515874717e49360d1c98a703",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "time": "2017-03-20T09:41:44+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Yaml\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Yaml Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/translation",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/translation.git",
+            "reference": "047e97a64d609778cadfc76e3a09793696bb19f1"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/translation/zipball/047e97a64d609778cadfc76e3a09793696bb19f1",
+            "reference": "047e97a64d609778cadfc76e3a09793696bb19f1",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "symfony/polyfill-mbstring": "~1.0"
+        },
+        "conflict": {
+            "symfony/config": "<2.7"
+        },
+        "require-dev": {
+            "psr/log": "~1.0",
+            "symfony/config": "~2.8",
+            "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
+            "symfony/yaml": "~2.2|~3.0.0"
+        },
+        "suggest": {
+            "psr/log": "To use logging capability in translator",
+            "symfony/config": "",
+            "symfony/yaml": ""
+        },
+        "time": "2017-03-21T21:39:01+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Translation\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Translation Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/validator",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/validator.git",
+            "reference": "43f617ee200af4f4dedbb0782c6c689e06994286"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/validator/zipball/43f617ee200af4f4dedbb0782c6c689e06994286",
+            "reference": "43f617ee200af4f4dedbb0782c6c689e06994286",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "symfony/polyfill-mbstring": "~1.0",
+            "symfony/translation": "~2.4|~3.0.0"
+        },
+        "require-dev": {
+            "doctrine/annotations": "~1.0",
+            "doctrine/cache": "~1.0",
+            "egulias/email-validator": "^1.2.1",
+            "symfony/config": "~2.2|~3.0.0",
+            "symfony/expression-language": "~2.4|~3.0.0",
+            "symfony/http-foundation": "~2.3|~3.0.0",
+            "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
+            "symfony/property-access": "~2.3|~3.0.0",
+            "symfony/yaml": "^2.0.5|~3.0.0"
+        },
+        "suggest": {
+            "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+            "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+            "egulias/email-validator": "Strict (RFC compliant) email validation",
+            "symfony/config": "",
+            "symfony/expression-language": "For using the 2.4 Expression validator",
+            "symfony/http-foundation": "",
+            "symfony/intl": "",
+            "symfony/property-access": "For using the 2.4 Validator API",
+            "symfony/yaml": ""
+        },
+        "time": "2017-03-23T16:08:03+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Validator\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Validator Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/serializer",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/serializer.git",
+            "reference": "d1c3d68daee29bbf0b4600745899a7000c215642"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/serializer/zipball/d1c3d68daee29bbf0b4600745899a7000c215642",
+            "reference": "d1c3d68daee29bbf0b4600745899a7000c215642",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "symfony/polyfill-php55": "~1.0"
+        },
+        "require-dev": {
+            "doctrine/annotations": "~1.0",
+            "doctrine/cache": "~1.0",
+            "symfony/config": "~2.2|~3.0.0",
+            "symfony/property-access": "~2.3|~3.0.0",
+            "symfony/yaml": "^2.0.5|~3.0.0"
+        },
+        "suggest": {
+            "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+            "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+            "symfony/config": "For using the XML mapping loader.",
+            "symfony/property-access": "For using the ObjectNormalizer.",
+            "symfony/yaml": "For using the default YAML mapping loader."
+        },
+        "time": "2017-03-21T22:47:17+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Serializer\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Serializer Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/routing",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/routing.git",
+            "reference": "d145cd396f702c497cb24b21785ddac90a23fe71"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/routing/zipball/d145cd396f702c497cb24b21785ddac90a23fe71",
+            "reference": "d145cd396f702c497cb24b21785ddac90a23fe71",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "conflict": {
+            "symfony/config": "<2.7"
+        },
+        "require-dev": {
+            "doctrine/annotations": "~1.0",
+            "doctrine/common": "~2.2",
+            "psr/log": "~1.0",
+            "symfony/config": "~2.7|~3.0.0",
+            "symfony/expression-language": "~2.4|~3.0.0",
+            "symfony/http-foundation": "~2.3|~3.0.0",
+            "symfony/yaml": "^2.0.5|~3.0.0"
+        },
+        "suggest": {
+            "doctrine/annotations": "For using the annotation loader",
+            "symfony/config": "For using the all-in-one router or any loader",
+            "symfony/dependency-injection": "For loading routes from a service",
+            "symfony/expression-language": "For using expression matching",
+            "symfony/http-foundation": "For using a Symfony Request object",
+            "symfony/yaml": "For using the YAML loader"
+        },
+        "time": "2017-03-02T15:56:34+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Routing\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Routing Component",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "router",
+            "routing",
+            "uri",
+            "url"
+        ]
+    },
+    {
+        "name": "symfony/http-foundation",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/http-foundation.git",
+            "reference": "0717efd2f2264dbd3d8e1bc69a0418c2fd6295d2"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0717efd2f2264dbd3d8e1bc69a0418c2fd6295d2",
+            "reference": "0717efd2f2264dbd3d8e1bc69a0418c2fd6295d2",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "symfony/polyfill-mbstring": "~1.1",
+            "symfony/polyfill-php54": "~1.0",
+            "symfony/polyfill-php55": "~1.0"
+        },
+        "require-dev": {
+            "symfony/expression-language": "~2.4|~3.0.0"
+        },
+        "time": "2017-04-04T15:24:26+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\HttpFoundation\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony HttpFoundation Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/psr-http-message-bridge",
+        "version": "v1.0.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/psr-http-message-bridge.git",
+            "reference": "66085f246d3893cbdbcec5f5ad15ac60546cf0de"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/66085f246d3893cbdbcec5f5ad15ac60546cf0de",
+            "reference": "66085f246d3893cbdbcec5f5ad15ac60546cf0de",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3",
+            "psr/http-message": "~1.0",
+            "symfony/http-foundation": "~2.3|~3.0"
+        },
+        "require-dev": {
+            "symfony/phpunit-bridge": "~2.7|~3.0"
+        },
+        "suggest": {
+            "psr/http-message-implementation": "To use the HttpFoundation factory",
+            "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
+        },
+        "time": "2016-09-14T18:37:20+00:00",
+        "type": "symfony-bridge",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Bridge\\PsrHttpMessage\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
+            },
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            }
+        ],
+        "description": "PSR HTTP message bridge",
+        "homepage": "http://symfony.com",
+        "keywords": [
+            "http",
+            "http-message",
+            "psr-7"
+        ]
+    },
+    {
+        "name": "symfony/process",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/process.git",
+            "reference": "41336b20b52f5fd5b42a227e394e673c8071118f"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/process/zipball/41336b20b52f5fd5b42a227e394e673c8071118f",
+            "reference": "41336b20b52f5fd5b42a227e394e673c8071118f",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "time": "2017-03-04T12:20:59+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Process\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Process Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/event-dispatcher",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/event-dispatcher.git",
+            "reference": "88b65f0ac25355090e524aba4ceb066025df8bd2"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/88b65f0ac25355090e524aba4ceb066025df8bd2",
+            "reference": "88b65f0ac25355090e524aba4ceb066025df8bd2",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "require-dev": {
+            "psr/log": "~1.0",
+            "symfony/config": "^2.0.5|~3.0.0",
+            "symfony/dependency-injection": "~2.6|~3.0.0",
+            "symfony/expression-language": "~2.6|~3.0.0",
+            "symfony/stopwatch": "~2.3|~3.0.0"
+        },
+        "suggest": {
+            "symfony/dependency-injection": "",
+            "symfony/http-kernel": ""
+        },
+        "time": "2017-04-03T20:37:06+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\EventDispatcher\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony EventDispatcher Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "psr/log",
+        "version": "1.0.2",
+        "version_normalized": "1.0.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/log.git",
+            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "time": "2016-10-10T12:19:37+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Psr\\Log\\": "Psr/Log/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interface for logging libraries",
+        "homepage": "https://github.com/php-fig/log",
+        "keywords": [
+            "log",
+            "psr",
+            "psr-3"
+        ]
+    },
+    {
+        "name": "symfony/debug",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/debug.git",
+            "reference": "e90099a2958d4833a02d05b504cc06e1c234abcc"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/debug/zipball/e90099a2958d4833a02d05b504cc06e1c234abcc",
+            "reference": "e90099a2958d4833a02d05b504cc06e1c234abcc",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "psr/log": "~1.0"
+        },
+        "conflict": {
+            "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+        },
+        "require-dev": {
+            "symfony/class-loader": "~2.2|~3.0.0",
+            "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0"
+        },
+        "time": "2017-02-18T19:13:35+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Debug\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Debug Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/http-kernel",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/http-kernel.git",
+            "reference": "3256e9e554f02ba2dd49cff253f15df69c36cf40"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3256e9e554f02ba2dd49cff253f15df69c36cf40",
+            "reference": "3256e9e554f02ba2dd49cff253f15df69c36cf40",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "psr/log": "~1.0",
+            "symfony/debug": "^2.6.2",
+            "symfony/event-dispatcher": "^2.6.7|~3.0.0",
+            "symfony/http-foundation": "~2.7.20|~2.8.13|~3.1.6"
+        },
+        "conflict": {
+            "symfony/config": "<2.7"
+        },
+        "require-dev": {
+            "symfony/browser-kit": "~2.3|~3.0.0",
+            "symfony/class-loader": "~2.1|~3.0.0",
+            "symfony/config": "~2.8",
+            "symfony/console": "~2.3|~3.0.0",
+            "symfony/css-selector": "^2.0.5|~3.0.0",
+            "symfony/dependency-injection": "~2.8|~3.0.0",
+            "symfony/dom-crawler": "^2.0.5|~3.0.0",
+            "symfony/expression-language": "~2.4|~3.0.0",
+            "symfony/finder": "^2.0.5|~3.0.0",
+            "symfony/process": "^2.0.5|~3.0.0",
+            "symfony/routing": "~2.8|~3.0.0",
+            "symfony/stopwatch": "~2.3|~3.0.0",
+            "symfony/templating": "~2.2|~3.0.0",
+            "symfony/translation": "^2.0.5|~3.0.0",
+            "symfony/var-dumper": "~2.6|~3.0.0"
+        },
+        "suggest": {
+            "symfony/browser-kit": "",
+            "symfony/class-loader": "",
+            "symfony/config": "",
+            "symfony/console": "",
+            "symfony/dependency-injection": "",
+            "symfony/finder": "",
+            "symfony/var-dumper": ""
+        },
+        "time": "2017-04-05T04:04:34+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\HttpKernel\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony HttpKernel Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/dependency-injection",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/dependency-injection.git",
+            "reference": "14b9d8ae69ac4c74e8f05fee7e0a57039b99c81e"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/14b9d8ae69ac4c74e8f05fee7e0a57039b99c81e",
+            "reference": "14b9d8ae69ac4c74e8f05fee7e0a57039b99c81e",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "conflict": {
+            "symfony/expression-language": "<2.6"
+        },
+        "require-dev": {
+            "symfony/config": "~2.2|~3.0.0",
+            "symfony/expression-language": "~2.6|~3.0.0",
+            "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.7"
+        },
+        "suggest": {
+            "symfony/config": "",
+            "symfony/expression-language": "For using expressions in service container configuration",
+            "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+            "symfony/yaml": ""
+        },
+        "time": "2017-04-03T22:14:48+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\DependencyInjection\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony DependencyInjection Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/console",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/console.git",
+            "reference": "86407ff20855a5eaa2a7219bd815e9c40a88633e"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/console/zipball/86407ff20855a5eaa2a7219bd815e9c40a88633e",
+            "reference": "86407ff20855a5eaa2a7219bd815e9c40a88633e",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "symfony/debug": "^2.7.2|~3.0.0",
+            "symfony/polyfill-mbstring": "~1.0"
+        },
+        "require-dev": {
+            "psr/log": "~1.0",
+            "symfony/event-dispatcher": "~2.1|~3.0.0",
+            "symfony/process": "~2.1|~3.0.0"
+        },
+        "suggest": {
+            "psr/log": "For using the console logger",
+            "symfony/event-dispatcher": "",
+            "symfony/process": ""
+        },
+        "time": "2017-04-03T20:37:06+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Console\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Console Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/class-loader",
+        "version": "v2.8.19",
+        "version_normalized": "2.8.19.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/class-loader.git",
+            "reference": "2c8de07a8a4cc4da9c018ab7a81888b80e762f93"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/class-loader/zipball/2c8de07a8a4cc4da9c018ab7a81888b80e762f93",
+            "reference": "2c8de07a8a4cc4da9c018ab7a81888b80e762f93",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "symfony/polyfill-apcu": "~1.1"
+        },
+        "require-dev": {
+            "symfony/finder": "^2.0.5|~3.0.0"
+        },
+        "time": "2017-02-18T19:13:35+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\ClassLoader\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony ClassLoader Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "paragonie/random_compat",
+        "version": "v2.0.10",
+        "version_normalized": "2.0.10.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/paragonie/random_compat.git",
+            "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+            "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.2.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "4.*|5.*"
+        },
+        "suggest": {
+            "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+        },
+        "time": "2017-03-13T16:27:32+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "lib/random.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Paragon Initiative Enterprises",
+                "email": "security@paragonie.com",
+                "homepage": "https://paragonie.com"
+            }
+        ],
+        "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+        "keywords": [
+            "csprng",
+            "pseudorandom",
+            "random"
+        ]
+    },
+    {
+        "name": "masterminds/html5",
+        "version": "2.2.2",
+        "version_normalized": "2.2.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/Masterminds/html5-php.git",
+            "reference": "7866e93dcf0245de22378414e0c2c7350abc45af"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/7866e93dcf0245de22378414e0c2c7350abc45af",
+            "reference": "7866e93dcf0245de22378414e0c2c7350abc45af",
+            "shasum": ""
+        },
+        "require": {
+            "ext-libxml": "*",
+            "php": ">=5.3.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "4.*",
+            "sami/sami": "~2.0",
+            "satooshi/php-coveralls": "1.0.*"
+        },
+        "time": "2016-09-22T11:01:11+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.2-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Masterminds\\": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Matt Butcher",
+                "email": "technosophos@gmail.com"
+            },
+            {
+                "name": "Asmir Mustafic",
+                "email": "goetas@gmail.com"
+            },
+            {
+                "name": "Matt Farina",
+                "email": "matt@mattfarina.com"
+            }
+        ],
+        "description": "An HTML5 parser and serializer.",
+        "homepage": "http://masterminds.github.io/html5-php",
+        "keywords": [
+            "HTML5",
+            "dom",
+            "html",
+            "parser",
+            "querypath",
+            "serializer",
+            "xml"
+        ]
+    },
+    {
+        "name": "guzzlehttp/psr7",
+        "version": "1.4.2",
+        "version_normalized": "1.4.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/guzzle/psr7.git",
+            "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+            "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.4.0",
+            "psr/http-message": "~1.0"
+        },
+        "provide": {
+            "psr/http-message-implementation": "1.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.0"
+        },
+        "time": "2017-03-20T17:10:46+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.4-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "GuzzleHttp\\Psr7\\": "src/"
+            },
+            "files": [
+                "src/functions_include.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Michael Dowling",
+                "email": "mtdowling@gmail.com",
+                "homepage": "https://github.com/mtdowling"
+            },
+            {
+                "name": "Tobias Schultze",
+                "homepage": "https://github.com/Tobion"
+            }
+        ],
+        "description": "PSR-7 message implementation that also provides common utility methods",
+        "keywords": [
+            "http",
+            "message",
+            "request",
+            "response",
+            "stream",
+            "uri",
+            "url"
+        ]
+    },
+    {
+        "name": "guzzlehttp/promises",
+        "version": "v1.3.1",
+        "version_normalized": "1.3.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/guzzle/promises.git",
+            "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+            "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.5.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^4.0"
+        },
+        "time": "2016-12-20T10:07:11+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.4-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "GuzzleHttp\\Promise\\": "src/"
+            },
+            "files": [
+                "src/functions_include.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Michael Dowling",
+                "email": "mtdowling@gmail.com",
+                "homepage": "https://github.com/mtdowling"
+            }
+        ],
+        "description": "Guzzle promises library",
+        "keywords": [
+            "promise"
+        ]
+    },
+    {
+        "name": "guzzlehttp/guzzle",
+        "version": "6.2.3",
+        "version_normalized": "6.2.3.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/guzzle/guzzle.git",
+            "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006",
+            "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006",
+            "shasum": ""
+        },
+        "require": {
+            "guzzlehttp/promises": "^1.0",
+            "guzzlehttp/psr7": "^1.4",
+            "php": ">=5.5"
+        },
+        "require-dev": {
+            "ext-curl": "*",
+            "phpunit/phpunit": "^4.0",
+            "psr/log": "^1.0"
+        },
+        "time": "2017-02-28T22:50:30+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "6.2-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "src/functions_include.php"
+            ],
+            "psr-4": {
+                "GuzzleHttp\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Michael Dowling",
+                "email": "mtdowling@gmail.com",
+                "homepage": "https://github.com/mtdowling"
+            }
+        ],
+        "description": "Guzzle is a PHP HTTP client library",
+        "homepage": "http://guzzlephp.org/",
+        "keywords": [
+            "client",
+            "curl",
+            "framework",
+            "http",
+            "http client",
+            "rest",
+            "web service"
+        ]
+    },
+    {
+        "name": "egulias/email-validator",
+        "version": "1.2.14",
+        "version_normalized": "1.2.14.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/egulias/EmailValidator.git",
+            "reference": "5642614492f0ca2064c01d60cc33284cc2f731a9"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/5642614492f0ca2064c01d60cc33284cc2f731a9",
+            "reference": "5642614492f0ca2064c01d60cc33284cc2f731a9",
+            "shasum": ""
+        },
+        "require": {
+            "doctrine/lexer": "^1.0.1",
+            "php": ">= 5.3.3"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^4.8.24"
+        },
+        "time": "2017-02-03T22:48:59+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Egulias\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Eduardo Gulias Davis"
+            }
+        ],
+        "description": "A library for validating emails",
+        "homepage": "https://github.com/egulias/EmailValidator",
+        "keywords": [
+            "email",
+            "emailvalidation",
+            "emailvalidator",
+            "validation",
+            "validator"
+        ]
+    },
+    {
+        "name": "doctrine/inflector",
+        "version": "v1.1.0",
+        "version_normalized": "1.1.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/doctrine/inflector.git",
+            "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
+            "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.2"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "4.*"
+        },
+        "time": "2015-11-06T14:35:42+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Doctrine\\Common\\Inflector\\": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Benjamin Eberlei",
+                "email": "kontakt@beberlei.de"
+            },
+            {
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com"
+            },
+            {
+                "name": "Jonathan Wage",
+                "email": "jonwage@gmail.com"
+            },
+            {
+                "name": "Johannes Schmitt",
+                "email": "schmittjoh@gmail.com"
+            }
+        ],
+        "description": "Common String Manipulations with regard to casing and singular/plural rules.",
+        "homepage": "http://www.doctrine-project.org",
+        "keywords": [
+            "inflection",
+            "pluralize",
+            "singularize",
+            "string"
+        ]
+    },
+    {
+        "name": "doctrine/collections",
+        "version": "v1.4.0",
+        "version_normalized": "1.4.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/doctrine/collections.git",
+            "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
+            "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.6 || ^7.0"
+        },
+        "require-dev": {
+            "doctrine/coding-standard": "~0.1@dev",
+            "phpunit/phpunit": "^5.7"
+        },
+        "time": "2017-01-03T10:49:41+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.3.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Doctrine\\Common\\Collections\\": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Benjamin Eberlei",
+                "email": "kontakt@beberlei.de"
+            },
+            {
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com"
+            },
+            {
+                "name": "Jonathan Wage",
+                "email": "jonwage@gmail.com"
+            },
+            {
+                "name": "Johannes Schmitt",
+                "email": "schmittjoh@gmail.com"
+            }
+        ],
+        "description": "Collections Abstraction library",
+        "homepage": "http://www.doctrine-project.org",
+        "keywords": [
+            "array",
+            "collections",
+            "iterator"
+        ]
+    },
+    {
+        "name": "doctrine/cache",
+        "version": "v1.6.1",
+        "version_normalized": "1.6.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/doctrine/cache.git",
+            "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/doctrine/cache/zipball/b6f544a20f4807e81f7044d31e679ccbb1866dc3",
+            "reference": "b6f544a20f4807e81f7044d31e679ccbb1866dc3",
+            "shasum": ""
+        },
+        "require": {
+            "php": "~5.5|~7.0"
+        },
+        "conflict": {
+            "doctrine/common": ">2.2,<2.4"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.8|~5.0",
+            "predis/predis": "~1.0",
+            "satooshi/php-coveralls": "~0.6"
+        },
+        "time": "2016-10-29T11:16:17+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.6.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Benjamin Eberlei",
+                "email": "kontakt@beberlei.de"
+            },
+            {
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com"
+            },
+            {
+                "name": "Jonathan Wage",
+                "email": "jonwage@gmail.com"
+            },
+            {
+                "name": "Johannes Schmitt",
+                "email": "schmittjoh@gmail.com"
+            }
+        ],
+        "description": "Caching library offering an object-oriented API for many cache backends",
+        "homepage": "http://www.doctrine-project.org",
+        "keywords": [
+            "cache",
+            "caching"
+        ]
+    },
+    {
+        "name": "doctrine/common",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/doctrine/common.git",
+            "reference": "930297026c8009a567ac051fd545bf6124150347"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/doctrine/common/zipball/930297026c8009a567ac051fd545bf6124150347",
+            "reference": "930297026c8009a567ac051fd545bf6124150347",
+            "shasum": ""
+        },
+        "require": {
+            "doctrine/annotations": "1.*",
+            "doctrine/cache": "1.*",
+            "doctrine/collections": "1.*",
+            "doctrine/inflector": "1.*",
+            "doctrine/lexer": "1.*",
+            "php": "~5.6|~7.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^5.4.6"
+        },
+        "time": "2017-01-13T14:02:13+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.7.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Doctrine\\Common\\": "lib/Doctrine/Common"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Benjamin Eberlei",
+                "email": "kontakt@beberlei.de"
+            },
+            {
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com"
+            },
+            {
+                "name": "Jonathan Wage",
+                "email": "jonwage@gmail.com"
+            },
+            {
+                "name": "Johannes Schmitt",
+                "email": "schmittjoh@gmail.com"
+            }
+        ],
+        "description": "Common Library for Doctrine projects",
+        "homepage": "http://www.doctrine-project.org",
+        "keywords": [
+            "annotations",
+            "collections",
+            "eventmanager",
+            "persistence",
+            "spl"
+        ]
+    },
+    {
+        "name": "composer/semver",
+        "version": "1.4.2",
+        "version_normalized": "1.4.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/composer/semver.git",
+            "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
+            "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.3.2 || ^7.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^4.5 || ^5.0.5",
+            "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+        },
+        "time": "2016-08-30T16:08:34+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Composer\\Semver\\": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nils Adermann",
+                "email": "naderman@naderman.de",
+                "homepage": "http://www.naderman.de"
+            },
+            {
+                "name": "Jordi Boggiano",
+                "email": "j.boggiano@seld.be",
+                "homepage": "http://seld.be"
+            },
+            {
+                "name": "Rob Bast",
+                "email": "rob.bast@gmail.com",
+                "homepage": "http://robbast.nl"
+            }
+        ],
+        "description": "Semver library that offers utilities, version constraint parsing and validation.",
+        "keywords": [
+            "semantic",
+            "semver",
+            "validation",
+            "versioning"
+        ]
+    },
+    {
+        "name": "asm89/stack-cors",
+        "version": "1.1.0",
+        "version_normalized": "1.1.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/asm89/stack-cors.git",
+            "reference": "65ccbd455370f043c2e3b93482a3813603d68731"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/asm89/stack-cors/zipball/65ccbd455370f043c2e3b93482a3813603d68731",
+            "reference": "65ccbd455370f043c2e3b93482a3813603d68731",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.5.9",
+            "symfony/http-foundation": "~2.7|~3.0",
+            "symfony/http-kernel": "~2.7|~3.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^5.0 || ^4.8.10",
+            "squizlabs/php_codesniffer": "^2.3"
+        },
+        "time": "2017-04-11T20:03:41+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.1-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Asm89\\Stack\\": "src/Asm89/Stack/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Alexander",
+                "email": "iam.asm89@gmail.com"
+            }
+        ],
+        "description": "Cross-origin resource sharing library and stack middleware",
+        "homepage": "https://github.com/asm89/stack-cors",
+        "keywords": [
+            "cors",
+            "stack"
+        ]
+    },
+    {
+        "name": "drupal/core",
+        "version": "8.3.0",
+        "version_normalized": "8.3.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/drupal-composer/drupal-core.git",
+            "reference": "e503a252ec5c2811abed6af0c7b70afda8e93a3f"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/drupal-composer/drupal-core/zipball/e503a252ec5c2811abed6af0c7b70afda8e93a3f",
+            "reference": "e503a252ec5c2811abed6af0c7b70afda8e93a3f",
+            "shasum": ""
+        },
+        "require": {
+            "asm89/stack-cors": "~1.0",
+            "composer/semver": "~1.0",
+            "doctrine/annotations": "1.2.*",
+            "doctrine/common": "^2.5",
+            "easyrdf/easyrdf": "0.9.*",
+            "egulias/email-validator": "1.2.*",
+            "guzzlehttp/guzzle": "^6.2.1",
+            "masterminds/html5": "~2.1",
+            "paragonie/random_compat": "^1.0|^2.0",
+            "php": ">=5.5.9",
+            "stack/builder": "1.0.*",
+            "symfony-cmf/routing": "~1.4",
+            "symfony/class-loader": "~2.8",
+            "symfony/console": "~2.8",
+            "symfony/dependency-injection": "~2.8",
+            "symfony/event-dispatcher": "~2.8",
+            "symfony/http-foundation": "~2.8",
+            "symfony/http-kernel": "~2.8",
+            "symfony/polyfill-iconv": "~1.0",
+            "symfony/process": "~2.8",
+            "symfony/psr-http-message-bridge": "^1.0",
+            "symfony/routing": "~2.8",
+            "symfony/serializer": "~2.8",
+            "symfony/translation": "~2.8",
+            "symfony/validator": "~2.8",
+            "symfony/yaml": "~2.8",
+            "twig/twig": "^1.23.1",
+            "zendframework/zend-diactoros": "~1.1",
+            "zendframework/zend-feed": "~2.4"
+        },
+        "replace": {
+            "drupal/action": "self.version",
+            "drupal/aggregator": "self.version",
+            "drupal/automated_cron": "self.version",
+            "drupal/ban": "self.version",
+            "drupal/bartik": "self.version",
+            "drupal/basic_auth": "self.version",
+            "drupal/big_pipe": "self.version",
+            "drupal/block": "self.version",
+            "drupal/block_content": "self.version",
+            "drupal/block_place": "self.version",
+            "drupal/book": "self.version",
+            "drupal/breakpoint": "self.version",
+            "drupal/ckeditor": "self.version",
+            "drupal/classy": "self.version",
+            "drupal/color": "self.version",
+            "drupal/comment": "self.version",
+            "drupal/config": "self.version",
+            "drupal/config_translation": "self.version",
+            "drupal/contact": "self.version",
+            "drupal/content_moderation": "self.version",
+            "drupal/content_translation": "self.version",
+            "drupal/contextual": "self.version",
+            "drupal/core-annotation": "self.version",
+            "drupal/core-assertion": "self.version",
+            "drupal/core-bridge": "self.version",
+            "drupal/core-datetime": "self.version",
+            "drupal/core-dependency-injection": "self.version",
+            "drupal/core-diff": "self.version",
+            "drupal/core-discovery": "self.version",
+            "drupal/core-event-dispatcher": "self.version",
+            "drupal/core-file-cache": "self.version",
+            "drupal/core-filesystem": "self.version",
+            "drupal/core-gettext": "self.version",
+            "drupal/core-graph": "self.version",
+            "drupal/core-http-foundation": "self.version",
+            "drupal/core-php-storage": "self.version",
+            "drupal/core-plugin": "self.version",
+            "drupal/core-proxy-builder": "self.version",
+            "drupal/core-render": "self.version",
+            "drupal/core-serialization": "self.version",
+            "drupal/core-transliteration": "self.version",
+            "drupal/core-utility": "self.version",
+            "drupal/core-uuid": "self.version",
+            "drupal/datetime": "self.version",
+            "drupal/datetime_range": "self.version",
+            "drupal/dblog": "self.version",
+            "drupal/dynamic_page_cache": "self.version",
+            "drupal/editor": "self.version",
+            "drupal/entity_reference": "self.version",
+            "drupal/field": "self.version",
+            "drupal/field_layout": "self.version",
+            "drupal/field_ui": "self.version",
+            "drupal/file": "self.version",
+            "drupal/filter": "self.version",
+            "drupal/forum": "self.version",
+            "drupal/hal": "self.version",
+            "drupal/help": "self.version",
+            "drupal/history": "self.version",
+            "drupal/image": "self.version",
+            "drupal/inline_form_errors": "self.version",
+            "drupal/language": "self.version",
+            "drupal/layout_discovery": "self.version",
+            "drupal/link": "self.version",
+            "drupal/locale": "self.version",
+            "drupal/menu_link_content": "self.version",
+            "drupal/menu_ui": "self.version",
+            "drupal/migrate": "self.version",
+            "drupal/migrate_drupal": "self.version",
+            "drupal/migrate_drupal_ui": "self.version",
+            "drupal/minimal": "self.version",
+            "drupal/node": "self.version",
+            "drupal/options": "self.version",
+            "drupal/outside_in": "self.version",
+            "drupal/page_cache": "self.version",
+            "drupal/path": "self.version",
+            "drupal/quickedit": "self.version",
+            "drupal/rdf": "self.version",
+            "drupal/responsive_image": "self.version",
+            "drupal/rest": "self.version",
+            "drupal/search": "self.version",
+            "drupal/serialization": "self.version",
+            "drupal/seven": "self.version",
+            "drupal/shortcut": "self.version",
+            "drupal/simpletest": "self.version",
+            "drupal/standard": "self.version",
+            "drupal/stark": "self.version",
+            "drupal/statistics": "self.version",
+            "drupal/syslog": "self.version",
+            "drupal/system": "self.version",
+            "drupal/taxonomy": "self.version",
+            "drupal/telephone": "self.version",
+            "drupal/text": "self.version",
+            "drupal/toolbar": "self.version",
+            "drupal/tour": "self.version",
+            "drupal/tracker": "self.version",
+            "drupal/update": "self.version",
+            "drupal/user": "self.version",
+            "drupal/views": "self.version",
+            "drupal/views_ui": "self.version",
+            "drupal/workflows": "self.version"
+        },
+        "require-dev": {
+            "behat/mink": "1.7.x-dev",
+            "behat/mink-goutte-driver": "~1.2",
+            "drupal/coder": "8.2.12",
+            "jcalderonzumba/gastonjs": "~1.0.2",
+            "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
+            "mikey179/vfsstream": "~1.2",
+            "phpunit/phpunit": ">=4.8.28 <5",
+            "symfony/browser-kit": ">=2.8.13 <3.0",
+            "symfony/css-selector": "~2.8"
+        },
+        "time": "2017-04-06T00:12:44+00:00",
+        "type": "drupal-core",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Drupal\\Core\\": "lib/Drupal/Core",
+                "Drupal\\Component\\": "lib/Drupal/Component",
+                "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
+            },
+            "classmap": [
+                "lib/Drupal.php",
+                "lib/Drupal/Component/Utility/Timer.php",
+                "lib/Drupal/Component/Utility/Unicode.php",
+                "lib/Drupal/Core/Database/Database.php",
+                "lib/Drupal/Core/DrupalKernel.php",
+                "lib/Drupal/Core/DrupalKernelInterface.php",
+                "lib/Drupal/Core/Site/Settings.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "description": "Drupal is an open source content management platform powering millions of websites and applications."
+    },
+    {
+        "name": "symfony/dom-crawler",
+        "version": "v3.0.9",
+        "version_normalized": "3.0.9.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/dom-crawler.git",
+            "reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/dff8fecf1f56990d88058e3a1885c2a5f1b8e970",
+            "reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.5.9",
+            "symfony/polyfill-mbstring": "~1.0"
+        },
+        "require-dev": {
+            "symfony/css-selector": "~2.8|~3.0"
+        },
+        "suggest": {
+            "symfony/css-selector": ""
+        },
+        "time": "2016-07-30T07:22:48+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\DomCrawler\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony DomCrawler Component",
+        "homepage": "https://symfony.com"
     }
 ]
diff --git a/web/vendor/composer/semver/CHANGELOG.md b/web/vendor/composer/semver/CHANGELOG.md
index 8352cb72d..febedc973 100644
--- a/web/vendor/composer/semver/CHANGELOG.md
+++ b/web/vendor/composer/semver/CHANGELOG.md
@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+### [1.4.2] 2016-08-30
+
+  * Fixed: collapsing of complex constraints lead to buggy constraints
+
+### [1.4.1] 2016-06-02
+
+  * Changed: branch-like requirements no longer strip build metadata - [composer/semver#38](https://github.com/composer/semver/pull/38).
+
+### [1.4.0] 2016-03-30
+
+  * Added: getters on MultiConstraint - [composer/semver#35](https://github.com/composer/semver/pull/35).
+
+### [1.3.0] 2016-02-25
+
+  * Fixed: stability parsing - [composer/composer#1234](https://github.com/composer/composer/issues/4889).
+  * Changed: collapse contiguous constraints when possible.
+
+### [1.2.0] 2015-11-10
+
+  * Changed: allow multiple numerical identifiers in 'pre-release' version part.
+  * Changed: add more 'v' prefix support.
+
+### [1.1.0] 2015-11-03
+
+  * Changed: dropped redundant `test` namespace.
+  * Changed: minor adjustment in datetime parsing normalization.
+  * Changed: `ConstraintInterface` relaxed, setPrettyString is not required anymore.
+  * Changed: `AbstractConstraint` marked deprecated, will be removed in 2.0.
+  * Changed: `Constraint` is now extensible.
+
 ### [1.0.0] 2015-09-21
 
   * Break: `VersionConstraint` renamed to `Constraint`.
@@ -13,7 +43,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   * Changed: `VersionParser::parseConstraints` allows (but ignores) prefixing numeric versions with a 'v' now.
   * Changed: Fixed namespace(s) of test files.
   * Changed: `Comparator::compare` no longer throws `InvalidArgumentException`.
-  * Changed: `VersionConstraint` now throws `InvalidArgumentException`.
+  * Changed: `Constraint` now throws `InvalidArgumentException`.
 
 ### [0.1.0] 2015-07-23
 
@@ -26,3 +56,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     - Namespace: `Composer\Test\Package\Version` -> `Composer\Test\Semver`
     - Namespace: `Composer\Test\Package\LinkConstraint` -> `Composer\Test\Semver\Constraint`
   * Changed: code style using php-cs-fixer.
+
+[1.4.1]: https://github.com/composer/semver/compare/1.4.0...1.4.1
+[1.4.0]: https://github.com/composer/semver/compare/1.3.0...1.4.0
+[1.3.0]: https://github.com/composer/semver/compare/1.2.0...1.3.0
+[1.2.0]: https://github.com/composer/semver/compare/1.1.0...1.2.0
+[1.1.0]: https://github.com/composer/semver/compare/1.0.0...1.1.0
+[1.0.0]: https://github.com/composer/semver/compare/0.1.0...1.0.0
+[0.1.0]: https://github.com/composer/semver/compare/5e0b9a4da...0.1.0
diff --git a/web/vendor/composer/semver/README.md b/web/vendor/composer/semver/README.md
index c8b697984..143daa0d6 100644
--- a/web/vendor/composer/semver/README.md
+++ b/web/vendor/composer/semver/README.md
@@ -56,10 +56,10 @@ Comparator::greaterThan('1.25.0', '1.24.0'); // 1.25.0 > 1.24.0
 
 ### Semver
 
-The `Composer\Semver\Semver` class providers the following methods:
+The `Composer\Semver\Semver` class provides the following methods:
 
 * satisfies($version, $constraints)
-* satisfiedBy($constraint, array $versions)
+* satisfiedBy(array $versions, $constraint)
 * sort($versions)
 * rsort($versions)
 
diff --git a/web/vendor/composer/semver/composer.json b/web/vendor/composer/semver/composer.json
index b996186f2..b0400cd7b 100644
--- a/web/vendor/composer/semver/composer.json
+++ b/web/vendor/composer/semver/composer.json
@@ -22,7 +22,8 @@
         },
         {
             "name": "Rob Bast",
-            "email": "rob.bast@gmail.com"
+            "email": "rob.bast@gmail.com",
+            "homepage": "http://robbast.nl"
         }
     ],
     "support": {
@@ -30,11 +31,11 @@
         "issues": "https://github.com/composer/semver/issues"
     },
     "require": {
-        "php": ">=5.3.2"
+        "php": "^5.3.2 || ^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.5",
-        "phpunit/phpunit-mock-objects": "~2.3"
+        "phpunit/phpunit": "^4.5 || ^5.0.5",
+        "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -43,12 +44,12 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Composer\\Semver\\Test\\": "tests"
+            "Composer\\Semver\\": "tests"
         }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1-dev"
+            "dev-master": "1.x-dev"
         }
     },
     "scripts": {
diff --git a/web/vendor/composer/semver/src/Constraint/AbstractConstraint.php b/web/vendor/composer/semver/src/Constraint/AbstractConstraint.php
index ccd834f6b..be83f750b 100644
--- a/web/vendor/composer/semver/src/Constraint/AbstractConstraint.php
+++ b/web/vendor/composer/semver/src/Constraint/AbstractConstraint.php
@@ -11,6 +11,8 @@
 
 namespace Composer\Semver\Constraint;
 
+trigger_error('The ' . __CLASS__ . ' abstract class is deprecated, there is no replacement for it, it will be removed in the next major version.', E_USER_DEPRECATED);
+
 /**
  * Base constraint class.
  */
@@ -26,17 +28,13 @@ abstract class AbstractConstraint implements ConstraintInterface
      */
     public function matches(ConstraintInterface $provider)
     {
-        if ($provider instanceof MultiConstraint) {
-            // turn matching around to find a match
-            return $provider->matches($this);
-        }
-
         if ($provider instanceof $this) {
             // see note at bottom of this class declaration
             return $this->matchSpecific($provider);
         }
 
-        return true;
+        // turn matching around to find a match
+        return $provider->matches($this);
     }
 
     /**
diff --git a/web/vendor/composer/semver/src/Constraint/Constraint.php b/web/vendor/composer/semver/src/Constraint/Constraint.php
index 8bc68db7b..7a21eb47f 100644
--- a/web/vendor/composer/semver/src/Constraint/Constraint.php
+++ b/web/vendor/composer/semver/src/Constraint/Constraint.php
@@ -14,7 +14,7 @@ namespace Composer\Semver\Constraint;
 /**
  * Defines a constraint.
  */
-class Constraint extends AbstractConstraint
+class Constraint implements ConstraintInterface
 {
     /* operator integer values */
     const OP_EQ = 0;
@@ -55,10 +55,48 @@ class Constraint extends AbstractConstraint
     );
 
     /** @var string */
-    private $operator;
+    protected $operator;
 
     /** @var string */
-    private $version;
+    protected $version;
+
+    /** @var string */
+    protected $prettyString;
+
+    /**
+     * @param ConstraintInterface $provider
+     *
+     * @return bool
+     */
+    public function matches(ConstraintInterface $provider)
+    {
+        if ($provider instanceof $this) {
+            return $this->matchSpecific($provider);
+        }
+
+        // turn matching around to find a match
+        return $provider->matches($this);
+    }
+
+    /**
+     * @param string $prettyString
+     */
+    public function setPrettyString($prettyString)
+    {
+        $this->prettyString = $prettyString;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrettyString()
+    {
+        if ($this->prettyString) {
+            return $this->prettyString;
+        }
+
+        return $this->__toString();
+    }
 
     /**
      * Get all supported comparison operators.
diff --git a/web/vendor/composer/semver/src/Constraint/ConstraintInterface.php b/web/vendor/composer/semver/src/Constraint/ConstraintInterface.php
index 78c099cec..7cb13b6a8 100644
--- a/web/vendor/composer/semver/src/Constraint/ConstraintInterface.php
+++ b/web/vendor/composer/semver/src/Constraint/ConstraintInterface.php
@@ -20,11 +20,6 @@ interface ConstraintInterface
      */
     public function matches(ConstraintInterface $provider);
 
-    /**
-     * @param string $prettyString
-     */
-    public function setPrettyString($prettyString);
-
     /**
      * @return string
      */
diff --git a/web/vendor/composer/semver/src/Constraint/MultiConstraint.php b/web/vendor/composer/semver/src/Constraint/MultiConstraint.php
index 0d769b7c1..0c547afd4 100644
--- a/web/vendor/composer/semver/src/Constraint/MultiConstraint.php
+++ b/web/vendor/composer/semver/src/Constraint/MultiConstraint.php
@@ -35,6 +35,30 @@ class MultiConstraint implements ConstraintInterface
         $this->conjunctive = $conjunctive;
     }
 
+    /**
+     * @return ConstraintInterface[]
+     */
+    public function getConstraints()
+    {
+        return $this->constraints;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isConjunctive()
+    {
+        return $this->conjunctive;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDisjunctive()
+    {
+        return !$this->conjunctive;
+    }
+
     /**
      * @param ConstraintInterface $provider
      *
diff --git a/web/vendor/composer/semver/src/VersionParser.php b/web/vendor/composer/semver/src/VersionParser.php
index 269aee948..359c18c46 100644
--- a/web/vendor/composer/semver/src/VersionParser.php
+++ b/web/vendor/composer/semver/src/VersionParser.php
@@ -23,13 +23,23 @@ use Composer\Semver\Constraint\Constraint;
  */
 class VersionParser
 {
-    /** @var string */
-    private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?';
+    /**
+     * Regex to match pre-release data (sort of).
+     *
+     * Due to backwards compatibility:
+     *   - Instead of enforcing hyphen, an underscore, dot or nothing at all are also accepted.
+     *   - Only stabilities as recognized by Composer are allowed to precede a numerical identifier.
+     *   - Numerical-only pre-release identifiers are not supported, see tests.
+     *
+     *                        |--------------|
+     * [major].[minor].[patch] -[pre-release] +[build-metadata]
+     *
+     * @var string
+     */
+    private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)((?:[.-]?\d+)*+)?)?([.-]?dev)?';
 
     /** @var array */
-    private static $stabilities = array(
-        'stable', 'RC', 'beta', 'alpha', 'dev',
-    );
+    private static $stabilities = array('stable', 'RC', 'beta', 'alpha', 'dev');
 
     /**
      * Returns the stability of a version.
@@ -46,7 +56,7 @@ class VersionParser
             return 'dev';
         }
 
-        preg_match('{' . self::$modifierRegex . '$}i', strtolower($version), $match);
+        preg_match('{' . self::$modifierRegex . '(?:\+.*)?$}i', strtolower($version), $match);
         if (!empty($match[3])) {
             return 'dev';
         }
@@ -96,12 +106,7 @@ class VersionParser
         }
 
         // strip off aliasing
-        if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) {
-            $version = $match[1];
-        }
-
-        // strip off build metadata
-        if (preg_match('{^([^,\s+]+)\+[^\s]+$}', $version, $match)) {
+        if (preg_match('{^([^,\s]++) ++as ++([^,\s]++)$}', $version, $match)) {
             $version = $match[1];
         }
 
@@ -110,12 +115,18 @@ class VersionParser
             return '9999999-dev';
         }
 
+        // if requirement is branch-like, use full name
         if ('dev-' === strtolower(substr($version, 0, 4))) {
             return 'dev-' . substr($version, 4);
         }
 
+        // strip off build metadata
+        if (preg_match('{^([^,\s+]++)\+[^\s]++$}', $version, $match)) {
+            $version = $match[1];
+        }
+
         // match classical versioning
-        if (preg_match('{^v?(\d{1,5})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
+        if (preg_match('{^v?(\d{1,5})(\.\d++)?(\.\d++)?(\.\d++)?' . self::$modifierRegex . '$}i', $version, $matches)) {
             $version = $matches[1]
                 . (!empty($matches[2]) ? $matches[2] : '.0')
                 . (!empty($matches[3]) ? $matches[3] : '.0')
@@ -123,7 +134,7 @@ class VersionParser
             $index = 5;
         // match date(time) based versioning
         } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) {
-            $version = preg_replace('{\D}', '-', $matches[1]);
+            $version = preg_replace('{\D}', '.', $matches[1]);
             $index = 2;
         }
 
@@ -133,7 +144,7 @@ class VersionParser
                 if ('stable' === $matches[$index]) {
                     return $version;
                 }
-                $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
+                $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? ltrim($matches[$index + 1], '.-') : '');
             }
 
             if (!empty($matches[$index + 2])) {
@@ -170,7 +181,7 @@ class VersionParser
      */
     public function parseNumericAliasPrefix($branch)
     {
-        if (preg_match('{^(?P<version>(\d+\\.)*\d+)(?:\.x)?-dev$}i', $branch, $matches)) {
+        if (preg_match('{^(?P<version>(\d++\\.)*\d++)(?:\.x)?-dev$}i', $branch, $matches)) {
             return $matches['version'] . '.';
         }
 
@@ -192,7 +203,7 @@ class VersionParser
             return $this->normalize($name);
         }
 
-        if (preg_match('{^v?(\d+)(\.(?:\d+|[xX*]))?(\.(?:\d+|[xX*]))?(\.(?:\d+|[xX*]))?$}i', $name, $matches)) {
+        if (preg_match('{^v?(\d++)(\.(?:\d++|[xX*]))?(\.(?:\d++|[xX*]))?(\.(?:\d++|[xX*]))?$}i', $name, $matches)) {
             $version = '';
             for ($i = 1; $i < 5; ++$i) {
                 $version .= isset($matches[$i]) ? str_replace(array('*', 'X'), 'x', $matches[$i]) : '.x';
@@ -205,7 +216,7 @@ class VersionParser
     }
 
     /**
-     * Parses as constraint string into LinkConstraint objects.
+     * Parses a constraint string into MultiConstraint and/or Constraint objects.
      *
      * @param string $constraints
      *
@@ -249,6 +260,23 @@ class VersionParser
 
         if (1 === count($orGroups)) {
             $constraint = $orGroups[0];
+        } elseif (2 === count($orGroups)
+            // parse the two OR groups and if they are contiguous we collapse
+            // them into one constraint
+            && $orGroups[0] instanceof MultiConstraint
+            && $orGroups[1] instanceof MultiConstraint
+            && 2 === count($orGroups[0]->getConstraints())
+            && 2 === count($orGroups[1]->getConstraints())
+            && ($a = (string) $orGroups[0])
+            && substr($a, 0, 3) === '[>=' && (false !== ($posA = strpos($a, '<', 4)))
+            && ($b = (string) $orGroups[1])
+            && substr($b, 0, 3) === '[>=' && (false !== ($posB = strpos($b, '<', 4)))
+            && substr($a, $posA + 2, -1) === substr($b, 4, $posB - 5)
+        ) {
+            $constraint = new MultiConstraint(array(
+                new Constraint('>=', substr($a, 4, $posA - 5)),
+                new Constraint('<', substr($b, $posB + 2, -1)),
+            ));
         } else {
             $constraint = new MultiConstraint($orGroups, false);
         }
@@ -274,11 +302,11 @@ class VersionParser
             }
         }
 
-        if (preg_match('{^[xX*](\.[xX*])*$}i', $constraint)) {
+        if (preg_match('{^v?[xX*](\.[xX*])*$}i', $constraint)) {
             return array(new EmptyConstraint());
         }
 
-        $versionRegex = 'v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.(\d+))?' . self::$modifierRegex . '(?:\+[^\s]+)?';
+        $versionRegex = 'v?(\d++)(?:\.(\d++))?(?:\.(\d++))?(?:\.(\d++))?' . self::$modifierRegex . '(?:\+[^\s]+)?';
 
         // Tilde Range
         //
@@ -372,7 +400,7 @@ class VersionParser
         //
         // Any of X, x, or * may be used to "stand in" for one of the numeric values in the [major, minor, patch] tuple.
         // A partial version range is treated as an X-Range, so the special character is in fact optional.
-        if (preg_match('{^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.[xX*])+$}', $constraint, $matches)) {
+        if (preg_match('{^v?(\d++)(?:\.(\d++))?(?:\.(\d++))?(?:\.[xX*])++$}', $constraint, $matches)) {
             if (isset($matches[3]) && '' !== $matches[3]) {
                 $position = 3;
             } elseif (isset($matches[2]) && '' !== $matches[2]) {
diff --git a/web/vendor/doctrine/cache/.travis.yml b/web/vendor/doctrine/cache/.travis.yml
index 2952a4817..a16fd9d93 100644
--- a/web/vendor/doctrine/cache/.travis.yml
+++ b/web/vendor/doctrine/cache/.travis.yml
@@ -1,11 +1,17 @@
 language: php
 
+sudo: false
+
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache
+
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
+    - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
 
 services:
     - riak
@@ -14,13 +20,14 @@ services:
     - redis-server
 
 before_install:
-    - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then pecl install riak-beta; fi"
-    - sh -c "if [[ $TRAVIS_PHP_VERSION != 'hhvm' && `php-config --vernum` -ge 50500 ]] ; then pecl config-set preferred_state beta; printf "yes\n" | pecl install apcu ; else echo 'extension="apc.so"' >> ./tests/travis/php.ini ;fi"
-    - composer self-update
-    - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-add ./tests/travis/php.ini; fi"
+    - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]] ; then pecl channel-update pecl.php.net; fi;
+    - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then pecl install riak-beta; fi;
+    - if [[ $TRAVIS_PHP_VERSION =~ 5.[56] ]] ; then echo yes | pecl install apcu-4.0.10; fi;
+    - if [[ $TRAVIS_PHP_VERSION = 7.* ]] ; then pecl config-set preferred_state beta; echo yes | pecl install apcu; fi;
+    - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-add ./tests/travis/php.ini; fi;
 
 install:
-    - composer --prefer-source --dev install
+    - travis_retry composer install
 
 script:
     - ./vendor/bin/phpunit -c ./tests/travis/phpunit.travis.xml -v
@@ -29,5 +36,7 @@ after_script:
     - php vendor/bin/coveralls -v
 
 matrix:
-  allow_failures:
-    - php: hhvm
+    fast_finish: true
+    allow_failures:
+        - php: hhvm
+        - php: 7.0
diff --git a/web/vendor/doctrine/cache/LICENSE b/web/vendor/doctrine/cache/LICENSE
index 4a91f0bf2..8c38cc1bc 100644
--- a/web/vendor/doctrine/cache/LICENSE
+++ b/web/vendor/doctrine/cache/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2012 Doctrine Project
+Copyright (c) 2006-2015 Doctrine Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/web/vendor/doctrine/cache/composer.json b/web/vendor/doctrine/cache/composer.json
index f3caa7a88..7ef1727a1 100644
--- a/web/vendor/doctrine/cache/composer.json
+++ b/web/vendor/doctrine/cache/composer.json
@@ -13,10 +13,10 @@
         {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
     ],
     "require": {
-        "php": ">=5.3.2"
+        "php": "~5.5|~7.0"
     },
     "require-dev": {
-        "phpunit/phpunit":         ">=3.7",
+        "phpunit/phpunit":         "~4.8|~5.0",
         "satooshi/php-coveralls":  "~0.6",
         "predis/predis":           "~1.0"
     },
@@ -24,11 +24,14 @@
         "doctrine/common": ">2.2,<2.4"
     },
     "autoload": {
-        "psr-0": { "Doctrine\\Common\\Cache\\": "lib/" }
+        "psr-4": { "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.5.x-dev"
+            "dev-master": "1.6.x-dev"
         }
     }
 }
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php
index abd5e71c2..0dfbd6a1d 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php
@@ -22,13 +22,14 @@ namespace Doctrine\Common\Cache;
 /**
  * APC cache provider.
  *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
+ * @link       www.doctrine-project.org
+ * @deprecated since version 1.6, use ApcuCache instead
+ * @since      2.0
+ * @author     Benjamin Eberlei <kontakt@beberlei.de>
+ * @author     Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author     Jonathan Wage <jonwage@gmail.com>
+ * @author     Roman Borschel <roman@code-factory.org>
+ * @author     David Abdemoulaie <dave@hobodave.com>
  */
 class ApcCache extends CacheProvider
 {
@@ -53,7 +54,7 @@ class ApcCache extends CacheProvider
      */
     protected function doSave($id, $data, $lifeTime = 0)
     {
-        return (bool) apc_store($id, $data, (int) $lifeTime);
+        return apc_store($id, $data, $lifeTime);
     }
 
     /**
@@ -61,7 +62,8 @@ class ApcCache extends CacheProvider
      */
     protected function doDelete($id)
     {
-        return apc_delete($id);
+        // apc_delete returns false if the id does not exist
+        return apc_delete($id) || ! apc_exists($id);
     }
 
     /**
@@ -77,7 +79,17 @@ class ApcCache extends CacheProvider
      */
     protected function doFetchMultiple(array $keys)
     {
-        return apc_fetch($keys);
+        return apc_fetch($keys) ?: [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
+    {
+        $result = apc_store($keysAndValues, null, $lifetime);
+
+        return empty($result);
     }
 
     /**
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcuCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcuCache.php
new file mode 100644
index 000000000..2a91752ba
--- /dev/null
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcuCache.php
@@ -0,0 +1,106 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * APCu cache provider.
+ *
+ * @link   www.doctrine-project.org
+ * @since  1.6
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class ApcuCache extends CacheProvider
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        return apcu_fetch($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        return apcu_exists($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        return apcu_store($id, $data, $lifeTime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        // apcu_delete returns false if the id does not exist
+        return apcu_delete($id) || ! apcu_exists($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        return apcu_clear_cache();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetchMultiple(array $keys)
+    {
+        return apcu_fetch($keys) ?: [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
+    {
+        $result = apcu_store($keysAndValues, null, $lifetime);
+
+        return empty($result);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        $info = apcu_cache_info(true);
+        $sma  = apcu_sma_info();
+
+        return array(
+            Cache::STATS_HITS             => $info['num_hits'],
+            Cache::STATS_MISSES           => $info['num_misses'],
+            Cache::STATS_UPTIME           => $info['start_time'],
+            Cache::STATS_MEMORY_USAGE     => $info['mem_size'],
+            Cache::STATS_MEMORY_AVAILABLE => $sma['avail_mem'],
+        );
+    }
+}
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php
index 31a072901..6610cc217 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php
@@ -33,16 +33,47 @@ namespace Doctrine\Common\Cache;
 class ArrayCache extends CacheProvider
 {
     /**
-     * @var array $data
+     * @var array[] $data each element being a tuple of [$data, $expiration], where the expiration is int|bool
      */
-    private $data = array();
+    private $data = [];
+
+    /**
+     * @var int
+     */
+    private $hitsCount = 0;
+
+    /**
+     * @var int
+     */
+    private $missesCount = 0;
+
+    /**
+     * @var int
+     */
+    private $upTime;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        $this->upTime = time();
+    }
 
     /**
      * {@inheritdoc}
      */
     protected function doFetch($id)
     {
-        return $this->doContains($id) ? $this->data[$id] : false;
+        if (! $this->doContains($id)) {
+            $this->missesCount += 1;
+
+            return false;
+        }
+
+        $this->hitsCount += 1;
+
+        return $this->data[$id][0];
     }
 
     /**
@@ -50,8 +81,19 @@ class ArrayCache extends CacheProvider
      */
     protected function doContains($id)
     {
-        // isset() is required for performance optimizations, to avoid unnecessary function calls to array_key_exists.
-        return isset($this->data[$id]) || array_key_exists($id, $this->data);
+        if (! isset($this->data[$id])) {
+            return false;
+        }
+
+        $expiration = $this->data[$id][1];
+
+        if ($expiration && $expiration < time()) {
+            $this->doDelete($id);
+
+            return false;
+        }
+
+        return true;
     }
 
     /**
@@ -59,7 +101,7 @@ class ArrayCache extends CacheProvider
      */
     protected function doSave($id, $data, $lifeTime = 0)
     {
-        $this->data[$id] = $data;
+        $this->data[$id] = [$data, $lifeTime ? time() + $lifeTime : false];
 
         return true;
     }
@@ -79,7 +121,7 @@ class ArrayCache extends CacheProvider
      */
     protected function doFlush()
     {
-        $this->data = array();
+        $this->data = [];
 
         return true;
     }
@@ -89,6 +131,12 @@ class ArrayCache extends CacheProvider
      */
     protected function doGetStats()
     {
-        return null;
+        return [
+            Cache::STATS_HITS             => $this->hitsCount,
+            Cache::STATS_MISSES           => $this->missesCount,
+            Cache::STATS_UPTIME           => $this->upTime,
+            Cache::STATS_MEMORY_USAGE     => null,
+            Cache::STATS_MEMORY_AVAILABLE => null,
+        ];
     }
 }
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php
index 205a12327..89fe32307 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php
@@ -59,19 +59,22 @@ interface Cache
      *
      * @param string $id The cache id of the entry to check for.
      *
-     * @return boolean TRUE if a cache entry exists for the given cache id, FALSE otherwise.
+     * @return bool TRUE if a cache entry exists for the given cache id, FALSE otherwise.
      */
     public function contains($id);
 
     /**
      * Puts data into the cache.
      *
+     * If a cache entry with the given id already exists, its data will be replaced.
+     *
      * @param string $id       The cache id.
      * @param mixed  $data     The cache entry/data.
-     * @param int    $lifeTime The cache lifetime.
-     *                         If != 0, sets a specific lifetime for this cache entry (0 => infinite lifeTime).
+     * @param int    $lifeTime The lifetime in number of seconds for this cache entry.
+     *                         If zero (the default), the entry never expires (although it may be deleted from the cache
+     *                         to make place for other entries).
      *
-     * @return boolean TRUE if the entry was successfully stored in the cache, FALSE otherwise.
+     * @return bool TRUE if the entry was successfully stored in the cache, FALSE otherwise.
      */
     public function save($id, $data, $lifeTime = 0);
 
@@ -80,7 +83,8 @@ interface Cache
      *
      * @param string $id The cache id.
      *
-     * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise.
+     * @return bool TRUE if the cache entry was successfully deleted, FALSE otherwise.
+     *              Deleting a non-existing entry is considered successful.
      */
     public function delete($id);
 
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php
index a172a4ceb..9f579237a 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php
@@ -29,7 +29,7 @@ namespace Doctrine\Common\Cache;
  * @author Roman Borschel <roman@code-factory.org>
  * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
  */
-abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, MultiGetCache
+abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, MultiGetCache, MultiPutCache
 {
     const DOCTRINE_NAMESPACE_CACHEKEY = 'DoctrineNamespaceCacheKey[%s]';
 
@@ -83,6 +83,10 @@ abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, M
      */
     public function fetchMultiple(array $keys)
     {
+        if (empty($keys)) {
+            return array();
+        }
+        
         // note: the array_combine() is in place to keep an association between our $keys and the $namespacedKeys
         $namespacedKeys = array_combine($keys, array_map(array($this, 'getNamespacedId'), $keys));
         $items          = $this->doFetchMultiple($namespacedKeys);
@@ -91,7 +95,7 @@ abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, M
         // no internal array function supports this sort of mapping: needs to be iterative
         // this filters and combines keys in one pass
         foreach ($namespacedKeys as $requestedKey => $namespacedKey) {
-            if (isset($items[$namespacedKey])) {
+            if (isset($items[$namespacedKey]) || array_key_exists($namespacedKey, $items)) {
                 $foundItems[$requestedKey] = $items[$namespacedKey];
             }
         }
@@ -99,6 +103,19 @@ abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, M
         return $foundItems;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function saveMultiple(array $keysAndValues, $lifetime = 0)
+    {
+        $namespacedKeysAndValues = array();
+        foreach ($keysAndValues as $key => $value) {
+            $namespacedKeysAndValues[$this->getNamespacedId($key)] = $value;
+        }
+
+        return $this->doSaveMultiple($namespacedKeysAndValues, $lifetime);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -147,9 +164,13 @@ abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, M
         $namespaceCacheKey = $this->getNamespaceCacheKey();
         $namespaceVersion  = $this->getNamespaceVersion() + 1;
 
-        $this->namespaceVersion = $namespaceVersion;
+        if ($this->doSave($namespaceCacheKey, $namespaceVersion)) {
+            $this->namespaceVersion = $namespaceVersion;
 
-        return $this->doSave($namespaceCacheKey, $namespaceVersion);
+            return true;
+        }
+
+        return false;
     }
 
     /**
@@ -188,15 +209,7 @@ abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, M
         }
 
         $namespaceCacheKey = $this->getNamespaceCacheKey();
-        $namespaceVersion = $this->doFetch($namespaceCacheKey);
-
-        if (false === $namespaceVersion) {
-            $namespaceVersion = 1;
-
-            $this->doSave($namespaceCacheKey, $namespaceVersion);
-        }
-
-        $this->namespaceVersion = $namespaceVersion;
+        $this->namespaceVersion = $this->doFetch($namespaceCacheKey) ?: 1;
 
         return $this->namespaceVersion;
     }
@@ -211,8 +224,8 @@ abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, M
     {
         $returnValues = array();
 
-        foreach ($keys as $index => $key) {
-            if (false !== ($item = $this->doFetch($key))) {
+        foreach ($keys as $key) {
+            if (false !== ($item = $this->doFetch($key)) || $this->doContains($key)) {
                 $returnValues[$key] = $item;
             }
         }
@@ -225,7 +238,7 @@ abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, M
      *
      * @param string $id The id of the cache entry to fetch.
      *
-     * @return mixed|boolean The cached data or FALSE, if no cache entry exists for the given id.
+     * @return mixed|false The cached data or FALSE, if no cache entry exists for the given id.
      */
     abstract protected function doFetch($id);
 
@@ -234,10 +247,32 @@ abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, M
      *
      * @param string $id The cache id of the entry to check for.
      *
-     * @return boolean TRUE if a cache entry exists for the given cache id, FALSE otherwise.
+     * @return bool TRUE if a cache entry exists for the given cache id, FALSE otherwise.
      */
     abstract protected function doContains($id);
 
+    /**
+     * Default implementation of doSaveMultiple. Each driver that supports multi-put should override it.
+     *
+     * @param array $keysAndValues  Array of keys and values to save in cache
+     * @param int   $lifetime       The lifetime. If != 0, sets a specific lifetime for these
+     *                              cache entries (0 => infinite lifeTime).
+     *
+     * @return bool TRUE if the operation was successful, FALSE if it wasn't.
+     */
+    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
+    {
+        $success = true;
+
+        foreach ($keysAndValues as $key => $value) {
+            if (!$this->doSave($key, $value, $lifetime)) {
+                $success = false;
+            }
+        }
+
+        return $success;
+    }
+
     /**
      * Puts data into the cache.
      *
@@ -246,7 +281,7 @@ abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, M
      * @param int    $lifeTime The lifetime. If != 0, sets a specific lifetime for this
      *                           cache entry (0 => infinite lifeTime).
      *
-     * @return boolean TRUE if the entry was successfully stored in the cache, FALSE otherwise.
+     * @return bool TRUE if the entry was successfully stored in the cache, FALSE otherwise.
      */
     abstract protected function doSave($id, $data, $lifeTime = 0);
 
@@ -255,14 +290,14 @@ abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, M
      *
      * @param string $id The cache id.
      *
-     * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise.
+     * @return bool TRUE if the cache entry was successfully deleted, FALSE otherwise.
      */
     abstract protected function doDelete($id);
 
     /**
      * Flushes all cache entries.
      *
-     * @return boolean TRUE if the cache entries were successfully flushed, FALSE otherwise.
+     * @return bool TRUE if the cache entries were successfully flushed, FALSE otherwise.
      */
     abstract protected function doFlush();
 
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php
index d7b4358de..3a91eaf3a 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php
@@ -34,7 +34,7 @@ interface ClearableCache
     /**
      * Deletes all cache entries in the current cache namespace.
      *
-     * @return boolean TRUE if the cache entries were successfully deleted, FALSE otherwise.
+     * @return bool TRUE if the cache entries were successfully deleted, FALSE otherwise.
      */
     public function deleteAll();
 }
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php
index 9ad3ce2c0..b2e0427e5 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php
@@ -24,6 +24,7 @@ namespace Doctrine\Common\Cache;
  *
  * @since  2.3
  * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
+ * @author Tobias Schultze <http://tobion.de>
  */
 abstract class FileCache extends CacheProvider
 {
@@ -42,22 +43,24 @@ abstract class FileCache extends CacheProvider
     private $extension;
 
     /**
-     * @var string[] regular expressions for replacing disallowed characters in file name
+     * @var int
      */
-    private $disallowedCharacterPatterns = array(
-        '/\-/', // replaced to disambiguate original `-` and `-` derived from replacements
-        '/[^a-zA-Z0-9\-_\[\]]/' // also excludes non-ascii chars (not supported, depending on FS)
-    );
-
-    /**
-     * @var string[] replacements for disallowed file characters
-     */
-    private $replacementCharacters = array('__', '-');
+    private $umask;
 
     /**
      * @var int
      */
-    private $umask;
+    private $directoryStringLength;
+
+    /**
+     * @var int
+     */
+    private $extensionStringLength;
+
+    /**
+     * @var bool
+     */
+    private $isRunningOnWindows;
 
     /**
      * Constructor.
@@ -95,6 +98,10 @@ abstract class FileCache extends CacheProvider
         // YES, this needs to be *after* createPathIfNeeded()
         $this->directory = realpath($directory);
         $this->extension = (string) $extension;
+
+        $this->directoryStringLength = strlen($this->directory);
+        $this->extensionStringLength = strlen($this->extension);
+        $this->isRunningOnWindows    = defined('PHP_WINDOWS_VERSION_BUILD');
     }
 
     /**
@@ -110,7 +117,7 @@ abstract class FileCache extends CacheProvider
     /**
      * Gets the cache file extension.
      *
-     * @return string|null
+     * @return string
      */
     public function getExtension()
     {
@@ -124,11 +131,29 @@ abstract class FileCache extends CacheProvider
      */
     protected function getFilename($id)
     {
+        $hash = hash('sha256', $id);
+
+        // This ensures that the filename is unique and that there are no invalid chars in it.
+        if (
+            '' === $id
+            || ((strlen($id) * 2 + $this->extensionStringLength) > 255)
+            || ($this->isRunningOnWindows && ($this->directoryStringLength + 4 + strlen($id) * 2 + $this->extensionStringLength) > 258)
+        ) {
+            // Most filesystems have a limit of 255 chars for each path component. On Windows the the whole path is limited
+            // to 260 chars (including terminating null char). Using long UNC ("\\?\" prefix) does not work with the PHP API.
+            // And there is a bug in PHP (https://bugs.php.net/bug.php?id=70943) with path lengths of 259.
+            // So if the id in hex representation would surpass the limit, we use the hash instead. The prefix prevents
+            // collisions between the hash and bin2hex.
+            $filename = '_' . $hash;
+        } else {
+            $filename = bin2hex($id);
+        }
+
         return $this->directory
             . DIRECTORY_SEPARATOR
-            . implode(str_split(hash('sha256', $id), 2), DIRECTORY_SEPARATOR)
+            . substr($hash, 0, 2)
             . DIRECTORY_SEPARATOR
-            . preg_replace($this->disallowedCharacterPatterns, $this->replacementCharacters, $id)
+            . $filename
             . $this->extension;
     }
 
@@ -137,7 +162,9 @@ abstract class FileCache extends CacheProvider
      */
     protected function doDelete($id)
     {
-        return @unlink($this->getFilename($id));
+        $filename = $this->getFilename($id);
+
+        return @unlink($filename) || ! file_exists($filename);
     }
 
     /**
@@ -146,7 +173,16 @@ abstract class FileCache extends CacheProvider
     protected function doFlush()
     {
         foreach ($this->getIterator() as $name => $file) {
-            @unlink($name);
+            if ($file->isDir()) {
+                // Remove the intermediate directories which have been created to balance the tree. It only takes effect
+                // if the directory is empty. If several caches share the same directory but with different file extensions,
+                // the other ones are not removed.
+                @rmdir($name);
+            } elseif ($this->isFilenameEndingWithExtension($name)) {
+                // If an extension is set, only remove files which end with the given extension.
+                // If no extension is set, we have no other choice than removing everything.
+                @unlink($name);
+            }
         }
 
         return true;
@@ -158,8 +194,10 @@ abstract class FileCache extends CacheProvider
     protected function doGetStats()
     {
         $usage = 0;
-        foreach ($this->getIterator() as $file) {
-            $usage += $file->getSize();
+        foreach ($this->getIterator() as $name => $file) {
+            if (! $file->isDir() && $this->isFilenameEndingWithExtension($name)) {
+                $usage += $file->getSize();
+            }
         }
 
         $free = disk_free_space($this->directory);
@@ -229,9 +267,20 @@ abstract class FileCache extends CacheProvider
      */
     private function getIterator()
     {
-        return new \RegexIterator(
-            new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory)),
-            '/^.+' . preg_quote($this->extension, '/') . '$/i'
+        return new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
         );
     }
+
+    /**
+     * @param string $name The filename
+     *
+     * @return bool
+     */
+    private function isFilenameEndingWithExtension($name)
+    {
+        return '' === $this->extension
+            || strrpos($name, $this->extension) === (strlen($name) - $this->extensionStringLength);
+    }
 }
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php
index 29d5e0746..d988294f6 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php
@@ -53,7 +53,7 @@ class FilesystemCache extends FileCache
         $resource = fopen($filename, "r");
 
         if (false !== ($line = fgets($resource))) {
-            $lifetime = (integer) $line;
+            $lifetime = (int) $line;
         }
 
         if ($lifetime !== 0 && $lifetime < time()) {
@@ -86,7 +86,7 @@ class FilesystemCache extends FileCache
         $resource = fopen($filename, "r");
 
         if (false !== ($line = fgets($resource))) {
-            $lifetime = (integer) $line;
+            $lifetime = (int) $line;
         }
 
         fclose($resource);
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php
index e4e606b17..4311d4f59 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php
@@ -31,7 +31,7 @@ interface FlushableCache
     /**
      * Flushes all cache entries, globally.
      *
-     * @return boolean TRUE if the cache entries were successfully flushed, FALSE otherwise.
+     * @return bool TRUE if the cache entries were successfully flushed, FALSE otherwise.
      */
     public function flushAll();
 }
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php
index c5098fd97..8afaeeacc 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php
@@ -97,7 +97,8 @@ class MemcacheCache extends CacheProvider
      */
     protected function doDelete($id)
     {
-        return $this->memcache->delete($id);
+        // Memcache::delete() returns false if entry does not exist
+        return $this->memcache->delete($id) || ! $this->doContains($id);
     }
 
     /**
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php
index 040c26c02..dc4016b59 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php
@@ -74,7 +74,19 @@ class MemcachedCache extends CacheProvider
      */
     protected function doFetchMultiple(array $keys)
     {
-        return $this->memcached->getMulti($keys);
+        return $this->memcached->getMulti($keys) ?: [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
+    {
+        if ($lifetime > 30 * 24 * 3600) {
+            $lifetime = time() + $lifetime;
+        }
+
+        return $this->memcached->setMulti($keysAndValues, $lifetime);
     }
 
     /**
@@ -82,7 +94,8 @@ class MemcachedCache extends CacheProvider
      */
     protected function doContains($id)
     {
-        return (false !== $this->memcached->get($id));
+        return false !== $this->memcached->get($id)
+            || $this->memcached->getResultCode() !== Memcached::RES_NOTFOUND;
     }
 
     /**
@@ -101,7 +114,8 @@ class MemcachedCache extends CacheProvider
      */
     protected function doDelete($id)
     {
-        return $this->memcached->delete($id);
+        return $this->memcached->delete($id)
+            || $this->memcached->getResultCode() === Memcached::RES_NOTFOUND;
     }
 
     /**
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php
index 0c7ac0a09..75fe0ca11 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php
@@ -21,6 +21,7 @@ namespace Doctrine\Common\Cache;
 
 use MongoBinData;
 use MongoCollection;
+use MongoCursorException;
 use MongoDate;
 
 /**
@@ -41,7 +42,7 @@ class MongoDBCache extends CacheProvider
      * cache entry should expire.
      *
      * With MongoDB 2.2+, entries can be automatically deleted by MongoDB by
-     * indexing this field wit the "expireAfterSeconds" option equal to zero.
+     * indexing this field with the "expireAfterSeconds" option equal to zero.
      * This will direct MongoDB to regularly query for and delete any entries
      * whose date is older than the current time. Entries without a date value
      * in this field will be ignored.
@@ -119,14 +120,18 @@ class MongoDBCache extends CacheProvider
      */
     protected function doSave($id, $data, $lifeTime = 0)
     {
-        $result = $this->collection->update(
-            array('_id' => $id),
-            array('$set' => array(
-                self::EXPIRATION_FIELD => ($lifeTime > 0 ? new MongoDate(time() + $lifeTime) : null),
-                self::DATA_FIELD => new MongoBinData(serialize($data), MongoBinData::BYTE_ARRAY),
-            )),
-            array('upsert' => true, 'multiple' => false)
-        );
+        try {
+            $result = $this->collection->update(
+                array('_id' => $id),
+                array('$set' => array(
+                    self::EXPIRATION_FIELD => ($lifeTime > 0 ? new MongoDate(time() + $lifeTime) : null),
+                    self::DATA_FIELD => new MongoBinData(serialize($data), MongoBinData::BYTE_ARRAY),
+                )),
+                array('upsert' => true, 'multiple' => false)
+            );
+        } catch (MongoCursorException $e) {
+            return false;
+        }
 
         return isset($result['ok']) ? $result['ok'] == 1 : true;
     }
@@ -138,7 +143,7 @@ class MongoDBCache extends CacheProvider
     {
         $result = $this->collection->remove(array('_id' => $id));
 
-        return isset($result['n']) ? $result['n'] == 1 : true;
+        return isset($result['ok']) ? $result['ok'] == 1 : true;
     }
 
     /**
@@ -170,8 +175,8 @@ class MongoDBCache extends CacheProvider
         return array(
             Cache::STATS_HITS => null,
             Cache::STATS_MISSES => null,
-            Cache::STATS_UPTIME => (isset($serverStatus['uptime']) ? (integer) $serverStatus['uptime'] : null),
-            Cache::STATS_MEMORY_USAGE => (isset($collStats['size']) ? (integer) $collStats['size'] : null),
+            Cache::STATS_UPTIME => (isset($serverStatus['uptime']) ? (int) $serverStatus['uptime'] : null),
+            Cache::STATS_MEMORY_USAGE => (isset($collStats['size']) ? (int) $collStats['size'] : null),
             Cache::STATS_MEMORY_AVAILABLE  => null,
         );
     }
@@ -180,7 +185,8 @@ class MongoDBCache extends CacheProvider
      * Check if the document is expired.
      *
      * @param array $document
-     * @return boolean
+     *
+     * @return bool
      */
     private function isExpired(array $document)
     {
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiPutCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiPutCache.php
new file mode 100644
index 000000000..bf87ea9f1
--- /dev/null
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiPutCache.php
@@ -0,0 +1,41 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * Interface for cache drivers that allows to put many items at once.
+ *
+ * @link   www.doctrine-project.org
+ * @since  1.6
+ * @author Daniel Gorgan <danut007ro@gmail.com>
+ */
+interface MultiPutCache
+{
+    /**
+     * Returns a boolean value indicating if the operation succeeded.
+     *
+     * @param array $keysAndValues  Array of keys and values to save in cache
+     * @param int   $lifetime       The lifetime. If != 0, sets a specific lifetime for these
+     *                              cache entries (0 => infinite lifeTime).
+     *
+     * @return bool TRUE if the operation was successful, FALSE if it wasn't.
+     */
+    function saveMultiple(array $keysAndValues, $lifetime = 0);
+}
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php
index 823477e6c..bcd27497e 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php
@@ -2,7 +2,7 @@
 
 namespace Doctrine\Common\Cache;
 
-use Predis\Client;
+use Predis\ClientInterface;
 
 /**
  * Predis cache provider.
@@ -12,16 +12,16 @@ use Predis\Client;
 class PredisCache extends CacheProvider
 {
     /**
-     * @var Client
+     * @var ClientInterface
      */
     private $client;
 
     /**
-     * @param Client $client
+     * @param ClientInterface $client
      *
      * @return void
      */
-    public function __construct(Client $client)
+    public function __construct(ClientInterface $client)
     {
         $this->client = $client;
     }
@@ -46,14 +46,43 @@ class PredisCache extends CacheProvider
     {
         $fetchedItems = call_user_func_array(array($this->client, 'mget'), $keys);
 
-        return array_filter(array_combine($keys, array_map('unserialize', $fetchedItems)));
+        return array_map('unserialize', array_filter(array_combine($keys, $fetchedItems)));
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
+    {
+        if ($lifetime) {
+            $success = true;
+
+            // Keys have lifetime, use SETEX for each of them
+            foreach ($keysAndValues as $key => $value) {
+                $response = $this->client->setex($key, $lifetime, serialize($value));
+
+                if ((string) $response != 'OK') {
+                    $success = false;
+                }
+            }
+
+            return $success;
+        }
+
+        // No lifetime, use MSET
+        $response = $this->client->mset(array_map(function ($value) {
+            return serialize($value);
+        }, $keysAndValues));
+
+        return (string) $response == 'OK';
+    }
+
     /**
      * {@inheritdoc}
      */
     protected function doContains($id)
     {
-        return $this->client->exists($id);
+        return (bool) $this->client->exists($id);
     }
 
     /**
@@ -76,7 +105,7 @@ class PredisCache extends CacheProvider
      */
     protected function doDelete($id)
     {
-        return $this->client->del($id) > 0;
+        return $this->client->del($id) >= 0;
     }
 
     /**
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php
index 50d7c917e..22add6679 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php
@@ -71,7 +71,40 @@ class RedisCache extends CacheProvider
      */
     protected function doFetchMultiple(array $keys)
     {
-        return array_filter(array_combine($keys, $this->redis->mget($keys)));
+        $fetchedItems = array_combine($keys, $this->redis->mget($keys));
+
+        // Redis mget returns false for keys that do not exist. So we need to filter those out unless it's the real data.
+        $foundItems   = array();
+
+        foreach ($fetchedItems as $key => $value) {
+            if (false !== $value || $this->redis->exists($key)) {
+                $foundItems[$key] = $value;
+            }
+        }
+
+        return $foundItems;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
+    {
+        if ($lifetime) {
+            $success = true;
+
+            // Keys have lifetime, use SETEX for each of them
+            foreach ($keysAndValues as $key => $value) {
+                if (!$this->redis->setex($key, $lifetime, $value)) {
+                    $success = false;
+                }
+            }
+
+            return $success;
+        }
+
+        // No lifetime, use MSET
+        return (bool) $this->redis->mset($keysAndValues);
     }
 
     /**
@@ -99,7 +132,7 @@ class RedisCache extends CacheProvider
      */
     protected function doDelete($id)
     {
-        return $this->redis->delete($id) > 0;
+        return $this->redis->delete($id) >= 0;
     }
 
     /**
@@ -137,6 +170,11 @@ class RedisCache extends CacheProvider
         if (defined('HHVM_VERSION')) {
             return Redis::SERIALIZER_PHP;
         }
-        return defined('Redis::SERIALIZER_IGBINARY') ? Redis::SERIALIZER_IGBINARY : Redis::SERIALIZER_PHP;
+
+        if (defined('Redis::SERIALIZER_IGBINARY') && extension_loaded('igbinary')) {
+            return Redis::SERIALIZER_IGBINARY;
+        }
+
+        return Redis::SERIALIZER_PHP;
     }
 }
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php
index 8bb6b4bf9..0baa3f253 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php
@@ -202,7 +202,7 @@ class RiakCache extends CacheProvider
      *
      * @param \Riak\Object $object
      *
-     * @return boolean
+     * @return bool
      */
     private function isExpired(Object $object)
     {
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php
index b12978c49..0bf6e4d44 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php
@@ -98,7 +98,7 @@ class SQLite3Cache extends CacheProvider
      */
     protected function doContains($id)
     {
-        return (boolean) $this->findById($id, false);
+        return null !== $this->findById($id, false);
     }
 
     /**
@@ -157,7 +157,7 @@ class SQLite3Cache extends CacheProvider
      * Find a single row by ID.
      *
      * @param mixed $id
-     * @param boolean $includeData
+     * @param bool $includeData
      *
      * @return array|null
      */
@@ -208,7 +208,8 @@ class SQLite3Cache extends CacheProvider
      * Check if the item is expired.
      *
      * @param array $item
-     * @return boolean
+     *
+     * @return bool
      */
     private function isExpired(array $item)
     {
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php
index d742fa080..a6399ecc1 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php
@@ -21,5 +21,5 @@ namespace Doctrine\Common\Cache;
 
 class Version
 {
-    const VERSION = '1.4.0-DEV';
+    const VERSION = '1.6.1-DEV';
 }
diff --git a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php
index ae3277293..8a250b29a 100644
--- a/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php
+++ b/web/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php
@@ -53,7 +53,7 @@ class WinCacheCache extends CacheProvider
      */
     protected function doSave($id, $data, $lifeTime = 0)
     {
-        return (bool) wincache_ucache_set($id, $data, (int) $lifeTime);
+        return wincache_ucache_set($id, $data, $lifeTime);
     }
 
     /**
@@ -72,6 +72,24 @@ class WinCacheCache extends CacheProvider
         return wincache_ucache_clear();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetchMultiple(array $keys)
+    {
+        return wincache_ucache_get($keys);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
+    {
+        $result = wincache_ucache_set($keysAndValues, null, $lifetime);
+
+        return empty($result);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/web/vendor/doctrine/cache/phpunit.xml.dist b/web/vendor/doctrine/cache/phpunit.xml.dist
index 34d7f4c87..40cc24dee 100644
--- a/web/vendor/doctrine/cache/phpunit.xml.dist
+++ b/web/vendor/doctrine/cache/phpunit.xml.dist
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./tests/Doctrine/Tests/TestInit.php"
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+    backupGlobals="false"
+    colors="true"
+    bootstrap="vendor/autoload.php"
 >
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
     <testsuites>
         <testsuite name="Doctrine Cache Test Suite">
             <directory>./tests/Doctrine/</directory>
diff --git a/web/vendor/doctrine/collections/.gitignore b/web/vendor/doctrine/collections/.gitignore
deleted file mode 100644
index 48b8bf907..000000000
--- a/web/vendor/doctrine/collections/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor/
diff --git a/web/vendor/doctrine/collections/.travis.yml b/web/vendor/doctrine/collections/.travis.yml
deleted file mode 100644
index 60f479277..000000000
--- a/web/vendor/doctrine/collections/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-  - hhvm-nightly
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: 7.0
-
-before_script:
-    - composer --prefer-source install
-
-script:
-    - phpunit
diff --git a/web/vendor/doctrine/collections/CONTRIBUTING.md b/web/vendor/doctrine/collections/CONTRIBUTING.md
new file mode 100644
index 000000000..407a66521
--- /dev/null
+++ b/web/vendor/doctrine/collections/CONTRIBUTING.md
@@ -0,0 +1,67 @@
+# Contribute to Doctrine
+
+Thank you for contributing to Doctrine!
+
+Before we can merge your Pull-Request here are some guidelines that you need to follow.
+These guidelines exist not to annoy you, but to keep the code base clean,
+unified and future proof.
+
+## We only accept PRs  to "master"
+
+Our branching strategy is "everything to master first", even
+bugfixes and we then merge them into the stable branches. You should only 
+open pull requests against the master branch. Otherwise we cannot accept the PR.
+
+There is one exception to the rule, when we merged a bug into some stable branches
+we do occasionally accept pull requests that merge the same bug fix into earlier
+branches.
+
+## Coding Standard
+
+We use [doctrine coding standard](https://github.com/doctrine/coding-standard) which is PSR-1 and PSR-2:
+
+* https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md
+* https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
+
+with some exceptions/differences:
+
+* Keep the nesting of control structures per method as small as possible
+* Align equals (=) signs
+* Add spaces between assignment, control and return statements
+* Prefer early exit over nesting conditions
+* Add spaces around a negation if condition ``if ( ! $cond)``
+* Add legal information at the beginning of each source file
+* Add ``@author`` [phpDoc](https://www.phpdoc.org/docs/latest/references/phpdoc/tags/author.html) comment at DockBlock of class/interface/trait that you create.
+
+## Unit-Tests
+
+Please try to add a test for your pull-request.
+
+* If you want to contribute new functionality add unit- or functional tests
+  depending on the scope of the feature.
+
+You can run the unit-tests by calling ``vendor/bin/phpunit`` from the root of the project.
+It will run all the project tests.
+
+In order to do that, you will need a fresh copy of doctrine/collections, and you
+will have to run a composer installation in the project:
+
+```sh
+git clone git@github.com:doctrine/collections.git
+cd collections
+curl -sS https://getcomposer.org/installer | php --
+./composer.phar install
+```
+
+## Travis
+
+We automatically run your pull request through [Travis CI](https://www.travis-ci.org)
+against supported PHP versions. If you break the tests, we cannot merge your code,
+so please make sure that your code is working before opening up a Pull-Request.
+
+## Getting merged
+
+Please allow us time to review your pull requests. We will give our best to review
+everything as fast as possible, but cannot always live up to our own expectations.
+
+Thank you very much again for your contribution!
diff --git a/web/vendor/doctrine/collections/README.md b/web/vendor/doctrine/collections/README.md
index 161cab63c..81e06d0ce 100644
--- a/web/vendor/doctrine/collections/README.md
+++ b/web/vendor/doctrine/collections/README.md
@@ -1,6 +1,8 @@
 # Doctrine Collections
 
 [![Build Status](https://travis-ci.org/doctrine/collections.svg?branch=master)](https://travis-ci.org/doctrine/collections)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/doctrine/collections/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/doctrine/collections/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/doctrine/collections/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/doctrine/collections/?branch=master)
 
 Collections Abstraction library
 
diff --git a/web/vendor/doctrine/collections/composer.json b/web/vendor/doctrine/collections/composer.json
index 155cac48f..385fa93d2 100644
--- a/web/vendor/doctrine/collections/composer.json
+++ b/web/vendor/doctrine/collections/composer.json
@@ -13,17 +13,23 @@
         {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
     ],
     "require": {
-        "php": ">=5.3.2"
+        "php": "^5.6 || ^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "^5.7",
+        "doctrine/coding-standard": "~0.1@dev"
     },
     "autoload": {
         "psr-0": { "Doctrine\\Common\\Collections\\": "lib/" }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Doctrine\\Tests\\": "tests/Doctrine/Tests"
+        }
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2.x-dev"
+            "dev-master": "1.3.x-dev"
         }
     }
 }
diff --git a/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php b/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
index bce575120..7ddd068e5 100644
--- a/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
+++ b/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
@@ -26,6 +26,11 @@ use Doctrine\Common\Collections\Expr\ClosureExpressionVisitor;
 /**
  * An ArrayCollection is a Collection implementation that wraps a regular PHP array.
  *
+ * Warning: Using (un-)serialize() on a collection is not a supported use-case
+ * and may break when we change the internals in the future. If you need to
+ * serialize a collection use {@link toArray()} and reconstruct the collection
+ * manually.
+ *
  * @since  2.0
  * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
  * @author Jonathan Wage <jonwage@gmail.com>
@@ -50,6 +55,21 @@ class ArrayCollection implements Collection, Selectable
         $this->elements = $elements;
     }
 
+    /**
+     * Creates a new instance from the specified elements.
+     *
+     * This method is provided for derived classes to specify how a new
+     * instance should be created when constructor semantics have changed.
+     *
+     * @param array $elements Elements.
+     *
+     * @return static
+     */
+    protected function createFrom(array $elements)
+    {
+        return new static($elements);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -254,9 +274,9 @@ class ArrayCollection implements Collection, Selectable
     /**
      * {@inheritDoc}
      */
-    public function add($value)
+    public function add($element)
     {
-        $this->elements[] = $value;
+        $this->elements[] = $element;
 
         return true;
     }
@@ -284,7 +304,7 @@ class ArrayCollection implements Collection, Selectable
      */
     public function map(Closure $func)
     {
-        return new static(array_map($func, $this->elements));
+        return $this->createFrom(array_map($func, $this->elements));
     }
 
     /**
@@ -292,7 +312,7 @@ class ArrayCollection implements Collection, Selectable
      */
     public function filter(Closure $p)
     {
-        return new static(array_filter($this->elements, $p));
+        return $this->createFrom(array_filter($this->elements, $p));
     }
 
     /**
@@ -324,7 +344,7 @@ class ArrayCollection implements Collection, Selectable
             }
         }
 
-        return array(new static($matches), new static($noMatches));
+        return array($this->createFrom($matches), $this->createFrom($noMatches));
     }
 
     /**
@@ -368,8 +388,9 @@ class ArrayCollection implements Collection, Selectable
         }
 
         if ($orderings = $criteria->getOrderings()) {
+            $next = null;
             foreach (array_reverse($orderings) as $field => $ordering) {
-                $next = ClosureExpressionVisitor::sortByField($field, $ordering == Criteria::DESC ? -1 : 1);
+                $next = ClosureExpressionVisitor::sortByField($field, $ordering == Criteria::DESC ? -1 : 1, $next);
             }
 
             uasort($filtered, $next);
@@ -382,6 +403,6 @@ class ArrayCollection implements Collection, Selectable
             $filtered = array_slice($filtered, (int)$offset, $length);
         }
 
-        return new static($filtered);
+        return $this->createFrom($filtered);
     }
 }
diff --git a/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php b/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
index 994085f91..1239aa393 100644
--- a/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
+++ b/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
@@ -69,6 +69,24 @@ class ClosureExpressionVisitor extends ExpressionVisitor
             return $object[$field];
         }
 
+        if (isset($object->$field)) {
+            return $object->$field;
+        }
+
+        // camelcase field name to support different variable naming conventions
+        $ccField   = preg_replace_callback('/_(.?)/', function($matches) { return strtoupper($matches[1]); }, $field);
+
+        foreach ($accessors as $accessor) {
+            $accessor .= $ccField;
+
+
+            if ( ! method_exists($object, $accessor)) {
+                continue;
+            }
+
+            return $object->$accessor();
+        }
+
         return $object->$field;
     }
 
@@ -155,6 +173,26 @@ class ClosureExpressionVisitor extends ExpressionVisitor
                     return false !== strpos(ClosureExpressionVisitor::getObjectFieldValue($object, $field), $value);
                 };
 
+            case Comparison::MEMBER_OF:
+                return function ($object) use ($field, $value) {
+                    $fieldValues = ClosureExpressionVisitor::getObjectFieldValue($object, $field);
+                    if (!is_array($fieldValues)) {
+                        $fieldValues = iterator_to_array($fieldValues);
+                    }
+                    return in_array($value, $fieldValues);
+                };
+
+            case Comparison::STARTS_WITH:
+                return function ($object) use ($field, $value) {
+                    return 0 === strpos(ClosureExpressionVisitor::getObjectFieldValue($object, $field), $value);
+                };
+
+            case Comparison::ENDS_WITH:
+                return function ($object) use ($field, $value) {
+                    return $value === substr(ClosureExpressionVisitor::getObjectFieldValue($object, $field), -strlen($value));
+                };
+
+
             default:
                 throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator());
         }
diff --git a/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php b/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php
index d54ecf25c..ec9a9f48a 100644
--- a/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php
+++ b/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php
@@ -27,17 +27,19 @@ namespace Doctrine\Common\Collections\Expr;
  */
 class Comparison implements Expression
 {
-    const EQ        = '=';
-    const NEQ       = '<>';
-    const LT        = '<';
-    const LTE       = '<=';
-    const GT        = '>';
-    const GTE       = '>=';
-    const IS        = '='; // no difference with EQ
-    const IN        = 'IN';
-    const NIN       = 'NIN';
-    const CONTAINS  = 'CONTAINS';
-
+    const EQ         = '=';
+    const NEQ        = '<>';
+    const LT         = '<';
+    const LTE        = '<=';
+    const GT         = '>';
+    const GTE        = '>=';
+    const IS         = '='; // no difference with EQ
+    const IN         = 'IN';
+    const NIN        = 'NIN';
+    const CONTAINS   = 'CONTAINS';
+    const MEMBER_OF  = 'MEMBER_OF';
+    const STARTS_WITH  = 'STARTS_WITH';
+    const ENDS_WITH    = 'ENDS_WITH';    
     /**
      * @var string
      */
diff --git a/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php b/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php
index 6539e3c75..1a44a7ba8 100644
--- a/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php
+++ b/web/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php
@@ -27,7 +27,7 @@ use Doctrine\Common\Collections\Expr\Value;
  * Builder for Expressions in the {@link Selectable} interface.
  *
  * Important Notice for interoperable code: You have to use scalar
- * values only for comparisons, otherwise the behavior of the comparision
+ * values only for comparisons, otherwise the behavior of the comparison
  * may be different between implementations (Array vs ORM vs ODM).
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
@@ -163,4 +163,38 @@ class ExpressionBuilder
     {
         return new Comparison($field, Comparison::CONTAINS, new Value($value));
     }
+
+    /**
+     * @param string $field
+     * @param mixed  $value
+     *
+     * @return Comparison
+     */
+    public function memberOf ($field, $value)
+    {
+        return new Comparison($field, Comparison::MEMBER_OF, new Value($value));
+    }
+
+    /**
+     * @param string $field
+     * @param mixed  $value
+     *
+     * @return Comparison
+     */
+    public function startsWith($field, $value)
+    {
+        return new Comparison($field, Comparison::STARTS_WITH, new Value($value));
+    }
+
+    /**
+     * @param string $field
+     * @param mixed  $value
+     *
+     * @return Comparison
+     */
+    public function endsWith($field, $value)
+    {
+        return new Comparison($field, Comparison::ENDS_WITH, new Value($value));
+    }    
+
 }
diff --git a/web/vendor/doctrine/collections/phpunit.xml.dist b/web/vendor/doctrine/collections/phpunit.xml.dist
deleted file mode 100644
index 36968e99c..000000000
--- a/web/vendor/doctrine/collections/phpunit.xml.dist
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./tests/Doctrine/Tests/TestInit.php"
->
-    <testsuites>
-        <testsuite name="Doctrine Collections Test Suite">
-            <directory>./tests/Doctrine/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./lib/Doctrine/</directory>
-        </whitelist>
-    </filter>
-    
-    <groups>
-        <exclude>
-            <group>performance</group>
-        </exclude>
-    </groups>
-</phpunit>
diff --git a/web/vendor/doctrine/common/.gitignore b/web/vendor/doctrine/common/.gitignore
deleted file mode 100644
index b15c686b4..000000000
--- a/web/vendor/doctrine/common/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-build/
-logs/
-reports/
-dist/
-tests/Doctrine/Tests/Common/Proxy/generated/
-vendor/
-.idea
-composer.lock
-doctrine-common-*.tar
-doctrine-common-*.tar.gz
diff --git a/web/vendor/doctrine/common/.gitmodules b/web/vendor/doctrine/common/.gitmodules
deleted file mode 100644
index 51f084351..000000000
--- a/web/vendor/doctrine/common/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "lib/vendor/doctrine-build-common"]
-	path = lib/vendor/doctrine-build-common
-	url = git://github.com/doctrine/doctrine-build-common.git
diff --git a/web/vendor/doctrine/common/.travis.yml b/web/vendor/doctrine/common/.travis.yml
deleted file mode 100644
index 9c20a84b4..000000000
--- a/web/vendor/doctrine/common/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-language: php
-
-sudo: false
-
-cache:
-  directory:
-    - $HOME/.composer/cache
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-before_script:
-  - composer --prefer-source install
-
-script:
-  - ./vendor/bin/phpunit
-
-matrix:
-  allow_failures:
-    - php: 7.0
diff --git a/web/vendor/doctrine/common/LICENSE b/web/vendor/doctrine/common/LICENSE
index 4a91f0bf2..8c38cc1bc 100644
--- a/web/vendor/doctrine/common/LICENSE
+++ b/web/vendor/doctrine/common/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2012 Doctrine Project
+Copyright (c) 2006-2015 Doctrine Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/web/vendor/doctrine/common/build.properties b/web/vendor/doctrine/common/build.properties
deleted file mode 100644
index ef51d207f..000000000
--- a/web/vendor/doctrine/common/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Version class and file
-project.version_class = Doctrine\\Common\\Version
-project.version_file = lib/Doctrine/Common/Version.php
diff --git a/web/vendor/doctrine/common/build.xml b/web/vendor/doctrine/common/build.xml
deleted file mode 100644
index 429b7688f..000000000
--- a/web/vendor/doctrine/common/build.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<project name="DoctrineCommon" default="build" basedir=".">
-    <property file="build.properties" />
-
-    <target name="php">
-        <exec executable="which" outputproperty="php_executable">
-            <arg value="php" />
-        </exec>
-    </target>
-
-    <target name="prepare">
-        <mkdir dir="build" />
-    </target>
-
-    <target name="build" depends="check-git-checkout-clean,prepare,php,composer">
-        <exec executable="${php_executable}">
-            <arg value="build/composer.phar" />
-            <arg value="archive" />
-            <arg value="--dir=build" />
-        </exec>
-    </target>
-
-    <target name="composer" depends="php,composer-check,composer-download">
-        <exec executable="${php_executable}">
-            <arg value="build/composer.phar" />
-            <arg value="install" />
-        </exec>
-    </target>
-
-    <target name="composer-check" depends="prepare">
-        <available file="build/composer.phar" property="composer.present"/>
-    </target>
-
-    <target name="composer-download" unless="composer.present">
-        <exec executable="wget">
-            <arg value="-Obuild/composer.phar" />
-            <arg value="http://getcomposer.org/composer.phar" />
-        </exec>
-    </target>
-
-    <target name="make-release" depends="check-git-checkout-clean,prepare,php">
-        <replace file="${project.version_file}" token="-DEV" value="" failOnNoReplacements="true" />
-        <exec executable="${php_executable}" outputproperty="doctrine.current_version" failonerror="true">
-            <arg value="-r" />
-            <arg value="require_once '${project.version_file}';echo ${project.version_class}::VERSION;" />
-        </exec>
-        <exec executable="${php_executable}" outputproperty="doctrine.next_version" failonerror="true">
-            <arg value="-r" />
-            <arg value="$parts = explode('.', str_ireplace(array('-DEV', '-ALPHA', '-BETA'), '', '${doctrine.current_version}'));
-                if (count($parts) != 3) {
-                    throw new \InvalidArgumentException('Version is assumed in format x.y.z, ${doctrine.current_version} given');
-                }
-                $parts[2]++;
-                echo implode('.', $parts);
-            " />
-        </exec>
-
-        <git-commit file="${project.version_file}" message="Release ${doctrine.current_version}" />
-        <git-tag version="${doctrine.current_version}" />
-        <replace file="${project.version_file}" token="${doctrine.current_version}" value="${doctrine.next_version}-DEV" />
-        <git-commit file="${project.version_file}" message="Bump version to ${doctrine.next_version}" />
-    </target>
-
-    <target name="check-git-checkout-clean">
-        <exec executable="git" failonerror="true">
-            <arg value="diff-index" />
-            <arg value="--quiet" />
-            <arg value="HEAD" />
-        </exec>
-    </target>
-
-    <macrodef name="git-commit">
-        <attribute name="file" default="NOT SET"/>
-        <attribute name="message" default="NOT SET"/>
-
-        <sequential>
-            <exec executable="git">
-                <arg value="add" />
-                <arg value="@{file}" />
-            </exec>
-            <exec executable="git">
-                <arg value="commit" />
-                <arg value="-m" />
-                <arg value="@{message}" />
-            </exec>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="git-tag">
-        <attribute name="version" default="NOT SET" />
-
-        <sequential>
-            <exec executable="git">
-                <arg value="tag" />
-                <arg value="-m" />
-                <arg value="v@{version}" />
-                <arg value="v@{version}" />
-            </exec>
-        </sequential>
-    </macrodef>
-</project>
diff --git a/web/vendor/doctrine/common/composer.json b/web/vendor/doctrine/common/composer.json
index be42e7fed..7729b1689 100644
--- a/web/vendor/doctrine/common/composer.json
+++ b/web/vendor/doctrine/common/composer.json
@@ -13,26 +13,24 @@
         {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
     ],
     "require": {
-        "php": ">=5.3.2",
+        "php": "~5.6|~7.0",
         "doctrine/inflector": "1.*",
         "doctrine/cache": "1.*",
         "doctrine/collections": "1.*",
         "doctrine/lexer": "1.*",
         "doctrine/annotations": "1.*"
     },
-    "minimum-stability": "dev",
     "require-dev": {
-        "phpunit/phpunit": "~3.7"
+        "phpunit/phpunit": "^5.4.6"
     },
     "autoload": {
-        "psr-0": { "Doctrine\\Common\\": "lib/" }
+        "psr-4": {
+            "Doctrine\\Common\\": "lib/Doctrine/Common"
+        }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6.x-dev"
+            "dev-master": "2.7.x-dev"
         }
-    },
-    "archive": {
-        "exclude": ["!vendor", "tests", "*phpunit.xml", ".travis.yml", "build.xml", "build.properties", "composer.phar"]
     }
 }
diff --git a/web/vendor/doctrine/common/humbug.json.dist b/web/vendor/doctrine/common/humbug.json.dist
new file mode 100644
index 000000000..ed6732a3c
--- /dev/null
+++ b/web/vendor/doctrine/common/humbug.json.dist
@@ -0,0 +1,11 @@
+{
+    "source": {
+        "directories": [
+            "lib\/Doctrine"
+        ]
+    },
+    "timeout": 10,
+    "logs": {
+        "text": "reports/humbuglog.txt"
+    }
+}
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php b/web/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php
index d65b9a631..78eeb35d3 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php
@@ -153,7 +153,7 @@ class ClassLoader
      */
     public function register()
     {
-        spl_autoload_register(array($this, 'loadClass'));
+        spl_autoload_register([$this, 'loadClass']);
     }
 
     /**
@@ -163,7 +163,7 @@ class ClassLoader
      */
     public function unregister()
     {
-        spl_autoload_unregister(array($this, 'loadClass'));
+        spl_autoload_unregister([$this, 'loadClass']);
     }
 
     /**
@@ -275,6 +275,6 @@ class ClassLoader
     {
         return class_exists($type, $autoload)
             || interface_exists($type, $autoload)
-            || (function_exists('trait_exists') && trait_exists($type, $autoload));
+            || trait_exists($type, $autoload);
     }
 }
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php b/web/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
index 69eb17ec6..0ee04a15a 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
@@ -38,7 +38,7 @@ class EventManager
      *
      * @var array
      */
-    private $_listeners = array();
+    private $_listeners = [];
 
     /**
      * Dispatches an event to all registered listeners.
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php
index 33770f901..6da542236 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php
@@ -141,7 +141,7 @@ abstract class AbstractManagerRegistry implements ManagerRegistry
      */
     public function getConnections()
     {
-        $connections = array();
+        $connections = [];
         foreach ($this->connections as $name => $id) {
             $connections[$name] = $this->getService($id);
         }
@@ -195,8 +195,13 @@ abstract class AbstractManagerRegistry implements ManagerRegistry
         }
 
         $proxyClass = new \ReflectionClass($class);
+
         if ($proxyClass->implementsInterface($this->proxyInterfaceName)) {
-            $class = $proxyClass->getParentClass()->getName();
+            if (! $parentClass = $proxyClass->getParentClass()) {
+                return null;
+            }
+
+            $class = $parentClass->getName();
         }
 
         foreach ($this->managers as $id) {
@@ -221,7 +226,7 @@ abstract class AbstractManagerRegistry implements ManagerRegistry
      */
     public function getManagers()
     {
-        $dms = array();
+        $dms = [];
         foreach ($this->managers as $name => $id) {
             $dms[$name] = $this->getService($id);
         }
@@ -253,5 +258,7 @@ abstract class AbstractManagerRegistry implements ManagerRegistry
         // force the creation of a new document manager
         // if the current one is closed
         $this->resetService($this->managers[$name]);
+
+        return $this->getManager($name);
     }
 }
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php
index 404fea91a..cba424b06 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php
@@ -53,7 +53,7 @@ abstract class AbstractClassMetadataFactory implements ClassMetadataFactory
     /**
      * @var ClassMetadata[]
      */
-    private $loadedMetadata = array();
+    private $loadedMetadata = [];
 
     /**
      * @var bool
@@ -110,7 +110,7 @@ abstract class AbstractClassMetadataFactory implements ClassMetadataFactory
         }
 
         $driver = $this->getDriver();
-        $metadata = array();
+        $metadata = [];
         foreach ($driver->getAllClassNames() as $className) {
             $metadata[] = $this->getMetadataFor($className);
         }
@@ -208,7 +208,7 @@ abstract class AbstractClassMetadataFactory implements ClassMetadataFactory
 
         try {
             if ($this->cacheDriver) {
-                if (($cached = $this->cacheDriver->fetch($realClassName . $this->cacheSalt)) !== false) {
+                if (($cached = $this->cacheDriver->fetch($realClassName . $this->cacheSalt)) instanceof ClassMetadata) {
                     $this->loadedMetadata[$realClassName] = $cached;
 
                     $this->wakeupReflection($cached, $this->getReflectionService());
@@ -277,7 +277,7 @@ abstract class AbstractClassMetadataFactory implements ClassMetadataFactory
     protected function getParentClasses($name)
     {
         // Collect parent classes, ignoring transient (not-mapped) classes.
-        $parentClasses = array();
+        $parentClasses = [];
         foreach (array_reverse($this->getReflectionService()->getParentClasses($name)) as $parentClass) {
             if ( ! $this->getDriver()->isTransient($parentClass)) {
                 $parentClasses[] = $parentClass;
@@ -306,7 +306,7 @@ abstract class AbstractClassMetadataFactory implements ClassMetadataFactory
             $this->initialize();
         }
 
-        $loaded = array();
+        $loaded = [];
 
         $parentClasses = $this->getParentClasses($name);
         $parentClasses[] = $name;
@@ -314,7 +314,7 @@ abstract class AbstractClassMetadataFactory implements ClassMetadataFactory
         // Move down the hierarchy of parent classes, starting from the topmost class
         $parent = null;
         $rootEntityFound = false;
-        $visited = array();
+        $visited = [];
         $reflService = $this->getReflectionService();
         foreach ($parentClasses as $className) {
             if (isset($this->loadedMetadata[$className])) {
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php
index 8bb574d92..deb82c0c9 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php
@@ -45,14 +45,14 @@ abstract class AnnotationDriver implements MappingDriver
      *
      * @var array
      */
-    protected $paths = array();
+    protected $paths = [];
 
     /**
      * The paths excluded from path where to look for mapping files.
      *
      * @var array
      */
-    protected $excludePaths = array();
+    protected $excludePaths = [];
 
     /**
      * The file extension of mapping documents.
@@ -73,7 +73,7 @@ abstract class AnnotationDriver implements MappingDriver
      *
      * @var array
      */
-    protected $entityAnnotationClasses = array();
+    protected $entityAnnotationClasses = [];
 
     /**
      * Initializes a new AnnotationDriver that uses the given AnnotationReader for reading
@@ -200,8 +200,8 @@ abstract class AnnotationDriver implements MappingDriver
             throw MappingException::pathRequired();
         }
 
-        $classes = array();
-        $includedFiles = array();
+        $classes = [];
+        $includedFiles = [];
 
         foreach ($this->paths as $path) {
             if ( ! is_dir($path)) {
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php
index 58a740b57..6ed7f6d0d 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php
@@ -37,7 +37,7 @@ class DefaultFileLocator implements FileLocator
      *
      * @var array
      */
-    protected $paths = array();
+    protected $paths = [];
 
     /**
      * The file extension of mapping documents.
@@ -125,7 +125,7 @@ class DefaultFileLocator implements FileLocator
      */
     public function getAllClassNames($globalBasename)
     {
-        $classes = array();
+        $classes = [];
 
         if ($this->paths) {
             foreach ($this->paths as $path) {
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
index ccc64faf8..f17b263c0 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
@@ -117,6 +117,8 @@ abstract class FileDriver implements MappingDriver
             throw MappingException::invalidMappingFile($className, str_replace('\\', '.', $className) . $this->locator->getFileExtension());
         }
 
+        $this->classCache[$className] = $result[$className];
+
         return $result[$className];
     }
 
@@ -145,11 +147,14 @@ abstract class FileDriver implements MappingDriver
             $this->initialize();
         }
 
-        $classNames = (array)$this->locator->getAllClassNames($this->globalBasename);
-        if ($this->classCache) {
-            $classNames = array_merge(array_keys($this->classCache), $classNames);
+        if (! $this->classCache) {
+            return (array) $this->locator->getAllClassNames($this->globalBasename);
         }
-        return $classNames;
+
+        return array_merge(
+            array_keys($this->classCache),
+            (array) $this->locator->getAllClassNames($this->globalBasename)
+        );
     }
 
     /**
@@ -175,7 +180,7 @@ abstract class FileDriver implements MappingDriver
      */
     protected function initialize()
     {
-        $this->classCache = array();
+        $this->classCache = [];
         if (null !== $this->globalBasename) {
             foreach ($this->locator->getPaths() as $path) {
                 $file = $path.'/'.$this->globalBasename.$this->locator->getFileExtension();
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php
index 26a9f3e2c..50d9785bc 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php
@@ -39,12 +39,12 @@ class MappingDriverChain implements MappingDriver
      *
      * @var MappingDriver|null
      */
-    private $defaultDriver = null;
+    private $defaultDriver;
 
     /**
      * @var array
      */
-    private $drivers = array();
+    private $drivers = [];
 
     /**
      * Gets the default driver.
@@ -117,8 +117,8 @@ class MappingDriverChain implements MappingDriver
      */
     public function getAllClassNames()
     {
-        $classNames = array();
-        $driverClasses = array();
+        $classNames = [];
+        $driverClasses = [];
 
         /* @var $driver MappingDriver */
         foreach ($this->drivers AS $namespace => $driver) {
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php
index 6df54b0f7..efffa6aa4 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php
@@ -44,8 +44,7 @@ class PHPDriver extends FileDriver
      */
     public function __construct($locator, $fileExtension = null)
     {
-        $fileExtension = ".php";
-        parent::__construct($locator, $fileExtension);
+        parent::__construct($locator, '.php');
     }
 
     /**
@@ -54,6 +53,7 @@ class PHPDriver extends FileDriver
     public function loadMetadataForClass($className, ClassMetadata $metadata)
     {
         $this->metadata = $metadata;
+
         $this->loadMappingFile($this->locator->findMappingFile($className));
     }
 
@@ -65,6 +65,6 @@ class PHPDriver extends FileDriver
         $metadata = $this->metadata;
         include $file;
 
-        return array($metadata->getName() => $metadata);
+        return [$metadata->getName() => $metadata];
     }
 }
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php
index df8f47700..8e37e5a7a 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php
@@ -40,7 +40,7 @@ class StaticPHPDriver implements MappingDriver
      *
      * @var array
      */
-    private $paths = array();
+    private $paths = [];
 
     /**
      * Map of all class names.
@@ -93,8 +93,8 @@ class StaticPHPDriver implements MappingDriver
             throw MappingException::pathRequired();
         }
 
-        $classes = array();
-        $includedFiles = array();
+        $classes = [];
+        $includedFiles = [];
 
         foreach ($this->paths as $path) {
             if (!is_dir($path)) {
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php
index f33426560..4588cfec8 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php
@@ -37,14 +37,14 @@ class SymfonyFileLocator implements FileLocator
      *
      * @var array
      */
-    protected $paths = array();
+    protected $paths = [];
 
     /**
      * A map of mapping directory path to namespace prefix used to expand class shortnames.
      *
      * @var array
      */
-    protected $prefixes = array();
+    protected $prefixes = [];
 
     /**
      * File extension that is searched for.
@@ -153,7 +153,9 @@ class SymfonyFileLocator implements FileLocator
             }
 
             $filename = $path.'/'.strtr(substr($className, strlen($prefix)+1), '\\', $this->nsSeparator).$this->fileExtension;
-            return is_file($filename);
+            if (is_file($filename)) {
+                return true;
+            }
         }
 
         return false;
@@ -164,7 +166,7 @@ class SymfonyFileLocator implements FileLocator
      */
     public function getAllClassNames($globalBasename = null)
     {
-        $classes = array();
+        $classes = [];
 
         if ($this->paths) {
             foreach ((array) $this->paths as $path) {
@@ -194,7 +196,7 @@ class SymfonyFileLocator implements FileLocator
                             '\\'
                         );
 
-                        $classes[] = $this->prefixes[$path] . $nsSuffix . '\\' .str_replace($this->nsSeparator, '\\', $fileName);
+                        $classes[] = $this->prefixes[$path] . str_replace(DIRECTORY_SEPARATOR, '\\', $nsSuffix) . '\\' .str_replace($this->nsSeparator, '\\', $fileName);
                     } else {
                         $classes[] = str_replace($this->nsSeparator, '\\', $fileName);
                     }
@@ -230,8 +232,6 @@ class SymfonyFileLocator implements FileLocator
             if (is_file($filename)) {
                 return $filename;
             }
-
-            throw MappingException::mappingFileNotFound($className, $filename);
         }
 
         throw MappingException::mappingFileNotFound($className, substr($className, strrpos($className, '\\') + 1).$this->fileExtension);
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php
index e5bcb06e7..7d0176649 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php
@@ -31,7 +31,7 @@ class StaticReflectionService implements ReflectionService
      */
     public function getParentClasses($class)
     {
-        return array();
+        return [];
     }
 
     /**
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php
index f60721914..fd968a3e0 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php
@@ -34,7 +34,7 @@ interface ObjectRepository
      *
      * @param mixed $id The identifier.
      *
-     * @return object The object.
+     * @return object|null The object.
      */
     public function find($id);
 
@@ -68,7 +68,7 @@ interface ObjectRepository
      *
      * @param array $criteria The criteria.
      *
-     * @return object The object.
+     * @return object|null The object.
      */
     public function findOneBy(array $criteria);
 
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php
index a35b71a28..990642e78 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php
@@ -198,7 +198,7 @@ abstract class PersistentObject implements ObjectManagerAware
                 throw new \InvalidArgumentException("Expected persistent object of type '".$targetClass."'");
             }
             if (!($this->$field instanceof Collection)) {
-                $this->$field = new ArrayCollection($this->$field ?: array());
+                $this->$field = new ArrayCollection($this->$field ?: []);
             }
             $this->$field->add($args[0]);
             $this->completeOwningSide($field, $targetClass, $args[0]);
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php
index bc546902e..7eb216bfc 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php
@@ -87,7 +87,7 @@ abstract class AbstractProxyFactory
     /**
      * @var \Doctrine\Common\Proxy\ProxyDefinition[]
      */
-    private $definitions = array();
+    private $definitions = [];
 
     /**
      * @param \Doctrine\Common\Proxy\ProxyGenerator                     $proxyGenerator
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php
index 0aa930b22..fae3348ee 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php
@@ -49,9 +49,13 @@ class Autoloader
             throw InvalidArgumentException::notProxyClass($className, $proxyNamespace);
         }
 
-        $className = str_replace('\\', '', substr($className, strlen($proxyNamespace) + 1));
+        // remove proxy namespace from class name
+        $classNameRelativeToProxyNamespace = substr($className, strlen($proxyNamespace));
 
-        return $proxyDir . DIRECTORY_SEPARATOR . $className . '.php';
+        // remove namespace separators from remaining class name
+        $fileName = str_replace('\\', '', $classNameRelativeToProxyNamespace);
+
+        return $proxyDir . DIRECTORY_SEPARATOR . $fileName . '.php';
     }
 
     /**
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
index 154b91779..ec980b593 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
@@ -41,15 +41,19 @@ class UnexpectedValueException extends BaseUnexpectedValueException implements P
     }
 
     /**
-     * @param string     $className
-     * @param string     $methodName
-     * @param string     $parameterName
-     * @param \Exception $previous
+     * @param string          $className
+     * @param string          $methodName
+     * @param string          $parameterName
+     * @param \Exception|null $previous
      *
      * @return self
      */
-    public static function invalidParameterTypeHint($className, $methodName, $parameterName, \Exception $previous)
-    {
+    public static function invalidParameterTypeHint(
+        $className,
+        $methodName,
+        $parameterName,
+        \Exception $previous = null
+    ) {
         return new self(
             sprintf(
                 'The type hint of parameter "%s" in method "%s" in class "%s" is invalid.',
@@ -61,4 +65,24 @@ class UnexpectedValueException extends BaseUnexpectedValueException implements P
             $previous
         );
     }
+
+    /**
+     * @param $className
+     * @param $methodName
+     * @param \Exception|null $previous
+     *
+     * @return self
+     */
+    public static function invalidReturnTypeHint($className, $methodName, \Exception $previous = null)
+    {
+        return new self(
+            sprintf(
+                'The return type of method "%s" in class "%s" is invalid.',
+                $methodName,
+                $className
+            ),
+            0,
+            $previous
+        );
+    }
 }
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
index c9d0e2cf9..62f4167f3 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
@@ -37,7 +37,7 @@ class ProxyGenerator
      * Used to match very simple id methods that don't need
      * to be decorated since the identifier is known.
      */
-    const PATTERN_MATCH_ID_METHOD = '((public\s+)?(function\s+%s\s*\(\)\s*)\s*{\s*return\s*\$this->%s;\s*})i';
+    const PATTERN_MATCH_ID_METHOD = '((public\s+)?(function\s+%s\s*\(\)\s*)\s*(?::\s*\??\s*\\\\?[a-z_\x7f-\xff][\w\x7f-\xff]*(?:\\\\[a-z_\x7f-\xff][\w\x7f-\xff]*)*\s*)?{\s*return\s*\$this->%s;\s*})i';
 
     /**
      * The namespace that contains all proxy classes.
@@ -58,10 +58,10 @@ class ProxyGenerator
      *
      * @var string[]|callable[]
      */
-    protected $placeholders = array(
-        'baseProxyInterface'   => 'Doctrine\Common\Proxy\Proxy',
+    protected $placeholders = [
+        'baseProxyInterface'   => Proxy::class,
         'additionalProperties' => '',
-    );
+    ];
 
     /**
      * Template used as a blueprint to generate proxies.
@@ -106,7 +106,7 @@ class <proxyShortClassName> extends \<className> implements \<baseProxyInterface
      *
      * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
      */
-    public static $lazyPropertiesDefaults = array(<lazyPropertiesDefaults>);
+    public static $lazyPropertiesDefaults = [<lazyPropertiesDefaults>];
 
 <additionalProperties>
 
@@ -129,7 +129,7 @@ class <proxyShortClassName> extends \<className> implements \<baseProxyInterface
      */
     public function __load()
     {
-        $this->__initializer__ && $this->__initializer__->__invoke($this, \'__load\', array());
+        $this->__initializer__ && $this->__initializer__->__invoke($this, \'__load\', []);
     }
 
     /**
@@ -263,12 +263,12 @@ class <proxyShortClassName> extends \<className> implements \<baseProxyInterface
         preg_match_all('(<([a-zA-Z]+)>)', $this->proxyClassTemplate, $placeholderMatches);
 
         $placeholderMatches = array_combine($placeholderMatches[0], $placeholderMatches[1]);
-        $placeholders       = array();
+        $placeholders       = [];
 
         foreach ($placeholderMatches as $placeholder => $name) {
             $placeholders[$placeholder] = isset($this->placeholders[$name])
                 ? $this->placeholders[$name]
-                : array($this, 'generate' . $name);
+                : [$this, 'generate' . $name];
         }
 
         foreach ($placeholders as & $placeholder) {
@@ -302,7 +302,7 @@ class <proxyShortClassName> extends \<className> implements \<baseProxyInterface
         $tmpFileName = $fileName . '.' . uniqid('', true);
 
         file_put_contents($tmpFileName, $proxyCode);
-        chmod($tmpFileName, 0664);
+        @chmod($tmpFileName, 0664);
         rename($tmpFileName, $fileName);
     }
 
@@ -358,7 +358,7 @@ class <proxyShortClassName> extends \<className> implements \<baseProxyInterface
     private function generateLazyPropertiesDefaults(ClassMetadata $class)
     {
         $lazyPublicProperties = $this->getLazyLoadedPublicProperties($class);
-        $values               = array();
+        $values               = [];
 
         foreach ($lazyPublicProperties as $key => $value) {
             $values[] = var_export($key, true) . ' => ' . var_export($value, true);
@@ -385,7 +385,7 @@ class <proxyShortClassName> extends \<className> implements \<baseProxyInterface
     {
 
 EOT;
-        $toUnset = array();
+        $toUnset = [];
 
         foreach ($this->getLazyLoadedPublicProperties($class) as $lazyPublicProperty => $unused) {
             $toUnset[] = '$this->' . $lazyPublicProperty;
@@ -443,7 +443,7 @@ EOT;
         if ( ! empty($lazyPublicProperties)) {
             $magicGet .= <<<'EOT'
         if (array_key_exists($name, $this->__getLazyProperties())) {
-            $this->__initializer__ && $this->__initializer__->__invoke($this, '__get', array($name));
+            $this->__initializer__ && $this->__initializer__->__invoke($this, '__get', [$name]);
 
             return $this->$name;
         }
@@ -454,7 +454,7 @@ EOT;
 
         if ($hasParentGet) {
             $magicGet .= <<<'EOT'
-        $this->__initializer__ && $this->__initializer__->__invoke($this, '__get', array($name));
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__get', [$name]);
 
         return parent::__get($name);
 
@@ -502,7 +502,7 @@ EOT;
         if ( ! empty($lazyPublicProperties)) {
             $magicSet .= <<<'EOT'
         if (array_key_exists($name, $this->__getLazyProperties())) {
-            $this->__initializer__ && $this->__initializer__->__invoke($this, '__set', array($name, $value));
+            $this->__initializer__ && $this->__initializer__->__invoke($this, '__set', [$name, $value]);
 
             $this->$name = $value;
 
@@ -515,7 +515,7 @@ EOT;
 
         if ($hasParentSet) {
             $magicSet .= <<<'EOT'
-        $this->__initializer__ && $this->__initializer__->__invoke($this, '__set', array($name, $value));
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__set', [$name, $value]);
 
         return parent::__set($name, $value);
 EOT;
@@ -559,7 +559,7 @@ EOT;
         if ( ! empty($lazyPublicProperties)) {
             $magicIsset .= <<<'EOT'
         if (array_key_exists($name, $this->__getLazyProperties())) {
-            $this->__initializer__ && $this->__initializer__->__invoke($this, '__isset', array($name));
+            $this->__initializer__ && $this->__initializer__->__invoke($this, '__isset', [$name]);
 
             return isset($this->$name);
         }
@@ -570,7 +570,7 @@ EOT;
 
         if ($hasParentIsset) {
             $magicIsset .= <<<'EOT'
-        $this->__initializer__ && $this->__initializer__->__invoke($this, '__isset', array($name));
+        $this->__initializer__ && $this->__initializer__->__invoke($this, '__isset', [$name]);
 
         return parent::__isset($name);
 
@@ -605,7 +605,7 @@ EOT;
 
         if ($hasParentSleep) {
             return $sleepImpl . <<<'EOT'
-        $properties = array_merge(array('__isInitialized__'), parent::__sleep());
+        $properties = array_merge(['__isInitialized__'], parent::__sleep());
 
         if ($this->__isInitialized__) {
             $properties = array_diff($properties, array_keys($this->__getLazyProperties()));
@@ -616,7 +616,7 @@ EOT;
 EOT;
         }
 
-        $allProperties = array('__isInitialized__');
+        $allProperties = ['__isInitialized__'];
 
         /* @var $prop \ReflectionProperty */
         foreach ($class->getReflectionClass()->getProperties() as $prop) {
@@ -645,10 +645,10 @@ EOT;
 
         return $sleepImpl . <<<EOT
         if (\$this->__isInitialized__) {
-            return array($allProperties);
+            return [$allProperties];
         }
 
-        return array($protectedProperties);
+        return [$protectedProperties];
     }
 EOT;
     }
@@ -662,7 +662,7 @@ EOT;
      */
     private function generateWakeupImpl(ClassMetadata $class)
     {
-        $unsetPublicProperties = array();
+        $unsetPublicProperties = [];
         $hasWakeup             = $class->getReflectionClass()->hasMethod('__wakeup');
 
         foreach (array_keys($this->getLazyLoadedPublicProperties($class)) as $lazyPublicProperty) {
@@ -727,7 +727,7 @@ EOT;
      */
     public function __clone()
     {
-        \$this->__cloner__ && \$this->__cloner__->__invoke(\$this, '__clone', array());
+        \$this->__cloner__ && \$this->__cloner__->__invoke(\$this, '__clone', []);
 $callParentClone    }
 EOT;
     }
@@ -742,16 +742,16 @@ EOT;
     private function generateMethods(ClassMetadata $class)
     {
         $methods           = '';
-        $methodNames       = array();
+        $methodNames       = [];
         $reflectionMethods = $class->getReflectionClass()->getMethods(\ReflectionMethod::IS_PUBLIC);
-        $skippedMethods    = array(
+        $skippedMethods    = [
             '__sleep'   => true,
             '__clone'   => true,
             '__wakeup'  => true,
             '__get'     => true,
             '__set'     => true,
             '__isset'   => true,
-        );
+        ];
 
         foreach ($reflectionMethods as $method) {
             $name = $method->getName();
@@ -778,15 +778,18 @@ EOT;
             }
 
             $methods .= $name . '(' . $this->buildParametersString($class, $method, $method->getParameters()) . ')';
+            $methods .= $this->getMethodReturnType($method);
             $methods .= "\n" . '    {' . "\n";
 
             if ($this->isShortIdentifierGetter($method, $class)) {
                 $identifier = lcfirst(substr($name, 3));
                 $fieldType  = $class->getTypeOfField($identifier);
-                $cast       = in_array($fieldType, array('integer', 'smallint')) ? '(int) ' : '';
+                $cast       = in_array($fieldType, ['integer', 'smallint']) ? '(int) ' : '';
 
                 $methods .= '        if ($this->__isInitialized__ === false) {' . "\n";
-                $methods .= '            return ' . $cast . ' parent::' . $method->getName() . "();\n";
+                $methods .= '            ';
+                $methods .= $this->shouldProxiedMethodReturn($method) ? 'return ' : '';
+                $methods .= $cast . ' parent::' . $method->getName() . "();\n";
                 $methods .= '        }' . "\n\n";
             }
 
@@ -795,8 +798,10 @@ EOT;
 
             $methods .= "\n        \$this->__initializer__ "
                 . "&& \$this->__initializer__->__invoke(\$this, " . var_export($name, true)
-                . ", array(" . $invokeParamsString . "));"
-                . "\n\n        return parent::" . $name . '(' . $callParamsString . ');'
+                . ", [" . $invokeParamsString . "]);"
+                . "\n\n        "
+                . ($this->shouldProxiedMethodReturn($method) ? 'return ' : '')
+                . "parent::" . $name . '(' . $callParamsString . ');'
                 . "\n" . '    }' . "\n";
         }
 
@@ -872,7 +877,7 @@ EOT;
     private function getLazyLoadedPublicProperties(ClassMetadata $class)
     {
         $defaultProperties = $class->getReflectionClass()->getDefaultProperties();
-        $properties = array();
+        $properties = [];
 
         foreach ($class->getReflectionClass()->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
             $name = $property->getName();
@@ -894,7 +899,7 @@ EOT;
      */
     private function buildParametersString(ClassMetadata $class, \ReflectionMethod $method, array $parameters)
     {
-        $parameterDefinitions = array();
+        $parameterDefinitions = [];
 
         /* @var $param \ReflectionParameter */
         foreach ($parameters as $param) {
@@ -908,10 +913,8 @@ EOT;
                 $parameterDefinition .= '&';
             }
 
-            if (method_exists($param, 'isVariadic')) {
-                if ($param->isVariadic()) {
-                    $parameterDefinition .= '...';
-                }
+            if (method_exists($param, 'isVariadic') && $param->isVariadic()) {
+                $parameterDefinition .= '...';
             }
 
             $parameters[]     = '$' . $param->getName();
@@ -936,13 +939,20 @@ EOT;
      */
     private function getParameterType(ClassMetadata $class, \ReflectionMethod $method, \ReflectionParameter $parameter)
     {
+        if (method_exists($parameter, 'hasType')) {
+            if ( ! $parameter->hasType()) {
+                return '';
+            }
 
-        // We need to pick the type hint class too
+            return $this->formatType($parameter->getType(), $parameter->getDeclaringFunction(), $parameter);
+        }
+
+        // For PHP 5.x, we need to pick the type hint in the old way (to be removed for PHP 7.0+)
         if ($parameter->isArray()) {
             return 'array';
         }
 
-        if (method_exists($parameter, 'isCallable') && $parameter->isCallable()) {
+        if ($parameter->isCallable()) {
             return 'callable';
         }
 
@@ -990,10 +1000,8 @@ EOT;
             function (\ReflectionParameter $parameter) {
                 $name = '';
 
-                if (method_exists($parameter, 'isVariadic')) {
-                    if ($parameter->isVariadic()) {
-                        $name .= '...';
-                    }
+                if (method_exists($parameter, 'isVariadic') && $parameter->isVariadic()) {
+                    $name .= '...';
                 }
 
                 $name .= '$' . $parameter->getName();
@@ -1003,4 +1011,83 @@ EOT;
             $parameters
         );
     }
+
+    /**
+     * @Param \ReflectionMethod $method
+     *
+     * @return string
+     */
+    private function getMethodReturnType(\ReflectionMethod $method)
+    {
+        if ( ! method_exists($method, 'hasReturnType') || ! $method->hasReturnType()) {
+            return '';
+        }
+
+        return ': ' . $this->formatType($method->getReturnType(), $method);
+    }
+
+    /**
+     * @param \ReflectionMethod $method
+     *
+     * @return bool
+     */
+    private function shouldProxiedMethodReturn(\ReflectionMethod $method)
+    {
+        if ( ! method_exists($method, 'hasReturnType') || ! $method->hasReturnType()) {
+            return true;
+        }
+
+        return 'void' !== strtolower($this->formatType($method->getReturnType(), $method));
+    }
+
+    /**
+     * @param \ReflectionType $type
+     * @param \ReflectionMethod $method
+     * @param \ReflectionParameter|null $parameter
+     *
+     * @return string
+     */
+    private function formatType(
+        \ReflectionType $type,
+        \ReflectionMethod $method,
+        \ReflectionParameter $parameter = null
+    ) {
+        $name = method_exists($type, 'getName') ? $type->getName() : (string) $type;
+        $nameLower = strtolower($name);
+
+        if ('self' === $nameLower) {
+            $name = $method->getDeclaringClass()->getName();
+        }
+
+        if ('parent' === $nameLower) {
+            $name = $method->getDeclaringClass()->getParentClass()->getName();
+        }
+
+        if ( ! $type->isBuiltin() && ! class_exists($name) && ! interface_exists($name)) {
+            if (null !== $parameter) {
+                throw UnexpectedValueException::invalidParameterTypeHint(
+                    $method->getDeclaringClass()->getName(),
+                    $method->getName(),
+                    $parameter->getName()
+                );
+            }
+
+            throw UnexpectedValueException::invalidReturnTypeHint(
+                $method->getDeclaringClass()->getName(),
+                $method->getName()
+            );
+        }
+
+        if ( ! $type->isBuiltin()) {
+            $name = '\\' . $name;
+        }
+
+        if ($type->allowsNull()
+            && (null === $parameter || ! $parameter->isDefaultValueAvailable() || null !== $parameter->getDefaultValue())
+        ) {
+            $name = '?' . $name;
+        }
+
+        return $name;
+    }
 }
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php
index b65979add..2d0f5b007 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php
@@ -402,7 +402,7 @@ class StaticReflectionClass extends ReflectionClass
     /**
      * {@inheritDoc}
      */
-    public function newInstanceArgs(array $args = array())
+    public function newInstanceArgs(array $args = [])
     {
         throw new ReflectionException('Method not implemented');
     }
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php
index 922404d98..c48e9ba73 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php
@@ -69,18 +69,18 @@ class StaticReflectionParser implements ReflectionProviderInterface
      *
      * @var array
      */
-    protected $useStatements = array();
+    protected $useStatements = [];
 
     /**
      * The docComment of the class.
      *
      * @var string
      */
-    protected $docComment = array(
+    protected $docComment = [
         'class' => '',
-        'property' => array(),
-        'method' => array()
-    );
+        'property' => [],
+        'method' => []
+    ];
 
     /**
      * The name of the class this class extends, if any.
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php
index 79b40d4a0..7f6522bba 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php
@@ -91,7 +91,7 @@ class StaticReflectionProperty extends ReflectionProperty
     /**
      * {@inheritDoc}
      */
-    public static function export ($class, $name, $return = false)
+    public static function export($class, $name, $return = false)
     {
         throw new ReflectionException('Method not implemented');
     }
@@ -155,7 +155,7 @@ class StaticReflectionProperty extends ReflectionProperty
     /**
      * {@inheritDoc}
      */
-    public function setAccessible ($accessible)
+    public function setAccessible($accessible)
     {
         throw new ReflectionException('Method not implemented');
     }
@@ -163,7 +163,7 @@ class StaticReflectionProperty extends ReflectionProperty
     /**
      * {@inheritDoc}
      */
-    public function setValue ($object, $value = null)
+    public function setValue($object, $value = null)
     {
         throw new ReflectionException('Method not implemented');
     }
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php
index 0959ce5d5..ae115edd7 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php
@@ -19,6 +19,7 @@
 
 namespace Doctrine\Common\Util;
 
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Persistence\Proxy;
 
 /**
@@ -64,7 +65,7 @@ final class Debug
             ini_set('xdebug.var_display_max_depth', $maxDepth);
         }
 
-        $var = self::export($var, $maxDepth++);
+        $var = self::export($var, $maxDepth);
 
         ob_start();
         var_dump($var);
@@ -76,11 +77,11 @@ final class Debug
         $dumpText = ($stripTags ? strip_tags(html_entity_decode($dump)) : $dump);
 
         ini_set('html_errors', $html);
-        
+
         if ($echo) {
             echo $dumpText;
         }
-        
+
         return $dumpText;
     }
 
@@ -95,51 +96,90 @@ final class Debug
         $return = null;
         $isObj = is_object($var);
 
-        if ($isObj && in_array('Doctrine\Common\Collections\Collection', class_implements($var))) {
+        if ($var instanceof Collection) {
             $var = $var->toArray();
         }
 
-        if ($maxDepth) {
-            if (is_array($var)) {
-                $return = array();
-
-                foreach ($var as $k => $v) {
-                    $return[$k] = self::export($v, $maxDepth - 1);
-                }
-            } else if ($isObj) {
-                $return = new \stdclass();
-                if ($var instanceof \DateTime) {
-                    $return->__CLASS__ = "DateTime";
-                    $return->date = $var->format('c');
-                    $return->timezone = $var->getTimeZone()->getName();
-                } else {
-                    $reflClass = ClassUtils::newReflectionObject($var);
-                    $return->__CLASS__ = ClassUtils::getClass($var);
-
-                    if ($var instanceof Proxy) {
-                        $return->__IS_PROXY__ = true;
-                        $return->__PROXY_INITIALIZED__ = $var->__isInitialized();
-                    }
-
-                    if ($var instanceof \ArrayObject || $var instanceof \ArrayIterator) {
-                        $return->__STORAGE__ = self::export($var->getArrayCopy(), $maxDepth - 1);
-                    }
-
-                    foreach ($reflClass->getProperties() as $reflProperty) {
-                        $name  = $reflProperty->getName();
-
-                        $reflProperty->setAccessible(true);
-                        $return->$name = self::export($reflProperty->getValue($var), $maxDepth - 1);
-                    }
-                }
-            } else {
-                $return = $var;
-            }
-        } else {
-            $return = is_object($var) ? get_class($var)
+        if (! $maxDepth) {
+            return is_object($var) ? get_class($var)
                 : (is_array($var) ? 'Array(' . count($var) . ')' : $var);
         }
 
+        if (is_array($var)) {
+            $return = [];
+
+            foreach ($var as $k => $v) {
+                $return[$k] = self::export($v, $maxDepth - 1);
+            }
+
+            return $return;
+        }
+
+        if (! $isObj) {
+            return $var;
+        }
+
+        $return = new \stdclass();
+        if ($var instanceof \DateTimeInterface) {
+            $return->__CLASS__ = get_class($var);
+            $return->date = $var->format('c');
+            $return->timezone = $var->getTimezone()->getName();
+
+            return $return;
+        }
+
+        $return->__CLASS__ = ClassUtils::getClass($var);
+
+        if ($var instanceof Proxy) {
+            $return->__IS_PROXY__ = true;
+            $return->__PROXY_INITIALIZED__ = $var->__isInitialized();
+        }
+
+        if ($var instanceof \ArrayObject || $var instanceof \ArrayIterator) {
+            $return->__STORAGE__ = self::export($var->getArrayCopy(), $maxDepth - 1);
+        }
+
+        return self::fillReturnWithClassAttributes($var, $return, $maxDepth);
+    }
+
+    /**
+     * Fill the $return variable with class attributes
+     *
+     * @param object   $var
+     * @param stdClass $return
+     * @param int      $maxDepth
+     *
+     * @return mixed
+     */
+    private static function fillReturnWithClassAttributes($var, \stdClass $return, $maxDepth)
+    {
+        $reflClass = ClassUtils::newReflectionObject($var);
+        $parsedAttributes = array();
+        do {
+            $currentClassName = $reflClass->getName();
+
+            foreach ($reflClass->getProperties() as $reflProperty) {
+                $attributeKey = $reflProperty->isPrivate() ? $currentClassName . '#' : '';
+                $attributeKey .= $reflProperty->getName();
+
+                if (isset($parsedAttributes[$attributeKey])) {
+                    continue;
+                }
+
+                $parsedAttributes[$attributeKey] = true;
+
+                $name =
+                      $reflProperty->getName()
+                    . ($return->__CLASS__ !== $currentClassName || $reflProperty->isPrivate() ? ':' . $currentClassName : '')
+                    . ($reflProperty->isPrivate() ? ':private' : '')
+                    . ($reflProperty->isProtected() ? ':protected' : '')
+                ;
+
+                $reflProperty->setAccessible(true);
+                $return->$name = self::export($reflProperty->getValue($var), $maxDepth - 1);
+            }
+        } while ($reflClass = $reflClass->getParentClass());
+
         return $return;
     }
 
diff --git a/web/vendor/doctrine/common/lib/Doctrine/Common/Version.php b/web/vendor/doctrine/common/lib/Doctrine/Common/Version.php
index 80c1fbf76..eed565557 100644
--- a/web/vendor/doctrine/common/lib/Doctrine/Common/Version.php
+++ b/web/vendor/doctrine/common/lib/Doctrine/Common/Version.php
@@ -34,7 +34,7 @@ class Version
     /**
      * Current Doctrine Version.
      */
-    const VERSION = '2.6.0-DEV';
+    const VERSION = '2.7.0-DEV';
 
     /**
      * Compares a Doctrine version with the current one.
diff --git a/web/vendor/doctrine/common/phpunit.xml.dist b/web/vendor/doctrine/common/phpunit.xml.dist
deleted file mode 100644
index f6fcf8498..000000000
--- a/web/vendor/doctrine/common/phpunit.xml.dist
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./tests/Doctrine/Tests/TestInit.php"
->
-    <testsuites>
-        <testsuite name="Doctrine Common Test Suite">
-            <directory>./tests/Doctrine/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./lib/Doctrine/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/web/vendor/doctrine/inflector/.travis.yml b/web/vendor/doctrine/inflector/.travis.yml
index 6b1d8ffd8..9ec68f765 100644
--- a/web/vendor/doctrine/inflector/.travis.yml
+++ b/web/vendor/doctrine/inflector/.travis.yml
@@ -1,11 +1,21 @@
 language: php
 
+sudo: false
+
+cache:
+  directory:
+    - $HOME/.composer/cache
+
 php:
   - 5.3
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 install:
-    - composer --prefer-source install
+  - composer install -n
+
+script:
+  - phpunit
diff --git a/web/vendor/doctrine/inflector/LICENSE b/web/vendor/doctrine/inflector/LICENSE
index 5e781fce4..8c38cc1bc 100644
--- a/web/vendor/doctrine/inflector/LICENSE
+++ b/web/vendor/doctrine/inflector/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2013 Doctrine Project
+Copyright (c) 2006-2015 Doctrine Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/web/vendor/doctrine/inflector/composer.json b/web/vendor/doctrine/inflector/composer.json
index a29c68cfb..7e5b2efbf 100644
--- a/web/vendor/doctrine/inflector/composer.json
+++ b/web/vendor/doctrine/inflector/composer.json
@@ -23,7 +23,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.1.x-dev"
         }
     }
 }
diff --git a/web/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php b/web/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php
index b007b2179..a53828aba 100644
--- a/web/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php
+++ b/web/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php
@@ -56,11 +56,12 @@ class Inflector
             '/(p)erson$/i' => '\1eople',
             '/(m)an$/i' => '\1en',
             '/(c)hild$/i' => '\1hildren',
-            '/(buffal|tomat)o$/i' => '\1\2oes',
+            '/(f)oot$/i' => '\1eet',
+            '/(buffal|her|potat|tomat|volcan)o$/i' => '\1\2oes',
             '/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i',
             '/us$/i' => 'uses',
             '/(alias)$/i' => '\1es',
-            '/(ax|cris|test)is$/i' => '\1es',
+            '/(analys|ax|cris|test|thes)is$/i' => '\1es',
             '/s$/' => 's',
             '/^$/' => '',
             '/$/' => 's',
@@ -70,27 +71,42 @@ class Inflector
         ),
         'irregular' => array(
             'atlas' => 'atlases',
+            'axe' => 'axes',
             'beef' => 'beefs',
             'brother' => 'brothers',
             'cafe' => 'cafes',
+            'chateau' => 'chateaux',
             'child' => 'children',
             'cookie' => 'cookies',
             'corpus' => 'corpuses',
             'cow' => 'cows',
-            'criteria' => 'criterion',
+            'criterion' => 'criteria',
+            'curriculum' => 'curricula',
+            'demo' => 'demos',
+            'domino' => 'dominoes',
+            'echo' => 'echoes',
+            'foot' => 'feet',
+            'fungus' => 'fungi',
             'ganglion' => 'ganglions',
             'genie' => 'genies',
             'genus' => 'genera',
             'graffito' => 'graffiti',
+            'hippopotamus' => 'hippopotami',
             'hoof' => 'hoofs',
             'human' => 'humans',
+            'iris' => 'irises',
+            'leaf' => 'leaves',
             'loaf' => 'loaves',
             'man' => 'men',
+            'medium' => 'media',
+            'memorandum' => 'memoranda',
             'money' => 'monies',
             'mongoose' => 'mongooses',
+            'motto' => 'mottoes',
             'move' => 'moves',
             'mythos' => 'mythoi',
             'niche' => 'niches',
+            'nucleus' => 'nuclei',
             'numen' => 'numina',
             'occiput' => 'occiputs',
             'octopus' => 'octopuses',
@@ -98,11 +114,19 @@ class Inflector
             'ox' => 'oxen',
             'penis' => 'penises',
             'person' => 'people',
+            'plateau' => 'plateaux',
+            'runner-up' => 'runners-up',
             'sex' => 'sexes',
             'soliloquy' => 'soliloquies',
+            'son-in-law' => 'sons-in-law',
+            'syllabus' => 'syllabi',
             'testis' => 'testes',
+            'thief' => 'thieves',
+            'tooth' => 'teeth',
+            'tornado' => 'tornadoes',
             'trilby' => 'trilbys',
             'turf' => 'turfs',
+            'volcano' => 'volcanoes',
         )
     );
 
@@ -120,9 +144,10 @@ class Inflector
             '/(vert|ind)ices$/i' => '\1ex',
             '/^(ox)en/i' => '\1',
             '/(alias)(es)*$/i' => '\1',
+            '/(buffal|her|potat|tomat|volcan)oes$/i' => '\1o',
             '/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|viri?)i$/i' => '\1us',
             '/([ftw]ax)es/i' => '\1',
-            '/(cris|ax|test)es$/i' => '\1is',
+            '/(analys|ax|cris|test|thes)es$/i' => '\1is',
             '/(shoe|slave)s$/i' => '\1',
             '/(o)es$/i' => '\1',
             '/ouses$/' => 'ouse',
@@ -143,6 +168,7 @@ class Inflector
             '/(p)eople$/i' => '\1\2erson',
             '/(m)en$/i' => '\1an',
             '/(c)hildren$/i' => '\1\2hild',
+            '/(f)eet$/i' => '\1oot',
             '/(n)ews$/i' => '\1\2ews',
             '/eaus$/' => 'eau',
             '/^(.*us)$/' => '\\1',
@@ -159,10 +185,15 @@ class Inflector
             '.*ss',
         ),
         'irregular' => array(
-            'criterion' => 'criteria',
-            'curves' => 'curve',
-            'foes' => 'foe',
-            'waves' => 'wave',
+            'criteria'  => 'criterion',
+            'curves'    => 'curve',
+            'emphases'  => 'emphasis',
+            'foes'      => 'foe',
+            'hoaxes'    => 'hoax',
+            'media'     => 'medium',
+            'neuroses'  => 'neurosis',
+            'waves'     => 'wave',
+            'oases'     => 'oasis',
         )
     );
 
@@ -236,6 +267,42 @@ class Inflector
         return lcfirst(self::classify($word));
     }
 
+    /**
+     * Uppercases words with configurable delimeters between words.
+     *
+     * Takes a string and capitalizes all of the words, like PHP's built-in
+     * ucwords function.  This extends that behavior, however, by allowing the
+     * word delimeters to be configured, rather than only separating on
+     * whitespace.
+     *
+     * Here is an example:
+     * <code>
+     * <?php
+     * $string = 'top-o-the-morning to all_of_you!';
+     * echo \Doctrine\Common\Inflector\Inflector::ucwords($string);
+     * // Top-O-The-Morning To All_of_you!
+     *
+     * echo \Doctrine\Common\Inflector\Inflector::ucwords($string, '-_ ');
+     * // Top-O-The-Morning To All_Of_You!
+     * ?>
+     * </code>
+     *
+     * @param string $string The string to operate on.
+     * @param string $delimiters A list of word separators.
+     *
+     * @return string The string with all delimeter-separated words capitalized.
+     */
+    public static function ucwords($string, $delimiters = " \n\t\r\0\x0B-")
+    {
+        return preg_replace_callback(
+            '/[^' . preg_quote($delimiters, '/') . ']+/',
+            function($matches) {
+                return ucfirst($matches[0]);
+            },
+            $string
+        );
+    }
+
     /**
      * Clears Inflectors inflected value caches, and resets the inflection
      * rules to the initial values.
diff --git a/web/vendor/egulias/email-validator/.travis.yml b/web/vendor/egulias/email-validator/.travis.yml
index f25de0fb8..86d52b23e 100644
--- a/web/vendor/egulias/email-validator/.travis.yml
+++ b/web/vendor/egulias/email-validator/.travis.yml
@@ -12,15 +12,17 @@ php:
 
 env:
   global:
-    - deps=no
+    - deps=high
 
 matrix:
   fast_finish: true
   include:
     - php: 5.3
       env: deps=low
-    - php: 5.6
-      env: deps=high
+    - php: 5.4
+      env: deps=no
+    - php: 5.5
+      env: deps=no
 
 install:
   - if [ "$deps" = "no" ]; then composer install; fi
@@ -31,6 +33,3 @@ script:
  - mkdir -p build/logs
  - phpunit --coverage-clover build/logs/clover.xml
 
-after_script:
- - php vendor/bin/coveralls
-
diff --git a/web/vendor/egulias/email-validator/README.md b/web/vendor/egulias/email-validator/README.md
index 262693bf7..0d0c5cc06 100644
--- a/web/vendor/egulias/email-validator/README.md
+++ b/web/vendor/egulias/email-validator/README.md
@@ -9,7 +9,7 @@ With the help of
 Run the command below to install via Composer
 
 ```shell
-composer require egulias/email-validator
+composer require egulias/email-validator "~1.2"
 ```
 
 ##Usage##
diff --git a/web/vendor/egulias/email-validator/composer.json b/web/vendor/egulias/email-validator/composer.json
index 1ccb77a14..6fdc4d0b9 100644
--- a/web/vendor/egulias/email-validator/composer.json
+++ b/web/vendor/egulias/email-validator/composer.json
@@ -15,11 +15,10 @@
   },
   "require":      {
     "php": ">= 5.3.3",
-    "doctrine/lexer": "~1.0,>=1.0.1"
+    "doctrine/lexer": "^1.0.1"
   },
   "require-dev" :   {
-    "satooshi/php-coveralls": "dev-master",
-    "phpunit/phpunit": "~4.4"
+    "phpunit/phpunit": "^4.8.24"
   },
   "autoload": {
     "psr-0": {
diff --git a/web/vendor/egulias/email-validator/composer.lock b/web/vendor/egulias/email-validator/composer.lock
index 49f7df867..cbd6ba2ea 100644
--- a/web/vendor/egulias/email-validator/composer.lock
+++ b/web/vendor/egulias/email-validator/composer.lock
@@ -1,10 +1,11 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "9426f5a00cf0f71d83c287a7c0ff392b",
+    "hash": "aeeae19ffaaf639f5ad6edac2f979b28",
+    "content-hash": "61ce0ff395bacaa79d3f6e1216e23e4b",
     "packages": [
         {
             "name": "doctrine/lexer",
@@ -63,28 +64,83 @@
     ],
     "packages-dev": [
         {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "name": "dflydev/markdown",
+            "version": "v1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+                "url": "https://github.com/dflydev/dflydev-markdown.git",
+                "reference": "76501a808522dbe40a5a71d272bd08d54cbae03d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://api.github.com/repos/dflydev/dflydev-markdown/zipball/76501a808522dbe40a5a71d272bd08d54cbae03d",
+                "reference": "76501a808522dbe40a5a71d272bd08d54cbae03d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "php": ">=5.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "dflydev\\markdown": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "New BSD License"
+            ],
+            "authors": [
+                {
+                    "name": "Dragonfly Development Inc.",
+                    "email": "info@dflydev.com",
+                    "homepage": "http://dflydev.com"
+                },
+                {
+                    "name": "Beau Simensen",
+                    "email": "beau@dflydev.com",
+                    "homepage": "http://beausimensen.com"
+                },
+                {
+                    "name": "Michel Fortin",
+                    "homepage": "http://michelf.com"
+                },
+                {
+                    "name": "John Gruber",
+                    "homepage": "http://daringfireball.net"
+                }
+            ],
+            "description": "PHP Markdown & Extra",
+            "homepage": "http://github.com/dflydev/dflydev-markdown",
+            "keywords": [
+                "markdown"
+            ],
+            "abandoned": "michelf/php-markdown",
+            "time": "2012-01-02 23:11:32"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "26404e0c90565b614ee76b988b9bc8790d77f590"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/26404e0c90565b614ee76b988b9bc8790d77f590",
+                "reference": "26404e0c90565b614ee76b988b9bc8790d77f590",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~5.3"
             },
             "require-dev": {
                 "athletic/athletic": "~0.1.8",
                 "ext-pdo": "*",
                 "ext-phar": "*",
                 "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
             },
             "type": "library",
             "extra": {
@@ -93,8 +149,8 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                "psr-0": {
+                    "Doctrine\\Instantiator\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -114,126 +170,28 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14 21:17:01"
-        },
-        {
-            "name": "guzzle/guzzle",
-            "version": "v3.9.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle3.git",
-                "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9",
-                "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "php": ">=5.3.3",
-                "symfony/event-dispatcher": "~2.1"
-            },
-            "replace": {
-                "guzzle/batch": "self.version",
-                "guzzle/cache": "self.version",
-                "guzzle/common": "self.version",
-                "guzzle/http": "self.version",
-                "guzzle/inflection": "self.version",
-                "guzzle/iterator": "self.version",
-                "guzzle/log": "self.version",
-                "guzzle/parser": "self.version",
-                "guzzle/plugin": "self.version",
-                "guzzle/plugin-async": "self.version",
-                "guzzle/plugin-backoff": "self.version",
-                "guzzle/plugin-cache": "self.version",
-                "guzzle/plugin-cookie": "self.version",
-                "guzzle/plugin-curlauth": "self.version",
-                "guzzle/plugin-error-response": "self.version",
-                "guzzle/plugin-history": "self.version",
-                "guzzle/plugin-log": "self.version",
-                "guzzle/plugin-md5": "self.version",
-                "guzzle/plugin-mock": "self.version",
-                "guzzle/plugin-oauth": "self.version",
-                "guzzle/service": "self.version",
-                "guzzle/stream": "self.version"
-            },
-            "require-dev": {
-                "doctrine/cache": "~1.3",
-                "monolog/monolog": "~1.0",
-                "phpunit/phpunit": "3.7.*",
-                "psr/log": "~1.0",
-                "symfony/class-loader": "~2.1",
-                "zendframework/zend-cache": "2.*,<2.3",
-                "zendframework/zend-log": "2.*,<2.3"
-            },
-            "suggest": {
-                "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Guzzle": "src/",
-                    "Guzzle\\Tests": "tests/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Guzzle Community",
-                    "homepage": "https://github.com/guzzle/guzzle/contributors"
-                }
-            ],
-            "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2015-03-18 18:23:50"
+            "time": "2014-08-25 15:09:25"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.4",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+                "reference": "66ae84e9d7c8ea85c979cb65977bd8e608baf0c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66ae84e9d7c8ea85c979cb65977bd8e608baf0c5",
+                "reference": "66ae84e9d7c8ea85c979cb65977bd8e608baf0c5",
                 "shasum": ""
             },
             "require": {
+                "dflydev/markdown": "1.0.*",
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
+                "phpunit/phpunit": "3.7.*@stable"
             },
             "type": "library",
             "extra": {
@@ -258,26 +216,25 @@
                     "email": "mike.vanriel@naenius.com"
                 }
             ],
-            "time": "2015-02-03 12:10:50"
+            "time": "2013-08-07 11:04:22"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.4.1",
+            "version": "v1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373"
+                "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
-                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/9ca52329bcdd1500de24427542577ebf3fc2f1c9",
+                "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "phpdocumentor/reflection-docblock": "~2.0",
-                "sebastian/comparator": "~1.1"
+                "doctrine/instantiator": "~1.0,>=1.0.2",
+                "phpdocumentor/reflection-docblock": "~2.0"
             },
             "require-dev": {
                 "phpspec/phpspec": "~2.0"
@@ -285,7 +242,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -309,7 +266,7 @@
                 }
             ],
             "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
+            "homepage": "http://phpspec.org",
             "keywords": [
                 "Double",
                 "Dummy",
@@ -318,20 +275,20 @@
                 "spy",
                 "stub"
             ],
-            "time": "2015-04-27 22:15:08"
+            "time": "2014-11-17 16:23:49"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "2.1.6",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "631e365cf26bb2c078683e8d9bcf8bc631ac4d44"
+                "reference": "ba315f46873fd6e86fdb98685a1a900e7379c886"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/631e365cf26bb2c078683e8d9bcf8bc631ac4d44",
-                "reference": "631e365cf26bb2c078683e8d9bcf8bc631ac4d44",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ba315f46873fd6e86fdb98685a1a900e7379c886",
+                "reference": "ba315f46873fd6e86fdb98685a1a900e7379c886",
                 "shasum": ""
             },
             "require": {
@@ -380,7 +337,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-06-19 07:11:55"
+            "time": "2015-05-30 12:58:40"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -431,16 +388,16 @@
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "1.2.1",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
                 "shasum": ""
             },
             "require": {
@@ -449,17 +406,20 @@
             "type": "library",
             "autoload": {
                 "classmap": [
-                    "src/"
+                    "Text/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
             "license": [
                 "BSD-3-Clause"
             ],
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
+                    "email": "sb@sebastian-bergmann.de",
                     "role": "lead"
                 }
             ],
@@ -468,7 +428,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21 13:50:34"
+            "time": "2014-01-30 17:20:04"
         },
         {
             "name": "phpunit/php-timer",
@@ -513,16 +473,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.3",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9"
+                "reference": "f8d5d08c56de5cfd592b3340424a81733259a876"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
-                "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/f8d5d08c56de5cfd592b3340424a81733259a876",
+                "reference": "f8d5d08c56de5cfd592b3340424a81733259a876",
                 "shasum": ""
             },
             "require": {
@@ -535,7 +495,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
@@ -558,20 +518,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2015-06-19 03:43:16"
+            "time": "2014-08-31 06:12:13"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.7.5",
+            "version": "4.8.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f6701ef3faea759acd1910a7751d8d102a7fd5bc"
+                "reference": "a1066c562c52900a142a0e2bbf0582994671385e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f6701ef3faea759acd1910a7751d8d102a7fd5bc",
-                "reference": "f6701ef3faea759acd1910a7751d8d102a7fd5bc",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1066c562c52900a142a0e2bbf0582994671385e",
+                "reference": "a1066c562c52900a142a0e2bbf0582994671385e",
                 "shasum": ""
             },
             "require": {
@@ -581,7 +541,7 @@
                 "ext-reflection": "*",
                 "ext-spl": "*",
                 "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3,>=1.3.1",
+                "phpspec/prophecy": "^1.3.1",
                 "phpunit/php-code-coverage": "~2.1",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
@@ -589,7 +549,7 @@
                 "phpunit/phpunit-mock-objects": "~2.3",
                 "sebastian/comparator": "~1.1",
                 "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.2",
+                "sebastian/environment": "~1.3",
                 "sebastian/exporter": "~1.2",
                 "sebastian/global-state": "~1.0",
                 "sebastian/version": "~1.0",
@@ -604,7 +564,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.7.x-dev"
+                    "dev-master": "4.8.x-dev"
                 }
             },
             "autoload": {
@@ -630,29 +590,29 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-06-21 07:23:36"
+            "time": "2016-03-14 06:16:08"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.4",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35"
+                "reference": "c63d2367247365f688544f0d500af90a11a44c65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/92408bb1968a81b3217a6fdf6c1a198da83caa35",
-                "reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65",
+                "reference": "c63d2367247365f688544f0d500af90a11a44c65",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.2",
+                "doctrine/instantiator": "~1.0,>=1.0.1",
                 "php": ">=5.3.3",
                 "phpunit/php-text-template": "~1.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "~4.3"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -685,142 +645,29 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2015-06-11 15:55:48"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Psr\\Log\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2012-12-21 11:40:51"
-        },
-        {
-            "name": "satooshi/php-coveralls",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/satooshi/php-coveralls.git",
-                "reference": "2fbf803803d179ab1082807308a67bbd5a760c70"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/2fbf803803d179ab1082807308a67bbd5a760c70",
-                "reference": "2fbf803803d179ab1082807308a67bbd5a760c70",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-simplexml": "*",
-                "guzzle/guzzle": ">=2.7",
-                "php": ">=5.3",
-                "psr/log": "1.0.0",
-                "symfony/config": ">=2.0",
-                "symfony/console": ">=2.0",
-                "symfony/stopwatch": ">=2.2",
-                "symfony/yaml": ">=2.0"
-            },
-            "require-dev": {
-                "apigen/apigen": "2.8.*@stable",
-                "pdepend/pdepend": "dev-master as 2.0.0",
-                "phpmd/phpmd": "dev-master",
-                "phpunit/php-invoker": ">=1.1.0,<1.2.0",
-                "phpunit/phpunit": "3.7.*@stable",
-                "sebastian/finder-facade": "dev-master",
-                "sebastian/phpcpd": "1.4.*@stable",
-                "squizlabs/php_codesniffer": "1.4.*@stable",
-                "theseer/fdomdocument": "dev-master"
-            },
-            "suggest": {
-                "symfony/http-kernel": "Allows Symfony integration"
-            },
-            "bin": [
-                "composer/bin/coveralls"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Satooshi\\Component": "src/",
-                    "Satooshi\\Bundle": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kitamura Satoshi",
-                    "email": "with.no.parachute@gmail.com",
-                    "homepage": "https://www.facebook.com/satooshi.jp"
-                }
-            ],
-            "description": "PHP client library for Coveralls API",
-            "homepage": "https://github.com/satooshi/php-coveralls",
-            "keywords": [
-                "ci",
-                "coverage",
-                "github",
-                "test"
-            ],
-            "time": "2014-11-11 15:35:34"
+            "time": "2014-10-03 05:12:11"
         },
         {
             "name": "sebastian/comparator",
-            "version": "1.1.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
+                "reference": "c484a80f97573ab934e37826dba0135a3301b26a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c484a80f97573ab934e37826dba0135a3301b26a",
+                "reference": "c484a80f97573ab934e37826dba0135a3301b26a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
+                "sebastian/diff": "~1.1",
+                "sebastian/exporter": "~1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "~4.1"
             },
             "type": "library",
             "extra": {
@@ -862,20 +709,20 @@
                 "compare",
                 "equality"
             ],
-            "time": "2015-01-29 16:28:08"
+            "time": "2014-11-16 21:32:38"
         },
         {
             "name": "sebastian/diff",
-            "version": "1.3.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
+                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
-                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7",
+                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7",
                 "shasum": ""
             },
             "require": {
@@ -887,7 +734,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -914,20 +761,20 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2015-02-22 15:13:53"
+            "time": "2014-08-15 10:29:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "1.2.2",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e"
+                "reference": "4fe0a44cddd8cc19583a024bdc7374eb2fef0b87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5a8c7d31914337b69923db26c4221b81ff5a196e",
-                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4fe0a44cddd8cc19583a024bdc7374eb2fef0b87",
+                "reference": "4fe0a44cddd8cc19583a024bdc7374eb2fef0b87",
                 "shasum": ""
             },
             "require": {
@@ -964,7 +811,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2015-01-01 10:01:08"
+            "time": "2015-07-26 06:42:57"
         },
         {
             "name": "sebastian/exporter",
@@ -1138,16 +985,16 @@
         },
         {
             "name": "sebastian/version",
-            "version": "1.0.6",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+                "reference": "16b021aed448b654ae05846e394e057e9a6f04cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/16b021aed448b654ae05846e394e057e9a6f04cb",
+                "reference": "16b021aed448b654ae05846e394e057e9a6f04cb",
                 "shasum": ""
             },
             "type": "library",
@@ -1169,300 +1016,35 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21 13:59:46"
-        },
-        {
-            "name": "symfony/config",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Config.git",
-                "reference": "58ded81f1f582a87c528ef3dae9a859f78b5f374"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/58ded81f1f582a87c528ef3dae9a859f78b5f374",
-                "reference": "58ded81f1f582a87c528ef3dae9a859f78b5f374",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/filesystem": "~2.3"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Config\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Config Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-11 14:06:56"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Console.git",
-                "reference": "564398bc1f33faf92fc2ec86859983d30eb81806"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/564398bc1f33faf92fc2ec86859983d30eb81806",
-                "reference": "564398bc1f33faf92fc2ec86859983d30eb81806",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/phpunit-bridge": "~2.7",
-                "symfony/process": "~2.1"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-10 15:30:22"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/be3c5ff8d503c46768aeb78ce6333051aa6f26d9",
-                "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.0,>=2.0.5",
-                "symfony/dependency-injection": "~2.6",
-                "symfony/expression-language": "~2.6",
-                "symfony/phpunit-bridge": "~2.7",
-                "symfony/stopwatch": "~2.3"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-08 09:37:21"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "a0d43eb3e17d4f4c6990289805a488a0482a07f3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a0d43eb3e17d4f4c6990289805a488a0482a07f3",
-                "reference": "a0d43eb3e17d4f4c6990289805a488a0482a07f3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-08 09:37:21"
-        },
-        {
-            "name": "symfony/stopwatch",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Stopwatch.git",
-                "reference": "c653f1985f6c2b7dbffd04d48b9c0a96aaef814b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/c653f1985f6c2b7dbffd04d48b9c0a96aaef814b",
-                "reference": "c653f1985f6c2b7dbffd04d48b9c0a96aaef814b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Stopwatch\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Stopwatch Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-04 20:11:48"
+            "time": "2013-01-05 14:27:32"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.7.1",
+            "version": "v2.1.0",
+            "target-dir": "Symfony/Component/Yaml",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160"
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "f18e004fc975707bb4695df1dbbe9b0d8c8b7715"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/9808e75c609a14f6db02f70fccf4ca4aab53c160",
-                "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/f18e004fc975707bb4695df1dbbe9b0d8c8b7715",
+                "reference": "f18e004fc975707bb4695df1dbbe9b0d8c8b7715",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
+                "php": ">=5.3.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
+                "psr-0": {
+                    "Symfony\\Component\\Yaml": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1471,26 +1053,24 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
                 },
                 {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-10 15:30:22"
+            "homepage": "http://symfony.com",
+            "time": "2012-08-22 13:48:41"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "satooshi/php-coveralls": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
-    "prefer-lowest": false,
+    "prefer-lowest": true,
     "platform": {
         "php": ">= 5.3.3"
     },
diff --git a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
index d8522fff1..882c96815 100644
--- a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
+++ b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
@@ -67,8 +67,6 @@ class EmailLexer extends AbstractLexer
         "\n"   => self::S_LF,
         "\r\n" => self::CRLF,
         'IPv6' => self::S_IPV6TAG,
-        '<'    => self::S_LOWERTHAN,
-        '>'    => self::S_GREATERTHAN,
         '{'    => self::S_OPENQBRACKET,
         '}'    => self::S_CLOSEQBRACKET,
         ''     => self::S_EMPTY,
diff --git a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php
index d047decf2..69ff5fc1a 100644
--- a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php
+++ b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php
@@ -7,49 +7,52 @@ namespace Egulias\EmailValidator;
  *
  * @author Eduardo Gulias Davis <me@egulias.com>
  */
-class EmailValidator
+class EmailValidator implements EmailValidatorInterface
 {
+    /**
+     * Critical validation errors used to indicate that
+     * an email address is invalid:
+     */
     const ERR_CONSECUTIVEATS     = 128;
     const ERR_EXPECTING_DTEXT    = 129;
     const ERR_NOLOCALPART        = 130;
     const ERR_NODOMAIN           = 131;
     const ERR_CONSECUTIVEDOTS    = 132;
     const ERR_ATEXT_AFTER_CFWS   = 133;
-    const ERR_ATEXT_AFTER_QS     = 134;
-    const ERR_ATEXT_AFTER_DOMLIT = 135;
     const ERR_EXPECTING_QPAIR    = 136;
     const ERR_EXPECTING_ATEXT    = 137;
-    const ERR_EXPECTING_QTEXT    = 138;
     const ERR_EXPECTING_CTEXT    = 139;
-    const ERR_BACKSLASHEND       = 140;
     const ERR_DOT_START          = 141;
     const ERR_DOT_END            = 142;
-    const ERR_DOMAINHYPHENSTART  = 143;
     const ERR_DOMAINHYPHENEND    = 144;
     const ERR_UNCLOSEDQUOTEDSTR  = 145;
     const ERR_UNCLOSEDCOMMENT    = 146;
-    const ERR_UNCLOSEDDOMLIT     = 147;
     const ERR_FWS_CRLF_X2        = 148;
     const ERR_FWS_CRLF_END       = 149;
     const ERR_CR_NO_LF           = 150;
     const ERR_DEPREC_REACHED     = 151;
+    const ERR_UNOPENEDCOMMENT    = 152;
+    const ERR_ATEXT_AFTER_QS     = 134; // not in use
+    const ERR_ATEXT_AFTER_DOMLIT = 135; // not in use
+    const ERR_EXPECTING_QTEXT    = 138; // not in use
+    const ERR_BACKSLASHEND       = 140; // not in use
+    const ERR_DOMAINHYPHENSTART  = 143; // not in use
+    const ERR_UNCLOSEDDOMLIT     = 147; // not in use
+
+    /**
+     * Informational validation warnings regarding unusual or
+     * deprecated features found in an email address:
+     */
+    // Address is valid for SMTP (RFC-5321), but has unusual elements.
     const RFC5321_TLD             = 9;
-    const RFC5321_TLDNUMERIC      = 10;
     const RFC5321_QUOTEDSTRING    = 11;
     const RFC5321_ADDRESSLITERAL  = 12;
     const RFC5321_IPV6DEPRECATED  = 13;
-    const CFWS_COMMENT            = 17;
-    const CFWS_FWS                = 18;
-    const DEPREC_LOCALPART        = 33;
-    const DEPREC_FWS              = 34;
-    const DEPREC_QTEXT            = 35;
-    const DEPREC_QP               = 36;
-    const DEPREC_COMMENT          = 37;
-    const DEPREC_CTEXT            = 38;
-    const DEPREC_CFWS_NEAR_AT     = 49;
+    const RFC5321_TLDNUMERIC      = 10; // not in use
+    // Address is only valid according to the broad
+    // definition of RFC-5322. It is otherwise invalid.
     const RFC5322_LOCAL_TOOLONG   = 64;
     const RFC5322_LABEL_TOOLONG   = 63;
-    const RFC5322_DOMAIN          = 65;
     const RFC5322_TOOLONG         = 66;
     const RFC5322_DOMAIN_TOOLONG  = 255;
     const RFC5322_DOMAINLITERAL   = 70;
@@ -60,12 +63,48 @@ class EmailValidator
     const RFC5322_IPV6_MAXGRPS    = 75;
     const RFC5322_IPV6_COLONSTRT  = 76;
     const RFC5322_IPV6_COLONEND   = 77;
+    const RFC5322_DOMAIN          = 65; // not in use
+    // Address contains deprecated elements, but may
+    // still be valid in restricted contexts.
+    const DEPREC_QP               = 36;
+    const DEPREC_COMMENT          = 37;
+    const DEPREC_CFWS_NEAR_AT     = 49;
+    const DEPREC_LOCALPART        = 33; // not in use
+    const DEPREC_FWS              = 34; // not in use
+    const DEPREC_QTEXT            = 35; // not in use
+    const DEPREC_CTEXT            = 38; // not in use
+    // Address is valid within the message,
+    // but cannot be used unmodified in the envelope.
+    const CFWS_COMMENT            = 17;
+    const CFWS_FWS                = 18;
+    // Hostname DNS checks were unsuccessful.
     const DNSWARN_NO_MX_RECORD    = 5;
     const DNSWARN_NO_RECORD       = 6;
 
+    /**
+     * @var EmailParser
+     */
     protected $parser;
+
+    /**
+     * Contains any informational warnings regarding unusual/deprecated
+     * features that were encountered during validation.
+     *
+     * @var array
+     */
     protected $warnings = array();
+
+    /**
+     * If a critical validation problem is encountered, this will be
+     * set to the value of one of this class's ERR_* constants.
+     *
+     * @var int
+     */
     protected $error;
+
+    /**
+     * @var int
+     */
     protected $threshold = 255;
 
     public function __construct()
@@ -73,6 +112,9 @@ class EmailValidator
         $this->parser = new EmailParser(new EmailLexer());
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function isValid($email, $checkDNS = false, $strict = false)
     {
         try {
@@ -84,22 +126,18 @@ class EmailValidator
             return false;
         }
 
-        $dns = true;
-        if ($checkDNS) {
-            $dns = $this->checkDNS();
-        }
+        $dnsProblemExists = ($checkDNS ? !$this->checkDNS() : false);
 
         if ($this->hasWarnings() && ((int) max($this->warnings) > $this->threshold)) {
             $this->error = self::ERR_DEPREC_REACHED;
-
             return false;
         }
 
-        return !$strict || (!$this->hasWarnings() && $dns);
+        return ($strict ? (!$this->hasWarnings() && !$dnsProblemExists) : true);
     }
 
     /**
-     * @return boolean
+     * {@inheritdoc}
      */
     public function hasWarnings()
     {
@@ -107,7 +145,7 @@ class EmailValidator
     }
 
     /**
-     * @return array
+     * {@inheritdoc}
      */
     public function getWarnings()
     {
@@ -115,7 +153,7 @@ class EmailValidator
     }
 
     /**
-     * @return string
+     * {@inheritdoc}
      */
     public function getError()
     {
@@ -123,9 +161,7 @@ class EmailValidator
     }
 
     /**
-     * @param int $threshold
-     *
-     * @return EmailValidator
+     * {@inheritdoc}
      */
     public function setThreshold($threshold)
     {
@@ -135,26 +171,30 @@ class EmailValidator
     }
 
     /**
-     * @return int
+     * {@inheritdoc}
      */
     public function getThreshold()
     {
         return $this->threshold;
     }
 
+    /**
+     * @return bool Whether or not an MX record exists for the
+     *              email address's host name.
+     */
     protected function checkDNS()
     {
-        $checked = true;
+        $host = $this->parser->getParsedDomainPart();
+        $host = rtrim($host, '.') . '.';
 
-        $result = checkdnsrr(trim($this->parser->getParsedDomainPart()), 'MX');
+        $mxRecordExists = checkdnsrr($host, 'MX');
 
-        if (!$result) {
+        if (!$mxRecordExists) {
             $this->warnings[] = self::DNSWARN_NO_RECORD;
-            $checked = false;
             $this->addTLDWarnings();
         }
 
-        return $checked;
+        return $mxRecordExists;
     }
 
     protected function addTLDWarnings()
diff --git a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidatorInterface.php b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidatorInterface.php
new file mode 100644
index 000000000..7ac54f930
--- /dev/null
+++ b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidatorInterface.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Egulias\EmailValidator;
+
+/**
+ * EmailValidatorInterface
+ *
+ * @author Chris McCafferty <cilefen@gmail.com>
+ */
+interface EmailValidatorInterface
+{
+    /**
+     * Validates an email address against the following standards:
+     *
+     * RFC-5321: Simple Mail Transfer Protocol
+     * RFC-5322: Internet Message Format
+     * RFC-6530: Overview and Framework for Internationalized Email
+     * RFC-6531: SMTP Extension for Internationalized Email
+     * RFC-6532: Internationalized Email Headers
+     * RFC-1123 section 2.1: Requirements for Internet Hosts -- Application and Support
+     * RFC-4291 section 2.2: IP Version 6 Addressing Architecture
+     *
+     * @param string $email    The email address to validate.
+     * @param bool   $checkDNS Whether or not the email address's hostname should
+     *                         be confirmed with a DNS lookup. This only comes
+     *                         into play if strict mode is also enabled.
+     * @param bool   $strict   If this is true, and any informational warnings
+     *                         were raised during validation, the email address
+     *                         will be considered invalid. Additionally, if
+     *                         $checkDNS is true and the DNS lookup failed,
+     *                         the email address will be considered invalid.
+     * @return bool
+     */
+    public function isValid($email, $checkDNS = false, $strict = false);
+
+    /**
+     * @return bool
+     */
+    public function hasWarnings();
+
+    /**
+     * @return array
+     */
+    public function getWarnings();
+
+    /**
+     * @return string
+     */
+    public function getError();
+
+    /**
+     * @param int $threshold The acceptable number of deprecation warnings.
+     *
+     * @return EmailValidator
+     */
+    public function setThreshold($threshold);
+
+    /**
+     * @return int
+     */
+    public function getThreshold();
+}
diff --git a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
index c4d0cf602..66a51fb4f 100644
--- a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
+++ b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
@@ -4,7 +4,6 @@
 namespace Egulias\EmailValidator\Parser;
 
 use Egulias\EmailValidator\EmailLexer;
-use Egulias\EmailValidator\Parser\Parser;
 use Egulias\EmailValidator\EmailValidator;
 
 class DomainPart extends Parser
@@ -103,23 +102,34 @@ class DomainPart extends Parser
     protected function doParseDomainPart()
     {
         $domain = '';
+        $openedParenthesis = 0;
+        $openBrackets = false;
         do {
-
             $prev = $this->lexer->getPrevious();
 
-            if ($this->lexer->token['type'] === EmailLexer::S_SLASH) {
-                throw new \InvalidArgumentException('ERR_DOMAIN_CHAR_NOT_ALLOWED');
-            }
+            $this->checkNotAllowedChars($this->lexer->token);
 
             if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
                 $this->parseComments();
+                $openedParenthesis += $this->getOpenedParenthesis();
                 $this->lexer->moveNext();
+                $tmpPrev = $this->lexer->getPrevious();
+                if ($tmpPrev['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+                    $openedParenthesis--;
+                }
+            }
+            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+                if ($openedParenthesis === 0) {
+                    throw new \InvalidArgumentException('ERR_UNOPENEDCOMMENT');
+                } else {
+                    $openedParenthesis--;
+                }
             }
 
             $this->checkConsecutiveDots();
             $this->checkDomainPartExceptions($prev);
 
-            if ($this->hasBrackets()) {
+            if ($openBrackets = $this->hasBrackets($openBrackets)) {
                 $this->parseDomainLiteral();
             }
 
@@ -136,6 +146,14 @@ class DomainPart extends Parser
         return $domain;
     }
 
+    private function checkNotAllowedChars($token)
+    {
+        $notAllowed = array(EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true);
+        if (isset($notAllowed[$token['type']])) {
+            throw new \InvalidArgumentException('ERR_DOMAIN_CHAR_NOT_ALLOWED');
+        }
+    }
+
     protected function parseDomainLiteral()
     {
         if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
@@ -180,7 +198,7 @@ class DomainPart extends Parser
             }
 
             if ($this->lexer->isNextToken(EmailLexer::S_CR)) {
-                throw new \InvalidArgumentException("ERR_CR_NO_LF");
+                throw new \InvalidArgumentException('ERR_CR_NO_LF');
             }
             if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) {
                 $this->warnings[] = EmailValidator::RFC5322_DOMLIT_OBSDTEXT;
@@ -276,8 +294,12 @@ class DomainPart extends Parser
         }
     }
 
-    protected function hasBrackets()
+    protected function hasBrackets($openBrackets)
     {
+        if ($this->lexer->token['type'] === EmailLexer::S_CLOSEBRACKET && !$openBrackets) {
+            throw new \InvalidArgumentException('ERR_EXPECTING_OPENBRACKET');
+        }
+
         if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
             return false;
         }
diff --git a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
index 2f7716409..449748f4d 100644
--- a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
+++ b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
@@ -4,7 +4,6 @@ namespace Egulias\EmailValidator\Parser;
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\EmailValidator;
-use \InvalidArgumentException;
 
 class LocalPart extends Parser
 {
@@ -12,9 +11,9 @@ class LocalPart extends Parser
     {
         $parseDQuote = true;
         $closingQuote = false;
+        $openedParenthesis = 0;
 
         while ($this->lexer->token['type'] !== EmailLexer::S_AT && $this->lexer->token) {
-
             if ($this->lexer->token['type'] === EmailLexer::S_DOT && !$this->lexer->getPrevious()) {
                 throw new \InvalidArgumentException('ERR_DOT_START');
             }
@@ -26,12 +25,19 @@ class LocalPart extends Parser
 
             if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
                 $this->parseComments();
+                $openedParenthesis += $this->getOpenedParenthesis();
+            }
+            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+                if ($openedParenthesis === 0) {
+                    throw new \InvalidArgumentException('ERR_UNOPENEDCOMMENT');
+                } else {
+                    $openedParenthesis--;
+                }
             }
 
             $this->checkConsecutiveDots();
 
-            if (
-                $this->lexer->token['type'] === EmailLexer::S_DOT &&
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
                 $this->lexer->isNextToken(EmailLexer::S_AT)
             ) {
                 throw new \InvalidArgumentException('ERR_DOT_END');
@@ -82,7 +88,7 @@ class LocalPart extends Parser
             $this->lexer->moveNext();
 
             if (!$this->escaped() && isset($invalid[$this->lexer->token['type']])) {
-                throw new InvalidArgumentException("ERR_EXPECTED_ATEXT");
+                throw new \InvalidArgumentException('ERR_EXPECTED_ATEXT');
             }
         }
 
@@ -90,12 +96,12 @@ class LocalPart extends Parser
 
         if ($prev['type'] === EmailLexer::S_BACKSLASH) {
             if (!$this->checkDQUOTE(false)) {
-                throw new \InvalidArgumentException("ERR_UNCLOSED_DQUOTE");
+                throw new \InvalidArgumentException('ERR_UNCLOSED_DQUOTE');
             }
         }
 
         if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) {
-            throw new \InvalidArgumentException("ERR_EXPECED_AT");
+            throw new \InvalidArgumentException('ERR_EXPECED_AT');
         }
 
         return $parseAgain;
diff --git a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php
index b66279e29..8a72cd104 100644
--- a/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php
+++ b/web/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php
@@ -9,6 +9,7 @@ abstract class Parser
 {
     protected $warnings = array();
     protected $lexer;
+    protected $openedParenthesis = 0;
 
     public function __construct(EmailLexer $lexer)
     {
@@ -20,7 +21,13 @@ abstract class Parser
         return $this->warnings;
     }
 
-    abstract function parse($str);
+    abstract public function parse($str);
+
+    /** @return int */
+    public function getOpenedParenthesis()
+    {
+        return $this->openedParenthesis;
+    }
 
     /**
      * validateQuotedPair
@@ -35,15 +42,15 @@ abstract class Parser
         $this->warnings[] = EmailValidator::DEPREC_QP;
     }
 
-    /**
-     * @return string the the comment
-     * @throws \InvalidArgumentException
-     */
     protected function parseComments()
     {
+        $this->openedParenthesis = 1;
         $this->isUnclosedComment();
         $this->warnings[] = EmailValidator::CFWS_COMMENT;
         while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
+            if ($this->lexer->isNextToken(EmailLexer::S_OPENPARENTHESIS)) {
+                $this->openedParenthesis++;
+            }
             $this->warnEscaping();
             $this->lexer->moveNext();
         }
@@ -75,11 +82,11 @@ abstract class Parser
         $this->checkCRLFInFWS();
 
         if ($this->lexer->token['type'] === EmailLexer::S_CR) {
-            throw new \InvalidArgumentException("ERR_CR_NO_LF");
+            throw new \InvalidArgumentException('ERR_CR_NO_LF');
         }
 
         if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type']  !== EmailLexer::S_AT) {
-            throw new \InvalidArgumentException("ERR_ATEXT_AFTER_CFWS");
+            throw new \InvalidArgumentException('ERR_ATEXT_AFTER_CFWS');
         }
 
         if ($this->lexer->token['type'] === EmailLexer::S_LF || $this->lexer->token['type'] === EmailLexer::C_NUL) {
@@ -160,7 +167,7 @@ abstract class Parser
             return $hasClosingQuote;
         }
         $previous = $this->lexer->getPrevious();
-        if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] === EmailLexer::GENERIC) {
+        if ($previous['type'] === EmailLexer::GENERIC && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
             throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
         }
 
@@ -181,10 +188,10 @@ abstract class Parser
             return;
         }
         if ($this->lexer->isNextToken(EmailLexer::CRLF)) {
-            throw new \InvalidArgumentException("ERR_FWS_CRLF_X2");
+            throw new \InvalidArgumentException('ERR_FWS_CRLF_X2');
         }
         if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
-            throw new \InvalidArgumentException("ERR_FWS_CRLF_END");
+            throw new \InvalidArgumentException('ERR_FWS_CRLF_END');
         }
     }
 }
diff --git a/web/vendor/guzzlehttp/guzzle/.travis.yml b/web/vendor/guzzlehttp/guzzle/.travis.yml
index a4cd64ccd..e2f4f7021 100644
--- a/web/vendor/guzzlehttp/guzzle/.travis.yml
+++ b/web/vendor/guzzlehttp/guzzle/.travis.yml
@@ -6,11 +6,11 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 before_script:
   - curl --version
-  - composer self-update
   - composer install --no-interaction --prefer-source --dev
   - ~/.nvm/nvm.sh install v0.6.14
   - ~/.nvm/nvm.sh run v0.6.14
diff --git a/web/vendor/guzzlehttp/guzzle/CHANGELOG.md b/web/vendor/guzzlehttp/guzzle/CHANGELOG.md
index affddab49..dbce4ac8b 100644
--- a/web/vendor/guzzlehttp/guzzle/CHANGELOG.md
+++ b/web/vendor/guzzlehttp/guzzle/CHANGELOG.md
@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 6.2.3 - 2017-02-28
+
+* Fix deprecations with guzzle/psr7 version 1.4
+
+## 6.2.2 - 2016-10-08
+
+* Allow to pass nullable Response to delay callable
+* Only add scheme when host is present
+* Fix drain case where content-length is the literal string zero
+* Obfuscate in-URL credentials in exceptions
+
 ## 6.2.1 - 2016-07-18
 
 * Address HTTP_PROXY security vulnerability, CVE-2016-5385:
@@ -746,7 +757,7 @@ interfaces.
 * Deprecating Response::getRequest() and now using a shallow clone of a request object to remove a circular reference
   to help with refcount based garbage collection of resources created by sending a request
 * Deprecating ZF1 cache and log adapters. These will be removed in the next major version.
-* Deprecating `Response::getPreviousResponse()` (method signature still exists, but it'sdeprecated). Use the
+* Deprecating `Response::getPreviousResponse()` (method signature still exists, but it's deprecated). Use the
   HistoryPlugin for a history.
 * Added a `responseBody` alias for the `response_body` location
 * Refactored internals to no longer rely on Response::getRequest()
diff --git a/web/vendor/guzzlehttp/guzzle/UPGRADING.md b/web/vendor/guzzlehttp/guzzle/UPGRADING.md
index 9e31ddcce..91d1dcc99 100644
--- a/web/vendor/guzzlehttp/guzzle/UPGRADING.md
+++ b/web/vendor/guzzlehttp/guzzle/UPGRADING.md
@@ -132,7 +132,7 @@ $handler = GuzzleHttp\HandlerStack::create();
 $handler->push(Middleware::mapRequest(function (RequestInterface $request) {
     // Notice that we have to return a request object
     return $request->withHeader('X-Foo', 'Bar');
-});
+}));
 // Inject the handler into the client
 $client = new GuzzleHttp\Client(['handler' => $handler]);
 ```
@@ -600,7 +600,7 @@ these if needed):
 The following plugins are not part of the core Guzzle package, but are provided
 in separate repositories:
 
-- `Guzzle\Http\Plugin\BackoffPlugin` has been rewritten to be muchs simpler
+- `Guzzle\Http\Plugin\BackoffPlugin` has been rewritten to be much simpler
   to build custom retry policies using simple functions rather than various
   chained classes. See: https://github.com/guzzle/retry-subscriber
 - `Guzzle\Http\Plugin\Cache\CachePlugin` has moved to
@@ -664,8 +664,8 @@ that contain additional metadata accessible via `getMetadata()`.
 
 The entire concept of the StreamRequestFactory has been removed. The way this
 was used in Guzzle 3 broke the actual interface of sending streaming requests
-(instead of getting back a Response, you got a StreamInterface). Streeaming
-PHP requests are now implemented throught the `GuzzleHttp\Adapter\StreamAdapter`.
+(instead of getting back a Response, you got a StreamInterface). Streaming
+PHP requests are now implemented through the `GuzzleHttp\Adapter\StreamAdapter`.
 
 3.6 to 3.7
 ----------
diff --git a/web/vendor/guzzlehttp/guzzle/composer.json b/web/vendor/guzzlehttp/guzzle/composer.json
index 218c24736..0f4f94a50 100644
--- a/web/vendor/guzzlehttp/guzzle/composer.json
+++ b/web/vendor/guzzlehttp/guzzle/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=5.5",
-        "guzzlehttp/psr7": "^1.3.1",
+        "guzzlehttp/psr7": "^1.4",
         "guzzlehttp/promises": "^1.0"
     },
     "require-dev": {
diff --git a/web/vendor/guzzlehttp/guzzle/src/Client.php b/web/vendor/guzzlehttp/guzzle/src/Client.php
index 6089c1869..2e4ceadef 100644
--- a/web/vendor/guzzlehttp/guzzle/src/Client.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Client.php
@@ -9,18 +9,18 @@ use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
- * @method ResponseInterface get($uri, array $options = [])
- * @method ResponseInterface head($uri, array $options = [])
- * @method ResponseInterface put($uri, array $options = [])
- * @method ResponseInterface post($uri, array $options = [])
- * @method ResponseInterface patch($uri, array $options = [])
- * @method ResponseInterface delete($uri, array $options = [])
- * @method Promise\PromiseInterface getAsync($uri, array $options = [])
- * @method Promise\PromiseInterface headAsync($uri, array $options = [])
- * @method Promise\PromiseInterface putAsync($uri, array $options = [])
- * @method Promise\PromiseInterface postAsync($uri, array $options = [])
- * @method Promise\PromiseInterface patchAsync($uri, array $options = [])
- * @method Promise\PromiseInterface deleteAsync($uri, array $options = [])
+ * @method ResponseInterface get(string|UriInterface $uri, array $options = [])
+ * @method ResponseInterface head(string|UriInterface $uri, array $options = [])
+ * @method ResponseInterface put(string|UriInterface $uri, array $options = [])
+ * @method ResponseInterface post(string|UriInterface $uri, array $options = [])
+ * @method ResponseInterface patch(string|UriInterface $uri, array $options = [])
+ * @method ResponseInterface delete(string|UriInterface $uri, array $options = [])
+ * @method Promise\PromiseInterface getAsync(string|UriInterface $uri, array $options = [])
+ * @method Promise\PromiseInterface headAsync(string|UriInterface $uri, array $options = [])
+ * @method Promise\PromiseInterface putAsync(string|UriInterface $uri, array $options = [])
+ * @method Promise\PromiseInterface postAsync(string|UriInterface $uri, array $options = [])
+ * @method Promise\PromiseInterface patchAsync(string|UriInterface $uri, array $options = [])
+ * @method Promise\PromiseInterface deleteAsync(string|UriInterface $uri, array $options = [])
  */
 class Client implements ClientInterface
 {
@@ -142,10 +142,10 @@ class Client implements ClientInterface
         $uri = Psr7\uri_for($uri === null ? '' : $uri);
 
         if (isset($config['base_uri'])) {
-            $uri = Psr7\Uri::resolve(Psr7\uri_for($config['base_uri']), $uri);
+            $uri = Psr7\UriResolver::resolve(Psr7\uri_for($config['base_uri']), $uri);
         }
 
-        return $uri->getScheme() === '' ? $uri->withScheme('http') : $uri;
+        return $uri->getScheme() === '' && $uri->getHost() !== '' ? $uri->withScheme('http') : $uri;
     }
 
     /**
diff --git a/web/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/web/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
index f01f06d99..3fd72faa8 100644
--- a/web/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
@@ -4,6 +4,7 @@ namespace GuzzleHttp\Exception;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use GuzzleHttp\Promise\PromiseInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
  * HTTP Request exception
@@ -89,12 +90,15 @@ class RequestException extends TransferException
             $className = __CLASS__;
         }
 
+        $uri = $request->getUri();
+        $uri = static::obfuscateUri($uri);
+
         // Server Error: `GET /` resulted in a `404 Not Found` response:
         // <html> ... (truncated)
         $message = sprintf(
             '%s: `%s` resulted in a `%s` response',
             $label,
-            $request->getMethod() . ' ' . $request->getUri(),
+            $request->getMethod() . ' ' . $uri,
             $response->getStatusCode() . ' ' . $response->getReasonPhrase()
         );
 
@@ -141,6 +145,24 @@ class RequestException extends TransferException
         return $summary;
     }
 
+    /**
+     * Obfuscates URI if there is an username and a password present
+     *
+     * @param UriInterface $uri
+     *
+     * @return UriInterface
+     */
+    private static function obfuscateUri($uri)
+    {
+        $userInfo = $uri->getUserInfo();
+
+        if (false !== ($pos = strpos($userInfo, ':'))) {
+            return $uri->withUserInfo(substr($userInfo, 0, $pos), '***');
+        }
+
+        return $uri;
+    }
+
     /**
      * Get the request that caused the exception
      *
diff --git a/web/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php b/web/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
index 30b602e2d..4972f54a4 100644
--- a/web/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
+++ b/web/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
@@ -210,7 +210,7 @@ class StreamHandler
         Psr7\copy_to_stream(
             $source,
             $sink,
-            strlen($contentLength) > 0 ? (int) $contentLength : -1
+            (strlen($contentLength) > 0 && (int) $contentLength > 0) ? (int) $contentLength : -1
         );
 
         $sink->seek(0);
diff --git a/web/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php b/web/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
index dbe8b87e5..5613f6ec0 100644
--- a/web/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
+++ b/web/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
@@ -208,9 +208,9 @@ class RedirectMiddleware
         ResponseInterface $response,
         array $protocols
     ) {
-        $location = Psr7\Uri::resolve(
+        $location = Psr7\UriResolver::resolve(
             $request->getUri(),
-            $response->getHeaderLine('Location')
+            new Psr7\Uri($response->getHeaderLine('Location'))
         );
 
         // Ensure that the redirect URI is allowed based on the protocols.
diff --git a/web/vendor/guzzlehttp/guzzle/src/RequestOptions.php b/web/vendor/guzzlehttp/guzzle/src/RequestOptions.php
index 3af2f368a..60e53f537 100644
--- a/web/vendor/guzzlehttp/guzzle/src/RequestOptions.php
+++ b/web/vendor/guzzlehttp/guzzle/src/RequestOptions.php
@@ -43,8 +43,8 @@ final class RequestOptions
     const AUTH = 'auth';
 
     /**
-     * body: (string|null|callable|iterator|object) Body to send in the
-     * request.
+     * body: (resource|string|null|int|float|StreamInterface|callable|\Iterator)
+     * Body to send in the request.
      */
     const BODY = 'body';
 
diff --git a/web/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php b/web/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
index 4b95a1474..db0f22226 100644
--- a/web/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
+++ b/web/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
@@ -5,6 +5,7 @@ use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\RejectedPromise;
 use GuzzleHttp\Psr7;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Middleware that retries requests based on the boolean result of
@@ -25,8 +26,8 @@ class RetryMiddleware
      *                              retried.
      * @param callable $nextHandler Next handler to invoke.
      * @param callable $delay       Function that accepts the number of retries
-     *                              and returns the number of milliseconds to
-     *                              delay.
+     *                              and [response] and returns the number of
+     *                              milliseconds to delay.
      */
     public function __construct(
         callable $decider,
@@ -82,7 +83,7 @@ class RetryMiddleware
             )) {
                 return $value;
             }
-            return $this->doRetry($req, $options);
+            return $this->doRetry($req, $options, $value);
         };
     }
 
@@ -102,9 +103,9 @@ class RetryMiddleware
         };
     }
 
-    private function doRetry(RequestInterface $request, array $options)
+    private function doRetry(RequestInterface $request, array $options, ResponseInterface $response = null)
     {
-        $options['delay'] = call_user_func($this->delay, ++$options['retries']);
+        $options['delay'] = call_user_func($this->delay, ++$options['retries'], $response);
 
         return $this($request, $options);
     }
diff --git a/web/vendor/guzzlehttp/promises/.gitignore b/web/vendor/guzzlehttp/promises/.gitignore
deleted file mode 100644
index 83ec41e24..000000000
--- a/web/vendor/guzzlehttp/promises/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-phpunit.xml
-composer.phar
-composer.lock
-composer-test.lock
-vendor/
-build/artifacts/
-artifacts/
-docs/_build
-docs/*.pyc
-.idea
-.DS_STORE
diff --git a/web/vendor/guzzlehttp/promises/.travis.yml b/web/vendor/guzzlehttp/promises/.travis.yml
deleted file mode 100644
index 4f4d2b86b..000000000
--- a/web/vendor/guzzlehttp/promises/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: php
-
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-sudo: false
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
-
-script: make test
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
diff --git a/web/vendor/guzzlehttp/promises/CHANGELOG.md b/web/vendor/guzzlehttp/promises/CHANGELOG.md
index 99603e5d0..551929f6b 100644
--- a/web/vendor/guzzlehttp/promises/CHANGELOG.md
+++ b/web/vendor/guzzlehttp/promises/CHANGELOG.md
@@ -1,31 +1,65 @@
 # CHANGELOG
 
+
+## 1.3.1 - 2016-12-20
+
+### Fixed
+
+- `wait()` foreign promise compatibility
+
+
+## 1.3.0 - 2016-11-18
+
+### Added
+
+- Adds support for custom task queues.
+
+### Fixed
+
+- Fixed coroutine promise memory leak.
+
+
 ## 1.2.0 - 2016-05-18
 
-* Update to now catch `\Throwable` on PHP 7+
+### Changed
+
+- Update to now catch `\Throwable` on PHP 7+
+
 
 ## 1.1.0 - 2016-03-07
 
-* Update EachPromise to prevent recurring on a iterator when advancing, as this
+### Changed
+
+- Update EachPromise to prevent recurring on a iterator when advancing, as this
   could trigger fatal generator errors.
-* Update Promise to allow recursive waiting without unwrapping exceptions.
+- Update Promise to allow recursive waiting without unwrapping exceptions.
+
 
 ## 1.0.3 - 2015-10-15
 
-* Update EachPromise to immediately resolve when the underlying promise iterator
+### Changed
+
+- Update EachPromise to immediately resolve when the underlying promise iterator
   is empty. Previously, such a promise would throw an exception when its `wait`
   function was called.
 
+
 ## 1.0.2 - 2015-05-15
 
-* Conditionally require functions.php.
+### Changed
+
+- Conditionally require functions.php.
+
 
 ## 1.0.1 - 2015-06-24
 
-* Updating EachPromise to call next on the underlying promise iterator as late
+### Changed
+
+- Updating EachPromise to call next on the underlying promise iterator as late
   as possible to ensure that generators that generate new requests based on
   callbacks are not iterated until after callbacks are invoked.
 
+
 ## 1.0.0 - 2015-05-12
 
-* Initial release
+- Initial release
diff --git a/web/vendor/guzzlehttp/promises/LICENSE b/web/vendor/guzzlehttp/promises/LICENSE
index 581d95f92..67f91a14c 100644
--- a/web/vendor/guzzlehttp/promises/LICENSE
+++ b/web/vendor/guzzlehttp/promises/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
+Copyright (c) 2015-2016 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/web/vendor/guzzlehttp/promises/README.md b/web/vendor/guzzlehttp/promises/README.md
index 0dea84014..7b607e28b 100644
--- a/web/vendor/guzzlehttp/promises/README.md
+++ b/web/vendor/guzzlehttp/promises/README.md
@@ -96,7 +96,7 @@ $promise->resolve('reader.');
 ## Promise forwarding
 
 Promises can be chained one after the other. Each then in the chain is a new
-promise. The return value of of a promise is what's forwarded to the next
+promise. The return value of a promise is what's forwarded to the next
 promise in the chain. Returning a promise in a `then` callback will cause the
 subsequent promises in the chain to only be fulfilled when the returned promise
 has been fulfilled. The next promise in the chain will be invoked with the
@@ -315,8 +315,11 @@ A promise has the following methods:
 
 - `then(callable $onFulfilled, callable $onRejected) : PromiseInterface`
   
-  Creates a new promise that is fulfilled or rejected when the promise is
-  resolved.
+  Appends fulfillment and rejection handlers to the promise, and returns a new promise resolving to the return value of the called handler.
+
+- `otherwise(callable $onRejected) : PromiseInterface`
+  
+  Appends a rejection handler callback to the promise, and returns a new promise resolving to the return value of the callback if it is called, or to its original fulfillment value if the promise is instead fulfilled.
 
 - `wait($unwrap = true) : mixed`
 
diff --git a/web/vendor/guzzlehttp/promises/composer.json b/web/vendor/guzzlehttp/promises/composer.json
index f13844b63..ec41a61e6 100644
--- a/web/vendor/guzzlehttp/promises/composer.json
+++ b/web/vendor/guzzlehttp/promises/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "guzzlehttp/promises",
-    "type": "library",
     "description": "Guzzle promises library",
     "keywords": ["promise"],
     "license": "MIT",
@@ -15,7 +14,7 @@
         "php": ">=5.5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "^4.0"
     },
     "autoload": {
         "psr-4": {
@@ -23,9 +22,13 @@
         },
         "files": ["src/functions_include.php"]
     },
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "test-ci": "vendor/bin/phpunit --coverage-text"
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.4-dev"
         }
     }
 }
diff --git a/web/vendor/guzzlehttp/promises/phpunit.xml.dist b/web/vendor/guzzlehttp/promises/phpunit.xml.dist
deleted file mode 100644
index 500cd53a0..000000000
--- a/web/vendor/guzzlehttp/promises/phpunit.xml.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-         colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
-  <filter>
-    <whitelist>
-      <directory suffix=".php">src</directory>
-      <exclude>
-        <directory suffix="Interface.php">src/</directory>
-      </exclude>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/web/vendor/guzzlehttp/promises/src/Coroutine.php b/web/vendor/guzzlehttp/promises/src/Coroutine.php
new file mode 100644
index 000000000..6aa095870
--- /dev/null
+++ b/web/vendor/guzzlehttp/promises/src/Coroutine.php
@@ -0,0 +1,151 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+use Exception;
+use Generator;
+use Throwable;
+
+/**
+ * Creates a promise that is resolved using a generator that yields values or
+ * promises (somewhat similar to C#'s async keyword).
+ *
+ * When called, the coroutine function will start an instance of the generator
+ * and returns a promise that is fulfilled with its final yielded value.
+ *
+ * Control is returned back to the generator when the yielded promise settles.
+ * This can lead to less verbose code when doing lots of sequential async calls
+ * with minimal processing in between.
+ *
+ *     use GuzzleHttp\Promise;
+ *
+ *     function createPromise($value) {
+ *         return new Promise\FulfilledPromise($value);
+ *     }
+ *
+ *     $promise = Promise\coroutine(function () {
+ *         $value = (yield createPromise('a'));
+ *         try {
+ *             $value = (yield createPromise($value . 'b'));
+ *         } catch (\Exception $e) {
+ *             // The promise was rejected.
+ *         }
+ *         yield $value . 'c';
+ *     });
+ *
+ *     // Outputs "abc"
+ *     $promise->then(function ($v) { echo $v; });
+ *
+ * @param callable $generatorFn Generator function to wrap into a promise.
+ *
+ * @return Promise
+ * @link https://github.com/petkaantonov/bluebird/blob/master/API.md#generators inspiration
+ */
+final class Coroutine implements PromiseInterface
+{
+    /**
+     * @var PromiseInterface|null
+     */
+    private $currentPromise;
+
+    /**
+     * @var Generator
+     */
+    private $generator;
+
+    /**
+     * @var Promise
+     */
+    private $result;
+
+    public function __construct(callable $generatorFn)
+    {
+        $this->generator = $generatorFn();
+        $this->result = new Promise(function () {
+            while (isset($this->currentPromise)) {
+                $this->currentPromise->wait();
+            }
+        });
+        $this->nextCoroutine($this->generator->current());
+    }
+
+    public function then(
+        callable $onFulfilled = null,
+        callable $onRejected = null
+    ) {
+        return $this->result->then($onFulfilled, $onRejected);
+    }
+
+    public function otherwise(callable $onRejected)
+    {
+        return $this->result->otherwise($onRejected);
+    }
+
+    public function wait($unwrap = true)
+    {
+        return $this->result->wait($unwrap);
+    }
+
+    public function getState()
+    {
+        return $this->result->getState();
+    }
+
+    public function resolve($value)
+    {
+        $this->result->resolve($value);
+    }
+
+    public function reject($reason)
+    {
+        $this->result->reject($reason);
+    }
+
+    public function cancel()
+    {
+        $this->currentPromise->cancel();
+        $this->result->cancel();
+    }
+
+    private function nextCoroutine($yielded)
+    {
+        $this->currentPromise = promise_for($yielded)
+            ->then([$this, '_handleSuccess'], [$this, '_handleFailure']);
+    }
+
+    /**
+     * @internal
+     */
+    public function _handleSuccess($value)
+    {
+        unset($this->currentPromise);
+        try {
+            $next = $this->generator->send($value);
+            if ($this->generator->valid()) {
+                $this->nextCoroutine($next);
+            } else {
+                $this->result->resolve($value);
+            }
+        } catch (Exception $exception) {
+            $this->result->reject($exception);
+        } catch (Throwable $throwable) {
+            $this->result->reject($throwable);
+        }
+    }
+
+    /**
+     * @internal
+     */
+    public function _handleFailure($reason)
+    {
+        unset($this->currentPromise);
+        try {
+            $nextYield = $this->generator->throw(exception_for($reason));
+            // The throw was caught, so keep iterating on the coroutine
+            $this->nextCoroutine($nextYield);
+        } catch (Exception $exception) {
+            $this->result->reject($exception);
+        } catch (Throwable $throwable) {
+            $this->result->reject($throwable);
+        }
+    }
+}
diff --git a/web/vendor/guzzlehttp/promises/src/Promise.php b/web/vendor/guzzlehttp/promises/src/Promise.php
index 04f3ea043..844ada073 100644
--- a/web/vendor/guzzlehttp/promises/src/Promise.php
+++ b/web/vendor/guzzlehttp/promises/src/Promise.php
@@ -263,10 +263,17 @@ class Promise implements PromiseInterface
         $this->waitList = null;
 
         foreach ($waitList as $result) {
-            $result->waitIfPending();
-            while ($result->result instanceof Promise) {
-                $result = $result->result;
+            while (true) {
                 $result->waitIfPending();
+
+                if ($result->result instanceof Promise) {
+                    $result = $result->result;
+                } else {
+                    if ($result->result instanceof PromiseInterface) {
+                        $result->result->wait(false);
+                    }
+                    break;
+                }
             }
         }
     }
diff --git a/web/vendor/guzzlehttp/promises/src/TaskQueue.php b/web/vendor/guzzlehttp/promises/src/TaskQueue.php
index 39fe5bbb6..6e8a2a083 100644
--- a/web/vendor/guzzlehttp/promises/src/TaskQueue.php
+++ b/web/vendor/guzzlehttp/promises/src/TaskQueue.php
@@ -10,7 +10,7 @@ namespace GuzzleHttp\Promise;
  *
  *     GuzzleHttp\Promise\queue()->run();
  */
-class TaskQueue
+class TaskQueue implements TaskQueueInterface
 {
     private $enableShutdown = true;
     private $queue = [];
@@ -30,30 +30,16 @@ class TaskQueue
         }
     }
 
-    /**
-     * Returns true if the queue is empty.
-     *
-     * @return bool
-     */
     public function isEmpty()
     {
         return !$this->queue;
     }
 
-    /**
-     * Adds a task to the queue that will be executed the next time run is
-     * called.
-     *
-     * @param callable $task
-     */
     public function add(callable $task)
     {
         $this->queue[] = $task;
     }
 
-    /**
-     * Execute all of the pending task in the queue.
-     */
     public function run()
     {
         /** @var callable $task */
diff --git a/web/vendor/guzzlehttp/promises/src/TaskQueueInterface.php b/web/vendor/guzzlehttp/promises/src/TaskQueueInterface.php
new file mode 100644
index 000000000..ac8306e19
--- /dev/null
+++ b/web/vendor/guzzlehttp/promises/src/TaskQueueInterface.php
@@ -0,0 +1,25 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+interface TaskQueueInterface
+{
+    /**
+     * Returns true if the queue is empty.
+     *
+     * @return bool
+     */
+    public function isEmpty();
+
+    /**
+     * Adds a task to the queue that will be executed the next time run is
+     * called.
+     *
+     * @param callable $task
+     */
+    public function add(callable $task);
+
+    /**
+     * Execute all of the pending task in the queue.
+     */
+    public function run();
+}
diff --git a/web/vendor/guzzlehttp/promises/src/functions.php b/web/vendor/guzzlehttp/promises/src/functions.php
index 8f9008f15..4e27709af 100644
--- a/web/vendor/guzzlehttp/promises/src/functions.php
+++ b/web/vendor/guzzlehttp/promises/src/functions.php
@@ -14,13 +14,17 @@ namespace GuzzleHttp\Promise;
  * }
  * </code>
  *
- * @return TaskQueue
+ * @param TaskQueueInterface $assign Optionally specify a new queue instance.
+ *
+ * @return TaskQueueInterface
  */
-function queue()
+function queue(TaskQueueInterface $assign = null)
 {
     static $queue;
 
-    if (!$queue) {
+    if ($assign) {
+        $queue = $assign;
+    } elseif (!$queue) {
         $queue = new TaskQueue();
     }
 
@@ -210,7 +214,7 @@ function unwrap($promises)
  *
  * @param mixed $promises Promises or values.
  *
- * @return Promise
+ * @return PromiseInterface
  */
 function all($promises)
 {
@@ -243,7 +247,7 @@ function all($promises)
  * @param int   $count    Total number of promises.
  * @param mixed $promises Promises or values.
  *
- * @return Promise
+ * @return PromiseInterface
  */
 function some($count, $promises)
 {
@@ -299,7 +303,7 @@ function any($promises)
  *
  * @param mixed $promises Promises or values.
  *
- * @return Promise
+ * @return PromiseInterface
  * @see GuzzleHttp\Promise\inspect for the inspection state array format.
  */
 function settle($promises)
@@ -337,7 +341,7 @@ function settle($promises)
  * @param callable $onFulfilled
  * @param callable $onRejected
  *
- * @return Promise
+ * @return PromiseInterface
  */
 function each(
     $iterable,
@@ -363,7 +367,7 @@ function each(
  * @param callable     $onFulfilled
  * @param callable     $onRejected
  *
- * @return mixed
+ * @return PromiseInterface
  */
 function each_limit(
     $iterable,
@@ -387,7 +391,7 @@ function each_limit(
  * @param int|callable $concurrency
  * @param callable     $onFulfilled
  *
- * @return mixed
+ * @return PromiseInterface
  */
 function each_limit_all(
     $iterable,
@@ -441,60 +445,13 @@ function is_settled(PromiseInterface $promise)
 }
 
 /**
- * Creates a promise that is resolved using a generator that yields values or
- * promises (somewhat similar to C#'s async keyword).
+ * @see Coroutine
  *
- * When called, the coroutine function will start an instance of the generator
- * and returns a promise that is fulfilled with its final yielded value.
+ * @param callable $generatorFn
  *
- * Control is returned back to the generator when the yielded promise settles.
- * This can lead to less verbose code when doing lots of sequential async calls
- * with minimal processing in between.
- *
- *     use GuzzleHttp\Promise;
- *
- *     function createPromise($value) {
- *         return new Promise\FulfilledPromise($value);
- *     }
- *
- *     $promise = Promise\coroutine(function () {
- *         $value = (yield createPromise('a'));
- *         try {
- *             $value = (yield createPromise($value . 'b'));
- *         } catch (\Exception $e) {
- *             // The promise was rejected.
- *         }
- *         yield $value . 'c';
- *     });
- *
- *     // Outputs "abc"
- *     $promise->then(function ($v) { echo $v; });
- *
- * @param callable $generatorFn Generator function to wrap into a promise.
- *
- * @return Promise
- * @link https://github.com/petkaantonov/bluebird/blob/master/API.md#generators inspiration
+ * @return PromiseInterface
  */
 function coroutine(callable $generatorFn)
 {
-    $generator = $generatorFn();
-    return __next_coroutine($generator->current(), $generator)->then();
-}
-
-/** @internal */
-function __next_coroutine($yielded, \Generator $generator)
-{
-    return promise_for($yielded)->then(
-        function ($value) use ($generator) {
-            $nextYield = $generator->send($value);
-            return $generator->valid()
-                ? __next_coroutine($nextYield, $generator)
-                : $value;
-        },
-        function ($reason) use ($generator) {
-            $nextYield = $generator->throw(exception_for($reason));
-            // The throw was caught, so keep iterating on the coroutine
-            return __next_coroutine($nextYield, $generator);
-        }
-    );
+    return new Coroutine($generatorFn);
 }
diff --git a/web/vendor/guzzlehttp/psr7/.gitignore b/web/vendor/guzzlehttp/psr7/.gitignore
deleted file mode 100644
index 83ec41e24..000000000
--- a/web/vendor/guzzlehttp/psr7/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-phpunit.xml
-composer.phar
-composer.lock
-composer-test.lock
-vendor/
-build/artifacts/
-artifacts/
-docs/_build
-docs/*.pyc
-.idea
-.DS_STORE
diff --git a/web/vendor/guzzlehttp/psr7/.travis.yml b/web/vendor/guzzlehttp/psr7/.travis.yml
deleted file mode 100644
index b88f8da27..000000000
--- a/web/vendor/guzzlehttp/psr7/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-sudo: false
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
-
-script: make test
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
diff --git a/web/vendor/guzzlehttp/psr7/CHANGELOG.md b/web/vendor/guzzlehttp/psr7/CHANGELOG.md
index 0771a9aca..5c252b3a2 100644
--- a/web/vendor/guzzlehttp/psr7/CHANGELOG.md
+++ b/web/vendor/guzzlehttp/psr7/CHANGELOG.md
@@ -1,5 +1,45 @@
 # CHANGELOG
 
+## 1.4.2 - 2017-03-20
+
+* Reverted BC break to `Uri::resolve` and `Uri::removeDotSegments` by removing 
+  calls to `trigger_error` when deprecated methods are invoked.
+
+## 1.4.1 - 2017-02-27
+
+* Reverted BC break by reintroducing behavior to automagically fix a URI with a
+  relative path and an authority by adding a leading slash to the path. It's only
+  deprecated now.
+* Added triggering of silenced deprecation warnings.
+
+## 1.4.0 - 2017-02-21
+
+* Fix `Stream::read` when length parameter <= 0.
+* `copy_to_stream` reads bytes in chunks instead of `maxLen` into memory.
+* Fix `ServerRequest::getUriFromGlobals` when `Host` header contains port.
+* Ensure `ServerRequest::getUriFromGlobals` returns a URI in absolute form.
+* Allow `parse_response` to parse a response without delimiting space and reason.
+* Ensure each URI modification results in a valid URI according to PSR-7 discussions.
+  Invalid modifications will throw an exception instead of returning a wrong URI or
+  doing some magic.
+  - `(new Uri)->withPath('foo')->withHost('example.com')` will throw an exception
+    because the path of a URI with an authority must start with a slash "/" or be empty
+  - `(new Uri())->withScheme('http')` will return `'http://localhost'`
+* Fix compatibility of URIs with `file` scheme and empty host.
+* Added common URI utility methods based on RFC 3986 (see documentation in the readme):
+  - `Uri::isDefaultPort`
+  - `Uri::isAbsolute`
+  - `Uri::isNetworkPathReference`
+  - `Uri::isAbsolutePathReference`
+  - `Uri::isRelativePathReference`
+  - `Uri::isSameDocumentReference`
+  - `Uri::composeComponents`
+  - `UriNormalizer::normalize`
+  - `UriNormalizer::isEquivalent`
+  - `UriResolver::relativize`
+* Deprecated `Uri::resolve` in favor of `UriResolver::resolve`
+* Deprecated `Uri::removeDotSegments` in favor of `UriResolver::removeDotSegments`
+
 ## 1.3.1 - 2016-06-25
 
 * Fix `Uri::__toString` for network path references, e.g. `//example.org`.
diff --git a/web/vendor/guzzlehttp/psr7/Makefile b/web/vendor/guzzlehttp/psr7/Makefile
deleted file mode 100644
index 8b00b43e6..000000000
--- a/web/vendor/guzzlehttp/psr7/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-all: clean test
-
-test:
-	vendor/bin/phpunit $(TEST)
-
-coverage:
-	vendor/bin/phpunit --coverage-html=artifacts/coverage $(TEST)
-
-view-coverage:
-	open artifacts/coverage/index.html
-
-check-tag:
-	$(if $(TAG),,$(error TAG is not defined. Pass via "make tag TAG=4.2.1"))
-
-tag: check-tag
-	@echo Tagging $(TAG)
-	chag update $(TAG)
-	git commit -a -m '$(TAG) release'
-	chag tag
-	@echo "Release has been created. Push using 'make release'"
-	@echo "Changes made in the release commit"
-	git diff HEAD~1 HEAD
-
-release: check-tag
-	git push origin master
-	git push origin $(TAG)
-
-clean:
-	rm -rf artifacts/*
diff --git a/web/vendor/guzzlehttp/psr7/README.md b/web/vendor/guzzlehttp/psr7/README.md
index 2642164ff..16499358e 100644
--- a/web/vendor/guzzlehttp/psr7/README.md
+++ b/web/vendor/guzzlehttp/psr7/README.md
@@ -519,51 +519,221 @@ Determines the mimetype of a file by looking at its extension.
 Maps a file extensions to a mimetype.
 
 
-# Static URI methods
+# Additional URI Methods
 
-The `GuzzleHttp\Psr7\Uri` class has several static methods to manipulate URIs.
+Aside from the standard `Psr\Http\Message\UriInterface` implementation in form of the `GuzzleHttp\Psr7\Uri` class,
+this library also provides additional functionality when working with URIs as static methods.
 
+## URI Types
 
-## `GuzzleHttp\Psr7\Uri::removeDotSegments`
+An instance of `Psr\Http\Message\UriInterface` can either be an absolute URI or a relative reference.
+An absolute URI has a scheme. A relative reference is used to express a URI relative to another URI,
+the base URI. Relative references can be divided into several forms according to
+[RFC 3986 Section 4.2](https://tools.ietf.org/html/rfc3986#section-4.2):
 
-`public static function removeDotSegments(string $path): string`
+- network-path references, e.g. `//example.com/path`
+- absolute-path references, e.g. `/path`
+- relative-path references, e.g. `subpath`
 
-Removes dot segments from a path and returns the new path.
+The following methods can be used to identify the type of the URI.
 
-See http://tools.ietf.org/html/rfc3986#section-5.2.4
+### `GuzzleHttp\Psr7\Uri::isAbsolute`
 
+`public static function isAbsolute(UriInterface $uri): bool`
 
-## `GuzzleHttp\Psr7\Uri::resolve`
+Whether the URI is absolute, i.e. it has a scheme.
 
-`public static function resolve(UriInterface $base, $rel): UriInterface`
+### `GuzzleHttp\Psr7\Uri::isNetworkPathReference`
 
-Resolve a base URI with a relative URI and return a new URI.
+`public static function isNetworkPathReference(UriInterface $uri): bool`
 
-See http://tools.ietf.org/html/rfc3986#section-5
+Whether the URI is a network-path reference. A relative reference that begins with two slash characters is
+termed an network-path reference.
 
+### `GuzzleHttp\Psr7\Uri::isAbsolutePathReference`
 
-## `GuzzleHttp\Psr7\Uri::withQueryValue`
+`public static function isAbsolutePathReference(UriInterface $uri): bool`
 
-`public static function withQueryValue(UriInterface $uri, $key, $value): UriInterface`
+Whether the URI is a absolute-path reference. A relative reference that begins with a single slash character is
+termed an absolute-path reference.
 
-Create a new URI with a specific query string value.
+### `GuzzleHttp\Psr7\Uri::isRelativePathReference`
 
-Any existing query string values that exactly match the provided key are
-removed and replaced with the given key value pair.
+`public static function isRelativePathReference(UriInterface $uri): bool`
 
+Whether the URI is a relative-path reference. A relative reference that does not begin with a slash character is
+termed a relative-path reference.
 
-## `GuzzleHttp\Psr7\Uri::withoutQueryValue`
+### `GuzzleHttp\Psr7\Uri::isSameDocumentReference`
 
-`public static function withoutQueryValue(UriInterface $uri, $key): UriInterface`
+`public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null): bool`
 
-Create a new URI with a specific query string value removed.
+Whether the URI is a same-document reference. A same-document reference refers to a URI that is, aside from its
+fragment component, identical to the base URI. When no base URI is given, only an empty URI reference
+(apart from its fragment) is considered a same-document reference.
 
-Any existing query string values that exactly match the provided key are
-removed.
+## URI Components
 
+Additional methods to work with URI components.
 
-## `GuzzleHttp\Psr7\Uri::fromParts`
+### `GuzzleHttp\Psr7\Uri::isDefaultPort`
+
+`public static function isDefaultPort(UriInterface $uri): bool`
+
+Whether the URI has the default port of the current scheme. `Psr\Http\Message\UriInterface::getPort` may return null
+or the standard port. This method can be used independently of the implementation.
+
+### `GuzzleHttp\Psr7\Uri::composeComponents`
+
+`public static function composeComponents($scheme, $authority, $path, $query, $fragment): string`
+
+Composes a URI reference string from its various components according to
+[RFC 3986 Section 5.3](https://tools.ietf.org/html/rfc3986#section-5.3). Usually this method does not need to be called
+manually but instead is used indirectly via `Psr\Http\Message\UriInterface::__toString`.
+
+### `GuzzleHttp\Psr7\Uri::fromParts`
 
 `public static function fromParts(array $parts): UriInterface`
 
-Create a `GuzzleHttp\Psr7\Uri` object from a hash of `parse_url` parts.
+Creates a URI from a hash of [`parse_url`](http://php.net/manual/en/function.parse-url.php) components.
+
+
+### `GuzzleHttp\Psr7\Uri::withQueryValue`
+
+`public static function withQueryValue(UriInterface $uri, $key, $value): UriInterface`
+
+Creates a new URI with a specific query string value. Any existing query string values that exactly match the
+provided key are removed and replaced with the given key value pair. A value of null will set the query string
+key without a value, e.g. "key" instead of "key=value".
+
+
+### `GuzzleHttp\Psr7\Uri::withoutQueryValue`
+
+`public static function withoutQueryValue(UriInterface $uri, $key): UriInterface`
+
+Creates a new URI with a specific query string value removed. Any existing query string values that exactly match the
+provided key are removed.
+
+## Reference Resolution
+
+`GuzzleHttp\Psr7\UriResolver` provides methods to resolve a URI reference in the context of a base URI according
+to [RFC 3986 Section 5](https://tools.ietf.org/html/rfc3986#section-5). This is for example also what web browsers
+do when resolving a link in a website based on the current request URI.
+
+### `GuzzleHttp\Psr7\UriResolver::resolve`
+
+`public static function resolve(UriInterface $base, UriInterface $rel): UriInterface`
+
+Converts the relative URI into a new URI that is resolved against the base URI.
+
+### `GuzzleHttp\Psr7\UriResolver::removeDotSegments`
+
+`public static function removeDotSegments(string $path): string`
+
+Removes dot segments from a path and returns the new path according to
+[RFC 3986 Section 5.2.4](https://tools.ietf.org/html/rfc3986#section-5.2.4).
+
+### `GuzzleHttp\Psr7\UriResolver::relativize`
+
+`public static function relativize(UriInterface $base, UriInterface $target): UriInterface`
+
+Returns the target URI as a relative reference from the base URI. This method is the counterpart to resolve():
+
+```php
+(string) $target === (string) UriResolver::resolve($base, UriResolver::relativize($base, $target))
+```
+
+One use-case is to use the current request URI as base URI and then generate relative links in your documents
+to reduce the document size or offer self-contained downloadable document archives.
+
+```php
+$base = new Uri('http://example.com/a/b/');
+echo UriResolver::relativize($base, new Uri('http://example.com/a/b/c'));  // prints 'c'.
+echo UriResolver::relativize($base, new Uri('http://example.com/a/x/y'));  // prints '../x/y'.
+echo UriResolver::relativize($base, new Uri('http://example.com/a/b/?q')); // prints '?q'.
+echo UriResolver::relativize($base, new Uri('http://example.org/a/b/'));   // prints '//example.org/a/b/'.
+```
+
+## Normalization and Comparison
+
+`GuzzleHttp\Psr7\UriNormalizer` provides methods to normalize and compare URIs according to
+[RFC 3986 Section 6](https://tools.ietf.org/html/rfc3986#section-6).
+
+### `GuzzleHttp\Psr7\UriNormalizer::normalize`
+
+`public static function normalize(UriInterface $uri, $flags = self::PRESERVING_NORMALIZATIONS): UriInterface`
+
+Returns a normalized URI. The scheme and host component are already normalized to lowercase per PSR-7 UriInterface.
+This methods adds additional normalizations that can be configured with the `$flags` parameter which is a bitmask
+of normalizations to apply. The following normalizations are available:
+
+- `UriNormalizer::PRESERVING_NORMALIZATIONS`
+
+    Default normalizations which only include the ones that preserve semantics.
+
+- `UriNormalizer::CAPITALIZE_PERCENT_ENCODING`
+
+    All letters within a percent-encoding triplet (e.g., "%3A") are case-insensitive, and should be capitalized.
+
+    Example: `http://example.org/a%c2%b1b` → `http://example.org/a%C2%B1b`
+
+- `UriNormalizer::DECODE_UNRESERVED_CHARACTERS`
+
+    Decodes percent-encoded octets of unreserved characters. For consistency, percent-encoded octets in the ranges of
+    ALPHA (%41–%5A and %61–%7A), DIGIT (%30–%39), hyphen (%2D), period (%2E), underscore (%5F), or tilde (%7E) should
+    not be created by URI producers and, when found in a URI, should be decoded to their corresponding unreserved
+    characters by URI normalizers.
+
+    Example: `http://example.org/%7Eusern%61me/` → `http://example.org/~username/`
+
+- `UriNormalizer::CONVERT_EMPTY_PATH`
+
+    Converts the empty path to "/" for http and https URIs.
+
+    Example: `http://example.org` → `http://example.org/`
+
+- `UriNormalizer::REMOVE_DEFAULT_HOST`
+
+    Removes the default host of the given URI scheme from the URI. Only the "file" scheme defines the default host
+    "localhost". All of `file:/myfile`, `file:///myfile`, and `file://localhost/myfile` are equivalent according to
+    RFC 3986.
+
+    Example: `file://localhost/myfile` → `file:///myfile`
+
+- `UriNormalizer::REMOVE_DEFAULT_PORT`
+
+    Removes the default port of the given URI scheme from the URI.
+
+    Example: `http://example.org:80/` → `http://example.org/`
+
+- `UriNormalizer::REMOVE_DOT_SEGMENTS`
+
+    Removes unnecessary dot-segments. Dot-segments in relative-path references are not removed as it would
+    change the semantics of the URI reference.
+
+    Example: `http://example.org/../a/b/../c/./d.html` → `http://example.org/a/c/d.html`
+
+- `UriNormalizer::REMOVE_DUPLICATE_SLASHES`
+
+    Paths which include two or more adjacent slashes are converted to one. Webservers usually ignore duplicate slashes
+    and treat those URIs equivalent. But in theory those URIs do not need to be equivalent. So this normalization
+    may change the semantics. Encoded slashes (%2F) are not removed.
+
+    Example: `http://example.org//foo///bar.html` → `http://example.org/foo/bar.html`
+
+- `UriNormalizer::SORT_QUERY_PARAMETERS`
+
+    Sort query parameters with their values in alphabetical order. However, the order of parameters in a URI may be
+    significant (this is not defined by the standard). So this normalization is not safe and may change the semantics
+    of the URI.
+
+    Example: `?lang=en&article=fred` → `?article=fred&lang=en`
+
+### `GuzzleHttp\Psr7\UriNormalizer::isEquivalent`
+
+`public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, $normalizations = self::PRESERVING_NORMALIZATIONS): bool`
+
+Whether two URIs can be considered equivalent. Both URIs are normalized automatically before comparison with the given
+`$normalizations` bitmask. The method also accepts relative URI references and returns true when they are equivalent.
+This of course assumes they will be resolved against the same base URI. If this is not the case, determination of
+equivalence or difference of relative references does not mean anything.
diff --git a/web/vendor/guzzlehttp/psr7/composer.json b/web/vendor/guzzlehttp/psr7/composer.json
index fdfb97bdd..b1c5a90ba 100644
--- a/web/vendor/guzzlehttp/psr7/composer.json
+++ b/web/vendor/guzzlehttp/psr7/composer.json
@@ -1,14 +1,18 @@
 {
     "name": "guzzlehttp/psr7",
     "type": "library",
-    "description": "PSR-7 message implementation",
-    "keywords": ["message", "stream", "http", "uri"],
+    "description": "PSR-7 message implementation that also provides common utility methods",
+    "keywords": ["request", "response", "message", "stream", "http", "uri", "url"],
     "license": "MIT",
     "authors": [
         {
             "name": "Michael Dowling",
             "email": "mtdowling@gmail.com",
             "homepage": "https://github.com/mtdowling"
+        },
+        {
+            "name": "Tobias Schultze",
+            "homepage": "https://github.com/Tobion"
         }
     ],
     "require": {
diff --git a/web/vendor/guzzlehttp/psr7/phpunit.xml.dist b/web/vendor/guzzlehttp/psr7/phpunit.xml.dist
deleted file mode 100644
index 500cd53a0..000000000
--- a/web/vendor/guzzlehttp/psr7/phpunit.xml.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-         colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
-  <filter>
-    <whitelist>
-      <directory suffix=".php">src</directory>
-      <exclude>
-        <directory suffix="Interface.php">src/</directory>
-      </exclude>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/web/vendor/guzzlehttp/psr7/src/LimitStream.php b/web/vendor/guzzlehttp/psr7/src/LimitStream.php
index 7f2298bcb..3c13d4f41 100644
--- a/web/vendor/guzzlehttp/psr7/src/LimitStream.php
+++ b/web/vendor/guzzlehttp/psr7/src/LimitStream.php
@@ -21,7 +21,7 @@ class LimitStream implements StreamInterface
      * @param StreamInterface $stream Stream to wrap
      * @param int             $limit  Total number of bytes to allow to be read
      *                                from the stream. Pass -1 for no limit.
-     * @param int|null        $offset Position to seek to before reading (only
+     * @param int             $offset Position to seek to before reading (only
      *                                works on seekable streams).
      */
     public function __construct(
diff --git a/web/vendor/guzzlehttp/psr7/src/MultipartStream.php b/web/vendor/guzzlehttp/psr7/src/MultipartStream.php
index 2988fcba0..c0fd584f7 100644
--- a/web/vendor/guzzlehttp/psr7/src/MultipartStream.php
+++ b/web/vendor/guzzlehttp/psr7/src/MultipartStream.php
@@ -27,7 +27,7 @@ class MultipartStream implements StreamInterface
      */
     public function __construct(array $elements = [], $boundary = null)
     {
-        $this->boundary = $boundary ?: uniqid();
+        $this->boundary = $boundary ?: sha1(uniqid('', true));
         $this->stream = $this->createStream($elements);
     }
 
@@ -108,7 +108,7 @@ class MultipartStream implements StreamInterface
     /**
      * @return array
      */
-    private function createElement($name, $stream, $filename, array $headers)
+    private function createElement($name, StreamInterface $stream, $filename, array $headers)
     {
         // Set a default content-disposition header if one was no provided
         $disposition = $this->getHeader($headers, 'content-disposition');
diff --git a/web/vendor/guzzlehttp/psr7/src/Request.php b/web/vendor/guzzlehttp/psr7/src/Request.php
index 4a3db6ece..08285484d 100644
--- a/web/vendor/guzzlehttp/psr7/src/Request.php
+++ b/web/vendor/guzzlehttp/psr7/src/Request.php
@@ -19,7 +19,7 @@ class Request implements RequestInterface
     /** @var null|string */
     private $requestTarget;
 
-    /** @var null|UriInterface */
+    /** @var UriInterface */
     private $uri;
 
     /**
diff --git a/web/vendor/guzzlehttp/psr7/src/Response.php b/web/vendor/guzzlehttp/psr7/src/Response.php
index 841ff0200..2830c6c9e 100644
--- a/web/vendor/guzzlehttp/psr7/src/Response.php
+++ b/web/vendor/guzzlehttp/psr7/src/Response.php
@@ -2,6 +2,7 @@
 namespace GuzzleHttp\Psr7;
 
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * PSR-7 response implementation.
@@ -100,7 +101,7 @@ class Response implements ResponseInterface
 
         $this->setHeaders($headers);
         if ($reason == '' && isset(self::$phrases[$this->statusCode])) {
-            $this->reasonPhrase = self::$phrases[$status];
+            $this->reasonPhrase = self::$phrases[$this->statusCode];
         } else {
             $this->reasonPhrase = (string) $reason;
         }
diff --git a/web/vendor/guzzlehttp/psr7/src/ServerRequest.php b/web/vendor/guzzlehttp/psr7/src/ServerRequest.php
index a6a47bec4..575aab848 100644
--- a/web/vendor/guzzlehttp/psr7/src/ServerRequest.php
+++ b/web/vendor/guzzlehttp/psr7/src/ServerRequest.php
@@ -188,25 +188,37 @@ class ServerRequest extends Request implements ServerRequestInterface
     public static function getUriFromGlobals() {
         $uri = new Uri('');
 
-        if (isset($_SERVER['HTTPS'])) {
-            $uri = $uri->withScheme($_SERVER['HTTPS'] == 'on' ? 'https' : 'http');
-        }
+        $uri = $uri->withScheme(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http');
 
+        $hasPort = false;
         if (isset($_SERVER['HTTP_HOST'])) {
-            $uri = $uri->withHost($_SERVER['HTTP_HOST']);
+            $hostHeaderParts = explode(':', $_SERVER['HTTP_HOST']);
+            $uri = $uri->withHost($hostHeaderParts[0]);
+            if (isset($hostHeaderParts[1])) {
+                $hasPort = true;
+                $uri = $uri->withPort($hostHeaderParts[1]);
+            }
         } elseif (isset($_SERVER['SERVER_NAME'])) {
             $uri = $uri->withHost($_SERVER['SERVER_NAME']);
+        } elseif (isset($_SERVER['SERVER_ADDR'])) {
+            $uri = $uri->withHost($_SERVER['SERVER_ADDR']);
         }
 
-        if (isset($_SERVER['SERVER_PORT'])) {
+        if (!$hasPort && isset($_SERVER['SERVER_PORT'])) {
             $uri = $uri->withPort($_SERVER['SERVER_PORT']);
         }
 
+        $hasQuery = false;
         if (isset($_SERVER['REQUEST_URI'])) {
-            $uri = $uri->withPath(current(explode('?', $_SERVER['REQUEST_URI'])));
+            $requestUriParts = explode('?', $_SERVER['REQUEST_URI']);
+            $uri = $uri->withPath($requestUriParts[0]);
+            if (isset($requestUriParts[1])) {
+                $hasQuery = true;
+                $uri = $uri->withQuery($requestUriParts[1]);
+            }
         }
 
-        if (isset($_SERVER['QUERY_STRING'])) {
+        if (!$hasQuery && isset($_SERVER['QUERY_STRING'])) {
             $uri = $uri->withQuery($_SERVER['QUERY_STRING']);
         }
 
diff --git a/web/vendor/guzzlehttp/psr7/src/Stream.php b/web/vendor/guzzlehttp/psr7/src/Stream.php
index 214af151c..e33662879 100644
--- a/web/vendor/guzzlehttp/psr7/src/Stream.php
+++ b/web/vendor/guzzlehttp/psr7/src/Stream.php
@@ -207,8 +207,20 @@ class Stream implements StreamInterface
         if (!$this->readable) {
             throw new \RuntimeException('Cannot read from non-readable stream');
         }
+        if ($length < 0) {
+            throw new \RuntimeException('Length parameter cannot be negative');
+        }
 
-        return fread($this->stream, $length);
+        if (0 === $length) {
+            return '';
+        }
+
+        $string = fread($this->stream, $length);
+        if (false === $string) {
+            throw new \RuntimeException('Unable to read from stream');
+        }
+
+        return $string;
     }
 
     public function write($string)
diff --git a/web/vendor/guzzlehttp/psr7/src/Uri.php b/web/vendor/guzzlehttp/psr7/src/Uri.php
index 44a1e9d49..f46c1db9e 100644
--- a/web/vendor/guzzlehttp/psr7/src/Uri.php
+++ b/web/vendor/guzzlehttp/psr7/src/Uri.php
@@ -12,9 +12,26 @@ use Psr\Http\Message\UriInterface;
  */
 class Uri implements UriInterface
 {
-    private static $schemes = [
+    /**
+     * Absolute http and https URIs require a host per RFC 7230 Section 2.7
+     * but in generic URIs the host can be empty. So for http(s) URIs
+     * we apply this default host when no host is given yet to form a
+     * valid URI.
+     */
+    const HTTP_DEFAULT_HOST = 'localhost';
+
+    private static $defaultPorts = [
         'http'  => 80,
         'https' => 443,
+        'ftp' => 21,
+        'gopher' => 70,
+        'nntp' => 119,
+        'news' => 119,
+        'telnet' => 23,
+        'tn3270' => 23,
+        'imap' => 143,
+        'pop' => 110,
+        'ldap' => 389,
     ];
 
     private static $charUnreserved = 'a-zA-Z0-9_\-\.~';
@@ -47,6 +64,7 @@ class Uri implements UriInterface
      */
     public function __construct($uri = '')
     {
+        // weak type check to also accept null until we can add scalar type hints
         if ($uri != '') {
             $parts = parse_url($uri);
             if ($parts === false) {
@@ -58,7 +76,7 @@ class Uri implements UriInterface
 
     public function __toString()
     {
-        return self::createUriString(
+        return self::composeComponents(
             $this->scheme,
             $this->getAuthority(),
             $this->path,
@@ -67,57 +85,199 @@ class Uri implements UriInterface
         );
     }
 
+    /**
+     * Composes a URI reference string from its various components.
+     *
+     * Usually this method does not need to be called manually but instead is used indirectly via
+     * `Psr\Http\Message\UriInterface::__toString`.
+     *
+     * PSR-7 UriInterface treats an empty component the same as a missing component as
+     * getQuery(), getFragment() etc. always return a string. This explains the slight
+     * difference to RFC 3986 Section 5.3.
+     *
+     * Another adjustment is that the authority separator is added even when the authority is missing/empty
+     * for the "file" scheme. This is because PHP stream functions like `file_get_contents` only work with
+     * `file:///myfile` but not with `file:/myfile` although they are equivalent according to RFC 3986. But
+     * `file:///` is the more common syntax for the file scheme anyway (Chrome for example redirects to
+     * that format).
+     *
+     * @param string $scheme
+     * @param string $authority
+     * @param string $path
+     * @param string $query
+     * @param string $fragment
+     *
+     * @return string
+     *
+     * @link https://tools.ietf.org/html/rfc3986#section-5.3
+     */
+    public static function composeComponents($scheme, $authority, $path, $query, $fragment)
+    {
+        $uri = '';
+
+        // weak type checks to also accept null until we can add scalar type hints
+        if ($scheme != '') {
+            $uri .= $scheme . ':';
+        }
+
+        if ($authority != ''|| $scheme === 'file') {
+            $uri .= '//' . $authority;
+        }
+
+        $uri .= $path;
+
+        if ($query != '') {
+            $uri .= '?' . $query;
+        }
+
+        if ($fragment != '') {
+            $uri .= '#' . $fragment;
+        }
+
+        return $uri;
+    }
+
+    /**
+     * Whether the URI has the default port of the current scheme.
+     *
+     * `Psr\Http\Message\UriInterface::getPort` may return null or the standard port. This method can be used
+     * independently of the implementation.
+     *
+     * @param UriInterface $uri
+     *
+     * @return bool
+     */
+    public static function isDefaultPort(UriInterface $uri)
+    {
+        return $uri->getPort() === null
+            || (isset(self::$defaultPorts[$uri->getScheme()]) && $uri->getPort() === self::$defaultPorts[$uri->getScheme()]);
+    }
+
+    /**
+     * Whether the URI is absolute, i.e. it has a scheme.
+     *
+     * An instance of UriInterface can either be an absolute URI or a relative reference. This method returns true
+     * if it is the former. An absolute URI has a scheme. A relative reference is used to express a URI relative
+     * to another URI, the base URI. Relative references can be divided into several forms:
+     * - network-path references, e.g. '//example.com/path'
+     * - absolute-path references, e.g. '/path'
+     * - relative-path references, e.g. 'subpath'
+     *
+     * @param UriInterface $uri
+     *
+     * @return bool
+     * @see Uri::isNetworkPathReference
+     * @see Uri::isAbsolutePathReference
+     * @see Uri::isRelativePathReference
+     * @link https://tools.ietf.org/html/rfc3986#section-4
+     */
+    public static function isAbsolute(UriInterface $uri)
+    {
+        return $uri->getScheme() !== '';
+    }
+
+    /**
+     * Whether the URI is a network-path reference.
+     *
+     * A relative reference that begins with two slash characters is termed an network-path reference.
+     *
+     * @param UriInterface $uri
+     *
+     * @return bool
+     * @link https://tools.ietf.org/html/rfc3986#section-4.2
+     */
+    public static function isNetworkPathReference(UriInterface $uri)
+    {
+        return $uri->getScheme() === '' && $uri->getAuthority() !== '';
+    }
+
+    /**
+     * Whether the URI is a absolute-path reference.
+     *
+     * A relative reference that begins with a single slash character is termed an absolute-path reference.
+     *
+     * @param UriInterface $uri
+     *
+     * @return bool
+     * @link https://tools.ietf.org/html/rfc3986#section-4.2
+     */
+    public static function isAbsolutePathReference(UriInterface $uri)
+    {
+        return $uri->getScheme() === ''
+            && $uri->getAuthority() === ''
+            && isset($uri->getPath()[0])
+            && $uri->getPath()[0] === '/';
+    }
+
+    /**
+     * Whether the URI is a relative-path reference.
+     *
+     * A relative reference that does not begin with a slash character is termed a relative-path reference.
+     *
+     * @param UriInterface $uri
+     *
+     * @return bool
+     * @link https://tools.ietf.org/html/rfc3986#section-4.2
+     */
+    public static function isRelativePathReference(UriInterface $uri)
+    {
+        return $uri->getScheme() === ''
+            && $uri->getAuthority() === ''
+            && (!isset($uri->getPath()[0]) || $uri->getPath()[0] !== '/');
+    }
+
+    /**
+     * Whether the URI is a same-document reference.
+     *
+     * A same-document reference refers to a URI that is, aside from its fragment
+     * component, identical to the base URI. When no base URI is given, only an empty
+     * URI reference (apart from its fragment) is considered a same-document reference.
+     *
+     * @param UriInterface      $uri  The URI to check
+     * @param UriInterface|null $base An optional base URI to compare against
+     *
+     * @return bool
+     * @link https://tools.ietf.org/html/rfc3986#section-4.4
+     */
+    public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null)
+    {
+        if ($base !== null) {
+            $uri = UriResolver::resolve($base, $uri);
+
+            return ($uri->getScheme() === $base->getScheme())
+                && ($uri->getAuthority() === $base->getAuthority())
+                && ($uri->getPath() === $base->getPath())
+                && ($uri->getQuery() === $base->getQuery());
+        }
+
+        return $uri->getScheme() === '' && $uri->getAuthority() === '' && $uri->getPath() === '' && $uri->getQuery() === '';
+    }
+
     /**
      * Removes dot segments from a path and returns the new path.
      *
      * @param string $path
      *
      * @return string
-     * @link http://tools.ietf.org/html/rfc3986#section-5.2.4
+     *
+     * @deprecated since version 1.4. Use UriResolver::removeDotSegments instead.
+     * @see UriResolver::removeDotSegments
      */
     public static function removeDotSegments($path)
     {
-        static $noopPaths = ['' => true, '/' => true, '*' => true];
-        static $ignoreSegments = ['.' => true, '..' => true];
-
-        if (isset($noopPaths[$path])) {
-            return $path;
-        }
-
-        $results = [];
-        $segments = explode('/', $path);
-        foreach ($segments as $segment) {
-            if ($segment === '..') {
-                array_pop($results);
-            } elseif (!isset($ignoreSegments[$segment])) {
-                $results[] = $segment;
-            }
-        }
-
-        $newPath = implode('/', $results);
-        // Add the leading slash if necessary
-        if (substr($path, 0, 1) === '/' &&
-            substr($newPath, 0, 1) !== '/'
-        ) {
-            $newPath = '/' . $newPath;
-        }
-
-        // Add the trailing slash if necessary
-        if ($newPath !== '/' && isset($ignoreSegments[end($segments)])) {
-            $newPath .= '/';
-        }
-
-        return $newPath;
+        return UriResolver::removeDotSegments($path);
     }
 
     /**
-     * Resolve a base URI with a relative URI and return a new URI.
+     * Converts the relative URI into a new URI that is resolved against the base URI.
      *
      * @param UriInterface        $base Base URI
      * @param string|UriInterface $rel  Relative URI
      *
      * @return UriInterface
-     * @link http://tools.ietf.org/html/rfc3986#section-5.2
+     *
+     * @deprecated since version 1.4. Use UriResolver::resolve instead.
+     * @see UriResolver::resolve
      */
     public static function resolve(UriInterface $base, $rel)
     {
@@ -125,55 +285,11 @@ class Uri implements UriInterface
             $rel = new self($rel);
         }
 
-        if ((string) $rel === '') {
-            // we can simply return the same base URI instance for this same-document reference
-            return $base;
-        }
-
-        if ($rel->getScheme() != '') {
-            return $rel->withPath(self::removeDotSegments($rel->getPath()));
-        }
-
-        if ($rel->getAuthority() != '') {
-            $targetAuthority = $rel->getAuthority();
-            $targetPath = self::removeDotSegments($rel->getPath());
-            $targetQuery = $rel->getQuery();
-        } else {
-            $targetAuthority = $base->getAuthority();
-            if ($rel->getPath() === '') {
-                $targetPath = $base->getPath();
-                $targetQuery = $rel->getQuery() != '' ? $rel->getQuery() : $base->getQuery();
-            } else {
-                if ($rel->getPath()[0] === '/') {
-                    $targetPath = $rel->getPath();
-                } else {
-                    if ($targetAuthority != '' && $base->getPath() === '') {
-                        $targetPath = '/' . $rel->getPath();
-                    } else {
-                        $lastSlashPos = strrpos($base->getPath(), '/');
-                        if ($lastSlashPos === false) {
-                            $targetPath = $rel->getPath();
-                        } else {
-                            $targetPath = substr($base->getPath(), 0, $lastSlashPos + 1) . $rel->getPath();
-                        }
-                    }
-                }
-                $targetPath = self::removeDotSegments($targetPath);
-                $targetQuery = $rel->getQuery();
-            }
-        }
-
-        return new self(self::createUriString(
-            $base->getScheme(),
-            $targetAuthority,
-            $targetPath,
-            $targetQuery,
-            $rel->getFragment()
-        ));
+        return UriResolver::resolve($base, $rel);
     }
 
     /**
-     * Create a new URI with a specific query string value removed.
+     * Creates a new URI with a specific query string value removed.
      *
      * Any existing query string values that exactly match the provided key are
      * removed.
@@ -186,7 +302,7 @@ class Uri implements UriInterface
     public static function withoutQueryValue(UriInterface $uri, $key)
     {
         $current = $uri->getQuery();
-        if ($current == '') {
+        if ($current === '') {
             return $uri;
         }
 
@@ -199,7 +315,7 @@ class Uri implements UriInterface
     }
 
     /**
-     * Create a new URI with a specific query string value.
+     * Creates a new URI with a specific query string value.
      *
      * Any existing query string values that exactly match the provided key are
      * removed and replaced with the given key value pair.
@@ -217,7 +333,7 @@ class Uri implements UriInterface
     {
         $current = $uri->getQuery();
 
-        if ($current == '') {
+        if ($current === '') {
             $result = [];
         } else {
             $decodedKey = rawurldecode($key);
@@ -241,16 +357,21 @@ class Uri implements UriInterface
     }
 
     /**
-     * Create a URI from a hash of parse_url parts.
+     * Creates a URI from a hash of `parse_url` components.
      *
      * @param array $parts
      *
-     * @return self
+     * @return UriInterface
+     * @link http://php.net/manual/en/function.parse-url.php
+     *
+     * @throws \InvalidArgumentException If the components do not form a valid URI.
      */
     public static function fromParts(array $parts)
     {
         $uri = new self();
         $uri->applyParts($parts);
+        $uri->validateState();
+
         return $uri;
     }
 
@@ -261,12 +382,8 @@ class Uri implements UriInterface
 
     public function getAuthority()
     {
-        if ($this->host == '') {
-            return '';
-        }
-
         $authority = $this->host;
-        if ($this->userInfo != '') {
+        if ($this->userInfo !== '') {
             $authority = $this->userInfo . '@' . $authority;
         }
 
@@ -317,7 +434,9 @@ class Uri implements UriInterface
 
         $new = clone $this;
         $new->scheme = $scheme;
-        $new->port = $new->filterPort($new->port);
+        $new->removeDefaultPort();
+        $new->validateState();
+
         return $new;
     }
 
@@ -334,6 +453,8 @@ class Uri implements UriInterface
 
         $new = clone $this;
         $new->userInfo = $info;
+        $new->validateState();
+
         return $new;
     }
 
@@ -347,6 +468,8 @@ class Uri implements UriInterface
 
         $new = clone $this;
         $new->host = $host;
+        $new->validateState();
+
         return $new;
     }
 
@@ -360,6 +483,9 @@ class Uri implements UriInterface
 
         $new = clone $this;
         $new->port = $port;
+        $new->removeDefaultPort();
+        $new->validateState();
+
         return $new;
     }
 
@@ -373,6 +499,8 @@ class Uri implements UriInterface
 
         $new = clone $this;
         $new->path = $path;
+        $new->validateState();
+
         return $new;
     }
 
@@ -386,6 +514,7 @@ class Uri implements UriInterface
 
         $new = clone $this;
         $new->query = $query;
+
         return $new;
     }
 
@@ -399,6 +528,7 @@ class Uri implements UriInterface
 
         $new = clone $this;
         $new->fragment = $fragment;
+
         return $new;
     }
 
@@ -431,69 +561,8 @@ class Uri implements UriInterface
         if (isset($parts['pass'])) {
             $this->userInfo .= ':' . $parts['pass'];
         }
-    }
 
-    /**
-     * Create a URI string from its various parts
-     *
-     * @param string $scheme
-     * @param string $authority
-     * @param string $path
-     * @param string $query
-     * @param string $fragment
-     * @return string
-     */
-    private static function createUriString($scheme, $authority, $path, $query, $fragment)
-    {
-        $uri = '';
-
-        if ($scheme != '') {
-            $uri .= $scheme . ':';
-        }
-
-        if ($authority != '') {
-            $uri .= '//' . $authority;
-        }
-
-        if ($path != '') {
-            if ($path[0] !== '/') {
-                if ($authority != '') {
-                    // If the path is rootless and an authority is present, the path MUST be prefixed by "/"
-                    $path = '/' . $path;
-                }
-            } elseif (isset($path[1]) && $path[1] === '/') {
-                if ($authority == '') {
-                    // If the path is starting with more than one "/" and no authority is present, the
-                    // starting slashes MUST be reduced to one.
-                    $path = '/' . ltrim($path, '/');
-                }
-            }
-
-            $uri .= $path;
-        }
-
-        if ($query != '') {
-            $uri .= '?' . $query;
-        }
-
-        if ($fragment != '') {
-            $uri .= '#' . $fragment;
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Is a given port non-standard for the current scheme?
-     *
-     * @param string $scheme
-     * @param int    $port
-     *
-     * @return bool
-     */
-    private static function isNonStandardPort($scheme, $port)
-    {
-        return !isset(self::$schemes[$scheme]) || $port !== self::$schemes[$scheme];
+        $this->removeDefaultPort();
     }
 
     /**
@@ -548,7 +617,14 @@ class Uri implements UriInterface
             );
         }
 
-        return self::isNonStandardPort($this->scheme, $port) ? $port : null;
+        return $port;
+    }
+
+    private function removeDefaultPort()
+    {
+        if ($this->port !== null && self::isDefaultPort($this)) {
+            $this->port = null;
+        }
     }
 
     /**
@@ -599,4 +675,28 @@ class Uri implements UriInterface
     {
         return rawurlencode($match[0]);
     }
+
+    private function validateState()
+    {
+        if ($this->host === '' && ($this->scheme === 'http' || $this->scheme === 'https')) {
+            $this->host = self::HTTP_DEFAULT_HOST;
+        }
+
+        if ($this->getAuthority() === '') {
+            if (0 === strpos($this->path, '//')) {
+                throw new \InvalidArgumentException('The path of a URI without an authority must not start with two slashes "//"');
+            }
+            if ($this->scheme === '' && false !== strpos(explode('/', $this->path, 2)[0], ':')) {
+                throw new \InvalidArgumentException('A relative URI must not have a path beginning with a segment containing a colon');
+            }
+        } elseif (isset($this->path[0]) && $this->path[0] !== '/') {
+            @trigger_error(
+                'The path of a URI with an authority must start with a slash "/" or be empty. Automagically fixing the URI ' .
+                'by adding a leading slash to the path is deprecated since version 1.4 and will throw an exception instead.',
+                E_USER_DEPRECATED
+            );
+            $this->path = '/'. $this->path;
+            //throw new \InvalidArgumentException('The path of a URI with an authority must start with a slash "/" or be empty');
+        }
+    }
 }
diff --git a/web/vendor/guzzlehttp/psr7/src/UriNormalizer.php b/web/vendor/guzzlehttp/psr7/src/UriNormalizer.php
new file mode 100644
index 000000000..384c29e50
--- /dev/null
+++ b/web/vendor/guzzlehttp/psr7/src/UriNormalizer.php
@@ -0,0 +1,216 @@
+<?php
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Provides methods to normalize and compare URIs.
+ *
+ * @author Tobias Schultze
+ *
+ * @link https://tools.ietf.org/html/rfc3986#section-6
+ */
+final class UriNormalizer
+{
+    /**
+     * Default normalizations which only include the ones that preserve semantics.
+     *
+     * self::CAPITALIZE_PERCENT_ENCODING | self::DECODE_UNRESERVED_CHARACTERS | self::CONVERT_EMPTY_PATH |
+     * self::REMOVE_DEFAULT_HOST | self::REMOVE_DEFAULT_PORT | self::REMOVE_DOT_SEGMENTS
+     */
+    const PRESERVING_NORMALIZATIONS = 63;
+
+    /**
+     * All letters within a percent-encoding triplet (e.g., "%3A") are case-insensitive, and should be capitalized.
+     *
+     * Example: http://example.org/a%c2%b1b → http://example.org/a%C2%B1b
+     */
+    const CAPITALIZE_PERCENT_ENCODING = 1;
+
+    /**
+     * Decodes percent-encoded octets of unreserved characters.
+     *
+     * For consistency, percent-encoded octets in the ranges of ALPHA (%41–%5A and %61–%7A), DIGIT (%30–%39),
+     * hyphen (%2D), period (%2E), underscore (%5F), or tilde (%7E) should not be created by URI producers and,
+     * when found in a URI, should be decoded to their corresponding unreserved characters by URI normalizers.
+     *
+     * Example: http://example.org/%7Eusern%61me/ → http://example.org/~username/
+     */
+    const DECODE_UNRESERVED_CHARACTERS = 2;
+
+    /**
+     * Converts the empty path to "/" for http and https URIs.
+     *
+     * Example: http://example.org → http://example.org/
+     */
+    const CONVERT_EMPTY_PATH = 4;
+
+    /**
+     * Removes the default host of the given URI scheme from the URI.
+     *
+     * Only the "file" scheme defines the default host "localhost".
+     * All of `file:/myfile`, `file:///myfile`, and `file://localhost/myfile`
+     * are equivalent according to RFC 3986. The first format is not accepted
+     * by PHPs stream functions and thus already normalized implicitly to the
+     * second format in the Uri class. See `GuzzleHttp\Psr7\Uri::composeComponents`.
+     *
+     * Example: file://localhost/myfile → file:///myfile
+     */
+    const REMOVE_DEFAULT_HOST = 8;
+
+    /**
+     * Removes the default port of the given URI scheme from the URI.
+     *
+     * Example: http://example.org:80/ → http://example.org/
+     */
+    const REMOVE_DEFAULT_PORT = 16;
+
+    /**
+     * Removes unnecessary dot-segments.
+     *
+     * Dot-segments in relative-path references are not removed as it would
+     * change the semantics of the URI reference.
+     *
+     * Example: http://example.org/../a/b/../c/./d.html → http://example.org/a/c/d.html
+     */
+    const REMOVE_DOT_SEGMENTS = 32;
+
+    /**
+     * Paths which include two or more adjacent slashes are converted to one.
+     *
+     * Webservers usually ignore duplicate slashes and treat those URIs equivalent.
+     * But in theory those URIs do not need to be equivalent. So this normalization
+     * may change the semantics. Encoded slashes (%2F) are not removed.
+     *
+     * Example: http://example.org//foo///bar.html → http://example.org/foo/bar.html
+     */
+    const REMOVE_DUPLICATE_SLASHES = 64;
+
+    /**
+     * Sort query parameters with their values in alphabetical order.
+     *
+     * However, the order of parameters in a URI may be significant (this is not defined by the standard).
+     * So this normalization is not safe and may change the semantics of the URI.
+     *
+     * Example: ?lang=en&article=fred → ?article=fred&lang=en
+     *
+     * Note: The sorting is neither locale nor Unicode aware (the URI query does not get decoded at all) as the
+     * purpose is to be able to compare URIs in a reproducible way, not to have the params sorted perfectly.
+     */
+    const SORT_QUERY_PARAMETERS = 128;
+
+    /**
+     * Returns a normalized URI.
+     *
+     * The scheme and host component are already normalized to lowercase per PSR-7 UriInterface.
+     * This methods adds additional normalizations that can be configured with the $flags parameter.
+     *
+     * PSR-7 UriInterface cannot distinguish between an empty component and a missing component as
+     * getQuery(), getFragment() etc. always return a string. This means the URIs "/?#" and "/" are
+     * treated equivalent which is not necessarily true according to RFC 3986. But that difference
+     * is highly uncommon in reality. So this potential normalization is implied in PSR-7 as well.
+     *
+     * @param UriInterface $uri   The URI to normalize
+     * @param int          $flags A bitmask of normalizations to apply, see constants
+     *
+     * @return UriInterface The normalized URI
+     * @link https://tools.ietf.org/html/rfc3986#section-6.2
+     */
+    public static function normalize(UriInterface $uri, $flags = self::PRESERVING_NORMALIZATIONS)
+    {
+        if ($flags & self::CAPITALIZE_PERCENT_ENCODING) {
+            $uri = self::capitalizePercentEncoding($uri);
+        }
+
+        if ($flags & self::DECODE_UNRESERVED_CHARACTERS) {
+            $uri = self::decodeUnreservedCharacters($uri);
+        }
+
+        if ($flags & self::CONVERT_EMPTY_PATH && $uri->getPath() === '' &&
+            ($uri->getScheme() === 'http' || $uri->getScheme() === 'https')
+        ) {
+            $uri = $uri->withPath('/');
+        }
+
+        if ($flags & self::REMOVE_DEFAULT_HOST && $uri->getScheme() === 'file' && $uri->getHost() === 'localhost') {
+            $uri = $uri->withHost('');
+        }
+
+        if ($flags & self::REMOVE_DEFAULT_PORT && $uri->getPort() !== null && Uri::isDefaultPort($uri)) {
+            $uri = $uri->withPort(null);
+        }
+
+        if ($flags & self::REMOVE_DOT_SEGMENTS && !Uri::isRelativePathReference($uri)) {
+            $uri = $uri->withPath(UriResolver::removeDotSegments($uri->getPath()));
+        }
+
+        if ($flags & self::REMOVE_DUPLICATE_SLASHES) {
+            $uri = $uri->withPath(preg_replace('#//++#', '/', $uri->getPath()));
+        }
+
+        if ($flags & self::SORT_QUERY_PARAMETERS && $uri->getQuery() !== '') {
+            $queryKeyValues = explode('&', $uri->getQuery());
+            sort($queryKeyValues);
+            $uri = $uri->withQuery(implode('&', $queryKeyValues));
+        }
+
+        return $uri;
+    }
+
+    /**
+     * Whether two URIs can be considered equivalent.
+     *
+     * Both URIs are normalized automatically before comparison with the given $normalizations bitmask. The method also
+     * accepts relative URI references and returns true when they are equivalent. This of course assumes they will be
+     * resolved against the same base URI. If this is not the case, determination of equivalence or difference of
+     * relative references does not mean anything.
+     *
+     * @param UriInterface $uri1           An URI to compare
+     * @param UriInterface $uri2           An URI to compare
+     * @param int          $normalizations A bitmask of normalizations to apply, see constants
+     *
+     * @return bool
+     * @link https://tools.ietf.org/html/rfc3986#section-6.1
+     */
+    public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, $normalizations = self::PRESERVING_NORMALIZATIONS)
+    {
+        return (string) self::normalize($uri1, $normalizations) === (string) self::normalize($uri2, $normalizations);
+    }
+
+    private static function capitalizePercentEncoding(UriInterface $uri)
+    {
+        $regex = '/(?:%[A-Fa-f0-9]{2})++/';
+
+        $callback = function (array $match) {
+            return strtoupper($match[0]);
+        };
+
+        return
+            $uri->withPath(
+                preg_replace_callback($regex, $callback, $uri->getPath())
+            )->withQuery(
+                preg_replace_callback($regex, $callback, $uri->getQuery())
+            );
+    }
+
+    private static function decodeUnreservedCharacters(UriInterface $uri)
+    {
+        $regex = '/%(?:2D|2E|5F|7E|3[0-9]|[46][1-9A-F]|[57][0-9A])/i';
+
+        $callback = function (array $match) {
+            return rawurldecode($match[0]);
+        };
+
+        return
+            $uri->withPath(
+                preg_replace_callback($regex, $callback, $uri->getPath())
+            )->withQuery(
+                preg_replace_callback($regex, $callback, $uri->getQuery())
+            );
+    }
+
+    private function __construct()
+    {
+        // cannot be instantiated
+    }
+}
diff --git a/web/vendor/guzzlehttp/psr7/src/UriResolver.php b/web/vendor/guzzlehttp/psr7/src/UriResolver.php
new file mode 100644
index 000000000..c1cb8a275
--- /dev/null
+++ b/web/vendor/guzzlehttp/psr7/src/UriResolver.php
@@ -0,0 +1,219 @@
+<?php
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Resolves a URI reference in the context of a base URI and the opposite way.
+ *
+ * @author Tobias Schultze
+ *
+ * @link https://tools.ietf.org/html/rfc3986#section-5
+ */
+final class UriResolver
+{
+    /**
+     * Removes dot segments from a path and returns the new path.
+     *
+     * @param string $path
+     *
+     * @return string
+     * @link http://tools.ietf.org/html/rfc3986#section-5.2.4
+     */
+    public static function removeDotSegments($path)
+    {
+        if ($path === '' || $path === '/') {
+            return $path;
+        }
+
+        $results = [];
+        $segments = explode('/', $path);
+        foreach ($segments as $segment) {
+            if ($segment === '..') {
+                array_pop($results);
+            } elseif ($segment !== '.') {
+                $results[] = $segment;
+            }
+        }
+
+        $newPath = implode('/', $results);
+
+        if ($path[0] === '/' && (!isset($newPath[0]) || $newPath[0] !== '/')) {
+            // Re-add the leading slash if necessary for cases like "/.."
+            $newPath = '/' . $newPath;
+        } elseif ($newPath !== '' && ($segment === '.' || $segment === '..')) {
+            // Add the trailing slash if necessary
+            // If newPath is not empty, then $segment must be set and is the last segment from the foreach
+            $newPath .= '/';
+        }
+
+        return $newPath;
+    }
+
+    /**
+     * Converts the relative URI into a new URI that is resolved against the base URI.
+     *
+     * @param UriInterface $base Base URI
+     * @param UriInterface $rel  Relative URI
+     *
+     * @return UriInterface
+     * @link http://tools.ietf.org/html/rfc3986#section-5.2
+     */
+    public static function resolve(UriInterface $base, UriInterface $rel)
+    {
+        if ((string) $rel === '') {
+            // we can simply return the same base URI instance for this same-document reference
+            return $base;
+        }
+
+        if ($rel->getScheme() != '') {
+            return $rel->withPath(self::removeDotSegments($rel->getPath()));
+        }
+
+        if ($rel->getAuthority() != '') {
+            $targetAuthority = $rel->getAuthority();
+            $targetPath = self::removeDotSegments($rel->getPath());
+            $targetQuery = $rel->getQuery();
+        } else {
+            $targetAuthority = $base->getAuthority();
+            if ($rel->getPath() === '') {
+                $targetPath = $base->getPath();
+                $targetQuery = $rel->getQuery() != '' ? $rel->getQuery() : $base->getQuery();
+            } else {
+                if ($rel->getPath()[0] === '/') {
+                    $targetPath = $rel->getPath();
+                } else {
+                    if ($targetAuthority != '' && $base->getPath() === '') {
+                        $targetPath = '/' . $rel->getPath();
+                    } else {
+                        $lastSlashPos = strrpos($base->getPath(), '/');
+                        if ($lastSlashPos === false) {
+                            $targetPath = $rel->getPath();
+                        } else {
+                            $targetPath = substr($base->getPath(), 0, $lastSlashPos + 1) . $rel->getPath();
+                        }
+                    }
+                }
+                $targetPath = self::removeDotSegments($targetPath);
+                $targetQuery = $rel->getQuery();
+            }
+        }
+
+        return new Uri(Uri::composeComponents(
+            $base->getScheme(),
+            $targetAuthority,
+            $targetPath,
+            $targetQuery,
+            $rel->getFragment()
+        ));
+    }
+
+    /**
+     * Returns the target URI as a relative reference from the base URI.
+     *
+     * This method is the counterpart to resolve():
+     *
+     *    (string) $target === (string) UriResolver::resolve($base, UriResolver::relativize($base, $target))
+     *
+     * One use-case is to use the current request URI as base URI and then generate relative links in your documents
+     * to reduce the document size or offer self-contained downloadable document archives.
+     *
+     *    $base = new Uri('http://example.com/a/b/');
+     *    echo UriResolver::relativize($base, new Uri('http://example.com/a/b/c'));  // prints 'c'.
+     *    echo UriResolver::relativize($base, new Uri('http://example.com/a/x/y'));  // prints '../x/y'.
+     *    echo UriResolver::relativize($base, new Uri('http://example.com/a/b/?q')); // prints '?q'.
+     *    echo UriResolver::relativize($base, new Uri('http://example.org/a/b/'));   // prints '//example.org/a/b/'.
+     *
+     * This method also accepts a target that is already relative and will try to relativize it further. Only a
+     * relative-path reference will be returned as-is.
+     *
+     *    echo UriResolver::relativize($base, new Uri('/a/b/c'));  // prints 'c' as well
+     *
+     * @param UriInterface $base   Base URI
+     * @param UriInterface $target Target URI
+     *
+     * @return UriInterface The relative URI reference
+     */
+    public static function relativize(UriInterface $base, UriInterface $target)
+    {
+        if ($target->getScheme() !== '' &&
+            ($base->getScheme() !== $target->getScheme() || $target->getAuthority() === '' && $base->getAuthority() !== '')
+        ) {
+            return $target;
+        }
+
+        if (Uri::isRelativePathReference($target)) {
+            // As the target is already highly relative we return it as-is. It would be possible to resolve
+            // the target with `$target = self::resolve($base, $target);` and then try make it more relative
+            // by removing a duplicate query. But let's not do that automatically.
+            return $target;
+        }
+
+        if ($target->getAuthority() !== '' && $base->getAuthority() !== $target->getAuthority()) {
+            return $target->withScheme('');
+        }
+
+        // We must remove the path before removing the authority because if the path starts with two slashes, the URI
+        // would turn invalid. And we also cannot set a relative path before removing the authority, as that is also
+        // invalid.
+        $emptyPathUri = $target->withScheme('')->withPath('')->withUserInfo('')->withPort(null)->withHost('');
+
+        if ($base->getPath() !== $target->getPath()) {
+            return $emptyPathUri->withPath(self::getRelativePath($base, $target));
+        }
+
+        if ($base->getQuery() === $target->getQuery()) {
+            // Only the target fragment is left. And it must be returned even if base and target fragment are the same.
+            return $emptyPathUri->withQuery('');
+        }
+
+        // If the base URI has a query but the target has none, we cannot return an empty path reference as it would
+        // inherit the base query component when resolving.
+        if ($target->getQuery() === '') {
+            $segments = explode('/', $target->getPath());
+            $lastSegment = end($segments);
+
+            return $emptyPathUri->withPath($lastSegment === '' ? './' : $lastSegment);
+        }
+
+        return $emptyPathUri;
+    }
+
+    private static function getRelativePath(UriInterface $base, UriInterface $target)
+    {
+        $sourceSegments = explode('/', $base->getPath());
+        $targetSegments = explode('/', $target->getPath());
+        array_pop($sourceSegments);
+        $targetLastSegment = array_pop($targetSegments);
+        foreach ($sourceSegments as $i => $segment) {
+            if (isset($targetSegments[$i]) && $segment === $targetSegments[$i]) {
+                unset($sourceSegments[$i], $targetSegments[$i]);
+            } else {
+                break;
+            }
+        }
+        $targetSegments[] = $targetLastSegment;
+        $relativePath = str_repeat('../', count($sourceSegments)) . implode('/', $targetSegments);
+
+        // A reference to am empty last segment or an empty first sub-segment must be prefixed with "./".
+        // This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used
+        // as the first segment of a relative-path reference, as it would be mistaken for a scheme name.
+        if ('' === $relativePath || false !== strpos(explode('/', $relativePath, 2)[0], ':')) {
+            $relativePath = "./$relativePath";
+        } elseif ('/' === $relativePath[0]) {
+            if ($base->getAuthority() != '' && $base->getPath() === '') {
+                // In this case an extra slash is added by resolve() automatically. So we must not add one here.
+                $relativePath = ".$relativePath";
+            } else {
+                $relativePath = "./$relativePath";
+            }
+        }
+
+        return $relativePath;
+    }
+
+    private function __construct()
+    {
+        // cannot be instantiated
+    }
+}
diff --git a/web/vendor/guzzlehttp/psr7/src/functions.php b/web/vendor/guzzlehttp/psr7/src/functions.php
index 96bf92611..e40348d6a 100644
--- a/web/vendor/guzzlehttp/psr7/src/functions.php
+++ b/web/vendor/guzzlehttp/psr7/src/functions.php
@@ -371,25 +371,24 @@ function copy_to_stream(
     StreamInterface $dest,
     $maxLen = -1
 ) {
+    $bufferSize = 8192;
+
     if ($maxLen === -1) {
         while (!$source->eof()) {
-            if (!$dest->write($source->read(1048576))) {
+            if (!$dest->write($source->read($bufferSize))) {
                 break;
             }
         }
-        return;
-    }
-
-    $bytes = 0;
-    while (!$source->eof()) {
-        $buf = $source->read($maxLen - $bytes);
-        if (!($len = strlen($buf))) {
-            break;
-        }
-        $bytes += $len;
-        $dest->write($buf);
-        if ($bytes == $maxLen) {
-            break;
+    } else {
+        $remaining = $maxLen;
+        while ($remaining > 0 && !$source->eof()) {
+            $buf = $source->read(min($bufferSize, $remaining));
+            $len = strlen($buf);
+            if (!$len) {
+                break;
+            }
+            $remaining -= $len;
+            $dest->write($buf);
         }
     }
 }
@@ -492,7 +491,10 @@ function parse_request($message)
 function parse_response($message)
 {
     $data = _parse_message($message);
-    if (!preg_match('/^HTTP\/.* [0-9]{3} .*/', $data['start-line'])) {
+    // According to https://tools.ietf.org/html/rfc7230#section-3.1.2 the space
+    // between status-code and reason-phrase is required. But browsers accept
+    // responses without space and reason as well.
+    if (!preg_match('/^HTTP\/.* [0-9]{3}( .*|$)/', $data['start-line'])) {
         throw new \InvalidArgumentException('Invalid response string');
     }
     $parts = explode(' ', $data['start-line'], 3);
diff --git a/web/vendor/masterminds/html5/RELEASE.md b/web/vendor/masterminds/html5/RELEASE.md
index dfec8f8ce..56d5fa1bc 100644
--- a/web/vendor/masterminds/html5/RELEASE.md
+++ b/web/vendor/masterminds/html5/RELEASE.md
@@ -1,10 +1,17 @@
 # Release Notes
 
-2.2.1 (2015-05-10)
+2.2.2 (2016-10-22)
 
-- #109: Fixed issue where address tag could be written without closing tag
+- #116: In XML mode, tags are case sensitive
+- #115: Fix PHP Notice in OutputRules
+- #112: fix parsing of options of an optgroup
+- #111: Adding test for the address tag
 
-2.2.0 (2015-04-11)
+2.2.1 (2016-05-10)
+
+- #109: Fixed issue where address tag could be written without closing tag (thanks sylus)
+
+2.2.0 (2016-04-11)
 
 - #105: Enable composer cache (for CI/CD)
 - #100: Use mb_substitute_character inset of ini_set for environments where
diff --git a/web/vendor/masterminds/html5/composer.json b/web/vendor/masterminds/html5/composer.json
index 30241849b..f4f43d325 100644
--- a/web/vendor/masterminds/html5/composer.json
+++ b/web/vendor/masterminds/html5/composer.json
@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "2.2-dev"
         }
     }
 }
diff --git a/web/vendor/masterminds/html5/src/HTML5.php b/web/vendor/masterminds/html5/src/HTML5.php
index 1c46c2b82..990e8f433 100644
--- a/web/vendor/masterminds/html5/src/HTML5.php
+++ b/web/vendor/masterminds/html5/src/HTML5.php
@@ -166,9 +166,10 @@ class HTML5
     public function parse(\Masterminds\HTML5\Parser\InputStream $input, array $options = array())
     {
         $this->errors = array();
-        $events = new DOMTreeBuilder(false, array_merge($this->getOptions(), $options));
+        $options = array_merge($this->getOptions(), $options);
+        $events = new DOMTreeBuilder(false, $options);
         $scanner = new Scanner($input);
-        $parser = new Tokenizer($scanner, $events);
+        $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML: Tokenizer::CONFORMANT_HTML);
 
         $parser->parse();
         $this->errors = $events->getErrors();
@@ -184,9 +185,10 @@ class HTML5
      */
     public function parseFragment(\Masterminds\HTML5\Parser\InputStream $input, array $options = array())
     {
-        $events = new DOMTreeBuilder(true, array_merge($this->getOptions(), $options));
+        $options = array_merge($this->getOptions(), $options);
+        $events = new DOMTreeBuilder(true, $options);
         $scanner = new Scanner($input);
-        $parser = new Tokenizer($scanner, $events);
+        $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML: Tokenizer::CONFORMANT_HTML);
 
         $parser->parse();
         $this->errors = $events->getErrors();
diff --git a/web/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php b/web/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php
index 301addf16..02b2affdd 100644
--- a/web/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php
+++ b/web/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php
@@ -43,6 +43,10 @@ class Tokenizer
     protected $textMode = 0; // TEXTMODE_NORMAL;
     protected $untilTag = null;
 
+    const CONFORMANT_XML = 'xml';
+    const CONFORMANT_HTML = 'html';
+    protected $mode = self::CONFORMANT_HTML;
+
     const WHITE = "\t\n\f ";
 
     /**
@@ -57,11 +61,13 @@ class Tokenizer
      * @param \Masterminds\HTML5\Parser\EventHandler $eventHandler
      *            An event handler, initialized and ready to receive
      *            events.
+     * @param string $mode
      */
-    public function __construct($scanner, $eventHandler)
+    public function __construct($scanner, $eventHandler, $mode = self::CONFORMANT_HTML)
     {
         $this->scanner = $scanner;
         $this->events = $eventHandler;
+        $this->mode = $mode;
     }
 
     /**
@@ -335,7 +341,8 @@ class Tokenizer
             return $this->bogusComment('</');
         }
 
-        $name = strtolower($this->scanner->charsUntil("\n\f \t>"));
+        $name = $this->scanner->charsUntil("\n\f \t>");
+        $name = $this->mode === self::CONFORMANT_XML ? $name: strtolower($name);
         // Trash whitespace.
         $this->scanner->whitespace();
 
@@ -362,7 +369,8 @@ class Tokenizer
         }
 
         // We know this is at least one char.
-        $name = strtolower($this->scanner->charsWhile(":_-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
+        $name = $this->scanner->charsWhile(":_-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
+        $name = $this->mode === self::CONFORMANT_XML ? $name : strtolower($name);
         $attributes = array();
         $selfClose = false;
 
diff --git a/web/vendor/masterminds/html5/src/HTML5/Parser/TreeBuildingRules.php b/web/vendor/masterminds/html5/src/HTML5/Parser/TreeBuildingRules.php
index 2af3c664e..623620821 100644
--- a/web/vendor/masterminds/html5/src/HTML5/Parser/TreeBuildingRules.php
+++ b/web/vendor/masterminds/html5/src/HTML5/Parser/TreeBuildingRules.php
@@ -76,7 +76,6 @@ class TreeBuildingRules
             case 'option':
                 return $this->closeIfCurrentMatches($new, $current, array(
                     'option',
-                    'optgroup'
                 ));
             case 'tr':
                 return $this->closeIfCurrentMatches($new, $current, array(
diff --git a/web/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php b/web/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php
index c45045f78..a22683c38 100644
--- a/web/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php
+++ b/web/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php
@@ -221,7 +221,11 @@ class OutputRules implements \Masterminds\HTML5\Serializer\RulesInterface
         $this->openTag($ele);
         if (Elements::isA($name, Elements::TEXT_RAW)) {
             foreach ($ele->childNodes as $child) {
-                $this->wr($child->data);
+                if ($child instanceof \DOMCharacterData) {
+                    $this->wr($child->data);
+                } elseif ($child instanceof \DOMElement) {
+                    $this->element($child);
+                }
             }
         } else {
             // Handle children.
diff --git a/web/vendor/paragonie/random_compat/.gitignore b/web/vendor/paragonie/random_compat/.gitignore
deleted file mode 100644
index de26af579..000000000
--- a/web/vendor/paragonie/random_compat/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-composer.lock
-/vendor/
-/tests/phpunit.phar
-/tests/phpunit.phar.asc
\ No newline at end of file
diff --git a/web/vendor/paragonie/random_compat/.scrutinizer.yml b/web/vendor/paragonie/random_compat/.scrutinizer.yml
deleted file mode 100644
index a2f32ead6..000000000
--- a/web/vendor/paragonie/random_compat/.scrutinizer.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-checks:
-    php:
-        code_rating: true
-        duplication: false
\ No newline at end of file
diff --git a/web/vendor/paragonie/random_compat/.travis.yml b/web/vendor/paragonie/random_compat/.travis.yml
deleted file mode 100644
index 43ec1272e..000000000
--- a/web/vendor/paragonie/random_compat/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-language: php
-php:
-
-- "7.0"
-- "5.6"
-- "5.5"
-- "5.4"
-- "5.3"
-- "hhvm"
-
-
-sudo: false
-
-matrix:
-    fast_finish: true
-    allow_failures:
-      - php: "hhvm"
-
-install:
-
-- composer install
-- composer self-update
-- composer update
-- chmod +x ./phpunit.sh
-
-script: ./phpunit.sh travis
diff --git a/web/vendor/paragonie/random_compat/ERRATA.md b/web/vendor/paragonie/random_compat/ERRATA.md
deleted file mode 100644
index 9c0ef9fdb..000000000
--- a/web/vendor/paragonie/random_compat/ERRATA.md
+++ /dev/null
@@ -1,40 +0,0 @@
-## Errata (Design Decisions)
-
-### Reasoning Behind the Order of Preferred Random Data Sources
-
-The order is:
-
- 1. `libsodium if available`
- 2. `fread() /dev/urandom if available`
- 3. `mcrypt_create_iv($bytes, MCRYPT_CREATE_IV)`
- 4. `COM('CAPICOM.Utilities.1')->GetRandom()`
- 5. `openssl_random_pseudo_bytes()`
-
-If libsodium is available, we get random data from it. This is the preferred
-method on all OSes, but libsodium is not very widely installed, so other
-fallbacks are available.
-
-Next, we read `/dev/urandom` (if it exists). This is the preferred file to read
-for random data for cryptographic purposes for BSD and Linux.
-
-Despite [strongly urging people not to use mcrypt in their projects](https://paragonie.com/blog/2015/05/if-you-re-typing-word-mcrypt-into-your-code-you-re-doing-it-wrong),
-because libmcrypt is abandonware and the API puts too much responsibility on the
-implementor, we prioritize `mcrypt_create_iv()` with `MCRYPT_DEV_URANDOM` above
-the remaining implementations.
-
-The reason is simple: `mcrypt_create_iv()` is part of PHP's `ext/mcrypt` code,
-and is not part `libmcrypt`. It actually does the right thing:
-
- * On Unix-based operating systems, it reads from `/dev/urandom`, which is the
-   sane and correct thing to do.
- * On Windows, it reads from `CryptGenRandom`, which is an exclusively Windows
-   way to get random bytes.
-
-If we're on Windows and don't have access to `mcrypt`, we use `CAPICOM.Utilities.1`.
-
-Finally, we use `openssl_random_pseudo_bytes()` **as a last resort**, due to
-[PHP bug #70014](https://bugs.php.net/bug.php?id=70014). Internally, this 
-function calls `RAND_pseudo_bytes()`, which has been [deprecated](https://github.com/paragonie/random_compat/issues/5)
-by the OpenSSL team. Furthermore, [it might silently return weak random data](https://github.com/paragonie/random_compat/issues/6#issuecomment-119564973)
-if it is called before OpenSSL's **userspace** CSPRNG is seeded. Also, 
-[you want the OS CSPRNG, not a userspace CSPRNG](http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers/).
diff --git a/web/vendor/paragonie/random_compat/README.md b/web/vendor/paragonie/random_compat/README.md
deleted file mode 100644
index ed5b1d85c..000000000
--- a/web/vendor/paragonie/random_compat/README.md
+++ /dev/null
@@ -1,149 +0,0 @@
-# random_compat
-
-[![Build Status](https://travis-ci.org/paragonie/random_compat.svg?branch=master)](https://travis-ci.org/paragonie/random_compat)
-[![Scrutinizer](https://scrutinizer-ci.com/g/paragonie/random_compat/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/paragonie/random_compat)
-
-PHP 5.x polyfill for `random_bytes()` and `random_int()` created and maintained
-by [Paragon Initiative Enterprises](https://paragonie.com).
-
-Although this library *should* function in earlier versions of PHP, we will only
-consider issues relevant to [supported PHP versions](https://secure.php.net/supported-versions.php).
-**If you are using an unsupported version of PHP, please upgrade as soon as possible.**
-
-## Important
-
-Although this library has been examined by some security experts in the PHP 
-community, there will always be a chance that we overlooked something. Please 
-ask your favorite trusted hackers to hammer it for implementation errors and
-bugs before even thinking about deploying it in production.
-
-**Do not use the master branch, use a [stable release](https://github.com/paragonie/random_compat/releases/latest).**
-
-For the background of this library, please refer to our blog post on 
-[Generating Random Integers and Strings in PHP](https://paragonie.com/blog/2015/07/how-safely-generate-random-strings-and-integers-in-php).
-
-### Usability Notice
-
-If PHP cannot safely generate random data, this library will throw an `Exception`.
-It will never fall back to insecure random data. If this keeps happening, upgrade
-to a newer version of PHP immediately.
-
-## Usage
-
-This library exposes the [CSPRNG functions added in PHP 7](https://secure.php.net/manual/en/ref.csprng.php)
-for use in PHP 5 projects. Their behavior should be identical.
-
-### Generate a string of random bytes
-
-```php
-try {
-    $string = random_bytes(32);
-} catch (TypeError $e) {
-    // Well, it's an integer, so this IS unexpected.
-    die("An unexpected error has occurred"); 
-} catch (Error $e) {
-    // This is also unexpected because 32 is a reasonable integer.
-    die("An unexpected error has occurred");
-} catch (Exception $e) {
-    // If you get this message, the CSPRNG failed hard.
-    die("Could not generate a random string. Is our OS secure?");
-}
-
-var_dump(bin2hex($string));
-// string(64) "5787c41ae124b3b9363b7825104f8bc8cf27c4c3036573e5f0d4a91ad2eeac6f"
-```
-
-### Generate a random integer between two given integers (inclusive)
-
-```php
-try {
-    $int = random_int(0,255);
-
-} catch (TypeError $e) {
-    // Well, it's an integer, so this IS unexpected.
-    die("An unexpected error has occurred"); 
-} catch (Error $e) {
-    // This is also unexpected because 0 and 255 are both reasonable integers.
-    die("An unexpected error has occurred");
-} catch (Exception $e) {
-    // If you get this message, the CSPRNG failed hard.
-    die("Could not generate a random string. Is our OS secure?");
-}
-
-var_dump($int);
-// int(47)
-```
-
-### Exception handling
-
-When handling exceptions and errors you must account for differences between
-PHP 5 and PHP7.
-
-The differences:
-
-* Catching `Error` works, so long as it is caught before `Exception`.
-* Catching `Exception` has different behavior, without previously catching `Error`.
-* There is *no* portable way to catch all errors/exceptions.
-
-#### Our recommendation
-
-**Always** catch `Error` before `Exception`.
-
-#### Example
-
-```php
-try {
-    return random_int(1, $userInput);
-} catch (TypeError $e) {
-    // This is okay, so long as `Error` is caught before `Exception`.
-    throw new Exception('Please enter a number!');
-} catch (Error $e) {
-    // This is required, if you do not need to do anything just rethrow.
-    throw $e;
-} catch (Exception $e) {
-    // This is optional and maybe omitted if you do not want to handle errors
-    // during generation.
-    throw new InternalServerErrorException(
-        'Oops, our server is bust and cannot generate any random data.',
-        500,
-        $e
-    );
-}
-```
-
-## Contributors
-
-This project would not be anywhere near as excellent as it is today if it 
-weren't for the contributions of the following individuals:
-
-* [@AndrewCarterUK (Andrew Carter)](https://github.com/AndrewCarterUK)
-* [@asgrim (James Titcumb)](https://github.com/asgrim)
-* [@CodesInChaos (Christian Winnerlein)](https://github.com/CodesInChaos)
-* [@chriscct7 (Chris Christoff)](https://github.com/chriscct7)
-* [@cs278 (Chris Smith)](https://github.com/cs278)
-* [@cweagans (Cameron Eagans)](https://github.com/cweagans)
-* [@dd32 (Dion Hulse)](https://github.com/dd32)
-* [@geggleto (Glenn Eggleton)](https://github.com/geggleto)
-* [@ircmaxell (Anthony Ferrara)](https://github.com/ircmaxell)
-* [@jedisct1 (Frank Denis)](https://github.com/jedisct1)
-* [@juliangut (Julián Gutiérrez)](https://github.com/juliangut)
-* [@kelunik (Niklas Keller)](https://github.com/kelunik)
-* [@lt (Leigh)](https://github.com/lt)
-* [@MasonM (Mason Malone)](https://github.com/MasonM)
-* [@mmeyer2k (Michael M)](https://github.com/mmeyer2k)
-* [@narfbg (Andrey Andreev)](https://github.com/narfbg)
-* [@nicolas-grekas (Nicolas Grekas)](https://github.com/nicolas-grekas)
-* [@oittaa](https://github.com/oittaa)
-* [@redragonx (Stephen Chavez)](https://github.com/redragonx)
-* [@rchouinard (Ryan Chouinard)](https://github.com/rchouinard)
-* [@SammyK (Sammy Kaye Powers)](https://github.com/SammyK)
-* [@scottchiefbaker (Scott Baker)](https://github.com/scottchiefbaker)
-* [@skyosev (Stoyan Kyosev)](https://github.com/skyosev)
-* [@stof (Christophe Coevoet)](https://github.com/stof)
-* [@teohhanhui (Teoh Han Hui)](https://github.com/teohhanhui)
-* [@tom-- (Tom Worster)](https://github.com/tom--)
-* [@tsyr2ko](https://github.com/tsyr2ko)
-* [@trowski (Aaron Piotrowski)](https://github.com/trowski)
-* [@twistor (Chris Lepannen)](https://github.com/twistor)
-* [@voku (Lars Moelleken)](https://github.com/voku)
-* [@xabbuh (Christian Flothmann)](https://github.com/xabbuh)
diff --git a/web/vendor/paragonie/random_compat/SECURITY.md b/web/vendor/paragonie/random_compat/SECURITY.md
deleted file mode 100644
index 8f731b38d..000000000
--- a/web/vendor/paragonie/random_compat/SECURITY.md
+++ /dev/null
@@ -1,108 +0,0 @@
-# An Invitation to Security Researchers
-
-Every company says they take security "very seriously." Rather than bore anyone 
-with banal boilerplate, here are some quick answers followed by detailed
-elaboration. If you have any questions about our policies, please email them to
-`scott@paragonie.com`.
-
-## Quick Answers
-
-* There is no compulsion to disclose vulnerabilities privately, but we 
-  appreciate a head's up.
-* `security@paragonie.com` will get your reports to the right person. Our GPG 
-  fingerprint, should you decide to encrypt your report, is 
-  `7F52 D5C6 1D12 55C7 3136  2E82 6B97 A1C2 8264 04DA`.
-
-* **YES**, we will reward security researchers who disclose vulnerabilities in
-  our software.
-* In most cases, **No Proof-of-Concept Required.**
-
-## How to Report a Security Bug to Paragon Initiative Enterprises
-
-### There is no compulsion to disclose privately.
-
-We believe vulnerability disclosure style is a personal choice and enjoy working
-with a diverse community. We understand and appreciate the importance of Full 
-Disclosure in the history and practice of security research.
-
-We would *like* to know about high-severity bugs before they become public
-knowledge, so we can fix them in a timely manner, but **we do not believe in 
-threatening researchers or trying to enforce vulnerability embargoes**.
-
-Ultimately, if you discover a security-affecting vulnerability, what you do with
-it is your choice. We would like to work with people, and to celebrate and 
-reward their skill, experience, and dedication. We appreciate being informed of
-our mistakes so we can learn from them and build a better product. Our goal is
-to empower the community.
-
-### Where to Send Security Vulnerabilities
-
-Our security email address is `security@paragonie.com`. Also feel free to open a
-new issue on Github if you want to disclose publicly.
-
-```
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG
-
-mQENBFUgwRUBCADcIpqNwyYc5UmY/tpx1sF/rQ3knR1YNXYZThzFV+Gmqhp1fDH5
-qBs9foh1xwI6O7knWmQngnf/nBumI3x6xj7PuOdEZUh2FwCG/VWnglW8rKmoHzHA
-ivjiu9SLnPIPAgHSHeh2XD7q3Ndm3nenbjAiRFNl2iXcwA2cTQp9Mmfw9vVcw0G0
-z1o0G3s8cC8ZS6flFySIervvfSRWj7A1acI5eE3+AH/qXJRdEJ+9J8OB65p1JMfk
-6+fWgOB1XZxMpz70S0rW6IX38WDSRhEK2fXyZJAJjyt+YGuzjZySNSoQR/V6vNYn
-syrNPCJ2i5CgZQxAkyBBcr7koV9RIhPRzct/ABEBAAG0IVNlY3VyaXR5IDxzZWN1
-cml0eUBwYXJhZ29uaWUuY29tPokBOQQTAQIAIwUCVSDBFQIbAwcLCQgHAwIBBhUI
-AgkKCwQWAgMBAh4BAheAAAoJEGuXocKCZATat2YIAIoejNFEQ2c1iaOEtSuB7Pn/
-WLbsDsHNLDKOV+UnfaCjv/vL7D+5NMChFCi2frde/NQb2TsjqmIH+V+XbnJtlrXD
-Vj7yvMVal+Jqjwj7v4eOEWcKVcFZk+9cfUgh7t92T2BMX58RpgZF0IQZ6Z1R3FfC
-9Ub4X6ykW+te1q0/4CoRycniwmlQi6iGSr99LQ5pfJq2Qlmz/luTZ0UX0h575T7d
-cp2T1sX/zFRk/fHeANWSksipdDBjAXR7NMnYZgw2HghEdFk/xRDY7K1NRWNZBf05
-WrMHmh6AIVJiWZvI175URxEe268hh+wThBhXQHMhFNJM1qPIuzb4WogxM3UUD7m5
-AQ0EVSDBFQEIALNkpzSuJsHAHh79sc0AYWztdUe2MzyofQbbOnOCpWZebYsC3EXU
-335fIg59k0m6f+O7GmEZzzIv5v0i99GS1R8CJm6FvhGqtH8ZqmOGbc71WdJSiNVE
-0kpQoJlVzRbig6ZyyjzrggbM1eh5OXOk5pw4+23FFEdw7JWU0HJS2o71r1hwp05Z
-vy21kcUEobz/WWQQyGS0Neo7PJn+9KS6wOxXul/UE0jct/5f7KLMdWMJ1VgniQmm
-hjvkHLPSICteqCI04RfcmMseW9gueHQXeUu1SNIvsWa2MhxjeBej3pDnrZWszKwy
-gF45GO9/v4tkIXNMy5J1AtOyRgQ3IUMqp8EAEQEAAYkBHwQYAQIACQUCVSDBFQIb
-DAAKCRBrl6HCgmQE2jnIB/4/xFz8InpM7eybnBOAir3uGcYfs3DOmaKn7qWVtGzv
-rKpQPYnVtlU2i6Z5UO4c4jDLT/8Xm1UDz3Lxvqt4xCaDwJvBZexU5BMK8l5DvOzH
-6o6P2L1UDu6BvmPXpVZz7/qUhOnyf8VQg/dAtYF4/ax19giNUpI5j5o5mX5w80Rx
-qSXV9NdSL4fdjeG1g/xXv2luhoV53T1bsycI3wjk/x5tV+M2KVhZBvvuOm/zhJje
-oLWp0saaESkGXIXqurj6gZoujJvSvzl0n9F9VwqMEizDUfrXgtD1siQGhP0sVC6q
-ha+F/SAEJ0jEquM4TfKWWU2S5V5vgPPpIQSYRnhQW4b1
-=xJPW
------END PGP PUBLIC KEY BLOCK-----
-```
-
-### We Will Reward Security Researchers
-
-**This process has not been formalized; nor have dollar amounts been 
-discussed.**
-
-However, if you report a valid security-affecting bug, we will compensate you
-for the time spent finding the vulnerability and reward you for being a good
-neighbor.
-
-#### What does a "valid" bug mean?
-
-There are two sides to this:
-
-1. Some have spammed projects with invalid bug reports hoping to collect
-   bounties for pressing a button and running an automated analysis tool. This
-   is not cool.
-2. There is a potential for the developers of a project to declare all security
-   bug reports as invalid to save money.
-
-Our team members have an established history of reporting vulnerabilities to
-large open source projects. **We aren't in the business of ripping people off.**
-When in doubt, our policy is to err on the side of generosity.
-
-### No Proof-of-Concept Required
-
-We might ask for one if we feel we do not understand some of the details 
-pertaining to a specific vulnerability. We certainly appreciate them if you 
-include them in your report, but we believe **the burden lies with the developer
-to prove their software *is* secure** rather than with the researcher to prove
-that it isn't.
-
-In our experience, most bugs are simpler to fix than they are to exploit.
-
diff --git a/web/vendor/paragonie/random_compat/build-phar.sh b/web/vendor/paragonie/random_compat/build-phar.sh
new file mode 100755
index 000000000..b4a5ba31c
--- /dev/null
+++ b/web/vendor/paragonie/random_compat/build-phar.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+basedir=$( dirname $( readlink -f ${BASH_SOURCE[0]} ) )
+
+php -dphar.readonly=0 "$basedir/other/build_phar.php" $*
\ No newline at end of file
diff --git a/web/vendor/paragonie/random_compat/composer.json b/web/vendor/paragonie/random_compat/composer.json
index d363f4c8c..1c5978c6f 100644
--- a/web/vendor/paragonie/random_compat/composer.json
+++ b/web/vendor/paragonie/random_compat/composer.json
@@ -1,35 +1,37 @@
 {
-    "name":         "paragonie/random_compat",
-    "description":  "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-    "keywords": [
-            "csprng",
-            "random",
-            "pseudorandom"
-        ],
-    "license":      "MIT",
-    "type":         "library",
-    "authors": [
-            {
-                "name":     "Paragon Initiative Enterprises",
-                "email":    "security@paragonie.com",
-                "homepage": "https://paragonie.com"
-            }
-        ],
-    "support": {
-        "issues":   "https://github.com/paragonie/random_compat/issues",
-        "email":    "info@paragonie.com",
-        "source":   "https://github.com/paragonie/random_compat"
-    },
-    "require": {
-        "php": ">=5.2.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.*|5.*"
-    },
-    "suggest": {
-        "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-    },
-    "autoload": {
-        "files": ["lib/random.php"]
+  "name":         "paragonie/random_compat",
+  "description":  "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+  "keywords": [
+    "csprng",
+    "random",
+    "pseudorandom"
+  ],
+  "license":      "MIT",
+  "type":         "library",
+  "authors": [
+    {
+      "name":     "Paragon Initiative Enterprises",
+      "email":    "security@paragonie.com",
+      "homepage": "https://paragonie.com"
     }
+  ],
+  "support": {
+    "issues":     "https://github.com/paragonie/random_compat/issues",
+    "email":      "info@paragonie.com",
+    "source":     "https://github.com/paragonie/random_compat"
+  },
+  "require": {
+    "php": ">=5.2.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "4.*|5.*"
+  },
+  "suggest": {
+    "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+  },
+  "autoload": {
+    "files": [
+      "lib/random.php"
+    ]
+  }
 }
diff --git a/web/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey b/web/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey
new file mode 100644
index 000000000..eb50ebfcd
--- /dev/null
+++ b/web/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey
@@ -0,0 +1,5 @@
+-----BEGIN PUBLIC KEY-----
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEEd+wCqJDrx5B4OldM0dQE0ZMX+lx1ZWm
+pui0SUqD4G29L3NGsz9UhJ/0HjBdbnkhIK5xviT0X5vtjacF6ajgcCArbTB+ds+p
++h7Q084NuSuIpNb6YPfoUFgC/CL9kAoc
+-----END PUBLIC KEY-----
diff --git a/web/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey.asc b/web/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey.asc
new file mode 100644
index 000000000..6a1d7f300
--- /dev/null
+++ b/web/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (MingW32)
+
+iQEcBAABAgAGBQJWtW1hAAoJEGuXocKCZATaJf0H+wbZGgskK1dcRTsuVJl9IWip
+QwGw/qIKI280SD6/ckoUMxKDCJiFuPR14zmqnS36k7N5UNPnpdTJTS8T11jttSpg
+1LCmgpbEIpgaTah+cELDqFCav99fS+bEiAL5lWDAHBTE/XPjGVCqeehyPYref4IW
+NDBIEsvnHPHPLsn6X5jq4+Yj5oUixgxaMPiR+bcO4Sh+RzOVB6i2D0upWfRXBFXA
+NNnsg9/zjvoC7ZW73y9uSH+dPJTt/Vgfeiv52/v41XliyzbUyLalf02GNPY+9goV
+JHG1ulEEBJOCiUD9cE1PUIJwHA/HqyhHIvV350YoEFiHl8iSwm7SiZu5kPjaq74=
+=B6+8
+-----END PGP SIGNATURE-----
diff --git a/web/vendor/paragonie/random_compat/lib/byte_safe_strings.php b/web/vendor/paragonie/random_compat/lib/byte_safe_strings.php
index a3cc90b14..3de86b223 100644
--- a/web/vendor/paragonie/random_compat/lib/byte_safe_strings.php
+++ b/web/vendor/paragonie/random_compat/lib/byte_safe_strings.php
@@ -5,7 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paragon Initiative Enterprises
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-if (!function_exists('RandomCompat_strlen')) {
+if (!is_callable('RandomCompat_strlen')) {
     if (
         defined('MB_OVERLOAD_STRING') &&
         ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
@@ -50,8 +50,10 @@ if (!function_exists('RandomCompat_strlen')) {
                     'RandomCompat_strlen() expects a string'
                 );
             }
-            return mb_strlen($binary_string, '8bit');
+
+            return (int) mb_strlen($binary_string, '8bit');
         }
+
     } else {
         /**
          * strlen() implementation that isn't brittle to mbstring.func_overload
@@ -71,14 +73,16 @@ if (!function_exists('RandomCompat_strlen')) {
                     'RandomCompat_strlen() expects a string'
                 );
             }
-            return strlen($binary_string);
+            return (int) strlen($binary_string);
         }
     }
 }
 
-if (!function_exists('RandomCompat_substr')) {
+if (!is_callable('RandomCompat_substr')) {
+
     if (
-        defined('MB_OVERLOAD_STRING') &&
+        defined('MB_OVERLOAD_STRING')
+        &&
         ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
     ) {
         /**
@@ -102,25 +106,38 @@ if (!function_exists('RandomCompat_substr')) {
                     'RandomCompat_substr(): First argument should be a string'
                 );
             }
+
             if (!is_int($start)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Second argument should be an integer'
                 );
             }
+
             if ($length === null) {
                 /**
                  * mb_substr($str, 0, NULL, '8bit') returns an empty string on
                  * PHP 5.3, so we have to find the length ourselves.
                  */
-                $length = RandomCompat_strlen($length) - $start;
+                $length = RandomCompat_strlen($binary_string) - $start;
             } elseif (!is_int($length)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Third argument should be an integer, or omitted'
                 );
             }
-            return mb_substr($binary_string, $start, $length, '8bit');
+
+            // Consistency with PHP's behavior
+            if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
+                return '';
+            }
+            if ($start > RandomCompat_strlen($binary_string)) {
+                return '';
+            }
+
+            return (string) mb_substr($binary_string, $start, $length, '8bit');
         }
+
     } else {
+
         /**
          * substr() implementation that isn't brittle to mbstring.func_overload
          *
@@ -141,20 +158,24 @@ if (!function_exists('RandomCompat_substr')) {
                     'RandomCompat_substr(): First argument should be a string'
                 );
             }
+
             if (!is_int($start)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Second argument should be an integer'
                 );
             }
+
             if ($length !== null) {
                 if (!is_int($length)) {
                     throw new TypeError(
                         'RandomCompat_substr(): Third argument should be an integer, or omitted'
                     );
                 }
-                return substr($binary_string, $start, $length);
+
+                return (string) substr($binary_string, $start, $length);
             }
-            return substr($binary_string, $start);
+
+            return (string) substr($binary_string, $start);
         }
     }
 }
diff --git a/web/vendor/paragonie/random_compat/lib/cast_to_int.php b/web/vendor/paragonie/random_compat/lib/cast_to_int.php
index 474ce6400..be7388dfd 100644
--- a/web/vendor/paragonie/random_compat/lib/cast_to_int.php
+++ b/web/vendor/paragonie/random_compat/lib/cast_to_int.php
@@ -5,7 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paragon Initiative Enterprises
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-if (!function_exists('RandomCompat_intval')) {
+if (!is_callable('RandomCompat_intval')) {
     
     /**
      * Cast to an integer if we can, safely.
@@ -37,28 +37,38 @@ if (!function_exists('RandomCompat_intval')) {
      * lose precision, so the <= and => operators might accidentally let a float
      * through.
      * 
-     * @param numeric $number The number we want to convert to an int
-     * @param boolean $fail_open Set to true to not throw an exception
+     * @param int|float $number    The number we want to convert to an int
+     * @param boolean   $fail_open Set to true to not throw an exception
      * 
-     * @return int (or float if $fail_open)
+     * @return float|int
+     *
+     * @throws TypeError
      */
     function RandomCompat_intval($number, $fail_open = false)
     {
-        if (is_numeric($number)) {
+        if (is_int($number) || is_float($number)) {
+            $number += 0;
+        } elseif (is_numeric($number)) {
             $number += 0;
         }
+
         if (
-            is_float($number) &&
-            $number > ~PHP_INT_MAX &&
+            is_float($number)
+            &&
+            $number > ~PHP_INT_MAX
+            &&
             $number < PHP_INT_MAX
         ) {
             $number = (int) $number;
         }
-        if (is_int($number) || $fail_open) {
-            return $number;
+
+        if (is_int($number)) {
+            return (int) $number;
+        } elseif (!$fail_open) {
+            throw new TypeError(
+                'Expected an integer.'
+            );
         }
-        throw new TypeError(
-            'Expected an integer.'
-        );
+        return $number;
     }
 }
diff --git a/web/vendor/paragonie/random_compat/lib/error_polyfill.php b/web/vendor/paragonie/random_compat/lib/error_polyfill.php
index 57cfefdcd..6a91990ce 100644
--- a/web/vendor/paragonie/random_compat/lib/error_polyfill.php
+++ b/web/vendor/paragonie/random_compat/lib/error_polyfill.php
@@ -4,8 +4,8 @@
  * for using the new PHP 7 random_* API in PHP 5 projects
  * 
  * The MIT License (MIT)
- * 
- * Copyright (c) 2015 Paragon Initiative Enterprises
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -35,8 +35,15 @@ if (!class_exists('Error', false)) {
 }
 
 if (!class_exists('TypeError', false)) {
-    class TypeError extends Error
-    {
-        
+    if (is_subclass_of('Error', 'Exception')) {
+        class TypeError extends Error
+        {
+            
+        }
+    } else {
+        class TypeError extends Exception
+        {
+            
+        }
     }
 }
diff --git a/web/vendor/paragonie/random_compat/lib/random.php b/web/vendor/paragonie/random_compat/lib/random.php
index d1f7555af..df74c8a4b 100644
--- a/web/vendor/paragonie/random_compat/lib/random.php
+++ b/web/vendor/paragonie/random_compat/lib/random.php
@@ -1,22 +1,25 @@
 <?php
 /**
- * Random_* Compatibility Library 
+ * Random_* Compatibility Library
  * for using the new PHP 7 random_* API in PHP 5 projects
- * 
+ *
+ * @version 2.0.10
+ * @released 2017-03-13
+ *
  * The MIT License (MIT)
- * 
- * Copyright (c) 2015 Paragon Initiative Enterprises
- * 
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,110 +31,193 @@
 
 if (!defined('PHP_VERSION_ID')) {
     // This constant was introduced in PHP 5.2.7
-    $RandomCompatversion = explode('.', PHP_VERSION);
-    define('PHP_VERSION_ID', ($RandomCompatversion[0] * 10000 + $RandomCompatversion[1] * 100 + $RandomCompatversion[2]));
+    $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
+    define(
+        'PHP_VERSION_ID',
+        $RandomCompatversion[0] * 10000
+        + $RandomCompatversion[1] * 100
+        + $RandomCompatversion[2]
+    );
     $RandomCompatversion = null;
 }
-if (PHP_VERSION_ID < 70000) {
-    if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-        define('RANDOM_COMPAT_READ_BUFFER', 8);
-    }
-    $RandomCompatDIR = dirname(__FILE__);
-    require_once $RandomCompatDIR.'/byte_safe_strings.php';
-    require_once $RandomCompatDIR.'/cast_to_int.php';
-    require_once $RandomCompatDIR.'/error_polyfill.php';
-    if (!function_exists('random_bytes')) {
-        /**
-         * PHP 5.2.0 - 5.6.x way to implement random_bytes()
-         * 
-         * We use conditional statements here to define the function in accordance
-         * to the operating environment. It's a micro-optimization.
-         * 
-         * In order of preference:
-         *   1. Use libsodium if available.
-         *   2. fread() /dev/urandom if available (never on Windows)
-         *   3. mcrypt_create_iv($bytes, MCRYPT_CREATE_IV)
-         *   4. COM('CAPICOM.Utilities.1')->GetRandom()
-         *   5. openssl_random_pseudo_bytes() (absolute last resort)
-         * 
-         * See ERRATA.md for our reasoning behind this particular order
-         */
-        if (extension_loaded('libsodium')) {
-            // See random_bytes_libsodium.php
-            require_once $RandomCompatDIR.'/random_bytes_libsodium.php';
+
+/**
+ * PHP 7.0.0 and newer have these functions natively.
+ */
+if (PHP_VERSION_ID >= 70000) {
+    return;
+}
+
+if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+    define('RANDOM_COMPAT_READ_BUFFER', 8);
+}
+
+$RandomCompatDIR = dirname(__FILE__);
+
+require_once $RandomCompatDIR . '/byte_safe_strings.php';
+require_once $RandomCompatDIR . '/cast_to_int.php';
+require_once $RandomCompatDIR . '/error_polyfill.php';
+
+if (!is_callable('random_bytes')) {
+    /**
+     * PHP 5.2.0 - 5.6.x way to implement random_bytes()
+     *
+     * We use conditional statements here to define the function in accordance
+     * to the operating environment. It's a micro-optimization.
+     *
+     * In order of preference:
+     *   1. Use libsodium if available.
+     *   2. fread() /dev/urandom if available (never on Windows)
+     *   3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
+     *   4. COM('CAPICOM.Utilities.1')->GetRandom()
+     *
+     * See RATIONALE.md for our reasoning behind this particular order
+     */
+    if (extension_loaded('libsodium')) {
+        // See random_bytes_libsodium.php
+        if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
+            require_once $RandomCompatDIR . '/random_bytes_libsodium.php';
+        } elseif (method_exists('Sodium', 'randombytes_buf')) {
+            require_once $RandomCompatDIR . '/random_bytes_libsodium_legacy.php';
         }
+    }
+
+    /**
+     * Reading directly from /dev/urandom:
+     */
+    if (DIRECTORY_SEPARATOR === '/') {
+        // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
+        // way to exclude Windows.
+        $RandomCompatUrandom = true;
+        $RandomCompat_basedir = ini_get('open_basedir');
+
+        if (!empty($RandomCompat_basedir)) {
+            $RandomCompat_open_basedir = explode(
+                PATH_SEPARATOR,
+                strtolower($RandomCompat_basedir)
+            );
+            $RandomCompatUrandom = (array() !== array_intersect(
+                array('/dev', '/dev/', '/dev/urandom'),
+                $RandomCompat_open_basedir
+            ));
+            $RandomCompat_open_basedir = null;
+        }
+
         if (
-            !function_exists('random_bytes') && 
-            DIRECTORY_SEPARATOR === '/' &&
+            !is_callable('random_bytes')
+            &&
+            $RandomCompatUrandom
+            &&
             @is_readable('/dev/urandom')
         ) {
-            // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
-            // way to exclude Windows.
-            // 
-            // Error suppression on is_readable() in case of an open_basedir or 
-            // safe_mode failure. All we care about is whether or not we can 
-            // read it at this point. If the PHP environment is going to panic 
-            // over trying to see if the file can be read in the first place,
-            // that is not helpful to us here.
-            
+            // Error suppression on is_readable() in case of an open_basedir
+            // or safe_mode failure. All we care about is whether or not we
+            // can read it at this point. If the PHP environment is going to
+            // panic over trying to see if the file can be read in the first
+            // place, that is not helpful to us here.
+
             // See random_bytes_dev_urandom.php
-            require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php';
+            require_once $RandomCompatDIR . '/random_bytes_dev_urandom.php';
         }
-        if (
-            !function_exists('random_bytes') &&
-            PHP_VERSION_ID >= 50307 &&
-            extension_loaded('mcrypt')
-        ) {
-            // See random_bytes_mcrypt.php
-            require_once $RandomCompatDIR.'/random_bytes_mcrypt.php';
-        }
-        if (
-            !function_exists('random_bytes') && 
-            extension_loaded('com_dotnet') &&
-            class_exists('COM')
-        ) {
+        // Unset variables after use
+        $RandomCompat_basedir = null;
+    } else {
+        $RandomCompatUrandom = false;
+    }
+
+    /**
+     * mcrypt_create_iv()
+     *
+     * We only want to use mcypt_create_iv() if:
+     *
+     * - random_bytes() hasn't already been defined
+     * - the mcrypt extensions is loaded
+     * - One of these two conditions is true:
+     *   - We're on Windows (DIRECTORY_SEPARATOR !== '/')
+     *   - We're not on Windows and /dev/urandom is readabale
+     *     (i.e. we're not in a chroot jail)
+     * - Special case:
+     *   - If we're not on Windows, but the PHP version is between
+     *     5.6.10 and 5.6.12, we don't want to use mcrypt. It will
+     *     hang indefinitely. This is bad.
+     *   - If we're on Windows, we want to use PHP >= 5.3.7 or else
+     *     we get insufficient entropy errors.
+     */
+    if (
+        !is_callable('random_bytes')
+        &&
+        // Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be.
+        (DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307)
+        &&
+        // Prevent this code from hanging indefinitely on non-Windows;
+        // see https://bugs.php.net/bug.php?id=69833
+        (
+            DIRECTORY_SEPARATOR !== '/' ||
+            (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
+        )
+        &&
+        extension_loaded('mcrypt')
+    ) {
+        // See random_bytes_mcrypt.php
+        require_once $RandomCompatDIR . '/random_bytes_mcrypt.php';
+    }
+    $RandomCompatUrandom = null;
+
+    /**
+     * This is a Windows-specific fallback, for when the mcrypt extension
+     * isn't loaded.
+     */
+    if (
+        !is_callable('random_bytes')
+        &&
+        extension_loaded('com_dotnet')
+        &&
+        class_exists('COM')
+    ) {
+        $RandomCompat_disabled_classes = preg_split(
+            '#\s*,\s*#',
+            strtolower(ini_get('disable_classes'))
+        );
+
+        if (!in_array('com', $RandomCompat_disabled_classes)) {
             try {
                 $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
                 if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
                     // See random_bytes_com_dotnet.php
-                    require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php';
+                    require_once $RandomCompatDIR . '/random_bytes_com_dotnet.php';
                 }
             } catch (com_exception $e) {
                 // Don't try to use it.
             }
-            $RandomCompatCOMtest = null;
         }
-        if (
-            !function_exists('random_bytes') && 
-            extension_loaded('openssl') &&
-            (
-                // Unix-like with PHP >= 5.3.0 or
-                (
-                    DIRECTORY_SEPARATOR === '/' &&
-                    PHP_VERSION_ID >= 50300
-                ) ||
-                // Windows with PHP >= 5.4.1
-                PHP_VERSION_ID >= 50401
-            )
-        ) {
-            // See random_bytes_openssl.php
-            require_once $RandomCompatDIR.'/random_bytes_openssl.php';
-        }
-        if (!function_exists('random_bytes')) {
-            /**
-             * We don't have any more options, so let's throw an exception right now
-             * and hope the developer won't let it fail silently.
-             */
-            function random_bytes()
-            {
-                throw new Exception(
-                    'There is no suitable CSPRNG installed on your system'
-                );
-            }
+        $RandomCompat_disabled_classes = null;
+        $RandomCompatCOMtest = null;
+    }
+
+    /**
+     * throw new Exception
+     */
+    if (!is_callable('random_bytes')) {
+        /**
+         * We don't have any more options, so let's throw an exception right now
+         * and hope the developer won't let it fail silently.
+         *
+         * @param mixed $length
+         * @return void
+         * @throws Exception
+         */
+        function random_bytes($length)
+        {
+            unset($length); // Suppress "variable not used" warnings.
+            throw new Exception(
+                'There is no suitable CSPRNG installed on your system'
+            );
         }
     }
-    if (!function_exists('random_int')) {
-        require_once $RandomCompatDIR.'/random_int.php';
-    }
-    $RandomCompatDIR = null;
 }
+
+if (!is_callable('random_int')) {
+    require_once $RandomCompatDIR . '/random_int.php';
+}
+
+$RandomCompatDIR = null;
diff --git a/web/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php b/web/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php
index 0a781f4ef..fc1926e5c 100644
--- a/web/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php
+++ b/web/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php
@@ -5,7 +5,7 @@
  * 
  * The MIT License (MIT)
  * 
- * Copyright (c) 2015 Paragon Initiative Enterprises
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,52 +26,63 @@
  * SOFTWARE.
  */
 
-/**
- * Windows with PHP < 5.3.0 will not have the function
- * openssl_random_pseudo_bytes() available, so let's use
- * CAPICOM to work around this deficiency.
- * 
- * @param int $bytes
- * 
- * @throws Exception
- * 
- * @return string
- */
-function random_bytes($bytes)
-{
-    try {
-        $bytes = RandomCompat_intval($bytes);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_bytes(): $bytes must be an integer'
-        );
-    }
-    if ($bytes < 1) {
-        throw new Error(
-            'Length must be greater than 0'
-        );
-    }
-    $buf = '';
-    $util = new COM('CAPICOM.Utilities.1');
-    $execCount = 0;
+if (!is_callable('random_bytes')) {
     /**
-     * Let's not let it loop forever. If we run N times and fail to
-     * get N bytes of random data, then CAPICOM has failed us.
+     * Windows with PHP < 5.3.0 will not have the function
+     * openssl_random_pseudo_bytes() available, so let's use
+     * CAPICOM to work around this deficiency.
+     *
+     * @param int $bytes
+     *
+     * @throws Exception
+     *
+     * @return string
      */
-    do {
-        $buf .= base64_decode($util->GetRandom($bytes, 0));
-        if (RandomCompat_strlen($buf) >= $bytes) {
-            /**
-             * Return our random entropy buffer here:
-             */
-            return RandomCompat_substr($buf, 0, $bytes);
+    function random_bytes($bytes)
+    {
+        try {
+            $bytes = RandomCompat_intval($bytes);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_bytes(): $bytes must be an integer'
+            );
         }
-        ++$execCount; 
-    } while ($execCount < $bytes);
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Could not gather sufficient random data'
-    );
-}
+
+        if ($bytes < 1) {
+            throw new Error(
+                'Length must be greater than 0'
+            );
+        }
+
+        $buf = '';
+        if (!class_exists('COM')) {
+            throw new Error(
+                'COM does not exist'
+            );
+        }
+        $util = new COM('CAPICOM.Utilities.1');
+        $execCount = 0;
+
+        /**
+         * Let's not let it loop forever. If we run N times and fail to
+         * get N bytes of random data, then CAPICOM has failed us.
+         */
+        do {
+            $buf .= base64_decode($util->GetRandom($bytes, 0));
+            if (RandomCompat_strlen($buf) >= $bytes) {
+                /**
+                 * Return our random entropy buffer here:
+                 */
+                return RandomCompat_substr($buf, 0, $bytes);
+            }
+            ++$execCount;
+        } while ($execCount < $bytes);
+
+        /**
+         * If we reach here, PHP has failed us.
+         */
+        throw new Exception(
+            'Could not gather sufficient random data'
+        );
+    }
+}
\ No newline at end of file
diff --git a/web/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php b/web/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php
index 5d07104b3..df5b91524 100644
--- a/web/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php
+++ b/web/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php
@@ -4,8 +4,8 @@
  * for using the new PHP 7 random_* API in PHP 5 projects
  * 
  * The MIT License (MIT)
- * 
- * Copyright (c) 2015 Paragon Initiative Enterprises
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,113 +30,138 @@ if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
     define('RANDOM_COMPAT_READ_BUFFER', 8);
 }
 
-/**
- * Unless open_basedir is enabled, use /dev/urandom for
- * random numbers in accordance with best practices
- * 
- * Why we use /dev/urandom and not /dev/random
- * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
- * 
- * @param int $bytes
- * 
- * @throws Exception
- * 
- * @return string
- */
-function random_bytes($bytes)
-{
-    static $fp = null;
+if (!is_callable('random_bytes')) {
     /**
-     * This block should only be run once
+     * Unless open_basedir is enabled, use /dev/urandom for
+     * random numbers in accordance with best practices
+     *
+     * Why we use /dev/urandom and not /dev/random
+     * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
+     *
+     * @param int $bytes
+     *
+     * @throws Exception
+     *
+     * @return string
      */
-    if (empty($fp)) {
+    function random_bytes($bytes)
+    {
+        static $fp = null;
         /**
-         * We use /dev/urandom if it is a char device.
-         * We never fall back to /dev/random
+         * This block should only be run once
          */
-        $fp = fopen('/dev/urandom', 'rb');
-        if (!empty($fp)) {
-            $st = fstat($fp);
-            if (($st['mode'] & 0170000) !== 020000) {
-                fclose($fp);
-                $fp = false;
+        if (empty($fp)) {
+            /**
+             * We use /dev/urandom if it is a char device.
+             * We never fall back to /dev/random
+             */
+            $fp = fopen('/dev/urandom', 'rb');
+            if (!empty($fp)) {
+                $st = fstat($fp);
+                if (($st['mode'] & 0170000) !== 020000) {
+                    fclose($fp);
+                    $fp = false;
+                }
+            }
+
+            if (!empty($fp)) {
+                /**
+                 * stream_set_read_buffer() does not exist in HHVM
+                 *
+                 * If we don't set the stream's read buffer to 0, PHP will
+                 * internally buffer 8192 bytes, which can waste entropy
+                 *
+                 * stream_set_read_buffer returns 0 on success
+                 */
+                if (is_callable('stream_set_read_buffer')) {
+                    stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+                }
+                if (is_callable('stream_set_chunk_size')) {
+                    stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+                }
             }
         }
+
+        try {
+            $bytes = RandomCompat_intval($bytes);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_bytes(): $bytes must be an integer'
+            );
+        }
+
+        if ($bytes < 1) {
+            throw new Error(
+                'Length must be greater than 0'
+            );
+        }
+
+        /**
+         * This if() block only runs if we managed to open a file handle
+         *
+         * It does not belong in an else {} block, because the above
+         * if (empty($fp)) line is logic that should only be run once per
+         * page load.
+         */
         if (!empty($fp)) {
             /**
-             * stream_set_read_buffer() does not exist in HHVM
-             * 
-             * If we don't set the stream's read buffer to 0, PHP will
-             * internally buffer 8192 bytes, which can waste entropy
-             * 
-             * stream_set_read_buffer returns 0 on success
+             * @var int
              */
-            if (function_exists('stream_set_read_buffer')) {
-                stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
-            }
-            if (function_exists('stream_set_chunk_size')) {
-                stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
-            }
-        }
-    }
-    try {
-        $bytes = RandomCompat_intval($bytes);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_bytes(): $bytes must be an integer'
-        );
-    }
-    if ($bytes < 1) {
-        throw new Error(
-            'Length must be greater than 0'
-        );
-    }
-    /**
-     * This if() block only runs if we managed to open a file handle
-     * 
-     * It does not belong in an else {} block, because the above 
-     * if (empty($fp)) line is logic that should only be run once per
-     * page load.
-     */
-    if (!empty($fp)) {
-        $remaining = $bytes;
-        $buf = '';
-        /**
-         * We use fread() in a loop to protect against partial reads
-         */
-        do {
-            $read = fread($fp, $remaining); 
-            if ($read === false) {
-                /**
-                 * We cannot safely read from the file. Exit the
-                 * do-while loop and trigger the exception condition
-                 */
-                $buf = false;
-                break;
-            }
+            $remaining = $bytes;
+
             /**
-             * Decrease the number of bytes returned from remaining
+             * @var string|bool
              */
-            $remaining -= RandomCompat_strlen($read);
-            $buf .= $read;
-        } while ($remaining > 0);
-        
-        /**
-         * Is our result valid?
-         */
-        if ($buf !== false) {
-            if (RandomCompat_strlen($buf) === $bytes) {
+            $buf = '';
+
+            /**
+             * We use fread() in a loop to protect against partial reads
+             */
+            do {
                 /**
-                 * Return our random entropy buffer here:
+                 * @var string|bool
                  */
-                return $buf;
+                $read = fread($fp, $remaining);
+                if (!is_string($read)) {
+                    if ($read === false) {
+                        /**
+                         * We cannot safely read from the file. Exit the
+                         * do-while loop and trigger the exception condition
+                         *
+                         * @var string|bool
+                         */
+                        $buf = false;
+                        break;
+                    }
+                }
+                /**
+                 * Decrease the number of bytes returned from remaining
+                 */
+                $remaining -= RandomCompat_strlen($read);
+                /**
+                 * @var string|bool
+                 */
+                $buf = $buf . $read;
+            } while ($remaining > 0);
+
+            /**
+             * Is our result valid?
+             */
+            if (is_string($buf)) {
+                if (RandomCompat_strlen($buf) === $bytes) {
+                    /**
+                     * Return our random entropy buffer here:
+                     */
+                    return $buf;
+                }
             }
         }
+
+        /**
+         * If we reach here, PHP has failed us.
+         */
+        throw new Exception(
+            'Error reading from source device'
+        );
     }
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Error reading from source device'
-    );
 }
diff --git a/web/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php b/web/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
index 938cac929..4af1a2422 100644
--- a/web/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
+++ b/web/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
@@ -4,8 +4,8 @@
  * for using the new PHP 7 random_* API in PHP 5 projects
  * 
  * The MIT License (MIT)
- * 
- * Copyright (c) 2015 Paragon Initiative Enterprises
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,59 +26,63 @@
  * SOFTWARE.
  */
 
-/**
- * If the libsodium PHP extension is loaded, we'll use it above any other
- * solution.
- *
- * libsodium-php project:
- * @ref https://github.com/jedisct1/libsodium-php
- *
- * @param int $bytes
- *
- * @throws Exception
- *
- * @return string
- */
-function random_bytes($bytes)
-{
-    try {
-        $bytes = RandomCompat_intval($bytes);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_bytes(): $bytes must be an integer'
+if (!is_callable('random_bytes')) {
+    /**
+     * If the libsodium PHP extension is loaded, we'll use it above any other
+     * solution.
+     *
+     * libsodium-php project:
+     * @ref https://github.com/jedisct1/libsodium-php
+     *
+     * @param int $bytes
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    function random_bytes($bytes)
+    {
+        try {
+            $bytes = RandomCompat_intval($bytes);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_bytes(): $bytes must be an integer'
+            );
+        }
+
+        if ($bytes < 1) {
+            throw new Error(
+                'Length must be greater than 0'
+            );
+        }
+
+        /**
+         * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+         * generated in one invocation.
+         */
+        if ($bytes > 2147483647) {
+            $buf = '';
+            for ($i = 0; $i < $bytes; $i += 1073741824) {
+                $n = ($bytes - $i) > 1073741824
+                    ? 1073741824
+                    : $bytes - $i;
+                $buf .= \Sodium\randombytes_buf($n);
+            }
+        } else {
+            $buf = \Sodium\randombytes_buf($bytes);
+        }
+
+        if ($buf !== false) {
+            if (RandomCompat_strlen($buf) === $bytes) {
+                return $buf;
+            }
+        }
+
+        /**
+         * If we reach here, PHP has failed us.
+         */
+        throw new Exception(
+            'Could not gather sufficient random data'
         );
     }
-    if ($bytes < 1) {
-        throw new Error(
-            'Length must be greater than 0'
-        );
-    }
-    /**
-     * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
-     * generated in one invocation.
-     */
-    if ($bytes > 2147483647) {
-        $buf = '';
-        for ($i = 0; $i < $bytes; $i += 1073741824) {
-            $n = ($bytes - $i) > 1073741824
-                ? 1073741824
-                : $bytes - $i;
-            $buf .= \Sodium\randombytes_buf($n);
-        }
-    } else {
-        $buf = \Sodium\randombytes_buf($bytes);
-    }
-
-    if ($buf !== false) {
-        if (RandomCompat_strlen($buf) === $bytes) {
-            return $buf;
-        }
-    }
-
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Could not gather sufficient random data'
-    );
 }
diff --git a/web/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php b/web/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php
new file mode 100644
index 000000000..02160b919
--- /dev/null
+++ b/web/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Random_* Compatibility Library 
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ * 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('random_bytes')) {
+    /**
+     * If the libsodium PHP extension is loaded, we'll use it above any other
+     * solution.
+     *
+     * libsodium-php project:
+     * @ref https://github.com/jedisct1/libsodium-php
+     *
+     * @param int $bytes
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    function random_bytes($bytes)
+    {
+        try {
+            $bytes = RandomCompat_intval($bytes);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_bytes(): $bytes must be an integer'
+            );
+        }
+
+        if ($bytes < 1) {
+            throw new Error(
+                'Length must be greater than 0'
+            );
+        }
+
+        /**
+         * @var string
+         */
+        $buf = '';
+
+        /**
+         * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+         * generated in one invocation.
+         */
+        if ($bytes > 2147483647) {
+            for ($i = 0; $i < $bytes; $i += 1073741824) {
+                $n = ($bytes - $i) > 1073741824
+                    ? 1073741824
+                    : $bytes - $i;
+                $buf .= Sodium::randombytes_buf($n);
+            }
+        } else {
+            $buf .= Sodium::randombytes_buf($bytes);
+        }
+
+        if (is_string($buf)) {
+            if (RandomCompat_strlen($buf) === $bytes) {
+                return $buf;
+            }
+        }
+
+        /**
+         * If we reach here, PHP has failed us.
+         */
+        throw new Exception(
+            'Could not gather sufficient random data'
+        );
+    }
+}
diff --git a/web/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php b/web/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php
index 5a1b688f6..aac9c013d 100644
--- a/web/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php
+++ b/web/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php
@@ -4,8 +4,8 @@
  * for using the new PHP 7 random_* API in PHP 5 projects
  * 
  * The MIT License (MIT)
- * 
- * Copyright (c) 2015 Paragon Initiative Enterprises
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,47 +26,52 @@
  * SOFTWARE.
  */
 
+if (!is_callable('random_bytes')) {
+    /**
+     * Powered by ext/mcrypt (and thankfully NOT libmcrypt)
+     *
+     * @ref https://bugs.php.net/bug.php?id=55169
+     * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386
+     *
+     * @param int $bytes
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    function random_bytes($bytes)
+    {
+        try {
+            $bytes = RandomCompat_intval($bytes);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_bytes(): $bytes must be an integer'
+            );
+        }
 
-/**
- * Powered by ext/mcrypt (and thankfully NOT libmcrypt)
- * 
- * @ref https://bugs.php.net/bug.php?id=55169
- * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386
- * 
- * @param int $bytes
- * 
- * @throws Exception
- * 
- * @return string
- */
-function random_bytes($bytes)
-{
-    try {
-        $bytes = RandomCompat_intval($bytes);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_bytes(): $bytes must be an integer'
-        );
-    }
-    if ($bytes < 1) {
-        throw new Error(
-            'Length must be greater than 0'
-        );
-    }
+        if ($bytes < 1) {
+            throw new Error(
+                'Length must be greater than 0'
+            );
+        }
 
-    $buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
-    if ($buf !== false) {
-        if (RandomCompat_strlen($buf) === $bytes) {
+        $buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
+        if (
+            $buf !== false
+            &&
+            RandomCompat_strlen($buf) === $bytes
+        ) {
             /**
              * Return our random entropy buffer here:
              */
             return $buf;
         }
+
+        /**
+         * If we reach here, PHP has failed us.
+         */
+        throw new Exception(
+            'Could not gather sufficient random data'
+        );
     }
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Could not gather sufficient random data'
-    );
 }
diff --git a/web/vendor/paragonie/random_compat/lib/random_bytes_openssl.php b/web/vendor/paragonie/random_compat/lib/random_bytes_openssl.php
deleted file mode 100644
index 3e12d3da5..000000000
--- a/web/vendor/paragonie/random_compat/lib/random_bytes_openssl.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library 
- * for using the new PHP 7 random_* API in PHP 5 projects
- * 
- * The MIT License (MIT)
- * 
- * Copyright (c) 2015 Paragon Initiative Enterprises
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * Since openssl_random_pseudo_bytes() uses openssl's 
- * RAND_pseudo_bytes() API, which has been marked as deprecated by the
- * OpenSSL team, this is our last resort before failure.
- * 
- * @ref https://www.openssl.org/docs/crypto/RAND_bytes.html
- * 
- * @param int $bytes
- * 
- * @throws Exception
- * 
- * @return string
- */
-function random_bytes($bytes)
-{
-    try {
-        $bytes = RandomCompat_intval($bytes);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_bytes(): $bytes must be an integer'
-        );
-    }
-    if ($bytes < 1) {
-        throw new Error(
-            'Length must be greater than 0'
-        );
-    }
-    $secure = true;
-    /**
-     * $secure is passed by reference. If it's set to false, fail. Note
-     * that this will only return false if this function fails to return
-     * any data.
-     * 
-     * @ref https://github.com/paragonie/random_compat/issues/6#issuecomment-119564973
-     */
-    $buf = openssl_random_pseudo_bytes($bytes, $secure);
-    if ($buf !== false && $secure) {
-        if (RandomCompat_strlen($buf) === $bytes) {
-            return $buf;
-        }
-    }
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Could not gather sufficient random data'
-    );
-}
diff --git a/web/vendor/paragonie/random_compat/lib/random_int.php b/web/vendor/paragonie/random_compat/lib/random_int.php
index 6c91dbc51..b2ea02d17 100644
--- a/web/vendor/paragonie/random_compat/lib/random_int.php
+++ b/web/vendor/paragonie/random_compat/lib/random_int.php
@@ -1,185 +1,190 @@
 <?php
-/**
- * Random_* Compatibility Library 
- * for using the new PHP 7 random_* API in PHP 5 projects
- * 
- * The MIT License (MIT)
- * 
- * Copyright (c) 2015 Paragon Initiative Enterprises
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 
-/**
- * Fetch a random integer between $min and $max inclusive
- * 
- * @param int $min
- * @param int $max
- * 
- * @throws Exception
- * 
- * @return int
- */
-function random_int($min, $max)
-{
+if (!is_callable('random_int')) {
     /**
-     * Type and input logic checks
-     * 
-     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
-     * lose precision, so the <= and => operators might accidentally let a float
-     * through.
+     * Random_* Compatibility Library
+     * for using the new PHP 7 random_* API in PHP 5 projects
+     *
+     * The MIT License (MIT)
+     *
+     * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+     *
+     * Permission is hereby granted, free of charge, to any person obtaining a copy
+     * of this software and associated documentation files (the "Software"), to deal
+     * in the Software without restriction, including without limitation the rights
+     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+     * copies of the Software, and to permit persons to whom the Software is
+     * furnished to do so, subject to the following conditions:
+     *
+     * The above copyright notice and this permission notice shall be included in
+     * all copies or substantial portions of the Software.
+     *
+     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+     * SOFTWARE.
      */
-    
-    try {
-        $min = RandomCompat_intval($min);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_int(): $min must be an integer'
-        );
-    }
-    try {
-        $max = RandomCompat_intval($max);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_int(): $max must be an integer'
-        );
-    }
-    
-    /**
-     * Now that we've verified our weak typing system has given us an integer,
-     * let's validate the logic then we can move forward with generating random
-     * integers along a given range.
-     */
-    if ($min > $max) {
-        throw new Error(
-            'Minimum value must be less than or equal to the maximum value'
-        );
-    }
-    if ($max === $min) {
-        return $min;
-    }
 
     /**
-     * Initialize variables to 0
-     * 
-     * We want to store:
-     * $bytes => the number of random bytes we need
-     * $mask => an integer bitmask (for use with the &) operator
-     *          so we can minimize the number of discards
+     * Fetch a random integer between $min and $max inclusive
+     *
+     * @param int $min
+     * @param int $max
+     *
+     * @throws Exception
+     *
+     * @return int
      */
-    $attempts = $bits = $bytes = $mask = $valueShift = 0;
-
-    /**
-     * At this point, $range is a positive number greater than 0. It might
-     * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
-     * a float and we will lose some precision.
-     */
-    $range = $max - $min;
-
-    /**
-     * Test for integer overflow:
-     */
-    if (!is_int($range)) {
+    function random_int($min, $max)
+    {
         /**
-         * Still safely calculate wider ranges.
-         * Provided by @CodesInChaos, @oittaa
-         * 
-         * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
-         * 
-         * We use ~0 as a mask in this case because it generates all 1s
-         * 
-         * @ref https://eval.in/400356 (32-bit)
-         * @ref http://3v4l.org/XX9r5  (64-bit)
+         * Type and input logic checks
+         *
+         * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+         * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+         * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
+         * lose precision, so the <= and => operators might accidentally let a float
+         * through.
          */
-        $bytes = PHP_INT_SIZE;
-        $mask = ~0;
-    } else {
+
+        try {
+            $min = RandomCompat_intval($min);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_int(): $min must be an integer'
+            );
+        }
+
+        try {
+            $max = RandomCompat_intval($max);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_int(): $max must be an integer'
+            );
+        }
+
         /**
-         * $bits is effectively ceil(log($range, 2)) without dealing with 
-         * type juggling
+         * Now that we've verified our weak typing system has given us an integer,
+         * let's validate the logic then we can move forward with generating random
+         * integers along a given range.
          */
-        while ($range > 0) {
-            if ($bits % 8 === 0) {
-               ++$bytes;
+        if ($min > $max) {
+            throw new Error(
+                'Minimum value must be less than or equal to the maximum value'
+            );
+        }
+
+        if ($max === $min) {
+            return $min;
+        }
+
+        /**
+         * Initialize variables to 0
+         *
+         * We want to store:
+         * $bytes => the number of random bytes we need
+         * $mask => an integer bitmask (for use with the &) operator
+         *          so we can minimize the number of discards
+         */
+        $attempts = $bits = $bytes = $mask = $valueShift = 0;
+
+        /**
+         * At this point, $range is a positive number greater than 0. It might
+         * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
+         * a float and we will lose some precision.
+         */
+        $range = $max - $min;
+
+        /**
+         * Test for integer overflow:
+         */
+        if (!is_int($range)) {
+
+            /**
+             * Still safely calculate wider ranges.
+             * Provided by @CodesInChaos, @oittaa
+             *
+             * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
+             *
+             * We use ~0 as a mask in this case because it generates all 1s
+             *
+             * @ref https://eval.in/400356 (32-bit)
+             * @ref http://3v4l.org/XX9r5  (64-bit)
+             */
+            $bytes = PHP_INT_SIZE;
+            $mask = ~0;
+
+        } else {
+
+            /**
+             * $bits is effectively ceil(log($range, 2)) without dealing with
+             * type juggling
+             */
+            while ($range > 0) {
+                if ($bits % 8 === 0) {
+                    ++$bytes;
+                }
+                ++$bits;
+                $range >>= 1;
+                $mask = $mask << 1 | 1;
             }
-            ++$bits;
-            $range >>= 1;
-            $mask = $mask << 1 | 1;
-        }
-        $valueShift = $min;
-    }
-
-    /**
-     * Now that we have our parameters set up, let's begin generating
-     * random integers until one falls between $min and $max
-     */
-    do {
-        /**
-         * The rejection probability is at most 0.5, so this corresponds
-         * to a failure probability of 2^-128 for a working RNG
-         */
-        if ($attempts > 128) {
-            throw new Exception(
-                'random_int: RNG is broken - too many rejections'
-            );
+            $valueShift = $min;
         }
 
-        /**
-         * Let's grab the necessary number of random bytes
-         */
-        $randomByteString = random_bytes($bytes);
-        if ($randomByteString === false) {
-            throw new Exception(
-                'Random number generator failure'
-            );
-        }
-
-        /**
-         * Let's turn $randomByteString into an integer
-         * 
-         * This uses bitwise operators (<< and |) to build an integer
-         * out of the values extracted from ord()
-         * 
-         * Example: [9F] | [6D] | [32] | [0C] =>
-         *   159 + 27904 + 3276800 + 201326592 =>
-         *   204631455
-         */
         $val = 0;
-        for ($i = 0; $i < $bytes; ++$i) {
-            $val |= ord($randomByteString[$i]) << ($i * 8);
-        }
-
         /**
-         * Apply mask
+         * Now that we have our parameters set up, let's begin generating
+         * random integers until one falls between $min and $max
          */
-        $val &= $mask;
-        $val += $valueShift;
+        do {
+            /**
+             * The rejection probability is at most 0.5, so this corresponds
+             * to a failure probability of 2^-128 for a working RNG
+             */
+            if ($attempts > 128) {
+                throw new Exception(
+                    'random_int: RNG is broken - too many rejections'
+                );
+            }
 
-        ++$attempts;
-        /**
-         * If $val overflows to a floating point number,
-         * ... or is larger than $max,
-         * ... or smaller than $min,
-         * then try again.
-         */
-    } while (!is_int($val) || $val > $max || $val < $min);
-    return (int) $val;
+            /**
+             * Let's grab the necessary number of random bytes
+             */
+            $randomByteString = random_bytes($bytes);
+
+            /**
+             * Let's turn $randomByteString into an integer
+             *
+             * This uses bitwise operators (<< and |) to build an integer
+             * out of the values extracted from ord()
+             *
+             * Example: [9F] | [6D] | [32] | [0C] =>
+             *   159 + 27904 + 3276800 + 201326592 =>
+             *   204631455
+             */
+            $val &= 0;
+            for ($i = 0; $i < $bytes; ++$i) {
+                $val |= ord($randomByteString[$i]) << ($i * 8);
+            }
+
+            /**
+             * Apply mask
+             */
+            $val &= $mask;
+            $val += $valueShift;
+
+            ++$attempts;
+            /**
+             * If $val overflows to a floating point number,
+             * ... or is larger than $max,
+             * ... or smaller than $min,
+             * then try again.
+             */
+        } while (!is_int($val) || $val > $max || $val < $min);
+
+        return (int)$val;
+    }
 }
diff --git a/web/vendor/paragonie/random_compat/other/build_phar.php b/web/vendor/paragonie/random_compat/other/build_phar.php
new file mode 100644
index 000000000..70ef4b2ed
--- /dev/null
+++ b/web/vendor/paragonie/random_compat/other/build_phar.php
@@ -0,0 +1,57 @@
+<?php
+$dist = dirname(__DIR__).'/dist';
+if (!is_dir($dist)) {
+    mkdir($dist, 0755);
+}
+if (file_exists($dist.'/random_compat.phar')) {
+    unlink($dist.'/random_compat.phar');
+}
+$phar = new Phar(
+    $dist.'/random_compat.phar',
+    FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::KEY_AS_FILENAME,
+    'random_compat.phar'
+);
+rename(
+    dirname(__DIR__).'/lib/random.php', 
+    dirname(__DIR__).'/lib/index.php'
+);
+$phar->buildFromDirectory(dirname(__DIR__).'/lib');
+rename(
+    dirname(__DIR__).'/lib/index.php', 
+    dirname(__DIR__).'/lib/random.php'
+);
+
+/**
+ * If we pass an (optional) path to a private key as a second argument, we will
+ * sign the Phar with OpenSSL.
+ * 
+ * If you leave this out, it will produce an unsigned .phar!
+ */
+if ($argc > 1) {
+    if (!@is_readable($argv[1])) {
+        echo 'Could not read the private key file:', $argv[1], "\n";
+        exit(255);
+    }
+    $pkeyFile = file_get_contents($argv[1]);
+    
+    $private = openssl_get_privatekey($pkeyFile);
+    if ($private !== false) {
+        $pkey = '';
+        openssl_pkey_export($private, $pkey);
+        $phar->setSignatureAlgorithm(Phar::OPENSSL, $pkey);
+        
+        /**
+         * Save the corresponding public key to the file
+         */
+        if (!@is_readable($dist.'/random_compat.phar.pubkey')) {
+            $details = openssl_pkey_get_details($private);
+            file_put_contents(
+                $dist.'/random_compat.phar.pubkey',
+                $details['key']
+            );
+        }
+    } else {
+        echo 'An error occurred reading the private key from OpenSSL.', "\n";
+        exit(255);
+    }
+}
diff --git a/web/vendor/paragonie/random_compat/phpunit.sh b/web/vendor/paragonie/random_compat/phpunit.sh
deleted file mode 100755
index c4c6a9f66..000000000
--- a/web/vendor/paragonie/random_compat/phpunit.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "$1" == 'full' ]; then
-    fulltest=1
-elif [ "$1" == 'each' ]; then
-    testeach=1
-else
-    fulltest=0
-fi
-
-PHP_VERSION=$(php -r "echo PHP_VERSION_ID;")
-
-echo
-echo -e "\033[33mBegin Unit Testing\033[0m"
-# Run the testing suite
-echo "Basic test suite:"
-php vendor/bin/phpunit tests/unit
-if [ $? -ne 0 ]; then
-    # Test failure
-    exit 1
-fi
-echo "With open_basedir enabled:"
-php -d open_basedir=`pwd` vendor/bin/phpunit tests/unit
-if [ $? -ne 0 ]; then
-    # Test failure
-    exit 1
-fi
-echo "With open_basedir enabled, allowing /dev:"
-php -d open_basedir=`pwd`:/dev vendor/bin/phpunit tests/unit
-if [ $? -ne 0 ]; then
-    # Test failure
-    exit 1
-fi
-echo "With mbstring.func_overload enabled:"
-php -d mbstring.func_overload=7 vendor/bin/phpunit tests/unit
-if [ $? -ne 0 ]; then
-    # Test failure
-    exit 1
-fi
-
-if [[ "$testeach" == "1" ]]; then
-    echo "    CAPICOM:"
-    php vendor/bin/phpunit --bootstrap tests/specific/capicom.php tests/unit
-    echo "    /dev/urandom:"
-    php vendor/bin/phpunit --bootstrap tests/specific/dev_urandom.php tests/unit
-    echo "    libsodium:"
-    php vendor/bin/phpunit --bootstrap tests/specific/libsodium.php tests/unit
-    echo "    mcrypt:"
-    php vendor/bin/phpunit --bootstrap tests/specific/mcrypt.php tests/unit
-    echo "    openssl:"
-    php vendor/bin/phpunit --bootstrap tests/specific/openssl.php tests/unit
-fi
-
-# Should we perform full statistical analyses?
-if [[ "$fulltest" == "1" ]]; then
-    php vendor/bin/phpunit tests/full
-    if [ $? -ne 0 ]; then
-        # Test failure
-        exit 1
-    fi
-fi
-
diff --git a/web/vendor/paragonie/random_compat/phpunit.xml.dist b/web/vendor/paragonie/random_compat/phpunit.xml.dist
deleted file mode 100644
index b4697d35a..000000000
--- a/web/vendor/paragonie/random_compat/phpunit.xml.dist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         bootstrap="lib/random.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         syntaxCheck="true"
->
-    <testsuites>
-        <testsuite name="Unit">
-            <directory>tests/unit</directory>
-        </testsuite>
-    </testsuites>
-    <testsuites>
-        <testsuite name="Random Compat Test Suite">
-            <directory suffix="Test.php">./tests/unit</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./lib</directory>
-        </whitelist>
-    </filter>
-</phpunit>
\ No newline at end of file
diff --git a/web/vendor/paragonie/random_compat/psalm-autoload.php b/web/vendor/paragonie/random_compat/psalm-autoload.php
new file mode 100644
index 000000000..d71d1b818
--- /dev/null
+++ b/web/vendor/paragonie/random_compat/psalm-autoload.php
@@ -0,0 +1,9 @@
+<?php
+
+require_once 'lib/byte_safe_strings.php';
+require_once 'lib/cast_to_int.php';
+require_once 'lib/error_polyfill.php';
+require_once 'other/ide_stubs/libsodium.php';
+require_once 'lib/random.php';
+
+$int = random_int(0, 65536);
diff --git a/web/vendor/paragonie/random_compat/psalm.xml b/web/vendor/paragonie/random_compat/psalm.xml
new file mode 100644
index 000000000..f50131560
--- /dev/null
+++ b/web/vendor/paragonie/random_compat/psalm.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+    autoloader="psalm-autoload.php"
+    stopOnFirstError="false"
+    useDocblockTypes="true"
+>
+    <projectFiles>
+        <directory name="lib" />
+    </projectFiles>
+    <issueHandlers>
+        <InvalidOperand errorLevel="info" />
+        <UndefinedConstant errorLevel="info" />
+        <MissingReturnType errorLevel="info" />
+    </issueHandlers>
+</psalm>
diff --git a/web/vendor/psr/http-message/CHANGELOG.md b/web/vendor/psr/http-message/CHANGELOG.md
new file mode 100644
index 000000000..74b1ef923
--- /dev/null
+++ b/web/vendor/psr/http-message/CHANGELOG.md
@@ -0,0 +1,36 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.0.1 - 2016-08-06
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Updated all `@return self` annotation references in interfaces to use
+  `@return static`, which more closelly follows the semantics of the
+  specification.
+- Updated the `MessageInterface::getHeaders()` return annotation to use the
+  value `string[][]`, indicating the format is a nested array of strings.
+- Updated the `@link` annotation for `RequestInterface::withRequestTarget()`
+  to point to the correct section of RFC 7230.
+- Updated the `ServerRequestInterface::withUploadedFiles()` parameter annotation
+  to add the parameter name (`$uploadedFiles`).
+- Updated a `@throws` annotation for the `UploadedFileInterface::moveTo()`
+  method to correctly reference the method parameter (it was referencing an
+  incorrect parameter name previously).
+
+## 1.0.0 - 2016-05-18
+
+Initial stable release; reflects accepted PSR-7 specification.
diff --git a/web/vendor/psr/http-message/composer.json b/web/vendor/psr/http-message/composer.json
index 4774b6126..b0d2937a0 100644
--- a/web/vendor/psr/http-message/composer.json
+++ b/web/vendor/psr/http-message/composer.json
@@ -2,6 +2,7 @@
     "name": "psr/http-message",
     "description": "Common interface for HTTP messages",
     "keywords": ["psr", "psr-7", "http", "http-message", "request", "response"],
+    "homepage": "https://github.com/php-fig/http-message",
     "license": "MIT",
     "authors": [
         {
diff --git a/web/vendor/psr/http-message/src/MessageInterface.php b/web/vendor/psr/http-message/src/MessageInterface.php
index 8f67a050e..dd46e5ec8 100644
--- a/web/vendor/psr/http-message/src/MessageInterface.php
+++ b/web/vendor/psr/http-message/src/MessageInterface.php
@@ -36,7 +36,7 @@ interface MessageInterface
      * new protocol version.
      *
      * @param string $version HTTP protocol version
-     * @return self
+     * @return static
      */
     public function withProtocolVersion($version);
 
@@ -61,7 +61,7 @@ interface MessageInterface
      * While header names are not case-sensitive, getHeaders() will preserve the
      * exact case in which headers were originally specified.
      *
-     * @return array Returns an associative array of the message's headers. Each
+     * @return string[][] Returns an associative array of the message's headers. Each
      *     key MUST be a header name, and each value MUST be an array of strings
      *     for that header.
      */
@@ -126,7 +126,7 @@ interface MessageInterface
      *
      * @param string $name Case-insensitive header field name.
      * @param string|string[] $value Header value(s).
-     * @return self
+     * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
     public function withHeader($name, $value);
@@ -144,7 +144,7 @@ interface MessageInterface
      *
      * @param string $name Case-insensitive header field name to add.
      * @param string|string[] $value Header value(s).
-     * @return self
+     * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
     public function withAddedHeader($name, $value);
@@ -159,7 +159,7 @@ interface MessageInterface
      * the named header.
      *
      * @param string $name Case-insensitive header field name to remove.
-     * @return self
+     * @return static
      */
     public function withoutHeader($name);
 
@@ -180,7 +180,7 @@ interface MessageInterface
      * new body stream.
      *
      * @param StreamInterface $body Body.
-     * @return self
+     * @return static
      * @throws \InvalidArgumentException When the body is not valid.
      */
     public function withBody(StreamInterface $body);
diff --git a/web/vendor/psr/http-message/src/RequestInterface.php b/web/vendor/psr/http-message/src/RequestInterface.php
index 75c802e29..a96d4fd63 100644
--- a/web/vendor/psr/http-message/src/RequestInterface.php
+++ b/web/vendor/psr/http-message/src/RequestInterface.php
@@ -53,10 +53,10 @@ interface RequestInterface extends MessageInterface
      * immutability of the message, and MUST return an instance that has the
      * changed request target.
      *
-     * @link http://tools.ietf.org/html/rfc7230#section-2.7 (for the various
+     * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
      *     request-target forms allowed in request messages)
      * @param mixed $requestTarget
-     * @return self
+     * @return static
      */
     public function withRequestTarget($requestTarget);
 
@@ -79,7 +79,7 @@ interface RequestInterface extends MessageInterface
      * changed request method.
      *
      * @param string $method Case-sensitive method.
-     * @return self
+     * @return static
      * @throws \InvalidArgumentException for invalid HTTP methods.
      */
     public function withMethod($method);
@@ -107,7 +107,7 @@ interface RequestInterface extends MessageInterface
      * setting `$preserveHost` to `true`. When `$preserveHost` is set to
      * `true`, this method interacts with the Host header in the following ways:
      *
-     * - If the the Host header is missing or empty, and the new URI contains
+     * - If the Host header is missing or empty, and the new URI contains
      *   a host component, this method MUST update the Host header in the returned
      *   request.
      * - If the Host header is missing or empty, and the new URI does not contain a
@@ -123,7 +123,7 @@ interface RequestInterface extends MessageInterface
      * @link http://tools.ietf.org/html/rfc3986#section-4.3
      * @param UriInterface $uri New request URI to use.
      * @param bool $preserveHost Preserve the original state of the Host header.
-     * @return self
+     * @return static
      */
     public function withUri(UriInterface $uri, $preserveHost = false);
 }
diff --git a/web/vendor/psr/http-message/src/ResponseInterface.php b/web/vendor/psr/http-message/src/ResponseInterface.php
index 6724809e3..c306514e6 100644
--- a/web/vendor/psr/http-message/src/ResponseInterface.php
+++ b/web/vendor/psr/http-message/src/ResponseInterface.php
@@ -46,7 +46,7 @@ interface ResponseInterface extends MessageInterface
      * @param string $reasonPhrase The reason phrase to use with the
      *     provided status code; if none is provided, implementations MAY
      *     use the defaults as suggested in the HTTP specification.
-     * @return self
+     * @return static
      * @throws \InvalidArgumentException For invalid status code arguments.
      */
     public function withStatus($code, $reasonPhrase = '');
diff --git a/web/vendor/psr/http-message/src/ServerRequestInterface.php b/web/vendor/psr/http-message/src/ServerRequestInterface.php
index 916e0658d..02512340a 100644
--- a/web/vendor/psr/http-message/src/ServerRequestInterface.php
+++ b/web/vendor/psr/http-message/src/ServerRequestInterface.php
@@ -80,7 +80,7 @@ interface ServerRequestInterface extends RequestInterface
      * updated cookie values.
      *
      * @param array $cookies Array of key/value pairs representing cookies.
-     * @return self
+     * @return static
      */
     public function withCookieParams(array $cookies);
 
@@ -118,7 +118,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @param array $query Array of query string arguments, typically from
      *     $_GET.
-     * @return self
+     * @return static
      */
     public function withQueryParams(array $query);
 
@@ -143,8 +143,8 @@ interface ServerRequestInterface extends RequestInterface
      * immutability of the message, and MUST return an instance that has the
      * updated body parameters.
      *
-     * @param array An array tree of UploadedFileInterface instances.
-     * @return self
+     * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
+     * @return static
      * @throws \InvalidArgumentException if an invalid structure is provided.
      */
     public function withUploadedFiles(array $uploadedFiles);
@@ -190,7 +190,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @param null|array|object $data The deserialized body data. This will
      *     typically be in an array or object.
-     * @return self
+     * @return static
      * @throws \InvalidArgumentException if an unsupported argument type is
      *     provided.
      */
@@ -239,7 +239,7 @@ interface ServerRequestInterface extends RequestInterface
      * @see getAttributes()
      * @param string $name The attribute name.
      * @param mixed $value The value of the attribute.
-     * @return self
+     * @return static
      */
     public function withAttribute($name, $value);
 
@@ -255,7 +255,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @see getAttributes()
      * @param string $name The attribute name.
-     * @return self
+     * @return static
      */
     public function withoutAttribute($name);
 }
diff --git a/web/vendor/psr/http-message/src/UploadedFileInterface.php b/web/vendor/psr/http-message/src/UploadedFileInterface.php
index 5ad288d2b..f8a6901e0 100644
--- a/web/vendor/psr/http-message/src/UploadedFileInterface.php
+++ b/web/vendor/psr/http-message/src/UploadedFileInterface.php
@@ -58,7 +58,7 @@ interface UploadedFileInterface
      * @see http://php.net/is_uploaded_file
      * @see http://php.net/move_uploaded_file
      * @param string $targetPath Path to which to move the uploaded file.
-     * @throws \InvalidArgumentException if the $path specified is invalid.
+     * @throws \InvalidArgumentException if the $targetPath specified is invalid.
      * @throws \RuntimeException on any error during the move operation, or on
      *     the second or subsequent call to the method.
      */
diff --git a/web/vendor/psr/http-message/src/UriInterface.php b/web/vendor/psr/http-message/src/UriInterface.php
index 1ff5bf01d..9d7ab9eae 100644
--- a/web/vendor/psr/http-message/src/UriInterface.php
+++ b/web/vendor/psr/http-message/src/UriInterface.php
@@ -185,7 +185,7 @@ interface UriInterface
      * An empty scheme is equivalent to removing the scheme.
      *
      * @param string $scheme The scheme to use with the new instance.
-     * @return self A new instance with the specified scheme.
+     * @return static A new instance with the specified scheme.
      * @throws \InvalidArgumentException for invalid or unsupported schemes.
      */
     public function withScheme($scheme);
@@ -202,7 +202,7 @@ interface UriInterface
      *
      * @param string $user The user name to use for authority.
      * @param null|string $password The password associated with $user.
-     * @return self A new instance with the specified user information.
+     * @return static A new instance with the specified user information.
      */
     public function withUserInfo($user, $password = null);
 
@@ -215,7 +215,7 @@ interface UriInterface
      * An empty host value is equivalent to removing the host.
      *
      * @param string $host The hostname to use with the new instance.
-     * @return self A new instance with the specified host.
+     * @return static A new instance with the specified host.
      * @throws \InvalidArgumentException for invalid hostnames.
      */
     public function withHost($host);
@@ -234,7 +234,7 @@ interface UriInterface
      *
      * @param null|int $port The port to use with the new instance; a null value
      *     removes the port information.
-     * @return self A new instance with the specified port.
+     * @return static A new instance with the specified port.
      * @throws \InvalidArgumentException for invalid ports.
      */
     public function withPort($port);
@@ -258,7 +258,7 @@ interface UriInterface
      * Implementations ensure the correct encoding as outlined in getPath().
      *
      * @param string $path The path to use with the new instance.
-     * @return self A new instance with the specified path.
+     * @return static A new instance with the specified path.
      * @throws \InvalidArgumentException for invalid paths.
      */
     public function withPath($path);
@@ -275,7 +275,7 @@ interface UriInterface
      * An empty query string value is equivalent to removing the query string.
      *
      * @param string $query The query string to use with the new instance.
-     * @return self A new instance with the specified query string.
+     * @return static A new instance with the specified query string.
      * @throws \InvalidArgumentException for invalid query strings.
      */
     public function withQuery($query);
@@ -292,7 +292,7 @@ interface UriInterface
      * An empty fragment value is equivalent to removing the fragment.
      *
      * @param string $fragment The fragment to use with the new instance.
-     * @return self A new instance with the specified fragment.
+     * @return static A new instance with the specified fragment.
      */
     public function withFragment($fragment);
 
diff --git a/web/vendor/psr/log/Psr/Log/AbstractLogger.php b/web/vendor/psr/log/Psr/Log/AbstractLogger.php
index 00f903452..90e721af2 100644
--- a/web/vendor/psr/log/Psr/Log/AbstractLogger.php
+++ b/web/vendor/psr/log/Psr/Log/AbstractLogger.php
@@ -15,8 +15,9 @@ abstract class AbstractLogger implements LoggerInterface
      * System is unusable.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function emergency($message, array $context = array())
     {
@@ -30,8 +31,9 @@ abstract class AbstractLogger implements LoggerInterface
      * trigger the SMS alerts and wake you up.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function alert($message, array $context = array())
     {
@@ -44,8 +46,9 @@ abstract class AbstractLogger implements LoggerInterface
      * Example: Application component unavailable, unexpected exception.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function critical($message, array $context = array())
     {
@@ -57,8 +60,9 @@ abstract class AbstractLogger implements LoggerInterface
      * be logged and monitored.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function error($message, array $context = array())
     {
@@ -72,8 +76,9 @@ abstract class AbstractLogger implements LoggerInterface
      * that are not necessarily wrong.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function warning($message, array $context = array())
     {
@@ -84,8 +89,9 @@ abstract class AbstractLogger implements LoggerInterface
      * Normal but significant events.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function notice($message, array $context = array())
     {
@@ -98,8 +104,9 @@ abstract class AbstractLogger implements LoggerInterface
      * Example: User logs in, SQL logs.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function info($message, array $context = array())
     {
@@ -110,8 +117,9 @@ abstract class AbstractLogger implements LoggerInterface
      * Detailed debug information.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function debug($message, array $context = array())
     {
diff --git a/web/vendor/psr/log/Psr/Log/LogLevel.php b/web/vendor/psr/log/Psr/Log/LogLevel.php
index e32c151cb..9cebcace6 100644
--- a/web/vendor/psr/log/Psr/Log/LogLevel.php
+++ b/web/vendor/psr/log/Psr/Log/LogLevel.php
@@ -3,16 +3,16 @@
 namespace Psr\Log;
 
 /**
- * Describes log levels
+ * Describes log levels.
  */
 class LogLevel
 {
     const EMERGENCY = 'emergency';
-    const ALERT = 'alert';
-    const CRITICAL = 'critical';
-    const ERROR = 'error';
-    const WARNING = 'warning';
-    const NOTICE = 'notice';
-    const INFO = 'info';
-    const DEBUG = 'debug';
+    const ALERT     = 'alert';
+    const CRITICAL  = 'critical';
+    const ERROR     = 'error';
+    const WARNING   = 'warning';
+    const NOTICE    = 'notice';
+    const INFO      = 'info';
+    const DEBUG     = 'debug';
 }
diff --git a/web/vendor/psr/log/Psr/Log/LoggerAwareInterface.php b/web/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
index 2eebc4ebd..4d64f4786 100644
--- a/web/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
+++ b/web/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
@@ -3,15 +3,16 @@
 namespace Psr\Log;
 
 /**
- * Describes a logger-aware instance
+ * Describes a logger-aware instance.
  */
 interface LoggerAwareInterface
 {
     /**
-     * Sets a logger instance on the object
+     * Sets a logger instance on the object.
      *
      * @param LoggerInterface $logger
-     * @return null
+     *
+     * @return void
      */
     public function setLogger(LoggerInterface $logger);
 }
diff --git a/web/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/web/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
index f087a3dac..639f79bda 100644
--- a/web/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ b/web/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
@@ -7,12 +7,16 @@ namespace Psr\Log;
  */
 trait LoggerAwareTrait
 {
-    /** @var LoggerInterface */
+    /**
+     * The logger instance.
+     *
+     * @var LoggerInterface
+     */
     protected $logger;
 
     /**
      * Sets a logger.
-     * 
+     *
      * @param LoggerInterface $logger
      */
     public function setLogger(LoggerInterface $logger)
diff --git a/web/vendor/psr/log/Psr/Log/LoggerInterface.php b/web/vendor/psr/log/Psr/Log/LoggerInterface.php
index 476bb962a..5ea72438b 100644
--- a/web/vendor/psr/log/Psr/Log/LoggerInterface.php
+++ b/web/vendor/psr/log/Psr/Log/LoggerInterface.php
@@ -3,14 +3,14 @@
 namespace Psr\Log;
 
 /**
- * Describes a logger instance
+ * Describes a logger instance.
  *
  * The message MUST be a string or object implementing __toString().
  *
  * The message MAY contain placeholders in the form: {foo} where foo
  * will be replaced by the context data in key "foo".
  *
- * The context array can contain arbitrary data, the only assumption that
+ * The context array can contain arbitrary data. The only assumption that
  * can be made by implementors is that if an Exception instance is given
  * to produce a stack trace, it MUST be in a key named "exception".
  *
@@ -23,8 +23,9 @@ interface LoggerInterface
      * System is unusable.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function emergency($message, array $context = array());
 
@@ -35,8 +36,9 @@ interface LoggerInterface
      * trigger the SMS alerts and wake you up.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function alert($message, array $context = array());
 
@@ -46,8 +48,9 @@ interface LoggerInterface
      * Example: Application component unavailable, unexpected exception.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function critical($message, array $context = array());
 
@@ -56,8 +59,9 @@ interface LoggerInterface
      * be logged and monitored.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function error($message, array $context = array());
 
@@ -68,8 +72,9 @@ interface LoggerInterface
      * that are not necessarily wrong.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function warning($message, array $context = array());
 
@@ -77,8 +82,9 @@ interface LoggerInterface
      * Normal but significant events.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function notice($message, array $context = array());
 
@@ -88,8 +94,9 @@ interface LoggerInterface
      * Example: User logs in, SQL logs.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function info($message, array $context = array());
 
@@ -97,18 +104,20 @@ interface LoggerInterface
      * Detailed debug information.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function debug($message, array $context = array());
 
     /**
      * Logs with an arbitrary level.
      *
-     * @param mixed $level
+     * @param mixed  $level
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function log($level, $message, array $context = array());
 }
diff --git a/web/vendor/psr/log/Psr/Log/LoggerTrait.php b/web/vendor/psr/log/Psr/Log/LoggerTrait.php
index 591249600..867225df1 100644
--- a/web/vendor/psr/log/Psr/Log/LoggerTrait.php
+++ b/web/vendor/psr/log/Psr/Log/LoggerTrait.php
@@ -6,8 +6,8 @@ namespace Psr\Log;
  * This is a simple Logger trait that classes unable to extend AbstractLogger
  * (because they extend another class, etc) can include.
  *
- * It simply delegates all log-level-specific methods to the `log` method to 
- * reduce boilerplate code that a simple Logger that does the same thing with 
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
  * messages regardless of the error level has to implement.
  */
 trait LoggerTrait
@@ -16,8 +16,9 @@ trait LoggerTrait
      * System is unusable.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function emergency($message, array $context = array())
     {
@@ -31,8 +32,9 @@ trait LoggerTrait
      * trigger the SMS alerts and wake you up.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function alert($message, array $context = array())
     {
@@ -45,8 +47,9 @@ trait LoggerTrait
      * Example: Application component unavailable, unexpected exception.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function critical($message, array $context = array())
     {
@@ -58,8 +61,9 @@ trait LoggerTrait
      * be logged and monitored.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function error($message, array $context = array())
     {
@@ -73,8 +77,9 @@ trait LoggerTrait
      * that are not necessarily wrong.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function warning($message, array $context = array())
     {
@@ -85,8 +90,9 @@ trait LoggerTrait
      * Normal but significant events.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function notice($message, array $context = array())
     {
@@ -99,8 +105,9 @@ trait LoggerTrait
      * Example: User logs in, SQL logs.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function info($message, array $context = array())
     {
@@ -111,8 +118,9 @@ trait LoggerTrait
      * Detailed debug information.
      *
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function debug($message, array $context = array())
     {
@@ -122,10 +130,11 @@ trait LoggerTrait
     /**
      * Logs with an arbitrary level.
      *
-     * @param mixed $level
+     * @param mixed  $level
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     abstract public function log($level, $message, array $context = array());
 }
diff --git a/web/vendor/psr/log/Psr/Log/NullLogger.php b/web/vendor/psr/log/Psr/Log/NullLogger.php
index 553a3c593..d8cd682c8 100644
--- a/web/vendor/psr/log/Psr/Log/NullLogger.php
+++ b/web/vendor/psr/log/Psr/Log/NullLogger.php
@@ -3,7 +3,7 @@
 namespace Psr\Log;
 
 /**
- * This Logger can be used to avoid conditional log calls
+ * This Logger can be used to avoid conditional log calls.
  *
  * Logging should always be optional, and if no logger is provided to your
  * library creating a NullLogger instance to have something to throw logs at
@@ -15,10 +15,11 @@ class NullLogger extends AbstractLogger
     /**
      * Logs with an arbitrary level.
      *
-     * @param mixed $level
+     * @param mixed  $level
      * @param string $message
-     * @param array $context
-     * @return null
+     * @param array  $context
+     *
+     * @return void
      */
     public function log($level, $message, array $context = array())
     {
diff --git a/web/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/web/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
index a93281511..a0391a52b 100644
--- a/web/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
+++ b/web/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
@@ -2,28 +2,32 @@
 
 namespace Psr\Log\Test;
 
+use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
 /**
- * Provides a base test class for ensuring compliance with the LoggerInterface
+ * Provides a base test class for ensuring compliance with the LoggerInterface.
  *
- * Implementors can extend the class and implement abstract methods to run this as part of their test suite
+ * Implementors can extend the class and implement abstract methods to run this
+ * as part of their test suite.
  */
 abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @return LoggerInterface
      */
-    abstract function getLogger();
+    abstract public function getLogger();
 
     /**
-     * This must return the log messages in order with a simple formatting: "<LOG LEVEL> <MESSAGE>"
+     * This must return the log messages in order.
      *
-     * Example ->error('Foo') would yield "error Foo"
+     * The simple formatting of the messages is: "<LOG LEVEL> <MESSAGE>".
+     *
+     * Example ->error('Foo') would yield "error Foo".
      *
      * @return string[]
      */
-    abstract function getLogs();
+    abstract public function getLogs();
 
     public function testImplements()
     {
@@ -61,7 +65,7 @@ abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException Psr\Log\InvalidArgumentException
+     * @expectedException \Psr\Log\InvalidArgumentException
      */
     public function testThrowsOnInvalidLevel()
     {
@@ -80,12 +84,19 @@ abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
 
     public function testObjectCastToString()
     {
-        $dummy = $this->getMock('Psr\Log\Test\DummyTest', array('__toString'));
+        if (method_exists($this, 'createPartialMock')) {
+            $dummy = $this->createPartialMock('Psr\Log\Test\DummyTest', array('__toString'));
+        } else {
+            $dummy = $this->getMock('Psr\Log\Test\DummyTest', array('__toString'));
+        }
         $dummy->expects($this->once())
             ->method('__toString')
             ->will($this->returnValue('DUMMY'));
 
         $this->getLogger()->warning($dummy);
+
+        $expected = array('warning DUMMY');
+        $this->assertEquals($expected, $this->getLogs());
     }
 
     public function testContextCanContainAnything()
@@ -102,15 +113,28 @@ abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
         );
 
         $this->getLogger()->warning('Crazy context data', $context);
+
+        $expected = array('warning Crazy context data');
+        $this->assertEquals($expected, $this->getLogs());
     }
 
     public function testContextExceptionKeyCanBeExceptionOrOtherValues()
     {
-        $this->getLogger()->warning('Random message', array('exception' => 'oops'));
-        $this->getLogger()->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
+        $logger = $this->getLogger();
+        $logger->warning('Random message', array('exception' => 'oops'));
+        $logger->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
+
+        $expected = array(
+            'warning Random message',
+            'critical Uncaught Exception!'
+        );
+        $this->assertEquals($expected, $this->getLogs());
     }
 }
 
 class DummyTest
 {
-}
\ No newline at end of file
+    public function __toString()
+    {
+    }
+}
diff --git a/web/vendor/psr/log/composer.json b/web/vendor/psr/log/composer.json
index 6bdcc2194..87934d707 100644
--- a/web/vendor/psr/log/composer.json
+++ b/web/vendor/psr/log/composer.json
@@ -2,6 +2,7 @@
     "name": "psr/log",
     "description": "Common interface for logging libraries",
     "keywords": ["psr", "psr-3", "log"],
+    "homepage": "https://github.com/php-fig/log",
     "license": "MIT",
     "authors": [
         {
@@ -9,9 +10,17 @@
             "homepage": "http://www.php-fig.org/"
         }
     ],
+    "require": {
+        "php": ">=5.3.0"
+    },
     "autoload": {
-        "psr-0": {
-            "Psr\\Log\\": ""
+        "psr-4": {
+            "Psr\\Log\\": "Psr/Log/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
         }
     }
 }
diff --git a/web/vendor/symfony/class-loader/composer.json b/web/vendor/symfony/class-loader/composer.json
index 7acbeafda..6f306d971 100644
--- a/web/vendor/symfony/class-loader/composer.json
+++ b/web/vendor/symfony/class-loader/composer.json
@@ -21,7 +21,7 @@
         "symfony/polyfill-apcu": "~1.1"
     },
     "require-dev": {
-        "symfony/finder": "~2.0,>=2.0.5|~3.0.0"
+        "symfony/finder": "^2.0.5|~3.0.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\ClassLoader\\": "" },
diff --git a/web/vendor/symfony/console/Application.php b/web/vendor/symfony/console/Application.php
index bd340d307..a72875d7b 100644
--- a/web/vendor/symfony/console/Application.php
+++ b/web/vendor/symfony/console/Application.php
@@ -14,6 +14,7 @@ namespace Symfony\Component\Console;
 use Symfony\Component\Console\Descriptor\TextDescriptor;
 use Symfony\Component\Console\Descriptor\XmlDescriptor;
 use Symfony\Component\Console\Exception\ExceptionInterface;
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\DebugFormatterHelper;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Console\Helper\QuestionHelper;
@@ -652,12 +653,11 @@ class Application
             if (defined('HHVM_VERSION') && $width > 1 << 31) {
                 $width = 1 << 31;
             }
-            $formatter = $output->getFormatter();
             $lines = array();
             foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
                 foreach ($this->splitStringByWidth($line, $width - 4) as $line) {
                     // pre-format lines to get the right string length
-                    $lineLength = $this->stringWidth(preg_replace('/\[[^m]*m/', '', $formatter->format($line))) + 4;
+                    $lineLength = $this->stringWidth($line) + 4;
                     $lines[] = array($line, $lineLength);
 
                     $len = max($lineLength, $len);
@@ -665,15 +665,15 @@ class Application
             }
 
             $messages = array();
-            $messages[] = $emptyLine = $formatter->format(sprintf('<error>%s</error>', str_repeat(' ', $len)));
-            $messages[] = $formatter->format(sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $this->stringWidth($title)))));
+            $messages[] = $emptyLine = sprintf('<error>%s</error>', str_repeat(' ', $len));
+            $messages[] = sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $this->stringWidth($title))));
             foreach ($lines as $line) {
-                $messages[] = $formatter->format(sprintf('<error>  %s  %s</error>', $line[0], str_repeat(' ', $len - $line[1])));
+                $messages[] = sprintf('<error>  %s  %s</error>', OutputFormatter::escape($line[0]), str_repeat(' ', $len - $line[1]));
             }
             $messages[] = $emptyLine;
             $messages[] = '';
 
-            $output->writeln($messages, OutputInterface::OUTPUT_RAW | OutputInterface::VERBOSITY_QUIET);
+            $output->writeln($messages, OutputInterface::VERBOSITY_QUIET);
 
             if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
                 $output->writeln('<comment>Exception trace:</comment>', OutputInterface::VERBOSITY_QUIET);
diff --git a/web/vendor/symfony/console/Helper/Helper.php b/web/vendor/symfony/console/Helper/Helper.php
index 9c538d1a7..4fb176527 100644
--- a/web/vendor/symfony/console/Helper/Helper.php
+++ b/web/vendor/symfony/console/Helper/Helper.php
@@ -105,6 +105,11 @@ abstract class Helper implements HelperInterface
     }
 
     public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, $string)
+    {
+        return self::strlen(self::removeDecoration($formatter, $string));
+    }
+
+    public static function removeDecoration(OutputFormatterInterface $formatter, $string)
     {
         $isDecorated = $formatter->isDecorated();
         $formatter->setDecorated(false);
@@ -114,6 +119,6 @@ abstract class Helper implements HelperInterface
         $string = preg_replace("/\033\[[^m]*m/", '', $string);
         $formatter->setDecorated($isDecorated);
 
-        return self::strlen($string);
+        return $string;
     }
 }
diff --git a/web/vendor/symfony/console/Helper/QuestionHelper.php b/web/vendor/symfony/console/Helper/QuestionHelper.php
index 4b4e1a63f..8998f7b0f 100644
--- a/web/vendor/symfony/console/Helper/QuestionHelper.php
+++ b/web/vendor/symfony/console/Helper/QuestionHelper.php
@@ -38,7 +38,7 @@ class QuestionHelper extends Helper
      * @param OutputInterface $output   An OutputInterface instance
      * @param Question        $question The question to ask
      *
-     * @return string The user answer
+     * @return mixed The user answer
      *
      * @throws RuntimeException If there is no data to read in the input stream
      */
@@ -384,7 +384,7 @@ class QuestionHelper extends Helper
      * @param OutputInterface $output      An Output instance
      * @param Question        $question    A Question instance
      *
-     * @return string The validated response
+     * @return mixed The validated response
      *
      * @throws \Exception In case the max number of attempts has been reached and no valid response has been given
      */
diff --git a/web/vendor/symfony/console/Helper/Table.php b/web/vendor/symfony/console/Helper/Table.php
index d622294ed..0fe89f7ec 100644
--- a/web/vendor/symfony/console/Helper/Table.php
+++ b/web/vendor/symfony/console/Helper/Table.php
@@ -387,7 +387,7 @@ class Table
                 if (!strstr($cell, "\n")) {
                     continue;
                 }
-                $lines = explode("\n", $cell);
+                $lines = explode("\n", str_replace("\n", "<fg=default;bg=default>\n</>", $cell));
                 foreach ($lines as $lineKey => $line) {
                     if ($cell instanceof TableCell) {
                         $line = new TableCell($line, array('colspan' => $cell->getColspan()));
@@ -428,7 +428,7 @@ class Table
                 $nbLines = $cell->getRowspan() - 1;
                 $lines = array($cell);
                 if (strstr($cell, "\n")) {
-                    $lines = explode("\n", $cell);
+                    $lines = explode("\n", str_replace("\n", "<fg=default;bg=default>\n</>", $cell));
                     $nbLines = count($lines) > $nbLines ? substr_count($cell, "\n") : $nbLines;
 
                     $rows[$line][$column] = new TableCell($lines[0], array('colspan' => $cell->getColspan()));
@@ -440,6 +440,9 @@ class Table
                 foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {
                     $value = isset($lines[$unmergedRowKey - $line]) ? $lines[$unmergedRowKey - $line] : '';
                     $unmergedRows[$unmergedRowKey][$column] = new TableCell($value, array('colspan' => $cell->getColspan()));
+                    if ($nbLines === $unmergedRowKey - $line) {
+                        break;
+                    }
                 }
             }
         }
@@ -560,9 +563,10 @@ class Table
 
                 foreach ($row as $i => $cell) {
                     if ($cell instanceof TableCell) {
-                        $textLength = strlen($cell);
+                        $textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
+                        $textLength = Helper::strlen($textContent);
                         if ($textLength > 0) {
-                            $contentColumns = str_split($cell, ceil($textLength / $cell->getColspan()));
+                            $contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
                             foreach ($contentColumns as $position => $content) {
                                 $row[$i + $position] = $content;
                             }
diff --git a/web/vendor/symfony/console/Helper/TableCell.php b/web/vendor/symfony/console/Helper/TableCell.php
index 69442d424..a3064fc09 100644
--- a/web/vendor/symfony/console/Helper/TableCell.php
+++ b/web/vendor/symfony/console/Helper/TableCell.php
@@ -37,6 +37,10 @@ class TableCell
      */
     public function __construct($value = '', array $options = array())
     {
+        if (is_numeric($value) && !is_string($value)) {
+            $value = (string) $value;
+        }
+
         $this->value = $value;
 
         // check option names
diff --git a/web/vendor/symfony/console/Output/BufferedOutput.php b/web/vendor/symfony/console/Output/BufferedOutput.php
index 5682fc240..205b02f5f 100644
--- a/web/vendor/symfony/console/Output/BufferedOutput.php
+++ b/web/vendor/symfony/console/Output/BufferedOutput.php
@@ -42,7 +42,7 @@ class BufferedOutput extends Output
         $this->buffer .= $message;
 
         if ($newline) {
-            $this->buffer .= "\n";
+            $this->buffer .= PHP_EOL;
         }
     }
 }
diff --git a/web/vendor/symfony/console/Tester/CommandTester.php b/web/vendor/symfony/console/Tester/CommandTester.php
index f95298bc9..609f46a65 100644
--- a/web/vendor/symfony/console/Tester/CommandTester.php
+++ b/web/vendor/symfony/console/Tester/CommandTester.php
@@ -70,9 +70,7 @@ class CommandTester
         }
 
         $this->output = new StreamOutput(fopen('php://memory', 'w', false));
-        if (isset($options['decorated'])) {
-            $this->output->setDecorated($options['decorated']);
-        }
+        $this->output->setDecorated(isset($options['decorated']) ? $options['decorated'] : false);
         if (isset($options['verbosity'])) {
             $this->output->setVerbosity($options['verbosity']);
         }
diff --git a/web/vendor/symfony/console/composer.json b/web/vendor/symfony/console/composer.json
index f0af3f214..35ee7a7b2 100644
--- a/web/vendor/symfony/console/composer.json
+++ b/web/vendor/symfony/console/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.9",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/debug": "~2.7,>=2.7.2|~3.0.0"
+        "symfony/debug": "^2.7.2|~3.0.0"
     },
     "require-dev": {
         "symfony/event-dispatcher": "~2.1|~3.0.0",
diff --git a/web/vendor/symfony/debug/ErrorHandler.php b/web/vendor/symfony/debug/ErrorHandler.php
index d541b83a7..1b7201171 100644
--- a/web/vendor/symfony/debug/ErrorHandler.php
+++ b/web/vendor/symfony/debug/ErrorHandler.php
@@ -375,12 +375,10 @@ class ErrorHandler
     /**
      * Handles errors by filtering then logging them according to the configured bit fields.
      *
-     * @param int    $type      One of the E_* constants
+     * @param int    $type    One of the E_* constants
      * @param string $message
      * @param string $file
      * @param int    $line
-     * @param array  $context
-     * @param array  $backtrace
      *
      * @return bool Returns false when no handling happens so that the PHP engine can handle the error itself
      *
@@ -388,7 +386,7 @@ class ErrorHandler
      *
      * @internal
      */
-    public function handleError($type, $message, $file, $line, array $context, array $backtrace = null)
+    public function handleError($type, $message, $file, $line)
     {
         $level = error_reporting() | E_RECOVERABLE_ERROR | E_USER_ERROR | E_DEPRECATED | E_USER_DEPRECATED;
         $log = $this->loggedErrors & $type;
@@ -398,8 +396,17 @@ class ErrorHandler
         if (!$type || (!$log && !$throw)) {
             return $type && $log;
         }
+        $scope = $this->scopedErrors & $type;
 
-        if (isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
+        if (4 < $numArgs = func_num_args()) {
+            $context = $scope ? (func_get_arg(4) ?: array()) : array();
+            $backtrace = 5 < $numArgs ? func_get_arg(5) : null; // defined on HHVM
+        } else {
+            $context = array();
+            $backtrace = null;
+        }
+
+        if (isset($context['GLOBALS']) && $scope) {
             $e = $context;                  // Whatever the signature of the method,
             unset($e['GLOBALS'], $context); // $context is always a reference in 5.3
             $context = $e;
@@ -418,7 +425,7 @@ class ErrorHandler
             if (null !== self::$toStringException) {
                 $throw = self::$toStringException;
                 self::$toStringException = null;
-            } elseif (($this->scopedErrors & $type) && class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
+            } elseif ($scope && class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
                 // Checking for class existence is a work around for https://bugs.php.net/42098
                 $throw = new ContextErrorException($this->levels[$type].': '.$message, 0, $type, $file, $line, $context);
             } else {
@@ -490,7 +497,7 @@ class ErrorHandler
         $e = compact('type', 'file', 'line', 'level');
 
         if ($type & $level) {
-            if ($this->scopedErrors & $type) {
+            if ($scope) {
                 $e['scope_vars'] = $context;
                 if ($trace) {
                     $e['stack'] = $backtrace ?: debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
diff --git a/web/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/web/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
index abfe90d79..612bfcaf7 100644
--- a/web/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+++ b/web/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -179,7 +179,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
         );
 
         if ($prefix) {
-            $candidates = array_filter($candidates, function ($candidate) use ($prefix) {return 0 === strpos($candidate, $prefix);});
+            $candidates = array_filter($candidates, function ($candidate) use ($prefix) { return 0 === strpos($candidate, $prefix); });
         }
 
         // We cannot use the autoloader here as most of them use require; but if the class
diff --git a/web/vendor/symfony/debug/composer.json b/web/vendor/symfony/debug/composer.json
index e739f7560..acf0ecd8c 100644
--- a/web/vendor/symfony/debug/composer.json
+++ b/web/vendor/symfony/debug/composer.json
@@ -24,7 +24,7 @@
     },
     "require-dev": {
         "symfony/class-loader": "~2.2|~3.0.0",
-        "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0"
+        "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Debug\\": "" },
diff --git a/web/vendor/symfony/dependency-injection/Compiler/AutowirePass.php b/web/vendor/symfony/dependency-injection/Compiler/AutowirePass.php
index cd5b61b29..07919b74d 100644
--- a/web/vendor/symfony/dependency-injection/Compiler/AutowirePass.php
+++ b/web/vendor/symfony/dependency-injection/Compiler/AutowirePass.php
@@ -28,6 +28,7 @@ class AutowirePass implements CompilerPassInterface
     private $definedTypes = array();
     private $types;
     private $notGuessableTypes = array();
+    private $autowired = array();
 
     /**
      * {@inheritdoc}
@@ -56,6 +57,7 @@ class AutowirePass implements CompilerPassInterface
         $this->definedTypes = array();
         $this->types = null;
         $this->notGuessableTypes = array();
+        $this->autowired = array();
 
         if (isset($e)) {
             throw $e;
@@ -72,6 +74,10 @@ class AutowirePass implements CompilerPassInterface
      */
     private function completeDefinition($id, Definition $definition)
     {
+        if ($definition->getFactory() || $definition->getFactoryClass(false) || $definition->getFactoryService(false)) {
+            throw new RuntimeException(sprintf('Service "%s" can use either autowiring or a factory, not both.', $id));
+        }
+
         if (!$reflectionClass = $this->getReflectionClass($id, $definition)) {
             return;
         }
@@ -81,15 +87,23 @@ class AutowirePass implements CompilerPassInterface
         if (!$constructor = $reflectionClass->getConstructor()) {
             return;
         }
+        $parameters = $constructor->getParameters();
+        if (method_exists('ReflectionMethod', 'isVariadic') && $constructor->isVariadic()) {
+            array_pop($parameters);
+        }
 
         $arguments = $definition->getArguments();
-        foreach ($constructor->getParameters() as $index => $parameter) {
+        foreach ($parameters as $index => $parameter) {
             if (array_key_exists($index, $arguments) && '' !== $arguments[$index]) {
                 continue;
             }
 
             try {
                 if (!$typeHint = $parameter->getClass()) {
+                    if (isset($arguments[$index])) {
+                        continue;
+                    }
+
                     // no default value? Then fail
                     if (!$parameter->isOptional()) {
                         throw new RuntimeException(sprintf('Unable to autowire argument index %d ($%s) for the service "%s". If this is an object, give it a type-hint. Otherwise, specify this argument\'s value explicitly.', $index, $parameter->name, $id));
@@ -101,6 +115,10 @@ class AutowirePass implements CompilerPassInterface
                     continue;
                 }
 
+                if (isset($this->autowired[$typeHint->name])) {
+                    return $this->autowired[$typeHint->name] ? new Reference($this->autowired[$typeHint->name]) : null;
+                }
+
                 if (null === $this->types) {
                     $this->populateAvailableTypes();
                 }
@@ -111,13 +129,14 @@ class AutowirePass implements CompilerPassInterface
                     try {
                         $value = $this->createAutowiredDefinition($typeHint, $id);
                     } catch (RuntimeException $e) {
-                        if ($parameter->allowsNull()) {
-                            $value = null;
-                        } elseif ($parameter->isDefaultValueAvailable()) {
+                        if ($parameter->isDefaultValueAvailable()) {
                             $value = $parameter->getDefaultValue();
+                        } elseif ($parameter->allowsNull()) {
+                            $value = null;
                         } else {
                             throw $e;
                         }
+                        $this->autowired[$typeHint->name] = false;
                     }
                 }
             } catch (\ReflectionException $e) {
@@ -133,6 +152,16 @@ class AutowirePass implements CompilerPassInterface
             $arguments[$index] = $value;
         }
 
+        if ($parameters && !isset($arguments[++$index])) {
+            while (0 <= --$index) {
+                $parameter = $parameters[$index];
+                if (!$parameter->isDefaultValueAvailable() || $parameter->getDefaultValue() !== $arguments[$index]) {
+                    break;
+                }
+                unset($arguments[$index]);
+            }
+        }
+
         // it's possible index 1 was set, then index 0, then 2, etc
         // make sure that we re-order so they're injected as expected
         ksort($arguments);
@@ -167,6 +196,7 @@ class AutowirePass implements CompilerPassInterface
         foreach ($definition->getAutowiringTypes() as $type) {
             $this->definedTypes[$type] = true;
             $this->types[$type] = $id;
+            unset($this->notGuessableTypes[$type]);
         }
 
         if (!$reflectionClass = $this->getReflectionClass($id, $definition)) {
@@ -236,13 +266,11 @@ class AutowirePass implements CompilerPassInterface
             throw new RuntimeException(sprintf('Unable to autowire argument of type "%s" for the service "%s". No services were found matching this %s and it cannot be auto-registered.', $typeHint->name, $id, $classOrInterface));
         }
 
-        $argumentId = sprintf('autowired.%s', $typeHint->name);
+        $this->autowired[$typeHint->name] = $argumentId = sprintf('autowired.%s', $typeHint->name);
 
         $argumentDefinition = $this->container->register($argumentId, $typeHint->name);
         $argumentDefinition->setPublic(false);
 
-        $this->populateAvailableType($argumentId, $argumentDefinition);
-
         try {
             $this->completeDefinition($argumentId, $argumentDefinition);
         } catch (RuntimeException $e) {
diff --git a/web/vendor/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php b/web/vendor/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php
index 156bcc0c3..f39a89af2 100644
--- a/web/vendor/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php
+++ b/web/vendor/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php
@@ -60,7 +60,6 @@ class CheckCircularReferencesPass implements CompilerPassInterface
             $id = $node->getId();
 
             if (empty($this->checkedNodes[$id])) {
-
                 // don't check circular dependencies for lazy services
                 if (!$node->getValue() || !$node->getValue()->isLazy()) {
                     $searchKey = array_search($id, $this->currentPath);
diff --git a/web/vendor/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php b/web/vendor/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php
index f9e602416..9434ac70b 100644
--- a/web/vendor/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php
+++ b/web/vendor/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 
 /**
@@ -47,6 +48,9 @@ class MergeExtensionConfigurationPass implements CompilerPassInterface
             $tmpContainer = new ContainerBuilder($container->getParameterBag());
             $tmpContainer->setResourceTracking($container->isTrackingResources());
             $tmpContainer->addObjectResource($extension);
+            if ($extension instanceof ConfigurationExtensionInterface && null !== $configuration = $extension->getConfiguration($config, $tmpContainer)) {
+                $tmpContainer->addObjectResource($configuration);
+            }
 
             foreach ($exprLangProviders as $provider) {
                 $tmpContainer->addExpressionLanguageProvider($provider);
diff --git a/web/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php b/web/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php
index 5c58656a5..b7210ee6e 100644
--- a/web/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ b/web/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -51,7 +51,7 @@ class ReplaceAliasByActualDefinitionPass implements CompilerPassInterface
             if (isset($replacements[$targetId])) {
                 $container->setAlias($definitionId, $replacements[$targetId]);
             }
-            // No neeed to process the same target twice
+            // No need to process the same target twice
             if (isset($seenAliasTargets[$targetId])) {
                 continue;
             }
diff --git a/web/vendor/symfony/dependency-injection/ContainerBuilder.php b/web/vendor/symfony/dependency-injection/ContainerBuilder.php
index ede06d6cc..3d1fa8b7b 100644
--- a/web/vendor/symfony/dependency-injection/ContainerBuilder.php
+++ b/web/vendor/symfony/dependency-injection/ContainerBuilder.php
@@ -26,6 +26,7 @@ use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\Resource\ResourceInterface;
 use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\InstantiatorInterface;
 use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
 
@@ -73,7 +74,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      */
     private $compiler;
 
-    private $trackResources = true;
+    private $trackResources;
 
     /**
      * @var InstantiatorInterface|null
@@ -90,6 +91,13 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      */
     private $expressionLanguageProviders = array();
 
+    public function __construct(ParameterBagInterface $parameterBag = null)
+    {
+        parent::__construct($parameterBag);
+
+        $this->trackResources = interface_exists('Symfony\Component\Config\Resource\ResourceInterface');
+    }
+
     /**
      * @var string[] with tag names used by findTaggedServiceIds
      */
diff --git a/web/vendor/symfony/dependency-injection/Definition.php b/web/vendor/symfony/dependency-injection/Definition.php
index a002df287..1b3a1c24e 100644
--- a/web/vendor/symfony/dependency-injection/Definition.php
+++ b/web/vendor/symfony/dependency-injection/Definition.php
@@ -164,7 +164,7 @@ class Definition
     }
 
     /**
-     * Gets the service that decorates this service.
+     * Gets the service that this service is decorating.
      *
      * @return null|array An array composed of the decorated service id, the new id for it and the priority of decoration, null if no service is decorated
      */
@@ -308,6 +308,10 @@ class Definition
      */
     public function replaceArgument($index, $argument)
     {
+        if (0 === count($this->arguments)) {
+            throw new OutOfBoundsException('Cannot replace arguments if none have been configured yet.');
+        }
+
         if ($index < 0 || $index > count($this->arguments) - 1) {
             throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d].', $index, count($this->arguments) - 1));
         }
diff --git a/web/vendor/symfony/dependency-injection/Dumper/PhpDumper.php b/web/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
index 2ef29aa3c..888e14439 100644
--- a/web/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
+++ b/web/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
@@ -628,7 +628,7 @@ EOF;
         }
 
         if ($definition->isAutowired()) {
-            $doc = <<<EOF
+            $doc .= <<<EOF
 
      *
      * This service is autowired.
@@ -1029,11 +1029,7 @@ EOF;
     private function addAliases()
     {
         if (!$aliases = $this->container->getAliases()) {
-            if ($this->container->isFrozen()) {
-                return "\n        \$this->aliases = array();\n";
-            } else {
-                return '';
-            }
+            return $this->container->isFrozen() ? "\n        \$this->aliases = array();\n" : '';
         }
 
         $code = "        \$this->aliases = array(\n";
@@ -1402,9 +1398,9 @@ EOF;
                     $service = $this->dumpValue($value->getFactoryService(false));
 
                     return sprintf('%s->%s(%s)', 0 === strpos($service, '$') ? sprintf('$this->get(%s)', $service) : $this->getServiceCall($value->getFactoryService(false)), $value->getFactoryMethod(false), implode(', ', $arguments));
-                } else {
-                    throw new RuntimeException('Cannot dump definitions which have factory method without factory service or factory class.');
                 }
+
+                throw new RuntimeException('Cannot dump definitions which have factory method without factory service or factory class.');
             }
 
             $class = $value->getClass();
@@ -1442,9 +1438,9 @@ EOF;
             }
         } elseif (is_object($value) || is_resource($value)) {
             throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
-        } else {
-            return $this->export($value);
         }
+
+        return $this->export($value);
     }
 
     /**
@@ -1513,13 +1509,13 @@ EOF;
 
         if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
             return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
-        } else {
-            if ($this->container->hasAlias($id)) {
-                $id = (string) $this->container->getAlias($id);
-            }
-
-            return sprintf('$this->get(\'%s\')', $id);
         }
+
+        if ($this->container->hasAlias($id)) {
+            $id = (string) $this->container->getAlias($id);
+        }
+
+        return sprintf('$this->get(\'%s\')', $id);
     }
 
     /**
diff --git a/web/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php b/web/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
index dbfc0524d..b527dec4f 100644
--- a/web/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
+++ b/web/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
@@ -85,7 +85,7 @@ class YamlFileLoader extends FileLoader
      * @param array  $content
      * @param string $file
      */
-    private function parseImports($content, $file)
+    private function parseImports(array $content, $file)
     {
         if (!isset($content['imports'])) {
             return;
@@ -112,7 +112,7 @@ class YamlFileLoader extends FileLoader
      * @param array  $content
      * @param string $file
      */
-    private function parseDefinitions($content, $file)
+    private function parseDefinitions(array $content, $file)
     {
         if (!isset($content['services'])) {
             return;
@@ -130,9 +130,9 @@ class YamlFileLoader extends FileLoader
     /**
      * Parses a definition.
      *
-     * @param string $id
-     * @param array  $service
-     * @param string $file
+     * @param string       $id
+     * @param array|string $service
+     * @param string       $file
      *
      * @throws InvalidArgumentException When tags are invalid
      */
@@ -353,7 +353,7 @@ class YamlFileLoader extends FileLoader
         }
 
         if (!file_exists($file)) {
-            throw new InvalidArgumentException(sprintf('The service file "%s" is not valid.', $file));
+            throw new InvalidArgumentException(sprintf('The file "%s" does not exist.', $file));
         }
 
         if (null === $this->yamlParser) {
@@ -454,7 +454,7 @@ class YamlFileLoader extends FileLoader
      *
      * @param array $content
      */
-    private function loadFromExtensions($content)
+    private function loadFromExtensions(array $content)
     {
         foreach ($content as $namespace => $values) {
             if (in_array($namespace, array('imports', 'parameters', 'services'))) {
diff --git a/web/vendor/symfony/dom-crawler/Crawler.php b/web/vendor/symfony/dom-crawler/Crawler.php
index 8c5d2eaf5..b1881dee2 100644
--- a/web/vendor/symfony/dom-crawler/Crawler.php
+++ b/web/vendor/symfony/dom-crawler/Crawler.php
@@ -18,7 +18,7 @@ use Symfony\Component\CssSelector\CssSelectorConverter;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Crawler extends \SplObjectStorage
+class Crawler implements \Countable, \IteratorAggregate
 {
     /**
      * @var string The current URI
@@ -45,6 +45,11 @@ class Crawler extends \SplObjectStorage
      */
     private $document;
 
+    /**
+     * @var \DOMElement[]
+     */
+    private $nodes = array();
+
     /**
      * Whether the Crawler contains HTML or XML content (used when converting CSS to XPath).
      *
@@ -72,7 +77,7 @@ class Crawler extends \SplObjectStorage
      */
     public function clear()
     {
-        parent::removeAll($this);
+        $this->nodes = array();
         $this->document = null;
     }
 
@@ -294,25 +299,19 @@ class Crawler extends \SplObjectStorage
         }
 
         if (null !== $this->document && $this->document !== $node->ownerDocument) {
-            @trigger_error('Attaching DOM nodes from multiple documents in a Crawler is deprecated as of 2.8 and will be forbidden in 3.0.', E_USER_DEPRECATED);
+            throw new \InvalidArgumentException('Attaching DOM nodes from multiple documents in the same crawler is forbidden.');
         }
 
         if (null === $this->document) {
             $this->document = $node->ownerDocument;
         }
 
-        parent::attach($node);
-    }
+        // Don't add duplicate nodes in the Crawler
+        if (in_array($node, $this->nodes, true)) {
+            return;
+        }
 
-    // Serializing and unserializing a crawler creates DOM objects in a corrupted state. DOM elements are not properly serializable.
-    public function unserialize($serialized)
-    {
-        throw new \BadMethodCallException('A Crawler cannot be serialized.');
-    }
-
-    public function serialize()
-    {
-        throw new \BadMethodCallException('A Crawler cannot be serialized.');
+        $this->nodes[] = $node;
     }
 
     /**
@@ -320,14 +319,12 @@ class Crawler extends \SplObjectStorage
      *
      * @param int $position The position
      *
-     * @return self
+     * @return Crawler A new instance of the Crawler with the selected node, or an empty Crawler if it does not exist
      */
     public function eq($position)
     {
-        foreach ($this as $i => $node) {
-            if ($i == $position) {
-                return $this->createSubCrawler($node);
-            }
+        if (isset($this->nodes[$position])) {
+            return $this->createSubCrawler($this->nodes[$position]);
         }
 
         return $this->createSubCrawler(null);
@@ -352,7 +349,7 @@ class Crawler extends \SplObjectStorage
     public function each(\Closure $closure)
     {
         $data = array();
-        foreach ($this as $i => $node) {
+        foreach ($this->nodes as $i => $node) {
             $data[] = $closure($this->createSubCrawler($node), $i);
         }
 
@@ -365,11 +362,11 @@ class Crawler extends \SplObjectStorage
      * @param int $offset
      * @param int $length
      *
-     * @return self
+     * @return Crawler A Crawler instance with the sliced nodes
      */
-    public function slice($offset = 0, $length = -1)
+    public function slice($offset = 0, $length = null)
     {
-        return $this->createSubCrawler(iterator_to_array(new \LimitIterator($this, $offset, $length)));
+        return $this->createSubCrawler(array_slice($this->nodes, $offset, $length));
     }
 
     /**
@@ -379,12 +376,12 @@ class Crawler extends \SplObjectStorage
      *
      * @param \Closure $closure An anonymous function
      *
-     * @return self
+     * @return Crawler A Crawler instance with the selected nodes
      */
     public function reduce(\Closure $closure)
     {
         $nodes = array();
-        foreach ($this as $i => $node) {
+        foreach ($this->nodes as $i => $node) {
             if (false !== $closure($this->createSubCrawler($node), $i)) {
                 $nodes[] = $node;
             }
@@ -396,7 +393,7 @@ class Crawler extends \SplObjectStorage
     /**
      * Returns the first node of the current selection.
      *
-     * @return self
+     * @return Crawler A Crawler instance with the first selected node
      */
     public function first()
     {
@@ -406,23 +403,23 @@ class Crawler extends \SplObjectStorage
     /**
      * Returns the last node of the current selection.
      *
-     * @return self
+     * @return Crawler A Crawler instance with the last selected node
      */
     public function last()
     {
-        return $this->eq(count($this) - 1);
+        return $this->eq(count($this->nodes) - 1);
     }
 
     /**
      * Returns the siblings nodes of the current selection.
      *
-     * @return self
+     * @return Crawler A Crawler instance with the sibling nodes
      *
      * @throws \InvalidArgumentException When current node is empty
      */
     public function siblings()
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -432,13 +429,13 @@ class Crawler extends \SplObjectStorage
     /**
      * Returns the next siblings nodes of the current selection.
      *
-     * @return self
+     * @return Crawler A Crawler instance with the next sibling nodes
      *
      * @throws \InvalidArgumentException When current node is empty
      */
     public function nextAll()
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -448,13 +445,13 @@ class Crawler extends \SplObjectStorage
     /**
      * Returns the previous sibling nodes of the current selection.
      *
-     * @return self
+     * @return Crawler A Crawler instance with the previous sibling nodes
      *
      * @throws \InvalidArgumentException
      */
     public function previousAll()
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -464,13 +461,13 @@ class Crawler extends \SplObjectStorage
     /**
      * Returns the parents nodes of the current selection.
      *
-     * @return self
+     * @return Crawler A Crawler instance with the parents nodes of the current selection
      *
      * @throws \InvalidArgumentException When current node is empty
      */
     public function parents()
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -489,13 +486,13 @@ class Crawler extends \SplObjectStorage
     /**
      * Returns the children nodes of the current selection.
      *
-     * @return self
+     * @return Crawler A Crawler instance with the children nodes
      *
      * @throws \InvalidArgumentException When current node is empty
      */
     public function children()
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -515,7 +512,7 @@ class Crawler extends \SplObjectStorage
      */
     public function attr($attribute)
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -533,7 +530,7 @@ class Crawler extends \SplObjectStorage
      */
     public function nodeName()
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -549,7 +546,7 @@ class Crawler extends \SplObjectStorage
      */
     public function text()
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -565,7 +562,7 @@ class Crawler extends \SplObjectStorage
      */
     public function html()
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -596,7 +593,7 @@ class Crawler extends \SplObjectStorage
         $count = count($attributes);
 
         $data = array();
-        foreach ($this as $node) {
+        foreach ($this->nodes as $node) {
             $elements = array();
             foreach ($attributes as $attribute) {
                 if ('_text' === $attribute) {
@@ -622,7 +619,7 @@ class Crawler extends \SplObjectStorage
      *
      * @param string $xpath An XPath expression
      *
-     * @return self
+     * @return Crawler A new instance of Crawler with the filtered list of nodes
      */
     public function filterXPath($xpath)
     {
@@ -643,7 +640,7 @@ class Crawler extends \SplObjectStorage
      *
      * @param string $selector A CSS selector
      *
-     * @return self
+     * @return Crawler A new instance of Crawler with the filtered list of nodes
      *
      * @throws \RuntimeException if the CssSelector Component is not available
      */
@@ -664,7 +661,7 @@ class Crawler extends \SplObjectStorage
      *
      * @param string $value The link text
      *
-     * @return self
+     * @return Crawler A new instance of Crawler with the filtered list of nodes
      */
     public function selectLink($value)
     {
@@ -679,7 +676,7 @@ class Crawler extends \SplObjectStorage
      *
      * @param string $value The button text
      *
-     * @return self
+     * @return Crawler A new instance of Crawler with the filtered list of nodes
      */
     public function selectButton($value)
     {
@@ -702,7 +699,7 @@ class Crawler extends \SplObjectStorage
      */
     public function link($method = 'get')
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -725,7 +722,7 @@ class Crawler extends \SplObjectStorage
     public function links()
     {
         $links = array();
-        foreach ($this as $node) {
+        foreach ($this->nodes as $node) {
             if (!$node instanceof \DOMElement) {
                 throw new \InvalidArgumentException(sprintf('The current node list should contain only DOMElement instances, "%s" found.', get_class($node)));
             }
@@ -748,7 +745,7 @@ class Crawler extends \SplObjectStorage
      */
     public function form(array $values = null, $method = null)
     {
-        if (!count($this)) {
+        if (!$this->nodes) {
             throw new \InvalidArgumentException('The current node list is empty.');
         }
 
@@ -830,127 +827,7 @@ class Crawler extends \SplObjectStorage
             }
         }
 
-        return sprintf('concat(%s)', implode(', ', $parts));
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function attach($object, $data = null)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        parent::attach($object, $data);
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function detach($object)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        parent::detach($object);
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function contains($object)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        return parent::contains($object);
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function addAll($storage)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        parent::addAll($storage);
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function removeAll($storage)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        parent::removeAll($storage);
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function removeAllExcept($storage)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        parent::removeAllExcept($storage);
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function getInfo()
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        return parent::getInfo();
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function setInfo($data)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        parent::setInfo($data);
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function offsetExists($object)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        return parent::offsetExists($object);
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function offsetSet($object, $data = null)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        parent::offsetSet($object, $data);
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function offsetUnset($object)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        parent::offsetUnset($object);
-    }
-
-    /**
-     * @deprecated Using the SplObjectStorage API on the Crawler is deprecated as of 2.8 and will be removed in 3.0.
-     */
-    public function offsetGet($object)
-    {
-        $this->triggerDeprecation(__METHOD__);
-
-        return parent::offsetGet($object);
+        return sprintf('concat(%s)', implode($parts, ', '));
     }
 
     /**
@@ -960,7 +837,7 @@ class Crawler extends \SplObjectStorage
      *
      * @param string $xpath
      *
-     * @return self
+     * @return Crawler
      */
     private function filterRelativeXPath($xpath)
     {
@@ -968,7 +845,7 @@ class Crawler extends \SplObjectStorage
 
         $crawler = $this->createSubCrawler(null);
 
-        foreach ($this as $node) {
+        foreach ($this->nodes as $node) {
             $domxpath = $this->createDOMXPath($node->ownerDocument, $prefixes);
             $crawler->add($domxpath->query($xpath, $node));
         }
@@ -990,59 +867,29 @@ class Crawler extends \SplObjectStorage
     {
         $expressions = array();
 
+        $unionPattern = '/\|(?![^\[]*\])/';
         // An expression which will never match to replace expressions which cannot match in the crawler
         // We cannot simply drop
         $nonMatchingExpression = 'a[name() = "b"]';
 
-        $xpathLen = strlen($xpath);
-        $openedBrackets = 0;
-        $startPosition = strspn($xpath, " \t\n\r\0\x0B");
+        // Split any unions into individual expressions.
+        foreach (preg_split($unionPattern, $xpath) as $expression) {
+            $expression = trim($expression);
+            $parenthesis = '';
 
-        for ($i = $startPosition; $i <= $xpathLen; ++$i) {
-            $i += strcspn($xpath, '"\'[]|', $i);
-
-            if ($i < $xpathLen) {
-                switch ($xpath[$i]) {
-                    case '"':
-                    case "'":
-                        if (false === $i = strpos($xpath, $xpath[$i], $i + 1)) {
-                            return $xpath; // The XPath expression is invalid
-                        }
-                        continue 2;
-                    case '[':
-                        ++$openedBrackets;
-                        continue 2;
-                    case ']':
-                        --$openedBrackets;
-                        continue 2;
-                }
-            }
-            if ($openedBrackets) {
-                continue;
+            // If the union is inside some braces, we need to preserve the opening braces and apply
+            // the change only inside it.
+            if (preg_match('/^[\(\s*]+/', $expression, $matches)) {
+                $parenthesis = $matches[0];
+                $expression = substr($expression, strlen($parenthesis));
             }
 
-            if ($startPosition < $xpathLen && '(' === $xpath[$startPosition]) {
-                // If the union is inside some braces, we need to preserve the opening braces and apply
-                // the change only inside it.
-                $j = 1 + strspn($xpath, "( \t\n\r\0\x0B", $startPosition + 1);
-                $parenthesis = substr($xpath, $startPosition, $j);
-                $startPosition += $j;
-            } else {
-                $parenthesis = '';
-            }
-            $expression = rtrim(substr($xpath, $startPosition, $i - $startPosition));
-
-            // BC for Symfony 2.4 and lower were elements were adding in a fake _root parent
-            if (0 === strpos($expression, '/_root/')) {
-                @trigger_error('XPath expressions referencing the fake root node are deprecated since version 2.8 and will be unsupported in 3.0. Please use "./" instead of "/_root/".', E_USER_DEPRECATED);
-
-                $expression = './'.substr($expression, 7);
-            } elseif (0 === strpos($expression, 'self::*/')) {
+            if (0 === strpos($expression, 'self::*/')) {
                 $expression = './'.substr($expression, 8);
             }
 
             // add prefix before absolute element selector
-            if ('' === $expression) {
+            if (empty($expression)) {
                 $expression = $nonMatchingExpression;
             } elseif (0 === strpos($expression, '//')) {
                 $expression = 'descendant-or-self::'.substr($expression, 2);
@@ -1052,15 +899,10 @@ class Crawler extends \SplObjectStorage
                 $expression = 'self::'.substr($expression, 2);
             } elseif (0 === strpos($expression, 'child::')) {
                 $expression = 'self::'.substr($expression, 7);
-            } elseif ('/' === $expression[0] || 0 === strpos($expression, 'self::')) {
-                // the only direct child in Symfony 2.4 and lower is _root, which is already handled previously
-                // so let's drop the expression entirely
-                $expression = $nonMatchingExpression;
-            } elseif ('.' === $expression[0]) {
-                // '.' is the fake root element in Symfony 2.4 and lower, which is excluded from results
+            } elseif ('/' === $expression[0] || '.' === $expression[0] || 0 === strpos($expression, 'self::')) {
                 $expression = $nonMatchingExpression;
             } elseif (0 === strpos($expression, 'descendant::')) {
-                $expression = 'descendant-or-self::'.substr($expression, 12);
+                $expression = 'descendant-or-self::'.substr($expression, strlen('descendant::'));
             } elseif (preg_match('/^(ancestor|ancestor-or-self|attribute|following|following-sibling|namespace|parent|preceding|preceding-sibling)::/', $expression)) {
                 // the fake root has no parent, preceding or following nodes and also no attributes (even no namespace attributes)
                 $expression = $nonMatchingExpression;
@@ -1068,16 +910,9 @@ class Crawler extends \SplObjectStorage
                 $expression = 'self::'.$expression;
             }
             $expressions[] = $parenthesis.$expression;
-
-            if ($i === $xpathLen) {
-                return implode(' | ', $expressions);
-            }
-
-            $i += strspn($xpath, " \t\n\r\0\x0B", $i + 1);
-            $startPosition = $i + 1;
         }
 
-        return $xpath; // The XPath expression is invalid
+        return implode(' | ', $expressions);
     }
 
     /**
@@ -1087,13 +922,27 @@ class Crawler extends \SplObjectStorage
      */
     public function getNode($position)
     {
-        foreach ($this as $i => $node) {
-            if ($i == $position) {
-                return $node;
-            }
+        if (isset($this->nodes[$position])) {
+            return $this->nodes[$position];
         }
     }
 
+    /**
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->nodes);
+    }
+
+    /**
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->nodes);
+    }
+
     /**
      * @param \DOMElement $node
      * @param string      $siblingDir
@@ -1187,23 +1036,4 @@ class Crawler extends \SplObjectStorage
 
         return $crawler;
     }
-
-    private function triggerDeprecation($methodName, $useTrace = false)
-    {
-        if ($useTrace || defined('HHVM_VERSION')) {
-            if (PHP_VERSION_ID >= 50400) {
-                $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
-            } else {
-                $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            }
-
-            // The SplObjectStorage class performs calls to its own methods. These
-            // method calls must not lead to triggered deprecation notices.
-            if (isset($trace[2]['class']) && 'SplObjectStorage' === $trace[2]['class']) {
-                return;
-            }
-        }
-
-        @trigger_error('The '.$methodName.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
-    }
 }
diff --git a/web/vendor/symfony/dom-crawler/Field/ChoiceFormField.php b/web/vendor/symfony/dom-crawler/Field/ChoiceFormField.php
index c479daa75..c429417c2 100644
--- a/web/vendor/symfony/dom-crawler/Field/ChoiceFormField.php
+++ b/web/vendor/symfony/dom-crawler/Field/ChoiceFormField.php
@@ -155,11 +155,11 @@ class ChoiceFormField extends FormField
     /**
      * Adds a choice to the current ones.
      *
+     * This method should only be used internally.
+     *
      * @param \DOMElement $node
      *
      * @throws \LogicException When choice provided is not multiple nor radio
-     *
-     * @internal
      */
     public function addChoice(\DOMElement $node)
     {
diff --git a/web/vendor/symfony/dom-crawler/Form.php b/web/vendor/symfony/dom-crawler/Form.php
index bad1b3493..0390e3fc7 100644
--- a/web/vendor/symfony/dom-crawler/Form.php
+++ b/web/vendor/symfony/dom-crawler/Form.php
@@ -69,7 +69,7 @@ class Form extends Link implements \ArrayAccess
      *
      * @param array $values An array of field values
      *
-     * @return $this
+     * @return Form
      */
     public function setValues(array $values)
     {
@@ -279,7 +279,7 @@ class Form extends Link implements \ArrayAccess
     /**
      * Gets all fields.
      *
-     * @return FormField[]
+     * @return FormField[] An array of fields
      */
     public function all()
     {
diff --git a/web/vendor/symfony/dom-crawler/FormFieldRegistry.php b/web/vendor/symfony/dom-crawler/FormFieldRegistry.php
index 9168dd365..dbd08ff72 100644
--- a/web/vendor/symfony/dom-crawler/FormFieldRegistry.php
+++ b/web/vendor/symfony/dom-crawler/FormFieldRegistry.php
@@ -15,8 +15,6 @@ use Symfony\Component\DomCrawler\Field\FormField;
 
 /**
  * This is an internal class that must not be used directly.
- *
- * @internal
  */
 class FormFieldRegistry
 {
@@ -151,7 +149,7 @@ class FormFieldRegistry
      * @param string $base   The fully qualified name of the base field
      * @param array  $values The values of the fields
      *
-     * @return static
+     * @return FormFieldRegistry
      */
     private static function create($base, array $values)
     {
diff --git a/web/vendor/symfony/dom-crawler/LICENSE b/web/vendor/symfony/dom-crawler/LICENSE
index 17d16a133..12a74531e 100644
--- a/web/vendor/symfony/dom-crawler/LICENSE
+++ b/web/vendor/symfony/dom-crawler/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-2016 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/web/vendor/symfony/dom-crawler/composer.json b/web/vendor/symfony/dom-crawler/composer.json
index 960220f39..1385ee988 100644
--- a/web/vendor/symfony/dom-crawler/composer.json
+++ b/web/vendor/symfony/dom-crawler/composer.json
@@ -16,11 +16,11 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9",
+        "php": ">=5.5.9",
         "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
-        "symfony/css-selector": "~2.8|~3.0.0"
+        "symfony/css-selector": "~2.8|~3.0"
     },
     "suggest": {
         "symfony/css-selector": ""
@@ -34,7 +34,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.8-dev"
+            "dev-master": "3.0-dev"
         }
     }
 }
diff --git a/web/vendor/symfony/event-dispatcher/EventDispatcher.php b/web/vendor/symfony/event-dispatcher/EventDispatcher.php
index bce44a142..dec7c85a1 100644
--- a/web/vendor/symfony/event-dispatcher/EventDispatcher.php
+++ b/web/vendor/symfony/event-dispatcher/EventDispatcher.php
@@ -103,7 +103,7 @@ class EventDispatcher implements EventDispatcherInterface
      */
     public function hasListeners($eventName = null)
     {
-        return (bool) count($this->getListeners($eventName));
+        return (bool) $this->getListeners($eventName);
     }
 
     /**
diff --git a/web/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php b/web/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
index 5e1653264..7b59072ac 100644
--- a/web/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
+++ b/web/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
@@ -11,11 +11,12 @@
 
 namespace Symfony\Component\EventDispatcher\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-abstract class AbstractEventDispatcherTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractEventDispatcherTest extends TestCase
 {
     /* Some pseudo events */
     const preFoo = 'pre.foo';
diff --git a/web/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/web/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
index 46eece72f..fb4506c25 100644
--- a/web/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/web/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\EventDispatcher\Tests\Debug;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -18,7 +19,7 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Stopwatch\Stopwatch;
 
-class TraceableEventDispatcherTest extends \PHPUnit_Framework_TestCase
+class TraceableEventDispatcherTest extends TestCase
 {
     public function testAddRemoveListener()
     {
@@ -177,14 +178,20 @@ class TraceableEventDispatcherTest extends \PHPUnit_Framework_TestCase
     {
         $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
         $loop = 1;
+        $dispatchedEvents = 0;
         $dispatcher->addListener('foo', $listener1 = function () use ($dispatcher, &$loop) {
             ++$loop;
             if (2 == $loop) {
                 $dispatcher->dispatch('foo');
             }
         });
+        $dispatcher->addListener('foo', function () use (&$dispatchedEvents) {
+            ++$dispatchedEvents;
+        });
 
         $dispatcher->dispatch('foo');
+
+        $this->assertSame(2, $dispatchedEvents);
     }
 
     public function testDispatchReusedEventNested()
diff --git a/web/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/web/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
index cb04f74be..53d7282b3 100644
--- a/web/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
+++ b/web/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\EventDispatcher\Tests\DependencyInjection;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
 
-class RegisterListenersPassTest extends \PHPUnit_Framework_TestCase
+class RegisterListenersPassTest extends TestCase
 {
     /**
      * Tests that event subscribers not implementing EventSubscriberInterface
diff --git a/web/vendor/symfony/event-dispatcher/Tests/EventTest.php b/web/vendor/symfony/event-dispatcher/Tests/EventTest.php
index 9a822670c..bdc14abbf 100644
--- a/web/vendor/symfony/event-dispatcher/Tests/EventTest.php
+++ b/web/vendor/symfony/event-dispatcher/Tests/EventTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\EventDispatcher\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 /**
  * Test class for Event.
  */
-class EventTest extends \PHPUnit_Framework_TestCase
+class EventTest extends TestCase
 {
     /**
      * @var \Symfony\Component\EventDispatcher\Event
diff --git a/web/vendor/symfony/event-dispatcher/Tests/GenericEventTest.php b/web/vendor/symfony/event-dispatcher/Tests/GenericEventTest.php
index aebd82dab..c84d3ac24 100644
--- a/web/vendor/symfony/event-dispatcher/Tests/GenericEventTest.php
+++ b/web/vendor/symfony/event-dispatcher/Tests/GenericEventTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\EventDispatcher\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 /**
  * Test class for Event.
  */
-class GenericEventTest extends \PHPUnit_Framework_TestCase
+class GenericEventTest extends TestCase
 {
     /**
      * @var GenericEvent
@@ -95,7 +96,7 @@ class GenericEventTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('Event', $this->event['name']);
 
         // test getting invalid arg
-        $this->setExpectedException('InvalidArgumentException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
         $this->assertFalse($this->event['nameNotExist']);
     }
 
diff --git a/web/vendor/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php b/web/vendor/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
index 0f8868037..04f2861e3 100644
--- a/web/vendor/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
+++ b/web/vendor/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
@@ -11,13 +11,14 @@
 
 namespace Symfony\Component\EventDispatcher\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class ImmutableEventDispatcherTest extends \PHPUnit_Framework_TestCase
+class ImmutableEventDispatcherTest extends TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
diff --git a/web/vendor/symfony/event-dispatcher/composer.json b/web/vendor/symfony/event-dispatcher/composer.json
index 282b770c8..14fc24ba2 100644
--- a/web/vendor/symfony/event-dispatcher/composer.json
+++ b/web/vendor/symfony/event-dispatcher/composer.json
@@ -21,7 +21,7 @@
     "require-dev": {
         "symfony/dependency-injection": "~2.6|~3.0.0",
         "symfony/expression-language": "~2.6|~3.0.0",
-        "symfony/config": "~2.0,>=2.0.5|~3.0.0",
+        "symfony/config": "^2.0.5|~3.0.0",
         "symfony/stopwatch": "~2.3|~3.0.0",
         "psr/log": "~1.0"
     },
diff --git a/web/vendor/symfony/http-foundation/BinaryFileResponse.php b/web/vendor/symfony/http-foundation/BinaryFileResponse.php
index 825c78fed..031462190 100644
--- a/web/vendor/symfony/http-foundation/BinaryFileResponse.php
+++ b/web/vendor/symfony/http-foundation/BinaryFileResponse.php
@@ -164,7 +164,7 @@ class BinaryFileResponse extends Response
         if ('' === $filenameFallback && (!preg_match('/^[\x20-\x7e]*$/', $filename) || false !== strpos($filename, '%'))) {
             $encoding = mb_detect_encoding($filename, null, true);
 
-            for ($i = 0; $i < mb_strlen($filename, $encoding); ++$i) {
+            for ($i = 0, $filenameLength = mb_strlen($filename, $encoding); $i < $filenameLength; ++$i) {
                 $char = mb_substr($filename, $i, 1, $encoding);
 
                 if ('%' === $char || ord($char) < 32 || ord($char) > 126) {
diff --git a/web/vendor/symfony/http-foundation/Request.php b/web/vendor/symfony/http-foundation/Request.php
index 46cc6bea5..78dc20235 100644
--- a/web/vendor/symfony/http-foundation/Request.php
+++ b/web/vendor/symfony/http-foundation/Request.php
@@ -206,6 +206,15 @@ class Request
 
     protected static $requestFactory;
 
+    private $isForwardedValid = true;
+
+    private static $forwardedParams = array(
+        self::HEADER_CLIENT_IP => 'for',
+        self::HEADER_CLIENT_HOST => 'host',
+        self::HEADER_CLIENT_PROTO => 'proto',
+        self::HEADER_CLIENT_PORT => 'host',
+    );
+
     /**
      * Constructor.
      *
@@ -596,6 +605,7 @@ class Request
      *  * Request::HEADER_CLIENT_HOST:  defaults to X-Forwarded-Host  (see getHost())
      *  * Request::HEADER_CLIENT_PORT:  defaults to X-Forwarded-Port  (see getPort())
      *  * Request::HEADER_CLIENT_PROTO: defaults to X-Forwarded-Proto (see getScheme() and isSecure())
+     *  * Request::HEADER_FORWARDED:    defaults to Forwarded         (see RFC 7239)
      *
      * Setting an empty value allows to disable the trusted header for the given key.
      *
@@ -805,41 +815,13 @@ class Request
      */
     public function getClientIps()
     {
-        $clientIps = array();
         $ip = $this->server->get('REMOTE_ADDR');
 
         if (!$this->isFromTrustedProxy()) {
             return array($ip);
         }
 
-        $hasTrustedForwardedHeader = self::$trustedHeaders[self::HEADER_FORWARDED] && $this->headers->has(self::$trustedHeaders[self::HEADER_FORWARDED]);
-        $hasTrustedClientIpHeader = self::$trustedHeaders[self::HEADER_CLIENT_IP] && $this->headers->has(self::$trustedHeaders[self::HEADER_CLIENT_IP]);
-
-        if ($hasTrustedForwardedHeader) {
-            $forwardedHeader = $this->headers->get(self::$trustedHeaders[self::HEADER_FORWARDED]);
-            preg_match_all('{(for)=("?\[?)([a-z0-9\.:_\-/]*)}', $forwardedHeader, $matches);
-            $forwardedClientIps = $matches[3];
-
-            $forwardedClientIps = $this->normalizeAndFilterClientIps($forwardedClientIps, $ip);
-            $clientIps = $forwardedClientIps;
-        }
-
-        if ($hasTrustedClientIpHeader) {
-            $xForwardedForClientIps = array_map('trim', explode(',', $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_IP])));
-
-            $xForwardedForClientIps = $this->normalizeAndFilterClientIps($xForwardedForClientIps, $ip);
-            $clientIps = $xForwardedForClientIps;
-        }
-
-        if ($hasTrustedForwardedHeader && $hasTrustedClientIpHeader && $forwardedClientIps !== $xForwardedForClientIps) {
-            throw new ConflictingHeadersException('The request has both a trusted Forwarded header and a trusted Client IP header, conflicting with each other with regards to the originating IP addresses of the request. This is the result of a misconfiguration. You should either configure your proxy only to send one of these headers, or configure Symfony to distrust one of them.');
-        }
-
-        if (!$hasTrustedForwardedHeader && !$hasTrustedClientIpHeader) {
-            return $this->normalizeAndFilterClientIps(array(), $ip);
-        }
-
-        return $clientIps;
+        return $this->getTrustedValues(self::HEADER_CLIENT_IP, $ip) ?: array($ip);
     }
 
     /**
@@ -965,31 +947,25 @@ class Request
      */
     public function getPort()
     {
-        if ($this->isFromTrustedProxy()) {
-            if (self::$trustedHeaders[self::HEADER_CLIENT_PORT] && $port = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PORT])) {
-                return $port;
-            }
-
-            if (self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && 'https' === $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO], 'http')) {
-                return 443;
-            }
+        if ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_CLIENT_PORT)) {
+            $host = $host[0];
+        } elseif ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_CLIENT_HOST)) {
+            $host = $host[0];
+        } elseif (!$host = $this->headers->get('HOST')) {
+            return $this->server->get('SERVER_PORT');
         }
 
-        if ($host = $this->headers->get('HOST')) {
-            if ($host[0] === '[') {
-                $pos = strpos($host, ':', strrpos($host, ']'));
-            } else {
-                $pos = strrpos($host, ':');
-            }
-
-            if (false !== $pos) {
-                return (int) substr($host, $pos + 1);
-            }
-
-            return 'https' === $this->getScheme() ? 443 : 80;
+        if ($host[0] === '[') {
+            $pos = strpos($host, ':', strrpos($host, ']'));
+        } else {
+            $pos = strrpos($host, ':');
         }
 
-        return $this->server->get('SERVER_PORT');
+        if (false !== $pos) {
+            return (int) substr($host, $pos + 1);
+        }
+
+        return 'https' === $this->getScheme() ? 443 : 80;
     }
 
     /**
@@ -1189,8 +1165,8 @@ class Request
      */
     public function isSecure()
     {
-        if ($this->isFromTrustedProxy() && self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && $proto = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO])) {
-            return in_array(strtolower(current(explode(',', $proto))), array('https', 'on', 'ssl', '1'));
+        if ($this->isFromTrustedProxy() && $proto = $this->getTrustedValues(self::HEADER_CLIENT_PROTO)) {
+            return in_array(strtolower($proto[0]), array('https', 'on', 'ssl', '1'), true);
         }
 
         $https = $this->server->get('HTTPS');
@@ -1215,10 +1191,8 @@ class Request
      */
     public function getHost()
     {
-        if ($this->isFromTrustedProxy() && self::$trustedHeaders[self::HEADER_CLIENT_HOST] && $host = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_HOST])) {
-            $elements = explode(',', $host);
-
-            $host = $elements[count($elements) - 1];
+        if ($this->isFromTrustedProxy() && $host = $this->getTrustedValues(self::HEADER_CLIENT_HOST)) {
+            $host = $host[0];
         } elseif (!$host = $this->headers->get('HOST')) {
             if (!$host = $this->server->get('SERVER_NAME')) {
                 $host = $this->server->get('SERVER_ADDR', '');
@@ -1387,10 +1361,10 @@ class Request
     public function getRequestFormat($default = 'html')
     {
         if (null === $this->format) {
-            $this->format = $this->get('_format', $default);
+            $this->format = $this->get('_format');
         }
 
-        return $this->format;
+        return null === $this->format ? $default : $this->format;
     }
 
     /**
@@ -1779,6 +1753,9 @@ class Request
 
         // Does the baseUrl have anything in common with the request_uri?
         $requestUri = $this->getRequestUri();
+        if ($requestUri !== '' && $requestUri[0] !== '/') {
+            $requestUri = '/'.$requestUri;
+        }
 
         if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, $baseUrl)) {
             // full $baseUrl matches
@@ -1851,9 +1828,12 @@ class Request
         }
 
         // Remove the query string from REQUEST_URI
-        if ($pos = strpos($requestUri, '?')) {
+        if (false !== $pos = strpos($requestUri, '?')) {
             $requestUri = substr($requestUri, 0, $pos);
         }
+        if ($requestUri !== '' && $requestUri[0] !== '/') {
+            $requestUri = '/'.$requestUri;
+        }
 
         $pathInfo = substr($requestUri, strlen($baseUrl));
         if (null !== $baseUrl && (false === $pathInfo || '' === $pathInfo)) {
@@ -1947,8 +1927,48 @@ class Request
         return self::$trustedProxies && IpUtils::checkIp($this->server->get('REMOTE_ADDR'), self::$trustedProxies);
     }
 
+    private function getTrustedValues($type, $ip = null)
+    {
+        $clientValues = array();
+        $forwardedValues = array();
+
+        if (self::$trustedHeaders[$type] && $this->headers->has(self::$trustedHeaders[$type])) {
+            foreach (explode(',', $this->headers->get(self::$trustedHeaders[$type])) as $v) {
+                $clientValues[] = (self::HEADER_CLIENT_PORT === $type ? '0.0.0.0:' : '').trim($v);
+            }
+        }
+
+        if (self::$trustedHeaders[self::HEADER_FORWARDED] && $this->headers->has(self::$trustedHeaders[self::HEADER_FORWARDED])) {
+            $forwardedValues = $this->headers->get(self::$trustedHeaders[self::HEADER_FORWARDED]);
+            $forwardedValues = preg_match_all(sprintf('{(?:%s)=(?:"?\[?)([a-zA-Z0-9\.:_\-/]*+)}', self::$forwardedParams[$type]), $forwardedValues, $matches) ? $matches[1] : array();
+        }
+
+        if (null !== $ip) {
+            $clientValues = $this->normalizeAndFilterClientIps($clientValues, $ip);
+            $forwardedValues = $this->normalizeAndFilterClientIps($forwardedValues, $ip);
+        }
+
+        if ($forwardedValues === $clientValues || !$clientValues) {
+            return $forwardedValues;
+        }
+
+        if (!$forwardedValues) {
+            return $clientValues;
+        }
+
+        if (!$this->isForwardedValid) {
+            return null !== $ip ? array('0.0.0.0', $ip) : array();
+        }
+        $this->isForwardedValid = false;
+
+        throw new ConflictingHeadersException(sprintf('The request has both a trusted "%s" header and a trusted "%s" header, conflicting with each other. You should either configure your proxy to remove one of them, or configure your project to distrust the offending one.', self::$trustedHeaders[self::HEADER_FORWARDED], self::$trustedHeaders[$type]));
+    }
+
     private function normalizeAndFilterClientIps(array $clientIps, $ip)
     {
+        if (!$clientIps) {
+            return array();
+        }
         $clientIps[] = $ip; // Complete the IP chain with the IP the request actually came from
         $firstTrustedIp = null;
 
diff --git a/web/vendor/symfony/http-foundation/Response.php b/web/vendor/symfony/http-foundation/Response.php
index 9d112d157..3eb8bd289 100644
--- a/web/vendor/symfony/http-foundation/Response.php
+++ b/web/vendor/symfony/http-foundation/Response.php
@@ -201,6 +201,11 @@ class Response
         $this->setContent($content);
         $this->setStatusCode($status);
         $this->setProtocolVersion('1.0');
+
+        /* RFC2616 - 14.18 says all Responses need to have a Date */
+        if (!$this->headers->has('Date')) {
+            $this->setDate(new \DateTime(null, new \DateTimeZone('UTC')));
+        }
     }
 
     /**
@@ -329,6 +334,7 @@ class Response
             return $this;
         }
 
+        /* RFC2616 - 14.18 says all Responses need to have a Date */
         if (!$this->headers->has('Date')) {
             $this->setDate(\DateTime::createFromFormat('U', time()));
         }
@@ -612,6 +618,11 @@ class Response
      */
     public function getDate()
     {
+        /*
+            RFC2616 - 14.18 says all Responses need to have a Date.
+            Make sure we provide one even if it the header
+            has been removed in the meantime.
+         */
         if (!$this->headers->has('Date')) {
             $this->setDate(\DateTime::createFromFormat('U', time()));
         }
diff --git a/web/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php b/web/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
index c26cc1334..348fd2301 100644
--- a/web/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
+++ b/web/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
@@ -58,9 +58,9 @@ class MockArraySessionStorage implements SessionStorageInterface
     protected $metadataBag;
 
     /**
-     * @var array
+     * @var array|SessionBagInterface[]
      */
-    protected $bags;
+    protected $bags = array();
 
     /**
      * Constructor.
diff --git a/web/vendor/symfony/http-kernel/Client.php b/web/vendor/symfony/http-kernel/Client.php
index 80b1bd6cd..b1814ad1f 100644
--- a/web/vendor/symfony/http-kernel/Client.php
+++ b/web/vendor/symfony/http-kernel/Client.php
@@ -25,6 +25,9 @@ use Symfony\Component\HttpFoundation\Response;
  * Client simulates a browser and makes requests to a Kernel object.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @method Request|null getRequest() A Request instance
+ * @method Response|null getResponse() A Response instance
  */
 class Client extends BaseClient
 {
@@ -47,26 +50,6 @@ class Client extends BaseClient
         parent::__construct($server, $history, $cookieJar);
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return Request|null A Request instance
-     */
-    public function getRequest()
-    {
-        return parent::getRequest();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return Response|null A Response instance
-     */
-    public function getResponse()
-    {
-        return parent::getResponse();
-    }
-
     /**
      * Makes a request.
      *
diff --git a/web/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php b/web/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
index 3f5e6acf6..6df03fa31 100644
--- a/web/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
+++ b/web/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
@@ -298,7 +298,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
     {
         $html = '';
 
-        $dumper = new HtmlDumper(function ($line) use (&$html) {$html .= $line;}, $this->charset);
+        $dumper = new HtmlDumper(function ($line) use (&$html) { $html .= $line; }, $this->charset);
         $dumper->setDumpHeader('');
         $dumper->setDumpBoundaries('', '');
 
diff --git a/web/vendor/symfony/http-kernel/DataCollector/Util/ValueExporter.php b/web/vendor/symfony/http-kernel/DataCollector/Util/ValueExporter.php
index 09fe4e331..71b090cf0 100644
--- a/web/vendor/symfony/http-kernel/DataCollector/Util/ValueExporter.php
+++ b/web/vendor/symfony/http-kernel/DataCollector/Util/ValueExporter.php
@@ -33,7 +33,7 @@ class ValueExporter
 
         if (is_object($value)) {
             if ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
-                return sprintf('Object(%s) - %s', get_class($value), $value->format(\DateTime::ISO8601));
+                return sprintf('Object(%s) - %s', get_class($value), $value->format(\DateTime::ATOM));
             }
 
             return sprintf('Object(%s)', get_class($value));
diff --git a/web/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php b/web/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php
index 14a5d4351..280844c18 100644
--- a/web/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php
+++ b/web/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php
@@ -52,6 +52,6 @@ class AddRequestFormatsListener implements EventSubscriberInterface
      */
     public static function getSubscribedEvents()
     {
-        return array(KernelEvents::REQUEST => 'onKernelRequest');
+        return array(KernelEvents::REQUEST => array('onKernelRequest', 1));
     }
 }
diff --git a/web/vendor/symfony/http-kernel/EventListener/SessionListener.php b/web/vendor/symfony/http-kernel/EventListener/SessionListener.php
index ecf065f0e..2d6adfa01 100644
--- a/web/vendor/symfony/http-kernel/EventListener/SessionListener.php
+++ b/web/vendor/symfony/http-kernel/EventListener/SessionListener.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/web/vendor/symfony/http-kernel/EventListener/TestSessionListener.php b/web/vendor/symfony/http-kernel/EventListener/TestSessionListener.php
index 8fc8e5757..19a61f169 100644
--- a/web/vendor/symfony/http-kernel/EventListener/TestSessionListener.php
+++ b/web/vendor/symfony/http-kernel/EventListener/TestSessionListener.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
diff --git a/web/vendor/symfony/http-kernel/HttpCache/Store.php b/web/vendor/symfony/http-kernel/HttpCache/Store.php
index b57d4a774..c4d961e68 100644
--- a/web/vendor/symfony/http-kernel/HttpCache/Store.php
+++ b/web/vendor/symfony/http-kernel/HttpCache/Store.php
@@ -314,6 +314,26 @@ class Store implements StoreInterface
         return unserialize($entries);
     }
 
+    /**
+     * Purges data for the given URL.
+     *
+     * This method purges both the HTTP and the HTTPS version of the cache entry.
+     *
+     * @param string $url A URL
+     *
+     * @return bool true if the URL exists with either HTTP or HTTPS scheme and has been purged, false otherwise
+     */
+    public function purge($url)
+    {
+        $http = preg_replace('#^https:#', 'http:', $url);
+        $https = preg_replace('#^http:#', 'https:', $url);
+
+        $purgedHttp = $this->doPurge($http);
+        $purgedHttps = $this->doPurge($https);
+
+        return $purgedHttp || $purgedHttps;
+    }
+
     /**
      * Purges data for the given URL.
      *
@@ -321,10 +341,9 @@ class Store implements StoreInterface
      *
      * @return bool true if the URL exists and has been purged, false otherwise
      */
-    public function purge($url)
+    private function doPurge($url)
     {
         $key = $this->getCacheKey(Request::create($url));
-
         if (isset($this->locks[$key])) {
             flock($this->locks[$key], LOCK_UN);
             fclose($this->locks[$key]);
diff --git a/web/vendor/symfony/http-kernel/Kernel.php b/web/vendor/symfony/http-kernel/Kernel.php
index acc77dc8c..b871a8ebd 100644
--- a/web/vendor/symfony/http-kernel/Kernel.php
+++ b/web/vendor/symfony/http-kernel/Kernel.php
@@ -59,11 +59,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '2.8.16';
-    const VERSION_ID = 20816;
+    const VERSION = '2.8.19';
+    const VERSION_ID = 20819;
     const MAJOR_VERSION = 2;
     const MINOR_VERSION = 8;
-    const RELEASE_VERSION = 16;
+    const RELEASE_VERSION = 19;
     const EXTRA_VERSION = '';
 
     const END_OF_MAINTENANCE = '11/2018';
@@ -303,6 +303,9 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     {
         if (null === $this->name) {
             $this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));
+            if (ctype_digit($this->name[0])) {
+                $this->name = '_'.$this->name;
+            }
         }
 
         return $this->name;
diff --git a/web/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php b/web/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
index 997c0dd45..6578ebfa5 100644
--- a/web/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
+++ b/web/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
@@ -46,7 +46,7 @@ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage
             $port = $matches[3];
 
             $memcache = new \Memcache();
-            $memcache->addserver($host, $port);
+            $memcache->addServer($host, $port);
 
             $this->memcache = $memcache;
         }
diff --git a/web/vendor/symfony/http-kernel/composer.json b/web/vendor/symfony/http-kernel/composer.json
index 13a89b718..14a36bbd4 100644
--- a/web/vendor/symfony/http-kernel/composer.json
+++ b/web/vendor/symfony/http-kernel/composer.json
@@ -17,9 +17,9 @@
     ],
     "require": {
         "php": ">=5.3.9",
-        "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0",
+        "symfony/event-dispatcher": "^2.6.7|~3.0.0",
         "symfony/http-foundation": "~2.7.20|~2.8.13|~3.1.6",
-        "symfony/debug": "~2.6,>=2.6.2",
+        "symfony/debug": "^2.6.2",
         "psr/log": "~1.0"
     },
     "require-dev": {
@@ -27,16 +27,16 @@
         "symfony/class-loader": "~2.1|~3.0.0",
         "symfony/config": "~2.8",
         "symfony/console": "~2.3|~3.0.0",
-        "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
+        "symfony/css-selector": "^2.0.5|~3.0.0",
         "symfony/dependency-injection": "~2.8|~3.0.0",
-        "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
+        "symfony/dom-crawler": "^2.0.5|~3.0.0",
         "symfony/expression-language": "~2.4|~3.0.0",
-        "symfony/finder": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/process": "~2.0,>=2.0.5|~3.0.0",
+        "symfony/finder": "^2.0.5|~3.0.0",
+        "symfony/process": "^2.0.5|~3.0.0",
         "symfony/routing": "~2.8|~3.0.0",
         "symfony/stopwatch": "~2.3|~3.0.0",
         "symfony/templating": "~2.2|~3.0.0",
-        "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
+        "symfony/translation": "^2.0.5|~3.0.0",
         "symfony/var-dumper": "~2.6|~3.0.0"
     },
     "conflict": {
diff --git a/web/vendor/symfony/process/ExecutableFinder.php b/web/vendor/symfony/process/ExecutableFinder.php
index 824457ce2..d8e689622 100644
--- a/web/vendor/symfony/process/ExecutableFinder.php
+++ b/web/vendor/symfony/process/ExecutableFinder.php
@@ -75,7 +75,7 @@ class ExecutableFinder
         $suffixes = array('');
         if ('\\' === DIRECTORY_SEPARATOR) {
             $pathExt = getenv('PATHEXT');
-            $suffixes = $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes;
+            $suffixes = array_merge($suffixes, $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes);
         }
         foreach ($suffixes as $suffix) {
             foreach ($dirs as $dir) {
diff --git a/web/vendor/symfony/process/Process.php b/web/vendor/symfony/process/Process.php
index 23d561662..96a93343f 100644
--- a/web/vendor/symfony/process/Process.php
+++ b/web/vendor/symfony/process/Process.php
@@ -162,7 +162,6 @@ class Process
         $this->setTimeout($timeout);
         $this->useFileHandles = '\\' === DIRECTORY_SEPARATOR;
         $this->pty = false;
-        $this->enhanceWindowsCompatibility = true;
         $this->enhanceSigchildCompatibility = '\\' !== DIRECTORY_SEPARATOR && $this->isSigchildEnabled();
         $this->options = array_replace(array('suppress_errors' => true, 'binary_pipes' => true), $options);
     }
diff --git a/web/vendor/symfony/process/ProcessUtils.php b/web/vendor/symfony/process/ProcessUtils.php
index 0bd2f6b77..c0fd9c12d 100644
--- a/web/vendor/symfony/process/ProcessUtils.php
+++ b/web/vendor/symfony/process/ProcessUtils.php
@@ -71,7 +71,7 @@ class ProcessUtils
             return $escapedArgument;
         }
 
-        return escapeshellarg($argument);
+        return "'".str_replace("'", "'\\''", $argument)."'";
     }
 
     /**
diff --git a/web/vendor/symfony/psr-http-message-bridge/.travis.yml b/web/vendor/symfony/psr-http-message-bridge/.travis.yml
index 39e7eb618..300847127 100644
--- a/web/vendor/symfony/psr-http-message-bridge/.travis.yml
+++ b/web/vendor/symfony/psr-http-message-bridge/.travis.yml
@@ -2,6 +2,10 @@ language: php
 
 sudo: false
 
+cache:
+    directories:
+        - $HOME/.composer/cache/files
+
 matrix:
     include:
         - php: 5.3
@@ -12,10 +16,9 @@ matrix:
           env: deps=low
         - php: 5.6
           env: deps=high
-        - php: nightly
+        - php: 7.0
         - php: hhvm
     allow_failures:
-        - php: nightly
         - php: hhvm
     fast_finish: true
 
@@ -25,15 +28,15 @@ env:
         - SYMFONY_DEPRECATIONS_HELPER=weak
 
 before_install:
-    - composer self-update
     - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
+    - composer self-update
     - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
     - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then php -i; fi;
     # Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
     - if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
 
 install:
-    - if [[ "$TRAVIS_PHP_VERSION" != "5.3" ]] && [[ "$TRAVIS_PHP_VERSION" != "5.4" ]]; then composer require --no-update zendframework/zend-diactoros; fi;
+    - if [ "$TRAVIS_PHP_VERSION" != "5.3" ]; then composer require --no-update zendframework/zend-diactoros; fi;
     - if [ "$deps" = "no" ]; then export SYMFONY_DEPRECATIONS_HELPER=strict; fi;
     - if [ "$deps" = "no" ]; then composer --prefer-source install; fi;
     - if [ "$deps" = "high" ]; then composer --prefer-source update; fi;
diff --git a/web/vendor/symfony/psr-http-message-bridge/CHANGELOG b/web/vendor/symfony/psr-http-message-bridge/CHANGELOG
new file mode 100644
index 000000000..cc3e9834e
--- /dev/null
+++ b/web/vendor/symfony/psr-http-message-bridge/CHANGELOG
@@ -0,0 +1,3 @@
+* 1.0.0 (2016-09-14)
+
+ * Initial release
diff --git a/web/vendor/symfony/psr-http-message-bridge/CHANGELOG.md b/web/vendor/symfony/psr-http-message-bridge/CHANGELOG.md
deleted file mode 100644
index 569522f7c..000000000
--- a/web/vendor/symfony/psr-http-message-bridge/CHANGELOG.md
+++ /dev/null
@@ -1,7 +0,0 @@
-CHANGELOG
-=========
-
-2.8.0
------
-
- * added the component
diff --git a/web/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php b/web/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
index 31726f15a..9174f051f 100644
--- a/web/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
+++ b/web/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
@@ -45,11 +45,11 @@ class DiactorosFactory implements HttpMessageFactoryInterface
         $server = DiactorosRequestFactory::normalizeServer($symfonyRequest->server->all());
         $headers = $symfonyRequest->headers->all();
 
-        try {
-            $body = new DiactorosStream($symfonyRequest->getContent(true));
-        } catch (\LogicException $e) {
+        if (PHP_VERSION_ID < 50600) {
             $body = new DiactorosStream('php://temp', 'wb+');
             $body->write($symfonyRequest->getContent());
+        } else {
+            $body = new DiactorosStream($symfonyRequest->getContent(true));
         }
 
         $request = new ServerRequest(
@@ -86,6 +86,10 @@ class DiactorosFactory implements HttpMessageFactoryInterface
         $files = array();
 
         foreach ($uploadedFiles as $key => $value) {
+            if (null === $value) {
+                $files[$key] = new DiactorosUploadedFile(null, 0, UPLOAD_ERR_NO_FILE, null, null);
+                continue;
+            }
             if ($value instanceof UploadedFile) {
                 $files[$key] = $this->createUploadedFile($value);
             } else {
@@ -107,7 +111,7 @@ class DiactorosFactory implements HttpMessageFactoryInterface
     {
         return new DiactorosUploadedFile(
             $symfonyUploadedFile->getRealPath(),
-            $symfonyUploadedFile->getSize(),
+            $symfonyUploadedFile->getClientSize(),
             $symfonyUploadedFile->getError(),
             $symfonyUploadedFile->getClientOriginalName(),
             $symfonyUploadedFile->getClientMimeType()
diff --git a/web/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php b/web/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php
index 2c356fd15..76d196bbb 100644
--- a/web/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php
+++ b/web/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php
@@ -14,6 +14,7 @@ namespace Symfony\Bridge\PsrHttpMessage\Factory;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UploadedFileInterface;
+use Psr\Http\Message\UriInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -32,6 +33,20 @@ class HttpFoundationFactory implements HttpFoundationFactoryInterface
      */
     public function createRequest(ServerRequestInterface $psrRequest)
     {
+        $server = array();
+        $uri = $psrRequest->getUri();
+
+        if ($uri instanceof UriInterface) {
+            $server['SERVER_NAME'] = $uri->getHost();
+            $server['SERVER_PORT'] = $uri->getPort();
+            $server['REQUEST_URI'] = $uri->getPath();
+            $server['QUERY_STRING'] = $uri->getQuery();
+        }
+
+        $server['REQUEST_METHOD'] = $psrRequest->getMethod();
+
+        $server = array_replace($server, $psrRequest->getServerParams());
+
         $parsedBody = $psrRequest->getParsedBody();
         $parsedBody = is_array($parsedBody) ? $parsedBody : array();
 
@@ -41,7 +56,7 @@ class HttpFoundationFactory implements HttpFoundationFactoryInterface
             $psrRequest->getAttributes(),
             $psrRequest->getCookieParams(),
             $this->getFiles($psrRequest->getUploadedFiles()),
-            $psrRequest->getServerParams(),
+            $server,
             $psrRequest->getBody()->__toString()
         );
         $request->headers->replace($psrRequest->getHeaders());
@@ -80,10 +95,14 @@ class HttpFoundationFactory implements HttpFoundationFactoryInterface
      */
     private function createUploadedFile(UploadedFileInterface $psrUploadedFile)
     {
-        $temporaryPath = $this->getTemporaryPath();
-        $psrUploadedFile->moveTo($temporaryPath);
+        $temporaryPath = '';
+        $clientFileName = '';
+        if (UPLOAD_ERR_NO_FILE !== $psrUploadedFile->getError()) {
+            $temporaryPath = $this->getTemporaryPath();
+            $psrUploadedFile->moveTo($temporaryPath);
 
-        $clientFileName = $psrUploadedFile->getClientFilename();
+            $clientFileName = $psrUploadedFile->getClientFilename();
+        }
 
         return new UploadedFile(
             $temporaryPath,
diff --git a/web/vendor/symfony/psr-http-message-bridge/LICENSE b/web/vendor/symfony/psr-http-message-bridge/LICENSE
index 43028bc60..12a74531e 100644
--- a/web/vendor/symfony/psr-http-message-bridge/LICENSE
+++ b/web/vendor/symfony/psr-http-message-bridge/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2015 Fabien Potencier
+Copyright (c) 2004-2016 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/web/vendor/symfony/psr-http-message-bridge/composer.json b/web/vendor/symfony/psr-http-message-bridge/composer.json
index 9dc9ce701..ad2508095 100644
--- a/web/vendor/symfony/psr-http-message-bridge/composer.json
+++ b/web/vendor/symfony/psr-http-message-bridge/composer.json
@@ -24,10 +24,16 @@
         "symfony/phpunit-bridge": "~2.7|~3.0"
     },
     "suggest": {
+        "psr/http-message-implementation": "To use the HttpFoundation factory",
         "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bridge\\PsrHttpMessage\\": "" }
     },
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
+    }
 }
diff --git a/web/vendor/symfony/routing/Loader/AnnotationClassLoader.php b/web/vendor/symfony/routing/Loader/AnnotationClassLoader.php
index f175d341e..62ad9c3f9 100644
--- a/web/vendor/symfony/routing/Loader/AnnotationClassLoader.php
+++ b/web/vendor/symfony/routing/Loader/AnnotationClassLoader.php
@@ -139,7 +139,7 @@ abstract class AnnotationClassLoader implements LoaderInterface
 
         $defaults = array_replace($globals['defaults'], $annot->getDefaults());
         foreach ($method->getParameters() as $param) {
-            if (!isset($defaults[$param->getName()]) && $param->isDefaultValueAvailable()) {
+            if (false !== strpos($globals['path'].$annot->getPath(), sprintf('{%s}', $param->getName())) && !isset($defaults[$param->getName()]) && $param->isDefaultValueAvailable()) {
                 $defaults[$param->getName()] = $param->getDefaultValue();
             }
         }
diff --git a/web/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php b/web/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php
index f66b92897..7b8467a81 100644
--- a/web/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php
+++ b/web/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php
@@ -38,7 +38,15 @@ class AnnotationDirectoryLoader extends AnnotationFileLoader
 
         $collection = new RouteCollection();
         $collection->addResource(new DirectoryResource($dir, '/\.php$/'));
-        $files = iterator_to_array(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir), \RecursiveIteratorIterator::LEAVES_ONLY));
+        $files = iterator_to_array(new \RecursiveIteratorIterator(
+            new RecursiveCallbackFilterIterator(
+                new \RecursiveDirectoryIterator($dir),
+                function (\SplFileInfo $current) {
+                    return '.' !== substr($current->getBasename(), 0, 1);
+                }
+            ),
+            \RecursiveIteratorIterator::LEAVES_ONLY
+        ));
         usort($files, function (\SplFileInfo $a, \SplFileInfo $b) {
             return (string) $a > (string) $b ? 1 : -1;
         });
@@ -79,3 +87,34 @@ class AnnotationDirectoryLoader extends AnnotationFileLoader
         return is_dir($path) && (!$type || 'annotation' === $type);
     }
 }
+
+/**
+ * @internal To be removed as RecursiveCallbackFilterIterator is available since PHP 5.4
+ */
+class RecursiveCallbackFilterIterator extends \FilterIterator implements \RecursiveIterator
+{
+    private $iterator;
+    private $callback;
+
+    public function __construct(\RecursiveIterator $iterator, $callback)
+    {
+        $this->iterator = $iterator;
+        $this->callback = $callback;
+        parent::__construct($iterator);
+    }
+
+    public function accept()
+    {
+        return call_user_func($this->callback, $this->current(), $this->key(), $this->iterator);
+    }
+
+    public function hasChildren()
+    {
+        return $this->iterator->hasChildren();
+    }
+
+    public function getChildren()
+    {
+        return new static($this->iterator->getChildren(), $this->callback);
+    }
+}
diff --git a/web/vendor/symfony/routing/composer.json b/web/vendor/symfony/routing/composer.json
index d00ae6d5d..7fb49738e 100644
--- a/web/vendor/symfony/routing/composer.json
+++ b/web/vendor/symfony/routing/composer.json
@@ -21,7 +21,7 @@
     "require-dev": {
         "symfony/config": "~2.7|~3.0.0",
         "symfony/http-foundation": "~2.3|~3.0.0",
-        "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
+        "symfony/yaml": "^2.0.5|~3.0.0",
         "symfony/expression-language": "~2.4|~3.0.0",
         "doctrine/annotations": "~1.0",
         "doctrine/common": "~2.2",
diff --git a/web/vendor/symfony/serializer/Encoder/XmlEncoder.php b/web/vendor/symfony/serializer/Encoder/XmlEncoder.php
index 671ab9785..40f61167b 100644
--- a/web/vendor/symfony/serializer/Encoder/XmlEncoder.php
+++ b/web/vendor/symfony/serializer/Encoder/XmlEncoder.php
@@ -92,14 +92,16 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
             throw new UnexpectedValueException($error->message);
         }
 
+        $rootNode = null;
         foreach ($dom->childNodes as $child) {
             if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
                 throw new UnexpectedValueException('Document types are not allowed.');
             }
+            if (!$rootNode && $child->nodeType !== XML_PI_NODE) {
+                $rootNode = $child;
+            }
         }
 
-        $rootNode = $dom->firstChild;
-
         // todo: throw an exception if the root node name is not correctly configured (bc)
 
         if ($rootNode->hasChildNodes()) {
@@ -329,6 +331,10 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
         $value = array();
 
         foreach ($node->childNodes as $subnode) {
+            if ($subnode->nodeType === XML_PI_NODE) {
+                continue;
+            }
+
             $val = $this->parseXml($subnode);
 
             if ('item' === $subnode->nodeName && isset($val['@key'])) {
@@ -369,7 +375,10 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
         if (is_array($data) || ($data instanceof \Traversable && !$this->serializer->supportsNormalization($data, $this->format))) {
             foreach ($data as $key => $data) {
                 //Ah this is the magic @ attribute types.
-                if (0 === strpos($key, '@') && is_scalar($data) && $this->isElementNameValid($attributeName = substr($key, 1))) {
+                if (0 === strpos($key, '@') && $this->isElementNameValid($attributeName = substr($key, 1))) {
+                    if (!is_scalar($data)) {
+                        $data = $this->serializer->normalize($data, $this->format, $this->context);
+                    }
                     $parentNode->setAttribute($attributeName, $data);
                 } elseif ($key === '#') {
                     $append = $this->selectNodeType($parentNode, $data);
@@ -474,7 +483,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
         } elseif ($val instanceof \Traversable) {
             $this->buildXml($node, $val);
         } elseif (is_object($val)) {
-            return $this->buildXml($node, $this->serializer->normalize($val, $this->format, $this->context));
+            return $this->selectNodeType($node, $this->serializer->normalize($val, $this->format, $this->context));
         } elseif (is_numeric($val)) {
             return $this->appendText($node, (string) $val);
         } elseif (is_string($val) && $this->needsCdataWrapping($val)) {
diff --git a/web/vendor/symfony/serializer/Mapping/Loader/YamlFileLoader.php b/web/vendor/symfony/serializer/Mapping/Loader/YamlFileLoader.php
index ebe2a6e4b..be2de7b6f 100644
--- a/web/vendor/symfony/serializer/Mapping/Loader/YamlFileLoader.php
+++ b/web/vendor/symfony/serializer/Mapping/Loader/YamlFileLoader.php
@@ -60,39 +60,39 @@ class YamlFileLoader extends FileLoader
             $this->classes = $classes;
         }
 
-        if (isset($this->classes[$classMetadata->getName()])) {
-            $yaml = $this->classes[$classMetadata->getName()];
+        if (!isset($this->classes[$classMetadata->getName()])) {
+            return false;
+        }
 
-            if (isset($yaml['attributes']) && is_array($yaml['attributes'])) {
-                $attributesMetadata = $classMetadata->getAttributesMetadata();
+        $yaml = $this->classes[$classMetadata->getName()];
 
-                foreach ($yaml['attributes'] as $attribute => $data) {
-                    if (isset($attributesMetadata[$attribute])) {
-                        $attributeMetadata = $attributesMetadata[$attribute];
-                    } else {
-                        $attributeMetadata = new AttributeMetadata($attribute);
-                        $classMetadata->addAttributeMetadata($attributeMetadata);
+        if (isset($yaml['attributes']) && is_array($yaml['attributes'])) {
+            $attributesMetadata = $classMetadata->getAttributesMetadata();
+
+            foreach ($yaml['attributes'] as $attribute => $data) {
+                if (isset($attributesMetadata[$attribute])) {
+                    $attributeMetadata = $attributesMetadata[$attribute];
+                } else {
+                    $attributeMetadata = new AttributeMetadata($attribute);
+                    $classMetadata->addAttributeMetadata($attributeMetadata);
+                }
+
+                if (isset($data['groups'])) {
+                    if (!is_array($data['groups'])) {
+                        throw new MappingException(sprintf('The "groups" key must be an array of strings in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName()));
                     }
 
-                    if (isset($data['groups'])) {
-                        if (!is_array($data['groups'])) {
-                            throw new MappingException('The "groups" key must be an array of strings in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName());
+                    foreach ($data['groups'] as $group) {
+                        if (!is_string($group)) {
+                            throw new MappingException(sprintf('Group names must be strings in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName()));
                         }
 
-                        foreach ($data['groups'] as $group) {
-                            if (!is_string($group)) {
-                                throw new MappingException('Group names must be strings in "%s" for the attribute "%s" of the class "%s".', $this->file, $attribute, $classMetadata->getName());
-                            }
-
-                            $attributeMetadata->addGroup($group);
-                        }
+                        $attributeMetadata->addGroup($group);
                     }
                 }
             }
-
-            return true;
         }
 
-        return false;
+        return true;
     }
 }
diff --git a/web/vendor/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php b/web/vendor/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
index d3daf12e4..508881e84 100644
--- a/web/vendor/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
+++ b/web/vendor/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
@@ -44,14 +44,15 @@ class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface
     public function normalize($propertyName)
     {
         if (null === $this->attributes || in_array($propertyName, $this->attributes)) {
+            $lcPropertyName = lcfirst($propertyName);
             $snakeCasedName = '';
 
-            $len = strlen($propertyName);
+            $len = strlen($lcPropertyName);
             for ($i = 0; $i < $len; ++$i) {
-                if (ctype_upper($propertyName[$i])) {
-                    $snakeCasedName .= '_'.strtolower($propertyName[$i]);
+                if (ctype_upper($lcPropertyName[$i])) {
+                    $snakeCasedName .= '_'.strtolower($lcPropertyName[$i]);
                 } else {
-                    $snakeCasedName .= strtolower($propertyName[$i]);
+                    $snakeCasedName .= strtolower($lcPropertyName[$i]);
                 }
             }
 
@@ -75,7 +76,7 @@ class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface
         }
 
         if (null === $this->attributes || in_array($camelCasedName, $this->attributes)) {
-            return $this->lowerCamelCase ? lcfirst($camelCasedName) : $camelCasedName;
+            return $camelCasedName;
         }
 
         return $propertyName;
diff --git a/web/vendor/symfony/serializer/composer.json b/web/vendor/symfony/serializer/composer.json
index 88b7832bf..70bc5438d 100644
--- a/web/vendor/symfony/serializer/composer.json
+++ b/web/vendor/symfony/serializer/composer.json
@@ -20,7 +20,7 @@
         "symfony/polyfill-php55": "~1.0"
     },
     "require-dev": {
-        "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
+        "symfony/yaml": "^2.0.5|~3.0.0",
         "symfony/config": "~2.2|~3.0.0",
         "symfony/property-access": "~2.3|~3.0.0",
         "doctrine/annotations": "~1.0",
diff --git a/web/vendor/symfony/translation/Catalogue/AbstractOperation.php b/web/vendor/symfony/translation/Catalogue/AbstractOperation.php
index 9598e1767..c230b78b8 100644
--- a/web/vendor/symfony/translation/Catalogue/AbstractOperation.php
+++ b/web/vendor/symfony/translation/Catalogue/AbstractOperation.php
@@ -83,7 +83,6 @@ abstract class AbstractOperation implements OperationInterface
         $this->source = $source;
         $this->target = $target;
         $this->result = new MessageCatalogue($source->getLocale());
-        $this->domains = null;
         $this->messages = array();
     }
 
diff --git a/web/vendor/symfony/translation/Loader/MoFileLoader.php b/web/vendor/symfony/translation/Loader/MoFileLoader.php
index 025fcd89c..928cc9dfd 100644
--- a/web/vendor/symfony/translation/Loader/MoFileLoader.php
+++ b/web/vendor/symfony/translation/Loader/MoFileLoader.php
@@ -137,7 +137,7 @@ class MoFileLoader extends FileLoader
     }
 
     /**
-     * Reads an unsigned long from stream respecting endianess.
+     * Reads an unsigned long from stream respecting endianness.
      *
      * @param resource $stream
      * @param bool     $isBigEndian
diff --git a/web/vendor/symfony/translation/Util/ArrayConverter.php b/web/vendor/symfony/translation/Util/ArrayConverter.php
index 60a55e9d3..9c0a420a8 100644
--- a/web/vendor/symfony/translation/Util/ArrayConverter.php
+++ b/web/vendor/symfony/translation/Util/ArrayConverter.php
@@ -62,7 +62,7 @@ class ArrayConverter
                  * $tree['foo'] was string before we found array {bar: test2}.
                  *  Treat new element as string too, e.g. add $tree['foo.bar'] = 'test2';
                  */
-                $elem = &$elem[ implode('.', array_slice($parts, $i)) ];
+                $elem = &$elem[implode('.', array_slice($parts, $i))];
                 break;
             }
             $parentOfElem = &$elem;
diff --git a/web/vendor/symfony/translation/composer.json b/web/vendor/symfony/translation/composer.json
index 79ff646c2..64d81bba0 100644
--- a/web/vendor/symfony/translation/composer.json
+++ b/web/vendor/symfony/translation/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "symfony/config": "~2.8",
-        "symfony/intl": "~2.4|~3.0.0",
+        "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
         "symfony/yaml": "~2.2|~3.0.0",
         "psr/log": "~1.0"
     },
diff --git a/web/vendor/symfony/validator/Constraints/BicValidator.php b/web/vendor/symfony/validator/Constraints/BicValidator.php
index f476713c7..d2188071f 100644
--- a/web/vendor/symfony/validator/Constraints/BicValidator.php
+++ b/web/vendor/symfony/validator/Constraints/BicValidator.php
@@ -17,7 +17,7 @@ use Symfony\Component\Validator\ConstraintValidator;
 /**
  * @author Michael Hirschler <michael.vhirsch@gmail.com>
  *
- * @link https://en.wikipedia.org/wiki/ISO_9362#Structure
+ * @see https://en.wikipedia.org/wiki/ISO_9362#Structure
  */
 class BicValidator extends ConstraintValidator
 {
diff --git a/web/vendor/symfony/validator/Constraints/Composite.php b/web/vendor/symfony/validator/Constraints/Composite.php
index ab8466bcf..d1391bb07 100644
--- a/web/vendor/symfony/validator/Constraints/Composite.php
+++ b/web/vendor/symfony/validator/Constraints/Composite.php
@@ -67,6 +67,10 @@ abstract class Composite extends Constraint
 
         foreach ($nestedConstraints as $constraint) {
             if (!$constraint instanceof Constraint) {
+                if (is_object($constraint)) {
+                    $constraint = get_class($constraint);
+                }
+
                 throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, get_class($this)));
             }
 
diff --git a/web/vendor/symfony/validator/Constraints/UrlValidator.php b/web/vendor/symfony/validator/Constraints/UrlValidator.php
index ed0a2579b..7ab72bcff 100644
--- a/web/vendor/symfony/validator/Constraints/UrlValidator.php
+++ b/web/vendor/symfony/validator/Constraints/UrlValidator.php
@@ -34,7 +34,9 @@ class UrlValidator extends ConstraintValidator
                 \]  # an IPv6 address
             )
             (:[0-9]+)?                              # a port (optional)
-            (/?|/\S+|\?\S*|\#\S*)                   # a /, nothing, a / with something, a query or a fragment
+            (?:/ (?:[\pL\pN\-._\~!$&\'()*+,;=:@]|%%[0-9A-Fa-f]{2})* )*      # a path
+            (?:\? (?:[\pL\pN\-._\~!$&\'()*+,;=:@/?]|%%[0-9A-Fa-f]{2})* )?   # a query (optional)
+            (?:\# (?:[\pL\pN\-._\~!$&\'()*+,;=:@/?]|%%[0-9A-Fa-f]{2})* )?   # a fragment (optional)
         $~ixu';
 
     /**
diff --git a/web/vendor/symfony/validator/Mapping/ClassMetadata.php b/web/vendor/symfony/validator/Mapping/ClassMetadata.php
index dc825e1fa..f895ad404 100644
--- a/web/vendor/symfony/validator/Mapping/ClassMetadata.php
+++ b/web/vendor/symfony/validator/Mapping/ClassMetadata.php
@@ -319,6 +319,30 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
         return $this;
     }
 
+    /**
+     * Adds a constraint to the getter of the given property.
+     *
+     * @param string     $property   The name of the property
+     * @param string     $method     The name of the getter method
+     * @param Constraint $constraint The constraint
+     *
+     * @return $this
+     */
+    public function addGetterMethodConstraint($property, $method, Constraint $constraint)
+    {
+        if (!isset($this->getters[$property])) {
+            $this->getters[$property] = new GetterMetadata($this->getClassName(), $property, $method);
+
+            $this->addPropertyMetadata($this->getters[$property]);
+        }
+
+        $constraint->addImplicitGroupName($this->getDefaultGroup());
+
+        $this->getters[$property]->addConstraint($constraint);
+
+        return $this;
+    }
+
     /**
      * @param string       $property
      * @param Constraint[] $constraints
@@ -334,6 +358,22 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
         return $this;
     }
 
+    /**
+     * @param string       $property
+     * @param string       $method
+     * @param Constraint[] $constraints
+     *
+     * @return $this
+     */
+    public function addGetterMethodConstraints($property, $method, array $constraints)
+    {
+        foreach ($constraints as $constraint) {
+            $this->addGetterMethodConstraint($property, $method, $constraint);
+        }
+
+        return $this;
+    }
+
     /**
      * Merges the constraints of the given metadata into this object.
      *
@@ -346,10 +386,6 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
         }
 
         foreach ($source->getConstrainedProperties() as $property) {
-            if ($this->hasPropertyMetadata($property)) {
-                continue;
-            }
-
             foreach ($source->getPropertyMetadata($property) as $member) {
                 $member = clone $member;
 
diff --git a/web/vendor/symfony/validator/Mapping/GetterMetadata.php b/web/vendor/symfony/validator/Mapping/GetterMetadata.php
index 0cf999276..cd42c4338 100644
--- a/web/vendor/symfony/validator/Mapping/GetterMetadata.php
+++ b/web/vendor/symfony/validator/Mapping/GetterMetadata.php
@@ -35,25 +35,30 @@ class GetterMetadata extends MemberMetadata
     /**
      * Constructor.
      *
-     * @param string $class    The class the getter is defined on
-     * @param string $property The property which the getter returns
+     * @param string      $class    The class the getter is defined on
+     * @param string      $property The property which the getter returns
+     * @param string|null $method   The method that is called to retrieve the value being validated (null for auto-detection)
      *
      * @throws ValidatorException
      */
-    public function __construct($class, $property)
+    public function __construct($class, $property, $method = null)
     {
-        $getMethod = 'get'.ucfirst($property);
-        $isMethod = 'is'.ucfirst($property);
-        $hasMethod = 'has'.ucfirst($property);
+        if (null === $method) {
+            $getMethod = 'get'.ucfirst($property);
+            $isMethod = 'is'.ucfirst($property);
+            $hasMethod = 'has'.ucfirst($property);
 
-        if (method_exists($class, $getMethod)) {
-            $method = $getMethod;
-        } elseif (method_exists($class, $isMethod)) {
-            $method = $isMethod;
-        } elseif (method_exists($class, $hasMethod)) {
-            $method = $hasMethod;
-        } else {
-            throw new ValidatorException(sprintf('Neither of these methods exist in class %s: %s, %s, %s', $class, $getMethod, $isMethod, $hasMethod));
+            if (method_exists($class, $getMethod)) {
+                $method = $getMethod;
+            } elseif (method_exists($class, $isMethod)) {
+                $method = $isMethod;
+            } elseif (method_exists($class, $hasMethod)) {
+                $method = $hasMethod;
+            } else {
+                throw new ValidatorException(sprintf('Neither of these methods exist in class %s: %s, %s, %s', $class, $getMethod, $isMethod, $hasMethod));
+            }
+        } elseif (!method_exists($class, $method)) {
+            throw new ValidatorException(sprintf('The %s() method does not exist in class %s.', $method, $class));
         }
 
         parent::__construct($class, $method, $property);
diff --git a/web/vendor/symfony/validator/Mapping/Loader/AnnotationLoader.php b/web/vendor/symfony/validator/Mapping/Loader/AnnotationLoader.php
index d1b8c35b3..a3b5f7ee8 100644
--- a/web/vendor/symfony/validator/Mapping/Loader/AnnotationLoader.php
+++ b/web/vendor/symfony/validator/Mapping/Loader/AnnotationLoader.php
@@ -79,7 +79,7 @@ class AnnotationLoader implements LoaderInterface
                         $metadata->addConstraint($constraint);
                     } elseif ($constraint instanceof Constraint) {
                         if (preg_match('/^(get|is|has)(.+)$/i', $method->name, $matches)) {
-                            $metadata->addGetterConstraint(lcfirst($matches[2]), $constraint);
+                            $metadata->addGetterMethodConstraint(lcfirst($matches[2]), $matches[0], $constraint);
                         } else {
                             throw new MappingException(sprintf('The constraint on "%s::%s" cannot be added. Constraints can only be added on methods beginning with "get", "is" or "has".', $className, $method->name));
                         }
diff --git a/web/vendor/symfony/validator/composer.json b/web/vendor/symfony/validator/composer.json
index f68d6e957..c4261f173 100644
--- a/web/vendor/symfony/validator/composer.json
+++ b/web/vendor/symfony/validator/composer.json
@@ -22,14 +22,14 @@
     },
     "require-dev": {
         "symfony/http-foundation": "~2.3|~3.0.0",
-        "symfony/intl": "~2.7.4|~2.8|~3.0.0",
-        "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
+        "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
+        "symfony/yaml": "^2.0.5|~3.0.0",
         "symfony/config": "~2.2|~3.0.0",
         "symfony/property-access": "~2.3|~3.0.0",
         "symfony/expression-language": "~2.4|~3.0.0",
         "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.0",
-        "egulias/email-validator": "~1.2,>=1.2.1"
+        "egulias/email-validator": "^1.2.1"
     },
     "suggest": {
         "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
diff --git a/web/vendor/symfony/yaml/Inline.php b/web/vendor/symfony/yaml/Inline.php
index 74d23be0a..a2674369c 100644
--- a/web/vendor/symfony/yaml/Inline.php
+++ b/web/vendor/symfony/yaml/Inline.php
@@ -21,7 +21,7 @@ use Symfony\Component\Yaml\Exception\DumpException;
  */
 class Inline
 {
-    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
+    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*+(?:\\\\.[^"\\\\]*+)*+)"|\'([^\']*+(?:\'\'[^\']*+)*+)\')';
 
     private static $exceptionOnInvalidType = false;
     private static $objectSupport = false;
@@ -149,8 +149,8 @@ class Inline
             case Escaper::requiresDoubleQuoting($value):
                 return Escaper::escapeWithDoubleQuotes($value);
             case Escaper::requiresSingleQuoting($value):
-            case preg_match(self::getHexRegex(), $value):
-            case preg_match(self::getTimestampRegex(), $value):
+            case Parser::preg_match(self::getHexRegex(), $value):
+            case Parser::preg_match(self::getTimestampRegex(), $value):
                 return Escaper::escapeWithSingleQuotes($value);
             default:
                 return $value;
@@ -244,10 +244,10 @@ class Inline
                 $i += strlen($output);
 
                 // remove comments
-                if (preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {
+                if (Parser::preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {
                     $output = substr($output, 0, $match[0][1]);
                 }
-            } elseif (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
+            } elseif (Parser::preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
                 $output = $match[1];
                 $i += strlen($output);
             } else {
@@ -282,7 +282,7 @@ class Inline
      */
     private static function parseQuotedScalar($scalar, &$i)
     {
-        if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
+        if (!Parser::preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
             throw new ParseException(sprintf('Malformed inline YAML string: %s.', substr($scalar, $i)));
         }
 
@@ -530,16 +530,16 @@ class Inline
 
                         return '0' == $scalar[1] ? octdec($scalar) : (((string) $raw === (string) $cast) ? $cast : $raw);
                     case is_numeric($scalar):
-                    case preg_match(self::getHexRegex(), $scalar):
+                    case Parser::preg_match(self::getHexRegex(), $scalar):
                         return '0x' === $scalar[0].$scalar[1] ? hexdec($scalar) : (float) $scalar;
                     case '.inf' === $scalarLower:
                     case '.nan' === $scalarLower:
                         return -log(0);
                     case '-.inf' === $scalarLower:
                         return log(0);
-                    case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
+                    case Parser::preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
                         return (float) str_replace(',', '', $scalar);
-                    case preg_match(self::getTimestampRegex(), $scalar):
+                    case Parser::preg_match(self::getTimestampRegex(), $scalar):
                         $timeZone = date_default_timezone_get();
                         date_default_timezone_set('UTC');
                         $time = strtotime($scalar);
diff --git a/web/vendor/symfony/yaml/Parser.php b/web/vendor/symfony/yaml/Parser.php
index 97db3af80..25da4e9f2 100644
--- a/web/vendor/symfony/yaml/Parser.php
+++ b/web/vendor/symfony/yaml/Parser.php
@@ -61,7 +61,7 @@ class Parser
      */
     public function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
     {
-        if (!preg_match('//u', $value)) {
+        if (false === preg_match('//u', $value)) {
             throw new ParseException('The YAML value does not appear to be valid UTF-8.');
         }
         $this->currentLineNb = -1;
@@ -92,13 +92,13 @@ class Parser
             }
 
             $isRef = $mergeNode = false;
-            if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
+            if (self::preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+))?$#u', rtrim($this->currentLine), $values)) {
                 if ($context && 'mapping' == $context) {
                     throw new ParseException('You cannot define a sequence item when in a mapping', $this->getRealCurrentLineNb() + 1, $this->currentLine);
                 }
                 $context = 'sequence';
 
-                if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                if (isset($values['value']) && self::preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
                     $isRef = $matches['ref'];
                     $values['value'] = $matches['value'];
                 }
@@ -108,7 +108,7 @@ class Parser
                     $data[] = $this->parseBlock($this->getRealCurrentLineNb() + 1, $this->getNextEmbedBlock(null, true), $exceptionOnInvalidType, $objectSupport, $objectForMap);
                 } else {
                     if (isset($values['leadspaces'])
-                        && preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches)
+                        && self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P<value>.+))?$#u', rtrim($values['value']), $matches)
                     ) {
                         // this is a compact notation element, add to next block and parse
                         $block = $values['value'];
@@ -124,7 +124,10 @@ class Parser
                 if ($isRef) {
                     $this->refs[$isRef] = end($data);
                 }
-            } elseif (preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values) && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))) {
+            } elseif (
+                self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+))?$#u', rtrim($this->currentLine), $values)
+                && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))
+            ) {
                 if ($context && 'sequence' == $context) {
                     throw new ParseException('You cannot define a mapping item when in a sequence', $this->currentLineNb + 1, $this->currentLine);
                 }
@@ -161,11 +164,7 @@ class Parser
                             throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
                         }
 
-                        foreach ($refValue as $key => $value) {
-                            if (!isset($data[$key])) {
-                                $data[$key] = $value;
-                            }
-                        }
+                        $data += $refValue; // array union
                     } else {
                         if (isset($values['value']) && $values['value'] !== '') {
                             $value = $values['value'];
@@ -187,23 +186,15 @@ class Parser
                                     throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
                                 }
 
-                                foreach ($parsedItem as $key => $value) {
-                                    if (!isset($data[$key])) {
-                                        $data[$key] = $value;
-                                    }
-                                }
+                                $data += $parsedItem; // array union
                             }
                         } else {
                             // If the value associated with the key is a single mapping node, each of its key/value pairs is inserted into the
                             // current mapping, unless the key already exists in it.
-                            foreach ($parsed as $key => $value) {
-                                if (!isset($data[$key])) {
-                                    $data[$key] = $value;
-                                }
-                            }
+                            $data += $parsed; // array union
                         }
                     }
-                } elseif (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                } elseif (isset($values['value']) && self::preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
                     $isRef = $matches['ref'];
                     $values['value'] = $matches['value'];
                 }
@@ -262,27 +253,7 @@ class Parser
                     return $value;
                 }
 
-                switch (preg_last_error()) {
-                    case PREG_INTERNAL_ERROR:
-                        $error = 'Internal PCRE error.';
-                        break;
-                    case PREG_BACKTRACK_LIMIT_ERROR:
-                        $error = 'pcre.backtrack_limit reached.';
-                        break;
-                    case PREG_RECURSION_LIMIT_ERROR:
-                        $error = 'pcre.recursion_limit reached.';
-                        break;
-                    case PREG_BAD_UTF8_ERROR:
-                        $error = 'Malformed UTF-8 data.';
-                        break;
-                    case PREG_BAD_UTF8_OFFSET_ERROR:
-                        $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point.';
-                        break;
-                    default:
-                        $error = 'Unable to parse.';
-                }
-
-                throw new ParseException($error, $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                throw new ParseException('Unable to parse.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
             }
         }
 
@@ -527,7 +498,7 @@ class Parser
             return $this->refs[$value];
         }
 
-        if (preg_match('/^'.self::BLOCK_SCALAR_HEADER_PATTERN.'$/', $value, $matches)) {
+        if (self::preg_match('/^'.self::BLOCK_SCALAR_HEADER_PATTERN.'$/', $value, $matches)) {
             $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
 
             return $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
@@ -582,7 +553,7 @@ class Parser
 
         // determine indentation if not specified
         if (0 === $indentation) {
-            if (preg_match('/^ +/', $this->currentLine, $matches)) {
+            if (self::preg_match('/^ +/', $this->currentLine, $matches)) {
                 $indentation = strlen($matches[0]);
             }
         }
@@ -593,7 +564,7 @@ class Parser
             while (
                 $notEOF && (
                     $isCurrentLineBlank ||
-                    preg_match($pattern, $this->currentLine, $matches)
+                    self::preg_match($pattern, $this->currentLine, $matches)
                 )
             ) {
                 if ($isCurrentLineBlank && strlen($this->currentLine) > $indentation) {
@@ -626,7 +597,7 @@ class Parser
             $previousLineIndented = false;
             $previousLineBlank = false;
 
-            for ($i = 0; $i < count($blockLines); ++$i) {
+            for ($i = 0, $blockLinesCount = count($blockLines); $i < $blockLinesCount; ++$i) {
                 if ('' === $blockLines[$i]) {
                     $text .= "\n";
                     $previousLineIndented = false;
@@ -681,10 +652,7 @@ class Parser
             return false;
         }
 
-        $ret = false;
-        if ($this->getCurrentLineIndentation() > $currentIndentation) {
-            $ret = true;
-        }
+        $ret = $this->getCurrentLineIndentation() > $currentIndentation;
 
         $this->moveToPreviousLine();
 
@@ -785,14 +753,7 @@ class Parser
             return false;
         }
 
-        $ret = false;
-        if (
-            $this->getCurrentLineIndentation() == $currentIndentation
-            &&
-            $this->isStringUnIndentedCollectionItem()
-        ) {
-            $ret = true;
-        }
+        $ret = $this->getCurrentLineIndentation() === $currentIndentation && $this->isStringUnIndentedCollectionItem();
 
         $this->moveToPreviousLine();
 
@@ -816,6 +777,48 @@ class Parser
      */
     private function isBlockScalarHeader()
     {
-        return (bool) preg_match('~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~', $this->currentLine);
+        return (bool) self::preg_match('~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~', $this->currentLine);
+    }
+
+    /**
+     * A local wrapper for `preg_match` which will throw a ParseException if there
+     * is an internal error in the PCRE engine.
+     *
+     * This avoids us needing to check for "false" every time PCRE is used
+     * in the YAML engine
+     *
+     * @throws ParseException on a PCRE internal error
+     *
+     * @see preg_last_error()
+     *
+     * @internal
+     */
+    public static function preg_match($pattern, $subject, &$matches = null, $flags = 0, $offset = 0)
+    {
+        if (false === $ret = preg_match($pattern, $subject, $matches, $flags, $offset)) {
+            switch (preg_last_error()) {
+                case PREG_INTERNAL_ERROR:
+                    $error = 'Internal PCRE error.';
+                    break;
+                case PREG_BACKTRACK_LIMIT_ERROR:
+                    $error = 'pcre.backtrack_limit reached.';
+                    break;
+                case PREG_RECURSION_LIMIT_ERROR:
+                    $error = 'pcre.recursion_limit reached.';
+                    break;
+                case PREG_BAD_UTF8_ERROR:
+                    $error = 'Malformed UTF-8 data.';
+                    break;
+                case PREG_BAD_UTF8_OFFSET_ERROR:
+                    $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point.';
+                    break;
+                default:
+                    $error = 'Error.';
+            }
+
+            throw new ParseException($error);
+        }
+
+        return $ret;
     }
 }
diff --git a/web/vendor/twig/twig/.php_cs.dist b/web/vendor/twig/twig/.php_cs.dist
new file mode 100644
index 000000000..cd75923a1
--- /dev/null
+++ b/web/vendor/twig/twig/.php_cs.dist
@@ -0,0 +1,15 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setRules(array(
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => array('syntax' => 'long'),
+        'php_unit_fqcn_annotation' => false,
+        'no_unreachable_default_argument_value' => false,
+        'braces' => array('allow_single_line_closure' => true),
+        'heredoc_to_nowdoc' => false,
+    ))
+    ->setRiskyAllowed(true)
+    ->setFinder(PhpCsFixer\Finder::create()->in(__DIR__))
+;
diff --git a/web/vendor/twig/twig/.travis.yml b/web/vendor/twig/twig/.travis.yml
index 37262da2f..19f8fb570 100644
--- a/web/vendor/twig/twig/.travis.yml
+++ b/web/vendor/twig/twig/.travis.yml
@@ -5,7 +5,7 @@ sudo: false
 cache:
     directories:
         - vendor
-        - $HOME/.composer/cache
+        - $HOME/.composer/cache/files
 
 php:
     - 5.2
@@ -14,12 +14,16 @@ php:
     - 5.5
     - 5.6
     - 7.0
+    - 7.1
     - hhvm
 
 env:
     - TWIG_EXT=no
     - TWIG_EXT=yes
 
+before_install:
+    - if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
+
 install:
     # Composer is not available on PHP 5.2
     - if [ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]; then travis_retry composer install; fi
@@ -27,13 +31,13 @@ install:
 before_script:
     - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi
     - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
-    - if [ ${TRAVIS_PHP_VERSION:0:3} == "5.2" ]; then sed -i.bak "s|vendor/autoload.php|test/bootstrap.php|" phpunit.xml.dist; fi
 
 matrix:
     fast_finish: true
     exclude:
         - php: hhvm
           env: TWIG_EXT=yes
-    allow_failures:
         - php: 7.0
           env: TWIG_EXT=yes
+        - php: 7.1
+          env: TWIG_EXT=yes
diff --git a/web/vendor/twig/twig/CHANGELOG b/web/vendor/twig/twig/CHANGELOG
index 85de10dd6..886bc7099 100644
--- a/web/vendor/twig/twig/CHANGELOG
+++ b/web/vendor/twig/twig/CHANGELOG
@@ -1,3 +1,117 @@
+* 1.33.0 (2017-03-22)
+
+ * fixed a race condition handling when writing cache files
+ * "length" filter now returns string length when applied to an object that does
+   not implement \Countable but provides __toString()
+ * "empty" test will now consider the return value of the __toString() method for
+   objects implement __toString() but not \Countable
+ * fixed JS escaping for unicode characters with higher code points
+
+* 1.32.0 (2017-02-26)
+
+ * fixed deprecation notice in Twig_Util_DeprecationCollector
+ * added a PSR-11 compatible runtime loader
+ * added `side` argument to `trim` to allow left or right trimming only.
+
+* 1.31.0 (2017-01-11)
+
+ * added Twig_NodeCaptureInterface for nodes that capture all output
+ * fixed marking the environment as initialized too early
+ * fixed C89 compat for the C extension
+ * turned fatal error into exception when a previously generated cache is corrupted
+ * fixed offline cache warm-ups for embedded templates
+
+* 1.30.0 (2016-12-23)
+
+ * added Twig_FactoryRuntimeLoader
+ * deprecated function/test/filter/tag overriding
+ * deprecated the "disable_c_ext" attribute on Twig_Node_Expression_GetAttr
+
+* 1.29.0 (2016-12-13)
+
+ * fixed sandbox being left enabled if an exception is thrown while rendering
+ * marked some classes as being final (via @final)
+ * made Twig_Error report real source path when possible
+ * added support for {{ _self }} to provide an upgrade path from 1.x to 2.0 (replaces {{ _self.templateName }})
+ * deprecated silent display of undefined blocks
+ * deprecated support for mbstring.func_overload != 0
+
+* 1.28.2 (2016-11-23)
+
+ * fixed precedence between getFoo() and isFoo() in Twig_Template::getAttribute()
+ * improved a deprecation message
+
+* 1.28.1 (2016-11-18)
+
+ * fixed block() function when used with a template argument
+
+* 1.28.0 (2016-11-17)
+
+ * added support for the PHP 7 null coalescing operator for the ?? Twig implementation
+ * exposed a way to access template data and methods in a portable way
+ * changed context access to use the PHP 7 null coalescing operator when available
+ * added the "with" tag
+ * added support for a custom template on the block() function
+ * added "is defined" support for block() and constant()
+ * optimized the way attributes are fetched
+
+* 1.27.0 (2016-10-25)
+
+ * deprecated Twig_Parser::getEnvironment()
+ * deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor()
+ * deprecated Twig_Compiler::addIndentation()
+ * fixed regression when registering two extensions having the same class name
+ * deprecated Twig_LoaderInterface::getSource() (implement Twig_SourceContextLoaderInterface instead)
+ * fixed the filesystem loader with relative paths
+ * deprecated Twig_Node::getLine() in favor of Twig_Node::getTemplateLine()
+ * deprecated Twig_Template::getSource() in favor of Twig_Template::getSourceContext()
+ * deprecated Twig_Node::getFilename() in favor of Twig_Node::getTemplateName()
+ * deprecated the "filename" escaping strategy (use "name" instead)
+ * added Twig_Source to hold information about the original template
+ * deprecated Twig_Error::getTemplateFile() and Twig_Error::setTemplateFile() in favor of Twig_Error::getTemplateName() and Twig_Error::setTemplateName()
+ * deprecated Parser::getFilename()
+ * fixed template paths when a template name contains a protocol like vfs://
+ * improved debugging with Twig_Sandbox_SecurityError exceptions for disallowed methods and properties
+
+* 1.26.1 (2016-10-05)
+
+ * removed template source code from generated template classes when debug is disabled
+ * fixed default implementation of Twig_Template::getDebugInfo() for better BC
+ * fixed regression on static calls for functions/filters/tests
+
+* 1.26.0 (2016-10-02)
+
+ * added template cache invalidation based on more environment options
+ * added a missing deprecation notice
+ * fixed template paths when a template is stored in a PHAR file
+ * allowed filters/functions/tests implementation to use a different class than the extension they belong to
+ * deprecated Twig_ExtensionInterface::getName()
+
+* 1.25.0 (2016-09-21)
+
+ * changed the way we store template source in template classes
+ * removed usage of realpath in cache keys
+ * fixed Twig cache sharing when used with different versions of PHP
+ * removed embed parent workaround for simple use cases
+ * deprecated the ability to store non Node instances in Node::$nodes
+ * deprecated Twig_Environment::getLexer(), Twig_Environment::getParser(), Twig_Environment::getCompiler()
+ * deprecated Twig_Compiler::getFilename()
+
+* 1.24.2 (2016-09-01)
+
+ * fixed static callables
+ * fixed a potential PHP warning when loading the cache
+ * fixed a case where the autoescaping does not work as expected
+
+* 1.24.1 (2016-05-30)
+
+ * fixed reserved keywords (forbids true, false, null and none keywords for variables names)
+ * fixed support for PHP7 (Throwable support)
+ * marked the following methods as being internals on Twig_Environment: 
+   getFunctions(), getFilters(), getTests(), getFunction(), getFilter(), getTest(),
+   getTokenParsers(), getTags(), getNodeVisitors(), getUnaryOperators(), getBinaryOperators(),
+   getFunctions(), getFilters(), getGlobals(), initGlobals(), initExtensions(), and initExtension()
+
 * 1.24.0 (2016-01-25)
 
  * adding support for the ?? operator
diff --git a/web/vendor/twig/twig/LICENSE b/web/vendor/twig/twig/LICENSE
index cc74f810e..b6e17a1a6 100644
--- a/web/vendor/twig/twig/LICENSE
+++ b/web/vendor/twig/twig/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2016 by the Twig Team.
+Copyright (c) 2009-2017 by the Twig Team.
 
 Some rights reserved.
 
diff --git a/web/vendor/twig/twig/composer.json b/web/vendor/twig/twig/composer.json
index 507d8aecd..b89f14ca8 100644
--- a/web/vendor/twig/twig/composer.json
+++ b/web/vendor/twig/twig/composer.json
@@ -30,8 +30,9 @@
         "php": ">=5.2.7"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/debug": "~2.7"
+        "symfony/phpunit-bridge": "~3.3@dev",
+        "symfony/debug": "~2.7",
+        "psr/container": "^1.0"
     },
     "autoload": {
         "psr-0" : {
@@ -40,7 +41,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.24-dev"
+            "dev-master": "1.33-dev"
         }
     }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Autoloader.php b/web/vendor/twig/twig/lib/Twig/Autoloader.php
index 14016b296..212af5445 100644
--- a/web/vendor/twig/twig/lib/Twig/Autoloader.php
+++ b/web/vendor/twig/twig/lib/Twig/Autoloader.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,7 +23,7 @@ class Twig_Autoloader
     /**
      * Registers Twig_Autoloader as an SPL autoloader.
      *
-     * @param bool $prepend Whether to prepend the autoloader or not.
+     * @param bool $prepend whether to prepend the autoloader or not
      */
     public static function register($prepend = false)
     {
@@ -39,7 +39,7 @@ class Twig_Autoloader
     /**
      * Handles autoloading of classes.
      *
-     * @param string $class A class name.
+     * @param string $class a class name
      */
     public static function autoload($class)
     {
diff --git a/web/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php b/web/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
index 3c6ef6626..1c917d2fb 100644
--- a/web/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
+++ b/web/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
@@ -16,9 +16,6 @@
  */
 abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     final public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
     {
         if (!$node instanceof Twig_Node) {
@@ -28,9 +25,6 @@ abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
         return $this->doEnterNode($node, $env);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     final public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)
     {
         if (!$node instanceof Twig_Node) {
@@ -43,9 +37,6 @@ abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
     /**
      * Called before child nodes are visited.
      *
-     * @param Twig_Node        $node The node to visit
-     * @param Twig_Environment $env  The Twig environment instance
-     *
      * @return Twig_Node The modified node
      */
     abstract protected function doEnterNode(Twig_Node $node, Twig_Environment $env);
@@ -53,9 +44,6 @@ abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
     /**
      * Called after child nodes are visited.
      *
-     * @param Twig_Node        $node The node to visit
-     * @param Twig_Environment $env  The Twig environment instance
-     *
      * @return Twig_Node|false The modified node or false if the node must be removed
      */
     abstract protected function doLeaveNode(Twig_Node $node, Twig_Environment $env);
diff --git a/web/vendor/twig/twig/lib/Twig/Cache/Filesystem.php b/web/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
index bebc2bfad..cb3fec468 100644
--- a/web/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
+++ b/web/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -31,9 +31,6 @@ class Twig_Cache_Filesystem implements Twig_CacheInterface
         $this->options = $options;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateKey($name, $className)
     {
         $hash = hash('sha256', $className);
@@ -41,23 +38,24 @@ class Twig_Cache_Filesystem implements Twig_CacheInterface
         return $this->directory.$hash[0].$hash[1].'/'.$hash.'.php';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function load($key)
     {
-        @include_once $key;
+        if (file_exists($key)) {
+            @include_once $key;
+        }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function write($key, $content)
     {
         $dir = dirname($key);
         if (!is_dir($dir)) {
-            if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
-                throw new RuntimeException(sprintf('Unable to create the cache directory (%s).', $dir));
+            if (false === @mkdir($dir, 0777, true)) {
+                if (PHP_VERSION_ID >= 50300) {
+                    clearstatcache(true, $dir);
+                }
+                if (!is_dir($dir)) {
+                    throw new RuntimeException(sprintf('Unable to create the cache directory (%s).', $dir));
+                }
             }
         } elseif (!is_writable($dir)) {
             throw new RuntimeException(sprintf('Unable to write in the cache directory (%s).', $dir));
@@ -82,9 +80,6 @@ class Twig_Cache_Filesystem implements Twig_CacheInterface
         throw new RuntimeException(sprintf('Failed to write cache file "%s".', $key));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getTimestamp($key)
     {
         if (!file_exists($key)) {
diff --git a/web/vendor/twig/twig/lib/Twig/Cache/Null.php b/web/vendor/twig/twig/lib/Twig/Cache/Null.php
index fde8c8082..7a194950e 100644
--- a/web/vendor/twig/twig/lib/Twig/Cache/Null.php
+++ b/web/vendor/twig/twig/lib/Twig/Cache/Null.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,35 +12,25 @@
 /**
  * Implements a no-cache strategy.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Cache_Null implements Twig_CacheInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function generateKey($name, $className)
     {
         return '';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function write($key, $content)
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function load($key)
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getTimestamp($key)
     {
         return 0;
diff --git a/web/vendor/twig/twig/lib/Twig/CacheInterface.php b/web/vendor/twig/twig/lib/Twig/CacheInterface.php
index 9b17e0f42..2a3f04dd0 100644
--- a/web/vendor/twig/twig/lib/Twig/CacheInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/CacheInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Compiler.php b/web/vendor/twig/twig/lib/Twig/Compiler.php
index abea3aafe..170fcb6dd 100644
--- a/web/vendor/twig/twig/lib/Twig/Compiler.php
+++ b/web/vendor/twig/twig/lib/Twig/Compiler.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -26,25 +26,25 @@ class Twig_Compiler implements Twig_CompilerInterface
     protected $sourceLine;
     protected $filename;
 
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env The twig environment instance
-     */
     public function __construct(Twig_Environment $env)
     {
         $this->env = $env;
     }
 
+    /**
+     * @deprecated since 1.25 (to be removed in 2.0)
+     */
     public function getFilename()
     {
+        @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
+
         return $this->filename;
     }
 
     /**
      * Returns the environment instance related to this compiler.
      *
-     * @return Twig_Environment The environment instance
+     * @return Twig_Environment
      */
     public function getEnvironment()
     {
@@ -67,7 +67,7 @@ class Twig_Compiler implements Twig_CompilerInterface
      * @param Twig_NodeInterface $node        The node to compile
      * @param int                $indentation The current indentation
      *
-     * @return Twig_Compiler The current compiler instance
+     * @return $this
      */
     public function compile(Twig_NodeInterface $node, $indentation = 0)
     {
@@ -80,7 +80,8 @@ class Twig_Compiler implements Twig_CompilerInterface
         $this->indentation = $indentation;
 
         if ($node instanceof Twig_Node_Module) {
-            $this->filename = $node->getAttribute('filename');
+            // to be removed in 2.0
+            $this->filename = $node->getTemplateName();
         }
 
         $node->compile($this);
@@ -91,7 +92,7 @@ class Twig_Compiler implements Twig_CompilerInterface
     public function subcompile(Twig_NodeInterface $node, $raw = true)
     {
         if (false === $raw) {
-            $this->addIndentation();
+            $this->source .= str_repeat(' ', $this->indentation * 4);
         }
 
         $node->compile($this);
@@ -104,7 +105,7 @@ class Twig_Compiler implements Twig_CompilerInterface
      *
      * @param string $string The string
      *
-     * @return Twig_Compiler The current compiler instance
+     * @return $this
      */
     public function raw($string)
     {
@@ -116,14 +117,13 @@ class Twig_Compiler implements Twig_CompilerInterface
     /**
      * Writes a string to the compiled code by adding indentation.
      *
-     * @return Twig_Compiler The current compiler instance
+     * @return $this
      */
     public function write()
     {
         $strings = func_get_args();
         foreach ($strings as $string) {
-            $this->addIndentation();
-            $this->source .= $string;
+            $this->source .= str_repeat(' ', $this->indentation * 4).$string;
         }
 
         return $this;
@@ -132,10 +132,14 @@ class Twig_Compiler implements Twig_CompilerInterface
     /**
      * Appends an indentation to the current PHP code after compilation.
      *
-     * @return Twig_Compiler The current compiler instance
+     * @return $this
+     *
+     * @deprecated since 1.27 (to be removed in 2.0).
      */
     public function addIndentation()
     {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use write(\'\') instead.', E_USER_DEPRECATED);
+
         $this->source .= str_repeat(' ', $this->indentation * 4);
 
         return $this;
@@ -146,7 +150,7 @@ class Twig_Compiler implements Twig_CompilerInterface
      *
      * @param string $value The string
      *
-     * @return Twig_Compiler The current compiler instance
+     * @return $this
      */
     public function string($value)
     {
@@ -160,12 +164,12 @@ class Twig_Compiler implements Twig_CompilerInterface
      *
      * @param mixed $value The value to convert
      *
-     * @return Twig_Compiler The current compiler instance
+     * @return $this
      */
     public function repr($value)
     {
         if (is_int($value) || is_float($value)) {
-            if (false !== $locale = setlocale(LC_NUMERIC, 0)) {
+            if (false !== $locale = setlocale(LC_NUMERIC, '0')) {
                 setlocale(LC_NUMERIC, 'C');
             }
 
@@ -201,28 +205,28 @@ class Twig_Compiler implements Twig_CompilerInterface
     /**
      * Adds debugging information.
      *
-     * @param Twig_NodeInterface $node The related twig node
-     *
-     * @return Twig_Compiler The current compiler instance
+     * @return $this
      */
     public function addDebugInfo(Twig_NodeInterface $node)
     {
-        if ($node->getLine() != $this->lastLine) {
-            $this->write(sprintf("// line %d\n", $node->getLine()));
+        if ($node->getTemplateLine() != $this->lastLine) {
+            $this->write(sprintf("// line %d\n", $node->getTemplateLine()));
 
             // when mbstring.func_overload is set to 2
             // mb_substr_count() replaces substr_count()
             // but they have different signatures!
             if (((int) ini_get('mbstring.func_overload')) & 2) {
+                @trigger_error('Support for having "mbstring.func_overload" different from 0 is deprecated version 1.29 and will be removed in 2.0.', E_USER_DEPRECATED);
+
                 // this is much slower than the "right" version
                 $this->sourceLine += mb_substr_count(mb_substr($this->source, $this->sourceOffset), "\n");
             } else {
                 $this->sourceLine += substr_count($this->source, "\n", $this->sourceOffset);
             }
             $this->sourceOffset = strlen($this->source);
-            $this->debugInfo[$this->sourceLine] = $node->getLine();
+            $this->debugInfo[$this->sourceLine] = $node->getTemplateLine();
 
-            $this->lastLine = $node->getLine();
+            $this->lastLine = $node->getTemplateLine();
         }
 
         return $this;
@@ -240,7 +244,7 @@ class Twig_Compiler implements Twig_CompilerInterface
      *
      * @param int $step The number of indentation to add
      *
-     * @return Twig_Compiler The current compiler instance
+     * @return $this
      */
     public function indent($step = 1)
     {
@@ -254,7 +258,7 @@ class Twig_Compiler implements Twig_CompilerInterface
      *
      * @param int $step The number of indentation to remove
      *
-     * @return Twig_Compiler The current compiler instance
+     * @return $this
      *
      * @throws LogicException When trying to outdent too much so the indentation would become negative
      */
@@ -262,7 +266,7 @@ class Twig_Compiler implements Twig_CompilerInterface
     {
         // can't outdent by more steps than the current indentation level
         if ($this->indentation < $step) {
-            throw new LogicException('Unable to call outdent() as the indentation would become negative');
+            throw new LogicException('Unable to call outdent() as the indentation would become negative.');
         }
 
         $this->indentation -= $step;
diff --git a/web/vendor/twig/twig/lib/Twig/CompilerInterface.php b/web/vendor/twig/twig/lib/Twig/CompilerInterface.php
index 272c7672f..42872c9cd 100644
--- a/web/vendor/twig/twig/lib/Twig/CompilerInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/CompilerInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,9 +21,7 @@ interface Twig_CompilerInterface
     /**
      * Compiles a node.
      *
-     * @param Twig_NodeInterface $node The node to compile
-     *
-     * @return Twig_CompilerInterface The current compiler instance
+     * @return $this
      */
     public function compile(Twig_NodeInterface $node);
 
diff --git a/web/vendor/twig/twig/lib/Twig/ContainerRuntimeLoader.php b/web/vendor/twig/twig/lib/Twig/ContainerRuntimeLoader.php
new file mode 100644
index 000000000..3284569d8
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/ContainerRuntimeLoader.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Psr\Container\ContainerInterface;
+
+/**
+ * Lazily loads Twig runtime implementations from a PSR-11 container.
+ *
+ * Note that the runtime services MUST use their class names as identifiers.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ */
+class Twig_ContainerRuntimeLoader implements Twig_RuntimeLoaderInterface
+{
+    private $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    public function load($class)
+    {
+        if ($this->container->has($class)) {
+            return $this->container->get($class);
+        }
+    }
+}
diff --git a/web/vendor/twig/twig/lib/Twig/Environment.php b/web/vendor/twig/twig/lib/Twig/Environment.php
index 4100ef580..11c1f3846 100644
--- a/web/vendor/twig/twig/lib/Twig/Environment.php
+++ b/web/vendor/twig/twig/lib/Twig/Environment.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +16,12 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.24.0';
+    const VERSION = '1.33.0';
+    const VERSION_ID = 13300;
+    const MAJOR_VERSION = 1;
+    const MINOR_VERSION = 33;
+    const RELEASE_VERSION = 0;
+    const EXTRA_VERSION = '';
 
     protected $charset;
     protected $loader;
@@ -49,6 +54,10 @@ class Twig_Environment
     private $bcWriteCacheFile = false;
     private $bcGetCacheFilename = false;
     private $lastModifiedExtension = 0;
+    private $extensionsByClass = array();
+    private $runtimeLoaders = array();
+    private $runtimes = array();
+    private $optionsHash;
 
     /**
      * Constructor.
@@ -78,14 +87,14 @@ class Twig_Environment
      *                  * false: disable auto-escaping
      *                  * true: equivalent to html
      *                  * html, js: set the autoescaping to one of the supported strategies
-     *                  * filename: set the autoescaping strategy based on the template filename extension
-     *                  * PHP callback: a PHP callback that returns an escaping strategy based on the template "filename"
+     *                  * name: set the autoescaping strategy based on the template name extension
+     *                  * PHP callback: a PHP callback that returns an escaping strategy based on the template "name"
      *
      *  * optimizations: A flag that indicates which optimizations to apply
      *                   (default to -1 which means that all optimizations are enabled;
      *                   set it to 0 to disable).
      *
-     * @param Twig_LoaderInterface $loader  A Twig_LoaderInterface instance
+     * @param Twig_LoaderInterface $loader
      * @param array                $options An array of options
      */
     public function __construct(Twig_LoaderInterface $loader = null, $options = array())
@@ -155,6 +164,7 @@ class Twig_Environment
     public function setBaseTemplateClass($class)
     {
         $this->baseTemplateClass = $class;
+        $this->updateOptionsHash();
     }
 
     /**
@@ -163,6 +173,7 @@ class Twig_Environment
     public function enableDebug()
     {
         $this->debug = true;
+        $this->updateOptionsHash();
     }
 
     /**
@@ -171,6 +182,7 @@ class Twig_Environment
     public function disableDebug()
     {
         $this->debug = false;
+        $this->updateOptionsHash();
     }
 
     /**
@@ -215,6 +227,7 @@ class Twig_Environment
     public function enableStrictVariables()
     {
         $this->strictVariables = true;
+        $this->updateOptionsHash();
     }
 
     /**
@@ -223,6 +236,7 @@ class Twig_Environment
     public function disableStrictVariables()
     {
         $this->strictVariables = false;
+        $this->updateOptionsHash();
     }
 
     /**
@@ -300,7 +314,10 @@ class Twig_Environment
      *
      *  * The cache key for the given template;
      *  * The currently enabled extensions;
-     *  * Whether the Twig C extension is available or not.
+     *  * Whether the Twig C extension is available or not;
+     *  * PHP version;
+     *  * Twig version;
+     *  * Options with what environment was created.
      *
      * @param string   $name  The name for which to calculate the template class name
      * @param int|null $index The index if it is an embedded template
@@ -309,9 +326,7 @@ class Twig_Environment
      */
     public function getTemplateClass($name, $index = null)
     {
-        $key = $this->getLoader()->getCacheKey($name);
-        $key .= json_encode(array_keys($this->extensions));
-        $key .= function_exists('twig_template_get_attributes');
+        $key = $this->getLoader()->getCacheKey($name).$this->optionsHash;
 
         return $this->templateClassPrefix.hash('sha256', $key).(null === $index ? '' : '_'.$index);
     }
@@ -363,19 +378,48 @@ class Twig_Environment
     }
 
     /**
-     * Loads a template by name.
+     * Loads a template.
+     *
+     * @param string|Twig_TemplateWrapper|Twig_Template $name The template name
+     *
+     * @return Twig_TemplateWrapper
+     */
+    public function load($name)
+    {
+        if ($name instanceof Twig_TemplateWrapper) {
+            return $name;
+        }
+
+        if ($name instanceof Twig_Template) {
+            return new Twig_TemplateWrapper($this, $name);
+        }
+
+        return new Twig_TemplateWrapper($this, $this->loadTemplate($name));
+    }
+
+    /**
+     * Loads a template internal representation.
+     *
+     * This method is for internal use only and should never be called
+     * directly.
      *
      * @param string $name  The template name
      * @param int    $index The index if it is an embedded template
      *
      * @return Twig_TemplateInterface A template instance representing the given template name
      *
-     * @throws Twig_Error_Loader When the template cannot be found
-     * @throws Twig_Error_Syntax When an error occurred during compilation
+     * @throws Twig_Error_Loader  When the template cannot be found
+     * @throws Twig_Error_Runtime When a previously generated cache is corrupted
+     * @throws Twig_Error_Syntax  When an error occurred during compilation
+     *
+     * @internal
      */
     public function loadTemplate($name, $index = null)
     {
-        $cls = $this->getTemplateClass($name, $index);
+        $cls = $mainCls = $this->getTemplateClass($name);
+        if (null !== $index) {
+            $cls .= '_'.$index;
+        }
 
         if (isset($this->loadedTemplates[$cls])) {
             return $this->loadedTemplates[$cls];
@@ -385,7 +429,7 @@ class Twig_Environment
             if ($this->bcGetCacheFilename) {
                 $key = $this->getCacheFilename($name);
             } else {
-                $key = $this->cache->generateKey($name, $cls);
+                $key = $this->cache->generateKey($name, $mainCls);
             }
 
             if (!$this->isAutoReload() || $this->isTemplateFresh($name, $this->cache->getTimestamp($key))) {
@@ -393,14 +437,34 @@ class Twig_Environment
             }
 
             if (!class_exists($cls, false)) {
-                $content = $this->compileSource($this->getLoader()->getSource($name), $name);
+                $loader = $this->getLoader();
+                if (!$loader instanceof Twig_SourceContextLoaderInterface) {
+                    $source = new Twig_Source($loader->getSource($name), $name);
+                } else {
+                    $source = $loader->getSourceContext($name);
+                }
+
+                $content = $this->compileSource($source);
+
                 if ($this->bcWriteCacheFile) {
                     $this->writeCacheFile($key, $content);
                 } else {
                     $this->cache->write($key, $content);
+                    $this->cache->load($key);
                 }
 
-                eval('?>'.$content);
+                if (!class_exists($mainCls, false)) {
+                    /* Last line of defense if either $this->bcWriteCacheFile was used,
+                     * $this->cache is implemented as a no-op or we have a race condition
+                     * where the cache was cleared between the above calls to write to and load from
+                     * the cache.
+                     */
+                    eval('?>'.$content);
+                }
+            }
+
+            if (!class_exists($cls, false)) {
+                throw new Twig_Error_Runtime(sprintf('Failed to load Twig template "%s", index "%s": cache is corrupted.', $name, $index), -1, $source);
             }
         }
 
@@ -438,6 +502,10 @@ class Twig_Environment
         } catch (Exception $e) {
             $this->setLoader($current);
 
+            throw $e;
+        } catch (Throwable $e) {
+            $this->setLoader($current);
+
             throw $e;
         }
         $this->setLoader($current);
@@ -541,10 +609,14 @@ class Twig_Environment
     /**
      * Gets the Lexer instance.
      *
-     * @return Twig_LexerInterface A Twig_LexerInterface instance
+     * @return Twig_LexerInterface
+     *
+     * @deprecated since 1.25 (to be removed in 2.0)
      */
     public function getLexer()
     {
+        @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
+
         if (null === $this->lexer) {
             $this->lexer = new Twig_Lexer($this);
         }
@@ -552,11 +624,6 @@ class Twig_Environment
         return $this->lexer;
     }
 
-    /**
-     * Sets the Lexer instance.
-     *
-     * @param Twig_LexerInterface $lexer A Twig_LexerInterface instance
-     */
     public function setLexer(Twig_LexerInterface $lexer)
     {
         $this->lexer = $lexer;
@@ -565,25 +632,38 @@ class Twig_Environment
     /**
      * Tokenizes a source code.
      *
-     * @param string $source The template source code
-     * @param string $name   The template name
+     * @param string|Twig_Source $source The template source code
+     * @param string             $name   The template name (deprecated)
      *
-     * @return Twig_TokenStream A Twig_TokenStream instance
+     * @return Twig_TokenStream
      *
      * @throws Twig_Error_Syntax When the code is syntactically wrong
      */
     public function tokenize($source, $name = null)
     {
-        return $this->getLexer()->tokenize($source, $name);
+        if (!$source instanceof Twig_Source) {
+            @trigger_error(sprintf('Passing a string as the $source argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
+            $source = new Twig_Source($source, $name);
+        }
+
+        if (null === $this->lexer) {
+            $this->lexer = new Twig_Lexer($this);
+        }
+
+        return $this->lexer->tokenize($source);
     }
 
     /**
      * Gets the Parser instance.
      *
-     * @return Twig_ParserInterface A Twig_ParserInterface instance
+     * @return Twig_ParserInterface
+     *
+     * @deprecated since 1.25 (to be removed in 2.0)
      */
     public function getParser()
     {
+        @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
+
         if (null === $this->parser) {
             $this->parser = new Twig_Parser($this);
         }
@@ -591,11 +671,6 @@ class Twig_Environment
         return $this->parser;
     }
 
-    /**
-     * Sets the Parser instance.
-     *
-     * @param Twig_ParserInterface $parser A Twig_ParserInterface instance
-     */
     public function setParser(Twig_ParserInterface $parser)
     {
         $this->parser = $parser;
@@ -604,24 +679,30 @@ class Twig_Environment
     /**
      * Converts a token stream to a node tree.
      *
-     * @param Twig_TokenStream $stream A token stream instance
-     *
-     * @return Twig_Node_Module A node tree
+     * @return Twig_Node_Module
      *
      * @throws Twig_Error_Syntax When the token stream is syntactically or semantically wrong
      */
     public function parse(Twig_TokenStream $stream)
     {
-        return $this->getParser()->parse($stream);
+        if (null === $this->parser) {
+            $this->parser = new Twig_Parser($this);
+        }
+
+        return $this->parser->parse($stream);
     }
 
     /**
      * Gets the Compiler instance.
      *
-     * @return Twig_CompilerInterface A Twig_CompilerInterface instance
+     * @return Twig_CompilerInterface
+     *
+     * @deprecated since 1.25 (to be removed in 2.0)
      */
     public function getCompiler()
     {
+        @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
+
         if (null === $this->compiler) {
             $this->compiler = new Twig_Compiler($this);
         }
@@ -629,11 +710,6 @@ class Twig_Environment
         return $this->compiler;
     }
 
-    /**
-     * Sets the Compiler instance.
-     *
-     * @param Twig_CompilerInterface $compiler A Twig_CompilerInterface instance
-     */
     public function setCompiler(Twig_CompilerInterface $compiler)
     {
         $this->compiler = $compiler;
@@ -642,20 +718,22 @@ class Twig_Environment
     /**
      * Compiles a node and returns the PHP code.
      *
-     * @param Twig_NodeInterface $node A Twig_NodeInterface instance
-     *
      * @return string The compiled PHP source code
      */
     public function compile(Twig_NodeInterface $node)
     {
-        return $this->getCompiler()->compile($node)->getSource();
+        if (null === $this->compiler) {
+            $this->compiler = new Twig_Compiler($this);
+        }
+
+        return $this->compiler->compile($node)->getSource();
     }
 
     /**
      * Compiles a template source code.
      *
-     * @param string $source The template source code
-     * @param string $name   The template name
+     * @param string|Twig_Source $source The template source code
+     * @param string             $name   The template name (deprecated)
      *
      * @return string The compiled PHP source code
      *
@@ -663,36 +741,34 @@ class Twig_Environment
      */
     public function compileSource($source, $name = null)
     {
+        if (!$source instanceof Twig_Source) {
+            @trigger_error(sprintf('Passing a string as the $source argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
+            $source = new Twig_Source($source, $name);
+        }
+
         try {
-            $compiled = $this->compile($this->parse($this->tokenize($source, $name)), $source);
-
-            if (isset($source[0])) {
-                $compiled .= '/* '.str_replace(array('*/', "\r\n", "\r", "\n"), array('*//* ', "\n", "\n", "*/\n/* "), $source)."*/\n";
-            }
-
-            return $compiled;
+            return $this->compile($this->parse($this->tokenize($source)));
         } catch (Twig_Error $e) {
-            $e->setTemplateFile($name);
+            $e->setSourceContext($source);
             throw $e;
         } catch (Exception $e) {
-            throw new Twig_Error_Syntax(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $name, $e);
+            throw new Twig_Error_Syntax(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $source, $e);
         }
     }
 
-    /**
-     * Sets the Loader instance.
-     *
-     * @param Twig_LoaderInterface $loader A Twig_LoaderInterface instance
-     */
     public function setLoader(Twig_LoaderInterface $loader)
     {
+        if (!$loader instanceof Twig_SourceContextLoaderInterface && 0 !== strpos(get_class($loader), 'Mock_Twig_LoaderInterface')) {
+            @trigger_error(sprintf('Twig loader "%s" should implement Twig_SourceContextLoaderInterface since version 1.27.', get_class($loader)), E_USER_DEPRECATED);
+        }
+
         $this->loader = $loader;
     }
 
     /**
      * Gets the Loader instance.
      *
-     * @return Twig_LoaderInterface A Twig_LoaderInterface instance
+     * @return Twig_LoaderInterface
      */
     public function getLoader()
     {
@@ -748,51 +824,100 @@ class Twig_Environment
     /**
      * Returns true if the given extension is registered.
      *
-     * @param string $name The extension name
+     * @param string $class The extension class name
      *
      * @return bool Whether the extension is registered or not
      */
-    public function hasExtension($name)
+    public function hasExtension($class)
     {
-        return isset($this->extensions[$name]);
-    }
+        $class = ltrim($class, '\\');
+        if (isset($this->extensions[$class])) {
+            if ($class !== get_class($this->extensions[$class])) {
+                @trigger_error(sprintf('Referencing the "%s" extension by its name (defined by getName()) is deprecated since 1.26 and will be removed in Twig 2.0. Use the Fully Qualified Extension Class Name instead.', $class), E_USER_DEPRECATED);
+            }
 
-    /**
-     * Gets an extension by name.
-     *
-     * @param string $name The extension name
-     *
-     * @return Twig_ExtensionInterface A Twig_ExtensionInterface instance
-     */
-    public function getExtension($name)
-    {
-        if (!isset($this->extensions[$name])) {
-            throw new Twig_Error_Runtime(sprintf('The "%s" extension is not enabled.', $name));
+            return true;
         }
 
-        return $this->extensions[$name];
+        return isset($this->extensionsByClass[$class]);
     }
 
     /**
-     * Registers an extension.
-     *
-     * @param Twig_ExtensionInterface $extension A Twig_ExtensionInterface instance
+     * Adds a runtime loader.
      */
+    public function addRuntimeLoader(Twig_RuntimeLoaderInterface $loader)
+    {
+        $this->runtimeLoaders[] = $loader;
+    }
+
+    /**
+     * Gets an extension by class name.
+     *
+     * @param string $class The extension class name
+     *
+     * @return Twig_ExtensionInterface
+     */
+    public function getExtension($class)
+    {
+        $class = ltrim($class, '\\');
+
+        if (isset($this->extensions[$class])) {
+            if ($class !== get_class($this->extensions[$class])) {
+                @trigger_error(sprintf('Referencing the "%s" extension by its name (defined by getName()) is deprecated since 1.26 and will be removed in Twig 2.0. Use the Fully Qualified Extension Class Name instead.', $class), E_USER_DEPRECATED);
+            }
+
+            return $this->extensions[$class];
+        }
+
+        if (!isset($this->extensionsByClass[$class])) {
+            throw new Twig_Error_Runtime(sprintf('The "%s" extension is not enabled.', $class));
+        }
+
+        return $this->extensionsByClass[$class];
+    }
+
+    /**
+     * Returns the runtime implementation of a Twig element (filter/function/test).
+     *
+     * @param string $class A runtime class name
+     *
+     * @return object The runtime implementation
+     *
+     * @throws Twig_Error_Runtime When the template cannot be found
+     */
+    public function getRuntime($class)
+    {
+        if (isset($this->runtimes[$class])) {
+            return $this->runtimes[$class];
+        }
+
+        foreach ($this->runtimeLoaders as $loader) {
+            if (null !== $runtime = $loader->load($class)) {
+                return $this->runtimes[$class] = $runtime;
+            }
+        }
+
+        throw new Twig_Error_Runtime(sprintf('Unable to load the "%s" runtime.', $class));
+    }
+
     public function addExtension(Twig_ExtensionInterface $extension)
     {
-        $name = $extension->getName();
-
         if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to register extension "%s" as extensions have already been initialized.', $name));
+            throw new LogicException(sprintf('Unable to register extension "%s" as extensions have already been initialized.', $extension->getName()));
         }
 
-        if (isset($this->extensions[$name])) {
-            @trigger_error(sprintf('The possibility to register the same extension twice ("%s") is deprecated since version 1.23 and will be removed in Twig 2.0. Use proper PHP inheritance instead.', $name), E_USER_DEPRECATED);
+        $class = get_class($extension);
+        if ($class !== $extension->getName()) {
+            if (isset($this->extensions[$extension->getName()])) {
+                unset($this->extensions[$extension->getName()], $this->extensionsByClass[$class]);
+                @trigger_error(sprintf('The possibility to register the same extension twice ("%s") is deprecated since version 1.23 and will be removed in Twig 2.0. Use proper PHP inheritance instead.', $extension->getName()), E_USER_DEPRECATED);
+            }
         }
 
         $this->lastModifiedExtension = 0;
-
-        $this->extensions[$name] = $extension;
+        $this->extensionsByClass[$class] = $extension;
+        $this->extensions[$extension->getName()] = $extension;
+        $this->updateOptionsHash();
     }
 
     /**
@@ -812,7 +937,17 @@ class Twig_Environment
             throw new LogicException(sprintf('Unable to remove extension "%s" as extensions have already been initialized.', $name));
         }
 
-        unset($this->extensions[$name]);
+        $class = ltrim($name, '\\');
+        if (isset($this->extensions[$class])) {
+            if ($class !== get_class($this->extensions[$class])) {
+                @trigger_error(sprintf('Referencing the "%s" extension by its name (defined by getName()) is deprecated since 1.26 and will be removed in Twig 2.0. Use the Fully Qualified Extension Class Name instead.', $class), E_USER_DEPRECATED);
+            }
+
+            unset($this->extensions[$class]);
+        }
+
+        unset($this->extensions[$class]);
+        $this->updateOptionsHash();
     }
 
     /**
@@ -830,18 +965,13 @@ class Twig_Environment
     /**
      * Returns all registered extensions.
      *
-     * @return array An array of extensions
+     * @return Twig_ExtensionInterface[] An array of extensions (keys are for internal usage only and should not be relied on)
      */
     public function getExtensions()
     {
         return $this->extensions;
     }
 
-    /**
-     * Registers a Token Parser.
-     *
-     * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
-     */
     public function addTokenParser(Twig_TokenParserInterface $parser)
     {
         if ($this->extensionInitialized) {
@@ -854,7 +984,9 @@ class Twig_Environment
     /**
      * Gets the registered Token Parsers.
      *
-     * @return Twig_TokenParserBrokerInterface A broker containing token parsers
+     * @return Twig_TokenParserBrokerInterface
+     *
+     * @internal
      */
     public function getTokenParsers()
     {
@@ -870,7 +1002,9 @@ class Twig_Environment
      *
      * Be warned that this method cannot return tags defined by Twig_TokenParserBrokerInterface classes.
      *
-     * @return Twig_TokenParserInterface[] An array of Twig_TokenParserInterface instances
+     * @return Twig_TokenParserInterface[]
+     *
+     * @internal
      */
     public function getTags()
     {
@@ -884,11 +1018,6 @@ class Twig_Environment
         return $tags;
     }
 
-    /**
-     * Registers a Node Visitor.
-     *
-     * @param Twig_NodeVisitorInterface $visitor A Twig_NodeVisitorInterface instance
-     */
     public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
     {
         if ($this->extensionInitialized) {
@@ -901,7 +1030,9 @@ class Twig_Environment
     /**
      * Gets the registered Node Visitors.
      *
-     * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
+     * @return Twig_NodeVisitorInterface[]
+     *
+     * @internal
      */
     public function getNodeVisitors()
     {
@@ -916,12 +1047,12 @@ class Twig_Environment
      * Registers a Filter.
      *
      * @param string|Twig_SimpleFilter               $name   The filter name or a Twig_SimpleFilter instance
-     * @param Twig_FilterInterface|Twig_SimpleFilter $filter A Twig_FilterInterface instance or a Twig_SimpleFilter instance
+     * @param Twig_FilterInterface|Twig_SimpleFilter $filter
      */
     public function addFilter($name, $filter = null)
     {
         if (!$name instanceof Twig_SimpleFilter && !($filter instanceof Twig_SimpleFilter || $filter instanceof Twig_FilterInterface)) {
-            throw new LogicException('A filter must be an instance of Twig_FilterInterface or Twig_SimpleFilter');
+            throw new LogicException('A filter must be an instance of Twig_FilterInterface or Twig_SimpleFilter.');
         }
 
         if ($name instanceof Twig_SimpleFilter) {
@@ -947,6 +1078,8 @@ class Twig_Environment
      * @param string $name The filter name
      *
      * @return Twig_Filter|false A Twig_Filter instance or false if the filter does not exist
+     *
+     * @internal
      */
     public function getFilter($name)
     {
@@ -990,9 +1123,11 @@ class Twig_Environment
      *
      * Be warned that this method cannot return filters defined with registerUndefinedFilterCallback.
      *
-     * @return Twig_FilterInterface[] An array of Twig_FilterInterface instances
+     * @return Twig_FilterInterface[]
      *
      * @see registerUndefinedFilterCallback
+     *
+     * @internal
      */
     public function getFilters()
     {
@@ -1012,7 +1147,7 @@ class Twig_Environment
     public function addTest($name, $test = null)
     {
         if (!$name instanceof Twig_SimpleTest && !($test instanceof Twig_SimpleTest || $test instanceof Twig_TestInterface)) {
-            throw new LogicException('A test must be an instance of Twig_TestInterface or Twig_SimpleTest');
+            throw new LogicException('A test must be an instance of Twig_TestInterface or Twig_SimpleTest.');
         }
 
         if ($name instanceof Twig_SimpleTest) {
@@ -1032,7 +1167,9 @@ class Twig_Environment
     /**
      * Gets the registered Tests.
      *
-     * @return Twig_TestInterface[] An array of Twig_TestInterface instances
+     * @return Twig_TestInterface[]
+     *
+     * @internal
      */
     public function getTests()
     {
@@ -1049,6 +1186,8 @@ class Twig_Environment
      * @param string $name The test name
      *
      * @return Twig_Test|false A Twig_Test instance or false if the test does not exist
+     *
+     * @internal
      */
     public function getTest($name)
     {
@@ -1067,12 +1206,12 @@ class Twig_Environment
      * Registers a Function.
      *
      * @param string|Twig_SimpleFunction                 $name     The function name or a Twig_SimpleFunction instance
-     * @param Twig_FunctionInterface|Twig_SimpleFunction $function A Twig_FunctionInterface instance or a Twig_SimpleFunction instance
+     * @param Twig_FunctionInterface|Twig_SimpleFunction $function
      */
     public function addFunction($name, $function = null)
     {
         if (!$name instanceof Twig_SimpleFunction && !($function instanceof Twig_SimpleFunction || $function instanceof Twig_FunctionInterface)) {
-            throw new LogicException('A function must be an instance of Twig_FunctionInterface or Twig_SimpleFunction');
+            throw new LogicException('A function must be an instance of Twig_FunctionInterface or Twig_SimpleFunction.');
         }
 
         if ($name instanceof Twig_SimpleFunction) {
@@ -1098,6 +1237,8 @@ class Twig_Environment
      * @param string $name function name
      *
      * @return Twig_Function|false A Twig_Function instance or false if the function does not exist
+     *
+     * @internal
      */
     public function getFunction($name)
     {
@@ -1141,9 +1282,11 @@ class Twig_Environment
      *
      * Be warned that this method cannot return functions defined with registerUndefinedFunctionCallback.
      *
-     * @return Twig_FunctionInterface[] An array of Twig_FunctionInterface instances
+     * @return Twig_FunctionInterface[]
      *
      * @see registerUndefinedFunctionCallback
+     *
+     * @internal
      */
     public function getFunctions()
     {
@@ -1189,6 +1332,8 @@ class Twig_Environment
      * Gets the registered Globals.
      *
      * @return array An array of globals
+     *
+     * @internal
      */
     public function getGlobals()
     {
@@ -1227,6 +1372,8 @@ class Twig_Environment
      * Gets the registered unary Operators.
      *
      * @return array An array of unary operators
+     *
+     * @internal
      */
     public function getUnaryOperators()
     {
@@ -1241,6 +1388,8 @@ class Twig_Environment
      * Gets the registered binary Operators.
      *
      * @return array An array of binary operators
+     *
+     * @internal
      */
     public function getBinaryOperators()
     {
@@ -1261,6 +1410,9 @@ class Twig_Environment
         return Twig_Error_Syntax::computeAlternatives($name, $items);
     }
 
+    /**
+     * @internal
+     */
     protected function initGlobals()
     {
         $globals = array();
@@ -1286,13 +1438,15 @@ class Twig_Environment
         return call_user_func_array('array_merge', $globals);
     }
 
+    /**
+     * @internal
+     */
     protected function initExtensions()
     {
         if ($this->extensionInitialized) {
             return;
         }
 
-        $this->extensionInitialized = true;
         $this->parsers = new Twig_TokenParserBroker(array(), array(), false);
         $this->filters = array();
         $this->functions = array();
@@ -1305,8 +1459,13 @@ class Twig_Environment
             $this->initExtension($extension);
         }
         $this->initExtension($this->staging);
+        // Done at the end only, so that an exception during initialization does not mark the environment as initialized when catching the exception
+        $this->extensionInitialized = true;
     }
 
+    /**
+     * @internal
+     */
     protected function initExtension(Twig_ExtensionInterface $extension)
     {
         // filters
@@ -1351,7 +1510,7 @@ class Twig_Environment
 
                 $this->parsers->addTokenParserBroker($parser);
             } else {
-                throw new LogicException('getTokenParsers() must return an array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances');
+                throw new LogicException('getTokenParsers() must return an array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances.');
             }
         }
 
@@ -1362,8 +1521,12 @@ class Twig_Environment
 
         // operators
         if ($operators = $extension->getOperators()) {
+            if (!is_array($operators)) {
+                throw new InvalidArgumentException(sprintf('"%s::getOperators()" must return an array with operators, got "%s".', get_class($extension), is_object($operators) ? get_class($operators) : gettype($operators).(is_resource($operators) ? '' : '#'.$operators)));
+            }
+
             if (2 !== count($operators)) {
-                throw new InvalidArgumentException(sprintf('"%s::getOperators()" does not return a valid operators array.', get_class($extension)));
+                throw new InvalidArgumentException(sprintf('"%s::getOperators()" must return an array of 2 elements, got %d.', get_class($extension), count($operators)));
             }
 
             $this->unaryOperators = array_merge($this->unaryOperators, $operators[0]);
@@ -1378,4 +1541,21 @@ class Twig_Environment
     {
         $this->cache->write($file, $content);
     }
+
+    private function updateOptionsHash()
+    {
+        $hashParts = array_merge(
+            array_keys($this->extensions),
+            array(
+                (int) function_exists('twig_template_get_attributes'),
+                PHP_MAJOR_VERSION,
+                PHP_MINOR_VERSION,
+                self::VERSION,
+                (int) $this->debug,
+                $this->baseTemplateClass,
+                (int) $this->strictVariables,
+            )
+        );
+        $this->optionsHash = implode(':', $hashParts);
+    }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Error.php b/web/vendor/twig/twig/lib/Twig/Error.php
index 37c743528..358a03b97 100644
--- a/web/vendor/twig/twig/lib/Twig/Error.php
+++ b/web/vendor/twig/twig/lib/Twig/Error.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,8 +25,8 @@
  * and line number) yourself by passing them to the constructor. If some or all
  * these information are not available from where you throw the exception, then
  * this class will guess them automatically (when the line number is set to -1
- * and/or the filename is set to null). As this is a costly operation, this
- * can be disabled by passing false for both the filename and the line number
+ * and/or the name is set to null). As this is a costly operation, this
+ * can be disabled by passing false for both the name and the line number
  * when creating a new instance of this class.
  *
  * @author Fabien Potencier <fabien@symfony.com>
@@ -34,29 +34,43 @@
 class Twig_Error extends Exception
 {
     protected $lineno;
+    // to be renamed to name in 2.0
     protected $filename;
     protected $rawMessage;
     protected $previous;
 
+    private $sourcePath;
+    private $sourceCode;
+
     /**
      * Constructor.
      *
-     * Set both the line number and the filename to false to
+     * Set both the line number and the name to false to
      * disable automatic guessing of the original template name
      * and line number.
      *
      * Set the line number to -1 to enable its automatic guessing.
-     * Set the filename to null to enable its automatic guessing.
+     * Set the name to null to enable its automatic guessing.
      *
      * By default, automatic guessing is enabled.
      *
-     * @param string    $message  The error message
-     * @param int       $lineno   The template line where the error occurred
-     * @param string    $filename The template file name where the error occurred
-     * @param Exception $previous The previous exception
+     * @param string                  $message  The error message
+     * @param int                     $lineno   The template line where the error occurred
+     * @param Twig_Source|string|null $source   The source context where the error occurred
+     * @param Exception               $previous The previous exception
      */
-    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
+    public function __construct($message, $lineno = -1, $source = null, Exception $previous = null)
     {
+        if (null === $source) {
+            $name = null;
+        } elseif (!$source instanceof Twig_Source) {
+            // for compat with the Twig C ext., passing the template name as string is accepted
+            $name = $source;
+        } else {
+            $name = $source->getName();
+            $this->sourceCode = $source->getCode();
+            $this->sourcePath = $source->getPath();
+        }
         if (PHP_VERSION_ID < 50300) {
             $this->previous = $previous;
             parent::__construct('');
@@ -65,9 +79,9 @@ class Twig_Error extends Exception
         }
 
         $this->lineno = $lineno;
-        $this->filename = $filename;
+        $this->filename = $name;
 
-        if (-1 === $this->lineno || null === $this->filename) {
+        if (-1 === $lineno || null === $name || null === $this->sourcePath) {
             $this->guessTemplateInfo();
         }
 
@@ -87,23 +101,62 @@ class Twig_Error extends Exception
     }
 
     /**
-     * Gets the filename where the error occurred.
+     * Gets the logical name where the error occurred.
      *
-     * @return string The filename
+     * @return string The name
+     *
+     * @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead.
      */
     public function getTemplateFile()
     {
+        @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
+
         return $this->filename;
     }
 
     /**
-     * Sets the filename where the error occurred.
+     * Sets the logical name where the error occurred.
      *
-     * @param string $filename The filename
+     * @param string $name The name
+     *
+     * @deprecated since 1.27 (to be removed in 2.0). Use setSourceContext() instead.
      */
-    public function setTemplateFile($filename)
+    public function setTemplateFile($name)
     {
-        $this->filename = $filename;
+        @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use setSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
+
+        $this->filename = $name;
+
+        $this->updateRepr();
+    }
+
+    /**
+     * Gets the logical name where the error occurred.
+     *
+     * @return string The name
+     *
+     * @deprecated since 1.29 (to be removed in 2.0). Use getSourceContext() instead.
+     */
+    public function getTemplateName()
+    {
+        @trigger_error(sprintf('The "%s" method is deprecated since version 1.29 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return $this->filename;
+    }
+
+    /**
+     * Sets the logical name where the error occurred.
+     *
+     * @param string $name The name
+     *
+     * @deprecated since 1.29 (to be removed in 2.0). Use setSourceContext() instead.
+     */
+    public function setTemplateName($name)
+    {
+        @trigger_error(sprintf('The "%s" method is deprecated since version 1.29 and will be removed in 2.0. Use setSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
+
+        $this->filename = $name;
+        $this->sourceCode = $this->sourcePath = null;
 
         $this->updateRepr();
     }
@@ -130,6 +183,32 @@ class Twig_Error extends Exception
         $this->updateRepr();
     }
 
+    /**
+     * Gets the source context of the Twig template where the error occurred.
+     *
+     * @return Twig_Source|null
+     */
+    public function getSourceContext()
+    {
+        return $this->filename ? new Twig_Source($this->sourceCode, $this->filename, $this->sourcePath) : null;
+    }
+
+    /**
+     * Sets the source context of the Twig template where the error occurred.
+     */
+    public function setSourceContext(Twig_Source $source = null)
+    {
+        if (null === $source) {
+            $this->sourceCode = $this->filename = $this->sourcePath = null;
+        } else {
+            $this->sourceCode = $source->getCode();
+            $this->filename = $source->getName();
+            $this->sourcePath = $source->getPath();
+        }
+
+        $this->updateRepr();
+    }
+
     public function guess()
     {
         $this->guessTemplateInfo();
@@ -168,6 +247,13 @@ class Twig_Error extends Exception
     {
         $this->message = $this->rawMessage;
 
+        if ($this->sourcePath && $this->lineno > 0) {
+            $this->file = $this->sourcePath;
+            $this->line = $this->lineno;
+
+            return;
+        }
+
         $dot = false;
         if ('.' === substr($this->message, -1)) {
             $this->message = substr($this->message, 0, -1);
@@ -182,11 +268,11 @@ class Twig_Error extends Exception
 
         if ($this->filename) {
             if (is_string($this->filename) || (is_object($this->filename) && method_exists($this->filename, '__toString'))) {
-                $filename = sprintf('"%s"', $this->filename);
+                $name = sprintf('"%s"', $this->filename);
             } else {
-                $filename = json_encode($this->filename);
+                $name = json_encode($this->filename);
             }
-            $this->message .= sprintf(' in %s', $filename);
+            $this->message .= sprintf(' in %s', $name);
         }
 
         if ($this->lineno && $this->lineno >= 0) {
@@ -227,11 +313,18 @@ class Twig_Error extends Exception
             }
         }
 
-        // update template filename
+        // update template name
         if (null !== $template && null === $this->filename) {
             $this->filename = $template->getTemplateName();
         }
 
+        // update template path if any
+        if (null !== $template && null === $this->sourcePath) {
+            $src = $template->getSourceContext();
+            $this->sourceCode = $src->getCode();
+            $this->sourcePath = $src->getPath();
+        }
+
         if (null === $template || $this->lineno > -1) {
             return;
         }
diff --git a/web/vendor/twig/twig/lib/Twig/Error/Loader.php b/web/vendor/twig/twig/lib/Twig/Error/Loader.php
index 68efb574a..68297201a 100644
--- a/web/vendor/twig/twig/lib/Twig/Error/Loader.php
+++ b/web/vendor/twig/twig/lib/Twig/Error/Loader.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -24,8 +24,15 @@
  */
 class Twig_Error_Loader extends Twig_Error
 {
-    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
+    public function __construct($message, $lineno = -1, $source = null, Exception $previous = null)
     {
-        parent::__construct($message, false, false, $previous);
+        if (PHP_VERSION_ID < 50300) {
+            $this->previous = $previous;
+            Exception::__construct('');
+        } else {
+            Exception::__construct('', 0, $previous);
+        }
+        $this->appendMessage($message);
+        $this->setTemplateLine(false);
     }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Error/Runtime.php b/web/vendor/twig/twig/lib/Twig/Error/Runtime.php
index 8b6ceddb9..c4e41b1d0 100644
--- a/web/vendor/twig/twig/lib/Twig/Error/Runtime.php
+++ b/web/vendor/twig/twig/lib/Twig/Error/Runtime.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Error/Syntax.php b/web/vendor/twig/twig/lib/Twig/Error/Syntax.php
index f73730a1a..bded07e56 100644
--- a/web/vendor/twig/twig/lib/Twig/Error/Syntax.php
+++ b/web/vendor/twig/twig/lib/Twig/Error/Syntax.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php b/web/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
index b168c3c35..553fb4e5e 100644
--- a/web/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/ExpressionParser.php b/web/vendor/twig/twig/lib/Twig/ExpressionParser.php
index 7b2d58f27..517ad14c7 100644
--- a/web/vendor/twig/twig/lib/Twig/ExpressionParser.php
+++ b/web/vendor/twig/twig/lib/Twig/ExpressionParser.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,6 +19,8 @@
  * @see http://en.wikipedia.org/wiki/Operator-precedence_parser
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @internal
  */
 class Twig_ExpressionParser
 {
@@ -29,11 +31,23 @@ class Twig_ExpressionParser
     protected $unaryOperators;
     protected $binaryOperators;
 
-    public function __construct(Twig_Parser $parser, array $unaryOperators, array $binaryOperators)
+    private $env;
+
+    public function __construct(Twig_Parser $parser, $env = null)
     {
         $this->parser = $parser;
-        $this->unaryOperators = $unaryOperators;
-        $this->binaryOperators = $binaryOperators;
+
+        if ($env instanceof Twig_Environment) {
+            $this->env = $env;
+            $this->unaryOperators = $env->getUnaryOperators();
+            $this->binaryOperators = $env->getBinaryOperators();
+        } else {
+            @trigger_error('Passing the operators as constructor arguments to '.__METHOD__.' is deprecated since version 1.27. Pass the environment instead.', E_USER_DEPRECATED);
+
+            $this->env = $parser->getEnvironment();
+            $this->unaryOperators = func_get_arg(1);
+            $this->binaryOperators = func_get_arg(2);
+        }
     }
 
     public function parseExpression($precedence = 0)
@@ -44,7 +58,11 @@ class Twig_ExpressionParser
             $op = $this->binaryOperators[$token->getValue()];
             $this->parser->getStream()->next();
 
-            if (isset($op['callable'])) {
+            if ('is not' === $token->getValue()) {
+                $expr = $this->parseNotTestExpression($expr);
+            } elseif ('is' === $token->getValue()) {
+                $expr = $this->parseTestExpression($expr);
+            } elseif (isset($op['callable'])) {
                 $expr = call_user_func($op['callable'], $this->parser, $expr);
             } else {
                 $expr1 = $this->parseExpression(self::OPERATOR_LEFT === $op['associativity'] ? $op['precedence'] + 1 : $op['precedence']);
@@ -171,7 +189,7 @@ class Twig_ExpressionParser
                     $negClass = 'Twig_Node_Expression_Unary_Neg';
                     $posClass = 'Twig_Node_Expression_Unary_Pos';
                     if (!(in_array($ref->getName(), array($negClass, $posClass)) || $ref->isSubclassOf($negClass) || $ref->isSubclassOf($posClass))) {
-                        throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s".', $token->getValue()), $token->getLine(), $this->parser->getFilename());
+                        throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s".', $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext());
                     }
 
                     $this->parser->getStream()->next();
@@ -187,7 +205,7 @@ class Twig_ExpressionParser
                 } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '{')) {
                     $node = $this->parseHashExpression();
                 } else {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getFilename());
+                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext());
                 }
         }
 
@@ -216,7 +234,7 @@ class Twig_ExpressionParser
 
         $expr = array_shift($nodes);
         foreach ($nodes as $node) {
-            $expr = new Twig_Node_Expression_Binary_Concat($expr, $node, $node->getLine());
+            $expr = new Twig_Node_Expression_Binary_Concat($expr, $node, $node->getTemplateLine());
         }
 
         return $expr;
@@ -278,7 +296,7 @@ class Twig_ExpressionParser
             } else {
                 $current = $stream->getCurrent();
 
-                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($current->getType()), $current->getValue()), $current->getLine(), $this->parser->getFilename());
+                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($current->getType()), $current->getValue()), $current->getLine(), $stream->getSourceContext());
             }
 
             $stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
@@ -317,20 +335,25 @@ class Twig_ExpressionParser
             case 'parent':
                 $this->parseArguments();
                 if (!count($this->parser->getBlockStack())) {
-                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden.', $line, $this->parser->getFilename());
+                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden.', $line, $this->parser->getStream()->getSourceContext());
                 }
 
                 if (!$this->parser->getParent() && !$this->parser->hasTraits()) {
-                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden.', $line, $this->parser->getFilename());
+                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden.', $line, $this->parser->getStream()->getSourceContext());
                 }
 
                 return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
             case 'block':
-                return new Twig_Node_Expression_BlockReference($this->parseArguments()->getNode(0), false, $line);
+                $args = $this->parseArguments();
+                if (count($args) < 1) {
+                    throw new Twig_Error_Syntax('The "block" function takes one argument (the block name).', $line, $this->parser->getStream()->getSourceContext());
+                }
+
+                return new Twig_Node_Expression_BlockReference($args->getNode(0), count($args) > 1 ? $args->getNode(1) : null, $line);
             case 'attribute':
                 $args = $this->parseArguments();
                 if (count($args) < 2) {
-                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes).', $line, $this->parser->getFilename());
+                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes).', $line, $this->parser->getStream()->getSourceContext());
                 }
 
                 return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : null, Twig_Template::ANY_CALL, $line);
@@ -379,18 +402,18 @@ class Twig_ExpressionParser
                     }
                 }
             } else {
-                throw new Twig_Error_Syntax('Expected name or number', $lineno, $this->parser->getFilename());
+                throw new Twig_Error_Syntax('Expected name or number.', $lineno, $stream->getSourceContext());
             }
 
             if ($node instanceof Twig_Node_Expression_Name && null !== $this->parser->getImportedSymbol('template', $node->getAttribute('name'))) {
                 if (!$arg instanceof Twig_Node_Expression_Constant) {
-                    throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s").', $node->getAttribute('name')), $token->getLine(), $this->parser->getFilename());
+                    throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s").', $node->getAttribute('name')), $token->getLine(), $stream->getSourceContext());
                 }
 
                 $name = $arg->getAttribute('value');
 
                 if ($this->parser->isReservedMacroName($name)) {
-                    throw new Twig_Error_Syntax(sprintf('"%s" cannot be called as macro as it is a reserved keyword.', $name), $token->getLine(), $this->parser->getFilename());
+                    throw new Twig_Error_Syntax(sprintf('"%s" cannot be called as macro as it is a reserved keyword.', $name), $token->getLine(), $stream->getSourceContext());
                 }
 
                 $node = new Twig_Node_Expression_MethodCall($node, 'get'.$name, $arguments, $lineno);
@@ -500,7 +523,7 @@ class Twig_ExpressionParser
             $name = null;
             if ($namedArguments && $token = $stream->nextIf(Twig_Token::OPERATOR_TYPE, '=')) {
                 if (!$value instanceof Twig_Node_Expression_Name) {
-                    throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given.', get_class($value)), $token->getLine(), $this->parser->getFilename());
+                    throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given.', get_class($value)), $token->getLine(), $stream->getSourceContext());
                 }
                 $name = $value->getAttribute('name');
 
@@ -508,7 +531,7 @@ class Twig_ExpressionParser
                     $value = $this->parsePrimaryExpression();
 
                     if (!$this->checkConstantExpression($value)) {
-                        throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $this->parser->getFilename());
+                        throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $stream->getSourceContext());
                     }
                 } else {
                     $value = $this->parseExpression();
@@ -536,15 +559,17 @@ class Twig_ExpressionParser
 
     public function parseAssignmentExpression()
     {
+        $stream = $this->parser->getStream();
         $targets = array();
         while (true) {
-            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
-            if (in_array($token->getValue(), array('true', 'false', 'none'))) {
-                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s".', $token->getValue()), $token->getLine(), $this->parser->getFilename());
+            $token = $stream->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
+            $value = $token->getValue();
+            if (in_array(strtolower($value), array('true', 'false', 'none', 'null'))) {
+                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext());
             }
-            $targets[] = new Twig_Node_Expression_AssignName($token->getValue(), $token->getLine());
+            $targets[] = new Twig_Node_Expression_AssignName($value, $token->getLine());
 
-            if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
+            if (!$stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
                 break;
             }
         }
@@ -565,13 +590,80 @@ class Twig_ExpressionParser
         return new Twig_Node($targets);
     }
 
+    private function parseNotTestExpression(Twig_NodeInterface $node)
+    {
+        return new Twig_Node_Expression_Unary_Not($this->parseTestExpression($node), $this->parser->getCurrentToken()->getLine());
+    }
+
+    private function parseTestExpression(Twig_NodeInterface $node)
+    {
+        $stream = $this->parser->getStream();
+        list($name, $test) = $this->getTest($node->getTemplateLine());
+
+        $class = $this->getTestNodeClass($test);
+        $arguments = null;
+        if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
+            $arguments = $this->parser->getExpressionParser()->parseArguments(true);
+        }
+
+        return new $class($node, $name, $arguments, $this->parser->getCurrentToken()->getLine());
+    }
+
+    private function getTest($line)
+    {
+        $stream = $this->parser->getStream();
+        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
+
+        if ($test = $this->env->getTest($name)) {
+            return array($name, $test);
+        }
+
+        if ($stream->test(Twig_Token::NAME_TYPE)) {
+            // try 2-words tests
+            $name = $name.' '.$this->parser->getCurrentToken()->getValue();
+
+            if ($test = $this->env->getTest($name)) {
+                $stream->next();
+
+                return array($name, $test);
+            }
+        }
+
+        $e = new Twig_Error_Syntax(sprintf('Unknown "%s" test.', $name), $line, $stream->getSourceContext());
+        $e->addSuggestions($name, array_keys($this->env->getTests()));
+
+        throw $e;
+    }
+
+    private function getTestNodeClass($test)
+    {
+        if ($test instanceof Twig_SimpleTest && $test->isDeprecated()) {
+            $stream = $this->parser->getStream();
+            $message = sprintf('Twig Test "%s" is deprecated', $test->getName());
+            if (!is_bool($test->getDeprecatedVersion())) {
+                $message .= sprintf(' since version %s', $test->getDeprecatedVersion());
+            }
+            if ($test->getAlternative()) {
+                $message .= sprintf('. Use "%s" instead', $test->getAlternative());
+            }
+            $src = $stream->getSourceContext();
+            $message .= sprintf(' in %s at line %d.', $src->getPath() ? $src->getPath() : $src->getName(), $stream->getCurrent()->getLine());
+
+            @trigger_error($message, E_USER_DEPRECATED);
+        }
+
+        if ($test instanceof Twig_SimpleTest) {
+            return $test->getNodeClass();
+        }
+
+        return $test instanceof Twig_Test_Node ? $test->getClass() : 'Twig_Node_Expression_Test';
+    }
+
     protected function getFunctionNodeClass($name, $line)
     {
-        $env = $this->parser->getEnvironment();
-
-        if (false === $function = $env->getFunction($name)) {
-            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" function.', $name), $line, $this->parser->getFilename());
-            $e->addSuggestions($name, array_keys($env->getFunctions()));
+        if (false === $function = $this->env->getFunction($name)) {
+            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" function.', $name), $line, $this->parser->getStream()->getSourceContext());
+            $e->addSuggestions($name, array_keys($this->env->getFunctions()));
 
             throw $e;
         }
@@ -584,7 +676,8 @@ class Twig_ExpressionParser
             if ($function->getAlternative()) {
                 $message .= sprintf('. Use "%s" instead', $function->getAlternative());
             }
-            $message .= sprintf(' in %s at line %d.', $this->parser->getFilename(), $line);
+            $src = $this->parser->getStream()->getSourceContext();
+            $message .= sprintf(' in %s at line %d.', $src->getPath() ? $src->getPath() : $src->getName(), $line);
 
             @trigger_error($message, E_USER_DEPRECATED);
         }
@@ -598,11 +691,9 @@ class Twig_ExpressionParser
 
     protected function getFilterNodeClass($name, $line)
     {
-        $env = $this->parser->getEnvironment();
-
-        if (false === $filter = $env->getFilter($name)) {
-            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" filter.', $name), $line, $this->parser->getFilename());
-            $e->addSuggestions($name, array_keys($env->getFilters()));
+        if (false === $filter = $this->env->getFilter($name)) {
+            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" filter.', $name), $line, $this->parser->getStream()->getSourceContext());
+            $e->addSuggestions($name, array_keys($this->env->getFilters()));
 
             throw $e;
         }
@@ -615,7 +706,8 @@ class Twig_ExpressionParser
             if ($filter->getAlternative()) {
                 $message .= sprintf('. Use "%s" instead', $filter->getAlternative());
             }
-            $message .= sprintf(' in %s at line %d.', $this->parser->getFilename(), $line);
+            $src = $this->parser->getStream()->getSourceContext();
+            $message .= sprintf(' in %s at line %d.', $src->getPath() ? $src->getPath() : $src->getName(), $line);
 
             @trigger_error($message, E_USER_DEPRECATED);
         }
diff --git a/web/vendor/twig/twig/lib/Twig/Extension.php b/web/vendor/twig/twig/lib/Twig/Extension.php
index cb03b3de1..5d72634a6 100644
--- a/web/vendor/twig/twig/lib/Twig/Extension.php
+++ b/web/vendor/twig/twig/lib/Twig/Extension.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,69 +11,55 @@
 abstract class Twig_Extension implements Twig_ExtensionInterface
 {
     /**
-     * {@inheritdoc}
-     *
      * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_InitRuntimeInterface instead
      */
     public function initRuntime(Twig_Environment $environment)
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getTokenParsers()
     {
         return array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getNodeVisitors()
     {
         return array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getFilters()
     {
         return array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getTests()
     {
         return array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getFunctions()
     {
         return array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getOperators()
     {
         return array();
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_GlobalsInterface instead
      */
     public function getGlobals()
     {
         return array();
     }
+
+    /**
+     * @deprecated since 1.26 (to be removed in 2.0), not used anymore internally
+     */
+    public function getName()
+    {
+        return get_class($this);
+    }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Extension/Core.php b/web/vendor/twig/twig/lib/Twig/Extension/Core.php
index 79ef5210a..4963a1679 100644
--- a/web/vendor/twig/twig/lib/Twig/Extension/Core.php
+++ b/web/vendor/twig/twig/lib/Twig/Extension/Core.php
@@ -8,11 +8,15 @@ if (!defined('ENT_SUBSTITUTE')) {
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
+/**
+ * @final
+ */
 class Twig_Extension_Core extends Twig_Extension
 {
     protected $dateFormats = array('F j, Y H:i', '%d days');
@@ -95,9 +99,9 @@ class Twig_Extension_Core extends Twig_Extension
     /**
      * Sets the default format to be used by the number_format filter.
      *
-     * @param int    $decimal      The number of decimal places to use.
-     * @param string $decimalPoint The character(s) to use for the decimal point.
-     * @param string $thousandSep  The character(s) to use for the thousands separator.
+     * @param int    $decimal      the number of decimal places to use
+     * @param string $decimalPoint the character(s) to use for the decimal point
+     * @param string $thousandSep  the character(s) to use for the thousands separator
      */
     public function setNumberFormat($decimal, $decimalPoint, $thousandSep)
     {
@@ -132,6 +136,7 @@ class Twig_Extension_Core extends Twig_Extension
             new Twig_TokenParser_Flush(),
             new Twig_TokenParser_Do(),
             new Twig_TokenParser_Embed(),
+            new Twig_TokenParser_With(),
         );
     }
 
@@ -158,7 +163,7 @@ class Twig_Extension_Core extends Twig_Extension
             new Twig_SimpleFilter('upper', 'strtoupper'),
             new Twig_SimpleFilter('lower', 'strtolower'),
             new Twig_SimpleFilter('striptags', 'strip_tags'),
-            new Twig_SimpleFilter('trim', 'trim'),
+            new Twig_SimpleFilter('trim', 'twig_trim_filter'),
             new Twig_SimpleFilter('nl2br', 'nl2br', array('pre_escape' => 'html', 'is_safe' => array('html'))),
 
             // array helpers
@@ -258,82 +263,14 @@ class Twig_Extension_Core extends Twig_Extension
                 '/' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Div', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
                 '//' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_FloorDiv', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
                 '%' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'is' => array('precedence' => 100, 'callable' => array($this, 'parseTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'is not' => array('precedence' => 100, 'callable' => array($this, 'parseNotTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+                'is' => array('precedence' => 100, 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+                'is not' => array('precedence' => 100, 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
                 '**' => array('precedence' => 200, 'class' => 'Twig_Node_Expression_Binary_Power', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
                 '??' => array('precedence' => 300, 'class' => 'Twig_Node_Expression_NullCoalesce', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
             ),
         );
     }
 
-    public function parseNotTestExpression(Twig_Parser $parser, Twig_NodeInterface $node)
-    {
-        return new Twig_Node_Expression_Unary_Not($this->parseTestExpression($parser, $node), $parser->getCurrentToken()->getLine());
-    }
-
-    public function parseTestExpression(Twig_Parser $parser, Twig_NodeInterface $node)
-    {
-        $stream = $parser->getStream();
-        list($name, $test) = $this->getTest($parser, $node->getLine());
-
-        if ($test instanceof Twig_SimpleTest && $test->isDeprecated()) {
-            $message = sprintf('Twig Test "%s" is deprecated', $name);
-            if (!is_bool($test->getDeprecatedVersion())) {
-                $message .= sprintf(' since version %s', $test->getDeprecatedVersion());
-            }
-            if ($test->getAlternative()) {
-                $message .= sprintf('. Use "%s" instead', $test->getAlternative());
-            }
-            $message .= sprintf(' in %s at line %d.', $stream->getFilename(), $stream->getCurrent()->getLine());
-
-            @trigger_error($message, E_USER_DEPRECATED);
-        }
-
-        $class = $this->getTestNodeClass($parser, $test);
-        $arguments = null;
-        if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-            $arguments = $parser->getExpressionParser()->parseArguments(true);
-        }
-
-        return new $class($node, $name, $arguments, $parser->getCurrentToken()->getLine());
-    }
-
-    protected function getTest(Twig_Parser $parser, $line)
-    {
-        $stream = $parser->getStream();
-        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-        $env = $parser->getEnvironment();
-
-        if ($test = $env->getTest($name)) {
-            return array($name, $test);
-        }
-
-        if ($stream->test(Twig_Token::NAME_TYPE)) {
-            // try 2-words tests
-            $name = $name.' '.$parser->getCurrentToken()->getValue();
-
-            if ($test = $env->getTest($name)) {
-                $parser->getStream()->next();
-
-                return array($name, $test);
-            }
-        }
-
-        $e = new Twig_Error_Syntax(sprintf('Unknown "%s" test.', $name), $line, $parser->getFilename());
-        $e->addSuggestions($name, array_keys($env->getTests()));
-
-        throw $e;
-    }
-
-    protected function getTestNodeClass(Twig_Parser $parser, $test)
-    {
-        if ($test instanceof Twig_SimpleTest) {
-            return $test->getNodeClass();
-        }
-
-        return $test instanceof Twig_Test_Node ? $test->getClass() : 'Twig_Node_Expression_Test';
-    }
-
     public function getName()
     {
         return 'core';
@@ -343,7 +280,7 @@ class Twig_Extension_Core extends Twig_Extension
 /**
  * Cycles over a value.
  *
- * @param ArrayAccess|array $values   An array or an ArrayAccess instance
+ * @param ArrayAccess|array $values
  * @param int               $position The cycle position
  *
  * @return string The next value in the cycle
@@ -363,10 +300,10 @@ function twig_cycle($values, $position)
  * - a random character from a string
  * - a random integer between 0 and the integer parameter.
  *
- * @param Twig_Environment             $env    A Twig_Environment instance
- * @param Traversable|array|int|string $values The values to pick a random item from
+ * @param Twig_Environment                   $env
+ * @param Traversable|array|int|float|string $values The values to pick a random item from
  *
- * @throws Twig_Error_Runtime When $values is an empty array (does not apply to an empty string which is returned as is).
+ * @throws Twig_Error_Runtime when $values is an empty array (does not apply to an empty string which is returned as is)
  *
  * @return mixed A random value from the given sequence
  */
@@ -423,7 +360,7 @@ function twig_random(Twig_Environment $env, $values = null)
  *   {{ post.published_at|date("m/d/Y") }}
  * </pre>
  *
- * @param Twig_Environment                               $env      A Twig_Environment instance
+ * @param Twig_Environment                               $env
  * @param DateTime|DateTimeInterface|DateInterval|string $date     A date
  * @param string|null                                    $format   The target format, null to use the default
  * @param DateTimeZone|string|null|false                 $timezone The target timezone, null to use the default, false to leave unchanged
@@ -433,7 +370,7 @@ function twig_random(Twig_Environment $env, $values = null)
 function twig_date_format_filter(Twig_Environment $env, $date, $format = null, $timezone = null)
 {
     if (null === $format) {
-        $formats = $env->getExtension('core')->getDateFormat();
+        $formats = $env->getExtension('Twig_Extension_Core')->getDateFormat();
         $format = $date instanceof DateInterval ? $formats[1] : $formats[0];
     }
 
@@ -451,7 +388,7 @@ function twig_date_format_filter(Twig_Environment $env, $date, $format = null, $
  *   {{ post.published_at|date_modify("-1day")|date("m/d/Y") }}
  * </pre>
  *
- * @param Twig_Environment $env      A Twig_Environment instance
+ * @param Twig_Environment $env
  * @param DateTime|string  $date     A date
  * @param string           $modifier A modifier string
  *
@@ -477,7 +414,7 @@ function twig_date_modify_filter(Twig_Environment $env, $date, $modifier)
  *    {% endif %}
  * </pre>
  *
- * @param Twig_Environment                       $env      A Twig_Environment instance
+ * @param Twig_Environment                       $env
  * @param DateTime|DateTimeInterface|string|null $date     A date
  * @param DateTimeZone|string|null|false         $timezone The target timezone, null to use the default, false to leave unchanged
  *
@@ -488,7 +425,7 @@ function twig_date_converter(Twig_Environment $env, $date = null, $timezone = nu
     // determine the timezone
     if (false !== $timezone) {
         if (null === $timezone) {
-            $timezone = $env->getExtension('core')->getTimezone();
+            $timezone = $env->getExtension('Twig_Extension_Core')->getTimezone();
         } elseif (!$timezone instanceof DateTimeZone) {
             $timezone = new DateTimeZone($timezone);
         }
@@ -509,14 +446,14 @@ function twig_date_converter(Twig_Environment $env, $date = null, $timezone = nu
     }
 
     if (null === $date || 'now' === $date) {
-        return new DateTime($date, false !== $timezone ? $timezone : $env->getExtension('core')->getTimezone());
+        return new DateTime($date, false !== $timezone ? $timezone : $env->getExtension('Twig_Extension_Core')->getTimezone());
     }
 
     $asString = (string) $date;
     if (ctype_digit($asString) || (!empty($asString) && '-' === $asString[0] && ctype_digit(substr($asString, 1)))) {
         $date = new DateTime('@'.$date);
     } else {
-        $date = new DateTime($date, $env->getExtension('core')->getTimezone());
+        $date = new DateTime($date, $env->getExtension('Twig_Extension_Core')->getTimezone());
     }
 
     if (false !== $timezone) {
@@ -544,7 +481,7 @@ function twig_replace_filter($str, $from, $to = null)
 
         return strtr($str, $from, $to);
     } elseif (!is_array($from)) {
-        throw new Twig_Error_Runtime(sprintf('The "replace" filter expects an array or "Traversable" as replace values, got "%s".',is_object($from) ? get_class($from) : gettype($from)));
+        throw new Twig_Error_Runtime(sprintf('The "replace" filter expects an array or "Traversable" as replace values, got "%s".', is_object($from) ? get_class($from) : gettype($from)));
     }
 
     return strtr($str, $from);
@@ -579,17 +516,17 @@ function twig_round($value, $precision = 0, $method = 'common')
  * be used.  Supplying any of the parameters will override the defaults set in the
  * environment object.
  *
- * @param Twig_Environment $env          A Twig_Environment instance
+ * @param Twig_Environment $env
  * @param mixed            $number       A float/int/string of the number to format
- * @param int              $decimal      The number of decimal points to display.
- * @param string           $decimalPoint The character(s) to use for the decimal point.
- * @param string           $thousandSep  The character(s) to use for the thousands separator.
+ * @param int              $decimal      the number of decimal points to display
+ * @param string           $decimalPoint the character(s) to use for the decimal point
+ * @param string           $thousandSep  the character(s) to use for the thousands separator
  *
  * @return string The formatted number
  */
 function twig_number_format_filter(Twig_Environment $env, $number, $decimal = null, $decimalPoint = null, $thousandSep = null)
 {
-    $defaults = $env->getExtension('core')->getNumberFormat();
+    $defaults = $env->getExtension('Twig_Extension_Core')->getNumberFormat();
     if (null === $decimal) {
         $decimal = $defaults[0];
     }
@@ -629,7 +566,7 @@ if (PHP_VERSION_ID < 50300) {
     /**
      * JSON encodes a variable.
      *
-     * @param mixed $value   The value to encode.
+     * @param mixed $value   the value to encode
      * @param int   $options Not used on PHP 5.2.x
      *
      * @return mixed The JSON encoded value
@@ -648,7 +585,7 @@ if (PHP_VERSION_ID < 50300) {
     /**
      * JSON encodes a variable.
      *
-     * @param mixed $value   The value to encode.
+     * @param mixed $value   the value to encode
      * @param int   $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
      *
      * @return mixed The JSON encoded value
@@ -708,7 +645,7 @@ function twig_array_merge($arr1, $arr2)
 /**
  * Slices a variable.
  *
- * @param Twig_Environment $env          A Twig_Environment instance
+ * @param Twig_Environment $env
  * @param mixed            $item         A variable
  * @param int              $start        Start of the slice
  * @param int              $length       Size of the slice
@@ -719,7 +656,7 @@ function twig_array_merge($arr1, $arr2)
 function twig_slice(Twig_Environment $env, $item, $start, $length = null, $preserveKeys = false)
 {
     if ($item instanceof Traversable) {
-        if ($item instanceof IteratorAggregate) {
+        while ($item instanceof IteratorAggregate) {
             $item = $item->getIterator();
         }
 
@@ -750,7 +687,7 @@ function twig_slice(Twig_Environment $env, $item, $start, $length = null, $prese
 /**
  * Returns the first element of the item.
  *
- * @param Twig_Environment $env  A Twig_Environment instance
+ * @param Twig_Environment $env
  * @param mixed            $item A variable
  *
  * @return mixed The first element of the item
@@ -765,7 +702,7 @@ function twig_first(Twig_Environment $env, $item)
 /**
  * Returns the last element of the item.
  *
- * @param Twig_Environment $env  A Twig_Environment instance
+ * @param Twig_Environment $env
  * @param mixed            $item A variable
  *
  * @return mixed The last element of the item
@@ -821,7 +758,7 @@ function twig_join_filter($value, $glue = '')
  *  {# returns [aa, bb, cc] #}
  * </pre>
  *
- * @param Twig_Environment $env       A Twig_Environment instance
+ * @param Twig_Environment $env
  * @param string           $value     A string
  * @param string           $delimiter The delimiter
  * @param int              $limit     The limit
@@ -888,7 +825,27 @@ function _twig_default_filter($value, $default = '')
 function twig_get_array_keys_filter($array)
 {
     if ($array instanceof Traversable) {
-        return array_keys(iterator_to_array($array));
+        while ($array instanceof IteratorAggregate) {
+            $array = $array->getIterator();
+        }
+
+        if ($array instanceof Iterator) {
+            $keys = array();
+            $array->rewind();
+            while ($array->valid()) {
+                $keys[] = $array->key();
+                $array->next();
+            }
+
+            return $keys;
+        }
+
+        $keys = array();
+        foreach ($array as $key => $item) {
+            $keys[] = $key;
+        }
+
+        return $keys;
     }
 
     if (!is_array($array)) {
@@ -901,7 +858,7 @@ function twig_get_array_keys_filter($array)
 /**
  * Reverses a variable.
  *
- * @param Twig_Environment         $env          A Twig_Environment instance
+ * @param Twig_Environment         $env
  * @param array|Traversable|string $item         An array, a Traversable instance, or a string
  * @param bool                     $preserveKeys Whether to preserve key or not
  *
@@ -968,17 +925,56 @@ function twig_in_filter($value, $compare)
     } elseif (is_string($compare) && (is_string($value) || is_int($value) || is_float($value))) {
         return '' === $value || false !== strpos($compare, (string) $value);
     } elseif ($compare instanceof Traversable) {
-        return in_array($value, iterator_to_array($compare, false), is_object($value) || is_resource($value));
+        if (is_object($value) || is_resource($value)) {
+            foreach ($compare as $item) {
+                if ($item === $value) {
+                    return true;
+                }
+            }
+        } else {
+            foreach ($compare as $item) {
+                if ($item == $value) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 
     return false;
 }
 
+/**
+ * Returns a trimmed string.
+ *
+ * @return string
+ *
+ * @throws Twig_Error_Runtime When an invalid trimming side is used (not a string or not 'left', 'right', or 'both')
+ */
+function twig_trim_filter($string, $characterMask = null, $side = 'both')
+{
+    if (null === $characterMask) {
+        $characterMask = " \t\n\r\0\x0B";
+    }
+
+    switch ($side) {
+        case 'both':
+            return trim($string, $characterMask);
+        case 'left':
+            return ltrim($string, $characterMask);
+        case 'right':
+            return rtrim($string, $characterMask);
+        default:
+            throw new Twig_Error_Runtime('Trimming side must be "left", "right" or "both".');
+    }
+}
+
 /**
  * Escapes a string.
  *
- * @param Twig_Environment $env        A Twig_Environment instance
- * @param string           $string     The value to be escaped
+ * @param Twig_Environment $env
+ * @param mixed            $string     The value to be escaped
  * @param string           $strategy   The escaping strategy
  * @param string           $charset    The charset
  * @param bool             $autoescape Whether the function is called by the auto-escaping feature (true) or by the developer (false)
@@ -1058,7 +1054,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
                 $string = twig_convert_encoding($string, 'UTF-8', $charset);
             }
 
-            if (0 == strlen($string) ? false : (1 == preg_match('/^./su', $string) ? false : true)) {
+            if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
                 throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
             }
 
@@ -1075,7 +1071,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
                 $string = twig_convert_encoding($string, 'UTF-8', $charset);
             }
 
-            if (0 == strlen($string) ? false : (1 == preg_match('/^./su', $string) ? false : true)) {
+            if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
                 throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
             }
 
@@ -1092,7 +1088,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
                 $string = twig_convert_encoding($string, 'UTF-8', $charset);
             }
 
-            if (0 == strlen($string) ? false : (1 == preg_match('/^./su', $string) ? false : true)) {
+            if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
                 throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
             }
 
@@ -1115,7 +1111,7 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
             static $escapers;
 
             if (null === $escapers) {
-                $escapers = $env->getExtension('core')->getEscapers();
+                $escapers = $env->getExtension('Twig_Extension_Core')->getEscapers();
             }
 
             if (isset($escapers[$strategy])) {
@@ -1172,8 +1168,13 @@ function _twig_escape_js_callback($matches)
 
     // \uHHHH
     $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
+    $char = strtoupper(bin2hex($char));
 
-    return '\\u'.strtoupper(substr('0000'.bin2hex($char), -4));
+    if (4 >= strlen($char)) {
+        return sprintf('\u%04s', $char);
+    }
+
+    return sprintf('\u%04s\u%04s', substr($char, 0, -4), substr($char, -4));
 }
 
 function _twig_escape_css_callback($matches)
@@ -1256,20 +1257,28 @@ if (function_exists('mb_get_info')) {
     /**
      * Returns the length of a variable.
      *
-     * @param Twig_Environment $env   A Twig_Environment instance
+     * @param Twig_Environment $env
      * @param mixed            $thing A variable
      *
      * @return int The length of the value
      */
     function twig_length_filter(Twig_Environment $env, $thing)
     {
-        return is_scalar($thing) ? mb_strlen($thing, $env->getCharset()) : count($thing);
+        if (is_scalar($thing)) {
+            return mb_strlen($thing, $env->getCharset());
+        }
+
+        if (method_exists($thing, '__toString') && !$thing instanceof \Countable) {
+            return mb_strlen((string) $thing, $env->getCharset());
+        }
+
+        return count($thing);
     }
 
     /**
      * Converts a string to uppercase.
      *
-     * @param Twig_Environment $env    A Twig_Environment instance
+     * @param Twig_Environment $env
      * @param string           $string A string
      *
      * @return string The uppercased string
@@ -1286,7 +1295,7 @@ if (function_exists('mb_get_info')) {
     /**
      * Converts a string to lowercase.
      *
-     * @param Twig_Environment $env    A Twig_Environment instance
+     * @param Twig_Environment $env
      * @param string           $string A string
      *
      * @return string The lowercased string
@@ -1303,7 +1312,7 @@ if (function_exists('mb_get_info')) {
     /**
      * Returns a titlecased string.
      *
-     * @param Twig_Environment $env    A Twig_Environment instance
+     * @param Twig_Environment $env
      * @param string           $string A string
      *
      * @return string The titlecased string
@@ -1320,7 +1329,7 @@ if (function_exists('mb_get_info')) {
     /**
      * Returns a capitalized string.
      *
-     * @param Twig_Environment $env    A Twig_Environment instance
+     * @param Twig_Environment $env
      * @param string           $string A string
      *
      * @return string The capitalized string
@@ -1339,20 +1348,28 @@ else {
     /**
      * Returns the length of a variable.
      *
-     * @param Twig_Environment $env   A Twig_Environment instance
+     * @param Twig_Environment $env
      * @param mixed            $thing A variable
      *
      * @return int The length of the value
      */
     function twig_length_filter(Twig_Environment $env, $thing)
     {
-        return is_scalar($thing) ? strlen($thing) : count($thing);
+        if (is_scalar($thing)) {
+            return strlen($thing);
+        }
+
+        if (method_exists($thing, '__toString') && !$thing instanceof \Countable) {
+            return strlen((string) $thing);
+        }
+
+        return count($thing);
     }
 
     /**
      * Returns a titlecased string.
      *
-     * @param Twig_Environment $env    A Twig_Environment instance
+     * @param Twig_Environment $env
      * @param string           $string A string
      *
      * @return string The titlecased string
@@ -1365,7 +1382,7 @@ else {
     /**
      * Returns a capitalized string.
      *
-     * @param Twig_Environment $env    A Twig_Environment instance
+     * @param Twig_Environment $env
      * @param string           $string A string
      *
      * @return string The capitalized string
@@ -1408,6 +1425,10 @@ function twig_test_empty($value)
         return 0 == count($value);
     }
 
+    if (method_exists($value, '__toString')) {
+        return '' === (string) $value;
+    }
+
     return '' === $value || false === $value || null === $value || array() === $value;
 }
 
@@ -1451,8 +1472,8 @@ function twig_include(Twig_Environment $env, $context, $template, $variables = a
         $variables = array_merge($context, $variables);
     }
 
-    if ($isSandboxed = $sandboxed && $env->hasExtension('sandbox')) {
-        $sandbox = $env->getExtension('sandbox');
+    if ($isSandboxed = $sandboxed && $env->hasExtension('Twig_Extension_Sandbox')) {
+        $sandbox = $env->getExtension('Twig_Extension_Sandbox');
         if (!$alreadySandboxed = $sandbox->isSandboxed()) {
             $sandbox->enableSandbox();
         }
@@ -1469,6 +1490,18 @@ function twig_include(Twig_Environment $env, $context, $template, $variables = a
 
             throw $e;
         }
+    } catch (Throwable $e) {
+        if ($isSandboxed && !$alreadySandboxed) {
+            $sandbox->disableSandbox();
+        }
+
+        throw $e;
+    } catch (Exception $e) {
+        if ($isSandboxed && !$alreadySandboxed) {
+            $sandbox->disableSandbox();
+        }
+
+        throw $e;
     }
 
     if ($isSandboxed && !$alreadySandboxed) {
@@ -1489,8 +1522,13 @@ function twig_include(Twig_Environment $env, $context, $template, $variables = a
  */
 function twig_source(Twig_Environment $env, $name, $ignoreMissing = false)
 {
+    $loader = $env->getLoader();
     try {
-        return $env->getLoader()->getSource($name);
+        if (!$loader instanceof Twig_SourceContextLoaderInterface) {
+            return $loader->getSource($name);
+        } else {
+            return $loader->getSourceContext($name)->getCode();
+        }
     } catch (Twig_Error_Loader $e) {
         if (!$ignoreMissing) {
             throw $e;
@@ -1515,6 +1553,23 @@ function twig_constant($constant, $object = null)
     return constant($constant);
 }
 
+/**
+ * Checks if a constant exists.
+ *
+ * @param string      $constant The name of the constant
+ * @param null|object $object   The object to get the constant from
+ *
+ * @return bool
+ */
+function twig_constant_is_defined($constant, $object = null)
+{
+    if (null !== $object) {
+        $constant = get_class($object).'::'.$constant;
+    }
+
+    return defined($constant);
+}
+
 /**
  * Batches item.
  *
diff --git a/web/vendor/twig/twig/lib/Twig/Extension/Debug.php b/web/vendor/twig/twig/lib/Twig/Extension/Debug.php
index 42fdb1e30..d22a38550 100644
--- a/web/vendor/twig/twig/lib/Twig/Extension/Debug.php
+++ b/web/vendor/twig/twig/lib/Twig/Extension/Debug.php
@@ -3,11 +3,15 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
+/**
+ * @final
+ */
 class Twig_Extension_Debug extends Twig_Extension
 {
     public function getFunctions()
diff --git a/web/vendor/twig/twig/lib/Twig/Extension/Escaper.php b/web/vendor/twig/twig/lib/Twig/Extension/Escaper.php
index 0be721d5b..118b6b367 100644
--- a/web/vendor/twig/twig/lib/Twig/Extension/Escaper.php
+++ b/web/vendor/twig/twig/lib/Twig/Extension/Escaper.php
@@ -3,18 +3,20 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
+/**
+ * @final
+ */
 class Twig_Extension_Escaper extends Twig_Extension
 {
     protected $defaultStrategy;
 
     /**
-     * Constructor.
-     *
      * @param string|false|callable $defaultStrategy An escaping strategy
      *
      * @see setDefaultStrategy()
@@ -45,7 +47,7 @@ class Twig_Extension_Escaper extends Twig_Extension
      * Sets the default strategy to use when not defined by the user.
      *
      * The strategy can be a valid PHP callback that takes the template
-     * "filename" as an argument and returns the strategy to use.
+     * name as an argument and returns the strategy to use.
      *
      * @param string|false|callable $defaultStrategy An escaping strategy
      */
@@ -59,6 +61,12 @@ class Twig_Extension_Escaper extends Twig_Extension
         }
 
         if ('filename' === $defaultStrategy) {
+            @trigger_error('Using "filename" as the default strategy is deprecated since version 1.27. Use "name" instead.', E_USER_DEPRECATED);
+
+            $defaultStrategy = 'name';
+        }
+
+        if ('name' === $defaultStrategy) {
             $defaultStrategy = array('Twig_FileExtensionEscapingStrategy', 'guess');
         }
 
@@ -68,16 +76,16 @@ class Twig_Extension_Escaper extends Twig_Extension
     /**
      * Gets the default strategy to use when not defined by the user.
      *
-     * @param string $filename The template "filename"
+     * @param string $name The template name
      *
      * @return string|false The default strategy to use for the template
      */
-    public function getDefaultStrategy($filename)
+    public function getDefaultStrategy($name)
     {
         // disable string callables to avoid calling a function named html or js,
         // or any other upcoming escaping strategy
         if (!is_string($this->defaultStrategy) && false !== $this->defaultStrategy) {
-            return call_user_func($this->defaultStrategy, $filename);
+            return call_user_func($this->defaultStrategy, $name);
         }
 
         return $this->defaultStrategy;
diff --git a/web/vendor/twig/twig/lib/Twig/Extension/Optimizer.php b/web/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
index 5a64a1a4e..e100f0b54 100644
--- a/web/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
+++ b/web/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
@@ -3,11 +3,15 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
+/**
+ * @final
+ */
 class Twig_Extension_Optimizer extends Twig_Extension
 {
     protected $optimizers;
diff --git a/web/vendor/twig/twig/lib/Twig/Extension/Profiler.php b/web/vendor/twig/twig/lib/Twig/Extension/Profiler.php
index 4d9f97f89..1d874ef8e 100644
--- a/web/vendor/twig/twig/lib/Twig/Extension/Profiler.php
+++ b/web/vendor/twig/twig/lib/Twig/Extension/Profiler.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -36,7 +36,7 @@ class Twig_Extension_Profiler extends Twig_Extension
 
     public function getNodeVisitors()
     {
-        return array(new Twig_Profiler_NodeVisitor_Profiler($this->getName()));
+        return array(new Twig_Profiler_NodeVisitor_Profiler(get_class($this)));
     }
 
     public function getName()
diff --git a/web/vendor/twig/twig/lib/Twig/Extension/Sandbox.php b/web/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
index 760d12382..1469a1e04 100644
--- a/web/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
+++ b/web/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
@@ -3,11 +3,15 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
+/**
+ * @final
+ */
 class Twig_Extension_Sandbox extends Twig_Extension
 {
     protected $sandboxedGlobally;
diff --git a/web/vendor/twig/twig/lib/Twig/Extension/Staging.php b/web/vendor/twig/twig/lib/Twig/Extension/Staging.php
index d21004d09..34b71d27e 100644
--- a/web/vendor/twig/twig/lib/Twig/Extension/Staging.php
+++ b/web/vendor/twig/twig/lib/Twig/Extension/Staging.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -29,6 +29,10 @@ class Twig_Extension_Staging extends Twig_Extension
 
     public function addFunction($name, $function)
     {
+        if (isset($this->functions[$name])) {
+            @trigger_error(sprintf('Overriding function "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
+        }
+
         $this->functions[$name] = $function;
     }
 
@@ -39,6 +43,10 @@ class Twig_Extension_Staging extends Twig_Extension
 
     public function addFilter($name, $filter)
     {
+        if (isset($this->filters[$name])) {
+            @trigger_error(sprintf('Overriding filter "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
+        }
+
         $this->filters[$name] = $filter;
     }
 
@@ -59,7 +67,11 @@ class Twig_Extension_Staging extends Twig_Extension
 
     public function addTokenParser(Twig_TokenParserInterface $parser)
     {
-        $this->tokenParsers[] = $parser;
+        if (isset($this->tokenParsers[$parser->getTag()])) {
+            @trigger_error(sprintf('Overriding tag "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $parser->getTag()), E_USER_DEPRECATED);
+        }
+
+        $this->tokenParsers[$parser->getTag()] = $parser;
     }
 
     public function getTokenParsers()
@@ -79,6 +91,10 @@ class Twig_Extension_Staging extends Twig_Extension
 
     public function addTest($name, $test)
     {
+        if (isset($this->tests[$name])) {
+            @trigger_error(sprintf('Overriding test "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
+        }
+
         $this->tests[$name] = $test;
     }
 
diff --git a/web/vendor/twig/twig/lib/Twig/Extension/StringLoader.php b/web/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
index 2a3ddb6a7..c41517397 100644
--- a/web/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
+++ b/web/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
@@ -3,11 +3,15 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
+/**
+ * @final
+ */
 class Twig_Extension_StringLoader extends Twig_Extension
 {
     public function getFunctions()
@@ -33,7 +37,7 @@ class Twig_Extension_StringLoader extends Twig_Extension
  * @param Twig_Environment $env      A Twig_Environment instance
  * @param string           $template A template as a string or object implementing __toString()
  *
- * @return Twig_Template A Twig_Template instance
+ * @return Twig_Template
  */
 function twig_template_from_string(Twig_Environment $env, $template)
 {
diff --git a/web/vendor/twig/twig/lib/Twig/ExtensionInterface.php b/web/vendor/twig/twig/lib/Twig/ExtensionInterface.php
index 776ffeba8..c5214bd56 100644
--- a/web/vendor/twig/twig/lib/Twig/ExtensionInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/ExtensionInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,8 +21,6 @@ interface Twig_ExtensionInterface
      *
      * This is where you can load some file that contains filter functions for instance.
      *
-     * @param Twig_Environment $environment The current Twig_Environment instance
-     *
      * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_InitRuntimeInterface instead
      */
     public function initRuntime(Twig_Environment $environment);
@@ -37,7 +35,7 @@ interface Twig_ExtensionInterface
     /**
      * Returns the node visitor instances to add to the existing list.
      *
-     * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
+     * @return Twig_NodeVisitorInterface[]
      */
     public function getNodeVisitors();
 
@@ -65,7 +63,7 @@ interface Twig_ExtensionInterface
     /**
      * Returns a list of operators to add to the existing list.
      *
-     * @return array An array of operators
+     * @return array<array> First array of unary operators, second array of binary operators
      */
     public function getOperators();
 
@@ -82,6 +80,8 @@ interface Twig_ExtensionInterface
      * Returns the name of the extension.
      *
      * @return string The extension name
+     *
+     * @deprecated since 1.26 (to be removed in 2.0), not used anymore internally
      */
     public function getName();
 }
diff --git a/web/vendor/twig/twig/lib/Twig/FactoryRuntimeLoader.php b/web/vendor/twig/twig/lib/Twig/FactoryRuntimeLoader.php
new file mode 100644
index 000000000..f428047ca
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/FactoryRuntimeLoader.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Lazy loads the runtime implementations for a Twig element.
+ *
+ * @author Robin Chalas <robin.chalas@gmail.com>
+ */
+class Twig_FactoryRuntimeLoader implements Twig_RuntimeLoaderInterface
+{
+    private $map;
+
+    /**
+     * @param array $map An array where keys are class names and values factory callables
+     */
+    public function __construct($map = array())
+    {
+        $this->map = $map;
+    }
+
+    public function load($class)
+    {
+        if (isset($this->map[$class])) {
+            $runtimeFactory = $this->map[$class];
+
+            return $runtimeFactory();
+        }
+    }
+}
diff --git a/web/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php b/web/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
index 9bda0b4f6..47183726b 100644
--- a/web/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
+++ b/web/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +13,7 @@
  * Default autoescaping strategy based on file names.
  *
  * This strategy sets the HTML as the default autoescaping strategy,
- * but changes it based on the filename.
+ * but changes it based on the template name.
  *
  * Note that there is no runtime performance impact as the
  * default autoescaping strategy is set at compilation time.
@@ -25,21 +25,21 @@ class Twig_FileExtensionEscapingStrategy
     /**
      * Guesses the best autoescaping strategy based on the file name.
      *
-     * @param string $filename The template file name
+     * @param string $name The template name
      *
      * @return string|false The escaping strategy name to use or false to disable
      */
-    public static function guess($filename)
+    public static function guess($name)
     {
-        if (in_array(substr($filename, -1), array('/', '\\'))) {
+        if (in_array(substr($name, -1), array('/', '\\'))) {
             return 'html'; // return html for directories
         }
 
-        if ('.twig' === substr($filename, -5)) {
-            $filename = substr($filename, 0, -5);
+        if ('.twig' === substr($name, -5)) {
+            $name = substr($name, 0, -5);
         }
 
-        $extension = pathinfo($filename, PATHINFO_EXTENSION);
+        $extension = pathinfo($name, PATHINFO_EXTENSION);
 
         switch ($extension) {
             case 'js':
diff --git a/web/vendor/twig/twig/lib/Twig/Filter.php b/web/vendor/twig/twig/lib/Twig/Filter.php
index 101d2e793..893d75d10 100644
--- a/web/vendor/twig/twig/lib/Twig/Filter.php
+++ b/web/vendor/twig/twig/lib/Twig/Filter.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Filter/Function.php b/web/vendor/twig/twig/lib/Twig/Filter/Function.php
index d679cab2f..71b16554e 100644
--- a/web/vendor/twig/twig/lib/Twig/Filter/Function.php
+++ b/web/vendor/twig/twig/lib/Twig/Filter/Function.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Filter/Method.php b/web/vendor/twig/twig/lib/Twig/Filter/Method.php
index 655aab405..1b75676c5 100644
--- a/web/vendor/twig/twig/lib/Twig/Filter/Method.php
+++ b/web/vendor/twig/twig/lib/Twig/Filter/Method.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -37,6 +37,6 @@ class Twig_Filter_Method extends Twig_Filter
 
     public function compile()
     {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
+        return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
     }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Filter/Node.php b/web/vendor/twig/twig/lib/Twig/Filter/Node.php
index a922f5037..3e6b12eff 100644
--- a/web/vendor/twig/twig/lib/Twig/Filter/Node.php
+++ b/web/vendor/twig/twig/lib/Twig/Filter/Node.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/FilterCallableInterface.php b/web/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
index 567986131..21b028c4e 100644
--- a/web/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/FilterInterface.php b/web/vendor/twig/twig/lib/Twig/FilterInterface.php
index 6b0be0e30..9d7e9ab6a 100644
--- a/web/vendor/twig/twig/lib/Twig/FilterInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/FilterInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Function.php b/web/vendor/twig/twig/lib/Twig/Function.php
index 9fc76a8b7..9dc16e908 100644
--- a/web/vendor/twig/twig/lib/Twig/Function.php
+++ b/web/vendor/twig/twig/lib/Twig/Function.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Function/Function.php b/web/vendor/twig/twig/lib/Twig/Function/Function.php
index ae83e153c..97c0eb77f 100644
--- a/web/vendor/twig/twig/lib/Twig/Function/Function.php
+++ b/web/vendor/twig/twig/lib/Twig/Function/Function.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
+ * (c) Fabien Potencier
+ * (c) Arnaud Le Blanc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Function/Method.php b/web/vendor/twig/twig/lib/Twig/Function/Method.php
index ba9945ed5..4299e1181 100644
--- a/web/vendor/twig/twig/lib/Twig/Function/Method.php
+++ b/web/vendor/twig/twig/lib/Twig/Function/Method.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
+ * (c) Fabien Potencier
+ * (c) Arnaud Le Blanc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -38,6 +38,6 @@ class Twig_Function_Method extends Twig_Function
 
     public function compile()
     {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
+        return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
     }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Function/Node.php b/web/vendor/twig/twig/lib/Twig/Function/Node.php
index 118b0bab7..0adc5d937 100644
--- a/web/vendor/twig/twig/lib/Twig/Function/Node.php
+++ b/web/vendor/twig/twig/lib/Twig/Function/Node.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php b/web/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
index 87d795eb8..d23d69173 100644
--- a/web/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/FunctionInterface.php b/web/vendor/twig/twig/lib/Twig/FunctionInterface.php
index f44923441..00d4f95c7 100644
--- a/web/vendor/twig/twig/lib/Twig/FunctionInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/FunctionInterface.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
+ * (c) Fabien Potencier
+ * (c) Arnaud Le Blanc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Lexer.php b/web/vendor/twig/twig/lib/Twig/Lexer.php
index dd7987385..834b54fbe 100644
--- a/web/vendor/twig/twig/lib/Twig/Lexer.php
+++ b/web/vendor/twig/twig/lib/Twig/Lexer.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -26,6 +26,7 @@ class Twig_Lexer implements Twig_LexerInterface
     protected $states;
     protected $brackets;
     protected $env;
+    // to be renamed to $name in 2.0 (where it is private)
     protected $filename;
     protected $options;
     protected $regexes;
@@ -33,6 +34,8 @@ class Twig_Lexer implements Twig_LexerInterface
     protected $positions;
     protected $currentVarBlockLine;
 
+    private $source;
+
     const STATE_DATA = 0;
     const STATE_BLOCK = 1;
     const STATE_VAR = 2;
@@ -72,11 +75,19 @@ class Twig_Lexer implements Twig_LexerInterface
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function tokenize($code, $filename = null)
+    public function tokenize($code, $name = null)
     {
+        if (!$code instanceof Twig_Source) {
+            @trigger_error(sprintf('Passing a string as the $code argument of %s() is deprecated since version 1.27 and will be removed in 2.0. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
+            $this->source = new Twig_Source($code, $name);
+        } else {
+            $this->source = $code;
+        }
+
+        if (((int) ini_get('mbstring.func_overload')) & 2) {
+            @trigger_error('Support for having "mbstring.func_overload" different from 0 is deprecated version 1.29 and will be removed in 2.0.', E_USER_DEPRECATED);
+        }
+
         if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
             $mbEncoding = mb_internal_encoding();
             mb_internal_encoding('ASCII');
@@ -84,8 +95,8 @@ class Twig_Lexer implements Twig_LexerInterface
             $mbEncoding = null;
         }
 
-        $this->code = str_replace(array("\r\n", "\r"), "\n", $code);
-        $this->filename = $filename;
+        $this->code = str_replace(array("\r\n", "\r"), "\n", $this->source->getCode());
+        $this->filename = $this->source->getName();
         $this->cursor = 0;
         $this->lineno = 1;
         $this->end = strlen($this->code);
@@ -129,14 +140,14 @@ class Twig_Lexer implements Twig_LexerInterface
 
         if (!empty($this->brackets)) {
             list($expect, $lineno) = array_pop($this->brackets);
-            throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->filename);
+            throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
         }
 
         if ($mbEncoding) {
             mb_internal_encoding($mbEncoding);
         }
 
-        return new Twig_TokenStream($this->tokens, $this->filename);
+        return new Twig_TokenStream($this->tokens, $this->source);
     }
 
     protected function lexData()
@@ -224,7 +235,7 @@ class Twig_Lexer implements Twig_LexerInterface
             $this->moveCursor($match[0]);
 
             if ($this->cursor >= $this->end) {
-                throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->currentVarBlockLine, $this->filename);
+                throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->currentVarBlockLine, $this->source);
             }
         }
 
@@ -256,12 +267,12 @@ class Twig_Lexer implements Twig_LexerInterface
             // closing bracket
             elseif (false !== strpos(')]}', $this->code[$this->cursor])) {
                 if (empty($this->brackets)) {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected "%s".', $this->code[$this->cursor]), $this->lineno, $this->filename);
+                    throw new Twig_Error_Syntax(sprintf('Unexpected "%s".', $this->code[$this->cursor]), $this->lineno, $this->source);
                 }
 
                 list($expect, $lineno) = array_pop($this->brackets);
                 if ($this->code[$this->cursor] != strtr($expect, '([{', ')]}')) {
-                    throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->filename);
+                    throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
                 }
             }
 
@@ -281,7 +292,7 @@ class Twig_Lexer implements Twig_LexerInterface
         }
         // unlexable
         else {
-            throw new Twig_Error_Syntax(sprintf('Unexpected character "%s".', $this->code[$this->cursor]), $this->lineno, $this->filename);
+            throw new Twig_Error_Syntax(sprintf('Unexpected character "%s".', $this->code[$this->cursor]), $this->lineno, $this->source);
         }
     }
 
@@ -292,7 +303,7 @@ class Twig_Lexer implements Twig_LexerInterface
         }
 
         if (!preg_match(str_replace('%s', $tag, $this->regexes['lex_raw_data']), $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s" block.', $tag), $this->lineno, $this->filename);
+            throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s" block.', $tag), $this->lineno, $this->source);
         }
 
         $text = substr($this->code, $this->cursor, $match[0][1] - $this->cursor);
@@ -308,7 +319,7 @@ class Twig_Lexer implements Twig_LexerInterface
     protected function lexComment()
     {
         if (!preg_match($this->regexes['lex_comment'], $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax('Unclosed comment.', $this->lineno, $this->filename);
+            throw new Twig_Error_Syntax('Unclosed comment.', $this->lineno, $this->source);
         }
 
         $this->moveCursor(substr($this->code, $this->cursor, $match[0][1] - $this->cursor).$match[0][0]);
@@ -327,7 +338,7 @@ class Twig_Lexer implements Twig_LexerInterface
         } elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
             list($expect, $lineno) = array_pop($this->brackets);
             if ($this->code[$this->cursor] != '"') {
-                throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->filename);
+                throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
             }
 
             $this->popState();
@@ -403,7 +414,7 @@ class Twig_Lexer implements Twig_LexerInterface
     protected function popState()
     {
         if (0 === count($this->states)) {
-            throw new Exception('Cannot pop state without a previous state');
+            throw new Exception('Cannot pop state without a previous state.');
         }
 
         $this->state = array_pop($this->states);
diff --git a/web/vendor/twig/twig/lib/Twig/LexerInterface.php b/web/vendor/twig/twig/lib/Twig/LexerInterface.php
index 24a947870..c10bbfec4 100644
--- a/web/vendor/twig/twig/lib/Twig/LexerInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/LexerInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,12 +21,12 @@ interface Twig_LexerInterface
     /**
      * Tokenizes a source code.
      *
-     * @param string $code     The source code
-     * @param string $filename A unique identifier for the source code
+     * @param string|Twig_Source $code The source code
+     * @param string             $name A unique identifier for the source code
      *
-     * @return Twig_TokenStream A token stream instance
+     * @return Twig_TokenStream
      *
      * @throws Twig_Error_Syntax When the code is syntactically wrong
      */
-    public function tokenize($code, $filename = null);
+    public function tokenize($code, $name = null);
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Loader/Array.php b/web/vendor/twig/twig/lib/Twig/Loader/Array.php
index 90221d5db..430efd060 100644
--- a/web/vendor/twig/twig/lib/Twig/Loader/Array.php
+++ b/web/vendor/twig/twig/lib/Twig/Loader/Array.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,18 +19,18 @@
  *
  * This loader should only be used for unit testing.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
+class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
 {
     protected $templates = array();
 
     /**
-     * Constructor.
-     *
      * @param array $templates An array of templates (keys are the names, and values are the source code)
      */
-    public function __construct(array $templates)
+    public function __construct(array $templates = array())
     {
         $this->templates = $templates;
     }
@@ -46,11 +46,10 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
         $this->templates[(string) $name] = $template;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSource($name)
     {
+        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
+
         $name = (string) $name;
         if (!isset($this->templates[$name])) {
             throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
@@ -59,17 +58,21 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
         return $this->templates[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    public function getSourceContext($name)
+    {
+        $name = (string) $name;
+        if (!isset($this->templates[$name])) {
+            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
+        }
+
+        return new Twig_Source($this->templates[$name], $name);
+    }
+
     public function exists($name)
     {
         return isset($this->templates[(string) $name]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCacheKey($name)
     {
         $name = (string) $name;
@@ -80,9 +83,6 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
         return $this->templates[$name];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFresh($name, $time)
     {
         $name = (string) $name;
diff --git a/web/vendor/twig/twig/lib/Twig/Loader/Chain.php b/web/vendor/twig/twig/lib/Twig/Loader/Chain.php
index 81d57adae..ffa892b17 100644
--- a/web/vendor/twig/twig/lib/Twig/Loader/Chain.php
+++ b/web/vendor/twig/twig/lib/Twig/Loader/Chain.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,17 +12,17 @@
 /**
  * Loads templates from other loaders.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
+class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
 {
     private $hasSourceCache = array();
     protected $loaders = array();
 
     /**
-     * Constructor.
-     *
-     * @param Twig_LoaderInterface[] $loaders An array of loader instances
+     * @param Twig_LoaderInterface[] $loaders
      */
     public function __construct(array $loaders = array())
     {
@@ -31,22 +31,16 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
         }
     }
 
-    /**
-     * Adds a loader instance.
-     *
-     * @param Twig_LoaderInterface $loader A Loader instance
-     */
     public function addLoader(Twig_LoaderInterface $loader)
     {
         $this->loaders[] = $loader;
         $this->hasSourceCache = array();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSource($name)
     {
+        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
+
         $exceptions = array();
         foreach ($this->loaders as $loader) {
             if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
@@ -63,9 +57,28 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
         throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    public function getSourceContext($name)
+    {
+        $exceptions = array();
+        foreach ($this->loaders as $loader) {
+            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
+                continue;
+            }
+
+            try {
+                if ($loader instanceof Twig_SourceContextLoaderInterface) {
+                    return $loader->getSourceContext($name);
+                }
+
+                return new Twig_Source($loader->getSource($name), $name);
+            } catch (Twig_Error_Loader $e) {
+                $exceptions[] = $e->getMessage();
+            }
+        }
+
+        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
+    }
+
     public function exists($name)
     {
         $name = (string) $name;
@@ -84,7 +97,11 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
             }
 
             try {
-                $loader->getSource($name);
+                if ($loader instanceof Twig_SourceContextLoaderInterface) {
+                    $loader->getSourceContext($name);
+                } else {
+                    $loader->getSource($name);
+                }
 
                 return $this->hasSourceCache[$name] = true;
             } catch (Twig_Error_Loader $e) {
@@ -94,9 +111,6 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
         return $this->hasSourceCache[$name] = false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCacheKey($name)
     {
         $exceptions = array();
@@ -115,9 +129,6 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
         throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFresh($name, $time)
     {
         $exceptions = array();
diff --git a/web/vendor/twig/twig/lib/Twig/Loader/Filesystem.php b/web/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
index 1bc75a104..25be4e2d8 100644
--- a/web/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
+++ b/web/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,7 +14,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
+class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
 {
     /** Identifier of the main namespace. */
     const MAIN_NAMESPACE = '__main__';
@@ -23,13 +23,19 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
     protected $cache = array();
     protected $errorCache = array();
 
+    private $rootPath;
+
     /**
-     * Constructor.
-     *
-     * @param string|array $paths A path or an array of paths where to look for templates
+     * @param string|array $paths    A path or an array of paths where to look for templates
+     * @param string|null  $rootPath The root path common to all relative paths (null for getcwd())
      */
-    public function __construct($paths = array())
+    public function __construct($paths = array(), $rootPath = null)
     {
+        $this->rootPath = (null === $rootPath ? getcwd() : $rootPath).DIRECTORY_SEPARATOR;
+        if (false !== $realPath = realpath($rootPath)) {
+            $this->rootPath = $realPath.DIRECTORY_SEPARATOR;
+        }
+
         if ($paths) {
             $this->setPaths($paths);
         }
@@ -81,7 +87,7 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
      * Adds a path where templates are stored.
      *
      * @param string $path      A path where to look for templates
-     * @param string $namespace A path name
+     * @param string $namespace A path namespace
      *
      * @throws Twig_Error_Loader
      */
@@ -90,8 +96,9 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
         // invalidate the cache
         $this->cache = $this->errorCache = array();
 
-        if (!is_dir($path)) {
-            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
+        $checkPath = $this->isAbsolutePath($path) ? $path : $this->rootPath.$path;
+        if (!is_dir($checkPath)) {
+            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist ("%s").', $path, $checkPath));
         }
 
         $this->paths[$namespace][] = rtrim($path, '/\\');
@@ -101,7 +108,7 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
      * Prepends a path where templates are stored.
      *
      * @param string $path      A path where to look for templates
-     * @param string $namespace A path name
+     * @param string $namespace A path namespace
      *
      * @throws Twig_Error_Loader
      */
@@ -110,8 +117,9 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
         // invalidate the cache
         $this->cache = $this->errorCache = array();
 
-        if (!is_dir($path)) {
-            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
+        $checkPath = $this->isAbsolutePath($path) ? $path : $this->rootPath.$path;
+        if (!is_dir($checkPath)) {
+            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist ("%s").', $path, $checkPath));
         }
 
         $path = rtrim($path, '/\\');
@@ -123,25 +131,31 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getSource($name)
     {
+        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
+
         return file_get_contents($this->findTemplate($name));
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getCacheKey($name)
+    public function getSourceContext($name)
     {
-        return $this->findTemplate($name);
+        $path = $this->findTemplate($name);
+
+        return new Twig_Source(file_get_contents($path), $name, $path);
+    }
+
+    public function getCacheKey($name)
+    {
+        $path = $this->findTemplate($name);
+        $len = strlen($this->rootPath);
+        if (0 === strncmp($this->rootPath, $path, $len)) {
+            return substr($path, $len);
+        }
+
+        return $path;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function exists($name)
     {
         $name = $this->normalizeName($name);
@@ -153,13 +167,12 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
         try {
             return false !== $this->findTemplate($name, false);
         } catch (Twig_Error_Loader $exception) {
+            @trigger_error(sprintf('In %s::findTemplate(), you must accept a second argument that when set to "false" returns "false" instead of throwing an exception. Not supporting this argument is deprecated since version 1.27.', get_class($this)), E_USER_DEPRECATED);
+
             return false;
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFresh($name, $time)
     {
         return filemtime($this->findTemplate($name)) <= $time;
@@ -197,6 +210,10 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
         }
 
         foreach ($this->paths[$namespace] as $path) {
+            if (!$this->isAbsolutePath($path)) {
+                $path = $this->rootPath.'/'.$path;
+            }
+
             if (is_file($path.'/'.$shortname)) {
                 if (false !== $realpath = realpath($path.'/'.$shortname)) {
                     return $this->cache[$name] = $realpath;
@@ -257,4 +274,15 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
             }
         }
     }
+
+    private function isAbsolutePath($file)
+    {
+        return strspn($file, '/\\', 0, 1)
+            || (strlen($file) > 3 && ctype_alpha($file[0])
+                && substr($file, 1, 1) === ':'
+                && strspn($file, '/\\', 2, 1)
+            )
+            || null !== parse_url($file, PHP_URL_SCHEME)
+        ;
+    }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Loader/String.php b/web/vendor/twig/twig/lib/Twig/Loader/String.php
index 00f507a4f..950bd35b0 100644
--- a/web/vendor/twig/twig/lib/Twig/Loader/String.php
+++ b/web/vendor/twig/twig/lib/Twig/Loader/String.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -27,35 +27,30 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
+class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getSource($name)
     {
+        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
+
         return $name;
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    public function getSourceContext($name)
+    {
+        return new Twig_Source($name, $name);
+    }
+
     public function exists($name)
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getCacheKey($name)
     {
         return $name;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function isFresh($name, $time)
     {
         return true;
diff --git a/web/vendor/twig/twig/lib/Twig/LoaderInterface.php b/web/vendor/twig/twig/lib/Twig/LoaderInterface.php
index 544ea4e32..b02999723 100644
--- a/web/vendor/twig/twig/lib/Twig/LoaderInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/LoaderInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -24,6 +24,8 @@ interface Twig_LoaderInterface
      * @return string The template source code
      *
      * @throws Twig_Error_Loader When $name is not found
+     *
+     * @deprecated since 1.27 (to be removed in 2.0), implement Twig_SourceContextLoaderInterface
      */
     public function getSource($name);
 
diff --git a/web/vendor/twig/twig/lib/Twig/Markup.php b/web/vendor/twig/twig/lib/Twig/Markup.php
index 69871fcbd..535ebe9e3 100644
--- a/web/vendor/twig/twig/lib/Twig/Markup.php
+++ b/web/vendor/twig/twig/lib/Twig/Markup.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node.php b/web/vendor/twig/twig/lib/Twig/Node.php
index 3065f675a..807f198f2 100644
--- a/web/vendor/twig/twig/lib/Twig/Node.php
+++ b/web/vendor/twig/twig/lib/Twig/Node.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,6 +22,8 @@ class Twig_Node implements Twig_NodeInterface
     protected $lineno;
     protected $tag;
 
+    private $name;
+
     /**
      * Constructor.
      *
@@ -35,6 +37,11 @@ class Twig_Node implements Twig_NodeInterface
      */
     public function __construct(array $nodes = array(), array $attributes = array(), $lineno = 0, $tag = null)
     {
+        foreach ($nodes as $name => $node) {
+            if (!$node instanceof Twig_NodeInterface) {
+                @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', is_object($node) ? get_class($node) : null === $node ? 'null' : gettype($node), $name, get_class($this)), E_USER_DEPRECATED);
+            }
+        }
         $this->nodes = $nodes;
         $this->attributes = $attributes;
         $this->lineno = $lineno;
@@ -111,8 +118,18 @@ class Twig_Node implements Twig_NodeInterface
         }
     }
 
+    public function getTemplateLine()
+    {
+        return $this->lineno;
+    }
+
+    /**
+     * @deprecated since 1.27 (to be removed in 2.0)
+     */
     public function getLine()
     {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateLine() instead.', E_USER_DEPRECATED);
+
         return $this->lineno;
     }
 
@@ -122,11 +139,7 @@ class Twig_Node implements Twig_NodeInterface
     }
 
     /**
-     * Returns true if the attribute is defined.
-     *
-     * @param string $name The attribute name
-     *
-     * @return bool true if the attribute is defined, false otherwise
+     * @return bool
      */
     public function hasAttribute($name)
     {
@@ -134,10 +147,6 @@ class Twig_Node implements Twig_NodeInterface
     }
 
     /**
-     * Gets an attribute value by name.
-     *
-     * @param string $name
-     *
      * @return mixed
      */
     public function getAttribute($name)
@@ -150,8 +159,6 @@ class Twig_Node implements Twig_NodeInterface
     }
 
     /**
-     * Sets an attribute by name to a value.
-     *
      * @param string $name
      * @param mixed  $value
      */
@@ -160,21 +167,12 @@ class Twig_Node implements Twig_NodeInterface
         $this->attributes[$name] = $value;
     }
 
-    /**
-     * Removes an attribute by name.
-     *
-     * @param string $name
-     */
     public function removeAttribute($name)
     {
         unset($this->attributes[$name]);
     }
 
     /**
-     * Returns true if the node with the given name exists.
-     *
-     * @param string $name
-     *
      * @return bool
      */
     public function hasNode($name)
@@ -183,10 +181,6 @@ class Twig_Node implements Twig_NodeInterface
     }
 
     /**
-     * Gets a node by name.
-     *
-     * @param string $name
-     *
      * @return Twig_Node
      */
     public function getNode($name)
@@ -198,22 +192,15 @@ class Twig_Node implements Twig_NodeInterface
         return $this->nodes[$name];
     }
 
-    /**
-     * Sets a node.
-     *
-     * @param string    $name
-     * @param Twig_Node $node
-     */
     public function setNode($name, $node = null)
     {
+        if (!$node instanceof Twig_NodeInterface) {
+            @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', is_object($node) ? get_class($node) : null === $node ? 'null' : gettype($node), $name, get_class($this)), E_USER_DEPRECATED);
+        }
+
         $this->nodes[$name] = $node;
     }
 
-    /**
-     * Removes a node by name.
-     *
-     * @param string $name
-     */
     public function removeNode($name)
     {
         unset($this->nodes[$name]);
@@ -228,4 +215,39 @@ class Twig_Node implements Twig_NodeInterface
     {
         return new ArrayIterator($this->nodes);
     }
+
+    public function setTemplateName($name)
+    {
+        $this->name = $name;
+        foreach ($this->nodes as $node) {
+            if (null !== $node) {
+                $node->setTemplateName($name);
+            }
+        }
+    }
+
+    public function getTemplateName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @deprecated since 1.27 (to be removed in 2.0)
+     */
+    public function setFilename($name)
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use setTemplateName() instead.', E_USER_DEPRECATED);
+
+        $this->setTemplateName($name);
+    }
+
+    /**
+     * @deprecated since 1.27 (to be removed in 2.0)
+     */
+    public function getFilename()
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateName() instead.', E_USER_DEPRECATED);
+
+        return $this->name;
+    }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Node/AutoEscape.php b/web/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
index 47cc998d4..570f23e49 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Block.php b/web/vendor/twig/twig/lib/Twig/Node/Block.php
index a05af6fb3..dfd8ceb8b 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Block.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Block.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/BlockReference.php b/web/vendor/twig/twig/lib/Twig/Node/BlockReference.php
index 9cd1551f8..d9b59378c 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/BlockReference.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/BlockReference.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Body.php b/web/vendor/twig/twig/lib/Twig/Node/Body.php
index 3ffb1342b..2314c9abd 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Body.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Body.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php b/web/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
index b4a436ab1..b9cf054aa 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -33,7 +33,7 @@ class Twig_Node_CheckSecurity extends Twig_Node
         foreach (array('tags', 'filters', 'functions') as $type) {
             foreach ($this->{'used'.ucfirst($type)} as $name => $node) {
                 if ($node instanceof Twig_Node) {
-                    ${$type}[$name] = $node->getLine();
+                    ${$type}[$name] = $node->getTemplateLine();
                 } else {
                     ${$type}[$node] = null;
                 }
@@ -46,7 +46,7 @@ class Twig_Node_CheckSecurity extends Twig_Node
             ->write('$functions = ')->repr(array_filter($functions))->raw(";\n\n")
             ->write("try {\n")
             ->indent()
-            ->write("\$this->env->getExtension('sandbox')->checkSecurity(\n")
+            ->write("\$this->env->getExtension('Twig_Extension_Sandbox')->checkSecurity(\n")
             ->indent()
             ->write(!$tags ? "array(),\n" : "array('".implode("', '", array_keys($tags))."'),\n")
             ->write(!$filters ? "array(),\n" : "array('".implode("', '", array_keys($filters))."'),\n")
@@ -56,7 +56,7 @@ class Twig_Node_CheckSecurity extends Twig_Node
             ->outdent()
             ->write("} catch (Twig_Sandbox_SecurityError \$e) {\n")
             ->indent()
-            ->write("\$e->setTemplateFile(\$this->getTemplateName());\n\n")
+            ->write("\$e->setSourceContext(\$this->getSourceContext());\n\n")
             ->write("if (\$e instanceof Twig_Sandbox_SecurityNotAllowedTagError && isset(\$tags[\$e->getTagName()])) {\n")
             ->indent()
             ->write("\$e->setTemplateLine(\$tags[\$e->getTagName()]);\n")
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Do.php b/web/vendor/twig/twig/lib/Twig/Node/Do.php
index 14fb84e97..94305c7a5 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Do.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Do.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Embed.php b/web/vendor/twig/twig/lib/Twig/Node/Embed.php
index a21304030..1786f36c6 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Embed.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Embed.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,11 +17,13 @@
 class Twig_Node_Embed extends Twig_Node_Include
 {
     // we don't inject the module to avoid node visitors to traverse it twice (as it will be already visited in the main module)
-    public function __construct($filename, $index, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
+    public function __construct($name, $index, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
     {
         parent::__construct(new Twig_Node_Expression_Constant('not_used', $lineno), $variables, $only, $ignoreMissing, $lineno, $tag);
 
-        $this->setAttribute('filename', $filename);
+        $this->setAttribute('name', $name);
+        // to be removed in 2.0, used name instead
+        $this->setAttribute('filename', $name);
         $this->setAttribute('index', $index);
     }
 
@@ -29,11 +31,11 @@ class Twig_Node_Embed extends Twig_Node_Include
     {
         $compiler
             ->write('$this->loadTemplate(')
-            ->string($this->getAttribute('filename'))
+            ->string($this->getAttribute('name'))
             ->raw(', ')
-            ->repr($compiler->getFilename())
+            ->repr($this->getTemplateName())
             ->raw(', ')
-            ->repr($this->getLine())
+            ->repr($this->getTemplateLine())
             ->raw(', ')
             ->string($this->getAttribute('index'))
             ->raw(')')
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression.php b/web/vendor/twig/twig/lib/Twig/Node/Expression.php
index a7382e7d6..e609d812f 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Array.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
index 83e583b04..0c726c04b 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -43,7 +43,7 @@ class Twig_Node_Expression_Array extends Twig_Node_Expression
         foreach ($this->getKeyValuePairs() as $pair) {
             // we compare the string representation of the keys
             // to avoid comparing the line numbers which are not relevant here.
-            if ((string) $key == (string) $pair['key']) {
+            if ((string) $key === (string) $pair['key']) {
                 return true;
             }
         }
@@ -54,7 +54,7 @@ class Twig_Node_Expression_Array extends Twig_Node_Expression
     public function addElement(Twig_Node_Expression $value, Twig_Node_Expression $key = null)
     {
         if (null === $key) {
-            $key = new Twig_Node_Expression_Constant(++$this->index, $value->getLine());
+            $key = new Twig_Node_Expression_Constant(++$this->index, $value->getTemplateLine());
         }
 
         array_push($this->nodes, $key, $value);
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
index ce0c5fbc5..ceb728233 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
index c821db526..d4787698e 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
index 0ef8e1172..51bba4809 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
index d5752ebba..9b3997dad 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
index 9a46d8455..fa9729db0 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
index 058a20bf6..e3be54851 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
index f4da73d44..9255d8f78 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
index f9a646270..7de9070eb 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
index e0797a612..386b4eabe 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
index 93b3b96f0..c24b720a4 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2013 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
index 7b1236d0a..4535cd082 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
index b606f6d1e..b386ae357 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,9 +12,9 @@ class Twig_Node_Expression_Binary_FloorDiv extends Twig_Node_Expression_Binary
 {
     public function compile(Twig_Compiler $compiler)
     {
-        $compiler->raw('intval(floor(');
+        $compiler->raw('(int) floor(');
         parent::compile($compiler);
-        $compiler->raw('))');
+        $compiler->raw(')');
     }
 
     public function operator(Twig_Compiler $compiler)
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
index a110bd92d..52dcb3322 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
index 3754fed21..1d66d6c42 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
index 9565a6088..ba44961ac 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
index 45fd30049..c9d20c427 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
index e38e257c3..219b3bdbf 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
index 93bb29205..b22debf2f 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2013 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
index 9924114fb..c99874ca3 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
index c91529ca6..0d24cee4e 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
index 26867ba20..69eae7e85 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
index 49ab39e9d..f276da7d6 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
index adba49c6f..7621763dd 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
index cd6d04627..d3225ded9 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,6 +12,10 @@ class Twig_Node_Expression_Binary_Power extends Twig_Node_Expression_Binary
 {
     public function compile(Twig_Compiler $compiler)
     {
+        if (PHP_VERSION_ID >= 50600) {
+            return parent::compile($compiler);
+        }
+
         $compiler
             ->raw('pow(')
             ->subcompile($this->getNode('left'))
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
index 692ec9c6d..4261cdea7 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
index d2e30d66e..d1e9a5a7f 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2013 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
index d44639915..b423d3eef 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
index f6ed6ff4a..056d99185 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,30 +17,75 @@
  */
 class Twig_Node_Expression_BlockReference extends Twig_Node_Expression
 {
-    public function __construct(Twig_NodeInterface $name, $asString = false, $lineno, $tag = null)
+    /**
+     * @param Twig_Node|null $template
+     */
+    public function __construct(Twig_NodeInterface $name, $template = null, $lineno, $tag = null)
     {
-        parent::__construct(array('name' => $name), array('as_string' => $asString, 'output' => false), $lineno, $tag);
+        if (is_bool($template)) {
+            @trigger_error(sprintf('The %s method "$asString" argument is deprecated since version 1.28 and will be removed in 2.0.', __METHOD__), E_USER_DEPRECATED);
+
+            $template = null;
+        }
+
+        $nodes = array('name' => $name);
+        if (null !== $template) {
+            $nodes['template'] = $template;
+        }
+
+        parent::__construct($nodes, array('is_defined_test' => false, 'output' => false), $lineno, $tag);
     }
 
     public function compile(Twig_Compiler $compiler)
     {
-        if ($this->getAttribute('as_string')) {
-            $compiler->raw('(string) ');
-        }
-
-        if ($this->getAttribute('output')) {
-            $compiler
-                ->addDebugInfo($this)
-                ->write('$this->displayBlock(')
-                ->subcompile($this->getNode('name'))
-                ->raw(", \$context, \$blocks);\n")
-            ;
+        if ($this->getAttribute('is_defined_test')) {
+            $this->compileTemplateCall($compiler, 'hasBlock');
         } else {
-            $compiler
-                ->raw('$this->renderBlock(')
-                ->subcompile($this->getNode('name'))
-                ->raw(', $context, $blocks)')
-            ;
+            if ($this->getAttribute('output')) {
+                $compiler->addDebugInfo($this);
+
+                $this
+                    ->compileTemplateCall($compiler, 'displayBlock')
+                    ->raw(";\n");
+            } else {
+                $this->compileTemplateCall($compiler, 'renderBlock');
+            }
         }
     }
+
+    private function compileTemplateCall(Twig_Compiler $compiler, $method)
+    {
+        if (!$this->hasNode('template')) {
+            $compiler->write('$this');
+        } else {
+            $compiler
+                ->write('$this->loadTemplate(')
+                ->subcompile($this->getNode('template'))
+                ->raw(', ')
+                ->repr($this->getTemplateName())
+                ->raw(', ')
+                ->repr($this->getTemplateLine())
+                ->raw(')')
+            ;
+        }
+
+        $compiler->raw(sprintf('->%s', $method));
+        $this->compileBlockArguments($compiler);
+
+        return $compiler;
+    }
+
+    private function compileBlockArguments(Twig_Compiler $compiler)
+    {
+        $compiler
+            ->raw('(')
+            ->subcompile($this->getNode('name'))
+            ->raw(', $context');
+
+        if (!$this->hasNode('template')) {
+            $compiler->raw(', $blocks');
+        }
+
+        return $compiler->raw(')');
+    }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Call.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
index 240553f93..277679724 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
@@ -3,25 +3,36 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
 {
+    private $reflector;
+
     protected function compileCallable(Twig_Compiler $compiler)
     {
         $closingParenthesis = false;
         if ($this->hasAttribute('callable') && $callable = $this->getAttribute('callable')) {
-            if (is_string($callable)) {
+            if (is_string($callable) && false === strpos($callable, '::')) {
                 $compiler->raw($callable);
-            } elseif (is_array($callable) && $callable[0] instanceof Twig_ExtensionInterface) {
-                $compiler->raw(sprintf('$this->env->getExtension(\'%s\')->%s', $callable[0]->getName(), $callable[1]));
             } else {
-                $type = ucfirst($this->getAttribute('type'));
-                $compiler->raw(sprintf('call_user_func_array($this->env->get%s(\'%s\')->getCallable(), array', $type, $this->getAttribute('name')));
-                $closingParenthesis = true;
+                list($r, $callable) = $this->reflectCallable($callable);
+                if ($r instanceof ReflectionMethod && is_string($callable[0])) {
+                    if ($r->isStatic()) {
+                        $compiler->raw(sprintf('%s::%s', $callable[0], $callable[1]));
+                    } else {
+                        $compiler->raw(sprintf('$this->env->getRuntime(\'%s\')->%s', $callable[0], $callable[1]));
+                    }
+                } elseif ($r instanceof ReflectionMethod && $callable[0] instanceof Twig_ExtensionInterface) {
+                    $compiler->raw(sprintf('$this->env->getExtension(\'%s\')->%s', get_class($callable[0]), $callable[1]));
+                } else {
+                    $type = ucfirst($this->getAttribute('type'));
+                    $compiler->raw(sprintf('call_user_func_array($this->env->get%s(\'%s\')->getCallable(), array', $type, $this->getAttribute('name')));
+                    $closingParenthesis = true;
+                }
             }
         } else {
             $compiler->raw($this->getAttribute('thing')->compile());
@@ -71,7 +82,7 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
             $first = false;
         }
 
-        if ($this->hasNode('arguments') && null !== $this->getNode('arguments')) {
+        if ($this->hasNode('arguments')) {
             $callable = $this->hasAttribute('callable') ? $this->getAttribute('callable') : null;
 
             $arguments = $this->getArguments($callable, $this->getNode('arguments'));
@@ -121,7 +132,6 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
             throw new LogicException($message);
         }
 
-        // manage named arguments
         $callableParameters = $this->getCallableParameters($callable, $isVariadic);
         $arguments = array();
         $names = array();
@@ -136,7 +146,7 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
                     throw new Twig_Error_Syntax(sprintf('Argument "%s" is defined twice for %s "%s".', $name, $callType, $callName));
                 }
 
-                if (!empty($missingArguments)) {
+                if (count($missingArguments)) {
                     throw new Twig_Error_Syntax(sprintf(
                         'Argument "%s" could not be assigned for %s "%s(%s)" because it is mapped to an internal PHP function which cannot determine default value for optional argument%s "%s".',
                         $name, $callType, $callName, implode(', ', $names), count($missingArguments) > 1 ? 's' : '', implode('", "', $missingArguments))
@@ -195,7 +205,7 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
             throw new Twig_Error_Syntax(sprintf(
                 'Unknown argument%s "%s" for %s "%s(%s)".',
                 count($parameters) > 1 ? 's' : '', implode('", "', array_keys($parameters)), $callType, $callName, implode(', ', $names)
-            ), $unknownParameter ? $unknownParameter->getLine() : -1);
+            ), $unknownParameter ? $unknownParameter->getTemplateLine() : -1);
         }
 
         return $arguments;
@@ -208,15 +218,9 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
 
     private function getCallableParameters($callable, $isVariadic)
     {
-        if (is_array($callable)) {
-            $r = new ReflectionMethod($callable[0], $callable[1]);
-        } elseif (is_object($callable) && !$callable instanceof Closure) {
-            $r = new ReflectionObject($callable);
-            $r = $r->getMethod('__invoke');
-        } elseif (is_string($callable) && false !== strpos($callable, '::')) {
-            $r = new ReflectionMethod($callable);
-        } else {
-            $r = new ReflectionFunction($callable);
+        list($r) = $this->reflectCallable($callable);
+        if (null === $r) {
+            return array();
         }
 
         $parameters = $r->getParameters();
@@ -240,7 +244,7 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
                 array_pop($parameters);
             } else {
                 $callableName = $r->name;
-                if ($r->getDeclaringClass()) {
+                if ($r instanceof ReflectionMethod) {
                     $callableName = $r->getDeclaringClass()->name.'::'.$callableName;
                 }
 
@@ -250,4 +254,36 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
 
         return $parameters;
     }
+
+    private function reflectCallable($callable)
+    {
+        if (null !== $this->reflector) {
+            return $this->reflector;
+        }
+
+        if (is_array($callable)) {
+            if (!method_exists($callable[0], $callable[1])) {
+                // __call()
+                return array(null, array());
+            }
+            $r = new ReflectionMethod($callable[0], $callable[1]);
+        } elseif (is_object($callable) && !$callable instanceof Closure) {
+            $r = new ReflectionObject($callable);
+            $r = $r->getMethod('__invoke');
+            $callable = array($callable, '__invoke');
+        } elseif (is_string($callable) && false !== $pos = strpos($callable, '::')) {
+            $class = substr($callable, 0, $pos);
+            $method = substr($callable, $pos + 2);
+            if (!method_exists($class, $method)) {
+                // __staticCall()
+                return array(null, array());
+            }
+            $r = new ReflectionMethod($callable);
+            $callable = array($class, $method);
+        } else {
+            $r = new ReflectionFunction($callable);
+        }
+
+        return $this->reflector = array($r, $callable);
+    }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
index edcb1e2d2..67cca1fd2 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
index a91dc6985..1a2c5964f 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
index b4882e360..114b5cd97 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
index a906232ea..a8fa847a8 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
index 1827c8886..d32d86d34 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,13 +22,13 @@ class Twig_Node_Expression_Filter_Default extends Twig_Node_Expression_Filter
 {
     public function __construct(Twig_NodeInterface $node, Twig_Node_Expression_Constant $filterName, Twig_NodeInterface $arguments, $lineno, $tag = null)
     {
-        $default = new Twig_Node_Expression_Filter($node, new Twig_Node_Expression_Constant('default', $node->getLine()), $arguments, $node->getLine());
+        $default = new Twig_Node_Expression_Filter($node, new Twig_Node_Expression_Constant('default', $node->getTemplateLine()), $arguments, $node->getTemplateLine());
 
         if ('default' === $filterName->getAttribute('value') && ($node instanceof Twig_Node_Expression_Name || $node instanceof Twig_Node_Expression_GetAttr)) {
-            $test = new Twig_Node_Expression_Test_Defined(clone $node, 'defined', new Twig_Node(), $node->getLine());
-            $false = count($arguments) ? $arguments->getNode(0) : new Twig_Node_Expression_Constant('', $node->getLine());
+            $test = new Twig_Node_Expression_Test_Defined(clone $node, 'defined', new Twig_Node(), $node->getTemplateLine());
+            $false = count($arguments) ? $arguments->getNode(0) : new Twig_Node_Expression_Constant('', $node->getTemplateLine());
 
-            $node = new Twig_Node_Expression_Conditional($test, $default, $false, $node->getLine());
+            $node = new Twig_Node_Expression_Conditional($test, $default, $false, $node->getTemplateLine());
         } else {
             $node = $default;
         }
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Function.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
index 7326ede26..eaad56ec0 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,7 @@ class Twig_Node_Expression_Function extends Twig_Node_Expression_Call
 {
     public function __construct($name, Twig_NodeInterface $arguments, $lineno)
     {
-        parent::__construct(array('arguments' => $arguments), array('name' => $name), $lineno);
+        parent::__construct(array('arguments' => $arguments), array('name' => $name, 'is_defined_test' => false), $lineno);
     }
 
     public function compile(Twig_Compiler $compiler)
@@ -27,7 +27,12 @@ class Twig_Node_Expression_Function extends Twig_Node_Expression_Call
         $this->setAttribute('needs_context', $function->needsContext());
         $this->setAttribute('arguments', $function->getArguments());
         if ($function instanceof Twig_FunctionCallableInterface || $function instanceof Twig_SimpleFunction) {
-            $this->setAttribute('callable', $function->getCallable());
+            $callable = $function->getCallable();
+            if ('constant' === $name && $this->getAttribute('is_defined_test')) {
+                $callable = 'twig_constant_is_defined';
+            }
+
+            $this->setAttribute('callable', $callable);
         }
         if ($function instanceof Twig_SimpleFunction) {
             $this->setAttribute('is_variadic', $function->isVariadic());
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
index 6ce61111c..75814265c 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,11 +13,20 @@ class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
 {
     public function __construct(Twig_Node_Expression $node, Twig_Node_Expression $attribute, Twig_Node_Expression $arguments = null, $type, $lineno)
     {
-        parent::__construct(array('node' => $node, 'attribute' => $attribute, 'arguments' => $arguments), array('type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false, 'disable_c_ext' => false), $lineno);
+        $nodes = array('node' => $node, 'attribute' => $attribute);
+        if (null !== $arguments) {
+            $nodes['arguments'] = $arguments;
+        }
+
+        parent::__construct($nodes, array('type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false, 'disable_c_ext' => false), $lineno);
     }
 
     public function compile(Twig_Compiler $compiler)
     {
+        if ($this->getAttribute('disable_c_ext')) {
+            @trigger_error(sprintf('Using the "disable_c_ext" attribute on %s is deprecated since version 1.30 and will be removed in 2.0.', __CLASS__), E_USER_DEPRECATED);
+        }
+
         if (function_exists('twig_template_get_attributes') && !$this->getAttribute('disable_c_ext')) {
             $compiler->raw('twig_template_get_attributes($this, ');
         } else {
@@ -36,10 +45,10 @@ class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
         $needFourth = $this->getAttribute('ignore_strict_check');
         $needThird = $needFourth || $this->getAttribute('is_defined_test');
         $needSecond = $needThird || Twig_Template::ANY_CALL !== $this->getAttribute('type');
-        $needFirst = $needSecond || null !== $this->getNode('arguments');
+        $needFirst = $needSecond || $this->hasNode('arguments');
 
         if ($needFirst) {
-            if (null !== $this->getNode('arguments')) {
+            if ($this->hasNode('arguments')) {
                 $compiler->raw(', ')->subcompile($this->getNode('arguments'));
             } else {
                 $compiler->raw(', array()');
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
index 620b02bf4..39481337b 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Name.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
index a6e0ff420..e03ca3578 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -43,10 +43,20 @@ class Twig_Node_Expression_Name extends Twig_Node_Expression
                 ->raw(']')
             ;
         } else {
-            // remove the non-PHP 5.4 version when PHP 5.3 support is dropped
-            // as the non-optimized version is just a workaround for slow ternary operator
-            // when the context has a lot of variables
-            if (PHP_VERSION_ID >= 50400) {
+            if (PHP_VERSION_ID >= 70000) {
+                // use PHP 7 null coalescing operator
+                $compiler
+                    ->raw('($context[')
+                    ->string($name)
+                    ->raw('] ?? ')
+                ;
+
+                if ($this->getAttribute('ignore_strict_check') || !$compiler->getEnvironment()->isStrictVariables()) {
+                    $compiler->raw('null)');
+                } else {
+                    $compiler->raw('$this->getContext($context, ')->string($name)->raw('))');
+                }
+            } elseif (PHP_VERSION_ID >= 50400) {
                 // PHP 5.4 ternary operator performance was optimized
                 $compiler
                     ->raw('(isset($context[')
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php
index 10039130c..14f6358fd 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/NullCoalesce.php
@@ -13,11 +13,34 @@ class Twig_Node_Expression_NullCoalesce extends Twig_Node_Expression_Conditional
     public function __construct(Twig_NodeInterface $left, Twig_NodeInterface $right, $lineno)
     {
         $test = new Twig_Node_Expression_Binary_And(
-            new Twig_Node_Expression_Test_Defined(clone $left, 'defined', new Twig_Node(), $left->getLine()),
-            new Twig_Node_Expression_Unary_Not(new Twig_Node_Expression_Test_Null($left, 'null', new Twig_Node(), $left->getLine()), $left->getLine()),
-            $left->getLine()
+            new Twig_Node_Expression_Test_Defined(clone $left, 'defined', new Twig_Node(), $left->getTemplateLine()),
+            new Twig_Node_Expression_Unary_Not(new Twig_Node_Expression_Test_Null($left, 'null', new Twig_Node(), $left->getTemplateLine()), $left->getTemplateLine()),
+            $left->getTemplateLine()
         );
 
         parent::__construct($test, $left, $right, $lineno);
     }
+
+    public function compile(Twig_Compiler $compiler)
+    {
+        /*
+         * This optimizes only one case. PHP 7 also supports more complex expressions
+         * that can return null. So, for instance, if log is defined, log("foo") ?? "..." works,
+         * but log($a["foo"]) ?? "..." does not if $a["foo"] is not defined. More advanced
+         * cases might be implemented as an optimizer node visitor, but has not been done
+         * as benefits are probably not worth the added complexity.
+         */
+        if (PHP_VERSION_ID >= 70000 && $this->getNode('expr2') instanceof Twig_Node_Expression_Name) {
+            $this->getNode('expr2')->setAttribute('always_defined', true);
+            $compiler
+                ->raw('((')
+                ->subcompile($this->getNode('expr2'))
+                ->raw(') ?? (')
+                ->subcompile($this->getNode('expr3'))
+                ->raw('))')
+            ;
+        } else {
+            parent::compile($compiler);
+        }
+    }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
index 694c08045..e7d82d81c 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
index e6b058e85..09a04a319 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
index c0358c8bf..3dfe4f195 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +12,12 @@ class Twig_Node_Expression_Test extends Twig_Node_Expression_Call
 {
     public function __construct(Twig_NodeInterface $node, $name, Twig_NodeInterface $arguments = null, $lineno)
     {
-        parent::__construct(array('node' => $node, 'arguments' => $arguments), array('name' => $name), $lineno);
+        $nodes = array('node' => $node);
+        if (null !== $arguments) {
+            $nodes['arguments'] = $arguments;
+        }
+
+        parent::__construct($nodes, array('name' => $name), $lineno);
     }
 
     public function compile(Twig_Compiler $compiler)
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
index de55f5f55..ffde3488c 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
index 3dc6ff592..31cd987cd 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -29,12 +29,15 @@ class Twig_Node_Expression_Test_Defined extends Twig_Node_Expression_Test
             $node->setAttribute('is_defined_test', true);
         } elseif ($node instanceof Twig_Node_Expression_GetAttr) {
             $node->setAttribute('is_defined_test', true);
-
             $this->changeIgnoreStrictCheck($node);
+        } elseif ($node instanceof Twig_Node_Expression_BlockReference) {
+            $node->setAttribute('is_defined_test', true);
+        } elseif ($node instanceof Twig_Node_Expression_Function && 'constant' === $node->getAttribute('name')) {
+            $node->setAttribute('is_defined_test', true);
         } elseif ($node instanceof Twig_Node_Expression_Constant || $node instanceof Twig_Node_Expression_Array) {
-            $node = new Twig_Node_Expression_Constant(true, $node->getLine());
+            $node = new Twig_Node_Expression_Constant(true, $node->getTemplateLine());
         } else {
-            throw new Twig_Error_Syntax('The "defined" test only works with simple variables.', $this->getLine());
+            throw new Twig_Error_Syntax('The "defined" test only works with simple variables.', $this->getTemplateLine());
         }
 
         parent::__construct($node, $name, $arguments, $lineno);
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
index d5bed234a..0d6bdb49e 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
index d7853e89c..fe42e627d 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
index 1c83825a0..934d83561 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
index 421c19e84..4f16029a2 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
index b48905ee4..abc2f5beb 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
index 1cf54c326..0ea2c2c32 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
index 2a3937ec3..ca3ef8f32 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
index f94073cfa..a5e4f198f 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php b/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
index 04edb52a6..5497532bc 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Flush.php b/web/vendor/twig/twig/lib/Twig/Node/Flush.php
index 2af17a42b..cd4be411e 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Flush.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Flush.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/For.php b/web/vendor/twig/twig/lib/Twig/Node/For.php
index 2d450932c..f93d9c812 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/For.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/For.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -27,7 +27,12 @@ class Twig_Node_For extends Twig_Node
             $body = new Twig_Node_If(new Twig_Node(array($ifexpr, $body)), null, $lineno, $tag);
         }
 
-        parent::__construct(array('key_target' => $keyTarget, 'value_target' => $valueTarget, 'seq' => $seq, 'body' => $body, 'else' => $else), array('with_loop' => true, 'ifexpr' => null !== $ifexpr), $lineno, $tag);
+        $nodes = array('key_target' => $keyTarget, 'value_target' => $valueTarget, 'seq' => $seq, 'body' => $body);
+        if (null !== $else) {
+            $nodes['else'] = $else;
+        }
+
+        parent::__construct($nodes, array('with_loop' => true, 'ifexpr' => null !== $ifexpr), $lineno, $tag);
     }
 
     public function compile(Twig_Compiler $compiler)
@@ -40,7 +45,7 @@ class Twig_Node_For extends Twig_Node
             ->raw(");\n")
         ;
 
-        if (null !== $this->getNode('else')) {
+        if ($this->hasNode('else')) {
             $compiler->write("\$context['_iterated'] = false;\n");
         }
 
@@ -69,7 +74,7 @@ class Twig_Node_For extends Twig_Node
             }
         }
 
-        $this->loop->setAttribute('else', null !== $this->getNode('else'));
+        $this->loop->setAttribute('else', $this->hasNode('else'));
         $this->loop->setAttribute('with_loop', $this->getAttribute('with_loop'));
         $this->loop->setAttribute('ifexpr', $this->getAttribute('ifexpr'));
 
@@ -85,7 +90,7 @@ class Twig_Node_For extends Twig_Node
             ->write("}\n")
         ;
 
-        if (null !== $this->getNode('else')) {
+        if ($this->hasNode('else')) {
             $compiler
                 ->write("if (!\$context['_iterated']) {\n")
                 ->indent()
diff --git a/web/vendor/twig/twig/lib/Twig/Node/ForLoop.php b/web/vendor/twig/twig/lib/Twig/Node/ForLoop.php
index 2554d4807..ab0215e6b 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/ForLoop.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/ForLoop.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/If.php b/web/vendor/twig/twig/lib/Twig/Node/If.php
index caff93682..9cd78f471 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/If.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/If.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,12 @@ class Twig_Node_If extends Twig_Node
 {
     public function __construct(Twig_NodeInterface $tests, Twig_NodeInterface $else = null, $lineno, $tag = null)
     {
-        parent::__construct(array('tests' => $tests, 'else' => $else), array(), $lineno, $tag);
+        $nodes = array('tests' => $tests);
+        if (null !== $else) {
+            $nodes['else'] = $else;
+        }
+
+        parent::__construct($nodes, array(), $lineno, $tag);
     }
 
     public function compile(Twig_Compiler $compiler)
@@ -45,7 +50,7 @@ class Twig_Node_If extends Twig_Node
             ;
         }
 
-        if ($this->hasNode('else') && null !== $this->getNode('else')) {
+        if ($this->hasNode('else')) {
             $compiler
                 ->outdent()
                 ->write("} else {\n")
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Import.php b/web/vendor/twig/twig/lib/Twig/Node/Import.php
index df37af371..759bb5c3e 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Import.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Import.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -37,9 +37,9 @@ class Twig_Node_Import extends Twig_Node
                 ->raw('$this->loadTemplate(')
                 ->subcompile($this->getNode('expr'))
                 ->raw(', ')
-                ->repr($compiler->getFilename())
+                ->repr($this->getTemplateName())
                 ->raw(', ')
-                ->repr($this->getLine())
+                ->repr($this->getTemplateLine())
                 ->raw(')')
             ;
         }
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Include.php b/web/vendor/twig/twig/lib/Twig/Node/Include.php
index 9952f7316..15a27ca60 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Include.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Include.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,12 @@ class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
 {
     public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
     {
-        parent::__construct(array('expr' => $expr, 'variables' => $variables), array('only' => (bool) $only, 'ignore_missing' => (bool) $ignoreMissing), $lineno, $tag);
+        $nodes = array('expr' => $expr);
+        if (null !== $variables) {
+            $nodes['variables'] = $variables;
+        }
+
+        parent::__construct($nodes, array('only' => (bool) $only, 'ignore_missing' => (bool) $ignoreMissing), $lineno, $tag);
     }
 
     public function compile(Twig_Compiler $compiler)
@@ -59,16 +64,16 @@ class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
              ->write('$this->loadTemplate(')
              ->subcompile($this->getNode('expr'))
              ->raw(', ')
-             ->repr($compiler->getFilename())
+             ->repr($this->getTemplateName())
              ->raw(', ')
-             ->repr($this->getLine())
+             ->repr($this->getTemplateLine())
              ->raw(')')
          ;
     }
 
     protected function addTemplateArguments(Twig_Compiler $compiler)
     {
-        if (null === $this->getNode('variables')) {
+        if (!$this->hasNode('variables')) {
             $compiler->raw(false === $this->getAttribute('only') ? '$context' : 'array()');
         } elseif (false === $this->getAttribute('only')) {
             $compiler
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Macro.php b/web/vendor/twig/twig/lib/Twig/Node/Macro.php
index 932e795f0..e9e1421aa 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Macro.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Macro.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,7 +22,7 @@ class Twig_Node_Macro extends Twig_Node
     {
         foreach ($arguments as $argumentName => $argument) {
             if (self::VARARGS_NAME === $argumentName) {
-                throw new Twig_Error_Syntax(sprintf('The argument "%s" in macro "%s" cannot be defined because the variable "%s" is reserved for arbitrary arguments.', self::VARARGS_NAME, $name, self::VARARGS_NAME), $argument->getLine());
+                throw new Twig_Error_Syntax(sprintf('The argument "%s" in macro "%s" cannot be defined because the variable "%s" is reserved for arbitrary arguments.', self::VARARGS_NAME, $name, self::VARARGS_NAME), $argument->getTemplateLine());
             }
         }
 
@@ -70,7 +70,7 @@ class Twig_Node_Macro extends Twig_Node
 
         foreach ($this->getNode('arguments') as $name => $default) {
             $compiler
-                ->addIndentation()
+                ->write('')
                 ->string($name)
                 ->raw(' => $__'.$name.'__')
                 ->raw(",\n")
@@ -78,7 +78,7 @@ class Twig_Node_Macro extends Twig_Node
         }
 
         $compiler
-            ->addIndentation()
+            ->write('')
             ->string(self::VARARGS_NAME)
             ->raw(' => ')
         ;
@@ -109,6 +109,11 @@ class Twig_Node_Macro extends Twig_Node
             ->write("ob_end_clean();\n\n")
             ->write("throw \$e;\n")
             ->outdent()
+            ->write("} catch (Throwable \$e) {\n")
+            ->indent()
+            ->write("ob_end_clean();\n\n")
+            ->write("throw \$e;\n")
+            ->outdent()
             ->write("}\n\n")
             ->write("return ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());\n")
             ->outdent()
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Module.php b/web/vendor/twig/twig/lib/Twig/Node/Module.php
index 01161d3e8..5bfcc9230 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Module.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Module.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,11 +21,18 @@
  */
 class Twig_Node_Module extends Twig_Node
 {
-    public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $parent = null, Twig_NodeInterface $blocks, Twig_NodeInterface $macros, Twig_NodeInterface $traits, $embeddedTemplates, $filename)
+    private $source;
+
+    public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $parent = null, Twig_NodeInterface $blocks, Twig_NodeInterface $macros, Twig_NodeInterface $traits, $embeddedTemplates, $name, $source = '')
     {
-        // embedded templates are set as attributes so that they are only visited once by the visitors
-        parent::__construct(array(
-            'parent' => $parent,
+        if (!$name instanceof Twig_Source) {
+            @trigger_error(sprintf('Passing a string as the $name argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
+            $this->source = new Twig_Source($source, $name);
+        } else {
+            $this->source = $name;
+        }
+
+        $nodes = array(
             'body' => $body,
             'blocks' => $blocks,
             'macros' => $macros,
@@ -35,11 +42,23 @@ class Twig_Node_Module extends Twig_Node
             'constructor_start' => new Twig_Node(),
             'constructor_end' => new Twig_Node(),
             'class_end' => new Twig_Node(),
-        ), array(
-            'filename' => $filename,
+        );
+        if (null !== $parent) {
+            $nodes['parent'] = $parent;
+        }
+
+        // embedded templates are set as attributes so that they are only visited once by the visitors
+        parent::__construct($nodes, array(
+            // source to be remove in 2.0
+            'source' => $this->source->getCode(),
+            // filename to be remove in 2.0 (use getTemplateName() instead)
+            'filename' => $this->source->getName(),
             'index' => null,
             'embedded_templates' => $embeddedTemplates,
         ), 1);
+
+        // populate the template name of all node children
+        $this->setTemplateName($this->source->getName());
     }
 
     public function setIndex($index)
@@ -67,7 +86,7 @@ class Twig_Node_Module extends Twig_Node
         if (
             count($this->getNode('blocks'))
             || count($this->getNode('traits'))
-            || null === $this->getNode('parent')
+            || !$this->hasNode('parent')
             || $this->getNode('parent') instanceof Twig_Node_Expression_Constant
             || count($this->getNode('constructor_start'))
             || count($this->getNode('constructor_end'))
@@ -89,14 +108,19 @@ class Twig_Node_Module extends Twig_Node
 
         $this->compileDebugInfo($compiler);
 
+        $this->compileGetSource($compiler);
+
+        $this->compileGetSourceContext($compiler);
+
         $this->compileClassFooter($compiler);
     }
 
     protected function compileGetParent(Twig_Compiler $compiler)
     {
-        if (null === $parent = $this->getNode('parent')) {
+        if (!$this->hasNode('parent')) {
             return;
         }
+        $parent = $this->getNode('parent');
 
         $compiler
             ->write("protected function doGetParent(array \$context)\n", "{\n")
@@ -112,9 +136,9 @@ class Twig_Node_Module extends Twig_Node
                 ->raw('$this->loadTemplate(')
                 ->subcompile($parent)
                 ->raw(', ')
-                ->repr($compiler->getFilename())
+                ->repr($this->source->getName())
                 ->raw(', ')
-                ->repr($this->getNode('parent')->getLine())
+                ->repr($parent->getTemplateLine())
                 ->raw(')')
             ;
         }
@@ -130,9 +154,9 @@ class Twig_Node_Module extends Twig_Node
     {
         $compiler
             ->write("\n\n")
-            // if the filename contains */, add a blank to avoid a PHP parse error
-            ->write('/* '.str_replace('*/', '* /', $this->getAttribute('filename'))." */\n")
-            ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->getAttribute('filename'), $this->getAttribute('index')))
+            // if the template name contains */, add a blank to avoid a PHP parse error
+            ->write('/* '.str_replace('*/', '* /', $this->source->getName())." */\n")
+            ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->source->getName(), $this->getAttribute('index')))
             ->raw(sprintf(" extends %s\n", $compiler->getEnvironment()->getBaseTemplateClass()))
             ->write("{\n")
             ->indent()
@@ -149,17 +173,17 @@ class Twig_Node_Module extends Twig_Node
         ;
 
         // parent
-        if (null === $parent = $this->getNode('parent')) {
+        if (!$this->hasNode('parent')) {
             $compiler->write("\$this->parent = false;\n\n");
-        } elseif ($parent instanceof Twig_Node_Expression_Constant) {
+        } elseif (($parent = $this->getNode('parent')) && $parent instanceof Twig_Node_Expression_Constant) {
             $compiler
                 ->addDebugInfo($parent)
                 ->write('$this->parent = $this->loadTemplate(')
                 ->subcompile($parent)
                 ->raw(', ')
-                ->repr($compiler->getFilename())
+                ->repr($this->source->getName())
                 ->raw(', ')
-                ->repr($this->getNode('parent')->getLine())
+                ->repr($parent->getTemplateLine())
                 ->raw(");\n")
             ;
         }
@@ -277,7 +301,8 @@ class Twig_Node_Module extends Twig_Node
             ->subcompile($this->getNode('body'))
         ;
 
-        if (null !== $parent = $this->getNode('parent')) {
+        if ($this->hasNode('parent')) {
+            $parent = $this->getNode('parent');
             $compiler->addDebugInfo($parent);
             if ($parent instanceof Twig_Node_Expression_Constant) {
                 $compiler->write('$this->parent');
@@ -314,7 +339,7 @@ class Twig_Node_Module extends Twig_Node
             ->write("public function getTemplateName()\n", "{\n")
             ->indent()
             ->write('return ')
-            ->repr($this->getAttribute('filename'))
+            ->repr($this->source->getName())
             ->raw(";\n")
             ->outdent()
             ->write("}\n\n")
@@ -330,7 +355,7 @@ class Twig_Node_Module extends Twig_Node
         //
         // Put another way, a template can be used as a trait if it
         // only contains blocks and use statements.
-        $traitable = null === $this->getNode('parent') && 0 === count($this->getNode('macros'));
+        $traitable = !$this->hasNode('parent') && 0 === count($this->getNode('macros'));
         if ($traitable) {
             if ($this->getNode('body') instanceof Twig_Node_Body) {
                 $nodes = $this->getNode('body')->getNode(0);
@@ -380,6 +405,37 @@ class Twig_Node_Module extends Twig_Node
             ->indent()
             ->write(sprintf("return %s;\n", str_replace("\n", '', var_export(array_reverse($compiler->getDebugInfo(), true), true))))
             ->outdent()
+            ->write("}\n\n")
+        ;
+    }
+
+    protected function compileGetSource(Twig_Compiler $compiler)
+    {
+        $compiler
+            ->write("/** @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead */\n")
+            ->write("public function getSource()\n", "{\n")
+            ->indent()
+            ->write("@trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', E_USER_DEPRECATED);\n\n")
+            ->write('return $this->getSourceContext()->getCode();')
+            ->raw("\n")
+            ->outdent()
+            ->write("}\n\n")
+        ;
+    }
+
+    protected function compileGetSourceContext(Twig_Compiler $compiler)
+    {
+        $compiler
+            ->write("public function getSourceContext()\n", "{\n")
+            ->indent()
+            ->write('return new Twig_Source(')
+            ->string($compiler->getEnvironment()->isDebug() ? $this->source->getCode() : '')
+            ->raw(', ')
+            ->string($this->source->getName())
+            ->raw(', ')
+            ->string($this->source->getPath())
+            ->raw(");\n")
+            ->outdent()
             ->write("}\n")
         ;
     }
@@ -391,13 +447,13 @@ class Twig_Node_Module extends Twig_Node
                 ->write(sprintf('%s = $this->loadTemplate(', $var))
                 ->subcompile($node)
                 ->raw(', ')
-                ->repr($compiler->getFilename())
+                ->repr($node->getTemplateName())
                 ->raw(', ')
-                ->repr($node->getLine())
+                ->repr($node->getTemplateLine())
                 ->raw(");\n")
             ;
         } else {
-            throw new LogicException('Trait templates can only be constant nodes');
+            throw new LogicException('Trait templates can only be constant nodes.');
         }
     }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Print.php b/web/vendor/twig/twig/lib/Twig/Node/Print.php
index 7b69ee811..9e317c84e 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Print.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Print.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Sandbox.php b/web/vendor/twig/twig/lib/Twig/Node/Sandbox.php
index cd705e258..658e068e1 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Sandbox.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Sandbox.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,7 +25,7 @@ class Twig_Node_Sandbox extends Twig_Node
     {
         $compiler
             ->addDebugInfo($this)
-            ->write("\$sandbox = \$this->env->getExtension('sandbox');\n")
+            ->write("\$sandbox = \$this->env->getExtension('Twig_Extension_Sandbox');\n")
             ->write("if (!\$alreadySandboxed = \$sandbox->isSandboxed()) {\n")
             ->indent()
             ->write("\$sandbox->enableSandbox();\n")
diff --git a/web/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php b/web/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
index 148dd2bb4..fba0051ba 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,7 +25,7 @@ class Twig_Node_SandboxedPrint extends Twig_Node_Print
     {
         $compiler
             ->addDebugInfo($this)
-            ->write('echo $this->env->getExtension(\'sandbox\')->ensureToStringAllowed(')
+            ->write('echo $this->env->getExtension(\'Twig_Extension_Sandbox\')->ensureToStringAllowed(')
             ->subcompile($this->getNode('expr'))
             ->raw(");\n")
         ;
@@ -36,11 +36,9 @@ class Twig_Node_SandboxedPrint extends Twig_Node_Print
      *
      * This is mostly needed when another visitor adds filters (like the escaper one).
      *
-     * @param Twig_Node $node A Node
-     *
      * @return Twig_Node
      */
-    protected function removeNodeFilter($node)
+    protected function removeNodeFilter(Twig_Node $node)
     {
         if ($node instanceof Twig_Node_Expression_Filter) {
             return $this->removeNodeFilter($node->getNode('node'));
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Set.php b/web/vendor/twig/twig/lib/Twig/Node/Set.php
index e5a660375..36e05ccad 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Set.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Set.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,7 +14,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Twig_Node_Set extends Twig_Node
+class Twig_Node_Set extends Twig_Node implements Twig_NodeCaptureInterface
 {
     public function __construct($capture, Twig_NodeInterface $names, Twig_NodeInterface $values, $lineno, $tag = null)
     {
@@ -30,7 +30,7 @@ class Twig_Node_Set extends Twig_Node
 
             $values = $this->getNode('values');
             if ($values instanceof Twig_Node_Text) {
-                $this->setNode('values', new Twig_Node_Expression_Constant($values->getAttribute('data'), $values->getLine()));
+                $this->setNode('values', new Twig_Node_Expression_Constant($values->getAttribute('data'), $values->getTemplateLine()));
                 $this->setAttribute('capture', false);
             }
         }
diff --git a/web/vendor/twig/twig/lib/Twig/Node/SetTemp.php b/web/vendor/twig/twig/lib/Twig/Node/SetTemp.php
index 3bdd1cb74..0f43c7d31 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/SetTemp.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/SetTemp.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Spaceless.php b/web/vendor/twig/twig/lib/Twig/Node/Spaceless.php
index 486e461a6..00419e260 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Spaceless.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Spaceless.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/Text.php b/web/vendor/twig/twig/lib/Twig/Node/Text.php
index 39879bb2c..2c013cd76 100644
--- a/web/vendor/twig/twig/lib/Twig/Node/Text.php
+++ b/web/vendor/twig/twig/lib/Twig/Node/Text.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Node/With.php b/web/vendor/twig/twig/lib/Twig/Node/With.php
new file mode 100644
index 000000000..4978f375b
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/Node/With.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a nested "with" scope.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Twig_Node_With extends Twig_Node
+{
+    public function __construct(Twig_Node $body, Twig_Node $variables = null, $only = false, $lineno, $tag = null)
+    {
+        $nodes = array('body' => $body);
+        if (null !== $variables) {
+            $nodes['variables'] = $variables;
+        }
+
+        parent::__construct($nodes, array('only' => (bool) $only), $lineno, $tag);
+    }
+
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+        if ($this->hasNode('variables')) {
+            $varsName = $compiler->getVarName();
+            $compiler
+                ->write(sprintf('$%s = ', $varsName))
+                ->subcompile($this->getNode('variables'))
+                ->raw(";\n")
+                ->write(sprintf("if (!is_array(\$%s)) {\n", $varsName))
+                ->indent()
+                ->write("throw new Twig_Error_Runtime('Variables passed to the \"with\" tag must be a hash.');\n")
+                ->outdent()
+                ->write("}\n")
+            ;
+
+            if ($this->getAttribute('only')) {
+                $compiler->write("\$context = array('_parent' => \$context);\n");
+            } else {
+                $compiler->write("\$context['_parent'] = \$context;\n");
+            }
+
+            $compiler->write(sprintf("\$context = array_merge(\$context, \$%s);\n", $varsName));
+        } else {
+            $compiler->write("\$context['_parent'] = \$context;\n");
+        }
+
+        $compiler
+            ->subcompile($this->getNode('body'))
+            ->write("\$context = \$context['_parent'];\n")
+        ;
+    }
+}
diff --git a/web/vendor/twig/twig/lib/Twig/NodeCaptureInterface.php b/web/vendor/twig/twig/lib/Twig/NodeCaptureInterface.php
new file mode 100644
index 000000000..97ffb6af2
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/NodeCaptureInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a node that captures any nested displayable nodes.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+interface Twig_NodeCaptureInterface
+{
+}
diff --git a/web/vendor/twig/twig/lib/Twig/NodeInterface.php b/web/vendor/twig/twig/lib/Twig/NodeInterface.php
index 8077349b3..78e758bd4 100644
--- a/web/vendor/twig/twig/lib/Twig/NodeInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/NodeInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,11 +20,12 @@ interface Twig_NodeInterface extends Countable, IteratorAggregate
 {
     /**
      * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler $compiler A Twig_Compiler instance
      */
     public function compile(Twig_Compiler $compiler);
 
+    /**
+     * @deprecated since 1.27 (to be removed in 2.0)
+     */
     public function getLine();
 
     public function getNodeTag();
diff --git a/web/vendor/twig/twig/lib/Twig/NodeOutputInterface.php b/web/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
index 22172c09d..e6bbd9643 100644
--- a/web/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/NodeTraverser.php b/web/vendor/twig/twig/lib/Twig/NodeTraverser.php
index 00f7b54b6..353221747 100644
--- a/web/vendor/twig/twig/lib/Twig/NodeTraverser.php
+++ b/web/vendor/twig/twig/lib/Twig/NodeTraverser.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,6 +14,8 @@
  *
  * It visits all nodes and their children and calls the given visitor for each.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_NodeTraverser
@@ -22,10 +24,8 @@ class Twig_NodeTraverser
     protected $visitors = array();
 
     /**
-     * Constructor.
-     *
-     * @param Twig_Environment            $env      A Twig_Environment instance
-     * @param Twig_NodeVisitorInterface[] $visitors An array of Twig_NodeVisitorInterface instances
+     * @param Twig_Environment            $env
+     * @param Twig_NodeVisitorInterface[] $visitors
      */
     public function __construct(Twig_Environment $env, array $visitors = array())
     {
@@ -35,11 +35,6 @@ class Twig_NodeTraverser
         }
     }
 
-    /**
-     * Adds a visitor.
-     *
-     * @param Twig_NodeVisitorInterface $visitor A Twig_NodeVisitorInterface instance
-     */
     public function addVisitor(Twig_NodeVisitorInterface $visitor)
     {
         if (!isset($this->visitors[$visitor->getPriority()])) {
@@ -52,8 +47,6 @@ class Twig_NodeTraverser
     /**
      * Traverses a node and calls the registered visitors.
      *
-     * @param Twig_NodeInterface $node A Twig_NodeInterface instance
-     *
      * @return Twig_NodeInterface
      */
     public function traverse(Twig_NodeInterface $node)
diff --git a/web/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php b/web/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
index 5c9497774..7169f6f67 100644
--- a/web/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
+++ b/web/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,6 +12,8 @@
 /**
  * Twig_NodeVisitor_Escaper implements output escaping.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
@@ -28,16 +30,14 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
         $this->safeAnalysis = new Twig_NodeVisitor_SafeAnalysis();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
     {
         if ($node instanceof Twig_Node_Module) {
-            if ($env->hasExtension('escaper') && $defaultStrategy = $env->getExtension('escaper')->getDefaultStrategy($node->getAttribute('filename'))) {
+            if ($env->hasExtension('Twig_Extension_Escaper') && $defaultStrategy = $env->getExtension('Twig_Extension_Escaper')->getDefaultStrategy($node->getTemplateName())) {
                 $this->defaultStrategy = $defaultStrategy;
             }
             $this->safeVars = array();
+            $this->blocks = array();
         } elseif ($node instanceof Twig_Node_AutoEscape) {
             $this->statusStack[] = $node->getAttribute('value');
         } elseif ($node instanceof Twig_Node_Block) {
@@ -49,14 +49,12 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
         return $node;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
     {
         if ($node instanceof Twig_Node_Module) {
             $this->defaultStrategy = false;
             $this->safeVars = array();
+            $this->blocks = array();
         } elseif ($node instanceof Twig_Node_Expression_Filter) {
             return $this->preEscapeFilterNode($node, $env);
         } elseif ($node instanceof Twig_Node_Print) {
@@ -88,7 +86,7 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
 
         return new $class(
             $this->getEscaperFilter($type, $expression),
-            $node->getLine()
+            $node->getTemplateLine()
         );
     }
 
@@ -140,16 +138,13 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
 
     protected function getEscaperFilter($type, Twig_NodeInterface $node)
     {
-        $line = $node->getLine();
+        $line = $node->getTemplateLine();
         $name = new Twig_Node_Expression_Constant('escape', $line);
         $args = new Twig_Node(array(new Twig_Node_Expression_Constant((string) $type, $line), new Twig_Node_Expression_Constant(null, $line), new Twig_Node_Expression_Constant(true, $line)));
 
         return new Twig_Node_Expression_Filter($node, $name, $args, $line);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority()
     {
         return 0;
diff --git a/web/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php b/web/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
index 872b7feaa..43453c4dc 100644
--- a/web/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
+++ b/web/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +17,8 @@
  * You can configure which optimizations you want to activate via the
  * optimizer mode.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
@@ -34,8 +36,6 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
     protected $inABody = false;
 
     /**
-     * Constructor.
-     *
      * @param int $optimizers The optimizer mode
      */
     public function __construct($optimizers = -1)
@@ -47,16 +47,13 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
         $this->optimizers = $optimizers;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
     {
         if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) {
             $this->enterOptimizeFor($node, $env);
         }
 
-        if (PHP_VERSION_ID < 50400 && self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('sandbox')) {
+        if (PHP_VERSION_ID < 50400 && self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('Twig_Extension_Sandbox')) {
             if ($this->inABody) {
                 if (!$node instanceof Twig_Node_Expression) {
                     if (get_class($node) !== 'Twig_Node') {
@@ -73,9 +70,6 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
         return $node;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
     {
         $expression = $node instanceof Twig_Node_Expression;
@@ -90,14 +84,14 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
 
         $node = $this->optimizePrintNode($node, $env);
 
-        if (self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('sandbox')) {
+        if (self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('Twig_Extension_Sandbox')) {
             if ($node instanceof Twig_Node_Body) {
                 $this->inABody = false;
             } elseif ($this->inABody) {
                 if (!$expression && get_class($node) !== 'Twig_Node' && $prependedNodes = array_shift($this->prependedNodes)) {
                     $nodes = array();
                     foreach (array_unique($prependedNodes) as $name) {
-                        $nodes[] = new Twig_Node_SetTemp($name, $node->getLine());
+                        $nodes[] = new Twig_Node_SetTemp($name, $node->getTemplateLine());
                     }
 
                     $nodes[] = $node;
@@ -114,7 +108,7 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
         if ('Twig_Node_Expression_Name' === get_class($node) && $node->isSimple()) {
             $this->prependedNodes[0][] = $node->getAttribute('name');
 
-            return new Twig_Node_Expression_TempName($node->getAttribute('name'), $node->getLine());
+            return new Twig_Node_Expression_TempName($node->getAttribute('name'), $node->getTemplateLine());
         }
 
         return $node;
@@ -127,9 +121,6 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
      *
      *   * "echo $this->render(Parent)Block()" with "$this->display(Parent)Block()"
      *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
-     *
      * @return Twig_NodeInterface
      */
     protected function optimizePrintNode(Twig_NodeInterface $node, Twig_Environment $env)
@@ -138,13 +129,14 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
             return $node;
         }
 
+        $exprNode = $node->getNode('expr');
         if (
-            $node->getNode('expr') instanceof Twig_Node_Expression_BlockReference ||
-            $node->getNode('expr') instanceof Twig_Node_Expression_Parent
+            $exprNode instanceof Twig_Node_Expression_BlockReference ||
+            $exprNode instanceof Twig_Node_Expression_Parent
         ) {
-            $node->getNode('expr')->setAttribute('output', true);
+            $exprNode->setAttribute('output', true);
 
-            return $node->getNode('expr');
+            return $exprNode;
         }
 
         return $node;
@@ -153,9 +145,6 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
     /**
      * Removes "raw" filters.
      *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
-     *
      * @return Twig_NodeInterface
      */
     protected function optimizeRawFilter(Twig_NodeInterface $node, Twig_Environment $env)
@@ -169,9 +158,6 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
 
     /**
      * Optimizes "for" tag by removing the "loop" variable creation whenever possible.
-     *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
      */
     protected function enterOptimizeFor(Twig_NodeInterface $node, Twig_Environment $env)
     {
@@ -236,9 +222,6 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
 
     /**
      * Optimizes "for" tag by removing the "loop" variable creation whenever possible.
-     *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
      */
     protected function leaveOptimizeFor(Twig_NodeInterface $node, Twig_Environment $env)
     {
@@ -261,9 +244,6 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority()
     {
         return 255;
diff --git a/web/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php b/web/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
index 439f5bf49..6997f3573 100644
--- a/web/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
+++ b/web/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
@@ -9,6 +9,9 @@
  * file that was distributed with this source code.
  */
 
+/**
+ * @final
+ */
 class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
 {
     protected $data = array();
@@ -57,17 +60,11 @@ class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
     {
         return $node;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
     {
         if ($node instanceof Twig_Node_Expression_Constant) {
@@ -144,9 +141,6 @@ class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
         return array_intersect($a, $b);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority()
     {
         return 0;
diff --git a/web/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php b/web/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
index 7f1b913b7..baf00a034 100644
--- a/web/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
+++ b/web/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,6 +12,8 @@
 /**
  * Twig_NodeVisitor_Sandbox implements sandboxing.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
@@ -21,9 +23,6 @@ class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
     protected $filters;
     protected $functions;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
     {
         if ($node instanceof Twig_Node_Module) {
@@ -51,16 +50,13 @@ class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
 
             // wrap print to check __toString() calls
             if ($node instanceof Twig_Node_Print) {
-                return new Twig_Node_SandboxedPrint($node->getNode('expr'), $node->getLine(), $node->getNodeTag());
+                return new Twig_Node_SandboxedPrint($node->getNode('expr'), $node->getTemplateLine(), $node->getNodeTag());
             }
         }
 
         return $node;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
     {
         if ($node instanceof Twig_Node_Module) {
@@ -72,9 +68,6 @@ class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
         return $node;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority()
     {
         return 0;
diff --git a/web/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php b/web/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
index f27616302..092d36ae7 100644
--- a/web/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,9 +19,6 @@ interface Twig_NodeVisitorInterface
     /**
      * Called before child nodes are visited.
      *
-     * @param Twig_NodeInterface $node The node to visit
-     * @param Twig_Environment   $env  The Twig environment instance
-     *
      * @return Twig_NodeInterface The modified node
      */
     public function enterNode(Twig_NodeInterface $node, Twig_Environment $env);
@@ -29,9 +26,6 @@ interface Twig_NodeVisitorInterface
     /**
      * Called after child nodes are visited.
      *
-     * @param Twig_NodeInterface $node The node to visit
-     * @param Twig_Environment   $env  The Twig environment instance
-     *
      * @return Twig_NodeInterface|false The modified node or false if the node must be removed
      */
     public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env);
diff --git a/web/vendor/twig/twig/lib/Twig/Parser.php b/web/vendor/twig/twig/lib/Twig/Parser.php
index 4628d67df..070f301b1 100644
--- a/web/vendor/twig/twig/lib/Twig/Parser.php
+++ b/web/vendor/twig/twig/lib/Twig/Parser.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -32,18 +32,18 @@ class Twig_Parser implements Twig_ParserInterface
     protected $traits;
     protected $embeddedTemplates = array();
 
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env A Twig_Environment instance
-     */
     public function __construct(Twig_Environment $env)
     {
         $this->env = $env;
     }
 
+    /**
+     * @deprecated since 1.27 (to be removed in 2.0)
+     */
     public function getEnvironment()
     {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0.', E_USER_DEPRECATED);
+
         return $this->env;
     }
 
@@ -52,18 +52,21 @@ class Twig_Parser implements Twig_ParserInterface
         return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
     }
 
+    /**
+     * @deprecated since 1.27 (to be removed in 2.0). Use $parser->getStream()->getSourceContext()->getPath() instead.
+     */
     public function getFilename()
     {
-        return $this->stream->getFilename();
+        @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use $parser->getStream()->getSourceContext()->getPath() instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return $this->stream->getSourceContext()->getName();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = false)
     {
         // push all variables into the stack to keep the current state of the parser
         // using get_object_vars() instead of foreach would lead to https://bugs.php.net/71336
+        // This hack can be removed when min version if PHP 7.0
         $vars = array();
         foreach ($this as $k => $v) {
             $vars[$k] = $v;
@@ -84,7 +87,7 @@ class Twig_Parser implements Twig_ParserInterface
         }
 
         if (null === $this->expressionParser) {
-            $this->expressionParser = new Twig_ExpressionParser($this, $this->env->getUnaryOperators(), $this->env->getBinaryOperators());
+            $this->expressionParser = new Twig_ExpressionParser($this, $this->env);
         }
 
         $this->stream = $stream;
@@ -103,8 +106,8 @@ class Twig_Parser implements Twig_ParserInterface
                 $body = new Twig_Node();
             }
         } catch (Twig_Error_Syntax $e) {
-            if (!$e->getTemplateFile()) {
-                $e->setTemplateFile($this->getFilename());
+            if (!$e->getSourceContext()) {
+                $e->setSourceContext($this->stream->getSourceContext());
             }
 
             if (!$e->getTemplateLine()) {
@@ -114,7 +117,7 @@ class Twig_Parser implements Twig_ParserInterface
             throw $e;
         }
 
-        $node = new Twig_Node_Module(new Twig_Node_Body(array($body)), $this->parent, new Twig_Node($this->blocks), new Twig_Node($this->macros), new Twig_Node($this->traits), $this->embeddedTemplates, $this->getFilename());
+        $node = new Twig_Node_Module(new Twig_Node_Body(array($body)), $this->parent, new Twig_Node($this->blocks), new Twig_Node($this->macros), new Twig_Node($this->traits), $this->embeddedTemplates, $stream->getSourceContext());
 
         $traverser = new Twig_NodeTraverser($this->env, $this->visitors);
 
@@ -151,7 +154,7 @@ class Twig_Parser implements Twig_ParserInterface
                     $token = $this->getCurrentToken();
 
                     if ($token->getType() !== Twig_Token::NAME_TYPE) {
-                        throw new Twig_Error_Syntax('A block must start with a tag name.', $token->getLine(), $this->getFilename());
+                        throw new Twig_Error_Syntax('A block must start with a tag name.', $token->getLine(), $this->stream->getSourceContext());
                     }
 
                     if (null !== $test && call_user_func($test, $token)) {
@@ -169,13 +172,13 @@ class Twig_Parser implements Twig_ParserInterface
                     $subparser = $this->handlers->getTokenParser($token->getValue());
                     if (null === $subparser) {
                         if (null !== $test) {
-                            $e = new Twig_Error_Syntax(sprintf('Unexpected "%s" tag', $token->getValue()), $token->getLine(), $this->getFilename());
+                            $e = new Twig_Error_Syntax(sprintf('Unexpected "%s" tag', $token->getValue()), $token->getLine(), $this->stream->getSourceContext());
 
                             if (is_array($test) && isset($test[0]) && $test[0] instanceof Twig_TokenParserInterface) {
                                 $e->appendMessage(sprintf(' (expecting closing tag for the "%s" tag defined near line %s).', $test[0]->getTag(), $lineno));
                             }
                         } else {
-                            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" tag.', $token->getValue()), $token->getLine(), $this->getFilename());
+                            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" tag.', $token->getValue()), $token->getLine(), $this->stream->getSourceContext());
                             $e->addSuggestions($token->getValue(), array_keys($this->env->getTags()));
                         }
 
@@ -191,7 +194,7 @@ class Twig_Parser implements Twig_ParserInterface
                     break;
 
                 default:
-                    throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', 0, $this->getFilename());
+                    throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', $this->getCurrentToken()->getLine(), $this->stream->getSourceContext());
             }
         }
 
@@ -202,13 +205,23 @@ class Twig_Parser implements Twig_ParserInterface
         return new Twig_Node($rv, array(), $lineno);
     }
 
+    /**
+     * @deprecated since 1.27 (to be removed in 2.0)
+     */
     public function addHandler($name, $class)
     {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0.', E_USER_DEPRECATED);
+
         $this->handlers[$name] = $class;
     }
 
+    /**
+     * @deprecated since 1.27 (to be removed in 2.0)
+     */
     public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
     {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0.', E_USER_DEPRECATED);
+
         $this->visitors[] = $visitor;
     }
 
@@ -244,7 +257,7 @@ class Twig_Parser implements Twig_ParserInterface
 
     public function setBlock($name, Twig_Node_Block $value)
     {
-        $this->blocks[$name] = new Twig_Node_Body(array($value), array(), $value->getLine());
+        $this->blocks[$name] = new Twig_Node_Body(array($value), array(), $value->getTemplateLine());
     }
 
     public function hasMacro($name)
@@ -255,7 +268,7 @@ class Twig_Parser implements Twig_ParserInterface
     public function setMacro($name, Twig_Node_Macro $node)
     {
         if ($this->isReservedMacroName($name)) {
-            throw new Twig_Error_Syntax(sprintf('"%s" cannot be used as a macro name as it is a reserved keyword.', $name), $node->getLine(), $this->getFilename());
+            throw new Twig_Error_Syntax(sprintf('"%s" cannot be used as a macro name as it is a reserved keyword.', $name), $node->getTemplateLine(), $this->stream->getSourceContext());
         }
 
         $this->macros[$name] = $node;
@@ -325,9 +338,7 @@ class Twig_Parser implements Twig_ParserInterface
     }
 
     /**
-     * Gets the expression parser.
-     *
-     * @return Twig_ExpressionParser The expression parser
+     * @return Twig_ExpressionParser
      */
     public function getExpressionParser()
     {
@@ -345,9 +356,7 @@ class Twig_Parser implements Twig_ParserInterface
     }
 
     /**
-     * Gets the token stream.
-     *
-     * @return Twig_TokenStream The token stream
+     * @return Twig_TokenStream
      */
     public function getStream()
     {
@@ -355,9 +364,7 @@ class Twig_Parser implements Twig_ParserInterface
     }
 
     /**
-     * Gets the current token.
-     *
-     * @return Twig_Token The current token
+     * @return Twig_Token
      */
     public function getCurrentToken()
     {
@@ -373,14 +380,14 @@ class Twig_Parser implements Twig_ParserInterface
             (!$node instanceof Twig_Node_Text && !$node instanceof Twig_Node_BlockReference && $node instanceof Twig_NodeOutputInterface)
         ) {
             if (false !== strpos((string) $node, chr(0xEF).chr(0xBB).chr(0xBF))) {
-                throw new Twig_Error_Syntax('A template that extends another one cannot have a body but a byte order mark (BOM) has been detected; it must be removed.', $node->getLine(), $this->getFilename());
+                throw new Twig_Error_Syntax('A template that extends another one cannot start with a byte order mark (BOM); it must be removed.', $node->getTemplateLine(), $this->stream->getSourceContext());
             }
 
-            throw new Twig_Error_Syntax('A template that extends another one cannot have a body.', $node->getLine(), $this->getFilename());
+            throw new Twig_Error_Syntax('A template that extends another one cannot include contents outside Twig blocks. Did you forget to put the contents inside a {% block %} tag?', $node->getTemplateLine(), $this->stream->getSourceContext());
         }
 
-        // bypass "set" nodes as they "capture" the output
-        if ($node instanceof Twig_Node_Set) {
+        // bypass nodes that will "capture" the output
+        if ($node instanceof Twig_NodeCaptureInterface) {
             return $node;
         }
 
diff --git a/web/vendor/twig/twig/lib/Twig/ParserInterface.php b/web/vendor/twig/twig/lib/Twig/ParserInterface.php
index 8e7cc0a85..85c6e67b2 100644
--- a/web/vendor/twig/twig/lib/Twig/ParserInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/ParserInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,9 +21,7 @@ interface Twig_ParserInterface
     /**
      * Converts a token stream to a node tree.
      *
-     * @param Twig_TokenStream $stream A token stream instance
-     *
-     * @return Twig_Node_Module A node tree
+     * @return Twig_Node_Module
      *
      * @throws Twig_Error_Syntax When the token stream is syntactically or semantically wrong
      */
diff --git a/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php b/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
index b82747a94..6be67edf9 100644
--- a/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
+++ b/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,6 +11,8 @@
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final
  */
 class Twig_Profiler_Dumper_Blackfire
 {
diff --git a/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php b/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
index f066da750..f0fa406aa 100644
--- a/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
+++ b/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,6 +11,8 @@
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final
  */
 class Twig_Profiler_Dumper_Html extends Twig_Profiler_Dumper_Text
 {
diff --git a/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php b/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
index 998e210d3..c77e69184 100644
--- a/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
+++ b/web/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,6 +11,8 @@
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final
  */
 class Twig_Profiler_Dumper_Text
 {
diff --git a/web/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php b/web/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
index 2f9721481..e10d857e0 100644
--- a/web/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
+++ b/web/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,9 +21,6 @@ class Twig_Profiler_Node_EnterProfile extends Twig_Node
         parent::__construct(array(), array('extension_name' => $extensionName, 'name' => $name, 'type' => $type, 'var_name' => $varName));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile(Twig_Compiler $compiler)
     {
         $compiler
diff --git a/web/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php b/web/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
index 88074c2f6..e4d0beb4e 100644
--- a/web/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
+++ b/web/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,9 +21,6 @@ class Twig_Profiler_Node_LeaveProfile extends Twig_Node
         parent::__construct(array(), array('var_name' => $varName));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function compile(Twig_Compiler $compiler)
     {
         $compiler
diff --git a/web/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php b/web/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
index 4b0baa82e..a99047488 100644
--- a/web/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
+++ b/web/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,6 +11,8 @@
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final
  */
 class Twig_Profiler_NodeVisitor_Profiler extends Twig_BaseNodeVisitor
 {
@@ -21,22 +23,16 @@ class Twig_Profiler_NodeVisitor_Profiler extends Twig_BaseNodeVisitor
         $this->extensionName = $extensionName;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
     {
         return $node;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
     {
         if ($node instanceof Twig_Node_Module) {
             $varName = $this->getVarName();
-            $node->setNode('display_start', new Twig_Node(array(new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::TEMPLATE, $node->getAttribute('filename'), $varName), $node->getNode('display_start'))));
+            $node->setNode('display_start', new Twig_Node(array(new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::TEMPLATE, $node->getTemplateName(), $varName), $node->getNode('display_start'))));
             $node->setNode('display_end', new Twig_Node(array(new Twig_Profiler_Node_LeaveProfile($varName), $node->getNode('display_end'))));
         } elseif ($node instanceof Twig_Node_Block) {
             $varName = $this->getVarName();
@@ -62,9 +58,6 @@ class Twig_Profiler_NodeVisitor_Profiler extends Twig_BaseNodeVisitor
         return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority()
     {
         return 0;
diff --git a/web/vendor/twig/twig/lib/Twig/Profiler/Profile.php b/web/vendor/twig/twig/lib/Twig/Profiler/Profile.php
index 104bc0581..9274da28b 100644
--- a/web/vendor/twig/twig/lib/Twig/Profiler/Profile.php
+++ b/web/vendor/twig/twig/lib/Twig/Profiler/Profile.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2015 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,6 +11,8 @@
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final
  */
 class Twig_Profiler_Profile implements IteratorAggregate, Serializable
 {
diff --git a/web/vendor/twig/twig/lib/Twig/RuntimeLoaderInterface.php b/web/vendor/twig/twig/lib/Twig/RuntimeLoaderInterface.php
new file mode 100644
index 000000000..c41f44af9
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/RuntimeLoaderInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Creates runtime implementations for Twig elements (filters/functions/tests).
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+interface Twig_RuntimeLoaderInterface
+{
+    /**
+     * Creates the runtime implementation of a Twig element (filter/function/test).
+     *
+     * @param string $class A runtime class
+     *
+     * @return object|null The runtime instance or null if the loader does not know how to create the runtime for this class
+     */
+    public function load($class);
+}
diff --git a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
index 015bfaea2..5a4e021d5 100644
--- a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
+++ b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
index 99faba9dd..1967cf766 100644
--- a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
+++ b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
index 05cf488af..79a400f12 100644
--- a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
+++ b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
new file mode 100644
index 000000000..9e5d4df04
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Exception thrown when a not allowed class method is used in a template.
+ *
+ * @author Kit Burton-Senior <mail@kitbs.com>
+ */
+class Twig_Sandbox_SecurityNotAllowedMethodError extends Twig_Sandbox_SecurityError
+{
+    private $className;
+    private $methodName;
+
+    public function __construct($message, $className, $methodName, $lineno = -1, $filename = null, Exception $previous = null)
+    {
+        parent::__construct($message, $lineno, $filename, $previous);
+        $this->className = $className;
+        $this->methodName = $methodName;
+    }
+
+    public function getClassName()
+    {
+        return $this->className;
+    }
+
+    public function getMethodName()
+    {
+        return $this->methodName;
+    }
+}
diff --git a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
new file mode 100644
index 000000000..9f7eab290
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Exception thrown when a not allowed class property is used in a template.
+ *
+ * @author Kit Burton-Senior <mail@kitbs.com>
+ */
+class Twig_Sandbox_SecurityNotAllowedPropertyError extends Twig_Sandbox_SecurityError
+{
+    private $className;
+    private $propertyName;
+
+    public function __construct($message, $className, $propertyName, $lineno = -1, $filename = null, Exception $previous = null)
+    {
+        parent::__construct($message, $lineno, $filename, $previous);
+        $this->className = $className;
+        $this->propertyName = $propertyName;
+    }
+
+    public function getClassName()
+    {
+        return $this->className;
+    }
+
+    public function getPropertyName()
+    {
+        return $this->propertyName;
+    }
+}
diff --git a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
index b3bb5e8e2..a177206cc 100644
--- a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
+++ b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
index c4dd03dff..4470c39f4 100644
--- a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
+++ b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,6 +12,8 @@
 /**
  * Represents a security policy which need to be enforced when sandbox mode is enabled.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterface
@@ -97,7 +99,8 @@ class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterfac
         }
 
         if (!$allowed) {
-            throw new Twig_Sandbox_SecurityError(sprintf('Calling "%s" method on a "%s" object is not allowed.', $method, get_class($obj)));
+            $class = get_class($obj);
+            throw new Twig_Sandbox_SecurityNotAllowedMethodError(sprintf('Calling "%s" method on a "%s" object is not allowed.', $method, $class), $class, $method);
         }
     }
 
@@ -113,7 +116,8 @@ class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterfac
         }
 
         if (!$allowed) {
-            throw new Twig_Sandbox_SecurityError(sprintf('Calling "%s" property on a "%s" object is not allowed.', $property, get_class($obj)));
+            $class = get_class($obj);
+            throw new Twig_Sandbox_SecurityNotAllowedPropertyError(sprintf('Calling "%s" property on a "%s" object is not allowed.', $property, $class), $class, $property);
         }
     }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
index 6ab48e3cc..2111a03c1 100644
--- a/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/SimpleFilter.php b/web/vendor/twig/twig/lib/Twig/SimpleFilter.php
index 0c1e092a7..a0b98af3a 100644
--- a/web/vendor/twig/twig/lib/Twig/SimpleFilter.php
+++ b/web/vendor/twig/twig/lib/Twig/SimpleFilter.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009-2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,6 +12,8 @@
 /**
  * Represents a template filter.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_SimpleFilter
diff --git a/web/vendor/twig/twig/lib/Twig/SimpleFunction.php b/web/vendor/twig/twig/lib/Twig/SimpleFunction.php
index 63003d6a0..b7ef92a59 100644
--- a/web/vendor/twig/twig/lib/Twig/SimpleFunction.php
+++ b/web/vendor/twig/twig/lib/Twig/SimpleFunction.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010-2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,6 +12,8 @@
 /**
  * Represents a template function.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_SimpleFunction
diff --git a/web/vendor/twig/twig/lib/Twig/SimpleTest.php b/web/vendor/twig/twig/lib/Twig/SimpleTest.php
index cff3ae7c9..b9ae8f146 100644
--- a/web/vendor/twig/twig/lib/Twig/SimpleTest.php
+++ b/web/vendor/twig/twig/lib/Twig/SimpleTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010-2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,6 +12,8 @@
 /**
  * Represents a template test.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_SimpleTest
diff --git a/web/vendor/twig/twig/lib/Twig/Source.php b/web/vendor/twig/twig/lib/Twig/Source.php
new file mode 100644
index 000000000..389317ec1
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/Source.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Holds information about a non-compiled Twig template.
+ *
+ * @final
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Twig_Source
+{
+    private $code;
+    private $name;
+    private $path;
+
+    /**
+     * @param string $code The template source code
+     * @param string $name The template logical name
+     * @param string $path The filesystem path of the template if any
+     */
+    public function __construct($code, $name, $path = '')
+    {
+        $this->code = $code;
+        $this->name = $name;
+        $this->path = $path;
+    }
+
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getPath()
+    {
+        return $this->path;
+    }
+}
diff --git a/web/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php b/web/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php
new file mode 100644
index 000000000..acf21e378
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/SourceContextLoaderInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Adds a getSourceContext() method for loaders.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated since 1.27 (to be removed in 3.0)
+ */
+interface Twig_SourceContextLoaderInterface
+{
+    /**
+     * Returns the source context for a given template logical name.
+     *
+     * @param string $name The template logical name
+     *
+     * @return Twig_Source
+     *
+     * @throws Twig_Error_Loader When $name is not found
+     */
+    public function getSourceContext($name);
+}
diff --git a/web/vendor/twig/twig/lib/Twig/Template.php b/web/vendor/twig/twig/lib/Twig/Template.php
index a8160227e..f1855f117 100644
--- a/web/vendor/twig/twig/lib/Twig/Template.php
+++ b/web/vendor/twig/twig/lib/Twig/Template.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,10 +13,19 @@
 /**
  * Default base class for compiled templates.
  *
+ * This class is an implementation detail of how template compilation currently
+ * works, which might change. It should never be used directly. Use $twig->load()
+ * instead, which returns an instance of Twig_TemplateWrapper.
+ *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @internal
  */
 abstract class Twig_Template implements Twig_TemplateInterface
 {
+    /**
+     * @internal
+     */
     protected static $cache = array();
 
     protected $parent;
@@ -25,16 +34,19 @@ abstract class Twig_Template implements Twig_TemplateInterface
     protected $blocks = array();
     protected $traits = array();
 
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env A Twig_Environment instance
-     */
     public function __construct(Twig_Environment $env)
     {
         $this->env = $env;
     }
 
+    /**
+     * @internal this method will be removed in 2.0 and is only used internally to provide an upgrade path from 1.x to 2.0
+     */
+    public function __toString()
+    {
+        return $this->getTemplateName();
+    }
+
     /**
      * Returns the template name.
      *
@@ -42,6 +54,42 @@ abstract class Twig_Template implements Twig_TemplateInterface
      */
     abstract public function getTemplateName();
 
+    /**
+     * Returns debug information about the template.
+     *
+     * @return array Debug information
+     *
+     * @internal
+     */
+    public function getDebugInfo()
+    {
+        return array();
+    }
+
+    /**
+     * Returns the template source code.
+     *
+     * @return string The template source code
+     *
+     * @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead
+     */
+    public function getSource()
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', E_USER_DEPRECATED);
+
+        return '';
+    }
+
+    /**
+     * Returns information about the original template source code.
+     *
+     * @return Twig_Source
+     */
+    public function getSourceContext()
+    {
+        return new Twig_Source('', $this->getTemplateName());
+    }
+
     /**
      * @deprecated since 1.20 (to be removed in 2.0)
      */
@@ -85,7 +133,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
                 $this->parents[$parent] = $this->loadTemplate($parent);
             }
         } catch (Twig_Error_Loader $e) {
-            $e->setTemplateFile(null);
+            $e->setSourceContext(null);
             $e->guess();
 
             throw $e;
@@ -125,7 +173,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
         } elseif (false !== $parent = $this->getParent($context)) {
             $parent->displayBlock($name, $context, $blocks, false);
         } else {
-            throw new Twig_Error_Runtime(sprintf('The template has no parent and no traits defining the "%s" block', $name), -1, $this->getTemplateName());
+            throw new Twig_Error_Runtime(sprintf('The template has no parent and no traits defining the "%s" block.', $name), -1, $this->getSourceContext());
         }
     }
 
@@ -157,17 +205,17 @@ abstract class Twig_Template implements Twig_TemplateInterface
             $block = null;
         }
 
-        if (null !== $template) {
-            // avoid RCEs when sandbox is enabled
-            if (!$template instanceof self) {
-                throw new LogicException('A block must be a method on a Twig_Template instance.');
-            }
+        // avoid RCEs when sandbox is enabled
+        if (null !== $template && !$template instanceof self) {
+            throw new LogicException('A block must be a method on a Twig_Template instance.');
+        }
 
+        if (null !== $template) {
             try {
                 $template->$block($context, $blocks);
             } catch (Twig_Error $e) {
-                if (!$e->getTemplateFile()) {
-                    $e->setTemplateFile($template->getTemplateName());
+                if (!$e->getSourceContext()) {
+                    $e->setSourceContext($template->getSourceContext());
                 }
 
                 // this is mostly useful for Twig_Error_Loader exceptions
@@ -179,10 +227,12 @@ abstract class Twig_Template implements Twig_TemplateInterface
 
                 throw $e;
             } catch (Exception $e) {
-                throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getTemplateName(), $e);
+                throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getSourceContext(), $e);
             }
         } elseif (false !== $parent = $this->getParent($context)) {
             $parent->displayBlock($name, $context, array_merge($this->blocks, $blocks), false);
+        } else {
+            @trigger_error(sprintf('Silent display of undefined block "%s" in template "%s" is deprecated since version 1.29 and will throw an exception in 2.0. Use the "block(\'%s\') is defined" expression to test for block existence.', $name, $this->getTemplateName(), $name), E_USER_DEPRECATED);
         }
     }
 
@@ -232,44 +282,70 @@ abstract class Twig_Template implements Twig_TemplateInterface
     }
 
     /**
-     * Returns whether a block exists or not.
+     * Returns whether a block exists or not in the current context of the template.
      *
-     * This method is for internal use only and should never be called
-     * directly.
+     * This method checks blocks defined in the current template
+     * or defined in "used" traits or defined in parent templates.
      *
-     * This method does only return blocks defined in the current template
-     * or defined in "used" traits.
-     *
-     * It does not return blocks from parent templates as the parent
-     * template name can be dynamic, which is only known based on the
-     * current context.
-     *
-     * @param string $name The block name
+     * @param string $name    The block name
+     * @param array  $context The context
+     * @param array  $blocks  The current set of blocks
      *
      * @return bool true if the block exists, false otherwise
      *
      * @internal
      */
-    public function hasBlock($name)
+    public function hasBlock($name, array $context = null, array $blocks = array())
     {
-        return isset($this->blocks[(string) $name]);
+        if (null === $context) {
+            @trigger_error('The '.__METHOD__.' method is internal and should never be called; calling it directly is deprecated since version 1.28 and won\'t be possible anymore in 2.0.', E_USER_DEPRECATED);
+
+            return isset($this->blocks[(string) $name]);
+        }
+
+        if (isset($blocks[$name])) {
+            return $blocks[$name][0] instanceof self;
+        }
+
+        if (isset($this->blocks[$name])) {
+            return true;
+        }
+
+        if (false !== $parent = $this->getParent($context)) {
+            return $parent->hasBlock($name, $context);
+        }
+
+        return false;
     }
 
     /**
-     * Returns all block names.
+     * Returns all block names in the current context of the template.
      *
-     * This method is for internal use only and should never be called
-     * directly.
+     * This method checks blocks defined in the current template
+     * or defined in "used" traits or defined in parent templates.
+     *
+     * @param array $context The context
+     * @param array $blocks  The current set of blocks
      *
      * @return array An array of block names
      *
-     * @see hasBlock
-     *
      * @internal
      */
-    public function getBlockNames()
+    public function getBlockNames(array $context = null, array $blocks = array())
     {
-        return array_keys($this->blocks);
+        if (null === $context) {
+            @trigger_error('The '.__METHOD__.' method is internal and should never be called; calling it directly is deprecated since version 1.28 and won\'t be possible anymore in 2.0.', E_USER_DEPRECATED);
+
+            return array_keys($this->blocks);
+        }
+
+        $names = array_merge(array_keys($blocks), array_keys($this->blocks));
+
+        if (false !== $parent = $this->getParent($context)) {
+            $names = array_merge($names, $parent->getBlockNames($context));
+        }
+
+        return array_unique($names);
     }
 
     protected function loadTemplate($template, $templateName = null, $line = null, $index = null)
@@ -283,10 +359,14 @@ abstract class Twig_Template implements Twig_TemplateInterface
                 return $template;
             }
 
+            if ($template instanceof Twig_TemplateWrapper) {
+                return $template;
+            }
+
             return $this->env->loadTemplate($template, $index);
         } catch (Twig_Error $e) {
-            if (!$e->getTemplateFile()) {
-                $e->setTemplateFile($templateName ? $templateName : $this->getTemplateName());
+            if (!$e->getSourceContext()) {
+                $e->setSourceContext($templateName ? new Twig_Source('', $templateName) : $this->getSourceContext());
             }
 
             if ($e->getTemplateLine()) {
@@ -311,8 +391,6 @@ abstract class Twig_Template implements Twig_TemplateInterface
      *
      * @return array An array of blocks
      *
-     * @see hasBlock
-     *
      * @internal
      */
     public function getBlocks()
@@ -320,44 +398,11 @@ abstract class Twig_Template implements Twig_TemplateInterface
         return $this->blocks;
     }
 
-    /**
-     * Returns the template source code.
-     *
-     * @return string|null The template source code or null if it is not available
-     */
-    public function getSource()
-    {
-        $reflector = new ReflectionClass($this);
-        $file = $reflector->getFileName();
-
-        if (!file_exists($file)) {
-            return;
-        }
-
-        $source = file($file, FILE_IGNORE_NEW_LINES);
-        array_splice($source, 0, $reflector->getEndLine());
-
-        $i = 0;
-        while (isset($source[$i]) && '/* */' === substr_replace($source[$i], '', 3, -2)) {
-            $source[$i] = str_replace('*//* ', '*/', substr($source[$i], 3, -2));
-            ++$i;
-        }
-        array_splice($source, $i);
-
-        return implode("\n", $source);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
     public function display(array $context, array $blocks = array())
     {
         $this->displayWithErrorHandling($this->env->mergeGlobals($context), array_merge($this->blocks, $blocks));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function render(array $context)
     {
         $level = ob_get_level();
@@ -369,6 +414,12 @@ abstract class Twig_Template implements Twig_TemplateInterface
                 ob_end_clean();
             }
 
+            throw $e;
+        } catch (Throwable $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+
             throw $e;
         }
 
@@ -380,8 +431,8 @@ abstract class Twig_Template implements Twig_TemplateInterface
         try {
             $this->doDisplay($context, $blocks);
         } catch (Twig_Error $e) {
-            if (!$e->getTemplateFile()) {
-                $e->setTemplateFile($this->getTemplateName());
+            if (!$e->getSourceContext()) {
+                $e->setSourceContext($this->getSourceContext());
             }
 
             // this is mostly useful for Twig_Error_Loader exceptions
@@ -393,7 +444,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
 
             throw $e;
         } catch (Exception $e) {
-            throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getTemplateName(), $e);
+            throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getSourceContext(), $e);
         }
     }
 
@@ -433,7 +484,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
                 return;
             }
 
-            throw new Twig_Error_Runtime(sprintf('Variable "%s" does not exist', $item), -1, $this->getTemplateName());
+            throw new Twig_Error_Runtime(sprintf('Variable "%s" does not exist.', $item), -1, $this->getSourceContext());
         }
 
         return $context[$item];
@@ -452,6 +503,8 @@ abstract class Twig_Template implements Twig_TemplateInterface
      * @return mixed The attribute value, or a Boolean when $isDefinedTest is true, or null when the attribute is not set and $ignoreStrictCheck is true
      *
      * @throws Twig_Error_Runtime if the attribute does not exist and Twig is running in strict mode and $isDefinedTest is false
+     *
+     * @internal
      */
     protected function getAttribute($object, $item, array $arguments = array(), $type = self::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
     {
@@ -459,7 +512,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
         if (self::METHOD_CALL !== $type) {
             $arrayItem = is_bool($item) || is_float($item) ? (int) $item : $item;
 
-            if ((is_array($object) && array_key_exists($arrayItem, $object))
+            if ((is_array($object) && (isset($object[$arrayItem]) || array_key_exists($arrayItem, $object)))
                 || ($object instanceof ArrayAccess && isset($object[$arrayItem]))
             ) {
                 if ($isDefinedTest) {
@@ -479,28 +532,28 @@ abstract class Twig_Template implements Twig_TemplateInterface
                 }
 
                 if ($object instanceof ArrayAccess) {
-                    $message = sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist', $arrayItem, get_class($object));
+                    $message = sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist.', $arrayItem, get_class($object));
                 } elseif (is_object($object)) {
-                    $message = sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface', $item, get_class($object));
+                    $message = sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface.', $item, get_class($object));
                 } elseif (is_array($object)) {
                     if (empty($object)) {
-                        $message = sprintf('Key "%s" does not exist as the array is empty', $arrayItem);
+                        $message = sprintf('Key "%s" does not exist as the array is empty.', $arrayItem);
                     } else {
-                        $message = sprintf('Key "%s" for array with keys "%s" does not exist', $arrayItem, implode(', ', array_keys($object)));
+                        $message = sprintf('Key "%s" for array with keys "%s" does not exist.', $arrayItem, implode(', ', array_keys($object)));
                     }
                 } elseif (self::ARRAY_CALL === $type) {
                     if (null === $object) {
-                        $message = sprintf('Impossible to access a key ("%s") on a null variable', $item);
+                        $message = sprintf('Impossible to access a key ("%s") on a null variable.', $item);
                     } else {
-                        $message = sprintf('Impossible to access a key ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
+                        $message = sprintf('Impossible to access a key ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
                     }
                 } elseif (null === $object) {
-                    $message = sprintf('Impossible to access an attribute ("%s") on a null variable', $item);
+                    $message = sprintf('Impossible to access an attribute ("%s") on a null variable.', $item);
                 } else {
-                    $message = sprintf('Impossible to access an attribute ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
+                    $message = sprintf('Impossible to access an attribute ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
                 }
 
-                throw new Twig_Error_Runtime($message, -1, $this->getTemplateName());
+                throw new Twig_Error_Runtime($message, -1, $this->getSourceContext());
             }
         }
 
@@ -514,12 +567,12 @@ abstract class Twig_Template implements Twig_TemplateInterface
             }
 
             if (null === $object) {
-                $message = sprintf('Impossible to invoke a method ("%s") on a null variable', $item);
+                $message = sprintf('Impossible to invoke a method ("%s") on a null variable.', $item);
             } else {
-                $message = sprintf('Impossible to invoke a method ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
+                $message = sprintf('Impossible to invoke a method ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
             }
 
-            throw new Twig_Error_Runtime($message, -1, $this->getTemplateName());
+            throw new Twig_Error_Runtime($message, -1, $this->getSourceContext());
         }
 
         // object property
@@ -529,8 +582,8 @@ abstract class Twig_Template implements Twig_TemplateInterface
                     return true;
                 }
 
-                if ($this->env->hasExtension('sandbox')) {
-                    $this->env->getExtension('sandbox')->checkPropertyAllowed($object, $item);
+                if ($this->env->hasExtension('Twig_Extension_Sandbox')) {
+                    $this->env->getExtension('Twig_Extension_Sandbox')->checkPropertyAllowed($object, $item);
                 }
 
                 return $object->$item;
@@ -540,37 +593,57 @@ abstract class Twig_Template implements Twig_TemplateInterface
         $class = get_class($object);
 
         // object method
-        if (!isset(self::$cache[$class]['methods'])) {
+        if (!isset(self::$cache[$class])) {
             // get_class_methods returns all methods accessible in the scope, but we only want public ones to be accessible in templates
             if ($object instanceof self) {
                 $ref = new ReflectionClass($class);
                 $methods = array();
 
                 foreach ($ref->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
-                    $methodName = strtolower($refMethod->name);
-
                     // Accessing the environment from templates is forbidden to prevent untrusted changes to the environment
-                    if ('getenvironment' !== $methodName) {
-                        $methods[$methodName] = true;
+                    if ('getenvironment' !== strtolower($refMethod->name)) {
+                        $methods[] = $refMethod->name;
                     }
                 }
-
-                self::$cache[$class]['methods'] = $methods;
             } else {
-                self::$cache[$class]['methods'] = array_change_key_case(array_flip(get_class_methods($object)));
+                $methods = get_class_methods($object);
             }
+            // sort values to have consistent behavior, so that "get" methods win precedence over "is" methods
+            sort($methods);
+
+            $cache = array();
+
+            foreach ($methods as $method) {
+                $cache[$method] = $method;
+                $cache[$lcName = strtolower($method)] = $method;
+
+                if ('g' === $lcName[0] && 0 === strpos($lcName, 'get')) {
+                    $name = substr($method, 3);
+                    $lcName = substr($lcName, 3);
+                } elseif ('i' === $lcName[0] && 0 === strpos($lcName, 'is')) {
+                    $name = substr($method, 2);
+                    $lcName = substr($lcName, 2);
+                } else {
+                    continue;
+                }
+
+                if (!isset($cache[$name])) {
+                    $cache[$name] = $method;
+                }
+                if (!isset($cache[$lcName])) {
+                    $cache[$lcName] = $method;
+                }
+            }
+            self::$cache[$class] = $cache;
         }
 
         $call = false;
-        $lcItem = strtolower($item);
-        if (isset(self::$cache[$class]['methods'][$lcItem])) {
-            $method = (string) $item;
-        } elseif (isset(self::$cache[$class]['methods']['get'.$lcItem])) {
-            $method = 'get'.$item;
-        } elseif (isset(self::$cache[$class]['methods']['is'.$lcItem])) {
-            $method = 'is'.$item;
-        } elseif (isset(self::$cache[$class]['methods']['__call'])) {
-            $method = (string) $item;
+        if (isset(self::$cache[$class][$item])) {
+            $method = self::$cache[$class][$item];
+        } elseif (isset(self::$cache[$class][$lcItem = strtolower($item)])) {
+            $method = self::$cache[$class][$lcItem];
+        } elseif (isset(self::$cache[$class]['__call'])) {
+            $method = $item;
             $call = true;
         } else {
             if ($isDefinedTest) {
@@ -581,21 +654,25 @@ abstract class Twig_Template implements Twig_TemplateInterface
                 return;
             }
 
-            throw new Twig_Error_Runtime(sprintf('Method "%s" for object "%s" does not exist', $item, get_class($object)), -1, $this->getTemplateName());
+            throw new Twig_Error_Runtime(sprintf('Neither the property "%1$s" nor one of the methods "%1$s()", "get%1$s()"/"is%1$s()" or "__call()" exist and have public access in class "%2$s".', $item, $class), -1, $this->getSourceContext());
         }
 
         if ($isDefinedTest) {
             return true;
         }
 
-        if ($this->env->hasExtension('sandbox')) {
-            $this->env->getExtension('sandbox')->checkMethodAllowed($object, $method);
+        if ($this->env->hasExtension('Twig_Extension_Sandbox')) {
+            $this->env->getExtension('Twig_Extension_Sandbox')->checkMethodAllowed($object, $method);
         }
 
         // Some objects throw exceptions when they have __call, and the method we try
         // to call is not supported. If ignoreStrictCheck is true, we should return null.
         try {
-            $ret = call_user_func_array(array($object, $method), $arguments);
+            if (!$arguments) {
+                $ret = $object->$method();
+            } else {
+                $ret = call_user_func_array(array($object, $method), $arguments);
+            }
         } catch (BadMethodCallException $e) {
             if ($call && ($ignoreStrictCheck || !$this->env->isStrictVariables())) {
                 return;
@@ -603,9 +680,19 @@ abstract class Twig_Template implements Twig_TemplateInterface
             throw $e;
         }
 
-        // useful when calling a template method from a template
-        // this is not supported but unfortunately heavily used in the Symfony profiler
+        // @deprecated in 1.28
         if ($object instanceof Twig_TemplateInterface) {
+            $self = $object->getTemplateName() === $this->getTemplateName();
+            $message = sprintf('Calling "%s" on template "%s" from template "%s" is deprecated since version 1.28 and won\'t be supported anymore in 2.0.', $item, $object->getTemplateName(), $this->getTemplateName());
+            if ('renderBlock' === $method || 'displayBlock' === $method) {
+                $message .= sprintf(' Use block("%s"%s) instead).', $arguments[0], $self ? '' : ', template');
+            } elseif ('hasBlock' === $method) {
+                $message .= sprintf(' Use "block("%s"%s) is defined" instead).', $arguments[0], $self ? '' : ', template');
+            } elseif ('render' === $method || 'display' === $method) {
+                $message .= sprintf(' Use include("%s") instead).', $object->getTemplateName());
+            }
+            @trigger_error($message, E_USER_DEPRECATED);
+
             return $ret === '' ? '' : new Twig_Markup($ret, $this->env->getCharset());
         }
 
diff --git a/web/vendor/twig/twig/lib/Twig/TemplateInterface.php b/web/vendor/twig/twig/lib/Twig/TemplateInterface.php
index 32746407e..457ef7d7b 100644
--- a/web/vendor/twig/twig/lib/Twig/TemplateInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/TemplateInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -42,7 +42,7 @@ interface Twig_TemplateInterface
     /**
      * Returns the bound environment for this template.
      *
-     * @return Twig_Environment The current environment
+     * @return Twig_Environment
      */
     public function getEnvironment();
 }
diff --git a/web/vendor/twig/twig/lib/Twig/TemplateWrapper.php b/web/vendor/twig/twig/lib/Twig/TemplateWrapper.php
new file mode 100644
index 000000000..b72b92c20
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/TemplateWrapper.php
@@ -0,0 +1,131 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Exposes a template to userland.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+final class Twig_TemplateWrapper
+{
+    private $env;
+    private $template;
+
+    /**
+     * This method is for internal use only and should never be called
+     * directly (use Twig_Environment::load() instead).
+     *
+     * @internal
+     */
+    public function __construct(Twig_Environment $env, Twig_Template $template)
+    {
+        $this->env = $env;
+        $this->template = $template;
+    }
+
+    /**
+     * Renders the template.
+     *
+     * @param array $context An array of parameters to pass to the template
+     *
+     * @return string The rendered template
+     */
+    public function render($context = array())
+    {
+        return $this->template->render($context);
+    }
+
+    /**
+     * Displays the template.
+     *
+     * @param array $context An array of parameters to pass to the template
+     */
+    public function display($context = array())
+    {
+        $this->template->display($context);
+    }
+
+    /**
+     * Checks if a block is defined.
+     *
+     * @param string $name    The block name
+     * @param array  $context An array of parameters to pass to the template
+     *
+     * @return bool
+     */
+    public function hasBlock($name, $context = array())
+    {
+        return $this->template->hasBlock($name, $context);
+    }
+
+    /**
+     * Returns defined block names in the template.
+     *
+     * @param array $context An array of parameters to pass to the template
+     *
+     * @return string[] An array of defined template block names
+     */
+    public function getBlockNames($context = array())
+    {
+        return $this->template->getBlockNames($context);
+    }
+
+    /**
+     * Renders a template block.
+     *
+     * @param string $name    The block name to render
+     * @param array  $context An array of parameters to pass to the template
+     *
+     * @return string The rendered block
+     */
+    public function renderBlock($name, $context = array())
+    {
+        $context = $this->env->mergeGlobals($context);
+        $level = ob_get_level();
+        ob_start();
+        try {
+            $this->template->displayBlock($name, $context);
+        } catch (Exception $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+
+            throw $e;
+        } catch (Throwable $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+
+            throw $e;
+        }
+
+        return ob_get_clean();
+    }
+
+    /**
+     * Displays a template block.
+     *
+     * @param string $name    The block name to render
+     * @param array  $context An array of parameters to pass to the template
+     */
+    public function displayBlock($name, $context = array())
+    {
+        $this->template->displayBlock($name, $this->env->mergeGlobals($context));
+    }
+
+    /**
+     * @return Twig_Source
+     */
+    public function getSourceContext()
+    {
+        return $this->template->getSourceContext();
+    }
+}
diff --git a/web/vendor/twig/twig/lib/Twig/Test.php b/web/vendor/twig/twig/lib/Twig/Test.php
index 3c2d8590b..b450ec625 100644
--- a/web/vendor/twig/twig/lib/Twig/Test.php
+++ b/web/vendor/twig/twig/lib/Twig/Test.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Test/Function.php b/web/vendor/twig/twig/lib/Twig/Test/Function.php
index 5e76c711b..9e83c3f84 100644
--- a/web/vendor/twig/twig/lib/Twig/Test/Function.php
+++ b/web/vendor/twig/twig/lib/Twig/Test/Function.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php b/web/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
index 45ca7dc49..2253f7165 100644
--- a/web/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
+++ b/web/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -121,6 +121,10 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
 
     protected function doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs)
     {
+        if (!$outputs) {
+            $this->markTestSkipped('no legacy tests to run');
+        }
+
         if ($condition) {
             eval('$ret = '.$condition.';');
             if (!$ret) {
@@ -167,17 +171,12 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
                 if (false !== $exception) {
                     $message = $e->getMessage();
                     $this->assertSame(trim($exception), trim(sprintf('%s: %s', get_class($e), $message)));
-                    $this->assertSame('.', substr($message, strlen($message) - 1), $message, 'Exception message must end with a dot.');
+                    $last = substr($message, strlen($message) - 1);
+                    $this->assertTrue('.' === $last || '?' === $last, $message, 'Exception message must end with a dot or a question mark.');
 
                     return;
                 }
 
-                if ($e instanceof Twig_Error_Syntax) {
-                    $e->setTemplateFile($file);
-
-                    throw $e;
-                }
-
                 throw new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
             }
 
@@ -190,11 +189,7 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
                     return;
                 }
 
-                if ($e instanceof Twig_Error_Syntax) {
-                    $e->setTemplateFile($file);
-                } else {
-                    $e = new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
-                }
+                $e = new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
 
                 $output = trim(sprintf('%s: %s', get_class($e), $e->getMessage()));
             }
@@ -211,8 +206,13 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
 
                 foreach (array_keys($templates) as $name) {
                     echo "Template: $name\n";
-                    $source = $loader->getSource($name);
-                    echo $twig->compile($twig->parse($twig->tokenize($source, $name)));
+                    $loader = $twig->getLoader();
+                    if (!$loader instanceof Twig_SourceContextLoaderInterface) {
+                        $source = new Twig_Source($loader->getSource($name), $name);
+                    } else {
+                        $source = $loader->getSourceContext($name);
+                    }
+                    echo $twig->compile($twig->parse($twig->tokenize($source)));
                 }
             }
             $this->assertEquals($expected, $output, $message.' (in '.$file.')');
diff --git a/web/vendor/twig/twig/lib/Twig/Test/Method.php b/web/vendor/twig/twig/lib/Twig/Test/Method.php
index 277998649..feccd5db3 100644
--- a/web/vendor/twig/twig/lib/Twig/Test/Method.php
+++ b/web/vendor/twig/twig/lib/Twig/Test/Method.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -35,6 +35,6 @@ class Twig_Test_Method extends Twig_Test
 
     public function compile()
     {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
+        return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
     }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Test/Node.php b/web/vendor/twig/twig/lib/Twig/Test/Node.php
index baef49cce..6098a5275 100644
--- a/web/vendor/twig/twig/lib/Twig/Test/Node.php
+++ b/web/vendor/twig/twig/lib/Twig/Test/Node.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php b/web/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
index e591c1d52..a6b550cf8 100644
--- a/web/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
+++ b/web/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
@@ -46,6 +46,10 @@ abstract class Twig_Test_NodeTestCase extends PHPUnit_Framework_TestCase
     {
         $line = $line > 0 ? "// line {$line}\n" : '';
 
+        if (PHP_VERSION_ID >= 70000) {
+            return sprintf('%s($context["%s"] ?? null)', $line, $name, $name);
+        }
+
         if (PHP_VERSION_ID >= 50400) {
             return sprintf('%s(isset($context["%s"]) ? $context["%s"] : null)', $line, $name, $name);
         }
diff --git a/web/vendor/twig/twig/lib/Twig/TestCallableInterface.php b/web/vendor/twig/twig/lib/Twig/TestCallableInterface.php
index 98d345785..51ecb9a28 100644
--- a/web/vendor/twig/twig/lib/Twig/TestCallableInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/TestCallableInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/TestInterface.php b/web/vendor/twig/twig/lib/Twig/TestInterface.php
index 2fa821ca3..91664075a 100644
--- a/web/vendor/twig/twig/lib/Twig/TestInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/TestInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/web/vendor/twig/twig/lib/Twig/Token.php b/web/vendor/twig/twig/lib/Twig/Token.php
index a0a029bcd..717ab0871 100644
--- a/web/vendor/twig/twig/lib/Twig/Token.php
+++ b/web/vendor/twig/twig/lib/Twig/Token.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,6 +14,8 @@
  * Represents a Token.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final
  */
 class Twig_Token
 {
@@ -36,8 +38,6 @@ class Twig_Token
     const INTERPOLATION_END_TYPE = 11;
 
     /**
-     * Constructor.
-     *
      * @param int    $type   The type of the token
      * @param string $value  The token value
      * @param int    $lineno The line position in the source
@@ -49,11 +49,6 @@ class Twig_Token
         $this->lineno = $lineno;
     }
 
-    /**
-     * Returns a string representation of the token.
-     *
-     * @return string A string representation of the token
-     */
     public function __toString()
     {
         return sprintf('%s(%s)', self::typeToString($this->type, true), $this->value);
@@ -63,9 +58,9 @@ class Twig_Token
      * Tests the current token for a type and/or a value.
      *
      * Parameters may be:
-     * * just type
-     * * type and value (or array of possible values)
-     * * just value (or array of possible values) (NAME_TYPE is used as type)
+     *  * just type
+     *  * type and value (or array of possible values)
+     *  * just value (or array of possible values) (NAME_TYPE is used as type)
      *
      * @param array|int         $type   The type to test
      * @param array|string|null $values The token value
@@ -87,9 +82,7 @@ class Twig_Token
     }
 
     /**
-     * Gets the line.
-     *
-     * @return int The source line
+     * @return int
      */
     public function getLine()
     {
@@ -97,9 +90,7 @@ class Twig_Token
     }
 
     /**
-     * Gets the token type.
-     *
-     * @return int The token type
+     * @return int
      */
     public function getType()
     {
@@ -107,9 +98,7 @@ class Twig_Token
     }
 
     /**
-     * Gets the token value.
-     *
-     * @return string The token value
+     * @return string
      */
     public function getValue()
     {
@@ -174,7 +163,7 @@ class Twig_Token
     }
 
     /**
-     * Returns the english representation of a given type.
+     * Returns the English representation of a given type.
      *
      * @param int $type The type as an integer
      *
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser.php b/web/vendor/twig/twig/lib/Twig/TokenParser.php
index fa9b6d867..700a227f1 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,8 +23,6 @@ abstract class Twig_TokenParser implements Twig_TokenParserInterface
 
     /**
      * Sets the parser associated with this token parser.
-     *
-     * @param Twig_Parser $parser A Twig_Parser instance
      */
     public function setParser(Twig_Parser $parser)
     {
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php b/web/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
index fd34cafe2..176820ead 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -26,6 +26,8 @@
  *   using the js escaping strategy
  * {% endautoescape %}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_AutoEscape extends Twig_TokenParser
 {
@@ -39,7 +41,7 @@ class Twig_TokenParser_AutoEscape extends Twig_TokenParser
         } else {
             $expr = $this->parser->getExpressionParser()->parseExpression();
             if (!$expr instanceof Twig_Node_Expression_Constant) {
-                throw new Twig_Error_Syntax('An escaping strategy must be a string or a bool.', $stream->getCurrent()->getLine(), $stream->getFilename());
+                throw new Twig_Error_Syntax('An escaping strategy must be a string or a bool.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
             }
             $value = $expr->getAttribute('value');
 
@@ -53,7 +55,7 @@ class Twig_TokenParser_AutoEscape extends Twig_TokenParser
                 @trigger_error('Using the autoescape tag with "true" or "false" before the strategy name is deprecated since version 1.21.', E_USER_DEPRECATED);
 
                 if (false === $value) {
-                    throw new Twig_Error_Syntax('Unexpected escaping strategy as you set autoescaping to false.', $stream->getCurrent()->getLine(), $stream->getFilename());
+                    throw new Twig_Error_Syntax('Unexpected escaping strategy as you set autoescaping to false.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
                 }
 
                 $value = $stream->next()->getValue();
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Block.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Block.php
index 4ffafbe71..9dae2b904 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Block.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Block.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,6 +19,8 @@
  *    <title>{% block title %}{% endblock %} - My Webpage</title>
  *  {% endblock %}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_Block extends Twig_TokenParser
 {
@@ -28,7 +30,7 @@ class Twig_TokenParser_Block extends Twig_TokenParser
         $stream = $this->parser->getStream();
         $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
         if ($this->parser->hasBlock($name)) {
-            throw new Twig_Error_Syntax(sprintf("The block '%s' has already been defined line %d.", $name, $this->parser->getBlock($name)->getLine()), $stream->getCurrent()->getLine(), $stream->getFilename());
+            throw new Twig_Error_Syntax(sprintf("The block '%s' has already been defined line %d.", $name, $this->parser->getBlock($name)->getTemplateLine()), $stream->getCurrent()->getLine(), $stream->getSourceContext());
         }
         $this->parser->setBlock($name, $block = new Twig_Node_Block($name, new Twig_Node(array()), $lineno));
         $this->parser->pushLocalScope();
@@ -40,7 +42,7 @@ class Twig_TokenParser_Block extends Twig_TokenParser
                 $value = $token->getValue();
 
                 if ($value != $name) {
-                    throw new Twig_Error_Syntax(sprintf('Expected endblock for block "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getFilename());
+                    throw new Twig_Error_Syntax(sprintf('Expected endblock for block "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext());
                 }
             }
         } else {
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Do.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Do.php
index 7adb5a081..fd03a2965 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Do.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Do.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,6 +11,8 @@
 
 /**
  * Evaluates an expression, discarding the returned value.
+ *
+ * @final
  */
 class Twig_TokenParser_Do extends Twig_TokenParser
 {
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Embed.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
index e685b955d..019d97810 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2012 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,6 +11,8 @@
 
 /**
  * Embeds a template.
+ *
+ * @final
  */
 class Twig_TokenParser_Embed extends Twig_TokenParser_Include
 {
@@ -22,24 +24,33 @@ class Twig_TokenParser_Embed extends Twig_TokenParser_Include
 
         list($variables, $only, $ignoreMissing) = $this->parseArguments();
 
+        $parentToken = $fakeParentToken = new Twig_Token(Twig_Token::STRING_TYPE, '__parent__', $token->getLine());
+        if ($parent instanceof Twig_Node_Expression_Constant) {
+            $parentToken = new Twig_Token(Twig_Token::STRING_TYPE, $parent->getAttribute('value'), $token->getLine());
+        } elseif ($parent instanceof Twig_Node_Expression_Name) {
+            $parentToken = new Twig_Token(Twig_Token::NAME_TYPE, $parent->getAttribute('name'), $token->getLine());
+        }
+
         // inject a fake parent to make the parent() function work
         $stream->injectTokens(array(
             new Twig_Token(Twig_Token::BLOCK_START_TYPE, '', $token->getLine()),
             new Twig_Token(Twig_Token::NAME_TYPE, 'extends', $token->getLine()),
-            new Twig_Token(Twig_Token::STRING_TYPE, '__parent__', $token->getLine()),
+            $parentToken,
             new Twig_Token(Twig_Token::BLOCK_END_TYPE, '', $token->getLine()),
         ));
 
         $module = $this->parser->parse($stream, array($this, 'decideBlockEnd'), true);
 
         // override the parent with the correct one
-        $module->setNode('parent', $parent);
+        if ($fakeParentToken === $parentToken) {
+            $module->setNode('parent', $parent);
+        }
 
         $this->parser->embedTemplate($module);
 
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return new Twig_Node_Embed($module->getAttribute('filename'), $module->getAttribute('index'), $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
+        return new Twig_Node_Embed($module->getTemplateName(), $module->getAttribute('index'), $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
     }
 
     public function decideBlockEnd(Twig_Token $token)
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Extends.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
index 510417ad1..b8454d2d6 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,21 +16,25 @@
  * <pre>
  *  {% extends "base.html" %}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_Extends extends Twig_TokenParser
 {
     public function parse(Twig_Token $token)
     {
+        $stream = $this->parser->getStream();
+
         if (!$this->parser->isMainScope()) {
-            throw new Twig_Error_Syntax('Cannot extend from a block.', $token->getLine(), $this->parser->getFilename());
+            throw new Twig_Error_Syntax('Cannot extend from a block.', $token->getLine(), $stream->getSourceContext());
         }
 
         if (null !== $this->parser->getParent()) {
-            throw new Twig_Error_Syntax('Multiple extends tags are forbidden.', $token->getLine(), $this->parser->getFilename());
+            throw new Twig_Error_Syntax('Multiple extends tags are forbidden.', $token->getLine(), $stream->getSourceContext());
         }
         $this->parser->setParent($this->parser->getExpressionParser()->parseExpression());
 
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
     }
 
     public function getTag()
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Filter.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
index b20dd5b32..1cdc0dd07 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,13 +17,15 @@
  *  This text becomes uppercase
  * {% endfilter %}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_Filter extends Twig_TokenParser
 {
     public function parse(Twig_Token $token)
     {
         $name = $this->parser->getVarName();
-        $ref = new Twig_Node_Expression_BlockReference(new Twig_Node_Expression_Constant($name, $token->getLine()), true, $token->getLine(), $this->getTag());
+        $ref = new Twig_Node_Expression_BlockReference(new Twig_Node_Expression_Constant($name, $token->getLine()), null, $token->getLine(), $this->getTag());
 
         $filter = $this->parser->getExpressionParser()->parseFilterExpressionRaw($ref, $this->getTag());
         $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Flush.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
index f9ce7c3b1..b09ff9577 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,6 +13,8 @@
  * Flushes the output to the client.
  *
  * @see flush()
+ *
+ * @final
  */
 class Twig_TokenParser_Flush extends Twig_TokenParser
 {
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/For.php b/web/vendor/twig/twig/lib/Twig/TokenParser/For.php
index 3fac51119..6407afa81 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/For.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/For.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,6 +20,8 @@
  *  {% endfor %}
  * </ul>
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_For extends Twig_TokenParser
 {
@@ -48,13 +50,13 @@ class Twig_TokenParser_For extends Twig_TokenParser
 
         if (count($targets) > 1) {
             $keyTarget = $targets->getNode(0);
-            $keyTarget = new Twig_Node_Expression_AssignName($keyTarget->getAttribute('name'), $keyTarget->getLine());
+            $keyTarget = new Twig_Node_Expression_AssignName($keyTarget->getAttribute('name'), $keyTarget->getTemplateLine());
             $valueTarget = $targets->getNode(1);
-            $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getLine());
+            $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getTemplateLine());
         } else {
             $keyTarget = new Twig_Node_Expression_AssignName('_key', $lineno);
             $valueTarget = $targets->getNode(0);
-            $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getLine());
+            $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getTemplateLine());
         }
 
         if ($ifexpr) {
@@ -79,7 +81,7 @@ class Twig_TokenParser_For extends Twig_TokenParser
     protected function checkLoopUsageCondition(Twig_TokenStream $stream, Twig_NodeInterface $node)
     {
         if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {
-            throw new Twig_Error_Syntax('The "loop" variable cannot be used in a looping condition.', $node->getLine(), $stream->getFilename());
+            throw new Twig_Error_Syntax('The "loop" variable cannot be used in a looping condition.', $node->getTemplateLine(), $stream->getSourceContext());
         }
 
         foreach ($node as $n) {
@@ -98,7 +100,7 @@ class Twig_TokenParser_For extends Twig_TokenParser
         if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {
             $attribute = $node->getNode('attribute');
             if ($attribute instanceof Twig_Node_Expression_Constant && in_array($attribute->getAttribute('value'), array('length', 'revindex0', 'revindex', 'last'))) {
-                throw new Twig_Error_Syntax(sprintf('The "loop.%s" variable is not defined when looping with a condition.', $attribute->getAttribute('value')), $node->getLine(), $stream->getFilename());
+                throw new Twig_Error_Syntax(sprintf('The "loop.%s" variable is not defined when looping with a condition.', $attribute->getAttribute('value')), $node->getTemplateLine(), $stream->getSourceContext());
             }
         }
 
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/From.php b/web/vendor/twig/twig/lib/Twig/TokenParser/From.php
index f7547ebe3..69c09c2f2 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/From.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/From.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,6 +15,8 @@
  * <pre>
  *   {% from 'forms.html' import forms %}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_From extends Twig_TokenParser
 {
@@ -46,7 +48,7 @@ class Twig_TokenParser_From extends Twig_TokenParser
 
         foreach ($targets as $name => $alias) {
             if ($this->parser->isReservedMacroName($name)) {
-                throw new Twig_Error_Syntax(sprintf('"%s" cannot be an imported macro as it is a reserved keyword.', $name), $token->getLine(), $stream->getFilename());
+                throw new Twig_Error_Syntax(sprintf('"%s" cannot be an imported macro as it is a reserved keyword.', $name), $token->getLine(), $stream->getSourceContext());
             }
 
             $this->parser->addImportedSymbol('function', $alias, 'get'.$name, $node->getNode('var'));
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/If.php b/web/vendor/twig/twig/lib/Twig/TokenParser/If.php
index 91c060498..05459408f 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/If.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/If.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,6 +22,8 @@
  *  </ul>
  * {% endif %}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_If extends Twig_TokenParser
 {
@@ -56,7 +58,7 @@ class Twig_TokenParser_If extends Twig_TokenParser
                     break;
 
                 default:
-                    throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "else", "elseif", or "endif" to close the "if" block started at line %d).', $lineno), $stream->getCurrent()->getLine(), $stream->getFilename());
+                    throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "else", "elseif", or "endif" to close the "if" block started at line %d).', $lineno), $stream->getCurrent()->getLine(), $stream->getSourceContext());
             }
         }
 
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Import.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Import.php
index 85c5c0364..fa5ebae2c 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Import.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Import.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,6 +15,8 @@
  * <pre>
  *   {% import 'forms.html' as forms %}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_Import extends Twig_TokenParser
 {
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Include.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Include.php
index 0e76dae3e..b3ac1bc7c 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Include.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Include.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,6 +18,8 @@
  *     Body
  *   {% include 'footer.html' %}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_Include extends Twig_TokenParser
 {
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Macro.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
index 8a7ebd6ed..b845c9095 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +17,8 @@
  *    <input type="{{ type|default('text') }}" name="{{ name }}" value="{{ value|e }}" size="{{ size|default(20) }}" />
  * {% endmacro %}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_Macro extends Twig_TokenParser
 {
@@ -35,7 +37,7 @@ class Twig_TokenParser_Macro extends Twig_TokenParser
             $value = $token->getValue();
 
             if ($value != $name) {
-                throw new Twig_Error_Syntax(sprintf('Expected endmacro for macro "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getFilename());
+                throw new Twig_Error_Syntax(sprintf('Expected endmacro for macro "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext());
             }
         }
         $this->parser->popLocalScope();
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
index 1feadd084..0b08fe61a 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,14 +19,17 @@
  * </pre>
  *
  * @see http://www.twig-project.org/doc/api.html#sandbox-extension for details
+ *
+ * @final
  */
 class Twig_TokenParser_Sandbox extends Twig_TokenParser
 {
     public function parse(Twig_Token $token)
     {
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+        $stream = $this->parser->getStream();
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
         $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
 
         // in a sandbox tag, only include tags are allowed
         if (!$body instanceof Twig_Node_Include) {
@@ -36,7 +39,7 @@ class Twig_TokenParser_Sandbox extends Twig_TokenParser
                 }
 
                 if (!$node instanceof Twig_Node_Include) {
-                    throw new Twig_Error_Syntax('Only "include" tags are allowed within a "sandbox" section.', $node->getLine(), $this->parser->getFilename());
+                    throw new Twig_Error_Syntax('Only "include" tags are allowed within a "sandbox" section.', $node->getTemplateLine(), $stream->getSourceContext());
                 }
             }
         }
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Set.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Set.php
index 5ca614bd6..d03a36b01 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Set.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Set.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,6 +25,8 @@
  *
  *  {% set foo %}Some content{% endset %}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_Set extends Twig_TokenParser
 {
@@ -41,13 +43,13 @@ class Twig_TokenParser_Set extends Twig_TokenParser
             $stream->expect(Twig_Token::BLOCK_END_TYPE);
 
             if (count($names) !== count($values)) {
-                throw new Twig_Error_Syntax('When using set, you must have the same number of variables and assignments.', $stream->getCurrent()->getLine(), $stream->getFilename());
+                throw new Twig_Error_Syntax('When using set, you must have the same number of variables and assignments.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
             }
         } else {
             $capture = true;
 
             if (count($names) > 1) {
-                throw new Twig_Error_Syntax('When using set with a block, you cannot have a multi-target.', $stream->getCurrent()->getLine(), $stream->getFilename());
+                throw new Twig_Error_Syntax('When using set with a block, you cannot have a multi-target.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
             }
 
             $stream->expect(Twig_Token::BLOCK_END_TYPE);
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
index 53d906d82..e8b2638e2 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,6 +21,8 @@
  *
  * {# output will be <div><strong>foo</strong></div> #}
  * </pre>
+ *
+ * @final
  */
 class Twig_TokenParser_Spaceless extends Twig_TokenParser
 {
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/Use.php b/web/vendor/twig/twig/lib/Twig/TokenParser/Use.php
index 4945d03c0..c3fb06974 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParser/Use.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/Use.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2011 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,6 +22,8 @@
  * </pre>
  *
  * @see http://www.twig-project.org/doc/templates.html#horizontal-reuse for details.
+ *
+ * @final
  */
 class Twig_TokenParser_Use extends Twig_TokenParser
 {
@@ -31,7 +33,7 @@ class Twig_TokenParser_Use extends Twig_TokenParser
         $stream = $this->parser->getStream();
 
         if (!$template instanceof Twig_Node_Expression_Constant) {
-            throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $stream->getCurrent()->getLine(), $stream->getFilename());
+            throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
         }
 
         $targets = array();
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParser/With.php b/web/vendor/twig/twig/lib/Twig/TokenParser/With.php
new file mode 100644
index 000000000..8d078d972
--- /dev/null
+++ b/web/vendor/twig/twig/lib/Twig/TokenParser/With.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Creates a nested scope.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final
+ */
+class Twig_TokenParser_With extends Twig_TokenParser
+{
+    public function parse(Twig_Token $token)
+    {
+        $stream = $this->parser->getStream();
+
+        $variables = null;
+        $only = false;
+        if (!$stream->test(Twig_Token::BLOCK_END_TYPE)) {
+            $variables = $this->parser->getExpressionParser()->parseExpression();
+            $only = $stream->nextIf(Twig_Token::NAME_TYPE, 'only');
+        }
+
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+        $body = $this->parser->subparse(array($this, 'decideWithEnd'), true);
+
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+        return new Twig_Node_With($body, $variables, $only, $token->getLine(), $this->getTag());
+    }
+
+    public function decideWithEnd(Twig_Token $token)
+    {
+        return $token->test('endwith');
+    }
+
+    public function getTag()
+    {
+        return 'with';
+    }
+}
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParserBroker.php b/web/vendor/twig/twig/lib/Twig/TokenParserBroker.php
index d88bb43e7..a64013508 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParserBroker.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParserBroker.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
+ * (c) Fabien Potencier
+ * (c) Arnaud Le Blanc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -24,8 +24,6 @@ class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
     protected $brokers = array();
 
     /**
-     * Constructor.
-     *
      * @param array|Traversable $parsers                 A Traversable of Twig_TokenParserInterface instances
      * @param array|Traversable $brokers                 A Traversable of Twig_TokenParserBrokerInterface instances
      * @param bool              $triggerDeprecationError
@@ -50,21 +48,11 @@ class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
         }
     }
 
-    /**
-     * Adds a TokenParser.
-     *
-     * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
-     */
     public function addTokenParser(Twig_TokenParserInterface $parser)
     {
         $this->parsers[$parser->getTag()] = $parser;
     }
 
-    /**
-     * Removes a TokenParser.
-     *
-     * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
-     */
     public function removeTokenParser(Twig_TokenParserInterface $parser)
     {
         $name = $parser->getTag();
@@ -73,21 +61,11 @@ class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
         }
     }
 
-    /**
-     * Adds a TokenParserBroker.
-     *
-     * @param Twig_TokenParserBroker $broker A Twig_TokenParserBroker instance
-     */
     public function addTokenParserBroker(Twig_TokenParserBroker $broker)
     {
         $this->brokers[] = $broker;
     }
 
-    /**
-     * Removes a TokenParserBroker.
-     *
-     * @param Twig_TokenParserBroker $broker A Twig_TokenParserBroker instance
-     */
     public function removeTokenParserBroker(Twig_TokenParserBroker $broker)
     {
         if (false !== $pos = array_search($broker, $this->brokers)) {
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php b/web/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
index 3ec2a8801..6c93f5ea1 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
+ * (c) Fabien Potencier
+ * (c) Arnaud Le Blanc
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -26,14 +26,12 @@ interface Twig_TokenParserBrokerInterface
      *
      * @param string $tag A tag name
      *
-     * @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found
+     * @return Twig_TokenParserInterface|null A Twig_TokenParserInterface or null if no suitable TokenParser was found
      */
     public function getTokenParser($tag);
 
     /**
      * Calls Twig_TokenParserInterface::setParser on all parsers the implementation knows of.
-     *
-     * @param Twig_ParserInterface $parser A Twig_ParserInterface interface
      */
     public function setParser(Twig_ParserInterface $parser);
 
diff --git a/web/vendor/twig/twig/lib/Twig/TokenParserInterface.php b/web/vendor/twig/twig/lib/Twig/TokenParserInterface.php
index 12ec39617..aea969961 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenParserInterface.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenParserInterface.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2010 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,17 +18,13 @@ interface Twig_TokenParserInterface
 {
     /**
      * Sets the parser associated with this token parser.
-     *
-     * @param Twig_Parser $parser A Twig_Parser instance
      */
     public function setParser(Twig_Parser $parser);
 
     /**
      * Parses a token and returns a node.
      *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     * @return Twig_NodeInterface
      *
      * @throws Twig_Error_Syntax
      */
diff --git a/web/vendor/twig/twig/lib/Twig/TokenStream.php b/web/vendor/twig/twig/lib/Twig/TokenStream.php
index 016f8122a..27ca1a74e 100644
--- a/web/vendor/twig/twig/lib/Twig/TokenStream.php
+++ b/web/vendor/twig/twig/lib/Twig/TokenStream.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
+ * (c) Fabien Potencier
+ * (c) Armin Ronacher
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,6 +13,8 @@
 /**
  * Represents a token stream.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Twig_TokenStream
@@ -21,23 +23,30 @@ class Twig_TokenStream
     protected $current = 0;
     protected $filename;
 
-    /**
-     * Constructor.
-     *
-     * @param array  $tokens   An array of tokens
-     * @param string $filename The name of the filename which tokens are associated with
-     */
-    public function __construct(array $tokens, $filename = null)
-    {
-        $this->tokens = $tokens;
-        $this->filename = $filename;
-    }
+    private $source;
 
     /**
-     * Returns a string representation of the token stream.
-     *
-     * @return string
+     * @param array       $tokens An array of tokens
+     * @param string|null $name   The name of the template which tokens are associated with
+     * @param string|null $source The source code associated with the tokens
      */
+    public function __construct(array $tokens, $name = null, $source = null)
+    {
+        if (!$name instanceof Twig_Source) {
+            if (null !== $name || null !== $source) {
+                @trigger_error(sprintf('Passing a string as the $name argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
+            }
+            $this->source = new Twig_Source($source, $name);
+        } else {
+            $this->source = $name;
+        }
+
+        $this->tokens = $tokens;
+
+        // deprecated, not used anymore, to be removed in 2.0
+        $this->filename = $this->source->getName();
+    }
+
     public function __toString()
     {
         return implode("\n", $this->tokens);
@@ -56,7 +65,7 @@ class Twig_TokenStream
     public function next()
     {
         if (!isset($this->tokens[++$this->current])) {
-            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current - 1]->getLine(), $this->filename);
+            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current - 1]->getLine(), $this->source);
         }
 
         return $this->tokens[$this->current - 1];
@@ -89,7 +98,7 @@ class Twig_TokenStream
                 Twig_Token::typeToEnglish($token->getType()), $token->getValue(),
                 Twig_Token::typeToEnglish($type), $value ? sprintf(' with value "%s"', $value) : ''),
                 $line,
-                $this->filename
+                $this->source
             );
         }
         $this->next();
@@ -107,7 +116,7 @@ class Twig_TokenStream
     public function look($number = 1)
     {
         if (!isset($this->tokens[$this->current + $number])) {
-            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current + $number - 1]->getLine(), $this->filename);
+            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current + $number - 1]->getLine(), $this->source);
         }
 
         return $this->tokens[$this->current + $number];
@@ -134,8 +143,6 @@ class Twig_TokenStream
     }
 
     /**
-     * Gets the current token.
-     *
      * @return Twig_Token
      */
     public function getCurrent()
@@ -144,12 +151,44 @@ class Twig_TokenStream
     }
 
     /**
-     * Gets the filename associated with this stream.
+     * Gets the name associated with this stream (null if not defined).
      *
-     * @return string
+     * @return string|null
+     *
+     * @deprecated since 1.27 (to be removed in 2.0)
      */
     public function getFilename()
     {
-        return $this->filename;
+        @trigger_error(sprintf('The %s() method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return $this->source->getName();
+    }
+
+    /**
+     * Gets the source code associated with this stream.
+     *
+     * @return string
+     *
+     * @internal Don't use this as it might be empty depending on the environment configuration
+     *
+     * @deprecated since 1.27 (to be removed in 2.0)
+     */
+    public function getSource()
+    {
+        @trigger_error(sprintf('The %s() method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
+
+        return $this->source->getCode();
+    }
+
+    /**
+     * Gets the source associated with this stream.
+     *
+     * @return Twig_Source
+     *
+     * @internal
+     */
+    public function getSourceContext()
+    {
+        return $this->source;
     }
 }
diff --git a/web/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php b/web/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
index e406f0aa7..884cf055f 100644
--- a/web/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
+++ b/web/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
@@ -11,6 +11,8 @@
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final
  */
 class Twig_Util_DeprecationCollector
 {
@@ -28,7 +30,7 @@ class Twig_Util_DeprecationCollector
      * @param string $dir A directory where templates are stored
      * @param string $ext Limit the loaded templates by extension
      *
-     * @return array() An array of deprecations
+     * @return array An array of deprecations
      */
     public function collectDir($dir, $ext = '.twig')
     {
@@ -44,11 +46,11 @@ class Twig_Util_DeprecationCollector
     /**
      * Returns deprecations for passed templates.
      *
-     * @param Iterator $iterator An iterator of templates (where keys are template names and values the contents of the template)
+     * @param Traversable $iterator An iterator of templates (where keys are template names and values the contents of the template)
      *
-     * @return array() An array of deprecations
+     * @return array An array of deprecations
      */
-    public function collect(Iterator $iterator)
+    public function collect(Traversable $iterator)
     {
         $this->deprecations = array();
 
@@ -56,7 +58,7 @@ class Twig_Util_DeprecationCollector
 
         foreach ($iterator as $name => $contents) {
             try {
-                $this->twig->parse($this->twig->tokenize($contents, $name));
+                $this->twig->parse($this->twig->tokenize(new Twig_Source($contents, $name)));
             } catch (Twig_Error_Syntax $e) {
                 // ignore templates containing syntax errors
             }
diff --git a/web/vendor/twig/twig/phpunit.xml.dist b/web/vendor/twig/twig/phpunit.xml.dist
index 6f6d1d25a..d800c5769 100644
--- a/web/vendor/twig/twig/phpunit.xml.dist
+++ b/web/vendor/twig/twig/phpunit.xml.dist
@@ -9,7 +9,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="vendor/autoload.php"
+         bootstrap="test/bootstrap.php"
 >
   <testsuites>
     <testsuite name="Twig Test Suite">
@@ -17,6 +17,14 @@
     </testsuite>
   </testsuites>
 
+  <php>
+    <ini name="error_reporting" value="-1" />
+  </php>
+
+  <listeners>
+    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+  </listeners>
+
   <filter>
     <whitelist>
       <directory suffix=".php">./lib/Twig/</directory>
diff --git a/web/vendor/zendframework/zend-diactoros/.coveralls.yml b/web/vendor/zendframework/zend-diactoros/.coveralls.yml
index 53bda829c..bc71b62f8 100644
--- a/web/vendor/zendframework/zend-diactoros/.coveralls.yml
+++ b/web/vendor/zendframework/zend-diactoros/.coveralls.yml
@@ -1,3 +1,2 @@
 coverage_clover: clover.xml
 json_path: coveralls-upload.json
-src_dir: src
diff --git a/web/vendor/zendframework/zend-diactoros/CHANGELOG.md b/web/vendor/zendframework/zend-diactoros/CHANGELOG.md
index 57b0a8717..4440059f7 100644
--- a/web/vendor/zendframework/zend-diactoros/CHANGELOG.md
+++ b/web/vendor/zendframework/zend-diactoros/CHANGELOG.md
@@ -2,11 +2,464 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.4.0 - 2017-04-06
+
+### Added
+
+- [#219](https://github.com/zendframework/zend-diactoros/pull/219) adds two new
+  classes, `Zend\Diactoros\Request\ArraySerializer` and
+  `Zend\Diactoros\Response\ArraySerializer`. Each exposes the static methods
+  `toArray()` and `fromArray()`, allowing de/serialization of messages from and
+  to arrays.
+
+- [#236](https://github.com/zendframework/zend-diactoros/pull/236) adds two new
+  constants to the `Response` class: `MIN_STATUS_CODE_VALUE` and
+  `MAX_STATUS_CODE_VALUE`.
+
+### Changes
+
+- [#240](https://github.com/zendframework/zend-diactoros/pull/240) changes the
+  behavior of `ServerRequestFactory::fromGlobals()` when no `$cookies` argument
+  is present. Previously, it would use `$_COOKIES`; now, if a `Cookie` header is
+  present, it will parse and use that to populate the instance instead.
+
+  This change allows utilizing cookies that contain period characters (`.`) in
+  their names (PHP's built-in cookie handling renames these to replace `.` with
+  `_`, which can lead to synchronization issues with clients).
+
+- [#235](https://github.com/zendframework/zend-diactoros/pull/235) changes the
+  behavior of `Uri::__toString()` to better follow proscribed behavior in PSR-7.
+  In particular, prior to this release, if a scheme was missing but an authority
+  was present, the class was incorrectly returning a value that did not include
+  a `//` prefix. As of this release, it now does this correctly.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 1.3.11 - 2017-04-06
+
+### Added
+
+- Nothing.
+
+### Changes
+
+- [#241](https://github.com/zendframework/zend-diactoros/pull/241) changes the
+  constraint by which the package provides `psr/http-message-implementation` to
+  simply `1.0` instead of `~1.0.0`, to follow how other implementations provide
+  PSR-7.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#161](https://github.com/zendframework/zend-diactoros/pull/161) adds
+  additional validations to header names and values to ensure no malformed values
+  are provided.
+
+- [#234](https://github.com/zendframework/zend-diactoros/pull/234) fixes a
+  number of reason phrases in the `Response` instance, and adds automation from
+  the canonical IANA sources to ensure any new phrases added are correct.
+
+## 1.3.10 - 2017-01-23
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#226](https://github.com/zendframework/zend-diactoros/pull/226) fixed an
+  issue with the `SapiStreamEmitter` causing the response body to be cast
+  to `(string)` and also be read as a readable stream, potentially producing
+  double output.
+
+## 1.3.9 - 2017-01-17
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#223](https://github.com/zendframework/zend-diactoros/issues/223)
+  [#224](https://github.com/zendframework/zend-diactoros/pull/224) fixed an issue
+  with the `SapiStreamEmitter` consuming too much memory when producing output
+  for readable bodies.
+
+## 1.3.8 - 2017-01-05
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#222](https://github.com/zendframework/zend-diactoros/pull/222) fixes the
+  `SapiStreamEmitter`'s handling of the `Content-Range` header to properly only
+  emit a range of bytes if the header value is in the form `bytes {first-last}/length`.
+  This allows using other range units, such as `items`, without incorrectly
+  emitting truncated content.
+
+## 1.3.7 - 2016-10-11
+
+### Added
+
+- [#208](https://github.com/zendframework/zend-diactoros/pull/208) adds several
+  missing response codes to `Zend\Diactoros\Response`, including:
+  - 226 ('IM used')
+  - 308 ('Permanent Redirect')
+  - 444 ('Connection Closed Without Response')
+  - 499 ('Client Closed Request')
+  - 510 ('Not Extended')
+  - 599 ('Network Connect Timeout Error')
+- [#211](https://github.com/zendframework/zend-diactoros/pull/211) adds support
+  for UTF-8 characters in query strings handled by `Zend\Diactoros\Uri`.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 1.3.6 - 2016-09-07
+
+### Added
+
+- [#170](https://github.com/zendframework/zend-diactoros/pull/170) prepared
+  documentation for publication at https://zendframework.github.io/zend-diactoros/
+- [#165](https://github.com/zendframework/zend-diactoros/pull/165) adds support
+  for Apache `REDIRECT_HTTP_*` header detection in the `ServerRequestFactory`.
+- [#166](https://github.com/zendframework/zend-diactoros/pull/166) adds support
+  for UTF-8 characters in URI paths.
+- [#204](https://github.com/zendframework/zend-diactoros/pull/204) adds testing
+  against PHP 7.1 release-candidate builds.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#186](https://github.com/zendframework/zend-diactoros/pull/186) fixes a typo
+  in a variable name within the `SapiStreamEmitter`.
+- [#200](https://github.com/zendframework/zend-diactoros/pull/200) updates the
+  `SapiStreamEmitter` to implement a check for `isSeekable()` prior to attempts
+  to rewind; this allows it to work with non-seekable streams such as the
+  `CallbackStream`.
+- [#169](https://github.com/zendframework/zend-diactoros/pull/169) ensures that
+  response serialization always provides a `\r\n\r\n` sequence following the
+  headers, even when no message body is present, to ensure it conforms with RFC
+  7230.
+- [#175](https://github.com/zendframework/zend-diactoros/pull/175) updates the
+  `Request` class to set the `Host` header from the URI host if no header is
+  already present. (Ensures conformity with PSR-7 specification.)
+- [#197](https://github.com/zendframework/zend-diactoros/pull/197) updates the
+  `Uri` class to ensure that string serialization does not include a colon after
+  the host name if no port is present in the instance.
+
+## 1.3.5 - 2016-03-17
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#160](https://github.com/zendframework/zend-diactoros/pull/160) fixes HTTP
+  protocol detection in the `ServerRequestFactory` to work correctly with HTTP/2.
+
+## 1.3.4 - 2016-03-17
+
+### Added
+
+- [#119](https://github.com/zendframework/zend-diactoros/pull/119) adds the 451
+  (Unavailable for Legal Reasons) status code to the `Response` class.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#117](https://github.com/zendframework/zend-diactoros/pull/117) provides
+  validation of the HTTP protocol version.
+- [#127](https://github.com/zendframework/zend-diactoros/pull/127) now properly
+  removes attributes with `null` values when calling `withoutAttribute()`.
+- [#132](https://github.com/zendframework/zend-diactoros/pull/132) updates the
+  `ServerRequestFactory` to marshal the request path fragment, if present.
+- [#142](https://github.com/zendframework/zend-diactoros/pull/142) updates the
+  exceptions thrown by `HeaderSecurity` to include the header name and/or
+  value.
+- [#148](https://github.com/zendframework/zend-diactoros/pull/148) fixes several
+  stream operations to ensure they raise exceptions when the internal pointer
+  is at an invalid position.
+- [#151](https://github.com/zendframework/zend-diactoros/pull/151) ensures
+  URI fragments are properly encoded.
+
+## 1.3.3 - 2016-01-04
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#135](https://github.com/zendframework/zend-diactoros/pull/135) fixes the
+  behavior of `ServerRequestFactory::marshalHeaders()` to no longer omit
+  `Cookie` headers from the aggregated headers. While the values are parsed and
+  injected into the cookie params, it's useful to have access to the raw headers
+  as well.
+
+## 1.3.2 - 2015-12-22
+
+### Added
+
+- [#124](https://github.com/zendframework/zend-diactoros/pull/124) adds four
+  more optional arguments to the `ServerRequest` constructor:
+  - `array $cookies`
+  - `array $queryParams`
+  - `null|array|object $parsedBody`
+  - `string $protocolVersion`
+  `ServerRequestFactory` was updated to pass values for each of these parameters
+  when creating an instance, instead of using the related `with*()` methods on
+  an instance.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#122](https://github.com/zendframework/zend-diactoros/pull/122) updates the
+  `ServerRequestFactory` to retrieve the HTTP protocol version and inject it in
+  the generated `ServerRequest`, which previously was not performed.
+
+## 1.3.1 - 2015-12-16
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#113](https://github.com/zendframework/zend-diactoros/pull/113) fixes an
+  issue in the response serializer, ensuring that the status code in the
+  deserialized response is an integer.
+- [#115](https://github.com/zendframework/zend-diactoros/pull/115) fixes an
+  issue in the various text-basd response types (`TextResponse`, `HtmlResponse`,
+  and `JsonResponse`); due to the fact that the constructor was not
+  rewinding the message body stream, `getContents()` was thus returning `null`,
+  as the pointer was at the end of the stream. The constructor now rewinds the
+  stream after populating it in the constructor.
+
+## 1.3.0 - 2015-12-15
+
+### Added
+
+- [#110](https://github.com/zendframework/zend-diactoros/pull/110) adds
+  `Zend\Diactoros\Response\SapiEmitterTrait`, which provides the following
+  private method definitions:
+  - `injectContentLength()`
+  - `emitStatusLine()`
+  - `emitHeaders()`
+  - `flush()`
+  - `filterHeader()`
+  The `SapiEmitter` implementation has been updated to remove those methods and
+  instead compose the trait.
+- [#111](https://github.com/zendframework/zend-diactoros/pull/111) adds
+  a new emitter implementation, `SapiStreamEmitter`; this emitter type will
+  loop through the stream instead of emitting it in one go, and supports content
+  ranges.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 1.2.1 - 2015-12-15
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#101](https://github.com/zendframework/zend-diactoros/pull/101) fixes the
+  `withHeader()` implementation to ensure that if the header existed previously
+  but using a different casing strategy, the previous version will be removed
+  in the cloned instance.
+- [#103](https://github.com/zendframework/zend-diactoros/pull/103) fixes the
+  constructor of `Response` to ensure that null status codes are not possible.
+- [#99](https://github.com/zendframework/zend-diactoros/pull/99) fixes
+  validation of header values submitted via request and response constructors as
+  follows:
+  - numeric (integer and float) values are now properly allowed (this solves
+    some reported issues with setting Content-Length headers)
+  - invalid header names (non-string values or empty strings) now raise an
+    exception.
+  - invalid individual header values (non-string, non-numeric) now raise an
+    exception.
+
+## 1.2.0 - 2015-11-24
+
+### Added
+
+- [#88](https://github.com/zendframework/zend-diactoros/pull/88) updates the
+  `SapiEmitter` to emit a `Content-Length` header with the content length as
+  reported by the response body stream, assuming that
+  `StreamInterface::getSize()` returns an integer.
+- [#77](https://github.com/zendframework/zend-diactoros/pull/77) adds a new
+  response type, `Zend\Diactoros\Response\TextResponse`, for returning plain
+  text responses. By default, it sets the content type to `text/plain;
+  charset=utf-8`; per the other response types, the signature is `new
+  TextResponse($text, $status = 200, array $headers = [])`.
+- [#90](https://github.com/zendframework/zend-diactoros/pull/90) adds a new
+  `Zend\Diactoros\CallbackStream`, allowing you to back a stream with a PHP
+  callable (such as a generator) to generate the message content. Its
+  constructor accepts the callable: `$stream = new CallbackStream($callable);`
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#77](https://github.com/zendframework/zend-diactoros/pull/77) updates the
+  `HtmlResponse` to set the charset to utf-8 by default (if no content type
+  header is provided at instantiation).
+
+## 1.1.4 - 2015-10-16
+
+### Added
+
+- [#98](https://github.com/zendframework/zend-diactoros/pull/98) adds
+  `JSON_UNESCAPED_SLASHES` to the default `json_encode` flags used by
+  `Zend\Diactoros\Response\JsonResponse`.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#96](https://github.com/zendframework/zend-diactoros/pull/96) updates
+  `withPort()` to allow `null` port values (indicating usage of default for
+  the given scheme).
+- [#91](https://github.com/zendframework/zend-diactoros/pull/91) fixes the
+  logic of `withUri()` to do a case-insensitive check for an existing `Host`
+  header, replacing it with the new one.
+
 ## 1.1.3 - 2015-08-10
 
 ### Added
 
-- Nothing.
+- [#73](https://github.com/zendframework/zend-diactoros/pull/73) adds caching of
+  the vendor directory to the Travis-CI configuration, to speed up builds.
 
 ### Deprecated
 
@@ -181,7 +634,7 @@ immediately.
 - [#57](https://github.com/zendframework/zend-diactoros/pull/57) fixes the
   behavior of how the `ServerRequestFactory` marshals upload files when they are
   represented as a nested associative array.
-- [#49](https://github.com/zendframework/zend-diactoros/pull/49) provides several 
+- [#49](https://github.com/zendframework/zend-diactoros/pull/49) provides several
   fixes that ensure that Diactoros complies with the PSR-7 specification:
   - `MessageInterface::getHeaderLine()` MUST return a string (that string CAN be
     empty). Previously, Diactoros would return `null`.
diff --git a/web/vendor/zendframework/zend-diactoros/CONDUCT.md b/web/vendor/zendframework/zend-diactoros/CONDUCT.md
new file mode 100644
index 000000000..c663d2be9
--- /dev/null
+++ b/web/vendor/zendframework/zend-diactoros/CONDUCT.md
@@ -0,0 +1,43 @@
+# Contributor Code of Conduct
+
+The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
+as its guidelines for contributor interactions.
+
+## The Code Manifesto
+
+We want to work in an ecosystem that empowers developers to reach their
+potential — one that encourages growth and effective collaboration. A space that
+is safe for all.
+
+A space such as this benefits everyone that participates in it. It encourages
+new developers to enter our field. It is through discussion and collaboration
+that we grow, and through growth that we improve.
+
+In the effort to create such a place, we hold to these values:
+
+1. **Discrimination limits us.** This includes discrimination on the basis of
+   race, gender, sexual orientation, gender identity, age, nationality, technology
+   and any other arbitrary exclusion of a group of people.
+2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort
+   levels. Remember that, and if brought to your attention, heed it.
+3. **We are our biggest assets.** None of us were born masters of our trade.
+   Each of us has been helped along the way. Return that favor, when and where
+   you can.
+4. **We are resources for the future.** As an extension of #3, share what you
+   know. Make yourself a resource to help those that come after you.
+5. **Respect defines us.** Treat others as you wish to be treated. Make your
+   discussions, criticisms and debates from a position of respectfulness. Ask
+   yourself, is it true? Is it necessary? Is it constructive? Anything less is
+   unacceptable.
+6. **Reactions require grace.** Angry responses are valid, but abusive language
+   and vindictive actions are toxic. When something happens that offends you,
+   handle it assertively, but be respectful. Escalate reasonably, and try to
+   allow the offender an opportunity to explain themselves, and possibly correct
+   the issue.
+7. **Opinions are just that: opinions.** Each and every one of us, due to our
+   background and upbringing, have varying opinions. The fact of the matter, is
+   that is perfectly acceptable. Remember this: if you respect your own
+   opinions, you should respect the opinions of others.
+8. **To err is human.** You might not intend it, but mistakes do happen and
+   contribute to build experience. Tolerate honest mistakes, and don't hesitate
+   to apologize if you make one yourself.
diff --git a/web/vendor/zendframework/zend-diactoros/CONTRIBUTING.md b/web/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
index d99a16cb0..817ba7bff 100644
--- a/web/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
+++ b/web/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
@@ -78,14 +78,14 @@ standards checks, and provides configuration for our selected checks.
 To run checks only:
 
 ```console
-$ ./vendor/bin/phpcs --standard=PSR2 src test
+$ composer cs-check
 ```
 
 `phpcs` also installs a tool named `phpcbf` which can attempt to fix problems
 for you:
 
 ```console
-$ ./vendor/bin/phpcbf --standard=PSR2 src test
+$ composer cs-fix
 ```
 
 If you allow phpcbf to fix CS issues, please re-run the tests to ensure
@@ -102,7 +102,7 @@ pull your work into the master repository. We recommend using
 3. Clone the canonical repository locally and enter it.
 
    ```console
-   $ git clone git://github.com:zendframework/zend-diactoros.git
+   $ git clone git://github.com/zendframework/zend-diactoros.git
    $ cd zend-diactoros
    ```
 
@@ -221,3 +221,8 @@ repository, we suggest doing some cleanup of these branches.
    ```console
    $ git push {username} :<branchname>
    ```
+
+
+## Conduct
+
+Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project.
diff --git a/web/vendor/zendframework/zend-diactoros/LICENSE.md b/web/vendor/zendframework/zend-diactoros/LICENSE.md
index b401e72de..c7e9a85d7 100644
--- a/web/vendor/zendframework/zend-diactoros/LICENSE.md
+++ b/web/vendor/zendframework/zend-diactoros/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2015, Zend Technologies USA, Inc.
+Copyright (c) 2015-2016, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/web/vendor/zendframework/zend-diactoros/README.md b/web/vendor/zendframework/zend-diactoros/README.md
index b25dc9b30..fadb18c24 100644
--- a/web/vendor/zendframework/zend-diactoros/README.md
+++ b/web/vendor/zendframework/zend-diactoros/README.md
@@ -18,17 +18,11 @@ This package supercedes and replaces [phly/http](https://github.com/phly/http).
 
 ## Documentation
 
-Documentation is [in the doc tree](doc/), and can be compiled using [bookdown](http://bookdown.io):
+Documentation is available at:
 
-```console
-$ bookdown doc/bookdown.json
-$ php -S 0.0.0.0:8080 -t doc/html/ # then browse to http://localhost:8080/
-```
+- https://zendframework.github.io/zend-diactoros/
 
-> ### Bookdown
->
-> You can install bookdown globally using `composer global require bookdown/bookdown`. If you do
-> this, make sure that `$HOME/.composer/vendor/bin` is on your `$PATH`.
+Source files for documentation are [in the doc/ tree](doc/).
 
   [Master]: https://travis-ci.org/zendframework/zend-diactoros
   [Master image]: https://secure.travis-ci.org/zendframework/zend-diactoros.svg?branch=master
diff --git a/web/vendor/zendframework/zend-diactoros/composer.json b/web/vendor/zendframework/zend-diactoros/composer.json
index fee75d9a0..12e4a9f33 100644
--- a/web/vendor/zendframework/zend-diactoros/composer.json
+++ b/web/vendor/zendframework/zend-diactoros/composer.json
@@ -15,20 +15,22 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0-dev",
-      "dev-develop": "1.1-dev"
+      "dev-master": "1.4-dev",
+      "dev-develop": "1.5-dev"
     }
   },
   "require": {
-    "php": ">=5.4",
+    "php": "^5.4 || ^7.0",
     "psr/http-message": "~1.0"
   },
   "require-dev": {
-    "phpunit/PHPUnit": "~4.6",
-    "squizlabs/php_codesniffer": "^2.3.1"
+    "phpunit/phpunit": "^4.6 || ^5.5",
+    "zendframework/zend-coding-standard": "~1.0.0",
+    "ext-dom": "*",
+    "ext-libxml": "*"
   },
   "provide": {
-    "psr/http-message-implementation": "~1.0.0"
+    "psr/http-message-implementation": "1.0"
   },
   "autoload": {
     "psr-4": {
@@ -43,5 +45,16 @@
       "test/TestAsset/Functions.php",
       "test/TestAsset/SapiResponse.php"
     ]
+  },
+  "scripts": {
+    "check": [
+      "@cs-check",
+      "@test"
+    ],
+    "upload-coverage": "coveralls -v",
+    "cs-check": "phpcs",
+    "cs-fix": "phpcbf",
+    "test": "phpunit --colors=always",
+    "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
   }
 }
diff --git a/web/vendor/zendframework/zend-diactoros/composer.lock b/web/vendor/zendframework/zend-diactoros/composer.lock
new file mode 100644
index 000000000..dae145c97
--- /dev/null
+++ b/web/vendor/zendframework/zend-diactoros/composer.lock
@@ -0,0 +1,1494 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "9b7a0211715addda935b3d3489792cd2",
+    "packages": [
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06T14:39:51+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14T21:17:01+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2017-01-26T22:05:40+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27T11:43:31+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-09-30T07:12:33+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2016-11-25T06:54:22+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8 || ^5.6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2017-03-02T20:05:34+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "4.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
+                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-file-iterator": "^1.3",
+                "phpunit/php-text-template": "^1.2",
+                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0",
+                "sebastian/environment": "^1.3.2 || ^2.0",
+                "sebastian/version": "^1.0 || ^2.0"
+            },
+            "require-dev": {
+                "ext-xdebug": "^2.1.4",
+                "phpunit/phpunit": "^5.7"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.5.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-04-02T07:44:40+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2016-10-03T07:40:28+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26T11:10:40+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-02-27T10:12:30+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "5.7.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/69c4f49ff376af2692bad9cebd883d17ebaa98a1",
+                "reference": "69c4f49ff376af2692bad9cebd883d17ebaa98a1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "myclabs/deep-copy": "~1.3",
+                "php": "^5.6 || ^7.0",
+                "phpspec/prophecy": "^1.6.2",
+                "phpunit/php-code-coverage": "^4.0.4",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "^3.2",
+                "sebastian/comparator": "^1.2.4",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "^1.3.4 || ^2.0",
+                "sebastian/exporter": "~2.0",
+                "sebastian/global-state": "^1.1",
+                "sebastian/object-enumerator": "~2.0",
+                "sebastian/resource-operations": "~1.0",
+                "sebastian/version": "~1.0.3|~2.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-04-03T02:22:27+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "3.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-text-template": "^1.2",
+                "sebastian/exporter": "^1.2 || ^2.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2016-12-08T20:27:08+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2017-03-04T06:30:41+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-01-29T09:50:25+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08T07:14:41+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-11-26T07:53:53+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~2.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-11-19T08:54:04+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12T03:26:01+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
+                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "sebastian/recursion-context": "~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2017-02-18T15:18:39+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-11-19T07:33:16+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2015-07-28T20:34:47+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03T07:35:21+00:00"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d",
+                "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "scripts/phpcs",
+                "scripts/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "CodeSniffer.php",
+                    "CodeSniffer/CLI.php",
+                    "CodeSniffer/Exception.php",
+                    "CodeSniffer/File.php",
+                    "CodeSniffer/Fixer.php",
+                    "CodeSniffer/Report.php",
+                    "CodeSniffer/Reporting.php",
+                    "CodeSniffer/Sniff.php",
+                    "CodeSniffer/Tokens.php",
+                    "CodeSniffer/Reports/",
+                    "CodeSniffer/Tokenizers/",
+                    "CodeSniffer/DocGenerators/",
+                    "CodeSniffer/Standards/AbstractPatternSniff.php",
+                    "CodeSniffer/Standards/AbstractScopeSniff.php",
+                    "CodeSniffer/Standards/AbstractVariableSniff.php",
+                    "CodeSniffer/Standards/IncorrectPatternException.php",
+                    "CodeSniffer/Standards/Generic/Sniffs/",
+                    "CodeSniffer/Standards/MySource/Sniffs/",
+                    "CodeSniffer/Standards/PEAR/Sniffs/",
+                    "CodeSniffer/Standards/PSR1/Sniffs/",
+                    "CodeSniffer/Standards/PSR2/Sniffs/",
+                    "CodeSniffer/Standards/Squiz/Sniffs/",
+                    "CodeSniffer/Standards/Zend/Sniffs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2017-03-01T22:17:45+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v3.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/62b4cdb99d52cb1ff253c465eb1532a80cebb621",
+                "reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "symfony/console": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-20T09:45:15+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2016-11-23T20:04:58+00:00"
+        },
+        {
+            "name": "zendframework/zend-coding-standard",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-coding-standard.git",
+                "reference": "893316d2904e93f1c74c1384b6d7d57778299cb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-coding-standard/zipball/893316d2904e93f1c74c1384b6d7d57778299cb6",
+                "reference": "893316d2904e93f1c74c1384b6d7d57778299cb6",
+                "shasum": ""
+            },
+            "require": {
+                "squizlabs/php_codesniffer": "^2.7"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Zend Framework coding standard",
+            "keywords": [
+                "Coding Standard",
+                "zf"
+            ],
+            "time": "2016-11-09T21:30:43+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": "^5.4 || ^7.0"
+    },
+    "platform-dev": {
+        "ext-dom": "*",
+        "ext-libxml": "*"
+    }
+}
diff --git a/web/vendor/zendframework/zend-diactoros/mkdocs.yml b/web/vendor/zendframework/zend-diactoros/mkdocs.yml
new file mode 100644
index 000000000..a08660646
--- /dev/null
+++ b/web/vendor/zendframework/zend-diactoros/mkdocs.yml
@@ -0,0 +1,16 @@
+docs_dir: doc/book
+site_dir: doc/html
+pages:
+    - index.md
+    - Overview: overview.md
+    - Installation: install.md
+    - Usage: usage.md
+    - Reference:
+        - "Custom Responses": custom-responses.md
+        - "Emitting Responses": emitting-responses.md
+        - Serialization: serialization.md
+        - API: api.md
+site_name: zend-diactoros
+site_description: 'zend-diactoros: PSR-7 HTTP message implementation'
+repo_url: 'https://github.com/zendframework/zend-diactoros'
+copyright: 'Copyright (c) 2016 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'
diff --git a/web/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php b/web/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
index a55ca5a3f..9ee9afd0c 100644
--- a/web/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
+++ b/web/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
diff --git a/web/vendor/zendframework/zend-diactoros/src/CallbackStream.php b/web/vendor/zendframework/zend-diactoros/src/CallbackStream.php
new file mode 100644
index 000000000..c8e6bc6fc
--- /dev/null
+++ b/web/vendor/zendframework/zend-diactoros/src/CallbackStream.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use InvalidArgumentException;
+use RuntimeException;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Implementation of PSR HTTP streams
+ */
+class CallbackStream implements StreamInterface
+{
+    /**
+     * @var callable|null
+     */
+    protected $callback;
+
+    /**
+     * @param callable $callback
+     * @throws InvalidArgumentException
+     */
+    public function __construct(callable $callback)
+    {
+        $this->attach($callback);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        return $this->getContents();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        $this->callback = null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function detach()
+    {
+        $callback = $this->callback;
+        $this->callback = null;
+        return $callback;
+    }
+
+    /**
+     * Attach a new callback to the instance.
+     *
+     * @param callable $callback
+     * @throws InvalidArgumentException for callable callback
+     */
+    public function attach(callable $callback)
+    {
+        $this->callback = $callback;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSize()
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function tell()
+    {
+        throw new RuntimeException('Callback streams cannot tell position');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function eof()
+    {
+        return empty($this->callback);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isSeekable()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        throw new RuntimeException('Callback streams cannot seek position');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        throw new RuntimeException('Callback streams cannot rewind position');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isWritable()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($string)
+    {
+        throw new RuntimeException('Callback streams cannot write');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isReadable()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($length)
+    {
+        throw new RuntimeException('Callback streams cannot read');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getContents()
+    {
+        $callback = $this->detach();
+        return $callback ? $callback() : '';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata($key = null)
+    {
+        $metadata = [
+            'eof' => $this->eof(),
+            'stream_type' => 'callback',
+            'seekable' => false
+        ];
+
+        if (null === $key) {
+            return $metadata;
+        }
+
+        if (! array_key_exists($key, $metadata)) {
+            return null;
+        }
+
+        return $metadata[$key];
+    }
+}
diff --git a/web/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php b/web/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
index bdef44a1c..59a2e4194 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
diff --git a/web/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php b/web/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
index a2b22fbfd..4bb54df80 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
diff --git a/web/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php b/web/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
index 231beac06..ecca716b1 100644
--- a/web/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
+++ b/web/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -24,6 +24,7 @@ final class HeaderSecurity
 {
     /**
      * Private constructor; non-instantiable.
+     * @codeCoverageIgnore
      */
     private function __construct()
     {
@@ -128,8 +129,17 @@ final class HeaderSecurity
      */
     public static function assertValid($value)
     {
+        if (! is_string($value) && ! is_numeric($value)) {
+            throw new InvalidArgumentException(sprintf(
+                'Invalid header value type; must be a string or numeric; received %s',
+                (is_object($value) ? get_class($value) : gettype($value))
+            ));
+        }
         if (! self::isValid($value)) {
-            throw new InvalidArgumentException('Invalid header value');
+            throw new InvalidArgumentException(sprintf(
+                '"%s" is not valid header value',
+                $value
+            ));
         }
     }
 
@@ -142,8 +152,17 @@ final class HeaderSecurity
      */
     public static function assertValidName($name)
     {
+        if (! is_string($name)) {
+            throw new InvalidArgumentException(sprintf(
+                'Invalid header name type; expected string; received %s',
+                (is_object($name) ? get_class($name) : gettype($name))
+            ));
+        }
         if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/', $name)) {
-            throw new InvalidArgumentException('Invalid header name');
+            throw new InvalidArgumentException(sprintf(
+                '"%s" is not valid header name',
+                $name
+            ));
         }
     }
 }
diff --git a/web/vendor/zendframework/zend-diactoros/src/MessageTrait.php b/web/vendor/zendframework/zend-diactoros/src/MessageTrait.php
index 1b3fc6f51..1c9768b54 100644
--- a/web/vendor/zendframework/zend-diactoros/src/MessageTrait.php
+++ b/web/vendor/zendframework/zend-diactoros/src/MessageTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -70,6 +70,7 @@ trait MessageTrait
      */
     public function withProtocolVersion($version)
     {
+        $this->validateProtocolVersion($version);
         $new = clone $this;
         $new->protocol = $version;
         return $new;
@@ -111,7 +112,7 @@ trait MessageTrait
      */
     public function hasHeader($header)
     {
-        return array_key_exists(strtolower($header), $this->headerNames);
+        return isset($this->headerNames[strtolower($header)]);
     }
 
     /**
@@ -135,10 +136,8 @@ trait MessageTrait
         }
 
         $header = $this->headerNames[strtolower($header)];
-        $value  = $this->headers[$header];
-        $value  = is_array($value) ? $value : [$value];
 
-        return $value;
+        return $this->headers[$header];
     }
 
     /**
@@ -188,22 +187,17 @@ trait MessageTrait
      */
     public function withHeader($header, $value)
     {
-        if (is_string($value)) {
-            $value = [$value];
-        }
-
-        if (! is_array($value) || ! $this->arrayContainsOnlyStrings($value)) {
-            throw new InvalidArgumentException(
-                'Invalid header value; must be a string or array of strings'
-            );
-        }
-
-        HeaderSecurity::assertValidName($header);
-        self::assertValidHeaderValue($value);
+        $this->assertHeader($header);
 
         $normalized = strtolower($header);
 
         $new = clone $this;
+        if ($new->hasHeader($header)) {
+            unset($new->headers[$new->headerNames[$normalized]]);
+        }
+
+        $value = $this->filterHeaderValue($value);
+
         $new->headerNames[$normalized] = $header;
         $new->headers[$header]         = $value;
 
@@ -229,27 +223,16 @@ trait MessageTrait
      */
     public function withAddedHeader($header, $value)
     {
-        if (is_string($value)) {
-            $value = [ $value ];
-        }
-
-        if (! is_array($value) || ! $this->arrayContainsOnlyStrings($value)) {
-            throw new InvalidArgumentException(
-                'Invalid header value; must be a string or array of strings'
-            );
-        }
-
-        HeaderSecurity::assertValidName($header);
-        self::assertValidHeaderValue($value);
+        $this->assertHeader($header);
 
         if (! $this->hasHeader($header)) {
             return $this->withHeader($header, $value);
         }
 
-        $normalized = strtolower($header);
-        $header     = $this->headerNames[$normalized];
+        $header = $this->headerNames[strtolower($header)];
 
         $new = clone $this;
+        $value = $this->filterHeaderValue($value);
         $new->headers[$header] = array_merge($this->headers[$header], $value);
         return $new;
     }
@@ -310,15 +293,21 @@ trait MessageTrait
         return $new;
     }
 
-    /**
-     * Test that an array contains only strings
-     *
-     * @param array $array
-     * @return bool
-     */
-    private function arrayContainsOnlyStrings(array $array)
+    private function getStream($stream, $modeIfNotInstance)
     {
-        return array_reduce($array, [__CLASS__, 'filterStringValue'], true);
+        if ($stream instanceof StreamInterface) {
+            return $stream;
+        }
+
+        if (! is_string($stream) && ! is_resource($stream)) {
+            throw new InvalidArgumentException(
+                'Stream must be a string stream resource identifier, '
+                . 'an actual stream resource, '
+                . 'or a Psr\Http\Message\StreamInterface implementation'
+            );
+        }
+
+        return new Stream($stream, $modeIfNotInstance);
     }
 
     /**
@@ -327,57 +316,80 @@ trait MessageTrait
      * Used by message constructors to allow setting all initial headers at once.
      *
      * @param array $originalHeaders Headers to filter.
-     * @return array Filtered headers and names.
      */
-    private function filterHeaders(array $originalHeaders)
+    private function setHeaders(array $originalHeaders)
     {
         $headerNames = $headers = [];
+
         foreach ($originalHeaders as $header => $value) {
-            if (! is_string($header)) {
-                continue;
-            }
+            $value = $this->filterHeaderValue($value);
 
-            if (! is_array($value) && ! is_string($value)) {
-                continue;
-            }
-
-            if (! is_array($value)) {
-                $value = [ $value ];
-            }
+            $this->assertHeader($header);
 
             $headerNames[strtolower($header)] = $header;
             $headers[$header] = $value;
         }
 
-        return [$headerNames, $headers];
+        $this->headerNames = $headerNames;
+        $this->headers = $headers;
     }
 
     /**
-     * Test if a value is a string
+     * Validate the HTTP protocol version
      *
-     * Used with array_reduce.
-     *
-     * @param bool $carry
-     * @param mixed $item
-     * @return bool
+     * @param string $version
+     * @throws InvalidArgumentException on invalid HTTP protocol version
      */
-    private static function filterStringValue($carry, $item)
+    private function validateProtocolVersion($version)
     {
-        if (! is_string($item)) {
-            return false;
+        if (empty($version)) {
+            throw new InvalidArgumentException(sprintf(
+                'HTTP protocol version can not be empty'
+            ));
+        }
+        if (! is_string($version)) {
+            throw new InvalidArgumentException(sprintf(
+                'Unsupported HTTP protocol version; must be a string, received %s',
+                (is_object($version) ? get_class($version) : gettype($version))
+            ));
+        }
+
+        // HTTP/1 uses a "<major>.<minor>" numbering scheme to indicate
+        // versions of the protocol, while HTTP/2 does not.
+        if (! preg_match('#^(1\.[01]|2)$#', $version)) {
+            throw new InvalidArgumentException(sprintf(
+                'Unsupported HTTP protocol version "%s" provided',
+                $version
+            ));
         }
-        return $carry;
     }
 
     /**
-     * Assert that the provided header values are valid.
+     * @param mixed $values
+     * @return string[]
+     */
+    private function filterHeaderValue($values)
+    {
+        if (! is_array($values)) {
+            $values = [$values];
+        }
+
+        return array_map(function ($value) {
+            HeaderSecurity::assertValid($value);
+
+            return (string) $value;
+        }, $values);
+    }
+
+    /**
+     * Ensure header name and values are valid.
+     *
+     * @param string $name
      *
-     * @see http://tools.ietf.org/html/rfc7230#section-3.2
-     * @param string[] $values
      * @throws InvalidArgumentException
      */
-    private static function assertValidHeaderValue(array $values)
+    private function assertHeader($name)
     {
-        array_walk($values, __NAMESPACE__ . '\HeaderSecurity::assertValid');
+        HeaderSecurity::assertValidName($name);
     }
 }
diff --git a/web/vendor/zendframework/zend-diactoros/src/PhpInputStream.php b/web/vendor/zendframework/zend-diactoros/src/PhpInputStream.php
index a035234e0..58bd1e472 100644
--- a/web/vendor/zendframework/zend-diactoros/src/PhpInputStream.php
+++ b/web/vendor/zendframework/zend-diactoros/src/PhpInputStream.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -26,12 +26,10 @@ class PhpInputStream extends Stream
 
     /**
      * @param  string|resource $stream
-     * @param  string $mode
      */
-    public function __construct($stream = 'php://input', $mode = 'r')
+    public function __construct($stream = 'php://input')
     {
-        $mode = 'r';
-        parent::__construct($stream, $mode);
+        parent::__construct($stream, 'r');
     }
 
     /**
diff --git a/web/vendor/zendframework/zend-diactoros/src/RelativeStream.php b/web/vendor/zendframework/zend-diactoros/src/RelativeStream.php
index f293d519e..631c41e0f 100644
--- a/web/vendor/zendframework/zend-diactoros/src/RelativeStream.php
+++ b/web/vendor/zendframework/zend-diactoros/src/RelativeStream.php
@@ -3,13 +3,14 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Diactoros;
 
 use Psr\Http\Message\StreamInterface;
+use RuntimeException;
 
 /**
  * Class RelativeStream
@@ -131,6 +132,9 @@ final class RelativeStream implements StreamInterface
      */
     public function write($string)
     {
+        if ($this->tell() < 0) {
+            throw new RuntimeException('Invalid pointer position');
+        }
         return $this->decoratedStream->write($string);
     }
 
@@ -147,6 +151,9 @@ final class RelativeStream implements StreamInterface
      */
     public function read($length)
     {
+        if ($this->tell() < 0) {
+            throw new RuntimeException('Invalid pointer position');
+        }
         return $this->decoratedStream->read($length);
     }
 
@@ -155,6 +162,9 @@ final class RelativeStream implements StreamInterface
      */
     public function getContents()
     {
+        if ($this->tell() < 0) {
+            throw new RuntimeException('Invalid pointer position');
+        }
         return $this->decoratedStream->getContents();
     }
 
diff --git a/web/vendor/zendframework/zend-diactoros/src/Request.php b/web/vendor/zendframework/zend-diactoros/src/Request.php
index 6e00c2529..768051360 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Request.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Request.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -11,6 +11,7 @@ namespace Zend\Diactoros;
 
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
  * HTTP Request encapsulation
@@ -21,10 +22,10 @@ use Psr\Http\Message\StreamInterface;
  */
 class Request implements RequestInterface
 {
-    use MessageTrait, RequestTrait;
+    use RequestTrait;
 
     /**
-     * @param null|string $uri URI for the request, if any.
+     * @param null|string|UriInterface $uri URI for the request, if any.
      * @param null|string $method HTTP method for the request, if any.
      * @param string|resource|StreamInterface $body Message body, if any.
      * @param array $headers Headers for the message, if any.
@@ -42,7 +43,7 @@ class Request implements RequestInterface
     {
         $headers = $this->headers;
         if (! $this->hasHeader('host')
-            && ($this->uri && $this->uri->getHost())
+            && $this->uri->getHost()
         ) {
             $headers['Host'] = [$this->getHostFromUri()];
         }
@@ -57,7 +58,7 @@ class Request implements RequestInterface
     {
         if (! $this->hasHeader($header)) {
             if (strtolower($header) === 'host'
-                && ($this->uri && $this->uri->getHost())
+                && $this->uri->getHost()
             ) {
                 return [$this->getHostFromUri()];
             }
@@ -66,9 +67,7 @@ class Request implements RequestInterface
         }
 
         $header = $this->headerNames[strtolower($header)];
-        $value  = $this->headers[$header];
-        $value  = is_array($value) ? $value : [$value];
 
-        return $value;
+        return $this->headers[$header];
     }
 }
diff --git a/web/vendor/zendframework/zend-diactoros/src/Request/ArraySerializer.php b/web/vendor/zendframework/zend-diactoros/src/Request/ArraySerializer.php
new file mode 100644
index 000000000..f48db37e0
--- /dev/null
+++ b/web/vendor/zendframework/zend-diactoros/src/Request/ArraySerializer.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Request;
+
+use Psr\Http\Message\RequestInterface;
+use UnexpectedValueException;
+use Zend\Diactoros\Request;
+use Zend\Diactoros\Stream;
+
+/**
+ * Serialize or deserialize request messages to/from arrays.
+ *
+ * This class provides functionality for serializing a RequestInterface instance
+ * to an array, as well as the reverse operation of creating a Request instance
+ * from an array representing a message.
+ */
+final class ArraySerializer
+{
+    /**
+     * Serialize a request message to an array.
+     *
+     * @param RequestInterface $request
+     * @return array
+     */
+    public static function toArray(RequestInterface $request)
+    {
+        return [
+            'method'           => $request->getMethod(),
+            'request_target'   => $request->getRequestTarget(),
+            'uri'              => (string) $request->getUri(),
+            'protocol_version' => $request->getProtocolVersion(),
+            'headers'          => $request->getHeaders(),
+            'body'             => (string) $request->getBody(),
+        ];
+    }
+
+    /**
+     * Deserialize a request array to a request instance.
+     *
+     * @param array $serializedRequest
+     * @return Request
+     * @throws UnexpectedValueException when cannot deserialize response
+     */
+    public static function fromArray(array $serializedRequest)
+    {
+        try {
+            $uri             = self::getValueFromKey($serializedRequest, 'uri');
+            $method          = self::getValueFromKey($serializedRequest, 'method');
+            $body            = new Stream('php://memory', 'wb+');
+            $body->write(self::getValueFromKey($serializedRequest, 'body'));
+            $headers         = self::getValueFromKey($serializedRequest, 'headers');
+            $requestTarget   = self::getValueFromKey($serializedRequest, 'request_target');
+            $protocolVersion = self::getValueFromKey($serializedRequest, 'protocol_version');
+
+            return (new Request($uri, $method, $body, $headers))
+                ->withRequestTarget($requestTarget)
+                ->withProtocolVersion($protocolVersion);
+        } catch (\Exception $exception) {
+            throw new UnexpectedValueException('Cannot deserialize request', null, $exception);
+        }
+    }
+
+    /**
+     * @param array $data
+     * @param string $key
+     * @param string $message
+     * @return mixed
+     * @throws UnexpectedValueException
+     */
+    private static function getValueFromKey(array $data, $key, $message = null)
+    {
+        if (isset($data[$key])) {
+            return $data[$key];
+        }
+        if ($message === null) {
+            $message = sprintf('Missing "%s" key in serialized request', $key);
+        }
+        throw new UnexpectedValueException($message);
+    }
+}
diff --git a/web/vendor/zendframework/zend-diactoros/src/Request/Serializer.php b/web/vendor/zendframework/zend-diactoros/src/Request/Serializer.php
index d7c8d131b..8f45e5edf 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Request/Serializer.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Request/Serializer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -76,6 +76,10 @@ final class Serializer extends AbstractSerializer
      */
     public static function toString(RequestInterface $request)
     {
+        $httpMethod = $request->getMethod();
+        if (empty($httpMethod)) {
+            throw new UnexpectedValueException('Object can not be serialized because HTTP method is empty');
+        }
         $headers = self::serializeHeaders($request->getHeaders());
         $body    = (string) $request->getBody();
         $format  = '%s %s HTTP/%s%s%s';
@@ -89,7 +93,7 @@ final class Serializer extends AbstractSerializer
 
         return sprintf(
             $format,
-            $request->getMethod(),
+            $httpMethod,
             $request->getRequestTarget(),
             $request->getProtocolVersion(),
             $headers,
diff --git a/web/vendor/zendframework/zend-diactoros/src/RequestTrait.php b/web/vendor/zendframework/zend-diactoros/src/RequestTrait.php
index 2ef15a949..6117b98a7 100644
--- a/web/vendor/zendframework/zend-diactoros/src/RequestTrait.php
+++ b/web/vendor/zendframework/zend-diactoros/src/RequestTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -22,14 +22,11 @@ use Psr\Http\Message\UriInterface;
  * the environment. As such, this trait exists to provide the common code
  * between both client-side and server-side requests, and each can then
  * use the headers functionality required by their implementations.
- *
- * @property array $headers
- * @property array $headerNames
- * @property StreamInterface $stream
- * @method bool hasHeader(string $header)
  */
 trait RequestTrait
 {
+    use MessageTrait;
+
     /**
      * @var string
      */
@@ -43,7 +40,7 @@ trait RequestTrait
     private $requestTarget;
 
     /**
-     * @var null|UriInterface
+     * @var UriInterface
      */
     private $uri;
 
@@ -52,7 +49,7 @@ trait RequestTrait
      *
      * Used by constructors.
      *
-     * @param null|string $uri URI for the request, if any.
+     * @param null|string|UriInterface $uri URI for the request, if any.
      * @param null|string $method HTTP method for the request, if any.
      * @param string|resource|StreamInterface $body Message body, if any.
      * @param array $headers Headers for the message, if any.
@@ -60,33 +57,52 @@ trait RequestTrait
      */
     private function initialize($uri = null, $method = null, $body = 'php://memory', array $headers = [])
     {
-        if (! $uri instanceof UriInterface && ! is_string($uri) && null !== $uri) {
-            throw new InvalidArgumentException(
-                'Invalid URI provided; must be null, a string, or a Psr\Http\Message\UriInterface instance'
-            );
-        }
-
         $this->validateMethod($method);
 
-        if (! is_string($body) && ! is_resource($body) && ! $body instanceof StreamInterface) {
-            throw new InvalidArgumentException(
-                'Body must be a string stream resource identifier, '
-                . 'an actual stream resource, '
-                . 'or a Psr\Http\Message\StreamInterface implementation'
-            );
-        }
-
-        if (is_string($uri)) {
-            $uri = new Uri($uri);
-        }
-
         $this->method = $method ?: '';
-        $this->uri    = $uri ?: new Uri();
-        $this->stream = ($body instanceof StreamInterface) ? $body : new Stream($body, 'wb+');
+        $this->uri    = $this->createUri($uri);
+        $this->stream = $this->getStream($body, 'wb+');
 
-        list($this->headerNames, $headers) = $this->filterHeaders($headers);
-        $this->assertHeaders($headers);
-        $this->headers = $headers;
+        $this->setHeaders($headers);
+
+        // per PSR-7: attempt to set the Host header from a provided URI if no
+        // Host header is provided
+        if (! $this->hasHeader('Host') && $this->uri->getHost()) {
+            $this->headerNames['host'] = 'Host';
+            $this->headers['Host'] = [$this->getHostFromUri()];
+        }
+    }
+
+    /**
+     * Create and return a URI instance.
+     *
+     * If `$uri` is a already a `UriInterface` instance, returns it.
+     *
+     * If `$uri` is a string, passes it to the `Uri` constructor to return an
+     * instance.
+     *
+     * If `$uri is null, creates and returns an empty `Uri` instance.
+     *
+     * Otherwise, it raises an exception.
+     *
+     * @param null|string|UriInterface $uri
+     * @return UriInterface
+     * @throws InvalidArgumentException
+     */
+    private function createUri($uri)
+    {
+        if ($uri instanceof UriInterface) {
+            return $uri;
+        }
+        if (is_string($uri)) {
+            return new Uri($uri);
+        }
+        if ($uri === null) {
+            return new Uri();
+        }
+        throw new InvalidArgumentException(
+            'Invalid URI provided; must be null, a string, or a Psr\Http\Message\UriInterface instance'
+        );
     }
 
     /**
@@ -111,10 +127,6 @@ trait RequestTrait
             return $this->requestTarget;
         }
 
-        if (! $this->uri) {
-            return '/';
-        }
-
         $target = $this->uri->getPath();
         if ($this->uri->getQuery()) {
             $target .= '?' . $this->uri->getQuery();
@@ -249,6 +261,16 @@ trait RequestTrait
         }
 
         $new->headerNames['host'] = 'Host';
+
+        // Remove an existing host header if present, regardless of current
+        // de-normalization of the header name.
+        // @see https://github.com/zendframework/zend-diactoros/issues/91
+        foreach (array_keys($new->headers) as $header) {
+            if (strtolower($header) === 'host') {
+                unset($new->headers[$header]);
+            }
+        }
+
         $new->headers['Host'] = [$host];
 
         return $new;
@@ -292,18 +314,4 @@ trait RequestTrait
         $host .= $this->uri->getPort() ? ':' . $this->uri->getPort() : '';
         return $host;
     }
-
-    /**
-     * Ensure header names and values are valid.
-     *
-     * @param array $headers
-     * @throws InvalidArgumentException
-     */
-    private function assertHeaders(array $headers)
-    {
-        foreach ($headers as $name => $headerValues) {
-            HeaderSecurity::assertValidName($name);
-            array_walk($headerValues, __NAMESPACE__ . '\HeaderSecurity::assertValid');
-        }
-    }
 }
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response.php b/web/vendor/zendframework/zend-diactoros/src/Response.php
index ef250e6a0..cd22b5dbc 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Response.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Response.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -24,6 +24,9 @@ class Response implements ResponseInterface
 {
     use MessageTrait;
 
+    const MIN_STATUS_CODE_VALUE = 100;
+    const MAX_STATUS_CODE_VALUE = 599;
+
     /**
      * Map of standard HTTP status code/reason phrases
      *
@@ -42,8 +45,9 @@ class Response implements ResponseInterface
         204 => 'No Content',
         205 => 'Reset Content',
         206 => 'Partial Content',
-        207 => 'Multi-status',
+        207 => 'Multi-Status',
         208 => 'Already Reported',
+        226 => 'IM Used',
         // REDIRECTION CODES
         300 => 'Multiple Choices',
         301 => 'Moved Permanently',
@@ -51,8 +55,9 @@ class Response implements ResponseInterface
         303 => 'See Other',
         304 => 'Not Modified',
         305 => 'Use Proxy',
-        306 => 'Switch Proxy', // Deprecated
+        306 => 'Switch Proxy', // Deprecated to 306 => '(Unused)'
         307 => 'Temporary Redirect',
+        308 => 'Permanent Redirect',
         // CLIENT ERROR
         400 => 'Bad Request',
         401 => 'Unauthorized',
@@ -62,17 +67,18 @@ class Response implements ResponseInterface
         405 => 'Method Not Allowed',
         406 => 'Not Acceptable',
         407 => 'Proxy Authentication Required',
-        408 => 'Request Time-out',
+        408 => 'Request Timeout',
         409 => 'Conflict',
         410 => 'Gone',
         411 => 'Length Required',
         412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Large',
+        413 => 'Payload Too Large',
+        414 => 'URI Too Long',
         415 => 'Unsupported Media Type',
-        416 => 'Requested range not satisfiable',
+        416 => 'Range Not Satisfiable',
         417 => 'Expectation Failed',
         418 => 'I\'m a teapot',
+        421 => 'Misdirected Request',
         422 => 'Unprocessable Entity',
         423 => 'Locked',
         424 => 'Failed Dependency',
@@ -81,17 +87,22 @@ class Response implements ResponseInterface
         428 => 'Precondition Required',
         429 => 'Too Many Requests',
         431 => 'Request Header Fields Too Large',
+        444 => 'Connection Closed Without Response',
+        451 => 'Unavailable For Legal Reasons',
         // SERVER ERROR
+        499 => 'Client Closed Request',
         500 => 'Internal Server Error',
         501 => 'Not Implemented',
         502 => 'Bad Gateway',
         503 => 'Service Unavailable',
-        504 => 'Gateway Time-out',
-        505 => 'HTTP Version not supported',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version Not Supported',
         506 => 'Variant Also Negotiates',
         507 => 'Insufficient Storage',
         508 => 'Loop Detected',
+        510 => 'Not Extended',
         511 => 'Network Authentication Required',
+        599 => 'Network Connect Timeout Error',
     ];
 
     /**
@@ -102,34 +113,19 @@ class Response implements ResponseInterface
     /**
      * @var int
      */
-    private $statusCode = 200;
+    private $statusCode;
 
     /**
-     * @param string|resource|StreamInterface $stream Stream identifier and/or actual stream resource
+     * @param string|resource|StreamInterface $body Stream identifier and/or actual stream resource
      * @param int $status Status code for the response, if any.
      * @param array $headers Headers for the response, if any.
      * @throws InvalidArgumentException on any invalid element.
      */
     public function __construct($body = 'php://memory', $status = 200, array $headers = [])
     {
-        if (! is_string($body) && ! is_resource($body) && ! $body instanceof StreamInterface) {
-            throw new InvalidArgumentException(
-                'Stream must be a string stream resource identifier, '
-                . 'an actual stream resource, '
-                . 'or a Psr\Http\Message\StreamInterface implementation'
-            );
-        }
-
-        if (null !== $status) {
-            $this->validateStatus($status);
-        }
-
-        $this->stream     = ($body instanceof StreamInterface) ? $body : new Stream($body, 'wb+');
-        $this->statusCode = $status ? (int) $status : 200;
-
-        list($this->headerNames, $headers) = $this->filterHeaders($headers);
-        $this->assertHeaders($headers);
-        $this->headers = $headers;
+        $this->setStatusCode($status);
+        $this->stream = $this->getStream($body, 'wb+');
+        $this->setHeaders($headers);
     }
 
     /**
@@ -159,44 +155,32 @@ class Response implements ResponseInterface
      */
     public function withStatus($code, $reasonPhrase = '')
     {
-        $this->validateStatus($code);
         $new = clone $this;
-        $new->statusCode   = (int) $code;
+        $new->setStatusCode($code);
         $new->reasonPhrase = $reasonPhrase;
         return $new;
     }
 
     /**
-     * Validate a status code.
+     * Set a valid status code.
      *
-     * @param int|string $code
+     * @param int $code
      * @throws InvalidArgumentException on an invalid status code.
      */
-    private function validateStatus($code)
+    private function setStatusCode($code)
     {
         if (! is_numeric($code)
             || is_float($code)
-            || $code < 100
-            || $code >= 600
+            || $code < static::MIN_STATUS_CODE_VALUE
+            || $code > static::MAX_STATUS_CODE_VALUE
         ) {
             throw new InvalidArgumentException(sprintf(
-                'Invalid status code "%s"; must be an integer between 100 and 599, inclusive',
-                (is_scalar($code) ? $code : gettype($code))
+                'Invalid status code "%s"; must be an integer between %d and %d, inclusive',
+                (is_scalar($code) ? $code : gettype($code)),
+                static::MIN_STATUS_CODE_VALUE,
+                static::MAX_STATUS_CODE_VALUE
             ));
         }
-    }
-
-    /**
-     * Ensure header names and values are valid.
-     *
-     * @param array $headers
-     * @throws InvalidArgumentException
-     */
-    private function assertHeaders(array $headers)
-    {
-        foreach ($headers as $name => $headerValues) {
-            HeaderSecurity::assertValidName($name);
-            array_walk($headerValues, __NAMESPACE__ . '\HeaderSecurity::assertValid');
-        }
+        $this->statusCode = $code;
     }
 }
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/ArraySerializer.php b/web/vendor/zendframework/zend-diactoros/src/Response/ArraySerializer.php
new file mode 100644
index 000000000..be4ab3e75
--- /dev/null
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/ArraySerializer.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use Psr\Http\Message\ResponseInterface;
+use UnexpectedValueException;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
+
+/**
+ * Serialize or deserialize response messages to/from arrays.
+ *
+ * This class provides functionality for serializing a ResponseInterface instance
+ * to an array, as well as the reverse operation of creating a Response instance
+ * from an array representing a message.
+ */
+final class ArraySerializer
+{
+    /**
+     * Serialize a response message to an array.
+     *
+     * @param ResponseInterface $response
+     * @return array
+     */
+    public static function toArray(ResponseInterface $response)
+    {
+        return [
+            'status_code'      => $response->getStatusCode(),
+            'reason_phrase'    => $response->getReasonPhrase(),
+            'protocol_version' => $response->getProtocolVersion(),
+            'headers'          => $response->getHeaders(),
+            'body'             => (string) $response->getBody(),
+        ];
+    }
+
+    /**
+     * Deserialize a response array to a response instance.
+     *
+     * @param array $serializedResponse
+     * @return Response
+     * @throws UnexpectedValueException when cannot deserialize response
+     */
+    public static function fromArray(array $serializedResponse)
+    {
+        try {
+            $body = new Stream('php://memory', 'wb+');
+            $body->write(self::getValueFromKey($serializedResponse, 'body'));
+
+            $statusCode      = self::getValueFromKey($serializedResponse, 'status_code');
+            $headers         = self::getValueFromKey($serializedResponse, 'headers');
+            $protocolVersion = self::getValueFromKey($serializedResponse, 'protocol_version');
+            $reasonPhrase    = self::getValueFromKey($serializedResponse, 'reason_phrase');
+
+            return (new Response($body, $statusCode, $headers))
+                ->withProtocolVersion($protocolVersion)
+                ->withStatus($statusCode, $reasonPhrase);
+        } catch (\Exception $exception) {
+            throw new UnexpectedValueException('Cannot deserialize response', null, $exception);
+        }
+    }
+
+    /**
+     * @param array $data
+     * @param string $key
+     * @param string $message
+     * @return mixed
+     * @throws UnexpectedValueException
+     */
+    private static function getValueFromKey(array $data, $key, $message = null)
+    {
+        if (isset($data[$key])) {
+            return $data[$key];
+        }
+        if ($message === null) {
+            $message = sprintf('Missing "%s" key in serialized request', $key);
+        }
+        throw new UnexpectedValueException($message);
+    }
+}
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php b/web/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
index 25ea7f397..f27b4a9ce 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php b/web/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
index 911030694..010cb9d33 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php b/web/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
index d298ee01e..1e1f032a9 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -41,7 +41,7 @@ class HtmlResponse extends Response
         parent::__construct(
             $this->createBody($html),
             $status,
-            $this->injectContentType('text/html', $headers)
+            $this->injectContentType('text/html; charset=utf-8', $headers)
         );
     }
 
@@ -68,6 +68,7 @@ class HtmlResponse extends Response
 
         $body = new Stream('php://temp', 'wb+');
         $body->write($html);
+        $body->rewind();
         return $body;
     }
 }
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php b/web/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
index 00fd21716..4f2caf842 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php b/web/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
index 766c8665c..c8af7c4c2 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -24,6 +24,17 @@ class JsonResponse extends Response
 {
     use InjectContentTypeTrait;
 
+    /**
+     * Default flags for json_encode; value of:
+     *
+     * <code>
+     * JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES
+     * </code>
+     *
+     * @const int
+     */
+    const DEFAULT_JSON_FLAGS = 79;
+
     /**
      * Create a JSON response with the given data.
      *
@@ -34,6 +45,7 @@ class JsonResponse extends Response
      * - JSON_HEX_APOS
      * - JSON_HEX_AMP
      * - JSON_HEX_QUOT
+     * - JSON_UNESCAPED_SLASHES
      *
      * @param mixed $data Data to convert to JSON.
      * @param int $status Integer status code for the response; 200 by default.
@@ -41,10 +53,15 @@ class JsonResponse extends Response
      * @param int $encodingOptions JSON encoding options to use.
      * @throws InvalidArgumentException if unable to encode the $data to JSON.
      */
-    public function __construct($data, $status = 200, array $headers = [], $encodingOptions = 15)
-    {
+    public function __construct(
+        $data,
+        $status = 200,
+        array $headers = [],
+        $encodingOptions = self::DEFAULT_JSON_FLAGS
+    ) {
         $body = new Stream('php://temp', 'wb+');
         $body->write($this->jsonEncode($data, $encodingOptions));
+        $body->rewind();
 
         $headers = $this->injectContentType('application/json', $headers);
 
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php b/web/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
index 26911f0ae..bce824992 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -12,7 +12,6 @@ namespace Zend\Diactoros\Response;
 use InvalidArgumentException;
 use Psr\Http\Message\UriInterface;
 use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
 
 /**
  * Produce a redirect response.
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php b/web/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
index bba291e30..a96134293 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -14,6 +14,8 @@ use RuntimeException;
 
 class SapiEmitter implements EmitterInterface
 {
+    use SapiEmitterTrait;
+
     /**
      * Emits a response for a PHP SAPI environment.
      *
@@ -29,88 +31,21 @@ class SapiEmitter implements EmitterInterface
             throw new RuntimeException('Unable to emit response; headers already sent');
         }
 
+        $response = $this->injectContentLength($response);
+
         $this->emitStatusLine($response);
         $this->emitHeaders($response);
-        $this->emitBody($response, $maxBufferLevel);
-    }
-
-    /**
-     * Emit the status line.
-     *
-     * Emits the status line using the protocol version and status code from
-     * the response; if a reason phrase is availble, it, too, is emitted.
-     *
-     * @param ResponseInterface $response
-     */
-    private function emitStatusLine(ResponseInterface $response)
-    {
-        $reasonPhrase = $response->getReasonPhrase();
-        header(sprintf(
-            'HTTP/%s %d%s',
-            $response->getProtocolVersion(),
-            $response->getStatusCode(),
-            ($reasonPhrase ? ' ' . $reasonPhrase : '')
-        ));
-    }
-
-    /**
-     * Emit response headers.
-     *
-     * Loops through each header, emitting each; if the header value
-     * is an array with multiple values, ensures that each is sent
-     * in such a way as to create aggregate headers (instead of replace
-     * the previous).
-     *
-     * @param ResponseInterface $response
-     */
-    private function emitHeaders(ResponseInterface $response)
-    {
-        foreach ($response->getHeaders() as $header => $values) {
-            $name  = $this->filterHeader($header);
-            $first = true;
-            foreach ($values as $value) {
-                header(sprintf(
-                    '%s: %s',
-                    $name,
-                    $value
-                ), $first);
-                $first = false;
-            }
-        }
+        $this->flush($maxBufferLevel);
+        $this->emitBody($response);
     }
 
     /**
      * Emit the message body.
      *
-     * Loops through the output buffer, flushing each, before emitting
-     * the response body using `echo()`.
-     *
      * @param ResponseInterface $response
-     * @param int $maxBufferLevel Flush up to this buffer level.
      */
-    private function emitBody(ResponseInterface $response, $maxBufferLevel)
+    private function emitBody(ResponseInterface $response)
     {
-        if (null === $maxBufferLevel) {
-            $maxBufferLevel = ob_get_level();
-        }
-
-        while (ob_get_level() > $maxBufferLevel) {
-            ob_end_flush();
-        }
-
         echo $response->getBody();
     }
-
-    /**
-     * Filter a header name to wordcase
-     *
-     * @param string $header
-     * @return string
-     */
-    private function filterHeader($header)
-    {
-        $filtered = str_replace('-', ' ', $header);
-        $filtered = ucwords($filtered);
-        return str_replace(' ', '-', $filtered);
-    }
 }
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/SapiEmitterTrait.php b/web/vendor/zendframework/zend-diactoros/src/Response/SapiEmitterTrait.php
new file mode 100644
index 000000000..bbfecfce2
--- /dev/null
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/SapiEmitterTrait.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use Psr\Http\Message\ResponseInterface;
+
+trait SapiEmitterTrait
+{
+    /**
+     * Inject the Content-Length header if is not already present.
+     *
+     * @param ResponseInterface $response
+     * @return ResponseInterface
+     */
+    private function injectContentLength(ResponseInterface $response)
+    {
+        if (! $response->hasHeader('Content-Length')) {
+            // PSR-7 indicates int OR null for the stream size; for null values,
+            // we will not auto-inject the Content-Length.
+            if (null !== $response->getBody()->getSize()) {
+                return $response->withHeader('Content-Length', (string) $response->getBody()->getSize());
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * Emit the status line.
+     *
+     * Emits the status line using the protocol version and status code from
+     * the response; if a reason phrase is available, it, too, is emitted.
+     *
+     * @param ResponseInterface $response
+     */
+    private function emitStatusLine(ResponseInterface $response)
+    {
+        $reasonPhrase = $response->getReasonPhrase();
+        header(sprintf(
+            'HTTP/%s %d%s',
+            $response->getProtocolVersion(),
+            $response->getStatusCode(),
+            ($reasonPhrase ? ' ' . $reasonPhrase : '')
+        ));
+    }
+
+    /**
+     * Emit response headers.
+     *
+     * Loops through each header, emitting each; if the header value
+     * is an array with multiple values, ensures that each is sent
+     * in such a way as to create aggregate headers (instead of replace
+     * the previous).
+     *
+     * @param ResponseInterface $response
+     */
+    private function emitHeaders(ResponseInterface $response)
+    {
+        foreach ($response->getHeaders() as $header => $values) {
+            $name  = $this->filterHeader($header);
+            $first = true;
+            foreach ($values as $value) {
+                header(sprintf(
+                    '%s: %s',
+                    $name,
+                    $value
+                ), $first);
+                $first = false;
+            }
+        }
+    }
+
+    /**
+     * Loops through the output buffer, flushing each, before emitting
+     * the response.
+     *
+     * @param int|null $maxBufferLevel Flush up to this buffer level.
+     */
+    private function flush($maxBufferLevel = null)
+    {
+        if (null === $maxBufferLevel) {
+            $maxBufferLevel = ob_get_level();
+        }
+
+        while (ob_get_level() > $maxBufferLevel) {
+            ob_end_flush();
+        }
+    }
+
+    /**
+     * Filter a header name to wordcase
+     *
+     * @param string $header
+     * @return string
+     */
+    private function filterHeader($header)
+    {
+        $filtered = str_replace('-', ' ', $header);
+        $filtered = ucwords($filtered);
+        return str_replace(' ', '-', $filtered);
+    }
+}
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/SapiStreamEmitter.php b/web/vendor/zendframework/zend-diactoros/src/Response/SapiStreamEmitter.php
new file mode 100644
index 000000000..02095e50b
--- /dev/null
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/SapiStreamEmitter.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use Psr\Http\Message\ResponseInterface;
+use RuntimeException;
+use Zend\Diactoros\RelativeStream;
+
+class SapiStreamEmitter implements EmitterInterface
+{
+    use SapiEmitterTrait;
+
+    /**
+     * Emits a response for a PHP SAPI environment.
+     *
+     * Emits the status line and headers via the header() function, and the
+     * body content via the output buffer.
+     *
+     * @param ResponseInterface $response
+     * @param int $maxBufferLength Maximum output buffering size for each iteration
+     */
+    public function emit(ResponseInterface $response, $maxBufferLength = 8192)
+    {
+        if (headers_sent()) {
+            throw new RuntimeException('Unable to emit response; headers already sent');
+        }
+
+        $response = $this->injectContentLength($response);
+
+        $this->emitStatusLine($response);
+        $this->emitHeaders($response);
+        $this->flush();
+
+        $range = $this->parseContentRange($response->getHeaderLine('Content-Range'));
+
+        if (is_array($range) && $range[0] === 'bytes') {
+            $this->emitBodyRange($range, $response, $maxBufferLength);
+            return;
+        }
+
+        $this->emitBody($response, $maxBufferLength);
+    }
+
+    /**
+     * Emit the message body.
+     *
+     * @param ResponseInterface $response
+     * @param int $maxBufferLength
+     */
+    private function emitBody(ResponseInterface $response, $maxBufferLength)
+    {
+        $body = $response->getBody();
+
+        if ($body->isSeekable()) {
+            $body->rewind();
+        }
+
+        if (! $body->isReadable()) {
+            echo $body;
+            return;
+        }
+
+        while (! $body->eof()) {
+            echo $body->read($maxBufferLength);
+        }
+    }
+
+    /**
+     * Emit a range of the message body.
+     *
+     * @param array $range
+     * @param ResponseInterface $response
+     * @param int $maxBufferLength
+     */
+    private function emitBodyRange(array $range, ResponseInterface $response, $maxBufferLength)
+    {
+        list($unit, $first, $last, $length) = $range;
+
+        $body = $response->getBody();
+
+        $length = $last - $first + 1;
+
+        if ($body->isSeekable()) {
+            $body->seek($first);
+
+            $first = 0;
+        }
+
+        if (! $body->isReadable()) {
+            echo substr($body->getContents(), $first, $length);
+            return;
+        }
+
+        $remaining = $length;
+
+        while ($remaining >= $maxBufferLength && ! $body->eof()) {
+            $contents   = $body->read($maxBufferLength);
+            $remaining -= strlen($contents);
+
+            echo $contents;
+        }
+
+        if ($remaining > 0 && ! $body->eof()) {
+            echo $body->read($remaining);
+        }
+    }
+
+    /**
+     * Parse content-range header
+     * http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.16
+     *
+     * @param string $header
+     * @return false|array [unit, first, last, length]; returns false if no
+     *     content range or an invalid content range is provided
+     */
+    private function parseContentRange($header)
+    {
+        if (preg_match('/(?P<unit>[\w]+)\s+(?P<first>\d+)-(?P<last>\d+)\/(?P<length>\d+|\*)/', $header, $matches)) {
+            return [
+                $matches['unit'],
+                (int) $matches['first'],
+                (int) $matches['last'],
+                $matches['length'] === '*' ? '*' : (int) $matches['length'],
+            ];
+        }
+        return false;
+    }
+}
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/Serializer.php b/web/vendor/zendframework/zend-diactoros/src/Response/Serializer.php
index 8da835da9..1d48dc106 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Response/Serializer.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/Serializer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -37,7 +37,7 @@ final class Serializer extends AbstractSerializer
      * Parse a response from a stream.
      *
      * @param StreamInterface $stream
-     * @return ResponseInterface
+     * @return Response
      * @throws InvalidArgumentException when the stream is not readable.
      * @throws UnexpectedValueException when errors occur parsing the message.
      */
@@ -54,7 +54,7 @@ final class Serializer extends AbstractSerializer
 
         return (new Response($body, $status, $headers))
             ->withProtocolVersion($version)
-            ->withStatus($status, $reasonPhrase);
+            ->withStatus((int) $status, $reasonPhrase);
     }
 
     /**
@@ -73,9 +73,8 @@ final class Serializer extends AbstractSerializer
         if (! empty($headers)) {
             $headers = "\r\n" . $headers;
         }
-        if (! empty($body)) {
-            $headers .= "\r\n\r\n";
-        }
+
+        $headers .= "\r\n\r\n";
 
         return sprintf(
             $format,
diff --git a/web/vendor/zendframework/zend-diactoros/src/Response/TextResponse.php b/web/vendor/zendframework/zend-diactoros/src/Response/TextResponse.php
new file mode 100644
index 000000000..13df29d88
--- /dev/null
+++ b/web/vendor/zendframework/zend-diactoros/src/Response/TextResponse.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use InvalidArgumentException;
+use Psr\Http\Message\StreamInterface;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
+
+/**
+ * Plain text response.
+ *
+ * Allows creating a response by passing a string to the constructor;
+ * by default, sets a status code of 200 and sets the Content-Type header to
+ * text/plain.
+ */
+class TextResponse extends Response
+{
+    use InjectContentTypeTrait;
+
+    /**
+     * Create a plain text response.
+     *
+     * Produces a text response with a Content-Type of text/plain and a default
+     * status of 200.
+     *
+     * @param string|StreamInterface $text String or stream for the message body.
+     * @param int $status Integer status code for the response; 200 by default.
+     * @param array $headers Array of headers to use at initialization.
+     * @throws InvalidArgumentException if $text is neither a string or stream.
+     */
+    public function __construct($text, $status = 200, array $headers = [])
+    {
+        parent::__construct(
+            $this->createBody($text),
+            $status,
+            $this->injectContentType('text/plain; charset=utf-8', $headers)
+        );
+    }
+
+    /**
+     * Create the message body.
+     *
+     * @param string|StreamInterface $text
+     * @return StreamInterface
+     * @throws InvalidArgumentException if $html is neither a string or stream.
+     */
+    private function createBody($text)
+    {
+        if ($text instanceof StreamInterface) {
+            return $text;
+        }
+
+        if (! is_string($text)) {
+            throw new InvalidArgumentException(sprintf(
+                'Invalid content (%s) provided to %s',
+                (is_object($text) ? get_class($text) : gettype($text)),
+                __CLASS__
+            ));
+        }
+
+        $body = new Stream('php://temp', 'wb+');
+        $body->write($text);
+        $body->rewind();
+        return $body;
+    }
+}
diff --git a/web/vendor/zendframework/zend-diactoros/src/Server.php b/web/vendor/zendframework/zend-diactoros/src/Server.php
index e3c9b3088..768d7f380 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Server.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Server.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
diff --git a/web/vendor/zendframework/zend-diactoros/src/ServerRequest.php b/web/vendor/zendframework/zend-diactoros/src/ServerRequest.php
index 67a04b40b..ecd52b0df 100644
--- a/web/vendor/zendframework/zend-diactoros/src/ServerRequest.php
+++ b/web/vendor/zendframework/zend-diactoros/src/ServerRequest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -13,6 +13,7 @@ use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
  * Server-side HTTP request
@@ -30,7 +31,7 @@ use Psr\Http\Message\UploadedFileInterface;
  */
 class ServerRequest implements ServerRequestInterface
 {
-    use MessageTrait, RequestTrait;
+    use RequestTrait;
 
     /**
      * @var array
@@ -65,10 +66,14 @@ class ServerRequest implements ServerRequestInterface
     /**
      * @param array $serverParams Server parameters, typically from $_SERVER
      * @param array $uploadedFiles Upload file information, a tree of UploadedFiles
-     * @param null|string $uri URI for the request, if any.
+     * @param null|string|UriInterface $uri URI for the request, if any.
      * @param null|string $method HTTP method for the request, if any.
      * @param string|resource|StreamInterface $body Message body, if any.
      * @param array $headers Headers for the message, if any.
+     * @param array $cookies Cookies for the message, if any.
+     * @param array $queryParams Query params for the message, if any.
+     * @param null|array|object $parsedBody The deserialized body parameters, if any.
+     * @param string $protocol HTTP protocol version.
      * @throws InvalidArgumentException for any invalid value.
      */
     public function __construct(
@@ -77,14 +82,25 @@ class ServerRequest implements ServerRequestInterface
         $uri = null,
         $method = null,
         $body = 'php://input',
-        array $headers = []
+        array $headers = [],
+        array $cookies = [],
+        array $queryParams = [],
+        $parsedBody = null,
+        $protocol = '1.1'
     ) {
         $this->validateUploadedFiles($uploadedFiles);
 
-        $body = $this->getStream($body);
+        if ($body === 'php://input') {
+            $body = new PhpInputStream();
+        }
+
         $this->initialize($uri, $method, $body, $headers);
         $this->serverParams  = $serverParams;
         $this->uploadedFiles = $uploadedFiles;
+        $this->cookieParams  = $cookies;
+        $this->queryParams   = $queryParams;
+        $this->parsedBody    = $parsedBody;
+        $this->protocol      = $protocol;
     }
 
     /**
@@ -203,10 +219,6 @@ class ServerRequest implements ServerRequestInterface
      */
     public function withoutAttribute($attribute)
     {
-        if (! isset($this->attributes[$attribute])) {
-            return clone $this;
-        }
-
         $new = clone $this;
         unset($new->attributes[$attribute]);
         return $new;
@@ -248,33 +260,6 @@ class ServerRequest implements ServerRequestInterface
         return $new;
     }
 
-    /**
-     * Set the body stream
-     *
-     * @param string|resource|StreamInterface $stream
-     * @return StreamInterface
-     */
-    private function getStream($stream)
-    {
-        if ($stream === 'php://input') {
-            return new PhpInputStream();
-        }
-
-        if (! is_string($stream) && ! is_resource($stream) && ! $stream instanceof StreamInterface) {
-            throw new InvalidArgumentException(
-                'Stream must be a string stream resource identifier, '
-                . 'an actual stream resource, '
-                . 'or a Psr\Http\Message\StreamInterface implementation'
-            );
-        }
-
-        if (! $stream instanceof StreamInterface) {
-            return new Stream($stream, 'r');
-        }
-
-        return $stream;
-    }
-
     /**
      * Recursively validate the structure in an uploaded files array.
      *
diff --git a/web/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php b/web/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
index e23dfe58b..e2ac59b66 100644
--- a/web/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
+++ b/web/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
@@ -3,17 +3,16 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Diactoros;
 
 use InvalidArgumentException;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\UploadedFileInterface;
 use stdClass;
+use UnexpectedValueException;
 
 /**
  * Class for marshaling a request object from the current PHP environment.
@@ -60,19 +59,23 @@ abstract class ServerRequestFactory
         $server  = static::normalizeServer($server ?: $_SERVER);
         $files   = static::normalizeFiles($files ?: $_FILES);
         $headers = static::marshalHeaders($server);
-        $request = new ServerRequest(
+
+        if (null === $cookies && array_key_exists('cookie', $headers)) {
+            $cookies = self::parseCookieHeader($headers['cookie']);
+        }
+
+        return new ServerRequest(
             $server,
             $files,
             static::marshalUriFromServer($server, $headers),
             static::get('REQUEST_METHOD', $server, 'GET'),
             'php://input',
-            $headers
+            $headers,
+            $cookies ?: $_COOKIE,
+            $query ?: $_GET,
+            $body ?: $_POST,
+            static::marshalProtocolVersion($server)
         );
-
-        return $request
-            ->withCookieParams($cookies ?: $_COOKIE)
-            ->withQueryParams($query ?: $_GET)
-            ->withParsedBody($body ?: $_POST);
     }
 
     /**
@@ -196,24 +199,26 @@ abstract class ServerRequestFactory
     {
         $headers = [];
         foreach ($server as $key => $value) {
-            if (strpos($key, 'HTTP_COOKIE') === 0) {
-                // Cookies are handled using the $_COOKIE superglobal
-                continue;
+            // Apache prefixes environment variables with REDIRECT_
+            // if they are added by rewrite rules
+            if (strpos($key, 'REDIRECT_') === 0) {
+                $key = substr($key, 9);
+
+                // We will not overwrite existing variables with the
+                // prefixed versions, though
+                if (array_key_exists($key, $server)) {
+                    continue;
+                }
             }
 
             if ($value && strpos($key, 'HTTP_') === 0) {
-                $name = strtr(substr($key, 5), '_', ' ');
-                $name = strtr(ucwords(strtolower($name)), ' ', '-');
-                $name = strtolower($name);
-
+                $name = strtr(strtolower(substr($key, 5)), '_', '-');
                 $headers[$name] = $value;
                 continue;
             }
 
             if ($value && strpos($key, 'CONTENT_') === 0) {
-                $name = substr($key, 8); // Content-
-                $name = 'Content-' . (($name == 'MD5') ? $name : ucfirst(strtolower($name)));
-                $name = strtolower($name);
+                $name = 'content-' . strtolower(substr($key, 8));
                 $headers[$name] = $value;
                 continue;
             }
@@ -267,8 +272,15 @@ abstract class ServerRequestFactory
             $query = ltrim($server['QUERY_STRING'], '?');
         }
 
+        // URI fragment
+        $fragment = '';
+        if (strpos($path, '#') !== false) {
+            list($path, $fragment) = explode('#', $path, 2);
+        }
+
         return $uri
             ->withPath($path)
+            ->withFragment($fragment)
             ->withQuery($query);
     }
 
@@ -455,4 +467,56 @@ abstract class ServerRequestFactory
         }
         return $normalizedFiles;
     }
+
+    /**
+     * Return HTTP protocol version (X.Y)
+     *
+     * @param array $server
+     * @return string
+     */
+    private static function marshalProtocolVersion(array $server)
+    {
+        if (! isset($server['SERVER_PROTOCOL'])) {
+            return '1.1';
+        }
+
+        if (! preg_match('#^(HTTP/)?(?P<version>[1-9]\d*(?:\.\d)?)$#', $server['SERVER_PROTOCOL'], $matches)) {
+            throw new UnexpectedValueException(sprintf(
+                'Unrecognized protocol version (%s)',
+                $server['SERVER_PROTOCOL']
+            ));
+        }
+
+        return $matches['version'];
+    }
+
+    /**
+     * Parse a cookie header according to RFC 6265.
+     *
+     * PHP will replace special characters in cookie names, which results in other cookies not being available due to
+     * overwriting. Thus, the server request should take the cookies from the request header instead.
+     *
+     * @param $cookieHeader
+     * @return array
+     */
+    private static function parseCookieHeader($cookieHeader)
+    {
+        preg_match_all('(
+            (?:^\\n?[ \t]*|;[ ])
+            (?P<name>[!#$%&\'*+-.0-9A-Z^_`a-z|~]+)
+            =
+            (?P<DQUOTE>"?)
+                (?P<value>[\x21\x23-\x2b\x2d-\x3a\x3c-\x5b\x5d-\x7e]*)
+            (?P=DQUOTE)
+            (?=\\n?[ \t]*$|;[ ])
+        )x', $cookieHeader, $matches, PREG_SET_ORDER);
+
+        $cookies = [];
+
+        foreach ($matches as $match) {
+            $cookies[$match['name']] = urldecode($match['value']);
+        }
+
+        return $cookies;
+    }
 }
diff --git a/web/vendor/zendframework/zend-diactoros/src/Stream.php b/web/vendor/zendframework/zend-diactoros/src/Stream.php
index aca58d284..6a04e2b9b 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Stream.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Stream.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -19,7 +19,7 @@ use Psr\Http\Message\StreamInterface;
 class Stream implements StreamInterface
 {
     /**
-     * @var resource
+     * @var resource|null
      */
     protected $resource;
 
diff --git a/web/vendor/zendframework/zend-diactoros/src/UploadedFile.php b/web/vendor/zendframework/zend-diactoros/src/UploadedFile.php
index 1aa083f01..767724b8a 100644
--- a/web/vendor/zendframework/zend-diactoros/src/UploadedFile.php
+++ b/web/vendor/zendframework/zend-diactoros/src/UploadedFile.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -51,6 +51,14 @@ class UploadedFile implements UploadedFileInterface
      */
     private $stream;
 
+    /**
+     * @param string|resource $streamOrFile
+     * @param int $size
+     * @param int $errorStatus
+     * @param string|null $clientFilename
+     * @param string|null $clientMediaType
+     * @throws InvalidArgumentException
+     */
     public function __construct($streamOrFile, $size, $errorStatus, $clientFilename = null, $clientMediaType = null)
     {
         if ($errorStatus === UPLOAD_ERR_OK) {
@@ -134,24 +142,26 @@ class UploadedFile implements UploadedFileInterface
      */
     public function moveTo($targetPath)
     {
+        if ($this->moved) {
+            throw new RuntimeException('Cannot move file; already moved!');
+        }
+
         if ($this->error !== UPLOAD_ERR_OK) {
             throw new RuntimeException('Cannot retrieve stream due to upload error');
         }
 
-        if (! is_string($targetPath)) {
-            throw new InvalidArgumentException(
-                'Invalid path provided for move operation; must be a string'
-            );
-        }
-
-        if (empty($targetPath)) {
+        if (! is_string($targetPath) || empty($targetPath)) {
             throw new InvalidArgumentException(
                 'Invalid path provided for move operation; must be a non-empty string'
             );
         }
 
-        if ($this->moved) {
-            throw new RuntimeException('Cannot move file; already moved!');
+        $targetDirectory = dirname($targetPath);
+        if (! is_dir($targetDirectory) || ! is_writable($targetDirectory)) {
+            throw new RuntimeException(sprintf(
+                'The target directory `%s` does not exists or is not writable',
+                $targetDirectory
+            ));
         }
 
         $sapi = PHP_SAPI;
diff --git a/web/vendor/zendframework/zend-diactoros/src/Uri.php b/web/vendor/zendframework/zend-diactoros/src/Uri.php
index be3077a17..969c99bfa 100644
--- a/web/vendor/zendframework/zend-diactoros/src/Uri.php
+++ b/web/vendor/zendframework/zend-diactoros/src/Uri.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
@@ -36,7 +36,7 @@ class Uri implements UriInterface
      *
      * @const string
      */
-    const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
+    const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~\pL';
 
     /**
      * @var int[] Array indexed by valid scheme names to their corresponding ports.
@@ -306,21 +306,23 @@ class Uri implements UriInterface
      */
     public function withPort($port)
     {
-        if (! is_numeric($port)) {
+        if (! is_numeric($port) && $port !== null) {
             throw new InvalidArgumentException(sprintf(
-                'Invalid port "%s" specified; must be an integer or integer string',
+                'Invalid port "%s" specified; must be an integer, an integer string, or null',
                 (is_object($port) ? get_class($port) : gettype($port))
             ));
         }
 
-        $port = (int) $port;
+        if ($port !== null) {
+            $port = (int) $port;
+        }
 
         if ($port === $this->port) {
             // Do nothing if no change was made.
             return clone $this;
         }
 
-        if ($port < 1 || $port > 65535) {
+        if ($port !== null && $port < 1 || $port > 65535) {
             throw new InvalidArgumentException(sprintf(
                 'Invalid port "%d" specified; must be a valid TCP/UDP port',
                 $port
@@ -440,12 +442,12 @@ class Uri implements UriInterface
             );
         }
 
-        $this->scheme    = isset($parts['scheme'])   ? $this->filterScheme($parts['scheme']) : '';
-        $this->userInfo  = isset($parts['user'])     ? $parts['user']     : '';
-        $this->host      = isset($parts['host'])     ? $parts['host']     : '';
-        $this->port      = isset($parts['port'])     ? $parts['port']     : null;
-        $this->path      = isset($parts['path'])     ? $this->filterPath($parts['path']) : '';
-        $this->query     = isset($parts['query'])    ? $this->filterQuery($parts['query']) : '';
+        $this->scheme    = isset($parts['scheme']) ? $this->filterScheme($parts['scheme']) : '';
+        $this->userInfo  = isset($parts['user']) ? $parts['user'] : '';
+        $this->host      = isset($parts['host']) ? $parts['host'] : '';
+        $this->port      = isset($parts['port']) ? $parts['port'] : null;
+        $this->path      = isset($parts['path']) ? $this->filterPath($parts['path']) : '';
+        $this->query     = isset($parts['query']) ? $this->filterQuery($parts['query']) : '';
         $this->fragment  = isset($parts['fragment']) ? $this->filterFragment($parts['fragment']) : '';
 
         if (isset($parts['pass'])) {
@@ -468,11 +470,11 @@ class Uri implements UriInterface
         $uri = '';
 
         if (! empty($scheme)) {
-            $uri .= sprintf('%s://', $scheme);
+            $uri .= sprintf('%s:', $scheme);
         }
 
         if (! empty($authority)) {
-            $uri .= $authority;
+            $uri .= '//' . $authority;
         }
 
         if ($path) {
@@ -505,6 +507,9 @@ class Uri implements UriInterface
     private function isNonStandardPort($scheme, $host, $port)
     {
         if (! $scheme) {
+            if ($host && ! $port) {
+                return false;
+            }
             return true;
         }
 
@@ -551,7 +556,7 @@ class Uri implements UriInterface
     private function filterPath($path)
     {
         $path = preg_replace_callback(
-            '/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
+            '/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/u',
             [$this, 'urlEncodeChar'],
             $path
         );
@@ -625,7 +630,7 @@ class Uri implements UriInterface
     private function filterFragment($fragment)
     {
         if (! empty($fragment) && strpos($fragment, '#') === 0) {
-            $fragment = substr($fragment, 1);
+            $fragment = '%23' . substr($fragment, 1);
         }
 
         return $this->filterQueryOrFragment($fragment);
@@ -640,7 +645,7 @@ class Uri implements UriInterface
     private function filterQueryOrFragment($value)
     {
         return preg_replace_callback(
-            '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/',
+            '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/u',
             [$this, 'urlEncodeChar'],
             $value
         );
diff --git a/web/vendor/zendframework/zend-escaper/CHANGELOG.md b/web/vendor/zendframework/zend-escaper/CHANGELOG.md
new file mode 100644
index 000000000..de6a08b3e
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/CHANGELOG.md
@@ -0,0 +1,26 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 2.5.2 - 2016-06-30
+
+### Added
+
+- [#11](https://github.com/zendframework/zend-escaper/pull/11),
+  [#12](https://github.com/zendframework/zend-escaper/pull/12), and
+  [#13](https://github.com/zendframework/zend-escaper/pull/13) prepare and
+  publish documentation to https://zendframework.github.io/zend-escaper/
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#3](https://github.com/zendframework/zend-escaper/pull/3) updates the
+  the escaping mechanism to add support for escaping characters outside the Basic
+  Multilingual Plane when escaping for JS, CSS, or HTML attributes.
diff --git a/web/vendor/zendframework/zend-escaper/CONDUCT.md b/web/vendor/zendframework/zend-escaper/CONDUCT.md
new file mode 100644
index 000000000..c663d2be9
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/CONDUCT.md
@@ -0,0 +1,43 @@
+# Contributor Code of Conduct
+
+The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
+as its guidelines for contributor interactions.
+
+## The Code Manifesto
+
+We want to work in an ecosystem that empowers developers to reach their
+potential — one that encourages growth and effective collaboration. A space that
+is safe for all.
+
+A space such as this benefits everyone that participates in it. It encourages
+new developers to enter our field. It is through discussion and collaboration
+that we grow, and through growth that we improve.
+
+In the effort to create such a place, we hold to these values:
+
+1. **Discrimination limits us.** This includes discrimination on the basis of
+   race, gender, sexual orientation, gender identity, age, nationality, technology
+   and any other arbitrary exclusion of a group of people.
+2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort
+   levels. Remember that, and if brought to your attention, heed it.
+3. **We are our biggest assets.** None of us were born masters of our trade.
+   Each of us has been helped along the way. Return that favor, when and where
+   you can.
+4. **We are resources for the future.** As an extension of #3, share what you
+   know. Make yourself a resource to help those that come after you.
+5. **Respect defines us.** Treat others as you wish to be treated. Make your
+   discussions, criticisms and debates from a position of respectfulness. Ask
+   yourself, is it true? Is it necessary? Is it constructive? Anything less is
+   unacceptable.
+6. **Reactions require grace.** Angry responses are valid, but abusive language
+   and vindictive actions are toxic. When something happens that offends you,
+   handle it assertively, but be respectful. Escalate reasonably, and try to
+   allow the offender an opportunity to explain themselves, and possibly correct
+   the issue.
+7. **Opinions are just that: opinions.** Each and every one of us, due to our
+   background and upbringing, have varying opinions. The fact of the matter, is
+   that is perfectly acceptable. Remember this: if you respect your own
+   opinions, you should respect the opinions of others.
+8. **To err is human.** You might not intend it, but mistakes do happen and
+   contribute to build experience. Tolerate honest mistakes, and don't hesitate
+   to apologize if you make one yourself.
diff --git a/web/vendor/zendframework/zend-escaper/CONTRIBUTING.md b/web/vendor/zendframework/zend-escaper/CONTRIBUTING.md
index 2b58aca39..8eb4657f9 100644
--- a/web/vendor/zendframework/zend-escaper/CONTRIBUTING.md
+++ b/web/vendor/zendframework/zend-escaper/CONTRIBUTING.md
@@ -227,3 +227,8 @@ repository, we suggest doing some cleanup of these branches.
    ```console
    $ git push {username} :<branchname>
    ```
+
+
+## Conduct
+
+Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project.
diff --git a/web/vendor/zendframework/zend-escaper/README.md b/web/vendor/zendframework/zend-escaper/README.md
index 9ed284f0b..4124bdd02 100644
--- a/web/vendor/zendframework/zend-escaper/README.md
+++ b/web/vendor/zendframework/zend-escaper/README.md
@@ -5,10 +5,9 @@
 
 The OWASP Top 10 web security risks study lists Cross-Site Scripting (XSS) in
 second place. PHP’s sole functionality against XSS is limited to two functions
-of which one is commonly misapplied. Thus, the `Zend\Escaper` component was written.
+of which one is commonly misapplied. Thus, the zend-escaper component was written.
 It offers developers a way to escape output and defend from XSS and related
 vulnerabilities by introducing contextual escaping based on peer-reviewed rules.
 
-
 - File issues at https://github.com/zendframework/zend-escaper/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-escaper
+- Documentation is at https://zendframework.github.io/zend-escaper/
diff --git a/web/vendor/zendframework/zend-escaper/composer.json b/web/vendor/zendframework/zend-escaper/composer.json
index faa4375d2..2abc6288f 100644
--- a/web/vendor/zendframework/zend-escaper/composer.json
+++ b/web/vendor/zendframework/zend-escaper/composer.json
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.3.23"
+        "php": ">=5.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -32,4 +32,4 @@
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     }
-}
\ No newline at end of file
+}
diff --git a/web/vendor/zendframework/zend-escaper/doc/book/configuration.md b/web/vendor/zendframework/zend-escaper/doc/book/configuration.md
new file mode 100644
index 000000000..b1932667a
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/doc/book/configuration.md
@@ -0,0 +1,21 @@
+# Configuration
+
+`Zend\Escaper\Escaper` has only one configuration option available, and that is
+the encoding to be used by the `Escaper` instance.
+
+The default encoding is **utf-8**. Other supported encodings are:
+
+- iso-8859-1
+- iso-8859-5
+- iso-8859-15
+- cp866, ibm866, 866
+- cp1251, windows-1251
+- cp1252, windows-1252
+- koi8-r, koi8-ru
+- big5, big5-hkscs, 950, gb2312, 936
+- shift\_jis, sjis, sjis-win, cp932
+- eucjp, eucjp-win
+- macroman
+
+If an unsupported encoding is passed to `Zend\Escaper\Escaper`, a
+`Zend\Escaper\Exception\InvalidArgumentException` will be thrown.
diff --git a/web/vendor/zendframework/zend-escaper/doc/book/escaping-css.md b/web/vendor/zendframework/zend-escaper/doc/book/escaping-css.md
new file mode 100644
index 000000000..63b554bd4
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/doc/book/escaping-css.md
@@ -0,0 +1,74 @@
+# Escaping Cascading Style Sheets
+
+CSS is similar to [escaping Javascript](escaping-javascript.md).  CSS escaping
+excludes only basic alphanumeric characters and escapes all other characters
+into valid CSS hexadecimal escapes.
+
+## Example of Bad CSS Escaping
+
+In most cases developers forget to escape CSS completely:
+
+```php
+<?php header('Content-Type: application/xhtml+xml; charset=UTF-8'); ?>
+<!DOCTYPE html>
+<?php
+$input = <<<INPUT
+body {
+    background-image: url('http://example.com/foo.jpg?</style><script>alert(1)</script>');
+}
+INPUT;
+?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title>Unescaped CSS</title>
+    <meta charset="UTF-8"/>
+    <style>
+    <?= $input ?>
+    </style>
+</head>
+<body>
+    <p>User controlled CSS needs to be properly escaped!</p>
+</body>
+</html>
+```
+
+In the above example, by failing to escape the user provided CSS, an attacker
+can execute an XSS attack fairly easily.
+
+## Example of Good CSS Escaping
+
+By using `escapeCss()` method in the CSS context, such attacks can be prevented:
+
+```php
+<?php header('Content-Type: application/xhtml+xml; charset=UTF-8'); ?>
+<!DOCTYPE html>
+<?php
+$input = <<<INPUT
+body {
+    background-image: url('http://example.com/foo.jpg?</style><script>alert(1)</script>');
+}
+INPUT;
+
+$escaper = new Zend\Escaper\Escaper('utf-8');
+$output = $escaper->escapeCss($input);
+?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title>Escaped CSS</title>
+    <meta charset="UTF-8"/>
+    <style>
+    <?php
+    // output will look something like
+    // body\20 \7B \A \20 \20 \20 \20 background\2D image\3A \20 url\28 ...
+    echo $output;
+    ?>
+    </style>
+</head>
+<body>
+    <p>User controlled CSS needs to be properly escaped!</p>
+</body>
+</html>
+```
+
+By properly escaping user controlled CSS, we can prevent XSS attacks in our web
+applications.
diff --git a/web/vendor/zendframework/zend-escaper/doc/book/escaping-html-attributes.md b/web/vendor/zendframework/zend-escaper/doc/book/escaping-html-attributes.md
new file mode 100644
index 000000000..d4987794a
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/doc/book/escaping-html-attributes.md
@@ -0,0 +1,128 @@
+# Escaping HTML Attributes
+
+Escaping data in **HTML Attribute** contexts is most often done incorrectly, if
+not overlooked completely by developers. Regular [HTML
+escaping](escaping-html.md) can be used for escaping HTML attributes *only* if
+the attribute value can be **guaranteed as being properly quoted**! To avoid
+confusion, we recommend always using the HTML Attribute escaper method when
+dealing with HTTP attributes specifically.
+
+To escape data for an HTML Attribute, use `Zend\Escaper\Escaper`'s
+`escapeHtmlAttr()` method.  Internally it will convert the data to UTF-8, check
+for its validity, and use an extended set of characters to escape that are not
+covered by `htmlspecialchars()` to cover the cases where an attribute might be
+unquoted or quoted illegally.
+
+## Examples of Bad HTML Attribute Escaping
+
+An example of incorrect HTML attribute escaping:
+
+```php
+<?php header('Content-Type: text/html; charset=UTF-8'); ?>
+<!DOCTYPE html>
+<?php
+$input = <<<INPUT
+' onmouseover='alert(/ZF2!/);
+INPUT;
+
+/**
+ * NOTE: This is equivalent to using htmlspecialchars($input, ENT_COMPAT)
+ */
+$output = htmlspecialchars($input);
+?>
+<html>
+<head>
+    <title>Single Quoted Attribute</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+    <div>
+        <?php 
+        // the span tag will look like:
+        // <span title='' onmouseover='alert(/ZF2!/);'>
+        ?>
+        <span title='<?= $output ?>'>
+            What framework are you using?
+        </span>
+    </div>
+</body>
+</html>
+```
+
+In the above example, the default `ENT_COMPAT` flag is being used, which does
+not escape single quotes, thus resulting in an alert box popping up when the
+`onmouseover` event happens on the `span` element.
+
+Another example of incorrect HTML attribute escaping can happen when unquoted
+attributes are used (which is, by the way, perfectly valid HTML5):
+
+```php
+<?php header('Content-Type: text/html; charset=UTF-8'); ?>
+<!DOCTYPE html>
+<?php
+$input = <<<INPUT
+faketitle onmouseover=alert(/ZF2!/);
+INPUT;
+
+// Tough luck using proper flags when the title attribute is unquoted!
+$output = htmlspecialchars($input, ENT_QUOTES);
+?>
+<html>
+<head>
+    <title>Quoteless Attribute</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+    <div>
+        <?php 
+        // the span tag will look like:
+        // <span title=faketitle onmouseover=alert(/ZF2!/);>
+        ?>
+        <span title=<?= $output ?>>
+            What framework are you using?
+        </span>
+    </div>
+</body>
+</html>
+```
+
+The above example shows how it is easy to break out from unquoted attributes in
+HTML5.
+
+## Example of Good HTML Attribute Escaping
+
+Both of the previous examples can be avoided by simply using the
+`escapeHtmlAttr()` method:
+
+```php
+<?php header('Content-Type: text/html; charset=UTF-8'); ?>
+<!DOCTYPE html>
+<?php
+$input = <<<INPUT
+faketitle onmouseover=alert(/ZF2!/);
+INPUT;
+
+$escaper = new Zend\Escaper\Escaper('utf-8');
+$output = $escaper->escapeHtmlAttr($input);
+?>
+<html>
+<head>
+    <title>Quoteless Attribute</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+    <div>
+        <?php 
+        // the span tag will look like:
+        // <span title=faketitle&#x20;onmouseover&#x3D;alert&#x28;&#x2F;ZF2&#x21;&#x2F;&#x29;&#x3B;>
+        ?>
+        <span title=<?= $output ?>>
+            What framework are you using?
+        </span>
+    </div>
+</body>
+</html>
+```
+
+In the above example, the malicious input from the attacker becomes completely
+harmless as we used proper HTML attribute escaping!
diff --git a/web/vendor/zendframework/zend-escaper/doc/book/escaping-html.md b/web/vendor/zendframework/zend-escaper/doc/book/escaping-html.md
new file mode 100644
index 000000000..7a88023f4
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/doc/book/escaping-html.md
@@ -0,0 +1,74 @@
+# Escaping HTML
+
+Probably the most common escaping happens for **HTML body** contexts. There are
+very few characters with special meaning in this context, yet it is quite common
+to escape data incorrectly, namely by setting the wrong flags and character
+encoding.
+
+For escaping data to use within an HTML body context, use
+`Zend\Escaper\Escaper`'s `escapeHtml()` method.  Internally it uses PHP's
+`htmlspecialchars()`, correctly setting the flags and encoding for you.
+
+```php
+// Outputting this without escaping would be a bad idea!
+$input = '<script>alert("zf2")</script>';
+
+$escaper = new Zend\Escaper\Escaper('utf-8');
+
+// somewhere in an HTML template
+<div class="user-provided-input">
+    <?= $escaper->escapeHtml($input) // all safe! ?>
+</div>
+```
+
+One thing a developer needs to pay special attention to is the encoding in which
+the document is served to the client, as it **must be the same** as the encoding
+used for escaping!
+
+## Example of Bad HTML Escaping
+
+An example of incorrect usage:
+
+```php
+<?php
+$input = '<script>alert("zf2")</script>';
+$escaper = new Zend\Escaper\Escaper('utf-8');
+?>
+<?php header('Content-Type: text/html; charset=ISO-8859-1'); ?>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Encodings set incorrectly!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+</head>
+<body>
+<?php 
+    // Bad! The escaper's and the document's encodings are different!
+    echo $escaper->escapeHtml($input);
+?>
+</body>
+```
+
+## Example of Good HTML Escaping
+
+An example of correct usage:
+
+```php
+<?php
+$input = '<script>alert("zf2")</script>';
+$escaper = new Zend\Escaper\Escaper('utf-8');
+?>
+<?php header('Content-Type: text/html; charset=UTF-8'); ?>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Encodings set correctly!</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<?php 
+    // Good! The escaper's and the document's encodings are same!
+    echo $escaper->escapeHtml($input);
+?>
+</body>
+```
diff --git a/web/vendor/zendframework/zend-escaper/doc/book/escaping-javascript.md b/web/vendor/zendframework/zend-escaper/doc/book/escaping-javascript.md
new file mode 100644
index 000000000..f40efa646
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/doc/book/escaping-javascript.md
@@ -0,0 +1,93 @@
+# Escaping Javascript
+
+Javascript string literals in HTML are subject to significant restrictions due
+to the potential for unquoted attributes and uncertainty as to whether
+Javascript will be viewed as being `CDATA` or `PCDATA` by the browser. To
+eliminate any possible XSS vulnerabilities, Javascript escaping for HTML extends
+the escaping rules of both ECMAScript and JSON to include any potentially
+dangerous character. Very similar to HTML attribute value escaping, this means
+escaping everything except basic alphanumeric characters and the comma, period,
+and underscore characters as hexadecimal or unicode escapes.
+
+Javascript escaping applies to all literal strings and digits. It is not
+possible to safely escape other Javascript markup.
+
+To escape data in the **Javascript context**, use `Zend\Escaper\Escaper`'s
+`escapeJs()` method. An extended set of characters are escaped beyond
+ECMAScript's rules for Javascript literal string escaping in order to prevent
+misinterpretation of Javascript as HTML leading to the injection of special
+characters and entities.
+
+## Example of Bad Javascript Escaping
+
+An example of incorrect Javascript escaping:
+
+```php
+<?php header('Content-Type: application/xhtml+xml; charset=UTF-8'); ?>
+<!DOCTYPE html>
+<?php
+$input = <<<INPUT
+bar&quot;; alert(&quot;Meow!&quot;); var xss=&quot;true
+INPUT;
+
+$output = json_encode($input);
+?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title>Unescaped Entities</title>
+    <meta charset="UTF-8"/>
+    <script type="text/javascript">
+        <?php
+        // this will result in
+        // var foo = "bar&quot;; alert(&quot;Meow!&quot;); var xss=&quot;true";
+        ?>
+        var foo = <?= $output ?>;
+    </script>
+</head>
+<body>
+    <p>json_encode() is not good for escaping javascript!</p>
+</body>
+</html>
+```
+
+The above example will show an alert popup box as soon as the page is loaded,
+because the data is not properly escaped for the Javascript context.
+
+## Example of Good Javascript Escaping
+
+By using the `escapeJs()` method in the Javascript context, such attacks can be
+prevented:
+
+```php
+<?php header('Content-Type: text/html; charset=UTF-8'); ?>
+<!DOCTYPE html>
+<?php
+$input = <<<INPUT
+bar&quot;; alert(&quot;Meow!&quot;); var xss=&quot;true
+INPUT;
+
+$escaper = new Zend\Escaper\Escaper('utf-8');
+$output = $escaper->escapeJs($input);
+?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title>Escaped Entities</title>
+    <meta charset="UTF-8"/>
+    <script type="text/javascript">
+        <?php
+        // this will look like
+        // var foo =
+bar\x26quot\x3B\x3B\x20alert\x28\x26quot\x3BMeow\x21\x26quot\x3B\x29\x3B\x20var\x20xss\x3D\x26quot\x3Btrue;
+        ?>
+        var foo = <?= $output ?>;
+    </script>
+</head>
+<body>
+    <p>Zend\Escaper\Escaper::escapeJs() is good for escaping javascript!</p>
+</body>
+</html>
+```
+
+In the above example, the Javascript parser will most likely report a
+`SyntaxError`, but at least the targeted application remains safe from such
+attacks.
diff --git a/web/vendor/zendframework/zend-escaper/doc/book/escaping-url.md b/web/vendor/zendframework/zend-escaper/doc/book/escaping-url.md
new file mode 100644
index 000000000..4dc13e143
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/doc/book/escaping-url.md
@@ -0,0 +1,57 @@
+# Escaping URLs
+
+This method is basically an alias for PHP's `rawurlencode()` which has applied
+RFC 3986 since PHP 5.3. It is included primarily for consistency.
+
+URL escaping applies to data being inserted into a URL and not to the whole URL
+itself.
+
+## Example of Bad URL Escaping
+
+XSS attacks are easy if data inserted into URLs is not escaped properly:
+
+```php
+<?php header('Content-Type: application/xhtml+xml; charset=UTF-8'); ?>
+<!DOCTYPE html>
+<?php
+$input = <<<INPUT
+" onmouseover="alert('zf2')
+INPUT;
+?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title>Unescaped URL data</title>
+    <meta charset="UTF-8"/>
+</head>
+<body>
+    <a href="http://example.com/?name=<?= $input ?>">Click here!</a>
+</body>
+</html>
+```
+
+## Example of Good URL Escaping
+
+By properly escaping data in URLs by using `escapeUrl()`, we can prevent XSS
+attacks:
+
+```php
+<?php header('Content-Type: application/xhtml+xml; charset=UTF-8'); ?>
+<!DOCTYPE html>
+<?php
+$input = <<<INPUT
+" onmouseover="alert('zf2')
+INPUT;
+
+$escaper = new Zend\Escaper\Escaper('utf-8');
+$output = $escaper->escapeUrl($input);
+?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title>Unescaped URL data</title>
+    <meta charset="UTF-8"/>
+</head>
+<body>
+    <a href="http://example.com/?name=<?= $output ?>">Click here!</a>
+</body>
+</html>
+```
diff --git a/web/vendor/zendframework/zend-escaper/doc/book/index.html b/web/vendor/zendframework/zend-escaper/doc/book/index.html
new file mode 100644
index 000000000..7263c45ba
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/doc/book/index.html
@@ -0,0 +1,10 @@
+<div class="container">
+  <div class="jumbotron">
+    <h1>zend-escaper</h1>
+    
+    <p>Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs.</p>
+
+    <pre><code class="language-bash">$ composer require zendframework/zend-escaper</code></pre>
+  </div>
+</div>
+
diff --git a/web/vendor/zendframework/zend-escaper/doc/book/index.md b/web/vendor/zendframework/zend-escaper/doc/book/index.md
new file mode 120000
index 000000000..fe8400541
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/doc/book/index.md
@@ -0,0 +1 @@
+../../README.md
\ No newline at end of file
diff --git a/web/vendor/zendframework/zend-escaper/doc/book/intro.md b/web/vendor/zendframework/zend-escaper/doc/book/intro.md
new file mode 100644
index 000000000..082045629
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/doc/book/intro.md
@@ -0,0 +1,51 @@
+# Introduction
+
+The [OWASP Top 10 web security risks](https://www.owasp.org/index.php/Top_10_2010-Main)
+study lists Cross-Site Scripting (XSS) in second place. PHP's sole functionality
+against XSS is limited to two functions of which one is commonly misapplied.
+Thus, the zend-escaper component was written. It offers developers a way to
+escape output and defend from XSS and related vulnerabilities by introducing
+**contextual escaping based on peer-reviewed rules**.
+
+zend-escaper was written with ease of use in mind, so it can be used completely stand-alone from
+the rest of the framework, and as such can be installed with Composer:
+
+```bash
+$ composer install zendframework/zend-escaper
+```
+
+Several Zend Framework components provide integrations for consuming
+zend-escaper, including [zend-view](https://github.com/zendframework/zend-view),
+which provides a set of helpers that consume it.
+
+> ### Security
+>
+> zend-escaper is a security related component. As such, if you believe you have
+> found an issue, we ask that you follow our [Security  Policy](http://framework.zend.com/security/)
+> and report security issues accordingly. The Zend Framework team and the
+> contributors thank you in advance.
+
+## Overview
+
+zend-escaper provides one class, `Zend\Escaper\Escaper`, which in turn provides
+five methods for escaping output. Which method to use  depends on the context in
+which the output is used. It is up to the developer to use the right methods in
+the right context.
+
+`Zend\Escaper\Escaper` has the following escaping methods available for each context:
+
+- `escapeHtml`: escape a string for an HTML body context.
+- `escapeHtmlAttr`: escape a string for an HTML attribute context.
+- `escapeJs`: escape a string for a Javascript context.
+- `escapeCss`: escape a string for a CSS context.
+- `escapeUrl`: escape a string for a URI or URI parameter context.
+
+Usage of each method will be discussed in detail in later chapters.
+
+## What zend-Escaper is not
+
+zend-escaper is meant to be used only for *escaping data for output*, and as
+such should not be misused for *filtering input data*. For such tasks, use
+[zend-filter](https://zendframework.github.io/zend-filter/),
+[HTMLPurifier](http://htmlpurifier.org/) or PHP's
+[Filter](http://php.net/filter) functionality should be used.
diff --git a/web/vendor/zendframework/zend-escaper/doc/book/theory-of-operation.md b/web/vendor/zendframework/zend-escaper/doc/book/theory-of-operation.md
new file mode 100644
index 000000000..9a769b079
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/doc/book/theory-of-operation.md
@@ -0,0 +1,147 @@
+# Theory of Operation
+
+zend-escaper provides methods for escaping output data, dependent on the context
+in which the data will be used. Each method is based on peer-reviewed rules and
+is in compliance with the current OWASP recommendations.
+
+The escaping follows a well-known and fixed set of encoding rules defined by
+OWASP for each key HTML context.  These rules cannot be impacted or negated by
+browser quirks or edge-case HTML parsing unless the browser suffers a
+catastrophic bug in its HTML parser or Javascript interpreter &mdash; both of
+these are unlikely.
+
+The contexts in which zend-escaper should be used are **HTML Body**, **HTML
+Attribute**, **Javascript**, **CSS**, and **URL/URI** contexts.
+
+Every escaper method will take the data to be escaped, make sure it is utf-8
+encoded data (or try to convert it to utf-8), perform context-based escaping,
+encode the escaped data back to its original encoding, and return the data to
+the caller.
+
+The actual escaping of the data differs between each method; they all have their
+own set of rules according to which escaping is performed. An example will allow
+us to clearly demonstrate the difference, and how the same characters are being
+escaped differently between contexts:
+
+```php
+$escaper = new Zend\Escaper\Escaper('utf-8');
+
+// &lt;script&gt;alert(&quot;zf2&quot;)&lt;/script&gt;
+echo $escaper->escapeHtml('<script>alert("zf2")</script>');
+
+// &lt;script&gt;alert&#x28;&quot;zf2&quot;&#x29;&lt;&#x2F;script&gt;
+echo $escaper->escapeHtmlAttr('<script>alert("zf2")</script>');
+
+// \x3Cscript\x3Ealert\x28\x22zf2\x22\x29\x3C\x2Fscript\x3E
+echo $escaper->escapeJs('<script>alert("zf2")</script>');
+
+// \3C script\3E alert\28 \22 zf2\22 \29 \3C \2F script\3E 
+echo $escaper->escapeCss('<script>alert("zf2")</script>');
+
+// %3Cscript%3Ealert%28%22zf2%22%29%3C%2Fscript%3E
+echo $escaper->escapeUrl('<script>alert("zf2")</script>');
+```
+
+More detailed examples will be given in later chapters.
+
+## The Problem with Inconsistent Functionality
+
+At present, programmers orient towards the following PHP functions for each
+common HTML context:
+
+- **HTML Body**: `htmlspecialchars()` or `htmlentities()`
+- **HTML Attribute**: `htmlspecialchars()` or `htmlentities()`
+- **Javascript**: `addslashes()` or `json_encode()`
+- **CSS**: n/a
+- **URL/URI**: `rawurlencode()` or `urlencode()`
+
+In practice, these decisions appear to depend more on what PHP offers, and if it
+can be interpreted as offering sufficient escaping safety, than it does on what
+is recommended in reality to defend against XSS. While these functions can
+prevent some forms of XSS, they do not cover all use cases or risks and are
+therefore insufficient defenses.
+
+Using `htmlspecialchars()` in a perfectly valid HTML5 unquoted attribute value,
+for example, is completely useless since the value can be terminated by a space
+(among other things), which is never escaped. Thus, in this instance, we have a
+conflict between a widely used HTML escaper and a modern HTML specification,
+with no specific function available to cover this use case. While it's tempting
+to blame users, or the HTML specification authors, escaping just needs to deal
+with whatever HTML and browsers allow.
+
+Using `addslashes()`, custom backslash escaping, or `json_encode()` will
+typically ignore HTML special characters such as ampersands, which may be used
+to inject entities into Javascript. Under the right circumstances, the browser
+will convert these entities into their literal equivalents before interpreting
+Javascript, thus allowing attackers to inject arbitrary code.
+
+Inconsistencies with valid HTML, insecure default parameters, lack of character
+encoding awareness, and misrepresentations of what functions are capable of by
+some programmers &mdash; these all make escaping in PHP an unnecessarily
+convoluted quest.
+
+To circumvent the lack of escaping methods in PHP, zend-escaper addresses the
+need to apply context-specific escaping in web applications. It implements
+methods that specifically target XSS and offers programmers a tool to secure
+their applications without misusing other inadequate methods, or using, most
+likely incomplete, home-grown solutions.
+
+## Why Contextual Escaping?
+
+To understand why multiple standardised escaping methods are needed, what
+follows are several quick points; they are by no means a complete set of
+reasons, however!
+
+### HTML escaping of unquoted HTML attribute values still allows XSS
+
+This is probably the best known way to defeat `htmlspecialchars()` when used on
+attribute values, since any space (or character interpreted as a space &mdash;
+there are a lot) lets you inject new attributes whose content can't be
+neutralised by HTML escaping. The solution (where this is possible) is
+additional escaping as defined by the OWASP ESAPI codecs. The point here can be
+extended further &mdash; escaping only works if a programmer or designer knows
+what they're doing. In many contexts, there are additional practices and gotchas
+that need to be carefully monitored since escaping sometimes needs a little
+extra help to protect against XSS &mdash; even if that means ensuring all
+attribute values are properly double quoted despite this not being required for
+valid HTML.
+
+### HTML escaping of CSS, Javascript or URIs is often reversed when passed to non-HTML interpreters by the browser
+
+HTML escaping is just that &mdsash; it's designed to escape a string for HTML
+(i.e. prevent tag or attribute insertion), but not alter the underlying meaning
+of the content, whether it be text, Javascript, CSS, or URIs. For that purpose,
+a fully HTML-escaped version of any other context may still have its unescaped
+form extracted before it's interpreted or executed. For this reason we need
+separate escapers for Javascript, CSS, and URIs, and developers or designers
+writing templates **must** know which escaper to apply to which context. Of
+course, this means you need to be able to identify the correct context before
+selecting the right escaper!
+
+### DOM-based XSS requires a defence using at least two levels of different escaping in many cases
+
+DOM-based XSS has become increasingly common as Javascript has taken off in
+popularity for large scale client-side coding. A simple example is Javascript
+defined in a template which inserts a new piece of HTML text into the DOM. If
+the string is only HTML escaped, it may still contain Javascript that will
+execute in that context. If the string is only Javascript-escaped, it may
+contain HTML markup (new tags and attributes) which will be injected into the
+DOM and parsed once the inserting Javascript executes. Damned either way? The
+solution is to escape twice &mdash; first escape the string for HTML (make it
+safe for DOM insertion), and then for Javascript (make it safe for the current
+Javascript context). Nested contexts are a common means of bypassing naive
+escaping habits (e.g. you can inject Javascript into a CSS expression within an
+HTML attribute).
+
+### PHP has no known anti-XSS escape functions (only those kidnapped from their original purposes)
+
+A simple example, widely used, is when you see `json_encode()` used to escape
+Javascript, or worse, some kind of mutant `addslashes()` implementation. These
+were never designed to eliminate XSS, yet PHP programmers use them as such. For
+example, `json_encode()` does not escape the ampersand or semi-colon characters
+by default. That means you can easily inject HTML entities which could then be
+decoded before the Javascript is evaluated in a HTML document. This lets you
+break out of strings, add new JS statements, close tags, etc. In other words,
+using `json_encode()` is insufficient and naive. The same, arguably, could be
+said for `htmlspecialchars()` which has its own well known limitations that make
+a singular reliance on it a questionable practice.
diff --git a/web/vendor/zendframework/zend-escaper/mkdocs.yml b/web/vendor/zendframework/zend-escaper/mkdocs.yml
new file mode 100644
index 000000000..48e7b311f
--- /dev/null
+++ b/web/vendor/zendframework/zend-escaper/mkdocs.yml
@@ -0,0 +1,17 @@
+docs_dir: doc/book
+site_dir: doc/html
+pages:
+    - index.md
+    - Intro: intro.md
+    - Reference:
+        - "Theory of Operation": theory-of-operation.md
+        - Configuration: configuration.md
+        - "Escaping HTML": escaping-html.md
+        - "Escaping HTML Attributes": escaping-html-attributes.md
+        - "Escaping Javascript": escaping-javascript.md
+        - "Escaping CSS": escaping-css.md
+        - "Escaping URLs": escaping-url.md
+site_name: zend-escaper
+site_description: zend-escaper
+repo_url: 'https://github.com/zendframework/zend-escaper'
+copyright: 'Copyright (c) 2016 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'
diff --git a/web/vendor/zendframework/zend-escaper/src/Escaper.php b/web/vendor/zendframework/zend-escaper/src/Escaper.php
index 072d543f7..e68e32b05 100644
--- a/web/vendor/zendframework/zend-escaper/src/Escaper.php
+++ b/web/vendor/zendframework/zend-escaper/src/Escaper.php
@@ -24,12 +24,12 @@ class Escaper
      *
      * @var array
      */
-    protected static $htmlNamedEntityMap = array(
+    protected static $htmlNamedEntityMap = [
         34 => 'quot',         // quotation mark
         38 => 'amp',          // ampersand
         60 => 'lt',           // less-than sign
         62 => 'gt',           // greater-than sign
-    );
+    ];
 
     /**
      * Current encoding for escaping. If not UTF-8, we convert strings from this encoding
@@ -41,13 +41,11 @@ class Escaper
 
     /**
      * Holds the value of the special flags passed as second parameter to
-     * htmlspecialchars(). We modify these for PHP 5.4 to take advantage
-     * of the new ENT_SUBSTITUTE flag for correctly dealing with invalid
-     * UTF-8 sequences.
+     * htmlspecialchars().
      *
-     * @var string
+     * @var int
      */
-    protected $htmlSpecialCharsFlags = ENT_QUOTES;
+    protected $htmlSpecialCharsFlags;
 
     /**
      * Static Matcher which escapes characters for HTML Attribute contexts
@@ -75,7 +73,7 @@ class Escaper
      *
      * @var array
      */
-    protected $supportedEncodings = array(
+    protected $supportedEncodings = [
         'iso-8859-1',   'iso8859-1',    'iso-8859-5',   'iso8859-5',
         'iso-8859-15',  'iso8859-15',   'utf-8',        'cp866',
         'ibm866',       '866',          'cp1251',       'windows-1251',
@@ -85,12 +83,11 @@ class Escaper
         'big5-hkscs',   'shift_jis',    'sjis',         'sjis-win',
         'cp932',        '932',          'euc-jp',       'eucjp',
         'eucjp-win',    'macroman'
-    );
+    ];
 
     /**
      * Constructor: Single parameter allows setting of global encoding for use by
-     * the current object. If PHP 5.4 is detected, additional ENT_SUBSTITUTE flag
-     * is set for htmlspecialchars() calls.
+     * the current object.
      *
      * @param string $encoding
      * @throws Exception\InvalidArgumentException
@@ -116,14 +113,13 @@ class Escaper
             $this->encoding = $encoding;
         }
 
-        if (defined('ENT_SUBSTITUTE')) {
-            $this->htmlSpecialCharsFlags|= ENT_SUBSTITUTE;
-        }
+        // We take advantage of ENT_SUBSTITUTE flag to correctly deal with invalid UTF-8 sequences.
+        $this->htmlSpecialCharsFlags = ENT_QUOTES | ENT_SUBSTITUTE;
 
         // set matcher callbacks
-        $this->htmlAttrMatcher = array($this, 'htmlAttrMatcher');
-        $this->jsMatcher       = array($this, 'jsMatcher');
-        $this->cssMatcher      = array($this, 'cssMatcher');
+        $this->htmlAttrMatcher = [$this, 'htmlAttrMatcher'];
+        $this->jsMatcher       = [$this, 'jsMatcher'];
+        $this->cssMatcher      = [$this, 'cssMatcher'];
     }
 
     /**
@@ -248,7 +244,7 @@ class Escaper
          * replace it with while grabbing the integer value of the character.
          */
         if (strlen($chr) > 1) {
-            $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
+            $chr = $this->convertEncoding($chr, 'UTF-32BE', 'UTF-8');
         }
 
         $hex = bin2hex($chr);
@@ -281,7 +277,13 @@ class Escaper
             return sprintf('\\x%02X', ord($chr));
         }
         $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
-        return sprintf('\\u%04s', strtoupper(bin2hex($chr)));
+        $hex = strtoupper(bin2hex($chr));
+        if (strlen($hex) <= 4) {
+            return sprintf('\\u%04s', $hex);
+        }
+        $highSurrogate = substr($hex, 0, 4);
+        $lowSurrogate = substr($hex, 4, 4);
+        return sprintf('\\u%04s\\u%04s', $highSurrogate, $lowSurrogate);
     }
 
     /**
@@ -297,7 +299,7 @@ class Escaper
         if (strlen($chr) == 1) {
             $ord = ord($chr);
         } else {
-            $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
+            $chr = $this->convertEncoding($chr, 'UTF-32BE', 'UTF-8');
             $ord = hexdec(bin2hex($chr));
         }
         return sprintf('\\%X ', $ord);
diff --git a/web/vendor/zendframework/zend-feed/CHANGELOG.md b/web/vendor/zendframework/zend-feed/CHANGELOG.md
index 426cab529..fbdd4aa25 100644
--- a/web/vendor/zendframework/zend-feed/CHANGELOG.md
+++ b/web/vendor/zendframework/zend-feed/CHANGELOG.md
@@ -2,12 +2,94 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.5.2 - TBD
+## 2.8.0 - 2017-04-02
 
 ### Added
 
+- [#27](https://github.com/zendframework/zend-feed/pull/27) adds a documentation
+  chapter demonstrating wrapping a PSR-7 client to use with `Zend\Feed\Reader`.
+- [#22](https://github.com/zendframework/zend-feed/pull/22) adds missing
+  ExtensionManagerInterface on Writer\ExtensionPluginManager.
+- [#32](https://github.com/zendframework/zend-feed/pull/32) adds missing
+  ExtensionManagerInterface on Reader\ExtensionPluginManager.
+
+### Deprecated
+
 - Nothing.
 
+### Removed
+
+- [#38](https://github.com/zendframework/zend-feed/pull/38) dropped php 5.5
+  support
+
+### Fixed
+
+- [#35](https://github.com/zendframework/zend-feed/pull/35) fixed
+  "A non-numeric value encountered" in php 7.1
+- [#39](https://github.com/zendframework/zend-feed/pull/39) fixed protocol
+  relative link absolutisation
+- [#40](https://github.com/zendframework/zend-feed/pull/40) fixed service
+  manager v3 compatibility aliases in extension plugin managers
+
+## 2.7.0 - 2016-02-11
+
+### Added
+
+- [#21](https://github.com/zendframework/zend-feed/pull/21) edits, revises, and
+  prepares the documentation for publication at https://zendframework.github.io/zend-feed/
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#20](https://github.com/zendframework/zend-feed/pull/20) makes the two
+  zend-servicemanager extension manager implementations forwards compatible
+  with version 3, and the overall code base forwards compatible with zend-stdlib
+  v3.
+
+## 2.6.0 - 2015-11-24
+
+### Added
+
+- [#13](https://github.com/zendframework/zend-feed/pull/13) introduces
+  `Zend\Feed\Writer\StandaloneExtensionManager`, an implementation of
+  `Zend\Feed\Writer\ExtensionManagerInterface` that has no dependencies.
+  `Zend\Feed\Writer\ExtensionManager` now composes this by default, instead of
+  `Zend\Feed\Writer\ExtensionPluginManager`, for managing the various feed and
+  entry extensions. If you relied on `ExtensionPluginManager` previously, you
+  will need to create an instance manually and inject it into the `Writer`
+  instance.
+- [#14](https://github.com/zendframework/zend-feed/pull/14) introduces:
+  - `Zend\Feed\Reader\Http\HeaderAwareClientInterface`, which extends
+    `ClientInterface` and adds an optional argument to the `get()` method,
+    `array $headers = []`; this argument allows specifying request headers for
+    the client to send. `$headers` should have header names for keys, and the
+    values should be arrays of strings/numbers representing the header values
+    (if only a single value is necessary, it should be represented as an single
+    value array).
+  - `Zend\Feed\Reader\Http\HeaderAwareResponseInterface`, which extends
+    `ResponseInterface` and adds the method `getHeader($name, $default = null)`.
+    Clients may return either a `ResponseInterface` or
+    `HeaderAwareResponseInterface` instance.
+  - `Zend\Feed\Reader\Http\Response`, which is an implementation of
+    `HeaderAwareResponseInterface`. Its constructor accepts the status code,
+    body, and, optionally, headers.
+  - `Zend\Feed\Reader\Http\Psr7ResponseDecorator`, which is an implementation of
+    `HeaderAwareResponseInterface`. Its constructor accepts a PSR-7 response
+    instance, and the various methdos then proxy to those methods. This should
+    make creating wrappers for PSR-7 HTTP clients trivial.
+  - `Zend\Feed\Reader\Http\ZendHttpClientDecorator`, which decorates a
+    `Zend\Http\Client` instance, implements `HeaderAwareClientInterface`, and
+    returns a `Response` instance seeded from the zend-http response upon
+    calling `get()`. The class exposes a `getDecoratedClient()` method to allow
+    retrieval of the decorated zend-http client instance.
+
 ### Deprecated
 
 - Nothing.
@@ -23,3 +105,19 @@ All notable changes to this project will be documented in this file, in reverse
 - [#2](https://github.com/zendframework/zend-feed/pull/2) ensures that the
   routine for "absolutising" a link in `Reader\FeedSet` always generates a URI
   with a scheme.
+- [#14](https://github.com/zendframework/zend-feed/pull/14) makes the following
+  changes to fix behavior around HTTP clients used within
+  `Zend\Feed\Reader\Reader`:
+  - `setHttpClient()` now ensures that the passed client is either a
+    `Zend\Feed\Reader\Http\ClientInterface` or `Zend\Http\Client`, raising an
+    `InvalidArgumentException` if neither. If a `Zend\Http\Client` is passed, it
+    is passed to the constructor of `Zend\Feed\Reader\Http\ZendHttpClientDecorator`,
+    and the decorator instance is used.
+  - `getHttpClient()` now *always* returns a `Zend\Feed\Reader\Http\ClientInterface`
+    instance. If no instance is currently registered, it lazy loads a
+    `ZendHttpClientDecorator` instance.
+  - `import()` was updated to consume a `ClientInterface` instance; when caches
+    are in play, it checks the client against `HeaderAwareClientInterface` to
+    determine if it can check for HTTP caching headers, and, if so, to retrieve
+    them.
+  - `findFeedLinks()` was updated to consume a `ClientInterface`.
diff --git a/web/vendor/zendframework/zend-feed/CONDUCT.md b/web/vendor/zendframework/zend-feed/CONDUCT.md
new file mode 100644
index 000000000..c663d2be9
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/CONDUCT.md
@@ -0,0 +1,43 @@
+# Contributor Code of Conduct
+
+The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
+as its guidelines for contributor interactions.
+
+## The Code Manifesto
+
+We want to work in an ecosystem that empowers developers to reach their
+potential — one that encourages growth and effective collaboration. A space that
+is safe for all.
+
+A space such as this benefits everyone that participates in it. It encourages
+new developers to enter our field. It is through discussion and collaboration
+that we grow, and through growth that we improve.
+
+In the effort to create such a place, we hold to these values:
+
+1. **Discrimination limits us.** This includes discrimination on the basis of
+   race, gender, sexual orientation, gender identity, age, nationality, technology
+   and any other arbitrary exclusion of a group of people.
+2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort
+   levels. Remember that, and if brought to your attention, heed it.
+3. **We are our biggest assets.** None of us were born masters of our trade.
+   Each of us has been helped along the way. Return that favor, when and where
+   you can.
+4. **We are resources for the future.** As an extension of #3, share what you
+   know. Make yourself a resource to help those that come after you.
+5. **Respect defines us.** Treat others as you wish to be treated. Make your
+   discussions, criticisms and debates from a position of respectfulness. Ask
+   yourself, is it true? Is it necessary? Is it constructive? Anything less is
+   unacceptable.
+6. **Reactions require grace.** Angry responses are valid, but abusive language
+   and vindictive actions are toxic. When something happens that offends you,
+   handle it assertively, but be respectful. Escalate reasonably, and try to
+   allow the offender an opportunity to explain themselves, and possibly correct
+   the issue.
+7. **Opinions are just that: opinions.** Each and every one of us, due to our
+   background and upbringing, have varying opinions. The fact of the matter, is
+   that is perfectly acceptable. Remember this: if you respect your own
+   opinions, you should respect the opinions of others.
+8. **To err is human.** You might not intend it, but mistakes do happen and
+   contribute to build experience. Tolerate honest mistakes, and don't hesitate
+   to apologize if you make one yourself.
diff --git a/web/vendor/zendframework/zend-feed/CONTRIBUTING.md b/web/vendor/zendframework/zend-feed/CONTRIBUTING.md
index e964373fc..38f6ddf1e 100644
--- a/web/vendor/zendframework/zend-feed/CONTRIBUTING.md
+++ b/web/vendor/zendframework/zend-feed/CONTRIBUTING.md
@@ -77,24 +77,24 @@ To do so:
 
 ## Running Coding Standards Checks
 
-This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
+This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
 standards checks, and provides configuration for our selected checks.
-`php-cs-fixer` is installed by default via Composer.
+`phpcs` is installed by default via Composer.
 
 To run checks only:
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
+$ composer cs-check
 ```
 
-To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
-flag:
+`phpcs` also includes a tool for fixing most CS violations, `phpcbf`:
+
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
+$ composer cs-fix
 ```
 
-If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
+If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure
 they pass, and make sure you add and commit the changes after verification.
 
 ## Recommended Workflow for Contributions
@@ -227,3 +227,8 @@ repository, we suggest doing some cleanup of these branches.
    ```console
    $ git push {username} :<branchname>
    ```
+
+
+## Conduct
+
+Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project.
diff --git a/web/vendor/zendframework/zend-feed/README.md b/web/vendor/zendframework/zend-feed/README.md
index ba8b8726c..3e2afd557 100644
--- a/web/vendor/zendframework/zend-feed/README.md
+++ b/web/vendor/zendframework/zend-feed/README.md
@@ -10,4 +10,4 @@ structure with the same natural syntax, and turning the result back into XML.
 
 
 - File issues at https://github.com/zendframework/zend-feed/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-feed
+- Documentation is at https://zendframework.github.io/zend-feed/
diff --git a/web/vendor/zendframework/zend-feed/composer.json b/web/vendor/zendframework/zend-feed/composer.json
index 2c29f0672..7aff1d6cd 100644
--- a/web/vendor/zendframework/zend-feed/composer.json
+++ b/web/vendor/zendframework/zend-feed/composer.json
@@ -13,37 +13,48 @@
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-escaper": "~2.5",
-        "zendframework/zend-stdlib": "~2.5"
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-escaper": "^2.5",
+        "zendframework/zend-stdlib": "^2.7 || ^3.1"
     },
     "require-dev": {
-        "zendframework/zend-db": "~2.5",
-        "zendframework/zend-cache": "~2.5",
-        "zendframework/zend-http": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
-        "zendframework/zend-validator": "~2.5",
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0"
+        "zendframework/zend-db": "^2.7",
+        "zendframework/zend-cache": "^2.6",
+        "zendframework/zend-http": "^2.5.4",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-validator": "^2.6",
+        "phpunit/PHPUnit": "^6.0.8 || ^5.7.15",
+        "psr/http-message": "^1.0",
+        "zendframework/zend-coding-standard": "~1.0.0"
     },
     "suggest": {
-        "zendframework/zend-cache": "Zend\\Cache component",
-        "zendframework/zend-db": "Zend\\Db component",
+        "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
+        "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
+        "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
         "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
-        "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
-        "zendframework/zend-validator": "Zend\\Validator component"
+        "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
+        "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries ehen using the Writer subcomponent"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+            "dev-master": "2.8-dev",
+            "dev-develop": "2.9-dev"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Feed\\": "test/"
         }
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "upload-coverage": "coveralls -v"
     }
-}
\ No newline at end of file
+}
diff --git a/web/vendor/zendframework/zend-feed/composer.lock b/web/vendor/zendframework/zend-feed/composer.lock
new file mode 100644
index 000000000..04f4f949c
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/composer.lock
@@ -0,0 +1,2115 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "b2e612675cf8887e17e5e4347e2365ac",
+    "packages": [
+        {
+            "name": "zendframework/zend-escaper",
+            "version": "2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-escaper.git",
+                "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+                "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Escaper\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-escaper",
+            "keywords": [
+                "escaper",
+                "zf2"
+            ],
+            "time": "2016-06-30T19:48:38+00:00"
+        },
+        {
+            "name": "zendframework/zend-stdlib",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-stdlib.git",
+                "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78",
+                "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "^2.6.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev",
+                    "dev-develop": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Stdlib\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-stdlib",
+            "keywords": [
+                "stdlib",
+                "zf2"
+            ],
+            "time": "2016-09-13T14:38:50+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "container-interop/container-interop",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/container-interop/container-interop.git",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "shasum": ""
+            },
+            "require": {
+                "psr/container": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Interop\\Container\\": "src/Interop/Container/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
+            "homepage": "https://github.com/container-interop/container-interop",
+            "time": "2017-02-14T19:40:03+00:00"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14T21:17:01+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2017-01-26T22:05:40+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27T11:43:31+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-09-30T07:12:33+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2016-11-25T06:54:22+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8 || ^5.6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2017-03-02T20:05:34+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "4.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "09e2277d14ea467e5a984010f501343ef29ffc69"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/09e2277d14ea467e5a984010f501343ef29ffc69",
+                "reference": "09e2277d14ea467e5a984010f501343ef29ffc69",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-file-iterator": "^1.3",
+                "phpunit/php-text-template": "^1.2",
+                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0",
+                "sebastian/environment": "^1.3.2 || ^2.0",
+                "sebastian/version": "^1.0 || ^2.0"
+            },
+            "require-dev": {
+                "ext-xdebug": "^2.1.4",
+                "phpunit/phpunit": "^5.7"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.5.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-03-01T09:12:17+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2016-10-03T07:40:28+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26T11:10:40+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-02-27T10:12:30+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "5.7.17",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/68752b665d3875f9a38a357e3ecb35c79f8673bf",
+                "reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "myclabs/deep-copy": "~1.3",
+                "php": "^5.6 || ^7.0",
+                "phpspec/prophecy": "^1.6.2",
+                "phpunit/php-code-coverage": "^4.0.4",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "^3.2",
+                "sebastian/comparator": "^1.2.4",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "^1.3.4 || ^2.0",
+                "sebastian/exporter": "~2.0",
+                "sebastian/global-state": "^1.1",
+                "sebastian/object-enumerator": "~2.0",
+                "sebastian/resource-operations": "~1.0",
+                "sebastian/version": "~1.0.3|~2.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-03-19T16:52:12+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "3.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-text-template": "^1.2",
+                "sebastian/exporter": "^1.2 || ^2.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2016-12-08T20:27:08+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "time": "2017-02-14T16:28:37+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06T14:39:51+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2017-03-04T06:30:41+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-01-29T09:50:25+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08T07:14:41+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-11-26T07:53:53+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~2.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-11-19T08:54:04+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12T03:26:01+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
+                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "sebastian/recursion-context": "~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2017-02-18T15:18:39+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-11-19T07:33:16+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2015-07-28T20:34:47+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03T07:35:21+00:00"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d",
+                "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "scripts/phpcs",
+                "scripts/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "CodeSniffer.php",
+                    "CodeSniffer/CLI.php",
+                    "CodeSniffer/Exception.php",
+                    "CodeSniffer/File.php",
+                    "CodeSniffer/Fixer.php",
+                    "CodeSniffer/Report.php",
+                    "CodeSniffer/Reporting.php",
+                    "CodeSniffer/Sniff.php",
+                    "CodeSniffer/Tokens.php",
+                    "CodeSniffer/Reports/",
+                    "CodeSniffer/Tokenizers/",
+                    "CodeSniffer/DocGenerators/",
+                    "CodeSniffer/Standards/AbstractPatternSniff.php",
+                    "CodeSniffer/Standards/AbstractScopeSniff.php",
+                    "CodeSniffer/Standards/AbstractVariableSniff.php",
+                    "CodeSniffer/Standards/IncorrectPatternException.php",
+                    "CodeSniffer/Standards/Generic/Sniffs/",
+                    "CodeSniffer/Standards/MySource/Sniffs/",
+                    "CodeSniffer/Standards/PEAR/Sniffs/",
+                    "CodeSniffer/Standards/PSR1/Sniffs/",
+                    "CodeSniffer/Standards/PSR2/Sniffs/",
+                    "CodeSniffer/Standards/Squiz/Sniffs/",
+                    "CodeSniffer/Standards/Zend/Sniffs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2017-03-01T22:17:45+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a",
+                "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "symfony/console": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-07T16:47:02+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2016-11-23T20:04:58+00:00"
+        },
+        {
+            "name": "zendframework/zend-cache",
+            "version": "2.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-cache.git",
+                "reference": "c98331b96d3b9d9b24cf32d02660602edb34d039"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-cache/zipball/c98331b96d3b9d9b24cf32d02660602edb34d039",
+                "reference": "c98331b96d3b9d9b24cf32d02660602edb34d039",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "phpbench/phpbench": "^0.10.0",
+                "phpunit/phpunit": "^4.8",
+                "zendframework/zend-coding-standard": "~1.0.0",
+                "zendframework/zend-serializer": "^2.6",
+                "zendframework/zend-session": "^2.6.2"
+            },
+            "suggest": {
+                "ext-apc": "APC or compatible extension, to use the APC storage adapter",
+                "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter",
+                "ext-dba": "DBA, to use the DBA storage adapter",
+                "ext-memcache": "Memcache >= 2.0.0 to use the Memcache storage adapter",
+                "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter",
+                "ext-mongo": "Mongo, to use MongoDb storage adapter",
+                "ext-redis": "Redis, to use Redis storage adapter",
+                "ext-wincache": "WinCache, to use the WinCache storage adapter",
+                "ext-xcache": "XCache, to use the XCache storage adapter",
+                "mongofill/mongofill": "Alternative to ext-mongo - a pure PHP implementation designed as a drop in replacement",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-session": "Zend\\Session component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Cache",
+                    "config-provider": "Zend\\Cache\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a generic way to cache any data",
+            "homepage": "https://github.com/zendframework/zend-cache",
+            "keywords": [
+                "cache",
+                "zf2"
+            ],
+            "time": "2016-12-16T11:35:47+00:00"
+        },
+        {
+            "name": "zendframework/zend-coding-standard",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-coding-standard.git",
+                "reference": "893316d2904e93f1c74c1384b6d7d57778299cb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-coding-standard/zipball/893316d2904e93f1c74c1384b6d7d57778299cb6",
+                "reference": "893316d2904e93f1c74c1384b6d7d57778299cb6",
+                "shasum": ""
+            },
+            "require": {
+                "squizlabs/php_codesniffer": "^2.7"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Zend Framework coding standard",
+            "keywords": [
+                "Coding Standard",
+                "zf"
+            ],
+            "time": "2016-11-09T21:30:43+00:00"
+        },
+        {
+            "name": "zendframework/zend-db",
+            "version": "2.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-db.git",
+                "reference": "5926a1a2e7e035546b690cb7d4c11a3c47db2c98"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/5926a1a2e7e035546b690cb7d4c11a3c47db2c98",
+                "reference": "5926a1a2e7e035546b690cb7d4c11a3c47db2c98",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-hydrator": "^1.1 || ^2.1",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+            },
+            "suggest": {
+                "zendframework/zend-eventmanager": "Zend\\EventManager component",
+                "zendframework/zend-hydrator": "Zend\\Hydrator component for using HydratingResultSets",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev",
+                    "dev-develop": "2.9-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Db",
+                    "config-provider": "Zend\\Db\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Db\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-db",
+            "keywords": [
+                "db",
+                "zf2"
+            ],
+            "time": "2016-08-09T19:28:55+00:00"
+        },
+        {
+            "name": "zendframework/zend-eventmanager",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-eventmanager.git",
+                "reference": "c3bce7b7d47c54040b9ae51bc55491c72513b75d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/c3bce7b7d47c54040b9ae51bc55491c72513b75d",
+                "reference": "c3bce7b7d47c54040b9ae51bc55491c72513b75d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "athletic/athletic": "^0.1",
+                "container-interop/container-interop": "^1.1.0",
+                "phpunit/phpunit": "^5.6",
+                "zendframework/zend-coding-standard": "~1.0.0",
+                "zendframework/zend-stdlib": "^2.7.3 || ^3.0"
+            },
+            "suggest": {
+                "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
+                "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev",
+                    "dev-develop": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\EventManager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Trigger and listen to events within a PHP application",
+            "homepage": "https://github.com/zendframework/zend-eventmanager",
+            "keywords": [
+                "event",
+                "eventmanager",
+                "events",
+                "zf2"
+            ],
+            "time": "2016-12-19T21:47:12+00:00"
+        },
+        {
+            "name": "zendframework/zend-http",
+            "version": "2.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-http.git",
+                "reference": "09f4d279f46d86be63171ff62ee0f79eca878678"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/09f4d279f46d86be63171ff62ee0f79eca878678",
+                "reference": "09f4d279f46d86be63171ff62ee0f79eca878678",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-loader": "^2.5",
+                "zendframework/zend-stdlib": "^2.5 || ^3.0",
+                "zendframework/zend-uri": "^2.5",
+                "zendframework/zend-validator": "^2.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0",
+                "zendframework/zend-coding-standard": "~1.0.0",
+                "zendframework/zend-config": "^2.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Http\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
+            "homepage": "https://github.com/zendframework/zend-http",
+            "keywords": [
+                "http",
+                "zf2"
+            ],
+            "time": "2017-01-31T14:41:02+00:00"
+        },
+        {
+            "name": "zendframework/zend-loader",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-loader.git",
+                "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c",
+                "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Loader\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-loader",
+            "keywords": [
+                "loader",
+                "zf2"
+            ],
+            "time": "2015-06-03T14:05:47+00:00"
+        },
+        {
+            "name": "zendframework/zend-servicemanager",
+            "version": "3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-servicemanager.git",
+                "reference": "c3036efb81f71bfa36cc9962ee5d4474f36581d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/c3036efb81f71bfa36cc9962ee5d4474f36581d0",
+                "reference": "c3036efb81f71bfa36cc9962ee5d4474f36581d0",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "^1.2",
+                "php": "^5.6 || ^7.0",
+                "psr/container": "^1.0",
+                "zendframework/zend-stdlib": "^3.1"
+            },
+            "provide": {
+                "container-interop/container-interop-implementation": "^1.2",
+                "psr/container-implementation": "^1.0"
+            },
+            "require-dev": {
+                "mikey179/vfsstream": "^1.6",
+                "ocramius/proxy-manager": "^1.0 || ^2.0",
+                "phpbench/phpbench": "^0.10.0",
+                "phpunit/phpunit": "^5.7 || ^6.0.6",
+                "zendframework/zend-coding-standard": "~1.0.0"
+            },
+            "suggest": {
+                "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services",
+                "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances"
+            },
+            "bin": [
+                "bin/generate-deps-for-config-factory",
+                "bin/generate-factory-for-class"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.3-dev",
+                    "dev-develop": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\ServiceManager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-servicemanager",
+            "keywords": [
+                "service-manager",
+                "servicemanager",
+                "zf"
+            ],
+            "time": "2017-03-01T22:08:02+00:00"
+        },
+        {
+            "name": "zendframework/zend-uri",
+            "version": "2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-uri.git",
+                "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0bf717a239432b1a1675ae314f7c4acd742749ed",
+                "reference": "0bf717a239432b1a1675ae314f7c4acd742749ed",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "zendframework/zend-escaper": "^2.5",
+                "zendframework/zend-validator": "^2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Uri\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
+            "homepage": "https://github.com/zendframework/zend-uri",
+            "keywords": [
+                "uri",
+                "zf2"
+            ],
+            "time": "2016-02-17T22:38:51+00:00"
+        },
+        {
+            "name": "zendframework/zend-validator",
+            "version": "2.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-validator.git",
+                "reference": "b71641582297eab52753b72cd4eb45a5ded4485c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/b71641582297eab52753b72cd4eb45a5ded4485c",
+                "reference": "b71641582297eab52753b72cd4eb45a5ded4485c",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "^1.1",
+                "php": "^5.6 || ^7.0",
+                "zendframework/zend-stdlib": "^2.7.6 || ^3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+                "zendframework/zend-cache": "^2.6.1",
+                "zendframework/zend-coding-standard": "~1.0.0",
+                "zendframework/zend-config": "^2.6",
+                "zendframework/zend-db": "^2.7",
+                "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-http": "^2.5.4",
+                "zendframework/zend-i18n": "^2.6",
+                "zendframework/zend-math": "^2.6",
+                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-session": "^2.6.2",
+                "zendframework/zend-uri": "^2.5"
+            },
+            "suggest": {
+                "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator",
+                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
+                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages",
+                "zendframework/zend-i18n-resources": "Translations of validator messages",
+                "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
+                "zendframework/zend-session": "Zend\\Session component, required by the Csrf validator",
+                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.9-dev",
+                    "dev-develop": "2.10-dev"
+                },
+                "zf": {
+                    "component": "Zend\\Validator",
+                    "config-provider": "Zend\\Validator\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Validator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a set of commonly needed validators",
+            "homepage": "https://github.com/zendframework/zend-validator",
+            "keywords": [
+                "validator",
+                "zf2"
+            ],
+            "time": "2017-03-17T10:15:50+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": "^5.6 || ^7.0"
+    },
+    "platform-dev": []
+}
diff --git a/web/vendor/zendframework/zend-feed/doc/book/consuming-atom-entry.md b/web/vendor/zendframework/zend-feed/doc/book/consuming-atom-entry.md
new file mode 100644
index 000000000..280e32bd7
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/consuming-atom-entry.md
@@ -0,0 +1,23 @@
+# Consuming a Single Atom Entry
+
+Single Atom `<entry>` elements are also valid by themselves. Usually the URL for
+an entry is the feed's URL followed by `/<entryId>`, such as
+`http://atom.example.com/feed/1`, using the example URL we used above. This
+pattern may exist for some web services which use Atom as a container syntax.
+
+If you read a single entry, you will have a `Zend\Feed\Reader\Entry\Atom` object.
+
+## Reading a Single-Entry Atom Feed
+
+```php
+$entry = Zend\Feed\Reader\Reader::import('http://atom.example.com/feed/1');
+echo 'Entry title: ' . $entry->getTitle();
+```
+
+> ## Importing requires an HTTP client
+>
+> To import a feed, you will need to have an [HTTP client](zend.feed.http-clients)
+> available. 
+>
+> If you are not using zend-http, you will need to inject `Reader` with the HTTP
+> client. See the [section on providing a client to Reader](http-clients.md#providing-a-client-to-reader).
diff --git a/web/vendor/zendframework/zend-feed/doc/book/consuming-atom.md b/web/vendor/zendframework/zend-feed/doc/book/consuming-atom.md
new file mode 100644
index 000000000..fdee05ac1
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/consuming-atom.md
@@ -0,0 +1,62 @@
+# Consuming Atom Feeds
+
+`Zend\Feed\Reader\Feed\Atom` is used in much the same way as
+`Zend\Feed\Reader\Feed\Rss`. It provides the same access to feed-level
+properties and iteration over entries in the feed. The main difference is in the
+structure of the Atom protocol itself. Atom is a successor to RSS; it is a
+more generalized protocol and it is designed to deal more easily with feeds that
+provide their full content inside the feed, splitting RSS' `description` tag
+into two elements, `summary` and `content`, for that purpose.
+
+## Basic Use of an Atom Feed
+
+Read an Atom feed and print the `title` and `summary` of each entry:
+
+```php
+$feed = Zend\Feed\Reader\Reader::import('http://atom.example.com/feed/');
+echo 'The feed contains ' . $feed->count() . ' entries.' . "\n\n";
+foreach ($feed as $entry) {
+    echo 'Title: ' . $entry->getTitle() . "\n";
+    echo 'Description: ' . $entry->getDescription() . "\n";
+    echo 'URL: ' . $entry->getLink() . "\n\n";
+}
+```
+
+> ## Importing requires an HTTP client
+>
+> To import a feed, you will need to have an [HTTP client](zend.feed.http-clients)
+> available. 
+>
+> If you are not using zend-http, you will need to inject `Reader` with the HTTP
+> client. See the [section on providing a client to Reader](http-clients.md#providing-a-client-to-reader).
+
+In an Atom feed, you can expect to find the following feed properties:
+
+- `title`: The feed's title, same as RSS' channel title.
+- `id`: Every feed and entry in Atom has a unique identifier.
+- `link`: Feeds can have multiple links, which are distinguished by a `type`
+  attribute. The equivalent to RSS's channel link would be `type="text/html"`.
+  If the link is to an alternate version of the same content that's in the feed,
+  it would have a `rel="alternate"` attribute.
+- `subtitle`: The feed's description, equivalent to RSS' channel description.
+- `author`: The feed's author, with `name` and `email` sub-tags.
+
+Atom entries commonly have the following properties:
+
+- `id`: The entry's unique identifier.
+- `title`: The entry's title, same as RSS item titles.
+- `link`: A link to another format or an alternate view of this entry.
+   The link property of an atom entry typically has an `href` attribute.
+- `summary`: A summary of this entry's content.
+- `content`: The full content of the entry; can be skipped if the feed just
+   contains summaries.
+- `author`: with `name` and `email` sub-tags like feeds have.
+- `published`: the date the entry was published, in RFC 3339 format.
+- `updated`: the date the entry was last updated, in RFC 3339 format.
+
+Where relevant, `Zend\Feed` supports a number of common RSS extensions including
+Dublin Core; Content, Slash, Syndication, and Syndication/Thread; and several
+others in common use on blogs.
+
+For more information on Atom and plenty of resources, see
+[http://www.atomenabled.org/](http://www.atomenabled.org/).
diff --git a/web/vendor/zendframework/zend-feed/doc/book/consuming-rss.md b/web/vendor/zendframework/zend-feed/doc/book/consuming-rss.md
new file mode 100644
index 000000000..f965a0c4f
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/consuming-rss.md
@@ -0,0 +1,99 @@
+# Consuming RSS Feeds
+
+## Reading a feed
+
+To read an RSS feed, pass its URL to `Zend\Feed\Reader\Reader::import()`:
+
+```php
+$channel = Zend\Feed\Reader\Reader::import('http://rss.example.com/channelName');
+```
+
+> ## Importing requires an HTTP client
+>
+> To import a feed, you will need to have an [HTTP client](zend.feed.http-clients)
+> available. 
+>
+> If you are not using zend-http, you will need to inject `Reader` with the HTTP
+> client. See the [section on providing a client to Reader](http-clients.md#providing-a-client-to-reader).
+
+If any errors occur fetching the feed, a
+`Zend\Feed\Reader\Exception\RuntimeException` will be thrown.
+
+## Get properties
+
+Once you have a feed object, you can access any of the standard RSS channel
+properties via the various instance getter methods:
+
+```php
+echo $channel->getTitle();
+echo $channel->getAuthor();
+// etc.
+```
+
+If channel properties have attributes, the getter method will return a key/value
+pair, where the key is the attribute name, and the value is the attribute value.
+
+```php
+$author = $channel->getAuthor();
+echo $author['name'];
+```
+
+Most commonly, you'll want to loop through the feed and do something with its
+entries.  `Zend\Feed\Reader\Feed\Rss` internally converts all entries to a
+`Zend\Feed\Reader\Entry\Rss` instance. Entry properties, similarly to channel
+properties, can be accessed via getter methods, such as `getTitle`,
+`getDescription`, etc.
+
+An example of printing all titles of articles in a channel is:
+
+```php
+foreach ($channel as $item) {
+    echo $item->getTitle() . "\n";
+}
+```
+
+If you are not familiar with RSS, here are the standard elements you can expect
+to be available in an RSS channel and in individual RSS items (entries).
+
+Required channel elements:
+
+- `title`: The name of the channel.
+- `link`: The URL of the web site corresponding to the channel.
+- `description`: A sentence (or more) describing the channel.
+
+Common optional channel elements:
+
+- `pubDate`: The publication date of this set of content, in RFC 822 date
+  format.
+- `language`: The language the channel is written in.
+- `category`: One or more (specified by multiple tags) categories the channel
+  belongs to.
+
+RSS `<item>` elements do not have any strictly required elements. However,
+either `title` or `description` must be present.
+
+Common item elements:
+
+- `title`: The title of the item.
+- `link`: The URL of the item.
+- `description`: A synopsis of the item.
+- `author`: The author's email address.
+- `category`: One more categories that the item belongs to.
+- `comments`: URL of comments relating to this item.
+- `pubDate`: The date the item was published, in RFC 822 date format.
+
+In your code you can always test to see if an element is non-empty by calling
+the getter:
+
+```php
+if ($item->getPropname()) {
+    // ... proceed.
+}
+```
+
+Where relevant, `Zend\Feed` supports a number of common RSS extensions including
+Dublin Core, Atom (inside RSS); the Content, Slash, Syndication,
+Syndication/Thread extensions; as well as several others.
+
+Please see the official [RSS 2.0 specification](http://cyber.law.harvard.edu/rss/rss.html)
+for further information.
diff --git a/web/vendor/zendframework/zend-feed/doc/book/find-feeds.md b/web/vendor/zendframework/zend-feed/doc/book/find-feeds.md
new file mode 100644
index 000000000..0f934072b
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/find-feeds.md
@@ -0,0 +1,48 @@
+# Feed Discovery from Web Pages
+
+Web pages often contain `<link>` tags that refer to feeds with content relevant
+to the particular page. `Zend\Feed\Reader\Reader` enables you to retrieve all
+feeds referenced by a web page with one method call:
+
+```php
+$feedLinks = Zend\Feed\Reader\Reader::findFeedLinks('http://www.example.com/news.html');
+```
+
+> ## Finding feed links requires an HTTP client
+>
+> To find feed links, you will need to have an [HTTP client](zend.feed.http-clients)
+> available. 
+>
+> If you are not using zend-http, you will need to inject `Reader` with the HTTP
+> client. See the [section on providing a client to Reader](http-clients.md#providing-a-client-to-reader).
+
+Here the `findFeedLinks()` method returns a `Zend\Feed\Reader\FeedSet` object,
+which is in turn a collection of other `Zend\Feed\Reader\FeedSet` objects, each
+referenced by `<link>` tags on the `news.html` web page.
+`Zend\Feed\Reader\Reader` will throw a
+`Zend\Feed\Reader\Exception\RuntimeException` upon failure, such as an HTTP
+404 response code or a malformed feed.
+
+You can examine all feed links located by iterating across the collection:
+
+```php
+$rssFeed = null;
+$feedLinks = Zend\Feed\Reader\Reader::findFeedLinks('http://www.example.com/news.html');
+foreach ($feedLinks as $link) {
+    if (stripos($link['type'], 'application/rss+xml') !== false) {
+        $rssFeed = $link['href'];
+        break;
+}
+```
+
+Each `Zend\Feed\Reader\FeedSet` object will expose the `rel`, `href`, `type`,
+and `title` properties of detected links for all RSS, Atom, or RDF feeds. You
+can always select the first encountered link of each type by using a shortcut:
+the first encountered link of a given type is assigned to a property named after
+the feed type.
+
+```php
+$rssFeed = null;
+$feedLinks = Zend\Feed\Reader\Reader::findFeedLinks('http://www.example.com/news.html');
+$firstAtomFeed = $feedLinks->atom;
+```
diff --git a/web/vendor/zendframework/zend-feed/doc/book/http-clients.md b/web/vendor/zendframework/zend-feed/doc/book/http-clients.md
new file mode 100644
index 000000000..9b9363498
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/http-clients.md
@@ -0,0 +1,236 @@
+# HTTP Clients and zend-feed
+
+Several operations in zend-feed's Reader subcomponent require an HTTP client:
+
+- importing a feed
+- finding links in a feed
+
+In order to allow developers a choice in HTTP clients, the subcomponent defines
+several interfaces and classes. Elsewhere in the documentation, we reference
+where an HTTP client may be used; this document details what constitutes an HTTP
+client and its behavior, and some of the concrete classes available within the
+component for implementing this behavior.
+
+## ClientInterface and HeaderAwareClientInterface
+
+First, we define two interfaces for clients,
+`Zend\Feed\Reader\Http\ClientInterface` and `HeaderAwareClientInterface`:
+
+```php
+namespace Zend\Feed\Reader\Http;
+
+interface ClientInterface
+{
+    /**
+     * Make a GET request to a given URL.
+     *
+     * @param string $url
+     * @return ResponseInterface
+     */
+    public function get($url);
+}
+
+interface HeaderAwareClientInterface extends ClientInterface
+{
+    /**
+     * Make a GET request to a given URL.
+     *
+     * @param string $url
+     * @param array $headers
+     * @return ResponseInterface
+     */
+    public function get($url, array $headers = []);
+}
+```
+
+The first is header-agnostic, and assumes that the client will simply perform an
+HTTP GET request. The second allows providing headers to the client; typically,
+these are used for HTTP caching headers. `$headers` must be in the following
+structure:
+
+```php
+$headers = [
+    'X-Header-Name' => [
+        'header',
+        'values',
+    ],
+];
+```
+
+i.e., each key is a header name, and each value is an array of values for that
+header. If the header represents only a single value, it should be an array with
+that value:
+
+```php
+$headers = [
+    'Accept' => [ 'application/rss+xml' ],
+];
+```
+
+A call to `get()` should yield a *response*.
+
+## ResponseInterface and HeaderAwareResponseInterface
+
+Responses are modeled using `Zend\Feed\Reader\Http\ResponseInterface` and
+`HeaderAwareResponseInterface`:
+
+```php
+namespace Zend\Feed\Reader\Http;
+
+class ResponseInterface
+{
+    /**
+     * Retrieve the status code.
+     *
+     * @return int
+     */
+    public function getStatusCode();
+
+    /**
+     * Retrieve the response body contents.
+     *
+     * @return string
+     */
+    public function getBody();
+}
+
+class HeaderAwareResponseInterface extends ResponseInterface
+{
+    /**
+     * Retrieve a named header line.
+     *
+     * Retrieve a header by name; all values MUST be concatenated to a single
+     * line. If no matching header is found, return the $default value.
+     *
+     * @param string $name
+     * @param null|string $default
+     * @return string
+    public function getHeaderLine($name, $default = null);
+}
+```
+
+Internally, `Reader` will typehint against `ClientInterface` for the bulk of
+operations. In some cases, however, certain capabilities are only possible if
+the response can provide headers (e.g., for caching); in such cases, it will
+check the instance against `HeaderAwareResponseInterface`, and only call
+`getHeaderLine()` if it matches.
+
+## Response
+
+zend-feed ships with a generic `ResponseInterface` implementation,
+`Zend\Feed\Http\Response`. It implements `HeaderAwareResponseInterface`, and
+defines the following constructor:
+
+```php
+namespace Zend\Feed\Reader\Http;
+
+class Response implements HeaderAwareResponseInterface
+{
+    /**
+     * Constructor
+     *
+     * @param int $statusCode Response status code
+     * @param string $body Response body
+     * @param array $headers Response headers, if available
+     */
+    public function __construct($statusCode, $body, array $headers = []);
+}
+```
+
+## PSR-7 Response
+
+[PSR-7](http://www.php-fig.org/psr/psr-7/) defines a set of HTTP message
+interfaces, but not a client interface. To facilitate wrapping an HTTP client
+that uses PSR-7 messages, we provide `Zend\Feed\Reader\Psr7ResponseDecorator`:
+
+```php
+namespace Zend\Feed\Reader\Http;
+
+use Psr\Http\Message\ResponseInterface as PsrResponseInterface;
+
+class Psr7ResponseDecorator implements HeaderAwareResponseInterface
+{
+    /**
+     * @param PsrResponseInterface $response
+     */
+    public function __construct(PsrResponseInterface $response);
+
+    /**
+     * @return PsrResponseInterface
+     */
+    public function getDecoratedResponse();
+}
+```
+
+Clients can then take the PSR-7 response they receive, pass it to the decorator,
+and return the decorator.
+
+To use the PSR-7 response, you will need to add the PSR-7 interfaces to your
+application, if they are not already installed by the client of your choice:
+
+```bash
+$ composer require psr/http-message
+```
+
+## zend-http
+
+We also provide a zend-http client decorator,
+`Zend\Feed\Reader\Http\ZendHttpClientDecorator`:
+
+```php
+namespace Zend\Feed\Reader\Http;
+
+use Zend\Http\Client as HttpClient;
+
+class ZendHttpClientDecorator implements HeaderAwareClientInterface
+{
+    /**
+     * @param HttpClient $client
+     */
+    public function __construct(HttpClient $client);
+
+    /**
+     * @return HttpClient
+     */
+    public function getDecoratedClient();
+}
+```
+
+Its `get()` implementation returns a `Response` instance seeded from the
+zend-http response returned, including status, body, and headers.
+
+zend-http is the default implementation assumed by `Zend\Feed\Reader\Reader`,
+but *is not installed by default*. You may install it using composer:
+
+```bash
+$ composer require zendframework/zend-http
+```
+
+## Providing a client to Reader
+
+By default, `Zend\Feed\Reader\Reader` will lazy load a zend-http client. If you
+have not installed zend-http, however, PHP will raise an error indicating the
+class is not found!
+
+As such, you have two options:
+
+1. Install zend-http: `composer require zendframework/zend-http`.
+2. Inject the `Reader` with your own HTTP client.
+
+To accomplish the second, you will need an implementation of
+`Zend\Feed\Reader\Http\ClientInterface` or `HeaderAwareClientInterface`, and an
+instance of that implementation. Once you do, you can use the static method
+`setHttpClient()` to inject it.
+
+As an example, let's say you've created a PSR-7-based implementation named
+`My\Http\Psr7FeedClient`. You could then do the following:
+
+```php
+use My\Http\Psr7FeedClient;
+use Zend\Feed\Reader\Reader;
+
+Reader::setHttpClient(new Psr7FeedClient());
+```
+
+Your client will then be used for all `import()` and `findFeedLinks()`
+operations.
diff --git a/web/vendor/zendframework/zend-feed/doc/book/importing.md b/web/vendor/zendframework/zend-feed/doc/book/importing.md
new file mode 100644
index 000000000..52b58936d
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/importing.md
@@ -0,0 +1,49 @@
+# Importing Feeds
+
+`Zend\Feed` enables developers to retrieve feeds via `Zend\Feader\Reader`. If
+you know the URI of a feed, use the `Zend\Feed\Reader\Reader::import()` method
+to consume it:
+
+```php
+$feed = Zend\Feed\Reader\Reader::import('http://feeds.example.com/feedName');
+```
+
+> ## Importing requires an HTTP client
+>
+> To import a feed, you will need to have an [HTTP client](zend.feed.http-clients)
+> available. 
+>
+> If you are not using zend-http, you will need to inject `Reader` with the HTTP
+> client. See the [section on providing a client to Reader](http-clients.md#providing-a-client-to-reader).
+
+You can also use `Zend\Feed\Reader\Reader` to fetch the contents of a feed from
+a file or the contents of a PHP string variable:
+
+```php
+// importing a feed from a text file
+$feedFromFile = Zend\Feed\Reader\Reader::importFile('feed.xml');
+
+// importing a feed from a PHP string variable
+$feedFromPHP = Zend\Feed\Reader\Reader::importString($feedString);
+```
+
+In each of the examples above, an object of a class that extends
+`Zend\Feed\Reader\Feed\AbstractFeed` is returned upon success, depending on the
+type of the feed. If an RSS feed were retrieved via one of the import methods
+above, then a `Zend\Feed\Reader\Feed\Rss` object would be returned. On the other
+hand, if an Atom feed were imported, then a `Zend\Feed\Reader\Feed\Atom` object
+is returned. The import methods will also throw a
+`Zend\Feed\Exception\Reader\RuntimeException` object upon failure, such as an
+unreadable or malformed feed.
+
+## Dumping the contents of a feed
+
+To dump the contents of a `Zend\Feed\Reader\Feed\AbstractFeed` instance, you may
+use the `saveXml()` method.
+
+```php
+assert($feed instanceof Zend\Feed\Reader\Feed\AbstractFeed);
+
+// dump the feed to standard output
+print $feed->saveXml();
+```
diff --git a/web/vendor/zendframework/zend-feed/doc/book/index.html b/web/vendor/zendframework/zend-feed/doc/book/index.html
new file mode 100644
index 000000000..f05b9c110
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/index.html
@@ -0,0 +1,10 @@
+<div class="container">
+  <div class="jumbotron">
+    <h1>zend-feed</h1>
+    
+    <p>Consume and generate Atom and RSS feeds, and interact with Pubsubhubbub.</p>
+
+    <pre><code class="language-bash">$ composer require zendframework/zend-feed</code></pre>
+  </div>
+</div>
+
diff --git a/web/vendor/zendframework/zend-feed/doc/book/index.md b/web/vendor/zendframework/zend-feed/doc/book/index.md
new file mode 120000
index 000000000..fe8400541
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/index.md
@@ -0,0 +1 @@
+../../README.md
\ No newline at end of file
diff --git a/web/vendor/zendframework/zend-feed/doc/book/intro.md b/web/vendor/zendframework/zend-feed/doc/book/intro.md
new file mode 100644
index 000000000..784aac8f5
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/intro.md
@@ -0,0 +1,62 @@
+# Introduction
+
+`Zend\Feed` provides functionality for consuming RSS and Atom feeds. It provides
+a natural syntax for accessing elements of feeds, feed attributes, and entry
+attributes. `Zend\Feed` also has extensive support for modifying feed and entry
+structure with the same natural syntax, and turning the result back into XML.
+In the future, this modification support could provide support for the Atom
+Publishing Protocol.
+
+`Zend\Feed` consists of `Zend\Feed\Reader` for reading RSS and Atom feeds,
+`Zend\Feed\Writer` for writing RSS and Atom feeds, and `Zend\Feed\PubSubHubbub`
+for working with Hub servers. Furthermore, both `Zend\Feed\Reader` and
+`Zend\Feed\Writer` support extensions which allows for working with additional
+data in feeds, not covered in the core API but used in conjunction with RSS and
+Atom feeds.
+
+In the example below, we demonstrate a simple use case of retrieving an RSS feed
+and saving relevant portions of the feed data to a simple PHP array, which could
+then be used for printing the data, storing to a database, etc.
+
+> ## RSS optional properties
+>
+> Many *RSS* feeds have different channel and item properties available. The
+> *RSS* specification provides for many optional properties, so be aware of this
+> when writing code to work with *RSS* data. `Zend\Feed` supports all optional
+> properties of the core *RSS* and *Atom* specifications.
+
+## Reading RSS Feed Data
+
+```php
+// Fetch the latest Slashdot headlines
+try {
+    $slashdotRss =
+        Zend\Feed\Reader\Reader::import('http://rss.slashdot.org/Slashdot/slashdot');
+} catch (Zend\Feed\Reader\Exception\RuntimeException $e) {
+    // feed import failed
+    echo "Exception caught importing feed: {$e->getMessage()}\n";
+    exit;
+}
+
+// Initialize the channel/feed data array
+$channel = [
+    'title'       => $slashdotRss->getTitle(),
+    'link'        => $slashdotRss->getLink(),
+    'description' => $slashdotRss->getDescription(),
+    'items'       => [],
+];
+
+// Loop over each channel item/entry and store relevant data for each
+foreach ($slashdotRss as $item) {
+    $channel['items'][] = [
+        'title'       => $item->getTitle(),
+        'link'        => $item->getLink(),
+        'description' => $item->getDescription(),
+    ];
+}
+```
+
+Your `$channel` array now contains the basic meta-information for the RSS
+channel and all items that it contained. The process is identical for Atom
+feeds since `Zend\Feed` provides a common feed API; i.e. all getters and
+setters are the same regardless of feed format.
diff --git a/web/vendor/zendframework/zend-feed/doc/book/psr7-clients.md b/web/vendor/zendframework/zend-feed/doc/book/psr7-clients.md
new file mode 100644
index 000000000..19445a71e
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/psr7-clients.md
@@ -0,0 +1,90 @@
+# Using PSR-7 Clients
+
+As noted in the previous section, you can [substitute your own HTTP client by implementing the ClientInterface](http-clients.md#clientinterface-and-headerawareclientinterface).
+In this section, we'll demonstrate doing so in order to use a client that is
+[PSR-7](http://www.php-fig.org/psr/psr-7/)-capable.
+
+## Responses
+
+zend-feed provides a facility to assist with generating a
+`Zend\Feed\Reader\Response` from a PSR-7 `ResponseInterface` via
+`Zend\Feed\Reader\Http\Psr7ResponseDecorator`. As such, if you have a
+PSR-7-capable client, you can pass the response to this decorator, and
+immediately return it from your custom client:
+
+```php
+return new Psr7ResponseDecorator($psr7Response);
+```
+
+We'll do this with our PSR-7 client.
+
+## Guzzle
+
+[Guzzle](http://docs.guzzlephp.org/en/latest/) is arguably the most popular HTTP
+client library for PHP, and fully supports PSR-7 since version 5. Let's install
+it:
+
+```bash
+$ composer require guzzlehttp/guzzle
+```
+
+We'll use the `GuzzleHttp\Client` to make our requests to feeds.
+
+## Creating a client
+
+From here, we'll create our client. To do this, we'll create a class that:
+
+- implements `Zend\Feed\Reader\Http\ClientInterface`
+- accepts a `GuzzleHttp\ClientInterface` to its constructor
+- uses the Guzzle client to make the request
+- returns a zend-feed response decorating the actual PSR-7 response
+
+The code looks like this:
+
+```php
+use GuzzleHttp\Client;
+use GuzzleHttp\ClientInterface as GuzzleClientInterface;
+use Zend\Feed\Reader\Http\ClientInterface as FeedReaderHttpClientInterface;
+use Zend\Feed\Reader\Http\Psr7ResponseDecorator;
+ 
+class GuzzleClient implements FeedReaderHttpClientInterface
+{
+    /**
+     * @var GuzzleClientInterface
+     */
+    private $client;
+ 
+    /**
+     * @param GuzzleClientInterface|null $client
+     */
+    public function __construct(GuzzleClientInterface $client = null)
+    {
+        $this->client = $client ?: new Client();
+    }
+ 
+    /**
+     * {@inheritdoc}
+     */
+    public function get($uri)
+    {
+        return new Psr7ResponseDecorator(
+			$this->client->request('GET', $uri)
+		);
+    }
+}
+```
+
+## Using the client
+
+In order to use our new client, we need to tell `Zend\Feed\Reader\Reader` about
+it:
+
+```php
+Zend\Feed\Reader\Reader::setHttpClient(new GuzzleClient());
+```
+
+From this point forward, this custom client will be used to retrieve feeds.
+
+## References
+
+This chapter is based on [a blog post by Stefan Gehrig](https://www.teqneers.de/2016/05/zendfeedreader-guzzle-and-psr-7/).
diff --git a/web/vendor/zendframework/zend-feed/doc/book/pubsubhubbub.md b/web/vendor/zendframework/zend-feed/doc/book/pubsubhubbub.md
new file mode 100644
index 000000000..c5719fa44
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/pubsubhubbub.md
@@ -0,0 +1,452 @@
+# Zend\\Feed\\PubSubHubbub
+
+`Zend\Feed\PubSubHubbub` is an implementation of the [PubSubHubbub Core 0.2/0.3
+Specification (Working Draft)](http://pubsubhubbub.googlecode.com/svn/trunk/pubsubhubbub-core-0.3.html).
+It offers implementations of a Pubsubhubbub Publisher and Subscriber suited to
+PHP applications.
+
+## What is PubSubHubbub?
+
+Pubsubhubbub is an open, simple, web-scale, pubsub protocol. A common use case
+to enable blogs (Publishers) to "push" updates from their RSS or Atom feeds
+(Topics) to end Subscribers. These Subscribers will have subscribed to the
+blog's RSS or Atom feed via a Hub, a central server which is notified of any
+updates by the Publisher, and which then distributes these updates to all
+Subscribers. Any feed may advertise that it supports one or more Hubs using an
+Atom namespaced link element with a rel attribute of "hub" (i.e., `rel="hub"`).
+
+Pubsubhubbub has garnered attention because it is a pubsub protocol which is
+easy to implement and which operates over HTTP. Its philosophy is to replace the
+traditional model where blog feeds have been polled at regular intervals to
+detect and retrieve updates. Depending on the frequency of polling, this can
+take a lot of time to propagate updates to interested parties from planet
+aggregators to desktop readers. With a pubsub system in place, updates are not
+simply polled by Subscribers, they are pushed to Subscribers, eliminating any
+delay. For this reason, Pubsubhubbub forms part of what has been dubbed the
+real-time web.
+
+The protocol does not exist in isolation. Pubsub systems have been around for a
+while, such as the familiar Jabber Publish-Subscribe protocol,
+[XEP-0060](http://www.xmpp.org/extensions/xep-0060.html), or the less well-known
+[rssCloud](http://www.rssboard.org/rsscloud-interface) (described in 2001).
+However, these have not achieved widespread adoption due to either their
+complexity, poor timing, or lack of suitability for web applications. rssCloud,
+which was recently revived as a response to the appearance of Pubsubhubbub, has
+also seen its usage increase significantly, though it lacks a formal
+specification and currently does not support Atom 1.0 feeds.
+
+Perhaps surprisingly given its relative early age, Pubsubhubbub is already in
+use including in Google Reader and Feedburner, and there are plugins available
+for Wordpress blogs.
+
+## Architecture
+
+`Zend\Feed\PubSubHubbub` implements two sides of the Pubsubhubbub 0.2/0.3
+Specification: a Publisher and a Subscriber. It does not currently implement a
+Hub Server.
+
+A Publisher is responsible for notifying all supported Hubs (many can be
+supported to add redundancy to the system) of any updates to its feeds, whether
+they be Atom or RSS based. This is achieved by pinging the supported Hub Servers
+with the URL of the updated feed. In Pubsubhubbub terminology, any updatable
+resource capable of being subscribed to is referred to as a Topic. Once a ping
+is received, the Hub will request the updated feed, process it for updated
+items, and forward all updates to all Subscribers subscribed to that feed.
+
+A Subscriber is any party or application which subscribes to one or more Hubs to
+receive updates from a Topic hosted by a Publisher. The Subscriber never
+directly communicates with the Publisher since the Hub acts as an intermediary,
+accepting subscriptions and sending updates to Subscribers. The Subscriber
+therefore communicates only with the Hub, either to subscribe or unsubscribe to
+Topics, or when it receives updates from the Hub. This communication design
+("Fat Pings") effectively removes the possibility of a "Thundering Herd" issue.
+(Thundering Herds occur in a pubsub system where the Hub merely informs
+Subscribers that an update is available, prompting all Subscribers to
+immediately retrieve the feed from the Publisher, giving rise to a traffic
+spike.) In Pubsubhubbub, the Hub distributes the actual update in a "Fat Ping"
+so the Publisher is not subjected to any traffic spike.
+
+`Zend\Feed\PubSubHubbub` implements Pubsubhubbub Publishers and Subscribers with
+the classes `Zend\Feed\PubSubHubbub\Publisher` and
+`Zend\Feed\PubSubHubbub\Subscriber`. In addition, the Subscriber implementation
+may handle any feed updates forwarded from a Hub by using
+`Zend\Feed\PubSubHubbub\Subscriber\Callback`. These classes, their use cases,
+and etheir APIs are covered in subsequent sections.
+
+## Zend\\Feed\\PubSubHubbub\\Publisher
+
+In Pubsubhubbub, the Publisher is the party publishing a live feed with content
+updates. This may be a blog, an aggregator, or even a web service with a public
+feed based API. In order for these updates to be pushed to Subscribers, the
+Publisher must notify all of its supported Hubs that an update has occurred
+using a simple HTTP POST request containing the URI of the updated Topic (i.e.,
+the updated RSS or Atom feed). The Hub will confirm receipt of the notification,
+fetch the updated feed, and forward any updates to any Subscribers who have
+subscribed to that Hub for updates from the relevant feed.
+
+By design, this means the Publisher has very little to do except send these Hub
+pings whenever its feeds change. As a result, the Publisher implementation is
+extremely simple to use and requires very little work to setup and use when
+feeds are updated.
+
+`Zend\Feed\PubSubHubbub\Publisher` implements a full Pubsubhubbub Publisher. Its
+setup for use primarily requires that it is configured with the URI endpoint for
+all Hubs to be notified of updates, and the URIs of all Topics to be included in
+the notifications.
+
+The following example shows a Publisher notifying a collection of Hubs about
+updates to a pair of local RSS and Atom feeds. The class retains a collection of
+errors which include the Hub URLs, so that notification can be attempted again
+later and/or logged if any notifications happen to fail.  Each resulting error
+array also includes a "response" key containing the related HTTP response
+object. In the event of any errors, it is strongly recommended to attempt the
+operation for failed Hub Endpoints at least once more at a future time. This may
+require the use of either a scheduled task for this purpose or a job queue,
+though such extra steps are optional.
+
+```php
+use Zend\Feed\PubSubHubbub\Publisher;
+
+$publisher = Publisher;
+$publisher->addHubUrls([
+    'http://pubsubhubbub.appspot.com/',
+    'http://hubbub.example.com',
+]);
+$publisher->addUpdatedTopicUrls([
+    'http://www.example.net/rss',
+    'http://www.example.net/atom',
+]);
+$publisher->notifyAll();
+
+if (! $publisher->isSuccess()) {
+    // check for errors
+    $errors     = $publisher->getErrors();
+    $failedHubs = [];
+    foreach ($errors as $error) {
+        $failedHubs[] = $error['hubUrl'];
+    }
+}
+
+// reschedule notifications for the failed Hubs in $failedHubs
+```
+
+If you prefer having more concrete control over the Publisher, the methods
+`addHubUrls()` and `addUpdatedTopicUrls()` pass each array value to the singular
+`addHubUrl()` and `addUpdatedTopicUrl()` public methods. There are also matching
+`removeUpdatedTopicUrl()` and `removeHubUrl()` methods.
+
+You can also skip setting Hub URIs, and notify each in turn using the
+`notifyHub()` method which accepts the URI of a Hub endpoint as its only
+argument.
+
+There are no other tasks to cover. The Publisher implementation is very simple
+since most of the feed processing and distribution is handled by the selected
+Hubs. It is, however, important to detect errors and reschedule notifications as
+soon as possible (with a reasonable maximum number of retries) to ensure
+notifications reach all Subscribers. In many cases, as a final alternative, Hubs
+may frequently poll your feeds to offer some additional tolerance for failures
+both in terms of their own temporary downtime or Publisher errors or downtime.
+
+## Zend\\Feed\\PubSubHubbub\\Subscriber
+
+In Pubsubhubbub, the Subscriber is the party who wishes to receive updates to
+any Topic (RSS or Atom feed). They achieve this by subscribing to one or more of
+the Hubs advertised by that Topic, usually as a set of one or more Atom 1.0
+links with a rel attribute of "hub" (i.e., `rel="hub"`). The Hub from that point
+forward will send an Atom or RSS feed containing all updates to that
+Subscriber's callback URL when it receives an update notification from the
+Publisher. In this way, the Subscriber need never actually visit the original
+feed (though it's still recommended at some level to ensure updates are
+retrieved if ever a Hub goes offline). All subscription requests must contain
+the URI of the Topic being subscribed and a callback URL which the Hub will use
+to confirm the subscription and to forward updates.
+
+The Subscriber therefore has two roles. The first is to *create* and *manage*
+subscriptions, including subscribing for new Topics with a Hub, unsubscribing
+(if necessary), and periodically renewing subscriptions, since they may have an
+expiry set by the Hub. This is handled by `Zend\Feed\PubSubHubbub\Subscriber`.
+
+The second role is to *accept updates* sent by a Hub to the Subscriber's
+callback URL, i.e. the URI the Subscriber has assigned to handle updates. The
+callback URL also handles events where the Hub contacts the Subscriber to
+confirm all subscriptions and unsubscriptions. This is handled by using an
+instance of `Zend\Feed\PubSubHubbub\Subscriber\Callback` when the callback URL
+is accessed.
+
+> ### Query strings in callback URLs
+>
+> `Zend\Feed\PubSubHubbub\Subscriber` implements the Pubsubhubbub 0.2/0.3
+> specification. As this is a new specification version, not all Hubs currently
+> implement it. The new specification allows the callback URL to include a query
+> string which is used by this class, but not supported by all Hubs. In the
+> interests of maximising compatibility, it is therefore recommended that the
+> query string component of the Subscriber callback URI be presented as a path
+> element, i.e. recognised as a parameter in the route associated with the
+> callback URI and used by the application's router.
+
+### Subscribing and Unsubscribing
+
+`Zend\Feed\PubSubHubbub\Subscriber` implements a full Pubsubhubbub Subscriber
+capable of subscribing to, or unsubscribing from, any Topic via any Hub
+advertised by that Topic. It operates in conjunction with
+`Zend\Feed\PubSubHubbub\Subscriber\Callback`, which accepts requests from a Hub
+to confirm all subscription or unsubscription attempts (to prevent third-party
+misuse).
+
+Any subscription (or unsubscription) requires the relevant information before
+proceeding, i.e. the URI of the Topic (Atom or RSS feed) to be subscribed to for
+updates, and the URI of the endpoint for the Hub which will handle the
+subscription and forwarding of the updates. The lifetime of a subscription may
+be determined by the Hub, but most Hubs should support automatic subscription
+refreshes by checking with the Subscriber. This is supported by
+`Zend\Feed\PubSubHubbub\Subscriber\Callback` and requires no other work on your
+part. It is still strongly recommended that you use the Hub-sourced subscription
+time-to.live (ttl) to schedule the creation of new subscriptions (the process is
+identical to that for any new subscription) to refresh it with the Hub. While it
+should not be necessary per se, it covers cases where a Hub may not support
+automatic subscription refreshing, and rules out Hub errors for additional
+redundancy.
+
+With the relevant information to hand, a subscription can be attempted as
+demonstrated below:
+
+```php
+use Zend\Feed\PubSubHubbub\Model\Subscription;
+use Zend\Feed\PubSubHubbub\Subscriber;
+
+$storage    = new Subscription;
+$subscriber = new Subscriber;
+$subscriber->setStorage($storage);
+$subscriber->addHubUrl('http://hubbub.example.com');
+$subscriber->setTopicUrl('http://www.example.net/rss.xml');
+$subscriber->setCallbackUrl('http://www.mydomain.com/hubbub/callback');
+$subscriber->subscribeAll();
+```
+
+In order to store subscriptions and offer access to this data for general use,
+the component requires a database (a schema is provided later in this section).
+By default, it is assumed the table name is "subscription", and it utilises
+`Zend\Db\TableGateway\TableGateway` in the background, meaning it will use the
+default adapter you have set for your application. You may also pass a specific
+custom `Zend\Db\TableGateway\TableGateway` instance into the associated model
+`Zend\Feed\PubSubHubbub\Model\Subscription`. This custom adapter may be as
+simple in intent as changing the table name to use or as complex as you deem
+necessary.
+
+While this model is offered as a default ready-to-roll solution, you may create
+your own model using any other backend or database layer (e.g. Doctrine) so long
+as the resulting class implements the interface
+`Zend\Feed\PubSubHubbub\Model\SubscriptionInterface`.
+
+An example schema (MySQL) for a subscription table accessible by the provided
+model may look similar to:
+
+```sql
+CREATE TABLE IF NOT EXISTS `subscription` (
+  `id` varchar(32) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
+  `topic_url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `hub_url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `created_time` datetime DEFAULT NULL,
+  `lease_seconds` bigint(20) DEFAULT NULL,
+  `verify_token` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `secret` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `expiration_time` datetime DEFAULT NULL,
+  `subscription_state` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+```
+
+Behind the scenes, the Subscriber above will send a request to the Hub endpoint
+containing the following parameters (based on the previous example):
+
+Parameter | Value | Explanation
+--------- | ----- | -----------
+`hub.callback` | `http://www.mydomain.com/hubbub/callback?xhub.subscription=5536df06b5dcb966edab3a4c4d56213c16a8184` | The URI used by a Hub to contact the Subscriber and either request confirmation of a (un)subscription request, or send updates from subscribed feeds. The appended query string contains a custom parameter (hence the xhub designation). It is a query string parameter preserved by the Hub and re-sent with all Subscriber requests. Its purpose is to allow the Subscriber to identify and look up the subscription associated with any Hub request in a backend storage medium. This is a non-standard parameter used by this component in preference to encoding a subscription key in the URI path, which is difficult to enforce generically. Nevertheless, since not all Hubs support query string parameters, we still strongly recommend adding the subscription key as a path component in the form `http://www.mydomain.com/hubbub/callback/5536df06b5dcb966edab3a4c4d56213c16a8184`.  This requires defining a route capable of parsing out the final value of the key, retrieving the value, and passing it to the Subscriber callback object. The value should be passed into the method `Zend\PubSubHubbub\Subscriber\Callback::setSubscriptionKey()`. A detailed example is offered later.
+`hub.lease_seconds` | `2592000` | The number of seconds for which the Subscriber would like a new subscription to remain valid (i.e. a TTL). Hubs may enforce their own maximum subscription period. All subscriptions should be renewed by re-subscribing before the subscription period ends to ensure continuity of updates. Hubs should additionally attempt to automatically refresh subscriptions before they expire by contacting Subscribers (handled automatically by the `Callback` class).
+`hub.mode` | `subscribe` | Value indicating this is a subscription request. Unsubscription requests would use the "unsubscribe" value.
+`hub.topic` | `http://www.example.net/rss.xml` | The URI of the Topic (i.e. Atom or RSS feed) which the Subscriber wishes to subscribe to for updates.
+`hub.verify` | `sync` or `async` | Indicates to the Hub the preferred mode of verifying subscriptions or unsubscriptions. It is repeated twice in order of preference. Technically this component does not distinguish between the two modes and treats both equally.
+`hub.verify_token` | `3065919804abcaa7212ae89.879827871253878386` | A verification token returned to the Subscriber by the Hub when it is confirming a subscription or unsubscription. Offers a measure of reliance that the confirmation request originates from the correct Hub to prevent misuse.
+
+You can modify several of these parameters to indicate a different preference.
+For example, you can set a different lease seconds value using
+`Zend\Feed\PubSubHubbub\Subscriber::setLeaseSeconds(),` or show a preference for
+the `async` verify mode by using `setPreferredVerificationMode(Zend\Feed\PubSubHubbub\PubSubHubbub::VERIFICATION_MODE_ASYNC)`.
+However, the Hubs retain the capability to enforce their own preferences, and
+for this reason the component is deliberately designed to work across almost any
+set of options with minimum end-user configuration required. Conventions are
+great when they work!
+
+> ### Verification modes
+>
+> While Hubs may require the use of a specific verification mode (both are
+> supported by `Zend\Feed\PubSubHubbub`), you may indicate a specific preference
+> using the `setPreferredVerificationMode()` method. In `sync` (synchronous)
+> mode, the Hub attempts to confirm a subscription as soon as it is received,
+> and before responding to the subscription request. In `async` (asynchronous)
+> mode, the Hub will return a response to the subscription request immediately,
+> and its verification request may occur at a later time. Since
+> `Zend\Feed\PubSubHubbub` implements the Subscriber verification role as a
+> separate callback class and requires the use of a backend storage medium, it
+> actually supports both transparently. In terms of end-user performance,
+> asynchronous verification is very much preferred to eliminate the impact of a
+> poorly performing Hub tying up end-user server resources and connections for
+> too long.
+
+Unsubscribing from a Topic follows the exact same pattern as the previous
+example, with the exception that we should call `unsubscribeAll()` instead. The
+parameters included are identical to a subscription request with the exception
+that `hub.mode` is set to "unsubscribe".
+
+By default, a new instance of `Zend\PubSubHubbub\Subscriber` will attempt to use
+a database backed storage medium which defaults to using the default zend-db
+adapter with a table name of "subscription". It is recommended to set a custom
+storage solution where these defaults are not apt either by passing in a new
+model supporting the required interface or by passing a new instance of
+`Zend\Db\TableGateway\TableGateway` to the default model's constructor to change
+the used table name.
+
+### Handling Subscriber Callbacks
+
+Whenever a subscription or unsubscription request is made, the Hub must verify
+the request by forwarding a new verification request to the callback URL set in
+the subscription or unsubscription parameters. To handle these Hub requests,
+which will include all future communications containing Topic (feed) updates,
+the callback URL should trigger the execution of an instance of
+`Zend\Feed\PubSubHubbub\Subscriber\Callback` to handle the request.
+
+The `Callback` class should be configured to use the same storage medium as the
+`Subscriber` class. The bulk of the work is handled internal to these classes.
+
+```php
+use Zend\Feed\PubSubHubbub\Model\Subscription;
+use Zend\Feed\PubSubHubbub\Subscriber\Callback;
+
+$storage = new Subscription();
+$callback = new Callback();
+$callback->setStorage($storage);
+$callback->handle();
+$callback->sendResponse();
+
+/*
+ * Check if the callback resulting in the receipt of a feed update.
+ * Otherwise it was either a (un)sub verification request or invalid request.
+ * Typically we need do nothing other than add feed update handling; the rest
+ * is handled internally by the class.
+ */
+if ($callback->hasFeedUpdate()) {
+    $feedString = $callback->getFeedUpdate();
+    /*
+     * Process the feed update asynchronously to avoid a Hub timeout.
+     */
+}
+```
+
+> #### Query and body parameters
+>
+> It should be noted that `Zend\Feed\PubSubHubbub\Subscriber\Callback` may
+> independently parse any incoming query string and other parameters. This is
+> necessary since PHP alters the structure and keys of a query string when it is
+> parsed into the `$_GET` or `$_POST` superglobals; for example, all duplicate
+> keys are ignored and periods are converted to underscores. Pubsubhubbub
+> features both of these in the query strings it generates.
+
+> #### Always delay feed processing
+>
+> It is essential that developers recognise that Hubs are only concerned with
+> sending requests and receiving a response which verifies its receipt. If a
+> feed update is received, it should never be processed on the spot since this
+> leaves the Hub waiting for a response. Rather, any processing should be
+> offloaded to another process or deferred until after a response has been
+> returned to the Hub. One symptom of a failure to promptly complete Hub
+> requests is that a Hub may continue to attempt delivery of the update or
+> verification request leading to duplicated update attempts being processed by
+> the Subscriber. This appears problematic, but in reality a Hub may apply a
+> timeout of just a few seconds, and if no response is received within that time
+> it may disconnect (assuming a delivery failure) and retry later. Note that
+> Hubs are expected to distribute vast volumes of updates so their resources are
+> stretched; please process feeds asynchronously (e.g. in a separate process or
+> a job queue or even a cronjob) as much as possible.
+
+### Setting Up And Using A Callback URL Route
+
+As noted earlier, the `Zend\Feed\PubSubHubbub\Subscriber\Callback` class
+receives the combined key associated with any subscription from the Hub via one
+of two methods. The technically preferred method is to add this key to the
+callback URL employed by the Hub in all future requests using a query string
+parameter with the key `xhub.subscription`. However, for historical reasons
+(primarily that this was not supported in Pubsubhubbub 0.1, and a late addition
+to 0.2 ), it is strongly recommended to use the most compatible means of adding
+this key to the callback URL by appending it to the URL's path.
+
+Thus the URL `http://www.example.com/callback?xhub.subscription=key` would become
+`http://www.example.com/callback/key`.
+
+Since the query string method is the default in anticipation of a greater level
+of future support for the full 0.2/0.3 specification, this requires some
+additional work to implement.
+
+The first step is to make the `Zend\Feed\PubSubHubbub\Subscriber\Callback` class
+aware of the path contained subscription key. It's manually injected; therefore
+it also requires manually defining a route for this purpose. This is achieved by
+called the method `Zend\Feed\PubSubHubbub\Subscriber\Callback::setSubscriptionKey()`
+with the parameter being the key value available from the router. The example
+below demonstrates this using a zend-mvc controller.
+
+```php
+use Zend\Feed\PubSubHubbub\Model\Subscription;
+use Zend\Feed\PubSubHubbub\Subscriber\Callback;
+use Zend\Mvc\Controller\AbstractActionController;
+
+class CallbackController extends AbstractActionController
+{
+
+    public function indexAction()
+    {
+        $storage = new Subscription();
+        $callback = new Callback();
+        $callback->setStorage($storage);
+
+        /*
+         * Inject subscription key parsing from URL path using
+         * a parameter from the router.
+         */
+        $subscriptionKey = $this->params()->fromRoute('subkey');
+        $callback->setSubscriptionKey($subscriptionKey);
+        $callback->handle();
+        $callback->sendResponse();
+
+        /*
+         * Check if the callback resulting in the receipt of a feed update.
+         * Otherwise it was either a (un)sub verification request or invalid
+         * request. Typically we need do nothing other than add feed update
+         * handling; the rest is handled internally by the class.
+         */
+        if ($callback->hasFeedUpdate()) {
+            $feedString = $callback->getFeedUpdate();
+            /*
+             *  Process the feed update asynchronously to avoid a Hub timeout.
+             */
+        }
+    }
+}
+```
+
+The example below illustrates adding a route mapping the path segment to a route
+parameter, using zend-mvc:
+
+```php
+use Zend\Mvc\Router\Http\Segment as SegmentRoute;;
+
+// Route defininition for enabling appending of a PuSH Subscription's lookup key
+$route = SegmentRoute::factory([
+   'route' => '/callback/:subkey',
+   'constraints' => [
+      'subkey' => '[a-z0-9]+',
+   ],
+   'defaults' => [
+      'controller' => 'application-index',
+      'action' => 'index',
+   ]
+]);
+```
diff --git a/web/vendor/zendframework/zend-feed/doc/book/reader.md b/web/vendor/zendframework/zend-feed/doc/book/reader.md
new file mode 100644
index 000000000..9a565a195
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/reader.md
@@ -0,0 +1,825 @@
+# Zend\\Feed\\Reader
+
+`Zend\Feed\Reader` is a component used to consume RSS and Atom feeds of
+any version, including RDF/RSS 1.0, RSS 2.0, Atom 0.3, and Atom 1.0. The API for
+retrieving feed data is deliberately simple since `Zend\Feed\Reader` is capable
+of searching any feed of any type for the information requested through the API.
+If the typical elements containing this information are not present, it will
+adapt and fall back on a variety of alternative elements instead. This ability
+to choose from alternatives removes the need for users to create their own
+abstraction layer on top of the component to make it useful or have any in-depth
+knowledge of the underlying standards, current alternatives, and namespaced
+extensions.
+
+Internally, the `Zend\Feed\Reader\Reader` class works almost entirely on the
+basis of making XPath queries against the feed XML's Document Object Model. This
+singular approach to parsing is consistent, and the component offers a plugin
+system to add to the Feed and Entry APIs by writing extensions on a similar
+basis.
+
+Performance is assisted in three ways. First of all, `Zend\Feed\Reader\Reader`
+supports caching using [zend-cache](https://github.com/zendframework/zend-cache)
+to maintain a copy of the original feed XML. This allows you to skip network
+requests for a feed URI if the cache is valid. Second, the Feed and Entry APIs
+are backed by an internal cache (non-persistent) so repeat API calls for the
+same feed will avoid additional DOM or XPath use. Thirdly, importing feeds from
+a URI can take advantage of HTTP Conditional `GET` requests which allow servers
+to issue an empty 304 response when the requested feed has not changed since the
+last time you requested it. In the final case, an zend-cache storage instance
+will hold the last received feed along with the ETag and Last-Modified header
+values sent in the HTTP response.
+
+`Zend\Feed\Reader\Reader` is not capable of constructing feeds, and delegates
+this responsibility to `Zend\Feed\Writer\Writer`.
+
+## Importing Feeds
+
+Feeds can be imported from a string, file or a URI. Importing from a URI can
+additionally utilise an HTTP Conditional `GET` request. If importing fails, an
+exception will be raised. The end result will be an object of type
+`Zend\Feed\Reader\Feed\AbstractFeed`, the core implementations of which are
+`Zend\Feed\Reader\Feed\Rss` and `Zend\Feed\Reader\Feed\Atom`. Both objects
+support multiple (all existing) versions of these broad feed types.
+
+In the following example, we import an RDF/RSS 1.0 feed and extract some basic
+information that can be saved to a database or elsewhere.
+
+```php
+$feed = Zend\Feed\Reader\Reader::import('http://www.planet-php.net/rdf/');
+$data = [
+    'title'        => $feed->getTitle(),
+    'link'         => $feed->getLink(),
+    'dateModified' => $feed->getDateModified(),
+    'description'  => $feed->getDescription(),
+    'language'     => $feed->getLanguage(),
+    'entries'      => [],
+];
+
+foreach ($feed as $entry) {
+    $edata = [
+        'title'        => $entry->getTitle(),
+        'description'  => $entry->getDescription(),
+        'dateModified' => $entry->getDateModified(),
+        'authors'      => $entry->getAuthors(),
+        'link'         => $entry->getLink(),
+        'content'      => $entry->getContent(),
+    ];
+    $data['entries'][] = $edata;
+}
+```
+
+> ## Importing requires an HTTP client
+>
+> To import a feed, you will need to have an [HTTP client](zend.feed.http-clients)
+> available. 
+>
+> If you are not using zend-http, you will need to inject `Reader` with the HTTP
+> client. See the [section on providing a client to Reader](http-clients.md#providing-a-client-to-reader).
+
+The example above demonstrates `Zend\Feed\Reader\Reader`'s API, and it also
+demonstrates some of its internal operation. In reality, the RDF feed selected
+does not have any native date or author elements; however it does utilise the
+Dublin Core 1.1 module which offers namespaced creator and date elements.
+`Zend\Feed\Reader\Reader` falls back on these and similar options if no relevant
+native elements exist. If it absolutely cannot find an alternative it will
+return `NULL`, indicating the information could not be found in the feed. You
+should note that classes implementing `Zend\Feed\Reader\Feed\AbstractFeed` also
+implement the SPL `Iterator` and `Countable` interfaces.
+
+Feeds can also be imported from strings or files.
+
+```php
+// from a URI
+$feed = Zend\Feed\Reader\Reader::import('http://www.planet-php.net/rdf/');
+
+// from a String
+$feed = Zend\Feed\Reader\Reader::importString($feedXmlString);
+
+// from a file
+$feed = Zend\Feed\Reader\Reader::importFile('./feed.xml');
+```
+
+## Retrieving Underlying Feed and Entry Sources
+
+`Zend\Feed\Reader\Reader` does its best not to stick you in a narrow confine. If
+you need to work on a feed outside of `Zend\Feed\Reader\Reader`, you can extract
+the base DOMDocument or DOMElement objects from any class, or even an XML
+string containing these. Also provided are methods to extract the current
+DOMXPath object (with all core and extension namespaces registered) and the
+correct prefix used in all XPath queries for the current feed or entry. The
+basic methods to use (on any object) are `saveXml()`, `getDomDocument()`,
+`getElement()`, `getXpath()` and `getXpathPrefix()`. These will let you break
+free of `Zend\Feed\Reader` and do whatever else you want.
+
+- `saveXml()` returns an XML string containing only the element representing the
+  current object.
+- `getDomDocument()` returns the DOMDocument object representing the entire feed
+  (even if called from an entry object).
+- `getElement()` returns the DOMElement of the current object (i.e. the feed or
+  current entry).
+- `getXpath()` returns the DOMXPath object for the current feed (even if called
+  from an entry object) with the namespaces of the current feed type and all
+  loaded extensions pre-registered.
+- `getXpathPrefix()` returns the query prefix for the current object (i.e. the
+  feed or current entry) which includes the correct XPath query path for that
+  specific feed or entry.
+
+Let's look at an example where a feed might include an RSS extension not
+supported by `Zend\Feed\Reader\Reader` out of the box. Notably, you could write
+and register an extension (covered later) to do this, but that's not always
+warranted for a quick check. You must register any new namespaces on the
+DOMXPath object before use unless they are registered by `Zend\Feed\Reader` or
+an extension beforehand.
+
+```php
+$feed        = Zend\Feed\Reader\Reader::import('http://www.planet-php.net/rdf/');
+$xpathPrefix = $feed->getXpathPrefix();
+$xpath       = $feed->getXpath();
+$xpath->registerNamespace('admin', 'http://webns.net/mvcb/');
+$reportErrorsTo = $xpath->evaluate(
+    'string(' . $xpathPrefix . '/admin:errorReportsTo)'
+);
+```
+
+> ### Do not register duplicate namespaces
+>
+> If you register an already registered namespace with a different prefix name
+> to that used internally by `Zend\Feed\Reader\Reader`, it will break the
+> internal operation of this component.
+
+## Cache Support and Intelligent Requests
+
+### Adding Cache Support to Zend\\Feed\\Reader\\Reader
+
+`Zend\Feed\Reader\Reader` supports using a
+[zend-cache](https://github.com/zendframework/zend-cache) storage instance to
+cache feeds (as XML) to avoid unnecessary network requests. To add a cache,
+create and configure your cache instance, and then tell
+`Zend\Feed\Reader\Reader` to use it. The cache key used is
+"`Zend\Feed\Reader\\`" followed by the MD5 hash of the feed's URI.
+
+```php
+$cache = Zend\Cache\StorageFactory::adapterFactory('Memory');
+Zend\Feed\Reader\Reader::setCache($cache);
+```
+
+### HTTP Conditional GET Support
+
+The big question often asked when importing a feed frequently is if it has even
+changed. With a cache enabled, you can add HTTP Conditional `GET` support to
+your arsenal to answer that question.
+
+Using this method, you can request feeds from URIs and include their last known
+ETag and Last-Modified response header values with the request (using the
+If-None-Match and If-Modified-Since headers). If the feed on the server remains
+unchanged, you should receive a 304 response which tells
+`Zend\Feed\Reader\Reader` to use the cached version. If a full feed is sent in a
+response with a status code of 200, this means the feed has changed and
+`Zend\Feed\Reader\Reader` will parse the new version and save it to the cache.
+It will also cache the new ETag and Last-Modified header values for future use.
+
+> #### Conditional GET requires a HeaderAwareClientInterface
+>
+> Conditional GET support only works for `Zend\Feed\Reader\Http\HeaderAwareClientInterface`
+> client implementations, as it requires the ability to send HTTP headers.
+
+These "conditional" requests are not guaranteed to be supported by the server
+you request a *URI* of, but can be attempted regardless. Most common feed
+sources like blogs should however have this supported. To enable conditional
+requests, you will need to provide a cache to `Zend\Feed\Reader\Reader`.
+
+```php
+$cache = Zend\Cache\StorageFactory::adapterFactory('Memory');
+
+Zend\Feed\Reader\Reader::setCache($cache);
+Zend\Feed\Reader\Reader::useHttpConditionalGet();
+
+$feed = Zend\Feed\Reader\Reader::import('http://www.planet-php.net/rdf/');
+```
+
+In the example above, with HTTP Conditional `GET` requests enabled, the response
+header values for ETag and Last-Modified will be cached along with the feed. For
+the the cache's lifetime, feeds will only be updated on the cache if a non-304
+response is received containing a valid RSS or Atom XML document.
+
+If you intend on managing request headers from outside
+`Zend\Feed\Reader\Reader`, you can set the relevant If-None-Matches and
+If-Modified-Since request headers via the URI import method.
+
+```php
+$lastEtagReceived = '5e6cefe7df5a7e95c8b1ba1a2ccaff3d';
+$lastModifiedDateReceived = 'Wed, 08 Jul 2009 13:37:22 GMT';
+$feed = Zend\Feed\Reader\Reader::import(
+    $uri, $lastEtagReceived, $lastModifiedDateReceived
+);
+```
+
+## Locating Feed URIs from Websites
+
+These days, many websites are aware that the location of their XML feeds is not
+always obvious. A small RDF, RSS, or Atom graphic helps when the user is reading
+the page, but what about when a machine visits trying to identify where your
+feeds are located? To assist in this, websites may point to their feeds using
+`<link>` tags in the `<head>` section of their HTML. To take advantage
+of this, you can use `Zend\Feed\Reader\Reader` to locate these feeds using the
+static `findFeedLinks()` method.
+
+This method calls any URI and searches for the location of RSS, RDF, and Atom
+feeds assuming, the website's HTML contains the relevant links. It then returns
+a value object where you can check for the existence of a RSS, RDF or Atom feed
+URI.
+
+The returned object is an `ArrayObject` subclass called
+`Zend\Feed\Reader\FeedSet`, so you can cast it to an array or iterate over it to
+access all the detected links. However, as a simple shortcut, you can just grab
+the first RSS, RDF, or Atom link using its public properties as in the example
+below. Otherwise, each element of the `ArrayObject` is a simple array with the
+keys `type` and `uri` where the type is one of "rdf", "rss", or "atom".
+
+```php
+$links = Zend\Feed\Reader\Reader::findFeedLinks('http://www.planet-php.net');
+
+if (isset($links->rdf)) {
+    echo $links->rdf, "\n"; // http://www.planet-php.org/rdf/
+}
+if (isset($links->rss)) {
+    echo $links->rss, "\n"; // http://www.planet-php.org/rss/
+}
+if (isset($links->atom)) {
+    echo $links->atom, "\n"; // http://www.planet-php.org/atom/
+}
+```
+
+Based on these links, you can then import from whichever source you wish in the usual manner.
+
+> ### Finding feed links requires an HTTP client
+>
+> To find feed links, you will need to have an [HTTP client](zend.feed.http-clients)
+> available. 
+>
+> If you are not using zend-http, you will need to inject `Reader` with the HTTP
+> client. See the [section on providing a client to Reader](http-clients.md#providing-a-client-to-reader).
+
+This quick method only gives you one link for each feed type, but websites may
+indicate many links of any type. Perhaps it's a news site with a RSS feed for
+each news category. You can iterate over all links using the ArrayObject's
+iterator.
+
+```php
+$links = Zend\Feed\Reader::findFeedLinks('http://www.planet-php.net');
+
+foreach ($links as $link) {
+    echo $link['href'], "\n";
+}
+```
+
+## Attribute Collections
+
+In an attempt to simplify return types, return types from the various feed and
+entry level methods may include an object of type
+`Zend\Feed\Reader\Collection\AbstractCollection`. Despite the special class name
+which I'll explain below, this is just a simple subclass of SPL's `ArrayObject`.
+
+The main purpose here is to allow the presentation of as much data as possible
+from the requested elements, while still allowing access to the most relevant
+data as a simple array. This also enforces a standard approach to returning such
+data which previously may have wandered between arrays and objects.
+
+The new class type acts identically to `ArrayObject` with the sole addition
+being a new method `getValues()` which returns a simple flat array containing
+the most relevant information.
+
+A simple example of this is `Zend\Feed\Reader\Reader\FeedInterface::getCategories()`.
+When used with any RSS or Atom feed, this method will return category data as a
+container object called `Zend\Feed\Reader\Collection\Category`. The container
+object will contain, per category, three fields of data: term, scheme, and label.
+The "term" is the basic category name, often machine readable (i.e. plays nice
+with URIs). The scheme represents a categorisation scheme (usually a URI
+identifier) also known as a "domain" in RSS 2.0. The "label" is a human readable
+category name which supports HTML entities. In RSS 2.0, there is no label
+attribute so it is always set to the same value as the term for convenience.
+
+To access category labels by themselves in a simple value array, you might
+commit to something like:
+
+```php
+$feed = Zend\Feed\Reader\Reader::import('http://www.example.com/atom.xml');
+$categories = $feed->getCategories();
+$labels = [];
+foreach ($categories as $cat) {
+    $labels[] = $cat['label']
+}
+```
+
+It's a contrived example, but the point is that the labels are tied up with
+other information.
+
+However, the container class allows you to access the "most relevant" data as a
+simple array using the `getValues()` method. The concept of "most relevant" is
+obviously a judgement call. For categories it means the category labels (not the
+terms or schemes) while for authors it would be the authors' names (not their
+email addresses or URIs). The simple array is flat (just values) and passed
+through `array_unique()` to remove duplication.
+
+```php
+$feed = Zend\Feed\Reader\Reader::import('http://www.example.com/atom.xml');
+$categories = $feed->getCategories();
+$labels = $categories->getValues();
+```
+
+The above example shows how to extract only labels and nothing else thus giving
+simple access to the category labels without any additional work to extract that
+data by itself.
+
+## Retrieving Feed Information
+
+Retrieving information from a feed (we'll cover entries and items in the next
+section though they follow identical principals) uses a clearly defined API
+which is exactly the same regardless of whether the feed in question is RSS,
+RDF, or Atom. The same goes for sub-versions of these standards and we've tested
+every single RSS and Atom version. While the underlying feed XML can differ
+substantially in terms of the tags and elements they present, they nonetheless
+are all trying to convey similar information and to reflect this all the
+differences and wrangling over alternative tags are handled internally by
+`Zend\Feed\Reader\Reader` presenting you with an identical interface for each.
+Ideally, you should not have to care whether a feed is RSS or Atom so long as
+you can extract the information you want.
+
+> ### RSS feeds vary widely
+>
+> While determining common ground between feed types is itself complex, it
+> should be noted that *RSS* in particular is a constantly disputed
+> "specification". This has its roots in the original RSS 2.0 document, which
+> contains ambiguities and does not detail the correct treatment of all
+> elements. As a result, this component rigorously applies the RSS 2.0.11
+> Specification published by the RSS Advisory Board and its accompanying RSS
+> Best Practices Profile. No other interpretation of RSS
+> 2.0 will be supported, though exceptions may be allowed where it does not
+> directly prevent the application of the two documents mentioned above.
+
+Of course, we don't live in an ideal world, so there may be times the API just
+does not cover what you're looking for. To assist you, `Zend\Feed\Reader\Reader`
+offers a plugin system which allows you to write extensions to expand the core
+API and cover any additional data you are trying to extract from feeds. If
+writing another extension is too much trouble, you can simply grab the
+underlying DOM or XPath objects and do it by hand in your application. Of
+course, we really do encourage writing an extension simply to make it more
+portable and reusable, and useful extensions may be proposed to the component
+for formal addition.
+
+Below is a summary of the Core API for feeds. You should note it comprises not
+only the basic RSS and Atom standards, but also accounts for a number of
+included extensions bundled with `Zend\Feed\Reader\Reader`. The naming of these
+extension sourced methods remain fairly generic; all Extension methods operate
+at the same level as the Core API though we do allow you to retrieve any
+specific extension object separately if required.
+
+### Feed Level API Methods
+
+Method | Description
+------ | -----------
+`getId()` | Returns a unique ID associated with this feed
+`getTitle()` |  Returns the title of the feed
+`getDescription()` | Returns the text description of the feed.
+`getLink()` | Returns a URI to the HTML website containing the same or similar information as this feed (i.e. if the feed is from a blog, it should provide the blog's URI where the HTML version of the entries can be read).
+`getFeedLink()` | Returns the URI of this feed, which may be the same as the URI used to import the feed. There are important cases where the feed link may differ because the source URI is being updated and is intended to be removed in the future.
+`getAuthors()` | Returns an object of type `Zend\Feed\Reader\Collection\Author` which is an `ArrayObject` whose elements are each simple arrays containing any combination of the keys "name", "email" and "uri". Where irrelevant to the source data, some of these keys may be omitted.
+`getAuthor(integer $index = 0)` | Returns either the first author known, or with the optional $index parameter any specific index on the array of authors as described above (returning `NULL` if an invalid index).
+`getDateCreated()` | Returns the date on which this feed was created. Generally only applicable to Atom, where it represents the date the resource described by an Atom 1.0 document was created. The returned date will be a `DateTime` object.
+`getDateModified()` | Returns the date on which this feed was last modified. The returned date will be a `DateTime` object.
+`getLastBuildDate()` |  Returns the date on which this feed was last built. The returned date will be a `DateTime` object. This is only supported by RSS; Atom feeds will always return `NULL`.
+`getLanguage()` | Returns the language of the feed (if defined) or simply the language noted in the XML document.
+`getGenerator()` |  Returns the generator of the feed, e.g. the software which generated it. This may differ between RSS and Atom since Atom defines a different notation.
+`getCopyright()` | Returns any copyright notice associated with the feed.
+`getHubs()` | Returns an array of all Hub Server URI endpoints which are advertised by the feed for use with the Pubsubhubbub Protocol, allowing subscriptions to the feed for real-time updates.
+`getCategories()` | Returns a `Zend\Feed\Reader\Collection\Category` object containing the details of any categories associated with the overall feed. The supported fields include "term" (the machine readable category name), "scheme" (the categorisation scheme and domain for this category), and "label" (a HTML decoded human readable category name). Where any of the three fields are absent from the field, they are either set to the closest available alternative or, in the case of "scheme", set to `NULL`.
+`getImage()` | Returns an array containing data relating to any feed image or logo, or `NULL` if no image found. The resulting array may contain the following keys: uri, link, title, description, height, and width. Atom logos only contain a URI so the remaining metadata is drawn from RSS feeds only.
+
+Given the variety of feeds in the wild, some of these methods will undoubtedly
+return `NULL` indicating the relevant information couldn't be located. Where
+possible, `Zend\Feed\Reader\Reader` will fall back on alternative elements
+during its search. For example, searching an RSS feed for a modification date is
+more complicated than it looks. RSS 2.0 feeds should include a `<lastBuildDate>`
+tag and/or a `<pubDate>` element. But what if it doesn't? Maybe this is an RSS
+1.0 feed? Perhaps it instead has an `<atom:updated>` element with identical
+information (Atom may be used to supplement RSS syntax)? Failing that, we
+could simply look at the entries, pick the most recent, and use its `<pubDate>`
+element. Assuming it exists, that is. Many feeds also use Dublin Core 1.0 or 1.1
+`<dc:date>` elements for feeds and entries. Or we could find Atom lurking again.
+
+The point is, `Zend\Feed\Reader\Reader` was designed to know this. When you ask
+for the modification date (or anything else), it will run off and search for all
+these alternatives until it either gives up and returns `NULL`, or finds an
+alternative that should have the right answer.
+
+In addition to the above methods, all feed objects implement methods for
+retrieving the DOM and XPath objects for the current feeds as described
+earlier. Feed objects also implement the SPL Iterator and Countable
+interfaces. The extended API is summarised below.
+
+### Extended Feed API Methods
+
+Method | Description
+------ | -----------
+`getDomDocument()` | Returns the parent DOMDocument object for the entire source XML document.
+`getElement()` | Returns the current feed level DOMElement object.
+`saveXml()` | Returns a string containing an XML document of the entire feed element (this is not the original document, but a rebuilt version).
+`getXpath()` | Returns the DOMXPath object used internally to run queries on the DOMDocument object (this includes core and extension namespaces pre-registered).
+`getXpathPrefix()` | Returns the valid DOM path prefix prepended to all XPath queries matching the feed being queried.
+`getEncoding()` | Returns the encoding of the source XML document (note: this cannot account for errors such as the server sending documents in a different encoding). Where not defined, the default UTF-8 encoding of Unicode is applied.
+`count()` | Returns a count of the entries or items this feed contains (implements SPL `Countable` interface)
+`current()` | Returns either the current entry (using the current index from `key()`).
+`key()` | Returns the current entry index.
+`next()` | Increments the entry index value by one.
+`rewind()` | Resets the entry index to 0.
+`valid()` | Checks that the current entry index is valid, i.e. it does not fall below 0 and does not exceed the number of entries existing.
+`getExtensions()` | Returns an array of all extension objects loaded for the current feed (note: both feed-level and entry-level extensions exist, and only feed-level extensions are returned here). The array keys are of the form `{ExtensionName}_Feed`.
+`getExtension(string $name)` | Returns an extension object for the feed registered under the provided name. This allows more fine-grained access to extensions which may otherwise be hidden within the implementation of the standard API methods.
+`getType()` | Returns a static class constant (e.g.  `Zend\Feed\Reader\Reader::TYPE_ATOM_03`, i.e. "Atom 0.3"), indicating exactly what kind of feed is being consumed.
+
+## Retrieving Entry/Item Information
+
+Retrieving information for specific entries or items (depending on whether you
+speak Atom or RSS) is identical to feed level data. Accessing entries is
+simply a matter of iterating over a feed object or using the SPL `Iterator`
+interface feed objects implement, and calling the appropriate method on each.
+
+### Entry API Methods
+
+Method | Description
+------ | -----------
+`getId()` | Returns a unique ID for the current entry.
+`getTitle()` | Returns the title of the current entry.
+`getDescription()` | Returns a description of the current entry.
+`getLink()` | Returns a URI to the HTML version of the current entry.
+`getPermaLink()` | Returns the permanent link to the current entry. In most cases, this is the same as using `getLink()`.
+`getAuthors()` | Returns an object of type `Zend\Feed\Reader\Collection\Author`, which is an `ArrayObject` whose elements are each simple arrays containing any combination of the keys "name", "email" and "uri". Where irrelevant to the source data, some of these keys may be omitted.
+`getAuthor(integer $index = 0)` | Returns either the first author known, or, with the optional `$index` parameter, any specific index on the array of Authors as described above (returning `NULL` if an invalid index).
+`getDateCreated()` | Returns the date on which the current entry was created. Generally only applicable to Atom where it represents the date the resource described by an Atom 1.0 document was created.
+`getDateModified()` | Returns the date on which the current entry was last modified.
+`getContent()` | Returns the content of the current entry (this has any entities reversed if possible, assuming the content type is HTML). The description is returned if a separate content element does not exist.
+`getEnclosure()` | Returns an array containing the value of all attributes from a multi-media `<enclosure>` element including as array keys: url, length, type. In accordance with the RSS Best Practices Profile of the RSS Advisory Board, no support is offers for multiple enclosures since such support forms no part of the RSS specification.
+`getCommentCount()` | Returns the number of comments made on this entry at the time the feed was last generated.
+`getCommentLink()` | Returns a URI pointing to the HTML page where comments can be made on this entry.
+`getCommentFeedLink([string $type = ‘atom'|'rss'])` | Returns a URI pointing to a feed of the provided type containing all comments for this entry (type defaults to Atom/RSS depending on current feed type).
+`getCategories()` | Returns a `Zend\Feed\Reader\Collection\Category` object containing the details of any categories associated with the entry. The supported fields include "term" (the machine readable category name), "scheme" (the categorisation scheme and domain for this category), and "label" (an HTML-decoded human readable category name). Where any of the three fields are absent from the field, they are either set to the closest available alternative or, in the case of "scheme", set to `NULL`.
+
+The extended API for entries is identical to that for feeds with the exception
+of the `Iterator` methods, which are not needed here.
+
+> ### Modified vs Created dates
+> 
+> There is often confusion over the concepts of *modified* and *created* dates.
+> In Atom, these are two clearly defined concepts (so knock yourself out) but in
+> RSS they are vague. RSS 2.0 defines a single `<pubDate>` element which
+> typically refers to the date this entry was published, i.e.  a creation date of
+> sorts. This is not always the case, and it may change with updates or not. As a
+> result, if you really want to check whether an entry has changed, don't rely on
+> the results of `getDateModified()`. Instead, consider tracking the MD5 hash of
+> three other elements concatenated, e.g. using `getTitle()`, `getDescription()`,
+> and `getContent()`. If the entry was truly updated, this hash computation will
+> give a different result than previously saved hashes for the same entry. This
+> is obviously content oriented, and will not assist in detecting changes to
+> other relevant elements.  Atom feeds should not require such steps.
+
+> Further muddying the waters, dates in feeds may follow different standards.
+> Atom and Dublin Core dates should follow ISO 8601, and RSS dates should
+> follow RFC 822 or RFC 2822 (which is also common). Date methods will throw an
+> exception if `DateTime` cannot load the date string using one of the above
+> standards, or the PHP recognised possibilities for RSS dates.
+
+> ### Validation
+>
+> The values returned from these methods are not validated. This means users
+> must perform validation on all retrieved data including the filtering of any
+> HTML such as from `getContent()` before it is output from your application.
+> Remember that most feeds come from external sources, and therefore the default
+> assumption should be that they cannot be trusted.
+
+### Extended Entry Level API Methods
+
+Method | Description
+------ | -----------
+`getDomDocument()` | Returns the parent DOMDocument object for the entire feed (not just the current entry).
+`getElement()` | Returns the current entry level DOMElement object.
+`getXpath()` | Returns the DOMXPath object used internally to run queries on the DOMDocument object (this includes core and extension namespaces pre-registered).
+`getXpathPrefix()` | Returns the valid DOM path prefix prepended to all XPath queries matching the entry being queried.
+`getEncoding()` | Returns the encoding of the source XML document (note: this cannot account for errors such as the server sending documents in a different encoding). The default encoding applied in the absence of any other is the UTF-8 encoding of Unicode.
+`getExtensions()` | Returns an array of all extension objects loaded for the current entry (note: both feed-level and entry-level extensions exist, and only entry-level extensions are returned here). The array keys are in the form `{ExtensionName}Entry`.
+`getExtension(string $name)` | Returns an extension object for the entry registered under the provided name. This allows more fine-grained access to extensions which may otherwise be hidden within the implementation of the standard API methods.
+`getType()` | Returns a static class constant (e.g. `Zend\Feed\Reader\Reader::TYPE_ATOM_03`, i.e. "Atom 0.3") indicating exactly what kind of feed is being consumed.
+
+## Extending Feed and Entry APIs
+
+Extending `Zend\Feed\Reader\Reader` allows you to add methods at both the feed
+and entry level which cover the retrieval of information not already supported
+by `Zend\Feed\Reader\Reader`. Given the number of RSS and Atom extensions that
+exist, this is a good thing, since `Zend\Feed\Reader\Reader` couldn't possibly
+add everything.
+
+There are two types of extensions possible, those which retrieve information
+from elements which are immediate children of the root element (e.g.
+`<channel>` for RSS or `<feed>` for Atom), and those who retrieve information
+from child elements of an entry (e.g. `<item>` for RSS or `<entry>` for Atom).
+On the filesystem, these are grouped as classes within a namespace based on the
+extension standard's name. For example, internally we have
+`Zend\Feed\Reader\Extension\DublinCore\Feed` and
+`Zend\Feed\Reader\Extension\DublinCore\Entry` classes which are two extensions
+implementing Dublin Core 1.0 and 1.1 support.
+
+Extensions are loaded into `Zend\Feed\Reader\Reader` using an "extension
+manager". Extension managers must implement `Zend\Feed\Reader\ExtensionManagerInterface`.
+Three implementations exist:
+
+- `Zend\Feed\Reader\StandaloneExtensionManager` is a hard-coded implementation
+  seeded with all feed and entry implementations. You can extend it to add
+  extensions, though it's likely easier to copy and paste it, adding your
+  changes.
+- `Zend\Feed\Reader\ExtensionPluginManager` is a `Zend\ServiceManager\AbstractPluginManager`
+  implementation, `Zend\Feed\Reader\ExtensionManager`; as such, you can extend
+  it to add more extensions, use a `Zend\ServiceManager\ConfigInterface` instance
+  to inject it with more extensions, or use its public API for adding services
+  (e.g., `setService()`, `setFactory()`, etc.). This implementation *does not*
+  implement `ExtensionManagerInterface`, and must be used with `ExtensionManager`.
+- `Zend\Feed\Reader\ExtensionManager` exists for legacy purposes; prior to 2.3,
+  this was an `AbstractPluginManager` implementation, and the only provided
+  extension manager. It now implements `ExtensionManagerInterface`, and acts as
+  a decorator for `ExtensionPluginManager`.
+
+By default, `Zend\Feed\Reader\Reader` composes a `StandaloneExtensionManager`. You
+can inject an alternate implementation using `Reader::setExtensionManager()`:
+
+```php
+$extensions = new Zend\Feed\Reader\ExtensionPluginManager();
+Zend\Feed\Reader\Reader::setExtensionManager(
+    new ExtensionManager($extensions)
+);
+```
+
+The shipped implementations all provide the default extensions (so-called
+"Core Extensions") used internally by `Zend\Feed\Reader\Reader`. These
+include:
+
+Extension | Description
+--------- | -----------
+DublinCore (Feed and Entry) | Implements support for Dublin Core Metadata Element Set 1.0 and 1.1.
+Content (Entry only) | Implements support for Content 1.0.
+Atom (Feed and Entry) | Implements support for Atom 0.3 and Atom 1.0.
+Slash | Implements support for the Slash RSS 1.0 module.
+WellFormedWeb | Implements support for the Well Formed Web CommentAPI 1.0.
+Thread | Implements support for Atom Threading Extensions as described in RFC 4685.
+Podcast | Implements support for the Podcast 1.0 DTD from Apple.
+
+The core extensions are somewhat special since they are extremely common and
+multi-faceted. For example, we have a core extension for Atom. Atom is
+implemented as an extension (not just a base class) because it doubles as a
+valid RSS module; you can insert Atom elements into RSS feeds.  I've even seen
+RDF feeds which use a lot of Atom in place of more common extensions like
+Dublin Core.
+
+The following is a list of non-Core extensions that are offered, but not registered 
+by default. If you want to use them, you'll need to
+tell `Zend\Feed\Reader\Reader` to load them in advance of importing a feed.
+Additional non-Core extensions will be included in future iterations of the
+component.
+
+Extension | Description
+--------- | -----------
+Syndication | Implements Syndication 1.0 support for RSS feeds.
+CreativeCommons | An RSS module that adds an element at the `<channel>` or `<item>` level that specifies which Creative Commons license applies.
+
+`Zend\Feed\Reader\Reader` requires you to explicitly register non-Core
+extensions in order to expose their API to feed and entry objects.  Below, we
+register the optional Syndication extension, and discover that it can be
+directly called from the entry API without any effort. (Note that
+extension names are case sensitive and use camelCasing for multiple terms.)
+
+```php
+use Zend\Feed\Reader\Reader;
+
+Reader::registerExtension('Syndication');
+$feed = Reader::import('http://rss.slashdot.org/Slashdot/slashdot');
+$updatePeriod = $feed->getUpdatePeriod();
+```
+
+In the simple example above, we checked how frequently a feed is being updated
+using the `getUpdatePeriod()` method. Since it's not part of
+`Zend\Feed\Reader\Reader`'s core API, it could only be a method supported by
+the newly registered Syndication extension.
+
+As you can also notice, methods provided by extensions are accessible from the
+main API using method overloading. As an alternative, you can also directly
+access any extension object for a similar result as seen below.
+
+```php
+use Zend\Feed\Reader\Reader;
+
+Reader::registerExtension('Syndication');
+$feed = Reader::import('http://rss.slashdot.org/Slashdot/slashdot');
+$syndication = $feed->getExtension('Syndication');
+$updatePeriod = $syndication->getUpdatePeriod();
+```
+
+### Writing Zend\\Feed\\Reader Extensions
+
+Inevitably, there will be times when the `Zend\Feed\Reader` API is just
+not capable of getting something you need from a feed or entry. You can use the
+underlying source objects, like DOMDocument, to get these by hand; however, there
+is a more reusable method available: you can write extensions supporting these new
+queries.
+
+As an example, let's take the case of a purely fictitious corporation named
+Jungle Books. Jungle Books have been publishing a lot of reviews on books they
+sell (from external sources and customers), which are distributed as an RSS 2.0
+feed. Their marketing department realises that web applications using this feed
+cannot currently figure out exactly what book is being reviewed. To make life
+easier for everyone, they determine that the geek department needs to extend
+RSS 2.0 to include a new element per entry supplying the ISBN-10 or ISBN-13
+number of the publication the entry concerns. They define the new `<isbn>`
+element quite simply with a standard name and namespace URI:
+
+- Name: JungleBooks 1.0
+- Namespace URI: http://example.com/junglebooks/rss/module/1.0/
+
+A snippet of RSS containing this extension in practice could be something
+similar to:
+
+```xml
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="2.0"
+   xmlns:content="http://purl.org/rss/1.0/modules/content/"
+   xmlns:jungle="http://example.com/junglebooks/rss/module/1.0/">
+<channel>
+    <title>Jungle Books Customer Reviews</title>
+    <link>http://example.com/junglebooks</link>
+    <description>Many book reviews!</description>
+    <pubDate>Fri, 26 Jun 2009 19:15:10 GMT</pubDate>
+    <jungle:dayPopular>
+        http://example.com/junglebooks/book/938
+    </jungle:dayPopular>
+    <item>
+        <title>Review Of Flatland: A Romance of Many Dimensions</title>
+        <link>http://example.com/junglebooks/review/987</link>
+        <author>Confused Physics Student</author>
+        <content:encoded>
+        A romantic square?!
+        </content:encoded>
+        <pubDate>Thu, 25 Jun 2009 20:03:28 -0700</pubDate>
+        <jungle:isbn>048627263X</jungle:isbn>
+    </item>
+</channel>
+</rss>
+```
+
+Implementing this new ISBN element as a simple entry level extension would
+require the following class (using your own namespace).
+
+```php
+namespace My\FeedReader\Extension\JungleBooks;
+
+use Zend\Feed\Reader\Extension\AbstractEntry;
+
+class Entry extends AbstractEntry
+{
+    public function getIsbn()
+    {
+        if (isset($this->data['isbn'])) {
+            return $this->data['isbn'];
+        }
+
+        $isbn = $this->xpath->evaluate(
+            'string(' . $this->getXpathPrefix() . '/jungle:isbn)'
+        );
+
+        if (! $isbn) {
+            $isbn = null;
+        }
+
+        $this->data['isbn'] = $isbn;
+        return $this->data['isbn'];
+    }
+
+    protected function registerNamespaces()
+    {
+        $this->xpath->registerNamespace(
+            'jungle',
+            'http://example.com/junglebooks/rss/module/1.0/'
+        );
+    }
+}
+```
+
+This extension creates a new method `getIsbn()`, which runs an XPath query on
+the current entry to extract the ISBN number enclosed by the `<jungle:isbn>`
+element. It can optionally store this to the internal non-persistent cache (no
+need to keep querying the DOM if it's called again on the same entry). The
+value is returned to the caller. At the end we have a protected method (it's
+abstract, making it required by implementations) which registers the Jungle
+Books namespace for their custom RSS module. While we call this an RSS module,
+there's nothing to prevent the same element being used in Atom feeds; all
+extensions which use the prefix provided by `getXpathPrefix()` are actually
+neutral and work on RSS or Atom feeds with no extra code.
+
+Since this extension is stored outside of zend-feed, you'll need to ensure your
+application can autoload it. Once that's in place, you will also need to ensure
+your extension manager knows about it, and then register the extension with
+`Zend\Feed\Reader\Reader`.
+
+The following example uses `Zend\Feed\Reader\ExtensionPluginManager` to manage
+extensions, as it provides the ability to register new extensions without
+requiring extension of the plugin manager itself. To use it, first intall
+zend-servicemanager:
+
+```bash
+$ composer require zendframework/zend-servicemanager
+```
+
+From there:
+
+```php
+use My\FeedReader\Extension\JungleBooks;
+use Zend\Feed\Reader\ExtensionManager;
+use Zend\Feed\Reader\ExtensionPluginManager;
+use Zend\Feed\Reader\Reader;
+
+$extensions = new ExtensionPluginManager();
+$extensions->setInvokableClass('JungleBooks\Entry', JungleBooks\Entry::class);
+Reader::setExtensionManager(new ExtensionManager($extensions));
+Reader::registerExtension('JungleBooks');
+
+$feed = Reader::import('http://example.com/junglebooks/rss');
+
+// ISBN for whatever book the first entry in the feed was concerned with
+$firstIsbn = $feed->current()->getIsbn();
+```
+
+Writing a feed extension is not much different. The example feed from earlier
+included an unmentioned `<jungle:dayPopular>` element which Jungle Books have
+added to their standard to include a link to the day's most popular book (in
+terms of visitor traffic). Here's an extension which adds a
+`getDaysPopularBookLink()` method to the feel level API.
+
+```php
+namespace My\FeedReader\Extension\JungleBooks;
+
+use Zend\Feed\Reader\Extension\AbstractFeed;
+
+class Feed extends AbstractFeed
+{
+    public function getDaysPopularBookLink()
+    {
+        if (isset($this->data['dayPopular'])) {
+            return $this->data['dayPopular'];
+        }
+
+        $dayPopular = $this->xpath->evaluate(
+            'string(' . $this->getXpathPrefix() . '/jungle:dayPopular)'
+        );
+
+        if (!$dayPopular) {
+            $dayPopular = null;
+        }
+
+        $this->data['dayPopular'] = $dayPopular;
+        return $this->data['dayPopular'];
+    }
+
+    protected function registerNamespaces()
+    {
+        $this->xpath->registerNamespace(
+            'jungle',
+            'http://example.com/junglebooks/rss/module/1.0/'
+        );
+    }
+}
+```
+
+Let's add to the previous example; we'll register the new class with the
+extension manager, and then demonstrate using the newly exposed method:
+
+```php
+use My\FeedReader\Extension\JungleBooks;
+use Zend\Feed\Reader\ExtensionManager;
+use Zend\Feed\Reader\ExtensionPluginManager;
+use Zend\Feed\Reader\Reader;
+
+$extensions = new ExtensionPluginManager();
+$extensions->setInvokableClass('JungleBooks\Entry', JungleBooks\Entry::class);
+$extensions->setInvokableClass('JungleBooks\Feed', JungleBooks\Feed::class);
+Reader::setExtensionManager(new ExtensionManager($extensions));
+Reader::registerExtension('JungleBooks');
+
+$feed = Reader::import('http://example.com/junglebooks/rss');
+
+// URI to the information page of the day's most popular book with visitors
+$daysPopularBookLink = $feed->getDaysPopularBookLink();
+```
+
+Going through these examples, you'll note that while we need to register the
+feed and entry classes separately with the plugin manager, we don't register
+them separately when registering the extension with the `Reader`.  Extensions
+within the same standard may or may not include both a feed and entry class, so
+`Zend\Feed\Reader\Reader` only requires you to register the overall parent name,
+e.g.  JungleBooks, DublinCore, Slash. Internally, it can check at what level
+extensions exist and load them up if found. In our case, we have a complete
+extension now, spanning the classes `JungleBooks\Feed` and `JungleBooks\Entry`.
diff --git a/web/vendor/zendframework/zend-feed/doc/book/security.md b/web/vendor/zendframework/zend-feed/doc/book/security.md
new file mode 100644
index 000000000..bc6ccd2c0
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/security.md
@@ -0,0 +1,161 @@
+# Zend\\Feed\\Reader and Security
+
+As with any data coming from a source that is beyond the developer's control,
+special attention needs to be given to securing, validating and filtering that
+data. Similar to data input to our application by users, data coming from RSS
+and Atom feeds should also be considered unsafe and potentially dangerous, as it
+allows the delivery of HTML and [xHTML](http://tools.ietf.org/html/rfc4287#section-8.1).
+Because data validation and filtration is out of `Zend\Feed`'s scope, this task
+is left for implementation by the developer, by using libraries such as
+zend-escaper for escaping and [HTMLPurifier](http://www.htmlpurifier.org/) for
+validating and filtering feed data.
+
+Escaping and filtering of potentially insecure data is highly recommended before
+outputting it anywhere in our application or before storing that data in some
+storage engine (be it a simple file or a database.).
+
+## Filtering data using HTMLPurifier
+
+Currently, the best available library for filtering and validating (x)HTML data
+in PHP is [HTMLPurifier](http://www.htmlpurifier.org/), and, as such, is the
+recommended tool for this task.  HTMLPurifier works by filtering out all (x)HTML
+from the data, except for the tags and attributes specifically allowed in a
+whitelist, and by checking and fixing nesting of tags, ensuring
+standards-compliant output.
+
+The following examples will show a basic usage of HTMLPurifier, but developers
+are urged to go through and read [HTMLPurifier's documentation](http://www.htmlpurifier.org/docs).
+
+```php
+// Setting HTMLPurifier's options
+$options = [
+    // Allow only paragraph tags
+    // and anchor tags wit the href attribute
+    [
+        'HTML.Allowed',
+        'p,a[href]'
+    ],
+    // Format end output with Tidy
+    [
+        'Output.TidyFormat',
+        true
+    ],
+    // Assume XHTML 1.0 Strict Doctype
+    [
+        'HTML.Doctype',
+        'XHTML 1.0 Strict'
+    ],
+    // Disable cache, but see note after the example
+    [
+        'Cache.DefinitionImpl',
+        null
+    ]
+];
+
+// Configuring HTMLPurifier
+$config = HTMLPurifier_Config::createDefault();
+foreach ($options as $option) {
+    $config->set($option[0], $option[1]);
+}
+
+// Creating a HTMLPurifier with it's config
+$purifier = new HTMLPurifier($config);
+
+// Fetch the RSS
+try {
+   $rss = Zend\Feed\Reader\Reader::import('http://www.planet-php.net/rss/');
+} catch (Zend\Feed\Exception\Reader\RuntimeException $e) {
+   // feed import failed
+   echo "Exception caught importing feed: {$e->getMessage()}\n";
+   exit;
+}
+
+// Initialize the channel data array
+// See that we're cleaning the description with HTMLPurifier
+$channel = [
+   'title'       => $rss->getTitle(),
+   'link'        => $rss->getLink(),
+   'description' => $purifier->purify($rss->getDescription()),
+   'items'       => [],
+];
+
+// Loop over each channel item and store relevant data
+// See that we're cleaning the descriptions with HTMLPurifier
+foreach ($rss as $item) {
+   $channel['items'][] = [
+       'title'       => $item->getTitle(),
+       'link'        => $item->getLink(),
+       'description' => $purifier->purify($item->getDescription()),
+   ];
+}
+```
+
+> ### Tidy is required
+>
+> HTMLPurifier is using the PHP [Tidy extension](http://php.net/tidy) to clean
+> and repair the final output. If this extension is not available, it will
+> silently fail, but its availability has no impact on the library's security.
+
+> ### Caching
+>
+> For the sake of this example, the HTMLPurifier's cache is disabled, but it is
+> recommended to configure caching and use its standalone include file as it can
+> improve the performance of HTMLPurifier substantially.
+
+## Escaping data using zend-escaper
+
+To help prevent XSS attacks, Zend Framework provides the [zend-escaper component](https://github.com/zendframework/zend-escaper),
+which complies to the current [OWASP recommendations](https://www.owasp.org/index.php/XSS_Prevention_Cheat_Sheet),
+and as such, is the recommended tool for escaping HTML tags and attributes,
+Javascript, CSS and URLs before outputing any potentially insecure data to the
+users.
+
+```php
+try {
+    $rss = Zend\Feed\Reader\Reader::import('http://www.planet-php.net/rss/');
+} catch (Zend\Feed\Exception\Reader\RuntimeException $e) {
+    // feed import failed
+    echo "Exception caught importing feed: {$e->getMessage()}\n";
+    exit;
+}
+
+// Validate all URIs
+$linkValidator = new Zend\Validator\Uri;
+$link = null;
+if ($linkValidator->isValid($rss->getLink())) {
+    $link = $rss->getLink();
+}
+
+// Escaper used for escaping data
+$escaper = new Zend\Escaper\Escaper('utf-8');
+
+// Initialize the channel data array
+$channel = [
+    'title'       => $escaper->escapeHtml($rss->getTitle()),
+    'link'        => $escaper->escapeUrl($link),
+    'description' => $escaper->escapeHtml($rss->getDescription()),
+    'items'       => [],
+];
+
+// Loop over each channel item and store relevant data
+foreach ($rss as $item) {
+    $link = null;
+    if ($linkValidator->isValid($rss->getLink())) {
+        $link = $item->getLink();
+    }
+    $channel['items'][] = [
+        'title'       => $escaper->escapeHtml($item->getTitle()),
+        'link'        => $escaper->escapeUrl($link),
+        'description' => $escaper->escapeHtml($item->getDescription()),
+    ];
+}
+```
+
+The feed data is now safe for output to HTML templates. You can, of course, skip
+escaping when simply storing the data persistently, but remember to escape it on
+output later!
+
+Of course, these are just basic examples, and cannot cover all possible
+scenarios that you, as a developer, can, and most likely will, encounter. Your
+responsibility is to learn what libraries and tools are at your disposal, and
+when and how to use them to secure your web applications.
diff --git a/web/vendor/zendframework/zend-feed/doc/book/writer.md b/web/vendor/zendframework/zend-feed/doc/book/writer.md
new file mode 100644
index 000000000..749b0e69d
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/doc/book/writer.md
@@ -0,0 +1,280 @@
+# Zend\\Feed\\Writer
+
+`Zend\Feed\Writer` is the sibling component to `Zend\Feed\Reader` responsible
+for *generating* feeds. It supports the Atom 1.0 specification (RFC 4287) and
+RSS 2.0 as specified by the RSS Advisory Board (RSS 2.0.11). It does not deviate
+from these standards. It does, however, offer a simple extension system which
+allows for any extension and module for either of these two specifications to be
+implemented if they are not provided out of the box.
+
+In many ways, `Zend\Feed\Writer` is the inverse of `Zend\Feed\Reader`. Where
+`Zend\Reader\Reader` focuses on providing an easy to use architecture fronted by
+getter methods, `Zend\Feed\Writer` is fronted by similarly named setters or
+mutators. This ensures the API won't pose a learning curve to anyone familiar
+with `Zend\Feed\Reader`.
+
+As a result of this design, the rest may even be obvious. Behind the scenes,
+data set on any `Zend\Feed\Writer\Writer` instance is translated at render time
+onto a DOMDocument object using the necessary feed elements. For each supported
+feed type there is both an Atom 1.0 and RSS 2.0 renderer. Using a DOMDocument
+class rather than a templating solution has numerous advantages, the most
+obvious being the ability to export the DOMDocument for additional processing
+and relying on PHP DOM for correct and valid rendering.
+
+## Architecture
+
+The architecture of `Zend\Feed\Writer` is very simple. It has two core sets of
+classes: data containers and renderers.
+
+The containers include the `Zend\Feed\Writer\Feed` and `Zend\Feed\Writer\Entry`
+classes. The Entry classes can be attached to any Feed class. The sole purpose
+of these containers is to collect data about the feed to generate using a simple
+interface of setter methods. These methods perform some data validity testing.
+For example, it will validate any passed URIs, dates, etc. These checks are not
+tied to any of the feed standards definitions. The container objects also
+contain methods to allow for fast rendering and export of the final feed, and
+these can be reused at will.
+
+In addition to the main data container classes, there are two additional Atom
+2.0-specific classes: `Zend\Feed\Writer\Source` and `Zend\Feed\Writer\Deleted`.
+The former implements Atom 2.0 source elements which carry source feed metadata
+for a specific entry within an aggregate feed (i.e. the current feed is not the
+entry's original source). The latter implements the [Atom Tombstones RFC](https://tools.ietf.org/html/rfc6721),
+allowing feeds to carry references to entries which have been deleted.
+
+While there are two main data container types, there are four renderers: two
+matching container renderers per supported feed type. Each renderer accepts a
+container, and, based on its content, attempts to generate valid feed markup. If
+the renderer is unable to generate valid feed markup (perhaps due to the
+container missing an obligatory data point), it will report this by throwing an
+exception. While it is possible to ignore exceptions, this removes the default
+safeguard of ensuring you have sufficient data set to render a wholly valid
+feed.
+
+To explain this more clearly: you may construct a set of data containers for a
+feed where there is a Feed container, into which has been added some Entry
+containers and a Deleted container. This forms a data hierarchy resembling a
+normal feed. When rendering is performed, this hierarchy has its pieces passed
+to relevant renderers, and the partial feeds (all DOMDocuments) are then pieced
+together to create a complete feed. In the case of Source or Deleted (Tombstone)
+containers, these are rendered only for Atom 2.0 and ignored for RSS.
+
+Due to the system being divided between data containers and renderers,
+extensions have more mandatory requirements than their equivalents in the
+`Zend\Feed\Reader` subcomponent.  A typical extension offering namespaced feed
+and entry level elements must itself reflect the exact same architecture: i.e.
+it must offer both feed and entry level data containers, and matching renderers.
+There is, fortunately, no complex integration work required since all extension
+classes are simply registered and automatically used by the core classes. We
+cover extensions in more detail at the end of this chapter.
+
+## Getting Started
+
+To use `Zend\Feed\Writer\Writer`, you will provide it with data, and then
+trigger the renderer. What follows is an example demonstrating generation of a
+minimal Atom 1.0 feed. Each feed or entry uses a separate data container.
+
+```php
+use Zend\Feed\Writer\Feed;
+
+/**
+ * Create the parent feed
+ */
+$feed = new Feed;
+$feed->setTitle("Paddy's Blog");
+$feed->setLink('http://www.example.com');
+$feed->setFeedLink('http://www.example.com/atom', 'atom');
+$feed->addAuthor([
+    'name'  => 'Paddy',
+    'email' => 'paddy@example.com',
+    'uri'   => 'http://www.example.com',
+]);
+$feed->setDateModified(time());
+$feed->addHub('http://pubsubhubbub.appspot.com/');
+
+/**
+ * Add one or more entries. Note that entries must
+ * be manually added once created.
+ */
+$entry = $feed->createEntry();
+$entry->setTitle('All Your Base Are Belong To Us');
+$entry->setLink('http://www.example.com/all-your-base-are-belong-to-us');
+$entry->addAuthor([
+    'name'  => 'Paddy',
+    'email' => 'paddy@example.com',
+    'uri'   => 'http://www.example.com',
+]);
+$entry->setDateModified(time());
+$entry->setDateCreated(time());
+$entry->setDescription('Exposing the difficulty of porting games to English.');
+$entry->setContent(
+    'I am not writing the article. The example is long enough as is ;).'
+);
+$feed->addEntry($entry);
+
+/**
+ * Render the resulting feed to Atom 1.0 and assign to $out.
+ * You can substitute "atom" with "rss" to generate an RSS 2.0 feed.
+ */
+$out = $feed->export('atom');
+```
+
+The output rendered should be as follows:
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <title type="text">Paddy's Blog</title>
+    <subtitle type="text">Writing about PC Games since 176 BC.</subtitle>
+    <updated>2009-12-14T20:28:18+00:00</updated>
+    <generator uri="http://framework.zend.com" version="1.10.0alpha">
+        Zend\Feed\Writer
+    </generator>
+    <link rel="alternate" type="text/html" href="http://www.example.com"/>
+    <link rel="self" type="application/atom+xml"
+        href="http://www.example.com/atom"/>
+    <id>http://www.example.com</id>
+    <author>
+        <name>Paddy</name>
+        <email>paddy@example.com</email>
+        <uri>http://www.example.com</uri>
+    </author>
+    <link rel="hub" href="http://pubsubhubbub.appspot.com/"/>
+    <entry>
+        <title type="html"><![CDATA[All Your Base Are Belong To
+            Us]]></title>
+        <summary type="html">
+            <![CDATA[Exposing the difficultly of porting games to
+                English.]]>
+        </summary>
+        <published>2009-12-14T20:28:18+00:00</published>
+        <updated>2009-12-14T20:28:18+00:00</updated>
+        <link rel="alternate" type="text/html"
+             href="http://www.example.com/all-your-base-are-belong-to-us"/>
+        <id>http://www.example.com/all-your-base-are-belong-to-us</id>
+        <author>
+            <name>Paddy</name>
+            <email>paddy@example.com</email>
+            <uri>http://www.example.com</uri>
+        </author>
+        <content type="html">
+            <![CDATA[I am not writing the article.
+                     The example is long enough as is ;).]]>
+        </content>
+    </entry>
+</feed>
+```
+
+This is a perfectly valid Atom 1.0 example. It should be noted that omitting an
+obligatory point of data, such as a title, will trigger an exception when
+rendering as Atom 1.0. This will differ for RSS 2.0, since a title may be
+omitted so long as a description is present. This gives rise to exceptions that
+differ between the two standards depending on the renderer in use. By design,
+`Zend\Feed\Writer` will not render an invalid feed for either standard
+unless the end-user deliberately elects to ignore all exceptions. This built in
+safeguard was added to ensure users without in-depth knowledge of the relevant
+specifications have a bit less to worry about.
+
+## Setting Feed Data Points
+
+Before you can render a feed, you must first setup the data necessary for the
+feed being rendered.  This utilises a simple setter style API, which doubles as
+a method for validating the data being set. By design, the API closely matches
+that for `Zend\Feed\Reader` to avoid undue confusion and uncertainty.
+
+`Zend\Feed\Writer` offers this API via its data container classes
+`Zend\Feed\Writer\Feed` and `Zend\Feed\Writer\Entry` (not to mention the Atom
+2.0 specific and extension classes). These classes merely store all feed data in
+a type-agnostic manner, meaning you may reuse any data container with any
+renderer without requiring additional work. Both classes are also amenable to
+extensions, meaning that an extension may define its own container classes which
+are registered to the base container classes as extensions, and are checked when
+any method call triggers the base container's `__call()` method, allowing method
+overloading to the extension classes.
+
+Here's a summary of the Core API for Feeds. You should note it comprises not
+only the basic RSS and Atom standards, but also accounts for a number of
+included extensions bundled with `Zend\Feed\Writer`. The naming of these
+extension sourced methods remain fairly generic; all extension methods operate
+at the same level as the Core API, though we do allow you to retrieve any
+specific extension object separately if required.
+
+The Feed API for data is contained in `Zend\Feed\Writer\Feed`. In addition to the API
+detailed below, the class also implements the `Countable` and `Iterator` interfaces.
+
+### Feed API Methods
+
+Method | Description
+------ | -----------
+`setId()` | Set a unique identifier associated with this feed. For Atom 1.0 this is an `atom:id` element, whereas for RSS 2.0 it is added as a `guid` element.  These are optional so long as a link is added; i.e. if no identifier is provided, the link is used.
+`setTitle()` | Set the title of the feed.
+`setDescription()` | Set the text description of the feed.
+`setLink()` | Set a URI to the HTML website containing the same or similar information as this feed (i.e. if the feed is from a blog, it should provide the blog's URI where the HTML version of the entries can be read).
+`setFeedLinks()` | Add a link to an XML feed, whether it is to the feed being generated, or an alternate URI pointing to the same feed but in a different format. At a minimum, it is recommended to include a link to the feed being generated so it has an identifiable final URI allowing a client to track its location changes without necessitating constant redirects. The parameter is an array of arrays, where each sub-array contains the keys "type" and "uri". The type should be one of "atom", "rss", or "rdf".
+`addAuthors()` | Sets the data for authors. The parameter is an array of array,s where each sub-array may contain the keys "name", "email", and "uri". The "uri" value is only applicable for Atom feeds, since RSS contains no facility to show it. For RSS 2.0, rendering will create two elements: an author element containing the email reference with the name in brackets, and a Dublin Core creator element only containing the name.
+`addAuthor()` | Sets the data for a single author following the same array format as described above for a single sub-array.
+`setDateCreated()` | Sets the date on which this feed was created. Generally only applicable to Atom, where it represents the date the resource described by an Atom 1.0 document was created. The expected parameter may be a UNIX timestamp or a `DateTime` object.
+`setDateModified()` | Sets the date on which this feed was last modified. The expected parameter may be a UNIX timestamp or a `DateTime` object.
+`setLastBuildDate()` | Sets the date on which this feed was last build. The expected parameter may be a UNIX timestamp or a `DateTime` object. This will only be rendered for RSS 2.0 feeds, and is automatically rendered as the current date by default when not explicitly set.
+`setLanguage()` | Sets the language of the feed. This will be omitted unless set.
+`setGenerator()` | Allows the setting of a generator. The parameter should be an array containing the keys "name", "version", and "uri". If omitted a default generator will be added referencing `Zend\Feed\Writer`, the current zend-version version, and the Framework's URI.
+`setCopyright()` | Sets a copyright notice associated with the feed.
+`addHubs()` | Accepts an array of Pubsubhubbub Hub Endpoints to be rendered in the feed as Atom links so that PuSH Subscribers may subscribe to your feed. Note that you must implement a Pubsubhubbub Publisher in order for real-time updates to be enabled. A Publisher may be implemented using `Zend\Feed\Pubsubhubbub\Publisher`. The method `addHub()` allows adding a single hub at a time.
+`addCategories()` | Accepts an array of categories for rendering, where each element is itself an array whose possible keys include "term", "label", and "scheme". The "term" is a typically a category name suitable for inclusion in a URI. The "label" may be a human readable category name supporting special characters (it is HTML encoded during rendering) and is a required key. The "scheme" (called the domain in RSS) is optional, but must be a valid URI. The method `addCategory()` allows adding a single category at a time.
+`setImage()` | Accepts an array of image metadata for an RSS image or Atom logo.  Atom 1.0 only requires a URI. RSS 2.0 requires a URI, HTML link, and an image title. RSS 2.0 optionally may send a width, height, and image description. To provide these, use an array argument with the following keys: "uri", "link", "title", "description", "height", and "width". The RSS 2.0 HTML link should point to the feed source's HTML page.
+`createEntry()` | Returns a new instance of `Zend\Feed\Writer\Entry`. This is the Entry data container. New entries are not automatically assigned to the current feed, so you must explicitly call `addEntry()` to add the entry for rendering.
+`addEntry()` | Adds an instance of `Zend\Feed\Writer\Entry` to the current feed container for rendering.
+`createTombstone()` | Returns a new instance of `Zend\Feed\Writer\Deleted`. This is the Atom 2.0 Tombstone data container. New entries are not automatically assigned to the current feed, so you must explicitly call `addTombstone()` to add the deleted entry for rendering.
+`addTombstone()` | Adds an instance of `Zend\Feed\Writer\Deleted` to the current feed container for rendering.
+`removeEntry()` | Accepts a parameter indicating an array index of the entry to remove from the feed.
+`export()` | Exports the entire data hierarchy to an XML feed. The method has two parameters. The first is the feed type, one of "atom" or "rss". The second is an optional boolean to set indicating whether or not Exceptions are thrown. The default is `TRUE`.
+
+> #### Retrieval methods
+>
+> In addition to the setters listed above, `Feed` instances also provide
+> matching getters to retrieve data from the `Feed` data container. For
+> example, `setImage()` is matched with a `getImage()` method.
+
+## Setting Entry Data Points
+
+Below is a summary of the Core API for entries and items. You should note that
+it covers not only the basic RSS and Atom standards, but also a number of
+included extensions bundled with `Zend\Feed\Writer`. The naming of these
+extension sourced methods remain fairly generic; all extension methods operate
+at the same level as the Core API, though we do allow you to retrieve any
+specific extension object separately if required.
+
+The Entry *API* for data is contained in `Zend\Feed\Writer\Entry`.
+
+### Entry API Methods
+
+Method | Description
+------ | -----------
+`setId()` | Set a unique identifier associated with this entry. For Atom 1.0 this is an `atom:id` element, whereas for RSS 2.0 it is added as a `guid` element.  These are optional so long as a link is added; i.e. if no identifier is provided, the link is used.
+`setTitle()` | Set the title of the entry.
+`setDescription()` | Set the text description of the entry.
+`setContent()` | Set the content of the entry.
+`setLink()` | Set a URI to the HTML website containing the same or similar information as this entry (i.e. if the feed is from a blog, it should provide the blog article's URI where the HTML version of the entry can be read).
+`setFeedLinks()` | Add a link to an XML feed, whether it is to the feed being generated, or an alternate URI pointing to the same feed but in a different format. At a minimum, it is recommended to include a link to the feed being generated so it has an identifiable final URI allowing a client to track its location changes without necessitating constant redirects. The parameter is an array of arrays, where each sub-array contains the keys "type" and "uri". The type should be one of "atom", "rss", or "rdf". If a type is omitted, it defaults to the type used when rendering the feed.
+`addAuthors()` | Sets the data for authors. The parameter is an array of array,s where each sub-array may contain the keys "name", "email", and "uri". The "uri" value is only applicable for Atom feeds, since RSS contains no facility to show it. For RSS 2.0, rendering will create two elements: an author element containing the email reference with the name in brackets, and a Dublin Core creator element only containing the name.
+`addAuthor()` | Sets the data for a single author following the same format as described above for a single sub-array.
+`setDateCreated()` | Sets the date on which this entry was created. Generally only applicable to Atom where it represents the date the resource described by an Atom 1.0 document was created. The expected parameter may be a UNIX timestamp or a `DateTime` object. If omitted, the date used will be the current date and time.
+`setDateModified()` | Sets the date on which this entry was last modified. The expected parameter may be a UNIX timestamp or a `DateTime` object. If omitted, the date used will be the current date and time.
+`setCopyright()` | Sets a copyright notice associated with the entry.
+`addCategories()` | Accepts an array of categories for rendering, where each element is itself an array whose possible keys include "term", "label", and "scheme". The "term" is a typically a category name suitable for inclusion in a URI. The "label" may be a human readable category name supporting special characters (it is encoded during rendering) and is a required key. The "scheme" (called the domain in RSS) is optional but must be a valid URI.
+`addCategory()` | Sets the data for a single category following the same format as described above for a single sub-array.
+`setCommentCount()` | Sets the number of comments associated with this entry. Rendering differs between RSS and Atom 2.0 depending on the element or attribute needed.
+`setCommentLink()` | Sets a link to an HTML page containing comments associated with this entry.
+`setCommentFeedLink()` | Sets a link to an XML feed containing comments associated with this entry. The parameter is an array containing the keys "uri" and "type", where the type is one of "rdf", "rss", or "atom".
+`setCommentFeedLinks()` | Same as `setCommentFeedLink()`, except it accepts an array of arrays, where each subarray contains the expected parameters of `setCommentFeedLink()`.
+`setEncoding()` | Sets the encoding of entry text. This will default to UTF-8, which is the preferred encoding.
+
+> #### Retrieval methods
+>
+> In addition to the setters listed above, `Entry` instances also provide
+> matching getters to retrieve data from the `Entry` data container. For
+> example, `setContent()` is matched with a `getContent()` method.
+
+## Extensions
+
+- TODO
diff --git a/web/vendor/zendframework/zend-feed/mkdocs.yml b/web/vendor/zendframework/zend-feed/mkdocs.yml
new file mode 100644
index 000000000..1209e65e8
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/mkdocs.yml
@@ -0,0 +1,21 @@
+docs_dir: doc/book
+site_dir: doc/html
+pages:
+    - index.md
+    - Introduction: intro.md
+    - Reader:
+        - "Zend\\Feed\\Reader": reader.md
+        - 'HTTP Clients': http-clients.md
+        - 'Using PSR-7 Clients': psr7-clients.md
+        - 'Importing Feeds': importing.md
+        - 'Feed Discovery': find-feeds.md
+        - 'Consuming RSS Feeds': consuming-rss.md
+        - 'Consuming Atom Feeds': consuming-atom.md
+        - 'Consuming Atom Entries': consuming-atom-entry.md
+        - Security: security.md
+    - Writer: writer.md
+    - Pubsubhubbub: pubsubhubbub.md
+site_name: zend-feed
+site_description: Zend\Feed
+repo_url: 'https://github.com/zendframework/zend-feed'
+copyright: 'Copyright (c) 2016 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'
diff --git a/web/vendor/zendframework/zend-feed/phpcs.xml b/web/vendor/zendframework/zend-feed/phpcs.xml
new file mode 100644
index 000000000..9e6a75116
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/phpcs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ruleset name="Zend Framework coding standard">
+    <rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml"/>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>test</file>
+</ruleset>
diff --git a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
index 7321c9625..702b2d020 100644
--- a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
+++ b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
@@ -67,7 +67,7 @@ abstract class AbstractCallback implements CallbackInterface
             $options = ArrayUtils::iteratorToArray($options);
         }
 
-        if (!is_array($options)) {
+        if (! is_array($options)) {
             throw new Exception\InvalidArgumentException('Array or Traversable object'
             . 'expected, got ' . gettype($options));
         }
@@ -137,7 +137,7 @@ abstract class AbstractCallback implements CallbackInterface
      */
     public function setHttpResponse($httpResponse)
     {
-        if (!$httpResponse instanceof HttpResponse && !$httpResponse instanceof PhpResponse) {
+        if (! $httpResponse instanceof HttpResponse && ! $httpResponse instanceof PhpResponse) {
             throw new Exception\InvalidArgumentException('HTTP Response object must'
                 . ' implement one of Zend\Feed\Pubsubhubbub\HttpResponse or'
                 . ' Zend\Http\PhpEnvironment\Response');
@@ -196,8 +196,10 @@ abstract class AbstractCallback implements CallbackInterface
      * Attempt to detect the callback URL (specifically the path forward)
      * @return string
      */
+    // @codingStandardsIgnoreStart
     protected function _detectCallbackUrl()
     {
+        // @codingStandardsIgnoreEnd
         $callbackUrl = '';
         if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
             $callbackUrl = $_SERVER['HTTP_X_ORIGINAL_URL'];
@@ -214,8 +216,8 @@ abstract class AbstractCallback implements CallbackInterface
                 $callbackUrl = substr($callbackUrl, strlen($schemeAndHttpHost));
             }
         } elseif (isset($_SERVER['ORIG_PATH_INFO'])) {
-            $callbackUrl= $_SERVER['ORIG_PATH_INFO'];
-            if (!empty($_SERVER['QUERY_STRING'])) {
+            $callbackUrl = $_SERVER['ORIG_PATH_INFO'];
+            if (! empty($_SERVER['QUERY_STRING'])) {
                 $callbackUrl .= '?' . $_SERVER['QUERY_STRING'];
             }
         }
@@ -227,9 +229,11 @@ abstract class AbstractCallback implements CallbackInterface
      *
      * @return string
      */
+    // @codingStandardsIgnoreStart
     protected function _getHttpHost()
     {
-        if (!empty($_SERVER['HTTP_HOST'])) {
+        // @codingStandardsIgnoreEnd
+        if (! empty($_SERVER['HTTP_HOST'])) {
             return $_SERVER['HTTP_HOST'];
         }
         $scheme = 'http';
@@ -253,19 +257,21 @@ abstract class AbstractCallback implements CallbackInterface
      * @param string $header
      * @return bool|string
      */
+    // @codingStandardsIgnoreStart
     protected function _getHeader($header)
     {
+        // @codingStandardsIgnoreEnd
         $temp = strtoupper(str_replace('-', '_', $header));
-        if (!empty($_SERVER[$temp])) {
+        if (! empty($_SERVER[$temp])) {
             return $_SERVER[$temp];
         }
         $temp = 'HTTP_' . strtoupper(str_replace('-', '_', $header));
-        if (!empty($_SERVER[$temp])) {
+        if (! empty($_SERVER[$temp])) {
             return $_SERVER[$temp];
         }
         if (function_exists('apache_request_headers')) {
             $headers = apache_request_headers();
-            if (!empty($headers[$header])) {
+            if (! empty($headers[$header])) {
                 return $headers[$header];
             }
         }
@@ -277,8 +283,10 @@ abstract class AbstractCallback implements CallbackInterface
      *
      * @return string|false Raw body, or false if not present
      */
+    // @codingStandardsIgnoreStart
     protected function _getRawBody()
     {
+        // @codingStandardsIgnoreEnd
         $body = file_get_contents('php://input');
         if (strlen(trim($body)) == 0 && isset($GLOBALS['HTTP_RAW_POST_DATA'])) {
             $body = $GLOBALS['HTTP_RAW_POST_DATA'];
diff --git a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
index 972296879..91239f3bb 100644
--- a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
+++ b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
@@ -60,14 +60,14 @@ class HttpResponse
         }
         $httpCodeSent = false;
         foreach ($this->headers as $header) {
-            if (!$httpCodeSent && $this->statusCode) {
+            if (! $httpCodeSent && $this->statusCode) {
                 header($header['name'] . ': ' . $header['value'], $header['replace'], $this->statusCode);
                 $httpCodeSent = true;
             } else {
                 header($header['name'] . ': ' . $header['value'], $header['replace']);
             }
         }
-        if (!$httpCodeSent) {
+        if (! $httpCodeSent) {
             header('HTTP/1.1 ' . $this->statusCode);
         }
     }
@@ -140,9 +140,11 @@ class HttpResponse
     {
         $ok = headers_sent($file, $line);
         if ($ok && $throw) {
-            throw new Exception\RuntimeException('Cannot send headers; headers already sent in ' . $file . ', line ' . $line);
+            throw new Exception\RuntimeException(
+                'Cannot send headers; headers already sent in ' . $file . ', line ' . $line
+            );
         }
-        return !$ok;
+        return ! $ok;
     }
 
     /**
@@ -154,7 +156,7 @@ class HttpResponse
      */
     public function setStatusCode($code)
     {
-        if (!is_int($code) || (100 > $code) || (599 < $code)) {
+        if (! is_int($code) || (100 > $code) || (599 < $code)) {
             throw new Exception\InvalidArgumentException('Invalid HTTP response'
             . ' code:' . $code);
         }
@@ -201,8 +203,10 @@ class HttpResponse
      * @param  string $name
      * @return string
      */
+    // @codingStandardsIgnoreStart
     protected function _normalizeHeader($name)
     {
+        // @codingStandardsIgnoreEnd
         $filtered = str_replace(['-', '_'], ' ', (string) $name);
         $filtered = ucwords(strtolower($filtered));
         $filtered = str_replace(' ', '-', $filtered);
diff --git a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
index a2086163d..97333ffed 100644
--- a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
+++ b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
@@ -31,7 +31,7 @@ class Subscription extends AbstractModel implements SubscriptionPersistenceInter
      */
     public function setSubscription(array $data)
     {
-        if (!isset($data['id'])) {
+        if (! isset($data['id'])) {
             throw new PubSubHubbub\Exception\InvalidArgumentException(
                 'ID must be set before attempting a save'
             );
@@ -66,7 +66,7 @@ class Subscription extends AbstractModel implements SubscriptionPersistenceInter
      */
     public function getSubscription($key)
     {
-        if (empty($key) || !is_string($key)) {
+        if (empty($key) || ! is_string($key)) {
             throw new PubSubHubbub\Exception\InvalidArgumentException('Invalid parameter "key"'
                 .' of "' . $key . '" must be a non-empty string');
         }
@@ -86,7 +86,7 @@ class Subscription extends AbstractModel implements SubscriptionPersistenceInter
      */
     public function hasSubscription($key)
     {
-        if (empty($key) || !is_string($key)) {
+        if (empty($key) || ! is_string($key)) {
             throw new PubSubHubbub\Exception\InvalidArgumentException('Invalid parameter "key"'
                 .' of "' . $key . '" must be a non-empty string');
         }
diff --git a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
index a930a70be..d7922aca6 100644
--- a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
+++ b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
@@ -85,7 +85,7 @@ class PubSubHubbub
      */
     public static function getHttpClient()
     {
-        if (!isset(static::$httpClient)) {
+        if (! isset(static::$httpClient)) {
             static::$httpClient = new Http\Client;
         } else {
             static::$httpClient->resetParameters();
diff --git a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
index aed9c8fe2..7d3e56271 100644
--- a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
+++ b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
@@ -75,7 +75,7 @@ class Publisher
             $options = ArrayUtils::iteratorToArray($options);
         }
 
-        if (!is_array($options)) {
+        if (! is_array($options)) {
             throw new Exception\InvalidArgumentException('Array or Traversable object'
                                 . 'expected, got ' . gettype($options));
         }
@@ -100,7 +100,7 @@ class Publisher
      */
     public function addHubUrl($url)
     {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
+        if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
             throw new Exception\InvalidArgumentException('Invalid parameter "url"'
                 . ' of "' . $url . '" must be a non-empty string and a valid'
                 . 'URL');
@@ -131,7 +131,7 @@ class Publisher
      */
     public function removeHubUrl($url)
     {
-        if (!in_array($url, $this->getHubUrls())) {
+        if (! in_array($url, $this->getHubUrls())) {
             return $this;
         }
         $key = array_search($url, $this->hubUrls);
@@ -159,7 +159,7 @@ class Publisher
      */
     public function addUpdatedTopicUrl($url)
     {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
+        if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
             throw new Exception\InvalidArgumentException('Invalid parameter "url"'
                 . ' of "' . $url . '" must be a non-empty string and a valid'
                 . 'URL');
@@ -190,7 +190,7 @@ class Publisher
      */
     public function removeUpdatedTopicUrl($url)
     {
-        if (!in_array($url, $this->getUpdatedTopicUrls())) {
+        if (! in_array($url, $this->getUpdatedTopicUrls())) {
             return $this;
         }
         $key = array_search($url, $this->updatedTopicUrls);
@@ -219,7 +219,7 @@ class Publisher
      */
     public function notifyHub($url)
     {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
+        if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
             throw new Exception\InvalidArgumentException('Invalid parameter "url"'
                 . ' of "' . $url . '" must be a non-empty string and a valid'
                 . 'URL');
@@ -281,7 +281,7 @@ class Publisher
             $this->setParameters($name);
             return $this;
         }
-        if (empty($name) || !is_string($name)) {
+        if (empty($name) || ! is_string($name)) {
             throw new Exception\InvalidArgumentException('Invalid parameter "name"'
                 . ' of "' . $name . '" must be a non-empty string');
         }
@@ -289,7 +289,7 @@ class Publisher
             $this->removeParameter($name);
             return $this;
         }
-        if (empty($value) || (!is_string($value) && $value !== null)) {
+        if (empty($value) || (! is_string($value) && $value !== null)) {
             throw new Exception\InvalidArgumentException('Invalid parameter "value"'
                 . ' of "' . $value . '" must be a non-empty string');
         }
@@ -320,7 +320,7 @@ class Publisher
      */
     public function removeParameter($name)
     {
-        if (empty($name) || !is_string($name)) {
+        if (empty($name) || ! is_string($name)) {
             throw new Exception\InvalidArgumentException('Invalid parameter "name"'
                 . ' of "' . $name . '" must be a non-empty string');
         }
@@ -348,7 +348,7 @@ class Publisher
      */
     public function isSuccess()
     {
-        return !(count($this->errors) != 0);
+        return ! (count($this->errors) != 0);
     }
 
     /**
@@ -369,8 +369,10 @@ class Publisher
      * @return \Zend\Http\Client
      * @throws Exception\RuntimeException
      */
+    // @codingStandardsIgnoreStart
     protected function _getHttpClient()
     {
+        // @codingStandardsIgnoreEnd
         $client = PubSubHubbub::getHttpClient();
         $client->setMethod(HttpRequest::METHOD_POST);
         $client->setOptions([
diff --git a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
index 802a00192..cb3a40295 100644
--- a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
+++ b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
@@ -147,7 +147,7 @@ class Subscriber
             $options = ArrayUtils::iteratorToArray($options);
         }
 
-        if (!is_array($options)) {
+        if (! is_array($options)) {
             throw new Exception\InvalidArgumentException('Array or Traversable object'
                                 . 'expected, got ' . gettype($options));
         }
@@ -193,7 +193,7 @@ class Subscriber
      */
     public function setTopicUrl($url)
     {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
+        if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
             throw new Exception\InvalidArgumentException('Invalid parameter "url"'
                 .' of "' . $url . '" must be a non-empty string and a valid'
                 .' URL');
@@ -256,7 +256,7 @@ class Subscriber
      */
     public function setCallbackUrl($url)
     {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
+        if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
             throw new Exception\InvalidArgumentException('Invalid parameter "url"'
                 . ' of "' . $url . '" must be a non-empty string and a valid'
                 . ' URL');
@@ -326,7 +326,7 @@ class Subscriber
      */
     public function addHubUrl($url)
     {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
+        if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
             throw new Exception\InvalidArgumentException('Invalid parameter "url"'
                 . ' of "' . $url . '" must be a non-empty string and a valid'
                 . ' URL');
@@ -357,7 +357,7 @@ class Subscriber
      */
     public function removeHubUrl($url)
     {
-        if (!in_array($url, $this->getHubUrls())) {
+        if (! in_array($url, $this->getHubUrls())) {
             return $this;
         }
         $key = array_search($url, $this->hubUrls);
@@ -386,7 +386,7 @@ class Subscriber
      */
     public function addAuthentication($url, array $authentication)
     {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
+        if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
             throw new Exception\InvalidArgumentException('Invalid parameter "url"'
                 . ' of "' . $url . '" must be a non-empty string and a valid'
                 . ' URL');
@@ -445,7 +445,7 @@ class Subscriber
             $this->setParameters($name);
             return $this;
         }
-        if (empty($name) || !is_string($name)) {
+        if (empty($name) || ! is_string($name)) {
             throw new Exception\InvalidArgumentException('Invalid parameter "name"'
                 . ' of "' . $name . '" must be a non-empty string');
         }
@@ -453,7 +453,7 @@ class Subscriber
             $this->removeParameter($name);
             return $this;
         }
-        if (empty($value) || (!is_string($value) && $value !== null)) {
+        if (empty($value) || (! is_string($value) && $value !== null)) {
             throw new Exception\InvalidArgumentException('Invalid parameter "value"'
                 . ' of "' . $value . '" must be a non-empty string');
         }
@@ -484,7 +484,7 @@ class Subscriber
      */
     public function removeParameter($name)
     {
-        if (empty($name) || !is_string($name)) {
+        if (empty($name) || ! is_string($name)) {
             throw new Exception\InvalidArgumentException('Invalid parameter "name"'
                 . ' of "' . $name . '" must be a non-empty string');
         }
@@ -602,8 +602,10 @@ class Subscriber
      * @return void
      * @throws Exception\RuntimeException
      */
+    // @codingStandardsIgnoreStart
     protected function _doRequest($mode)
     {
+        // @codingStandardsIgnoreEnd
         $client = $this->_getHttpClient();
         $hubs   = $this->getHubUrls();
         if (empty($hubs)) {
@@ -648,8 +650,10 @@ class Subscriber
      *
      * @return \Zend\Http\Client
      */
+    // @codingStandardsIgnoreStart
     protected function _getHttpClient()
     {
+        // @codingStandardsIgnoreEnd
         $client = PubSubHubbub::getHttpClient();
         $client->setMethod(HttpRequest::METHOD_POST);
         $client->setOptions(['useragent' => 'Zend_Feed_Pubsubhubbub_Subscriber/'
@@ -666,9 +670,11 @@ class Subscriber
      * @return string
      * @throws Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _getRequestParameters($hubUrl, $mode)
     {
-        if (!in_array($mode, ['subscribe', 'unsubscribe'])) {
+        // @codingStandardsIgnoreEnd
+        if (! in_array($mode, ['subscribe', 'unsubscribe'])) {
             throw new Exception\InvalidArgumentException('Invalid mode specified: "'
                 . $mode . '" which should have been "subscribe" or "unsubscribe"');
         }
@@ -705,7 +711,7 @@ class Subscriber
         $params['hub.verify_token'] = $token;
 
         // Note: query string only usable with PuSH 0.2 Hubs
-        if (!$this->usePathParameter) {
+        if (! $this->usePathParameter) {
             $params['hub.callback'] = $this->getCallbackUrl()
                 . '?xhub.subscription=' . PubSubHubbub::urlencode($key);
         } else {
@@ -738,7 +744,9 @@ class Subscriber
             'verify_token'       => hash('sha256', $params['hub.verify_token']),
             'secret'             => null,
             'expiration_time'    => $expires,
-            'subscription_state' => ($mode == 'unsubscribe')? PubSubHubbub::SUBSCRIPTION_TODELETE : PubSubHubbub::SUBSCRIPTION_NOTVERIFIED,
+            // @codingStandardsIgnoreStart
+            'subscription_state' => ($mode == 'unsubscribe') ? PubSubHubbub::SUBSCRIPTION_TODELETE : PubSubHubbub::SUBSCRIPTION_NOTVERIFIED,
+            // @codingStandardsIgnoreEnd
         ];
         $this->getStorage()->setSubscription($data);
 
@@ -754,9 +762,11 @@ class Subscriber
      *
      * @return string
      */
+    // @codingStandardsIgnoreStart
     protected function _generateVerifyToken()
     {
-        if (!empty($this->testStaticToken)) {
+        // @codingStandardsIgnoreEnd
+        if (! empty($this->testStaticToken)) {
             return $this->testStaticToken;
         }
         return uniqid(rand(), true) . time();
@@ -770,8 +780,10 @@ class Subscriber
      * @param string $hubUrl The Hub Server URL for which this token will apply
      * @return string
      */
+    // @codingStandardsIgnoreStart
     protected function _generateSubscriptionKey(array $params, $hubUrl)
     {
+        // @codingStandardsIgnoreEnd
         $keyBase = $params['hub.topic'] . $hubUrl;
         $key     = md5($keyBase);
 
@@ -784,8 +796,10 @@ class Subscriber
      * @param  array $params
      * @return array
      */
+    // @codingStandardsIgnoreStart
     protected function _urlEncode(array $params)
     {
+        // @codingStandardsIgnoreEnd
         $encoded = [];
         foreach ($params as $key => $value) {
             if (is_array($value)) {
@@ -809,8 +823,10 @@ class Subscriber
      * @param  array $params
      * @return array
      */
+    // @codingStandardsIgnoreStart
     protected function _toByteValueOrderedString(array $params)
     {
+        // @codingStandardsIgnoreEnd
         $return = [];
         uksort($params, 'strnatcmp');
         foreach ($params as $key => $value) {
diff --git a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
index 56c06c7df..a6bffef21 100644
--- a/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
+++ b/web/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
@@ -147,7 +147,7 @@ class Callback extends PubSubHubbub\AbstractCallback
             'hub_verify_token',
         ];
         foreach ($required as $key) {
-            if (!array_key_exists($key, $httpGetData)) {
+            if (! array_key_exists($key, $httpGetData)) {
                 return false;
             }
         }
@@ -157,11 +157,11 @@ class Callback extends PubSubHubbub\AbstractCallback
             return false;
         }
         if ($httpGetData['hub_mode'] == 'subscribe'
-            && !array_key_exists('hub_lease_seconds', $httpGetData)
+            && ! array_key_exists('hub_lease_seconds', $httpGetData)
         ) {
             return false;
         }
-        if (!Uri::factory($httpGetData['hub_topic'])->isValid()) {
+        if (! Uri::factory($httpGetData['hub_topic'])->isValid()) {
             return false;
         }
 
@@ -169,7 +169,7 @@ class Callback extends PubSubHubbub\AbstractCallback
          * Attempt to retrieve any Verification Token Key attached to Callback
          * URL's path by our Subscriber implementation
          */
-        if (!$this->_hasValidVerifyToken($httpGetData)) {
+        if (! $this->_hasValidVerifyToken($httpGetData)) {
             return false;
         }
         return true;
@@ -220,14 +220,16 @@ class Callback extends PubSubHubbub\AbstractCallback
      * @param  bool $checkValue
      * @return bool
      */
+    // @codingStandardsIgnoreStart
     protected function _hasValidVerifyToken(array $httpGetData = null, $checkValue = true)
     {
+        // @codingStandardsIgnoreEnd
         $verifyTokenKey = $this->_detectVerifyTokenKey($httpGetData);
         if (empty($verifyTokenKey)) {
             return false;
         }
         $verifyTokenExists = $this->getStorage()->hasSubscription($verifyTokenKey);
-        if (!$verifyTokenExists) {
+        if (! $verifyTokenExists) {
             return false;
         }
         if ($checkValue) {
@@ -250,8 +252,10 @@ class Callback extends PubSubHubbub\AbstractCallback
      * @param  null|array $httpGetData
      * @return false|string
      */
+    // @codingStandardsIgnoreStart
     protected function _detectVerifyTokenKey(array $httpGetData = null)
     {
+        // @codingStandardsIgnoreEnd
         /**
          * Available when sub keys encoding in Callback URL path
          */
@@ -286,8 +290,10 @@ class Callback extends PubSubHubbub\AbstractCallback
      *
      * @return array|void
      */
+    // @codingStandardsIgnoreStart
     protected function _parseQueryString()
     {
+        // @codingStandardsIgnoreEnd
         $params      = [];
         $queryString = '';
         if (isset($_SERVER['QUERY_STRING'])) {
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php b/web/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
index a706ff82e..4421c76c5 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
@@ -141,7 +141,7 @@ abstract class AbstractEntry
      */
     public function getXpath()
     {
-        if (!$this->xpath) {
+        if (! $this->xpath) {
             $this->setXpath(new DOMXPath($this->getDomDocument()));
         }
         return $this->xpath;
@@ -207,8 +207,10 @@ abstract class AbstractEntry
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _loadExtensions()
     {
+        // @codingStandardsIgnoreEnd
         $all = Reader::getExtensions();
         $feed = $all['entry'];
         foreach ($feed as $extension) {
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php b/web/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
index 2f43a0718..46d64829f 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
@@ -23,7 +23,7 @@ class Category extends AbstractCollection
     {
         $categories = [];
         foreach ($this->getIterator() as $element) {
-            if (isset($element['label']) && !empty($element['label'])) {
+            if (isset($element['label']) && ! empty($element['label'])) {
                 $categories[] = $element['label'];
             } else {
                 $categories[] = $element['term'];
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php b/web/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
index 1342431a3..f05803f0f 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
@@ -146,7 +146,7 @@ abstract class AbstractEntry
      */
     public function getXpath()
     {
-        if (!$this->xpath) {
+        if (! $this->xpath) {
             $this->setXpath(new DOMXPath($this->getDomDocument()));
         }
         return $this->xpath;
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php b/web/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
index c68f360f9..4d7a5f9f8 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
@@ -104,7 +104,7 @@ class Atom extends AbstractEntry implements EntryInterface
     /**
      * Get the entry creation date
      *
-     * @return string
+     * @return \DateTime
      */
     public function getDateCreated()
     {
@@ -122,7 +122,7 @@ class Atom extends AbstractEntry implements EntryInterface
     /**
      * Get the entry modification date
      *
-     * @return string
+     * @return \DateTime
      */
     public function getDateModified()
     {
@@ -199,7 +199,7 @@ class Atom extends AbstractEntry implements EntryInterface
      */
     public function getLink($index = 0)
     {
-        if (!array_key_exists('links', $this->data)) {
+        if (! array_key_exists('links', $this->data)) {
             $this->getLinks();
         }
 
@@ -269,7 +269,7 @@ class Atom extends AbstractEntry implements EntryInterface
 
         $commentcount = $this->getExtension('Thread')->getCommentCount();
 
-        if (!$commentcount) {
+        if (! $commentcount) {
             $commentcount = $this->getExtension('Atom')->getCommentCount();
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php b/web/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
index c5e5fb224..250f4b6e0 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
@@ -38,14 +38,14 @@ interface EntryInterface
     /**
      * Get the entry creation date
      *
-     * @return string
+     * @return \DateTime
      */
     public function getDateCreated();
 
     /**
      * Get the entry modification date
      *
-     * @return string
+     * @return \DateTime
      */
     public function getDateModified();
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php b/web/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
index b55fdad42..3ba5cd15e 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
@@ -41,8 +41,8 @@ class Rss extends AbstractEntry implements EntryInterface
     public function __construct(DOMElement $entry, $entryKey, $type = null)
     {
         parent::__construct($entry, $entryKey, $type);
-        $this->xpathQueryRss = '//item[' . ($this->entryKey+1) . ']';
-        $this->xpathQueryRdf = '//rss:item[' . ($this->entryKey+1) . ']';
+        $this->xpathQueryRss = '//item[' . ($this->entryKey + 1) . ']';
+        $this->xpathQueryRdf = '//rss:item[' . ($this->entryKey + 1) . ']';
 
         $manager    = Reader\Reader::getExtensionManager();
         $extensions = [
@@ -92,7 +92,7 @@ class Rss extends AbstractEntry implements EntryInterface
 
         $authors = [];
         $authorsDc = $this->getExtension('DublinCore')->getAuthors();
-        if (!empty($authorsDc)) {
+        if (! empty($authorsDc)) {
             foreach ($authorsDc as $author) {
                 $authors[] = [
                     'name' => $author['name']
@@ -151,7 +151,7 @@ class Rss extends AbstractEntry implements EntryInterface
 
         $content = $this->getExtension('Content')->getContent();
 
-        if (!$content) {
+        if (! $content) {
             $content = $this->getDescription();
         }
 
@@ -167,7 +167,7 @@ class Rss extends AbstractEntry implements EntryInterface
     /**
      * Get the entry's date of creation
      *
-     * @return string
+     * @return \DateTime
      */
     public function getDateCreated()
     {
@@ -178,7 +178,7 @@ class Rss extends AbstractEntry implements EntryInterface
      * Get the entry's date of modification
      *
      * @throws Exception\RuntimeException
-     * @return string
+     * @return \DateTime
      */
     public function getDateModified()
     {
@@ -209,7 +209,8 @@ class Rss extends AbstractEntry implements EntryInterface
                                     'Could not load date due to unrecognised'
                                     .' format (should follow RFC 822 or 2822):'
                                     . $e->getMessage(),
-                                    0, $e
+                                    0,
+                                    $e
                                 );
                             }
                         }
@@ -218,15 +219,15 @@ class Rss extends AbstractEntry implements EntryInterface
             }
         }
 
-        if (!$date) {
+        if (! $date) {
             $date = $this->getExtension('DublinCore')->getDate();
         }
 
-        if (!$date) {
+        if (! $date) {
             $date = $this->getExtension('Atom')->getDateModified();
         }
 
-        if (!$date) {
+        if (! $date) {
             $date = null;
         }
 
@@ -256,7 +257,7 @@ class Rss extends AbstractEntry implements EntryInterface
             $description = $this->xpath->evaluate('string(' . $this->xpathQueryRdf . '/rss:description)');
         }
 
-        if (!$description) {
+        if (! $description) {
             $description = $this->getExtension('DublinCore')->getDescription();
         }
 
@@ -264,7 +265,7 @@ class Rss extends AbstractEntry implements EntryInterface
             $description = $this->getExtension('Atom')->getDescription();
         }
 
-        if (!$description) {
+        if (! $description) {
             $description = null;
         }
 
@@ -296,7 +297,7 @@ class Rss extends AbstractEntry implements EntryInterface
             }
         }
 
-        if (!$enclosure) {
+        if (! $enclosure) {
             $enclosure = $this->getExtension('Atom')->getEnclosure();
         }
 
@@ -324,7 +325,7 @@ class Rss extends AbstractEntry implements EntryInterface
             $id = $this->xpath->evaluate('string(' . $this->xpathQueryRss . '/guid)');
         }
 
-        if (!$id) {
+        if (! $id) {
             $id = $this->getExtension('DublinCore')->getId();
         }
 
@@ -332,7 +333,7 @@ class Rss extends AbstractEntry implements EntryInterface
             $id = $this->getExtension('Atom')->getId();
         }
 
-        if (!$id) {
+        if (! $id) {
             if ($this->getPermalink()) {
                 $id = $this->getPermalink();
             } elseif ($this->getTitle()) {
@@ -355,7 +356,7 @@ class Rss extends AbstractEntry implements EntryInterface
      */
     public function getLink($index = 0)
     {
-        if (!array_key_exists('links', $this->data)) {
+        if (! array_key_exists('links', $this->data)) {
             $this->getLinks();
         }
 
@@ -386,7 +387,7 @@ class Rss extends AbstractEntry implements EntryInterface
             $list = $this->xpath->query($this->xpathQueryRdf . '//rss:link');
         }
 
-        if (!$list->length) {
+        if (! $list->length) {
             $links = $this->getExtension('Atom')->getLinks();
         } else {
             foreach ($list as $link) {
@@ -470,15 +471,15 @@ class Rss extends AbstractEntry implements EntryInterface
             $title = $this->xpath->evaluate('string(' . $this->xpathQueryRdf . '/rss:title)');
         }
 
-        if (!$title) {
+        if (! $title) {
             $title = $this->getExtension('DublinCore')->getTitle();
         }
 
-        if (!$title) {
+        if (! $title) {
             $title = $this->getExtension('Atom')->getTitle();
         }
 
-        if (!$title) {
+        if (! $title) {
             $title = null;
         }
 
@@ -500,15 +501,15 @@ class Rss extends AbstractEntry implements EntryInterface
 
         $commentcount = $this->getExtension('Slash')->getCommentCount();
 
-        if (!$commentcount) {
+        if (! $commentcount) {
             $commentcount = $this->getExtension('Thread')->getCommentCount();
         }
 
-        if (!$commentcount) {
+        if (! $commentcount) {
             $commentcount = $this->getExtension('Atom')->getCommentCount();
         }
 
-        if (!$commentcount) {
+        if (! $commentcount) {
             $commentcount = null;
         }
 
@@ -536,11 +537,11 @@ class Rss extends AbstractEntry implements EntryInterface
             $commentlink = $this->xpath->evaluate('string(' . $this->xpathQueryRss . '/comments)');
         }
 
-        if (!$commentlink) {
+        if (! $commentlink) {
             $commentlink = $this->getExtension('Atom')->getCommentLink();
         }
 
-        if (!$commentlink) {
+        if (! $commentlink) {
             $commentlink = null;
         }
 
@@ -562,15 +563,15 @@ class Rss extends AbstractEntry implements EntryInterface
 
         $commentfeedlink = $this->getExtension('WellFormedWeb')->getCommentFeedLink();
 
-        if (!$commentfeedlink) {
+        if (! $commentfeedlink) {
             $commentfeedlink = $this->getExtension('Atom')->getCommentFeedLink('rss');
         }
 
-        if (!$commentfeedlink) {
+        if (! $commentfeedlink) {
             $commentfeedlink = $this->getExtension('Atom')->getCommentFeedLink('rdf');
         }
 
-        if (!$commentfeedlink) {
+        if (! $commentfeedlink) {
             $commentfeedlink = null;
         }
 
diff --git a/web/vendor/zendframework/zend-hydrator/src/Exception/DomainException.php b/web/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidHttpClientException.php
similarity index 64%
rename from web/vendor/zendframework/zend-hydrator/src/Exception/DomainException.php
rename to web/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidHttpClientException.php
index 40baf4f5e..c5d662981 100644
--- a/web/vendor/zendframework/zend-hydrator/src/Exception/DomainException.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidHttpClientException.php
@@ -7,11 +7,10 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace Zend\Hydrator\Exception;
+namespace Zend\Feed\Reader\Exception;
 
-/**
- * Domain exception
- */
-class DomainException extends \DomainException implements ExceptionInterface
+use Zend\Feed\Exception;
+
+class InvalidHttpClientException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
index c589146ae..54df33e4c 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
@@ -135,18 +135,18 @@ abstract class AbstractEntry
         if ($type === Reader\Reader::TYPE_RSS_10
             || $type === Reader\Reader::TYPE_RSS_090
         ) {
-            $this->setXpathPrefix('//rss:item[' . ($this->entryKey + 1) . ']');
+            $this->setXpathPrefix('//rss:item[' . ((int)$this->entryKey + 1) . ']');
             return $this;
         }
 
         if ($type === Reader\Reader::TYPE_ATOM_10
             || $type === Reader\Reader::TYPE_ATOM_03
         ) {
-            $this->setXpathPrefix('//atom:entry[' . ($this->entryKey + 1) . ']');
+            $this->setXpathPrefix('//atom:entry[' . ((int)$this->entryKey + 1) . ']');
             return $this;
         }
 
-        $this->setXpathPrefix('//item[' . ($this->entryKey + 1) . ']');
+        $this->setXpathPrefix('//item[' . ((int)$this->entryKey + 1) . ']');
         return $this;
     }
 
@@ -186,7 +186,7 @@ abstract class AbstractEntry
      */
     public function getXpath()
     {
-        if (!$this->xpath) {
+        if (! $this->xpath) {
             $this->setXpath(new DOMXPath($this->getDomDocument()));
         }
         return $this->xpath;
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
index 9d06ad3b9..9ded6aa98 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
@@ -51,7 +51,7 @@ class Entry extends Extension\AbstractEntry
         $authors = [];
         $list = $this->getXpath()->query($this->getXpathPrefix() . '//atom:author');
 
-        if (!$list->length) {
+        if (! $list->length) {
             /**
              * TODO: Limit query to feed level els only!
              */
@@ -61,7 +61,7 @@ class Entry extends Extension\AbstractEntry
         if ($list->length) {
             foreach ($list as $author) {
                 $author = $this->getAuthorFromElement($author);
-                if (!empty($author)) {
+                if (! empty($author)) {
                     $authors[] = $author;
                 }
             }
@@ -121,7 +121,7 @@ class Entry extends Extension\AbstractEntry
             }
         }
 
-        if (!$content) {
+        if (! $content) {
             $content = $this->getDescription();
         }
 
@@ -139,7 +139,7 @@ class Entry extends Extension\AbstractEntry
      */
     protected function collectXhtml($xhtml, $prefix)
     {
-        if (!empty($prefix)) {
+        if (! empty($prefix)) {
             $prefix = $prefix . ':';
         }
         $matches = [
@@ -147,7 +147,7 @@ class Entry extends Extension\AbstractEntry
             "/<\/" . $prefix . "div>\s*$/"
         ];
         $xhtml = preg_replace($matches, '', $xhtml);
-        if (!empty($prefix)) {
+        if (! empty($prefix)) {
             $xhtml = preg_replace("/(<[\/]?)" . $prefix . "([a-zA-Z]+)/", '$1$2', $xhtml);
         }
         return $xhtml;
@@ -222,7 +222,7 @@ class Entry extends Extension\AbstractEntry
 
         $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:summary)');
 
-        if (!$description) {
+        if (! $description) {
             $description = null;
         }
 
@@ -271,7 +271,7 @@ class Entry extends Extension\AbstractEntry
 
         $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:id)');
 
-        if (!$id) {
+        if (! $id) {
             if ($this->getPermalink()) {
                 $id = $this->getPermalink();
             } elseif ($this->getTitle()) {
@@ -304,11 +304,11 @@ class Entry extends Extension\AbstractEntry
             . ')'
         );
 
-        if (!$baseUrl) {
+        if (! $baseUrl) {
             $baseUrl = $this->getXpath()->evaluate('string(//@xml:base[1])');
         }
 
-        if (!$baseUrl) {
+        if (! $baseUrl) {
             $baseUrl = null;
         }
 
@@ -325,7 +325,7 @@ class Entry extends Extension\AbstractEntry
      */
     public function getLink($index = 0)
     {
-        if (!array_key_exists('links', $this->data)) {
+        if (! array_key_exists('links', $this->data)) {
             $this->getLinks();
         }
 
@@ -388,7 +388,7 @@ class Entry extends Extension\AbstractEntry
 
         $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:title)');
 
-        if (!$title) {
+        if (! $title) {
             $title = null;
         }
 
@@ -554,10 +554,10 @@ class Entry extends Extension\AbstractEntry
      */
     protected function absolutiseUri($link)
     {
-        if (!Uri::factory($link)->isAbsolute()) {
+        if (! Uri::factory($link)->isAbsolute()) {
             if ($this->getBaseUrl() !== null) {
                 $link = $this->getBaseUrl() . $link;
-                if (!Uri::factory($link)->isValid()) {
+                if (! Uri::factory($link)->isValid()) {
                     $link = null;
                 }
             }
@@ -623,11 +623,11 @@ class Entry extends Extension\AbstractEntry
         $prefixAtom03 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_03);
         $prefixAtom10 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_10);
         if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_03)
-        || !empty($prefixAtom03)) {
+        || ! empty($prefixAtom03)) {
             return Reader\Reader::TYPE_ATOM_03;
         }
         if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_10)
-        || !empty($prefixAtom10)) {
+        || ! empty($prefixAtom10)) {
             return Reader\Reader::TYPE_ATOM_10;
         }
     }
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
index dc5a59f7f..94d914b09 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
@@ -53,7 +53,7 @@ class Feed extends Extension\AbstractFeed
         if ($list->length) {
             foreach ($list as $author) {
                 $author = $this->getAuthorFromElement($author);
-                if (!empty($author)) {
+                if (! empty($author)) {
                     $authors[] = $author;
                 }
             }
@@ -91,7 +91,7 @@ class Feed extends Extension\AbstractFeed
             $copyright = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:rights)');
         }
 
-        if (!$copyright) {
+        if (! $copyright) {
             $copyright = null;
         }
 
@@ -175,7 +175,7 @@ class Feed extends Extension\AbstractFeed
             $description = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:subtitle)');
         }
 
-        if (!$description) {
+        if (! $description) {
             $description = null;
         }
 
@@ -197,7 +197,7 @@ class Feed extends Extension\AbstractFeed
         // TODO: Add uri support
         $generator = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:generator)');
 
-        if (!$generator) {
+        if (! $generator) {
             $generator = null;
         }
 
@@ -219,7 +219,7 @@ class Feed extends Extension\AbstractFeed
 
         $id = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:id)');
 
-        if (!$id) {
+        if (! $id) {
             if ($this->getLink()) {
                 $id = $this->getLink();
             } elseif ($this->getTitle()) {
@@ -247,11 +247,11 @@ class Feed extends Extension\AbstractFeed
 
         $language = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:lang)');
 
-        if (!$language) {
+        if (! $language) {
             $language = $this->xpath->evaluate('string(//@xml:lang[1])');
         }
 
-        if (!$language) {
+        if (! $language) {
             $language = null;
         }
 
@@ -273,7 +273,7 @@ class Feed extends Extension\AbstractFeed
 
         $imageUrl = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:logo)');
 
-        if (!$imageUrl) {
+        if (! $imageUrl) {
             $image = null;
         } else {
             $image = ['uri' => $imageUrl];
@@ -297,7 +297,7 @@ class Feed extends Extension\AbstractFeed
 
         $baseUrl = $this->xpath->evaluate('string(//@xml:base[1])');
 
-        if (!$baseUrl) {
+        if (! $baseUrl) {
             $baseUrl = null;
         }
         $this->data['baseUrl'] = $baseUrl;
@@ -394,7 +394,7 @@ class Feed extends Extension\AbstractFeed
 
         $title = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:title)');
 
-        if (!$title) {
+        if (! $title) {
             $title = null;
         }
 
@@ -482,10 +482,10 @@ class Feed extends Extension\AbstractFeed
      */
     protected function absolutiseUri($link)
     {
-        if (!Uri::factory($link)->isAbsolute()) {
+        if (! Uri::factory($link)->isAbsolute()) {
             if ($this->getBaseUrl() !== null) {
                 $link = $this->getBaseUrl() . $link;
-                if (!Uri::factory($link)->isValid()) {
+                if (! Uri::factory($link)->isValid()) {
                     $link = null;
                 }
             }
@@ -523,12 +523,12 @@ class Feed extends Extension\AbstractFeed
         $prefixAtom03 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_03);
         $prefixAtom10 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_10);
         if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_10)
-            || !empty($prefixAtom10)
+            || ! empty($prefixAtom10)
         ) {
             return Reader\Reader::TYPE_ATOM_10;
         }
         if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_03)
-            || !empty($prefixAtom03)
+            || ! empty($prefixAtom03)
         ) {
             return Reader\Reader::TYPE_ATOM_03;
         }
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
index 1b42f581a..4da435b35 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
@@ -47,13 +47,13 @@ class Entry extends Extension\AbstractEntry
         $authors = [];
         $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:creator');
 
-        if (!$list->length) {
+        if (! $list->length) {
             $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:creator');
         }
-        if (!$list->length) {
+        if (! $list->length) {
             $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:publisher');
 
-            if (!$list->length) {
+            if (! $list->length) {
                 $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:publisher');
             }
         }
@@ -89,7 +89,7 @@ class Entry extends Extension\AbstractEntry
 
         $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:subject');
 
-        if (!$list->length) {
+        if (! $list->length) {
             $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:subject');
         }
 
@@ -133,11 +133,11 @@ class Entry extends Extension\AbstractEntry
 
         $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');
 
-        if (!$description) {
+        if (! $description) {
             $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:description)');
         }
 
-        if (!$description) {
+        if (! $description) {
             $description = null;
         }
 
@@ -159,7 +159,7 @@ class Entry extends Extension\AbstractEntry
 
         $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');
 
-        if (!$id) {
+        if (! $id) {
             $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:identifier)');
         }
 
@@ -181,11 +181,11 @@ class Entry extends Extension\AbstractEntry
 
         $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');
 
-        if (!$title) {
+        if (! $title) {
             $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:title)');
         }
 
-        if (!$title) {
+        if (! $title) {
             $title = null;
         }
 
@@ -208,7 +208,7 @@ class Entry extends Extension\AbstractEntry
         $d    = null;
         $date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');
 
-        if (!$date) {
+        if (! $date) {
             $date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:date)');
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
index 9e3395881..11fc68d68 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
@@ -47,13 +47,13 @@ class Feed extends Extension\AbstractFeed
         $authors = [];
         $list    = $this->getXpath()->query('//dc11:creator');
 
-        if (!$list->length) {
+        if (! $list->length) {
             $list = $this->getXpath()->query('//dc10:creator');
         }
-        if (!$list->length) {
+        if (! $list->length) {
             $list = $this->getXpath()->query('//dc11:publisher');
 
-            if (!$list->length) {
+            if (! $list->length) {
                 $list = $this->getXpath()->query('//dc10:publisher');
             }
         }
@@ -89,11 +89,11 @@ class Feed extends Extension\AbstractFeed
 
         $copyright = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:rights)');
 
-        if (!$copyright) {
+        if (! $copyright) {
             $copyright = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:rights)');
         }
 
-        if (!$copyright) {
+        if (! $copyright) {
             $copyright = null;
         }
 
@@ -115,11 +115,11 @@ class Feed extends Extension\AbstractFeed
 
         $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');
 
-        if (!$description) {
+        if (! $description) {
             $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:description)');
         }
 
-        if (!$description) {
+        if (! $description) {
             $description = null;
         }
 
@@ -141,7 +141,7 @@ class Feed extends Extension\AbstractFeed
 
         $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');
 
-        if (!$id) {
+        if (! $id) {
             $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:identifier)');
         }
 
@@ -163,11 +163,11 @@ class Feed extends Extension\AbstractFeed
 
         $language = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:language)');
 
-        if (!$language) {
+        if (! $language) {
             $language = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:language)');
         }
 
-        if (!$language) {
+        if (! $language) {
             $language = null;
         }
 
@@ -189,11 +189,11 @@ class Feed extends Extension\AbstractFeed
 
         $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');
 
-        if (!$title) {
+        if (! $title) {
             $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:title)');
         }
 
-        if (!$title) {
+        if (! $title) {
             $title = null;
         }
 
@@ -216,7 +216,7 @@ class Feed extends Extension\AbstractFeed
         $d = null;
         $date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');
 
-        if (!$date) {
+        if (! $date) {
             $date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:date)');
         }
 
@@ -242,7 +242,7 @@ class Feed extends Extension\AbstractFeed
 
         $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:subject');
 
-        if (!$list->length) {
+        if (! $list->length) {
             $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:subject');
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
index 5aec2fd9c..e18bc387b 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
@@ -28,7 +28,7 @@ class Entry extends Extension\AbstractEntry
 
         $author = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:author)');
 
-        if (!$author) {
+        if (! $author) {
             $author = null;
         }
 
@@ -50,7 +50,7 @@ class Entry extends Extension\AbstractEntry
 
         $block = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:block)');
 
-        if (!$block) {
+        if (! $block) {
             $block = null;
         }
 
@@ -72,7 +72,7 @@ class Entry extends Extension\AbstractEntry
 
         $duration = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:duration)');
 
-        if (!$duration) {
+        if (! $duration) {
             $duration = null;
         }
 
@@ -94,7 +94,7 @@ class Entry extends Extension\AbstractEntry
 
         $explicit = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:explicit)');
 
-        if (!$explicit) {
+        if (! $explicit) {
             $explicit = null;
         }
 
@@ -116,7 +116,7 @@ class Entry extends Extension\AbstractEntry
 
         $keywords = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:keywords)');
 
-        if (!$keywords) {
+        if (! $keywords) {
             $keywords = null;
         }
 
@@ -138,7 +138,7 @@ class Entry extends Extension\AbstractEntry
 
         $subtitle = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:subtitle)');
 
-        if (!$subtitle) {
+        if (! $subtitle) {
             $subtitle = null;
         }
 
@@ -160,7 +160,7 @@ class Entry extends Extension\AbstractEntry
 
         $summary = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:summary)');
 
-        if (!$summary) {
+        if (! $summary) {
             $summary = null;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
index 4ae7bf3ac..d2d11cb4b 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
@@ -29,7 +29,7 @@ class Feed extends Extension\AbstractFeed
 
         $author = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:author)');
 
-        if (!$author) {
+        if (! $author) {
             $author = null;
         }
 
@@ -51,7 +51,7 @@ class Feed extends Extension\AbstractFeed
 
         $block = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:block)');
 
-        if (!$block) {
+        if (! $block) {
             $block = null;
         }
 
@@ -83,7 +83,7 @@ class Feed extends Extension\AbstractFeed
                     $children = [];
 
                     foreach ($node->childNodes as $childNode) {
-                        if (!($childNode instanceof DOMText)) {
+                        if (! ($childNode instanceof DOMText)) {
                             $children[$childNode->getAttribute('text')] = null;
                         }
                     }
@@ -93,7 +93,7 @@ class Feed extends Extension\AbstractFeed
             }
         }
 
-        if (!$categories) {
+        if (! $categories) {
             $categories = null;
         }
 
@@ -115,7 +115,7 @@ class Feed extends Extension\AbstractFeed
 
         $explicit = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:explicit)');
 
-        if (!$explicit) {
+        if (! $explicit) {
             $explicit = null;
         }
 
@@ -137,7 +137,7 @@ class Feed extends Extension\AbstractFeed
 
         $image = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:image/@href)');
 
-        if (!$image) {
+        if (! $image) {
             $image = null;
         }
 
@@ -159,7 +159,7 @@ class Feed extends Extension\AbstractFeed
 
         $keywords = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:keywords)');
 
-        if (!$keywords) {
+        if (! $keywords) {
             $keywords = null;
         }
 
@@ -181,7 +181,7 @@ class Feed extends Extension\AbstractFeed
 
         $newFeedUrl = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:new-feed-url)');
 
-        if (!$newFeedUrl) {
+        if (! $newFeedUrl) {
             $newFeedUrl = null;
         }
 
@@ -206,13 +206,13 @@ class Feed extends Extension\AbstractFeed
         $email = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:owner/itunes:email)');
         $name  = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:owner/itunes:name)');
 
-        if (!empty($email)) {
+        if (! empty($email)) {
             $owner = $email . (empty($name) ? '' : ' (' . $name . ')');
-        } elseif (!empty($name)) {
+        } elseif (! empty($name)) {
             $owner = $name;
         }
 
-        if (!$owner) {
+        if (! $owner) {
             $owner = null;
         }
 
@@ -234,7 +234,7 @@ class Feed extends Extension\AbstractFeed
 
         $subtitle = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:subtitle)');
 
-        if (!$subtitle) {
+        if (! $subtitle) {
             $subtitle = null;
         }
 
@@ -256,7 +256,7 @@ class Feed extends Extension\AbstractFeed
 
         $summary = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:summary)');
 
-        if (!$summary) {
+        if (! $summary) {
             $summary = null;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
index 4bd01fe7f..93cd54a15 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
@@ -51,7 +51,7 @@ class Entry extends Extension\AbstractEntry
         $stringParade = $this->getData($name);
         $hitParade    = [];
 
-        if (!empty($stringParade)) {
+        if (! empty($stringParade)) {
             $stringParade = explode(',', $stringParade);
 
             foreach ($stringParade as $hit) {
@@ -78,7 +78,7 @@ class Entry extends Extension\AbstractEntry
 
         $comments = $this->getData($name, 'string');
 
-        if (!$comments) {
+        if (! $comments) {
             $this->data[$name] = null;
             return $this->data[$name];
         }
@@ -101,7 +101,7 @@ class Entry extends Extension\AbstractEntry
 
         $data = $this->xpath->evaluate($type . '(' . $this->getXpathPrefix() . '/slash10:' . $name . ')');
 
-        if (!$data) {
+        if (! $data) {
             $data = null;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
index 09f12ddea..e126c6d08 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
@@ -39,8 +39,7 @@ class Feed extends Extension\AbstractFeed
                 return $period;
             default:
                 throw new Reader\Exception\InvalidArgumentException("Feed specified invalid update period: '$period'."
-                    .  " Must be one of hourly, daily, weekly or yearly"
-                );
+                    .  " Must be one of hourly, daily, weekly or yearly");
         }
     }
 
@@ -54,7 +53,7 @@ class Feed extends Extension\AbstractFeed
         $name = 'updateFrequency';
         $freq = $this->getData($name, 'number');
 
-        if (!$freq || $freq < 1) {
+        if (! $freq || $freq < 1) {
             $this->data[$name] = 1;
             return 1;
         }
@@ -72,7 +71,7 @@ class Feed extends Extension\AbstractFeed
         $name = 'updateFrequency';
         $freq = $this->getData($name, 'number');
 
-        if (!$freq || $freq < 1) {
+        if (! $freq || $freq < 1) {
             $this->data[$name] = 1;
             $freq = 1;
         }
@@ -130,7 +129,7 @@ class Feed extends Extension\AbstractFeed
 
         $data = $this->xpath->evaluate($type . '(' . $this->getXpathPrefix() . '/syn10:' . $name . ')');
 
-        if (!$data) {
+        if (! $data) {
             $data = null;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
index e5de5bb1c..e378d4b88 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
@@ -51,7 +51,7 @@ class Entry extends Extension\AbstractEntry
 
         $data = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/thread10:' . $name . ')');
 
-        if (!$data) {
+        if (! $data) {
             $data = null;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php b/web/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
index 42fafb4aa..ff19d0e16 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
@@ -29,7 +29,7 @@ class Entry extends Extension\AbstractEntry
 
         $data = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/wfw:' . $name . ')');
 
-        if (!$data) {
+        if (! $data) {
             $data = null;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php b/web/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
index 6740cc92b..f7946b791 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
@@ -46,7 +46,7 @@ class ExtensionManager implements ExtensionManagerInterface
      */
     public function __call($method, $args)
     {
-        if (!method_exists($this->pluginManager, $method)) {
+        if (! method_exists($this->pluginManager, $method)) {
             throw new Exception\BadMethodCallException(sprintf(
                 'Method by name of %s does not exist in %s',
                 $method,
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php b/web/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
index 431be124c..a2b5fffa3 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
@@ -10,6 +10,8 @@
 namespace Zend\Feed\Reader;
 
 use Zend\ServiceManager\AbstractPluginManager;
+use Zend\ServiceManager\Exception\InvalidServiceException;
+use Zend\ServiceManager\Factory\InvokableFactory;
 
 /**
  * Plugin manager implementation for feed reader extensions based on the
@@ -18,36 +20,119 @@ use Zend\ServiceManager\AbstractPluginManager;
  * Validation checks that we have an Extension\AbstractEntry or
  * Extension\AbstractFeed.
  */
-class ExtensionPluginManager extends AbstractPluginManager
+class ExtensionPluginManager extends AbstractPluginManager implements ExtensionManagerInterface
 {
     /**
-     * Default set of extension classes
+     * Aliases for default set of extension classes
      *
      * @var array
      */
-    protected $invokableClasses = [
-        'atomentry'            => 'Zend\Feed\Reader\Extension\Atom\Entry',
-        'atomfeed'             => 'Zend\Feed\Reader\Extension\Atom\Feed',
-        'contententry'         => 'Zend\Feed\Reader\Extension\Content\Entry',
-        'creativecommonsentry' => 'Zend\Feed\Reader\Extension\CreativeCommons\Entry',
-        'creativecommonsfeed'  => 'Zend\Feed\Reader\Extension\CreativeCommons\Feed',
-        'dublincoreentry'      => 'Zend\Feed\Reader\Extension\DublinCore\Entry',
-        'dublincorefeed'       => 'Zend\Feed\Reader\Extension\DublinCore\Feed',
-        'podcastentry'         => 'Zend\Feed\Reader\Extension\Podcast\Entry',
-        'podcastfeed'          => 'Zend\Feed\Reader\Extension\Podcast\Feed',
-        'slashentry'           => 'Zend\Feed\Reader\Extension\Slash\Entry',
-        'syndicationfeed'      => 'Zend\Feed\Reader\Extension\Syndication\Feed',
-        'threadentry'          => 'Zend\Feed\Reader\Extension\Thread\Entry',
-        'wellformedwebentry'   => 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry',
+    protected $aliases = [
+        'atomentry'            => Extension\Atom\Entry::class,
+        'atomEntry'            => Extension\Atom\Entry::class,
+        'AtomEntry'            => Extension\Atom\Entry::class,
+        'Atom\Entry'           => Extension\Atom\Entry::class,
+        'atomfeed'             => Extension\Atom\Feed::class,
+        'atomFeed'             => Extension\Atom\Feed::class,
+        'AtomFeed'             => Extension\Atom\Feed::class,
+        'Atom\Feed'            => Extension\Atom\Feed::class,
+        'contententry'         => Extension\Content\Entry::class,
+        'contentEntry'         => Extension\Content\Entry::class,
+        'ContentEntry'         => Extension\Content\Entry::class,
+        'Content\Entry'        => Extension\Content\Entry::class,
+        'creativecommonsentry' => Extension\CreativeCommons\Entry::class,
+        'creativeCommonsEntry' => Extension\CreativeCommons\Entry::class,
+        'CreativeCommonsEntry' => Extension\CreativeCommons\Entry::class,
+        'CreativeCommons\Entry' => Extension\CreativeCommons\Entry::class,
+        'creativecommonsfeed'  => Extension\CreativeCommons\Feed::class,
+        'creativeCommonsFeed'  => Extension\CreativeCommons\Feed::class,
+        'CreativeCommonsFeed'  => Extension\CreativeCommons\Feed::class,
+        'CreativeCommons\Feed' => Extension\CreativeCommons\Feed::class,
+        'dublincoreentry'      => Extension\DublinCore\Entry::class,
+        'dublinCoreEntry'      => Extension\DublinCore\Entry::class,
+        'DublinCoreEntry'      => Extension\DublinCore\Entry::class,
+        'DublinCore\Entry'     => Extension\DublinCore\Entry::class,
+        'dublincorefeed'       => Extension\DublinCore\Feed::class,
+        'dublinCoreFeed'       => Extension\DublinCore\Feed::class,
+        'DublinCoreFeed'       => Extension\DublinCore\Feed::class,
+        'DublinCore\Feed'      => Extension\DublinCore\Feed::class,
+        'podcastentry'         => Extension\Podcast\Entry::class,
+        'podcastEntry'         => Extension\Podcast\Entry::class,
+        'PodcastEntry'         => Extension\Podcast\Entry::class,
+        'Podcast\Entry'        => Extension\Podcast\Entry::class,
+        'podcastfeed'          => Extension\Podcast\Feed::class,
+        'podcastFeed'          => Extension\Podcast\Feed::class,
+        'PodcastFeed'          => Extension\Podcast\Feed::class,
+        'Podcast\Feed'         => Extension\Podcast\Feed::class,
+        'slashentry'           => Extension\Slash\Entry::class,
+        'slashEntry'           => Extension\Slash\Entry::class,
+        'SlashEntry'           => Extension\Slash\Entry::class,
+        'Slash\Entry'          => Extension\Slash\Entry::class,
+        'syndicationfeed'      => Extension\Syndication\Feed::class,
+        'syndicationFeed'      => Extension\Syndication\Feed::class,
+        'SyndicationFeed'      => Extension\Syndication\Feed::class,
+        'Syndication\Feed'     => Extension\Syndication\Feed::class,
+        'threadentry'          => Extension\Thread\Entry::class,
+        'threadEntry'          => Extension\Thread\Entry::class,
+        'ThreadEntry'          => Extension\Thread\Entry::class,
+        'Thread\Entry'         => Extension\Thread\Entry::class,
+        'wellformedwebentry'   => Extension\WellFormedWeb\Entry::class,
+        'wellFormedWebEntry'   => Extension\WellFormedWeb\Entry::class,
+        'WellFormedWebEntry'   => Extension\WellFormedWeb\Entry::class,
+        'WellFormedWeb\Entry'  => Extension\WellFormedWeb\Entry::class,
     ];
 
     /**
-     * Do not share instances
+     * Factories for default set of extension classes
+     *
+     * @var array
+     */
+    protected $factories = [
+        Extension\Atom\Entry::class            => InvokableFactory::class,
+        Extension\Atom\Feed::class             => InvokableFactory::class,
+        Extension\Content\Entry::class         => InvokableFactory::class,
+        Extension\CreativeCommons\Entry::class => InvokableFactory::class,
+        Extension\CreativeCommons\Feed::class  => InvokableFactory::class,
+        Extension\DublinCore\Entry::class      => InvokableFactory::class,
+        Extension\DublinCore\Feed::class       => InvokableFactory::class,
+        Extension\Podcast\Entry::class         => InvokableFactory::class,
+        Extension\Podcast\Feed::class          => InvokableFactory::class,
+        Extension\Slash\Entry::class           => InvokableFactory::class,
+        Extension\Syndication\Feed::class      => InvokableFactory::class,
+        Extension\Thread\Entry::class          => InvokableFactory::class,
+        Extension\WellFormedWeb\Entry::class   => InvokableFactory::class,
+        // Legacy (v2) due to alias resolution; canonical form of resolved
+        // alias is used to look up the factory, while the non-normalized
+        // resolved alias is used as the requested name passed to the factory.
+        'zendfeedreaderextensionatomentry'            => InvokableFactory::class,
+        'zendfeedreaderextensionatomfeed'             => InvokableFactory::class,
+        'zendfeedreaderextensioncontententry'         => InvokableFactory::class,
+        'zendfeedreaderextensioncreativecommonsentry' => InvokableFactory::class,
+        'zendfeedreaderextensioncreativecommonsfeed'  => InvokableFactory::class,
+        'zendfeedreaderextensiondublincoreentry'      => InvokableFactory::class,
+        'zendfeedreaderextensiondublincorefeed'       => InvokableFactory::class,
+        'zendfeedreaderextensionpodcastentry'         => InvokableFactory::class,
+        'zendfeedreaderextensionpodcastfeed'          => InvokableFactory::class,
+        'zendfeedreaderextensionslashentry'           => InvokableFactory::class,
+        'zendfeedreaderextensionsyndicationfeed'      => InvokableFactory::class,
+        'zendfeedreaderextensionthreadentry'          => InvokableFactory::class,
+        'zendfeedreaderextensionwellformedwebentry'   => InvokableFactory::class,
+    ];
+
+    /**
+     * Do not share instances (v2)
      *
      * @var bool
      */
     protected $shareByDefault = false;
 
+    /**
+     * Do not share instances (v3)
+     *
+     * @var bool
+     */
+    protected $sharedByDefault = false;
+
     /**
      * Validate the plugin
      *
@@ -57,7 +142,7 @@ class ExtensionPluginManager extends AbstractPluginManager
      * @return void
      * @throws Exception\InvalidArgumentException if invalid
      */
-    public function validatePlugin($plugin)
+    public function validate($plugin)
     {
         if ($plugin instanceof Extension\AbstractEntry
             || $plugin instanceof Extension\AbstractFeed
@@ -66,7 +151,7 @@ class ExtensionPluginManager extends AbstractPluginManager
             return;
         }
 
-        throw new Exception\InvalidArgumentException(sprintf(
+        throw new InvalidServiceException(sprintf(
             'Plugin of type %s is invalid; must implement %s\Extension\AbstractFeed '
             . 'or %s\Extension\AbstractEntry',
             (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
@@ -74,4 +159,26 @@ class ExtensionPluginManager extends AbstractPluginManager
             __NAMESPACE__
         ));
     }
+
+    /**
+     * Validate the plugin (v2)
+     *
+     * @param  mixed $plugin
+     * @return void
+     * @throws Exception\InvalidArgumentException if invalid
+     */
+    public function validatePlugin($plugin)
+    {
+        try {
+            $this->validate($plugin);
+        } catch (InvalidServiceException $e) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Plugin of type %s is invalid; must implement %s\Extension\AbstractFeed '
+                . 'or %s\Extension\AbstractEntry',
+                (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+                __NAMESPACE__,
+                __NAMESPACE__
+            ));
+        }
+    }
 }
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php b/web/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
index 78b671dd4..179a1a516 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
@@ -282,8 +282,10 @@ abstract class AbstractFeed implements FeedInterface
             if (in_array($extension, $all['core'])) {
                 continue;
             }
-            if (!$manager->has($extension)) {
-                throw new Exception\RuntimeException(sprintf('Unable to load extension "%s"; cannot find class', $extension));
+            if (! $manager->has($extension)) {
+                throw new Exception\RuntimeException(
+                    sprintf('Unable to load extension "%s"; cannot find class', $extension)
+                );
             }
             $plugin = $manager->get($extension);
             $plugin->setDomDocument($this->getDomDocument());
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php b/web/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
index 37064701c..f0c5c2e91 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
@@ -92,7 +92,7 @@ class Atom extends AbstractFeed
 
         $copyright = $this->getExtension('Atom')->getCopyright();
 
-        if (!$copyright) {
+        if (! $copyright) {
             $copyright = null;
         }
 
@@ -104,7 +104,7 @@ class Atom extends AbstractFeed
     /**
      * Get the feed creation date
      *
-     * @return string|null
+     * @return \DateTime|null
      */
     public function getDateCreated()
     {
@@ -114,7 +114,7 @@ class Atom extends AbstractFeed
 
         $dateCreated = $this->getExtension('Atom')->getDateCreated();
 
-        if (!$dateCreated) {
+        if (! $dateCreated) {
             $dateCreated = null;
         }
 
@@ -126,7 +126,7 @@ class Atom extends AbstractFeed
     /**
      * Get the feed modification date
      *
-     * @return string|null
+     * @return \DateTime|null
      */
     public function getDateModified()
     {
@@ -136,7 +136,7 @@ class Atom extends AbstractFeed
 
         $dateModified = $this->getExtension('Atom')->getDateModified();
 
-        if (!$dateModified) {
+        if (! $dateModified) {
             $dateModified = null;
         }
 
@@ -168,7 +168,7 @@ class Atom extends AbstractFeed
 
         $description = $this->getExtension('Atom')->getDescription();
 
-        if (!$description) {
+        if (! $description) {
             $description = null;
         }
 
@@ -226,11 +226,11 @@ class Atom extends AbstractFeed
 
         $language = $this->getExtension('Atom')->getLanguage();
 
-        if (!$language) {
+        if (! $language) {
             $language = $this->xpath->evaluate('string(//@xml:lang[1])');
         }
 
-        if (!$language) {
+        if (! $language) {
             $language = null;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php b/web/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
index 441ba9269..875482e26 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
@@ -41,14 +41,14 @@ interface FeedInterface extends Iterator, Countable
     /**
      * Get the feed creation date
      *
-     * @return string|null
+     * @return \DateTime|null
      */
     public function getDateCreated();
 
     /**
      * Get the feed modification date
      *
-     * @return string|null
+     * @return \DateTime|null
      */
     public function getDateModified();
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php b/web/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
index 1a148b219..1275bda54 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
@@ -85,7 +85,7 @@ class Rss extends AbstractFeed
 
         $authors = [];
         $authorsDc = $this->getExtension('DublinCore')->getAuthors();
-        if (!empty($authorsDc)) {
+        if (! empty($authorsDc)) {
             foreach ($authorsDc as $author) {
                 $authors[] = [
                     'name' => $author['name']
@@ -153,7 +153,7 @@ class Rss extends AbstractFeed
             $copyright = $this->xpath->evaluate('string(/rss/channel/copyright)');
         }
 
-        if (!$copyright && $this->getExtension('DublinCore') !== null) {
+        if (! $copyright && $this->getExtension('DublinCore') !== null) {
             $copyright = $this->getExtension('DublinCore')->getCopyright();
         }
 
@@ -161,7 +161,7 @@ class Rss extends AbstractFeed
             $copyright = $this->getExtension('Atom')->getCopyright();
         }
 
-        if (!$copyright) {
+        if (! $copyright) {
             $copyright = null;
         }
 
@@ -173,7 +173,7 @@ class Rss extends AbstractFeed
     /**
      * Get the feed creation date
      *
-     * @return string|null
+     * @return DateTime|null
      */
     public function getDateCreated()
     {
@@ -197,7 +197,7 @@ class Rss extends AbstractFeed
         if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
             $this->getType() !== Reader\Reader::TYPE_RSS_090) {
             $dateModified = $this->xpath->evaluate('string(/rss/channel/pubDate)');
-            if (!$dateModified) {
+            if (! $dateModified) {
                 $dateModified = $this->xpath->evaluate('string(/rss/channel/lastBuildDate)');
             }
             if ($dateModified) {
@@ -217,7 +217,8 @@ class Rss extends AbstractFeed
                                     'Could not load date due to unrecognised'
                                     .' format (should follow RFC 822 or 2822):'
                                     . $e->getMessage(),
-                                    0, $e
+                                    0,
+                                    $e
                                 );
                             }
                         }
@@ -226,15 +227,15 @@ class Rss extends AbstractFeed
             }
         }
 
-        if (!$date) {
+        if (! $date) {
             $date = $this->getExtension('DublinCore')->getDate();
         }
 
-        if (!$date) {
+        if (! $date) {
             $date = $this->getExtension('Atom')->getDateModified();
         }
 
-        if (!$date) {
+        if (! $date) {
             $date = null;
         }
 
@@ -277,7 +278,8 @@ class Rss extends AbstractFeed
                                     'Could not load date due to unrecognised'
                                     .' format (should follow RFC 822 or 2822):'
                                     . $e->getMessage(),
-                                    0, $e
+                                    0,
+                                    $e
                                 );
                             }
                         }
@@ -286,7 +288,7 @@ class Rss extends AbstractFeed
             }
         }
 
-        if (!$date) {
+        if (! $date) {
             $date = null;
         }
 
@@ -313,7 +315,7 @@ class Rss extends AbstractFeed
             $description = $this->xpath->evaluate('string(/rdf:RDF/rss:channel/rss:description)');
         }
 
-        if (!$description && $this->getExtension('DublinCore') !== null) {
+        if (! $description && $this->getExtension('DublinCore') !== null) {
             $description = $this->getExtension('DublinCore')->getDescription();
         }
 
@@ -321,7 +323,7 @@ class Rss extends AbstractFeed
             $description = $this->getExtension('Atom')->getDescription();
         }
 
-        if (!$description) {
+        if (! $description) {
             $description = null;
         }
 
@@ -348,7 +350,7 @@ class Rss extends AbstractFeed
             $id = $this->xpath->evaluate('string(/rss/channel/guid)');
         }
 
-        if (!$id && $this->getExtension('DublinCore') !== null) {
+        if (! $id && $this->getExtension('DublinCore') !== null) {
             $id = $this->getExtension('DublinCore')->getId();
         }
 
@@ -356,7 +358,7 @@ class Rss extends AbstractFeed
             $id = $this->getExtension('Atom')->getId();
         }
 
-        if (!$id) {
+        if (! $id) {
             if ($this->getLink()) {
                 $id = $this->getLink();
             } elseif ($this->getTitle()) {
@@ -443,7 +445,7 @@ class Rss extends AbstractFeed
             $language = $this->xpath->evaluate('string(/rss/channel/language)');
         }
 
-        if (!$language && $this->getExtension('DublinCore') !== null) {
+        if (! $language && $this->getExtension('DublinCore') !== null) {
             $language = $this->getExtension('DublinCore')->getLanguage();
         }
 
@@ -451,11 +453,11 @@ class Rss extends AbstractFeed
             $language = $this->getExtension('Atom')->getLanguage();
         }
 
-        if (!$language) {
+        if (! $language) {
             $language = $this->xpath->evaluate('string(//@xml:lang[1])');
         }
 
-        if (!$language) {
+        if (! $language) {
             $language = null;
         }
 
@@ -486,7 +488,7 @@ class Rss extends AbstractFeed
             $link = $this->getExtension('Atom')->getLink();
         }
 
-        if (!$link) {
+        if (! $link) {
             $link = null;
         }
 
@@ -535,7 +537,7 @@ class Rss extends AbstractFeed
             $generator = $this->xpath->evaluate('string(/rss/channel/generator)');
         }
 
-        if (!$generator) {
+        if (! $generator) {
             if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
             $this->getType() !== Reader\Reader::TYPE_RSS_090) {
                 $generator = $this->xpath->evaluate('string(/rss/channel/atom:generator)');
@@ -548,7 +550,7 @@ class Rss extends AbstractFeed
             $generator = $this->getExtension('Atom')->getGenerator();
         }
 
-        if (!$generator) {
+        if (! $generator) {
             $generator = null;
         }
 
@@ -575,15 +577,15 @@ class Rss extends AbstractFeed
             $title = $this->xpath->evaluate('string(/rdf:RDF/rss:channel/rss:title)');
         }
 
-        if (!$title && $this->getExtension('DublinCore') !== null) {
+        if (! $title && $this->getExtension('DublinCore') !== null) {
             $title = $this->getExtension('DublinCore')->getTitle();
         }
 
-        if (!$title) {
+        if (! $title) {
             $title = $this->getExtension('Atom')->getTitle();
         }
 
-        if (!$title) {
+        if (! $title) {
             $title = null;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/FeedSet.php b/web/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
index d89053283..2f640628e 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
@@ -41,14 +41,14 @@ class FeedSet extends ArrayObject
     {
         foreach ($links as $link) {
             if (strtolower($link->getAttribute('rel')) !== 'alternate'
-                || !$link->getAttribute('type') || !$link->getAttribute('href')) {
+                || ! $link->getAttribute('type') || ! $link->getAttribute('href')) {
                 continue;
             }
-            if (!isset($this->rss) && $link->getAttribute('type') == 'application/rss+xml') {
+            if (! isset($this->rss) && $link->getAttribute('type') == 'application/rss+xml') {
                 $this->rss = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
-            } elseif (!isset($this->atom) && $link->getAttribute('type') == 'application/atom+xml') {
+            } elseif (! isset($this->atom) && $link->getAttribute('type') == 'application/atom+xml') {
                 $this->atom = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
-            } elseif (!isset($this->rdf) && $link->getAttribute('type') == 'application/rdf+xml') {
+            } elseif (! isset($this->rdf) && $link->getAttribute('type') == 'application/rdf+xml') {
                 $this->rdf = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
             }
             $this[] = new static([
@@ -61,33 +61,73 @@ class FeedSet extends ArrayObject
 
     /**
      *  Attempt to turn a relative URI into an absolute URI
+     *
+     *  @param string $link
+     *  @param string $uri OPTIONAL
+     *  @return string|null absolutised link or null if invalid
      */
     protected function absolutiseUri($link, $uri = null)
     {
         $linkUri = Uri::factory($link);
-        if (!$linkUri->isAbsolute() or !$linkUri->isValid()) {
-            if ($uri !== null) {
-                $uri = Uri::factory($uri);
-
-                if ($link[0] !== '/') {
-                    $link = $uri->getPath() . '/' . $link;
-                }
-
-                $link   = sprintf(
-                    '%s://%s/%s',
-                    ($uri->getScheme() ?: 'http'),
-                    $uri->getHost(),
-                    $this->canonicalizePath($link)
-                );
-
-                if (!Uri::factory($link)->isValid()) {
-                    $link = null;
-                }
-            }
+        if ($linkUri->isAbsolute()) {
+            // invalid absolute link can not be recovered
+            return $linkUri->isValid() ? $link : null;
         }
+
+        $scheme = 'http';
+        if ($uri !== null) {
+            $uri = Uri::factory($uri);
+            $scheme = $uri->getScheme() ?: $scheme;
+        }
+
+        if ($linkUri->getHost()) {
+            $link = $this->resolveSchemeRelativeUri($link, $scheme);
+        } elseif ($uri !== null) {
+            $link = $this->resolveRelativeUri($link, $scheme, $uri->getHost(), $uri->getPath());
+        }
+
+        if (! Uri::factory($link)->isValid()) {
+            return null;
+        }
+
         return $link;
     }
 
+    /**
+     * Resolves scheme relative link to absolute
+     *
+     * @param string $link
+     * @param string $scheme
+     * @return string
+     */
+    private function resolveSchemeRelativeUri($link, $scheme)
+    {
+        $link = ltrim($link, '/');
+        return sprintf('%s://%s', $scheme, $link);
+    }
+
+    /**
+     *  Resolves relative link to absolute
+     *
+     *  @param string $link
+     *  @param string $scheme
+     *  @param string $host
+     *  @param string $uriPath
+     *  @return string
+     */
+    private function resolveRelativeUri($link, $scheme, $host, $uriPath)
+    {
+        if ($link[0] !== '/') {
+            $link = $uriPath . '/' . $link;
+        }
+        return sprintf(
+            '%s://%s/%s',
+            $scheme,
+            $host,
+            $this->canonicalizePath($link)
+        );
+    }
+
     /**
      *  Canonicalize relative path
      */
@@ -117,8 +157,8 @@ class FeedSet extends ArrayObject
      */
     public function offsetGet($offset)
     {
-        if ($offset == 'feed' && !$this->offsetExists('feed')) {
-            if (!$this->offsetExists('href')) {
+        if ($offset == 'feed' && ! $this->offsetExists('feed')) {
+            if (! $this->offsetExists('href')) {
                 return;
             }
             $feed = Reader::import($this->offsetGet('href'));
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareClientInterface.php b/web/vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareClientInterface.php
new file mode 100644
index 000000000..5895b7cd2
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareClientInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader\Http;
+
+interface HeaderAwareClientInterface extends ClientInterface
+{
+    /**
+     * Allow specifying headers to use when fetching a feed.
+     *
+     * Headers MUST be in the format:
+     *
+     * <code>
+     * [
+     *     'header-name' => [
+     *         'header',
+     *         'values'
+     *     ]
+     * ]
+     * </code>
+     *
+     * @param string $uri
+     * @param array $headers
+     * @return HeaderAwareResponseInterface
+     */
+    public function get($uri, array $headers = []);
+}
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareResponseInterface.php b/web/vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareResponseInterface.php
new file mode 100644
index 000000000..509c5fd7e
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareResponseInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader\Http;
+
+interface HeaderAwareResponseInterface extends ResponseInterface
+{
+    /**
+     * Retrieve a header (as a single line) from the response.
+     *
+     * Header name lookups MUST be case insensitive.
+     *
+     * Since the only header values the feed reader consumes are singular
+     * in nature, this method is expected to return a string, and not
+     * an array of values.
+     *
+     * @param string $name Header name to retrieve.
+     * @param mixed $default Default value to use if header is not present.
+     * @return string
+     */
+    public function getHeaderLine($name, $default = null);
+}
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Http/Psr7ResponseDecorator.php b/web/vendor/zendframework/zend-feed/src/Reader/Http/Psr7ResponseDecorator.php
new file mode 100644
index 000000000..7424fef6d
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Http/Psr7ResponseDecorator.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader\Http;
+
+use Psr\Http\Message\ResponseInterface as Psr7ResponseInterface;
+
+/**
+ * ResponseInterface wrapper for a PSR-7 response.
+ */
+class Psr7ResponseDecorator implements HeaderAwareResponseInterface
+{
+    /**
+     * @var Psr7ResponseInterface
+     */
+    private $decoratedResponse;
+
+    /**
+     * @param Psr7ResponseInterface $response
+     */
+    public function __construct(Psr7ResponseInterface $response)
+    {
+        $this->decoratedResponse = $response;
+    }
+
+    /**
+     * Return the original PSR-7 response being decorated.
+     *
+     * @return Psr7ResponseInterface
+     */
+    public function getDecoratedResponse()
+    {
+        return $this->decoratedResponse;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBody()
+    {
+        return (string) $this->decoratedResponse->getBody();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getStatusCode()
+    {
+        return $this->decoratedResponse->getStatusCode();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getHeaderLine($name, $default = null)
+    {
+        if (! $this->decoratedResponse->hasHeader($name)) {
+            return $default;
+        }
+        return $this->decoratedResponse->getHeaderLine($name);
+    }
+}
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Http/Response.php b/web/vendor/zendframework/zend-feed/src/Reader/Http/Response.php
new file mode 100644
index 000000000..482c33e1f
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Http/Response.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader\Http;
+
+use Zend\Feed\Reader\Exception;
+
+class Response implements HeaderAwareResponseInterface
+{
+    /**
+     * @var string
+     */
+    private $body;
+
+    /**
+     * @var array
+     */
+    private $headers;
+
+    /**
+     * @var int
+     */
+    private $statusCode;
+
+    /**
+     * @param int $statusCode
+     * @param string|object $body
+     * @param array $headers
+     * @throws Exception\InvalidArgumentException
+     */
+    public function __construct($statusCode, $body = '', array $headers = [])
+    {
+        $this->validateStatusCode($statusCode);
+        $this->validateBody($body);
+        $this->validateHeaders($headers);
+
+        $this->statusCode = (int) $statusCode;
+        $this->body       = (string) $body;
+        $this->headers    = $this->normalizeHeaders($headers);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getHeaderLine($name, $default = null)
+    {
+        $normalizedName = strtolower($name);
+        return isset($this->headers[$normalizedName])
+            ? $this->headers[$normalizedName]
+            : $default;
+    }
+
+    /**
+     * Validate that we have a status code argument that will work for our context.
+     *
+     * @param mixed $body
+     * @throws Exception\InvalidArgumentException for arguments not castable
+     *     to integer HTTP status codes.
+     */
+    private function validateStatusCode($statusCode)
+    {
+        if (! is_numeric($statusCode)) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects a numeric status code; received %s',
+                __CLASS__,
+                (is_object($statusCode) ? get_class($statusCode) : gettype($statusCode))
+            ));
+        }
+
+        if (100 > $statusCode || 599 < $statusCode) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects an integer status code between 100 and 599 inclusive; received %s',
+                __CLASS__,
+                $statusCode
+            ));
+        }
+
+        if (intval($statusCode) != $statusCode) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects an integer status code; received %s',
+                __CLASS__,
+                $statusCode
+            ));
+        }
+    }
+
+    /**
+     * Validate that we have a body argument that will work for our context.
+     *
+     * @param mixed $body
+     * @throws Exception\InvalidArgumentException for arguments not castable
+     *     to strings.
+     */
+    private function validateBody($body)
+    {
+        if (is_string($body)) {
+            return;
+        }
+
+        if (is_object($body) && method_exists($body, '__toString')) {
+            return;
+        }
+
+        throw new Exception\InvalidArgumentException(sprintf(
+            '%s expects a string body, or an object that can cast to string; received %s',
+            __CLASS__,
+            (is_object($body) ? get_class($body) : gettype($body))
+        ));
+    }
+
+    /**
+     * Validate header values.
+     *
+     * @param array $headers
+     * @throws Exception\InvalidArgumentException
+     */
+    private function validateHeaders(array $headers)
+    {
+        foreach ($headers as $name => $value) {
+            if (! is_string($name) || is_numeric($name) || empty($name)) {
+                throw new Exception\InvalidArgumentException(sprintf(
+                    'Header names provided to %s must be non-empty, non-numeric strings; received %s',
+                    __CLASS__,
+                    $name
+                ));
+            }
+
+            if (! is_string($value) && ! is_numeric($value)) {
+                throw new Exception\InvalidArgumentException(sprintf(
+                    'Individual header values provided to %s must be a string or numeric; received %s for header %s',
+                    __CLASS__,
+                    (is_object($value) ? get_class($value) : gettype($value)),
+                    $name
+                ));
+            }
+        }
+    }
+
+    /**
+     * Normalize header names to lowercase.
+     *
+     * @param array $headers
+     * @return array
+     */
+    private function normalizeHeaders(array $headers)
+    {
+        $normalized = [];
+        foreach ($headers as $name => $value) {
+            $normalized[strtolower($name)] = $value;
+        }
+        return $normalized;
+    }
+}
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Http/ZendHttpClientDecorator.php b/web/vendor/zendframework/zend-feed/src/Reader/Http/ZendHttpClientDecorator.php
new file mode 100644
index 000000000..dbff9932e
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Http/ZendHttpClientDecorator.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader\Http;
+
+use Zend\Http\Client as ZendHttpClient;
+use Zend\Http\Headers;
+use Zend\Feed\Reader\Exception;
+
+class ZendHttpClientDecorator implements HeaderAwareClientInterface
+{
+    /**
+     * @var ZendHttpClient
+     */
+    private $client;
+
+    /**
+     * @param ZendHttpClient $client
+     */
+    public function __construct(ZendHttpClient $client)
+    {
+        $this->client = $client;
+    }
+
+    /**
+     * @return ZendHttpClient
+     */
+    public function getDecoratedClient()
+    {
+        return $this->client;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function get($uri, array $headers = [])
+    {
+        $this->client->resetParameters();
+        $this->client->setMethod('GET');
+        $this->client->setHeaders(new Headers());
+        $this->client->setUri($uri);
+        if (! empty($headers)) {
+            $this->injectHeaders($headers);
+        }
+        $response = $this->client->send();
+
+        return new Response(
+            $response->getStatusCode(),
+            $response->getBody(),
+            $this->prepareResponseHeaders($response->getHeaders())
+        );
+    }
+
+    /**
+     * Inject header values into the client.
+     *
+     * @param array $headerValues
+     */
+    private function injectHeaders(array $headerValues)
+    {
+        $headers = $this->client->getRequest()->getHeaders();
+        foreach ($headerValues as $name => $values) {
+            if (! is_string($name) || is_numeric($name) || empty($name)) {
+                throw new Exception\InvalidArgumentException(sprintf(
+                    'Header names provided to %s::get must be non-empty, non-numeric strings; received %s',
+                    __CLASS__,
+                    $name
+                ));
+            }
+
+            if (! is_array($values)) {
+                throw new Exception\InvalidArgumentException(sprintf(
+                    'Header values provided to %s::get must be arrays of values; received %s',
+                    __CLASS__,
+                    (is_object($values) ? get_class($values) : gettype($values))
+                ));
+            }
+
+            foreach ($values as $value) {
+                if (! is_string($value) && ! is_numeric($value)) {
+                    throw new Exception\InvalidArgumentException(sprintf(
+                        'Individual header values provided to %s::get must be strings or numbers; '
+                        . 'received %s for header %s',
+                        __CLASS__,
+                        (is_object($value) ? get_class($value) : gettype($value)),
+                        $name
+                    ));
+                }
+
+                $headers->addHeaderLine($name, $value);
+            }
+        }
+    }
+
+    /**
+     * Normalize headers to use with HeaderAwareResponseInterface.
+     *
+     * Ensures multi-value headers are represented as a single string, via
+     * comma concatenation.
+     *
+     * @param Headers $headers
+     * @return array
+     */
+    private function prepareResponseHeaders(Headers $headers)
+    {
+        $normalized = [];
+        foreach ($headers->toArray() as $name => $value) {
+            $normalized[$name] = is_array($value) ? implode(', ', $value) : $value;
+        }
+        return $normalized;
+    }
+}
diff --git a/web/vendor/zendframework/zend-feed/src/Reader/Reader.php b/web/vendor/zendframework/zend-feed/src/Reader/Reader.php
index 09bdcf4b9..80c1e483e 100644
--- a/web/vendor/zendframework/zend-feed/src/Reader/Reader.php
+++ b/web/vendor/zendframework/zend-feed/src/Reader/Reader.php
@@ -14,6 +14,7 @@ use DOMXPath;
 use Zend\Cache\Storage\StorageInterface as CacheStorage;
 use Zend\Http as ZendHttp;
 use Zend\Stdlib\ErrorHandler;
+use Zend\Feed\Reader\Exception\InvalidHttpClientException;
 
 /**
 */
@@ -57,7 +58,7 @@ class Reader implements ReaderImportInterface
     /**
      * HTTP client object to use for retrieving feeds
      *
-     * @var ZendHttp\Client
+     * @var Http\ClientInterface
      */
     protected static $httpClient = null;
 
@@ -117,23 +118,30 @@ class Reader implements ReaderImportInterface
      *
      * Sets the HTTP client object to use for retrieving the feeds.
      *
-     * @param  ZendHttp\Client $httpClient
+     * @param  ZendHttp\Client | Http\ClientInterface $httpClient
      * @return void
      */
-    public static function setHttpClient(ZendHttp\Client $httpClient)
+    public static function setHttpClient($httpClient)
     {
+        if ($httpClient instanceof ZendHttp\Client) {
+            $httpClient = new Http\ZendHttpClientDecorator($httpClient);
+        }
+
+        if (! $httpClient instanceof Http\ClientInterface) {
+            throw new InvalidHttpClientException();
+        }
         static::$httpClient = $httpClient;
     }
 
     /**
      * Gets the HTTP client object. If none is set, a new ZendHttp\Client will be used.
      *
-     * @return ZendHttp\Client
+     * @return Http\ClientInterface
      */
     public static function getHttpClient()
     {
-        if (!static::$httpClient instanceof ZendHttp\Client) {
-            static::$httpClient = new ZendHttp\Client();
+        if (! static::$httpClient) {
+            static::$httpClient = new Http\ZendHttpClientDecorator(new ZendHttp\Client());
         }
 
         return static::$httpClient;
@@ -189,17 +197,16 @@ class Reader implements ReaderImportInterface
      */
     public static function import($uri, $etag = null, $lastModified = null)
     {
-        $cache       = self::getCache();
-        $client      = self::getHttpClient();
-        $client->resetParameters();
-        $headers = new ZendHttp\Headers();
-        $client->setHeaders($headers);
-        $client->setUri($uri);
+        $cache   = self::getCache();
+        $client  = self::getHttpClient();
         $cacheId = 'Zend_Feed_Reader_' . md5($uri);
 
         if (static::$httpConditionalGet && $cache) {
-            $data = $cache->getItem($cacheId);
-            if ($data) {
+            $headers = [];
+            $data    = $cache->getItem($cacheId);
+            if ($data && $client instanceof Http\HeaderAwareClientInterface) {
+                // Only check for ETag and last modified values in the cache
+                // if we have a client capable of emitting headers in the first place.
                 if ($etag === null) {
                     $etag = $cache->getItem($cacheId . '_etag');
                 }
@@ -207,26 +214,31 @@ class Reader implements ReaderImportInterface
                     $lastModified = $cache->getItem($cacheId . '_lastmodified');
                 }
                 if ($etag) {
-                    $headers->addHeaderLine('If-None-Match', $etag);
+                    $headers['If-None-Match'] = [$etag];
                 }
                 if ($lastModified) {
-                    $headers->addHeaderLine('If-Modified-Since', $lastModified);
+                    $headers['If-Modified-Since'] = [$lastModified];
                 }
             }
-            $response = $client->send();
+            $response = $client->get($uri, $headers);
             if ($response->getStatusCode() !== 200 && $response->getStatusCode() !== 304) {
-                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
+                throw new Exception\RuntimeException(
+                    'Feed failed to load, got response code ' . $response->getStatusCode()
+                );
             }
             if ($response->getStatusCode() == 304) {
                 $responseXml = $data;
             } else {
                 $responseXml = $response->getBody();
                 $cache->setItem($cacheId, $responseXml);
-                if ($response->getHeaders()->get('ETag')) {
-                    $cache->setItem($cacheId . '_etag', $response->getHeaders()->get('ETag')->getFieldValue());
-                }
-                if ($response->getHeaders()->get('Last-Modified')) {
-                    $cache->setItem($cacheId . '_lastmodified', $response->getHeaders()->get('Last-Modified')->getFieldValue());
+
+                if ($response instanceof Http\HeaderAwareResponseInterface) {
+                    if ($response->getHeaderLine('ETag', false)) {
+                        $cache->setItem($cacheId . '_etag', $response->getHeaderLine('ETag'));
+                    }
+                    if ($response->getHeaderLine('Last-Modified', false)) {
+                        $cache->setItem($cacheId . '_lastmodified', $response->getHeaderLine('Last-Modified'));
+                    }
                 }
             }
             return static::importString($responseXml);
@@ -235,17 +247,21 @@ class Reader implements ReaderImportInterface
             if ($data) {
                 return static::importString($data);
             }
-            $response = $client->send();
+            $response = $client->get($uri);
             if ((int) $response->getStatusCode() !== 200) {
-                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
+                throw new Exception\RuntimeException(
+                    'Feed failed to load, got response code ' . $response->getStatusCode()
+                );
             }
             $responseXml = $response->getBody();
             $cache->setItem($cacheId, $responseXml);
             return static::importString($responseXml);
         } else {
-            $response = $client->send();
+            $response = $client->get($uri);
             if ((int) $response->getStatusCode() !== 200) {
-                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
+                throw new Exception\RuntimeException(
+                    'Feed failed to load, got response code ' . $response->getStatusCode()
+                );
             }
             $reader = static::importString($response->getBody());
             $reader->setOriginalSourceUri($uri);
@@ -270,7 +286,7 @@ class Reader implements ReaderImportInterface
     public static function importRemoteFeed($uri, Http\ClientInterface $client)
     {
         $response = $client->get($uri);
-        if (!$response instanceof Http\ResponseInterface) {
+        if (! $response instanceof Http\ResponseInterface) {
             throw new Exception\RuntimeException(sprintf(
                 'Did not receive a %s\Http\ResponseInterface from the provided HTTP client; received "%s"',
                 __NAMESPACE__,
@@ -279,7 +295,9 @@ class Reader implements ReaderImportInterface
         }
 
         if ((int) $response->getStatusCode() !== 200) {
-            throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
+            throw new Exception\RuntimeException(
+                'Feed failed to load, got response code ' . $response->getStatusCode()
+            );
         }
         $reader = static::importString($response->getBody());
         $reader->setOriginalSourceUri($uri);
@@ -297,7 +315,7 @@ class Reader implements ReaderImportInterface
     public static function importString($string)
     {
         $trimmed = trim($string);
-        if (!is_string($string) || empty($trimmed)) {
+        if (! is_string($string) || empty($trimmed)) {
             throw new Exception\InvalidArgumentException('Only non empty strings are allowed as input');
         }
 
@@ -315,7 +333,7 @@ class Reader implements ReaderImportInterface
         libxml_disable_entity_loader($oldValue);
         libxml_use_internal_errors($libxmlErrflag);
 
-        if (!$status) {
+        if (! $status) {
             // Build error message
             $error = libxml_get_last_error();
             if ($error && $error->message) {
@@ -371,11 +389,12 @@ class Reader implements ReaderImportInterface
      */
     public static function findFeedLinks($uri)
     {
-        $client = static::getHttpClient();
-        $client->setUri($uri);
-        $response = $client->send();
+        $client   = static::getHttpClient();
+        $response = $client->get($uri);
         if ($response->getStatusCode() !== 200) {
-            throw new Exception\RuntimeException("Failed to access $uri, got response code " . $response->getStatusCode());
+            throw new Exception\RuntimeException(
+                "Failed to access $uri, got response code " . $response->getStatusCode()
+            );
         }
         $responseHtml = $response->getBody();
         $libxmlErrflag = libxml_use_internal_errors(true);
@@ -384,7 +403,7 @@ class Reader implements ReaderImportInterface
         $status = $dom->loadHTML(trim($responseHtml));
         libxml_disable_entity_loader($oldValue);
         libxml_use_internal_errors($libxmlErrflag);
-        if (!$status) {
+        if (! $status) {
             // Build error message
             $error = libxml_get_last_error();
             if ($error && $error->message) {
@@ -416,8 +435,8 @@ class Reader implements ReaderImportInterface
             $dom = $feed->getDomDocument();
         } elseif ($feed instanceof DOMDocument) {
             $dom = $feed;
-        } elseif (is_string($feed) && !empty($feed)) {
-            ErrorHandler::start(E_NOTICE|E_WARNING);
+        } elseif (is_string($feed) && ! empty($feed)) {
+            ErrorHandler::start(E_NOTICE | E_WARNING);
             ini_set('track_errors', 1);
             $oldValue = libxml_disable_entity_loader(true);
             $dom = new DOMDocument;
@@ -432,8 +451,8 @@ class Reader implements ReaderImportInterface
             libxml_disable_entity_loader($oldValue);
             ini_restore('track_errors');
             ErrorHandler::stop();
-            if (!$status) {
-                if (!isset($phpErrormsg)) {
+            if (! $status) {
+                if (! isset($phpErrormsg)) {
                     if (function_exists('xdebug_is_enabled')) {
                         $phpErrormsg = '(error message not available, when XDebug is running)';
                     } else {
@@ -543,7 +562,7 @@ class Reader implements ReaderImportInterface
      */
     public static function getExtensionManager()
     {
-        if (!isset(static::$extensionManager)) {
+        if (! isset(static::$extensionManager)) {
             static::setExtensionManager(new StandaloneExtensionManager());
         }
         return static::$extensionManager;
@@ -567,7 +586,7 @@ class Reader implements ReaderImportInterface
             }
         }
 
-        if (!$manager->has($feedName) && !$manager->has($entryName)) {
+        if (! $manager->has($feedName) && ! $manager->has($entryName)) {
             throw new Exception\RuntimeException('Could not load extension: ' . $name
                 . ' using Plugin Loader. Check prefix paths are configured and extension exists.');
         }
diff --git a/web/vendor/zendframework/zend-feed/src/Uri.php b/web/vendor/zendframework/zend-feed/src/Uri.php
index 818433f66..0409fda70 100644
--- a/web/vendor/zendframework/zend-feed/src/Uri.php
+++ b/web/vendor/zendframework/zend-feed/src/Uri.php
@@ -76,13 +76,13 @@ class Uri
             return;
         }
 
-        $this->scheme   = isset($parsed['scheme'])   ? $parsed['scheme']   : null;
-        $this->host     = isset($parsed['host'])     ? $parsed['host']     : null;
-        $this->port     = isset($parsed['port'])     ? $parsed['port']     : null;
-        $this->user     = isset($parsed['user'])     ? $parsed['user']     : null;
-        $this->pass     = isset($parsed['pass'])     ? $parsed['pass']     : null;
-        $this->path     = isset($parsed['path'])     ? $parsed['path']     : null;
-        $this->query    = isset($parsed['query'])    ? $parsed['query']    : null;
+        $this->scheme   = isset($parsed['scheme']) ? $parsed['scheme'] : null;
+        $this->host     = isset($parsed['host']) ? $parsed['host'] : null;
+        $this->port     = isset($parsed['port']) ? $parsed['port'] : null;
+        $this->user     = isset($parsed['user']) ? $parsed['user'] : null;
+        $this->pass     = isset($parsed['pass']) ? $parsed['pass'] : null;
+        $this->path     = isset($parsed['path']) ? $parsed['path'] : null;
+        $this->query    = isset($parsed['query']) ? $parsed['query'] : null;
         $this->fragment = isset($parsed['fragment']) ? $parsed['fragment'] : null;
     }
 
@@ -140,7 +140,7 @@ class Uri
             return false;
         }
 
-        if ($this->scheme && !in_array($this->scheme, $this->validSchemes)) {
+        if ($this->scheme && ! in_array($this->scheme, $this->validSchemes)) {
             return false;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php b/web/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
index 5659b47ea..a33411397 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
@@ -61,26 +61,29 @@ class AbstractFeed
     public function addAuthor(array $author)
     {
         // Check array values
-        if (!array_key_exists('name', $author)
+        if (! array_key_exists('name', $author)
             || empty($author['name'])
-            || !is_string($author['name'])
+            || ! is_string($author['name'])
         ) {
             throw new Exception\InvalidArgumentException(
-                'Invalid parameter: author array must include a "name" key with a non-empty string value');
+                'Invalid parameter: author array must include a "name" key with a non-empty string value'
+            );
         }
 
         if (isset($author['email'])) {
-            if (empty($author['email']) || !is_string($author['email'])) {
+            if (empty($author['email']) || ! is_string($author['email'])) {
                 throw new Exception\InvalidArgumentException(
-                    'Invalid parameter: "email" array value must be a non-empty string');
+                    'Invalid parameter: "email" array value must be a non-empty string'
+                );
             }
         }
         if (isset($author['uri'])) {
-            if (empty($author['uri']) || !is_string($author['uri']) ||
-                !Uri::factory($author['uri'])->isValid()
+            if (empty($author['uri']) || ! is_string($author['uri']) ||
+                ! Uri::factory($author['uri'])->isValid()
             ) {
                 throw new Exception\InvalidArgumentException(
-                    'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI');
+                    'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'
+                );
             }
         }
 
@@ -114,7 +117,7 @@ class AbstractFeed
      */
     public function setCopyright($copyright)
     {
-        if (empty($copyright) || !is_string($copyright)) {
+        if (empty($copyright) || ! is_string($copyright)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['copyright'] = $copyright;
@@ -135,7 +138,7 @@ class AbstractFeed
             $date = new DateTime();
         } elseif (is_int($date)) {
             $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
+        } elseif (! $date instanceof DateTime) {
             throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
                                                          . ' passed as parameter');
         }
@@ -157,7 +160,7 @@ class AbstractFeed
             $date = new DateTime();
         } elseif (is_int($date)) {
             $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
+        } elseif (! $date instanceof DateTime) {
             throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
                                                          . ' passed as parameter');
         }
@@ -179,7 +182,7 @@ class AbstractFeed
             $date = new DateTime();
         } elseif (is_int($date)) {
             $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
+        } elseif (! $date instanceof DateTime) {
             throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
                                                          . ' passed as parameter');
         }
@@ -197,7 +200,7 @@ class AbstractFeed
      */
     public function setDescription($description)
     {
-        if (empty($description) || !is_string($description)) {
+        if (empty($description) || ! is_string($description)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['description'] = $description;
@@ -218,36 +221,44 @@ class AbstractFeed
     {
         if (is_array($name)) {
             $data = $name;
-            if (empty($data['name']) || !is_string($data['name'])) {
+            if (empty($data['name']) || ! is_string($data['name'])) {
                 throw new Exception\InvalidArgumentException('Invalid parameter: "name" must be a non-empty string');
             }
             $generator = ['name' => $data['name']];
             if (isset($data['version'])) {
-                if (empty($data['version']) || !is_string($data['version'])) {
-                    throw new Exception\InvalidArgumentException('Invalid parameter: "version" must be a non-empty string');
+                if (empty($data['version']) || ! is_string($data['version'])) {
+                    throw new Exception\InvalidArgumentException(
+                        'Invalid parameter: "version" must be a non-empty string'
+                    );
                 }
                 $generator['version'] = $data['version'];
             }
             if (isset($data['uri'])) {
-                if (empty($data['uri']) || !is_string($data['uri']) || !Uri::factory($data['uri'])->isValid()) {
-                    throw new Exception\InvalidArgumentException('Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI');
+                if (empty($data['uri']) || ! is_string($data['uri']) || ! Uri::factory($data['uri'])->isValid()) {
+                    throw new Exception\InvalidArgumentException(
+                        'Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI'
+                    );
                 }
                 $generator['uri'] = $data['uri'];
             }
         } else {
-            if (empty($name) || !is_string($name)) {
+            if (empty($name) || ! is_string($name)) {
                 throw new Exception\InvalidArgumentException('Invalid parameter: "name" must be a non-empty string');
             }
             $generator = ['name' => $name];
             if (isset($version)) {
-                if (empty($version) || !is_string($version)) {
-                    throw new Exception\InvalidArgumentException('Invalid parameter: "version" must be a non-empty string');
+                if (empty($version) || ! is_string($version)) {
+                    throw new Exception\InvalidArgumentException(
+                        'Invalid parameter: "version" must be a non-empty string'
+                    );
                 }
                 $generator['version'] = $version;
             }
             if (isset($uri)) {
-                if (empty($uri) || !is_string($uri) || !Uri::factory($uri)->isValid()) {
-                    throw new Exception\InvalidArgumentException('Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI');
+                if (empty($uri) || ! is_string($uri) || ! Uri::factory($uri)->isValid()) {
+                    throw new Exception\InvalidArgumentException(
+                        'Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI'
+                    );
                 }
                 $generator['uri'] = $uri;
             }
@@ -266,11 +277,15 @@ class AbstractFeed
      */
     public function setId($id)
     {
-        if ((empty($id) || !is_string($id) || !Uri::factory($id)->isValid())
-            && !preg_match("#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#", $id)
-            && !$this->_validateTagUri($id)
+        // @codingStandardsIgnoreStart
+        if ((empty($id) || ! is_string($id) || ! Uri::factory($id)->isValid())
+            && ! preg_match("#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#", $id)
+            && ! $this->_validateTagUri($id)
         ) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
+            // @codingStandardsIgnoreEnd
+            throw new Exception\InvalidArgumentException(
+                'Invalid parameter: parameter must be a non-empty string and valid URI/IRI'
+            );
         }
         $this->data['id'] = $id;
 
@@ -283,9 +298,15 @@ class AbstractFeed
      * @param string $id
      * @return bool
      */
+    // @codingStandardsIgnoreStart
     protected function _validateTagUri($id)
     {
-        if (preg_match('/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/', $id, $matches)) {
+        // @codingStandardsIgnoreEnd
+        if (preg_match(
+            '/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/',
+            $id,
+            $matches
+        )) {
             $dvalid = false;
             $date = $matches['date'];
             $d6 = strtotime($date);
@@ -319,8 +340,8 @@ class AbstractFeed
      */
     public function setImage(array $data)
     {
-        if (empty($data['uri']) || !is_string($data['uri'])
-            || !Uri::factory($data['uri'])->isValid()
+        if (empty($data['uri']) || ! is_string($data['uri'])
+            || ! Uri::factory($data['uri'])->isValid()
         ) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter \'uri\''
             . ' must be a non-empty string and valid URI/IRI');
@@ -339,7 +360,7 @@ class AbstractFeed
      */
     public function setLanguage($language)
     {
-        if (empty($language) || !is_string($language)) {
+        if (empty($language) || ! is_string($language)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['language'] = $language;
@@ -356,8 +377,10 @@ class AbstractFeed
      */
     public function setLink($link)
     {
-        if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
+        if (empty($link) || ! is_string($link) || ! Uri::factory($link)->isValid()) {
+            throw new Exception\InvalidArgumentException(
+                'Invalid parameter: parameter must be a non-empty string and valid URI/IRI'
+            );
         }
         $this->data['link'] = $link;
 
@@ -374,11 +397,15 @@ class AbstractFeed
      */
     public function setFeedLink($link, $type)
     {
-        if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "link"" must be a non-empty string and valid URI/IRI');
+        if (empty($link) || ! is_string($link) || ! Uri::factory($link)->isValid()) {
+            throw new Exception\InvalidArgumentException(
+                'Invalid parameter: "link"" must be a non-empty string and valid URI/IRI'
+            );
         }
-        if (!in_array(strtolower($type), ['rss', 'rdf', 'atom'])) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "type"; You must declare the type of feed the link points to, i.e. RSS, RDF or Atom');
+        if (! in_array(strtolower($type), ['rss', 'rdf', 'atom'])) {
+            throw new Exception\InvalidArgumentException(
+                'Invalid parameter: "type"; You must declare the type of feed the link points to, i.e. RSS, RDF or Atom'
+            );
         }
         $this->data['feedLinks'][strtolower($type)] = $link;
 
@@ -394,7 +421,7 @@ class AbstractFeed
      */
     public function setTitle($title)
     {
-        if (empty($title) || !is_string($title)) {
+        if (empty($title) || ! is_string($title)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['title'] = $title;
@@ -411,7 +438,7 @@ class AbstractFeed
      */
     public function setEncoding($encoding)
     {
-        if (empty($encoding) || !is_string($encoding)) {
+        if (empty($encoding) || ! is_string($encoding)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['encoding'] = $encoding;
@@ -428,7 +455,7 @@ class AbstractFeed
      */
     public function setBaseUrl($url)
     {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
+        if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
             throw new Exception\InvalidArgumentException('Invalid parameter: "url" array value'
             . ' must be a non-empty string and valid URI/IRI');
         }
@@ -446,11 +473,11 @@ class AbstractFeed
      */
     public function addHub($url)
     {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
+        if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
             throw new Exception\InvalidArgumentException('Invalid parameter: "url" array value'
             . ' must be a non-empty string and valid URI/IRI');
         }
-        if (!isset($this->data['hubs'])) {
+        if (! isset($this->data['hubs'])) {
             $this->data['hubs'] = [];
         }
         $this->data['hubs'][] = $url;
@@ -482,21 +509,21 @@ class AbstractFeed
      */
     public function addCategory(array $category)
     {
-        if (!isset($category['term'])) {
+        if (! isset($category['term'])) {
             throw new Exception\InvalidArgumentException('Each category must be an array and '
             . 'contain at least a "term" element containing the machine '
             . ' readable category name');
         }
         if (isset($category['scheme'])) {
             if (empty($category['scheme'])
-                || !is_string($category['scheme'])
-                || !Uri::factory($category['scheme'])->isValid()
+                || ! is_string($category['scheme'])
+                || ! Uri::factory($category['scheme'])->isValid()
             ) {
                 throw new Exception\InvalidArgumentException('The Atom scheme or RSS domain of'
                 . ' a category must be a valid URI');
             }
         }
-        if (!isset($this->data['categories'])) {
+        if (! isset($this->data['categories'])) {
             $this->data['categories'] = [];
         }
         $this->data['categories'][] = $category;
@@ -541,7 +568,7 @@ class AbstractFeed
      */
     public function getAuthors()
     {
-        if (!array_key_exists('authors', $this->data)) {
+        if (! array_key_exists('authors', $this->data)) {
             return;
         }
         return $this->data['authors'];
@@ -554,7 +581,7 @@ class AbstractFeed
      */
     public function getCopyright()
     {
-        if (!array_key_exists('copyright', $this->data)) {
+        if (! array_key_exists('copyright', $this->data)) {
             return;
         }
         return $this->data['copyright'];
@@ -567,7 +594,7 @@ class AbstractFeed
      */
     public function getDateCreated()
     {
-        if (!array_key_exists('dateCreated', $this->data)) {
+        if (! array_key_exists('dateCreated', $this->data)) {
             return;
         }
         return $this->data['dateCreated'];
@@ -580,7 +607,7 @@ class AbstractFeed
      */
     public function getDateModified()
     {
-        if (!array_key_exists('dateModified', $this->data)) {
+        if (! array_key_exists('dateModified', $this->data)) {
             return;
         }
         return $this->data['dateModified'];
@@ -593,7 +620,7 @@ class AbstractFeed
      */
     public function getLastBuildDate()
     {
-        if (!array_key_exists('lastBuildDate', $this->data)) {
+        if (! array_key_exists('lastBuildDate', $this->data)) {
             return;
         }
         return $this->data['lastBuildDate'];
@@ -606,7 +633,7 @@ class AbstractFeed
      */
     public function getDescription()
     {
-        if (!array_key_exists('description', $this->data)) {
+        if (! array_key_exists('description', $this->data)) {
             return;
         }
         return $this->data['description'];
@@ -619,7 +646,7 @@ class AbstractFeed
      */
     public function getGenerator()
     {
-        if (!array_key_exists('generator', $this->data)) {
+        if (! array_key_exists('generator', $this->data)) {
             return;
         }
         return $this->data['generator'];
@@ -632,7 +659,7 @@ class AbstractFeed
      */
     public function getId()
     {
-        if (!array_key_exists('id', $this->data)) {
+        if (! array_key_exists('id', $this->data)) {
             return;
         }
         return $this->data['id'];
@@ -645,7 +672,7 @@ class AbstractFeed
      */
     public function getImage()
     {
-        if (!array_key_exists('image', $this->data)) {
+        if (! array_key_exists('image', $this->data)) {
             return;
         }
         return $this->data['image'];
@@ -658,7 +685,7 @@ class AbstractFeed
      */
     public function getLanguage()
     {
-        if (!array_key_exists('language', $this->data)) {
+        if (! array_key_exists('language', $this->data)) {
             return;
         }
         return $this->data['language'];
@@ -671,7 +698,7 @@ class AbstractFeed
      */
     public function getLink()
     {
-        if (!array_key_exists('link', $this->data)) {
+        if (! array_key_exists('link', $this->data)) {
             return;
         }
         return $this->data['link'];
@@ -684,7 +711,7 @@ class AbstractFeed
      */
     public function getFeedLinks()
     {
-        if (!array_key_exists('feedLinks', $this->data)) {
+        if (! array_key_exists('feedLinks', $this->data)) {
             return;
         }
         return $this->data['feedLinks'];
@@ -697,7 +724,7 @@ class AbstractFeed
      */
     public function getTitle()
     {
-        if (!array_key_exists('title', $this->data)) {
+        if (! array_key_exists('title', $this->data)) {
             return;
         }
         return $this->data['title'];
@@ -710,7 +737,7 @@ class AbstractFeed
      */
     public function getEncoding()
     {
-        if (!array_key_exists('encoding', $this->data)) {
+        if (! array_key_exists('encoding', $this->data)) {
             return 'UTF-8';
         }
         return $this->data['encoding'];
@@ -723,7 +750,7 @@ class AbstractFeed
      */
     public function getBaseUrl()
     {
-        if (!array_key_exists('baseUrl', $this->data)) {
+        if (! array_key_exists('baseUrl', $this->data)) {
             return;
         }
         return $this->data['baseUrl'];
@@ -736,7 +763,7 @@ class AbstractFeed
      */
     public function getHubs()
     {
-        if (!array_key_exists('hubs', $this->data)) {
+        if (! array_key_exists('hubs', $this->data)) {
             return;
         }
         return $this->data['hubs'];
@@ -749,7 +776,7 @@ class AbstractFeed
      */
     public function getCategories()
     {
-        if (!array_key_exists('categories', $this->data)) {
+        if (! array_key_exists('categories', $this->data)) {
             return;
         }
         return $this->data['categories'];
@@ -830,14 +857,18 @@ class AbstractFeed
      * @throws Exception\RuntimeException
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _loadExtensions()
     {
+        // @codingStandardsIgnoreEnd
         $all     = Writer::getExtensions();
         $manager = Writer::getExtensionManager();
         $exts    = $all['feed'];
         foreach ($exts as $ext) {
-            if (!$manager->has($ext)) {
-                throw new Exception\RuntimeException(sprintf('Unable to load extension "%s"; could not resolve to class', $ext));
+            if (! $manager->has($ext)) {
+                throw new Exception\RuntimeException(
+                    sprintf('Unable to load extension "%s"; could not resolve to class', $ext)
+                );
             }
             $this->extensions[$ext] = $manager->get($ext);
             $this->extensions[$ext]->setEncoding($this->getEncoding());
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Deleted.php b/web/vendor/zendframework/zend-feed/src/Writer/Deleted.php
index 321102669..6d94997f0 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Deleted.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Deleted.php
@@ -41,7 +41,7 @@ class Deleted
      */
     public function setEncoding($encoding)
     {
-        if (empty($encoding) || !is_string($encoding)) {
+        if (empty($encoding) || ! is_string($encoding)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['encoding'] = $encoding;
@@ -56,7 +56,7 @@ class Deleted
      */
     public function getEncoding()
     {
-        if (!array_key_exists('encoding', $this->data)) {
+        if (! array_key_exists('encoding', $this->data)) {
             return 'UTF-8';
         }
         return $this->data['encoding'];
@@ -110,7 +110,7 @@ class Deleted
      */
     public function setReference($reference)
     {
-        if (empty($reference) || !is_string($reference)) {
+        if (empty($reference) || ! is_string($reference)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: reference must be a non-empty string');
         }
         $this->data['reference'] = $reference;
@@ -123,7 +123,7 @@ class Deleted
      */
     public function getReference()
     {
-        if (!array_key_exists('reference', $this->data)) {
+        if (! array_key_exists('reference', $this->data)) {
             return;
         }
         return $this->data['reference'];
@@ -142,7 +142,7 @@ class Deleted
             $date = new DateTime();
         } elseif (is_int($date)) {
             $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
+        } elseif (! $date instanceof DateTime) {
             throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
             . ' passed as parameter');
         }
@@ -156,7 +156,7 @@ class Deleted
      */
     public function getWhen()
     {
-        if (!array_key_exists('when', $this->data)) {
+        if (! array_key_exists('when', $this->data)) {
             return;
         }
         return $this->data['when'];
@@ -172,16 +172,16 @@ class Deleted
     public function setBy(array $by)
     {
         $author = [];
-        if (!array_key_exists('name', $by)
+        if (! array_key_exists('name', $by)
             || empty($by['name'])
-            || !is_string($by['name'])
+            || ! is_string($by['name'])
         ) {
             throw new Exception\InvalidArgumentException('Invalid parameter: author array must include a'
             . ' "name" key with a non-empty string value');
         }
         $author['name'] = $by['name'];
         if (isset($by['email'])) {
-            if (empty($by['email']) || !is_string($by['email'])) {
+            if (empty($by['email']) || ! is_string($by['email'])) {
                 throw new Exception\InvalidArgumentException('Invalid parameter: "email" array'
                 . ' value must be a non-empty string');
             }
@@ -189,8 +189,8 @@ class Deleted
         }
         if (isset($by['uri'])) {
             if (empty($by['uri'])
-                || !is_string($by['uri'])
-                || !Uri::factory($by['uri'])->isValid()
+                || ! is_string($by['uri'])
+                || ! Uri::factory($by['uri'])->isValid()
             ) {
                 throw new Exception\InvalidArgumentException('Invalid parameter: "uri" array value must'
                  . ' be a non-empty string and valid URI/IRI');
@@ -207,7 +207,7 @@ class Deleted
      */
     public function getBy()
     {
-        if (!array_key_exists('by', $this->data)) {
+        if (! array_key_exists('by', $this->data)) {
             return;
         }
         return $this->data['by'];
@@ -228,7 +228,7 @@ class Deleted
      */
     public function getComment()
     {
-        if (!array_key_exists('comment', $this->data)) {
+        if (! array_key_exists('comment', $this->data)) {
             return;
         }
         return $this->data['comment'];
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Entry.php b/web/vendor/zendframework/zend-feed/src/Writer/Entry.php
index a802ffa05..94f17339a 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Entry.php
@@ -64,26 +64,29 @@ class Entry
     public function addAuthor(array $author)
     {
         // Check array values
-        if (!array_key_exists('name', $author)
+        if (! array_key_exists('name', $author)
             || empty($author['name'])
-            || !is_string($author['name'])
+            || ! is_string($author['name'])
         ) {
             throw new Exception\InvalidArgumentException(
-                'Invalid parameter: author array must include a "name" key with a non-empty string value');
+                'Invalid parameter: author array must include a "name" key with a non-empty string value'
+            );
         }
 
         if (isset($author['email'])) {
-            if (empty($author['email']) || !is_string($author['email'])) {
+            if (empty($author['email']) || ! is_string($author['email'])) {
                 throw new Exception\InvalidArgumentException(
-                    'Invalid parameter: "email" array value must be a non-empty string');
+                    'Invalid parameter: "email" array value must be a non-empty string'
+                );
             }
         }
         if (isset($author['uri'])) {
-            if (empty($author['uri']) || !is_string($author['uri']) ||
-                !Uri::factory($author['uri'])->isValid()
+            if (empty($author['uri']) || ! is_string($author['uri']) ||
+                ! Uri::factory($author['uri'])->isValid()
             ) {
                 throw new Exception\InvalidArgumentException(
-                    'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI');
+                    'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'
+                );
             }
         }
 
@@ -117,7 +120,7 @@ class Entry
      */
     public function setEncoding($encoding)
     {
-        if (empty($encoding) || !is_string($encoding)) {
+        if (empty($encoding) || ! is_string($encoding)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['encoding'] = $encoding;
@@ -132,7 +135,7 @@ class Entry
      */
     public function getEncoding()
     {
-        if (!array_key_exists('encoding', $this->data)) {
+        if (! array_key_exists('encoding', $this->data)) {
             return 'UTF-8';
         }
         return $this->data['encoding'];
@@ -147,7 +150,7 @@ class Entry
      */
     public function setCopyright($copyright)
     {
-        if (empty($copyright) || !is_string($copyright)) {
+        if (empty($copyright) || ! is_string($copyright)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['copyright'] = $copyright;
@@ -164,7 +167,7 @@ class Entry
      */
     public function setContent($content)
     {
-        if (empty($content) || !is_string($content)) {
+        if (empty($content) || ! is_string($content)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['content'] = $content;
@@ -185,8 +188,10 @@ class Entry
             $date = new DateTime();
         } elseif (is_int($date)) {
             $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
-            throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp passed as parameter');
+        } elseif (! $date instanceof DateTime) {
+            throw new Exception\InvalidArgumentException(
+                'Invalid DateTime object or UNIX Timestamp passed as parameter'
+            );
         }
         $this->data['dateCreated'] = $date;
 
@@ -206,8 +211,10 @@ class Entry
             $date = new DateTime();
         } elseif (is_int($date)) {
             $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
-            throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp passed as parameter');
+        } elseif (! $date instanceof DateTime) {
+            throw new Exception\InvalidArgumentException(
+                'Invalid DateTime object or UNIX Timestamp passed as parameter'
+            );
         }
         $this->data['dateModified'] = $date;
 
@@ -223,7 +230,7 @@ class Entry
      */
     public function setDescription($description)
     {
-        if (empty($description) || !is_string($description)) {
+        if (empty($description) || ! is_string($description)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['description'] = $description;
@@ -240,7 +247,7 @@ class Entry
      */
     public function setId($id)
     {
-        if (empty($id) || !is_string($id)) {
+        if (empty($id) || ! is_string($id)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['id'] = $id;
@@ -257,8 +264,10 @@ class Entry
      */
     public function setLink($link)
     {
-        if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
+        if (empty($link) || ! is_string($link) || ! Uri::factory($link)->isValid()) {
+            throw new Exception\InvalidArgumentException(
+                'Invalid parameter: parameter must be a non-empty string and valid URI/IRI'
+            );
         }
         $this->data['link'] = $link;
 
@@ -274,8 +283,10 @@ class Entry
      */
     public function setCommentCount($count)
     {
-        if (!is_numeric($count) || (int) $count != $count || (int) $count < 0) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "count" must be a positive integer number or zero');
+        if (! is_numeric($count) || (int) $count != $count || (int) $count < 0) {
+            throw new Exception\InvalidArgumentException(
+                'Invalid parameter: "count" must be a positive integer number or zero'
+            );
         }
         $this->data['commentCount'] = (int) $count;
 
@@ -291,8 +302,10 @@ class Entry
      */
     public function setCommentLink($link)
     {
-        if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "link" must be a non-empty string and valid URI/IRI');
+        if (empty($link) || ! is_string($link) || ! Uri::factory($link)->isValid()) {
+            throw new Exception\InvalidArgumentException(
+                'Invalid parameter: "link" must be a non-empty string and valid URI/IRI'
+            );
         }
         $this->data['commentLink'] = $link;
 
@@ -308,14 +321,16 @@ class Entry
      */
     public function setCommentFeedLink(array $link)
     {
-        if (!isset($link['uri']) || !is_string($link['uri']) || !Uri::factory($link['uri'])->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "link" must be a non-empty string and valid URI/IRI');
+        if (! isset($link['uri']) || ! is_string($link['uri']) || ! Uri::factory($link['uri'])->isValid()) {
+            throw new Exception\InvalidArgumentException(
+                'Invalid parameter: "link" must be a non-empty string and valid URI/IRI'
+            );
         }
-        if (!isset($link['type']) || !in_array($link['type'], ['atom', 'rss', 'rdf'])) {
+        if (! isset($link['type']) || ! in_array($link['type'], ['atom', 'rss', 'rdf'])) {
             throw new Exception\InvalidArgumentException('Invalid parameter: "type" must be one'
             . ' of "atom", "rss" or "rdf"');
         }
-        if (!isset($this->data['commentFeedLinks'])) {
+        if (! isset($this->data['commentFeedLinks'])) {
             $this->data['commentFeedLinks'] = [];
         }
         $this->data['commentFeedLinks'][] = $link;
@@ -349,7 +364,7 @@ class Entry
      */
     public function setTitle($title)
     {
-        if (empty($title) || !is_string($title)) {
+        if (empty($title) || ! is_string($title)) {
             throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
         }
         $this->data['title'] = $title;
@@ -364,7 +379,7 @@ class Entry
      */
     public function getAuthors()
     {
-        if (!array_key_exists('authors', $this->data)) {
+        if (! array_key_exists('authors', $this->data)) {
             return;
         }
         return $this->data['authors'];
@@ -377,7 +392,7 @@ class Entry
      */
     public function getContent()
     {
-        if (!array_key_exists('content', $this->data)) {
+        if (! array_key_exists('content', $this->data)) {
             return;
         }
         return $this->data['content'];
@@ -390,7 +405,7 @@ class Entry
      */
     public function getCopyright()
     {
-        if (!array_key_exists('copyright', $this->data)) {
+        if (! array_key_exists('copyright', $this->data)) {
             return;
         }
         return $this->data['copyright'];
@@ -403,7 +418,7 @@ class Entry
      */
     public function getDateCreated()
     {
-        if (!array_key_exists('dateCreated', $this->data)) {
+        if (! array_key_exists('dateCreated', $this->data)) {
             return;
         }
         return $this->data['dateCreated'];
@@ -416,7 +431,7 @@ class Entry
      */
     public function getDateModified()
     {
-        if (!array_key_exists('dateModified', $this->data)) {
+        if (! array_key_exists('dateModified', $this->data)) {
             return;
         }
         return $this->data['dateModified'];
@@ -429,7 +444,7 @@ class Entry
      */
     public function getDescription()
     {
-        if (!array_key_exists('description', $this->data)) {
+        if (! array_key_exists('description', $this->data)) {
             return;
         }
         return $this->data['description'];
@@ -442,7 +457,7 @@ class Entry
      */
     public function getId()
     {
-        if (!array_key_exists('id', $this->data)) {
+        if (! array_key_exists('id', $this->data)) {
             return;
         }
         return $this->data['id'];
@@ -455,7 +470,7 @@ class Entry
      */
     public function getLink()
     {
-        if (!array_key_exists('link', $this->data)) {
+        if (! array_key_exists('link', $this->data)) {
             return;
         }
         return $this->data['link'];
@@ -469,7 +484,7 @@ class Entry
      */
     public function getLinks()
     {
-        if (!array_key_exists('links', $this->data)) {
+        if (! array_key_exists('links', $this->data)) {
             return;
         }
         return $this->data['links'];
@@ -482,7 +497,7 @@ class Entry
      */
     public function getTitle()
     {
-        if (!array_key_exists('title', $this->data)) {
+        if (! array_key_exists('title', $this->data)) {
             return;
         }
         return $this->data['title'];
@@ -495,7 +510,7 @@ class Entry
      */
     public function getCommentCount()
     {
-        if (!array_key_exists('commentCount', $this->data)) {
+        if (! array_key_exists('commentCount', $this->data)) {
             return;
         }
         return $this->data['commentCount'];
@@ -508,7 +523,7 @@ class Entry
      */
     public function getCommentLink()
     {
-        if (!array_key_exists('commentLink', $this->data)) {
+        if (! array_key_exists('commentLink', $this->data)) {
             return;
         }
         return $this->data['commentLink'];
@@ -522,7 +537,7 @@ class Entry
      */
     public function getCommentFeedLinks()
     {
-        if (!array_key_exists('commentFeedLinks', $this->data)) {
+        if (! array_key_exists('commentFeedLinks', $this->data)) {
             return;
         }
         return $this->data['commentFeedLinks'];
@@ -537,21 +552,21 @@ class Entry
      */
     public function addCategory(array $category)
     {
-        if (!isset($category['term'])) {
+        if (! isset($category['term'])) {
             throw new Exception\InvalidArgumentException('Each category must be an array and '
             . 'contain at least a "term" element containing the machine '
             . ' readable category name');
         }
         if (isset($category['scheme'])) {
             if (empty($category['scheme'])
-                || !is_string($category['scheme'])
-                || !Uri::factory($category['scheme'])->isValid()
+                || ! is_string($category['scheme'])
+                || ! Uri::factory($category['scheme'])->isValid()
             ) {
                 throw new Exception\InvalidArgumentException('The Atom scheme or RSS domain of'
                 . ' a category must be a valid URI');
             }
         }
-        if (!isset($this->data['categories'])) {
+        if (! isset($this->data['categories'])) {
             $this->data['categories'] = [];
         }
         $this->data['categories'][] = $category;
@@ -581,7 +596,7 @@ class Entry
      */
     public function getCategories()
     {
-        if (!array_key_exists('categories', $this->data)) {
+        if (! array_key_exists('categories', $this->data)) {
             return;
         }
         return $this->data['categories'];
@@ -599,10 +614,10 @@ class Entry
      */
     public function setEnclosure(array $enclosure)
     {
-        if (!isset($enclosure['uri'])) {
+        if (! isset($enclosure['uri'])) {
             throw new Exception\InvalidArgumentException('Enclosure "uri" is not set');
         }
-        if (!Uri::factory($enclosure['uri'])->isValid()) {
+        if (! Uri::factory($enclosure['uri'])->isValid()) {
             throw new Exception\InvalidArgumentException('Enclosure "uri" is not a valid URI/IRI');
         }
         $this->data['enclosure'] = $enclosure;
@@ -617,7 +632,7 @@ class Entry
      */
     public function getEnclosure()
     {
-        if (!array_key_exists('enclosure', $this->data)) {
+        if (! array_key_exists('enclosure', $this->data)) {
             return;
         }
         return $this->data['enclosure'];
@@ -752,8 +767,10 @@ class Entry
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _loadExtensions()
     {
+        // @codingStandardsIgnoreEnd
         $all     = Writer::getExtensions();
         $manager = Writer::getExtensionManager();
         $exts    = $all['entry'];
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
index 1a32b4756..856e71410 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
@@ -160,5 +160,7 @@ abstract class AbstractRenderer implements RendererInterface
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     abstract protected function _appendNamespaces();
+    // @codingStandardsIgnoreEnd
 }
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
index 25571c0e0..e066ab8a0 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
@@ -52,10 +52,14 @@ class Feed extends Extension\AbstractRenderer
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _appendNamespaces()
     {
-        $this->getRootElement()->setAttribute('xmlns:atom',
-            'http://www.w3.org/2005/Atom');
+        // @codingStandardsIgnoreEnd
+        $this->getRootElement()->setAttribute(
+            'xmlns:atom',
+            'http://www.w3.org/2005/Atom'
+        );
     }
 
     /**
@@ -65,10 +69,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $flinks = $this->getDataContainer()->getFeedLinks();
-        if (!$flinks || empty($flinks)) {
+        if (! $flinks || empty($flinks)) {
             return;
         }
         foreach ($flinks as $type => $href) {
@@ -91,10 +97,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setHubs(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $hubs = $this->getDataContainer()->getHubs();
-        if (!$hubs || empty($hubs)) {
+        if (! $hubs || empty($hubs)) {
             return;
         }
         foreach ($hubs as $hubUrl) {
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
index 939b2492b..c7f44d4fa 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
@@ -47,10 +47,14 @@ class Entry extends Extension\AbstractRenderer
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _appendNamespaces()
     {
-        $this->getRootElement()->setAttribute('xmlns:content',
-            'http://purl.org/rss/1.0/modules/content/');
+        // @codingStandardsIgnoreEnd
+        $this->getRootElement()->setAttribute(
+            'xmlns:content',
+            'http://purl.org/rss/1.0/modules/content/'
+        );
     }
 
     /**
@@ -60,10 +64,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setContent(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $content = $this->getDataContainer()->getContent();
-        if (!$content) {
+        if (! $content) {
             return;
         }
         $element = $dom->createElement('content:encoded');
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
index 5cc86cd6b..598f228c8 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
@@ -47,10 +47,14 @@ class Entry extends Extension\AbstractRenderer
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _appendNamespaces()
     {
-        $this->getRootElement()->setAttribute('xmlns:dc',
-            'http://purl.org/dc/elements/1.1/');
+        // @codingStandardsIgnoreEnd
+        $this->getRootElement()->setAttribute(
+            'xmlns:dc',
+            'http://purl.org/dc/elements/1.1/'
+        );
     }
 
     /**
@@ -60,10 +64,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setAuthors(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $authors = $this->getDataContainer()->getAuthors();
-        if (!$authors || empty($authors)) {
+        if (! $authors || empty($authors)) {
             return;
         }
         foreach ($authors as $data) {
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
index 160b5a484..e69f95056 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
@@ -47,10 +47,14 @@ class Feed extends Extension\AbstractRenderer
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _appendNamespaces()
     {
-        $this->getRootElement()->setAttribute('xmlns:dc',
-            'http://purl.org/dc/elements/1.1/');
+        // @codingStandardsIgnoreEnd
+        $this->getRootElement()->setAttribute(
+            'xmlns:dc',
+            'http://purl.org/dc/elements/1.1/'
+        );
     }
 
     /**
@@ -60,10 +64,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setAuthors(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $authors = $this->getDataContainer()->getAuthors();
-        if (!$authors || empty($authors)) {
+        if (! $authors || empty($authors)) {
             return;
         }
         foreach ($authors as $data) {
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
index 595689a05..00eba8e16 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
@@ -76,7 +76,7 @@ class Entry
      */
     public function setItunesBlock($value)
     {
-        if (!ctype_alpha($value) && strlen($value) > 0) {
+        if (! ctype_alpha($value) && strlen($value) > 0) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "block" may only'
             . ' contain alphabetic characters');
         }
@@ -115,7 +115,7 @@ class Entry
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "author" may only'
             . ' contain a maximum of 255 characters each');
         }
-        if (!isset($this->data['authors'])) {
+        if (! isset($this->data['authors'])) {
             $this->data['authors'] = [];
         }
         $this->data['authors'][] = $value;
@@ -132,9 +132,9 @@ class Entry
     public function setItunesDuration($value)
     {
         $value = (string) $value;
-        if (!ctype_digit($value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value)
+        if (! ctype_digit($value)
+            && ! preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value)
+            && ! preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value)
         ) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "duration" may only'
             . ' be of a specified [[HH:]MM:]SS format');
@@ -152,7 +152,7 @@ class Entry
      */
     public function setItunesExplicit($value)
     {
-        if (!in_array($value, ['yes', 'no', 'clean'])) {
+        if (! in_array($value, ['yes', 'no', 'clean'])) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
             . ' be one of "yes", "no" or "clean"');
         }
@@ -229,14 +229,14 @@ class Entry
     public function __call($method, array $params)
     {
         $point = lcfirst(substr($method, 9));
-        if (!method_exists($this, 'setItunes' . ucfirst($point))
-            && !method_exists($this, 'addItunes' . ucfirst($point))
+        if (! method_exists($this, 'setItunes' . ucfirst($point))
+            && ! method_exists($this, 'addItunes' . ucfirst($point))
         ) {
             throw new Writer\Exception\BadMethodCallException(
                 'invalid method: ' . $method
             );
         }
-        if (!array_key_exists($point, $this->data)
+        if (! array_key_exists($point, $this->data)
             || empty($this->data[$point])
         ) {
             return;
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
index 0b21b3b0a..2acf80fc9 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
@@ -14,8 +14,6 @@ use Zend\Feed\Writer;
 use Zend\Stdlib\StringUtils;
 use Zend\Stdlib\StringWrapper\StringWrapperInterface;
 
-/**
-*/
 class Feed
 {
     /**
@@ -79,7 +77,7 @@ class Feed
      */
     public function setItunesBlock($value)
     {
-        if (!ctype_alpha($value) && strlen($value) > 0) {
+        if (! ctype_alpha($value) && strlen($value) > 0) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "block" may only'
             . ' contain alphabetic characters');
         }
@@ -118,7 +116,7 @@ class Feed
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "author" may only'
             . ' contain a maximum of 255 characters each');
         }
-        if (!isset($this->data['authors'])) {
+        if (! isset($this->data['authors'])) {
             $this->data['authors'] = [];
         }
         $this->data['authors'][] = $value;
@@ -134,11 +132,11 @@ class Feed
      */
     public function setItunesCategories(array $values)
     {
-        if (!isset($this->data['categories'])) {
+        if (! isset($this->data['categories'])) {
             $this->data['categories'] = [];
         }
         foreach ($values as $key => $value) {
-            if (!is_array($value)) {
+            if (! is_array($value)) {
                 if ($this->stringWrapper->strlen($value) > 255) {
                     throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "category" may only'
                     . ' contain a maximum of 255 characters each');
@@ -171,11 +169,11 @@ class Feed
      */
     public function setItunesImage($value)
     {
-        if (!Uri::factory($value)->isValid()) {
+        if (! Uri::factory($value)->isValid()) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
             . ' be a valid URI/IRI');
         }
-        if (!in_array(substr($value, -3), ['jpg', 'png'])) {
+        if (! in_array(substr($value, -3), ['jpg', 'png'])) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
             . ' use file extension "jpg" or "png" which must be the last three'
             . ' characters of the URI (i.e. no query string or fragment)');
@@ -194,9 +192,9 @@ class Feed
     public function setItunesDuration($value)
     {
         $value = (string) $value;
-        if (!ctype_digit($value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value)
+        if (! ctype_digit($value)
+            && ! preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value)
+            && ! preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value)
         ) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "duration" may only'
             . ' be of a specified [[HH:]MM:]SS format');
@@ -214,7 +212,7 @@ class Feed
      */
     public function setItunesExplicit($value)
     {
-        if (!in_array($value, ['yes', 'no', 'clean'])) {
+        if (! in_array($value, ['yes', 'no', 'clean'])) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
             . ' be one of "yes", "no" or "clean"');
         }
@@ -254,7 +252,7 @@ class Feed
      */
     public function setItunesNewFeedUrl($value)
     {
-        if (!Uri::factory($value)->isValid()) {
+        if (! Uri::factory($value)->isValid()) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "newFeedUrl" may only'
             . ' be a valid URI/IRI');
         }
@@ -285,7 +283,7 @@ class Feed
      */
     public function addItunesOwner(array $value)
     {
-        if (!isset($value['name']) || !isset($value['email'])) {
+        if (! isset($value['name']) || ! isset($value['email'])) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "owner" must'
             . ' be an array containing keys "name" and "email"');
         }
@@ -295,7 +293,7 @@ class Feed
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "owner" may only'
             . ' contain a maximum of 255 characters each for "name" and "email"');
         }
-        if (!isset($this->data['owners'])) {
+        if (! isset($this->data['owners'])) {
             $this->data['owners'] = [];
         }
         $this->data['owners'][] = $value;
@@ -347,14 +345,14 @@ class Feed
     public function __call($method, array $params)
     {
         $point = lcfirst(substr($method, 9));
-        if (!method_exists($this, 'setItunes' . ucfirst($point))
-            && !method_exists($this, 'addItunes' . ucfirst($point))
+        if (! method_exists($this, 'setItunes' . ucfirst($point))
+            && ! method_exists($this, 'addItunes' . ucfirst($point))
         ) {
             throw new Writer\Exception\BadMethodCallException(
                 'invalid method: ' . $method
             );
         }
-        if (!array_key_exists($point, $this->data) || empty($this->data[$point])) {
+        if (! array_key_exists($point, $this->data) || empty($this->data[$point])) {
             return;
         }
         return $this->data[$point];
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
index ed8f732ed..9e996e510 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
@@ -50,10 +50,14 @@ class Entry extends Extension\AbstractRenderer
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _appendNamespaces()
     {
-        $this->getRootElement()->setAttribute('xmlns:itunes',
-            'http://www.itunes.com/dtds/podcast-1.0.dtd');
+        // @codingStandardsIgnoreEnd
+        $this->getRootElement()->setAttribute(
+            'xmlns:itunes',
+            'http://www.itunes.com/dtds/podcast-1.0.dtd'
+        );
     }
 
     /**
@@ -63,10 +67,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setAuthors(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $authors = $this->getDataContainer()->getItunesAuthors();
-        if (!$authors || empty($authors)) {
+        if (! $authors || empty($authors)) {
             return;
         }
         foreach ($authors as $author) {
@@ -85,8 +91,10 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setBlock(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $block = $this->getDataContainer()->getItunesBlock();
         if ($block === null) {
             return;
@@ -105,10 +113,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDuration(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $duration = $this->getDataContainer()->getItunesDuration();
-        if (!$duration) {
+        if (! $duration) {
             return;
         }
         $el = $dom->createElement('itunes:duration');
@@ -125,8 +135,10 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setExplicit(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $explicit = $this->getDataContainer()->getItunesExplicit();
         if ($explicit === null) {
             return;
@@ -145,10 +157,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setKeywords(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $keywords = $this->getDataContainer()->getItunesKeywords();
-        if (!$keywords || empty($keywords)) {
+        if (! $keywords || empty($keywords)) {
             return;
         }
         $el = $dom->createElement('itunes:keywords');
@@ -165,10 +179,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setSubtitle(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $subtitle = $this->getDataContainer()->getItunesSubtitle();
-        if (!$subtitle) {
+        if (! $subtitle) {
             return;
         }
         $el = $dom->createElement('itunes:subtitle');
@@ -185,10 +201,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setSummary(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $summary = $this->getDataContainer()->getItunesSummary();
-        if (!$summary) {
+        if (! $summary) {
             return;
         }
         $el = $dom->createElement('itunes:summary');
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
index d978f0320..7bce80d4b 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
@@ -54,10 +54,14 @@ class Feed extends Extension\AbstractRenderer
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _appendNamespaces()
     {
-        $this->getRootElement()->setAttribute('xmlns:itunes',
-            'http://www.itunes.com/dtds/podcast-1.0.dtd');
+        // @codingStandardsIgnoreEnd
+        $this->getRootElement()->setAttribute(
+            'xmlns:itunes',
+            'http://www.itunes.com/dtds/podcast-1.0.dtd'
+        );
     }
 
     /**
@@ -67,10 +71,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setAuthors(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $authors = $this->getDataContainer()->getItunesAuthors();
-        if (!$authors || empty($authors)) {
+        if (! $authors || empty($authors)) {
             return;
         }
         foreach ($authors as $author) {
@@ -89,8 +95,10 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setBlock(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $block = $this->getDataContainer()->getItunesBlock();
         if ($block === null) {
             return;
@@ -109,14 +117,16 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCategories(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $cats = $this->getDataContainer()->getItunesCategories();
-        if (!$cats || empty($cats)) {
+        if (! $cats || empty($cats)) {
             return;
         }
         foreach ($cats as $key => $cat) {
-            if (!is_array($cat)) {
+            if (! is_array($cat)) {
                 $el = $dom->createElement('itunes:category');
                 $el->setAttribute('text', $cat);
                 $root->appendChild($el);
@@ -141,10 +151,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setImage(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $image = $this->getDataContainer()->getItunesImage();
-        if (!$image) {
+        if (! $image) {
             return;
         }
         $el = $dom->createElement('itunes:image');
@@ -160,10 +172,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDuration(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $duration = $this->getDataContainer()->getItunesDuration();
-        if (!$duration) {
+        if (! $duration) {
             return;
         }
         $el = $dom->createElement('itunes:duration');
@@ -180,8 +194,10 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setExplicit(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $explicit = $this->getDataContainer()->getItunesExplicit();
         if ($explicit === null) {
             return;
@@ -200,10 +216,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setKeywords(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $keywords = $this->getDataContainer()->getItunesKeywords();
-        if (!$keywords || empty($keywords)) {
+        if (! $keywords || empty($keywords)) {
             return;
         }
         $el = $dom->createElement('itunes:keywords');
@@ -220,10 +238,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setNewFeedUrl(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $url = $this->getDataContainer()->getItunesNewFeedUrl();
-        if (!$url) {
+        if (! $url) {
             return;
         }
         $el = $dom->createElement('itunes:new-feed-url');
@@ -240,10 +260,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setOwners(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $owners = $this->getDataContainer()->getItunesOwners();
-        if (!$owners || empty($owners)) {
+        if (! $owners || empty($owners)) {
             return;
         }
         foreach ($owners as $owner) {
@@ -268,10 +290,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setSubtitle(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $subtitle = $this->getDataContainer()->getItunesSubtitle();
-        if (!$subtitle) {
+        if (! $subtitle) {
             return;
         }
         $el = $dom->createElement('itunes:subtitle');
@@ -288,10 +312,12 @@ class Feed extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setSummary(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $summary = $this->getDataContainer()->getItunesSummary();
-        if (!$summary) {
+        if (! $summary) {
             return;
         }
         $el = $dom->createElement('itunes:summary');
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
index c74cb0202..9d3e07c3b 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
@@ -47,10 +47,14 @@ class Entry extends Extension\AbstractRenderer
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _appendNamespaces()
     {
-        $this->getRootElement()->setAttribute('xmlns:slash',
-            'http://purl.org/rss/1.0/modules/slash/');
+        // @codingStandardsIgnoreEnd
+        $this->getRootElement()->setAttribute(
+            'xmlns:slash',
+            'http://purl.org/rss/1.0/modules/slash/'
+        );
     }
 
     /**
@@ -60,10 +64,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCommentCount(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $count = $this->getDataContainer()->getCommentCount();
-        if (!$count) {
+        if (! $count) {
             $count = 0;
         }
         $tcount = $this->dom->createElement('slash:comments');
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
index 6f19641b8..bf7cde51a 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
@@ -49,10 +49,14 @@ class Entry extends Extension\AbstractRenderer
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _appendNamespaces()
     {
-        $this->getRootElement()->setAttribute('xmlns:thr',
-            'http://purl.org/syndication/thread/1.0');
+        // @codingStandardsIgnoreEnd
+        $this->getRootElement()->setAttribute(
+            'xmlns:thr',
+            'http://purl.org/syndication/thread/1.0'
+        );
     }
 
     /**
@@ -62,10 +66,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCommentLink(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $link = $this->getDataContainer()->getCommentLink();
-        if (!$link) {
+        if (! $link) {
             return;
         }
         $clink = $this->dom->createElement('link');
@@ -87,10 +93,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCommentFeedLinks(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $links = $this->getDataContainer()->getCommentFeedLinks();
-        if (!$links || empty($links)) {
+        if (! $links || empty($links)) {
             return;
         }
         foreach ($links as $link) {
@@ -114,8 +122,10 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCommentCount(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $count = $this->getDataContainer()->getCommentCount();
         if ($count === null) {
             return;
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/web/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
index 48c0d8f2e..cdb6e58de 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
@@ -47,10 +47,14 @@ class Entry extends Extension\AbstractRenderer
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _appendNamespaces()
     {
-        $this->getRootElement()->setAttribute('xmlns:wfw',
-            'http://wellformedweb.org/CommentAPI/');
+        // @codingStandardsIgnoreEnd
+        $this->getRootElement()->setAttribute(
+            'xmlns:wfw',
+            'http://wellformedweb.org/CommentAPI/'
+        );
     }
 
     /**
@@ -60,10 +64,12 @@ class Entry extends Extension\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCommentFeedLinks(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $links = $this->getDataContainer()->getCommentFeedLinks();
-        if (!$links || empty($links)) {
+        if (! $links || empty($links)) {
             return;
         }
         foreach ($links as $link) {
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php b/web/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
index b0e0e3bf7..82bc73ab0 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
@@ -12,7 +12,7 @@ namespace Zend\Feed\Writer;
 /**
  * Default implementation of ExtensionManagerInterface
  *
- * Decorator of ExtensionPluginManager.
+ * Decorator for an ExtensionManagerInstance.
  */
 class ExtensionManager implements ExtensionManagerInterface
 {
@@ -22,14 +22,14 @@ class ExtensionManager implements ExtensionManagerInterface
      * Constructor
      *
      * Seeds the extension manager with a plugin manager; if none provided,
-     * creates an instance.
+     * creates and decorates an instance of StandaloneExtensionManager.
      *
-     * @param  null|ExtensionPluginManager $pluginManager
+     * @param  null|ExtensionManagerInterface $pluginManager
      */
-    public function __construct(ExtensionPluginManager $pluginManager = null)
+    public function __construct(ExtensionManagerInterface $pluginManager = null)
     {
         if (null === $pluginManager) {
-            $pluginManager = new ExtensionPluginManager();
+            $pluginManager = new StandaloneExtensionManager();
         }
         $this->pluginManager = $pluginManager;
     }
@@ -37,7 +37,7 @@ class ExtensionManager implements ExtensionManagerInterface
     /**
      * Method overloading
      *
-     * Proxy to composed ExtensionPluginManager instance.
+     * Proxy to composed ExtensionManagerInterface instance.
      *
      * @param  string $method
      * @param  array $args
@@ -46,7 +46,7 @@ class ExtensionManager implements ExtensionManagerInterface
      */
     public function __call($method, $args)
     {
-        if (!method_exists($this->pluginManager, $method)) {
+        if (! method_exists($this->pluginManager, $method)) {
             throw new Exception\BadMethodCallException(sprintf(
                 'Method by name of %s does not exist in %s',
                 $method,
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php b/web/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
index 8586b48aa..c5bd2fb01 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
@@ -10,50 +10,129 @@
 namespace Zend\Feed\Writer;
 
 use Zend\ServiceManager\AbstractPluginManager;
+use Zend\ServiceManager\Exception\InvalidServiceException;
+use Zend\ServiceManager\Factory\InvokableFactory;
 
 /**
  * Plugin manager implementation for feed writer extensions
  *
  * Validation checks that we have an Entry, Feed, or Extension\AbstractRenderer.
  */
-class ExtensionPluginManager extends AbstractPluginManager
+class ExtensionPluginManager extends AbstractPluginManager implements ExtensionManagerInterface
 {
     /**
-     * Default set of extension classes
+     * Aliases for default set of extension classes
      *
      * @var array
      */
-    protected $invokableClasses = [
-        'atomrendererfeed'           => 'Zend\Feed\Writer\Extension\Atom\Renderer\Feed',
-        'contentrendererentry'       => 'Zend\Feed\Writer\Extension\Content\Renderer\Entry',
-        'dublincorerendererentry'    => 'Zend\Feed\Writer\Extension\DublinCore\Renderer\Entry',
-        'dublincorerendererfeed'     => 'Zend\Feed\Writer\Extension\DublinCore\Renderer\Feed',
-        'itunesentry'                => 'Zend\Feed\Writer\Extension\ITunes\Entry',
-        'itunesfeed'                 => 'Zend\Feed\Writer\Extension\ITunes\Feed',
-        'itunesrendererentry'        => 'Zend\Feed\Writer\Extension\ITunes\Renderer\Entry',
-        'itunesrendererfeed'         => 'Zend\Feed\Writer\Extension\ITunes\Renderer\Feed',
-        'slashrendererentry'         => 'Zend\Feed\Writer\Extension\Slash\Renderer\Entry',
-        'threadingrendererentry'     => 'Zend\Feed\Writer\Extension\Threading\Renderer\Entry',
-        'wellformedwebrendererentry' => 'Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry',
+    protected $aliases = [
+        'atomrendererfeed'           => Extension\Atom\Renderer\Feed::class,
+        'atomRendererFeed'           => Extension\Atom\Renderer\Feed::class,
+        'AtomRendererFeed'           => Extension\Atom\Renderer\Feed::class,
+        'AtomRenderer\Feed'          => Extension\Atom\Renderer\Feed::class,
+        'contentrendererentry'       => Extension\Content\Renderer\Entry::class,
+        'contentRendererEntry'       => Extension\Content\Renderer\Entry::class,
+        'ContentRendererEntry'       => Extension\Content\Renderer\Entry::class,
+        'ContentRenderer\Entry'      => Extension\Content\Renderer\Entry::class,
+        'dublincorerendererentry'    => Extension\DublinCore\Renderer\Entry::class,
+        'dublinCoreRendererEntry'    => Extension\DublinCore\Renderer\Entry::class,
+        'DublinCoreRendererEntry'    => Extension\DublinCore\Renderer\Entry::class,
+        'DublinCoreRenderer\Entry'   => Extension\DublinCore\Renderer\Entry::class,
+        'dublincorerendererfeed'     => Extension\DublinCore\Renderer\Feed::class,
+        'dublinCoreRendererFeed'     => Extension\DublinCore\Renderer\Feed::class,
+        'DublinCoreRendererFeed'     => Extension\DublinCore\Renderer\Feed::class,
+        'DublinCoreRenderer\Feed'    => Extension\DublinCore\Renderer\Feed::class,
+        'itunesentry'                => Extension\ITunes\Entry::class,
+        'itunesEntry'                => Extension\ITunes\Entry::class,
+        'iTunesEntry'                => Extension\ITunes\Entry::class,
+        'ItunesEntry'                => Extension\ITunes\Entry::class,
+        'Itunes\Entry'               => Extension\ITunes\Entry::class,
+        'itunesfeed'                 => Extension\ITunes\Feed::class,
+        'itunesFeed'                 => Extension\ITunes\Feed::class,
+        'iTunesFeed'                 => Extension\ITunes\Feed::class,
+        'ItunesFeed'                 => Extension\ITunes\Feed::class,
+        'Itunes\Feed'                => Extension\ITunes\Feed::class,
+        'itunesrendererentry'        => Extension\ITunes\Renderer\Entry::class,
+        'itunesRendererEntry'        => Extension\ITunes\Renderer\Entry::class,
+        'iTunesRendererEntry'        => Extension\ITunes\Renderer\Entry::class,
+        'ItunesRendererEntry'        => Extension\ITunes\Renderer\Entry::class,
+        'ItunesRenderer\Entry'       => Extension\ITunes\Renderer\Entry::class,
+        'itunesrendererfeed'         => Extension\ITunes\Renderer\Feed::class,
+        'itunesRendererFeed'         => Extension\ITunes\Renderer\Feed::class,
+        'iTunesRendererFeed'         => Extension\ITunes\Renderer\Feed::class,
+        'ItunesRendererFeed'         => Extension\ITunes\Renderer\Feed::class,
+        'ItunesRenderer\Feed'        => Extension\ITunes\Renderer\Feed::class,
+        'slashrendererentry'         => Extension\Slash\Renderer\Entry::class,
+        'slashRendererEntry'         => Extension\Slash\Renderer\Entry::class,
+        'SlashRendererEntry'         => Extension\Slash\Renderer\Entry::class,
+        'SlashRenderer\Entry'        => Extension\Slash\Renderer\Entry::class,
+        'threadingrendererentry'     => Extension\Threading\Renderer\Entry::class,
+        'threadingRendererEntry'     => Extension\Threading\Renderer\Entry::class,
+        'ThreadingRendererEntry'     => Extension\Threading\Renderer\Entry::class,
+        'ThreadingRenderer\Entry'    => Extension\Threading\Renderer\Entry::class,
+        'wellformedwebrendererentry' => Extension\WellFormedWeb\Renderer\Entry::class,
+        'wellFormedWebRendererEntry' => Extension\WellFormedWeb\Renderer\Entry::class,
+        'WellFormedWebRendererEntry' => Extension\WellFormedWeb\Renderer\Entry::class,
+        'WellFormedWebRenderer\Entry' => Extension\WellFormedWeb\Renderer\Entry::class,
     ];
 
     /**
-     * Do not share instances
+     * Factories for default set of extension classes
+     *
+     * @var array
+     */
+    protected $factories = [
+        Extension\Atom\Renderer\Feed::class           => InvokableFactory::class,
+        Extension\Content\Renderer\Entry::class       => InvokableFactory::class,
+        Extension\DublinCore\Renderer\Entry::class    => InvokableFactory::class,
+        Extension\DublinCore\Renderer\Feed::class     => InvokableFactory::class,
+        Extension\ITunes\Entry::class                 => InvokableFactory::class,
+        Extension\ITunes\Feed::class                  => InvokableFactory::class,
+        Extension\ITunes\Renderer\Entry::class        => InvokableFactory::class,
+        Extension\ITunes\Renderer\Feed::class         => InvokableFactory::class,
+        Extension\Slash\Renderer\Entry::class         => InvokableFactory::class,
+        Extension\Threading\Renderer\Entry::class     => InvokableFactory::class,
+        Extension\WellFormedWeb\Renderer\Entry::class => InvokableFactory::class,
+        // Legacy (v2) due to alias resolution; canonical form of resolved
+        // alias is used to look up the factory, while the non-normalized
+        // resolved alias is used as the requested name passed to the factory.
+        'zendfeedwriterextensionatomrendererfeed'           => InvokableFactory::class,
+        'zendfeedwriterextensioncontentrendererentry'       => InvokableFactory::class,
+        'zendfeedwriterextensiondublincorerendererentry'    => InvokableFactory::class,
+        'zendfeedwriterextensiondublincorerendererfeed'     => InvokableFactory::class,
+        'zendfeedwriterextensionitunesentry'                => InvokableFactory::class,
+        'zendfeedwriterextensionitunesfeed'                 => InvokableFactory::class,
+        'zendfeedwriterextensionitunesrendererentry'        => InvokableFactory::class,
+        'zendfeedwriterextensionitunesrendererfeed'         => InvokableFactory::class,
+        'zendfeedwriterextensionslashrendererentry'         => InvokableFactory::class,
+        'zendfeedwriterextensionthreadingrendererentry'     => InvokableFactory::class,
+        'zendfeedwriterextensionwellformedwebrendererentry' => InvokableFactory::class,
+    ];
+
+    /**
+     * Do not share instances (v2)
      *
      * @var bool
      */
     protected $shareByDefault = false;
 
     /**
-     * Validate the plugin
+     * Do not share instances (v3)
+     *
+     * @var bool
+     */
+    protected $sharedByDefault = false;
+
+    /**
+     * Validate the plugin (v3)
      *
      * Checks that the extension loaded is of a valid type.
      *
      * @param  mixed $plugin
      * @return void
-     * @throws Exception\InvalidArgumentException if invalid
+     * @throws InvalidServiceException if invalid
      */
-    public function validatePlugin($plugin)
+    public function validate($plugin)
     {
         if ($plugin instanceof Extension\AbstractRenderer) {
             // we're okay
@@ -70,11 +149,32 @@ class ExtensionPluginManager extends AbstractPluginManager
             return;
         }
 
-        throw new Exception\InvalidArgumentException(sprintf(
+        throw new InvalidServiceException(sprintf(
             'Plugin of type %s is invalid; must implement %s\Extension\RendererInterface '
             . 'or the classname must end in "Feed" or "Entry"',
             (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
             __NAMESPACE__
         ));
     }
+
+    /**
+     * Validate plugin (v2)
+     *
+     * @param mixed $plugin
+     * @return void
+     * @throws Exception\InvalidArgumentException when invalid
+     */
+    public function validatePlugin($plugin)
+    {
+        try {
+            $this->validate($plugin);
+        } catch (InvalidServiceException $e) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Plugin of type %s is invalid; must implement %s\Extension\RendererInterface '
+                . 'or the classname must end in "Feed" or "Entry"',
+                (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+                __NAMESPACE__
+            ));
+        }
+    }
 }
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Feed.php b/web/vendor/zendframework/zend-feed/src/Writer/Feed.php
index 5d01232d5..8645987f6 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Feed.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Feed.php
@@ -99,7 +99,7 @@ class Feed extends AbstractFeed implements Iterator, Countable
      */
     public function removeEntry($index)
     {
-        if (!isset($this->entries[$index])) {
+        if (! isset($this->entries[$index])) {
             throw new Exception\InvalidArgumentException('Undefined index: ' . $index . '. Entry does not exist.');
         }
         unset($this->entries[$index]);
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php b/web/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
index 99b528c73..b321d70fc 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
@@ -22,7 +22,7 @@ abstract class FeedFactory
      */
     public static function factory($data)
     {
-        if (!is_array($data) && !$data instanceof Traversable) {
+        if (! is_array($data) && ! $data instanceof Traversable) {
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s expects an array or Traversable argument; received "%s"',
                 __METHOD__,
@@ -39,11 +39,11 @@ abstract class FeedFactory
             if (method_exists($feed, $method)) {
                 switch ($method) {
                     case 'setfeedlink':
-                        if (!is_array($value)) {
+                        if (! is_array($value)) {
                             // Need an array
                             break;
                         }
-                        if (!array_key_exists('link', $value) || !array_key_exists('type', $value)) {
+                        if (! array_key_exists('link', $value) || ! array_key_exists('type', $value)) {
                             // Need both keys to set this correctly
                             break;
                         }
@@ -88,7 +88,7 @@ abstract class FeedFactory
      */
     protected static function createEntries($entries, Feed $feed)
     {
-        if (!is_array($entries) && !$entries instanceof Traversable) {
+        if (! is_array($entries) && ! $entries instanceof Traversable) {
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s::factory expects the "entries" value to be an array or Traversable; received "%s"',
                 get_called_class(),
@@ -97,7 +97,7 @@ abstract class FeedFactory
         }
 
         foreach ($entries as $data) {
-            if (!is_array($data) && !$data instanceof Traversable && !$data instanceof Entry) {
+            if (! is_array($data) && ! $data instanceof Traversable && ! $data instanceof Entry) {
                 throw new Exception\InvalidArgumentException(sprintf(
                     '%s expects an array, Traversable, or Zend\Feed\Writer\Entry argument; received "%s"',
                     __METHOD__,
@@ -116,7 +116,7 @@ abstract class FeedFactory
             foreach ($data as $key => $value) {
                 $key    = static::convertKey($key);
                 $method = 'set' . $key;
-                if (!method_exists($entry, $method)) {
+                if (! method_exists($entry, $method)) {
                     continue;
                 }
                 $entry->$method($value);
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
index a609ca785..4759fd8ad 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
@@ -146,8 +146,10 @@ class AbstractRenderer
      */
     public function ignoreExceptions($bool = true)
     {
-        if (!is_bool($bool)) {
-            throw new Writer\Exception\InvalidArgumentException('Invalid parameter: $bool. Should be TRUE or FALSE (defaults to TRUE if null)');
+        if (! is_bool($bool)) {
+            throw new Writer\Exception\InvalidArgumentException(
+                'Invalid parameter: $bool. Should be TRUE or FALSE (defaults to TRUE if null)'
+            );
         }
         $this->ignoreExceptions = $bool;
         return $this;
@@ -213,8 +215,10 @@ class AbstractRenderer
      *
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _loadExtensions()
     {
+        // @codingStandardsIgnoreEnd
         Writer\Writer::registerCoreExtensions();
         $manager = Writer\Writer::getExtensionManager();
         $all = Writer\Writer::getExtensions();
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
index dced034ca..84ae0773d 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
@@ -71,13 +71,15 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setTitle(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getTitle()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getTitle()) {
             $message = 'Atom 1.0 entry elements MUST contain exactly one'
             . ' atom:title element but a title has not been set';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -98,9 +100,11 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDescription(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDescription()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDescription()) {
             return; // unless src content or base64
         }
         $subtitle = $dom->createElement('summary');
@@ -120,13 +124,15 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setDateModified(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDateModified()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDateModified()) {
             $message = 'Atom 1.0 entry elements MUST contain exactly one'
             . ' atom:updated element but a modification date has not been set';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -149,9 +155,11 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDateCreated()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDateCreated()) {
             return;
         }
         $el = $dom->createElement('published');
@@ -169,10 +177,12 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setAuthors(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $authors = $this->container->getAuthors();
-        if ((!$authors || empty($authors))) {
+        if ((! $authors || empty($authors))) {
             /**
              * This will actually trigger an Exception at the feed level if
              * a feed level author is not set.
@@ -208,10 +218,12 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $data = $this->container->getEnclosure();
-        if ((!$data || empty($data))) {
+        if ((! $data || empty($data))) {
             return;
         }
         $enclosure = $this->dom->createElement('link');
@@ -226,9 +238,11 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
         $root->appendChild($enclosure);
     }
 
+    // @codingStandardsIgnoreStart
     protected function _setLink(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getLink()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getLink()) {
             return;
         }
         $link = $dom->createElement('link');
@@ -246,16 +260,18 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setId(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getId()
+        && ! $this->getDataContainer()->getLink()) {
             $message = 'Atom 1.0 entry elements MUST contain exactly one '
             . 'atom:id element, or as an alternative, we can use the same '
             . 'value as atom:link however neither a suitable link nor an '
             . 'id have been set';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -263,17 +279,17 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
             }
         }
 
-        if (!$this->getDataContainer()->getId()) {
+        if (! $this->getDataContainer()->getId()) {
             $this->getDataContainer()->setId(
                 $this->getDataContainer()->getLink()
             );
         }
-        if (!Uri::factory($this->getDataContainer()->getId())->isValid()
-            && !preg_match(
+        if (! Uri::factory($this->getDataContainer()->getId())->isValid()
+            && ! preg_match(
                 "#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#",
                 $this->getDataContainer()->getId()
             )
-            && !$this->_validateTagUri($this->getDataContainer()->getId())
+            && ! $this->_validateTagUri($this->getDataContainer()->getId())
         ) {
             throw new Writer\Exception\InvalidArgumentException('Atom 1.0 IDs must be a valid URI/IRI');
         }
@@ -289,8 +305,10 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @param string $id
      * @return bool
      */
+    // @codingStandardsIgnoreStart
     protected function _validateTagUri($id)
     {
+        // @codingStandardsIgnoreEnd
         if (preg_match(
             '/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/',
             $id,
@@ -325,23 +343,25 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setContent(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $content = $this->getDataContainer()->getContent();
-        if (!$content && !$this->getDataContainer()->getLink()) {
+        if (! $content && ! $this->getDataContainer()->getLink()) {
             $message = 'Atom 1.0 entry elements MUST contain exactly one '
             . 'atom:content element, or as an alternative, at least one link '
             . 'with a rel attribute of "alternate" to indicate an alternate '
             . 'method to consume the content.';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
                 return;
             }
         }
-        if (!$content) {
+        if (! $content) {
             return;
         }
         $element = $dom->createElement('content');
@@ -356,8 +376,10 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
     /**
      * Load a HTML string and attempt to normalise to XML
      */
+    // @codingStandardsIgnoreStart
     protected function _loadXhtml($content)
     {
+        // @codingStandardsIgnoreEnd
         if (class_exists('tidy', false)) {
             $tidy = new \tidy;
             $config = [
@@ -391,10 +413,12 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCategories(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
+        if (! $categories) {
             return;
         }
         foreach ($categories as $cat) {
@@ -419,10 +443,12 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setSource(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $source = $this->getDataContainer()->getSource();
-        if (!$source) {
+        if (! $source) {
             return;
         }
         $renderer = new Renderer\Feed\AtomSource($source);
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
index 8519bd9d9..717718c6a 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
@@ -55,9 +55,11 @@ class Deleted extends Renderer\AbstractRenderer implements Renderer\RendererInte
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setComment(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getComment()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getComment()) {
             return;
         }
         $c = $dom->createElement('at:comment');
@@ -74,10 +76,12 @@ class Deleted extends Renderer\AbstractRenderer implements Renderer\RendererInte
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setBy(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $data = $this->container->getBy();
-        if ((!$data || empty($data))) {
+        if ((! $data || empty($data))) {
             return;
         }
         $author = $this->dom->createElement('at:by');
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
index f0db3e932..4f76040e8 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
@@ -57,9 +57,11 @@ class AtomDeleted extends Renderer\AbstractRenderer implements Renderer\Renderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setComment(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getComment()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getComment()) {
             return;
         }
         $c = $dom->createElement('at:comment');
@@ -76,10 +78,12 @@ class AtomDeleted extends Renderer\AbstractRenderer implements Renderer\Renderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setBy(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $data = $this->container->getBy();
-        if ((!$data || empty($data))) {
+        if ((! $data || empty($data))) {
             return;
         }
         $author = $this->dom->createElement('at:by');
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
index 3edb4fd3b..4c99936a6 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
@@ -71,15 +71,17 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setTitle(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDescription()
-        && !$this->getDataContainer()->getTitle()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDescription()
+        && ! $this->getDataContainer()->getTitle()) {
             $message = 'RSS 2.0 entry elements SHOULD contain exactly one'
             . ' title element but a title has not been set. In addition, there'
             . ' is no description as required in the absence of a title.';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -100,23 +102,25 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setDescription(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDescription()
-        && !$this->getDataContainer()->getTitle()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDescription()
+        && ! $this->getDataContainer()->getTitle()) {
             $message = 'RSS 2.0 entry elements SHOULD contain exactly one'
             . ' description element but a description has not been set. In'
             . ' addition, there is no title element as required in the absence'
             . ' of a description.';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
                 return;
             }
         }
-        if (!$this->getDataContainer()->getDescription()) {
+        if (! $this->getDataContainer()->getDescription()) {
             return;
         }
         $subtitle = $dom->createElement('description');
@@ -132,9 +136,11 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDateModified(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDateModified()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDateModified()) {
             return;
         }
 
@@ -153,12 +159,14 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDateCreated()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDateCreated()) {
             return;
         }
-        if (!$this->getDataContainer()->getDateModified()) {
+        if (! $this->getDataContainer()->getDateModified()) {
             $this->getDataContainer()->setDateModified(
                 $this->getDataContainer()->getDateCreated()
             );
@@ -172,10 +180,12 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setAuthors(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $authors = $this->container->getAuthors();
-        if ((!$authors || empty($authors))) {
+        if ((! $authors || empty($authors))) {
             return;
         }
         foreach ($authors as $data) {
@@ -198,34 +208,36 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $data = $this->container->getEnclosure();
-        if ((!$data || empty($data))) {
+        if ((! $data || empty($data))) {
             return;
         }
-        if (!isset($data['type'])) {
+        if (! isset($data['type'])) {
             $exception = new Writer\Exception\InvalidArgumentException('Enclosure "type" is not set');
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
                 return;
             }
         }
-        if (!isset($data['length'])) {
+        if (! isset($data['length'])) {
             $exception = new Writer\Exception\InvalidArgumentException('Enclosure "length" is not set');
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
                 return;
             }
         }
-        if ((int) $data['length'] < 0 || !ctype_digit((string) $data['length'])) {
+        if ((int) $data['length'] < 0 || ! ctype_digit((string) $data['length'])) {
             $exception = new Writer\Exception\InvalidArgumentException('Enclosure "length" must be an integer'
             . ' indicating the content\'s length in bytes');
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -246,9 +258,11 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setLink(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getLink()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getLink()) {
             return;
         }
         $link = $dom->createElement('link');
@@ -264,22 +278,25 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setId(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getId()
+        && ! $this->getDataContainer()->getLink()) {
             return;
         }
 
         $id = $dom->createElement('guid');
         $root->appendChild($id);
-        if (!$this->getDataContainer()->getId()) {
+        if (! $this->getDataContainer()->getId()) {
             $this->getDataContainer()->setId(
-                $this->getDataContainer()->getLink());
+                $this->getDataContainer()->getLink()
+            );
         }
         $text = $dom->createTextNode($this->getDataContainer()->getId());
         $id->appendChild($text);
-        if (!Uri::factory($this->getDataContainer()->getId())->isValid()) {
+        if (! Uri::factory($this->getDataContainer()->getId())->isValid()) {
             $id->setAttribute('isPermaLink', 'false');
         }
     }
@@ -291,10 +308,12 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCommentLink(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $link = $this->getDataContainer()->getCommentLink();
-        if (!$link) {
+        if (! $link) {
             return;
         }
         $clink = $this->dom->createElement('comments');
@@ -310,10 +329,12 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCategories(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
+        if (! $categories) {
             return;
         }
         foreach ($categories as $cat) {
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
index a5400a605..349d65cd6 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
@@ -37,8 +37,10 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setLanguage(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         if ($this->getDataContainer()->getLanguage()) {
             $root->setAttribute('xml:lang', $this->getDataContainer()
                 ->getLanguage());
@@ -53,13 +55,15 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setTitle(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getTitle()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getTitle()) {
             $message = 'Atom 1.0 feed elements MUST contain exactly one'
             . ' atom:title element but a title has not been set';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -81,9 +85,11 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDescription(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDescription()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDescription()) {
             return;
         }
         $subtitle = $dom->createElement('subtitle');
@@ -101,13 +107,15 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setDateModified(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDateModified()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDateModified()) {
             $message = 'Atom 1.0 feed elements MUST contain exactly one'
             . ' atom:updated element but a modification date has not been set';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -130,11 +138,16 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setGenerator(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getGenerator()) {
-            $this->getDataContainer()->setGenerator('Zend_Feed_Writer',
-                Version::VERSION, 'http://framework.zend.com');
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getGenerator()) {
+            $this->getDataContainer()->setGenerator(
+                'Zend_Feed_Writer',
+                Version::VERSION,
+                'http://framework.zend.com'
+            );
         }
 
         $gdata = $this->getDataContainer()->getGenerator();
@@ -157,9 +170,11 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setLink(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getLink()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getLink()) {
             return;
         }
         $link = $dom->createElement('link');
@@ -177,16 +192,18 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $flinks = $this->getDataContainer()->getFeedLinks();
-        if (!$flinks || !array_key_exists('atom', $flinks)) {
+        if (! $flinks || ! array_key_exists('atom', $flinks)) {
             $message = 'Atom 1.0 feed elements SHOULD contain one atom:link '
             . 'element with a rel attribute value of "self".  This is the '
             . 'preferred URI for retrieving Atom Feed Documents representing '
             . 'this Atom feed but a feed link has not been set';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -211,10 +228,12 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setAuthors(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $authors = $this->container->getAuthors();
-        if (!$authors || empty($authors)) {
+        if (! $authors || empty($authors)) {
             /**
              * Technically we should defer an exception until we can check
              * that all entries contain an author. If any entry is missing
@@ -252,16 +271,18 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setId(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getId()
+        && ! $this->getDataContainer()->getLink()) {
             $message = 'Atom 1.0 feed elements MUST contain exactly one '
             . 'atom:id element, or as an alternative, we can use the same '
             . 'value as atom:link however neither a suitable link nor an '
             . 'id have been set';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -269,9 +290,10 @@ class AbstractAtom extends Renderer\AbstractRenderer
             }
         }
 
-        if (!$this->getDataContainer()->getId()) {
+        if (! $this->getDataContainer()->getId()) {
             $this->getDataContainer()->setId(
-                $this->getDataContainer()->getLink());
+                $this->getDataContainer()->getLink()
+            );
         }
         $id = $dom->createElement('id');
         $root->appendChild($id);
@@ -286,10 +308,12 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCopyright(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $copyright = $this->getDataContainer()->getCopyright();
-        if (!$copyright) {
+        if (! $copyright) {
             return;
         }
         $copy = $dom->createElement('rights');
@@ -305,10 +329,12 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setImage(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $image = $this->getDataContainer()->getImage();
-        if (!$image) {
+        if (! $image) {
             return;
         }
         $img = $dom->createElement('logo');
@@ -324,12 +350,14 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDateCreated()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDateCreated()) {
             return;
         }
-        if (!$this->getDataContainer()->getDateModified()) {
+        if (! $this->getDataContainer()->getDateModified()) {
             $this->getDataContainer()->setDateModified(
                 $this->getDataContainer()->getDateCreated()
             );
@@ -343,10 +371,12 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setBaseUrl(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $baseUrl = $this->getDataContainer()->getBaseUrl();
-        if (!$baseUrl) {
+        if (! $baseUrl) {
             return;
         }
         $root->setAttribute('xml:base', $baseUrl);
@@ -359,10 +389,12 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setHubs(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $hubs = $this->getDataContainer()->getHubs();
-        if (!$hubs) {
+        if (! $hubs) {
             return;
         }
         foreach ($hubs as $hubUrl) {
@@ -380,10 +412,12 @@ class AbstractAtom extends Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCategories(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
+        if (! $categories) {
             return;
         }
         foreach ($categories as $cat) {
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
index 939babc0b..9d3718ccb 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
@@ -34,7 +34,7 @@ class Atom extends AbstractAtom implements Renderer\RendererInterface
      */
     public function render()
     {
-        if (!$this->container->getEncoding()) {
+        if (! $this->container->getEncoding()) {
             $this->container->setEncoding('UTF-8');
         }
         $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
@@ -75,7 +75,7 @@ class Atom extends AbstractAtom implements Renderer\RendererInterface
             if ($entry instanceof Writer\Entry) {
                 $renderer = new Renderer\Entry\Atom($entry);
             } else {
-                if (!$this->dom->documentElement->hasAttribute('xmlns:at')) {
+                if (! $this->dom->documentElement->hasAttribute('xmlns:at')) {
                     $this->dom->documentElement->setAttribute(
                         'xmlns:at',
                         'http://purl.org/atompub/tombstones/1.0'
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
index 20fc8df81..233005731 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -34,8 +34,10 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setLanguage(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         if ($this->getDataContainer()->getLanguage()) {
             $root->setAttribute('xml:lang', $this->getDataContainer()
                 ->getLanguage());
@@ -50,13 +52,15 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @return void
      * @throws Feed\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setTitle(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getTitle()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getTitle()) {
             $message = 'Atom 1.0 feed elements MUST contain exactly one'
                 . ' atom:title element but a title has not been set';
             $exception = new Feed\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -78,9 +82,11 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDescription(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDescription()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDescription()) {
             return;
         }
         $subtitle = $dom->createElement('subtitle');
@@ -98,13 +104,15 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @return void
      * @throws Feed\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setDateModified(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDateModified()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDateModified()) {
             $message = 'Atom 1.0 feed elements MUST contain exactly one'
                 . ' atom:updated element but a modification date has not been set';
             $exception = new Feed\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -127,11 +135,16 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setGenerator(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getGenerator()) {
-            $this->getDataContainer()->setGenerator('Zend_Feed_Writer',
-                Version::VERSION, 'http://framework.zend.com');
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getGenerator()) {
+            $this->getDataContainer()->setGenerator(
+                'Zend_Feed_Writer',
+                Version::VERSION,
+                'http://framework.zend.com'
+            );
         }
 
         $gdata = $this->getDataContainer()->getGenerator();
@@ -154,9 +167,11 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setLink(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getLink()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getLink()) {
             return;
         }
         $link = $dom->createElement('link');
@@ -174,16 +189,18 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @return void
      * @throws Feed\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $flinks = $this->getDataContainer()->getFeedLinks();
-        if (!$flinks || !array_key_exists('atom', $flinks)) {
+        if (! $flinks || ! array_key_exists('atom', $flinks)) {
             $message = 'Atom 1.0 feed elements SHOULD contain one atom:link '
                 . 'element with a rel attribute value of "self".  This is the '
                 . 'preferred URI for retrieving Atom Feed Documents representing '
                 . 'this Atom feed but a feed link has not been set';
             $exception = new Feed\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -208,10 +225,12 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setAuthors(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $authors = $this->container->getAuthors();
-        if (!$authors || empty($authors)) {
+        if (! $authors || empty($authors)) {
             /**
              * Technically we should defer an exception until we can check
              * that all entries contain an author. If any entry is missing
@@ -249,16 +268,18 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @return void
      * @throws Feed\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setId(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getId()
+        && ! $this->getDataContainer()->getLink()) {
             $message = 'Atom 1.0 feed elements MUST contain exactly one '
                 . 'atom:id element, or as an alternative, we can use the same '
                 . 'value as atom:link however neither a suitable link nor an '
                 . 'id have been set';
             $exception = new Feed\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -266,9 +287,10 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
             }
         }
 
-        if (!$this->getDataContainer()->getId()) {
+        if (! $this->getDataContainer()->getId()) {
             $this->getDataContainer()->setId(
-                $this->getDataContainer()->getLink());
+                $this->getDataContainer()->getLink()
+            );
         }
         $id = $dom->createElement('id');
         $root->appendChild($id);
@@ -283,10 +305,12 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCopyright(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $copyright = $this->getDataContainer()->getCopyright();
-        if (!$copyright) {
+        if (! $copyright) {
             return;
         }
         $copy = $dom->createElement('rights');
@@ -294,6 +318,7 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
         $text = $dom->createTextNode($copyright);
         $copy->appendChild($text);
     }
+
     /**
      * Set feed level logo (image)
      *
@@ -301,10 +326,12 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setImage(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $image = $this->getDataContainer()->getImage();
-        if (!$image) {
+        if (! $image) {
             return;
         }
         $img = $dom->createElement('logo');
@@ -320,12 +347,14 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDateCreated()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDateCreated()) {
             return;
         }
-        if (!$this->getDataContainer()->getDateModified()) {
+        if (! $this->getDataContainer()->getDateModified()) {
             $this->getDataContainer()->setDateModified(
                 $this->getDataContainer()->getDateCreated()
             );
@@ -339,10 +368,12 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setBaseUrl(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $baseUrl = $this->getDataContainer()->getBaseUrl();
-        if (!$baseUrl) {
+        if (! $baseUrl) {
             return;
         }
         $root->setAttribute('xml:base', $baseUrl);
@@ -355,10 +386,12 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setHubs(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $hubs = $this->getDataContainer()->getHubs();
-        if (!$hubs) {
+        if (! $hubs) {
             return;
         }
         foreach ($hubs as $hubUrl) {
@@ -376,10 +409,12 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCategories(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
+        if (! $categories) {
             return;
         }
         foreach ($categories as $cat) {
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
index 3793db0cb..4d664859f 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
@@ -33,7 +33,7 @@ class Source extends AbstractAtom implements Renderer\RendererInterface
      */
     public function render()
     {
-        if (!$this->container->getEncoding()) {
+        if (! $this->container->getEncoding()) {
             $this->container->setEncoding('UTF-8');
         }
         $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
@@ -71,9 +71,11 @@ class Source extends AbstractAtom implements Renderer\RendererInterface
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setGenerator(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getGenerator()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getGenerator()) {
             return;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
index d552b8089..ac1f583f0 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
@@ -35,7 +35,7 @@ class AtomSource extends AbstractAtom implements Renderer\RendererInterface
      */
     public function render()
     {
-        if (!$this->container->getEncoding()) {
+        if (! $this->container->getEncoding()) {
             $this->container->setEncoding('UTF-8');
         }
         $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
@@ -73,9 +73,11 @@ class AtomSource extends AbstractAtom implements Renderer\RendererInterface
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setGenerator(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getGenerator()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getGenerator()) {
             return;
         }
 
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
index be902b8a9..22ebe7636 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
@@ -99,10 +99,12 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setLanguage(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $lang = $this->getDataContainer()->getLanguage();
-        if (!$lang) {
+        if (! $lang) {
             return;
         }
         $language = $dom->createElement('language');
@@ -118,13 +120,15 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setTitle(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getTitle()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getTitle()) {
             $message = 'RSS 2.0 feed elements MUST contain exactly one'
             . ' title element but a title has not been set';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -146,13 +150,15 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setDescription(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDescription()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDescription()) {
             $message = 'RSS 2.0 feed elements MUST contain exactly one'
             . ' description element but one has not been set';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -172,9 +178,11 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDateModified(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDateModified()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDateModified()) {
             return;
         }
 
@@ -193,9 +201,11 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setGenerator(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getGenerator()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getGenerator()) {
             $this->getDataContainer()->setGenerator(
                 'Zend_Feed_Writer',
                 Version::VERSION,
@@ -225,14 +235,16 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setLink(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $value = $this->getDataContainer()->getLink();
-        if (!$value) {
+        if (! $value) {
             $message = 'RSS 2.0 feed elements MUST contain exactly one'
             . ' link element but one has not been set';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -243,7 +255,7 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
         $root->appendChild($link);
         $text = $dom->createTextNode($value);
         $link->appendChild($text);
-        if (!Uri::factory($value)->isValid()) {
+        if (! Uri::factory($value)->isValid()) {
             $link->setAttribute('isPermaLink', 'false');
         }
     }
@@ -255,10 +267,12 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setAuthors(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $authors = $this->getDataContainer()->getAuthors();
-        if (!$authors || empty($authors)) {
+        if (! $authors || empty($authors)) {
             return;
         }
         foreach ($authors as $data) {
@@ -280,10 +294,12 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCopyright(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $copyright = $this->getDataContainer()->getCopyright();
-        if (!$copyright) {
+        if (! $copyright) {
             return;
         }
         $copy = $dom->createElement('copyright');
@@ -300,19 +316,21 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @return void
      * @throws Writer\Exception\InvalidArgumentException
      */
+    // @codingStandardsIgnoreStart
     protected function _setImage(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $image = $this->getDataContainer()->getImage();
-        if (!$image) {
+        if (! $image) {
             return;
         }
 
-        if (!isset($image['title']) || empty($image['title'])
-            || !is_string($image['title'])
+        if (! isset($image['title']) || empty($image['title'])
+            || ! is_string($image['title'])
         ) {
             $message = 'RSS 2.0 feed images must include a title';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -320,13 +338,13 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
             }
         }
 
-        if (empty($image['link']) || !is_string($image['link'])
-            || !Uri::factory($image['link'])->isValid()
+        if (empty($image['link']) || ! is_string($image['link'])
+            || ! Uri::factory($image['link'])->isValid()
         ) {
             $message = 'Invalid parameter: parameter \'link\''
             . ' must be a non-empty string and valid URI/IRI';
             $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
+            if (! $this->ignoreExceptions) {
                 throw $exception;
             } else {
                 $this->exceptions[] = $exception;
@@ -354,11 +372,11 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
         $img->appendChild($link);
 
         if (isset($image['height'])) {
-            if (!ctype_digit((string) $image['height']) || $image['height'] > 400) {
+            if (! ctype_digit((string) $image['height']) || $image['height'] > 400) {
                 $message = 'Invalid parameter: parameter \'height\''
                          . ' must be an integer not exceeding 400';
                 $exception = new Writer\Exception\InvalidArgumentException($message);
-                if (!$this->ignoreExceptions) {
+                if (! $this->ignoreExceptions) {
                     throw $exception;
                 } else {
                     $this->exceptions[] = $exception;
@@ -371,11 +389,11 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
             $img->appendChild($height);
         }
         if (isset($image['width'])) {
-            if (!ctype_digit((string) $image['width']) || $image['width'] > 144) {
+            if (! ctype_digit((string) $image['width']) || $image['width'] > 144) {
                 $message = 'Invalid parameter: parameter \'width\''
                          . ' must be an integer not exceeding 144';
                 $exception = new Writer\Exception\InvalidArgumentException($message);
-                if (!$this->ignoreExceptions) {
+                if (! $this->ignoreExceptions) {
                     throw $exception;
                 } else {
                     $this->exceptions[] = $exception;
@@ -388,11 +406,11 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
             $img->appendChild($width);
         }
         if (isset($image['description'])) {
-            if (empty($image['description']) || !is_string($image['description'])) {
+            if (empty($image['description']) || ! is_string($image['description'])) {
                 $message = 'Invalid parameter: parameter \'description\''
                          . ' must be a non-empty string';
                 $exception = new Writer\Exception\InvalidArgumentException($message);
-                if (!$this->ignoreExceptions) {
+                if (! $this->ignoreExceptions) {
                     throw $exception;
                 } else {
                     $this->exceptions[] = $exception;
@@ -413,12 +431,14 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getDateCreated()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getDateCreated()) {
             return;
         }
-        if (!$this->getDataContainer()->getDateModified()) {
+        if (! $this->getDataContainer()->getDateModified()) {
             $this->getDataContainer()->setDateModified(
                 $this->getDataContainer()->getDateCreated()
             );
@@ -432,9 +452,11 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setLastBuildDate(DOMDocument $dom, DOMElement $root)
     {
-        if (!$this->getDataContainer()->getLastBuildDate()) {
+        // @codingStandardsIgnoreEnd
+        if (! $this->getDataContainer()->getLastBuildDate()) {
             return;
         }
 
@@ -453,10 +475,12 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setBaseUrl(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $baseUrl = $this->getDataContainer()->getBaseUrl();
-        if (!$baseUrl) {
+        if (! $baseUrl) {
             return;
         }
         $root->setAttribute('xml:base', $baseUrl);
@@ -469,10 +493,12 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      * @param  DOMElement $root
      * @return void
      */
+    // @codingStandardsIgnoreStart
     protected function _setCategories(DOMDocument $dom, DOMElement $root)
     {
+        // @codingStandardsIgnoreEnd
         $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
+        if (! $categories) {
             return;
         }
         foreach ($categories as $cat) {
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/StandaloneExtensionManager.php b/web/vendor/zendframework/zend-feed/src/Writer/StandaloneExtensionManager.php
new file mode 100644
index 000000000..c9a88c76a
--- /dev/null
+++ b/web/vendor/zendframework/zend-feed/src/Writer/StandaloneExtensionManager.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Writer;
+
+class StandaloneExtensionManager implements ExtensionManagerInterface
+{
+    private $extensions = [
+        'Atom\Renderer\Feed'           => Extension\Atom\Renderer\Feed::class,
+        'Content\Renderer\Entry'       => Extension\Content\Renderer\Entry::class,
+        'DublinCore\Renderer\Entry'    => Extension\DublinCore\Renderer\Entry::class,
+        'DublinCore\Renderer\Feed'     => Extension\DublinCore\Renderer\Feed::class,
+        'ITunes\Entry'                 => Extension\ITunes\Entry::class,
+        'ITunes\Feed'                  => Extension\ITunes\Feed::class,
+        'ITunes\Renderer\Entry'        => Extension\ITunes\Renderer\Entry::class,
+        'ITunes\Renderer\Feed'         => Extension\ITunes\Renderer\Feed::class,
+        'Slash\Renderer\Entry'         => Extension\Slash\Renderer\Entry::class,
+        'Threading\Renderer\Entry'     => Extension\Threading\Renderer\Entry::class,
+        'WellFormedWeb\Renderer\Entry' => Extension\WellFormedWeb\Renderer\Entry::class,
+    ];
+
+    /**
+     * Do we have the extension?
+     *
+     * @param  string $extension
+     * @return bool
+     */
+    public function has($extension)
+    {
+        return array_key_exists($extension, $this->extensions);
+    }
+
+    /**
+     * Retrieve the extension
+     *
+     * @param  string $extension
+     * @return mixed
+     */
+    public function get($extension)
+    {
+        $class = $this->extensions[$extension];
+        return new $class();
+    }
+}
diff --git a/web/vendor/zendframework/zend-feed/src/Writer/Writer.php b/web/vendor/zendframework/zend-feed/src/Writer/Writer.php
index a4f95bfc8..b7ba794c5 100644
--- a/web/vendor/zendframework/zend-feed/src/Writer/Writer.php
+++ b/web/vendor/zendframework/zend-feed/src/Writer/Writer.php
@@ -76,7 +76,7 @@ class Writer
      */
     public static function getExtensionManager()
     {
-        if (!isset(static::$extensionManager)) {
+        if (! isset(static::$extensionManager)) {
             static::setExtensionManager(new ExtensionManager());
         }
         return static::$extensionManager;
@@ -105,13 +105,16 @@ class Writer
                 return;
             }
         }
-        if (!$manager->has($feedName)
-            && !$manager->has($entryName)
-            && !$manager->has($feedRendererName)
-            && !$manager->has($entryRendererName)
+        if (! $manager->has($feedName)
+            && ! $manager->has($entryName)
+            && ! $manager->has($feedRendererName)
+            && ! $manager->has($entryRendererName)
         ) {
-            throw new Exception\RuntimeException('Could not load extension: ' . $name
-                . 'using Plugin Loader. Check prefix paths are configured and extension exists.');
+            throw new Exception\RuntimeException(sprintf(
+                'Could not load extension "%s" using Plugin Loader. '
+                . 'Check prefix paths are configured and extension exists.',
+                $name
+            ));
         }
         if ($manager->has($feedName)) {
             static::$extensions['feed'][] = $feedName;
diff --git a/web/vendor/zendframework/zend-hydrator/CHANGELOG.md b/web/vendor/zendframework/zend-hydrator/CHANGELOG.md
deleted file mode 100644
index 691168625..000000000
--- a/web/vendor/zendframework/zend-hydrator/CHANGELOG.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
-
-## 1.0.0 - 2015-09-17
-
-Initial release. This ports all hydrator classes and functionality from
-[zend-stdlib](https://github.com/zendframework/zend-stdlib) to a standalone
-repository. All final keywords are removed, to allow a deprecation cycle in the
-zend-stdlib component.
-
-Please note: the following classes will be marked as `final` for a version 2.0.0
-release to immediately follow 1.0.0:
-
-- `Zend\Hydrator\NamingStrategy\IdentityNamingStrategy`
-- `Zend\Hydrator\NamingStrategy\ArrayMapNamingStrategy`
-- `Zend\Hydrator\NamingStrategy\CompositeNamingStrategy`
-- `Zend\Hydrator\Strategy\ExplodeStrategy`
-- `Zend\Hydrator\Strategy\StrategyChain`
-- `Zend\Hydrator\Strategy\DateTimeFormatterStrategy`
-- `Zend\Hydrator\Strategy\BooleanStrategy`
-
-As such, you should not extend them.
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
diff --git a/web/vendor/zendframework/zend-hydrator/CONTRIBUTING.md b/web/vendor/zendframework/zend-hydrator/CONTRIBUTING.md
deleted file mode 100644
index ddfff50ec..000000000
--- a/web/vendor/zendframework/zend-hydrator/CONTRIBUTING.md
+++ /dev/null
@@ -1,229 +0,0 @@
-# CONTRIBUTING
-
-## RESOURCES
-
-If you wish to contribute to Zend Framework, please be sure to
-read/subscribe to the following resources:
-
- -  [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
- -  [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
- -  ZF Contributor's mailing list:
-    Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
-    Subscribe: zf-contributors-subscribe@lists.zend.com
- -  ZF Contributor's IRC channel:
-    #zftalk.dev on Freenode.net
-
-If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-hydrator/issues/new).
-
-## Reporting Potential Security Issues
-
-If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
-issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
-We will work with you to verify the vulnerability and patch it as soon as possible.
-
-When reporting issues, please provide the following information:
-
-- Component(s) affected
-- A description indicating how to reproduce the issue
-- A summary of the security vulnerability and impact
-
-We request that you contact us via the email address above and give the project
-contributors a chance to resolve the vulnerability and issue a new release prior
-to any public exposure; this helps protect users and provides them with a chance
-to upgrade and/or update in order to protect their applications.
-
-For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
-
-## RUNNING TESTS
-
-> ### Note: testing versions prior to 2.4
->
-> This component originates with Zend Framework 2. During the lifetime of ZF2,
-> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
-> changes were necessary. However, due to the migration, tests may not run on
-> versions < 2.4. As such, you may need to change the PHPUnit dependency if
-> attempting a fix on such a version.
-
-To run tests:
-
-- Clone the repository:
-
-  ```console
-  $ git clone git@github.com:zendframework/zend-hydrator.git
-  $ cd
-  ```
-
-- Install dependencies via composer:
-
-  ```console
-  $ curl -sS https://getcomposer.org/installer | php --
-  $ ./composer.phar install
-  ```
-
-  If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
-
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
-
-  ```console
-  $ ./vendor/bin/phpunit
-  ```
-
-You can turn on conditional tests with the phpunit.xml file.
-To do so:
-
- -  Copy `phpunit.xml.dist` file to `phpunit.xml`
- -  Edit `phpunit.xml` to enable any specific functionality you
-    want to test, as well as to provide test values to utilize.
-
-## Running Coding Standards Checks
-
-This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
-standards checks, and provides configuration for our selected checks.
-`phpcs` is installed by default via Composer.
-
-To run checks only:
-
-```console
-$ ./vendor/bin/phpcs
-```
-
-`phpcs` also provides a tool that can automatically fix many CS issues,
-`phpcbf`:
-
-```console
-$ ./vendor/bin/phpcbf
-```
-
-If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure
-they pass, and make sure you add and commit the changes after verification.
-
-## Recommended Workflow for Contributions
-
-Your first step is to establish a public repository from which we can
-pull your work into the master repository. We recommend using
-[GitHub](https://github.com), as that is where the component is already hosted.
-
-1. Setup a [GitHub account](http://github.com/), if you haven't yet
-2. Fork the repository (http://github.com/zendframework/zend-hydrator)
-3. Clone the canonical repository locally and enter it.
-
-   ```console
-   $ git clone git://github.com:zendframework/zend-hydrator.git
-   $ cd zend-hydrator
-   ```
-
-4. Add a remote to your fork; substitute your GitHub username in the command
-   below.
-
-   ```console
-   $ git remote add {username} git@github.com:{username}/zend-hydrator.git
-   $ git fetch {username}
-   ```
-
-### Keeping Up-to-Date
-
-Periodically, you should update your fork or personal repository to
-match the canonical ZF repository. Assuming you have setup your local repository
-per the instructions above, you can do the following:
-
-
-```console
-$ git checkout master
-$ git fetch origin
-$ git rebase origin/master
-# OPTIONALLY, to keep your remote up-to-date -
-$ git push {username} master:master
-```
-
-If you're tracking other branches -- for example, the "develop" branch, where
-new feature development occurs -- you'll want to do the same operations for that
-branch; simply substitute  "develop" for "master".
-
-### Working on a patch
-
-We recommend you do each new feature or bugfix in a new branch. This simplifies
-the task of code review as well as the task of merging your changes into the
-canonical repository.
-
-A typical workflow will then consist of the following:
-
-1. Create a new local branch based off either your master or develop branch.
-2. Switch to your new local branch. (This step can be combined with the
-   previous step with the use of `git checkout -b`.)
-3. Do some work, commit, repeat as necessary.
-4. Push the local branch to your remote repository.
-5. Send a pull request.
-
-The mechanics of this process are actually quite trivial. Below, we will
-create a branch for fixing an issue in the tracker.
-
-```console
-$ git checkout -b hotfix/9295
-Switched to a new branch 'hotfix/9295'
-```
-
-... do some work ...
-
-
-```console
-$ git commit
-```
-
-... write your log message ...
-
-
-```console
-$ git push {username} hotfix/9295:hotfix/9295
-Counting objects: 38, done.
-Delta compression using up to 2 threads.
-Compression objects: 100% (18/18), done.
-Writing objects: 100% (20/20), 8.19KiB, done.
-Total 20 (delta 12), reused 0 (delta 0)
-To ssh://git@github.com/{username}/zend-hydrator.git
-   b5583aa..4f51698  HEAD -> master
-```
-
-To send a pull request, you have two options.
-
-If using GitHub, you can do the pull request from there. Navigate to
-your repository, select the branch you just created, and then select the
-"Pull Request" button in the upper right. Select the user/organization
-"zendframework" as the recipient.
-
-If using your own repository - or even if using GitHub - you can use `git
-format-patch` to create a patchset for us to apply; in fact, this is
-**recommended** for security-related patches. If you use `format-patch`, please
-send the patches as attachments to:
-
--  zf-devteam@zend.com for patches without security implications
--  zf-security@zend.com for security patches
-
-#### What branch to issue the pull request against?
-
-Which branch should you issue a pull request against?
-
-- For fixes against the stable release, issue the pull request against the
-  "master" branch.
-- For new features, or fixes that introduce new elements to the public API (such
-  as new public methods or properties), issue the pull request against the
-  "develop" branch.
-
-### Branch Cleanup
-
-As you might imagine, if you are a frequent contributor, you'll start to
-get a ton of branches both locally and on your remote.
-
-Once you know that your changes have been accepted to the master
-repository, we suggest doing some cleanup of these branches.
-
--  Local branch cleanup
-
-   ```console
-   $ git branch -d <branchname>
-   ```
-
--  Remote branch removal
-
-   ```console
-   $ git push {username} :<branchname>
-   ```
diff --git a/web/vendor/zendframework/zend-hydrator/LICENSE.md b/web/vendor/zendframework/zend-hydrator/LICENSE.md
deleted file mode 100644
index dbb1b49c0..000000000
--- a/web/vendor/zendframework/zend-hydrator/LICENSE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-- Neither the name of Zend Technologies USA, Inc. nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/web/vendor/zendframework/zend-hydrator/README.md b/web/vendor/zendframework/zend-hydrator/README.md
deleted file mode 100644
index 76083347b..000000000
--- a/web/vendor/zendframework/zend-hydrator/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# zend-hydrator
-
-[![Build Status](https://secure.travis-ci.org/zendframework/zend-hydrator.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-hydrator)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-hydrator/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-hydrator?branch=master)
-
-`Zend\Hydrator` provides utilities for mapping arrays to objects, and vice
-versa, including facilities for filtering which data is mapped as well as
-providing mechanisms for mapping nested structures.
-
-- File issues at https://github.com/zendframework/zend-hydrator/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-stdlib
diff --git a/web/vendor/zendframework/zend-hydrator/composer.json b/web/vendor/zendframework/zend-hydrator/composer.json
deleted file mode 100644
index 21b4afe01..000000000
--- a/web/vendor/zendframework/zend-hydrator/composer.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "name": "zendframework/zend-hydrator",
-    "description": " ",
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "zf2",
-        "hydrator"
-    ],
-    "homepage": "https://github.com/zendframework/zend-hydrator",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Hydrator\\": "src/"
-        }
-    },
-    "require": {
-        "php": ">=5.5",
-        "zendframework/zend-stdlib": "^2.5.1"
-    },
-    "require-dev": {
-        "zendframework/zend-eventmanager": "^2.5.1",
-        "zendframework/zend-inputfilter": "^2.5.1",
-        "zendframework/zend-serializer": "^2.5.1",
-        "zendframework/zend-servicemanager": "^2.5.1",
-        "zendframework/zend-filter": "^2.5.1",
-        "phpunit/PHPUnit": "~4.0",
-        "squizlabs/php_codesniffer": "^2.0@dev"
-    },
-    "suggest": {
-        "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage",
-        "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy",
-        "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage",
-        "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev",
-            "dev-develop": "1.1-dev"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "ZendTest\\Hydrator\\": "test/"
-        }
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/phpcs.xml b/web/vendor/zendframework/zend-hydrator/phpcs.xml
deleted file mode 100644
index e994eae10..000000000
--- a/web/vendor/zendframework/zend-hydrator/phpcs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Zend Framework coding standard">
-    <description>Zend Framework coding standard</description>
-
-    <!-- display progress -->
-    <arg value="p"/>
-    <arg name="colors"/>
-
-    <!-- inherit rules from: -->
-    <rule ref="PSR2"/>
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
-        <properties>
-            <property name="ignoreBlankLines" value="false"/>
-        </properties>
-    </rule>
-
-    <!-- Paths to check -->
-    <file>src</file>
-    <file>test</file>
-</ruleset>
diff --git a/web/vendor/zendframework/zend-hydrator/src/AbstractHydrator.php b/web/vendor/zendframework/zend-hydrator/src/AbstractHydrator.php
deleted file mode 100644
index 6f3f0a904..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/AbstractHydrator.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use ArrayObject;
-
-abstract class AbstractHydrator implements
-    HydratorInterface,
-    StrategyEnabledInterface,
-    FilterEnabledInterface,
-    NamingStrategyEnabledInterface
-{
-    /**
-     * The list with strategies that this hydrator has.
-     *
-     * @var ArrayObject
-     */
-    protected $strategies;
-
-    /**
-     * An instance of NamingStrategy\NamingStrategyInterface
-     *
-     * @var NamingStrategy\NamingStrategyInterface
-     */
-    protected $namingStrategy;
-
-    /**
-     * Composite to filter the methods, that need to be hydrated
-     *
-     * @var Filter\FilterComposite
-     */
-    protected $filterComposite;
-
-    /**
-     * Initializes a new instance of this class.
-     */
-    public function __construct()
-    {
-        $this->strategies = new ArrayObject();
-        $this->filterComposite = new Filter\FilterComposite();
-    }
-
-    /**
-     * Gets the strategy with the given name.
-     *
-     * @param string $name The name of the strategy to get.
-     *
-     * @throws Exception\InvalidArgumentException
-     * @return Strategy\StrategyInterface
-     */
-    public function getStrategy($name)
-    {
-        if (isset($this->strategies[$name])) {
-            return $this->strategies[$name];
-        }
-
-        if (!isset($this->strategies['*'])) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s: no strategy by name of "%s", and no wildcard strategy present',
-                __METHOD__,
-                $name
-            ));
-        }
-
-        return $this->strategies['*'];
-    }
-
-    /**
-     * Checks if the strategy with the given name exists.
-     *
-     * @param string $name The name of the strategy to check for.
-     * @return bool
-     */
-    public function hasStrategy($name)
-    {
-        return array_key_exists($name, $this->strategies)
-               || array_key_exists('*', $this->strategies);
-    }
-
-    /**
-     * Adds the given strategy under the given name.
-     *
-     * @param string $name The name of the strategy to register.
-     * @param Strategy\StrategyInterface $strategy The strategy to register.
-     * @return HydratorInterface
-     */
-    public function addStrategy($name, Strategy\StrategyInterface $strategy)
-    {
-        $this->strategies[$name] = $strategy;
-        return $this;
-    }
-
-    /**
-     * Removes the strategy with the given name.
-     *
-     * @param string $name The name of the strategy to remove.
-     * @return HydratorInterface
-     */
-    public function removeStrategy($name)
-    {
-        unset($this->strategies[$name]);
-        return $this;
-    }
-
-    /**
-     * Converts a value for extraction. If no strategy exists the plain value is returned.
-     *
-     * @param  string $name  The name of the strategy to use.
-     * @param  mixed  $value  The value that should be converted.
-     * @param  mixed  $object The object is optionally provided as context.
-     * @return mixed
-     */
-    public function extractValue($name, $value, $object = null)
-    {
-        if ($this->hasStrategy($name)) {
-            $strategy = $this->getStrategy($name);
-            $value = $strategy->extract($value, $object);
-        }
-        return $value;
-    }
-
-    /**
-     * Converts a value for hydration. If no strategy exists the plain value is returned.
-     *
-     * @param string $name The name of the strategy to use.
-     * @param mixed $value The value that should be converted.
-     * @param array $data The whole data is optionally provided as context.
-     * @return mixed
-     */
-    public function hydrateValue($name, $value, $data = null)
-    {
-        if ($this->hasStrategy($name)) {
-            $strategy = $this->getStrategy($name);
-            $value = $strategy->hydrate($value, $data);
-        }
-        return $value;
-    }
-
-    /**
-     * Convert a name for extraction. If no naming strategy exists, the plain value is returned.
-     *
-     * @param string $name    The name to convert.
-     * @param null   $object  The object is optionally provided as context.
-     * @return mixed
-     */
-    public function extractName($name, $object = null)
-    {
-        if ($this->hasNamingStrategy()) {
-            $name = $this->getNamingStrategy()->extract($name, $object);
-        }
-        return $name;
-    }
-
-    /**
-     * Converts a value for hydration. If no naming strategy exists, the plain value is returned.
-     *
-     * @param string $name  The name to convert.
-     * @param array  $data  The whole data is optionally provided as context.
-     * @return mixed
-     */
-    public function hydrateName($name, $data = null)
-    {
-        if ($this->hasNamingStrategy()) {
-            $name = $this->getNamingStrategy()->hydrate($name, $data);
-        }
-        return $name;
-    }
-
-    /**
-     * Get the filter instance
-     *
-     * @return Filter\FilterComposite
-     */
-    public function getFilter()
-    {
-        return $this->filterComposite;
-    }
-
-    /**
-     * Add a new filter to take care of what needs to be hydrated.
-     * To exclude e.g. the method getServiceLocator:
-     *
-     * <code>
-     * $composite->addFilter("servicelocator",
-     *     function ($property) {
-     *         list($class, $method) = explode('::', $property);
-     *         if ($method === 'getServiceLocator') {
-     *             return false;
-     *         }
-     *         return true;
-     *     }, FilterComposite::CONDITION_AND
-     * );
-     * </code>
-     *
-     * @param string $name Index in the composite
-     * @param callable|Filter\FilterInterface $filter
-     * @param int $condition
-     * @return Filter\FilterComposite
-     */
-    public function addFilter($name, $filter, $condition = Filter\FilterComposite::CONDITION_OR)
-    {
-        return $this->filterComposite->addFilter($name, $filter, $condition);
-    }
-
-    /**
-     * Check whether a specific filter exists at key $name or not
-     *
-     * @param string $name Index in the composite
-     * @return bool
-     */
-    public function hasFilter($name)
-    {
-        return $this->filterComposite->hasFilter($name);
-    }
-
-    /**
-     * Remove a filter from the composition.
-     * To not extract "has" methods, you simply need to unregister it
-     *
-     * <code>
-     * $filterComposite->removeFilter('has');
-     * </code>
-     *
-     * @param $name
-     * @return Filter\FilterComposite
-     */
-    public function removeFilter($name)
-    {
-        return $this->filterComposite->removeFilter($name);
-    }
-
-    /**
-     * Adds the given naming strategy
-     *
-     * @param NamingStrategy\NamingStrategyInterface $strategy The naming to register.
-     * @return self
-     */
-    public function setNamingStrategy(NamingStrategy\NamingStrategyInterface $strategy)
-    {
-        $this->namingStrategy = $strategy;
-
-        return $this;
-    }
-
-    /**
-     * Gets the naming strategy.
-     *
-     * @return NamingStrategy\NamingStrategyInterface
-     */
-    public function getNamingStrategy()
-    {
-        return $this->namingStrategy;
-    }
-
-    /**
-     * Checks if a naming strategy exists.
-     *
-     * @return bool
-     */
-    public function hasNamingStrategy()
-    {
-        return isset($this->namingStrategy);
-    }
-
-    /**
-     * Removes the naming strategy
-     *
-     * @return self
-     */
-    public function removeNamingStrategy()
-    {
-        $this->namingStrategy = null;
-
-        return $this;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Aggregate/AggregateHydrator.php b/web/vendor/zendframework/zend-hydrator/src/Aggregate/AggregateHydrator.php
deleted file mode 100644
index fa384adbd..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Aggregate/AggregateHydrator.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Aggregate;
-
-use Zend\EventManager\EventManager;
-use Zend\EventManager\EventManagerAwareInterface;
-use Zend\EventManager\EventManagerInterface;
-use Zend\Hydrator\HydratorInterface;
-
-/**
- * Aggregate hydrator that composes multiple hydrators via events
- */
-class AggregateHydrator implements HydratorInterface, EventManagerAwareInterface
-{
-    const DEFAULT_PRIORITY = 1;
-
-    /**
-     * @var EventManagerInterface|null
-     */
-    protected $eventManager;
-
-    /**
-     * Attaches the provided hydrator to the list of hydrators to be used while hydrating/extracting data
-     *
-     * @param HydratorInterface $hydrator
-     * @param int $priority
-     */
-    public function add(HydratorInterface $hydrator, $priority = self::DEFAULT_PRIORITY)
-    {
-        $this->getEventManager()->attachAggregate(new HydratorListener($hydrator), $priority);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function extract($object)
-    {
-        $event = new ExtractEvent($this, $object);
-
-        $this->getEventManager()->trigger($event);
-
-        return $event->getExtractedData();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hydrate(array $data, $object)
-    {
-        $event = new HydrateEvent($this, $object, $data);
-
-        $this->getEventManager()->trigger($event);
-
-        return $event->getHydratedObject();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setEventManager(EventManagerInterface $eventManager)
-    {
-        $eventManager->setIdentifiers([__CLASS__, get_class($this)]);
-
-        $this->eventManager = $eventManager;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getEventManager()
-    {
-        if (null === $this->eventManager) {
-            $this->setEventManager(new EventManager());
-        }
-
-        return $this->eventManager;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Aggregate/ExtractEvent.php b/web/vendor/zendframework/zend-hydrator/src/Aggregate/ExtractEvent.php
deleted file mode 100644
index 13959175a..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Aggregate/ExtractEvent.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Aggregate;
-
-use Zend\EventManager\Event;
-
-/**
- * Event triggered when the {@see AggregateHydrator} extracts
- * data from an object
- */
-class ExtractEvent extends Event
-{
-    const EVENT_EXTRACT = 'extract';
-
-    /**
-     * {@inheritDoc}
-     */
-    protected $name = self::EVENT_EXTRACT;
-
-    /**
-     * @var object
-     */
-    protected $extractionObject;
-
-    /**
-     * @var array
-     */
-    protected $extractedData = [];
-
-    /**
-     * @param object $target
-     * @param object $extractionObject
-     */
-    public function __construct($target, $extractionObject)
-    {
-        $this->target           = $target;
-        $this->extractionObject = $extractionObject;
-    }
-
-    /**
-     * Retrieves the object from which data is extracted
-     *
-     * @return object
-     */
-    public function getExtractionObject()
-    {
-        return $this->extractionObject;
-    }
-
-    /**
-     * @param object $extractionObject
-     *
-     * @return void
-     */
-    public function setExtractionObject($extractionObject)
-    {
-        $this->extractionObject = $extractionObject;
-    }
-
-    /**
-     * Retrieves the data that has been extracted
-     *
-     * @return array
-     */
-    public function getExtractedData()
-    {
-        return $this->extractedData;
-    }
-
-    /**
-     * @param array $extractedData
-     *
-     * @return void
-     */
-    public function setExtractedData(array $extractedData)
-    {
-        $this->extractedData = $extractedData;
-    }
-
-    /**
-     * Merge provided data with the extracted data
-     *
-     * @param array $additionalData
-     *
-     * @return void
-     */
-    public function mergeExtractedData(array $additionalData)
-    {
-        $this->extractedData = array_merge($this->extractedData, $additionalData);
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Aggregate/HydrateEvent.php b/web/vendor/zendframework/zend-hydrator/src/Aggregate/HydrateEvent.php
deleted file mode 100644
index 7865964d7..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Aggregate/HydrateEvent.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Aggregate;
-
-use Zend\EventManager\Event;
-
-/**
- * Event triggered when the {@see AggregateHydrator} hydrates
- * data into an object
- */
-class HydrateEvent extends Event
-{
-    const EVENT_HYDRATE = 'hydrate';
-
-    /**
-     * {@inheritDoc}
-     */
-    protected $name = self::EVENT_HYDRATE;
-
-    /**
-     * @var object
-     */
-    protected $hydratedObject;
-
-    /**
-     * @var array
-     */
-    protected $hydrationData;
-
-    /**
-     * @param object $target
-     * @param object $hydratedObject
-     * @param array  $hydrationData
-     */
-    public function __construct($target, $hydratedObject, array $hydrationData)
-    {
-        $this->target         = $target;
-        $this->hydratedObject = $hydratedObject;
-        $this->hydrationData  = $hydrationData;
-    }
-
-    /**
-     * Retrieves the object that is being hydrated
-     *
-     * @return object
-     */
-    public function getHydratedObject()
-    {
-        return $this->hydratedObject;
-    }
-
-    /**
-     * @param object $hydratedObject
-     */
-    public function setHydratedObject($hydratedObject)
-    {
-        $this->hydratedObject = $hydratedObject;
-    }
-
-    /**
-     * Retrieves the data that is being used for hydration
-     *
-     * @return array
-     */
-    public function getHydrationData()
-    {
-        return $this->hydrationData;
-    }
-
-    /**
-     * @param array $hydrationData
-     */
-    public function setHydrationData(array $hydrationData)
-    {
-        $this->hydrationData = $hydrationData;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Aggregate/HydratorListener.php b/web/vendor/zendframework/zend-hydrator/src/Aggregate/HydratorListener.php
deleted file mode 100644
index c8260a43c..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Aggregate/HydratorListener.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Aggregate;
-
-use Zend\EventManager\AbstractListenerAggregate;
-use Zend\EventManager\EventManagerInterface;
-use Zend\Hydrator\HydratorInterface;
-
-/**
- * Aggregate listener wrapping around a hydrator.
- *
- * Listens to {@see HydrateEvent::EVENT_HYDRATE} and {@see ExtractEvent::EVENT_EXTRACT}
- */
-class HydratorListener extends AbstractListenerAggregate
-{
-    /**
-     * @var HydratorInterface
-     */
-    protected $hydrator;
-
-    /**
-     * @param HydratorInterface $hydrator
-     */
-    public function __construct(HydratorInterface $hydrator)
-    {
-        $this->hydrator = $hydrator;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function attach(EventManagerInterface $events, $priority = 1)
-    {
-        $this->listeners[] = $events->attach(HydrateEvent::EVENT_HYDRATE, [$this, 'onHydrate'], $priority);
-        $this->listeners[] = $events->attach(ExtractEvent::EVENT_EXTRACT, [$this, 'onExtract'], $priority);
-    }
-
-    /**
-     * Callback to be used when {@see HydrateEvent::EVENT_HYDRATE} is triggered
-     *
-     * @param HydrateEvent $event
-     * @return object
-     * @internal
-     */
-    public function onHydrate(HydrateEvent $event)
-    {
-        $object = $this->hydrator->hydrate($event->getHydrationData(), $event->getHydratedObject());
-        $event->setHydratedObject($object);
-        return $object;
-    }
-
-    /**
-     * Callback to be used when {@see ExtractEvent::EVENT_EXTRACT} is triggered
-     *
-     * @param ExtractEvent $event
-     * @return array
-     * @internal
-     */
-    public function onExtract(ExtractEvent $event)
-    {
-        $data = $this->hydrator->extract($event->getExtractionObject());
-        $event->mergeExtractedData($data);
-        return $data;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/ArraySerializable.php b/web/vendor/zendframework/zend-hydrator/src/ArraySerializable.php
deleted file mode 100644
index 24edee5c2..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/ArraySerializable.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-class ArraySerializable extends AbstractHydrator
-{
-    /**
-     * Extract values from the provided object
-     *
-     * Extracts values via the object's getArrayCopy() method.
-     *
-     * @param  object $object
-     * @return array
-     * @throws Exception\BadMethodCallException for an $object not implementing getArrayCopy()
-     */
-    public function extract($object)
-    {
-        if (! is_callable([$object, 'getArrayCopy'])) {
-            throw new Exception\BadMethodCallException(
-                sprintf('%s expects the provided object to implement getArrayCopy()', __METHOD__)
-            );
-        }
-
-        $data   = $object->getArrayCopy();
-        $filter = $this->getFilter();
-
-        foreach ($data as $name => $value) {
-            if (!$filter->filter($name)) {
-                unset($data[$name]);
-                continue;
-            }
-            $extractedName = $this->extractName($name, $object);
-            // replace the original key with extracted, if differ
-            if ($extractedName !== $name) {
-                unset($data[$name]);
-                $name = $extractedName;
-            }
-            $data[$name] = $this->extractValue($name, $value, $object);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Hydrate an object
-     *
-     * Hydrates an object by passing $data to either its exchangeArray() or
-     * populate() method.
-     *
-     * @param  array $data
-     * @param  object $object
-     * @return object
-     * @throws Exception\BadMethodCallException for an $object not implementing exchangeArray() or populate()
-     */
-    public function hydrate(array $data, $object)
-    {
-        $replacement = [];
-        foreach ($data as $key => $value) {
-            $name = $this->hydrateName($key, $data);
-            $replacement[$name] = $this->hydrateValue($name, $value, $data);
-        }
-
-        if (is_callable([$object, 'exchangeArray'])) {
-            $object->exchangeArray($replacement);
-        } elseif (is_callable([$object, 'populate'])) {
-            $object->populate($replacement);
-        } else {
-            throw new Exception\BadMethodCallException(
-                sprintf('%s expects the provided object to implement exchangeArray() or populate()', __METHOD__)
-            );
-        }
-        return $object;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/ClassMethods.php b/web/vendor/zendframework/zend-hydrator/src/ClassMethods.php
deleted file mode 100644
index 80cce8482..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/ClassMethods.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use Traversable;
-use Zend\Stdlib\ArrayUtils;
-
-class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
-{
-    /**
-     * Holds the names of the methods used for hydration, indexed by class::property name,
-     * false if the hydration method is not callable/usable for hydration purposes
-     *
-     * @var string[]|bool[]
-     */
-    private $hydrationMethodsCache = [];
-
-    /**
-     * A map of extraction methods to property name to be used during extraction, indexed
-     * by class name and method name
-     *
-     * @var string[][]
-     */
-    private $extractionMethodsCache = [];
-
-    /**
-     * Flag defining whether array keys are underscore-separated (true) or camel case (false)
-     *
-     * @var bool
-     */
-    protected $underscoreSeparatedKeys = true;
-
-    /**
-     * @var Filter\FilterInterface
-     */
-    private $callableMethodFilter;
-
-    /**
-     * Define if extract values will use camel case or name with underscore
-     * @param bool|array $underscoreSeparatedKeys
-     */
-    public function __construct($underscoreSeparatedKeys = true)
-    {
-        parent::__construct();
-        $this->setUnderscoreSeparatedKeys($underscoreSeparatedKeys);
-
-        $this->callableMethodFilter = new Filter\OptionalParametersFilter();
-
-        $this->filterComposite->addFilter('is', new Filter\IsFilter());
-        $this->filterComposite->addFilter('has', new Filter\HasFilter());
-        $this->filterComposite->addFilter('get', new Filter\GetFilter());
-        $this->filterComposite->addFilter(
-            'parameter',
-            new Filter\OptionalParametersFilter(),
-            Filter\FilterComposite::CONDITION_AND
-        );
-    }
-
-    /**
-     * @param  array|Traversable                 $options
-     * @return ClassMethods
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setOptions($options)
-    {
-        if ($options instanceof Traversable) {
-            $options = ArrayUtils::iteratorToArray($options);
-        } elseif (!is_array($options)) {
-            throw new Exception\InvalidArgumentException(
-                'The options parameter must be an array or a Traversable'
-            );
-        }
-        if (isset($options['underscoreSeparatedKeys'])) {
-            $this->setUnderscoreSeparatedKeys($options['underscoreSeparatedKeys']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param  bool      $underscoreSeparatedKeys
-     * @return ClassMethods
-     */
-    public function setUnderscoreSeparatedKeys($underscoreSeparatedKeys)
-    {
-        $this->underscoreSeparatedKeys = (bool) $underscoreSeparatedKeys;
-
-        if ($this->underscoreSeparatedKeys) {
-            $this->setNamingStrategy(new NamingStrategy\UnderscoreNamingStrategy);
-        } elseif ($this->getNamingStrategy() instanceof NamingStrategy\UnderscoreNamingStrategy) {
-            $this->removeNamingStrategy();
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getUnderscoreSeparatedKeys()
-    {
-        return $this->underscoreSeparatedKeys;
-    }
-
-    /**
-     * Extract values from an object with class methods
-     *
-     * Extracts the getter/setter of the given $object.
-     *
-     * @param  object                           $object
-     * @return array
-     * @throws Exception\BadMethodCallException for a non-object $object
-     */
-    public function extract($object)
-    {
-        if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(sprintf(
-                '%s expects the provided $object to be a PHP object)',
-                __METHOD__
-            ));
-        }
-
-        $objectClass = get_class($object);
-
-        // reset the hydrator's hydrator's cache for this object, as the filter may be per-instance
-        if ($object instanceof Filter\FilterProviderInterface) {
-            $this->extractionMethodsCache[$objectClass] = null;
-        }
-
-        // pass 1 - finding out which properties can be extracted, with which methods (populate hydration cache)
-        if (! isset($this->extractionMethodsCache[$objectClass])) {
-            $this->extractionMethodsCache[$objectClass] = [];
-            $filter                                     = $this->filterComposite;
-            $methods                                    = get_class_methods($object);
-
-            if ($object instanceof Filter\FilterProviderInterface) {
-                $filter = new Filter\FilterComposite(
-                    [$object->getFilter()],
-                    [new Filter\MethodMatchFilter('getFilter')]
-                );
-            }
-
-            foreach ($methods as $method) {
-                $methodFqn = $objectClass . '::' . $method;
-
-                if (! ($filter->filter($methodFqn) && $this->callableMethodFilter->filter($methodFqn))) {
-                    continue;
-                }
-
-                $attribute = $method;
-
-                if (strpos($method, 'get') === 0) {
-                    $attribute = substr($method, 3);
-                    if (!property_exists($object, $attribute)) {
-                        $attribute = lcfirst($attribute);
-                    }
-                }
-
-                $this->extractionMethodsCache[$objectClass][$method] = $attribute;
-            }
-        }
-
-        $values = [];
-
-        // pass 2 - actually extract data
-        foreach ($this->extractionMethodsCache[$objectClass] as $methodName => $attributeName) {
-            $realAttributeName          = $this->extractName($attributeName, $object);
-            $values[$realAttributeName] = $this->extractValue($realAttributeName, $object->$methodName(), $object);
-        }
-
-        return $values;
-    }
-
-    /**
-     * Hydrate an object by populating getter/setter methods
-     *
-     * Hydrates an object by getter/setter methods of the object.
-     *
-     * @param  array                            $data
-     * @param  object                           $object
-     * @return object
-     * @throws Exception\BadMethodCallException for a non-object $object
-     */
-    public function hydrate(array $data, $object)
-    {
-        if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(sprintf(
-                '%s expects the provided $object to be a PHP object)',
-                __METHOD__
-            ));
-        }
-
-        $objectClass = get_class($object);
-
-        foreach ($data as $property => $value) {
-            $propertyFqn = $objectClass . '::$' . $property;
-
-            if (! isset($this->hydrationMethodsCache[$propertyFqn])) {
-                $setterName = 'set' . ucfirst($this->hydrateName($property, $data));
-
-                $this->hydrationMethodsCache[$propertyFqn] = is_callable([$object, $setterName])
-                    ? $setterName
-                    : false;
-            }
-
-            if ($this->hydrationMethodsCache[$propertyFqn]) {
-                $object->{$this->hydrationMethodsCache[$propertyFqn]}($this->hydrateValue($property, $value, $data));
-            }
-        }
-
-        return $object;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function addFilter($name, $filter, $condition = Filter\FilterComposite::CONDITION_OR)
-    {
-        $this->resetCaches();
-
-        return parent::addFilter($name, $filter, $condition);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function removeFilter($name)
-    {
-        $this->resetCaches();
-
-        return parent::removeFilter($name);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setNamingStrategy(NamingStrategy\NamingStrategyInterface $strategy)
-    {
-        $this->resetCaches();
-
-        return parent::setNamingStrategy($strategy);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function removeNamingStrategy()
-    {
-        $this->resetCaches();
-
-        return parent::removeNamingStrategy();
-    }
-
-    /**
-     * Reset all local hydration/extraction caches
-     */
-    private function resetCaches()
-    {
-        $this->hydrationMethodsCache = $this->extractionMethodsCache = [];
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/DelegatingHydrator.php b/web/vendor/zendframework/zend-hydrator/src/DelegatingHydrator.php
deleted file mode 100644
index a6f3f9472..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/DelegatingHydrator.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use Zend\ServiceManager\ServiceLocatorInterface;
-
-class DelegatingHydrator implements HydratorInterface
-{
-    /**
-     * @var ServiceLocatorInterface
-     */
-    protected $hydrators;
-
-    /**
-     * Constructor
-     *
-     * @param ServiceLocatorInterface $hydrators
-     */
-    public function __construct(ServiceLocatorInterface $hydrators)
-    {
-        $this->hydrators = $hydrators;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hydrate(array $data, $object)
-    {
-        return $this->getHydrator($object)->hydrate($data, $object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function extract($object)
-    {
-        return $this->getHydrator($object)->extract($object);
-    }
-
-    /**
-     * Gets hydrator of an object
-     *
-     * @param  object $object
-     * @return HydratorInterface
-     */
-    protected function getHydrator($object)
-    {
-        return $this->hydrators->get(get_class($object));
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/DelegatingHydratorFactory.php b/web/vendor/zendframework/zend-hydrator/src/DelegatingHydratorFactory.php
deleted file mode 100644
index 89f284179..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/DelegatingHydratorFactory.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-
-class DelegatingHydratorFactory implements FactoryInterface
-{
-    /**
-     * Creates DelegatingHydrator
-     *
-     * @param  ServiceLocatorInterface $serviceLocator
-     * @return DelegatingHydrator
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        // Assume that this factory is registered with the HydratorManager,
-        // and just pass it directly on.
-        return new DelegatingHydrator($serviceLocator);
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Exception/BadMethodCallException.php b/web/vendor/zendframework/zend-hydrator/src/Exception/BadMethodCallException.php
deleted file mode 100644
index a8503e2ad..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Bad method call exception
- */
-class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Exception/ExceptionInterface.php b/web/vendor/zendframework/zend-hydrator/src/Exception/ExceptionInterface.php
deleted file mode 100644
index 888c6a09a..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Exception marker interface
- */
-interface ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Exception/ExtensionNotLoadedException.php b/web/vendor/zendframework/zend-hydrator/src/Exception/ExtensionNotLoadedException.php
deleted file mode 100644
index ff5fd8e70..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Exception/ExtensionNotLoadedException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Extension not loaded exception
- */
-class ExtensionNotLoadedException extends RuntimeException
-{
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Exception/InvalidArgumentException.php b/web/vendor/zendframework/zend-hydrator/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index 56c2d146e..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Invalid Argument Exception
- */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Exception/InvalidCallbackException.php b/web/vendor/zendframework/zend-hydrator/src/Exception/InvalidCallbackException.php
deleted file mode 100644
index 263e9fb0d..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Exception/InvalidCallbackException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Invalid callback exception
- */
-class InvalidCallbackException extends DomainException implements ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Exception/LogicException.php b/web/vendor/zendframework/zend-hydrator/src/Exception/LogicException.php
deleted file mode 100644
index 89ff89cb8..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Exception/LogicException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Logic exception
- */
-class LogicException extends \LogicException implements ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Exception/RuntimeException.php b/web/vendor/zendframework/zend-hydrator/src/Exception/RuntimeException.php
deleted file mode 100644
index 766ece265..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Exception/RuntimeException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Runtime exception
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/ExtractionInterface.php b/web/vendor/zendframework/zend-hydrator/src/ExtractionInterface.php
deleted file mode 100644
index 6b3c07f34..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/ExtractionInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface ExtractionInterface
-{
-    /**
-     * Extract values from an object
-     *
-     * @param  object $object
-     * @return array
-     */
-    public function extract($object);
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Filter/FilterComposite.php b/web/vendor/zendframework/zend-hydrator/src/Filter/FilterComposite.php
deleted file mode 100644
index 67907139e..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Filter/FilterComposite.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-use ArrayObject;
-use Zend\Hydrator\Exception\InvalidArgumentException;
-
-class FilterComposite implements FilterInterface
-{
-    /**
-     * @var ArrayObject
-     */
-    protected $orFilter;
-
-    /**
-     * @var ArrayObject
-     */
-    protected $andFilter;
-
-    /**
-     * Constant to add with "or" conditition
-     */
-    const CONDITION_OR = 1;
-
-    /**
-     * Constant to add with "and" conditition
-     */
-    const CONDITION_AND = 2;
-
-    /**
-     * Define default Filter
-     *
-     * @param  array $orFilter
-     * @param  array $andFilter
-     * @throws InvalidArgumentException
-     */
-    public function __construct($orFilter = [], $andFilter = [])
-    {
-        array_walk(
-            $orFilter,
-            function ($value, $key) {
-                if (!is_callable($value) && !$value instanceof FilterInterface) {
-                    throw new InvalidArgumentException(
-                        'The value of ' . $key . ' should be either a callable or ' .
-                        'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
-                    );
-                }
-            }
-        );
-
-        array_walk(
-            $andFilter,
-            function ($value, $key) {
-                if (!is_callable($value) && !$value instanceof FilterInterface) {
-                    throw new InvalidArgumentException(
-                        'The value of ' . $key . '  should be either a callable or ' .
-                        'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
-                    );
-                }
-            }
-        );
-
-        $this->orFilter = new ArrayObject($orFilter);
-        $this->andFilter = new ArrayObject($andFilter);
-    }
-
-    /**
-     * Add a filter to the composite. Has to be indexed with $name in
-     * order to identify a specific filter.
-     *
-     * This example will exclude all methods from the hydration, that starts with 'getService'
-     * <code>
-     * $composite->addFilter('exclude',
-     *     function ($method) {
-     *         if (preg_match('/^getService/', $method) {
-     *             return false;
-     *         }
-     *         return true;
-     *     }, FilterComposite::CONDITION_AND
-     * );
-     * </code>
-     *
-     * @param  string                   $name
-     * @param  callable|FilterInterface $filter
-     * @param  int                      $condition Can be either
-     *     FilterComposite::CONDITION_OR or FilterComposite::CONDITION_AND
-     * @throws InvalidArgumentException
-     * @return FilterComposite
-     */
-    public function addFilter($name, $filter, $condition = self::CONDITION_OR)
-    {
-        if (!is_callable($filter) && !($filter instanceof FilterInterface)) {
-            throw new InvalidArgumentException(
-                'The value of ' . $name . ' should be either a callable or ' .
-                'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
-            );
-        }
-
-        if ($condition === self::CONDITION_OR) {
-            $this->orFilter[$name] = $filter;
-        } elseif ($condition === self::CONDITION_AND) {
-            $this->andFilter[$name] = $filter;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Remove a filter from the composition
-     *
-     * @param $name string Identifier for the filter
-     * @return FilterComposite
-     */
-    public function removeFilter($name)
-    {
-        if (isset($this->orFilter[$name])) {
-            unset($this->orFilter[$name]);
-        }
-
-        if (isset($this->andFilter[$name])) {
-            unset($this->andFilter[$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Check if $name has a filter registered
-     *
-     * @param $name string Identifier for the filter
-     * @return bool
-     */
-    public function hasFilter($name)
-    {
-        return isset($this->orFilter[$name]) || isset($this->andFilter[$name]);
-    }
-
-    /**
-     * Filter the composite based on the AND and OR condition
-     * Will return true if one from the "or conditions" and all from
-     * the "and condition" returns true. Otherwise false
-     *
-     * @param $property string Parameter will be e.g. Parent\Namespace\Class::method
-     * @return bool
-     */
-    public function filter($property)
-    {
-        $andCount = count($this->andFilter);
-        $orCount = count($this->orFilter);
-        // return true if no filters are registered
-        if ($orCount === 0 && $andCount === 0) {
-            return true;
-        } elseif ($orCount === 0 && $andCount !== 0) {
-            $returnValue = true;
-        } else {
-            $returnValue = false;
-        }
-
-        // Check if 1 from the or filters return true
-        foreach ($this->orFilter as $filter) {
-            if (is_callable($filter)) {
-                if ($filter($property) === true) {
-                    $returnValue = true;
-                    break;
-                }
-                continue;
-            } else {
-                if ($filter->filter($property) === true) {
-                    $returnValue = true;
-                    break;
-                }
-            }
-        }
-
-        // Check if all of the and condition return true
-        foreach ($this->andFilter as $filter) {
-            if (is_callable($filter)) {
-                if ($filter($property) === false) {
-                    return false;
-                }
-                continue;
-            } else {
-                if ($filter->filter($property) === false) {
-                    return false;
-                }
-            }
-        }
-
-        return $returnValue;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Filter/FilterInterface.php b/web/vendor/zendframework/zend-hydrator/src/Filter/FilterInterface.php
deleted file mode 100644
index fb49918f2..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Filter/FilterInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-interface FilterInterface
-{
-    /**
-     * Should return true, if the given filter
-     * does not match
-     *
-     * @param string $property The name of the property
-     * @return bool
-     */
-    public function filter($property);
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Filter/FilterProviderInterface.php b/web/vendor/zendframework/zend-hydrator/src/Filter/FilterProviderInterface.php
deleted file mode 100644
index 2826c338b..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Filter/FilterProviderInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-interface FilterProviderInterface
-{
-    /**
-     * Provides a filter for hydration
-     *
-     * @return FilterInterface
-     */
-    public function getFilter();
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Filter/GetFilter.php b/web/vendor/zendframework/zend-hydrator/src/Filter/GetFilter.php
deleted file mode 100644
index 220a1b5d4..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Filter/GetFilter.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-class GetFilter implements FilterInterface
-{
-    public function filter($property)
-    {
-        $pos = strpos($property, '::');
-        if ($pos !== false) {
-            $pos += 2;
-        } else {
-            $pos = 0;
-        }
-
-        if (substr($property, $pos, 3) === 'get') {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Filter/HasFilter.php b/web/vendor/zendframework/zend-hydrator/src/Filter/HasFilter.php
deleted file mode 100644
index d1ba4f920..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Filter/HasFilter.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-class HasFilter implements FilterInterface
-{
-    public function filter($property)
-    {
-        $pos = strpos($property, '::');
-        if ($pos !== false) {
-            $pos += 2;
-        } else {
-            $pos = 0;
-        }
-
-        if (substr($property, $pos, 3) === 'has') {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Filter/IsFilter.php b/web/vendor/zendframework/zend-hydrator/src/Filter/IsFilter.php
deleted file mode 100644
index b74fcd73a..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Filter/IsFilter.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-class IsFilter implements FilterInterface
-{
-    public function filter($property)
-    {
-        $pos = strpos($property, '::');
-        if ($pos !== false) {
-            $pos += 2;
-        } else {
-            $pos = 0;
-        }
-
-        if (substr($property, $pos, 2) === 'is') {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Filter/MethodMatchFilter.php b/web/vendor/zendframework/zend-hydrator/src/Filter/MethodMatchFilter.php
deleted file mode 100644
index 865b57894..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Filter/MethodMatchFilter.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-class MethodMatchFilter implements FilterInterface
-{
-    /**
-     * The method to exclude
-     * @var string
-     */
-    protected $method = null;
-
-    /**
-     * Either an exclude or an include
-     * @var bool
-     */
-    protected $exclude = null;
-
-    /**
-     * @param string $method The method to exclude or include
-     * @param bool $exclude If the method should be excluded
-     */
-    public function __construct($method, $exclude = true)
-    {
-        $this->method = $method;
-        $this->exclude = $exclude;
-    }
-
-    public function filter($property)
-    {
-        $pos = strpos($property, '::');
-        if ($pos !== false) {
-            $pos += 2;
-        } else {
-            $pos = 0;
-        }
-        if (substr($property, $pos) === $this->method) {
-            return !$this->exclude;
-        }
-        return $this->exclude;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Filter/NumberOfParameterFilter.php b/web/vendor/zendframework/zend-hydrator/src/Filter/NumberOfParameterFilter.php
deleted file mode 100644
index abd8ee67c..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Filter/NumberOfParameterFilter.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-use ReflectionException;
-use ReflectionMethod;
-use Zend\Hydrator\Exception\InvalidArgumentException;
-
-class NumberOfParameterFilter implements FilterInterface
-{
-    /**
-     * The number of parameters beeing accepted
-     * @var int
-     */
-    protected $numberOfParameters = null;
-
-    /**
-     * @param int $numberOfParameters Number of accepted parameters
-     */
-    public function __construct($numberOfParameters = 0)
-    {
-        $this->numberOfParameters = (int) $numberOfParameters;
-    }
-
-    /**
-     * @param string $property the name of the property
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function filter($property)
-    {
-        try {
-            $reflectionMethod = new ReflectionMethod($property);
-        } catch (ReflectionException $exception) {
-            throw new InvalidArgumentException(
-                "Method $property doesn't exist"
-            );
-        }
-
-        return $reflectionMethod->getNumberOfParameters() === $this->numberOfParameters;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Filter/OptionalParametersFilter.php b/web/vendor/zendframework/zend-hydrator/src/Filter/OptionalParametersFilter.php
deleted file mode 100644
index 25775d7e5..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Filter/OptionalParametersFilter.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-use ReflectionException;
-use ReflectionMethod;
-use ReflectionParameter;
-use Zend\Hydrator\Exception\InvalidArgumentException;
-
-/**
- * Filter that includes methods which have no parameters or only optional parameters
- */
-class OptionalParametersFilter implements FilterInterface
-{
-    /**
-     * Map of methods already analyzed
-     * by {@see OptionalParametersFilter::filter()},
-     * cached for performance reasons
-     *
-     * @var bool[]
-     */
-    protected static $propertiesCache = [];
-
-    /**
-     * {@inheritDoc}
-     */
-    public function filter($property)
-    {
-        if (isset(static::$propertiesCache[$property])) {
-            return static::$propertiesCache[$property];
-        }
-
-        try {
-            $reflectionMethod = new ReflectionMethod($property);
-        } catch (ReflectionException $exception) {
-            throw new InvalidArgumentException(sprintf('Method %s doesn\'t exist', $property));
-        }
-
-        $mandatoryParameters = array_filter(
-            $reflectionMethod->getParameters(),
-            function (ReflectionParameter $parameter) {
-                return ! $parameter->isOptional();
-            }
-        );
-
-        return static::$propertiesCache[$property] = empty($mandatoryParameters);
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/FilterEnabledInterface.php b/web/vendor/zendframework/zend-hydrator/src/FilterEnabledInterface.php
deleted file mode 100644
index f95f8b4b9..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/FilterEnabledInterface.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface FilterEnabledInterface extends Filter\FilterProviderInterface
-{
-    /**
-     * Add a new filter to take care of what needs to be hydrated.
-     * To exclude e.g. the method getServiceLocator:
-     *
-     * <code>
-     * $composite->addFilter(
-     *     "servicelocator",
-     *     function ($property) {
-     *         list($class, $method) = explode('::', $property);
-     *         if ($method === 'getServiceLocator') {
-     *             return false;
-     *         }
-     *         return true;
-     *     },
-     *     FilterComposite::CONDITION_AND
-     * );
-     * </code>
-     *
-     * @param string $name Index in the composite
-     * @param callable|Filter\FilterInterface $filter
-     * @param int $condition
-     * @return Filter\FilterComposite
-     */
-    public function addFilter($name, $filter, $condition = Filter\FilterComposite::CONDITION_OR);
-
-    /**
-     * Check whether a specific filter exists at key $name or not
-     *
-     * @param string $name Index in the composite
-     * @return bool
-     */
-    public function hasFilter($name);
-
-    /**
-     * Remove a filter from the composition.
-     * To not extract "has" methods, you simply need to unregister it
-     *
-     * <code>
-     * $filterComposite->removeFilter('has');
-     * </code>
-     *
-     * @param $name
-     * @return Filter\FilterComposite
-     */
-    public function removeFilter($name);
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/HydrationInterface.php b/web/vendor/zendframework/zend-hydrator/src/HydrationInterface.php
deleted file mode 100644
index ca2898348..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/HydrationInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface HydrationInterface
-{
-    /**
-     * Hydrate $object with the provided $data.
-     *
-     * @param  array $data
-     * @param  object $object
-     * @return object
-     */
-    public function hydrate(array $data, $object);
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/HydratorAwareInterface.php b/web/vendor/zendframework/zend-hydrator/src/HydratorAwareInterface.php
deleted file mode 100644
index 8c89bc6d9..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/HydratorAwareInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface HydratorAwareInterface
-{
-    /**
-     * Set hydrator
-     *
-     * @param  HydratorInterface $hydrator
-     * @return HydratorAwareInterface
-     */
-    public function setHydrator(HydratorInterface $hydrator);
-
-    /**
-     * Retrieve hydrator
-     *
-     * @return HydratorInterface
-     */
-    public function getHydrator();
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/HydratorAwareTrait.php b/web/vendor/zendframework/zend-hydrator/src/HydratorAwareTrait.php
deleted file mode 100644
index 76c1989c9..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/HydratorAwareTrait.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-trait HydratorAwareTrait
-{
-    /**
-     * Hydrator instance
-     *
-     * @var HydratorInterface
-     * @access protected
-     */
-    protected $hydrator = null;
-
-    /**
-     * Set hydrator
-     *
-     * @param  HydratorInterface $hydrator
-     * @return self
-     * @access public
-     */
-    public function setHydrator(HydratorInterface $hydrator)
-    {
-        $this->hydrator = $hydrator;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve hydrator
-     *
-     * @param void
-     * @return null|HydratorInterface
-     * @access public
-     */
-    public function getHydrator()
-    {
-        return $this->hydrator;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/HydratorInterface.php b/web/vendor/zendframework/zend-hydrator/src/HydratorInterface.php
deleted file mode 100644
index a48effa8c..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/HydratorInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface HydratorInterface extends HydrationInterface, ExtractionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/HydratorOptionsInterface.php b/web/vendor/zendframework/zend-hydrator/src/HydratorOptionsInterface.php
deleted file mode 100644
index 20efbbfae..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/HydratorOptionsInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use Traversable;
-
-interface HydratorOptionsInterface
-{
-    /**
-     * @param  array|Traversable $options
-     * @return self
-     */
-    public function setOptions($options);
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/HydratorPluginManager.php b/web/vendor/zendframework/zend-hydrator/src/HydratorPluginManager.php
deleted file mode 100644
index de13dd18b..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/HydratorPluginManager.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use Zend\ServiceManager\AbstractPluginManager;
-
-/**
- * Plugin manager implementation for hydrators.
- *
- * Enforces that adapters retrieved are instances of HydratorInterface
- */
-class HydratorPluginManager extends AbstractPluginManager
-{
-    /**
-     * Whether or not to share by default
-     *
-     * @var bool
-     */
-    protected $shareByDefault = false;
-
-    /**
-     * Default aliases
-     *
-     * @var array
-     */
-    protected $aliases = [
-        'delegatinghydrator' => 'Zend\Hydrator\DelegatingHydrator',
-    ];
-
-    /**
-     * Default set of adapters
-     *
-     * @var array
-     */
-    protected $invokableClasses = [
-        'arrayserializable' => 'Zend\Hydrator\ArraySerializable',
-        'classmethods'      => 'Zend\Hydrator\ClassMethods',
-        'objectproperty'    => 'Zend\Hydrator\ObjectProperty',
-        'reflection'        => 'Zend\Hydrator\Reflection'
-    ];
-
-    /**
-     * Default factory-based adapters
-     *
-     * @var array
-     */
-    protected $factories = [
-        'Zend\Hydrator\DelegatingHydrator' => 'Zend\Hydrator\DelegatingHydratorFactory',
-    ];
-
-    /**
-     * {@inheritDoc}
-     */
-    public function validatePlugin($plugin)
-    {
-        if ($plugin instanceof HydratorInterface) {
-            // we're okay
-            return;
-        }
-
-        throw new Exception\RuntimeException(sprintf(
-            'Plugin of type %s is invalid; must implement Zend\Hydrator\HydratorInterface',
-            (is_object($plugin) ? get_class($plugin) : gettype($plugin))
-        ));
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Iterator/HydratingArrayIterator.php b/web/vendor/zendframework/zend-hydrator/src/Iterator/HydratingArrayIterator.php
deleted file mode 100644
index 8e14f035f..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Iterator/HydratingArrayIterator.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Iterator;
-
-use ArrayIterator;
-use Zend\Hydrator\HydratorInterface;
-
-class HydratingArrayIterator extends HydratingIteratorIterator
-{
-    /**
-     * @var HydratorInterface
-     */
-    protected $hydrator;
-
-    /**
-     * @var object
-     */
-    protected $prototype;
-
-    /**
-     * @param HydratorInterface $hydrator
-     * @param array $data
-     * @param string|object $prototype Object, or class name to use for prototype.
-     */
-    public function __construct(HydratorInterface $hydrator, array $data, $prototype)
-    {
-        parent::__construct($hydrator, new ArrayIterator($data), $prototype);
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorInterface.php b/web/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorInterface.php
deleted file mode 100644
index ec31040a3..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Iterator;
-
-use Iterator;
-use Zend\Hydrator\HydratorInterface;
-
-interface HydratingIteratorInterface extends Iterator
-{
-    /**
-     * This sets the prototype to hydrate.
-     *
-     * This prototype can be the name of the class or the object itself;
-     * iteration will clone the object.
-     *
-     * @param string|object $prototype
-     */
-    public function setPrototype($prototype);
-
-    /**
-     * Sets the hydrator to use during iteration.
-     *
-     * @param HydratorInterface $hydrator
-     */
-    public function setHydrator(HydratorInterface $hydrator);
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorIterator.php b/web/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorIterator.php
deleted file mode 100644
index 53e09f0bc..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorIterator.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Iterator;
-
-use Iterator;
-use IteratorIterator;
-use Zend\Hydrator\Exception\InvalidArgumentException;
-use Zend\Hydrator\HydratorInterface;
-
-class HydratingIteratorIterator extends IteratorIterator implements HydratingIteratorInterface
-{
-    /**
-     * @var HydratorInterface
-     */
-    protected $hydrator;
-
-    /**
-     * @var object
-     */
-    protected $prototype;
-
-    /**
-     * @param HydratorInterface $hydrator
-     * @param Iterator $data
-     * @param string|object $prototype Object or class name to use for prototype.
-     */
-    public function __construct(HydratorInterface $hydrator, Iterator $data, $prototype)
-    {
-        $this->setHydrator($hydrator);
-        $this->setPrototype($prototype);
-        parent::__construct($data);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function setPrototype($prototype)
-    {
-        if (is_object($prototype)) {
-            $this->prototype = $prototype;
-            return;
-        }
-
-        if (!class_exists($prototype)) {
-            throw new InvalidArgumentException(
-                sprintf('Method %s was passed an invalid class name: %s', __METHOD__, $prototype)
-            );
-        }
-
-        $this->prototype = new $prototype;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function setHydrator(HydratorInterface $hydrator)
-    {
-        $this->hydrator = $hydrator;
-    }
-
-    /**
-     * @return object Returns hydrated clone of $prototype
-     */
-    public function current()
-    {
-        $currentValue = parent::current();
-        $object       = clone $this->prototype;
-        $this->hydrator->hydrate($currentValue, $object);
-        return $object;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/ArrayMapNamingStrategy.php b/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/ArrayMapNamingStrategy.php
deleted file mode 100644
index c6333e2dc..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/ArrayMapNamingStrategy.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-class ArrayMapNamingStrategy implements NamingStrategyInterface
-{
-    /**
-     * @var string[]
-     */
-    private $extractionMap = [];
-
-    /**
-     * @var string[]
-     */
-    private $hydrationMap = [];
-
-    /**
-     * Constructor
-     *
-     * @param array $extractionMap A map of string keys and values for symmetric translation of hydrated
-     *                             and extracted field names
-     */
-    public function __construct(array $extractionMap)
-    {
-        $this->extractionMap = $extractionMap;
-        $this->hydrationMap  = array_flip($extractionMap);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hydrate($name)
-    {
-        return isset($this->hydrationMap[$name]) ? $this->hydrationMap[$name] : $name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function extract($name)
-    {
-        return isset($this->extractionMap[$name]) ? $this->extractionMap[$name] : $name;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/CompositeNamingStrategy.php b/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/CompositeNamingStrategy.php
deleted file mode 100644
index c2bae8c29..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/CompositeNamingStrategy.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-class CompositeNamingStrategy implements NamingStrategyInterface
-{
-    /**
-     * @var array
-     */
-    private $namingStrategies = [];
-
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $defaultNamingStrategy;
-
-    /**
-     * @param NamingStrategyInterface[]    $strategies            indexed by the name they translate
-     * @param NamingStrategyInterface|null $defaultNamingStrategy
-     */
-    public function __construct(array $strategies, NamingStrategyInterface $defaultNamingStrategy = null)
-    {
-        $this->namingStrategies = array_map(
-            function (NamingStrategyInterface $strategy) {
-                // this callback is here only to ensure type-safety
-                return $strategy;
-            },
-            $strategies
-        );
-
-        $this->defaultNamingStrategy = $defaultNamingStrategy ?: new IdentityNamingStrategy();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function extract($name)
-    {
-        $strategy = isset($this->namingStrategies[$name])
-            ? $this->namingStrategies[$name]
-            : $this->defaultNamingStrategy;
-
-        return $strategy->extract($name);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hydrate($name)
-    {
-        $strategy = isset($this->namingStrategies[$name])
-            ? $this->namingStrategies[$name]
-            : $this->defaultNamingStrategy;
-
-        return $strategy->hydrate($name);
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/IdentityNamingStrategy.php b/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/IdentityNamingStrategy.php
deleted file mode 100644
index 59e3feda5..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/IdentityNamingStrategy.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-class IdentityNamingStrategy implements NamingStrategyInterface
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function hydrate($name)
-    {
-        return $name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function extract($name)
-    {
-        return $name;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/MapNamingStrategy.php b/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/MapNamingStrategy.php
deleted file mode 100644
index 7846bcedb..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/MapNamingStrategy.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\Exception\InvalidArgumentException;
-
-class MapNamingStrategy implements NamingStrategyInterface
-{
-    /**
-     * Map for hydrate name conversion.
-     *
-     * @var array
-     */
-    protected $mapping = [];
-
-    /**
-     * Reversed map for extract name conversion.
-     *
-     * @var array
-     */
-    protected $reverse = [];
-
-    /**
-     * Initialize.
-     *
-     * @param array $mapping Map for name conversion on hydration
-     * @param array $reverse Reverse map for name conversion on extraction
-     */
-    public function __construct(array $mapping, array $reverse = null)
-    {
-        $this->mapping = $mapping;
-        $this->reverse = $reverse ?: $this->flipMapping($mapping);
-    }
-
-    /**
-     * Safelly flip mapping array.
-     *
-     * @param  array                    $array Array to flip
-     * @return array                    Flipped array
-     * @throws InvalidArgumentException
-     */
-    protected function flipMapping(array $array)
-    {
-        array_walk($array, function ($value) {
-            if (!is_string($value) && !is_int($value)) {
-                throw new InvalidArgumentException('Mapping array can\'t be flipped because of invalid value');
-            }
-        });
-
-        return array_flip($array);
-    }
-
-    /**
-     * Converts the given name so that it can be extracted by the hydrator.
-     *
-     * @param  string $name The original name
-     * @return mixed  The hydrated name
-     */
-    public function hydrate($name)
-    {
-        if (array_key_exists($name, $this->mapping)) {
-            return $this->mapping[$name];
-        }
-
-        return $name;
-    }
-
-    /**
-     * Converts the given name so that it can be hydrated by the hydrator.
-     *
-     * @param  string $name The original name
-     * @return mixed  The extracted name
-     */
-    public function extract($name)
-    {
-        if (array_key_exists($name, $this->reverse)) {
-            return $this->reverse[$name];
-        }
-
-        return $name;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/NamingStrategyInterface.php b/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/NamingStrategyInterface.php
deleted file mode 100644
index cb7ca94ef..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/NamingStrategyInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-/**
- * Allow property extraction / hydration for hydrator
- */
-interface NamingStrategyInterface
-{
-    /**
-     * Converts the given name so that it can be extracted by the hydrator.
-     *
-     * @param string $name   The original name
-     * @param object $object (optional) The original object for context.
-     * @return mixed         The hydrated name
-     */
-    public function hydrate($name);
-
-    /**
-     * Converts the given name so that it can be hydrated by the hydrator.
-     *
-     * @param string $name The original name
-     * @param array  $data (optional) The original data for context.
-     * @return mixed The extracted name
-     */
-    public function extract($name);
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/UnderscoreNamingStrategy.php b/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/UnderscoreNamingStrategy.php
deleted file mode 100644
index 7fdfa5318..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/NamingStrategy/UnderscoreNamingStrategy.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-use Zend\Filter\FilterChain;
-
-class UnderscoreNamingStrategy implements NamingStrategyInterface
-{
-    /**
-     * @var FilterChain|null
-     */
-    protected static $camelCaseToUnderscoreFilter;
-
-    /**
-     * @var FilterChain|null
-     */
-    protected static $underscoreToStudlyCaseFilter;
-
-    /**
-     * Remove underscores and capitalize letters
-     *
-     * @param  string $name
-     * @return string
-     */
-    public function hydrate($name)
-    {
-        return $this->getUnderscoreToStudlyCaseFilter()->filter($name);
-    }
-
-    /**
-     * Remove capitalized letters and prepend underscores.
-     *
-     * @param  string $name
-     * @return string
-     */
-    public function extract($name)
-    {
-        return $this->getCamelCaseToUnderscoreFilter()->filter($name);
-    }
-
-    /**
-     * @return FilterChain
-     */
-    protected function getUnderscoreToStudlyCaseFilter()
-    {
-        if (static::$underscoreToStudlyCaseFilter instanceof FilterChain) {
-            return static::$underscoreToStudlyCaseFilter;
-        }
-
-        $filter = new FilterChain();
-
-        $filter->attachByName('WordUnderscoreToStudlyCase');
-
-        return static::$underscoreToStudlyCaseFilter = $filter;
-    }
-
-    /**
-     * @return FilterChain
-     */
-    protected function getCamelCaseToUnderscoreFilter()
-    {
-        if (static::$camelCaseToUnderscoreFilter instanceof FilterChain) {
-            return static::$camelCaseToUnderscoreFilter;
-        }
-
-        $filter = new FilterChain();
-
-        $filter->attachByName('WordCamelCaseToUnderscore');
-        $filter->attachByName('StringToLower');
-
-        return static::$camelCaseToUnderscoreFilter = $filter;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/NamingStrategyEnabledInterface.php b/web/vendor/zendframework/zend-hydrator/src/NamingStrategyEnabledInterface.php
deleted file mode 100644
index c01a5272f..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/NamingStrategyEnabledInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface NamingStrategyEnabledInterface
-{
-    /**
-     * Adds the given naming strategy
-     *
-     * @param NamingStrategy\NamingStrategyInterface $strategy The naming to register.
-     * @return self
-     */
-    public function setNamingStrategy(NamingStrategy\NamingStrategyInterface $strategy);
-
-    /**
-     * Gets the naming strategy.
-     *
-     * @return NamingStrategy\NamingStrategyInterface
-     */
-    public function getNamingStrategy();
-
-    /**
-     * Checks if a naming strategy exists.
-     *
-     * @return bool
-     */
-    public function hasNamingStrategy();
-
-    /**
-     * Removes the naming with the given name.
-     *
-     * @return self
-     */
-    public function removeNamingStrategy();
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/ObjectProperty.php b/web/vendor/zendframework/zend-hydrator/src/ObjectProperty.php
deleted file mode 100644
index db68fb287..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/ObjectProperty.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use ReflectionClass;
-use ReflectionProperty;
-
-class ObjectProperty extends AbstractHydrator
-{
-    /**
-     * @var array[] indexed by class name and then property name
-     */
-    private static $skippedPropertiesCache = [];
-
-    /**
-     * {@inheritDoc}
-     *
-     * Extracts the accessible non-static properties of the given $object.
-     *
-     * @throws Exception\BadMethodCallException for a non-object $object
-     */
-    public function extract($object)
-    {
-        if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(
-                sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
-            );
-        }
-
-        $data   = get_object_vars($object);
-        $filter = $this->getFilter();
-
-        foreach ($data as $name => $value) {
-            // Filter keys, removing any we don't want
-            if (! $filter->filter($name)) {
-                unset($data[$name]);
-                continue;
-            }
-
-            // Replace name if extracted differ
-            $extracted = $this->extractName($name, $object);
-
-            if ($extracted !== $name) {
-                unset($data[$name]);
-                $name = $extracted;
-            }
-
-            $data[$name] = $this->extractValue($name, $value, $object);
-        }
-
-        return $data;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Hydrate an object by populating public properties
-     *
-     * Hydrates an object by setting public properties of the object.
-     *
-     * @throws Exception\BadMethodCallException for a non-object $object
-     */
-    public function hydrate(array $data, $object)
-    {
-        if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(
-                sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
-            );
-        }
-
-        $properties = & self::$skippedPropertiesCache[get_class($object)];
-
-        if (! isset($properties)) {
-            $reflection = new ReflectionClass($object);
-            $properties = array_fill_keys(
-                array_map(
-                    function (ReflectionProperty $property) {
-                        return $property->getName();
-                    },
-                    $reflection->getProperties(
-                        ReflectionProperty::IS_PRIVATE
-                        + ReflectionProperty::IS_PROTECTED
-                        + ReflectionProperty::IS_STATIC
-                    )
-                ),
-                true
-            );
-        }
-
-        foreach ($data as $name => $value) {
-            $property = $this->hydrateName($name, $data);
-
-            if (isset($properties[$property])) {
-                continue;
-            }
-
-            $object->$property = $this->hydrateValue($property, $value, $data);
-        }
-
-        return $object;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Reflection.php b/web/vendor/zendframework/zend-hydrator/src/Reflection.php
deleted file mode 100644
index 019748b1f..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Reflection.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use ReflectionClass;
-use ReflectionProperty;
-
-class Reflection extends AbstractHydrator
-{
-    /**
-     * Simple in-memory array cache of ReflectionProperties used.
-     * @var ReflectionProperty[]
-     */
-    protected static $reflProperties = [];
-
-    /**
-     * Extract values from an object
-     *
-     * @param  object $object
-     * @return array
-     */
-    public function extract($object)
-    {
-        $result = [];
-        foreach (self::getReflProperties($object) as $property) {
-            $propertyName = $this->extractName($property->getName(), $object);
-            if (!$this->filterComposite->filter($propertyName)) {
-                continue;
-            }
-
-            $value = $property->getValue($object);
-            $result[$propertyName] = $this->extractValue($propertyName, $value, $object);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Hydrate $object with the provided $data.
-     *
-     * @param  array $data
-     * @param  object $object
-     * @return object
-     */
-    public function hydrate(array $data, $object)
-    {
-        $reflProperties = self::getReflProperties($object);
-        foreach ($data as $key => $value) {
-            $name = $this->hydrateName($key, $data);
-            if (isset($reflProperties[$name])) {
-                $reflProperties[$name]->setValue($object, $this->hydrateValue($name, $value, $data));
-            }
-        }
-        return $object;
-    }
-
-    /**
-     * Get a reflection properties from in-memory cache and lazy-load if
-     * class has not been loaded.
-     *
-     * @param  string|object $input
-     * @throws Exception\InvalidArgumentException
-     * @return ReflectionProperty[]
-     */
-    protected static function getReflProperties($input)
-    {
-        if (is_object($input)) {
-            $input = get_class($input);
-        } elseif (!is_string($input)) {
-            throw new Exception\InvalidArgumentException('Input must be a string or an object.');
-        }
-
-        if (isset(static::$reflProperties[$input])) {
-            return static::$reflProperties[$input];
-        }
-
-        static::$reflProperties[$input] = [];
-        $reflClass                      = new ReflectionClass($input);
-        $reflProperties                 = $reflClass->getProperties();
-
-        foreach ($reflProperties as $property) {
-            $property->setAccessible(true);
-            static::$reflProperties[$input][$property->getName()] = $property;
-        }
-
-        return static::$reflProperties[$input];
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Strategy/BooleanStrategy.php b/web/vendor/zendframework/zend-hydrator/src/Strategy/BooleanStrategy.php
deleted file mode 100644
index dcb3a429c..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Strategy/BooleanStrategy.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-use Zend\Hydrator\Exception\InvalidArgumentException;
-
-/**
- * This Strategy extracts and hydrates int and string values to Boolean values
- */
-class BooleanStrategy implements StrategyInterface
-{
-    /**
-     * @var int|string
-     */
-    private $trueValue;
-
-    /**
-     * @var int|string
-     */
-    private $falseValue;
-
-    /**
-     * @param int|string $trueValue
-     * @param int|string $falseValue
-     * @throws InvalidArgumentException
-     */
-    public function __construct($trueValue, $falseValue)
-    {
-        if (!is_int($trueValue) && !is_string($trueValue)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to instantiate BooleanStrategy. Expected int or string as $trueValue. %s was given',
-                is_object($trueValue) ? get_class($trueValue) : gettype($trueValue)
-            ));
-        }
-
-        if (!is_int($falseValue) && !is_string($falseValue)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to instantiate BooleanStrategy. Expected int or string as $falseValue. %s was given',
-                is_object($falseValue) ? get_class($falseValue) : gettype($falseValue)
-            ));
-        }
-
-        $this->trueValue  = $trueValue;
-        $this->falseValue = $falseValue;
-    }
-
-    /**
-     * Converts the given value so that it can be extracted by the hydrator.
-     *
-     * @param  bool $value The original value.
-     * @throws InvalidArgumentException
-     * @return int|string Returns the value that should be extracted.
-     */
-    public function extract($value)
-    {
-        if (!is_bool($value)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to extract. Expected bool. %s was given.',
-                is_object($value) ? get_class($value) : gettype($value)
-            ));
-        }
-
-        return $value === true ? $this->trueValue : $this->falseValue;
-    }
-
-    /**
-     * Converts the given value so that it can be hydrated by the hydrator.
-     *
-     * @param  int|string $value The original value.
-     * @throws InvalidArgumentException
-     * @return bool Returns the value that should be hydrated.
-     */
-    public function hydrate($value)
-    {
-        if (!is_string($value) && !is_int($value)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to hydrate. Expected string or int. %s was given.',
-                is_object($value) ? get_class($value) : gettype($value)
-            ));
-        }
-
-        if ($value === $this->trueValue) {
-            return true;
-        }
-
-        if ($value === $this->falseValue) {
-            return false;
-        }
-
-        throw new InvalidArgumentException(sprintf(
-            'Unexpected value %s can\'t be hydrated. Expect %s or %s as Value.',
-            $value,
-            $this->trueValue,
-            $this->falseValue
-        ));
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Strategy/ClosureStrategy.php b/web/vendor/zendframework/zend-hydrator/src/Strategy/ClosureStrategy.php
deleted file mode 100644
index 1f6526de3..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Strategy/ClosureStrategy.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-class ClosureStrategy implements StrategyInterface
-{
-    /**
-     * Function, used in extract method, default:
-     *
-     * <code>
-     * function ($value) {
-     *     return $value;
-     * };
-     * </code>
-     *
-     * @var callable
-     */
-    protected $extractFunc = null;
-
-    /**
-     * Function, used in hydrate method, default:
-     *
-     * <code>
-     * function ($value) {
-     *     return $value;
-     * };
-     * </code>
-     *
-     * @var callable
-     */
-    protected $hydrateFunc = null;
-
-    /**
-     * You can describe how your values will extract and hydrate, like this:
-     *
-     * <code>
-     * $hydrator->addStrategy('category', new ClosureStrategy(
-     *     function (Category $value) {
-     *         return (int) $value->id;
-     *     },
-     *     function ($value) {
-     *         return new Category((int) $value);
-     *     }
-     * ));
-     * </code>
-     *
-     * @param callable $extractFunc - anonymous function, that extract values
-     *     from object
-     * @param callable $hydrateFunc - anonymous function, that hydrate values
-     *     into object
-     */
-    public function __construct($extractFunc = null, $hydrateFunc = null)
-    {
-        if (isset($extractFunc)) {
-            if (!is_callable($extractFunc)) {
-                throw new \Exception('$extractFunc must be callable');
-            }
-
-            $this->extractFunc = $extractFunc;
-        } else {
-            $this->extractFunc = function ($value) {
-                return $value;
-            };
-        }
-
-        if (isset($hydrateFunc)) {
-            if (!is_callable($hydrateFunc)) {
-                throw new \Exception('$hydrateFunc must be callable');
-            }
-
-            $this->hydrateFunc = $hydrateFunc;
-        } else {
-            $this->hydrateFunc = function ($value) {
-                return $value;
-            };
-        }
-    }
-
-    /**
-     * Converts the given value so that it can be extracted by the hydrator.
-     *
-     * @param  mixed $value  The original value.
-     * @param  array $object The object is optionally provided as context.
-     * @return mixed Returns the value that should be extracted.
-     */
-    public function extract($value, $object = null)
-    {
-        $func = $this->extractFunc;
-
-        return $func($value, $object);
-    }
-
-    /**
-     * Converts the given value so that it can be hydrated by the hydrator.
-     *
-     * @param  mixed $value The original value.
-     * @param  array $data  The whole data is optionally provided as context.
-     * @return mixed Returns the value that should be hydrated.
-     */
-    public function hydrate($value, $data = null)
-    {
-        $func = $this->hydrateFunc;
-
-        return $func($value, $data);
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Strategy/DateTimeFormatterStrategy.php b/web/vendor/zendframework/zend-hydrator/src/Strategy/DateTimeFormatterStrategy.php
deleted file mode 100644
index 62dda7148..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Strategy/DateTimeFormatterStrategy.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-use DateTime;
-use DateTimeZone;
-
-class DateTimeFormatterStrategy implements StrategyInterface
-{
-    /**
-     * @var string
-     */
-    private $format;
-
-    /**
-     * @var DateTimeZone|null
-     */
-    private $timezone;
-
-    /**
-     * Constructor
-     *
-     * @param string            $format
-     * @param DateTimeZone|null $timezone
-     */
-    public function __construct($format = DateTime::RFC3339, DateTimeZone $timezone = null)
-    {
-        $this->format   = (string) $format;
-        $this->timezone = $timezone;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Converts to date time string
-     *
-     * @param mixed|DateTime $value
-     *
-     * @return mixed|string
-     */
-    public function extract($value)
-    {
-        if ($value instanceof DateTime) {
-            return $value->format($this->format);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Converts date time string to DateTime instance for injecting to object
-     *
-     * {@inheritDoc}
-     *
-     * @param mixed|string $value
-     *
-     * @return mixed|DateTime
-     */
-    public function hydrate($value)
-    {
-        if ($value === '' || $value === null) {
-            return;
-        }
-
-        if ($this->timezone) {
-            $hydrated = DateTime::createFromFormat($this->format, $value, $this->timezone);
-        } else {
-            $hydrated = DateTime::createFromFormat($this->format, $value);
-        }
-
-        return $hydrated ?: $value;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Strategy/DefaultStrategy.php b/web/vendor/zendframework/zend-hydrator/src/Strategy/DefaultStrategy.php
deleted file mode 100644
index 6fb8f4588..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Strategy/DefaultStrategy.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-class DefaultStrategy implements StrategyInterface
-{
-    /**
-     * Converts the given value so that it can be extracted by the hydrator.
-     *
-     * @param mixed $value The original value.
-     * @return mixed Returns the value that should be extracted.
-     */
-    public function extract($value)
-    {
-        return $value;
-    }
-
-    /**
-     * Converts the given value so that it can be hydrated by the hydrator.
-     *
-     * @param mixed $value The original value.
-     * @return mixed Returns the value that should be hydrated.
-     */
-    public function hydrate($value)
-    {
-        return $value;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Strategy/Exception/ExceptionInterface.php b/web/vendor/zendframework/zend-hydrator/src/Strategy/Exception/ExceptionInterface.php
deleted file mode 100644
index 6c16ec768..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Strategy/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy\Exception;
-
-interface ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Strategy/Exception/InvalidArgumentException.php b/web/vendor/zendframework/zend-hydrator/src/Strategy/Exception/InvalidArgumentException.php
deleted file mode 100644
index c3175de4f..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Strategy/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy\Exception;
-
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Strategy/ExplodeStrategy.php b/web/vendor/zendframework/zend-hydrator/src/Strategy/ExplodeStrategy.php
deleted file mode 100644
index 4eb54d6b4..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Strategy/ExplodeStrategy.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-class ExplodeStrategy implements StrategyInterface
-{
-    /**
-     * @var string
-     */
-    private $valueDelimiter;
-
-    /**
-     * @var int|null
-     */
-    private $explodeLimit;
-
-    /**
-     * Constructor
-     *
-     * @param string   $delimiter    String that the values will be split upon
-     * @param int|null $explodeLimit Explode limit
-     */
-    public function __construct($delimiter = ',', $explodeLimit = null)
-    {
-        $this->setValueDelimiter($delimiter);
-
-        $this->explodeLimit = ($explodeLimit === null) ? null : (int) $explodeLimit;
-    }
-
-    /**
-     * Sets the delimiter string that the values will be split upon
-     *
-     * @param  string $delimiter
-     * @return self
-     */
-    private function setValueDelimiter($delimiter)
-    {
-        if (!is_string($delimiter)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects Delimiter to be string, %s provided instead',
-                __METHOD__,
-                is_object($delimiter) ? get_class($delimiter) : gettype($delimiter)
-            ));
-        }
-
-        if (empty($delimiter)) {
-            throw new Exception\InvalidArgumentException('Delimiter cannot be empty.');
-        }
-
-        $this->valueDelimiter = $delimiter;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Split a string by delimiter
-     *
-     * @param string|null $value
-     *
-     * @return string[]
-     *
-     * @throws Exception\InvalidArgumentException
-     */
-    public function hydrate($value)
-    {
-        if (null === $value) {
-            return [];
-        }
-
-        if (!(is_string($value) || is_numeric($value))) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects argument 1 to be string, %s provided instead',
-                __METHOD__,
-                is_object($value) ? get_class($value) : gettype($value)
-            ));
-        }
-
-        if ($this->explodeLimit !== null) {
-            return explode($this->valueDelimiter, $value, $this->explodeLimit);
-        }
-
-        return explode($this->valueDelimiter, $value);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Join array elements with delimiter
-     *
-     * @param string[] $value The original value.
-     *
-     * @return string|null
-     */
-    public function extract($value)
-    {
-        if (!is_array($value)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects argument 1 to be array, %s provided instead',
-                __METHOD__,
-                is_object($value) ? get_class($value) : gettype($value)
-            ));
-        }
-
-        return empty($value) ? null : implode($this->valueDelimiter, $value);
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Strategy/SerializableStrategy.php b/web/vendor/zendframework/zend-hydrator/src/Strategy/SerializableStrategy.php
deleted file mode 100644
index bc49e7b20..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Strategy/SerializableStrategy.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-use Zend\Hydrator\Exception\InvalidArgumentException;
-use Zend\Serializer\Adapter\AdapterInterface as SerializerAdapter;
-use Zend\Serializer\Serializer as SerializerFactory;
-
-class SerializableStrategy implements StrategyInterface
-{
-    /**
-     * @var string|SerializerAdapter
-     */
-    protected $serializer;
-
-    /**
-     * @var array
-     */
-    protected $serializerOptions = [];
-
-    /**
-     *
-     * @param mixed $serializer string or SerializerAdapter
-     * @param mixed $serializerOptions
-     */
-    public function __construct($serializer, $serializerOptions = null)
-    {
-        $this->setSerializer($serializer);
-        if ($serializerOptions) {
-            $this->setSerializerOptions($serializerOptions);
-        }
-    }
-
-    /**
-     * Serialize the given value so that it can be extracted by the hydrator.
-     *
-     * @param mixed $value The original value.
-     * @return mixed Returns the value that should be extracted.
-     */
-    public function extract($value)
-    {
-        $serializer = $this->getSerializer();
-        return $serializer->serialize($value);
-    }
-
-    /**
-     * Unserialize the given value so that it can be hydrated by the hydrator.
-     *
-     * @param mixed $value The original value.
-     * @return mixed Returns the value that should be hydrated.
-     */
-    public function hydrate($value)
-    {
-        $serializer = $this->getSerializer();
-        return $serializer->unserialize($value);
-    }
-
-    /**
-     * Set serializer
-     *
-     * @param  string|SerializerAdapter $serializer
-     * @return SerializableStrategy
-     */
-    public function setSerializer($serializer)
-    {
-        if (!is_string($serializer) && !$serializer instanceof SerializerAdapter) {
-            throw new InvalidArgumentException(sprintf(
-                '%s expects either a string serializer name or Zend\Serializer\Adapter\AdapterInterface instance; '
-                . 'received "%s"',
-                __METHOD__,
-                (is_object($serializer) ? get_class($serializer) : gettype($serializer))
-            ));
-        }
-        $this->serializer = $serializer;
-        return $this;
-    }
-
-    /**
-     * Get serializer
-     *
-     * @return SerializerAdapter
-     */
-    public function getSerializer()
-    {
-        if (is_string($this->serializer)) {
-            $options = $this->getSerializerOptions();
-            $this->setSerializer(SerializerFactory::factory($this->serializer, $options));
-        } elseif (null === $this->serializer) {
-            $this->setSerializer(SerializerFactory::getDefaultAdapter());
-        }
-
-        return $this->serializer;
-    }
-
-    /**
-     * Set configuration options for instantiating a serializer adapter
-     *
-     * @param  mixed $serializerOptions
-     * @return SerializableStrategy
-     */
-    public function setSerializerOptions($serializerOptions)
-    {
-        $this->serializerOptions = $serializerOptions;
-        return $this;
-    }
-
-    /**
-     * Get configuration options for instantiating a serializer adapter
-     *
-     * @return mixed
-     */
-    public function getSerializerOptions()
-    {
-        return $this->serializerOptions;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Strategy/StrategyChain.php b/web/vendor/zendframework/zend-hydrator/src/Strategy/StrategyChain.php
deleted file mode 100644
index 49d514d30..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Strategy/StrategyChain.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-use Traversable;
-use Zend\Stdlib\ArrayUtils;
-
-class StrategyChain implements StrategyInterface
-{
-    /**
-     * Strategy chain for extraction
-     *
-     * @var StrategyInterface[]
-     */
-    private $extractionStrategies;
-
-    /**
-     * Strategy chain for hydration
-     *
-     * @var StrategyInterface[]
-     */
-    private $hydrationStrategies;
-
-    /**
-     * Constructor
-     *
-     * @param array|Traversable $extractionStrategies
-     */
-    public function __construct($extractionStrategies)
-    {
-        $extractionStrategies = ArrayUtils::iteratorToArray($extractionStrategies);
-        $this->extractionStrategies = array_map(
-            function (StrategyInterface $strategy) {
-                // this callback is here only to ensure type-safety
-                return $strategy;
-            },
-            $extractionStrategies
-        );
-
-        $this->hydrationStrategies = array_reverse($extractionStrategies);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function extract($value)
-    {
-        foreach ($this->extractionStrategies as $strategy) {
-            $value = $strategy->extract($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hydrate($value)
-    {
-        foreach ($this->hydrationStrategies as $strategy) {
-            $value = $strategy->hydrate($value);
-        }
-
-        return $value;
-    }
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/Strategy/StrategyInterface.php b/web/vendor/zendframework/zend-hydrator/src/Strategy/StrategyInterface.php
deleted file mode 100644
index a70559338..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/Strategy/StrategyInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-/**
- * @todo v3.0, add optional object/data to extract/hydrate.
- */
-interface StrategyInterface
-{
-    /**
-     * Converts the given value so that it can be extracted by the hydrator.
-     *
-     * @param mixed   $value The original value.
-     * @param object $object (optional) The original object for context.
-     * @return mixed Returns the value that should be extracted.
-     */
-    public function extract($value);
-
-    /**
-     * Converts the given value so that it can be hydrated by the hydrator.
-     *
-     * @param mixed $value The original value.
-     * @param array  $data (optional) The original data for context.
-     * @return mixed Returns the value that should be hydrated.
-     */
-    public function hydrate($value);
-}
diff --git a/web/vendor/zendframework/zend-hydrator/src/StrategyEnabledInterface.php b/web/vendor/zendframework/zend-hydrator/src/StrategyEnabledInterface.php
deleted file mode 100644
index 3c85b7883..000000000
--- a/web/vendor/zendframework/zend-hydrator/src/StrategyEnabledInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface StrategyEnabledInterface
-{
-    /**
-     * Adds the given strategy under the given name.
-     *
-     * @param string $name The name of the strategy to register.
-     * @param Strategy\StrategyInterface $strategy The strategy to register.
-     * @return self
-     */
-    public function addStrategy($name, Strategy\StrategyInterface $strategy);
-
-    /**
-     * Gets the strategy with the given name.
-     *
-     * @param string $name The name of the strategy to get.
-     * @return Strategy\StrategyInterface
-     */
-    public function getStrategy($name);
-
-    /**
-     * Checks if the strategy with the given name exists.
-     *
-     * @param string $name The name of the strategy to check for.
-     * @return bool
-     */
-    public function hasStrategy($name);
-
-    /**
-     * Removes the strategy with the given name.
-     *
-     * @param string $name The name of the strategy to remove.
-     * @return self
-     */
-    public function removeStrategy($name);
-}
diff --git a/web/vendor/zendframework/zend-stdlib/CHANGELOG.md b/web/vendor/zendframework/zend-stdlib/CHANGELOG.md
index 5ce14e677..e47517930 100644
--- a/web/vendor/zendframework/zend-stdlib/CHANGELOG.md
+++ b/web/vendor/zendframework/zend-stdlib/CHANGELOG.md
@@ -2,6 +2,112 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.1.0 - 2016-09-13
+
+### Added
+
+- [#63](https://github.com/zendframework/zend-stdlib/pull/63) adds a new
+  `Zend\Stdlib\ConsoleHelper` class, providing minimal support for writing
+  output to `STDOUT` and `STDERR`, with optional colorization, when the console
+  supports that feature.
+
+### Deprecated
+
+- [#38](https://github.com/zendframework/zend-stdlib/pull/38) deprecates
+  `Zend\Stdlib\JsonSerializable`, as all supported version of PHP now support
+  it.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 3.0.1 - 2016-04-12
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#59](https://github.com/zendframework/zend-stdlib/pull/59) fixes a notice
+  when defining the `Zend\Json\Json::GLOB_BRACE` constant on systems using
+  non-gcc glob implementations.
+
+## 3.0.0 - 2016-02-03
+
+### Added
+
+- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds PHP 7 as a
+  supported PHP version.
+- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds a migration
+  document from v2 to v3. Hint: if you use hydrators, you need to be using
+  zend-hydrator instead!
+- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds automated
+  documentation builds to gh-pages.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#33](https://github.com/zendframework/zend-stdlib/pull/33) - removed
+  deprecated classes
+  - *All Hydrator classes* see #22.
+  - `Zend\Stdlib\CallbackHandler` see #35
+- [#37](https://github.com/zendframework/zend-stdlib/pull/37) - removed
+  deprecated classes and polyfills:
+  - `Zend\Stdlib\DateTime`; this had been deprecated since 2.5, and only
+    existed as a polyfill for the `createFromISO8601()` support, now standard
+    in all PHP versions we support.
+  - `Zend\Stdlib\Exception\InvalidCallbackException`, which was unused since #33.
+  - `Zend\Stdlib\Guard\GuardUtils`, which duplicated `Zend\Stdlib\Guard\AllGuardsTrait`
+    to allow usage with pre-PHP 5.4 versions.
+  - `src/compatibility/autoload.php`, which has been dprecated since 2.5.
+- [#37](https://github.com/zendframework/zend-stdlib/pull/37) - removed
+  unneeded dependencies:
+  - zend-config (used only in testing ArrayUtils, and the test was redundant)
+  - zend-serializer (no longer used)
+- [#51](https://github.com/zendframework/zend-stdlib/pull/51) removes the
+  documentation for hydrators, as those are part of the zend-hydrator
+  component.
+
+### Fixed
+
+- Nothing.
+
+## 2.7.4 - 2015-10-15
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- [#35](https://github.com/zendframework/zend-stdlib/pull/35) deprecates
+  `Zend\Stdlib\CallbackHandler`, as the one component that used it,
+  zend-eventmanager, will no longer depend on it starting in v3.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.7.3 - 2015-09-24
 
 ### Added
diff --git a/web/vendor/zendframework/zend-stdlib/CONDUCT.md b/web/vendor/zendframework/zend-stdlib/CONDUCT.md
new file mode 100644
index 000000000..c663d2be9
--- /dev/null
+++ b/web/vendor/zendframework/zend-stdlib/CONDUCT.md
@@ -0,0 +1,43 @@
+# Contributor Code of Conduct
+
+The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
+as its guidelines for contributor interactions.
+
+## The Code Manifesto
+
+We want to work in an ecosystem that empowers developers to reach their
+potential — one that encourages growth and effective collaboration. A space that
+is safe for all.
+
+A space such as this benefits everyone that participates in it. It encourages
+new developers to enter our field. It is through discussion and collaboration
+that we grow, and through growth that we improve.
+
+In the effort to create such a place, we hold to these values:
+
+1. **Discrimination limits us.** This includes discrimination on the basis of
+   race, gender, sexual orientation, gender identity, age, nationality, technology
+   and any other arbitrary exclusion of a group of people.
+2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort
+   levels. Remember that, and if brought to your attention, heed it.
+3. **We are our biggest assets.** None of us were born masters of our trade.
+   Each of us has been helped along the way. Return that favor, when and where
+   you can.
+4. **We are resources for the future.** As an extension of #3, share what you
+   know. Make yourself a resource to help those that come after you.
+5. **Respect defines us.** Treat others as you wish to be treated. Make your
+   discussions, criticisms and debates from a position of respectfulness. Ask
+   yourself, is it true? Is it necessary? Is it constructive? Anything less is
+   unacceptable.
+6. **Reactions require grace.** Angry responses are valid, but abusive language
+   and vindictive actions are toxic. When something happens that offends you,
+   handle it assertively, but be respectful. Escalate reasonably, and try to
+   allow the offender an opportunity to explain themselves, and possibly correct
+   the issue.
+7. **Opinions are just that: opinions.** Each and every one of us, due to our
+   background and upbringing, have varying opinions. The fact of the matter, is
+   that is perfectly acceptable. Remember this: if you respect your own
+   opinions, you should respect the opinions of others.
+8. **To err is human.** You might not intend it, but mistakes do happen and
+   contribute to build experience. Tolerate honest mistakes, and don't hesitate
+   to apologize if you make one yourself.
diff --git a/web/vendor/zendframework/zend-stdlib/CONTRIBUTING.md b/web/vendor/zendframework/zend-stdlib/CONTRIBUTING.md
index 1083b840a..39327161b 100644
--- a/web/vendor/zendframework/zend-stdlib/CONTRIBUTING.md
+++ b/web/vendor/zendframework/zend-stdlib/CONTRIBUTING.md
@@ -237,3 +237,8 @@ repository, we suggest doing some cleanup of these branches.
    ```console
    $ git push {username} :<branchname>
    ```
+
+
+## Conduct
+
+Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project.
diff --git a/web/vendor/zendframework/zend-stdlib/README.md b/web/vendor/zendframework/zend-stdlib/README.md
index d87d00c90..b26184a07 100644
--- a/web/vendor/zendframework/zend-stdlib/README.md
+++ b/web/vendor/zendframework/zend-stdlib/README.md
@@ -7,8 +7,6 @@
 class for different scopes like:
 
 - array utilities functions;
-- hydrators;
-- json serializable interfaces;
 - general messaging systems;
 - string wrappers;
 - etc.
@@ -16,4 +14,4 @@ class for different scopes like:
 ---
 
 - File issues at https://github.com/zendframework/zend-stdlib/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-stdlib
+- Documentation is at https://docs.zendframework.com/zend-stdlib/
diff --git a/web/vendor/zendframework/zend-stdlib/composer.json b/web/vendor/zendframework/zend-stdlib/composer.json
index 4a5ecd55d..739661199 100644
--- a/web/vendor/zendframework/zend-stdlib/composer.json
+++ b/web/vendor/zendframework/zend-stdlib/composer.json
@@ -13,32 +13,17 @@
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-hydrator": "~1.0"
+        "php": "^5.6 || ^7.0"
     },
     "require-dev": {
-        "zendframework/zend-config": "~2.5",
-        "zendframework/zend-eventmanager": "~2.5",
-        "zendframework/zend-inputfilter": "~2.5",
-        "zendframework/zend-serializer": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
-        "zendframework/zend-filter": "~2.5",
-        "fabpot/php-cs-fixer": "1.7.*",
+        "athletic/athletic": "~0.1",
         "phpunit/PHPUnit": "~4.0",
-        "athletic/athletic": "~0.1"
+        "squizlabs/php_codesniffer": "^2.6.2"
     },
-    "suggest": {
-        "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-        "zendframework/zend-serializer": "Zend\\Serializer component",
-        "zendframework/zend-servicemanager": "To support hydrator plugin manager usage",
-        "zendframework/zend-filter": "To support naming strategy hydrator usage"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev",
-            "dev-develop": "2.8-dev"
+            "dev-master": "3.1-dev",
+            "dev-develop": "3.2-dev"
         }
     },
     "autoload-dev": {
@@ -46,5 +31,12 @@
             "ZendTest\\Stdlib\\": "test/",
             "ZendBench\\Stdlib\\": "benchmark/"
         }
+    },
+    "scripts": {
+        "cs-check": "phpcs --colors",
+        "cs-fix": "phpcbf --colors",
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "upload-coverage": "coveralls -v"
     }
 }
diff --git a/web/vendor/zendframework/zend-stdlib/doc/book/console-helper.md b/web/vendor/zendframework/zend-stdlib/doc/book/console-helper.md
new file mode 100644
index 000000000..0a275667e
--- /dev/null
+++ b/web/vendor/zendframework/zend-stdlib/doc/book/console-helper.md
@@ -0,0 +1,126 @@
+# Console Helper
+
+Writing one-off scripts or vendor binaries for a package is often problematic:
+
+- You need to parse arguments manually.
+- You need to send output to the console in a meaningful fashion:
+    - Using `STDOUT` for meaningful, expected output
+    - Using `STDERR` for error messages
+    - Ensuring any line breaks are converted to `PHP_EOL`
+    - Optionally, using console colors to provide context, which means:
+        - Detecting whether or not the console supports colors in the first place
+        - Providing appropriate escape sequences to produce color
+
+`Zend\Stdlib\ConsoleHelper` helps to address the second major bullet point and
+all beneath it in a minimal fashion.
+
+## Usage
+
+Typical usage is to instantiate a `ConsoleHelper`, and call one of its methods:
+
+```php
+use Zend\Stdlib\ConsoleHelper;
+
+$helper = new ConsoleHelper();
+$helper->writeLine('This is output');
+```
+
+You can optionally pass a PHP stream resource to the constructor, which will be
+used to determine whether or not color support is available:
+
+```php
+$helper = new ConsoleHelper($stream);
+```
+
+By default, it assumes `STDOUT`, and tests against that.
+
+## Available methods
+
+`ConsoleHelper` provides the following methods.
+
+### colorize
+
+- `colorize(string $string) : string`
+
+`colorize()` accepts a formatted string, and will then apply ANSI color
+sequences to them, if color support is detected.
+
+The following sequences are currently supported:
+
+- `<info>...</info>` will apply a green color sequence around the provided text.
+- `<error>...</error>` will apply a red color sequence around the provided text.
+
+You may mix multiple sequences within the same stream.
+
+### write
+
+- `write(string $string, bool $colorize = true, resource $stream = STDOUT) : void`
+
+Emits the provided `$string` to the provided `$stream` (which defaults to
+`STDOUT` if not provided). Any EOL sequences are convered to `PHP_EOL`. If
+`$colorize` is `true`, the string is first passed to `colorize()` as well.
+
+### writeline
+
+- `writeLine(string $string, bool $colorize = true, resource $stream = STDOUT) : void`
+
+Same as `write()`, except it also appends a `PHP_EOL` sequence to the `$string`.
+
+### writeErrorMessage
+
+- `writeErrorMessage(string $message)`
+
+Wraps `$message` in an `<error></error>` sequence, and passes it to
+`writeLine()`, using `STDERR` as the `$stream`.
+
+## Example
+
+Below is an example class that accepts an argument list, and determines how and
+what to emit.
+
+```php
+namespace Foo;
+
+use Zend\Stdlib\ConsoleHelper;
+
+class HelloWorld
+{
+    private $helper;
+
+    public function __construct(ConsoleHelper $helper = null)
+    {
+        $this->helper = $helper ?: new ConsoleHelper();
+    }
+
+    public function __invoke(array $args)
+    {
+        if (! count($args)) {
+            $this->helper->writeErrorMessage('Missing arguments!');
+            return;
+        }
+
+        if (count($args) > 1) {
+            $this->helper->writeErrorMessage('Too many arguments!');
+            return;
+        }
+
+        $target = array_shift($args);
+
+        $this->helper->writeLine(sprintf(
+            '<info>Hello</info> %s',
+            $target
+        ));
+    }
+}
+```
+
+## When to upgrade
+
+`ConsoleHelper` is deliberately simple, and assumes that your primary need for
+console tooling is for output considerations.
+
+If you need to parse complex argument strings, we recommend using
+[zend-console](https://docs.zendframework.com/zend-console/)/[zf-console](https://github.com/zfcampus/zf-console)
+or [symfony/console](http://symfony.com/doc/current/components/console.html),
+as these packages provide those capabilities, as well as far more colorization
+and console feature detection facilities.
diff --git a/web/vendor/zendframework/zend-stdlib/doc/book/index.html b/web/vendor/zendframework/zend-stdlib/doc/book/index.html
new file mode 100644
index 000000000..f4b09ab44
--- /dev/null
+++ b/web/vendor/zendframework/zend-stdlib/doc/book/index.html
@@ -0,0 +1,10 @@
+<div class="container">
+  <div class="jumbotron">
+    <h1>zend-stdlib</h1>
+    
+    <p>SPL extensions, array utilities, error handlers, and more.</p>
+
+    <pre><code class="language-bash">$ composer require zendframework/zend-stdlib</code></pre>
+  </div>
+</div>
+
diff --git a/web/vendor/zendframework/zend-stdlib/doc/book/index.md b/web/vendor/zendframework/zend-stdlib/doc/book/index.md
new file mode 120000
index 000000000..fe8400541
--- /dev/null
+++ b/web/vendor/zendframework/zend-stdlib/doc/book/index.md
@@ -0,0 +1 @@
+../../README.md
\ No newline at end of file
diff --git a/web/vendor/zendframework/zend-stdlib/doc/book/migration.md b/web/vendor/zendframework/zend-stdlib/doc/book/migration.md
new file mode 100644
index 000000000..a0c7ff398
--- /dev/null
+++ b/web/vendor/zendframework/zend-stdlib/doc/book/migration.md
@@ -0,0 +1,60 @@
+# Migration Guide
+
+## From v2 to v3
+
+The changes made going from v2 to v3 were:
+
+- Removal of the Hydrator subcomponent.
+- Removal of the `CallbackHandler` class.
+- Removal of `Zend\Stdlib\Guard\GuardUtils`.
+
+### Hydrators
+
+The biggest single change from version 2 to version 3 is that the hydrator
+subcomponent, which was deprecated in v2.7.0, is now removed. This means that if
+you were using zend-stdlib principally for the hydrators, you need to convert
+your code to use [zend-hydrator](https://github.com/zendframework/zend-hydrator).
+
+This will also mean a multi-step migration. zend-stdlib v3 pre-dates
+zend-hydrator v2.1, which will be the first version that supports zend-stdlib v3
+and zend-servicemanager v3. If you are using Composer, the migration should be
+seamless:
+
+- Remove your zend-stdlib dependency:
+
+  ```bash
+  $ composer remove zendframework/zend-stdlib
+  ```
+
+- Update to use zend-hydrator:
+
+  ```bash
+  $ composer require zendframework/zend-hydrator
+  ```
+
+When zend-hydrator updates to newer versions of zend-stdlib and
+zend-servicemanager, you will either automatically get those versions, or you
+can tell composer to use those specific versions:
+
+```bash
+$ composer require "zendframework/zend-stdlib:^3.0"
+```
+
+### CallbackHandler
+
+`Zend\Stdlib\CallbackHandler` primarily existed for legacy purposes; it was
+created before the `callable` typehint existed, so that we could typehint PHP
+callables. It also provided some minimal features around lazy-loading callables
+from instantiable classes, but these features were rarely used, and better
+approaches already exist for handling such functinality in zend-servicemanager
+and zend-expressive.
+
+As such, the class was marked deprecated in v2.7.0, and removed for v3.0.0.
+
+### GuardUtils
+
+Version 3 removes `Zend\Stdlib\Guard\GuardUtils`. This abstract class existed to
+provide the functionality of the various traits also present in that
+subcomponent, for consumers on versions of PHP earlier than 5.4. Since the
+minimum required version is now PHP 5.5, the class is unnecessary. If you were
+using it previously, compose the related traits instead.
diff --git a/web/vendor/zendframework/zend-stdlib/doc/bookdown.json b/web/vendor/zendframework/zend-stdlib/doc/bookdown.json
new file mode 100644
index 000000000..ad93f485f
--- /dev/null
+++ b/web/vendor/zendframework/zend-stdlib/doc/bookdown.json
@@ -0,0 +1,14 @@
+{
+    "title": "Zend\\Stdlib",
+    "target": "html/",
+    "content": [
+        "book/zend.stdlib.hydrator.md",
+        "book/zend.stdlib.hydrator.filter.md",
+        "book/zend.stdlib.hydrator.strategy.md",
+        "book/zend.stdlib.hydrator.aggregate.md",
+        "book/zend.stdlib.hydrator.namingstrategy.compositenamingstrategy.md",
+        "book/zend.stdlib.hydrator.namingstrategy.identitynamingstrategy.md",
+        "book/zend.stdlib.hydrator.namingstrategy.mapnamingstrategy.md",
+        "book/zend.stdlib.hydrator.namingstrategy.underscorenamingstrategy.md"
+    ]
+}
\ No newline at end of file
diff --git a/web/vendor/zendframework/zend-stdlib/mkdocs.yml b/web/vendor/zendframework/zend-stdlib/mkdocs.yml
new file mode 100644
index 000000000..89f84200d
--- /dev/null
+++ b/web/vendor/zendframework/zend-stdlib/mkdocs.yml
@@ -0,0 +1,11 @@
+docs_dir: doc/book
+site_dir: doc/html
+pages:
+    - index.md
+    - Reference:
+      - "Console Helper": console-helper.md
+    - Migration: migration.md
+site_name: zend-stdlib
+site_description: Zend\Stdlib
+repo_url: 'https://github.com/zendframework/zend-stdlib'
+copyright: 'Copyright (c) 2016 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'
diff --git a/web/vendor/zendframework/zend-diactoros/phpcs.xml b/web/vendor/zendframework/zend-stdlib/phpcs.xml
similarity index 72%
rename from web/vendor/zendframework/zend-diactoros/phpcs.xml
rename to web/vendor/zendframework/zend-stdlib/phpcs.xml
index e994eae10..7aa21c070 100644
--- a/web/vendor/zendframework/zend-diactoros/phpcs.xml
+++ b/web/vendor/zendframework/zend-stdlib/phpcs.xml
@@ -9,6 +9,12 @@
     <!-- inherit rules from: -->
     <rule ref="PSR2"/>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Generic.Formatting.SpaceAfterNot"/>
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true"/>
+        </properties>
+    </rule>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
         <properties>
             <property name="ignoreBlankLines" value="false"/>
diff --git a/web/vendor/zendframework/zend-stdlib/src/AbstractOptions.php b/web/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
index 812e1ca13..172f5d363 100644
--- a/web/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
+++ b/web/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
@@ -13,6 +13,7 @@ use Traversable;
 
 abstract class AbstractOptions implements ParameterObjectInterface
 {
+    // @codingStandardsIgnoreStart
     /**
      * We use the __ prefix to avoid collisions with properties in
      * user-implementations.
@@ -20,6 +21,7 @@ abstract class AbstractOptions implements ParameterObjectInterface
      * @var bool
      */
     protected $__strictMode__ = true;
+    // @codingStandardsIgnoreEnd
 
     /**
      * Constructor
@@ -46,7 +48,7 @@ abstract class AbstractOptions implements ParameterObjectInterface
             $options = $options->toArray();
         }
 
-        if (!is_array($options) && !$options instanceof Traversable) {
+        if (! is_array($options) && ! $options instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
                 sprintf(
                     'Parameter provided to %s must be an %s, %s or %s',
diff --git a/web/vendor/zendframework/zend-stdlib/src/ArrayObject.php b/web/vendor/zendframework/zend-stdlib/src/ArrayObject.php
index e890084d0..926ff6ea9 100644
--- a/web/vendor/zendframework/zend-stdlib/src/ArrayObject.php
+++ b/web/vendor/zendframework/zend-stdlib/src/ArrayObject.php
@@ -180,14 +180,16 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Count
      */
     public function exchangeArray($data)
     {
-        if (!is_array($data) && !is_object($data)) {
-            throw new Exception\InvalidArgumentException('Passed variable is not an array or object, using empty array instead');
+        if (! is_array($data) && ! is_object($data)) {
+            throw new Exception\InvalidArgumentException(
+                'Passed variable is not an array or object, using empty array instead'
+            );
         }
 
         if (is_object($data) && ($data instanceof self || $data instanceof \ArrayObject)) {
             $data = $data->getArrayCopy();
         }
-        if (!is_array($data)) {
+        if (! is_array($data)) {
             $data = (array) $data;
         }
 
@@ -290,7 +292,7 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Count
     public function &offsetGet($key)
     {
         $ret = null;
-        if (!$this->offsetExists($key)) {
+        if (! $this->offsetExists($key)) {
             return $ret;
         }
         $ret =& $this->storage[$key];
diff --git a/web/vendor/zendframework/zend-stdlib/src/ArrayUtils.php b/web/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
index 17e3ae3cd..0e2b738cc 100644
--- a/web/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
+++ b/web/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
@@ -39,11 +39,11 @@ abstract class ArrayUtils
      */
     public static function hasStringKeys($value, $allowEmpty = false)
     {
-        if (!is_array($value)) {
+        if (! is_array($value)) {
             return false;
         }
 
-        if (!$value) {
+        if (! $value) {
             return $allowEmpty;
         }
 
@@ -59,11 +59,11 @@ abstract class ArrayUtils
      */
     public static function hasIntegerKeys($value, $allowEmpty = false)
     {
-        if (!is_array($value)) {
+        if (! is_array($value)) {
             return false;
         }
 
-        if (!$value) {
+        if (! $value) {
             return $allowEmpty;
         }
 
@@ -86,11 +86,11 @@ abstract class ArrayUtils
      */
     public static function hasNumericKeys($value, $allowEmpty = false)
     {
-        if (!is_array($value)) {
+        if (! is_array($value)) {
             return false;
         }
 
-        if (!$value) {
+        if (! $value) {
             return $allowEmpty;
         }
 
@@ -119,11 +119,11 @@ abstract class ArrayUtils
      */
     public static function isList($value, $allowEmpty = false)
     {
-        if (!is_array($value)) {
+        if (! is_array($value)) {
             return false;
         }
 
-        if (!$value) {
+        if (! $value) {
             return $allowEmpty;
         }
 
@@ -161,11 +161,11 @@ abstract class ArrayUtils
      */
     public static function isHashTable($value, $allowEmpty = false)
     {
-        if (!is_array($value)) {
+        if (! is_array($value)) {
             return false;
         }
 
-        if (!$value) {
+        if (! $value) {
             return $allowEmpty;
         }
 
@@ -187,7 +187,7 @@ abstract class ArrayUtils
      */
     public static function inArray($needle, array $haystack, $strict = false)
     {
-        if (!$strict) {
+        if (! $strict) {
             if (is_int($needle) || is_float($needle)) {
                 $needle = (string) $needle;
             }
@@ -215,11 +215,11 @@ abstract class ArrayUtils
      */
     public static function iteratorToArray($iterator, $recursive = true)
     {
-        if (!is_array($iterator) && !$iterator instanceof Traversable) {
+        if (! is_array($iterator) && ! $iterator instanceof Traversable) {
             throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable object');
         }
 
-        if (!$recursive) {
+        if (! $recursive) {
             if (is_array($iterator)) {
                 return $iterator;
             }
@@ -274,7 +274,7 @@ abstract class ArrayUtils
             } elseif (isset($a[$key]) || array_key_exists($key, $a)) {
                 if ($value instanceof MergeRemoveKey) {
                     unset($a[$key]);
-                } elseif (!$preserveNumericKeys && is_int($key)) {
+                } elseif (! $preserveNumericKeys && is_int($key)) {
                     $a[] = $value;
                 } elseif (is_array($value) && is_array($a[$key])) {
                     $a[$key] = static::merge($a[$key], $value, $preserveNumericKeys);
@@ -282,7 +282,7 @@ abstract class ArrayUtils
                     $a[$key] = $value;
                 }
             } else {
-                if (!$value instanceof MergeRemoveKey) {
+                if (! $value instanceof MergeRemoveKey) {
                     $a[$key] = $value;
                 }
             }
diff --git a/web/vendor/zendframework/zend-stdlib/src/CallbackHandler.php b/web/vendor/zendframework/zend-stdlib/src/CallbackHandler.php
deleted file mode 100644
index dc6bc7469..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/CallbackHandler.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use ReflectionClass;
-
-/**
- * CallbackHandler
- *
- * A handler for an event, event, filterchain, etc. Abstracts PHP callbacks,
- * primarily to allow for lazy-loading and ensuring availability of default
- * arguments (currying).
- */
-class CallbackHandler
-{
-    /**
-     * @var string|array|callable PHP callback to invoke
-     */
-    protected $callback;
-
-    /**
-     * Callback metadata, if any
-     * @var array
-     */
-    protected $metadata;
-
-    /**
-     * Constructor
-     *
-     * @param  string|array|object|callable $callback PHP callback
-     * @param  array                        $metadata  Callback metadata
-     */
-    public function __construct($callback, array $metadata = [])
-    {
-        $this->metadata  = $metadata;
-        $this->registerCallback($callback);
-    }
-
-    /**
-     * Registers the callback provided in the constructor
-     *
-     * @param  callable $callback
-     * @throws Exception\InvalidCallbackException
-     * @return void
-     */
-    protected function registerCallback($callback)
-    {
-        if (!is_callable($callback)) {
-            throw new Exception\InvalidCallbackException('Invalid callback provided; not callable');
-        }
-
-        $this->callback = $callback;
-    }
-
-    /**
-     * Retrieve registered callback
-     *
-     * @return callable
-     */
-    public function getCallback()
-    {
-        return $this->callback;
-    }
-
-    /**
-     * Invoke handler
-     *
-     * @param  array $args Arguments to pass to callback
-     * @return mixed
-     */
-    public function call(array $args = [])
-    {
-        $callback = $this->getCallback();
-        $argCount = count($args);
-
-        if (is_string($callback)) {
-            $result = $this->validateStringCallbackFor54($callback);
-
-            if ($result !== true && $argCount <= 3) {
-                $callback       = $result;
-                // Minor performance tweak, if the callback gets called more
-                // than once
-                $this->callback = $result;
-            }
-        }
-
-        // Minor performance tweak; use call_user_func() until > 3 arguments
-        // reached
-        switch ($argCount) {
-            case 0:
-                return $callback();
-            case 1:
-                return $callback(array_shift($args));
-            case 2:
-                $arg1 = array_shift($args);
-                $arg2 = array_shift($args);
-                return $callback($arg1, $arg2);
-            case 3:
-                $arg1 = array_shift($args);
-                $arg2 = array_shift($args);
-                $arg3 = array_shift($args);
-                return $callback($arg1, $arg2, $arg3);
-            default:
-                return call_user_func_array($callback, $args);
-        }
-    }
-
-    /**
-     * Invoke as functor
-     *
-     * @return mixed
-     */
-    public function __invoke()
-    {
-        return $this->call(func_get_args());
-    }
-
-    /**
-     * Get all callback metadata
-     *
-     * @return array
-     */
-    public function getMetadata()
-    {
-        return $this->metadata;
-    }
-
-    /**
-     * Retrieve a single metadatum
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function getMetadatum($name)
-    {
-        if (array_key_exists($name, $this->metadata)) {
-            return $this->metadata[$name];
-        }
-        return;
-    }
-
-    /**
-     * Validate a static method call
-     *
-     *
-     * @param  string $callback
-     * @return true|array
-     * @throws Exception\InvalidCallbackException if invalid
-     */
-    protected function validateStringCallbackFor54($callback)
-    {
-        if (!strstr($callback, '::')) {
-            return true;
-        }
-
-        list($class, $method) = explode('::', $callback, 2);
-
-        if (!class_exists($class)) {
-            throw new Exception\InvalidCallbackException(sprintf(
-                'Static method call "%s" refers to a class that does not exist',
-                $callback
-            ));
-        }
-
-        $r = new ReflectionClass($class);
-        if (!$r->hasMethod($method)) {
-            throw new Exception\InvalidCallbackException(sprintf(
-                'Static method call "%s" refers to a method that does not exist',
-                $callback
-            ));
-        }
-        $m = $r->getMethod($method);
-        if (!$m->isStatic()) {
-            throw new Exception\InvalidCallbackException(sprintf(
-                'Static method call "%s" refers to a method that is not static',
-                $callback
-            ));
-        }
-
-        // returning a non boolean value may not be nice for a validate method,
-        // but that allows the usage of a static string callback without using
-        // the call_user_func function.
-        return [$class, $method];
-    }
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/ConsoleHelper.php b/web/vendor/zendframework/zend-stdlib/src/ConsoleHelper.php
new file mode 100644
index 000000000..79a65c803
--- /dev/null
+++ b/web/vendor/zendframework/zend-stdlib/src/ConsoleHelper.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-stdlib for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib;
+
+/**
+ * Utilities for console tooling.
+ *
+ * Provides the following facilities:
+ *
+ * - Colorize strings using markup (e.g., `<info>message</info>`,
+ *   `<error>message</error>`)
+ * - Write output to a specified stream, optionally with colorization.
+ * - Write a line of output to a specified stream, optionally with
+ *   colorization, using the system EOL sequence..
+ * - Write an error message to STDERR.
+ *
+ * Colorization will only occur when expected sequences are discovered, and
+ * then, only if the console terminal allows it.
+ *
+ * Essentially, provides the bare minimum to allow you to provide messages to
+ * the current console.
+ */
+class ConsoleHelper
+{
+    const COLOR_GREEN = "\033[32m";
+    const COLOR_RED   = "\033[31m";
+    const COLOR_RESET = "\033[0m";
+
+    const HIGHLIGHT_INFO  = 'info';
+    const HIGHLIGHT_ERROR = 'error';
+
+    private $highlightMap = [
+        self::HIGHLIGHT_INFO  => self::COLOR_GREEN,
+        self::HIGHLIGHT_ERROR => self::COLOR_RED,
+    ];
+
+    /**
+     * @var string Exists only for testing.
+     */
+    private $eol = PHP_EOL;
+
+    /**
+     * @var resource Exists only for testing.
+     */
+    private $stderr = STDERR;
+
+    /**
+     * @var bool
+     */
+    private $supportsColor;
+
+    /**
+     * @param resource $resource
+     */
+    public function __construct($resource = STDOUT)
+    {
+        $this->supportsColor = $this->detectColorCapabilities($resource);
+    }
+
+    /**
+     * Colorize a string for use with the terminal.
+     *
+     * Takes strings formatted as `<key>string</key>` and formats them per the
+     * $highlightMap; if color support is disabled, simply removes the formatting
+     * tags.
+     *
+     * @param string $string
+     * @return string
+     */
+    public function colorize($string)
+    {
+        $reset = $this->supportsColor ? self::COLOR_RESET : '';
+        foreach ($this->highlightMap as $key => $color) {
+            $pattern = sprintf('#<%s>(.*?)</%s>#s', $key, $key);
+            $color   = $this->supportsColor ? $color : '';
+            $string  = preg_replace($pattern, $color . '$1' . $reset, $string);
+        }
+        return $string;
+    }
+
+    /**
+     * @param string $string
+     * @param bool $colorize Whether or not to colorize the string
+     * @param resource $resource Defaults to STDOUT
+     * @return void
+     */
+    public function write($string, $colorize = true, $resource = STDOUT)
+    {
+        if ($colorize) {
+            $string = $this->colorize($string);
+        }
+
+        $string = $this->formatNewlines($string);
+
+        fwrite($resource, $string);
+    }
+
+    /**
+     * @param string $string
+     * @param bool $colorize Whether or not to colorize the line
+     * @param resource $resource Defaults to STDOUT
+     * @return void
+     */
+    public function writeLine($string, $colorize = true, $resource = STDOUT)
+    {
+        $this->write($string . $this->eol, $colorize, $resource);
+    }
+
+    /**
+     * Emit an error message.
+     *
+     * Wraps the message in `<error></error>`, and passes it to `writeLine()`,
+     * using STDERR as the resource; emits an additional empty line when done,
+     * also to STDERR.
+     *
+     * @param string $message
+     * @return void
+     */
+    public function writeErrorMessage($message)
+    {
+        $this->writeLine(sprintf('<error>%s</error>', $message), true, $this->stderr);
+        $this->writeLine('', false, $this->stderr);
+    }
+
+    /**
+     * @param resource $resource
+     * @return bool
+     */
+    private function detectColorCapabilities($resource = STDOUT)
+    {
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            // Windows
+            return false !== getenv('ANSICON')
+                || 'ON' === getenv('ConEmuANSI')
+                || 'xterm' === getenv('TERM');
+        }
+
+        return function_exists('posix_isatty') && posix_isatty($resource);
+    }
+
+    /**
+     * Ensure newlines are appropriate for the current terminal.
+     *
+     * @param string
+     * @return string
+     */
+    private function formatNewlines($string)
+    {
+        $string = str_replace($this->eol, "\0PHP_EOL\0", $string);
+        $string = preg_replace("/(\r\n|\n|\r)/", $this->eol, $string);
+        return str_replace("\0PHP_EOL\0", $this->eol, $string);
+    }
+}
diff --git a/web/vendor/zendframework/zend-stdlib/src/DateTime.php b/web/vendor/zendframework/zend-stdlib/src/DateTime.php
deleted file mode 100644
index cdab67d6e..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/DateTime.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use DateTimeZone;
-
-trigger_error('DateTime extension deprecated as of ZF 2.1.4; use the \DateTime constructor to parse extended ISO8601 dates instead', E_USER_DEPRECATED);
-
-/**
- * DateTime
- *
- * An extension of the \DateTime object.
- *
- * @deprecated
- */
-class DateTime extends \DateTime
-{
-    /**
-     * The DateTime::ISO8601 constant used by php's native DateTime object does
-     * not allow for fractions of a second. This function better handles ISO8601
-     * formatted date strings.
-     *
-     * @param  string       $time
-     * @param  DateTimeZone $timezone
-     * @return mixed
-     */
-    public static function createFromISO8601($time, DateTimeZone $timezone = null)
-    {
-        $format = self::ISO8601;
-        if (isset($time[19]) && $time[19] === '.') {
-            $format = 'Y-m-d\TH:i:s.uO';
-        }
-
-        if ($timezone !== null) {
-            return self::createFromFormat($format, $time, $timezone);
-        }
-
-        return self::createFromFormat($format, $time);
-    }
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/ErrorHandler.php b/web/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
index a849620ab..5c544e205 100644
--- a/web/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
+++ b/web/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
@@ -51,7 +51,7 @@ abstract class ErrorHandler
      */
     public static function start($errorLevel = \E_WARNING)
     {
-        if (!static::$stack) {
+        if (! static::$stack) {
             set_error_handler([get_called_class(), 'addError'], $errorLevel);
         }
 
@@ -72,7 +72,7 @@ abstract class ErrorHandler
         if (static::$stack) {
             $errorException = array_pop(static::$stack);
 
-            if (!static::$stack) {
+            if (! static::$stack) {
                 restore_error_handler();
             }
 
diff --git a/web/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php b/web/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php
deleted file mode 100644
index aa36f9863..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Invalid callback exception
- */
-class InvalidCallbackException extends DomainException implements ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php b/web/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php
deleted file mode 100644
index 6c84720c8..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Extractor;
-
-use Zend\Hydrator\ExtractionInterface as BaseExtractionInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\ExtractionInterface from zendframework/zend-hydrator instead.
- */
-interface ExtractionInterface extends BaseExtractionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Glob.php b/web/vendor/zendframework/zend-stdlib/src/Glob.php
index 5358740ed..ded3fc533 100644
--- a/web/vendor/zendframework/zend-stdlib/src/Glob.php
+++ b/web/vendor/zendframework/zend-stdlib/src/Glob.php
@@ -38,7 +38,7 @@ abstract class Glob
      */
     public static function glob($pattern, $flags = 0, $forceFallback = false)
     {
-        if (!defined('GLOB_BRACE') || $forceFallback) {
+        if (! defined('GLOB_BRACE') || $forceFallback) {
             return static::fallbackGlob($pattern, $flags);
         }
 
@@ -61,7 +61,7 @@ abstract class Glob
                 self::GLOB_NOSORT   => GLOB_NOSORT,
                 self::GLOB_NOCHECK  => GLOB_NOCHECK,
                 self::GLOB_NOESCAPE => GLOB_NOESCAPE,
-                self::GLOB_BRACE    => GLOB_BRACE,
+                self::GLOB_BRACE    => defined('GLOB_BRACE') ? GLOB_BRACE : 0,
                 self::GLOB_ONLYDIR  => GLOB_ONLYDIR,
                 self::GLOB_ERR      => GLOB_ERR,
             ];
@@ -96,7 +96,7 @@ abstract class Glob
      */
     protected static function fallbackGlob($pattern, $flags)
     {
-        if (!$flags & self::GLOB_BRACE) {
+        if (! $flags & self::GLOB_BRACE) {
             return static::systemGlob($pattern, $flags);
         }
 
@@ -182,7 +182,7 @@ abstract class Glob
         $current = $begin;
 
         while ($current < $length) {
-            if (!$flags & self::GLOB_NOESCAPE && $pattern[$current] === '\\') {
+            if (! $flags & self::GLOB_NOESCAPE && $pattern[$current] === '\\') {
                 if (++$current === $length) {
                     break;
                 }
diff --git a/web/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php b/web/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
index e6959a5ef..116101f1b 100644
--- a/web/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
+++ b/web/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
@@ -29,7 +29,7 @@ trait ArrayOrTraversableGuardTrait
         $dataName = 'Argument',
         $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
     ) {
-        if (!is_array($data) && !($data instanceof Traversable)) {
+        if (! is_array($data) && ! ($data instanceof Traversable)) {
             $message = sprintf(
                 "%s must be an array or Traversable, [%s] given",
                 $dataName,
diff --git a/web/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php b/web/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php
deleted file mode 100644
index 4fe4ccacb..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Guard;
-
-use Traversable;
-
-/**
- * Static guard helper class
- *
- * Bridges the gap for allowing refactoring until traits can be used by default.
- *
- * @deprecated
- */
-abstract class GuardUtils
-{
-    const DEFAULT_EXCEPTION_CLASS = 'Zend\Stdlib\Exception\InvalidArgumentException';
-
-    /**
-     * Verifies that the data is an array or Traversable
-     *
-     * @param  mixed  $data           the data to verify
-     * @param  string $dataName       the data name
-     * @param  string $exceptionClass FQCN for the exception
-     * @throws \Exception
-     */
-    public static function guardForArrayOrTraversable(
-        $data,
-        $dataName = 'Argument',
-        $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
-    ) {
-        if (!is_array($data) && !($data instanceof Traversable)) {
-            $message = sprintf(
-                '%s must be an array or Traversable, [%s] given',
-                $dataName,
-                is_object($data) ? get_class($data) : gettype($data)
-            );
-            throw new $exceptionClass($message);
-        }
-    }
-
-    /**
-     * Verify that the data is not empty
-     *
-     * @param  mixed  $data           the data to verify
-     * @param  string $dataName       the data name
-     * @param  string $exceptionClass FQCN for the exception
-     * @throws \Exception
-     */
-    public static function guardAgainstEmpty(
-        $data,
-        $dataName = 'Argument',
-        $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
-    ) {
-        if (empty($data)) {
-            $message = sprintf('%s cannot be empty', $dataName);
-            throw new $exceptionClass($message);
-        }
-    }
-
-    /**
-     * Verify that the data is not null
-     *
-     * @param  mixed  $data           the data to verify
-     * @param  string $dataName       the data name
-     * @param  string $exceptionClass FQCN for the exception
-     * @throws \Exception
-     */
-    public static function guardAgainstNull(
-        $data,
-        $dataName = 'Argument',
-        $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
-    ) {
-        if (null === $data) {
-            $message = sprintf('%s cannot be null', $dataName);
-            throw new $exceptionClass($message);
-        }
-    }
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php
deleted file mode 100644
index a4cf08a5a..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\AbstractHydrator as BaseAbstractHydrator;
-
-/**
- * @deprecated Use Zend\Hydrator\AbstractHydrator from zendframework/zend-hydrator instead.
- */
-abstract class AbstractHydrator extends BaseAbstractHydrator implements HydratorInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/AggregateHydrator.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/AggregateHydrator.php
deleted file mode 100644
index 62c6b32a7..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/AggregateHydrator.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Aggregate;
-
-use Zend\Hydrator\Aggregate\AggregateHydrator as BaseAggregateHydrator;
-use Zend\Stdlib\Hydrator\HydratorInterface;
-
-/**
- * Aggregate hydrator that composes multiple hydrators via events
- *
- * @deprecated Use Zend\Hydrator\Aggregate\AggregateHydrator from zendframework/zend-hydrator instead.
- */
-class AggregateHydrator extends BaseAggregateHydrator implements HydratorInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/ExtractEvent.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/ExtractEvent.php
deleted file mode 100644
index 9563efb2c..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/ExtractEvent.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Aggregate;
-
-use Zend\Hydrator\Aggregate\ExtractEvent as BaseExtractEvent;
-
-/**
- * Event triggered when the {@see \Zend\Stdlib\Hydrator\Aggregate\AggregateHydrator} extracts
- * data from an object
- *
- * @deprecated Use Zend\Hydrator\Aggregate\ExtractEvent from zendframework/zend-hydrator instead.
- */
-class ExtractEvent extends BaseExtractEvent
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydrateEvent.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydrateEvent.php
deleted file mode 100644
index 29c9fd67b..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydrateEvent.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Aggregate;
-
-use Zend\Hydrator\Aggregate\HydrateEvent as BaseHydrateEvent;
-
-/**
- * Event triggered when the {@see \Zend\Stdlib\Hydrator\Aggregate\AggregateHydrator} hydrates
- * data into an object
- *
- * @deprecated Use Zend\Hydrator\Aggregate\HydrateEvent from zendframework/zend-hydrator instead.
- */
-class HydrateEvent extends BaseHydrateEvent
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydratorListener.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydratorListener.php
deleted file mode 100644
index e15cae476..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydratorListener.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Aggregate;
-
-use Zend\Hydrator\Aggregate\HydratorListener as BaseHydratorListener;
-
-/**
- * Aggregate listener wrapping around a hydrator. Listens
- * to {@see \Zend\Stdlib\Hydrator\Aggregate::EVENT_HYDRATE} and
- * {@see \Zend\Stdlib\Hydrator\Aggregate::EVENT_EXTRACT}
- *
- * @deprecated Use Zend\Hydrator\Aggregate\HydratorListener from zendframework/zend-hydrator instead.
- */
-class HydratorListener extends BaseHydratorListener
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/ArraySerializable.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/ArraySerializable.php
deleted file mode 100644
index 415a44d1a..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/ArraySerializable.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\ArraySerializable as BaseArraySerializable;
-
-/**
- * @deprecated Use Zend\Hydrator\ArraySerializable from zendframework/zend-hydrator instead.
- */
-class ArraySerializable extends BaseArraySerializable implements HydratorInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/ClassMethods.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/ClassMethods.php
deleted file mode 100644
index ee6bdadc0..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/ClassMethods.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\ClassMethods as BaseClassMethods;
-
-/**
- * @deprecated Use Zend\Hydrator\ClassMethods from zendframework/zend-hydrator instead.
- */
-class ClassMethods extends BaseClassMethods implements HydratorInterface, HydratorOptionsInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydrator.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydrator.php
deleted file mode 100644
index eb65d9531..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydrator.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\DelegatingHydrator as BaseDelegatingHydrator;
-
-/**
- * @deprecated Use Zend\Hydrator\DelegatingHydrator from zendframework/zend-hydrator instead.
- */
-class DelegatingHydrator extends BaseDelegatingHydrator implements HydratorInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydratorFactory.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydratorFactory.php
deleted file mode 100644
index 170308d97..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydratorFactory.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\DelegatingHydratorFactory as BaseDelegatingHydratorFactory;
-
-/**
- * @deprecated Use Zend\Hydrator\DelegatingHydratorFactory from zendframework/zend-hydrator instead.
- */
-class DelegatingHydratorFactory extends BaseDelegatingHydratorFactory
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterComposite.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterComposite.php
deleted file mode 100644
index b230c97ba..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterComposite.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\FilterComposite as BaseFilterComposite;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\FilterComposite from zendframework/zend-hydrator instead.
- */
-class FilterComposite extends BaseFilterComposite implements FilterInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterInterface.php
deleted file mode 100644
index 95c4e2402..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\FilterInterface as BaseFilterInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\FilterInterface from zendframework/zend-hydrator instead.
- */
-interface FilterInterface extends BaseFilterInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterProviderInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterProviderInterface.php
deleted file mode 100644
index 142ddf1ff..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterProviderInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\FilterProviderInterface as BaseFilterProviderInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\FilterProviderInterface from zendframework/zend-hydrator instead.
- */
-interface FilterProviderInterface extends BaseFilterProviderInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/GetFilter.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/GetFilter.php
deleted file mode 100644
index ca7dd3cbe..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/GetFilter.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\GetFilter as BaseGetFilter;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\GetFilter from zendframework/zend-hydrator instead.
- */
-class GetFilter extends BaseGetFilter implements FilterInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/HasFilter.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/HasFilter.php
deleted file mode 100644
index af00600bf..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/HasFilter.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\HasFilter as BaseHasFilter;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\HasFilter from zendframework/zend-hydrator instead.
- */
-class HasFilter extends BaseHasFilter implements FilterInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/IsFilter.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/IsFilter.php
deleted file mode 100644
index 9e51643f5..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/IsFilter.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\IsFilter as BaseIsFilter;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\IsFilter from zendframework/zend-hydrator instead.
- */
-class IsFilter extends BaseIsFilter implements FilterInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/MethodMatchFilter.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/MethodMatchFilter.php
deleted file mode 100644
index 471849ce8..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/MethodMatchFilter.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\MethodMatchFilter as BaseMethodMatchFilter;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\MethodMatchFilter from zendframework/zend-hydrator instead.
- */
-class MethodMatchFilter extends BaseMethodMatchFilter implements FilterInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/NumberOfParameterFilter.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/NumberOfParameterFilter.php
deleted file mode 100644
index 95309b160..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/NumberOfParameterFilter.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\NumberOfParameterFilter as BaseNumberOfParameterFilter;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\NumberOfParameterFilter from zendframework/zend-hydrator instead.
- */
-class NumberOfParameterFilter extends BaseNumberOfParameterFilter implements FilterInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/OptionalParametersFilter.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/OptionalParametersFilter.php
deleted file mode 100644
index 07c8dfdc4..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/OptionalParametersFilter.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\OptionalParametersFilter as BaseOptionalParametersFilter;
-
-/**
- * Filter that includes methods which have no parameters or only optional parameters
- *
- * @deprecated Use Zend\Hydrator\Filter\OptionalParametersFilter from zendframework/zend-hydrator instead.
- */
-class OptionalParametersFilter extends BaseOptionalParametersFilter implements FilterInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/FilterEnabledInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/FilterEnabledInterface.php
deleted file mode 100644
index 9643f1427..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/FilterEnabledInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\FilterEnabledInterface as BaseFilterEnabledInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\FilterEnabledInterface from zendframework/zend-hydrator instead.
- */
-interface FilterEnabledInterface extends BaseFilterEnabledInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydrationInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydrationInterface.php
deleted file mode 100644
index 8395169b4..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydrationInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\HydrationInterface as BaseHydrationInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\HydrationInterface from zendframework/zend-hydrator instead.
- */
-interface HydrationInterface extends BaseHydrationInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareInterface.php
deleted file mode 100644
index 625a609b7..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\HydratorAwareInterface as BaseHydratorAwareInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\HydratorAwareInterface from zendframework/zend-hydrator instead.
- */
-interface HydratorAwareInterface extends BaseHydratorAwareInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareTrait.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareTrait.php
deleted file mode 100644
index e7d608209..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareTrait.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\HydratorAwareTrait as BaseHydratorAwareTrait;
-
-/**
- * @deprecated Use Zend\Hydrator\HydratorAwareTrait from zendframework/zend-hydrator instead.
- */
-trait HydratorAwareTrait
-{
-    use BaseHydratorAwareTrait;
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorInterface.php
deleted file mode 100644
index 14f143ab8..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Stdlib\Extractor\ExtractionInterface;
-use Zend\Hydrator\HydratorInterface as BaseHydratorInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\HydratorInterface from zendframework/zend-hydrator instead.
- */
-interface HydratorInterface extends BaseHydratorInterface, HydrationInterface, ExtractionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorOptionsInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorOptionsInterface.php
deleted file mode 100644
index dfda9253f..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorOptionsInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\HydratorOptionsInterface as BaseHydratorOptionsInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\HydratorOptionsInterface from zendframework/zend-hydrator instead.
- */
-interface HydratorOptionsInterface extends BaseHydratorOptionsInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorPluginManager.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorPluginManager.php
deleted file mode 100644
index 6b7049b8d..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorPluginManager.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\HydratorPluginManager as BaseHydratorPluginManager;
-
-/**
- * Plugin manager implementation for hydrators.
- *
- * Enforces that adapters retrieved are instances of HydratorInterface
- *
- * @deprecated Use Zend\Hydrator\HydratorPluginManager from zendframework/zend-hydrator instead.
- */
-class HydratorPluginManager extends BaseHydratorPluginManager
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingArrayIterator.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingArrayIterator.php
deleted file mode 100644
index f51befe44..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingArrayIterator.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Iterator;
-
-use Zend\Hydrator\Iterator\HydratingArrayIterator as BaseHydratingArrayIterator;
-
-/**
- * @deprecated Use Zend\Hydrator\Iterator\HydratingArrayIterator from zendframework/zend-hydrator instead.
- */
-class HydratingArrayIterator extends BaseHydratingArrayIterator implements HydratingIteratorInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorInterface.php
deleted file mode 100644
index 81a9999b5..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Iterator;
-
-use Zend\Hydrator\Iterator\HydratingIteratorInterface as BaseHydratingIteratorInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\Iterator\HydratingIteratorInterface from zendframework/zend-hydrator instead.
- */
-interface HydratingIteratorInterface extends BaseHydratingIteratorInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorIterator.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorIterator.php
deleted file mode 100644
index 1d2ac7ad9..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorIterator.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Iterator;
-
-use Zend\Hydrator\Iterator\HydratingIteratorIterator as BaseHydratingIteratorIterator;
-
-/**
- * @deprecated Use Zend\Hydrator\Iterator\HydratingIteratorIterator from zendframework/zend-hydrator instead.
- */
-class HydratingIteratorIterator extends BaseHydratingIteratorIterator implements HydratingIteratorInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php
deleted file mode 100644
index d440c531e..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\ArrayMapNamingStrategy as BaseArrayMapNamingStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\ArrayMapNamingStrategy from zendframework/zend-hydrator instead.
- */
-class ArrayMapNamingStrategy extends BaseArrayMapNamingStrategy implements NamingStrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/CompositeNamingStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/CompositeNamingStrategy.php
deleted file mode 100644
index d529a8b03..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/CompositeNamingStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\CompositeNamingStrategy as BaseCompositeNamingStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\CompositeNamingStrategy from zendframework/zend-hydrator instead.
- */
-class CompositeNamingStrategy extends BaseCompositeNamingStrategy implements NamingStrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/IdentityNamingStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/IdentityNamingStrategy.php
deleted file mode 100644
index be5783917..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/IdentityNamingStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\IdentityNamingStrategy as BaseIdentityNamingStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\IdentityNamingStrategy from zendframework/zend-hydrator instead.
- */
-class IdentityNamingStrategy extends BaseIdentityNamingStrategy implements NamingStrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/MapNamingStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/MapNamingStrategy.php
deleted file mode 100644
index 59e3f7f8f..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/MapNamingStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\MapNamingStrategy as BaseMapNamingStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\MapNamingStrategy from zendframework/zend-hydrator instead.
- */
-class MapNamingStrategy extends BaseMapNamingStrategy implements NamingStrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/NamingStrategyInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/NamingStrategyInterface.php
deleted file mode 100644
index 4d82ee1d6..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/NamingStrategyInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\NamingStrategyInterface as BaseNamingStrategyInterface;
-
-/**
- * Allow property extraction / hydration for hydrator
- *
- * @deprecated Use Zend\Hydrator\NamingStrategy\NamingStrategyInterface from zendframework/zend-hydrator instead.
- */
-interface NamingStrategyInterface extends BaseNamingStrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
deleted file mode 100644
index 2b9d6efbc..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\UnderscoreNamingStrategy as BaseUnderscoreNamingStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\UnderscoreNamingStrategy from zendframework/zend-hydrator instead.
- */
-class UnderscoreNamingStrategy extends BaseUnderscoreNamingStrategy implements NamingStrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategyEnabledInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategyEnabledInterface.php
deleted file mode 100644
index 8f8acabc5..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategyEnabledInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\NamingStrategyEnabledInterface as BaseNamingStrategyEnabledInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\NamingStrategyEnabledInterface from zendframework/zend-hydrator instead.
- */
-interface NamingStrategyEnabledInterface extends BaseNamingStrategyEnabledInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/ObjectProperty.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/ObjectProperty.php
deleted file mode 100644
index c846fe5d5..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/ObjectProperty.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\ObjectProperty as BaseObjectProperty;
-
-/**
- * @deprecated Use Zend\Hydrator\ObjectProperty from zendframework/zend-hydrator instead.
- */
-class ObjectProperty extends BaseObjectProperty implements HydratorInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Reflection.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Reflection.php
deleted file mode 100644
index 22d8cdfde..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Reflection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\Reflection as BaseReflection;
-
-/**
- * @deprecated Use Zend\Hydrator\Reflection from zendframework/zend-hydrator instead.
- */
-class Reflection extends BaseReflection implements HydratorInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/BooleanStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/BooleanStrategy.php
deleted file mode 100644
index d89f50711..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/BooleanStrategy.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\BooleanStrategy as BaseBooleanStrategy;
-
-/**
- * This Strategy extracts and hydrates int and string values to Boolean values
- *
- * @deprecated Use Zend\Hydrator\Strategy\BooleanStrategy from zendframework/zend-hydrator instead.
- */
-class BooleanStrategy extends BaseBooleanStrategy implements StrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ClosureStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ClosureStrategy.php
deleted file mode 100644
index 32572226f..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ClosureStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\ClosureStrategy as BaseClosureStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\ClosureStrategy from zendframework/zend-hydrator instead.
- */
-class ClosureStrategy extends BaseClosureStrategy implements StrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DateTimeFormatterStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DateTimeFormatterStrategy.php
deleted file mode 100644
index 8e633f322..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DateTimeFormatterStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\DateTimeFormatterStrategy as BaseDateTimeFormatterStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\DateTimeFormatterStrategy from zendframework/zend-hydrator instead.
- */
-class DateTimeFormatterStrategy extends BaseDateTimeFormatterStrategy implements StrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DefaultStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DefaultStrategy.php
deleted file mode 100644
index 155c82f0f..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DefaultStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\DefaultStrategy as BaseDefaultStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\DefaultStrategy from zendframework/zend-hydrator instead.
- */
-class DefaultStrategy extends BaseDefaultStrategy implements StrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/ExceptionInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/ExceptionInterface.php
deleted file mode 100644
index 16a921be1..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy\Exception;
-
-use Zend\Hydrator\Strategy\Exception;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\Exception\ExceptionInterface from zendframework/zend-hydrator instead.
- */
-interface ExceptionInterface extends Exception\ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/InvalidArgumentException.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/InvalidArgumentException.php
deleted file mode 100644
index 10f69a244..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy\Exception;
-
-use Zend\Hydrator\Strategy\Exception\InvalidArgumentException as BaseInvalidArgumentException;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\Exception\InvalidArgumentException from zendframework/zend-hydrator instead.
- */
-class InvalidArgumentException extends BaseInvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ExplodeStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ExplodeStrategy.php
deleted file mode 100644
index ca7e5851c..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ExplodeStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\ExplodeStrategy as BaseExplodeStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\ExplodeStrategy from zendframework/zend-hydrator instead.
- */
-class ExplodeStrategy extends BaseExplodeStrategy implements StrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/SerializableStrategy.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/SerializableStrategy.php
deleted file mode 100644
index 045279231..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/SerializableStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\SerializableStrategy as BaseSerializableStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\SerializableStrategy from zendframework/zend-hydrator instead.
- */
-class SerializableStrategy extends BaseSerializableStrategy implements StrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyChain.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyChain.php
deleted file mode 100644
index 33d2bc13e..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyChain.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\StrategyChain as BaseStrategyChain;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\StrategyChain from zendframework/zend-hydrator instead.
- */
-class StrategyChain extends BaseStrategyChain implements StrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyInterface.php
deleted file mode 100644
index a1eb8e906..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\StrategyInterface as BaseStrategyInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\StrategyInterface from zendframework/zend-hydrator instead.
- */
-interface StrategyInterface extends BaseStrategyInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/Hydrator/StrategyEnabledInterface.php b/web/vendor/zendframework/zend-stdlib/src/Hydrator/StrategyEnabledInterface.php
deleted file mode 100644
index 9c058a712..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/Hydrator/StrategyEnabledInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\StrategyEnabledInterface as BaseStrategyEnabledInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\StrategyEnabledInterface from zendframework/zend-hydrator instead.
- */
-interface StrategyEnabledInterface extends BaseStrategyEnabledInterface
-{
-}
diff --git a/web/vendor/zendframework/zend-stdlib/src/JsonSerializable.php b/web/vendor/zendframework/zend-stdlib/src/JsonSerializable.php
index 16cc24466..05b8836d7 100644
--- a/web/vendor/zendframework/zend-stdlib/src/JsonSerializable.php
+++ b/web/vendor/zendframework/zend-stdlib/src/JsonSerializable.php
@@ -9,6 +9,9 @@
 
 namespace Zend\Stdlib;
 
+/**
+ * @deprecated Since 3.1.0; use the native JsonSerializable interface
+ */
 interface JsonSerializable extends \JsonSerializable
 {
 }
diff --git a/web/vendor/zendframework/zend-stdlib/src/Message.php b/web/vendor/zendframework/zend-stdlib/src/Message.php
index 12d5bb3d8..11ec16330 100644
--- a/web/vendor/zendframework/zend-stdlib/src/Message.php
+++ b/web/vendor/zendframework/zend-stdlib/src/Message.php
@@ -40,7 +40,7 @@ class Message implements MessageInterface
             $this->metadata[$spec] = $value;
             return $this;
         }
-        if (!is_array($spec) && !$spec instanceof Traversable) {
+        if (! is_array($spec) && ! $spec instanceof Traversable) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Expected a string, array, or Traversable argument in first position; received "%s"',
                 (is_object($spec) ? get_class($spec) : gettype($spec))
@@ -66,7 +66,7 @@ class Message implements MessageInterface
             return $this->metadata;
         }
 
-        if (!is_scalar($key)) {
+        if (! is_scalar($key)) {
             throw new Exception\InvalidArgumentException('Non-scalar argument provided for key');
         }
 
diff --git a/web/vendor/zendframework/zend-stdlib/src/Parameters.php b/web/vendor/zendframework/zend-stdlib/src/Parameters.php
index ab5ada97a..e845fcdaf 100644
--- a/web/vendor/zendframework/zend-stdlib/src/Parameters.php
+++ b/web/vendor/zendframework/zend-stdlib/src/Parameters.php
@@ -70,7 +70,7 @@ class Parameters extends PhpArrayObject implements ParametersInterface
      */
     public function toString()
     {
-        return http_build_query($this);
+        return http_build_query($this->toArray());
     }
 
     /**
diff --git a/web/vendor/zendframework/zend-stdlib/src/PriorityList.php b/web/vendor/zendframework/zend-stdlib/src/PriorityList.php
index b318f264e..d5ca136bd 100644
--- a/web/vendor/zendframework/zend-stdlib/src/PriorityList.php
+++ b/web/vendor/zendframework/zend-stdlib/src/PriorityList.php
@@ -62,7 +62,7 @@ class PriorityList implements Iterator, Countable
      */
     public function insert($name, $value, $priority = 0)
     {
-        if (!isset($this->items[$name])) {
+        if (! isset($this->items[$name])) {
             $this->count++;
         }
 
@@ -85,7 +85,7 @@ class PriorityList implements Iterator, Countable
      */
     public function setPriority($name, $priority)
     {
-        if (!isset($this->items[$name])) {
+        if (! isset($this->items[$name])) {
             throw new \Exception("item $name not found");
         }
 
@@ -131,7 +131,7 @@ class PriorityList implements Iterator, Countable
      */
     public function get($name)
     {
-        if (!isset($this->items[$name])) {
+        if (! isset($this->items[$name])) {
             return;
         }
 
@@ -145,7 +145,7 @@ class PriorityList implements Iterator, Countable
      */
     protected function sort()
     {
-        if (!$this->sorted) {
+        if (! $this->sorted) {
             uasort($this->items, [$this, 'compare']);
             $this->sorted = true;
         }
@@ -161,7 +161,7 @@ class PriorityList implements Iterator, Countable
     protected function compare(array $item1, array $item2)
     {
         return ($item1['priority'] === $item2['priority'])
-            ? ($item1['serial']   > $item2['serial']   ? -1 : 1) * $this->isLIFO
+            ? ($item1['serial'] > $item2['serial'] ? -1 : 1) * $this->isLIFO
             : ($item1['priority'] > $item2['priority'] ? -1 : 1);
     }
 
diff --git a/web/vendor/zendframework/zend-stdlib/src/PriorityQueue.php b/web/vendor/zendframework/zend-stdlib/src/PriorityQueue.php
index eded6adfe..2a1628731 100644
--- a/web/vendor/zendframework/zend-stdlib/src/PriorityQueue.php
+++ b/web/vendor/zendframework/zend-stdlib/src/PriorityQueue.php
@@ -99,7 +99,7 @@ class PriorityQueue implements Countable, IteratorAggregate, Serializable
             unset($this->items[$key]);
             $this->queue = null;
 
-            if (!$this->isEmpty()) {
+            if (! $this->isEmpty()) {
                 $queue = $this->getQueue();
                 foreach ($this->items as $item) {
                     $queue->insert($item['data'], $item['priority']);
@@ -277,7 +277,7 @@ class PriorityQueue implements Countable, IteratorAggregate, Serializable
     {
         if (null === $this->queue) {
             $this->queue = new $this->queueClass();
-            if (!$this->queue instanceof \SplPriorityQueue) {
+            if (! $this->queue instanceof \SplPriorityQueue) {
                 throw new Exception\DomainException(sprintf(
                     'PriorityQueue expects an internal queue of type SplPriorityQueue; received "%s"',
                     get_class($this->queue)
diff --git a/web/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php b/web/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php
index 28b365d85..42d31deb4 100644
--- a/web/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php
+++ b/web/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php
@@ -36,7 +36,7 @@ class SplPriorityQueue extends \SplPriorityQueue implements Serializable
      */
     public function insert($datum, $priority)
     {
-        if (!is_array($priority)) {
+        if (! is_array($priority)) {
             $priority = [$priority, $this->serial--];
         }
         parent::insert($datum, $priority);
diff --git a/web/vendor/zendframework/zend-stdlib/src/StringUtils.php b/web/vendor/zendframework/zend-stdlib/src/StringUtils.php
index 575cf2aab..79a22a4c0 100644
--- a/web/vendor/zendframework/zend-stdlib/src/StringUtils.php
+++ b/web/vendor/zendframework/zend-stdlib/src/StringUtils.php
@@ -84,7 +84,7 @@ abstract class StringUtils
     public static function registerWrapper($wrapper)
     {
         $wrapper = (string) $wrapper;
-        if (!in_array($wrapper, static::$wrapperRegistry, true)) {
+        if (! in_array($wrapper, static::$wrapperRegistry, true)) {
             static::$wrapperRegistry[] = $wrapper;
         }
     }
diff --git a/web/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php b/web/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php
index 3e395ccc5..cf2625079 100644
--- a/web/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php
+++ b/web/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php
@@ -38,11 +38,11 @@ abstract class AbstractStringWrapper implements StringWrapperInterface
     {
         $supportedEncodings = static::getSupportedEncodings();
 
-        if (!in_array(strtoupper($encoding), $supportedEncodings)) {
+        if (! in_array(strtoupper($encoding), $supportedEncodings)) {
             return false;
         }
 
-        if ($convertEncoding !== null && !in_array(strtoupper($convertEncoding), $supportedEncodings)) {
+        if ($convertEncoding !== null && ! in_array(strtoupper($convertEncoding), $supportedEncodings)) {
             return false;
         }
 
@@ -61,7 +61,7 @@ abstract class AbstractStringWrapper implements StringWrapperInterface
         $supportedEncodings = static::getSupportedEncodings();
 
         $encodingUpper = strtoupper($encoding);
-        if (!in_array($encodingUpper, $supportedEncodings)) {
+        if (! in_array($encodingUpper, $supportedEncodings)) {
             throw new Exception\InvalidArgumentException(
                 'Wrapper doesn\'t support character encoding "' . $encoding . '"'
             );
@@ -69,7 +69,7 @@ abstract class AbstractStringWrapper implements StringWrapperInterface
 
         if ($convertEncoding !== null) {
             $convertEncodingUpper = strtoupper($convertEncoding);
-            if (!in_array($convertEncodingUpper, $supportedEncodings)) {
+            if (! in_array($convertEncodingUpper, $supportedEncodings)) {
                 throw new Exception\InvalidArgumentException(
                     'Wrapper doesn\'t support character encoding "' . $convertEncoding . '"'
                 );
diff --git a/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php b/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php
index 46413ab79..bc791b893 100644
--- a/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php
+++ b/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php
@@ -214,7 +214,7 @@ class Iconv extends AbstractStringWrapper
      */
     public function __construct()
     {
-        if (!extension_loaded('iconv')) {
+        if (! extension_loaded('iconv')) {
             throw new Exception\ExtensionNotLoadedException(
                 'PHP extension "iconv" is required for this wrapper'
             );
diff --git a/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php b/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php
index eaab28f88..4644db361 100644
--- a/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php
+++ b/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php
@@ -37,7 +37,7 @@ class Intl extends AbstractStringWrapper
      */
     public function __construct()
     {
-        if (!extension_loaded('intl')) {
+        if (! extension_loaded('intl')) {
             throw new Exception\ExtensionNotLoadedException(
                 'PHP extension "intl" is required for this wrapper'
             );
diff --git a/web/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php b/web/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php
index d6db18566..a0f80f62a 100644
--- a/web/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php
+++ b/web/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php
@@ -48,7 +48,7 @@ class MbString extends AbstractStringWrapper
      */
     public function __construct()
     {
-        if (!extension_loaded('mbstring')) {
+        if (! extension_loaded('mbstring')) {
             throw new Exception\ExtensionNotLoadedException(
                 'PHP extension "mbstring" is required for this wrapper'
             );
diff --git a/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php b/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php
index 38b3c10a4..ce9dbfc35 100644
--- a/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php
+++ b/web/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php
@@ -35,7 +35,7 @@ class Native extends AbstractStringWrapper
         $encodingUpper      = strtoupper($encoding);
         $supportedEncodings = static::getSupportedEncodings();
 
-        if (!in_array($encodingUpper, $supportedEncodings)) {
+        if (! in_array($encodingUpper, $supportedEncodings)) {
             return false;
         }
 
@@ -69,7 +69,7 @@ class Native extends AbstractStringWrapper
         $supportedEncodings = static::getSupportedEncodings();
 
         $encodingUpper = strtoupper($encoding);
-        if (!in_array($encodingUpper, $supportedEncodings)) {
+        if (! in_array($encodingUpper, $supportedEncodings)) {
             throw new Exception\InvalidArgumentException(
                 'Wrapper doesn\'t support character encoding "' . $encoding . '"'
             );
diff --git a/web/vendor/zendframework/zend-stdlib/src/compatibility/autoload.php b/web/vendor/zendframework/zend-stdlib/src/compatibility/autoload.php
deleted file mode 100644
index f8670cc16..000000000
--- a/web/vendor/zendframework/zend-stdlib/src/compatibility/autoload.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @deprecated
- */
-
-/**
- * Legacy purposes only, to prevent code that references it from breaking.
- */
-trigger_error('Polyfill autoload support (file library/Zend/Stdlib/compatibility/autoload.php) is no longer necessary; please remove your require statement referencing this file', E_USER_DEPRECATED);